diff --git a/.eslintrc b/.eslintrc
index c9cd552..c9a1b03 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -52,6 +52,7 @@
 		"frappe": true,
 		"erpnext": true,
 		"schools": true,
+		"education": true,
 
 		"$": true,
 		"jQuery": true,
@@ -132,6 +133,7 @@
 		"get_url_arg": true,
 		"get_server_fields": true,
 		"set_multiple": true,
-		"QUnit": true
+		"QUnit": true,
+		"Chart": true
 	}
 }
diff --git a/.travis.yml b/.travis.yml
index 8681c03..43b4078 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@
   - cp -r $TRAVIS_BUILD_DIR/test_sites/test_site ~/frappe-bench/sites/
 
 before_script:
-  - wget http://chromedriver.storage.googleapis.com/2.27/chromedriver_linux64.zip
+  - wget http://chromedriver.storage.googleapis.com/2.33/chromedriver_linux64.zip
   - unzip chromedriver_linux64.zip
   - sudo apt-get install libnss3
   - sudo apt-get --only-upgrade install google-chrome-stable
@@ -64,4 +64,21 @@
         - bench execute erpnext.setup.utils.enable_all_roles_and_domains
         - bench run-ui-tests --app erpnext
       env: Client Side Test
-
+    - # stage
+      script:
+        - bench --verbose run-setup-wizard-ui-test
+        - bench execute erpnext.setup.utils.enable_all_roles_and_domains
+        - bench run-ui-tests --app erpnext --test-list erpnext/tests/ui/tests2.txt
+      env: Client Side Test - 2
+    - # stage
+      script:
+        - bench --verbose run-setup-wizard-ui-test
+        - bench execute erpnext.setup.utils.enable_all_roles_and_domains
+        - bench run-ui-tests --app erpnext --test-list erpnext/tests/ui/agriculture.txt
+      env: Agriculture Client Side Test
+    - # stage
+      script:
+        - wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz
+        - bench --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis
+        - bench migrate
+      env: Patch Testing
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 04f881c..fdd74e8 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -3,6 +3,7 @@
 import inspect
 import frappe
 from erpnext.hooks import regional_overrides
+from frappe.utils import getdate
 
 __version__ = '9.2.22'
 
@@ -108,3 +109,16 @@
 
 	return caller
 
+def get_last_membership():
+	'''Returns last membership if exists'''
+	last_membership = frappe.get_all('Membership', 'name,to_date,membership_type',
+		dict(member=frappe.session.user, paid=1), order_by='to_date desc', limit=1)
+
+	return last_membership and last_membership[0]
+
+def is_member():
+	'''Returns true if the user is still a member'''
+	last_membership = get_last_membership()
+	if last_membership and getdate(last_membership.to_date) > getdate():
+		return True
+	return False
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/account.js b/erpnext/accounts/doctype/account/account.js
index ca46d6b0..3a86fbc 100644
--- a/erpnext/accounts/doctype/account/account.js
+++ b/erpnext/accounts/doctype/account/account.js
@@ -47,6 +47,12 @@
 			// show / hide convert buttons
 			frm.trigger('add_toolbar_buttons');
 		}
+
+		if(!frm.doc.__islocal) {
+			frm.add_custom_button(__('Update Account Number'), function () {
+				frm.trigger("update_account_number");
+			});
+		}
 	},
 	account_type: function (frm) {
 		if (frm.doc.is_group == 0) {
@@ -90,6 +96,46 @@
 				});
 			});
 		}
+	},
 
+	update_account_number: function(frm) {
+		var d = new frappe.ui.Dialog({
+			title: __('Update Account Number'),
+			fields: [
+				{
+					"label": "Account Number",
+					"fieldname": "account_number",
+					"fieldtype": "Data",
+					"reqd": 1
+				}
+			],
+			primary_action: function() {
+				var data = d.get_values();
+				if(data.account_number === frm.doc.account_number) {
+					d.hide();
+					return;
+				}
+
+				frappe.call({
+					method: "erpnext.accounts.doctype.account.account.update_account_number",
+					args: {
+						account_number: data.account_number,
+						name: frm.doc.name
+					},
+					callback: function(r) {
+						if(!r.exc) {
+							if(r.message) {
+								frappe.set_route("Form", "Account", r.message);
+							} else {
+								frm.set_value("account_number", data.account_number);
+							}
+							d.hide();
+						}
+					}
+				});
+			},
+			primary_action_label: __('Update')
+		});
+		d.show();
 	}
 });
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/account.json b/erpnext/accounts/doctype/account/account.json
index 8de923f..8731c51 100644
--- a/erpnext/accounts/doctype/account/account.json
+++ b/erpnext/accounts/doctype/account/account.json
@@ -108,6 +108,36 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "account_number", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Account Number", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "default": "0", 
    "fieldname": "is_group", 
    "fieldtype": "Check", 
@@ -545,7 +575,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-08-11 15:28:35.855809", 
+ "modified": "2017-08-22 17:39:10.711343", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Account", 
@@ -655,7 +685,7 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "search_fields": "", 
+ "search_fields": "account_number", 
  "show_name_in_global_search": 1, 
  "sort_order": "ASC", 
  "track_changes": 1, 
diff --git a/erpnext/accounts/doctype/account/account.py b/erpnext/accounts/doctype/account/account.py
index 0787a1f..36f8ce2 100644
--- a/erpnext/accounts/doctype/account/account.py
+++ b/erpnext/accounts/doctype/account/account.py
@@ -3,14 +3,14 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.utils import cint, fmt_money
+from frappe.utils import cint, cstr
 from frappe import throw, _
-from frappe.model.document import Document
+from frappe.utils.nestedset import NestedSet
 
 class RootNotEditable(frappe.ValidationError): pass
 class BalanceMismatchError(frappe.ValidationError): pass
 
-class Account(Document):
+class Account(NestedSet):
 	nsm_parent_field = 'parent_account'
 
 	def onload(self):
@@ -20,18 +20,14 @@
 			self.set_onload("can_freeze_account", True)
 
 	def autoname(self):
-		# first validate if company exists
-		company = frappe.db.get_value("Company", self.company, ["abbr", "name"], as_dict=True)
-		if not company:
-			frappe.throw(_('Company {0} does not exist').format(self.company))
-
-		self.name = self.account_name.strip() + ' - ' + company.abbr
+		self.name = get_account_autoname(self.account_number, self.account_name, self.company)
 
 	def validate(self):
 		if frappe.local.flags.allow_unverified_charts:
 			return
 		self.validate_parent()
 		self.validate_root_details()
+		validate_account_number(self.name, self.account_number, self.company)
 		self.validate_group_or_ledger()
 		self.set_root_and_report_type()
 		self.validate_mandatory()
@@ -56,12 +52,15 @@
 
 	def set_root_and_report_type(self):
 		if self.parent_account:
-			par = frappe.db.get_value("Account", self.parent_account, ["report_type", "root_type"], as_dict=1)
+			par = frappe.db.get_value("Account", self.parent_account,
+				["report_type", "root_type", "account_type"], as_dict=1)
 
 			if par.report_type:
 				self.report_type = par.report_type
 			if par.root_type:
 				self.root_type = par.root_type
+			if par.account_type and not self.account_type:
+				self.account_type = par.account_type
 
 		if self.is_group:
 			db_value = frappe.db.get_value("Account", self.name, ["report_type", "root_type"], as_dict=1)
@@ -161,31 +160,18 @@
 		if not self.report_type:
 			throw(_("Report Type is mandatory"))
 
-
-	def update_nsm_model(self):
-		"""update lft, rgt indices for nested set model"""
-		import frappe
-		import frappe.utils.nestedset
-		frappe.utils.nestedset.update_nsm(self)
-
-	def on_update(self):
-		self.update_nsm_model()
-
-	def validate_trash(self):
-		"""checks gl entries and if child exists"""
+	def on_trash(self):
+		# checks gl entries and if child exists
 		if self.check_gle_exists():
 			throw(_("Account with existing transaction can not be deleted"))
-		if self.check_if_child_exists():
-			throw(_("Child account exists for this account. You can not delete this account."))
 
-	def on_trash(self):
-		self.validate_trash()
-		self.update_nsm_model()
+		super(Account, self).on_trash()
 
 	def before_rename(self, old, new, merge=False):
 		# Add company abbr if not provided
 		from erpnext.setup.doctype.company.company import get_name_with_abbr
 		new_account = get_name_with_abbr(new, self.company)
+		new_account = get_name_with_number(new_account, self.account_number)
 
 		# Validate properties before merging
 		if merge:
@@ -205,12 +191,28 @@
 		return new_account
 
 	def after_rename(self, old, new, merge=False):
+		super(Account, self).after_rename(old, new, merge)
+
 		if not merge:
-			frappe.db.set_value("Account", new, "account_name",
-				" - ".join(new.split(" - ")[:-1]))
-		else:
-			from frappe.utils.nestedset import rebuild_tree
-			rebuild_tree("Account", "parent_account")
+			new_acc = frappe.db.get_value("Account", new, ["account_name", "account_number"], as_dict=1)
+
+			# exclude company abbr
+			new_parts = new.split(" - ")[:-1]
+			# update account number and remove from parts
+			if new_parts[0][0].isdigit():
+				# if account number is separate by space, split using space
+				if len(new_parts) == 1:
+					new_parts = new.split(" ")
+				if new_acc.account_number != new_parts[0]:
+					self.account_number = new_parts[0]
+					self.db_set("account_number", new_parts[0])
+				new_parts = new_parts[1:]
+
+			# update account name
+			account_name = " - ".join(new_parts)
+			if new_acc.account_name != account_name:
+				self.account_name = account_name
+				self.db_set("account_name", account_name)
 
 def get_parent_account(doctype, txt, searchfield, start, page_len, filters):
 	return frappe.db.sql("""select name from tabAccount
@@ -231,3 +233,46 @@
 		return account_currency
 
 	return frappe.local_cache("account_currency", account, generator)
+
+def get_account_autoname(account_number, account_name, company):
+	# first validate if company exists
+	company = frappe.db.get_value("Company", company, ["abbr", "name"], as_dict=True)
+	if not company:
+		frappe.throw(_('Company {0} does not exist').format(company))
+
+	parts = [account_name.strip(), company.abbr]
+	if cstr(account_number).strip():
+		parts.insert(0, cstr(account_number).strip())
+	return ' - '.join(parts)
+
+def validate_account_number(name, account_number, company):
+	if account_number:
+		account_with_same_number = frappe.db.get_value("Account",
+			{"account_number": account_number, "company": company, "name": ["!=", name]})
+		if account_with_same_number:
+			frappe.throw(_("Account Number {0} already used in account {1}")
+				.format(account_number, account_with_same_number))
+
+@frappe.whitelist()
+def update_account_number(name, account_number):
+	account = frappe.db.get_value("Account", name, ["account_name", "company"], as_dict=True)
+
+	validate_account_number(name, account_number, account.company)
+
+	frappe.db.set_value("Account", name, "account_number", account_number)
+
+	account_name = account.account_name
+	if account_name[0].isdigit():
+		separator = " - " if " - " in account_name else " "
+		account_name = account_name.split(separator, 1)[1]
+	frappe.db.set_value("Account", name, "account_name", account_name)
+
+	new_name = get_account_autoname(account_number, account_name, account.company)
+	if name != new_name:
+		frappe.rename_doc("Account", name, new_name)
+		return new_name
+
+def get_name_with_number(new_account, account_number):
+	if account_number and not new_account[0].isdigit():
+		new_account = account_number + " - " + new_account
+	return new_account
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/account_tree.js b/erpnext/accounts/doctype/account/account_tree.js
index b803984..2f4e09b 100644
--- a/erpnext/accounts/doctype/account/account_tree.js
+++ b/erpnext/accounts/doctype/account/account_tree.js
@@ -24,6 +24,8 @@
 	fields: [
 		{fieldtype:'Data', fieldname:'account_name', label:__('New Account Name'), reqd:true,
 			description: __("Name of new Account. Note: Please don't create accounts for Customers and Suppliers")},
+		{fieldtype:'Data', fieldname:'account_number', label:__('Account Number'),
+			description: __("Number of new Account, it will be included in the account name as a prefix")},
 		{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
 			description: __('Further accounts can be made under Groups, but entries can be made against non-Groups')},
 		{fieldtype:'Select', fieldname:'root_type', label:__('Root Type'),
@@ -41,6 +43,41 @@
 			description: __("Optional. Sets company's default currency, if not specified.")}
 	],
 	ignore_fields:["parent_account"],
+	onload: function(treeview) {
+		function get_company() {
+			return treeview.page.fields_dict.company.get_value();
+		}
+
+		// tools
+		treeview.page.add_inner_button(__("Chart of Cost Centers"), function() {
+			frappe.set_route('Tree', 'Cost Center', {company: get_company()});
+		}, __('View'));
+
+		treeview.page.add_inner_button(__("Opening Invoice Creation Tool"), function() {
+			frappe.set_route('Form', 'Opening Invoice Creation Tool', {company: get_company()});
+		}, __('View'));
+
+		treeview.page.add_inner_button(__("Period Closing Voucher"), function() {
+			frappe.set_route('List', 'Period Closing Voucher', {company: get_company()});
+		}, __('View'));
+
+		// make
+		treeview.page.add_inner_button(__("Journal Entry"), function() {
+			frappe.new_doc('Journal Entry', {company: get_company()});
+		}, __('Make'));
+		treeview.page.add_inner_button(__("New Company"), function() {
+			frappe.new_doc('Company');
+		}, __('Make'));
+
+		// financial statements
+		for (let report of ['Trial Balance', 'General Ledger', 'Balance Sheet',
+			'Profit and Loss', 'Cash Flow Statement', 'Accounts Payable', 'Accounts Receivable']) {
+			treeview.page.add_inner_button(__(report), function() {
+				frappe.set_route('query-report', report, {company: get_company()});
+			}, __('Financial Statements'));
+		}
+
+	},
 	onrender: function(node) {
 		var dr_or_cr = node.data.balance < 0 ? "Cr" : "Dr";
 		if (node.data && node.data.balance!==undefined) {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py b/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
index 1e694e7..dc98db1 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
@@ -16,12 +16,12 @@
 				if root_account:
 					root_type = child.get("root_type")
 
-				if account_name not in ["account_type", "root_type", "is_group", "tax_rate"]:
+				if account_name not in ["account_number", "account_type",
+					"root_type", "is_group", "tax_rate"]:
 
-					account_name_in_db = unidecode(account_name.strip().lower())
-					if account_name_in_db in accounts:
-						count = accounts.count(account_name_in_db)
-						account_name = account_name + " " + cstr(count)
+					account_number = cstr(child.get("account_number")).strip()
+					account_name, account_name_in_db = add_suffix_if_duplicate(account_name,
+						account_number, accounts)
 
 					is_group = identify_is_group(child)
 					report_type = "Balance Sheet" if root_type in ["Asset", "Liability", "Equity"] \
@@ -35,6 +35,7 @@
 						"is_group": is_group,
 						"root_type": root_type,
 						"report_type": report_type,
+						"account_number": account_number,
 						"account_type": child.get("account_type"),
 						"account_currency": frappe.db.get_value("Company", company, "default_currency"),
 						"tax_rate": child.get("tax_rate")
@@ -53,10 +54,23 @@
 
 		_import_accounts(chart, None, None, root_account=True)
 
+def add_suffix_if_duplicate(account_name, account_number, accounts):
+	if account_number:
+		account_name_in_db = unidecode(" - ".join([account_number,
+			account_name.strip().lower()]))
+	else:
+		account_name_in_db = unidecode(account_name.strip().lower())
+
+	if account_name_in_db in accounts:
+		count = accounts.count(account_name_in_db)
+		account_name = account_name + " " + cstr(count)
+
+	return account_name, account_name_in_db
+
 def identify_is_group(child):
 	if child.get("is_group"):
 		is_group = child.get("is_group")
-	elif len(set(child.keys()) - set(["account_type", "root_type", "is_group", "tax_rate"])):
+	elif len(set(child.keys()) - set(["account_type", "root_type", "is_group", "tax_rate", "account_number"])):
 		is_group = 1
 	else:
 		is_group = 0
@@ -71,6 +85,10 @@
 	elif chart_template == "Standard":
 		from erpnext.accounts.doctype.account.chart_of_accounts.verified import standard_chart_of_accounts
 		return standard_chart_of_accounts.get()
+	elif chart_template == "Standard with Numbers":
+		from erpnext.accounts.doctype.account.chart_of_accounts.verified \
+			import standard_chart_of_accounts_with_account_number
+		return standard_chart_of_accounts_with_account_number.get()
 	else:
 		folders = ("verified",)
 		if frappe.local.flags.allow_unverified_charts:
@@ -86,7 +104,7 @@
 							return json.loads(chart).get("tree")
 
 @frappe.whitelist()
-def get_charts_for_country(country):
+def get_charts_for_country(country, with_standard=False):
 	charts = []
 
 	def _get_chart_name(content):
@@ -111,26 +129,26 @@
 					with open(os.path.join(path, fname), "r") as f:
 						_get_chart_name(f.read())
 
-	if len(charts) != 1:
-		charts.append("Standard")
+	if len(charts) != 1 or with_standard:
+		charts += ["Standard", "Standard with Numbers"]
 
 	return charts
 
 
 def get_account_tree_from_existing_company(existing_company):
-	all_accounts = frappe.get_all('Account', 
-		filters={'company': existing_company}, 
-		fields = ["name", "account_name", "parent_account", "account_type", 
-			"is_group", "root_type", "tax_rate"], 
+	all_accounts = frappe.get_all('Account',
+		filters={'company': existing_company},
+		fields = ["name", "account_name", "parent_account", "account_type",
+			"is_group", "root_type", "tax_rate", "account_number"],
 		order_by="lft, rgt")
-	
+
 	account_tree = {}
 
 	# fill in tree starting with root accounts (those with no parent)
 	if all_accounts:
 		build_account_tree(account_tree, None, all_accounts)
 	return account_tree
-	
+
 def build_account_tree(tree, parent, all_accounts):
 	# find children
 	parent_account = parent.name if parent else ""
@@ -139,18 +157,17 @@
 	# if no children, but a group account
 	if not children and parent.is_group:
 		tree["is_group"] = 1
+		tree["account_number"] = parent.account_number
 
 	# build a subtree for each child
 	for child in children:
-		if child.account_type == "Stock" and not child.is_group:
-			tree["is_group"] = 1
-			continue
-		
 		# start new subtree
 		tree[child.account_name] = {}
 		
 		# assign account_type and root_type
 		if child.account_type:
+			tree[child.account_name]["account_number"] = child.account_number
+		if child.account_type:
 			tree[child.account_name]["account_type"] = child.account_type
 		if child.tax_rate:
 			tree[child.account_name]["tax_rate"] = child.tax_rate
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ar_ar_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ar_ar_chart_template.json
deleted file mode 100644
index 0dfd1bd..0000000
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ar_ar_chart_template.json
+++ /dev/null
@@ -1,209 +0,0 @@
-{
-    "country_code": "ar",
-    "name": "Argentina - Plan de Cuentas",
-    "tree": {
-        "Cuentas Patrimoniales": {
-            "ACTIVO": {
-                "Bienes Inmateriales": {
-                    "Bienes Inmateriales / (-) Amortizaci\u00f3n Acumulada": {},
-                    "Bienes Inmateriales / Concesiones y Franquicias": {},
-                    "Bienes Inmateriales / Marcas de F\u00e1brica": {},
-                    "Bienes Inmateriales / Patentes de Invenci\u00f3n": {}
-                },
-                "Bienes de Cambio": {
-                    "(-) Previsi\u00f3n para Desvalorizaci\u00f3n de Bienes de Cambio": {},
-                    "Bienes de Cambio - Mercader\u00edas": {
-                        "Bienes de Cambio - Mercader\u00edas / Categoria de productos 01": {}
-                    },
-                    "Bienes de Cambio - Mercader\u00edas en Tr\u00e1nsito": {},
-                    "Materiales Varios ": {},
-                    "Materias primas": {},
-                    "Productos Elaborados": {},
-                    "Productos en Curso de Elaboraci\u00f3n": {}
-                },
-                "Bienes de Uso": {
-                    "Bienes de Uso / (-) Depreciaci\u00f3n Acumulada": {},
-                    "Bienes de Uso / Equipos": {},
-                    "Bienes de Uso / Inmuebles": {},
-                    "Bienes de Uso / Maquinaria": {},
-                    "Bienes de Uso / Rodados": {}
-                },
-                "Caja y Bancos": {
-                    "Caja y Bancos - Caja": {
-                        "Caja y bancos - Caja / efectivo ARS": {}
-                    },
-                    "Caja y Bancos - Cuentas Corrientes": {
-                        "Caja y Bancos.../ BCO. CTA CTE ARS": {}
-                    },
-                    "Caja y Bancos - Fondos fijos": {
-                        "Caja y ...- Fondos fijos / caja chica 01 ARS": {}
-                    },
-                    "Caja y Bancos - Moneda Extranjera": {
-                        "Caja y bancos - Caja / efectivo USD": {}
-                    },
-                    "Caja y bancos - Recaudaciones a Depositar ": {},
-                    "Caja y bancos - Valores a Depositar ": {}
-                },
-                "Inversiones": {
-                    "Inversiones / (-) Previsi\u00f3n para Devalorizaci\u00f3n de Acciones": {},
-                    "Inversiones / Acciones Permanentes": {},
-                    "Inversiones / Acciones Transitorias": {},
-                    "Inversiones / T\u00edtulos P\u00fablicos": {}
-                }
-            },
-            "Cr\u00e9ditos por Ventas": {
-                "Cr\u00e9ditos por Ventas / (-) Previsi\u00f3n para Ds. Incobrables": {},
-                "Cr\u00e9ditos por Ventas / Deudores Morosos": {},
-                "Cr\u00e9ditos por Ventas / Deudores Varios": {},
-                "Cr\u00e9ditos por Ventas / Deudores en Gesti\u00f3n Judicial": {},
-                "Cr\u00e9ditos por Ventas / Deudores por Ventas": {}
-            },
-            "Otros Cr\u00e9ditos": {
-                "Otros Cr\u00e9ditos / (-) Intereses (+) a Devengar": {},
-                "Otros Cr\u00e9ditos / (-) Previsi\u00f3n para Descuentos": {},
-                "Otros Cr\u00e9ditos / Accionistas": {},
-                "Otros Cr\u00e9ditos / Alquileres Pagados por Adelantado": {},
-                "Otros Cr\u00e9ditos / Anticipo al Personal": {},
-                "Otros Cr\u00e9ditos / Anticipo de Impuestos": {},
-                "Otros Cr\u00e9ditos / Anticipos a Proveedores": {},
-                "Otros Cr\u00e9ditos / Intereses Pagados por Adelantado": {},
-                "Otros Cr\u00e9ditos / Pr\u00e9stamos otorgados": {}
-            },
-            "PASIVO": {
-                "Deudas Bancarias y Financieras": {
-                    "Deudas Bancarias y Financieras / Adelantos en Cuenta Corriente": {},
-                    "Deudas Bancarias y Financieras / Debentures Emitidos": {},
-                    "Deudas Bancarias y Financieras / Intereses a Pagar": {},
-                    "Deudas Bancarias y Financieras / Obligaciones a Pagar": {},
-                    "Deudas Bancarias y Financieras / Prestamos": {}
-                },
-                "Deudas Comerciales": {
-                    "Deudas Comerciales / (-) Intereses a Devengar por Compras al Cr\u00e9dito": {},
-                    "Deudas Comerciales / Anticipos de Clientes": {},
-                    "Deudas Comerciales / Proveedores": {}
-                },
-                "Deudas Fiscales": {
-                    "Deudas Fiscales / IVA a Pagar": {},
-                    "Deudas Fiscales / Impuesto a la Ganancia M\u00ednima Presunta a Pagar": {},
-                    "Deudas Fiscales / Impuesto a las Ganancias a Pagar": {},
-                    "Deudas Fiscales / Impuesto a los D\u00e9bitos y Cr\u00e9ditos Bancarios a Pagar": {},
-                    "Deudas Fiscales / Impuesto sobre los Bienes Personales a Pagar": {},
-                    "Deudas Fiscales / Monotributo a Pagar": {}
-                },
-                "Deudas Sociales": {
-                    "Deudas Sociales / Cargas Sociales a Pagar": {},
-                    "Deudas Sociales / Provisi\u00f3n para Sueldo Anual Complementario": {},
-                    "Deudas Sociales / Retenciones a Depositar": {},
-                    "Deudas Sociales / Sueldos a Pagar": {}
-                },
-                "Otras Deudas": {
-                    "Otras Deudas / Acreedores Varios": {},
-                    "Otras Deudas / Cobros por Adelantado": {},
-                    "Otras Deudas / Dividendos a Pagar": {},
-                    "Otras Deudas / Honorarios Directores y S\u00edndicos a Pagar": {}
-                },
-                "Previsiones": {
-                    "Previsiones / Previsi\u00f3n Indemnizaci\u00f3n por Despidos": {},
-                    "Previsiones / Previsi\u00f3n para Garant\u00edas por Service": {},
-                    "Previsiones / Previsi\u00f3n para juicios Pendientes": {}
-                }
-            },
-            "PATRIMONIO NETO": {
-                "Ajustes al Patrimonio": {
-                    "Ajustes al Patrimonio / Revaluo T\u00e9cnico de Bienes de Uso": {}
-                },
-                "Aportes No Capitalizados": {
-                    "Aportes No Capitalizados / Aportes Irrevocables Futura Suscripci\u00f3n de Acciones": {},
-                    "Aportes No Capitalizados / Primas de Emsi\u00f3n": {}
-                },
-                "Capital Social": {
-                    "Capital social / (-) Descuento de Emisi\u00f3n de Acciones": {},
-                    "Capital social / Acciones en Circulaci\u00f3n": {},
-                    "Capital social / Capital Suscripto": {},
-                    "Capital social / Dividendos a Distribuir en Acciones": {}
-                },
-                "Ganancias Reservadas": {
-                    "Reserva Estatutaria": {},
-                    "Reserva Facultativa": {},
-                    "Reserva Legal": {},
-                    "Reserva para Renovaci\u00f3n de Bienes de Uso": {}
-                },
-                "Resultados No Asignados": {
-                    "Ganancias y P\u00e9rdidas del Ejercicio": {},
-                    "Resultado del Ejercicio": {},
-                    "Resultados Acumulados": {},
-                    "Resultados Acumulados del Ejercicio Anterior": {}
-                }
-            },
-            "root_type": ""
-        },
-        "Cuentas de Movimiento": {
-            "Compras": {
-                "Compras - Categoria de productos 01": {}
-            },
-            "Costos de Producci\u00f3n": {},
-            "Gastos de Administraci\u00f3n": {},
-            "Gastos de Comercializaci\u00f3n": {},
-            "root_type": ""
-        },
-        "Cuentas de Orden": {
-            "CUENTAS DE ORDEN ACREEDORAS": {
-                "Acreedor por Documentos Descontados": {},
-                "Acreedor por Garant\u00edas Otorgadas": {},
-                "Comitente por Mercaderias Recibidas en Consignaci\u00f3n": {}
-            },
-            "CUENTAS DE ORDEN DEUDORAS": {
-                "Dep\u00f3sito de Valores Recibos en Garant\u00eda": {},
-                "Documentos Descontados": {},
-                "Documentos Endosados": {},
-                "Garantias Otorgadas": {},
-                "Mercaderias Recibidas en Consignaci\u00f3n": {}
-            },
-            "root_type": ""
-        },
-        "Cuentas de Resultado": {
-            "RESULTADOS NEGATIVOS": {
-                "Resultados Negativos Extraordinarios": {
-                    "Donaciones Cedidas, Otorgadas": {},
-                    "Gastos en Siniestros": {},
-                    "P\u00e9rdida Venta Bienes de Uso": {}
-                },
-                "Resultados Negativos Ordinarios": {
-                    "Costo de Mercader\u00edas Vendidas": {
-                        "Costo de Mercader\u00edas Vendidas - Categoria de productos 01": {}
-                    },
-                    "Gastos Bancarios": {},
-                    "Gastos de Publicidad y Propaganda": {},
-                    "Gastos en Amortizaci\u00f3n": {},
-                    "Gastos en Cargas Sociales": {},
-                    "Gastos en Depreciaci\u00f3n de Bienes de Uso": {},
-                    "Gastos en Impuestos": {},
-                    "Gastos en Servicios P\u00fablicos": {},
-                    "Gastos en Sueldos y Jormales": {}
-                }
-            },
-            "RESULTADOS POSITIVOS": {
-                "Resultados Positivos Extraordinarios": {
-                    "Donaciones obtenidas, ganandas, percibidas": {},
-                    "Ganancia Venta Inversiones Permanentes": {},
-                    "Ganancia Venta de Bienes de Uso": {},
-                    "Recupero de Deudores Incobrables": {},
-                    "Recupero de Rezagos": {}
-                },
-                "Resultados Positivos Ordinarios": {
-                    "Alquileres gananados, obtenidos, percibidos": {},
-                    "Comisiones gananados, obtenidos, percibidos": {},
-                    "Descuentos gananados, obtenidos, percibidos": {},
-                    "Ganancia Venta de Acciones": {},
-                    "Honorarios gananados, obtenidos, percibidos": {},
-                    "Intereses gananados, obtenidos, percibidos": {},
-                    "Renta de T\u00edtulos P\u00fablicos": {},
-                    "Resultados Positivos Ordinarios": {
-                        "Ventas - Categoria de productos 01": {}
-                    }
-                }
-            },
-            "root_type": ""
-        }
-    }
-}
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ca_ca_en_chart_template_en.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ca_ca_en_chart_template_en.json
deleted file mode 100644
index 02c4609..0000000
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ca_ca_en_chart_template_en.json
+++ /dev/null
@@ -1,172 +0,0 @@
-{
-    "country_code": "ca",
-    "name": "Canada - Chart of Accounts for english-speaking provinces",
-    "tree": {
-        "ASSETS": {
-            "CURRENT ASSETS": {
-                "ACCOUNTS RECEIVABLES": {
-                    "ALLOWANCE FOR DOUBTFUL ACCOUNTS": {},
-                    "Customers Account": {
-                        "account_type": "Receivable"
-                    }
-                },
-                "CASH": {},
-                "CERTIFICATES OF DEPOSITS": {},
-                "INVESTMENTS HELD FOR TRADING": {},
-                "PREPAID EXPENSES": {},
-                "STOCKS": {
-                    "Stock Delivered But Not Billed": {},
-                    "Stock In Hand": {}
-                },
-                "TAXES RECEIVABLES": {
-                    "GST receivable": {
-                        "account_type": "Receivable"
-                    },
-                    "HST receivable": {
-                        "HST receivable - 13%": {
-                            "account_type": "Receivable"
-                        },
-                        "HST receivable - 14%": {
-                            "account_type": "Receivable"
-                        },
-                        "HST receivable - 15%": {
-                            "account_type": "Receivable"
-                        }
-                    },
-                    "PST/QST receivable": {
-                        "account_type": "Receivable"
-                    }
-                },
-                "TREASURY OR TREASURY EQUIVALENTS": {}
-            },
-            "NON-CURRENT ASSETS": {
-                "INTANGIBLE ASSETS": {
-                    "PATENTS, TRADEMARKS AND COPYRIGHTS": {}
-                },
-                "INVESTMENTS AVAILABLE FOR SALE": {},
-                "TANGIBLE ASSETS": {
-                    "ACCUMULATED DEPRECIATIONS": {}
-                }
-            },
-            "root_type": "Asset"
-        },
-        "EQUITY": {
-            "CONTRIBUTED SURPLUS": {},
-            "DIVIDENDS": {},
-            "PREMIUMS": {},
-            "RETAINED EARNINGS": {},
-            "SHARE CAPITAL": {},
-            "TRANSLATION ADJUSTMENTS": {},
-            "root_type": "Equity"
-        },
-        "EXPENSES": {
-            "NON-OPERATING EXPENSES": {
-                "INTERESTS EXPENSES": {},
-                "OTHER NON-OPERATING EXPENSES": {}
-            },
-            "OPERATING EXPENSES": {
-                "COST OF GOODS SOLD": {
-                    "Inside Purchases": {},
-                    "International Purchases": {},
-                    "Purchases in harmonized provinces": {},
-                    "Purchases in non-harmonized provinces": {}
-                },
-                "GENERAL EXPENSES": {},
-                "LABOUR EXPENSES": {
-                    "Annuities": {},
-                    "Employment Insurance": {},
-                    "Federal Income Tax": {},
-                    "Health Services Fund": {},
-                    "Holidays": {},
-                    "Labour Health and Safety": {},
-                    "Labour Standards": {},
-                    "Parental Insurance": {},
-                    "Provincial Income Tax": {},
-                    "Salaries, wages and commissions": {}
-                },
-                "OTHER OPERATING EXPENSES": {},
-                "RESEARCH AND DEVELOPMENT EXPENSES": {},
-                "SALES EXPENSES": {}
-            },
-            "root_type": "Expense"
-        },
-        "INCOMES": {
-            "NON-OPERATING INCOMES": {
-                "INTERESTS": {},
-                "OTHER NON-OPERATING INCOMES": {}
-            },
-            "OPERATING INCOMES": {
-                "Harmonized Provinces Sales": {},
-                "Inside Sales": {},
-                "International Sales": {},
-                "Non-Harmonized Provinces Sales": {},
-                "OTHER OPERATING INCOMES": {}
-            },
-            "root_type": "Income"
-        },
-        "LIABILITIES": {
-            "CURRENT LIABILITIES": {
-                "ACCOUNTS PAYABLES": {
-                    "Suppliers Account": {
-                        "account_type": "Payable"
-                    }
-                },
-                "CURRENT FINANCIAL DEBTS": {},
-                "LABOUR TAXES TO PAY": {
-                    "CANADIAN REVENU AGENCY": {
-                        "EMPLOYMENT INSURANCE TO PAY": {
-                            "EI - Employees Contribution": {},
-                            "EI - Employer Contribution": {}
-                        },
-                        "Federal Income Tax": {}
-                    },
-                    "PROVINCIAL REVENU AGENCY": {
-                        "ANNUITIES TO PAY": {
-                            "Annuities - Employees Contribution": {},
-                            "Annuities - Employer Contribution": {}
-                        },
-                        "Health Services Fund to pay": {},
-                        "Labour Health and Safety to pay": {},
-                        "Labour Standards to pay": {},
-                        "PARENTAL INSURANCE PLAN TO PAY": {
-                            "PAP - Employee Contribution": {},
-                            "PAP - Employer Contribution": {}
-                        },
-                        "Provincial Income Tax": {}
-                    }
-                },
-                "LIABILITIES ASSETS HELD FOR TRANSFER": {
-                    "Stock Received But Not Billed": {}
-                },
-                "OTHER ACCOUNTS PAYABLES": {},
-                "STOCK LIABILITIES": {},
-                "TAXES PAYABLES": {
-                    "GST to pay": {
-                        "account_type": "Payable"
-                    },
-                    "HST to pay": {
-                        "HST to pay - 13%": {
-                            "account_type": "Payable"
-                        },
-                        "HST to pay - 14%": {
-                            "account_type": "Payable"
-                        },
-                        "HST to pay - 15%": {
-                            "account_type": "Payable"
-                        }
-                    },
-                    "PST/QST to pay": {
-                        "account_type": "Payable"
-                    }
-                }
-            },
-            "NON-CURRENT LIABILITIES": {
-                "DEFERRED TAXES": {},
-                "NON-CURRENT FINANCIAL DEBTS": {},
-                "OTHER NON-CURRENT LIABILITIES": {},
-                "PROVISIONS FOR PENSIONS AND OTHER POST-EMPLOYMENT ADVANTAGES": {}
-            },
-            "root_type": "Liability"
-        }
-    }
-}
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/hu_hungarian_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/hu_hungarian_chart_template.json
deleted file mode 100644
index 85a49c5..0000000
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/hu_hungarian_chart_template.json
+++ /dev/null
@@ -1,355 +0,0 @@
-{
-    "country_code": "hu", 
-    "name": "Hungary - Magyar f\u0151k\u00f6nyvi kivonat", 
-    "tree": {
-        "Eredm\u00e9ny sz\u00e1ml\u00e1k": {
-            "AZ \u00c9RT\u00c9KES\u00cdT\u00c9S \u00c1RBEV\u00c9TELE, BEV\u00c9TELEK": {
-                "BELF\u00d6LDI \u00c9RK\u00c9KES\u00cdT\u00c9S \u00c1RBEV\u00c9TELE": {
-                    "Belf\u00f6ldi \u00e9rt\u00e9kes\u00edt\u00e9s \u00e1rbev\u00e9tele": {}
-                }, 
-                "BELF\u00d6LDI \u00c9RT\u00c9KES\u00cdT\u00c9S \u00c1RBEV\u00c9TELE": {
-                    "Belf\u00f6ldi \u00e9rt\u00e9kes\u00edt\u00e9s \u00e1rbev\u00e9tele": {}
-                }, 
-                "EGY\u00c9B BEV\u00c9TELEK": {
-                    "Az \u00fczleti \u00e9vhez kapcs. egy\u00e9b bev\u00e9telek": {}, 
-                    "Biztos\u00edt\u00f3 \u00e1ltal visszaig. k\u00e1rt\u00e9r\u00edt\u00e9s \u00f6.": {}, 
-                    "C\u00e9ltartal\u00e9k felhaszn\u00e1l\u00e1sa": {}, 
-                    "K\u00fcl\u00f6nf\u00e9le egy\u00e9b bev\u00e9telek": {}, 
-                    "Ut\u00f3lag kapott p\u00fc. rendezett engedm\u00e9ny": {}, 
-                    "Visszafiz. k\u00f6t. n\u00e9lk\u00fcl kapott t\u00e1mogat\u00e1s": {}, 
-                    "\u00c9rt,\u00e1truh\u00e1zott k\u00f6vetel\u00e9sek elism.m\u00e9rt\u00e9ke": {}, 
-                    "\u00c9rt.immat. javak, t\u00e1rgyi eszk.bev\u00e9tele": {}, 
-                    "\u00c9rt\u00e9kveszt\u00e9sek vissza\u00edr\u00e1sa, tervenf.\u00e9cs.": {}
-                }, 
-                "EXPORT \u00c9RT\u00c9KES\u00cdT\u00c9S \u00c1RBEV\u00c9TELE": {
-                    "Export \u00e9rt\u00e9kes\u00edt\u00e9s \u00e1rbev. EU tagorsz\u00e1gba": {}, 
-                    "Export \u00e9rt\u00e9kes\u00edt\u00e9s \u00e1rbev.nem EU tagorsz.": {}
-                }, 
-                "P\u00c9NZ\u00dcGYI M\u00dcVELETEK BEV\u00c9TELEI": {
-                    "Befekt. p\u00fci.eszk. kamatai, \u00e1rf.nyeres.": {}, 
-                    "Egy\u00e9b kapott kamatok,kamatjell.bev\u00e9telek": {}, 
-                    "Egy\u00e9b p\u00e9nz\u00fcgyi m\u00fbveletek bev\u00e9telei": {}, 
-                    "Egy\u00e9b \u00e1rfolyamnyeres\u00e9gek, opci\u00f3s bev.": {}, 
-                    "Forg\u00f3eszk. \u00e9rt\u00e9kpap\u00edr \u00e1rfolyamnyeres\u00e9ge": {}, 
-                    "Kapott (j\u00e1r\u00f3) osztal\u00e9k, r\u00e9szesed\u00e9s": {}, 
-                    "R\u00e9szesed\u00e9sek \u00e9rt. \u00e1rfolyamnyeres\u00e9ge": {}, 
-                    "V\u00e1s. k\u00f6vetel\u00e9sekkel kapcs. bev\u00e9telek": {}, 
-                    "\u00c1tv\u00e1lt\u00e1si, \u00e1t\u00e9rt\u00e9kel\u00e9skori \u00e1rf.nyeres\u00e9g": {}
-                }, 
-                "RENDKIV\u00dcLI BEV\u00c9TELEK": {
-                    "Rendk\u00edv\u00fcli bev\u00e9telek": {}
-                }
-            }, 
-            "AZ \u00c9RT\u00c9KES\u00cdT\u00c9S \u00d6NK\u00d6LTS. \u00c9S R\u00c1FORD\u00cdT\u00c1SOK": {
-                "ANYAGJELLEG\u00db R\u00c1FORD\u00cdT\u00c1SOK": {
-                    "Anyagk\u00f6lts\u00e9g": {}, 
-                    "Egy\u00e9b szolg\u00e1ltat\u00e1sok \u00e9rt\u00e9ke": {}, 
-                    "Eladott (k\u00f6zvet\u00edtett) szolg. \u00e9rt\u00e9ke": {}, 
-                    "Eladott \u00e1ruk beszerz\u00e9si \u00e9rt\u00e9ke": {}, 
-                    "Ig\u00e9nybevett szolg\u00e1ltat\u00e1sok \u00e9rt\u00e9ke": {}
-                }, 
-                "EGY\u00c9B R\u00c1FORD\u00cdT\u00c1SOK": {
-                    "Ad\u00f3k, illet\u00e9kek, hozz\u00e1j\u00e1rul\u00e1sok": {}, 
-                    "Az \u00fczleti \u00e9vhez kapcs. r\u00e1ford\u00edt\u00e1sok": {}, 
-                    "C\u00e9ltartal\u00e9k k\u00e9pz\u00e9se": {}, 
-                    "Elsz\u00e1molt \u00e9rt\u00e9kveszt\u00e9s, tervenf. \u00e9rt\u00e9kcs": {}, 
-                    "K\u00fcl\u00f6nf\u00e9le egy\u00e9b r\u00e1ford\u00edt\u00e1sok": {}, 
-                    "Ut\u00f3lag adott p\u00fc. rendezett engedm\u00e9ny": {}, 
-                    "\u00c9rt.\u00e1truh\u00e1zott k\u00f6vetel\u00e9sek k\u00f6nyvsz. \u00e9rt.": {}, 
-                    "\u00c9rt\u00e9kes\u00edtett eszk.imm.javak nytsz \u00e9rt\u00e9ke": {}
-                }, 
-                "NYERES\u00c9GET TERHEL\u00d6 AD\u00d3K": {
-                    "Egyszer\u00fcs\u00edtett v\u00e1llalkoz\u00f3i ad\u00f3": {}, 
-                    "T\u00e1rsas v\u00e1llalkoz\u00e1s k\u00fcl\u00f6nad\u00f3ja": {}, 
-                    "T\u00e1rsas\u00e1gi ad\u00f3": {}
-                }, 
-                "P\u00c9NZ\u00dcGYI M\u00dcVELETEK R\u00c1FORD\u00cdT\u00c1SAI": {
-                    "Befektetett p\u00fci. eszk. \u00e1rf.vesztes\u00e9ge": {}, 
-                    "Egy\u00e9b p\u00e9nz\u00fcgyi r\u00e1ford\u00edt\u00e1sok": {}, 
-                    "Egy\u00e9b \u00e1rfolyamvesztes\u00e9gek, opci\u00f3s d\u00edjak": {}, 
-                    "Fizetend\u00f5 kamatok, kamatjell. r\u00e1ford.": {}, 
-                    "Forg\u00f3eszk. \u00e9rt\u00e9kpap\u00edr \u00e1rf.vesztes\u00e9ge": {}, 
-                    "R\u00e9szesed\u00e9sek,\u00e9.pap\u00edrok,bankb. \u00e9rt\u00e9kveszt": {}, 
-                    "V\u00e1s\u00e1rolt k\u00f6v. kapcs. r\u00e1ford\u00edt\u00e1sok": {}, 
-                    "\u00c1tv\u00e1lt\u00e1si, \u00e9rt\u00e9kel\u00e9si \u00e1rfolyamvesztes\u00e9g": {}
-                }, 
-                "RENDKIV\u00dcLI R\u00c1FORD\u00cdT\u00c1SOK": {
-                    "Egy\u00e9b vagyoncs\u00f6kk. rendk\u00edv\u00fcli r\u00e1ford\u00edt\u00e1s": {}, 
-                    "Saj\u00e1t \u00fczletr\u00e9sz nyilv\u00e1ntart\u00e1si \u00e9rt\u00e9ke": {}, 
-                    "Tartoz\u00e1s\u00e1tv. szerz. szerinti \u00f6sszege": {}, 
-                    "T\u00e1rsas\u00e1gban bevitt eszk. nytsz. \u00e9rt\u00e9ke": {}
-                }, 
-                "SZEM\u00c9LYI JELLEG\u00fb R\u00c1FORD\u00cdT\u00c1SOK": {
-                    "B\u00e9rj\u00e1rul\u00e9kok": {}, 
-                    "B\u00e9rk\u00f6lts\u00e9g": {}, 
-                    "Szem\u00e9lyi jelleg\u00fc egy\u00e9b kifizet\u00e9sek": {}
-                }, 
-                "\u00c9RT\u00c9KCS\u00d6KKEN\u00c9SI LE\u00cdR\u00c1S": {}
-            }, 
-            "K\u00d6LTS\u00c9GNEMEK": {
-                "AKT\u00cdV\u00c1LT SAJ\u00c1T TELJES\u00cdTM\u00c9NYEK \u00c9RT\u00c9KE": {
-                    "Saj\u00e1t el\u00f5\u00e1ll\u00edt\u00e1si eszk\u00f6z\u00f6k aktiv\u00e1lt \u00e9rt.": {}, 
-                    "Saj\u00e1t term. k\u00e9szletek \u00e1llom\u00e1nyv\u00e1ltoz\u00e1sa": {}
-                }, 
-                "ANYAGK\u00d6LTS\u00c9G": {
-                    "Anyagk\u00f6lts\u00e9g megt\u00e9r\u00fcl\u00e9s": {}, 
-                    "Egy \u00e9ven bel\u00fcl elhaszn. anyagi eszk\u00f6z\u00f6k": {}, 
-                    "Egy\u00e9b anyagk\u00f6lts\u00e9g": {}, 
-                    "V\u00e1s\u00e1rolt anyagok k\u00f6lts\u00e9gei": {}
-                }, 
-                "B\u00c9RJ\u00c1RUL\u00c9KOK": {
-                    "Egyszer\u00fbs\u00edtett fogl. k\u00f6zteher": {}, 
-                    "Egyszer\u00fbs\u00edtett k\u00f6ztehervisel\u00e9si hj\u00e1r": {}, 
-                    "Eg\u00e9szs\u00e9g\u00fcgyi hozz\u00e1j\u00e1rul\u00e1s": {}, 
-                    "K\u00f6zteherjegy": {}, 
-                    "Munkaad\u00f3i j\u00e1rul\u00e9k": {}, 
-                    "Rehabilit\u00e1ci\u00f3s hozz\u00e1j\u00e1rul\u00e1s": {}, 
-                    "Szakk\u00e9pz\u00e9si hozz\u00e1j\u00e1rul\u00e1s": {}, 
-                    "T\u00e1rsadalombiztos\u00edt\u00e1si j\u00e1rul\u00e9k": {}
-                }, 
-                "B\u00c9RK\u00d6LTS\u00c9G": {
-                    "Egyszer\u00fbs\u00edtett fogl. b\u00e9rk\u00f6lts\u00e9ge": {}, 
-                    "Megb\u00edz\u00e1si d\u00edjak b\u00e9rk\u00f6lts\u00e9g terh\u00e9re": {}, 
-                    "Munkav\u00e1llal\u00f3k munkab\u00e9r k\u00f6lts\u00e9ge": {}, 
-                    "Tagok szem\u00e9lyes k\u00f6zr. ellen\u00e9rt\u00e9ke": {}
-                }, 
-                "EGY\u00c9B SZOLG\u00c1LTAT\u00c1SOK K\u00d6LTS\u00c9GEI": {
-                    "Biztos\u00edt\u00e1si d\u00edjak": {}, 
-                    "Hat\u00f3s\u00e1gi igazgat\u00e1si d\u00edjak (illet\u00e9kek)": {}, 
-                    "P\u00e9nz\u00fcgyi szolg-i d\u00edjak, bankk\u00f6lts\u00e9gek": {}
-                }, 
-                "IG\u00c9NYBE VETT SZOLG\u00c1LTAT\u00c1SOK K\u00d6LTS\u00c9GEI": {
-                    "B\u00e9rleti d\u00edjak": {}, 
-                    "Egy\u00e9b ig\u00e9nybevett szolg\u00e1ltat\u00e1sok ktg-ei": {}, 
-                    "Hirdet\u00e9s, rekl\u00e1m-propaganda k\u00f6lts\u00e9g": {}, 
-                    "Jav\u00edt\u00e1si, karbantart\u00e1si k\u00f6lts\u00e9gek": {}, 
-                    "Oktat\u00e1si, tov\u00e1bbk\u00e9pz\u00e9si k\u00f6lts\u00e9gek": {}, 
-                    "Postai, t\u00e1vk\u00f6zl\u00e9si k\u00f6lts\u00e9gek": {}, 
-                    "Szakk\u00f6nyv, foly\u00f3irat, napilap beszerz\u00e9s": {}, 
-                    "Sz\u00e1ll\u00edt\u00e1si, rakod\u00e1si k\u00f6lts\u00e9g": {}, 
-                    "Utaz\u00e1si- \u00e9s kik\u00fcldet\u00e9si k\u00f6lts\u00e9gek": {}
-                }, 
-                "K\u00d6LTS\u00c9GNEM \u00c1TVEZET\u00c9SI SZ\u00c1MLA": {
-                    "Anyagk\u00f6lts\u00e9g \u00e1tvezet\u00e9si szla": {}, 
-                    "B\u00e9rj\u00e1rul\u00e9kok \u00e1tvezet\u00e9si szla": {}, 
-                    "B\u00e9rk\u00f6lts\u00e9g \u00e1tvezet\u00e9si szla": {}, 
-                    "Egy\u00e9b szolg\u00e1ltat\u00e1sok \u00e1tvezet\u00e9si szla": {}, 
-                    "Ig\u00e9nybevett szolg. \u00e1tvezet\u00e9si szla": {}, 
-                    "Szem\u00e9lyi jell. kif. \u00e1tvezet\u00e9si szla": {}, 
-                    "\u00c9rt\u00e9kcs\u00f6kken\u00e9si le\u00edr\u00e1s \u00e1tvez. szla": {}
-                }, 
-                "SZEM\u00c9LYI JELLEG\u00fb EGY\u00c9B KIFIZET\u00c9SEK": {
-                    "Egy\u00e9b szem\u00e9lyi jelleg\u00fb kifizet\u00e9sek": {}, 
-                    "Foglalkoztat\u00f3t terhel\u00f5 t\u00e1pp\u00e9nz hj\u00e1rul\u00e1s": {}, 
-                    "J\u00f3l\u00e9ti \u00e9s kultur\u00e1lis k\u00f6lts\u00e9gek": {}, 
-                    "Kifizet\u00f5t terhel\u00f5 szem\u00e9lyi j\u00f6vedelemad\u00f3": {}, 
-                    "Mag\u00e1nnyugd\u00edjp\u00e9nzt\u00e1ri tagd\u00edjak, hozz\u00e1j\u00e1r.": {}, 
-                    "Szem\u00e9lyi jelleg\u00fb kifizet\u00e9sek": {}, 
-                    "Term\u00e9szetbeni juttat\u00e1sok": {}
-                }, 
-                "\u00c9RT\u00c9KCS\u00d6KKEN\u00c9SI LE\u00cdR\u00c1S": {
-                    "Terv szerinti egy\u00f6sszeg\u00fb (kis\u00e9rt\u00e9k\u00fbek)": {}, 
-                    "Terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9s line\u00e1ris": {}
-                }
-            }, 
-            "root_type": ""
-        }, 
-        "M\u00e9rleg sz\u00e1ml\u00e1k": {
-            "BEFEKTETETT ESZK\u00d6Z\u00d6K": {
-                "BEFEKTETETT P\u00fc.I ESZK\u00d6Z\u00d6K R\u00c9SZESED\u00c9SEK": {
-                    "Egy\u00e9b tart\u00f3s r\u00e9szesed\u00e9s": {}, 
-                    "R\u00e9szesed\u00e9sek \u00e9rt\u00e9khelyesb\u00edt\u00e9se": {}, 
-                    "R\u00e9szesed\u00e9sek \u00e9rt\u00e9kveszt\u00e9se, vissza\u00edr\u00e1sa": {}, 
-                    "Tart\u00f3s r\u00e9szesed\u00e9s kapcs. v\u00e1llalkoz\u00e1sban": {}
-                }, 
-                "BERUH\u00c1Z\u00c1SOK, FEL\u00faJ\u00cdT\u00c1SOK": {
-                    "Befejezetlen beruh\u00e1z\u00e1sok": {}, 
-                    "Beruh\u00e1z\u00e1sok terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kk.": {}, 
-                    "Fel\u00faj\u00edt\u00e1sok": {}
-                }, 
-                "EGY\u00c9B BERENDEZ\u00c9SEK, FELSZ., J\u00c1RM\u00dcVEK": {
-                    "Egy\u00e9b g\u00e9pek,felsz,j\u00e1rm. \u00e9rt\u00e9khelyesb\u00edt\u00e9s": {}, 
-                    "Egy\u00e9b j\u00e1rm\u00fbvek": {}, 
-                    "Irodai, igazgat\u00e1si berendez\u00e9sek": {}, 
-                    "\u00dczemi berendez\u00e9sek, g\u00e9pek,felszerel\u00e9sek": {}, 
-                    "\u00dczemk\u00f6r\u00f6n kiv\u00fcli berendez\u00e9sek, felsz.": {}
-                }, 
-                "HITELVISZONYT MEGTESTES\u00cdT\u00d6 \u00c9RT\u00c9KPAP\u00cdROK": {
-                    "Egy\u00e9b v\u00e1llalkoz\u00e1sok \u00e9rt\u00e9kpap\u00edrjai": {}, 
-                    "Kapcsolt v\u00e1llalkoz\u00e1sok \u00e9rt\u00e9kpap\u00edrjai": {}, 
-                    "Tart\u00f3s diszkont \u00e9rt\u00e9kpap\u00edrok": {}, 
-                    "\u00c1llamk\u00f6tv\u00e9nyek": {}, 
-                    "\u00c9rt\u00e9kpap\u00edrok \u00e9rt\u00e9kveszt\u00e9se, vissza\u00edr\u00e1sa": {}
-                }, 
-                "IMMATERI\u00c1LIS JAVAK": {
-                    "Alap\u00edt\u00e1s-\u00e1tszervez\u00e9s akt\u00edv\u00e1lt \u00e9rt\u00e9ke": {}, 
-                    "Immateri\u00e1lis javak \u00e9rt\u00e9khelyesb\u00edt\u00e9se": {}, 
-                    "K\u00eds\u00e9rleti fejleszt\u00e9s akt\u00edv\u00e1lt \u00e9rt\u00e9ke": {}, 
-                    "Szellemi term\u00e9kek": {}, 
-                    "Vagyoni \u00e9rt\u00e9k\u00fb jogok": {}, 
-                    "\u00dczleti vagy c\u00e9g\u00e9rt\u00e9k": {}
-                }, 
-                "INGATLANOK, KAPCS. VAGYONI \u00c9RT. JOGOK": {
-                    "Egy\u00e9b \u00e9p\u00edtm\u00e9nyek": {}, 
-                    "F\u00f6ldter\u00fclet": {}, 
-                    "Ingatlanhoz kapcs. vagyoni \u00e9rt. jogok": {}, 
-                    "Ingatlanok \u00e9rt\u00e9khelyesb\u00edt\u00e9se": {}, 
-                    "Telek, telkes\u00edt\u00e9s": {}, 
-                    "\u00c9p\u00fcletek,\u00e9p\u00fcletr\u00e9szek,tulajdoni h\u00e1nyadok": {}, 
-                    "\u00dczemk\u00f6r\u00f6n kiv\u00fcli ingatlanok, \u00e9p\u00fcletek": {}
-                }, 
-                "M\u00dcSZAKI BERENDEZ\u00c9SEK, G\u00c9PEK, J\u00c1RM\u00dcVEK": {
-                    "M\u00fcszaki g\u00e9pek,felsz,j\u00e1rm. \u00e9rt\u00e9khelyesb.": {}, 
-                    "Termel\u00e9sben r\u00e9sztvev\u00f5 j\u00e1rm\u00fbvek": {}, 
-                    "Termel\u00f5 g\u00e9pek, berendez\u00e9sek, gy\u00e1rt\u00f3eszk.": {}
-                }, 
-                "TART\u00d3SAN ADOTT K\u00d6LCS\u00d6N\u00d6K": {
-                    "Egy\u00e9b tart\u00f3s bankbet\u00e9tek": {}, 
-                    "Egy\u00e9b tart\u00f3san adott k\u00f6lcs\u00f6n\u00f6k": {}, 
-                    "P\u00e9nz\u00fcgyi l\u00edzing miatti tart\u00f3s k\u00f6vetel\u00e9s": {}, 
-                    "Tart\u00f3s bankbet\u00e9tek egy\u00e9b r\u00e9sz. v\u00e1ll.-ban": {}, 
-                    "Tart\u00f3s bankbet\u00e9tek kapcs. v\u00e1ll.-ban": {}, 
-                    "Tart\u00f3san adott k\u00f6lcs\u00f6n egy\u00e9b r\u00e9sz.v\u00e1ll.": {}, 
-                    "Tart\u00f3san adott k\u00f6lcs\u00f6n\u00f6k kapcs. v\u00e1ll.": {}, 
-                    "Tart\u00f3san adott k\u00f6lcs\u00f6n\u00f6k \u00e9rt\u00e9kveszt\u00e9se": {}
-                }, 
-                "TENY\u00c9SZ\u00c1LLATOK": {
-                    "Teny\u00e9sz\u00e1llatok": {}
-                }
-            }, 
-            "FORR\u00c1SOK (PASSZ\u00cdV\u00c1K)": {
-                "C\u00c9LTARTAL\u00c9KOK": {
-                    "C\u00e9ltartal\u00e9k v\u00e1rhat\u00f3 k\u00f6telezetts\u00e9gre": {}
-                }, 
-                "EGY\u00c9B R\u00d6VID LEJ\u00c1RAT\u00fa K\u00d6TELEZETTS\u00c9GEK": {
-                    "El\u00f5zetesen felsz\u00e1m\u00edtott \u00e1lt.forgalmi ad\u00f3": {}, 
-                    "Fizetend\u00f5 \u00e1ltal\u00e1nos forgalmi ad\u00f3": {}, 
-                    "K\u00f6lts\u00e9gvet\u00e9si befizet\u00e9si k\u00f6t.teljes\u00edt\u00e9se": {}, 
-                    "K\u00f6lts\u00e9gvet\u00e9si befizet\u00e9si k\u00f6telezetts\u00e9gek": {}, 
-                    "Szem\u00e9lyi j\u00f6vedelemad\u00f3 elsz\u00e1mol\u00e1sa": {}, 
-                    "T\u00e1rsas\u00e1gi ad\u00f3 \u00e9s osztal\u00e9kad\u00f3 elsz\u00e1mol\u00e1s": {}, 
-                    "V\u00e1m- \u00e9s P\u00e9nz\u00fcgy\u00f5rs\u00e9g elsz\u00e1mol\u00e1si sz\u00e1mla": {}, 
-                    "\u00c1fa p\u00e9nz\u00fcgyi elsz\u00e1mol\u00e1si sz\u00e1mla": {}, 
-                    "\u00d6nkorm\u00e1nyzati ad\u00f3k elsz\u00e1mol\u00e1si sz\u00e1mla": {}
-                }, 
-                "HOSSZ\u00da LEJ\u00c1RAT\u00da K\u00d6TELEZETTS\u00c9GEK": {
-                    "Beruh\u00e1z\u00e1si \u00e9s fejleszt\u00e9si hitelek": {}, 
-                    "Egy\u00e9b hossz\u00fa lej. k\u00f6telezetts\u00e9gek": {}, 
-                    "Egy\u00e9b hossz\u00fa lej\u00e1rat\u00fa hitelek": {}, 
-                    "Hossz\u00fa lej\u00e1ratra kapott k\u00f6lcs\u00f6n\u00f6k": {}, 
-                    "P\u00e9nz\u00fcgyi l\u00edzinggel kapcsolatos k\u00f6telez.": {}, 
-                    "Tartoz\u00e1sok k\u00f6tv\u00e9nykibocs\u00e1t\u00e1sb\u00f3l": {}, 
-                    "Tart\u00f3s k\u00f6t. egy\u00e9b r\u00e9sz. v\u00e1ll. szemben": {}, 
-                    "Tart\u00f3s k\u00f6t. kapcs. v\u00e1llalkoz\u00e1ssal sz.": {}, 
-                    "\u00c1tv\u00e1ltoztathat\u00f3 k\u00f6tv\u00e9nyek": {}
-                }, 
-                "H\u00c1TRASOROLT K\u00d6TELEZETTS\u00c9GEK": {
-                    "H\u00e1trasorolt k\u00f6telezetts\u00e9g": {}
-                }, 
-                "PASSZ\u00cdV ID\u00d6BELI ELHAT\u00c1ROL\u00c1S": {
-                    "Bev\u00e9telek passz\u00edv id\u00f5beli elhat\u00e1rol\u00e1sa": {}, 
-                    "Halasztott bev\u00e9telek": {}, 
-                    "K\u00f6lts\u00e9gek,r\u00e1ford. passz\u00edv id\u00f5beli elhat.": {}
-                }, 
-                "R\u00d6VID LEJ\u00c1RAT\u00fa K\u00d6TELEZETTS\u00c9GEK": {
-                    "R\u00f6vid lej\u00e1rat\u00fa hitelek": {}, 
-                    "R\u00f6vid lej\u00e1rat\u00fa k\u00f6lcs\u00f6n\u00f6k": {}, 
-                    "Sz\u00e1ll\u00edt\u00f3k": {
-                        "Belf\u00f6ldi sz\u00e1ll\u00edt\u00f3k": {
-                            "account_type": "Payable"
-                        }, 
-                        "K\u00fclf\u00f6ldi sz\u00e1ll\u00edt\u00f3k": {
-                            "account_type": "Payable"
-                        }
-                    }, 
-                    "Vev\u00f5kt\u00f5l kapott el\u00f5legek": {}
-                }, 
-                "SAJ\u00c1T T\u00d6KE": {
-                    "Eredm\u00e9nytartal\u00e9k": {}, 
-                    "Jegyzett t\u00f5ke": {}, 
-                    "Lek\u00f6t\u00f6tt tartal\u00e9k": {}, 
-                    "M\u00e9rleg szerinti eredm\u00e9ny": {}, 
-                    "T\u00f5ketartal\u00e9k": {}, 
-                    "\u00c9rt\u00e9kel\u00e9si tartal\u00e9k": {}
-                }, 
-                "\u00c9VI M\u00c9RLEG SZ\u00c1ML\u00c1K": {
-                    "Nyit\u00f3m\u00e9rleg sz\u00e1mla": {}
-                }
-            }, 
-            "K\u00c9SZLETEK": {
-                "ANYAGOK": {
-                    "Seg\u00e9danyagok": {}
-                }, 
-                "BEFEJEZETLEN TERMEL\u00c9S \u00c9S F\u00c9LK\u00c9SZTERM\u00c9KEK": {
-                    "Befejezetlen termel\u00e9s": {}
-                }, 
-                "BET\u00c9TD\u00cdJAS G\u00d6NGY\u00d6LEGEK": {
-                    "Bet\u00e9td\u00edjas g\u00f6ngy\u00f6legek": {}
-                }, 
-                "K\u00c9SZTERM\u00c9KEK": {
-                    "K\u00e9szterm\u00e9kek": {}
-                }, 
-                "K\u00d6ZVET\u00cdTETT SZOLG\u00c1LTAT\u00c1SOK": {
-                    "K\u00f6zvet\u00edtett szolg\u00e1ltat\u00e1sok": {}
-                }, 
-                "\u00c1RUK": {
-                    "\u00c1ruk beszerz\u00e9si \u00e1ron": {}
-                }
-            }, 
-            "K\u00d6VETEL\u00c9SEK,P\u00c9NZ\u00dcGYI ESZK,AKT\u00cdV ID\u00d6B.ELH": {
-                "ADOTT EL\u00d6LEGEK": {
-                    "Adott el\u00f5legek": {}
-                }, 
-                "AKT\u00cdV ID\u00d6BELI ELHAT\u00c1ROL\u00c1S": {
-                    "Akt\u00edv id\u00f5beli elhat\u00e1rol\u00e1sa": {}
-                }, 
-                "EGY\u00c9B K\u00d6VETEL\u00c9SEK": {
-                    "K\u00fcl\u00f6nf\u00e9le egy\u00e9b k\u00f6vetel\u00e9sek": {}, 
-                    "Munkav\u00e1llal\u00f3kkal szembeni k\u00f6vetel\u00e9s": {}
-                }, 
-                "K\u00d6VETEL\u00c9SEK \u00c1RUSZ\u00c1LL.- SZOLG\u00c1LTAT\u00c1SB\u00d3L": {
-                    "Belf\u00f6ldi k\u00f6vetel\u00e9sek": {
-                        "account_type": "Receivable"
-                    }, 
-                    "K\u00fclf\u00f6ldi k\u00f6vetel\u00e9sek": {
-                        "account_type": "Receivable"
-                    }
-                }, 
-                "P\u00c9NZESZK\u00d6Z\u00d6K": {
-                    "Deviza bet\u00e9tsz\u00e1mla": {
-                        "account_type": "Bank"
-                    }, 
-                    "Elk\u00fcl\u00f6n\u00edtett bet\u00e9tsz\u00e1ml\u00e1k": {
-                        "account_type": "Bank"
-                    }, 
-                    "Elsz\u00e1mol\u00e1si bet\u00e9tsz\u00e1mla": {
-                        "Banksz\u00e1mla": {
-                            "account_type": "Bank"
-                        }
-                    }, 
-                    "P\u00e9nzhelyettes\u00edt\u00f5 eszk. (utalv\u00e1ny, jegy)": {
-                        "account_type": "Bank"
-                    }, 
-                    "P\u00e9nzt\u00e1rak": {
-                        "P\u00e9nzt\u00e1r": {
-                            "account_type": "Cash"
-                        }
-                    }, 
-                    "Valuta p\u00e9nzt\u00e1r": {
-                        "account_type": "Cash"
-                    }, 
-                    "\u00c1tvezet\u00e9si sz\u00e1mla": {
-                        "account_type": "Bank"
-                    }
-                }, 
-                "\u00c9RT\u00c9KPAP\u00cdROK": {
-                    "Egy\u00e9b r\u00e9szesed\u00e9s": {}, 
-                    "Forgat\u00e1si c\u00e9l\u00fa hitelv. m. \u00e9rt\u00e9kpap\u00edrok": {}, 
-                    "R\u00e9szesed\u00e9s kapcsolt v\u00e1llalkoz\u00e1sban": {}, 
-                    "Saj\u00e1t r\u00e9szv\u00e9nyek, saj\u00e1t \u00fczletr\u00e9szek": {}
-                }
-            }, 
-            "root_type": ""
-        }
-    }
-}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/nl_l10nnl_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/nl_l10nnl_chart_template.json
deleted file mode 100644
index 8009a10..0000000
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/nl_l10nnl_chart_template.json
+++ /dev/null
@@ -1,716 +0,0 @@
-{
-    "country_code": "nl", 
-    "name": "Nederlands - Grootboekschema", 
-    "tree": {
-        "FABRIKAGEREKENINGEN": {
-            "root_type": ""
-        }, 
-        "FINANCIELE REKENINGEN, KORTLOPENDE VORDERINGEN EN SCHULDEN": {
-            "KORTLOPENDE SCHULDEN": {
-                "Accountantskosten": {}, 
-                "Af te dragen Btw-verlegd": {
-                    "account_type": "Tax"
-                }, 
-                "Afdracht loonheffing": {}, 
-                "Btw af te dragen hoog": {
-                    "account_type": "Tax"
-                }, 
-                "Btw af te dragen laag": {
-                    "account_type": "Tax"
-                }, 
-                "Btw af te dragen overig": {
-                    "account_type": "Tax"
-                }, 
-                "Btw oude jaren": {
-                    "account_type": "Tax"
-                }, 
-                "Btw te vorderen hoog": {
-                    "account_type": "Tax"
-                }, 
-                "Btw te vorderen laag": {
-                    "account_type": "Tax"
-                }, 
-                "Btw te vorderen overig": {
-                    "account_type": "Tax"
-                }, 
-                "Btw-afdracht": {
-                    "account_type": "Tax"
-                }, 
-                "Crediteuren": {
-                    "account_type": "Payable"
-                }, 
-                "Dividend": {}, 
-                "Dividendbelasting": {}, 
-                "Energiekosten": {}, 
-                "Investeringsaftrek": {}, 
-                "Loonheffing": {}, 
-                "Overige te betalen posten": {}, 
-                "Pensioenpremies": {}, 
-                "Premie WIR": {}, 
-                "Rekening-courant inkoopvereniging": {}, 
-                "Rente": {}, 
-                "Sociale lasten": {}, 
-                "Tanti\u00e8mes": {}, 
-                "Te vorderen Btw-verlegd": {
-                    "account_type": "Tax"
-                }, 
-                "Telefoon/telefax": {}, 
-                "Termijnen onderh. werk": {}, 
-                "Vakantiedagen": {}, 
-                "Vakantiegeld": {}, 
-                "Vakantiezegels": {}, 
-                "Vennootschapsbelasting": {}, 
-                "Vooruit ontvangen bedr.": {}
-            }, 
-            "LIQUIDE MIDDELEN": {
-                "ABN-AMRO bank": {
-                    "account_type": "Cash"
-                }, 
-                "BIZNER bank": {
-                    "account_type": "Cash"
-                }, 
-                "Bankbetaalkaarten": {}, 
-                "Effecten": {}, 
-                "Girobetaalkaarten": {}, 
-                "Kas": {
-                    "account_type": "Cash"
-                }, 
-                "Kas  valuta": {
-                    "account_type": "Cash"
-                }, 
-                "Kleine kas": {
-                    "account_type": "Cash"
-                }, 
-                "Kruisposten": {}, 
-                "Postbank": {
-                    "account_type": "Cash"
-                }, 
-                "RABO bank": {
-                    "account_type": "Cash"
-                }
-            }, 
-            "VORDERINGEN": {
-                "Debiteuren": {
-                    "account_type": "Receivable"
-                }, 
-                "Dubieuze debiteuren": {}, 
-                "Overige vorderingen": {}, 
-                "Rekening-courant directie": {}, 
-                "Te ontvangen ziekengeld": {}, 
-                "Voorschotten personeel": {}, 
-                "Vooruitbetaalde kosten": {}, 
-                "Voorziening dubieuze debiteuren": {}
-            }, 
-            "root_type": ""
-        }, 
-        "INDIRECTE KOSTEN": {
-            "root_type": ""
-        }, 
-        "KOSTENREKENINGEN": {
-            "AFSCHRIJVINGEN": {
-                "Aanhangwagens": {}, 
-                "Aankoopkosten": {}, 
-                "Aanloopkosten": {}, 
-                "Auteursrechten": {}, 
-                "Bedrijfsgebouwen": {}, 
-                "Bedrijfsinventaris": {}, 
-                "Drankvergunningen": {}, 
-                "Fabrieksinventaris": {}, 
-                "Gebouwen": {}, 
-                "Gereedschappen": {}, 
-                "Goodwill": {}, 
-                "Grondverbetering": {}, 
-                "Heftrucks": {}, 
-                "Kantine-inventaris": {}, 
-                "Kantoorinventaris": {}, 
-                "Kantoormachines": {}, 
-                "Licenties": {}, 
-                "Machines": {}, 
-                "Magazijninventaris": {}, 
-                "Octrooien": {}, 
-                "Ontwikkelingskosten": {}, 
-                "Pachtersinvestering": {}, 
-                "Parkeerplaats": {}, 
-                "Personenauto's": {}, 
-                "Rijwielen en bromfietsen": {}, 
-                "Tonnagevergunningen": {}, 
-                "Verbouwingen": {}, 
-                "Vergunningen": {}, 
-                "Voorraadverschillen": {}, 
-                "Vrachtauto's": {}, 
-                "Winkels": {}, 
-                "Woon-winkelhuis": {}
-            }, 
-            "ALGEMENE KOSTEN": {
-                "Accountantskosten": {}, 
-                "Advieskosten": {}, 
-                "Assuranties": {}, 
-                "Bankkosten": {}, 
-                "Juridische kosten": {}, 
-                "Overige algemene kosten": {}, 
-                "Toev. Ass. eigen risico": {}
-            }, 
-            "BEDRIJFSKOSTEN": {
-                "Assuranties": {}, 
-                "Energie (krachtstroom)": {}, 
-                "Gereedschappen": {}, 
-                "Hulpmaterialen": {}, 
-                "Huur inventaris": {}, 
-                "Huur machines": {}, 
-                "Leasing invent.operational": {}, 
-                "Leasing mach. operational": {}, 
-                "Onderhoud inventaris": {}, 
-                "Onderhoud machines": {}, 
-                "Ophalen/vervoer afval": {}, 
-                "Overige bedrijfskosten": {}
-            }, 
-            "FINANCIERINGSKOSTEN": {
-                "Overige rentebaten": {}, 
-                "Overige rentelasten": {}, 
-                "Rente bankkrediet": {}, 
-                "Rente huurkoopcontracten": {}, 
-                "Rente hypotheek": {}, 
-                "Rente leasecontracten": {}, 
-                "Rente lening o/g": {}, 
-                "Rente lening u/g": {}
-            }, 
-            "HUISVESTINGSKOSTEN": {
-                "Assurantie onroerend goed": {}, 
-                "Belastingen onr. Goed": {}, 
-                "Energiekosten": {}, 
-                "Groot onderhoud onr. Goed": {}, 
-                "Huur": {}, 
-                "Huurwaarde woongedeelte": {}, 
-                "Onderhoud onroerend goed": {}, 
-                "Ontvangen huren": {}, 
-                "Overige huisvestingskosten": {}, 
-                "Pacht": {}, 
-                "Schoonmaakkosten": {}, 
-                "Toevoeging egalisatieres. Groot onderhoud": {}
-            }, 
-            "KANTOORKOSTEN": {
-                "Administratiekosten": {}, 
-                "Contributies/abonnementen": {}, 
-                "Huur kantoorapparatuur": {}, 
-                "Internetaansluiting": {}, 
-                "Kantoorbenodigdh./drukw.": {}, 
-                "Onderhoud kantoorinvent.": {}, 
-                "Overige kantoorkosten": {}, 
-                "Porti": {}, 
-                "Telefoon/telefax": {}
-            }, 
-            "OVERIGE BATEN EN LASTEN": {
-                "Betaalde schadevergoed.": {}, 
-                "Boekverlies vaste activa": {}, 
-                "Boekwinst van vaste activa": {}, 
-                "K.O. regeling OB": {}, 
-                "Kasverschillen": {}, 
-                "Kosten loonbelasting": {}, 
-                "Kosten omzetbelasting": {}, 
-                "Nadelige koersverschillen": {}, 
-                "Naheffing bedrijfsver.": {}, 
-                "Ontvangen schadevergoed.": {}, 
-                "Overige baten": {}, 
-                "Overige lasten": {}, 
-                "Voordelige koersverschil.": {}
-            }, 
-            "PERSONEELSKOSTEN": {
-                "Autokostenvergoeding": {}, 
-                "Bedrijfskleding": {}, 
-                "Belastingvrije uitkeringen": {}, 
-                "Bijzondere beloningen": {}, 
-                "Congressen, seminars en symposia": {}, 
-                "Gereedschapsgeld": {}, 
-                "Geschenken personeel": {}, 
-                "Gratificaties": {}, 
-                "Inhouding pensioenpremies": {}, 
-                "Inhouding sociale lasten": {}, 
-                "Kantinekosten": {}, 
-                "Lonen en salarissen": {}, 
-                "Loonwerk": {}, 
-                "Managementvergoedingen": {}, 
-                "Opleidingskosten": {}, 
-                "Oprenting stamrechtverpl.": {}, 
-                "Overhevelingstoeslag": {}, 
-                "Overige kostenverg.": {}, 
-                "Overige personeelskosten": {}, 
-                "Overige uitkeringen": {}, 
-                "Pensioenpremies": {}, 
-                "Provisie": {}, 
-                "Reiskosten": {}, 
-                "Rijwielvergoeding": {}, 
-                "Sociale lasten": {}, 
-                "Tanti\u00e8mes": {}, 
-                "Thuiswerkers": {}, 
-                "Toev. Backservice pens.verpl.": {}, 
-                "Toevoeging pensioenverpl.": {}, 
-                "Uitkering ziekengeld": {}, 
-                "Uitzendkrachten": {}, 
-                "Vakantiebonnen": {}, 
-                "Vakantiegeld": {}, 
-                "Vergoeding studiekosten": {}, 
-                "Wervingskosten personeel": {}
-            }, 
-            "VERKOOPKOSTEN": {
-                "Advertenties": {}, 
-                "Afschrijving dubieuze deb.": {}, 
-                "Beurskosten": {}, 
-                "Etalagekosten": {}, 
-                "Exportkosten": {}, 
-                "Kascorrecties": {}, 
-                "Overige verkoopkosten": {}, 
-                "Provisie": {}, 
-                "Reclame": {}, 
-                "Reis en verblijfkosten": {}, 
-                "Relatiegeschenken": {}, 
-                "Representatiekosten": {}, 
-                "Uitgaande vrachten": {}, 
-                "Veilingkosten": {}, 
-                "Verpakkingsmateriaal": {}, 
-                "Websitekosten": {}
-            }, 
-            "VERVOERSKOSTEN": {
-                "Assuranties auto's": {}, 
-                "Brandstoffen": {}, 
-                "Leasing auto's": {}, 
-                "Onderhoud personenauto's": {}, 
-                "Onderhoud vrachtauto's": {}, 
-                "Overige vervoerskosten": {}, 
-                "Priv\u00e9-gebruik auto's": {}, 
-                "Wegenbelasting": {}
-            }, 
-            "root_type": ""
-        }, 
-        "OVERIGE RESULTATEN": {
-            "Memoriaal": {
-                "account_type": "Cash"
-            }, 
-            "Opbrengsten deelnemingen": {}, 
-            "Reorganisatiekosten": {}, 
-            "Verlies verkoop deelnem.": {}, 
-            "Voorz. Verlies deelnem.": {}, 
-            "Vpb bijzonder resultaat": {}, 
-            "Vpb normaal resultaat": {}, 
-            "Winst": {}, 
-            "Winst bij verkoop deelnem.": {}, 
-            "root_type": ""
-        }, 
-        "TUSSENREKENINGEN": {
-            "Betaalwijze cadeaubonnen": {
-                "account_type": "Cash"
-            }, 
-            "Betaalwijze chipknip": {
-                "account_type": "Cash"
-            }, 
-            "Betaalwijze contant": {
-                "account_type": "Cash"
-            }, 
-            "Betaalwijze pin": {
-                "account_type": "Cash"
-            }, 
-            "Inkopen Nederland hoog": {
-                "account_type": "Cash"
-            }, 
-            "Inkopen Nederland laag": {
-                "account_type": "Cash"
-            }, 
-            "Inkopen Nederland onbelast": {
-                "account_type": "Cash"
-            }, 
-            "Inkopen Nederland overig": {
-                "account_type": "Cash"
-            }, 
-            "Inkopen Nederland verlegd": {
-                "account_type": "Cash"
-            }, 
-            "Inkopen binnen EU hoog": {
-                "account_type": "Cash"
-            }, 
-            "Inkopen binnen EU laag": {
-                "account_type": "Cash"
-            }, 
-            "Inkopen binnen EU overig": {
-                "account_type": "Cash"
-            }, 
-            "Inkopen buiten EU hoog": {
-                "account_type": "Cash"
-            }, 
-            "Inkopen buiten EU laag": {
-                "account_type": "Cash"
-            }, 
-            "Inkopen buiten EU overig": {
-                "account_type": "Cash"
-            }, 
-            "Kassa 1": {
-                "account_type": "Cash"
-            }, 
-            "Kassa 2": {
-                "account_type": "Cash"
-            }, 
-            "Netto lonen": {
-                "account_type": "Cash"
-            }, 
-            "Tegenrekening Inkopen": {
-                "account_type": "Cash"
-            }, 
-            "Tussenrek. autom. betalingen": {
-                "account_type": "Cash"
-            }, 
-            "Tussenrek. autom. loonbetalingen": {
-                "account_type": "Cash"
-            }, 
-            "Tussenrek. cadeaubonbetalingen": {
-                "account_type": "Cash"
-            }, 
-            "Tussenrekening balans": {
-                "account_type": "Cash"
-            }, 
-            "Tussenrekening chipknip": {
-                "account_type": "Cash"
-            }, 
-            "Tussenrekening correcties": {
-                "account_type": "Cash"
-            }, 
-            "Tussenrekening pin": {
-                "account_type": "Cash"
-            }, 
-            "Vraagposten": {
-                "account_type": "Cash"
-            }, 
-            "root_type": ""
-        }, 
-        "VASTE ACTIVA, EIGEN VERMOGEN, LANGLOPEND VREEMD VERMOGEN EN VOORZIENINGEN": {
-            "EIGEN VERMOGEN": {
-                "Aandelenkapitaal": {
-                    "account_type": "Equity"
-                }, 
-                "Assuranties": {
-                    "account_type": "Equity"
-                }, 
-                "Buitengewone lasten": {
-                    "account_type": "Equity"
-                }, 
-                "Giften": {
-                    "account_type": "Equity"
-                }, 
-                "Huishoudgeld": {
-                    "account_type": "Equity"
-                }, 
-                "Inkomstenbelasting": {
-                    "account_type": "Equity"
-                }, 
-                "Kapitaal": {
-                    "account_type": "Equity"
-                }, 
-                "Overige persoonlijke verplichtingen": {
-                    "account_type": "Equity"
-                }, 
-                "Overige priv\u00e9-uitgaven": {
-                    "account_type": "Equity"
-                }, 
-                "Overige reserves": {
-                    "account_type": "Equity"
-                }, 
-                "Premie lijfrenteverzekeringen": {
-                    "account_type": "Equity"
-                }, 
-                "Premie volksverzekeringen": {
-                    "account_type": "Equity"
-                }, 
-                "Priv\u00e9-gebruik": {
-                    "account_type": "Equity"
-                }, 
-                "Priv\u00e9-opnamen/stortingen": {
-                    "account_type": "Equity"
-                }, 
-                "Vermogensbelasting": {
-                    "account_type": "Equity"
-                }, 
-                "WAO en ziekengeldverzekeringen": {
-                    "account_type": "Equity"
-                }, 
-                "Wettelijke reserves": {
-                    "account_type": "Equity"
-                }
-            }, 
-            "FINANCIELE VASTE ACTIVA EN LANGLOPENDE VORDERINGEN": {
-                "FINANCIELE VASTE ACTIVA": {
-                    "Aandeel inkoopcombinatie": {}, 
-                    "Meerderheidsdeelnemingen": {}, 
-                    "Minderheidsdeelnemingen": {}
-                }, 
-                "LANGLOPENDE VORDERINGEN": {
-                    "Financieringskosten": {}, 
-                    "Financieringskosten huurkoop": {}, 
-                    "Hypotheken u/g 1": {}, 
-                    "Hypotheken u/g 2": {}, 
-                    "Hypotheken u/g 3": {}, 
-                    "Leningen u/g 1": {}, 
-                    "Leningen u/g 2": {}, 
-                    "Leningen u/g 3": {}, 
-                    "Leningen u/g 4": {}, 
-                    "Leningen u/g 5": {}, 
-                    "Vorderingen op deelnemingen": {}, 
-                    "Waarborgsommen": {}
-                }
-            }, 
-            "IMMATERIELE ACTIVA": {
-                "Aanschafwaarde Aanloopkosten": {}, 
-                "Aanschafwaarde Auteursrechten": {}, 
-                "Aanschafwaarde Drankvergunningen": {}, 
-                "Aanschafwaarde Goodwill": {}, 
-                "Aanschafwaarde Octrooien": {}, 
-                "Aanschafwaarde Ontwikkelingskosten": {}, 
-                "Aanschafwaarde Tonnagevergunningen": {}, 
-                "Aanschafwaarde Vergunningen": {}, 
-                "Afschrijving Aanloopkosten": {}, 
-                "Afschrijving Auteursrechten": {}, 
-                "Afschrijving Drankvergunningen": {}, 
-                "Afschrijving Goodwill": {}, 
-                "Afschrijving Licenties": {}, 
-                "Afschrijving Octrooien": {}, 
-                "Afschrijving Ontwikkelingskosten": {}, 
-                "Afschrijving Tonnagevergunningen": {}, 
-                "Afschrijving Vergunningen": {}
-            }, 
-            "LANGLOPENDE SCHULDEN EN AFLOSSINGEN": {
-                "AFLOSSINGEN": {
-                    "Huurkoopverplichtingen": {}, 
-                    "Hypotheek o/g 1": {}, 
-                    "Hypotheek o/g 2": {}, 
-                    "Hypotheek o/g 3": {}, 
-                    "Hypotheek o/g 4": {}, 
-                    "Hypotheek o/g 5": {}, 
-                    "Lease-verplichtingen": {}
-                }, 
-                "LANGLOPENDE SCHULDEN": {
-                    "Huurkoopverplichtingen": {}, 
-                    "Hypotheken o/g 1": {}, 
-                    "Hypotheken o/g 2": {}, 
-                    "Hypotheken o/g 3": {}, 
-                    "Hypotheken o/g 4": {}, 
-                    "Hypotheken o/g 5": {}, 
-                    "Lease-verplichtingen": {}, 
-                    "Leningen o/g 1": {}, 
-                    "Leningen o/g 2": {}, 
-                    "Leningen o/g 3": {}, 
-                    "Leningen o/g 4": {}, 
-                    "Leningen o/g 5": {}, 
-                    "Rekening-courant directie": {}
-                }
-            }, 
-            "MACHINES EN INVENTARIS": {
-                "INVENTARIS": {
-                    "Aanschafwaarde Bedrijfsinventaris": {}, 
-                    "Aanschafwaarde Fabrieksinventaris": {}, 
-                    "Aanschafwaarde Gereedschappen": {}, 
-                    "Aanschafwaarde Kantine-inventaris": {}, 
-                    "Aanschafwaarde Kantoorinventaris": {}, 
-                    "Aanschafwaarde Kantoormachines": {}, 
-                    "Aanschafwaarde Magazijninventaris": {}, 
-                    "Afschrijving Bedrijfsinventaris": {}, 
-                    "Afschrijving Fabrieksinventaris": {}, 
-                    "Afschrijving Gereedschappen": {}, 
-                    "Afschrijving Kantine-inventaris": {}, 
-                    "Afschrijving Kantoorinventaris": {}, 
-                    "Afschrijving Kantoormachines": {}, 
-                    "Afschrijving Magazijninventaris": {}
-                }, 
-                "MACHINES": {
-                    "Aanschafwaarde Machines 1": {}, 
-                    "Aanschafwaarde Machines 2": {}, 
-                    "Aanschafwaarde Machines 3": {}, 
-                    "Aanschafwaarde Machines 4": {}, 
-                    "Aanschafwaarde Machines 5": {}, 
-                    "Afschrijving Machines 1": {}, 
-                    "Afschrijving Machines 2": {}, 
-                    "Afschrijving Machines 3": {}, 
-                    "Afschrijving Machines 4": {}, 
-                    "Afschrijving Machines 5": {}
-                }
-            }, 
-            "ONROERENDE GOEDEREN": {
-                "Aanschafwaarde Aanloopkosten": {}, 
-                "Aanschafwaarde Bedrijfsgebouwen": {}, 
-                "Aanschafwaarde Gebouwen": {}, 
-                "Aanschafwaarde Grondverbetering": {}, 
-                "Aanschafwaarde Landerijen": {}, 
-                "Aanschafwaarde Ondergrond gebouwen": {}, 
-                "Aanschafwaarde Pachtersinvesteringen": {}, 
-                "Aanschafwaarde Parkeerplaats": {}, 
-                "Aanschafwaarde Verbouwingen": {}, 
-                "Aanschafwaarde Winkels": {}, 
-                "Aanschafwaarde Woon-winkelhuis": {}, 
-                "Afschrijving Aanloopkosten": {}, 
-                "Afschrijving Bedrijfsgebouwen": {}, 
-                "Afschrijving Gebouwen": {}, 
-                "Afschrijving Grondverbetering": {}, 
-                "Afschrijving Pachtersinvesteringen": {}, 
-                "Afschrijving Parkeerplaats": {}, 
-                "Afschrijving Verbouwingen": {}, 
-                "Afschrijving Winkels": {}, 
-                "Afschrijving Woon-winkelhuis": {}
-            }, 
-            "VERVOERMIDDELEN": {
-                "Aanschafwaarde Aanhangwagens": {}, 
-                "Aanschafwaarde Heftrucks": {}, 
-                "Aanschafwaarde Personenauto's": {}, 
-                "Aanschafwaarde Rijwielen en bromfietsen": {}, 
-                "Aanschafwaarde Vrachtauto's": {}, 
-                "Afschrijving Aanhangwagens": {}, 
-                "Afschrijving Heftrucks": {}, 
-                "Afschrijving Personenauto's": {}, 
-                "Afschrijving Rijwielen en bromfietsen": {}, 
-                "Afschrijving Vrachtauto's": {}
-            }, 
-            "VOORZIENINGEN": {
-                "Assurantie eigen risico": {
-                    "account_type": "Equity"
-                }, 
-                "Backservice pensioenverpl.": {
-                    "account_type": "Equity"
-                }, 
-                "Egalisatierekening WIR": {
-                    "account_type": "Equity"
-                }, 
-                "Egalisatieres. grootonderh.": {
-                    "account_type": "Equity"
-                }, 
-                "Garantieverplichtingen": {
-                    "account_type": "Equity"
-                }, 
-                "Latente belastingverpl.": {
-                    "account_type": "Equity"
-                }, 
-                "Pens.voorz. eigen beheer": {
-                    "account_type": "Equity"
-                }, 
-                "Pensioenverplichtingen": {
-                    "account_type": "Equity"
-                }, 
-                "Stamrechtverplichtingen": {
-                    "account_type": "Equity"
-                }, 
-                "Vervangingsreserve": {
-                    "account_type": "Equity"
-                }, 
-                "Voorziening deelnemingen": {
-                    "account_type": "Equity"
-                }
-            }, 
-            "root_type": ""
-        }, 
-        "VERKOOPRESULTATEN": {
-            "Diensten fabric. 0% niet-EU": {}, 
-            "Diensten fabricage 0% EU": {}, 
-            "Diensten fabricage hoog": {}, 
-            "Diensten fabricage laag": {}, 
-            "Diensten fabricage overig": {}, 
-            "Diensten handel 0% EU": {}, 
-            "Diensten handel 0% niet-EU": {}, 
-            "Diensten handel hoog tarief": {}, 
-            "Diensten handel laag tarief": {}, 
-            "Verkopen Fabric. 0% niet-EU": {}, 
-            "Verkopen Handel 0% niet-EU": {}, 
-            "Verkopen fabric. 0 % EU": {}, 
-            "Verkopen fabricage hoog": {}, 
-            "Verkopen fabricage laag": {}, 
-            "Verkopen fabricage overig": {}, 
-            "Verkopen handel 0% EU": {}, 
-            "Verkopen handel hoog": {}, 
-            "Verkopen handel laag": {}, 
-            "Verkopen handel overig": {}, 
-            "Verleende Kredietbep. fabricage": {}, 
-            "Verleende Kredietbep. handel": {}, 
-            "root_type": ""
-        }, 
-        "VOORRAAD GEREED PRODUCT EN ONDERHANDEN WERK": {
-            "Betalingskort. crediteuren": {}, 
-            "Garantiekosten": {}, 
-            "Hulpmaterialen": {}, 
-            "Inkomende vrachten": {}, 
-            "Inkoop import buiten EU hoog": {}, 
-            "Inkoop import buiten EU laag": {}, 
-            "Inkoop import buiten EU overig": {}, 
-            "Inkoopbonussen": {}, 
-            "Inkoopkosten": {}, 
-            "Inkoopprovisie": {}, 
-            "Inkopen BTW verlegd": {}, 
-            "Inkopen EU hoog tarief": {}, 
-            "Inkopen EU laag tarief": {}, 
-            "Inkopen EU overig": {}, 
-            "Inkopen hoog": {}, 
-            "Inkopen laag": {}, 
-            "Inkopen nul": {}, 
-            "Inkopen overig": {}, 
-            "Invoerkosten": {}, 
-            "Kosten inkoopvereniging": {}, 
-            "Kostprijs omzet grondstoffen": {}, 
-            "Kostprijs omzet handelsgoederen": {}, 
-            "Onttrekking uitgev.garantie": {}, 
-            "Priv\u00e9-gebruik goederen": {}, 
-            "Tegenrekening inkoop": {}, 
-            "Toev. Voorz. incour. grondst.": {}, 
-            "Toevoeging garantieverpl.": {}, 
-            "Toevoeging voorz. incour. handelsgoed.": {}, 
-            "Uitbesteed werk": {}, 
-            "Voorz. Incourourant grondst.": {}, 
-            "Voorz.incour. handelsgoed.": {}, 
-            "root_type": ""
-        }, 
-        "VOORRAAD GRONDSTOFFEN, HULPMATERIALEN EN HANDELSGOEDEREN": {
-            "Emballage": {
-                "account_type": "Cash"
-            }, 
-            "Gereed product 1": {
-                "account_type": "Cash"
-            }, 
-            "Gereed product 2": {
-                "account_type": "Cash"
-            }, 
-            "Goederen 1": {
-                "account_type": "Cash"
-            }, 
-            "Goederen 2": {
-                "account_type": "Cash"
-            }, 
-            "Goederen in consignatie": {
-                "account_type": "Cash"
-            }, 
-            "Goederen onderweg": {
-                "account_type": "Cash"
-            }, 
-            "Grondstoffen 1": {
-                "account_type": "Cash"
-            }, 
-            "Grondstoffen 2": {
-                "account_type": "Cash"
-            }, 
-            "Halffabrikaten 1": {
-                "account_type": "Cash"
-            }, 
-            "Halffabrikaten 2": {
-                "account_type": "Cash"
-            }, 
-            "Hulpstoffen 1": {
-                "account_type": "Cash"
-            }, 
-            "Hulpstoffen 2": {
-                "account_type": "Cash"
-            }, 
-            "Kantoorbenodigdheden": {
-                "account_type": "Cash"
-            }, 
-            "Onderhanden werk": {
-                "account_type": "Cash"
-            }, 
-            "Verpakkingsmateriaal": {
-                "account_type": "Cash"
-            }, 
-            "Zegels": {
-                "account_type": "Cash"
-            }, 
-            "root_type": ""
-        }
-    }
-}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/ar_chart_of_accounts.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ar_chart_of_accounts.json
index 367ea60..057d437 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/ar_chart_of_accounts.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ar_chart_of_accounts.json
@@ -2,418 +2,839 @@
     "country_code": "ar", 
     "name": "Argentina - Chart of Accounts", 
     "tree": {
-        "1.0.0.00.00 - ACTIVO": {
-            "1.1.0.00.00 - ACTIVO CORRIENTE": {
-                "1.1.1.00.00 - CAJA Y BANCOS": {
-                    "1.1.1.01.00 - CAJAS": {
-                        "1.1.1.01.01 - Caja": {}, 
-                        "1.1.1.01.02 - Caja chica": {}, 
-                        "1.1.1.01.03 - Caja en Moneda Extranjera": {}, 
-                        "1.1.1.01.04 - Valores a depositar": {}, 
-                        "1.1.1.01.05 - Tarjetas - Cupones": {}, 
+        "ACTIVO": {
+            "ACTIVO CORRIENTE": {
+                "CAJA Y BANCOS": {
+                    "BANCOS": {
+                        "Banco de la Nacio\u0301n Argentina(ejemplo) c/c en": {
+                            "account_number": "1.1.1.02.01"
+                        }, 
+                        "Banco del exterior": {
+                            "account_number": "1.1.1.02.03"
+                        }, 
+                        "account_number": "1.1.1.02.00", 
+                        "account_type": "Bank"
+                    }, 
+                    "CAJAS": {
+                        "Caja": {
+                            "account_number": "1.1.1.01.01"
+                        }, 
+                        "Caja chica": {
+                            "account_number": "1.1.1.01.02"
+                        }, 
+                        "Caja en Moneda Extranjera": {
+                            "account_number": "1.1.1.01.03"
+                        }, 
+                        "Tarjetas - Cupones": {
+                            "account_number": "1.1.1.01.05"
+                        }, 
+                        "Valores a depositar": {
+                            "account_number": "1.1.1.01.04"
+                        }, 
+                        "account_number": "1.1.1.01.00", 
                         "account_type": "Cash"
                     }, 
-                    "1.1.1.02.00 - BANCOS": {
-                        "1.1.1.02.01 - Banco de la Nacio\u0301n Argentina(ejemplo) c/c en": {}, 
-                        "1.1.1.02.03 - Banco del exterior": {}, 
-                        "account_type": "Bank"
-                    }
+                    "account_number": "1.1.1.00.00"
                 }, 
-                "1.1.2.00.00 - INVERSIONES TEMPORARIAS": {
-                    "1.1.2.01.00 - INVERSIONES EN ACCIONES": {
-                        "1.1.2.01.01 - Acciones": {
-                            "account_type": "Receivable"
-                        }
-                    }, 
-                    "1.1.2.02.00 - DEPO\u0301SITOS A PLAZO FIJO": {
-                        "1.1.2.02.01 - Depo\u0301sitos a Plazo Fijo en pesos": {
-                            "account_type": "Receivable"
-                        }, 
-                        "1.1.2.02.02 - Depo\u0301sitos a Plazo Fijo en moneda": {
-                            "account_type": "Receivable"
-                        }
-                    }
-                }, 
-                "1.1.3.00.00 - CRE\u0301DITOS POR VENTAS DE SERVICIOS": {
-                    "1.1.3.01.00 - DEUDORES EN CTA. CTE": {
-                        "1.1.3.01.01 - Deudores locales": {
-                            "account_type": "Receivable"
-                        }, 
-                        "1.1.3.01.02 - Deudores del exterior": {
-                            "account_type": "Receivable"
-                        }, 
-                        "1.1.3.01.03 - Deudores Morosos": {
+                "CRE\u0301DITOS POR VENTAS DE SERVICIOS": {
+                    "DEUDORES EN CTA. CTE": {
+                        "Deudores Morosos": {
+                            "account_number": "1.1.3.01.03", 
                             "account_type": "Chargeable"
                         }, 
-                        "1.1.3.01.04 - Deudores en Gestio\u0301n Judicial": {}
-                    }, 
-                    "1.1.3.02.00 - Documentos a cobrar por Vas. de Servicios": {
-                        "account_type": "Receivable"
-                    }, 
-                    "1.1.3.03.00 - Previsio\u0301n para deudores incobrables": {}
-                }, 
-                "1.1.4.00.00 - OTROS CRE\u0301DITOS CORRIENTES": {
-                    "1.1.4.01.00 - CRE\u0301DITOS IMPOSITIVOS CORRIENTES": {
-                        "1.1.4.01.01 - Anticipos Impuesto a las Ganancias": {}, 
-                        "1.1.4.01.02 - Anticipos Impuesto a los Ingresos Brutos": {}, 
-                        "1.1.4.01.03 - Percepciones y Retenciones Impto. a las Ganancias": {}, 
-                        "1.1.4.01.04 - Percepciones y Retenciones Impto. a los": {}, 
-                        "1.1.4.01.05 - IVA Cre\u0301dito Fiscal": {}, 
-                        "1.1.4.01.06 - IVA Cre\u0301dito Fiscal Exportacio\u0301n": {}, 
-                        "1.1.4.01.07 - IVA Saldo a Favor Te\u0301cnico": {}, 
-                        "1.1.4.01.08 - IVA Saldo a Favor Te\u0301cnico": {}, 
-                        "1.1.4.01.09 - IVA Saldo a Favor de Libre": {}, 
-                        "1.1.4.01.10 - Percepciones y Retenciones de IVA": {}, 
-                        "1.1.4.01.11 - Cre\u0301ditos por quebrantos impositivos no": {}, 
-                        "1.1.4.01.12 - Activos por Impuesto Diferido (Ctes.)": {}
-                    }, 
-                    "1.1.4.02.00 - CRE\u0301DITOS DIVERSOS CORRIENTES": {
-                        "1.1.4.02.01 - Cuentas Particulares Directores": {}, 
-                        "1.1.4.02.02 - Cuentas Particulares Socios/Accionistas": {}, 
-                        "1.1.4.02.03 - Anticipos a Proveedores (No cong.": {
+                        "Deudores del exterior": {
+                            "account_number": "1.1.3.01.02", 
                             "account_type": "Receivable"
                         }, 
-                        "1.1.4.02.04 - Anticipos de Sueldos": {}, 
-                        "1.1.4.02.05 - Pre\u0301stamos al personal": {}, 
-                        "1.1.4.02.06 - Depo\u0301sitos pendientes de acreditacio\u0301n": {}, 
-                        "1.1.4.02.07 - Arrendamiento pagado por adelantado": {}
-                    }
+                        "Deudores en Gestio\u0301n Judicial": {
+                            "account_number": "1.1.3.01.04"
+                        }, 
+                        "Deudores locales": {
+                            "account_number": "1.1.3.01.01", 
+                            "account_type": "Receivable"
+                        }, 
+                        "account_number": "1.1.3.01.00"
+                    }, 
+                    "Documentos a cobrar por Vas. de Servicios": {
+                        "account_number": "1.1.3.02.00", 
+                        "account_type": "Receivable"
+                    }, 
+                    "Previsio\u0301n para deudores incobrables": {
+                        "account_number": "1.1.3.03.00"
+                    }, 
+                    "account_number": "1.1.3.00.00"
                 }, 
-                "1.1.5.00.00 - OTROS ACTIVOS CORRIENTES": {
-                    "is_group": 1
-                }, 
-                "1.1.6.00.00 - INVENTARIOS": {
+                "INVENTARIOS": {
+                    "account_number": "1.1.6.00.00", 
                     "account_type": "Stock", 
                     "is_group": 1
-                }
+                }, 
+                "INVERSIONES TEMPORARIAS": {
+                    "DEPO\u0301SITOS A PLAZO FIJO": {
+                        "Depo\u0301sitos a Plazo Fijo en moneda": {
+                            "account_number": "1.1.2.02.02", 
+                            "account_type": "Receivable"
+                        }, 
+                        "Depo\u0301sitos a Plazo Fijo en pesos": {
+                            "account_number": "1.1.2.02.01", 
+                            "account_type": "Receivable"
+                        }, 
+                        "account_number": "1.1.2.02.00"
+                    }, 
+                    "INVERSIONES EN ACCIONES": {
+                        "Acciones": {
+                            "account_number": "1.1.2.01.01", 
+                            "account_type": "Receivable"
+                        }, 
+                        "account_number": "1.1.2.01.00"
+                    }, 
+                    "account_number": "1.1.2.00.00"
+                }, 
+                "OTROS ACTIVOS CORRIENTES": {
+                    "account_number": "1.1.5.00.00", 
+                    "is_group": 1
+                }, 
+                "OTROS CRE\u0301DITOS CORRIENTES": {
+                    "CRE\u0301DITOS DIVERSOS CORRIENTES": {
+                        "Anticipos a Proveedores (No cong.": {
+                            "account_number": "1.1.4.02.03", 
+                            "account_type": "Receivable"
+                        }, 
+                        "Anticipos de Sueldos": {
+                            "account_number": "1.1.4.02.04"
+                        }, 
+                        "Arrendamiento pagado por adelantado": {
+                            "account_number": "1.1.4.02.07"
+                        }, 
+                        "Cuentas Particulares Directores": {
+                            "account_number": "1.1.4.02.01"
+                        }, 
+                        "Cuentas Particulares Socios/Accionistas": {
+                            "account_number": "1.1.4.02.02"
+                        }, 
+                        "Depo\u0301sitos pendientes de acreditacio\u0301n": {
+                            "account_number": "1.1.4.02.06"
+                        }, 
+                        "Pre\u0301stamos al personal": {
+                            "account_number": "1.1.4.02.05"
+                        }, 
+                        "account_number": "1.1.4.02.00"
+                    }, 
+                    "CRE\u0301DITOS IMPOSITIVOS CORRIENTES": {
+                        "Activos por Impuesto Diferido (Ctes.)": {
+                            "account_number": "1.1.4.01.12"
+                        }, 
+                        "Anticipos Impuesto a las Ganancias": {
+                            "account_number": "1.1.4.01.01"
+                        }, 
+                        "Anticipos Impuesto a los Ingresos Brutos": {
+                            "account_number": "1.1.4.01.02"
+                        }, 
+                        "Cre\u0301ditos por quebrantos impositivos no": {
+                            "account_number": "1.1.4.01.11"
+                        }, 
+                        "IVA Cre\u0301dito Fiscal": {
+                            "account_number": "1.1.4.01.05"
+                        }, 
+                        "IVA Cre\u0301dito Fiscal Exportacio\u0301n": {
+                            "account_number": "1.1.4.01.06"
+                        }, 
+                        "IVA Saldo a Favor Te\u0301cnico": {
+                            "account_number": "1.1.4.01.07"
+                        }, 
+                        "IVA Saldo a Favor de Libre": {
+                            "account_number": "1.1.4.01.09"
+                        }, 
+                        "Percepciones y Retenciones Impto. a las Ganancias": {
+                            "account_number": "1.1.4.01.03"
+                        }, 
+                        "Percepciones y Retenciones Impto. a los": {
+                            "account_number": "1.1.4.01.04"
+                        }, 
+                        "Percepciones y Retenciones de IVA": {
+                            "account_number": "1.1.4.01.10"
+                        }, 
+                        "account_number": "1.1.4.01.00"
+                    }, 
+                    "account_number": "1.1.4.00.00"
+                }, 
+                "account_number": "1.1.0.00.00"
             }, 
-            "1.2.0.00.00 - ACTIVO NO CORRIENTE": {
-                "1.2.1.00.00 - INVERSIONES PERMANENTES": {
-                    "1.2.1.01.00 - BONOS DE DEUDA": {
-                        "1.2.1.01.01 - Ti\u0301tulos Deuda Pu\u0301blica (Pesos)": {
+            "ACTIVO NO CORRIENTE": {
+                "ACTIVOS INTANGIBLES": {
+                    "MARCAS Y PATENTES": {
+                        "Amortizaciones Acumuladas Marcas y": {
+                            "account_number": "1.2.3.01.03"
+                        }, 
+                        "Marcas y Patentes Actualizaciones": {
+                            "account_number": "1.2.3.01.02"
+                        }, 
+                        "Marcas y Patentes Valores Originales": {
+                            "account_number": "1.2.3.01.01"
+                        }, 
+                        "account_number": "1.2.3.01.00"
+                    }, 
+                    "account_number": "1.2.3.00.00"
+                }, 
+                "BIENES DE USO": {
+                    "HERRAMIENTAS": {
+                        "Amortizaciones Acumuladas": {
+                            "account_number": "1.2.2.09.03", 
+                            "account_type": "Depreciation"
+                        }, 
+                        "Herramientas Ajuste": {
+                            "account_number": "1.2.2.09.02"
+                        }, 
+                        "Herramientas Valores Originales": {
+                            "account_number": "1.2.2.09.01", 
+                            "account_type": "Fixed Asset"
+                        }, 
+                        "account_number": "1.2.2.09.00"
+                    }, 
+                    "INMUEBLES": {
+                        "Amortizaciones Acumuladas Inmuebles": {
+                            "account_number": "1.2.2.01.03", 
+                            "account_type": "Depreciation"
+                        }, 
+                        "Inmuebles Actualizaciones": {
+                            "account_number": "1.2.2.01.02"
+                        }, 
+                        "Inmuebles Valores originales": {
+                            "account_number": "1.2.2.01.01", 
+                            "account_type": "Fixed Asset"
+                        }, 
+                        "account_number": "1.2.2.01.00"
+                    }, 
+                    "INSTALACIONES": {
+                        "Amortizaciones Acumuladas": {
+                            "account_number": "1.2.2.08.03", 
+                            "account_type": "Depreciation"
+                        }, 
+                        "Instalaciones Ajuste": {
+                            "account_number": "1.2.2.08.02"
+                        }, 
+                        "Instalaciones Valores Originales": {
+                            "account_number": "1.2.2.08.01", 
+                            "account_type": "Fixed Asset"
+                        }, 
+                        "account_number": "1.2.2.08.00"
+                    }, 
+                    "MAQUINARIAS Y EQUIPOS": {
+                        "Amortizaciones Acumuladas Maquinarias": {
+                            "account_number": "1.2.2.02.03", 
+                            "account_type": "Depreciation"
+                        }, 
+                        "Maquinarias y Equipos Actualizaciones": {
+                            "account_number": "1.2.2.02.02"
+                        }, 
+                        "Maquinarias y Equipos Valores de origen": {
+                            "account_number": "1.2.2.02.01", 
+                            "account_type": "Fixed Asset"
+                        }, 
+                        "account_number": "1.2.2.02.00"
+                    }, 
+                    "MUEBLES Y U\u0301TILES": {
+                        "Amortizaciones Acumuladas Muebles y": {
+                            "account_number": "1.2.2.03.03", 
+                            "account_type": "Depreciation"
+                        }, 
+                        "Muebles y U\u0301tiles Actualizaciones": {
+                            "account_number": "1.2.2.03.02"
+                        }, 
+                        "Muebles y U\u0301tiles Valores de Origen": {
+                            "account_number": "1.2.2.03.01", 
+                            "account_type": "Fixed Asset"
+                        }, 
+                        "account_number": "1.2.2.03.00"
+                    }, 
+                    "RODADOS": {
+                        "Amortizaciones Acumuladas Rodados": {
+                            "account_number": "1.2.2.04.03", 
+                            "account_type": "Depreciation"
+                        }, 
+                        "Rodados Actualizaciones": {
+                            "account_number": "1.2.2.04.02"
+                        }, 
+                        "Rodados Valores Originales": {
+                            "account_number": "1.2.2.04.01", 
+                            "account_type": "Fixed Asset"
+                        }, 
+                        "account_number": "1.2.2.04.00"
+                    }, 
+                    "TERRENOS": {
+                        "Terrenos Actualizaciones": {
+                            "account_number": "1.2.2.07.02"
+                        }, 
+                        "Terrenos Valores Originales": {
+                            "account_number": "1.2.2.07.01", 
+                            "account_type": "Fixed Asset"
+                        }, 
+                        "account_number": "1.2.2.07.00"
+                    }, 
+                    "account_number": "1.2.2.00.00"
+                }, 
+                "CRE\u0301DITOS POR VENTA DE SERVICIOS": {
+                    "DEUDORES NO CORRIENTES": {
+                        "Deudores Locales (No Ctes.)": {
+                            "account_number": "1.2.4.01.01"
+                        }, 
+                        "account_number": "1.2.4.01.00"
+                    }, 
+                    "Documentos a cobrar por Vtas. de Servicios": {
+                        "account_number": "1.2.4.02.00"
+                    }, 
+                    "account_number": "1.2.4.00.00"
+                }, 
+                "INVERSIONES PERMANENTES": {
+                    "BONOS DE DEUDA": {
+                        "Bonex": {
+                            "account_number": "1.2.1.01.02"
+                        }, 
+                        "Ti\u0301tulos Deuda Pu\u0301blica (Pesos)": {
+                            "account_number": "1.2.1.01.01", 
                             "is_group": 1
                         }, 
-                        "1.2.1.01.02 - Bonex": {}
+                        "account_number": "1.2.1.01.00"
                     }, 
-                    "1.2.1.02.00 - DEPO\u0301SITOS A PLAZO FIJO NO": {
-                        "1.2.1.02.01 - Depo\u0301sitos a plazo fijo en pesos (no cte.)": {}, 
-                        "1.2.1.02.02 - Depo\u0301sitos a plazo fijo en moneda": {}
+                    "DEPO\u0301SITOS A PLAZO FIJO NO": {
+                        "Depo\u0301sitos a plazo fijo en moneda": {
+                            "account_number": "1.2.1.02.02"
+                        }, 
+                        "Depo\u0301sitos a plazo fijo en pesos (no cte.)": {
+                            "account_number": "1.2.1.02.01"
+                        }, 
+                        "account_number": "1.2.1.02.00"
                     }, 
-                    "1.2.1.03.00 - INVERSIONES EN BIENES DEPRECIABLES": {
-                        "1.2.1.03.01 - Inversiones en Inmuebles Valores": {}, 
-                        "1.2.1.03.02 - Inversiones en Inmuebles": {}, 
-                        "1.2.1.03.03 - Amortizaciones Acumuladas Inversiones": {}
-                    }
+                    "INVERSIONES EN BIENES DEPRECIABLES": {
+                        "Amortizaciones Acumuladas Inversiones": {
+                            "account_number": "1.2.1.03.03"
+                        }, 
+                        "Inversiones en Inmuebles": {
+                            "account_number": "1.2.1.03.02"
+                        }, 
+                        "Inversiones en Inmuebles Valores": {
+                            "account_number": "1.2.1.03.01"
+                        }, 
+                        "account_number": "1.2.1.03.00"
+                    }, 
+                    "account_number": "1.2.1.00.00"
                 }, 
-                "1.2.2.00.00 - BIENES DE USO": {
-                    "1.2.2.01.00 - INMUEBLES": {
-                        "1.2.2.01.01 - Inmuebles Valores originales": {
-                            "account_type": "Fixed Asset"
-                        }, 
-                        "1.2.2.01.02 - Inmuebles Actualizaciones": {}, 
-                        "1.2.2.01.03 - Amortizaciones Acumuladas Inmuebles": {
-                            "account_type": "Depreciation"
-                        }
+                "OTROS ACTIVOS NO CORRIENTES": {
+                    "Llave de Negocio": {
+                        "account_number": "1.2.6.01.00"
                     }, 
-                    "1.2.2.02.00 - MAQUINARIAS Y EQUIPOS": {
-                        "1.2.2.02.01 - Maquinarias y Equipos Valores de origen": {
-                            "account_type": "Fixed Asset"
-                        }, 
-                        "1.2.2.02.02 - Maquinarias y Equipos Actualizaciones": {}, 
-                        "1.2.2.02.03 - Amortizaciones Acumuladas Maquinarias": {
-                            "account_type": "Depreciation"
-                        }
-                    }, 
-                    "1.2.2.03.00 - MUEBLES Y U\u0301TILES": {
-                        "1.2.2.03.01 - Muebles y U\u0301tiles Valores de Origen": {
-                            "account_type": "Fixed Asset"
-                        }, 
-                        "1.2.2.03.02 - Muebles y U\u0301tiles Actualizaciones": {}, 
-                        "1.2.2.03.03 - Amortizaciones Acumuladas Muebles y": {
-                            "account_type": "Depreciation"
-                        }
-                    }, 
-                    "1.2.2.04.00 - RODADOS": {
-                        "1.2.2.04.01 - Rodados Valores Originales": {
-                            "account_type": "Fixed Asset"
-                        }, 
-                        "1.2.2.04.02 - Rodados Actualizaciones": {}, 
-                        "1.2.2.04.03 - Amortizaciones Acumuladas Rodados": {
-                            "account_type": "Depreciation"
-                        }
-                    }, 
-                    "1.2.2.07.00 - TERRENOS": {
-                        "1.2.2.07.01 - Terrenos Valores Originales": {
-                            "account_type": "Fixed Asset"
-                        }, 
-                        "1.2.2.07.02 - Terrenos Actualizaciones": {}
-                    }, 
-                    "1.2.2.08.00 - INSTALACIONES": {
-                        "1.2.2.08.01 - Instalaciones Valores Originales": {
-                            "account_type": "Fixed Asset"
-                        }, 
-                        "1.2.2.08.02 - Instalaciones Ajuste": {}, 
-                        "1.2.2.08.03 - Amortizaciones Acumuladas": {
-                            "account_type": "Depreciation"
-                        }
-                    }, 
-                    "1.2.2.09.00 - HERRAMIENTAS": {
-                        "1.2.2.09.01 - Herramientas Valores Originales": {
-                            "account_type": "Fixed Asset"
-                        }, 
-                        "1.2.2.09.02 - Herramientas Ajuste": {}, 
-                        "1.2.2.09.03 - Amortizaciones Acumuladas": {
-                            "account_type": "Depreciation"
-                        }
-                    }
+                    "account_number": "1.2.6.00.00"
                 }, 
-                "1.2.3.00.00 - ACTIVOS INTANGIBLES": {
-                    "1.2.3.01.00 - MARCAS Y PATENTES": {
-                        "1.2.3.01.01 - Marcas y Patentes Valores Originales": {}, 
-                        "1.2.3.01.02 - Marcas y Patentes Actualizaciones": {}, 
-                        "1.2.3.01.03 - Amortizaciones Acumuladas Marcas y": {}
-                    }
-                }, 
-                "1.2.4.00.00 - CRE\u0301DITOS POR VENTA DE SERVICIOS": {
-                    "1.2.4.01.00 - DEUDORES NO CORRIENTES": {
-                        "1.2.4.01.01 - Deudores Locales (No Ctes.)": {}
+                "OTROS CRE\u0301DITOS NO CORRIENTES": {
+                    "CRE\u0301DITOS DIVERSOS NO CORRIENTES": {
+                        "Cuentas Particulares Directores (No": {
+                            "account_number": "1.2.5.02.01"
+                        }, 
+                        "Cuentas Particulares Socios/Accionistas": {
+                            "account_number": "1.2.5.02.02"
+                        }, 
+                        "account_number": "1.2.5.02.00"
                     }, 
-                    "1.2.4.02.00 - Documentos a cobrar por Vtas. de Servicios": {}
-                }, 
-                "1.2.5.00.00 - OTROS CRE\u0301DITOS NO CORRIENTES": {
-                    "1.2.5.01.00 - CRE\u0301DITOS IMPOSITIVOS NO CORRIENTES": {
-                        "1.2.5.01.01 - Activos por Impto. Diferido (No Ctes.)": {}, 
-                        "1.2.5.01.02 - Cre\u0301ditos por Quebrantos Impositivos no": {}
+                    "CRE\u0301DITOS IMPOSITIVOS NO CORRIENTES": {
+                        "Activos por Impto. Diferido (No Ctes.)": {
+                            "account_number": "1.2.5.01.01"
+                        }, 
+                        "Cre\u0301ditos por Quebrantos Impositivos no": {
+                            "account_number": "1.2.5.01.02"
+                        }, 
+                        "account_number": "1.2.5.01.00"
                     }, 
-                    "1.2.5.02.00 - CRE\u0301DITOS DIVERSOS NO CORRIENTES": {
-                        "1.2.5.02.01 - Cuentas Particulares Directores (No": {}, 
-                        "1.2.5.02.02 - Cuentas Particulares Socios/Accionistas": {}
-                    }
+                    "account_number": "1.2.5.00.00"
                 }, 
-                "1.2.6.00.00 - OTROS ACTIVOS NO CORRIENTES": {
-                    "1.2.6.01.00 - Llave de Negocio": {}
-                }
+                "account_number": "1.2.0.00.00"
             }, 
+            "account_number": "1.0.0.00.00", 
             "root_type": "Asset"
         }, 
-        "2.0.0.00.00 - PASIVO": {
-            "2.1.0.00.00 - PASIVO CORRIENTE": {
-                "2.1.1.00.00 - DEUDAS COMERCIALES CORRIENTES": {
-                    "2.1.1.02.00 - ACREEDORES": {
-                        "2.1.1.02.01 - Acreedores Locales (Ctes.)": {
-                            "account_type": "Payable"
-                        }
-                    }
+        "EGRESOS": {
+            "EGRESOS EXTRAORDINARIOS": {
+                "Ajuste de Amortizaciones acumuladas de": {
+                    "account_number": "5.2.4.00.00"
                 }, 
-                "2.1.2.00.00 - REMUNERACIONES Y CAGAS SOCIALES": {
-                    "2.1.2.02.00 - DEUDAS PREVISIONALES": {
-                        "2.1.2.02.01 - Jubilaciones a pagar": {}, 
-                        "2.1.2.02.02 - ART a pagar": {}, 
-                        "2.1.2.02.03 - Obra Social a pagar": {}, 
-                        "2.1.2.02.04 - SAC a pagar": {}, 
-                        "2.1.2.02.05 - Vacaciones a pagar": {}
-                    }, 
-                    "2.1.2.03.00 - Sueldos y Jornales a pagar": {
-                        "account_type": "Chargeable"
-                    }
+                "Ajuste del valor de los bienes": {
+                    "account_number": "5.2.3.00.00"
                 }, 
-                "2.1.3.00.00 - CARGAS FISCALES": {
-                    "2.1.3.01.00 - IMPUESTO AL VALOR AGREGADO": {
-                        "2.1.3.01.01 - IVA De\u0301bito Fiscal": {}, 
-                        "2.1.3.01.02 - IVA De\u0301bito Fiscal Sobretasa": {}, 
-                        "2.1.3.01.03 - Percepciones y Retenciones efectuadas": {}, 
-                        "2.1.3.01.04 - IVA a Pagar": {}
-                    }, 
-                    "2.1.3.02.00 - INGRESOS BRUTOS": {
-                        "2.1.3.02.01 - Impuesto a los Ingresos Brutos a Pagar": {}, 
-                        "2.1.3.02.02 - Percepciones efectuadas Ingresos": {}
-                    }, 
-                    "2.1.3.03.00 - IMPUESTO A LAS GANANCIAS": {
-                        "2.1.3.03.01 - Impuesto Ganancia Mi\u0301nima Presunta a": {}, 
-                        "2.1.3.03.02 - Impuesto a las Ganancias a Pagar": {}, 
-                        "2.1.3.03.03 - Pasivo por Impuesto Diferido": {}, 
-                        "2.1.3.03.04 - Percepciones y Retenciones efectuadas": {}
-                    }
+                "Amortizaciones extraordinarias": {
+                    "account_number": "5.2.2.00.00"
                 }, 
-                "2.1.4.00.00 - DEUDAS FINANCIERAS": {
-                    "2.1.4.01.00 - Pre\u0301stamo Banco de la Nacio\u0301n Argentina (Cte.)": {}, 
-                    "2.1.4.02.00 - Pre\u0301stamo Banco de la Provincia de Bs. As.": {}
+                "Pe\u0301rdida por venta bienes de uso": {
+                    "account_number": "5.2.1.00.00"
                 }, 
-                "2.1.5.00.00 - OTRAS DEUDAS CORRIENTES": {
-                    "2.1.5.01.00 - Dividendos a pagar (Ctes.)": {}, 
-                    "2.1.5.02.00 - Honorarios Directores a Pagar (Ctes.)": {}
-                }, 
-                "2.1.6.00.00 - PROVISIONES": {
-                    "2.1.6.01.00 - Provisio\u0301n para despidos": {}, 
-                    "2.1.6.02.00 - Provisio\u0301n para SAC": {}
-                }, 
-                "2.1.7.00.00 - INVENTARIOS POR PAGAR": {
-                    "2.1.7.01.00 - Inventario entrante no facturado": {
-                        "account_type": "Stock Received But Not Billed"
-                    }
-                }
+                "account_number": "5.2.0.00.00"
             }, 
-            "2.2.0.00.00 - PASIVO NO CORRIENTE": {
-                "2.2.1.00.00 - DEUDAS FINANCIERAS NO CORRIENTES": {
-                    "2.2.1.01.00 - Pre\u0301stamo Banco de la Nacio\u0301n Argentina(ejemplo) (No": {}
+            "EGRESOS ORDINARIOS": {
+                "GASTOS DE ADMINISTRACIO\u0301N": {
+                    "Amortizaciones - Administracio\u0301n": {
+                        "account_number": "5.1.3.04.00"
+                    }, 
+                    "Cargas Sociales - Administracio\u0301n": {
+                        "account_number": "5.1.3.02.00"
+                    }, 
+                    "Certificaciones y Sellados": {
+                        "account_number": "5.1.3.07.00"
+                    }, 
+                    "Correspondencia - Administracio\u0301n": {
+                        "account_number": "5.1.3.11.00"
+                    }, 
+                    "Costo sobre ventas": {
+                        "account_number": "5.1.3.15.00", 
+                        "account_type": "Cost of Goods Sold"
+                    }, 
+                    "Energi\u0301a - Administracio\u0301n": {
+                        "account_number": "5.1.3.13.00"
+                    }, 
+                    "Gastos Bancarios - Administracio\u0301n": {
+                        "account_number": "5.1.3.08.00"
+                    }, 
+                    "Gastos Varios - Administracio\u0301n": {
+                        "account_number": "5.1.3.09.00"
+                    }, 
+                    "Gastos de Valoracion": {
+                        "account_number": "5.1.3.16.00", 
+                        "account_type": "Expenses Included In Valuation"
+                    }, 
+                    "Honorarios - Administracio\u0301n": {
+                        "account_number": "5.1.3.03.00"
+                    }, 
+                    "Insumos Computacio\u0301n - Administracio\u0301n": {
+                        "account_number": "5.1.3.10.00"
+                    }, 
+                    "Libreri\u0301a y Papeleri\u0301a - Administracio\u0301n": {
+                        "account_number": "5.1.3.06.00"
+                    }, 
+                    "Mantenimiento - Administracio\u0301n": {
+                        "account_number": "5.1.3.12.00"
+                    }, 
+                    "Seguros - Administracio\u0301n": {
+                        "account_number": "5.1.3.14.00"
+                    }, 
+                    "Sueldos - Administracio\u0301n": {
+                        "account_number": "5.1.3.01.00"
+                    }, 
+                    "Via\u0301ticos - Administracio\u0301n": {
+                        "account_number": "5.1.3.05.00"
+                    }, 
+                    "account_number": "5.1.3.00.00"
                 }, 
-                "2.2.2.00.00 - CARGAS FISCALES NO CORRIENTES": {
-                    "2.2.2.01.00 - Moratoria": {}
+                "GASTOS DE COMERCIALIZACIO\u0301N": {
+                    "Amortizaciones - Comercializacio\u0301n": {
+                        "account_number": "5.1.4.04.00"
+                    }, 
+                    "Cargas Sociales - Comercializacio\u0301n": {
+                        "account_number": "5.1.4.02.00"
+                    }, 
+                    "Comisiones de terceros": {
+                        "account_number": "5.1.4.11.00"
+                    }, 
+                    "Descuentos otorgados a clientes": {
+                        "account_number": "5.1.4.10.00"
+                    }, 
+                    "Fletes - Comercializacio\u0301n": {
+                        "account_number": "5.1.4.08.00"
+                    }, 
+                    "Gastos Varios - Comercializacio\u0301n": {
+                        "account_number": "5.1.4.07.00"
+                    }, 
+                    "Honorarios - Comercializacio\u0301n": {
+                        "account_number": "5.1.4.06.00"
+                    }, 
+                    "IVA no computable - Comercializacio\u0301n": {
+                        "account_number": "5.1.4.09.00"
+                    }, 
+                    "Publicidad - Comercializacio\u0301n": {
+                        "account_number": "5.1.4.03.00"
+                    }, 
+                    "Quebrantos por deudores": {
+                        "account_number": "5.1.4.12.00"
+                    }, 
+                    "Seguros - Comercializacio\u0301n": {
+                        "account_number": "5.1.4.05.00"
+                    }, 
+                    "Sueldos - Comercializacio\u0301n": {
+                        "account_number": "5.1.4.01.00"
+                    }, 
+                    "Via\u0301ticos - Comercializacio\u0301n": {
+                        "account_number": "5.1.4.13.00"
+                    }, 
+                    "account_number": "5.1.4.00.00"
                 }, 
-                "2.2.3.00.00 - DEUDAS COMERCIALES": {
-                    "2.2.3.01.00 - ACREEDORES": {
-                        "2.2.3.01.01 - Acreedores Locales (No Ctes.)": {}
-                    }
+                "GASTOS DE EXPLOTACIO\u0301N": {
+                    "Amortizaciones - Explotacio\u0301n": {
+                        "account_number": "5.1.2.10.00"
+                    }, 
+                    "Cargas Sociales - Explotacio\u0301n": {
+                        "account_number": "5.1.2.02.00"
+                    }, 
+                    "Combustibles y Lubricantes - Explotacio\u0301n": {
+                        "account_number": "5.1.2.14.00"
+                    }, 
+                    "Comida del personal - Explotacio\u0301n": {
+                        "account_number": "5.1.2.08.00"
+                    }, 
+                    "Cuota me\u0301dica a cargo del empleador": {
+                        "account_number": "5.1.2.09.00"
+                    }, 
+                    "Despidos - Explotacio\u0301n": {
+                        "account_number": "5.1.2.07.00"
+                    }, 
+                    "Energi\u0301a - Explotacio\u0301n": {
+                        "account_number": "5.1.2.03.00"
+                    }, 
+                    "Fletes - Explotacio\u0301n": {
+                        "account_number": "5.1.2.16.00"
+                    }, 
+                    "Gastos de limpieza - Explotacio\u0301n": {
+                        "account_number": "5.1.2.12.00"
+                    }, 
+                    "Honorarios Profesionales - Explotacio\u0301n": {
+                        "account_number": "5.1.2.04.00"
+                    }, 
+                    "Insumos diversos - Explotacio\u0301n": {
+                        "account_number": "5.1.2.15.00"
+                    }, 
+                    "Mantenimiento - Explotacio\u0301n": {
+                        "account_number": "5.1.2.13.00"
+                    }, 
+                    "Repuestos y Reparaciones - Explotacio\u0301n": {
+                        "account_number": "5.1.2.11.00"
+                    }, 
+                    "Ropa de trabajo - Explotacio\u0301n": {
+                        "account_number": "5.1.2.05.00"
+                    }, 
+                    "Seguros - Explotacio\u0301n": {
+                        "account_number": "5.1.2.06.00"
+                    }, 
+                    "Sueldos y Jornales - Explotacio\u0301n": {
+                        "account_number": "5.1.2.01.00"
+                    }, 
+                    "account_number": "5.1.2.00.00"
                 }, 
-                "2.2.4.00.00 - OTRAS DEUDAS NO CORRIENTES": {
-                    "is_group": 1
-                }
+                "GASTOS FINANCIEROS": {
+                    "Amortizaciones Inversiones en bienes": {
+                        "account_number": "5.1.5.08.00"
+                    }, 
+                    "Diferencia de Cambio": {
+                        "account_number": "5.1.5.04.00"
+                    }, 
+                    "Diferencia de Cambio Balance en": {
+                        "account_number": "5.1.5.05.00"
+                    }, 
+                    "Intereses a Proveedores": {
+                        "account_number": "5.1.5.02.00"
+                    }, 
+                    "Intereses y Gastos bancarios": {
+                        "account_number": "5.1.5.01.00"
+                    }, 
+                    "Intereses y recargos impositivos": {
+                        "account_number": "5.1.5.03.00"
+                    }, 
+                    "R.E.C.P.A.M": {
+                        "account_number": "5.1.5.09.00"
+                    }, 
+                    "Resultado por tenencia (negativo)": {
+                        "account_number": "5.1.5.06.00"
+                    }, 
+                    "Resultado por tenencia negativo de": {
+                        "account_number": "5.1.5.10.00"
+                    }, 
+                    "account_number": "5.1.5.00.00"
+                }, 
+                "GASTOS SOBRE EXISTENCIAS": {
+                    "Ajuste de Existencia": {
+                        "account_number": "5.1.8.03.00", 
+                        "account_type": "Stock Adjustment"
+                    }, 
+                    "Costo sobre ventas": {
+                        "account_number": "5.1.8.01.00", 
+                        "account_type": "Cost of Goods Sold"
+                    }, 
+                    "Gastos de Valoracion": {
+                        "account_number": "5.1.8.02.00", 
+                        "account_type": "Expenses Included In Valuation"
+                    }, 
+                    "account_number": "5.1.8.00.00"
+                }, 
+                "IMPUESTOS": {
+                    "Impuesto a las Ganancia Mi\u0301nima": {
+                        "account_number": "5.1.7.02.00"
+                    }, 
+                    "Impuesto a las Ganancias": {
+                        "account_number": "5.1.7.01.00"
+                    }, 
+                    "Impuesto a los Ingresos Brutos": {
+                        "account_number": "5.1.7.03.00"
+                    }, 
+                    "Impuesto s/ los De\u0301bitos y Cre\u0301ditos": {
+                        "account_number": "5.1.7.06.00"
+                    }, 
+                    "Impuestos Territoriales": {
+                        "account_number": "5.1.7.05.00"
+                    }, 
+                    "Impuestos internos y varios": {
+                        "account_number": "5.1.7.07.00"
+                    }, 
+                    "Tasa municipal": {
+                        "account_number": "5.1.7.04.00"
+                    }, 
+                    "account_number": "5.1.7.00.00"
+                }, 
+                "account_number": "5.1.0.00.00"
             }, 
-            "root_type": "Liability"
+            "account_number": "5.0.0.00.00", 
+            "root_type": "Expense"
         }, 
-        "3.0.0.00.00 - PATRIMONIO NETO": {
-            "3.1.0.00.00 - APORTE DE LOS PROPIETARIOS": {
-                "3.1.1.00.00 - CAPITAL SOCIAL": {
-                    "3.1.1.01.00 - Acciones en Circulacio\u0301n": {}, 
-                    "3.1.1.02.00 - Aportes Irrevocables": {}, 
-                    "3.1.1.03.00 - Acciones a distribuir": {}, 
-                    "3.1.1.04.00 - Capital": {}, 
-                    "3.1.1.05.00 - Ajuste del Capital": {}
-                }
-            }, 
-            "3.3.0.00.00 - RESERVAS": {
-                "3.3.1.00.00 - Reserva Legal": {}, 
-                "3.3.2.00.00 - Reserva Facultativa": {}, 
-                "3.3.3.00.00 - Reserva Estatutaria": {}, 
-                "3.3.4.00.00 - Ajuste Reserva Legal": {}
-            }, 
-            "3.4.0.00.00 - RESULTADOS ACUMULADOS": {
-                "3.4.1.00.00 - Resultado del Ejercicio": {}, 
-                "3.4.2.00.00 - Resultado Ejercicios Anteriores": {}, 
-                "3.4.3.00.00 - A.R.E.A (P)": {}, 
-                "3.4.4.00.00 - A.R.E.A (G)": {}
-            }, 
-            "root_type": "Equity"
-        }, 
-        "4.1.0.00.00 - INGRESOS": {
-            "4.1.0.00.00 - INGRESOS ORDINARIOS": {
-                "4.1.1.00.00 - INGRESOS POR SERVICIOS PRESTADOS": {
-                    "4.1.1.01.00 - Ventas de Servicios": {}, 
-                    "4.1.1.02.00 - Ingresos de fuente extranjera": {}
+        "INGRESOS": {
+            "INGRESOS EXTRAORDINARIOS": {
+                "Otros ingresos extraordinarios": {
+                    "account_number": "4.2.3.00.00"
                 }, 
-                "4.1.3.00.00 - RESULTADOS FINANCIEROS Y POR": {
-                    "4.1.3.01.00 - Intereses Ganados": {}, 
-                    "4.1.3.02.00 - Resultado por Tenencia de acciones": {}, 
-                    "4.1.3.03.00 - Diferencia tipo de cambio": {}, 
-                    "4.1.3.04.00 - Resultado por tenencia (positivo)": {}
+                "Reintegro de Seguros": {
+                    "account_number": "4.2.2.00.00"
                 }, 
-                "4.1.4.00.00 - OTROS INGRESOS ORDINARIOS": {
+                "Utilidad Venta Bienes de Uso": {
+                    "account_number": "4.2.1.00.00"
+                }, 
+                "account_number": "4.2.0.00.00"
+            }, 
+            "INGRESOS ORDINARIOS": {
+                "INGRESOS POR SERVICIOS PRESTADOS": {
+                    "Ingresos de fuente extranjera": {
+                        "account_number": "4.1.1.02.00"
+                    }, 
+                    "Ventas de Servicios": {
+                        "account_number": "4.1.1.01.00"
+                    }, 
+                    "account_number": "4.1.1.00.00"
+                }, 
+                "OTROS INGRESOS ORDINARIOS": {
+                    "account_number": "4.1.4.00.00", 
                     "is_group": 1
-                }
+                }, 
+                "RESULTADOS FINANCIEROS Y POR": {
+                    "Diferencia tipo de cambio": {
+                        "account_number": "4.1.3.03.00"
+                    }, 
+                    "Intereses Ganados": {
+                        "account_number": "4.1.3.01.00"
+                    }, 
+                    "Resultado por Tenencia de acciones": {
+                        "account_number": "4.1.3.02.00"
+                    }, 
+                    "Resultado por tenencia (positivo)": {
+                        "account_number": "4.1.3.04.00"
+                    }, 
+                    "account_number": "4.1.3.00.00"
+                }, 
+                "account_number": "4.1.0.00.00"
             }, 
-            "4.2.0.00.00 - INGRESOS EXTRAORDINARIOS": {
-                "4.2.1.00.00 - Utilidad Venta Bienes de Uso": {}, 
-                "4.2.2.00.00 - Reintegro de Seguros": {}, 
-                "4.2.3.00.00 - Otros ingresos extraordinarios": {}
-            }, 
+            "account_number": "4.0.0.00.00", 
             "root_type": "Income"
         }, 
-        "5.0.0.00.00 - EGRESOS": {
-            "5.1.0.00.00 - EGRESOS ORDINARIOS": {
-                "5.1.2.00.00 - GASTOS DE EXPLOTACIO\u0301N": {
-                    "5.1.2.01.00 - Sueldos y Jornales - Explotacio\u0301n": {}, 
-                    "5.1.2.02.00 - Cargas Sociales - Explotacio\u0301n": {}, 
-                    "5.1.2.03.00 - Energi\u0301a - Explotacio\u0301n": {}, 
-                    "5.1.2.04.00 - Honorarios Profesionales - Explotacio\u0301n": {}, 
-                    "5.1.2.05.00 - Ropa de trabajo - Explotacio\u0301n": {}, 
-                    "5.1.2.06.00 - Seguros - Explotacio\u0301n": {}, 
-                    "5.1.2.07.00 - Despidos - Explotacio\u0301n": {}, 
-                    "5.1.2.08.00 - Comida del personal - Explotacio\u0301n": {}, 
-                    "5.1.2.09.00 - Cuota me\u0301dica a cargo del empleador": {}, 
-                    "5.1.2.10.00 - Amortizaciones - Explotacio\u0301n": {}, 
-                    "5.1.2.11.00 - Repuestos y Reparaciones - Explotacio\u0301n": {}, 
-                    "5.1.2.12.00 - Gastos de limpieza - Explotacio\u0301n": {}, 
-                    "5.1.2.13.00 - Mantenimiento - Explotacio\u0301n": {}, 
-                    "5.1.2.14.00 - Combustibles y Lubricantes - Explotacio\u0301n": {}, 
-                    "5.1.2.15.00 - Insumos diversos - Explotacio\u0301n": {}, 
-                    "5.1.2.16.00 - Fletes - Explotacio\u0301n": {}
-                }, 
-                "5.1.3.00.00 - GASTOS DE ADMINISTRACIO\u0301N": {
-                    "5.1.3.01.00 - Sueldos - Administracio\u0301n": {}, 
-                    "5.1.3.02.00 - Cargas Sociales - Administracio\u0301n": {}, 
-                    "5.1.3.03.00 - Honorarios - Administracio\u0301n": {}, 
-                    "5.1.3.04.00 - Amortizaciones - Administracio\u0301n": {}, 
-                    "5.1.3.05.00 - Via\u0301ticos - Administracio\u0301n": {}, 
-                    "5.1.3.06.00 - Libreri\u0301a y Papeleri\u0301a - Administracio\u0301n": {}, 
-                    "5.1.3.07.00 - Certificaciones y Sellados": {}, 
-                    "5.1.3.08.00 - Gastos Bancarios - Administracio\u0301n": {}, 
-                    "5.1.3.09.00 - Gastos Varios - Administracio\u0301n": {}, 
-                    "5.1.3.10.00 - Insumos Computacio\u0301n - Administracio\u0301n": {}, 
-                    "5.1.3.11.00 - Correspondencia - Administracio\u0301n": {}, 
-                    "5.1.3.12.00 - Mantenimiento - Administracio\u0301n": {}, 
-                    "5.1.3.13.00 - Energi\u0301a - Administracio\u0301n": {}, 
-                    "5.1.3.14.00 - Seguros - Administracio\u0301n": {}, 
-                    "5.1.3.15.00 - Costo sobre ventas": {
-                        "account_type": "Cost of Goods Sold"
+        "PASIVO": {
+            "PASIVO CORRIENTE": {
+                "CARGAS FISCALES": {
+                    "IMPUESTO A LAS GANANCIAS": {
+                        "Impuesto Ganancia Mi\u0301nima Presunta a": {
+                            "account_number": "2.1.3.03.01"
+                        }, 
+                        "Impuesto a las Ganancias a Pagar": {
+                            "account_number": "2.1.3.03.02"
+                        }, 
+                        "Pasivo por Impuesto Diferido": {
+                            "account_number": "2.1.3.03.03"
+                        }, 
+                        "Percepciones y Retenciones efectuadas": {
+                            "account_number": "2.1.3.03.04"
+                        }, 
+                        "account_number": "2.1.3.03.00"
                     }, 
-                    "5.1.3.16.00 - Gastos de Valoracion": {
-                        "account_type": "Expenses Included In Valuation"
-                    }
-                }, 
-                "5.1.4.00.00 - GASTOS DE COMERCIALIZACIO\u0301N": {
-                    "5.1.4.01.00 - Sueldos - Comercializacio\u0301n": {}, 
-                    "5.1.4.02.00 - Cargas Sociales - Comercializacio\u0301n": {}, 
-                    "5.1.4.03.00 - Publicidad - Comercializacio\u0301n": {}, 
-                    "5.1.4.04.00 - Amortizaciones - Comercializacio\u0301n": {}, 
-                    "5.1.4.05.00 - Seguros - Comercializacio\u0301n": {}, 
-                    "5.1.4.06.00 - Honorarios - Comercializacio\u0301n": {}, 
-                    "5.1.4.07.00 - Gastos Varios - Comercializacio\u0301n": {}, 
-                    "5.1.4.08.00 - Fletes - Comercializacio\u0301n": {}, 
-                    "5.1.4.09.00 - IVA no computable - Comercializacio\u0301n": {}, 
-                    "5.1.4.10.00 - Descuentos otorgados a clientes": {}, 
-                    "5.1.4.11.00 - Comisiones de terceros": {}, 
-                    "5.1.4.12.00 - Quebrantos por deudores": {}, 
-                    "5.1.4.13.00 - Via\u0301ticos - Comercializacio\u0301n": {}
-                }, 
-                "5.1.5.00.00 - GASTOS FINANCIEROS": {
-                    "5.1.5.01.00 - Intereses y Gastos bancarios": {}, 
-                    "5.1.5.02.00 - Intereses a Proveedores": {}, 
-                    "5.1.5.03.00 - Intereses y recargos impositivos": {}, 
-                    "5.1.5.04.00 - Diferencia de Cambio": {}, 
-                    "5.1.5.05.00 - Diferencia de Cambio Balance en": {}, 
-                    "5.1.5.06.00 - Resultado por tenencia (negativo)": {}, 
-                    "5.1.5.08.00 - Amortizaciones Inversiones en bienes": {}, 
-                    "5.1.5.09.00 - R.E.C.P.A.M": {}, 
-                    "5.1.5.10.00 - Resultado por tenencia negativo de": {}
-                }, 
-                "5.1.7.00.00 - IMPUESTOS": {
-                    "5.1.7.01.00 - Impuesto a las Ganancias": {}, 
-                    "5.1.7.02.00 - Impuesto a las Ganancia Mi\u0301nima": {}, 
-                    "5.1.7.03.00 - Impuesto a los Ingresos Brutos": {}, 
-                    "5.1.7.04.00 - Tasa municipal": {}, 
-                    "5.1.7.05.00 - Impuestos Territoriales": {}, 
-                    "5.1.7.06.00 - Impuesto s/ los De\u0301bitos y Cre\u0301ditos": {}, 
-                    "5.1.7.07.00 - Impuestos internos y varios": {}
-                }, 
-                "5.1.8.00.00 - GASTOS SOBRE EXISTENCIAS": {
-                    "5.1.8.01.00 - Costo sobre ventas": {
-                        "account_type": "Cost of Goods Sold"
+                    "IMPUESTO AL VALOR AGREGADO": {
+                        "IVA De\u0301bito Fiscal": {
+                            "account_number": "2.1.3.01.01"
+                        }, 
+                        "IVA De\u0301bito Fiscal Sobretasa": {
+                            "account_number": "2.1.3.01.02"
+                        }, 
+                        "IVA a Pagar": {
+                            "account_number": "2.1.3.01.04"
+                        }, 
+                        "Percepciones y Retenciones efectuadas": {
+                            "account_number": "2.1.3.01.03"
+                        }, 
+                        "account_number": "2.1.3.01.00"
                     }, 
-                    "5.1.8.02.00 - Gastos de Valoracion": {
-                        "account_type": "Expenses Included In Valuation"
+                    "INGRESOS BRUTOS": {
+                        "Impuesto a los Ingresos Brutos a Pagar": {
+                            "account_number": "2.1.3.02.01"
+                        }, 
+                        "Percepciones efectuadas Ingresos": {
+                            "account_number": "2.1.3.02.02"
+                        }, 
+                        "account_number": "2.1.3.02.00"
                     }, 
-                    "5.1.8.03.00 - Ajuste de Existencia": {
-                        "account_type": "Stock Adjustment"
-                    }
-                }
+                    "account_number": "2.1.3.00.00"
+                }, 
+                "DEUDAS COMERCIALES CORRIENTES": {
+                    "ACREEDORES": {
+                        "Acreedores Locales (Ctes.)": {
+                            "account_number": "2.1.1.02.01", 
+                            "account_type": "Payable"
+                        }, 
+                        "account_number": "2.1.1.02.00"
+                    }, 
+                    "account_number": "2.1.1.00.00"
+                }, 
+                "DEUDAS FINANCIERAS": {
+                    "Pre\u0301stamo Banco de la Nacio\u0301n Argentina (Cte.)": {
+                        "account_number": "2.1.4.01.00"
+                    }, 
+                    "Pre\u0301stamo Banco de la Provincia de Bs. As.": {
+                        "account_number": "2.1.4.02.00"
+                    }, 
+                    "account_number": "2.1.4.00.00"
+                }, 
+                "INVENTARIOS POR PAGAR": {
+                    "Inventario entrante no facturado": {
+                        "account_number": "2.1.7.01.00", 
+                        "account_type": "Stock Received But Not Billed"
+                    }, 
+                    "account_number": "2.1.7.00.00"
+                }, 
+                "OTRAS DEUDAS CORRIENTES": {
+                    "Dividendos a pagar (Ctes.)": {
+                        "account_number": "2.1.5.01.00"
+                    }, 
+                    "Honorarios Directores a Pagar (Ctes.)": {
+                        "account_number": "2.1.5.02.00"
+                    }, 
+                    "account_number": "2.1.5.00.00"
+                }, 
+                "PROVISIONES": {
+                    "Provisio\u0301n para SAC": {
+                        "account_number": "2.1.6.02.00"
+                    }, 
+                    "Provisio\u0301n para despidos": {
+                        "account_number": "2.1.6.01.00"
+                    }, 
+                    "account_number": "2.1.6.00.00"
+                }, 
+                "REMUNERACIONES Y CAGAS SOCIALES": {
+                    "DEUDAS PREVISIONALES": {
+                        "ART a pagar": {
+                            "account_number": "2.1.2.02.02"
+                        }, 
+                        "Jubilaciones a pagar": {
+                            "account_number": "2.1.2.02.01"
+                        }, 
+                        "Obra Social a pagar": {
+                            "account_number": "2.1.2.02.03"
+                        }, 
+                        "SAC a pagar": {
+                            "account_number": "2.1.2.02.04"
+                        }, 
+                        "Vacaciones a pagar": {
+                            "account_number": "2.1.2.02.05"
+                        }, 
+                        "account_number": "2.1.2.02.00"
+                    }, 
+                    "Sueldos y Jornales a pagar": {
+                        "account_number": "2.1.2.03.00", 
+                        "account_type": "Chargeable"
+                    }, 
+                    "account_number": "2.1.2.00.00"
+                }, 
+                "account_number": "2.1.0.00.00"
             }, 
-            "5.2.0.00.00 - EGRESOS EXTRAORDINARIOS": {
-                "5.2.1.00.00 - Pe\u0301rdida por venta bienes de uso": {}, 
-                "5.2.2.00.00 - Amortizaciones extraordinarias": {}, 
-                "5.2.3.00.00 - Ajuste del valor de los bienes": {}, 
-                "5.2.4.00.00 - Ajuste de Amortizaciones acumuladas de": {}
+            "PASIVO NO CORRIENTE": {
+                "CARGAS FISCALES NO CORRIENTES": {
+                    "Moratoria": {
+                        "account_number": "2.2.2.01.00"
+                    }, 
+                    "account_number": "2.2.2.00.00"
+                }, 
+                "DEUDAS COMERCIALES": {
+                    "ACREEDORES": {
+                        "Acreedores Locales (No Ctes.)": {
+                            "account_number": "2.2.3.01.01"
+                        }, 
+                        "account_number": "2.2.3.01.00"
+                    }, 
+                    "account_number": "2.2.3.00.00"
+                }, 
+                "DEUDAS FINANCIERAS NO CORRIENTES": {
+                    "Pre\u0301stamo Banco de la Nacio\u0301n Argentina(ejemplo) (No": {
+                        "account_number": "2.2.1.01.00"
+                    }, 
+                    "account_number": "2.2.1.00.00"
+                }, 
+                "OTRAS DEUDAS NO CORRIENTES": {
+                    "account_number": "2.2.4.00.00", 
+                    "is_group": 1
+                }, 
+                "account_number": "2.2.0.00.00"
             }, 
-            "root_type": "Expense"
+            "account_number": "2.0.0.00.00", 
+            "root_type": "Liability"
+        }, 
+        "PATRIMONIO NETO": {
+            "APORTE DE LOS PROPIETARIOS": {
+                "CAPITAL SOCIAL": {
+                    "Acciones a distribuir": {
+                        "account_number": "3.1.1.03.00"
+                    }, 
+                    "Acciones en Circulacio\u0301n": {
+                        "account_number": "3.1.1.01.00"
+                    }, 
+                    "Ajuste del Capital": {
+                        "account_number": "3.1.1.05.00"
+                    }, 
+                    "Aportes Irrevocables": {
+                        "account_number": "3.1.1.02.00"
+                    }, 
+                    "Capital": {
+                        "account_number": "3.1.1.04.00"
+                    }, 
+                    "account_number": "3.1.1.00.00"
+                }, 
+                "account_number": "3.1.0.00.00"
+            }, 
+            "RESERVAS": {
+                "Ajuste Reserva Legal": {
+                    "account_number": "3.3.4.00.00"
+                }, 
+                "Reserva Estatutaria": {
+                    "account_number": "3.3.3.00.00"
+                }, 
+                "Reserva Facultativa": {
+                    "account_number": "3.3.2.00.00"
+                }, 
+                "Reserva Legal": {
+                    "account_number": "3.3.1.00.00"
+                }, 
+                "account_number": "3.3.0.00.00"
+            }, 
+            "RESULTADOS ACUMULADOS": {
+                "A.R.E.A (G)": {
+                    "account_number": "3.4.4.00.00"
+                }, 
+                "A.R.E.A (P)": {
+                    "account_number": "3.4.3.00.00"
+                }, 
+                "Resultado Ejercicios Anteriores": {
+                    "account_number": "3.4.2.00.00"
+                }, 
+                "Resultado del Ejercicio": {
+                    "account_number": "3.4.1.00.00"
+                }, 
+                "account_number": "3.4.0.00.00"
+            }, 
+            "account_number": "3.0.0.00.00", 
+            "root_type": "Equity"
         }
     }
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_plan_comptable_general.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_plan_comptable_general.json
index 018d368..da1d10d 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_plan_comptable_general.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_plan_comptable_general.json
@@ -1,6 +1,6 @@
 {
     "country_code": "fr", 
-    "name": "France - Plan Comptable G\u00e9n\u00e9ral", 
+    "name": "France - Plan Comptable General", 
     "tree": {
         "1-Comptes de Capitaux": {
             "10-Capital et R\u00e9serves": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/gt_cuentas_plantilla.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/gt_cuentas_plantilla.json
index f7cf9a0..0434938 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/gt_cuentas_plantilla.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/gt_cuentas_plantilla.json
@@ -2,7 +2,394 @@
     "country_code": "gt", 
     "name": "Guatemala - Cuentas", 
     "tree": {
-        "02 - Pasivos": {
+        "Activos": {
+            "Activo Corriente": {
+                "Activos Biol\u00f3gicos": {
+                    "Activos Biol\u00f3gicos a Valor Razonable": {
+                        "Animales": {
+                            "account_number": "1.5.2.1", 
+                            "account_type": "Stock", 
+                            "is_group": 1
+                        }, 
+                        "Plantas": {
+                            "account_number": "1.5.2.2", 
+                            "account_type": "Stock", 
+                            "is_group": 1
+                        }, 
+                        "account_number": "1.5.2", 
+                        "account_type": "Stock"
+                    }, 
+                    "Activos Biol\u00f3gicos al Costo": {
+                        "account_number": "1.5.1", 
+                        "account_type": "Stock", 
+                        "is_group": 1
+                    }, 
+                    "account_number": "1.5", 
+                    "account_type": "Stock"
+                }, 
+                "Activos Corrientes Adicionales": {
+                    "Activos Diferidos o Restringidos": {
+                        "Cr\u00e9dito Fiscal (IVA Por Cobrar)": {
+                            "account_number": "1.1.2.1", 
+                            "account_type": "Chargeable", 
+                            "is_group": 1
+                        }, 
+                        "account_number": "1.1.2", 
+                        "account_type": "Chargeable"
+                    }, 
+                    "Inversiones Corrientes no Clasificados como Equivalentes de Caja y Bancos": {
+                        "account_number": "1.1.1"
+                    }, 
+                    "account_number": "1.1", 
+                    "account_type": "Chargeable"
+                }, 
+                "Activos Devengables y Otros Activos": {
+                    "Activos Adicionales y Otros": {
+                        "account_number": "1.6.6", 
+                        "account_type": "Chargeable", 
+                        "is_group": 1
+                    }, 
+                    "Cobrables Relacionados con Impuestos": {
+                        "account_number": "1.6.2", 
+                        "account_type": "Chargeable", 
+                        "is_group": 1
+                    }, 
+                    "Contratos de Construccion": {
+                        "account_number": "1.6.4", 
+                        "account_type": "Chargeable", 
+                        "is_group": 1
+                    }, 
+                    "Costos de Montaje": {
+                        "account_number": "1.6.5", 
+                        "account_type": "Chargeable", 
+                        "is_group": 1
+                    }, 
+                    "Pagos Anticipados y Otros Activos Circulantes": {
+                        "Seguro Pagado Anticipadamente": {
+                            "account_number": "1.6.1.0", 
+                            "account_type": "Chargeable"
+                        }, 
+                        "account_number": "1.6.1", 
+                        "account_type": "Chargeable"
+                    }, 
+                    "Proveedores de Servicio": {
+                        "account_number": "1.6.3", 
+                        "account_type": "Chargeable", 
+                        "is_group": 1
+                    }, 
+                    "account_number": "1.6", 
+                    "account_type": "Chargeable"
+                }, 
+                "Activos Financieros": {
+                    "Activos Financieros Clasificados por Designaci\u00f3n": {
+                        "account_number": "1.4.6", 
+                        "account_type": "Chargeable", 
+                        "is_group": 1
+                    }, 
+                    "Activos Financieros Derivados": {
+                        "account_number": "1.4.3", 
+                        "account_type": "Chargeable", 
+                        "is_group": 1
+                    }, 
+                    "Inversion o Participaci\u00f3n Accionaria en Empresas Afiliadas": {
+                        "account_number": "1.4.1", 
+                        "account_type": "Chargeable", 
+                        "is_group": 1
+                    }, 
+                    "Inversiones Burs\u00e1tiles e Instrumentos Financieros": {
+                        "account_number": "1.4.2", 
+                        "account_type": "Chargeable", 
+                        "is_group": 1
+                    }, 
+                    "Otros Activos Financieros": {
+                        "account_number": "1.4.4", 
+                        "account_type": "Chargeable", 
+                        "is_group": 1
+                    }, 
+                    "Provisi\u00f3n por Riesgo de Cr\u00e9dito (agregado) (Contra-activo)": {
+                        "account_number": "1.4.5", 
+                        "account_type": "Round Off", 
+                        "is_group": 1
+                    }, 
+                    "account_number": "1.4", 
+                    "account_type": "Chargeable"
+                }, 
+                "Activos Intangibles": {
+                    "account_number": "1.3", 
+                    "account_type": "Chargeable", 
+                    "is_group": 1
+                }, 
+                "Caja y Equivalentes": {
+                    "Caja": {
+                        "account_number": "1.9.1", 
+                        "account_type": "Cash", 
+                        "is_group": 1
+                    }, 
+                    "Equivalentes de Efectivo (Bancos)": {
+                        "Bancos Internacionales": {
+                            "HSBC": {
+                                "account_number": "1.9.2.2.1", 
+                                "account_type": "Bank"
+                            }, 
+                            "account_number": "1.9.2.2", 
+                            "account_type": "Bank"
+                        }, 
+                        "Bancos Nacionales": {
+                            "Banco Agromercantil de Guatemala": {
+                                "account_number": "1.9.2.1.2", 
+                                "account_type": "Bank"
+                            }, 
+                            "Banco G&T Continental": {
+                                "account_number": "1.9.2.1.5", 
+                                "account_type": "Bank"
+                            }, 
+                            "Banco Industrial": {
+                                "account_number": "1.9.2.1.1", 
+                                "account_type": "Bank", 
+                                "is_group": 1
+                            }, 
+                            "Banco Internacional": {
+                                "account_number": "1.9.2.1.6", 
+                                "account_type": "Bank"
+                            }, 
+                            "Banco Prom\u00e9rica": {
+                                "account_number": "1.9.2.1.3", 
+                                "account_type": "Bank"
+                            }, 
+                            "Banco de Am\u00e9rica Central": {
+                                "account_number": "1.9.2.1.4", 
+                                "account_type": "Bank"
+                            }, 
+                            "Banco de Desarrollo Rural": {
+                                "account_number": "1.9.2.1.7", 
+                                "account_type": "Bank"
+                            }, 
+                            "Banco de los Trabajadores": {
+                                "account_number": "1.9.2.1.8", 
+                                "account_type": "Bank"
+                            }, 
+                            "Vivibanco": {
+                                "account_number": "1.9.2.1.9", 
+                                "account_type": "Bank"
+                            }, 
+                            "account_number": "1.9.2.1", 
+                            "account_type": "Bank"
+                        }, 
+                        "Cadena de Bloques (Blockchain)": {
+                            "Billetera Bitcoin 1234567890abcdefg": {
+                                "account_number": "1.9.2.3.1", 
+                                "account_type": "Cash"
+                            }, 
+                            "account_number": "1.9.2.3", 
+                            "account_type": "Cash"
+                        }, 
+                        "account_number": "1.9.2", 
+                        "account_type": "Bank"
+                    }, 
+                    "Inversiones a Corto Plazo": {
+                        "account_number": "1.9.3", 
+                        "account_type": "Bank", 
+                        "is_group": 1
+                    }, 
+                    "Otros Equivalentes de Caja y Bancos": {
+                        "account_number": "1.9.4", 
+                        "account_type": "Cash", 
+                        "is_group": 1
+                    }, 
+                    "account_number": "1.9", 
+                    "account_type": "Bank"
+                }, 
+                "Cobrables": {
+                    "Activos bajo Contrato": {
+                        "account_number": "1.8.2", 
+                        "account_type": "Receivable", 
+                        "is_group": 1
+                    }, 
+                    "Ajustes": {
+                        "account_number": "1.8.4", 
+                        "account_type": "Chargeable", 
+                        "is_group": 1
+                    }, 
+                    "Otras Cuentas por Cobrar": {
+                        "Cuentas Por Cobrar Compa\u00f1\u00edas Afiliadas": {
+                            "Compa\u00f1\u00eda subsidiaria (EJEMPLO)": {
+                                "account_number": "1.8.3.2.1", 
+                                "account_type": "Receivable"
+                            }, 
+                            "account_number": "1.8.3.2", 
+                            "account_type": "Receivable"
+                        }, 
+                        "Cuentas por Cobrar a Empleados": {
+                            "Prestamo EJEMPLO": {
+                                "account_number": "1.8.3.3.1", 
+                                "account_type": "Receivable"
+                            }, 
+                            "account_number": "1.8.3.3", 
+                            "account_type": "Receivable"
+                        }, 
+                        "Cuentas por Cobrar a Otras Entidades no Afiliadas": {
+                            "Compa\u00f1\u00eda No Afiliada (EJEMPLO)": {
+                                "account_number": "1.8.3.1.1", 
+                                "account_type": "Receivable"
+                            }, 
+                            "account_number": "1.8.3.1", 
+                            "account_type": "Receivable"
+                        }, 
+                        "account_number": "1.8.3", 
+                        "account_type": "Receivable"
+                    }, 
+                    "Ventas al Cr\u00e9dito": {
+                        "account_number": "1.8.1", 
+                        "account_type": "Receivable", 
+                        "is_group": 1
+                    }, 
+                    "account_number": "1.8", 
+                    "account_type": "Receivable"
+                }, 
+                "Impuestos por Cobrar": {
+                    "Retenciones de IVA recibidas": {}
+                }, 
+                "Inventario": {
+                    "Art\u00edculos de Inventario Adicionales": {
+                        "account_number": "1.7.8", 
+                        "account_type": "Stock", 
+                        "is_group": 1
+                    }, 
+                    "Combustibles": {
+                        "account_number": "1.7.5", 
+                        "account_type": "Stock", 
+                        "is_group": 1
+                    }, 
+                    "Inventarios Pignorados Como Garant\u00eda de Pasivo": {
+                        "account_number": "1.7.10", 
+                        "account_type": "Stock", 
+                        "is_group": 1
+                    }, 
+                    "Inventarios a Valor Razonable Menos Costos de Venta": {
+                        "account_number": "1.7.11", 
+                        "account_type": "Stock", 
+                        "is_group": 1
+                    }, 
+                    "Materia Prima": {
+                        "account_number": "1.7.1", 
+                        "account_type": "Stock", 
+                        "is_group": 1
+                    }, 
+                    "Mercader\u00eda (Mercanc\u00edas)": {
+                        "account_number": "1.7.2", 
+                        "account_type": "Stock", 
+                        "is_group": 1
+                    }, 
+                    "Otros Inventarios": {
+                        "Merma o Ajuste de Inventario": {
+                            "account_number": "1.7.9.1", 
+                            "account_type": "Stock Adjustment", 
+                            "is_group": 1
+                        }, 
+                        "account_number": "1.7.9", 
+                        "account_type": "Stock"
+                    }, 
+                    "Producto Terminado": {
+                        "account_number": "1.7.7", 
+                        "account_type": "Stock", 
+                        "is_group": 1
+                    }, 
+                    "Repuestos": {
+                        "Respuestos en Transito": {
+                            "account_number": "1.7.4.0", 
+                            "account_type": "Stock", 
+                            "is_group": 1
+                        }, 
+                        "account_number": "1.7.4", 
+                        "account_type": "Stock"
+                    }, 
+                    "Suministros de Producci\u00f3n y Consumibles": {
+                        "account_number": "1.7.3", 
+                        "account_type": "Stock", 
+                        "is_group": 1
+                    }, 
+                    "Trabajo en Progeso": {
+                        "account_number": "1.7.6", 
+                        "account_type": "Stock", 
+                        "is_group": 1
+                    }, 
+                    "account_number": "1.7", 
+                    "account_type": "Stock"
+                }, 
+                "Inversion en Propiedades": {
+                    "Inversion Inmobiliaria Bajo Construccion": {
+                        "account_number": "1.2.1", 
+                        "account_type": "Chargeable"
+                    }, 
+                    "Inversion Inmobiliaria Construida": {
+                        "account_number": "1.2.2", 
+                        "account_type": "Chargeable", 
+                        "is_group": 1
+                    }, 
+                    "account_number": "1.2", 
+                    "account_type": "Chargeable"
+                }, 
+                "account_number": "1.0"
+            }, 
+            "No Corriente": {
+                "Activos Fijos": {
+                    "account_type": "Fixed Asset"
+                }, 
+                "Cargos Diferidos": {}
+            }, 
+            "account_number": "1", 
+            "root_type": "Asset"
+        }, 
+        "Costos": {
+            "Costo de Ventas": {
+                "account_type": "Cost of Goods Sold"
+            }, 
+            "Costos Incluidos en la Valuaci\u00f3n": {
+                "account_type": "Expenses Included In Valuation"
+            }, 
+            "Merma o Ajuste de Inventario": {
+                "account_type": "Stock Adjustment"
+            }, 
+            "account_number": "5", 
+            "root_type": "Expense"
+        }, 
+        "Gastos": {
+            "Alquileres": {}, 
+            "Depreciaciones": {
+                "account_type": "Depreciation"
+            }, 
+            "Gastos Diversos": {}, 
+            "Gastos de Personal": {}, 
+            "Honorarios Profesionales": {}, 
+            "Mantenimiento": {}, 
+            "Seguros": {}, 
+            "Servicios B\u00e1sicos": {}, 
+            "account_number": "6", 
+            "root_type": "Expense"
+        }, 
+        "Ingresos": {
+            "Productos": {}, 
+            "Servicios": {}, 
+            "account_number": "4", 
+            "root_type": "Income"
+        }, 
+        "Otros Gastos y Productos Financieros": {
+            "Otros Gastos": {
+                "Otros Gastos y Productos Financieros 2": {
+                    "Intereses 1": {}, 
+                    "Otros Gastos Financieros 1": {}
+                }
+            }, 
+            "Otros Ingresos": {
+                "Otros Gastos y Productos Financieros 1": {
+                    "Intereses": {}, 
+                    "Otros Gastos Financieros": {}
+                }
+            }, 
+            "account_number": "7", 
+            "root_type": "Expense"
+        }, 
+        "Pasivos": {
             "Pasivo Corriente": {
                 "Acreedores 1": {
                     "account_type": "Payable"
@@ -22,329 +409,14 @@
                 "Acreedores": {}, 
                 "Provisi\u00f3n para Indemnizaciones": {}
             }, 
+            "account_number": "2", 
             "root_type": "Liability"
         }, 
-        "03 - Patrimonio": {
+        "Patrimonio": {
             "Capital": {}, 
             "Resultados del Ejercicio": {}, 
             "Utilidades Retenidas": {}, 
-            "root_type": "Asset"
-        }, 
-        "04 - Ingresos": {
-            "Productos": {}, 
-            "Servicios": {}, 
-            "root_type": "Income"
-        }, 
-        "05 - Costos": {
-            "Costo de Ventas": {
-                "account_type": "Cost of Goods Sold"
-            }, 
-            "Costos Incluidos en la Valuaci\u00f3n": {
-                "account_type": "Expenses Included In Valuation"
-            }, 
-            "Merma o Ajuste de Inventario": {
-                "account_type": "Stock Adjustment"
-            }, 
-            "root_type": "Expense"
-        }, 
-        "06 - Gastos": {
-            "Alquileres": {}, 
-            "Depreciaciones": {
-                "account_type": "Depreciation"
-            }, 
-            "Gastos Diversos": {}, 
-            "Gastos de Personal": {}, 
-            "Honorarios Profesionales": {}, 
-            "Mantenimiento": {}, 
-            "Seguros": {}, 
-            "Servicios B\u00e1sicos": {}, 
-            "root_type": "Expense"
-        }, 
-        "07 - Otros Gastos y Productos Financieros": {
-            "Otros Gastos": {
-                "Otros Gastos y Productos Financieros 2": {
-                    "Intereses 1": {}, 
-                    "Otros Gastos Financieros 1": {}
-                }
-            }, 
-            "Otros Ingresos": {
-                "Otros Gastos y Productos Financieros 1": {
-                    "Intereses": {}, 
-                    "Otros Gastos Financieros": {}
-                }
-            }, 
-            "root_type": "Expense"
-        }, 
-        "1 - Activos": {
-            "1. Activo Corriente": {
-                "1.10 Activos Corrientes Adicionales": {
-                    "1.10.1 Inversiones Corrientes no Clasificados como Equivalentes de Caja y Bancos": {}, 
-                    "1.10.2 Activos Diferidos o Restringidos": {
-                        "1.10.2.1 Cr\u00e9dito Fiscal (IVA Por Cobrar)": {
-                            "account_type": "Chargeable", 
-                            "is_group": 1
-                        }, 
-                        "account_type": "Chargeable"
-                    }, 
-                    "account_type": "Chargeable"
-                }, 
-                "1.2 Inversion en Propiedades": {
-                    "1.2.1 Inversion Inmobiliaria Bajo Construccion": {
-                        "account_type": "Chargeable"
-                    }, 
-                    "1.2.2 Inversion Inmobiliaria Construida": {
-                        "account_type": "Chargeable", 
-                        "is_group": 1
-                    }, 
-                    "account_type": "Chargeable"
-                }, 
-                "1.3 Activos Intangibles": {
-                    "account_type": "Chargeable", 
-                    "is_group": 1
-                }, 
-                "1.4 Activos Financieros": {
-                    "1.4.1 Inversion o Participaci\u00f3n Accionaria en Empresas Afiliadas": {
-                        "account_type": "Chargeable", 
-                        "is_group": 1
-                    }, 
-                    "1.4.2 Inversiones Burs\u00e1tiles e Instrumentos Financieros": {
-                        "account_type": "Chargeable", 
-                        "is_group": 1
-                    }, 
-                    "1.4.3 Activos Financieros Derivados": {
-                        "account_type": "Chargeable", 
-                        "is_group": 1
-                    }, 
-                    "1.4.4 Otros Activos Financieros": {
-                        "account_type": "Chargeable", 
-                        "is_group": 1
-                    }, 
-                    "1.4.5 Provisi\u00f3n por Riesgo de Cr\u00e9dito (agregado) (Contra-activo)": {
-                        "account_type": "Round Off", 
-                        "is_group": 1
-                    }, 
-                    "1.4.6 Activos Financieros Clasificados por Designaci\u00f3n": {
-                        "account_type": "Chargeable", 
-                        "is_group": 1
-                    }, 
-                    "account_type": "Chargeable"
-                }, 
-                "1.5 Activos Biol\u00f3gicos": {
-                    "1.5.1 Activos Biol\u00f3gicos al Costo": {
-                        "account_type": "Stock", 
-                        "is_group": 1
-                    }, 
-                    "1.5.2 Activos Biol\u00f3gicos a Valor Razonable": {
-                        "1.5.2.1 Animales": {
-                            "account_type": "Stock", 
-                            "is_group": 1
-                        }, 
-                        "1.5.2.2 Plantas": {
-                            "1.5.2.2.1 Division productiva 1er nivel EJEMPLO": {
-                                "1.5.2.2.1.1 Division Productiva 2do nivel EJEMPLO": {
-                                    "1.5.2.2.1.1.1 Division Productiva 3er Nivel EJEMPLO": {
-                                        "1.5.2.2.1.1.1.1 Divisi\u00f3n Productiva 4\u00ba Nivel EJEMPLO": {}, 
-                                        "account_type": "Stock"
-                                    }, 
-                                    "account_type": "Stock"
-                                }, 
-                                "account_type": "Stock"
-                            }, 
-                            "account_type": "Stock"
-                        }, 
-                        "account_type": "Stock"
-                    }, 
-                    "account_type": "Stock"
-                }, 
-                "1.6 Activos Devengables y Otros Activos": {
-                    "1.6.1 Pagos Anticipados y Otros Activos Circulantes": {
-                        "1.6.1.0 Seguro Pagado Anticipadamente": {
-                            "account_type": "Chargeable"
-                        }, 
-                        "account_type": "Chargeable"
-                    }, 
-                    "1.6.2 Cobrables Relacionados con Impuestos": {
-                        "account_type": "Chargeable", 
-                        "is_group": 1
-                    }, 
-                    "1.6.3 Proveedores de Servicio": {
-                        "account_type": "Chargeable", 
-                        "is_group": 1
-                    }, 
-                    "1.6.4 Contratos de Construccion": {
-                        "account_type": "Chargeable", 
-                        "is_group": 1
-                    }, 
-                    "1.6.5 Costos de Montaje": {
-                        "account_type": "Chargeable", 
-                        "is_group": 1
-                    }, 
-                    "1.6.6 Activos Adicionales y Otros": {
-                        "account_type": "Chargeable", 
-                        "is_group": 1
-                    }, 
-                    "account_type": "Chargeable"
-                }, 
-                "1.7 Inventario": {
-                    "1.7.1 Materia Prima": {
-                        "account_type": "Stock", 
-                        "is_group": 1
-                    }, 
-                    "1.7.10 Inventarios Pignorados Como Garant\u00eda de Pasivo": {
-                        "account_type": "Stock", 
-                        "is_group": 1
-                    }, 
-                    "1.7.11 Inventarios a Valor Razonable Menos Costos de Venta": {
-                        "account_type": "Stock", 
-                        "is_group": 1
-                    }, 
-                    "1.7.2 Mercader\u00eda (Mercanc\u00edas)": {
-                        "account_type": "Stock", 
-                        "is_group": 1
-                    }, 
-                    "1.7.3 Suministros de Producci\u00f3n y Consumibles": {
-                        "account_type": "Stock", 
-                        "is_group": 1
-                    }, 
-                    "1.7.4 Repuestos": {
-                        "1.7.4.0 Respuestos en Transito": {
-                            "account_type": "Stock", 
-                            "is_group": 1
-                        }, 
-                        "account_type": "Stock"
-                    }, 
-                    "1.7.5 Combustibles": {
-                        "account_type": "Stock", 
-                        "is_group": 1
-                    }, 
-                    "1.7.6 Trabajo en Progeso": {
-                        "account_type": "Stock", 
-                        "is_group": 1
-                    }, 
-                    "1.7.7 Producto Terminado": {
-                        "account_type": "Stock", 
-                        "is_group": 1
-                    }, 
-                    "1.7.8 Art\u00edculos de Inventario Adicionales": {
-                        "account_type": "Stock", 
-                        "is_group": 1
-                    }, 
-                    "1.7.9 Otros Inventarios": {
-                        "1.7.9.1 Merma o Ajuste de Inventario": {
-                            "account_type": "Stock Adjustment", 
-                            "is_group": 1
-                        }, 
-                        "account_type": "Stock"
-                    }, 
-                    "account_type": "Stock"
-                }, 
-                "1.8 Cobrables": {
-                    "1.8.1 Ventas al Cr\u00e9dito": {
-                        "account_type": "Receivable", 
-                        "is_group": 1
-                    }, 
-                    "1.8.2 Activos bajo Contrato": {
-                        "account_type": "Receivable", 
-                        "is_group": 1
-                    }, 
-                    "1.8.3 Otras Cuentas por Cobrar": {
-                        "1.8.3.1 Cuentas por Cobrar a Otras Entidades no Afiliadas": {
-                            "1.8.3.1.1 Compa\u00f1\u00eda No Afiliada (EJEMPLO)": {
-                                "account_type": "Receivable"
-                            }, 
-                            "account_type": "Receivable"
-                        }, 
-                        "1.8.3.2 Cuentas Por Cobrar Compa\u00f1\u00edas Afiliadas": {
-                            "1.8.3.2.1 Compa\u00f1\u00eda subsidiaria (EJEMPLO)": {
-                                "account_type": "Receivable"
-                            }, 
-                            "account_type": "Receivable"
-                        }, 
-                        "1.8.3.3 Cuentas por Cobrar a Empleados": {
-                            "1.8.3.3.1 Prestamo EJEMPLO": {
-                                "account_type": "Receivable"
-                            }, 
-                            "account_type": "Receivable"
-                        }, 
-                        "account_type": "Receivable"
-                    }, 
-                    "1.8.4 Ajustes": {
-                        "account_type": "Chargeable", 
-                        "is_group": 1
-                    }, 
-                    "account_type": "Receivable"
-                }, 
-                "1.9 Caja y Equivalentes": {
-                    "1.9.1 Caja": {
-                        "account_type": "Cash", 
-                        "is_group": 1
-                    }, 
-                    "1.9.2 Equivalentes de Efectivo (Bancos)": {
-                        "1.9.2.1 Bancos Nacionales": {
-                            "1.9.2.1.1 Banco Industrial": {
-                                "account_type": "Bank", 
-                                "is_group": 1
-                            }, 
-                            "1.9.2.1.2 Banco Agromercantil de Guatemala": {
-                                "account_type": "Bank"
-                            }, 
-                            "1.9.2.1.3 Banco Prom\u00e9rica": {
-                                "account_type": "Bank"
-                            }, 
-                            "1.9.2.1.4 Banco de Am\u00e9rica Central": {
-                                "account_type": "Bank"
-                            }, 
-                            "1.9.2.1.5 Banco G&T Continental": {
-                                "account_type": "Bank"
-                            }, 
-                            "1.9.2.1.6 Banco Internacional": {
-                                "account_type": "Bank"
-                            }, 
-                            "1.9.2.1.7 Banco de Desarrollo Rural": {
-                                "account_type": "Bank"
-                            }, 
-                            "1.9.2.1.8 Banco de los Trabajadores": {
-                                "account_type": "Bank"
-                            }, 
-                            "1.9.2.1.9 Vivibanco": {
-                                "account_type": "Bank"
-                            }, 
-                            "account_type": "Bank"
-                        }, 
-                        "1.9.2.2 Bancos Internacionales": {
-                            "1.9.2.2.1 HSBC": {
-                                "account_type": "Bank"
-                            }, 
-                            "account_type": "Bank"
-                        }, 
-                        "1.9.2.3 Cadena de Bloques (Blockchain)": {
-                            "1.9.2.3.1 Billetera Bitcoin 1234567890abcdefg": {
-                                "account_type": "Cash"
-                            }, 
-                            "account_type": "Cash"
-                        }, 
-                        "account_type": "Bank"
-                    }, 
-                    "1.9.3 Inversiones a Corto Plazo": {
-                        "account_type": "Bank", 
-                        "is_group": 1
-                    }, 
-                    "1.9.4 Otros Equivalentes de Caja y Bancos": {
-                        "account_type": "Cash", 
-                        "is_group": 1
-                    }, 
-                    "account_type": "Bank"
-                }, 
-                "Impuestos por Cobrar": {
-                    "Retenciones de IVA recibidas": {}
-                }
-            }, 
-            "No Corriente": {
-                "Activos Fijos": {
-                    "account_type": "Fixed Asset"
-                }, 
-                "Cargos Diferidos": {}
-            }, 
+            "account_number": "3", 
             "root_type": "Asset"
         }
     }
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/hu_chart_of_accounts.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/hu_chart_of_accounts.json
index fe4c484..3ed6b1d 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/hu_chart_of_accounts.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/hu_chart_of_accounts.json
@@ -527,7 +527,7 @@
 			"root_type": "Liability"
 		}, 
 		"5. SZ\u00c1MLAOSZT\u00c1LY K\u00d6LTS\u00c9GNEMEK": {
-			"51 - 53 ANYAGJELLEG\u00db R\u00c1FORD\u00cdT\u00c1SOK ": {
+			"51 - 53. ANYAGJELLEG\u00db R\u00c1FORD\u00cdT\u00c1SOK ": {
 				"51. ANYAGK\u00d6LTS\u00c9G": {
 					"511. V\u00e1s\u00e1rolt anyagok k\u00f6lts\u00e9gei ": {
 						"5111. Alapanyag k\u00f6lts\u00e9gek": {}, 
@@ -618,23 +618,8 @@
 				"581. Saj\u00e1t termel\u00e9s\u0171 k\u00e9szletek \u00e1llom\u00e1nyv\u00e1ltoz\u00e1sa ": {}, 
 				"582. Saj\u00e1t el\u0151\u00e1ll\u00edt\u00e1s\u00fa eszk\u00f6z\u00f6k aktiv\u00e1lt \u00e9rt\u00e9ke": {}, 
 				"589. Aktiv\u00e1lt saj\u00e1t teljes\u00edtm\u00e9nyek \u00e1tvezet\u00e9si sz\u00e1mla": {}
-			}, 
-			"59. K\u00d6LTS\u00c9GNEM ELLENSZ\u00c1MLA  (els\u0151dleges k\u00f6lts\u00e9ghely-k\u00f6lts\u00e9gvisel\u0151 elsz\u00e1mol\u00f3s eset\u00e9n) ": {
-				"is_group": 1
-			}, 
-			"59. K\u00d6LTS\u00c9GNEM \u00c1TVEZET\u00c9SI SZ\u00c1MLA  (els\u0151dleges k\u00f6lts\u00e9gnem-elsz\u00e1mol\u00e1s eset\u00e9n)": {
-				"is_group": 1
-			}, 
-			"59. K\u00d6LTS\u00c9GNEM \u00c1TVEZET\u00c9SI SZ\u00c1MLA  (els\u0151dleges k\u00f6lts\u00e9gnem-elsz\u00e1mol\u00e1s eset\u00e9n, kiz\u00e1r\u00f3lag \u00f6sszk\u00f6lts\u00e9g elj\u00e1r\u00e1ssal)": {
-				"59/51. Anyagk\u00f6lts\u00e9g \u00e1tvezet\u00e9si sz\u00e1mla": {}, 
-				"59/52. Ig\u00e9nybe vett szolg\u00e1ltat\u00e1sok k\u00f6lts\u00e9gei \u00e1tvezet\u00e9si sz\u00e1mla ": {}, 
-				"59/53. Egy\u00e9b szolg\u00e1ltat\u00e1sok k\u00f6lts\u00e9gei \u00e1tvezet\u00e9si sz\u00e1mla ": {}, 
-				"59/54. B\u00e9rk\u00f6lts\u00e9g \u00e1tvezet\u00e9si sz\u00e1mla": {}, 
-				"59/55. Szem\u00e9lyi jelleg\u0171 egy\u00e9b kifizet\u00e9sek \u00e1tvezet\u00e9si sz\u00e1mla ": {}, 
-				"59/56. B\u00e9rj\u00e1rul\u00e9kok \u00e1tvezet\u00e9si sz\u00e1mla": {}, 
-				"59/57. \u00c9rt\u00e9kcs\u00f6kken\u00e9si le\u00edr\u00e1s \u00e1tvezet\u00e9si sz\u00e1mla ": {}
-			}, 
-			"59. K\u00d6LTS\u00c9GNEM \u00c1TVEZET\u00c9SI SZ\u00c1MLA  (kiz\u00e1r\u00f3lag k\u00f6lts\u00e9gnem-elsz\u00e1mol\u00e1s \u00e9s forgalmi k\u00f6lts\u00e9g elj\u00e1r\u00e1ssal)": {
+			},
+			"59. K\u00d6LTS\u00c9GNEM \u00c1TVEZET\u00c9SI SZ\u00c1MLA": {
 				"is_group": 1
 			}, 
 			"root_type": "Expense"
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/id_chart_of_accounts.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/id_chart_of_accounts.json
index b37e171..37f57ec 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/id_chart_of_accounts.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/id_chart_of_accounts.json
@@ -2,358 +2,686 @@
     "country_code": "id", 
     "name": "Indonesia - Chart of Accounts", 
     "tree": {
-        "1000.0000 Aktiva": {
-            "1100.0000 Aktiva Lancar": {
-                "1110.0000 Kas": {
-                    "1111.000 Kas Rupiah": {
-                        "1111.0010 Kas Kecil": {
-                            "account_type": "Cash"
-                        }, 
-                        "1111.0020 Kas Besar": {
-                            "account_type": "Cash"
-                        }, 
-                        "account_type": "Cash"
+        "Aktiva": {
+            "Aktiva Lancar": {
+                "Akun sementara": {
+                    "Pembukaan sementara": {
+                        "account_number": "1171.000", 
+                        "account_type": "Temporary"
                     }, 
-                    "1112.000 Kas Mata Uang Lain": {
-                        "1112.0010 Kas USD": {
-                            "account_type": "Cash"
-                        }
-                    }
+                    "account_number": "1170.000"
                 }, 
-                "1120.000 Bank ": {
-                    "1121.000 Bank Rupiah": {
-						"is_group": 1
+                "Bank ": {
+                    "Bank Other Currency": {
+                        "account_number": "1122.000", 
+                        "is_group": 1
                     }, 
-                    "1122.000 Bank Other Currency": {
-						"is_group": 1
+                    "Bank Rupiah": {
+                        "account_number": "1121.000", 
+                        "is_group": 1
                     }, 
+                    "account_number": "1120.000", 
                     "account_type": "Bank"
                 }, 
-                "1130.000 Piutang": {
-                    "1131.000 Piutang Dagang": {
-                        "1131.0010 Piutang Dagang": {
-                            "account_type": "Receivable"
-                        }
+                "Biaya di Bayar di Muka": {
+                    "Biaya di Bayar di Muka": {
+                        "Biaya di Bayar di Muka": {
+                            "Biaya d Bayar di Muka": {
+                                "account_number": "1151.00111"
+                            }, 
+                            "account_number": "1151.001"
+                        }, 
+                        "account_number": "1151.000"
                     }, 
-                    "1132.000 Piutang Lain lain": {
-                        "1132.001 Piutang Lain-lain 1": {
-                            "account_type": "Receivable"
-                        }
-                    }
+                    "account_number": "1150.000"
                 }, 
-                "1140.000 Persediaan Barang": {
-                    "1141.000 Persediaan Barang": {
+                "Kas": {
+                    "Kas Mata Uang Lain": {
+                        "Kas USD": {
+                            "account_number": "1112.0010", 
+                            "account_type": "Cash"
+                        }, 
+                        "account_number": "1112.000"
+                    }, 
+                    "Kas Rupiah": {
+                        "Kas Besar": {
+                            "account_number": "1111.0020", 
+                            "account_type": "Cash"
+                        }, 
+                        "Kas Kecil": {
+                            "account_number": "1111.0010", 
+                            "account_type": "Cash"
+                        }, 
+                        "account_number": "1111.000", 
+                        "account_type": "Cash"
+                    }, 
+                    "account_number": "1110.0000"
+                }, 
+                "Pendapatan Yang Akan di Terima": {
+                    "Pendapatan Yang di Terima": {
+                        "Pendapatan Yang Akan di Terima": {
+                            "account_number": "1161.001"
+                        }, 
+                        "account_number": "1161.000"
+                    }, 
+                    "account_number": "1160.000"
+                }, 
+                "Persediaan Barang": {
+                    "Persediaan Barang": {
+                        "account_number": "1141.000", 
                         "account_type": "Stock", 
                         "is_group": 1
                     }, 
-                    "1142.000 Uang Muka Pembelian": {
-                        "1142.001 Uang Muka Pembelian": {
+                    "Uang Muka Pembelian": {
+                        "Uang Muka Pembelian": {
+                            "account_number": "1142.001", 
                             "account_type": "Bank"
-                        }
-                    }
-                }, 
-                "1150.000 Biaya di Bayar di Muka": {
-                    "1151.000 Biaya di Bayar di Muka": {
-                        "1151.001 Biaya di Bayar di Muka": {
-                            "1151.00111 Biaya d Bayar di Muka": {}
-                        }
-                    }
-                }, 
-                "1160.000 Pendapatan Yang Akan di Terima": {
-                    "1161.000 Pendapatan Yang di Terima": {
-                        "1161.001 Pendapatan Yang Akan di Terima": {}
-                    }
-                }, 
-                "1170.000 Akun sementara": {
-                    "1171.000 Pembukaan sementara": {
-                        "account_type": "Temporary"
-                    }
-                }
-            }, 
-            "1200.000 Aktiva Tetap": {
-                "1210.000 Aktiva": {
-                    "1211.000 Aktiva": {
-                        "1211.001 Aktiva": {
-                            "account_type": "Fixed Asset"
-                        }
+                        }, 
+                        "account_number": "1142.000"
                     }, 
-                    "1212.000 Akumulasi Penyusutan Aktiva": {
-                        "1212.001 Akumulasi Penyusutan Aktiva": {
-                            "account_type": "Accumulated Depreciation"
-                        }
-                    }
+                    "account_number": "1140.000"
                 }, 
-                "1230.000 Investasi": {
-                    "1231.000 Investasi": {
-                        "1231.001 Investai Saham": {
-                            "1231.0011 Investasi Saham": {}
+                "Piutang": {
+                    "Piutang Dagang": {
+                        "Piutang Dagang": {
+                            "account_number": "1131.0010", 
+                            "account_type": "Receivable"
                         }, 
-                        "1231.002 Investasi Perumahan": {
-                            "1231.0021 Investasi Perumahan": {}
+                        "account_number": "1131.000"
+                    }, 
+                    "Piutang Lain lain": {
+                        "Piutang Lain-lain 1": {
+                            "account_number": "1132.001", 
+                            "account_type": "Receivable"
                         }, 
-                        "1231.003 Deposito": {
-                            "is_group": 1
-                        }
-                    }
-                }
+                        "account_number": "1132.000"
+                    }, 
+                    "account_number": "1130.000"
+                }, 
+                "account_number": "1100.0000"
             }, 
+            "Aktiva Tetap": {
+                "Aktiva": {
+                    "Aktiva": {
+                        "Aktiva": {
+                            "account_number": "1211.001", 
+                            "account_type": "Fixed Asset"
+                        }, 
+                        "account_number": "1211.000"
+                    }, 
+                    "Akumulasi Penyusutan Aktiva": {
+                        "Akumulasi Penyusutan Aktiva": {
+                            "account_number": "1212.001", 
+                            "account_type": "Accumulated Depreciation"
+                        }, 
+                        "account_number": "1212.000"
+                    }, 
+                    "account_number": "1210.000"
+                }, 
+                "Investasi": {
+                    "Investasi": {
+                        "Deposito": {
+                            "account_number": "1231.003", 
+                            "is_group": 1
+                        }, 
+                        "Investai Saham": {
+                            "Investasi Saham": {
+                                "account_number": "1231.0011"
+                            }, 
+                            "account_number": "1231.001"
+                        }, 
+                        "Investasi Perumahan": {
+                            "Investasi Perumahan": {
+                                "account_number": "1231.0021"
+                            }, 
+                            "account_number": "1231.002"
+                        }, 
+                        "account_number": "1231.000"
+                    }, 
+                    "account_number": "1230.000"
+                }, 
+                "account_number": "1200.000"
+            }, 
+            "account_number": "1000.0000", 
             "root_type": "Asset"
         }, 
-        "2000.000 Passiva": {
-            "2100.000 Pasiva Lancar": {
-                "2110.000 Hutang Dagang": {
-                    "2111.000 Hutang Dagang Rupiah": {
-                        "2111.001 Hutang Dagang Dalam Negeri": {
-                            "account_type": "Payable"
-                        }, 
-                        "2111.002 Hutang Dagang Luar Negeri": {
-                            "account_type": "Payable"
-                        }, 
-                        "2111.003 Hutang Dagang Biaya Kirim Dalam Negeri": {
-                            "account_type": "Payable"
-                        }, 
-                        "2111.004 HUtang Dagang Biaya Kirim Luar Negeri": {
-                            "account_type": "Payable"
-                        }
+        "Beban": {
+            "Beban Lain lain": {
+                "Beban Lain lain": {
+                    "Beban Adm Bank": {
+                        "account_number": "5510.001"
                     }, 
-                    "2112.000 Hutang Dagang Other Currency": {
-                        "2112.001 Hutang Dagang Luar Negeri (USD)": {
-                            "account_type": "Payable"
-                        }, 
-                        "2112.002 Hutang Dagang Luar Negeri (SGD)": {
-                            "account_type": "Payable"
-                        }, 
-                        "2112.003 Hutang Dagang Biaya Kirim Luar Negeri (USD)": {
-                            "account_type": "Payable"
-                        }, 
-                        "2112.004 Hutang Dagang Biaya Kirim Luar Negeri (SGD)": {
-                            "account_type": "Payable"
-                        }, 
-                        "2112.005 Hutang Dagang Biaya Kirim Dalam Negeri": {
-                            "account_type": "Payable"
-                        }
+                    "Beban Bunga Kredit Rekening Koran Bank": {
+                        "account_number": "5510.004"
                     }, 
-                    "2115.000 Stock Diterima Tapi Tidak Ditagih": {
-                        "account_type": "Stock Received But Not Billed"
-                    }
-                }, 
-                "2120.000 Pendapatan di Terima di Muka": {
-                    "2121.000 Pendapatan di Terima di Muka": {
-                        "2121.001 Dp Penjualan": {
-                            "account_type": "Bank"
-                        }
-                    }
-                }, 
-                "2130.000 Biaya Yang Akan di Bayar": {
-                    "2131.000 Biaya Yang Akan di Bayar": {
-                        "2131.001 Biaya Yang Akan di Bayar": {}
+                    "Beban Bunga Pinjaman Pada Pihak Ke 3": {
+                        "account_number": "5510.005"
                     }, 
-                    "2132.000 Biaya Yang Akan di Bayar - Freight": {
-                        "2132.001 Biaya Yang Akan di Bayar - Freight": {
-                            "account_type": "Expenses Included In Valuation"
-                        }
-                    }
-                }, 
-                "2140.000 Hutang Pajak": {
-                    "2141.000 Hutang Pajak": {
-                        "account_type": "Payable"
-                    }
-                }
-            }, 
-            "2200.000 Passiva Tetap": {
-                "2210.000 Hutang Pada Pihak ke 3": {
-                    "2211.000 Pinjaman Pihak ke 3 Rutin": {
-                        "2211.001 Hutang": {}
+                    "Beban Notaris Dan ADM Kredit Bank": {
+                        "account_number": "5510.003"
                     }, 
-                    "2212.000 Pinjaman Pihak ke 3 Tidak Rutin": {
-                        "2212.001 Hutang": {}
+                    "Beban Pajak Bumi & Bangunan": {
+                        "account_number": "5510.006"
                     }, 
-                    "2213.000 Hutang Bunga Pinjaman Pihak Ke 3 Tidak Rutin": {
-                        "2213.001 Hutang Bunga": {}
-                    }
+                    "Beban Pajak PPN": {
+                        "account_number": "5510.008"
+                    }, 
+                    "Beban Pajak Penghasilan ": {
+                        "account_number": "5510.007"
+                    }, 
+                    "Beban Provisi Pinjaman Bank": {
+                        "account_number": "5510.002"
+                    }, 
+                    "Selisih Kurs": {
+                        "account_number": "5510.010", 
+                        "account_type": "Round Off"
+                    }, 
+                    "Selisih Pembayaran Customer": {
+                        "account_number": "5510.009", 
+                        "account_type": "Round Off"
+                    }, 
+                    "account_number": "5510.000"
                 }, 
-                "2220.000 Hutang Pada Bank": {
-                    "2221.000 Hutang Bank": {
-                        "2221.001 Hutang": {}
-                    }
-                }, 
-                "2230.000 Hutang Leasing Kendaraan": {
-                    "2231.000 Hutang Leasing Kendaraan": {
-                        "2231.001 Hutang Leasing Kendaraan": {}
-                    }
-                }, 
-                "2240.000 Hutang Lain Lain": {
-                    "2241.000 Hutang Lain Lain": {
-                        "2241.001 Hutang": {}
-                    }
-                }
+                "account_number": "5500.000"
             }, 
-            "root_type": "Liability"
-        }, 
-        "3000.000 Modal": {
-            "3100.000 Modal": {
-                "3110.000 Modal di Setor": {}, 
-                "3120.000 Prive P.Saham": {}, 
-                "3130.000 Saldo pembukaan Equity": {}
-            }, 
-            "3200.000 Laba": {
-                "3210.000 Laba di Tahan": {}, 
-                "3220.000 Laba Tahun Berjalan": {}, 
-                "3230.000 Laba Periode Berjalan": {}
-            }, 
-            "root_type": "Equity"
-        }, 
-        "4000.000 Penjualan": {
-            "4100.000 Penjualan Barang Dagangan": {
-                "4110.000 Penjualan": {}, 
-                "4120.000 Retur Penjualan": {}, 
-                "4130.000 Potongan Penjualan": {}
-            }, 
-            "4200.000 Harga Pokok Pembelian": {
-                "4210.000 HPP Pembelian": {
-                    "account_type": "Cost of Goods Sold"
-                }
-            }, 
-            "4300.000 Pendapatan Service/Jasa": {
-                "4310.000 Pendapatan Service": {}
-            }, 
-            "4400.000 Pendapatan Lain lain": {
-                "4410.000 Pendapatan Bunga Bank": {}, 
-                "4420.000 Pendapatan Bunga Dari Pihak Ke 3": {}, 
-                "4430.000 Pendapatan Keuntungan Penjualan Aktiva": {}, 
-                "4440.000 Pendapatan Komisi": {}, 
-                "4450.000 Pendapatan Sewa Gudang": {}, 
-                "4460.000 Pendapatan Sewa Lain lain": {}, 
-                "4470.000 Pendapatan Penjualan Barang BS": {}, 
-                "4480.000 Pendapatan Lain lain": {}
-            }, 
-            "root_type": "Income"
-        }, 
-        "5000.000 Beban": {
-            "5100.000 Beban Langsung": {
-                "5110.000 Beban Penjualan": {
-                    "5110.001 Biaya BBM": {}, 
-                    "5110.002 Biaya Tol": {}, 
-                    "5110.003 Biaya Parkir": {}, 
-                    "5110.004 Biaya Upah Angkat/Turun Barang": {}, 
-                    "5110.005 Biaya Kuli": {}, 
-                    "5110.006 Biaya Perjalanan Dinas": {}, 
-                    "5110.007 Biaya Barang Rusak": {}, 
-                    "5110.008 Biaya Perbaikan Kendaraan Operasional": {}, 
-                    "5110.009 Biaya Asuransi Kendaraan Operasional": {}, 
-                    "5110.010 Biaya Leasing Kendaraan Operasional": {}, 
-                    "5110.011 Biaya Kebutuhan Penjualan": {}, 
-                    "5110.012 Biaya Sample": {}, 
-                    "5110.013 Biaya Bonus, Hadiah, dan Sampel": {}, 
-                    "5110.014 Biaya Entertainment dan Pergaulan": {}, 
-                    "5110.015 Biaya Sewa Gudang": {}, 
-                    "5110.016 Biaya Sewa Peralatan Gudang": {}, 
-                    "5110.017 Biaya Piutang Tak Tertagih": {}, 
-                    "5110.018 Potongan Supplier": {}, 
-                    "5110.019 Biaya Penjualan Lain Lain": {}, 
-                    "5110.020 Penyesuaian Stock": {
+            "Beban Langsung": {
+                "Beban Penjualan": {
+                    "Biaya Asuransi Kendaraan Operasional": {
+                        "account_number": "5110.009"
+                    }, 
+                    "Biaya BBM": {
+                        "account_number": "5110.001"
+                    }, 
+                    "Biaya Barang Rusak": {
+                        "account_number": "5110.007"
+                    }, 
+                    "Biaya Bonus, Hadiah, dan Sampel": {
+                        "account_number": "5110.013"
+                    }, 
+                    "Biaya Entertainment dan Pergaulan": {
+                        "account_number": "5110.014"
+                    }, 
+                    "Biaya Kebutuhan Penjualan": {
+                        "account_number": "5110.011"
+                    }, 
+                    "Biaya Kuli": {
+                        "account_number": "5110.005"
+                    }, 
+                    "Biaya Leasing Kendaraan Operasional": {
+                        "account_number": "5110.010"
+                    }, 
+                    "Biaya Parkir": {
+                        "account_number": "5110.003"
+                    }, 
+                    "Biaya Penjualan Lain Lain": {
+                        "account_number": "5110.019"
+                    }, 
+                    "Biaya Perbaikan Kendaraan Operasional": {
+                        "account_number": "5110.008"
+                    }, 
+                    "Biaya Perjalanan Dinas": {
+                        "account_number": "5110.006"
+                    }, 
+                    "Biaya Piutang Tak Tertagih": {
+                        "account_number": "5110.017"
+                    }, 
+                    "Biaya Sample": {
+                        "account_number": "5110.012"
+                    }, 
+                    "Biaya Sewa Gudang": {
+                        "account_number": "5110.015"
+                    }, 
+                    "Biaya Sewa Peralatan Gudang": {
+                        "account_number": "5110.016"
+                    }, 
+                    "Biaya Susut Barang": {
+                        "account_number": "5110.021"
+                    }, 
+                    "Biaya Tol": {
+                        "account_number": "5110.002"
+                    }, 
+                    "Biaya Upah Angkat/Turun Barang": {
+                        "account_number": "5110.004"
+                    }, 
+                    "Penyesuaian Stock": {
+                        "account_number": "5110.020", 
                         "account_type": "Stock Adjustment"
                     }, 
-                    "5110.021 Biaya Susut Barang": {}
-                }, 
-                "5120.000 Biaya Gaji & Kesejahteraan Pegawai": {
-                    "5120.001 Biaya Gaji Staff & Karyawan Tetap": {}, 
-                    "5120.002 Biaya Gaji Karyawan Harian": {}, 
-                    "5120.003 Biaya Pengobatan": {}, 
-                    "5120.004 Biaya Asuransi Kesehatan Pegawai": {}, 
-                    "5120.005 Biaya THR, Bonus, dan Komisi": {}, 
-                    "5120.006 Biaya Konsumsi": {}, 
-                    "5120.007 Biaya Gaji & Kesejahteraan Lainnya": {}
-                }, 
-                "5130.000 Biaya Kantor & Gudang": {
-                    "5130.001 Biaya PLN Gudang & Kantor": {}, 
-                    "5130.002 Biaya PAM Gudang & Kantor": {}, 
-                    "5130.003 Biaya TLP Gudang & Kantor": {}, 
-                    "5130.004 Biaya Fotocopy, Photo, Print Out": {}, 
-                    "5130.005 Biaya Alat Tulis Kantor": {}, 
-                    "5130.006 Biaya Stamp Duty & Pos": {}, 
-                    "5130.007 Biaya Servis Peralatan Gudang": {}, 
-                    "5130.008 Biaya Pemeliharaan Bgn Gudang": {}, 
-                    "5130.009 Biaya Humas & Pergaulan": {}, 
-                    "5130.010 Biaya Perlengkapan Gudang": {}, 
-                    "5130.011 Iuran Bulanan": {}, 
-                    "5130.012 Biaya Serba Serbi": {}, 
-                    "5130.013 Biaya Sewa Kantor": {}, 
-                    "5130.014 Biaya Asuransi Bangunan": {}, 
-                    "5130.015 Biaya Sumbangan": {}, 
-                    "5130.016 Biaya Perizinan Usaha dan Bangunan": {}, 
-                    "5130.017 Biaya Perizinan Kendaraan Operasional": {}, 
-                    "5130.018 Biaya KTR & GDG Lain Lain": {}
-                }
-            }, 
-            "5200.000 Beban Tidak Langsung": {
-                "5210.000 Biaya Gaji & Kesejahteraan Pegawai Indirect": {
-                    "5210.001 Biaya Gaji Staff": {}, 
-                    "5210.002 Biaya THR dan Bonus Staff": {}, 
-                    "5210.003 Biaya Pengobatan & Kesehatan": {}, 
-                    "5210.004 Biaya Konsumsi": {}, 
-                    "5210.005 Biaya Gaji Lain Lain": {}
-                }, 
-                "5220.000 Biaya Operational Indirect": {
-                    "5220.001 Biaya BBM": {}, 
-                    "5220.002 Biaya Tol & Parkir": {}, 
-                    "5220.003 Biaya TLP & HP": {}, 
-                    "5220.004 Biaya Perjalanan Dinas": {}, 
-                    "5220.005 Biaya Perbaikan Kendaraan Dinas": {}, 
-                    "5220.006 Biaya Asuransi Kendaraan Dinas": {}, 
-                    "5220.007 Biaya Leasing Kendaraan Dinas": {}, 
-                    "5220.008 Biaya Entertainment dan Pergaulan": {}, 
-                    "5220.009 Biaya Hadiah dan Bonus": {}
-                }, 
-                "5230.000 Biaya Kantor Indirect": {
-                    "5230.001 Biaya PLN Kantor": {}, 
-                    "5230.002 Biaya PAM Kantor": {}, 
-                    "5230.003 Biaya TLP Kantor": {}, 
-                    "5230.004 Biaya Sewa Kantor": {}, 
-                    "5230.005 Biaya Asuransi Bangunan": {}, 
-                    "5230.006 Biaya Alat Tulis Kantor": {}, 
-                    "5230.007 Biaya Fotocopy, Photo, Print Out": {}, 
-                    "5230.008 Biaya Kirim Dokumen": {}, 
-                    "5230.009 Biaya Perlengkapan & Peralatan Kantor": {}, 
-                    "5230.010 Service Peralatan Kantor": {}, 
-                    "5230.011 Biaya Pemeliharaan Bangunan Kantor": {}, 
-                    "5230.012 Biaya Iuran Bulanan": {}, 
-                    "5230.013 Biaya Sumbangan": {}, 
-                    "5230.014 Biaya Perizinan Bangunan": {}, 
-                    "5230.015 Biaya Perizinan Kendaraan Dinas": {}, 
-                    "5230.016 Biaya KTR Lain Lain": {}, 
-                    "5230.017 Biaya Stamp Duty & Pos": {}
-                }
-            }, 
-            "5300.000 Biaya Penyusutan": {
-                "5310.000 Biaya Penyusutan": {
-                    "5310.001 By Peny Aktiva ": {
-                        "account_type": "Depreciation"
-                    }
-                }
-            }, 
-            "5400.000 Biaya Amortisasi": {
-                "5410.000 Biaya Amortisasi": {}
-            }, 
-            "5500.000 Beban Lain lain": {
-                "5510.000 Beban Lain lain": {
-                    "5510.001 Beban Adm Bank": {}, 
-                    "5510.002 Beban Provisi Pinjaman Bank": {}, 
-                    "5510.003 Beban Notaris Dan ADM Kredit Bank": {}, 
-                    "5510.004 Beban Bunga Kredit Rekening Koran Bank": {}, 
-                    "5510.005 Beban Bunga Pinjaman Pada Pihak Ke 3": {}, 
-                    "5510.006 Beban Pajak Bumi & Bangunan": {}, 
-                    "5510.007 Beban Pajak Penghasilan ": {}, 
-                    "5510.008 Beban Pajak PPN": {}, 
-                    "5510.009 Selisih Pembayaran Customer": {
-                        "account_type": "Round Off"
+                    "Potongan Supplier": {
+                        "account_number": "5110.018"
                     }, 
-                    "5510.010 Selisih Kurs": {
-                        "account_type": "Round Off"
-                    }
-                }
+                    "account_number": "5110.000"
+                }, 
+                "Biaya Gaji & Kesejahteraan Pegawai": {
+                    "Biaya Asuransi Kesehatan Pegawai": {
+                        "account_number": "5120.004"
+                    }, 
+                    "Biaya Gaji & Kesejahteraan Lainnya": {
+                        "account_number": "5120.007"
+                    }, 
+                    "Biaya Gaji Karyawan Harian": {
+                        "account_number": "5120.002"
+                    }, 
+                    "Biaya Gaji Staff & Karyawan Tetap": {
+                        "account_number": "5120.001"
+                    }, 
+                    "Biaya Konsumsi": {
+                        "account_number": "5120.006"
+                    }, 
+                    "Biaya Pengobatan": {
+                        "account_number": "5120.003"
+                    }, 
+                    "Biaya THR, Bonus, dan Komisi": {
+                        "account_number": "5120.005"
+                    }, 
+                    "account_number": "5120.000"
+                }, 
+                "Biaya Kantor & Gudang": {
+                    "Biaya Alat Tulis Kantor": {
+                        "account_number": "5130.005"
+                    }, 
+                    "Biaya Asuransi Bangunan": {
+                        "account_number": "5130.014"
+                    }, 
+                    "Biaya Fotocopy, Photo, Print Out": {
+                        "account_number": "5130.004"
+                    }, 
+                    "Biaya Humas & Pergaulan": {
+                        "account_number": "5130.009"
+                    }, 
+                    "Biaya KTR & GDG Lain Lain": {
+                        "account_number": "5130.018"
+                    }, 
+                    "Biaya PAM Gudang & Kantor": {
+                        "account_number": "5130.002"
+                    }, 
+                    "Biaya PLN Gudang & Kantor": {
+                        "account_number": "5130.001"
+                    }, 
+                    "Biaya Pemeliharaan Bgn Gudang": {
+                        "account_number": "5130.008"
+                    }, 
+                    "Biaya Perizinan Kendaraan Operasional": {
+                        "account_number": "5130.017"
+                    }, 
+                    "Biaya Perizinan Usaha dan Bangunan": {
+                        "account_number": "5130.016"
+                    }, 
+                    "Biaya Perlengkapan Gudang": {
+                        "account_number": "5130.010"
+                    }, 
+                    "Biaya Serba Serbi": {
+                        "account_number": "5130.012"
+                    }, 
+                    "Biaya Servis Peralatan Gudang": {
+                        "account_number": "5130.007"
+                    }, 
+                    "Biaya Sewa Kantor": {
+                        "account_number": "5130.013"
+                    }, 
+                    "Biaya Stamp Duty & Pos": {
+                        "account_number": "5130.006"
+                    }, 
+                    "Biaya Sumbangan": {
+                        "account_number": "5130.015"
+                    }, 
+                    "Biaya TLP Gudang & Kantor": {
+                        "account_number": "5130.003"
+                    }, 
+                    "Iuran Bulanan": {
+                        "account_number": "5130.011"
+                    }, 
+                    "account_number": "5130.000"
+                }, 
+                "account_number": "5100.000"
             }, 
+            "Beban Tidak Langsung": {
+                "Biaya Gaji & Kesejahteraan Pegawai Indirect": {
+                    "Biaya Gaji Lain Lain": {
+                        "account_number": "5210.005"
+                    }, 
+                    "Biaya Gaji Staff": {
+                        "account_number": "5210.001"
+                    }, 
+                    "Biaya Konsumsi": {
+                        "account_number": "5210.004"
+                    }, 
+                    "Biaya Pengobatan & Kesehatan": {
+                        "account_number": "5210.003"
+                    }, 
+                    "Biaya THR dan Bonus Staff": {
+                        "account_number": "5210.002"
+                    }, 
+                    "account_number": "5210.000"
+                }, 
+                "Biaya Kantor Indirect": {
+                    "Biaya Alat Tulis Kantor": {
+                        "account_number": "5230.006"
+                    }, 
+                    "Biaya Asuransi Bangunan": {
+                        "account_number": "5230.005"
+                    }, 
+                    "Biaya Fotocopy, Photo, Print Out": {
+                        "account_number": "5230.007"
+                    }, 
+                    "Biaya Iuran Bulanan": {
+                        "account_number": "5230.012"
+                    }, 
+                    "Biaya KTR Lain Lain": {
+                        "account_number": "5230.016"
+                    }, 
+                    "Biaya Kirim Dokumen": {
+                        "account_number": "5230.008"
+                    }, 
+                    "Biaya PAM Kantor": {
+                        "account_number": "5230.002"
+                    }, 
+                    "Biaya PLN Kantor": {
+                        "account_number": "5230.001"
+                    }, 
+                    "Biaya Pemeliharaan Bangunan Kantor": {
+                        "account_number": "5230.011"
+                    }, 
+                    "Biaya Perizinan Bangunan": {
+                        "account_number": "5230.014"
+                    }, 
+                    "Biaya Perizinan Kendaraan Dinas": {
+                        "account_number": "5230.015"
+                    }, 
+                    "Biaya Perlengkapan & Peralatan Kantor": {
+                        "account_number": "5230.009"
+                    }, 
+                    "Biaya Sewa Kantor": {
+                        "account_number": "5230.004"
+                    }, 
+                    "Biaya Stamp Duty & Pos": {
+                        "account_number": "5230.017"
+                    }, 
+                    "Biaya Sumbangan": {
+                        "account_number": "5230.013"
+                    }, 
+                    "Biaya TLP Kantor": {
+                        "account_number": "5230.003"
+                    }, 
+                    "Service Peralatan Kantor": {
+                        "account_number": "5230.010"
+                    }, 
+                    "account_number": "5230.000"
+                }, 
+                "Biaya Operational Indirect": {
+                    "Biaya Asuransi Kendaraan Dinas": {
+                        "account_number": "5220.006"
+                    }, 
+                    "Biaya BBM": {
+                        "account_number": "5220.001"
+                    }, 
+                    "Biaya Entertainment dan Pergaulan": {
+                        "account_number": "5220.008"
+                    }, 
+                    "Biaya Hadiah dan Bonus": {
+                        "account_number": "5220.009"
+                    }, 
+                    "Biaya Leasing Kendaraan Dinas": {
+                        "account_number": "5220.007"
+                    }, 
+                    "Biaya Perbaikan Kendaraan Dinas": {
+                        "account_number": "5220.005"
+                    }, 
+                    "Biaya Perjalanan Dinas": {
+                        "account_number": "5220.004"
+                    }, 
+                    "Biaya TLP & HP": {
+                        "account_number": "5220.003"
+                    }, 
+                    "Biaya Tol & Parkir": {
+                        "account_number": "5220.002"
+                    }, 
+                    "account_number": "5220.000"
+                }, 
+                "account_number": "5200.000"
+            }, 
+            "Biaya Amortisasi": {
+                "Biaya Amortisasi": {
+                    "account_number": "5410.000"
+                }, 
+                "account_number": "5400.000"
+            }, 
+            "Biaya Penyusutan": {
+                "Biaya Penyusutan": {
+                    "By Peny Aktiva ": {
+                        "account_number": "5310.001", 
+                        "account_type": "Depreciation"
+                    }, 
+                    "account_number": "5310.000"
+                }, 
+                "account_number": "5300.000"
+            }, 
+            "account_number": "5000.000", 
             "root_type": "Expense"
+        }, 
+        "Modal": {
+            "Laba": {
+                "Laba Periode Berjalan": {
+                    "account_number": "3230.000"
+                }, 
+                "Laba Tahun Berjalan": {
+                    "account_number": "3220.000"
+                }, 
+                "Laba di Tahan": {
+                    "account_number": "3210.000"
+                }, 
+                "account_number": "3200.000"
+            }, 
+            "Modal": {
+                "Modal di Setor": {
+                    "account_number": "3110.000"
+                }, 
+                "Prive P.Saham": {
+                    "account_number": "3120.000"
+                }, 
+                "Saldo pembukaan Equity": {
+                    "account_number": "3130.000"
+                }, 
+                "account_number": "3100.000"
+            }, 
+            "account_number": "3000.000", 
+            "root_type": "Equity"
+        }, 
+        "Passiva": {
+            "Pasiva Lancar": {
+                "Biaya Yang Akan di Bayar": {
+                    "Biaya Yang Akan di Bayar": {
+                        "Biaya Yang Akan di Bayar": {
+                            "account_number": "2131.001"
+                        }, 
+                        "account_number": "2131.000"
+                    }, 
+                    "Biaya Yang Akan di Bayar - Freight": {
+                        "Biaya Yang Akan di Bayar - Freight": {
+                            "account_number": "2132.001", 
+                            "account_type": "Expenses Included In Valuation"
+                        }, 
+                        "account_number": "2132.000"
+                    }, 
+                    "account_number": "2130.000"
+                }, 
+                "Hutang Dagang": {
+                    "Hutang Dagang Other Currency": {
+                        "Hutang Dagang Biaya Kirim Dalam Negeri": {
+                            "account_number": "2112.005", 
+                            "account_type": "Payable"
+                        }, 
+                        "Hutang Dagang Biaya Kirim Luar Negeri (SGD)": {
+                            "account_number": "2112.004", 
+                            "account_type": "Payable"
+                        }, 
+                        "Hutang Dagang Biaya Kirim Luar Negeri (USD)": {
+                            "account_number": "2112.003", 
+                            "account_type": "Payable"
+                        }, 
+                        "Hutang Dagang Luar Negeri (SGD)": {
+                            "account_number": "2112.002", 
+                            "account_type": "Payable"
+                        }, 
+                        "Hutang Dagang Luar Negeri (USD)": {
+                            "account_number": "2112.001", 
+                            "account_type": "Payable"
+                        }, 
+                        "account_number": "2112.000"
+                    }, 
+                    "Hutang Dagang Rupiah": {
+                        "HUtang Dagang Biaya Kirim Luar Negeri": {
+                            "account_number": "2111.004", 
+                            "account_type": "Payable"
+                        }, 
+                        "Hutang Dagang Biaya Kirim Dalam Negeri": {
+                            "account_number": "2111.003", 
+                            "account_type": "Payable"
+                        }, 
+                        "Hutang Dagang Dalam Negeri": {
+                            "account_number": "2111.001", 
+                            "account_type": "Payable"
+                        }, 
+                        "Hutang Dagang Luar Negeri": {
+                            "account_number": "2111.002", 
+                            "account_type": "Payable"
+                        }, 
+                        "account_number": "2111.000"
+                    }, 
+                    "Stock Diterima Tapi Tidak Ditagih": {
+                        "account_number": "2115.000", 
+                        "account_type": "Stock Received But Not Billed"
+                    }, 
+                    "account_number": "2110.000"
+                }, 
+                "Hutang Pajak": {
+                    "Hutang Pajak": {
+                        "account_number": "2141.000", 
+                        "account_type": "Payable"
+                    }, 
+                    "account_number": "2140.000"
+                }, 
+                "Pendapatan di Terima di Muka": {
+                    "Pendapatan di Terima di Muka": {
+                        "Dp Penjualan": {
+                            "account_number": "2121.001", 
+                            "account_type": "Bank"
+                        }, 
+                        "account_number": "2121.000"
+                    }, 
+                    "account_number": "2120.000"
+                }, 
+                "account_number": "2100.000"
+            }, 
+            "Passiva Tetap": {
+                "Hutang Lain Lain": {
+                    "Hutang Lain Lain": {
+                        "Hutang": {
+                            "account_number": "2241.001"
+                        }, 
+                        "account_number": "2241.000"
+                    }, 
+                    "account_number": "2240.000"
+                }, 
+                "Hutang Leasing Kendaraan": {
+                    "Hutang Leasing Kendaraan": {
+                        "Hutang Leasing Kendaraan": {
+                            "account_number": "2231.001"
+                        }, 
+                        "account_number": "2231.000"
+                    }, 
+                    "account_number": "2230.000"
+                }, 
+                "Hutang Pada Bank": {
+                    "Hutang Bank": {
+                        "Hutang": {
+                            "account_number": "2221.001"
+                        }, 
+                        "account_number": "2221.000"
+                    }, 
+                    "account_number": "2220.000"
+                }, 
+                "Hutang Pada Pihak ke 3": {
+                    "Hutang Bunga Pinjaman Pihak Ke 3 Tidak Rutin": {
+                        "Hutang Bunga": {
+                            "account_number": "2213.001"
+                        }, 
+                        "account_number": "2213.000"
+                    }, 
+                    "Pinjaman Pihak ke 3 Rutin": {
+                        "Hutang": {
+                            "account_number": "2211.001"
+                        }, 
+                        "account_number": "2211.000"
+                    }, 
+                    "Pinjaman Pihak ke 3 Tidak Rutin": {
+                        "Hutang": {
+                            "account_number": "2212.001"
+                        }, 
+                        "account_number": "2212.000"
+                    }, 
+                    "account_number": "2210.000"
+                }, 
+                "account_number": "2200.000"
+            }, 
+            "account_number": "2000.000", 
+            "root_type": "Liability"
+        }, 
+        "Penjualan": {
+            "Harga Pokok Pembelian": {
+                "HPP Pembelian": {
+                    "account_number": "4210.000", 
+                    "account_type": "Cost of Goods Sold"
+                }, 
+                "account_number": "4200.000"
+            }, 
+            "Pendapatan Lain lain": {
+                "Pendapatan Bunga Bank": {
+                    "account_number": "4410.000"
+                }, 
+                "Pendapatan Bunga Dari Pihak Ke 3": {
+                    "account_number": "4420.000"
+                }, 
+                "Pendapatan Keuntungan Penjualan Aktiva": {
+                    "account_number": "4430.000"
+                }, 
+                "Pendapatan Komisi": {
+                    "account_number": "4440.000"
+                }, 
+                "Pendapatan Lain lain": {
+                    "account_number": "4480.000"
+                }, 
+                "Pendapatan Penjualan Barang BS": {
+                    "account_number": "4470.000"
+                }, 
+                "Pendapatan Sewa Gudang": {
+                    "account_number": "4450.000"
+                }, 
+                "Pendapatan Sewa Lain lain": {
+                    "account_number": "4460.000"
+                }, 
+                "account_number": "4400.000"
+            }, 
+            "Pendapatan Service/Jasa": {
+                "Pendapatan Service": {
+                    "account_number": "4310.000"
+                }, 
+                "account_number": "4300.000"
+            }, 
+            "Penjualan Barang Dagangan": {
+                "Penjualan": {
+                    "account_number": "4110.000"
+                }, 
+                "Potongan Penjualan": {
+                    "account_number": "4130.000"
+                }, 
+                "Retur Penjualan": {
+                    "account_number": "4120.000"
+                }, 
+                "account_number": "4100.000"
+            }, 
+            "account_number": "4000.000", 
+            "root_type": "Income"
         }
     }
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/in_standard_chart_of_accounts.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/in_standard_chart_of_accounts.json
index 2f5dbf3..bc7f965 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/in_standard_chart_of_accounts.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/in_standard_chart_of_accounts.json
@@ -2,160 +2,161 @@
     "country_code": "in",
     "name": "India - Chart of Accounts",
     "tree": {
-	    "Application of Funds (Assets)": {
-	        "Current Assets": {
-	            "Accounts Receivable": {
-	                "Debtors": {
-	                    "account_type": "Receivable"
-	                }
-	            },
-	            "Bank Accounts": {
-	                "account_type": "Bank",
-					"is_group": 1
-	            },
-	            "Cash In Hand": {
-	                "Cash": {
-	                    "account_type": "Cash"
-	                },
-	                "account_type": "Cash"
-	            },
-	            "Loans and Advances (Assets)": {
-	            	"is_group": 1
-	            },
-	            "Securities and Deposits": {
-	                "Earnest Money": {}
-	            },
-	            "Stock Assets": {
-					"Stock in Hand": {
-		                "account_type": "Stock"							
-					}
-	            },
-	            "Tax Assets": {
-					"is_group": 1
-				}
-	        },
-	        "Fixed Assets": {
-	            "Capital Equipments": {
-	                "account_type": "Fixed Asset"
-	            },
-	            "Electronic Equipments": {
-	                "account_type": "Fixed Asset"
-	            },
-	            "Furnitures and Fixtures": {
-	                "account_type": "Fixed Asset"
-	            },
-	            "Office Equipments": {
-	                "account_type": "Fixed Asset"
-	            },
-	            "Plants and Machineries": {
-	                "account_type": "Fixed Asset"
-	            },
-				"Buildings": {
-					"account_type": "Fixed Asset"
-				},
-				"Accumulated Depreciations": {
-					"account_type": "Accumulated Depreciation"
-				}
-	        },
-	        "Investments": {
-	        	"is_group": 1
-	        },
-	        "Temporary Accounts": {
-	            "Temporary Opening": {
-	            	"account_type": "Temporary"
-	            }
-	        },
-			"root_type": "Asset"
-	    },
-	    "Expenses": {
-	        "Direct Expenses": {
-	            "Stock Expenses": {
-	                "Cost of Goods Sold": {
-	                    "account_type": "Cost of Goods Sold"
-	                },
-	                "Expenses Included In Valuation": {
-	                    "account_type": "Expenses Included In Valuation"
-	                },
-	                "Stock Adjustment": {
-	                    "account_type": "Stock Adjustment"
-	                }
-	            }
-	        },
-	        "Indirect Expenses": {
-	            "Administrative Expenses": {},
-	            "Commission on Sales": {},
-	            "Depreciation": {
-	                "account_type": "Depreciation"
-	            },
-	            "Entertainment Expenses": {},
-	            "Freight and Forwarding Charges": {
-	                "account_type": "Chargeable"
-	            },
-	            "Legal Expenses": {},
-	            "Marketing Expenses": {},
-	            "Miscellaneous Expenses": {},
-	            "Office Maintenance Expenses": {},
-	            "Office Rent": {},
-	            "Postal Expenses": {},
-	            "Print and Stationary": {},
-	            "Rounded Off": {
-	                "account_type": "Round Off"
-	            },
-	            "Salary": {},
-	            "Sales Expenses": {},
-	            "Telephone Expenses": {},
-	            "Travel Expenses": {},
-	            "Utility Expenses": {},
-				"Write Off": {},
-				"Exchange Gain/Loss": {},
-				"Gain/Loss on Asset Disposal": {}
-	        },
-			"root_type": "Expense"
-	    },
-	    "Income": {
-	        "Direct Income": {
-	            "Sales": {
-	                "account_type": "Income Account"
-	            },
-	            "Service": {
-	                "account_type": "Income Account"
-	            },
-	            "account_type": "Income Account"
-	        },
-	        "Indirect Income": {
-	            "account_type": "Income Account",
-				"is_group": 1
-	        },
-			"root_type": "Income"
-	    },
-	    "Source of Funds (Liabilities)": {
-	        "Capital Account": {
-	            "Reserves and Surplus": {},
-	            "Shareholders Funds": {}
-	        },
-	        "Current Liabilities": {
-			    "Accounts Payable": {
-			        "Creditors": {
-			            "account_type": "Payable"
-			        },
-					"Payroll Payable": {}
-			    },
-			    "Stock Liabilities": {
-				    "Stock Received But Not Billed": {
-				        "account_type": "Stock Received But Not Billed"
-				    }
-			    },
-				"Duties and Taxes": {
-					"account_type": "Tax",
-					"is_group": 1
-				},
-				"Loans (Liabilities)": {
-					"Secured Loans": {},
-					"Unsecured Loans": {},
-					"Bank Overdraft Account": {}
-				}
-	        },
-			"root_type": "Liability"
-		}
-	}
+        "Application of Funds (Assets)": {
+            "Current Assets": {
+                "Accounts Receivable": {
+                    "Debtors": {
+                        "account_type": "Receivable"
+                    }
+                },
+                "Bank Accounts": {
+                    "account_type": "Bank",
+                    "is_group": 1
+                },
+                "Cash In Hand": {
+                    "Cash": {
+                        "account_type": "Cash"
+                    },
+                    "account_type": "Cash"
+                },
+                "Loans and Advances (Assets)": {
+                    "is_group": 1
+                },
+                "Securities and Deposits": {
+                    "Earnest Money": {}
+                },
+                "Stock Assets": {
+                    "Stock In Hand": {
+                        "account_type": "Stock"
+                    },
+                    "account_type": "Stock"
+                },
+                "Tax Assets": {
+                    "is_group": 1
+                }
+            },
+            "Fixed Assets": {
+                "Capital Equipments": {
+                    "account_type": "Fixed Asset"
+                },
+                "Electronic Equipments": {
+                    "account_type": "Fixed Asset"
+                },
+                "Furnitures and Fixtures": {
+                    "account_type": "Fixed Asset"
+                },
+                "Office Equipments": {
+                    "account_type": "Fixed Asset"
+                },
+                "Plants and Machineries": {
+                    "account_type": "Fixed Asset"
+                },
+                "Buildings": {
+                    "account_type": "Fixed Asset"
+                },
+                "Accumulated Depreciations": {
+                    "account_type": "Accumulated Depreciation"
+                }
+            },
+            "Investments": {
+                "is_group": 1
+            },
+            "Temporary Accounts": {
+                "Temporary Opening": {
+                    "account_type": "Temporary"
+                }
+            },
+            "root_type": "Asset"
+        },
+        "Expenses": {
+            "Direct Expenses": {
+                "Stock Expenses": {
+                    "Cost of Goods Sold": {
+                        "account_type": "Cost of Goods Sold"
+                    },
+                    "Expenses Included In Valuation": {
+                        "account_type": "Expenses Included In Valuation"
+                    },
+                    "Stock Adjustment": {
+                        "account_type": "Stock Adjustment"
+                    }
+                }
+            },
+            "Indirect Expenses": {
+                "Administrative Expenses": {},
+                "Commission on Sales": {},
+                "Depreciation": {
+                    "account_type": "Depreciation"
+                },
+                "Entertainment Expenses": {},
+                "Freight and Forwarding Charges": {
+                    "account_type": "Chargeable"
+                },
+                "Legal Expenses": {},
+                "Marketing Expenses": {},
+                "Miscellaneous Expenses": {},
+                "Office Maintenance Expenses": {},
+                "Office Rent": {},
+                "Postal Expenses": {},
+                "Print and Stationary": {},
+                "Rounded Off": {
+                    "account_type": "Round Off"
+                },
+                "Salary": {},
+                "Sales Expenses": {},
+                "Telephone Expenses": {},
+                "Travel Expenses": {},
+                "Utility Expenses": {},
+                "Write Off": {},
+                "Exchange Gain/Loss": {},
+                "Gain/Loss on Asset Disposal": {}
+            },
+            "root_type": "Expense"
+        },
+        "Income": {
+            "Direct Income": {
+                "Sales": {
+                    "account_type": "Income Account"
+                },
+                "Service": {
+                    "account_type": "Income Account"
+                },
+                "account_type": "Income Account"
+            },
+            "Indirect Income": {
+                "account_type": "Income Account",
+                "is_group": 1
+            },
+            "root_type": "Income"
+        },
+        "Source of Funds (Liabilities)": {
+            "Capital Account": {
+                "Reserves and Surplus": {},
+                "Shareholders Funds": {}
+            },
+            "Current Liabilities": {
+                "Accounts Payable": {
+                    "Creditors": {
+                        "account_type": "Payable"
+                    },
+                    "Payroll Payable": {}
+                },
+                "Stock Liabilities": {
+                    "Stock Received But Not Billed": {
+                        "account_type": "Stock Received But Not Billed"
+                    }
+                },
+                "Duties and Taxes": {
+                    "account_type": "Tax",
+                    "is_group": 1
+                },
+                "Loans (Liabilities)": {
+                    "Secured Loans": {},
+                    "Unsecured Loans": {},
+                    "Bank Overdraft Account": {}
+                }
+            },
+            "root_type": "Liability"
+        }
+    }
 }
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py b/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py
new file mode 100644
index 0000000..bad8453
--- /dev/null
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py
@@ -0,0 +1,275 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+from frappe import _
+
+def get():
+    return {
+        _("Application of Funds (Assets)"): {
+            _("Current Assets"): {
+                _("Accounts Receivable"): {
+                    _("Debtors"): {
+                        "account_type": "Receivable",
+                        "account_number": "1310"
+                    },
+                    "account_number": "1300"
+                },
+                _("Bank Accounts"): {
+                    "account_type": "Bank",
+                    "is_group": 1,
+                    "account_number": "1200"
+                },
+                _("Cash In Hand"): {
+                    _("Cash"): {
+                        "account_type": "Cash",
+                        "account_number": "1110"
+                    },
+                    "account_type": "Cash",
+                    "account_number": "1100"
+                },
+                _("Loans and Advances (Assets)"): {
+                    "is_group": 1,
+                    "account_number": "1600"
+                },
+                _("Securities and Deposits"): {
+                    _("Earnest Money"): {
+                        "account_number": "1651"
+                    },
+                    "account_number": "1650"
+                },
+                _("Stock Assets"): {
+                    _("Stock In Hand"): {
+                        "account_type": "Stock",
+                        "account_number": "1410"
+                    },
+                    "account_type": "Stock",
+                    "account_number": "1400"
+                },
+                _("Tax Assets"): {
+                    "is_group": 1,
+                    "account_number": "1500"
+                },
+                "account_number": "1100-1600"
+            },
+            _("Fixed Assets"): {
+                _("Capital Equipments"): {
+                    "account_type": "Fixed Asset",
+                    "account_number": "1710"
+                },
+                _("Electronic Equipments"): {
+                    "account_type": "Fixed Asset",
+                    "account_number": "1720"
+                },
+                _("Furnitures and Fixtures"): {
+                    "account_type": "Fixed Asset",
+                    "account_number": "1730"
+                },
+                _("Office Equipments"): {
+                    "account_type": "Fixed Asset",
+                    "account_number": "1740"
+                },
+                _("Plants and Machineries"): {
+                    "account_type": "Fixed Asset",
+                    "account_number": "1750"
+                },
+                _("Buildings"): {
+                    "account_type": "Fixed Asset",
+                    "account_number": "1760"
+                },
+                _("Softwares"): {
+                    "account_type": "Fixed Asset",
+                    "account_number": "1770"
+                },
+                _("Accumulated Depreciation"): {
+                    "account_type": "Accumulated Depreciation",
+                    "account_number": "1780"
+                },
+                "account_number": "1700"
+            },
+            _("Investments"): {
+                "is_group": 1,
+                "account_number": "1800"
+            },
+            _("Temporary Accounts"): {
+                _("Temporary Opening"): {
+                    "account_type": "Temporary",
+                    "account_number": "1910"
+                },
+                "account_number": "1900"
+            },
+            "root_type": "Asset",
+            "account_number": "1000"
+        },
+        _("Expenses"): {
+            _("Direct Expenses"): {
+                _("Stock Expenses"): {
+                    _("Cost of Goods Sold"): {
+                        "account_type": "Cost of Goods Sold",
+                        "account_number": "5111"
+                    },
+                    _("Expenses Included In Valuation"): {
+                        "account_type": "Expenses Included In Valuation",
+                        "account_number": "5118"
+                    },
+                    _("Stock Adjustment"): {
+                        "account_type": "Stock Adjustment",
+                        "account_number": "5119"
+                    },
+                    "account_number": "5110"
+                },
+                "account_number": "5100"
+            },
+            _("Indirect Expenses"): {
+                _("Administrative Expenses"): {
+                    "account_number": "5201"
+                },
+                _("Commission on Sales"): {
+                    "account_number": "5202"
+                },
+                _("Depreciation"): {
+                    "account_type": "Depreciation",
+                    "account_number": "5203"
+                },
+                _("Entertainment Expenses"): {
+                    "account_number": "5204"
+                },
+                _("Freight and Forwarding Charges"): {
+                    "account_type": "Chargeable",
+                    "account_number": "5205"
+                },
+                _("Legal Expenses"): {
+                    "account_number": "5206"
+                },
+                _("Marketing Expenses"): {
+                    "account_type": "Chargeable",
+                    "account_number": "5207"
+                },
+                _("Office Maintenance Expenses"): {
+                    "account_number": "5208"
+                },
+                _("Office Rent"): {
+                    "account_number": "5209"
+                },
+                _("Postal Expenses"): {
+                    "account_number": "5210"
+                },
+                _("Print and Stationery"): {
+                    "account_number": "5211"
+                },
+                _("Round Off"): {
+                    "account_type": "Round Off",
+                    "account_number": "5212"
+                },
+                _("Salary"): {
+                    "account_number": "5213"
+                },
+                _("Sales Expenses"): {
+                    "account_number": "5214"
+                },
+                _("Telephone Expenses"): {
+                    "account_number": "5215"
+                },
+                _("Travel Expenses"): {
+                    "account_number": "5216"
+                },
+                _("Utility Expenses"): {
+                    "account_number": "5217"
+                },
+                _("Write Off"): {
+                    "account_number": "5218"
+                },
+                _("Exchange Gain/Loss"): {
+                    "account_number": "5219"
+                },
+                _("Gain/Loss on Asset Disposal"): {
+                    "account_number": "5220"
+                },
+                _("Miscellaneous Expenses"): {
+                    "account_type": "Chargeable",
+                    "account_number": "5221"
+                },
+                "account_number": "5200"
+            },
+            "root_type": "Expense",
+            "account_number": "5000"
+        },
+        _("Income"): {
+            _("Direct Income"): {
+                _("Sales"): {
+                    "account_number": "4110"
+                },
+                _("Service"): {
+                    "account_number": "4120"
+                },
+                "account_number": "4100"
+            },
+            _("Indirect Income"): {
+                "is_group": 1,
+                "account_number": "4200"
+            },
+            "root_type": "Income",
+            "account_number": "4000"
+        },
+        _("Source of Funds (Liabilities)"): {
+            _("Current Liabilities"): {
+                _("Accounts Payable"): {
+                    _("Creditors"): {
+                        "account_type": "Payable",
+                        "account_number": "2110"
+                    },
+                    _("Payroll Payable"): {
+                        "account_number": "2120"
+                    },
+                    "account_number": "2100"
+                },
+                _("Stock Liabilities"): {
+                    _("Stock Received But Not Billed"): {
+                        "account_type": "Stock Received But Not Billed",
+                        "account_number": "2210"
+                    },
+                    "account_number": "2200"
+                },
+                _("Duties and Taxes"): {
+                    "account_type": "Tax",
+                    "is_group": 1,
+                    "account_number": "2300"
+                },
+                _("Loans (Liabilities)"): {
+                    _("Secured Loans"): {
+                        "account_number": "2410"
+                    },
+                    _("Unsecured Loans"): {
+                        "account_number": "2420"
+                    },
+                    _("Bank Overdraft Account"): {
+                        "account_number": "2430"
+                    },
+                    "account_number": "2400"
+                },
+                "account_number": "2100-2400"
+            },
+            "root_type": "Liability",
+            "account_number": "2000"
+        },
+        _("Equity"): {
+            _("Capital Stock"): {
+                "account_type": "Equity",
+                "account_number": "3100"
+            },
+            _("Dividends Paid"): {
+                "account_type": "Equity",
+                "account_number": "3200"
+            },
+            _("Opening Balance Equity"): {
+                "account_type": "Equity",
+                "account_number": "3300"
+            },
+            _("Retained Earnings"): {
+                "account_type": "Equity",
+                "account_number": "3400"
+            },
+            "root_type": "Equity",
+            "account_number": "3000"
+        }
+    }
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/tw_chart_of_accounts.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/tw_chart_of_accounts.json
index a79283a..166f8a7 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/tw_chart_of_accounts.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/tw_chart_of_accounts.json
@@ -2,721 +2,1353 @@
     "country_code": "tw", 
     "name": "Taiwan - Chart of Accounts", 
     "tree": {
-        "1-\u8cc7\u7522": {
-            "11~12-\u6d41\u52d5\u8cc7\u7522": {
-                "111-\u73fe\u91d1\u53ca\u7d04\u7576\u73fe\u91d1": {
-                    "1111-\u5eab\u5b58\u73fe\u91d1": {
-                        "account_type": "Cash"
-                    },
-                    "1112-\u96f6\u7528\u91d1/\u9031\u8f49\u91d1": {
-                        "account_type": "Cash"
-                    },
-                    "1113-\u9280\u884c\u5b58\u6b3e": {
-                        "account_type": "Bank", 
-                        "\u4e2d\u570b\u4fe1\u8a17": {
-                            "account_type": "Bank"
-                        },
-                        "\u53f0\u5317\u5bcc\u90a6": {
-                            "account_type": "Bank"
-                        }
-                    },
-                    "1116-\u5728\u9014\u73fe\u91d1": {
-                        "account_type": "Cash"
-                    },
-                    "1117-\u7d04\u7576\u73fe\u91d1": {
-                        "account_type": "Cash"
-                    },
-                    "1118-\u5176\u4ed6\u73fe\u91d1\u53ca\u7d04\u7576\u73fe\u91d1": {
-                        "account_type": "Cash"
-                    },
-                    "account_type": "Cash"
-                },
-                "112-\u77ed\u671f\u6295\u8cc7": {
-                    "1121-\u77ed\u671f\u6295\u8cc7 \u2014\u80a1\u7968": {}
-                },
-                "113-\u61c9\u6536\u7968\u64da": {
-                    "1131-\u61c9\u6536\u7968\u64da": {
-                        "account_type": "Receivable"
-                    },
-                    "1132-\u61c9\u6536\u7968\u64da\u8cbc\u73fe ": {
-                        "account_type": "Receivable"
-                    },
-                    "1138-\u5176\u4ed6\u61c9\u6536\u7968\u64da ": {
-                        "account_type": "Receivable"
-                    },
-                    "1139-\u5099\u62b5\u5446\u5e33 \uff0d\u61c9\u6536\u7968\u64da ": {
-                        "account_type": "Receivable"
-                    },
-                    "account_type": "Receivable"
-                },
-                "114-\u61c9\u6536\u5e33\u6b3e": {
-                    "1141-\u61c9\u6536\u5e33\u6b3e ": {
-                        "account_type": "Receivable"
-                    },
-                    "1142-\u61c9\u6536\u5206\u671f\u5e33\u6b3e ": {
-                        "account_type": "Receivable"
-                    },
-                    "1149-\u5099\u62b5\u5446\u5e33 \uff0d\u61c9\u6536\u5e33\u6b3e ": {
-                        "account_type": "Receivable"
-                    },
-                    "account_type": "Receivable"
-                },
-                "118-\u5176\u4ed6\u61c9\u6536\u6b3e": {
-                    "1184-\u61c9\u6536\u6536\u76ca": {
-                        "account_type": "Receivable"
-                    },
-                    "1185-\u61c9\u6536\u9000\u7a05\u6b3e": {
-                        "account_type": "Receivable"
-                    },
-                    "1189-\u5099\u62b5\u5446\u5e33 \u2014 \u5176\u4ed6\u61c9\u6536\u6b3e ": {
-                        "account_type": "Receivable"
-                    },
-                    "account_type": "Receivable"
-                },
-                "121~122-\u5b58\u8ca8": {
-                    "1219-\u5099\u62b5\u5b58\u8ca8\u8dcc\u50f9\u640d\u5931": {},
-                    "1229-\u5099\u62b5\u5b58\u8ca8\u8dcc\u50f9\u640d\u5931": {},
-                    "account_type": "Stock", 
-                    "is_group": 1
-                },
-                "125-\u9810\u4ed8\u8cbb\u7528": {
-                    "1251-\u9810\u4ed8\u85aa\u8cc7": {},
-                    "1252-\u9810\u4ed8\u79df\u91d1": {},
-                    "1253-\u9810\u4ed8\u4fdd\u96aa\u8cbb": {},
-                    "1254-\u7528\u54c1\u76e4\u5b58": {},
-                    "1255-\u9810\u4ed8\u6240\u5f97\u7a05": {},
-                    "1258-\u5176\u4ed6\u9810\u4ed8\u8cbb\u7528": {}
-                },
-                "126-\u9810\u4ed8\u6b3e\u9805": {
-                    "1261-\u9810\u4ed8\u8ca8\u6b3e": {},
-                    "1268-\u5176\u4ed6\u9810\u4ed8\u6b3e\u9805": {}
-                },
-                "128~129-\u5176\u4ed6\u6d41\u52d5\u8cc7\u7522": {
-                    "1281-\u9032\u9805\u7a05\u984d": {},
-                    "1282-\u7559\u62b5\u7a05\u984d": {},
-                    "1283-\u66ab\u4ed8\u6b3e": {},
-                    "1284-\u4ee3\u4ed8\u6b3e": {},
-                    "1285-\u54e1\u5de5\u501f\u652f": {}
-                }
-            },
-            "13-\u57fa\u91d1\u53ca\u9577\u671f\u6295\u8cc7": {
-                "131-\u57fa\u91d1": {
-                    "1311-\u511f\u50b5\u57fa\u91d1": {},
-                    "1313-\u610f\u5916\u640d\u5931\u6e96\u5099\u57fa\u91d1": {},
-                    "1314-\u9000\u4f11\u57fa\u91d1": {},
-                    "1318-\u5176\u4ed6\u57fa\u91d1": {}
-                },
-                "132-\u9577\u671f\u6295\u8cc7": {
-                    "1321-\u9577\u671f\u80a1\u6b0a\u6295\u8cc7": {},
-                    "1322-\u9577\u671f\u50b5\u5238\u6295\u8cc7": {},
-                    "1323-\u9577\u671f\u4e0d\u52d5\u7522\u6295\u8cc7": {},
-                    "1328-\u5176\u4ed6\u9577\u671f\u6295\u8cc7": {}
-                }
-            },
-            "14~15-\u56fa\u5b9a\u8cc7\u7522": {
-                "141-\u571f\u5730": {
-                    "1411-\u571f\u5730": {
-                        "account_type": "Fixed Asset"
-                    },
-                    "account_type": "Fixed Asset"
-                },
-                "142-\u571f\u5730\u6539\u826f\u7269": {
-                    "1421-\u571f\u5730\u6539\u826f\u7269": {
-                        "account_type": "Fixed Asset"
-                    },
-                    "account_type": "Fixed Asset"
-                },
-                "143-\u623f\u5c4b\u53ca\u5efa\u7269": {
-                    "1431-\u623f\u5c4b\u53ca\u5efa\u7269": {
-                        "account_type": "Fixed Asset"
-                    },
-                    "account_type": "Fixed Asset"
-                },
-                "144~146-\u6a5f(\u5668)\u5177\u53ca\u8a2d\u5099": {
-                    "1441-\u6a5f(\u5668)\u5177": {
-                        "account_type": "Fixed Asset"
-                    },
-                    "account_type": "Fixed Asset"
-                },
-                "151-\u79df\u8cc3\u8cc7\u7522": {
-                    "1511-\u79df\u8cc3\u8cc7\u7522": {
-                        "account_type": "Fixed Asset"
-                    },
-                    "account_type": "Fixed Asset"
-                },
-                "152-\u79df\u8cc3\u6b0a\u76ca\u6539\u826f": {
-                    "1521-\u79df\u8cc3\u6b0a\u76ca\u6539\u826f": {
-                        "account_type": "Fixed Asset"
-                    },
-                    "account_type": "Fixed Asset"
-                },
-                "156-\u672a\u5b8c\u5de5\u7a0b\u53ca\u9810\u4ed8\u8cfc\u7f6e\u8a2d\u5099\u6b3e": {
-                    "1561-\u672a\u5b8c\u5de5\u7a0b": {
-                        "account_type": "Fixed Asset"
-                    },
-                    "account_type": "Fixed Asset"
-                },
-                "158-\u96dc\u9805\u56fa\u5b9a\u8cc7\u7522": {
-                    "1581-\u96dc\u9805\u56fa\u5b9a\u8cc7\u7522": {
-                        "account_type": "Fixed Asset"
-                    },
-                    "account_type": "Fixed Asset"
-                },
-                "account_type": "Fixed Asset"
-            },
-            "16-\u905e\u8017\u8cc7\u7522": {
-                "161-\u905e\u8017\u8cc7\u7522": {
-                    "is_group": 1
-                }
-            },
-            "17-\u7121\u5f62\u8cc7\u7522": {
-                "171-\u5546\u6a19\u6b0a": {
-                    "1711-\u5546\u6a19\u6b0a": {}
-                },
-                "172-\u5c08\u5229\u6b0a": {
-                    "1721-\u5c08\u5229\u6b0a": {}
-                },
-                "176-\u5546\u8b7d": {
-                    "1761-\u5546\u8b7d": {}
-                },
-                "177-\u958b\u8fa6\u8cbb": {
-                    "1771-\u958b\u8fa6\u8cbb": {}
-                },
-                "178-\u5176\u4ed6\u7121\u5f62\u8cc7\u7522": {
-                    "1781-\u905e\u5ef6\u9000\u4f11\u91d1\u6210\u672c": {}
-                }
-            },
-            "18-\u5176\u4ed6\u8cc7\u7522": {
-                "181-\u905e\u5ef6\u8cc7\u7522": {
-                    "1811-\u50b5\u5238\u767c\u884c\u6210\u672c": {},
-                    "1812-\u9577\u671f\u9810\u4ed8\u79df\u91d1": {},
-                    "1813-\u9577\u671f\u9810\u4ed8\u4fdd\u96aa\u8cbb": {},
-                    "1814-\u905e\u5ef6\u6240\u5f97\u7a05\u8cc7\u7522": {},
-                    "1815-\u9810\u4ed8\u9000\u4f11\u91d1": {},
-                    "1818-\u5176\u4ed6\u905e\u5ef6\u8cc7\u7522": {}
-                },
-                "182-\u9592\u7f6e\u8cc7\u7522": {
-                    "1821-\u9592\u7f6e\u8cc7\u7522": {}
-                },
-                "184-\u9577\u671f\u61c9\u6536\u7968\u64da\u53ca\u6b3e\u9805\u8207\u50ac\u6536\u5e33\u6b3e": {
-                    "1841-\u9577\u671f\u61c9\u6536\u7968\u64da": {
-                        "account_type": "Receivable"
-                    },
-                    "1842-\u9577\u671f\u61c9\u6536\u5e33\u6b3e": {
-                        "account_type": "Receivable"
-                    },
-                    "1843-\u50ac\u6536\u5e33\u6b3e": {
-                        "account_type": "Receivable"
-                    },
-                    "1848-\u5176\u4ed6\u9577\u671f\u61c9\u6536\u6b3e\u9805": {
-                        "account_type": "Receivable"
-                    },
-                    "1849-\u5099\u62b5\u5446\u5e33\u2014\u9577\u671f\u61c9\u6536\u7968\u64da\u53ca\u6b3e\u9805\u8207\u50ac\u6536\u5e33\u6b3e": {
-                        "account_type": "Receivable"
-                    },
-                    "account_type": "Receivable"
-                },
-                "185-\u51fa\u79df\u8cc7\u7522": {
-                    "1851-\u51fa\u79df\u8cc7\u7522": {},
-                    "1858-\u51fa\u79df\u8cc7\u7522 \u2014\u91cd\u4f30\u589e\u503c": {},
-                    "1859-\u7d2f\u7a4d\u6298\u820a \u2014\u51fa\u79df\u8cc7\u7522": {
-                        "account_type": "Accumulated Depreciation"
+        "\u6240\u5f97\u7a05\u8cbb\u7528(\u5229\u76ca)": {
+            "account_number": "8", 
+            "root_type": "Expense", 
+            "\u6240\u5f97\u7a05\u8cbb\u7528(\u5229\u76ca)": {
+                "account_number": "81", 
+                "\u6240\u5f97\u7a05\u8cbb\u7528(\u5229\u76ca) ": {
+                    "account_number": "811", 
+                    "\u6240\u5f97\u7a05\u8cbb\u7528(\u5229\u76ca) ": {
+                        "account_number": "8111"
                     }
-                },
-                "186-\u5b58\u51fa\u4fdd\u8b49\u91d1": {
-                    "1861-\u5b58\u51fa\u4fdd\u8b49\u91d1": {}
-                },
-                "188-\u96dc\u9805\u8cc7\u7522": {
-                    "1881-\u53d7\u9650\u5236\u5b58\u6b3e": {},
-                    "1888-\u96dc\u9805\u8cc7\u7522 \u2014\u5176\u4ed6": {}
                 }
-            },
+            }
+        }, 
+        "\u696d\u4e3b\u6b0a\u76ca": {
+            "account_number": "3", 
+            "root_type": "Equity", 
+            "\u4fdd\u7559\u76c8\u9918(\u7d2f\u7a4d\u8667\u640d)": {
+                "account_number": "33", 
+                "\u672a\u5206\u914d\u76c8\u9918(\u7d2f\u7a4d\u8667\u640d) ": {
+                    "account_number": "335", 
+                    "is_group": 1
+                }, 
+                "\u6cd5\u5b9a\u76c8\u9918\u516c\u7a4d": {
+                    "account_number": "331", 
+                    "\u6cd5\u5b9a\u76c8\u9918\u516c\u7a4d": {
+                        "account_number": "3311"
+                    }
+                }, 
+                "\u7279\u5225\u76c8\u9918\u516c\u7a4d": {
+                    "account_number": "332", 
+                    "\u511f\u50b5\u6e96\u5099": {
+                        "account_number": "3323"
+                    }, 
+                    "\u5176\u4ed6\u7279\u5225\u76c8\u9918\u516c\u7a4d": {
+                        "account_number": "3328"
+                    }, 
+                    "\u610f\u5916\u640d\u5931\u6e96\u5099": {
+                        "account_number": "3321"
+                    }, 
+                    "\u6539\u826f\u64f4\u5145\u6e96\u5099": {
+                        "account_number": "3322"
+                    }
+                }
+            }, 
+            "\u5c11\u6578\u80a1\u6b0a": {
+                "account_number": "36", 
+                "\u5c11\u6578\u80a1\u6b0a": {
+                    "account_number": "361", 
+                    "\u5c11\u6578\u80a1\u6b0a": {
+                        "account_number": "3611"
+                    }
+                }
+            }, 
+            "\u5eab\u85cf\u80a1": {
+                "account_number": "35", 
+                "\u5eab\u85cf\u80a1": {
+                    "account_number": "351", 
+                    "\u5eab\u85cf\u80a1": {
+                        "account_number": "3511"
+                    }
+                }
+            }, 
+            "\u6b0a\u76ca\u8abf\u6574": {
+                "account_number": "34", 
+                "\u672a\u8a8d\u5217\u70ba\u9000\u4f11\u91d1\u6210\u672c\u4e4b\u6de8\u640d\u5931": {
+                    "account_number": "343", 
+                    "\u672a\u8a8d\u5217\u70ba\u9000\u4f11\u91d1\u6210\u672c\u4e4b\u6de8\u640d\u5931": {
+                        "account_number": "3431"
+                    }
+                }, 
+                "\u7d2f\u7a4d\u63db\u7b97\u8abf\u6574\u6578": {
+                    "account_number": "342", 
+                    "\u7d2f\u7a4d\u63db\u7b97\u8abf\u6574\u6578": {
+                        "account_number": "3421"
+                    }
+                }, 
+                "\u9577\u671f\u80a1\u6b0a\u6295\u8cc7\u672a\u5be6\u73fe\u8dcc\u50f9\u640d\u5931": {
+                    "account_number": "341", 
+                    "\u9577\u671f\u80a1\u6b0a\u6295\u8cc7\u672a\u5be6\u73fe\u8dcc\u50f9\u640d\u5931": {
+                        "account_number": "3411"
+                    }
+                }
+            }, 
+            "\u8cc7\u672c": {
+                "account_number": "31", 
+                "\u8cc7\u672c\uff08\u80a1\u672c\uff09 ": {
+                    "account_number": "311", 
+                    "\u5f85\u5206\u914d\u80a1\u7968\u80a1\u5229": {
+                        "account_number": "3114"
+                    }, 
+                    "\u666e\u901a\u80a1\u80a1\u672c": {
+                        "account_number": "3111"
+                    }, 
+                    "\u7279\u5225\u80a1\u80a1\u672c": {
+                        "account_number": "3112"
+                    }, 
+                    "\u8cc7\u672c": {
+                        "account_number": "3115"
+                    }, 
+                    "\u9810\u6536\u80a1\u672c": {
+                        "account_number": "3113"
+                    }
+                }
+            }, 
+            "\u8cc7\u672c\u516c\u7a4d": {
+                "account_number": "32", 
+                "\u5176\u4ed6\u8cc7\u672c\u516c\u7a4d": {
+                    "account_number": "328", 
+                    "\u6b0a\u76ca\u6cd5\u9577\u671f\u80a1\u6b0a\u6295\u8cc7\u8cc7\u672c\u516c\u7a4d": {
+                        "account_number": "3281"
+                    }, 
+                    "\u8cc7\u672c\u516c\u7a4d\u2014 \u5eab\u85cf\u80a1\u7968\u4ea4\u6613": {
+                        "account_number": "3282"
+                    }
+                }, 
+                "\u53d7\u8d08\u516c\u7a4d": {
+                    "account_number": "326", 
+                    "\u53d7\u8d08\u516c\u7a4d": {
+                        "account_number": "3261"
+                    }
+                }, 
+                "\u5408\u4f75\u516c\u7a4d": {
+                    "account_number": "325", 
+                    "\u5408\u4f75\u516c\u7a4d": {
+                        "account_number": "3251"
+                    }
+                }, 
+                "\u80a1\u7968\u6ea2\u50f9": {
+                    "account_number": "321", 
+                    "\u666e\u901a\u80a1\u80a1\u7968\u6ea2\u50f9": {
+                        "account_number": "3211"
+                    }, 
+                    "\u7279\u5225\u80a1\u80a1\u7968\u6ea2\u50f9": {
+                        "account_number": "3212"
+                    }
+                }, 
+                "\u8655\u5206\u8cc7\u7522\u6ea2\u50f9\u516c\u7a4d": {
+                    "account_number": "324", 
+                    "\u8655\u5206\u8cc7\u7522\u6ea2\u50f9\u516c\u7a4d": {
+                        "account_number": "3241"
+                    }
+                }, 
+                "\u8cc7\u7522\u91cd\u4f30\u589e\u503c\u6e96\u5099": {
+                    "account_number": "323", 
+                    "\u8cc7\u7522\u91cd\u4f30\u589e\u503c\u6e96\u5099": {
+                        "account_number": "3231"
+                    }
+                }
+            }
+        }, 
+        "\u71df\u696d\u5916\u6536\u5165\u53ca\u8cbb\u7528": {
+            "account_number": "7", 
+            "root_type": "Income", 
+            "\u71df\u696d\u5916\u6536\u5165": {
+                "account_number": "71~74", 
+                "\u514c\u63db\u5229\u76ca": {
+                    "account_number": "713", 
+                    "\u514c\u63db\u5229\u76ca": {
+                        "account_number": "7131"
+                    }
+                }, 
+                "\u5176\u4ed6\u71df\u696d\u5916\u6536\u5165": {
+                    "account_number": "748", 
+                    "\u4f63\u91d1\u6536\u5165": {
+                        "account_number": "7483"
+                    }, 
+                    "\u5176\u4ed6\u71df\u696d\u5916\u6536\u5165\u2014\u5176\u4ed6": {
+                        "account_number": "7488"
+                    }, 
+                    "\u51fa\u552e\u4e0b\u8173\u53ca\u5ee2\u6599\u6536\u5165": {
+                        "account_number": "7484"
+                    }, 
+                    "\u58de\u5e33\u8f49\u56de\u5229\u76ca": {
+                        "account_number": "7487"
+                    }, 
+                    "\u5b58\u8ca8\u76e4\u76c8": {
+                        "account_number": "7485"
+                    }, 
+                    "\u5b58\u8ca8\u8dcc\u50f9\u56de\u5347\u5229\u76ca": {
+                        "account_number": "7486"
+                    }, 
+                    "\u6350\u8d08\u6536\u5165": {
+                        "account_number": "7481"
+                    }, 
+                    "\u79df\u91d1\u6536\u5165": {
+                        "account_number": "7482"
+                    }
+                }, 
+                "\u5229\u606f\u6536\u5165": {
+                    "account_number": "711", 
+                    "\u5229\u606f\u6536\u5165": {
+                        "account_number": "7111"
+                    }
+                }, 
+                "\u6295\u8cc7\u6536\u76ca": {
+                    "account_number": "712", 
+                    "\u6b0a\u76ca\u6cd5\u8a8d\u5217\u4e4b\u6295\u8cc7\u6536\u76ca": {
+                        "account_number": "7121"
+                    }, 
+                    "\u77ed\u671f\u6295\u8cc7\u5e02\u50f9\u56de\u5347\u5229\u76ca": {
+                        "account_number": "7123"
+                    }, 
+                    "\u80a1\u5229\u6536\u5165": {
+                        "account_number": "7122"
+                    }
+                }, 
+                "\u8655\u5206\u6295\u8cc7\u6536\u76ca": {
+                    "account_number": "714", 
+                    "\u8655\u5206\u6295\u8cc7\u6536\u76ca": {
+                        "account_number": "7141"
+                    }
+                }, 
+                "\u8655\u5206\u8cc7\u7522\u6ea2\u50f9\u6536\u5165": {
+                    "account_number": "715", 
+                    "\u8655\u5206\u8cc7\u7522\u6ea2\u50f9\u6536\u5165": {
+                        "account_number": "7151"
+                    }
+                }
+            }, 
+            "\u71df\u696d\u5916\u8cbb\u7528": {
+                "account_number": "75~78", 
+                "\u514c\u63db\u640d\u5931": {
+                    "account_number": "753", 
+                    "\u514c\u63db\u640d\u5931": {
+                        "account_number": "7531"
+                    }
+                }, 
+                "\u5176\u4ed6\u71df\u696d\u5916\u8cbb\u7528": {
+                    "account_number": "788", 
+                    "\u505c\u5de5\u640d\u5931": {
+                        "account_number": "7881"
+                    }, 
+                    "\u5176\u4ed6\u71df\u696d\u5916\u8cbb\u7528\u2014\u5176\u4ed6": {
+                        "account_number": "7888"
+                    }, 
+                    "\u5b58\u8ca8\u76e4\u640d": {
+                        "account_number": "7885"
+                    }, 
+                    "\u5b58\u8ca8\u8dcc\u50f9\u53ca\u5446\u6eef\u640d\u5931": {
+                        "account_number": "7886"
+                    }, 
+                    "\u707d\u5bb3\u640d\u5931": {
+                        "account_number": "7882"
+                    }
+                }, 
+                "\u5229\u606f\u8cbb\u7528": {
+                    "account_number": "751", 
+                    "\u5229\u606f\u8cbb\u7528": {
+                        "account_number": "7511"
+                    }
+                }, 
+                "\u6295\u8cc7\u640d\u5931": {
+                    "account_number": "752", 
+                    "\u6b0a\u76ca\u6cd5\u8a8d\u5217\u4e4b\u6295\u8cc7\u640d\u5931": {
+                        "account_number": "7521"
+                    }, 
+                    "\u77ed\u671f\u6295\u8cc7\u672a\u5be6\u73fe\u8dcc\u50f9\u640d\u5931": {
+                        "account_number": "7523"
+                    }
+                }, 
+                "\u8655\u5206\u6295\u8cc7\u640d\u5931": {
+                    "account_number": "754", 
+                    "\u8655\u5206\u6295\u8cc7\u640d\u5931": {
+                        "account_number": "7541"
+                    }
+                }, 
+                "\u8655\u5206\u8cc7\u7522\u640d\u5931": {
+                    "account_number": "755", 
+                    "\u8655\u5206\u8cc7\u7522\u640d\u5931 ": {
+                        "account_number": "7551"
+                    }
+                }
+            }
+        }, 
+        "\u71df\u696d\u6210\u672c": {
+            "Stock Adjustment": {
+                "account_type": "Stock Adjustment"
+            }, 
+            "account_number": "5", 
+            "root_type": "Expense", 
+            "\u5176\u4ed6\u71df\u696d\u6210\u672c": {
+                "account_number": "58", 
+                "\u5176\u4ed6\u71df\u696d\u6210\u672c\u2014\u5176\u4ed6 ": {
+                    "account_number": "588", 
+                    "\u5176\u4ed6\u71df\u696d\u6210\u672c\u2014\u5176\u4ed6": {
+                        "account_number": "5888"
+                    }
+                }
+            }, 
+            "\u52de\u52d9\u6210\u672c\u88fd": {
+                "account_number": "56", 
+                "\u52de\u52d9\u6210\u672c": {
+                    "account_number": "561", 
+                    "\u52de\u52d9\u6210\u672c": {
+                        "account_number": "5611"
+                    }
+                }
+            }, 
+            "\u696d\u52d9\u6210\u672c": {
+                "account_number": "57", 
+                "\u696d\u52d9\u6210\u672c": {
+                    "account_number": "571", 
+                    "\u696d\u52d9\u6210\u672c": {
+                        "account_number": "5711"
+                    }
+                }
+            }, 
+            "\u92b7\u8ca8\u6210\u672c": {
+                "Expenses Included In Valuation": {
+                    "account_type": "Expenses Included In Valuation"
+                }, 
+                "account_number": "51", 
+                "account_type": "Cost of Goods Sold", 
+                "\u76f4\u63a5\u4eba\u5de5": {
+                    "account_number": "514", 
+                    "\u76f4\u63a5\u4eba\u5de5": {
+                        "account_number": "5141"
+                    }
+                }, 
+                "\u88fd\u9020\u8cbb\u7528": {
+                    "account_number": "515~518", 
+                    "\u4f19\u98df\u8cbb": {
+                        "account_number": "5172"
+                    }, 
+                    "\u4fdd\u96aa\u8cbb": {
+                        "account_number": "5162"
+                    }, 
+                    "\u4fee\u7e55\u8cbb": {
+                        "account_number": "5157"
+                    }, 
+                    "\u5176\u4ed6\u88fd\u9020\u8cbb\u7528": {
+                        "account_number": "5188"
+                    }, 
+                    "\u52a0\u5de5\u8cbb": {
+                        "account_number": "5163"
+                    }, 
+                    "\u5305\u88dd\u8cbb": {
+                        "account_number": "5158"
+                    }, 
+                    "\u5404\u9805\u8017\u7aed\u53ca\u6524\u63d0": {
+                        "account_number": "5169"
+                    }, 
+                    "\u6298\u820a ": {
+                        "account_number": "5168", 
+                        "account_type": "Depreciation"
+                    }, 
+                    "\u6587\u5177\u7528\u54c1": {
+                        "account_number": "5153"
+                    }, 
+                    "\u65c5\u8cbb": {
+                        "account_number": "5154"
+                    }, 
+                    "\u6c34\u96fb\u74e6\u65af\u8cbb": {
+                        "account_number": "5161"
+                    }, 
+                    "\u79df\u91d1\u652f\u51fa": {
+                        "account_number": "5152"
+                    }, 
+                    "\u7a05\u6350": {
+                        "account_number": "5166", 
+                        "account_type": "Tax", 
+                        "tax_rate": 5.0
+                    }, 
+                    "\u8077\u5de5\u798f\u5229": {
+                        "account_number": "5173"
+                    }, 
+                    "\u8a13\u7df4\u8cbb": {
+                        "account_number": "5176"
+                    }, 
+                    "\u904b\u8cbb": {
+                        "account_number": "5155"
+                    }, 
+                    "\u90f5\u96fb\u8cbb": {
+                        "account_number": "5156"
+                    }, 
+                    "\u9593\u63a5\u4eba\u5de5": {
+                        "account_number": "5151"
+                    }, 
+                    "\u9593\u63a5\u6750\u6599": {
+                        "account_number": "5177"
+                    }
+                }, 
+                "\u9032\u6599": {
+                    "account_number": "513", 
+                    "\u9032\u6599": {
+                        "account_number": "5131"
+                    }, 
+                    "\u9032\u6599\u6298\u8b93": {
+                        "account_number": "5134"
+                    }, 
+                    "\u9032\u6599\u8cbb\u7528": {
+                        "account_number": "5132"
+                    }, 
+                    "\u9032\u6599\u9000\u51fa": {
+                        "account_number": "5133"
+                    }
+                }, 
+                "\u9032\u8ca8": {
+                    "account_number": "512", 
+                    "\u9032\u8ca8": {
+                        "account_number": "5121"
+                    }, 
+                    "\u9032\u8ca8\u6298\u8b93": {
+                        "account_number": "5124"
+                    }, 
+                    "\u9032\u8ca8\u8cbb\u7528": {
+                        "account_number": "5122"
+                    }, 
+                    "\u9032\u8ca8\u9000\u51fa": {
+                        "account_number": "5123"
+                    }
+                }, 
+                "\u92b7\u8ca8\u6210\u672c": {
+                    "account_number": "511", 
+                    "account_type": "Cost of Goods Sold", 
+                    "\u5206\u671f\u4ed8\u6b3e\u92b7\u8ca8\u6210\u672c": {
+                        "account_number": "5112", 
+                        "account_type": "Cost of Goods Sold"
+                    }, 
+                    "\u92b7\u8ca8\u6210\u672c": {
+                        "account_number": "5111", 
+                        "account_type": "Cost of Goods Sold"
+                    }
+                }
+            }
+        }, 
+        "\u71df\u696d\u6536\u5165": {
+            "account_number": "4", 
+            "root_type": "Income", 
+            "\u5176\u4ed6\u71df\u696d\u6536\u5165": {
+                "account_number": "48", 
+                "\u5176\u4ed6\u71df\u696d\u6536\u5165\u2014\u5176\u4ed6": {
+                    "account_number": "488", 
+                    "\u5176\u4ed6\u71df\u696d\u6536\u5165\u2014\u5176\u4ed6": {
+                        "account_number": "4888"
+                    }
+                }
+            }, 
+            "\u52de\u52d9\u6536\u5165": {
+                "account_number": "46", 
+                "\u52de\u52d9\u6536\u5165": {
+                    "account_number": "461", 
+                    "\u52de\u52d9\u6536\u5165": {
+                        "account_number": "4611"
+                    }
+                }
+            }, 
+            "\u696d\u52d9\u6536\u5165": {
+                "account_number": "47", 
+                "\u696d\u52d9\u6536\u5165": {
+                    "account_number": "471", 
+                    "\u696d\u52d9\u6536\u5165": {
+                        "account_number": "4711"
+                    }
+                }
+            }, 
+            "\u92b7\u8ca8\u6536\u5165": {
+                "account_number": "41", 
+                "\u92b7\u8ca8\u6298\u8b93": {
+                    "account_number": "419", 
+                    "\u92b7\u8ca8\u6298\u8b93": {
+                        "account_number": "4191"
+                    }
+                }, 
+                "\u92b7\u8ca8\u6536\u5165": {
+                    "account_number": "411", 
+                    "\u5206\u671f\u4ed8\u6b3e\u92b7\u8ca8\u6536\u5165": {
+                        "account_number": "4112"
+                    }, 
+                    "\u92b7\u8ca8\u6536\u5165": {
+                        "account_number": "4111"
+                    }
+                }, 
+                "\u92b7\u8ca8\u9000\u56de": {
+                    "account_number": "417", 
+                    "\u92b7\u8ca8\u9000\u56de": {
+                        "account_number": "4171"
+                    }
+                }
+            }
+        }, 
+        "\u71df\u696d\u8cbb\u7528": {
+            "account_number": "6", 
+            "root_type": "Expense", 
+            "\u63a8\u92b7\u8cbb\u7528": {
+                "account_number": "61", 
+                "\u63a8\u92b7\u8cbb\u7528": {
+                    "account_number": "615~618", 
+                    "\u4ea4\u969b\u8cbb": {
+                        "account_number": "6164"
+                    }, 
+                    "\u4f19\u98df\u8cbb": {
+                        "account_number": "6172"
+                    }, 
+                    "\u4f63\u91d1\u652f\u51fa": {
+                        "account_number": "6175"
+                    }, 
+                    "\u4fdd\u96aa\u8cbb": {
+                        "account_number": "6162"
+                    }, 
+                    "\u4fee\u7e55\u8cbb": {
+                        "account_number": "6157"
+                    }, 
+                    "\u5176\u4ed6\u63a8\u92b7\u8cbb\u7528": {
+                        "account_number": "6188"
+                    }, 
+                    "\u5404\u9805\u8017\u7aed\u53ca\u6524\u63d0": {
+                        "account_number": "6169"
+                    }, 
+                    "\u5446\u5e33\u640d\u5931": {
+                        "account_number": "6167"
+                    }, 
+                    "\u5ee3\u544a\u8cbb": {
+                        "account_number": "6159"
+                    }, 
+                    "\u6298\u820a ": {
+                        "account_number": "6168", 
+                        "account_type": "Depreciation"
+                    }, 
+                    "\u6350\u8d08": {
+                        "account_number": "6165"
+                    }, 
+                    "\u6587\u5177\u7528\u54c1": {
+                        "account_number": "6153"
+                    }, 
+                    "\u65c5\u8cbb": {
+                        "account_number": "6154"
+                    }, 
+                    "\u6c34\u96fb\u74e6\u65af\u8cbb": {
+                        "account_number": "6161"
+                    }, 
+                    "\u79df\u91d1\u652f\u51fa": {
+                        "account_number": "6152"
+                    }, 
+                    "\u7a05\u6350": {
+                        "account_number": "6166", 
+                        "account_type": "Tax", 
+                        "tax_rate": 5.0
+                    }, 
+                    "\u8077\u5de5\u798f\u5229": {
+                        "account_number": "6173"
+                    }, 
+                    "\u85aa\u8cc7\u652f\u51fa": {
+                        "account_number": "6151"
+                    }, 
+                    "\u8a13\u7df4\u8cbb": {
+                        "account_number": "6176"
+                    }, 
+                    "\u904b\u8cbb": {
+                        "account_number": "6155"
+                    }, 
+                    "\u90f5\u96fb\u8cbb": {
+                        "account_number": "6156"
+                    }
+                }
+            }, 
+            "\u7814\u7a76\u767c\u5c55\u8cbb\u7528": {
+                "account_number": "63", 
+                "\u7814\u7a76\u767c\u5c55\u8cbb\u7528": {
+                    "account_number": "635~638", 
+                    "\u4ea4\u969b\u8cbb": {
+                        "account_number": "6364"
+                    }, 
+                    "\u4f19\u98df\u8cbb": {
+                        "account_number": "6372"
+                    }, 
+                    "\u4fdd\u96aa\u8cbb": {
+                        "account_number": "6362"
+                    }, 
+                    "\u4fee\u7e55\u8cbb": {
+                        "account_number": "6357"
+                    }, 
+                    "\u5176\u4ed6\u7814\u7a76\u767c\u5c55\u8cbb\u7528": {
+                        "account_number": "6378"
+                    }, 
+                    "\u5404\u9805\u8017\u7aed\u53ca\u6524\u63d0": {
+                        "account_number": "6369"
+                    }, 
+                    "\u6298\u820a": {
+                        "account_number": "6368", 
+                        "account_type": "Depreciation"
+                    }, 
+                    "\u6587\u5177\u7528\u54c1": {
+                        "account_number": "6353"
+                    }, 
+                    "\u65c5\u8cbb": {
+                        "account_number": "6354"
+                    }, 
+                    "\u6c34\u96fb\u74e6\u65af\u8cbb": {
+                        "account_number": "6361"
+                    }, 
+                    "\u79df\u91d1\u652f\u51fa": {
+                        "account_number": "6352"
+                    }, 
+                    "\u7a05\u6350": {
+                        "account_number": "6366", 
+                        "account_type": "Tax", 
+                        "tax_rate": 5.0
+                    }, 
+                    "\u8077\u5de5\u798f\u5229": {
+                        "account_number": "6373"
+                    }, 
+                    "\u85aa\u8cc7\u652f\u51fa": {
+                        "account_number": "6351"
+                    }, 
+                    "\u8a13\u7df4\u8cbb": {
+                        "account_number": "6376"
+                    }, 
+                    "\u904b\u8cbb": {
+                        "account_number": "6355"
+                    }, 
+                    "\u90f5\u96fb\u8cbb": {
+                        "account_number": "6356"
+                    }
+                }
+            }, 
+            "\u7ba1\u7406\u53ca\u7e3d\u52d9\u8cbb\u7528": {
+                "account_number": "62", 
+                "\u7ba1\u7406\u53ca\u7e3d\u52d9\u8cbb\u7528": {
+                    "account_number": "625~628", 
+                    "\u4ea4\u969b\u8cbb": {
+                        "account_number": "6264"
+                    }, 
+                    "\u4f19\u98df\u8cbb": {
+                        "account_number": "6272"
+                    }, 
+                    "\u4f63\u91d1\u652f\u51fa": {
+                        "account_number": "6275"
+                    }, 
+                    "\u4fdd\u96aa\u8cbb": {
+                        "account_number": "6262"
+                    }, 
+                    "\u4fee\u7e55\u8cbb": {
+                        "account_number": "6257"
+                    }, 
+                    "\u5176\u4ed6\u7ba1\u7406\u53ca\u7e3d\u52d9\u8cbb\u7528": {
+                        "account_number": "6288"
+                    }, 
+                    "\u52de\u52d9\u8cbb": {
+                        "account_number": "6278"
+                    }, 
+                    "\u5404\u9805\u8017\u7aed\u53ca\u6524\u63d0": {
+                        "account_number": "6269"
+                    }, 
+                    "\u5446\u5e33\u640d\u5931": {
+                        "account_number": "6267"
+                    }, 
+                    "\u5916\u92b7\u640d\u5931": {
+                        "account_number": "6271"
+                    }, 
+                    "\u5ee3\u544a\u8cbb": {
+                        "account_number": "6259"
+                    }, 
+                    "\u6298\u820a": {
+                        "account_number": "6268", 
+                        "account_type": "Depreciation"
+                    }, 
+                    "\u6350\u8d08": {
+                        "account_number": "6265"
+                    }, 
+                    "\u6587\u5177\u7528\u54c1": {
+                        "account_number": "6253"
+                    }, 
+                    "\u65c5\u8cbb": {
+                        "account_number": "6254"
+                    }, 
+                    "\u6c34\u96fb\u74e6\u65af\u8cbb": {
+                        "account_number": "6261"
+                    }, 
+                    "\u7814\u7a76\u767c\u5c55\u8cbb\u7528": {
+                        "account_number": "6274"
+                    }, 
+                    "\u79df\u91d1\u652f\u51fa": {
+                        "account_number": "6252"
+                    }, 
+                    "\u7a05\u6350": {
+                        "account_number": "6266", 
+                        "account_type": "Tax", 
+                        "tax_rate": 5.0
+                    }, 
+                    "\u8077\u5de5\u798f\u5229": {
+                        "account_number": "6273"
+                    }, 
+                    "\u85aa\u8cc7\u652f\u51fa": {
+                        "account_number": "6251"
+                    }, 
+                    "\u8a13\u7df4\u8cbb": {
+                        "account_number": "6276"
+                    }, 
+                    "\u904b\u8cbb": {
+                        "account_number": "6255"
+                    }, 
+                    "\u90f5\u96fb\u8cbb": {
+                        "account_number": "6256"
+                    }
+                }
+            }
+        }, 
+        "\u8ca0\u50b5": {
+            "Stock Received But Not Billed": {
+                "account_type": "Stock Received But Not Billed"
+            }, 
+            "account_number": "2", 
+            "root_type": "Liability", 
+            "\u5176\u4ed6\u8ca0\u50b5": {
+                "account_number": "28", 
+                "\u5b58\u5165\u4fdd\u8b49\u91d1": {
+                    "account_number": "286", 
+                    "\u5b58\u5165\u4fdd\u8b49\u91d1": {
+                        "account_number": "2861"
+                    }
+                }, 
+                "\u905e\u5ef6\u8ca0\u50b5": {
+                    "account_number": "281", 
+                    "\u5176\u4ed6\u905e\u5ef6\u8ca0\u50b5": {
+                        "account_number": "2818"
+                    }, 
+                    "\u905e\u5ef6\u6240\u5f97\u7a05\u8ca0\u50b5": {
+                        "account_number": "2814"
+                    }, 
+                    "\u905e\u5ef6\u6536\u5165": {
+                        "account_number": "2811"
+                    }
+                }, 
+                "\u96dc\u9805\u8ca0\u50b5": {
+                    "account_number": "288", 
+                    "\u96dc\u9805\u8ca0\u50b5 \u2014\u5176\u4ed6": {
+                        "account_number": "2888"
+                    }
+                }
+            }, 
+            "\u6d41\u52d5\u8ca0\u50b5": {
+                "account_number": "21~22", 
+                "\u4e00\u5e74\u6216\u4e00\u71df\u696d\u9031\u671f\u5167\u5230\u671f\u9577\u671f\u8ca0\u50b5": {
+                    "account_number": "227", 
+                    "is_group": 1
+                }, 
+                "\u5176\u4ed6\u61c9\u4ed8\u6b3e": {
+                    "account_number": "218~219", 
+                    "\u61c9\u4ed8\u571f\u5730\u623f\u5c4b\u6b3e": {
+                        "account_number": "2184"
+                    }, 
+                    "\u61c9\u4ed8\u80a1\u5229": {
+                        "account_number": "2192"
+                    }, 
+                    "\u61c9\u4ed8\u8a2d\u5099\u6b3e": {
+                        "account_number": "2185"
+                    }
+                }, 
+                "\u5176\u4ed6\u6d41\u52d5\u8ca0\u50b5": {
+                    "account_number": "228~229", 
+                    "\u4ee3\u6536\u6b3e": {
+                        "account_number": "2284"
+                    }, 
+                    "\u4f30\u8a08\u552e\u5f8c\u670d\u52d9/\u4fdd\u56fa\u8ca0\u50b5": {
+                        "account_number": "2285"
+                    }, 
+                    "\u66ab\u6536\u6b3e ": {
+                        "account_number": "2283"
+                    }, 
+                    "\u905e\u5ef6\u514c\u63db\u5229\u76ca": {
+                        "account_number": "2292"
+                    }, 
+                    "\u905e\u5ef6\u6240\u5f97\u7a05\u8ca0\u50b5": {
+                        "account_number": "2291"
+                    }, 
+                    "\u92b7\u9805\u7a05\u984d": {
+                        "account_number": "2281"
+                    }
+                }, 
+                "\u61c9\u4ed8\u5e33\u6b3e": {
+                    "account_number": "214", 
+                    "account_type": "Payable", 
+                    "\u61c9\u4ed8\u5e33\u6b3e": {
+                        "account_number": "2141", 
+                        "account_type": "Payable"
+                    }
+                }, 
+                "\u61c9\u4ed8\u6240\u5f97\u7a05": {
+                    "account_number": "216", 
+                    "account_type": "Tax", 
+                    "tax_rate": 5.0, 
+                    "\u61c9\u4ed8\u6240\u5f97\u7a05": {
+                        "account_number": "2161", 
+                        "account_type": "Tax", 
+                        "tax_rate": 5.0
+                    }
+                }, 
+                "\u61c9\u4ed8\u77ed\u671f\u7968\u5238": {
+                    "account_number": "212", 
+                    "account_type": "Payable", 
+                    "\u61c9\u4ed8\u5546\u696d\u672c\u7968": {
+                        "account_number": "2121", 
+                        "account_type": "Payable"
+                    }, 
+                    "\u9280\u884c\u627f\u514c\u532f\u7968": {
+                        "account_number": "2122", 
+                        "account_type": "Payable"
+                    }
+                }, 
+                "\u61c9\u4ed8\u7968\u64da": {
+                    "account_number": "213", 
+                    "account_type": "Payable", 
+                    "\u61c9\u4ed8\u7968\u64da": {
+                        "account_number": "2131", 
+                        "account_type": "Payable"
+                    }
+                }, 
+                "\u61c9\u4ed8\u8cbb\u7528": {
+                    "account_number": "217", 
+                    "\u5176\u4ed6\u61c9\u4ed8\u8cbb\u7528": {
+                        "account_number": "2178"
+                    }, 
+                    "\u61c9\u4ed8\u5229\u606f": {
+                        "account_number": "2173"
+                    }, 
+                    "\u61c9\u4ed8\u71df\u696d\u7a05": {
+                        "account_number": "2174"
+                    }, 
+                    "\u61c9\u4ed8\u79df\u91d1": {
+                        "account_number": "2172"
+                    }, 
+                    "\u61c9\u4ed8\u7a05\u6350 \u2014\u5176\u4ed6": {
+                        "account_number": "2175", 
+                        "account_type": "Tax", 
+                        "tax_rate": 5.0
+                    }, 
+                    "\u61c9\u4ed8\u85aa\u5de5": {
+                        "account_number": "2171"
+                    }
+                }, 
+                "\u77ed\u671f\u501f\u6b3e": {
+                    "account_number": "211", 
+                    "\u9280\u884c\u501f\u6b3e": {
+                        "account_number": "2112"
+                    }, 
+                    "\u9280\u884c\u900f\u652f": {
+                        "account_number": "2111"
+                    }
+                }, 
+                "\u9810\u6536\u6b3e\u9805": {
+                    "account_number": "226", 
+                    "\u5176\u4ed6\u9810\u6536\u6b3e": {
+                        "account_number": "2268"
+                    }, 
+                    "\u9810\u6536\u6536\u5165": {
+                        "account_number": "2262"
+                    }, 
+                    "\u9810\u6536\u8ca8\u6b3e": {
+                        "account_number": "2261"
+                    }
+                }
+            }, 
+            "\u9577\u671f\u8ca0\u50b5": {
+                "account_number": "23", 
+                "\u4f30\u8a08\u61c9\u4ed8\u571f\u5730\u589e\u503c\u7a05": {
+                    "account_number": "234", 
+                    "\u4f30\u8a08\u61c9\u4ed8\u571f\u5730\u589e\u503c\u7a05": {
+                        "account_number": "2341"
+                    }
+                }, 
+                "\u5176\u4ed6\u9577\u671f\u8ca0\u50b5": {
+                    "account_number": "238", 
+                    "\u5176\u4ed6\u9577\u671f\u8ca0\u50b5\u2014\u5176\u4ed6": {
+                        "account_number": "2388"
+                    }
+                }, 
+                "\u61c9\u4ed8\u516c\u53f8\u50b5": {
+                    "account_number": "231", 
+                    "\u61c9\u4ed8\u516c\u53f8\u50b5": {
+                        "account_number": "2311"
+                    }, 
+                    "\u61c9\u4ed8\u516c\u53f8\u50b5\u6ea2(\u6298)\u50f9": {
+                        "account_number": "2319"
+                    }
+                }, 
+                "\u61c9\u8a08\u9000\u4f11\u91d1\u8ca0\u50b5": {
+                    "account_number": "235", 
+                    "\u61c9\u8a08\u9000\u4f11\u91d1\u8ca0\u50b5": {
+                        "account_number": "2351"
+                    }
+                }, 
+                "\u9577\u671f\u501f\u6b3e": {
+                    "account_number": "232", 
+                    "\u9577\u671f\u501f\u6b3e \u2014\u5176\u4ed6": {
+                        "account_number": "2328"
+                    }, 
+                    "\u9577\u671f\u501f\u6b3e \u2014\u54e1\u5de5": {
+                        "account_number": "2325"
+                    }, 
+                    "\u9577\u671f\u501f\u6b3e \u2014\u696d\u4e3b": {
+                        "account_number": "2324"
+                    }, 
+                    "\u9577\u671f\u501f\u6b3e \u2014\u95dc\u4fc2\u4eba": {
+                        "account_number": "2327"
+                    }, 
+                    "\u9577\u671f\u9280\u884c\u501f\u6b3e": {
+                        "account_number": "2321"
+                    }
+                }, 
+                "\u9577\u671f\u61c9\u4ed8\u7968\u64da\u53ca\u6b3e\u9805": {
+                    "account_number": "233", 
+                    "account_type": "Payable", 
+                    "\u9577\u671f\u61c9\u4ed8\u5e33\u6b3e": {
+                        "account_number": "2332", 
+                        "account_type": "Payable"
+                    }, 
+                    "\u9577\u671f\u61c9\u4ed8\u7968\u64da": {
+                        "account_number": "2331", 
+                        "account_type": "Payable"
+                    }, 
+                    "\u9577\u671f\u61c9\u4ed8\u79df\u8cc3\u8ca0\u50b5": {
+                        "account_number": "2333", 
+                        "account_type": "Payable"
+                    }
+                }
+            }
+        }, 
+        "\u8cc7\u7522": {
             "Temporary Accounts": {
                 "Temporary Opening": {
                     "account_type": "Temporary"
-                },
+                }, 
                 "account_type": "Temporary"
-            },
-            "root_type": "Asset"
-        },
-        "2-\u8ca0\u50b5": {
-            "21~22-\u6d41\u52d5\u8ca0\u50b5": {
-                "211-\u77ed\u671f\u501f\u6b3e": {
-                    "2111-\u9280\u884c\u900f\u652f": {},
-                    "2112-\u9280\u884c\u501f\u6b3e": {}
-                },
-                "212-\u61c9\u4ed8\u77ed\u671f\u7968\u5238": {
-                    "2121-\u61c9\u4ed8\u5546\u696d\u672c\u7968": {
-                        "account_type": "Payable"
-                    },
-                    "2122-\u9280\u884c\u627f\u514c\u532f\u7968": {
-                        "account_type": "Payable"
-                    },
-                    "account_type": "Payable"
-                },
-                "213-\u61c9\u4ed8\u7968\u64da": {
-                    "2131-\u61c9\u4ed8\u7968\u64da": {
-                        "account_type": "Payable"
-                    },
-                    "account_type": "Payable"
-                },
-                "214-\u61c9\u4ed8\u5e33\u6b3e": {
-                    "2141-\u61c9\u4ed8\u5e33\u6b3e": {
-                        "account_type": "Payable"
-                    },
-                    "account_type": "Payable"
-                },
-                "216-\u61c9\u4ed8\u6240\u5f97\u7a05": {
-                    "2161-\u61c9\u4ed8\u6240\u5f97\u7a05": {
-                        "account_type": "Tax", 
-                        "tax_rate": 5.0
-                    },
-                    "account_type": "Tax", 
-                    "tax_rate": 5.0
-                },
-                "217-\u61c9\u4ed8\u8cbb\u7528": {
-                    "2171-\u61c9\u4ed8\u85aa\u5de5": {},
-                    "2172-\u61c9\u4ed8\u79df\u91d1": {},
-                    "2173-\u61c9\u4ed8\u5229\u606f": {},
-                    "2174-\u61c9\u4ed8\u71df\u696d\u7a05": {},
-                    "2175-\u61c9\u4ed8\u7a05\u6350 \u2014\u5176\u4ed6": {
-                        "account_type": "Tax", 
-                        "tax_rate": 5.0
-                    },
-                    "2178-\u5176\u4ed6\u61c9\u4ed8\u8cbb\u7528": {}
-                },
-                "218~219-\u5176\u4ed6\u61c9\u4ed8\u6b3e": {
-                    "2184-\u61c9\u4ed8\u571f\u5730\u623f\u5c4b\u6b3e": {},
-                    "2185-\u61c9\u4ed8\u8a2d\u5099\u6b3e": {},
-                    "2192-\u61c9\u4ed8\u80a1\u5229": {}
-                },
-                "226-\u9810\u6536\u6b3e\u9805": {
-                    "2261-\u9810\u6536\u8ca8\u6b3e": {},
-                    "2262-\u9810\u6536\u6536\u5165": {},
-                    "2268-\u5176\u4ed6\u9810\u6536\u6b3e": {}
-                },
-                "227-\u4e00\u5e74\u6216\u4e00\u71df\u696d\u9031\u671f\u5167\u5230\u671f\u9577\u671f\u8ca0\u50b5": {
-                    "is_group": 1
-                },
-                "228~229-\u5176\u4ed6\u6d41\u52d5\u8ca0\u50b5": {
-                    "2281-\u92b7\u9805\u7a05\u984d": {},
-                    "2283-\u66ab\u6536\u6b3e ": {},
-                    "2284-\u4ee3\u6536\u6b3e": {},
-                    "2285-\u4f30\u8a08\u552e\u5f8c\u670d\u52d9/\u4fdd\u56fa\u8ca0\u50b5": {},
-                    "2291-\u905e\u5ef6\u6240\u5f97\u7a05\u8ca0\u50b5": {},
-                    "2292-\u905e\u5ef6\u514c\u63db\u5229\u76ca": {}
+            }, 
+            "account_number": "1", 
+            "root_type": "Asset", 
+            "\u5176\u4ed6\u8cc7\u7522": {
+                "account_number": "18", 
+                "\u51fa\u79df\u8cc7\u7522": {
+                    "account_number": "185", 
+                    "\u51fa\u79df\u8cc7\u7522": {
+                        "account_number": "1851"
+                    }, 
+                    "\u51fa\u79df\u8cc7\u7522 \u2014\u91cd\u4f30\u589e\u503c": {
+                        "account_number": "1858"
+                    }, 
+                    "\u7d2f\u7a4d\u6298\u820a \u2014\u51fa\u79df\u8cc7\u7522": {
+                        "account_number": "1859", 
+                        "account_type": "Accumulated Depreciation"
+                    }
+                }, 
+                "\u5b58\u51fa\u4fdd\u8b49\u91d1": {
+                    "account_number": "186", 
+                    "\u5b58\u51fa\u4fdd\u8b49\u91d1": {
+                        "account_number": "1861"
+                    }
+                }, 
+                "\u905e\u5ef6\u8cc7\u7522": {
+                    "account_number": "181", 
+                    "\u50b5\u5238\u767c\u884c\u6210\u672c": {
+                        "account_number": "1811"
+                    }, 
+                    "\u5176\u4ed6\u905e\u5ef6\u8cc7\u7522": {
+                        "account_number": "1818"
+                    }, 
+                    "\u905e\u5ef6\u6240\u5f97\u7a05\u8cc7\u7522": {
+                        "account_number": "1814"
+                    }, 
+                    "\u9577\u671f\u9810\u4ed8\u4fdd\u96aa\u8cbb": {
+                        "account_number": "1813"
+                    }, 
+                    "\u9577\u671f\u9810\u4ed8\u79df\u91d1": {
+                        "account_number": "1812"
+                    }, 
+                    "\u9810\u4ed8\u9000\u4f11\u91d1": {
+                        "account_number": "1815"
+                    }
+                }, 
+                "\u9577\u671f\u61c9\u6536\u7968\u64da\u53ca\u6b3e\u9805\u8207\u50ac\u6536\u5e33\u6b3e": {
+                    "account_number": "184", 
+                    "account_type": "Receivable", 
+                    "\u5099\u62b5\u5446\u5e33\u2014\u9577\u671f\u61c9\u6536\u7968\u64da\u53ca\u6b3e\u9805\u8207\u50ac\u6536\u5e33\u6b3e": {
+                        "account_number": "1849", 
+                        "account_type": "Receivable"
+                    }, 
+                    "\u50ac\u6536\u5e33\u6b3e": {
+                        "account_number": "1843", 
+                        "account_type": "Receivable"
+                    }, 
+                    "\u5176\u4ed6\u9577\u671f\u61c9\u6536\u6b3e\u9805": {
+                        "account_number": "1848", 
+                        "account_type": "Receivable"
+                    }, 
+                    "\u9577\u671f\u61c9\u6536\u5e33\u6b3e": {
+                        "account_number": "1842", 
+                        "account_type": "Receivable"
+                    }, 
+                    "\u9577\u671f\u61c9\u6536\u7968\u64da": {
+                        "account_number": "1841", 
+                        "account_type": "Receivable"
+                    }
+                }, 
+                "\u9592\u7f6e\u8cc7\u7522": {
+                    "account_number": "182", 
+                    "\u9592\u7f6e\u8cc7\u7522": {
+                        "account_number": "1821"
+                    }
+                }, 
+                "\u96dc\u9805\u8cc7\u7522": {
+                    "account_number": "188", 
+                    "\u53d7\u9650\u5236\u5b58\u6b3e": {
+                        "account_number": "1881"
+                    }, 
+                    "\u96dc\u9805\u8cc7\u7522 \u2014\u5176\u4ed6": {
+                        "account_number": "1888"
+                    }
                 }
-            },
-            "23-\u9577\u671f\u8ca0\u50b5": {
-                "231-\u61c9\u4ed8\u516c\u53f8\u50b5": {
-                    "2311-\u61c9\u4ed8\u516c\u53f8\u50b5": {},
-                    "2319-\u61c9\u4ed8\u516c\u53f8\u50b5\u6ea2(\u6298)\u50f9": {}
-                },
-                "232-\u9577\u671f\u501f\u6b3e": {
-                    "2321-\u9577\u671f\u9280\u884c\u501f\u6b3e": {},
-                    "2324-\u9577\u671f\u501f\u6b3e \u2014\u696d\u4e3b": {},
-                    "2325-\u9577\u671f\u501f\u6b3e \u2014\u54e1\u5de5": {},
-                    "2327-\u9577\u671f\u501f\u6b3e \u2014\u95dc\u4fc2\u4eba": {},
-                    "2328-\u9577\u671f\u501f\u6b3e \u2014\u5176\u4ed6": {}
-                },
-                "233-\u9577\u671f\u61c9\u4ed8\u7968\u64da\u53ca\u6b3e\u9805": {
-                    "2331-\u9577\u671f\u61c9\u4ed8\u7968\u64da": {
-                        "account_type": "Payable"
-                    },
-                    "2332-\u9577\u671f\u61c9\u4ed8\u5e33\u6b3e": {
-                        "account_type": "Payable"
-                    },
-                    "2333-\u9577\u671f\u61c9\u4ed8\u79df\u8cc3\u8ca0\u50b5": {
-                        "account_type": "Payable"
-                    },
-                    "account_type": "Payable"
-                },
-                "234-\u4f30\u8a08\u61c9\u4ed8\u571f\u5730\u589e\u503c\u7a05": {
-                    "2341-\u4f30\u8a08\u61c9\u4ed8\u571f\u5730\u589e\u503c\u7a05": {}
-                },
-                "235-\u61c9\u8a08\u9000\u4f11\u91d1\u8ca0\u50b5": {
-                    "2351-\u61c9\u8a08\u9000\u4f11\u91d1\u8ca0\u50b5": {}
-                },
-                "238-\u5176\u4ed6\u9577\u671f\u8ca0\u50b5": {
-                    "2388-\u5176\u4ed6\u9577\u671f\u8ca0\u50b5\u2014\u5176\u4ed6": {}
+            }, 
+            "\u56fa\u5b9a\u8cc7\u7522": {
+                "account_number": "14~15", 
+                "account_type": "Fixed Asset", 
+                "\u571f\u5730": {
+                    "account_number": "141", 
+                    "account_type": "Fixed Asset", 
+                    "\u571f\u5730": {
+                        "account_number": "1411", 
+                        "account_type": "Fixed Asset"
+                    }
+                }, 
+                "\u571f\u5730\u6539\u826f\u7269": {
+                    "account_number": "142", 
+                    "account_type": "Fixed Asset", 
+                    "\u571f\u5730\u6539\u826f\u7269": {
+                        "account_number": "1421", 
+                        "account_type": "Fixed Asset"
+                    }
+                }, 
+                "\u623f\u5c4b\u53ca\u5efa\u7269": {
+                    "account_number": "143", 
+                    "account_type": "Fixed Asset", 
+                    "\u623f\u5c4b\u53ca\u5efa\u7269": {
+                        "account_number": "1431", 
+                        "account_type": "Fixed Asset"
+                    }
+                }, 
+                "\u672a\u5b8c\u5de5\u7a0b\u53ca\u9810\u4ed8\u8cfc\u7f6e\u8a2d\u5099\u6b3e": {
+                    "account_number": "156", 
+                    "account_type": "Fixed Asset", 
+                    "\u672a\u5b8c\u5de5\u7a0b": {
+                        "account_number": "1561", 
+                        "account_type": "Fixed Asset"
+                    }
+                }, 
+                "\u6a5f(\u5668)\u5177\u53ca\u8a2d\u5099": {
+                    "account_number": "144~146", 
+                    "account_type": "Fixed Asset", 
+                    "\u6a5f(\u5668)\u5177": {
+                        "account_number": "1441", 
+                        "account_type": "Fixed Asset"
+                    }
+                }, 
+                "\u79df\u8cc3\u6b0a\u76ca\u6539\u826f": {
+                    "account_number": "152", 
+                    "account_type": "Fixed Asset", 
+                    "\u79df\u8cc3\u6b0a\u76ca\u6539\u826f": {
+                        "account_number": "1521", 
+                        "account_type": "Fixed Asset"
+                    }
+                }, 
+                "\u79df\u8cc3\u8cc7\u7522": {
+                    "account_number": "151", 
+                    "account_type": "Fixed Asset", 
+                    "\u79df\u8cc3\u8cc7\u7522": {
+                        "account_number": "1511", 
+                        "account_type": "Fixed Asset"
+                    }
+                }, 
+                "\u96dc\u9805\u56fa\u5b9a\u8cc7\u7522": {
+                    "account_number": "158", 
+                    "account_type": "Fixed Asset", 
+                    "\u96dc\u9805\u56fa\u5b9a\u8cc7\u7522": {
+                        "account_number": "1581", 
+                        "account_type": "Fixed Asset"
+                    }
                 }
-            },
-            "28-\u5176\u4ed6\u8ca0\u50b5": {
-                "281-\u905e\u5ef6\u8ca0\u50b5": {
-                    "2811-\u905e\u5ef6\u6536\u5165": {},
-                    "2814-\u905e\u5ef6\u6240\u5f97\u7a05\u8ca0\u50b5": {},
-                    "2818-\u5176\u4ed6\u905e\u5ef6\u8ca0\u50b5": {}
-                },
-                "286-\u5b58\u5165\u4fdd\u8b49\u91d1": {
-                    "2861-\u5b58\u5165\u4fdd\u8b49\u91d1": {}
-                },
-                "288-\u96dc\u9805\u8ca0\u50b5": {
-                    "2888-\u96dc\u9805\u8ca0\u50b5 \u2014\u5176\u4ed6": {}
+            }, 
+            "\u57fa\u91d1\u53ca\u9577\u671f\u6295\u8cc7": {
+                "account_number": "13", 
+                "\u57fa\u91d1": {
+                    "account_number": "131", 
+                    "\u511f\u50b5\u57fa\u91d1": {
+                        "account_number": "1311"
+                    }, 
+                    "\u5176\u4ed6\u57fa\u91d1": {
+                        "account_number": "1318"
+                    }, 
+                    "\u610f\u5916\u640d\u5931\u6e96\u5099\u57fa\u91d1": {
+                        "account_number": "1313"
+                    }, 
+                    "\u9000\u4f11\u57fa\u91d1": {
+                        "account_number": "1314"
+                    }
+                }, 
+                "\u9577\u671f\u6295\u8cc7": {
+                    "account_number": "132", 
+                    "\u5176\u4ed6\u9577\u671f\u6295\u8cc7": {
+                        "account_number": "1328"
+                    }, 
+                    "\u9577\u671f\u4e0d\u52d5\u7522\u6295\u8cc7": {
+                        "account_number": "1323"
+                    }, 
+                    "\u9577\u671f\u50b5\u5238\u6295\u8cc7": {
+                        "account_number": "1322"
+                    }, 
+                    "\u9577\u671f\u80a1\u6b0a\u6295\u8cc7": {
+                        "account_number": "1321"
+                    }
                 }
-            },
-            "Stock Received But Not Billed": {
-                "account_type": "Stock Received But Not Billed"
-            },
-            "root_type": "Liability"
-        },
-        "3-\u696d\u4e3b\u6b0a\u76ca": {
-            "31-\u8cc7\u672c": {
-                "311-\u8cc7\u672c\uff08\u80a1\u672c\uff09 ": {
-                    "3111-\u666e\u901a\u80a1\u80a1\u672c": {},
-                    "3112-\u7279\u5225\u80a1\u80a1\u672c": {},
-                    "3113-\u9810\u6536\u80a1\u672c": {},
-                    "3114-\u5f85\u5206\u914d\u80a1\u7968\u80a1\u5229": {},
-                    "3115-\u8cc7\u672c": {}
+            }, 
+            "\u6d41\u52d5\u8cc7\u7522": {
+                "account_number": "11~12", 
+                "\u5176\u4ed6\u61c9\u6536\u6b3e": {
+                    "account_number": "118", 
+                    "account_type": "Receivable", 
+                    "\u5099\u62b5\u5446\u5e33 \u2014 \u5176\u4ed6\u61c9\u6536\u6b3e ": {
+                        "account_number": "1189", 
+                        "account_type": "Receivable"
+                    }, 
+                    "\u61c9\u6536\u6536\u76ca": {
+                        "account_number": "1184", 
+                        "account_type": "Receivable"
+                    }, 
+                    "\u61c9\u6536\u9000\u7a05\u6b3e": {
+                        "account_number": "1185", 
+                        "account_type": "Receivable"
+                    }
+                }, 
+                "\u5176\u4ed6\u6d41\u52d5\u8cc7\u7522": {
+                    "account_number": "128~129", 
+                    "\u4ee3\u4ed8\u6b3e": {
+                        "account_number": "1284"
+                    }, 
+                    "\u54e1\u5de5\u501f\u652f": {
+                        "account_number": "1285"
+                    }, 
+                    "\u66ab\u4ed8\u6b3e": {
+                        "account_number": "1283"
+                    }, 
+                    "\u7559\u62b5\u7a05\u984d": {
+                        "account_number": "1282"
+                    }, 
+                    "\u9032\u9805\u7a05\u984d": {
+                        "account_number": "1281"
+                    }
+                }, 
+                "\u5b58\u8ca8": {
+                    "account_number": "121~122", 
+                    "account_type": "Stock", 
+                    "is_group": 1, 
+                    "\u5099\u62b5\u5b58\u8ca8\u8dcc\u50f9\u640d\u5931": {
+                        "account_number": "1229"
+                    }
+                }, 
+                "\u61c9\u6536\u5e33\u6b3e": {
+                    "account_number": "114", 
+                    "account_type": "Receivable", 
+                    "\u5099\u62b5\u5446\u5e33 \uff0d\u61c9\u6536\u5e33\u6b3e ": {
+                        "account_number": "1149", 
+                        "account_type": "Receivable"
+                    }, 
+                    "\u61c9\u6536\u5206\u671f\u5e33\u6b3e ": {
+                        "account_number": "1142", 
+                        "account_type": "Receivable"
+                    }, 
+                    "\u61c9\u6536\u5e33\u6b3e ": {
+                        "account_number": "1141", 
+                        "account_type": "Receivable"
+                    }
+                }, 
+                "\u61c9\u6536\u7968\u64da": {
+                    "account_number": "113", 
+                    "account_type": "Receivable", 
+                    "\u5099\u62b5\u5446\u5e33 \uff0d\u61c9\u6536\u7968\u64da ": {
+                        "account_number": "1139", 
+                        "account_type": "Receivable"
+                    }, 
+                    "\u5176\u4ed6\u61c9\u6536\u7968\u64da ": {
+                        "account_number": "1138", 
+                        "account_type": "Receivable"
+                    }, 
+                    "\u61c9\u6536\u7968\u64da": {
+                        "account_number": "1131", 
+                        "account_type": "Receivable"
+                    }, 
+                    "\u61c9\u6536\u7968\u64da\u8cbc\u73fe ": {
+                        "account_number": "1132", 
+                        "account_type": "Receivable"
+                    }
+                }, 
+                "\u73fe\u91d1\u53ca\u7d04\u7576\u73fe\u91d1": {
+                    "account_number": "111", 
+                    "account_type": "Cash", 
+                    "\u5176\u4ed6\u73fe\u91d1\u53ca\u7d04\u7576\u73fe\u91d1": {
+                        "account_number": "1118", 
+                        "account_type": "Cash"
+                    }, 
+                    "\u5728\u9014\u73fe\u91d1": {
+                        "account_number": "1116", 
+                        "account_type": "Cash"
+                    }, 
+                    "\u5eab\u5b58\u73fe\u91d1": {
+                        "account_number": "1111", 
+                        "account_type": "Cash"
+                    }, 
+                    "\u7d04\u7576\u73fe\u91d1": {
+                        "account_number": "1117", 
+                        "account_type": "Cash"
+                    }, 
+                    "\u9280\u884c\u5b58\u6b3e": {
+                        "account_number": "1113", 
+                        "account_type": "Bank", 
+                        "\u4e2d\u570b\u4fe1\u8a17": {
+                            "account_type": "Bank"
+                        }, 
+                        "\u53f0\u5317\u5bcc\u90a6": {
+                            "account_type": "Bank"
+                        }
+                    }, 
+                    "\u96f6\u7528\u91d1/\u9031\u8f49\u91d1": {
+                        "account_number": "1112", 
+                        "account_type": "Cash"
+                    }
+                }, 
+                "\u77ed\u671f\u6295\u8cc7": {
+                    "account_number": "112", 
+                    "\u77ed\u671f\u6295\u8cc7 \u2014\u80a1\u7968": {
+                        "account_number": "1121"
+                    }
+                }, 
+                "\u9810\u4ed8\u6b3e\u9805": {
+                    "account_number": "126", 
+                    "\u5176\u4ed6\u9810\u4ed8\u6b3e\u9805": {
+                        "account_number": "1268"
+                    }, 
+                    "\u9810\u4ed8\u8ca8\u6b3e": {
+                        "account_number": "1261"
+                    }
+                }, 
+                "\u9810\u4ed8\u8cbb\u7528": {
+                    "account_number": "125", 
+                    "\u5176\u4ed6\u9810\u4ed8\u8cbb\u7528": {
+                        "account_number": "1258"
+                    }, 
+                    "\u7528\u54c1\u76e4\u5b58": {
+                        "account_number": "1254"
+                    }, 
+                    "\u9810\u4ed8\u4fdd\u96aa\u8cbb": {
+                        "account_number": "1253"
+                    }, 
+                    "\u9810\u4ed8\u6240\u5f97\u7a05": {
+                        "account_number": "1255"
+                    }, 
+                    "\u9810\u4ed8\u79df\u91d1": {
+                        "account_number": "1252"
+                    }, 
+                    "\u9810\u4ed8\u85aa\u8cc7": {
+                        "account_number": "1251"
+                    }
                 }
-            },
-            "32-\u8cc7\u672c\u516c\u7a4d": {
-                "321-\u80a1\u7968\u6ea2\u50f9": {
-                    "3211-\u666e\u901a\u80a1\u80a1\u7968\u6ea2\u50f9": {},
-                    "3212-\u7279\u5225\u80a1\u80a1\u7968\u6ea2\u50f9": {}
-                },
-                "323-\u8cc7\u7522\u91cd\u4f30\u589e\u503c\u6e96\u5099": {
-                    "3231-\u8cc7\u7522\u91cd\u4f30\u589e\u503c\u6e96\u5099": {}
-                },
-                "324-\u8655\u5206\u8cc7\u7522\u6ea2\u50f9\u516c\u7a4d": {
-                    "3241-\u8655\u5206\u8cc7\u7522\u6ea2\u50f9\u516c\u7a4d": {}
-                },
-                "325-\u5408\u4f75\u516c\u7a4d": {
-                    "3251-\u5408\u4f75\u516c\u7a4d": {}
-                },
-                "326-\u53d7\u8d08\u516c\u7a4d": {
-                    "3261-\u53d7\u8d08\u516c\u7a4d": {}
-                },
-                "328-\u5176\u4ed6\u8cc7\u672c\u516c\u7a4d": {
-                    "3281-\u6b0a\u76ca\u6cd5\u9577\u671f\u80a1\u6b0a\u6295\u8cc7\u8cc7\u672c\u516c\u7a4d": {},
-                    "3282-\u8cc7\u672c\u516c\u7a4d\u2014 \u5eab\u85cf\u80a1\u7968\u4ea4\u6613": {}
+            }, 
+            "\u7121\u5f62\u8cc7\u7522": {
+                "account_number": "17", 
+                "\u5176\u4ed6\u7121\u5f62\u8cc7\u7522": {
+                    "account_number": "178", 
+                    "\u905e\u5ef6\u9000\u4f11\u91d1\u6210\u672c": {
+                        "account_number": "1781"
+                    }
+                }, 
+                "\u5546\u6a19\u6b0a": {
+                    "account_number": "171", 
+                    "\u5546\u6a19\u6b0a": {
+                        "account_number": "1711"
+                    }
+                }, 
+                "\u5546\u8b7d": {
+                    "account_number": "176", 
+                    "\u5546\u8b7d": {
+                        "account_number": "1761"
+                    }
+                }, 
+                "\u5c08\u5229\u6b0a": {
+                    "account_number": "172", 
+                    "\u5c08\u5229\u6b0a": {
+                        "account_number": "1721"
+                    }
+                }, 
+                "\u958b\u8fa6\u8cbb": {
+                    "account_number": "177", 
+                    "\u958b\u8fa6\u8cbb": {
+                        "account_number": "1771"
+                    }
                 }
-            },
-            "33-\u4fdd\u7559\u76c8\u9918(\u7d2f\u7a4d\u8667\u640d)": {
-                "331-\u6cd5\u5b9a\u76c8\u9918\u516c\u7a4d": {
-                    "3311-\u6cd5\u5b9a\u76c8\u9918\u516c\u7a4d": {}
-                },
-                "332-\u7279\u5225\u76c8\u9918\u516c\u7a4d": {
-                    "3321-\u610f\u5916\u640d\u5931\u6e96\u5099": {},
-                    "3322-\u6539\u826f\u64f4\u5145\u6e96\u5099": {},
-                    "3323-\u511f\u50b5\u6e96\u5099": {},
-                    "3328-\u5176\u4ed6\u7279\u5225\u76c8\u9918\u516c\u7a4d": {}
-                },
-                "335-\u672a\u5206\u914d\u76c8\u9918(\u7d2f\u7a4d\u8667\u640d) ": {
+            }, 
+            "\u905e\u8017\u8cc7\u7522": {
+                "account_number": "16", 
+                "\u905e\u8017\u8cc7\u7522": {
+                    "account_number": "161", 
                     "is_group": 1
                 }
-            },
-            "34-\u6b0a\u76ca\u8abf\u6574": {
-                "341-\u9577\u671f\u80a1\u6b0a\u6295\u8cc7\u672a\u5be6\u73fe\u8dcc\u50f9\u640d\u5931": {
-                    "3411-\u9577\u671f\u80a1\u6b0a\u6295\u8cc7\u672a\u5be6\u73fe\u8dcc\u50f9\u640d\u5931": {}
-                },
-                "342-\u7d2f\u7a4d\u63db\u7b97\u8abf\u6574\u6578": {
-                    "3421-\u7d2f\u7a4d\u63db\u7b97\u8abf\u6574\u6578": {}
-                },
-                "343-\u672a\u8a8d\u5217\u70ba\u9000\u4f11\u91d1\u6210\u672c\u4e4b\u6de8\u640d\u5931": {
-                    "3431-\u672a\u8a8d\u5217\u70ba\u9000\u4f11\u91d1\u6210\u672c\u4e4b\u6de8\u640d\u5931": {}
+            }
+        }, 
+        "\u975e\u7d93\u5e38\u71df\u696d\u640d\u76ca": {
+            "account_number": "9", 
+            "root_type": "Expense", 
+            "\u505c\u696d\u90e8\u9580\u640d\u76ca": {
+                "account_number": "91", 
+                "\u505c\u696d\u90e8\u9580\u640d\u76ca\u2014\u505c\u696d\u524d\u71df\u696d\u640d\u76ca": {
+                    "account_number": "911", 
+                    "\u505c\u696d\u90e8\u9580\u640d\u76ca\u2014\u505c\u696d\u524d\u71df\u696d\u640d\u76ca": {
+                        "account_number": "9111"
+                    }
+                }, 
+                "\u505c\u696d\u90e8\u9580\u640d\u76ca\u2014\u8655\u5206\u640d\u76ca": {
+                    "account_number": "912", 
+                    "\u505c\u696d\u90e8\u9580\u640d\u76ca\u2014\u8655\u5206\u640d\u76ca": {
+                        "account_number": "9121"
+                    }
                 }
-            },
-            "35-\u5eab\u85cf\u80a1": {
-                "351-\u5eab\u85cf\u80a1": {
-                    "3511-\u5eab\u85cf\u80a1": {}
+            }, 
+            "\u5c11\u6578\u80a1\u6b0a\u6de8\u5229": {
+                "account_number": "94", 
+                "\u5c11\u6578\u80a1\u6b0a\u6de8\u5229": {
+                    "account_number": "941", 
+                    "\u5c11\u6578\u80a1\u6b0a\u6de8\u5229": {
+                        "account_number": "9411"
+                    }
                 }
-            },
-            "36-\u5c11\u6578\u80a1\u6b0a": {
-                "361-\u5c11\u6578\u80a1\u6b0a": {
-                    "3611-\u5c11\u6578\u80a1\u6b0a": {}
+            }, 
+            "\u6703\u8a08\u539f\u5247\u8b8a\u52d5\u7d2f\u7a4d\u5f71\u97ff\u6578": {
+                "account_number": "93", 
+                "\u6703\u8a08\u539f\u5247\u8b8a\u52d5\u7d2f\u7a4d\u5f71\u97ff\u6578": {
+                    "account_number": "931", 
+                    "\u6703\u8a08\u539f\u5247\u8b8a\u52d5\u7d2f\u7a4d\u5f71\u97ff\u6578": {
+                        "account_number": "9311"
+                    }
                 }
-            },
-            "root_type": "Equity"
-        },
-        "4-\u71df\u696d\u6536\u5165": {
-            "41-\u92b7\u8ca8\u6536\u5165": {
-                "411-\u92b7\u8ca8\u6536\u5165": {
-                    "4111-\u92b7\u8ca8\u6536\u5165": {},
-                    "4112-\u5206\u671f\u4ed8\u6b3e\u92b7\u8ca8\u6536\u5165": {}
-                },
-                "417-\u92b7\u8ca8\u9000\u56de": {
-                    "4171-\u92b7\u8ca8\u9000\u56de": {}
-                },
-                "419-\u92b7\u8ca8\u6298\u8b93": {
-                    "4191-\u92b7\u8ca8\u6298\u8b93": {}
+            }, 
+            "\u975e\u5e38\u640d\u76ca": {
+                "account_number": "92", 
+                "\u975e\u5e38\u640d\u76ca": {
+                    "account_number": "921", 
+                    "\u975e\u5e38\u640d\u76ca": {
+                        "account_number": "9211"
+                    }
                 }
-            },
-            "46-\u52de\u52d9\u6536\u5165": {
-                "461-\u52de\u52d9\u6536\u5165": {
-                    "4611-\u52de\u52d9\u6536\u5165": {}
-                }
-            },
-            "47-\u696d\u52d9\u6536\u5165": {
-                "471-\u696d\u52d9\u6536\u5165": {
-                    "4711-\u696d\u52d9\u6536\u5165": {}
-                }
-            },
-            "48-\u5176\u4ed6\u71df\u696d\u6536\u5165": {
-                "488-\u5176\u4ed6\u71df\u696d\u6536\u5165\u2014\u5176\u4ed6": {
-                    "4888-\u5176\u4ed6\u71df\u696d\u6536\u5165\u2014\u5176\u4ed6": {}
-                }
-            },
-            "root_type": "Income"
-        },
-        "5-\u71df\u696d\u6210\u672c": {
-            "51-\u92b7\u8ca8\u6210\u672c": {
-                "511-\u92b7\u8ca8\u6210\u672c": {
-                    "5111-\u92b7\u8ca8\u6210\u672c": {
-                        "account_type": "Cost of Goods Sold"
-                    },
-                    "5112-\u5206\u671f\u4ed8\u6b3e\u92b7\u8ca8\u6210\u672c": {
-                        "account_type": "Cost of Goods Sold"
-                    },
-                    "account_type": "Cost of Goods Sold"
-                },
-                "512-\u9032\u8ca8": {
-                    "5121-\u9032\u8ca8": {},
-                    "5122-\u9032\u8ca8\u8cbb\u7528": {},
-                    "5123-\u9032\u8ca8\u9000\u51fa": {},
-                    "5124-\u9032\u8ca8\u6298\u8b93": {}
-                },
-                "513-\u9032\u6599": {
-                    "5131-\u9032\u6599": {},
-                    "5132-\u9032\u6599\u8cbb\u7528": {},
-                    "5133-\u9032\u6599\u9000\u51fa": {},
-                    "5134-\u9032\u6599\u6298\u8b93": {}
-                },
-                "514-\u76f4\u63a5\u4eba\u5de5": {
-                    "5141-\u76f4\u63a5\u4eba\u5de5": {}
-                },
-                "515~518-\u88fd\u9020\u8cbb\u7528": {
-                    "5151-\u9593\u63a5\u4eba\u5de5": {},
-                    "5152-\u79df\u91d1\u652f\u51fa": {},
-                    "5153-\u6587\u5177\u7528\u54c1": {},
-                    "5154-\u65c5\u8cbb": {},
-                    "5155-\u904b\u8cbb": {},
-                    "5156-\u90f5\u96fb\u8cbb": {},
-                    "5157-\u4fee\u7e55\u8cbb": {},
-                    "5158-\u5305\u88dd\u8cbb": {},
-                    "5161-\u6c34\u96fb\u74e6\u65af\u8cbb": {},
-                    "5162-\u4fdd\u96aa\u8cbb": {},
-                    "5163-\u52a0\u5de5\u8cbb": {},
-                    "5166-\u7a05\u6350": {
-                        "account_type": "Tax", 
-                        "tax_rate": 5.0
-                    },
-                    "5168-\u6298\u820a ": {
-                        "account_type": "Depreciation"
-                    },
-                    "5169-\u5404\u9805\u8017\u7aed\u53ca\u6524\u63d0": {},
-                    "5172-\u4f19\u98df\u8cbb": {},
-                    "5173-\u8077\u5de5\u798f\u5229": {},
-                    "5176-\u8a13\u7df4\u8cbb": {},
-                    "5177-\u9593\u63a5\u6750\u6599": {},
-                    "5188-\u5176\u4ed6\u88fd\u9020\u8cbb\u7528": {}
-                },
-                "Expenses Included In Valuation": {
-                    "account_type": "Expenses Included In Valuation"
-                },
-                "account_type": "Cost of Goods Sold"
-            },
-            "56-\u52de\u52d9\u6210\u672c\u88fd": {
-                "561-\u52de\u52d9\u6210\u672c": {
-                    "5611-\u52de\u52d9\u6210\u672c": {}
-                }
-            },
-            "57-\u696d\u52d9\u6210\u672c": {
-                "571-\u696d\u52d9\u6210\u672c": {
-                    "5711-\u696d\u52d9\u6210\u672c": {}
-                }
-            },
-            "58-\u5176\u4ed6\u71df\u696d\u6210\u672c": {
-                "588-\u5176\u4ed6\u71df\u696d\u6210\u672c\u2014\u5176\u4ed6 ": {
-                    "5888-\u5176\u4ed6\u71df\u696d\u6210\u672c\u2014\u5176\u4ed6": {}
-                }
-            },
-            "Stock Adjustment": {
-                "account_type": "Stock Adjustment"
-            },
-            "root_type": "Expense"
-        },
-        "6-\u71df\u696d\u8cbb\u7528": {
-            "61-\u63a8\u92b7\u8cbb\u7528": {
-                "615~618-\u63a8\u92b7\u8cbb\u7528": {
-                    "6151-\u85aa\u8cc7\u652f\u51fa": {},
-                    "6152-\u79df\u91d1\u652f\u51fa": {},
-                    "6153-\u6587\u5177\u7528\u54c1": {},
-                    "6154-\u65c5\u8cbb": {},
-                    "6155-\u904b\u8cbb": {},
-                    "6156-\u90f5\u96fb\u8cbb": {},
-                    "6157-\u4fee\u7e55\u8cbb": {},
-                    "6159-\u5ee3\u544a\u8cbb": {},
-                    "6161-\u6c34\u96fb\u74e6\u65af\u8cbb": {},
-                    "6162-\u4fdd\u96aa\u8cbb": {},
-                    "6164-\u4ea4\u969b\u8cbb": {},
-                    "6165-\u6350\u8d08": {},
-                    "6166-\u7a05\u6350": {
-                        "account_type": "Tax", 
-                        "tax_rate": 5.0
-                    },
-                    "6167-\u5446\u5e33\u640d\u5931": {},
-                    "6168-\u6298\u820a ": {
-                        "account_type": "Depreciation"
-                    },
-                    "6169-\u5404\u9805\u8017\u7aed\u53ca\u6524\u63d0": {},
-                    "6172-\u4f19\u98df\u8cbb": {},
-                    "6173-\u8077\u5de5\u798f\u5229": {},
-                    "6175-\u4f63\u91d1\u652f\u51fa": {},
-                    "6176-\u8a13\u7df4\u8cbb": {},
-                    "6188-\u5176\u4ed6\u63a8\u92b7\u8cbb\u7528": {}
-                }
-            },
-            "62-\u7ba1\u7406\u53ca\u7e3d\u52d9\u8cbb\u7528": {
-                "625~628-\u7ba1\u7406\u53ca\u7e3d\u52d9\u8cbb\u7528": {
-                    "6251-\u85aa\u8cc7\u652f\u51fa": {},
-                    "6252-\u79df\u91d1\u652f\u51fa": {},
-                    "6253-\u6587\u5177\u7528\u54c1": {},
-                    "6254-\u65c5\u8cbb": {},
-                    "6255-\u904b\u8cbb": {},
-                    "6256-\u90f5\u96fb\u8cbb": {},
-                    "6257-\u4fee\u7e55\u8cbb": {},
-                    "6259-\u5ee3\u544a\u8cbb": {},
-                    "6261-\u6c34\u96fb\u74e6\u65af\u8cbb": {},
-                    "6262-\u4fdd\u96aa\u8cbb": {},
-                    "6264-\u4ea4\u969b\u8cbb": {},
-                    "6265-\u6350\u8d08": {},
-                    "6266-\u7a05\u6350": {
-                        "account_type": "Tax", 
-                        "tax_rate": 5.0
-                    },
-                    "6267-\u5446\u5e33\u640d\u5931": {},
-                    "6268-\u6298\u820a": {
-                        "account_type": "Depreciation"
-                    },
-                    "6269-\u5404\u9805\u8017\u7aed\u53ca\u6524\u63d0": {},
-                    "6271-\u5916\u92b7\u640d\u5931": {},
-                    "6272-\u4f19\u98df\u8cbb": {},
-                    "6273-\u8077\u5de5\u798f\u5229": {},
-                    "6274-\u7814\u7a76\u767c\u5c55\u8cbb\u7528": {},
-                    "6275-\u4f63\u91d1\u652f\u51fa": {},
-                    "6276-\u8a13\u7df4\u8cbb": {},
-                    "6278-\u52de\u52d9\u8cbb": {},
-                    "6288-\u5176\u4ed6\u7ba1\u7406\u53ca\u7e3d\u52d9\u8cbb\u7528": {}
-                }
-            },
-            "63-\u7814\u7a76\u767c\u5c55\u8cbb\u7528": {
-                "635~638-\u7814\u7a76\u767c\u5c55\u8cbb\u7528": {
-                    "6351-\u85aa\u8cc7\u652f\u51fa": {},
-                    "6352-\u79df\u91d1\u652f\u51fa": {},
-                    "6353-\u6587\u5177\u7528\u54c1": {},
-                    "6354-\u65c5\u8cbb": {},
-                    "6355-\u904b\u8cbb": {},
-                    "6356-\u90f5\u96fb\u8cbb": {},
-                    "6357-\u4fee\u7e55\u8cbb": {},
-                    "6361-\u6c34\u96fb\u74e6\u65af\u8cbb": {},
-                    "6362-\u4fdd\u96aa\u8cbb": {},
-                    "6364-\u4ea4\u969b\u8cbb": {},
-                    "6366-\u7a05\u6350": {
-                        "account_type": "Tax", 
-                        "tax_rate": 5.0
-                    },
-                    "6368-\u6298\u820a": {
-                        "account_type": "Depreciation"
-                    },
-                    "6369-\u5404\u9805\u8017\u7aed\u53ca\u6524\u63d0": {},
-                    "6372-\u4f19\u98df\u8cbb": {},
-                    "6373-\u8077\u5de5\u798f\u5229": {},
-                    "6376-\u8a13\u7df4\u8cbb": {},
-                    "6378-\u5176\u4ed6\u7814\u7a76\u767c\u5c55\u8cbb\u7528": {}
-                }
-            },
-            "root_type": "Expense"
-        },
-        "7-\u71df\u696d\u5916\u6536\u5165\u53ca\u8cbb\u7528": {
-            "71~74-\u71df\u696d\u5916\u6536\u5165": {
-                "711-\u5229\u606f\u6536\u5165": {
-                    "7111-\u5229\u606f\u6536\u5165": {}
-                },
-                "712-\u6295\u8cc7\u6536\u76ca": {
-                    "7121-\u6b0a\u76ca\u6cd5\u8a8d\u5217\u4e4b\u6295\u8cc7\u6536\u76ca": {},
-                    "7122-\u80a1\u5229\u6536\u5165": {},
-                    "7123-\u77ed\u671f\u6295\u8cc7\u5e02\u50f9\u56de\u5347\u5229\u76ca": {}
-                },
-                "713-\u514c\u63db\u5229\u76ca": {
-                    "7131-\u514c\u63db\u5229\u76ca": {}
-                },
-                "714-\u8655\u5206\u6295\u8cc7\u6536\u76ca": {
-                    "7141-\u8655\u5206\u6295\u8cc7\u6536\u76ca": {}
-                },
-                "715-\u8655\u5206\u8cc7\u7522\u6ea2\u50f9\u6536\u5165": {
-                    "7151-\u8655\u5206\u8cc7\u7522\u6ea2\u50f9\u6536\u5165": {}
-                },
-                "748-\u5176\u4ed6\u71df\u696d\u5916\u6536\u5165": {
-                    "7481-\u6350\u8d08\u6536\u5165": {},
-                    "7482-\u79df\u91d1\u6536\u5165": {},
-                    "7483-\u4f63\u91d1\u6536\u5165": {},
-                    "7484-\u51fa\u552e\u4e0b\u8173\u53ca\u5ee2\u6599\u6536\u5165": {},
-                    "7485-\u5b58\u8ca8\u76e4\u76c8": {},
-                    "7486-\u5b58\u8ca8\u8dcc\u50f9\u56de\u5347\u5229\u76ca": {},
-                    "7487-\u58de\u5e33\u8f49\u56de\u5229\u76ca": {},
-                    "7488-\u5176\u4ed6\u71df\u696d\u5916\u6536\u5165\u2014\u5176\u4ed6": {}
-                }
-            },
-            "75~78-\u71df\u696d\u5916\u8cbb\u7528": {
-                "751-\u5229\u606f\u8cbb\u7528": {
-                    "7511-\u5229\u606f\u8cbb\u7528": {}
-                },
-                "752-\u6295\u8cc7\u640d\u5931": {
-                    "7521-\u6b0a\u76ca\u6cd5\u8a8d\u5217\u4e4b\u6295\u8cc7\u640d\u5931": {},
-                    "7523-\u77ed\u671f\u6295\u8cc7\u672a\u5be6\u73fe\u8dcc\u50f9\u640d\u5931": {}
-                },
-                "753-\u514c\u63db\u640d\u5931": {
-                    "7531-\u514c\u63db\u640d\u5931": {}
-                },
-                "754-\u8655\u5206\u6295\u8cc7\u640d\u5931": {
-                    "7541-\u8655\u5206\u6295\u8cc7\u640d\u5931": {}
-                },
-                "755-\u8655\u5206\u8cc7\u7522\u640d\u5931": {
-                    "7551-\u8655\u5206\u8cc7\u7522\u640d\u5931 ": {}
-                },
-                "788-\u5176\u4ed6\u71df\u696d\u5916\u8cbb\u7528": {
-                    "7881-\u505c\u5de5\u640d\u5931": {},
-                    "7882-\u707d\u5bb3\u640d\u5931": {},
-                    "7885-\u5b58\u8ca8\u76e4\u640d": {},
-                    "7886-\u5b58\u8ca8\u8dcc\u50f9\u53ca\u5446\u6eef\u640d\u5931": {},
-                    "7888-\u5176\u4ed6\u71df\u696d\u5916\u8cbb\u7528\u2014\u5176\u4ed6": {}
-                }
-            },
-            "root_type": "Income"
-        },
-        "8-\u6240\u5f97\u7a05\u8cbb\u7528(\u5229\u76ca)": {
-            "81-\u6240\u5f97\u7a05\u8cbb\u7528(\u5229\u76ca)": {
-                "811-\u6240\u5f97\u7a05\u8cbb\u7528(\u5229\u76ca) ": {
-                    "8111-\u6240\u5f97\u7a05\u8cbb\u7528(\u5229\u76ca) ": {}
-                }
-            },
-            "root_type": "Expense"
-        },
-        "9-\u975e\u7d93\u5e38\u71df\u696d\u640d\u76ca": {
-            "91-\u505c\u696d\u90e8\u9580\u640d\u76ca": {
-                "911-\u505c\u696d\u90e8\u9580\u640d\u76ca\u2014\u505c\u696d\u524d\u71df\u696d\u640d\u76ca": {
-                    "9111-\u505c\u696d\u90e8\u9580\u640d\u76ca\u2014\u505c\u696d\u524d\u71df\u696d\u640d\u76ca": {}
-                },
-                "912-\u505c\u696d\u90e8\u9580\u640d\u76ca\u2014\u8655\u5206\u640d\u76ca": {
-                    "9121-\u505c\u696d\u90e8\u9580\u640d\u76ca\u2014\u8655\u5206\u640d\u76ca": {}
-                }
-            },
-            "92-\u975e\u5e38\u640d\u76ca": {
-                "921-\u975e\u5e38\u640d\u76ca": {
-                    "9211-\u975e\u5e38\u640d\u76ca": {}
-                }
-            },
-            "93-\u6703\u8a08\u539f\u5247\u8b8a\u52d5\u7d2f\u7a4d\u5f71\u97ff\u6578": {
-                "931-\u6703\u8a08\u539f\u5247\u8b8a\u52d5\u7d2f\u7a4d\u5f71\u97ff\u6578": {
-                    "9311-\u6703\u8a08\u539f\u5247\u8b8a\u52d5\u7d2f\u7a4d\u5f71\u97ff\u6578": {}
-                }
-            },
-            "94-\u5c11\u6578\u80a1\u6b0a\u6de8\u5229": {
-                "941-\u5c11\u6578\u80a1\u6b0a\u6de8\u5229": {
-                    "9411-\u5c11\u6578\u80a1\u6b0a\u6de8\u5229": {}
-                }
-            },
-            "root_type": "Expense"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/test_account.py b/erpnext/accounts/doctype/account/test_account.py
index c609443..680f6e3 100644
--- a/erpnext/accounts/doctype/account/test_account.py
+++ b/erpnext/accounts/doctype/account/test_account.py
@@ -2,9 +2,40 @@
 # License: GNU General Public License v3. See license.txt
 
 from __future__ import unicode_literals
+import unittest
 import frappe
 from erpnext.stock import get_warehouse_account, get_company_default_inventory_account
 
+class TestAccount(unittest.TestCase):
+	def test_rename_account(self):
+		if not frappe.db.exists("Account", "1210 - Debtors - _TC"):
+			acc = frappe.new_doc("Account")
+			acc.account_name = "Debtors"
+			acc.parent_account = "Accounts Receivable - _TC"
+			acc.account_number = "1210"
+			acc.company = "_Test Company"
+			acc.insert()
+
+		account_number, account_name = frappe.db.get_value("Account", "1210 - Debtors - _TC",
+			["account_number", "account_name"])
+		self.assertEqual(account_number, "1210")
+		self.assertEqual(account_name, "Debtors")
+
+		frappe.rename_doc("Account", "1210 - Debtors - _TC", "1211 - Debtors 1 - _TC")
+
+		new_acc = frappe.db.get_value("Account", "1211 - Debtors 1 - _TC",
+			["account_name", "account_number"], as_dict=1)
+		self.assertEqual(new_acc.account_name, "Debtors 1")
+		self.assertEqual(new_acc.account_number, "1211")
+
+		frappe.rename_doc("Account", "1211 - Debtors 1 - _TC", "Debtors 2")
+
+		new_acc = frappe.db.get_value("Account", "1211 - Debtors 2 - _TC",
+			["account_name", "account_number"], as_dict=1)
+		self.assertEqual(new_acc.account_name, "Debtors 2")
+		self.assertEqual(new_acc.account_number, "1211")
+
+		frappe.delete_doc("Account", "1211 - Debtors 2 - _TC")
 
 def _make_test_records(verbose):
 	from frappe.test_runner import make_test_objects
diff --git a/erpnext/accounts/doctype/account/test_account.js b/erpnext/accounts/doctype/account/tests/test_account.js
similarity index 100%
rename from erpnext/accounts/doctype/account/test_account.js
rename to erpnext/accounts/doctype/account/tests/test_account.js
diff --git a/erpnext/accounts/doctype/account/tests/test_account_with_number.js b/erpnext/accounts/doctype/account/tests/test_account_with_number.js
new file mode 100644
index 0000000..c03e278
--- /dev/null
+++ b/erpnext/accounts/doctype/account/tests/test_account_with_number.js
@@ -0,0 +1,69 @@
+QUnit.module('accounts');
+
+QUnit.test("test account with number", function(assert) {
+	assert.expect(7);
+	let done = assert.async();
+	frappe.run_serially([
+		() => frappe.set_route('Tree', 'Account'),
+		() => frappe.click_link('Income'),
+		() => frappe.click_button('Add Child'),
+		() => frappe.timeout(.5),
+		() => {
+			cur_dialog.fields_dict.account_name.$input.val("Test Income");
+			cur_dialog.fields_dict.account_number.$input.val("4010");
+		},
+		() => frappe.click_button('Create New'),
+		() => frappe.timeout(1),
+		() => {
+			assert.ok($('a:contains("4010 - Test Income"):visible').length!=0, "Account created with number");
+		},
+		() => frappe.click_link('4010 - Test Income'),
+		() => frappe.click_button('Edit'),
+		() => frappe.timeout(.5),
+		() => frappe.click_button('Update Account Number'),
+		() => frappe.timeout(.5),
+		() => {
+			cur_dialog.fields_dict.account_number.$input.val("4020");
+		},
+		() => frappe.timeout(1),
+		() => cur_dialog.primary_action(),
+		() => frappe.timeout(1),
+		() => cur_frm.refresh_fields(),
+		() => frappe.timeout(.5),
+		() => {
+			var abbr = frappe.get_abbr(frappe.defaults.get_default("Company"));
+			var new_account = "4020 - Test Income - " + abbr;
+			assert.ok(cur_frm.doc.name==new_account, "Account renamed");
+			assert.ok(cur_frm.doc.account_name=="Test Income", "account name remained same");
+			assert.ok(cur_frm.doc.account_number=="4020", "Account number updated to 4020");
+		},
+		() => frappe.timeout(1),
+		() => frappe.click_button('Menu'),
+		() => frappe.click_link('Rename'),
+		() => frappe.timeout(.5),
+		() => {
+			cur_dialog.fields_dict.new_name.$input.val("4030 - Test Income");
+		},
+		() => frappe.timeout(.5),
+		() => frappe.click_button("Rename"),
+		() => frappe.timeout(2),
+		() => {
+			assert.ok(cur_frm.doc.account_name=="Test Income", "account name remained same");
+			assert.ok(cur_frm.doc.account_number=="4030", "Account number updated to 4030");
+		},
+		() => frappe.timeout(.5),
+		() => frappe.click_button('Chart of Accounts'),
+		() => frappe.timeout(.5),
+		() => frappe.click_button('Menu'),
+		() => frappe.click_link('Refresh'),
+		() => frappe.click_button('Expand All'),
+		() => frappe.click_link('4030 - Test Income'),
+		() => frappe.click_button('Delete'),
+		() => frappe.click_button('Yes'),
+		() => frappe.timeout(.5),
+		() => {
+			assert.ok($('a:contains("4030 - Test Account"):visible').length==0, "Account deleted");
+		},
+		() => done()
+	]);
+});
diff --git a/erpnext/accounts/doctype/account/test_make_tax_account.js b/erpnext/accounts/doctype/account/tests/test_make_tax_account.js
similarity index 100%
rename from erpnext/accounts/doctype/account/test_make_tax_account.js
rename to erpnext/accounts/doctype/account/tests/test_make_tax_account.js
diff --git a/erpnext/accounts/doctype/asset/asset.js b/erpnext/accounts/doctype/asset/asset.js
deleted file mode 100644
index e3afc35..0000000
--- a/erpnext/accounts/doctype/asset/asset.js
+++ /dev/null
@@ -1,299 +0,0 @@
-// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.provide("erpnext.asset");
-
-frappe.ui.form.on('Asset', {
-	onload: function(frm) {
-		frm.set_query("item_code", function() {
-			return {
-				"filters": {
-					"disabled": 0,
-					"is_fixed_asset": 1,
-					"is_stock_item": 0
-				}
-			};
-		});
-
-		frm.set_query("warehouse", function() {
-			return {
-				"filters": {
-					"company": frm.doc.company,
-					"is_group": 0
-				}
-			};
-		});
-	},
-
-	refresh: function(frm) {
-		frappe.ui.form.trigger("Asset", "is_existing_asset");
-		frm.toggle_display("next_depreciation_date", frm.doc.docstatus < 1);
-		frm.events.make_schedules_editable(frm);
-
-		if (frm.doc.docstatus==1) {
-			if (frm.doc.status=='Submitted' && !frm.doc.is_existing_asset && !frm.doc.purchase_invoice) {
-				frm.add_custom_button("Make Purchase Invoice", function() {
-					erpnext.asset.make_purchase_invoice(frm);
-				});
-			}
-			if (in_list(["Submitted", "Partially Depreciated", "Fully Depreciated"], frm.doc.status)) {
-				frm.add_custom_button("Transfer Asset", function() {
-					erpnext.asset.transfer_asset(frm);
-				});
-
-				frm.add_custom_button("Scrap Asset", function() {
-					erpnext.asset.scrap_asset(frm);
-				});
-
-				frm.add_custom_button("Sell Asset", function() {
-					erpnext.asset.make_sales_invoice(frm);
-				});
-
-			} else if (frm.doc.status=='Scrapped') {
-				frm.add_custom_button("Restore Asset", function() {
-					erpnext.asset.restore_asset(frm);
-				});
-			}
-
-			frm.trigger("setup_chart");
-		}
-	},
-
-	setup_chart: function(frm) {
-		var x_intervals = [frm.doc.purchase_date];
-		var asset_values = [frm.doc.gross_purchase_amount];
-		var last_depreciation_date = frm.doc.purchase_date;
-
-		if(frm.doc.opening_accumulated_depreciation) {
-			last_depreciation_date = frappe.datetime.add_months(frm.doc.next_depreciation_date,
-				-1*frm.doc.frequency_of_depreciation);
-
-			x_intervals.push(last_depreciation_date);
-			asset_values.push(flt(frm.doc.gross_purchase_amount) -
-				flt(frm.doc.opening_accumulated_depreciation));
-		}
-
-		$.each(frm.doc.schedules || [], function(i, v) {
-			x_intervals.push(v.schedule_date);
-			var asset_value = flt(frm.doc.gross_purchase_amount) - flt(v.accumulated_depreciation_amount);
-			if(v.journal_entry) {
-				last_depreciation_date = v.schedule_date;
-				asset_values.push(asset_value)
-			} else {
-				if (in_list(["Scrapped", "Sold"], frm.doc.status)) {
-					asset_values.push(null)
-				} else {
-					asset_values.push(asset_value)
-				}
-			}
-		})
-
-		if(in_list(["Scrapped", "Sold"], frm.doc.status)) {
-			x_intervals.push(frm.doc.disposal_date);
-			asset_values.push(0);
-			last_depreciation_date = frm.doc.disposal_date;
-		}
-
-		frm.dashboard.render_graph({
-			title: "Asset Value",
-			data: {
-				labels: x_intervals,
-				datasets: [{
-					color: 'green',
-					values: asset_values,
-					formatted: asset_values.map(d => d.toFixed(2))
-				}]
-			},
-			type: 'line'
-		});
-	},
-
-
-	item_code: function(frm) {
-		if(frm.doc.item_code) {
-			frappe.call({
-				method: "erpnext.accounts.doctype.asset.asset.get_item_details",
-				args: {
-					item_code: frm.doc.item_code
-				},
-				callback: function(r, rt) {
-					if(r.message) {
-						$.each(r.message, function(field, value) {
-							frm.set_value(field, value);
-						})
-					}
-				}
-			})
-		}
-	},
-
-	is_existing_asset: function(frm) {
-		frm.toggle_enable("supplier", frm.doc.is_existing_asset);
-		frm.toggle_reqd("next_depreciation_date", !frm.doc.is_existing_asset);
-	},
-
-	opening_accumulated_depreciation: function(frm) {
-		erpnext.asset.set_accululated_depreciation(frm);
-	},
-
-	depreciation_method: function(frm) {
-		frm.events.make_schedules_editable(frm);
-	},
-
-	make_schedules_editable: function(frm) {
-		var is_editable = frm.doc.depreciation_method==="Manual" ? true : false;
-		frm.toggle_enable("schedules", is_editable);
-		frm.fields_dict["schedules"].grid.toggle_enable("schedule_date", is_editable);
-		frm.fields_dict["schedules"].grid.toggle_enable("depreciation_amount", is_editable);
-	}
-
-});
-
-frappe.ui.form.on('Depreciation Schedule', {
-	make_depreciation_entry: function(frm, cdt, cdn) {
-		var row = locals[cdt][cdn];
-		if (!row.journal_entry) {
-			frappe.call({
-				method: "erpnext.accounts.doctype.asset.depreciation.make_depreciation_entry",
-				args: {
-					"asset_name": frm.doc.name,
-					"date": row.schedule_date
-				},
-				callback: function(r) {
-					frappe.model.sync(r.message);
-					frm.refresh();
-				}
-			})
-		}
-	},
-
-	depreciation_amount: function(frm, cdt, cdn) {
-		erpnext.asset.set_accululated_depreciation(frm);
-	}
-
-})
-
-erpnext.asset.set_accululated_depreciation = function(frm) {
-	if(frm.doc.depreciation_method != "Manual") return;
-
-	var accumulated_depreciation = flt(frm.doc.opening_accumulated_depreciation);
-	$.each(frm.doc.schedules || [], function(i, row) {
-		accumulated_depreciation  += flt(row.depreciation_amount);
-		frappe.model.set_value(row.doctype, row.name,
-			"accumulated_depreciation_amount", accumulated_depreciation);
-	})
-}
-
-erpnext.asset.make_purchase_invoice = function(frm) {
-	frappe.call({
-		args: {
-			"asset": frm.doc.name,
-			"item_code": frm.doc.item_code,
-			"gross_purchase_amount": frm.doc.gross_purchase_amount,
-			"company": frm.doc.company,
-			"posting_date": frm.doc.purchase_date
-		},
-		method: "erpnext.accounts.doctype.asset.asset.make_purchase_invoice",
-		callback: function(r) {
-			var doclist = frappe.model.sync(r.message);
-			frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
-		}
-	})
-}
-
-erpnext.asset.make_sales_invoice = function(frm) {
-	frappe.call({
-		args: {
-			"asset": frm.doc.name,
-			"item_code": frm.doc.item_code,
-			"company": frm.doc.company
-		},
-		method: "erpnext.accounts.doctype.asset.asset.make_sales_invoice",
-		callback: function(r) {
-			var doclist = frappe.model.sync(r.message);
-			frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
-		}
-	})
-}
-
-erpnext.asset.scrap_asset = function(frm) {
-	frappe.confirm(__("Do you really want to scrap this asset?"), function () {
-		frappe.call({
-			args: {
-				"asset_name": frm.doc.name
-			},
-			method: "erpnext.accounts.doctype.asset.depreciation.scrap_asset",
-			callback: function(r) {
-				cur_frm.reload_doc();
-			}
-		})
-	})
-}
-
-erpnext.asset.restore_asset = function(frm) {
-	frappe.confirm(__("Do you really want to restore this scrapped asset?"), function () {
-		frappe.call({
-			args: {
-				"asset_name": frm.doc.name
-			},
-			method: "erpnext.accounts.doctype.asset.depreciation.restore_asset",
-			callback: function(r) {
-				cur_frm.reload_doc();
-			}
-		})
-	})
-}
-
-erpnext.asset.transfer_asset = function(frm) {
-	var dialog = new frappe.ui.Dialog({
-		title: __("Transfer Asset"),
-		fields: [
-			{
-				"label": __("Target Warehouse"),
-				"fieldname": "target_warehouse",
-				"fieldtype": "Link",
-				"options": "Warehouse",
-				"get_query": function () {
-					return {
-						filters: [
-							["Warehouse", "company", "in", ["", cstr(frm.doc.company)]],
-							["Warehouse", "is_group", "=", 0]
-						]
-					}
-				},
-				"reqd": 1
-			},
-			{
-				"label": __("Date"),
-				"fieldname": "transfer_date",
-				"fieldtype": "Datetime",
-				"reqd": 1,
-				"default": frappe.datetime.now_datetime()
-			}
-		]
-	});
-
-	dialog.set_primary_action(__("Transfer"), function() {
-		var args = dialog.get_values();
-		if(!args) return;
-		dialog.hide();
-		return frappe.call({
-			type: "GET",
-			method: "erpnext.accounts.doctype.asset.asset.transfer_asset",
-			args: {
-				args: {
-					"asset": frm.doc.name,
-					"transaction_date": args.transfer_date,
-					"source_warehouse": frm.doc.warehouse,
-					"target_warehouse": args.target_warehouse,
-					"company": frm.doc.company
-				}
-			},
-			freeze: true,
-			callback: function(r) {
-				cur_frm.reload_doc();
-			}
-		})
-	});
-	dialog.show();
-}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset/asset.json b/erpnext/accounts/doctype/asset/asset.json
deleted file mode 100644
index 469daa0..0000000
--- a/erpnext/accounts/doctype/asset/asset.json
+++ /dev/null
@@ -1,922 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "field:asset_name", 
- "beta": 0, 
- "creation": "2016-03-01 17:01:27.920130", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 0, 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "asset_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Asset Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "item_code", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Item Code", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Item", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "item_name", 
-   "fieldtype": "Read Only", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Item Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "item_code.item_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, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "asset_category", 
-   "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": 1, 
-   "label": "Asset Category", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Asset Category", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Draft", 
-   "fieldname": "status", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Status", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Draft\nSubmitted\nPartially Depreciated\nFully Depreciated\nSold\nScrapped", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 1, 
-   "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": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 1, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "warehouse", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Warehouse", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Warehouse", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "is_existing_asset", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Is Existing Asset", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "purchase_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": "Purchase Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "supplier", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Supplier", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Supplier", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "purchase_invoice", 
-   "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": "Purchase Invoice", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Purchase Invoice", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "disposal_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": "Disposal Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "journal_entry_for_scrap", 
-   "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": "Journal Entry for Scrap", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Journal Entry", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_5", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "gross_purchase_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Gross Purchase Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "expected_value_after_useful_life", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Expected Value After Useful Life", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "is_existing_asset", 
-   "fieldname": "opening_accumulated_depreciation", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Opening Accumulated Depreciation", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "value_after_depreciation", 
-   "fieldtype": "Currency", 
-   "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": "Value After Depreciation", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_11", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "depends_on": "", 
-   "fieldname": "depreciation_method", 
-   "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": "Depreciation Method", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nStraight Line\nDouble Declining Balance\nManual", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "total_number_of_depreciations", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Total Number of Depreciations", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:(doc.is_existing_asset && doc.opening_accumulated_depreciation)", 
-   "fieldname": "number_of_depreciations_booked", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Number of Depreciations Booked", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "frequency_of_depreciation", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Frequency of Depreciation (Months)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "next_depreciation_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": "Next Depreciation Date", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_14", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Depreciation Schedule", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "schedules", 
-   "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": "Depreciation Schedules", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Depreciation Schedule", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "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": "Asset", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 72, 
- "image_field": "image", 
- "image_view": 0, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-02-17 16:26:19.111939", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Asset", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
-   "write": 1
-  }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 1, 
- "show_name_in_global_search": 1, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset/asset.py b/erpnext/accounts/doctype/asset/asset.py
deleted file mode 100644
index dd1e491..0000000
--- a/erpnext/accounts/doctype/asset/asset.py
+++ /dev/null
@@ -1,260 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-from frappe.utils import flt, add_months, cint, nowdate, getdate
-from frappe.model.document import Document
-from erpnext.accounts.doctype.purchase_invoice.purchase_invoice import get_fixed_asset_account
-from erpnext.accounts.doctype.asset.depreciation \
-	import get_disposal_account_and_cost_center, get_depreciation_accounts
-
-class Asset(Document):
-	def validate(self):
-		self.status = self.get_status()
-		self.validate_item()
-		self.set_missing_values()
-		self.validate_asset_values()
-		self.make_depreciation_schedule()
-		self.set_accumulated_depreciation()
-		if self.get("schedules"):
-			self.validate_expected_value_after_useful_life()
-		# Validate depreciation related accounts
-		get_depreciation_accounts(self)
-
-	def on_submit(self):
-		self.set_status()
-
-	def on_cancel(self):
-		self.validate_cancellation()
-		self.delete_depreciation_entries()
-		self.set_status()
-
-	def validate_item(self):
-		item = frappe.db.get_value("Item", self.item_code,
-			["is_fixed_asset", "is_stock_item", "disabled"], as_dict=1)
-		if not item:
-			frappe.throw(_("Item {0} does not exist").format(self.item_code))
-		elif item.disabled:
-			frappe.throw(_("Item {0} has been disabled").format(self.item_code))
-		elif not item.is_fixed_asset:
-			frappe.throw(_("Item {0} must be a Fixed Asset Item").format(self.item_code))
-		elif item.is_stock_item:
-			frappe.throw(_("Item {0} must be a non-stock item").format(self.item_code))
-
-	def set_missing_values(self):
-		if self.item_code:
-			item_details = get_item_details(self.item_code)
-			for field, value in item_details.items():
-				if not self.get(field):
-					self.set(field, value)
-
-		self.value_after_depreciation = (flt(self.gross_purchase_amount) -
-			flt(self.opening_accumulated_depreciation))
-
-	def validate_asset_values(self):
-		if flt(self.expected_value_after_useful_life) >= flt(self.gross_purchase_amount):
-			frappe.throw(_("Expected Value After Useful Life must be less than Gross Purchase Amount"))
-
-		if not flt(self.gross_purchase_amount):
-			frappe.throw(_("Gross Purchase Amount is mandatory"), frappe.MandatoryError)
-
-		if not self.is_existing_asset:
-			self.opening_accumulated_depreciation = 0
-			self.number_of_depreciations_booked = 0
-			if not self.next_depreciation_date:
-				frappe.throw(_("Next Depreciation Date is mandatory for new asset"))
-		else:
-			depreciable_amount = flt(self.gross_purchase_amount) - flt(self.expected_value_after_useful_life)
-			if flt(self.opening_accumulated_depreciation) > depreciable_amount:
-					frappe.throw(_("Opening Accumulated Depreciation must be less than equal to {0}")
-						.format(depreciable_amount))
-
-			if self.opening_accumulated_depreciation:
-				if not self.number_of_depreciations_booked:
-					frappe.throw(_("Please set Number of Depreciations Booked"))
-			else:
-				self.number_of_depreciations_booked = 0
-
-			if cint(self.number_of_depreciations_booked) > cint(self.total_number_of_depreciations):
-				frappe.throw(_("Number of Depreciations Booked cannot be greater than Total Number of Depreciations"))
-
-		if self.next_depreciation_date and getdate(self.next_depreciation_date) < getdate(nowdate()):
-			frappe.msgprint(_("Next Depreciation Date is entered as past date"), title=_('Warning'), indicator='red')
-
-		if self.next_depreciation_date and getdate(self.next_depreciation_date) < getdate(self.purchase_date):
-			frappe.throw(_("Next Depreciation Date cannot be before Purchase Date"))
-
-		if (flt(self.value_after_depreciation) > flt(self.expected_value_after_useful_life)
-			and not self.next_depreciation_date):
-				frappe.throw(_("Please set Next Depreciation Date"))
-
-	def make_depreciation_schedule(self):
-		if self.depreciation_method != 'Manual':
-			self.schedules = []
-
-		if not self.get("schedules") and self.next_depreciation_date:
-			value_after_depreciation = flt(self.value_after_depreciation)
-
-			number_of_pending_depreciations = cint(self.total_number_of_depreciations) - \
-				cint(self.number_of_depreciations_booked)
-			if number_of_pending_depreciations:
-				for n in xrange(number_of_pending_depreciations):
-					schedule_date = add_months(self.next_depreciation_date,
-						n * cint(self.frequency_of_depreciation))
-
-					depreciation_amount = self.get_depreciation_amount(value_after_depreciation)
-					value_after_depreciation -= flt(depreciation_amount)
-
-					self.append("schedules", {
-						"schedule_date": schedule_date,
-						"depreciation_amount": depreciation_amount
-					})
-
-	def set_accumulated_depreciation(self):
-		accumulated_depreciation = flt(self.opening_accumulated_depreciation)
-		value_after_depreciation = flt(self.value_after_depreciation)
-		for i, d in enumerate(self.get("schedules")):
-			depreciation_amount = flt(d.depreciation_amount, d.precision("depreciation_amount"))
-			value_after_depreciation -= flt(depreciation_amount)
-
-			if i==len(self.get("schedules"))-1 and self.depreciation_method == "Straight Line":
-				depreciation_amount += flt(value_after_depreciation - flt(self.expected_value_after_useful_life),
-					d.precision("depreciation_amount"))
-
-			d.depreciation_amount = depreciation_amount
-			accumulated_depreciation += d.depreciation_amount
-			d.accumulated_depreciation_amount = flt(accumulated_depreciation, d.precision("accumulated_depreciation_amount"))
-
-	def get_depreciation_amount(self, depreciable_value):
-		if self.depreciation_method in ("Straight Line", "Manual"):
-			depreciation_amount = (flt(self.value_after_depreciation) -
-				flt(self.expected_value_after_useful_life)) / (cint(self.total_number_of_depreciations) -
-				cint(self.number_of_depreciations_booked))
-		else:
-			factor = 200.0 /  self.total_number_of_depreciations
-			depreciation_amount = flt(depreciable_value * factor / 100, 0)
-
-			value_after_depreciation = flt(depreciable_value) - depreciation_amount
-			if value_after_depreciation < flt(self.expected_value_after_useful_life):
-				depreciation_amount = flt(depreciable_value) - flt(self.expected_value_after_useful_life)
-
-		return depreciation_amount
-
-	def validate_expected_value_after_useful_life(self):
-		accumulated_depreciation_after_full_schedule = \
-			max([d.accumulated_depreciation_amount for d in self.get("schedules")])
-
-		asset_value_after_full_schedule = flt(flt(self.gross_purchase_amount) -
-			flt(accumulated_depreciation_after_full_schedule),
-			self.precision('expected_value_after_useful_life'))
-
-		if self.expected_value_after_useful_life < asset_value_after_full_schedule:
-			frappe.throw(_("Expected value after useful life must be greater than or equal to {0}")
-				.format(asset_value_after_full_schedule))
-
-	def validate_cancellation(self):
-		if self.status not in ("Submitted", "Partially Depreciated", "Fully Depreciated"):
-			frappe.throw(_("Asset cannot be cancelled, as it is already {0}").format(self.status))
-
-		if self.purchase_invoice:
-			frappe.throw(_("Please cancel Purchase Invoice {0} first").format(self.purchase_invoice))
-
-	def delete_depreciation_entries(self):
-		for d in self.get("schedules"):
-			if d.journal_entry:
-				frappe.get_doc("Journal Entry", d.journal_entry).cancel()
-				d.db_set("journal_entry", None)
-
-		self.db_set("value_after_depreciation",
-			(flt(self.gross_purchase_amount) - flt(self.opening_accumulated_depreciation)))
-
-	def set_status(self, status=None):
-		'''Get and update status'''
-		if not status:
-			status = self.get_status()
-		self.db_set("status", status)
-
-	def get_status(self):
-		'''Returns status based on whether it is draft, submitted, scrapped or depreciated'''
-		if self.docstatus == 0:
-			status = "Draft"
-		elif self.docstatus == 1:
-			status = "Submitted"
-			if self.journal_entry_for_scrap:
-				status = "Scrapped"
-			elif flt(self.value_after_depreciation) <= flt(self.expected_value_after_useful_life):
-				status = "Fully Depreciated"
-			elif flt(self.value_after_depreciation) < flt(self.gross_purchase_amount):
-				status = 'Partially Depreciated'
-		elif self.docstatus == 2:
-			status = "Cancelled"
-
-		return status
-
-@frappe.whitelist()
-def make_purchase_invoice(asset, item_code, gross_purchase_amount, company, posting_date):
-	pi = frappe.new_doc("Purchase Invoice")
-	pi.company = company
-	pi.currency = frappe.db.get_value("Company", company, "default_currency")
-	pi.set_posting_time = 1
-	pi.posting_date = posting_date
-	pi.append("items", {
-		"item_code": item_code,
-		"is_fixed_asset": 1,
-		"asset": asset,
-		"expense_account": get_fixed_asset_account(asset),
-		"qty": 1,
-		"price_list_rate": gross_purchase_amount,
-		"rate": gross_purchase_amount
-	})
-	pi.set_missing_values()
-	return pi
-
-@frappe.whitelist()
-def make_sales_invoice(asset, item_code, company):
-	si = frappe.new_doc("Sales Invoice")
-	si.company = company
-	si.currency = frappe.db.get_value("Company", company, "default_currency")
-	disposal_account, depreciation_cost_center = get_disposal_account_and_cost_center(company)
-	si.append("items", {
-		"item_code": item_code,
-		"is_fixed_asset": 1,
-		"asset": asset,
-		"income_account": disposal_account,
-		"cost_center": depreciation_cost_center,
-		"qty": 1
-	})
-	si.set_missing_values()
-	return si
-
-@frappe.whitelist()
-def transfer_asset(args):
-	import json
-	args = json.loads(args)
-	movement_entry = frappe.new_doc("Asset Movement")
-	movement_entry.update(args)
-	movement_entry.insert()
-	movement_entry.submit()
-
-	frappe.db.commit()
-
-	frappe.msgprint(_("Asset Movement record {0} created").format("<a href='#Form/Asset Movement/{0}'>{0}</a>".format(movement_entry.name)))
-
-@frappe.whitelist()
-def get_item_details(item_code):
-	asset_category = frappe.db.get_value("Item", item_code, "asset_category")
-
-	if not asset_category:
-		frappe.throw(_("Please enter Asset Category in Item {0}").format(item_code))
-
-	ret = frappe.db.get_value("Asset Category", asset_category,
-		["depreciation_method", "total_number_of_depreciations", "frequency_of_depreciation"], as_dict=1)
-
-	ret.update({
-		"asset_category": asset_category
-	})
-
-	return ret
diff --git a/erpnext/accounts/doctype/asset/test_asset.py b/erpnext/accounts/doctype/asset/test_asset.py
deleted file mode 100644
index fd66d1f..0000000
--- a/erpnext/accounts/doctype/asset/test_asset.py
+++ /dev/null
@@ -1,343 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import frappe
-import unittest
-from frappe.utils import cstr, nowdate, getdate, flt
-from erpnext.accounts.doctype.asset.depreciation import post_depreciation_entries, scrap_asset, restore_asset
-from erpnext.accounts.doctype.asset.asset import make_sales_invoice, make_purchase_invoice
-
-class TestAsset(unittest.TestCase):
-	def setUp(self):
-		set_depreciation_settings_in_company()
-		create_asset()
-		frappe.db.sql("delete from `tabTax Rule`")
-		
-	def test_purchase_asset(self):
-		asset = frappe.get_doc("Asset", "Macbook Pro 1")
-		asset.submit()
-		
-		pi = make_purchase_invoice(asset.name, asset.item_code, asset.gross_purchase_amount, 
-			asset.company, asset.purchase_date)
-		pi.supplier = "_Test Supplier"
-		pi.insert()
-		pi.submit()
-		
-		asset.load_from_db()
-		self.assertEqual(asset.supplier, "_Test Supplier")
-		self.assertEqual(asset.purchase_date, getdate("2015-01-01"))
-		self.assertEqual(asset.purchase_invoice, pi.name)
-		
-		expected_gle = (
-			("_Test Fixed Asset - _TC", 100000.0, 0.0),
-			("Creditors - _TC", 0.0, 100000.0)
-		)
-
-		gle = frappe.db.sql("""select account, debit, credit from `tabGL Entry`
-			where voucher_type='Purchase Invoice' and voucher_no = %s
-			order by account""", pi.name)
-
-		self.assertEqual(gle, expected_gle)
-
-		pi.cancel()
-
-		asset.load_from_db()
-		self.assertEqual(asset.supplier, None)
-		self.assertEqual(asset.purchase_invoice, None)
-		
-		self.assertFalse(frappe.db.get_value("GL Entry", 
-			{"voucher_type": "Purchase Invoice", "voucher_no": pi.name}))
-		
-
-	def test_schedule_for_straight_line_method(self):
-		asset = frappe.get_doc("Asset", "Macbook Pro 1")
-
-		self.assertEqual(asset.status, "Draft")
-
-		expected_schedules = [
-			["2020-12-31", 30000, 30000],
-			["2021-03-31", 30000, 60000],
-			["2021-06-30", 30000, 90000]
-		]
-
-		schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
-			for d in asset.get("schedules")]
-
-		self.assertEqual(schedules, expected_schedules)
-		
-	def test_schedule_for_straight_line_method_for_existing_asset(self):
-		asset = frappe.get_doc("Asset", "Macbook Pro 1")
-		asset.is_existing_asset = 1
-		asset.number_of_depreciations_booked = 1
-		asset.opening_accumulated_depreciation = 40000
-		asset.save()
-		
-		self.assertEqual(asset.status, "Draft")
-
-		expected_schedules = [
-			["2020-12-31", 25000, 65000],
-			["2021-03-31", 25000, 90000]
-		]
-
-		schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
-			for d in asset.get("schedules")]
-
-		self.assertEqual(schedules, expected_schedules)
-
-
-	def test_schedule_for_double_declining_method(self):
-		asset = frappe.get_doc("Asset", "Macbook Pro 1")
-		asset.depreciation_method = "Double Declining Balance"
-		asset.save()
-
-		expected_schedules = [
-			["2020-12-31", 66667, 66667],
-			["2021-03-31", 22222, 88889],
-			["2021-06-30", 1111, 90000]
-		]
-
-		schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
-			for d in asset.get("schedules")]
-
-		self.assertEqual(schedules, expected_schedules)
-		
-	def test_schedule_for_double_declining_method_for_existing_asset(self):
-		asset = frappe.get_doc("Asset", "Macbook Pro 1")
-		asset.depreciation_method = "Double Declining Balance"
-		asset.is_existing_asset = 1
-		asset.number_of_depreciations_booked = 1
-		asset.opening_accumulated_depreciation = 50000
-		asset.save()
-
-		expected_schedules = [
-			["2020-12-31", 33333, 83333],
-			["2021-03-31", 6667, 90000]
-		]
-
-		schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
-			for d in asset.get("schedules")]
-
-		self.assertEqual(schedules, expected_schedules)
-		
-	def test_schedule_for_manual_method(self):
-		asset = frappe.get_doc("Asset", "Macbook Pro 1")
-		asset.depreciation_method = "Manual"
-		asset.schedules = []
-		for schedule_date, amount in [["2020-12-31", 40000], ["2021-06-30", 30000], ["2021-10-31", 20000]]:
-			asset.append("schedules", {
-				"schedule_date": schedule_date,
-				"depreciation_amount": amount
-			})
-		asset.save()
-
-		self.assertEqual(asset.status, "Draft")
-
-		expected_schedules = [
-			["2020-12-31", 40000, 40000],
-			["2021-06-30", 30000, 70000],
-			["2021-10-31", 20000, 90000]
-		]
-
-		schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
-			for d in asset.get("schedules")]
-
-		self.assertEqual(schedules, expected_schedules)
-
-	def test_depreciation(self):
-		asset = frappe.get_doc("Asset", "Macbook Pro 1")
-		asset.submit()
-		asset.load_from_db()
-		self.assertEqual(asset.status, "Submitted")
-
-		frappe.db.set_value("Company", "_Test Company", "series_for_depreciation_entry", "DEPR-")
-
-		post_depreciation_entries(date="2021-01-01")
-		asset.load_from_db()
-
-		self.assertEqual(asset.status, "Partially Depreciated")
-
-		# check depreciation entry series
-		self.assertEqual(asset.get("schedules")[0].journal_entry[:4], "DEPR")
-
-		expected_gle = (
-			("_Test Accumulated Depreciations - _TC", 0.0, 30000.0),
-			("_Test Depreciations - _TC", 30000.0, 0.0)
-		)
-
-		gle = frappe.db.sql("""select account, debit, credit from `tabGL Entry`
-			where against_voucher_type='Asset' and against_voucher = %s
-			order by account""", asset.name)
-
-		self.assertEqual(gle, expected_gle)
-		self.assertEqual(asset.get("value_after_depreciation"), 70000)
-		
-	def test_depreciation_entry_cancellation(self):
-		asset = frappe.get_doc("Asset", "Macbook Pro 1")
-		asset.submit()
-		post_depreciation_entries(date="2021-01-01")
-		
-		asset.load_from_db()
-		
-		# cancel depreciation entry
-		depr_entry = asset.get("schedules")[0].journal_entry
-		self.assertTrue(depr_entry)
-		frappe.get_doc("Journal Entry", depr_entry).cancel()
-		
-		asset.load_from_db()
-		depr_entry = asset.get("schedules")[0].journal_entry
-		self.assertFalse(depr_entry)
-
-	def test_scrap_asset(self):
-		asset = frappe.get_doc("Asset", "Macbook Pro 1")
-		asset.submit()
-		post_depreciation_entries(date="2021-01-01")
-
-		scrap_asset("Macbook Pro 1")
-
-		asset.load_from_db()
-		self.assertEqual(asset.status, "Scrapped")
-		self.assertTrue(asset.journal_entry_for_scrap)
-
-		expected_gle = (
-			("_Test Accumulated Depreciations - _TC", 30000.0, 0.0),
-			("_Test Fixed Asset - _TC", 0.0, 100000.0),
-			("_Test Gain/Loss on Asset Disposal - _TC", 70000.0, 0.0)
-		)
-
-		gle = frappe.db.sql("""select account, debit, credit from `tabGL Entry`
-			where voucher_type='Journal Entry' and voucher_no = %s
-			order by account""", asset.journal_entry_for_scrap)
-
-		self.assertEqual(gle, expected_gle)
-
-		restore_asset("Macbook Pro 1")
-
-		asset.load_from_db()
-		self.assertFalse(asset.journal_entry_for_scrap)
-		self.assertEqual(asset.status, "Partially Depreciated")
-
-	def test_asset_sale(self):
-		frappe.get_doc("Asset", "Macbook Pro 1").submit()
-		post_depreciation_entries(date="2021-01-01")
-
-		si = make_sales_invoice(asset="Macbook Pro 1", item_code="Macbook Pro", company="_Test Company")
-		si.customer = "_Test Customer"
-		si.due_date = nowdate()
-		si.get("items")[0].rate = 25000
-		si.insert()
-		si.submit()
-
-		self.assertEqual(frappe.db.get_value("Asset", "Macbook Pro 1", "status"), "Sold")
-
-		expected_gle = (
-			("_Test Accumulated Depreciations - _TC", 30000.0, 0.0),
-			("_Test Depreciations - _TC", 70000.0, 0.0),
-			("_Test Fixed Asset - _TC", 0.0, 100000.0),
-			("_Test Gain/Loss on Asset Disposal - _TC", 0.0, 25000.0),
-			("Debtors - _TC", 25000.0, 0.0)
-		)
-
-		gle = frappe.db.sql("""select account, debit, credit from `tabGL Entry`
-			where voucher_type='Sales Invoice' and voucher_no = %s
-			order by account""", si.name)
-
-		self.assertEqual(gle, expected_gle)
-
-		si.cancel()
-
-		self.assertEqual(frappe.db.get_value("Asset", "Macbook Pro 1", "status"), "Partially Depreciated")
-
-	def test_asset_expected_value_after_useful_life(self):
-		asset = frappe.get_doc("Asset", "Macbook Pro 1")
-		asset.depreciation_method = "Straight Line"
-		asset.is_existing_asset = 1
-		asset.total_number_of_depreciations = 400
-		asset.gross_purchase_amount = 16866177.00
-		asset.expected_value_after_useful_life = 500000
-		asset.save()
-
-		accumulated_depreciation_after_full_schedule = \
-			max([d.accumulated_depreciation_amount for d in asset.get("schedules")])
-
-		asset_value_after_full_schedule = (flt(asset.gross_purchase_amount) -
-			flt(accumulated_depreciation_after_full_schedule))
-
-		self.assertTrue(asset.expected_value_after_useful_life >= asset_value_after_full_schedule)
-
-	def tearDown(self):
-		asset = frappe.get_doc("Asset", "Macbook Pro 1")
-
-		if asset.docstatus == 1 and asset.status not in ("Scrapped", "Sold", "Draft", "Cancelled"):
-			asset.cancel()
-
-			self.assertEqual(frappe.db.get_value("Asset", "Macbook Pro 1", "status"), "Cancelled")
-
-		frappe.delete_doc("Asset", "Macbook Pro 1")
-
-def create_asset():
-	if not frappe.db.exists("Asset Category", "Computers"):
-		create_asset_category()
-
-	if not frappe.db.exists("Item", "Macbook Pro"):
-		create_fixed_asset_item()
-	
-	asset = frappe.get_doc({
-		"doctype": "Asset",
-		"asset_name": "Macbook Pro 1",
-		"asset_category": "Computers",
-		"item_code": "Macbook Pro",
-		"company": "_Test Company",
-		"purchase_date": "2015-01-01",
-		"next_depreciation_date": "2020-12-31",
-		"gross_purchase_amount": 100000,
-		"expected_value_after_useful_life": 10000,
-		"warehouse": "_Test Warehouse - _TC"
-	})
-	try:
-		asset.save()
-	except frappe.DuplicateEntryError:
-		pass
-
-	return asset
-
-def create_asset_category():
-	asset_category = frappe.new_doc("Asset Category")
-	asset_category.asset_category_name = "Computers"
-	asset_category.total_number_of_depreciations = 3
-	asset_category.frequency_of_depreciation = 3
-	asset_category.append("accounts", {
-		"company_name": "_Test Company",
-		"fixed_asset_account": "_Test Fixed Asset - _TC",
-		"accumulated_depreciation_account": "_Test Accumulated Depreciations - _TC",
-		"depreciation_expense_account": "_Test Depreciations - _TC"
-	})
-	asset_category.insert()
-
-def create_fixed_asset_item():
-	try:
-		frappe.get_doc({
-			"doctype": "Item",
-			"item_code": "Macbook Pro",
-			"item_name": "Macbook Pro",
-			"description": "Macbook Pro Retina Display",
-			"asset_category": "Computers",
-			"item_group": "All Item Groups",
-			"stock_uom": "Nos",
-			"is_stock_item": 0,
-			"is_fixed_asset": 1
-		}).insert()		
-	except frappe.DuplicateEntryError:
-		pass
-
-def set_depreciation_settings_in_company():
-	company = frappe.get_doc("Company", "_Test Company")
-	company.accumulated_depreciation_account = "_Test Accumulated Depreciations - _TC"
-	company.depreciation_expense_account = "_Test Depreciations - _TC"
-	company.disposal_account = "_Test Gain/Loss on Asset Disposal - _TC"
-	company.depreciation_cost_center = "_Test Cost Center - _TC"
-	company.save()
-	
-	# Enable booking asset depreciation entry automatically
-	frappe.db.set_value("Accounts Settings", None, "book_asset_depreciation_entry_automatically", 1)
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset_category/asset_category.json b/erpnext/accounts/doctype/asset_category/asset_category.json
deleted file mode 100644
index 161ac78..0000000
--- a/erpnext/accounts/doctype/asset_category/asset_category.json
+++ /dev/null
@@ -1,287 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "field:asset_category_name", 
- "beta": 0, 
- "creation": "2016-03-01 17:41:39.778765", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "asset_category_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Asset Category Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Straight Line", 
-   "fieldname": "depreciation_method", 
-   "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": 1, 
-   "label": "Depreciation Method", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nStraight Line\nDouble Declining Balance\nManual", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "total_number_of_depreciations", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Total Number of Depreciations", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "frequency_of_depreciation", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Frequency of Depreciation (Months)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_2", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Accounts", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "accounts", 
-   "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": "Accounts", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Asset Category Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-11-30 16:09:52.955332", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Asset Category", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 1, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
diff --git a/erpnext/accounts/doctype/asset_category_account/asset_category_account.json b/erpnext/accounts/doctype/asset_category_account/asset_category_account.json
deleted file mode 100644
index 2393327..0000000
--- a/erpnext/accounts/doctype/asset_category_account/asset_category_account.json
+++ /dev/null
@@ -1,149 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2016-03-07 15:55:18.806409", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 3, 
-   "fieldname": "company_name", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 1, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 3, 
-   "fieldname": "fixed_asset_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Fixed Asset Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "accumulated_depreciation_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Accumulated Depreciation Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "depreciation_expense_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Depreciation Expense Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2016-11-03 15:12:55.775239", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Asset Category Account", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset_movement/asset_movement.json b/erpnext/accounts/doctype/asset_movement/asset_movement.json
deleted file mode 100644
index a1189f5..0000000
--- a/erpnext/accounts/doctype/asset_movement/asset_movement.json
+++ /dev/null
@@ -1,307 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "AM-.#####", 
- "beta": 0, 
- "creation": "2016-04-25 18:00:23.559973", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 0, 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "asset", 
-   "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": 1, 
-   "label": "Asset", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Asset", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "transaction_date", 
-   "fieldtype": "Datetime", 
-   "hidden": 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": "Transaction Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 1, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "source_warehouse", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Source Warehouse", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Warehouse", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "target_warehouse", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Target Warehouse", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Warehouse", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "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": "Asset Movement", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-02-17 16:09:32.069344", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Asset Movement", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
-   "write": 1
-  }, 
-  {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
-   "write": 1
-  }, 
-  {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Stock Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
-   "write": 1
-  }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset_movement/test_asset_movement.py b/erpnext/accounts/doctype/asset_movement/test_asset_movement.py
deleted file mode 100644
index 9880efc..0000000
--- a/erpnext/accounts/doctype/asset_movement/test_asset_movement.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import frappe
-from frappe.utils import now
-import unittest
-from erpnext.accounts.doctype.asset.test_asset import create_asset
-
-
-class TestAssetMovement(unittest.TestCase):
-	def test_movement(self):
-		asset = create_asset()
-		
-		if asset.docstatus == 0:
-			asset.submit()
-		
-		movement1 = create_asset_movement(asset, target_warehouse="_Test Warehouse 1 - _TC")
-		self.assertEqual(frappe.db.get_value("Asset", asset.name, "warehouse"), "_Test Warehouse 1 - _TC")
-		
-		movement2 = create_asset_movement(asset, target_warehouse="_Test Warehouse 2 - _TC")
-		self.assertEqual(frappe.db.get_value("Asset", asset.name, "warehouse"), "_Test Warehouse 2 - _TC")
-		
-		movement1.cancel()
-		self.assertEqual(frappe.db.get_value("Asset", asset.name, "warehouse"), "_Test Warehouse 2 - _TC")
-		
-		movement2.cancel()
-		self.assertEqual(frappe.db.get_value("Asset", asset.name, "warehouse"), "_Test Warehouse - _TC")
-		
-		asset.load_from_db()
-		asset.cancel()
-		frappe.delete_doc("Asset", asset.name)
-		
-		
-def create_asset_movement(asset, target_warehouse, transaction_date=None):
-	if not transaction_date:
-		transaction_date = now()
-		
-	movement = frappe.new_doc("Asset Movement")
-	movement.update({
-		"asset": asset.name,
-		"transaction_date": transaction_date,
-		"target_warehouse": target_warehouse,
-		"company": asset.company
-	})
-	
-	movement.insert()
-	movement.submit()
-	
-	return movement
diff --git a/erpnext/accounts/doctype/cost_center/cost_center.py b/erpnext/accounts/doctype/cost_center/cost_center.py
index 12d5e19..55388a5 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.py
+++ b/erpnext/accounts/doctype/cost_center/cost_center.py
@@ -59,9 +59,8 @@
 		return new_cost_center
 
 	def after_rename(self, olddn, newdn, merge=False):
+		super(CostCenter, self).after_rename(olddn, newdn, merge)
+
 		if not merge:
 			frappe.db.set_value("Cost Center", newdn, "cost_center_name",
 				" - ".join(newdn.split(" - ")[:-1]))
-		else:
-			super(CostCenter, self).after_rename(olddn, newdn, merge)
-
diff --git a/erpnext/accounts/doctype/cost_center/cost_center_tree.js b/erpnext/accounts/doctype/cost_center/cost_center_tree.js
index 6eab34f..f409d64 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center_tree.js
+++ b/erpnext/accounts/doctype/cost_center/cost_center_tree.js
@@ -23,5 +23,30 @@
 		{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
 			description:__('Further cost centers can be made under Groups but entries can be made against non-Groups')}
 	],
-	ignore_fields:["parent_cost_center"]
+	ignore_fields:["parent_cost_center"],
+	onload: function(treeview) {
+		function get_company() {
+			return treeview.page.fields_dict.company.get_value();
+		}
+
+		// tools
+		treeview.page.add_inner_button(__("Chart of Accounts"), function() {
+			frappe.set_route('Tree', 'Account', {company: get_company()});
+		}, __('View'));
+
+		// make
+		treeview.page.add_inner_button(__("Budget List"), function() {
+			frappe.set_route('List', 'Budget', {company: get_company()});
+		}, __('Budget'));
+
+		treeview.page.add_inner_button(__("Monthly Distribution"), function() {
+			frappe.set_route('List', 'Monthly Distribution', {company: get_company()});
+		}, __('Budget'));
+
+		treeview.page.add_inner_button(__("Budget Variance Report"), function() {
+			frappe.set_route('query-report', 'Budget Variance Report', {company: get_company()});
+		}, __('Budget'));
+
+	},
+
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/depreciation_schedule/depreciation_schedule.json b/erpnext/accounts/doctype/depreciation_schedule/depreciation_schedule.json
deleted file mode 100644
index 1fadf5e..0000000
--- a/erpnext/accounts/doctype/depreciation_schedule/depreciation_schedule.json
+++ /dev/null
@@ -1,205 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 1, 
- "autoname": "", 
- "beta": 0, 
- "creation": "2016-03-02 15:11:01.278862", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "schedule_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Schedule Date", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "depreciation_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Depreciation Amount", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "accumulated_depreciation_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Accumulated Depreciation Amount", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.docstatus==1", 
-   "fieldname": "journal_entry", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Journal Entry", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Journal Entry", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:(doc.docstatus==1 && !doc.journal_entry && doc.schedule_date <= get_today())", 
-   "fieldname": "make_depreciation_entry", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Make Depreciation Entry", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2016-11-18 16:42:19.543657", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Depreciation Schedule", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/depreciation_schedule/depreciation_schedule.py b/erpnext/accounts/doctype/depreciation_schedule/depreciation_schedule.py
deleted file mode 100644
index 957d6d1..0000000
--- a/erpnext/accounts/doctype/depreciation_schedule/depreciation_schedule.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-
-class DepreciationSchedule(Document):
-	pass
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.json b/erpnext/accounts/doctype/gl_entry/gl_entry.json
index 76e66d0..e27eaab 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.json
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.json
@@ -80,6 +80,36 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "due_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": "Due Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "account", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -718,7 +748,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-08-03 12:40:09.611951", 
+ "modified": "2017-08-10 18:06:44.904081", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "GL Entry", 
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js
index 9047a4e..4ce6886 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -185,8 +185,39 @@
 		})
 	},
 
+	due_date_options_cache: {},
+
 	reference_name: function(doc, cdt, cdn) {
 		var d = frappe.get_doc(cdt, cdn);
+		var me = this;
+
+		const get_invoice_due_dates = invoice_name => {
+			const options = this.due_date_options_cache[invoice_name];
+			const input = $(cur_frm.fields_dict["accounts"].wrapper).find("select[data-fieldname=reference_due_date]");
+
+			if (options) {
+				input.empty();
+				input.add_options(options);
+				frappe.model.set_value(cdt, cdn, "reference_due_date", options[0]);
+			}
+			else {
+				frappe.call({
+					method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_invoice_due_dates",
+					args: {name: invoice_name},
+					callback: function(r) {
+						const options = [];
+						$.each(r.message, function(key, value) {
+							options.push(value.due_date);
+						});
+						input.empty();
+						input.add_options(options);
+						frappe.model.set_value(cdt, cdn, "reference_due_date", options[0]);
+						me.due_date_options_cache[d.reference_name] = options;
+					}
+				});
+			}
+		}
+
 		if(d.reference_name) {
 			if (d.reference_type==="Purchase Invoice" && !flt(d.debit)) {
 				this.get_outstanding('Purchase Invoice', d.reference_name, doc.company, d);
@@ -197,6 +228,9 @@
 			if (d.reference_type==="Journal Entry" && !flt(d.credit) && !flt(d.debit)) {
 				this.get_outstanding('Journal Entry', d.reference_name, doc.company, d);
 			}
+			if( in_list(["Sales Invoice", "Purchase Invoice"]), d.reference_type) {
+				get_invoice_due_dates(d.reference_name);
+			}
 		}
 	},
 
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index 790003c..f010e67 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -436,7 +436,8 @@
 						"against_voucher": d.reference_name,
 						"remarks": self.remark,
 						"cost_center": d.cost_center,
-						"project": d.project
+						"project": d.project,
+						"due_date": d.reference_due_date
 					})
 				)
 
@@ -566,17 +567,26 @@
 		account = get_bank_cash_account(mode_of_payment, company).get("account")
 
 	if not account:
+		'''
+			Set the default account first. If the user hasn't set any default account then, he doesn't
+			want us to set any random account. In this case set the account only if there is single
+			account (of that type), otherwise return empty dict.
+		'''
 		if account_type=="Bank":
 			account = frappe.db.get_value("Company", company, "default_bank_account")
 			if not account:
-				account = frappe.db.get_value("Account",
-					{"company": company, "account_type": "Bank", "is_group": 0})
+				account_list = frappe.get_all("Account", filters = {"company": company,
+					"account_type": "Bank", "is_group": 0})
+				if len(account_list) == 1:
+					account = account_list[0].name
 
 		elif account_type=="Cash":
 			account = frappe.db.get_value("Company", company, "default_cash_account")
 			if not account:
-				account = frappe.db.get_value("Account",
-					{"company": company, "account_type": "Cash", "is_group": 0})
+				account_list = frappe.get_all("Account", filters = {"company": company,
+					"account_type": "Cash", "is_group": 0})
+				if len(account_list) == 1:
+					account = account_list[0].name
 
 	if account:
 		account_details = frappe.db.get_value("Account", account,
@@ -889,3 +899,14 @@
 		exchange_rate = bank_balance_in_company_currency / bank_balance_in_account_currency
 
 	return exchange_rate
+
+
+@frappe.whitelist()
+def get_invoice_due_dates(name):
+	result = frappe.get_list(
+		doctype='GL Entry', group_by='name, due_date',
+		filters={'voucher_no': name, "ifnull(due_date, '')": ('!=', '')},
+		fields=['due_date'], distinct=True
+	)
+
+	return result
diff --git a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
index 54af579..2954f72 100644
--- a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
+++ b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
@@ -13,6 +14,7 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -46,6 +48,7 @@
    "width": "250px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -75,6 +78,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -106,6 +110,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -141,6 +146,7 @@
    "width": "180px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -168,6 +174,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -197,6 +204,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -226,6 +234,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -256,6 +265,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -287,6 +297,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -317,6 +328,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -345,6 +357,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -374,6 +387,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -402,6 +416,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -432,6 +447,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -464,6 +480,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -491,6 +508,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -521,6 +539,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -553,6 +572,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -581,6 +601,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -597,7 +618,7 @@
    "label": "Reference Type", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim\nAsset\nEmployee Loan", 
+   "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim\nAsset\nEmployee Loan\nPayroll Entry", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -611,6 +632,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -641,6 +663,39 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.reference_type&&!in_list(doc.reference_type, ['Expense Claim', 'Asset', 'Employee Loan'])", 
+   "fieldname": "reference_due_date", 
+   "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": "Reference Due Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -671,6 +726,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -698,6 +754,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -729,6 +786,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -759,17 +817,17 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-03-02 05:02:10.102039", 
+ "modified": "2017-12-06 19:54:19.851534", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Journal Entry Account", 
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/accounts/doctype/opening_invoice_creation_tool/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/accounts/doctype/opening_invoice_creation_tool/__init__.py
diff --git a/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js b/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js
new file mode 100644
index 0000000..7c7d3a4
--- /dev/null
+++ b/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js
@@ -0,0 +1,96 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Opening Invoice Creation Tool', {
+	setup: function(frm) {
+		frm.set_query('party_type', 'invoices', function(doc, cdt, cdn) {
+			return {
+				filters: {
+					'name': ['in', 'Customer,Supplier']
+				}
+			};
+		});
+	},
+
+	refresh: function(frm) {
+		frm.disable_save();
+		frm.trigger("make_dashboard");
+		frm.page.set_primary_action(__("Make Invoices"), () => {
+			let btn_primary = frm.page.btn_primary.get(0);
+			return frm.call({
+				doc: frm.doc,
+				freeze: true,
+				btn: $(btn_primary),
+				method: "make_invoices",
+				freeze_message: __("Creating {0} Invoice", [frm.doc.invoice_type]),
+				callback: (r) => {
+					if(!r.exc){
+						frappe.msgprint(__("Opening {0} Invoice created", [frm.doc.invoice_type]));
+						frm.clear_table("invoices");
+						frm.refresh_fields();
+						frm.reload_doc();
+					}
+				}
+			});
+		});
+	},
+
+	company: function(frm) {
+		frappe.call({
+			method: 'erpnext.accounts.doctype.opening_invoice_creation_tool.opening_invoice_creation_tool.get_temporary_opening_account',
+			args: {
+				company: frm.doc.company
+			},
+			callback: (r) => {
+				if (r.message) {
+					frm.doc.__onload.temporary_opening_account = r.message;
+					frm.trigger('update_invoice_table');
+				}
+			}
+		})
+	},
+
+	invoice_type: function(frm) {
+		$.each(frm.doc.invoices, (idx, row) => {
+			row.party_type = frm.doc.invoice_type == "Sales"? "Customer": "Supplier";
+			row.party = "";
+		});
+		frm.refresh_fields();
+	},
+
+	make_dashboard: function(frm) {
+		let max_count = frm.doc.__onload.max_count;
+		let opening_invoices_summary = frm.doc.__onload.opening_invoices_summary;
+		if(!$.isEmptyObject(opening_invoices_summary)) {
+			let section = frm.dashboard.add_section(
+				frappe.render_template('opening_invoice_creation_tool_dashboard', {
+					data: opening_invoices_summary,
+					max_count: max_count
+				})
+			);
+
+			section.on('click', '.invoice-link', function() {
+				let doctype = $(this).attr('data-type');
+				let company = $(this).attr('data-company');
+				frappe.set_route('List', doctype,
+					{'is_opening': 'Yes', 'company': company, 'docstatus': 1});
+			});
+			frm.dashboard.show();
+		}
+	},
+
+	update_invoice_table: function(frm) {
+		$.each(frm.doc.invoices, (idx, row) => {
+			if (!row.temporary_opening_account) {
+				row.temporary_opening_account = frm.doc.__onload.temporary_opening_account;
+			}
+			row.party_type = frm.doc.invoice_type == "Sales"? "Customer": "Supplier";
+		});
+	}
+});
+
+frappe.ui.form.on('Opening Invoice Creation Tool Item', {
+	invoices_add: (frm) => {
+		frm.trigger('update_invoice_table');
+	}
+});
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json b/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
new file mode 100644
index 0000000..cde4c99
--- /dev/null
+++ b/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
@@ -0,0 +1,184 @@
+{
+ "allow_copy": 1, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 1, 
+ "creation": "2017-08-29 02:22:54.947711", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "invoice_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Invoice Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Sales\nPurchase", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_4", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Invoices", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 1, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "invoices", 
+   "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, 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Opening Invoice Creation Tool Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 1, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 1, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-09-05 01:30:33.235664", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Opening Invoice Creation Tool", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 0, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py b/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py
new file mode 100644
index 0000000..f173376
--- /dev/null
+++ b/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py
@@ -0,0 +1,169 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.utils import flt
+from frappe.model.document import Document
+
+
+class OpeningInvoiceCreationTool(Document):
+	def onload(self):
+		"""Load the Opening Invoice summary"""
+		summary, max_count = self.get_opening_invoice_summary()
+		self.set_onload('opening_invoices_summary', summary)
+		self.set_onload('max_count', max_count)
+		self.set_onload('temporary_opening_account', get_temporary_opening_account(self.company))
+
+	def get_opening_invoice_summary(self):
+		def prepare_invoice_summary(doctype, invoices):
+			# add company wise sales / purchase invoice summary
+			paid_amount = []
+			outstanding_amount = []
+			for invoice in invoices:
+				company = invoice.pop("company")
+				_summary = invoices_summary.get(company, {})
+				_summary.update({
+					"currency": company_wise_currency.get(company),
+					doctype: invoice
+				})
+				invoices_summary.update({company: _summary})
+
+				paid_amount.append(invoice.paid_amount)
+				outstanding_amount.append(invoice.outstanding_amount)
+
+			if paid_amount or outstanding_amount:
+				max_count.update({
+					doctype: {
+						"max_paid": max(paid_amount) if paid_amount else 0.0,
+						"max_due": max(outstanding_amount) if outstanding_amount else 0.0
+					}
+				})
+
+		invoices_summary = {}
+		max_count = {}
+		fields = [
+			"company", "count(name) as total_invoices", "sum(outstanding_amount) as outstanding_amount"
+		]
+		companies = frappe.get_all("Company", fields=["name as company", "default_currency as currency"])
+		if not companies:
+			return None, None
+
+		company_wise_currency = {row.company: row.currency for row in companies}
+		for doctype in ["Sales Invoice", "Purchase Invoice"]:
+			invoices = frappe.get_all(doctype, filters=dict(is_opening="Yes", docstatus=1),
+				fields=fields, group_by="company")
+			prepare_invoice_summary(doctype, invoices)
+
+		return invoices_summary, max_count
+
+	def make_invoices(self):
+		names = []
+		mandatory_error_msg = _("Row {idx}: {field} is required to create the Opening {invoice_type} Invoices")
+		if not self.company:
+			frappe.throw(_("Please select the Company"))
+
+		for row in self.invoices:
+			if not row.qty:
+				row.qty = 1.0
+			if not row.party:
+				frappe.throw(mandatory_error_msg.format(
+					idx=row.idx,
+					field=_("Party"),
+					invoice_type=self.invoice_type
+				))
+			# set party type if not available
+			if not row.party_type:
+				row.party_type = "Customer" if self.invoice_type == "Sales" else "Supplier"
+
+			if not row.posting_date:
+				frappe.throw(mandatory_error_msg.format(
+					idx=row.idx,
+					field=_("Party"),
+					invoice_type=self.invoice_type
+				))
+
+			if not row.outstanding_amount:
+				frappe.throw(mandatory_error_msg.format(
+					idx=row.idx,
+					field=_("Outstanding Amount"),
+					invoice_type=self.invoice_type
+				))
+
+			args = self.get_invoice_dict(row=row)
+			if not args:
+				continue
+
+			doc = frappe.get_doc(args).insert()
+			doc.submit()
+			names.append(doc.name)
+
+			if len(self.invoices) > 5:
+				frappe.publish_realtime(
+					"progress", dict(
+						progress=[row.idx, len(self.invoices)],
+						title=_('Creating {0}').format(doc.doctype)
+					),
+					user=frappe.session.user
+				)
+
+		return names
+
+	def get_invoice_dict(self, row=None):
+		def get_item_dict():
+			default_uom = frappe.db.get_single_value("Stock Settings", "stock_uom") or _("Nos")
+			cost_center = frappe.db.get_value("Company", self.company, "cost_center")
+			if not cost_center:
+				frappe.throw(
+					_("Please set the Default Cost Center in {0} company").format(frappe.bold(self.company))
+				)
+			rate = flt(row.outstanding_amount) / flt(row.qty)
+
+			return frappe._dict({
+				"uom": default_uom,
+				"rate": rate or 0.0,
+				"qty": row.qty,
+				"conversion_factor": 1.0,
+				"item_name": row.item_name or "Opening Invoice Item",
+				"description": row.item_name or "Opening Invoice Item",
+				income_expense_account_field: row.temporary_opening_account,
+				"cost_center": cost_center
+			})
+
+		if not row:
+			return None
+
+		party_type = "Customer"
+		income_expense_account_field = "income_account"
+		if self.invoice_type == "Purchase":
+			party_type = "Supplier"
+			income_expense_account_field = "expense_account"
+
+		item = get_item_dict()
+		return frappe._dict({
+			"items": [item],
+			"is_opening": "Yes",
+			"set_posting_time": 1,
+			"company": self.company,
+			"due_date": row.due_date,
+			"posting_date": row.posting_date,
+			frappe.scrub(party_type): row.party,
+			"doctype": "Sales Invoice" if self.invoice_type == "Sales" else "Purchase Invoice",
+			"currency": frappe.db.get_value("Company", self.company, "default_currency")
+		})
+
+@frappe.whitelist()
+def get_temporary_opening_account(company=None):
+	if not company:
+		return
+
+	accounts = frappe.get_all("Account", filters={
+		'company': company,
+		'account_type': 'Temporary'
+	})
+	if not accounts:
+		frappe.throw(_("Please add a Temporary Opening account in Chart of Accounts"))
+
+	return accounts[0].name
diff --git a/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html b/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html
new file mode 100644
index 0000000..5b136d4
--- /dev/null
+++ b/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html
@@ -0,0 +1,32 @@
+<h5 style="margin-top: 0px;">{{ __("Opening Invoices Summary") }}</h5>
+{% $.each(data, (company, summary) => { %}
+<h6 style="margin: 15px 0px -10px 0px;"><a class="company-link"> {{ company }}</a></h6>
+
+<table class="table table-bordered small">
+	<thead>
+		<tr>
+			<td style="width: 33%">{{ __("Invoice Type") }}</td>
+			<td style="width: 33%" class="text-right">{{ __("Opening Invoices") }}</td>
+			<td style="width: 33%" class="text-right">{{ __("Total Outstanding") }}</td>
+		</tr>
+	</thead>
+	<tbody>
+		{% $.each(["Sales Invoice", "Purchase Invoice"], (idx, doctype) => { %}
+		{% if summary[doctype] %}
+		<tr>
+			<td>
+				<a class="invoice-link" data-type="{{ doctype }}" data-company="{{ company }}">
+					{{ __(doctype) }}</a>
+			</td>
+			<td class="text-right">
+				{{ summary[doctype].total_invoices }}
+			</td>
+			<td class="text-right">
+				{{ format_currency(summary[doctype].outstanding_amount, summary.currency, 2) }}
+			</td>
+		</div>
+		{% endif %}
+		{% }); %}
+	</tbody>
+</table>
+{% }); %}
diff --git a/erpnext/accounts/doctype/opening_invoice_creation_tool/test_opening_invoice_creation_tool.js b/erpnext/accounts/doctype/opening_invoice_creation_tool/test_opening_invoice_creation_tool.js
new file mode 100644
index 0000000..f95d0d8
--- /dev/null
+++ b/erpnext/accounts/doctype/opening_invoice_creation_tool/test_opening_invoice_creation_tool.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Opening Invoice Creation Tool", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Opening Invoice Creation Tool
+		() => frappe.tests.make('Opening Invoice Creation Tool', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/accounts/doctype/opening_invoice_creation_tool/test_opening_invoice_creation_tool.py b/erpnext/accounts/doctype/opening_invoice_creation_tool/test_opening_invoice_creation_tool.py
new file mode 100644
index 0000000..3bfc10d
--- /dev/null
+++ b/erpnext/accounts/doctype/opening_invoice_creation_tool/test_opening_invoice_creation_tool.py
@@ -0,0 +1,79 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+test_dependencies = ["Customer", "Supplier"]
+from erpnext.accounts.doctype.opening_invoice_creation_tool.opening_invoice_creation_tool import get_temporary_opening_account
+
+class TestOpeningInvoiceCreationTool(unittest.TestCase):
+	def make_invoices(self, invoice_type="Sales"):
+		doc = frappe.get_single("Opening Invoice Creation Tool")
+		args = get_opening_invoice_creation_dict(invoice_type=invoice_type)
+		doc.update(args)
+		return doc.make_invoices()
+
+	def test_opening_sales_invoice_creation(self):
+		invoices = self.make_invoices()
+
+		self.assertEqual(len(invoices), 2)
+		expected_value = {
+			"keys": ["customer", "outstanding_amount", "status"],
+			0: ["_Test Customer", 300, "Overdue"],
+			1: ["_Test Customer 1", 250, "Overdue"],
+		}
+		self.check_expected_values(invoices, expected_value)
+
+	def check_expected_values(self, invoices, expected_value, invoice_type="Sales"):
+		doctype = "Sales Invoice" if invoice_type == "Sales" else "Purchase Invoice"
+
+		for invoice_idx, invoice in enumerate(invoices or []):
+			si = frappe.get_doc(doctype, invoice)
+			for field_idx, field in enumerate(expected_value["keys"]):
+				self.assertEqual(si.get(field, ""), expected_value[invoice_idx][field_idx])
+
+	def test_opening_purchase_invoice_creation(self):
+		invoices = self.make_invoices(invoice_type="Purchase")
+
+		self.assertEqual(len(invoices), 2)
+		expected_value = {
+			"keys": ["supplier", "outstanding_amount", "status"],
+			0: ["_Test Supplier", 300, "Overdue"],
+			1: ["_Test Supplier 1", 250, "Overdue"],
+		}
+		self.check_expected_values(invoices, expected_value, invoice_type="Purchase", )
+
+def get_opening_invoice_creation_dict(**args):
+	party = "Customer" if args.get("invoice_type", "Sales") == "Sales" else "Supplier"
+	company = args.get("company", "_Test Company")
+
+	invoice_dict = frappe._dict({
+		"company": company,
+		"invoice_type": args.get("invoice_type", "Sales"),
+		"invoices": [
+			{
+				"qty": 1.0,
+				"outstanding_amount": 300,
+				"party": "_Test {0}".format(party),
+				"item_name": "Opening Item",
+				"due_date": "2016-09-10",
+				"posting_date": "2016-09-05",
+				"temporary_opening_account": get_temporary_opening_account(company)
+			},
+			{
+				"qty": 2.0,
+				"outstanding_amount": 250,
+				"party": "_Test {0} 1".format(party),
+				"item_name": "Opening Item",
+				"due_date": "2016-09-10",
+				"posting_date": "2016-09-05",
+				"temporary_opening_account": get_temporary_opening_account(company)
+			}
+		]
+	})
+
+	invoice_dict.update(args)
+	return invoice_dict
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/accounts/doctype/opening_invoice_creation_tool_item/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/accounts/doctype/opening_invoice_creation_tool_item/__init__.py
diff --git a/erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json b/erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json
new file mode 100644
index 0000000..3f8ce16
--- /dev/null
+++ b/erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json
@@ -0,0 +1,378 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-08-29 04:26:36.159247", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "party_type", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Party Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "DocType", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "party", 
+   "fieldtype": "Dynamic Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Party", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "party_type", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "temporary_opening_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Temporary Opening Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Today", 
+   "fieldname": "posting_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Posting Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Today", 
+   "fieldname": "due_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Due Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Opening Invoice Item", 
+   "fieldname": "item_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Item Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "outstanding_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Outstanding Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "fieldname": "qty", 
+   "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": "Quantity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-12-11 17:49:14.541176", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Opening Invoice Creation Tool Item", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.py b/erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.py
new file mode 100644
index 0000000..d47c3e9
--- /dev/null
+++ b/erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class OpeningInvoiceCreationToolItem(Document):
+	pass
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index d8995a9..8ecedb5 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -512,7 +512,7 @@
 						c.outstanding_amount = d.outstanding_amount;
 						c.bill_no = d.bill_no;
 
-						if(!in_list(["Sales Order", "Purchase Order", "Expense Claim"], d.voucher_type)) {
+						if(!in_list(["Sales Order", "Purchase Order", "Expense Claim", "Fees"], d.voucher_type)) {
 							if(flt(d.outstanding_amount) > 0)
 								total_positive_outstanding += flt(d.outstanding_amount);
 							else
@@ -527,7 +527,7 @@
 						} else {
 							c.exchange_rate = 1;
 						}
-						if (in_list(['Sales Invoice', 'Purchase Invoice', "Expense Claim"], d.reference_doctype)){
+						if (in_list(['Sales Invoice', 'Purchase Invoice', "Expense Claim", "Fees"], d.reference_doctype)){
 							c.due_date = d.due_date;
 						}
 					});
@@ -535,7 +535,8 @@
 					if(
 						(frm.doc.payment_type=="Receive" && frm.doc.party_type=="Customer") ||
 						(frm.doc.payment_type=="Pay" && frm.doc.party_type=="Supplier")  ||
-						(frm.doc.payment_type=="Pay" && frm.doc.party_type=="Employee")
+						(frm.doc.payment_type=="Pay" && frm.doc.party_type=="Employee") ||
+						(frm.doc.payment_type=="Receive" && frm.doc.party_type=="Student") 
 					) {
 						if(total_positive_outstanding > total_negative_outstanding)
 							frm.set_value("paid_amount",
@@ -579,13 +580,16 @@
 		})
 
 		var allocated_negative_outstanding = 0;
-		if ((frm.doc.payment_type=="Receive" && frm.doc.party_type=="Customer") ||
+		if (
+				(frm.doc.payment_type=="Receive" && frm.doc.party_type=="Customer") ||
 				(frm.doc.payment_type=="Pay" && frm.doc.party_type=="Supplier") ||
-				(frm.doc.payment_type=="Pay" && frm.doc.party_type=="Employee")) {
-			if(total_positive_outstanding_including_order > paid_amount) {
-				var remaining_outstanding = total_positive_outstanding_including_order - paid_amount;
-				allocated_negative_outstanding = total_negative_outstanding < remaining_outstanding ?
-					total_negative_outstanding : remaining_outstanding;
+				(frm.doc.payment_type=="Pay" && frm.doc.party_type=="Employee") ||
+				(frm.doc.payment_type=="Receive" && frm.doc.party_type=="Student")
+			) {
+				if(total_positive_outstanding_including_order > paid_amount) {
+					var remaining_outstanding = total_positive_outstanding_including_order - paid_amount;
+					allocated_negative_outstanding = total_negative_outstanding < remaining_outstanding ?
+						total_negative_outstanding : remaining_outstanding;
 			}
 
 			var allocated_positive_outstanding =  paid_amount + allocated_negative_outstanding;
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index 56bdfba..99ff295 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -8,14 +8,16 @@
 from frappe.utils import flt, comma_or, nowdate
 from erpnext.accounts.utils import get_outstanding_invoices, get_account_currency, get_balance_on
 from erpnext.accounts.party import get_party_account
-from erpnext.accounts.doctype.journal_entry.journal_entry \
-	import get_average_exchange_rate, get_default_bank_cash_account
+from erpnext.accounts.doctype.journal_entry.journal_entry import get_default_bank_cash_account
 from erpnext.setup.utils import get_exchange_rate
 from erpnext.accounts.general_ledger import make_gl_entries
 from erpnext.hr.doctype.expense_claim.expense_claim import update_reimbursed_amount
 from erpnext.controllers.accounts_controller import AccountsController
 
-class InvalidPaymentEntry(ValidationError): pass
+
+class InvalidPaymentEntry(ValidationError):
+	pass
+
 
 class PaymentEntry(AccountsController):
 	def setup_party_account_field(self):
@@ -69,10 +71,9 @@
 	def validate_duplicate_entry(self):
 		reference_names = []
 		for d in self.get("references"):
-			if (d.reference_doctype, d.reference_name) in reference_names:
+			if (d.reference_doctype, d.reference_name, d.due_date) in reference_names:
 				frappe.throw(_("Row #{0}: Duplicate entry in References {1} {2}").format(d.idx, d.reference_doctype, d.reference_name))
-			reference_names.append((d.reference_doctype, d.reference_name))
-
+			reference_names.append((d.reference_doctype, d.reference_name, d.due_date))
 
 	def validate_allocated_amount(self):
 		for d in self.get("references"):
@@ -80,7 +81,6 @@
 				if flt(d.allocated_amount) > flt(d.outstanding_amount):
 					frappe.throw(_("Row #{0}: Allocated Amount cannot be greater than outstanding amount.").format(d.idx))
 
-
 	def delink_advance_entry_references(self):
 		for reference in self.references:
 			if reference.reference_doctype in ("Sales Invoice", "Purchase Invoice"):
@@ -128,7 +128,6 @@
 
 		self.set_missing_ref_details()
 
-
 	def set_missing_ref_details(self):
 		for d in self.get("references"):
 			if d.allocated_amount:
@@ -295,7 +294,7 @@
 
 	def set_difference_amount(self):
 		base_unallocated_amount = flt(self.unallocated_amount) * (flt(self.source_exchange_rate)
-			if self.payment_type=="Receive" else flt(self.target_exchange_rate))
+			if self.payment_type == "Receive" else flt(self.target_exchange_rate))
 
 		base_party_amount = flt(self.base_total_allocated_amount) + flt(base_unallocated_amount)
 
@@ -311,9 +310,10 @@
 		self.difference_amount = flt(self.difference_amount - total_deductions,
 			self.precision("difference_amount"))
 
+	# Paid amount is auto allocated in the reference document by default.
+	# Clear the reference document which doesn't have allocated amount on validate so that form can be loaded fast
 	def clear_unallocated_reference_document_rows(self):
 		self.set("references", self.get("references", {"allocated_amount": ["not in", [0, None, ""]]}))
-
 		frappe.db.sql("""delete from `tabPayment Entry Reference`
 			where parent = %s and allocated_amount = 0""", self.name)
 
@@ -413,7 +413,8 @@
 				gle = party_gl_dict.copy()
 				gle.update({
 					"against_voucher_type": d.reference_doctype,
-					"against_voucher": d.reference_name
+					"against_voucher": d.reference_name,
+					"due_date": d.due_date
 				})
 
 				allocated_amount_in_company_currency = flt(flt(d.allocated_amount) * flt(d.exchange_rate),
@@ -505,12 +506,10 @@
 	company_currency = frappe.db.get_value("Company", args.get("company"), "default_currency")
 
 	# Get negative outstanding sales /purchase invoices
-	total_field = "base_grand_total" if party_account_currency == company_currency else "grand_total"
-
 	negative_outstanding_invoices = []
-	if (args.get("party_type") != "Student"):
+	if args.get("party_type") not in ["Student", "Employee"]:
 		negative_outstanding_invoices = get_negative_outstanding_invoices(args.get("party_type"),
-			args.get("party"), args.get("party_account"), total_field)
+			args.get("party"), args.get("party_account"), party_account_currency, company_currency)
 
 	# Get positive outstanding sales /purchase invoices/ Fees
 	outstanding_invoices = get_outstanding_invoices(args.get("party_type"), args.get("party"),
@@ -580,28 +579,34 @@
 
 	return order_list
 
-def get_negative_outstanding_invoices(party_type, party, party_account, total_field):
-	if party_type != "Employee":
-		voucher_type = "Sales Invoice" if party_type == "Customer" else "Purchase Invoice"
-		return frappe.db.sql("""
-			select
-				"{voucher_type}" as voucher_type, name as voucher_no,
-				{total_field} as invoice_amount, outstanding_amount, posting_date,
-				due_date, conversion_rate as exchange_rate
-			from
-				`tab{voucher_type}`
-			where
-				{party_type} = %s and {party_account} = %s and docstatus = 1 and outstanding_amount < 0
-			order by
-				posting_date, name
-			""".format(**{
-				"total_field": total_field,
-				"voucher_type": voucher_type,
-				"party_type": scrub(party_type),
-				"party_account": "debit_to" if party_type=="Customer" else "credit_to"
-			}), (party, party_account), as_dict = True)
+def get_negative_outstanding_invoices(party_type, party, party_account, party_account_currency, company_currency):
+	voucher_type = "Sales Invoice" if party_type == "Customer" else "Purchase Invoice"
+	if party_account_currency == company_currency:
+		grand_total_field = "base_grand_total"
+		rounded_total_field = "base_rounded_total"
 	else:
-		return []
+		grand_total_field = "grand_total"
+		rounded_total_field = "rounded_total"
+
+	return frappe.db.sql("""
+		select
+			"{voucher_type}" as voucher_type, name as voucher_no,
+			if({rounded_total_field}, {rounded_total_field}, {grand_total_field}) as invoice_amount,
+			outstanding_amount, posting_date,
+			due_date, conversion_rate as exchange_rate
+		from
+			`tab{voucher_type}`
+		where
+			{party_type} = %s and {party_account} = %s and docstatus = 1 and outstanding_amount < 0
+		order by
+			posting_date, name
+		""".format(**{
+			"rounded_total_field": rounded_total_field,
+			"grand_total_field": grand_total_field,
+			"voucher_type": voucher_type,
+			"party_type": scrub(party_type),
+			"party_account": "debit_to" if party_type == "Customer" else "credit_to"
+		}), (party, party_account), as_dict=True)
 
 @frappe.whitelist()
 def get_party_details(company, party_type, party, date):
@@ -721,7 +726,10 @@
 	if party_amount:
 		grand_total = outstanding_amount = party_amount
 	elif dt in ("Sales Invoice", "Purchase Invoice"):
-		grand_total = doc.base_grand_total if party_account_currency == doc.company_currency else doc.grand_total
+		if party_account_currency == doc.company_currency:
+			grand_total = doc.base_rounded_total or doc.base_grand_total
+		else:
+			grand_total = doc.rounded_total or doc.grand_total
 		outstanding_amount = doc.outstanding_amount
 	elif dt in ("Expense Claim"):
 		grand_total = doc.total_sanctioned_amount
@@ -730,8 +738,10 @@
 		grand_total = doc.grand_total
 		outstanding_amount = doc.outstanding_amount
 	else:
-		total_field = "base_grand_total" if party_account_currency == doc.company_currency else "grand_total"
-		grand_total = flt(doc.get(total_field))
+		if party_account_currency == doc.company_currency:
+			grand_total = flt(doc.get("base_rounded_total") or doc.base_grand_total)
+		else:
+			grand_total = flt(doc.get("rounded_total") or doc.grand_total)
 		outstanding_amount = grand_total - flt(doc.advance_paid)
 
 	# bank or cash
@@ -766,20 +776,51 @@
 	pe.received_amount = received_amount
 	pe.allocate_payment_amount = 1
 	pe.letter_head = doc.get("letter_head")
+	args = {
+		'party_account': party_account, 'company': pe.company, 'party_type': pe.party_type,
+		'party': pe.party, 'posting_date': pe.posting_date
+	}
+	references = get_outstanding_reference_documents(args=args)
 
-	pe.append("references", {
-		"reference_doctype": dt,
-		"reference_name": dn,
-		"bill_no": doc.get("bill_no"),
-		"due_date": doc.get("due_date"),
-		"total_amount": grand_total,
-		"outstanding_amount": outstanding_amount,
-		"allocated_amount": outstanding_amount
-	})
+	for reference in references:
+		if reference.voucher_no == dn:
+			allocated_amount = min(paid_amount, reference.outstanding_amount)
+			pe.append("references", {
+				'reference_doctype': reference.voucher_type,
+				'reference_name': reference.voucher_no,
+				'due_date': reference.due_date,
+				'total_amount': reference.invoice_amount,
+				'outstanding_amount': reference.outstanding_amount,
+				'allocated_amount': allocated_amount,
+				"bill_no": reference.get("bill_no")
+			})
+			if paid_amount:
+				paid_amount -= allocated_amount
 
 	pe.setup_party_account_field()
 	pe.set_missing_values()
 	if party_account and bank:
 		pe.set_exchange_rate()
 		pe.set_amounts()
-	return pe
\ No newline at end of file
+	return pe
+
+
+def get_paid_amount(dt, dn, party_type, party, account, due_date):
+	if party_type=="Customer":
+		dr_or_cr = "credit_in_account_currency - debit_in_account_currency"
+	else:
+		dr_or_cr = "debit_in_account_currency - credit_in_account_currency"
+
+	paid_amount = frappe.db.sql("""
+		select ifnull(sum({dr_or_cr}), 0) as paid_amount
+		from `tabGL Entry`
+		where against_voucher_type = %s
+			and against_voucher = %s
+			and party_type = %s
+			and party = %s
+			and account = %s
+			and due_date = %s
+			and {dr_or_cr} > 0
+	""".format(dr_or_cr=dr_or_cr), (dt, dn, party_type, party, account, due_date))
+
+	return paid_amount[0][0] if paid_amount else 0
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
index 60be20d..a3a78a3 100644
--- a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
@@ -14,6 +14,7 @@
 
 test_dependencies = ["Item"]
 
+
 class TestPaymentEntry(unittest.TestCase):
 	def test_payment_entry_against_order(self):
 		so = make_sales_order()
@@ -40,7 +41,7 @@
 		self.assertEqual(so_advance_paid, 0)
 
 	def test_payment_entry_against_si_usd_to_usd(self):
-		si =  create_sales_invoice(customer="_Test Customer USD", debit_to="_Test Receivable USD - _TC",
+		si = create_sales_invoice(customer="_Test Customer USD", debit_to="_Test Receivable USD - _TC",
 			currency="USD", conversion_rate=50)
 		pe = get_payment_entry("Sales Invoice", si.name, bank_account="_Test Bank USD - _TC")
 		pe.reference_no = "1"
@@ -65,8 +66,20 @@
 		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", si.name, "outstanding_amount"))
 		self.assertEqual(outstanding_amount, 100)
 
+	def test_payment_entry_against_si_multi_due_dates(self):
+		si = create_sales_invoice(do_not_save=1)
+		si.payment_terms_template = '_Test Payment Term Template'
+		si.insert()
+		si.submit()
+
+		pe = get_payment_entry(si.doctype, si.name)
+		pe.reference_no = "1"
+		pe.reference_date = "2016-01-01"
+		pe.insert()
+		pe.submit()
+
 	def test_payment_entry_against_pi(self):
-		pi =  make_purchase_invoice(supplier="_Test Supplier USD", debit_to="_Test Payable USD - _TC",
+		pi = make_purchase_invoice(supplier="_Test Supplier USD", debit_to="_Test Payable USD - _TC",
 			currency="USD", conversion_rate=50)
 		pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank USD - _TC")
 		pe.reference_no = "1"
@@ -88,7 +101,7 @@
 	def test_payment_entry_against_ec(self):
 
 		payable = frappe.db.get_value('Company', "_Test Company", 'default_payable_account')
-		ec =  make_expense_claim(payable, 300, 300, "_Test Company","Travel Expenses - _TC")
+		ec = make_expense_claim(payable, 300, 300, "_Test Company", "Travel Expenses - _TC")
 		pe = get_payment_entry("Expense Claim", ec.name, bank_account="_Test Bank USD - _TC", bank_amount=300)
 		pe.reference_no = "1"
 		pe.reference_date = "2016-01-01"
@@ -108,7 +121,7 @@
 		self.assertEqual(outstanding_amount, 0)
 
 	def test_payment_entry_against_si_usd_to_inr(self):
-		si =  create_sales_invoice(customer="_Test Customer USD", debit_to="_Test Receivable USD - _TC",
+		si = create_sales_invoice(customer="_Test Customer USD", debit_to="_Test Receivable USD - _TC",
 			currency="USD", conversion_rate=50)
 		pe = get_payment_entry("Sales Invoice", si.name, party_amount=20,
 			bank_account="_Test Bank - _TC", bank_amount=900)
@@ -212,7 +225,7 @@
 
 		self.assertRaises(InvalidPaymentEntry, pe1.validate)
 
-		si1 =  create_sales_invoice()
+		si1 = create_sales_invoice()
 
 		# create full payment entry against si1
 		pe2 = get_payment_entry("Sales Invoice", si1.name, bank_account="_Test Cash - _TC")
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py
index 807ad28..21ddb10 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.py
+++ b/erpnext/accounts/doctype/payment_request/payment_request.py
@@ -294,7 +294,7 @@
 	if args.get("payment_gateway"):
 		return get_payment_gateway_account(args.get("payment_gateway"))
 
-	if args.cart:
+	if args.order_type == "Shopping Cart":
 		payment_gateway_account = frappe.get_doc("Shopping Cart Settings").payment_gateway_account
 		return get_payment_gateway_account(payment_gateway_account)
 
diff --git a/erpnext/accounts/doctype/depreciation_schedule/__init__.py b/erpnext/accounts/doctype/payment_schedule/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/depreciation_schedule/__init__.py
copy to erpnext/accounts/doctype/payment_schedule/__init__.py
diff --git a/erpnext/accounts/doctype/payment_schedule/payment_schedule.json b/erpnext/accounts/doctype/payment_schedule/payment_schedule.json
new file mode 100644
index 0000000..854def0
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_schedule/payment_schedule.json
@@ -0,0 +1,197 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "", 
+ "beta": 0, 
+ "creation": "2017-08-10 15:38:00.080575", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "payment_term", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Payment Term", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Payment Term", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "description", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "payment_term.description", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "due_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Due Date", 
+   "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": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "invoice_portion", 
+   "fieldtype": "Percent", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Invoice Portion", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "payment_term.invoice_portion", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "payment_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Payment Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-23 12:39:02.013040", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Payment Schedule", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_schedule/payment_schedule.py b/erpnext/accounts/doctype/payment_schedule/payment_schedule.py
new file mode 100644
index 0000000..4174017
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_schedule/payment_schedule.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+
+class PaymentSchedule(Document):
+	pass
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/accounts/doctype/payment_term/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/accounts/doctype/payment_term/__init__.py
diff --git a/erpnext/accounts/doctype/payment_term/payment_term.js b/erpnext/accounts/doctype/payment_term/payment_term.js
new file mode 100644
index 0000000..054c2d1
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_term/payment_term.js
@@ -0,0 +1,2 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
diff --git a/erpnext/accounts/doctype/payment_term/payment_term.json b/erpnext/accounts/doctype/payment_term/payment_term.json
new file mode 100644
index 0000000..702319b
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_term/payment_term.json
@@ -0,0 +1,344 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:payment_term_name", 
+ "beta": 0, 
+ "creation": "2017-08-10 15:24:54.876365", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "payment_term_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payment Term Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "invoice_portion", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Invoice Portion", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "due_date_based_on", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Due Date Based On", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Day(s) after invoice date\nDay(s) after the end of the invoice month\nMonth(s) after the end of the invoice month", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:in_list(['Day(s) after invoice date', 'Day(s) after the end of the invoice month'], doc.due_date_based_on)", 
+   "fieldname": "credit_days", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Credit Days", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.due_date_based_on=='Month(s) after the end of the invoice month'", 
+   "fieldname": "credit_months", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Credit Months", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_6", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-08-10 16:26:03.581501", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Payment Term", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_term/payment_term.py b/erpnext/accounts/doctype/payment_term/payment_term.py
new file mode 100644
index 0000000..5d4df05
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_term/payment_term.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+
+class PaymentTerm(Document):
+	pass
diff --git a/erpnext/accounts/doctype/payment_term/test_payment_term.js b/erpnext/accounts/doctype/payment_term/test_payment_term.js
new file mode 100644
index 0000000..b26e42a
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_term/test_payment_term.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Payment Term", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Payment Term
+		() => frappe.tests.make('Payment Term', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/accounts/doctype/payment_term/test_payment_term.py b/erpnext/accounts/doctype/payment_term/test_payment_term.py
new file mode 100644
index 0000000..d9baa59
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_term/test_payment_term.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+import unittest
+
+
+class TestPaymentTerm(unittest.TestCase):
+	pass
diff --git a/erpnext/accounts/doctype/payment_term/test_records.json b/erpnext/accounts/doctype/payment_term/test_records.json
new file mode 100644
index 0000000..ef6e069
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_term/test_records.json
@@ -0,0 +1,34 @@
+[
+  {
+    "doctype":"Payment Term",
+    "due_date_based_on":"Day(s) after invoice date",
+    "payment_term_name":"_Test N30",
+    "description":"_Test Net 30 Days",
+    "invoice_portion":50,
+    "credit_days":30
+  },
+  {
+    "doctype":"Payment Term",
+    "due_date_based_on":"Day(s) after invoice date",
+    "payment_term_name":"_Test COD",
+    "description":"_Test Cash on Delivery",
+    "invoice_portion":50,
+    "credit_days":0
+  },
+  {
+    "doctype":"Payment Term",
+    "due_date_based_on":"Month(s) after the end of the invoice month",
+    "payment_term_name":"_Test EONM",
+    "description":"_Test End of Next Month",
+    "invoice_portion":100,
+    "credit_months":1
+  },
+  {
+    "doctype":"Payment Term",
+    "due_date_based_on":"Day(s) after invoice date",
+    "payment_term_name":"_Test N30 1",
+    "description":"_Test Net 30 Days",
+    "invoice_portion":100,
+    "credit_days":30
+  }
+]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/depreciation_schedule/__init__.py b/erpnext/accounts/doctype/payment_terms_template/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/depreciation_schedule/__init__.py
copy to erpnext/accounts/doctype/payment_terms_template/__init__.py
diff --git a/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.js b/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.js
new file mode 100644
index 0000000..558297f
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.js
@@ -0,0 +1,12 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Payment Terms Template', {
+	setup: function(frm) {
+		frm.add_fetch("payment_term", "description", "description");
+		frm.add_fetch("payment_term", "invoice_portion", "invoice_portion");
+		frm.add_fetch("payment_term", "due_date_based_on", "due_date_based_on");
+		frm.add_fetch("payment_term", "credit_days", "credit_days");
+		frm.add_fetch("payment_term", "credit_months", "credit_months");
+	}
+});
diff --git a/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.json b/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.json
new file mode 100644
index 0000000..0959658
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.json
@@ -0,0 +1,164 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:template_name", 
+ "beta": 0, 
+ "creation": "2017-08-10 15:34:28.058054", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "template_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Template Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "terms", 
+   "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": "Payment Terms", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Payment Terms Template Detail", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-08-10 15:46:33.877884", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Payment Terms Template", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py b/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py
new file mode 100644
index 0000000..7042df0
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+
+import frappe
+from frappe.model.document import Document
+from frappe.utils import flt, cint
+from frappe import _
+
+
+class PaymentTermsTemplate(Document):
+	def validate(self):
+		self.validate_invoice_portion()
+		self.validate_credit_days()
+		self.check_duplicate_terms()
+
+	def validate_invoice_portion(self):
+		total_portion = 0
+		for term in self.terms:
+			total_portion += flt(term.get('invoice_portion', 0))
+
+		if flt(total_portion, 2) != 100.00:
+			frappe.msgprint(_('Combined invoice portion must equal 100%'), raise_exception=1, indicator='red')
+
+	def validate_credit_days(self):
+		for term in self.terms:
+			if cint(term.credit_days) < 0:
+				frappe.msgprint(_('Credit Days cannot be a negative number'), raise_exception=1, indicator='red')
+
+	def check_duplicate_terms(self):
+		terms = []
+		for term in self.terms:
+			term_info = (term.credit_days, term.due_date_based_on)
+			if term_info in terms:
+				frappe.msgprint(
+					_('The Payment Term at row {0} is possibly a duplicate.').format(term.idx),
+					raise_exception=1, indicator='red'
+				)
+			else:
+				terms.append(term_info)
diff --git a/erpnext/accounts/doctype/payment_terms_template/test_payment_terms_template.js b/erpnext/accounts/doctype/payment_terms_template/test_payment_terms_template.js
new file mode 100644
index 0000000..494a0ed
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_terms_template/test_payment_terms_template.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Payment Terms Template", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Payment Terms Template
+		() => frappe.tests.make('Payment Terms Template', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/accounts/doctype/payment_terms_template/test_payment_terms_template.py b/erpnext/accounts/doctype/payment_terms_template/test_payment_terms_template.py
new file mode 100644
index 0000000..6daaf1e
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_terms_template/test_payment_terms_template.py
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+import unittest
+
+import frappe
+
+
+class TestPaymentTermsTemplate(unittest.TestCase):
+	def tearDown(self):
+		frappe.delete_doc('Payment Terms Template', '_Test Payment Terms Template For Test', force=1)
+
+	def test_create_template(self):
+		template = frappe.get_doc({
+			'doctype': 'Payment Terms Template',
+			'template_name': '_Test Payment Terms Template For Test',
+			'terms': [{
+				'doctype': 'Payment Terms Template Detail',
+				'invoice_portion': 50.00,
+				'credit_days_based_on': 'Day(s) after invoice date',
+				'credit_days': 30
+			}]
+		})
+
+		self.assertRaises(frappe.ValidationError, template.insert)
+
+		template.append('terms', {
+			'doctype': 'Payment Terms Template Detail',
+			'invoice_portion': 50.00,
+			'credit_days_based_on': 'Day(s) after invoice date',
+			'credit_days': 0
+		})
+
+		template.insert()
+
+	def test_credit_days(self):
+		template = frappe.get_doc({
+			'doctype': 'Payment Terms Template',
+			'template_name': '_Test Payment Terms Template For Test',
+			'terms': [{
+				'doctype': 'Payment Terms Template Detail',
+				'invoice_portion': 100.00,
+				'credit_days_based_on': 'Day(s) after invoice date',
+				'credit_days': -30
+			}]
+		})
+
+		self.assertRaises(frappe.ValidationError, template.insert)
+
+	def test_duplicate_terms(self):
+		template = frappe.get_doc({
+			'doctype': 'Payment Terms Template',
+			'template_name': '_Test Payment Terms Template For Test',
+			'terms': [
+				{
+					'doctype': 'Payment Terms Template Detail',
+					'invoice_portion': 50.00,
+					'credit_days_based_on': 'Day(s) after invoice date',
+					'credit_days': 30
+				},
+				{
+					'doctype': 'Payment Terms Template Detail',
+					'invoice_portion': 50.00,
+					'credit_days_based_on': 'Day(s) after invoice date',
+					'credit_days': 30
+				}
+
+			]
+		})
+
+		self.assertRaises(frappe.ValidationError, template.insert)
diff --git a/erpnext/accounts/doctype/payment_terms_template/test_records.json b/erpnext/accounts/doctype/payment_terms_template/test_records.json
new file mode 100644
index 0000000..fea0b35
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_terms_template/test_records.json
@@ -0,0 +1,60 @@
+[
+  {
+    "doctype":"Payment Terms Template",
+    "terms":[
+          {
+            "doctype":"Payment Terms Template Detail",
+            "due_date_based_on":"Day(s) after invoice date",
+            "idx":1,
+            "description":"Cash on Delivery",
+            "invoice_portion":50,
+            "credit_days":0,
+            "credit_months":0,
+            "payment_term":"_Test COD"
+        },
+        {
+            "doctype":"Payment Terms Template Detail",
+            "due_date_based_on":"Day(s) after invoice date",
+            "idx":2,
+            "description":"Net 30 Days ",
+            "invoice_portion":50,
+            "credit_days":30,
+            "credit_months":0,
+            "payment_term":"_Test N30"
+        }
+    ],
+    "template_name":"_Test Payment Term Template"
+  },
+  {
+    "doctype":"Payment Terms Template",
+    "terms":[
+          {
+            "doctype":"Payment Terms Template Detail",
+            "due_date_based_on":"Month(s) after the end of the invoice month",
+            "idx":1,
+            "description":"_Test End of Next Months",
+            "invoice_portion":100,
+            "credit_days":0,
+            "credit_months":1,
+            "payment_term":"_Test EONM"
+        }
+    ],
+    "template_name":"_Test Payment Term Template 1"
+  },
+  {
+    "doctype":"Payment Terms Template",
+    "terms":[
+          {
+            "doctype":"Payment Terms Template Detail",
+            "due_date_based_on":"Day(s) after invoice date",
+            "idx":1,
+            "description":"_Test Net Within 30 days",
+            "invoice_portion":100,
+            "credit_days":30,
+            "credit_months":0,
+            "payment_term":"_Test N30 1"
+        }
+    ],
+    "template_name":"_Test Payment Term Template 3"
+  }
+]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/accounts/doctype/payment_terms_template_detail/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/accounts/doctype/payment_terms_template_detail/__init__.py
diff --git a/erpnext/accounts/doctype/payment_terms_template_detail/payment_terms_template_detail.json b/erpnext/accounts/doctype/payment_terms_template_detail/payment_terms_template_detail.json
new file mode 100644
index 0000000..f808a0f
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_terms_template_detail/payment_terms_template_detail.json
@@ -0,0 +1,232 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "PTTD.#####", 
+ "beta": 0, 
+ "creation": "2017-08-10 15:34:09.409562", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "payment_term", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Payment Term", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Payment 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "description", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "default": "0", 
+   "fieldname": "invoice_portion", 
+   "fieldtype": "Percent", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Invoice Portion", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "due_date_based_on", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Due Date Based On", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Day(s) after invoice date\nDay(s) after the end of the invoice month\nMonth(s) after the end of the invoice month", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "default": "0", 
+   "depends_on": "eval:in_list(['Day(s) after invoice date', 'Day(s) after the end of the invoice month'], doc.due_date_based_on)", 
+   "fieldname": "credit_days", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Credit Days", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "depends_on": "eval:doc.due_date_based_on=='Month(s) after the end of the invoice month'", 
+   "fieldname": "credit_months", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Credit Months", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-09-26 05:21:51.738319", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Payment Terms Template Detail", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_terms_template_detail/payment_terms_template_detail.py b/erpnext/accounts/doctype/payment_terms_template_detail/payment_terms_template_detail.py
new file mode 100644
index 0000000..54c0fda
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_terms_template_detail/payment_terms_template_detail.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+
+class PaymentTermsTemplateDetail(Document):
+	pass
diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.js b/erpnext/accounts/doctype/pos_profile/pos_profile.js
index 25aff13..b62d9b0 100755
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.js
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.js
@@ -106,11 +106,6 @@
 	};
 };
 
-
-cur_frm.fields_dict.user.get_query = function(doc,cdt,cdn) {
-	return{	query:"frappe.core.doctype.user.user.user_query"};
-};
-
 cur_frm.fields_dict.write_off_account.get_query = function(doc) {
 	return{
 		filters:{
diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.json b/erpnext/accounts/doctype/pos_profile/pos_profile.json
index 8136c98..e2a6b53 100644
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.json
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.json
@@ -2,7 +2,7 @@
  "allow_copy": 0, 
  "allow_guest_to_view": 0, 
  "allow_import": 0, 
- "allow_rename": 0, 
+ "allow_rename": 1, 
  "autoname": "field:pos_profile_name", 
  "beta": 0, 
  "creation": "2013-05-24 12:15:51", 
@@ -107,38 +107,6 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "user", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Applicable for User", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "user", 
-   "oldfieldtype": "Link", 
-   "options": "User", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 1, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -292,6 +260,36 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "allow_print_before_pay", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Allow Print Before Pay", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_4", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -480,7 +478,67 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "depends_on": "", 
+   "fieldname": "section_break_15", 
+   "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": "Applicable for Users", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "applicable_for_users", 
+   "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": "Applicable for Users", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "POS Profile User", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_11", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1418,7 +1476,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-10-27 06:45:32.957674", 
+ "modified": "2017-12-11 17:30:45.198147", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "POS Profile", 
@@ -1468,10 +1526,11 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "search_fields": "pos_profile_name", 
  "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
- "title_field": "user", 
+ "title_field": "pos_profile_name", 
  "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.py b/erpnext/accounts/doctype/pos_profile/pos_profile.py
index 79894f1..5710bd4 100644
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.py
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.py
@@ -4,30 +4,35 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import msgprint, _
-from frappe.utils import cint
+from frappe.utils import cint, now
+from erpnext.accounts.doctype.sales_invoice.pos import get_child_nodes
 from erpnext.accounts.doctype.sales_invoice.sales_invoice import set_account_for_mode_of_payment
 
 from frappe.model.document import Document
 
 class POSProfile(Document):
 	def validate(self):
-		self.check_for_duplicate()
+		self.validate_default_profile()
 		self.validate_all_link_fields()
 		self.validate_duplicate_groups()
 		self.check_default_payment()
 		self.validate_customer_territory_group()
 
-	def check_for_duplicate(self):
-		res = frappe.db.sql("""select name, user from `tabPOS Profile`
-			where ifnull(user, '') = %s and name != %s and company = %s and ifnull(disabled, 0) != 1""",
-			(self.user, self.name, self.company))
-		if res:
-			if res[0][1]:
-				msgprint(_("POS Profile {0} already created for user: {1} and company {2}").format(res[0][0],
-					res[0][1], self.company), raise_exception=1)
-			else:
-				msgprint(_("Global POS Profile {0} already created for company {1}").format(res[0][0],
-					self.company), raise_exception=1)
+	def validate_default_profile(self):
+		for row in self.applicable_for_users:
+			res = frappe.db.sql("""select pf.name
+				from
+					`tabPOS Profile User` pfu, `tabPOS Profile` pf
+				where
+					pf.name = pfu.parent and pfu.user = %s and pf.name != %s and pf.company = %s
+					and pfu.default=1""", (row.user, self.name, self.company))
+
+			if row.default and res:
+				msgprint(_("Already set default in pos profile {0} for user {1}, kindly disabled default")
+					.format(res[0][0], row.user), raise_exception=1)
+			elif not row.default and not res:
+				msgprint(_("User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.")
+					.format(row.user, row.idx), raise_exception=1)
 
 	def validate_all_link_fields(self):
 		accounts = {"Account": [self.income_account,
@@ -78,12 +83,12 @@
 		frappe.defaults.clear_default("is_pos")
 
 		if not include_current_pos:
-			condition = " where name != '%s'" % self.name.replace("'", "\'")
+			condition = " where pfu.name != '%s' and pfu.default = 1 " % self.name.replace("'", "\'")
 		else:
-			condition = ""
+			condition = " where pfu.default = 1 "
 
-		pos_view_users = frappe.db.sql_list("""select user
-			from `tabPOS Profile` {0}""".format(condition))
+		pos_view_users = frappe.db.sql_list("""select pfu.user
+			from `tabPOS Profile User` as pfu {0}""".format(condition))
 
 		for user in pos_view_users:
 			if user:
@@ -91,6 +96,73 @@
 			else:
 				frappe.defaults.set_global_default("is_pos", 1)
 
+def get_item_groups(pos_profile):
+	item_groups = []
+	pos_profile = frappe.get_doc('POS Profile', pos_profile)
+
+	if pos_profile.get('item_groups'):
+		# Get items based on the item groups defined in the POS profile
+		for data in pos_profile.get('item_groups'):
+			item_groups.extend(["'%s'"%d.name for d in get_child_nodes('Item Group', data.item_group)])
+
+	return list(set(item_groups))
+
 @frappe.whitelist()
 def get_series():
 	return frappe.get_meta("Sales Invoice").get_field("naming_series").options or ""
+
+def pos_profile_query(doctype, txt, searchfield, start, page_len, filters):
+	user = frappe.session['user']
+	company = filters.get('company') or frappe.defaults.get_user_default('company')
+
+	args = {
+		'user': user,
+		'start': start,
+		'company': company,
+		'page_len': page_len,
+		'txt': '%%%s%%' % txt
+	}
+
+	pos_profile = frappe.db.sql("""select pf.name, pf.pos_profile_name
+		from
+			`tabPOS Profile` pf, `tabPOS Profile User` pfu
+		where
+			pfu.parent = pf.name and pfu.user = %(user)s and pf.company = %(company)s
+			and (pf.name like %(txt)s or pf.pos_profile_name like %(txt)s)
+			and pf.disabled = 0 limit %(start)s, %(page_len)s""", args)
+
+	if not pos_profile:
+		del args['user']
+
+		pos_profile = frappe.db.sql("""select pf.name, pf.pos_profile_name
+			from
+				`tabPOS Profile` pf left join `tabPOS Profile User` pfu
+			on
+				pf.name = pfu.parent
+			where
+				ifnull(pfu.user, '') = '' and pf.company = %(company)s and
+				(pf.name like %(txt)s or pf.pos_profile_name like %(txt)s)
+				and pf.disabled = 0""", args)
+
+	return pos_profile
+
+@frappe.whitelist()
+def set_default_profile(pos_profile, company):
+	modified = now()
+	user = frappe.session.user
+	company = frappe.db.escape(company)
+
+	if pos_profile and company:
+		frappe.db.sql(""" update `tabPOS Profile User` pfu, `tabPOS Profile` pf
+			set
+				pfu.default = 0, pf.modified = %s, pf.modified_by = %s
+			where
+				pfu.user = %s and pf.name = pfu.parent and pf.company = %s
+				and pfu.default = 1""", (modified, user, user, company), auto_commit=1)
+
+		frappe.db.sql(""" update `tabPOS Profile User` pfu, `tabPOS Profile` pf
+			set
+				pfu.default = 1, pf.modified = %s, pf.modified_by = %s
+			where
+				pfu.user = %s and pf.name = pfu.parent and pf.company = %s and pf.name = %s
+			""", (modified, user, user, company, pos_profile), auto_commit=1)
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/accounts/doctype/pos_profile_user/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/accounts/doctype/pos_profile_user/__init__.py
diff --git a/erpnext/accounts/doctype/pos_profile_user/pos_profile_user.js b/erpnext/accounts/doctype/pos_profile_user/pos_profile_user.js
new file mode 100644
index 0000000..f0884eb
--- /dev/null
+++ b/erpnext/accounts/doctype/pos_profile_user/pos_profile_user.js
@@ -0,0 +1,6 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('POS Profile User', {
+
+});
diff --git a/erpnext/accounts/doctype/pos_profile_user/pos_profile_user.json b/erpnext/accounts/doctype/pos_profile_user/pos_profile_user.json
new file mode 100644
index 0000000..2fb66d2
--- /dev/null
+++ b/erpnext/accounts/doctype/pos_profile_user/pos_profile_user.json
@@ -0,0 +1,123 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-10-27 16:46:06.060930", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Default", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "user", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "User", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "User", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-23 17:13:16.005475", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "POS Profile User", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pos_profile_user/pos_profile_user.py b/erpnext/accounts/doctype/pos_profile_user/pos_profile_user.py
new file mode 100644
index 0000000..d77cdde
--- /dev/null
+++ b/erpnext/accounts/doctype/pos_profile_user/pos_profile_user.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+class POSProfileUser(Document):
+	pass
diff --git a/erpnext/accounts/doctype/pos_profile_user/test_pos_profile_user.js b/erpnext/accounts/doctype/pos_profile_user/test_pos_profile_user.js
new file mode 100644
index 0000000..5449ab7
--- /dev/null
+++ b/erpnext/accounts/doctype/pos_profile_user/test_pos_profile_user.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: POS Profile User", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new POS Profile User
+		() => frappe.tests.make('POS Profile User', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/accounts/doctype/pos_profile_user/test_pos_profile_user.py b/erpnext/accounts/doctype/pos_profile_user/test_pos_profile_user.py
new file mode 100644
index 0000000..5c69ab1
--- /dev/null
+++ b/erpnext/accounts/doctype/pos_profile_user/test_pos_profile_user.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import unittest
+
+class TestPOSProfileUser(unittest.TestCase):
+	pass
diff --git a/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
index 82a3d65..3fa34e2 100644
--- a/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
@@ -252,9 +252,11 @@
 		self.assertEquals(so.items[0].rate, 100)
 
 	def test_pricing_rule_with_margin_and_discount(self):
+		frappe.delete_doc_if_exists('Pricing Rule', '_Test Pricing Rule')
 		make_pricing_rule(selling=1, margin_type="Percentage", margin_rate_or_amount=10)
 		si = create_sales_invoice(do_not_save=True)
 		si.items[0].price_list_rate = 1000
+		si.payment_schedule = []
 		si.insert(ignore_permissions=True)
 
 		item = si.items[0]
@@ -263,6 +265,7 @@
 
 		# With discount
 		item.discount_percentage = 10
+		si.payment_schedule = []
 		si.save()
 		item = si.items[0]
 		self.assertEquals(item.rate, 990)
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index b9a7dae..2fbf014 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -17,12 +17,13 @@
 			if(!this.frm.doc.supplier && this.frm.doc.credit_to) {
 				this.frm.set_df_property("credit_to", "print_hide", 0);
 			}
+		} else {
+			this.frm.set_value("disable_rounded_total", frappe.sys_defaults.disable_rounded_total);
 		}
 
 		// formatter for material request item
 		this.frm.set_indicator_formatter('item_code',
 			function(doc) { return (doc.qty<=doc.received_qty) ? "green" : "orange" })
-
 	},
 
 	refresh: function(doc) {
@@ -377,5 +378,5 @@
 			erpnext.buying.get_default_bom(frm);
 		}
 		frm.toggle_reqd("supplier_warehouse", frm.doc.is_subcontracted==="Yes");
-	},
+	}
 })
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 3d70b3b..7247323 100755
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -128,6 +128,7 @@
    "no_copy": 0, 
    "oldfieldname": "supplier_name", 
    "oldfieldtype": "Data", 
+   "options": "supplier.supplier_name", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -145,6 +146,36 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "tax_id", 
+   "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": "Tax Id", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "due_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -1427,6 +1458,36 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "total_net_weight", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Net Weight", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1490,6 +1551,95 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "column_break_49", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "shipping_rule", 
+   "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": "Shipping Rule", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Shipping Rule", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_51", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -2109,6 +2259,38 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "eval:!doc.disable_rounded_total", 
+   "fieldname": "base_rounded_total", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Rounded Total (Company Currency)", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "base_in_words", 
    "fieldtype": "Data", 
@@ -2234,6 +2416,38 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "eval:!doc.disable_rounded_total", 
+   "fieldname": "rounded_total", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Rounded Total", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "in_words", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -2327,6 +2541,37 @@
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "grand_total", 
+   "fieldname": "disable_rounded_total", 
+   "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": "Disable Rounded Total", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "paid_amount", 
    "columns": 0, 
@@ -2793,6 +3038,99 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "collapsible_depends_on": "eval:(!doc.is_return)", 
+   "columns": 0, 
+   "fieldname": "payment_schedule_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payment Terms", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "payment_terms_template", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payment Terms Template", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Payment Terms Template", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "payment_schedule", 
+   "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": "Payment Schedule", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Payment Schedule", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
    "collapsible_depends_on": "terms", 
    "columns": 0, 
    "fieldname": "terms_section_break", 
@@ -3430,7 +3768,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "remember_last_selected_value": 0, 
@@ -3575,7 +3913,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-10-24 12:51:51.199594", 
+ "modified": "2017-12-07 15:37:30.173811", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice", 
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index 78c5682..b1dab50 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -16,6 +16,7 @@
 from erpnext.accounts.doctype.gl_entry.gl_entry import update_outstanding_amt
 from erpnext.buying.utils import check_for_closed_status
 from erpnext.accounts.general_ledger import get_round_off_account_and_cost_center
+from frappe.model.mapper import get_mapped_doc
 
 form_grid_templates = {
 	"items": "templates/form_grid/item_grid.html"
@@ -77,8 +78,10 @@
 		if not self.cash_bank_account and flt(self.paid_amount):
 			frappe.throw(_("Cash or Bank Account is mandatory for making payment entry"))
 
-		if flt(self.paid_amount) + flt(self.write_off_amount) \
-				- flt(self.grand_total) > 1/(10**(self.precision("base_grand_total") + 1)):
+		if (flt(self.paid_amount) + flt(self.write_off_amount)
+			- flt(self.get("rounded_total") or self.grand_total)
+			> 1/(10**(self.precision("base_grand_total") + 1))):
+
 			frappe.throw(_("""Paid amount + Write Off Amount can not be greater than Grand Total"""))
 
 	def create_remarks(self):
@@ -93,7 +96,7 @@
 		if not self.credit_to:
 			self.credit_to = get_party_account("Supplier", self.supplier, self.company)
 		if not self.due_date:
-			self.due_date = get_due_date(self.posting_date, "Supplier", self.supplier, self.company)
+			self.due_date = get_due_date(self.posting_date, "Supplier", self.supplier)
 
 		super(PurchaseInvoice, self).set_missing_values(for_validate)
 
@@ -359,9 +362,30 @@
 		return gl_entries
 
 	def make_supplier_gl_entry(self, gl_entries):
-		if self.grand_total:
+		grand_total = self.rounded_total or self.grand_total
+		if self.get("payment_schedule"):
+			for d in self.get("payment_schedule"):
+				payment_amount_in_company_currency = flt(d.payment_amount * self.conversion_rate,
+					d.precision("payment_amount"))
+
+				gl_entries.append(
+					self.get_gl_dict({
+						"account": self.credit_to,
+						"party_type": "Supplier",
+						"party": self.supplier,
+						"due_date": d.due_date,
+						"against": self.against_expense_account,
+						"credit": payment_amount_in_company_currency,
+						"credit_in_account_currency": payment_amount_in_company_currency \
+							if self.party_account_currency==self.company_currency else d.payment_amount,
+						"against_voucher": self.return_against if cint(self.is_return) else self.name,
+						"against_voucher_type": self.doctype
+					}, self.party_account_currency)
+				)
+
+		elif grand_total:
 			# Didnot use base_grand_total to book rounding loss gle
-			grand_total_in_company_currency = flt(self.grand_total * self.conversion_rate,
+			grand_total_in_company_currency = flt(grand_total * self.conversion_rate,
 				self.precision("grand_total"))
 			gl_entries.append(
 				self.get_gl_dict({
@@ -371,7 +395,7 @@
 					"against": self.against_expense_account,
 					"credit": grand_total_in_company_currency,
 					"credit_in_account_currency": grand_total_in_company_currency \
-						if self.party_account_currency==self.company_currency else self.grand_total,
+						if self.party_account_currency==self.company_currency else grand_total,
 					"against_voucher": self.return_against if cint(self.is_return) else self.name,
 					"against_voucher_type": self.doctype,
 				}, self.party_account_currency)
@@ -705,3 +729,22 @@
 			filters={"parent": asset_category, "company_name": company}, fieldname="fixed_asset_account")
 
 	return account
+
+@frappe.whitelist()
+def make_stock_entry(source_name, target_doc=None):
+	doc = get_mapped_doc("Purchase Invoice", source_name, {
+		"Purchase Invoice": {
+			"doctype": "Stock Entry",
+			"validation": {
+				"docstatus": ["=", 1]
+			}
+		},
+		"Purchase Invoice Item": {
+			"doctype": "Stock Entry Detail",
+			"field_map": {
+				"stock_qty": "transfer_qty"
+			},
+		}
+	}, target_doc)
+
+	return doc
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.js
index e01dda3..db71a17 100644
--- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.js
@@ -1,7 +1,7 @@
-QUnit.module('Purchaes Invoice');
+QUnit.module('Purchase Invoice');
 
 QUnit.test("test purchase invoice", function(assert) {
-	assert.expect(4);
+	assert.expect(6);
 	let done = assert.async();
 	frappe.run_serially([
 		() => {
@@ -20,7 +20,8 @@
 				{contact_person: 'Contact 3-Test Supplier'},
 				{taxes_and_charges: 'TEST In State GST'},
 				{tc_name: 'Test Term 1'},
-				{terms: 'This is Test'}
+				{terms: 'This is Test'},
+				{payment_terms_template: '_Test Payment Term Template UI'}
 			]);
 		},
 		() => cur_frm.save(),
@@ -34,6 +35,9 @@
 			// grand_total Calculated
 			assert.ok(cur_frm.doc.grand_total==590, "Grad Total correct");
 
+			assert.ok(cur_frm.doc.payment_terms_template, "Payment Terms Template is correct");
+			assert.ok(cur_frm.doc.payment_schedule.length > 0, "Payment Term Schedule is not empty");
+
 		},
 		() => frappe.tests.click_button('Submit'),
 		() => frappe.tests.click_button('Yes'),
diff --git a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
index 474329f..3ac521a 100644
--- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
@@ -6,15 +6,16 @@
 import unittest
 import frappe, erpnext
 import frappe.model
-from frappe.utils import cint, flt, today, nowdate
+from frappe.utils import cint, flt, today, nowdate, getdate, add_days
 import frappe.defaults
 from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory, \
 	test_records as pr_test_records
+from erpnext.controllers.accounts_controller import get_payment_terms
 from erpnext.exceptions import InvalidCurrency
 from erpnext.stock.doctype.stock_entry.test_stock_entry import get_qty_after_transaction
 from erpnext.accounts.doctype.account.test_account import get_inventory_account
 
-test_dependencies = ["Item", "Cost Center"]
+test_dependencies = ["Item", "Cost Center", "Payment Term", "Payment Terms Template"]
 test_ignore = ["Serial No"]
 
 class TestPurchaseInvoice(unittest.TestCase):
@@ -35,7 +36,7 @@
 		dl = wrapper
 
 		expected_gl_entries = {
-			"_Test Payable - _TC": [0, 1512.30],
+			"_Test Payable - _TC": [0, 1512.0],
 			"_Test Account Cost for Goods Sold - _TC": [1250, 0],
 			"_Test Account Shipping Charges - _TC": [100, 0],
 			"_Test Account Excise Duty - _TC": [140, 0],
@@ -44,6 +45,7 @@
 			"_Test Account CST - _TC": [29.88, 0],
 			"_Test Account VAT - _TC": [156.25, 0],
 			"_Test Account Discount - _TC": [0, 168.03],
+			"Round Off - _TC": [0, 0.3]
 		}
 		gl_entries = frappe.db.sql("""select account, debit, credit from `tabGL Entry`
 			where voucher_type = 'Purchase Invoice' and voucher_no = %s""", dl.name, as_dict=1)
@@ -61,6 +63,12 @@
 
 		set_perpetual_inventory(0, pi.company)
 
+	def test_terms_added_after_save(self):
+		pi = frappe.copy_doc(test_records[1])
+		pi.insert()
+		self.assertTrue(pi.payment_schedule)
+		self.assertEqual(pi.payment_schedule[0].due_date, pi.due_date)
+
 	def test_payment_entry_unlink_against_purchase_invoice(self):
 		from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_payment_entry
 		unlink_payment_on_cancel_of_invoice(0)
@@ -233,6 +241,7 @@
 		jv.submit()
 
 		pi = frappe.copy_doc(test_records[0])
+		pi.disable_rounded_total = 1
 		pi.append("advances", {
 			"reference_type": "Journal Entry",
 			"reference_name": jv.name,
@@ -242,6 +251,14 @@
 			"remarks": jv.remark
 		})
 		pi.insert()
+
+		self.assertEqual(pi.outstanding_amount, 1212.30)
+
+		pi.disable_rounded_total = 0
+		pi.get("payment_schedule")[0].payment_amount = 1512.0
+		pi.save()
+		self.assertEqual(pi.outstanding_amount, 1212.0)
+
 		pi.submit()
 		pi.load_from_db()
 
@@ -249,13 +266,61 @@
 			where reference_type='Purchase Invoice'
 			and reference_name=%s and debit_in_account_currency=300""", pi.name))
 
-		self.assertEqual(pi.outstanding_amount, 1212.30)
-
 		pi.cancel()
 
 		self.assertFalse(frappe.db.sql("""select name from `tabJournal Entry Account`
 			where reference_type='Purchase Invoice' and reference_name=%s""", pi.name))
 
+	def test_invoice_with_advance_and_multi_payment_terms(self):
+		from erpnext.accounts.doctype.journal_entry.test_journal_entry \
+			import test_records as jv_test_records
+
+		jv = frappe.copy_doc(jv_test_records[1])
+		jv.insert()
+		jv.submit()
+
+		pi = frappe.copy_doc(test_records[0])
+		pi.disable_rounded_total = 1
+		pi.append("advances", {
+			"reference_type": "Journal Entry",
+			"reference_name": jv.name,
+			"reference_row": jv.get("accounts")[0].name,
+			"advance_amount": 400,
+			"allocated_amount": 300,
+			"remarks": jv.remark
+		})
+		pi.insert()
+
+		pi.update({
+			"payment_schedule": get_payment_terms("_Test Payment Term Template",
+				pi.posting_date, pi.grand_total)
+		})
+
+		pi.save()
+		pi.submit()
+		self.assertEqual(pi.payment_schedule[0].payment_amount, 756.15)
+		self.assertEqual(pi.payment_schedule[0].due_date, pi.posting_date)
+		self.assertEqual(pi.payment_schedule[1].payment_amount, 756.15)
+		self.assertEqual(pi.payment_schedule[1].due_date, add_days(pi.posting_date, 30))
+
+		pi.load_from_db()
+
+		self.assertTrue(
+			frappe.db.sql(
+				"select name from `tabJournal Entry Account` where reference_type='Purchase Invoice' and "
+				"reference_name=%s and debit_in_account_currency=300", pi.name)
+		)
+
+		self.assertEqual(pi.outstanding_amount, 1212.30)
+
+		pi.cancel()
+
+		self.assertFalse(
+			frappe.db.sql(
+				"select name from `tabJournal Entry Account` where reference_type='Purchase Invoice' and "
+				"reference_name=%s", pi.name)
+		)
+
 	def test_total_purchase_cost_for_project(self):
 		existing_purchase_cost = frappe.db.sql("""select sum(base_net_amount)
 			from `tabPurchase Invoice Item` where project = '_Test Project' and docstatus=1""")
@@ -491,7 +556,7 @@
 		pi.load_from_db()
 		
 		#check outstanding after advance allocation
-		self.assertEqual(flt(pi.outstanding_amount), flt(pi.grand_total - pi.total_advance))
+		self.assertEqual(flt(pi.outstanding_amount), flt(pi.rounded_total - pi.total_advance))
 		
 		#added to avoid Document has been modified exception
 		jv = frappe.get_doc("Journal Entry", jv.name)
@@ -499,7 +564,7 @@
 		
 		pi.load_from_db()
 		#check outstanding after advance cancellation
-		self.assertEqual(flt(pi.outstanding_amount), flt(pi.grand_total + pi.total_advance))
+		self.assertEqual(flt(pi.outstanding_amount), flt(pi.rounded_total + pi.total_advance))
 
 	def test_outstanding_amount_after_advance_payment_entry_cancelation(self):
 		pe = frappe.get_doc({
@@ -521,7 +586,7 @@
 		})
 		pe.insert()
 		pe.submit()
-		
+
 		pi = frappe.copy_doc(test_records[0])
 		pi.is_pos = 0
 		pi.append("advances", {
@@ -534,19 +599,102 @@
 		})
 		pi.insert()
 		pi.submit()
-		
+
 		pi.load_from_db()
 
 		#check outstanding after advance allocation
-		self.assertEqual(flt(pi.outstanding_amount), flt(pi.grand_total - pi.total_advance))
-		
+		self.assertEqual(flt(pi.outstanding_amount), flt(pi.rounded_total - pi.total_advance))
+
 		#added to avoid Document has been modified exception
 		pe = frappe.get_doc("Payment Entry", pe.name)
 		pe.cancel()
-		
+
 		pi.load_from_db()
 		#check outstanding after advance cancellation
-		self.assertEqual(flt(pi.outstanding_amount), flt(pi.grand_total + pi.total_advance))
+		self.assertEqual(flt(pi.outstanding_amount), flt(pi.rounded_total + pi.total_advance))
+
+	def test_purchase_invoice_with_shipping_rule(self):
+		from erpnext.accounts.doctype.shipping_rule.test_shipping_rule \
+			import create_shipping_rule
+
+		shipping_rule = create_shipping_rule(shipping_rule_type = "Buying", shipping_rule_name = "Shipping Rule - Purchase Invoice Test")
+
+		pi = frappe.copy_doc(test_records[0])
+		
+		pi.shipping_rule = shipping_rule.name
+		pi.insert()
+
+		shipping_amount = 0.0
+		for condition in shipping_rule.get("conditions"):
+			if not condition.to_value or (flt(condition.from_value) <= pi.net_total <= flt(condition.to_value)):
+				shipping_amount = condition.shipping_amount
+
+		shipping_charge = {
+			"doctype": "Purchase Taxes and Charges",
+			"category": "Valuation and Total",
+			"charge_type": "Actual",
+			"account_head": shipping_rule.account,
+			"cost_center": shipping_rule.cost_center,
+			"tax_amount": shipping_amount,
+			"description": shipping_rule.name,
+			"add_deduct_tax": "Add"
+		}	
+		pi.append("taxes", shipping_charge)
+		pi.save()
+
+		self.assertEquals(pi.net_total, 1250)
+
+		self.assertEquals(pi.total_taxes_and_charges, 462.3)
+		self.assertEquals(pi.grand_total, 1712.3)	
+
+	def test_gl_entry_based_on_payment_schedule(self):
+		pi = make_purchase_invoice(do_not_save=True, supplier="_Test Supplier P")
+		pi.append("payment_schedule", {
+			"due_date": add_days(nowdate(), 15),
+			"payment_amount": 100,
+			"invoice_portion": 40.00
+		})
+		pi.append("payment_schedule", {
+			"due_date": add_days(nowdate(), 25),
+			"payment_amount": 150,
+			"invoice_portion": 60.00
+		})
+
+		pi.save()
+		pi.submit()
+
+		gl_entries = frappe.db.sql("""select account, debit, credit, due_date
+			from `tabGL Entry` where voucher_type='Purchase Invoice' and voucher_no=%s
+			order by account asc, debit asc""", pi.name, as_dict=1)
+		self.assertTrue(gl_entries)
+
+		expected_gl_entries = sorted([
+			[pi.credit_to, 0.0, 100.0, add_days(nowdate(), 15)],
+			[pi.credit_to, 0.0, 150.0, add_days(nowdate(), 25)],
+			["_Test Account Cost for Goods Sold - _TC", 250.0, 0.0, None]
+		])
+
+		for i, gle in enumerate(sorted(gl_entries, key=lambda gle: gle.account)):
+			self.assertEquals(expected_gl_entries[i][0], gle.account)
+			self.assertEquals(expected_gl_entries[i][1], gle.debit)
+			self.assertEquals(expected_gl_entries[i][2], gle.credit)
+			self.assertEquals(getdate(expected_gl_entries[i][3]), getdate(gle.due_date))
+
+	def test_make_pi_without_terms(self):
+		pi = make_purchase_invoice(do_not_save=1)
+
+		self.assertFalse(pi.get('payment_schedule'))
+
+		pi.insert()
+
+		self.assertTrue(pi.get('payment_schedule'))
+
+	def test_duplicate_due_date_in_terms(self):
+		pi = make_purchase_invoice(do_not_save=1)
+		pi.append('payment_schedule', dict(due_date='2017-01-01', invoice_portion=50.00, payment_amount=50))
+		pi.append('payment_schedule', dict(due_date='2017-01-01', invoice_portion=50.00, payment_amount=50))
+
+		self.assertRaises(frappe.ValidationError, pi.insert)
 
 def unlink_payment_on_cancel_of_invoice(enable=1):
 	accounts_settings = frappe.get_doc("Accounts Settings")
diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
index 36e5a1d..6646506 100755
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -13,6 +13,7 @@
  "editable_grid": 1, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -44,6 +45,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -71,6 +73,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -101,6 +104,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -130,6 +134,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -162,6 +167,7 @@
    "width": "300px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -191,6 +197,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -221,6 +228,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -249,6 +257,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -278,6 +287,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -308,6 +318,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -337,6 +348,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -367,6 +379,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -394,6 +407,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -412,17 +426,19 @@
    "no_copy": 0, 
    "options": "UOM", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -436,21 +452,23 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Conversion Factor", 
+   "label": "UOM Conversion Factor", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -474,12 +492,13 @@
    "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -507,6 +526,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -536,6 +556,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -565,6 +586,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -592,6 +614,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -621,6 +644,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -648,6 +672,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -679,6 +704,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -710,6 +736,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -737,6 +764,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -768,6 +796,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -799,6 +828,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -828,6 +858,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -856,6 +887,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -886,6 +918,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -916,6 +949,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -944,6 +978,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -974,6 +1009,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1004,6 +1040,157 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "item_weight_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Weight Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "weight_per_unit", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Weight Per Unit", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_weight", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Weight", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_38", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "weight_uom", 
+   "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": "Weight UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1033,6 +1220,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1064,6 +1252,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1094,6 +1283,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1125,6 +1315,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1155,6 +1346,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1184,6 +1376,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1213,6 +1406,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1242,6 +1436,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1270,6 +1465,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1303,6 +1499,7 @@
    "width": "120px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1330,6 +1527,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1359,6 +1557,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1394,6 +1593,7 @@
    "width": "120px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1422,6 +1622,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1451,6 +1652,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1481,6 +1683,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1513,6 +1716,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1544,6 +1748,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1575,6 +1780,7 @@
    "width": "150px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1606,6 +1812,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1636,6 +1843,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1663,6 +1871,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1692,6 +1901,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1723,6 +1933,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1753,6 +1964,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1784,6 +1996,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1812,6 +2025,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1842,6 +2056,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1871,6 +2086,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1900,6 +2116,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1939,7 +2156,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-04-19 11:54:16.112134", 
+ "modified": "2017-11-30 14:21:00.962126", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice Item", 
@@ -1953,4 +2170,4 @@
  "sort_order": "DESC", 
  "track_changes": 0, 
  "track_seen": 0
-}
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
index dd9d56d..e620065 100644
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
+++ b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
@@ -679,7 +679,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-12-05 13:37:44.483509", 
+ "modified": "2017-12-06 13:37:44.483509", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Taxes and Charges", 
diff --git a/erpnext/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py
index 36c2365..63db16c 100644
--- a/erpnext/accounts/doctype/sales_invoice/pos.py
+++ b/erpnext/accounts/doctype/sales_invoice/pos.py
@@ -16,6 +16,8 @@
 	doc = frappe.new_doc('Sales Invoice')
 	doc.is_pos = 1;
 	pos_profile = get_pos_profile(doc.company) or {}
+	if not pos_profile:
+		frappe.throw(_("POS Profile is required to use Point-of-Sale"))
 	if not doc.company: doc.company = pos_profile.get('company')
 	doc.update_stock = pos_profile.get('update_stock')
 
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 28a5d01..754fc6b 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -95,8 +95,9 @@
 
 		// Show buttons only when pos view is active
 		if (cint(doc.docstatus==0) && cur_frm.page.current_view_name!=="pos" && !doc.is_return) {
-			cur_frm.cscript.sales_order_btn();
-			cur_frm.cscript.delivery_note_btn();
+			this.frm.cscript.sales_order_btn();
+			this.frm.cscript.delivery_note_btn();
+			this.frm.cscript.quotation_btn();
 		}
 
 		this.set_default_print_format();
@@ -158,6 +159,26 @@
 			}, __("Get items from"));
 	},
 
+	quotation_btn: function() {
+		var me = this;
+		this.$quotation_btn = this.frm.add_custom_button(__('Quotation'),
+			function() {
+				erpnext.utils.map_current_doc({
+					method: "erpnext.selling.doctype.quotation.quotation.make_sales_invoice",
+					source_doctype: "Quotation",
+					target: me.frm,
+					setters: {
+						customer: me.frm.doc.customer || undefined,
+					},
+					get_query_filters: {
+						docstatus: 1,
+						status: ["!=", "Lost"],
+						company: me.frm.doc.company
+					}
+				})
+			}, __("Get items from"));
+	},
+
 	delivery_note_btn: function() {
 		var me = this;
 		this.$delivery_note_btn = this.frm.add_custom_button(__('Delivery Note'),
@@ -277,7 +298,7 @@
 		var row = locals[cdt][cdn];
 		if(row.asset) {
 			frappe.call({
-				method: erpnext.accounts.doctype.asset.depreciation.get_disposal_account_and_cost_center,
+				method: erpnext.assets.doctype.asset.depreciation.get_disposal_account_and_cost_center,
 				args: {
 					"company": frm.doc.company
 				},
@@ -290,6 +311,14 @@
 	},
 
 	is_pos: function(frm){
+		this.set_pos_data();
+	},
+
+	pos_profile: function() {
+		this.set_pos_data();
+	},
+
+	set_pos_data: function() {
 		if(this.frm.doc.is_pos) {
 			if(!this.frm.doc.company) {
 				this.frm.set_value("is_pos", 0);
@@ -302,7 +331,7 @@
 					callback: function(r) {
 						if(!r.exc) {
 							if(r.message && r.message.print_format) {
-								frm.pos_print_format = r.message.print_format;
+								me.frm.pos_print_format = r.message.print_format;
 							}
 							me.frm.script_manager.trigger("update_stock");
 							frappe.model.set_default_values(me.frm.doc);
@@ -519,6 +548,19 @@
 				}
 			};
 		});
+
+		frm.set_query('pos_profile', function(doc) {
+			if(!doc.company) {
+				frappe.throw(_('Please set Company'));
+			}
+
+			return {
+				query: 'erpnext.accounts.doctype.pos_profile.pos_profile.pos_profile_query',
+				filters: {
+					company: doc.company
+				}
+			};
+		});
 	},
 	//When multiple companies are set up. in case company name is changed set default company address
 	company:function(frm){
@@ -586,3 +628,4 @@
 
 	refresh_field('total_billing_amount')
 }
+
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index ecd7cf9..b85c623 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -1,4535 +1,4665 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "naming_series:", 
- "beta": 0, 
- "creation": "2013-05-24 19:29:05", 
- "custom": 0, 
- "default_print_format": "", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 1,
+ "allow_rename": 0,
+ "autoname": "naming_series:",
+ "beta": 0,
+ "creation": "2013-05-24 19:29:05",
+ "custom": 0,
+ "default_print_format": "",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 0,
+ "engine": "InnoDB",
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "customer_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "fa fa-user", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "customer_section",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "",
+   "length": 0,
+   "no_copy": 0,
+   "options": "fa fa-user",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "{customer_name}", 
-   "fieldname": "title", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Title", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 1,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "{customer_name}",
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Title",
+   "length": 0,
+   "no_copy": 1,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "naming_series", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Series", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "naming_series", 
-   "oldfieldtype": "Select", 
-   "options": "SINV-\nSINV-RET-", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 1, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "naming_series",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Series",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "naming_series",
+   "oldfieldtype": "Select",
+   "options": "SINV-\nSINV-RET-",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 1,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "customer", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Customer", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "customer", 
-   "oldfieldtype": "Link", 
-   "options": "Customer", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "customer",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 1,
+   "label": "Customer",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "customer",
+   "oldfieldtype": "Link",
+   "options": "Customer",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 1,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "customer", 
-   "fieldname": "customer_name", 
-   "fieldtype": "Data", 
-   "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": "Customer Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "customer_name", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "customer",
+   "fieldname": "customer_name",
+   "fieldtype": "Data",
+   "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": "Customer Name",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "customer_name",
+   "oldfieldtype": "Data",
+   "options": "customer.customer_name",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "tax_id", 
-   "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": "Tax Id", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "tax_id",
+   "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": "Tax Id",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "project", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Project", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "project_name", 
-   "oldfieldtype": "Link", 
-   "options": "Project", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "project",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 1,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Project",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "project_name",
+   "oldfieldtype": "Link",
+   "options": "Project",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "is_pos", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Include Payment (POS)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "is_pos", 
-   "oldfieldtype": "Check", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "is_pos",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Include Payment (POS)",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "is_pos",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "offline_pos_name", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Offline POS Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "is_pos",
+   "fieldname": "pos_profile",
+   "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": "POS Profile",
+   "length": 0,
+   "no_copy": 0,
+   "options": "POS Profile",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "pos_profile", 
-   "fieldtype": "Link", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "POS Profile", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "POS Profile", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "offline_pos_name",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Offline POS Name",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break1", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break1",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Column Break",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "company", 
-   "oldfieldtype": "Link", 
-   "options": "Company", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 1, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 1,
+   "label": "Company",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "company",
+   "oldfieldtype": "Link",
+   "options": "Company",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 1,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Today", 
-   "fieldname": "posting_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Date", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "posting_date", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "Today",
+   "fieldname": "posting_date",
+   "fieldtype": "Date",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Date",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "posting_date",
+   "oldfieldtype": "Date",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 1,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "posting_time", 
-   "fieldtype": "Time", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Posting Time", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "posting_time", 
-   "oldfieldtype": "Time", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "posting_time",
+   "fieldtype": "Time",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Posting Time",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "posting_time",
+   "oldfieldtype": "Time",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.docstatus==0", 
-   "fieldname": "set_posting_time", 
-   "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": "Edit Posting Date and Time", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:doc.docstatus==0",
+   "fieldname": "set_posting_time",
+   "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": "Edit Posting Date and Time",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "due_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": "Payment Due Date", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "due_date", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "due_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": "Payment Due Date",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "due_date",
+   "oldfieldtype": "Date",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "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, 
-   "oldfieldname": "amended_from", 
-   "oldfieldtype": "Link", 
-   "options": "Sales Invoice", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 1,
+   "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,
+   "oldfieldname": "amended_from",
+   "oldfieldtype": "Link",
+   "options": "Sales Invoice",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "is_return", 
-   "fieldname": "returns", 
-   "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": "Returns", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "is_return",
+   "fieldname": "returns",
+   "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": "Returns",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "is_return", 
-   "fieldname": "is_return", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Is Return", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "is_return",
+   "fieldname": "is_return",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Is Return",
+   "length": 0,
+   "no_copy": 1,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "is_return", 
-   "fieldname": "return_against", 
-   "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": "Return Against Sales Invoice", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Sales Invoice", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "is_return",
+   "fieldname": "return_against",
+   "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": "Return Against Sales Invoice",
+   "length": 0,
+   "no_copy": 1,
+   "options": "Sales Invoice",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "address_and_contact", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Address and Contact", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "columns": 0,
+   "depends_on": "",
+   "fieldname": "address_and_contact",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Address and Contact",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "customer_address", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Customer Address", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Address", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "customer_address",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Customer Address",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Address",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "address_display", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Address", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "address_display",
+   "fieldtype": "Small Text",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Address",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "contact_person", 
-   "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": "Contact Person", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Contact", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "contact_person",
+   "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": "Contact Person",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Contact",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "contact_display", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Contact", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "contact_display",
+   "fieldtype": "Small Text",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Contact",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "contact_mobile", 
-   "fieldtype": "Small Text", 
-   "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": "Mobile No", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "contact_mobile",
+   "fieldtype": "Small Text",
+   "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": "Mobile No",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "contact_email", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Contact Email", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Email", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "contact_email",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Contact Email",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Email",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "territory", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Territory", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Territory", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "territory",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Territory",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Territory",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "col_break4", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "col_break4",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "shipping_address_name", 
-   "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": "Shipping Address Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Address", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "shipping_address_name",
+   "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": "Shipping Address Name",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Address",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "shipping_address", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Shipping Address", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "shipping_address",
+   "fieldtype": "Small Text",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Shipping Address",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "company_address", 
-   "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": "Company Address Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Address", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "company_address",
+   "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": "Company Address Name",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Address",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "company_address_display", 
-   "fieldtype": "Small Text", 
-   "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": "Company Address", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "company_address_display",
+   "fieldtype": "Small Text",
+   "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": "Company Address",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "depends_on": "customer", 
-   "fieldname": "currency_and_price_list", 
-   "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": "Currency and Price List", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "columns": 0,
+   "depends_on": "customer",
+   "fieldname": "currency_and_price_list",
+   "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": "Currency and Price List",
+   "length": 0,
+   "no_copy": 0,
+   "options": "",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "currency", 
-   "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": "Currency", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "currency", 
-   "oldfieldtype": "Select", 
-   "options": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "currency",
+   "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": "Currency",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "currency",
+   "oldfieldtype": "Select",
+   "options": "Currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Rate at which Customer Currency is converted to customer's base currency", 
-   "fieldname": "conversion_rate", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Exchange Rate", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "conversion_rate", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "precision": "9", 
-   "print_hide": 1, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "Rate at which Customer Currency is converted to customer's base currency",
+   "fieldname": "conversion_rate",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Exchange Rate",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "conversion_rate",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
+   "precision": "9",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break2",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "selling_price_list", 
-   "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": "Price List", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "price_list_name", 
-   "oldfieldtype": "Select", 
-   "options": "Price List", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "selling_price_list",
+   "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": "Price List",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "price_list_name",
+   "oldfieldtype": "Select",
+   "options": "Price List",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "price_list_currency", 
-   "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": "Price List Currency", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "price_list_currency",
+   "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": "Price List Currency",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Rate at which Price list currency is converted to customer's base currency", 
-   "fieldname": "plc_conversion_rate", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Price List Exchange Rate", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "9", 
-   "print_hide": 1, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "Rate at which Price list currency is converted to customer's base currency",
+   "fieldname": "plc_conversion_rate",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Price List Exchange Rate",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "9",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "ignore_pricing_rule", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Ignore Pricing Rule", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 1, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "ignore_pricing_rule",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Ignore Pricing Rule",
+   "length": 0,
+   "no_copy": 1,
+   "permlevel": 1,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "items_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "fa fa-shopping-cart", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "items_section",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-shopping-cart",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "update_stock", 
-   "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": "Update Stock", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "update_stock", 
-   "oldfieldtype": "Check", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "update_stock",
+   "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": "Update Stock",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "update_stock",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "items", 
-   "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": "Items", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "entries", 
-   "oldfieldtype": "Table", 
-   "options": "Sales Invoice Item", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "items",
+   "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": "Items",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "entries",
+   "oldfieldtype": "Table",
+   "options": "Sales Invoice Item",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "packing_list", 
-   "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": "Packing List", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "fa fa-suitcase", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "packing_list",
+   "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": "Packing List",
+   "length": 0,
+   "no_copy": 0,
+   "options": "fa fa-suitcase",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "packed_items", 
-   "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": "Packed Items", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Packed Item", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "packed_items",
+   "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": "Packed Items",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Packed Item",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "product_bundle_help", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Product Bundle Help", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "product_bundle_help",
+   "fieldtype": "HTML",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Product Bundle Help",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "eval:doc.total_billing_amount > 0", 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "time_sheet_list", 
-   "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": "Time Sheet List", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "collapsible_depends_on": "eval:doc.total_billing_amount > 0",
+   "columns": 0,
+   "depends_on": "",
+   "fieldname": "time_sheet_list",
+   "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": "Time Sheet List",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "timesheets", 
-   "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": "Time Sheets", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Sales Invoice Timesheet", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "timesheets",
+   "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": "Time Sheets",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Sales Invoice Timesheet",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "fieldname": "total_billing_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Total Billing Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "2", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "0",
+   "fieldname": "total_billing_amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Total Billing Amount",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "2",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_30", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "section_break_30",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_total", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Total (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "base_total",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Total (Company Currency)",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_net_total", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Net Total (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "net_total", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "base_net_total",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Net Total (Company Currency)",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "net_total",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_32", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_32",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "total", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Total", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "currency", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "total",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Total",
+   "length": 0,
+   "no_copy": 0,
+   "options": "currency",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "net_total", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Net Total", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "currency", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "net_total",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Net Total",
+   "length": 0,
+   "no_copy": 0,
+   "options": "currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "taxes_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "fa fa-money", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "total_net_weight",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Total Net Weight",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "taxes_and_charges", 
-   "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": "Taxes and Charges", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "charge", 
-   "oldfieldtype": "Link", 
-   "options": "Sales Taxes and Charges Template", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "taxes_section",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-money",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_38", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "taxes_and_charges",
+   "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": "Taxes and Charges",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "charge",
+   "oldfieldtype": "Link",
+   "options": "Sales Taxes and Charges Template",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "shipping_rule", 
-   "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": "Shipping Rule", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Button", 
-   "options": "Shipping Rule", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_38",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_40", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "shipping_rule",
+   "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": "Shipping Rule",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Button",
+   "options": "Shipping Rule",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "taxes", 
-   "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": "Sales Taxes and Charges", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "other_charges", 
-   "oldfieldtype": "Table", 
-   "options": "Sales Taxes and Charges", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "section_break_40",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "sec_tax_breakup", 
-   "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": "Tax Breakup", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "taxes",
+   "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": "Sales Taxes and Charges",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "other_charges",
+   "oldfieldtype": "Table",
+   "options": "Sales Taxes and Charges",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "other_charges_calculation", 
-   "fieldtype": "Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Taxes and Charges Calculation", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldtype": "HTML", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "columns": 0,
+   "fieldname": "sec_tax_breakup",
+   "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": "Tax Breakup",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_43", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "other_charges_calculation",
+   "fieldtype": "Text",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Taxes and Charges Calculation",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldtype": "HTML",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_total_taxes_and_charges", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Total Taxes and Charges (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "other_charges_total", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "section_break_43",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_47", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "base_total_taxes_and_charges",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Total Taxes and Charges (Company Currency)",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "other_charges_total",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "total_taxes_and_charges", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Total Taxes and Charges", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "currency", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_47",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "discount_amount", 
-   "columns": 0, 
-   "fieldname": "section_break_49", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Additional Discount", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "total_taxes_and_charges",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Total Taxes and Charges",
+   "length": 0,
+   "no_copy": 0,
+   "options": "currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Grand Total", 
-   "fieldname": "apply_discount_on", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Apply Additional Discount On", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nGrand Total\nNet Total", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "collapsible_depends_on": "discount_amount",
+   "columns": 0,
+   "fieldname": "section_break_49",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Additional Discount",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_discount_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Additional Discount Amount (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "Grand Total",
+   "fieldname": "apply_discount_on",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Apply Additional Discount On",
+   "length": 0,
+   "no_copy": 0,
+   "options": "\nGrand Total\nNet Total",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_51", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "base_discount_amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Additional Discount Amount (Company Currency)",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "additional_discount_percentage", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Additional Discount Percentage", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_51",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "discount_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Additional Discount Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "additional_discount_percentage",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Additional Discount Percentage",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "totals", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "fa fa-money", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "discount_amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Additional Discount Amount",
+   "length": 0,
+   "no_copy": 0,
+   "options": "currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_grand_total", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Grand Total (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "grand_total", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "totals",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-money",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_rounding_adjustment", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Rounding Adjustment (Company Currency)", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "base_grand_total",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Grand Total (Company Currency)",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "grand_total",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_rounded_total", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Rounded Total (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "rounded_total", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "base_rounding_adjustment",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Rounding Adjustment (Company Currency)",
+   "length": 0,
+   "no_copy": 1,
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "In Words will be visible once you save the Sales Invoice.", 
-   "fieldname": "base_in_words", 
-   "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": "In Words (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "in_words", 
-   "oldfieldtype": "Data", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "base_rounded_total",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Rounded Total (Company Currency)",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "rounded_total",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break5", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "In Words will be visible once you save the Sales Invoice.",
+   "fieldname": "base_in_words",
+   "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": "In Words (Company Currency)",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "in_words",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break5",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Column Break",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "grand_total", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Grand Total", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "grand_total_export", 
-   "oldfieldtype": "Currency", 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "grand_total",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Grand Total",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "grand_total_export",
+   "oldfieldtype": "Currency",
+   "options": "currency",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "rounding_adjustment", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Rounding Adjustment", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "rounding_adjustment",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Rounding Adjustment",
+   "length": 0,
+   "no_copy": 1,
+   "options": "currency",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "rounded_total", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Rounded Total", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "rounded_total_export", 
-   "oldfieldtype": "Currency", 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "rounded_total",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Rounded Total",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "rounded_total_export",
+   "oldfieldtype": "Currency",
+   "options": "currency",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "in_words", 
-   "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": "In Words", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "in_words_export", 
-   "oldfieldtype": "Data", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "in_words",
+   "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": "In Words",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "in_words_export",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "total_advance", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Total Advance", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "total_advance", 
-   "oldfieldtype": "Currency", 
-   "options": "party_account_currency", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "total_advance",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Total Advance",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "total_advance",
+   "oldfieldtype": "Currency",
+   "options": "party_account_currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "outstanding_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Outstanding Amount", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "outstanding_amount", 
-   "oldfieldtype": "Currency", 
-   "options": "party_account_currency", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "outstanding_amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Outstanding Amount",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "outstanding_amount",
+   "oldfieldtype": "Currency",
+   "options": "party_account_currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "advances", 
-   "columns": 0, 
-   "fieldname": "advances_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Advance Payments", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "fa fa-money", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "collapsible_depends_on": "advances",
+   "columns": 0,
+   "fieldname": "advances_section",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Advance Payments",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-money",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "get_advances", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Get Advances Received", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Button", 
-   "options": "", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "get_advances",
+   "fieldtype": "Button",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Get Advances Received",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Button",
+   "options": "",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "advances", 
-   "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": "Advances", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "advance_adjustment_details", 
-   "oldfieldtype": "Table", 
-   "options": "Sales Invoice Advance", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "advances",
+   "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": "Advances",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "advance_adjustment_details",
+   "oldfieldtype": "Table",
+   "options": "Sales Invoice Advance",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "collapsible_depends_on": "", 
-   "columns": 0, 
-   "depends_on": "eval:doc.is_pos===1||(doc.advances && doc.advances.length>0)", 
-   "fieldname": "payments_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Payments", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "fa fa-money", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "collapsible_depends_on": "eval:(!doc.is_pos && !doc.is_return)",
+   "columns": 0,
+   "fieldname": "payment_schedule_section",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Payment Terms",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "is_pos", 
-   "fieldname": "cash_bank_account", 
-   "fieldtype": "Link", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Cash/Bank Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "cash_bank_account", 
-   "oldfieldtype": "Link", 
-   "options": "Account", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:(!doc.is_pos && !doc.is_return)",
+   "fieldname": "payment_terms_template",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Payment Terms Template",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Payment Terms Template",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.is_pos===1", 
-   "fieldname": "payments", 
-   "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": "Sales Invoice Payment", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Sales Invoice Payment", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:(!doc.is_pos && !doc.is_return)",
+   "fieldname": "payment_schedule",
+   "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": "Payment Schedule",
+   "length": 0,
+   "no_copy": 1,
+   "options": "Payment Schedule",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_84", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": "",
+   "columns": 0,
+   "depends_on": "eval:doc.is_pos===1||(doc.advances && doc.advances.length>0)",
+   "fieldname": "payments_section",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Payments",
+   "length": 0,
+   "no_copy": 0,
+   "options": "fa fa-money",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_paid_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Paid Amount (Company Currency)", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "is_pos",
+   "fieldname": "cash_bank_account",
+   "fieldtype": "Link",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Cash/Bank Account",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "cash_bank_account",
+   "oldfieldtype": "Link",
+   "options": "Account",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_86", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:doc.is_pos===1",
+   "fieldname": "payments",
+   "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": "Sales Invoice Payment",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Sales Invoice Payment",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "is_pos", 
-   "fieldname": "paid_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Paid Amount", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "paid_amount", 
-   "oldfieldtype": "Currency", 
-   "options": "currency", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "section_break_84",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_88", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "base_paid_amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Paid Amount (Company Currency)",
+   "length": 0,
+   "no_copy": 1,
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_change_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Base Change Amount (Company Currency)", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_86",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_90", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "is_pos",
+   "fieldname": "paid_amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Paid Amount",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "paid_amount",
+   "oldfieldtype": "Currency",
+   "options": "currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "change_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Change Amount", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "section_break_88",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "account_for_change_amount", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Account for Change Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "is_pos",
+   "fieldname": "base_change_amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Base Change Amount (Company Currency)",
+   "length": 0,
+   "no_copy": 1,
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "write_off_amount", 
-   "columns": 0, 
-   "depends_on": "grand_total", 
-   "fieldname": "column_break4", 
-   "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": "Write Off", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_90",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "is_pos",
+   "fieldname": "change_amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Change Amount",
+   "length": 0,
+   "no_copy": 1,
+   "options": "currency",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "is_pos",
+   "fieldname": "account_for_change_amount",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Account for Change Amount",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Account",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "collapsible_depends_on": "write_off_amount",
+   "columns": 0,
+   "depends_on": "grand_total",
+   "fieldname": "column_break4",
+   "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": "Write Off",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "write_off_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Write Off Amount", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "fieldname": "write_off_amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Write Off Amount",
+   "length": 0,
+   "no_copy": 1,
+   "options": "currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_write_off_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Write Off Amount (Company Currency)", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "base_write_off_amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Write Off Amount (Company Currency)",
+   "length": 0,
+   "no_copy": 1,
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "is_pos", 
-   "fieldname": "write_off_outstanding_amount_automatically", 
-   "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": "Write Off Outstanding Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "is_pos",
+   "fieldname": "write_off_outstanding_amount_automatically",
+   "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": "Write Off Outstanding Amount",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "column_break_74", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "fieldname": "column_break_74",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "write_off_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Write Off Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "fieldname": "write_off_account",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Write Off Account",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Account",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "write_off_cost_center", 
-   "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": "Write Off Cost Center", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Cost Center", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "fieldname": "write_off_cost_center",
+   "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": "Write Off Cost Center",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Cost Center",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "terms", 
-   "columns": 0, 
-   "fieldname": "terms_section_break", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Terms", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "collapsible_depends_on": "terms",
+   "columns": 0,
+   "fieldname": "terms_section_break",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Terms",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Section Break",
+   "options": "",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "tc_name", 
-   "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": "Terms", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "tc_name", 
-   "oldfieldtype": "Link", 
-   "options": "Terms and Conditions", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "tc_name",
+   "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": "Terms",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "tc_name",
+   "oldfieldtype": "Link",
+   "options": "Terms and Conditions",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "terms", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Terms and Conditions Details", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "terms", 
-   "oldfieldtype": "Text Editor", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "terms",
+   "fieldtype": "Text Editor",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Terms and Conditions Details",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "terms",
+   "oldfieldtype": "Text Editor",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "edit_printing_settings", 
-   "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": "Printing Settings", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "columns": 0,
+   "fieldname": "edit_printing_settings",
+   "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": "Printing Settings",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "letter_head", 
-   "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": "Letter Head", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "letter_head", 
-   "oldfieldtype": "Select", 
-   "options": "Letter Head", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 1,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "letter_head",
+   "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": "Letter Head",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "letter_head",
+   "oldfieldtype": "Select",
+   "options": "Letter Head",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "language", 
-   "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": "Print Language", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "language",
+   "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": "Print Language",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_84", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_84",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "select_print_heading", 
-   "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": "Print Heading", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "select_print_heading", 
-   "oldfieldtype": "Link", 
-   "options": "Print Heading", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 1, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 1,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "select_print_heading",
+   "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": "Print Heading",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "select_print_heading",
+   "oldfieldtype": "Link",
+   "options": "Print Heading",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 1,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "depends_on": "customer", 
-   "fieldname": "more_information", 
-   "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": "More Information", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "columns": 0,
+   "depends_on": "customer",
+   "fieldname": "more_information",
+   "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": "More Information",
+   "length": 0,
+   "no_copy": 0,
+   "options": "",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "customer_group", 
-   "fieldtype": "Link", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Customer Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Customer Group", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "",
+   "fieldname": "customer_group",
+   "fieldtype": "Link",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Customer Group",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Customer Group",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "campaign", 
-   "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": "Campaign", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "campaign", 
-   "oldfieldtype": "Link", 
-   "options": "Campaign", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "fieldname": "campaign",
+   "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": "Campaign",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "campaign",
+   "oldfieldtype": "Link",
+   "options": "Campaign",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "col_break23", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "col_break23",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Draft", 
-   "fieldname": "status", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Status", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "\nDraft\nReturn\nCredit Note Issued\nSubmitted\nPaid\nUnpaid\nOverdue\nCancelled", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "Draft",
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 1,
+   "label": "Status",
+   "length": 0,
+   "no_copy": 1,
+   "options": "\nDraft\nReturn\nCredit Note Issued\nSubmitted\nPaid\nUnpaid\nOverdue\nCancelled",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "source", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Source", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "source", 
-   "oldfieldtype": "Select", 
-   "options": "Lead Source", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "source",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Source",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "source",
+   "oldfieldtype": "Select",
+   "options": "Lead Source",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "more_info", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Accounting Details", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "fa fa-file-text", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "columns": 0,
+   "fieldname": "more_info",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Accounting Details",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-file-text",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "debit_to", 
-   "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": "Debit To", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "debit_to", 
-   "oldfieldtype": "Link", 
-   "options": "Account", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "",
+   "fieldname": "debit_to",
+   "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": "Debit To",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "debit_to",
+   "oldfieldtype": "Link",
+   "options": "Account",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 1,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "party_account_currency", 
-   "fieldtype": "Link", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Party Account Currency", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "party_account_currency",
+   "fieldtype": "Link",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Party Account Currency",
+   "length": 0,
+   "no_copy": 1,
+   "options": "Currency",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "No", 
-   "description": "", 
-   "fieldname": "is_opening", 
-   "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": "Is Opening Entry", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "is_opening", 
-   "oldfieldtype": "Select", 
-   "options": "No\nYes", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "No",
+   "description": "",
+   "fieldname": "is_opening",
+   "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": "Is Opening Entry",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "is_opening",
+   "oldfieldtype": "Select",
+   "options": "No\nYes",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "c_form_applicable", 
-   "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": "C-Form Applicable", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "No\nYes", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "c_form_applicable",
+   "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": "C-Form Applicable",
+   "length": 0,
+   "no_copy": 1,
+   "options": "No\nYes",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "c_form_no", 
-   "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": "C-Form No", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "C-Form", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "c_form_no",
+   "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": "C-Form No",
+   "length": 0,
+   "no_copy": 1,
+   "options": "C-Form",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break8", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break8",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Column Break",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "remarks", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Remarks", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "remarks", 
-   "oldfieldtype": "Text", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "remarks",
+   "fieldtype": "Small Text",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Remarks",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "remarks",
+   "oldfieldtype": "Text",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "sales_partner", 
-   "columns": 0, 
-   "fieldname": "sales_team_section_break", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Commission", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "fa fa-group", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "collapsible_depends_on": "sales_partner",
+   "columns": 0,
+   "fieldname": "sales_team_section_break",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Commission",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-group",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "sales_partner", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Sales Partner", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "sales_partner", 
-   "oldfieldtype": "Link", 
-   "options": "Sales Partner", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "sales_partner",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Sales Partner",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "sales_partner",
+   "oldfieldtype": "Link",
+   "options": "Sales Partner",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break10", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break10",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Column Break",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "commission_rate", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Commission Rate (%)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "commission_rate", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "commission_rate",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Commission Rate (%)",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "commission_rate",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "total_commission", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Total Commission", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "total_commission", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "total_commission",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Total Commission",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "total_commission",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "sales_team", 
-   "columns": 0, 
-   "fieldname": "section_break2", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Sales Team", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "collapsible_depends_on": "sales_team",
+   "columns": 0,
+   "fieldname": "section_break2",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Sales Team",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "sales_team", 
-   "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": "Sales Team1", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "sales_team", 
-   "oldfieldtype": "Table", 
-   "options": "Sales Team", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 1,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "sales_team",
+   "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": "Sales Team1",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "sales_team",
+   "oldfieldtype": "Table",
+   "options": "Sales Team",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "subscription_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Subscription Section", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "subscription_section",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Subscription Section",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "description": "", 
-   "fieldname": "from_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": "From Date", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 1,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "description": "",
+   "fieldname": "from_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": "From Date",
+   "length": 0,
+   "no_copy": 1,
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "description": "", 
-   "fieldname": "to_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": "To Date", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 1,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "description": "",
+   "fieldname": "to_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": "To Date",
+   "length": 0,
+   "no_copy": 1,
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_140", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_140",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "subscription", 
-   "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": "Subscription", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Subscription", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 1,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "subscription",
+   "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": "Subscription",
+   "length": 0,
+   "no_copy": 1,
+   "options": "Subscription",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "against_income_account", 
-   "fieldtype": "Small Text", 
-   "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": "Against Income Account", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "against_income_account", 
-   "oldfieldtype": "Small Text", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 1, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "against_income_account",
+   "fieldtype": "Small Text",
+   "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": "Against Income Account",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "against_income_account",
+   "oldfieldtype": "Small Text",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 1,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-file-text", 
- "idx": 181, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "menu_index": 0, 
- "modified": "2017-10-24 12:46:48.331723", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Sales Invoice", 
- "name_case": "Title Case", 
- "owner": "Administrator", 
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "icon": "fa fa-file-text",
+ "idx": 181,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 1,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "menu_index": 0,
+ "modified": "2017-11-29 17:36:05.216046",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Sales Invoice",
+ "name_case": "Title Case",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
+   "amend": 1,
+   "apply_user_permissions": 0,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
+   "amend": 1,
+   "apply_user_permissions": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 0,
+   "email": 1,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts User",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 1, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Accounts Manager", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "amend": 0,
+   "apply_user_permissions": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 0,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 1,
+   "print": 0,
+   "read": 1,
+   "report": 0,
+   "role": "Accounts Manager",
+   "set_user_permissions": 0,
+   "share": 0,
+   "submit": 0,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 1, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "All", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "amend": 0,
+   "apply_user_permissions": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 0,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 1,
+   "print": 0,
+   "read": 1,
+   "report": 0,
+   "role": "All",
+   "set_user_permissions": 0,
+   "share": 0,
+   "submit": 0,
    "write": 0
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 1, 
- "search_fields": "posting_date, due_date, customer, base_grand_total, outstanding_amount", 
- "show_name_in_global_search": 1, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "timeline_field": "customer", 
- "title_field": "title", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 1,
+ "search_fields": "posting_date, due_date, customer, base_grand_total, outstanding_amount",
+ "show_name_in_global_search": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "timeline_field": "customer",
+ "title_field": "title",
+ "track_changes": 1,
+ "track_seen": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 83d5103..76b50c2 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -15,7 +15,7 @@
 from erpnext.accounts.utils import get_account_currency
 from erpnext.stock.doctype.delivery_note.delivery_note import update_billed_amount_based_on_so
 from erpnext.projects.doctype.timesheet.timesheet import get_projectwise_timesheet_data
-from erpnext.accounts.doctype.asset.depreciation \
+from erpnext.assets.doctype.asset.depreciation \
 	import get_disposal_account_and_cost_center, get_gl_entries_on_asset_disposal
 from erpnext.stock.doctype.batch.batch import set_batch_nos
 from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos, get_delivery_note_serial_no
@@ -143,6 +143,7 @@
 		self.update_time_sheet(self.name)
 
 		self.update_current_month_sales()
+		self.update_project()
 
 	def validate_pos_paid_amount(self):
 		if len(self.payments) == 0 and self.is_pos:
@@ -181,6 +182,7 @@
 		frappe.db.set(self, 'status', 'Cancelled')
 
 		self.update_current_month_sales()
+		self.update_project()
 
 	def update_current_month_sales(self):
 		if frappe.flags.in_test:
@@ -242,7 +244,7 @@
 		if not self.debit_to:
 			self.debit_to = get_party_account("Customer", self.customer, self.company)
 		if not self.due_date and self.customer:
-			self.due_date = get_due_date(self.posting_date, "Customer", self.customer, self.company)
+			self.due_date = get_due_date(self.posting_date, "Customer", self.customer)
 
 		super(SalesInvoice, self).set_missing_values(for_validate)
 
@@ -294,21 +296,23 @@
 			return
 
 		from erpnext.stock.get_item_details import get_pos_profile_item_details, get_pos_profile
-		pos = get_pos_profile(self.company)
+		if not self.pos_profile:
+			pos_profile = get_pos_profile(self.company) or {}
+			self.pos_profile = pos_profile.get('name')
+
+		pos = {}
+		if self.pos_profile:
+			pos = frappe.get_doc('POS Profile', self.pos_profile)
 
 		if not self.get('payments') and not for_validate:
-			pos_profile = frappe.get_doc('POS Profile', pos.name) if pos else None
-			update_multi_mode_option(self, pos_profile)
+			update_multi_mode_option(self, pos)
 
 		if not self.account_for_change_amount:
 			self.account_for_change_amount = frappe.db.get_value('Company', self.company, 'default_cash_account')
 
 		if pos:
-			self.pos_profile = pos.name
 			if not for_validate and not self.customer:
 				self.customer = pos.customer
-				self.mode_of_payment = pos.mode_of_payment
-				# self.set_customer_defaults()
 
 			if pos.get('account_for_change_amount'):
 				self.account_for_change_amount = pos.get('account_for_change_amount')
@@ -632,9 +636,30 @@
 		return gl_entries
 
 	def make_customer_gl_entry(self, gl_entries):
-		if self.grand_total:
+		grand_total = self.rounded_total or self.grand_total
+		if self.get("payment_schedule"):
+			for d in self.get("payment_schedule"):
+				payment_amount_in_company_currency = flt(d.payment_amount * self.conversion_rate,
+					d.precision("payment_amount"))
+
+				gl_entries.append(
+					self.get_gl_dict({
+						"account": self.debit_to,
+						"party_type": "Customer",
+						"party": self.customer,
+						"due_date": d.due_date,
+						"against": self.against_income_account,
+						"debit": payment_amount_in_company_currency,
+						"debit_in_account_currency": payment_amount_in_company_currency \
+							if self.party_account_currency==self.company_currency else d.payment_amount,
+						"against_voucher": self.return_against if cint(self.is_return) else self.name,
+						"against_voucher_type": self.doctype
+					}, self.party_account_currency)
+				)
+
+		elif grand_total:
 			# Didnot use base_grand_total to book rounding loss gle
-			grand_total_in_company_currency = flt(self.grand_total * self.conversion_rate,
+			grand_total_in_company_currency = flt(grand_total * self.conversion_rate,
 				self.precision("grand_total"))
 
 			gl_entries.append(
@@ -645,7 +670,7 @@
 					"against": self.against_income_account,
 					"debit": grand_total_in_company_currency,
 					"debit_in_account_currency": grand_total_in_company_currency \
-						if self.party_account_currency==self.company_currency else self.grand_total,
+						if self.party_account_currency==self.company_currency else grand_total,
 					"against_voucher": self.return_against if cint(self.is_return) else self.name,
 					"against_voucher_type": self.doctype
 				}, self.party_account_currency)
@@ -889,6 +914,13 @@
 						serial_no, sales_invoice
 					)))
 
+	def update_project(self):
+		if self.project:
+			project = frappe.get_doc("Project", self.project)
+			project.flags.dont_sync_tasks = True
+			project.update_billed_amount()
+			project.save()
+
 def get_list_context(context=None):
 	from erpnext.controllers.website_list_for_contact import get_list_context
 	list_context = get_list_context(context)
diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.js
index 35b2558..b4be3ba 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.js
@@ -1,7 +1,7 @@
 QUnit.module('Sales Invoice');
 
 QUnit.test("test sales Invoice", function(assert) {
-	assert.expect(4);
+	assert.expect(6);
 	let done = assert.async();
 	frappe.run_serially([
 		() => {
@@ -19,7 +19,8 @@
 				{contact_person: 'Contact 1-Test Customer 1'},
 				{taxes_and_charges: 'TEST In State GST'},
 				{tc_name: 'Test Term 1'},
-				{terms: 'This is Test'}
+				{terms: 'This is Test'},
+				{payment_terms_template: '_Test Payment Term Template UI'}
 			]);
 		},
 		() => cur_frm.save(),
@@ -31,7 +32,10 @@
 			// get tax account head details
 			assert.ok(cur_frm.doc.taxes[0].account_head=='CGST - '+frappe.get_abbr(frappe.defaults.get_default('Company')), " Account Head abbr correct");
 			// grand_total Calculated
-			assert.ok(cur_frm.doc.grand_total==590, "Grad Total correct");
+			assert.ok(cur_frm.doc.grand_total==590, "Grand Total correct");
+
+			assert.ok(cur_frm.doc.payment_terms_template, "Payment Terms Template is correct");
+			assert.ok(cur_frm.doc.payment_schedule.length > 0, "Payment Term Schedule is not empty");
 
 		},
 		() => frappe.tests.click_button('Submit'),
@@ -40,4 +44,3 @@
 		() => done()
 	]);
 });
-
diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index 50d2ce8..b3a143c 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -3,8 +3,9 @@
 from __future__ import unicode_literals
 
 import frappe
+
 import unittest, copy, time
-from frappe.utils import nowdate, add_days, flt, cint
+from frappe.utils import nowdate, add_days, flt, getdate, cint
 from frappe.model.dynamic_links import get_dynamic_link_map
 from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry, get_qty_after_transaction
 from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import unlink_payment_on_cancel_of_invoice
@@ -58,6 +59,13 @@
 
 		self.assertRaises(frappe.CannotChangeConstantError, si.save)
 
+	def test_add_terms_after_save(self):
+		si = frappe.copy_doc(test_records[2])
+		si.insert()
+
+		self.assertTrue(si.payment_schedule)
+		self.assertEqual(getdate(si.payment_schedule[0].due_date), getdate(si.due_date))
+
 	def test_sales_invoice_calculation_base_currency(self):
 		si = frappe.copy_doc(test_records[2])
 		si.insert()
@@ -199,6 +207,7 @@
 		# additional discount
 		si.discount_amount = 100
 		si.apply_discount_on = 'Net Total'
+		si.payment_schedule = []
 
 		si.save()
 
@@ -211,6 +220,7 @@
 		# additional discount on grand total
 		si.discount_amount = 100
 		si.apply_discount_on = 'Grand Total'
+		si.payment_schedule = []
 
 		si.save()
 
@@ -546,7 +556,7 @@
 
 	def test_outstanding(self):
 		w = self.make()
-		self.assertEquals(w.outstanding_amount, w.base_grand_total)
+		self.assertEquals(w.outstanding_amount, w.base_rounded_total)
 
 	def test_payment(self):
 		w = self.make()
@@ -560,7 +570,7 @@
 		jv.insert()
 		jv.submit()
 
-		self.assertEquals(frappe.db.get_value("Sales Invoice", w.name, "outstanding_amount"), 161.8)
+		self.assertEquals(frappe.db.get_value("Sales Invoice", w.name, "outstanding_amount"), 162.0)
 
 		link_data = get_dynamic_link_map().get('Sales Invoice', [])
 		link_doctypes = [d.parent for d in link_data]
@@ -569,7 +579,7 @@
 		self.assertTrue(link_doctypes.index('GL Entry') > link_doctypes.index('Journal Entry Account'))
 
 		jv.cancel()
-		self.assertEquals(frappe.db.get_value("Sales Invoice", w.name, "outstanding_amount"), 561.8)
+		self.assertEquals(frappe.db.get_value("Sales Invoice", w.name, "outstanding_amount"), 562.0)
 
 	def test_sales_invoice_gl_entry_without_perpetual_inventory(self):
 		si = frappe.copy_doc(test_records[1])
@@ -848,7 +858,7 @@
 		self.assertTrue(frappe.db.sql("""select name from `tabJournal Entry Account`
 			where reference_name=%s and credit_in_account_currency=300""", si.name))
 
-		self.assertEqual(si.outstanding_amount, 261.8)
+		self.assertEqual(si.outstanding_amount, 262.0)
 
 		si.cancel()
 
@@ -932,20 +942,6 @@
 
 		self.assertEquals(si.get("items")[0].serial_no, dn.get("items")[0].serial_no)
 
-	def test_invoice_due_date_against_customers_credit_days(self):
-		# set customer's credit days
-		frappe.db.set_value("Customer", "_Test Customer", "credit_days_based_on", "Fixed Days")
-		frappe.db.set_value("Customer", "_Test Customer", "credit_days", 10)
-
-		si = create_sales_invoice()
-		self.assertEqual(si.due_date, add_days(nowdate(), 10))
-
-		# set customer's credit days is last day of the next month
-		frappe.db.set_value("Customer", "_Test Customer", "credit_days_based_on", "Last Day of the Next Month")
-
-		si1 = create_sales_invoice(posting_date="2015-07-05")
-		self.assertEqual(si1.due_date, "2015-08-31")
-
 	def test_return_sales_invoice(self):
 		set_perpetual_inventory()
 		make_stock_entry(item_code="_Test Item", target="_Test Warehouse - _TC", qty=50, basic_rate=100)
@@ -1152,7 +1148,8 @@
 		si.load_from_db()
 
 		#check outstanding after advance allocation
-		self.assertEqual(flt(si.outstanding_amount), flt(si.grand_total - si.total_advance, si.precision("outstanding_amount")))
+		self.assertEqual(flt(si.outstanding_amount),
+			flt(si.rounded_total - si.total_advance, si.precision("outstanding_amount")))
 
 		#added to avoid Document has been modified exception
 		jv = frappe.get_doc("Journal Entry", jv.name)
@@ -1160,7 +1157,8 @@
 
 		si.load_from_db()
 		#check outstanding after advance cancellation
-		self.assertEqual(flt(si.outstanding_amount), flt(si.grand_total + si.total_advance, si.precision("outstanding_amount")))
+		self.assertEqual(flt(si.outstanding_amount),
+			flt(si.rounded_total + si.total_advance, si.precision("outstanding_amount")))
 
 	def test_outstanding_amount_after_advance_payment_entry_cancelation(self):
 		pe = frappe.get_doc({
@@ -1199,7 +1197,8 @@
 		si.load_from_db()
 
 		#check outstanding after advance allocation
-		self.assertEqual(flt(si.outstanding_amount), flt(si.grand_total - si.total_advance, si.precision("outstanding_amount")))
+		self.assertEqual(flt(si.outstanding_amount),
+			flt(si.rounded_total - si.total_advance, si.precision("outstanding_amount")))
 
 		#added to avoid Document has been modified exception
 		pe = frappe.get_doc("Payment Entry", pe.name)
@@ -1207,7 +1206,8 @@
 
 		si.load_from_db()
 		#check outstanding after advance cancellation
-		self.assertEqual(flt(si.outstanding_amount), flt(si.grand_total + si.total_advance, si.precision("outstanding_amount")))
+		self.assertEqual(flt(si.outstanding_amount),
+			flt(si.rounded_total + si.total_advance, si.precision("outstanding_amount")))
 
 	def test_multiple_uom_in_selling(self):
 		frappe.db.sql("""delete from `tabItem Price`
@@ -1321,6 +1321,40 @@
 		})
 		si.insert()
 		return si
+	
+	def test_gl_entry_based_on_payment_schedule(self):
+		si = create_sales_invoice(do_not_save=True, customer="_Test Customer P")
+		si.append("payment_schedule", {
+			"due_date": add_days(nowdate(), 15),
+			"payment_amount": 20,
+			"invoice_portion": 20.00
+		})
+		si.append("payment_schedule", {
+			"due_date": add_days(nowdate(), 45),
+			"payment_amount": 80,
+			"invoice_portion": 80.00
+		})
+		
+		si.save()
+		si.submit()
+		
+		gl_entries = frappe.db.sql("""select account, debit, credit, due_date
+			from `tabGL Entry` where voucher_type='Sales Invoice' and voucher_no=%s
+			order by account asc, debit asc""", si.name, as_dict=1)
+		self.assertTrue(gl_entries)
+
+		expected_gl_entries = sorted([
+			[si.debit_to, 20.0, 0.0, add_days(nowdate(), 15)],
+			[si.debit_to, 80.0, 0.0, add_days(nowdate(), 45)],
+			["Sales - _TC", 0.0, 100.0, None]
+		])
+
+		for i, gle in enumerate(sorted(gl_entries, key=lambda gle: gle.account)):
+			self.assertEquals(expected_gl_entries[i][0], gle.account)
+			self.assertEquals(expected_gl_entries[i][1], gle.debit)
+			self.assertEquals(expected_gl_entries[i][2], gle.credit)
+			self.assertEquals(getdate(expected_gl_entries[i][3]), getdate(gle.due_date))
+
 
 	def test_company_monthly_sales(self):
 		existing_current_month_sales = frappe.db.get_value("Company", "_Test Company", "total_monthly_sales")
@@ -1367,6 +1401,53 @@
 			self.assertEquals(expected_values[gle.account][1], gle.debit)
 			self.assertEquals(expected_values[gle.account][2], gle.credit)
 
+	def test_sales_invoice_with_shipping_rule(self):
+		from erpnext.accounts.doctype.shipping_rule.test_shipping_rule \
+			import create_shipping_rule
+
+		shipping_rule = create_shipping_rule(shipping_rule_type = "Selling", shipping_rule_name = "Shipping Rule - Sales Invoice Test")
+
+		si = frappe.copy_doc(test_records[2])
+		
+		si.shipping_rule = shipping_rule.name
+		si.insert()
+
+		shipping_amount = 0.0
+		for condition in shipping_rule.get("conditions"):
+			if not condition.to_value or (flt(condition.from_value) <= si.net_total <= flt(condition.to_value)):
+				shipping_amount = condition.shipping_amount
+
+		shipping_charge = {
+			"doctype": "Sales Taxes and Charges",
+			"category": "Valuation and Total",
+			"charge_type": "Actual",
+			"account_head": shipping_rule.account,
+			"cost_center": shipping_rule.cost_center,
+			"tax_amount": shipping_amount,
+			"description": shipping_rule.name
+		}	
+		si.append("taxes", shipping_charge)
+		si.save()
+
+		self.assertEquals(si.net_total, 1250)
+
+		self.assertEquals(si.total_taxes_and_charges, 577.05)
+		self.assertEquals(si.grand_total, 1827.05)		
+
+	def test_create_invoice_without_terms(self):
+		si = create_sales_invoice(do_not_save=1)
+		self.assertFalse(si.get('payment_schedule'))
+
+		si.insert()
+		self.assertTrue(si.get('payment_schedule'))
+
+	def test_duplicate_due_date_in_terms(self):
+		si = create_sales_invoice(do_not_save=1)
+		si.append('payment_schedule', dict(due_date='2017-01-01', invoice_portion=50.00, payment_amount=50))
+		si.append('payment_schedule', dict(due_date='2017-01-01', invoice_portion=50.00, payment_amount=50))
+
+		self.assertRaises(frappe.ValidationError, si.insert)
+
 def create_sales_invoice(**args):
 	si = frappe.new_doc("Sales Invoice")
 	args = frappe._dict(args)
@@ -1400,6 +1481,11 @@
 		si.insert()
 		if not args.do_not_submit:
 			si.submit()
+		else:
+			si.payment_schedule = []
+	else:
+		si.payment_schedule = []
+
 	return si
 
 test_dependencies = ["Journal Entry", "Contact", "Address"]
diff --git a/erpnext/accounts/doctype/sales_invoice/tests/test_sales_invoice_with_margin.js b/erpnext/accounts/doctype/sales_invoice/tests/test_sales_invoice_with_margin.js
new file mode 100644
index 0000000..f1cb22a
--- /dev/null
+++ b/erpnext/accounts/doctype/sales_invoice/tests/test_sales_invoice_with_margin.js
@@ -0,0 +1,36 @@
+QUnit.module('Accounts');
+
+QUnit.test("test sales invoice with margin", function(assert) {
+	assert.expect(3);
+	let done = assert.async();
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make('Sales Invoice', [
+				{customer: 'Test Customer 1'},
+				{selling_price_list: 'Test-Selling-USD'},
+				{currency: 'USD'},
+				{items: [
+					[
+						{'item_code': 'Test Product 4'},
+						{'delivery_date': frappe.datetime.add_days(frappe.defaults.get_default("year_end_date"), 1)},
+						{'qty': 1},
+						{'margin_type': 'Percentage'},
+						{'margin_rate_or_amount': 20}
+					]
+				]}
+			]);
+		},
+		() => cur_frm.save(),
+		() => {
+			assert.ok(cur_frm.doc.items[0].rate_with_margin == 240, "Margin rate correct");
+			assert.ok(cur_frm.doc.items[0].base_rate_with_margin == cur_frm.doc.conversion_rate * 240, "Base margin rate correct");
+			assert.ok(cur_frm.doc.total == 240, "Amount correct");
+
+		},
+		() => frappe.tests.click_button('Submit'),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(0.3),
+		() => done()
+	]);
+});
+
diff --git a/erpnext/accounts/doctype/sales_invoice/tests/test_sales_invoice_with_payment.js b/erpnext/accounts/doctype/sales_invoice/tests/test_sales_invoice_with_payment.js
index 736443e..890fb68 100644
--- a/erpnext/accounts/doctype/sales_invoice/tests/test_sales_invoice_with_payment.js
+++ b/erpnext/accounts/doctype/sales_invoice/tests/test_sales_invoice_with_payment.js
@@ -19,7 +19,8 @@
 				{contact_person: 'Contact 1-Test Customer 1'},
 				{taxes_and_charges: 'TEST In State GST'},
 				{tc_name: 'Test Term 1'},
-				{terms: 'This is Test'}
+				{terms: 'This is Test'},
+				{payment_terms_template: '_Test Payment Term Template UI'}
 			]);
 		},
 		() => cur_frm.save(),
diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
index 613f384..bb73556 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -1,2183 +1,2367 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "hash", 
- "beta": 0, 
- "creation": "2013-06-04 11:02:19", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "autoname": "hash",
+ "beta": 0,
+ "creation": "2013-06-04 11:02:19",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Document",
+ "editable_grid": 1,
+ "engine": "InnoDB",
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "barcode", 
-   "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": "Barcode", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "barcode",
+   "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": "Barcode",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 4, 
-   "fieldname": "item_code", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Item", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "item_code", 
-   "oldfieldtype": "Link", 
-   "options": "Item", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "columns": 4,
+   "fieldname": "item_code",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Item",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "item_code",
+   "oldfieldtype": "Link",
+   "options": "Item",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 1,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "col_break1", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "col_break1",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "item_name", 
-   "fieldtype": "Data", 
-   "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": "Item Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "item_name", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "item_name",
+   "fieldtype": "Data",
+   "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": "Item Name",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "item_name",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "customer_item_code", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Customer's Item Code", 
-   "length": 0, 
-   "no_copy": 0, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "customer_item_code",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Customer's Item Code",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "section_break_6", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Edit Description", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "columns": 0,
+   "fieldname": "section_break_6",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Edit Description",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "description", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Description", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "description", 
-   "oldfieldtype": "Text", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "200px", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "description",
+   "fieldtype": "Text Editor",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Description",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "description",
+   "oldfieldtype": "Text",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": "200px",
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "200px"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_8", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_8",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "image_view", 
-   "fieldtype": "Image", 
-   "hidden": 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": "Image View", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "image", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "image_view",
+   "fieldtype": "Image",
+   "hidden": 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": "Image View",
+   "length": 0,
+   "no_copy": 0,
+   "options": "image",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "image", 
-   "fieldtype": "Attach", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "image",
+   "fieldtype": "Attach",
+   "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,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "quantity_and_rate", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "quantity_and_rate",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Quantity", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "qty", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "columns": 2,
+   "fieldname": "qty",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Quantity",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "qty",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "stock_uom", 
-   "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": "Stock UOM", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "UOM", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "stock_uom",
+   "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": "Stock UOM",
+   "length": 0,
+   "no_copy": 0,
+   "options": "UOM",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "col_break2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "col_break2",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "uom", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "UOM", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "UOM", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "uom",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "UOM",
+   "length": 0,
+   "no_copy": 0,
+   "options": "UOM",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "conversion_factor", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "UOM Conversion Factor", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "conversion_factor",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "UOM Conversion Factor",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "stock_qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Qty as per Stock UOM", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "stock_qty",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Qty as per Stock UOM",
+   "length": 0,
+   "no_copy": 1,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_17", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "section_break_17",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "price_list_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Price List Rate", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "ref_rate", 
-   "oldfieldtype": "Currency", 
-   "options": "currency", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "price_list_rate",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Price List Rate",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "ref_rate",
+   "oldfieldtype": "Currency",
+   "options": "currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_price_list_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Price List Rate (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "base_ref_rate", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "base_price_list_rate",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Price List Rate (Company Currency)",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "base_ref_rate",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "discount_and_margin", 
-   "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": "Discount and Margin", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "columns": 0,
+   "fieldname": "discount_and_margin",
+   "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": "Discount and Margin",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "price_list_rate", 
-   "fieldname": "margin_type", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Margin Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nPercentage\nAmount", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "price_list_rate",
+   "fieldname": "margin_type",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Margin Type",
+   "length": 0,
+   "no_copy": 0,
+   "options": "\nPercentage\nAmount",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.margin_type && doc.price_list_rate", 
-   "fieldname": "margin_rate_or_amount", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Margin Rate or Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:doc.margin_type && doc.price_list_rate",
+   "fieldname": "margin_rate_or_amount",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Margin Rate or Amount",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.margin_type && doc.price_list_rate && doc.margin_rate_or_amount", 
-   "fieldname": "rate_with_margin", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Rate With Margin", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "2", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:doc.margin_type && doc.price_list_rate && doc.margin_rate_or_amount",
+   "fieldname": "rate_with_margin",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Rate With Margin",
+   "length": 0,
+   "no_copy": 0,
+   "options": "currency",
+   "permlevel": 0,
+   "precision": "2",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_19", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_19",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "price_list_rate", 
-   "fieldname": "discount_percentage", 
-   "fieldtype": "Percent", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Discount (%) on Price List Rate with Margin", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "adj_rate", 
-   "oldfieldtype": "Float", 
-   "permlevel": 0, 
-   "precision": "2", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "price_list_rate",
+   "fieldname": "discount_percentage",
+   "fieldtype": "Percent",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Discount (%) on Price List Rate with Margin",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "adj_rate",
+   "oldfieldtype": "Float",
+   "permlevel": 0,
+   "precision": "2",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break1", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:doc.margin_type && doc.price_list_rate && doc.margin_rate_or_amount",
+   "fieldname": "base_rate_with_margin",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Rate With Margin (Company Currency)",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "precision": "2",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Rate", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "export_rate", 
-   "oldfieldtype": "Currency", 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "section_break1",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "export_amount", 
-   "oldfieldtype": "Currency", 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "columns": 2,
+   "fieldname": "rate",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Rate",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "export_rate",
+   "oldfieldtype": "Currency",
+   "options": "currency",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "col_break3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 2,
+   "fieldname": "amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Amount",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "export_amount",
+   "oldfieldtype": "Currency",
+   "options": "currency",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Rate (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "basic_rate", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "col_break3",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Amount (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "amount", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "base_rate",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Rate (Company Currency)",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "basic_rate",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "pricing_rule", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Pricing Rule", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Pricing Rule", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "base_amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Amount (Company Currency)",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "amount",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_21", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "pricing_rule",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Pricing Rule",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Pricing Rule",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "net_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Net Rate", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "section_break_21",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "net_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Net Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "net_rate",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Net Rate",
+   "length": 0,
+   "no_copy": 0,
+   "options": "currency",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_24", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "net_amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Net Amount",
+   "length": 0,
+   "no_copy": 0,
+   "options": "currency",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_net_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Net Rate (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_24",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_net_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Net Amount (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "base_net_rate",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Net Rate (Company Currency)",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "eval:doc.delivered_by_supplier==1", 
-   "columns": 0, 
-   "fieldname": "drop_ship", 
-   "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": "Drop Ship", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "base_net_amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Net Amount (Company Currency)",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "delivered_by_supplier", 
-   "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": "Delivered By Supplier", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "collapsible_depends_on": "eval:doc.delivered_by_supplier==1",
+   "columns": 0,
+   "fieldname": "drop_ship",
+   "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": "Drop Ship",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "accounting", 
-   "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": "Accounting Details", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "delivered_by_supplier",
+   "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": "Delivered By Supplier",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "income_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Income Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "income_account", 
-   "oldfieldtype": "Link", 
-   "options": "Account", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "120px", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "columns": 0,
+   "fieldname": "accounting",
+   "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": "Accounting Details",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "income_account",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Income Account",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "income_account",
+   "oldfieldtype": "Link",
+   "options": "Account",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "print_width": "120px",
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "120px"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "expense_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Expense Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "expense_account",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Expense Account",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Account",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "120px"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "col_break4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "col_break4",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": ":Company", 
-   "fieldname": "cost_center", 
-   "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": "Cost Center", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "cost_center", 
-   "oldfieldtype": "Link", 
-   "options": "Cost Center", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "120px", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": ":Company",
+   "fieldname": "cost_center",
+   "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": "Cost Center",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "cost_center",
+   "oldfieldtype": "Link",
+   "options": "Cost Center",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "print_width": "120px",
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "120px"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "eval:doc.serial_no || doc.batch_no", 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "warehouse_and_reference", 
-   "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": "Stock Details", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "columns": 0,
+   "fieldname": "section_break_18",
+   "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": "Item Weight Details",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "warehouse", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Warehouse", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "warehouse", 
-   "oldfieldtype": "Link", 
-   "options": "Warehouse", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "weight_per_unit",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Weight Per Unit",
+   "length": 0,
+   "no_copy": 0,
+   "options": "",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "target_warehouse", 
-   "fieldtype": "Link", 
-   "hidden": 1, 
-   "ignore_user_permissions": 1, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Customer Warehouse (Optional)", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Warehouse", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "total_weight",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Total Weight",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:!doc.__islocal", 
-   "fieldname": "quality_inspection", 
-   "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": "Quality Inspection", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Quality Inspection", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_21",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "batch_no", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Batch No", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Batch", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "weight_uom",
+   "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": "Weight UOM",
+   "length": 0,
+   "no_copy": 0,
+   "options": "UOM",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "col_break5", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "collapsible_depends_on": "eval:doc.serial_no || doc.batch_no",
+   "columns": 0,
+   "depends_on": "",
+   "fieldname": "warehouse_and_reference",
+   "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": "Stock Details",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "allow_zero_valuation_rate", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Allow Zero Valuation Rate", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "warehouse",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Warehouse",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "warehouse",
+   "oldfieldtype": "Link",
+   "options": "Warehouse",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "serial_no", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Serial No", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "serial_no", 
-   "oldfieldtype": "Small Text", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "target_warehouse",
+   "fieldtype": "Link",
+   "hidden": 1,
+   "ignore_user_permissions": 1,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Customer Warehouse (Optional)",
+   "length": 0,
+   "no_copy": 1,
+   "options": "Warehouse",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "item_group", 
-   "fieldtype": "Link", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Item Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "item_group", 
-   "oldfieldtype": "Link", 
-   "options": "Item Group", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:!doc.__islocal",
+   "fieldname": "quality_inspection",
+   "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": "Quality Inspection",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Quality Inspection",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "brand", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Brand Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "brand", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "batch_no",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Batch No",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Batch",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "item_tax_rate", 
-   "fieldtype": "Small Text", 
-   "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": "Item Tax Rate", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "item_tax_rate", 
-   "oldfieldtype": "Small Text", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "col_break5",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "actual_batch_qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Available Batch Qty at Warehouse", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "150px", 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "allow_zero_valuation_rate",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Allow Zero Valuation Rate",
+   "length": 0,
+   "no_copy": 1,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "serial_no",
+   "fieldtype": "Small Text",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Serial No",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "serial_no",
+   "oldfieldtype": "Small Text",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "",
+   "fieldname": "item_group",
+   "fieldtype": "Link",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Item Group",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "item_group",
+   "oldfieldtype": "Link",
+   "options": "Item Group",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "brand",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Brand Name",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "brand",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "item_tax_rate",
+   "fieldtype": "Small Text",
+   "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": "Item Tax Rate",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "item_tax_rate",
+   "oldfieldtype": "Small Text",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 1,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "actual_batch_qty",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Available Batch Qty at Warehouse",
+   "length": 0,
+   "no_copy": 1,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "print_width": "150px",
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "150px"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "actual_qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Available Qty at Warehouse", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "actual_qty", 
-   "oldfieldtype": "Currency", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 1,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "actual_qty",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Available Qty at Warehouse",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "actual_qty",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "edit_references", 
-   "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": "References", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "columns": 0,
+   "fieldname": "edit_references",
+   "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": "References",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "sales_order", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Sales Order", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "sales_order", 
-   "oldfieldtype": "Link", 
-   "options": "Sales Order", 
-   "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": 1, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "sales_order",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Sales Order",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "sales_order",
+   "oldfieldtype": "Link",
+   "options": "Sales Order",
+   "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": 1,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "so_detail", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Sales Order Item", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "so_detail", 
-   "oldfieldtype": "Data", 
-   "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": 1, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "so_detail",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Sales Order Item",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "so_detail",
+   "oldfieldtype": "Data",
+   "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": 1,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_50", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_50",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "delivery_note", 
-   "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": "Delivery Note", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "delivery_note", 
-   "oldfieldtype": "Link", 
-   "options": "Delivery Note", 
-   "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": 1, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "delivery_note",
+   "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": "Delivery Note",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "delivery_note",
+   "oldfieldtype": "Link",
+   "options": "Delivery Note",
+   "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": 1,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "dn_detail", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Delivery Note Item", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "dn_detail", 
-   "oldfieldtype": "Data", 
-   "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": 1, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "dn_detail",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Delivery Note Item",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "dn_detail",
+   "oldfieldtype": "Data",
+   "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": 1,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "delivered_qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Delivered Qty", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "delivered_qty", 
-   "oldfieldtype": "Currency", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "delivered_qty",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Delivered Qty",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "delivered_qty",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "is_fixed_asset", 
-   "fieldtype": "Check", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Is Fixed Asset", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "is_fixed_asset",
+   "fieldtype": "Check",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Is Fixed Asset",
+   "length": 0,
+   "no_copy": 1,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "asset", 
-   "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": "Asset", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Asset", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "asset",
+   "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": "Asset",
+   "length": 0,
+   "no_copy": 1,
+   "options": "Asset",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_54", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "section_break_54",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "page_break", 
-   "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": "Page Break", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 1, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 1,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "page_break",
+   "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": "Page Break",
+   "length": 0,
+   "no_copy": 1,
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 1,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-09-27 08:31:37.827893", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Sales Invoice Item", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 1,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 1,
+ "max_attachments": 0,
+ "modified": "2017-11-29 13:42:59.003120",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Sales Invoice Item",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 0,
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json b/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
index 9f6c003..7e3ccc2 100644
--- a/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
+++ b/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "INVTD.######", 
@@ -12,6 +13,7 @@
  "editable_grid": 1, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -22,7 +24,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -33,6 +37,7 @@
    "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, 
@@ -40,6 +45,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -51,7 +57,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reference Row #", 
    "length": 0, 
    "no_copy": 0, 
@@ -61,6 +69,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -68,6 +77,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -78,7 +88,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Account Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -89,6 +101,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -96,6 +109,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -107,7 +121,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Cost Center", 
    "length": 0, 
    "no_copy": 0, 
@@ -118,6 +134,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -125,6 +142,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -135,13 +153,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -150,17 +171,20 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "description", 
-   "fieldtype": "Text Editor", 
+   "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -171,6 +195,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "300px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -179,6 +204,7 @@
    "width": "300px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -190,7 +216,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is this Tax included in Basic Rate?", 
    "length": 0, 
    "no_copy": 0, 
@@ -199,6 +227,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -207,6 +236,7 @@
    "width": "150px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -217,7 +247,9 @@
    "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, 
@@ -225,6 +257,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -232,6 +265,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -242,7 +276,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -252,6 +288,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -259,6 +296,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -269,7 +307,9 @@
    "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, 
@@ -277,6 +317,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -284,6 +325,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -294,7 +336,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -304,6 +348,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -311,6 +356,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -321,7 +367,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Total", 
    "length": 0, 
    "no_copy": 0, 
@@ -331,6 +379,7 @@
    "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, 
@@ -338,6 +387,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -348,7 +398,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Tax Amount After Discount Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -358,6 +410,7 @@
    "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, 
@@ -365,6 +418,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -375,7 +429,9 @@
    "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, 
@@ -383,6 +439,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -390,6 +447,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -400,7 +458,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -411,6 +471,7 @@
    "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, 
@@ -418,6 +479,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -428,7 +490,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -439,6 +503,7 @@
    "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, 
@@ -446,6 +511,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -457,7 +523,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Tax Amount After Discount Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -466,6 +534,7 @@
    "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, 
@@ -473,6 +542,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -483,7 +553,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Wise Tax Detail", 
    "length": 0, 
    "no_copy": 0, 
@@ -493,6 +565,7 @@
    "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, 
@@ -500,6 +573,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -510,7 +584,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Parenttype", 
    "length": 0, 
    "no_copy": 0, 
@@ -520,6 +596,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -527,17 +604,17 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 1, 
  "hide_toolbar": 0, 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-08-26 03:08:03.235381", 
+ "modified": "2017-11-15 19:24:39.351600", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Taxes and Charges", 
@@ -546,6 +623,8 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/shipping_rule/shipping_rule.js b/erpnext/accounts/doctype/shipping_rule/shipping_rule.js
index 17f2083..53ee08a 100644
--- a/erpnext/accounts/doctype/shipping_rule/shipping_rule.js
+++ b/erpnext/accounts/doctype/shipping_rule/shipping_rule.js
@@ -1,3 +1,15 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
+frappe.ui.form.on('Shipping Rule', {
+	refresh: function(frm) {
+		frm.trigger('toggle_reqd');
+	},
+	calculate_based_on: function(frm) {
+		frm.trigger('toggle_reqd');
+	},
+	toggle_reqd: function(frm) {
+		frm.toggle_reqd("shipping_amount", frm.doc.calculate_based_on === 'Fixed');
+		frm.toggle_reqd("conditions", frm.doc.calculate_based_on !== 'Fixed');
+	}
+});
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/shipping_rule/shipping_rule.json b/erpnext/accounts/doctype/shipping_rule/shipping_rule.json
index a8788a1..1d65d86 100644
--- a/erpnext/accounts/doctype/shipping_rule/shipping_rule.json
+++ b/erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "field:label", 
@@ -12,6 +13,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -23,7 +25,8 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Shipping Rule Label", 
    "length": 0, 
@@ -40,6 +43,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -50,6 +54,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Disabled", 
@@ -68,134 +73,53 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "default": "Net Total", 
-   "fieldname": "calculate_based_on", 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "shipping_rule_type", 
    "fieldtype": "Select", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Calculate Based On", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Net Total\nNet Weight", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:!doc.disabled", 
-   "fieldname": "rule_conditions_section", 
-   "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Shipping Rule Conditions", 
+   "label": "Shipping Rule Type", 
    "length": 0, 
    "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "conditions", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Shipping Rule Conditions", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Shipping Rule Condition", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:!doc.disabled", 
-   "fieldname": "section_break_6", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Valid for Countries", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "worldwide_shipping", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Worldwide Shipping", 
-   "length": 0, 
-   "no_copy": 0, 
+   "options": "Selling\nBuying", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -209,36 +133,7 @@
    "unique": 0
   }, 
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:!doc.worldwide_shipping", 
-   "fieldname": "countries", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Valid for Countries", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Shipping Rule Country", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -250,8 +145,10 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
+   "label": "Accounting", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -266,6 +163,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -276,6 +174,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company", 
@@ -294,6 +193,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -304,6 +204,7 @@
    "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, 
@@ -320,6 +221,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -330,6 +232,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Shipping Account", 
@@ -348,6 +251,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -358,6 +262,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Cost Center", 
@@ -374,20 +279,264 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "shipping_amount_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Fixed", 
+   "fieldname": "calculate_based_on", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Calculate Based On", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Fixed\nNet Total\nNet Weight", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_8", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.calculate_based_on==='Fixed'", 
+   "fieldname": "shipping_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Shipping Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "collapsible_depends_on": "", 
+   "columns": 0, 
+   "depends_on": "eval:doc.calculate_based_on!=='Fixed'", 
+   "fieldname": "rule_conditions_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Shipping Rule Conditions", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "conditions", 
+   "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": "Shipping Rule Conditions", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Shipping Rule Condition", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "section_break_6", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Restrict to Countries", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "countries", 
+   "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": "Valid for Countries", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Shipping Rule Country", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-truck", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:18:06.472734", 
+ "modified": "2017-12-08 11:26:41.909395", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Shipping Rule", 
@@ -403,7 +552,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -424,7 +572,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -445,7 +592,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -466,7 +612,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -481,6 +626,8 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/shipping_rule/shipping_rule.py b/erpnext/accounts/doctype/shipping_rule/shipping_rule.py
index a47df2d..08e2018 100644
--- a/erpnext/accounts/doctype/shipping_rule/shipping_rule.py
+++ b/erpnext/accounts/doctype/shipping_rule/shipping_rule.py
@@ -15,18 +15,10 @@
 
 class ShippingRule(Document):
 	def validate(self):
-		self.validate_value("calculate_based_on", "in", ["Net Total", "Net Weight"])
-		self.conditions = self.get("conditions")
 		self.validate_from_to_values()
 		self.sort_shipping_rule_conditions()
 		self.validate_overlapping_shipping_rule_conditions()
 
-		if self.worldwide_shipping:
-			self.countries = []
-
-		elif not len([d.country for d in self.countries if d.country]):
-			frappe.throw(_("Please specify a country for this Shipping Rule or check Worldwide Shipping"))
-
 	def validate_from_to_values(self):
 		zero_to_values = []
 
@@ -47,6 +39,80 @@
 			throw(_('There can only be one Shipping Rule Condition with 0 or blank value for "To Value"'),
 				ManyBlankToValuesError)
 
+	def apply(self, doc):
+		'''Apply shipping rule on given doc. Called from accounts controller'''
+
+		shipping_amount = 0.0
+		by_value = False
+
+		self.validate_countries(doc)
+
+		if self.calculate_based_on == 'Net Total':
+			value = doc.base_net_total
+			by_value = True
+
+		elif self.calculate_based_on == 'Net Weight':
+			value = doc.total_net_weight
+			by_value = True
+
+		elif self.calculate_based_on == 'Fixed':
+			shipping_amount = self.shipping_amount
+
+		# shipping amount by value, apply conditions
+		if by_value:
+			shipping_amount = self.get_shipping_amount_from_rules(value)
+
+		# convert to order currency
+		if doc.currency != doc.company_currency:
+			shipping_amount = flt(shipping_amount / doc.conversion_rate, 2)
+
+		self.add_shipping_rule_to_tax_table(doc, shipping_amount)
+
+	def get_shipping_amount_from_rules(self, value):
+		for condition in self.get("conditions"):
+			if not condition.to_value or (flt(condition.from_value) <= value <= flt(condition.to_value)):
+				return condition.shipping_amount
+
+		return 0.0
+
+	def validate_countries(self, doc):
+		# validate applicable countries
+		if self.countries:
+			shipping_country = doc.get_shipping_address().get('country')
+			if not shipping_country:
+				frappe.throw(_('Shipping Address does not have country, which is required for this Shipping Rule'))
+			if shipping_country not in [d.country for d in self.countries]:
+				frappe.throw(_('Shipping rule not applicable for country {0}'.format(shipping_country)))
+
+	def add_shipping_rule_to_tax_table(self, doc, shipping_amount):
+		shipping_charge = {
+			"charge_type": "Actual",
+			"account_head": self.account,
+			"cost_center": self.cost_center
+		}
+		if self.shipping_rule_type == "Selling":
+			# check if not applied on purchase
+			if not doc.meta.get_field('taxes').options == 'Sales Taxes and Charges':
+				frappe.throw(_('Shipping rule only applicable for Selling'))
+			shipping_charge["doctype"] = "Sales Taxes and Charges"
+		else:
+			# check if not applied on sales
+			if not doc.meta.get_field('taxes').options == 'Purchase Taxes and Charges':
+				frappe.throw(_('Shipping rule only applicable for Buying'))
+
+			shipping_charge["doctype"] = "Purchase Taxes and Charges"
+			shipping_charge["category"] = "Valuation and Total"
+			shipping_charge["add_deduct_tax"] = "Add"
+
+		existing_shipping_charge = doc.get("taxes", filters=shipping_charge)
+		if existing_shipping_charge:
+			# take the last record found
+			existing_shipping_charge[-1].tax_amount = shipping_amount
+		else:
+			shipping_charge["tax_amount"] = shipping_amount
+			shipping_charge["description"] = self.label
+			doc.append("taxes", shipping_charge)
+
 	def sort_shipping_rule_conditions(self):
 		"""Sort Shipping Rule Conditions based on increasing From Value"""
 		self.shipping_rules_conditions = sorted(self.conditions, key=lambda d: flt(d.from_value))
diff --git a/erpnext/accounts/doctype/shipping_rule/test_records.json b/erpnext/accounts/doctype/shipping_rule/test_records.json
index a271009..26b3737 100644
--- a/erpnext/accounts/doctype/shipping_rule/test_records.json
+++ b/erpnext/accounts/doctype/shipping_rule/test_records.json
@@ -7,6 +7,7 @@
   "doctype": "Shipping Rule",
   "label": "_Test Shipping Rule",
   "name": "_Test Shipping Rule",
+  "shipping_rule_type": "Selling",
   "conditions": [
    {
     "doctype": "Shipping Rule Condition",
@@ -26,9 +27,12 @@
     "doctype": "Shipping Rule Condition",
     "from_value": 201,
     "parentfield": "conditions",
-    "shipping_amount": 0.0
+    "shipping_amount": 200.0
    }
   ],
+  "countries": [
+	  {"country": "India"}
+  ],
   "worldwide_shipping": 1
  },
  {
@@ -73,6 +77,7 @@
   "doctype": "Shipping Rule",
   "label": "_Test Shipping Rule - Rest of the World",
   "name": "_Test Shipping Rule - Rest of the World",
+  "shipping_rule_type": "Buying",
   "conditions": [
    {
     "doctype": "Shipping Rule Condition",
@@ -95,6 +100,9 @@
     "shipping_amount": 1500.0
    }
   ],
-  "worldwide_shipping": 1
+  "worldwide_shipping": 1,
+  "countries": [
+	  {"country": "Germany"}
+  ]
  }
 ]
diff --git a/erpnext/accounts/doctype/shipping_rule/test_shipping_rule.js b/erpnext/accounts/doctype/shipping_rule/test_shipping_rule.js
index 9c72aeb..0201f76 100644
--- a/erpnext/accounts/doctype/shipping_rule/test_shipping_rule.js
+++ b/erpnext/accounts/doctype/shipping_rule/test_shipping_rule.js
@@ -7,6 +7,8 @@
 		() => {
 			return frappe.tests.make("Shipping Rule", [
 				{label: "Next Day Shipping"},
+				{shipping_rule_type: "Selling"},
+				{calculate_based_on: 'Net Total'},
 				{conditions:[
 					[
 						{from_value:1},
diff --git a/erpnext/accounts/doctype/shipping_rule/test_shipping_rule.py b/erpnext/accounts/doctype/shipping_rule/test_shipping_rule.py
index 76b1d9e..582ecb2 100644
--- a/erpnext/accounts/doctype/shipping_rule/test_shipping_rule.py
+++ b/erpnext/accounts/doctype/shipping_rule/test_shipping_rule.py
@@ -36,3 +36,38 @@
 			shipping_rule.get("conditions")[1].from_value = range_b[0]
 			shipping_rule.get("conditions")[1].to_value = range_b[1]
 			self.assertRaises(OverlappingConditionError, shipping_rule.insert)
+
+def create_shipping_rule(shipping_rule_type, shipping_rule_name):
+	sr = frappe.new_doc("Shipping Rule")
+	sr.account =  "_Test Account Shipping Charges - _TC"
+	sr.calculate_based_on =  "Net Total"
+	sr.company = "_Test Company"
+	sr.cost_center = "_Test Cost Center - _TC"
+	sr.label = shipping_rule_name
+	sr.name = shipping_rule_name
+	sr.shipping_rule_type = shipping_rule_type
+
+	sr.append("conditions", {
+			"doctype": "Shipping Rule Condition",
+			"from_value": 0,
+			"parentfield": "conditions",
+			"shipping_amount": 50.0,
+			"to_value": 100
+		})
+	sr.append("conditions", {
+			"doctype": "Shipping Rule Condition",
+			"from_value": 101,
+			"parentfield": "conditions",
+			"shipping_amount": 100.0,
+			"to_value": 200
+		})
+	sr.append("conditions", {
+			"doctype": "Shipping Rule Condition",
+			"from_value": 201,
+			"parentfield": "conditions",
+			"shipping_amount": 200.0,
+			"to_value": 2000
+		})
+	sr.insert(ignore_permissions=True)
+	sr.submit()
+	return sr			
diff --git a/erpnext/accounts/doctype/shipping_rule/tests/test_shipping_rule_for_buying.js b/erpnext/accounts/doctype/shipping_rule/tests/test_shipping_rule_for_buying.js
new file mode 100644
index 0000000..ab1b77c
--- /dev/null
+++ b/erpnext/accounts/doctype/shipping_rule/tests/test_shipping_rule_for_buying.js
@@ -0,0 +1,37 @@
+QUnit.module('Shipping Rule');
+
+QUnit.test("test Shipping Rule", function(assert) {
+	assert.expect(1);
+	let done = assert.async();
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make("Shipping Rule", [
+				{label: "Two Day Shipping"},
+				{shipping_rule_type: "Buying"},
+				{fixed_shipping_amount: 0},
+				{conditions:[
+					[
+						{from_value:1},
+						{to_value:200},
+						{shipping_amount:100}
+					],
+					[
+						{from_value:201},
+						{to_value:3000},
+						{shipping_amount:200}
+					],
+				]},
+				{countries:[
+					[
+						{country:'India'}
+					]
+				]},
+				{account:'Accounts Payable - '+frappe.get_abbr(frappe.defaults.get_default("Company"))},
+				{cost_center:'Main - '+frappe.get_abbr(frappe.defaults.get_default("Company"))}
+			]);
+		},
+		() => {assert.ok(cur_frm.doc.name=='Two Day Shipping');},
+		() => done()
+	]);
+});
+
diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py
index c575d59..d370c49 100644
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe, erpnext
-from frappe.utils import flt, cstr, cint
+from frappe.utils import flt, cstr, cint, getdate
 from frappe import _
 from frappe.model.meta import get_field_precision
 from erpnext.accounts.doctype.budget.budget import validate_expense_against_budget
@@ -75,7 +75,8 @@
 			and cstr(e.get('against_voucher'))==cstr(gle.get('against_voucher')) \
 			and cstr(e.get('against_voucher_type')) == cstr(gle.get('against_voucher_type')) \
 			and cstr(e.get('cost_center')) == cstr(gle.get('cost_center')) \
-			and cstr(e.get('project')) == cstr(gle.get('project')):
+			and cstr(e.get('project')) == cstr(gle.get('project')) \
+			and getdate(e.get('due_date')) == getdate(gle.get('due_date')):
 				return e
 
 def save_entries(gl_map, adv_adj, update_outstanding, from_repost=False):
diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js
index 6b58033..558dd8d 100644
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -1505,11 +1505,15 @@
 			me.make_menu_list()
 		}, "fa fa-plus")
 
-		if (this.frm.doc.docstatus == 1) {
+		if (this.frm.doc.docstatus == 1 || this.pos_profile_data["allow_print_before_pay"]) {
 			this.page.set_secondary_action(__("Print"), function () {
+				me.create_invoice();
 				var html = frappe.render(me.print_template_data, me.frm.doc)
 				me.print_document(html)
 			})
+		}
+		
+		if (this.frm.doc.docstatus == 1) {	
 			this.page.add_menu_item(__("Email"), function () {
 				me.email_prompt()
 			})
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index e6887ba..7bccfe8 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -9,7 +9,7 @@
 from frappe.defaults import get_user_permissions
 from frappe.model.utils import get_fetch_values
 from frappe.utils import (add_days, getdate, formatdate, get_first_day, date_diff,
-	add_years, get_timestamp, nowdate, flt)
+                          add_years, get_timestamp, nowdate, flt, add_months, get_last_day)
 from frappe.contacts.doctype.address.address import (get_address_display,
 	get_default_address, get_company_address)
 from frappe.contacts.doctype.contact.contact import get_contact_details, get_default_contact
@@ -51,6 +51,7 @@
 	set_other_values(out, party, party_type)
 	set_price_list(out, party, party_type, price_list)
 	out["taxes_and_charges"] = set_taxes(party.name, party_type, posting_date, company, out.customer_group, out.supplier_type)
+	out["payment_terms_template"] = get_pyt_term_template(party.name, party_type)
 
 	if not out.get("currency"):
 		out["currency"] = currency
@@ -163,7 +164,7 @@
 	out = {
 		party_type.lower(): party,
 		account_fieldname : account,
-		"due_date": get_due_date(posting_date, party_type, party, company)
+		"due_date": get_due_date(posting_date, party_type, party)
 	}
 	return out
 
@@ -262,51 +263,54 @@
 
 		if doc.get("default_currency") and party_account_currency and company_default_currency:
 			if doc.default_currency != party_account_currency and doc.default_currency != company_default_currency:
-				frappe.throw(_("Billing currency must be equal to either default comapany's currency or party account currency"))
+				frappe.throw(_("Billing currency must be equal to either default company's currency or party account currency"))
+
 
 @frappe.whitelist()
-def get_due_date(posting_date, party_type, party, company):
-	"""Set Due Date = Posting Date + Credit Days"""
+def get_due_date(posting_date, party_type, party):
+	"""Get due date from `Payment Terms Template`"""
 	due_date = None
 	if posting_date and party:
 		due_date = posting_date
-		credit_days_based_on, credit_days = get_credit_days(party_type, party, company)
-		if credit_days_based_on == "Fixed Days" and credit_days:
-			due_date = add_days(posting_date, credit_days)
-		elif credit_days_based_on == "Last Day of the Next Month":
-			due_date = (get_first_day(posting_date, 0, 2) + datetime.timedelta(-1)).strftime("%Y-%m-%d")
+		template_name = get_pyt_term_template(party, party_type)
+		if template_name:
+			due_date = get_due_date_from_template(template_name, posting_date).strftime("%Y-%m-%d")
+		else:
+			if party_type == "Supplier":
+				supplier_type = frappe.db.get_value(party_type, party, fieldname="supplier_type")
+				template_name = frappe.db.get_value("Supplier Type", supplier_type, fieldname="payment_terms")
+				if template_name:
+					due_date = get_due_date_from_template(template_name, posting_date).strftime("%Y-%m-%d")
 
 	return due_date
 
-def get_credit_days(party_type, party, company):
-	credit_days = 0
-	if party_type and party:
-		if party_type == "Customer":
-			credit_days_based_on, credit_days, customer_group = \
-				frappe.db.get_value(party_type, party, ["credit_days_based_on", "credit_days", "customer_group"])
+
+def get_due_date_from_template(template_name, posting_date):
+	"""
+	Inspects all `Payment Term`s from the a `Payment Terms Template` and returns the due
+	date after considering all the `Payment Term`s requirements.
+	:param template_name: Name of the `Payment Terms Template`
+	:return: String representing the calculated due date
+	"""
+	due_date = getdate(posting_date)
+	template = frappe.get_doc('Payment Terms Template', template_name)
+
+	for term in template.terms:
+		if term.due_date_based_on == 'Day(s) after invoice date':
+			due_date = max(due_date, add_days(due_date, term.credit_days))
+		elif term.due_date_based_on == 'Day(s) after the end of the invoice month':
+			due_date = max(due_date, add_days(get_last_day(due_date), term.credit_days))
 		else:
-			credit_days_based_on, credit_days, supplier_type = \
-				frappe.db.get_value(party_type, party, ["credit_days_based_on", "credit_days", "supplier_type"])
+			due_date = max(due_date, add_months(get_last_day(due_date), term.credit_months))
 
-	if not credit_days_based_on:
-		if party_type == "Customer" and customer_group:
-			credit_days_based_on, credit_days = \
-				frappe.db.get_value("Customer Group", customer_group, ["credit_days_based_on", "credit_days"])
-		elif party_type == "Supplier" and supplier_type:
-			credit_days_based_on, credit_days = \
-				frappe.db.get_value("Supplier Type", supplier_type, ["credit_days_based_on", "credit_days"])
+	return due_date
 
-	if not credit_days_based_on:
-		credit_days_based_on, credit_days = \
-			frappe.db.get_value("Company", company, ["credit_days_based_on", "credit_days"])
 
-	return credit_days_based_on, credit_days
-
-def validate_due_date(posting_date, due_date, party_type, party, company):
+def validate_due_date(posting_date, due_date, party_type, party):
 	if getdate(due_date) < getdate(posting_date):
 		frappe.throw(_("Due Date cannot be before Posting Date"))
 	else:
-		default_due_date = get_due_date(posting_date, party_type, party, company)
+		default_due_date = get_due_date(posting_date, party_type, party)
 		if not default_due_date:
 			return
 
@@ -316,7 +320,8 @@
 				msgprint(_("Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s)")
 					.format(date_diff(due_date, default_due_date)))
 			else:
-				frappe.throw(_("Due / Reference Date cannot be after {0}").format(formatdate(default_due_date)))
+				frappe.throw(_("Due / Reference Date cannot be after {0}")
+					.format(formatdate(default_due_date)))
 
 @frappe.whitelist()
 def set_taxes(party, party_type, posting_date, company, customer_group=None, supplier_type=None,
@@ -353,6 +358,16 @@
 
 	return get_tax_template(posting_date, args)
 
+
+@frappe.whitelist()
+def get_pyt_term_template(party_name, party_type):
+	template = None
+	if party_type in ('Customer', 'Supplier'):
+		template = frappe.db.get_value(party_type, party_name, fieldname='payment_terms')
+
+	return template
+
+
 def validate_party_frozen_disabled(party_type, party_name):
 	if party_type and party_name:
 		if party_type in ("Customer", "Supplier"):
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
index 56db392..300e6a8 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -113,7 +113,7 @@
 						row += [self.get_party_name(gle.party_type, gle.party)]
 
 					# get due date
-					due_date = voucher_details.get(gle.voucher_no, {}).get("due_date", "")
+					due_date = gle.due_date or voucher_details.get(gle.voucher_no, {}).get("due_date", "")
 
 					row += [gle.voucher_type, gle.voucher_no, due_date]
 
@@ -162,8 +162,7 @@
 
 	def get_entries_till(self, report_date, party_type):
 		# returns a generator
-		return (e for e in self.get_gl_entries(party_type)
-			if getdate(e.posting_date) <= report_date)
+		return (e for e in self.get_gl_entries(party_type) if getdate(e.posting_date) <= report_date)
 
 	def is_receivable_or_payable(self, gle, dr_or_cr, future_vouchers):
 		return (
@@ -189,7 +188,8 @@
 		reverse_dr_or_cr = "credit" if dr_or_cr=="debit" else "debit"
 
 		for e in self.get_gl_entries_for(gle.party, gle.party_type, gle.voucher_type, gle.voucher_no):
-			if getdate(e.posting_date) <= report_date and e.name!=gle.name:
+			if getdate(e.posting_date) <= report_date and e.name!=gle.name \
+				and (not gle.due_date or getdate(e.due_date) == getdate(gle.due_date)):
 				amount = flt(e.get(reverse_dr_or_cr)) - flt(e.get(dr_or_cr))
 				if e.voucher_no not in return_entries:
 					payment_amount += amount
@@ -250,12 +250,12 @@
 			else:
 				select_fields = "sum(debit) as debit, sum(credit) as credit"
 
-			self.gl_entries = frappe.db.sql("""select name, posting_date, account, party_type, party,
-				voucher_type, voucher_no, against_voucher_type, against_voucher,
+			self.gl_entries = frappe.db.sql("""select name, posting_date, account, party_type, party, 
+				voucher_type, voucher_no, against_voucher_type, against_voucher, due_date,
 				account_currency, remarks, {0}
 				from `tabGL Entry`
 				where docstatus < 2 and party_type=%s and (party is not null and party != '') {1}
-				group by voucher_type, voucher_no, against_voucher_type, against_voucher, party
+				group by voucher_type, voucher_no, against_voucher_type, against_voucher, party, due_date
 				order by posting_date, party"""
 				.format(select_fields, conditions), values, as_dict=True)
 
@@ -309,14 +309,16 @@
 
 		rows = []
 		for d in data:
-			rows.append(d[self.ageing_col_idx_start : self.ageing_col_idx_start+4])
-
-		if rows:
-			rows.insert(0, [[d.get("label")] for d in ageing_columns])
+			rows.append(
+				{
+					'values': d[self.ageing_col_idx_start : self.ageing_col_idx_start+4]
+				}
+			)
 
 		return {
 			"data": {
-				'labels': rows
+				'labels': [d.get("label") for d in ageing_columns],
+				'datasets': rows
 			},
 			"type": 'percentage'
 		}
diff --git a/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.json b/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.json
index f0399b0..08bbf8d 100644
--- a/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.json
+++ b/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.json
@@ -1,5 +1,5 @@
 {
- "add_total_row": 0, 
+ "add_total_row": 1, 
  "apply_user_permissions": 1, 
  "creation": "2013-07-30 17:28:49", 
  "disabled": 0, 
@@ -7,7 +7,7 @@
  "doctype": "Report", 
  "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2017-02-24 20:20:20.613388", 
+ "modified": "2017-11-06 13:04:36.338268", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Delivered Items To Be Billed", 
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py
index 5d1aabe..d5180a6 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@ -3,8 +3,8 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.utils import flt, getdate, cstr
-from frappe import _
+from frappe.utils import getdate, cstr, flt
+from frappe import _, _dict
 from erpnext.accounts.utils import get_account_currency
 
 def execute(filters=None):
@@ -163,129 +163,89 @@
 	data = []
 	gle_map = initialize_gle_map(gl_entries)
 
-	opening, total_debit, total_credit, opening_in_account_currency, total_debit_in_account_currency, \
-		total_credit_in_account_currency, gle_map = get_accountwise_gle(filters, gl_entries, gle_map)
+	totals, entries = get_accountwise_gle(filters, gl_entries, gle_map)
 
 	# Opening for filtered account
-	if filters.get("account") or filters.get("party"):
-		data += [get_balance_row(_("Opening"), opening, opening_in_account_currency), {}]
+	data.append(totals.opening)
 
 	if filters.get("group_by_account"):
 		for acc, acc_dict in gle_map.items():
 			if acc_dict.entries:
-				# Opening for individual ledger, if grouped by account
-				data.append(get_balance_row(_("Opening"), acc_dict.opening,
-					acc_dict.opening_in_account_currency))
+				# opening
+				data.append({})
+				data.append(acc_dict.totals.opening)
 
 				data += acc_dict.entries
 
-				# Totals and closing for individual ledger, if grouped by account
-				account_closing = acc_dict.opening + acc_dict.total_debit - acc_dict.total_credit
-				account_closing_in_account_currency = acc_dict.opening_in_account_currency \
-					+ acc_dict.total_debit_in_account_currency - acc_dict.total_credit_in_account_currency
+				# totals
+				data.append(acc_dict.totals.total)
 
-				data += [{"account": "'" + _("Totals") + "'", "debit": acc_dict.total_debit,
-					"credit": acc_dict.total_credit},
-					get_balance_row(_("Closing (Opening + Totals)"),
-						account_closing, account_closing_in_account_currency), {}]
+				# closing
+				data.append(acc_dict.totals.closing)
+		data.append({})
 
 	else:
-		for gl in gl_entries:
-			if gl.posting_date >= getdate(filters.from_date) and gl.posting_date <= getdate(filters.to_date) \
-					and gl.is_opening == "No":
-				data.append(gl)
+		data += entries
 
+	# totals
+	data.append(totals.total)
 
-	# Total debit and credit between from and to date
-	if total_debit or total_credit:
-		data.append({
-			"account": "'" + _("Totals") + "'",
-			"debit": total_debit,
-			"credit": total_credit,
-			"debit_in_account_currency": total_debit_in_account_currency,
-			"credit_in_account_currency": total_credit_in_account_currency
-		})
-
-	# Closing for filtered account
-	if filters.get("account") or filters.get("party"):
-		closing = opening + total_debit - total_credit
-		closing_in_account_currency = opening_in_account_currency + \
-			total_debit_in_account_currency - total_credit_in_account_currency
-
-		data.append(get_balance_row(_("Closing (Opening + Totals)"),
-			closing, closing_in_account_currency))
+	# closing
+	data.append(totals.closing)
 
 	return data
 
+def get_totals_dict():
+	def _get_debit_credit_dict(label):
+		return _dict(
+			account = "'{0}'".format(label),
+			debit = 0.0,
+			credit = 0.0,
+			debit_in_account_currency = 0.0,
+			credit_in_account_currency = 0.0
+		)
+	return _dict(
+		opening = _get_debit_credit_dict(_('Opening')),
+		total = _get_debit_credit_dict(_('Total')),
+		closing = _get_debit_credit_dict(_('Closing (Opening + Total)'))
+	)
+
 def initialize_gle_map(gl_entries):
 	gle_map = frappe._dict()
 	for gle in gl_entries:
-		gle_map.setdefault(gle.account, frappe._dict({
-			"opening": 0,
-			"opening_in_account_currency": 0,
-			"entries": [],
-			"total_debit": 0,
-			"total_debit_in_account_currency": 0,
-			"total_credit": 0,
-			"total_credit_in_account_currency": 0,
-			"closing": 0,
-			"closing_in_account_currency": 0
-		}))
+		gle_map.setdefault(gle.account, _dict(totals = get_totals_dict(), entries = []))
 	return gle_map
 
 def get_accountwise_gle(filters, gl_entries, gle_map):
-	opening, total_debit, total_credit = 0, 0, 0
-	opening_in_account_currency, total_debit_in_account_currency, total_credit_in_account_currency = 0, 0, 0
+	totals = get_totals_dict()
+	entries = []
+
+	def update_value_in_dict(data, key, gle):
+		data[key].debit += flt(gle.debit)
+		data[key].credit += flt(gle.credit)
+
+		data[key].debit_in_account_currency += flt(gle.debit_in_account_currency)
+		data[key].credit_in_account_currency += flt(gle.credit_in_account_currency)
+
 
 	from_date, to_date = getdate(filters.from_date), getdate(filters.to_date)
 	for gle in gl_entries:
-		amount = flt(gle.debit, 3) - flt(gle.credit, 3)
-		amount_in_account_currency = flt(gle.debit_in_account_currency, 3) - flt(gle.credit_in_account_currency, 3)
-
-		if (filters.get("account") or filters.get("party") or filters.get("group_by_account")) \
-				and (gle.posting_date < from_date or cstr(gle.is_opening) == "Yes"):
-
-			gle_map[gle.account].opening += amount
-			if filters.get("show_in_account_currency"):
-				gle_map[gle.account].opening_in_account_currency += amount_in_account_currency
-
-			if filters.get("account") or filters.get("party"):
-				opening += amount
-				if filters.get("show_in_account_currency"):
-					opening_in_account_currency += amount_in_account_currency
+		if gle.posting_date < from_date or cstr(gle.is_opening) == "Yes":
+			update_value_in_dict(gle_map[gle.account].totals, 'opening', gle)
+			update_value_in_dict(totals, 'opening', gle)
 
 		elif gle.posting_date <= to_date:
-			gle_map[gle.account].entries.append(gle)
-			gle_map[gle.account].total_debit += flt(gle.debit, 3)
-			gle_map[gle.account].total_credit += flt(gle.credit, 3)
+			update_value_in_dict(gle_map[gle.account].totals, 'total', gle)
+			update_value_in_dict(totals, 'total', gle)
+			if filters.get("group_by_account"):
+				gle_map[gle.account].entries.append(gle)
+			else:
+				entries.append(gle)
 
-			total_debit += flt(gle.debit, 3)
-			total_credit += flt(gle.credit, 3)
+		update_value_in_dict(gle_map[gle.account].totals, 'closing', gle)
+		update_value_in_dict(totals, 'closing', gle)
 
-			if filters.get("show_in_account_currency"):
-				gle_map[gle.account].total_debit_in_account_currency += flt(gle.debit_in_account_currency, 3)
-				gle_map[gle.account].total_credit_in_account_currency += flt(gle.credit_in_account_currency, 3)
-
-				total_debit_in_account_currency += flt(gle.debit_in_account_currency, 3)
-				total_credit_in_account_currency += flt(gle.credit_in_account_currency, 3)
-
-	return opening, total_debit, total_credit, opening_in_account_currency, \
-		total_debit_in_account_currency, total_credit_in_account_currency, gle_map
-
-def get_balance_row(label, balance, balance_in_account_currency=None):
-	balance_row = {
-		"account": "'" + label + "'",
-		"debit": balance if balance > 0 else 0,
-		"credit": -1*balance if balance < 0 else 0
-	}
-
-	if balance_in_account_currency != None:
-		balance_row.update({
-			"debit_in_account_currency": balance_in_account_currency if balance_in_account_currency > 0 else 0,
-			"credit_in_account_currency": -1*balance_in_account_currency if balance_in_account_currency < 0 else 0
-		})
-
-	return balance_row
+	return totals, entries
 
 def get_result_as_list(data, filters):
 	result = []
diff --git a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
index 9892e03..205d43f 100644
--- a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
+++ b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
@@ -189,7 +189,9 @@
 
 	for parent, description, item_wise_tax_detail, charge_type, tax_amount in tax_details:
 		if description not in tax_columns and tax_amount:
-			tax_columns.append(description)
+			# as description is text editor earlier and markup can break the column convention in reports
+			from frappe.utils.xlsxutils import handle_html
+			tax_columns.append(handle_html(description))
 
 		if item_wise_tax_detail:
 			try:
diff --git a/erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.json b/erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.json
index db3c9d2..c983dc9 100644
--- a/erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.json
+++ b/erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.json
@@ -1,5 +1,5 @@
 {
- "add_total_row": 0, 
+ "add_total_row": 1, 
  "apply_user_permissions": 1, 
  "creation": "2013-02-21 14:26:44", 
  "disabled": 0, 
@@ -7,7 +7,7 @@
  "doctype": "Report", 
  "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2017-02-24 20:20:13.972178", 
+ "modified": "2017-11-06 13:04:51.559061", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Ordered Items To Be Billed", 
diff --git a/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.json b/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.json
index 906481f..64eb984 100644
--- a/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.json
+++ b/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.json
@@ -1,5 +1,5 @@
 {
- "add_total_row": 0, 
+ "add_total_row": 1, 
  "apply_user_permissions": 1, 
  "creation": "2013-07-30 18:35:10", 
  "disabled": 0, 
@@ -7,7 +7,7 @@
  "doctype": "Report", 
  "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2017-02-24 19:59:52.887744", 
+ "modified": "2017-11-06 13:04:26.094432", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Received Items To Be Billed", 
diff --git a/erpnext/accounts/report/sales_register/sales_register.js b/erpnext/accounts/report/sales_register/sales_register.js
index 0495976..db74626 100644
--- a/erpnext/accounts/report/sales_register/sales_register.js
+++ b/erpnext/accounts/report/sales_register/sales_register.js
@@ -34,6 +34,24 @@
 			"label": __("Mode of Payment"),
 			"fieldtype": "Link",
 			"options": "Mode of Payment"
+		},
+		{
+			"fieldname":"owner",
+			"label": __("Owner"),
+			"fieldtype": "Link",
+			"options": "User"
+		},
+		{
+			"fieldname":"cost_center",
+			"label": __("Cost Center"),
+			"fieldtype": "Link",
+			"options": "Cost Center"
+		},
+		{
+			"fieldname":"warehouse",
+			"label": __("Warehouse"),
+			"fieldtype": "Link",
+			"options": "Warehouse"
 		}
 	]
 }
diff --git a/erpnext/accounts/report/sales_register/sales_register.py b/erpnext/accounts/report/sales_register/sales_register.py
index c471b8b..ace8d54 100644
--- a/erpnext/accounts/report/sales_register/sales_register.py
+++ b/erpnext/accounts/report/sales_register/sales_register.py
@@ -22,7 +22,8 @@
 	invoice_income_map = get_invoice_income_map(invoice_list)
 	invoice_income_map, invoice_tax_map = get_invoice_tax_map(invoice_list,
 		invoice_income_map, income_accounts)
-
+	#Cost Center & Warehouse Map
+	invoice_cc_wh_map = get_invoice_cc_wh_map(invoice_list)
 	invoice_so_dn_map = get_invoice_so_dn_map(invoice_list)
 	customers = list(set([inv.customer for inv in invoice_list]))
 	customer_map = get_customer_details(customers)
@@ -34,6 +35,8 @@
 		# invoice details
 		sales_order = list(set(invoice_so_dn_map.get(inv.name, {}).get("sales_order", [])))
 		delivery_note = list(set(invoice_so_dn_map.get(inv.name, {}).get("delivery_note", [])))
+		cost_center = list(set(invoice_cc_wh_map.get(inv.name, {}).get("cost_center", [])))
+		warehouse = list(set(invoice_cc_wh_map.get(inv.name, {}).get("warehouse", [])))
 
 		customer_details = customer_map.get(inv.customer, {})
 		row = [
@@ -48,8 +51,9 @@
 			customer_details.get("customer_group"),
 			customer_details.get("territory"),
 			inv.debit_to, ", ".join(mode_of_payments.get(inv.name, [])),
-			inv.project, inv.remarks,
-			", ".join(sales_order), ", ".join(delivery_note), company_currency
+			inv.project, inv.owner, inv.remarks,
+			", ".join(sales_order), ", ".join(delivery_note),", ".join(cost_center),
+			", ".join(warehouse), company_currency
 		]
 		# map income values
 		base_net_total = 0
@@ -89,8 +93,9 @@
 	columns +=[
 		_("Customer Group") + ":Link/Customer Group:120", _("Territory") + ":Link/Territory:80",
 		_("Receivable Account") + ":Link/Account:120", _("Mode of Payment") + "::120",
-		_("Project") +":Link/Project:80", _("Remarks") + "::150",
+		_("Project") +":Link/Project:80", _("Owner") + "::150", _("Remarks") + "::150",
 		_("Sales Order") + ":Link/Sales Order:100", _("Delivery Note") + ":Link/Delivery Note:100",
+		_("Cost Center") + ":Link/Cost Center:100", _("Warehouse") + ":Link/Warehouse:100",
 		{
 			"fieldname": "currency",
 			"label": _("Currency"),
@@ -133,11 +138,23 @@
 	if filters.get("from_date"): conditions += " and posting_date >= %(from_date)s"
 	if filters.get("to_date"): conditions += " and posting_date <= %(to_date)s"
 
+	if filters.get("owner"): conditions += " and owner = %(owner)s"
+
 	if filters.get("mode_of_payment"):
 		conditions += """ and exists(select name from `tabSales Invoice Payment`
 			 where parent=`tabSales Invoice`.name
 			 	and ifnull(`tabSales Invoice Payment`.mode_of_payment, '') = %(mode_of_payment)s)"""
 
+	if filters.get("cost_center"):
+		conditions +=  """ and exists(select name from `tabSales Invoice Item`
+			 where parent=`tabSales Invoice`.name
+			 	and ifnull(`tabSales Invoice Item`.cost_center, '') = %(cost_center)s)"""
+
+	if filters.get("warehouse"):
+		conditions +=  """ and exists(select name from `tabSales Invoice Item`
+			 where parent=`tabSales Invoice`.name
+			 	and ifnull(`tabSales Invoice Item`.warehouse, '') = %(warehouse)s)"""
+
 	return conditions
 
 def get_invoices(filters, additional_query_columns):
@@ -145,7 +162,7 @@
 		additional_query_columns = ', ' + ', '.join(additional_query_columns)
 
 	conditions = get_conditions(filters)
-	return frappe.db.sql("""select name, posting_date, debit_to, project, customer, customer_name, remarks,
+	return frappe.db.sql("""select name, posting_date, debit_to, project, customer, customer_name, owner, remarks,
 		base_net_total, base_grand_total, base_rounded_total, outstanding_amount {0}
 		from `tabSales Invoice`
 		where docstatus = 1 %s order by posting_date desc, name desc""".format(additional_query_columns or '') %
@@ -206,6 +223,24 @@
 
 	return invoice_so_dn_map
 
+def get_invoice_cc_wh_map(invoice_list):
+	si_items = frappe.db.sql("""select parent, cost_center, warehouse
+		from `tabSales Invoice Item` where parent in (%s)
+		and (ifnull(cost_center, '') != '' or ifnull(warehouse, '') != '')""" %
+		', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]), as_dict=1)
+
+	invoice_cc_wh_map = {}
+	for d in si_items:
+		if d.cost_center:
+			invoice_cc_wh_map.setdefault(d.parent, frappe._dict()).setdefault(
+				"cost_center", []).append(d.cost_center)
+
+		if d.warehouse:
+			invoice_cc_wh_map.setdefault(d.parent, frappe._dict()).setdefault(
+				"warehouse", []).append(d.warehouse)
+
+	return invoice_cc_wh_map
+
 def get_customer_details(customers):
 	customer_map = {}
 	for cust in frappe.db.sql("""select name, territory, customer_group from `tabCustomer`
@@ -225,4 +260,4 @@
 		for d in inv_mop:
 			mode_of_payments.setdefault(d.parent, []).append(d.mode_of_payment)
 
-	return mode_of_payments
+	return mode_of_payments
\ No newline at end of file
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index bcce6a1..abdadb3 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -257,6 +257,8 @@
 	if cint(ac.get("is_root")):
 		ac.parent_account = None
 		ac.flags.ignore_mandatory = True
+	else:
+		ac.root_type = None
 
 	ac.insert()
 
@@ -569,26 +571,21 @@
 	# Amount should be credited
 	return flt(stock_rbnb) + flt(sys_bal)
 
+
 def get_outstanding_invoices(party_type, party, account, condition=None):
 	outstanding_invoices = []
 	precision = frappe.get_precision("Sales Invoice", "outstanding_amount")
 
-	if party_type=="Customer":
+	if party_type == "Customer" or party_type == "Student":
 		dr_or_cr = "debit_in_account_currency - credit_in_account_currency"
 		payment_dr_or_cr = "payment_gl_entry.credit_in_account_currency - payment_gl_entry.debit_in_account_currency"
 	else:
 		dr_or_cr = "credit_in_account_currency - debit_in_account_currency"
 		payment_dr_or_cr = "payment_gl_entry.debit_in_account_currency - payment_gl_entry.credit_in_account_currency"
 
-	invoice = 'Sales Invoice' if party_type == 'Customer' else 'Purchase Invoice'
 	invoice_list = frappe.db.sql("""
 		select
-			voucher_no,	voucher_type, posting_date, ifnull(sum({dr_or_cr}), 0) as invoice_amount,
-			(
-				case when (voucher_type = 'Sales Invoice' or voucher_type = 'Purchase Invoice')
-					then (select due_date from `tab{invoice}` where name = voucher_no)
-				else posting_date end
-			) as due_date,
+			voucher_no,	voucher_type, posting_date, ifnull(sum({dr_or_cr}), 0) as invoice_amount, due_date,
 			(
 				select ifnull(sum({payment_dr_or_cr}), 0)
 				from `tabGL Entry` payment_gl_entry
@@ -599,6 +596,7 @@
 					and payment_gl_entry.party_type = invoice_gl_entry.party_type
 					and payment_gl_entry.party = invoice_gl_entry.party
 					and payment_gl_entry.account = invoice_gl_entry.account
+					and payment_gl_entry.due_date = invoice_gl_entry.due_date
 					and {payment_dr_or_cr} > 0
 			) as payment_amount
 		from
@@ -610,13 +608,12 @@
 			and ((voucher_type = 'Journal Entry'
 					and (against_voucher = '' or against_voucher is null))
 				or (voucher_type not in ('Journal Entry', 'Payment Entry')))
-		group by voucher_type, voucher_no
+		group by voucher_type, voucher_no, due_date
 		having (invoice_amount - payment_amount) > 0.005
-		order by posting_date, name""".format(
-			dr_or_cr = dr_or_cr,
-			invoice = invoice,
-			payment_dr_or_cr = payment_dr_or_cr,
-			condition = condition or ""
+		order by posting_date, name, due_date""".format(
+			dr_or_cr=dr_or_cr,
+			payment_dr_or_cr=payment_dr_or_cr,
+			condition=condition or ""
 		), {
 			"party_type": party_type,
 			"party": party,
@@ -624,17 +621,24 @@
 		}, as_dict=True)
 
 	for d in invoice_list:
-		outstanding_invoices.append(frappe._dict({
-			'voucher_no': d.voucher_no,
-			'voucher_type': d.voucher_type,
-			'due_date': d.due_date,
-			'posting_date': d.posting_date,
-			'invoice_amount': flt(d.invoice_amount),
-			'payment_amount': flt(d.payment_amount),
-			'outstanding_amount': flt(d.invoice_amount - d.payment_amount, precision),
-			'due_date': frappe.db.get_value(d.voucher_type, d.voucher_no, 
-				"posting_date" if party_type=="Employee" else "due_date"),
-		}))
+		due_date = d.due_date or (
+			frappe.db.get_value(
+				d.voucher_type, d.voucher_no,
+				"posting_date" if party_type == "Employee" else "due_date"
+			)
+		)
+
+		outstanding_invoices.append(
+			frappe._dict({
+				'voucher_no': d.voucher_no,
+				'voucher_type': d.voucher_type,
+				'posting_date': d.posting_date,
+				'invoice_amount': flt(d.invoice_amount),
+				'payment_amount': flt(d.payment_amount),
+				'outstanding_amount': flt(d.invoice_amount - d.payment_amount, precision),
+				'due_date': due_date
+			})
+		)
 
 	outstanding_invoices = sorted(outstanding_invoices, key=lambda k: k['due_date'] or getdate(nowdate()))
 
@@ -658,16 +662,14 @@
 		order_by="name")]
 
 @frappe.whitelist()
-def get_children():
+def get_children(doctype, parent, company, is_root=False):
 	from erpnext.accounts.report.financial_statements import sort_root_accounts
 
-	args = frappe.local.form_dict
-	doctype, company = args['doctype'], args['company']
 	fieldname = frappe.db.escape(doctype.lower().replace(' ','_'))
 	doctype = frappe.db.escape(doctype)
 
 	# root
-	if args['parent'] in ("Accounts", "Cost Centers"):
+	if is_root:
 		fields = ", root_type, report_type, account_currency" if doctype=="Account" else ""
 		acc = frappe.db.sql(""" select
 			name as value, is_group as expandable {fields}
@@ -677,7 +679,7 @@
 			order by name""".format(fields=fields, fieldname = fieldname, doctype=doctype),
 				company, as_dict=1)
 
-		if args["parent"]=="Accounts":
+		if parent=="Accounts":
 			sort_root_accounts(acc)
 	else:
 		# other
@@ -688,7 +690,7 @@
 			where ifnull(`parent_{fieldname}`,'') = %s
 			and docstatus<2
 			order by name""".format(fields=fields, fieldname=fieldname, doctype=doctype),
-				args['parent'], as_dict=1)
+				parent, as_dict=1)
 
 	if doctype == 'Account':
 		company_currency = frappe.db.get_value("Company", company, "default_currency")
diff --git a/erpnext/schools/__init__.py b/erpnext/agriculture/__init__.py
similarity index 100%
copy from erpnext/schools/__init__.py
copy to erpnext/agriculture/__init__.py
diff --git a/erpnext/schools/doctype/__init__.py b/erpnext/agriculture/doctype/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/__init__.py
copy to erpnext/agriculture/doctype/__init__.py
diff --git a/erpnext/schools/doctype/assessment_criteria/__init__.py b/erpnext/agriculture/doctype/agriculture_analysis_criteria/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/assessment_criteria/__init__.py
copy to erpnext/agriculture/doctype/agriculture_analysis_criteria/__init__.py
diff --git a/erpnext/agriculture/doctype/agriculture_analysis_criteria/agriculture_analysis_criteria.js b/erpnext/agriculture/doctype/agriculture_analysis_criteria/agriculture_analysis_criteria.js
new file mode 100644
index 0000000..e236cc6
--- /dev/null
+++ b/erpnext/agriculture/doctype/agriculture_analysis_criteria/agriculture_analysis_criteria.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Agriculture Analysis Criteria', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/agriculture/doctype/agriculture_analysis_criteria/agriculture_analysis_criteria.json b/erpnext/agriculture/doctype/agriculture_analysis_criteria/agriculture_analysis_criteria.json
new file mode 100644
index 0000000..a53bffd
--- /dev/null
+++ b/erpnext/agriculture/doctype/agriculture_analysis_criteria/agriculture_analysis_criteria.json
@@ -0,0 +1,155 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:title", 
+ "beta": 0, 
+ "creation": "2017-12-05 16:37:46.599982", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "title", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Title", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "standard", 
+   "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": "Standard", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "linked_doctype", 
+   "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": "Linked Doctype", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nWater Analysis\nSoil Analysis\nPlant Analysis\nFertilizer\nSoil Texture\nWeather", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-05 18:54:26.250707", 
+ "modified_by": "Administrator", 
+ "module": "Agriculture", 
+ "name": "Agriculture Analysis Criteria", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/agriculture_analysis_criteria/agriculture_analysis_criteria.py b/erpnext/agriculture/doctype/agriculture_analysis_criteria/agriculture_analysis_criteria.py
new file mode 100644
index 0000000..3bd3d7d
--- /dev/null
+++ b/erpnext/agriculture/doctype/agriculture_analysis_criteria/agriculture_analysis_criteria.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class AgricultureAnalysisCriteria(Document):
+	pass
diff --git a/erpnext/agriculture/doctype/agriculture_analysis_criteria/test_agriculture_analysis_criteria.js b/erpnext/agriculture/doctype/agriculture_analysis_criteria/test_agriculture_analysis_criteria.js
new file mode 100644
index 0000000..f70dcd2
--- /dev/null
+++ b/erpnext/agriculture/doctype/agriculture_analysis_criteria/test_agriculture_analysis_criteria.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Agriculture Analysis Criteria", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Agriculture Analysis Criteria
+		() => frappe.tests.make('Agriculture Analysis Criteria', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/agriculture/doctype/agriculture_analysis_criteria/test_agriculture_analysis_criteria.py b/erpnext/agriculture/doctype/agriculture_analysis_criteria/test_agriculture_analysis_criteria.py
new file mode 100644
index 0000000..d79970b
--- /dev/null
+++ b/erpnext/agriculture/doctype/agriculture_analysis_criteria/test_agriculture_analysis_criteria.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestAgricultureAnalysisCriteria(unittest.TestCase):
+	pass
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/agriculture/doctype/agriculture_task/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/agriculture/doctype/agriculture_task/__init__.py
diff --git a/erpnext/agriculture/doctype/agriculture_task/agriculture_task.js b/erpnext/agriculture/doctype/agriculture_task/agriculture_task.js
new file mode 100644
index 0000000..4d6b959
--- /dev/null
+++ b/erpnext/agriculture/doctype/agriculture_task/agriculture_task.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Agriculture Task', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/agriculture/doctype/agriculture_task/agriculture_task.json b/erpnext/agriculture/doctype/agriculture_task/agriculture_task.json
new file mode 100644
index 0000000..11c691c
--- /dev/null
+++ b/erpnext/agriculture/doctype/agriculture_task/agriculture_task.json
@@ -0,0 +1,199 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "ATask.########", 
+ "beta": 0, 
+ "creation": "2017-10-26 15:51:19.602452", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "task_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Task Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "fieldname": "start_day", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Start Day", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "fieldname": "end_day", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "End Day", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Ignore holidays", 
+   "fieldname": "holiday_management", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Holiday Management", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Ignore holidays\nPrevious Business Day\nNext Business Day", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Low", 
+   "fieldname": "priority", 
+   "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": "Priority", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Low\nMedium\nHigh\nUrgent", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-12-06 01:13:14.512609", 
+ "modified_by": "Administrator", 
+ "module": "Agriculture", 
+ "name": "Agriculture Task", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/agriculture_task/agriculture_task.py b/erpnext/agriculture/doctype/agriculture_task/agriculture_task.py
new file mode 100644
index 0000000..ce39368
--- /dev/null
+++ b/erpnext/agriculture/doctype/agriculture_task/agriculture_task.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class AgricultureTask(Document):
+	pass
diff --git a/erpnext/agriculture/doctype/agriculture_task/test_agriculture_task.js b/erpnext/agriculture/doctype/agriculture_task/test_agriculture_task.js
new file mode 100644
index 0000000..a012c4b
--- /dev/null
+++ b/erpnext/agriculture/doctype/agriculture_task/test_agriculture_task.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Agriculture Task", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Agriculture Task
+		() => frappe.tests.make('Agriculture Task', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/agriculture/doctype/agriculture_task/test_agriculture_task.py b/erpnext/agriculture/doctype/agriculture_task/test_agriculture_task.py
new file mode 100644
index 0000000..e828151
--- /dev/null
+++ b/erpnext/agriculture/doctype/agriculture_task/test_agriculture_task.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestAgricultureTask(unittest.TestCase):
+	pass
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/agriculture/doctype/crop/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/agriculture/doctype/crop/__init__.py
diff --git a/erpnext/agriculture/doctype/crop/crop.js b/erpnext/agriculture/doctype/crop/crop.js
new file mode 100644
index 0000000..587727c
--- /dev/null
+++ b/erpnext/agriculture/doctype/crop/crop.js
@@ -0,0 +1,7 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Crop', {
+	validate: (frm) => {
+	}
+});
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/crop/crop.json b/erpnext/agriculture/doctype/crop/crop.json
new file mode 100644
index 0000000..8e6807f
--- /dev/null
+++ b/erpnext/agriculture/doctype/crop/crop.json
@@ -0,0 +1,1045 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:title", 
+ "beta": 0, 
+ "creation": "2017-10-20 01:16:17.606174", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "title", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Title", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_2", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "crop_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Crop Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "scientific_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Scientific Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "You can define all the tasks which need to carried out for this crop here. The day field is used to mention the day on which the task needs to be carried out, 1 being the 1st day, etc.. ", 
+   "fieldname": "section_break_20", 
+   "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": "Tasks", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "agriculture_task", 
+   "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": "Agriculture Task", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Agriculture Task", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "period", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Period", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_9", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "crop_spacing", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Crop Spacing", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "crop_spacing_uom", 
+   "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": "Crop Spacing UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_12", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "row_spacing", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Row Spacing", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "row_spacing_uom", 
+   "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": "Row Spacing UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_4", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Annual\nPerennial\nBiennial", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_6", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "category", 
+   "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": "Category", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_8", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "target_warehouse", 
+   "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": "Target Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_12", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "planting_uom", 
+   "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": "Planting UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "planting_area", 
+   "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": "Planting Area", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_14", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "yield_uom", 
+   "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": "Yield UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_16", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_17", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Materials Required", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "materials_required", 
+   "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": "Materials Required", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "BOM Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_19", 
+   "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": "Produced Items", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "produce", 
+   "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": "Produce", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "BOM Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_18", 
+   "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": "Byproducts", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "byproducts", 
+   "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": "Byproducts", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "BOM Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-06 11:00:06.333894", 
+ "modified_by": "Administrator", 
+ "module": "Agriculture", 
+ "name": "Crop", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Agriculture Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Agriculture User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/crop/crop.py b/erpnext/agriculture/doctype/crop/crop.py
new file mode 100644
index 0000000..29b9823
--- /dev/null
+++ b/erpnext/agriculture/doctype/crop/crop.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class Crop(Document):
+	def validate(self):
+		max_period = 0
+		for task in self.agriculture_task:
+			# validate start_day is not > end_day
+			if task.start_day > task.end_day:
+				frappe.throw("Start day is greater than end day in task '{0}'".format(task.subject))
+			# to calculate the period of the Crop Cycle
+			if task.end_day > max_period: max_period = task.end_day
+		if max_period > self.period: self.period = max_period
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/crop/crop_dashboard.py b/erpnext/agriculture/doctype/crop/crop_dashboard.py
new file mode 100644
index 0000000..715f92b
--- /dev/null
+++ b/erpnext/agriculture/doctype/crop/crop_dashboard.py
@@ -0,0 +1,11 @@
+from frappe import _
+
+def get_data():
+	return {
+		'transactions': [
+			{
+				'label': _('Crop Cycle'),
+				'items': ['Crop Cycle']
+			}
+		]
+	}
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/crop/test_crop.js b/erpnext/agriculture/doctype/crop/test_crop.js
new file mode 100644
index 0000000..138acbf
--- /dev/null
+++ b/erpnext/agriculture/doctype/crop/test_crop.js
@@ -0,0 +1,116 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Crop", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(2);
+
+	frappe.run_serially([
+		// insert a new Item
+		() => frappe.tests.make('Item', [
+			// values to be set
+			{item_code: 'Basil Seeds'},
+			{item_name: 'Basil Seeds'},
+			{item_group: 'Seed'}
+		]),
+		// insert a new Item
+		() => frappe.tests.make('Item', [
+			// values to be set
+			{item_code: 'Twigs'},
+			{item_name: 'Twigs'},
+			{item_group: 'By-product'}
+		]),
+		// insert a new Item
+		() => frappe.tests.make('Item', [
+			// values to be set
+			{item_code: 'Basil Leaves'},
+			{item_name: 'Basil Leaves'},
+			{item_group: 'Produce'}
+		]),
+		// insert a new Crop
+		() => frappe.tests.make('Crop', [
+			// values to be set
+			{title: 'Basil from seed'},
+			{crop_name: 'Basil'},
+			{scientific_name: 'Ocimum basilicum'},
+			{materials_required: [
+				[
+					{item_code: 'Basil Seeds'},
+					{qty: '25'},
+					{uom: 'Nos'},
+					{rate: '1'}
+				],
+				[
+					{item_code: 'Urea'},
+					{qty: '5'},
+					{uom: 'Kg'},
+					{rate: '10'}
+				]
+			]},
+			{byproducts: [
+				[
+					{item_code: 'Twigs'},
+					{qty: '25'},
+					{uom: 'Nos'},
+					{rate: '1'}
+				]
+			]},
+			{produce: [
+				[
+					{item_code: 'Basil Leaves'},
+					{qty: '100'},
+					{uom: 'Nos'},
+					{rate: '1'}
+				]
+			]},
+			{agriculture_task: [
+				[
+					{task_name: "Plough the field"},
+					{start_day: 1},
+					{end_day: 1},
+					{holiday_management: "Ignore holidays"}
+				],
+				[
+					{task_name: "Plant the seeds"},
+					{start_day: 2},
+					{end_day: 3},
+					{holiday_management: "Ignore holidays"}
+				],
+				[
+					{task_name: "Water the field"},
+					{start_day: 4},
+					{end_day: 4},
+					{holiday_management: "Ignore holidays"}
+				],
+				[
+					{task_name: "First harvest"},
+					{start_day: 8},
+					{end_day: 8},
+					{holiday_management: "Ignore holidays"}
+				],
+				[
+					{task_name: "Add the fertilizer"},
+					{start_day: 10},
+					{end_day: 12},
+					{holiday_management: "Ignore holidays"}
+				],
+				[
+					{task_name: "Final cut"},
+					{start_day: 15},
+					{end_day: 15},
+					{holiday_management: "Ignore holidays"}
+				]
+			]}
+		]),
+		// agriculture task list 
+		() => {
+			assert.equal(cur_frm.doc.name, 'Basil from seed');
+			assert.equal(cur_frm.doc.period, 15);
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/agriculture/doctype/crop/test_crop.py b/erpnext/agriculture/doctype/crop/test_crop.py
new file mode 100644
index 0000000..5c992ea
--- /dev/null
+++ b/erpnext/agriculture/doctype/crop/test_crop.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+test_dependencies = ["Fertilizer"]
+
+class TestCrop(unittest.TestCase):
+	def test_crop_period(self):
+		basil = frappe.get_doc('Crop', 'Basil from seed')
+		self.assertEquals(basil.period, 15)
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/crop/test_records.json b/erpnext/agriculture/doctype/crop/test_records.json
new file mode 100644
index 0000000..41ddb9a
--- /dev/null
+++ b/erpnext/agriculture/doctype/crop/test_records.json
@@ -0,0 +1,80 @@
+[
+	{
+		"doctype": "Item",
+		"item_code": "Basil Seeds",
+		"item_name": "Basil Seeds",
+		"item_group": "Seed"
+	},
+	{
+		"doctype": "Item",
+		"item_code": "Twigs",
+		"item_name": "Twigs",
+		"item_group": "By-product"
+	},
+	{
+		"doctype": "Item",
+		"item_code": "Basil Leaves",
+		"item_name": "Basil Leaves",
+		"item_group": "Produce"
+	},
+	{
+		"doctype": "Crop",
+		"title": "Basil from seed",
+		"crop_name": "Basil",
+		"scientific_name": "Ocimum basilicum",
+		"materials_required": [{
+			"item_code": "Basil Seeds",
+			"qty": "25",
+			"uom": "Nos",
+			"rate": "1"
+		}, {
+			"item_code": "Urea",
+			"qty": "5",
+			"uom": "Kg",
+			"rate": "10"
+		}],
+		"byproducts": [{
+			"item_code": "Twigs",
+			"qty": "25",
+			"uom": "Nos",
+			"rate": "1"
+		}],
+		"produce": [{
+			"item_code": "Basil Leaves",
+			"qty": "100",
+			"uom": "Nos",
+			"rate": "1"
+		}],
+		"agriculture_task": [{
+			"task_name": "Plough the field",
+			"start_day": 1,
+			"end_day": 1,
+			"holiday_management": "Ignore holidays"
+		}, {
+			"task_name": "Plant the seeds",
+			"start_day": 2,
+			"end_day": 3,
+			"holiday_management": "Ignore holidays"
+		}, {
+			"task_name": "Water the field",
+			"start_day": 4,
+			"end_day": 4,
+			"holiday_management": "Ignore holidays"
+		}, {
+			"task_name": "First harvest",
+			"start_day": 8,
+			"end_day": 8,
+			"holiday_management": "Ignore holidays"
+		}, {
+			"task_name": "Add the fertilizer",
+			"start_day": 10,
+			"end_day": 12,
+			"holiday_management": "Ignore holidays"
+		}, {
+			"task_name": "Final cut",
+			"start_day": 15,
+			"end_day": 15,
+			"holiday_management": "Ignore holidays"
+		}]
+	}
+]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/agriculture/doctype/crop_cycle/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/agriculture/doctype/crop_cycle/__init__.py
diff --git a/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js b/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js
new file mode 100644
index 0000000..98dd056
--- /dev/null
+++ b/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js
@@ -0,0 +1,48 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Crop Cycle', {
+	refresh: (frm) => {
+		if (!frm.doc.__islocal)
+			frm.add_custom_button(__('Reload Linked Analysis'), () => frm.call("reload_linked_analysis"));
+
+		frappe.realtime.on("List of Linked Docs", (output) => {
+			let analysis_doctypes = ['Soil Texture', 'Plant Analysis', 'Soil Analysis'];
+			let analysis_doctypes_docs = ['soil_texture', 'plant_analysis', 'soil_analysis'];
+			let obj_to_append = {soil_analysis: [], soil_texture: [], plant_analysis: []};
+			output['Land Unit'].forEach( (land_doc) => {
+				analysis_doctypes.forEach( (doctype) => {
+					output[doctype].forEach( (analysis_doc) => {
+						let point_to_be_tested = JSON.parse(analysis_doc.location).features[0].geometry.coordinates;
+						let poly_of_land = JSON.parse(land_doc.location).features[0].geometry.coordinates[0];
+						if (test_analysis_position(point_to_be_tested, poly_of_land)){
+							obj_to_append[analysis_doctypes_docs[analysis_doctypes.indexOf(doctype)]].push(analysis_doc.name);
+						}
+					});
+				});
+			});
+			frm.call('append_to_child', {
+				obj_to_append: obj_to_append
+			});
+		});
+	}
+});
+
+function test_analysis_position(point, vs) {
+	// ray-casting algorithm based on
+	// http://www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html
+	
+	var x = point[0], y = point[1];
+	
+	var inside = false;
+	for (var i = 0, j = vs.length - 1; i < vs.length; j = i++) {
+		var xi = vs[i][0], yi = vs[i][1];
+		var xj = vs[j][0], yj = vs[j][1];
+		
+		var intersect = ((yi > y) != (yj > y))
+			&& (x < (xj - xi) * (y - yi) / (yj - yi) + xi);
+		if (intersect) inside = !inside;
+	}
+	
+	return inside;
+};
diff --git a/erpnext/agriculture/doctype/crop_cycle/crop_cycle.json b/erpnext/agriculture/doctype/crop_cycle/crop_cycle.json
new file mode 100644
index 0000000..410a0d4
--- /dev/null
+++ b/erpnext/agriculture/doctype/crop_cycle/crop_cycle.json
@@ -0,0 +1,849 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:title", 
+ "beta": 0, 
+ "creation": "2017-11-02 03:09:35.449880", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "title", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Title", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "crop", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Crop", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Crop", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "", 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Linked Land Unit", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "A link to all the Land Units in which the Crop is growing", 
+   "fieldname": "linked_land_unit", 
+   "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": "Linked Land Unit", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Linked Land Unit", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_3", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "project", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Project", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Project", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_12", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "This will be day 1 of the crop cycle", 
+   "fieldname": "start_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Start Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "end_date", 
+   "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": "End Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "project.expected_end_date", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_7", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "iso_8016_standard", 
+   "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": "ISO 8016 standard", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_5", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cycle_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Cycle Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Yearly\nLess than a year", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_12", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "The minimum length between each plant in the field for optimum growth", 
+   "fieldname": "crop_spacing", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Crop Spacing", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "crop.crop_spacing", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "crop_spacing_uom", 
+   "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": "Crop Spacing UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_11", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "The minimum distance between rows of plants for optimum growth", 
+   "fieldname": "row_spacing", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Row Spacing", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "crop.row_spacing", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "row_spacing_uom", 
+   "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": "Row Spacing UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ", 
+   "fieldname": "section_break_14", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Detected Diseases", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "detected_disease", 
+   "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": "Detected Disease", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Detected Disease", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "collapsible_depends_on": "eval:false", 
+   "columns": 0, 
+   "fieldname": "section_break_22", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "LInked Analysis", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "soil_texture", 
+   "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": "Soil Texture", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Linked Soil Texture", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "soil_analysis", 
+   "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": "Soil Analysis", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Linked Soil Analysis", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "plant_analysis", 
+   "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": "Plant Analysis", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Linked Plant Analysis", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-06 01:47:26.656870", 
+ "modified_by": "Administrator", 
+ "module": "Agriculture", 
+ "name": "Crop Cycle", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Agriculture Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Agriculture User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/crop_cycle/crop_cycle.py b/erpnext/agriculture/doctype/crop_cycle/crop_cycle.py
new file mode 100644
index 0000000..8912f59
--- /dev/null
+++ b/erpnext/agriculture/doctype/crop_cycle/crop_cycle.py
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+import ast
+
+class CropCycle(Document):
+	def validate(self):
+		if self.is_new():
+			crop = frappe.get_doc('Crop', self.crop)
+			self.create_project(crop.period, crop.agriculture_task)
+		if not self.project:
+			self.project = self.name
+		for detected_disease in self.detected_disease:
+			disease = frappe.get_doc('Disease', detected_disease.disease)
+			self.create_task(disease.treatment_task, self.name, detected_disease.start_date)
+
+	def create_project(self, period, crop_tasks):
+		project = frappe.new_doc("Project")
+		project.project_name = self.title
+		project.expected_start_date = self.start_date
+		project.expected_end_date = frappe.utils.data.add_days(self.start_date, period-1)
+		project.insert()
+		self.create_task(crop_tasks, project.as_dict.im_self.name, self.start_date)
+		return project.as_dict.im_self.name
+
+	def create_task(self, crop_tasks, project_name, start_date):
+		for crop_task in crop_tasks:
+			task = frappe.new_doc("Task")
+			task.subject = crop_task.get("task_name")
+			task.priority = crop_task.get("priority")
+			task.project = project_name
+			task.exp_start_date = frappe.utils.data.add_days(start_date, crop_task.get("start_day")-1)
+			task.exp_end_date = frappe.utils.data.add_days(start_date, crop_task.get("end_day")-1)
+			task.insert()
+
+	def reload_linked_analysis(self):
+		linked_doctypes = ['Soil Texture', 'Soil Analysis', 'Plant Analysis']
+		required_fields = ['location', 'name', 'collection_datetime']
+		output = {}
+		for doctype in linked_doctypes:
+			output[doctype] = frappe.get_all(doctype, fields=required_fields)
+		output['Land Unit'] = []
+		for land in self.linked_land_unit:
+			output['Land Unit'].append(frappe.get_doc('Land Unit', land.land_unit))
+
+		frappe.publish_realtime("List of Linked Docs", output, user=frappe.session.user)
+
+	def append_to_child(self, obj_to_append):
+		for doctype in obj_to_append:
+			for doc_name in set(obj_to_append[doctype]):
+				self.append(doctype, {doctype: doc_name})
+		self.save()
+
+	def get_coordinates(self, doc):
+		return ast.literal_eval(doc.location).get('features')[0].get('geometry').get('coordinates')
+
+	def get_geometry_type(self, doc):
+		return ast.literal_eval(doc.location).get('features')[0].get('geometry').get('type')
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/crop_cycle/test_crop_cycle.js b/erpnext/agriculture/doctype/crop_cycle/test_crop_cycle.js
new file mode 100644
index 0000000..464a368
--- /dev/null
+++ b/erpnext/agriculture/doctype/crop_cycle/test_crop_cycle.js
@@ -0,0 +1,34 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Crop Cycle", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Crop Cycle
+		() => frappe.tests.make('Crop Cycle', [
+			// values to be set
+			{title: 'Basil from seed 2017'},
+			{detected_disease: [
+				[
+					{start_date: '2017-11-21'},
+					{disease: 'Aphids'}
+				]
+			]},
+			{linked_land_unit: [ 
+				[
+					{land_unit: 'Basil Farm'}
+				]
+			]},
+			{crop: 'Basil from seed'},
+			{start_date: '2017-11-11'},
+			{cycle_type: 'Less than a year'}
+		]),
+		() => assert.equal(cur_frm.doc.name, 'Basil from seed 2017'),
+		() => done()
+	]);
+});
diff --git a/erpnext/agriculture/doctype/crop_cycle/test_crop_cycle.py b/erpnext/agriculture/doctype/crop_cycle/test_crop_cycle.py
new file mode 100644
index 0000000..0c3db73
--- /dev/null
+++ b/erpnext/agriculture/doctype/crop_cycle/test_crop_cycle.py
@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+test_dependencies = ["Crop", "Fertilizer", "Land Unit", "Disease"]
+
+class TestCropCycle(unittest.TestCase):
+	def test_crop_cycle_creation(self):
+		cycle = frappe.get_doc('Crop Cycle', 'Basil from seed 2017')
+		self.assertEquals(frappe.db.exists('Crop Cycle', 'Basil from seed 2017'), 'Basil from seed 2017')
+
+		# check if the tasks were created 
+		self.assertEquals(check_task_creation(), True)
+		self.assertEquals(check_project_creation(), True)
+
+def check_task_creation():
+	all_task_dict = {
+		"Survey and find the aphid locations": {
+			"exp_start_date": frappe.utils.datetime.date(2017,11,21),
+			"exp_end_date": frappe.utils.datetime.date(2017,11,22)
+		},
+		"Apply Pesticides": {
+			"exp_start_date": frappe.utils.datetime.date(2017,11,23),
+			"exp_end_date": frappe.utils.datetime.date(2017,11,23)
+		},
+		"Plough the field": {
+			"exp_start_date": frappe.utils.datetime.date(2017,11,11),
+			"exp_end_date": frappe.utils.datetime.date(2017,11,11)
+		},
+		"Plant the seeds": {
+			"exp_start_date": frappe.utils.datetime.date(2017,11,12),
+			"exp_end_date": frappe.utils.datetime.date(2017,11,13)
+		},
+		"Water the field": {
+			"exp_start_date": frappe.utils.datetime.date(2017,11,14),
+			"exp_end_date": frappe.utils.datetime.date(2017,11,14)
+		},
+		"First harvest": {
+			"exp_start_date": frappe.utils.datetime.date(2017,11,18),
+			"exp_end_date": frappe.utils.datetime.date(2017,11,18)
+		},
+		"Add the fertilizer": {
+			"exp_start_date": frappe.utils.datetime.date(2017,11,20),
+			"exp_end_date": frappe.utils.datetime.date(2017,11,22)
+		},
+		"Final cut":{
+			"exp_start_date": frappe.utils.datetime.date(2017,11,25),
+			"exp_end_date": frappe.utils.datetime.date(2017,11,25)
+		}
+	}
+	all_tasks = frappe.get_all('Task')
+	for task in all_tasks:
+		sample_task = frappe.get_doc('Task', task.name)
+		if sample_task.subject in all_task_dict.keys():
+			if sample_task.exp_start_date != all_task_dict[sample_task.subject]['exp_start_date'] or sample_task.exp_end_date != all_task_dict[sample_task.subject]['exp_end_date']:
+				return False
+			all_task_dict.pop(sample_task.subject)
+	if all_task_dict != {}:
+		return False
+	return True
+
+def check_project_creation():
+	if frappe.db.exists('Project', 'Basil from seed 2017'): return True
+	else: return False
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/crop_cycle/test_records.json b/erpnext/agriculture/doctype/crop_cycle/test_records.json
new file mode 100644
index 0000000..fade7a0
--- /dev/null
+++ b/erpnext/agriculture/doctype/crop_cycle/test_records.json
@@ -0,0 +1,15 @@
+[
+	{
+		"doctype": "Crop Cycle",
+		"title": "Basil from seed 2017",
+		"linked_land_unit": [{
+			"land_unit": "Basil Farm"
+		}],
+		"crop": "Basil from seed",
+		"start_date": "2017-11-11",
+		"detected_disease": [{
+			"disease": "Aphids",
+			"start_date": "2017-11-21"
+		}]
+	}
+]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/agriculture/doctype/detected_disease/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/agriculture/doctype/detected_disease/__init__.py
diff --git a/erpnext/agriculture/doctype/detected_disease/detected_disease.json b/erpnext/agriculture/doctype/detected_disease/detected_disease.json
new file mode 100644
index 0000000..cf44149
--- /dev/null
+++ b/erpnext/agriculture/doctype/detected_disease/detected_disease.json
@@ -0,0 +1,102 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-11-20 17:31:30.772779", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "disease", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Disease", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Disease", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "start_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Start Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-26 21:10:14.753511", 
+ "modified_by": "Administrator", 
+ "module": "Agriculture", 
+ "name": "Detected Disease", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/detected_disease/detected_disease.py b/erpnext/agriculture/doctype/detected_disease/detected_disease.py
new file mode 100644
index 0000000..8c90b83
--- /dev/null
+++ b/erpnext/agriculture/doctype/detected_disease/detected_disease.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class DetectedDisease(Document):
+	pass
diff --git a/erpnext/schools/doctype/course/__init__.py b/erpnext/agriculture/doctype/disease/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/course/__init__.py
copy to erpnext/agriculture/doctype/disease/__init__.py
diff --git a/erpnext/agriculture/doctype/disease/disease.js b/erpnext/agriculture/doctype/disease/disease.js
new file mode 100644
index 0000000..f6b678c
--- /dev/null
+++ b/erpnext/agriculture/doctype/disease/disease.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Disease', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/agriculture/doctype/disease/disease.json b/erpnext/agriculture/doctype/disease/disease.json
new file mode 100644
index 0000000..e10b1ca
--- /dev/null
+++ b/erpnext/agriculture/doctype/disease/disease.json
@@ -0,0 +1,293 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:common_name", 
+ "beta": 0, 
+ "creation": "2017-11-20 17:16:54.496355", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "common_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Common Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "scientific_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Scientific Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_3", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Long Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_2", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Treatment Task", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "treatment_task", 
+   "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": "Treatment Task", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Agriculture Task", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "treatment_period", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Treatment Period", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-04 19:20:19.352479", 
+ "modified_by": "Administrator", 
+ "module": "Agriculture", 
+ "name": "Disease", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Agriculture Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Agriculture User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/disease/disease.py b/erpnext/agriculture/doctype/disease/disease.py
new file mode 100644
index 0000000..42005d6
--- /dev/null
+++ b/erpnext/agriculture/doctype/disease/disease.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class Disease(Document):
+	def validate(self):
+		max_period = 0
+		for task in self.treatment_task:
+			# validate start_day is not > end_day
+			if task.start_day > task.end_day:
+				frappe.throw("Start day is greater than end day in task '{0}'".format(task.task_name))
+			# to calculate the period of the Crop Cycle
+			if task.end_day > max_period: max_period = task.end_day
+		self.treatment_period = max_period
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/disease/test_disease.js b/erpnext/agriculture/doctype/disease/test_disease.js
new file mode 100644
index 0000000..57d62c1
--- /dev/null
+++ b/erpnext/agriculture/doctype/disease/test_disease.js
@@ -0,0 +1,39 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Disease", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Disease
+		() => frappe.tests.make('Disease', [
+			// values to be set
+			{common_name: 'Aphids'},
+			{scientific_name: 'Aphidoidea'},
+			{treatment_task: [
+				[
+					{task_name: "Survey and find the aphid locations"},
+					{start_day: 1},
+					{end_day: 2},
+					{holiday_management: "Ignore holidays"}
+				],
+				[
+					{task_name: "Apply Pesticides"},
+					{start_day: 3},
+					{end_day: 3},
+					{holiday_management: "Ignore holidays"}
+				]
+			]}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.treatment_period, 3);
+		},
+		() => done()
+	]);
+
+});
+
diff --git a/erpnext/agriculture/doctype/disease/test_disease.py b/erpnext/agriculture/doctype/disease/test_disease.py
new file mode 100644
index 0000000..a040358
--- /dev/null
+++ b/erpnext/agriculture/doctype/disease/test_disease.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestDisease(unittest.TestCase):
+	def test_treatment_period(self):
+		disease = frappe.get_doc('Disease', 'Aphids')
+		self.assertEquals(disease.treatment_period, 3)
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/disease/test_records.json b/erpnext/agriculture/doctype/disease/test_records.json
new file mode 100644
index 0000000..e91a611
--- /dev/null
+++ b/erpnext/agriculture/doctype/disease/test_records.json
@@ -0,0 +1,18 @@
+[
+	{
+		"doctype": "Disease",
+		"common_name": "Aphids",
+		"scientific_name": "Aphidoidea",
+		"treatment_task": [{
+			"task_name": "Survey and find the aphid locations",
+			"start_day": 1,
+			"end_day": 2,
+			"holiday_management": "Ignore holidays"
+		}, {
+			"task_name": "Apply Pesticides",
+			"start_day": 3,
+			"end_day": 3,
+			"holiday_management": "Ignore holidays"
+		}]
+	}
+]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/agriculture/doctype/fertilizer/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/agriculture/doctype/fertilizer/__init__.py
diff --git a/erpnext/agriculture/doctype/fertilizer/fertilizer.js b/erpnext/agriculture/doctype/fertilizer/fertilizer.js
new file mode 100644
index 0000000..357e089
--- /dev/null
+++ b/erpnext/agriculture/doctype/fertilizer/fertilizer.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Fertilizer', {
+	onload: (frm) => {
+		if (frm.doc.fertilizer_contents == undefined) frm.call('load_contents');
+	}
+});
diff --git a/erpnext/agriculture/doctype/fertilizer/fertilizer.json b/erpnext/agriculture/doctype/fertilizer/fertilizer.json
new file mode 100644
index 0000000..b2a1b81
--- /dev/null
+++ b/erpnext/agriculture/doctype/fertilizer/fertilizer.json
@@ -0,0 +1,292 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:fertilizer_name", 
+ "beta": 0, 
+ "creation": "2017-10-17 18:17:06.175062", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "fertilizer_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Fertilizer Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item", 
+   "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": "Item", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_2", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "density", 
+   "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": "Density (if liquid)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_4", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_28", 
+   "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": "Fertilizer Contents", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "fertilizer_contents", 
+   "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, 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Fertilizer Content", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-05 19:13:42.471667", 
+ "modified_by": "Administrator", 
+ "module": "Agriculture", 
+ "name": "Fertilizer", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Agriculture Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Agriculture User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/fertilizer/fertilizer.py b/erpnext/agriculture/doctype/fertilizer/fertilizer.py
new file mode 100644
index 0000000..dc2781c
--- /dev/null
+++ b/erpnext/agriculture/doctype/fertilizer/fertilizer.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class Fertilizer(Document):
+	def load_contents(self):
+		docs = frappe.get_all("Agriculture Analysis Criteria", filters={'linked_doctype':'Fertilizer'})
+		for doc in docs:
+			self.append('fertilizer_contents', {'title': str(doc.name)})
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/fertilizer/test_fertilizer.js b/erpnext/agriculture/doctype/fertilizer/test_fertilizer.js
new file mode 100644
index 0000000..5dd7313
--- /dev/null
+++ b/erpnext/agriculture/doctype/fertilizer/test_fertilizer.js
@@ -0,0 +1,31 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Fertilizer", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Item
+		() => frappe.tests.make('Item', [
+			// values to be set
+			{item_code: 'Urea'},
+			{item_name: 'Urea'},
+			{item_group: 'Fertilizer'}
+		]),
+		// insert a new Fertilizer
+		() => frappe.tests.make('Fertilizer', [
+			// values to be set
+			{fertilizer_name: 'Urea'},
+			{item: 'Urea'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.name, 'Urea');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/agriculture/doctype/fertilizer/test_fertilizer.py b/erpnext/agriculture/doctype/fertilizer/test_fertilizer.py
new file mode 100644
index 0000000..3b34e4f
--- /dev/null
+++ b/erpnext/agriculture/doctype/fertilizer/test_fertilizer.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestFertilizer(unittest.TestCase):
+	def test_fertilizer_creation(self):
+		self.assertEquals(frappe.db.exists('Fertilizer', 'Urea'), 'Urea')
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/fertilizer/test_records.json b/erpnext/agriculture/doctype/fertilizer/test_records.json
new file mode 100644
index 0000000..ba735cd
--- /dev/null
+++ b/erpnext/agriculture/doctype/fertilizer/test_records.json
@@ -0,0 +1,13 @@
+[
+	{
+		"doctype": "Item",
+		"item_code": "Urea",
+		"item_name": "Urea",
+		"item_group": "Fertilizer"
+	},
+	{
+		"doctype": "Fertilizer",
+		"fertilizer_name": "Urea",
+		"item": "Urea"
+	}
+]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset_category_account/__init__.py b/erpnext/agriculture/doctype/fertilizer_content/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset_category_account/__init__.py
copy to erpnext/agriculture/doctype/fertilizer_content/__init__.py
diff --git a/erpnext/agriculture/doctype/fertilizer_content/fertilizer_content.json b/erpnext/agriculture/doctype/fertilizer_content/fertilizer_content.json
new file mode 100644
index 0000000..bf222ab
--- /dev/null
+++ b/erpnext/agriculture/doctype/fertilizer_content/fertilizer_content.json
@@ -0,0 +1,103 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-12-05 16:54:17.071914", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "title", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Title", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Agriculture Analysis Criteria", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "value", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Value", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-12-05 19:20:38.892231", 
+ "modified_by": "Administrator", 
+ "module": "Agriculture", 
+ "name": "Fertilizer Content", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Agriculture", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/fertilizer_content/fertilizer_content.py b/erpnext/agriculture/doctype/fertilizer_content/fertilizer_content.py
new file mode 100644
index 0000000..d385242
--- /dev/null
+++ b/erpnext/agriculture/doctype/fertilizer_content/fertilizer_content.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class FertilizerContent(Document):
+	pass
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/agriculture/doctype/land_unit/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/agriculture/doctype/land_unit/__init__.py
diff --git a/erpnext/agriculture/doctype/land_unit/land_unit.js b/erpnext/agriculture/doctype/land_unit/land_unit.js
new file mode 100644
index 0000000..c9ab348
--- /dev/null
+++ b/erpnext/agriculture/doctype/land_unit/land_unit.js
@@ -0,0 +1,31 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+// Code for finding the area of editable features drawn on the geolocation control
+
+
+
+frappe.ui.form.on('Land Unit', {
+	setup: function(frm) {
+		frm.add_fetch("parent_land_unit", "latitude", "latitude");
+		frm.add_fetch("parent_land_unit", "longitude", "longitude");
+	},
+
+	onload_post_render(frm){
+		if(!frm.doc.location && frm.doc.latitude && frm.doc.longitude)	{
+			frm.fields_dict.location.map.setView([frm.doc.latitude, frm.doc.longitude],13);
+		}
+		else {
+			frm.doc.latitude = frm.fields_dict.location.map.getCenter()['lat'];
+			frm.doc.longitude = frm.fields_dict.location.map.getCenter()['lng'];
+		}
+	},
+	refresh: function(frm) {
+		if(!frm.doc.parent_land_unit) {
+			frm.set_read_only();
+			frm.set_intro(__("This is a root land unit and cannot be edited."));
+		} else {
+			frm.set_intro(null);
+		}
+	},
+});
diff --git a/erpnext/agriculture/doctype/land_unit/land_unit.json b/erpnext/agriculture/doctype/land_unit/land_unit.json
new file mode 100644
index 0000000..9ed3d03
--- /dev/null
+++ b/erpnext/agriculture/doctype/land_unit/land_unit.json
@@ -0,0 +1,690 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:land_unit_name", 
+ "beta": 0, 
+ "creation": "2017-10-21 05:35:34.508529", 
+ "custom": 0, 
+ "description": "Land Unit describing various land assets", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "land_unit_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Land Unit Name", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "parent_land_unit", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Parent Land Unit", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Land Unit", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Check if it is a hydroponic unit", 
+   "fieldname": "is_container", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Container", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "fieldname": "is_group", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Is Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "tree_details", 
+   "fieldtype": "Section Break", 
+   "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": "Tree Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "lft", 
+   "fieldtype": "Int", 
+   "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": "lft", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "rgt", 
+   "fieldtype": "Int", 
+   "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": "rgt", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "old_parent", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "old_parent", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Land Unit", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "land_unit_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Land Unit Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "latitude", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Latitude", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "longitude", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Longitude", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "latlong", 
+   "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, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "area", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Area", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_13", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "location", 
+   "fieldtype": "Geolocation", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Location", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_17", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "linked_soil_texture", 
+   "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": "Linked Soil Texture", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Linked Soil Texture", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "linked_soil_analysis", 
+   "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": "Linked Soil Analysis", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Linked Soil Analysis", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "linked_plant_analysis", 
+   "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": "Linked Plant Analysis", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Linked Plant Analysis", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-05 10:57:33.108504", 
+ "modified_by": "Administrator", 
+ "module": "Agriculture", 
+ "name": "Land Unit", 
+ "name_case": "Title Case", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Agriculture Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Agriculture User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/land_unit/land_unit.py b/erpnext/agriculture/doctype/land_unit/land_unit.py
new file mode 100644
index 0000000..634cb75
--- /dev/null
+++ b/erpnext/agriculture/doctype/land_unit/land_unit.py
@@ -0,0 +1,165 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+import json
+import math
+
+from  frappe import _
+
+from frappe.utils.nestedset import NestedSet
+# from frappe.model.document import Document
+
+RADIUS = 6378137
+FLATTENING_DENOM = 298.257223563
+FLATTENING = 1/FLATTENING_DENOM
+POLAR_RADIUS = RADIUS*(1-FLATTENING)
+
+class LandUnit(NestedSet):
+	# pass
+	nsm_parent_field = 'parent_land_unit'
+
+	def on_trash(self):
+		ancestors = self.get_ancestors()
+		for ancestor in ancestors:
+			ancestor_doc = frappe.get_doc('Land Unit', ancestor)	
+			ancestor_child_features, ancestor_non_child_features = ancestor_doc.feature_seperator(child_feature = self.get('land_unit_name'))
+			ancestor_features = ancestor_non_child_features
+			for index,feature in enumerate(ancestor_features):
+				ancestor_features[index] = json.loads(feature)
+			ancestor_doc.set_location_value(features = ancestor_features)	
+			ancestor_doc.db_set(fieldname='area', value=ancestor_doc.get('area')-self.get('area'),commit=True)
+
+	def validate(self):
+		if not self.is_new():
+			if not self.get('location'):
+				features = ''
+			else:
+				features = json.loads(self.get('location')).get('features')
+			new_area = compute_area(features)
+			self.area_difference = new_area - self.area
+			self.area = new_area	
+
+			if self.get('parent'): 
+				ancestors = self.get_ancestors()
+				self_features = self.add_child_property()
+				self_features = set(self_features)
+
+				for ancestor in ancestors:
+					ancestor_doc = frappe.get_doc('Land Unit', ancestor)
+					ancestor_child_features, ancestor_non_child_features = ancestor_doc.feature_seperator(child_feature = self.get('land_unit_name'))
+					ancestor_features = list(set(ancestor_non_child_features))
+					child_features = set(ancestor_child_features)
+
+					if not (self_features.issubset(child_features) and child_features.issubset(self_features)): 
+						features_to_be_appended =	self_features - child_features 
+						features_to_be_discarded = 	child_features - self_features
+						for feature in features_to_be_discarded:
+							child_features.discard(feature)
+						for feature in features_to_be_appended:
+							child_features.add(feature)
+						child_features = list(child_features)
+
+					ancestor_features.extend(child_features)
+					for index,feature in enumerate(ancestor_features):
+						ancestor_features[index] = json.loads(feature)
+					ancestor_doc.set_location_value(features = ancestor_features)	
+					ancestor_doc.db_set(fieldname='area', value=ancestor_doc.get('area')+\
+						self.get('area_difference'),commit=True)
+
+	def set_location_value(self, features):
+		if not self.get('location'):
+			self.location = '{"type":"FeatureCollection","features":[]}'
+		location = json.loads(self.location)
+		location['features'] = features
+		self.db_set(fieldname='location', value=json.dumps(location), commit=True)
+
+	def on_update(self):
+		super(LandUnit, self).on_update()
+		self.validate_one_root()
+
+	def add_child_property(self):
+		location = self.get('location')
+		if location:
+			features = json.loads(location).get('features')	
+			if type(features) != list:
+				features = json.loads(features)
+			filter_features = [feature for feature in features if feature.get('properties').get('child_feature') != True]
+			for index,feature in enumerate(filter_features):
+				feature['properties'].update({'child_feature': True, 'feature_of': self.land_unit_name})
+				filter_features[index] = json.dumps(filter_features[index])
+			return filter_features 
+		return []
+
+	def feature_seperator(self, child_feature=None):
+		doc = self 
+		child_features = []
+		non_child_features = []
+		location = doc.get('location')
+		if location:
+			features = json.loads(location).get('features')
+			if type(features) != list:
+				features = json.loads(features)
+			for feature in features:
+				if feature.get('properties').get('feature_of') == child_feature:
+					child_features.extend([json.dumps(feature)])
+				else:
+					non_child_features.extend([json.dumps(feature)])
+		
+		return child_features, non_child_features
+
+
+def compute_area(features):                                
+	layer_area = 0
+	for feature in features:
+		if feature.get('geometry').get('type') == 'Polygon':
+			layer_area += polygon_area(coords = feature.get('geometry').get('coordinates'))
+		elif feature.get('geometry').get('type') == 'Point' and feature.get('properties').get('point_type') == 'circle':
+			layer_area += math.pi * math.pow(feature.get('properties').get('radius'), 2)
+	return layer_area
+
+def rad(angle_in_degrees):
+	return angle_in_degrees*math.pi/180
+
+def polygon_area(coords):
+	area = 0
+	if coords and len(coords) > 0:
+		area += math.fabs(ring_area(coords[0]));
+		for i in range(1, len(coords)): 
+			area -= math.fabs(ring_area(coords[i]));
+	return area;
+	
+def ring_area(coords):
+	p1 = 0
+	p2 = 0
+	p3 = 0
+	lower_index = 0
+	middle_index = 0
+	upper_index = 0
+	i = 0
+	area = 0
+	coords_length = len(coords)
+	if coords_length > 2: 
+		for i in range(0, coords_length):
+			if i == coords_length - 2: # i = N-2
+				lower_index = coords_length - 2;
+				middle_index = coords_length -1;
+				upper_index = 0;
+			elif i == coords_length - 1: # i = N-1
+				lower_index = coords_length - 1;
+				middle_index = 0;
+				upper_index = 1;
+			else: # i = 0 to N-3
+				lower_index = i;
+				middle_index = i+1;
+				upper_index = i+2;
+			p1 = coords[lower_index];
+			p2 = coords[middle_index];
+			p3 = coords[upper_index];
+			area += ( rad(p3[0]) - rad(p1[0]) ) * math.sin( rad(p2[1]));
+
+		area = area * RADIUS * RADIUS / 2
+	return area
+		
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/land_unit/land_unit_tree.js b/erpnext/agriculture/doctype/land_unit/land_unit_tree.js
new file mode 100644
index 0000000..0d7a53e
--- /dev/null
+++ b/erpnext/agriculture/doctype/land_unit/land_unit_tree.js
@@ -0,0 +1,15 @@
+frappe.treeview_settings["Land Unit"] = {
+	ignore_fields:["parent_land_unit"],
+	disable_add_node: true,
+	toolbar: [
+		{ toggle_btn: true },
+		{
+			label:__("Add Child"),
+			click: function(node) {
+				var lu = frappe.new_doc("Land Unit", {
+					"parent_land_unit": node.label
+				})
+			}
+		}
+	],
+}
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/land_unit/test_land_unit.js b/erpnext/agriculture/doctype/land_unit/test_land_unit.js
new file mode 100644
index 0000000..c23db77
--- /dev/null
+++ b/erpnext/agriculture/doctype/land_unit/test_land_unit.js
@@ -0,0 +1,24 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Land Unit", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Land Unit
+		() => frappe.tests.make('Land Unit', [
+			// values to be set
+			{parent_land_unit: 'All Land Units'},
+			{land_unit_name: 'Basil Farm'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.name, 'Basil Farm');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/agriculture/doctype/land_unit/test_land_unit.py b/erpnext/agriculture/doctype/land_unit/test_land_unit.py
new file mode 100644
index 0000000..cf08f98
--- /dev/null
+++ b/erpnext/agriculture/doctype/land_unit/test_land_unit.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+import json
+import frappe
+import unittest
+
+class TestLandUnit(unittest.TestCase):
+
+	def runTest(self):
+		land_units = ['Basil Farm', 'Division 1', 'Field 1', 'Block 1']
+		area = 0                                                             
+		formatted_land_units = []	
+		for land_unit in land_units:
+			doc = frappe.get_doc('Land Unit', land_unit)
+			doc.save()
+			area += doc.area
+			temp = json.loads(doc.location)
+			temp['features'][0]['properties']['child_feature'] = True
+			temp['features'][0]['properties']['feature_of'] =	land_unit 
+			formatted_land_units.extend(temp['features'])
+		formatted_land_unit_string = str(formatted_land_units)
+		all_land_units = frappe.get_doc('Land Unit', 'All Land Units')
+		self.assertEquals(formatted_land_unit_string, str(json.loads(all_land_units.get('location'))['features']))
+		self.assertEquals(area, all_land_units.get('area'))
diff --git a/erpnext/agriculture/doctype/land_unit/test_records.json b/erpnext/agriculture/doctype/land_unit/test_records.json
new file mode 100644
index 0000000..6baaf27
--- /dev/null
+++ b/erpnext/agriculture/doctype/land_unit/test_records.json
@@ -0,0 +1,38 @@
+[
+	{
+		"doctype": "Land Unit",
+		"land_unit_name": "Basil Farm",
+		"location": "{\"type\":\"FeatureCollection\",\"features\":[{\"type\":\"Feature\",\"properties\":{\"point_type\":\"circle\",\"radius\":884.5625420736483},\"geometry\":{\"type\":\"Point\",\"coordinates\":[72.875834,19.100566]}}]}",
+		"parent_land_unit": "All Land Units",
+		"parent": "All Land Units",
+		"is_group": 1,
+		"is_container": 1
+	},
+	{
+		"doctype": "Land Unit",
+		"land_unit_name": "Division 1",
+		"location": "{\"type\":\"FeatureCollection\",\"features\":[{\"type\":\"Feature\",\"properties\":{\"point_type\":\"circle\",\"radius\":542.3424997060739},\"geometry\":{\"type\":\"Point\",\"coordinates\":[72.852359,19.11557]}}]}",
+		"parent_land_unit": "Basil Farm",
+		"parent": "Basil Farm",
+		"is_group": 1,
+		"is_container": 1
+	},
+	{
+		"doctype": "Land Unit",
+		"land_unit_name": "Field 1",
+		"location": "{\"type\":\"FeatureCollection\",\"features\":[{\"type\":\"Feature\",\"properties\":{},\"geometry\":{\"type\":\"Polygon\",\"coordinates\":[[[72.846758,19.118287],[72.846758,19.121206],[72.850535,19.121206],[72.850535,19.118287],[72.846758,19.118287]]]}}]}",
+		"parent_land_unit": "Division 1",
+		"parent": "Division 1",
+		"is_group": 1,
+		"is_container": 1
+	},
+	{
+		"doctype": "Land Unit",
+		"land_unit_name": "Block 1",
+		"location": "{\"type\":\"FeatureCollection\",\"features\":[{\"type\":\"Feature\",\"properties\":{},\"geometry\":{\"type\":\"Polygon\",\"coordinates\":[[[72.921495,19.073313],[72.924929,19.068121],[72.934713,19.06585],[72.929392,19.05579],[72.94158,19.056926],[72.951365,19.095213],[72.921495,19.073313]]]}}]}",
+		"parent_land_unit": "Field 1",
+		"parent": "Field 1",
+		"is_group": 0,
+		"is_container": 1
+	}
+]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/agriculture/doctype/linked_land_unit/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/agriculture/doctype/linked_land_unit/__init__.py
diff --git a/erpnext/agriculture/doctype/linked_land_unit/linked_land_unit.json b/erpnext/agriculture/doctype/linked_land_unit/linked_land_unit.json
new file mode 100644
index 0000000..63816b8
--- /dev/null
+++ b/erpnext/agriculture/doctype/linked_land_unit/linked_land_unit.json
@@ -0,0 +1,72 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-11-22 14:34:59.461273", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "land_unit", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Land Unit", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Land Unit", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-12-04 13:25:50.856991", 
+ "modified_by": "Administrator", 
+ "module": "Agriculture", 
+ "name": "Linked Land Unit", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/linked_land_unit/linked_land_unit.py b/erpnext/agriculture/doctype/linked_land_unit/linked_land_unit.py
new file mode 100644
index 0000000..266edb9
--- /dev/null
+++ b/erpnext/agriculture/doctype/linked_land_unit/linked_land_unit.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class LinkedLandUnit(Document):
+	pass
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/agriculture/doctype/linked_plant_analysis/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/agriculture/doctype/linked_plant_analysis/__init__.py
diff --git a/erpnext/agriculture/doctype/linked_plant_analysis/linked_plant_analysis.json b/erpnext/agriculture/doctype/linked_plant_analysis/linked_plant_analysis.json
new file mode 100644
index 0000000..e136d61
--- /dev/null
+++ b/erpnext/agriculture/doctype/linked_plant_analysis/linked_plant_analysis.json
@@ -0,0 +1,72 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-11-22 15:04:25.180446", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "plant_analysis", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Plant Analysis", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Plant Analysis", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-12-04 13:25:30.437597", 
+ "modified_by": "Administrator", 
+ "module": "Agriculture", 
+ "name": "Linked Plant Analysis", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/linked_plant_analysis/linked_plant_analysis.py b/erpnext/agriculture/doctype/linked_plant_analysis/linked_plant_analysis.py
new file mode 100644
index 0000000..daea54b
--- /dev/null
+++ b/erpnext/agriculture/doctype/linked_plant_analysis/linked_plant_analysis.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class LinkedPlantAnalysis(Document):
+	pass
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/agriculture/doctype/linked_soil_analysis/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/agriculture/doctype/linked_soil_analysis/__init__.py
diff --git a/erpnext/agriculture/doctype/linked_soil_analysis/linked_soil_analysis.json b/erpnext/agriculture/doctype/linked_soil_analysis/linked_soil_analysis.json
new file mode 100644
index 0000000..a248ed0
--- /dev/null
+++ b/erpnext/agriculture/doctype/linked_soil_analysis/linked_soil_analysis.json
@@ -0,0 +1,72 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-11-22 15:00:37.259063", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "soil_analysis", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Soil Analysis", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Soil Analysis", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-12-04 13:26:18.682109", 
+ "modified_by": "Administrator", 
+ "module": "Agriculture", 
+ "name": "Linked Soil Analysis", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/linked_soil_analysis/linked_soil_analysis.py b/erpnext/agriculture/doctype/linked_soil_analysis/linked_soil_analysis.py
new file mode 100644
index 0000000..c4e9245
--- /dev/null
+++ b/erpnext/agriculture/doctype/linked_soil_analysis/linked_soil_analysis.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class LinkedSoilAnalysis(Document):
+	pass
diff --git a/erpnext/schools/doctype/fee_structure/__init__.py b/erpnext/agriculture/doctype/linked_soil_texture/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/fee_structure/__init__.py
copy to erpnext/agriculture/doctype/linked_soil_texture/__init__.py
diff --git a/erpnext/agriculture/doctype/linked_soil_texture/linked_soil_texture.json b/erpnext/agriculture/doctype/linked_soil_texture/linked_soil_texture.json
new file mode 100644
index 0000000..5df1812
--- /dev/null
+++ b/erpnext/agriculture/doctype/linked_soil_texture/linked_soil_texture.json
@@ -0,0 +1,72 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-11-22 14:58:52.818040", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "soil_texture", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Soil Texture", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Soil Texture", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-12-04 13:26:07.773314", 
+ "modified_by": "Administrator", 
+ "module": "Agriculture", 
+ "name": "Linked Soil Texture", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/linked_soil_texture/linked_soil_texture.py b/erpnext/agriculture/doctype/linked_soil_texture/linked_soil_texture.py
new file mode 100644
index 0000000..1b75892
--- /dev/null
+++ b/erpnext/agriculture/doctype/linked_soil_texture/linked_soil_texture.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class LinkedSoilTexture(Document):
+	pass
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/agriculture/doctype/plant_analysis/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/agriculture/doctype/plant_analysis/__init__.py
diff --git a/erpnext/agriculture/doctype/plant_analysis/plant_analysis.js b/erpnext/agriculture/doctype/plant_analysis/plant_analysis.js
new file mode 100644
index 0000000..3914f83
--- /dev/null
+++ b/erpnext/agriculture/doctype/plant_analysis/plant_analysis.js
@@ -0,0 +1,17 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Plant Analysis', {
+	onload: (frm) => {
+		if (frm.doc.plant_analysis_criteria == undefined) frm.call('load_contents');
+	},
+	refresh: (frm) => {
+		let map_tools = ["a.leaflet-draw-draw-polyline",
+			"a.leaflet-draw-draw-polygon",
+			"a.leaflet-draw-draw-rectangle",
+			"a.leaflet-draw-draw-circle",
+			"a.leaflet-draw-draw-circlemarker"];
+
+		map_tools.forEach((element) => $(element).hide());
+	}
+});
diff --git a/erpnext/agriculture/doctype/plant_analysis/plant_analysis.json b/erpnext/agriculture/doctype/plant_analysis/plant_analysis.json
new file mode 100644
index 0000000..cb66103
--- /dev/null
+++ b/erpnext/agriculture/doctype/plant_analysis/plant_analysis.json
@@ -0,0 +1,353 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "PANA.#####", 
+ "beta": 0, 
+ "creation": "2017-10-18 12:45:13.575986", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "crop", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Crop", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Crop", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_1", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "location", 
+   "fieldtype": "Geolocation", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Location", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "collection_datetime", 
+   "fieldtype": "Datetime", 
+   "hidden": 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": "Collection Datetime", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "laboratory_testing_datetime", 
+   "fieldtype": "Datetime", 
+   "hidden": 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": "Laboratory Testing Datetime", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "result_datetime", 
+   "fieldtype": "Datetime", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Result Datetime", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_2", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Plant Analysis Criterias", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "plant_analysis_criteria", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Plant Analysis Criteria", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-05 19:29:58.612659", 
+ "modified_by": "Administrator", 
+ "module": "Agriculture", 
+ "name": "Plant Analysis", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Agriculture Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Agriculture User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/plant_analysis/plant_analysis.py b/erpnext/agriculture/doctype/plant_analysis/plant_analysis.py
new file mode 100644
index 0000000..304727e
--- /dev/null
+++ b/erpnext/agriculture/doctype/plant_analysis/plant_analysis.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.naming import make_autoname
+from frappe.model.document import Document
+
+class PlantAnalysis(Document):
+	def load_contents(self):
+		docs = frappe.get_all("Agriculture Analysis Criteria", filters={'linked_doctype':'Plant Analysis'})
+		for doc in docs:
+			self.append('plant_analysis_criteria', {'title': str(doc.name)})
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/plant_analysis/test_plant_analysis.js b/erpnext/agriculture/doctype/plant_analysis/test_plant_analysis.js
new file mode 100644
index 0000000..786c047
--- /dev/null
+++ b/erpnext/agriculture/doctype/plant_analysis/test_plant_analysis.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Plant Analysis", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Plant Analysis
+		() => frappe.tests.make('Plant Analysis', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/agriculture/doctype/plant_analysis/test_plant_analysis.py b/erpnext/agriculture/doctype/plant_analysis/test_plant_analysis.py
new file mode 100644
index 0000000..cbd2fd7
--- /dev/null
+++ b/erpnext/agriculture/doctype/plant_analysis/test_plant_analysis.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestPlantAnalysis(unittest.TestCase):
+	pass
diff --git a/erpnext/schools/doctype/assessment_criteria/__init__.py b/erpnext/agriculture/doctype/plant_analysis_criteria/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/assessment_criteria/__init__.py
copy to erpnext/agriculture/doctype/plant_analysis_criteria/__init__.py
diff --git a/erpnext/agriculture/doctype/plant_analysis_criteria/plant_analysis_criteria.json b/erpnext/agriculture/doctype/plant_analysis_criteria/plant_analysis_criteria.json
new file mode 100644
index 0000000..9b07a8a
--- /dev/null
+++ b/erpnext/agriculture/doctype/plant_analysis_criteria/plant_analysis_criteria.json
@@ -0,0 +1,162 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-12-05 19:23:52.481348", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "title", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Title", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Agriculture Analysis Criteria", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "value", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Value", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "minimum_permissible_value", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Minimum Permissible Value", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "maximum_permissible_value", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Maximum Permissible Value", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-12-05 19:37:02.289320", 
+ "modified_by": "Administrator", 
+ "module": "Agriculture", 
+ "name": "Plant Analysis Criteria", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/plant_analysis_criteria/plant_analysis_criteria.py b/erpnext/agriculture/doctype/plant_analysis_criteria/plant_analysis_criteria.py
new file mode 100644
index 0000000..c173184
--- /dev/null
+++ b/erpnext/agriculture/doctype/plant_analysis_criteria/plant_analysis_criteria.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class PlantAnalysisCriteria(Document):
+	pass
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/agriculture/doctype/soil_analysis/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/agriculture/doctype/soil_analysis/__init__.py
diff --git a/erpnext/agriculture/doctype/soil_analysis/soil_analysis.js b/erpnext/agriculture/doctype/soil_analysis/soil_analysis.js
new file mode 100644
index 0000000..12829be
--- /dev/null
+++ b/erpnext/agriculture/doctype/soil_analysis/soil_analysis.js
@@ -0,0 +1,17 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Soil Analysis', {
+	onload: (frm) => {
+		if (frm.doc.soil_analysis_criteria == undefined) frm.call('load_contents');
+	},
+	refresh: (frm) => {
+		let map_tools = ["a.leaflet-draw-draw-polyline",
+			"a.leaflet-draw-draw-polygon",
+			"a.leaflet-draw-draw-rectangle",
+			"a.leaflet-draw-draw-circle",
+			"a.leaflet-draw-draw-circlemarker"];
+
+		map_tools.forEach((element) => $(element).hide());
+	}
+});
diff --git a/erpnext/agriculture/doctype/soil_analysis/soil_analysis.json b/erpnext/agriculture/doctype/soil_analysis/soil_analysis.json
new file mode 100644
index 0000000..e92cc3e
--- /dev/null
+++ b/erpnext/agriculture/doctype/soil_analysis/soil_analysis.json
@@ -0,0 +1,560 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "SANA.#####", 
+ "beta": 0, 
+ "creation": "2017-10-17 19:12:16.728395", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "location", 
+   "fieldtype": "Geolocation", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Location", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "collection_datetime", 
+   "fieldtype": "Datetime", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Collection Datetime", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "laboratory_testing_datetime", 
+   "fieldtype": "Datetime", 
+   "hidden": 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": "Laboratory Testing Datetime", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "result_datetime", 
+   "fieldtype": "Datetime", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Result Datetime", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_3", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "ca_per_k", 
+   "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": "Ca/K", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "ca_per_mg", 
+   "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": "Ca/Mg", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "mg_per_k", 
+   "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": "Mg/K", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_31", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "ca_mg_per_k", 
+   "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": "(Ca+Mg)/K", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "ca_per_k_ca_mg", 
+   "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": "Ca/(K+Ca+Mg)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_28", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "invoice_number", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Invoice 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "soil_analysis_criterias", 
+   "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": "Soil Analysis Criterias", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "soil_analysis_criteria", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Soil Analysis Criteria", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-05 19:43:05.543080", 
+ "modified_by": "Administrator", 
+ "module": "Agriculture", 
+ "name": "Soil Analysis", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Agriculture Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Agriculture User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/soil_analysis/soil_analysis.py b/erpnext/agriculture/doctype/soil_analysis/soil_analysis.py
new file mode 100644
index 0000000..17b96a0
--- /dev/null
+++ b/erpnext/agriculture/doctype/soil_analysis/soil_analysis.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class SoilAnalysis(Document):
+	def load_contents(self):
+		docs = frappe.get_all("Agriculture Analysis Criteria", filters={'linked_doctype':'Soil Analysis'})
+		for doc in docs:
+			self.append('soil_analysis_criteria', {'title': str(doc.name)})
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/soil_analysis/test_soil_analysis.js b/erpnext/agriculture/doctype/soil_analysis/test_soil_analysis.js
new file mode 100644
index 0000000..29128eb
--- /dev/null
+++ b/erpnext/agriculture/doctype/soil_analysis/test_soil_analysis.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Soil Analysis", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Soil Analysis
+		() => frappe.tests.make('Soil Analysis', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/agriculture/doctype/soil_analysis/test_soil_analysis.py b/erpnext/agriculture/doctype/soil_analysis/test_soil_analysis.py
new file mode 100644
index 0000000..b89d756
--- /dev/null
+++ b/erpnext/agriculture/doctype/soil_analysis/test_soil_analysis.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestSoilAnalysis(unittest.TestCase):
+	pass
diff --git a/erpnext/schools/doctype/assessment_criteria/__init__.py b/erpnext/agriculture/doctype/soil_analysis_criteria/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/assessment_criteria/__init__.py
copy to erpnext/agriculture/doctype/soil_analysis_criteria/__init__.py
diff --git a/erpnext/agriculture/doctype/soil_analysis_criteria/soil_analysis_criteria.json b/erpnext/agriculture/doctype/soil_analysis_criteria/soil_analysis_criteria.json
new file mode 100644
index 0000000..d2627e4
--- /dev/null
+++ b/erpnext/agriculture/doctype/soil_analysis_criteria/soil_analysis_criteria.json
@@ -0,0 +1,162 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-12-05 19:36:05.300770", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "title", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Title", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Agriculture Analysis Criteria", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "value", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Value", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "minimum_permissible_value", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Minimum Permissible Value", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "maximum_permissible_value", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Maximum Permissible Value", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-12-05 23:35:34.569482", 
+ "modified_by": "Administrator", 
+ "module": "Agriculture", 
+ "name": "Soil Analysis Criteria", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/soil_analysis_criteria/soil_analysis_criteria.py b/erpnext/agriculture/doctype/soil_analysis_criteria/soil_analysis_criteria.py
new file mode 100644
index 0000000..b073c20
--- /dev/null
+++ b/erpnext/agriculture/doctype/soil_analysis_criteria/soil_analysis_criteria.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class SoilAnalysisCriteria(Document):
+	pass
diff --git a/erpnext/schools/doctype/fee_structure/__init__.py b/erpnext/agriculture/doctype/soil_texture/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/fee_structure/__init__.py
copy to erpnext/agriculture/doctype/soil_texture/__init__.py
diff --git a/erpnext/agriculture/doctype/soil_texture/soil_texture.js b/erpnext/agriculture/doctype/soil_texture/soil_texture.js
new file mode 100644
index 0000000..1cb8408
--- /dev/null
+++ b/erpnext/agriculture/doctype/soil_texture/soil_texture.js
@@ -0,0 +1,59 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.provide('agriculture');
+
+frappe.ui.form.on('Soil Texture', {
+	refresh: (frm) => {
+		let map_tools = ["a.leaflet-draw-draw-polyline",
+			"a.leaflet-draw-draw-polygon",
+			"a.leaflet-draw-draw-rectangle",
+			"a.leaflet-draw-draw-circle",
+			"a.leaflet-draw-draw-circlemarker"];
+
+		map_tools.forEach((element) => $(element).hide());
+	},
+	onload: function(frm) {
+		if (frm.doc.soil_texture_criteria == undefined) frm.call('load_contents');
+		if (this.ternary_plot) return;
+		this.ternary_plot = new agriculture.TernaryPlot({
+			parent: frm.get_field("ternary_plot").$wrapper,
+			clay: frm.doc.clay_composition,
+			sand: frm.doc.sand_composition,
+			silt: frm.doc.silt_composition,
+		});
+	},
+	soil_type: (frm) => {
+		let composition_types = ['clay_composition', 'sand_composition', 'silt_composition'];
+		composition_types.forEach((composition_type) => {
+			frm.doc[composition_type] = 0;
+			frm.refresh_field(composition_type);
+		});
+	},
+	clay_composition: function(frm) {
+		frm.call("update_soil_edit", {
+			soil_type: 'clay_composition'
+		}, () => {
+			refresh_ternary_plot(frm, this);
+		});
+	},
+	sand_composition: function(frm) {
+		frm.call("update_soil_edit", {
+			soil_type: 'sand_composition'
+		}, () => {
+			refresh_ternary_plot(frm, this);
+		});
+	},
+	silt_composition: function(frm) {
+		frm.call("update_soil_edit", {
+			soil_type: 'silt_composition'
+		}, () => {
+			refresh_ternary_plot(frm, this);
+		});
+	}
+});
+
+let refresh_ternary_plot = (frm, me) => {
+	me.ternary_plot.remove_blip();
+	me.ternary_plot.mark_blip({clay: frm.doc.clay_composition, sand: frm.doc.sand_composition, silt: frm.doc.silt_composition});
+};
diff --git a/erpnext/agriculture/doctype/soil_texture/soil_texture.json b/erpnext/agriculture/doctype/soil_texture/soil_texture.json
new file mode 100644
index 0000000..308039b
--- /dev/null
+++ b/erpnext/agriculture/doctype/soil_texture/soil_texture.json
@@ -0,0 +1,504 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "STEXT.#####", 
+ "beta": 0, 
+ "creation": "2017-10-18 13:06:47.506762", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "location", 
+   "fieldtype": "Geolocation", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Location", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "collection_datetime", 
+   "fieldtype": "Datetime", 
+   "hidden": 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": "Collection Datetime", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "laboratory_testing_datetime", 
+   "fieldtype": "Datetime", 
+   "hidden": 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": "Laboratory Testing Datetime", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "result_datetime", 
+   "fieldtype": "Datetime", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Result Datetime", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_4", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "soil_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Soil Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Select\nSand\nLoamy Sand\nSandy Loam\nLoam\nSilt Loam\nSilt\nSandy Clay Loam\nClay Loam\nSilty Clay Loam\nSandy Clay\nSilty Clay\nClay", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "clay_composition", 
+   "fieldtype": "Percent", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Clay Composition (%)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "sand_composition", 
+   "fieldtype": "Percent", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Sand Composition (%)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "silt_composition", 
+   "fieldtype": "Percent", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Silt Composition (%)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_6", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "ternary_plot", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Ternary Plot", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_15", 
+   "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": "Soil Texture Criteria", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "soil_texture_criteria", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Soil Texture Criteria", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-05 23:57:10.725578", 
+ "modified_by": "Administrator", 
+ "module": "Agriculture", 
+ "name": "Soil Texture", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Agriculture Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Agriculture User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/soil_texture/soil_texture.py b/erpnext/agriculture/doctype/soil_texture/soil_texture.py
new file mode 100644
index 0000000..7345e86
--- /dev/null
+++ b/erpnext/agriculture/doctype/soil_texture/soil_texture.py
@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe.utils import flt, cint
+
+class SoilTexture(Document):
+	soil_edit_order = [2, 1, 0]
+	soil_types = ['clay_composition', 'sand_composition', 'silt_composition']
+
+	def load_contents(self):
+		docs = frappe.get_all("Agriculture Analysis Criteria", filters={'linked_doctype':'Soil Texture'})
+		for doc in docs:
+			self.append('soil_texture_criteria', {'title': str(doc.name)})
+
+	def validate(self):
+		self.update_soil_edit('sand_composition')
+		for soil_type in self.soil_types:
+			if self.get(soil_type) > 100 or self.get(soil_type) < 0:
+				frappe.throw("{0} should be a value between 0 and 100".format(soil_type))
+		if sum(self.get(soil_type) for soil_type in self.soil_types) != 100:
+			frappe.throw('Soil compositions do not add up to 100')
+
+	def update_soil_edit(self, soil_type):
+		self.soil_edit_order[self.soil_types.index(soil_type)] = max(self.soil_edit_order)+1
+		self.soil_type = self.get_soil_type()
+
+	def get_soil_type(self):
+		# update the last edited soil type
+		if sum(self.soil_edit_order) < 5: return
+		last_edit_index = self.soil_edit_order.index(min(self.soil_edit_order))
+
+		# set composition of the last edited soil 
+		self.set( self.soil_types[last_edit_index], 
+			100 - sum(cint(self.get(soil_type)) for soil_type in self.soil_types) + cint(self.get(self.soil_types[last_edit_index])))
+
+		# calculate soil type
+		c, sa, si = flt(self.clay_composition), flt(self.sand_composition), flt(self.silt_composition)
+
+		if si + (1.5 * c) < 15:
+			return 'Sand'
+		elif si + 1.5 * c >= 15 and si + 2 * c < 30:
+			return 'Loamy Sand'
+		elif ((c >= 7 and c < 20) or (sa > 52) and ((si + 2*c) >= 30) or (c < 7 and si < 50 and (si+2*c) >= 30)):
+			return 'Sandy Loam'
+		elif ((c >= 7 and c < 27) and (si >= 28 and si < 50) and (sa <= 52)):
+			return 'Loam'
+		elif ((si >= 50 and (c >= 12 and c < 27)) or ((si >= 50 and si < 80) and c < 12)):
+			return 'Silt Loam'
+		elif (si >= 80 and c < 12):
+			return 'Silt'
+		elif ((c >= 20 and c < 35) and (si < 28) and (sa > 45)):
+			return 'Sandy Clay Loam'
+		elif ((c >= 27 and c < 40) and (sa > 20 and sa <= 45)):
+			return 'Clay Loam'
+		elif ((c >= 27 and c < 40) and (sa  <= 20)):
+			return 'Silty Clay Loam'
+		elif (c >= 35 and sa > 45):
+			return 'Sandy Clay'
+		elif (c >= 40 and si >= 40):
+			return 'Silty Clay'
+		elif (c >= 40 and sa <= 45 and si < 40):
+			return 'Clay'
+		else:
+			return 'Select'
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/soil_texture/test_records.json b/erpnext/agriculture/doctype/soil_texture/test_records.json
new file mode 100644
index 0000000..dcac7ad
--- /dev/null
+++ b/erpnext/agriculture/doctype/soil_texture/test_records.json
@@ -0,0 +1,9 @@
+[
+	{
+		"doctype": "Soil Texture",
+		"location": "{\"type\":\"FeatureCollection\",\"features\":[{\"type\":\"Feature\",\"properties\":{},\"geometry\":{\"type\":\"Point\",\"coordinates\":[72.861242,19.079153]}}]}",
+		"collection_datetime": "2017-11-08",
+		"clay_composition": 20,
+		"sand_composition": 30
+	}
+]
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/soil_texture/test_soil_texture.js b/erpnext/agriculture/doctype/soil_texture/test_soil_texture.js
new file mode 100644
index 0000000..d93f852
--- /dev/null
+++ b/erpnext/agriculture/doctype/soil_texture/test_soil_texture.js
@@ -0,0 +1,26 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Soil Texture", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(2);
+
+	frappe.run_serially([
+		// insert a new Soil Texture
+		() => frappe.tests.make('Soil Texture', [
+			// values to be set
+			{location: '{"type":"FeatureCollection","features":[{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[72.882185,19.076395]}}]}'},
+			{collection_datetime: '2017-11-08'},
+			{clay_composition: 20},
+			{sand_composition: 30}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.silt_composition, 50);
+			assert.equal(cur_frm.doc.soil_type, 'Silt Loam');
+		},
+		() => done()
+	]);
+});
diff --git a/erpnext/agriculture/doctype/soil_texture/test_soil_texture.py b/erpnext/agriculture/doctype/soil_texture/test_soil_texture.py
new file mode 100644
index 0000000..3f20e19
--- /dev/null
+++ b/erpnext/agriculture/doctype/soil_texture/test_soil_texture.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestSoilTexture(unittest.TestCase):
+	def test_texture_selection(self):
+		soil_tex = frappe.get_all('Soil Texture', fields=['name'], filters={'collection_datetime': '2017-11-08'})
+		doc = frappe.get_doc('Soil Texture', soil_tex[0].name)
+		self.assertEquals(doc.silt_composition, 50)
+		self.assertEquals(doc.soil_type, 'Silt Loam')
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_criteria/__init__.py b/erpnext/agriculture/doctype/soil_texture_criteria/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/assessment_criteria/__init__.py
copy to erpnext/agriculture/doctype/soil_texture_criteria/__init__.py
diff --git a/erpnext/agriculture/doctype/soil_texture_criteria/soil_texture_criteria.json b/erpnext/agriculture/doctype/soil_texture_criteria/soil_texture_criteria.json
new file mode 100644
index 0000000..e48a34b
--- /dev/null
+++ b/erpnext/agriculture/doctype/soil_texture_criteria/soil_texture_criteria.json
@@ -0,0 +1,162 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-12-05 23:45:17.419610", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "title", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Title", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Agriculture Analysis Criteria", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "value", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Value", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "minimum_permissible_value", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Minimum Permissible Value", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "maximum_permissible_value", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Maximum Permissible Value", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-12-05 23:45:17.419610", 
+ "modified_by": "Administrator", 
+ "module": "Agriculture", 
+ "name": "Soil Texture Criteria", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/soil_texture_criteria/soil_texture_criteria.py b/erpnext/agriculture/doctype/soil_texture_criteria/soil_texture_criteria.py
new file mode 100644
index 0000000..a7525ae
--- /dev/null
+++ b/erpnext/agriculture/doctype/soil_texture_criteria/soil_texture_criteria.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class SoilTextureCriteria(Document):
+	pass
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/agriculture/doctype/water_analysis/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/agriculture/doctype/water_analysis/__init__.py
diff --git a/erpnext/agriculture/doctype/water_analysis/test_water_analysis.js b/erpnext/agriculture/doctype/water_analysis/test_water_analysis.js
new file mode 100644
index 0000000..bb01cb3
--- /dev/null
+++ b/erpnext/agriculture/doctype/water_analysis/test_water_analysis.js
@@ -0,0 +1,25 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Water Analysis", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Water Analysis
+		() => frappe.tests.make('Water Analysis', [
+			// values to be set
+			{location: '{"type":"FeatureCollection","features":[{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[72.882185,19.076395]}}]}'},
+			{collection_datetime: '2017-11-08 18:43:57'},
+			{laboratory_testing_datetime: '2017-11-10 18:43:57'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.result_datetime, '2017-11-10 18:43:57');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/agriculture/doctype/water_analysis/test_water_analysis.py b/erpnext/agriculture/doctype/water_analysis/test_water_analysis.py
new file mode 100644
index 0000000..b6467b7
--- /dev/null
+++ b/erpnext/agriculture/doctype/water_analysis/test_water_analysis.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestWaterAnalysis(unittest.TestCase):
+	pass
diff --git a/erpnext/agriculture/doctype/water_analysis/water_analysis.js b/erpnext/agriculture/doctype/water_analysis/water_analysis.js
new file mode 100644
index 0000000..13fe3ad
--- /dev/null
+++ b/erpnext/agriculture/doctype/water_analysis/water_analysis.js
@@ -0,0 +1,18 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Water Analysis', {
+	onload: (frm) => {
+		if (frm.doc.water_analysis_criteria == undefined) frm.call('load_contents');
+	},
+	refresh: (frm) => {
+		let map_tools = ["a.leaflet-draw-draw-polyline",
+			"a.leaflet-draw-draw-polygon",
+			"a.leaflet-draw-draw-rectangle",
+			"a.leaflet-draw-draw-circle",
+			"a.leaflet-draw-draw-circlemarker"];
+
+		map_tools.forEach((element) => $(element).hide());
+	},
+	laboratory_testing_datetime: (frm) => frm.call("update_lab_result_date")
+});
diff --git a/erpnext/agriculture/doctype/water_analysis/water_analysis.json b/erpnext/agriculture/doctype/water_analysis/water_analysis.json
new file mode 100644
index 0000000..467dde4
--- /dev/null
+++ b/erpnext/agriculture/doctype/water_analysis/water_analysis.json
@@ -0,0 +1,561 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "WANA.#####", 
+ "beta": 0, 
+ "creation": "2017-10-17 18:51:19.946950", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "location", 
+   "fieldtype": "Geolocation", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Location", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "collection_datetime", 
+   "fieldtype": "Datetime", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Collection Datetime", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "laboratory_testing_datetime", 
+   "fieldtype": "Datetime", 
+   "hidden": 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": "Laboratory Testing Datetime", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "result_datetime", 
+   "fieldtype": "Datetime", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Result Datetime", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_4", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "type_of_sample", 
+   "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": "Type of Sample", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "container", 
+   "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": "Container", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "origin", 
+   "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": "Origin", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_8", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "collection_temperature", 
+   "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": "Collection Temperature ", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "storage_temperature", 
+   "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": "Storage Temperature", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "appearance", 
+   "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": "Appearance", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "person_responsible", 
+   "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": "Person Responsible", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_29", 
+   "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": "Water Analysis Criteria", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "water_analysis_criteria", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Water Analysis Criteria", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-05 23:42:50.684183", 
+ "modified_by": "Administrator", 
+ "module": "Agriculture", 
+ "name": "Water Analysis", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Agriculture Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Agriculture User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/water_analysis/water_analysis.py b/erpnext/agriculture/doctype/water_analysis/water_analysis.py
new file mode 100644
index 0000000..81fdf14
--- /dev/null
+++ b/erpnext/agriculture/doctype/water_analysis/water_analysis.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class WaterAnalysis(Document):
+	def load_contents(self):
+		docs = frappe.get_all("Agriculture Analysis Criteria", filters={'linked_doctype':'Water Analysis'})
+		for doc in docs:
+			self.append('water_analysis_criteria', {'title': str(doc.name)})
+
+	def update_lab_result_date(self):
+		if not self.result_datetime:
+			self.result_datetime = self.laboratory_testing_datetime
+
+	def validate(self):
+		if self.collection_datetime > self.laboratory_testing_datetime:
+			frappe.throw('Lab testing datetime cannot be before collection datetime')
+		if self.laboratory_testing_datetime > self.result_datetime:
+			frappe.throw('Lab result datetime cannot be before testing datetime')
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_criteria/__init__.py b/erpnext/agriculture/doctype/water_analysis_criteria/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/assessment_criteria/__init__.py
copy to erpnext/agriculture/doctype/water_analysis_criteria/__init__.py
diff --git a/erpnext/agriculture/doctype/water_analysis_criteria/water_analysis_criteria.json b/erpnext/agriculture/doctype/water_analysis_criteria/water_analysis_criteria.json
new file mode 100644
index 0000000..395669a
--- /dev/null
+++ b/erpnext/agriculture/doctype/water_analysis_criteria/water_analysis_criteria.json
@@ -0,0 +1,162 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-12-05 23:36:22.723558", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "title", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Title", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Agriculture Analysis Criteria", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "value", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Value", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "minimum_permissible_value", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Minimum Permissible Value", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "maximum_permissible_value", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Maximum Permissible Value", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-12-05 23:36:45.836858", 
+ "modified_by": "Administrator", 
+ "module": "Agriculture", 
+ "name": "Water Analysis Criteria", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/water_analysis_criteria/water_analysis_criteria.py b/erpnext/agriculture/doctype/water_analysis_criteria/water_analysis_criteria.py
new file mode 100644
index 0000000..6833f90
--- /dev/null
+++ b/erpnext/agriculture/doctype/water_analysis_criteria/water_analysis_criteria.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class WaterAnalysisCriteria(Document):
+	pass
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/agriculture/doctype/weather/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/agriculture/doctype/weather/__init__.py
diff --git a/erpnext/agriculture/doctype/weather/test_weather.js b/erpnext/agriculture/doctype/weather/test_weather.js
new file mode 100644
index 0000000..b5009a4
--- /dev/null
+++ b/erpnext/agriculture/doctype/weather/test_weather.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Weather", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Weather
+		() => frappe.tests.make('Weather', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/agriculture/doctype/weather/test_weather.py b/erpnext/agriculture/doctype/weather/test_weather.py
new file mode 100644
index 0000000..b4ab3ae
--- /dev/null
+++ b/erpnext/agriculture/doctype/weather/test_weather.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestWeather(unittest.TestCase):
+	pass
diff --git a/erpnext/agriculture/doctype/weather/weather.js b/erpnext/agriculture/doctype/weather/weather.js
new file mode 100644
index 0000000..dadb1d8
--- /dev/null
+++ b/erpnext/agriculture/doctype/weather/weather.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Weather', {
+	onload: (frm) => {
+		if (frm.doc.weather_parameter == undefined) frm.call('load_contents');
+	}
+});
diff --git a/erpnext/agriculture/doctype/weather/weather.json b/erpnext/agriculture/doctype/weather/weather.json
new file mode 100644
index 0000000..8f54957
--- /dev/null
+++ b/erpnext/agriculture/doctype/weather/weather.json
@@ -0,0 +1,261 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:date", 
+ "beta": 0, 
+ "creation": "2017-10-17 19:01:05.095598", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "source", 
+   "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": "Source", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_3", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_9", 
+   "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": "Weather Parameter", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "weather_parameter", 
+   "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, 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Weather Parameter", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-06 11:04:36.977755", 
+ "modified_by": "Administrator", 
+ "module": "Agriculture", 
+ "name": "Weather", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Agriculture Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Agriculture User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/weather/weather.py b/erpnext/agriculture/doctype/weather/weather.py
new file mode 100644
index 0000000..938daa2
--- /dev/null
+++ b/erpnext/agriculture/doctype/weather/weather.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class Weather(Document):
+	def load_contents(self):
+		docs = frappe.get_all("Agriculture Analysis Criteria", filters={'linked_doctype':'Weather'})
+		for doc in docs:
+			self.append('weather_parameter', {'title': str(doc.name)})
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/agriculture/doctype/weather_parameter/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/agriculture/doctype/weather_parameter/__init__.py
diff --git a/erpnext/agriculture/doctype/weather_parameter/weather_parameter.json b/erpnext/agriculture/doctype/weather_parameter/weather_parameter.json
new file mode 100644
index 0000000..724ead9
--- /dev/null
+++ b/erpnext/agriculture/doctype/weather_parameter/weather_parameter.json
@@ -0,0 +1,162 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-12-06 00:19:15.967334", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "title", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Title", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Agriculture Analysis Criteria", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "value", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Value", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "minimum_permissible_value", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Minimum Permissible Value", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "maximum_permissible_value", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Maximum Permissible Value", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-12-06 00:26:48.887975", 
+ "modified_by": "Administrator", 
+ "module": "Agriculture", 
+ "name": "Weather Parameter", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/weather_parameter/weather_parameter.py b/erpnext/agriculture/doctype/weather_parameter/weather_parameter.py
new file mode 100644
index 0000000..89db74c
--- /dev/null
+++ b/erpnext/agriculture/doctype/weather_parameter/weather_parameter.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class WeatherParameter(Document):
+	pass
diff --git a/erpnext/agriculture/setup.py b/erpnext/agriculture/setup.py
new file mode 100644
index 0000000..b3b136a
--- /dev/null
+++ b/erpnext/agriculture/setup.py
@@ -0,0 +1,434 @@
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from erpnext.setup.utils import insert_record
+
+def setup_agriculture():
+	records = [
+		dict(
+			doctype="Land Unit",
+			land_unit_name="All Land Units",
+			is_group=1,
+			is_container=1),
+		dict(
+			doctype='Item Group',
+			item_group_name='Fertilizer',
+			is_group=0,
+			parent_item_group=_('All Item Groups')),
+		dict(
+			doctype='Item Group',
+			item_group_name='Seed',
+			is_group=0,
+			parent_item_group=_('All Item Groups')),
+		dict(
+			doctype='Item Group',
+			item_group_name='By-product',
+			is_group=0,
+			parent_item_group=_('All Item Groups')),
+		dict(
+			doctype='Item Group',
+			item_group_name='Produce',
+			is_group=0,
+			parent_item_group=_('All Item Groups')),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Nitrogen Content',
+			standard=1,
+			linked_doctype='Fertilizer'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Phosphorous Content',
+			standard=1,
+			linked_doctype='Fertilizer'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Potassium Content',
+			standard=1,
+			linked_doctype='Fertilizer'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Calcium Content',
+			standard=1,
+			linked_doctype='Fertilizer'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Sulphur Content',
+			standard=1,
+			linked_doctype='Fertilizer'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Magnesium Content',
+			standard=1,
+			linked_doctype='Fertilizer'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Iron Content',
+			standard=1,
+			linked_doctype='Fertilizer'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Copper Content',
+			standard=1,
+			linked_doctype='Fertilizer'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Zinc Content',
+			standard=1,
+			linked_doctype='Fertilizer'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Boron Content',
+			standard=1,
+			linked_doctype='Fertilizer'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Manganese Content',
+			standard=1,
+			linked_doctype='Fertilizer'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Chlorine Content',
+			standard=1,
+			linked_doctype='Fertilizer'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Molybdenum Content',
+			standard=1,
+			linked_doctype='Fertilizer'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Sodium Content',
+			standard=1,
+			linked_doctype='Fertilizer'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Humic Acid',
+			standard=1,
+			linked_doctype='Fertilizer'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Fulvic Acid',
+			standard=1,
+			linked_doctype='Fertilizer'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Inert',
+			standard=1,
+			linked_doctype='Fertilizer'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Others',
+			standard=1,
+			linked_doctype='Fertilizer'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Nitrogen',
+			standard=1,
+			linked_doctype='Plant Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Phosphorous',
+			standard=1,
+			linked_doctype='Plant Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Potassium',
+			standard=1,
+			linked_doctype='Plant Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Calcium',
+			standard=1,
+			linked_doctype='Plant Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Magnesium',
+			standard=1,
+			linked_doctype='Plant Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Sulphur',
+			standard=1,
+			linked_doctype='Plant Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Boron',
+			standard=1,
+			linked_doctype='Plant Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Copper',
+			standard=1,
+			linked_doctype='Plant Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Iron',
+			standard=1,
+			linked_doctype='Plant Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Manganese',
+			standard=1,
+			linked_doctype='Plant Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Zinc',
+			standard=1,
+			linked_doctype='Plant Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Depth (in cm)',
+			standard=1,
+			linked_doctype='Soil Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='pH',
+			standard=1,
+			linked_doctype='Soil Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Salt Concentration (%)',
+			standard=1,
+			linked_doctype='Soil Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Organic Matter (%)',
+			standard=1,
+			linked_doctype='Soil Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='CEC (Cation Exchange Capacity) (MAQ/100mL)',
+			standard=1,
+			linked_doctype='Soil Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Potassium Saturation (%)',
+			standard=1,
+			linked_doctype='Soil Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Calcium Saturation (%)',
+			standard=1,
+			linked_doctype='Soil Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Manganese Saturation (%)',
+			standard=1,
+			linked_doctype='Soil Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Nirtogen (ppm)',
+			standard=1,
+			linked_doctype='Soil Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Phosphorous (ppm)',
+			standard=1,
+			linked_doctype='Soil Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Potassium (ppm)',
+			standard=1,
+			linked_doctype='Soil Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Calcium (ppm)',
+			standard=1,
+			linked_doctype='Soil Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Magnesium (ppm)',
+			standard=1,
+			linked_doctype='Soil Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Sulphur (ppm)',
+			standard=1,
+			linked_doctype='Soil Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Copper (ppm)',
+			standard=1,
+			linked_doctype='Soil Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Iron (ppm)',
+			standard=1,
+			linked_doctype='Soil Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Manganese (ppm)',
+			standard=1,
+			linked_doctype='Soil Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Zinc (ppm)',
+			standard=1,
+			linked_doctype='Soil Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Aluminium (ppm)',
+			standard=1,
+			linked_doctype='Soil Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='pH',
+			standard=1,
+			linked_doctype='Water Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Conductivity (mS/cm)',
+			standard=1,
+			linked_doctype='Water Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Hardness (mg/CaCO3)',
+			standard=1,
+			linked_doctype='Water Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Turbidity (NTU)',
+			standard=1,
+			linked_doctype='Water Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Odor',
+			standard=1,
+			linked_doctype='Water Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Color',
+			standard=1,
+			linked_doctype='Water Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Nitrate (mg/L)',
+			standard=1,
+			linked_doctype='Water Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Nirtite (mg/L)',
+			standard=1,
+			linked_doctype='Water Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Calcium (mg/L)',
+			standard=1,
+			linked_doctype='Water Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Magnesium (mg/L)',
+			standard=1,
+			linked_doctype='Water Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Sulphate (mg/L)',
+			standard=1,
+			linked_doctype='Water Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Boron (mg/L)',
+			standard=1,
+			linked_doctype='Water Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Copper (mg/L)',
+			standard=1,
+			linked_doctype='Water Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Iron (mg/L)',
+			standard=1,
+			linked_doctype='Water Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Manganese (mg/L)',
+			standard=1,
+			linked_doctype='Water Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Zinc (mg/L)',
+			standard=1,
+			linked_doctype='Water Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Chlorine (mg/L)',
+			standard=1,
+			linked_doctype='Water Analysis'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Bulk Density',
+			standard=1,
+			linked_doctype='Soil Texture'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Field Capacity',
+			standard=1,
+			linked_doctype='Soil Texture'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Wilting Point',
+			standard=1,
+			linked_doctype='Soil Texture'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Hydraulic Conductivity',
+			standard=1,
+			linked_doctype='Soil Texture'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Organic Matter',
+			standard=1,
+			linked_doctype='Soil Texture'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Temperature High',
+			standard=1,
+			linked_doctype='Weather'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Temperature Low',
+			standard=1,
+			linked_doctype='Weather'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Temperature Average',
+			standard=1,
+			linked_doctype='Weather'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Dew Point',
+			standard=1,
+			linked_doctype='Weather'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Precipitation Received',
+			standard=1,
+			linked_doctype='Weather'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Humidity',
+			standard=1,
+			linked_doctype='Weather'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Pressure',
+			standard=1,
+			linked_doctype='Weather'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Insolation/ PAR (Photosynthetically Active Radiation)',
+			standard=1,
+			linked_doctype='Weather'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Degree Days',
+			standard=1,
+			linked_doctype='Weather'),
+		dict(
+			doctype='Agriculture Analysis Criteria',
+			title='Degree Days',
+			standard=1,
+			linked_doctype='Water Analysis')
+	] 
+	insert_record(records)
diff --git a/erpnext/schools/__init__.py b/erpnext/assets/__init__.py
similarity index 100%
rename from erpnext/schools/__init__.py
rename to erpnext/assets/__init__.py
diff --git a/erpnext/schools/doctype/__init__.py b/erpnext/assets/doctype/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/__init__.py
rename to erpnext/assets/doctype/__init__.py
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/assets/doctype/asset/__init__.py
similarity index 100%
rename from erpnext/accounts/doctype/asset/__init__.py
rename to erpnext/assets/doctype/asset/__init__.py
diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js
new file mode 100644
index 0000000..2b9eac1
--- /dev/null
+++ b/erpnext/assets/doctype/asset/asset.js
@@ -0,0 +1,319 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.provide("erpnext.asset");
+
+frappe.ui.form.on('Asset', {
+	onload: function(frm) {
+		frm.set_query("item_code", function() {
+			return {
+				"filters": {
+					"disabled": 0,
+					"is_fixed_asset": 1,
+					"is_stock_item": 0
+				}
+			};
+		});
+
+		frm.set_query("warehouse", function() {
+			return {
+				"filters": {
+					"company": frm.doc.company,
+					"is_group": 0
+				}
+			};
+		});
+	},
+
+	refresh: function(frm) {
+		frappe.ui.form.trigger("Asset", "is_existing_asset");
+		frm.toggle_display("next_depreciation_date", frm.doc.docstatus < 1);
+		frm.events.make_schedules_editable(frm);
+
+		if (frm.doc.docstatus==1) {
+			if (in_list(["Submitted", "Partially Depreciated", "Fully Depreciated"], frm.doc.status)) {
+				frm.add_custom_button("Transfer Asset", function() {
+					erpnext.asset.transfer_asset(frm);
+				});
+
+				frm.add_custom_button("Scrap Asset", function() {
+					erpnext.asset.scrap_asset(frm);
+				});
+
+				frm.add_custom_button("Sell Asset", function() {
+					frm.trigger("make_sales_invoice");
+				});
+
+			} else if (frm.doc.status=='Scrapped') {
+				frm.add_custom_button("Restore Asset", function() {
+					erpnext.asset.restore_asset(frm);
+				});
+			}
+			if (frm.doc.status=='Submitted' && !frm.doc.is_existing_asset && !frm.doc.purchase_invoice) {
+				frm.add_custom_button(__("Purchase Invoice"), function() {
+					frm.trigger("make_purchase_invoice");
+				}, __("Make"));
+			}
+			if (frm.doc.maintenance_required && !frm.doc.maintenance_schedule) {
+				frm.add_custom_button(__("Asset Maintenance"), function() {
+					frm.trigger("create_asset_maintenance");
+				}, __("Make"));
+			}
+			frm.page.set_inner_btn_group_as_primary(__("Make"));
+			frm.trigger("setup_chart");
+		}
+	},
+
+	setup_chart: function(frm) {
+		var x_intervals = [frm.doc.purchase_date];
+		var asset_values = [frm.doc.gross_purchase_amount];
+		var last_depreciation_date = frm.doc.purchase_date;
+
+		if(frm.doc.opening_accumulated_depreciation) {
+			last_depreciation_date = frappe.datetime.add_months(frm.doc.next_depreciation_date,
+				-1*frm.doc.frequency_of_depreciation);
+
+			x_intervals.push(last_depreciation_date);
+			asset_values.push(flt(frm.doc.gross_purchase_amount) -
+				flt(frm.doc.opening_accumulated_depreciation));
+		}
+
+		$.each(frm.doc.schedules || [], function(i, v) {
+			x_intervals.push(v.schedule_date);
+			var asset_value = flt(frm.doc.gross_purchase_amount) - flt(v.accumulated_depreciation_amount);
+			if(v.journal_entry) {
+				last_depreciation_date = v.schedule_date;
+				asset_values.push(asset_value);
+			} else {
+				if (in_list(["Scrapped", "Sold"], frm.doc.status)) {
+					asset_values.push(null);
+				} else {
+					asset_values.push(asset_value)
+				}
+			}
+		});
+
+		if(in_list(["Scrapped", "Sold"], frm.doc.status)) {
+			x_intervals.push(frm.doc.disposal_date);
+			asset_values.push(0);
+			last_depreciation_date = frm.doc.disposal_date;
+		}
+
+		frm.dashboard.render_graph({
+			title: "Asset Value",
+			data: {
+				labels: x_intervals,
+				datasets: [{
+					color: 'green',
+					values: asset_values,
+					formatted: asset_values.map(d => d.toFixed(2))
+				}]
+			},
+			type: 'line'
+		});
+	},
+
+
+	item_code: function(frm) {
+		if(frm.doc.item_code) {
+			frappe.call({
+				method: "erpnext.assets.doctype.asset.asset.get_item_details",
+				args: {
+					item_code: frm.doc.item_code
+				},
+				callback: function(r, rt) {
+					if(r.message) {
+						$.each(r.message, function(field, value) {
+							frm.set_value(field, value);
+						})
+					}
+				}
+			})
+		}
+	},
+
+	is_existing_asset: function(frm) {
+		frm.toggle_reqd("next_depreciation_date", (!frm.doc.is_existing_asset && frm.doc.calculate_depreciation));
+	},
+
+	opening_accumulated_depreciation: function(frm) {
+		erpnext.asset.set_accululated_depreciation(frm);
+	},
+
+	depreciation_method: function(frm) {
+		frm.events.make_schedules_editable(frm);
+	},
+
+	make_schedules_editable: function(frm) {
+		var is_editable = frm.doc.depreciation_method==="Manual" ? true : false;
+		frm.toggle_enable("schedules", is_editable);
+		frm.fields_dict["schedules"].grid.toggle_enable("schedule_date", is_editable);
+		frm.fields_dict["schedules"].grid.toggle_enable("depreciation_amount", is_editable);
+	},
+
+	make_purchase_invoice: function(frm) {
+		frappe.call({
+			args: {
+				"asset": frm.doc.name,
+				"item_code": frm.doc.item_code,
+				"gross_purchase_amount": frm.doc.gross_purchase_amount,
+				"company": frm.doc.company,
+				"posting_date": frm.doc.purchase_date
+			},
+			method: "erpnext.assets.doctype.asset.asset.make_purchase_invoice",
+			callback: function(r) {
+				var doclist = frappe.model.sync(r.message);
+				frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
+			}
+		})
+	},
+
+	make_sales_invoice: function(frm) {
+		frappe.call({
+			args: {
+				"asset": frm.doc.name,
+				"item_code": frm.doc.item_code,
+				"company": frm.doc.company
+			},
+			method: "erpnext.accounts.doctype.asset.asset.make_sales_invoice",
+			callback: function(r) {
+				var doclist = frappe.model.sync(r.message);
+				frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
+			}
+		})
+	},
+
+	create_asset_maintenance: function(frm) {
+		frappe.call({
+			args: {
+				"asset": frm.doc.name,
+				"item_code": frm.doc.item_code,
+				"item_name": frm.doc.item_name,
+				"asset_category": frm.doc.asset_category,
+				"company": frm.doc.company
+			},
+			method: "erpnext.assets.doctype.asset.asset.create_asset_maintenance",
+			callback: function(r) {
+				var doclist = frappe.model.sync(r.message);
+				frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
+			}
+		})
+	}
+});
+
+frappe.ui.form.on('Depreciation Schedule', {
+	make_depreciation_entry: function(frm, cdt, cdn) {
+		var row = locals[cdt][cdn];
+		if (!row.journal_entry) {
+			frappe.call({
+				method: "erpnext.assets.doctype.asset.depreciation.make_depreciation_entry",
+				args: {
+					"asset_name": frm.doc.name,
+					"date": row.schedule_date
+				},
+				callback: function(r) {
+					frappe.model.sync(r.message);
+					frm.refresh();
+				}
+			})
+		}
+	},
+
+	depreciation_amount: function(frm, cdt, cdn) {
+		erpnext.asset.set_accululated_depreciation(frm);
+	}
+
+})
+
+erpnext.asset.set_accululated_depreciation = function(frm) {
+	if(frm.doc.depreciation_method != "Manual") return;
+
+	var accumulated_depreciation = flt(frm.doc.opening_accumulated_depreciation);
+	$.each(frm.doc.schedules || [], function(i, row) {
+		accumulated_depreciation  += flt(row.depreciation_amount);
+		frappe.model.set_value(row.doctype, row.name,
+			"accumulated_depreciation_amount", accumulated_depreciation);
+	})
+};
+
+erpnext.asset.scrap_asset = function(frm) {
+	frappe.confirm(__("Do you really want to scrap this asset?"), function () {
+		frappe.call({
+			args: {
+				"asset_name": frm.doc.name
+			},
+			method: "erpnext.assets.doctype.asset.depreciation.scrap_asset",
+			callback: function(r) {
+				cur_frm.reload_doc();
+			}
+		})
+	})
+};
+
+erpnext.asset.restore_asset = function(frm) {
+	frappe.confirm(__("Do you really want to restore this scrapped asset?"), function () {
+		frappe.call({
+			args: {
+				"asset_name": frm.doc.name
+			},
+			method: "erpnext.assets.doctype.asset.depreciation.restore_asset",
+			callback: function(r) {
+				cur_frm.reload_doc();
+			}
+		})
+	})
+};
+
+erpnext.asset.transfer_asset = function(frm) {
+	var dialog = new frappe.ui.Dialog({
+		title: __("Transfer Asset"),
+		fields: [
+			{
+				"label": __("Target Warehouse"),
+				"fieldname": "target_warehouse",
+				"fieldtype": "Link",
+				"options": "Warehouse",
+				"get_query": function () {
+					return {
+						filters: [
+							["Warehouse", "company", "in", ["", cstr(frm.doc.company)]],
+							["Warehouse", "is_group", "=", 0]
+						]
+					}
+				},
+				"reqd": 1
+			},
+			{
+				"label": __("Date"),
+				"fieldname": "transfer_date",
+				"fieldtype": "Datetime",
+				"reqd": 1,
+				"default": frappe.datetime.now_datetime()
+			}
+		]
+	});
+
+	dialog.set_primary_action(__("Transfer"), function() {
+		var args = dialog.get_values();
+		if(!args) return;
+		dialog.hide();
+		return frappe.call({
+			type: "GET",
+			method: "erpnext.assets.doctype.asset.asset.transfer_asset",
+			args: {
+				args: {
+					"asset": frm.doc.name,
+					"transaction_date": args.transfer_date,
+					"source_warehouse": frm.doc.warehouse,
+					"target_warehouse": args.target_warehouse,
+					"company": frm.doc.company
+				}
+			},
+			freeze: true,
+			callback: function(r) {
+				cur_frm.reload_doc();
+			}
+		})
+	});
+	dialog.show();
+};
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset/asset.json b/erpnext/assets/doctype/asset/asset.json
new file mode 100644
index 0000000..ee6b12c
--- /dev/null
+++ b/erpnext/assets/doctype/asset/asset.json
@@ -0,0 +1,1280 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:asset_name", 
+ "beta": 0, 
+ "creation": "2016-03-01 17:01:27.920130", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 0, 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "asset_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Asset Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item_code", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Item Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item_name", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "item_code.item_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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "asset_category", 
+   "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": 1, 
+   "label": "Asset Category", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Asset Category", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Draft", 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Draft\nSubmitted\nPartially Depreciated\nFully Depreciated\nSold\nScrapped\nIn Maintenance\nOut of Order", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "asset_owner", 
+   "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": "Asset Owner", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nCompany\nSupplier\nCustomer", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.asset_owner == \"Company\"", 
+   "fieldname": "asset_owner_company", 
+   "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": "Asset Owner Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.asset_owner == \"Supplier\"", 
+   "fieldname": "supplier", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Supplier", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Supplier", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.asset_owner == \"Customer\"", 
+   "fieldname": "customer", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Customer", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Customer", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "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": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 1, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Department", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "purchase_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": "Purchase Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "purchase_invoice", 
+   "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": "Purchase Invoice", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Purchase Invoice", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "is_existing_asset", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Existing Asset", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "disposal_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": "Disposal Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "journal_entry_for_scrap", 
+   "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": "Journal Entry for Scrap", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Journal Entry", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "gross_purchase_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Gross Purchase Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_18", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "", 
+   "fieldname": "expected_value_after_useful_life", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Expected Value After Useful Life", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_existing_asset", 
+   "fieldname": "opening_accumulated_depreciation", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Opening Accumulated Depreciation", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_20", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "calculate_depreciation", 
+   "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": "Calculate Depreciation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "depends_on": "calculate_depreciation", 
+   "fieldname": "section_break_23", 
+   "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": "Depreciation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "depends_on": "", 
+   "fieldname": "depreciation_method", 
+   "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": "Depreciation Method", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nStraight Line\nDouble Declining Balance\nManual", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "value_after_depreciation", 
+   "fieldtype": "Currency", 
+   "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": "Value After Depreciation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_number_of_depreciations", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Number of Depreciations", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_24", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:(doc.is_existing_asset && doc.opening_accumulated_depreciation)", 
+   "fieldname": "number_of_depreciations_booked", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Number of Depreciations Booked", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "frequency_of_depreciation", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Frequency of Depreciation (Months)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "next_depreciation_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": "Next Depreciation Date", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "calculate_depreciation", 
+   "fieldname": "section_break_14", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Depreciation Schedule", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "schedules", 
+   "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": "Depreciation Schedules", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Depreciation Schedule", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_31", 
+   "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": "Maintenance", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Check if Asset requires Preventive Maintenance or Calibration", 
+   "fieldname": "maintenance_required", 
+   "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": "Maintenance Required", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Asset", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 72, 
+ "image_field": "image", 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-08 12:58:44.137460", 
+ "modified_by": "Administrator", 
+ "module": "Assets", 
+ "name": "Asset", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Quality Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 1, 
+ "show_name_in_global_search": 1, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py
new file mode 100644
index 0000000..857aade
--- /dev/null
+++ b/erpnext/assets/doctype/asset/asset.py
@@ -0,0 +1,281 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.utils import flt, add_months, cint, nowdate, getdate, today
+from frappe.model.document import Document
+from erpnext.accounts.doctype.purchase_invoice.purchase_invoice import get_fixed_asset_account
+from erpnext.assets.doctype.asset.depreciation \
+	import get_disposal_account_and_cost_center, get_depreciation_accounts
+
+class Asset(Document):
+	def validate(self):
+		self.status = self.get_status()
+		self.validate_item()
+		self.set_missing_values()
+		self.validate_asset_values()
+		if self.calculate_depreciation:
+			self.make_depreciation_schedule()
+			self.set_accumulated_depreciation()
+			get_depreciation_accounts(self)
+		if self.get("schedules"):
+			self.validate_expected_value_after_useful_life()
+
+	def on_submit(self):
+		self.set_status()
+
+	def on_cancel(self):
+		self.validate_cancellation()
+		self.delete_depreciation_entries()
+		self.set_status()
+
+	def validate_item(self):
+		item = frappe.db.get_value("Item", self.item_code,
+			["is_fixed_asset", "is_stock_item", "disabled"], as_dict=1)
+		if not item:
+			frappe.throw(_("Item {0} does not exist").format(self.item_code))
+		elif item.disabled:
+			frappe.throw(_("Item {0} has been disabled").format(self.item_code))
+		elif not item.is_fixed_asset:
+			frappe.throw(_("Item {0} must be a Fixed Asset Item").format(self.item_code))
+		elif item.is_stock_item:
+			frappe.throw(_("Item {0} must be a non-stock item").format(self.item_code))
+
+	def set_missing_values(self):
+		if self.item_code:
+			item_details = get_item_details(self.item_code)
+			for field, value in item_details.items():
+				if not self.get(field):
+					self.set(field, value)
+
+		self.value_after_depreciation = (flt(self.gross_purchase_amount) -
+			flt(self.opening_accumulated_depreciation))
+
+	def validate_asset_values(self):
+		if flt(self.expected_value_after_useful_life) >= flt(self.gross_purchase_amount):
+			frappe.throw(_("Expected Value After Useful Life must be less than Gross Purchase Amount"))
+
+		if not flt(self.gross_purchase_amount):
+			frappe.throw(_("Gross Purchase Amount is mandatory"), frappe.MandatoryError)
+
+		if not self.is_existing_asset and self.calculate_depreciation:
+			self.opening_accumulated_depreciation = 0
+			self.number_of_depreciations_booked = 0
+			if not self.next_depreciation_date:
+				frappe.throw(_("Next Depreciation Date is mandatory for new asset"))
+		else:
+			depreciable_amount = flt(self.gross_purchase_amount) - flt(self.expected_value_after_useful_life)
+			if flt(self.opening_accumulated_depreciation) > depreciable_amount:
+					frappe.throw(_("Opening Accumulated Depreciation must be less than equal to {0}")
+						.format(depreciable_amount))
+
+			if self.opening_accumulated_depreciation:
+				if not self.number_of_depreciations_booked:
+					frappe.throw(_("Please set Number of Depreciations Booked"))
+			else:
+				self.number_of_depreciations_booked = 0
+
+			if cint(self.number_of_depreciations_booked) > cint(self.total_number_of_depreciations):
+				frappe.throw(_("Number of Depreciations Booked cannot be greater than Total Number of Depreciations"))
+
+		if self.next_depreciation_date and getdate(self.next_depreciation_date) < getdate(nowdate()):
+			frappe.msgprint(_("Next Depreciation Date is entered as past date"), title=_('Warning'), indicator='red')
+
+		if self.next_depreciation_date and getdate(self.next_depreciation_date) < getdate(self.purchase_date):
+			frappe.throw(_("Next Depreciation Date cannot be before Purchase Date"))
+
+		if (flt(self.value_after_depreciation) > flt(self.expected_value_after_useful_life)
+			and not self.next_depreciation_date and self.calculate_depreciation):
+				frappe.throw(_("Please set Next Depreciation Date"))
+
+	def make_depreciation_schedule(self):
+		if self.depreciation_method != 'Manual':
+			self.schedules = []
+
+		if not self.get("schedules") and self.next_depreciation_date:
+			value_after_depreciation = flt(self.value_after_depreciation)
+
+			number_of_pending_depreciations = cint(self.total_number_of_depreciations) - \
+				cint(self.number_of_depreciations_booked)
+			if number_of_pending_depreciations:
+				for n in xrange(number_of_pending_depreciations):
+					schedule_date = add_months(self.next_depreciation_date,
+						n * cint(self.frequency_of_depreciation))
+
+					depreciation_amount = self.get_depreciation_amount(value_after_depreciation)
+					value_after_depreciation -= flt(depreciation_amount)
+
+					self.append("schedules", {
+						"schedule_date": schedule_date,
+						"depreciation_amount": depreciation_amount
+					})
+
+	def set_accumulated_depreciation(self):
+		accumulated_depreciation = flt(self.opening_accumulated_depreciation)
+		value_after_depreciation = flt(self.value_after_depreciation)
+		for i, d in enumerate(self.get("schedules")):
+			depreciation_amount = flt(d.depreciation_amount, d.precision("depreciation_amount"))
+			value_after_depreciation -= flt(depreciation_amount)
+
+			if i==len(self.get("schedules"))-1 and self.depreciation_method == "Straight Line":
+				depreciation_amount += flt(value_after_depreciation - flt(self.expected_value_after_useful_life),
+					d.precision("depreciation_amount"))
+
+			d.depreciation_amount = depreciation_amount
+			accumulated_depreciation += d.depreciation_amount
+			d.accumulated_depreciation_amount = flt(accumulated_depreciation, d.precision("accumulated_depreciation_amount"))
+
+	def get_depreciation_amount(self, depreciable_value):
+		if self.depreciation_method in ("Straight Line", "Manual"):
+			depreciation_amount = (flt(self.value_after_depreciation) -
+				flt(self.expected_value_after_useful_life)) / (cint(self.total_number_of_depreciations) -
+				cint(self.number_of_depreciations_booked))
+		else:
+			factor = 200.0 /  self.total_number_of_depreciations
+			depreciation_amount = flt(depreciable_value * factor / 100, 0)
+
+			value_after_depreciation = flt(depreciable_value) - depreciation_amount
+			if value_after_depreciation < flt(self.expected_value_after_useful_life):
+				depreciation_amount = flt(depreciable_value) - flt(self.expected_value_after_useful_life)
+
+		return depreciation_amount
+
+	def validate_expected_value_after_useful_life(self):
+		accumulated_depreciation_after_full_schedule = \
+			max([d.accumulated_depreciation_amount for d in self.get("schedules")])
+
+		asset_value_after_full_schedule = flt(flt(self.gross_purchase_amount) -
+			flt(accumulated_depreciation_after_full_schedule),
+			self.precision('expected_value_after_useful_life'))
+
+		if self.expected_value_after_useful_life < asset_value_after_full_schedule:
+			frappe.throw(_("Expected value after useful life must be greater than or equal to {0}")
+				.format(asset_value_after_full_schedule))
+
+	def validate_cancellation(self):
+		if self.status not in ("Submitted", "Partially Depreciated", "Fully Depreciated"):
+			frappe.throw(_("Asset cannot be cancelled, as it is already {0}").format(self.status))
+
+		if self.purchase_invoice:
+			frappe.throw(_("Please cancel Purchase Invoice {0} first").format(self.purchase_invoice))
+
+	def delete_depreciation_entries(self):
+		for d in self.get("schedules"):
+			if d.journal_entry:
+				frappe.get_doc("Journal Entry", d.journal_entry).cancel()
+				d.db_set("journal_entry", None)
+
+		self.db_set("value_after_depreciation",
+			(flt(self.gross_purchase_amount) - flt(self.opening_accumulated_depreciation)))
+
+	def set_status(self, status=None):
+		'''Get and update status'''
+		if not status:
+			status = self.get_status()	
+		self.db_set("status", status)
+
+	def get_status(self):
+		'''Returns status based on whether it is draft, submitted, scrapped or depreciated'''
+		if self.docstatus == 0:
+			status = "Draft"
+		elif self.docstatus == 1:
+			status = "Submitted"
+			if self.journal_entry_for_scrap:
+				status = "Scrapped"
+			elif flt(self.value_after_depreciation) <= flt(self.expected_value_after_useful_life):
+				status = "Fully Depreciated"
+			elif flt(self.value_after_depreciation) < flt(self.gross_purchase_amount):
+				status = 'Partially Depreciated'
+		elif self.docstatus == 2:
+			status = "Cancelled"
+		return status
+
+def update_maintenance_status():
+	assets = frappe.get_all('Asset', filters = {'docstatus': 1, 'maintenance_required': 1})
+
+	for asset in assets:
+		asset = frappe.get_doc("Asset", asset.name)
+		if frappe.db.exists('Asset Maintenance Task', {'parent': asset.name, 'next_due_date': today()}):
+			asset.set_status('In Maintenance')
+		if frappe.db.exists('Asset Repair', {'asset_name': asset.name, 'repair_status': 'Pending'}):
+			asset.set_status('Out of Order')
+
+@frappe.whitelist()
+def make_purchase_invoice(asset, item_code, gross_purchase_amount, company, posting_date):
+	pi = frappe.new_doc("Purchase Invoice")
+	pi.company = company
+	pi.currency = frappe.db.get_value("Company", company, "default_currency")
+	pi.set_posting_time = 1
+	pi.posting_date = posting_date
+	pi.append("items", {
+		"item_code": item_code,
+		"is_fixed_asset": 1,
+		"asset": asset,
+		"expense_account": get_fixed_asset_account(asset),
+		"qty": 1,
+		"price_list_rate": gross_purchase_amount,
+		"rate": gross_purchase_amount
+	})
+	pi.set_missing_values()
+	return pi
+
+@frappe.whitelist()
+def make_sales_invoice(asset, item_code, company):
+	si = frappe.new_doc("Sales Invoice")
+	si.company = company
+	si.currency = frappe.db.get_value("Company", company, "default_currency")
+	disposal_account, depreciation_cost_center = get_disposal_account_and_cost_center(company)
+	si.append("items", {
+		"item_code": item_code,
+		"is_fixed_asset": 1,
+		"asset": asset,
+		"income_account": disposal_account,
+		"cost_center": depreciation_cost_center,
+		"qty": 1
+	})
+	si.set_missing_values()
+	return si
+
+@frappe.whitelist()
+def create_asset_maintenance(asset, item_code, item_name, asset_category, company):
+	asset_maintenance = frappe.new_doc("Asset Maintenance")
+	asset_maintenance.update({
+		"asset_name": asset,
+		"company": company,
+		"item_code": item_code,
+		"item_name": item_name,
+		"asset_category": asset_category
+	})
+	return asset_maintenance
+
+@frappe.whitelist()
+def transfer_asset(args):
+	import json
+	args = json.loads(args)
+	movement_entry = frappe.new_doc("Asset Movement")
+	movement_entry.update(args)
+	movement_entry.insert()
+	movement_entry.submit()
+
+	frappe.db.commit()
+
+	frappe.msgprint(_("Asset Movement record {0} created").format("<a href='#Form/Asset Movement/{0}'>{0}</a>".format(movement_entry.name)))
+
+@frappe.whitelist()
+def get_item_details(item_code):
+	asset_category = frappe.db.get_value("Item", item_code, "asset_category")
+
+	if not asset_category:
+		frappe.throw(_("Please enter Asset Category in Item {0}").format(item_code))
+
+	ret = frappe.db.get_value("Asset Category", asset_category,
+		["depreciation_method", "total_number_of_depreciations", "frequency_of_depreciation"], as_dict=1)
+
+	ret.update({
+		"asset_category": asset_category
+	})
+
+	return ret
diff --git a/erpnext/assets/doctype/asset/asset_dashboard.py b/erpnext/assets/doctype/asset/asset_dashboard.py
new file mode 100644
index 0000000..94dad1b
--- /dev/null
+++ b/erpnext/assets/doctype/asset/asset_dashboard.py
@@ -0,0 +1,14 @@
+def get_data():
+	return {
+		'fieldname': 'asset_name',
+		'transactions': [
+			{
+				'label': ['Maintenance'],
+				'items': ['Asset Maintenance', 'Asset Maintenance Log']
+			},
+			{
+				'label': ['Repair'],
+				'items': ['Asset Repair']
+			}
+		]
+	}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset/asset_list.js b/erpnext/assets/doctype/asset/asset_list.js
similarity index 100%
rename from erpnext/accounts/doctype/asset/asset_list.js
rename to erpnext/assets/doctype/asset/asset_list.js
diff --git a/erpnext/accounts/doctype/asset/depreciation.py b/erpnext/assets/doctype/asset/depreciation.py
similarity index 100%
rename from erpnext/accounts/doctype/asset/depreciation.py
rename to erpnext/assets/doctype/asset/depreciation.py
diff --git a/erpnext/assets/doctype/asset/test_asset.js b/erpnext/assets/doctype/asset/test_asset.js
new file mode 100644
index 0000000..6119e38
--- /dev/null
+++ b/erpnext/assets/doctype/asset/test_asset.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Asset", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Asset
+		() => frappe.tests.make('Asset', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/assets/doctype/asset/test_asset.py b/erpnext/assets/doctype/asset/test_asset.py
new file mode 100644
index 0000000..107ffec
--- /dev/null
+++ b/erpnext/assets/doctype/asset/test_asset.py
@@ -0,0 +1,347 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+from frappe.utils import cstr, nowdate, getdate, flt
+from erpnext.assets.doctype.asset.depreciation import post_depreciation_entries, scrap_asset, restore_asset
+from erpnext.assets.doctype.asset.asset import make_sales_invoice, make_purchase_invoice
+
+class TestAsset(unittest.TestCase):
+	def setUp(self):
+		set_depreciation_settings_in_company()
+		create_asset()
+		frappe.db.sql("delete from `tabTax Rule`")
+
+	def test_purchase_asset(self):
+		asset = frappe.get_doc("Asset", "Macbook Pro 1")
+		asset.submit()
+		
+		pi = make_purchase_invoice(asset.name, asset.item_code, asset.gross_purchase_amount,
+			asset.company, asset.purchase_date)
+		pi.supplier = "_Test Supplier"
+		pi.insert()
+		pi.submit()
+		
+		asset.load_from_db()
+		self.assertEqual(asset.supplier, "_Test Supplier")
+		self.assertEqual(asset.purchase_date, getdate("2015-01-01"))
+		self.assertEqual(asset.purchase_invoice, pi.name)
+		
+		expected_gle = (
+			("_Test Fixed Asset - _TC", 100000.0, 0.0),
+			("Creditors - _TC", 0.0, 100000.0)
+		)
+
+		gle = frappe.db.sql("""select account, debit, credit from `tabGL Entry`
+			where voucher_type='Purchase Invoice' and voucher_no = %s
+			order by account""", pi.name)
+
+		self.assertEqual(gle, expected_gle)
+
+		pi.cancel()
+
+		asset.load_from_db()
+		self.assertEqual(asset.supplier, None)
+		self.assertEqual(asset.purchase_invoice, None)
+		
+		self.assertFalse(frappe.db.get_value("GL Entry",
+			{"voucher_type": "Purchase Invoice", "voucher_no": pi.name}))
+		
+
+	def test_schedule_for_straight_line_method(self):
+		asset = frappe.get_doc("Asset", "Macbook Pro 1")
+
+		self.assertEqual(asset.status, "Draft")
+
+		expected_schedules = [
+			["2020-12-31", 30000, 30000],
+			["2021-03-31", 30000, 60000],
+			["2021-06-30", 30000, 90000]
+		]
+
+		schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
+			for d in asset.get("schedules")]
+
+		self.assertEqual(schedules, expected_schedules)
+		
+	def test_schedule_for_straight_line_method_for_existing_asset(self):
+		asset = frappe.get_doc("Asset", "Macbook Pro 1")
+		asset.is_existing_asset = 1
+		asset.number_of_depreciations_booked = 1
+		asset.opening_accumulated_depreciation = 40000
+		asset.save()
+		
+		self.assertEqual(asset.status, "Draft")
+
+		expected_schedules = [
+			["2020-12-31", 25000, 65000],
+			["2021-03-31", 25000, 90000]
+		]
+
+		schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
+			for d in asset.get("schedules")]
+
+		self.assertEqual(schedules, expected_schedules)
+
+
+	def test_schedule_for_double_declining_method(self):
+		asset = frappe.get_doc("Asset", "Macbook Pro 1")
+		asset.depreciation_method = "Double Declining Balance"
+		asset.save()
+
+		expected_schedules = [
+			["2020-12-31", 66667, 66667],
+			["2021-03-31", 22222, 88889],
+			["2021-06-30", 1111, 90000]
+		]
+
+		schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
+			for d in asset.get("schedules")]
+
+		self.assertEqual(schedules, expected_schedules)
+		
+	def test_schedule_for_double_declining_method_for_existing_asset(self):
+		asset = frappe.get_doc("Asset", "Macbook Pro 1")
+		asset.depreciation_method = "Double Declining Balance"
+		asset.is_existing_asset = 1
+		asset.number_of_depreciations_booked = 1
+		asset.opening_accumulated_depreciation = 50000
+		asset.save()
+
+		expected_schedules = [
+			["2020-12-31", 33333, 83333],
+			["2021-03-31", 6667, 90000]
+		]
+
+		schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
+			for d in asset.get("schedules")]
+
+		self.assertEqual(schedules, expected_schedules)
+		
+	def test_schedule_for_manual_method(self):
+		asset = frappe.get_doc("Asset", "Macbook Pro 1")
+		asset.depreciation_method = "Manual"
+		asset.schedules = []
+		for schedule_date, amount in [["2020-12-31", 40000], ["2021-06-30", 30000], ["2021-10-31", 20000]]:
+			asset.append("schedules", {
+				"schedule_date": schedule_date,
+				"depreciation_amount": amount
+			})
+		asset.save()
+
+		self.assertEqual(asset.status, "Draft")
+
+		expected_schedules = [
+			["2020-12-31", 40000, 40000],
+			["2021-06-30", 30000, 70000],
+			["2021-10-31", 20000, 90000]
+		]
+
+		schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
+			for d in asset.get("schedules")]
+
+		self.assertEqual(schedules, expected_schedules)
+
+	def test_depreciation(self):
+		asset = frappe.get_doc("Asset", "Macbook Pro 1")
+		asset.submit()
+		asset.load_from_db()
+		self.assertEqual(asset.status, "Submitted")
+
+		frappe.db.set_value("Company", "_Test Company", "series_for_depreciation_entry", "DEPR-")
+
+		post_depreciation_entries(date="2021-01-01")
+		asset.load_from_db()
+
+		self.assertEqual(asset.status, "Partially Depreciated")
+
+		# check depreciation entry series
+		self.assertEqual(asset.get("schedules")[0].journal_entry[:4], "DEPR")
+
+		expected_gle = (
+			("_Test Accumulated Depreciations - _TC", 0.0, 30000.0),
+			("_Test Depreciations - _TC", 30000.0, 0.0)
+		)
+
+		gle = frappe.db.sql("""select account, debit, credit from `tabGL Entry`
+			where against_voucher_type='Asset' and against_voucher = %s
+			order by account""", asset.name)
+
+		self.assertEqual(gle, expected_gle)
+		self.assertEqual(asset.get("value_after_depreciation"), 70000)
+		
+	def test_depreciation_entry_cancellation(self):
+		asset = frappe.get_doc("Asset", "Macbook Pro 1")
+		asset.submit()
+		post_depreciation_entries(date="2021-01-01")
+		
+		asset.load_from_db()
+		
+		# cancel depreciation entry
+		depr_entry = asset.get("schedules")[0].journal_entry
+		self.assertTrue(depr_entry)
+		frappe.get_doc("Journal Entry", depr_entry).cancel()
+		
+		asset.load_from_db()
+		depr_entry = asset.get("schedules")[0].journal_entry
+		self.assertFalse(depr_entry)
+		
+
+	def test_scrap_asset(self):
+		asset = frappe.get_doc("Asset", "Macbook Pro 1")
+		asset.submit()
+		post_depreciation_entries(date="2021-01-01")
+
+		scrap_asset("Macbook Pro 1")
+
+		asset.load_from_db()
+		self.assertEqual(asset.status, "Scrapped")
+		self.assertTrue(asset.journal_entry_for_scrap)
+
+		expected_gle = (
+			("_Test Accumulated Depreciations - _TC", 30000.0, 0.0),
+			("_Test Fixed Asset - _TC", 0.0, 100000.0),
+			("_Test Gain/Loss on Asset Disposal - _TC", 70000.0, 0.0)
+		)
+
+		gle = frappe.db.sql("""select account, debit, credit from `tabGL Entry`
+			where voucher_type='Journal Entry' and voucher_no = %s
+			order by account""", asset.journal_entry_for_scrap)
+
+		self.assertEqual(gle, expected_gle)
+
+		restore_asset("Macbook Pro 1")
+
+		asset.load_from_db()
+		self.assertFalse(asset.journal_entry_for_scrap)
+		self.assertEqual(asset.status, "Partially Depreciated")
+
+	def test_asset_sale(self):
+		frappe.get_doc("Asset", "Macbook Pro 1").submit()
+		post_depreciation_entries(date="2021-01-01")
+
+		si = make_sales_invoice(asset="Macbook Pro 1", item_code="Macbook Pro", company="_Test Company")
+		si.customer = "_Test Customer"
+		si.due_date = nowdate()
+		si.get("items")[0].rate = 25000
+		si.insert()
+		si.submit()
+
+		self.assertEqual(frappe.db.get_value("Asset", "Macbook Pro 1", "status"), "Sold")
+
+		expected_gle = (
+			("_Test Accumulated Depreciations - _TC", 30000.0, 0.0),
+			("_Test Depreciations - _TC", 70000.0, 0.0),
+			("_Test Fixed Asset - _TC", 0.0, 100000.0),
+			("_Test Gain/Loss on Asset Disposal - _TC", 0.0, 25000.0),
+			("Debtors - _TC", 25000.0, 0.0)
+		)
+
+		gle = frappe.db.sql("""select account, debit, credit from `tabGL Entry`
+			where voucher_type='Sales Invoice' and voucher_no = %s
+			order by account""", si.name)
+
+		self.assertEqual(gle, expected_gle)
+
+		si.cancel()
+		frappe.delete_doc("Sales Invoice", si.name)
+
+		self.assertEqual(frappe.db.get_value("Asset", "Macbook Pro 1", "status"), "Partially Depreciated")
+
+	def test_asset_expected_value_after_useful_life(self):
+		asset = frappe.get_doc("Asset", "Macbook Pro 1")
+		asset.depreciation_method = "Straight Line"
+		asset.is_existing_asset = 1
+		asset.total_number_of_depreciations = 400
+		asset.gross_purchase_amount = 16866177.00
+		asset.expected_value_after_useful_life = 500000
+		asset.save()
+
+		accumulated_depreciation_after_full_schedule = \
+			max([d.accumulated_depreciation_amount for d in asset.get("schedules")])
+
+		asset_value_after_full_schedule = (flt(asset.gross_purchase_amount) -
+			flt(accumulated_depreciation_after_full_schedule))
+
+		self.assertTrue(asset.expected_value_after_useful_life >= asset_value_after_full_schedule)
+
+	def tearDown(self):
+		asset = frappe.get_doc("Asset", "Macbook Pro 1")
+
+		if asset.docstatus == 1 and asset.status not in ("Scrapped", "Sold", "Draft", "Cancelled"):
+			asset.cancel()
+
+			self.assertEqual(frappe.db.get_value("Asset", "Macbook Pro 1", "status"), "Cancelled")
+
+		frappe.delete_doc("Asset", "Macbook Pro 1")
+
+def create_asset():
+	if not frappe.db.exists("Asset Category", "Computers"):
+		create_asset_category()
+
+	if not frappe.db.exists("Item", "Macbook Pro"):
+		create_fixed_asset_item()
+	
+	asset = frappe.get_doc({
+		"doctype": "Asset",
+		"asset_name": "Macbook Pro 1",
+		"asset_category": "Computers",
+		"item_code": "Macbook Pro",
+		"company": "_Test Company",
+		"purchase_date": "2015-01-01",
+		"calculate_depreciation": 1,
+		"next_depreciation_date": "2020-12-31",
+		"gross_purchase_amount": 100000,
+		"expected_value_after_useful_life": 10000,
+		"warehouse": "_Test Warehouse - _TC",
+		"asset_owner": "Company"
+	})
+	try:
+		asset.save()
+	except frappe.DuplicateEntryError:
+		pass
+
+	return asset
+
+def create_asset_category():
+	asset_category = frappe.new_doc("Asset Category")
+	asset_category.asset_category_name = "Computers"
+	asset_category.total_number_of_depreciations = 3
+	asset_category.frequency_of_depreciation = 3
+	asset_category.append("accounts", {
+		"company_name": "_Test Company",
+		"fixed_asset_account": "_Test Fixed Asset - _TC",
+		"accumulated_depreciation_account": "_Test Accumulated Depreciations - _TC",
+		"depreciation_expense_account": "_Test Depreciations - _TC"
+	})
+	asset_category.insert()
+
+def create_fixed_asset_item():
+	try:
+		frappe.get_doc({
+			"doctype": "Item",
+			"item_code": "Macbook Pro",
+			"item_name": "Macbook Pro",
+			"description": "Macbook Pro Retina Display",
+			"asset_category": "Computers",
+			"item_group": "All Item Groups",
+			"stock_uom": "Nos",
+			"is_stock_item": 0,
+			"is_fixed_asset": 1
+		}).insert()
+	except frappe.DuplicateEntryError:
+		pass
+
+def set_depreciation_settings_in_company():
+	company = frappe.get_doc("Company", "_Test Company")
+	company.accumulated_depreciation_account = "_Test Accumulated Depreciations - _TC"
+	company.depreciation_expense_account = "_Test Depreciations - _TC"
+	company.disposal_account = "_Test Gain/Loss on Asset Disposal - _TC"
+	company.depreciation_cost_center = "_Test Cost Center - _TC"
+	company.save()
+	
+	# Enable booking asset depreciation entry automatically
+	frappe.db.set_value("Accounts Settings", None, "book_asset_depreciation_entry_automatically", 1)
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset_category/__init__.py b/erpnext/assets/doctype/asset_category/__init__.py
similarity index 100%
rename from erpnext/accounts/doctype/asset_category/__init__.py
rename to erpnext/assets/doctype/asset_category/__init__.py
diff --git a/erpnext/accounts/doctype/asset_category/asset_category.js b/erpnext/assets/doctype/asset_category/asset_category.js
similarity index 100%
rename from erpnext/accounts/doctype/asset_category/asset_category.js
rename to erpnext/assets/doctype/asset_category/asset_category.js
diff --git a/erpnext/assets/doctype/asset_category/asset_category.json b/erpnext/assets/doctype/asset_category/asset_category.json
new file mode 100644
index 0000000..3331d05
--- /dev/null
+++ b/erpnext/assets/doctype/asset_category/asset_category.json
@@ -0,0 +1,315 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:asset_category_name", 
+ "beta": 0, 
+ "creation": "2016-03-01 17:41:39.778765", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "asset_category_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Asset Category Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Straight Line", 
+   "fieldname": "depreciation_method", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Depreciation Method", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nStraight Line\nDouble Declining Balance\nManual", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_number_of_depreciations", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Total Number of Depreciations", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "frequency_of_depreciation", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Frequency of Depreciation (Months)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_2", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Accounts", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "accounts", 
+   "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": "Accounts", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Asset Category Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-01 15:14:25.645077", 
+ "modified_by": "Administrator", 
+ "module": "Assets", 
+ "name": "Asset Category", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Quality Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
diff --git a/erpnext/accounts/doctype/asset_category/asset_category.py b/erpnext/assets/doctype/asset_category/asset_category.py
similarity index 100%
rename from erpnext/accounts/doctype/asset_category/asset_category.py
rename to erpnext/assets/doctype/asset_category/asset_category.py
diff --git a/erpnext/assets/doctype/asset_category/test_asset_category.js b/erpnext/assets/doctype/asset_category/test_asset_category.js
new file mode 100644
index 0000000..7e343b7
--- /dev/null
+++ b/erpnext/assets/doctype/asset_category/test_asset_category.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Asset Category", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Asset Category
+		() => frappe.tests.make('Asset Category', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/accounts/doctype/asset_category/test_asset_category.py b/erpnext/assets/doctype/asset_category/test_asset_category.py
similarity index 100%
rename from erpnext/accounts/doctype/asset_category/test_asset_category.py
rename to erpnext/assets/doctype/asset_category/test_asset_category.py
diff --git a/erpnext/accounts/doctype/asset_category_account/__init__.py b/erpnext/assets/doctype/asset_category_account/__init__.py
similarity index 100%
rename from erpnext/accounts/doctype/asset_category_account/__init__.py
rename to erpnext/assets/doctype/asset_category_account/__init__.py
diff --git a/erpnext/assets/doctype/asset_category_account/asset_category_account.json b/erpnext/assets/doctype/asset_category_account/asset_category_account.json
new file mode 100644
index 0000000..679cc52
--- /dev/null
+++ b/erpnext/assets/doctype/asset_category_account/asset_category_account.json
@@ -0,0 +1,165 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-03-07 15:55:18.806409", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 3, 
+   "fieldname": "company_name", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 1, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 3, 
+   "fieldname": "fixed_asset_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Fixed Asset Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "accumulated_depreciation_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Accumulated Depreciation Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "depreciation_expense_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Depreciation Expense Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-28 16:54:12.252271", 
+ "modified_by": "Administrator", 
+ "module": "Assets", 
+ "name": "Asset Category Account", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset_category_account/asset_category_account.py b/erpnext/assets/doctype/asset_category_account/asset_category_account.py
similarity index 100%
rename from erpnext/accounts/doctype/asset_category_account/asset_category_account.py
rename to erpnext/assets/doctype/asset_category_account/asset_category_account.py
diff --git a/erpnext/schools/doctype/student_attendance/__init__.py b/erpnext/assets/doctype/asset_maintenance/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/student_attendance/__init__.py
copy to erpnext/assets/doctype/asset_maintenance/__init__.py
diff --git a/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js
new file mode 100644
index 0000000..1583daf
--- /dev/null
+++ b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js
@@ -0,0 +1,119 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Asset Maintenance', {
+	setup: (frm) => {
+		frm.set_query("assign_to", "asset_maintenance_tasks", function(doc) {
+			return {
+				query: "erpnext.assets.doctype.asset_maintenance.asset_maintenance.get_team_members",
+				filters: {
+					maintenance_team: doc.maintenance_team
+				}
+			};
+		});
+
+		frm.set_indicator_formatter('maintenance_status',
+			function(doc) {
+				let indicator = 'blue';
+				if (doc.maintenance_status == 'Overdue') {
+					indicator = 'orange';
+				}
+				if (doc.maintenance_status == 'Cancelled') {
+					indicator = 'red';
+				}
+				return indicator;
+			}
+		);
+	},
+	refresh: (frm) => {
+		if(!frm.is_new()) {
+			frm.trigger('make_dashboard');
+		}
+	},
+	make_dashboard: (frm) => {
+		if(!frm.is_new()) {
+			frappe.call({
+				method: 'erpnext.assets.doctype.asset_maintenance.asset_maintenance.get_maintenance_log',
+				args: {asset_name: frm.doc.asset_name},
+				callback: (r) => {
+					if(!r.message) {
+						return;
+					}
+					var section = frm.dashboard.add_section(`<h5 style="margin-top: 0px;">
+						${ __("Maintenance Log") }</a></h5>`);
+					var rows = $('<div></div>').appendTo(section);
+					// show
+					(r.message || []).forEach(function(d) {
+						$(`<div class='row' style='margin-bottom: 10px;'>
+							<div class='col-sm-3 small'>
+								<a onclick="frappe.set_route('List', 'Asset Maintenance Log', 
+									{'asset_name': '${d.asset_name}','maintenance_status': '${d.maintenance_status}' });">
+									${d.maintenance_status} <span class="badge">${d.count}</span>
+								</a>
+							</div>
+						</div>`).appendTo(rows);
+					});
+					frm.dashboard.show();
+				}
+			});
+		}
+	}
+});
+
+frappe.ui.form.on('Asset Maintenance Task', {
+	start_date: (frm, cdt, cdn)  => {
+		get_next_due_date(frm, cdt, cdn);
+	},
+	periodicity: (frm, cdt, cdn)  => {
+		get_next_due_date(frm, cdt, cdn);
+	},
+	last_completion_date: (frm, cdt, cdn)  => {
+		get_next_due_date(frm, cdt, cdn);
+	},
+	end_date: (frm, cdt, cdn)  => {
+		get_next_due_date(frm, cdt, cdn);
+	},
+	assign_to: (frm, cdt, cdn)  => {
+		var d = locals[cdt][cdn];
+		if (frm.doc.__islocal) {
+			frappe.model.set_value(cdt, cdn, "assign_to", "");
+			frappe.model.set_value(cdt, cdn, "assign_to_name", "");
+			frappe.throw(__("Please save before assigning task."));
+		}
+		if (d.assign_to) {
+			return frappe.call({
+				method: 'erpnext.assets.doctype.asset_maintenance.asset_maintenance.assign_tasks',
+				args: {
+					asset_maintenance_name: frm.doc.name,
+					assign_to_member: d.assign_to,
+					maintenance_task: d.maintenance_task,
+					next_due_date: d.next_due_date
+				}
+			});
+		}
+	}
+});
+
+var get_next_due_date = function (frm, cdt, cdn) {
+	var d = locals[cdt][cdn];
+	if (d.start_date && d.periodicity) {
+		return frappe.call({
+			method: 'erpnext.assets.doctype.asset_maintenance.asset_maintenance.calculate_next_due_date',
+			args: {
+				start_date: d.start_date,
+				periodicity: d.periodicity,
+				end_date: d.end_date,
+				last_completion_date: d.last_completion_date,
+				next_due_date: d.next_due_date
+			},
+			callback: function(r) {
+				if (r.message) {
+					frappe.model.set_value(cdt, cdn, "next_due_date", r.message);
+				}
+				else {
+					frappe.model.set_value(cdt, cdn, "next_due_date", "");
+				}
+			}
+		});
+	}
+};
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_maintenance/asset_maintenance.json b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
new file mode 100644
index 0000000..72d96b0
--- /dev/null
+++ b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
@@ -0,0 +1,479 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:asset_name", 
+ "beta": 0, 
+ "creation": "2017-10-19 16:50:22.879545", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "asset_name", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Asset Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Asset", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "asset_category", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Asset Category", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "asset_name.asset_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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item_code", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "asset_name.item_code", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item_name", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "asset_name.item_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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_6", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "maintenance_team", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Maintenance Team", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Asset Maintenance Team", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_9", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "maintenance_manager", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Maintenance Manager", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "maintenance_team.maintenance_manager", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "maintenance_manager_name", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Maintenance Manager Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "maintenance_team.maintenance_manager_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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_8", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Tasks", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "asset_maintenance_tasks", 
+   "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": "Maintenance Tasks", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Asset Maintenance Task", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-01 15:13:29.816396", 
+ "modified_by": "Administrator", 
+ "module": "Assets", 
+ "name": "Asset Maintenance", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Quality Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Manufacturing User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py
new file mode 100644
index 0000000..7551eae
--- /dev/null
+++ b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py
@@ -0,0 +1,118 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe.desk.form import assign_to
+from frappe import throw, _
+from frappe.utils import add_days, add_months, add_years, getdate, nowdate
+
+class AssetMaintenance(Document):
+	def validate(self):
+		for task in self.get('asset_maintenance_tasks'):
+			if task.end_date and (getdate(task.start_date) >= getdate(task.end_date)):
+				throw(_("Start date should be less than end date for task {0}").format(task.maintenance_task))
+			if getdate(task.next_due_date) < getdate(nowdate()):
+				task.maintenance_status = "Overdue"
+
+	def on_update(self):
+		for task in self.get('asset_maintenance_tasks'):
+			if not task.assign_to:
+				task.db_set("assign_to", self.maintenance_manager)
+				task.db_set("assign_to_name", self.maintenance_manager_name)
+			assign_tasks(self.name, task.assign_to, task.maintenance_task, task.next_due_date)
+		self.sync_maintenance_tasks()
+
+	def sync_maintenance_tasks(self):
+		tasks_names = []
+		for task in self.get('asset_maintenance_tasks'):
+			tasks_names.append(task.name)
+			update_maintenance_log(asset_maintenance = self.name, item_code = self.item_code, item_name = self.item_name, task = task)
+		asset_maintenance_logs = frappe.get_all("Asset Maintenance Log", fields=["name"], filters = {"asset_maintenance": self.name,
+			"task": ("not in", tasks_names)})
+		if asset_maintenance_logs:
+			for asset_maintenance_log in asset_maintenance_logs:
+				maintenance_log = frappe.get_doc('Asset Maintenance Log', asset_maintenance_log.name)
+				maintenance_log.db_set('maintenance_status', 'Cancelled')
+
+@frappe.whitelist()
+def assign_tasks(asset_maintenance_name, assign_to_member, maintenance_task, next_due_date):
+	team_member = frappe.get_doc('User', assign_to_member).email
+	args = {
+		'doctype' : 'Asset Maintenance',
+		'assign_to' : team_member,
+		'name' : asset_maintenance_name,
+		'description' : maintenance_task,
+		'date' : next_due_date
+	}
+	if not frappe.db.sql("""select owner from `tabToDo`
+		where reference_type=%(doctype)s and reference_name=%(name)s and status="Open"
+		and owner=%(assign_to)s""", args):
+		assign_to.add(args)
+
+@frappe.whitelist()
+def calculate_next_due_date(periodicity, start_date = None, end_date = None, last_completion_date = None, next_due_date = None):
+	if not start_date and not last_completion_date:
+		start_date = frappe.utils.now()
+
+	if last_completion_date and (last_completion_date > start_date or not start_date):
+		start_date = last_completion_date
+	if periodicity == 'Daily':
+		next_due_date = add_days(start_date, 1)
+	if periodicity == 'Weekly':
+		next_due_date = add_days(start_date, 7)
+	if periodicity == 'Monthly':
+		next_due_date = add_months(start_date, 1)
+	if periodicity == 'Yearly':
+		next_due_date = add_years(start_date, 1)
+	if periodicity == '2 Yearly':
+		next_due_date = add_years(start_date, 2)
+	if periodicity == 'Quarterly':
+		next_due_date = add_months(start_date, 3)
+	if end_date and (start_date >= end_date or last_completion_date >= end_date or next_due_date):
+		next_due_date = ""
+	return next_due_date
+
+def update_maintenance_log(asset_maintenance, item_code, item_name, task):
+	asset_maintenance_log = frappe.get_value("Asset Maintenance Log", {"asset_maintenance": asset_maintenance,
+		"task": task.maintenance_task, "maintenance_status": ('in',['Planned','Overdue'])})
+
+	if not asset_maintenance_log:
+		asset_maintenance_log = frappe.get_doc({
+			"doctype": "Asset Maintenance Log",
+			"asset_maintenance": asset_maintenance,
+			"asset_name": asset_maintenance,
+			"item_code": item_code,
+			"item_name": item_name,
+			"task": task.maintenance_task,
+			"has_certificate": task.certificate_required,
+			"description": task.description,
+			"assign_to_name": task.assign_to_name,
+			"periodicity": str(task.periodicity),
+			"maintenance_type": task.maintenance_type,
+			"due_date": task.next_due_date
+		})
+		asset_maintenance_log.insert()
+	else:
+		maintenance_log = frappe.get_doc('Asset Maintenance Log', asset_maintenance_log)
+		maintenance_log.assign_to_name = task.assign_to_name
+		maintenance_log.has_certificate = task.certificate_required
+		maintenance_log.description = task.description
+		maintenance_log.periodicity = str(task.periodicity)
+		maintenance_log.maintenance_type = task.maintenance_type
+		maintenance_log.due_date = task.next_due_date
+		maintenance_log.save()
+
+@frappe.whitelist()
+def get_team_members(doctype, txt, searchfield, start, page_len, filters):
+	return frappe.db.get_values('Maintenance Team Member', {'parent':filters.get("maintenance_team")})
+
+@frappe.whitelist()
+def get_maintenance_log(asset_name):
+    return frappe.db.sql("""
+        select maintenance_status, count(asset_name) as count, asset_name
+        from `tabAsset Maintenance Log`
+        where asset_name=%s group by maintenance_status""",
+        (asset_name), as_dict=1)
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_maintenance/test_asset_maintenance.js b/erpnext/assets/doctype/asset_maintenance/test_asset_maintenance.js
new file mode 100644
index 0000000..f9b38a1
--- /dev/null
+++ b/erpnext/assets/doctype/asset_maintenance/test_asset_maintenance.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Asset Maintenance", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Asset Maintenance
+		() => frappe.tests.make('Asset Maintenance', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/assets/doctype/asset_maintenance/test_asset_maintenance.py b/erpnext/assets/doctype/asset_maintenance/test_asset_maintenance.py
new file mode 100644
index 0000000..3be3dcf
--- /dev/null
+++ b/erpnext/assets/doctype/asset_maintenance/test_asset_maintenance.py
@@ -0,0 +1,141 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+from frappe.utils import nowdate, add_days
+from erpnext.assets.doctype.asset_maintenance.asset_maintenance import calculate_next_due_date
+
+class TestAssetMaintenance(unittest.TestCase):
+	def setUp(self):
+		set_depreciation_settings_in_company()
+		create_asset()
+		create_maintenance_team()
+
+	def test_create_asset_maintenance(self):
+		if not frappe.db.exists("Asset Maintenance", "Photocopier"):
+			asset_maintenance =	frappe.get_doc({
+					"doctype": "Asset Maintenance",
+					"asset_name": "Photocopier",
+					"maintenance_team": "Team Awesome",
+					"company": "_Test Company",
+					"asset_maintenance_tasks": get_maintenance_tasks()
+				}).insert()
+
+			next_due_date = calculate_next_due_date(nowdate(), "Monthly")
+			self.assertEqual(asset_maintenance.asset_maintenance_tasks[0].next_due_date, next_due_date)
+
+	def test_create_asset_maintenance_log(self):
+		if not frappe.db.exists("Asset Maintenance Log", "Photocopier"):
+			asset_maintenance_log =	frappe.get_doc({
+					"doctype": "Asset Maintenance Log",
+					"asset_maintenance": "Photocopier",
+					"task": "Change Oil",
+					"completion_date": add_days(nowdate(), 2),
+					"maintenance_status": "Completed"
+				}).insert()
+		asset_maintenance = frappe.get_doc("Asset Maintenance", "Photocopier")
+		next_due_date = calculate_next_due_date(asset_maintenance_log.completion_date, "Monthly")
+		self.assertEqual(asset_maintenance.asset_maintenance_tasks[0].next_due_date, next_due_date)
+
+def create_asset():
+	if not frappe.db.exists("Asset Category", "Equipment"):
+		create_asset_category()
+
+	if not frappe.db.exists("Item", "Photocopier"):
+		frappe.get_doc({
+			"doctype": "Item",
+			"item_code": "Photocopier",
+			"item_name": "Photocopier",
+			"item_group": "All Item Groups",
+			"company": "_Test Company",
+			"is_fixed_asset": 1,
+			"is_stock_item": 0,
+			"asset_category": "Equipment"
+		}).insert()
+
+	if not frappe.db.exists("Asset", "Photocopier"):
+		frappe.get_doc({
+			"doctype": "Asset",
+			"asset_name": "Photocopier",
+			"item_code": "Photocopier",
+			"asset_category": "Equipment",
+			"gross_purchase_amount": 100000,
+			"expected_value_after_useful_life": 10000,
+			"warehouse": "_Test Warehouse - _TC",
+			"company": "_Test Company",
+			"purchase_date": nowdate(),
+			"maintenance_required": 1,
+			"asset_owner": "Company"
+		}).insert()
+
+def create_maintenance_team():
+	user_list = ["marcus@abc.com", "thalia@abc.com", "mathias@abc.com"]
+	if not frappe.db.exists("Role", "Technician"):
+		frappe.get_doc({"doctype": "Role", "role_name": "Technician"}).insert()
+	for user in user_list:
+		if not frappe.db.get_value("User", user):
+			frappe.get_doc({
+				"doctype": "User",
+				"email": user,
+				"first_name": user,
+				"new_password": "password",
+				"roles": [{"doctype": "Has Role", "role": "Technician"}]
+			}).insert()
+
+	if not frappe.db.exists("Asset Maintenance Team", "Team Awesome"):
+		frappe.get_doc({
+			"doctype": "Asset Maintenance Team",
+			"maintenance_manager": "marcus@abc.com",
+			"maintenance_team_name": "Team Awesome",
+			"company": "_Test Company",
+			"maintenance_team_members": get_maintenance_team(user_list)
+		}).insert()
+
+def get_maintenance_team(user_list):
+	return [{"team_member": user,
+			"full_name": user,
+			"maintenance_role": "Technician"
+			}
+		for user in user_list[1:]]
+
+def get_maintenance_tasks():
+	return [{"maintenance_task": "Change Oil",
+			"start_date": nowdate(),
+			"periodicity": "Monthly",
+			"maintenance_type": "Preventive Maintenance",
+			"maintenance_status": "Planned"
+			},
+			{"maintenance_task": "Check Gears",
+			"start_date": nowdate(),
+			"periodicity": "Yearly",
+			"maintenance_type": "Calibration",
+			"maintenance_status": "Planned"
+			}
+		]
+
+def create_asset_category():
+	asset_category = frappe.new_doc("Asset Category")
+	asset_category.asset_category_name = "Equipment"
+	asset_category.total_number_of_depreciations = 3
+	asset_category.frequency_of_depreciation = 3
+	asset_category.append("accounts", {
+		"company_name": "_Test Company",
+		"fixed_asset_account": "_Test Fixed Asset - _TC",
+		"accumulated_depreciation_account": "_Test Accumulated Depreciations - _TC",
+		"depreciation_expense_account": "_Test Depreciations - _TC"
+	})
+	asset_category.insert()
+
+def set_depreciation_settings_in_company():
+	company = frappe.get_doc("Company", "_Test Company")
+	company.accumulated_depreciation_account = "_Test Accumulated Depreciations - _TC"
+	company.depreciation_expense_account = "_Test Depreciations - _TC"
+	company.disposal_account = "_Test Gain/Loss on Asset Disposal - _TC"
+	company.depreciation_cost_center = "_Test Cost Center - _TC"
+	company.save()
+	
+	# Enable booking asset depreciation entry automatically
+	frappe.db.set_value("Accounts Settings", None, "book_asset_depreciation_entry_automatically", 1)	
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_log/__init__.py b/erpnext/assets/doctype/asset_maintenance_log/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/student_log/__init__.py
copy to erpnext/assets/doctype/asset_maintenance_log/__init__.py
diff --git a/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.js b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.js
new file mode 100644
index 0000000..c5db90a
--- /dev/null
+++ b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.js
@@ -0,0 +1,15 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Asset Maintenance Log', {
+	asset_maintenance: (frm) => {
+		frm.set_query('task', function(doc) {
+			return {
+				query: "erpnext.assets.doctype.asset_maintenance_log.asset_maintenance_log.get_maintenance_tasks",
+				filters: {
+					'asset_maintenance': doc.asset_maintenance
+				}
+			};
+		});
+	}
+});
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
new file mode 100644
index 0000000..b63f755
--- /dev/null
+++ b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
@@ -0,0 +1,763 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "naming_series:", 
+ "beta": 0, 
+ "creation": "2017-10-23 16:58:44.424309", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "asset_maintenance", 
+   "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": "Asset Maintenance", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Asset Maintenance", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "AML-", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "asset_name", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Asset Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "asset_maintenance.asset_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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item_code", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "asset_maintenance.item_code", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item_name", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "asset_maintenance.item_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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "task", 
+   "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": "Task", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Asset Maintenance Task", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "maintenance_type", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Maintenance Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "task.maintenance_type", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "periodicity", 
+   "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": "Periodicity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "task.periodicity", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assign_to_name", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Assign To", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "task.assign_to_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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_6", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "due_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Due Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "task.next_due_date", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "completion_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Completion Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "maintenance_status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Maintenance Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Planned\nCompleted\nCancelled\nOverdue", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_12", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "has_certificate", 
+   "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": "Has Certificate ", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "task.has_certificate", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.has_certificate", 
+   "fieldname": "certificate_attachement", 
+   "fieldtype": "Attach", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Certificate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_6", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "task.description", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_9", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "actions_performed", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Actions performed", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Asset Maintenance Log", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-28 13:15:01.689318", 
+ "modified_by": "Administrator", 
+ "module": "Assets", 
+ "name": "Asset Maintenance Log", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Manufacturing User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "", 
+ "track_changes": 1, 
+ "track_seen": 1
+}
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py
new file mode 100644
index 0000000..f169f01
--- /dev/null
+++ b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe import _
+from frappe.utils import nowdate, getdate
+from erpnext.assets.doctype.asset_maintenance.asset_maintenance import calculate_next_due_date
+
+class AssetMaintenanceLog(Document):
+	def validate(self):
+		if getdate(self.due_date) < getdate(nowdate()):
+			self.maintenance_status = "Overdue"
+
+		if self.maintenance_status == "Completed" and not self.completion_date:
+			frappe.throw(_("Please select Completion Date for Completed Asset Maintenance Log"))
+
+		if self.maintenance_status != "Completed" and self.completion_date:
+			frappe.throw(_("Please select Maintenance Status as Completed or remove Completion Date"))
+
+	def on_submit(self):
+		if self.maintenance_status not in ['Completed', 'Cancelled']:
+			frappe.throw(_("Maintenance Status has to be Cancelled or Completed to Submit"))
+		self.update_maintenance_task()
+
+	def update_maintenance_task(self):
+		asset_maintenance_doc = frappe.get_doc('Asset Maintenance Task', self.task)
+		if self.maintenance_status == "Completed":
+			if asset_maintenance_doc.last_completion_date != self.completion_date:
+				next_due_date = calculate_next_due_date(periodicity = self.periodicity, last_completion_date = self.completion_date)
+				asset_maintenance_doc.last_completion_date = self.completion_date
+				asset_maintenance_doc.next_due_date = next_due_date
+				asset_maintenance_doc.maintenance_status = "Planned"
+				asset_maintenance_doc.save()
+		if self.maintenance_status == "Cancelled":
+			asset_maintenance_doc.maintenance_status = "Cancelled"
+			asset_maintenance_doc.save()
+		asset_maintenance_doc = frappe.get_doc('Asset Maintenance', self.asset_maintenance)
+		asset_maintenance_doc.save()
+
+@frappe.whitelist()
+def get_maintenance_tasks(doctype, txt, searchfield, start, page_len, filters):
+	asset_maintenance_tasks = frappe.db.get_values('Asset Maintenance Task', {'parent':filters.get("asset_maintenance")}, 'maintenance_task')
+	return asset_maintenance_tasks
diff --git a/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log_calendar.js b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log_calendar.js
new file mode 100644
index 0000000..c804b31
--- /dev/null
+++ b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log_calendar.js
@@ -0,0 +1,22 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+frappe.views.calendar["Asset Maintenance Log"] = {
+	field_map: {
+		"start": "due_date",
+		"end": "due_date",
+		"id": "name",
+		"title": "task",
+		"allDay": "allDay",
+		"progress": "progress"
+	},
+	filters: [
+		{
+			"fieldtype": "Link",
+			"fieldname": "asset_name",
+			"options": "Asset Maintenance",
+			"label": __("Asset Maintenance")
+		}
+	],
+	get_events_method: "frappe.desk.calendar.get_events"
+};
diff --git a/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log_list.js b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log_list.js
new file mode 100644
index 0000000..b854413
--- /dev/null
+++ b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log_list.js
@@ -0,0 +1,14 @@
+frappe.listview_settings['Asset Maintenance Log'] = {
+	add_fields: ["maintenance_status"],
+	get_indicator: function(doc) {
+		if(doc.maintenance_status=="Pending") {
+			return [__("Pending"), "orange"];
+		} else if(doc.maintenance_status=="Completed") {
+			return [__("Completed"), "green"];
+		} else if(doc.maintenance_status=="Cancelled") {
+			return [__("Cancelled"), "red"];
+		} else if(doc.maintenance_status=="Overdue") {
+			return [__("Overdue"), "red"];
+		}
+	}
+};
diff --git a/erpnext/assets/doctype/asset_maintenance_log/test_asset_maintenance_log.js b/erpnext/assets/doctype/asset_maintenance_log/test_asset_maintenance_log.js
new file mode 100644
index 0000000..4e80184
--- /dev/null
+++ b/erpnext/assets/doctype/asset_maintenance_log/test_asset_maintenance_log.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Asset Maintenance Log", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Asset Maintenance Log
+		() => frappe.tests.make('Asset Maintenance Log', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/assets/doctype/asset_maintenance_log/test_asset_maintenance_log.py b/erpnext/assets/doctype/asset_maintenance_log/test_asset_maintenance_log.py
new file mode 100644
index 0000000..a1ec879
--- /dev/null
+++ b/erpnext/assets/doctype/asset_maintenance_log/test_asset_maintenance_log.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import unittest
+
+class TestAssetMaintenanceLog(unittest.TestCase):
+	pass
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/assets/doctype/asset_maintenance_task/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/assets/doctype/asset_maintenance_task/__init__.py
diff --git a/erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.json b/erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.json
new file mode 100644
index 0000000..bdf9054
--- /dev/null
+++ b/erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.json
@@ -0,0 +1,643 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:maintenance_task", 
+ "beta": 0, 
+ "creation": "2017-10-20 07:10:55.903571", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "maintenance_task", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Maintenance Task", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 1
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "maintenance_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Maintenance Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Preventive Maintenance\nCalibration", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "fieldname": "maintenance_status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Maintenance Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Planned\nOverdue\nCancelled", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_2", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Today", 
+   "fieldname": "start_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Start Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "periodicity", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Periodicity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nDaily\nWeekly\nMonthly\nQuarterly\nYearly\n2 Yearly", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "end_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "End Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "certificate_required", 
+   "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": "Certificate Required", 
+   "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": 1, 
+   "set_only_once": 1, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_9", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assign_to", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Assign To", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "User", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_10", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assign_to_name", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Assign to Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "assign_to.full_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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_10", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "next_due_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Next Due Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_14", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "last_completion_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Last Completion Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_7", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-28 12:22:34.151430", 
+ "modified_by": "Administrator", 
+ "module": "Assets", 
+ "name": "Asset Maintenance Task", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.py b/erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.py
new file mode 100644
index 0000000..2a5666d
--- /dev/null
+++ b/erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class AssetMaintenanceTask(Document):
+	pass
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/assets/doctype/asset_maintenance_team/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/assets/doctype/asset_maintenance_team/__init__.py
diff --git a/erpnext/assets/doctype/asset_maintenance_team/asset_maintenance_team.js b/erpnext/assets/doctype/asset_maintenance_team/asset_maintenance_team.js
new file mode 100644
index 0000000..c94e3db
--- /dev/null
+++ b/erpnext/assets/doctype/asset_maintenance_team/asset_maintenance_team.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Asset Maintenance Team', {
+	refresh: function() {
+
+	}
+});
diff --git a/erpnext/assets/doctype/asset_maintenance_team/asset_maintenance_team.json b/erpnext/assets/doctype/asset_maintenance_team/asset_maintenance_team.json
new file mode 100644
index 0000000..3405a7d
--- /dev/null
+++ b/erpnext/assets/doctype/asset_maintenance_team/asset_maintenance_team.json
@@ -0,0 +1,275 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:maintenance_team_name", 
+ "beta": 0, 
+ "creation": "2017-10-20 11:43:47.712616", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "maintenance_team_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Maintenance Team Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "maintenance_manager", 
+   "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": "Maintenance Manager", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "User", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "maintenance_manager_name", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Maintenance Manager Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "maintenance_manager.full_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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_2", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "maintenance_team_members", 
+   "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": "Maintenance Team Members", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Maintenance Team Member", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-01 15:13:00.374360", 
+ "modified_by": "Administrator", 
+ "module": "Assets", 
+ "name": "Asset Maintenance Team", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Manufacturing User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_maintenance_team/asset_maintenance_team.py b/erpnext/assets/doctype/asset_maintenance_team/asset_maintenance_team.py
new file mode 100644
index 0000000..f741a8f
--- /dev/null
+++ b/erpnext/assets/doctype/asset_maintenance_team/asset_maintenance_team.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class AssetMaintenanceTeam(Document):
+	pass
diff --git a/erpnext/assets/doctype/asset_maintenance_team/test_asset_maintenance_team.js b/erpnext/assets/doctype/asset_maintenance_team/test_asset_maintenance_team.js
new file mode 100644
index 0000000..41bf696
--- /dev/null
+++ b/erpnext/assets/doctype/asset_maintenance_team/test_asset_maintenance_team.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Asset Maintenance Team", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Asset Maintenance Team
+		() => frappe.tests.make('Asset Maintenance Team', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/assets/doctype/asset_maintenance_team/test_asset_maintenance_team.py b/erpnext/assets/doctype/asset_maintenance_team/test_asset_maintenance_team.py
new file mode 100644
index 0000000..a0c0b14
--- /dev/null
+++ b/erpnext/assets/doctype/asset_maintenance_team/test_asset_maintenance_team.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import unittest
+
+class TestAssetMaintenanceTeam(unittest.TestCase):
+	pass
diff --git a/erpnext/accounts/doctype/asset_movement/__init__.py b/erpnext/assets/doctype/asset_movement/__init__.py
similarity index 100%
rename from erpnext/accounts/doctype/asset_movement/__init__.py
rename to erpnext/assets/doctype/asset_movement/__init__.py
diff --git a/erpnext/accounts/doctype/asset_movement/asset_movement.js b/erpnext/assets/doctype/asset_movement/asset_movement.js
similarity index 100%
rename from erpnext/accounts/doctype/asset_movement/asset_movement.js
rename to erpnext/assets/doctype/asset_movement/asset_movement.js
diff --git a/erpnext/assets/doctype/asset_movement/asset_movement.json b/erpnext/assets/doctype/asset_movement/asset_movement.json
new file mode 100644
index 0000000..0c05552
--- /dev/null
+++ b/erpnext/assets/doctype/asset_movement/asset_movement.json
@@ -0,0 +1,315 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "AM-.#####", 
+ "beta": 0, 
+ "creation": "2016-04-25 18:00:23.559973", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 0, 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "asset", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Asset", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Asset", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "transaction_date", 
+   "fieldtype": "Datetime", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Transaction Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 1, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "source_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Source Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "target_warehouse", 
+   "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": "Target Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Asset Movement", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-10-19 16:08:17.389257", 
+ "modified_by": "Administrator", 
+ "module": "Assets", 
+ "name": "Asset Movement", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Stock Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset_movement/asset_movement.py b/erpnext/assets/doctype/asset_movement/asset_movement.py
similarity index 100%
rename from erpnext/accounts/doctype/asset_movement/asset_movement.py
rename to erpnext/assets/doctype/asset_movement/asset_movement.py
diff --git a/erpnext/assets/doctype/asset_movement/test_asset_movement.js b/erpnext/assets/doctype/asset_movement/test_asset_movement.js
new file mode 100644
index 0000000..b951576
--- /dev/null
+++ b/erpnext/assets/doctype/asset_movement/test_asset_movement.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Asset Movement", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Asset Movement
+		() => frappe.tests.make('Asset Movement', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/assets/doctype/asset_movement/test_asset_movement.py b/erpnext/assets/doctype/asset_movement/test_asset_movement.py
new file mode 100644
index 0000000..bf3e37b
--- /dev/null
+++ b/erpnext/assets/doctype/asset_movement/test_asset_movement.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+from frappe.utils import now
+import unittest
+from erpnext.assets.doctype.asset.test_asset import create_asset
+
+
+class TestAssetMovement(unittest.TestCase):
+	def test_movement(self):
+		asset = create_asset()
+		
+		if asset.docstatus == 0:
+			asset.submit()
+		
+		movement1 = create_asset_movement(asset, target_warehouse="_Test Warehouse 1 - _TC")
+		self.assertEqual(frappe.db.get_value("Asset", asset.name, "warehouse"), "_Test Warehouse 1 - _TC")
+		
+		movement2 = create_asset_movement(asset, target_warehouse="_Test Warehouse 2 - _TC")
+		self.assertEqual(frappe.db.get_value("Asset", asset.name, "warehouse"), "_Test Warehouse 2 - _TC")
+		
+		movement1.cancel()
+		self.assertEqual(frappe.db.get_value("Asset", asset.name, "warehouse"), "_Test Warehouse 2 - _TC")
+		
+		movement2.cancel()
+		self.assertEqual(frappe.db.get_value("Asset", asset.name, "warehouse"), "_Test Warehouse - _TC")
+		
+		asset.load_from_db()
+		asset.cancel()
+		frappe.delete_doc("Asset", asset.name)
+		
+		
+def create_asset_movement(asset, target_warehouse, transaction_date=None):
+	if not transaction_date:
+		transaction_date = now()
+		
+	movement = frappe.new_doc("Asset Movement")
+	movement.update({
+		"asset": asset.name,
+		"transaction_date": transaction_date,
+		"target_warehouse": target_warehouse,
+		"company": asset.company
+	})
+	
+	movement.insert()
+	movement.submit()
+	
+	return movement
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/assets/doctype/asset_repair/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/assets/doctype/asset_repair/__init__.py
diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.js b/erpnext/assets/doctype/asset_repair/asset_repair.js
new file mode 100644
index 0000000..4ba2b44
--- /dev/null
+++ b/erpnext/assets/doctype/asset_repair/asset_repair.js
@@ -0,0 +1,21 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Asset Repair', {
+	repair_status: (frm) => {
+		if (frm.doc.completion_date && frm.doc.repair_status == "Completed") {
+			frappe.call ({
+				method: "erpnext.assets.doctype.asset_repair.asset_repair.get_downtime",
+				args: {
+					"failure_date":frm.doc.failure_date,
+					"completion_date":frm.doc.completion_date
+				},
+				callback: function(r) {
+					if(r.message) {
+						frm.set_value("downtime", r.message + " Hrs");
+					}
+				}
+			});
+		}
+	}
+});
diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.json b/erpnext/assets/doctype/asset_repair/asset_repair.json
new file mode 100644
index 0000000..edc17bd
--- /dev/null
+++ b/erpnext/assets/doctype/asset_repair/asset_repair.json
@@ -0,0 +1,718 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "naming_series:", 
+ "beta": 0, 
+ "creation": "2017-10-23 11:38:54.004355", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 1, 
+   "fieldname": "asset_name", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Asset Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Asset", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "ARLOG-", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item_code", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "asset_name.item_code", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item_name", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "asset_name.item_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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 1, 
+   "fieldname": "failure_date", 
+   "fieldtype": "Datetime", 
+   "hidden": 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": "Failure Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assign_to", 
+   "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": "Assign To", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "User", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assign_to_name", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Assign To Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "assign_to.full_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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_6", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "completion_date", 
+   "fieldtype": "Datetime", 
+   "hidden": 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": "Completion Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Pending", 
+   "fieldname": "repair_status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Repair Status", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Pending\nCompleted\nCancelled", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": ""
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_9", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Long Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Error Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_9", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "actions_performed", 
+   "fieldtype": "Long Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Actions performed", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_17", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "downtime", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Downtime", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_19", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "repair_cost", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Repair Cost", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Asset Repair", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-29 00:49:11.172141", 
+ "modified_by": "Administrator", 
+ "module": "Assets", 
+ "name": "Asset Repair", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Manufacturing Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Quality Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "", 
+ "track_changes": 1, 
+ "track_seen": 1
+}
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.py b/erpnext/assets/doctype/asset_repair/asset_repair.py
new file mode 100644
index 0000000..049b931
--- /dev/null
+++ b/erpnext/assets/doctype/asset_repair/asset_repair.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.utils import time_diff_in_hours
+from frappe.model.document import Document
+
+class AssetRepair(Document):
+	def validate(self):
+		if self.repair_status == "Completed" and not self.completion_date:
+			frappe.throw(_("Please select Completion Date for Completed Repair"))
+
+
+@frappe.whitelist()
+def get_downtime(failure_date, completion_date):
+	downtime = time_diff_in_hours(completion_date, failure_date)
+	return round(downtime, 2)
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_repair/asset_repair_list.js b/erpnext/assets/doctype/asset_repair/asset_repair_list.js
new file mode 100644
index 0000000..f36fd2f
--- /dev/null
+++ b/erpnext/assets/doctype/asset_repair/asset_repair_list.js
@@ -0,0 +1,13 @@
+frappe.listview_settings['Asset Repair'] = {
+	add_fields: ["repair_status"],
+	get_indicator: function(doc) {
+		if(doc.repair_status=="Pending") {
+			return [__("Pending"), "orange"];
+		} else if(doc.repair_status=="Completed") {
+			return [__("Completed"), "green"];
+		} else if(doc.repair_status=="Cancelled") {
+			return [__("Cancelled"), "red"];
+		}
+	}
+};
+
diff --git a/erpnext/assets/doctype/asset_repair/test_asset_repair.js b/erpnext/assets/doctype/asset_repair/test_asset_repair.js
new file mode 100644
index 0000000..7424ffe
--- /dev/null
+++ b/erpnext/assets/doctype/asset_repair/test_asset_repair.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Asset Repair", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Asset Repair
+		() => frappe.tests.make('Asset Repair', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/assets/doctype/asset_repair/test_asset_repair.py b/erpnext/assets/doctype/asset_repair/test_asset_repair.py
new file mode 100644
index 0000000..3d325a9
--- /dev/null
+++ b/erpnext/assets/doctype/asset_repair/test_asset_repair.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import unittest
+
+class TestAssetRepair(unittest.TestCase):
+	pass
diff --git a/erpnext/accounts/doctype/depreciation_schedule/__init__.py b/erpnext/assets/doctype/depreciation_schedule/__init__.py
similarity index 100%
rename from erpnext/accounts/doctype/depreciation_schedule/__init__.py
rename to erpnext/assets/doctype/depreciation_schedule/__init__.py
diff --git a/erpnext/assets/doctype/depreciation_schedule/depreciation_schedule.json b/erpnext/assets/doctype/depreciation_schedule/depreciation_schedule.json
new file mode 100644
index 0000000..3303472
--- /dev/null
+++ b/erpnext/assets/doctype/depreciation_schedule/depreciation_schedule.json
@@ -0,0 +1,226 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 1, 
+ "autoname": "", 
+ "beta": 0, 
+ "creation": "2016-03-02 15:11:01.278862", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "schedule_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Schedule Date", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "depreciation_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Depreciation Amount", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "accumulated_depreciation_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Accumulated Depreciation Amount", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.docstatus==1", 
+   "fieldname": "journal_entry", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Journal Entry", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Journal Entry", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:(doc.docstatus==1 && !doc.journal_entry && doc.schedule_date <= get_today())", 
+   "fieldname": "make_depreciation_entry", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Make Depreciation Entry", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-10-19 16:30:13.738170", 
+ "modified_by": "Administrator", 
+ "module": "Assets", 
+ "name": "Depreciation Schedule", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/assets/doctype/depreciation_schedule/depreciation_schedule.py b/erpnext/assets/doctype/depreciation_schedule/depreciation_schedule.py
new file mode 100644
index 0000000..54fba3f
--- /dev/null
+++ b/erpnext/assets/doctype/depreciation_schedule/depreciation_schedule.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class DepreciationSchedule(Document):
+	pass
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/assets/doctype/maintenance_team_member/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/assets/doctype/maintenance_team_member/__init__.py
diff --git a/erpnext/assets/doctype/maintenance_team_member/maintenance_team_member.js b/erpnext/assets/doctype/maintenance_team_member/maintenance_team_member.js
new file mode 100644
index 0000000..2db7125
--- /dev/null
+++ b/erpnext/assets/doctype/maintenance_team_member/maintenance_team_member.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Maintenance Team Member', {
+	refresh: function() {
+
+	}
+});
diff --git a/erpnext/assets/doctype/maintenance_team_member/maintenance_team_member.json b/erpnext/assets/doctype/maintenance_team_member/maintenance_team_member.json
new file mode 100644
index 0000000..195661a
--- /dev/null
+++ b/erpnext/assets/doctype/maintenance_team_member/maintenance_team_member.json
@@ -0,0 +1,136 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:team_member", 
+ "beta": 0, 
+ "creation": "2016-10-26 10:56:04.534717", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "team_member", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Team Member", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "User", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "full_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Full Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "team_member.full_name", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "maintenance_role", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Maintenance Role", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Role", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-10-24 15:51:58.295745", 
+ "modified_by": "Administrator", 
+ "module": "Assets", 
+ "name": "Maintenance Team Member", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/assets/doctype/maintenance_team_member/maintenance_team_member.py b/erpnext/assets/doctype/maintenance_team_member/maintenance_team_member.py
new file mode 100644
index 0000000..3d9e555
--- /dev/null
+++ b/erpnext/assets/doctype/maintenance_team_member/maintenance_team_member.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class MaintenanceTeamMember(Document):
+	pass
diff --git a/erpnext/assets/doctype/maintenance_team_member/test_maintenance_team_member.js b/erpnext/assets/doctype/maintenance_team_member/test_maintenance_team_member.js
new file mode 100644
index 0000000..d942e2a
--- /dev/null
+++ b/erpnext/assets/doctype/maintenance_team_member/test_maintenance_team_member.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Maintenance Team Member", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Maintenance Team Member
+		() => frappe.tests.make('Maintenance Team Member', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/assets/doctype/maintenance_team_member/test_maintenance_team_member.py b/erpnext/assets/doctype/maintenance_team_member/test_maintenance_team_member.py
new file mode 100644
index 0000000..c805e56
--- /dev/null
+++ b/erpnext/assets/doctype/maintenance_team_member/test_maintenance_team_member.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import unittest
+
+class TestMaintenanceTeamMember(unittest.TestCase):
+	pass
diff --git a/erpnext/schools/report/__init__.py b/erpnext/assets/report/__init__.py
similarity index 100%
rename from erpnext/schools/report/__init__.py
rename to erpnext/assets/report/__init__.py
diff --git a/erpnext/schools/doctype/student_attendance/__init__.py b/erpnext/assets/report/asset_maintenance/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/student_attendance/__init__.py
copy to erpnext/assets/report/asset_maintenance/__init__.py
diff --git a/erpnext/assets/report/asset_maintenance/asset_maintenance.json b/erpnext/assets/report/asset_maintenance/asset_maintenance.json
new file mode 100644
index 0000000..100c8d8
--- /dev/null
+++ b/erpnext/assets/report/asset_maintenance/asset_maintenance.json
@@ -0,0 +1,24 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2017-10-24 13:12:39.946874", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "json": "{\"add_total_row\": 0, \"sort_by\": \"Asset Maintenance.modified\", \"add_totals_row\": 0, \"sort_order\": \"desc\", \"sort_by_next\": null, \"filters\": [], \"sort_order_next\": \"desc\", \"columns\": [[\"name\", \"Asset Maintenance\"], [\"asset_name\", \"Asset Maintenance\"], [\"item_code\", \"Asset Maintenance\"], [\"maintenance_type\", \"Asset Maintenance Task\"], [\"maintenance_task\", \"Asset Maintenance Task\"], [\"description\", \"Asset Maintenance Task\"], [\"assign_to_name\", \"Asset Maintenance Task\"], [\"maintenance_status\", \"Asset Maintenance Task\"], [\"next_due_date\", \"Asset Maintenance Task\"], [\"last_completion_date\", \"Asset Maintenance Task\"]]}", 
+ "modified": "2017-10-27 22:49:56.286781", 
+ "modified_by": "Administrator", 
+ "module": "Assets", 
+ "name": "Asset Maintenance", 
+ "owner": "Administrator", 
+ "ref_doctype": "Asset Maintenance", 
+ "report_name": "Asset Maintenance", 
+ "report_type": "Report Builder", 
+ "roles": [
+  {
+   "role": "System Manager"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/buying/doctype/buying_settings/buying_settings.json b/erpnext/buying/doctype/buying_settings/buying_settings.json
index ac97255..25e9c15 100644
--- a/erpnext/buying/doctype/buying_settings/buying_settings.json
+++ b/erpnext/buying/doctype/buying_settings/buying_settings.json
@@ -182,6 +182,38 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "0",
+   "description": "If enabled, last purchase details of items will not be fetched from previous purchase order or purchase receipt",
+   "fieldname": "disable_fetch_last_purchase_rate",
+   "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": "Disable Fetching Last Purchase Details in Purchase Order",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
   }
  ], 
  "hide_heading": 0, 
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index 534af8b..fffc5ab 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -218,6 +218,7 @@
    "label": "Supplier Name", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "supplier.supplier_name", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -291,40 +292,40 @@
    "search_index": 1, 
    "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "",
-   "fieldname": "schedule_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": "Reqd By Date",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "fieldname": "schedule_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": "Reqd By Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1456,6 +1457,36 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "total_net_weight", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Net Weight", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1520,6 +1551,95 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "column_break_50", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "shipping_rule", 
+   "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": "Shipping Rule", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Shipping Rule", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_52", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -2354,6 +2474,98 @@
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "payment_schedule_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payment Terms", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "payment_terms_template", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payment Terms Template", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Payment Terms Template", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "payment_schedule", 
+   "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": "Payment Schedule", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Payment Schedule", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "terms", 
    "columns": 0, 
@@ -2845,39 +3057,6 @@
    "precision": "", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "supplied_items", 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "raw_material_details", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Raw Materials Supplied", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "fa fa-truck", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
@@ -3082,7 +3261,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-10-24 12:52:11.272306", 
+ "modified": "2017-11-29 14:06:33.636401", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order", 
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py
index 8142b04..fac70aa 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 import json
-from frappe.utils import cstr, flt
+from frappe.utils import cstr, flt, cint
 from frappe import msgprint, _
 from frappe.model.mapper import get_mapped_doc
 from erpnext.controllers.buying_controller import BuyingController
@@ -29,7 +29,7 @@
 			'target_field': 'ordered_qty',
 			'target_parent_dt': 'Material Request',
 			'target_parent_field': 'per_ordered',
-			'target_ref_field': 'qty',
+			'target_ref_field': 'stock_qty',
 			'source_field': 'stock_qty',
 			'percent_join_field': 'material_request',
 			'overflow_type': 'order'
@@ -113,25 +113,26 @@
 	def get_last_purchase_rate(self):
 		"""get last purchase rates for all items"""
 
-		conversion_rate = flt(self.get('conversion_rate')) or 1.0
+		if not cint(frappe.db.get_single_value("Buying Settings", "disable_fetch_last_purchase_rate")):
+			conversion_rate = flt(self.get('conversion_rate')) or 1.0
 
-		for d in self.get("items"):
-			if d.item_code:
-				last_purchase_details = get_last_purchase_details(d.item_code, self.name)
+			for d in self.get("items"):
+				if d.item_code:
+					last_purchase_details = get_last_purchase_details(d.item_code, self.name)
 
-				if last_purchase_details:
-					d.base_price_list_rate = (last_purchase_details['base_price_list_rate'] *
-						(flt(d.conversion_factor) or 1.0))
-					d.discount_percentage = last_purchase_details['discount_percentage']
-					d.base_rate = last_purchase_details['base_rate'] * (flt(d.conversion_factor) or 1.0)
-					d.price_list_rate = d.base_price_list_rate / conversion_rate
-					d.last_purchase_rate = d.base_rate / conversion_rate
-				else:
+					if last_purchase_details:
+						d.base_price_list_rate = (last_purchase_details['base_price_list_rate'] *
+							(flt(d.conversion_factor) or 1.0))
+						d.discount_percentage = last_purchase_details['discount_percentage']
+						d.base_rate = last_purchase_details['base_rate'] * (flt(d.conversion_factor) or 1.0)
+						d.price_list_rate = d.base_price_list_rate / conversion_rate
+						d.last_purchase_rate = d.base_rate / conversion_rate
+					else:
 
-					item_last_purchase_rate = frappe.db.get_value("Item", d.item_code, "last_purchase_rate")
-					if item_last_purchase_rate:
-						d.base_price_list_rate = d.base_rate = d.price_list_rate \
-							= d.last_purchase_rate = item_last_purchase_rate
+						item_last_purchase_rate = frappe.db.get_value("Item", d.item_code, "last_purchase_rate")
+						if item_last_purchase_rate:
+							d.base_price_list_rate = d.base_rate = d.price_list_rate \
+								= d.last_purchase_rate = item_last_purchase_rate
 
 	# Check for Closed status
 	def check_for_closed_status(self):
diff --git a/erpnext/buying/doctype/purchase_order/test_purchase_order.py b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
index 2af5582..d31b230 100644
--- a/erpnext/buying/doctype/purchase_order/test_purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
@@ -8,6 +8,7 @@
 from frappe.utils import flt, add_days, nowdate
 from erpnext.buying.doctype.purchase_order.purchase_order import make_purchase_receipt, make_purchase_invoice
 
+
 class TestPurchaseOrder(unittest.TestCase):
 	def test_make_purchase_receipt(self):
 		po = create_purchase_order(do_not_submit=True)
@@ -83,6 +84,33 @@
 		self.assertEquals(pi.doctype, "Purchase Invoice")
 		self.assertEquals(len(pi.get("items", [])), 1)
 
+	def test_make_purchase_invoice_with_terms(self):
+		po = create_purchase_order(do_not_save=True)
+
+		self.assertRaises(frappe.ValidationError, make_purchase_invoice, po.name)
+
+		po.update(
+			{"payment_terms_template": "_Test Payment Term Template"}
+		)
+
+		po.save()
+		po.submit()
+
+		self.assertEqual(po.payment_schedule[0].payment_amount, 2500.0)
+		self.assertEqual(po.payment_schedule[0].due_date, po.transaction_date)
+		self.assertEqual(po.payment_schedule[1].payment_amount, 2500.0)
+		self.assertEqual(po.payment_schedule[1].due_date, add_days(po.transaction_date, 30))
+		pi = make_purchase_invoice(po.name)
+		pi.save()
+
+		self.assertEquals(pi.doctype, "Purchase Invoice")
+		self.assertEquals(len(pi.get("items", [])), 1)
+
+		self.assertEqual(pi.payment_schedule[0].payment_amount, 2500.0)
+		self.assertEqual(pi.payment_schedule[0].due_date, po.transaction_date)
+		self.assertEqual(pi.payment_schedule[1].payment_amount, 2500.0)
+		self.assertEqual(pi.payment_schedule[1].due_date, add_days(po.transaction_date, 30))
+
 	def test_subcontracting(self):
 		po = create_purchase_order(item_code="_Test FG Item", is_subcontracted="Yes")
 		self.assertEquals(len(po.get("supplied_items")), 2)
@@ -125,6 +153,35 @@
 			"group_same_items": 1
 			}).insert(ignore_permissions=True)
 
+	def test_make_po_without_terms(self):
+		po = create_purchase_order(do_not_save=1)
+
+		self.assertFalse(po.get('payment_schedule'))
+
+		po.insert()
+
+		self.assertTrue(po.get('payment_schedule'))
+
+	def test_terms_does_not_copy(self):
+		po = create_purchase_order()
+
+		self.assertTrue(po.get('payment_schedule'))
+
+		pi = make_purchase_invoice(po.name)
+
+		self.assertFalse(pi.get('payment_schedule'))
+
+	def test_terms_copied(self):
+		po = create_purchase_order(do_not_save=1)
+		po.payment_terms_template = '_Test Payment Term Template'
+		po.insert()
+		po.submit()
+		self.assertTrue(po.get('payment_schedule'))
+
+		pi = make_purchase_invoice(po.name)
+		pi.insert()
+		self.assertTrue(pi.get('payment_schedule'))
+
 		
 def get_same_items():
 	return [
diff --git a/erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_last_purchase_rate.js b/erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_last_purchase_rate.js
index d19f017..8ccf1b6 100644
--- a/erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_last_purchase_rate.js
+++ b/erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_last_purchase_rate.js
@@ -1,7 +1,7 @@
 QUnit.module('Buying');
 
 QUnit.test("test: purchase order with last purchase rate", function(assert) {
-	assert.expect(5);
+	assert.expect(9);
 	let done = assert.async();
 
 	frappe.run_serially([
@@ -77,9 +77,11 @@
 		// Get the last purchase rate of items
 		() => {
 			assert.ok(cur_frm.doc.items[0].last_purchase_rate == 800, "Last purchase rate of item 1 correct");
+			assert.ok(cur_frm.doc.items[1].last_purchase_rate != 0);
 		},
 		() => {
 			assert.ok(cur_frm.doc.items[1].last_purchase_rate == 400, "Last purchase rate of item 2 correct");
+			assert.ok(cur_frm.doc.items[1].last_purchase_rate != 0);
 		},
 
 		() => frappe.tests.click_button('Submit'),
@@ -94,6 +96,61 @@
 			assert.ok(cur_frm.doc.status == 'To Receive and Bill', "Submitted successfully");
 		},
 
+		// enable allow_last_purchase_rate
+		() => {
+			return frappe.tests.make('Buying Settings', [
+				// values to be set
+				{"disable_fetch_last_purchase_rate": 1}
+			]);
+		},
+
+		() => {
+			return frappe.tests.make('Purchase Order', [
+				{supplier: 'Test Supplier'},
+				{is_subcontracted: 'No'},
+				{currency: 'INR'},
+				{items: [
+					[
+						{"item_code": 'Test Product 4'},
+						{"schedule_date": frappe.datetime.add_days(frappe.datetime.now_date(), 1)},
+						{"expected_delivery_date": frappe.datetime.add_days(frappe.datetime.now_date(), 5)},
+						{"qty": 1},
+						{"rate": 800},
+						{"warehouse": 'Stores - '+frappe.get_abbr(frappe.defaults.get_default("Company"))}
+					],
+					[
+						{"item_code": 'Test Product 1'},
+						{"schedule_date": frappe.datetime.add_days(frappe.datetime.now_date(), 1)},
+						{"expected_delivery_date": frappe.datetime.add_days(frappe.datetime.now_date(), 5)},
+						{"qty": 1},
+						{"rate": 400},
+						{"warehouse": 'Stores - '+frappe.get_abbr(frappe.defaults.get_default("Company"))}
+					]
+				]}
+			]);
+		},
+
+		() => {
+			// Get item details
+			assert.ok(cur_frm.doc.items[0].last_purchase_rate == 0);
+			assert.ok(cur_frm.doc.items[1].last_purchase_rate == 0);
+		},
+
+		() => frappe.timeout(1),
+
+		() => frappe.tests.click_button('Submit'),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(3),
+
+		() => frappe.tests.click_button('Close'),
+		() => frappe.timeout(1),
+
+		// enable allow_last_purchase_rate
+		() => frappe.tests.make('Buying Settings', [
+			// values to be set
+			{"disable_fetch_last_purchase_rate": 0}
+		]),
+
 		() => done()
 	]);
 });
\ No newline at end of file
diff --git a/erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_shipping_rule.js b/erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_shipping_rule.js
new file mode 100644
index 0000000..96775eb
--- /dev/null
+++ b/erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_shipping_rule.js
@@ -0,0 +1,43 @@
+QUnit.module('Buying');
+
+QUnit.test("test: purchase order with shipping rule", function(assert) {
+	assert.expect(3);
+	let done = assert.async();
+
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make('Purchase Order', [
+				{supplier: 'Test Supplier'},
+				{is_subcontracted: 'No'},
+				{buying_price_list: 'Test-Buying-USD'},
+				{currency: 'USD'},
+				{"schedule_date": frappe.datetime.add_days(frappe.datetime.now_date(), 1)},
+				{items: [
+					[
+						{"item_code": 'Test Product 4'},
+						{"qty": 5},
+						{"uom": 'Unit'},
+						{"rate": 500 },
+						{"schedule_date": frappe.datetime.add_days(frappe.datetime.now_date(), 1)},
+						{"expected_delivery_date": frappe.datetime.add_days(frappe.datetime.now_date(), 5)},
+						{"warehouse": 'Stores - '+frappe.get_abbr(frappe.defaults.get_default("Company"))}
+					]
+				]},
+
+				{shipping_rule:'Two Day Shipping'}
+			]);
+		},
+
+		() => {
+			// Check grand total
+			assert.ok(cur_frm.doc.total_taxes_and_charges == 200, "Taxes and charges correct");
+			assert.ok(cur_frm.doc.grand_total == 2700, "Grand total correct");
+		},
+
+		() => frappe.timeout(0.3),
+		() => frappe.tests.click_button('Submit'),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(0.3),
+		() => done()
+	]);
+});
\ No newline at end of file
diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
index ca1a0a7..51943a0 100755
--- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
+++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@@ -462,7 +462,8 @@
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
-   "print_hide": 0, 
+   "precision": "", 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "remember_last_selected_value": 0, 
@@ -527,6 +528,7 @@
    "oldfieldname": "conversion_factor", 
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
@@ -1119,6 +1121,156 @@
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "item_weight_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Weight Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "weight_per_unit", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Weight Per Unit", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_weight", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Weight", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_40", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "weight_uom", 
+   "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": "Weight UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "warehouse_and_reference", 
@@ -1745,7 +1897,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-10-05 19:47:12.433095", 
+ "modified": "2017-11-30 14:17:15.817754", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order Item", 
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
index 3801141..c3d7a2c 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
@@ -254,7 +254,7 @@
 						}
 					})
 				}, __("Get items from"));
-			// Get items from Opportunity 
+			// Get items from Opportunity
             this.frm.add_custom_button(__('Opportunity'),
 				function() {
 					erpnext.utils.map_current_doc({
@@ -264,11 +264,8 @@
 						setters: {
 							company: me.frm.doc.company
 						},
-						get_query_filters: {
-							enquiry_type: "Sales"
-						}
 					})
-				}, __("Get items from"));  
+				}, __("Get items from"));
 			// Get items from open Material Requests based on supplier
 			this.frm.add_custom_button(__('Possible Supplier'), function() {
 				// Create a dialog window for the user to pick their supplier
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
index 5becb82..97c4438 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
@@ -138,7 +138,7 @@
 			'user_fullname': full_name
 		}
 
-		subject = _("Request for Quotation: {0}".format(self.name))
+		subject = _("Request for Quotation")
 		template = "templates/emails/request_for_quotation.html"
 		sender = frappe.session.user not in STANDARD_USERS and frappe.session.user or None
 		message = frappe.get_template(template).render(args)
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index 711e05d..e6cea53 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -597,8 +597,9 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "credit_days_based_on", 
-   "fieldtype": "Select", 
+   "depends_on": "", 
+   "fieldname": "payment_terms", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -606,10 +607,10 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Credit Days Based On", 
+   "label": "Default Payment Terms Template", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "\nFixed Days\nLast Day of the Next Month", 
+   "options": "Payment Terms Template", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -628,36 +629,6 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "depends_on": "eval:doc.credit_days_based_on == 'Fixed Days'", 
-   "fieldname": "credit_days", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Credit Days", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "address_contacts", 
    "fieldtype": "Section Break", 
@@ -970,8 +941,8 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-07-06 16:40:46.935608", 
- "modified_by": "Administrator", 
+ "modified": "2017-08-31 16:10:44.049915", 
+ "modified_by": "tundebabzy@gmail.com", 
  "module": "Buying", 
  "name": "Supplier", 
  "name_case": "Title Case", 
diff --git a/erpnext/buying/doctype/supplier/test_records.json b/erpnext/buying/doctype/supplier/test_records.json
index d2b3995..7479f55 100644
--- a/erpnext/buying/doctype/supplier/test_records.json
+++ b/erpnext/buying/doctype/supplier/test_records.json
@@ -1,6 +1,18 @@
 [
  {
   "doctype": "Supplier",
+  "supplier_name": "_Test Supplier With Template 1",
+  "supplier_type": "_Test Supplier Type",
+  "payment_terms": "_Test Payment Term Template 3"
+ },
+ {
+  "doctype": "Supplier",
+  "supplier_name": "_Test Supplier P",
+  "supplier_type": "_Test Supplier Type",
+  "credit_days_based_on": "Fixed Days"
+ },
+ {
+  "doctype": "Supplier",
   "supplier_name": "_Test Supplier with Country",
   "supplier_type": "_Test Supplier Type",
   "country": "Greece"
@@ -17,6 +29,11 @@
  },
  {
   "doctype": "Supplier",
+  "supplier_name": "_Test Supplier 2",
+  "supplier_type": "_Test Supplier Type"
+ },
+ {
+  "doctype": "Supplier",
   "supplier_name": "_Test Supplier USD",
   "supplier_type": "_Test Supplier Type",
   "accounts": [{
diff --git a/erpnext/buying/doctype/supplier/test_supplier.js b/erpnext/buying/doctype/supplier/test_supplier.js
index 05ea044..51e3c09 100644
--- a/erpnext/buying/doctype/supplier/test_supplier.js
+++ b/erpnext/buying/doctype/supplier/test_supplier.js
@@ -10,7 +10,6 @@
 				{supplier_type: 'Hardware'},
 				{country: 'India'},
 				{default_currency: 'INR'},
-				{credit_days_based_on: 'Fixed Days'},
 				{accounts: [
 					[
 						{'company': "For Testing"},
diff --git a/erpnext/buying/doctype/supplier/test_supplier.py b/erpnext/buying/doctype/supplier/test_supplier.py
index 1d089e7..16dda5c 100644
--- a/erpnext/buying/doctype/supplier/test_supplier.py
+++ b/erpnext/buying/doctype/supplier/test_supplier.py
@@ -5,56 +5,62 @@
 
 import frappe, unittest
 from erpnext.accounts.party import get_due_date
-from erpnext.exceptions import PartyFrozen, PartyDisabled
+from erpnext.exceptions import PartyDisabled
 from frappe.test_runner import make_test_records
 
+test_dependencies = ['Payment Term', 'Payment Terms Template']
 test_records = frappe.get_test_records('Supplier')
 
+
 class TestSupplier(unittest.TestCase):
-    def test_supplier_due_date_against_supplier_credit_limit(self):
-        # Set Credit Limit based on Fixed days
-        frappe.db.set_value("Supplier", "_Test Supplier", "credit_days_based_on", "Fixed Days")
-        frappe.db.set_value("Supplier", "_Test Supplier", "credit_days", 10)
+    def test_supplier_default_payment_terms(self):
+        # Payment Term based on Days after invoice date
+        frappe.db.set_value(
+            "Supplier", "_Test Supplier With Template 1", "payment_terms", "_Test Payment Term Template 3")
 
-        due_date = get_due_date("2016-01-22", "Supplier", "_Test Supplier", "_Test Company")
-        self.assertEqual(due_date, "2016-02-01")
+        due_date = get_due_date("2016-01-22", "Supplier", "_Test Supplier With Template 1")
+        self.assertEqual(due_date, "2016-02-21")
 
-        # Set Credit Limit based on Last day next month
-        frappe.db.set_value("Supplier", "_Test Supplier", "credit_days", 0)
-        frappe.db.set_value("Supplier", "_Test Supplier", "credit_days_based_on",
-                            "Last Day of the Next Month")
+        due_date = get_due_date("2017-01-22", "Supplier", "_Test Supplier With Template 1")
+        self.assertEqual(due_date, "2017-02-21")
 
-        # Leap year
-        due_date = get_due_date("2016-01-22", "Supplier", "_Test Supplier", "_Test Company")
+        # Payment Term based on last day of month
+        frappe.db.set_value(
+            "Supplier", "_Test Supplier With Template 1", "payment_terms", "_Test Payment Term Template 1")
+
+        due_date = get_due_date("2016-01-22", "Supplier", "_Test Supplier With Template 1")
         self.assertEqual(due_date, "2016-02-29")
-        # Non Leap year
-        due_date = get_due_date("2017-01-22", "Supplier", "_Test Supplier", "_Test Company")
+
+        due_date = get_due_date("2017-01-22", "Supplier", "_Test Supplier With Template 1")
         self.assertEqual(due_date, "2017-02-28")
 
-        frappe.db.set_value("Supplier", "_Test Supplier", "credit_days_based_on", "")
+        frappe.db.set_value("Supplier", "_Test Supplier With Template 1", "payment_terms", "")
 
         # Set credit limit for the supplier type instead of supplier and evaluate the due date
-        # based on Fixed days
-        frappe.db.set_value("Supplier Type", "_Test Supplier Type", "credit_days_based_on",
-                            "Fixed Days")
-        frappe.db.set_value("Supplier Type", "_Test Supplier Type", "credit_days", 10)
+        frappe.db.set_value("Supplier Type", "_Test Supplier Type", "payment_terms", "_Test Payment Term Template 3")
 
-        due_date = get_due_date("2016-01-22", "Supplier", "_Test Supplier", "_Test Company")
-        self.assertEqual(due_date, "2016-02-01")
+        due_date = get_due_date("2016-01-22", "Supplier", "_Test Supplier With Template 1")
+        self.assertEqual(due_date, "2016-02-21")
 
-        # Set credit limit for the supplier type instead of supplier and evaluate the due date
-        # based on Last day of next month
-        frappe.db.set_value("Supplier", "_Test Supplier Type", "credit_days", 0)
-        frappe.db.set_value("Supplier Type", "_Test Supplier Type", "credit_days_based_on",
-                            "Last Day of the Next Month")
+        # Payment terms for Supplier Type instead of supplier and evaluate the due date
+        frappe.db.set_value("Supplier Type", "_Test Supplier Type", "payment_terms", "_Test Payment Term Template 1")
 
         # Leap year
-        due_date = get_due_date("2016-01-22", "Supplier", "_Test Supplier", "_Test Company")
+        due_date = get_due_date("2016-01-22", "Supplier", "_Test Supplier With Template 1")
         self.assertEqual(due_date, "2016-02-29")
-        # Non Leap year
-        due_date = get_due_date("2017-01-22", "Supplier", "_Test Supplier", "_Test Company")
+        # # Non Leap year
+        due_date = get_due_date("2017-01-22", "Supplier", "_Test Supplier With Template 1")
         self.assertEqual(due_date, "2017-02-28")
 
+        # Supplier with no default Payment Terms Template
+        frappe.db.set_value("Supplier Type", "_Test Supplier Type", "payment_terms", "")
+        frappe.db.set_value("Supplier", "_Test Supplier", "payment_terms", "")
+
+        due_date = get_due_date("2016-01-22", "Supplier", "_Test Supplier")
+        self.assertEqual(due_date, "2016-01-22")
+        # # Non Leap year
+        due_date = get_due_date("2017-01-22", "Supplier", "_Test Supplier")
+        self.assertEqual(due_date, "2017-01-22")
 
     def test_supplier_disabled(self):
         make_test_records("Item")
@@ -71,7 +77,6 @@
 
         po.save()
 
-
     def test_supplier_country(self):
         # Test that country field exists in Supplier DocType
         supplier = frappe.get_doc('Supplier', '_Test Supplier with Country')
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
index d7edc01..b94710f 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -156,6 +156,7 @@
    "label": "Name", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "supplier.supplier_name", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -1030,6 +1031,36 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "total_net_weight", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Net Weight", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1094,6 +1125,95 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "column_break_36", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "shipping_rule", 
+   "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": "Shipping Rule", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Shipping Rule", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_38", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -2370,7 +2490,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-09-19 11:23:25.268924", 
+ "modified": "2017-11-29 14:07:56.698355", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier Quotation", 
diff --git a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
index 62da505..4c6375e 100644
--- a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
+++ b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
@@ -516,11 +516,10 @@
    "label": "UOM", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "uom", 
-   "oldfieldtype": "Link", 
    "options": "UOM", 
    "permlevel": 0, 
-   "print_hide": 0, 
+   "precision": "", 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
@@ -554,7 +553,7 @@
    "precision": "", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -568,6 +567,36 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "stock_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Qty as per Stock UOM", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_price_list_rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -582,6 +611,7 @@
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
@@ -994,6 +1024,156 @@
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "item_weight_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Weight Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "weight_per_unit", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Weight Per Unit", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_weight", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Weight", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_23", 
+   "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": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "weight_uom", 
+   "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": "Weight UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "warehouse_and_reference", 
@@ -1394,36 +1574,6 @@
   }, 
   {
    "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "stock_qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Qty as per Stock UOM", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1464,7 +1614,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-07-10 09:08:52.015387", 
+ "modified": "2017-11-30 14:22:10.542868", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier Quotation Item", 
diff --git a/erpnext/config/accounts.py b/erpnext/config/accounts.py
index 58fb2f0..9a71608 100644
--- a/erpnext/config/accounts.py
+++ b/erpnext/config/accounts.py
@@ -98,14 +98,6 @@
 				{
 					"type": "doctype",
 					"name": "Item",
-				},
-				{
-					"type": "doctype",
-					"name": "Asset",
-				},
-				{
-					"type": "doctype",
-					"name": "Asset Category",
 				}
 			]
 		},
@@ -276,13 +268,13 @@
 				},
 				{
 					"type": "doctype",
-					"name": "Asset Movement",
-					"description": _("Transfer an asset from one warehouse to another")
+					"name": "Cheque Print Template",
+					"description": _("Setup cheque dimensions for printing")
 				},
 				{
 					"type": "doctype",
-					"name": "Cheque Print Template",
-					"description": _("Setup cheque dimensions for printing")
+					"name": "Opening Invoice Creation Tool",
+					"description": _("Make Opening Sales and Purchase Invoices")
 				},
 			]
 		},
@@ -404,18 +396,6 @@
 			"items": [
 				{
 					"type": "report",
-					"name": "Asset Depreciation Ledger",
-					"doctype": "Asset",
-					"is_query_report": True,
-				},
-				{
-					"type": "report",
-					"name": "Asset Depreciations and Balances",
-					"doctype": "Asset",
-					"is_query_report": True,
-				},
-				{
-					"type": "report",
 					"name": "Trial Balance for Party",
 					"doctype": "GL Entry",
 					"is_query_report": True,
diff --git a/erpnext/config/agriculture.py b/erpnext/config/agriculture.py
new file mode 100644
index 0000000..20ee7cf
--- /dev/null
+++ b/erpnext/config/agriculture.py
@@ -0,0 +1,65 @@
+from __future__ import unicode_literals
+from frappe import _
+
+def get_data():
+	return [
+		{
+			"label": _("Crops & Lands"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Crop",
+				},
+				{
+					"type": "doctype",
+					"name": "Crop Cycle",
+				},
+				{
+					"type": "doctype",
+					"name": "Land Unit",
+				}
+			]
+		},
+		{
+			"label": _("Diseases & Fertilizers"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Disease",
+				},
+				{
+					"type": "doctype",
+					"name": "Fertilizer",
+				}
+			]
+		},
+		{
+			"label": _("Analytics"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Plant Analysis",
+				},
+				{
+					"type": "doctype",
+					"name": "Soil Analysis",
+				},
+				{
+					"type": "doctype",
+					"name": "Water Analysis",
+				},
+				{
+					"type": "doctype",
+					"name": "Soil Texture",
+				},
+				{
+					"type": "doctype",
+					"name": "Weather",
+				},
+				{
+					"type": "doctype",
+					"name": "Agriculture Analysis Criteria",
+				}
+			]
+		},
+	]
\ No newline at end of file
diff --git a/erpnext/config/assets.py b/erpnext/config/assets.py
new file mode 100644
index 0000000..1001e94
--- /dev/null
+++ b/erpnext/config/assets.py
@@ -0,0 +1,77 @@
+from __future__ import unicode_literals
+from frappe import _
+
+def get_data():
+	return [
+		{
+			"label": _("Assets"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Asset",
+				},
+				{
+					"type": "doctype",
+					"name": "Asset Category",
+				}
+			]
+		},
+		{
+			"label": _("Maintenance"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Asset Maintenance Team",
+				},
+				{
+					"type": "doctype",
+					"name": "Asset Maintenance",
+				},
+				{
+					"type": "doctype",
+					"name": "Asset Maintenance Tasks",
+				},
+				{
+					"type": "doctype",
+					"name": "Asset Maintenance Log",
+				},
+				{
+					"type": "doctype",
+					"name": "Asset Repair",
+				},
+			]
+		},
+		{
+			"label": _("Tools"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Asset Movement",
+					"description": _("Transfer an asset from one warehouse to another")
+				},
+			]
+		},
+		{
+			"label": _("Reports"),
+			"icon": "fa fa-table",
+			"items": [
+				{
+					"type": "report",
+					"name": "Asset Depreciation Ledger",
+					"doctype": "Asset",
+					"is_query_report": True,
+				},
+				{
+					"type": "report",
+					"name": "Asset Depreciations and Balances",
+					"doctype": "Asset",
+					"is_query_report": True,
+				},
+				{
+					"type": "report",
+					"name": "Asset Maintenance",
+					"doctype": "Asset Maintenance"
+				},
+			]
+		}
+	]
\ No newline at end of file
diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py
index ce6c0c3..36d2b40 100644
--- a/erpnext/config/desktop.py
+++ b/erpnext/config/desktop.py
@@ -164,7 +164,8 @@
 			"color": "#FF888B",
 			"icon": "octicon octicon-tools",
 			"type": "module",
-			"label": _("Maintenance")
+			"label": _("Maintenance"),
+			"hidden": 1
 		},
 		{
 			"module_name": "Student",
@@ -173,7 +174,8 @@
 			"label": _("Student"),
 			"link": "List/Student",
 			"_doctype": "Student",
-			"type": "list"
+			"type": "list",
+			"hidden": 1
 		},
 		{
 			"module_name": "Student Group",
@@ -182,7 +184,8 @@
 			"label": _("Student Group"),
 			"link": "List/Student Group",
 			"_doctype": "Student Group",
-			"type": "list"
+			"type": "list",
+			"hidden": 1
 		},
 		{
 			"module_name": "Course Schedule",
@@ -191,16 +194,18 @@
 			"label": _("Course Schedule"),
 			"link": "Calendar/Course Schedule",
 			"_doctype": "Course Schedule",
-			"type": "list"
+			"type": "list",
+			"hidden": 1
 		},
 		{
-			"module_name": "Student Attendance",
-			"color": "#3aacba",
+			"module_name": "Student Attendance Tool",
+			"color": "#C0392B",
 			"icon": "octicon octicon-checklist",
-			"label": _("Student Attendance"),
-			"link": "List/Student Attendance",
-			"_doctype": "Student Attendance",
-			"type": "list"
+			"label": _("Student Attendance Tool"),
+			"link": "List/Student Attendance Tool",
+			"_doctype": "Student Attendance Tool",
+			"type": "list",
+			"hidden": 1
 		},
 		{
 			"module_name": "Course",
@@ -209,7 +214,8 @@
 			"label": _("Course"),
 			"link": "List/Course",
 			"_doctype": "Course",
-			"type": "list"
+			"type": "list",
+			"hidden": 1
 		},
 		{
 			"module_name": "Program",
@@ -218,7 +224,8 @@
 			"label": _("Program"),
 			"link": "List/Program",
 			"_doctype": "Program",
-			"type": "list"
+			"type": "list",
+			"hidden": 1
 		},
 		{
 			"module_name": "Student Applicant",
@@ -227,7 +234,8 @@
 			"label": _("Student Applicant"),
 			"link": "List/Student Applicant",
 			"_doctype": "Student Applicant",
-			"type": "list"
+			"type": "list",
+			"hidden": 1
 		},
 		{
 			"module_name": "Fees",
@@ -236,7 +244,8 @@
 			"label": _("Fees"),
 			"link": "List/Fees",
 			"_doctype": "Fees",
-			"type": "list"
+			"type": "list",
+			"hidden": 1
 		},
 		{
 			"module_name": "Instructor",
@@ -245,7 +254,8 @@
 			"label": _("Instructor"),
 			"link": "List/Instructor",
 			"_doctype": "Instructor",
-			"type": "list"
+			"type": "list",
+			"hidden": 1
 		},
 		{
 			"module_name": "Room",
@@ -254,14 +264,16 @@
 			"label": _("Room"),
 			"link": "List/Room",
 			"_doctype": "Room",
-			"type": "list"
+			"type": "list",
+			"hidden": 1
 		},
 		{
-			"module_name": "Schools",
-			"color": "#DE2B37",
+			"module_name": "Education",
+			"color": "#428B46",
 			"icon": "octicon octicon-mortar-board",
 			"type": "module",
-			"label": _("Schools")
+			"label": _("Education"),
+			"hidden": 1
 		},
 		{
 			"module_name": "Healthcare",
@@ -269,6 +281,7 @@
 			"icon": "octicon octicon-plus",
 			"type": "module",
 			"label": _("Healthcare"),
+			"hidden": 1
 		},
 		{
 			"module_name": "Hub",
@@ -279,19 +292,198 @@
 			"label": _("Hub")
 		},
 		{
-			"module_name": "Data Import Tool",
-			"color": "#7f8c8d",
-			"icon": "octicon octicon-circuit-board",
-			"type": "page",
-			"link": "data-import-tool",
-			"label": _("Data Import Tool")
+			"module_name": "Data Import",
+			"color": "#FFF168",
+			"reverse": 1,
+			"doctype": "Data Import",
+			"icon": "octicon octicon-cloud-upload",
+			"label": _("Data Import"),
+			"link": "List/Data Import",
+			"type": "list"
 		},
 		{
 			"module_name": "Restaurant",
 			"color": "#EA81E8",
 			"icon": "🍔",
 			"_doctype": "Restaurant",
+			"type": "list",
 			"link": "List/Restaurant",
-			"label": _("Restaurant")
+			"label": _("Restaurant"),
+			"hidden": 1
+		},
+		{
+			"module_name": "Agriculture",
+			"color": "#8BC34A",
+			"icon": "octicon octicon-globe",
+			"type": "module",
+			"label": _("Agriculture"),
+			"hidden": 1
+		},
+		{
+			"module_name": "Crop",
+			"_doctype": "Crop",
+			"label": _("Crop"),
+			"color": "#8BC34A",
+			"icon": "fa fa-tree",
+			"type": "list",
+			"link": "List/Crop",
+			"hidden": 1
+		},
+		{
+			"module_name": "Crop Cycle",
+			"_doctype": "Crop Cycle",
+			"label": _("Crop Cycle"),
+			"color": "#8BC34A",
+			"icon": "fa fa-circle-o-notch",
+			"type": "list",
+			"link": "List/Crop Cycle",
+			"hidden": 1
+		},
+		{
+			"module_name": "Fertilizer",
+			"_doctype": "Fertilizer",
+			"label": _("Fertilizer"),
+			"color": "#8BC34A",
+			"icon": "fa fa-leaf",
+			"type": "list",
+			"link": "List/Fertilizer",
+			"hidden": 1
+		},
+		{
+			"module_name": "Land Unit",
+			"_doctype": "Land Unit",
+			"label": _("Land Unit"),
+			"color": "#8BC34A",
+			"icon": "fa fa-map",
+			"type": "list",
+			"link": "List/Land Unit",
+			"hidden": 1
+		},
+		{
+			"module_name": "Disease",
+			"_doctype": "Disease",
+			"label": _("Disease"),
+			"color": "#8BC34A",
+			"icon": "octicon octicon-bug",
+			"type": "list",
+			"link": "List/Disease",
+			"hidden": 1
+		},
+		{
+			"module_name": "Plant Analysis",
+			"_doctype": "Plant Analysis",
+			"label": _("Plant Analysis"),
+			"color": "#8BC34A",
+			"icon": "fa fa-pagelines",
+			"type": "list",
+			"link": "List/Plant Analysis",
+			"hidden": 1
+		},
+		{
+			"module_name": "Soil Analysis",
+			"_doctype": "Soil Analysis",
+			"label": _("Soil Analysis"),
+			"color": "#8BC34A",
+			"icon": "fa fa-flask",
+			"type": "list",
+			"link": "List/Soil Analysis",
+			"hidden": 1
+		},
+		{
+			"module_name": "Soil Texture",
+			"_doctype": "Soil Texture",
+			"label": _("Soil Texture"),
+			"color": "#8BC34A",
+			"icon": "octicon octicon-beaker",
+			"type": "list",
+			"link": "List/Soil Texture",
+			"hidden": 1
+		},
+		{
+			"module_name": "Water Analysis",
+			"_doctype": "Water Analysis",
+			"label": _("Water Analysis"),
+			"color": "#8BC34A",
+			"icon": "fa fa-tint",
+			"type": "list",
+			"link": "List/Water Analysis",
+			"hidden": 1
+		},
+		{
+			"module_name": "Weather",
+			"_doctype": "Weather",
+			"label": _("Weather"),
+			"color": "#8BC34A",
+			"icon": "fa fa-sun-o",
+			"type": "list",
+			"link": "List/Weather",
+			"hidden": 1
+		},
+		{
+			"module_name": "Assets",
+			"color": "#4286f4",
+			"icon": "octicon octicon-database",
+			"hidden": 1,
+			"label": _("Assets"),
+			"type": "module"
+		},
+		{
+			"module_name": "Grant Application",
+			"color": "#E9AB17",
+			"icon": "fa fa-gift",
+			"_doctype": "Grant Application",
+			"type": "list",
+			"link": "List/Grant Application",
+			"label": _("Grant Application"),
+			"hidden": 1
+
+		},
+		{
+			"module_name": "Donor",
+			"color": "#7F5A58",
+			"icon": "fa fa-tint",
+			"_doctype": "Donor",
+			"type": "list",
+			"link": "List/Donor",
+			"label": _("Donor"),
+			"hidden": 1
+		},
+		{
+			"module_name": "Volunteer",
+			"color": "#7E587E",
+			"icon": "fa fa-angellist",
+			"_doctype": "Volunteer",
+			"type": "list",
+			"link": "List/Volunteer",
+			"label": _("Volunteer"),
+			"hidden": 1
+		},
+		{
+			"module_name": "Member",
+			"color": "#79BAEC",
+			"icon": "fa fa-users",
+			"_doctype": "Member",
+			"type": "list",
+			"link": "List/Member",
+			"label": _("Member"),
+			"hidden": 1
+		},
+		{
+			"module_name": "Chapter",
+			"color": "#3B9C9C",
+			"icon": "fa fa-handshake-o",
+			"_doctype": "Chapter",
+			"type": "list",
+			"link": "List/Chapter",
+			"label": _("Chapter"),
+			"hidden": 1
+		},
+		{
+			"module_name": "Non Profit",
+			"color": "#DE2B37",
+			"icon": "octicon octicon-heart",
+			"type": "module",
+			"label": _("Non Profit"),
+			"hidden": 1
 		}
 	]
diff --git a/erpnext/config/education.py b/erpnext/config/education.py
new file mode 100644
index 0000000..08846a2
--- /dev/null
+++ b/erpnext/config/education.py
@@ -0,0 +1,224 @@
+from __future__ import unicode_literals
+from frappe import _
+
+def get_data():
+	return [
+		{
+			"label": _("Student"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Student"
+				},
+				{
+					"type": "doctype",
+					"name": "Guardian"
+				},
+				{
+					"type": "doctype",
+					"name": "Student Log"
+				},
+				{
+					"type": "doctype",
+					"name": "Student Group"
+				},
+				{
+					"type": "doctype",
+					"name": "Student Group Creation Tool"
+				},
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Student and Guardian Contact Details",
+					"doctype": "Program Enrollment"
+				}
+
+			]
+		},
+		{
+			"label": _("Admission"),
+			"items": [
+
+				{
+					"type": "doctype",
+					"name": "Student Applicant"
+				},
+				{
+					"type": "doctype",
+					"name": "Student Admission"
+				},
+				{
+					"type": "doctype",
+					"name": "Program Enrollment"
+				},
+				{
+					"type": "doctype",
+					"name": "Program Enrollment Tool"
+				}
+			]
+		},
+		{
+			"label": _("Attendance"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Student Attendance"
+				},
+				{
+					"type": "doctype",
+					"name": "Student Leave Application"
+				},
+				{
+					"type": "doctype",
+					"name": "Student Attendance Tool"
+				},
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Absent Student Report",
+					"doctype": "Student Attendance"
+				},
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Student Batch-Wise Attendance",
+					"doctype": "Student Attendance"
+				},
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Student Monthly Attendance Sheet",
+					"doctype": "Student Attendance"
+				}
+			]
+		},
+		{
+			"label": _("Schedule"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Course Schedule",
+					"route": "List/Course Schedule/Calendar"
+				},
+				{
+					"type": "doctype",
+					"name": "Course Scheduling Tool"
+				}
+			]
+		},
+		{
+			"label": _("Assessment"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Assessment Plan"
+				},
+				{
+					"type": "doctype",
+					"name": "Assessment Group",
+					"link": "Tree/Assessment Group",
+				},
+				{
+					"type": "doctype",
+					"name": "Assessment Result"
+				},
+				{
+					"type": "doctype",
+					"name": "Assessment Criteria"
+				},
+				{
+					"type": "doctype",
+					"name": "Assessment Criteria Group"
+				},
+				{
+					"type": "doctype",
+					"name": "Assessment Result Tool"
+				},
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Course wise Assessment Report",
+					"doctype": "Assessment Result"
+				},
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Assessment Plan Status",
+					"doctype": "Assessment Plan"
+				},
+
+			]
+		},
+		{
+			"label": _("Fees"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Fees"
+				},
+				{
+					"type": "doctype",
+					"name": "Fee Schedule"
+				},
+				{
+					"type": "doctype",
+					"name": "Fee Structure"
+				},
+				{
+					"type": "doctype",
+					"name": "Fee Category"
+				},
+				{
+					"type": "report",
+					"name": "Student Fee Collection",
+					"doctype": "Fees",
+					"is_query_report": True
+				}
+			]
+		},
+		{
+			"label": _("Setup"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Course"
+				},
+				{
+					"type": "doctype",
+					"name": "Program"
+				},
+				{
+					"type": "doctype",
+					"name": "Instructor"
+				},
+				{
+					"type": "doctype",
+					"name": "Room"
+				},
+				{
+					"type": "doctype",
+					"name": "Student Category"
+				},
+				{
+					"type": "doctype",
+					"name": "Student Batch Name"
+				},
+				{
+					"type": "doctype",
+					"name": "Grading Scale"
+				},
+				{
+					"type": "doctype",
+					"name": "Academic Term"
+				},
+				{
+					"type": "doctype",
+					"name": "Academic Year"
+				},
+				{
+					"type": "doctype",
+					"name": "Education Settings"
+				}
+			]
+		},
+	]
diff --git a/erpnext/config/hr.py b/erpnext/config/hr.py
index ec281bb..b433433 100644
--- a/erpnext/config/hr.py
+++ b/erpnext/config/hr.py
@@ -99,8 +99,8 @@
 				},
 				{
 					"type": "doctype",
-					"name": "Process Payroll",
-					"label": _("Process Payroll"),
+					"name": "Payroll Entry",
+					"label": _("Payroll Entry"),
 					"description":_("Generate Salary Slips"),
 					"hide_count": True
 				},
diff --git a/erpnext/config/non_profit.py b/erpnext/config/non_profit.py
new file mode 100644
index 0000000..60ca80e
--- /dev/null
+++ b/erpnext/config/non_profit.py
@@ -0,0 +1,77 @@
+from __future__ import unicode_literals
+from frappe import _
+
+def get_data():
+	return [
+		{
+			"label": _("Chapter"),
+			"icon": "fa fa-star",
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Chapter",
+					"description": _("Chapter information."),
+				}
+			]
+		},
+		{
+			"label": _("Membership"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Member",
+					"description": _("Member information."),
+				},
+				{
+					"type": "doctype",
+					"name": "Membership",
+					"description": _("Memebership Details"),
+				},
+				{
+					"type": "doctype",
+					"name": "Membership Type",
+					"description": _("Memebership Type Details"),
+				},
+			]
+		},
+		{
+			"label": _("Volunteer"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Volunteer",
+					"description": _("Volunteer information."),
+				},
+				{
+					"type": "doctype",
+					"name": "Volunteer Type",
+					"description": _("Volunteer Type information."),
+				}
+			]
+		},
+		{
+			"label": _("Donor"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Donor",
+					"description": _("Donor information."),
+				},
+				{
+					"type": "doctype",
+					"name": "Donor Type",
+					"description": _("Donor Type information."),
+				}
+			]
+		},
+		{
+			"label": _("Grant Application"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Grant Application",
+					"description": _("Grant information."),
+				}
+			]
+		}
+	]
diff --git a/erpnext/config/projects.py b/erpnext/config/projects.py
index a8514b2..b97e097 100644
--- a/erpnext/config/projects.py
+++ b/erpnext/config/projects.py
@@ -15,6 +15,7 @@
 				{
 					"type": "doctype",
 					"name": "Task",
+					"route": "Tree/Task",
 					"description": _("Project activity / task."),
 				},
 				{
diff --git a/erpnext/config/schools.py b/erpnext/config/schools.py
deleted file mode 100644
index dbdcd35..0000000
--- a/erpnext/config/schools.py
+++ /dev/null
@@ -1,218 +0,0 @@
-from __future__ import unicode_literals
-from frappe import _
-
-def get_data():
-	return [
-		{
-			"label": _("Student"),
-			"items": [
-				{
-					"type": "doctype",
-					"name": "Student"
-				},
-				{
-					"type": "doctype",
-					"name": "Guardian"
-				},
-				{
-					"type": "doctype",
-					"name": "Student Log"
-				},
-				{
-					"type": "doctype",
-					"name": "Student Group"
-				},
-				{
-					"type": "doctype",
-					"name": "Student Group Creation Tool"
-				},
-				{
-					"type": "report",
-					"is_query_report": True,
-					"name": "Student and Guardian Contact Details",
-					"doctype": "Program Enrollment"
-				}
-
-			]
-		},
-		{
-			"label": _("Admission"),
-			"items": [
-
-				{
-					"type": "doctype",
-					"name": "Student Applicant"
-				},
-				{
-					"type": "doctype",
-					"name": "Student Admission"
-				},
-				{
-					"type": "doctype",
-					"name": "Program Enrollment"
-				},
-				{
-					"type": "doctype",
-					"name": "Program Enrollment Tool"
-				}
-			]
-		},
-		{
-			"label": _("Attendance"),
-			"items": [
-				{
-					"type": "doctype",
-					"name": "Student Attendance"
-				},
-				{
-					"type": "doctype",
-					"name": "Student Leave Application"
-				},
-				{
-					"type": "doctype",
-					"name": "Student Attendance Tool"
-				},
-				{
-					"type": "report",
-					"is_query_report": True,
-					"name": "Absent Student Report",
-					"doctype": "Student Attendance"
-				},
-				{
-					"type": "report",
-					"is_query_report": True,
-					"name": "Student Batch-Wise Attendance",
-					"doctype": "Student Attendance"
-				},
-				{
-					"type": "report",
-					"is_query_report": True,
-					"name": "Student Monthly Attendance Sheet",
-					"doctype": "Student Attendance"
-				}
-			]
-		},
-		{
-			"label": _("Schedule"),
-			"items": [
-				{
-					"type": "doctype",
-					"name": "Course Schedule",
-					"route": "List/Course Schedule/Calendar"
-				},
-				{
-					"type": "doctype",
-					"name": "Course Scheduling Tool"
-				}
-			]
-		},
-		{
-			"label": _("Assessment"),
-			"items": [
-				{
-					"type": "doctype",
-					"name": "Assessment Plan"
-				},
-				{
-					"type": "doctype",
-					"name": "Assessment Group",
-					"link": "Tree/Assessment Group",
-				},
-				{
-					"type": "doctype",
-					"name": "Assessment Result"
-				},
-				{
-					"type": "doctype",
-					"name": "Grading Scale"
-				},
-				{
-					"type": "doctype",
-					"name": "Assessment Criteria"
-				},
-				{
-					"type": "doctype",
-					"name": "Assessment Criteria Group"
-				},
-				{
-					"type": "doctype",
-					"name": "Assessment Result Tool"
-				},
-				{
-					"type": "report",
-					"is_query_report": True,
-					"name": "Course wise Assessment Report",
-					"doctype": "Assessment Result"
-				},
-
-			]
-		},
-		{
-			"label": _("Fees"),
-			"items": [
-				{
-					"type": "doctype",
-					"name": "Fees"
-				},
-				{
-					"type": "doctype",
-					"name": "Fee Schedule"
-				},
-				{
-					"type": "doctype",
-					"name": "Fee Structure"
-				},
-				{
-					"type": "doctype",
-					"name": "Fee Category"
-				},
-				{
-					"type": "report",
-					"name": "Student Fee Collection",
-					"doctype": "Fees",
-					"is_query_report": True
-				}
-			]
-		},
-		{
-			"label": _("Setup"),
-			"items": [
-				{
-					"type": "doctype",
-					"name": "Course"
-				},
-				{
-					"type": "doctype",
-					"name": "Program"
-				},
-				{
-					"type": "doctype",
-					"name": "Instructor"
-				},
-				{
-					"type": "doctype",
-					"name": "Room"
-				},
-				{
-					"type": "doctype",
-					"name": "Student Category"
-				},
-				{
-					"type": "doctype",
-					"name": "Student Batch Name"
-				},
-				{
-					"type": "doctype",
-					"name": "Academic Term"
-				},
-				{
-					"type": "doctype",
-					"name": "Academic Year"
-				},
-				{
-					"type": "doctype",
-					"name": "School Settings"
-				}
-			]
-		},
-	]
diff --git a/erpnext/config/stock.py b/erpnext/config/stock.py
index d6b18fd..c5a372b 100644
--- a/erpnext/config/stock.py
+++ b/erpnext/config/stock.py
@@ -9,22 +9,18 @@
 				{
 					"type": "doctype",
 					"name": "Stock Entry",
-					"description": _("Record item movement."),
 				},
 				{
 					"type": "doctype",
 					"name": "Delivery Note",
-					"description": _("Shipments to customers."),
 				},
 				{
 					"type": "doctype",
 					"name": "Purchase Receipt",
-					"description": _("Goods received from Suppliers."),
 				},
 				{
 					"type": "doctype",
 					"name": "Material Request",
-					"description": _("Requests for items."),
 				},
 			]
 		},
@@ -60,7 +56,12 @@
 					"name": "Stock Ageing",
 					"doctype": "Item",
 				},
-
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Item Price Stock",
+					"doctype": "Item",
+				}
 			]
 		},
 		{
@@ -69,17 +70,14 @@
 				{
 					"type": "doctype",
 					"name": "Item",
-					"description": _("All Products or Services."),
 				},
 				{
 					"type": "doctype",
 					"name": "Product Bundle",
-					"description": _("Bundle items at time of sale."),
 				},
 				{
 					"type": "doctype",
 					"name": "Price List",
-					"description": _("Price List master.")
 				},
 				{
 					"type": "doctype",
@@ -87,30 +85,24 @@
 					"icon": "fa fa-sitemap",
 					"label": _("Item Group"),
 					"link": "Tree/Item Group",
-					"description": _("Tree of Item Groups."),
 				},
 				{
 					"type": "doctype",
 					"name": "Item Price",
-					"description": _("Multiple Item prices."),
 					"route": "Report/Item Price"
 				},
 				{
 					"type": "doctype",
 					"name": "Shipping Rule",
-					"description": _("Rules for adding shipping costs.")
 				},
 				{
 					"type": "doctype",
 					"name": "Pricing Rule",
-					"description": _("Rules for applying pricing and discount.")
 				},
 				{
 					"type": "doctype",
 					"name": "Item Variant Settings",
-					"description": _("Item Variant Settings."),
 				},
-
 			]
 		},
 		{
@@ -119,17 +111,14 @@
 				{
 					"type": "doctype",
 					"name": "Serial No",
-					"description": _("Single unit of an Item."),
 				},
 				{
 					"type": "doctype",
 					"name": "Batch",
-					"description": _("Batch (lot) of an Item."),
 				},
 				{
 					"type": "doctype",
 					"name": "Installation Note",
-					"description": _("Installation record for a Serial No.")
 				},
 				{
 					"type": "report",
@@ -149,28 +138,34 @@
 			]
 		},
 		{
+			"label": _("Fulfilment"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Delivery Trip",
+					"description": _("Delivery Trip service tours to customers.")
+				}
+			]
+		},
+		{
 			"label": _("Tools"),
 			"icon": "fa fa-wrench",
 			"items": [
 				{
 					"type": "doctype",
 					"name": "Stock Reconciliation",
-					"description": _("Upload stock balance via csv.")
 				},
 				{
 					"type": "doctype",
 					"name": "Packing Slip",
-					"description": _("Split Delivery Note into packages.")
 				},
 				{
 					"type": "doctype",
 					"name": "Quality Inspection",
-					"description": _("Incoming quality inspection.")
 				},
 				{
 					"type": "doctype",
 					"name": "Landed Cost Voucher",
-					"description": _("Update additional costs to calculate landed cost of items"),
 				}
 			]
 		},
@@ -181,28 +176,27 @@
 				{
 					"type": "doctype",
 					"name": "Stock Settings",
-					"description": _("Default settings for stock transactions.")
 				},
 				{
 					"type": "doctype",
 					"name": "Warehouse",
-					"description": _("Where items are stored."),
 				},
 				{
 					"type": "doctype",
 					"name": "UOM",
 					"label": _("Unit of Measure") + " (UOM)",
-					"description": _("e.g. Kg, Unit, Nos, m")
 				},
 				{
 					"type": "doctype",
 					"name": "Item Attribute",
-					"description": _("Attributes for Item Variants. e.g Size, Color etc."),
 				},
 				{
 					"type": "doctype",
 					"name": "Brand",
-					"description": _("Brand master.")
+				},
+				{
+					"type": "doctype",
+					"name": "Item Variant Settings",
 				},
 			]
 		},
@@ -289,6 +283,12 @@
 					"name": "Itemwise Recommended Reorder Level",
 					"doctype": "Item"
 				},
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Item Variant Details",
+					"doctype": "Item"
+				}
 			]
 		},
 		{
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index d3f6d38..c8d30c8 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe, erpnext
 from frappe import _, throw
-from frappe.utils import today, flt, cint, fmt_money, formatdate, getdate
+from frappe.utils import today, flt, cint, fmt_money, formatdate, getdate, add_days, add_months, get_last_day
 from erpnext.setup.utils import get_exchange_rate
 from erpnext.accounts.utils import get_fiscal_years, validate_fiscal_year, get_account_currency
 from erpnext.utilities.transaction_base import TransactionBase
@@ -26,11 +26,19 @@
 		return self.__company_currency
 
 	def onload(self):
-		self.get("__onload").make_payment_via_journal_entry = frappe.db.get_single_value('Accounts Settings', 'make_payment_via_journal_entry')
+		self.get("__onload").make_payment_via_journal_entry \
+			= frappe.db.get_single_value('Accounts Settings', 'make_payment_via_journal_entry')
+
+		if self.is_new():
+			relevant_docs = ("Quotation", "Purchase Order", "Sales Order",
+				"Purchase Invoice", "Sales Invoice")
+			if self.doctype in relevant_docs:
+				self.set_payment_schedule()
 
 	def validate(self):
 		if self.get("_action") and self._action != "update_after_submit":
 			self.set_missing_values(for_validate=True)
+
 		self.validate_date_with_fiscal_year()
 
 		if self.meta.get_field("currency"):
@@ -42,9 +50,7 @@
 			validate_return(self)
 			self.set_total_in_words()
 
-		if self.doctype in ("Sales Invoice", "Purchase Invoice") and not self.is_return:
-			self.validate_due_date()
-			self.validate_advance_entries()
+		self.validate_all_documents_schedule()
 
 		if self.meta.get_field("taxes_and_charges"):
 			self.validate_enabled_taxes_and_charges()
@@ -55,6 +61,26 @@
 		if self.doctype == 'Purchase Invoice':
 			self.validate_paid_amount()
 
+	def validate_invoice_documents_schedule(self):
+		self.validate_payment_schedule_dates()
+		self.set_due_date()
+		self.validate_invoice_portion()
+		self.set_payment_schedule()
+		self.validate_payment_schedule_amount()
+		self.validate_due_date()
+		self.validate_advance_entries()
+
+	def validate_non_invoice_documents_schedule(self):
+		self.validate_invoice_portion()
+		self.set_payment_schedule()
+		self.validate_payment_schedule_amount()
+
+	def validate_all_documents_schedule(self):
+		if self.doctype in ("Sales Invoice", "Purchase Invoice") and not self.is_return:
+			self.validate_invoice_documents_schedule()
+		elif self.doctype in ("Quotation", "Purchase Order", "Sales Order"):
+			self.validate_non_invoice_documents_schedule()
+
 	def before_print(self):
 		if self.doctype in ['Purchase Order', 'Sales Order']:
 			if self.get("group_same_items"):
@@ -66,26 +92,23 @@
 			if cint(is_paid) == 1:
 				if flt(self.paid_amount) == 0 and flt(self.outstanding_amount) > 0:
 					if self.cash_bank_account:
-						self.paid_amount = flt(flt(self.grand_total) - flt(self.write_off_amount),
-							self.precision("paid_amount"))
-						self.base_paid_amount = flt(self.paid_amount * self.conversion_rate, self.precision("base_paid_amount"))
+						self.paid_amount = flt(flt(self.outstanding_amount), self.precision("paid_amount"))
+						self.base_paid_amount = flt(self.paid_amount * self.conversion_rate,
+							self.precision("base_paid_amount"))
 					else:
 						# show message that the amount is not paid
 						self.paid_amount = 0
 						frappe.throw(_("Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified"))
 			else:
-				frappe.db.set(self,'paid_amount',0)
+				frappe.db.set(self, 'paid_amount', 0)
 
 	def set_missing_values(self, for_validate=False):
 		if frappe.flags.in_test:
-			for fieldname in ["posting_date","transaction_date"]:
+			for fieldname in ["posting_date", "transaction_date"]:
 				if self.meta.get_field(fieldname) and not self.get(fieldname):
 					self.set(fieldname, today())
 					break
 
-		# set taxes table if missing from `taxes_and_charges`
-		self.set_taxes()
-
 	def calculate_taxes_and_totals(self):
 		from erpnext.controllers.taxes_and_totals import calculate_taxes_and_totals
 		calculate_taxes_and_totals(self)
@@ -112,9 +135,9 @@
 			if not self.due_date:
 				frappe.throw(_("Due Date is mandatory"))
 
-			validate_due_date(self.posting_date, self.due_date, "Customer", self.customer, self.company)
+			validate_due_date(self.posting_date, self.due_date, "Customer", self.customer)
 		elif self.doctype == "Purchase Invoice":
-			validate_due_date(self.posting_date, self.due_date, "Supplier", self.supplier, self.company)
+			validate_due_date(self.posting_date, self.due_date, "Supplier", self.supplier)
 
 	def set_price_list_currency(self, buying_or_selling):
 		if self.meta.get_field("posting_date"):
@@ -210,9 +233,10 @@
 		tax_master_doctype = self.meta.get_field("taxes_and_charges").options
 
 		if self.is_new() and not self.get("taxes"):
-			if not self.get("taxes_and_charges"):
+			if self.company and not self.get("taxes_and_charges"):
 				# get the default tax master
-				self.taxes_and_charges = frappe.db.get_value(tax_master_doctype, {"is_default": 1})
+				self.taxes_and_charges = frappe.db.get_value(tax_master_doctype,
+					{"is_default": 1, 'company': self.company})
 
 			self.append_taxes_from_master(tax_master_doctype)
 
@@ -302,6 +326,27 @@
 				"allocated_amount": flt(d.amount) if d.against_order else 0
 			})
 
+	def apply_shipping_rule(self):
+		if self.shipping_rule:
+			shipping_rule = frappe.get_doc("Shipping Rule", self.shipping_rule)
+			shipping_rule.apply(self)
+			self.calculate_taxes_and_totals()
+
+	def get_shipping_address(self):
+		'''Returns Address object from shipping address fields if present'''
+
+		# shipping address fields can be `shipping_address_name` or `shipping_address`
+		# try getting value from both
+
+		for fieldname in ('shipping_address_name', 'shipping_address'):
+			shipping_field = self.meta.get_field(fieldname)
+			if shipping_field and shipping_field.fieldtype == 'Link':
+				if self.get(fieldname):
+					return frappe.get_doc('Address', self.get(fieldname))
+
+		return {}
+
+
 	def get_advance_entries(self, include_unallocated=True):
 		if self.doctype == "Sales Invoice":
 			party_account = self.debit_to
@@ -601,13 +646,84 @@
 		for item in duplicate_list:
 			self.remove(item)
 
+	def set_payment_schedule(self):
+		posting_date = self.get("posting_date") or self.get("transaction_date")
+		date = self.get("due_date")
+		due_date = date or posting_date
+		grand_total = self.get("rounded_total") or self.grand_total
+
+		if not self.get("payment_schedule"):
+			if self.get("payment_terms_template"):
+				data = get_payment_terms(self.payment_terms_template, posting_date, grand_total)
+				for item in data:
+					self.append("payment_schedule", item)
+			else:
+				data = dict(due_date=due_date, invoice_portion=100, payment_amount=grand_total)
+				self.append("payment_schedule", data)
+		else:
+			for d in self.get("payment_schedule"):
+				d.payment_amount = grand_total * flt(d.invoice_portion) / 100
+
+	def set_due_date(self):
+		due_dates = [d.due_date for d in self.get("payment_schedule") if d.due_date]
+		if due_dates:
+			self.due_date = max(due_dates)
+
+	def validate_payment_schedule_dates(self):
+		dates = []
+		li = []
+		if self.due_date and getdate(self.due_date) < getdate(self.posting_date):
+			frappe.throw(_("Due Date cannot be before posting date"))
+
+		for d in self.get("payment_schedule"):
+			if getdate(d.due_date) < getdate(self.posting_date):
+				frappe.throw(_("Row {0}: Due Date cannot be before posting date").format(d.idx))
+			elif d.due_date in dates:
+				li.append('{0} in row {1}'.format(d.due_date, d.idx))
+				# frappe.throw(_("Row {0}: Duplicate due date found").format(d.idx))
+			dates.append(d.due_date)
+
+		if li:
+			duplicates = '<br>' + '<br>'.join(li)
+			frappe.throw(_("Rows with duplicate due dates in other rows were found: {list}")
+				.format(list=duplicates))
+
+	def validate_payment_schedule_amount(self):
+		if self.get("payment_schedule"):
+			total = 0
+			for d in self.get("payment_schedule"):
+				total += flt(d.payment_amount)
+
+			grand_total = self.get("rounded_total") or self.grand_total
+			if total != grand_total:
+				frappe.throw(_("Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total"))
+
+	def validate_invoice_portion(self):
+		if self.get("payment_schedule"):
+			total_portion = 0
+			for term in self.payment_schedule:
+				total_portion += flt(term.get('invoice_portion', 0))
+
+			if flt(total_portion, 2) != 100.00:
+				frappe.msgprint(_('Combined invoice portion must equal 100%'), indicator='red', raise_exception=1)
+
+	def is_rounded_total_disabled(self):
+		if self.meta.get_field("disable_rounded_total"):
+			return self.disable_rounded_total
+		else:
+			return frappe.db.get_single_value("Global Defaults", "disable_rounded_total")
+
 @frappe.whitelist()
 def get_tax_rate(account_head):
 	return frappe.db.get_value("Account", account_head, ["tax_rate", "account_name"], as_dict=True)
 
 @frappe.whitelist()
-def get_default_taxes_and_charges(master_doctype):
-	default_tax = frappe.db.get_value(master_doctype, {"is_default": 1})
+def get_default_taxes_and_charges(master_doctype, company=None):
+	if not company: return {}
+
+	default_tax = frappe.db.get_value(master_doctype,
+		{"is_default": 1, "company": company})
+
 	return {
 		'taxes_and_charges': default_tax,
 		'taxes': get_taxes_and_charges(master_doctype, default_tax)
@@ -772,4 +888,43 @@
 		where due_date < CURDATE() and docstatus = 1 and outstanding_amount > 0""")
 
 	frappe.db.sql(""" update `tabPurchase Invoice` set status = 'Overdue'
-		where due_date < CURDATE() and docstatus = 1 and outstanding_amount > 0""")
\ No newline at end of file
+		where due_date < CURDATE() and docstatus = 1 and outstanding_amount > 0""")
+
+@frappe.whitelist()
+def get_payment_terms(terms_template, posting_date=None, grand_total=None):
+	if not terms_template:
+		return
+
+	terms_doc = frappe.get_doc("Payment Terms Template", terms_template)
+
+	schedule = []
+	for d in terms_doc.get("terms"):
+		term_details = get_payment_term_details(d, posting_date, grand_total)
+		schedule.append(term_details)
+
+	return schedule
+
+@frappe.whitelist()
+def get_payment_term_details(term, posting_date=None, grand_total=None):
+	term_details = frappe._dict()
+	if isinstance(term, unicode):
+		term = frappe.get_doc("Payment Term", term)
+	else:
+		term_details.payment_term = term.payment_term
+	term_details.description = term.description
+	term_details.invoice_portion = term.invoice_portion
+	term_details.payment_amount = flt(term.invoice_portion) * flt(grand_total) / 100
+	if posting_date:
+		term_details.due_date = get_due_date(posting_date, term)
+	return term_details
+
+def get_due_date(posting_date, term):
+	due_date = None
+	if term.due_date_based_on == "Day(s) after invoice date":
+		due_date = add_days(posting_date, term.credit_days)
+	elif term.due_date_based_on == "Day(s) after the end of the invoice month":
+		due_date = add_days(get_last_day(posting_date), term.credit_days)
+	elif term.due_date_based_on == "Month(s) after the end of the invoice month":
+		due_date = add_months(get_last_day(posting_date), term.credit_months)
+
+	return due_date
diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index e598735..fcf6a80 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -202,7 +202,8 @@
 			if not exists:
 				rm = self.append(raw_material_table, {})
 
-			required_qty = flt(bom_item.qty_consumed_per_unit) * flt(item.qty) * flt(item.conversion_factor)
+			required_qty = flt(flt(bom_item.qty_consumed_per_unit) * flt(item.qty) *
+				flt(item.conversion_factor), rm.precision("required_qty"))
 			rm.reference_name = item.name
 			rm.bom_detail_no = bom_item.name
 			rm.main_item_code = item.item_code
@@ -420,4 +421,5 @@
 				if d.schedule_date and getdate(d.schedule_date) < getdate(self.transaction_date):
 					frappe.throw(_("Expected Date cannot be before Transaction Date"))
 		else:
-			frappe.throw(_("Please enter Schedule Date"))
\ No newline at end of file
+			frappe.throw(_("Please enter Schedule Date"))
+
diff --git a/erpnext/controllers/item_variant.py b/erpnext/controllers/item_variant.py
index f40d519..9817f0f 100644
--- a/erpnext/controllers/item_variant.py
+++ b/erpnext/controllers/item_variant.py
@@ -169,6 +169,74 @@
 
 	return variant
 
+@frappe.whitelist()
+def enqueue_multiple_variant_creation(item, args):
+	# There can be innumerable attribute combinations, enqueue
+	frappe.enqueue("erpnext.controllers.item_variant.create_multiple_variants",
+		item=item, args=args, now=frappe.flags.in_test);
+
+def create_multiple_variants(item, args):
+	if isinstance(args, basestring):
+		args = json.loads(args)
+
+	args_set = generate_keyed_value_combinations(args)
+
+	for attribute_values in args_set:
+		if not get_variant(item, args=attribute_values):
+			variant = create_variant(item, attribute_values)
+			variant.save()
+
+def generate_keyed_value_combinations(args):
+	"""
+	From this:
+
+		args = {"attr1": ["a", "b", "c"], "attr2": ["1", "2"], "attr3": ["A"]}
+
+	To this:
+
+		[
+			{u'attr1': u'a', u'attr2': u'1', u'attr3': u'A'},
+			{u'attr1': u'b', u'attr2': u'1', u'attr3': u'A'},
+			{u'attr1': u'c', u'attr2': u'1', u'attr3': u'A'},
+			{u'attr1': u'a', u'attr2': u'2', u'attr3': u'A'},
+			{u'attr1': u'b', u'attr2': u'2', u'attr3': u'A'},
+			{u'attr1': u'c', u'attr2': u'2', u'attr3': u'A'}
+		]
+
+	"""
+	# Return empty list if empty
+	if not args:
+		return []
+
+	# Turn `args` into a list of lists of key-value tuples:
+	# [
+	# 	[(u'attr2', u'1'), (u'attr2', u'2')],
+	# 	[(u'attr3', u'A')],
+	# 	[(u'attr1', u'a'), (u'attr1', u'b'), (u'attr1', u'c')]
+	# ]
+	key_value_lists = [[(key, val) for val in args[key]] for key in args.keys()]
+
+	# Store the first, but as objects
+	# [{u'attr2': u'1'}, {u'attr2': u'2'}]
+	results = key_value_lists.pop(0)
+	results = [{d[0]: d[1]} for d in results]
+
+	# Iterate the remaining
+	# Take the next list to fuse with existing results
+	for l in key_value_lists:
+		new_results = []
+		for res in results:
+			for key_val in l:
+				# create a new clone of object in result
+				obj = copy.deepcopy(res)
+				# to be used with every incoming new value
+				obj[key_val[0]] = key_val[1]
+				# and pushed into new_results
+				new_results.append(obj)
+		results = new_results
+
+	return results
+
 def copy_attributes_to_variant(item, variant):
 	from frappe.model import no_value_fields
 
@@ -208,7 +276,7 @@
 			attributes_description = ""
 			for d in variant.attributes:
 				attributes_description += "<div>" + d.attribute + ": " + cstr(d.attribute_value) + "</div>"
-			
+
 			if attributes_description not in variant.description:
 					variant.description += attributes_description
 
@@ -239,3 +307,20 @@
 	if abbreviations:
 		variant.item_code = "{0}-{1}".format(template_item_code, "-".join(abbreviations))
 		variant.item_name = "{0}-{1}".format(template_item_name, "-".join(abbreviations))
+
+@frappe.whitelist()
+def create_variant_doc_for_quick_entry(template, args):
+	variant_based_on = frappe.db.get_value("Item", template, "variant_based_on")
+	args = json.loads(args)
+	if variant_based_on == "Manufacturer":
+		variant = get_variant(template, **args)
+	else:
+		existing_variant = get_variant(template, args)
+		if existing_variant:
+			return existing_variant
+		else:
+			variant = create_variant(template, args=args)
+			variant.name = variant.item_code
+			validate_item_variant_attributes(variant, args)
+	return variant.as_dict()
+
diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index 353721e..a71a08e 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -410,3 +410,14 @@
 	for row in filters:
 		filter_dict[row[0]].append(row)
 	return filter_dict
+
+
+@frappe.whitelist()
+def get_batch_numbers(doctype, txt, searchfield, start, page_len, filters):
+	query = 'select batch_id from `tabBatch` ' \
+			'where (`tabBatch`.expiry_date >= CURDATE() or `tabBatch`.expiry_date IS NULL)'
+
+	if filters and filters.get('item_code'):
+		query += 'where item = %(item_code)s' % filters
+
+	return frappe.db.sql(query)
diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py
index 0074560..d16f063 100644
--- a/erpnext/controllers/sales_and_purchase_return.py
+++ b/erpnext/controllers/sales_and_purchase_return.py
@@ -20,9 +20,9 @@
 		frappe.throw(_("{0} is mandatory for Return").format(doc.meta.get_label("return_against")))
 	else:
 		filters = {"doctype": doc.doctype, "docstatus": 1, "company": doc.company}
-		if doc.meta.get_field("customer"):
+		if doc.meta.get_field("customer") and doc.customer:
 			filters["customer"] = doc.customer
-		elif doc.meta.get_field("supplier"):
+		elif doc.meta.get_field("supplier") and doc.supplier:
 			filters["supplier"] = doc.supplier
 
 		if not frappe.db.exists(filters):
@@ -256,6 +256,9 @@
 			target_doc.dn_detail = source_doc.dn_detail
 			target_doc.expense_account = source_doc.expense_account
 
+	def update_terms(source_doc, target_doc, source_parent):
+		target_doc.payment_amount = -source_doc.payment_amount
+
 	doclist = get_mapped_doc(doctype, source_name,	{
 		doctype: {
 			"doctype": doctype,
@@ -272,6 +275,10 @@
 			},
 			"postprocess": update_item
 		},
+		"Payment Schedule": {
+			"doctype": "Payment Schedule",
+			"postprocess": update_terms
+		}
 	}, target_doc, set_missing_values)
 
 	return doclist
diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index c1028a5..75704b0 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -28,8 +28,7 @@
 		super(SellingController, self).onload()
 		if self.doctype in ("Sales Order", "Delivery Note", "Sales Invoice"):
 			for item in self.get("items"):
-				item.update(get_bin_details(item.item_code,
-					item.warehouse))
+				item.update(get_bin_details(item.item_code, item.warehouse))
 
 	def validate(self):
 		super(SellingController, self).validate()
@@ -67,38 +66,6 @@
 		self.set_price_list_currency("Selling")
 		self.set_missing_item_details(for_validate=for_validate)
 
-	def apply_shipping_rule(self):
-		if self.shipping_rule:
-			shipping_rule = frappe.get_doc("Shipping Rule", self.shipping_rule)
-			value = self.base_net_total
-
-			# TODO
-			# shipping rule calculation based on item's net weight
-
-			shipping_amount = 0.0
-			for condition in shipping_rule.get("conditions"):
-				if not condition.to_value or (flt(condition.from_value) <= value <= flt(condition.to_value)):
-					shipping_amount = condition.shipping_amount
-					break
-
-			shipping_charge = {
-				"doctype": "Sales Taxes and Charges",
-				"charge_type": "Actual",
-				"account_head": shipping_rule.account,
-				"cost_center": shipping_rule.cost_center
-			}
-
-			existing_shipping_charge = self.get("taxes", filters=shipping_charge)
-			if existing_shipping_charge:
-				# take the last record found
-				existing_shipping_charge[-1].tax_amount = shipping_amount
-			else:
-				shipping_charge["tax_amount"] = shipping_amount
-				shipping_charge["description"] = shipping_rule.label
-				self.append("taxes", shipping_charge)
-
-			self.calculate_taxes_and_totals()
-
 	def remove_shipping_charge(self):
 		if self.shipping_rule:
 			shipping_rule = frappe.get_doc("Shipping Rule", self.shipping_rule)
@@ -114,14 +81,15 @@
 
 	def set_total_in_words(self):
 		from frappe.utils import money_in_words
-		disable_rounded_total = cint(frappe.db.get_value("Global Defaults", None, "disable_rounded_total"))
 
 		if self.meta.get_field("base_in_words"):
-			self.base_in_words = money_in_words(disable_rounded_total and
-				abs(self.base_grand_total) or abs(self.base_rounded_total), self.company_currency)
+			base_amount = abs(self.base_grand_total
+				if self.is_rounded_total_disabled() else self.base_rounded_total)
+			self.base_in_words = money_in_words(base_amount, self.company_currency)
+
 		if self.meta.get_field("in_words"):
-			self.in_words = money_in_words(disable_rounded_total and
-				abs(self.grand_total) or abs(self.rounded_total), self.currency)
+			amount = abs(self.grand_total if self.is_rounded_total_disabled() else self.rounded_total)
+			self.in_words = money_in_words(amount, self.currency)
 
 	def calculate_commission(self):
 		if self.meta.get_field("commission_rate"):
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index 4b73abd..0fe7f7c 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -24,7 +24,7 @@
 
 		if self.doc.doctype in ["Sales Invoice", "Purchase Invoice"]:
 			self.calculate_total_advance()
-			
+
 		if self.doc.meta.get_field("other_charges_calculation"):
 			self.set_item_wise_tax_breakup()
 
@@ -62,7 +62,7 @@
 						(1.0 - (item.discount_percentage / 100.0)), item.precision("rate"))
 
 				if item.doctype in ['Quotation Item', 'Sales Order Item', 'Delivery Note Item', 'Sales Invoice Item']:
-					item.rate_with_margin = self.calculate_margin(item)
+					item.rate_with_margin, item.base_rate_with_margin = self.calculate_margin(item)
 
 					item.rate = flt(item.rate_with_margin * (1.0 - (item.discount_percentage / 100.0)), item.precision("rate"))\
 						if item.rate_with_margin > 0 else item.rate
@@ -70,6 +70,7 @@
 				item.net_rate = item.rate
 				item.amount = flt(item.rate * item.qty,	item.precision("amount"))
 				item.net_amount = item.amount
+				item.total_weight = flt(item.weight_per_unit * item.qty)
 
 				self._set_in_company_currency(item, ["price_list_rate", "rate", "net_rate", "amount", "net_amount"])
 
@@ -163,13 +164,13 @@
 			return tax.rate
 
 	def calculate_net_total(self):
-		self.doc.total = self.doc.base_total = self.doc.net_total = self.doc.base_net_total = 0.0
-
+		self.doc.total = self.doc.base_total = self.doc.net_total = self.doc.base_net_total = self.doc.total_net_weight= 0.0
 		for item in self.doc.get("items"):
 			self.doc.total += item.amount
 			self.doc.base_total += item.base_amount
 			self.doc.net_total += item.net_amount
 			self.doc.base_net_total += item.base_net_amount
+			self.doc.total_net_weight += item.total_weight
 
 		self.doc.round_floats_in(self.doc, ["total", "base_total", "net_total", "base_net_total"])
 
@@ -233,7 +234,8 @@
 		# if tax/charges is for deduction, multiply by -1
 		if getattr(tax, "category", None):
 			tax_amount = 0.0 if (tax.category == "Valuation") else tax_amount
-			tax_amount *= -1.0 if (tax.add_deduct_tax == "Deduct") else 1.0
+			if self.doc.doctype in ["Purchase Order", "Purchase Invoice", "Purchase Receipt", "Supplier Quotation"]:
+				tax_amount *= -1.0 if (tax.add_deduct_tax == "Deduct") else 1.0
 		return tax_amount
 
 	def set_cumulative_total(self, row_idx, tax):
@@ -278,7 +280,7 @@
 
 	def round_off_totals(self, tax):
 		tax.tax_amount = flt(tax.tax_amount, tax.precision("tax_amount"))
-		tax.tax_amount_after_discount_amount = flt(tax.tax_amount_after_discount_amount, 
+		tax.tax_amount_after_discount_amount = flt(tax.tax_amount_after_discount_amount,
 			tax.precision("tax_amount"))
 
 	def manipulate_grand_total_for_inclusive_tax(self):
@@ -328,20 +330,19 @@
 		self.set_rounded_total()
 
 	def set_rounded_total(self):
-		if frappe.db.get_single_value("Global Defaults", "disable_rounded_total"):
-			self.doc.rounded_total = self.doc.base_rounded_total = 0
-			return
-
 		if self.doc.meta.get_field("rounded_total"):
+			if self.doc.is_rounded_total_disabled():
+				self.doc.rounded_total = self.doc.base_rounded_total = 0
+				return
+
 			self.doc.rounded_total = round_based_on_smallest_currency_fraction(self.doc.grand_total,
 				self.doc.currency, self.doc.precision("rounded_total"))
 
-		if self.doc.meta.get_field("base_rounded_total"):
-			company_currency = erpnext.get_company_currency(self.doc.company)
+			#if print_in_rate is set, we would have already calculated rounding adjustment
+			self.doc.rounding_adjustment += flt(self.doc.rounded_total - self.doc.grand_total,
+				self.doc.precision("rounding_adjustment"))
 
-			self.doc.base_rounded_total = \
-				round_based_on_smallest_currency_fraction(self.doc.base_grand_total,
-					company_currency, self.doc.precision("base_rounded_total"))
+			self._set_in_company_currency(self.doc, ["rounding_adjustment", "rounded_total"])
 
 	def _cleanup(self):
 		for tax in self.doc.get("taxes"):
@@ -405,7 +406,8 @@
 					actual_tax_amount = flt(actual_taxes_dict.get(tax.row_id, 0)) * flt(tax.rate) / 100
 					actual_taxes_dict.setdefault(tax.idx, actual_tax_amount)
 
-			return flt(self.doc.grand_total - sum(actual_taxes_dict.values()), self.doc.precision("grand_total"))
+			return flt(self.doc.grand_total - sum(actual_taxes_dict.values()),
+				self.doc.precision("grand_total"))
 
 
 	def calculate_total_advance(self):
@@ -416,14 +418,14 @@
 			self.doc.total_advance = flt(total_allocated_amount, self.doc.precision("total_advance"))
 
 			if self.doc.party_account_currency == self.doc.currency:
-				invoice_total = flt(self.doc.grand_total - flt(self.doc.write_off_amount), 
+				invoice_total = flt(self.doc.grand_total - flt(self.doc.write_off_amount),
 					self.doc.precision("grand_total"))
 			else:
-				base_write_off_amount = flt(flt(self.doc.write_off_amount) * self.doc.conversion_rate, 
+				base_write_off_amount = flt(flt(self.doc.write_off_amount) * self.doc.conversion_rate,
 					self.doc.precision("base_write_off_amount"))
-				invoice_total = flt(self.doc.grand_total * self.doc.conversion_rate, 
+				invoice_total = flt(self.doc.grand_total * self.doc.conversion_rate,
 					self.doc.precision("grand_total")) - base_write_off_amount
-				
+
 			if invoice_total > 0 and self.doc.total_advance > invoice_total:
 				frappe.throw(_("Advance amount cannot be greater than {0} {1}")
 					.format(self.doc.party_account_currency, invoice_total))
@@ -443,30 +445,31 @@
 		self.doc.round_floats_in(self.doc, ["grand_total", "total_advance", "write_off_amount"])
 		self._set_in_company_currency(self.doc, ['write_off_amount'])
 
-		if self.doc.party_account_currency == self.doc.currency:
-			total_amount_to_pay = flt(self.doc.grand_total  - self.doc.total_advance
-				- flt(self.doc.write_off_amount), self.doc.precision("grand_total"))
-		else:
-			total_amount_to_pay = flt(flt(self.doc.grand_total *
-				self.doc.conversion_rate, self.doc.precision("grand_total")) - self.doc.total_advance
-					- flt(self.doc.base_write_off_amount), self.doc.precision("grand_total"))
+		if self.doc.doctype in ["Sales Invoice", "Purchase Invoice"]:
+			grand_total = self.doc.rounded_total or self.doc.grand_total
+			if self.doc.party_account_currency == self.doc.currency:
+				total_amount_to_pay = flt(grand_total  - self.doc.total_advance
+					- flt(self.doc.write_off_amount), self.doc.precision("grand_total"))
+			else:
+				total_amount_to_pay = flt(flt(grand_total *
+					self.doc.conversion_rate, self.doc.precision("grand_total")) - self.doc.total_advance
+						- flt(self.doc.base_write_off_amount), self.doc.precision("grand_total"))
 
-		if self.doc.doctype == "Sales Invoice":			
 			self.doc.round_floats_in(self.doc, ["paid_amount"])
-			self.calculate_write_off_amount()
-			self.calculate_change_amount()
-			
+			change_amount = 0
+
+			if self.doc.doctype == "Sales Invoice":
+				self.calculate_write_off_amount()
+				self.calculate_change_amount()
+				change_amount = self.doc.change_amount \
+					if self.doc.party_account_currency == self.doc.currency else self.doc.base_change_amount
+
 			paid_amount = self.doc.paid_amount \
 				if self.doc.party_account_currency == self.doc.currency else self.doc.base_paid_amount
-			
-			change_amount = self.doc.change_amount \
-				if self.doc.party_account_currency == self.doc.currency else self.doc.base_change_amount
 
-			self.doc.outstanding_amount = flt(total_amount_to_pay - flt(paid_amount) +
-				flt(change_amount), self.doc.precision("outstanding_amount"))
 
-		elif self.doc.doctype == "Purchase Invoice":
-			self.doc.outstanding_amount = flt(total_amount_to_pay, self.doc.precision("outstanding_amount"))
+			self.doc.outstanding_amount = flt(total_amount_to_pay - flt(paid_amount) + flt(change_amount),
+				self.doc.precision("outstanding_amount"))
 
 	def calculate_paid_amount(self):
 		paid_amount = base_paid_amount = 0.0
@@ -486,7 +489,9 @@
 	def calculate_change_amount(self):
 		self.doc.change_amount = 0.0
 		self.doc.base_change_amount = 0.0
-		if self.doc.paid_amount > self.doc.grand_total and not self.doc.is_return \
+
+		if self.doc.doctype == "Sales Invoice" \
+			and self.doc.paid_amount > self.doc.grand_total and not self.doc.is_return \
 			and any([d.type == "Cash" for d in self.doc.payments]):
 
 			self.doc.change_amount = flt(self.doc.paid_amount - self.doc.grand_total +
@@ -497,13 +502,14 @@
 
 	def calculate_write_off_amount(self):
 		if flt(self.doc.change_amount) > 0:
-			self.doc.write_off_amount = flt(self.doc.grand_total - self.doc.paid_amount + self.doc.change_amount,
-				self.doc.precision("write_off_amount"))
+			self.doc.write_off_amount = flt(self.doc.grand_total - self.doc.paid_amount
+				+ self.doc.change_amount, self.doc.precision("write_off_amount"))
 			self.doc.base_write_off_amount = flt(self.doc.write_off_amount * self.doc.conversion_rate,
 				self.doc.precision("base_write_off_amount"))
 
 	def calculate_margin(self, item):
 		rate_with_margin = 0.0
+		base_rate_with_margin = 0.0
 		if item.price_list_rate:
 			if item.pricing_rule and not self.doc.ignore_pricing_rule:
 				pricing_rule = frappe.get_doc('Pricing Rule', item.pricing_rule)
@@ -513,34 +519,35 @@
 			if item.margin_type and item.margin_rate_or_amount:
 				margin_value = item.margin_rate_or_amount if item.margin_type == 'Amount' else flt(item.price_list_rate) * flt(item.margin_rate_or_amount) / 100
 				rate_with_margin = flt(item.price_list_rate) + flt(margin_value)
+				base_rate_with_margin = flt(rate_with_margin) * flt(self.doc.conversion_rate)
 
-		return rate_with_margin
+		return rate_with_margin, base_rate_with_margin
 
 	def set_item_wise_tax_breakup(self):
 		self.doc.other_charges_calculation = get_itemised_tax_breakup_html(self.doc)
-		
+
 def get_itemised_tax_breakup_html(doc):
 	if not doc.taxes:
 		return
 	frappe.flags.company = doc.company
-	
+
 	# get headers
 	tax_accounts = []
 	for tax in doc.taxes:
 		if getattr(tax, "category", None) and tax.category=="Valuation":
 			continue
-		if tax.description not in tax_accounts and tax.tax_amount_after_discount_amount:
+		if tax.description not in tax_accounts:
 			tax_accounts.append(tax.description)
 
 	headers = get_itemised_tax_breakup_header(doc.doctype + " Item", tax_accounts)
-	
+
 	# get tax breakup data
 	itemised_tax, itemised_taxable_amount = get_itemised_tax_breakup_data(doc)
 
 	get_rounded_tax_amount(itemised_tax, doc.precision("tax_amount", "taxes"))
 
 	frappe.flags.company = None
-	
+
 	return frappe.render_template(
 		"templates/includes/itemised_tax_breakup.html", dict(
 			headers=headers,
@@ -573,7 +580,7 @@
 		if item_tax_map:
 			for item_code, tax_data in item_tax_map.items():
 				itemised_tax.setdefault(item_code, frappe._dict())
-			
+
 				if isinstance(tax_data, list):
 					itemised_tax[item_code][tax.description] = frappe._dict(dict(
 						tax_rate=flt(tax_data[0]),
diff --git a/erpnext/crm/doctype/item/test_item.js b/erpnext/crm/doctype/item/test_item.js
deleted file mode 100644
index c9b14ca..0000000
--- a/erpnext/crm/doctype/item/test_item.js
+++ /dev/null
@@ -1,120 +0,0 @@
-QUnit.test("test: item", function (assert) {
-	assert.expect(6);
-	let done = assert.async();
-	let keyboard_cost  = 800;
-	let screen_cost  = 4000;
-	let CPU_cost  = 15000;
-	let scrap_cost = 100;
-	let no_of_items_to_stock = 100;
-	let is_stock_item = 1;
-	frappe.run_serially([
-		// test item creation
-		() => frappe.set_route("List", "Item"),
-
-		// Create a keyboard item
-		() => frappe.tests.make(
-			"Item", [
-				{item_code: "Keyboard"},
-				{item_group: "Products"},
-				{is_stock_item: is_stock_item},
-				{standard_rate: keyboard_cost},
-				{opening_stock: no_of_items_to_stock},
-				{default_warehouse: "Stores - FT"}
-			]
-		),
-		() => {
-			assert.ok(cur_frm.doc.item_name.includes('Keyboard'),
-				'Item Keyboard created correctly');
-			assert.ok(cur_frm.doc.item_code.includes('Keyboard'),
-				'item_code for Keyboard set correctly');
-			assert.ok(cur_frm.doc.item_group.includes('Products'),
-				'item_group for Keyboard set correctly');
-			assert.equal(cur_frm.doc.is_stock_item, is_stock_item,
-				'is_stock_item for Keyboard set correctly');
-			assert.equal(cur_frm.doc.standard_rate, keyboard_cost,
-				'standard_rate for Keyboard set correctly');
-			assert.equal(cur_frm.doc.opening_stock, no_of_items_to_stock,
-				'opening_stock for Keyboard set correctly');
-		},
-
-		// Create a Screen item
-		() => frappe.tests.make(
-			"Item", [
-				{item_code: "Screen"},
-				{item_group: "Products"},
-				{is_stock_item: is_stock_item},
-				{standard_rate: screen_cost},
-				{opening_stock: no_of_items_to_stock},
-				{default_warehouse: "Stores - FT"}
-			]
-		),
-
-		// Create a CPU item
-		() => frappe.tests.make(
-			"Item", [
-				{item_code: "CPU"},
-				{item_group: "Products"},
-				{is_stock_item: is_stock_item},
-				{standard_rate: CPU_cost},
-				{opening_stock: no_of_items_to_stock},
-				{default_warehouse: "Stores - FT"}
-			]
-		),
-
-		// Create a laptop item
-		() => frappe.tests.make(
-			"Item", [
-				{item_code: "Laptop"},
-				{item_group: "Products"},
-				{default_warehouse: "Stores - FT"}
-			]
-		),
-		() => frappe.tests.make(
-			"Item", [
-				{item_code: "Computer"},
-				{item_group: "Products"},
-				{is_stock_item: 0},
-			]
-		),
-
-		// Create a scrap item
-		() => frappe.tests.make(
-			"Item", [
-				{item_code: "Scrap item"},
-				{item_group: "Products"},
-				{is_stock_item: is_stock_item},
-				{standard_rate: scrap_cost},
-				{opening_stock: no_of_items_to_stock},
-				{default_warehouse: "Stores - FT"}
-			]
-		),
-		() => frappe.tests.make(
-			"Item", [
-				{item_code: "Test Product 4"},
-				{item_group: "Products"},
-				{is_stock_item: 1},
-				{has_batch_no: 1},
-				{create_new_batch: 1},
-				{uoms:
-					[
-						[
-							{uom:"Unit"},
-							{conversion_factor: 10},
-						]
-					]
-				},
-				{taxes:
-					[
-						[
-							{tax_type:"SGST - "+frappe.get_abbr(frappe.defaults.get_default("Company"))},
-							{tax_rate: 0},
-						]
-					]},
-				{has_serial_no: 1},
-				{standard_rate: 100},
-				{opening_stock: 100},
-			]
-		),
-		() => done()
-	]);
-});
\ No newline at end of file
diff --git a/erpnext/crm/doctype/lead/lead.js b/erpnext/crm/doctype/lead/lead.js
index f2f3937..2b3b5a9 100644
--- a/erpnext/crm/doctype/lead/lead.js
+++ b/erpnext/crm/doctype/lead/lead.js
@@ -11,6 +11,7 @@
 	},
 
 	onload: function() {
+
 		if(cur_frm.fields_dict.lead_owner.df.options.match(/^User/)) {
 			cur_frm.fields_dict.lead_owner.get_query = function(doc, cdt, cdn) {
 				return { query: "frappe.core.doctype.user.user.user_query" }
@@ -61,10 +62,21 @@
 			method: "erpnext.crm.doctype.lead.lead.make_quotation",
 			frm: cur_frm
 		})
+	},
+
+	organization_lead: function() {
+		if (this.frm.doc.organization_lead == 1) {
+			this.frm.set_df_property('company_name', 'reqd', 1);
+		} else {
+			this.frm.set_df_property('company_name', 'reqd', 0);
+		}
+	},
+
+	company_name: function() {
+		if (this.frm.doc.organization_lead == 1) {
+			this.frm.set_value("lead_name", this.frm.doc.company_name);
+		}
 	}
 });
 
 $.extend(cur_frm.cscript, new erpnext.LeadController({frm: cur_frm}));
-
-
-
diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json
index c9d04ac..ad61abd 100644
--- a/erpnext/crm/doctype/lead/lead.json
+++ b/erpnext/crm/doctype/lead/lead.json
@@ -18,6 +18,37 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "organization_lead", 
+   "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": "Lead is an Organization", 
+   "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": 1, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "lead_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -80,6 +111,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "eval:!doc.organization_lead", 
    "fieldname": "lead_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -673,6 +705,38 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "eval:doc.organization_lead", 
+   "fieldname": "contact_html", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Contact HTML", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.organization_lead", 
    "fieldname": "phone", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -704,6 +768,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "eval:!doc.organization_lead", 
    "fieldname": "salutation", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -735,6 +800,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "eval:!doc.organization_lead", 
    "fieldname": "mobile_no", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -766,6 +832,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "eval:!doc.organization_lead", 
    "fieldname": "fax", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -1147,7 +1214,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-08-21 02:28:21.581948", 
+ "modified": "2017-11-24 11:10:56.485917", 
  "modified_by": "Administrator", 
  "module": "CRM", 
  "name": "Lead", 
diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index eb6e876..a5dfc5c 100644
--- a/erpnext/crm/doctype/lead/lead.py
+++ b/erpnext/crm/doctype/lead/lead.py
@@ -23,6 +23,7 @@
 		load_address_and_contact(self)
 
 	def validate(self):
+		self.set_lead_name()
 		self._prev = frappe._dict({
 			"contact_date": frappe.db.get_value("Lead", self.name, "contact_date") if \
 				(not cint(self.get("__islocal"))) else None,
@@ -98,6 +99,10 @@
 			"status": "Lost"
 		})
 
+	def set_lead_name(self):
+		if not self.lead_name:
+			frappe.db.set_value("Lead", self.name, "lead_name", self.organization_name)
+
 @frappe.whitelist()
 def make_customer(source_name, target_doc=None):
 	return _make_customer(source_name, target_doc)
@@ -124,11 +129,12 @@
 			}
 		}}, target_doc, set_missing_values, ignore_permissions=ignore_permissions)
 
+	print(doclist)
 	return doclist
 
 @frappe.whitelist()
 def make_opportunity(source_name, target_doc=None):
-	target_doc = get_mapped_doc("Lead", source_name, 
+	target_doc = get_mapped_doc("Lead", source_name,
 		{"Lead": {
 			"doctype": "Opportunity",
 			"field_map": {
diff --git a/erpnext/crm/doctype/lead/test_lead.py b/erpnext/crm/doctype/lead/test_lead.py
index 763e533..2781076 100644
--- a/erpnext/crm/doctype/lead/test_lead.py
+++ b/erpnext/crm/doctype/lead/test_lead.py
@@ -21,3 +21,14 @@
 		customer.company = "_Test Company"
 		customer.customer_group = "_Test Customer Group"
 		customer.insert()
+
+	def test_make_customer_from_organization(self):
+		from erpnext.crm.doctype.lead.lead import make_customer
+
+		customer = make_customer("_T-Lead-00002")
+		self.assertEquals(customer.doctype, "Customer")
+		self.assertEquals(customer.lead_name, "_T-Lead-00002")
+
+		customer.company = "_Test Company"
+		customer.customer_group = "_Test Customer Group"
+		customer.insert()
diff --git a/erpnext/crm/doctype/lead/test_records.json b/erpnext/crm/doctype/lead/test_records.json
index 01b0a99..590e200 100644
--- a/erpnext/crm/doctype/lead/test_records.json
+++ b/erpnext/crm/doctype/lead/test_records.json
@@ -23,5 +23,13 @@
   "email_id": "test_lead3@example.com",
   "lead_name": "_Test Lead 3",
   "status": "Converted"
- }
+},
+{
+ "doctype": "Lead",
+ "email_id": "test_lead4@example.com",
+ "organization_lead": 1,
+ "lead_name": "_Test Lead 4",
+ "organization_name": "_Test Lead 4",
+ "status": "Open"
+}
 ]
diff --git a/erpnext/crm/doctype/lead/test_lead.js b/erpnext/crm/doctype/lead/tests/test_lead_individual.js
similarity index 100%
rename from erpnext/crm/doctype/lead/test_lead.js
rename to erpnext/crm/doctype/lead/tests/test_lead_individual.js
diff --git a/erpnext/crm/doctype/lead/tests/test_lead_organization.js b/erpnext/crm/doctype/lead/tests/test_lead_organization.js
new file mode 100644
index 0000000..4395935
--- /dev/null
+++ b/erpnext/crm/doctype/lead/tests/test_lead_organization.js
@@ -0,0 +1,56 @@
+QUnit.module("sales");
+
+QUnit.test("test: lead", function (assert) {
+	assert.expect(5);
+	let done = assert.async();
+	let lead_name = frappe.utils.get_random(10);
+	frappe.run_serially([
+		// test lead creation
+		() => frappe.set_route("List", "Lead"),
+		() => frappe.new_doc("Lead"),
+		() => frappe.timeout(1),
+		() => cur_frm.set_value("organization_lead", "1"),
+		() => cur_frm.set_value("company_name", lead_name),
+		() => cur_frm.save(),
+		() => frappe.timeout(1),
+		() => {
+			assert.ok(cur_frm.doc.lead_name.includes(lead_name),
+				'name correctly set');
+			frappe.lead_name = cur_frm.doc.name;
+		},
+		// create address and contact
+		() => frappe.click_link('Address & Contact'),
+		() => frappe.click_button('New Address'),
+		() => frappe.timeout(1),
+		() => frappe.set_control('address_line1', 'Gateway'),
+		() => frappe.set_control('city', 'Mumbai'),
+		() => cur_frm.save(),
+		() => frappe.timeout(3),
+		() => assert.equal(frappe.get_route()[1], 'Lead',
+			'back to lead form'),
+		() => frappe.click_link('Address & Contact'),
+		() => assert.ok($('.address-box').text().includes('Mumbai'),
+			'city is seen in address box'),
+
+		() => frappe.click_button('New Contact'),
+		() => frappe.timeout(1),
+		() => frappe.set_control('first_name', 'John'),
+		() => frappe.set_control('last_name', 'Doe'),
+		() => cur_frm.save(),
+		() => frappe.timeout(3),
+		() => frappe.set_route('Form', 'Lead', cur_frm.doc.links[0].link_name),
+		() => frappe.timeout(1),
+		() => frappe.click_link('Address & Contact'),
+		() => assert.ok($('.address-box').text().includes('John'),
+			'contact is seen in contact box'),
+
+		// make customer
+		() => frappe.click_button('Make'),
+		() => frappe.click_link('Customer'),
+		() => frappe.timeout(2),
+		() => assert.equal(cur_frm.doc.lead_name, frappe.lead_name,
+			'lead name correctly mapped'),
+
+		() => done()
+	]);
+});
diff --git a/erpnext/crm/doctype/opportunity/opportunity.json b/erpnext/crm/doctype/opportunity/opportunity.json
index 89eb191..ea07ce2 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.json
+++ b/erpnext/crm/doctype/opportunity/opportunity.json
@@ -270,8 +270,8 @@
    "collapsible": 0, 
    "columns": 0, 
    "default": "Sales", 
-   "fieldname": "enquiry_type", 
-   "fieldtype": "Select", 
+   "fieldname": "opportunity_type", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -284,14 +284,14 @@
    "no_copy": 0, 
    "oldfieldname": "enquiry_type", 
    "oldfieldtype": "Select", 
-   "options": "Sales\nMaintenance", 
+   "options": "Opportunity Type", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -1189,7 +1189,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-08-21 02:07:46.486433", 
+ "modified": "2017-11-15 17:44:46.241548", 
  "modified_by": "Administrator", 
  "module": "CRM", 
  "name": "Opportunity", 
@@ -1239,7 +1239,7 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "search_fields": "status,transaction_date,customer,lead,enquiry_type,territory,company", 
+ "search_fields": "status,transaction_date,customer,lead,opportunity_type,territory,company", 
  "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
diff --git a/erpnext/crm/doctype/opportunity/opportunity.py b/erpnext/crm/doctype/opportunity/opportunity.py
index e9a7baa..9b5d6a6 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.py
+++ b/erpnext/crm/doctype/opportunity/opportunity.py
@@ -232,7 +232,7 @@
 		quotation.conversion_rate = exchange_rate
 
 		# get default taxes
-		taxes = get_default_taxes_and_charges("Sales Taxes and Charges Template")
+		taxes = get_default_taxes_and_charges("Sales Taxes and Charges Template", quotation.company)
 		if taxes.get('taxes'):
 			quotation.update(taxes)
 
@@ -246,7 +246,7 @@
 			"doctype": "Quotation",
 			"field_map": {
 				"enquiry_from": "quotation_to",
-				"enquiry_type": "order_type",
+				"opportunity_type": "order_type",
 				"name": "enq_no",
 			}
 		},
@@ -267,10 +267,7 @@
 def make_request_for_quotation(source_name, target_doc=None):
 	doclist = get_mapped_doc("Opportunity", source_name, {
 		"Opportunity": {
-			"doctype": "Request for Quotation",
-			"validation": {
-				"enquiry_type": ["=", "Sales"]
-			}
+			"doctype": "Request for Quotation"
 		},
 		"Opportunity Item": {
 			"doctype": "Request for Quotation Item",
diff --git a/erpnext/crm/doctype/opportunity/opportunity_list.js b/erpnext/crm/doctype/opportunity/opportunity_list.js
index 55a5463..0dbbf8a 100644
--- a/erpnext/crm/doctype/opportunity/opportunity_list.js
+++ b/erpnext/crm/doctype/opportunity/opportunity_list.js
@@ -1,5 +1,5 @@
 frappe.listview_settings['Opportunity'] = {
-	add_fields: ["customer_name", "enquiry_type", "enquiry_from", "status"],
+	add_fields: ["customer_name", "opportunity_type", "enquiry_from", "status"],
 	get_indicator: function(doc) {
 		var indicator = [__(doc.status), frappe.utils.guess_colour(doc.status), "status,=," + doc.status];
 		if(doc.status=="Quotation") {
diff --git a/erpnext/crm/doctype/opportunity/test_opportunity.py b/erpnext/crm/doctype/opportunity/test_opportunity.py
index 61b583c..658e31f 100644
--- a/erpnext/crm/doctype/opportunity/test_opportunity.py
+++ b/erpnext/crm/doctype/opportunity/test_opportunity.py
@@ -30,7 +30,7 @@
 		args = {
 			"doctype": "Opportunity",
 			"contact_email":"new.opportunity@example.com",
-			"enquiry_type": "Sales",
+			"opportunity_type": "Sales",
 			"with_items": 0,
 			"transaction_date": today()
 		}
@@ -65,7 +65,7 @@
 	opp_doc = frappe.get_doc({
 		"doctype": "Opportunity",
 		"enquiry_from": args.enquiry_from or "Customer",
-		"enquiry_type": "Sales",
+		"opportunity_type": "Sales",
 		"with_items": args.with_items or 0,
 		"transaction_date": today()
 	})
diff --git a/erpnext/schools/doctype/__init__.py b/erpnext/crm/doctype/opportunity_type/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/__init__.py
copy to erpnext/crm/doctype/opportunity_type/__init__.py
diff --git a/erpnext/crm/doctype/opportunity_type/opportunity_type.js b/erpnext/crm/doctype/opportunity_type/opportunity_type.js
new file mode 100644
index 0000000..174625e
--- /dev/null
+++ b/erpnext/crm/doctype/opportunity_type/opportunity_type.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Opportunity Type', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/crm/doctype/opportunity_type/opportunity_type.json b/erpnext/crm/doctype/opportunity_type/opportunity_type.json
new file mode 100644
index 0000000..3ada0f1
--- /dev/null
+++ b/erpnext/crm/doctype/opportunity_type/opportunity_type.json
@@ -0,0 +1,135 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "Prompt", 
+ "beta": 0, 
+ "creation": "2017-10-06 12:55:43.318773", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-15 17:27:12.271303", 
+ "modified_by": "Administrator", 
+ "module": "CRM", 
+ "name": "Opportunity Type", 
+ "name_case": "Title Case", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Sales Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Sales User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 0
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "search_fields": "", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/crm/doctype/opportunity_type/opportunity_type.py b/erpnext/crm/doctype/opportunity_type/opportunity_type.py
new file mode 100644
index 0000000..48abac3
--- /dev/null
+++ b/erpnext/crm/doctype/opportunity_type/opportunity_type.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class OpportunityType(Document):
+	pass
diff --git a/erpnext/crm/doctype/opportunity_type/test_opportunity_type.js b/erpnext/crm/doctype/opportunity_type/test_opportunity_type.js
new file mode 100644
index 0000000..3a1ede9
--- /dev/null
+++ b/erpnext/crm/doctype/opportunity_type/test_opportunity_type.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Opportunity Type", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Opportunity Type
+		() => frappe.tests.make('Opportunity Type', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/crm/doctype/opportunity_type/test_opportunity_type.py b/erpnext/crm/doctype/opportunity_type/test_opportunity_type.py
new file mode 100644
index 0000000..6410bbc
--- /dev/null
+++ b/erpnext/crm/doctype/opportunity_type/test_opportunity_type.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestOpportunityType(unittest.TestCase):
+	pass
diff --git a/erpnext/demo/data/item_schools.json b/erpnext/demo/data/item_education.json
similarity index 100%
rename from erpnext/demo/data/item_schools.json
rename to erpnext/demo/data/item_education.json
diff --git a/erpnext/demo/demo.py b/erpnext/demo/demo.py
index 35256b5..42ef896 100644
--- a/erpnext/demo/demo.py
+++ b/erpnext/demo/demo.py
@@ -3,7 +3,7 @@
 import frappe, sys
 import erpnext
 import frappe.utils
-from erpnext.demo.user import hr, sales, purchase, manufacturing, stock, accounts, projects, fixed_asset, schools
+from erpnext.demo.user import hr, sales, purchase, manufacturing, stock, accounts, projects, fixed_asset, education
 from erpnext.demo.setup import education, manufacture, setup_data, healthcare
 """
 Make a demo
@@ -83,7 +83,7 @@
 				sales.work()
 				manufacturing.work()
 			elif domain=='Education':
-				schools.work()
+				education.work()
 
 		except:
 			frappe.db.set_global('demo_last_date', current_date)
diff --git a/erpnext/demo/domains.py b/erpnext/demo/domains.py
index 456eb5d..5ad3e04 100644
--- a/erpnext/demo/domains.py
+++ b/erpnext/demo/domains.py
@@ -18,5 +18,11 @@
 	},
 	'Healthcare': {
 		'company_name': 'ABC Hospital Ltd.'
+	},
+	'Agriculture': {
+		'company_name': 'Schrute Farms'
+  },
+	'Non Profit': {
+		'company_name': 'Erpnext Foundation'
 	}
 }
\ No newline at end of file
diff --git a/erpnext/demo/setup/education.py b/erpnext/demo/setup/education.py
index a124ee7..2a894f7 100644
--- a/erpnext/demo/setup/education.py
+++ b/erpnext/demo/setup/education.py
@@ -31,7 +31,7 @@
 	frappe.db.commit()
 
 def setup_item():
-	items = json.loads(open(frappe.get_app_path('erpnext', 'demo', 'data', 'item_schools.json')).read())
+	items = json.loads(open(frappe.get_app_path('erpnext', 'demo', 'data', 'item_education.json')).read())
 	for i in items:
 		item = frappe.new_doc('Item')
 		item.update(i)
diff --git a/erpnext/demo/setup/setup_data.py b/erpnext/demo/setup/setup_data.py
index d395493..c7babc0 100644
--- a/erpnext/demo/setup/setup_data.py
+++ b/erpnext/demo/setup/setup_data.py
@@ -229,10 +229,10 @@
 		user.add_roles('HR User', 'Projects User')
 		frappe.db.set_global('demo_projects_user', user.name)
 
-	if not frappe.db.get_global('demo_schools_user'):
+	if not frappe.db.get_global('demo_education_user'):
 		user = frappe.get_doc('User', 'aromn@example.com')
 		user.add_roles('Academics User')
-		frappe.db.set_global('demo_schools_user', user.name)
+		frappe.db.set_global('demo_education_user', user.name)
 
 	#Add Expense Approver
 	user = frappe.get_doc('User', 'WanMai@example.com')
diff --git a/erpnext/demo/user/education.py b/erpnext/demo/user/education.py
new file mode 100644
index 0000000..8c82f87
--- /dev/null
+++ b/erpnext/demo/user/education.py
@@ -0,0 +1,117 @@
+
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+
+import frappe
+import random
+from frappe.utils import cstr
+from frappe.utils.make_random import get_random
+from datetime import timedelta
+from erpnext.education.api import get_student_group_students, make_attendance_records, enroll_student, \
+								get_fee_schedule, collect_fees, get_course
+
+
+def work():
+	frappe.set_user(frappe.db.get_global('demo_education_user'))
+	for d in xrange(20):
+		approve_random_student_applicant()
+		enroll_random_student(frappe.flags.current_date)
+	# if frappe.flags.current_date.weekday()== 0:
+	# 	make_course_schedule(frappe.flags.current_date, frappe.utils.add_days(frappe.flags.current_date, 5))	
+	mark_student_attendance(frappe.flags.current_date)
+	# make_assessment_plan()
+	make_fees()
+
+def approve_random_student_applicant():
+	random_student = get_random("Student Applicant", {"application_status": "Applied"})
+	if random_student:
+		status = ["Approved", "Rejected"]
+		frappe.db.set_value("Student Applicant", random_student, "application_status", status[weighted_choice([9,3])])
+
+def enroll_random_student(current_date):
+	batch = ["Section-A", "Section-B"]
+	random_student = get_random("Student Applicant", {"application_status": "Approved"})
+	if random_student:
+		enrollment = enroll_student(random_student)
+		enrollment.academic_year = get_random("Academic Year")
+		enrollment.enrollment_date = current_date
+		enrollment.student_batch_name = batch[weighted_choice([9,3])]
+		fee_schedule = get_fee_schedule(enrollment.program)
+		for fee in fee_schedule:
+			enrollment.append("fees", fee)
+		enrolled_courses = get_course(enrollment.program)
+		for course in enrolled_courses:
+			enrollment.append("courses", course)
+		enrollment.submit()
+		frappe.db.commit()
+		assign_student_group(enrollment.student, enrollment.student_name, enrollment.program,
+			enrolled_courses, enrollment.student_batch_name)
+		
+def assign_student_group(student, student_name, program, courses, batch):
+	course_list = [d["course"] for d in courses]
+	for d in frappe.get_list("Student Group", fields=("name"), filters={"program": program, "course":("in", course_list)}):
+		student_group = frappe.get_doc("Student Group", d.name)
+		student_group.append("students", {"student": student, "student_name": student_name,
+			"group_roll_number":len(student_group.students)+1, "active":1})
+		student_group.save()
+	student_batch = frappe.get_list("Student Group", fields=("name"), filters={"program": program, "group_based_on":"Batch", "batch":batch})[0]
+	student_batch_doc = frappe.get_doc("Student Group", student_batch.name)
+	student_batch_doc.append("students", {"student": student, "student_name": student_name,
+		"group_roll_number":len(student_batch_doc.students)+1, "active":1})
+	student_batch_doc.save()
+	frappe.db.commit()
+
+def mark_student_attendance(current_date):
+	status = ["Present", "Absent"]
+	for d in frappe.db.get_list("Student Group", filters={"group_based_on": "Batch"}):
+		students = get_student_group_students(d.name)
+		for stud in students:
+			make_attendance_records(stud.student, stud.student_name, status[weighted_choice([9,4])], None, d.name, current_date)
+			
+def make_fees():
+	for d in range(1,10):
+		random_fee = get_random("Fees", {"paid_amount": 0})
+		collect_fees(random_fee, frappe.db.get_value("Fees", random_fee, "outstanding_amount"))	
+
+def make_assessment_plan(date):
+	for d in range(1,4):
+		random_group = get_random("Student Group", {"group_based_on": "Course"}, True)
+		doc = frappe.new_doc("Assessment Plan")
+		doc.student_group = random_group.name
+		doc.course = random_group.course
+		doc.assessment_group = get_random("Assessment Group", {"is_group": 0, "parent": "2017-18 (Semester 2)"})
+		doc.grading_scale = get_random("Grading Scale")
+		doc.maximum_assessment_score = 100
+		
+def make_course_schedule(start_date, end_date):
+	for d in frappe.db.get_list("Student Group"):
+		cs = frappe.new_doc("Scheduling Tool")
+		cs.student_group = d.name
+		cs.room = get_random("Room")
+		cs.instructor = get_random("Instructor")
+		cs.course_start_date = cstr(start_date)
+		cs.course_end_date = cstr(end_date)
+		day = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
+		for x in xrange(3):
+			random_day = random.choice(day)
+			cs.day = random_day
+			cs.from_time = timedelta(hours=(random.randrange(7, 17,1)))
+			cs.to_time = cs.from_time + timedelta(hours=1)
+			cs.schedule_course()
+			day.remove(random_day)
+
+
+def weighted_choice(weights):
+	totals = []
+	running_total = 0
+
+	for w in weights:
+		running_total += w
+		totals.append(running_total)
+
+	rnd = random.random() * running_total
+	for i, total in enumerate(totals):
+		if rnd < total:
+			return i
\ No newline at end of file
diff --git a/erpnext/demo/user/fixed_asset.py b/erpnext/demo/user/fixed_asset.py
index b2db39c..e6d1687 100644
--- a/erpnext/demo/user/fixed_asset.py
+++ b/erpnext/demo/user/fixed_asset.py
@@ -6,8 +6,8 @@
 
 import frappe
 from frappe.utils.make_random import get_random
-from erpnext.accounts.doctype.asset.asset import make_purchase_invoice, make_sales_invoice
-from erpnext.accounts.doctype.asset.depreciation import post_depreciation_entries, scrap_asset
+from erpnext.assets.doctype.asset.asset import make_purchase_invoice, make_sales_invoice
+from erpnext.assets.doctype.asset.depreciation import post_depreciation_entries, scrap_asset
 
 def work():
 	frappe.set_user(frappe.db.get_global('demo_accounts_user'))
diff --git a/erpnext/demo/user/hr.py b/erpnext/demo/user/hr.py
index 1570df5..504478a 100644
--- a/erpnext/demo/user/hr.py
+++ b/erpnext/demo/user/hr.py
@@ -17,32 +17,32 @@
 	mark_attendance()
 	make_leave_application()
 
-	# process payroll
+	# payroll entry
 	if not frappe.db.sql('select name from `tabSalary Slip` where month(adddate(start_date, interval 1 month))=month(curdate())'):
 		# process payroll for previous month
-		process_payroll = frappe.get_doc("Process Payroll", "Process Payroll")
-		process_payroll.company = frappe.flags.company
-		process_payroll.payroll_frequency = 'Monthly'
+		payroll_entry = frappe.new_doc("Payroll Entry")
+		payroll_entry.company = frappe.flags.company
+		payroll_entry.payroll_frequency = 'Monthly'
 
 		# select a posting date from the previous month
-		process_payroll.posting_date = get_last_day(getdate(frappe.flags.current_date) - datetime.timedelta(days=10))
-		process_payroll.payment_account = frappe.get_value('Account', {'account_type': 'Cash', 'company': erpnext.get_default_company(),'is_group':0}, "name")
+		payroll_entry.posting_date = get_last_day(getdate(frappe.flags.current_date) - datetime.timedelta(days=10))
+		payroll_entry.payment_account = frappe.get_value('Account', {'account_type': 'Cash', 'company': erpnext.get_default_company(),'is_group':0}, "name")
 
-		process_payroll.set_start_end_dates()
+		payroll_entry.set_start_end_dates()
 
 		# based on frequency
-		process_payroll.salary_slip_based_on_timesheet = 0
-		process_payroll.create_salary_slips()
-		process_payroll.submit_salary_slips()
-		process_payroll.make_accural_jv_entry()
-		# process_payroll.make_journal_entry(reference_date=frappe.flags.current_date,
+		payroll_entry.salary_slip_based_on_timesheet = 0
+		payroll_entry.create_salary_slips()
+		payroll_entry.submit_salary_slips()
+		payroll_entry.make_accural_jv_entry()
+		# payroll_entry.make_journal_entry(reference_date=frappe.flags.current_date,
 		# 	reference_number=random_string(10))
 
-		process_payroll.salary_slip_based_on_timesheet = 1
-		process_payroll.create_salary_slips()
-		process_payroll.submit_salary_slips()
-		process_payroll.make_accural_jv_entry()
-		# process_payroll.make_journal_entry(reference_date=frappe.flags.current_date,
+		payroll_entry.salary_slip_based_on_timesheet = 1
+		payroll_entry.create_salary_slips()
+		payroll_entry.submit_salary_slips()
+		payroll_entry.make_accural_jv_entry()
+		# payroll_entry.make_journal_entry(reference_date=frappe.flags.current_date,
 		# 	reference_number=random_string(10))
 
 	if frappe.db.get_global('demo_hr_user'):
diff --git a/erpnext/demo/user/sales.py b/erpnext/demo/user/sales.py
index ddd36ef..54ea173 100644
--- a/erpnext/demo/user/sales.py
+++ b/erpnext/demo/user/sales.py
@@ -54,7 +54,7 @@
 		"doctype": "Opportunity",
 		"enquiry_from": "Customer",
 		"customer": get_random("Customer"),
-		"enquiry_type": "Sales",
+		"opportunity_type": "Sales",
 		"with_items": 1,
 		"transaction_date": frappe.flags.current_date,
 	})
diff --git a/erpnext/demo/user/schools.py b/erpnext/demo/user/schools.py
deleted file mode 100644
index 422c31a..0000000
--- a/erpnext/demo/user/schools.py
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-
-import frappe
-import random
-from frappe.utils import cstr
-from frappe.utils.make_random import get_random
-from datetime import timedelta
-from erpnext.schools.api import get_student_group_students, make_attendance_records, enroll_student, \
-								get_fee_schedule, collect_fees, get_course
-from erpnext.schools.doctype.program_enrollment.program_enrollment import get_program_courses
-from erpnext.schools.doctype.student_group.student_group import get_students
-
-def work():
-	frappe.set_user(frappe.db.get_global('demo_schools_user'))
-	for d in xrange(20):
-		approve_random_student_applicant()
-		enroll_random_student(frappe.flags.current_date)
-	# if frappe.flags.current_date.weekday()== 0:
-	# 	make_course_schedule(frappe.flags.current_date, frappe.utils.add_days(frappe.flags.current_date, 5))	
-	mark_student_attendance(frappe.flags.current_date)
-	# make_assessment_plan()
-	make_fees()
-
-def approve_random_student_applicant():
-	random_student = get_random("Student Applicant", {"application_status": "Applied"})
-	if random_student:
-		status = ["Approved", "Rejected"]
-		frappe.db.set_value("Student Applicant", random_student, "application_status", status[weighted_choice([9,3])])
-
-def enroll_random_student(current_date):
-	batch = ["Section-A", "Section-B"]
-	random_student = get_random("Student Applicant", {"application_status": "Approved"})
-	if random_student:
-		enrollment = enroll_student(random_student)
-		enrollment.academic_year = get_random("Academic Year")
-		enrollment.enrollment_date = current_date
-		enrollment.student_batch_name = batch[weighted_choice([9,3])]
-		fee_schedule = get_fee_schedule(enrollment.program)
-		for fee in fee_schedule:
-			enrollment.append("fees", fee)
-		enrolled_courses = get_course(enrollment.program)
-		for course in enrolled_courses:
-			enrollment.append("courses", course)
-		enrollment.submit()
-		frappe.db.commit()
-		assign_student_group(enrollment.student, enrollment.student_name, enrollment.program,
-			enrolled_courses, enrollment.student_batch_name)
-		
-def assign_student_group(student, student_name, program, courses, batch):
-	course_list = [d["course"] for d in courses]
-	for d in frappe.get_list("Student Group", fields=("name"), filters={"program": program, "course":("in", course_list)}):
-		student_group = frappe.get_doc("Student Group", d.name)
-		student_group.append("students", {"student": student, "student_name": student_name,
-			"group_roll_number":len(student_group.students)+1, "active":1})
-		student_group.save()
-	student_batch = frappe.get_list("Student Group", fields=("name"), filters={"program": program, "group_based_on":"Batch", "batch":batch})[0]
-	student_batch_doc = frappe.get_doc("Student Group", student_batch.name)
-	student_batch_doc.append("students", {"student": student, "student_name": student_name,
-		"group_roll_number":len(student_batch_doc.students)+1, "active":1})
-	student_batch_doc.save()
-	frappe.db.commit()
-
-def mark_student_attendance(current_date):
-	status = ["Present", "Absent"]
-	for d in frappe.db.get_list("Student Group", filters={"group_based_on": "Batch"}):
-		students = get_student_group_students(d.name)
-		for stud in students:
-			make_attendance_records(stud.student, stud.student_name, status[weighted_choice([9,4])], None, d.name, current_date)
-			
-def make_fees():
-	for d in range(1,10):
-		random_fee = get_random("Fees", {"paid_amount": 0})
-		collect_fees(random_fee, frappe.db.get_value("Fees", random_fee, "outstanding_amount"))	
-
-def make_assessment_plan(date):
-	for d in range(1,4):
-		random_group = get_random("Student Group", {"group_based_on": "Course"}, True)
-		doc = frappe.new_doc("Assessment Plan")
-		doc.student_group = random_group.name
-		doc.course = random_group.course
-		doc.assessment_group = get_random("Assessment Group", {"is_group": 0, "parent": "2017-18 (Semester 2)"})
-		doc.grading_scale = get_random("Grading Scale")
-		doc.maximum_assessment_score = 100
-		
-def make_course_schedule(start_date, end_date):
-	for d in frappe.db.get_list("Student Group"):
-		cs = frappe.new_doc("Scheduling Tool")
-		cs.student_group = d.name
-		cs.room = get_random("Room")
-		cs.instructor = get_random("Instructor")
-		cs.course_start_date = cstr(start_date)
-		cs.course_end_date = cstr(end_date)
-		day = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
-		for x in xrange(3):
-			random_day = random.choice(day)
-			cs.day = random_day
-			cs.from_time = timedelta(hours=(random.randrange(7, 17,1)))
-			cs.to_time = cs.from_time + timedelta(hours=1)
-			cs.schedule_course()
-			day.remove(random_day)
-
-
-def weighted_choice(weights):
-	totals = []
-	running_total = 0
-
-	for w in weights:
-		running_total += w
-		totals.append(running_total)
-
-	rnd = random.random() * running_total
-	for i, total in enumerate(totals):
-		if rnd < total:
-			return i
\ No newline at end of file
diff --git a/erpnext/docs/assets/img/accounts/opening-invoice-creation-tool.png b/erpnext/docs/assets/img/accounts/opening-invoice-creation-tool.png
new file mode 100644
index 0000000..638b9e6
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/opening-invoice-creation-tool.png
Binary files differ
diff --git a/erpnext/docs/assets/img/agriculture/agri_desk.png b/erpnext/docs/assets/img/agriculture/agri_desk.png
new file mode 100644
index 0000000..bc1a03b
--- /dev/null
+++ b/erpnext/docs/assets/img/agriculture/agri_desk.png
Binary files differ
diff --git a/erpnext/docs/assets/img/agriculture/agri_doctypes.png b/erpnext/docs/assets/img/agriculture/agri_doctypes.png
new file mode 100644
index 0000000..75dea2f
--- /dev/null
+++ b/erpnext/docs/assets/img/agriculture/agri_doctypes.png
Binary files differ
diff --git a/erpnext/docs/assets/img/agriculture/crops_and_land/crop.png b/erpnext/docs/assets/img/agriculture/crops_and_land/crop.png
new file mode 100644
index 0000000..2b31317
--- /dev/null
+++ b/erpnext/docs/assets/img/agriculture/crops_and_land/crop.png
Binary files differ
diff --git a/erpnext/docs/assets/img/agriculture/crops_and_land/crop_cycle.png b/erpnext/docs/assets/img/agriculture/crops_and_land/crop_cycle.png
new file mode 100644
index 0000000..27b612f
--- /dev/null
+++ b/erpnext/docs/assets/img/agriculture/crops_and_land/crop_cycle.png
Binary files differ
diff --git a/erpnext/docs/assets/img/agriculture/crops_and_land/land_unit.png b/erpnext/docs/assets/img/agriculture/crops_and_land/land_unit.png
new file mode 100644
index 0000000..500978e
--- /dev/null
+++ b/erpnext/docs/assets/img/agriculture/crops_and_land/land_unit.png
Binary files differ
diff --git a/erpnext/docs/assets/img/agriculture/crops_and_land/projects.png b/erpnext/docs/assets/img/agriculture/crops_and_land/projects.png
new file mode 100644
index 0000000..f55d3c7
--- /dev/null
+++ b/erpnext/docs/assets/img/agriculture/crops_and_land/projects.png
Binary files differ
diff --git a/erpnext/docs/assets/img/agriculture/diseases_and_fertilizer/disease.png b/erpnext/docs/assets/img/agriculture/diseases_and_fertilizer/disease.png
new file mode 100644
index 0000000..ad10e29
--- /dev/null
+++ b/erpnext/docs/assets/img/agriculture/diseases_and_fertilizer/disease.png
Binary files differ
diff --git a/erpnext/docs/assets/img/agriculture/diseases_and_fertilizer/fertilizer.png b/erpnext/docs/assets/img/agriculture/diseases_and_fertilizer/fertilizer.png
new file mode 100644
index 0000000..640b1a9
--- /dev/null
+++ b/erpnext/docs/assets/img/agriculture/diseases_and_fertilizer/fertilizer.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/asset-category.png b/erpnext/docs/assets/img/asset/asset-category.png
similarity index 100%
rename from erpnext/docs/assets/img/accounts/asset-category.png
rename to erpnext/docs/assets/img/asset/asset-category.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/asset-graph.png b/erpnext/docs/assets/img/asset/asset-graph.png
similarity index 100%
rename from erpnext/docs/assets/img/accounts/asset-graph.png
rename to erpnext/docs/assets/img/asset/asset-graph.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/asset-item.png b/erpnext/docs/assets/img/asset/asset-item.png
similarity index 100%
rename from erpnext/docs/assets/img/accounts/asset-item.png
rename to erpnext/docs/assets/img/asset/asset-item.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/asset-movement-using-button.png b/erpnext/docs/assets/img/asset/asset-movement-using-button.png
similarity index 100%
rename from erpnext/docs/assets/img/accounts/asset-movement-using-button.png
rename to erpnext/docs/assets/img/asset/asset-movement-using-button.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/asset-movement.png b/erpnext/docs/assets/img/asset/asset-movement.png
similarity index 100%
rename from erpnext/docs/assets/img/accounts/asset-movement.png
rename to erpnext/docs/assets/img/asset/asset-movement.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/asset-purchase-invoice.png b/erpnext/docs/assets/img/asset/asset-purchase-invoice.png
similarity index 100%
rename from erpnext/docs/assets/img/accounts/asset-purchase-invoice.png
rename to erpnext/docs/assets/img/asset/asset-purchase-invoice.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/asset-sales.png b/erpnext/docs/assets/img/asset/asset-sales.png
similarity index 100%
rename from erpnext/docs/assets/img/accounts/asset-sales.png
rename to erpnext/docs/assets/img/asset/asset-sales.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/asset.png b/erpnext/docs/assets/img/asset/asset.png
similarity index 100%
rename from erpnext/docs/assets/img/accounts/asset.png
rename to erpnext/docs/assets/img/asset/asset.png
Binary files differ
diff --git a/erpnext/docs/assets/img/asset/asset_maintenance.png b/erpnext/docs/assets/img/asset/asset_maintenance.png
new file mode 100644
index 0000000..725cf62
--- /dev/null
+++ b/erpnext/docs/assets/img/asset/asset_maintenance.png
Binary files differ
diff --git a/erpnext/docs/assets/img/asset/asset_maintenance_log.png b/erpnext/docs/assets/img/asset/asset_maintenance_log.png
new file mode 100644
index 0000000..8a51c2d
--- /dev/null
+++ b/erpnext/docs/assets/img/asset/asset_maintenance_log.png
Binary files differ
diff --git a/erpnext/docs/assets/img/asset/asset_maintenance_team.png b/erpnext/docs/assets/img/asset/asset_maintenance_team.png
new file mode 100644
index 0000000..c022249
--- /dev/null
+++ b/erpnext/docs/assets/img/asset/asset_maintenance_team.png
Binary files differ
diff --git a/erpnext/docs/assets/img/asset/asset_repair.png b/erpnext/docs/assets/img/asset/asset_repair.png
new file mode 100644
index 0000000..ff3cd5f
--- /dev/null
+++ b/erpnext/docs/assets/img/asset/asset_repair.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/depreciation-entry.png b/erpnext/docs/assets/img/asset/depreciation-entry.png
similarity index 100%
rename from erpnext/docs/assets/img/accounts/depreciation-entry.png
rename to erpnext/docs/assets/img/asset/depreciation-entry.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/depreciation-schedule.png b/erpnext/docs/assets/img/asset/depreciation-schedule.png
similarity index 100%
rename from erpnext/docs/assets/img/accounts/depreciation-schedule.png
rename to erpnext/docs/assets/img/asset/depreciation-schedule.png
Binary files differ
diff --git a/erpnext/docs/assets/img/asset/maintenance_required.png b/erpnext/docs/assets/img/asset/maintenance_required.png
new file mode 100644
index 0000000..a4c853a
--- /dev/null
+++ b/erpnext/docs/assets/img/asset/maintenance_required.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/scrap-journal-entry.png b/erpnext/docs/assets/img/asset/scrap-journal-entry.png
similarity index 100%
rename from erpnext/docs/assets/img/accounts/scrap-journal-entry.png
rename to erpnext/docs/assets/img/asset/scrap-journal-entry.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/__init__.py b/erpnext/docs/assets/img/education/__init__.py
similarity index 100%
rename from erpnext/docs/assets/img/schools/__init__.py
rename to erpnext/docs/assets/img/education/__init__.py
diff --git a/erpnext/docs/assets/img/schools/admission/__init__.py b/erpnext/docs/assets/img/education/admission/__init__.py
similarity index 100%
rename from erpnext/docs/assets/img/schools/admission/__init__.py
rename to erpnext/docs/assets/img/education/admission/__init__.py
diff --git a/erpnext/docs/assets/img/schools/admission/program-enrollment-tool.gif b/erpnext/docs/assets/img/education/admission/program-enrollment-tool.gif
similarity index 100%
rename from erpnext/docs/assets/img/schools/admission/program-enrollment-tool.gif
rename to erpnext/docs/assets/img/education/admission/program-enrollment-tool.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/admission/program-enrollment-tool01.gif b/erpnext/docs/assets/img/education/admission/program-enrollment-tool01.gif
similarity index 100%
rename from erpnext/docs/assets/img/schools/admission/program-enrollment-tool01.gif
rename to erpnext/docs/assets/img/education/admission/program-enrollment-tool01.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/admission/program-enrollment.gif b/erpnext/docs/assets/img/education/admission/program-enrollment.gif
similarity index 100%
rename from erpnext/docs/assets/img/schools/admission/program-enrollment.gif
rename to erpnext/docs/assets/img/education/admission/program-enrollment.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/admission/student-admission.gif b/erpnext/docs/assets/img/education/admission/student-admission.gif
similarity index 100%
rename from erpnext/docs/assets/img/schools/admission/student-admission.gif
rename to erpnext/docs/assets/img/education/admission/student-admission.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/admission/student-applicant-enroll.png b/erpnext/docs/assets/img/education/admission/student-applicant-enroll.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/admission/student-applicant-enroll.png
rename to erpnext/docs/assets/img/education/admission/student-applicant-enroll.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/admission/student-applicant.png b/erpnext/docs/assets/img/education/admission/student-applicant.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/admission/student-applicant.png
rename to erpnext/docs/assets/img/education/admission/student-applicant.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/admission/student-application-actions.png b/erpnext/docs/assets/img/education/admission/student-application-actions.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/admission/student-application-actions.png
rename to erpnext/docs/assets/img/education/admission/student-application-actions.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/assessment/__init__.py b/erpnext/docs/assets/img/education/assessment/__init__.py
similarity index 100%
rename from erpnext/docs/assets/img/schools/assessment/__init__.py
rename to erpnext/docs/assets/img/education/assessment/__init__.py
diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-criteria.png b/erpnext/docs/assets/img/education/assessment/assessment-criteria.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/assessment/assessment-criteria.png
rename to erpnext/docs/assets/img/education/assessment/assessment-criteria.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-group-details.png b/erpnext/docs/assets/img/education/assessment/assessment-group-details.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/assessment/assessment-group-details.png
rename to erpnext/docs/assets/img/education/assessment/assessment-group-details.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-group-term.png b/erpnext/docs/assets/img/education/assessment/assessment-group-term.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/assessment/assessment-group-term.png
rename to erpnext/docs/assets/img/education/assessment/assessment-group-term.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-plan-criteria.png b/erpnext/docs/assets/img/education/assessment/assessment-plan-criteria.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/assessment/assessment-plan-criteria.png
rename to erpnext/docs/assets/img/education/assessment/assessment-plan-criteria.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-plan-details.png b/erpnext/docs/assets/img/education/assessment/assessment-plan-details.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/assessment/assessment-plan-details.png
rename to erpnext/docs/assets/img/education/assessment/assessment-plan-details.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-result-tool.png b/erpnext/docs/assets/img/education/assessment/assessment-result-tool.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/assessment/assessment-result-tool.png
rename to erpnext/docs/assets/img/education/assessment/assessment-result-tool.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-result.png b/erpnext/docs/assets/img/education/assessment/assessment-result.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/assessment/assessment-result.png
rename to erpnext/docs/assets/img/education/assessment/assessment-result.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/assessment/grading-scale.png b/erpnext/docs/assets/img/education/assessment/grading-scale.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/assessment/grading-scale.png
rename to erpnext/docs/assets/img/education/assessment/grading-scale.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/fees/__init__.py b/erpnext/docs/assets/img/education/fees/__init__.py
similarity index 100%
rename from erpnext/docs/assets/img/schools/fees/__init__.py
rename to erpnext/docs/assets/img/education/fees/__init__.py
diff --git a/erpnext/docs/assets/img/schools/fees/fee-category.png b/erpnext/docs/assets/img/education/fees/fee-category.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/fees/fee-category.png
rename to erpnext/docs/assets/img/education/fees/fee-category.png
Binary files differ
diff --git a/erpnext/docs/assets/img/education/fees/fee-structure.png b/erpnext/docs/assets/img/education/fees/fee-structure.png
new file mode 100644
index 0000000..cd1edaf
--- /dev/null
+++ b/erpnext/docs/assets/img/education/fees/fee-structure.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/fees/fees-section.png b/erpnext/docs/assets/img/education/fees/fees-section.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/fees/fees-section.png
rename to erpnext/docs/assets/img/education/fees/fees-section.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/fees/fees.png b/erpnext/docs/assets/img/education/fees/fees.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/fees/fees.png
rename to erpnext/docs/assets/img/education/fees/fees.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/home.png b/erpnext/docs/assets/img/education/home.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/home.png
rename to erpnext/docs/assets/img/education/home.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/module.png b/erpnext/docs/assets/img/education/module.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/module.png
rename to erpnext/docs/assets/img/education/module.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/schedule/__init__.py b/erpnext/docs/assets/img/education/schedule/__init__.py
similarity index 100%
rename from erpnext/docs/assets/img/schools/schedule/__init__.py
rename to erpnext/docs/assets/img/education/schedule/__init__.py
diff --git a/erpnext/docs/assets/img/schools/schedule/course-schedule-att-1.png b/erpnext/docs/assets/img/education/schedule/course-schedule-att-1.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/schedule/course-schedule-att-1.png
rename to erpnext/docs/assets/img/education/schedule/course-schedule-att-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/schedule/course-schedule-att.png b/erpnext/docs/assets/img/education/schedule/course-schedule-att.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/schedule/course-schedule-att.png
rename to erpnext/docs/assets/img/education/schedule/course-schedule-att.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/schedule/course-schedule.png b/erpnext/docs/assets/img/education/schedule/course-schedule.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/schedule/course-schedule.png
rename to erpnext/docs/assets/img/education/schedule/course-schedule.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/schedule/examination.png b/erpnext/docs/assets/img/education/schedule/examination.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/schedule/examination.png
rename to erpnext/docs/assets/img/education/schedule/examination.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/schedule/schedule-section.png b/erpnext/docs/assets/img/education/schedule/schedule-section.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/schedule/schedule-section.png
rename to erpnext/docs/assets/img/education/schedule/schedule-section.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/schedule/scheduling-tool.png b/erpnext/docs/assets/img/education/schedule/scheduling-tool.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/schedule/scheduling-tool.png
rename to erpnext/docs/assets/img/education/schedule/scheduling-tool.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/schedule/student-attendance.gif b/erpnext/docs/assets/img/education/schedule/student-attendance.gif
similarity index 100%
rename from erpnext/docs/assets/img/schools/schedule/student-attendance.gif
rename to erpnext/docs/assets/img/education/schedule/student-attendance.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/schedule/student-attendance.png b/erpnext/docs/assets/img/education/schedule/student-attendance.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/schedule/student-attendance.png
rename to erpnext/docs/assets/img/education/schedule/student-attendance.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/schedule/student-leave-application.gif b/erpnext/docs/assets/img/education/schedule/student-leave-application.gif
similarity index 100%
rename from erpnext/docs/assets/img/schools/schedule/student-leave-application.gif
rename to erpnext/docs/assets/img/education/schedule/student-leave-application.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/setup/Course-schedule-error.png b/erpnext/docs/assets/img/education/setup/Course-schedule-error.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/setup/Course-schedule-error.png
rename to erpnext/docs/assets/img/education/setup/Course-schedule-error.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/setup/Room-Assesment-plan.png b/erpnext/docs/assets/img/education/setup/Room-Assesment-plan.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/setup/Room-Assesment-plan.png
rename to erpnext/docs/assets/img/education/setup/Room-Assesment-plan.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/setup/__init__.py b/erpnext/docs/assets/img/education/setup/__init__.py
similarity index 100%
rename from erpnext/docs/assets/img/schools/setup/__init__.py
rename to erpnext/docs/assets/img/education/setup/__init__.py
diff --git a/erpnext/docs/assets/img/schools/setup/academic-term.png b/erpnext/docs/assets/img/education/setup/academic-term.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/setup/academic-term.png
rename to erpnext/docs/assets/img/education/setup/academic-term.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/setup/academic-year.png b/erpnext/docs/assets/img/education/setup/academic-year.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/setup/academic-year.png
rename to erpnext/docs/assets/img/education/setup/academic-year.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/setup/course-fee-program.png b/erpnext/docs/assets/img/education/setup/course-fee-program.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/setup/course-fee-program.png
rename to erpnext/docs/assets/img/education/setup/course-fee-program.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/setup/course.png b/erpnext/docs/assets/img/education/setup/course.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/setup/course.png
rename to erpnext/docs/assets/img/education/setup/course.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/setup/instructor.png b/erpnext/docs/assets/img/education/setup/instructor.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/setup/instructor.png
rename to erpnext/docs/assets/img/education/setup/instructor.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/setup/program.png b/erpnext/docs/assets/img/education/setup/program.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/setup/program.png
rename to erpnext/docs/assets/img/education/setup/program.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/setup/room.png b/erpnext/docs/assets/img/education/setup/room.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/setup/room.png
rename to erpnext/docs/assets/img/education/setup/room.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/setup/student-attendance-tool.gif b/erpnext/docs/assets/img/education/setup/student-attendance-tool.gif
similarity index 100%
rename from erpnext/docs/assets/img/schools/setup/student-attendance-tool.gif
rename to erpnext/docs/assets/img/education/setup/student-attendance-tool.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/setup/student-group-instructor.png b/erpnext/docs/assets/img/education/setup/student-group-instructor.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/setup/student-group-instructor.png
rename to erpnext/docs/assets/img/education/setup/student-group-instructor.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/student/__init__.py b/erpnext/docs/assets/img/education/student/__init__.py
similarity index 100%
rename from erpnext/docs/assets/img/schools/student/__init__.py
rename to erpnext/docs/assets/img/education/student/__init__.py
diff --git a/erpnext/docs/assets/img/schools/student/guardian.png b/erpnext/docs/assets/img/education/student/guardian.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/student/guardian.png
rename to erpnext/docs/assets/img/education/student/guardian.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/student/schools-settings.png b/erpnext/docs/assets/img/education/student/schools-settings.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/student/schools-settings.png
rename to erpnext/docs/assets/img/education/student/schools-settings.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/student/student group.gif b/erpnext/docs/assets/img/education/student/student group.gif
similarity index 100%
rename from erpnext/docs/assets/img/schools/student/student group.gif
rename to erpnext/docs/assets/img/education/student/student group.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/student/student-admission.gif b/erpnext/docs/assets/img/education/student/student-admission.gif
similarity index 100%
rename from erpnext/docs/assets/img/schools/student/student-admission.gif
rename to erpnext/docs/assets/img/education/student/student-admission.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/student/student-batch-validation.gif b/erpnext/docs/assets/img/education/student/student-batch-validation.gif
similarity index 100%
rename from erpnext/docs/assets/img/schools/student/student-batch-validation.gif
rename to erpnext/docs/assets/img/education/student/student-batch-validation.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/student/student-batch.gif b/erpnext/docs/assets/img/education/student/student-batch.gif
similarity index 100%
rename from erpnext/docs/assets/img/schools/student/student-batch.gif
rename to erpnext/docs/assets/img/education/student/student-batch.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/student/student-course-validation.gif b/erpnext/docs/assets/img/education/student/student-course-validation.gif
similarity index 100%
rename from erpnext/docs/assets/img/schools/student/student-course-validation.gif
rename to erpnext/docs/assets/img/education/student/student-course-validation.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/student/student-group-attendance.gif b/erpnext/docs/assets/img/education/student/student-group-attendance.gif
similarity index 100%
rename from erpnext/docs/assets/img/schools/student/student-group-attendance.gif
rename to erpnext/docs/assets/img/education/student/student-group-attendance.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/student/student-group-creation-tool.gif b/erpnext/docs/assets/img/education/student/student-group-creation-tool.gif
similarity index 100%
rename from erpnext/docs/assets/img/schools/student/student-group-creation-tool.gif
rename to erpnext/docs/assets/img/education/student/student-group-creation-tool.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/student/student-log.png b/erpnext/docs/assets/img/education/student/student-log.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/student/student-log.png
rename to erpnext/docs/assets/img/education/student/student-log.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/student/student.png b/erpnext/docs/assets/img/education/student/student.png
similarity index 100%
rename from erpnext/docs/assets/img/schools/student/student.png
rename to erpnext/docs/assets/img/education/student/student.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/__init__.py b/erpnext/docs/assets/img/non_profit/__init__.py
similarity index 100%
copy from erpnext/docs/assets/img/schools/__init__.py
copy to erpnext/docs/assets/img/non_profit/__init__.py
diff --git a/erpnext/docs/assets/img/non_profit/chapter/chapter.png b/erpnext/docs/assets/img/non_profit/chapter/chapter.png
new file mode 100644
index 0000000..794f808
--- /dev/null
+++ b/erpnext/docs/assets/img/non_profit/chapter/chapter.png
Binary files differ
diff --git a/erpnext/docs/assets/img/non_profit/chapter/online_chapter.png b/erpnext/docs/assets/img/non_profit/chapter/online_chapter.png
new file mode 100644
index 0000000..95ebd81
--- /dev/null
+++ b/erpnext/docs/assets/img/non_profit/chapter/online_chapter.png
Binary files differ
diff --git a/erpnext/docs/assets/img/non_profit/chapter/online_chapter_join.png b/erpnext/docs/assets/img/non_profit/chapter/online_chapter_join.png
new file mode 100644
index 0000000..7ea56ec
--- /dev/null
+++ b/erpnext/docs/assets/img/non_profit/chapter/online_chapter_join.png
Binary files differ
diff --git a/erpnext/docs/assets/img/non_profit/donor/donor.png b/erpnext/docs/assets/img/non_profit/donor/donor.png
new file mode 100644
index 0000000..681dcc7
--- /dev/null
+++ b/erpnext/docs/assets/img/non_profit/donor/donor.png
Binary files differ
diff --git a/erpnext/docs/assets/img/non_profit/donor/donor_type.png b/erpnext/docs/assets/img/non_profit/donor/donor_type.png
new file mode 100644
index 0000000..9fedb9b
--- /dev/null
+++ b/erpnext/docs/assets/img/non_profit/donor/donor_type.png
Binary files differ
diff --git a/erpnext/docs/assets/img/non_profit/grant_application/grant_application.png b/erpnext/docs/assets/img/non_profit/grant_application/grant_application.png
new file mode 100644
index 0000000..f00ba32
--- /dev/null
+++ b/erpnext/docs/assets/img/non_profit/grant_application/grant_application.png
Binary files differ
diff --git a/erpnext/docs/assets/img/non_profit/grant_application/grant_application_row.png b/erpnext/docs/assets/img/non_profit/grant_application/grant_application_row.png
new file mode 100644
index 0000000..81cf2c6
--- /dev/null
+++ b/erpnext/docs/assets/img/non_profit/grant_application/grant_application_row.png
Binary files differ
diff --git a/erpnext/docs/assets/img/non_profit/grant_application/grant_portal.png b/erpnext/docs/assets/img/non_profit/grant_application/grant_portal.png
new file mode 100644
index 0000000..ef46bd4
--- /dev/null
+++ b/erpnext/docs/assets/img/non_profit/grant_application/grant_portal.png
Binary files differ
diff --git a/erpnext/docs/assets/img/non_profit/grant_application/online_grant_application_1.png b/erpnext/docs/assets/img/non_profit/grant_application/online_grant_application_1.png
new file mode 100644
index 0000000..899c257
--- /dev/null
+++ b/erpnext/docs/assets/img/non_profit/grant_application/online_grant_application_1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/non_profit/membership/member.png b/erpnext/docs/assets/img/non_profit/membership/member.png
new file mode 100644
index 0000000..d5518ff
--- /dev/null
+++ b/erpnext/docs/assets/img/non_profit/membership/member.png
Binary files differ
diff --git a/erpnext/docs/assets/img/non_profit/membership/membership.png b/erpnext/docs/assets/img/non_profit/membership/membership.png
new file mode 100644
index 0000000..01c3ca4
--- /dev/null
+++ b/erpnext/docs/assets/img/non_profit/membership/membership.png
Binary files differ
diff --git a/erpnext/docs/assets/img/non_profit/membership/membership_type.png b/erpnext/docs/assets/img/non_profit/membership/membership_type.png
new file mode 100644
index 0000000..6711d77
--- /dev/null
+++ b/erpnext/docs/assets/img/non_profit/membership/membership_type.png
Binary files differ
diff --git a/erpnext/docs/assets/img/non_profit/module.png b/erpnext/docs/assets/img/non_profit/module.png
new file mode 100644
index 0000000..fa1d3e8
--- /dev/null
+++ b/erpnext/docs/assets/img/non_profit/module.png
Binary files differ
diff --git a/erpnext/docs/assets/img/non_profit/non_profit_domain.png b/erpnext/docs/assets/img/non_profit/non_profit_domain.png
new file mode 100644
index 0000000..8c102e8
--- /dev/null
+++ b/erpnext/docs/assets/img/non_profit/non_profit_domain.png
Binary files differ
diff --git a/erpnext/docs/assets/img/non_profit/volunteer/volunteer.png b/erpnext/docs/assets/img/non_profit/volunteer/volunteer.png
new file mode 100644
index 0000000..0ada095
--- /dev/null
+++ b/erpnext/docs/assets/img/non_profit/volunteer/volunteer.png
Binary files differ
diff --git a/erpnext/docs/assets/img/non_profit/volunteer/volunteer_type.png b/erpnext/docs/assets/img/non_profit/volunteer/volunteer_type.png
new file mode 100644
index 0000000..729a0b7
--- /dev/null
+++ b/erpnext/docs/assets/img/non_profit/volunteer/volunteer_type.png
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project_costing.png b/erpnext/docs/assets/img/project/project_costing.png
index 997e613..c55976d 100644
--- a/erpnext/docs/assets/img/project/project_costing.png
+++ b/erpnext/docs/assets/img/project/project_costing.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/__init__.py b/erpnext/docs/assets/img/regional/uae/__init__.py
similarity index 100%
copy from erpnext/docs/assets/img/schools/__init__.py
copy to erpnext/docs/assets/img/regional/uae/__init__.py
diff --git a/erpnext/docs/assets/img/regional/uae/detailed-invoice.png b/erpnext/docs/assets/img/regional/uae/detailed-invoice.png
new file mode 100644
index 0000000..6cfcb04
--- /dev/null
+++ b/erpnext/docs/assets/img/regional/uae/detailed-invoice.png
Binary files differ
diff --git a/erpnext/docs/assets/img/regional/uae/simplified-invoice.png b/erpnext/docs/assets/img/regional/uae/simplified-invoice.png
new file mode 100644
index 0000000..1678f9e
--- /dev/null
+++ b/erpnext/docs/assets/img/regional/uae/simplified-invoice.png
Binary files differ
diff --git a/erpnext/docs/assets/img/regional/uae/tax-code-item.png b/erpnext/docs/assets/img/regional/uae/tax-code-item.png
new file mode 100644
index 0000000..2278bd9
--- /dev/null
+++ b/erpnext/docs/assets/img/regional/uae/tax-code-item.png
Binary files differ
diff --git a/erpnext/docs/assets/img/regional/uae/tax-id-company.png b/erpnext/docs/assets/img/regional/uae/tax-id-company.png
new file mode 100644
index 0000000..56a2a7b
--- /dev/null
+++ b/erpnext/docs/assets/img/regional/uae/tax-id-company.png
Binary files differ
diff --git a/erpnext/docs/assets/img/regional/uae/tax-id-customer.png b/erpnext/docs/assets/img/regional/uae/tax-id-customer.png
new file mode 100644
index 0000000..d7dfb3b
--- /dev/null
+++ b/erpnext/docs/assets/img/regional/uae/tax-id-customer.png
Binary files differ
diff --git a/erpnext/docs/assets/img/regional/uae/uae-tax-templates.png b/erpnext/docs/assets/img/regional/uae/uae-tax-templates.png
new file mode 100644
index 0000000..d2a2c26
--- /dev/null
+++ b/erpnext/docs/assets/img/regional/uae/uae-tax-templates.png
Binary files differ
diff --git a/erpnext/docs/assets/img/regional/uae/vat-invoice.gif b/erpnext/docs/assets/img/regional/uae/vat-invoice.gif
new file mode 100644
index 0000000..227036d
--- /dev/null
+++ b/erpnext/docs/assets/img/regional/uae/vat-invoice.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/fees/fee-structure.png b/erpnext/docs/assets/img/schools/fees/fee-structure.png
deleted file mode 100644
index 81f3e20..0000000
--- a/erpnext/docs/assets/img/schools/fees/fee-structure.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/selling/shipping-rule.png b/erpnext/docs/assets/img/selling/shipping-rule.png
index 7cd9b46..7f2a63d 100644
--- a/erpnext/docs/assets/img/selling/shipping-rule.png
+++ b/erpnext/docs/assets/img/selling/shipping-rule.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/barcode-1.png b/erpnext/docs/assets/img/setup/barcode-1.png
deleted file mode 100644
index c200a13..0000000
--- a/erpnext/docs/assets/img/setup/barcode-1.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/barcode-2.png b/erpnext/docs/assets/img/setup/barcode-2.png
deleted file mode 100644
index 6ea4529..0000000
--- a/erpnext/docs/assets/img/setup/barcode-2.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/stock/delivery_stops.png b/erpnext/docs/assets/img/stock/delivery_stops.png
new file mode 100644
index 0000000..1811cf3
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/delivery_stops.png
Binary files differ
diff --git a/erpnext/docs/assets/img/stock/delivery_trip.png b/erpnext/docs/assets/img/stock/delivery_trip.png
new file mode 100644
index 0000000..6913542
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/delivery_trip.png
Binary files differ
diff --git a/erpnext/docs/assets/img/stock/material-receipt-sample.png b/erpnext/docs/assets/img/stock/material-receipt-sample.png
new file mode 100644
index 0000000..f893424
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/material-receipt-sample.png
Binary files differ
diff --git a/erpnext/docs/assets/img/stock/material-transfer-sample.png b/erpnext/docs/assets/img/stock/material-transfer-sample.png
new file mode 100644
index 0000000..6191156
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/material-transfer-sample.png
Binary files differ
diff --git a/erpnext/docs/assets/img/stock/retain-sample.png b/erpnext/docs/assets/img/stock/retain-sample.png
new file mode 100644
index 0000000..675339f
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/retain-sample.png
Binary files differ
diff --git a/erpnext/docs/assets/img/stock/sample-warehouse.png b/erpnext/docs/assets/img/stock/sample-warehouse.png
new file mode 100644
index 0000000..fc6fee1
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/sample-warehouse.png
Binary files differ
diff --git a/erpnext/docs/user/manual/de/setting-up/bar-code.md b/erpnext/docs/user/manual/de/setting-up/bar-code.md
deleted file mode 100644
index e85c698..0000000
--- a/erpnext/docs/user/manual/de/setting-up/bar-code.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# Barcode
-<span class="text-muted contributed-by">Beigetragen von CWT Connector & Wire Technology GmbH</span>
-
-Ein Barcode ist ein maschinenlesbarer Code und besteht aus Nummern und Mustern von parallelen Linien mit unterschiedlicher Breite, die auf eine Ware aufgedruckt werden. Barcodes werden speziell zur Lagerverwaltung verwendet.
-
-Wenn Sie einen Artikel bei einem beliebigen Geschäft kaufen, dann werden Sie einen Aufkleber mit dünnen Linien erkennen, versehen mit einer Kombination von verschiedenen Zahlen. Dieser Aufkleber wird dann vom Kassierer eingescannt und die Beschreibung und der Preis werden automatisch übernommen. Diese Anordnung von Linien und Zahlen bezeichnet man als Barcode.
-
-Ein Barcode-Lesegerät liest die Nummer des Aufklebers eines Artikels ein. Um mit ERPNext Barcodes zu nutzen, verbinden Sie den Barcodeleser mit Ihrer Hardware. Gehen Sie dann zu den ERPNext-Einstellungen und aktivieren Sie "Barcode" indem Sie zu den Werkzeugen gehen und auf die Funktion "verbergen / anzeigen" klicken. Kreuzen Sie dann das Feld "Artikel-Barcode" an.
-
-> Einstellungen > Anpassen > Funktionen einstellen > Artikelbarcode
-
-### Abbildung 1: Markieren Sie das Feld "Artikelbarcode"
-
-<img class="screenshot" alt="Barcode" src="/docs/assets/img/setup/barcode-1.png">
-
-Wenn Sie einen Barcode einlesen wollen, gehen Sie zu:
-
-> Rechnungswesen > Dokumente > Eingangsrechnung
-
-Klicken Sie unter dem Artikel auf "Neue Zeile einfügen". Die Artikelzeile erweitert sich um neue Felder anzuzeigen. Positionieren Sie Ihre Schreibmarke im Barcodefeld und beginnen Sie mit dem Einlesen. Der Barcode wird im entsprechenden Feld aktualisiert. Nachdem der Barcode eingelesen wurd, holt das System automatisch alle Artikeldetails aus dem System.
-
-Aktivieren Sie der Einfachheit halber die POS-Ansicht in ERPNext. Der Aktivierungsprozess ist der selbe wie bei der Barcodeaktivierung. Gehen Sie in die Einstellungen und klicken Sie auf "Funktionen einstellen". Aktivieren Sie dann das Feld "Ist POS".
-
-Gehen Sie dann zu "Rechnungswesen" und klicken Sie auf Ausgangsrechnung. Aktivieren Sie das Feld "Ist POS".
-
-### Abbildung 2: Aktivieren Sie das Feld "Ist POS"
-
-<img class="screenshot" alt="Barcode" src="/docs/assets/img/setup/barcode-2.png">
-
-Gehen Sie zu "Artikel" und klicken Sie auf "Neue Zeile einfügen".
-
-Die Schreibmarke wird automatisch im Barcodefeld positioniert. So können Sie sofort den Barcode einlesen und mit Ihren Arbeiten fortfahren.
-
-{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/index.txt b/erpnext/docs/user/manual/de/setting-up/index.txt
index a607ca2..fff1665 100644
--- a/erpnext/docs/user/manual/de/setting-up/index.txt
+++ b/erpnext/docs/user/manual/de/setting-up/index.txt
@@ -13,7 +13,6 @@
 territory
 third-party-backups
 workflows
-bar-code
 company-setup
 setting-company-sales-goal
 calculate-incentive-for-sales-team
diff --git a/erpnext/docs/user/manual/en/CRM/lead.md b/erpnext/docs/user/manual/en/CRM/lead.md
index 15b1159..2a48166 100644
--- a/erpnext/docs/user/manual/en/CRM/lead.md
+++ b/erpnext/docs/user/manual/en/CRM/lead.md
@@ -43,6 +43,9 @@
 organization or individual who has given you business before (and has an Account
 in your system). A Contact is a person who belongs to the Customer.
 
+A Lead can sometimes be an organization you are trying to make a deal with. In this case you can select "Lead is an Organization" and add as many contacts within this organization as you want.
+It is useful if you are establishing a relationship with several people within the same organization.
+
 A Lead can be converted to a Customer by selecting “Customer” from the **Make**
 dropdown. Once the Customer is created, the Lead becomes “Converted” and any
 further Opportunities from the same source can be created against this
diff --git a/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md b/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md
index f2208b4..44a940a 100644
--- a/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md
+++ b/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md
@@ -108,6 +108,11 @@
 
 <img class="screenshot" alt="Chart of Accounts" src="/docs/assets/img/accounts/chart-of-accounts-2.png">
 
+### Account Number
+A standard chart of accounts is organized according to a numerical system. Each major category will begin with a certain number, and then the sub-categories within that major category will all begin with the same number. For example, if assets are classified by numbers starting with the digit 1000, then cash accounts might be labeled 1100, bank accounts might be labeled 1200, accounts receivable might be labeled 1300, and so on. A gap between account numbers is generally maintained for adding accounts in the future.
+
+You can assign a number while creating an account from Chart of Accounts page. You can also edit a number from account record, by clicking "Update Account Number" button. On updating account number, system renames the account name automatically to embed the number in the account name.
+
 ### Other Account Types
 
 In ERPNext, you can also specify more information when you create a new
@@ -115,6 +120,19 @@
 scenario like Bank Account or a Tax Account and has no effect on the Chart
 itself.
 
+Explanation of account types:
+- **Bank:** The account group under which bank account will be created.
+- **Cash:** The account group under which cash account will be created.
+- **Cost of Goods Sold:** The account to book the accumulated total of all costs used to manufacture / purchase a product or service, sold by a company.
+- **Depreciation:** The expense account to book the depreciation of teh fixed assets.
+- **Expenses Included In Valuation:** The account to book the expenses (apart from direct material costs) included in landed cost of an item/product, used in Perpetual Inventory, .
+- **Fixed Asset:** The account to maintain the costs of fixed assets.
+- **Payable:** The account which represents the amount owed by a company to its creditors.
+- **Receivable:** The account which represents the amount owed by a company by its debtors.
+- **Stock:** The account group under which the warehouse account will be created.
+- **Stock Adjustment:** An expense account to book any adjustment entry of stock/inventory, and generally comes at the same level of Cost of Goods Sold.
+- **Stock Received But Not Billed:** A temporary liability account which holds the value of stock received but not billed yet and used in Perpetual Inventory.
+
 ### Creating / Editing Accounts
 
 To create new Accounts, explore your Chart of Accounts and click on an Account
@@ -124,7 +142,8 @@
 <img class="screenshot" alt="Chart of Accounts" src="/docs/assets/img/accounts/chart-of-accounts-3.png">
 
 Option to create will only appear if you click on a Group (folder) type
-Account.
+Account. There you need to enter account name, account number and some more
+optional details.
 
 ERPNext creates a standard structure for you when the Company is created but
 it is up to you to modify or add or remove accounts.
diff --git a/erpnext/docs/user/manual/en/accounts/managing-fixed-assets.md b/erpnext/docs/user/manual/en/accounts/managing-fixed-assets.md
deleted file mode 100644
index 45bd227..0000000
--- a/erpnext/docs/user/manual/en/accounts/managing-fixed-assets.md
+++ /dev/null
@@ -1,95 +0,0 @@
-# Managing Fixed Assets
-
-In ERPNext, you can maintain fixed asset records like Computers, Furnitures, Cars, etc. and manage depreciations, sale or disposal of those assets.
-
-## Asset Category
-
-Based on the type of assets, create Asset Category. For example, all your desktops and laptops can be part of an Asset Category named "Computers". Here you can set default depreciation method, periodicity and depreciation related accounts, which will be applicable to all the assets under the category.
-
-<img class="screenshot" alt="Asset Category" src="/docs/assets/img/accounts/asset-category.png">
-
-> **Note:** You can also set default depreciation related Accounts and Cost Centers in Company master.
-
-## Asset
-
-Asset master is the heart of fixed asset management feature. All the transactions related to Asset like purchasing, sales, depreciation, scrapping will be managed from the Asset master.
-
-<img class="screenshot" alt="Asset" src="/docs/assets/img/accounts/asset.png">
-
-Explanation of the fields:
-
-1. Item Code: An Item for the Asset must be a non-stock item, with "Is Asset" field checked.
-
-	<img class="screenshot" alt="Asset Item" src="/docs/assets/img/accounts/asset-item.png">
-
-2. Asset Category: The category of assets it belongs to.
-3. Is Existing Asset: Check if the asset is being carried forward from the previous Fiscal Year. The existing assets which are partially / fully depreciated can also be created/maintained for the future reference.
-4. Status: The options are - Draft, Submitted, Partially Depreciated, Fully Depreciated, Sold and Scrapped.
-5. Warehouse: Set the location of the asset.
-6. Gross Purchase Amount: The purchase cost of the asset.
-7. Expected Value After Useful Life: Useful Life is the time period over in which the company expects that the asset will be productive. After that period, either the asset is scrapped or sold. In case it is sold, mention the estimated value here. This value is also known as Salvage Value, Scrap Value or Residual Value.
-8. Opening Accumulated Depreciation: The accumulated depreciation amount which has already been booked for an existing asset.
-9. Current Value (After Depreciation): In case you are creating record of an existing asset which has already been partially/fully depreciated, mention the current value of the asset. In case of new asset, mention the purchase amount or leave it blank.
-10. Depreciation Method: There are two options: Straight Line and Double Declining Balance.
-	- Straight Line: This method spreads the cost of the fixed asset evenly over its useful life.
-	- Double Declining Method: An accelerated method of depreciation, it results in higher depreciation expense in the earlier years of ownership.
-10. Total Number of Depreciations: The total number of depreciations during the useful life. In case of existing assets which are partially depreciated, mention the number of pending depreciations.
-11. Number of Depreciations Booked: Enter the number of already booked depreciations for an existing asset.
-12. Frequency of Depreciation (Months): The number of months between two depreciations.
-13. Next Depreciation Date: Mention the next depreciation date, even if it is the first one. If the asset is an existing one and depreciation has already been completed, leave it blank.
-
-### Depreciations
-
-The system automatically creates a schedule for depreciation based on depreciation method and other related inputs in the Asset record.
-
-<img class="screenshot" alt="Asset" src="/docs/assets/img/accounts/depreciation-schedule.png">
-
-On the scheduled date, system creates depreciation entry by creating a Journal Entry and the same Journal Entry is updated in the depreciation table for reference. Next Depreciation Date and Current Value are also updated on submission of depreciation entry.
-
-<img class="screenshot" alt="Asset" src="/docs/assets/img/accounts/depreciation-entry.png">
-
-In the depreciation entry, the "Accumulated Depreciation Account" is credited and "Depreciation Expense Account" is debited. The related accounts can be set in the Asset Category or Company.
-
-For better visibility, net value of the asset on different depreciation dates are shown in a line graph.
-
-<img class="screenshot" alt="Asset" src="/docs/assets/img/accounts/asset-graph.png">
-
-
-## Purchase an Asset
-
-For purchasing a new asset, create and submit the asset record with all the depreciation settings. Then create a Purchase Invoice via "Make Purchase Invoice" button. On clicking the button, system will load a new Purchase Invoice form with pre-loaded items table. It will also set proper fixed asset account (defined in the Asset Category) in the Expense Account field. You need to select Supplier and other necessary details and submit the Purchase Invoice.
-
-<img class="screenshot" alt="Asset" src="/docs/assets/img/accounts/asset-purchase-invoice.png">
-
-On submission of the invoice, the "Fixed Asset Account" will be debited and payable account will be credited. It also updates purchase date, supplier and Purchase Invoice no. in the Asset master.
-
-
-## Sell an Asset
-
-To sell an asset, open the asset record and create a Sales Invoice by clicking on "Sell Asset". On submission of the Sales Invoice, following entries will take place:
-
-- "Receivable Account" (Debtors) will be debited by the sales amount.
-- "Fixed Asset Account" will be credited by the purchase amount of asset.
-- "Accumulated Depreciation Account" will be debited by the total depreciated amount till now.
-- "Gain/Loss Account on Asset Disposal" will be credited/debited based on gain/loss amount. The Gain/Loss account can be set in Company record.
-
-<img class="screenshot" alt="Asset" src="/docs/assets/img/accounts/asset-sales.png">
-
-
-## Scrap an Asset
-
-You can scrap an asset anytime using the "Scrap Asset" button in the Asset record. The "Gain/Loss Account on Asset Disposal" mentioned in the Company is debited by the Current Value (After Depreciation) of the asset. After scrapping, you can also restore the asset using "Restore Asset" button.
-
-<img class="screenshot" alt="Asset" src="/docs/assets/img/accounts/scrap-journal-entry.png">
-
-## Asset Movement
-
-The movement of the assets (from one warehouse to another) is also tracked via Asset Movement form.
-
-<img class="screenshot" alt="Asset" src="/docs/assets/img/accounts/asset-movement.png">
-
-There is also a dedicated button "Transfer Asset" inside the Asset form to track the Asset Movement.
-
-<img class="screenshot" alt="Asset" src="/docs/assets/img/accounts/asset-movement-using-button.png">
-
-{next}
diff --git a/erpnext/docs/user/manual/en/accounts/opening-accounts.md b/erpnext/docs/user/manual/en/accounts/opening-accounts.md
index 40546a3..958c20b 100644
--- a/erpnext/docs/user/manual/en/accounts/opening-accounts.md
+++ b/erpnext/docs/user/manual/en/accounts/opening-accounts.md
@@ -1,4 +1,4 @@
-#Updating Opening Balance in Accounts
+# Updating Opening Balance in Accounts
 
 If you are a new company you can start using ERPNext accounting module by going to chart of accounts. However, if you are migrating from a legacy accounting system like Tally or a Fox Pro based software
 
@@ -13,28 +13,28 @@
 > Opening entry is only for Balance Sheet accounts and not for the Accounts in the Profit and Loss statement.
 
   * For all assets (excluding Accounts Receivables): This entry will contain all your assets except the amounts you are expecting from your Customers against outstanding Sales Invoices. You will have to update your receivables by making an individual entry for each Invoice (this is because, the system will help you track the invoices which are yet to be paid). You can credit the sum of all these debits against the **Temporary Opening** account.
-  
+
   * For all liabilities: Similarly you need to pass a Journal Entry for your Opening Liabilities (except for the bills you have to pay) against **Temporary Opening** account.
 
 ###Opening Entry
 
-####Step 1: New Journal Entry
+#### Step 1: New Journal Entry
 
 To open new Journal Entry, go to:
 
 `Explore > Accounts > Journal Entry`
 
-####Step 2: Entry Type
+#### Step 2: Entry Type
 
 If Entry Type is selected as Opening Entry, all the Balance Sheet Accounts will be auto-fetched in the Journal Entry.
 
 <img class="screenshot" alt="Opening Account" src="/docs/assets/img/accounts/opening-account-1.png">
 
-####Step 3: Posting Date
+#### Step 3: Posting Date
 
 Select Posting Date on which Accounts Opening Balance will be updated.
 
-####Step 4: Enter Debit/Credit Value
+#### Step 4: Enter Debit/Credit Value
 
 For each Account, enter opening value in the Debit or Credit column. As per the double entry valuation system, Total Debit value in a entry must be equal to Total Credit value.
 
@@ -86,9 +86,9 @@
 
 Opening balance for the fixed asset account should be updated via Journal Entry. Assets which are not fully depreciated should be added in the [Asset master](/docs/user/manual/en/accounts/managing-fixed-assets.html). For adding Assets in your possession, ensure to check **Is Existing Asset** field.
 
-### Outstanding Invoices
+### Outstanding Payables and Receivables
 
-After opening Journal Entries are made, you will need to enter each Sales Invoice and Purchase Invoice that is yet to be paid.
+After opening Journal Entries are made, you will need to enter the Sales Invoice and Purchase Invoice that is yet to be paid.
 
 Since you have already booked the income or expense on these invoices in the previous period, select **Temporary Opening** in the “Income” and “Expense” accounts.
 
@@ -96,4 +96,12 @@
 
 If you don’t care what items are in that invoice, just make a dummy item entry in the Invoice. Item code in the Invoice is not necessary, so it should not be such a problem.
 
+You can also do this quickly using the **Opening Invoice Creation Tool**
+
+To use this tool, just type "Opening Invoice" in the search bar and select the **Opening Invoice Creation Tool**
+
+Here, select the company and type of invoice (sales or purchase) and add a line item for each invoice you want to create.
+
+<img class="screenshot" alt="Opening Invoice Creation Tool" src="/docs/assets/img/accounts/opening-invoice-creation-tool.png">
+
 {next}
diff --git a/erpnext/docs/user/manual/en/accounts/payment-terms.md b/erpnext/docs/user/manual/en/accounts/payment-terms.md
new file mode 100644
index 0000000..4f28d0d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/payment-terms.md
@@ -0,0 +1,70 @@
+# Payment Terms
+You can save your business' payment terms on ERPNext and include it in all documents in the sales/purchase cycle and ERPNext will make all the proper general ledger entries accordingly.
+
+The documents you can attach Payment Terms to are:
+- Sales Invoice
+- Purchase Invoice
+- Sales Order
+- Purchase Order
+- Quotation
+
+Note that the introduction of Payment Terms removes "Credit Days" and "Credit Days Based On" fields in Customer/Supplier master. Payment Term contains the same information and makes it more flexible to use.
+
+## Payment Terms
+Navigate to the Payment Term list page and click "New".
+> Accounts > Payment Term > New Payment Term
+
+Payment Term has the following fields:
+**Payment Term Name:** (optional) The name for this Payment Term.
+
+**Due Date Based On:** The basis by which the due date for the Payment Term is to be calculated. There are three options:
+- Day(s) after invoice date: Due date should be calculated in days with reference to the posting date of the invoice
+- Day(s) after the end of the invoice month: Due date should be calculated in days with reference to the last day of the month in which the invoice was created
+- Month(s) after the end of the invoice month: Due date should be calculated in months with reference to the last day of the month in which the invoice was created
+
+**Invoice Portion:** (optional) The portion of the total invoice amount for which this Payment Term should be applied. Value given will be regarded as percentage i.e 100 = 100%
+
+**Credit Days:** (optional) The number of days or month credit is allowed depending on the option chosen in the `Due Date Based On` field. 0 means no credit allowed.
+
+**Description:** (optional) A brief description of the Payment Term.
+
+## Payment Terms In Converted Documents
+When converting or copying documents in the sales/purchase cycle, the attached Payment Term(s) will not be copied. The reason for this is because the copied information might no longer be true. For example, a Quotation is created for a service costing $1000 on January 1 with payment term of "N 30" (Net payable within 30 days) and then sent to a customer. On the quotation, the due date on the invoice will be January 30. Let's say the customer agrees to the quotation of January 20 and you decide to make an invoice from the Quotation. If the Payment Terms from the Quotation is copied, the due date on the invoice will still wrongly read January 30. This issue also applies for recurring documents.
+
+This does not mean you have manually set Payment Terms for every document. If you want the Payment Terms to be copyable, make use of Payment Terms Template.
+
+##  Payment Terms Template
+Payment Terms Template tells ERPNext how to populate the table in the Payment Terms Schedule section of the sales/purchase document.
+ 
+You should use it if you have a set of standard Payment Terms or if you want the Payment Term(s) on a sales/purchase document to be copyable.
+
+To create a new Payment Terms Template, navigate to the Payment Term Template creation form:
+> Accounts > Payment Terms Template > New Payment Terms Template
+
+**Payment Term:** (optional) The name for this Payment Term.
+
+**Due Date Based On:** The basis by which the due date for the Payment Term is to be calculated. There are three options:
+- Day(s) after invoice date: Due date should be calculated in days with reference to the posting date of the invoice
+- Day(s) after the end of the invoice month: Due date should be calculated in days with reference to the last day of the month in which the invoice was created
+- Month(s) after the end of the invoice month: Due date should be calculated in months with reference to the last day of the month in which the invoice was created
+
+**Invoice Portion:** (optional) The portion of the total invoice amount for which this Payment Term should be applied. Value given will be regarded as percentage i.e 100 = 100%
+
+**Credit Days:** (optional) The number of days or month credit is allowed depending on the option chosen in the `Due Date Based On` field. 0 means no credit allowed.
+
+**Description:** (optional) A brief description of the Payment Term.
+
+Add as many rows as needed but make sure that the sum of the values in the `Invoice Portion` fields in all populated rows equals 100.
+
+## How to Add Payment Terms To Documents
+You can add Payments Terms in the "Payment Terms Schedule" section of the Document. Each row in the table represents a portion of the document's grand total. The table collects the following information:
+
+**Payment Term:** (optional) The name of the Payment Term document you require. If this is added, the data from the selected Payment Term will be used to populate the remaining columns in the row.
+
+**Description:** (optional) Description of the Payment Term.
+
+**Due Date:** (optional) The due date for the portion of the invoice. Set this value only if you did not specify anything in the `Payment Term` column.
+
+**Invoice Portion:** The percentage portion of the document represented in each row.
+
+**Payment Amount:** The amount due from the portion of the invoice represented by each row.
diff --git a/erpnext/docs/user/manual/en/accounts/sales-invoice.md b/erpnext/docs/user/manual/en/accounts/sales-invoice.md
index f4c4143..3ea13f0 100644
--- a/erpnext/docs/user/manual/en/accounts/sales-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/sales-invoice.md
@@ -56,6 +56,21 @@
 ERPNext will automatically create new Invoices and mail it to the Email Addresses
 you set.
 
+#### Automatically Fetching Item Batch Numbers
+
+If you are selling an item from a [Batch](/docs/user/manual/en/stock/batch),
+ERPNext will automatically fetch a batch number for you if "Update Stock" 
+is checked. The batch number will be fetched on a First Expiring First Out 
+(FEFO) basis. This is a variant of First In First Out (FIFO) that gives 
+highest priority to the soonest to expire Items. 
+
+<img class="screenshot" alt="POS Invoice" src="/docs/assets/img/accounts/sales-invoice-fetch-batch.png">
+
+Note that if the first batch in the queue cannot satisfy the order on the invoice, 
+the next batch in the queue that can satisfy the order will be selected. If there is 
+no batch that can satisfy the order, ERPNext will cancel its attempt to automatically 
+fetch a suitable batch number.
+
 #### POS Invoices
 
 Consider a scenario where retail transaction is carried out. For e.g: A retail shop.
diff --git a/erpnext/docs/user/manual/en/accounts/tools/index.txt b/erpnext/docs/user/manual/en/accounts/tools/index.txt
index 7f93166..d551820 100644
--- a/erpnext/docs/user/manual/en/accounts/tools/index.txt
+++ b/erpnext/docs/user/manual/en/accounts/tools/index.txt
@@ -1,4 +1,3 @@
 bank-reconciliation
 payment-reconciliation
 period-closing-voucher
-payment-tool
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/tools/payment-tool.md b/erpnext/docs/user/manual/en/accounts/tools/payment-tool.md
deleted file mode 100644
index 32a539b..0000000
--- a/erpnext/docs/user/manual/en/accounts/tools/payment-tool.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Payment Tool
-
-###Payment Tool
-The Payment Tool Feature allows non-accounting personnel to generate Journal Entries by populating relevant fields in the Journal Entry with account and payment details.
-
-To go to Payment Tool, click on Accounts > Tools > Payment Tool.
-
-1. Select the Company Name.
-2. Select the Party Type (Customer or Supplier) and the name of the customer or supplier against whom the payment has been made or received.
-3. Use the Received Or Paid field to specify 'Received' if payment is being received or 'Paid' if User is making the payment.
-4. Select the Mode of Payment and the Payment Account .
-5. Enter the Reference Number and Reference Date of the payment, for instance, the Cheque no. and Cheque date in case the payment is being made by cheque.
-6. Click on Get Outstanding Vouchers to fetch all the valid Vouchers, Invoices and Orders against which a payment can be made/received. These will appear in the Against Voucher section.
-	* __Note:__ In case User is paying a customer or receiving payment from a supplier, add the details regarding the relevant invoices and orders manually.
-
-   <img class="screenshot" alt="Payment Tool" src="/docs/assets/img/accounts/payment-tool-1.png">
-
-7. Once details have been fetched, click on the detail entry and enter the payment amount made against that Invoice/Order/Voucher
-
-   <img class="screenshot" alt="Payment Tool" src="/docs/assets/img/accounts/payment-tool-2.png">
-
-8. Click on 'Make Journal Entry' to generate a new Journal Entry with the relevant Party Details and Credit/Debit details filled in.
-
-   <img class="screenshot" alt="Payment Tool" src="/docs/assets/img/accounts/payment-tool-3.png">
-	
-{next}
diff --git a/erpnext/docs/user/manual/en/agriculture/analytics/index.md b/erpnext/docs/user/manual/en/agriculture/analytics/index.md
new file mode 100644
index 0000000..7fbffdd
--- /dev/null
+++ b/erpnext/docs/user/manual/en/agriculture/analytics/index.md
@@ -0,0 +1,12 @@
+# Analytics
+
+This part of the Agriculture module is used for tracking data and report generation
+
+All the data pertaining to the following doctypes can be tracked by ERPNext
+
+* Plant Analysis
+* Soil Analysis
+* Water Analysis
+* Soil Texture
+* Weather
+* Agriculture Analysis Criteria
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/agriculture/crops_and_land/crop.md b/erpnext/docs/user/manual/en/agriculture/crops_and_land/crop.md
new file mode 100644
index 0000000..ecdc4f9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/agriculture/crops_and_land/crop.md
@@ -0,0 +1,50 @@
+# Crop 
+
+Now we need to specify what our crop will be. A crop summarizes all that is necessary before creatng our first crop cycle or planting.
+
+> Agriculture > Crop
+
+On the desk, click on the Crop icon. A list will show any existing Crops.
+
+On the top right, click on 'New'  to create the first Crop. A new Crop document will open, and we will enter basic information.
+
+The basic information should be entered as such:
+
+* Title: Carrot from carrot-top
+* Crop Name: Carrot
+* Scientific name: Daucus Carota
+* Type: Biennial
+* Planting UOM: Unit
+* Yield UOM: Grams
+
+Click Save 
+
+We will skip the Materials Required, Byproducts and Produce sections. In the Ideal Agriculture Task List we enter some planned tasks such as planting, watering, and harvesting. (Please note, our activity list will be intentionally abbreviated for illustraion purposes. For this example we will prepare our field, plant the next day, water only once, add a cover after germination on day 12, remove weeds at day 19, and harvest at day 90.
+
+The first row will look like this:
+
+* Task Name: Preparation - Make rows
+* Start Day: 1
+* End Day: 1
+* Holiday Management: Ignore holidays
+
+When done, you can click 'Save' to prevent any work from being lost.
+
+We are not done yet, we simply have saved the minimum required information!
+Continue filling the next rows with Task Name, Start Day, End Day and Holiday Management.
+
+
+* Row 2: Preparation - Add mulch cover, 1, 1, Previous Business Day
+* Row 3: Planting - Sow the seeds, 2, 2, Previous Business Day
+* Row 4: Water - 10ml per plant, 2, 2, Ignore holidays
+* Row 5: Disease - Pest control - Cover with Fine Net, 12, 12, Previous Business Day
+* Row 6: Weed Control - Remove weeds, 19, 19, Previous Business Day
+* Row 7: Harvest - When top is at 5cm, 90, 90, Previous Business Day
+
+Click 'Save'
+
+You form should now look something like this
+
+<img class="screenshot" alt="Task" src="/docs/assets/img/agriculture/crops_and_land/crop.png">
+
+Repeat step 2 for as many crops as you need. You can save some time by duplicating existing crops and modifying only the necessary items
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/agriculture/crops_and_land/crop_cycle.md b/erpnext/docs/user/manual/en/agriculture/crops_and_land/crop_cycle.md
new file mode 100644
index 0000000..7a9c3eb
--- /dev/null
+++ b/erpnext/docs/user/manual/en/agriculture/crops_and_land/crop_cycle.md
@@ -0,0 +1,30 @@
+# Crop Cycle
+
+Once we have defined our crop, we can create as many crop cycles as we like, using the parameters outlined previously
+
+On the desk, clik on the Crop Cycle icon.  A list will show any existing Crop Cycles.
+
+> Agriculture > Crop Cycle
+
+On the top right, click on New to create the first Crop Cycle. A new Crop Cycle document will open, and right away you see that two of the required items are a Land Unit and a Crop. We shall give it a descriptive name, to differentiate it from Crop Cycles we might create later.
+
+* Title: Carrot Planting 2017
+* Land Unit: Add a row, and select, Carrot Field 1
+* Crop: Carrot from carrot-top
+* Start Date: Today
+* Leave the ISO 8016 Standard (week count) box unchecked
+* Skip the next four fields for Crop Spacing
+
+Save the new Crop Cycle
+
+It should now look something like this
+
+<img class="screenshot" alt="Task" src="/docs/assets/img/agriculture/crops_and_land/crop_cycle.png">
+
+Repeat these for every Crop Cycle you need
+
+As you can see a Project was created, with the same name as the Crop Cycle and linked to the Crop Cycle. If you click on the project, you'll see all the 'Sample Tasks' from the linked Crop, i.e. 'Carrot from carrot-top' in this case, were converted into actual 'Tasks' and linked to the Project, for easy management
+
+> Projects > Project
+
+<img class="screenshot" alt="Task" src="/docs/assets/img/agriculture/crops_and_land/projects.png">
diff --git a/erpnext/docs/user/manual/en/agriculture/crops_and_land/index.md b/erpnext/docs/user/manual/en/agriculture/crops_and_land/index.md
new file mode 100644
index 0000000..b94a655
--- /dev/null
+++ b/erpnext/docs/user/manual/en/agriculture/crops_and_land/index.md
@@ -0,0 +1,15 @@
+# Crops and Land
+
+The core and most important elements of Agriculture module are:
+
+* Land Unit: Representing the physical space where the crops are planted.
+* Crop: Characteristics of the crop, inputs and expected outputs, expected calendar of activities and harvest, etc.
+* Crop Cycle: Individual representation of a single planting in a specific area. (Links a crop to a Land Unit for a specified period)
+
+Here we will learn to do a quick setup with the essential requirements to manage a simple example crop, Carrots.
+
+ These instructions assume you have already completed the basic ERPNext setup, and you have the ERPNext desk on your browser window.
+
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/agriculture/crops_and_land/index.txt b/erpnext/docs/user/manual/en/agriculture/crops_and_land/index.txt
new file mode 100644
index 0000000..1b24d5b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/agriculture/crops_and_land/index.txt
@@ -0,0 +1,3 @@
+land_unit
+crop
+crop_cycle
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/agriculture/crops_and_land/land_unit.md b/erpnext/docs/user/manual/en/agriculture/crops_and_land/land_unit.md
new file mode 100644
index 0000000..9b3fb23
--- /dev/null
+++ b/erpnext/docs/user/manual/en/agriculture/crops_and_land/land_unit.md
@@ -0,0 +1,31 @@
+# Land Unit
+
+Before we do anything, we need to define some details about where our crops will be planted. We will first create our farm as a parent land unit, and then we will add one or more fields as children or nodes, belonging to the parent.
+
+> Agriculture > Land Unit
+
+On the desk, click on the Land Unit icon. assets/img/new-land-unit-icon.png A list will show any existing Land Units.
+
+On the top right, click on New  to create the first Land Unit.
+
+* Land Unit Name: Carrot Farm
+* Parent Land Unit: All Land Units
+* Check the box next to 'Is Group'
+* Location: plot the area as you please
+
+Click Save
+
+It should look something like this
+
+<img class="screenshot" alt="Task" src="/docs/assets/img/agriculture/crops_and_land/land_unit.png">
+
+With the farm created, we can now create our first Carrot Field! Click on New 
+
+* Land Unit Name: Carrot Field 1
+* Parent Land Unit:select the one we just created in step two, i.e. Carrot Farm
+* Leave the 'Is Group' box unchecked
+* Location: plot the area as you please
+
+Click Save
+
+Repeat step 3 for as many fields as you need
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/disease.md b/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/disease.md
new file mode 100644
index 0000000..e7f68ad
--- /dev/null
+++ b/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/disease.md
@@ -0,0 +1,24 @@
+# Disease 
+
+This part of Agriculture module deals with the management of Diseases, which may include various types of bacteria, funcgi, viruses, or pests which affect he Crop
+
+On the desk, click on the Disease icon. A list will show any existing Diseases.
+
+> Agriculture > Disease
+
+The basic information should be entered as such:
+
+* Disease Name: Aphids
+* Scientific name: Aphidoidea
+* Description: you could give a description of the disease here
+* Treatment Task: This may contain a list of all the Tasks which need to to be executed in orfer to get rid of the Disease
+
+Once you fill the form, click Save
+
+Click Save
+
+Now it should look something like this
+
+<img class="screenshot" alt="Task" src="/docs/assets/img/agriculture/diseases_and_fertilizer/disease.png">
+
+These Tasks will be imported into the Crop Cycle Project if you choose to add this Disease to the list of Detected Diesase in Crop Cycle
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/fertilizer.md b/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/fertilizer.md
new file mode 100644
index 0000000..8e1ccf2
--- /dev/null
+++ b/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/fertilizer.md
@@ -0,0 +1,5 @@
+# Fertilizer
+
+This is used to keep track of available fertilizers, and their chemical composition, which is linked to the Item master
+
+<img class="screenshot" alt="Task" src="/docs/assets/img/agriculture/diseases_and_fertilizer/fertilizer.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/index.md b/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/index.md
new file mode 100644
index 0000000..3adb91b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/index.md
@@ -0,0 +1,7 @@
+# Disease and Fertilizer
+
+This part of Agriculture module deals with the management of Diseases which affect the Crop and Fertilizers which may be used to promote the growth of the Crop
+
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/index.txt b/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/index.txt
new file mode 100644
index 0000000..eb13feb
--- /dev/null
+++ b/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/index.txt
@@ -0,0 +1,2 @@
+disease
+fertilizer
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/agriculture/index.md b/erpnext/docs/user/manual/en/agriculture/index.md
new file mode 100644
index 0000000..b186998
--- /dev/null
+++ b/erpnext/docs/user/manual/en/agriculture/index.md
@@ -0,0 +1,22 @@
+# Agriculture
+
+Farmers know that even a small operation requires intensive recordkeeping. A well-run farm requires proper management of accounting, payroll, suppliers, customers and logistics to name a few areas. ERPNext already helps organize these activities.
+
+A farm requires additional attention to manage its productive units (plots of land), time sensitive crop activities (such as planting, irrigating, fertilizing, etc.), recording environmental and crop data for analysis, and reports to help make effective decisions.
+
+<img class="screenshot" alt="Task" src="/docs/assets/img/agriculture/agri_desk.png">
+
+The Agriculture module in ERPNext helps you keep track of your farming operations. It allows you keep records for each field where you farm, such as geospatial and soil texture characteristics. It allows you to:
+
+* Manage the physical spaces where you plant your crops
+* Manage your crops
+* Record analysis data
+* Plan activities related to your crops
+* Record sale of the harvest or transfer to warehouse for further processing
+* View reports
+
+<img class="screenshot" alt="Task" src="/docs/assets/img/agriculture/agri_doctypes.png">
+
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/agriculture/index.txt b/erpnext/docs/user/manual/en/agriculture/index.txt
new file mode 100644
index 0000000..a7f92f5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/agriculture/index.txt
@@ -0,0 +1,3 @@
+crops_and_land
+diseases_and_fertlizers
+analytics
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/asset/asset-maintenance.md b/erpnext/docs/user/manual/en/asset/asset-maintenance.md
new file mode 100644
index 0000000..7ad13a6
--- /dev/null
+++ b/erpnext/docs/user/manual/en/asset/asset-maintenance.md
@@ -0,0 +1,31 @@
+# Asset Maintenance Management
+ERPNext provides features to track the details of individual maintenance/calibration tasks for an asset by date, the person responsible for the maintenance and future maintenance due date.
+
+To perform Asset Maintenance in ERPNext,
+
+  1. Enable Asset Maintenance.
+  2. Create Asset Maintenance Team.
+  3. Create Asset Maintenance.
+  4. Create Asset Maintenance Log.
+  5. Create Asset Repair Log.
+
+### Enable Asset Maintenance
+Check Maintain Required in Asset to enable Asset Maintenance
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/maintenance_required.png">
+
+### Asset Maintenance Team
+Create Asset Maintenance Team, select team members and their role.
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset_maintenance_team.png">
+
+
+### Asset Maintenance
+For each asset create a Asset Maintenance record listing all the associated maintenance tasks, maintenance type (Preventive Maintenance or Calibration), periodicity, assign to and start and end date of maintenance. Based on start date and periodicity the next due date is auto-calculated and a ToDo is created for the Assignee.
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset_maintenance.png">
+
+### Asset Maintenance Log
+For each task in Asset Maintenance, Asset Maintenance Log is auto created to keep track of the upcoming Maintenances. It will have status, completion date and actions performed. Based on completion date here, next due date is calculated automatically and new Asset Maintenance Log is created.
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset_maintenance_log.png">
+
+### Asset Repair
+You can also maintain the records of Repair/Failures of your asset which are not listed in Asset Maintenance.
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset_repair.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/asset/assets.md b/erpnext/docs/user/manual/en/asset/assets.md
new file mode 100644
index 0000000..6932c59
--- /dev/null
+++ b/erpnext/docs/user/manual/en/asset/assets.md
@@ -0,0 +1,95 @@
+# Managing Fixed Assets
+
+In ERPNext, you can maintain fixed asset records like Computers, Furnitures, Cars, etc. and manage depreciations, sale or disposal of those assets.
+
+## Asset Category
+
+Based on the type of assets, create Asset Category. For example, all your desktops and laptops can be part of an Asset Category named "Computers". Here you can set default depreciation method, periodicity and depreciation related accounts, which will be applicable to all the assets under the category.
+
+<img class="screenshot" alt="Asset Category" src="/docs/assets/img/asset/asset-category.png">
+
+> **Note:** You can also set default depreciation related Accounts and Cost Centers in Company master.
+
+## Asset
+
+Asset master is the heart of fixed asset management feature. All the transactions related to Asset like purchasing, sales, depreciation, scrapping will be managed from the Asset master.
+
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset.png">
+
+Explanation of the fields:
+
+1. Item Code: An Item for the Asset must be a non-stock item, with "Is Asset" field checked.
+
+	<img class="screenshot" alt="Asset Item" src="/docs/assets/img/asset/asset-item.png">
+
+2. Asset Category: The category of assets it belongs to.
+3. Is Existing Asset: Check if the asset is being carried forward from the previous Fiscal Year. The existing assets which are partially / fully depreciated can also be created/maintained for the future reference.
+4. Status: The options are - Draft, Submitted, Partially Depreciated, Fully Depreciated, Sold and Scrapped.
+5. Warehouse: Set the location of the asset.
+6. Gross Purchase Amount: The purchase cost of the asset.
+7. Expected Value After Useful Life: Useful Life is the time period over in which the company expects that the asset will be productive. After that period, either the asset is scrapped or sold. In case it is sold, mention the estimated value here. This value is also known as Salvage Value, Scrap Value or Residual Value.
+8. Opening Accumulated Depreciation: The accumulated depreciation amount which has already been booked for an existing asset.
+9. Current Value (After Depreciation): In case you are creating record of an existing asset which has already been partially/fully depreciated, mention the current value of the asset. In case of new asset, mention the purchase amount or leave it blank.
+10. Depreciation Method: There are two options: Straight Line and Double Declining Balance.
+	- Straight Line: This method spreads the cost of the fixed asset evenly over its useful life.
+	- Double Declining Method: An accelerated method of depreciation, it results in higher depreciation expense in the earlier years of ownership.
+10. Total Number of Depreciations: The total number of depreciations during the useful life. In case of existing assets which are partially depreciated, mention the number of pending depreciations.
+11. Number of Depreciations Booked: Enter the number of already booked depreciations for an existing asset.
+12. Frequency of Depreciation (Months): The number of months between two depreciations.
+13. Next Depreciation Date: Mention the next depreciation date, even if it is the first one. If the asset is an existing one and depreciation has already been completed, leave it blank.
+
+### Depreciations
+
+The system automatically creates a schedule for depreciation based on depreciation method and other related inputs in the Asset record.
+
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/depreciation-schedule.png">
+
+On the scheduled date, system creates depreciation entry by creating a Journal Entry and the same Journal Entry is updated in the depreciation table for reference. Next Depreciation Date and Current Value are also updated on submission of depreciation entry.
+
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/depreciation-entry.png">
+
+In the depreciation entry, the "Accumulated Depreciation Account" is credited and "Depreciation Expense Account" is debited. The related accounts can be set in the Asset Category or Company.
+
+For better visibility, net value of the asset on different depreciation dates are shown in a line graph.
+
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset-graph.png">
+
+
+## Purchase an Asset
+
+For purchasing a new asset, create and submit the asset record with all the depreciation settings. Then create a Purchase Invoice via "Make Purchase Invoice" button. On clicking the button, system will load a new Purchase Invoice form with pre-loaded items table. It will also set proper fixed asset account (defined in the Asset Category) in the Expense Account field. You need to select Supplier and other necessary details and submit the Purchase Invoice.
+
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset-purchase-invoice.png">
+
+On submission of the invoice, the "Fixed Asset Account" will be debited and payable account will be credited. It also updates purchase date, supplier and Purchase Invoice no. in the Asset master.
+
+
+## Sell an Asset
+
+To sell an asset, open the asset record and create a Sales Invoice by clicking on "Sell Asset". On submission of the Sales Invoice, following entries will take place:
+
+- "Receivable Account" (Debtors) will be debited by the sales amount.
+- "Fixed Asset Account" will be credited by the purchase amount of asset.
+- "Accumulated Depreciation Account" will be debited by the total depreciated amount till now.
+- "Gain/Loss Account on Asset Disposal" will be credited/debited based on gain/loss amount. The Gain/Loss account can be set in Company record.
+
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset-sales.png">
+
+
+## Scrap an Asset
+
+You can scrap an asset anytime using the "Scrap Asset" button in the Asset record. The "Gain/Loss Account on Asset Disposal" mentioned in the Company is debited by the Current Value (After Depreciation) of the asset. After scrapping, you can also restore the asset using "Restore Asset" button.
+
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/scrap-journal-entry.png">
+
+## Asset Movement
+
+The movement of the assets (from one warehouse to another) is also tracked via Asset Movement form.
+
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset-movement.png">
+
+There is also a dedicated button "Transfer Asset" inside the Asset form to track the Asset Movement.
+
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset-movement-using-button.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/customer-portal/index.md b/erpnext/docs/user/manual/en/customer-portal/index.md
index 1dbb140..f620dcb 100644
--- a/erpnext/docs/user/manual/en/customer-portal/index.md
+++ b/erpnext/docs/user/manual/en/customer-portal/index.md
@@ -1,9 +1,8 @@
 # Customer Portal
 
-Customer Portal is designed to give easy accesibility to customers of a
-company.
+Customer Portal is designed to give easy accessibility to customers of a company.
 
-This portal allows customers to login and find out information relevant to them.They can trace communication history of their mails. They can also check order status by logging into the website.
+This portal allows customers to login and find out information relevant to them. The customers can trace the communication history of their mails. They can also check order status by logging into the website.
 
 ### Topics
 
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/field-types.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/field-types.md
index 24cb4ab..c73ebc7 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/field-types.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/field-types.md
@@ -56,6 +56,17 @@
 
 Link field is connected to another master from where it fetches data. For example, in the Quotation master, Customer is a Link field.
 
+- Geolocation
+
+Use Geolocation field to store GeoJSON <a href="https://tools.ietf.org/html/rfc7946#section-3.3">featurecollection</a>. Stores polygons, lines and points. Internally it uses following custom properties for identifying a circle.
+
+```
+{
+	"point_type": "circle",
+	"radius": 10.00
+}
+```
+
 - Password
 
 Password field will have decode value in it.
@@ -84,4 +95,4 @@
 
 Text Editor is text field. It has text-formatting options. In ERPNext, this field is generally used for defining Terms and Conditions.
 
-<!-- markdown -->
\ No newline at end of file
+<!-- markdown -->
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/__init__.py b/erpnext/docs/user/manual/en/education/Assessment/__init__.py
similarity index 100%
rename from erpnext/docs/user/manual/en/schools/Assessment/__init__.py
rename to erpnext/docs/user/manual/en/education/Assessment/__init__.py
diff --git a/erpnext/docs/user/manual/en/education/Assessment/assessment_criteria.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_criteria.md
new file mode 100644
index 0000000..b97cfb1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_criteria.md
@@ -0,0 +1,13 @@
+#Assessment Criteria
+
+Assessment Criteria is the parameter based on which you assess the Student.
+
+<img class="screenshot" alt="Assessment Criteria" src="/docs/assets/img/education/assessment/assessment-criteria.png">
+
+After assessment is conducted for a Course, marks earned are entered based on the Assessment Criteria. For example, if assessment was conducted for science subject, then you can evaluate Student in Science on various criteria like Writing, Practicals, Presentation etc.
+
+Assessment Criteria is be used when scheduling Assessment Plan for Student Group and Course.
+
+<img class="screenshot" alt="Assessment Plan Criteria" src="/docs/assets/img/education/assessment/assessment-plan-criteria.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria_group.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_criteria_group.md
similarity index 100%
rename from erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria_group.md
rename to erpnext/docs/user/manual/en/education/Assessment/assessment_criteria_group.md
diff --git a/erpnext/docs/user/manual/en/education/Assessment/assessment_group.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_group.md
new file mode 100644
index 0000000..ed02a53
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_group.md
@@ -0,0 +1,13 @@
+#Assessment Group
+
+Assessment Group tree is a master where you can define the hierarchy for examination conducted in your education institute.
+
+For example, if you conduct two assessment in a academic year, then setup Assessment Group as following.
+
+<img class="screenshot" alt="Assessment Group Term" src="/docs/assets/img/education/assessment/assessment-group-term.png">
+
+On the same lines, you can also define multiple Assessment Group bases on assessment conducted in your institute.
+
+<img class="screenshot" alt="Assessment Group Term" src="/docs/assets/img/education/assessment/assessment-group-details.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/Assessment/assessment_plan.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_plan.md
new file mode 100644
index 0000000..7272279
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_plan.md
@@ -0,0 +1,19 @@
+#Assessment Plan
+
+To schedule an assessment/examination for a Student Group, for specific Course, create Assessment Plan. In the Assessment Plan, you can also capture details like:
+
+1. Grading Scale based on which grades will be assigned to students.
+
+2. Schedule Date of Assessment
+
+3. Room where assessment will be conducted
+
+4. Examiner and Supervisor
+
+<img class="screenshot" alt="Assessment Plan Details" src="/docs/assets/img/education/assessment/assessment-plan-details.png">
+
+5. Assessment Criteria is list of criteria based which each student in will be evaluated and grades will be assigned.
+
+<img class="screenshot" alt="Assessment Plan Criteria" src="/docs/assets/img/education/assessment/assessment-plan-criteria.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/Assessment/assessment_result.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_result.md
new file mode 100644
index 0000000..ed3e5fb
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_result.md
@@ -0,0 +1,7 @@
+#Assessment Result
+
+Assessment Result is a log of marks/grades earned by the student for specific Assessment. Assessment Result is created in the backend based on the marks entered in the [Assessment Result Tool](/docs/user/manual/en/education/assessment/assessment_result_tool.html).
+
+<img class="screenshot" alt="Assessment Result" src="/docs/assets/img/education/assessment/assessment-result.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/Assessment/assessment_result_tool.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_result_tool.md
new file mode 100644
index 0000000..88b7a7a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_result_tool.md
@@ -0,0 +1,9 @@
+#Assessment Result Tool
+
+Assessment Result Tool help you entering marks earned by the Students for specific course. In this tool, based on the Assessment Plan, all the Student will be fetched into Assessment Result Tool. Also, Columns for Assessment Criteria will be where marks earned can be entered for each Student.
+
+<img class="screenshot" alt="Assessment Result Tool" src="/docs/assets/img/education/assessment/assessment-result-tool.png">
+
+As you go on entering marks for a Student, and switch to next student, in the backend, Student Result record will be auto-created for that Student.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/education/Assessment/grading_scale.md b/erpnext/docs/user/manual/en/education/Assessment/grading_scale.md
new file mode 100644
index 0000000..0ad610b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/Assessment/grading_scale.md
@@ -0,0 +1,7 @@
+#Grading Scale
+
+In the Grading Scale, you can define various grades and threshold for them. Based on the score earned by an Student for an Assessment, Grade will be assigned.
+
+<img class="screenshot" alt="Grading Scale" src="/docs/assets/img/education/assessment/grading-scale.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/index.md b/erpnext/docs/user/manual/en/education/Assessment/index.md
similarity index 100%
rename from erpnext/docs/user/manual/en/schools/Assessment/index.md
rename to erpnext/docs/user/manual/en/education/Assessment/index.md
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/index.txt b/erpnext/docs/user/manual/en/education/Assessment/index.txt
similarity index 100%
rename from erpnext/docs/user/manual/en/schools/Assessment/index.txt
rename to erpnext/docs/user/manual/en/education/Assessment/index.txt
diff --git a/erpnext/docs/user/manual/en/schools/Attendance/__init__.py b/erpnext/docs/user/manual/en/education/Attendance/__init__.py
similarity index 100%
rename from erpnext/docs/user/manual/en/schools/Attendance/__init__.py
rename to erpnext/docs/user/manual/en/education/Attendance/__init__.py
diff --git a/erpnext/docs/user/manual/en/schools/Attendance/index.md b/erpnext/docs/user/manual/en/education/Attendance/index.md
similarity index 100%
rename from erpnext/docs/user/manual/en/schools/Attendance/index.md
rename to erpnext/docs/user/manual/en/education/Attendance/index.md
diff --git a/erpnext/docs/user/manual/en/schools/Attendance/index.txt b/erpnext/docs/user/manual/en/education/Attendance/index.txt
similarity index 100%
rename from erpnext/docs/user/manual/en/schools/Attendance/index.txt
rename to erpnext/docs/user/manual/en/education/Attendance/index.txt
diff --git a/erpnext/docs/user/manual/en/education/Attendance/student-attendance-tool.md b/erpnext/docs/user/manual/en/education/Attendance/student-attendance-tool.md
new file mode 100644
index 0000000..fac9d6e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/Attendance/student-attendance-tool.md
@@ -0,0 +1,15 @@
+# Student Attendance Tool
+
+The Student Attendance tool allow you to bulk update the attendance for students based on **Student Group and Course Schedule**.
+
+To mark the **Attedance* based on Student Group select the group based on 
+
+**1. Batch
+  2. Course
+  3. Activity **
+
+Student detials will be autofetched and you can mark the attendance of the given date. 
+
+<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/education/setup/student-attendance-tool.gif">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/Attendance/student-attendance.md b/erpnext/docs/user/manual/en/education/Attendance/student-attendance.md
new file mode 100644
index 0000000..4be2831
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/Attendance/student-attendance.md
@@ -0,0 +1,15 @@
+# Student Attendance
+
+Attendance doctype allows you to track and manage attendance of a student in all the days at any time. The Attendance module is designed to help teachers easily mark student attendance during class. 
+
+Attendance Records can be created against Student on daily basis.
+
+To create Attendance record :
+
+Select the **Student, Course Schedule and Student Group** for which attendance is to be marked for the given date. Set the Status to Present/Absent and save. 
+
+<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/education/schedule/student-attendance.gif">
+
+**Student Attendance tool** can be used for bulk updation of the attendance based on **Batch, Course or Activity**.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/Attendance/student-leave-application.md b/erpnext/docs/user/manual/en/education/Attendance/student-leave-application.md
new file mode 100644
index 0000000..e22c6e9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/Attendance/student-leave-application.md
@@ -0,0 +1,13 @@
+#Student Leave Application 
+
+ERPNext allows you to record the leave application for a student. 
+
+To create a Student Leave application record, enter the Student and the date for the leave is applied and save.
+
+<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/education/schedule/student-leave-application.gif">
+
+Incase the student is not attending the institute in order to participate or represent institute in any event, he/she can be mark as present from the Leave Application itself. 
+
+Once a Leave Application is recorded for a student it will not be recorded in the absent student report as he has applied for a leave. 
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/__init__.py b/erpnext/docs/user/manual/en/education/__init__.py
similarity index 100%
rename from erpnext/docs/user/manual/en/schools/__init__.py
rename to erpnext/docs/user/manual/en/education/__init__.py
diff --git a/erpnext/docs/user/manual/en/schools/admission/__init__.py b/erpnext/docs/user/manual/en/education/admission/__init__.py
similarity index 100%
rename from erpnext/docs/user/manual/en/schools/admission/__init__.py
rename to erpnext/docs/user/manual/en/education/admission/__init__.py
diff --git a/erpnext/docs/user/manual/en/schools/admission/index.md b/erpnext/docs/user/manual/en/education/admission/index.md
similarity index 100%
rename from erpnext/docs/user/manual/en/schools/admission/index.md
rename to erpnext/docs/user/manual/en/education/admission/index.md
diff --git a/erpnext/docs/user/manual/en/schools/admission/index.txt b/erpnext/docs/user/manual/en/education/admission/index.txt
similarity index 100%
rename from erpnext/docs/user/manual/en/schools/admission/index.txt
rename to erpnext/docs/user/manual/en/education/admission/index.txt
diff --git a/erpnext/docs/user/manual/en/education/admission/program-enrollment-tool.md b/erpnext/docs/user/manual/en/education/admission/program-enrollment-tool.md
new file mode 100644
index 0000000..53d9d9c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/admission/program-enrollment-tool.md
@@ -0,0 +1,16 @@
+# Program Enrollment Tool
+
+The Program Enrollment tool allows the bulk enrollment of the **Student Applicants** in a Program. 
+
+
+You can create the the Program Enrollment for :
+
+1. **Student Applicants** >> List of Student Applicants will be fetched for the selected **Program** and **Academic year**.
+
+<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/program-enrollment-tool.gif">
+
+2. **Program Enrollment** >> You can bulk update the **Program** for the students from one academic year to another in the same **Program** or a new **Program**.
+
+<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/program-enrollment-tool01.gif">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/admission/program-enrollment.md b/erpnext/docs/user/manual/en/education/admission/program-enrollment.md
new file mode 100644
index 0000000..0bf16df
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/admission/program-enrollment.md
@@ -0,0 +1,12 @@
+# Program Enrollment
+
+Program Enrollment describes an educational model where students must complete a  defined set of courses towards their academic objective in a specified sequence. Enrollment is a program driven process in which the student select the Program to enrol for in a Academic Year. 
+
+Once a student have applied for the **Program** and the application is approved, the program enrollment is done for that student. 
+
+<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/program-enrollment.gif">
+
+- A student can be enrolled in multiple Course for a program in a given academeic year. 
+- Based on the Fee structure selected at the time of enrollment Fee detials are created of the student.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/education/admission/student-applicant.md b/erpnext/docs/user/manual/en/education/admission/student-applicant.md
new file mode 100644
index 0000000..121844c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/admission/student-applicant.md
@@ -0,0 +1,30 @@
+# Student Applicant
+
+A Student Applicant record needs to be created when a student applies for a program at your institute.
+You can Approve or Reject a student applicant. By accepting a student applicant you can add them to the student master.
+
+<img class="screenshot" alt="Student Applicant" src="/docs/assets/img/education/admission/student-applicant.png">
+
+### Application Status
+
+- By default when a student applicant is created in the system, the application status is set to 'Applied'
+
+- You can update the status to 'Approved' once you approve the applicant to join your institute.
+
+- Once the application status is set to 'Approved', the 'Enroll' button should show up. 
+	You can create a student record against the student applicant and enroll them to a program by clicking on this button.
+	
+- Once a student is created against the student applicant, the system shall set the application status to 'Admitted' 
+	and will not allow you to change the application status unless the student record is deleted.
+
+### Student Enrollment
+Once the form is submitted you can either approve or reject the application form.
+
+<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/student-application-actions.png">
+
+Once you approve a Student Applicant you can enroll them to a program. When you click the 'Enroll' buttom,
+the system shall create a student against that applicant and redirect you to the [Program Enrollment form](/docs/user/manual/en/education/student/program-enrollment.html).
+
+<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/student-applicant-enroll.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/education/admission/student_admission.md b/erpnext/docs/user/manual/en/education/admission/student_admission.md
new file mode 100644
index 0000000..f2b8ef6
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/admission/student_admission.md
@@ -0,0 +1,14 @@
+# Student Admission
+
+The admission process begins with filling the admission form. The Student Admission record enables to initiate your admission process for a given **Academic year**. ERPNext admission module allows you to create an admission record which can be then published on the ERPNext generate website.
+
+To create a Student Admission record  go to :
+
+**education** >> **Admissions** >> **Student Admission** >>
+
+
+<img class="screenshot" alt="Student Applicant" src="/docs/assets/img/education/admission/student-admission.gif">
+
+Once an admission record is created, the age eligibility criteria can be determined for the every program. Similarly, you can also determine the application fee and naming series for every student applicant. If you keep the naming series blank then the default naming series will be applied for every student applicant.
+
+The information provided in the Student Admission records will be used for the validation and creation of the Student Admission records (only if student admission link is filled there)
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/fees/__init__.py b/erpnext/docs/user/manual/en/education/fees/__init__.py
similarity index 100%
rename from erpnext/docs/user/manual/en/schools/fees/__init__.py
rename to erpnext/docs/user/manual/en/education/fees/__init__.py
diff --git a/erpnext/docs/user/manual/en/education/fees/fee-category.md b/erpnext/docs/user/manual/en/education/fees/fee-category.md
new file mode 100644
index 0000000..8a4822f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/fees/fee-category.md
@@ -0,0 +1,7 @@
+# Fee Category
+
+List of all different type of fees collected.
+
+<img class="screenshot" alt="Fees Category" src="/docs/assets/img/education/fees/fee-category.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/fees/fee-structure.md b/erpnext/docs/user/manual/en/education/fees/fee-structure.md
new file mode 100644
index 0000000..2131c4a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/fees/fee-structure.md
@@ -0,0 +1,23 @@
+# Fee Structure
+
+A Fee Structure is a template that can be used while making Fees records or generating them via the Fee Schedule. In the Accounts section, you can set also the different accounts as for the Fees is an accounting transaction.
+
+You can create the Fee Structure directly from 
+
+> Education > Fees > Fee Structure > New Fee Structure
+
+or you can create the Fee Structure from Program also.
+
+<img class="screenshot" alt="Fees Structure" src="/docs/assets/img/education/fees/fee-structure.png">
+
+#### Academic Year Impact
+
+If the Fee amount doesn't change every academic year then Fee Structure can be created without the Acadamic year. In doing so, the same Fee Structure can be used every academic year until the Fees for that particular program doesn't change. Still you can set the academic year and term while creating the Fees or Fee Schedule records.
+
+#### Accounting Impact
+
+You can set the "Income Account" and "Receivable Account" in the Accounts section which refers to an Account of you [Chart of Accounts](/docs/user/manual/en/accounts/chart-of-accounts.md). You must also mention the Cost Center in which your income will be booked.
+
+If you are going to use this in the Fee Schedule, you must select the Accounts carefully as Fee Schedule updates the respected Accounts in bulk. 
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/fees/fees.md b/erpnext/docs/user/manual/en/education/fees/fees.md
new file mode 100644
index 0000000..5e0c126
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/fees/fees.md
@@ -0,0 +1,8 @@
+# Fees
+
+Maintain a record of fees collected from students.
+The [Fee Structure](/docs/user/manual/en/education/fees/fee-structure.html) is fetched based on the selected Program and Academic Term.
+
+<img class="screenshot" alt="Fees" src="/docs/assets/img/education/fees/fees.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/fees/index.md b/erpnext/docs/user/manual/en/education/fees/index.md
new file mode 100644
index 0000000..d0ccb94
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/fees/index.md
@@ -0,0 +1,9 @@
+# Fees
+
+This section contains 'Fee' related documents.
+
+<img class="screenshot" alt="Fees Section" src="/docs/assets/img/education/fees/fees-section.png">
+
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/fees/index.txt b/erpnext/docs/user/manual/en/education/fees/index.txt
similarity index 100%
rename from erpnext/docs/user/manual/en/schools/fees/index.txt
rename to erpnext/docs/user/manual/en/education/fees/index.txt
diff --git a/erpnext/docs/user/manual/en/education/index.md b/erpnext/docs/user/manual/en/education/index.md
new file mode 100644
index 0000000..36c6bbd
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/index.md
@@ -0,0 +1,8 @@
+# Education
+
+
+The Education Domain in ERPNext is designed to meet requirements of any educational Institute whether that is a school, college or any other private firm. ERPNext provides a centralized system, which can be used to maintain and update all the activities related to an Institution. It will provide a complete package for every funcationality required in any institute like Online Admission, Fees, Attendance, Examination.
+
+<img class="screenshot" alt="Fees Section" src="/docs/assets/img/education/module.png">
+
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/index.txt b/erpnext/docs/user/manual/en/education/index.txt
similarity index 100%
rename from erpnext/docs/user/manual/en/schools/index.txt
rename to erpnext/docs/user/manual/en/education/index.txt
diff --git a/erpnext/docs/user/manual/en/schools/schedule/__init__.py b/erpnext/docs/user/manual/en/education/schedule/__init__.py
similarity index 100%
rename from erpnext/docs/user/manual/en/schools/schedule/__init__.py
rename to erpnext/docs/user/manual/en/education/schedule/__init__.py
diff --git a/erpnext/docs/user/manual/en/education/schedule/course-schedule.md b/erpnext/docs/user/manual/en/education/schedule/course-schedule.md
new file mode 100644
index 0000000..f5134d5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/schedule/course-schedule.md
@@ -0,0 +1,25 @@
+# Course Schedule
+
+Course Schedule is the schedule of a session conducted by an Instructor for a particular Course.
+You can see the overall course schedule in the Calendar view.
+
+<img class="screenshot" alt="Course Schedule" src="/docs/assets/img/education/schedule/course-schedule.png">
+
+### Marking Attendance
+
+You can mark attendance for a Student Group against a Course Schedule.
+
+<img class="screenshot" alt="Course Schedule Attendance" src="/docs/assets/img/education/schedule/course-schedule-att.png">
+
+- To make attendance, expand the attendance section.
+- Check the students who were present for that session.
+- Click on 'Mark Attendance'. The system will create the Attendance records.
+
+###View Attendance
+
+Once you have marked Attendance against a Course Schedule the Attendance section in the Course Schedule shall be hidden. 
+A View Attendance button shall appear. Click on that button to view all attendance records created against that Course Schedule.
+
+<img class="screenshot" alt="Course Schedule Attendance" src="/docs/assets/img/education/schedule/course-schedule-att-1.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/schedule/examination.md b/erpnext/docs/user/manual/en/education/schedule/examination.md
new file mode 100644
index 0000000..d21d204
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/schedule/examination.md
@@ -0,0 +1,8 @@
+# Examination
+
+The Examination record can be used to track the exam schedule and the results of that exam.
+
+<img class="screenshot" alt="Examination" src="/docs/assets/img/education/schedule/examination.png">
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/schedule/index.md b/erpnext/docs/user/manual/en/education/schedule/index.md
new file mode 100644
index 0000000..247b0b8
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/schedule/index.md
@@ -0,0 +1,7 @@
+# Schedule
+
+<img class="screenshot" alt="Schedule Section" src="/docs/assets/img/education/schedule/schedule-section.png">
+
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/schedule/index.txt b/erpnext/docs/user/manual/en/education/schedule/index.txt
similarity index 100%
rename from erpnext/docs/user/manual/en/schools/schedule/index.txt
rename to erpnext/docs/user/manual/en/education/schedule/index.txt
diff --git a/erpnext/docs/user/manual/en/education/schedule/scheduling-tool.md b/erpnext/docs/user/manual/en/education/schedule/scheduling-tool.md
new file mode 100644
index 0000000..08a7fa9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/schedule/scheduling-tool.md
@@ -0,0 +1,23 @@
+# Scheduling Tool
+
+This tool can be used to create 'Course Schedules'. 
+
+<img class="screenshot" alt="Scheduling Tool" src="/docs/assets/img/education/schedule/scheduling-tool.png">
+
+### Creating Course Schedules
+
+- Select Student Group for which you need to create Course Schedules.
+- Select Course, Room and Instructor for Course Schedules.
+- Enter From Time and To Time for Course Schedule.
+- Enter Start Date and End Date of the Course (Course Schedules will be created within this date range)
+- Enter Day of the week on which you want to schedule the Course.
+- Click on the 'Schedule Course' button
+- The system will create Course Schedules if the Room and Instructor are available and there is no conflict for the selected Student Group with other Course Schedules.
+
+###Rescheduling
+
+- If you wish to reschedule Course Schedules created against a Course, follow the instructions for creating course schedules
+- Check the 'Reschedule' checkbox and then click 'Schedule Course' button.
+- System will delete existing Course Schedules for specified Course within the mentioned Course Start Date and Course End Date and crate new Course Schedules.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/schools/setup/__init__.py b/erpnext/docs/user/manual/en/education/setup/__init__.py
similarity index 100%
rename from erpnext/docs/user/manual/en/schools/setup/__init__.py
rename to erpnext/docs/user/manual/en/education/setup/__init__.py
diff --git a/erpnext/docs/user/manual/en/education/setup/academic-term.md b/erpnext/docs/user/manual/en/education/setup/academic-term.md
new file mode 100644
index 0000000..d264dca
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/setup/academic-term.md
@@ -0,0 +1,10 @@
+# Academic Term
+
+An academic term (or simply "term") is a portion of an academic year, the time during which an educational institution holds classes. The schedules adopted vary widely. The academic term can be a quater, trimester or a semester.
+
+The **Academic term** form in ERPNext enables you to create academic terms within in a year. Based on the term schedule enter the start and end date for the schedule and generate the term for a Academic year.
+
+<img class="screenshot" alt="Academic Term" src="/docs/assets/img/education/setup/academic-term.png">
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/setup/academic-year.md b/erpnext/docs/user/manual/en/education/setup/academic-year.md
new file mode 100644
index 0000000..c9ea521
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/setup/academic-year.md
@@ -0,0 +1,11 @@
+# Academic Year
+
+An academic year is a period of time which education, colleges and universities use to measure a quantity of study.
+
+The **Academic year** form have the Start and End date for the Academic year.
+
+<img class="screenshot" alt="Academic Year" src="/docs/assets/img/education/setup/academic-year.png">
+
+**Student group** link is given to view or add the respective groups to the Academic year.
+
+{next} 
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/setup/course.md b/erpnext/docs/user/manual/en/education/setup/course.md
new file mode 100644
index 0000000..0d6e5ac
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/setup/course.md
@@ -0,0 +1,15 @@
+# Course
+
+ A course is a unit of teaching that typically lasts one academic term, is led by one or more instructors (teachers or professors), and has a fixed number of students. Students may receive a grade and academic credit after completion of the course.
+
+To create a **Course** enter the Course name and Code. Code for the course should be unique for every course. You can also link the department under which the course is conducted.
+
+<img class="screenshot" alt="Course" src="/docs/assets/img/education/setup/course.png">
+
+Once a **Course** is created, a course schedule can defined for the same.
+
+<img class="screenshot" alt="Course" src="/docs/assets/img/education/setup/Course.gif">
+
+The Course form is further linked to **Program, Student Group and Assessment Plan** doctypes. The links allow to view/create the related documents for a **Course**.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/setup/index.md b/erpnext/docs/user/manual/en/education/setup/index.md
new file mode 100644
index 0000000..1062c3a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/setup/index.md
@@ -0,0 +1,9 @@
+# Setup
+
+The Setup section of education module provides facility to make some basic configuration. Below are doctypes for basic configuration.
+
+<img class="screenshot" alt="Setup Section" src="/docs/assets/img/education/setup/setup-section.png">
+
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/setup/index.txt b/erpnext/docs/user/manual/en/education/setup/index.txt
new file mode 100644
index 0000000..9f88c5d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/setup/index.txt
@@ -0,0 +1,9 @@
+course
+program
+instructor
+room
+student-category
+student-batch-name
+academic-term
+academic-year
+education-settings
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/setup/instructor.md b/erpnext/docs/user/manual/en/education/setup/instructor.md
new file mode 100644
index 0000000..2b53ce1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/setup/instructor.md
@@ -0,0 +1,18 @@
+# Instructor
+
+An instructoe is a teacher, or professor, of a specialised subject that involves skill. 
+
+You can create an Instructor and link it to the Employee master and a Departmemt.
+
+<img class="screenshot" alt="Instructor" src="/docs/assets/img/education/setup/instructor.png">
+
+An **Instructor** is further linked to a **Course Schedule**, where you can define the schedule for a **Course** for a give date and **Room no**.
+
+<img class="screenshot" alt="Instructor" src="/docs/assets/img/education/setup/instructor.gif">
+It is also linked to **Student group** where an **Instructor** is assigned to the Student group.
+
+<img class="screenshot" alt="Instructor" src="/docs/assets/img/education/setup/student-group-instructor.gif">
+
+An **Instructor** is also linked to an **Assesment Plan** for a Student group. The Instructor can be an Examiner or the supervisor for the assesment. 
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/setup/program.md b/erpnext/docs/user/manual/en/education/setup/program.md
new file mode 100644
index 0000000..25e390e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/setup/program.md
@@ -0,0 +1,19 @@
+# Program
+
+An educational program is a program written by the institutions which determines the learning progress of each subject in all the stages of formal education.
+
+To create a Program go to :
+
+###education >> Setup >> Program >> New Program
+
+Enter a unique code for every **Program**. You can also link the **Program** to the department under which it is conducted.
+
+<img class="screenshot" alt="Program" src="/docs/assets/img/education/setup/program.png">
+
+Add the relevant Course and the Fee details for a program. 
+
+<img class="screenshot" alt="Program" src="/docs/assets/img/education/setup/course-fee-program.png">
+
+The Program Doctype is further linked to the **Student applicant**, **Program enrollment, Student group, Fee structre and Fee**. The links allow to view or create the related document for a Program.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/setup/room.md b/erpnext/docs/user/manual/en/education/setup/room.md
new file mode 100644
index 0000000..6a1f32e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/setup/room.md
@@ -0,0 +1,17 @@
+# Room
+
+A classroom is a space (room or lab) where you want to schedule courses or examinations. A room in an educational institute can be a Class room, a laboratory or a Examination hall.
+
+The Room doctype allows you to record the room number and the seating capacity for a classroom. Once a room is created Course schedule link is provided in the Room doctype to view or add the course schedule for the classroom. 
+
+<img class="screenshot" alt="Room" src="/docs/assets/img/education/setup/room.png">
+
+The course schedule validate the availability of the Room number and an alert message is shown if there is an overlap for the Room number for a given time slot.
+
+<img class="screenshot" alt="Room" src="/docs/assets/img/education/setup/Course-schedule-error.png">
+
+The Room number is further linked to the Assesment plan. It validates the availability of examination room for the assessment to be held for a given date and time.
+
+<img class="screenshot" alt="Room" src="/docs/assets/img/education/setup/Room-Assesment-plan.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/setup/school-settings.md b/erpnext/docs/user/manual/en/education/setup/school-settings.md
new file mode 100644
index 0000000..44f9c44
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/setup/school-settings.md
@@ -0,0 +1,15 @@
+# Education Settings
+
+The Education Settings page allow you to setup basic settings like **Academic Year and Term** for the educational setup. 
+
+<img class="screenshot" alt="Student" src="/docs/assets/img/education/student/education.png">
+
+The checkbox to Validate Batch for Students in Student Group enables the Student Batch validation for every Student from the Program Enrollment for the **Batch** based on **Student Group** 
+
+<img class="screenshot" alt="Student" src="/docs/assets/img/education/student/student-batch-validation.gif">
+
+You can enable the validation of Course for every Student from the enrolled Courses in Program Enrollment,for Course based Student Group by checking the settings for **Validate Enrolled Course for Students in Student Group**
+
+<img class="screenshot" alt="Student" src="/docs/assets/img/education/student/student-course-validation.gif">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/setup/student-batch-name.md b/erpnext/docs/user/manual/en/education/setup/student-batch-name.md
new file mode 100644
index 0000000..3b5ad41
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/setup/student-batch-name.md
@@ -0,0 +1,10 @@
+# Student Batch
+
+Student batch is a collection of students from Student Groups. **Student batch** allows you to create **Student Group** based on a batch. When a student is enrolled for a **Program**, the Student batch is selected to enroll the student for the given Program and batch 
+
+<img class="screenshot" alt="Student" src="/docs/assets/img/education/student/student-batch.gif">
+
+You can also get a **Student Batch-Wise Attendance** report to view the number of student present from the Batch.
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/education/setup/student-category.md b/erpnext/docs/user/manual/en/education/setup/student-category.md
new file mode 100644
index 0000000..cb5cbea
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/setup/student-category.md
@@ -0,0 +1,12 @@
+# Student Category
+
+Student Category doctype allow you to classify student based various categories. In Institutions, there may be fee concession for some categories such as Handicapped students, foreign, nationals, reserved category by the government etc.
+
+To create Student category go to Setup >> Student Category >> New.
+
+We can create new student category by adding a name and save it
+
+<img class="screenshot" alt="Student" src="/docs/assets/img/education/student/student-category.gif">
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/student/__init__.py b/erpnext/docs/user/manual/en/education/student/__init__.py
similarity index 100%
rename from erpnext/docs/user/manual/en/schools/student/__init__.py
rename to erpnext/docs/user/manual/en/education/student/__init__.py
diff --git a/erpnext/docs/user/manual/en/education/student/guardian.md b/erpnext/docs/user/manual/en/education/student/guardian.md
new file mode 100644
index 0000000..ca34e8b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/student/guardian.md
@@ -0,0 +1,9 @@
+#Guardian
+
+The Guardian doctype allows you to record the guardian details for a **Student**.
+
+<img class="screenshot" alt="Student" src="/docs/assets/img/education/student/guardian.png">
+
+The email id added in the **Guardian** detail can be linked to a email group for sending newsletter or announcements.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/student/index.md b/erpnext/docs/user/manual/en/education/student/index.md
similarity index 100%
rename from erpnext/docs/user/manual/en/schools/student/index.md
rename to erpnext/docs/user/manual/en/education/student/index.md
diff --git a/erpnext/docs/user/manual/en/schools/student/index.txt b/erpnext/docs/user/manual/en/education/student/index.txt
similarity index 100%
rename from erpnext/docs/user/manual/en/schools/student/index.txt
rename to erpnext/docs/user/manual/en/education/student/index.txt
diff --git a/erpnext/docs/user/manual/en/education/student/student-batch.md b/erpnext/docs/user/manual/en/education/student/student-batch.md
new file mode 100644
index 0000000..3b5ad41
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/student/student-batch.md
@@ -0,0 +1,10 @@
+# Student Batch
+
+Student batch is a collection of students from Student Groups. **Student batch** allows you to create **Student Group** based on a batch. When a student is enrolled for a **Program**, the Student batch is selected to enroll the student for the given Program and batch 
+
+<img class="screenshot" alt="Student" src="/docs/assets/img/education/student/student-batch.gif">
+
+You can also get a **Student Batch-Wise Attendance** report to view the number of student present from the Batch.
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/education/student/student-group-creation-tool.md b/erpnext/docs/user/manual/en/education/student/student-group-creation-tool.md
new file mode 100644
index 0000000..aeedd97
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/student/student-group-creation-tool.md
@@ -0,0 +1,17 @@
+# Student Group Creation Tool
+
+The Student group creation tool allows you to create student groups in bulk. 
+
+To create Student group using this tool go to 
+
+##education >>Student >> Student Group creation tool
+
+Select the **Academic Term** and the **Program** for which a student group is to be created. 
+
+<img class="screenshot" alt="Student Group Creation Tool" src="/docs/assets/img/education/student/student-group-creation-tool.gif">
+
+By default the student group is created based on the **Course** only. The check box for "Separate course based Group for every Batch" allows you to create batchwise Student groups for a course.
+
+You can leave it unchecked if you don't want to consider batch while making course based groups.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/student/student-group.md b/erpnext/docs/user/manual/en/education/student/student-group.md
new file mode 100644
index 0000000..467fb3e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/student/student-group.md
@@ -0,0 +1,22 @@
+# Student Group
+
+A student group is a collection of students taking same course. You can create Course Schedules and Examinations against a Student Group.
+
+A Student Group needs to be created for every course for **Academic Term** and **Academic Year**. The student group can be create based on **Batch, Course and Activity**. 
+
+To create a Student Group go to:
+
+education >> Student >> New Student Group 
+
+<img class="screenshot" alt="Student Group" src="/docs/assets/img/education/student/Student-group.gif">
+
+To create a Student group based on **Batch**, select the **Progam** and **Batch**, where as to create a Student group based on **Course**, you will only have to select the Course Code. Creating a student group based on activity allows you to group of student for events and activities happening in the institute. 
+
+Once a student group is created you can mark attendance for the group. 
+
+<img class="screenshot" alt="Student Group" src="/docs/assets/img/education/student/student-group-attendance.gif">
+
+You can also update the **Email Group** for the Student Group. Click on Update Email Group to add all the email ids of the gaurdians in the respective email group and **Newsletter** can be created and sent to the Email group.
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/student/student-log.md b/erpnext/docs/user/manual/en/education/student/student-log.md
new file mode 100644
index 0000000..5c113e4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/student/student-log.md
@@ -0,0 +1,9 @@
+# Student Log
+
+The Student log Doctype enables you to add and edit addtional information for a student.
+You can make a note of student activities using Student log.
+Logs can be categorised as 'General', 'Academic', 'Medical' or 'Achievement'
+
+<img class="screenshot" alt="Student" src="/docs/assets/img/education/student/student-log.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/education/student/student.md b/erpnext/docs/user/manual/en/education/student/student.md
new file mode 100644
index 0000000..fce5d7b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/education/student/student.md
@@ -0,0 +1,12 @@
+# Student
+
+A Student is a person who has enrolled at your institute and you have accepted their application.
+The Student doctype maintains detials like personal information, date of birth, address etc. It also records the **Guardian** and sibling details. 
+
+<img class="screenshot" alt="Student" src="/docs/assets/img/education/student/student.png">
+The student is enrolled in a **Program** when the application is approved. Once the enrollement is done the **Student Applicant** status is update to Admitted.
+
+You can view every doctype created for a particular student. Eg : Fees, Student Group, etc
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/index.txt b/erpnext/docs/user/manual/en/index.txt
index 712ab8e..34bb24e 100644
--- a/erpnext/docs/user/manual/en/index.txt
+++ b/erpnext/docs/user/manual/en/index.txt
@@ -15,3 +15,4 @@
 using-erpnext
 regional
 customize-erpnext
+education
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/__init__.py b/erpnext/docs/user/manual/en/non_profit/Chapter/__init__.py
similarity index 100%
copy from erpnext/docs/user/manual/en/schools/Assessment/__init__.py
copy to erpnext/docs/user/manual/en/non_profit/Chapter/__init__.py
diff --git a/erpnext/docs/user/manual/en/non_profit/Chapter/chapter.md b/erpnext/docs/user/manual/en/non_profit/Chapter/chapter.md
new file mode 100644
index 0000000..0078f6c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/non_profit/Chapter/chapter.md
@@ -0,0 +1,27 @@
+#Chapter
+
+The Chapter doctype allows you to record the Chapter details.
+
+Chapter Head or System User can create Chapter.
+
+To Create Chapter:
+
+> Non Profit > Chapter > New
+
+<img class="screenshot" alt="Chapter" src="/docs/assets/img/non_profit/chapter/chapter.png">
+
+System User or Chapter Head can add chapter Member directly from the desk or
+User can join directly by visiting chapter page on website
+
+to join chapter online
+
+> My Account on website > Chapter from sidebar > Select Available chapter and click on join chapter button
+
+<img class="screenshot" alt="online Chapter" src="/docs/assets/img/non_profit/chapter/online_chapter.png">
+
+<img class="screenshot" alt="online Chapter" src="/docs/assets/img/non_profit/chapter/online_chapter_join.png">
+
+
+To leave chapter click on leave chapter button
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/non_profit/Chapter/index.md b/erpnext/docs/user/manual/en/non_profit/Chapter/index.md
new file mode 100644
index 0000000..1c5e132
--- /dev/null
+++ b/erpnext/docs/user/manual/en/non_profit/Chapter/index.md
@@ -0,0 +1,10 @@
+# Chapter
+
+This section contains Chapter related documents.
+
+Chapter doctype is for people to organize or join offline group meetings in various cities around the world. user/members can find and join groups with a common interest.
+
+
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/non_profit/Chapter/index.txt b/erpnext/docs/user/manual/en/non_profit/Chapter/index.txt
new file mode 100644
index 0000000..9eb7bdd
--- /dev/null
+++ b/erpnext/docs/user/manual/en/non_profit/Chapter/index.txt
@@ -0,0 +1 @@
+chapter
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/__init__.py b/erpnext/docs/user/manual/en/non_profit/Donor/__init__.py
similarity index 100%
copy from erpnext/docs/user/manual/en/schools/__init__.py
copy to erpnext/docs/user/manual/en/non_profit/Donor/__init__.py
diff --git a/erpnext/docs/user/manual/en/non_profit/Donor/donor.md b/erpnext/docs/user/manual/en/non_profit/Donor/donor.md
new file mode 100644
index 0000000..7958755
--- /dev/null
+++ b/erpnext/docs/user/manual/en/non_profit/Donor/donor.md
@@ -0,0 +1,21 @@
+#Donor
+
+The Donor doctype allows you to record the Donor details.
+
+Donor are simply contacts in your ERPNext database with one or more Donation. The contact may be an individual, a household, an organisation, or some other contact sub-type, but it is always a contact to which a donation is applied.
+
+To create new Donor go to:
+
+> Non Profit > Donor > New
+
+<img class="screenshot" alt="Student" src="/docs/assets/img/non_profit/donor/donor.png">
+
+**Email:** Email field is the id of Member doctype.
+
+**Donor Type:** DonorType is link field to Donor Type Doctype. Member can select Available Doctype.
+
+**Address and Contact Section:** This Section linked to address and contact doctypes.
+
+**Accounting Section:** This section allowed to set member accounting details such as Account Receivable.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/non_profit/Donor/donor_type.md b/erpnext/docs/user/manual/en/non_profit/Donor/donor_type.md
new file mode 100644
index 0000000..ba74c17
--- /dev/null
+++ b/erpnext/docs/user/manual/en/non_profit/Donor/donor_type.md
@@ -0,0 +1,17 @@
+#Donor Type
+
+The Donor Type doctype allows you to Create different Donor Profile for the Donor.
+
+Donor Types are a basic building block for Donor and contribution management. Typically an organization will set up a donor type for each of the different donation that they offer. For example, an organisation may define three donation types for 'regular', 'Organization', and 'honorary' donor.
+
+In this chapter we will cover the most common set-up for donor types.
+
+To create new donor Type go to:
+
+> Non Profit > Donor Type > New
+
+<img class="screenshot" alt="donor type" src="/docs/assets/img/non_profit/donor/donor_type.png">
+
+**Donor Type:** The Donor Type is displayed throughout the system, on both public and backend pages so spend some time thinking about a donor type name that is appropriate to both audiences. It can be changed at a later date
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/non_profit/Donor/index.md b/erpnext/docs/user/manual/en/non_profit/Donor/index.md
new file mode 100644
index 0000000..9b7b14f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/non_profit/Donor/index.md
@@ -0,0 +1,9 @@
+# Donor
+
+This section contains Donors and Donors Contribution related documents.
+
+A donor in general is a person, organization or government who donates something voluntarily. The term is usually used to represent a form of pure altruism but sometimes used when the payment for a service is recognized by all parties as representing less than the value of the donation and that the motivation is altruistic. In business law, a donor is someone who is giving the gift (law), and a donee the person receiving the gift.
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/non_profit/Donor/index.txt b/erpnext/docs/user/manual/en/non_profit/Donor/index.txt
new file mode 100644
index 0000000..7f36f92
--- /dev/null
+++ b/erpnext/docs/user/manual/en/non_profit/Donor/index.txt
@@ -0,0 +1,2 @@
+donor_type
+donor
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/admission/__init__.py b/erpnext/docs/user/manual/en/non_profit/Grant Application/__init__.py
similarity index 100%
copy from erpnext/docs/user/manual/en/schools/admission/__init__.py
copy to erpnext/docs/user/manual/en/non_profit/Grant Application/__init__.py
diff --git a/erpnext/docs/user/manual/en/non_profit/Grant Application/grant_application.md b/erpnext/docs/user/manual/en/non_profit/Grant Application/grant_application.md
new file mode 100644
index 0000000..3b07d35
--- /dev/null
+++ b/erpnext/docs/user/manual/en/non_profit/Grant Application/grant_application.md
@@ -0,0 +1,43 @@
+#Grant Application
+
+The Grant Application doctype allows you to record the Grant Applicants details.
+
+To Generate Online Grant Application go to:
+
+> My Account on website > Grant Application from sidebar > Apply for new Grant Application.
+
+
+<img class="screenshot" alt="Online Grant Application row" src="/docs/assets/img/non_profit/grant_application/grant_application_row.png">
+
+<img class="screenshot" alt="Online Grant Application" src="/docs/assets/img/non_profit/grant_application/online_grant_application_1.png">
+
+<img class="screenshot" alt="Online Grant Application" src="/docs/assets/img/non_profit/grant_application/grant_portal.png">
+
+
+To Generate Grant Application go to:
+
+> Non Profit > Grant Application > New.
+
+
+<img class="screenshot" alt="Grant Application" src="/docs/assets/img/non_profit/grant_application/grant_application.png">
+
+
+**Email:** Email is a mandatory field.
+
+**Organization:** Organization is data field contain organizaion name set as name field in erpnext.
+
+
+**Address and Contact Section:** This Section linked to address and contact doctypes.
+
+**Grant Application Details Section:** This section contains information about grant description.
+
+**Amount:** Amount field describe requested amount by an applicant.
+
+**Route:** Route field leave blank it will automatically create route path grant-application/organization_name
+
+**Assessment Result Section:** In This section when status field selected as received, send Grant Review Email button appear on the top right corner which sends grant URL to Assessment Manager.
+
+After reviewing grant. Grant Assessment Manager scale application at 0 - 9 point and left a note about a grant.
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/non_profit/Grant Application/index.md b/erpnext/docs/user/manual/en/non_profit/Grant Application/index.md
new file mode 100644
index 0000000..a665440
--- /dev/null
+++ b/erpnext/docs/user/manual/en/non_profit/Grant Application/index.md
@@ -0,0 +1,16 @@
+# Grant Application
+
+Grant Application is designed to be used by organisations that distribute funds to others, for example grant seeker, etc.
+
+Grants are non-repayable funds or products disbursed or gifted by one party (grantmakers), often a government department, corporation, foundation or trust, to a recipient, often (but not always) a nonprofit entity, educational institution, business or an individual. In order to receive a grant, some form of "Grant Writing" often referred to as either a proposal or an application is required.
+
+Most grants are made to fund a specific project and require some level of compliance and reporting.
+
+The grant writing process involves an applicant submitting a proposal (or submission) to a potential funder, either on the applicant's own initiative or in response to a Request for Proposal from the funder. Other grants can be given to individuals, such as victims of natural disasters or individuals who seek to open a small business. Sometimes grant makers require grant seekers to have some form of tax-exempt status, be a registered nonprofit organization or a local government.
+
+Grant Application is grant writing process which can be review by assessment manager and then decided by the organization to disburse grant amount to the applicant or not.
+
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/non_profit/Grant Application/index.txt b/erpnext/docs/user/manual/en/non_profit/Grant Application/index.txt
new file mode 100644
index 0000000..5d997e8
--- /dev/null
+++ b/erpnext/docs/user/manual/en/non_profit/Grant Application/index.txt
@@ -0,0 +1 @@
+grant_application
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/__init__.py b/erpnext/docs/user/manual/en/non_profit/Membership/__init__.py
similarity index 100%
copy from erpnext/docs/user/manual/en/schools/setup/__init__.py
copy to erpnext/docs/user/manual/en/non_profit/Membership/__init__.py
diff --git a/erpnext/docs/user/manual/en/non_profit/Membership/index.md b/erpnext/docs/user/manual/en/non_profit/Membership/index.md
new file mode 100644
index 0000000..1241451
--- /dev/null
+++ b/erpnext/docs/user/manual/en/non_profit/Membership/index.md
@@ -0,0 +1,9 @@
+# Membership
+
+This section contains Member and Membership related documents.
+
+How to set up one or more membership types that you can use to manage your organization's members. It also explains the concept of membership statuses and how your organisation can use them to define a membership life-cycle.
+
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/non_profit/Membership/index.txt b/erpnext/docs/user/manual/en/non_profit/Membership/index.txt
new file mode 100644
index 0000000..f1d9bf3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/non_profit/Membership/index.txt
@@ -0,0 +1,3 @@
+membership_type
+member
+membership
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/non_profit/Membership/member.md b/erpnext/docs/user/manual/en/non_profit/Membership/member.md
new file mode 100644
index 0000000..c9dc9c6
--- /dev/null
+++ b/erpnext/docs/user/manual/en/non_profit/Membership/member.md
@@ -0,0 +1,21 @@
+#Member
+
+The Member doctype allows you to record the Member details for a **Membership**.
+
+Members are simply contacts in your ERPNext database with one or more memberships. The contact may be an individual, a household, an organisation, or some other contact sub-type, but it is always a contact to which a membership is applied.
+
+To create new Member go to:
+
+> Non Profit > Member > New
+
+<img class="screenshot" alt="Student" src="/docs/assets/img/non_profit/membership/member.png">
+
+**Email:** Email field is the id of Member doctype.
+
+**Membership Type:** Membership Type is link field to Membership Type Doctype. Member can select Available Doctype.
+
+**Membership Expiry Date:** This Field fetch membership end date details from membership doctype.
+
+**Address and Contact Section:** This Section linked to address and contact doctypes.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/non_profit/Membership/membership.md b/erpnext/docs/user/manual/en/non_profit/Membership/membership.md
new file mode 100644
index 0000000..f101b86
--- /dev/null
+++ b/erpnext/docs/user/manual/en/non_profit/Membership/membership.md
@@ -0,0 +1,23 @@
+#Membership
+
+The Membership doctype allows you to record membership details for the **Member**.
+
+Membership is a term which refers to any organization that allows people to subscribe, and often requires them to pay a membership fee or "subscription".
+
+
+To create new Membership go to:
+
+> Non Profit > Membership > New
+
+<img class="screenshot" alt="Membership" src="/docs/assets/img/non_profit/membership/membership.png">
+
+**Member:** Member is a link field fetch member details from Member doctype.
+
+**Membership Status:** Membership Status is a select field which contains New, Current, Expired, Pending and Cancelled.
+
+**Membership Date Details section:** This section contain information related to Membership start date, end date and member since date.
+
+**Payment Details:** This section contains payment related details. If the person paid for membership checkbox paid is marked as checked else unmarked.
+Amount fetch based on membership type.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/non_profit/Membership/membership_type.md b/erpnext/docs/user/manual/en/non_profit/Membership/membership_type.md
new file mode 100644
index 0000000..eb7a09e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/non_profit/Membership/membership_type.md
@@ -0,0 +1,18 @@
+#Membership Type
+
+Membership Types are a basic building block for membership management. Typically an organization will set up a membership type for each of the different memberships that they offer. For the simplest membership structures, one membership type may be enough. For more complex membership structures, more membership types may be required. For example, an organisation may define three membership types for 'regular', 'student', and 'honorary' members. Or an organization may choose to use membership types as subcriptions to their different publications, either free or paying ones.
+
+In this chapter we will cover the most common set-up for membership types.
+
+To create new Membership Type go to:
+
+> Non Profit > Membership Type > New
+
+
+<img class="screenshot" alt="Student" src="/docs/assets/img/non_profit/membership/membership_type.png">
+
+**Membership Type:** The Membership Type is displayed throughout the system, on both public and backend pages so spend some time thinking about a membership type name that is appropriate to both audiences. It can be changed at a later date
+
+**Amount:** If your memberships are free you should enter 0 (zero) in this field. Otherwise you should enter the amount that must be paid for this membership type.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/__init__.py b/erpnext/docs/user/manual/en/non_profit/Volunteer/__init__.py
similarity index 100%
copy from erpnext/docs/user/manual/en/schools/Assessment/__init__.py
copy to erpnext/docs/user/manual/en/non_profit/Volunteer/__init__.py
diff --git a/erpnext/docs/user/manual/en/non_profit/Volunteer/index.md b/erpnext/docs/user/manual/en/non_profit/Volunteer/index.md
new file mode 100644
index 0000000..77a8289
--- /dev/null
+++ b/erpnext/docs/user/manual/en/non_profit/Volunteer/index.md
@@ -0,0 +1,9 @@
+# Volunteer
+
+This section contains Volunteer and Volunteer Type related documents.
+
+Volunteer is the practice of people working on behalf of others without being motivated by financial or material gain.
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/non_profit/Volunteer/index.txt b/erpnext/docs/user/manual/en/non_profit/Volunteer/index.txt
new file mode 100644
index 0000000..3d93d06
--- /dev/null
+++ b/erpnext/docs/user/manual/en/non_profit/Volunteer/index.txt
@@ -0,0 +1,2 @@
+volunteer_type
+volunteer
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/non_profit/Volunteer/volunteer.md b/erpnext/docs/user/manual/en/non_profit/Volunteer/volunteer.md
new file mode 100644
index 0000000..6b875ee
--- /dev/null
+++ b/erpnext/docs/user/manual/en/non_profit/Volunteer/volunteer.md
@@ -0,0 +1,24 @@
+#Volunteer
+
+The Volunteer doctype allows you to record the Volunter details.
+
+Volunteer are simply contacts in your ERPNext database with one or more volunteering program. The contact may be an individual, a household, an organisation, or some other contact sub-type
+
+To create new Volunteer go to:
+
+> Non Profit > Volunteer > New
+
+<img class="screenshot" alt="Volunteer" src="/docs/assets/img/non_profit/volunteer/volunteer.png">
+
+**Email:** Email field is the id of Member doctype.
+
+**Volunteer Type:** Volunteer Type is link field to Volunteer Type Doctype. Volunteer can select available Doctype.
+
+**Address and Contact Section:** This Section linked to address and contact doctypes.
+
+**Volunteer Availability Section:** This section is child table which contains select field about volunteer availability. a volunteer can select availability such as weekly, morning etc
+
+**Volunteer Skills Section:** This section is child table which contains data field about the volunteer skills. a volunteer can add multiple skill for eg. Desk Job,
+Hospitality, Food management, computer operator etc.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/non_profit/Volunteer/volunteer_type.md b/erpnext/docs/user/manual/en/non_profit/Volunteer/volunteer_type.md
new file mode 100644
index 0000000..95b4c81
--- /dev/null
+++ b/erpnext/docs/user/manual/en/non_profit/Volunteer/volunteer_type.md
@@ -0,0 +1,18 @@
+#Volunteer Type
+
+Volunteer Types are a basic building block for Volunteering management. Typically an organization will set up a volunteer type for each of the different donation that they offer. For example, an organisation may define three volunteer types for 'regular', 'Student', and 'Member' donor.
+
+In this chapter we will cover the most common set-up for volunteer types.
+
+To create new volunteer Type go to:
+
+> Non Profit > Volunteer Type > New
+
+<img class="screenshot" alt="Volunteer" src="/docs/assets/img/non_profit/volunteer/volunteer_type.png">
+
+
+**Volunteer Type:** The Volunteer Type is displayed throughout the system, on both public and backend pages so spend some time thinking about a membership type name that is appropriate to both audiences. It can be changed at a later date
+
+**Amount:** If your Volunteering are free you should enter 0 (zero) in this field. Otherwise you should enter the amount that must be paid to the volunteer.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/__init__.py b/erpnext/docs/user/manual/en/non_profit/__init__.py
similarity index 100%
copy from erpnext/docs/user/manual/en/schools/__init__.py
copy to erpnext/docs/user/manual/en/non_profit/__init__.py
diff --git a/erpnext/docs/user/manual/en/non_profit/index.md b/erpnext/docs/user/manual/en/non_profit/index.md
new file mode 100644
index 0000000..546581f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/non_profit/index.md
@@ -0,0 +1,23 @@
+# Non Profit
+
+
+The Non Profit Modules in ERPNext is designed to meet requirements of NGO and Non Profit Organization. This is a centralized system, which maintains and updates all the activities related to an Organization.
+
+This will track all activity related to Memberships, Chapters, Volunteer Management,
+Donor Management, Event and Grant etc
+
+
+### Desk Page
+<img class="screenshot" >
+
+<div class="section" style="padding-top: 0px; margin-top: -30px;">
+	<div class="fake-browser-frame">
+		<img class="img-responsive browser-image feature-image" alt="Non Profit Domain"
+			src="/docs/assets/img/non_profit/non_profit_domain.png">
+	</div>
+</div>
+
+### Non Profit Domain
+<img class="screenshot" alt="Non Profit" src="/docs/assets/img/non_profit/module.png">
+
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/non_profit/index.txt b/erpnext/docs/user/manual/en/non_profit/index.txt
new file mode 100644
index 0000000..9f5e13a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/non_profit/index.txt
@@ -0,0 +1,5 @@
+Membership
+Chapter
+Volunteer
+Donor
+Grant Application
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/projects/project.md b/erpnext/docs/user/manual/en/projects/project.md
index d835295..e1e936b 100644
--- a/erpnext/docs/user/manual/en/projects/project.md
+++ b/erpnext/docs/user/manual/en/projects/project.md
@@ -81,13 +81,13 @@
 
 ###Project Costing
 
-The Project Costing section helps you track the time and expenses incurred against the project.
+The Project Costing section helps you track the time, expenses and purchases incurred against the project.
 
 <img class="screenshot" alt="Project - Costing" src="/docs/assets/img/project/project_costing.png">
 
-* The Costing Section is updated based on Time Logs made.
+* The Total Cost is composed of the costing amount from timesheets, the total cost from expense claims and the total cost from purchase invoices created against this project.
 
-* Gross Margin is the difference between Total Costing Amount and Total Billing Amount
+* The Gross Margin is the difference between Total Billed Amount and the Total Cost Amount for this project.
 
 ###Billing
 
diff --git a/erpnext/docs/user/manual/en/regional/united_arab_emirates/index.txt b/erpnext/docs/user/manual/en/regional/united_arab_emirates/index.txt
new file mode 100644
index 0000000..cf167db
--- /dev/null
+++ b/erpnext/docs/user/manual/en/regional/united_arab_emirates/index.txt
@@ -0,0 +1 @@
+uae-vat-setup
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/regional/united_arab_emirates/uae-vat-setup.md b/erpnext/docs/user/manual/en/regional/united_arab_emirates/uae-vat-setup.md
new file mode 100644
index 0000000..b2a38c9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/regional/united_arab_emirates/uae-vat-setup.md
@@ -0,0 +1,45 @@
+# VAT/EXCISE Tax Implementation for UAE/KSA
+
+### 1. Setting up Tax Registration No for customer, supplier and company
+
+Set tax registation number in the field tax id for the customer, supplier and company
+
+1. For Customer
+<img class="screenshot" alt="TRN in Customer" src="/docs/assets/img/regional/uae/tax-id-customer.png">
+
+2. For Company
+<img class="screenshot" alt="TRN in Company" src="/docs/assets/img/regional/uae/tax-id-company.png">
+
+### 2. Setting up TAX Code for Products
+Setup tax code in the item master, system will fetch same code in the sales/purchase invoice on selection of an item.
+
+<img class="screenshot" alt="Tax Code in Item" src="/docs/assets/img/regional/uae/tax-code-item.png">
+### 3. Default Tax Templates
+
+ERPNext provides you default tax template for vat(5%, zero, exempted) and excise(50%, 100%). You can create your own [tax template](/docs/user/manual/en/setting-up/setting-up-taxes.html).
+
+<img class="screenshot" alt="Default Tax Template" src="/docs/assets/img/regional/uae/uae-tax-templates.png">
+
+### 3. Making VAT Ready Invoices
+
+If you have setup the TRN of your Customers and Suppliers, and your tax template, you are ready to go for making VAT Ready Invoices!
+
+For **Sales Invoice**,
+
+1. Select the correct Customer and Item and the address where the transaction will happen.
+2. Check if the TRN of your Company and Supplier have been correctly set.
+3. Check if the TAX Code has been set in the Item
+4. Select the  template that you have created based on the type of transaction
+5. Save and Submit the Invoice
+
+<img class="screenshot" alt="VAT Invoice" src="/docs/assets/img/regional/uae/vat-invoice.gif">
+
+### 4. Print Tax Invoice
+
+ERPNext provides 2 default print foramt
+
+1. Simplified Tax Invoice
+<img class="screenshot" alt="Simplified Tax Invoice" src="/docs/assets/img/regional/uae/simplified-invoice.png">
+
+2. Detailed Tax Invoice
+<img class="screenshot" alt="Detailed Tax Invoice" src="/docs/assets/img/regional/uae/detailed-invoice.png">
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria.md b/erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria.md
deleted file mode 100644
index c422578..0000000
--- a/erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria.md
+++ /dev/null
@@ -1,13 +0,0 @@
-#Assessment Criteria
-
-Assessment Criteria is the parameter based on which you assess the Student.
-
-<img class="screenshot" alt="Assessment Criteria" src="/docs/assets/img/schools/assessment/assessment-criteria.png">
-
-After assessment is conducted for a Course, marks earned are entered based on the Assessment Criteria. For example, if assessment was conducted for science subject, then you can evaluate Student in Science on various criteria like Writing, Practicals, Presentation etc.
-
-Assessment Criteria is be used when scheduling Assessment Plan for Student Group and Course.
-
-<img class="screenshot" alt="Assessment Plan Criteria" src="/docs/assets/img/schools/assessment/assessment-plan-criteria.png">
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_group.md b/erpnext/docs/user/manual/en/schools/Assessment/assessment_group.md
deleted file mode 100644
index 90c7b5d..0000000
--- a/erpnext/docs/user/manual/en/schools/Assessment/assessment_group.md
+++ /dev/null
@@ -1,13 +0,0 @@
-#Assessment Group
-
-Assessment Group tree is a master where you can define the hierarchy for examination conducted in your education institute.
-
-For example, if you conduct two assessment in a academic year, then setup Assessment Group as following.
-
-<img class="screenshot" alt="Assessment Group Term" src="/docs/assets/img/schools/assessment/assessment-group-term.png">
-
-On the same lines, you can also define multiple Assessment Group bases on assessment conducted in your institute.
-
-<img class="screenshot" alt="Assessment Group Term" src="/docs/assets/img/schools/assessment/assessment-group-details.png">
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_plan.md b/erpnext/docs/user/manual/en/schools/Assessment/assessment_plan.md
deleted file mode 100644
index 103def1..0000000
--- a/erpnext/docs/user/manual/en/schools/Assessment/assessment_plan.md
+++ /dev/null
@@ -1,19 +0,0 @@
-#Assessment Plan
-
-To schedule an assessment/examination for a Student Group, for specific Course, create Assessment Plan. In the Assessment Plan, you can also capture details like:
-
-1. Grading Scale based on which grades will be assigned to students.
-
-2. Schedule Date of Assessment
-
-3. Room where assessment will be conducted
-
-4. Examiner and Supervisor
-
-<img class="screenshot" alt="Assessment Plan Details" src="/docs/assets/img/schools/assessment/assessment-plan-details.png">
-
-5. Assessment Criteria is list of criteria based which each student in will be evaluated and grades will be assigned.
-
-<img class="screenshot" alt="Assessment Plan Criteria" src="/docs/assets/img/schools/assessment/assessment-plan-criteria.png">
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_result.md b/erpnext/docs/user/manual/en/schools/Assessment/assessment_result.md
deleted file mode 100644
index dc35ca7..0000000
--- a/erpnext/docs/user/manual/en/schools/Assessment/assessment_result.md
+++ /dev/null
@@ -1,7 +0,0 @@
-#Assessment Result
-
-Assessment Result is a log of marks/grades earned by the student for specific Assessment. Assessment Result is created in the backend based on the marks entered in the [Assessment Result Tool](/docs/user/manual/en/schools/assessment/assessment_result_tool.html).
-
-<img class="screenshot" alt="Assessment Result" src="/docs/assets/img/schools/assessment/assessment-result.png">
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_result_tool.md b/erpnext/docs/user/manual/en/schools/Assessment/assessment_result_tool.md
deleted file mode 100644
index bb2a2ba..0000000
--- a/erpnext/docs/user/manual/en/schools/Assessment/assessment_result_tool.md
+++ /dev/null
@@ -1,9 +0,0 @@
-#Assessment Result Tool
-
-Assessment Result Tool help you entering marks earned by the Students for specific course. In this tool, based on the Assessment Plan, all the Student will be fetched into Assessment Result Tool. Also, Columns for Assessment Criteria will be where marks earned can be entered for each Student.
-
-<img class="screenshot" alt="Assessment Result Tool" src="/docs/assets/img/schools/assessment/assessment-result-tool.png">
-
-As you go on entering marks for a Student, and switch to next student, in the backend, Student Result record will be auto-created for that Student.
-
-{next}
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/grading_scale.md b/erpnext/docs/user/manual/en/schools/Assessment/grading_scale.md
deleted file mode 100644
index 4519112..0000000
--- a/erpnext/docs/user/manual/en/schools/Assessment/grading_scale.md
+++ /dev/null
@@ -1,7 +0,0 @@
-#Grading Scale
-
-In the Grading Scale, you can define various grades and threshold for them. Based on the score earned by an Student for an Assessment, Grade will be assigned.
-
-<img class="screenshot" alt="Grading Scale" src="/docs/assets/img/schools/assessment/grading-scale.png">
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Attendance/student-attendance-tool.md b/erpnext/docs/user/manual/en/schools/Attendance/student-attendance-tool.md
deleted file mode 100644
index 5c4ce30..0000000
--- a/erpnext/docs/user/manual/en/schools/Attendance/student-attendance-tool.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Student Attendance Tool
-
-The Student Attendance tool allow you to bulk update the attendance for students based on **Student Group and Course Schedule**.
-
-To mark the **Attedance* based on Student Group select the group based on 
-
-**1. Batch
-  2. Course
-  3. Activity **
-
-Student detials will be autofetched and you can mark the attendance of the given date. 
-
-<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/schools/setup/student-attendance-tool.gif">
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Attendance/student-attendance.md b/erpnext/docs/user/manual/en/schools/Attendance/student-attendance.md
deleted file mode 100644
index 1b917d0..0000000
--- a/erpnext/docs/user/manual/en/schools/Attendance/student-attendance.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Student Attendance
-
-Attendance doctype allows you to track and manage attendance of a student in all the days at any time. The Attendance module is designed to help teachers easily mark student attendance during class. 
-
-Attendance Records can be created against Student on daily basis.
-
-To create Attendance record :
-
-Select the **Student, Course Schedule and Student Group** for which attendance is to be marked for the given date. Set the Status to Present/Absent and save. 
-
-<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/schools/schedule/student-attendance.gif">
-
-**Student Attendance tool** can be used for bulk updation of the attendance based on **Batch, Course or Activity**.
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Attendance/student-leave-application.md b/erpnext/docs/user/manual/en/schools/Attendance/student-leave-application.md
deleted file mode 100644
index 5620bda..0000000
--- a/erpnext/docs/user/manual/en/schools/Attendance/student-leave-application.md
+++ /dev/null
@@ -1,13 +0,0 @@
-#Student Leave Application 
-
-ERPNext allows you to record the leave application for a student. 
-
-To create a Student Leave application record, enter the Student and the date for the leave is applied and save.
-
-<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/schools/schedule/student-leave-application.gif">
-
-Incase the student is not attending the school in order to participate or represent school in any event, he/she can be mark as present from the Leave Application itself. 
-
-Once a Leave Application is recorded for a student it will not be recorded in the absent student report as he has applied for a leave. 
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/admission/program-enrollment-tool.md b/erpnext/docs/user/manual/en/schools/admission/program-enrollment-tool.md
deleted file mode 100644
index 2a2fa1e..0000000
--- a/erpnext/docs/user/manual/en/schools/admission/program-enrollment-tool.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Program Enrollment Tool
-
-The Program Enrollment tool allows the bulk enrollment of the **Student Applicants** in a Program. 
-
-
-You can create the the Program Enrollment for :
-
-1. **Student Applicants** >> List of Student Applicants will be fetched for the selected **Program** and **Academic year**.
-
-<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/schools/admission/program-enrollment-tool.gif">
-
-2. **Program Enrollment** >> You can bulk update the **Program** for the students from one academic year to another in the same **Program** or a new **Program**.
-
-<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/schools/admission/program-enrollment-tool01.gif">
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/admission/program-enrollment.md b/erpnext/docs/user/manual/en/schools/admission/program-enrollment.md
deleted file mode 100644
index cc1308c..0000000
--- a/erpnext/docs/user/manual/en/schools/admission/program-enrollment.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Program Enrollment
-
-Program Enrollment describes an educational model where students must complete a  defined set of courses towards their academic objective in a specified sequence. Enrollment is a program driven process in which the student select the Program to enrol for in a Academic Year. 
-
-Once a student have applied for the **Program** and the application is approved, the program enrollment is done for that student. 
-
-<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/schools/admission/program-enrollment.gif">
-
-- A student can be enrolled in multiple Course for a program in a given academeic year. 
-- Based on the Fee structure selected at the time of enrollment Fee detials are created of the student.
-
-{next}
diff --git a/erpnext/docs/user/manual/en/schools/admission/student-applicant.md b/erpnext/docs/user/manual/en/schools/admission/student-applicant.md
deleted file mode 100644
index 22d3709..0000000
--- a/erpnext/docs/user/manual/en/schools/admission/student-applicant.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Student Applicant
-
-A Student Applicant record needs to be created when a student applies for a program at your institute.
-You can Approve or Reject a student applicant. By accepting a student applicant you can add them to the student master.
-
-<img class="screenshot" alt="Student Applicant" src="/docs/assets/img/schools/admission/student-applicant.png">
-
-### Application Status
-
-- By default when a student applicant is created in the system, the application status is set to 'Applied'
-
-- You can update the status to 'Approved' once you approve the applicant to join your institute.
-
-- Once the application status is set to 'Approved', the 'Enroll' button should show up. 
-	You can create a student record against the student applicant and enroll them to a program by clicking on this button.
-	
-- Once a student is created against the student applicant, the system shall set the application status to 'Admitted' 
-	and will not allow you to change the application status unless the student record is deleted.
-
-### Student Enrollment
-Once the form is submitted you can either approve or reject the application form.
-
-<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/schools/admission/student-application-actions.png">
-
-Once you approve a Student Applicant you can enroll them to a program. When you click the 'Enroll' buttom,
-the system shall create a student against that applicant and redirect you to the [Program Enrollment form](/docs/user/manual/en/schools/student/program-enrollment.html).
-
-<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/schools/admission/student-applicant-enroll.png">
-
-{next}
diff --git a/erpnext/docs/user/manual/en/schools/admission/student_admission.md b/erpnext/docs/user/manual/en/schools/admission/student_admission.md
deleted file mode 100644
index 7a63fa7..0000000
--- a/erpnext/docs/user/manual/en/schools/admission/student_admission.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Student Admission
-
-The admission process begins with filling the admission form. The Student Admission record enables to initiate your admission process for a given **Academic year**. ERPNext admission module allows you to create an admission record which can be then published on the ERPNext generate website.
-
-To create a Student Admission record  go to :
-
-**Schools** >> **Admissions** >> **Student Admission** >>
-
-
-<img class="screenshot" alt="Student Applicant" src="/docs/assets/img/schools/admission/student-admission.gif">
-
-Once an admission record is created, the age eligibility criteria can be determined for the every program. Similarly, you can also determine the application fee and naming series for every student applicant. If you keep the naming series blank then the default naming series will be applied for every student applicant.
-
-The information provided in the Student Admission records will be used for the validation and creation of the Student Admission records (only if student admission link is filled there)
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/fees/fee-category.md b/erpnext/docs/user/manual/en/schools/fees/fee-category.md
deleted file mode 100644
index fbf43e6..0000000
--- a/erpnext/docs/user/manual/en/schools/fees/fee-category.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Fee Category
-
-List of all different type of fees collected.
-
-<img class="screenshot" alt="Fees Category" src="/docs/assets/img/schools/fees/fee-category.png">
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/fees/fee-structure.md b/erpnext/docs/user/manual/en/schools/fees/fee-structure.md
deleted file mode 100644
index a1dd9be..0000000
--- a/erpnext/docs/user/manual/en/schools/fees/fee-structure.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Fee Structure
-
-A Fee Structure is a template that can be used while making fee records.
-
-<img class="screenshot" alt="Fees Structure" src="/docs/assets/img/schools/fees/fee-structure.png">
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/fees/fees.md b/erpnext/docs/user/manual/en/schools/fees/fees.md
deleted file mode 100644
index f17720c..0000000
--- a/erpnext/docs/user/manual/en/schools/fees/fees.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Fees
-
-Maintain a record of fees collected from students.
-The [Fee Structure](/docs/user/manual/en/schools/fees/fee-structure.html) is fetched based on the selected Program and Academic Term.
-
-<img class="screenshot" alt="Fees" src="/docs/assets/img/schools/fees/fees.png">
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/fees/index.md b/erpnext/docs/user/manual/en/schools/fees/index.md
deleted file mode 100644
index c5be5f6..0000000
--- a/erpnext/docs/user/manual/en/schools/fees/index.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Fees
-
-This section contains 'Fee' related documents.
-
-<img class="screenshot" alt="Fees Section" src="/docs/assets/img/schools/fees/fees-section.png">
-
-### Topics
-
-{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/index.md b/erpnext/docs/user/manual/en/schools/index.md
deleted file mode 100644
index d317d39..0000000
--- a/erpnext/docs/user/manual/en/schools/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Schools
-
-
-The School Modules in ERPNext is designed to meet requirements of Schools, Colleges & Educational Institutes. This is a centralized system, which maintains and updates all the activities related to an Institution. This will ease the process of each and every aspect of a School, be it Students, Admission, Examination and Fee.
-
-<img class="screenshot" alt="Fees Section" src="/docs/assets/img/schools/module.png">
-
-{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/schedule/course-schedule.md b/erpnext/docs/user/manual/en/schools/schedule/course-schedule.md
deleted file mode 100644
index 9f7d980..0000000
--- a/erpnext/docs/user/manual/en/schools/schedule/course-schedule.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Course Schedule
-
-Course Schedule is the schedule of a session conducted by an Instructor for a particular Course.
-You can see the overall course schedule in the Calendar view.
-
-<img class="screenshot" alt="Course Schedule" src="/docs/assets/img/schools/schedule/course-schedule.png">
-
-### Marking Attendance
-
-You can mark attendance for a Student Group against a Course Schedule.
-
-<img class="screenshot" alt="Course Schedule Attendance" src="/docs/assets/img/schools/schedule/course-schedule-att.png">
-
-- To make attendance, expand the attendance section.
-- Check the students who were present for that session.
-- Click on 'Mark Attendance'. The system will create the Attendance records.
-
-###View Attendance
-
-Once you have marked Attendance against a Course Schedule the Attendance section in the Course Schedule shall be hidden. 
-A View Attendance button shall appear. Click on that button to view all attendance records created against that Course Schedule.
-
-<img class="screenshot" alt="Course Schedule Attendance" src="/docs/assets/img/schools/schedule/course-schedule-att-1.png">
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/schedule/examination.md b/erpnext/docs/user/manual/en/schools/schedule/examination.md
deleted file mode 100644
index d167e9c..0000000
--- a/erpnext/docs/user/manual/en/schools/schedule/examination.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Examination
-
-The Examination record can be used to track the exam schedule and the results of that exam.
-
-<img class="screenshot" alt="Examination" src="/docs/assets/img/schools/schedule/examination.png">
-
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/schedule/index.md b/erpnext/docs/user/manual/en/schools/schedule/index.md
deleted file mode 100644
index 57e578b..0000000
--- a/erpnext/docs/user/manual/en/schools/schedule/index.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Schedule
-
-<img class="screenshot" alt="Schedule Section" src="/docs/assets/img/schools/schedule/schedule-section.png">
-
-### Topics
-
-{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/schedule/scheduling-tool.md b/erpnext/docs/user/manual/en/schools/schedule/scheduling-tool.md
deleted file mode 100644
index 9e13d6d..0000000
--- a/erpnext/docs/user/manual/en/schools/schedule/scheduling-tool.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Scheduling Tool
-
-This tool can be used to create 'Course Schedules'. 
-
-<img class="screenshot" alt="Scheduling Tool" src="/docs/assets/img/schools/schedule/scheduling-tool.png">
-
-### Creating Course Schedules
-
-- Select Student Group for which you need to create Course Schedules.
-- Select Course, Room and Instructor for Course Schedules.
-- Enter From Time and To Time for Course Schedule.
-- Enter Start Date and End Date of the Course (Course Schedules will be created within this date range)
-- Enter Day of the week on which you want to schedule the Course.
-- Click on the 'Schedule Course' button
-- The system will create Course Schedules if the Room and Instructor are available and there is no conflict for the selected Student Group with other Course Schedules.
-
-###Rescheduling
-
-- If you wish to reschedule Course Schedules created against a Course, follow the instructions for creating course schedules
-- Check the 'Reschedule' checkbox and then click 'Schedule Course' button.
-- System will delete existing Course Schedules for specified Course within the mentioned Course Start Date and Course End Date and crate new Course Schedules.
-
-{next}
diff --git a/erpnext/docs/user/manual/en/schools/setup/academic-term.md b/erpnext/docs/user/manual/en/schools/setup/academic-term.md
deleted file mode 100644
index b52bea7..0000000
--- a/erpnext/docs/user/manual/en/schools/setup/academic-term.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Academic Term
-
-An academic term (or simply "term") is a portion of an academic year, the time during which an educational institution holds classes. The schedules adopted vary widely. The academic term can be a quater, trimester or a semester.
-
-The **Academic term** form in ERPNext enables you to create academic terms within in a year. Based on the term schedule enter the start and end date for the schedule and generate the term for a Academic year.
-
-<img class="screenshot" alt="Academic Term" src="/docs/assets/img/schools/setup/academic-term.png">
-
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/academic-year.md b/erpnext/docs/user/manual/en/schools/setup/academic-year.md
deleted file mode 100644
index 4fc5f92..0000000
--- a/erpnext/docs/user/manual/en/schools/setup/academic-year.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Academic Year
-
-An academic year is a period of time which schools, colleges and universities use to measure a quantity of study.
-
-The **Academic year** form have the Start and End date for the Academic year.
-
-<img class="screenshot" alt="Academic Year" src="/docs/assets/img/schools/setup/academic-year.png">
-
-**Student group** link is given to view or add the respective groups to the Academic year.
-
-{next} 
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/course.md b/erpnext/docs/user/manual/en/schools/setup/course.md
deleted file mode 100644
index dc10ed5..0000000
--- a/erpnext/docs/user/manual/en/schools/setup/course.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Course
-
- A course is a unit of teaching that typically lasts one academic term, is led by one or more instructors (teachers or professors), and has a fixed number of students. Students may receive a grade and academic credit after completion of the course.
-
-To create a **Course** enter the Course name and Code. Code for the course should be unique for every course. You can also link the department under which the course is conducted.
-
-<img class="screenshot" alt="Course" src="/docs/assets/img/schools/setup/course.png">
-
-Once a **Course** is created, a course schedule can defined for the same.
-
-<img class="screenshot" alt="Course" src="/docs/assets/img/schools/setup/Course.gif">
-
-The Course form is further linked to **Program, Student Group and Assessment Plan** doctypes. The links allow to view/create the related documents for a **Course**.
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/index.md b/erpnext/docs/user/manual/en/schools/setup/index.md
deleted file mode 100644
index 4e09152..0000000
--- a/erpnext/docs/user/manual/en/schools/setup/index.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Setup
-
-The Setup section of Schools module provides facility to make some basic configuration. Below are doctypes for basic configuration.
-
-<img class="screenshot" alt="Setup Section" src="/docs/assets/img/schools/setup/setup-section.png">
-
-### Topics
-
-{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/index.txt b/erpnext/docs/user/manual/en/schools/setup/index.txt
deleted file mode 100644
index 8fb9bb2..0000000
--- a/erpnext/docs/user/manual/en/schools/setup/index.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-course
-program
-instructor
-room
-student-category
-student-batch-name
-academic-term
-academic-year
-school-settings
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/instructor.md b/erpnext/docs/user/manual/en/schools/setup/instructor.md
deleted file mode 100644
index 6150f02..0000000
--- a/erpnext/docs/user/manual/en/schools/setup/instructor.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Instructor
-
-An instructoe is a teacher, or professor, of a specialised subject that involves skill. 
-
-You can create an Instructor and link it to the Employee master and a Departmemt.
-
-<img class="screenshot" alt="Instructor" src="/docs/assets/img/schools/setup/instructor.png">
-
-An **Instructor** is further linked to a **Course Schedule**, where you can define the schedule for a **Course** for a give date and **Room no**.
-
-<img class="screenshot" alt="Instructor" src="/docs/assets/img/schools/setup/instructor.gif">
-It is also linked to **Student group** where an **Instructor** is assigned to the Student group.
-
-<img class="screenshot" alt="Instructor" src="/docs/assets/img/schools/setup/student-group-instructor.gif">
-
-An **Instructor** is also linked to an **Assesment Plan** for a Student group. The Instructor can be an Examiner or the supervisor for the assesment. 
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/program.md b/erpnext/docs/user/manual/en/schools/setup/program.md
deleted file mode 100644
index be10166..0000000
--- a/erpnext/docs/user/manual/en/schools/setup/program.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Program
-
-An educational program is a program written by the institutions which determines the learning progress of each subject in all the stages of formal education.
-
-To create a Program go to :
-
-###Schools >> Setup >> Program >> New Program
-
-Enter a unique code for every **Program**. You can also link the **Program** to the department under which it is conducted.
-
-<img class="screenshot" alt="Program" src="/docs/assets/img/schools/setup/program.png">
-
-Add the relevant Course and the Fee details for a program. 
-
-<img class="screenshot" alt="Program" src="/docs/assets/img/schools/setup/course-fee-program.png">
-
-The Program Doctype is further linked to the **Student applicant**, **Program enrollment, Student group, Fee structre and Fee**. The links allow to view or create the related document for a Program.
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/room.md b/erpnext/docs/user/manual/en/schools/setup/room.md
deleted file mode 100644
index 43ddde9..0000000
--- a/erpnext/docs/user/manual/en/schools/setup/room.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Room
-
-A classroom is a space (room or lab) where you want to schedule courses or examinations. A room in an educational institute can be a Class room, a laboratory or a Examination hall.
-
-The Room doctype allows you to record the room number and the seating capacity for a classroom. Once a room is created Course schedule link is provided in the Room doctype to view or add the course schedule for the classroom. 
-
-<img class="screenshot" alt="Room" src="/docs/assets/img/schools/setup/room.png">
-
-The course schedule validate the availability of the Room number and an alert message is shown if there is an overlap for the Room number for a given time slot.
-
-<img class="screenshot" alt="Room" src="/docs/assets/img/schools/setup/Course-schedule-error.png">
-
-The Room number is further linked to the Assesment plan. It validates the availability of examination room for the assessment to be held for a given date and time.
-
-<img class="screenshot" alt="Room" src="/docs/assets/img/schools/setup/Room-Assesment-plan.png">
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/school-settings.md b/erpnext/docs/user/manual/en/schools/setup/school-settings.md
deleted file mode 100644
index ce9e914..0000000
--- a/erpnext/docs/user/manual/en/schools/setup/school-settings.md
+++ /dev/null
@@ -1,15 +0,0 @@
-#School Settings
-
-The Schools settings page allow you to setup basic settings like **Academic Year and Term** for the Schools setup. 
-
-<img class="screenshot" alt="Student" src="/docs/assets/img/schools/student/schools.png">
-
-The checkbox to Validate Batch for Students in Student Group enables the Student Batch validation for every Student from the Program Enrollment for the **Batch** based on **Student Group** 
-
-<img class="screenshot" alt="Student" src="/docs/assets/img/schools/student/student-batch-validation.gif">
-
-You can enable the validation of Course for every Student from the enrolled Courses in Program Enrollment,for Course based Student Group by checking the settings for **Validate Enrolled Course for Students in Student Group**
-
-<img class="screenshot" alt="Student" src="/docs/assets/img/schools/student/student-course-validation.gif">
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/student-batch-name.md b/erpnext/docs/user/manual/en/schools/setup/student-batch-name.md
deleted file mode 100644
index 056f910..0000000
--- a/erpnext/docs/user/manual/en/schools/setup/student-batch-name.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Student Batch
-
-Student batch is a collection of students from Student Groups. **Student batch** allows you to create **Student Group** based on a batch. When a student is enrolled for a **Program**, the Student batch is selected to enroll the student for the given Program and batch 
-
-<img class="screenshot" alt="Student" src="/docs/assets/img/schools/student/student-batch.gif">
-
-You can also get a **Student Batch-Wise Attendance** report to view the number of student present from the Batch.
-
-
-{next}
diff --git a/erpnext/docs/user/manual/en/schools/setup/student-category.md b/erpnext/docs/user/manual/en/schools/setup/student-category.md
deleted file mode 100644
index 0d76927..0000000
--- a/erpnext/docs/user/manual/en/schools/setup/student-category.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Student Category
-
-Student Category doctype allow you to classify student based various categories. In Institutions, there may be fee concession for some categories such as Handicapped students, foreign, nationals, reserved category by the government etc.
-
-To create Student category go to Setup >> Student Category >> New.
-
-We can create new student category by adding a name and save it
-
-<img class="screenshot" alt="Student" src="/docs/assets/img/schools/student/student-category.gif">
-
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/student/guardian.md b/erpnext/docs/user/manual/en/schools/student/guardian.md
deleted file mode 100644
index 7bbdbc2..0000000
--- a/erpnext/docs/user/manual/en/schools/student/guardian.md
+++ /dev/null
@@ -1,9 +0,0 @@
-#Guardian
-
-The Guardian doctype allows you to record the guardian details for a **Student**.
-
-<img class="screenshot" alt="Student" src="/docs/assets/img/schools/student/guardian.png">
-
-The email id added in the **Guardian** detail can be linked to a email group for sending newsletter or announcements.
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/student/student-batch.md b/erpnext/docs/user/manual/en/schools/student/student-batch.md
deleted file mode 100644
index 056f910..0000000
--- a/erpnext/docs/user/manual/en/schools/student/student-batch.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Student Batch
-
-Student batch is a collection of students from Student Groups. **Student batch** allows you to create **Student Group** based on a batch. When a student is enrolled for a **Program**, the Student batch is selected to enroll the student for the given Program and batch 
-
-<img class="screenshot" alt="Student" src="/docs/assets/img/schools/student/student-batch.gif">
-
-You can also get a **Student Batch-Wise Attendance** report to view the number of student present from the Batch.
-
-
-{next}
diff --git a/erpnext/docs/user/manual/en/schools/student/student-group-creation-tool.md b/erpnext/docs/user/manual/en/schools/student/student-group-creation-tool.md
deleted file mode 100644
index 1cd9b1e..0000000
--- a/erpnext/docs/user/manual/en/schools/student/student-group-creation-tool.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Student Group Creation Tool
-
-The Student group creation tool allows you to create student groups in bulk. 
-
-To create Student group using this tool go to 
-
-##Schools >>Student >> Student Group creation tool
-
-Select the **Academic Term** and the **Program** for which a student group is to be created. 
-
-<img class="screenshot" alt="Student Group Creation Tool" src="/docs/assets/img/schools/student/student-group-creation-tool.gif">
-
-By default the student group is created based on the **Course** only. The check box for "Separate course based Group for every Batch" allows you to create batchwise Student groups for a course.
-
-You can leave it unchecked if you don't want to consider batch while making course based groups.
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/student/student-group.md b/erpnext/docs/user/manual/en/schools/student/student-group.md
deleted file mode 100644
index cf3f82c..0000000
--- a/erpnext/docs/user/manual/en/schools/student/student-group.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Student Group
-
-A student group is a collection of students taking same course. You can create Course Schedules and Examinations against a Student Group.
-
-A Student Group needs to be created for every course for **Academic Term** and **Academic Year**. The student group can be create based on **Batch, Course and Activity**. 
-
-To create a Student Group go to:
-
-Schools >> Student >> New Student Group 
-
-<img class="screenshot" alt="Student Group" src="/docs/assets/img/schools/student/Student-group.gif">
-
-To create a Student group based on **Batch**, select the **Progam** and **Batch**, where as to create a Student group based on **Course**, you will only have to select the Course Code. Creating a student group based on activity allows you to group of student for events and activities happening in the institute. 
-
-Once a student group is created you can mark attendance for the group. 
-
-<img class="screenshot" alt="Student Group" src="/docs/assets/img/schools/student/student-group-attendance.gif">
-
-You can also update the **Email Group** for the Student Group. Click on Update Email Group to add all the email ids of the gaurdians in the respective email group and **Newsletter** can be created and sent to the Email group.
-
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/student/student-log.md b/erpnext/docs/user/manual/en/schools/student/student-log.md
deleted file mode 100644
index 160e39f..0000000
--- a/erpnext/docs/user/manual/en/schools/student/student-log.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Student Log
-
-The Student log Doctype enables you to add and edit addtional information for a student.
-You can make a note of student activities using Student log.
-Logs can be categorised as 'General', 'Academic', 'Medical' or 'Achievement'
-
-<img class="screenshot" alt="Student" src="/docs/assets/img/schools/student/student-log.png">
-
-{next}
diff --git a/erpnext/docs/user/manual/en/schools/student/student.md b/erpnext/docs/user/manual/en/schools/student/student.md
deleted file mode 100644
index 09e4471..0000000
--- a/erpnext/docs/user/manual/en/schools/student/student.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Student
-
-A Student is a person who has enrolled at your institute and you have accepted their application.
-The Student doctype maintains detials like personal information, date of birth, address etc. It also records the **Guardian** and sibling details. 
-
-<img class="screenshot" alt="Student" src="/docs/assets/img/schools/student/student.png">
-The student is enrolled in a **Program** when the application is approved. Once the enrollement is done the **Student Applicant** status is update to Admitted.
-
-You can view every doctype created for a particular student. Eg : Fees, Student Group, etc
-
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md b/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md
index 0d8c269..9b25c8c 100644
--- a/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md
+++ b/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md
@@ -1,7 +1,7 @@
 # Shipping Rule
 
-Using Shipping Rule you can define the cost for delivering the product to the customer.
-You can define different shipping rules for the same item across different territories.
+Using Shipping Rule you can define the cost for delivering the product to the customer and also to the supplier.
+You can define different shipping rules or a fixed shipping amount for the same item across different territories.
 
 <img class="screenshot" alt="Shipping Rule" src="/docs/assets/img/selling/shipping-rule.png">
 
diff --git a/erpnext/docs/user/manual/en/setting-up/bar-code.md b/erpnext/docs/user/manual/en/setting-up/bar-code.md
deleted file mode 100644
index e317628..0000000
--- a/erpnext/docs/user/manual/en/setting-up/bar-code.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# Bar Code
-
-A Barcode is a machine-readable code in the form of numbers and a pattern of
-parallel lines of varying widths, printed on a commodity and used especially
-for stock control.
-
-When you purchase an item from any store, you will notice a label with thin,
-black lines across it, along with a variation of different numbers. This label
-is then scanned by the cashier, and the item's description and price
-automatically comes up. This set of lines and numbers on the label are termed
-as bar-code.
-
-A bar-code machine scans the number from the label of an Item. To work with
-ERPNext and the bar-code mechanism, connect the bar-code machine to your
-operating hardware. Then go to ERPNext setup and activate bar-code by going to
-tools and clicking on 'hide / unhide features'. Under Materials, feature
-setup, check the box that says Item Barcode.
-
-> Setup > Customize > Hide/ Unhide Features > Item Barcode.
-
-#### Figure 1: Check the box 'Item Barcode'
-
-<img class="screenshot" alt="Barcode" src="/docs/assets/img/setup/barcode-1.png">
-
-
-To start scanning with a bar-code, go to  
-
-> Accounts > Sales Invoice
-
-Under Item, click on Add new row. The item row will expand to show new fields.
-Place your cursor on the bar-code field and begin scanning. The bar-code will
-be updated in the field. Once the bar-code is entered, all the Item details
-will be fetched automatically by the system.
-
-For more ease, activate the POS view in ERPnext. The activation process is
-same as the bar-code activation. Go to Setup and click on 'hide/unhide
-features'. Check the 'POS view' box.
-
-Then go to Accounts and click on Sales Invoice. Check the box 'Is POS'
-
-  
-#### Figure 2: Check the box 'Is POS'
-
-<img class="screenshot" alt="Barcode" src="/docs/assets/img/setup/barcode-2.png">
-
-
-Go to Item and click on Add new row.  
-
-The cursor will automatically be placed in the bar-code field. Thus you can
-immediately scan the bar-code and proceed with your operations.
-
-{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/index.txt b/erpnext/docs/user/manual/en/setting-up/index.txt
index 129876e..2733e91 100644
--- a/erpnext/docs/user/manual/en/setting-up/index.txt
+++ b/erpnext/docs/user/manual/en/setting-up/index.txt
@@ -13,6 +13,5 @@
 territory
 third-party-backups
 workflows
-bar-code
 company-setup
 articles
diff --git a/erpnext/docs/user/manual/en/stock/delivery-trip.md b/erpnext/docs/user/manual/en/stock/delivery-trip.md
new file mode 100644
index 0000000..5e0911a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/delivery-trip.md
@@ -0,0 +1,17 @@
+# Delivery Trip
+
+Delivery Trip is created to record Customer Deliveries in one vehicle. Multiple stops can also be added and Submitted Delivery Note can be tagged per Customer.
+
+You can make a Delivery directly from:
+
+> Stock > Delivery Trip > New Delivery Trip
+
+Delivery
+
+<img class="screenshot" alt="Delivery" src="/docs/assets/img/stock/delivery_trip.png">
+
+Delivery Stops
+
+<img class="screenshot" alt="Delivery" src="/docs/assets/img/stock/delivery_stops.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/index.txt b/erpnext/docs/user/manual/en/stock/index.txt
index b89abe1..f807e73 100644
--- a/erpnext/docs/user/manual/en/stock/index.txt
+++ b/erpnext/docs/user/manual/en/stock/index.txt
@@ -16,3 +16,4 @@
 articles
 opening-stock
 stock-how-to
+retain-sample-stock
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/item/index.txt b/erpnext/docs/user/manual/en/stock/item/index.txt
index 4e66875..db5fa0a 100644
--- a/erpnext/docs/user/manual/en/stock/item/index.txt
+++ b/erpnext/docs/user/manual/en/stock/item/index.txt
@@ -4,3 +4,4 @@
 purchase-details
 reorder
 item-valuation-fifo-and-moving-average
+item-settings
diff --git a/erpnext/docs/user/manual/en/stock/retain-sample-stock.md b/erpnext/docs/user/manual/en/stock/retain-sample-stock.md
new file mode 100644
index 0000000..0f8199a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/retain-sample-stock.md
@@ -0,0 +1,26 @@
+# Retain Sample Stock
+
+A sample of a batch of starting material, packaging material or finished product is stored for the purpose of being analyzed should the need arise later.
+
+### Set Sample Retention Warehouse in Stock Settings
+
+It is advised to create a new warehouse just for retaining samples and not use it in production.
+
+<img class="screenshot" alt="Sample Retention Warehouse" src="/docs/assets/img/stock/sample-warehouse.png">
+
+### Enable Retain Sample in Item master
+
+Check Retain Sample and Maximum allowed samples in Item Master for a batch. Please note that Retain Sample is based
+on Batch hence Has Batch No should be enabled as well.
+
+<img class="screenshot" alt="Retain Sample" src="/docs/assets/img/stock/retain-sample.png">
+
+### Stock Entry
+
+Whenever a Stock Entry is created with the purpose as Material Receipt, for items which have Retain Sample enabled, the Sample Quantity can be set during that Stock Entry. Sample quantity cannot be more than the Maximum sample quantity set in Item Master.
+
+<img class="screenshot" alt="Retain Sample" src="/docs/assets/img/stock/material-receipt-sample.png">
+
+On submission of this Stock Entry, button 'Make Retention Stock Entry' will be available to make another Stock Entry for the transfer of sample items from the mentioned batch to the retention warehouse set in Stock Settings. On clicking this button it will direct you to new Stock Entry with all the information, verify the information and click Submit.
+
+<img class="screenshot" alt="Retain Sample" src="/docs/assets/img/stock/material-transfer-sample.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/setup/stock-settings.md b/erpnext/docs/user/manual/en/stock/setup/stock-settings.md
index 32562c6..96d1627 100644
--- a/erpnext/docs/user/manual/en/stock/setup/stock-settings.md
+++ b/erpnext/docs/user/manual/en/stock/setup/stock-settings.md
@@ -4,4 +4,12 @@
 
 <img class="screenshot" alt="Stock Settings" src="/docs/assets/img/stock/stock-settings.png">
 
+### Clean HTML Description
+
+Usually descriptions are copy-pasted from a website or Word / PDF file and they contain a lot of embedded style. This messes up the Print view of your invoices or quotes.
+
+To fix this, you can check "Convert Item Description to Clean HTML" in Stock Settings. This will ensure that when you save your Items, their descriptions will be cleaned up.
+
+If you want control your description views and llow any HTML to be embedded, you can uncheck this property.
+
 {next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/es/schools/Assessment/__init__.py b/erpnext/docs/user/manual/es/education/Assessment/__init__.py
similarity index 100%
rename from erpnext/docs/user/manual/es/schools/Assessment/__init__.py
rename to erpnext/docs/user/manual/es/education/Assessment/__init__.py
diff --git a/erpnext/docs/user/manual/es/education/Assessment/assessment_criteria.md b/erpnext/docs/user/manual/es/education/Assessment/assessment_criteria.md
new file mode 100644
index 0000000..31e710a
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/Assessment/assessment_criteria.md
@@ -0,0 +1,13 @@
+#Criterios de Evaluación
+
+Criterios de evaluación es el parámetro basado en el que se evalúa el estudiante.
+
+<img class="screenshot" alt="Assessment Criteria" src="/docs/assets/img/education/assessment/assessment-criteria.png">
+
+Después de la evaluación para un curso, las calificaciones obtenidas se ingresan en base a los criterios de evaluación. Por ejemplo, si la evaluación se llevó a cabo para el tema de la ciencia, entonces usted puede evaluar al estudiante en ciencia en varios criterios como la escritura, prácticas, presentación, etc
+
+Los Criterios de Evaluación se usan al programar el Plan de Evaluación para el Grupo de Estudiantes y el Curso.
+
+<img class="screenshot" alt="Assessment Plan Criteria" src="/docs/assets/img/education/assessment/assessment-plan-criteria.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/es/education/Assessment/assessment_group.md b/erpnext/docs/user/manual/es/education/Assessment/assessment_group.md
new file mode 100644
index 0000000..aaabda1
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/Assessment/assessment_group.md
@@ -0,0 +1,13 @@
+#Grupo de Evaluación
+
+La estructura del grupo de evaluación es un maestro donde se puede definir la jerarquía para el examen realizado en su instituto de educación.
+
+Por ejemplo, si realiza dos evaluaciones en un año académico, configure el Grupo de evaluación de la siguiente manera.
+
+<img class="screenshot" alt="Assessment Group Term" src="/docs/assets/img/education/assessment/assessment-group-term.png">
+
+En la misma línea, también puede definir varios Grupo de Evaluación basado sobre la evaluación llevada a cabo en su instituto.
+
+<img class="screenshot" alt="Assessment Group Term" src="/docs/assets/img/education/assessment/assessment-group-details.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/es/education/Assessment/assessment_plan.md b/erpnext/docs/user/manual/es/education/Assessment/assessment_plan.md
new file mode 100644
index 0000000..5661892
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/Assessment/assessment_plan.md
@@ -0,0 +1,19 @@
+#Plan de Evaluación
+
+Para programar una evaluación/examinación para un Grupo de Estudiantes, para un curso específico, crea un Plan de Evaluación. En el plan de evaluación, puedes capturar detalles como:
+
+1. Escala de Calificaciones basada en qué calificaciones serán asignadas a los estudiantes.
+
+2. Fecha de planificación de la Evaluación
+
+3. Aula donde se va a llevar a cabo la evaluación
+
+4. Examinador y Supervisor
+
+<img class="screenshot" alt="Assessment Plan Details" src="/docs/assets/img/education/assessment/assessment-plan-details.png">
+
+5. Los Criterios de Evaluación son la lista de criterios basados ​​en que cada estudiante en será evaluado y los grados serán asignados.
+
+<img class="screenshot" alt="Assessment Plan Criteria" src="/docs/assets/img/education/assessment/assessment-plan-criteria.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/es/education/Assessment/assessment_result.md b/erpnext/docs/user/manual/es/education/Assessment/assessment_result.md
new file mode 100644
index 0000000..67a6f9a
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/Assessment/assessment_result.md
@@ -0,0 +1,7 @@
+#Resultados de Evaluación
+
+El resultado de la evaluación es un registro de las calificaciones obtenidas por el estudiante para una evaluación específica. El resultado de la evaluación se crea en el backend en base a los puntos en [Herramienta de Resultados de Evaluación](/docs/user/manual/es/education/assessment/assessment_result_tool.html).
+
+<img class="screenshot" alt="Assessment Result" src="/docs/assets/img/education/assessment/assessment-result.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/es/education/Assessment/assessment_result_tool.md b/erpnext/docs/user/manual/es/education/Assessment/assessment_result_tool.md
new file mode 100644
index 0000000..a6a44e5
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/Assessment/assessment_result_tool.md
@@ -0,0 +1,10 @@
+#Herramienta de resultados de la evaluación
+
+
+Herramienta de resultados de evaluación le ayuda a ingresar las calificaciones obtenidas por los estudiantes para un curso específico. En esta herramienta, basada en el plan de evaluación, todos los estudiantes van a ser filtrados dentro de la herramienta de resultados de la evaluación. También, Columnas para los Criterios de Evaluación serán donde las calificaciones ganadas pueden ser ingresadas para cada Estudiante.
+
+<img class="screenshot" alt="Assessment Result Tool" src="/docs/assets/img/education/assessment/assessment-result-tool.png">
+
+A medida que vaya introduciendo las notas para un Estudiante y cambie al siguiente alumno, en el backend, el registro de Resultados del Estudiante se creará automáticamente para ese Estudiante.
+
+{next}
diff --git a/erpnext/docs/user/manual/es/education/Assessment/grading_scale.md b/erpnext/docs/user/manual/es/education/Assessment/grading_scale.md
new file mode 100644
index 0000000..bf362b4
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/Assessment/grading_scale.md
@@ -0,0 +1,7 @@
+#Escala de calificación
+
+En la escala de calificación, puedes definir varios grados y límites para los estudiantes. Basado en la calificación obtenida por el estudiante en la evaluación, el grado (Grade) será asignado.
+
+<img class="screenshot" alt="Grading Scale" src="/docs/assets/img/education/assessment/grading-scale.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/es/schools/Assessment/index.md b/erpnext/docs/user/manual/es/education/Assessment/index.md
similarity index 100%
rename from erpnext/docs/user/manual/es/schools/Assessment/index.md
rename to erpnext/docs/user/manual/es/education/Assessment/index.md
diff --git a/erpnext/docs/user/manual/es/schools/Assessment/index.txt b/erpnext/docs/user/manual/es/education/Assessment/index.txt
similarity index 100%
rename from erpnext/docs/user/manual/es/schools/Assessment/index.txt
rename to erpnext/docs/user/manual/es/education/Assessment/index.txt
diff --git a/erpnext/docs/user/manual/es/schools/__init__.py b/erpnext/docs/user/manual/es/education/__init__.py
similarity index 100%
rename from erpnext/docs/user/manual/es/schools/__init__.py
rename to erpnext/docs/user/manual/es/education/__init__.py
diff --git a/erpnext/docs/user/manual/es/schools/admission/__init__.py b/erpnext/docs/user/manual/es/education/admission/__init__.py
similarity index 100%
rename from erpnext/docs/user/manual/es/schools/admission/__init__.py
rename to erpnext/docs/user/manual/es/education/admission/__init__.py
diff --git a/erpnext/docs/user/manual/es/schools/admission/index.md b/erpnext/docs/user/manual/es/education/admission/index.md
similarity index 100%
rename from erpnext/docs/user/manual/es/schools/admission/index.md
rename to erpnext/docs/user/manual/es/education/admission/index.md
diff --git a/erpnext/docs/user/manual/es/schools/admission/index.txt b/erpnext/docs/user/manual/es/education/admission/index.txt
similarity index 100%
rename from erpnext/docs/user/manual/es/schools/admission/index.txt
rename to erpnext/docs/user/manual/es/education/admission/index.txt
diff --git a/erpnext/docs/user/manual/es/education/admission/program-enrollment.md b/erpnext/docs/user/manual/es/education/admission/program-enrollment.md
new file mode 100644
index 0000000..6a24284
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/admission/program-enrollment.md
@@ -0,0 +1,7 @@
+# Inscripción al Programa
+
+Este formulario te permite inscribir un estudiante a un programa. Un estudiante puede ser inscrito en multiples programas.
+
+<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/program-enrollment.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/es/education/admission/student-applicant.md b/erpnext/docs/user/manual/es/education/admission/student-applicant.md
new file mode 100644
index 0000000..4d8723c
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/admission/student-applicant.md
@@ -0,0 +1,28 @@
+# Aplicación de Estudiante
+
+Un registro de Aplicación de Estudiante necesita ser creado cuando un estudiante aplica para un programa en su institución.
+Puedes Aprobar o Rechazar una aplicación de estudiante. Aceptando una aplicación de un estudiante puedes agregarlos al master de estudiantes.
+
+<img class="screenshot" alt="Student Applicant" src="/docs/assets/img/education/admission/student-applicant.png">
+
+### Estados de la Aplicación
+
+- Por defecto cuando una aplicación de estudiante es creada en el sistema, el estado de la aplicación es seteado a 'Applied'
+
+- Puedes actualizar el estado a 'Approved' una vez apruebas la aplicación de estudiante para unirse a su institución
+
+- Cuando el estado de la aplicación es actualizada a 'Approved', el botón de 'Inscribir' debería aparecer.
+	Puedes crear un registro de estudiante usando la aplicación de estudiante e inscribirlos a un programa al presionar el botón de Inscribir
+
+- Una vez el estudiante es creado usando la aplicación de estudiante, el sistema va a setear el estado del documento de aplicación a 'Admitted'
+	y no te va a permiter cambiar el estado de la aplicación a menos que el estudiante sea eliminado
+
+### Registro de Estudiante
+
+
+Una vez aprobada una Aplicación de Estudiante, puedes inscribirlo a un programa. Cuando le das click al butón 'Inscribir',
+el sistema creará un estudiante usando esa aplicación y le va a redireccionar a el [Formulario de Inscripción al Programa](/docs/user/manual/es/education/student/program-enrollment.html).
+
+<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/student-applicant-enroll.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/es/schools/fees/__init__.py b/erpnext/docs/user/manual/es/education/fees/__init__.py
similarity index 100%
rename from erpnext/docs/user/manual/es/schools/fees/__init__.py
rename to erpnext/docs/user/manual/es/education/fees/__init__.py
diff --git a/erpnext/docs/user/manual/es/education/fees/fee-category.md b/erpnext/docs/user/manual/es/education/fees/fee-category.md
new file mode 100644
index 0000000..a38ba7e
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/fees/fee-category.md
@@ -0,0 +1,7 @@
+# Categoría de Cuota
+
+Todos los tipos diferentes de cuotas que se cobran
+
+<img class="screenshot" alt="Fees Category" src="/docs/assets/img/education/fees/fee-category.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/es/education/fees/fee-structure.md b/erpnext/docs/user/manual/es/education/fees/fee-structure.md
new file mode 100644
index 0000000..6fe6af9
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/fees/fee-structure.md
@@ -0,0 +1,7 @@
+# Estructura de Cuota
+
+Una Estructura de Cuota es una plantilla que puede ser usada cuando se hacen registros de cuotas.
+
+<img class="screenshot" alt="Fees Structure" src="/docs/assets/img/education/fees/fee-structure.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/es/education/fees/fees.md b/erpnext/docs/user/manual/es/education/fees/fees.md
new file mode 100644
index 0000000..5f6eee4
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/fees/fees.md
@@ -0,0 +1,8 @@
+# Cuotas
+
+Mantiene un registro de todas las cuotas recolectadas de los estudiantes.
+La [Estructura de Cuota](/docs/user/manual/es/education/fees/fee-structure.html) es seleccionada basada en el programa seleccionada y los Términos Académicos.
+
+<img class="screenshot" alt="Fees" src="/docs/assets/img/education/fees/fees.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/es/education/fees/index.md b/erpnext/docs/user/manual/es/education/fees/index.md
new file mode 100644
index 0000000..c1b5bb5
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/fees/index.md
@@ -0,0 +1,9 @@
+# Cuota
+
+Esta sección contiene todos los documentos relacionado a las 'Cuota'
+
+<img class="screenshot" alt="Fees Section" src="/docs/assets/img/education/fees/fees-section.png">
+
+### Temas
+
+{index}
diff --git a/erpnext/docs/user/manual/es/schools/fees/index.txt b/erpnext/docs/user/manual/es/education/fees/index.txt
similarity index 100%
rename from erpnext/docs/user/manual/es/schools/fees/index.txt
rename to erpnext/docs/user/manual/es/education/fees/index.txt
diff --git a/erpnext/docs/user/manual/es/education/index.md b/erpnext/docs/user/manual/es/education/index.md
new file mode 100644
index 0000000..feca830
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/index.md
@@ -0,0 +1,8 @@
+# Education
+
+
+Los módulos de School estan diseñados para satisfacer los requerimientos de Escuelas, Colegios e Institutos Educacionales.
+
+<img class="screenshot" alt="Fees Section" src="/docs/assets/img/education/module.png">
+
+{index}
diff --git a/erpnext/docs/user/manual/es/schools/index.txt b/erpnext/docs/user/manual/es/education/index.txt
similarity index 100%
rename from erpnext/docs/user/manual/es/schools/index.txt
rename to erpnext/docs/user/manual/es/education/index.txt
diff --git a/erpnext/docs/user/manual/es/schools/schedule/__init__.py b/erpnext/docs/user/manual/es/education/schedule/__init__.py
similarity index 100%
rename from erpnext/docs/user/manual/es/schools/schedule/__init__.py
rename to erpnext/docs/user/manual/es/education/schedule/__init__.py
diff --git a/erpnext/docs/user/manual/es/education/schedule/course-schedule.md b/erpnext/docs/user/manual/es/education/schedule/course-schedule.md
new file mode 100644
index 0000000..7bf40ff
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/schedule/course-schedule.md
@@ -0,0 +1,25 @@
+# Horario de un Curso
+
+El Horario de Curso es el horario de una sesión de un profesor para un Curso en particular.
+Puedes ver un resumen del horario del curso en la vista de Calendario.
+
+<img class="screenshot" alt="Course Schedule" src="/docs/assets/img/education/schedule/course-schedule.png">
+
+### Marcando asistencia
+
+Puedes pasar la asistencia para un grupo de estudiantes usando el Horario de Curso.
+
+<img class="screenshot" alt="Course Schedule Attendance" src="/docs/assets/img/education/schedule/course-schedule-att.png">
+
+- Para hacer la asistencia, expandir la sección de asistencia.
+- Selecciona los estudiantes que estaban presentes para esa sesión.
+- Click en el botón de 'Mark Attendance'. El sistema va a crear los registros de asistencia automáticamente.
+
+### Ver Asistencia
+
+Una vez hayas marcado la asistencia usando la sección de asistencia en el Horario de un Curso, esta sección debería estar oculta.
+Un botón de Ver Asistencia debería aparecer. Click en el botón para ver todos los registros de asistencia creados para ese Horario de Curso.
+
+<img class="screenshot" alt="Course Schedule Attendance" src="/docs/assets/img/education/schedule/course-schedule-att-1.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/es/education/schedule/examination.md b/erpnext/docs/user/manual/es/education/schedule/examination.md
new file mode 100644
index 0000000..b8cef3e
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/schedule/examination.md
@@ -0,0 +1,8 @@
+# Examinación
+
+El registro de examinación puede ser usado para hacer el seguimiento del horario  de los examenes y los resultados de los mismos.
+
+<img class="screenshot" alt="Examination" src="/docs/assets/img/education/schedule/examination.png">
+
+
+{next}
diff --git a/erpnext/docs/user/manual/es/education/schedule/index.md b/erpnext/docs/user/manual/es/education/schedule/index.md
new file mode 100644
index 0000000..016aa10
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/schedule/index.md
@@ -0,0 +1,7 @@
+# Horario
+
+<img class="screenshot" alt="Schedule Section" src="/docs/assets/img/education/schedule/schedule-section.png">
+
+### Temas
+
+{index}
diff --git a/erpnext/docs/user/manual/es/schools/schedule/index.txt b/erpnext/docs/user/manual/es/education/schedule/index.txt
similarity index 100%
rename from erpnext/docs/user/manual/es/schools/schedule/index.txt
rename to erpnext/docs/user/manual/es/education/schedule/index.txt
diff --git a/erpnext/docs/user/manual/es/education/schedule/scheduling-tool.md b/erpnext/docs/user/manual/es/education/schedule/scheduling-tool.md
new file mode 100644
index 0000000..55ff425
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/schedule/scheduling-tool.md
@@ -0,0 +1,23 @@
+# Herramienta para Horarios
+
+Esta herramienta puede ser usada para crear los Horarios de los Cursos.
+
+<img class="screenshot" alt="Scheduling Tool" src="/docs/assets/img/education/schedule/scheduling-tool.png">
+
+### Creando Horarios de Cursos
+
+- Selecciona el Grupo de Estudiante para el cual vas a establecer el Horario.
+- Seleccione el curso, Aula y un Instructor para el Horario.
+- Específica los rangos de fecha desde-hasta para el horario de los cursos.
+- Especifíca Fecha Inicio y Fecha Final de un curso(Los Horarios de los cursos van a ser creados dentro de este rango de fechas)
+- Espeficíca el dia de la semana en el cual deseas establecer el horario.
+- Presiona el botón de 'Schedule Course'
+- El sistema va a crear la planificación si el Aula y el Instructor estan disponibles y no hay ningún conflicto con el grupo de estudiantes seleccionados con otros horarios para el mismo grupo.
+
+###Reprogramar Horario
+
+- Si deseas reprogramar el horario de un curso, sigue las instrucciones para crear horarios de cursos.
+- Selecciona el checkbox 'Reschedule' y luego da click en el botón 'Schedule Course'.
+- El sistema va a eliminar la progración de horario especifícada para ese curso dentro del rango de fecha seleccionado y crearia la nueva planificación de horario para el curso.
+
+{next}
diff --git a/erpnext/docs/user/manual/es/education/schedule/student-attendance.md b/erpnext/docs/user/manual/es/education/schedule/student-attendance.md
new file mode 100644
index 0000000..53bd4e9
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/schedule/student-attendance.md
@@ -0,0 +1,7 @@
+# Asistencia de Estudiante
+
+Mantiene los registros de la asistencia del estudiante. Los registros de asistencia pueden ser creados sobre los horarios de los cursos (Course Schedules).
+
+<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/education/schedule/student-attendance.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/es/schools/setup/__init__.py b/erpnext/docs/user/manual/es/education/setup/__init__.py
similarity index 100%
rename from erpnext/docs/user/manual/es/schools/setup/__init__.py
rename to erpnext/docs/user/manual/es/education/setup/__init__.py
diff --git a/erpnext/docs/user/manual/es/education/setup/academic-term.md b/erpnext/docs/user/manual/es/education/setup/academic-term.md
new file mode 100644
index 0000000..7a6b405
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/setup/academic-term.md
@@ -0,0 +1,6 @@
+# Término Académico
+
+<img class="screenshot" alt="Academic Term" src="/docs/assets/img/education/setup/academic-term.png">
+
+
+{next}
diff --git a/erpnext/docs/user/manual/es/education/setup/academic-year.md b/erpnext/docs/user/manual/es/education/setup/academic-year.md
new file mode 100644
index 0000000..7fe2a8f
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/setup/academic-year.md
@@ -0,0 +1,5 @@
+# Año Académico
+
+<img class="screenshot" alt="Academic Year" src="/docs/assets/img/education/setup/academic-year.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/es/education/setup/course.md b/erpnext/docs/user/manual/es/education/setup/course.md
new file mode 100644
index 0000000..fbbce62
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/setup/course.md
@@ -0,0 +1,5 @@
+# Curso
+
+<img class="screenshot" alt="Course" src="/docs/assets/img/education/setup/course.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/es/education/setup/index.md b/erpnext/docs/user/manual/es/education/setup/index.md
new file mode 100644
index 0000000..59df995
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/setup/index.md
@@ -0,0 +1,7 @@
+# Configuración
+
+<img class="screenshot" alt="Setup Section" src="/docs/assets/img/education/setup/setup-section.png">
+
+### Temas
+
+{index}
diff --git a/erpnext/docs/user/manual/es/schools/setup/index.txt b/erpnext/docs/user/manual/es/education/setup/index.txt
similarity index 100%
rename from erpnext/docs/user/manual/es/schools/setup/index.txt
rename to erpnext/docs/user/manual/es/education/setup/index.txt
diff --git a/erpnext/docs/user/manual/es/education/setup/instructor.md b/erpnext/docs/user/manual/es/education/setup/instructor.md
new file mode 100644
index 0000000..4812c15
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/setup/instructor.md
@@ -0,0 +1,5 @@
+# Instructor
+
+<img class="screenshot" alt="Instructor" src="/docs/assets/img/education/setup/instructor.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/es/education/setup/program.md b/erpnext/docs/user/manual/es/education/setup/program.md
new file mode 100644
index 0000000..1236057
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/setup/program.md
@@ -0,0 +1,5 @@
+# Programa
+
+<img class="screenshot" alt="Program" src="/docs/assets/img/education/setup/program.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/es/education/setup/room.md b/erpnext/docs/user/manual/es/education/setup/room.md
new file mode 100644
index 0000000..7750dcf
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/setup/room.md
@@ -0,0 +1,6 @@
+# Aula
+
+
+<img class="screenshot" alt="Room" src="/docs/assets/img/education/setup/room.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/es/schools/student/__init__.py b/erpnext/docs/user/manual/es/education/student/__init__.py
similarity index 100%
rename from erpnext/docs/user/manual/es/schools/student/__init__.py
rename to erpnext/docs/user/manual/es/education/student/__init__.py
diff --git a/erpnext/docs/user/manual/es/schools/student/index.md b/erpnext/docs/user/manual/es/education/student/index.md
similarity index 100%
rename from erpnext/docs/user/manual/es/schools/student/index.md
rename to erpnext/docs/user/manual/es/education/student/index.md
diff --git a/erpnext/docs/user/manual/es/schools/student/index.txt b/erpnext/docs/user/manual/es/education/student/index.txt
similarity index 100%
rename from erpnext/docs/user/manual/es/schools/student/index.txt
rename to erpnext/docs/user/manual/es/education/student/index.txt
diff --git a/erpnext/docs/user/manual/es/education/student/student-batch.md b/erpnext/docs/user/manual/es/education/student/student-batch.md
new file mode 100644
index 0000000..bb7c9d5
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/student/student-batch.md
@@ -0,0 +1,8 @@
+# Lote de Estudiantes
+
+
+Un lote de estudiantes es una colección de estudiantes desde los Grupos de Estudiantes.
+
+<img class="screenshot" alt="Student" src="/docs/assets/img/education/student/student-batch.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/es/education/student/student-group-creation-tool.md b/erpnext/docs/user/manual/es/education/student/student-group-creation-tool.md
new file mode 100644
index 0000000..942fadf
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/student/student-group-creation-tool.md
@@ -0,0 +1,8 @@
+# Herramienta para creación de Grupo de Estudiantes
+
+Esta herramienta te permite crear grupos de estudiantes. Puedes especificar multiples parámetros para crearlos.
+
+
+<img class="screenshot" alt="Student Group Creation Tool" src="/docs/assets/img/education/student/student-group-creation-tool.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/es/education/student/student-group.md b/erpnext/docs/user/manual/es/education/student/student-group.md
new file mode 100644
index 0000000..59dfcbc
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/student/student-group.md
@@ -0,0 +1,8 @@
+# Grupo de Estudiante
+
+Un Grupo de Estudiante es una colección de estudiantes tomando el mismo curso. Puedes crear calendarios para los cursos y examinaciones para un Grupo de Estudiante.
+Un Grupo de Estudiante necesita ser creado para cada curso en un año o término académico en particular.
+
+<img class="screenshot" alt="Student Group" src="/docs/assets/img/education/student/student-group.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/es/education/student/student-log.md b/erpnext/docs/user/manual/es/education/student/student-log.md
new file mode 100644
index 0000000..e5a5e2c
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/student/student-log.md
@@ -0,0 +1,8 @@
+# Bitácora de Estudiante (Log)
+
+Puedes crear una nota de una actividad de un estudiante usando la bitácora de estudiante (log)
+Los registros de bitágora pueden ser categorizadas como 'General', 'Academic', 'Medical' or 'Achievement'
+
+<img class="screenshot" alt="Student" src="/docs/assets/img/education/student/student-log.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/es/education/student/student.md b/erpnext/docs/user/manual/es/education/student/student.md
new file mode 100644
index 0000000..21724a7
--- /dev/null
+++ b/erpnext/docs/user/manual/es/education/student/student.md
@@ -0,0 +1,10 @@
+# Estudiante
+
+Un estudiante es una persona que se ha registrado en su institución y has aceptado se solicitud de aplicación.
+El doctype de Estudiante mantiene los detalles personales de los estudiantes.
+
+Puedes ver todo lo relacionado a un estudiante en particular en esta página. Ejemplo: Pagos, Grupo de Estudiante, etc.
+
+<img class="screenshot" alt="Student" src="/docs/assets/img/education/student/student.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/es/index.txt b/erpnext/docs/user/manual/es/index.txt
index 00cf97b..ad85a79 100644
--- a/erpnext/docs/user/manual/es/index.txt
+++ b/erpnext/docs/user/manual/es/index.txt
@@ -1,4 +1,4 @@
 introduction
 accounts
 projects
-schools
+education
diff --git a/erpnext/docs/user/manual/es/schools/Assessment/assessment_criteria.md b/erpnext/docs/user/manual/es/schools/Assessment/assessment_criteria.md
deleted file mode 100644
index 92f338f..0000000
--- a/erpnext/docs/user/manual/es/schools/Assessment/assessment_criteria.md
+++ /dev/null
@@ -1,13 +0,0 @@
-#Criterios de Evaluación
-
-Criterios de evaluación es el parámetro basado en el que se evalúa el estudiante.
-
-<img class="screenshot" alt="Assessment Criteria" src="/docs/assets/img/schools/assessment/assessment-criteria.png">
-
-Después de la evaluación para un curso, las calificaciones obtenidas se ingresan en base a los criterios de evaluación. Por ejemplo, si la evaluación se llevó a cabo para el tema de la ciencia, entonces usted puede evaluar al estudiante en ciencia en varios criterios como la escritura, prácticas, presentación, etc
-
-Los Criterios de Evaluación se usan al programar el Plan de Evaluación para el Grupo de Estudiantes y el Curso.
-
-<img class="screenshot" alt="Assessment Plan Criteria" src="/docs/assets/img/schools/assessment/assessment-plan-criteria.png">
-
-{next}
diff --git a/erpnext/docs/user/manual/es/schools/Assessment/assessment_group.md b/erpnext/docs/user/manual/es/schools/Assessment/assessment_group.md
deleted file mode 100644
index 7102888..0000000
--- a/erpnext/docs/user/manual/es/schools/Assessment/assessment_group.md
+++ /dev/null
@@ -1,13 +0,0 @@
-#Grupo de Evaluación
-
-La estructura del grupo de evaluación es un maestro donde se puede definir la jerarquía para el examen realizado en su instituto de educación.
-
-Por ejemplo, si realiza dos evaluaciones en un año académico, configure el Grupo de evaluación de la siguiente manera.
-
-<img class="screenshot" alt="Assessment Group Term" src="/docs/assets/img/schools/assessment/assessment-group-term.png">
-
-En la misma línea, también puede definir varios Grupo de Evaluación basado sobre la evaluación llevada a cabo en su instituto.
-
-<img class="screenshot" alt="Assessment Group Term" src="/docs/assets/img/schools/assessment/assessment-group-details.png">
-
-{next}
diff --git a/erpnext/docs/user/manual/es/schools/Assessment/assessment_plan.md b/erpnext/docs/user/manual/es/schools/Assessment/assessment_plan.md
deleted file mode 100644
index 9d66c21..0000000
--- a/erpnext/docs/user/manual/es/schools/Assessment/assessment_plan.md
+++ /dev/null
@@ -1,19 +0,0 @@
-#Plan de Evaluación
-
-Para programar una evaluación/examinación para un Grupo de Estudiantes, para un curso específico, crea un Plan de Evaluación. En el plan de evaluación, puedes capturar detalles como:
-
-1. Escala de Calificaciones basada en qué calificaciones serán asignadas a los estudiantes.
-
-2. Fecha de planificación de la Evaluación
-
-3. Aula donde se va a llevar a cabo la evaluación
-
-4. Examinador y Supervisor
-
-<img class="screenshot" alt="Assessment Plan Details" src="/docs/assets/img/schools/assessment/assessment-plan-details.png">
-
-5. Los Criterios de Evaluación son la lista de criterios basados ​​en que cada estudiante en será evaluado y los grados serán asignados.
-
-<img class="screenshot" alt="Assessment Plan Criteria" src="/docs/assets/img/schools/assessment/assessment-plan-criteria.png">
-
-{next}
diff --git a/erpnext/docs/user/manual/es/schools/Assessment/assessment_result.md b/erpnext/docs/user/manual/es/schools/Assessment/assessment_result.md
deleted file mode 100644
index 2d94097..0000000
--- a/erpnext/docs/user/manual/es/schools/Assessment/assessment_result.md
+++ /dev/null
@@ -1,7 +0,0 @@
-#Resultados de Evaluación
-
-El resultado de la evaluación es un registro de las calificaciones obtenidas por el estudiante para una evaluación específica. El resultado de la evaluación se crea en el backend en base a los puntos en [Herramienta de Resultados de Evaluación](/docs/user/manual/es/schools/assessment/assessment_result_tool.html).
-
-<img class="screenshot" alt="Assessment Result" src="/docs/assets/img/schools/assessment/assessment-result.png">
-
-{next}
diff --git a/erpnext/docs/user/manual/es/schools/Assessment/assessment_result_tool.md b/erpnext/docs/user/manual/es/schools/Assessment/assessment_result_tool.md
deleted file mode 100644
index 70e4ee3..0000000
--- a/erpnext/docs/user/manual/es/schools/Assessment/assessment_result_tool.md
+++ /dev/null
@@ -1,10 +0,0 @@
-#Herramienta de resultados de la evaluación
-
-
-Herramienta de resultados de evaluación le ayuda a ingresar las calificaciones obtenidas por los estudiantes para un curso específico. En esta herramienta, basada en el plan de evaluación, todos los estudiantes van a ser filtrados dentro de la herramienta de resultados de la evaluación. También, Columnas para los Criterios de Evaluación serán donde las calificaciones ganadas pueden ser ingresadas para cada Estudiante.
-
-<img class="screenshot" alt="Assessment Result Tool" src="/docs/assets/img/schools/assessment/assessment-result-tool.png">
-
-A medida que vaya introduciendo las notas para un Estudiante y cambie al siguiente alumno, en el backend, el registro de Resultados del Estudiante se creará automáticamente para ese Estudiante.
-
-{next}
diff --git a/erpnext/docs/user/manual/es/schools/Assessment/grading_scale.md b/erpnext/docs/user/manual/es/schools/Assessment/grading_scale.md
deleted file mode 100644
index 9107f92..0000000
--- a/erpnext/docs/user/manual/es/schools/Assessment/grading_scale.md
+++ /dev/null
@@ -1,7 +0,0 @@
-#Escala de calificación
-
-En la escala de calificación, puedes definir varios grados y límites para los estudiantes. Basado en la calificación obtenida por el estudiante en la evaluación, el grado (Grade) será asignado.
-
-<img class="screenshot" alt="Grading Scale" src="/docs/assets/img/schools/assessment/grading-scale.png">
-
-{next}
diff --git a/erpnext/docs/user/manual/es/schools/admission/program-enrollment.md b/erpnext/docs/user/manual/es/schools/admission/program-enrollment.md
deleted file mode 100644
index 34e8996..0000000
--- a/erpnext/docs/user/manual/es/schools/admission/program-enrollment.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Inscripción al Programa
-
-Este formulario te permite inscribir un estudiante a un programa. Un estudiante puede ser inscrito en multiples programas.
-
-<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/schools/admission/program-enrollment.png">
-
-{next}
diff --git a/erpnext/docs/user/manual/es/schools/admission/student-applicant.md b/erpnext/docs/user/manual/es/schools/admission/student-applicant.md
deleted file mode 100644
index 33d8dd7..0000000
--- a/erpnext/docs/user/manual/es/schools/admission/student-applicant.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# Aplicación de Estudiante
-
-Un registro de Aplicación de Estudiante necesita ser creado cuando un estudiante aplica para un programa en su institución.
-Puedes Aprobar o Rechazar una aplicación de estudiante. Aceptando una aplicación de un estudiante puedes agregarlos al master de estudiantes.
-
-<img class="screenshot" alt="Student Applicant" src="/docs/assets/img/schools/admission/student-applicant.png">
-
-### Estados de la Aplicación
-
-- Por defecto cuando una aplicación de estudiante es creada en el sistema, el estado de la aplicación es seteado a 'Applied'
-
-- Puedes actualizar el estado a 'Approved' una vez apruebas la aplicación de estudiante para unirse a su institución
-
-- Cuando el estado de la aplicación es actualizada a 'Approved', el botón de 'Inscribir' debería aparecer.
-	Puedes crear un registro de estudiante usando la aplicación de estudiante e inscribirlos a un programa al presionar el botón de Inscribir
-
-- Una vez el estudiante es creado usando la aplicación de estudiante, el sistema va a setear el estado del documento de aplicación a 'Admitted'
-	y no te va a permiter cambiar el estado de la aplicación a menos que el estudiante sea eliminado
-
-### Registro de Estudiante
-
-
-Una vez aprobada una Aplicación de Estudiante, puedes inscribirlo a un programa. Cuando le das click al butón 'Inscribir',
-el sistema creará un estudiante usando esa aplicación y le va a redireccionar a el [Formulario de Inscripción al Programa](/docs/user/manual/es/schools/student/program-enrollment.html).
-
-<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/schools/admission/student-applicant-enroll.png">
-
-{next}
diff --git a/erpnext/docs/user/manual/es/schools/fees/fee-category.md b/erpnext/docs/user/manual/es/schools/fees/fee-category.md
deleted file mode 100644
index c05b3f5..0000000
--- a/erpnext/docs/user/manual/es/schools/fees/fee-category.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Categoría de Cuota
-
-Todos los tipos diferentes de cuotas que se cobran
-
-<img class="screenshot" alt="Fees Category" src="/docs/assets/img/schools/fees/fee-category.png">
-
-{next}
diff --git a/erpnext/docs/user/manual/es/schools/fees/fee-structure.md b/erpnext/docs/user/manual/es/schools/fees/fee-structure.md
deleted file mode 100644
index 1f621d7..0000000
--- a/erpnext/docs/user/manual/es/schools/fees/fee-structure.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Estructura de Cuota
-
-Una Estructura de Cuota es una plantilla que puede ser usada cuando se hacen registros de cuotas.
-
-<img class="screenshot" alt="Fees Structure" src="/docs/assets/img/schools/fees/fee-structure.png">
-
-{next}
diff --git a/erpnext/docs/user/manual/es/schools/fees/fees.md b/erpnext/docs/user/manual/es/schools/fees/fees.md
deleted file mode 100644
index d6b74dc..0000000
--- a/erpnext/docs/user/manual/es/schools/fees/fees.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Cuotas
-
-Mantiene un registro de todas las cuotas recolectadas de los estudiantes.
-La [Estructura de Cuota](/docs/user/manual/es/schools/fees/fee-structure.html) es seleccionada basada en el programa seleccionada y los Términos Académicos.
-
-<img class="screenshot" alt="Fees" src="/docs/assets/img/schools/fees/fees.png">
-
-{next}
diff --git a/erpnext/docs/user/manual/es/schools/fees/index.md b/erpnext/docs/user/manual/es/schools/fees/index.md
deleted file mode 100644
index e883813..0000000
--- a/erpnext/docs/user/manual/es/schools/fees/index.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Cuota
-
-Esta sección contiene todos los documentos relacionado a las 'Cuota'
-
-<img class="screenshot" alt="Fees Section" src="/docs/assets/img/schools/fees/fees-section.png">
-
-### Temas
-
-{index}
diff --git a/erpnext/docs/user/manual/es/schools/index.md b/erpnext/docs/user/manual/es/schools/index.md
deleted file mode 100644
index a1824dc..0000000
--- a/erpnext/docs/user/manual/es/schools/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Schools
-
-
-Los módulos de School estan diseñados para satisfacer los requerimientos de Escuelas, Colegios e Institutos Educacionales.
-
-<img class="screenshot" alt="Fees Section" src="/docs/assets/img/schools/module.png">
-
-{index}
diff --git a/erpnext/docs/user/manual/es/schools/schedule/course-schedule.md b/erpnext/docs/user/manual/es/schools/schedule/course-schedule.md
deleted file mode 100644
index 629c828..0000000
--- a/erpnext/docs/user/manual/es/schools/schedule/course-schedule.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Horario de un Curso
-
-El Horario de Curso es el horario de una sesión de un profesor para un Curso en particular.
-Puedes ver un resumen del horario del curso en la vista de Calendario.
-
-<img class="screenshot" alt="Course Schedule" src="/docs/assets/img/schools/schedule/course-schedule.png">
-
-### Marcando asistencia
-
-Puedes pasar la asistencia para un grupo de estudiantes usando el Horario de Curso.
-
-<img class="screenshot" alt="Course Schedule Attendance" src="/docs/assets/img/schools/schedule/course-schedule-att.png">
-
-- Para hacer la asistencia, expandir la sección de asistencia.
-- Selecciona los estudiantes que estaban presentes para esa sesión.
-- Click en el botón de 'Mark Attendance'. El sistema va a crear los registros de asistencia automáticamente.
-
-### Ver Asistencia
-
-Una vez hayas marcado la asistencia usando la sección de asistencia en el Horario de un Curso, esta sección debería estar oculta.
-Un botón de Ver Asistencia debería aparecer. Click en el botón para ver todos los registros de asistencia creados para ese Horario de Curso.
-
-<img class="screenshot" alt="Course Schedule Attendance" src="/docs/assets/img/schools/schedule/course-schedule-att-1.png">
-
-{next}
diff --git a/erpnext/docs/user/manual/es/schools/schedule/examination.md b/erpnext/docs/user/manual/es/schools/schedule/examination.md
deleted file mode 100644
index 5f85aed..0000000
--- a/erpnext/docs/user/manual/es/schools/schedule/examination.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Examinación
-
-El registro de examinación puede ser usado para hacer el seguimiento del horario  de los examenes y los resultados de los mismos.
-
-<img class="screenshot" alt="Examination" src="/docs/assets/img/schools/schedule/examination.png">
-
-
-{next}
diff --git a/erpnext/docs/user/manual/es/schools/schedule/index.md b/erpnext/docs/user/manual/es/schools/schedule/index.md
deleted file mode 100644
index f9c2c3b..0000000
--- a/erpnext/docs/user/manual/es/schools/schedule/index.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Horario
-
-<img class="screenshot" alt="Schedule Section" src="/docs/assets/img/schools/schedule/schedule-section.png">
-
-### Temas
-
-{index}
diff --git a/erpnext/docs/user/manual/es/schools/schedule/scheduling-tool.md b/erpnext/docs/user/manual/es/schools/schedule/scheduling-tool.md
deleted file mode 100644
index 070a035..0000000
--- a/erpnext/docs/user/manual/es/schools/schedule/scheduling-tool.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Herramienta para Horarios
-
-Esta herramienta puede ser usada para crear los Horarios de los Cursos.
-
-<img class="screenshot" alt="Scheduling Tool" src="/docs/assets/img/schools/schedule/scheduling-tool.png">
-
-### Creando Horarios de Cursos
-
-- Selecciona el Grupo de Estudiante para el cual vas a establecer el Horario.
-- Seleccione el curso, Aula y un Instructor para el Horario.
-- Específica los rangos de fecha desde-hasta para el horario de los cursos.
-- Especifíca Fecha Inicio y Fecha Final de un curso(Los Horarios de los cursos van a ser creados dentro de este rango de fechas)
-- Espeficíca el dia de la semana en el cual deseas establecer el horario.
-- Presiona el botón de 'Schedule Course'
-- El sistema va a crear la planificación si el Aula y el Instructor estan disponibles y no hay ningún conflicto con el grupo de estudiantes seleccionados con otros horarios para el mismo grupo.
-
-###Reprogramar Horario
-
-- Si deseas reprogramar el horario de un curso, sigue las instrucciones para crear horarios de cursos.
-- Selecciona el checkbox 'Reschedule' y luego da click en el botón 'Schedule Course'.
-- El sistema va a eliminar la progración de horario especifícada para ese curso dentro del rango de fecha seleccionado y crearia la nueva planificación de horario para el curso.
-
-{next}
diff --git a/erpnext/docs/user/manual/es/schools/schedule/student-attendance.md b/erpnext/docs/user/manual/es/schools/schedule/student-attendance.md
deleted file mode 100644
index a06c4f2..0000000
--- a/erpnext/docs/user/manual/es/schools/schedule/student-attendance.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Asistencia de Estudiante
-
-Mantiene los registros de la asistencia del estudiante. Los registros de asistencia pueden ser creados sobre los horarios de los cursos (Course Schedules).
-
-<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/schools/schedule/student-attendance.png">
-
-{next}
diff --git a/erpnext/docs/user/manual/es/schools/setup/academic-term.md b/erpnext/docs/user/manual/es/schools/setup/academic-term.md
deleted file mode 100644
index 83af58a..0000000
--- a/erpnext/docs/user/manual/es/schools/setup/academic-term.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Término Académico
-
-<img class="screenshot" alt="Academic Term" src="/docs/assets/img/schools/setup/academic-term.png">
-
-
-{next}
diff --git a/erpnext/docs/user/manual/es/schools/setup/academic-year.md b/erpnext/docs/user/manual/es/schools/setup/academic-year.md
deleted file mode 100644
index 56a46f9..0000000
--- a/erpnext/docs/user/manual/es/schools/setup/academic-year.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Año Académico
-
-<img class="screenshot" alt="Academic Year" src="/docs/assets/img/schools/setup/academic-year.png">
-
-{next}
diff --git a/erpnext/docs/user/manual/es/schools/setup/course.md b/erpnext/docs/user/manual/es/schools/setup/course.md
deleted file mode 100644
index 799f9b4..0000000
--- a/erpnext/docs/user/manual/es/schools/setup/course.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Curso
-
-<img class="screenshot" alt="Course" src="/docs/assets/img/schools/setup/course.png">
-
-{next}
diff --git a/erpnext/docs/user/manual/es/schools/setup/index.md b/erpnext/docs/user/manual/es/schools/setup/index.md
deleted file mode 100644
index 070db54..0000000
--- a/erpnext/docs/user/manual/es/schools/setup/index.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configuración
-
-<img class="screenshot" alt="Setup Section" src="/docs/assets/img/schools/setup/setup-section.png">
-
-### Temas
-
-{index}
diff --git a/erpnext/docs/user/manual/es/schools/setup/instructor.md b/erpnext/docs/user/manual/es/schools/setup/instructor.md
deleted file mode 100644
index 1a4d351..0000000
--- a/erpnext/docs/user/manual/es/schools/setup/instructor.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Instructor
-
-<img class="screenshot" alt="Instructor" src="/docs/assets/img/schools/setup/instructor.png">
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/es/schools/setup/program.md b/erpnext/docs/user/manual/es/schools/setup/program.md
deleted file mode 100644
index 78895c5..0000000
--- a/erpnext/docs/user/manual/es/schools/setup/program.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Programa
-
-<img class="screenshot" alt="Program" src="/docs/assets/img/schools/setup/program.png">
-
-{next}
diff --git a/erpnext/docs/user/manual/es/schools/setup/room.md b/erpnext/docs/user/manual/es/schools/setup/room.md
deleted file mode 100644
index 92a4de7..0000000
--- a/erpnext/docs/user/manual/es/schools/setup/room.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Aula
-
-
-<img class="screenshot" alt="Room" src="/docs/assets/img/schools/setup/room.png">
-
-{next}
diff --git a/erpnext/docs/user/manual/es/schools/student/student-batch.md b/erpnext/docs/user/manual/es/schools/student/student-batch.md
deleted file mode 100644
index 4d5a17e..0000000
--- a/erpnext/docs/user/manual/es/schools/student/student-batch.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Lote de Estudiantes
-
-
-Un lote de estudiantes es una colección de estudiantes desde los Grupos de Estudiantes.
-
-<img class="screenshot" alt="Student" src="/docs/assets/img/schools/student/student-batch.png">
-
-{next}
diff --git a/erpnext/docs/user/manual/es/schools/student/student-group-creation-tool.md b/erpnext/docs/user/manual/es/schools/student/student-group-creation-tool.md
deleted file mode 100644
index 2102c34..0000000
--- a/erpnext/docs/user/manual/es/schools/student/student-group-creation-tool.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Herramienta para creación de Grupo de Estudiantes
-
-Esta herramienta te permite crear grupos de estudiantes. Puedes especificar multiples parámetros para crearlos.
-
-
-<img class="screenshot" alt="Student Group Creation Tool" src="/docs/assets/img/schools/student/student-group-creation-tool.png">
-
-{next}
diff --git a/erpnext/docs/user/manual/es/schools/student/student-group.md b/erpnext/docs/user/manual/es/schools/student/student-group.md
deleted file mode 100644
index f5841cc..0000000
--- a/erpnext/docs/user/manual/es/schools/student/student-group.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Grupo de Estudiante
-
-Un Grupo de Estudiante es una colección de estudiantes tomando el mismo curso. Puedes crear calendarios para los cursos y examinaciones para un Grupo de Estudiante.
-Un Grupo de Estudiante necesita ser creado para cada curso en un año o término académico en particular.
-
-<img class="screenshot" alt="Student Group" src="/docs/assets/img/schools/student/student-group.png">
-
-{next}
diff --git a/erpnext/docs/user/manual/es/schools/student/student-log.md b/erpnext/docs/user/manual/es/schools/student/student-log.md
deleted file mode 100644
index 296b867..0000000
--- a/erpnext/docs/user/manual/es/schools/student/student-log.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Bitácora de Estudiante (Log)
-
-Puedes crear una nota de una actividad de un estudiante usando la bitácora de estudiante (log)
-Los registros de bitágora pueden ser categorizadas como 'General', 'Academic', 'Medical' or 'Achievement'
-
-<img class="screenshot" alt="Student" src="/docs/assets/img/schools/student/student-log.png">
-
-{next}
diff --git a/erpnext/docs/user/manual/es/schools/student/student.md b/erpnext/docs/user/manual/es/schools/student/student.md
deleted file mode 100644
index fee84c5..0000000
--- a/erpnext/docs/user/manual/es/schools/student/student.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Estudiante
-
-Un estudiante es una persona que se ha registrado en su institución y has aceptado se solicitud de aplicación.
-El doctype de Estudiante mantiene los detalles personales de los estudiantes.
-
-Puedes ver todo lo relacionado a un estudiante en particular en esta página. Ejemplo: Pagos, Grupo de Estudiante, etc.
-
-<img class="screenshot" alt="Student" src="/docs/assets/img/schools/student/student.png">
-
-{next}
diff --git a/erpnext/docs/user/videos/learn/education.md b/erpnext/docs/user/videos/learn/education.md
new file mode 100644
index 0000000..24b0cd0
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/education.md
@@ -0,0 +1,7 @@
+# ERPNext for Education
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/f6foQOyGzdA" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 39:21**
+
+This video is a recording of a webinar on how education institutes can use ERPNext Education module. It covers management of Student Applications, managing masters like Students, Programs and Courses. Also, you can manage processes like Course Scheduling, Student Assessment, Fees and Attendance.
\ No newline at end of file
diff --git a/erpnext/docs/user/videos/learn/index.md b/erpnext/docs/user/videos/learn/index.md
index dad5cc0..3bdf305 100644
--- a/erpnext/docs/user/videos/learn/index.md
+++ b/erpnext/docs/user/videos/learn/index.md
@@ -27,8 +27,8 @@
               ERPNext for Retailers</a>
             <span class="text-muted pull-right">39:21</span>
         </li>
-        <li><a href="/docs/user/videos/learn/schools.html">
-              ERPNext for Schools</a>
+        <li><a href="/docs/user/videos/learn/education.html">
+              ERPNext for Education</a>
             <span class="text-muted pull-right">39:21</span>
         </li>
     </ul>
diff --git a/erpnext/docs/user/videos/learn/schools.md b/erpnext/docs/user/videos/learn/schools.md
deleted file mode 100644
index 3553a53..0000000
--- a/erpnext/docs/user/videos/learn/schools.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# ERPNext for Schools
-
-<iframe width="660" height="371" src="https://www.youtube.com/embed/f6foQOyGzdA" frameborder="0" allowfullscreen></iframe>
-
-**Duration: 39:21**
-
-This video is a recording of a webinar on how education institutes can use ERPNext Schools module. It covers management of Student Applications, managing masters like Students, Programs and Courses. Also, you can manage processes like Course Scheduling, Student Assessment, Fees and Attendance.
\ No newline at end of file
diff --git a/erpnext/domains/agriculture.py b/erpnext/domains/agriculture.py
new file mode 100644
index 0000000..378c5f1
--- /dev/null
+++ b/erpnext/domains/agriculture.py
@@ -0,0 +1,22 @@
+data = {
+	'desktop_icons': [
+		'Agriculture Task',
+		'Crop',
+		'Crop Cycle',
+		'Fertilizer',
+		'Item',
+		'Land Unit',
+		'Disease',
+		'Plant Analysis',
+		'Soil Analysis',
+		'Soil Texture',
+		'Task',
+		'Water Analysis',
+		'Weather'
+	],
+	'modules': [
+		'Agriculture'
+	],
+	'default_portal_role': 'System Manager',
+	'on_setup': 'erpnext.agriculture.setup.setup_agriculture'
+}
\ No newline at end of file
diff --git a/erpnext/domains/education.py b/erpnext/domains/education.py
index 7a86c76..eed3545 100644
--- a/erpnext/domains/education.py
+++ b/erpnext/domains/education.py
@@ -8,7 +8,9 @@
 		'Fees',
 		'Task',
 		'ToDo',
-		'Schools'
+		'Education',
+		'Student Attendance Tool',
+		'Student Applicant'
 	],
 	'default_portal_role': 'Student',
 	'restricted_roles': [
@@ -17,21 +19,8 @@
 		'Academics User'
 	],
 	'modules': [
-		'Schools'
+		'Education'
 	],
-	'fixtures': [
-		dict(doctype='Academic Year', academic_year_name='2013-14'),
-		dict(doctype='Academic Year', academic_year_name='2014-15'),
-		dict(doctype='Academic Year', academic_year_name='2015-16'),
-		dict(doctype='Academic Year', academic_year_name='2016-17'),
-		dict(doctype='Academic Year', academic_year_name='2017-18'),
-		dict(doctype='Academic Year', academic_year_name='2018-19'),
-		dict(doctype='Academic Year', academic_year_name='2019-20'),
-		dict(doctype='Academic Term', academic_year='2016-17', term_name='Semester 1'),
-		dict(doctype='Academic Term', academic_year='2016-17', term_name='Semester 2'),
-		dict(doctype='Academic Term', academic_year='2016-17', term_name='Semester 3'),
-		dict(doctype='Academic Term', academic_year='2017-18', term_name='Semester 1'),
-		dict(doctype='Academic Term', academic_year='2017-18', term_name='Semester 2'),
-		dict(doctype='Academic Term', academic_year='2017-18', term_name='Semester 3')
-	]
+	'on_setup': 'erpnext.education.setup.setup_education'
+
 }
\ No newline at end of file
diff --git a/erpnext/domains/manufacturing.py b/erpnext/domains/manufacturing.py
index b8bb7e0..8c911a3 100644
--- a/erpnext/domains/manufacturing.py
+++ b/erpnext/domains/manufacturing.py
@@ -18,8 +18,5 @@
 	'set_value': [
 		['Stock Settings', None, 'show_barcode_field', 1]
 	],
-	'restricted_roles': [
-		'Manufacturing User'
-	],
 	'default_portal_role': 'Customer'
 }
\ No newline at end of file
diff --git a/erpnext/domains/non_profit.py b/erpnext/domains/non_profit.py
new file mode 100644
index 0000000..b9683bd
--- /dev/null
+++ b/erpnext/domains/non_profit.py
@@ -0,0 +1,17 @@
+data = {
+	'desktop_icons': [
+		'Non Profit',
+		'Member',
+		'Donor',
+		'Volunteer',
+		'Grant Application',
+		'Accounts',
+		'Buying',
+		'HR',
+		'ToDo'
+	],
+	'modules': [
+		'Non Profit'
+	],
+	'default_portal_role': 'Non Profit Manager'
+}
\ No newline at end of file
diff --git a/erpnext/domains/retail.py b/erpnext/domains/retail.py
index 1bfd65f..07b2e27 100644
--- a/erpnext/domains/retail.py
+++ b/erpnext/domains/retail.py
@@ -9,10 +9,6 @@
 		'Task',
 		'ToDo'
 	],
-	'properties': [
-		{'doctype': 'Item', 'fieldname': 'manufacturing', 'property': 'hidden', 'value': 1},
-		{'doctype': 'Customer', 'fieldname': 'credit_limit_section', 'property': 'hidden', 'value': 1},
-	],
 	'set_value': [
 		['Stock Settings', None, 'show_barcode_field', 1]
 	],
diff --git a/erpnext/schools/__init__.py b/erpnext/education/__init__.py
similarity index 100%
copy from erpnext/schools/__init__.py
copy to erpnext/education/__init__.py
diff --git a/erpnext/schools/api.py b/erpnext/education/api.py
similarity index 100%
rename from erpnext/schools/api.py
rename to erpnext/education/api.py
diff --git a/erpnext/schools/doctype/__init__.py b/erpnext/education/doctype/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/__init__.py
copy to erpnext/education/doctype/__init__.py
diff --git a/erpnext/schools/doctype/academic_term/__init__.py b/erpnext/education/doctype/academic_term/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/academic_term/__init__.py
rename to erpnext/education/doctype/academic_term/__init__.py
diff --git a/erpnext/schools/doctype/academic_term/academic_term.js b/erpnext/education/doctype/academic_term/academic_term.js
similarity index 100%
rename from erpnext/schools/doctype/academic_term/academic_term.js
rename to erpnext/education/doctype/academic_term/academic_term.js
diff --git a/erpnext/education/doctype/academic_term/academic_term.json b/erpnext/education/doctype/academic_term/academic_term.json
new file mode 100644
index 0000000..06c5b1a
--- /dev/null
+++ b/erpnext/education/doctype/academic_term/academic_term.json
@@ -0,0 +1,216 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:title", 
+ "beta": 0, 
+ "creation": "2015-09-08 17:19:19.158228", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 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": 0, 
+   "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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "term_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Term Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "term_start_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Term Start Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "term_end_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Term End Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "title", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Title", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:05:58.567627", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Academic Term", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "name", 
+ "sort_order": "DESC", 
+ "title_field": "title", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/academic_term/academic_term.py b/erpnext/education/doctype/academic_term/academic_term.py
similarity index 100%
rename from erpnext/schools/doctype/academic_term/academic_term.py
rename to erpnext/education/doctype/academic_term/academic_term.py
diff --git a/erpnext/education/doctype/academic_term/test_academic_term.js b/erpnext/education/doctype/academic_term/test_academic_term.js
new file mode 100644
index 0000000..6d91e97
--- /dev/null
+++ b/erpnext/education/doctype/academic_term/test_academic_term.js
@@ -0,0 +1,24 @@
+// Testing Setup Module in Education
+QUnit.module('education');
+
+QUnit.test('Test: Academic Term', function(assert){
+	assert.expect(4);
+	let done = assert.async();
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make('Academic Term', [
+				{academic_year: '2016-17'},
+				{term_name: "Semester 1"},
+				{term_start_date: '2016-07-20'},
+				{term_end_date:'2017-06-20'},
+			]);
+		},
+		() => {
+			assert.ok(cur_frm.doc.academic_year=='2016-17');
+			assert.ok(cur_frm.doc.term_name=='Semester 1');
+			assert.ok(cur_frm.doc.term_start_date=='2016-07-20');
+			assert.ok(cur_frm.doc.term_end_date=='2017-06-20');
+		},
+		() => done()
+	]);
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/academic_term/test_academic_term.py b/erpnext/education/doctype/academic_term/test_academic_term.py
similarity index 100%
rename from erpnext/schools/doctype/academic_term/test_academic_term.py
rename to erpnext/education/doctype/academic_term/test_academic_term.py
diff --git a/erpnext/schools/doctype/academic_term/test_records.json b/erpnext/education/doctype/academic_term/test_records.json
similarity index 100%
rename from erpnext/schools/doctype/academic_term/test_records.json
rename to erpnext/education/doctype/academic_term/test_records.json
diff --git a/erpnext/schools/doctype/academic_year/__init__.py b/erpnext/education/doctype/academic_year/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/academic_year/__init__.py
rename to erpnext/education/doctype/academic_year/__init__.py
diff --git a/erpnext/schools/doctype/academic_year/academic_year.js b/erpnext/education/doctype/academic_year/academic_year.js
similarity index 100%
rename from erpnext/schools/doctype/academic_year/academic_year.js
rename to erpnext/education/doctype/academic_year/academic_year.js
diff --git a/erpnext/education/doctype/academic_year/academic_year.json b/erpnext/education/doctype/academic_year/academic_year.json
new file mode 100644
index 0000000..5df89a7
--- /dev/null
+++ b/erpnext/education/doctype/academic_year/academic_year.json
@@ -0,0 +1,154 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "field:academic_year_name", 
+ "beta": 0, 
+ "creation": "2015-09-07 12:49:51.303026", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 0, 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "academic_year_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Academic Year Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "year_start_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Year Start Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "year_end_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Year End Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:06:08.123090", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Academic Year", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/academic_year/academic_year.py b/erpnext/education/doctype/academic_year/academic_year.py
similarity index 100%
rename from erpnext/schools/doctype/academic_year/academic_year.py
rename to erpnext/education/doctype/academic_year/academic_year.py
diff --git a/erpnext/education/doctype/academic_year/test_academic_year.js b/erpnext/education/doctype/academic_year/test_academic_year.js
new file mode 100644
index 0000000..ec2f49c
--- /dev/null
+++ b/erpnext/education/doctype/academic_year/test_academic_year.js
@@ -0,0 +1,23 @@
+// Testing Setup Module in Education
+QUnit.module('education');
+
+QUnit.test('Test: Academic Year', function(assert){
+	assert.expect(3);
+	let done = assert.async();
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make('Academic Year', [
+				{academic_year_name: '2016-17'},
+				{year_start_date: '2016-07-20'},
+				{year_end_date:'2017-06-20'},
+			]);
+		},
+
+		() => {
+			assert.ok(cur_frm.doc.academic_year_name=='2016-17');
+			assert.ok(cur_frm.doc.year_start_date=='2016-07-20');
+			assert.ok(cur_frm.doc.year_end_date=='2017-06-20');
+		},
+		() => done()
+	]);
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/academic_year/test_academic_year.py b/erpnext/education/doctype/academic_year/test_academic_year.py
similarity index 100%
rename from erpnext/schools/doctype/academic_year/test_academic_year.py
rename to erpnext/education/doctype/academic_year/test_academic_year.py
diff --git a/erpnext/schools/doctype/academic_year/test_records.json b/erpnext/education/doctype/academic_year/test_records.json
similarity index 100%
rename from erpnext/schools/doctype/academic_year/test_records.json
rename to erpnext/education/doctype/academic_year/test_records.json
diff --git a/erpnext/schools/doctype/assessment_criteria/__init__.py b/erpnext/education/doctype/assessment_criteria/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/assessment_criteria/__init__.py
rename to erpnext/education/doctype/assessment_criteria/__init__.py
diff --git a/erpnext/schools/doctype/assessment_criteria/assessment_criteria.js b/erpnext/education/doctype/assessment_criteria/assessment_criteria.js
similarity index 100%
rename from erpnext/schools/doctype/assessment_criteria/assessment_criteria.js
rename to erpnext/education/doctype/assessment_criteria/assessment_criteria.js
diff --git a/erpnext/education/doctype/assessment_criteria/assessment_criteria.json b/erpnext/education/doctype/assessment_criteria/assessment_criteria.json
new file mode 100644
index 0000000..9e228fd
--- /dev/null
+++ b/erpnext/education/doctype/assessment_criteria/assessment_criteria.json
@@ -0,0 +1,125 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "field:assessment_criteria", 
+ "beta": 0, 
+ "creation": "2016-12-14 16:40:15.144115", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assessment_criteria", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Assessment Criteria", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assessment_criteria_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Assessment Criteria Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Assessment Criteria Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:08:11.311304", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Assessment Criteria", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_criteria/assessment_criteria.py b/erpnext/education/doctype/assessment_criteria/assessment_criteria.py
similarity index 100%
rename from erpnext/schools/doctype/assessment_criteria/assessment_criteria.py
rename to erpnext/education/doctype/assessment_criteria/assessment_criteria.py
diff --git a/erpnext/education/doctype/assessment_criteria/test_assessment_criteria.js b/erpnext/education/doctype/assessment_criteria/test_assessment_criteria.js
new file mode 100644
index 0000000..db4a4cf
--- /dev/null
+++ b/erpnext/education/doctype/assessment_criteria/test_assessment_criteria.js
@@ -0,0 +1,16 @@
+// Education Assessment module
+QUnit.module('education');
+
+QUnit.test('Test: Assessment Criteria', function(assert){
+	assert.expect(0);
+	let done = assert.async();
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make('Assessment Criteria', [
+				{assessment_criteria: 'Pass'},
+				{assessment_criteria_group: 'Reservation'}
+			]);
+		},
+		() => done()
+	]);
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_criteria/test_assessment_criteria.py b/erpnext/education/doctype/assessment_criteria/test_assessment_criteria.py
similarity index 100%
rename from erpnext/schools/doctype/assessment_criteria/test_assessment_criteria.py
rename to erpnext/education/doctype/assessment_criteria/test_assessment_criteria.py
diff --git a/erpnext/schools/doctype/assessment_criteria/test_records.json b/erpnext/education/doctype/assessment_criteria/test_records.json
similarity index 100%
rename from erpnext/schools/doctype/assessment_criteria/test_records.json
rename to erpnext/education/doctype/assessment_criteria/test_records.json
diff --git a/erpnext/schools/doctype/assessment_criteria_group/__init__.py b/erpnext/education/doctype/assessment_criteria_group/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/assessment_criteria_group/__init__.py
rename to erpnext/education/doctype/assessment_criteria_group/__init__.py
diff --git a/erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.js b/erpnext/education/doctype/assessment_criteria_group/assessment_criteria_group.js
similarity index 100%
rename from erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.js
rename to erpnext/education/doctype/assessment_criteria_group/assessment_criteria_group.js
diff --git a/erpnext/education/doctype/assessment_criteria_group/assessment_criteria_group.json b/erpnext/education/doctype/assessment_criteria_group/assessment_criteria_group.json
new file mode 100644
index 0000000..5765b4b
--- /dev/null
+++ b/erpnext/education/doctype/assessment_criteria_group/assessment_criteria_group.json
@@ -0,0 +1,94 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:assessment_criteria_group", 
+ "beta": 0, 
+ "creation": "2017-01-27 15:17:38.855910", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assessment_criteria_group", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Assessment Criteria Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:11:45.334917", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Assessment Criteria Group", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.py b/erpnext/education/doctype/assessment_criteria_group/assessment_criteria_group.py
similarity index 100%
rename from erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.py
rename to erpnext/education/doctype/assessment_criteria_group/assessment_criteria_group.py
diff --git a/erpnext/education/doctype/assessment_criteria_group/test_assessment_criteria_group.js b/erpnext/education/doctype/assessment_criteria_group/test_assessment_criteria_group.js
new file mode 100644
index 0000000..bcfcaf8
--- /dev/null
+++ b/erpnext/education/doctype/assessment_criteria_group/test_assessment_criteria_group.js
@@ -0,0 +1,15 @@
+// Education Assessment module
+QUnit.module('education');
+
+QUnit.test('Test: Assessment Criteria Group', function(assert){
+	assert.expect(0);
+	let done = assert.async();
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make('Assessment Criteria Group', [
+				{assessment_criteria_group: 'Reservation'}
+			]);
+		},
+		() => done()
+	]);
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_criteria_group/test_assessment_criteria_group.py b/erpnext/education/doctype/assessment_criteria_group/test_assessment_criteria_group.py
similarity index 100%
rename from erpnext/schools/doctype/assessment_criteria_group/test_assessment_criteria_group.py
rename to erpnext/education/doctype/assessment_criteria_group/test_assessment_criteria_group.py
diff --git a/erpnext/schools/doctype/assessment_group/__init__.py b/erpnext/education/doctype/assessment_group/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/assessment_group/__init__.py
rename to erpnext/education/doctype/assessment_group/__init__.py
diff --git a/erpnext/schools/doctype/assessment_group/assessment_group.js b/erpnext/education/doctype/assessment_group/assessment_group.js
similarity index 100%
rename from erpnext/schools/doctype/assessment_group/assessment_group.js
rename to erpnext/education/doctype/assessment_group/assessment_group.js
diff --git a/erpnext/education/doctype/assessment_group/assessment_group.json b/erpnext/education/doctype/assessment_group/assessment_group.json
new file mode 100644
index 0000000..56917d2
--- /dev/null
+++ b/erpnext/education/doctype/assessment_group/assessment_group.json
@@ -0,0 +1,274 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:assessment_group_name", 
+ "beta": 0, 
+ "creation": "2016-08-04 04:42:48.319388", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assessment_group_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Assessment Group Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "is_group", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_2", 
+   "fieldtype": "Section Break", 
+   "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, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "parent_assessment_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Parent Assessment Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Assessment Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "lft", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "lft", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "rgt", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "rgt", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "old_parent", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "old_parent", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Assessment Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:09:25.366400", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Assessment Group", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_group/assessment_group.py b/erpnext/education/doctype/assessment_group/assessment_group.py
similarity index 100%
rename from erpnext/schools/doctype/assessment_group/assessment_group.py
rename to erpnext/education/doctype/assessment_group/assessment_group.py
diff --git a/erpnext/schools/doctype/assessment_group/assessment_group_tree.js b/erpnext/education/doctype/assessment_group/assessment_group_tree.js
similarity index 100%
rename from erpnext/schools/doctype/assessment_group/assessment_group_tree.js
rename to erpnext/education/doctype/assessment_group/assessment_group_tree.js
diff --git a/erpnext/education/doctype/assessment_group/test_assessment_group.js b/erpnext/education/doctype/assessment_group/test_assessment_group.js
new file mode 100644
index 0000000..a127fd4
--- /dev/null
+++ b/erpnext/education/doctype/assessment_group/test_assessment_group.js
@@ -0,0 +1,65 @@
+// Education Assessment module
+QUnit.module('education');
+
+QUnit.test('Test: Assessment Group', function(assert){
+	assert.expect(4);
+	let done = assert.async();
+
+	frappe.run_serially([
+		() => frappe.set_route('Tree', 'Assessment Group'),
+
+		// Checking adding child without selecting any Node
+		() => frappe.tests.click_button('New'),
+		() => frappe.timeout(0.2),
+		() => {assert.equal($(`.msgprint`).text(), "Select a group node first.", "Error message success");},
+		() => frappe.tests.click_button('Close'),
+		() => frappe.timeout(0.2),
+
+		// Creating child nodes
+		() => frappe.tests.click_link('All Assessment Groups'),
+		() => frappe.map_group.make('Assessment-group-1'),
+		() => frappe.map_group.make('Assessment-group-4', "All Assessment Groups", 1),
+		() => frappe.tests.click_link('Assessment-group-4'),
+		() => frappe.map_group.make('Assessment-group-5', "Assessment-group-3", 0),
+
+		// Checking Edit button
+		() => frappe.timeout(0.5),
+		() => frappe.tests.click_link('Assessment-group-1'),
+		() => frappe.tests.click_button('Edit'),
+		() => frappe.timeout(0.5),
+		() => {assert.deepEqual(frappe.get_route(), ["Form", "Assessment Group", "Assessment-group-1"], "Edit route checks");},
+
+		// Deleting child Node
+		() => frappe.set_route('Tree', 'Assessment Group'),
+		() => frappe.timeout(0.5),
+		() => frappe.tests.click_link('Assessment-group-1'),
+		() => frappe.tests.click_button('Delete'),
+		() => frappe.timeout(0.5),
+		() => frappe.tests.click_button('Yes'),
+
+		// Checking Collapse and Expand button
+		() => frappe.timeout(2),
+		() => frappe.tests.click_link('Assessment-group-4'),
+		() => frappe.click_button('Collapse'),
+		() => frappe.tests.click_link('All Assessment Groups'),
+		() => frappe.click_button('Collapse'),
+		() => {assert.ok($('.opened').size() == 0, 'Collapsed');},
+		() => frappe.click_button('Expand'),
+		() => {assert.ok($('.opened').size() > 0, 'Expanded');},
+
+		() => done()
+	]);
+});
+
+frappe.map_group = {
+	make:function(assessment_group_name, parent_assessment_group = 'All Assessment Groups', is_group = 0){
+		return frappe.run_serially([
+			() => frappe.click_button('Add Child'),
+			() => frappe.timeout(0.2),
+			() => cur_dialog.set_value('is_group', is_group),
+			() => cur_dialog.set_value('assessment_group_name', assessment_group_name),
+			() => cur_dialog.set_value('parent_assessment_group', parent_assessment_group),
+			() => frappe.click_button('Create New'),
+		]);
+	}
+};
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_group/test_assessment_group.py b/erpnext/education/doctype/assessment_group/test_assessment_group.py
similarity index 100%
rename from erpnext/schools/doctype/assessment_group/test_assessment_group.py
rename to erpnext/education/doctype/assessment_group/test_assessment_group.py
diff --git a/erpnext/schools/doctype/assessment_plan/__init__.py b/erpnext/education/doctype/assessment_plan/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/assessment_plan/__init__.py
rename to erpnext/education/doctype/assessment_plan/__init__.py
diff --git a/erpnext/education/doctype/assessment_plan/assessment_plan.js b/erpnext/education/doctype/assessment_plan/assessment_plan.js
new file mode 100644
index 0000000..f6fceb1
--- /dev/null
+++ b/erpnext/education/doctype/assessment_plan/assessment_plan.js
@@ -0,0 +1,66 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+cur_frm.add_fetch("student_group", "course", "course");
+cur_frm.add_fetch("examiner", "instructor_name", "examiner_name");
+cur_frm.add_fetch("supervisor", "instructor_name", "supervisor_name");
+cur_frm.add_fetch("course", "default_grading_scale", "grading_scale");
+
+frappe.ui.form.on("Assessment Plan", {
+    onload: function(frm) {
+        frm.set_query("assessment_group", function(doc, cdt, cdn) {
+            return{
+                filters: {
+                    'is_group': 0
+                }
+            }
+        });
+    },
+
+    refresh: function(frm) {
+        if (frm.doc.docstatus == 1) {
+            frm.add_custom_button(__("Assessment Result"), function() {
+                frappe.route_options = {
+                    assessment_plan: frm.doc.name,
+                    student_group: frm.doc.student_group
+                }
+                frappe.set_route("Form", "Assessment Result Tool");
+            });
+        }
+
+		frm.set_query('grading_scale', function(){
+			return {
+				filters: {
+					docstatus: 1
+				}
+			}
+		});
+    },
+
+	course: function(frm) {
+		if (frm.doc.course && frm.doc.maximum_assessment_score) {
+			frappe.call({
+				method: "erpnext.education.api.get_assessment_criteria",
+				args: {
+					course: frm.doc.course
+				},
+				callback: function(r) {
+					if (r.message) {
+						frm.doc.assessment_criteria = [];
+						$.each(r.message, function(i, d) {
+							var row = frappe.model.add_child(frm.doc, "Assessment Plan Criteria", "assessment_criteria");
+							row.assessment_criteria = d.assessment_criteria;
+							row.maximum_score = d.weightage / 100 * frm.doc.maximum_assessment_score;
+						});
+					}
+					refresh_field("assessment_criteria");
+
+				}
+			});
+		}
+	},
+
+	maximum_assessment_score: function(frm) {
+		frm.trigger("course");
+	}
+});
\ No newline at end of file
diff --git a/erpnext/education/doctype/assessment_plan/assessment_plan.json b/erpnext/education/doctype/assessment_plan/assessment_plan.json
new file mode 100644
index 0000000..e2ae247
--- /dev/null
+++ b/erpnext/education/doctype/assessment_plan/assessment_plan.json
@@ -0,0 +1,674 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "ASP.#####", 
+ "beta": 0, 
+ "creation": "2015-11-12 16:34:34.658092", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assessment_name", 
+   "fieldtype": "Data", 
+   "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": "Assessment Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "student_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Student Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "course", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Course", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Course", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assessment_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Assessment Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Assessment Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "maximum_assessment_score", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Maximum Assessment Score", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "grading_scale", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Grading Scale", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Grading Scale", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "collapsible_depends_on": "", 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "section_break_5", 
+   "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": "Schedule", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Today", 
+   "fieldname": "schedule_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Schedule Date", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "room", 
+   "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": "Room", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Room", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "examiner", 
+   "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": "Examiner", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Instructor", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "examiner_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Examiner Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "from_time", 
+   "fieldtype": "Time", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "From Time", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "to_time", 
+   "fieldtype": "Time", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "To Time", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "supervisor", 
+   "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": "Supervisor", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Instructor", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "supervisor_name", 
+   "fieldtype": "Data", 
+   "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": "Supervisor Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_20", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assessment_criteria", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Assessment Criteria", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Assessment Plan Criteria", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Assessment Plan", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2017-11-28 17:23:36.657725", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Assessment Plan", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "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": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "assessment_name", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/education/doctype/assessment_plan/assessment_plan.py b/erpnext/education/doctype/assessment_plan/assessment_plan.py
new file mode 100644
index 0000000..7ad76b8
--- /dev/null
+++ b/erpnext/education/doctype/assessment_plan/assessment_plan.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+import frappe
+from frappe import _
+
+class AssessmentPlan(Document):
+	def validate(self):
+		self.validate_overlap()
+		self.validate_max_score()
+		self.validate_assessment_criteria()
+
+	def validate_overlap(self):
+		"""Validates overlap for Student Group, Instructor, Room"""
+		
+		from erpnext.education.utils import validate_overlap_for
+
+		#Validate overlapping course schedules.
+		if self.student_group:
+			validate_overlap_for(self, "Course Schedule", "student_group")
+		
+		validate_overlap_for(self, "Course Schedule", "instructor")
+		validate_overlap_for(self, "Course Schedule", "room")
+
+		#validate overlapping assessment schedules.
+		if self.student_group:
+			validate_overlap_for(self, "Assessment Plan", "student_group")
+		
+		validate_overlap_for(self, "Assessment Plan", "room")
+		validate_overlap_for(self, "Assessment Plan", "supervisor", self.supervisor)
+
+	def validate_max_score(self):
+		max_score = 0
+		for d in self.assessment_criteria:
+			max_score += d.maximum_score
+		if self.maximum_assessment_score != max_score:
+			frappe.throw(_("Sum of Scores of Assessment Criteria needs to be {0}.".format(self.maximum_assessment_score)))
+
+	def validate_assessment_criteria(self):
+		assessment_criteria_list = frappe.db.sql_list(''' select apc.assessment_criteria
+			from `tabAssessment Plan` ap , `tabAssessment Plan Criteria` apc
+			where ap.name = apc.parent and ap.course=%s and ap.student_group=%s and ap.assessment_group=%s
+			and ap.name != %s and ap.docstatus=1''', (self.course, self.student_group, self.assessment_group, self.name))
+		for d in self.assessment_criteria:
+			if d.assessment_criteria in assessment_criteria_list:
+				frappe.throw(_("You have already assessed for the assessment criteria {}.")
+					.format(frappe.bold(d.assessment_criteria)))
diff --git a/erpnext/education/doctype/assessment_plan/test_assessment_plan.js b/erpnext/education/doctype/assessment_plan/test_assessment_plan.js
new file mode 100644
index 0000000..b0bff26
--- /dev/null
+++ b/erpnext/education/doctype/assessment_plan/test_assessment_plan.js
@@ -0,0 +1,54 @@
+// Testing Assessment Module in education
+QUnit.module('education');
+
+QUnit.test('Test: Assessment Plan', function(assert){
+	assert.expect(6);
+	let done = assert.async();
+	let room_name, instructor_name, assessment_name;
+
+	frappe.run_serially([
+		() => frappe.db.get_value('Room', {'room_name': 'Room 1'}, 'name'),
+		(room) => {room_name = room.message.name;}, // Fetching Room name
+		() => frappe.db.get_value('Instructor', {'instructor_name': 'Instructor 1'}, 'name'),
+		(instructor) => {instructor_name = instructor.message.name;}, // Fetching Instructor name
+
+		() => {
+			return frappe.tests.make('Assessment Plan', [
+				{assessment_name: "Test-Mid-Term"},
+				{assessment_group: 'Assessment-group-5'},
+				{maximum_assessment_score: 100},
+				{student_group: 'test-course-wise-group-2'},
+				{course: 'Test_Sub'},
+				{grading_scale: 'GTU'},
+				{schedule_date: frappe.datetime.nowdate()},
+				{room: room_name},
+				{examiner: instructor_name},
+				{supervisor: instructor_name},
+				{from_time: "12:30:00"},
+				{to_time: "2:30:00"}
+			]);
+		},
+
+		() => {
+			assessment_name = cur_frm.doc.name; // Storing the name of current Assessment Plan
+			assert.equal(cur_frm.doc.assessment_criteria[0].assessment_criteria, 'Pass', 'Assessment Criteria auto-filled correctly');
+			assert.equal(cur_frm.doc.assessment_criteria[0].maximum_score, 100, 'Maximum score correctly set');
+		}, // Checking if the table was auto-filled upon selecting appropriate fields
+
+		() => frappe.timeout(1),
+		() => frappe.tests.click_button('Submit'),
+		() => frappe.timeout(0.5),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(0.5),
+		() => {assert.equal(cur_frm.doc.docstatus, 1, "Assessment Plan submitted successfully");},
+
+		() => frappe.click_button('Assessment Result'), // Checking out Assessment Result button option
+		() => frappe.timeout(0.5),
+		() => {
+			assert.deepEqual(frappe.get_route(), ["Form", "Assessment Result Tool"], 'Assessment Result properly linked');
+			assert.equal(cur_frm.doc.assessment_plan, assessment_name, 'Assessment correctly set');
+			assert.equal(cur_frm.doc.student_group, 'test-course-wise-group-2', 'Course for Assessment correctly set');
+		},
+		() => done()
+	]);
+});
diff --git a/erpnext/schools/doctype/assessment_plan/test_assessment_plan.py b/erpnext/education/doctype/assessment_plan/test_assessment_plan.py
similarity index 100%
rename from erpnext/schools/doctype/assessment_plan/test_assessment_plan.py
rename to erpnext/education/doctype/assessment_plan/test_assessment_plan.py
diff --git a/erpnext/schools/doctype/assessment_plan_criteria/__init__.py b/erpnext/education/doctype/assessment_plan_criteria/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/assessment_plan_criteria/__init__.py
rename to erpnext/education/doctype/assessment_plan_criteria/__init__.py
diff --git a/erpnext/education/doctype/assessment_plan_criteria/assessment_plan_criteria.json b/erpnext/education/doctype/assessment_plan_criteria/assessment_plan_criteria.json
new file mode 100644
index 0000000..d9ad0cb
--- /dev/null
+++ b/erpnext/education/doctype/assessment_plan_criteria/assessment_plan_criteria.json
@@ -0,0 +1,134 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "", 
+ "beta": 0, 
+ "creation": "2016-12-14 17:20:27.738226", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assessment_criteria", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Assessment Criteria", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Assessment Criteria", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "maximum_score", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Maximum Score", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:10:50.560006", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Assessment Plan Criteria", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_plan_criteria/assessment_plan_criteria.py b/erpnext/education/doctype/assessment_plan_criteria/assessment_plan_criteria.py
similarity index 100%
rename from erpnext/schools/doctype/assessment_plan_criteria/assessment_plan_criteria.py
rename to erpnext/education/doctype/assessment_plan_criteria/assessment_plan_criteria.py
diff --git a/erpnext/schools/doctype/assessment_result/__init__.py b/erpnext/education/doctype/assessment_result/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/assessment_result/__init__.py
rename to erpnext/education/doctype/assessment_result/__init__.py
diff --git a/erpnext/education/doctype/assessment_result/assessment_result.js b/erpnext/education/doctype/assessment_result/assessment_result.js
new file mode 100644
index 0000000..d1115a7
--- /dev/null
+++ b/erpnext/education/doctype/assessment_result/assessment_result.js
@@ -0,0 +1,53 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+cur_frm.add_fetch("student", "title", "student_name");
+cur_frm.add_fetch("assessment_plan", "grading_scale", "grading_scale");
+cur_frm.add_fetch("assessment_plan", "maximum_assessment_score", "maximum_score");
+
+frappe.ui.form.on("Assessment Result", {
+	assessment_plan: function(frm) {
+		if (frm.doc.assessment_plan) {
+			frappe.call({
+				method: "erpnext.education.api.get_assessment_details",
+				args: {
+					assessment_plan: frm.doc.assessment_plan
+				},
+				callback: function(r) {
+					if (r.message) {
+						frm.doc.details = [];
+						$.each(r.message, function(i, d) {
+							var row = frappe.model.add_child(frm.doc, "Assessment Result Detail", "details");
+							row.assessment_criteria = d.assessment_criteria;
+							row.maximum_score = d.maximum_score;
+						});
+					}
+					refresh_field("details");
+				}
+			});
+		}
+	}
+});
+
+frappe.ui.form.on("Assessment Result Detail", {
+	score: function(frm, cdt, cdn) {
+		var d  = locals[cdt][cdn];
+		if (d.score > d.maximum_score) {
+			frappe.throw(__("Score cannot be greater than Maximum Score"));
+		}
+		else {
+			frappe.call({
+				method: "erpnext.education.api.get_grade",
+				args: {
+					grading_scale: frm.doc.grading_scale,
+					percentage: ((d.score/d.maximum_score) * 100)
+				},
+				callback: function(r) {
+					if (r.message) {
+						frappe.model.set_value(cdt, cdn, "grade", r.message);
+					}
+				}
+			});
+		}
+	}
+});
\ No newline at end of file
diff --git a/erpnext/education/doctype/assessment_result/assessment_result.json b/erpnext/education/doctype/assessment_result/assessment_result.json
new file mode 100644
index 0000000..3912587
--- /dev/null
+++ b/erpnext/education/doctype/assessment_result/assessment_result.json
@@ -0,0 +1,515 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "RES.######", 
+ "beta": 0, 
+ "creation": "2015-11-13 17:18:06.468332", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "student_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Student Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assessment_plan", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Assessment Plan", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Assessment Plan", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "grading_scale", 
+   "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": "Grading Scale", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Grading Scale", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "details", 
+   "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": "Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Assessment Result Detail", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_8", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "maximum_score", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Maximum Score", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_score", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Total Score", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_11", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "grade", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Grade", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_13", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "comment", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Comment", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Assessment Result", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 18:58:32.114529", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Assessment Result", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "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
+}
\ No newline at end of file
diff --git a/erpnext/education/doctype/assessment_result/assessment_result.py b/erpnext/education/doctype/assessment_result/assessment_result.py
new file mode 100644
index 0000000..7459d5a
--- /dev/null
+++ b/erpnext/education/doctype/assessment_result/assessment_result.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.utils import flt
+from frappe.model.document import Document
+from erpnext.education.api import get_grade
+from erpnext.education.api import get_assessment_details
+from frappe.utils.csvutils import getlink
+
+
+class AssessmentResult(Document):
+	def validate(self):
+		if self.student and not self.student_name:
+			self.student_name = frappe.db.get_value("Student", self.student, "title")
+		self.grading_scale = frappe.db.get_value("Assessment Plan", self.assessment_plan, "grading_scale")
+		self.validate_maximum_score()
+		self.validate_grade()
+		self.validate_duplicate()
+
+	def validate_maximum_score(self):
+		self.maximum_score = frappe.db.get_value("Assessment Plan", self.assessment_plan, "maximum_assessment_score")
+		assessment_details = get_assessment_details(self.assessment_plan)
+		max_scores = {}
+		for d in assessment_details:
+			max_scores.update({d.assessment_criteria: d.maximum_score})
+
+		for d in self.details:
+			d.maximum_score = max_scores.get(d.assessment_criteria)
+			if d.score > d.maximum_score:
+				frappe.throw(_("Score cannot be greater than Maximum Score"))
+		
+	def validate_grade(self):
+		self.total_score = 0.0
+		for d in self.details:
+			d.grade = get_grade(self.grading_scale, (flt(d.score)/d.maximum_score)*100)
+			self.total_score += d.score
+		self.grade = get_grade(self.grading_scale, (self.total_score/self.maximum_score)*100)
+
+	def validate_duplicate(self):
+		assessment_result = frappe.get_list("Assessment Result", filters={"name": ("not in", [self.name]),
+			"student":self.student, "assessment_plan":self.assessment_plan, "docstatus":("!=", 2)})
+		if assessment_result:
+			frappe.throw(_("Assessment Result record {0} already exists.".format(getlink("Assessment Result",assessment_result[0].name))))
+
+
+
+
diff --git a/erpnext/education/doctype/assessment_result/test_assessment_result.js b/erpnext/education/doctype/assessment_result/test_assessment_result.js
new file mode 100644
index 0000000..b7adfac
--- /dev/null
+++ b/erpnext/education/doctype/assessment_result/test_assessment_result.js
@@ -0,0 +1,73 @@
+// Education Assessment module
+QUnit.module('education');
+
+QUnit.test('Test: Assessment Result', function(assert){
+	assert.expect(25);
+	let done = assert.async();
+	let student_list = [];
+	let assessment_name;
+	let tasks = []
+
+	frappe.run_serially([
+		// Saving Assessment Plan name
+		() => frappe.db.get_value('Assessment Plan', {'assessment_name': 'Test-Mid-Term'}, 'name'),
+		(assessment_plan) => {assessment_name = assessment_plan.message.name;},
+		// Fetching list of Student for which Result is supposed to be set
+		() => frappe.set_route('Form', 'Assessment Plan', assessment_name),
+		() => frappe.timeout(1),
+		() => frappe.tests.click_button('Assessment Result'),
+		() => frappe.timeout(1),
+		() => cur_frm.refresh(),
+		() => frappe.timeout(1),
+		() => {
+			$("tbody tr").each( function(i, input){
+				student_list.push($(input).data().student);
+			});
+		},
+
+		// Looping through each student in the list and setting up their score
+		() => {
+			student_list.forEach(index => {
+				tasks.push(
+					() => frappe.set_route('List', 'Assessment Result', 'List'),
+					() => frappe.timeout(0.5),
+					() => frappe.tests.click_button('New'),
+					() => frappe.timeout(0.5),
+					() => cur_frm.set_value('student', index),
+					() => cur_frm.set_value('assessment_plan', assessment_name),
+					() => frappe.timeout(0.2),
+					() => cur_frm.doc.details[0].score = (39 + (15 * student_list.indexOf(index))),
+					() => cur_frm.save(),
+					() => frappe.timeout(0.5),
+
+					() => frappe.db.get_value('Assessment Plan', {'name': 'ASP00001'}, ['grading_scale', 'maximum_assessment_score']),
+					(assessment_plan) => {
+						assert.equal(cur_frm.doc.grading_scale, assessment_plan.message.grading_scale, 'Grading scale correctly fetched');
+						assert.equal(cur_frm.doc.maximum_score, assessment_plan.message.maximum_assessment_score, 'Maximum score correctly fetched');
+
+						frappe.call({
+							method: "erpnext.education.api.get_grade",
+							args: {
+								"grading_scale": assessment_plan.message.grading_scale,
+								"percentage": cur_frm.doc.total_score
+							},
+							callback: function(r){
+								assert.equal(cur_frm.doc.grade, r.message, "Grade correctly calculated");
+							}
+						});
+					},
+
+					() => frappe.tests.click_button('Submit'),
+					() => frappe.timeout(0.5),
+					() => frappe.tests.click_button('Yes'),
+					() => frappe.timeout(0.5),
+					() => {assert.equal();},
+					() => {assert.equal(cur_frm.doc.docstatus, 1, "Submitted successfully");},
+				);
+			});
+			return frappe.run_serially(tasks);
+		},
+
+		() => done()
+	]);
+});
\ No newline at end of file
diff --git a/erpnext/education/doctype/assessment_result/test_assessment_result.py b/erpnext/education/doctype/assessment_result/test_assessment_result.py
new file mode 100644
index 0000000..bf12b32
--- /dev/null
+++ b/erpnext/education/doctype/assessment_result/test_assessment_result.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+from erpnext.education.api import get_grade
+
+# test_records = frappe.get_test_records('Assessment Result')
+
+class TestAssessmentResult(unittest.TestCase):
+	def test_grade(self):
+		grade = get_grade("_Test Grading Scale", 80)
+		self.assertEquals("A", grade)
+
+		grade = get_grade("_Test Grading Scale", 70)
+		self.assertEquals("B", grade)
+		
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_result_detail/__init__.py b/erpnext/education/doctype/assessment_result_detail/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/assessment_result_detail/__init__.py
rename to erpnext/education/doctype/assessment_result_detail/__init__.py
diff --git a/erpnext/education/doctype/assessment_result_detail/assessment_result_detail.json b/erpnext/education/doctype/assessment_result_detail/assessment_result_detail.json
new file mode 100644
index 0000000..85d943b
--- /dev/null
+++ b/erpnext/education/doctype/assessment_result_detail/assessment_result_detail.json
@@ -0,0 +1,194 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "", 
+ "beta": 0, 
+ "creation": "2016-12-14 17:44:35.583123", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 4, 
+   "fieldname": "assessment_criteria", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Assessment Criteria", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Assessment Criteria", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "maximum_score", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Maximum Score", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "score", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Score", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "grade", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Grade", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:11:14.362410", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Assessment Result Detail", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_result_detail/assessment_result_detail.py b/erpnext/education/doctype/assessment_result_detail/assessment_result_detail.py
similarity index 100%
rename from erpnext/schools/doctype/assessment_result_detail/assessment_result_detail.py
rename to erpnext/education/doctype/assessment_result_detail/assessment_result_detail.py
diff --git a/erpnext/schools/doctype/assessment_result_tool/__init__.py b/erpnext/education/doctype/assessment_result_tool/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/assessment_result_tool/__init__.py
rename to erpnext/education/doctype/assessment_result_tool/__init__.py
diff --git a/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js b/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js
new file mode 100644
index 0000000..3cd4512
--- /dev/null
+++ b/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js
@@ -0,0 +1,162 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+
+frappe.ui.form.on('Assessment Result Tool', {
+	setup: function(frm) {
+		frm.add_fetch("assessment_plan", "student_group", "student_group");
+	},
+
+	refresh: function(frm) {
+		if (frappe.route_options) {
+			frm.set_value("student_group", frappe.route_options.student_group);
+			frm.set_value("assessment_plan", frappe.route_options.assessment_plan);
+			frappe.route_options = null;
+		} else {
+			frm.trigger("assessment_plan");
+		}
+		frm.disable_save();
+		frm.page.clear_indicator();
+	},
+
+	assessment_plan: function(frm) {
+		frm.doc.show_submit = false;
+		if(frm.doc.assessment_plan) {
+			if (!frm.doc.student_group)
+				return
+			frappe.call({
+				method: "erpnext.education.api.get_assessment_students",
+				args: {
+					"assessment_plan": frm.doc.assessment_plan,
+					"student_group": frm.doc.student_group
+				},
+				callback: function(r) {
+					if (r.message) {
+						frm.doc.students = r.message;
+						frm.events.render_table(frm);
+						for (let value of r.message) {
+							if (!value.docstatus) {
+								frm.doc.show_submit = true;
+								break;
+							}
+						}
+						frm.events.submit_result(frm);
+					}
+				}
+			});
+		}
+	},
+
+	render_table: function(frm) {
+		$(frm.fields_dict.result_html.wrapper).empty();
+		let assessment_plan = frm.doc.assessment_plan;
+		frappe.call({
+			method: "erpnext.education.api.get_assessment_details",
+			args: {
+				assessment_plan: assessment_plan
+			},
+			callback: function(r) {
+				frm.events.get_marks(frm, r.message);
+			}
+		});
+	},
+
+	get_marks: function(frm, criteria_list) {
+		let max_total_score = 0;
+		criteria_list.forEach(function(c) {
+			max_total_score += c.maximum_score
+		});
+		var result_table = $(frappe.render_template('assessment_result_tool', {
+			frm: frm,
+			students: frm.doc.students,
+			criteria: criteria_list,
+			max_total_score: max_total_score
+		}));
+		result_table.appendTo(frm.fields_dict.result_html.wrapper);
+
+		result_table.on('change', 'input', function(e) {
+			let $input = $(e.target);
+			let student = $input.data().student;
+			let max_score = $input.data().maxScore;
+			let value = $input.val();
+			if(value < 0) {
+				$input.val(0);
+			} else if(value > max_score) {
+				$input.val(max_score);
+			}
+			let total_score = 0;
+			let student_scores = {};
+			student_scores["assessment_details"] = {}
+			result_table.find(`input[data-student=${student}].student-result-data`)
+				.each(function(el, input) {
+					let $input = $(input);
+					let criteria = $input.data().criteria;
+					let value = parseFloat($input.val());
+					if (!Number.isNaN(value)) {
+						student_scores["assessment_details"][criteria] = value;
+					}
+					total_score += value;
+			});
+			if(!Number.isNaN(total_score)) {
+				result_table.find(`span[data-student=${student}].total-score`).html(total_score);
+			}
+			if (Object.keys(student_scores["assessment_details"]).length === criteria_list.length) {
+				student_scores["student"] = student;
+				student_scores["total_score"] = total_score;
+				result_table.find(`[data-student=${student}].result-comment`)
+					.each(function(el, input){
+					student_scores["comment"] = $(input).val();
+				});
+				frappe.call({
+					method: "erpnext.education.api.mark_assessment_result",
+					args: {
+						"assessment_plan": frm.doc.assessment_plan,
+						"scores": student_scores
+					},
+					callback: function(r) {
+						let assessment_result = r.message;
+						if (!frm.doc.show_submit) {
+							frm.doc.show_submit = true;
+							frm.events.submit_result;
+						}
+						for (var criteria of Object.keys(assessment_result.details)) {
+							result_table.find(`[data-criteria=${criteria}][data-student=${assessment_result
+								.student}].student-result-grade`).each(function(e1, input) {
+									$(input).html(assessment_result.details[criteria]);
+							});
+						}
+						result_table.find(`span[data-student=${assessment_result.student}].total-score-grade`).html(assessment_result.grade);
+						let link_span = result_table.find(`span[data-student=${assessment_result.student}].total-result-link`);
+						$(link_span).css("display", "block");
+						$(link_span).find("a").attr("href", "#Form/Assessment Result/"+assessment_result.name);
+					}
+				});
+			}
+		});
+	},
+
+	submit_result: function(frm) {
+		if (frm.doc.show_submit) {
+			frm.page.set_primary_action(__("Submit"), function() {
+				frappe.call({
+					method: "erpnext.education.api.submit_assessment_results",
+					args: {
+						"assessment_plan": frm.doc.assessment_plan,
+						"student_group": frm.doc.student_group
+					},
+					callback: function(r) {
+						if (r.message) {
+							frappe.msgprint(__("{0} Result submittted", [r.message]));
+						} else {
+							frappe.msgprint(__("No Result to submit"));
+						}
+						frm.events.assessment_plan(frm);
+					}
+				});
+			});
+		}
+		else {
+			frm.page.clear_primary_action();
+		}
+	}
+});
diff --git a/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.json b/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.json
new file mode 100644
index 0000000..1ea5062
--- /dev/null
+++ b/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.json
@@ -0,0 +1,215 @@
+{
+ "allow_copy": 1, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-01-05 12:27:48.951036", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "fieldname": "assessment_plan", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Assessment Plan", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Assessment Plan", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "student_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Student Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "assessment_plan", 
+   "fieldname": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "result_html", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Result HTML", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 1, 
+ "hide_toolbar": 1, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 1, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 18:55:54.438981", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Assessment Result Tool", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.py b/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.py
similarity index 100%
rename from erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.py
rename to erpnext/education/doctype/assessment_result_tool/assessment_result_tool.py
diff --git a/erpnext/education/doctype/assessment_result_tool/test_assessment_result_tool.js b/erpnext/education/doctype/assessment_result_tool/test_assessment_result_tool.js
new file mode 100644
index 0000000..0bbe331
--- /dev/null
+++ b/erpnext/education/doctype/assessment_result_tool/test_assessment_result_tool.js
@@ -0,0 +1,29 @@
+// Education Assessment module
+QUnit.module('education');
+
+QUnit.test('Test: Assessment Result Tool', function(assert){
+	assert.expect(1);
+	let done = assert.async();
+	let i, count = 0, assessment_name;
+
+	frappe.run_serially([
+		// Saving Assessment Plan name
+		() => frappe.db.get_value('Assessment Plan', {'assessment_name': 'Test-Mid-Term'}, 'name'),
+		(assessment_plan) => {assessment_name = assessment_plan.message.name;},
+
+		() => frappe.set_route('Form', 'Assessment Plan', assessment_name),
+		() => frappe.timeout(1),
+		() => frappe.tests.click_button('Assessment Result'),
+		() => frappe.timeout(1),
+		() => cur_frm.refresh(),
+		() => frappe.timeout(1),
+		() => {
+			for(i = 2; i < $('tbody tr').size() * 4; i = (i + 4)){
+				if(($(`tbody td:eq("${i}")`) != "") && ($(`tbody td:eq("${i+1}")`) != ""))
+					count++;
+			}
+			assert.equal($('tbody tr').size(), count, 'All grades correctly displayed');
+		},
+		() => done()
+	]);
+});
\ No newline at end of file
diff --git a/erpnext/education/doctype/assessment_result_tool/test_assessment_result_tool.py b/erpnext/education/doctype/assessment_result_tool/test_assessment_result_tool.py
new file mode 100644
index 0000000..f784ccb
--- /dev/null
+++ b/erpnext/education/doctype/assessment_result_tool/test_assessment_result_tool.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestAssessmentResultTool(unittest.TestCase):
+	pass
diff --git a/erpnext/schools/doctype/course/__init__.py b/erpnext/education/doctype/course/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/course/__init__.py
rename to erpnext/education/doctype/course/__init__.py
diff --git a/erpnext/schools/doctype/course/course.js b/erpnext/education/doctype/course/course.js
similarity index 100%
rename from erpnext/schools/doctype/course/course.js
rename to erpnext/education/doctype/course/course.js
diff --git a/erpnext/education/doctype/course/course.json b/erpnext/education/doctype/course/course.json
new file mode 100644
index 0000000..15360f8
--- /dev/null
+++ b/erpnext/education/doctype/course/course.json
@@ -0,0 +1,417 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:course_code", 
+ "beta": 0, 
+ "creation": "2015-09-07 12:39:55.181893", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "course_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Course Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Department", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "parent_course", 
+   "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": "Parent Course (Leave blank, if this isn't part of Parent Course)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "course_code", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Course Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "course_abbreviation", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Course Abbreviation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_6", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "course_intro", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Course Intro", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assessment", 
+   "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": "Assessment", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default_grading_scale", 
+   "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": "Default Grading Scale", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Grading Scale", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assessment_criteria", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Assessment Criteria", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Course Assessment Criteria", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2017-11-10 19:06:28.909585", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Course", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "search_fields": "course_name", 
+ "show_name_in_global_search": 1, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course/course.py b/erpnext/education/doctype/course/course.py
similarity index 100%
rename from erpnext/schools/doctype/course/course.py
rename to erpnext/education/doctype/course/course.py
diff --git a/erpnext/education/doctype/course/test_course.js b/erpnext/education/doctype/course/test_course.js
new file mode 100644
index 0000000..88fddc2
--- /dev/null
+++ b/erpnext/education/doctype/course/test_course.js
@@ -0,0 +1,36 @@
+// Testing Setup Module in education
+QUnit.module('education');
+
+QUnit.test('test course', function(assert) {
+	assert.expect(8);
+	let done = assert.async();
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make('Course', [
+				{course_name: 'Test_Subject'},
+				{course_code: 'Test_Sub'},
+				{department: 'Test Department'},
+				{course_abbreviation: 'Test_Sub'},
+				{course_intro: 'Test Subject Intro'},
+				{default_grading_scale: 'GTU'},
+				{assessment_criteria: [
+					[
+						{assessment_criteria: 'Pass'},
+						{weightage: 100}
+					]
+				]}
+			]);
+		},
+		() => {
+			assert.ok(cur_frm.doc.course_name == 'Test_Subject', 'Course name correctly set');
+			assert.ok(cur_frm.doc.course_code == 'Test_Sub', 'Course code correctly set');
+			assert.ok(cur_frm.doc.department == 'Test Department', 'Department selected correctly');
+			assert.ok(cur_frm.doc.course_abbreviation == 'Test_Sub');
+			assert.ok(cur_frm.doc.course_intro == 'Test Subject Intro');
+			assert.ok(cur_frm.doc.default_grading_scale == 'GTU', 'Grading scale selected correctly');
+			assert.ok(cur_frm.doc.assessment_criteria[0].assessment_criteria == 'Pass', 'Assessment criteria selected correctly');
+			assert.ok(cur_frm.doc.assessment_criteria[0].weightage == '100');
+		},
+		() => done()
+	]);
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course/test_course.py b/erpnext/education/doctype/course/test_course.py
similarity index 100%
rename from erpnext/schools/doctype/course/test_course.py
rename to erpnext/education/doctype/course/test_course.py
diff --git a/erpnext/schools/doctype/course/test_records.json b/erpnext/education/doctype/course/test_records.json
similarity index 100%
rename from erpnext/schools/doctype/course/test_records.json
rename to erpnext/education/doctype/course/test_records.json
diff --git a/erpnext/schools/doctype/course_assessment_criteria/__init__.py b/erpnext/education/doctype/course_assessment_criteria/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/course_assessment_criteria/__init__.py
rename to erpnext/education/doctype/course_assessment_criteria/__init__.py
diff --git a/erpnext/education/doctype/course_assessment_criteria/course_assessment_criteria.json b/erpnext/education/doctype/course_assessment_criteria/course_assessment_criteria.json
new file mode 100644
index 0000000..2d8c0b3
--- /dev/null
+++ b/erpnext/education/doctype/course_assessment_criteria/course_assessment_criteria.json
@@ -0,0 +1,134 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "", 
+ "beta": 0, 
+ "creation": "2016-12-14 16:46:46.786353", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assessment_criteria", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Assessment Criteria", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Assessment Criteria", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "weightage", 
+   "fieldtype": "Percent", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Weightage", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:10:44.710837", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Course Assessment Criteria", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course_assessment_criteria/course_assessment_criteria.py b/erpnext/education/doctype/course_assessment_criteria/course_assessment_criteria.py
similarity index 100%
rename from erpnext/schools/doctype/course_assessment_criteria/course_assessment_criteria.py
rename to erpnext/education/doctype/course_assessment_criteria/course_assessment_criteria.py
diff --git a/erpnext/schools/doctype/course_schedule/__init__.py b/erpnext/education/doctype/course_schedule/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/course_schedule/__init__.py
rename to erpnext/education/doctype/course_schedule/__init__.py
diff --git a/erpnext/education/doctype/course_schedule/course_schedule.js b/erpnext/education/doctype/course_schedule/course_schedule.js
new file mode 100644
index 0000000..692c2a8
--- /dev/null
+++ b/erpnext/education/doctype/course_schedule/course_schedule.js
@@ -0,0 +1,16 @@
+frappe.provide("education");
+
+cur_frm.add_fetch("student_group", "course", "course")
+frappe.ui.form.on("Course Schedule", {
+	refresh: function(frm) {
+		if (!frm.doc.__islocal) {
+			frm.add_custom_button(__("Attendance"), function() {
+				frappe.route_options = {
+					based_on: "Course Schedule",
+					course_schedule: frm.doc.name
+				}
+				frappe.set_route("Form", "Student Attendance Tool");
+			});
+		}
+	}
+});
\ No newline at end of file
diff --git a/erpnext/education/doctype/course_schedule/course_schedule.json b/erpnext/education/doctype/course_schedule/course_schedule.json
new file mode 100644
index 0000000..9049a80
--- /dev/null
+++ b/erpnext/education/doctype/course_schedule/course_schedule.json
@@ -0,0 +1,461 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "naming_series:", 
+ "beta": 0, 
+ "creation": "2015-09-09 16:34:04.960369", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "student_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Student Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "instructor", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Instructor", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Instructor", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "instructor_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": "Instructor Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "instructor.Instructor_name", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "SH", 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Naming Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "SH", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "course", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Course", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Course", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_6", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Today", 
+   "fieldname": "schedule_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": "Schedule Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "room", 
+   "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": "Room", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Room", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_9", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "from_time", 
+   "fieldtype": "Time", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "From Time", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "to_time", 
+   "fieldtype": "Time", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "To Time", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "title", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Title", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2017-11-10 19:10:28.797143", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Course Schedule", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "schedule_date", 
+ "sort_order": "DESC", 
+ "title_field": "title", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/education/doctype/course_schedule/course_schedule.py b/erpnext/education/doctype/course_schedule/course_schedule.py
new file mode 100644
index 0000000..5083ff6
--- /dev/null
+++ b/erpnext/education/doctype/course_schedule/course_schedule.py
@@ -0,0 +1,50 @@
+	# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+
+class CourseSchedule(Document):
+	def validate(self):
+		self.instructor_name = frappe.db.get_value("Instructor", self.instructor, "instructor_name")
+		self.set_title()
+		self.validate_course()
+		self.validate_date()
+		self.validate_overlap()
+	
+	def set_title(self):
+		"""Set document Title"""
+		self.title = self.course + " by " + (self.instructor_name if self.instructor_name else self.instructor)
+	
+	def validate_course(self):
+		group_based_on, course = frappe.db.get_value("Student Group", self.student_group, ["group_based_on", "course"])
+		if group_based_on == "Course":
+			self.course = course
+
+	def validate_date(self):
+		"""Validates if from_time is greater than to_time"""
+		if self.from_time > self.to_time:
+			frappe.throw(_("From Time cannot be greater than To Time."))
+	
+	def validate_overlap(self):
+		"""Validates overlap for Student Group, Instructor, Room"""
+		
+		from erpnext.education.utils import validate_overlap_for
+
+		#Validate overlapping course schedules.
+		if self.student_group:
+			validate_overlap_for(self, "Course Schedule", "student_group")
+		
+		validate_overlap_for(self, "Course Schedule", "instructor")
+		validate_overlap_for(self, "Course Schedule", "room")
+
+		#validate overlapping assessment schedules.
+		if self.student_group:
+			validate_overlap_for(self, "Assessment Plan", "student_group")
+		
+		validate_overlap_for(self, "Assessment Plan", "room")
+		validate_overlap_for(self, "Assessment Plan", "supervisor", self.instructor)
+
diff --git a/erpnext/education/doctype/course_schedule/course_schedule_calendar.js b/erpnext/education/doctype/course_schedule/course_schedule_calendar.js
new file mode 100644
index 0000000..c11405d
--- /dev/null
+++ b/erpnext/education/doctype/course_schedule/course_schedule_calendar.js
@@ -0,0 +1,38 @@
+frappe.views.calendar["Course Schedule"] = {
+	field_map: {
+		// from_datetime and to_datetime don't exist as docfields but are used in onload
+		"start": "from_datetime",
+		"end": "to_datetime",
+		"id": "name",
+		"title": "course",
+		"allDay": "allDay"
+	},
+	gantt: false,
+	filters: [
+		{
+			"fieldtype": "Link",
+			"fieldname": "student_group",
+			"options": "Student Group",
+			"label": __("Student Group")
+		},
+		{
+			"fieldtype": "Link",
+			"fieldname": "course",
+			"options": "Course",
+			"label": __("Course")
+		},
+		{
+			"fieldtype": "Link",
+			"fieldname": "instructor",
+			"options": "Instructor",
+			"label": __("Instructor")
+		},
+		{
+			"fieldtype": "Link",
+			"fieldname": "room",
+			"options": "Room",
+			"label": __("Room")
+		}
+	],
+	get_events_method: "erpnext.education.api.get_course_schedule_events"
+}
diff --git a/erpnext/education/doctype/course_schedule/test_course_schedule.js b/erpnext/education/doctype/course_schedule/test_course_schedule.js
new file mode 100644
index 0000000..5cdb67b
--- /dev/null
+++ b/erpnext/education/doctype/course_schedule/test_course_schedule.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Course Schedule", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Course Schedule
+		() => frappe.tests.make('Course Schedule', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/education/doctype/course_schedule/test_course_schedule.py b/erpnext/education/doctype/course_schedule/test_course_schedule.py
new file mode 100644
index 0000000..9ba6bd3
--- /dev/null
+++ b/erpnext/education/doctype/course_schedule/test_course_schedule.py
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+import datetime
+from frappe.utils import today, to_timedelta
+from erpnext.education.utils import OverlapError
+
+# test_records = frappe.get_test_records('Course Schedule')
+
+class TestCourseSchedule(unittest.TestCase):
+	def test_student_group_conflict(self):
+		cs1 = make_course_schedule_test_record(simulate= True)
+
+		cs2 = make_course_schedule_test_record(schedule_date=cs1.schedule_date, from_time= cs1.from_time, 
+			to_time= cs1.to_time, instructor="_Test Instructor 2", room="RM0002", do_not_save= 1)
+		self.assertRaises(OverlapError, cs2.save)
+
+	def test_instructor_conflict(self):
+		cs1 = make_course_schedule_test_record(simulate= True)
+		
+		cs2 = make_course_schedule_test_record(from_time= cs1.from_time, to_time= cs1.to_time, 
+			student_group="Course-TC101-2014-2015 (_Test Academic Term)", room="RM0002", do_not_save= 1)
+		self.assertRaises(OverlapError, cs2.save)
+
+	def test_room_conflict(self):
+		cs1 = make_course_schedule_test_record(simulate= True)
+		
+		cs2 = make_course_schedule_test_record(from_time= cs1.from_time, to_time= cs1.to_time, 
+			student_group="Course-TC101-2014-2015 (_Test Academic Term)", instructor="_Test Instructor 2", do_not_save= 1)
+		self.assertRaises(OverlapError, cs2.save)
+		
+	def test_no_conflict(self):
+		cs1 = make_course_schedule_test_record(simulate= True)
+		
+		make_course_schedule_test_record(from_time= cs1.from_time, to_time= cs1.to_time, 
+			student_group="Course-TC102-2014-2015 (_Test Academic Term)", instructor="_Test Instructor 2", room="RM0002")
+
+def make_course_schedule_test_record(**args):
+	args = frappe._dict(args)
+
+	course_schedule = frappe.new_doc("Course Schedule")
+	course_schedule.student_group = args.student_group or "Course-TC101-2014-2015 (_Test Academic Term)"
+	course_schedule.course = args.course or "TC101"
+	course_schedule.instructor = args.instructor or "_Test Instructor"
+	course_schedule.room = args.room or "RM0001"
+	
+	course_schedule.schedule_date = args.schedule_date or today()
+	course_schedule.from_time = args.from_time or to_timedelta("01:00:00")
+	course_schedule.to_time = args.to_time or course_schedule.from_time + datetime.timedelta(hours= 1)
+
+	
+	if not args.do_not_save:
+		if args.simulate:
+			while True:
+				try:
+					course_schedule.save()
+					break
+				except OverlapError:
+					course_schedule.from_time = course_schedule.from_time + datetime.timedelta(minutes=10)
+					course_schedule.to_time = course_schedule.from_time + datetime.timedelta(hours= 1)
+		else:
+			course_schedule.save()
+
+	return course_schedule
diff --git a/erpnext/schools/doctype/course_scheduling_tool/__init__.py b/erpnext/education/doctype/course_scheduling_tool/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/course_scheduling_tool/__init__.py
rename to erpnext/education/doctype/course_scheduling_tool/__init__.py
diff --git a/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js b/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js
new file mode 100644
index 0000000..20503f9
--- /dev/null
+++ b/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js
@@ -0,0 +1,39 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+
+frappe.ui.form.on('Course Scheduling Tool', {
+	setup(frm) {
+		frm.add_fetch('student_group', 'program', 'program');
+		frm.add_fetch('student_group', 'course', 'course');
+		frm.add_fetch('student_group', 'academic_year', 'academic_year');
+		frm.add_fetch('student_group', 'academic_term', 'academic_term');
+	},
+	refresh(frm) {
+		frm.disable_save();
+		frm.page.set_primary_action(__('Schedule Course'), () => {
+			frm.call('schedule_course')
+				.then(r => {
+					if (!r.message) {
+						frappe.throw(__('There were errors creating Course Schedule'));
+					}
+					const { course_schedules } = r.message;
+					if (course_schedules) {
+						const html = `
+						<table class="table table-bordered">
+							<caption>${__('Following course schedules were created')}</caption>
+							<thead><tr><th>${__("Course")}</th><th>${__("Date")}</th></tr></thead>
+							<tbody>
+								${course_schedules.map(
+									c => `<tr><td><a href="#Form/Course Schedule/${c.name}">${c.name}</a></td>
+									<td>${c.schedule_date}</td></tr>`
+								).join('')}
+							</tbody>
+						</table>`
+
+						frappe.msgprint(html);
+					}
+				});
+		});
+	}
+});
\ No newline at end of file
diff --git a/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.json b/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.json
new file mode 100644
index 0000000..11932fe
--- /dev/null
+++ b/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.json
@@ -0,0 +1,642 @@
+{
+ "allow_copy": 1, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2015-09-23 15:37:38.108475", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "student_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Student Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "course", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Course", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Course", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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": 0, 
+   "in_standard_filter": 0, 
+   "label": "Program", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Program", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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": 0, 
+   "in_standard_filter": 0, 
+   "label": "Academic Year", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Year", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_6", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "instructor", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Instructor", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Instructor", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "instructor_name", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Instructor Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "instructor.instructor_name", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_9", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "room", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Room", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Room", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_7", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "fieldname": "from_time", 
+   "fieldtype": "Time", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "From Time", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "fieldname": "course_start_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Course Start Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "day", 
+   "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": "Day", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nMonday\nTuesday\nWednesday\nThursday\nFriday\nSaturday\nSunday", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "reschedule", 
+   "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": "Reschedule", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_15", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "to_time", 
+   "fieldtype": "Time", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "To TIme", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "fieldname": "course_end_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Course End Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 1, 
+ "hide_toolbar": 1, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 1, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2017-11-21 16:47:58.091740", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Course Scheduling Tool", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.py b/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.py
new file mode 100644
index 0000000..97c29ab
--- /dev/null
+++ b/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.py
@@ -0,0 +1,114 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+import calendar
+from frappe import _
+from frappe.model.document import Document
+from frappe.utils import add_days, getdate
+from erpnext.education.utils import OverlapError
+
+
+class CourseSchedulingTool(Document):
+
+	def schedule_course(self):
+		"""Creates course schedules as per specified parameters"""
+
+		course_schedules = []
+		course_schedules_errors = []
+		rescheduled = []
+		reschedule_errors = []
+
+		self.validate_mandatory()
+		self.validate_date()
+		self.instructor_name = frappe.db.get_value(
+			"Instructor", self.instructor, "instructor_name")
+
+		group_based_on, course = frappe.db.get_value(
+			"Student Group", self.student_group, ["group_based_on", "course"])
+
+		if group_based_on == "Course":
+			self.course = course
+
+		if self.reschedule:
+			rescheduled, reschedule_errors = self.delete_course_schedule(
+				rescheduled, reschedule_errors)
+
+		date = self.course_start_date
+		while date < self.course_end_date:
+			if self.day == calendar.day_name[getdate(date).weekday()]:
+				course_schedule = self.make_course_schedule(date)
+				try:
+					print('pass')
+					course_schedule.save()
+				except OverlapError:
+					print('fail')
+					course_schedules_errors.append(date)
+				else:
+					course_schedules.append(course_schedule)
+
+				date = add_days(date, 7)
+			else:
+				date = add_days(date, 1)
+
+		return dict(
+			course_schedules=course_schedules,
+			course_schedules_errors=course_schedules_errors,
+			rescheduled=rescheduled,
+			reschedule_errors=reschedule_errors
+		)
+
+	def validate_mandatory(self):
+		"""Validates all mandatory fields"""
+
+		fields = ['course', 'room', 'instructor', 'from_time',
+				  'to_time', 'course_start_date', 'course_end_date', 'day']
+		for d in fields:
+			if not self.get(d):
+				frappe.throw(_("{0} is mandatory").format(
+					self.meta.get_label(d)))
+
+	def validate_date(self):
+		"""Validates if Course Start Date is greater than Course End Date"""
+		if self.course_start_date > self.course_end_date:
+			frappe.throw(
+				"Course Start Date cannot be greater than Course End Date.")
+
+	def delete_course_schedule(self, rescheduled, reschedule_errors):
+		"""Delete all course schedule within the Date range and specified filters"""
+
+		schedules = frappe.get_list("Course Schedule",
+			fields=["name", "schedule_date"],
+			filters=[
+				["student_group", "=", self.student_group],
+				["course", "=", self.course],
+				["schedule_date", ">=", self.course_start_date],
+				["schedule_date", "<=", self.course_end_date]
+			]
+		)
+
+		for d in schedules:
+			try:
+				if self.day == calendar.day_name[getdate(d.schedule_date).weekday()]:
+					frappe.delete_doc("Course Schedule", d.name)
+					rescheduled.append(d.name)
+			except:
+				reschedule_errors.append(d.name)
+		return rescheduled, reschedule_errors
+
+	def make_course_schedule(self, date):
+		"""Makes a new Course Schedule.
+		:param date: Date on which Course Schedule will be created."""
+
+		course_schedule = frappe.new_doc("Course Schedule")
+		course_schedule.student_group = self.student_group
+		course_schedule.course = self.course
+		course_schedule.instructor = self.instructor
+		course_schedule.instructor_name = self.instructor_name
+		course_schedule.room = self.room
+		course_schedule.schedule_date = date
+		course_schedule.from_time = self.from_time
+		course_schedule.to_time = self.to_time
+		return course_schedule
diff --git a/erpnext/education/doctype/course_scheduling_tool/test_course_scheduling_tool.js b/erpnext/education/doctype/course_scheduling_tool/test_course_scheduling_tool.js
new file mode 100644
index 0000000..4419d18
--- /dev/null
+++ b/erpnext/education/doctype/course_scheduling_tool/test_course_scheduling_tool.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Course Scheduling Tool", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Course Scheduling Tool
+		() => frappe.tests.make('Course Scheduling Tool', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/education/doctype/course_scheduling_tool/test_course_scheduling_tool.py b/erpnext/education/doctype/course_scheduling_tool/test_course_scheduling_tool.py
new file mode 100644
index 0000000..d921f8e
--- /dev/null
+++ b/erpnext/education/doctype/course_scheduling_tool/test_course_scheduling_tool.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestCourseSchedulingTool(unittest.TestCase):
+	pass
diff --git a/erpnext/schools/doctype/school_settings/__init__.py b/erpnext/education/doctype/education_settings/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/school_settings/__init__.py
rename to erpnext/education/doctype/education_settings/__init__.py
diff --git a/erpnext/education/doctype/education_settings/education_settings.js b/erpnext/education/doctype/education_settings/education_settings.js
new file mode 100644
index 0000000..764d8b4
--- /dev/null
+++ b/erpnext/education/doctype/education_settings/education_settings.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Education Settings', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/education/doctype/education_settings/education_settings.json b/erpnext/education/doctype/education_settings/education_settings.json
new file mode 100644
index 0000000..a0b8e99
--- /dev/null
+++ b/erpnext/education/doctype/education_settings/education_settings.json
@@ -0,0 +1,327 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-04-05 13:33:04.519313", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "current_academic_year", 
+   "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": "Current Academic Year", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Year", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "current_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": "Current 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "attendance_freeze_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": "Attendance Freeze Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.", 
+   "fieldname": "validate_batch", 
+   "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": "Validate Batch for Students in Student Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.", 
+   "fieldname": "validate_course", 
+   "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": "Validate Enrolled Course for Students in Student Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_7", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Full Name", 
+   "fieldname": "instructor_created_by", 
+   "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": "Instructor Records to be created by", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Full Name\nNaming Series\nEmployee Number", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 1, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-28 15:45:30.324324", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Education Settings", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 0, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Education Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/education/doctype/education_settings/education_settings.py b/erpnext/education/doctype/education_settings/education_settings.py
new file mode 100644
index 0000000..9286efa
--- /dev/null
+++ b/erpnext/education/doctype/education_settings/education_settings.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+import frappe.defaults
+from frappe.model.document import Document
+
+education_keydict = {
+	# "key in defaults": "key in Global Defaults"
+	"academic_year": "current_academic_year",
+	"academic_term": "current_academic_term",
+	"validate_batch": "validate_batch",
+	"validate_course": "validate_course"
+}
+
+
+class EducationSettings(Document):
+	def on_update(self):
+		"""update defaults"""
+		for key in education_keydict:
+			frappe.db.set_default(key, self.get(education_keydict[key], ''))
+
+		# clear cache
+		frappe.clear_cache()
+
+	def get_defaults(self):
+		return frappe.defaults.get_defaults()
+
+	def validate(self):
+		from frappe.custom.doctype.property_setter.property_setter import make_property_setter
+		if self.get('instructor_created_by')=='Naming Series':
+			make_property_setter('Instructor', "naming_series", "hidden", 0, "Check")
+		else:
+			make_property_setter('Instructor', "naming_series", "hidden", 1, "Check")
diff --git a/erpnext/education/doctype/education_settings/test_education_settings.js b/erpnext/education/doctype/education_settings/test_education_settings.js
new file mode 100644
index 0000000..990b0aa
--- /dev/null
+++ b/erpnext/education/doctype/education_settings/test_education_settings.js
@@ -0,0 +1,31 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+// Testing Setup Module in Education
+QUnit.module('education');
+
+QUnit.test("test: Education Settings", function (assert) {
+	let done = assert.async();
+
+	assert.expect(3);
+
+	frappe.run_serially([
+		() => frappe.set_route("List", "Education Settings"),
+		() => frappe.timeout(0.4),
+		() => {
+			return frappe.tests.set_form_values(cur_frm, [
+				{current_academic_year: '2016-17'},
+				{current_academic_term: '2016-17 (Semester 1)'},
+				{attendance_freeze_date: '2016-07-20'}
+			]);
+		},
+		() => {
+			cur_frm.save();
+			assert.ok(cur_frm.doc.current_academic_year=="2016-17");
+			assert.ok(cur_frm.doc.current_academic_term=="2016-17 (Semester 1)");
+			assert.ok(cur_frm.doc.attendance_freeze_date=="2016-07-20");
+		},
+		() => done()
+	]);
+});
diff --git a/erpnext/education/doctype/education_settings/test_education_settings.py b/erpnext/education/doctype/education_settings/test_education_settings.py
new file mode 100644
index 0000000..038fb6e
--- /dev/null
+++ b/erpnext/education/doctype/education_settings/test_education_settings.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestEducationSettings(unittest.TestCase):
+	pass
diff --git a/erpnext/schools/doctype/fee_category/__init__.py b/erpnext/education/doctype/fee_category/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/fee_category/__init__.py
rename to erpnext/education/doctype/fee_category/__init__.py
diff --git a/erpnext/schools/doctype/fee_category/fee_category.js b/erpnext/education/doctype/fee_category/fee_category.js
similarity index 100%
rename from erpnext/schools/doctype/fee_category/fee_category.js
rename to erpnext/education/doctype/fee_category/fee_category.js
diff --git a/erpnext/education/doctype/fee_category/fee_category.json b/erpnext/education/doctype/fee_category/fee_category.json
new file mode 100644
index 0000000..c1bfa8e
--- /dev/null
+++ b/erpnext/education/doctype/fee_category/fee_category.json
@@ -0,0 +1,171 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:category_name", 
+ "beta": 0, 
+ "creation": "2015-09-16 13:01:10.448734", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 0, 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "category_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "earning_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Small Text", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "300px"
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "fa fa-flag", 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2017-11-10 18:56:33.824534", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Fee Category", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "search_fields": "description", 
+ "show_name_in_global_search": 1, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fee_category/fee_category.py b/erpnext/education/doctype/fee_category/fee_category.py
similarity index 100%
rename from erpnext/schools/doctype/fee_category/fee_category.py
rename to erpnext/education/doctype/fee_category/fee_category.py
diff --git a/erpnext/education/doctype/fee_category/test_fee_category.js b/erpnext/education/doctype/fee_category/test_fee_category.js
new file mode 100644
index 0000000..a08ed33
--- /dev/null
+++ b/erpnext/education/doctype/fee_category/test_fee_category.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Fee Category", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Fee Category
+		() => frappe.tests.make('Fee Category', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/schools/doctype/fee_category/test_fee_category.py b/erpnext/education/doctype/fee_category/test_fee_category.py
similarity index 100%
rename from erpnext/schools/doctype/fee_category/test_fee_category.py
rename to erpnext/education/doctype/fee_category/test_fee_category.py
diff --git a/erpnext/schools/doctype/fee_category/test_records.json b/erpnext/education/doctype/fee_category/test_records.json
similarity index 100%
rename from erpnext/schools/doctype/fee_category/test_records.json
rename to erpnext/education/doctype/fee_category/test_records.json
diff --git a/erpnext/schools/doctype/fee_component/__init__.py b/erpnext/education/doctype/fee_component/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/fee_component/__init__.py
rename to erpnext/education/doctype/fee_component/__init__.py
diff --git a/erpnext/education/doctype/fee_component/fee_component.json b/erpnext/education/doctype/fee_component/fee_component.json
new file mode 100644
index 0000000..f6e13c4
--- /dev/null
+++ b/erpnext/education/doctype/fee_component/fee_component.json
@@ -0,0 +1,169 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 1, 
+ "autoname": "", 
+ "beta": 0, 
+ "creation": "2015-09-16 13:07:27.675453", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "fees_category", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Fees Category", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "earning_name", 
+   "oldfieldtype": "Data", 
+   "options": "Fee Category", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Small Text", 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "300px"
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "fa fa-flag", 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 18:58:10.254407", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Fee Component", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fee_component/fee_component.py b/erpnext/education/doctype/fee_component/fee_component.py
similarity index 100%
rename from erpnext/schools/doctype/fee_component/fee_component.py
rename to erpnext/education/doctype/fee_component/fee_component.py
diff --git a/erpnext/schools/doctype/fee_schedule/__init__.py b/erpnext/education/doctype/fee_schedule/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/fee_schedule/__init__.py
rename to erpnext/education/doctype/fee_schedule/__init__.py
diff --git a/erpnext/education/doctype/fee_schedule/fee_schedule.js b/erpnext/education/doctype/fee_schedule/fee_schedule.js
new file mode 100644
index 0000000..a36b9cb
--- /dev/null
+++ b/erpnext/education/doctype/fee_schedule/fee_schedule.js
@@ -0,0 +1,116 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Fee Schedule', {
+	setup: function(frm) {
+		frm.add_fetch("fee_structure", "receivable_account", "receivable_account");
+		frm.add_fetch("fee_structure", "income_account", "income_account");
+		frm.add_fetch("fee_structure", "cost_center", "cost_center");
+	},
+
+	onload: function(frm) {
+		frm.set_query("receivable_account", function(doc) {
+			return {
+				filters: {
+					'account_type': 'Receivable',
+					'is_group': 0,
+					'company': doc.company
+				}
+			};
+		});
+		frm.set_query("income_account", function(doc) {
+			return {
+				filters: {
+					'account_type': 'Income Account',
+					'is_group': 0,
+					'company': doc.company
+				}
+			};
+		});
+		frm.set_query("student_group", "student_groups", function() {
+			return {
+				"program": frm.doc.program,
+				"academic_term": frm.doc.academic_term,
+				"academic_year": frm.doc.academic_year
+			};
+		});
+		frappe.realtime.on("fee_schedule_progress", function(data) {
+			if (data.reload && data.reload === 1) {
+				frm.reload_doc();
+			}
+			if (data.progress && data.progress === "0") {
+				frappe.msgprint(__("Fee records will be created in the background. In case of any error the error message will be updated in the Schedule."));
+			}
+			if (data.progress) {
+				let progress_bar = $(cur_frm.dashboard.progress_area).find(".progress-bar");
+				if (progress_bar) {
+					$(progress_bar).removeClass("progress-bar-danger").addClass("progress-bar-success progress-bar-striped");
+					$(progress_bar).css("width", data.progress+"%");
+				}
+			}
+		});
+	},
+
+	refresh: function(frm) {
+		if(!frm.doc.__islocal && frm.doc.__onload && frm.doc.__onload.dashboard_info &&
+			frm.doc.fee_creation_status=="Successful") {
+			var info = frm.doc.__onload.dashboard_info;
+			frm.dashboard.add_indicator(__('Total Collected: {0}', [format_currency(info.total_paid,
+				info.currency)]), 'blue');
+			frm.dashboard.add_indicator(__('Total Outstanding: {0}', [format_currency(info.total_unpaid,
+				info.currency)]), info.total_unpaid ? 'orange' : 'green');
+		}
+		if (frm.doc.fee_creation_status=="In Process") {
+			frm.dashboard.add_progress("Fee Creation Status", "0");
+		}
+		if (frm.doc.docstatus==1 && !frm.doc.fee_creation_status || frm.doc.fee_creation_status == "Failed") {
+			frm.add_custom_button(__('Create Fees'), function() {
+				frappe.call({
+					method: "create_fees",
+					doc: frm.doc,
+					callback: function() {
+						frm.refresh();
+					}
+				});
+			}, "fa fa-play", "btn-success");
+		}
+	},
+
+	fee_structure: function(frm) {
+		if (frm.doc.fee_structure) {
+			frappe.call({
+				method: "erpnext.education.doctype.fee_schedule.fee_schedule.get_fee_structure",
+				args: {
+					"target_doc": frm.doc.name,
+					"source_name": frm.doc.fee_structure
+				},
+				callback: function(r) {
+					var doc = frappe.model.sync(r.message);
+					frappe.set_route("Form", doc[0].doctype, doc[0].name);
+				}
+			});
+		}
+	}
+});
+
+frappe.ui.form.on("Fee Schedule Student Group", {
+	student_group: function(frm, cdt, cdn) {
+		var row = locals[cdt][cdn];
+		if (row.student_group && frm.doc.academic_year) {
+			frappe.call({
+				method: "erpnext.education.doctype.fee_schedule.fee_schedule.get_total_students",
+				args: {
+					"student_group": row.student_group,
+					"academic_year": frm.doc.academic_year,
+					"academic_term": frm.doc.academic_term,
+					"student_category": frm.doc.student_category
+				},
+				callback: function(r) {
+					if(!r.exc) {
+						frappe.model.set_value(cdt, cdn, "total_students", r.message);
+					}
+				}
+			});
+		}
+	}
+})
\ No newline at end of file
diff --git a/erpnext/education/doctype/fee_schedule/fee_schedule.json b/erpnext/education/doctype/fee_schedule/fee_schedule.json
new file mode 100644
index 0000000..a77cc59
--- /dev/null
+++ b/erpnext/education/doctype/fee_schedule/fee_schedule.json
@@ -0,0 +1,1110 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "naming_series:", 
+ "beta": 1, 
+ "creation": "2017-07-18 15:21:21.527136", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "fee_structure", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Fee Structure", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Fee Structure", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "due_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": "Due Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Naming Series", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "FRQ.", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "fee_creation_status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Fee Creation Status", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "\nIn Process\nFailed\nSuccessful", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "send_email", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Send Payment Request Email", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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": 0, 
+   "in_standard_filter": 0, 
+   "label": "Program", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Program", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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": 0, 
+   "in_standard_filter": 0, 
+   "label": "Academic Year", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Year", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_10", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "currency", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Currency", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "student_groups", 
+   "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": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Fee Schedule Student Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_14", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Fee Breakup for each student", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "components", 
+   "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": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Fee Component", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_16", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_18", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "total_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Amount per Student", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "grand_total", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Grand Total", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "grand_total_in_words", 
+   "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": "In Words", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "edit_printing_settings", 
+   "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": "Printing Settings", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "letter_head", 
+   "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": "Letter Head", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Letter Head", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_32", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "select_print_heading", 
+   "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": "Print Heading", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Print Heading", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "account", 
+   "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": "Accounting", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "receivable_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Receivable Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "income_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Income Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_39", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cost_center", 
+   "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": "Cost Center", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Institution", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Fee Schedule", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "collapsible_depends_on": "", 
+   "columns": 0, 
+   "depends_on": "error_log", 
+   "fieldname": "section_break_31", 
+   "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": "Error Log", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "error_log", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Error Log", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-04 13:08:27.727709", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Fee Schedule", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/education/doctype/fee_schedule/fee_schedule.py b/erpnext/education/doctype/fee_schedule/fee_schedule.py
new file mode 100644
index 0000000..59acf46
--- /dev/null
+++ b/erpnext/education/doctype/fee_schedule/fee_schedule.py
@@ -0,0 +1,139 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe, erpnext
+from frappe.model.document import Document
+from frappe.model.mapper import get_mapped_doc
+from frappe.utils import money_in_words
+from frappe.utils import cint, flt, cstr
+from frappe.utils.background_jobs import enqueue
+from frappe import _
+
+
+class FeeSchedule(Document):
+	def onload(self):
+		info = self.get_dashboard_info()
+		self.set_onload('dashboard_info', info)
+
+	def get_dashboard_info(self):
+		info = {
+			"total_paid": 0,
+			"total_unpaid": 0,
+			"currency": erpnext.get_company_currency(self.company)
+		}
+
+		fees_amount = frappe.db.sql("""select sum(grand_total), sum(outstanding_amount) from tabFees
+			where fee_schedule=%s and docstatus=1""", (self.name))
+
+		if fees_amount:
+			info["total_paid"] = flt(fees_amount[0][0]) - flt(fees_amount[0][1])
+			info["total_unpaid"] = flt(fees_amount[0][1])
+
+		return info
+
+	def validate(self):
+		self.calculate_total_and_program()
+
+	def calculate_total_and_program(self):
+		no_of_students = 0
+		for d in self.student_groups:
+			# if not d.total_students:
+			d.total_students = get_total_students(d.student_group, self.academic_year,
+				self.academic_term, self.student_category)
+			no_of_students += cint(d.total_students)
+
+			# validate the program of fee structure and student groups
+			student_group_program = frappe.db.get_value("Student Group", d.student_group, "program")
+			if self.program and student_group_program and self.program != student_group_program:
+				frappe.msgprint(_("Program in the Fee Structure and Student Group {0} are different.")
+					.format(d.student_group))
+		self.grand_total = no_of_students*self.total_amount
+		self.grand_total_in_words = money_in_words(self.grand_total)
+
+	def create_fees(self):
+		self.db_set("fee_creation_status", "In Process")
+		frappe.publish_realtime("fee_schedule_progress",
+			{"progress": "0", "reload": 1}, user=frappe.session.user)
+		enqueue(generate_fee, queue='default', timeout=6000, event='generate_fee',
+			fee_schedule=self.name)
+
+def generate_fee(fee_schedule):
+	doc = frappe.get_doc("Fee Schedule", fee_schedule)
+	error = False
+	total_records = sum([int(d.total_students) for d in doc.student_groups])
+	created_records = 0
+
+	if not total_records:
+		frappe.throw(_("Please setup Students under Student Groups"))
+
+	for d in doc.student_groups:
+		students = frappe.db.sql(""" select sg.program, sg.batch, sgs.student, sgs.student_name
+			from `tabStudent Group` sg, `tabStudent Group Student` sgs
+			where sg.name=%s and sg.name=sgs.parent and sgs.active=1""", d.student_group, as_dict=1)
+
+		for student in students:
+			try:
+				fees_doc = get_mapped_doc("Fee Schedule", fee_schedule,	{
+					"Fee Schedule": {
+						"doctype": "Fees",
+						"field_map": {
+							"name": "Fee Schedule"
+						}
+					}
+				})
+				fees_doc.student = student.student
+				fees_doc.student_name = student.student_name
+				fees_doc.program = student.program
+				fees_doc.student_batch = student.batch
+				fees_doc.send_payment_request = doc.send_email
+				fees_doc.save()
+				fees_doc.submit()
+				created_records += 1
+				frappe.publish_realtime("fee_schedule_progress", {"progress": str(int(created_records * 100/total_records))}, user=frappe.session.user)
+
+			except Exception as e:
+				error = True
+				err_msg = frappe.local.message_log and "\n\n".join(frappe.local.message_log) or cstr(e)
+
+	if error:
+		frappe.db.rollback()
+		frappe.db.set_value("Fee Schedule", fee_schedule, "fee_creation_status", "Failed")
+		frappe.db.set_value("Fee Schedule", fee_schedule, "error_log", err_msg)
+
+	else:
+		frappe.db.set_value("Fee Schedule", fee_schedule, "fee_creation_status", "Successful")
+		frappe.db.set_value("Fee Schedule", fee_schedule, "error_log", None)
+
+	frappe.publish_realtime("fee_schedule_progress",
+		{"progress": "100", "reload": 1}, user=frappe.session.user)
+
+
+@frappe.whitelist()
+def get_fee_structure(source_name,target_doc=None):
+	fee_request = get_mapped_doc("Fee Structure", source_name,
+		{"Fee Structure": {
+			"doctype": "Fee Schedule"
+		}}, ignore_permissions=True)
+	return fee_request
+
+@frappe.whitelist()
+def get_total_students(student_group, academic_year, academic_term=None, student_category=None):
+	conditions = ""
+	if student_category:
+		conditions = " and pe.student_category='{}'".format(frappe.db.escape(student_category))
+	if academic_term:
+		conditions = " and pe.academic_term='{}'".format(frappe.db.escape(academic_term))
+
+
+	return frappe.db.sql("""
+		select count(pe.name)
+		from `tabStudent Group Student` sgs, `tabProgram Enrollment` pe
+		where 
+			pe.student = sgs.student
+			and pe.academic_year = %s
+			and sgs.parent = %s
+			and sgs.active = 1
+			{conditions}
+	""".format(conditions=conditions), (academic_year, student_group))[0][0]
diff --git a/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js b/erpnext/education/doctype/fee_schedule/fee_schedule_list.js
similarity index 100%
rename from erpnext/schools/doctype/fee_schedule/fee_schedule_list.js
rename to erpnext/education/doctype/fee_schedule/fee_schedule_list.js
diff --git a/erpnext/schools/doctype/fee_schedule/test_fee_schedule.js b/erpnext/education/doctype/fee_schedule/test_fee_schedule.js
similarity index 100%
rename from erpnext/schools/doctype/fee_schedule/test_fee_schedule.js
rename to erpnext/education/doctype/fee_schedule/test_fee_schedule.js
diff --git a/erpnext/schools/doctype/fee_schedule/test_fee_schedule.py b/erpnext/education/doctype/fee_schedule/test_fee_schedule.py
similarity index 100%
rename from erpnext/schools/doctype/fee_schedule/test_fee_schedule.py
rename to erpnext/education/doctype/fee_schedule/test_fee_schedule.py
diff --git a/erpnext/schools/doctype/fee_schedule_program/__init__.py b/erpnext/education/doctype/fee_schedule_program/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/fee_schedule_program/__init__.py
rename to erpnext/education/doctype/fee_schedule_program/__init__.py
diff --git a/erpnext/education/doctype/fee_schedule_program/fee_schedule_program.json b/erpnext/education/doctype/fee_schedule_program/fee_schedule_program.json
new file mode 100644
index 0000000..e9a5c12
--- /dev/null
+++ b/erpnext/education/doctype/fee_schedule_program/fee_schedule_program.json
@@ -0,0 +1,133 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-03-23 17:46:55.712169", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "program", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Program", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Program", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "student_batch", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Student 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": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_students", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Total Students", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:09:02.326827", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Fee Schedule Program", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fee_schedule_program/fee_schedule_program.py b/erpnext/education/doctype/fee_schedule_program/fee_schedule_program.py
similarity index 100%
rename from erpnext/schools/doctype/fee_schedule_program/fee_schedule_program.py
rename to erpnext/education/doctype/fee_schedule_program/fee_schedule_program.py
diff --git a/erpnext/schools/doctype/fee_schedule_student_group/__init__.py b/erpnext/education/doctype/fee_schedule_student_group/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/fee_schedule_student_group/__init__.py
rename to erpnext/education/doctype/fee_schedule_student_group/__init__.py
diff --git a/erpnext/education/doctype/fee_schedule_student_group/fee_schedule_student_group.json b/erpnext/education/doctype/fee_schedule_student_group/fee_schedule_student_group.json
new file mode 100644
index 0000000..aed1ae5
--- /dev/null
+++ b/erpnext/education/doctype/fee_schedule_student_group/fee_schedule_student_group.json
@@ -0,0 +1,102 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-03-23 17:55:52.476822", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "student_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Student Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_students", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Total Students", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:09:19.498184", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Fee Schedule Student Group", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fee_schedule_student_group/fee_schedule_student_group.py b/erpnext/education/doctype/fee_schedule_student_group/fee_schedule_student_group.py
similarity index 100%
rename from erpnext/schools/doctype/fee_schedule_student_group/fee_schedule_student_group.py
rename to erpnext/education/doctype/fee_schedule_student_group/fee_schedule_student_group.py
diff --git a/erpnext/schools/doctype/fee_structure/__init__.py b/erpnext/education/doctype/fee_structure/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/fee_structure/__init__.py
rename to erpnext/education/doctype/fee_structure/__init__.py
diff --git a/erpnext/education/doctype/fee_structure/fee_structure.js b/erpnext/education/doctype/fee_structure/fee_structure.js
new file mode 100644
index 0000000..812456c
--- /dev/null
+++ b/erpnext/education/doctype/fee_structure/fee_structure.js
@@ -0,0 +1,56 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Fee Structure', {
+	setup: function(frm) {
+		frm.add_fetch("company", "default_receivable_account", "receivable_account");
+		frm.add_fetch("company", "default_income_account", "income_account");
+		frm.add_fetch("company", "cost_center", "cost_center");
+	},
+
+	onload: function(frm) {
+		frm.set_query("receivable_account", function(doc) {
+			return {
+				filters: {
+					'account_type': 'Receivable',
+					'is_group': 0,
+					'company': doc.company
+				}
+			};
+		});
+		frm.set_query("income_account", function(doc) {
+			return {
+				filters: {
+					'account_type': 'Income Account',
+					'is_group': 0,
+					'company': doc.company
+				}
+			};
+		});
+	},
+
+	refresh: function(frm) {
+		if(frm.doc.docstatus === 1) {
+			frm.add_custom_button(__("Make Fee Schedule"), function() {
+				frm.events.make_fee_schedule(frm);
+			});
+		}
+	},
+
+	make_fee_schedule: function(frm) {
+		frappe.model.open_mapped_doc({
+			method: "erpnext.education.doctype.fee_structure.fee_structure.make_fee_schedule",
+			frm: frm
+		});
+	}
+});
+
+frappe.ui.form.on("Fee Component", {
+	amount: function(frm) {
+		var total_amount = 0;
+		for(var i=0;i<frm.doc.components.length;i++) {
+			total_amount += frm.doc.components[i].amount;
+		}
+		frm.set_value("total_amount", total_amount);
+	}
+});
\ No newline at end of file
diff --git a/erpnext/education/doctype/fee_structure/fee_structure.json b/erpnext/education/doctype/fee_structure/fee_structure.json
new file mode 100644
index 0000000..98b8faa
--- /dev/null
+++ b/erpnext/education/doctype/fee_structure/fee_structure.json
@@ -0,0 +1,659 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "naming_series:", 
+ "beta": 0, 
+ "creation": "2015-09-16 13:03:20.430704", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Naming Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "FS.", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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": 1, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Program", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "earning_name", 
+   "oldfieldtype": "Data", 
+   "options": "Program", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "academic_term", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Academic Term", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Small Text", 
+   "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": 1, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "300px"
+  }, 
+  {
+   "allow_bulk_edit": 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": 0, 
+   "in_standard_filter": 0, 
+   "label": "Academic Year", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Year", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_4", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "components", 
+   "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": "Components", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Fee Component", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_6", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_11", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Total Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "accounts", 
+   "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": "Accounts", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "fieldname": "receivable_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Receivable Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "income_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Income Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_16", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cost_center", 
+   "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": "Cost Center", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Fee Structure", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "fa fa-flag", 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2017-12-04 12:51:06.864660", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Fee Structure", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "search_fields": "program, student_category, academic_year", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "program", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fee_structure/fee_structure.py b/erpnext/education/doctype/fee_structure/fee_structure.py
similarity index 100%
rename from erpnext/schools/doctype/fee_structure/fee_structure.py
rename to erpnext/education/doctype/fee_structure/fee_structure.py
diff --git a/erpnext/schools/doctype/fee_structure/test_fee_structure.js b/erpnext/education/doctype/fee_structure/test_fee_structure.js
similarity index 100%
rename from erpnext/schools/doctype/fee_structure/test_fee_structure.js
rename to erpnext/education/doctype/fee_structure/test_fee_structure.js
diff --git a/erpnext/schools/doctype/fee_structure/test_fee_structure.py b/erpnext/education/doctype/fee_structure/test_fee_structure.py
similarity index 100%
rename from erpnext/schools/doctype/fee_structure/test_fee_structure.py
rename to erpnext/education/doctype/fee_structure/test_fee_structure.py
diff --git a/erpnext/schools/doctype/fee_structure/test_records.json b/erpnext/education/doctype/fee_structure/test_records.json
similarity index 100%
rename from erpnext/schools/doctype/fee_structure/test_records.json
rename to erpnext/education/doctype/fee_structure/test_records.json
diff --git a/erpnext/schools/doctype/fees/__init__.py b/erpnext/education/doctype/fees/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/fees/__init__.py
rename to erpnext/education/doctype/fees/__init__.py
diff --git a/erpnext/education/doctype/fees/fees.js b/erpnext/education/doctype/fees/fees.js
new file mode 100644
index 0000000..2a7218a
--- /dev/null
+++ b/erpnext/education/doctype/fees/fees.js
@@ -0,0 +1,183 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+
+frappe.ui.form.on("Fees", {
+	setup: function(frm) {
+		frm.add_fetch("fee_structure", "receivable_account", "receivable_account");
+		frm.add_fetch("fee_structure", "income_account", "income_account");
+		frm.add_fetch("fee_structure", "cost_center", "cost_center");
+	},
+
+	onload: function(frm){
+		frm.set_query("academic_term",function(){
+			return{
+				"filters":{
+					"academic_year": (frm.doc.academic_year)
+				}
+			};
+		});
+		frm.set_query("fee_structure",function(){
+			return{
+				"filters":{
+					"academic_year": (frm.doc.academic_year)
+				}
+			};
+		});
+		frm.set_query("receivable_account", function(doc) {
+			return {
+				filters: {
+					'account_type': 'Receivable',
+					'is_group': 0,
+					'company': doc.company
+				}
+			};
+		});
+		frm.set_query("income_account", function(doc) {
+			return {
+				filters: {
+					'account_type': 'Income Account',
+					'is_group': 0,
+					'company': doc.company
+				}
+			};
+		});
+		if (!frm.doc.posting_date) {
+			frm.doc.posting_date = frappe.datetime.get_today();
+		}
+	},
+
+	refresh: function(frm) {
+		if(frm.doc.docstatus == 0 && frm.doc.set_posting_time) {
+			frm.set_df_property('posting_date', 'read_only', 0);
+			frm.set_df_property('posting_time', 'read_only', 0);
+		} else {
+			frm.set_df_property('posting_date', 'read_only', 1);
+			frm.set_df_property('posting_time', 'read_only', 1);
+		}
+		if(frm.doc.docstatus===1) {
+			frm.add_custom_button(__('Accounting Ledger'), function() {
+				frappe.route_options = {
+					voucher_no: frm.doc.name,
+					from_date: frm.doc.posting_date,
+					to_date: frm.doc.posting_date,
+					company: frm.doc.company,
+					group_by_voucher: false
+				};
+				frappe.set_route("query-report", "General Ledger");
+			}, __("View"));
+		}
+		if(frm.doc.docstatus===1 && frm.doc.outstanding_amount>0) {
+			frm.add_custom_button(__("Payment Request"), function() {
+				frm.events.make_payment_request(frm);
+			}, __("Make"));
+			frm.page.set_inner_btn_group_as_primary(__("Make"));
+		}
+		if(frm.doc.docstatus===1 && frm.doc.outstanding_amount!=0) {
+			frm.add_custom_button(__("Payment"), function() {
+				frm.events.make_payment_entry(frm);
+			}, __("Make"));
+			frm.page.set_inner_btn_group_as_primary(__("Make"));
+		}
+	},
+
+	student: function(frm) {
+		if (frm.doc.student) {
+			frappe.call({
+				method:"erpnext.education.api.get_current_enrollment",
+				args: {
+					"student": frm.doc.student,
+					"academic_year": frm.doc.academic_year
+				},
+				callback: function(r) {
+					if(r){
+						$.each(r.message, function(i, d) {
+							frm.set_value(i,d);
+						});
+					}
+				}
+			});
+		}
+	},
+
+	make_payment_request: function(frm) {
+		if (!frm.doc.student_email) {
+			frappe.msgprint(__("Please set the Email ID for the Student to send the Payment Request"));
+		} else {
+			frappe.call({
+				method:"erpnext.accounts.doctype.payment_request.payment_request.make_payment_request",
+				args: {
+					"dt": frm.doc.doctype,
+					"dn": frm.doc.name,
+					"recipient_id": frm.doc.student_email
+				},
+				callback: function(r) {
+					if(!r.exc){
+						var doc = frappe.model.sync(r.message);
+						frappe.set_route("Form", doc[0].doctype, doc[0].name);
+					}
+				}
+			});
+		}
+	},
+
+	make_payment_entry: function(frm) {
+		return frappe.call({
+			method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_payment_entry",
+			args: {
+				"dt": frm.doc.doctype,
+				"dn": frm.doc.name
+			},
+			callback: function(r) {
+				var doc = frappe.model.sync(r.message);
+				frappe.set_route("Form", doc[0].doctype, doc[0].name);
+			}
+		});
+	},
+
+	set_posting_time: function(frm) {
+		frm.refresh();
+	},
+
+	academic_term: function() {
+		frappe.ui.form.trigger("Fees", "program");
+	},
+
+	fee_structure: function(frm) {
+		frm.set_value("components" ,"");
+		if (frm.doc.fee_structure) {
+			frappe.call({
+				method: "erpnext.education.api.get_fee_components",
+				args: {
+					"fee_structure": frm.doc.fee_structure
+				},
+				callback: function(r) {
+					if (r.message) {
+						$.each(r.message, function(i, d) {
+							var row = frappe.model.add_child(frm.doc, "Fee Component", "components");
+							row.fees_category = d.fees_category;
+							row.amount = d.amount;
+						});
+					}
+					refresh_field("components");
+					frm.trigger("calculate_total_amount");
+				}
+			});
+		}
+	},
+
+	calculate_total_amount: function(frm) {
+		var grand_total = 0;
+		for(var i=0;i<frm.doc.components.length;i++) {
+			grand_total += frm.doc.components[i].amount;
+		}
+		frm.set_value("grand_total", grand_total);
+	}
+});
+
+
+frappe.ui.form.on("Fee Component", {
+	amount: function(frm) {
+		frm.trigger("calculate_total_amount");
+	}
+});
diff --git a/erpnext/education/doctype/fees/fees.json b/erpnext/education/doctype/fees/fees.json
new file mode 100644
index 0000000..c4e1f82
--- /dev/null
+++ b/erpnext/education/doctype/fees/fees.json
@@ -0,0 +1,1358 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "naming_series:", 
+ "beta": 1, 
+ "creation": "2015-09-22 16:57:22.143710", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Naming Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "FEE.", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "student_name", 
+   "fieldtype": "Data", 
+   "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": "student.title", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "fee_schedule", 
+   "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": "Fee Schedule", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Fee Schedule", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "include_payment", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Include Payment", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "fieldname": "send_payment_request", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Send Payment Request", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Institution", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 1, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Today", 
+   "fieldname": "posting_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Date", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "posting_time", 
+   "fieldtype": "Time", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Posting Time", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.docstatus==0", 
+   "fieldname": "set_posting_time", 
+   "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": "Edit Posting Date and Time", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "due_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": "Due Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "student_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Student Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "program_enrollment", 
+   "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": "Program Enrollment", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Program Enrollment", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "student_batch", 
+   "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 Batch", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Batch Name", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "student_email", 
+   "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": "Student Email", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Email", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_16", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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": 0, 
+   "in_standard_filter": 0, 
+   "label": "Academic Year", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Year", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_7", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "currency", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Currency", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "fee_structure", 
+   "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": "Fee Structure", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Fee Structure", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "components", 
+   "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": "Components", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Fee Component", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_10", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Fees", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_11", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "grand_total", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Grand Total", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "grand_total_in_words", 
+   "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": "In Words", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "paid_amount", 
+   "fieldtype": "Currency", 
+   "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": "Paid Amount", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "outstanding_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Outstanding Amount", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "edit_printing_settings", 
+   "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": "Printing Settings", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "letter_head", 
+   "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": "Letter Head", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Letter Head", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_32", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "select_print_heading", 
+   "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": "Print Heading", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Print Heading", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "account", 
+   "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": "Accounting", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "receivable_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Receivable Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "income_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Income Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_39", 
+   "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": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cost_center", 
+   "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": "Cost Center", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2017-12-06 05:55:10.502567", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Fees", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "search_fields": "student, student_name", 
+ "show_name_in_global_search": 1, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "student_name", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fees/fees.py b/erpnext/education/doctype/fees/fees.py
similarity index 100%
rename from erpnext/schools/doctype/fees/fees.py
rename to erpnext/education/doctype/fees/fees.py
diff --git a/erpnext/schools/doctype/fees/fees_list.js b/erpnext/education/doctype/fees/fees_list.js
similarity index 100%
rename from erpnext/schools/doctype/fees/fees_list.js
rename to erpnext/education/doctype/fees/fees_list.js
diff --git a/erpnext/schools/doctype/fees/test_fees.js b/erpnext/education/doctype/fees/test_fees.js
similarity index 100%
rename from erpnext/schools/doctype/fees/test_fees.js
rename to erpnext/education/doctype/fees/test_fees.js
diff --git a/erpnext/schools/doctype/fees/test_fees.py b/erpnext/education/doctype/fees/test_fees.py
similarity index 100%
rename from erpnext/schools/doctype/fees/test_fees.py
rename to erpnext/education/doctype/fees/test_fees.py
diff --git a/erpnext/schools/doctype/grading_scale/__init__.py b/erpnext/education/doctype/grading_scale/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/grading_scale/__init__.py
rename to erpnext/education/doctype/grading_scale/__init__.py
diff --git a/erpnext/schools/doctype/grading_scale/grading_scale.js b/erpnext/education/doctype/grading_scale/grading_scale.js
similarity index 100%
rename from erpnext/schools/doctype/grading_scale/grading_scale.js
rename to erpnext/education/doctype/grading_scale/grading_scale.js
diff --git a/erpnext/education/doctype/grading_scale/grading_scale.json b/erpnext/education/doctype/grading_scale/grading_scale.json
new file mode 100644
index 0000000..67fef3e
--- /dev/null
+++ b/erpnext/education/doctype/grading_scale/grading_scale.json
@@ -0,0 +1,216 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 1, 
+ "autoname": "field:grading_scale_name", 
+ "beta": 0, 
+ "creation": "2016-08-26 03:06:53.922972", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "grading_scale_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Grading Scale Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "grading_intervals_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Grading Scale Intervals", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "intervals", 
+   "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": "Intervals", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Grading Scale Interval", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Grading Scale", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:07:22.001040", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Grading Scale", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/grading_scale/grading_scale.py b/erpnext/education/doctype/grading_scale/grading_scale.py
similarity index 100%
rename from erpnext/schools/doctype/grading_scale/grading_scale.py
rename to erpnext/education/doctype/grading_scale/grading_scale.py
diff --git a/erpnext/education/doctype/grading_scale/test_grading_scale.js b/erpnext/education/doctype/grading_scale/test_grading_scale.js
new file mode 100644
index 0000000..e363545
--- /dev/null
+++ b/erpnext/education/doctype/grading_scale/test_grading_scale.js
@@ -0,0 +1,102 @@
+// Education Assessment module
+QUnit.module('education');
+
+QUnit.test('Test: Grading Scale', function(assert){
+	assert.expect(3);
+	let done = assert.async();
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make('Grading Scale', [
+				{grading_scale_name: 'GTU'},
+				{description: 'The score will be set according to 100 based system.'},
+				{intervals: [
+					[
+						{grade_code: 'AA'},
+						{threshold: '95'},
+						{grade_description: 'First Class + Distinction'}
+					],
+					[
+						{grade_code: 'AB'},
+						{threshold: '90'},
+						{grade_description: 'First Class'}
+					],
+					[
+						{grade_code: 'BB'},
+						{threshold: '80'},
+						{grade_description: 'Distinction'}
+					],
+					[
+						{grade_code: 'BC'},
+						{threshold: '70'},
+						{grade_description: 'Second Class'}
+					],
+					[
+						{grade_code: 'CC'},
+						{threshold: '60'},
+						{grade_description: 'Third Class'}
+					],
+					[
+						{grade_code: 'CD'},
+						{threshold: '50'},
+						{grade_description: 'Average'}
+					],
+					[
+						{grade_code: 'DD'},
+						{threshold: '40'},
+						{grade_description: 'Pass'}
+					],
+					[
+						{grade_code: 'FF'},
+						{threshold: '0'},
+						{grade_description: 'Fail'}
+					],
+				]}
+			]);
+		},
+		() => {
+			return frappe.tests.make('Grading Scale', [
+				{grading_scale_name: 'GTU-2'},
+				{description: 'The score will be set according to 100 based system.'},
+				{intervals: [
+					[
+						{grade_code: 'AA'},
+						{threshold: '90'},
+						{grade_description: 'Distinction'}
+					],
+					[
+						{grade_code: 'FF'},
+						{threshold: '0'},
+						{grade_description: 'Fail'}
+					]
+				]}
+			]);
+		},
+
+		() => {
+			let grading_scale = ['GTU', 'GTU-2'];
+			let tasks = [];
+			grading_scale.forEach(index => {
+				tasks.push(
+					() => frappe.set_route('Form', 'Grading Scale', index),
+					() => frappe.timeout(0.5),
+					() => frappe.tests.click_button('Submit'),
+					() => frappe.timeout(0.5),
+					() => frappe.tests.click_button('Yes'),
+					() => {assert.equal(cur_frm.doc.docstatus, 1, 'Submitted successfully');}
+				);
+			});
+			return frappe.run_serially(tasks);
+		},
+
+		() => frappe.timeout(1),
+		() => frappe.set_route('Form', 'Grading Scale','GTU-2'),
+		() => frappe.timeout(0.5),
+		() => frappe.tests.click_button('Cancel'),
+		() => frappe.timeout(0.5),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(0.5),
+		() => {assert.equal(cur_frm.doc.docstatus, 2, 'Cancelled successfully');},
+
+		() => done()
+	]);
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/grading_scale/test_grading_scale.py b/erpnext/education/doctype/grading_scale/test_grading_scale.py
similarity index 100%
rename from erpnext/schools/doctype/grading_scale/test_grading_scale.py
rename to erpnext/education/doctype/grading_scale/test_grading_scale.py
diff --git a/erpnext/schools/doctype/grading_scale/test_records.json b/erpnext/education/doctype/grading_scale/test_records.json
similarity index 100%
rename from erpnext/schools/doctype/grading_scale/test_records.json
rename to erpnext/education/doctype/grading_scale/test_records.json
diff --git a/erpnext/schools/doctype/grading_scale_interval/__init__.py b/erpnext/education/doctype/grading_scale_interval/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/grading_scale_interval/__init__.py
rename to erpnext/education/doctype/grading_scale_interval/__init__.py
diff --git a/erpnext/education/doctype/grading_scale_interval/grading_scale_interval.json b/erpnext/education/doctype/grading_scale_interval/grading_scale_interval.json
new file mode 100644
index 0000000..5574e1d
--- /dev/null
+++ b/erpnext/education/doctype/grading_scale_interval/grading_scale_interval.json
@@ -0,0 +1,133 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-08-26 03:11:09.591049", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "grade_code", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Grade Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "threshold", 
+   "fieldtype": "Percent", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Threshold", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "1", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "grade_description", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Grade Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:08:48.083084", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Grading Scale Interval", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/grading_scale_interval/grading_scale_interval.py b/erpnext/education/doctype/grading_scale_interval/grading_scale_interval.py
similarity index 100%
rename from erpnext/schools/doctype/grading_scale_interval/grading_scale_interval.py
rename to erpnext/education/doctype/grading_scale_interval/grading_scale_interval.py
diff --git a/erpnext/schools/doctype/guardian/__init__.py b/erpnext/education/doctype/guardian/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/guardian/__init__.py
rename to erpnext/education/doctype/guardian/__init__.py
diff --git a/erpnext/schools/doctype/guardian/guardian.js b/erpnext/education/doctype/guardian/guardian.js
similarity index 100%
rename from erpnext/schools/doctype/guardian/guardian.js
rename to erpnext/education/doctype/guardian/guardian.js
diff --git a/erpnext/education/doctype/guardian/guardian.json b/erpnext/education/doctype/guardian/guardian.json
new file mode 100644
index 0000000..500b747
--- /dev/null
+++ b/erpnext/education/doctype/guardian/guardian.json
@@ -0,0 +1,517 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "GARD.####", 
+ "beta": 0, 
+ "creation": "2016-07-21 15:32:51.163292", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "guardian_name", 
+   "fieldtype": "Data", 
+   "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": "Guardian Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "email_address", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Email Address", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "mobile_number", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Mobile 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "alternate_number", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Alternate 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "date_of_birth", 
+   "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": "Date of Birth", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "education", 
+   "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": "Education", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "occupation", 
+   "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": "Occupation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "designation", 
+   "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": "Designation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "work_address", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Work Address", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_13", 
+   "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": "Guardian Of ", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "students", 
+   "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": "Students", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Guardian Student", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_8", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Guardian Interests", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "interests", 
+   "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": "Interests", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Guardian Interest", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_field": "image", 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:06:57.122193", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Guardian", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "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": "guardian_name", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/guardian/guardian.py b/erpnext/education/doctype/guardian/guardian.py
similarity index 100%
rename from erpnext/schools/doctype/guardian/guardian.py
rename to erpnext/education/doctype/guardian/guardian.py
diff --git a/erpnext/education/doctype/guardian/test_guardian.js b/erpnext/education/doctype/guardian/test_guardian.js
new file mode 100644
index 0000000..9bbfacd
--- /dev/null
+++ b/erpnext/education/doctype/guardian/test_guardian.js
@@ -0,0 +1,34 @@
+// Testing Student Module in education
+QUnit.module('education');
+
+QUnit.test('Test: Guardian', function(assert){
+	assert.expect(9);
+	let done = assert.async();
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make('Guardian', [
+				{guardian_name: 'Test Guardian'},
+				{email_address: 'guardian@testmail.com'},
+				{mobile_number: 9898980000},
+				{alternate_number: 8989890000},
+				{date_of_birth: '1982-07-22'},
+				{education: 'Testing'},
+				{occupation: 'Testing'},
+				{designation: 'Testing'},
+				{work_address: 'Testing address'}
+			]);
+		},
+		() => {
+			assert.ok(cur_frm.doc.guardian_name == 'Test Guardian');
+			assert.ok(cur_frm.doc.email_address == 'guardian@testmail.com');
+			assert.ok(cur_frm.doc.mobile_number == 9898980000);
+			assert.ok(cur_frm.doc.alternate_number == 8989890000);
+			assert.ok(cur_frm.doc.date_of_birth == '1982-07-22');
+			assert.ok(cur_frm.doc.education == 'Testing');
+			assert.ok(cur_frm.doc.occupation == 'Testing');
+			assert.ok(cur_frm.doc.designation == 'Testing');
+			assert.ok(cur_frm.doc.work_address == 'Testing address');
+		},
+		() => done()
+	]);
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/guardian/test_guardian.py b/erpnext/education/doctype/guardian/test_guardian.py
similarity index 100%
rename from erpnext/schools/doctype/guardian/test_guardian.py
rename to erpnext/education/doctype/guardian/test_guardian.py
diff --git a/erpnext/schools/doctype/guardian_interest/__init__.py b/erpnext/education/doctype/guardian_interest/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/guardian_interest/__init__.py
rename to erpnext/education/doctype/guardian_interest/__init__.py
diff --git a/erpnext/education/doctype/guardian_interest/guardian_interest.json b/erpnext/education/doctype/guardian_interest/guardian_interest.json
new file mode 100644
index 0000000..1995c55
--- /dev/null
+++ b/erpnext/education/doctype/guardian_interest/guardian_interest.json
@@ -0,0 +1,72 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-07-25 07:19:55.113871", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "interest", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Interest", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Interest", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:10:22.333454", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Guardian Interest", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/guardian_interest/guardian_interest.py b/erpnext/education/doctype/guardian_interest/guardian_interest.py
similarity index 100%
rename from erpnext/schools/doctype/guardian_interest/guardian_interest.py
rename to erpnext/education/doctype/guardian_interest/guardian_interest.py
diff --git a/erpnext/schools/doctype/guardian_student/__init__.py b/erpnext/education/doctype/guardian_student/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/guardian_student/__init__.py
rename to erpnext/education/doctype/guardian_student/__init__.py
diff --git a/erpnext/education/doctype/guardian_student/guardian_student.json b/erpnext/education/doctype/guardian_student/guardian_student.json
new file mode 100644
index 0000000..2519a54
--- /dev/null
+++ b/erpnext/education/doctype/guardian_student/guardian_student.json
@@ -0,0 +1,132 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-01-31 11:53:21.580099", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 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": 0, 
+   "in_list_view": 1, 
+   "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": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "student_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Student Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:10:15.786362", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Guardian Student", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/guardian_student/guardian_student.py b/erpnext/education/doctype/guardian_student/guardian_student.py
similarity index 100%
rename from erpnext/schools/doctype/guardian_student/guardian_student.py
rename to erpnext/education/doctype/guardian_student/guardian_student.py
diff --git a/erpnext/schools/doctype/instructor/__init__.py b/erpnext/education/doctype/instructor/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/instructor/__init__.py
rename to erpnext/education/doctype/instructor/__init__.py
diff --git a/erpnext/schools/doctype/instructor/instructor.js b/erpnext/education/doctype/instructor/instructor.js
similarity index 100%
rename from erpnext/schools/doctype/instructor/instructor.js
rename to erpnext/education/doctype/instructor/instructor.js
diff --git a/erpnext/education/doctype/instructor/instructor.json b/erpnext/education/doctype/instructor/instructor.json
new file mode 100644
index 0000000..865e07c
--- /dev/null
+++ b/erpnext/education/doctype/instructor/instructor.json
@@ -0,0 +1,249 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "naming_series:", 
+ "beta": 0, 
+ "creation": "2015-11-04 15:56:30.004034", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Other", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "instructor_name", 
+   "fieldtype": "Data", 
+   "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": "Instructor Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_5", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Naming Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "INS/", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Department", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_field": "image", 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2017-11-10 19:00:20.354954", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Instructor", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "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": "instructor_name", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/education/doctype/instructor/instructor.py b/erpnext/education/doctype/instructor/instructor.py
new file mode 100644
index 0000000..44a4e4c
--- /dev/null
+++ b/erpnext/education/doctype/instructor/instructor.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+from frappe.model.naming import make_autoname
+
+class Instructor(Document):
+	def autoname(self):
+		naming_method = frappe.db.get_value("Education Settings", None, "instructor_created_by")
+		if not naming_method:
+			frappe.throw(_("Please setup Instructor Naming System in Education > Education Settings"))
+		else:
+			if naming_method == 'Naming Series':
+				self.name = make_autoname(self.naming_series + '.####')
+			elif naming_method == 'Employee Number':
+				if not self.employee:
+					frappe.throw("Please select Employee")
+				self.name = self.employee
+			elif naming_method == 'Full Name':
+				self.name = self.instructor_name
diff --git a/erpnext/education/doctype/instructor/test_instructor.js b/erpnext/education/doctype/instructor/test_instructor.js
new file mode 100644
index 0000000..c584f45
--- /dev/null
+++ b/erpnext/education/doctype/instructor/test_instructor.js
@@ -0,0 +1,20 @@
+// Testing Setup Module in education
+QUnit.module('education');
+
+QUnit.test('Test: Instructor', function(assert){
+	assert.expect(2);
+	let done = assert.async();
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make("Instructor", [
+				{instructor_name: 'Instructor 1'},
+				{department: 'Test Department'}
+			]);
+		},
+		() => {
+			assert.ok(cur_frm.doc.instructor_name == 'Instructor 1');
+			assert.ok(cur_frm.doc.department = 'Test Department');
+		},
+		() => done()
+	]);
+});
diff --git a/erpnext/schools/doctype/instructor/test_instructor.py b/erpnext/education/doctype/instructor/test_instructor.py
similarity index 100%
rename from erpnext/schools/doctype/instructor/test_instructor.py
rename to erpnext/education/doctype/instructor/test_instructor.py
diff --git a/erpnext/schools/doctype/instructor/test_records.json b/erpnext/education/doctype/instructor/test_records.json
similarity index 100%
rename from erpnext/schools/doctype/instructor/test_records.json
rename to erpnext/education/doctype/instructor/test_records.json
diff --git a/erpnext/schools/doctype/program/__init__.py b/erpnext/education/doctype/program/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/program/__init__.py
rename to erpnext/education/doctype/program/__init__.py
diff --git a/erpnext/schools/doctype/program/program.js b/erpnext/education/doctype/program/program.js
similarity index 100%
rename from erpnext/schools/doctype/program/program.js
rename to erpnext/education/doctype/program/program.js
diff --git a/erpnext/education/doctype/program/program.json b/erpnext/education/doctype/program/program.json
new file mode 100644
index 0000000..05e35a2
--- /dev/null
+++ b/erpnext/education/doctype/program/program.json
@@ -0,0 +1,277 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:program_code", 
+ "beta": 0, 
+ "creation": "2015-09-07 12:54:03.609282", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "program_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Program Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Department", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "program_code", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Program Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "program_abbreviation", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Program Abbreviation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_5", 
+   "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": "Course", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "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 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, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2017-11-10 18:56:18.413911", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Program", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "search_fields": "program_name", 
+ "show_name_in_global_search": 1, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program/program.py b/erpnext/education/doctype/program/program.py
similarity index 100%
rename from erpnext/schools/doctype/program/program.py
rename to erpnext/education/doctype/program/program.py
diff --git a/erpnext/education/doctype/program/test_program.js b/erpnext/education/doctype/program/test_program.js
new file mode 100644
index 0000000..dc347cf
--- /dev/null
+++ b/erpnext/education/doctype/program/test_program.js
@@ -0,0 +1,34 @@
+// Testing Setup Module in education
+QUnit.module('education');
+
+QUnit.test('Test: Program', function(assert){
+	assert.expect(6);
+	let done = assert.async();
+	let fee_structure_code;
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make('Program', [
+				{program_name: 'Standard Test'},
+				{program_code: 'Standard Test'},
+				{department: 'Test Department'},
+				{program_abbreviation: 'Standard Test'},
+				{courses: [
+					[
+						{course: 'Test_Sub'},
+						{required: true}
+					]
+				]}
+			]);
+		},
+
+		() => {
+			assert.ok(cur_frm.doc.program_name == 'Standard Test');
+			assert.ok(cur_frm.doc.program_code == 'Standard Test');
+			assert.ok(cur_frm.doc.department == 'Test Department');
+			assert.ok(cur_frm.doc.program_abbreviation == 'Standard Test');
+			assert.ok(cur_frm.doc.courses[0].course == 'Test_Sub');
+			assert.ok(cur_frm.doc.courses[0].required == true);
+		},
+		() => done()
+	]);
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program/test_program.py b/erpnext/education/doctype/program/test_program.py
similarity index 100%
rename from erpnext/schools/doctype/program/test_program.py
rename to erpnext/education/doctype/program/test_program.py
diff --git a/erpnext/schools/doctype/program/test_records.json b/erpnext/education/doctype/program/test_records.json
similarity index 100%
rename from erpnext/schools/doctype/program/test_records.json
rename to erpnext/education/doctype/program/test_records.json
diff --git a/erpnext/schools/doctype/program_course/__init__.py b/erpnext/education/doctype/program_course/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/program_course/__init__.py
rename to erpnext/education/doctype/program_course/__init__.py
diff --git a/erpnext/education/doctype/program_course/program_course.json b/erpnext/education/doctype/program_course/program_course.json
new file mode 100644
index 0000000..c3d45d8
--- /dev/null
+++ b/erpnext/education/doctype/program_course/program_course.json
@@ -0,0 +1,164 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2015-09-07 14:37:01.886859", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "course", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Course", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Course", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "course_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Course Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "course.course_name", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "required", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Mandatory", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2017-11-10 19:10:10.231463", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Program Course", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program_course/program_course.py b/erpnext/education/doctype/program_course/program_course.py
similarity index 100%
rename from erpnext/schools/doctype/program_course/program_course.py
rename to erpnext/education/doctype/program_course/program_course.py
diff --git a/erpnext/schools/doctype/program_enrollment/__init__.py b/erpnext/education/doctype/program_enrollment/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/program_enrollment/__init__.py
rename to erpnext/education/doctype/program_enrollment/__init__.py
diff --git a/erpnext/education/doctype/program_enrollment/program_enrollment.js b/erpnext/education/doctype/program_enrollment/program_enrollment.js
new file mode 100644
index 0000000..d35f41a
--- /dev/null
+++ b/erpnext/education/doctype/program_enrollment/program_enrollment.js
@@ -0,0 +1,83 @@
+// Copyright (c) 2016, Frappe and contributors
+// For license information, please see license.txt
+
+
+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)
+				}
+			};
+		});
+
+		frm.fields_dict['fees'].grid.get_field('fee_structure').get_query = function(doc, cdt, cdn) {
+			var d = locals[cdt][cdn];
+			return {
+				filters: {'academic_term': d.academic_term}
+			}
+		};
+
+		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",
+					filters: {
+						'program': frm.doc.program
+					}
+				}
+			});
+		}
+
+		frm.set_query("student", function() {
+			return{
+				query: "erpnext.education.doctype.program_enrollment.program_enrollment.get_students",
+				filters: {
+					'academic_year': frm.doc.academic_year,
+					'academic_term': frm.doc.academic_term
+				}
+			}
+		});
+	},
+
+	program: function(frm) {
+		frm.events.get_courses(frm);
+		if (frm.doc.program) {
+			frappe.call({
+				method: "erpnext.education.api.get_fee_schedule",
+				args: {
+					"program": frm.doc.program,
+					"student_category": frm.doc.student_category
+				},
+				callback: function(r) {
+					if(r.message) {
+						frm.set_value("fees" ,r.message);
+						frm.events.get_courses(frm);
+					}
+				}
+			});
+		}
+	},
+
+	student_category: function() {
+		frappe.ui.form.trigger("Program Enrollment", "program");
+	},
+
+	get_courses: function(frm) {
+		frm.set_value("courses",[]);
+		frappe.call({
+			method: "get_courses",
+			doc:frm.doc,
+			callback: function(r) {
+				if(r.message) {
+					frm.set_value("courses", r.message);
+				}
+			}
+		})
+	}
+});
diff --git a/erpnext/education/doctype/program_enrollment/program_enrollment.json b/erpnext/education/doctype/program_enrollment/program_enrollment.json
new file mode 100644
index 0000000..9badf93
--- /dev/null
+++ b/erpnext/education/doctype/program_enrollment/program_enrollment.json
@@ -0,0 +1,712 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "PE.#####", 
+ "beta": 0, 
+ "creation": "2015-12-02 12:58:32.916080", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "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": "student.title", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0, 
+   "width": ""
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }
+ ], 
+ "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": "2017-11-16 13:20:28.650637", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Program Enrollment", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "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
+}
\ 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
new file mode 100644
index 0000000..79772b0
--- /dev/null
+++ b/erpnext/education/doctype/program_enrollment/program_enrollment.py
@@ -0,0 +1,112 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+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
+
+class ProgramEnrollment(Document):
+	def validate(self):
+		self.validate_duplication()
+		if not self.student_name:
+			self.student_name = frappe.db.get_value("Student", self.student, "title")
+		if not self.courses:
+			self.extend("courses", self.get_courses())
+	
+	def on_submit(self):
+		self.update_student_joining_date()
+		self.make_fee_records()
+	
+	def validate_duplication(self):
+		enrollment = frappe.db.sql("""select name from `tabProgram Enrollment` where student= %s and program= %s 
+			and academic_year= %s and docstatus<2 and name != %s""", (self.student, self.program, self.academic_year, self.name))
+		if enrollment:
+			frappe.throw(_("Student is already enrolled."))
+	
+	def update_student_joining_date(self):
+		date = frappe.db.sql("select min(enrollment_date) from `tabProgram Enrollment` where student= %s", self.student)
+		frappe.db.set_value("Student", self.student, "joining_date", date)
+		
+	def make_fee_records(self):
+		from erpnext.education.api import get_fee_components
+		fee_list = []
+		for d in self.fees:
+			fee_components = get_fee_components(d.fee_structure)
+			if fee_components:
+				fees = frappe.new_doc("Fees")
+				fees.update({
+					"student": self.student,
+					"academic_year": self.academic_year,
+					"academic_term": d.academic_term,
+					"fee_structure": d.fee_structure,
+					"program": self.program,
+					"due_date": d.due_date,
+					"student_name": self.student_name,
+					"program_enrollment": self.name,
+					"components": fee_components
+				})
+				
+				fees.save()
+				fees.submit()
+				fee_list.append(fees.name)
+		if fee_list:
+			fee_list = ["""<a href="#Form/Fees/%s" target="_blank">%s</a>""" % \
+				(fee, fee) for fee in fee_list]
+			msgprint(_("Fee Records Created - {0}").format(comma_and(fee_list)))
+
+	def get_courses(self):
+		return frappe.db.sql('''select course, course_name from `tabProgram Course` where parent = %s and required = 1''', (self.program), as_dict=1)
+
+
+@frappe.whitelist()
+def get_program_courses(doctype, txt, searchfield, start, page_len, filters):
+	if filters.get('program'):
+		return frappe.db.sql("""select course, course_name from `tabProgram Course`
+			where  parent = %(program)s and course like %(txt)s {match_cond}
+			order by
+				if(locate(%(_txt)s, course), locate(%(_txt)s, course), 99999),
+				idx desc,
+				`tabProgram Course`.course asc
+			limit {start}, {page_len}""".format(
+				match_cond=get_match_cond(doctype),
+				start=start,
+				page_len=page_len), {
+					"txt": "%{0}%".format(txt),
+					"_txt": txt.replace('%', ''),
+					"program": filters['program']
+				})
+
+
+@frappe.whitelist()
+def get_students(doctype, txt, searchfield, start, page_len, filters):
+	if not filters.get("academic_term"):
+		filters["academic_term"] = frappe.defaults.get_defaults().academic_term
+
+	if not filters.get("academic_year"):
+		filters["academic_year"] = frappe.defaults.get_defaults().academic_year
+
+	enrolled_students = frappe.get_list("Program Enrollment", filters={
+		"academic_term": filters.get('academic_term'),
+		"academic_year": filters.get('academic_year')
+	}, fields=["student"])
+
+	students = [d.student for d in enrolled_students] if enrolled_students else [""]
+
+	return frappe.db.sql("""select
+			name, title from tabStudent
+		where 
+			name not in (%s)
+		and 
+			`%s` LIKE %s
+		order by 
+			idx desc, name
+		limit %s, %s"""%(
+			", ".join(['%s']*len(students)), searchfield, "%s", "%s", "%s"),
+			tuple(students + ["%%%s%%" % txt, start, page_len]
+		)
+	)
+
diff --git a/erpnext/education/doctype/program_enrollment/test_program_enrollment.js b/erpnext/education/doctype/program_enrollment/test_program_enrollment.js
new file mode 100644
index 0000000..aea81a0
--- /dev/null
+++ b/erpnext/education/doctype/program_enrollment/test_program_enrollment.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Program Enrollment", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Program Enrollment
+		() => frappe.tests.make('Program Enrollment', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/schools/doctype/program_enrollment/test_program_enrollment.py b/erpnext/education/doctype/program_enrollment/test_program_enrollment.py
similarity index 100%
rename from erpnext/schools/doctype/program_enrollment/test_program_enrollment.py
rename to erpnext/education/doctype/program_enrollment/test_program_enrollment.py
diff --git a/erpnext/schools/doctype/program_enrollment_course/__init__.py b/erpnext/education/doctype/program_enrollment_course/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/program_enrollment_course/__init__.py
rename to erpnext/education/doctype/program_enrollment_course/__init__.py
diff --git a/erpnext/education/doctype/program_enrollment_course/program_enrollment_course.json b/erpnext/education/doctype/program_enrollment_course/program_enrollment_course.json
new file mode 100644
index 0000000..87d9db3
--- /dev/null
+++ b/erpnext/education/doctype/program_enrollment_course/program_enrollment_course.json
@@ -0,0 +1,104 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-04-10 19:28:19.616308", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "course", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Course", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Course", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "course_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Course Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "course.course_name", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:11:54.272255", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Program Enrollment Course", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program_enrollment_course/program_enrollment_course.py b/erpnext/education/doctype/program_enrollment_course/program_enrollment_course.py
similarity index 100%
rename from erpnext/schools/doctype/program_enrollment_course/program_enrollment_course.py
rename to erpnext/education/doctype/program_enrollment_course/program_enrollment_course.py
diff --git a/erpnext/schools/doctype/program_enrollment_fee/__init__.py b/erpnext/education/doctype/program_enrollment_fee/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/program_enrollment_fee/__init__.py
rename to erpnext/education/doctype/program_enrollment_fee/__init__.py
diff --git a/erpnext/education/doctype/program_enrollment_fee/program_enrollment_fee.json b/erpnext/education/doctype/program_enrollment_fee/program_enrollment_fee.json
new file mode 100644
index 0000000..0af2815
--- /dev/null
+++ b/erpnext/education/doctype/program_enrollment_fee/program_enrollment_fee.json
@@ -0,0 +1,192 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-05-19 05:52:56.322125", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "academic_term", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Academic Term", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Term", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "fee_structure", 
+   "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": "Fee Structure", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Fee Structure", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "due_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Due Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:11:07.516632", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Program Enrollment Fee", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program_enrollment_fee/program_enrollment_fee.py b/erpnext/education/doctype/program_enrollment_fee/program_enrollment_fee.py
similarity index 100%
rename from erpnext/schools/doctype/program_enrollment_fee/program_enrollment_fee.py
rename to erpnext/education/doctype/program_enrollment_fee/program_enrollment_fee.py
diff --git a/erpnext/schools/doctype/program_enrollment_tool/__init__.py b/erpnext/education/doctype/program_enrollment_tool/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/program_enrollment_tool/__init__.py
rename to erpnext/education/doctype/program_enrollment_tool/__init__.py
diff --git a/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.js b/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js
similarity index 100%
rename from erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.js
rename to erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js
diff --git a/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.json b/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.json
new file mode 100644
index 0000000..2745366
--- /dev/null
+++ b/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.json
@@ -0,0 +1,368 @@
+{
+ "allow_copy": 1, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-06-10 03:01:05.178956", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 0, 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "get_students_from", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Get Students From", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nStudent Applicants\nProgram Enrollments", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "program", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Program", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Program", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "academic_year", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Academic Year", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Year", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "get_students", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Get Students", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "students", 
+   "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": "Students", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Program Enrollment Tool 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": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_7", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.get_students_from==\"Program Enrollments\"", 
+   "fieldname": "new_program", 
+   "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": "New Program", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Program", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.get_students_from==\"Program Enrollments\"", 
+   "fieldname": "new_academic_year", 
+   "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": "New Academic Year", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Year", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "enroll_students", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Enroll Students", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 1, 
+ "hide_toolbar": 1, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 1, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:39:54.858394", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Program Enrollment Tool", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py b/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py
new file mode 100644
index 0000000..d989d9f
--- /dev/null
+++ b/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+from erpnext.education.api import enroll_student
+
+class ProgramEnrollmentTool(Document):
+	def get_students(self):
+		if not self.get_students_from:
+			frappe.throw(_("Mandatory field - Get Students From"))
+		elif not self.program:
+			frappe.throw(_("Mandatory field - Program"))
+		elif not self.academic_year:
+			frappe.throw(_("Mandatory field - Academic Year"))
+		else:
+			if self.get_students_from == "Student Applicants":
+				students = frappe.db.sql("select name as student_applicant, title as student_name from \
+					`tabStudent Applicant` where program = %s and academic_year = %s",(self.program, self.academic_year), as_dict=1)
+			else:
+				students = frappe.db.sql("select student, student_name, student_batch_name from \
+					`tabProgram Enrollment` where program = %s and academic_year = %s",(self.program, self.academic_year), as_dict=1)
+				student_list = [d.student for d in students]
+
+				inactive_students = frappe.db.sql('''
+					select name as student, title as student_name from `tabStudent` where name in (%s) and enabled = 0''' %
+					', '.join(['%s']*len(student_list)), tuple(student_list), as_dict=1)
+
+				for student in students:
+					if student.student in [d.student for d in inactive_students]:
+						students.remove(student)
+
+		if students:
+			return students
+		else:
+			frappe.throw(_("No students Found"))
+			
+	def enroll_students(self):
+		for stud in self.students:
+			if stud.student:
+				prog_enrollment = frappe.new_doc("Program Enrollment")
+				prog_enrollment.student = stud.student
+				prog_enrollment.student_name = stud.student_name
+				prog_enrollment.student_batch_name = stud.student_batch_name
+				prog_enrollment.program = self.new_program
+				prog_enrollment.academic_year = self.new_academic_year
+				prog_enrollment.save()
+			elif stud.student_applicant:
+				prog_enrollment = enroll_student(stud.student_applicant)
+				prog_enrollment.academic_year = self.academic_year
+				prog_enrollment.save()
+		frappe.msgprint("Students have been enrolled.")
+			
\ No newline at end of file
diff --git a/erpnext/education/doctype/program_enrollment_tool/test_program_enrollment_tool.js b/erpnext/education/doctype/program_enrollment_tool/test_program_enrollment_tool.js
new file mode 100644
index 0000000..8d55104
--- /dev/null
+++ b/erpnext/education/doctype/program_enrollment_tool/test_program_enrollment_tool.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Program Enrollment Tool", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Program Enrollment Tool
+		() => frappe.tests.make('Program Enrollment Tool', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/education/doctype/program_enrollment_tool/test_program_enrollment_tool.py b/erpnext/education/doctype/program_enrollment_tool/test_program_enrollment_tool.py
new file mode 100644
index 0000000..f22b3b1
--- /dev/null
+++ b/erpnext/education/doctype/program_enrollment_tool/test_program_enrollment_tool.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestProgramEnrollmentTool(unittest.TestCase):
+	pass
diff --git a/erpnext/schools/doctype/program_enrollment_tool_student/__init__.py b/erpnext/education/doctype/program_enrollment_tool_student/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/program_enrollment_tool_student/__init__.py
rename to erpnext/education/doctype/program_enrollment_tool_student/__init__.py
diff --git a/erpnext/education/doctype/program_enrollment_tool_student/program_enrollment_tool_student.json b/erpnext/education/doctype/program_enrollment_tool_student/program_enrollment_tool_student.json
new file mode 100644
index 0000000..0dbe1b8
--- /dev/null
+++ b/erpnext/education/doctype/program_enrollment_tool_student/program_enrollment_tool_student.json
@@ -0,0 +1,164 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-06-10 03:29:02.539914", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "student_applicant", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Student Applicant", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Applicant", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "student", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Student", 
+   "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": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "student_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Student Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:09:59.530615", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Program Enrollment Tool Student", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program_enrollment_tool_student/program_enrollment_tool_student.py b/erpnext/education/doctype/program_enrollment_tool_student/program_enrollment_tool_student.py
similarity index 100%
rename from erpnext/schools/doctype/program_enrollment_tool_student/program_enrollment_tool_student.py
rename to erpnext/education/doctype/program_enrollment_tool_student/program_enrollment_tool_student.py
diff --git a/erpnext/schools/doctype/program_fee/__init__.py b/erpnext/education/doctype/program_fee/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/program_fee/__init__.py
rename to erpnext/education/doctype/program_fee/__init__.py
diff --git a/erpnext/education/doctype/program_fee/program_fee.json b/erpnext/education/doctype/program_fee/program_fee.json
new file mode 100644
index 0000000..d45e4bd
--- /dev/null
+++ b/erpnext/education/doctype/program_fee/program_fee.json
@@ -0,0 +1,224 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-05-19 05:52:56.322125", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "academic_term", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Academic Term", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Term", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "fee_structure", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Fee Structure", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Fee Structure", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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": 1, 
+   "in_list_view": 1, 
+   "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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "due_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Due Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:07:10.426335", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Program Fee", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program_fee/program_fee.py b/erpnext/education/doctype/program_fee/program_fee.py
similarity index 100%
rename from erpnext/schools/doctype/program_fee/program_fee.py
rename to erpnext/education/doctype/program_fee/program_fee.py
diff --git a/erpnext/schools/doctype/room/__init__.py b/erpnext/education/doctype/room/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/room/__init__.py
rename to erpnext/education/doctype/room/__init__.py
diff --git a/erpnext/schools/doctype/room/room.js b/erpnext/education/doctype/room/room.js
similarity index 100%
rename from erpnext/schools/doctype/room/room.js
rename to erpnext/education/doctype/room/room.js
diff --git a/erpnext/education/doctype/room/room.json b/erpnext/education/doctype/room/room.json
new file mode 100644
index 0000000..6526766
--- /dev/null
+++ b/erpnext/education/doctype/room/room.json
@@ -0,0 +1,155 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "RM.####", 
+ "beta": 0, 
+ "creation": "2015-09-09 16:20:14.613061", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 0, 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "room_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Room Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "room_number", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Room 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "seating_capacity", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Seating Capacity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2017-11-10 19:04:32.237051", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Room", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "room_name", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/room/room.py b/erpnext/education/doctype/room/room.py
similarity index 100%
rename from erpnext/schools/doctype/room/room.py
rename to erpnext/education/doctype/room/room.py
diff --git a/erpnext/schools/doctype/room/test_records.json b/erpnext/education/doctype/room/test_records.json
similarity index 100%
rename from erpnext/schools/doctype/room/test_records.json
rename to erpnext/education/doctype/room/test_records.json
diff --git a/erpnext/education/doctype/room/test_room.js b/erpnext/education/doctype/room/test_room.js
new file mode 100644
index 0000000..fdcbe92
--- /dev/null
+++ b/erpnext/education/doctype/room/test_room.js
@@ -0,0 +1,22 @@
+// Testing Setup Module in Education
+QUnit.module('education');
+
+QUnit.test('Test: Room', function(assert){
+	assert.expect(3);
+	let done = assert.async();
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make('Room', [
+				{room_name: 'Room 1'},
+				{room_number: '1'},
+				{seating_capacity: '60'},
+			]);
+		},
+		() => {
+			assert.ok(cur_frm.doc.room_name == 'Room 1');
+			assert.ok(cur_frm.doc.room_number = '1');
+			assert.ok(cur_frm.doc.seating_capacity = '60');
+		},
+		() => done()
+	]);
+});
diff --git a/erpnext/schools/doctype/room/test_room.py b/erpnext/education/doctype/room/test_room.py
similarity index 100%
rename from erpnext/schools/doctype/room/test_room.py
rename to erpnext/education/doctype/room/test_room.py
diff --git a/erpnext/schools/doctype/school_house/__init__.py b/erpnext/education/doctype/school_house/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/school_house/__init__.py
rename to erpnext/education/doctype/school_house/__init__.py
diff --git a/erpnext/schools/doctype/school_house/school_house.js b/erpnext/education/doctype/school_house/school_house.js
similarity index 100%
rename from erpnext/schools/doctype/school_house/school_house.js
rename to erpnext/education/doctype/school_house/school_house.js
diff --git a/erpnext/education/doctype/school_house/school_house.json b/erpnext/education/doctype/school_house/school_house.json
new file mode 100644
index 0000000..8a653a9
--- /dev/null
+++ b/erpnext/education/doctype/school_house/school_house.json
@@ -0,0 +1,94 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:house_name", 
+ "beta": 0, 
+ "creation": "2017-03-27 15:19:54.672995", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "house_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "House Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:05:06.419022", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "School House", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/school_house/school_house.py b/erpnext/education/doctype/school_house/school_house.py
similarity index 100%
rename from erpnext/schools/doctype/school_house/school_house.py
rename to erpnext/education/doctype/school_house/school_house.py
diff --git a/erpnext/education/doctype/school_house/test_school_house.js b/erpnext/education/doctype/school_house/test_school_house.js
new file mode 100644
index 0000000..dde63ec
--- /dev/null
+++ b/erpnext/education/doctype/school_house/test_school_house.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: School House", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new School House
+		() => frappe.tests.make('School House', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/schools/doctype/school_house/test_school_house.py b/erpnext/education/doctype/school_house/test_school_house.py
similarity index 100%
rename from erpnext/schools/doctype/school_house/test_school_house.py
rename to erpnext/education/doctype/school_house/test_school_house.py
diff --git a/erpnext/schools/doctype/student/__init__.py b/erpnext/education/doctype/student/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/student/__init__.py
rename to erpnext/education/doctype/student/__init__.py
diff --git a/erpnext/schools/doctype/student/student.js b/erpnext/education/doctype/student/student.js
similarity index 100%
rename from erpnext/schools/doctype/student/student.js
rename to erpnext/education/doctype/student/student.js
diff --git a/erpnext/education/doctype/student/student.json b/erpnext/education/doctype/student/student.json
new file mode 100644
index 0000000..62c21d3
--- /dev/null
+++ b/erpnext/education/doctype/student/student.json
@@ -0,0 +1,1175 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "naming_series:", 
+ "beta": 0, 
+ "creation": "2015-09-07 13:00:55.938280", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_1", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "fieldname": "enabled", 
+   "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": "Enabled", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_3", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "first_name", 
+   "fieldtype": "Data", 
+   "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": "First Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "middle_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Middle Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "last_name", 
+   "fieldtype": "Data", 
+   "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": "Last Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Naming Series", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "STUD.", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "student_email_id", 
+   "fieldtype": "Data", 
+   "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 Email Address", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 1
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "student_mobile_number", 
+   "fieldtype": "Data", 
+   "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 Mobile Number", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Today", 
+   "fieldname": "joining_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Joining Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0, 
+   "width": "10"
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "collapsible_depends_on": "", 
+   "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": "Personal Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "date_of_birth", 
+   "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": "Date of Birth", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "blood_group", 
+   "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": "Blood Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nA+\nA-\nB+\nB-\nO+\nO-\nAB+\nAB-", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "gender", 
+   "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": "Gender", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nMale\nFemale\nOther", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "nationality", 
+   "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": "Nationality", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "student_applicant", 
+   "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 Applicant", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Applicant", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_22", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Home Address", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "address_line_1", 
+   "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": "Address Line 1", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "address_line_2", 
+   "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": "Address Line 2", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "pincode", 
+   "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": "Pincode", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_20", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "city", 
+   "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": "City", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "state", 
+   "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": "State", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_18", 
+   "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": "Guardian Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "guardians", 
+   "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": "Guardians", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "section_break_20", 
+   "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": "Sibling Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Country", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "siblings", 
+   "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": "Siblings", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Sibling", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "exit", 
+   "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": "Exit", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "date_of_leaving", 
+   "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": "Date of Leaving", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "leaving_certificate_number", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Leaving Certificate 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_31", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "reason_for_leaving", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Reason For Leaving", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "fieldname": "title", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Title", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_field": "image", 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2017-11-10 19:03:36.495785", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Student", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Instructor", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "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": "title", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student/student.py b/erpnext/education/doctype/student/student.py
similarity index 100%
rename from erpnext/schools/doctype/student/student.py
rename to erpnext/education/doctype/student/student.py
diff --git a/erpnext/schools/doctype/student/student_dashboard.py b/erpnext/education/doctype/student/student_dashboard.py
similarity index 100%
rename from erpnext/schools/doctype/student/student_dashboard.py
rename to erpnext/education/doctype/student/student_dashboard.py
diff --git a/erpnext/schools/doctype/student/student_list.js b/erpnext/education/doctype/student/student_list.js
similarity index 100%
rename from erpnext/schools/doctype/student/student_list.js
rename to erpnext/education/doctype/student/student_list.js
diff --git a/erpnext/schools/doctype/student/test_records.json b/erpnext/education/doctype/student/test_records.json
similarity index 100%
rename from erpnext/schools/doctype/student/test_records.json
rename to erpnext/education/doctype/student/test_records.json
diff --git a/erpnext/education/doctype/student/test_student.js b/erpnext/education/doctype/student/test_student.js
new file mode 100644
index 0000000..e18d39a
--- /dev/null
+++ b/erpnext/education/doctype/student/test_student.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Student", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Student
+		() => frappe.tests.make('Student', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/schools/doctype/student/test_student.py b/erpnext/education/doctype/student/test_student.py
similarity index 100%
rename from erpnext/schools/doctype/student/test_student.py
rename to erpnext/education/doctype/student/test_student.py
diff --git a/erpnext/schools/doctype/student_admission/__init__.py b/erpnext/education/doctype/student_admission/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/student_admission/__init__.py
rename to erpnext/education/doctype/student_admission/__init__.py
diff --git a/erpnext/schools/doctype/student_admission/student_admission.js b/erpnext/education/doctype/student_admission/student_admission.js
similarity index 100%
rename from erpnext/schools/doctype/student_admission/student_admission.js
rename to erpnext/education/doctype/student_admission/student_admission.js
diff --git a/erpnext/education/doctype/student_admission/student_admission.json b/erpnext/education/doctype/student_admission/student_admission.json
new file mode 100644
index 0000000..b3c10d4
--- /dev/null
+++ b/erpnext/education/doctype/student_admission/student_admission.json
@@ -0,0 +1,398 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 1, 
+ "allow_import": 0, 
+ "allow_rename": 1, 
+ "autoname": "", 
+ "beta": 0, 
+ "creation": "2016-09-13 03:05:27.154713", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "title", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Title", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "route", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Route", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 1
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "application_form_route", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Application Form Route", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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": 1, 
+   "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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "admission_start_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Admission Start Date", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "admission_end_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Admission End Date", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "published", 
+   "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": "Publish on website", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_5", 
+   "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": "Eligibility and Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "program_details", 
+   "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": "Eligibility and Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Admission Program", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "introduction", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Introduction", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 1, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_published_field": "published", 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 18:57:34.570376", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Student Admission", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "route": "admissions", 
+ "show_name_in_global_search": 1, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "title", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/education/doctype/student_admission/student_admission.py b/erpnext/education/doctype/student_admission/student_admission.py
new file mode 100644
index 0000000..2781c9c
--- /dev/null
+++ b/erpnext/education/doctype/student_admission/student_admission.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.utils import nowdate
+from frappe.website.website_generator import WebsiteGenerator
+
+
+class StudentAdmission(WebsiteGenerator):
+	def autoname(self):
+		if not self.title:
+			self.title = self.get_title()
+		self.name = self.title
+
+	def validate(self):
+		if not self.route:		#pylint: disable=E0203
+			self.route = "admissions/" + "-".join(self.title.split(" "))
+
+	def get_context(self, context):
+		context.no_cache = 1
+		context.show_sidebar = True
+		context.title = self.title
+		context.parents = [{'name': 'admissions', 'title': _('All Student Admissions'), 'route': 'admissions' }]
+
+	def get_title(self):
+		return _("Admissions for {0}").format(self.academic_year)
+
+
+def get_list_context(context=None):
+	context.update({
+		"show_sidebar": True,
+		"title": _("Student Admissions"),
+		"get_list": get_admission_list,
+		"row_template": "education/doctype/student_admission/templates/student_admission_row.html",
+	})
+
+def get_admission_list(doctype, txt, filters, limit_start, limit_page_length=20, order_by="modified"):
+	return frappe.db.sql('''select name, title, academic_year, modified, admission_start_date, route,
+		admission_end_date from `tabStudent Admission` where published=1 and admission_end_date >= %s
+		order by admission_end_date asc limit {0}, {1}
+		'''.format(limit_start, limit_page_length), [nowdate()], as_dict=1)
diff --git a/erpnext/schools/doctype/student_admission/templates/student_admission.html b/erpnext/education/doctype/student_admission/templates/student_admission.html
similarity index 100%
rename from erpnext/schools/doctype/student_admission/templates/student_admission.html
rename to erpnext/education/doctype/student_admission/templates/student_admission.html
diff --git a/erpnext/schools/doctype/student_admission/templates/student_admission_row.html b/erpnext/education/doctype/student_admission/templates/student_admission_row.html
similarity index 100%
rename from erpnext/schools/doctype/student_admission/templates/student_admission_row.html
rename to erpnext/education/doctype/student_admission/templates/student_admission_row.html
diff --git a/erpnext/education/doctype/student_admission/test_student_admission.js b/erpnext/education/doctype/student_admission/test_student_admission.js
new file mode 100644
index 0000000..ed794b2
--- /dev/null
+++ b/erpnext/education/doctype/student_admission/test_student_admission.js
@@ -0,0 +1,40 @@
+// Testing Admission Module in Education
+QUnit.module('education');
+
+QUnit.test('Test: Student Admission', function(assert) {
+	assert.expect(10);
+	let done = assert.async();
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make('Student Admission', [
+				{academic_year: '2016-17'},
+				{admission_start_date: '2016-04-20'},
+				{admission_end_date: '2016-05-31'},
+				{title: '2016-17 Admissions'},
+				{application_form_route: 'student-applicant'},
+				{introduction: 'Test intro'},
+				{program_details: [
+					[
+						{'program': 'Standard Test'},
+						{'application_fee': 1000},
+						{'applicant_naming_series': 'AP'},
+					]
+				]}
+			]);
+		},
+		() => cur_frm.save(),
+		() => {
+			assert.ok(cur_frm.doc.academic_year == '2016-17');
+			assert.ok(cur_frm.doc.admission_start_date == '2016-04-20');
+			assert.ok(cur_frm.doc.admission_end_date == '2016-05-31');
+			assert.ok(cur_frm.doc.title == '2016-17 Admissions');
+			assert.ok(cur_frm.doc.application_form_route == 'student-applicant');
+			assert.ok(cur_frm.doc.introduction == 'Test intro');
+			assert.ok(cur_frm.doc.program_details[0].program == 'Standard Test', 'Program correctly selected');
+			assert.ok(cur_frm.doc.program_details[0].application_fee == 1000);
+			assert.ok(cur_frm.doc.program_details[0].applicant_naming_series == 'AP');
+			assert.ok(cur_frm.doc.route == 'admissions/2016-17-Admissions', "Route successfully set");
+		},
+		() => done()
+	]);
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_admission/test_student_admission.py b/erpnext/education/doctype/student_admission/test_student_admission.py
similarity index 100%
rename from erpnext/schools/doctype/student_admission/test_student_admission.py
rename to erpnext/education/doctype/student_admission/test_student_admission.py
diff --git a/erpnext/schools/doctype/student_admission_program/__init__.py b/erpnext/education/doctype/student_admission_program/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/student_admission_program/__init__.py
rename to erpnext/education/doctype/student_admission_program/__init__.py
diff --git a/erpnext/education/doctype/student_admission_program/student_admission_program.json b/erpnext/education/doctype/student_admission_program/student_admission_program.json
new file mode 100644
index 0000000..46c5fab
--- /dev/null
+++ b/erpnext/education/doctype/student_admission_program/student_admission_program.json
@@ -0,0 +1,222 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "", 
+ "beta": 0, 
+ "creation": "2017-09-15 12:59:43.207923", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "program", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Program", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Program", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "minimum_age", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Minimum Age", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "maximum_age", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Maximum Age", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "application_fee", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Application Fee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "applicant_naming_series", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Naming Series (for Student Applicant)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 18:57:21.174604", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Student Admission Program", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_admission_program/student_admission_program.py b/erpnext/education/doctype/student_admission_program/student_admission_program.py
similarity index 100%
rename from erpnext/schools/doctype/student_admission_program/student_admission_program.py
rename to erpnext/education/doctype/student_admission_program/student_admission_program.py
diff --git a/erpnext/schools/doctype/student_applicant/__init__.py b/erpnext/education/doctype/student_applicant/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/student_applicant/__init__.py
rename to erpnext/education/doctype/student_applicant/__init__.py
diff --git a/erpnext/education/doctype/student_applicant/student_applicant.js b/erpnext/education/doctype/student_applicant/student_applicant.js
new file mode 100644
index 0000000..83621c5
--- /dev/null
+++ b/erpnext/education/doctype/student_applicant/student_applicant.js
@@ -0,0 +1,55 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on("Student Applicant", {
+	setup: function(frm) {
+		frm.add_fetch("guardian", "guardian_name", "guardian_name");
+	},
+
+	refresh: function(frm) {
+		if(frm.doc.application_status== "Applied" && frm.doc.docstatus== 1 ) {
+			frm.add_custom_button(__("Approve"), function() {
+				frm.set_value("application_status", "Approved");
+				frm.save_or_update();
+
+			}, 'Actions');
+
+			frm.add_custom_button(__("Reject"), function() {
+				frm.set_value("application_status", "Rejected");
+				frm.save_or_update();
+			}, 'Actions');
+		}
+
+		if(frm.doc.application_status== "Approved" && frm.doc.docstatus== 1 ) {
+			frm.add_custom_button(__("Enroll"), function() {
+				frm.events.enroll(frm)
+			}).addClass("btn-primary");
+			frm.add_custom_button(__("Reject"), function() {
+				frm.set_value("application_status", "Rejected");
+				frm.save_or_update();
+			}, 'Actions');
+		}
+
+		frappe.realtime.on("enroll_student_progress", function(data) {
+			if(data.progress) {
+				frappe.hide_msgprint(true);
+				frappe.show_progress(__("Enrolling student"), data.progress[0],data.progress[1]);
+			}
+		})
+	},
+
+	enroll: function(frm) {
+		frappe.model.open_mapped_doc({
+			method: "erpnext.education.api.enroll_student",
+			frm: frm
+		})
+	}
+});
+
+frappe.ui.form.on('Student Sibling', {
+	setup: function(frm) {
+		frm.add_fetch("student", "title", "full_name");
+		frm.add_fetch("student", "gender", "gender");
+		frm.add_fetch("student", "date_of_birth", "date_of_birth");
+	}
+});
\ No newline at end of file
diff --git a/erpnext/education/doctype/student_applicant/student_applicant.json b/erpnext/education/doctype/student_applicant/student_applicant.json
new file mode 100644
index 0000000..9c84234
--- /dev/null
+++ b/erpnext/education/doctype/student_applicant/student_applicant.json
@@ -0,0 +1,1099 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "naming_series:", 
+ "beta": 0, 
+ "creation": "2015-09-11 11:50:09.740807", 
+ "custom": 0, 
+ "default_print_format": "", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "first_name", 
+   "fieldtype": "Data", 
+   "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": "First Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "middle_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Middle Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "last_name", 
+   "fieldtype": "Data", 
+   "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": "Last Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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": 1, 
+   "in_global_search": 1, 
+   "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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "paid", 
+   "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": "Paid", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_8", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Naming Series", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "AP", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.docstatus != 0", 
+   "fieldname": "application_status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Application Status", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Applied\nApproved\nRejected\nAdmitted", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Today", 
+   "fieldname": "application_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": "Application Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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": 0, 
+   "in_standard_filter": 0, 
+   "label": "Academic Year", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Year", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "student_admission", 
+   "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 Admission", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Admission", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "collapsible_depends_on": "", 
+   "columns": 0, 
+   "fieldname": "section_break_4", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Personal Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "date_of_birth", 
+   "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": "Date of Birth", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "gender", 
+   "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": "Gender", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nMale\nFemale", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "blood_group", 
+   "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": "Blood Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nA+\nA-\nB+\nB-\nO+\nO-\nAB+\nAB-", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_12", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "student_email_id", 
+   "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": "Student Email Address", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 1
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "student_mobile_number", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Student Mobile 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "INDIAN", 
+   "fieldname": "nationality", 
+   "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": "Nationality", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "home_address", 
+   "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": "Home Address", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "address_line_1", 
+   "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": "Address Line 1", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "address_line_2", 
+   "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": "Address Line 2", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "pincode", 
+   "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": "Pincode", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_23", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "city", 
+   "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": "City", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "state", 
+   "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": "State", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "section_break_20", 
+   "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": "Guardian Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "guardians", 
+   "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": "Guardians", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "section_break_21", 
+   "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": "Sibling Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "siblings", 
+   "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": "Siblings", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Sibling", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_23", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "title", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Title", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Student Applicant", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "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": "2017-11-10 19:08:55.049625", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Student Applicant", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "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": "title", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_applicant/student_applicant.py b/erpnext/education/doctype/student_applicant/student_applicant.py
similarity index 100%
rename from erpnext/schools/doctype/student_applicant/student_applicant.py
rename to erpnext/education/doctype/student_applicant/student_applicant.py
diff --git a/erpnext/schools/doctype/student_applicant/student_applicant_list.js b/erpnext/education/doctype/student_applicant/student_applicant_list.js
similarity index 100%
rename from erpnext/schools/doctype/student_applicant/student_applicant_list.js
rename to erpnext/education/doctype/student_applicant/student_applicant_list.js
diff --git a/erpnext/schools/doctype/student_applicant/test_student_applicant.py b/erpnext/education/doctype/student_applicant/test_student_applicant.py
similarity index 100%
rename from erpnext/schools/doctype/student_applicant/test_student_applicant.py
rename to erpnext/education/doctype/student_applicant/test_student_applicant.py
diff --git a/erpnext/education/doctype/student_applicant/tests/test_student_applicant.js b/erpnext/education/doctype/student_applicant/tests/test_student_applicant.js
new file mode 100644
index 0000000..a69ad8a
--- /dev/null
+++ b/erpnext/education/doctype/student_applicant/tests/test_student_applicant.js
@@ -0,0 +1,95 @@
+// Testing Admission module in Education
+QUnit.module('education');
+
+QUnit.test('Test: Student Applicant', function(assert){
+	assert.expect(24);
+	let done = assert.async();
+	let guradian_auto_code;
+	let guardian_name;
+	frappe.run_serially([
+		() => frappe.set_route('List', 'Guardian'),
+		() => frappe.timeout(0.5),
+		() => {$(`a:contains("Test Guardian"):visible`)[0].click();},
+		() => frappe.timeout(1),
+		() => {
+			guardian_name = cur_frm.doc.guardian_name;
+			guradian_auto_code = frappe.get_route()[2];
+		},
+		// Testing data entry for Student Applicant
+		() => {
+			return frappe.tests.make('Student Applicant',[
+				{first_name: 'Fname'},
+				{middle_name: 'Mname'},
+				{last_name: 'Lname'},
+				{program: 'Standard Test'},
+				{student_admission: '2016-17 Admissions'},
+				{academic_year: '2016-17'},
+				{date_of_birth: '1995-07-20'},
+				{student_email_id: 'test@testmail.com'},
+				{gender: 'Male'},
+				{student_mobile_number: '9898980000'},
+				{blood_group: 'O+'},
+				{address_line_1: 'Test appt, Test Society,'},
+				{address_line_2: 'Test district, Test city.'},
+				{city: 'Test'},
+				{state: 'Test'},
+				{pincode: '400086'}
+			]);
+		},
+		// Entry in Guardian child table
+		() => $('a:contains("Guardian Details"):visible').click(),
+		() => $('.btn:contains("Add Row"):visible').click(),
+		() => {
+			cur_frm.get_field("guardians").grid.grid_rows[0].doc.guardian = guradian_auto_code;
+			cur_frm.get_field("guardians").grid.grid_rows[0].doc.relation = "Father";
+			cur_frm.get_field("guardians").grid.grid_rows[0].doc.guardian_name = guardian_name;
+			$('a:contains("Guardian Details"):visible').click();
+		},
+		// Entry in Sibling child table
+		() => $('a:contains("Sibling Details"):visible').click(),
+		() => $('.btn:contains("Add Row"):visible').click(),
+		() => {
+			cur_frm.get_field("siblings").grid.grid_rows[0].doc.full_name = "Test Name";
+			cur_frm.get_field("siblings").grid.grid_rows[0].doc.gender = "Male";
+			cur_frm.get_field("siblings").grid.grid_rows[0].doc.institution = "Test Institution";
+			cur_frm.get_field("siblings").grid.grid_rows[0].doc.program = "Test Program";
+			cur_frm.get_field("siblings").grid.grid_rows[0].doc.date_of_birth = "1995-07-20";
+			$('span.hidden-xs.octicon.octicon-triangle-up').click();
+			cur_frm.save();
+		},
+		() => {
+			assert.ok(cur_frm.doc.first_name == 'Fname');
+			assert.ok(cur_frm.doc.middle_name == 'Mname');
+			assert.ok(cur_frm.doc.last_name == 'Lname');
+			assert.ok(cur_frm.doc.program == 'Standard Test', 'Program selected correctly');
+			assert.ok(cur_frm.doc.student_admission == '2016-17 Admissions', 'Student Admission entry correctly selected');
+			assert.ok(cur_frm.doc.academic_year == '2016-17');
+			assert.ok(cur_frm.doc.date_of_birth == '1995-07-20');
+			assert.ok(cur_frm.doc.student_email_id == 'test@testmail.com');
+			assert.ok(cur_frm.doc.gender == 'Male');
+			assert.ok(cur_frm.doc.student_mobile_number == '9898980000');
+			assert.ok(cur_frm.doc.blood_group == 'O+');
+			assert.ok(cur_frm.doc.address_line_1 == 'Test appt, Test Society,');
+			assert.ok(cur_frm.doc.address_line_2 == 'Test district, Test city.');
+			assert.ok(cur_frm.doc.city == 'Test');
+			assert.ok(cur_frm.doc.state == 'Test');
+			assert.ok(cur_frm.doc.pincode == '400086');
+		},
+		() => frappe.timeout(1),
+		() => $('a:contains("Guardian Details"):visible').click(),
+		() => {
+			assert.ok(cur_frm.get_field("guardians").grid.grid_rows[0].doc.guardian == guradian_auto_code, 'Guardian correctly selected from dropdown');
+			assert.ok(cur_frm.get_field("guardians").grid.grid_rows[0].doc.relation == 'Father');
+			assert.ok(cur_frm.get_field("guardians").grid.grid_rows[0].doc.guardian_name == guardian_name, 'Guardian name was correctly retrieved');
+		},
+		() => $('a:contains("Sibling Details"):visible').click(),
+		() => {
+			assert.ok(cur_frm.get_field("siblings").grid.grid_rows[0].doc.full_name == 'Test Name');
+			assert.ok(cur_frm.get_field("siblings").grid.grid_rows[0].doc.gender == 'Male');
+			assert.ok(cur_frm.get_field("siblings").grid.grid_rows[0].doc.institution == 'Test Institution');
+			assert.ok(cur_frm.get_field("siblings").grid.grid_rows[0].doc.program == 'Test Program');
+			assert.ok(cur_frm.get_field("siblings").grid.grid_rows[0].doc.date_of_birth == '1995-07-20');
+		},
+		() => done()
+	]);
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_applicant/tests/test_student_applicant_dummy_data.js b/erpnext/education/doctype/student_applicant/tests/test_student_applicant_dummy_data.js
similarity index 100%
rename from erpnext/schools/doctype/student_applicant/tests/test_student_applicant_dummy_data.js
rename to erpnext/education/doctype/student_applicant/tests/test_student_applicant_dummy_data.js
diff --git a/erpnext/education/doctype/student_applicant/tests/test_student_applicant_options.js b/erpnext/education/doctype/student_applicant/tests/test_student_applicant_options.js
new file mode 100644
index 0000000..114358f
--- /dev/null
+++ b/erpnext/education/doctype/student_applicant/tests/test_student_applicant_options.js
@@ -0,0 +1,110 @@
+// Testing Admission module in Education
+QUnit.module('education');
+
+QUnit.test('test student applicant', function(assert){
+	assert.expect(11);
+	let done = assert.async();
+	let testing_status;
+	frappe.run_serially([
+		() => frappe.set_route('List', 'Student Applicant'),
+		() => frappe.timeout(0.5),
+		() => {$(`a:contains("Fname Mname Lname"):visible`)[0].click();},
+
+		// Checking different options
+		// 1. Moving forward with Submit
+		() => frappe.timeout(0.5),
+		() => frappe.tests.click_button('Submit'),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(0.5),
+		() => {
+			testing_status = $('span.indicator.orange').text();
+			assert.ok(testing_status.indexOf('Submit this document to confirm') == -1); // checking if submit has been successfull
+		},
+
+		// 2. Cancelling the Submit request
+		() => frappe.timeout(0.5),
+		() => frappe.tests.click_button('Cancel'),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(0.5),
+		() => {
+			testing_status = $('h1.editable-title').text();
+			assert.ok(testing_status.indexOf('Cancelled') != -1); // checking if cancel request has been successfull
+		},
+
+		// 3. Checking Amend option
+		() => frappe.timeout(0.5),
+		() => frappe.tests.click_button('Amend'),
+		() => cur_frm.doc.student_email_id = "test2@testmail.com", // updating email id since same id again is not allowed
+		() => cur_frm.save(),
+		() => frappe.timeout(0.5),
+		() => frappe.tests.click_button('Submit'),
+		() => frappe.tests.click_button('Yes'), // Submitting again after amend
+		() => {
+			testing_status = $('span.indicator.orange').text();
+			assert.ok(testing_status.indexOf('Submit this document to confirm') == -1); // checking if submit has been successfull after amend
+		},
+
+		// Checking different Application status option
+		() => {
+			testing_status = $('h1.editable-title').text();
+			assert.ok(testing_status.indexOf('Applied') != -1); // checking if Applied has been successfull
+		},
+		() => cur_frm.set_value('application_status', "Rejected"), // Rejected Status
+		() => frappe.tests.click_button('Update'),
+		() => {
+			testing_status = $('h1.editable-title').text();
+			assert.ok(testing_status.indexOf('Rejected') != -1); // checking if Rejected has been successfull
+		},
+		() => cur_frm.set_value('application_status', "Admitted"), // Admitted Status
+		() => frappe.tests.click_button('Update'),
+		() => {
+			testing_status = $('h1.editable-title').text();
+			assert.ok(testing_status.indexOf('Admitted') != -1); // checking if Admitted has been successfull
+		},
+		() => cur_frm.set_value('application_status', "Approved"), // Approved Status
+		() => frappe.tests.click_button('Update'),
+		() => {
+			testing_status = $('h1.editable-title').text();
+			assert.ok(testing_status.indexOf('Approved') != -1); // checking if Approved has been successfull
+		},
+
+		// Clicking on Enroll button should add the applicant's entry in Student doctype, and take you to Program Enrollment page
+		() => frappe.timeout(0.5),
+		() => frappe.tests.click_button('Enroll'),
+		() => frappe.timeout(0.5),
+		() => {
+			assert.ok(frappe.get_route()[0] == 'Form'); // Checking if the current page is Program Enrollment page or not
+			assert.ok(frappe.get_route()[1] == 'Program Enrollment');
+		},
+
+		// Routing to Student List to check if the Applicant's entry has been made or not
+		() => frappe.timeout(0.5),
+		() => frappe.set_route('List', 'Student'),
+		() => frappe.timeout(0.5),
+		() => {$(`a:contains("Fname Mname Lname"):visible`)[0].click();},
+		() => frappe.timeout(0.5),
+		() => {assert.ok(($(`h1.editable-title`).text()).indexOf('Enabled') != -1, 'Student entry successfully created');}, // Checking if the Student entry has been enabled
+		// Enrolling the Student into a Program
+		() => {$('.form-documents .row:nth-child(1) .col-xs-6:nth-child(1) .octicon-plus').click();},
+		() => frappe.timeout(1),
+		() => cur_frm.set_value('program', 'Standard Test'),
+		() => frappe.timeout(1),
+		() => {
+			cur_frm.set_value('student_category', 'Reservation');
+			cur_frm.set_value('student_batch_name', 'A');
+			cur_frm.set_value('academic_year', '2016-17');
+			cur_frm.set_value('academic_term', '2016-17 (Semester 1)');
+			cur_frm.set_value('school_house', 'Test_house');
+		},
+		() => cur_frm.save(),
+
+		// Submitting Program Enrollment form for our Test Student
+		() => frappe.timeout(1),
+		() => frappe.tests.click_button('Submit'),
+		() => frappe.tests.click_button('Yes'),
+		() => {
+			assert.ok(cur_frm.doc.docstatus == 1, "Program enrollment successfully submitted");
+		},
+		() => done()
+	]);
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_attendance/__init__.py b/erpnext/education/doctype/student_attendance/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/student_attendance/__init__.py
rename to erpnext/education/doctype/student_attendance/__init__.py
diff --git a/erpnext/schools/doctype/student_attendance/student_attendance.js b/erpnext/education/doctype/student_attendance/student_attendance.js
similarity index 100%
rename from erpnext/schools/doctype/student_attendance/student_attendance.js
rename to erpnext/education/doctype/student_attendance/student_attendance.js
diff --git a/erpnext/education/doctype/student_attendance/student_attendance.json b/erpnext/education/doctype/student_attendance/student_attendance.json
new file mode 100644
index 0000000..07530b4
--- /dev/null
+++ b/erpnext/education/doctype/student_attendance/student_attendance.json
@@ -0,0 +1,280 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "SA.######", 
+ "beta": 0, 
+ "creation": "2015-11-05 15:20:23.045996", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 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": 1, 
+   "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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "course_schedule", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Course Schedule", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Course Schedule", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "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": "Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "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": "student.title", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "student_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Student Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Present", 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Present\nAbsent", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:09:51.041960", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Student Attendance", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "student_name", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/education/doctype/student_attendance/student_attendance.py b/erpnext/education/doctype/student_attendance/student_attendance.py
new file mode 100644
index 0000000..06ac4fb
--- /dev/null
+++ b/erpnext/education/doctype/student_attendance/student_attendance.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe import _
+from frappe.utils import cstr
+from erpnext.education.api import get_student_group_students
+
+
+class StudentAttendance(Document):
+	def validate(self):
+		self.validate_date()
+		self.validate_mandatory()
+		self.validate_course_schedule()
+		self.validate_student()
+		self.validate_duplication()
+		
+	def validate_date(self):
+		if self.course_schedule:
+			self.date = frappe.db.get_value("Course Schedule", self.course_schedule, "schedule_date")
+	
+	def validate_mandatory(self):
+		if not (self.student_group or self.course_schedule):
+			frappe.throw(_("""Student Group or Course Schedule is mandatory"""))
+	
+	def validate_course_schedule(self):
+		if self.course_schedule:
+			self.student_group = frappe.db.get_value("Course Schedule", self.course_schedule, "student_group")
+	
+	def validate_student(self):
+		if self.course_schedule:
+			student_group = frappe.db.get_value("Course Schedule", self.course_schedule, "student_group")
+		else:
+			student_group = self.student_group
+		student_group_students = [d.student for d in get_student_group_students(student_group)]
+		if student_group and self.student not in student_group_students:
+			frappe.throw(_('''Student {0}: {1} does not belong to Student Group {2}'''.format(self.student, self.student_name, student_group)))
+
+	def validate_duplication(self):
+		"""Check if the Attendance Record is Unique"""
+		attendance_records=None
+		if self.course_schedule:
+			attendance_records= frappe.db.sql("""select name from `tabStudent Attendance` where \
+				student= %s and ifnull(course_schedule, '')= %s and name != %s""",
+				(self.student, cstr(self.course_schedule), self.name))
+		else:
+			attendance_records= frappe.db.sql("""select name from `tabStudent Attendance` where \
+				student= %s and student_group= %s and date= %s and name != %s and \
+				(course_schedule is Null or course_schedule='')""",
+				(self.student, self.student_group, self.date, self.name))
+			
+		if attendance_records:
+			frappe.throw(_("Attendance Record {0} exists against Student {1}")
+				.format(attendance_records[0][0], self.student))
diff --git a/erpnext/schools/doctype/student_attendance/student_attendance_list.js b/erpnext/education/doctype/student_attendance/student_attendance_list.js
similarity index 100%
rename from erpnext/schools/doctype/student_attendance/student_attendance_list.js
rename to erpnext/education/doctype/student_attendance/student_attendance_list.js
diff --git a/erpnext/education/doctype/student_attendance/test_student_attendance.js b/erpnext/education/doctype/student_attendance/test_student_attendance.js
new file mode 100644
index 0000000..c7da6f6
--- /dev/null
+++ b/erpnext/education/doctype/student_attendance/test_student_attendance.js
@@ -0,0 +1,31 @@
+// Testing Attendance Module in Education
+QUnit.module('education');
+
+QUnit.test('Test: Student Attendance', function(assert){
+	assert.expect(2);
+	let done = assert.async();
+	let student_code;
+
+	frappe.run_serially([
+		() => frappe.db.get_value('Student', {'student_email_id': 'test2@testmail.com'}, 'name'),
+		(student) => {student_code = student.message.name;}, // fetching student code from db
+
+		() => {
+			return frappe.tests.make('Student Attendance', [
+				{student: student_code},
+				{date: frappe.datetime.nowdate()},
+				{student_group: "test-batch-wise-group-2"},
+				{status: "Absent"}
+			]);
+		},
+
+		() => frappe.timeout(0.5),
+		() => {assert.equal(cur_frm.doc.status, "Absent", "Attendance correctly saved");},
+
+		() => frappe.timeout(0.5),
+		() => cur_frm.set_value("status", "Present"),
+		() => {assert.equal(cur_frm.doc.status, "Present", "Attendance correctly saved");},
+
+		() => done()
+	]);
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_attendance/test_student_attendance.py b/erpnext/education/doctype/student_attendance/test_student_attendance.py
similarity index 100%
rename from erpnext/schools/doctype/student_attendance/test_student_attendance.py
rename to erpnext/education/doctype/student_attendance/test_student_attendance.py
diff --git a/erpnext/schools/doctype/student_attendance_tool/__init__.py b/erpnext/education/doctype/student_attendance_tool/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/student_attendance_tool/__init__.py
rename to erpnext/education/doctype/student_attendance_tool/__init__.py
diff --git a/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js b/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js
new file mode 100644
index 0000000..df6d132
--- /dev/null
+++ b/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js
@@ -0,0 +1,182 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+frappe.provide("education");
+
+frappe.ui.form.on('Student Attendance Tool', {
+	onload: function(frm) {
+		frm.set_query("student_group", function() {
+			return {
+				"filters": {
+					"group_based_on": frm.doc.group_based_on
+				}
+			};
+		});
+	},
+
+	refresh: function(frm) {
+		if (frappe.route_options) {
+			frm.set_value("based_on", frappe.route_options.based_on);
+			frm.set_value("student_group", frappe.route_options.student_group);
+			frm.set_value("course_schedule", frappe.route_options.course_schedule);
+			frappe.route_options = null;
+		}
+		frm.disable_save();
+	},
+
+	based_on: function(frm) {
+		if (frm.doc.based_on == "Student Group") {
+			frm.set_value("course_schedule", "");
+		} else {
+			frm.set_value("student_group", "");
+		}
+	},
+
+	student_group: function(frm) {
+		if ((frm.doc.student_group && frm.doc.date) || frm.doc.course_schedule) {
+			var method = "erpnext.education.doctype.student_attendance_tool.student_attendance_tool.get_student_attendance_records";
+
+			frappe.call({
+				method: method,
+				args: {
+					based_on: frm.doc.based_on,
+					student_group: frm.doc.student_group,
+					date: frm.doc.date,
+					course_schedule: frm.doc.course_schedule
+				},
+				callback: function(r) {
+					frm.events.get_students(frm, r.message);
+				}
+			})
+		}
+	},
+
+	date: function(frm) {
+		frm.trigger("student_group");
+	},
+
+	course_schedule: function(frm) {
+		frm.trigger("student_group");
+	},
+
+	get_students: function(frm, students) {
+		if (!frm.students_area) {
+			frm.students_area = $('<div>')
+				.appendTo(frm.fields_dict.students_html.wrapper);
+		}
+		students = students || [];
+		frm.students_editor = new education.StudentsEditor(frm, frm.students_area, students);
+	}
+});
+
+
+education.StudentsEditor = Class.extend({
+	init: function(frm, wrapper, students) {
+		this.wrapper = wrapper;
+		this.frm = frm;
+		if(students.length > 0) {
+			this.make(frm, students);
+		} else {
+			this.show_empty_state();
+		}
+	},
+	make: function(frm, students) {
+		var me = this;
+
+		$(this.wrapper).empty();
+		var student_toolbar = $('<p>\
+			<button class="btn btn-default btn-add btn-xs" style="margin-right: 5px;"></button>\
+			<button class="btn btn-xs btn-default btn-remove" style="margin-right: 5px;"></button>\
+			<button class="btn btn-default btn-primary btn-mark-att btn-xs"></button></p>').appendTo($(this.wrapper));
+
+		student_toolbar.find(".btn-add")
+			.html(__('Check all'))
+			.on("click", function() {
+				$(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
+					if (!$(check).prop("disabled")) {
+						check.checked = true;
+					}
+				});
+			});
+
+		student_toolbar.find(".btn-remove")
+			.html(__('Uncheck all'))
+			.on("click", function() {
+				$(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
+					if (!$(check).prop("disabled")) {
+						check.checked = false;
+					}
+				});
+			});
+
+		student_toolbar.find(".btn-mark-att")
+			.html(__('Mark Attendance'))
+			.on("click", function() {
+				$(me.wrapper.find(".btn-mark-att")).attr("disabled", true);
+				var studs = [];
+				$(me.wrapper.find('input[type="checkbox"]')).each(function(i, check) {
+					var $check = $(check);
+					studs.push({
+						student: $check.data().student,
+						student_name: $check.data().studentName,
+						group_roll_number: $check.data().group_roll_number,
+						disabled: $check.prop("disabled"),
+						checked: $check.is(":checked")
+					});
+				});
+
+				var students_present = studs.filter(function(stud) {
+					return !stud.disabled && stud.checked;
+				});
+
+				var students_absent = studs.filter(function(stud) {
+					return !stud.disabled && !stud.checked;
+				});
+
+				frappe.confirm(__("Do you want to update attendance?<br>Present: {0}\
+					<br>Absent: {1}", [students_present.length, students_absent.length]),
+					function() {	//ifyes
+						if(!frappe.request.ajax_count) {
+							frappe.call({
+								method: "erpnext.education.api.mark_attendance",
+								freeze: true,
+								freeze_message: "Marking attendance",
+								args: {
+									"students_present": students_present,
+									"students_absent": students_absent,
+									"student_group": frm.doc.student_group,
+									"course_schedule": frm.doc.course_schedule,
+									"date": frm.doc.date
+								},
+								callback: function(r) {
+									$(me.wrapper.find(".btn-mark-att")).attr("disabled", false);
+									frm.trigger("student_group");
+								}
+							});
+						}
+					},
+					function() {	//ifno
+						$(me.wrapper.find(".btn-mark-att")).attr("disabled", false);
+					}
+				);
+			});
+
+		var htmls = students.map(function(student) {
+			return frappe.render_template("student_button", {
+				student: student.student,
+				student_name: student.student_name,
+				group_roll_number: student.group_roll_number,
+				status: student.status
+			})
+		});
+
+		$(htmls.join("")).appendTo(me.wrapper);
+	},
+
+	show_empty_state: function() {
+		$(this.wrapper).html(
+			`<div class="text-center text-muted" style="line-height: 100px;">
+				${__("No Students in")} ${this.frm.doc.student_group}
+			</div>`
+		);
+	}
+});
\ No newline at end of file
diff --git a/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.json b/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.json
new file mode 100644
index 0000000..26b28b3
--- /dev/null
+++ b/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.json
@@ -0,0 +1,333 @@
+{
+ "allow_copy": 1, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-11-16 17:12:46.437539", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "fieldname": "based_on", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Based On", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Group\nCourse Schedule", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Batch", 
+   "depends_on": "eval:doc.based_on == \"Student Group\"", 
+   "fieldname": "group_based_on", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Group Based On", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Batch\nCourse\nActivity", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.based_on ==\"Student Group\"", 
+   "fieldname": "student_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Student Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.based_on ==\"Course Schedule\"", 
+   "fieldname": "course_schedule", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Course Schedule", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Course Schedule", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.based_on ==\"Student Group\"", 
+   "fieldname": "date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval: (doc.course_schedule \n|| (doc.student_group && doc.date))", 
+   "fieldname": "attendance", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Attendance", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "students_html", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Students HTML", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 1, 
+ "hide_toolbar": 1, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 1, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 18:55:36.168044", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Student Attendance Tool", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Instructor", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.py b/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.py
similarity index 100%
rename from erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.py
rename to erpnext/education/doctype/student_attendance_tool/student_attendance_tool.py
diff --git a/erpnext/education/doctype/student_attendance_tool/test_student_attendance_tool.js b/erpnext/education/doctype/student_attendance_tool/test_student_attendance_tool.js
new file mode 100644
index 0000000..19b32a9
--- /dev/null
+++ b/erpnext/education/doctype/student_attendance_tool/test_student_attendance_tool.js
@@ -0,0 +1,85 @@
+// Testing Attendance Module in Education
+QUnit.module('education');
+
+QUnit.test('Test: Student Attendace Tool', function(assert){
+	assert.expect(10);
+	let done = assert.async();
+	let i, count = 0;
+
+	frappe.run_serially([
+		() => frappe.timeout(0.2),
+		() => frappe.set_route('Form', 'Student Attendance Tool'),
+		() => frappe.timeout(0.5),
+
+		() => {
+			if(cur_frm.doc.based_on == 'Student Group' || cur_frm.doc.based_on == 'Course Schedule'){
+				cur_frm.doc.based_on = 'Student Group';
+				assert.equal(1, 1, 'Attendance basis correctly set');
+				cur_frm.set_value("group_based_on", 'Batch');
+				cur_frm.set_value("student_group", "test-batch-wise-group");
+				cur_frm.set_value("date", frappe.datetime.nowdate());
+			}
+		},
+		() => frappe.timeout(0.5),
+		() => {
+			assert.equal($('input.students-check').size(), 5, "Student list based on batch correctly fetched");
+			assert.equal(frappe.datetime.nowdate(), cur_frm.doc.date, 'Current date correctly set');
+
+			cur_frm.set_value("student_group", "test-batch-wise-group-2");
+			assert.equal($('input.students-check').size(), 5, "Student list based on batch 2 correctly fetched");
+
+			cur_frm.set_value("group_based_on", 'Course');
+
+			cur_frm.set_value("student_group", "test-course-wise-group");
+			assert.equal($('input.students-check').size(), 5, "Student list based on course correctly fetched");
+
+			cur_frm.set_value("student_group", "test-course-wise-group-2");
+			assert.equal($('input.students-check').size(), 5, "Student list based on course 2 correctly fetched");
+		},
+
+		() => frappe.timeout(1),
+		() => frappe.tests.click_button('Check all'), // Marking all Student as checked
+		() => {
+			for(i = 0; i < $('input.students-check').size(); i++){
+				if($('input.students-check')[i].checked == true)
+					count++;
+			}
+
+			if(count == $('input.students-check').size())
+				assert.equal($('input.students-check').size(), count, "All students marked checked");
+		},
+
+		() => frappe.timeout(1),
+		() => frappe.tests.click_button('Uncheck all'), // Marking all Student as unchecked
+		() => {
+			count = 0;
+			for(i = 0; i < $('input.students-check').size(); i++){
+				if(!($('input.students-check')[i].checked))
+					count++;
+			}
+
+			if(count == $('input.students-check').size())
+				assert.equal($('input.students-check').size(), count, "All students marked checked");
+		},
+
+		() => frappe.timeout(1),
+		() => frappe.tests.click_button('Check all'),
+		() => frappe.tests.click_button('Mark Attendance'),
+		() => frappe.timeout(1),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(1),
+		() => {
+			assert.equal($('.msgprint').text(), "Attendance has been marked successfully.", "Attendance successfully marked");
+			frappe.tests.click_button('Close');
+		},
+
+		() => frappe.timeout(1),
+		() => frappe.set_route('List', 'Student Attendance/List'),
+		() => frappe.timeout(1),
+		() => {
+			assert.equal(($('div.list-item').size() - 1), count, "Attendance list created");
+		},
+
+		() => done()
+	]);
+});
\ No newline at end of file
diff --git a/erpnext/education/doctype/student_attendance_tool/test_student_attendance_tool.py b/erpnext/education/doctype/student_attendance_tool/test_student_attendance_tool.py
new file mode 100644
index 0000000..ffc42af
--- /dev/null
+++ b/erpnext/education/doctype/student_attendance_tool/test_student_attendance_tool.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestStudentAttendanceTool(unittest.TestCase):
+	pass
diff --git a/erpnext/schools/doctype/student_batch_name/__init__.py b/erpnext/education/doctype/student_batch_name/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/student_batch_name/__init__.py
rename to erpnext/education/doctype/student_batch_name/__init__.py
diff --git a/erpnext/schools/doctype/student_batch_name/student_batch_name.js b/erpnext/education/doctype/student_batch_name/student_batch_name.js
similarity index 100%
rename from erpnext/schools/doctype/student_batch_name/student_batch_name.js
rename to erpnext/education/doctype/student_batch_name/student_batch_name.js
diff --git a/erpnext/education/doctype/student_batch_name/student_batch_name.json b/erpnext/education/doctype/student_batch_name/student_batch_name.json
new file mode 100644
index 0000000..abb6436
--- /dev/null
+++ b/erpnext/education/doctype/student_batch_name/student_batch_name.json
@@ -0,0 +1,94 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:batch_name", 
+ "beta": 0, 
+ "creation": "2016-11-17 18:45:57.965091", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "batch_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Batch Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:08:17.980349", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Student Batch Name", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_batch_name/student_batch_name.py b/erpnext/education/doctype/student_batch_name/student_batch_name.py
similarity index 100%
rename from erpnext/schools/doctype/student_batch_name/student_batch_name.py
rename to erpnext/education/doctype/student_batch_name/student_batch_name.py
diff --git a/erpnext/schools/doctype/student_batch_name/test_records.json b/erpnext/education/doctype/student_batch_name/test_records.json
similarity index 100%
rename from erpnext/schools/doctype/student_batch_name/test_records.json
rename to erpnext/education/doctype/student_batch_name/test_records.json
diff --git a/erpnext/education/doctype/student_batch_name/test_student_batch_name.js b/erpnext/education/doctype/student_batch_name/test_student_batch_name.js
new file mode 100644
index 0000000..6c761b8
--- /dev/null
+++ b/erpnext/education/doctype/student_batch_name/test_student_batch_name.js
@@ -0,0 +1,19 @@
+// Testing Setup Module in Education
+QUnit.module('education');
+
+QUnit.test('Test: Student Batch Name', function(assert){
+	assert.expect(1);
+	let done = assert.async();
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make('Student Batch Name', [
+				{batch_name: 'A'}
+			]);
+		},
+		() => cur_frm.save(),
+		() => {
+			assert.ok(cur_frm.doc.batch_name=='A');
+		},
+		() => done()
+	]);
+});
diff --git a/erpnext/schools/doctype/student_batch_name/test_student_batch_name.py b/erpnext/education/doctype/student_batch_name/test_student_batch_name.py
similarity index 100%
rename from erpnext/schools/doctype/student_batch_name/test_student_batch_name.py
rename to erpnext/education/doctype/student_batch_name/test_student_batch_name.py
diff --git a/erpnext/schools/doctype/student_category/__init__.py b/erpnext/education/doctype/student_category/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/student_category/__init__.py
rename to erpnext/education/doctype/student_category/__init__.py
diff --git a/erpnext/schools/doctype/student_category/student_category.js b/erpnext/education/doctype/student_category/student_category.js
similarity index 100%
rename from erpnext/schools/doctype/student_category/student_category.js
rename to erpnext/education/doctype/student_category/student_category.js
diff --git a/erpnext/education/doctype/student_category/student_category.json b/erpnext/education/doctype/student_category/student_category.json
new file mode 100644
index 0000000..d7d4444
--- /dev/null
+++ b/erpnext/education/doctype/student_category/student_category.json
@@ -0,0 +1,93 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:category", 
+ "beta": 0, 
+ "creation": "2016-09-05 06:28:33.679415", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "category", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Category", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:09:45.783401", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Student Category", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_category/student_category.py b/erpnext/education/doctype/student_category/student_category.py
similarity index 100%
rename from erpnext/schools/doctype/student_category/student_category.py
rename to erpnext/education/doctype/student_category/student_category.py
diff --git a/erpnext/education/doctype/student_category/test_student_category.js b/erpnext/education/doctype/student_category/test_student_category.js
new file mode 100644
index 0000000..01f50e2
--- /dev/null
+++ b/erpnext/education/doctype/student_category/test_student_category.js
@@ -0,0 +1,19 @@
+// Testing Setup Module in Education
+QUnit.module('education');
+
+QUnit.test('Test: Student Category', function(assert){
+	assert.expect(1);
+	let done = assert.async();
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make('Student Category', [
+				{category: 'Reservation'}
+			]);
+		},
+		() => cur_frm.save(),
+		() => {
+			assert.ok(cur_frm.doc.name=='Reservation');
+		},
+		() => done()
+	]);
+});
diff --git a/erpnext/schools/doctype/student_category/test_student_category.py b/erpnext/education/doctype/student_category/test_student_category.py
similarity index 100%
rename from erpnext/schools/doctype/student_category/test_student_category.py
rename to erpnext/education/doctype/student_category/test_student_category.py
diff --git a/erpnext/schools/doctype/student_group/__init__.py b/erpnext/education/doctype/student_group/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/student_group/__init__.py
rename to erpnext/education/doctype/student_group/__init__.py
diff --git a/erpnext/education/doctype/student_group/student_group.js b/erpnext/education/doctype/student_group/student_group.js
new file mode 100644
index 0000000..f3f8c88
--- /dev/null
+++ b/erpnext/education/doctype/student_group/student_group.js
@@ -0,0 +1,119 @@
+cur_frm.add_fetch("student", "title", "student_name");
+
+frappe.ui.form.on("Student Group", {
+	onload: function(frm) {
+		frm.set_query("academic_term", function() {
+			return {
+				"filters": {
+					"academic_year": (frm.doc.academic_year)
+				}
+			};
+		});
+		if (!frm.__islocal) {
+			frm.set_query("student", "students", function() {
+				return{
+					query: "erpnext.education.doctype.student_group.student_group.fetch_students",
+					filters: {
+						'academic_year': frm.doc.academic_year,
+						'group_based_on': frm.doc.group_based_on,
+						'academic_term': frm.doc.academic_term,
+						'program': frm.doc.program,
+						'batch': frm.doc.batch,
+						'course': frm.doc.course,
+						'student_group': frm.doc.name
+					}
+				}
+			});
+		}
+	},
+
+	refresh: function(frm) {
+		if (!frm.doc.__islocal) {
+			frm.add_custom_button(__("Attendance"), function() {
+				frappe.route_options = {
+					based_on: "Student Group",
+					student_group: frm.doc.name
+				}
+				frappe.set_route("List", "Student Attendance Tool");
+			});
+			frm.add_custom_button(__("Course Schedule"), function() {
+				frappe.route_options = {
+					student_group: frm.doc.name
+				}
+				frappe.set_route("List", "Course Schedule");
+			});
+			frm.add_custom_button(__("Assessment Plan"), function() {
+				frappe.route_options = {
+					student_group: frm.doc.name
+				}
+				frappe.set_route("List", "Assessment Plan");
+			});
+			frm.add_custom_button(__("Update Email Group"), function() {
+				frappe.call({
+					method: "erpnext.education.api.update_email_group",
+					args: {
+						"doctype": "Student Group",
+						"name": frm.doc.name
+					}
+				});
+			});
+			frm.add_custom_button(__("Newsletter"), function() {
+				frappe.route_options = {
+					"Newsletter Email Group.email_group": frm.doc.name
+				}
+				frappe.set_route("List", "Newsletter");
+			});
+		}
+	},
+	
+	group_based_on: function(frm) {
+		if (frm.doc.group_based_on == "Batch") {
+			frm.doc.course = null;
+		}
+	},
+
+	get_students: function(frm) {
+		if (frm.doc.group_based_on == "Batch" || frm.doc.group_based_on == "Course") {
+			var student_list = [];
+			var max_roll_no = 0;
+			$.each(frm.doc.students, function(i,d) {
+				student_list.push(d.student);
+				if (d.group_roll_number>max_roll_no) {
+					max_roll_no = d.group_roll_number;
+				}
+			});
+			frappe.call({
+				method: "erpnext.education.doctype.student_group.student_group.get_students",
+				args: {
+					"academic_year": frm.doc.academic_year,
+					"academic_term": frm.doc.academic_term,
+					"group_based_on": frm.doc.group_based_on,
+					"program": frm.doc.program,
+					"batch" : frm.doc.batch,
+					"course": frm.doc.course	
+				},
+				callback: function(r) {
+					if(r.message) {
+						$.each(r.message, function(i, d) {
+							if(!in_list(student_list, d.student)) {
+								var s = frm.add_child("students");
+								s.student = d.student;
+								s.student_name = d.student_name;
+								if (d.active === 0) {
+									s.active = 0;
+								}
+								s.group_roll_number = ++max_roll_no;
+							}
+						});
+						refresh_field("students");
+						frm.save();
+					} else {
+						frappe.msgprint(__("Student Group is already updated."))
+					}
+				}
+			})	
+		} else {
+			frappe.msgprint(__("Select students manually for the Activity based Group"));
+		}
+	}
+});
\ No newline at end of file
diff --git a/erpnext/education/doctype/student_group/student_group.json b/erpnext/education/doctype/student_group/student_group.json
new file mode 100644
index 0000000..37a611b
--- /dev/null
+++ b/erpnext/education/doctype/student_group/student_group.json
@@ -0,0 +1,521 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:student_group_name", 
+ "beta": 0, 
+ "creation": "2015-09-07 12:55:52.072792", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 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": 0, 
+   "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": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "group_based_on", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Group Based on", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nBatch\nCourse\nActivity", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "student_group_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Student Group Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Set 0 for no limit", 
+   "fieldname": "max_strength", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Max Strength", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "academic_term", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "program", 
+   "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": "Program", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Program", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "batch", 
+   "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": "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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.group_based_on == 'Course'", 
+   "fieldname": "course", 
+   "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": 1, 
+   "label": "Course", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Course", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "collapsible_depends_on": "", 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "section_break_6", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Students", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "get_students", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Get Students", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "students", 
+   "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": "Students", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Group 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": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_12", 
+   "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": "Instructors", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "instructors", 
+   "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": "Instructors", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Group Instructor", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2017-11-10 19:09:37.370864", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Student Group", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Instructor", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "search_fields": "program, batch, course", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/education/doctype/student_group/student_group.py b/erpnext/education/doctype/student_group/student_group.py
new file mode 100644
index 0000000..d508589
--- /dev/null
+++ b/erpnext/education/doctype/student_group/student_group.py
@@ -0,0 +1,126 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe import _
+from erpnext.education.utils import validate_duplicate_student
+from frappe.utils import cint
+
+class StudentGroup(Document):
+	def validate(self):
+		self.validate_mandatory_fields()
+		self.validate_strength()
+		self.validate_students()
+		self.validate_and_set_child_table_fields()
+		validate_duplicate_student(self.students)
+
+	def validate_mandatory_fields(self):
+		if self.group_based_on == "Course" and not self.course:
+			frappe.throw(_("Please select Course"))
+		if self.group_based_on == "Course" and (not self.program and self.batch):
+			frappe.throw(_("Please select Program"))
+		if self.group_based_on == "Batch" and not self.program:
+			frappe.throw(_("Please select Program"))
+
+	def validate_strength(self):
+		if self.max_strength and len(self.students) > self.max_strength:
+			frappe.throw(_("""Cannot enroll more than {0} students for this student group.""").format(self.max_strength))
+
+	def validate_students(self):
+		program_enrollment = get_program_enrollment(self.academic_year, self.academic_term, self.program, self.batch, self.course)
+		students = [d.student for d in program_enrollment] if program_enrollment else []
+		for d in self.students:
+			if not frappe.db.get_value("Student", d.student, "enabled") and d.active:
+				frappe.throw(_("{0} - {1} is inactive student".format(d.group_roll_number, d.student_name)))
+
+			if (self.group_based_on == "Batch") and cint(frappe.defaults.get_defaults().validate_batch)\
+				and d.student not in students:
+				frappe.throw(_("{0} - {1} is not enrolled in the Batch {2}".format(d.group_roll_number, d.student_name, self.batch)))
+
+			if (self.group_based_on == "Course") and cint(frappe.defaults.get_defaults().validate_course)\
+				and (d.student not in students):
+				frappe.throw(_("{0} - {1} is not enrolled in the Course {2}".format(d.group_roll_number, d.student_name, self.course)))
+
+	def validate_and_set_child_table_fields(self):
+		roll_numbers = [d.group_roll_number for d in self.students if d.group_roll_number]
+		max_roll_no = max(roll_numbers) if roll_numbers else 0
+		roll_no_list = []
+		for d in self.students:
+			if not d.student_name:
+				d.student_name = frappe.db.get_value("Student", d.student, "title")
+			if not d.group_roll_number:
+				max_roll_no += 1
+				d.group_roll_number = max_roll_no
+			if d.group_roll_number in roll_no_list:
+				frappe.throw(_("Duplicate roll number for student {0}".format(d.student_name)))
+			else:
+				roll_no_list.append(d.group_roll_number)
+
+@frappe.whitelist()
+def get_students(academic_year, group_based_on, academic_term=None, program=None, batch=None, course=None):
+	enrolled_students = get_program_enrollment(academic_year, academic_term, program, batch, course)
+
+	if enrolled_students:
+		student_list = []
+		for s in enrolled_students:
+			if frappe.db.get_value("Student", s.student, "enabled"):
+				s.update({"active": 1})
+			else:
+				s.update({"active": 0})
+			student_list.append(s)
+		return student_list
+	else:
+		frappe.msgprint(_("No students found"))
+		return []
+
+def get_program_enrollment(academic_year, academic_term=None, program=None, batch=None, course=None):
+	
+	condition1 = " "
+	condition2 = " "
+	if academic_term:
+		condition1 += " and pe.academic_term = %(academic_term)s"
+	if program:
+		condition1 += " and pe.program = %(program)s"
+	if batch:
+		condition1 += " and pe.student_batch_name = %(batch)s"
+	if course:
+		condition1 += " and pe.name = pec.parent and pec.course = %(course)s"
+		condition2 = ", `tabProgram Enrollment Course` pec"
+
+	return frappe.db.sql('''
+		select 
+			pe.student, pe.student_name 
+		from 
+			`tabProgram Enrollment` pe {condition2}
+		where
+			pe.academic_year = %(academic_year)s  {condition1}
+		order by
+			pe.student_name asc
+		'''.format(condition1=condition1, condition2=condition2),
+		({"academic_year": academic_year, "academic_term":academic_term, "program": program, "batch": batch, "course": course}), as_dict=1)
+
+
+@frappe.whitelist()
+def fetch_students(doctype, txt, searchfield, start, page_len, filters):
+	if filters.get("group_based_on") != "Activity":
+		enrolled_students = get_program_enrollment(filters.get('academic_year'), filters.get('academic_term'),
+			filters.get('program'), filters.get('batch'))
+		student_group_student = frappe.db.sql_list('''select student from `tabStudent Group Student` where parent=%s''',
+			(filters.get('student_group')))
+		students = ([d.student for d in enrolled_students if d.student not in student_group_student]
+			if enrolled_students else [""]) or [""]
+		return frappe.db.sql("""select name, title from tabStudent
+			where name in ({0}) and (`{1}` LIKE %s or title LIKE %s)
+			order by idx desc, name
+			limit %s, %s""".format(", ".join(['%s']*len(students)), searchfield),
+			tuple(students + ["%%%s%%" % txt, "%%%s%%" % txt, start, page_len]))
+	else:
+		return frappe.db.sql("""select name, title from tabStudent
+			where `{0}` LIKE %s or title LIKE %s
+			order by idx desc, name
+			limit %s, %s""".format(searchfield),
+			tuple(["%%%s%%" % txt, "%%%s%%" % txt, start, page_len]))
+
diff --git a/erpnext/schools/doctype/student_group/test_records.json b/erpnext/education/doctype/student_group/test_records.json
similarity index 100%
rename from erpnext/schools/doctype/student_group/test_records.json
rename to erpnext/education/doctype/student_group/test_records.json
diff --git a/erpnext/education/doctype/student_group/test_student_group.js b/erpnext/education/doctype/student_group/test_student_group.js
new file mode 100644
index 0000000..6673343
--- /dev/null
+++ b/erpnext/education/doctype/student_group/test_student_group.js
@@ -0,0 +1,56 @@
+// Testing Student Module in Education
+QUnit.module('education');
+
+QUnit.test('Test: Student Group', function(assert){
+	assert.expect(2);
+	let done = assert.async();
+	let group_based_on = ["test-batch-wise-group", "test-course-wise-group"];
+	let tasks = [];
+
+	frappe.run_serially([
+		// Creating a Batch and Course based group
+		() => {
+			return frappe.tests.make('Student Group', [
+				{academic_year: '2016-17'},
+				{academic_term: '2016-17 (Semester 1)'},
+				{program: "Standard Test"},
+				{group_based_on: 'Batch'},
+				{student_group_name: group_based_on[0]},
+				{max_strength: 10},
+				{batch: 'A'}
+			]);
+		},
+		() => {
+			return frappe.tests.make('Student Group', [
+				{academic_year: '2016-17'},
+				{academic_term: '2016-17 (Semester 1)'},
+				{program: "Standard Test"},
+				{group_based_on: 'Course'},
+				{student_group_name: group_based_on[1]},
+				{max_strength: 10},
+				{batch: 'A'},
+				{course: 'Test_Sub'},
+			]);
+		},
+
+		// Populating the created group with Students
+		() => {
+			tasks = [];
+			group_based_on.forEach(index => {
+				tasks.push(
+					() => frappe.timeout(0.5),
+					() => frappe.set_route("Form", ('Student Group/' + index)),
+					() => frappe.timeout(0.5),
+					() => frappe.tests.click_button('Get Students'),
+					() => frappe.timeout(1),
+					() => {
+						assert.equal(cur_frm.doc.students.length, 5, 'Successfully fetched list of students');
+					},
+				);
+			});
+			return frappe.run_serially(tasks);
+		},
+
+		() => done()
+	]);
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_group/test_student_group.py b/erpnext/education/doctype/student_group/test_student_group.py
similarity index 100%
rename from erpnext/schools/doctype/student_group/test_student_group.py
rename to erpnext/education/doctype/student_group/test_student_group.py
diff --git a/erpnext/schools/doctype/student_group_creation_tool/__init__.py b/erpnext/education/doctype/student_group_creation_tool/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/student_group_creation_tool/__init__.py
rename to erpnext/education/doctype/student_group_creation_tool/__init__.py
diff --git a/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js b/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js
similarity index 100%
rename from erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js
rename to erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js
diff --git a/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.json b/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.json
new file mode 100644
index 0000000..d759b91
--- /dev/null
+++ b/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.json
@@ -0,0 +1,309 @@
+{
+ "allow_copy": 1, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-01-04 14:45:36.576933", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "academic_year", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Academic Year", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Year", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Leave blank if you make students groups per year", 
+   "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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "get_courses", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Get 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "", 
+   "fieldname": "program", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Program", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Program", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Leave unchecked if you don't want to consider batch while making course based groups. ", 
+   "fieldname": "separate_groups", 
+   "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": "Separate course based Group for every Batch", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_4", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "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": "Student Group Creation Tool 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": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 1, 
+ "hide_toolbar": 1, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 1, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:40:07.862203", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Student Group Creation Tool", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py b/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py
new file mode 100644
index 0000000..643093e
--- /dev/null
+++ b/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py
@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+from erpnext.education.doctype.student_group.student_group import get_students
+
+class StudentGroupCreationTool(Document):
+	def get_courses(self):
+		group_list = []
+
+		batches = frappe.db.sql('''select name as batch from `tabStudent Batch Name`''', as_dict=1)
+		for batch in batches:
+			group_list.append({"group_based_on":"Batch", "batch":batch.batch})
+
+		courses = frappe.db.sql('''select course, course_name from `tabProgram Course` where parent=%s''',
+			(self.program), as_dict=1)
+		if self.separate_groups:
+			from itertools import product
+			course_list = product(courses,batches)
+			for course in course_list:
+				temp_dict = {}
+				temp_dict.update({"group_based_on":"Course"})
+				temp_dict.update(course[0])
+				temp_dict.update(course[1])
+				group_list.append(temp_dict)
+		else:
+			for course in courses:
+				course.update({"group_based_on":"Course"})
+				group_list.append(course)
+
+		for group in group_list:
+			if group.get("group_based_on") == "Batch":
+				student_group_name = self.program + "/" + group.get("batch") + "/" + (self.academic_term if self.academic_term else self.academic_year)
+				group.update({"student_group_name": student_group_name})
+			elif group.get("group_based_on") == "Course":
+				student_group_name = group.get("course") + "/" + self.program + ("/" + group.get("batch") if group.get("batch") else "") + "/" + (self.academic_term if self.academic_term else self.academic_year)
+				group.update({"student_group_name": student_group_name})
+
+		return group_list
+
+	def create_student_groups(self):
+		if not self.courses:
+			frappe.throw(_("""No Student Groups created."""))
+
+		l = len(self.courses)
+		for d in self.courses:
+			if not d.student_group_name:
+				frappe.throw(_("""Student Group Name is mandatory in row {0}""".format(d.idx)))
+
+			if d.group_based_on == "Course" and not d.course:
+				frappe.throw(_("""Course is mandatory in row {0}""".format(d.idx)))
+
+			if d.group_based_on == "Batch" and not d.batch:
+				frappe.throw(_("""Batch is mandatory in row {0}""".format(d.idx)))
+
+			frappe.publish_realtime('student_group_creation_progress', {"progress": [d.idx, l]}, user=frappe.session.user)
+
+			student_group = frappe.new_doc("Student Group")
+			student_group.student_group_name = d.student_group_name
+			student_group.group_based_on = d.group_based_on
+			student_group.program = self.program
+			student_group.course = d.course
+			student_group.batch = d.batch
+			student_group.max_strength = d.max_strength
+			student_group.academic_term = self.academic_term
+			student_group.academic_year = self.academic_year
+			student_list = get_students(self.academic_year, d.group_based_on, self.academic_term, self.program, d.batch, d.course)
+
+			for student in student_list:
+				student_group.append('students', student)
+			student_group.save()
+
+		frappe.msgprint(_("{0} Student Groups created.".format(l)))
\ No newline at end of file
diff --git a/erpnext/education/doctype/student_group_creation_tool/test_student_group_creation_tool.js b/erpnext/education/doctype/student_group_creation_tool/test_student_group_creation_tool.js
new file mode 100644
index 0000000..34c1093
--- /dev/null
+++ b/erpnext/education/doctype/student_group_creation_tool/test_student_group_creation_tool.js
@@ -0,0 +1,84 @@
+QUnit.module('education');
+
+QUnit.test('Test: Student Group Creation Tool', function(assert){
+	assert.expect(5);
+	let done = assert.async();
+	let instructor_code;
+
+	frappe.run_serially([
+		// Saving Instructor code beforehand
+		() => frappe.db.get_value('Instructor', {'instructor_name': 'Instructor 1'}, 'name'),
+		(instructor) => {instructor_code = instructor.message.name;},
+
+		// Setting up the creation tool to generate and save Student Group
+		() => frappe.set_route('Form', 'Student Group Creation Tool'),
+		() => frappe.timeout(0.5),
+		() => {
+			cur_frm.set_value("academic_year", "2016-17");
+			cur_frm.set_value("academic_term", "2016-17 (Semester 1)");
+			cur_frm.set_value("program", "Standard Test");
+			frappe.tests.click_button('Get Courses');
+		},
+		() => frappe.timeout(1),
+		() => {
+			let no_of_courses = $('input.grid-row-check.pull-left').size() - 1;
+			assert.equal(cur_frm.doc.courses.length, no_of_courses, 'Successfully created groups using the tool');
+		},
+
+		() => {
+			let d, grid, grid_row;
+
+			for(d = 0; d < cur_frm.doc.courses.length; d++)
+			{
+				grid = cur_frm.get_field("courses").grid;
+				grid_row = grid.get_row(d).toggle_view(true);
+				if(grid_row.doc.student_group_name == 'Standard Test/A/2016-17 (Semester 1)'){
+					grid_row.doc.max_strength = 10;
+					grid_row.doc.student_group_name = "test-batch-wise-group-2";
+					$(`.octicon.octicon-triangle-up`).click();
+					continue;
+				}
+				else if(grid_row.doc.student_group_name == 'Test_Sub/Standard Test/2016-17 (Semester 1)'){
+					grid_row.doc.max_strength = 10;
+					grid_row.doc.student_group_name = "test-course-wise-group-2";
+					$(`.octicon.octicon-triangle-up`).click();
+					continue;
+				}
+			}
+		},
+
+		// Generating Student Group
+		() => frappe.timeout(0.5),
+		() => frappe.tests.click_button("Create Student Groups"),
+		() => frappe.timeout(0.5),
+		() => frappe.tests.click_button("Close"),
+
+		// Goin to the generated group to set up student and instructor list
+		() => {
+			let group_name = ['Student Group/test-batch-wise-group-2', 'Student Group/test-course-wise-group-2'];
+			let tasks = [];
+			group_name.forEach(index => {
+				tasks.push(
+					() => frappe.timeout(1),
+					() => frappe.set_route("Form", index),
+					() => frappe.timeout(0.5),
+					() => {
+						assert.equal(cur_frm.doc.students.length, 5, 'Successfully fetched list of students');
+					},
+					() => frappe.timeout(0.5),
+					() => {
+						d = cur_frm.add_child('instructors');
+						d.instructor = instructor_code;
+						cur_frm.save();
+					},
+					() => {
+						assert.equal(cur_frm.doc.instructors.length, 1, 'Instructor detail stored successfully');
+					},
+				);
+			});
+			return frappe.run_serially(tasks);
+		},
+
+		() => done()
+	]);
+});
\ No newline at end of file
diff --git a/erpnext/education/doctype/student_group_creation_tool/test_student_group_creation_tool.py b/erpnext/education/doctype/student_group_creation_tool/test_student_group_creation_tool.py
new file mode 100644
index 0000000..9ca5658
--- /dev/null
+++ b/erpnext/education/doctype/student_group_creation_tool/test_student_group_creation_tool.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestStudentGroupCreationTool(unittest.TestCase):
+	pass
diff --git a/erpnext/schools/doctype/student_group_creation_tool_course/__init__.py b/erpnext/education/doctype/student_group_creation_tool_course/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/student_group_creation_tool_course/__init__.py
rename to erpnext/education/doctype/student_group_creation_tool_course/__init__.py
diff --git a/erpnext/education/doctype/student_group_creation_tool_course/student_group_creation_tool_course.json b/erpnext/education/doctype/student_group_creation_tool_course/student_group_creation_tool_course.json
new file mode 100644
index 0000000..a749929
--- /dev/null
+++ b/erpnext/education/doctype/student_group_creation_tool_course/student_group_creation_tool_course.json
@@ -0,0 +1,254 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-01-04 15:03:57.940079", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "group_based_on", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Group Based On", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nBatch\nCourse", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "course", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Course", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Course", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "batch", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "student_group_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Student Group Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "course_code", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Course Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "course.course_name", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "max_strength", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Max Strength", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:08:27.657591", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Student Group Creation Tool Course", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_group_creation_tool_course/student_group_creation_tool_course.py b/erpnext/education/doctype/student_group_creation_tool_course/student_group_creation_tool_course.py
similarity index 100%
rename from erpnext/schools/doctype/student_group_creation_tool_course/student_group_creation_tool_course.py
rename to erpnext/education/doctype/student_group_creation_tool_course/student_group_creation_tool_course.py
diff --git a/erpnext/schools/doctype/student_group_instructor/__init__.py b/erpnext/education/doctype/student_group_instructor/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/student_group_instructor/__init__.py
rename to erpnext/education/doctype/student_group_instructor/__init__.py
diff --git a/erpnext/education/doctype/student_group_instructor/student_group_instructor.json b/erpnext/education/doctype/student_group_instructor/student_group_instructor.json
new file mode 100644
index 0000000..c09d7d3
--- /dev/null
+++ b/erpnext/education/doctype/student_group_instructor/student_group_instructor.json
@@ -0,0 +1,132 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-04-17 16:06:01.406768", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "instructor", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Instructor", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Instructor", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "instructor_name", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Instructor Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "instructor.instructor_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, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:11:31.439735", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Student Group Instructor", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_group_instructor/student_group_instructor.py b/erpnext/education/doctype/student_group_instructor/student_group_instructor.py
similarity index 100%
rename from erpnext/schools/doctype/student_group_instructor/student_group_instructor.py
rename to erpnext/education/doctype/student_group_instructor/student_group_instructor.py
diff --git a/erpnext/schools/doctype/student_group_student/__init__.py b/erpnext/education/doctype/student_group_student/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/student_group_student/__init__.py
rename to erpnext/education/doctype/student_group_student/__init__.py
diff --git a/erpnext/education/doctype/student_group_student/student_group_student.json b/erpnext/education/doctype/student_group_student/student_group_student.json
new file mode 100644
index 0000000..3ff339f
--- /dev/null
+++ b/erpnext/education/doctype/student_group_student/student_group_student.json
@@ -0,0 +1,191 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2015-09-11 15:14:58.501830", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_bulk_edit": 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": 0, 
+   "in_list_view": 1, 
+   "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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "student_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Student Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "group_roll_number", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Group Roll 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "fieldname": "active", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Active", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:11:39.735521", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Student Group Student", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_group_student/student_group_student.py b/erpnext/education/doctype/student_group_student/student_group_student.py
similarity index 100%
rename from erpnext/schools/doctype/student_group_student/student_group_student.py
rename to erpnext/education/doctype/student_group_student/student_group_student.py
diff --git a/erpnext/schools/doctype/student_guardian/__init__.py b/erpnext/education/doctype/student_guardian/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/student_guardian/__init__.py
rename to erpnext/education/doctype/student_guardian/__init__.py
diff --git a/erpnext/education/doctype/student_guardian/student_guardian.json b/erpnext/education/doctype/student_guardian/student_guardian.json
new file mode 100644
index 0000000..b4844fd
--- /dev/null
+++ b/erpnext/education/doctype/student_guardian/student_guardian.json
@@ -0,0 +1,132 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-09-01 14:28:39.174471", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "guardian", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Guardian", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "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": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "guardian_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Guardian Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "relation", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Relation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nMother\nFather\nOthers", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:10:57.680471", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Student Guardian", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_guardian/student_guardian.py b/erpnext/education/doctype/student_guardian/student_guardian.py
similarity index 100%
rename from erpnext/schools/doctype/student_guardian/student_guardian.py
rename to erpnext/education/doctype/student_guardian/student_guardian.py
diff --git a/erpnext/schools/doctype/student_language/__init__.py b/erpnext/education/doctype/student_language/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/student_language/__init__.py
rename to erpnext/education/doctype/student_language/__init__.py
diff --git a/erpnext/schools/doctype/student_language/student_language.js b/erpnext/education/doctype/student_language/student_language.js
similarity index 100%
rename from erpnext/schools/doctype/student_language/student_language.js
rename to erpnext/education/doctype/student_language/student_language.js
diff --git a/erpnext/education/doctype/student_language/student_language.json b/erpnext/education/doctype/student_language/student_language.json
new file mode 100644
index 0000000..43e6dbd
--- /dev/null
+++ b/erpnext/education/doctype/student_language/student_language.json
@@ -0,0 +1,94 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:language_name", 
+ "beta": 0, 
+ "creation": "2017-02-21 01:55:00.366273", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "language_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Language Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:05:37.035846", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Student Language", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_language/student_language.py b/erpnext/education/doctype/student_language/student_language.py
similarity index 100%
rename from erpnext/schools/doctype/student_language/student_language.py
rename to erpnext/education/doctype/student_language/student_language.py
diff --git a/erpnext/education/doctype/student_language/test_student_language.js b/erpnext/education/doctype/student_language/test_student_language.js
new file mode 100644
index 0000000..9b25569
--- /dev/null
+++ b/erpnext/education/doctype/student_language/test_student_language.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Student Language", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Student Language
+		() => frappe.tests.make('Student Language', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/schools/doctype/student_language/test_student_language.py b/erpnext/education/doctype/student_language/test_student_language.py
similarity index 100%
rename from erpnext/schools/doctype/student_language/test_student_language.py
rename to erpnext/education/doctype/student_language/test_student_language.py
diff --git a/erpnext/schools/doctype/student_leave_application/__init__.py b/erpnext/education/doctype/student_leave_application/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/student_leave_application/__init__.py
rename to erpnext/education/doctype/student_leave_application/__init__.py
diff --git a/erpnext/schools/doctype/student_leave_application/student_leave_application.js b/erpnext/education/doctype/student_leave_application/student_leave_application.js
similarity index 100%
rename from erpnext/schools/doctype/student_leave_application/student_leave_application.js
rename to erpnext/education/doctype/student_leave_application/student_leave_application.js
diff --git a/erpnext/education/doctype/student_leave_application/student_leave_application.json b/erpnext/education/doctype/student_leave_application/student_leave_application.json
new file mode 100644
index 0000000..93ff1ad
--- /dev/null
+++ b/erpnext/education/doctype/student_leave_application/student_leave_application.json
@@ -0,0 +1,357 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "SLA.######", 
+ "beta": 0, 
+ "creation": "2016-11-28 15:38:54.793854", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "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": "student.title", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "from_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "From Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "to_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "To Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Will show the student as Present in Student Monthly Attendance Report", 
+   "fieldname": "mark_as_present", 
+   "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": "Mark as Present", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "reason", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Reason", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Student Leave Application", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:09:31.848381", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Student Leave Application", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Instructor", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "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
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_leave_application/student_leave_application.py b/erpnext/education/doctype/student_leave_application/student_leave_application.py
similarity index 100%
rename from erpnext/schools/doctype/student_leave_application/student_leave_application.py
rename to erpnext/education/doctype/student_leave_application/student_leave_application.py
diff --git a/erpnext/education/doctype/student_leave_application/test_student_leave_application.js b/erpnext/education/doctype/student_leave_application/test_student_leave_application.js
new file mode 100644
index 0000000..5af9f5d
--- /dev/null
+++ b/erpnext/education/doctype/student_leave_application/test_student_leave_application.js
@@ -0,0 +1,69 @@
+// Testing Attendance Module in Education
+QUnit.module('education');
+
+QUnit.test('Test: Student Leave Application', function(assert){
+	assert.expect(4);
+	let done = assert.async();
+	let student_code;
+	let leave_code;
+	frappe.run_serially([
+		() => frappe.db.get_value('Student', {'student_email_id': 'test2@testmail.com'}, 'name'),
+		(student) => {student_code = student.message.name;}, // fetching student code from db
+
+		() => {
+			return frappe.tests.make('Student Leave Application', [
+				{student: student_code},
+				{from_date: '2017-08-02'},
+				{to_date: '2017-08-04'},
+				{mark_as_present: 0},
+				{reason: "Sick Leave."}
+			]);
+		},
+		() => frappe.tests.click_button('Submit'), // Submitting the leave application
+		() => frappe.timeout(0.7),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(0.7),
+		() => {
+			assert.equal(cur_frm.doc.docstatus, 1, "Submitted leave application");
+			leave_code = frappe.get_route()[2];
+		},
+		() => frappe.tests.click_button('Cancel'), // Cancelling the leave application
+		() => frappe.timeout(0.7),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(1),
+		() => {assert.equal(cur_frm.doc.docstatus, 2, "Cancelled leave application");},
+		() => frappe.tests.click_button('Amend'), // Amending the leave application
+		() => frappe.timeout(1),
+		() => {
+			cur_frm.doc.mark_as_present = 1;
+			cur_frm.save();
+		},
+		() => frappe.timeout(0.7),
+		() => frappe.tests.click_button('Submit'),
+		() => frappe.timeout(0.7),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(0.7),
+		() => {assert.equal(cur_frm.doc.amended_from, leave_code, "Amended successfully");},
+
+		() => frappe.timeout(0.5),
+		() => {
+			return frappe.tests.make('Student Leave Application', [
+				{student: student_code},
+				{from_date: '2017-08-07'},
+				{to_date: '2017-08-09'},
+				{mark_as_present: 0},
+				{reason: "Sick Leave."}
+			]);
+		},
+		() => frappe.tests.click_button('Submit'),
+		() => frappe.timeout(0.7),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(0.7),
+		() => {
+			assert.equal(cur_frm.doc.docstatus, 1, "Submitted leave application");
+			leave_code = frappe.get_route()[2];
+		},
+
+		() => done()
+	]);
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_leave_application/test_student_leave_application.py b/erpnext/education/doctype/student_leave_application/test_student_leave_application.py
similarity index 100%
rename from erpnext/schools/doctype/student_leave_application/test_student_leave_application.py
rename to erpnext/education/doctype/student_leave_application/test_student_leave_application.py
diff --git a/erpnext/schools/doctype/student_log/__init__.py b/erpnext/education/doctype/student_log/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/student_log/__init__.py
rename to erpnext/education/doctype/student_log/__init__.py
diff --git a/erpnext/schools/doctype/student_log/student_log.js b/erpnext/education/doctype/student_log/student_log.js
similarity index 100%
rename from erpnext/schools/doctype/student_log/student_log.js
rename to erpnext/education/doctype/student_log/student_log.js
diff --git a/erpnext/education/doctype/student_log/student_log.json b/erpnext/education/doctype/student_log/student_log.json
new file mode 100644
index 0000000..9d55bb9
--- /dev/null
+++ b/erpnext/education/doctype/student_log/student_log.json
@@ -0,0 +1,400 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "SLog.####", 
+ "beta": 0, 
+ "creation": "2016-07-29 03:27:22.451772", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 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": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "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": "student.title", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "General\nAcademic\nMedical\nAchievement", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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": 0, 
+   "in_standard_filter": 0, 
+   "label": "Academic Year", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Year", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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": 0, 
+   "in_standard_filter": 0, 
+   "label": "Program", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Program", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "student_batch", 
+   "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 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "log", 
+   "fieldtype": "Text Editor", 
+   "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": "Log", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:04:50.483773", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Student Log", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Education", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "student_name", 
+ "track_changes": 0, 
+ "track_seen": 1
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_log/student_log.py b/erpnext/education/doctype/student_log/student_log.py
similarity index 100%
rename from erpnext/schools/doctype/student_log/student_log.py
rename to erpnext/education/doctype/student_log/student_log.py
diff --git a/erpnext/education/doctype/student_log/test_student_log.js b/erpnext/education/doctype/student_log/test_student_log.js
new file mode 100644
index 0000000..5775369
--- /dev/null
+++ b/erpnext/education/doctype/student_log/test_student_log.js
@@ -0,0 +1,35 @@
+// Testing Student Module in Education
+QUnit.module('education');
+
+QUnit.test('Test: Student Log', function(assert){
+	assert.expect(9);
+	let done = assert.async();
+	let student_code;
+	frappe.run_serially([
+		() => frappe.db.get_value('Student', {'student_email_id': 'test2@testmail.com'}, 'name'),
+		(student) => {student_code = student.message.name;},
+		() => {
+			return frappe.tests.make("Student Log", [
+				{student: student_code},
+				{academic_year: '2016-17'},
+				{academic_term: '2016-17 (Semester 1)'},
+				{program: "Standard Test"},
+				{date: '2017-07-31'},
+				{student_batch: 'A'},
+				{log: 'This is Test log.'}
+			]);
+		},
+		() => {
+			assert.equal(cur_frm.doc.student, student_code, 'Student code was fetched properly');
+			assert.equal(cur_frm.doc.student_name, 'Fname Mname Lname', 'Student name was correctly auto-fetched');
+			assert.equal(cur_frm.doc.type, 'General', 'Default type selected');
+			assert.equal(cur_frm.doc.academic_year, '2016-17');
+			assert.equal(cur_frm.doc.academic_term, '2016-17 (Semester 1)');
+			assert.equal(cur_frm.doc.program, 'Standard Test', 'Program correctly selected');
+			assert.equal(cur_frm.doc.student_batch, 'A');
+			assert.equal(cur_frm.doc.date, '2017-07-31');
+			assert.equal(cur_frm.doc.log, 'This is Test log.');
+		},
+		() => done()
+	]);
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_log/test_student_log.py b/erpnext/education/doctype/student_log/test_student_log.py
similarity index 100%
rename from erpnext/schools/doctype/student_log/test_student_log.py
rename to erpnext/education/doctype/student_log/test_student_log.py
diff --git a/erpnext/schools/doctype/student_sibling/__init__.py b/erpnext/education/doctype/student_sibling/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/student_sibling/__init__.py
rename to erpnext/education/doctype/student_sibling/__init__.py
diff --git a/erpnext/education/doctype/student_sibling/student_sibling.json b/erpnext/education/doctype/student_sibling/student_sibling.json
new file mode 100644
index 0000000..22b7182
--- /dev/null
+++ b/erpnext/education/doctype/student_sibling/student_sibling.json
@@ -0,0 +1,287 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-09-01 14:41:23.824083", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 0, 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "studying_in_same_institute", 
+   "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": "Studying in Same Institute", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "NO\nYES", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 3, 
+   "fieldname": "full_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Full Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 1, 
+   "fieldname": "gender", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Gender", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nMale\nFemale", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "", 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.studying_in_same_institute == \"YES\"", 
+   "fieldname": "student", 
+   "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 ID", 
+   "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": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "depends_on": "eval:doc.studying_in_same_institute == \"NO\"", 
+   "fieldname": "institution", 
+   "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": "Institution", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "program", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Program", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "date_of_birth", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Date of Birth", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:05:24.999063", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Student Sibling", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_sibling/student_sibling.py b/erpnext/education/doctype/student_sibling/student_sibling.py
similarity index 100%
rename from erpnext/schools/doctype/student_sibling/student_sibling.py
rename to erpnext/education/doctype/student_sibling/student_sibling.py
diff --git a/erpnext/schools/doctype/student_siblings/__init__.py b/erpnext/education/doctype/student_siblings/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/student_siblings/__init__.py
rename to erpnext/education/doctype/student_siblings/__init__.py
diff --git a/erpnext/education/doctype/student_siblings/student_siblings.json b/erpnext/education/doctype/student_siblings/student_siblings.json
new file mode 100644
index 0000000..0fdc2fd
--- /dev/null
+++ b/erpnext/education/doctype/student_siblings/student_siblings.json
@@ -0,0 +1,132 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-09-01 14:41:23.824083", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "name1", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "gender", 
+   "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": "Gender", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nMale\nFemale", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "date_of_birth", 
+   "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": "Date of Birth", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-10 19:05:46.408887", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Student Siblings", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_siblings/student_siblings.py b/erpnext/education/doctype/student_siblings/student_siblings.py
similarity index 100%
rename from erpnext/schools/doctype/student_siblings/student_siblings.py
rename to erpnext/education/doctype/student_siblings/student_siblings.py
diff --git a/erpnext/schools/report/__init__.py b/erpnext/education/report/__init__.py
similarity index 100%
copy from erpnext/schools/report/__init__.py
copy to erpnext/education/report/__init__.py
diff --git a/erpnext/schools/report/absent_student_report/__init__.py b/erpnext/education/report/absent_student_report/__init__.py
similarity index 100%
rename from erpnext/schools/report/absent_student_report/__init__.py
rename to erpnext/education/report/absent_student_report/__init__.py
diff --git a/erpnext/schools/report/absent_student_report/absent_student_report.js b/erpnext/education/report/absent_student_report/absent_student_report.js
similarity index 100%
rename from erpnext/schools/report/absent_student_report/absent_student_report.js
rename to erpnext/education/report/absent_student_report/absent_student_report.js
diff --git a/erpnext/education/report/absent_student_report/absent_student_report.json b/erpnext/education/report/absent_student_report/absent_student_report.json
new file mode 100644
index 0000000..0d5eeba
--- /dev/null
+++ b/erpnext/education/report/absent_student_report/absent_student_report.json
@@ -0,0 +1,23 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2013-05-13 14:04:03", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 3, 
+ "is_standard": "Yes", 
+ "modified": "2017-11-10 19:42:36.457449", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Absent Student Report", 
+ "owner": "Administrator", 
+ "ref_doctype": "Student Attendance", 
+ "report_name": "Absent Student Report", 
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Academics User"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/schools/report/absent_student_report/absent_student_report.py b/erpnext/education/report/absent_student_report/absent_student_report.py
similarity index 100%
rename from erpnext/schools/report/absent_student_report/absent_student_report.py
rename to erpnext/education/report/absent_student_report/absent_student_report.py
diff --git a/erpnext/docs/assets/img/schools/__init__.py b/erpnext/education/report/assessment_plan_status/__init__.py
similarity index 100%
copy from erpnext/docs/assets/img/schools/__init__.py
copy to erpnext/education/report/assessment_plan_status/__init__.py
diff --git a/erpnext/education/report/assessment_plan_status/assessment_plan_status.js b/erpnext/education/report/assessment_plan_status/assessment_plan_status.js
new file mode 100644
index 0000000..2d1eb09
--- /dev/null
+++ b/erpnext/education/report/assessment_plan_status/assessment_plan_status.js
@@ -0,0 +1,28 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["Assessment Plan Status"] = {
+	"filters": [
+		{
+			"fieldname":"assessment_group",
+			"label": __("Assessment Group"),
+			"fieldtype": "Link",
+			"options": "Assessment Group",
+			"get_query": function() {
+				return{
+					filters: {
+						'is_group': 0
+					}
+				};
+			}
+		},
+		{
+			"fieldname":"schedule_date",
+			"label": __("Scheduled Upto"),
+			"fieldtype": "Date",
+			"options": ""
+		}
+
+	]
+}
diff --git a/erpnext/education/report/assessment_plan_status/assessment_plan_status.json b/erpnext/education/report/assessment_plan_status/assessment_plan_status.json
new file mode 100644
index 0000000..3000bec
--- /dev/null
+++ b/erpnext/education/report/assessment_plan_status/assessment_plan_status.json
@@ -0,0 +1,23 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2017-11-09 15:07:30.404428", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "modified": "2017-11-28 18:35:44.903665", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Assessment Plan Status", 
+ "owner": "Administrator", 
+ "ref_doctype": "Assessment Plan", 
+ "report_name": "Assessment Plan Status", 
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Academics User"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/education/report/assessment_plan_status/assessment_plan_status.py b/erpnext/education/report/assessment_plan_status/assessment_plan_status.py
new file mode 100644
index 0000000..21184a6
--- /dev/null
+++ b/erpnext/education/report/assessment_plan_status/assessment_plan_status.py
@@ -0,0 +1,179 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from itertools import groupby
+from frappe.utils import cint
+
+DOCSTATUS = {
+	0: "saved",
+	1: "submitted",
+}
+
+def execute(filters=None):
+	columns, data = [], []
+
+	args = frappe._dict()
+	args["assessment_group"] = filters.get("assessment_group")
+	args["schedule_date"] = filters.get("schedule_date")
+
+	columns = get_column()
+
+	data, chart = get_assessment_data(args)
+
+	return columns, data, None, chart
+
+
+def get_assessment_data(args=None):
+
+	# [total, saved, submitted, remaining]
+	chart_data = [0, 0, 0, 0]
+
+	condition = ''
+	if args["assessment_group"]:
+		condition += "and assessment_group = %(assessment_group)s"
+	if args["schedule_date"]:
+		condition += "and schedule_date <= %(schedule_date)s"
+
+	assessment_plan = frappe.db.sql('''
+			SELECT
+				ap.name as assessment_plan,
+				ap.assessment_name,
+				ap.student_group,
+				ap.schedule_date,
+				(select count(*) from `tabStudent Group Student` sgs where sgs.parent=ap.student_group)
+					as student_group_strength
+			FROM
+				`tabAssessment Plan` ap
+			WHERE
+				ap.docstatus = 1 {condition}
+			ORDER BY
+				ap.modified desc
+		'''.format(condition=condition), (args), as_dict=1)
+
+	assessment_plan_list = [d.assessment_plan for d in assessment_plan] if assessment_plan else ['']
+	assessment_result = get_assessment_result(assessment_plan_list)
+
+	for d in assessment_plan:
+
+		assessment_plan_details = assessment_result.get(d.assessment_plan)
+		assessment_plan_details = frappe._dict() if not assessment_plan_details else \
+			frappe._dict(assessment_plan_details)
+		if "saved" not in assessment_plan_details:
+			assessment_plan_details.update({"saved": 0})
+		if "submitted" not in assessment_plan_details:
+			assessment_plan_details.update({"submitted": 0})
+
+		# remaining students whose marks not entered
+		remaining_students = cint(d.student_group_strength) - cint(assessment_plan_details.saved) -\
+			cint(assessment_plan_details.submitted)
+		assessment_plan_details.update({"remaining": remaining_students})
+		d.update(assessment_plan_details)
+
+		chart_data[0] += cint(d.student_group_strength)
+		chart_data[1] += assessment_plan_details.saved
+		chart_data[2] += assessment_plan_details.submitted
+		chart_data[3] += assessment_plan_details.remaining
+
+	chart = get_chart(chart_data[1:])
+
+	return assessment_plan, chart
+
+
+def get_assessment_result(assessment_plan_list):
+	assessment_result_dict = frappe._dict()
+
+	assessment_result = frappe.db.sql('''
+		SELECT
+			assessment_plan, docstatus, count(*) as count
+		FROM
+			`tabAssessment Result`
+		WHERE
+			assessment_plan in (%s)
+		GROUP BY
+			assessment_plan, docstatus
+		ORDER BY
+			assessment_plan
+	''' %', '.join(['%s']*len(assessment_plan_list)), tuple(assessment_plan_list), as_dict=1)
+
+	for key, group in groupby(assessment_result, lambda ap: ap["assessment_plan"]):
+		tmp = {}
+		for d in group:
+			if d.docstatus in [0,1]:
+				tmp.update({DOCSTATUS[d.docstatus]:d.count})
+		assessment_result_dict[key] = tmp
+
+	return assessment_result_dict
+
+
+def get_chart(chart_data):
+	return {
+		"data": {
+			"labels": ["Saved", "Submitted", "Remaining"],
+			"datasets": [{
+				"values": chart_data
+			}]
+		},
+		"type": 'percentage',
+	}
+
+
+def get_column():
+	return [{
+		"fieldname": "assessment_plan",
+		"label": _("Assessment Plan"),
+		"fieldtype": "Link",
+		"options": "Assessment Plan",
+		"width": 120
+	},
+	{
+		"fieldname": "assessment_name",
+		"label": _("Assessment Plan Name"),
+		"fieldtype": "Data",
+		"options": "",
+		"width": 200
+	},
+	{
+		"fieldname": "schedule_date",
+		"label": _("Schedule Date"),
+		"fieldtype": "Date",
+		"options": "",
+		"width": 100
+	},
+	{
+		"fieldname": "student_group",
+		"label": _("Student Group"),
+		"fieldtype": "Link",
+		"options": "Student Group",
+		"width": 200
+	},
+	{
+		"fieldname": "student_group_strength",
+		"label": _("Total Student"),
+		"fieldtype": "Data",
+		"options": "",
+		"width": 100
+	},
+	{
+		"fieldname": "submitted",
+		"label": _("Submitted"),
+		"fieldtype": "Data",
+		"options": "",
+		"width": 100
+	},
+	{
+		"fieldname": "saved",
+		"label": _("Saved"),
+		"fieldtype": "Data",
+		"options": "",
+		"width": 100
+	},
+	{
+		"fieldname": "remaining",
+		"label": _("Remaining"),
+		"fieldtype": "Data",
+		"options": "",
+		"width": 100
+	}]
diff --git a/erpnext/schools/report/course_wise_assessment_report/__init__.py b/erpnext/education/report/course_wise_assessment_report/__init__.py
similarity index 100%
rename from erpnext/schools/report/course_wise_assessment_report/__init__.py
rename to erpnext/education/report/course_wise_assessment_report/__init__.py
diff --git a/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html b/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html
similarity index 100%
rename from erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html
rename to erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html
diff --git a/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.js b/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.js
similarity index 100%
rename from erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.js
rename to erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.js
diff --git a/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.json b/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.json
new file mode 100644
index 0000000..e153f8c
--- /dev/null
+++ b/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.json
@@ -0,0 +1,23 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2017-05-05 14:46:13.776133", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "modified": "2017-11-10 19:41:46.641227", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Course wise Assessment Report", 
+ "owner": "Administrator", 
+ "ref_doctype": "Assessment Result", 
+ "report_name": "Course wise Assessment Report", 
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Academics User"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py b/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py
new file mode 100644
index 0000000..ff17238
--- /dev/null
+++ b/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py
@@ -0,0 +1,192 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.utils import flt
+from collections import defaultdict
+from erpnext.education.api import get_grade
+
+
+def execute(filters=None):
+	data = []
+
+	args = frappe._dict()
+	args["assessment_group"] = filters.get("assessment_group")
+	if args["assessment_group"] == "All Assessment Groups":
+		frappe.throw(_("Please select the assessment group other than 'All Assessment Groups'"))
+
+	args["course"] = filters.get("course")
+	args["student_group"] = filters.get("student_group")
+
+
+	# find all assessment plan and related details linked with the given filters
+	def get_assessment_details():
+		if args["student_group"]:
+			cond = "and ap.student_group=%(student_group)s"
+		else:
+			cond = ''
+
+		assessment_plan = frappe.db.sql('''
+			select
+				ap.name, ap.student_group, ap.grading_scale, apc.assessment_criteria, apc.maximum_score as max_score
+			from
+				`tabAssessment Plan` ap, `tabAssessment Plan Criteria` apc
+			where
+				ap.assessment_group=%(assessment_group)s and ap.course=%(course)s and
+				ap.name=apc.parent and ap.docstatus=1 {0}
+			order by
+				apc.assessment_criteria'''.format(cond), (args), as_dict=1)
+
+		assessment_plan_list = list(set([d["name"] for d in assessment_plan]))
+		if not assessment_plan_list:
+			frappe.throw(_("No assessment plan linked with this assessment group"))
+
+		assessment_criteria_list = list(set([(d["assessment_criteria"],d["max_score"]) for d in assessment_plan]))
+		student_group_list = list(set([d["student_group"] for d in assessment_plan]))
+		total_maximum_score = flt(sum([flt(d[1]) for d in assessment_criteria_list]))
+		grading_scale = assessment_plan[0]["grading_scale"]
+
+		return assessment_plan_list, assessment_criteria_list, total_maximum_score, grading_scale, student_group_list
+
+
+	# get all the result and make a dict map student as the key and value as dict of result
+	def get_result_map():
+		result_dict = defaultdict(dict)
+		kounter = defaultdict(dict)
+		assessment_result = frappe.db.sql('''select ar.student, ard.assessment_criteria, ard.grade, ard.score
+			from `tabAssessment Result` ar, `tabAssessment Result Detail` ard
+			where ar.assessment_plan in (%s) and ar.name=ard.parent and ar.docstatus=1
+			order by ard.assessment_criteria''' %', '.join(['%s']*len(assessment_plan_list)),
+			tuple(assessment_plan_list), as_dict=1)
+
+		for result in assessment_result:
+			if "total_score" in result_dict[result.student]:
+				total_score = result_dict[result.student]["total_score"] + result.score
+			else:
+				total_score = result.score
+			total = get_grade(grading_scale, (total_score/total_maximum_score)*100)
+
+			if result.grade in kounter[result.assessment_criteria]:
+				kounter[result.assessment_criteria][result.grade] += 1
+			else:
+				kounter[result.assessment_criteria].update({result.grade: 1})
+
+			if "Total" not in kounter:
+				kounter["Total"] = {}
+
+			if "total" in result_dict[result.student]:
+				prev_grade = result_dict[result.student]["total"]
+				prev_grade_count = kounter["Total"].get(prev_grade) - 1
+				kounter["Total"].update({prev_grade: prev_grade_count})
+			latest_grade_count = kounter["Total"].get(total)+1 if kounter["Total"].get(total) else 1
+			kounter["Total"].update({total: latest_grade_count})
+
+			result_dict[result.student].update({
+					frappe.scrub(result.assessment_criteria): result.grade,
+					frappe.scrub(result.assessment_criteria)+"_score": result.score,
+					"total_score": total_score,
+					"total": total
+				})
+
+		return result_dict, kounter
+
+	# make data from the result dict
+	def get_data():
+		student_list = frappe.db.sql('''select sgs.student, sgs.student_name
+			from `tabStudent Group` sg, `tabStudent Group Student` sgs
+			where sg.name = sgs.parent and sg.name in (%s)
+			order by sgs.group_roll_number asc''' %', '.join(['%s']*len(student_group_list)),
+			tuple(student_group_list), as_dict=1)
+
+		for student in student_list:
+			student.update(result_dict[student.student])
+		return student_list
+
+
+	# get chart data
+	def get_chart():
+		grading_scale = frappe.db.get_value("Assessment Plan", list(assessment_plan_list)[0], "grading_scale")
+		grades = frappe.db.sql_list('''select grade_code from `tabGrading Scale Interval` where parent=%s''',
+			(grading_scale))
+		criteria_list = [d[0] for d in assessment_criteria_list] + ["Total"]
+		return get_chart_data(grades, criteria_list, kounter)
+
+
+	assessment_plan_list, assessment_criteria_list, total_maximum_score, grading_scale,\
+		student_group_list = get_assessment_details()
+	result_dict, kounter = get_result_map()
+	data = get_data()
+
+	columns = get_column(assessment_criteria_list, total_maximum_score)
+	chart = get_chart()
+	data_to_be_printed = [{
+		"assessment_plan": ", ".join(assessment_plan_list)
+	}]
+
+	return columns, data, None, chart, data_to_be_printed
+
+def get_column(assessment_criteria, total_maximum_score):
+	columns = [{
+		"fieldname": "student",
+		"label": _("Student ID"),
+		"fieldtype": "Link",
+		"options": "Student",
+		"width": 90
+	},
+	{
+		"fieldname": "student_name",
+		"label": _("Student Name"),
+		"fieldtype": "Data",
+		"width": 160
+	}]
+	for d in assessment_criteria:
+		columns.append({
+			"fieldname": frappe.scrub(d[0]),
+			"label": d[0],
+			"fieldtype": "Data",
+			"width": 110
+		})
+		columns.append({
+			"fieldname": frappe.scrub(d[0]) +"_score",
+			"label": "Score(" + str(int(d[1])) + ")",
+			"fieldtype": "Float",
+			"width": 100
+		})
+
+	columns += [{
+		"fieldname": "total",
+		"label": "Total",
+		"fieldtype": "Data",
+		"width": 100
+	},
+	{
+		"fieldname": "total_score",
+		"label": "Total Score("+ str(int(total_maximum_score)) + ")",
+		"fieldtype": "Float",
+		"width": 110
+	}]
+
+	return columns
+
+def get_chart_data(grades, assessment_criteria_list, kounter):
+	grades = sorted(grades)
+	datasets = []
+
+	for grade in grades:
+		tmp = frappe._dict({"values":[], "title": grade})
+		for criteria in assessment_criteria_list:
+			if grade in kounter[criteria]:
+				tmp["values"].append(kounter[criteria][grade])
+			else:
+				tmp["values"].append(0)
+		datasets.append(tmp)
+
+	return {
+		"data": {
+			"labels": assessment_criteria_list,
+			"datasets": datasets
+		},
+		"type": 'bar',
+	}
diff --git a/erpnext/schools/report/student_and_guardian_contact_details/__init__.py b/erpnext/education/report/student_and_guardian_contact_details/__init__.py
similarity index 100%
rename from erpnext/schools/report/student_and_guardian_contact_details/__init__.py
rename to erpnext/education/report/student_and_guardian_contact_details/__init__.py
diff --git a/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.js b/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.js
similarity index 100%
rename from erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.js
rename to erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.js
diff --git a/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.json b/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.json
new file mode 100644
index 0000000..fe7d158
--- /dev/null
+++ b/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.json
@@ -0,0 +1,26 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2017-03-27 17:47:16.831433", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "modified": "2017-11-10 19:42:30.300729", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Student and Guardian Contact Details", 
+ "owner": "Administrator", 
+ "ref_doctype": "Program Enrollment", 
+ "report_name": "Student and Guardian Contact Details", 
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Instructor"
+  }, 
+  {
+   "role": "Academics User"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py b/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py
similarity index 100%
rename from erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py
rename to erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py
diff --git a/erpnext/schools/report/student_batch_wise_attendance/__init__.py b/erpnext/education/report/student_batch_wise_attendance/__init__.py
similarity index 100%
rename from erpnext/schools/report/student_batch_wise_attendance/__init__.py
rename to erpnext/education/report/student_batch_wise_attendance/__init__.py
diff --git a/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.js b/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.js
similarity index 100%
rename from erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.js
rename to erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.js
diff --git a/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.json b/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.json
new file mode 100644
index 0000000..eb547b7
--- /dev/null
+++ b/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.json
@@ -0,0 +1,23 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2016-11-28 22:07:03.859124", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 2, 
+ "is_standard": "Yes", 
+ "modified": "2017-11-10 19:41:12.328346", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Student Batch-Wise Attendance", 
+ "owner": "Administrator", 
+ "ref_doctype": "Student Attendance", 
+ "report_name": "Student Batch-Wise Attendance", 
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Academics User"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py b/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py
similarity index 100%
rename from erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py
rename to erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py
diff --git a/erpnext/schools/report/student_fee_collection/__init__.py b/erpnext/education/report/student_fee_collection/__init__.py
similarity index 100%
rename from erpnext/schools/report/student_fee_collection/__init__.py
rename to erpnext/education/report/student_fee_collection/__init__.py
diff --git a/erpnext/education/report/student_fee_collection/student_fee_collection.json b/erpnext/education/report/student_fee_collection/student_fee_collection.json
new file mode 100644
index 0000000..07fc27c
--- /dev/null
+++ b/erpnext/education/report/student_fee_collection/student_fee_collection.json
@@ -0,0 +1,24 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2016-06-22 02:58:41.024538", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 3, 
+ "is_standard": "Yes", 
+ "modified": "2017-11-10 19:41:37.320224", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Student Fee Collection", 
+ "owner": "Administrator", 
+ "query": "SELECT\n student as \"Student:Link/Student:200\",\n student_name as \"Student Name::200\",\n sum(paid_amount) as \"Paid Amount:Currency:150\",\n sum(outstanding_amount) as \"Outstanding Amount:Currency:150\",\n sum(grand_total) as \"Grand Total:Currency:150\"\nFROM\n `tabFees` \nGROUP BY\n student", 
+ "ref_doctype": "Fees", 
+ "report_name": "Student Fee Collection", 
+ "report_type": "Query Report", 
+ "roles": [
+  {
+   "role": "Academics User"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/schools/report/student_monthly_attendance_sheet/__init__.py b/erpnext/education/report/student_monthly_attendance_sheet/__init__.py
similarity index 100%
rename from erpnext/schools/report/student_monthly_attendance_sheet/__init__.py
rename to erpnext/education/report/student_monthly_attendance_sheet/__init__.py
diff --git a/erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js b/erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js
new file mode 100644
index 0000000..402bb02
--- /dev/null
+++ b/erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js
@@ -0,0 +1,42 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+
+frappe.query_reports["Student Monthly Attendance Sheet"] = {
+	"filters": [{
+		"fieldname": "month",
+		"label": __("Month"),
+		"fieldtype": "Select",
+		"options": "Jan\nFeb\nMar\nApr\nMay\nJun\nJul\nAug\nSep\nOct\nNov\nDec",
+		"default": ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov",
+			"Dec"
+		][frappe.datetime.str_to_obj(frappe.datetime.get_today()).getMonth()],
+	},
+	{
+		"fieldname": "year",
+		"label": __("Year"),
+		"fieldtype": "Select",
+		"reqd": 1
+	},
+	{
+		"fieldname": "student_group",
+		"label": __("Student Group"),
+		"fieldtype": "Link",
+		"options": "Student Group",
+		"reqd": 1
+	}
+	],
+
+	"onload": function() {
+		return frappe.call({
+			method: "erpnext.education.report.student_monthly_attendance_sheet.student_monthly_attendance_sheet.get_attendance_years",
+			callback: function(r) {
+				var year_filter = frappe.query_report_filters_by_name.year;
+				year_filter.df.options = r.message;
+				year_filter.df.default = r.message.split("\n")[0];
+				year_filter.refresh();
+				year_filter.set_input(year_filter.df.default);
+			}
+		});
+	}
+}
\ No newline at end of file
diff --git a/erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.json b/erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.json
new file mode 100644
index 0000000..e10f190
--- /dev/null
+++ b/erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.json
@@ -0,0 +1,23 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2013-05-13 14:04:03", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 3, 
+ "is_standard": "Yes", 
+ "modified": "2017-11-10 19:42:43.376658", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "Student Monthly Attendance Sheet", 
+ "owner": "Administrator", 
+ "ref_doctype": "Student Attendance", 
+ "report_name": "Student Monthly Attendance Sheet", 
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Academics User"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py b/erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py
new file mode 100644
index 0000000..0c7baa8
--- /dev/null
+++ b/erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py
@@ -0,0 +1,108 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.utils import cstr, cint, getdate, get_first_day, get_last_day, date_diff, add_days
+from frappe import msgprint, _
+from calendar import monthrange
+from erpnext.education.api import get_student_group_students
+
+def execute(filters=None):
+	if not filters: filters = {}
+
+	from_date = get_first_day(filters["month"] + '-' + filters["year"])
+	to_date = get_last_day(filters["month"] + '-' + filters["year"])
+	total_days_in_month = date_diff(to_date, from_date) +1
+	columns = get_columns(total_days_in_month)
+	students = get_student_group_students(filters.get("student_group"),1)
+	students_list = get_students_list(students)
+	att_map = get_attendance_list(from_date, to_date, filters.get("student_group"), students_list)
+	data = []
+	for stud in students:
+		row = [stud.student, stud.student_name]
+		student_status = frappe.db.get_value("Student", stud.student, "enabled")
+		date = from_date
+		total_p = total_a = 0.0
+		for day in range(total_days_in_month):
+			status="None"
+			if att_map.get(stud.student):
+				status = att_map.get(stud.student).get(date, "None")
+			elif not student_status:
+				status = "Inactive"
+			else:
+				status = "None"
+			status_map = {"Present": "P", "Absent": "A", "None": "", "Inactive":"-"}
+			row.append(status_map[status])
+			if status == "Present":
+				total_p += 1
+			elif status == "Absent":
+				total_a += 1
+			date = add_days(date, 1)
+		row += [total_p, total_a]
+		data.append(row)
+	return columns, data
+
+def get_columns(days_in_month):
+	columns = [ _("Student") + ":Link/Student:90", _("Student Name") + "::150"]
+	for day in range(days_in_month):
+		columns.append(cstr(day+1) +"::20")
+	columns += [_("Total Present") + ":Int:95", _("Total Absent") + ":Int:90"]
+	return columns
+
+def get_students_list(students):
+	student_list = []
+	for stud in students:
+		student_list.append(stud.student)
+	return student_list
+
+def get_attendance_list(from_date, to_date, student_group, students_list):
+	attendance_list = frappe.db.sql('''select student, date, status 
+		from `tabStudent Attendance` where student_group = %s 
+		and date between %s and %s
+		order by student, date''',
+		(student_group, from_date, to_date), as_dict=1)
+	att_map = {}
+	students_with_leave_application = get_students_with_leave_application(from_date, to_date, students_list)
+	for d in attendance_list:
+		att_map.setdefault(d.student, frappe._dict()).setdefault(d.date, "")
+		if students_with_leave_application.get(d.date) and d.student in students_with_leave_application.get(d.date):
+			att_map[d.student][d.date] = "Present"
+		else:
+			att_map[d.student][d.date] = d.status
+	return att_map
+
+def get_students_with_leave_application(from_date, to_date, students_list):
+	leave_applications = frappe.db.sql("""
+		select student, from_date, to_date 
+		from `tabStudent Leave Application` 
+		where 
+			mark_as_present and docstatus = 1
+			and student in %(students)s
+			and (
+				from_date between %(from_date)s and %(to_date)s
+				or to_date between %(from_date)s and %(to_date)s
+				or (%(from_date)s between from_date and to_date and %(to_date)s between from_date and to_date)
+			)
+		""", {
+			"students": students_list,
+			"from_date": from_date,
+			"to_date": to_date
+		}, as_dict=True)
+	students_with_leaves= {}
+	for application in leave_applications:
+		for date in daterange(application.from_date, application.to_date):
+			students_with_leaves.setdefault(date, []).append(application.student)
+
+	return students_with_leaves
+
+def daterange(d1, d2):
+	import datetime
+	return (d1 + datetime.timedelta(days=i) for i in range((d2 - d1).days + 1))
+
+@frappe.whitelist()
+def get_attendance_years():
+	year_list = frappe.db.sql_list('''select distinct YEAR(date) from `tabStudent Attendance` ORDER BY YEAR(date) DESC''')
+	if not year_list:
+		year_list = [getdate().year]
+	return "\n".join(str(year) for year in year_list)
diff --git a/erpnext/education/setup.py b/erpnext/education/setup.py
new file mode 100644
index 0000000..ed1d69e
--- /dev/null
+++ b/erpnext/education/setup.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+
+import frappe
+from erpnext.setup.utils import insert_record
+
+
+def setup_education():
+	if frappe.db.exists('Academic Year', '2015-16'):
+		# already setup
+		return
+	create_academic_sessions()
+
+def create_academic_sessions():
+	data = [
+		{"doctype": "Academic Year", "academic_year_name": "2015-16"},
+		{"doctype": "Academic Year", "academic_year_name": "2016-17"},
+		{"doctype": "Academic Year", "academic_year_name": "2017-18"},
+		{"doctype": "Academic Year", "academic_year_name": "2018-19"},
+		{"doctype": "Academic Term", "academic_year": "2016-17", "term_name": "Semester 1"},
+		{"doctype": "Academic Term", "academic_year": "2016-17", "term_name": "Semester 2"},
+		{"doctype": "Academic Term", "academic_year": "2017-18", "term_name": "Semester 1"},
+		{"doctype": "Academic Term", "academic_year": "2017-18", "term_name": "Semester 2"}
+	]
+	insert_record(data)
diff --git a/erpnext/education/utils.py b/erpnext/education/utils.py
new file mode 100644
index 0000000..1b93c9d
--- /dev/null
+++ b/erpnext/education/utils.py
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For lice
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+
+class OverlapError(frappe.ValidationError): pass
+
+def validate_overlap_for(doc, doctype, fieldname, value=None):
+	"""Checks overlap for specified field.
+	
+	:param fieldname: Checks Overlap for this field 
+	"""
+	
+	existing = get_overlap_for(doc, doctype, fieldname, value)
+	if existing:
+		frappe.throw(_("This {0} conflicts with {1} for {2} {3}").format(doc.doctype, existing.name,
+			doc.meta.get_label(fieldname) if not value else fieldname , value or doc.get(fieldname)), OverlapError)
+	
+def get_overlap_for(doc, doctype, fieldname, value=None):
+	"""Returns overlaping document for specified field.
+	
+	:param fieldname: Checks Overlap for this field 
+	"""
+
+	existing = frappe.db.sql("""select name, from_time, to_time from `tab{0}`
+		where `{1}`=%(val)s and schedule_date = %(schedule_date)s and
+		(
+			(from_time > %(from_time)s and from_time < %(to_time)s) or
+			(to_time > %(from_time)s and to_time < %(to_time)s) or
+			(%(from_time)s > from_time and %(from_time)s < to_time) or
+			(%(from_time)s = from_time and %(to_time)s = to_time))
+		and name!=%(name)s and docstatus!=2""".format(doctype, fieldname),
+		{
+			"schedule_date": doc.schedule_date,
+			"val": value or doc.get(fieldname),
+			"from_time": doc.from_time,
+			"to_time": doc.to_time,
+			"name": doc.name or "No Name"
+		}, as_dict=True)
+
+	return existing[0] if existing else None
+	
+def validate_duplicate_student(students):
+	unique_students= []
+	for stud in students:
+		if stud.student in unique_students:
+			frappe.throw(_("Student {0} - {1} appears Multiple times in row {2} & {3}")
+				.format(stud.student, stud.student_name, unique_students.index(stud.student)+1, stud.idx))
+		else:
+			unique_students.append(stud.student)
diff --git a/erpnext/schools/web_form/__init__.py b/erpnext/education/web_form/__init__.py
similarity index 100%
rename from erpnext/schools/web_form/__init__.py
rename to erpnext/education/web_form/__init__.py
diff --git a/erpnext/schools/web_form/student_applicant/__init__.py b/erpnext/education/web_form/student_applicant/__init__.py
similarity index 100%
rename from erpnext/schools/web_form/student_applicant/__init__.py
rename to erpnext/education/web_form/student_applicant/__init__.py
diff --git a/erpnext/schools/web_form/student_applicant/student_applicant.js b/erpnext/education/web_form/student_applicant/student_applicant.js
similarity index 100%
rename from erpnext/schools/web_form/student_applicant/student_applicant.js
rename to erpnext/education/web_form/student_applicant/student_applicant.js
diff --git a/erpnext/education/web_form/student_applicant/student_applicant.json b/erpnext/education/web_form/student_applicant/student_applicant.json
new file mode 100644
index 0000000..b1ad754
--- /dev/null
+++ b/erpnext/education/web_form/student_applicant/student_applicant.json
@@ -0,0 +1,200 @@
+{
+ "accept_payment": 0, 
+ "allow_comments": 0, 
+ "allow_delete": 0, 
+ "allow_edit": 1, 
+ "allow_incomplete": 0, 
+ "allow_multiple": 1, 
+ "allow_print": 0, 
+ "amount": 0.0, 
+ "amount_based_on_field": 0, 
+ "creation": "2016-09-22 13:10:10.792735", 
+ "doc_type": "Student Applicant", 
+ "docstatus": 0, 
+ "doctype": "Web Form", 
+ "idx": 0, 
+ "is_standard": 1, 
+ "login_required": 1, 
+ "max_attachment_size": 0, 
+ "modified": "2017-02-21 05:44:46.022738", 
+ "modified_by": "Administrator", 
+ "module": "Education", 
+ "name": "student-applicant", 
+ "owner": "Administrator", 
+ "payment_button_label": "Buy Now", 
+ "published": 1, 
+ "route": "student-applicant", 
+ "show_sidebar": 1, 
+ "sidebar_items": [], 
+ "success_url": "/student-applicant", 
+ "title": "Student Applicant", 
+ "web_form_fields": [
+  {
+   "fieldname": "first_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "First Name", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "middle_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Middle Name", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "last_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Last Name", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "image", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Image", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "program", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "label": "Program", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "options": "Program", 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "academic_year", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "label": "Academic Year", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "options": "Academic Year", 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "date_of_birth", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "label": "Date of Birth", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "blood_group", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "label": "Blood Group", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "options": "\nA+\nA-\nB+\nB-\nO+\nO-\nAB+\nAB-", 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "student_email_id", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Student Email ID", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "student_mobile_number", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Student Mobile Number", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "default": "INDIAN", 
+   "fieldname": "nationality", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Nationality", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "options": "", 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "address_line_1", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Address Line 1", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "address_line_2", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Address Line 2", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "pincode", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Pincode", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "guardians", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "label": "Guardians", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "options": "Student Guardian", 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "siblings", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "label": "Siblings", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "options": "Student Sibling", 
+   "read_only": 0, 
+   "reqd": 0
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/schools/web_form/student_applicant/student_applicant.py b/erpnext/education/web_form/student_applicant/student_applicant.py
similarity index 100%
rename from erpnext/schools/web_form/student_applicant/student_applicant.py
rename to erpnext/education/web_form/student_applicant/student_applicant.py
diff --git a/erpnext/schools/__init__.py b/erpnext/erpnext_integrations/__init__.py
similarity index 100%
copy from erpnext/schools/__init__.py
copy to erpnext/erpnext_integrations/__init__.py
diff --git a/erpnext/docs/assets/img/schools/__init__.py b/erpnext/erpnext_integrations/connectors/__init__.py
similarity index 100%
copy from erpnext/docs/assets/img/schools/__init__.py
copy to erpnext/erpnext_integrations/connectors/__init__.py
diff --git a/erpnext/erpnext_integrations/connectors/github_connection.py b/erpnext/erpnext_integrations/connectors/github_connection.py
new file mode 100644
index 0000000..ab7708d
--- /dev/null
+++ b/erpnext/erpnext_integrations/connectors/github_connection.py
@@ -0,0 +1,45 @@
+from __future__ import unicode_literals
+import frappe
+from frappe.data_migration.doctype.data_migration_connector.connectors.base import BaseConnection
+from github import Github
+
+class GithubConnection(BaseConnection):
+	def __init__(self, connector):
+		self.connector = connector
+
+		try:
+			password = self.get_password()
+		except frappe.AuthenticationError:
+			password = None
+
+		if self.connector.username and password:
+			self.connection = Github(self.connector.username, self.get_password())
+		else:
+			self.connection = Github()
+
+		self.name_field = 'id'
+
+	def insert(self, doctype, doc):
+		pass
+
+	def update(self, doctype, doc, migration_id):
+		pass
+
+	def delete(self, doctype, migration_id):
+		pass
+
+	def get(self, remote_objectname, fields=None, filters=None, start=0, page_length=10):
+		repo = filters.get('repo')
+
+		if remote_objectname == 'Milestone':
+			return self.get_milestones(repo, start, page_length)
+		if remote_objectname == 'Issue':
+			return self.get_issues(repo, start, page_length)
+
+	def get_milestones(self, repo, start=0, page_length=10):
+		_repo = self.connection.get_repo(repo)
+		return list(_repo.get_milestones()[start:start+page_length])
+
+	def get_issues(self, repo, start=0, page_length=10):
+		_repo = self.connection.get_repo(repo)
+		return list(_repo.get_issues()[start:start+page_length])
diff --git a/erpnext/schools/doctype/student_sibling/__init__.py b/erpnext/erpnext_integrations/data_migration_mapping/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/student_sibling/__init__.py
copy to erpnext/erpnext_integrations/data_migration_mapping/__init__.py
diff --git a/erpnext/erpnext_integrations/data_migration_mapping/issue_to_task/__init__.py b/erpnext/erpnext_integrations/data_migration_mapping/issue_to_task/__init__.py
new file mode 100644
index 0000000..5f0f691
--- /dev/null
+++ b/erpnext/erpnext_integrations/data_migration_mapping/issue_to_task/__init__.py
@@ -0,0 +1,11 @@
+import frappe
+
+def pre_process(issue):
+
+	project = frappe.db.get_value('Project', filters={'project_name': issue.milestone})
+	return {
+		'title': issue.title,
+		'body': frappe.utils.to_html(issue.body or ''),
+		'state': issue.state.title(),
+		'project': project or ''
+	}
diff --git a/erpnext/erpnext_integrations/data_migration_mapping/issue_to_task/issue_to_task.json b/erpnext/erpnext_integrations/data_migration_mapping/issue_to_task/issue_to_task.json
new file mode 100644
index 0000000..e945ba2
--- /dev/null
+++ b/erpnext/erpnext_integrations/data_migration_mapping/issue_to_task/issue_to_task.json
@@ -0,0 +1,36 @@
+{
+ "condition": "{\"repo\":\"frappe/erpnext\"}", 
+ "creation": "2017-10-16 16:03:32.772191", 
+ "docstatus": 0, 
+ "doctype": "Data Migration Mapping", 
+ "fields": [
+  {
+   "is_child_table": 0, 
+   "local_fieldname": "subject", 
+   "remote_fieldname": "title"
+  }, 
+  {
+   "is_child_table": 0, 
+   "local_fieldname": "description", 
+   "remote_fieldname": "body"
+  }, 
+  {
+   "is_child_table": 0, 
+   "local_fieldname": "status", 
+   "remote_fieldname": "state"
+  }
+ ], 
+ "idx": 0, 
+ "local_doctype": "Task", 
+ "local_primary_key": "name", 
+ "mapping_name": "Issue to Task", 
+ "mapping_type": "Pull", 
+ "migration_id_field": "github_sync_id", 
+ "modified": "2017-10-20 11:48:54.575993", 
+ "modified_by": "Administrator", 
+ "name": "Issue to Task", 
+ "owner": "Administrator", 
+ "page_length": 10, 
+ "remote_objectname": "Issue", 
+ "remote_primary_key": "id"
+}
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/data_migration_mapping/milestone_to_project/__init__.py b/erpnext/erpnext_integrations/data_migration_mapping/milestone_to_project/__init__.py
new file mode 100644
index 0000000..212f81b
--- /dev/null
+++ b/erpnext/erpnext_integrations/data_migration_mapping/milestone_to_project/__init__.py
@@ -0,0 +1,6 @@
+def pre_process(milestone):
+	return {
+		'title': milestone.title,
+		'description': milestone.description,
+		'state': milestone.state.title()
+	}
diff --git a/erpnext/erpnext_integrations/data_migration_mapping/milestone_to_project/milestone_to_project.json b/erpnext/erpnext_integrations/data_migration_mapping/milestone_to_project/milestone_to_project.json
new file mode 100644
index 0000000..5a3e07e
--- /dev/null
+++ b/erpnext/erpnext_integrations/data_migration_mapping/milestone_to_project/milestone_to_project.json
@@ -0,0 +1,36 @@
+{
+ "condition": "{\"repo\": \"frappe/erpnext\"}", 
+ "creation": "2017-10-13 11:16:49.664925", 
+ "docstatus": 0, 
+ "doctype": "Data Migration Mapping", 
+ "fields": [
+  {
+   "is_child_table": 0, 
+   "local_fieldname": "project_name", 
+   "remote_fieldname": "title"
+  }, 
+  {
+   "is_child_table": 0, 
+   "local_fieldname": "notes", 
+   "remote_fieldname": "description"
+  }, 
+  {
+   "is_child_table": 0, 
+   "local_fieldname": "status", 
+   "remote_fieldname": "state"
+  }
+ ], 
+ "idx": 0, 
+ "local_doctype": "Project", 
+ "local_primary_key": "project_name", 
+ "mapping_name": "Milestone to Project", 
+ "mapping_type": "Pull", 
+ "migration_id_field": "github_sync_id", 
+ "modified": "2017-10-20 11:48:54.552305", 
+ "modified_by": "Administrator", 
+ "name": "Milestone to Project", 
+ "owner": "Administrator", 
+ "page_length": 10, 
+ "remote_objectname": "Milestone", 
+ "remote_primary_key": "id"
+}
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/data_migration_plan/github_sync/github_sync.json b/erpnext/erpnext_integrations/data_migration_plan/github_sync/github_sync.json
new file mode 100644
index 0000000..20eb387
--- /dev/null
+++ b/erpnext/erpnext_integrations/data_migration_plan/github_sync/github_sync.json
@@ -0,0 +1,22 @@
+{
+ "creation": "2017-10-13 11:16:53.600026", 
+ "docstatus": 0, 
+ "doctype": "Data Migration Plan", 
+ "idx": 0, 
+ "mappings": [
+  {
+   "enabled": 1, 
+   "mapping": "Milestone to Project"
+  }, 
+  {
+   "enabled": 1, 
+   "mapping": "Issue to Task"
+  }
+ ], 
+ "modified": "2017-10-20 11:48:54.496123", 
+ "modified_by": "Administrator", 
+ "module": "ERPNext Integrations", 
+ "name": "GitHub Sync", 
+ "owner": "Administrator", 
+ "plan_name": "GitHub Sync"
+}
\ No newline at end of file
diff --git a/erpnext/healthcare/setup.py b/erpnext/healthcare/setup.py
index 69a92b3..fca1270 100644
--- a/erpnext/healthcare/setup.py
+++ b/erpnext/healthcare/setup.py
@@ -2,6 +2,7 @@
 import frappe
 
 from frappe import _
+from erpnext.setup.utils import insert_record
 
 def setup_healthcare():
 	if frappe.db.exists('Medical Department', 'Cardiology'):
@@ -259,17 +260,3 @@
 		{"doctype": "Sensitivity", "sensitivity": _("Intermediate")}
 	]
 	insert_record(records)
-
-def insert_record(records):
-	for r in records:
-		doc = frappe.new_doc(r.get("doctype"))
-		doc.update(r)
-		try:
-			doc.insert(ignore_permissions=True)
-		except frappe.DuplicateEntryError, e:
-			# pass DuplicateEntryError and continue
-			if e.args and e.args[0]==doc.doctype and e.args[1]==doc.name:
-				# make sure DuplicateEntryError is for the exact same doc and not a related doc
-				pass
-			else:
-				raise
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 44a3b18..53d117c 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -41,7 +41,7 @@
 on_session_creation = "erpnext.shopping_cart.utils.set_cart_count"
 on_logout = "erpnext.shopping_cart.utils.clear_cart_count"
 
-treeviews = ['Account', 'Cost Center', 'Warehouse', 'Item Group', 'Customer Group', 'Sales Person', 'Territory']
+treeviews = ['Account', 'Cost Center', 'Warehouse', 'Item Group', 'Customer Group', 'Sales Person', 'Territory', 'Assessment Group']
 
 # website
 update_website_context = "erpnext.shopping_cart.utils.update_website_context"
@@ -49,11 +49,12 @@
 
 email_append_to = ["Job Applicant", "Lead", "Opportunity", "Issue"]
 
-calendars = ["Task", "Production Order", "Leave Application", "Sales Order", "Holiday List"]
+calendars = ["Task", "Production Order", "Leave Application", "Sales Order", "Holiday List", "Course Schedule"]
 
-fixtures = ["Web Form"]
+
 
 domains = {
+	'Agriculture': 'erpnext.domains.agriculture',
 	'Distribution': 'erpnext.domains.distribution',
 	'Education': 'erpnext.domains.education',
 	'Healthcare': 'erpnext.domains.healthcare',
@@ -125,6 +126,8 @@
 	{"from_route": "/admissions", "to_route": "Student Admission"},
 	{"from_route": "/boms", "to_route": "BOM"},
 	{"from_route": "/timesheets", "to_route": "Timesheet"},
+	{"from_route": "/grant-application", "to_route": "Grant Application"},
+	{"from_route": "/chapters", "to_route": "Chapter"},
 ]
 
 standard_portal_menu_items = [
@@ -144,7 +147,9 @@
 	{"title": _("Patient Appointment"), "route": "/patient-appointments", "reference_doctype": "Patient Appointment", "role":"Patient"},
 	{"title": _("Fees"), "route": "/fees", "reference_doctype": "Fees", "role":"Student"},
 	{"title": _("Newsletter"), "route": "/newsletters", "reference_doctype": "Newsletter"},
-	{"title": _("Admission"), "route": "/admissions", "reference_doctype": "Student Admission"}
+	{"title": _("Admission"), "route": "/admissions", "reference_doctype": "Student Admission"},
+	{"title": _("Grant Application"), "route": "/grant-application", "reference_doctype": "Grant Application", "role": "Non Profit Portal User"},
+	{"title": _("Chapter"), "route": "/chapters", "reference_doctype": "Chapter"}
 ]
 
 default_roles = [
@@ -214,12 +219,13 @@
 		"erpnext.accounts.doctype.fiscal_year.fiscal_year.auto_create_fiscal_year",
 		"erpnext.hr.doctype.employee.employee.send_birthday_reminders",
 		"erpnext.projects.doctype.task.task.set_tasks_as_overdue",
-		"erpnext.accounts.doctype.asset.depreciation.post_depreciation_entries",
+		"erpnext.assets.doctype.asset.depreciation.post_depreciation_entries",
 		"erpnext.hr.doctype.daily_work_summary_settings.daily_work_summary_settings.send_summary",
 		"erpnext.stock.doctype.serial_no.serial_no.update_maintenance_status",
 		"erpnext.buying.doctype.supplier_scorecard.supplier_scorecard.refresh_scorecards",
 		"erpnext.setup.doctype.company.company.cache_companies_monthly_sales_history",
-		"erpnext.manufacturing.doctype.bom_update_tool.bom_update_tool.update_latest_price_in_all_boms"
+		"erpnext.manufacturing.doctype.bom_update_tool.bom_update_tool.update_latest_price_in_all_boms",
+		"erpnext.assets.doctype.asset.asset.update_maintenance_status"
 	]
 }
 
diff --git a/erpnext/hr/doctype/branch/test_branch.js b/erpnext/hr/doctype/branch/test_branch.js
index 446db75..c315385 100644
--- a/erpnext/hr/doctype/branch/test_branch.js
+++ b/erpnext/hr/doctype/branch/test_branch.js
@@ -9,7 +9,8 @@
 		() => frappe.set_route("List", "Branch", "List"),
 		() => frappe.new_doc("Branch"),
 		() => frappe.timeout(1),
-		() => frappe.click_link('Edit in full page'),
+		() => frappe.quick_entry.dialog.$wrapper.find('.edit-full').click(),
+		() => frappe.timeout(1),
 		() => cur_frm.set_value("branch", "Test Branch"),
 
 		// save form
diff --git a/erpnext/hr/doctype/department/test_department.js b/erpnext/hr/doctype/department/test_department.js
index 1c413e9..3a571f7 100644
--- a/erpnext/hr/doctype/department/test_department.js
+++ b/erpnext/hr/doctype/department/test_department.js
@@ -9,7 +9,8 @@
 		() => frappe.set_route("List", "Department", "List"),
 		() => frappe.new_doc("Department"),
 		() => frappe.timeout(1),
-		() => frappe.click_link('Edit in full page'),
+		() => frappe.quick_entry.dialog.$wrapper.find('.edit-full').click(),
+		() => frappe.timeout(1),
 		() => cur_frm.set_value("department_name", "Test Department"),
 		() => cur_frm.set_value("leave_block_list", "Test Leave block list"),
 		// save form
diff --git a/erpnext/hr/doctype/designation/test_designation.js b/erpnext/hr/doctype/designation/test_designation.js
index a012877..45c3417 100644
--- a/erpnext/hr/doctype/designation/test_designation.js
+++ b/erpnext/hr/doctype/designation/test_designation.js
@@ -9,7 +9,8 @@
 		() => frappe.set_route("List", "Designation", "List"),
 		() => frappe.new_doc("Designation"),
 		() => frappe.timeout(1),
-		() => frappe.click_link('Edit in full page'),
+		() => frappe.quick_entry.dialog.$wrapper.find('.edit-full').click(),
+		() => frappe.timeout(1),
 		() => cur_frm.set_value("designation_name", "Test Designation"),
 		() => cur_frm.set_value("description", "This designation is just for testing."),
 		// save form
diff --git a/erpnext/hr/doctype/process_payroll/__init__.py b/erpnext/hr/doctype/driver/__init__.py
similarity index 100%
rename from erpnext/hr/doctype/process_payroll/__init__.py
rename to erpnext/hr/doctype/driver/__init__.py
diff --git a/erpnext/hr/doctype/driver/driver.js b/erpnext/hr/doctype/driver/driver.js
new file mode 100644
index 0000000..014c4d3
--- /dev/null
+++ b/erpnext/hr/doctype/driver/driver.js
@@ -0,0 +1,5 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Driver', {
+});
diff --git a/erpnext/hr/doctype/driver/driver.json b/erpnext/hr/doctype/driver/driver.json
new file mode 100644
index 0000000..ccead4e
--- /dev/null
+++ b/erpnext/hr/doctype/driver/driver.json
@@ -0,0 +1,528 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "naming_series:", 
+ "beta": 0, 
+ "creation": "2017-10-17 08:21:50.489773", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "DRIVER-.#####", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "full_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Full Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Active\nSuspended\nLeft", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cell_number", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Cellphone 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "license_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "License Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "license_number", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "License 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, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_8", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "issuing_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": "Issuing Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_10", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "expiry_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": "Expiry Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "driving_license_categories", 
+   "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": "Driving License Categories", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "driving_license_category", 
+   "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": "Driving License Category", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Driving License 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, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "fa fa-user", 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-06 06:52:01.868222", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Driver", 
+ "name_case": "Title Case", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Fleet Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 0
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "search_fields": "full_name", 
+ "show_name_in_global_search": 1, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "full_name", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/driver/driver.py b/erpnext/hr/doctype/driver/driver.py
new file mode 100644
index 0000000..2cd22cd
--- /dev/null
+++ b/erpnext/hr/doctype/driver/driver.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+class Driver(Document):
+	pass
diff --git a/erpnext/hr/doctype/driver/test_driver.js b/erpnext/hr/doctype/driver/test_driver.js
new file mode 100644
index 0000000..ff9f61e
--- /dev/null
+++ b/erpnext/hr/doctype/driver/test_driver.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Driver", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Driver
+		() => frappe.tests.make('Driver', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/driver/test_driver.py b/erpnext/hr/doctype/driver/test_driver.py
new file mode 100644
index 0000000..4bc4a8f
--- /dev/null
+++ b/erpnext/hr/doctype/driver/test_driver.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import unittest
+
+class TestDriver(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/process_payroll/__init__.py b/erpnext/hr/doctype/driving_license_category/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/process_payroll/__init__.py
copy to erpnext/hr/doctype/driving_license_category/__init__.py
diff --git a/erpnext/hr/doctype/driving_license_category/driving_license_category.json b/erpnext/hr/doctype/driving_license_category/driving_license_category.json
new file mode 100644
index 0000000..45e38d3
--- /dev/null
+++ b/erpnext/hr/doctype/driving_license_category/driving_license_category.json
@@ -0,0 +1,161 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-10-17 08:19:43.142329", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "class", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Class", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "issuing_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Issuing Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "expiry_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Expiry Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-10-17 08:19:43.142329", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Driving License Category", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/driving_license_category/driving_license_category.py b/erpnext/hr/doctype/driving_license_category/driving_license_category.py
new file mode 100644
index 0000000..33ba138
--- /dev/null
+++ b/erpnext/hr/doctype/driving_license_category/driving_license_category.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+class DrivingLicenseCategory(Document):
+	pass
diff --git a/erpnext/hr/doctype/employee/employee.json b/erpnext/hr/doctype/employee/employee.json
index 227302c..2779b1d 100644
--- a/erpnext/hr/doctype/employee/employee.json
+++ b/erpnext/hr/doctype/employee/employee.json
@@ -2418,6 +2418,96 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "lft", 
+   "fieldtype": "Int", 
+   "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": "lft", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "rgt", 
+   "fieldtype": "Int", 
+   "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": "rgt", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "old_parent", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Old Parent", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
   }
  ], 
  "has_web_view": 0, 
@@ -2432,7 +2522,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-10-04 11:42:02.495731", 
+ "modified": "2017-11-19 01:27:48.222343", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee", 
diff --git a/erpnext/hr/doctype/employee/employee.py b/erpnext/hr/doctype/employee/employee.py
index 03626cd..9541b77 100755
--- a/erpnext/hr/doctype/employee/employee.py
+++ b/erpnext/hr/doctype/employee/employee.py
@@ -10,13 +10,14 @@
 import frappe.permissions
 from frappe.model.document import Document
 from erpnext.utilities.transaction_base import delete_events
-
+from frappe.utils.nestedset import NestedSet
 
 class EmployeeUserDisabledError(frappe.ValidationError):
 	pass
 
+class Employee(NestedSet):
+	nsm_parent_field = 'reports_to'
 
-class Employee(Document):
 	def autoname(self):
 		naming_method = frappe.db.get_value("HR Settings", None, "emp_created_by")
 		if not naming_method:
@@ -52,7 +53,11 @@
 				frappe.permissions.remove_user_permission(
 					"Employee", self.name, existing_user_id)
 
+	def update_nsm_model(self):
+		frappe.utils.nestedset.update_nsm(self)
+
 	def on_update(self):
+		self.update_nsm_model()
 		if self.user_id:
 			self.update_user()
 			self.update_user_permissions()
@@ -154,13 +159,13 @@
 			throw(_("Employee cannot report to himself."))
 
 	def on_trash(self):
+		self.update_nsm_model()
 		delete_events(self.doctype, self.name)
 
 	def validate_prefered_email(self):
 		if self.prefered_contact_email and not self.get(scrub(self.prefered_contact_email)):
 			frappe.msgprint(_("Please enter " + self.prefered_contact_email))
 
-
 def get_timeline_data(doctype, name):
 	'''Return timeline for attendance'''
 	return dict(frappe.db.sql('''select unix_timestamp(attendance_date), count(*)
@@ -183,7 +188,6 @@
 
 	return ret
 
-
 def validate_employee_role(doc, method):
 	# called via User hook
 	if "Employee" in [d.role for d in doc.get("roles")]:
@@ -241,7 +245,6 @@
 
 def is_holiday(employee, date=None):
 	'''Returns True if given Employee has an holiday on the given date
-
 	:param employee: Employee `name`
 	:param date: Date to check. Will check for today if None'''
 
@@ -300,4 +303,27 @@
 		if user or email:
 			employee_emails.append(user or email)
 
-	return employee_emails
\ No newline at end of file
+	return employee_emails
+
+@frappe.whitelist()
+def get_children(doctype, parent=None, company=None, is_root=False, is_tree=False):
+	condition = ''
+
+	if is_root:
+		parent = ""
+	if parent and company and parent!=company:
+		condition = ' and reports_to = "{0}"'.format(frappe.db.escape(parent))
+	else:
+		condition = ' and ifnull(reports_to, "")=""'
+
+	employee = frappe.db.sql("""
+		select
+			name as value, employee_name as title,
+			exists(select name from `tabEmployee` where reports_to=emp.name) as expandable
+		from
+			`tabEmployee` emp
+		where company='{company}' {condition} order by name"""
+		.format(company=company, condition=condition),  as_dict=1)
+
+	# return employee
+	return employee
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee/employee_tree.js b/erpnext/hr/doctype/employee/employee_tree.js
new file mode 100644
index 0000000..5d3ec42
--- /dev/null
+++ b/erpnext/hr/doctype/employee/employee_tree.js
@@ -0,0 +1,36 @@
+frappe.treeview_settings['Employee'] = {
+	get_tree_nodes: "erpnext.hr.doctype.employee.employee.get_children",
+	filters: [
+		{
+			fieldname: "company",
+			fieldtype:"Select",
+			options: $.map(locals[':Company'], function(c) { return c.name; }).sort(),
+			label: __("Company"),
+			default: frappe.defaults.get_default('company') ? frappe.defaults.get_default('company') : ""
+		}
+	],
+	breadcrumb: "Hr",
+	disable_add_node: true,
+	get_tree_root: false,
+	toolbar: [
+		{ toggle_btn: true },
+		{
+			label:__("Edit"),
+			condition: function(node) {
+				return !node.is_root;
+			},
+			click: function(node) {
+				frappe.set_route("Form", "Employee", node.data.value);
+			}
+		}
+	],
+	menu_items: [
+		{
+			label: __("New Employee"),
+			action: function() {
+				frappe.new_doc("Employee", true);
+			},
+			condition: 'frappe.boot.user.can_create.indexOf("Employee") !== -1'
+		}
+	],
+};
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_loan_application/test_employee_loan_application.js b/erpnext/hr/doctype/employee_loan_application/test_employee_loan_application.js
index 3e2977e..d828d9a 100644
--- a/erpnext/hr/doctype/employee_loan_application/test_employee_loan_application.js
+++ b/erpnext/hr/doctype/employee_loan_application/test_employee_loan_application.js
@@ -12,7 +12,7 @@
 			employee_name = r.message.name;
 		},
 		() => {
-			frappe.tests.make('Employee Loan Application', [
+			return frappe.tests.make('Employee Loan Application', [
 				{ company: 'For Testing'},
 				{ employee: employee_name},
 				{ employee_name: 'Test Employee 1'},
diff --git a/erpnext/hr/doctype/employment_type/test_employment_type.js b/erpnext/hr/doctype/employment_type/test_employment_type.js
index 0ddd3e0..9835aab 100644
--- a/erpnext/hr/doctype/employment_type/test_employment_type.js
+++ b/erpnext/hr/doctype/employment_type/test_employment_type.js
@@ -9,7 +9,8 @@
 		() => frappe.set_route("List", "Employment Type", "List"),
 		() => frappe.new_doc("Employment Type"),
 		() => frappe.timeout(1),
-		() => frappe.click_link('Edit in full page'),
+		() => frappe.quick_entry.dialog.$wrapper.find('.edit-full').click(),
+		() => frappe.timeout(1),
 		() => cur_frm.set_value("employee_type_name", "Test Employment type"),
 		// save form
 		() => cur_frm.save(),
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.js b/erpnext/hr/doctype/expense_claim/expense_claim.js
index 0bd8911..84391b6 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.js
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.js
@@ -83,15 +83,26 @@
 
 		if (doc.docstatus===1 && doc.approval_status=="Approved") {
 			/* eslint-disable */
-			// no idea how `me` works here 
-			if (cint(doc.total_amount_reimbursed) > 0 && frappe.model.can_read("Journal Entry")) {
+			// no idea how `me` works here
+			var entry_doctype, entry_reference_doctype, entry_reference_name;
+			if(doc.__onload.make_payment_via_journal_entry){
+				entry_doctype = "Journal Entry";
+				entry_reference_doctype = "Journal Entry Account.reference_type";
+				entry_reference_name = "Journal Entry.reference_name";
+			} else {
+				entry_doctype = "Payment Entry";
+				entry_reference_doctype = "Payment Entry Reference.reference_doctype";
+				entry_reference_name = "Payment Entry Reference.reference_name";
+			}
+
+			if (cint(doc.total_amount_reimbursed) > 0 && frappe.model.can_read(entry_doctype)) {
 				cur_frm.add_custom_button(__('Bank Entries'), function() {
 					frappe.route_options = {
-						"Journal Entry Account.reference_type": me.frm.doc.doctype,
-						"Journal Entry Account.reference_name": me.frm.doc.name,
+						entry_route_doctype: me.frm.doc.doctype,
+						entry_route_name: me.frm.doc.name,
 						company: me.frm.doc.company
 					};
-					frappe.set_route("List", "Journal Entry");
+					frappe.set_route("List", entry_doctype);
 				}, __("View"));
 			}
 			/* eslint-enable */
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.json b/erpnext/hr/doctype/expense_claim/expense_claim.json
index 5708c04..ec52e71 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.json
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.json
@@ -413,6 +413,7 @@
    "no_copy": 0, 
    "oldfieldname": "employee_name", 
    "oldfieldtype": "Data", 
+   "options": "employee.employee_name", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -964,7 +965,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-07-17 15:47:23.255142", 
+ "modified": "2017-11-15 01:05:24.323540", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Expense Claim", 
diff --git a/erpnext/hr/doctype/expense_claim/test_expense_claim.py b/erpnext/hr/doctype/expense_claim/test_expense_claim.py
index b813537..9b4832a 100644
--- a/erpnext/hr/doctype/expense_claim/test_expense_claim.py
+++ b/erpnext/hr/doctype/expense_claim/test_expense_claim.py
@@ -8,6 +8,7 @@
 from erpnext.hr.doctype.expense_claim.expense_claim import make_bank_entry
 
 test_records = frappe.get_test_records('Expense Claim')
+test_dependencies = ['Employee']
 
 class TestExpenseClaim(unittest.TestCase):
 	def test_total_expense_claim_for_project(self):
diff --git a/erpnext/hr/doctype/expense_claim_type/test_expense_claim_type.js b/erpnext/hr/doctype/expense_claim_type/test_expense_claim_type.js
index 3f9d486..62234e0 100644
--- a/erpnext/hr/doctype/expense_claim_type/test_expense_claim_type.js
+++ b/erpnext/hr/doctype/expense_claim_type/test_expense_claim_type.js
@@ -12,7 +12,7 @@
 				{ accounts: [
 					[
 						{ company: 'For Testing'},
-						{ default_account: 'Round Off - FT'}
+						{ default_account: 'Rounded Off - FT'}
 					]
 				]},
 			]);
diff --git a/erpnext/hr/doctype/process_payroll/__init__.py b/erpnext/hr/doctype/payroll_employee_detail/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/process_payroll/__init__.py
copy to erpnext/hr/doctype/payroll_employee_detail/__init__.py
diff --git a/erpnext/hr/doctype/payroll_employee_detail/payroll_employee_detail.json b/erpnext/hr/doctype/payroll_employee_detail/payroll_employee_detail.json
new file mode 100644
index 0000000..953cffa
--- /dev/null
+++ b/erpnext/hr/doctype/payroll_employee_detail/payroll_employee_detail.json
@@ -0,0 +1,194 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-11-30 06:07:33.477781", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Employee Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "employee.employee_name", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "department", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "employee.department", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "designation", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Designation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "employee.designation", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-30 18:25:34.967999", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Payroll Employee Detail", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 1, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/payroll_employee_detail/payroll_employee_detail.py b/erpnext/hr/doctype/payroll_employee_detail/payroll_employee_detail.py
new file mode 100644
index 0000000..aeb11fd
--- /dev/null
+++ b/erpnext/hr/doctype/payroll_employee_detail/payroll_employee_detail.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+class PayrollEmployeeDetail(Document):
+	pass
diff --git a/erpnext/hr/doctype/process_payroll/__init__.py b/erpnext/hr/doctype/payroll_entry/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/process_payroll/__init__.py
copy to erpnext/hr/doctype/payroll_entry/__init__.py
diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.js b/erpnext/hr/doctype/payroll_entry/payroll_entry.js
new file mode 100644
index 0000000..a26283d
--- /dev/null
+++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.js
@@ -0,0 +1,164 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+var in_progress = false;
+
+frappe.ui.form.on('Payroll Entry', {
+	onload: function (frm) {
+		frm.doc.posting_date = frappe.datetime.nowdate();
+		frm.toggle_reqd(['payroll_frequency'], !frm.doc.salary_slip_based_on_timesheet);
+	},
+
+	refresh: function(frm) {
+		if (frm.doc.docstatus==1) {
+			if(frm.doc.payment_account) {
+				frm.add_custom_button("Make Bank Entry", function() {
+					make_bank_entry(frm);
+				});
+			}
+
+			frm.add_custom_button("Submit Salary Slip", function() {
+				submit_salary_slip(frm);
+			});
+
+			frm.add_custom_button("View Salary Slip", function() {
+				frappe.set_route('List', 'Salary Slip',
+					{posting_date: frm.doc.posting_date});
+			});
+		}
+	},
+
+	setup: function (frm) {
+		frm.set_query("payment_account", function () {
+			var account_types = ["Bank", "Cash"];
+			return {
+				filters: {
+					"account_type": ["in", account_types],
+					"is_group": 0,
+					"company": frm.doc.company
+				}
+			};
+		}),
+		frm.set_query("cost_center", function () {
+			return {
+				filters: {
+					"is_group": 0,
+					company: frm.doc.company
+				}
+			};
+		}),
+		frm.set_query("project", function () {
+			return {
+				filters: {
+					company: frm.doc.company
+				}
+			};
+		});
+	},
+
+	payroll_frequency: function (frm) {
+		frm.trigger("set_start_end_dates");
+		frm.set_value('employees', []);
+	},
+
+	company: function (frm) {
+		frm.set_value('employees', []);
+	},
+
+	department: function (frm) {
+		frm.set_value('employees', []);
+	},
+
+	designation: function (frm) {
+		frm.set_value('employees', []);
+	},
+
+	branch: function (frm) {
+		frm.set_value('employees', []);
+	},
+
+	start_date: function (frm) {
+		if(!in_progress && frm.doc.start_date){
+			frm.trigger("set_end_date");
+		}else{
+			// reset flag
+			in_progress = false;
+		}
+		frm.set_value('employees', []);
+	},
+
+	project: function (frm) {
+		frm.set_value('employees', []);
+	},
+
+	salary_slip_based_on_timesheet: function (frm) {
+		frm.toggle_reqd(['payroll_frequency'], !frm.doc.salary_slip_based_on_timesheet);
+	},
+
+	set_start_end_dates: function (frm) {
+		if (!frm.doc.salary_slip_based_on_timesheet) {
+			frappe.call({
+				method: 'erpnext.hr.doctype.payroll_entry.payroll_entry.get_start_end_dates',
+				args: {
+					payroll_frequency: frm.doc.payroll_frequency,
+					start_date: frm.doc.posting_date
+				},
+				callback: function (r) {
+					if (r.message) {
+						in_progress = true;
+						frm.set_value('start_date', r.message.start_date);
+						frm.set_value('end_date', r.message.end_date);
+					}
+				}
+			});
+		}
+	},
+
+	set_end_date: function(frm){
+		frappe.call({
+			method: 'erpnext.hr.doctype.payroll_entry.payroll_entry.get_end_date',
+			args: {
+				frequency: frm.doc.payroll_frequency,
+				start_date: frm.doc.start_date
+			},
+			callback: function (r) {
+				if (r.message) {
+					frm.set_value('end_date', r.message.end_date);
+				}
+			}
+		});
+	},
+});
+
+// Submit salary slips
+
+let submit_salary_slip = function (frm) {
+	var doc = frm.doc;
+	return $c('runserverobj', { 'method': 'submit_salary_slips', 'docs': doc });
+};
+
+cur_frm.cscript.get_employee_details = function (doc) {
+	var callback = function (r) {
+		if (r.docs[0].employees){
+			cur_frm.refresh_field('employees');
+		}
+	};
+	return $c('runserverobj', { 'method': 'fill_employee_details', 'docs': doc }, callback);
+};
+
+let make_bank_entry = function (frm) {
+	var doc = frm.doc;
+	if (doc.company && doc.start_date && doc.end_date) {
+		return frappe.call({
+			doc: cur_frm.doc,
+			method: "make_payment_entry",
+			callback: function (r) {
+				if (r.message)
+					var doc = frappe.model.sync(r.message)[0];
+				frappe.set_route("Form", doc.doctype, doc.name);
+			}
+		});
+	} else {
+		frappe.msgprint(__("Company, From Date and To Date is mandatory"));
+	}
+};
diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.json b/erpnext/hr/doctype/payroll_entry/payroll_entry.json
new file mode 100644
index 0000000..5cd1e53
--- /dev/null
+++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.json
@@ -0,0 +1,917 @@
+{
+ "allow_copy": 1, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "Payroll .####", 
+ "beta": 0, 
+ "creation": "2017-10-23 15:22:29.291323", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Other", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break0", 
+   "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": "Select Employees", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break0", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "50%"
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 1, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Today", 
+   "fieldname": "posting_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Posting Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "depends_on": "eval:doc.salary_slip_based_on_timesheet == 0", 
+   "fieldname": "payroll_frequency", 
+   "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": "Payroll Frequency", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nMonthly\nFortnightly\nBimonthly\nWeekly\nDaily", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "50%"
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "branch", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Branch", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Branch", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Department", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "designation", 
+   "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": "Designation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Designation", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_8", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "get_employee_details", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Get Employee Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employees", 
+   "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": "Employees", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Payroll Employee Detail", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_12", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "salary_slip_based_on_timesheet", 
+   "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": "Salary Slip Based on Timesheet", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "select_payroll_period", 
+   "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": "Select Payroll Period", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "fieldname": "start_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Start Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_11", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "fieldname": "end_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "End Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_16", 
+   "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": "Accounts", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cost_center", 
+   "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": "Cost Center", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_18", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "project", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Project", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Project", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "50%"
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "account", 
+   "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": "Payment Entry", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Select Payment Account to make Bank Entry", 
+   "fieldname": "payment_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payment Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break2", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "activity_log", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Activity Log", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Payroll Entry", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "fa fa-cog", 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-06 19:47:03.235021", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Payroll Entry", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.py b/erpnext/hr/doctype/payroll_entry/payroll_entry.py
new file mode 100644
index 0000000..2f5fae4
--- /dev/null
+++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.py
@@ -0,0 +1,464 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from dateutil.relativedelta import relativedelta
+from frappe.utils import cint, flt, nowdate, add_days, getdate, fmt_money, add_to_date, DATE_FORMAT
+from frappe import _
+from erpnext.accounts.utils import get_fiscal_year
+
+
+class PayrollEntry(Document):
+
+	def on_submit(self):
+		self.create_salary_slips()
+
+	def get_emp_list(self):
+		"""
+			Returns list of active employees based on selected criteria
+			and for which salary structure exists
+		"""
+		cond = self.get_filter_condition()
+		cond += self.get_joining_releiving_condition()
+
+		condition = ''
+		if self.payroll_frequency:
+			condition = """and payroll_frequency = '%(payroll_frequency)s'"""% {"payroll_frequency": self.payroll_frequency}
+
+		sal_struct = frappe.db.sql("""
+				select
+					name from `tabSalary Structure`
+				where
+					docstatus != 2 and
+					is_active = 'Yes'
+					and company = %(company)s and
+					ifnull(salary_slip_based_on_timesheet,0) = %(salary_slip_based_on_timesheet)s
+					{condition}""".format(condition=condition),
+				{"company": self.company, "salary_slip_based_on_timesheet":self.salary_slip_based_on_timesheet})
+
+		if sal_struct:
+			cond += "and t2.parent IN %(sal_struct)s "
+			emp_list = frappe.db.sql("""
+				select
+					t1.name as employee, t1.employee_name, t1.department, t1.designation
+				from
+					`tabEmployee` t1, `tabSalary Structure Employee` t2
+				where
+					t1.docstatus!=2
+					and t1.name = t2.employee
+			%s """% cond, {"sal_struct": sal_struct}, as_dict=True)
+			return emp_list
+
+	def fill_employee_details(self):
+		self.set('employees', [])
+		employees = self.get_emp_list()
+		if not employees:
+			frappe.throw(_("No employees for the mentioned criteria"))
+
+		for d in employees:
+			self.append('employees', d)
+
+	def get_filter_condition(self):
+		self.check_mandatory()
+
+		cond = ''
+		for f in ['company', 'branch', 'department', 'designation']:
+			if self.get(f):
+				cond += " and t1." + f + " = '" + self.get(f).replace("'", "\'") + "'"
+
+		return cond
+
+	def get_joining_releiving_condition(self):
+		cond = """
+			and ifnull(t1.date_of_joining, '0000-00-00') <= '%(end_date)s'
+			and ifnull(t1.relieving_date, '2199-12-31') >= '%(start_date)s'
+		""" % {"start_date": self.start_date, "end_date": self.end_date}
+		return cond
+
+	def check_mandatory(self):
+		for fieldname in ['company', 'start_date', 'end_date']:
+			if not self.get(fieldname):
+				frappe.throw(_("Please set {0}").format(self.meta.get_label(fieldname)))
+
+	def create_salary_slips(self):
+		"""
+			Creates salary slip for selected employees if already not created
+		"""
+		self.check_permission('write')
+		self.created = 1;
+		emp_list = self.get_emp_list()
+		ss_list = []
+		if emp_list:
+			for emp in emp_list:
+				if not frappe.db.sql("""select
+						name from `tabSalary Slip`
+					where
+						docstatus!= 2 and
+						employee = %s and
+						start_date >= %s and
+						end_date <= %s and
+						company = %s
+						""", (emp['employee'], self.start_date, self.end_date, self.company)):
+					ss = frappe.get_doc({
+						"doctype": "Salary Slip",
+						"salary_slip_based_on_timesheet": self.salary_slip_based_on_timesheet,
+						"payroll_frequency": self.payroll_frequency,
+						"start_date": self.start_date,
+						"end_date": self.end_date,
+						"employee": emp['employee'],
+						"employee_name": frappe.get_value("Employee", {"name":emp['employee']}, "employee_name"),
+						"company": self.company,
+						"posting_date": self.posting_date
+					})
+					ss.insert()
+					ss_dict = {}
+					ss_dict["Employee Name"] = ss.employee_name
+					ss_dict["Total Pay"] = fmt_money(ss.rounded_total,currency = frappe.defaults.get_global_default("currency"))
+					ss_dict["Salary Slip"] = format_as_links(ss.name)[0]
+					ss_list.append(ss_dict)
+		return create_log(ss_list)
+
+	def get_sal_slip_list(self, ss_status, as_dict=False):
+		"""
+			Returns list of salary slips based on selected criteria
+		"""
+		cond = self.get_filter_condition()
+
+		ss_list = frappe.db.sql("""
+			select t1.name, t1.salary_structure from `tabSalary Slip` t1
+			where t1.docstatus = %s and t1.start_date >= %s and t1.end_date <= %s
+			and (t1.journal_entry is null or t1.journal_entry = "") and ifnull(salary_slip_based_on_timesheet,0) = %s %s
+		""" % ('%s', '%s', '%s','%s', cond), (ss_status, self.start_date, self.end_date, self.salary_slip_based_on_timesheet), as_dict=as_dict)
+		return ss_list
+
+	def submit_salary_slips(self):
+		"""
+			Submit all salary slips based on selected criteria
+		"""
+		self.check_permission('write')
+
+		# self.create_salary_slips()
+
+		jv_name = ""
+		ss_list = self.get_sal_slip_list(ss_status=0)
+		submitted_ss = []
+		not_submitted_ss = []
+		for ss in ss_list:
+			ss_obj = frappe.get_doc("Salary Slip",ss[0])
+			ss_dict = {}
+			ss_dict["Employee Name"] = ss_obj.employee_name
+			ss_dict["Total Pay"] = fmt_money(ss_obj.net_pay,
+				currency = frappe.defaults.get_global_default("currency"))
+			ss_dict["Salary Slip"] = format_as_links(ss_obj.name)[0]
+
+			if ss_obj.net_pay<0:
+				not_submitted_ss.append(ss_dict)
+			else:
+				try:
+					ss_obj.submit()
+					submitted_ss.append(ss_dict)
+
+				except frappe.ValidationError:
+					not_submitted_ss.append(ss_dict)
+		if submitted_ss:
+			jv_name = self.make_accural_jv_entry()
+			frappe.msgprint(_("Salary Slip submitted for period from {0} to {1}")
+				.format(ss_obj.start_date, ss_obj.end_date))
+
+		return create_submit_log(submitted_ss, not_submitted_ss, jv_name)
+
+	def get_loan_details(self):
+		"""
+			Get loan details from submitted salary slip based on selected criteria
+		"""
+		cond = self.get_filter_condition()
+		return frappe.db.sql(""" select eld.employee_loan_account,
+				eld.interest_income_account, eld.principal_amount, eld.interest_amount, eld.total_payment
+			from
+				`tabSalary Slip` t1, `tabSalary Slip Loan` eld
+			where
+				t1.docstatus = 1 and t1.name = eld.parent and start_date >= %s and end_date <= %s %s
+			""" % ('%s', '%s', cond), (self.start_date, self.end_date), as_dict=True) or []
+
+	def get_total_salary_amount(self):
+		"""
+			Get total salary amount from submitted salary slip based on selected criteria
+		"""
+		cond = self.get_filter_condition()
+		totals = frappe.db.sql(""" select sum(rounded_total) as rounded_total from `tabSalary Slip` t1
+			where t1.docstatus = 1 and start_date >= %s and end_date <= %s %s
+			""" % ('%s', '%s', cond), (self.start_date, self.end_date), as_dict=True)
+		return totals and totals[0] or None
+
+	def get_salary_component_account(self, salary_component):
+		account = frappe.db.get_value("Salary Component Account",
+			{"parent": salary_component, "company": self.company}, "default_account")
+
+		if not account:
+			frappe.throw(_("Please set default account in Salary Component {0}")
+				.format(salary_component))
+
+		return account
+
+	def get_salary_components(self, component_type):
+		salary_slips = self.get_sal_slip_list(ss_status = 1, as_dict = True)
+		if salary_slips:
+			salary_components = frappe.db.sql("""select salary_component, amount, parentfield
+				from `tabSalary Detail` where parentfield = '%s' and parent in (%s)""" %
+				(component_type, ', '.join(['%s']*len(salary_slips))), tuple([d.name for d in salary_slips]), as_dict=True)
+			return salary_components
+
+	def get_salary_component_total(self, component_type = None):
+		salary_components = self.get_salary_components(component_type)
+		if salary_components:
+			component_dict = {}
+			for item in salary_components:
+				component_dict[item['salary_component']] = component_dict.get(item['salary_component'], 0) + item['amount']
+			account_details = self.get_account(component_dict = component_dict)
+			return account_details
+
+	def get_account(self, component_dict = None):
+		account_dict = {}
+		for s, a in component_dict.items():
+			account = self.get_salary_component_account(s)
+			account_dict[account] = account_dict.get(account, 0) + a
+		return account_dict
+
+	def get_default_payroll_payable_account(self):
+		payroll_payable_account = frappe.db.get_value("Company",
+			{"company_name": self.company}, "default_payroll_payable_account")
+
+		if not payroll_payable_account:
+			frappe.throw(_("Please set Default Payroll Payable Account in Company {0}")
+				.format(self.company))
+
+		return payroll_payable_account
+
+	def make_accural_jv_entry(self):
+		self.check_permission('write')
+		earnings = self.get_salary_component_total(component_type = "earnings") or {}
+		deductions = self.get_salary_component_total(component_type = "deductions") or {}
+		default_payroll_payable_account = self.get_default_payroll_payable_account()
+		loan_details = self.get_loan_details()
+		jv_name = ""
+		precision = frappe.get_precision("Journal Entry Account", "debit_in_account_currency")
+
+		if earnings or deductions:
+			journal_entry = frappe.new_doc('Journal Entry')
+			journal_entry.voucher_type = 'Journal Entry'
+			journal_entry.user_remark = _('Accural Journal Entry for salaries from {0} to {1}')\
+				.format(self.start_date, self.end_date)
+			journal_entry.company = self.company
+			journal_entry.posting_date = nowdate()
+
+			accounts = []
+			payable_amount = 0
+
+			# Earnings
+			for acc, amount in earnings.items():
+				payable_amount += flt(amount, precision)
+				accounts.append({
+						"account": acc,
+						"debit_in_account_currency": flt(amount, precision),
+						"cost_center": self.cost_center,
+						"project": self.project
+					})
+
+			# Deductions
+			for acc, amount in deductions.items():
+				payable_amount -= flt(amount, precision)
+				accounts.append({
+						"account": acc,
+						"credit_in_account_currency": flt(amount, precision),
+						"cost_center": self.cost_center,
+						"project": self.project
+					})
+
+			# Employee loan
+			for data in loan_details:
+				accounts.append({
+						"account": data.employee_loan_account,
+						"credit_in_account_currency": data.principal_amount
+					})
+				accounts.append({
+						"account": data.interest_income_account,
+						"credit_in_account_currency": data.interest_amount,
+						"cost_center": self.cost_center,
+						"project": self.project
+					})
+				payable_amount -= flt(data.total_payment, precision)
+
+			# Payable amount
+			accounts.append({
+				"account": default_payroll_payable_account,
+				"credit_in_account_currency": flt(payable_amount, precision)
+			})
+
+			journal_entry.set("accounts", accounts)
+			journal_entry.save()
+
+			try:
+				journal_entry.submit()
+				jv_name = journal_entry.name
+				self.update_salary_slip_status(jv_name = jv_name)
+			except Exception as e:
+				frappe.msgprint(e)
+
+		return jv_name
+
+	def make_payment_entry(self):
+		self.check_permission('write')
+		total_salary_amount = self.get_total_salary_amount()
+		default_payroll_payable_account = self.get_default_payroll_payable_account()
+		precision = frappe.get_precision("Journal Entry Account", "debit_in_account_currency")
+
+		if total_salary_amount and total_salary_amount.rounded_total:
+			journal_entry = frappe.new_doc('Journal Entry')
+			journal_entry.voucher_type = 'Bank Entry'
+			journal_entry.user_remark = _('Payment of salary from {0} to {1}')\
+				.format(self.start_date, self.end_date)
+			journal_entry.company = self.company
+			journal_entry.posting_date = nowdate()
+
+			payment_amount = flt(total_salary_amount.rounded_total, precision)
+
+			journal_entry.set("accounts", [
+				{
+					"account": self.payment_account,
+					"credit_in_account_currency": payment_amount
+				},
+				{
+					"account": default_payroll_payable_account,
+					"debit_in_account_currency": payment_amount,
+					"reference_type": self.doctype,
+					"reference_name": self.name
+				}
+			])
+			return journal_entry.as_dict()
+		else:
+			frappe.msgprint(
+				_("There are no submitted Salary Slips to process."),
+				title="Error", indicator="red"
+			)
+
+	def update_salary_slip_status(self, jv_name = None):
+		ss_list = self.get_sal_slip_list(ss_status=1)
+		for ss in ss_list:
+			ss_obj = frappe.get_doc("Salary Slip",ss[0])
+			frappe.db.set_value("Salary Slip", ss_obj.name, "status", "Paid")
+			frappe.db.set_value("Salary Slip", ss_obj.name, "journal_entry", jv_name)
+
+	def set_start_end_dates(self):
+		self.update(get_start_end_dates(self.payroll_frequency,
+			self.start_date or self.posting_date, self.company))
+
+
+@frappe.whitelist()
+def get_start_end_dates(payroll_frequency, start_date=None, company=None):
+	'''Returns dict of start and end dates for given payroll frequency based on start_date'''
+
+	if payroll_frequency == "Monthly" or payroll_frequency == "Bimonthly" or payroll_frequency == "":
+		fiscal_year = get_fiscal_year(start_date, company=company)[0]
+		month = "%02d" % getdate(start_date).month
+		m = get_month_details(fiscal_year, month)
+		if payroll_frequency == "Bimonthly":
+			if getdate(start_date).day <= 15:
+				start_date = m['month_start_date']
+				end_date = m['month_mid_end_date']
+			else:
+				start_date = m['month_mid_start_date']
+				end_date = m['month_end_date']
+		else:
+			start_date = m['month_start_date']
+			end_date = m['month_end_date']
+
+	if payroll_frequency == "Weekly":
+		end_date = add_days(start_date, 6)
+
+	if payroll_frequency == "Fortnightly":
+		end_date = add_days(start_date, 13)
+
+	if payroll_frequency == "Daily":
+		end_date = start_date
+
+	return frappe._dict({
+		'start_date': start_date, 'end_date': end_date
+	})
+
+
+def get_frequency_kwargs(frequency_name):
+	frequency_dict = {
+		'monthly': {'months': 1},
+		'fortnightly': {'days': 14},
+		'weekly': {'days': 7},
+		'daily': {'days': 1}
+	}
+	return frequency_dict.get(frequency_name)
+
+
+@frappe.whitelist()
+def get_end_date(start_date, frequency):
+	start_date = getdate(start_date)
+	frequency = frequency.lower() if frequency else 'monthly'
+	kwargs = get_frequency_kwargs(frequency) if frequency != 'bimonthly' else get_frequency_kwargs('monthly')
+
+	# weekly, fortnightly and daily intervals have fixed days so no problems
+	end_date = add_to_date(start_date, **kwargs) - relativedelta(days=1)
+	if frequency != 'bimonthly':
+		return dict(end_date=end_date.strftime(DATE_FORMAT))
+
+	else:
+		return dict(end_date='')
+
+
+def get_month_details(year, month):
+	ysd = frappe.db.get_value("Fiscal Year", year, "year_start_date")
+	if ysd:
+		import calendar, datetime
+		diff_mnt = cint(month)-cint(ysd.month)
+		if diff_mnt<0:
+			diff_mnt = 12-int(ysd.month)+cint(month)
+		msd = ysd + relativedelta(months=diff_mnt) # month start date
+		month_days = cint(calendar.monthrange(cint(msd.year) ,cint(month))[1]) # days in month
+		mid_start = datetime.date(msd.year, cint(month), 16) # month mid start date
+		mid_end = datetime.date(msd.year, cint(month), 15) # month mid end date
+		med = datetime.date(msd.year, cint(month), month_days) # month end date
+		return frappe._dict({
+			'year': msd.year,
+			'month_start_date': msd,
+			'month_end_date': med,
+			'month_mid_start_date': mid_start,
+			'month_mid_end_date': mid_end,
+			'month_days': month_days
+		})
+	else:
+		frappe.throw(_("Fiscal Year {0} not found").format(year))
+
+
+@frappe.whitelist()
+def create_log(ss_list):
+	if not ss_list:
+		frappe.throw(
+			_("There's no employee for the given criteria. Check that Salary Slips have not already been created."),
+			title='Error'
+		)
+	return ss_list
+
+
+def format_as_links(salary_slip):
+	return ['<a href="#Form/Salary Slip/{0}">{0}</a>'.format(salary_slip)]
+
+
+def create_submit_log(submitted_ss, not_submitted_ss, jv_name):
+
+	if not submitted_ss and not not_submitted_ss:
+		frappe.msgprint("No salary slip found to submit for the above selected criteria OR salary slip already submitted")
+
+	if not_submitted_ss:
+		frappe.msgprint("Could not submit any Salary Slip <br>\
+			Possible reasons: <br>\
+			1. Net pay is less than 0. <br>\
+			2. Company Email Address specified in employee master is not valid. <br>")
\ No newline at end of file
diff --git a/erpnext/hr/doctype/payroll_entry/test_payroll_entry.js b/erpnext/hr/doctype/payroll_entry/test_payroll_entry.js
new file mode 100644
index 0000000..c109aab
--- /dev/null
+++ b/erpnext/hr/doctype/payroll_entry/test_payroll_entry.js
@@ -0,0 +1,61 @@
+QUnit.module('HR');
+
+QUnit.test("test: Payroll Entry", function (assert) {
+	assert.expect(5);
+	let done = assert.async();
+	let employees, docname;
+
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make('Payroll Entry', [
+				{company: 'For Testing'},
+				{posting_date: frappe.datetime.add_days(frappe.datetime.nowdate(), 0)},
+				{payroll_frequency: 'Monthly'},
+				{cost_center: 'Main - '+frappe.get_abbr(frappe.defaults.get_default("Company"))}
+			]);
+		},
+
+		() => frappe.timeout(1),
+		() => {
+			assert.equal(cur_frm.doc.company, 'For Testing');
+			assert.equal(cur_frm.doc.posting_date, frappe.datetime.add_days(frappe.datetime.nowdate(), 0));
+			assert.equal(cur_frm.doc.cost_center, 'Main - FT');
+		},
+		() => frappe.click_button('Get Employee Details'),
+		() => {
+			employees = cur_frm.doc.employees.length;
+			docname = cur_frm.doc.name;
+		},
+
+		() => frappe.click_button('Submit'),
+		() => frappe.timeout(1),
+		() => frappe.click_button('Yes'),
+		() => frappe.timeout(2),
+
+		() => frappe.click_button('View Salary Slip'),
+		() => frappe.timeout(2),
+		() => assert.equal(cur_list.data.length, employees),
+
+		() => frappe.set_route('Form', 'Payroll Entry', docname),
+		() => frappe.timeout(2),
+		() => frappe.click_button('Submit Salary Slip'),
+		() => frappe.timeout(3),
+
+		() => frappe.click_button('Close'),
+		() => frappe.timeout(1),
+
+		() => frappe.click_button('View Salary Slip'),
+		() => frappe.timeout(2),
+		() => {
+			let count = 0;
+			for(var i = 0; i < employees; i++) {
+				if(cur_list.data[i].docstatus == 1){
+					count++;
+				}
+			}
+			assert.equal(count, employees, "Salary Slip submitted for all employees");
+		},
+
+		() => done()
+	]);
+});
diff --git a/erpnext/hr/doctype/payroll_entry/test_payroll_entry.py b/erpnext/hr/doctype/payroll_entry/test_payroll_entry.py
new file mode 100644
index 0000000..21b0d58
--- /dev/null
+++ b/erpnext/hr/doctype/payroll_entry/test_payroll_entry.py
@@ -0,0 +1,191 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
+import unittest
+import erpnext
+import frappe
+from dateutil.relativedelta import relativedelta
+from erpnext.accounts.utils import get_fiscal_year, getdate, nowdate
+from erpnext.hr.doctype.payroll_entry.payroll_entry import get_start_end_dates, get_end_date
+
+class TestPayrollEntry(unittest.TestCase):
+	def test_payroll_entry(self): # pylint: disable=no-self-use
+
+		for data in frappe.get_all('Salary Component', fields = ["name"]):
+			if not frappe.db.get_value('Salary Component Account',
+				{'parent': data.name, 'company': erpnext.get_default_company()}, 'name'):
+				get_salary_component_account(data.name)
+
+		if not frappe.db.get_value("Salary Slip", {"start_date": "2016-11-01", "end_date": "2016-11-30"}):
+			make_payroll_entry()
+
+	def test_get_end_date(self):
+		self.assertEqual(get_end_date('2017-01-01', 'monthly'), {'end_date': '2017-01-31'})
+		self.assertEqual(get_end_date('2017-02-01', 'monthly'), {'end_date': '2017-02-28'})
+		self.assertEqual(get_end_date('2017-02-01', 'fortnightly'), {'end_date': '2017-02-14'})
+		self.assertEqual(get_end_date('2017-02-01', 'bimonthly'), {'end_date': ''})
+		self.assertEqual(get_end_date('2017-01-01', 'bimonthly'), {'end_date': ''})
+		self.assertEqual(get_end_date('2020-02-15', 'bimonthly'), {'end_date': ''})
+		self.assertEqual(get_end_date('2017-02-15', 'monthly'), {'end_date': '2017-03-14'})
+		self.assertEqual(get_end_date('2017-02-15', 'daily'), {'end_date': '2017-02-15'})
+
+	def test_employee_loan(self):
+		from erpnext.hr.doctype.salary_structure.test_salary_structure import (make_employee,
+			make_salary_structure)
+		from erpnext.hr.doctype.employee_loan.test_employee_loan import create_employee_loan
+
+		branch = "Test Employee Branch"
+		employee = make_employee("test_employee@loan.com")
+		company = erpnext.get_default_company()
+		holiday_list = make_holiday("test holiday for loan")
+
+		if not frappe.db.exists('Salary Component', 'Basic Salary'):
+			frappe.get_doc({
+				'doctype': 'Salary Component',
+				'salary_component': 'Basic Salary',
+				'salary_component_abbr': 'BS',
+				'type': 'Earning',
+				'accounts': [{
+					'company': company,
+					'default_account': frappe.db.get_value('Account',
+						{'company': company, 'root_type': 'Expense', 'account_type': ''}, 'name')
+				}]
+			}).insert()
+
+		if not frappe.db.get_value('Salary Component Account',
+			{'parent': 'Basic Salary', 'company': company}):
+			salary_component = frappe.get_doc('Salary Component', 'Basic Salary')
+			salary_component.append('accounts', {
+				'company': company,
+				'default_account': 'Salary - WP'
+			})
+
+		company_doc = frappe.get_doc('Company', company)
+		if not company_doc.default_payroll_payable_account:
+			company_doc.default_payroll_payable_account = frappe.db.get_value('Account',
+				{'company': company, 'root_type': 'Liability', 'account_type': ''}, 'name')
+			company_doc.save()
+
+		if not frappe.db.exists('Branch', branch):
+			frappe.get_doc({
+				'doctype': 'Branch',
+				'branch': branch
+			}).insert()
+
+		employee_doc = frappe.get_doc('Employee', employee)
+		employee_doc.branch = branch
+		employee_doc.holiday_list = holiday_list
+		employee_doc.save()
+
+		employee_loan = create_employee_loan(employee,
+			"Personal Loan", 280000, "Repay Over Number of Periods", 20)
+		employee_loan.repay_from_salary = 1
+		employee_loan.submit()
+
+		salary_strcture = "Test Salary Structure for Loan"
+		if not frappe.db.exists('Salary Structure', salary_strcture):
+			salary_strcture = make_salary_structure(salary_strcture, [{
+				'employee': employee,
+				'from_date': '2017-01-01',
+				'base': 30000
+			}])
+
+			salary_strcture = frappe.get_doc('Salary Structure', salary_strcture)
+			salary_strcture.set('earnings', [{
+				'salary_component': 'Basic Salary',
+				'abbr': 'BS',
+				'amount_based_on_formula':1,
+				'formula': 'base*.5'
+			}])
+			salary_strcture.save()
+
+		dates = get_start_end_dates('Monthly', nowdate())
+		make_payroll_entry(start_date=dates.start_date,
+			end_date=dates.end_date, branch=branch)
+
+		name = frappe.db.get_value('Salary Slip',
+			{'posting_date': nowdate(), 'employee': employee}, 'name')
+
+		salary_slip = frappe.get_doc('Salary Slip', name)
+		for row in salary_slip.loans:
+			if row.employee_loan == employee_loan.name:
+				interest_amount = (280000 * 8.4)/(12*100)
+				principal_amount = employee_loan.monthly_repayment_amount - interest_amount
+				self.assertEqual(row.interest_amount, interest_amount)
+				self.assertEqual(row.principal_amount, principal_amount)
+				self.assertEqual(row.total_payment,
+					interest_amount + principal_amount)
+
+		if salary_slip.docstatus == 0:
+			frappe.delete_doc('Salary Slip', name)
+
+		employee_loan.cancel()
+		frappe.delete_doc('Employee Loan', employee_loan.name)
+
+def get_salary_component_account(sal_comp):
+	company = erpnext.get_default_company()
+	sal_comp = frappe.get_doc("Salary Component", sal_comp)
+	sc = sal_comp.append("accounts")
+	sc.company = company
+	sc.default_account = create_account(company)
+
+def create_account(company):
+	salary_account = frappe.db.get_value("Account", "Salary - " + frappe.db.get_value('Company', company, 'abbr'))
+	if not salary_account:
+		frappe.get_doc({
+		"doctype": "Account",
+		"account_name": "Salary",
+		"parent_account": "Indirect Expenses - " + frappe.db.get_value('Company', company, 'abbr'),
+		"company": company
+		}).insert()
+	return salary_account
+
+def make_payroll_entry(**args):
+	args = frappe._dict(args)
+
+	payroll_entry = frappe.new_doc("Payroll Entry")
+	payroll_entry.company = erpnext.get_default_company()
+	payroll_entry.start_date = args.start_date or "2016-11-01"
+	payroll_entry.end_date = args.end_date or "2016-11-30"
+	payroll_entry.payment_account = get_payment_account()
+	payroll_entry.posting_date = nowdate()
+	payroll_entry.payroll_frequency = "Monthly"
+	payroll_entry.branch = args.branch or None
+	payroll_entry.create_salary_slips()
+	payroll_entry.submit_salary_slips()
+	if payroll_entry.get_sal_slip_list(ss_status = 1):
+		payroll_entry.make_payment_entry()
+
+	return payroll_entry
+
+def get_payment_account():
+	return frappe.get_value('Account',
+		{'account_type': 'Cash', 'company': erpnext.get_default_company(),'is_group':0}, "name")
+
+def make_holiday(holiday_list_name):
+	if not frappe.db.exists('Holiday List', holiday_list_name):
+		current_fiscal_year = get_fiscal_year(nowdate(), as_dict=True)
+		dt = getdate(nowdate())
+
+		new_year = dt + relativedelta(month=01, day=01, year=dt.year)
+		republic_day = dt + relativedelta(month=01, day=26, year=dt.year)
+		test_holiday = dt + relativedelta(month=02, day=02, year=dt.year)
+
+		frappe.get_doc({
+			'doctype': 'Holiday List',
+			'from_date': current_fiscal_year.year_start_date,
+			'to_date': current_fiscal_year.year_end_date,
+			'holiday_list_name': holiday_list_name,
+			'holidays': [{
+				'holiday_date': new_year,
+				'description': 'New Year'
+			}, {
+				'holiday_date': republic_day,
+				'description': 'Republic Day'
+			}, {
+				'holiday_date': test_holiday,
+				'description': 'Test Holiday'
+			}]
+		}).insert()
+
+	return holiday_list_name
diff --git a/erpnext/hr/doctype/payroll_entry/test_set_salary_components.js b/erpnext/hr/doctype/payroll_entry/test_set_salary_components.js
new file mode 100644
index 0000000..8ff5515
--- /dev/null
+++ b/erpnext/hr/doctype/payroll_entry/test_set_salary_components.js
@@ -0,0 +1,61 @@
+QUnit.module('HR');
+
+QUnit.test("test: Set Salary Components", function (assert) {
+	assert.expect(5);
+	let done = assert.async();
+
+	frappe.run_serially([
+		() => frappe.set_route('Form', 'Salary Component', 'Leave Encashment'),
+		() => {
+			var row = frappe.model.add_child(cur_frm.doc, "Salary Component Account", "accounts");
+			row.company = 'For Testing';
+			row.default_account = 'Salary - FT';
+		},
+
+		() => cur_frm.save(),
+		() => frappe.timeout(2),
+		() => assert.equal(cur_frm.doc.accounts[0].default_account, 'Salary - FT'),
+
+		() => frappe.set_route('Form', 'Salary Component', 'Basic'),
+		() => {
+			var row = frappe.model.add_child(cur_frm.doc, "Salary Component Account", "accounts");
+			row.company = 'For Testing';
+			row.default_account = 'Salary - FT';
+		},
+
+		() => cur_frm.save(),
+		() => frappe.timeout(2),
+		() => assert.equal(cur_frm.doc.accounts[0].default_account, 'Salary - FT'),
+
+		() => frappe.set_route('Form', 'Salary Component', 'Income Tax'),
+		() => {
+			var row = frappe.model.add_child(cur_frm.doc, "Salary Component Account", "accounts");
+			row.company = 'For Testing';
+			row.default_account = 'Salary - FT';
+		},
+
+		() => cur_frm.save(),
+		() => frappe.timeout(2),
+		() => assert.equal(cur_frm.doc.accounts[0].default_account, 'Salary - FT'),
+
+		() => frappe.set_route('Form', 'Salary Component', 'Arrear'),
+		() => {
+			var row = frappe.model.add_child(cur_frm.doc, "Salary Component Account", "accounts");
+			row.company = 'For Testing';
+			row.default_account = 'Salary - FT';
+		},
+
+		() => cur_frm.save(),
+		() => frappe.timeout(2),
+		() => assert.equal(cur_frm.doc.accounts[0].default_account, 'Salary - FT'),
+
+		() => frappe.set_route('Form', 'Company', 'For Testing'),
+		() => cur_frm.set_value('default_payroll_payable_account', 'Payroll Payable - FT'),
+		() => cur_frm.save(),
+		() => frappe.timeout(2),
+		() => assert.equal(cur_frm.doc.default_payroll_payable_account, 'Payroll Payable - FT'),
+
+		() => done()
+
+	]);
+});
diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.js b/erpnext/hr/doctype/process_payroll/process_payroll.js
deleted file mode 100644
index a9ad429..0000000
--- a/erpnext/hr/doctype/process_payroll/process_payroll.js
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-var in_progress = false;
-
-frappe.ui.form.on("Process Payroll", {
-	onload: function (frm) {
-		frm.doc.posting_date = frappe.datetime.nowdate();
-		frm.doc.start_date = '';
-		frm.doc.end_date = '';
-		frm.doc.payroll_frequency = '';
-		frm.toggle_reqd(['payroll_frequency'], !frm.doc.salary_slip_based_on_timesheet);
-	},
-
-	setup: function (frm) {
-		frm.set_query("payment_account", function () {
-			var account_types = ["Bank", "Cash"];
-			return {
-				filters: {
-					"account_type": ["in", account_types],
-					"is_group": 0,
-					"company": frm.doc.company
-				}
-			}
-		}),
-			frm.set_query("cost_center", function () {
-				return {
-					filters: {
-						"is_group": 0,
-						company: frm.doc.company
-					}
-				}
-			}),
-			frm.set_query("project", function () {
-				return {
-					filters: {
-						company: frm.doc.company
-					}
-				}
-			})
-	},
-
-	refresh: function (frm) {
-		frm.disable_save();
-	},
-
-	payroll_frequency: function (frm) {
-		frm.trigger("set_start_end_dates");
-	},
-
-	start_date: function (frm) {
-		if(!in_progress && frm.doc.start_date){
-			frm.trigger("set_end_date");
-		}else{
-			// reset flag
-			in_progress = false
-		}
-	},
-
-	salary_slip_based_on_timesheet: function (frm) {
-		frm.toggle_reqd(['payroll_frequency'], !frm.doc.salary_slip_based_on_timesheet);
-	},
-
-	payment_account: function (frm) {
-		frm.toggle_display(['make_bank_entry'], (frm.doc.payment_account != "" && frm.doc.payment_account != "undefined"));
-	},
-
-	set_start_end_dates: function (frm) {
-		if (!frm.doc.salary_slip_based_on_timesheet) {
-			frappe.call({
-				method: 'erpnext.hr.doctype.process_payroll.process_payroll.get_start_end_dates',
-				args: {
-					payroll_frequency: frm.doc.payroll_frequency,
-					start_date: frm.doc.posting_date
-				},
-				callback: function (r) {
-					if (r.message) {
-						in_progress = true;
-						frm.set_value('start_date', r.message.start_date);
-						frm.set_value('end_date', r.message.end_date);
-					}
-				}
-			})
-		}
-	},
-
-	set_end_date: function(frm){
-		frappe.call({
-			method: 'erpnext.hr.doctype.process_payroll.process_payroll.get_end_date',
-			args: {
-				frequency: frm.doc.payroll_frequency,
-				start_date: frm.doc.start_date
-			},
-			callback: function (r) {
-				if (r.message) {
-					frm.set_value('end_date', r.message.end_date);
-				}
-			}
-		})
-	}
-})
-
-cur_frm.cscript.display_activity_log = function (msg) {
-	if (!cur_frm.ss_html)
-		cur_frm.ss_html = $a(cur_frm.fields_dict['activity_log'].wrapper, 'div');
-	if (msg) {
-		cur_frm.ss_html.innerHTML =
-			'<div class="padding"><h4>' + __("Activity Log:") + '</h4>' + msg + '</div>';
-	} else {
-		cur_frm.ss_html.innerHTML = "";
-	}
-}
-
-// Create salary slip
-// -----------------------
-cur_frm.cscript.create_salary_slip = function (doc, cdt, cdn) {
-	cur_frm.cscript.display_activity_log("");
-	var callback = function (r, rt) {
-		if (r.message)
-			cur_frm.cscript.display_activity_log(r.message);
-	}
-	return $c('runserverobj', { 'method': 'create_salary_slips', 'docs': doc }, callback);
-}
-
-cur_frm.cscript.submit_salary_slip = function (doc, cdt, cdn) {
-	cur_frm.cscript.display_activity_log("");
-
-	frappe.confirm(__("Do you really want to Submit all Salary Slip from {0} to {1}", [doc.start_date, doc.end_date]), function () {
-		// clear all in locals
-		if (locals["Salary Slip"]) {
-			$.each(locals["Salary Slip"], function (name, d) {
-				frappe.model.remove_from_locals("Salary Slip", name);
-			});
-		}
-
-		var callback = function (r, rt) {
-			if (r.message)
-				cur_frm.cscript.display_activity_log(r.message);
-		}
-
-		return $c('runserverobj', { 'method': 'submit_salary_slips', 'docs': doc }, callback);
-	});
-}
-
-cur_frm.cscript.make_bank_entry = function (doc, cdt, cdn) {
-	if (doc.company && doc.start_date && doc.end_date) {
-		return frappe.call({
-			doc: cur_frm.doc,
-			method: "make_payment_entry",
-			callback: function (r) {
-				if (r.message)
-					var doc = frappe.model.sync(r.message)[0];
-				frappe.set_route("Form", doc.doctype, doc.name);
-			}
-		});
-	} else {
-		frappe.msgprint(__("Company, From Date and To Date is mandatory"));
-	}
-}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.json b/erpnext/hr/doctype/process_payroll/process_payroll.json
deleted file mode 100644
index 2b847b3..0000000
--- a/erpnext/hr/doctype/process_payroll/process_payroll.json
+++ /dev/null
@@ -1,843 +0,0 @@
-{
- "allow_copy": 1, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2012-03-27 14:35:59", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Other", 
- "editable_grid": 0, 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break0", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Select Employees", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break0", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "50%"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 1, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Today", 
-   "fieldname": "posting_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Posting Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "depends_on": "eval:doc.salary_slip_based_on_timesheet == 0", 
-   "fieldname": "payroll_frequency", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Payroll Frequency", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nMonthly\nFortnightly\nBimonthly\nWeekly\nDaily", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break1", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "50%"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "branch", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Branch", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Branch", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "department", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Department", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Department", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "designation", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Designation", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Designation", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_8", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "salary_slip_based_on_timesheet", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Salary Slip Based on Timesheet", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "select_payroll_period", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Select Payroll Period", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "fieldname": "start_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Start Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_11", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "fieldname": "end_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "End Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_16", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Accounts", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "cost_center", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Cost Center", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Cost Center", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_18", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "project", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Project", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Project", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "process_payroll", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Process Payroll", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "50%"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Creates salary slip for above mentioned criteria.", 
-   "fieldname": "create_salary_slip", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Create Salary Slip", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "25%"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Submit all salary slips for the above selected criteria", 
-   "fieldname": "submit_salary_slip", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Submit Salary Slip", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "account", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Payment Entry", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Select Payment Account to make Bank Entry", 
-   "fieldname": "payment_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Payment Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "description": "Create Bank Entry for the total salary paid for the above selected criteria", 
-   "fieldname": "make_bank_entry", 
-   "fieldtype": "Button", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Make Bank Entry", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break2", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "activity_log", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Activity Log", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 1, 
- "icon": "fa fa-cog", 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-02-08 02:34:59.130475", 
- "modified_by": "Administrator", 
- "module": "HR", 
- "name": "Process Payroll", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "HR Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.py b/erpnext/hr/doctype/process_payroll/process_payroll.py
deleted file mode 100644
index f8ac044..0000000
--- a/erpnext/hr/doctype/process_payroll/process_payroll.py
+++ /dev/null
@@ -1,453 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from dateutil.relativedelta import relativedelta
-from frappe.utils import cint, flt, nowdate, add_days, getdate, fmt_money, add_to_date, DATE_FORMAT
-from frappe import _
-from erpnext.accounts.utils import get_fiscal_year
-
-from frappe.model.document import Document
-
-class ProcessPayroll(Document):
-	def get_emp_list(self):
-		"""
-			Returns list of active employees based on selected criteria
-			and for which salary structure exists
-		"""
-		cond = self.get_filter_condition()
-		cond += self.get_joining_releiving_condition()
-
-
-		condition = ''
-		if self.payroll_frequency:
-			condition = """and payroll_frequency = '%(payroll_frequency)s'""" % {"payroll_frequency": self.payroll_frequency}
-
-		sal_struct = frappe.db.sql("""
-				select
-					name from `tabSalary Structure`
-				where
-					docstatus != 2 and
-					is_active = 'Yes'
-					and company = %(company)s and
-					ifnull(salary_slip_based_on_timesheet,0) = %(salary_slip_based_on_timesheet)s
-					{condition}""".format(condition=condition),
-				{"company": self.company, "salary_slip_based_on_timesheet":self.salary_slip_based_on_timesheet})
-
-		if sal_struct:
-			cond += "and t2.parent IN %(sal_struct)s "
-			emp_list = frappe.db.sql("""
-				select
-					t1.name
-				from
-					`tabEmployee` t1, `tabSalary Structure Employee` t2
-				where
-					t1.docstatus!=2
-					and t1.name = t2.employee
-			%s """% cond, {"sal_struct": sal_struct})
-			return emp_list
-
-	def get_filter_condition(self):
-		self.check_mandatory()
-
-		cond = ''
-		for f in ['company', 'branch', 'department', 'designation']:
-			if self.get(f):
-				cond += " and t1." + f + " = '" + self.get(f).replace("'", "\'") + "'"
-
-		return cond
-
-	def get_joining_releiving_condition(self):
-		cond = """
-			and ifnull(t1.date_of_joining, '0000-00-00') <= '%(end_date)s'
-			and ifnull(t1.relieving_date, '2199-12-31') >= '%(start_date)s'
-		""" % {"start_date": self.start_date, "end_date": self.end_date}
-		return cond
-
-	def check_mandatory(self):
-		for fieldname in ['company', 'start_date', 'end_date']:
-			if not self.get(fieldname):
-				frappe.throw(_("Please set {0}").format(self.meta.get_label(fieldname)))
-
-	def create_salary_slips(self):
-		"""
-			Creates salary slip for selected employees if already not created
-		"""
-		self.check_permission('write')
-
-		emp_list = self.get_emp_list()
-		ss_list = []
-		if emp_list:
-			for emp in emp_list:
-				if not frappe.db.sql("""select
-						name from `tabSalary Slip`
-					where
-						docstatus!= 2 and
-						employee = %s and
-						start_date >= %s and
-						end_date <= %s and
-						company = %s
-						""", (emp[0], self.start_date, self.end_date, self.company)):
-					ss = frappe.get_doc({
-						"doctype": "Salary Slip",
-						"salary_slip_based_on_timesheet": self.salary_slip_based_on_timesheet,
-						"payroll_frequency": self.payroll_frequency,
-						"start_date": self.start_date,
-						"end_date": self.end_date,
-						"employee": emp[0],
-						"employee_name": frappe.get_value("Employee", {"name":emp[0]}, "employee_name"),
-						"company": self.company,
-						"posting_date": self.posting_date
-					})
-					ss.insert()
-					ss_dict = {}
-					ss_dict["Employee Name"] = ss.employee_name
-					ss_dict["Total Pay"] = fmt_money(ss.rounded_total,currency = frappe.defaults.get_global_default("currency"))
-					ss_dict["Salary Slip"] = self.format_as_links(ss.name)[0]
-					ss_list.append(ss_dict)
-		return self.create_log(ss_list)
-
-	def create_log(self, ss_list):
-		if not ss_list or len(ss_list) < 1: 
-			log = "<p>" + _("No employee for the above selected criteria OR salary slip already created") + "</p>"
-		else:
-			log = frappe.render_template("templates/includes/salary_slip_log.html",
-						dict(ss_list=ss_list,
-							keys=sorted(ss_list[0].keys()),
-							title=_('Created Salary Slips')))
-		return log
-
-	def get_sal_slip_list(self, ss_status, as_dict=False):
-		"""
-			Returns list of salary slips based on selected criteria
-		"""
-		cond = self.get_filter_condition()
-
-		ss_list = frappe.db.sql("""
-			select t1.name, t1.salary_structure from `tabSalary Slip` t1
-			where t1.docstatus = %s and t1.start_date >= %s and t1.end_date <= %s
-			and (t1.journal_entry is null or t1.journal_entry = "") and ifnull(salary_slip_based_on_timesheet,0) = %s %s
-		""" % ('%s', '%s', '%s','%s', cond), (ss_status, self.start_date, self.end_date, self.salary_slip_based_on_timesheet), as_dict=as_dict)
-		return ss_list
-
-	def submit_salary_slips(self):
-		"""
-			Submit all salary slips based on selected criteria
-		"""
-		self.check_permission('write')
-		jv_name = ""
-		ss_list = self.get_sal_slip_list(ss_status=0)
-		submitted_ss = []
-		not_submitted_ss = []
-		for ss in ss_list:
-			ss_obj = frappe.get_doc("Salary Slip",ss[0])
-			ss_dict = {}
-			ss_dict["Employee Name"] = ss_obj.employee_name
-			ss_dict["Total Pay"] = fmt_money(ss_obj.net_pay,
-				currency = frappe.defaults.get_global_default("currency"))	
-			ss_dict["Salary Slip"] = self.format_as_links(ss_obj.name)[0]
-			
-			if ss_obj.net_pay<0:
-				not_submitted_ss.append(ss_dict)
-			else:
-				try:
-					ss_obj.submit()
-					submitted_ss.append(ss_dict)
-				except frappe.ValidationError:
-					not_submitted_ss.append(ss_dict)
-		if submitted_ss:
-			jv_name = self.make_accural_jv_entry()		
-
-		return self.create_submit_log(submitted_ss, not_submitted_ss, jv_name)
-
-	def create_submit_log(self, submitted_ss, not_submitted_ss, jv_name):
-		log = ''
-		if not submitted_ss and not not_submitted_ss:
-			log = "No salary slip found to submit for the above selected criteria"
-
-		if submitted_ss:
-			log = frappe.render_template("templates/includes/salary_slip_log.html",
-					dict(ss_list=submitted_ss,
-						keys=sorted(submitted_ss[0].keys()),
-						title=_('Submitted Salary Slips')))
-			if jv_name:
-				log += "<b>" + _("Accural Journal Entry Submitted") + "</b>\
-					%s" % '<br>''<a href="#Form/Journal Entry/{0}">{0}</a>'.format(jv_name)			
-
-		if not_submitted_ss:
-			log += frappe.render_template("templates/includes/salary_slip_log.html",
-					dict(ss_list=not_submitted_ss,
-						keys=sorted(not_submitted_ss[0].keys()),
-						title=_('Not Submitted Salary Slips')))
-			log += """
-				Possible reasons: <br>\
-				1. Net pay is less than 0 <br>
-				2. Company Email Address specified in employee master is not valid. <br>
-				"""
-		return log
-
-	def format_as_links(self, salary_slip):
-		return ['<a href="#Form/Salary Slip/{0}">{0}</a>'.format(salary_slip)]
-
-	def get_loan_details(self):
-		"""
-			Get loan details from submitted salary slip based on selected criteria
-		"""
-		cond = self.get_filter_condition()
-		return frappe.db.sql(""" select eld.employee_loan_account,
-				eld.interest_income_account, eld.principal_amount, eld.interest_amount, eld.total_payment
-			from
-				`tabSalary Slip` t1, `tabSalary Slip Loan` eld
-			where
-				t1.docstatus = 1 and t1.name = eld.parent and start_date >= %s and end_date <= %s %s
-			""" % ('%s', '%s', cond), (self.start_date, self.end_date), as_dict=True) or []
-
-	def get_total_salary_amount(self):
-		"""
-			Get total salary amount from submitted salary slip based on selected criteria
-		"""
-		cond = self.get_filter_condition()
-		totals = frappe.db.sql(""" select sum(rounded_total) as rounded_total from `tabSalary Slip` t1
-			where t1.docstatus = 1 and start_date >= %s and end_date <= %s %s
-			""" % ('%s', '%s', cond), (self.start_date, self.end_date), as_dict=True)
-		return totals and totals[0] or None
-
-	def get_salary_component_account(self, salary_component):
-		account = frappe.db.get_value("Salary Component Account",
-			{"parent": salary_component, "company": self.company}, "default_account")
-
-		if not account:
-			frappe.throw(_("Please set default account in Salary Component {0}")
-				.format(salary_component))
-
-		return account
-
-	def get_salary_components(self, component_type):
-		salary_slips = self.get_sal_slip_list(ss_status = 1, as_dict = True)
-		if salary_slips:
-			salary_components = frappe.db.sql("""select salary_component, amount, parentfield
-				from `tabSalary Detail` where parentfield = '%s' and parent in (%s)""" %
-				(component_type, ', '.join(['%s']*len(salary_slips))), tuple([d.name for d in salary_slips]), as_dict=True)
-			return salary_components
-
-	def get_salary_component_total(self, component_type = None):
-		salary_components = self.get_salary_components(component_type)
-		if salary_components:
-			component_dict = {}
-			for item in salary_components:
-				component_dict[item['salary_component']] = component_dict.get(item['salary_component'], 0) + item['amount']
-			account_details = self.get_account(component_dict = component_dict)
-			return account_details
-
-	def get_account(self, component_dict = None):
-		account_dict = {}
-		for s, a in component_dict.items():
-			account = self.get_salary_component_account(s)
-			account_dict[account] = account_dict.get(account, 0) + a
-		return account_dict
-	
-	def get_default_payroll_payable_account(self):
-		payroll_payable_account = frappe.db.get_value("Company",
-			{"company_name": self.company}, "default_payroll_payable_account")
-
-		if not payroll_payable_account:
-			frappe.throw(_("Please set Default Payroll Payable Account in Company {0}")
-				.format(self.company))
-
-		return payroll_payable_account	
-
-	def make_accural_jv_entry(self):
-		self.check_permission('write')
-		earnings = self.get_salary_component_total(component_type = "earnings") or {}
-		deductions = self.get_salary_component_total(component_type = "deductions") or {}
-		default_payroll_payable_account = self.get_default_payroll_payable_account()
-		loan_details = self.get_loan_details()
-		jv_name = ""
-		precision = frappe.get_precision("Journal Entry Account", "debit_in_account_currency")
-
-		if earnings or deductions:
-			journal_entry = frappe.new_doc('Journal Entry')
-			journal_entry.voucher_type = 'Journal Entry'
-			journal_entry.user_remark = _('Accural Journal Entry for salaries from {0} to {1}')\
-				.format(self.start_date, self.end_date)
-			journal_entry.company = self.company
-			journal_entry.posting_date = nowdate()
-
-			accounts = []
-			payable_amount = 0
-
-			# Earnings
-			for acc, amount in earnings.items():
-				payable_amount += flt(amount, precision)
-				accounts.append({
-						"account": acc,
-						"debit_in_account_currency": flt(amount, precision),
-						"cost_center": self.cost_center,
-						"project": self.project
-					})
-
-			# Deductions
-			for acc, amount in deductions.items():
-				payable_amount -= flt(amount, precision)
-				accounts.append({
-						"account": acc,
-						"credit_in_account_currency": flt(amount, precision),
-						"cost_center": self.cost_center,
-						"project": self.project
-					})
-
-			# Employee loan
-			for data in loan_details:
-				accounts.append({
-						"account": data.employee_loan_account,
-						"credit_in_account_currency": data.principal_amount
-					})
-				accounts.append({
-						"account": data.interest_income_account,
-						"credit_in_account_currency": data.interest_amount,
-						"cost_center": self.cost_center,
-						"project": self.project
-					})
-				payable_amount -= flt(data.total_payment, precision)
-
-			# Payable amount
-			accounts.append({
-				"account": default_payroll_payable_account,
-				"credit_in_account_currency": flt(payable_amount, precision)
-			})
-
-			journal_entry.set("accounts", accounts)
-			journal_entry.save()
-
-			try:
-				journal_entry.submit()
-				jv_name = journal_entry.name
-				self.update_salary_slip_status(jv_name = jv_name)
-			except Exception as e:
-				frappe.msgprint(e)
-
-		return jv_name
-
-	def make_payment_entry(self):
-		self.check_permission('write')
-		total_salary_amount = self.get_total_salary_amount()
-		default_payroll_payable_account = self.get_default_payroll_payable_account()
-		precision = frappe.get_precision("Journal Entry Account", "debit_in_account_currency")
-
-		if total_salary_amount and total_salary_amount.rounded_total:
-			journal_entry = frappe.new_doc('Journal Entry')
-			journal_entry.voucher_type = 'Bank Entry'
-			journal_entry.user_remark = _('Payment of salary from {0} to {1}')\
-				.format(self.start_date, self.end_date)
-			journal_entry.company = self.company
-			journal_entry.posting_date = nowdate()
-
-			payment_amount = flt(total_salary_amount.rounded_total, precision)
-
-			journal_entry.set("accounts", [
-				{
-					"account": self.payment_account,
-					"credit_in_account_currency": payment_amount
-				},
-				{
-					"account": default_payroll_payable_account,
-					"debit_in_account_currency": payment_amount
-				}
-			])
-			return journal_entry.as_dict()
-		else:
-			frappe.msgprint(
-				_("There are no submitted Salary Slips to process."),
-				title="Error", indicator="red"
-			)
-
-	def update_salary_slip_status(self, jv_name = None):
-		ss_list = self.get_sal_slip_list(ss_status=1)
-		for ss in ss_list:
-			ss_obj = frappe.get_doc("Salary Slip",ss[0])
-			frappe.db.set_value("Salary Slip", ss_obj.name, "status", "Paid")
-			frappe.db.set_value("Salary Slip", ss_obj.name, "journal_entry", jv_name)
-
-	def set_start_end_dates(self):
-		self.update(get_start_end_dates(self.payroll_frequency, 
-			self.start_date or self.posting_date, self.company))
-
-@frappe.whitelist()
-def get_start_end_dates(payroll_frequency, start_date=None, company=None):
-	'''Returns dict of start and end dates for given payroll frequency based on start_date'''
-
-	if payroll_frequency == "Monthly" or payroll_frequency == "Bimonthly" or payroll_frequency == "":
-		fiscal_year = get_fiscal_year(start_date, company=company)[0]
-		month = "%02d" % getdate(start_date).month
-		m = get_month_details(fiscal_year, month)
-		if payroll_frequency == "Bimonthly":
-			if getdate(start_date).day <= 15:
-				start_date = m['month_start_date']
-				end_date = m['month_mid_end_date']
-			else:
-				start_date = m['month_mid_start_date']
-				end_date = m['month_end_date']
-		else:
-			start_date = m['month_start_date']
-			end_date = m['month_end_date']
-
-	if payroll_frequency == "Weekly":
-		end_date = add_days(start_date, 6)
-
-	if payroll_frequency == "Fortnightly":
-		end_date = add_days(start_date, 13)
-
-	if payroll_frequency == "Daily":
-		end_date = start_date
-
-	return frappe._dict({
-		'start_date': start_date, 'end_date': end_date
-	})
-
-def get_frequency_kwargs(frequency_name):
-	frequency_dict = {
-		'monthly': {'months': 1},
-		'fortnightly': {'days': 14},
-		'weekly': {'days': 7},
-		'daily': {'days': 1}
-	}
-	return frequency_dict.get(frequency_name)
-
-@frappe.whitelist()
-def get_end_date(start_date, frequency):
-	start_date = getdate(start_date)
-	frequency = frequency.lower() if frequency else 'monthly'
-	kwargs = get_frequency_kwargs(frequency) if frequency != 'bimonthly' else get_frequency_kwargs('monthly')
-
-	# weekly, fortnightly and daily intervals have fixed days so no problems
-	end_date = add_to_date(start_date, **kwargs) - relativedelta(days=1)
-	if frequency != 'bimonthly':
-		return dict(end_date=end_date.strftime(DATE_FORMAT))
-
-	else:
-		return dict(end_date='')
-
-def get_month_details(year, month):
-	ysd = frappe.db.get_value("Fiscal Year", year, "year_start_date")
-	if ysd:
-		from dateutil.relativedelta import relativedelta
-		import calendar, datetime
-		diff_mnt = cint(month)-cint(ysd.month)
-		if diff_mnt<0:
-			diff_mnt = 12-int(ysd.month)+cint(month)
-		msd = ysd + relativedelta(months=diff_mnt) # month start date
-		month_days = cint(calendar.monthrange(cint(msd.year) ,cint(month))[1]) # days in month
-		mid_start = datetime.date(msd.year, cint(month), 16) # month mid start date
-		mid_end = datetime.date(msd.year, cint(month), 15) # month mid end date
-		med = datetime.date(msd.year, cint(month), month_days) # month end date
-		return frappe._dict({
-			'year': msd.year,
-			'month_start_date': msd,
-			'month_end_date': med,
-			'month_mid_start_date': mid_start,
-			'month_mid_end_date': mid_end,
-			'month_days': month_days
-		})
-	else:
-		frappe.throw(_("Fiscal Year {0} not found").format(year))
diff --git a/erpnext/hr/doctype/process_payroll/test_process_payroll.js b/erpnext/hr/doctype/process_payroll/test_process_payroll.js
deleted file mode 100644
index bc61150..0000000
--- a/erpnext/hr/doctype/process_payroll/test_process_payroll.js
+++ /dev/null
@@ -1,59 +0,0 @@
-QUnit.module('hr');
-
-QUnit.test("Test: Process Payroll [HR]", function (assert) {
-	assert.expect(5);
-	let done = assert.async();
-	let net_pay;
-
-	let check_amounts = (employee_name,net_amt,gross_amt) => {
-		frappe.run_serially([
-			// Retrieving the actual amount from salary slip
-			() => frappe.db.get_value('Salary Slip', {'employee_name': employee_name}, 'net_pay'),
-			(r)	=> {
-				net_pay=r.message.net_pay;
-			},
-			() => frappe.db.get_value('Salary Slip', {'employee_name': employee_name}, 'gross_pay'),
-
-			// Checking if amounts are correctly calculated
-			(r) => {
-				assert.ok(net_pay==net_amt,
-					'Net Pay is correctly calculated for '+employee_name);
-				assert.ok(r.message.gross_pay==gross_amt,
-					'Gross Pay is correctly calculated for '+employee_name);
-			},
-		]);
-	};
-	frappe.run_serially([
-
-		// Deleting the already generated Salary Slips for employees
-		() => frappe.set_route('List','Salary Slip'),
-		() => frappe.timeout(2),
-		() => { $('input.list-row-checkbox').click();},
-		() => frappe.click_button('Delete'),
-		() => frappe.click_button('Yes'),
-		() => frappe.timeout(2),
-		() => assert.ok(cur_list.data.length==0,"Salary Slips successfully deleted"),
-		() => frappe.timeout(3),
-
-
-		// Creating Process Payroll for specific company
-		() => frappe.set_route('Form','Process Payroll'),
-		() => {
-			cur_frm.set_value('company','For Testing'),
-			frappe.timeout(1),
-			cur_frm.set_value('payroll_frequency','Monthly'),
-			cur_frm.set_value('start_date','2017-08-01'),
-			frappe.timeout(1),
-			cur_frm.set_value('end_date','2017-08-31'),
-			cur_frm.set_value('cost_center','Main-TC'),
-			frappe.timeout(1),
-			frappe.click_button('Create Salary Slip');
-		},
-		() => frappe.timeout(3),
-		() => check_amounts('Test Employee 1','19200','24000'),
-		() => frappe.timeout(3),
-		() => check_amounts('Test Employee 3','23040','28800'),
-		() => frappe.timeout(4),
-		() => done()
-	]);
-});
diff --git a/erpnext/hr/doctype/process_payroll/test_process_payroll.py b/erpnext/hr/doctype/process_payroll/test_process_payroll.py
deleted file mode 100644
index 91b60b4..0000000
--- a/erpnext/hr/doctype/process_payroll/test_process_payroll.py
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-from __future__ import unicode_literals
-
-import unittest
-
-import erpnext
-import frappe
-from dateutil.relativedelta import relativedelta
-from erpnext.accounts.utils import get_fiscal_year, getdate, nowdate
-from erpnext.hr.doctype.process_payroll.process_payroll import get_start_end_dates, get_end_date
-
-class TestProcessPayroll(unittest.TestCase):
-	def test_process_payroll(self):
-		month = "11"
-		fiscal_year = "_Test Fiscal Year 2016"
-
-		for data in frappe.get_all('Salary Component', fields = ["name"]):
-			if not frappe.db.get_value('Salary Component Account',
-				{'parent': data.name, 'company': erpnext.get_default_company()}, 'name'):
-				get_salary_component_account(data.name)
-
-		if not frappe.db.get_value("Salary Slip", {"start_date": "2016-11-01", "end_date": "2016-11-30"}):
-			make_process_payroll()
-
-	def test_get_end_date(self):
-		self.assertEqual(get_end_date('2017-01-01', 'monthly'), {'end_date': '2017-01-31'})
-		self.assertEqual(get_end_date('2017-02-01', 'monthly'), {'end_date': '2017-02-28'})
-		self.assertEqual(get_end_date('2017-02-01', 'fortnightly'), {'end_date': '2017-02-14'})
-		self.assertEqual(get_end_date('2017-02-01', 'bimonthly'), {'end_date': ''})
-		self.assertEqual(get_end_date('2017-01-01', 'bimonthly'), {'end_date': ''})
-		self.assertEqual(get_end_date('2020-02-15', 'bimonthly'), {'end_date': ''})
-		self.assertEqual(get_end_date('2017-02-15', 'monthly'), {'end_date': '2017-03-14'})
-		self.assertEqual(get_end_date('2017-02-15', 'daily'), {'end_date': '2017-02-15'})
-
-	def test_employee_loan(self):
-		from erpnext.hr.doctype.salary_structure.test_salary_structure import (make_employee,
-			make_salary_structure)
-		from erpnext.hr.doctype.employee_loan.test_employee_loan import create_employee_loan
-
-		branch = "Test Employee Branch"
-		employee = make_employee("test_employee@loan.com")
-		company = erpnext.get_default_company()
-		holiday_list = make_holiday("test holiday for loan")
-
-		if not frappe.db.exists('Salary Component', 'Basic Salary'):
-			frappe.get_doc({
-				'doctype': 'Salary Component',
-				'salary_component': 'Basic Salary',
-				'salary_component_abbr': 'BS',
-				'type': 'Earning',
-				'accounts': [{
-					'company': company,
-					'default_account': frappe.db.get_value('Account',
-						{'company': company, 'root_type': 'Expense', 'account_type': ''}, 'name')
-				}]
-			}).insert()
-
-		if not frappe.db.get_value('Salary Component Account',
-			{'parent': 'Basic Salary', 'company': company}):
-			salary_component = frappe.get_doc('Salary Component', 'Basic Salary')
-			salary_component.append('accounts', {
-				'company': company,
-				'default_account': 'Salary - WP'
-			})
-
-		company_doc = frappe.get_doc('Company', company)
-		if not company_doc.default_payroll_payable_account:
-			company_doc.default_payroll_payable_account = frappe.db.get_value('Account',
-				{'company': company, 'root_type': 'Liability', 'account_type': ''}, 'name')
-			company_doc.save()
-
-		if not frappe.db.exists('Branch', branch):
-			frappe.get_doc({
-				'doctype': 'Branch',
-				'branch': branch
-			}).insert()
-
-		employee_doc = frappe.get_doc('Employee', employee)
-		employee_doc.branch = branch
-		employee_doc.holiday_list = holiday_list
-		employee_doc.save()
-
-		employee_loan = create_employee_loan(employee,
-			"Personal Loan", 280000, "Repay Over Number of Periods", 20)
-		employee_loan.repay_from_salary = 1
-		employee_loan.submit()
-
-		salary_strcture = "Test Salary Structure for Loan"
-		if not frappe.db.exists('Salary Structure', salary_strcture):
-			salary_strcture = make_salary_structure(salary_strcture, [{
-				'employee': employee,
-				'from_date': '2017-01-01',
-				'base': 30000
-			}])
-
-			salary_strcture = frappe.get_doc('Salary Structure', salary_strcture)
-			salary_strcture.set('earnings', [{
-				'salary_component': 'Basic Salary',
-				'abbr': 'BS',
-				'amount_based_on_formula':1,
-				'formula': 'base*.5'
-			}])
-			salary_strcture.save()
-
-		dates = get_start_end_dates('Monthly', nowdate())
-		make_process_payroll(start_date=dates.start_date,
-			end_date=dates.end_date, branch=branch)
-
-		name = frappe.db.get_value('Salary Slip',
-			{'posting_date': nowdate(), 'employee': employee}, 'name')
-
-		salary_slip = frappe.get_doc('Salary Slip', name)
-		for row in salary_slip.loans:
-			if row.employee_loan == employee_loan.name:
-				interest_amount = (280000 * 8.4)/(12*100)
-				principal_amount = employee_loan.monthly_repayment_amount - interest_amount
-				self.assertEqual(row.interest_amount, interest_amount)
-				self.assertEqual(row.principal_amount, principal_amount)
-				self.assertEqual(row.total_payment,
-					interest_amount + principal_amount)
-
-		if salary_slip.docstatus == 0:
-			frappe.delete_doc('Salary Slip', name)
-
-		employee_loan.cancel()
-		frappe.delete_doc('Employee Loan', employee_loan.name)
-
-def get_salary_component_account(sal_comp):
-	company = erpnext.get_default_company()
-	sal_comp = frappe.get_doc("Salary Component", sal_comp)
-	sc = sal_comp.append("accounts")
-	sc.company = company
-	sc.default_account = create_account(company)
-	
-def create_account(company):
-	salary_account = frappe.db.get_value("Account", "Salary - " + frappe.db.get_value('Company', company, 'abbr'))
-	if not salary_account:
-		frappe.get_doc({
-		"doctype": "Account",
-		"account_name": "Salary",
-		"parent_account": "Indirect Expenses - " + frappe.db.get_value('Company', company, 'abbr'),
-		"company": company
-		}).insert()
-	return salary_account
-
-def make_process_payroll(**args):
-	args = frappe._dict(args)
-
-	process_payroll = frappe.get_doc("Process Payroll", "Process Payroll")
-	process_payroll.company = erpnext.get_default_company()
-	process_payroll.start_date = args.start_date or "2016-11-01"
-	process_payroll.end_date = args.end_date or "2016-11-30"
-	process_payroll.payment_account = get_payment_account()
-	process_payroll.posting_date = nowdate()
-	process_payroll.payroll_frequency = "Monthly"
-	process_payroll.branch = args.branch or None
-	process_payroll.create_salary_slips()
-	process_payroll.submit_salary_slips()
-	if process_payroll.get_sal_slip_list(ss_status = 1):
-		r = process_payroll.make_payment_entry()
-
-	return process_payroll
-
-def get_payment_account():
-	return frappe.get_value('Account',
-		{'account_type': 'Cash', 'company': erpnext.get_default_company(),'is_group':0}, "name")
-
-def make_holiday(holiday_list_name):
-	if not frappe.db.exists('Holiday List', holiday_list_name):
-		current_fiscal_year = get_fiscal_year(nowdate(), as_dict=True)
-		dt = getdate(nowdate())
-
-		new_year = dt + relativedelta(month=01, day=01, year=dt.year)
-		republic_day = dt + relativedelta(month=01, day=26, year=dt.year)
-		test_holiday = dt + relativedelta(month=02, day=02, year=dt.year)
-
-		frappe.get_doc({
-			'doctype': 'Holiday List',
-			'from_date': current_fiscal_year.year_start_date,
-			'to_date': current_fiscal_year.year_end_date,
-			'holiday_list_name': holiday_list_name,
-			'holidays': [{
-				'holiday_date': new_year,
-				'description': 'New Year'
-			}, {
-				'holiday_date': republic_day,
-				'description': 'Republic Day'
-			}, {
-				'holiday_date': test_holiday,
-				'description': 'Test Holiday'
-			}]
-		}).insert()
-
-	return holiday_list_name
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.js b/erpnext/hr/doctype/salary_slip/salary_slip.js
index 4679cbd..840387c 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.js
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.js
@@ -37,7 +37,7 @@
 
 	set_end_date: function(frm){
 		frappe.call({
-			method: 'erpnext.hr.doctype.process_payroll.process_payroll.get_end_date',
+			method: 'erpnext.hr.doctype.payroll_entry.payroll_entry.get_end_date',
 			args: {
 				frequency: frm.doc.payroll_frequency,
 				start_date: frm.doc.start_date
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py
index ea5f35b..656a4ac 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -8,7 +8,7 @@
 from frappe.model.naming import make_autoname
 
 from frappe import msgprint, _
-from erpnext.hr.doctype.process_payroll.process_payroll import get_start_end_dates
+from erpnext.hr.doctype.payroll_entry.payroll_entry import get_start_end_dates
 from erpnext.hr.doctype.employee.employee import get_holiday_list_for_employee
 from erpnext.utilities.transaction_base import TransactionBase
 from frappe.utils.background_jobs import enqueue
diff --git a/erpnext/hr/doctype/salary_slip/test_salary_slip.js b/erpnext/hr/doctype/salary_slip/test_salary_slip.js
index 619e530..43cc27d 100644
--- a/erpnext/hr/doctype/salary_slip/test_salary_slip.js
+++ b/erpnext/hr/doctype/salary_slip/test_salary_slip.js
@@ -44,6 +44,12 @@
 		() => frappe.timeout(6),
 		() => salary_slip('Test Employee 3'),
 		() => frappe.timeout(5),
+		() => frappe.set_route('List', 'Salary Slip', 'List'),
+		() => frappe.timeout(2),
+		() => {$('.list-select-all').click();},
+		() => frappe.timeout(2),
+		() => frappe.click_button('Delete'),
+		() => frappe.click_button('Yes'),
 		() => done()
 	]);
 });
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_slip/test_salary_slip.py b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
index f136cb5..0b240f0 100644
--- a/erpnext/hr/doctype/salary_slip/test_salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
@@ -9,8 +9,8 @@
 from erpnext.accounts.utils import get_fiscal_year
 from frappe.utils import getdate, nowdate, add_days, add_months, flt
 from erpnext.hr.doctype.salary_structure.salary_structure import make_salary_slip
-from erpnext.hr.doctype.process_payroll.test_process_payroll import get_salary_component_account
-from erpnext.hr.doctype.process_payroll.process_payroll import get_month_details
+from erpnext.hr.doctype.payroll_entry.test_payroll_entry import get_salary_component_account
+from erpnext.hr.doctype.payroll_entry.payroll_entry import get_month_details
 
 class TestSalarySlip(unittest.TestCase):
 	def setUp(self):
diff --git a/erpnext/hr/doctype/training_event/training_event.py b/erpnext/hr/doctype/training_event/training_event.py
index 1972100..1b13b70 100644
--- a/erpnext/hr/doctype/training_event/training_event.py
+++ b/erpnext/hr/doctype/training_event/training_event.py
@@ -11,29 +11,3 @@
 	def validate(self):
 		self.employee_emails = ', '.join(get_employee_emails([d.employee
 			for d in self.employees]))
-
-@frappe.whitelist()
-def get_events(start, end, filters=None):
-	"""Returns events for Gantt / Calendar view rendering.
-
-	:param start: Start date-time.
-	:param end: End date-time.
-	:param filters: Filters (JSON).
-	"""
-	from frappe.desk.calendar import get_event_conditions
-	conditions = get_event_conditions("Training Event", filters)
-
-	data = frappe.db.sql("""
-		select
-			name, event_name, event_status, start_time, end_time
-		from
-			`tabTraining Event`
-		where (ifnull(start_time, '0000-00-00')!= '0000-00-00') \
-			and (start_time between %(start)s and %(end)s)
-			and docstatus < 2
-			{conditions}
-		""".format(conditions=conditions), {
-			"start": start,
-			"end": end
-		}, as_dict=True, update={"allDay": 0})
-	return data
diff --git a/erpnext/hr/doctype/training_event/training_event_calendar.js b/erpnext/hr/doctype/training_event/training_event_calendar.js
index cb93851..cb168c0 100644
--- a/erpnext/hr/doctype/training_event/training_event_calendar.js
+++ b/erpnext/hr/doctype/training_event/training_event_calendar.js
@@ -10,5 +10,5 @@
 		"allDay": "allDay"
 	},
 	gantt: true,
-	get_events_method: "erpnext.hr.doctype.training_event.training_event.get_events",
+	get_events_method: "frappe.desk.calendar.get_events",
 }
diff --git a/erpnext/hr/doctype/training_program/training_program.json b/erpnext/hr/doctype/training_program/training_program.json
index d9b33d5..522d5e9 100644
--- a/erpnext/hr/doctype/training_program/training_program.json
+++ b/erpnext/hr/doctype/training_program/training_program.json
@@ -2,7 +2,7 @@
  "allow_copy": 0, 
  "allow_guest_to_view": 0, 
  "allow_import": 0, 
- "allow_rename": 0, 
+ "allow_rename": 1, 
  "autoname": "field:training_program", 
  "beta": 0, 
  "creation": "2017-10-11 04:43:17.230065", 
@@ -414,7 +414,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-10-16 05:34:23.055153", 
+ "modified": "2017-11-27 08:12:03.649247", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Training Program", 
diff --git a/erpnext/hr/doctype/upload_attendance/upload_attendance.json b/erpnext/hr/doctype/upload_attendance/upload_attendance.json
index 5a3f72a..16b7a83 100644
--- a/erpnext/hr/doctype/upload_attendance/upload_attendance.json
+++ b/erpnext/hr/doctype/upload_attendance/upload_attendance.json
@@ -1,28 +1,39 @@
 {
  "allow_copy": 1, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-01-25 11:34:53", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "description": "Download the Template, fill appropriate data and attach the modified file.\nAll dates and employee combination in the selected period will come in the template, with existing attendance records", 
+   "columns": 0, 
+   "description": "", 
    "fieldname": "download_template", 
    "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": "Download Template", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -30,22 +41,30 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "att_fr_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Attendance From Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "attenadnce_date", 
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -53,20 +72,28 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "att_to_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Attendance To Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -74,21 +101,29 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "get_template", 
    "fieldtype": "Button", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Get Template", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Button", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -96,20 +131,28 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "upload_attendance_data", 
    "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": "Import Attendance", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -117,20 +160,28 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "upload_html", 
    "fieldtype": "HTML", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Upload HTML", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -138,20 +189,28 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "import_log", 
    "fieldtype": "HTML", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Import Log", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -159,17 +218,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 1, 
  "icon": "fa fa-upload-alt", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 1, 
- "modified": "2015-06-05 11:37:04.348120", 
+ "modified": "2017-11-14 12:51:34.980103", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Upload Attendance", 
@@ -216,6 +276,10 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "track_changes": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/vehicle/test_vehicle.js b/erpnext/hr/doctype/vehicle/test_vehicle.js
new file mode 100644
index 0000000..4d40cce
--- /dev/null
+++ b/erpnext/hr/doctype/vehicle/test_vehicle.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Vehicle", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Vehicle
+		() => frappe.tests.make('Vehicle', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/vehicle/test_vehicle.py b/erpnext/hr/doctype/vehicle/test_vehicle.py
index 6431977..ff3429d 100644
--- a/erpnext/hr/doctype/vehicle/test_vehicle.py
+++ b/erpnext/hr/doctype/vehicle/test_vehicle.py
@@ -19,6 +19,7 @@
 			"acquisition_date":frappe.utils.nowdate(),
 			"location": "Mumbai",
 			"chassis_no": "1234ABCD",
+			"uom": "Litre",
 			"vehicle_value":frappe.utils.flt(500000)
 		})
 		vehicle.insert()
diff --git a/erpnext/hr/doctype/vehicle/vehicle.json b/erpnext/hr/doctype/vehicle/vehicle.json
index 39735e6..6f395b3 100644
--- a/erpnext/hr/doctype/vehicle/vehicle.json
+++ b/erpnext/hr/doctype/vehicle/vehicle.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "field:license_plate", 
@@ -12,6 +13,7 @@
  "editable_grid": 1, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -21,7 +23,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "License Plate", 
@@ -40,6 +43,7 @@
    "unique": 1
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -50,6 +54,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Make", 
@@ -68,6 +73,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -78,6 +84,7 @@
    "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, 
@@ -95,6 +102,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -104,7 +112,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Model", 
@@ -123,6 +132,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -133,6 +143,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Details", 
@@ -151,6 +162,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -160,7 +172,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Odometer Value (Last)", 
@@ -179,6 +192,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -188,7 +202,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Acquisition Date", 
@@ -207,6 +222,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -217,6 +233,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Location", 
@@ -235,6 +252,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -245,6 +263,7 @@
    "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, 
@@ -262,6 +281,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -272,6 +292,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Chassis No", 
@@ -290,6 +311,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -300,6 +322,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Vehicle Value", 
@@ -319,6 +342,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -329,6 +353,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Employee", 
@@ -348,6 +373,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -358,6 +384,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Insurance Details", 
@@ -376,6 +403,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -385,7 +413,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Insurance Company", 
@@ -404,6 +433,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -413,7 +443,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Policy No", 
@@ -432,6 +463,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -442,6 +474,7 @@
    "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, 
@@ -459,6 +492,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -469,6 +503,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Start Date", 
@@ -487,6 +522,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -497,6 +533,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "End Date", 
@@ -515,6 +552,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -525,6 +563,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Details", 
@@ -543,6 +582,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -553,6 +593,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Fuel Type", 
@@ -572,17 +613,19 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "default": "Litre", 
+   "default": "", 
    "fieldname": "uom", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Fuel UOM", 
@@ -602,6 +645,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -612,6 +656,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Last Carbon Check", 
@@ -630,6 +675,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -640,6 +686,7 @@
    "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, 
@@ -657,6 +704,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -667,6 +715,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Color", 
@@ -685,6 +734,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -695,6 +745,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Wheels", 
@@ -713,6 +764,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -723,6 +775,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Doors", 
@@ -741,6 +794,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -751,6 +805,7 @@
    "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", 
@@ -769,17 +824,17 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-01-09 11:10:11.678834", 
+ "modified": "2017-11-29 14:48:30.813359", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Vehicle", 
@@ -796,7 +851,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -812,6 +866,7 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "license_plate,location,model", 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "", 
diff --git a/erpnext/hr/doctype/vehicle_log/test_vehicle_log.py b/erpnext/hr/doctype/vehicle_log/test_vehicle_log.py
index 71c1d91..35400b0 100644
--- a/erpnext/hr/doctype/vehicle_log/test_vehicle_log.py
+++ b/erpnext/hr/doctype/vehicle_log/test_vehicle_log.py
@@ -20,6 +20,7 @@
 			"acquisition_date":frappe.utils.nowdate(),
 			"location": "Mumbai",
 			"chassis_no": "1234ABCD",
+			"uom": "Litre",
 			"vehicle_value":frappe.utils.flt(500000)
 		})
 		try:
diff --git a/erpnext/hub_node/__init__.py b/erpnext/hub_node/__init__.py
index 8efbed8..8eb1074 100644
--- a/erpnext/hub_node/__init__.py
+++ b/erpnext/hub_node/__init__.py
@@ -15,13 +15,16 @@
 	return hub_settings
 
 @frappe.whitelist()
-def get_items(start=0, limit=20, category=None, order_by=None, text=None):
-	connection = get_connection()
+def get_items(start=0, limit=20, category=None, order_by=None, company=None, text=None):
+	connection = get_client_connection()
 	filters = {
 		'hub_category': category,
 	}
 	if text:
 		filters.update({'item_name': ('like', '%' + text + '%')})
+	if company:
+		filters.update({'company_name': company})
+
 	response = connection.get_list('Hub Item',
 		limit_start=start, limit_page_length=limit,
 		filters=filters)
@@ -29,7 +32,7 @@
 
 @frappe.whitelist()
 def get_categories():
-	connection = get_connection()
+	connection = get_client_connection()
 	response = connection.get_list('Hub Category')
 	return response
 
@@ -37,20 +40,24 @@
 def get_item_details(hub_sync_id=None):
 	if not hub_sync_id:
 		return
-	connection = get_connection()
+	connection = get_client_connection()
 	return connection.get_doc('Hub Item', hub_sync_id)
 
 @frappe.whitelist()
 def get_company_details(hub_sync_id):
-	connection = get_connection()
+	connection = get_client_connection()
 	return connection.get_doc('Hub Company', hub_sync_id)
 
-def get_connection():
+def get_client_connection():
+	# frappeclient connection
+	hub_connection = get_hub_connection()
+	return hub_connection.connection
+
+def get_hub_connection():
 	hub_connector = frappe.get_doc(
 		'Data Migration Connector', 'Hub Connector')
 	hub_connection = hub_connector.get_connection()
-	# frappeclient connection
-	return hub_connection.connection
+	return hub_connection
 
 def make_opportunity(buyer_name, email_id):
 	buyer_name = "HUB-" + buyer_name
@@ -171,7 +178,7 @@
 		user=contact.email_id
 	))
 
-	connection = get_connection()
+	connection = get_hub_connection()
 	response = connection.insert('Hub Message', args)
 
 	return response.ok
diff --git a/erpnext/hub_node/api.py b/erpnext/hub_node/api.py
new file mode 100644
index 0000000..b32efd9
--- /dev/null
+++ b/erpnext/hub_node/api.py
@@ -0,0 +1,29 @@
+# Copyright (c) 2015, Web Notes Technologies Pvt. Ltd. and Contributors and contributors
+# For license information, please see license.txt
+
+
+import frappe, json
+from frappe.utils import now, nowdate
+from erpnext.hub_node.doctype.hub_settings.hub_settings import get_hub_settings
+
+# API wrapper
+@frappe.whitelist(allow_guest=True)
+def call_method(access_token, method, message):
+	try:
+		args = json.loads(message)
+		if args:
+			return globals()[method](access_token, args)
+		else:
+			return globals()[method](access_token)
+	except:
+		print("Client Exception")
+		print(frappe.get_traceback())
+
+def disable_and_suspend_hub_user(access_token):
+	hub_settings = get_hub_settings()
+	hub_settings.publish = 0
+	hub_settings.publish_pricing = 0
+	hub_settings.publish_availability = 0
+	hub_settings.suspended = 1
+	hub_settings.enabled = 0
+	hub_settings.save(ignore_permissions=True)
diff --git a/erpnext/hub_node/data_migration_mapping/hub_message_to_lead/__init__.py b/erpnext/hub_node/data_migration_mapping/hub_message_to_lead/__init__.py
index 79769ee..0ea1bc4 100644
--- a/erpnext/hub_node/data_migration_mapping/hub_message_to_lead/__init__.py
+++ b/erpnext/hub_node/data_migration_mapping/hub_message_to_lead/__init__.py
@@ -20,7 +20,7 @@
 	opportunity = frappe.get_doc({
 		'doctype': 'Opportunity',
 		'naming_series': 'OPTY-',
-		'enquiry_type': 'Sales',
+		'opportunity_type': 'Hub',
 		'enquiry_from': 'Lead',
 		'status': 'Open',
 		'lead': lead.name,
diff --git a/erpnext/hub_node/page/hub/hub.js b/erpnext/hub_node/page/hub/hub.js
index 8a715b8..15bd97d 100644
--- a/erpnext/hub_node/page/hub/hub.js
+++ b/erpnext/hub_node/page/hub/hub.js
@@ -215,7 +215,7 @@
 			.on('click', '.company-link a', function(e) {
 				e.preventDefault();
 				const company_name = $(this).attr('data-company-name');
-				me.get_company_details(company_name);
+				frappe.set_route('hub', 'Company', company_name);
 			})
 			.on('click', '.breadcrumb li', function(e) {
 				e.preventDefault();
@@ -476,26 +476,34 @@
 	}
 
 	get_company_details(company_id) {
-		// get from cache if exists
-		let company_details = this.company_cache[company_id];
-		if(this.company_cache[company_id]) {
-			this.go_to_company_page(company_details);
-			return;
-		}
-		frappe.call({
-			method: 'erpnext.hub_node.get_company_details',
-			args: {hub_sync_id: company_id}
-		}).then((r) => {
-			if (r.message) {
-				const company_details = r.message.company_details;
-				this.company_cache[company_id] = company_details;
-				this.go_to_company_page(company_details)
+		this.company_cache = this.company_cache || {};
+
+		return new Promise(resolve => {
+			// get from cache if exists
+			let company_details = this.company_cache[company_id];
+			if(company_details) {
+				resolve(company_details);
+				return;
 			}
-		});
+			frappe.call({
+				method: 'erpnext.hub_node.get_company_details',
+				args: {hub_sync_id: company_id}
+			}).then((r) => {
+				if (r.message) {
+					const company_details = r.message;
+					this.company_cache[company_id] = company_details;
+					resolve(company_details)
+				}
+			});
+		})
 	}
 
-	go_to_company_page(company_details) {
-		frappe.set_route('hub', 'Company', company_details.company_name);
+	go_to_company_page(company_id) {
+		this.get_company_details(company_id)
+			.then(this.show_company_page.bind(this));
+	}
+
+	show_company_page(company_details) {
 		this.$hub_main_section.empty();
 
 		let $company_page =
@@ -574,10 +582,10 @@
 							<h2>${ company_details.company_name }</h2>
 						</div>
 						<div class="company">
-							<span class="">${ company_details.seller_city }</span>
+							<span class="">${ company_details.country }</span>
 						</div>
 						<div class="description">
-							<span class="small">${ company_details.seller_description }</span>
+							<span class="small">${ company_details.site_name }</span>
 						</div>
 					</div>
 
@@ -836,7 +844,7 @@
 					</div>
 				</a>
 				<div class="company-link">
-					<a data-company-name="${ item.company_id }" class="">${ item.company_name }</a>
+					<a data-company-name="${ item.company_name }" class="">${ item.company_name }</a>
 				</div>
 				<div>${ item.formatted_price ? item.formatted_price : ''}</div>
 			</div>
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
index d1de7e3..079ec68 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
@@ -101,7 +101,7 @@
    "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
    "unique": 0
@@ -653,7 +653,7 @@
    "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -685,7 +685,7 @@
    "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -764,7 +764,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-06-13 14:29:01.615516", 
+ "modified": "2017-10-17 07:57:01.723090", 
  "modified_by": "Administrator", 
  "module": "Maintenance", 
  "name": "Maintenance Schedule", 
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/test_maintenance_schedule.js b/erpnext/maintenance/doctype/maintenance_schedule/test_maintenance_schedule.js
new file mode 100644
index 0000000..e0f05b1
--- /dev/null
+++ b/erpnext/maintenance/doctype/maintenance_schedule/test_maintenance_schedule.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Maintenance Schedule", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Maintenance Schedule
+		() => frappe.tests.make('Maintenance Schedule', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json b/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
index c6aac14..2f159e9 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
+++ b/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
@@ -13,6 +14,7 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -44,6 +46,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -62,6 +65,7 @@
    "no_copy": 0, 
    "oldfieldname": "item_name", 
    "oldfieldtype": "Data", 
+   "options": "item_code.item_name", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -74,6 +78,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -85,13 +90,14 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Data", 
+   "options": "item_code.description", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -106,6 +112,7 @@
    "width": "300px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -134,6 +141,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -164,6 +172,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -194,6 +203,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -225,6 +235,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -249,12 +260,13 @@
    "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -280,12 +292,13 @@
    "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -314,6 +327,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -344,6 +358,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -377,17 +392,17 @@
    "width": "150px"
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-02-17 17:06:21.448695", 
+ "modified": "2017-10-17 08:37:28.964789", 
  "modified_by": "Administrator", 
  "module": "Maintenance", 
  "name": "Maintenance Schedule Item", 
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index b140bf5..d0cf609 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -587,7 +587,11 @@
 		frappe.throw(_("BOM {0} does not belong to Item {1}").format(bom_no, item))
 
 @frappe.whitelist()
-def get_children():
+def get_children(doctype, parent=None, is_tree=False):
+	if not parent:
+		frappe.msgprint(_('Please select a BOM'))
+		return
+
 	if frappe.form_dict.parent:
 		return frappe.db.sql("""select
 			bom_item.item_code,
diff --git a/erpnext/manufacturing/doctype/bom/bom_tree.js b/erpnext/manufacturing/doctype/bom/bom_tree.js
index 09fe037..854f633 100644
--- a/erpnext/manufacturing/doctype/bom/bom_tree.js
+++ b/erpnext/manufacturing/doctype/bom/bom_tree.js
@@ -11,7 +11,7 @@
 	title: "BOM",
 	breadcrumb: "Manufacturing",
 	disable_add_node: true,
-	root_label: "bom", //fieldname from filters
+	root_label: "All Bill of Materials", //fieldname from filters
 	get_label: function(node) {
 		if(node.data.qty) {
 			return node.data.qty + " x " + node.data.item_code;
diff --git a/erpnext/manufacturing/doctype/operation/test_operation.js b/erpnext/manufacturing/doctype/operation/test_operation.js
index 42553ce..fd7783f 100644
--- a/erpnext/manufacturing/doctype/operation/test_operation.js
+++ b/erpnext/manufacturing/doctype/operation/test_operation.js
@@ -7,7 +7,7 @@
 
 		// Create a Keyboard operation
 		() => {
-			frappe.tests.make(
+			return frappe.tests.make(
 				"Operation", [
 					{__newname: "Assemble Keyboard"},
 					{workstation: "Keyboard assembly workstation"}
@@ -24,7 +24,7 @@
 
 		// Create a Screen operation
 		() => {
-			frappe.tests.make(
+			return frappe.tests.make(
 				"Operation", [
 					{__newname: 'Assemble Screen'},
 					{workstation: "Screen assembly workstation"}
@@ -35,7 +35,7 @@
 
 		// Create a CPU operation
 		() => {
-			frappe.tests.make(
+			return frappe.tests.make(
 				"Operation", [
 					{__newname: 'Assemble CPU'},
 					{workstation: "CPU assembly workstation"}
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.js b/erpnext/manufacturing/doctype/production_order/production_order.js
index 68a5dc4..fb7ced9 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.js
+++ b/erpnext/manufacturing/doctype/production_order/production_order.js
@@ -17,6 +17,14 @@
 			}
 		});
 		
+		frm.set_query("source_warehouse", function() {
+			return {
+				filters: {
+					'company': frm.doc.company,
+				}
+			}
+		});
+		
 		frm.set_query("source_warehouse", "required_items", function() {
 			return {
 				filters: {
@@ -160,6 +168,8 @@
 				freeze: true,
 				callback: function(r) {
 					if(r.message) {
+						frm.set_value('sales_order', "");
+						frm.trigger('set_sales_order');
 						erpnext.in_production_item_onchange = true;
 						$.each(["description", "stock_uom", "project", "bom_no"], function(i, field) {
 							frm.set_value(field, r.message[field]);
@@ -207,6 +217,24 @@
 	before_submit: function(frm) {
 		frm.toggle_reqd(["fg_warehouse", "wip_warehouse"], true);
 		frm.fields_dict.required_items.grid.toggle_reqd("source_warehouse", true);
+	},
+
+	set_sales_order: function(frm) {
+		if(frm.doc.production_item) {
+			frappe.call({
+				method: "erpnext.manufacturing.doctype.production_order.production_order.query_sales_order",
+				args: { production_item: frm.doc.production_item },
+				callback: function(r) {
+					frm.set_query("sales_order", function() {
+						return {
+							filters: [
+								["Sales Order","name", "in", r.message]
+							]
+						}
+					});
+				}
+			});
+		}
 	}
 });
 
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.json b/erpnext/manufacturing/doctype/production_order/production_order.json
index e56e5a1..a5428aa 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.json
+++ b/erpnext/manufacturing/doctype/production_order/production_order.json
@@ -1320,6 +1320,36 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "sales_order_item", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Sales Order Item", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1358,7 +1388,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-07-10 14:29:00.457874", 
+ "modified": "2017-11-03 05:31:56.636724", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Production Order", 
@@ -1412,5 +1442,5 @@
  "sort_order": "ASC", 
  "title_field": "production_item", 
  "track_changes": 1, 
- "track_seen": 0
+ "track_seen": 1
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.py b/erpnext/manufacturing/doctype/production_order/production_order.py
index 891e6dc..7c56d97 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.py
+++ b/erpnext/manufacturing/doctype/production_order/production_order.py
@@ -35,6 +35,7 @@
 			validate_bom_no(self.production_item, self.bom_no)
 
 		self.validate_sales_order()
+		self.set_default_warehouse()
 		self.validate_warehouse_belongs_to_company()
 		self.calculate_operating_cost()
 		self.validate_qty()
@@ -49,10 +50,13 @@
 		if self.sales_order:
 			so = frappe.db.sql("""
 				select so.name, so_item.delivery_date, so.project
-				from `tabSales Order` so, `tabSales Order Item` so_item
-				where so.name=%s and so.name=so_item.parent
-					and so.docstatus = 1 and so_item.item_code=%s
-			""", (self.sales_order, self.production_item), as_dict=1)
+				from `tabSales Order` so
+				inner join `tabSales Order Item` so_item on so_item.parent = so.name
+				left join `tabProduct Bundle Item` pk_item on so_item.item_code = pk_item.parent
+				where so.name=%s and so.docstatus = 1 and (
+					so_item.item_code=%s or
+					pk_item.item_code=%s )
+			""", (self.sales_order, self.production_item, self.production_item), as_dict=1)
 
 			if not so:
 				so = frappe.db.sql("""
@@ -79,6 +83,12 @@
 			else:
 				frappe.throw(_("Sales Order {0} is not valid").format(self.sales_order))
 
+	def set_default_warehouse(self):
+		if not self.wip_warehouse:
+			self.wip_warehouse = frappe.db.get_single_value("Manufacturing Settings", "default_wip_warehouse")
+		if not self.fg_warehouse:
+			self.fg_warehouse = frappe.db.get_single_value("Manufacturing Settings", "default_fg_warehouse")
+	
 	def validate_warehouse_belongs_to_company(self):
 		warehouses = [self.fg_warehouse, self.wip_warehouse]
 		for d in self.get("required_items"):
@@ -571,30 +581,6 @@
 	return stock_entry.as_dict()
 
 @frappe.whitelist()
-def get_events(start, end, filters=None):
-	"""Returns events for Gantt / Calendar view rendering.
-
-	:param start: Start date-time.
-	:param end: End date-time.
-	:param filters: Filters (JSON).
-	"""
-	from frappe.desk.calendar import get_event_conditions
-	conditions = get_event_conditions("Production Order", filters)
-
-	data = frappe.db.sql("""select name, production_item, planned_start_date,
-		planned_end_date, status
-		from `tabProduction Order`
-		where ((ifnull(planned_start_date, '0000-00-00')!= '0000-00-00') \
-				and (planned_start_date <= %(end)s) \
-			and ((ifnull(planned_start_date, '0000-00-00')!= '0000-00-00') \
-				and ifnull(planned_end_date, '2199-12-31 00:00:00') >= %(start)s)) {conditions}
-		""".format(conditions=conditions), {
-			"start": start,
-			"end": end
-		}, as_dict=True, update={"allDay": 0})
-	return data
-
-@frappe.whitelist()
 def make_timesheet(production_order, company):
 	timesheet = frappe.new_doc("Timesheet")
 	timesheet.employee = ""
@@ -645,3 +631,15 @@
 	pro_order.notify_update()
 
 	return pro_order.status
+
+@frappe.whitelist()
+def query_sales_order(production_item):
+	out = frappe.db.sql_list("""
+		select distinct so.name from `tabSales Order` so, `tabSales Order Item` so_item
+		where so_item.parent=so.name and so_item.item_code=%s and so.docstatus=1
+	union
+		select distinct so.name from `tabSales Order` so, `tabPacked Item` pi_item
+		where pi_item.parent=so.name and pi_item.item_code=%s and so.docstatus=1
+	""", (production_item, production_item))
+	
+	return out
diff --git a/erpnext/manufacturing/doctype/production_order/production_order_calendar.js b/erpnext/manufacturing/doctype/production_order/production_order_calendar.js
index 47cac28..ce2600a 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order_calendar.js
+++ b/erpnext/manufacturing/doctype/production_order/production_order_calendar.js
@@ -42,5 +42,5 @@
 			"label": __("WIP Warehouse")
 		}
 	],
-	get_events_method: "erpnext.manufacturing.doctype.production_order.production_order.get_events"
+	get_events_method: "frappe.desk.calendar.get_events"
 }
diff --git a/erpnext/manufacturing/doctype/production_order/test_production_order.js b/erpnext/manufacturing/doctype/production_order/test_production_order.js
index 32cc3ef..3a2e5ce 100644
--- a/erpnext/manufacturing/doctype/production_order/test_production_order.js
+++ b/erpnext/manufacturing/doctype/production_order/test_production_order.js
@@ -15,8 +15,8 @@
 
 	frappe.run_serially([
 		// test production order
-		() => frappe.set_route("List", "Production Order"),
-		() => frappe.timeout(0.5),
+		() => frappe.set_route("List", "Production Order", "List"),
+		() => frappe.timeout(3),
 
 		// Create a laptop production order
 		() => {
@@ -29,7 +29,7 @@
 				{fg_warehouse: "Finished Goods - FT"}
 			]);
 		},
-		() => frappe.timeout(2),
+		() => frappe.timeout(3),
 		() => {
 			assert.equal(cur_frm.doc.planned_operating_cost, cur_frm.doc.total_operating_cost,
 				"Total and Planned Cost is equal");
@@ -54,7 +54,7 @@
 		() => cur_frm.savesubmit(),
 		() => frappe.timeout(1),
 		() => frappe.click_button('Yes'),
-		() => frappe.timeout(1),
+		() => frappe.timeout(2.5),
 
 		// Confirm the production order timesheet, save and submit it
 		() => frappe.click_link("TS-00"),
@@ -62,12 +62,10 @@
 		() => frappe.click_button("Submit"),
 		() => frappe.timeout(1),
 		() => frappe.click_button("Yes"),
-		() => frappe.timeout(2),
+		() => frappe.timeout(2.5),
 
 		// Start the production order process
-		() => frappe.set_route("List", "Production Order"),
-		() => frappe.timeout(.5),
-		() => frappe.set_route("List", "Production Order"),
+		() => frappe.set_route("List", "Production Order", "List"),
 		() => frappe.timeout(2),
 		() => frappe.click_link("Laptop"),
 		() => frappe.timeout(1),
@@ -120,7 +118,7 @@
 		() => frappe.timeout(1),
 
 		// Manufacturing finished
-		() => frappe.set_route("List", "Production Order"),
+		() => frappe.set_route("List", "Production Order", "List"),
 		() => frappe.timeout(1),
 		() => frappe.click_link("Laptop"),
 		() => frappe.timeout(1),
diff --git a/erpnext/manufacturing/page/production_analytics/production_analytics.js b/erpnext/manufacturing/page/production_analytics/production_analytics.js
index 39168b7..efbd0a5 100644
--- a/erpnext/manufacturing/page/production_analytics/production_analytics.js
+++ b/erpnext/manufacturing/page/production_analytics/production_analytics.js
@@ -64,7 +64,7 @@
 
 		var chart_data = this.get_chart_data ? this.get_chart_data() : null;
 
-		this.chart = new frappe.chart.FrappeChart({
+		this.chart = new Chart({
 			parent: ".chart",
 			data: chart_data,
 			type: 'line'
diff --git a/erpnext/modules.txt b/erpnext/modules.txt
index 5e9f6c7..42f0f0b 100644
--- a/erpnext/modules.txt
+++ b/erpnext/modules.txt
@@ -10,10 +10,14 @@
 Support
 Utilities
 Shopping Cart
+Assets
 Hub Node
 Portal
 Maintenance
-Schools
+Education
 Regional
 Healthcare
 Restaurant
+Agriculture
+ERPNext Integrations
+Non Profit
\ No newline at end of file
diff --git a/erpnext/schools/__init__.py b/erpnext/non_profit/__init__.py
similarity index 100%
copy from erpnext/schools/__init__.py
copy to erpnext/non_profit/__init__.py
diff --git a/erpnext/schools/doctype/__init__.py b/erpnext/non_profit/doctype/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/__init__.py
copy to erpnext/non_profit/doctype/__init__.py
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/non_profit/doctype/chapter/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/non_profit/doctype/chapter/__init__.py
diff --git a/erpnext/non_profit/doctype/chapter/chapter.js b/erpnext/non_profit/doctype/chapter/chapter.js
new file mode 100644
index 0000000..c8b6d4a
--- /dev/null
+++ b/erpnext/non_profit/doctype/chapter/chapter.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Chapter', {
+	refresh: function() {
+
+	}
+});
diff --git a/erpnext/non_profit/doctype/chapter/chapter.json b/erpnext/non_profit/doctype/chapter/chapter.json
new file mode 100644
index 0000000..b5f6ad5
--- /dev/null
+++ b/erpnext/non_profit/doctype/chapter/chapter.json
@@ -0,0 +1,397 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 1, 
+ "allow_import": 0, 
+ "allow_rename": 1, 
+ "autoname": "prompt", 
+ "beta": 0, 
+ "creation": "2017-09-14 13:36:03.904702", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "chapter_head", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Chapter Head", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "User", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "region", 
+   "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": "Region", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "introduction", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Introduction", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "meetup_embed_html", 
+   "fieldtype": "Code", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Meetup Embed HTML", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "address", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Address", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "chapters/chapter_name\nleave blank automatically set after saving chapter.", 
+   "fieldname": "route", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Route", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "published", 
+   "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": "Published", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "chapter_members", 
+   "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": "Chapter Members", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "members", 
+   "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": "Members", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Chapter Member", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 1, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_published_field": "published", 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-06 11:45:54.559482", 
+ "modified_by": "Administrator", 
+ "module": "Non Profit", 
+ "name": "Chapter", 
+ "name_case": "Title Case", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Non Profit Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Non Profit", 
+ "route": "chapters", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/chapter/chapter.py b/erpnext/non_profit/doctype/chapter/chapter.py
new file mode 100644
index 0000000..d484882
--- /dev/null
+++ b/erpnext/non_profit/doctype/chapter/chapter.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.website.website_generator import WebsiteGenerator
+
+class Chapter(WebsiteGenerator):
+	_website = frappe._dict(
+		condition_field = "published",
+	)
+
+	def get_context(self, context):
+		context.no_cache = True
+		context.show_sidebar = True
+		context.parents = [dict(label='View All Chapters',
+			route='chapters', title='View Chapters')]
+
+	def validate(self):
+		if not self.route:		#pylint: disable=E0203
+			self.route = 'chapters/' + self.scrub(self.name)
+
+	def enable(self):
+		chapter = frappe.get_doc('Chapter', frappe.form_dict.name)
+		chapter.append('members', dict(enable=self.value))
+		chapter.save(ignore_permissions=1)
+		frappe.db.commit()
+
+
+def get_list_context(context):
+	context.allow_guest = True
+	context.no_cache = True
+	context.show_sidebar = True
+	context.title = 'All Chapters'
+	context.no_breadcrumbs = True
+	context.order_by = 'creation desc'
+	context.introduction = '<p>All Chapters</p>'
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/chapter/templates/chapter.html b/erpnext/non_profit/doctype/chapter/templates/chapter.html
new file mode 100644
index 0000000..8953481
--- /dev/null
+++ b/erpnext/non_profit/doctype/chapter/templates/chapter.html
@@ -0,0 +1,66 @@
+{% extends "templates/web.html" %}
+
+{% block page_content %}
+<h1>{{ title }}</h1>
+<h3>Details</h3>
+<p>{{ introduction }}</p>
+{% if meetup_embed_html %}
+{{ meetup_embed_html }}
+{% endif %}
+<h3>List of Members</h3>
+{% if members %}
+	<table class="table table-bordered small" style="max-width: 500px;">
+		<tr>
+			<th width="15%" ></th>
+			<th>Member Details</th>
+		</tr>
+		{% for user in members %}
+			<tr>
+				<td>{{ loop.index }}</td>
+				<td>
+					<div class="row">
+						<div class="col-lg-6 col-md-6 col-sm-6">{{ frappe.db.get_value('User', user.user, 'full_name') }}</div>
+						<div class="col-lg-6 col-md-6 col-sm-6 text-right">
+							{% if user.website_url %}
+								<a href="{{ user.website_url }}">{{ user.website_url or '' }}</a>
+							{% endif %}
+						</div>
+						<div class="col-lg-12">
+						{% if user.introduction %}
+							{{ user.introduction }}
+						{% endif %}
+						</div>
+					</div>
+				</td>
+			</tr>
+		{% endfor %}
+	</table>
+{% else %}
+	<p>No member yet.</p>
+{% endif %}
+
+<h3>Chapter Head</h3>
+<table class="table table-bordered small" style="max-width: 500px;">
+	<tr>
+		<td style='width: 15%'>Name</td>
+		<td>{{ frappe.db.get_value('User', chapter_head, 'full_name') }}</td>
+	</tr>
+	<tr>
+		<td>Email</td>
+		<td>{{ frappe.db.get_value('User', chapter_head, 'email') or '' }}</td>
+	</tr>
+	<tr>
+		<td>Phone</td>
+		<td>{{ frappe.db.get_value('User', chapter_head, 'phone') or '' }}</td>
+	</tr>
+</table>
+<h3>Address</h3>
+<p>{{ address }}</p>
+
+<p style="margin: 20px 0 30px;"><a href="/non_profit/join-chapter?name={{ name }}" class='btn btn-primary'>Join this Chapter</a></p>
+<p style="margin: 20px 0 30px;"><a href="/non_profit/leave-chapter?name={{ name }}" class=''>Leave this Chapter</a></p>
+
+
+{% endblock %}
+
+<!-- this is a sample default web page template -->
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/chapter/templates/chapter_row.html b/erpnext/non_profit/doctype/chapter/templates/chapter_row.html
new file mode 100644
index 0000000..67fb0c5
--- /dev/null
+++ b/erpnext/non_profit/doctype/chapter/templates/chapter_row.html
@@ -0,0 +1,60 @@
+{% if doc.published %}
+	<div style="margin-bottom: 30px; max-width: 600px" class="with-border clickable">
+		<a href="/{{ doc.route }}">
+			<h3>{{ doc.name }}</h3>
+			<p>
+				<span class="label">{{ frappe.db.get_value('User', chapter_head, 'full_name') }}</span>
+				<span class="label">
+					{% if members %}
+						Members: {{ members|length }}
+					{% else %}
+						Members: 0
+					{% endif %}
+				</span>
+			</p>
+			<p>{{ html2text(doc.introduction[:200]) }}{% if introduction|len > 200 %}...{% endif %}</p>
+		</a>
+	</div>
+{% endif %}
+<style type="text/css">
+
+.label {
+	font-weight: normal;
+	background-color: #d1d8dd;
+	font-size: 13px;
+	padding: 3px 7px;
+	margin-right: 10px;
+}
+
+
+.with-border {
+	border: 1px solid #d1d8dd;
+	border-radius: 3px;
+	padding: 15px;
+	margin-bottom: 30px;
+}
+
+.with-border h3 {
+	margin-top: 0px;
+}
+
+a {
+	color: #5E64FF;
+}
+
+.clickable a {
+	color: #161c23;
+}
+
+.with-border.clickable:hover {
+	border-color: #36414C;
+	background-color: #fafbfc;
+
+}
+
+.with-border a, .with-border a:hover {
+	text-decoration: none;
+}
+
+
+</style>
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/chapter/test_chapter.js b/erpnext/non_profit/doctype/chapter/test_chapter.js
new file mode 100644
index 0000000..e30d6a5
--- /dev/null
+++ b/erpnext/non_profit/doctype/chapter/test_chapter.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Chapter", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Chapter
+		() => frappe.tests.make('Chapter', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/non_profit/doctype/chapter/test_chapter.py b/erpnext/non_profit/doctype/chapter/test_chapter.py
new file mode 100644
index 0000000..d757a1f
--- /dev/null
+++ b/erpnext/non_profit/doctype/chapter/test_chapter.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import unittest
+
+class TestChapter(unittest.TestCase):
+	pass
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/non_profit/doctype/chapter_member/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/non_profit/doctype/chapter_member/__init__.py
diff --git a/erpnext/non_profit/doctype/chapter_member/chapter_member.json b/erpnext/non_profit/doctype/chapter_member/chapter_member.json
new file mode 100644
index 0000000..ba78a67
--- /dev/null
+++ b/erpnext/non_profit/doctype/chapter_member/chapter_member.json
@@ -0,0 +1,163 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-09-14 13:38:04.296375", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "user", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "User", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "User", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "introduction", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Introduction", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "website_url", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Website URL", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "enabled", 
+   "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": "Enabled", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-12-06 11:33:34.300252", 
+ "modified_by": "Administrator", 
+ "module": "Non Profit", 
+ "name": "Chapter Member", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Non Profit", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/chapter_member/chapter_member.py b/erpnext/non_profit/doctype/chapter_member/chapter_member.py
new file mode 100644
index 0000000..c4b8999
--- /dev/null
+++ b/erpnext/non_profit/doctype/chapter_member/chapter_member.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+class ChapterMember(Document):
+	pass
+
+
diff --git a/erpnext/schools/doctype/instructor/__init__.py b/erpnext/non_profit/doctype/donor/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/instructor/__init__.py
copy to erpnext/non_profit/doctype/donor/__init__.py
diff --git a/erpnext/non_profit/doctype/donor/donor.js b/erpnext/non_profit/doctype/donor/donor.js
new file mode 100644
index 0000000..090d5af
--- /dev/null
+++ b/erpnext/non_profit/doctype/donor/donor.js
@@ -0,0 +1,17 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Donor', {
+	refresh: function(frm) {
+		frappe.dynamic_link = {doc: frm.doc, fieldname: 'name', doctype: 'Donor'};
+
+		frm.toggle_display(['address_html','contact_html'], !frm.doc.__islocal);
+
+		if(!frm.doc.__islocal) {
+			frappe.contacts.render_address_and_contact(frm);
+		} else {
+			frappe.contacts.clear_address_and_contact(frm);
+		}
+
+	}
+});
diff --git a/erpnext/non_profit/doctype/donor/donor.json b/erpnext/non_profit/doctype/donor/donor.json
new file mode 100644
index 0000000..c940bda
--- /dev/null
+++ b/erpnext/non_profit/doctype/donor/donor.json
@@ -0,0 +1,335 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:email", 
+ "beta": 0, 
+ "creation": "2017-09-19 16:20:27.510196", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "donor_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Donor Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_5", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "donor_type", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Donor Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Donor Type", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "email", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Email", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "address_contacts", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Address and Contact", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "fa fa-map-marker", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "address_html", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Address HTML", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_9", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "contact_html", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Contact HTML", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_field": "image", 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-05 07:02:06.690416", 
+ "modified_by": "Administrator", 
+ "module": "Non Profit", 
+ "name": "Donor", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Non Profit Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Non Profit", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/donor/donor.py b/erpnext/non_profit/doctype/donor/donor.py
new file mode 100644
index 0000000..9121d0c
--- /dev/null
+++ b/erpnext/non_profit/doctype/donor/donor.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+from frappe.contacts.address_and_contact import load_address_and_contact
+
+class Donor(Document):
+	def onload(self):
+		"""Load address and contacts in `__onload`"""
+		load_address_and_contact(self)
+
diff --git a/erpnext/non_profit/doctype/donor/donor_list.js b/erpnext/non_profit/doctype/donor/donor_list.js
new file mode 100644
index 0000000..31d4d29
--- /dev/null
+++ b/erpnext/non_profit/doctype/donor/donor_list.js
@@ -0,0 +1,3 @@
+frappe.listview_settings['Donor'] = {
+	add_fields: ["donor_name", "donor_type", "image"],
+};
diff --git a/erpnext/non_profit/doctype/donor/test_donor.js b/erpnext/non_profit/doctype/donor/test_donor.js
new file mode 100644
index 0000000..e478b34
--- /dev/null
+++ b/erpnext/non_profit/doctype/donor/test_donor.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Donor", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(3);
+
+	frappe.run_serially([
+		// insert a new Member
+		() => frappe.tests.make('Donor', [
+			// values to be set
+			{donor_name: 'Test Donor'},
+			{donor_type: 'Test Organization'},
+			{email: 'test@example.com'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.donor_name, 'Test Donor');
+			assert.equal(cur_frm.doc.donor_type, 'Test Organization');
+			assert.equal(cur_frm.doc.email, 'test@example.com');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/non_profit/doctype/donor/test_donor.py b/erpnext/non_profit/doctype/donor/test_donor.py
new file mode 100644
index 0000000..3b6724e
--- /dev/null
+++ b/erpnext/non_profit/doctype/donor/test_donor.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import unittest
+
+class TestDonor(unittest.TestCase):
+	pass
diff --git a/erpnext/schools/doctype/__init__.py b/erpnext/non_profit/doctype/donor_type/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/__init__.py
copy to erpnext/non_profit/doctype/donor_type/__init__.py
diff --git a/erpnext/non_profit/doctype/donor_type/donor_type.js b/erpnext/non_profit/doctype/donor_type/donor_type.js
new file mode 100644
index 0000000..7b1fd4f
--- /dev/null
+++ b/erpnext/non_profit/doctype/donor_type/donor_type.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Donor Type', {
+	refresh: function() {
+
+	}
+});
diff --git a/erpnext/non_profit/doctype/donor_type/donor_type.json b/erpnext/non_profit/doctype/donor_type/donor_type.json
new file mode 100644
index 0000000..07118fd
--- /dev/null
+++ b/erpnext/non_profit/doctype/donor_type/donor_type.json
@@ -0,0 +1,94 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:donor_type", 
+ "beta": 0, 
+ "creation": "2017-09-19 16:19:16.639635", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "donor_type", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Donor Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-05 07:04:36.757595", 
+ "modified_by": "Administrator", 
+ "module": "Non Profit", 
+ "name": "Donor Type", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Non Profit Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Non Profit", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/donor_type/donor_type.py b/erpnext/non_profit/doctype/donor_type/donor_type.py
new file mode 100644
index 0000000..e9262ac
--- /dev/null
+++ b/erpnext/non_profit/doctype/donor_type/donor_type.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+class DonorType(Document):
+	pass
diff --git a/erpnext/non_profit/doctype/donor_type/test_donor_type.js b/erpnext/non_profit/doctype/donor_type/test_donor_type.js
new file mode 100644
index 0000000..22dc18e
--- /dev/null
+++ b/erpnext/non_profit/doctype/donor_type/test_donor_type.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Donor Type", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Member
+		() => frappe.tests.make('Donor Type', [
+			// values to be set
+			{donor_type: 'Test Organization'},
+		]),
+		() => {
+			assert.equal(cur_frm.doc.donor_type, 'Test Organization');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/non_profit/doctype/donor_type/test_donor_type.py b/erpnext/non_profit/doctype/donor_type/test_donor_type.py
new file mode 100644
index 0000000..e793913
--- /dev/null
+++ b/erpnext/non_profit/doctype/donor_type/test_donor_type.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+
+import unittest
+
+class TestDonorType(unittest.TestCase):
+	pass
diff --git a/erpnext/schools/doctype/student_leave_application/__init__.py b/erpnext/non_profit/doctype/grant_application/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/student_leave_application/__init__.py
copy to erpnext/non_profit/doctype/grant_application/__init__.py
diff --git a/erpnext/non_profit/doctype/grant_application/grant_application.js b/erpnext/non_profit/doctype/grant_application/grant_application.js
new file mode 100644
index 0000000..70f319b
--- /dev/null
+++ b/erpnext/non_profit/doctype/grant_application/grant_application.js
@@ -0,0 +1,27 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Grant Application', {
+	refresh: function(frm) {
+		frappe.dynamic_link = {doc: frm.doc, fieldname: 'name', doctype: 'Grant Application'};
+
+		frm.toggle_display(['address_html','contact_html'], !frm.doc.__islocal);
+
+		if(!frm.doc.__islocal) {
+			frappe.contacts.render_address_and_contact(frm);
+		} else {
+			frappe.contacts.clear_address_and_contact(frm);
+		}
+
+		if(frm.doc.status == 'Received' && !frm.doc.email_notification_sent){
+			frm.add_custom_button(__("Send Grant Review Email"), function() {
+				frappe.call({
+					method: "erpnext.non_profit.doctype.grant_application.grant_application.send_grant_review_emails",
+					args: {
+						grant_application: frm.doc.name
+					}
+				});
+			});
+		}
+	}
+});
diff --git a/erpnext/non_profit/doctype/grant_application/grant_application.json b/erpnext/non_profit/doctype/grant_application/grant_application.json
new file mode 100644
index 0000000..2eb2087
--- /dev/null
+++ b/erpnext/non_profit/doctype/grant_application/grant_application.json
@@ -0,0 +1,851 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 1, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "", 
+ "beta": 0, 
+ "creation": "2017-09-21 12:02:01.206913", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "applicant_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Applicant Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Individual\nOrganization", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "applicant_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.applicant_type=='Organization'", 
+   "fieldname": "contact_person", 
+   "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": "Contact Person", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "email", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Email", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_5", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Open", 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Open\nReceived\nIn Progress\nApproved\nRejected\nExpired\nWithdrawn", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "website_url", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Website URL", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "address_contacts", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Address and Contact", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "fa fa-map-marker", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "address_html", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Address HTML", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_9", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "contact_html", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Contact HTML", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "grant_application_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Grant Application Details ", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "grant_description", 
+   "fieldtype": "Long Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Grant Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_15", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Requested Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "has_any_past_grant_record", 
+   "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": "Has any past Grant Record", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_17", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "route", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Route", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "published", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Show on Website", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assessment_result", 
+   "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": "Assessment Result", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assessment_mark", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Assessment  Mark (Out of 10)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "note", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Note", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_24", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assessment_manager", 
+   "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": "Assessment  Manager", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "User", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "email_notification_sent", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Email Notification Sent", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 1, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_field": "", 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_published_field": "published", 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-06 12:39:57.677899", 
+ "modified_by": "Administrator", 
+ "module": "Non Profit", 
+ "name": "Grant Application", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Non Profit Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Non Profit", 
+ "route": "grant-application", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "applicant_name", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/grant_application/grant_application.py b/erpnext/non_profit/doctype/grant_application/grant_application.py
new file mode 100644
index 0000000..f0123b2
--- /dev/null
+++ b/erpnext/non_profit/doctype/grant_application/grant_application.py
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.website.website_generator import WebsiteGenerator
+from frappe.contacts.address_and_contact import load_address_and_contact
+from frappe.utils import get_url
+
+class GrantApplication(WebsiteGenerator):
+	_website = frappe._dict(
+		condition_field = "published",
+	)
+
+	def validate(self):
+		if not self.route:	#pylint: disable=E0203
+			self.route = 'grant-application/' + self.scrub(self.name)
+
+	def onload(self):
+		"""Load address and contacts in `__onload`"""
+		load_address_and_contact(self)
+
+	def get_context(self, context):
+		context.no_cache = True
+		context.show_sidebar = True
+		context.parents = [dict(label='View All Grant Applications',
+			route='grant-application', title='View Grants')]
+
+def get_list_context(context):
+	context.allow_guest = True
+	context.no_cache = True
+	context.no_breadcrumbs = True
+	context.show_sidebar = True
+	context.order_by = 'creation desc'
+	context.introduction ='''<a class="btn btn-primary" href="/my-grant?new=1">
+		Apply for new Grant Application</a>'''
+
+@frappe.whitelist()
+def send_grant_review_emails(grant_application):
+	grant = frappe.get_doc("Grant Application", grant_application)
+	url =  get_url('grant-application/{0}'.format(grant_application))
+	frappe.sendmail(
+		recipients= grant.assessment_manager,
+		sender=frappe.session.user,
+		subject='Grant Application for {0}'.format(grant.applicant_name),
+		message='<p> Please Review this grant application</p><br>' + url,
+		reference_doctype=grant.doctype,
+		reference_name=grant.name
+	)
+
+	grant.status = 'In Progress'
+	grant.email_notification_sent = 1
+	grant.save()
+	frappe.db.commit()
+
+	frappe.msgprint(_("Review Invitation Sent"))
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/grant_application/templates/grant_application.html b/erpnext/non_profit/doctype/grant_application/templates/grant_application.html
new file mode 100644
index 0000000..8fecdad
--- /dev/null
+++ b/erpnext/non_profit/doctype/grant_application/templates/grant_application.html
@@ -0,0 +1,62 @@
+{% extends "templates/web.html" %}
+
+{% block page_content %}
+	<h1>{{ applicant_name }}</h1>
+	{% if frappe.user == owner %}
+		<p><a class='btn btn-primary btn-sm' href="/my-grant?name={{ name }}">Edit Grant</a></p>
+	{% endif %}
+	<br>
+	<table class='table table-bordered small' style='max-width: 400px; margin-bottom: 0px;'>
+		<tr>
+			<td style='width: 38.2%'>Organization/Indvidual</td>
+			<td>{{ applicant_type }}</td>
+		</tr>
+		<tr>
+			<td>Grant Applicant Name</td>
+			<td>{{ applicant_name}}</td>
+		</tr>
+		<tr>
+			<td>Date</td>
+			<td>{{ frappe.format_date(creation) }}</td>
+		</tr>
+		<tr>
+			<td>Status</td>
+			<td>{{ status }}</td>
+		</tr>
+		<tr>
+			<td>Email</td>
+			<td>{{ email }}</td>
+		</tr>
+	</table>
+	<h2>Q. Please outline your current situation and why you are applying for a grant?</h2>
+	<p>	{{ grant_description }}</p>
+	<h2>Q. Requested grant amount</h2>
+	<p>{{ amount }}</p>
+	<h2>Q. Have you recevied grant from us before?</h2>
+	<p>{{ has_any_past_grant_record }}</p>
+	<h3>Contact</h3>
+	{% if frappe.user != 'Guest' %}
+		<table class='table table-bordered small' style='max-width: 400px; margin-bottom: 0px;'>
+			{% if contact_person %}
+				<tr>
+					<td style='width: 38.2%'>Contact Person</td>
+					<td>{{ contact_person }}</td>
+				</tr>
+			{% endif %}
+			<tr>
+				<td style='width: 38.2%'>Email</td>
+				<td>{{ email }}</td>
+			</tr>
+		</table>
+	{% else %}
+		<p><a href="/login">You must register and login to view contact details</a></p>
+	{% endif %}
+	<br>
+	{% if frappe.session.user == assessment_manager %}
+		{% if assessment_scale %}
+			<p> Assessment Review done </p>
+		{% endif %}
+	{% else %}
+	<p><br><a href="/my-grant?new=1" class='btn btn-primary'>Post a New Grant</a></p>
+	{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/grant_application/templates/grant_application_row.html b/erpnext/non_profit/doctype/grant_application/templates/grant_application_row.html
new file mode 100644
index 0000000..c374959
--- /dev/null
+++ b/erpnext/non_profit/doctype/grant_application/templates/grant_application_row.html
@@ -0,0 +1,51 @@
+{% if doc.published %}
+	<div style='margin-bottom: 30px; max-width: 600px;'
+		class='with-border clickable'>
+		<a href="/{{ doc.route }}">
+			<h3 style='margin-top: 0px;'>{{ doc.name }}</h3>
+			<p>
+				<span class='label'>{{ frappe.format_date(doc.creation) }}</span>
+			</p>
+		</a>
+	</div>
+{% endif %}
+
+<style type="text/css">
+.label {
+	font-weight: normal;
+	background-color: #d1d8dd;
+	font-size: 13px;
+	padding: 3px 7px;
+	margin-right: 10px;
+}
+
+
+.with-border {
+	border: 1px solid #d1d8dd;
+	border-radius: 3px;
+	padding: 15px;
+	margin-bottom: 30px;
+}
+
+.with-border h3 {
+	margin-top: 0px;
+}
+
+a {
+	color: #5E64FF;
+}
+
+.clickable a {
+	color: #161c23;
+}
+
+.with-border.clickable:hover {
+	border-color: #36414C;
+	background-color: #fafbfc;
+
+}
+
+.with-border a, .with-border a:hover {
+	text-decoration: none;
+}
+</style>
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/grant_application/test_grant_application.js b/erpnext/non_profit/doctype/grant_application/test_grant_application.js
new file mode 100644
index 0000000..47230a5
--- /dev/null
+++ b/erpnext/non_profit/doctype/grant_application/test_grant_application.js
@@ -0,0 +1,30 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Grant Application", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(4);
+
+	frappe.run_serially([
+		// insert a new Member
+		() => frappe.tests.make('Grant Application', [
+			// values to be set
+			{applicant_name: 'Test Organization'},
+			{contact_person:'Test Applicant'},
+			{email: 'test@example.com'},
+			{grant_description:'Test message'},
+			{amount: 150000}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.applicant_name, 'Test Organization');
+			assert.equal(cur_frm.doc.contact_person, 'Test Applicant');
+			assert.equal(cur_frm.doc.email, 'test@example.com');
+			assert.equal(cur_frm.doc.amount, 150000);
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/non_profit/doctype/grant_application/test_grant_application.py b/erpnext/non_profit/doctype/grant_application/test_grant_application.py
new file mode 100644
index 0000000..da16acf
--- /dev/null
+++ b/erpnext/non_profit/doctype/grant_application/test_grant_application.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import unittest
+
+class TestGrantApplication(unittest.TestCase):
+	pass
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/non_profit/doctype/member/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/non_profit/doctype/member/__init__.py
diff --git a/erpnext/non_profit/doctype/member/member.js b/erpnext/non_profit/doctype/member/member.js
new file mode 100644
index 0000000..c0468a7
--- /dev/null
+++ b/erpnext/non_profit/doctype/member/member.js
@@ -0,0 +1,45 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Member', {
+	refresh: function(frm) {
+
+		frappe.dynamic_link = {doc: frm.doc, fieldname: 'name', doctype: 'Member'};
+
+		frm.toggle_display(['address_html','contact_html'], !frm.doc.__islocal);
+
+		if(!frm.doc.__islocal) {
+			frappe.contacts.render_address_and_contact(frm);
+
+			// custom buttons
+			frm.add_custom_button(__('Accounting Ledger'), function() {
+				frappe.set_route('query-report', 'General Ledger',
+					{party_type:'Member', party:frm.doc.name});
+			});
+
+			frm.add_custom_button(__('Accounts Receivable'), function() {
+				frappe.set_route('query-report', 'Accounts Receivable', {member:frm.doc.name});
+			});
+
+			// indicator
+			erpnext.utils.set_party_dashboard_indicators(frm);
+
+		} else {
+			frappe.contacts.clear_address_and_contact(frm);
+		}
+
+		frappe.call({
+			method:"frappe.client.get_value",
+			args:{
+				'doctype':"Membership",
+				'filters':{'member': frm.doc.name},
+				'fieldname':[
+					'to_date'
+				]
+			},
+			callback: function (data) {
+				frappe.model.set_value(frm.doctype,frm.docname, "membership_expiry_date", data.message.to_date);
+			}
+		});
+	}
+});
diff --git a/erpnext/non_profit/doctype/member/member.json b/erpnext/non_profit/doctype/member/member.json
new file mode 100644
index 0000000..1c6b9fc
--- /dev/null
+++ b/erpnext/non_profit/doctype/member/member.json
@@ -0,0 +1,385 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:email", 
+ "beta": 0, 
+ "creation": "2017-09-11 09:24:52.898356", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "member_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Member Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "membership_expiry_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": "Membership Expiry Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_5", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "membership_type", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Membership Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Membership Type", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "email", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Email", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "address_contacts", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Address and Contact", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "fa fa-map-marker", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "address_html", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Address HTML", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_9", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "contact_html", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Contact HTML", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_field": "image", 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-05 07:03:21.606732", 
+ "modified_by": "Administrator", 
+ "module": "Non Profit", 
+ "name": "Member", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Non Profit Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Non Profit Member", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Non Profit", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/member/member.py b/erpnext/non_profit/doctype/member/member.py
new file mode 100644
index 0000000..cc617b5
--- /dev/null
+++ b/erpnext/non_profit/doctype/member/member.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+from frappe.contacts.address_and_contact import load_address_and_contact
+
+STANDARD_USERS = ("Guest", "Administrator")
+
+class Member(Document):
+	def onload(self):
+		"""Load address and contacts in `__onload`"""
+		load_address_and_contact(self)
+
+
+	def validate(self):
+		if self.name not in STANDARD_USERS:
+			self.validate_email_type(self.email)
+			self.validate_email_type(self.name)
+
+
+	def validate_email_type(self, email):
+		from frappe.utils import validate_email_add
+		validate_email_add(email.strip(), True)
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/member/member_dashboard.py b/erpnext/non_profit/doctype/member/member_dashboard.py
new file mode 100644
index 0000000..658647c
--- /dev/null
+++ b/erpnext/non_profit/doctype/member/member_dashboard.py
@@ -0,0 +1,14 @@
+from frappe import _
+
+def get_data():
+	return {
+		'heatmap': True,
+		'heatmap_message': _('Memeber Activity'),
+		'fieldname': 'member',
+		'transactions': [
+			{
+				'label': _('Membership Details'),
+				'items': ['Membership']
+			}
+		]
+	}
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/member/member_list.js b/erpnext/non_profit/doctype/member/member_list.js
new file mode 100644
index 0000000..8e41e7f
--- /dev/null
+++ b/erpnext/non_profit/doctype/member/member_list.js
@@ -0,0 +1,3 @@
+frappe.listview_settings['Member'] = {
+	add_fields: ["member_name", "membership_type", "image"],
+};
diff --git a/erpnext/non_profit/doctype/member/test_member.js b/erpnext/non_profit/doctype/member/test_member.js
new file mode 100644
index 0000000..f7cca97
--- /dev/null
+++ b/erpnext/non_profit/doctype/member/test_member.js
@@ -0,0 +1,26 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Member", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(2);
+
+	frappe.run_serially([
+		// insert a new Member
+		() => frappe.tests.make('Member', [
+			// values to be set
+			{member_name: 'Test Member'},
+			{membership_type: 'Gold'},
+			{email: 'test@example.com'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.membership_type, 'Gold');
+			assert.equal(cur_frm.doc.email, 'test@example.com');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/non_profit/doctype/member/test_member.py b/erpnext/non_profit/doctype/member/test_member.py
new file mode 100644
index 0000000..748a500
--- /dev/null
+++ b/erpnext/non_profit/doctype/member/test_member.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import unittest
+
+class TestMember(unittest.TestCase):
+	pass
diff --git a/erpnext/docs/assets/img/schools/setup/__init__.py b/erpnext/non_profit/doctype/membership/__init__.py
similarity index 100%
copy from erpnext/docs/assets/img/schools/setup/__init__.py
copy to erpnext/non_profit/doctype/membership/__init__.py
diff --git a/erpnext/non_profit/doctype/membership/membership.js b/erpnext/non_profit/doctype/membership/membership.js
new file mode 100644
index 0000000..4210879
--- /dev/null
+++ b/erpnext/non_profit/doctype/membership/membership.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Membership', {
+	onload:function(frm) {
+		frm.add_fetch('membership_type', 'amount', 'amount');
+	}
+});
diff --git a/erpnext/non_profit/doctype/membership/membership.json b/erpnext/non_profit/doctype/membership/membership.json
new file mode 100644
index 0000000..42e084d
--- /dev/null
+++ b/erpnext/non_profit/doctype/membership/membership.json
@@ -0,0 +1,476 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "M-.YY.-.####", 
+ "beta": 0, 
+ "creation": "2017-09-11 11:39:18.492184", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "member", 
+   "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": "Member", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Member", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "membership_type", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Membership Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Membership Type", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "membership_status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Membership Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "New\nCurrent\nExpired\nPending\nCancelled", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "membership_validaty_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "membership validaty section", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "from_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "From", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "to_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "To", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_8", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "member_since_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": "Member Since", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "payment_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payment Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "paid", 
+   "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": "Paid", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "currency", 
+   "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": "Currency", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "USD\nINR", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-05 07:02:56.859408", 
+ "modified_by": "Administrator", 
+ "module": "Non Profit", 
+ "name": "Membership", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Non Profit Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Non Profit Member", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Non Profit", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/membership/membership.py b/erpnext/non_profit/doctype/membership/membership.py
new file mode 100644
index 0000000..a6be164
--- /dev/null
+++ b/erpnext/non_profit/doctype/membership/membership.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe.utils import add_days, add_years, nowdate, getdate
+from frappe import _
+import erpnext
+
+
+class Membership(Document):
+	def validate(self):
+
+		# get last membership (if active)
+		last_membership = erpnext.get_last_membership()
+
+		# if person applied for offline membership
+		if last_membership and not frappe.session.user == "Administrator":
+			# if last membership does not expire in 30 days, then do not allow to renew
+			if getdate(add_days(last_membership.to_date, -30)) > getdate(nowdate()) :
+				frappe.throw(_('You can only renew if your membership expires within 30 days'))
+
+			self.from_date = add_days(last_membership.to_date, 1)
+		elif frappe.session.user == "Administrator":
+			self.from_date = self.from_date
+		else:
+			self.from_date = nowdate()
+
+		self.to_date = add_years(self.from_date, 1)
+
+	def on_payment_authorized(self, status_changed_to=None):
+		if status_changed_to in ("Completed", "Authorized"):
+			self.load_from_db()
+			self.db_set('paid', 1)
+
+
diff --git a/erpnext/non_profit/doctype/membership/test_membership.js b/erpnext/non_profit/doctype/membership/test_membership.js
new file mode 100644
index 0000000..24c85c6
--- /dev/null
+++ b/erpnext/non_profit/doctype/membership/test_membership.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Membership", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Membership
+		() => frappe.tests.make('Membership', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/non_profit/doctype/membership/test_membership.py b/erpnext/non_profit/doctype/membership/test_membership.py
new file mode 100644
index 0000000..b23f406
--- /dev/null
+++ b/erpnext/non_profit/doctype/membership/test_membership.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import unittest
+
+class TestMembership(unittest.TestCase):
+	pass
diff --git a/erpnext/schools/doctype/__init__.py b/erpnext/non_profit/doctype/membership_type/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/__init__.py
copy to erpnext/non_profit/doctype/membership_type/__init__.py
diff --git a/erpnext/non_profit/doctype/membership_type/membership_type.js b/erpnext/non_profit/doctype/membership_type/membership_type.js
new file mode 100644
index 0000000..3ef39ae
--- /dev/null
+++ b/erpnext/non_profit/doctype/membership_type/membership_type.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Membership Type', {
+	refresh: function() {
+
+	}
+});
diff --git a/erpnext/non_profit/doctype/membership_type/membership_type.json b/erpnext/non_profit/doctype/membership_type/membership_type.json
new file mode 100644
index 0000000..35a7902
--- /dev/null
+++ b/erpnext/non_profit/doctype/membership_type/membership_type.json
@@ -0,0 +1,124 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:membership_type", 
+ "beta": 0, 
+ "creation": "2017-09-18 12:56:56.343999", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "membership_type", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Membership Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-05 07:03:45.860757", 
+ "modified_by": "Administrator", 
+ "module": "Non Profit", 
+ "name": "Membership Type", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Non Profit Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Non Profit", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/membership_type/membership_type.py b/erpnext/non_profit/doctype/membership_type/membership_type.py
new file mode 100644
index 0000000..ed6b549
--- /dev/null
+++ b/erpnext/non_profit/doctype/membership_type/membership_type.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+class MembershipType(Document):
+	pass
diff --git a/erpnext/non_profit/doctype/membership_type/test_membership_type.js b/erpnext/non_profit/doctype/membership_type/test_membership_type.js
new file mode 100644
index 0000000..6440df8
--- /dev/null
+++ b/erpnext/non_profit/doctype/membership_type/test_membership_type.js
@@ -0,0 +1,25 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Membership Type", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(2);
+
+	frappe.run_serially([
+		// insert a new Member
+		() => frappe.tests.make('Membership Type', [
+			// values to be set
+			{membership_type: 'Gold'},
+			{amount:50000}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.membership_type, 'Gold');
+			assert.equal(cur_frm.doc.amount, '50000');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/non_profit/doctype/membership_type/test_membership_type.py b/erpnext/non_profit/doctype/membership_type/test_membership_type.py
new file mode 100644
index 0000000..d2c9bee
--- /dev/null
+++ b/erpnext/non_profit/doctype/membership_type/test_membership_type.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import unittest
+
+class TestMembershipType(unittest.TestCase):
+	pass
diff --git a/erpnext/schools/doctype/academic_year/__init__.py b/erpnext/non_profit/doctype/volunteer/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/academic_year/__init__.py
copy to erpnext/non_profit/doctype/volunteer/__init__.py
diff --git a/erpnext/non_profit/doctype/volunteer/test_volunteer.js b/erpnext/non_profit/doctype/volunteer/test_volunteer.js
new file mode 100644
index 0000000..45eb281
--- /dev/null
+++ b/erpnext/non_profit/doctype/volunteer/test_volunteer.js
@@ -0,0 +1,34 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Volunteer", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(4);
+
+	frappe.run_serially([
+		// insert a new Member
+		() => frappe.tests.make('Volunteer', [
+			// values to be set
+			{volunteer_name: 'Test Volunteer'},
+			{volunteer_type:'Test Work'},
+			{email:'test@example.com'},
+			{'availability': 'Weekends'},
+			{volunteer_skills:[
+					[
+						{'volunteer_skills': 'Fundraiser'},
+					]
+			]},
+		]),
+		() => {
+			assert.equal(cur_frm.doc.volunteer_name, 'Test Volunteer');
+			assert.equal(cur_frm.doc.volunteer_type, 'Test Work');
+			assert.equal(cur_frm.doc.email, 'test@example.com');
+			assert.equal(cur_frm.doc.availability, 'Weekends');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/non_profit/doctype/volunteer/test_volunteer.py b/erpnext/non_profit/doctype/volunteer/test_volunteer.py
new file mode 100644
index 0000000..6f3bee0
--- /dev/null
+++ b/erpnext/non_profit/doctype/volunteer/test_volunteer.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import unittest
+
+class TestVolunteer(unittest.TestCase):
+	pass
diff --git a/erpnext/non_profit/doctype/volunteer/volunteer.js b/erpnext/non_profit/doctype/volunteer/volunteer.js
new file mode 100644
index 0000000..ac93d8c
--- /dev/null
+++ b/erpnext/non_profit/doctype/volunteer/volunteer.js
@@ -0,0 +1,17 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Volunteer', {
+	refresh: function(frm) {
+
+		frappe.dynamic_link = {doc: frm.doc, fieldname: 'name', doctype: 'Volunteer'};
+
+		frm.toggle_display(['address_html','contact_html'], !frm.doc.__islocal);
+
+		if(!frm.doc.__islocal) {
+			frappe.contacts.render_address_and_contact(frm);
+		} else {
+			frappe.contacts.clear_address_and_contact(frm);
+		}
+	}
+});
diff --git a/erpnext/non_profit/doctype/volunteer/volunteer.json b/erpnext/non_profit/doctype/volunteer/volunteer.json
new file mode 100644
index 0000000..703230c
--- /dev/null
+++ b/erpnext/non_profit/doctype/volunteer/volunteer.json
@@ -0,0 +1,545 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:email", 
+ "beta": 0, 
+ "creation": "2017-09-19 16:16:45.676019", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "volunteer_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Volunteer Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_5", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "volunteer_type", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Volunteer Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Volunteer Type", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "email", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Email", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 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": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "address_contacts", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Address and Contact", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "fa fa-map-marker", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "address_html", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Address HTML", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_9", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "contact_html", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Contact HTML", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "volunteer_availability_and_skills_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Availability and Skills", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "availability", 
+   "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": "Availability", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nWeekly\nWeekdays\nWeekends", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "availability_timeslot", 
+   "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": "Availability Timeslot", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nMorning\nAfternoon\nEvening\nAnytime", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_12", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "volunteer_skills", 
+   "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": "Volunteer Skills", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Volunteer Skill", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_15", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "note", 
+   "fieldtype": "Long Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Note", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_field": "image", 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-06 12:03:08.624579", 
+ "modified_by": "Administrator", 
+ "module": "Non Profit", 
+ "name": "Volunteer", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Non Profit Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/volunteer/volunteer.py b/erpnext/non_profit/doctype/volunteer/volunteer.py
new file mode 100644
index 0000000..699868a
--- /dev/null
+++ b/erpnext/non_profit/doctype/volunteer/volunteer.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+from frappe.contacts.address_and_contact import load_address_and_contact
+
+class Volunteer(Document):
+	def onload(self):
+		"""Load address and contacts in `__onload`"""
+		load_address_and_contact(self)
diff --git a/erpnext/hr/doctype/process_payroll/__init__.py b/erpnext/non_profit/doctype/volunteer_skill/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/process_payroll/__init__.py
copy to erpnext/non_profit/doctype/volunteer_skill/__init__.py
diff --git a/erpnext/non_profit/doctype/volunteer_skill/volunteer_skill.json b/erpnext/non_profit/doctype/volunteer_skill/volunteer_skill.json
new file mode 100644
index 0000000..7d210aa
--- /dev/null
+++ b/erpnext/non_profit/doctype/volunteer_skill/volunteer_skill.json
@@ -0,0 +1,73 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-09-20 15:26:26.453435", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "volunteer_skill", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Volunteer Skill", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-12-06 11:54:14.396354", 
+ "modified_by": "Administrator", 
+ "module": "Non Profit", 
+ "name": "Volunteer Skill", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Non Profit", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/volunteer_skill/volunteer_skill.py b/erpnext/non_profit/doctype/volunteer_skill/volunteer_skill.py
new file mode 100644
index 0000000..dc9f823
--- /dev/null
+++ b/erpnext/non_profit/doctype/volunteer_skill/volunteer_skill.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class VolunteerSkill(Document):
+	pass
diff --git a/erpnext/schools/doctype/__init__.py b/erpnext/non_profit/doctype/volunteer_type/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/__init__.py
copy to erpnext/non_profit/doctype/volunteer_type/__init__.py
diff --git a/erpnext/non_profit/doctype/volunteer_type/test_volunteer_type.js b/erpnext/non_profit/doctype/volunteer_type/test_volunteer_type.js
new file mode 100644
index 0000000..08baaf0
--- /dev/null
+++ b/erpnext/non_profit/doctype/volunteer_type/test_volunteer_type.js
@@ -0,0 +1,27 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Volunteer Type", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(2);
+
+	frappe.run_serially([
+		// insert a new Member
+		() => {
+			return frappe.tests.make('Volunteer Type', [
+				// values to be set
+				{__newname: 'Test Work'},
+				{amount: 500}
+			]);
+		},
+		() => {
+			assert.equal(cur_frm.doc.name, 'Test Work');
+			assert.equal(cur_frm.doc.amount, 500);
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/non_profit/doctype/volunteer_type/test_volunteer_type.py b/erpnext/non_profit/doctype/volunteer_type/test_volunteer_type.py
new file mode 100644
index 0000000..78f65c7
--- /dev/null
+++ b/erpnext/non_profit/doctype/volunteer_type/test_volunteer_type.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import unittest
+
+class TestVolunteerType(unittest.TestCase):
+	pass
diff --git a/erpnext/non_profit/doctype/volunteer_type/volunteer_type.js b/erpnext/non_profit/doctype/volunteer_type/volunteer_type.js
new file mode 100644
index 0000000..5c17505
--- /dev/null
+++ b/erpnext/non_profit/doctype/volunteer_type/volunteer_type.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Volunteer Type', {
+	refresh: function() {
+
+	}
+});
diff --git a/erpnext/non_profit/doctype/volunteer_type/volunteer_type.json b/erpnext/non_profit/doctype/volunteer_type/volunteer_type.json
new file mode 100644
index 0000000..256b25f
--- /dev/null
+++ b/erpnext/non_profit/doctype/volunteer_type/volunteer_type.json
@@ -0,0 +1,94 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "prompt", 
+ "beta": 0, 
+ "creation": "2017-09-19 16:13:07.763273", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-12-06 11:52:08.800425", 
+ "modified_by": "Administrator", 
+ "module": "Non Profit", 
+ "name": "Volunteer Type", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Non Profit Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Non Profit", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/volunteer_type/volunteer_type.py b/erpnext/non_profit/doctype/volunteer_type/volunteer_type.py
new file mode 100644
index 0000000..9776402
--- /dev/null
+++ b/erpnext/non_profit/doctype/volunteer_type/volunteer_type.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+class VolunteerType(Document):
+	pass
diff --git a/erpnext/schools/web_form/__init__.py b/erpnext/non_profit/web_form/__init__.py
similarity index 100%
copy from erpnext/schools/web_form/__init__.py
copy to erpnext/non_profit/web_form/__init__.py
diff --git a/erpnext/schools/doctype/student_leave_application/__init__.py b/erpnext/non_profit/web_form/grant_application/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/student_leave_application/__init__.py
copy to erpnext/non_profit/web_form/grant_application/__init__.py
diff --git a/erpnext/non_profit/web_form/grant_application/grant_application.js b/erpnext/non_profit/web_form/grant_application/grant_application.js
new file mode 100644
index 0000000..7da3f1f
--- /dev/null
+++ b/erpnext/non_profit/web_form/grant_application/grant_application.js
@@ -0,0 +1,3 @@
+frappe.ready(function() {
+	// bind events here
+});
\ No newline at end of file
diff --git a/erpnext/non_profit/web_form/grant_application/grant_application.json b/erpnext/non_profit/web_form/grant_application/grant_application.json
new file mode 100644
index 0000000..73c9445
--- /dev/null
+++ b/erpnext/non_profit/web_form/grant_application/grant_application.json
@@ -0,0 +1,108 @@
+{
+ "accept_payment": 0, 
+ "allow_comments": 0, 
+ "allow_delete": 1, 
+ "allow_edit": 1, 
+ "allow_incomplete": 0, 
+ "allow_multiple": 1, 
+ "allow_print": 0, 
+ "amount": 0.0, 
+ "amount_based_on_field": 0, 
+ "creation": "2017-10-30 15:57:10.825188", 
+ "currency": "INR", 
+ "doc_type": "Grant Application", 
+ "docstatus": 0, 
+ "doctype": "Web Form", 
+ "idx": 0, 
+ "introduction_text": "Share as many details as you can to get quick response from organization", 
+ "is_standard": 1, 
+ "login_required": 1, 
+ "max_attachment_size": 0, 
+ "modified": "2017-12-06 12:32:16.893289", 
+ "modified_by": "Administrator", 
+ "module": "Non Profit", 
+ "name": "grant-application", 
+ "owner": "Administrator", 
+ "payment_button_label": "Buy Now", 
+ "published": 1, 
+ "route": "my-grant", 
+ "show_sidebar": 1, 
+ "sidebar_items": [], 
+ "success_url": "/grant-application", 
+ "title": "Grant Application", 
+ "web_form_fields": [
+  {
+   "fieldname": "applicant_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "label": "Applicant Type", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "options": "Individual\nOrganization", 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "applicant_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Name", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "email", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Email Address", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "description": "", 
+   "fieldname": "grant_description", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "label": "Please outline your current situation and why you are applying for a grant?", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "amount", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "label": "Requested Amount", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "has_any_past_grant_record", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "label": "Have you received any grant from us before?", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "options": "", 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "published", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "label": "Show on Website", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "read_only": 0, 
+   "reqd": 0
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/non_profit/web_form/grant_application/grant_application.py b/erpnext/non_profit/web_form/grant_application/grant_application.py
new file mode 100644
index 0000000..7666ef6
--- /dev/null
+++ b/erpnext/non_profit/web_form/grant_application/grant_application.py
@@ -0,0 +1,8 @@
+from __future__ import unicode_literals
+
+def get_context(context):
+	context.no_cache = True
+	context.parents = [dict(label='View All ',
+		route='grant-application', title='View All')]
+
+
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index f057b80..c0ad07f 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -1,5 +1,6 @@
 execute:import unidecode # new requirement
 erpnext.patches.v8_0.move_perpetual_inventory_setting
+erpnext.patches.v10_0.rename_schools_to_education
 erpnext.patches.v4_0.validate_v3_patch
 erpnext.patches.v4_0.fix_employee_user_id
 erpnext.patches.v4_0.remove_employee_role_if_no_employee
@@ -334,6 +335,7 @@
 execute:frappe.db.sql("update `tabEmployee` set prefered_contact_email = IFNULL(prefered_contact_email,'') ")
 execute:frappe.reload_doctype("Salary Slip")
 execute:frappe.db.sql("update `tabSalary Slip` set posting_date=creation")
+execute:frappe.reload_doc("stock", "doctype", "stock_settings")
 erpnext.patches.v8_0.create_domain_docs	#16-05-2017
 erpnext.patches.v7_1.update_portal_roles
 erpnext.patches.v7_1.set_total_amount_currency_in_je
@@ -438,7 +440,7 @@
 erpnext.patches.v8_7.fix_purchase_receipt_status
 erpnext.patches.v8_6.rename_bom_update_tool
 erpnext.patches.v8_7.set_offline_in_pos_settings #11-09-17
-erpnext.patches.v8_9.add_setup_progress_actions #08-09-2017 #26-09-2017
+erpnext.patches.v8_9.add_setup_progress_actions #08-09-2017 #26-09-2017 #22-11-2017
 erpnext.patches.v8_9.rename_company_sales_target_field
 erpnext.patches.v8_8.set_bom_rate_as_per_uom
 erpnext.patches.v8_8.add_new_fields_in_accounts_settings
@@ -448,6 +450,8 @@
 erpnext.patches.v8_9.delete_gst_doctypes_for_outside_india_accounts
 erpnext.patches.v8_9.set_default_fields_in_variant_settings
 erpnext.patches.v8_9.update_billing_gstin_for_indian_account
+erpnext.patches.v8_9.set_member_party_type
+erpnext.patches.v9_0.add_user_to_child_table_in_pos_profile
 erpnext.patches.v9_0.set_schedule_date_for_material_request_and_purchase_order
 erpnext.patches.v9_0.student_admission_childtable_migrate
 erpnext.patches.v9_0.fix_subscription_next_date #2017-10-23
@@ -455,12 +459,24 @@
 erpnext.patches.v9_0.set_variant_item_description
 erpnext.patches.v9_0.set_uoms_in_variant_field
 erpnext.patches.v9_0.copy_old_fees_field_data
+execute:frappe.delete_doc_if_exists("DocType", "Program Fee")
 erpnext.patches.v9_0.set_pos_profile_name
 erpnext.patches.v9_0.remove_non_existing_warehouse_from_stock_settings
 execute:frappe.delete_doc_if_exists("DocType", "Program Fee")
+erpnext.patches.v8_10.update_gl_due_date_for_pi_and_si
+erpnext.patches.v8_10.change_default_customer_credit_days
 erpnext.patches.v9_0.update_employee_loan_details
 erpnext.patches.v9_2.delete_healthcare_domain_default_items
+erpnext.patches.v9_1.create_issue_opportunity_type
 erpnext.patches.v9_2.rename_translated_domains_in_en
+erpnext.patches.v9_0.set_shipping_type_for_existing_shipping_rules
+erpnext.patches.v9_0.update_multi_uom_fields_in_material_request
 erpnext.patches.v9_2.repost_reserved_qty_for_production
 erpnext.patches.v9_2.remove_company_from_patient
-erpnext.patches.v9_2.set_item_name_in_production_order
\ No newline at end of file
+erpnext.patches.v9_2.set_item_name_in_production_order
+erpnext.patches.v10_0.update_lft_rgt_for_employee
+erpnext.patches.v9_2.rename_net_weight_in_item_master
+erpnext.patches.v9_2.delete_process_payroll
+erpnext.patches.v10_0.add_agriculture_domain
+erpnext.patches.v10_0.add_non_profit_domain
+erpnext.patches.v10_0.setup_vat_for_uae_and_saudi_arabia
\ No newline at end of file
diff --git a/erpnext/schools/__init__.py b/erpnext/patches/v10_0/__init__.py
similarity index 100%
copy from erpnext/schools/__init__.py
copy to erpnext/patches/v10_0/__init__.py
diff --git a/erpnext/patches/v10_0/add_agriculture_domain.py b/erpnext/patches/v10_0/add_agriculture_domain.py
new file mode 100644
index 0000000..c18e69f
--- /dev/null
+++ b/erpnext/patches/v10_0/add_agriculture_domain.py
@@ -0,0 +1,13 @@
+# Copyright (c) 2017, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	domain = 'Agriculture'
+	if not frappe.db.exists('Domain', domain):
+		frappe.get_doc({
+			'doctype': 'Domain',
+			'domain': domain
+		}).insert(ignore_permissions=True)
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/add_non_profit_domain.py b/erpnext/patches/v10_0/add_non_profit_domain.py
new file mode 100644
index 0000000..b03d669
--- /dev/null
+++ b/erpnext/patches/v10_0/add_non_profit_domain.py
@@ -0,0 +1,20 @@
+# Copyright (c) 2017, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	domain = 'Non Profit'
+	if not frappe.db.exists('Domain', domain):
+		frappe.get_doc({
+			'doctype': 'Domain',
+			'domain': domain
+		}).insert(ignore_permissions=True)
+
+		frappe.get_doc({
+			'doctype': 'Role',
+			'role_name': 'Non Profit Portal User',
+			'desk_access': 0,
+			'restrict_to_domain': domain
+		}).insert(ignore_permissions=True)
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/rename_schools_to_education.py b/erpnext/patches/v10_0/rename_schools_to_education.py
new file mode 100644
index 0000000..85c25a8
--- /dev/null
+++ b/erpnext/patches/v10_0/rename_schools_to_education.py
@@ -0,0 +1,32 @@
+# Copyright (c) 2017, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	# rename the School module as Education
+
+	# rename the school module
+	if frappe.db.exists('Module Def', 'Schools') and not frappe.db.exists('Module Def', 'Education'):
+		frappe.rename_doc("Module Def", "Schools", "Education")
+
+	# delete the school module
+	if frappe.db.exists('Module Def', 'Schools') and frappe.db.exists('Module Def', 'Education'):
+		frappe.db.sql("""delete from `tabModule Def` where module_name = 'Schools'""")
+
+
+	# rename "School Settings" to the "Education Settings
+	if frappe.db.exists('DocType', 'School Settings'):
+		frappe.rename_doc("DocType", "School Settings", "Education Settings", force=True)
+		frappe.reload_doc("education", "doctype", "education_settings")
+
+	# delete the discussion web form if exists
+	if frappe.db.exists('Web Form', 'Discussion'):
+		frappe.db.sql("""delete from `tabWeb Form` where name = 'discussion'""")
+
+	# rename the select option field from "School Bus" to "Institute's Bus"
+	frappe.reload_doc("education", "doctype", "Program Enrollment")
+	if "mode_of_transportation" in frappe.db.get_table_columns("Program Enrollment"):
+		frappe.db.sql("""update `tabProgram Enrollment` set mode_of_transportation = "Institute's Bus"
+			where mode_of_transportation = "School Bus" """)
diff --git a/erpnext/patches/v10_0/setup_vat_for_uae_and_saudi_arabia.py b/erpnext/patches/v10_0/setup_vat_for_uae_and_saudi_arabia.py
new file mode 100644
index 0000000..cf6efbb
--- /dev/null
+++ b/erpnext/patches/v10_0/setup_vat_for_uae_and_saudi_arabia.py
@@ -0,0 +1,11 @@
+# Copyright (c) 2017, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from erpnext.setup.doctype.company.company import install_country_fixtures
+
+def execute():
+	for d in frappe.get_all('Company',
+		filters={'country': ('in', ['Saudi Arabia', 'United Arab Emirates'])}):
+		install_country_fixtures(d.name)
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/update_lft_rgt_for_employee.py b/erpnext/patches/v10_0/update_lft_rgt_for_employee.py
new file mode 100644
index 0000000..82fbeaa
--- /dev/null
+++ b/erpnext/patches/v10_0/update_lft_rgt_for_employee.py
@@ -0,0 +1,8 @@
+import frappe
+from frappe.utils.nestedset import rebuild_tree
+
+def execute():
+    """ assign lft and rgt appropriately """
+    frappe.reload_doc("hr", "doctype", "employee")
+
+    rebuild_tree("Employee", "reports_to")
\ No newline at end of file
diff --git a/erpnext/patches/v5_4/cleanup_journal_entry.py b/erpnext/patches/v5_4/cleanup_journal_entry.py
index a0c3323..9100b8f 100644
--- a/erpnext/patches/v5_4/cleanup_journal_entry.py
+++ b/erpnext/patches/v5_4/cleanup_journal_entry.py
@@ -1,5 +1,5 @@
 import frappe
-from MySQLdb import OperationalError
+from pymysql import InternalError
 
 def execute():
 	frappe.reload_doctype("Journal Entry Account")
@@ -15,6 +15,6 @@
 			frappe.db.sql("""update `tabJournal Entry Account`
 				set reference_type=%s, reference_name={0} where ifnull({0}, '') != ''
 			""".format(fieldname), doctype)
-		except OperationalError:
+		except InternalError:
 			# column not found
 			pass
diff --git a/erpnext/patches/v5_7/item_template_attributes.py b/erpnext/patches/v5_7/item_template_attributes.py
index 22b15d3..6aa81f7 100644
--- a/erpnext/patches/v5_7/item_template_attributes.py
+++ b/erpnext/patches/v5_7/item_template_attributes.py
@@ -3,7 +3,7 @@
 
 from __future__ import print_function, unicode_literals
 import frappe
-import MySQLdb
+from frappe.exceptions import SQLError
 
 def execute():
 	"""
@@ -31,7 +31,7 @@
 		try:
 			migrate_item_variants()
 
-		except MySQLdb.ProgrammingError:
+		except SQLError:
 			print("`tabItem Variant` not found")
 
 def rename_and_reload_doctypes():
diff --git a/erpnext/patches/v7_0/make_guardian.py b/erpnext/patches/v7_0/make_guardian.py
index 0839c4f..519969b 100644
--- a/erpnext/patches/v7_0/make_guardian.py
+++ b/erpnext/patches/v7_0/make_guardian.py
@@ -5,9 +5,15 @@
 	if frappe.db.exists("DocType", "Student"):
 		student_table_cols = frappe.db.get_table_columns("Student")
 		if "father_name" in student_table_cols:
-			frappe.reload_doc("schools", "doctype", "student")
-			frappe.reload_doc("schools", "doctype", "guardian")
-			frappe.reload_doc("schools", "doctype", "guardian_interest")
+
+			# 'Schools' module changed to the 'Education'
+			# frappe.reload_doc("schools", "doctype", "student")
+			# frappe.reload_doc("schools", "doctype", "guardian")
+			# frappe.reload_doc("schools", "doctype", "guardian_interest")
+
+			frappe.reload_doc("education", "doctype", "student")
+			frappe.reload_doc("education", "doctype", "guardian")
+			frappe.reload_doc("education", "doctype", "guardian_interest")
 			frappe.reload_doc("hr", "doctype", "interest")
 		
 			fields = ["name", "father_name", "mother_name"]
diff --git a/erpnext/patches/v7_0/migrate_schools_to_erpnext.py b/erpnext/patches/v7_0/migrate_schools_to_erpnext.py
index f64f400..9137b5a 100644
--- a/erpnext/patches/v7_0/migrate_schools_to_erpnext.py
+++ b/erpnext/patches/v7_0/migrate_schools_to_erpnext.py
@@ -13,13 +13,20 @@
 		frappe.db.sql("""delete from `tabDesktop Icon`""")
 		
 		if not frappe.db.exists('Module Def', 'Schools') and frappe.db.exists('Module Def', 'Academics'):
-			frappe.rename_doc("Module Def", "Academics", "Schools")
+			
+			# 'Schools' module changed to the 'Education'
+			# frappe.rename_doc("Module Def", "Academics", "Schools")
+			
+			frappe.rename_doc("Module Def", "Academics", "Education")
 			
 		remove_from_installed_apps("schools")
 
 def reload_doctypes_for_schools_icons():
-	base_path = frappe.get_app_path('erpnext', 'schools', 'doctype')
+	# 'Schools' module changed to the 'Education'
+	# base_path = frappe.get_app_path('erpnext', 'schools', 'doctype')
+	
+	base_path = frappe.get_app_path('erpnext', 'education', 'doctype')
 	for doctype in os.listdir(base_path):
 		if os.path.exists(os.path.join(base_path, doctype, doctype + '.json')) \
 			and doctype not in ("fee_component", "assessment", "assessment_result"):
-			frappe.reload_doc('schools', 'doctype', doctype)
\ No newline at end of file
+			frappe.reload_doc('education', 'doctype', doctype)
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/rename_examination_to_assessment.py b/erpnext/patches/v7_0/rename_examination_to_assessment.py
index 1d6e688..dc248de 100644
--- a/erpnext/patches/v7_0/rename_examination_to_assessment.py
+++ b/erpnext/patches/v7_0/rename_examination_to_assessment.py
@@ -10,8 +10,14 @@
 	if frappe.db.exists("DocType", "Examination"):
 		frappe.rename_doc("DocType", "Examination", "Assessment")
 		frappe.rename_doc("DocType", "Examination Result", "Assessment Result")
-		frappe.reload_doc("schools", "doctype", "assessment")
-		frappe.reload_doc("schools", "doctype", "assessment_result")
+
+		# 'Schools' module changed to the 'Education'
+		# frappe.reload_doc("schools", "doctype", "assessment")
+		# frappe.reload_doc("schools", "doctype", "assessment_result")
+
+		frappe.reload_doc("education", "doctype", "assessment")
+		frappe.reload_doc("education", "doctype", "assessment_result")
+
 		rename_field("Assessment", "exam_name", "assessment_name")
 		rename_field("Assessment", "exam_code", "assessment_code")
 	
diff --git a/erpnext/patches/v7_0/set_portal_settings.py b/erpnext/patches/v7_0/set_portal_settings.py
index 9bae1c5..5259d4f 100644
--- a/erpnext/patches/v7_0/set_portal_settings.py
+++ b/erpnext/patches/v7_0/set_portal_settings.py
@@ -8,7 +8,9 @@
 def execute():
 	frappe.reload_doctype('Role')
 	for dt in ("assessment", "course", "fees"):
-		frappe.reload_doc("schools", "doctype", dt)
+		# 'Schools' module changed to the 'Education'
+		# frappe.reload_doc("schools", "doctype", dt)
+		frappe.reload_doc("education", "doctype", dt)
 
 	for dt in ("domain", "has_domain", "domain_settings"):
 		frappe.reload_doc("core", "doctype", dt)
diff --git a/erpnext/patches/v7_1/set_student_guardian.py b/erpnext/patches/v7_1/set_student_guardian.py
index e64279b..0942505 100644
--- a/erpnext/patches/v7_1/set_student_guardian.py
+++ b/erpnext/patches/v7_1/set_student_guardian.py
@@ -2,9 +2,15 @@
 
 def execute():
 	if frappe.db.exists("DocType", "Guardian"):
-		frappe.reload_doc("schools", "doctype", "student")
-		frappe.reload_doc("schools", "doctype", "student_guardian")
-		frappe.reload_doc("schools", "doctype", "student_sibling")
+
+		# 'Schools' module changed to the 'Education'
+		# frappe.reload_doc("schools", "doctype", "student")
+		# frappe.reload_doc("schools", "doctype", "student_guardian")
+		# frappe.reload_doc("schools", "doctype", "student_sibling")
+
+		frappe.reload_doc("education", "doctype", "student")
+		frappe.reload_doc("education", "doctype", "student_guardian")
+		frappe.reload_doc("education", "doctype", "student_sibling")
 		if "student" not in frappe.db.get_table_columns("Guardian"):
 			return
 		guardian = frappe.get_all("Guardian", fields=["name", "student"])
diff --git a/erpnext/patches/v7_2/make_all_assessment_group.py b/erpnext/patches/v7_2/make_all_assessment_group.py
index 769e503..f3ec628 100644
--- a/erpnext/patches/v7_2/make_all_assessment_group.py
+++ b/erpnext/patches/v7_2/make_all_assessment_group.py
@@ -6,6 +6,7 @@
 
 def execute():
 	if not frappe.db.exists({"doctype": "Assessment Group","assessment_group_name": "All Assessment Groups"}):
+		frappe.reload_doc("education", "doctype", "assessment_group")
 		doc = frappe.new_doc("Assessment Group")
 		doc.assessment_group_name = "All Assessment Groups"
 		doc.is_group = 1
diff --git a/erpnext/patches/v7_2/mark_students_active.py b/erpnext/patches/v7_2/mark_students_active.py
index 3513cde..0a2f2d3 100644
--- a/erpnext/patches/v7_2/mark_students_active.py
+++ b/erpnext/patches/v7_2/mark_students_active.py
@@ -1,5 +1,8 @@
 import frappe
 
 def execute():
-    frappe.reload_doc('schools', 'doctype', 'student_group_student')
-    frappe.db.sql("update `tabStudent Group Student` set active=1")
+	# 'Schools' module changed to the 'Education'
+	# frappe.reload_doc('schools', 'doctype', 'student_group_student')
+
+	frappe.reload_doc('education', 'doctype', 'student_group_student')
+	frappe.db.sql("update `tabStudent Group Student` set active=1")
diff --git a/erpnext/patches/v7_2/rename_evaluation_criteria.py b/erpnext/patches/v7_2/rename_evaluation_criteria.py
index a45604f..d749760 100644
--- a/erpnext/patches/v7_2/rename_evaluation_criteria.py
+++ b/erpnext/patches/v7_2/rename_evaluation_criteria.py
@@ -2,28 +2,37 @@
 from frappe.model.utils.rename_field import rename_field
 
 def execute():
+	# 'Schools' module changed to the 'Education'
+
+
 	frappe.rename_doc("DocType", "Evaluation Criteria", "Assessment Criteria", force=True)
-	frappe.reload_doc("schools", "doctype", "assessment_criteria")
+	# frappe.reload_doc("schools", "doctype", "assessment_criteria")
+	frappe.reload_doc("education", "doctype", "assessment_criteria")
 	if 'evaluation_criteria' in frappe.db.get_table_columns('Assessment Criteria'):
 		rename_field("Assessment Criteria", "evaluation_criteria", "assessment_criteria")
 
 	frappe.rename_doc("DocType", "Assessment Evaluation Criteria", "Assessment Plan Criteria", force=True)
-	frappe.reload_doc("schools", "doctype", "assessment_plan_criteria")
+	# frappe.reload_doc("schools", "doctype", "assessment_plan_criteria")
+	frappe.reload_doc("education", "doctype", "assessment_plan_criteria")
 	if 'evaluation_criteria' in frappe.db.get_table_columns('Assessment Plan'):
 		rename_field("Assessment Plan Criteria", "evaluation_criteria", "assessment_criteria")
 
-	frappe.reload_doc("schools", "doctype", "assessment_plan")
+	# frappe.reload_doc("schools", "doctype", "assessment_plan")
+	frappe.reload_doc("education", "doctype", "assessment_plan")
 	rename_field("Assessment Plan", "evaluation_criterias", "assessment_criteria")
 
-	frappe.reload_doc("schools", "doctype", "assessment_result_detail")
+	# frappe.reload_doc("schools", "doctype", "assessment_result_detail")
+	frappe.reload_doc("education", "doctype", "assessment_result_detail")
 	if 'evaluation_criteria' in frappe.db.get_table_columns('Assessment Result Detail'):
 		rename_field("Assessment Result Detail", "evaluation_criteria", "assessment_criteria")
 
 	frappe.rename_doc("DocType", "Course Evaluation Criteria", "Course Assessment Criteria", force=True)
-	frappe.reload_doc("schools", "doctype", "course_assessment_criteria")
+	# frappe.reload_doc("schools", "doctype", "course_assessment_criteria")
+	frappe.reload_doc("education", "doctype", "course_assessment_criteria")
 	if 'evaluation_criteria' in frappe.db.get_table_columns('Course Assessment Criteria'):
 		rename_field("Course Assessment Criteria", "evaluation_criteria", "assessment_criteria")
 
-	frappe.reload_doc("schools", "doctype", "course")
+	# frappe.reload_doc("schools", "doctype", "course")
+	frappe.reload_doc("education", "doctype", "course")
 	if 'evaluation_criteria' in frappe.db.get_table_columns('Course'):
 		rename_field("Course", "evaluation_criterias", "assessment_criteria")
diff --git a/erpnext/patches/v7_2/update_assessment_modules.py b/erpnext/patches/v7_2/update_assessment_modules.py
index 9075bbf..37ae7c7 100644
--- a/erpnext/patches/v7_2/update_assessment_modules.py
+++ b/erpnext/patches/v7_2/update_assessment_modules.py
@@ -8,21 +8,28 @@
 	if not frappe.db.exists("DocType", "Grading Scale Interval"):
 		frappe.rename_doc("DocType", "Grade Interval", "Grading Scale Interval", force=True)
 
-	frappe.reload_doc("schools", "doctype", "grading_scale_interval")
+	# frappe.reload_doc("schools", "doctype", "grading_scale_interval")
+	frappe.reload_doc("education", "doctype", "grading_scale_interval")
 	if "to_score" in frappe.db.get_table_columns("Grading Scale Interval"):
 		rename_field("Grading Scale Interval", "to_score", "threshold")
 
 	if not frappe.db.exists("DocType", "Assessment Plan"):
 		frappe.rename_doc("DocType", "Assessment", "Assessment Plan", force=True)
 
+	# 'Schools' module changed to the 'Education'
+	# frappe.reload_doc("schools", "doctype", "assessment_plan")
+
 	#Rename Assessment Results
-	frappe.reload_doc("schools", "doctype", "assessment_plan")
+	frappe.reload_doc("education", "doctype", "assessment_plan")
 	if "grading_structure" in frappe.db.get_table_columns("Assessment Plan"):
 		rename_field("Assessment Plan", "grading_structure", "grading_scale")
 
-	frappe.reload_doc("schools", "doctype", "assessment_result")
-	frappe.reload_doc("schools", "doctype", "assessment_result_detail")
-	frappe.reload_doc("schools", "doctype", "assessment_criteria")
+	# frappe.reload_doc("schools", "doctype", "assessment_result")
+	# frappe.reload_doc("schools", "doctype", "assessment_result_detail")
+	# frappe.reload_doc("schools", "doctype", "assessment_criteria")
+	frappe.reload_doc("education", "doctype", "assessment_result")
+	frappe.reload_doc("education", "doctype", "assessment_result_detail")
+	frappe.reload_doc("education", "doctype", "assessment_criteria")
 
 
 	for assessment in frappe.get_all("Assessment Plan", 
diff --git a/erpnext/patches/v7_2/update_attendance_docstatus.py b/erpnext/patches/v7_2/update_attendance_docstatus.py
index 6fbab01..863c0c0 100644
--- a/erpnext/patches/v7_2/update_attendance_docstatus.py
+++ b/erpnext/patches/v7_2/update_attendance_docstatus.py
@@ -1,8 +1,7 @@
 import frappe
 
 def execute():
-	frappe.reload_doctype('Student Attendance')
-	# frappe.reload_doc("schools", "doctype", "student_attendance")
+	frappe.reload_doc("education", "doctype", "student_attendance")
 	frappe.db.sql('''
 		update `tabStudent Attendance` set
 			docstatus=0
diff --git a/erpnext/patches/v7_2/update_guardian_name_in_student_master.py b/erpnext/patches/v7_2/update_guardian_name_in_student_master.py
index 6ac4073..163e7c3 100644
--- a/erpnext/patches/v7_2/update_guardian_name_in_student_master.py
+++ b/erpnext/patches/v7_2/update_guardian_name_in_student_master.py
@@ -2,8 +2,12 @@
 from frappe.model.utils.rename_field import rename_field
 
 def execute():
-    frappe.reload_doc("schools", "doctype", "student_guardian")
-    student_guardians = frappe.get_all("Student Guardian", fields=["guardian"])
-    for student_guardian in student_guardians:
-        guardian_name = frappe.db.get_value("Guardian", student_guardian.guardian, "guardian_name")
-        frappe.db.sql("update `tabStudent Guardian` set guardian_name = %s where guardian= %s", (guardian_name, student_guardian.guardian))
\ No newline at end of file
+	# 'Schools' module changed to the 'Education'
+	# frappe.reload_doc("schools", "doctype", "student_guardian")
+	frappe.reload_doc("education", "doctype", "student_guardian")
+
+	student_guardians = frappe.get_all("Student Guardian", fields=["guardian"])
+	for student_guardian in student_guardians:
+		guardian_name = frappe.db.get_value("Guardian", student_guardian.guardian, "guardian_name")
+		frappe.db.sql("update `tabStudent Guardian` set guardian_name = %s where guardian= %s",
+			(guardian_name, student_guardian.guardian))
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/update_salary_slips.py b/erpnext/patches/v7_2/update_salary_slips.py
index b7a4050..22bb1d8 100644
--- a/erpnext/patches/v7_2/update_salary_slips.py
+++ b/erpnext/patches/v7_2/update_salary_slips.py
@@ -1,5 +1,5 @@
 import frappe
-from erpnext.hr.doctype.process_payroll.process_payroll import get_month_details
+from erpnext.hr.doctype.payroll_entry.payroll_entry import get_month_details
 from frappe.utils import cint
 
 def execute():
diff --git a/erpnext/patches/v8_0/merge_student_batch_and_student_group.py b/erpnext/patches/v8_0/merge_student_batch_and_student_group.py
index ca71d36..fb9021f 100644
--- a/erpnext/patches/v8_0/merge_student_batch_and_student_group.py
+++ b/erpnext/patches/v8_0/merge_student_batch_and_student_group.py
@@ -11,7 +11,10 @@
 	# for converting student batch into student group
 	for doctype in ["Student Group", "Student Group Student", 'Program Enrollment',
 		"Student Group Instructor", "Student Attendance", "Student", "Student Batch Name"]:
-		frappe.reload_doc("schools", "doctype", frappe.scrub(doctype))
+		# 'Schools' module changed to the 'Education'
+		# frappe.reload_doc("schools", "doctype", frappe.scrub(doctype))
+
+		frappe.reload_doc("education", "doctype", frappe.scrub(doctype))
 
 	if frappe.db.table_exists("Student Batch"):
 		student_batches = frappe.db.sql('''select name as student_group_name, student_batch_name as batch,
diff --git a/erpnext/patches/v8_0/update_sales_cost_in_project.py b/erpnext/patches/v8_0/update_sales_cost_in_project.py
index cc3798e..4f89ba0 100644
--- a/erpnext/patches/v8_0/update_sales_cost_in_project.py
+++ b/erpnext/patches/v8_0/update_sales_cost_in_project.py
@@ -1,12 +1,9 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
 from __future__ import unicode_literals
 import frappe
 
 def execute():
 	frappe.db.sql("""
 		update `tabProject` p
-		set total_sales_cost = (select sum(base_grand_total) 
-			from `tabSales Order` where project=p.name and docstatus=1)
+		set total_sales_cost = ifnull((select sum(base_grand_total)
+			from `tabSales Order` where project=p.name and docstatus=1), 0)
 	""")
\ No newline at end of file
diff --git a/erpnext/schools/__init__.py b/erpnext/patches/v8_10/__init__.py
similarity index 100%
copy from erpnext/schools/__init__.py
copy to erpnext/patches/v8_10/__init__.py
diff --git a/erpnext/patches/v8_10/change_default_customer_credit_days.py b/erpnext/patches/v8_10/change_default_customer_credit_days.py
new file mode 100644
index 0000000..d2bc3ec
--- /dev/null
+++ b/erpnext/patches/v8_10/change_default_customer_credit_days.py
@@ -0,0 +1,88 @@
+from __future__ import unicode_literals
+import frappe
+
+
+def execute():
+	frappe.reload_doc("selling", "doctype", "customer")
+	frappe.reload_doc("buying", "doctype", "supplier")
+	frappe.reload_doc("setup", "doctype", "supplier_type")
+	frappe.reload_doc("accounts", "doctype", "payment_term")
+	frappe.reload_doc("accounts", "doctype", "payment_terms_template_detail")
+	frappe.reload_doc("accounts", "doctype", "payment_terms_template")
+
+	payment_terms = []
+	records = []
+	for doctype in ("Customer", "Supplier", "Supplier Type"):
+		credit_days = frappe.db.sql("""
+			SELECT DISTINCT `credit_days`, `credit_days_based_on`, `name`
+			from `tab{0}`
+			where
+				(credit_days_based_on='Fixed Days' and credit_days is not null)
+				or credit_days_based_on='Last Day of the Next Month'
+		""".format(doctype))
+
+		credit_records = ((record[0], record[1], record[2]) for record in credit_days)
+		for days, based_on, party_name in credit_records:
+			if based_on == "Fixed Days":
+				pyt_template_name = 'Default Payment Term - N{0}'.format(days)
+			else:
+				pyt_template_name = 'Default Payment Term - EO2M'
+
+			if not frappe.db.exists("Payment Terms Template", pyt_template_name):
+				payment_term = make_payment_term(days, based_on)
+				template = make_template(payment_term)
+			else:
+				template = frappe.get_doc("Payment Terms Template", pyt_template_name)
+
+			payment_terms.append('WHEN `name`="%s" THEN "%s"' % (party_name, template.template_name))
+			records.append(party_name)
+
+		begin_query_str = "UPDATE `tab{0}` SET `payment_terms` = CASE ".format(doctype)
+		value_query_str = " ".join(payment_terms)
+		cond_query_str = " ELSE `payment_terms` END WHERE "
+
+		if records:
+			frappe.db.sql(
+				begin_query_str + value_query_str + cond_query_str + '`name` IN %s',
+				(records,)
+			)
+
+
+def make_template(payment_term):
+	doc = frappe.new_doc('Payment Terms Template Detail')
+	doc.payment_term = payment_term.payment_term_name
+	doc.due_date_based_on = payment_term.due_date_based_on
+	doc.invoice_portion = payment_term.invoice_portion
+	doc.description = payment_term.description
+	doc.credit_days = payment_term.credit_days
+	doc.credit_months = payment_term.credit_months
+
+	template = frappe.new_doc('Payment Terms Template')
+	template.template_name = 'Default Payment Term - {0}'.format(payment_term.payment_term_name)
+	template.append('terms', doc)
+	template.save()
+
+	return template
+
+
+def make_payment_term(days, based_on):
+	based_on_map = {
+		'Fixed Days': 'Day(s) after invoice date',
+		'Last Day of the Next Month': 'Month(s) after the end of the invoice month'
+	}
+
+	doc = frappe.new_doc('Payment Term')
+	doc.due_date_based_on = based_on_map.get(based_on)
+	doc.invoice_portion = 100
+
+	if based_on == 'Fixed Days':
+		doc.credit_days = days
+		doc.description = 'Net payable within {0} days'.format(days)
+		doc.payment_term_name = 'N{0}'.format(days)
+	else:
+		doc.credit_months = 1
+		doc.description = 'Net payable by the end of next month'
+		doc.payment_term_name = 'EO2M'
+
+	doc.save()
+	return doc
diff --git a/erpnext/patches/v8_10/update_gl_due_date_for_pi_and_si.py b/erpnext/patches/v8_10/update_gl_due_date_for_pi_and_si.py
new file mode 100644
index 0000000..8596e66
--- /dev/null
+++ b/erpnext/patches/v8_10/update_gl_due_date_for_pi_and_si.py
@@ -0,0 +1,138 @@
+from __future__ import unicode_literals
+import frappe
+
+# This will update existing GL Entries by saving its linked Purchase/Sales Invoice's
+# Journal Entry's due date as the due date for the GL Entry
+
+
+def execute():
+	frappe.reload_doc("accounts", "doctype", "gl_entry")
+
+	kwargs = get_query_kwargs()
+
+	for kwarg in kwargs:
+		for batch in get_result_in_batches(**kwarg):
+			voucher_num_col = kwarg.get('voucher_num_col', 'voucher_no')
+			voucher_type = kwarg.get('use_voucher_type') or kwarg.get('voucher_type')
+			conditions, names = build_conditions(batch, voucher_type, voucher_num_col)
+			if conditions and names:
+				start = 'UPDATE `tabGL Entry` SET `due_date` = CASE '
+				cond = ' '.join(conditions)
+				else_cond = ' ELSE `due_date` END WHERE '
+
+				frappe.db.sql(
+					start + cond + else_cond + voucher_num_col + ' IN %s',
+					values=(names,)
+				)
+
+
+def get_result_in_batches(**kwargs):
+	"""A simple generator to yield slices of GL Entry records"""
+	while True:
+		batch = get_gle_batch(**kwargs)
+		if batch:
+			yield batch
+		else:
+			return
+
+
+def get_gle_batch(**kwargs):
+	"""Returns a slice of records in GL Entry"""
+	doctype = kwargs.get('doctype')
+	fields = kwargs.get('fields')
+	limit_start = kwargs.get('limit_start')
+	limit_page_length = kwargs.get('limit_page_length')
+	filters = kwargs.get('filters')
+	or_filters = kwargs.get('or_filters')
+
+	results = frappe.get_list(
+		doctype, fields=fields, limit_start=limit_start, limit_page_length=limit_page_length,
+		filters=filters, or_filters=or_filters
+	)
+
+	return results
+
+
+def build_conditions(query_results, voucher_type, voucher_num_col):
+	"""
+	builds the string to be used is sql CASE statement. Returns the a tuple of
+	the string for the CASE statement and a tuple of applicable voucher names
+	"""
+	conditions = []
+	invoice_names = []
+
+	for result in query_results:
+		voucher_no = result.get(voucher_num_col)
+		if voucher_no:
+			invoice_names.append("%s" % (voucher_no,))
+
+	# get invoice details
+	invoice_details = frappe.get_list(
+		voucher_type, fields=['name', 'due_date'], filters={'name': ('in', invoice_names)}
+	)
+
+	if invoice_details:
+		for d in invoice_details:
+			conditions.append('WHEN `{voucher_no}`="{number}" THEN "{date}"'.format(
+				number=d.name, date=d.due_date, voucher_no=voucher_num_col))
+
+	return conditions, invoice_names
+
+
+def get_query_kwargs():
+	pi_kwargs = dict(
+		voucher_type='Purchase Invoice', doctype='GL Entry', fields=['voucher_no'],
+		limit_start=0, limit_page_length=5, filters={
+			"ifnull(due_date, '')": ('=', ''), "ifnull(party, '')": ('!=', ''),
+			'voucher_type': 'Purchase Invoice', 'credit': ('!=', '0')
+		}
+	)
+
+	si_kwargs = dict(
+		voucher_type='Sales Invoice', doctype='GL Entry', fields=['voucher_no'],
+		limit_start=0, limit_page_length=5, filters={
+			"ifnull(due_date, '')": ('=', ''), "ifnull(party, '')": ('!=', ''),
+			'voucher_type': 'Sales Invoice', 'debit': ('!=', '0')
+		}
+	)
+
+	journal_kwargs_si = dict(
+		voucher_type='Journal Entry', doctype='GL Entry', fields=['against_voucher'],
+		limit_start=0, limit_page_length=5, filters={
+			"ifnull(due_date, '')": ('=', ''), "ifnull(party, '')": ('!=', ''),
+			'voucher_type': 'Journal Entry', 'against_voucher_type': 'Sales Invoice'
+		},
+		voucher_num_col='against_voucher', use_voucher_type='Sales Invoice',
+	)
+
+	journal_kwargs_pi = dict(
+		voucher_type='Journal Entry', doctype='GL Entry', fields=['against_voucher'],
+		limit_start=0, limit_page_length=5, filters={
+			"ifnull(due_date, '')": ('=', ''), "ifnull(party, '')": ('!=', ''),
+			'voucher_type': 'Journal Entry', 'against_voucher_type': 'Purchase Invoice'
+		},
+		voucher_num_col='against_voucher', use_voucher_type='Purchase Invoice',
+	)
+
+	payment_entry_kwargs_pi = dict(
+		voucher_type='Payment Entry', doctype='GL Entry', fields=['against_voucher'],
+		limit_start=0, limit_page_length=5, filters={
+			"ifnull(due_date, '')": ('=', ''), "ifnull(party, '')": ('!=', ''),
+			'voucher_type': 'Payment Entry', 'against_voucher_type': 'Purchase Invoice'
+		},
+		voucher_num_col='against_voucher', use_voucher_type='Purchase Invoice',
+	)
+
+	payment_entry_kwargs_si = dict(
+		voucher_type='Payment Entry', doctype='GL Entry', fields=['against_voucher'],
+		limit_start=0, limit_page_length=5, filters={
+			"ifnull(due_date, '')": ('=', ''), "ifnull(party, '')": ('!=', ''),
+			'voucher_type': 'Payment Entry', 'against_voucher_type': 'Sales Invoice'
+		},
+		voucher_num_col='against_voucher', use_voucher_type='Sales Invoice',
+	)
+
+	return [
+		pi_kwargs, si_kwargs, journal_kwargs_pi, journal_kwargs_si,
+		payment_entry_kwargs_pi, payment_entry_kwargs_si
+	]
diff --git a/erpnext/patches/v8_9/add_setup_progress_actions.py b/erpnext/patches/v8_9/add_setup_progress_actions.py
index dbd0fac..fe12311 100644
--- a/erpnext/patches/v8_9/add_setup_progress_actions.py
+++ b/erpnext/patches/v8_9/add_setup_progress_actions.py
@@ -30,6 +30,8 @@
 		{"action_name": "Add Rooms", "action_doctype": "Room", "min_doc_count": 1, "is_completed": 0,
 			"domains": '["Education"]' },
 		{"action_name": "Add Users", "action_doctype": "User", "min_doc_count": 4, "is_completed": 0,
+			"domains": '[]' },
+		{"action_name": "Add Letterhead", "action_doctype": "Letter Head", "min_doc_count": 1, "is_completed": 0,
 			"domains": '[]' }
 	]
 
diff --git a/erpnext/patches/v8_9/set_member_party_type.py b/erpnext/patches/v8_9/set_member_party_type.py
new file mode 100644
index 0000000..2934c70
--- /dev/null
+++ b/erpnext/patches/v8_9/set_member_party_type.py
@@ -0,0 +1,8 @@
+import frappe
+
+def execute():
+	if not frappe.db.exists("Party Type", "Member"):
+		frappe.reload_doc("non_profit", "doctype", "member")
+		party = frappe.new_doc("Party Type")
+		party.party_type = "Member"
+		party.save()
diff --git a/erpnext/patches/v9_0/add_healthcare_domain.py b/erpnext/patches/v9_0/add_healthcare_domain.py
index 45fceb1..3c0433b 100644
--- a/erpnext/patches/v9_0/add_healthcare_domain.py
+++ b/erpnext/patches/v9_0/add_healthcare_domain.py
@@ -3,10 +3,9 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe import _
 
 def execute():
-	domain = _('Healthcare')
+	domain = 'Healthcare'
 	if not frappe.db.exists('Domain', domain):
 		frappe.get_doc({
 			'doctype': 'Domain',
diff --git a/erpnext/patches/v9_0/add_user_to_child_table_in_pos_profile.py b/erpnext/patches/v9_0/add_user_to_child_table_in_pos_profile.py
new file mode 100644
index 0000000..942f089
--- /dev/null
+++ b/erpnext/patches/v9_0/add_user_to_child_table_in_pos_profile.py
@@ -0,0 +1,38 @@
+# Copyright (c) 2017, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	if frappe.db.table_exists("POS Profile User"):
+		frappe.reload_doc('accounts', 'doctype', 'pos_profile_user')
+
+		frappe.db.sql(""" update `tabPOS Profile User`,
+			(select `tabPOS Profile User`.name from `tabPOS Profile User`, `tabPOS Profile`
+				where `tabPOS Profile`.name = `tabPOS Profile User`.parent
+				group by `tabPOS Profile User`.user, `tabPOS Profile`.company) as pfu
+			set
+				`tabPOS Profile User`.default = 1
+			where `tabPOS Profile User`.name = pfu.name""")
+	else:
+		doctype = 'POS Profile'
+		frappe.reload_doc('accounts', 'doctype', doctype)
+		frappe.reload_doc('accounts', 'doctype', 'pos_profile_user')
+		frappe.reload_doc('accounts', 'doctype', 'pos_item_group')
+		frappe.reload_doc('accounts', 'doctype', 'pos_customer_group')
+
+		for doc in frappe.get_all(doctype):
+			_doc = frappe.get_doc(doctype, doc.name)
+			user = frappe.db.get_value(doctype, doc.name, 'user')
+
+			if not user: continue
+
+			_doc.append('applicable_for_users', {
+				'user': user,
+				'default': 1
+			})
+			_doc.pos_profile_name = user + ' - ' + _doc.company
+			_doc.flags.ignore_validate  = True
+			_doc.flags.ignore_mandatory = True
+			_doc.save()
\ No newline at end of file
diff --git a/erpnext/patches/v9_0/copy_old_fees_field_data.py b/erpnext/patches/v9_0/copy_old_fees_field_data.py
index 4243c5b..1427820 100644
--- a/erpnext/patches/v9_0/copy_old_fees_field_data.py
+++ b/erpnext/patches/v9_0/copy_old_fees_field_data.py
@@ -5,7 +5,9 @@
 import frappe
 
 def execute():
-	frappe.reload_doc("schools", "doctype", "fees")
+	# 'Schools' module changed to the 'Education'
+	# frappe.reload_doc("schools", "doctype", "fees")
+	frappe.reload_doc("education", "doctype", "fees")
 
 	if "total_amount" not in frappe.db.get_table_columns("Fees"):
 		return
diff --git a/erpnext/patches/v9_0/revert_manufacturing_user_role.py b/erpnext/patches/v9_0/revert_manufacturing_user_role.py
new file mode 100644
index 0000000..5bfa8c3
--- /dev/null
+++ b/erpnext/patches/v9_0/revert_manufacturing_user_role.py
@@ -0,0 +1,21 @@
+import frappe
+
+def execute():
+	if 'Manufacturing' in frappe.get_active_domains(): return
+
+	role = 'Manufacturing User'
+	frappe.db.set_value('Role', role, 'restrict_to_domain', '')
+	frappe.db.set_value('Role', role, 'disabled', 0)
+
+	users = frappe.get_all('Has Role', filters = {
+		'parenttype': 'User',
+		'role': ('in', ['System Manager', 'Manufacturing Manager'])
+	}, fields=['parent'], as_list=1)
+
+	for user in users:
+		_user = frappe.get_doc('User', user[0])
+		_user.append('roles', {
+			'role': role
+		})
+		_user.flags.ignore_validate = True
+		_user.save()
diff --git a/erpnext/patches/v9_0/set_shipping_type_for_existing_shipping_rules.py b/erpnext/patches/v9_0/set_shipping_type_for_existing_shipping_rules.py
new file mode 100644
index 0000000..5092695
--- /dev/null
+++ b/erpnext/patches/v9_0/set_shipping_type_for_existing_shipping_rules.py
@@ -0,0 +1,18 @@
+# Copyright (c) 2017, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	frappe.reload_doctype("Shipping Rule")
+
+	# default "calculate_based_on"
+	frappe.db.sql('''update `tabShipping Rule`
+		set calculate_based_on = "Net Weight"
+		where ifnull(calculate_based_on, '') = '' ''')
+
+	# default "shipping_rule_type"
+	frappe.db.sql('''update `tabShipping Rule`
+		set shipping_rule_type = "Selling"
+		where ifnull(shipping_rule_type, '') = '' ''')
diff --git a/erpnext/patches/v9_0/student_admission_childtable_migrate.py b/erpnext/patches/v9_0/student_admission_childtable_migrate.py
index dcbbeeb..a5712c7 100644
--- a/erpnext/patches/v9_0/student_admission_childtable_migrate.py
+++ b/erpnext/patches/v9_0/student_admission_childtable_migrate.py
@@ -5,8 +5,11 @@
 import frappe
 
 def execute():
-	frappe.reload_doc('schools', 'doctype', 'Student Admission Program')
-	frappe.reload_doctype('Student Admission')
+	# 'Schools' module changed to the 'Education'
+	# frappe.reload_doc('schools', 'doctype', 'Student Admission Program')
+	# frappe.reload_doc('schools', 'doctype', 'student_admission')
+	frappe.reload_doc('education', 'doctype', 'Student Admission Program')
+	frappe.reload_doc('education', 'doctype', 'student_admission')
 
 	if "program" not in frappe.db.get_table_columns("Student Admission"):
 		return
diff --git a/erpnext/patches/v9_0/update_multi_uom_fields_in_material_request.py b/erpnext/patches/v9_0/update_multi_uom_fields_in_material_request.py
new file mode 100644
index 0000000..45610ed
--- /dev/null
+++ b/erpnext/patches/v9_0/update_multi_uom_fields_in_material_request.py
@@ -0,0 +1,12 @@
+# Copyright (c) 2017, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	frappe.reload_doctype('Material Request')
+	frappe.reload_doctype('Material Request Item')
+
+	frappe.db.sql(""" update `tabMaterial Request Item`
+		set stock_uom = uom, stock_qty = qty, conversion_factor = 1.0""")
\ No newline at end of file
diff --git a/erpnext/schools/__init__.py b/erpnext/patches/v9_1/__init__.py
similarity index 100%
copy from erpnext/schools/__init__.py
copy to erpnext/patches/v9_1/__init__.py
diff --git a/erpnext/patches/v9_1/create_issue_opportunity_type.py b/erpnext/patches/v9_1/create_issue_opportunity_type.py
new file mode 100644
index 0000000..aa8bbd1
--- /dev/null
+++ b/erpnext/patches/v9_1/create_issue_opportunity_type.py
@@ -0,0 +1,34 @@
+# Copyright (c) 2017, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+
+def execute():
+	# delete custom field if exists
+	for doctype, fieldname in (('Issue', 'issue_type'), ('Opportunity', 'opportunity_type')):
+		custom_field = frappe.db.get_value("Custom Field", {"fieldname": fieldname, 'dt': doctype})
+		if custom_field:
+			frappe.delete_doc("Custom Field", custom_field, ignore_permissions=True)
+
+	frappe.reload_doc('support', 'doctype', 'issue_type')
+	frappe.reload_doc('support', 'doctype', 'issue')
+	frappe.reload_doc('crm', 'doctype', 'opportunity_type')
+	frappe.reload_doc('crm', 'doctype', 'opportunity')
+
+	# rename enquiry_type -> opportunity_type
+	from frappe.model.utils.rename_field import rename_field
+	rename_field('Opportunity', 'enquiry_type', 'opportunity_type')
+
+	# create values if already set
+	for opts in (('Issue', 'issue_type', 'Issue Type'),
+		('Opportunity', 'opportunity_type', 'Opportunity Type')):
+		for d in frappe.db.sql('select distinct {0} from `tab{1}`'.format(opts[1], opts[0])):
+			if d[0] and not frappe.db.exists(opts[2], d[0]):
+				frappe.get_doc(dict(doctype = opts[2], name=d[0])).insert()
+
+	# fixtures
+	for name in ('Hub', _('Sales'), _('Support'), _('Maintenance')):
+		if not frappe.db.exists('Opportunity Type', name):
+			frappe.get_doc(dict(doctype = 'Opportunity Type', name=name)).insert()
diff --git a/erpnext/patches/v9_2/delete_process_payroll.py b/erpnext/patches/v9_2/delete_process_payroll.py
new file mode 100644
index 0000000..e9e1b99
--- /dev/null
+++ b/erpnext/patches/v9_2/delete_process_payroll.py
@@ -0,0 +1,4 @@
+import frappe
+
+def execute():
+	frappe.delete_doc("DocType", "Process Payroll")
diff --git a/erpnext/patches/v9_2/rename_net_weight_in_item_master.py b/erpnext/patches/v9_2/rename_net_weight_in_item_master.py
new file mode 100644
index 0000000..cad979d
--- /dev/null
+++ b/erpnext/patches/v9_2/rename_net_weight_in_item_master.py
@@ -0,0 +1,8 @@
+from __future__ import unicode_literals
+import frappe
+from frappe.model.utils.rename_field import rename_field
+
+def execute():
+	frappe.reload_doc("stock", "doctype", "item")
+	if frappe.db.has_column('Item', 'net_weight'):
+		rename_field("Item", "net_weight", "weight_per_unit")
diff --git a/erpnext/portal/doctype/products_settings/products_settings.json b/erpnext/portal/doctype/products_settings/products_settings.json
index 90de96c..2d025cf 100644
--- a/erpnext/portal/doctype/products_settings/products_settings.json
+++ b/erpnext/portal/doctype/products_settings/products_settings.json
@@ -1,17 +1,23 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2016-04-22 09:11:55.272398", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "If checked, the Home page will be the default Item Group for the website", 
    "fieldname": "home_page_is_products", 
    "fieldtype": "Check", 
@@ -19,7 +25,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Home Page is Products", 
    "length": 0, 
    "no_copy": 0, 
@@ -28,6 +36,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -35,16 +44,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "products_as_list", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Show Products as a List", 
    "length": 0, 
    "no_copy": 0, 
@@ -53,6 +66,39 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "6", 
+   "fieldname": "products_per_page", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Products per Page", 
+   "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, 
@@ -60,16 +106,17 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 0, 
+ "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-04-22 09:11:59.537639", 
+ "modified": "2017-11-07 19:34:33.055048", 
  "modified_by": "Administrator", 
  "module": "Portal", 
  "name": "Products Settings", 
@@ -100,7 +147,9 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/portal/doctype/products_settings/test_products_settings.js b/erpnext/portal/doctype/products_settings/test_products_settings.js
new file mode 100644
index 0000000..b7049b3
--- /dev/null
+++ b/erpnext/portal/doctype/products_settings/test_products_settings.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Products Settings", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Products Settings
+		() => frappe.tests.make('Products Settings', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/portal/doctype/products_settings/test_products_settings.py b/erpnext/portal/doctype/products_settings/test_products_settings.py
new file mode 100644
index 0000000..d04a009
--- /dev/null
+++ b/erpnext/portal/doctype/products_settings/test_products_settings.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestProductsSettings(unittest.TestCase):
+	pass
diff --git a/erpnext/projects/doctype/activity_type/test_activity_type.js b/erpnext/projects/doctype/activity_type/test_activity_type.js
index 8023121..62be972 100644
--- a/erpnext/projects/doctype/activity_type/test_activity_type.js
+++ b/erpnext/projects/doctype/activity_type/test_activity_type.js
@@ -8,7 +8,8 @@
 		() => frappe.set_route("List", "Activity Type", "List"),
 		() => frappe.new_doc("Activity Type"),
 		() => frappe.timeout(1),
-		() => frappe.click_link('Edit in full page'),
+		() => frappe.quick_entry.dialog.$wrapper.find('.edit-full').click(),
+		() => frappe.timeout(1),
 		() => cur_frm.set_value("activity_type", "Test Activity"),
 		() => frappe.click_button('Save'),
 		() => frappe.timeout(1),
diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json
index 101e4ff..5d95bd3 100644
--- a/erpnext/projects/doctype/project/project.json
+++ b/erpnext/projects/doctype/project/project.json
@@ -893,7 +893,7 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Total Costing Amount (via Time Logs)", 
+   "label": "Total Costing Amount (via Timesheets)", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -945,6 +945,36 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "total_purchase_cost", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Purchase Cost (via Purchase Invoice)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -975,36 +1005,6 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "cost_center", 
-   "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": "Default Cost Center", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Cost Center", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "column_break_28", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1034,8 +1034,38 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "total_sales_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Sales Amount (via Sales Order)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
-   "fieldname": "total_billing_amount", 
+   "fieldname": "total_billable_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -1044,7 +1074,7 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Total Billing Amount (via Time Logs)", 
+   "label": "Total Billable Amount (via Timesheets)", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1065,7 +1095,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "total_purchase_cost", 
+   "fieldname": "total_billed_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -1074,7 +1104,7 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Total Purchase Cost (via Purchase Invoice)", 
+   "label": "Total Billed Amount (via Sales Invoices)", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1095,8 +1125,8 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "total_sales_cost", 
-   "fieldtype": "Currency", 
+   "fieldname": "cost_center", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -1104,14 +1134,14 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Total Sales Cost (via Sales Order)", 
+   "label": "Default Cost Center", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "Cost Center", 
    "permlevel": 0, 
-   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 1, 
+   "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1255,7 +1285,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 4, 
- "modified": "2017-07-26 14:36:20.857673", 
+ "modified": "2017-12-10 08:40:46.843201", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Project", 
diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index 460ddc6..979c4fc 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
 from __future__ import unicode_literals
@@ -25,6 +25,8 @@
 			from `tabTimesheet Detail` where project=%s and docstatus < 2 group by activity_type
 			order by total_hours desc''', self.name, as_dict=True))
 
+		self.update_costing()
+
 	def __setup__(self):
 		self.onload()
 
@@ -68,7 +70,7 @@
 		if self.expected_start_date and self.expected_end_date:
 			if getdate(self.expected_end_date) < getdate(self.expected_start_date):
 				frappe.throw(_("Expected End Date can not be less than Expected Start Date"))
-				
+
 	def validate_weights(self):
 		sum = 0
 		for task in self.tasks:
@@ -174,28 +176,37 @@
 		self.actual_end_date = from_time_sheet.end_date
 
 		self.total_costing_amount = from_time_sheet.costing_amount
-		self.total_billing_amount = from_time_sheet.billing_amount
+		self.total_billable_amount = from_time_sheet.billing_amount
 		self.actual_time = from_time_sheet.time
 
 		self.total_expense_claim = from_expense_claim.total_sanctioned_amount
+		self.update_purchase_costing()
+		self.update_sales_amount()
+		self.update_billed_amount()
 
-		self.gross_margin = flt(self.total_billing_amount) - flt(self.total_costing_amount)
+		self.gross_margin = flt(self.total_billed_amount) - (flt(self.total_costing_amount) + flt(self.total_expense_claim) + flt(self.total_purchase_cost))
 
-		if self.total_billing_amount:
-			self.per_gross_margin = (self.gross_margin / flt(self.total_billing_amount)) *100
+		if self.total_billed_amount:
+			self.per_gross_margin = (self.gross_margin / flt(self.total_billed_amount)) *100
 
 	def update_purchase_costing(self):
 		total_purchase_cost = frappe.db.sql("""select sum(base_net_amount)
 			from `tabPurchase Invoice Item` where project = %s and docstatus=1""", self.name)
 
 		self.total_purchase_cost = total_purchase_cost and total_purchase_cost[0][0] or 0
-		
-	def update_sales_costing(self):
-		total_sales_cost = frappe.db.sql("""select sum(base_grand_total)
+
+	def update_sales_amount(self):
+		total_sales_amount = frappe.db.sql("""select sum(base_grand_total)
 			from `tabSales Order` where project = %s and docstatus=1""", self.name)
 
-		self.total_sales_cost = total_sales_cost and total_sales_cost[0][0] or 0
-				
+		self.total_sales_amount = total_sales_amount and total_sales_amount[0][0] or 0
+
+	def update_billed_amount(self):
+		total_billed_amount = frappe.db.sql("""select sum(base_grand_total)
+			from `tabSales Invoice` where project = %s and docstatus=1""", self.name)
+
+		self.total_billed_amount = total_billed_amount and total_billed_amount[0][0] or 0
+
 
 	def send_welcome_email(self):
 		url = get_url("/project/?name={0}".format(self.name))
@@ -219,7 +230,7 @@
 		self.load_tasks()
 		self.sync_tasks()
 		self.update_dependencies_on_duplicated_project()
-	
+
 	def update_dependencies_on_duplicated_project(self):
 		if self.flags.dont_sync_tasks: return
 		if not self.copied_from:
@@ -289,10 +300,10 @@
 
 def get_users_for_project(doctype, txt, searchfield, start, page_len, filters):
 	conditions = []
-	return frappe.db.sql("""select name, concat_ws(' ', first_name, middle_name, last_name) 
+	return frappe.db.sql("""select name, concat_ws(' ', first_name, middle_name, last_name)
 		from `tabUser`
 		where enabled=1
-			and name not in ("Guest", "Administrator") 
+			and name not in ("Guest", "Administrator")
 			and ({key} like %(txt)s
 				or full_name like %(txt)s)
 			{fcond} {mcond}
diff --git a/erpnext/projects/doctype/project/test_project.js b/erpnext/projects/doctype/project/test_project.js
new file mode 100644
index 0000000..16494f6
--- /dev/null
+++ b/erpnext/projects/doctype/project/test_project.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Project", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Project
+		() => frappe.tests.make('Project', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/projects/doctype/task/task.js b/erpnext/projects/doctype/task/task.js
index df38cfe..b8f324a 100644
--- a/erpnext/projects/doctype/task/task.js
+++ b/erpnext/projects/doctype/task/task.js
@@ -19,38 +19,47 @@
 	},
 
 	refresh: function(frm) {
-		var doc = frm.doc;
-		if(doc.__islocal) {
-			if(!frm.doc.exp_end_date) {
-				frm.set_value("exp_end_date", frappe.datetime.add_days(new Date(), 7));
+		frm.fields_dict['parent_task'].get_query = function() {
+			return {
+				filters: {
+					"is_group": 1,
+				}
 			}
 		}
-
-		if(!doc.__islocal) {
-			if(frappe.model.can_read("Timesheet")) {
-				frm.add_custom_button(__("Timesheet"), function() {
-					frappe.route_options = {"project": doc.project, "task": doc.name}
-					frappe.set_route("List", "Timesheet");
-				}, __("View"), true);
-			}
-			if(frappe.model.can_read("Expense Claim")) {
-				frm.add_custom_button(__("Expense Claims"), function() {
-					frappe.route_options = {"project": doc.project, "task": doc.name}
-					frappe.set_route("List", "Expense Claim");
-				}, __("View"), true);
+		if(!frm.is_group){
+			var doc = frm.doc;
+			if(doc.__islocal) {
+				if(!frm.doc.exp_end_date) {
+					frm.set_value("exp_end_date", frappe.datetime.add_days(new Date(), 7));
+				}
 			}
 
-			if(frm.perm[0].write) {
-				if(frm.doc.status!=="Closed" && frm.doc.status!=="Cancelled") {
-					frm.add_custom_button(__("Close"), function() {
-						frm.set_value("status", "Closed");
-						frm.save();
-					});
-				} else {
-					frm.add_custom_button(__("Reopen"), function() {
-						frm.set_value("status", "Open");
-						frm.save();
-					});
+			if(!doc.__islocal) {
+				if(frappe.model.can_read("Timesheet")) {
+					frm.add_custom_button(__("Timesheet"), function() {
+						frappe.route_options = {"project": doc.project, "task": doc.name}
+						frappe.set_route("List", "Timesheet");
+					}, __("View"), true);
+				}
+				if(frappe.model.can_read("Expense Claim")) {
+					frm.add_custom_button(__("Expense Claims"), function() {
+						frappe.route_options = {"project": doc.project, "task": doc.name}
+						frappe.set_route("List", "Expense Claim");
+					}, __("View"), true);
+				}
+
+				if(frm.perm[0].write) {
+					if(frm.doc.status!=="Closed" && frm.doc.status!=="Cancelled") {
+						frm.add_custom_button(__("Close"), function() {
+							frm.set_value("status", "Closed");
+							frm.save();
+						});
+					} else {
+						frm.add_custom_button(__("Reopen"), function() {
+							frm.set_value("status", "Open");
+							frm.save();
+						});
+					}
 				}
 			}
 		}
@@ -71,6 +80,21 @@
 		}
 	},
 
+	is_group: function(frm) {
+		frappe.call({
+			method:"erpnext.projects.doctype.task.task.check_if_child_exists",
+			args: {
+				name: frm.doc.name
+			},
+			callback: function(r){
+				if(r.message){
+					frappe.msgprint(__('Cannot convert it to non-group. Child Tasks exist.'));
+					frm.reload_doc();
+				}
+			}
+		})
+	},
+
 	validate: function(frm) {
 		frm.doc.project && frappe.model.remove_from_locals("Project",
 			frm.doc.project);
diff --git a/erpnext/projects/doctype/task/task.json b/erpnext/projects/doctype/task/task.json
index e4ab5a7..8e72d03 100644
--- a/erpnext/projects/doctype/task/task.json
+++ b/erpnext/projects/doctype/task/task.json
@@ -2,7 +2,7 @@
  "allow_copy": 0, 
  "allow_guest_to_view": 0, 
  "allow_import": 1, 
- "allow_rename": 1, 
+ "allow_rename": 0, 
  "autoname": "TASK.#####", 
  "beta": 0, 
  "creation": "2013-01-29 19:25:50", 
@@ -30,9 +30,8 @@
    "label": "Subject", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "subject", 
-   "oldfieldtype": "Data", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
@@ -78,6 +77,37 @@
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "is_group", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Is Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
@@ -173,9 +203,42 @@
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "parent_task", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Parent Task", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Task", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "collapsible_depends_on": "", 
+   "columns": 0, 
+   "depends_on": "", 
    "fieldname": "section_break_10", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -205,6 +268,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "", 
    "fieldname": "exp_start_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -237,6 +301,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "default": "0", 
+   "depends_on": "", 
    "description": "", 
    "fieldname": "expected_time", 
    "fieldtype": "Float", 
@@ -269,6 +334,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "", 
    "fieldname": "task_weight", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -328,6 +394,7 @@
    "bold": 1, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "", 
    "fieldname": "exp_end_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -359,6 +426,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "", 
    "fieldname": "progress", 
    "fieldtype": "Percent", 
    "hidden": 0, 
@@ -389,6 +457,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "", 
    "fieldname": "is_milestone", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -418,7 +487,9 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "collapsible_depends_on": "", 
    "columns": 0, 
+   "depends_on": "", 
    "fieldname": "section_break0", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -449,6 +520,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "", 
    "fieldname": "description", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
@@ -481,7 +553,9 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "collapsible_depends_on": "", 
    "columns": 0, 
+   "depends_on": "", 
    "fieldname": "section_break", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -512,6 +586,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "", 
    "fieldname": "depends_on", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -543,6 +618,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "", 
    "fieldname": "depends_on_tasks", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -572,7 +648,9 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "collapsible_depends_on": "", 
    "columns": 0, 
+   "depends_on": "", 
    "description": "", 
    "fieldname": "actual", 
    "fieldtype": "Section Break", 
@@ -606,6 +684,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "", 
    "fieldname": "act_start_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -638,6 +717,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "default": "", 
+   "depends_on": "", 
    "description": "", 
    "fieldname": "actual_time", 
    "fieldtype": "Float", 
@@ -699,6 +779,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "", 
    "fieldname": "act_end_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -730,6 +811,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "", 
    "fieldname": "section_break_17", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -759,6 +841,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "", 
    "fieldname": "total_costing_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -791,6 +874,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "", 
    "fieldname": "total_expense_claim", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -851,6 +935,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "", 
    "fieldname": "total_billing_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1025,6 +1110,96 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "lft", 
+   "fieldtype": "Int", 
+   "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": "lft", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "rgt", 
+   "fieldtype": "Int", 
+   "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": "rgt", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "old_parent", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Old Parent", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
   }
  ], 
  "has_web_view": 0, 
@@ -1039,7 +1214,7 @@
  "istable": 0, 
  "max_attachments": 5, 
  "menu_index": 0, 
- "modified": "2017-05-23 11:28:28.161600", 
+ "modified": "2017-11-10 18:37:19.660293", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Task", 
diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index 52ae132..2a1b0e0 100644
--- a/erpnext/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py
@@ -5,13 +5,14 @@
 import frappe, json
 
 from frappe.utils import getdate, date_diff, add_days, cstr
-from frappe import _
-
-from frappe.model.document import Document
+from frappe import _, throw
+from frappe.utils.nestedset import NestedSet
 
 class CircularReferenceError(frappe.ValidationError): pass
 
-class Task(Document):
+class Task(NestedSet):
+	nsm_parent_field = 'parent_task'
+
 	def get_feed(self):
 		return '{0}: {1}'.format(_(self.status), self.subject)
 
@@ -59,7 +60,11 @@
 				depends_on_tasks += d.task + ","
 		self.depends_on_tasks = depends_on_tasks
 
+	def update_nsm_model(self):
+		frappe.utils.nestedset.update_nsm(self)
+
 	def on_update(self):
+		self.update_nsm_model()
 		self.check_recursion()
 		self.reschedule_dependent_tasks()
 		self.update_project()
@@ -105,16 +110,20 @@
 						frappe.throw(_("Circular Reference Error"), CircularReferenceError)
 					if b[0]:
 						task_list.append(b[0])
+
 				if count == 15:
 					break
 
 	def reschedule_dependent_tasks(self):
 		end_date = self.exp_end_date or self.act_end_date
 		if end_date:
-			for task_name in frappe.db.sql("""select name from `tabTask` as parent where parent.project = %(project)s and parent.name in \
-				(select parent from `tabTask Depends On` as child where child.task = %(task)s and child.project = %(project)s)""",
-				{'project': self.project, 'task':self.name }, as_dict=1):
-
+			for task_name in frappe.db.sql("""
+				select name from `tabTask` as parent
+				where parent.project = %(project)s
+					and parent.name in (
+						select parent from `tabTask Depends On` as child
+						where child.task = %(task)s and child.project = %(project)s)
+			""", {'project': self.project, 'task':self.name }, as_dict=1):
 				task = frappe.get_doc("Task", task_name.name)
 				if task.exp_start_date and task.exp_end_date and task.exp_start_date < getdate(end_date) and task.status == "Open":
 					task_duration = date_diff(task.exp_end_date, task.exp_start_date)
@@ -128,29 +137,16 @@
 		if project_user:
 			return True
 
+	def on_trash(self):
+		if check_if_child_exists(self.name):
+			throw(_("Child Task exists for this Task. You can not delete this Task."))
+
+		self.update_nsm_model()
+
 @frappe.whitelist()
-def get_events(start, end, filters=None):
-	"""Returns events for Gantt / Calendar view rendering.
-
-	:param start: Start date-time.
-	:param end: End date-time.
-	:param filters: Filters (JSON).
-	"""
-	from frappe.desk.calendar import get_event_conditions
-	conditions = get_event_conditions("Task", filters)
-
-	data = frappe.db.sql("""select name, exp_start_date, exp_end_date,
-		subject, status, project from `tabTask`
-		where ((ifnull(exp_start_date, '0000-00-00')!= '0000-00-00') \
-				and (exp_start_date <= %(end)s) \
-			or ((ifnull(exp_end_date, '0000-00-00')!= '0000-00-00') \
-				and exp_end_date >= %(start)s))
-		{conditions}""".format(conditions=conditions), {
-			"start": start,
-			"end": end
-		}, as_dict=True, update={"allDay": 0})
-
-	return data
+def check_if_child_exists(name):
+	return frappe.db.sql("""select name from `tabTask`
+		where parent_task = %s""", name)
 
 def get_project(doctype, txt, searchfield, start, page_len, filters):
 	from erpnext.controllers.queries import get_match_cond
@@ -177,4 +173,54 @@
 		and exp_end_date < CURDATE()
 		and `status` not in ('Closed', 'Cancelled')""")
 
+@frappe.whitelist()
+def get_children(doctype, parent, task=None, project=None, is_root=False):
+	conditions = ''
 
+	if task:
+		# via filters
+		conditions += ' and parent_task = "{0}"'.format(frappe.db.escape(task))
+	elif parent and not is_root:
+		# via expand child
+		conditions += ' and parent_task = "{0}"'.format(frappe.db.escape(parent))
+	else:
+		conditions += ' and ifnull(parent_task, "")=""'
+
+	if project:
+		conditions += ' and project = "{0}"'.format(frappe.db.escape(project))
+
+	tasks = frappe.db.sql("""select name as value,
+		subject as title,
+		is_group as expandable
+		from `tabTask`
+		where docstatus < 2
+		{conditions}
+		order by name""".format(conditions=conditions), as_dict=1)
+
+	# return tasks
+	return tasks
+
+@frappe.whitelist()
+def add_node():
+    from frappe.desk.treeview import make_tree_args
+    args = frappe.form_dict
+    args.update({
+    	"name_field": "subject"
+    })
+    args = make_tree_args(**args)
+
+    if args.parent_task == 'All Tasks':
+        args.parent_task = None
+
+    frappe.get_doc(args).insert()
+
+@frappe.whitelist()
+def add_multiple_tasks(data, parent):
+    data = json.loads(data)['tasks']
+    tasks = data.split('\n')
+    new_doc = {'doctype': 'Task', 'parent_task': parent}
+
+    for d in tasks:
+        new_doc['subject'] = d
+        new_task = frappe.get_doc(new_doc)
+        new_task.insert()
diff --git a/erpnext/projects/doctype/task/task_calendar.js b/erpnext/projects/doctype/task/task_calendar.js
index d7468a5..49dbb76 100644
--- a/erpnext/projects/doctype/task/task_calendar.js
+++ b/erpnext/projects/doctype/task/task_calendar.js
@@ -19,5 +19,5 @@
 			"label": __("Project")
 		}
 	],
-	get_events_method: "erpnext.projects.doctype.task.task.get_events"
+	get_events_method: "frappe.desk.calendar.get_events"
 }
diff --git a/erpnext/projects/doctype/task/task_list.js b/erpnext/projects/doctype/task/task_list.js
index ee224d9..887bd42 100644
--- a/erpnext/projects/doctype/task/task_list.js
+++ b/erpnext/projects/doctype/task/task_list.js
@@ -25,7 +25,9 @@
 		return [__(doc.status), colors[doc.status], "status,=," + doc.status];
 	},
 	gantt_custom_popup_html: function(ganttobj, task) {
-		var html = `<h5>${ganttobj.name}</h5>`;
+		var html = `<h5><a style="text-decoration:underline"\
+			href="#Form/Task/${ganttobj.id}""> ${ganttobj.name} </a></h5>`;
+
 		if(task.project) html += `<p>Project: ${task.project}</p>`;
 		html += `<p>Progress: ${ganttobj.progress}</p>`;
 
diff --git a/erpnext/projects/doctype/task/task_tree.js b/erpnext/projects/doctype/task/task_tree.js
new file mode 100644
index 0000000..3ff00f6
--- /dev/null
+++ b/erpnext/projects/doctype/task/task_tree.js
@@ -0,0 +1,68 @@
+frappe.provide("frappe.treeview_settings");
+
+frappe.treeview_settings['Task'] = {
+	get_tree_nodes: "erpnext.projects.doctype.task.task.get_children",
+	add_tree_node: "erpnext.projects.doctype.task.task.add_node",
+	filters: [
+		{
+			fieldname: "project",
+			fieldtype:"Link",
+			options: "Project",
+			label: __("Project"),
+		},
+		{
+			fieldname: "task",
+			fieldtype:"Link",
+			options: "Task",
+			label: __("Task"),
+			get_query: function() {
+				var me = frappe.treeview_settings['Task'];
+				var project = me.page.fields_dict.project.get_value();
+				var args = [["Task", 'is_group', '=', 1]];
+				if(project){
+					args.push(["Task", 'project', "=", project]);
+				}
+				return {
+					filters: args
+				};
+			}
+		}
+	],
+	breadcrumb: "Projects",
+	get_tree_root: false,
+	root_label: "All Tasks",
+	ignore_fields: ["parent_task"],
+	onload: function(me) {
+		frappe.treeview_settings['Task'].page = {};
+		$.extend(frappe.treeview_settings['Task'].page, me.page);
+		me.make_tree();
+	},
+	toolbar: [
+		{
+			label:__("Add Multiple"),
+			condition: function(node) {
+				return node.expandable;
+			},
+			click: function(node) {
+				var d = new frappe.ui.Dialog({
+					'fields': [
+						{'fieldname': 'tasks', 'label': 'Tasks', 'fieldtype': 'Text'},
+					],
+					primary_action: function() {
+						d.hide();
+						return frappe.call({
+							method: "erpnext.projects.doctype.task.task.add_multiple_tasks",
+							args: {
+								data: d.get_values(),
+								parent: node.data.value
+							},
+							callback: function() { }
+						});
+					}
+				});
+				d.show();
+			}
+		}
+	],
+	extend_toolbar: true
+};
\ No newline at end of file
diff --git a/erpnext/projects/doctype/task/test_records.json b/erpnext/projects/doctype/task/test_records.json
deleted file mode 100644
index 42ca0e7..0000000
--- a/erpnext/projects/doctype/task/test_records.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
- {
-  "status": "Open", 
-  "subject": "_Test Task",
-  "name": "task001"
- }, 
- {
-  "status": "Open", 
-  "subject": "_Test Task 1"
- }, 
- {
-  "status": "Open", 
-  "subject": "_Test Task 2"
- }
-]
\ No newline at end of file
diff --git a/erpnext/projects/doctype/task/test_task.py b/erpnext/projects/doctype/task/test_task.py
index 2e64b73..1d94618 100644
--- a/erpnext/projects/doctype/task/test_task.py
+++ b/erpnext/projects/doctype/task/test_task.py
@@ -5,137 +5,61 @@
 import unittest
 from frappe.utils import getdate, nowdate, add_days
 
-# test_records = frappe.get_test_records('Task')
-
 from erpnext.projects.doctype.task.task import CircularReferenceError
 
 class TestTask(unittest.TestCase):
 	def test_circular_reference(self):
+		task1 = create_task("_Test Task 1", nowdate(), add_days(nowdate(), 10))
+		task2 = create_task("_Test Task 2", add_days(nowdate(), 11), add_days(nowdate(), 15), task1.name)
+		task3 = create_task("_Test Task 3", add_days(nowdate(), 11), add_days(nowdate(), 15), task2.name)
 
-		task1 =  frappe.new_doc('Task')
-		task1.update({
-			"status": "Open",
-			"subject": "_Test Task 1",
-			"project": "_Test Project",
-			"exp_start_date": "2015-1-1",
-			"exp_end_date": "2015-1-10"
-		})
-		task1.save()
-
-		task2 =  frappe.new_doc('Task')
-		task2.update({
-			"status": "Open",
-			"subject": "_Test Task 2",
-			"project": "_Test Project",
-			"exp_start_date": "2015-1-11",
-			"exp_end_date": "2015-1-15",
-			"depends_on":[
-				{
-					"task": task1.name
-				}
-			]
-		})
-		task2.save()
-
-		task3 =  frappe.new_doc('Task')
-		task3.update({
-			"status": "Open",
-			"subject": "_Test Task 2",
-			"project": "_Test Project",
-			"exp_start_date": "2015-1-11",
-			"exp_end_date": "2015-1-15",
-			"depends_on":[
-				{
-					"task": task2.name
-				}
-			]
-		})
-		task3.save()
-
+		task1.reload()
 		task1.append("depends_on", {
 			"task": task3.name
 		})
+
 		self.assertRaises(CircularReferenceError, task1.save)
 
 		task1.set("depends_on", [])
 		task1.save()
 
-		task4 =  frappe.new_doc('Task')
-		task4.update({
-			"status": "Open",
-			"subject": "_Test Task 1",
-			"exp_start_date": "2015-1-1",
-			"exp_end_date": "2015-1-15",
-			"depends_on":[
-				{
-					"task": task1.name
-				}
-			]
-		})
-		task4.save()
+		task4 = create_task("_Test Task 4", nowdate(), add_days(nowdate(), 15), task1.name)
 
 		task3.append("depends_on", {
 			"task": task4.name
 		})
 
 	def test_reschedule_dependent_task(self):
-		task1 =  frappe.new_doc('Task')
-		task1.update({
-			"status": "Open",
-			"subject": "_Test Task 1",
-			"project": "_Test Project",
-			"exp_start_date": "2015-1-1",
-			"exp_end_date": "2015-1-10"
-		})
-		task1.save()
+		task1 = create_task("_Test Task 1", nowdate(), add_days(nowdate(), 10))
 
-		task2 =  frappe.new_doc('Task')
-		task2.update({
-			"status": "Open",
-			"subject": "_Test Task 2",
-			"project": "_Test Project",
-			"exp_start_date": "2015-1-11",
-			"exp_end_date": "2015-1-15",
-			"depends_on":[
-				{
-					"task": task1.name,
-					"project": "_Test Project"
-				}
-			]
-		})
+		task2 = create_task("_Test Task 2", add_days(nowdate(), 11), add_days(nowdate(), 15), task1.name)
+		task2.get("depends_on")[0].project = "_Test Project"
 		task2.save()
 
-		task3 =  frappe.new_doc('Task')
-		task3.update({
-			"status": "Open",
-			"subject": "_Test Task 3",
-			"project": "_Test Project",
-			"exp_start_date": "2015-1-16",
-			"exp_end_date": "2015-1-18",
-			"depends_on":[
-				{
-					"task": task2.name,
-					"project": "_Test Project"
-				}
-			]
-		})
+		task3 = create_task("_Test Task 3", add_days(nowdate(), 11), add_days(nowdate(), 15), task2.name)
+		task3.get("depends_on")[0].project = "_Test Project"
 		task3.save()
 
 		task1.update({
-			"exp_end_date": "2015-1-20"
+			"exp_end_date": add_days(nowdate(), 20)
 		})
 		task1.save()
 
-		self.assertEqual(frappe.db.get_value("Task", task2.name, "exp_start_date"), getdate('2015-1-21'))
-		self.assertEqual(frappe.db.get_value("Task", task2.name, "exp_end_date"), getdate('2015-1-25'))
+		self.assertEqual(frappe.db.get_value("Task", task2.name, "exp_start_date"),
+			getdate(add_days(nowdate(), 21)))
+		self.assertEqual(frappe.db.get_value("Task", task2.name, "exp_end_date"),
+			getdate(add_days(nowdate(), 25)))
 
-		self.assertEqual(frappe.db.get_value("Task", task3.name, "exp_start_date"), getdate('2015-1-26'))
-		self.assertEqual(frappe.db.get_value("Task", task3.name, "exp_end_date"), getdate('2015-1-28'))
+		self.assertEqual(frappe.db.get_value("Task", task3.name, "exp_start_date"),
+			getdate(add_days(nowdate(), 26)))
+		self.assertEqual(frappe.db.get_value("Task", task3.name, "exp_end_date"),
+			getdate(add_days(nowdate(), 30)))
 
 	def test_close_assignment(self):
-		task = frappe.new_doc("Task")
-		task.subject = "Test Close Assignment"
-		task.insert()
+		if not frappe.db.exists("Task", "Test Close Assignment"):
+			task = frappe.new_doc("Task")
+			task.subject = "Test Close Assignment"
+			task.insert()
 
 		def assign():
 			from frappe.desk.form import assign_to
@@ -147,8 +71,10 @@
 			})
 
 		def get_owner_and_status():
-			return frappe.db.get_value("ToDo", filters={"reference_type": task.doctype, "reference_name": task.name,
-					"description": "Close this task"}, fieldname=("owner", "status"), as_dict=True)
+			return frappe.db.get_value("ToDo",
+				filters={"reference_type": task.doctype, "reference_name": task.name,
+					"description": "Close this task"},
+				fieldname=("owner", "status"), as_dict=True)
 
 		assign()
 		todo = get_owner_and_status()
@@ -164,16 +90,29 @@
 		self.assertEquals(todo.status, "Closed")
 
 	def test_overdue(self):
-		task = frappe.get_doc({
-			"doctype":"Task",
-			"subject": "Testing Overdue",
-			"status": "Open",
-			"exp_end_date": add_days(nowdate(), -1)
-		})
-
-		task.insert()
+		task = create_task("Testing Overdue", add_days(nowdate(), -10), add_days(nowdate(), -5))
 
 		from erpnext.projects.doctype.task.task import set_tasks_as_overdue
 		set_tasks_as_overdue()
 
 		self.assertEquals(frappe.db.get_value("Task", task.name, "status"), "Overdue")
+
+def create_task(subject, start=None, end=None, depends_on=None, project=None):
+	if not frappe.db.exists("Task", subject):
+		task = frappe.new_doc('Task')
+		task.status = "Open"
+		task.subject = subject
+		task.exp_start_date = start or nowdate()
+		task.exp_end_date = end or nowdate()
+		task.project = project or "_Test Project"
+		task.save()
+	else:
+		task = frappe.get_doc("Task", subject)
+
+	if depends_on:
+		task.append("depends_on", {
+			"task": depends_on
+		})
+		task.save()
+
+	return task
\ No newline at end of file
diff --git a/erpnext/projects/doctype/task/test_task.js b/erpnext/projects/doctype/task/tests/test_task.js
similarity index 100%
rename from erpnext/projects/doctype/task/test_task.js
rename to erpnext/projects/doctype/task/tests/test_task.js
diff --git a/erpnext/projects/doctype/task/tests/test_task_tree.js b/erpnext/projects/doctype/task/tests/test_task_tree.js
new file mode 100644
index 0000000..27dccbf
--- /dev/null
+++ b/erpnext/projects/doctype/task/tests/test_task_tree.js
@@ -0,0 +1,88 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Task Tree", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(4);
+
+	frappe.run_serially([
+		// insert a new Task
+		() => frappe.set_route('Tree', 'Task'),
+		() => frappe.timeout(0.5),
+
+		// Checking adding child without selecting any Node
+		() => frappe.tests.click_button('New'),
+		() => frappe.timeout(0.5),
+		() => {assert.equal($(`.msgprint`).text(), "Select a group node first.", "Error message success");},
+		() => frappe.tests.click_button('Close'),
+		() => frappe.timeout(0.5),
+
+		// Creating child nodes
+		() => frappe.tests.click_link('All Tasks'),
+		() => frappe.map_group.make('Test-1'),
+		() => frappe.map_group.make('Test-3', 1),
+		() => frappe.timeout(1),
+		() => frappe.tests.click_link('Test-3'),
+		() => frappe.map_group.make('Test-4', 0),
+
+		// Checking Edit button
+		() => frappe.timeout(0.5),
+		() => frappe.tests.click_link('Test-1'),
+		() => frappe.tests.click_button('Edit'),
+		() => frappe.timeout(1),
+		() => frappe.db.get_value('Task', {'subject': 'Test-1'}, 'name'),
+		(task) => {assert.deepEqual(frappe.get_route(), ["Form", "Task", task.message.name], "Edit route checks");},
+
+		// Deleting child Node
+		() => frappe.set_route('Tree', 'Task'),
+		() => frappe.timeout(0.5),
+		() => frappe.tests.click_link('Test-1'),
+		() => frappe.tests.click_button('Delete'),
+		() => frappe.timeout(0.5),
+		() => frappe.tests.click_button('Yes'),
+
+		// Deleting Group Node that has child nodes in it
+		() => frappe.timeout(0.5),
+		() => frappe.tests.click_link('Test-3'),
+		() => frappe.tests.click_button('Delete'),
+		() => frappe.timeout(0.5),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(1),
+		() => {assert.equal(cur_dialog.title, 'Message', 'Error thrown correctly');},
+		() => frappe.tests.click_button('Close'),
+
+		// Add multiple child tasks
+		() => frappe.tests.click_link('Test-3'),
+		() => frappe.timeout(0.5),
+		() => frappe.click_button('Add Multiple'),
+		() => frappe.timeout(1),
+		() => cur_dialog.set_value('tasks', 'Test-6\nTest-7'),
+		() => frappe.timeout(0.5),
+		() => frappe.click_button('Submit'),
+		() => frappe.timeout(2),
+		() => frappe.click_button('Expand All'),
+		() => frappe.timeout(1),
+		() => {
+			let count = $(`a:contains("Test-6"):visible`).length + $(`a:contains("Test-7"):visible`).length;
+			assert.equal(count, 2, "Multiple Tasks added successfully");
+		},
+
+		() => done()
+	]);
+});
+
+frappe.map_group = {
+	make:function(subject, is_group = 0){
+		return frappe.run_serially([
+			() => frappe.click_button('Add Child'),
+			() => frappe.timeout(1),
+			() => cur_dialog.set_value('is_group', is_group),
+			() => cur_dialog.set_value('subject', subject),
+			() => frappe.click_button('Create New'),
+			() => frappe.timeout(1.5)
+		]);
+	}
+};
diff --git a/erpnext/public/build.json b/erpnext/public/build.json
index 393e90c..612bc60 100644
--- a/erpnext/public/build.json
+++ b/erpnext/public/build.json
@@ -31,8 +31,11 @@
         "public/js/templates/item_selector.html",
         "public/js/utils/item_selector.js",
         "public/js/help_links.js",
-        "public/js/schools/student_button.html",
-        "public/js/schools/assessment_result_tool.html"
+        "public/js/agriculture/ternary_plot.js",
+        "public/js/templates/item_quick_entry.html",
+        "public/js/utils/item_quick_entry.js",
+        "public/js/education/student_button.html",
+        "public/js/education/assessment_result_tool.html"
     ],
     "js/item-dashboard.min.js": [
         "stock/dashboard/item_dashboard.html",
diff --git a/erpnext/public/css/leaflet/leaflet.css b/erpnext/public/css/leaflet/leaflet.css
new file mode 100755
index 0000000..979a8bd
--- /dev/null
+++ b/erpnext/public/css/leaflet/leaflet.css
@@ -0,0 +1,611 @@
+/* required styles */
+
+.leaflet-pane,
+.leaflet-tile,
+.leaflet-marker-icon,
+.leaflet-marker-shadow,
+.leaflet-tile-container,
+.leaflet-map-pane svg,
+.leaflet-map-pane canvas,
+.leaflet-zoom-box,
+.leaflet-image-layer,
+.leaflet-layer {
+    position: absolute;
+    left: 0;
+    top: 0;
+}
+
+.leaflet-container {
+    overflow: hidden;
+    -ms-touch-action: none;
+    touch-action: none;
+}
+
+.leaflet-tile,
+.leaflet-marker-icon,
+.leaflet-marker-shadow {
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    user-select: none;
+    -webkit-user-drag: none;
+}
+
+
+/* Safari renders non-retina tile on retina better with this, but Chrome is worse */
+
+.leaflet-safari .leaflet-tile {
+    image-rendering: -webkit-optimize-contrast;
+}
+
+
+/* hack that prevents hw layers "stretching" when loading new tiles */
+
+.leaflet-safari .leaflet-tile-container {
+    width: 1600px;
+    height: 1600px;
+    -webkit-transform-origin: 0 0;
+}
+
+.leaflet-marker-icon,
+.leaflet-marker-shadow {
+    display: block;
+}
+
+
+/* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */
+
+
+/* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */
+
+.leaflet-container .leaflet-overlay-pane svg,
+.leaflet-container .leaflet-marker-pane img,
+.leaflet-container .leaflet-tile-pane img,
+.leaflet-container img.leaflet-image-layer {
+    max-width: none !important;
+}
+
+.leaflet-tile {
+    filter: inherit;
+    visibility: hidden;
+}
+
+.leaflet-tile-loaded {
+    visibility: inherit;
+}
+
+.leaflet-zoom-box {
+    width: 0;
+    height: 0;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    z-index: 800;
+}
+
+
+/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */
+
+.leaflet-overlay-pane svg {
+    -moz-user-select: none;
+}
+
+.leaflet-pane {
+    z-index: 400;
+}
+
+.leaflet-tile-pane {
+    z-index: 200;
+}
+
+.leaflet-overlay-pane {
+    z-index: 400;
+}
+
+.leaflet-shadow-pane {
+    z-index: 500;
+}
+
+.leaflet-marker-pane {
+    z-index: 600;
+}
+
+.leaflet-popup-pane {
+    z-index: 700;
+}
+
+.leaflet-map-pane canvas {
+    z-index: 100;
+}
+
+.leaflet-map-pane svg {
+    z-index: 200;
+}
+
+.leaflet-vml-shape {
+    width: 1px;
+    height: 1px;
+}
+
+.lvml {
+    behavior: url(#default#VML);
+    display: inline-block;
+    position: absolute;
+}
+
+
+/* control positioning */
+
+.leaflet-control {
+    position: relative;
+    z-index: 800;
+    pointer-events: auto;
+}
+
+.leaflet-top,
+.leaflet-bottom {
+    position: absolute;
+    z-index: 1000;
+    pointer-events: none;
+}
+
+.leaflet-top {
+    top: 0;
+}
+
+.leaflet-right {
+    right: 0;
+}
+
+.leaflet-bottom {
+    bottom: 0;
+}
+
+.leaflet-left {
+    left: 0;
+}
+
+.leaflet-control {
+    float: left;
+    clear: both;
+}
+
+.leaflet-right .leaflet-control {
+    float: right;
+}
+
+.leaflet-top .leaflet-control {
+    margin-top: 10px;
+}
+
+.leaflet-bottom .leaflet-control {
+    margin-bottom: 10px;
+}
+
+.leaflet-left .leaflet-control {
+    margin-left: 10px;
+}
+
+.leaflet-right .leaflet-control {
+    margin-right: 10px;
+}
+
+
+/* zoom and fade animations */
+
+.leaflet-fade-anim .leaflet-tile {
+    will-change: opacity;
+}
+
+.leaflet-fade-anim .leaflet-popup {
+    opacity: 0;
+    -webkit-transition: opacity 0.2s linear;
+    -moz-transition: opacity 0.2s linear;
+    -o-transition: opacity 0.2s linear;
+    transition: opacity 0.2s linear;
+}
+
+.leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
+    opacity: 1;
+}
+
+.leaflet-zoom-animated {
+    -webkit-transform-origin: 0 0;
+    -ms-transform-origin: 0 0;
+    transform-origin: 0 0;
+}
+
+.leaflet-zoom-anim .leaflet-zoom-animated {
+    will-change: transform;
+}
+
+.leaflet-zoom-anim .leaflet-zoom-animated {
+    -webkit-transition: -webkit-transform 0.25s cubic-bezier(0, 0, 0.25, 1);
+    -moz-transition: -moz-transform 0.25s cubic-bezier(0, 0, 0.25, 1);
+    -o-transition: -o-transform 0.25s cubic-bezier(0, 0, 0.25, 1);
+    transition: transform 0.25s cubic-bezier(0, 0, 0.25, 1);
+}
+
+.leaflet-zoom-anim .leaflet-tile,
+.leaflet-pan-anim .leaflet-tile {
+    -webkit-transition: none;
+    -moz-transition: none;
+    -o-transition: none;
+    transition: none;
+}
+
+.leaflet-zoom-anim .leaflet-zoom-hide {
+    visibility: hidden;
+}
+
+
+/* cursors */
+
+.leaflet-interactive {
+    cursor: pointer;
+}
+
+.leaflet-grab {
+    cursor: -webkit-grab;
+    cursor: -moz-grab;
+}
+
+.leaflet-crosshair,
+.leaflet-crosshair .leaflet-interactive {
+    cursor: crosshair;
+}
+
+.leaflet-popup-pane,
+.leaflet-control {
+    cursor: auto;
+}
+
+.leaflet-dragging .leaflet-grab,
+.leaflet-dragging .leaflet-grab .leaflet-interactive,
+.leaflet-dragging .leaflet-marker-draggable {
+    cursor: move;
+    cursor: -webkit-grabbing;
+    cursor: -moz-grabbing;
+}
+
+
+/* visual tweaks */
+
+.leaflet-container {
+    background: #ddd;
+    outline: 0;
+}
+
+.leaflet-container a {
+    color: #0078A8;
+}
+
+.leaflet-container a.leaflet-active {
+    outline: 2px solid orange;
+}
+
+.leaflet-zoom-box {
+    border: 2px dotted #38f;
+    background: rgba(255, 255, 255, 0.5);
+}
+
+
+/* general typography */
+
+.leaflet-container {
+    font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
+}
+
+
+/* general toolbar styles */
+
+.leaflet-bar {
+    box-shadow: 0 1px 5px rgba(0, 0, 0, 0.65);
+    border-radius: 4px;
+}
+
+.leaflet-bar a,
+.leaflet-bar a:hover {
+    background-color: #fff;
+    border-bottom: 1px solid #ccc;
+    width: 26px;
+    height: 26px;
+    line-height: 26px;
+    display: block;
+    text-align: center;
+    text-decoration: none;
+    color: black;
+}
+
+.leaflet-bar a,
+.leaflet-control-layers-toggle {
+    background-position: 50% 50%;
+    background-repeat: no-repeat;
+    display: block;
+}
+
+.leaflet-bar a:hover {
+    background-color: #f4f4f4;
+}
+
+.leaflet-bar a:first-child {
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+}
+
+.leaflet-bar a:last-child {
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-bottom: none;
+}
+
+.leaflet-bar a.leaflet-disabled {
+    cursor: default;
+    background-color: #f4f4f4;
+    color: #bbb;
+}
+
+.leaflet-touch .leaflet-bar a {
+    width: 30px;
+    height: 30px;
+    line-height: 30px;
+}
+
+
+/* zoom control */
+
+.leaflet-control-zoom-in,
+.leaflet-control-zoom-out {
+    font: bold 18px 'Lucida Console', Monaco, monospace;
+    text-indent: 1px;
+}
+
+.leaflet-control-zoom-out {
+    font-size: 20px;
+}
+
+.leaflet-touch .leaflet-control-zoom-in {
+    font-size: 22px;
+}
+
+.leaflet-touch .leaflet-control-zoom-out {
+    font-size: 24px;
+}
+
+
+/* layers control */
+
+.leaflet-control-layers {
+    box-shadow: 0 1px 5px rgba(0, 0, 0, 0.4);
+    background: #fff;
+    border-radius: 5px;
+}
+
+.leaflet-control-layers-toggle {
+    background-image: url('assets/erpnext/images/leaflet/layers.png');
+    width: 36px;
+    height: 36px;
+}
+
+.leaflet-retina .leaflet-control-layers-toggle {
+    background-image: url('assets/erpnext/images/leaflet/layers-2x.png');
+    background-size: 26px 26px;
+}
+
+.leaflet-touch .leaflet-control-layers-toggle {
+    width: 44px;
+    height: 44px;
+}
+
+.leaflet-control-layers .leaflet-control-layers-list,
+.leaflet-control-layers-expanded .leaflet-control-layers-toggle {
+    display: none;
+}
+
+.leaflet-control-layers-expanded .leaflet-control-layers-list {
+    display: block;
+    position: relative;
+}
+
+.leaflet-control-layers-expanded {
+    padding: 6px 10px 6px 6px;
+    color: #333;
+    background: #fff;
+}
+
+.leaflet-control-layers-scrollbar {
+    overflow-y: scroll;
+    padding-right: 5px;
+}
+
+.leaflet-control-layers-selector {
+    margin-top: 2px;
+    position: relative;
+    top: 1px;
+}
+
+.leaflet-control-layers label {
+    display: block;
+}
+
+.leaflet-control-layers-separator {
+    height: 0;
+    border-top: 1px solid #ddd;
+    margin: 5px -10px 5px -6px;
+}
+
+
+/* attribution and scale controls */
+
+.leaflet-container .leaflet-control-attribution {
+    background: #fff;
+    background: rgba(255, 255, 255, 0.7);
+    margin: 0;
+}
+
+.leaflet-control-attribution,
+.leaflet-control-scale-line {
+    padding: 0 5px;
+    color: #333;
+}
+
+.leaflet-control-attribution a {
+    text-decoration: none;
+}
+
+.leaflet-control-attribution a:hover {
+    text-decoration: underline;
+}
+
+.leaflet-container .leaflet-control-attribution,
+.leaflet-container .leaflet-control-scale {
+    font-size: 11px;
+}
+
+.leaflet-left .leaflet-control-scale {
+    margin-left: 5px;
+}
+
+.leaflet-bottom .leaflet-control-scale {
+    margin-bottom: 5px;
+}
+
+.leaflet-control-scale-line {
+    border: 2px solid #777;
+    border-top: none;
+    line-height: 1.1;
+    padding: 2px 5px 1px;
+    font-size: 11px;
+    white-space: nowrap;
+    overflow: hidden;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    background: #fff;
+    background: rgba(255, 255, 255, 0.5);
+}
+
+.leaflet-control-scale-line:not(:first-child) {
+    border-top: 2px solid #777;
+    border-bottom: none;
+    margin-top: -2px;
+}
+
+.leaflet-control-scale-line:not(:first-child):not(:last-child) {
+    border-bottom: 2px solid #777;
+}
+
+.leaflet-touch .leaflet-control-attribution,
+.leaflet-touch .leaflet-control-layers,
+.leaflet-touch .leaflet-bar {
+    box-shadow: none;
+}
+
+.leaflet-touch .leaflet-control-layers,
+.leaflet-touch .leaflet-bar {
+    border: 2px solid rgba(0, 0, 0, 0.2);
+    background-clip: padding-box;
+}
+
+
+/* popup */
+
+.leaflet-popup {
+    position: absolute;
+    text-align: center;
+}
+
+.leaflet-popup-content-wrapper {
+    padding: 1px;
+    text-align: left;
+    border-radius: 12px;
+}
+
+.leaflet-popup-content {
+    margin: 13px 19px;
+    line-height: 1.4;
+}
+
+.leaflet-popup-content p {
+    margin: 18px 0;
+}
+
+.leaflet-popup-tip-container {
+    margin: 0 auto;
+    width: 40px;
+    height: 20px;
+    position: relative;
+    overflow: hidden;
+}
+
+.leaflet-popup-tip {
+    width: 17px;
+    height: 17px;
+    padding: 1px;
+    margin: -10px auto 0;
+    -webkit-transform: rotate(45deg);
+    -moz-transform: rotate(45deg);
+    -ms-transform: rotate(45deg);
+    -o-transform: rotate(45deg);
+    transform: rotate(45deg);
+}
+
+.leaflet-popup-content-wrapper,
+.leaflet-popup-tip {
+    background: white;
+    color: #333;
+    box-shadow: 0 3px 14px rgba(0, 0, 0, 0.4);
+}
+
+.leaflet-container a.leaflet-popup-close-button {
+    position: absolute;
+    top: 0;
+    right: 0;
+    padding: 4px 4px 0 0;
+    border: none;
+    text-align: center;
+    width: 18px;
+    height: 14px;
+    font: 16px/14px Tahoma, Verdana, sans-serif;
+    color: #c3c3c3;
+    text-decoration: none;
+    font-weight: bold;
+    background: transparent;
+}
+
+.leaflet-container a.leaflet-popup-close-button:hover {
+    color: #999;
+}
+
+.leaflet-popup-scrolled {
+    overflow: auto;
+    border-bottom: 1px solid #ddd;
+    border-top: 1px solid #ddd;
+}
+
+.leaflet-oldie .leaflet-popup-content-wrapper {
+    zoom: 1;
+}
+
+.leaflet-oldie .leaflet-popup-tip {
+    width: 24px;
+    margin: 0 auto;
+    -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
+    filter: progid: DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
+}
+
+.leaflet-oldie .leaflet-popup-tip-container {
+    margin-top: -1px;
+}
+
+.leaflet-oldie .leaflet-control-zoom,
+.leaflet-oldie .leaflet-control-layers,
+.leaflet-oldie .leaflet-popup-content-wrapper,
+.leaflet-oldie .leaflet-popup-tip {
+    border: 1px solid #999;
+}
+
+
+/* div icon */
+
+.leaflet-div-icon {
+    background: #fff;
+    border: 1px solid #666;
+}
\ No newline at end of file
diff --git a/erpnext/public/css/leaflet/leaflet.draw.css b/erpnext/public/css/leaflet/leaflet.draw.css
new file mode 100755
index 0000000..6fb7db0
--- /dev/null
+++ b/erpnext/public/css/leaflet/leaflet.draw.css
@@ -0,0 +1,316 @@
+/* ================================================================== */
+
+
+/* Toolbars
+/* ================================================================== */
+
+.leaflet-draw-section {
+    position: relative;
+}
+
+.leaflet-draw-toolbar {
+    margin-top: 12px;
+}
+
+.leaflet-draw-toolbar-top {
+    margin-top: 0;
+}
+
+.leaflet-draw-toolbar-notop a:first-child {
+    border-top-right-radius: 0;
+}
+
+.leaflet-draw-toolbar-nobottom a:last-child {
+    border-bottom-right-radius: 0;
+}
+
+.leaflet-draw-toolbar a {
+    background-image: url('assets/erpnext/images/leaflet/spritesheet.png');
+    background-repeat: no-repeat;
+}
+
+.leaflet-retina .leaflet-draw-toolbar a {
+    background-image: url('assets/erpnext/images/leaflet/spritesheet-2x.png');
+    background-size: 270px 30px;
+}
+
+.leaflet-draw a {
+    display: block;
+    text-align: center;
+    text-decoration: none;
+}
+
+
+/* ================================================================== */
+
+
+/* Toolbar actions menu
+/* ================================================================== */
+
+.leaflet-draw-actions {
+    display: none;
+    list-style: none;
+    margin: 0;
+    padding: 0;
+    position: absolute;
+    left: 26px;
+    /* leaflet-draw-toolbar.left + leaflet-draw-toolbar.width */
+    top: 0;
+    white-space: nowrap;
+}
+
+.leaflet-right .leaflet-draw-actions {
+    right: 26px;
+    left: auto;
+}
+
+.leaflet-draw-actions li {
+    display: inline-block;
+}
+
+.leaflet-draw-actions li:first-child a {
+    border-left: none;
+}
+
+.leaflet-draw-actions li:last-child a {
+    -webkit-border-radius: 0 4px 4px 0;
+    border-radius: 0 4px 4px 0;
+}
+
+.leaflet-right .leaflet-draw-actions li:last-child a {
+    -webkit-border-radius: 0;
+    border-radius: 0;
+}
+
+.leaflet-right .leaflet-draw-actions li:first-child a {
+    -webkit-border-radius: 4px 0 0 4px;
+    border-radius: 4px 0 0 4px;
+}
+
+.leaflet-draw-actions a {
+    background-color: #919187;
+    border-left: 1px solid #AAA;
+    color: #FFF;
+    font: 11px/19px "Helvetica Neue", Arial, Helvetica, sans-serif;
+    line-height: 28px;
+    text-decoration: none;
+    padding-left: 10px;
+    padding-right: 10px;
+    height: 28px;
+}
+
+.leaflet-draw-actions-bottom {
+    margin-top: 0;
+}
+
+.leaflet-draw-actions-top {
+    margin-top: 1px;
+}
+
+.leaflet-draw-actions-top a,
+.leaflet-draw-actions-bottom a {
+    height: 27px;
+    line-height: 27px;
+}
+
+.leaflet-draw-actions a:hover {
+    background-color: #A0A098;
+}
+
+.leaflet-draw-actions-top.leaflet-draw-actions-bottom a {
+    height: 26px;
+    line-height: 26px;
+}
+
+
+/* ================================================================== */
+
+
+/* Draw toolbar
+/* ================================================================== */
+
+.leaflet-draw-toolbar .leaflet-draw-draw-polyline {
+    background-position: -2px -2px;
+}
+
+.leaflet-draw-toolbar .leaflet-draw-draw-polygon {
+    background-position: -31px -2px;
+}
+
+.leaflet-draw-toolbar .leaflet-draw-draw-rectangle {
+    background-position: -62px -2px;
+}
+
+.leaflet-draw-toolbar .leaflet-draw-draw-circle {
+    background-position: -92px -2px;
+}
+
+.leaflet-draw-toolbar .leaflet-draw-draw-marker {
+    background-position: -122px -2px;
+}
+
+
+/* ================================================================== */
+
+
+/* Edit toolbar
+/* ================================================================== */
+
+.leaflet-draw-toolbar .leaflet-draw-edit-edit {
+    background-position: -152px -2px;
+}
+
+.leaflet-draw-toolbar .leaflet-draw-edit-remove {
+    background-position: -182px -2px;
+}
+
+.leaflet-draw-toolbar .leaflet-draw-edit-edit.leaflet-disabled {
+    background-position: -212px -2px;
+}
+
+.leaflet-draw-toolbar .leaflet-draw-edit-remove.leaflet-disabled {
+    background-position: -242px -2px;
+}
+
+
+/* ================================================================== */
+
+
+/* Drawing styles
+/* ================================================================== */
+
+.leaflet-mouse-marker {
+    background-color: #fff;
+    cursor: crosshair;
+}
+
+.leaflet-draw-tooltip {
+    background: rgb(54, 54, 54);
+    background: rgba(0, 0, 0, 0.5);
+    border: 1px solid transparent;
+    -webkit-border-radius: 4px;
+    border-radius: 4px;
+    color: #fff;
+    font: 12px/18px "Helvetica Neue", Arial, Helvetica, sans-serif;
+    margin-left: 20px;
+    margin-top: -21px;
+    padding: 4px 8px;
+    position: absolute;
+    visibility: hidden;
+    white-space: nowrap;
+    z-index: 6;
+}
+
+.leaflet-draw-tooltip:before {
+    border-right: 6px solid black;
+    border-right-color: rgba(0, 0, 0, 0.5);
+    border-top: 6px solid transparent;
+    border-bottom: 6px solid transparent;
+    content: "";
+    position: absolute;
+    top: 7px;
+    left: -7px;
+}
+
+.leaflet-error-draw-tooltip {
+    background-color: #F2DEDE;
+    border: 1px solid #E6B6BD;
+    color: #B94A48;
+}
+
+.leaflet-error-draw-tooltip:before {
+    border-right-color: #E6B6BD;
+}
+
+.leaflet-draw-tooltip-single {
+    margin-top: -12px
+}
+
+.leaflet-draw-tooltip-subtext {
+    color: #f8d5e4;
+}
+
+.leaflet-draw-guide-dash {
+    font-size: 1%;
+    opacity: 0.6;
+    position: absolute;
+    width: 5px;
+    height: 5px;
+}
+
+
+/* ================================================================== */
+
+
+/* Edit styles
+/* ================================================================== */
+
+.leaflet-edit-marker-selected {
+    background: rgba(254, 87, 161, 0.1);
+    border: 4px dashed rgba(254, 87, 161, 0.6);
+    -webkit-border-radius: 4px;
+    border-radius: 4px;
+}
+
+.leaflet-edit-move {
+    cursor: move;
+}
+
+.leaflet-edit-resize {
+    cursor: pointer;
+}
+
+
+/* ================================================================== */
+
+
+/* Old IE styles
+/* ================================================================== */
+
+.leaflet-oldie .leaflet-draw-toolbar {
+    border: 3px solid #999;
+}
+
+.leaflet-oldie .leaflet-draw-toolbar a {
+    background-color: #eee;
+}
+
+.leaflet-oldie .leaflet-draw-toolbar a:hover {
+    background-color: #fff;
+}
+
+.leaflet-oldie .leaflet-draw-actions {
+    left: 32px;
+    margin-top: 3px;
+}
+
+.leaflet-oldie .leaflet-draw-actions li {
+    display: inline;
+    zoom: 1;
+}
+
+.leaflet-oldie .leaflet-edit-marker-selected {
+    border: 4px dashed #fe93c2;
+}
+
+.leaflet-oldie .leaflet-draw-actions a {
+    background-color: #999;
+}
+
+.leaflet-oldie .leaflet-draw-actions a:hover {
+    background-color: #a5a5a5;
+}
+
+.leaflet-oldie .leaflet-draw-actions-top a {
+    margin-top: 1px;
+}
+
+.leaflet-oldie .leaflet-draw-actions-bottom a {
+    height: 28px;
+    line-height: 28px;
+}
+
+.leaflet-oldie .leaflet-draw-actions-top.leaflet-draw-actions-bottom a {
+    height: 27px;
+    line-height: 27px;
+}
\ No newline at end of file
diff --git a/erpnext/public/images/leaflet/farmer.png b/erpnext/public/images/leaflet/farmer.png
new file mode 100644
index 0000000..03e42ff
--- /dev/null
+++ b/erpnext/public/images/leaflet/farmer.png
Binary files differ
diff --git a/erpnext/public/images/leaflet/layers-2x.png b/erpnext/public/images/leaflet/layers-2x.png
new file mode 100644
index 0000000..200c333
--- /dev/null
+++ b/erpnext/public/images/leaflet/layers-2x.png
Binary files differ
diff --git a/erpnext/public/images/leaflet/layers.png b/erpnext/public/images/leaflet/layers.png
new file mode 100644
index 0000000..1a72e57
--- /dev/null
+++ b/erpnext/public/images/leaflet/layers.png
Binary files differ
diff --git a/erpnext/public/images/leaflet/marker-icon-2x.png b/erpnext/public/images/leaflet/marker-icon-2x.png
new file mode 100644
index 0000000..e4abba3
--- /dev/null
+++ b/erpnext/public/images/leaflet/marker-icon-2x.png
Binary files differ
diff --git a/erpnext/public/images/leaflet/marker-icon.png b/erpnext/public/images/leaflet/marker-icon.png
new file mode 100644
index 0000000..950edf2
--- /dev/null
+++ b/erpnext/public/images/leaflet/marker-icon.png
Binary files differ
diff --git a/erpnext/public/images/leaflet/marker-shadow.png b/erpnext/public/images/leaflet/marker-shadow.png
new file mode 100644
index 0000000..9fd2979
--- /dev/null
+++ b/erpnext/public/images/leaflet/marker-shadow.png
Binary files differ
diff --git a/erpnext/public/images/leaflet/spritesheet-2x.png b/erpnext/public/images/leaflet/spritesheet-2x.png
new file mode 100644
index 0000000..c45231a
--- /dev/null
+++ b/erpnext/public/images/leaflet/spritesheet-2x.png
Binary files differ
diff --git a/erpnext/public/images/leaflet/spritesheet.png b/erpnext/public/images/leaflet/spritesheet.png
new file mode 100644
index 0000000..97d71c6
--- /dev/null
+++ b/erpnext/public/images/leaflet/spritesheet.png
Binary files differ
diff --git a/erpnext/public/images/leaflet/spritesheet.svg b/erpnext/public/images/leaflet/spritesheet.svg
new file mode 100644
index 0000000..3c00f30
--- /dev/null
+++ b/erpnext/public/images/leaflet/spritesheet.svg
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 600 60"
+   height="60"
+   width="600"
+   id="svg4225"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="spritesheet.svg"
+   inkscape:export-filename="/home/fpuga/development/upstream/icarto.Leaflet.draw/src/images/spritesheet-2x.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <metadata
+     id="metadata4258">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs4256" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1056"
+     id="namedview4254"
+     showgrid="false"
+     inkscape:zoom="1.3101852"
+     inkscape:cx="237.56928"
+     inkscape:cy="7.2419621"
+     inkscape:window-x="1920"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4225" />
+  <g
+     id="enabled"
+     style="fill:#464646;fill-opacity:1">
+    <g
+       id="polyline"
+       style="fill:#464646;fill-opacity:1">
+      <path
+         d="m 18,36 0,6 6,0 0,-6 -6,0 z m 4,4 -2,0 0,-2 2,0 0,2 z"
+         id="path4229"
+         inkscape:connector-curvature="0"
+         style="fill:#464646;fill-opacity:1" />
+      <path
+         d="m 36,18 0,6 6,0 0,-6 -6,0 z m 4,4 -2,0 0,-2 2,0 0,2 z"
+         id="path4231"
+         inkscape:connector-curvature="0"
+         style="fill:#464646;fill-opacity:1" />
+      <path
+         d="m 23.142,39.145 -2.285,-2.29 16,-15.998 2.285,2.285 z"
+         id="path4233"
+         inkscape:connector-curvature="0"
+         style="fill:#464646;fill-opacity:1" />
+    </g>
+    <path
+       id="polygon"
+       d="M 100,24.565 97.904,39.395 83.07,42 76,28.773 86.463,18 Z"
+       inkscape:connector-curvature="0"
+       style="fill:#464646;fill-opacity:1" />
+    <path
+       id="rectangle"
+       d="m 140,20 20,0 0,20 -20,0 z"
+       inkscape:connector-curvature="0"
+       style="fill:#464646;fill-opacity:1" />
+    <path
+       id="circle"
+       d="m 221,30 c 0,6.078 -4.926,11 -11,11 -6.074,0 -11,-4.922 -11,-11 0,-6.074 4.926,-11 11,-11 6.074,0 11,4.926 11,11 z"
+       inkscape:connector-curvature="0"
+       style="fill:#464646;fill-opacity:1" />
+    <path
+       id="marker"
+       d="m 270,19 c -4.971,0 -9,4.029 -9,9 0,4.971 5.001,12 9,14 4.001,-2 9,-9.029 9,-14 0,-4.971 -4.029,-9 -9,-9 z m 0,12.5 c -2.484,0 -4.5,-2.014 -4.5,-4.5 0,-2.484 2.016,-4.5 4.5,-4.5 2.485,0 4.5,2.016 4.5,4.5 0,2.486 -2.015,4.5 -4.5,4.5 z"
+       inkscape:connector-curvature="0"
+       style="fill:#464646;fill-opacity:1" />
+    <g
+       id="edit"
+       style="fill:#464646;fill-opacity:1">
+      <path
+         d="m 337,30.156 0,0.407 0,5.604 c 0,1.658 -1.344,3 -3,3 l -10,0 c -1.655,0 -3,-1.342 -3,-3 l 0,-10 c 0,-1.657 1.345,-3 3,-3 l 6.345,0 3.19,-3.17 -9.535,0 c -3.313,0 -6,2.687 -6,6 l 0,10 c 0,3.313 2.687,6 6,6 l 10,0 c 3.314,0 6,-2.687 6,-6 l 0,-8.809 -3,2.968"
+         id="path4240"
+         inkscape:connector-curvature="0"
+         style="fill:#464646;fill-opacity:1" />
+      <path
+         d="m 338.72,24.637 -8.892,8.892 -2.828,0 0,-2.829 8.89,-8.89 z"
+         id="path4242"
+         inkscape:connector-curvature="0"
+         style="fill:#464646;fill-opacity:1" />
+      <path
+         d="m 338.697,17.826 4,0 0,4 -4,0 z"
+         transform="matrix(-0.70698336,-0.70723018,0.70723018,-0.70698336,567.55917,274.78273)"
+         id="path4244"
+         inkscape:connector-curvature="0"
+         style="fill:#464646;fill-opacity:1" />
+    </g>
+    <g
+       id="remove"
+       style="fill:#464646;fill-opacity:1">
+      <path
+         d="m 381,42 18,0 0,-18 -18,0 0,18 z m 14,-16 2,0 0,14 -2,0 0,-14 z m -4,0 2,0 0,14 -2,0 0,-14 z m -4,0 2,0 0,14 -2,0 0,-14 z m -4,0 2,0 0,14 -2,0 0,-14 z"
+         id="path4247"
+         inkscape:connector-curvature="0"
+         style="fill:#464646;fill-opacity:1" />
+      <path
+         d="m 395,20 0,-4 -10,0 0,4 -6,0 0,2 22,0 0,-2 -6,0 z m -2,0 -6,0 0,-2 6,0 0,2 z"
+         id="path4249"
+         inkscape:connector-curvature="0"
+         style="fill:#464646;fill-opacity:1" />
+    </g>
+  </g>
+  <g
+     id="disabled"
+     transform="translate(120,0)"
+     style="fill:#bbbbbb">
+    <use
+       xlink:href="#edit"
+       id="edit-disabled"
+       x="0"
+       y="0"
+       width="100%"
+       height="100%" />
+    <use
+       xlink:href="#remove"
+       id="remove-disabled"
+       x="0"
+       y="0"
+       width="100%"
+       height="100%" />
+  </g>
+  <path
+     style="fill:none;stroke:#464646;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="circle-3"
+     d="m 581.65725,30 c 0,6.078 -4.926,11 -11,11 -6.074,0 -11,-4.922 -11,-11 0,-6.074 4.926,-11 11,-11 6.074,0 11,4.926 11,11 z"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/erpnext/public/js/agriculture/ternary_plot.js b/erpnext/public/js/agriculture/ternary_plot.js
new file mode 100644
index 0000000..6f06585
--- /dev/null
+++ b/erpnext/public/js/agriculture/ternary_plot.js
@@ -0,0 +1,232 @@
+frappe.provide('agriculture');
+
+agriculture.TernaryPlot = class TernaryPlot {
+	constructor(opts) {
+		Object.assign(this, opts);
+
+		frappe.require('assets/frappe/js/lib/snap.svg-min.js', () => {
+			this.make_svg();
+			this.init_snap();
+			this.init_config();
+			this.make_plot();
+			this.make_plot_marking();
+			this.make_legend();
+			this.mark_blip();
+		});
+	}
+
+	make_svg() {
+		this.$svg = $('<svg height="350" width="400">');
+		$(this.parent).append(this.$svg);
+	}
+
+	init_snap() {
+		this.paper = new Snap(this.$svg.get(0));
+	}
+
+	init_config() {
+		this.config = {
+			triangle_side: 300,
+			spacing: 50,
+			strokeWidth: 1,
+			stroke: frappe.ui.color.get('black')
+		};
+		this.config.scaling_factor = this.config.triangle_side / 100;
+		let { triangle_side: t, spacing: s, scaling_factor: p } = this.config;
+
+		this.coords = {
+			sand: {
+				points: [
+					s + t * Snap.cos(60), s,
+					s, s + t * Snap.cos(30),
+					s + t, s + t * Snap.cos(30)
+				],
+				color: frappe.ui.color.get('peach')
+			},
+			loamy_sand: {
+				points: [
+					s + 15 * p * Snap.cos(60), s + (100 - 15) * p * Snap.cos(30),
+					s + 10 * p * Snap.cos(60), s + (100 - 10) * p * Snap.cos(30),
+					s + (100 - 85) * p, s + t * Snap.cos(30),
+					s + (100 - 70) * p, s + t * Snap.cos(30)
+				],
+				color: frappe.ui.color.get('pink')
+			},
+			sandy_loam: {
+				points: [
+					s + 20 * p * Snap.cos(60) + 27.5 * p, s + (100 - 20) * p * Snap.cos(30),
+					s + 20 * p * Snap.cos(60), s + (100 - 20) * p * Snap.cos(30),
+					s + 15 * p * Snap.cos(60), s + (100 - 15) * p * Snap.cos(30),
+					s + (100 - 75) * p, s + t * Snap.cos(30),
+					s + (100 - 50) * p, s + t * Snap.cos(30),
+					s + (100 - 50) * p + 7.5 * p * Snap.cos(60), s + t * Snap.cos(30) - 7.5 * p * Snap.cos(30),
+					s + (100 - 50) * p + 7.5 * p * Snap.cos(60) - 10 * p, s + t * Snap.cos(30) - 7.5 * p * Snap.cos(30)
+				],
+				color: frappe.ui.color.get('pink', 'light')
+			},
+			loam: {
+				points: [
+					s + (100 - 50) * p + 27.5 * p * Snap.cos(60), s + t * Snap.cos(30) - 27.5 * p * Snap.cos(30),
+					s + (100 - 50) * p + 27.5 * p * Snap.cos(60) - 22.5 * p, s + t * Snap.cos(30) - 27.5 * p * Snap.cos(30),
+					s + 20 * p * Snap.cos(60) + 27.5 * p, s + (100 - 20) * p * Snap.cos(30),
+					s + (100 - 50) * p + 7.5 * p * Snap.cos(60) - 10 * p, s + t * Snap.cos(30) - 7.5 * p * Snap.cos(30),
+					s + (100 - 50) * p + 7.5 * p * Snap.cos(60), s + t * Snap.cos(30) - 7.5 * p * Snap.cos(30)
+				],
+				color: frappe.ui.color.get('brown')
+			},
+			silt_loam: {
+				points: [
+					s + t - 27.5 * p * Snap.cos(60), s + 72.5 * p * Snap.cos(30),
+					s + (100 - 50) * p + 27.5 * p * Snap.cos(60), s + t * Snap.cos(30) - 27.5 * p * Snap.cos(30),
+					s + (100 - 50) * p, s + t * Snap.cos(30),
+					s + (100 - 20) * p, s + t * Snap.cos(30),
+					s + (100 - 20) * p + 12.5 * p * Snap.cos(60), s + 90 * p * Snap.cos(30),
+					s + t - 12.5 * p * Snap.cos(60), s + (100 - 12.5) * p * Snap.cos(30)
+				],
+				color: frappe.ui.color.get('green', 'dark')
+			},
+			silt: {
+				points: [
+					s + t - 12.5 * p * Snap.cos(60), s + (100 - 12.5) * p * Snap.cos(30),
+					s + (100 - 20) * p + 12.5 * p * Snap.cos(60), s + 90 * p * Snap.cos(30),
+					s + (100 - 20) * p, s + t * Snap.cos(30),
+					s + t, s + t * Snap.cos(30)
+				],
+				color: frappe.ui.color.get('green')
+			},
+			silty_clay_loam: {
+				points: [
+					s + t - 40 * p * Snap.cos(60), s + 60 * p * Snap.cos(30),
+					s + t - 40 * p * Snap.cos(60) - 20 * p, s + 60 * p * Snap.cos(30),
+					s + t - 27.5 * p * Snap.cos(60) - 20 * p, s + 72.5 * p * Snap.cos(30),
+					s + t - 27.5 * p * Snap.cos(60), s + 72.5 * p * Snap.cos(30)
+				],
+				color: frappe.ui.color.get('cyan', 'dark')
+			},
+			silty_clay: {
+				points: [
+					s + t - 60 * p * Snap.cos(60), s + 40 * p * Snap.cos(30),
+					s + t - 40 * p * Snap.cos(60) - 20 * p, s + 60 * p * Snap.cos(30),
+					s + t - 40 * p * Snap.cos(60), s + 60 * p * Snap.cos(30)
+				],
+				color: frappe.ui.color.get('cyan')
+			},
+			clay_loam: {
+				points: [
+					s + t - 40 * p * Snap.cos(60) - 20 * p, s + 60 * p * Snap.cos(30),
+					s + t - 40 * p * Snap.cos(60) - 45 * p, s + 60 * p * Snap.cos(30),
+					s + t - 27.5 * p * Snap.cos(60) - 45 * p, s + 72.5 * p * Snap.cos(30),
+					s + t - 27.5 * p * Snap.cos(60) - 20 * p, s + 72.5 * p * Snap.cos(30)
+				],
+				color: frappe.ui.color.get('green', 'light')
+			},
+			sandy_clay_loam: {
+				points: [
+					s + 35 * p * Snap.cos(60) + 20 * p, s + (100 - 35) * p * Snap.cos(30),
+					s + 35 * p * Snap.cos(60), s + (100 - 35) * p * Snap.cos(30),
+					s + 20 * p * Snap.cos(60), s + (100 - 20) * p * Snap.cos(30),
+					s + 20 * p * Snap.cos(60) + 27.5 * p, s + (100 - 20) * p * Snap.cos(30),
+					s + t - 27.5 * p * Snap.cos(60) - 45 * p, s + 72.5 * p * Snap.cos(30)
+				],
+				color: frappe.ui.color.get('pink', 'dark')
+			},
+			sandy_clay: {
+				points: [
+					s + 55 * p * Snap.cos(60), s + (100 - 55) * p * Snap.cos(30),
+					s + 35 * p * Snap.cos(60), s + (100 - 35) * p * Snap.cos(30),
+					s + 35 * p * Snap.cos(60) + 20 * p, s + (100 - 35) * p * Snap.cos(30)
+				],
+				color: frappe.ui.color.get('red')
+			},
+			clay: {
+				points: [
+					s + t * Snap.cos(60), s,
+					s + 55 * p * Snap.cos(60), s + (100 - 55) * p * Snap.cos(30),
+					s + t - 40 * p * Snap.cos(60) - 45 * p, s + 60 * p * Snap.cos(30),
+					s + t - 40 * p * Snap.cos(60) - 20 * p, s + 60 * p * Snap.cos(30),
+					s + t - 60 * p * Snap.cos(60), s + 40 * p * Snap.cos(30)
+				],
+				color: frappe.ui.color.get('yellow')
+			},
+		};
+	}
+
+	get_coords(soil_type) {
+		return this.coords[soil_type].points;
+	}
+
+	get_color(soil_type) {
+		return this.coords[soil_type].color;
+	}
+
+	make_plot() {
+		for (let soil_type in this.coords) {
+			this.paper.polygon(this.get_coords(soil_type)).attr({
+				fill: this.get_color(soil_type),
+				stroke: this.config.stroke,
+				strokeWidth: this.config.strokeWidth
+			});
+		}
+	}
+
+	make_plot_marking() {
+		let { triangle_side: t, spacing: s, scaling_factor: p } = this.config;
+
+		let clay = this.paper.text(t * Snap.cos(60) / 2, s + t * Snap.cos(30) / 2, "Clay").attr({
+			fill: frappe.ui.color.get('black')
+		});
+		clay.transform("r300");
+
+		let silt = this.paper.text(t, s + t * Snap.cos(30) / 2, "Silt").attr({
+			fill: frappe.ui.color.get('black')
+		});
+		silt.transform("r60");
+
+		let sand = this.paper.text(35 + t * Snap.cos(60), 90 + t * Snap.cos(30), "Sand").attr({
+			fill: frappe.ui.color.get('black')
+		});
+		sand.transform("r0");
+	}
+
+	make_legend() {
+		// let side = len(this.coords)/2;
+		let index = 1;
+		let offset = 0;
+		let exec_once = true;
+		for (let soil_type in this.coords) {
+			if (index > 6 && exec_once){
+				offset = 300;
+				index = 1;
+				exec_once = false;
+			}
+			let rect = this.paper.rect(0+offset, 0+index*20, 100, 19, 5, 5).attr({
+				fill: this.get_color(soil_type),
+				stroke: frappe.ui.color.get('black')
+			});
+			let text = this.paper.text(5+offset, 16+index*20, soil_type).attr({
+				fill: frappe.ui.color.get('black'),
+				'font-size': 12
+			});
+			index++;
+		}
+	}
+
+	mark_blip({clay, sand, silt} = this) {
+		if (clay + sand + silt != 0){
+			let { triangle_side: t, spacing: s, scaling_factor: p } = this.config;
+
+			let x_blip = s + clay * p * Snap.cos(60) + silt * p;
+			let y_blip = s + silt * p * Snap.cos(30) + sand * p * Snap.sin(60);
+			this.blip = this.paper.circle(x_blip, y_blip, 4).attr({
+				fill: frappe.ui.color.get("orange"),
+				stroke: frappe.ui.color.get("orange"),
+				strokeWidth: 2
+			});
+		}
+	}
+
+	remove_blip() {
+		if (typeof this.blip !== 'undefined')
+			this.blip.remove();
+	}
+};
\ No newline at end of file
diff --git a/erpnext/public/js/controllers/accounts.js b/erpnext/public/js/controllers/accounts.js
index abd5566..860c8c1 100644
--- a/erpnext/public/js/controllers/accounts.js
+++ b/erpnext/public/js/controllers/accounts.js
@@ -20,7 +20,7 @@
 				if(frm.cscript.tax_table == "Sales Taxes and Charges") {
 					var account_type = ["Tax", "Chargeable", "Expense Account"];
 				} else {
-					var account_type = ["Tax", "Chargeable", "Income Account"];
+					var account_type = ["Tax", "Chargeable", "Income Account", "Expenses Included In Valuation"];
 				}
 
 				return {
@@ -62,15 +62,32 @@
 			frappe.model.set_value(cdt, cdn, 'account', account)
 		})
 	}
-})
+});
+
+frappe.ui.form.on("Sales Invoice", {
+	payment_terms_template: function() {
+		cur_frm.trigger("disable_due_date");
+	}
+});
 
 frappe.ui.form.on('Purchase Invoice', {
 	mode_of_payment: function(frm) {
 		get_payment_mode_account(frm, frm.doc.mode_of_payment, function(account){
 			frm.set_value('cash_bank_account', account);
 		})
+	},
+
+	payment_terms_template: function() {
+		cur_frm.trigger("disable_due_date");
 	}
-})
+});
+
+frappe.ui.form.on("Payment Schedule", {
+	payment_schedule_remove: function() {
+		cur_frm.trigger("disable_due_date");
+	},
+
+});
 
 frappe.ui.form.on('Payment Entry', {
 	mode_of_payment: function(frm) {
diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js
index 010d4d9..a9e3ad4 100644
--- a/erpnext/public/js/controllers/buying.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -18,6 +18,14 @@
 		this.setup_queries();
 		this._super();
 
+		this.frm.set_query('shipping_rule', function() {
+			return {
+				filters: {
+					"shipping_rule_type": "Buying"
+				}
+			};
+		});
+
 		/* eslint-disable */
 		// no idea where me is coming from
 		if(this.frm.get_field('shipping_address')) {
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index 960807a..580e5fa 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -4,11 +4,13 @@
 erpnext.taxes_and_totals = erpnext.payments.extend({
 	setup: function() {},
 	apply_pricing_rule_on_item: function(item){
+
 		if(item.margin_type == "Percentage"){
 			item.rate_with_margin = flt(item.price_list_rate)
 				+ flt(item.price_list_rate) * ( flt(item.margin_rate_or_amount) / 100);
 		} else {
 			item.rate_with_margin = flt(item.price_list_rate) + flt(item.margin_rate_or_amount);
+			item.base_rate_with_margin = flt(item.rate_with_margin) * flt(this.frm.doc.conversion_rate);
 		}
 
 		item.rate = flt(item.rate_with_margin , precision("rate", item));
@@ -90,6 +92,7 @@
 				item.amount = flt(item.rate * item.qty, precision("amount", item));
 				item.net_amount = item.amount;
 				item.item_tax_amount = 0.0;
+				item.total_weight = flt(item.weight_per_unit * item.qty);
 
 				me.set_in_company_currency(item, ["price_list_rate", "rate", "amount", "net_rate", "net_amount"]);
 			});
@@ -197,15 +200,17 @@
 
 	calculate_net_total: function() {
 		var me = this;
-		this.frm.doc.total = this.frm.doc.base_total = this.frm.doc.net_total = this.frm.doc.base_net_total = 0.0;
+		this.frm.doc.total = this.frm.doc.base_total = this.frm.doc.net_total = this.frm.doc.base_net_total = this.frm.doc.total_net_weight= 0.0;
 
 		$.each(this.frm.doc["items"] || [], function(i, item) {
 			me.frm.doc.total += item.amount;
 			me.frm.doc.base_total += item.base_amount;
 			me.frm.doc.net_total += item.net_amount;
 			me.frm.doc.base_net_total += item.base_net_amount;
+			me.frm.doc.total_net_weight += item.total_weight;
 		});
 
+
 		frappe.model.round_floats_in(this.frm.doc, ["total", "base_total", "net_total", "base_net_total"]);
 	},
 
@@ -420,20 +425,29 @@
 		frappe.model.round_floats_in(this.frm.doc, ["grand_total", "base_grand_total"]);
 
 		// rounded totals
-		this.set_rounded_total()
+		this.set_rounded_total();
 	},
 
 	set_rounded_total: function() {
+		var disable_rounded_total = 0;
+		if(frappe.meta.get_docfield(this.frm.doc.doctype, "disable_rounded_total", this.frm.doc.name)) {
+			disable_rounded_total = this.frm.doc.disable_rounded_total;
+		} else if (frappe.sys_defaults.disable_rounded_total) {
+			disable_rounded_total = frappe.sys_defaults.disable_rounded_total;
+		}
+		if(disable_rounded_total) {
+			this.frm.doc.rounded_total = 0;
+			this.frm.doc.base_rounded_total = 0;
+			return;
+		}
+
 		if(frappe.meta.get_docfield(this.frm.doc.doctype, "rounded_total", this.frm.doc.name)) {
 			this.frm.doc.rounded_total = round_based_on_smallest_currency_fraction(this.frm.doc.grand_total,
 				this.frm.doc.currency, precision("rounded_total"));
-		}
-		if(frappe.meta.get_docfield(this.frm.doc.doctype, "base_rounded_total", this.frm.doc.name)) {
-			var company_currency = this.get_company_currency();
+			this.frm.doc.rounding_adjustment += flt(this.frm.doc.rounded_total - this.frm.doc.grand_total,
+				precision("rounding_adjustment"));
 
-			this.frm.doc.base_rounded_total =
-				round_based_on_smallest_currency_fraction(this.frm.doc.base_grand_total,
-					company_currency, precision("base_rounded_total"));
+			this.set_in_company_currency(this.frm.doc, ["rounding_adjustment", "rounded_total"]);
 		}
 	},
 
@@ -560,20 +574,22 @@
 		if(this.frm.doc.is_return || this.frm.doc.docstatus > 0) return;
 
 		frappe.model.round_floats_in(this.frm.doc, ["grand_total", "total_advance", "write_off_amount"]);
-		if(this.frm.doc.party_account_currency == this.frm.doc.currency) {
-			var total_amount_to_pay = flt((this.frm.doc.grand_total - this.frm.doc.total_advance
-				- this.frm.doc.write_off_amount), precision("grand_total"));
-		} else {
-			var total_amount_to_pay = flt(
-				(flt(this.frm.doc.grand_total*this.frm.doc.conversion_rate, precision("grand_total"))
-					- this.frm.doc.total_advance - this.frm.doc.base_write_off_amount),
-				precision("base_grand_total")
-			);
-		}
 
-		if(this.frm.doc.doctype == "Sales Invoice" || this.frm.doc.doctype == "Purchase Invoice") {
+		if(in_list(["Sales Invoice", "Purchase Invoice"], this.frm.doc.doctype)) {
+			var grand_total = this.frm.doc.rounded_total || this.frm.doc.grand_total;
+
+			if(this.frm.doc.party_account_currency == this.frm.doc.currency) {
+				var total_amount_to_pay = flt((grand_total - this.frm.doc.total_advance
+					- this.frm.doc.write_off_amount), precision("grand_total"));
+			} else {
+				var total_amount_to_pay = flt(
+					(flt(grand_total*this.frm.doc.conversion_rate, precision("grand_total"))
+						- this.frm.doc.total_advance - this.frm.doc.base_write_off_amount),
+					precision("base_grand_total")
+				);
+			}
+
 			frappe.model.round_floats_in(this.frm.doc, ["paid_amount"]);
-
 			this.set_in_company_currency(this.frm.doc, ["paid_amount"]);
 
 			if(this.frm.refresh_field){
@@ -581,11 +597,10 @@
 				this.frm.refresh_field("base_paid_amount");
 			}
 
-			if(this.frm.doc.doctype == "Sales Invoice"){
+			if(this.frm.doc.doctype == "Sales Invoice") {
 				this.set_default_payment(total_amount_to_pay, update_paid_amount);
 				this.calculate_paid_amount();
 			}
-
 			this.calculate_change_amount();
 
 			var paid_amount = (this.frm.doc.party_account_currency == this.frm.doc.currency) ?
@@ -593,9 +608,6 @@
 
 			this.frm.doc.outstanding_amount =  flt(total_amount_to_pay - flt(paid_amount) +
 				flt(this.frm.doc.change_amount * this.frm.doc.conversion_rate), precision("outstanding_amount"));
-
-		} else if(this.frm.doc.doctype == "Purchase Invoice") {
-			this.frm.doc.outstanding_amount = flt(total_amount_to_pay, precision("outstanding_amount"));
 		}
 	},
 
@@ -636,7 +648,9 @@
 	calculate_change_amount: function(){
 		this.frm.doc.change_amount = 0.0;
 		this.frm.doc.base_change_amount = 0.0;
-		if(this.frm.doc.paid_amount > this.frm.doc.grand_total && !this.frm.doc.is_return) {
+		if(this.frm.doc.doctype == "Sales Invoice"
+			&& this.frm.doc.paid_amount > this.frm.doc.grand_total && !this.frm.doc.is_return) {
+
 			var payment_types = $.map(this.frm.doc.payments, function(d) { return d.type; });
 			if (in_list(payment_types, 'Cash')) {
 				this.frm.doc.change_amount = flt(this.frm.doc.paid_amount - this.frm.doc.grand_total +
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index cb1cf3a..66c0c44 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -36,7 +36,10 @@
 
 			cur_frm.cscript.set_gross_profit(item);
 			cur_frm.cscript.calculate_taxes_and_totals();
-		})
+
+		});
+
+
 
 		frappe.ui.form.on(this.frm.cscript.tax_table, "rate", function(frm, cdt, cdn) {
 			cur_frm.cscript.calculate_taxes_and_totals();
@@ -98,10 +101,14 @@
 		var me = this;
 		if(this.frm.fields_dict["items"].grid.get_field('batch_no')) {
 			this.frm.set_query("batch_no", "items", function(doc, cdt, cdn) {
-				return me.set_query_for_batch(doc, cdt, cdn)
+				return me.set_query_for_batch(doc, cdt, cdn);
 			});
 		}
 
+		if(this.frm.fields_dict["payment_terms_template"]){
+			this.frm.trigger("payment_terms_template");
+		}
+
 		if(this.frm.fields_dict["taxes"]) {
 			this["taxes_remove"] = this.calculate_taxes_and_totals;
 		}
@@ -116,7 +123,7 @@
 					filters: [
 						['Print Format', 'doc_type', '=', cur_frm.doctype],
 					]
-				}
+				};
 			});
 		}
 
@@ -216,6 +223,7 @@
 		erpnext.hide_company();
 		this.set_dynamic_labels();
 		this.setup_sms();
+
 	},
 
 	apply_default_taxes: function() {
@@ -227,7 +235,8 @@
 			return frappe.call({
 				method: "erpnext.controllers.accounts_controller.get_default_taxes_and_charges",
 				args: {
-					"master_doctype": taxes_and_charges_field.options
+					"master_doctype": taxes_and_charges_field.options,
+					"company": me.frm.doc.company
 				},
 				callback: function(r) {
 					if(!r.exc) {
@@ -318,7 +327,10 @@
 							project: item.project || me.frm.doc.project,
 							qty: item.qty || 1,
 							stock_qty: item.stock_qty,
-							conversion_factor: item.conversion_factor
+							conversion_factor: item.conversion_factor,
+							weight_per_unit: item.weight_per_unit,
+							weight_uom: item.weight_uom,
+							pos_profile: me.frm.doc.doctype == 'Sales Invoice' ? me.frm.doc.pos_profile : ''
 						}
 					},
 
@@ -409,8 +421,11 @@
 					me.frm.set_value("tc_name", company_doc.default_terms);
 				}
 
-				me.frm.script_manager.trigger("currency");
-				me.apply_pricing_rule();
+				frappe.run_serially([
+					() => me.frm.script_manager.trigger("currency"),
+					() => me.apply_default_taxes(),
+					() => me.apply_pricing_rule()
+				]);
 			}
 		}
 
@@ -553,6 +568,21 @@
 		this.frm.set_df_property("conversion_rate", "read_only", erpnext.stale_rate_allowed() ? 0 : 1);
 	},
 
+	shipping_rule: function() {
+		var me = this;
+		if(this.frm.doc.shipping_rule) {
+			return this.frm.call({
+				doc: this.frm.doc,
+				method: "apply_shipping_rule",
+				callback: function(r) {
+					if(!r.exc) {
+						me.calculate_taxes_and_totals();
+					}
+				}
+			}).fail(() => this.frm.set_value('shipping_rule', ''));
+		}
+	},
+
 	set_actual_charges_based_on_currency: function() {
 		var me = this;
 		$.each(this.frm.doc.taxes || [], function(i, d) {
@@ -635,7 +665,10 @@
 			item.stock_qty = flt(item.qty * item.conversion_factor, precision("stock_qty", item));
 			refresh_field("stock_qty", item.name, item.parentfield);
 			this.toggle_conversion_factor(item);
-			if(!dont_fetch_price_list_rate) this.apply_price_list(item, true);
+			if (!dont_fetch_price_list_rate &&
+				frappe.meta.has_field(doc.doctype, "price_list_currency")) {
+				this.apply_price_list(item, true);
+			}
 		}
 	},
 
@@ -650,6 +683,15 @@
 	qty: function(doc, cdt, cdn) {
 		this.conversion_factor(doc, cdt, cdn, true);
 		this.apply_pricing_rule(frappe.get_doc(cdt, cdn), true);
+		this.calculate_total_weight(doc, cdt, cdn, true);
+	},
+
+	calculate_total_weight: function(doc, cdt, cdn){
+		if(frappe.meta.get_docfield(cdt, "weight_per_unit", cdn)) {
+			var item = frappe.get_doc(cdt, cdn);
+			item.total_weight = flt(item.qty * item.weight_per_unit);
+			refresh_field("total_weight", item.name, item.parentfield);
+		}
 	},
 
 	set_dynamic_labels: function() {
@@ -701,12 +743,12 @@
 			"base_grand_total", "base_rounded_total", "base_in_words", "base_discount_amount",
 			"base_paid_amount", "base_write_off_amount", "base_operating_cost", "base_raw_material_cost",
 			"base_total_cost", "base_scrap_material_cost", "base_rounding_adjustment"],
-			this.frm.doc.currency != company_currency);
+		this.frm.doc.currency != company_currency);
 
 		this.frm.toggle_display(["plc_conversion_rate", "price_list_currency"],
 			this.frm.doc.price_list_currency != company_currency);
 
-		var show =cint(cur_frm.doc.discount_amount) ||
+		var show = cint(cur_frm.doc.discount_amount) ||
 				((cur_frm.doc.taxes || []).filter(function(d) {return d.included_in_print_rate===1}).length);
 
 		if(frappe.meta.get_docfield(cur_frm.doctype, "net_total"))
@@ -816,7 +858,7 @@
 					if (!r.exc && r.message) {
 						me._set_values_for_item_list(r.message);
 						me.calculate_taxes_and_totals();
-						if(me.frm.doc.apply_discount_on) me.frm.trigger("apply_discount_on")
+						if(me.frm.doc.apply_discount_on) me.frm.trigger("apply_discount_on");
 					}
 				}
 			});
@@ -869,7 +911,8 @@
 			"name": me.frm.doc.name,
 			"is_return": cint(me.frm.doc.is_return),
 			"update_stock": in_list(['Sales Invoice', 'Purchase Invoice'], me.frm.doc.doctype) ? cint(me.frm.doc.update_stock) : 0,
-			"conversion_factor": me.frm.doc.conversion_factor
+			"conversion_factor": me.frm.doc.conversion_factor,
+			"pos_profile": me.frm.doc.doctype == 'Sales Invoice' ? me.frm.doc.pos_profile : ''
 		};
 	},
 
@@ -895,8 +938,8 @@
 
 				// if doctype is Quotation Item / Sales Order Iten then add Margin Type and rate in item_list
 				if (in_list(["Quotation Item", "Sales Order Item", "Delivery Note Item", "Sales Invoice Item"]), d.doctype){
-					item_list[0]["margin_type"] = d.margin_type
-					item_list[0]["margin_rate_or_amount"] = d.margin_rate_or_amount
+					item_list[0]["margin_type"] = d.margin_type;
+					item_list[0]["margin_rate_or_amount"] = d.margin_rate_or_amount;
 				}
 			}
 		};
@@ -1101,12 +1144,12 @@
 	},
 
 	get_method_for_payment: function(){
-		var method = "erpnext.accounts.doctype.payment_entry.payment_entry.get_payment_entry"
+		var method = "erpnext.accounts.doctype.payment_entry.payment_entry.get_payment_entry";
 		if(cur_frm.doc.__onload && cur_frm.doc.__onload.make_payment_via_journal_entry){
 			if(in_list(['Sales Invoice', 'Purchase Invoice'],  cur_frm.doc.doctype)){
-				method = "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_invoice"
+				method = "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_invoice";
 			}else {
-				method= "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_order"
+				method= "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_order";
 			}
 		}
 
@@ -1132,7 +1175,7 @@
 				'item_code': item.item_code,
 				'posting_date': me.frm.doc.posting_date || frappe.datetime.nowdate(),
 			}
-			if (item.warehouse) filters["warehouse"] = item.warehouse
+			if (item.warehouse) filters["warehouse"] = item.warehouse;
 
 			return {
 				query : "erpnext.controllers.queries.get_batch_no",
@@ -1140,6 +1183,46 @@
 			}
 		}
 	},
+
+	payment_terms_template: function() {
+		var me = this;
+		if(this.frm.doc.payment_terms_template) {
+			frappe.call({
+				method: "erpnext.controllers.accounts_controller.get_payment_terms",
+				args: {
+					terms_template: this.frm.doc.payment_terms_template,
+					posting_date: this.frm.doc.posting_date || this.frm.doc.transaction_date,
+					grand_total: this.frm.doc.rounded_total || this.frm.doc.grand_total
+				},
+				callback: function(r) {
+					if(r.message && !r.exc) {
+						me.frm.set_value("payment_schedule", r.message);
+					}
+				}
+			})
+		}
+	},
+
+	payment_term: function(doc, cdt, cdn) {
+		var row = locals[cdt][cdn];
+		if(row.payment_term) {
+			frappe.call({
+				method: "erpnext.controllers.accounts_controller.get_payment_term_details",
+				args: {
+					term: row.payment_term,
+					posting_date: this.frm.doc.posting_date || this.frm.doc.transaction_date,
+					grand_total: this.frm.doc.rounded_total || this.frm.doc.grand_total
+				},
+				callback: function(r) {
+					if(r.message && !r.exc) {
+						for (var d in r.message) {
+							frappe.model.set_value(cdt, cdn, d, r.message[d]);
+						}
+					}
+				}
+			})
+		}
+	}
 });
 
 erpnext.show_serial_batch_selector = function(frm, d, callback, show_dialog) {
diff --git a/erpnext/public/js/schools/assessment_result_tool.html b/erpnext/public/js/education/assessment_result_tool.html
similarity index 100%
rename from erpnext/public/js/schools/assessment_result_tool.html
rename to erpnext/public/js/education/assessment_result_tool.html
diff --git a/erpnext/public/js/schools/student_button.html b/erpnext/public/js/education/student_button.html
similarity index 100%
rename from erpnext/public/js/schools/student_button.html
rename to erpnext/public/js/education/student_button.html
diff --git a/erpnext/public/js/leaflet/leaflet.draw.js b/erpnext/public/js/leaflet/leaflet.draw.js
new file mode 100755
index 0000000..4352f70
--- /dev/null
+++ b/erpnext/public/js/leaflet/leaflet.draw.js
@@ -0,0 +1,143 @@
+/*
+	Leaflet.draw, a plugin that adds drawing and editing tools to Leaflet powered maps.
+	(c) 2012-2013, Jacob Toye, Smartrak
+
+	https://github.com/Leaflet/Leaflet.draw
+	http://leafletjs.com
+	https://github.com/jacobtoye
+*/
+! function(t, e) {
+    L.drawVersion = "0.2.3", L.drawLocal = { draw: { toolbar: { actions: { title: "Cancel drawing", text: "Cancel" }, undo: { title: "Delete last point drawn", text: "Delete last point" }, buttons: { polyline: "Draw a polyline", polygon: "Draw a polygon", rectangle: "Draw a rectangle", circle: "Draw a circle", marker: "Draw a marker" } }, handlers: { circle: { tooltip: { start: "Click and drag to draw circle." } }, marker: { tooltip: { start: "Click map to place marker." } }, polygon: { tooltip: { start: "Click to start drawing shape.", cont: "Click to continue drawing shape.", end: "Click first point to close this shape." } }, polyline: { error: "<strong>Error:</strong> shape edges cannot cross!", tooltip: { start: "Click to start drawing line.", cont: "Click to continue drawing line.", end: "Click last point to finish line." } }, rectangle: { tooltip: { start: "Click and drag to draw rectangle." } }, simpleshape: { tooltip: { end: "Release mouse to finish drawing." } } } }, edit: { toolbar: { actions: { save: { title: "Save changes.", text: "Save" }, cancel: { title: "Cancel editing, discards all changes.", text: "Cancel" } }, buttons: { edit: "Edit layers.", editDisabled: "No layers to edit.", remove: "Delete layers.", removeDisabled: "No layers to delete." } }, handlers: { edit: { tooltip: { text: "Drag handles, or marker to edit feature.", subtext: "Click cancel to undo changes." } }, remove: { tooltip: { text: "Click on a feature to remove" } } } } }, L.Draw = {}, L.Draw.Feature = L.Handler.extend({ includes: L.Mixin.Events, initialize: function(t, e) { this._map = t, this._container = t._container, this._overlayPane = t._panes.overlayPane, this._popupPane = t._panes.popupPane, e && e.shapeOptions && (e.shapeOptions = L.Util.extend({}, this.options.shapeOptions, e.shapeOptions)), L.setOptions(this, e) }, enable: function() { this._enabled || (this.fire("enabled", { handler: this.type }), this._map.fire("draw:drawstart", { layerType: this.type }), L.Handler.prototype.enable.call(this)) }, disable: function() { this._enabled && (L.Handler.prototype.disable.call(this), this._map.fire("draw:drawstop", { layerType: this.type }), this.fire("disabled", { handler: this.type })) }, addHooks: function() { var t = this._map;
+            t && (L.DomUtil.disableTextSelection(), t.getContainer().focus(), this._tooltip = new L.Tooltip(this._map), L.DomEvent.on(this._container, "keyup", this._cancelDrawing, this)) }, removeHooks: function() { this._map && (L.DomUtil.enableTextSelection(), this._tooltip.dispose(), this._tooltip = null, L.DomEvent.off(this._container, "keyup", this._cancelDrawing, this)) }, setOptions: function(t) { L.setOptions(this, t) }, _fireCreatedEvent: function(t) { this._map.fire("draw:created", { layer: t, layerType: this.type }) }, _cancelDrawing: function(t) { 27 === t.keyCode && this.disable() } }), L.Draw.Polyline = L.Draw.Feature.extend({ statics: { TYPE: "polyline" }, Poly: L.Polyline, options: { allowIntersection: !0, repeatMode: !1, drawError: { color: "#b00b00", timeout: 2500 }, icon: new L.DivIcon({ iconSize: new L.Point(8, 8), className: "leaflet-div-icon leaflet-editing-icon" }), guidelineDistance: 20, maxGuideLineLength: 4e3, shapeOptions: { stroke: !0, color: "#f06eaa", weight: 4, opacity: .5, fill: !1, clickable: !0 }, metric: !0, showLength: !0, zIndexOffset: 2e3 }, initialize: function(t, e) { this.options.drawError.message = L.drawLocal.draw.handlers.polyline.error, e && e.drawError && (e.drawError = L.Util.extend({}, this.options.drawError, e.drawError)), this.type = L.Draw.Polyline.TYPE, L.Draw.Feature.prototype.initialize.call(this, t, e) }, addHooks: function() { L.Draw.Feature.prototype.addHooks.call(this), this._map && (this._markers = [], this._markerGroup = new L.LayerGroup, this._map.addLayer(this._markerGroup), this._poly = new L.Polyline([], this.options.shapeOptions), this._tooltip.updateContent(this._getTooltipText()), this._mouseMarker || (this._mouseMarker = L.marker(this._map.getCenter(), { icon: L.divIcon({ className: "leaflet-mouse-marker", iconAnchor: [20, 20], iconSize: [40, 40] }), opacity: 0, zIndexOffset: this.options.zIndexOffset })), this._mouseMarker.on("mousedown", this._onMouseDown, this).addTo(this._map), this._map.on("mousemove", this._onMouseMove, this).on("mouseup", this._onMouseUp, this).on("zoomend", this._onZoomEnd, this)) }, removeHooks: function() { L.Draw.Feature.prototype.removeHooks.call(this), this._clearHideErrorTimeout(), this._cleanUpShape(), this._map.removeLayer(this._markerGroup), delete this._markerGroup, delete this._markers, this._map.removeLayer(this._poly), delete this._poly, this._mouseMarker.off("mousedown", this._onMouseDown, this).off("mouseup", this._onMouseUp, this), this._map.removeLayer(this._mouseMarker), delete this._mouseMarker, this._clearGuides(), this._map.off("mousemove", this._onMouseMove, this).off("zoomend", this._onZoomEnd, this) }, deleteLastVertex: function() { if (!(this._markers.length <= 1)) { var t = this._markers.pop(),
+                    e = this._poly,
+                    i = this._poly.spliceLatLngs(e.getLatLngs().length - 1, 1)[0];
+                this._markerGroup.removeLayer(t), e.getLatLngs().length < 2 && this._map.removeLayer(e), this._vertexChanged(i, !1) } }, addVertex: function(t) { var e = this._markers.length; return e > 0 && !this.options.allowIntersection && this._poly.newLatLngIntersects(t) ? void this._showErrorTooltip() : (this._errorShown && this._hideErrorTooltip(), this._markers.push(this._createMarker(t)), this._poly.addLatLng(t), 2 === this._poly.getLatLngs().length && this._map.addLayer(this._poly), void this._vertexChanged(t, !0)) }, _finishShape: function() { var t = this._poly.newLatLngIntersects(this._poly.getLatLngs()[0], !0); return !this.options.allowIntersection && t || !this._shapeIsValid() ? void this._showErrorTooltip() : (this._fireCreatedEvent(), this.disable(), void(this.options.repeatMode && this.enable())) }, _shapeIsValid: function() { return !0 }, _onZoomEnd: function() { this._updateGuide() }, _onMouseMove: function(t) { var e = t.layerPoint,
+                i = t.latlng;
+            this._currentLatLng = i, this._updateTooltip(i), this._updateGuide(e), this._mouseMarker.setLatLng(i), L.DomEvent.preventDefault(t.originalEvent) }, _vertexChanged: function(t, e) { this._updateFinishHandler(), this._updateRunningMeasure(t, e), this._clearGuides(), this._updateTooltip() }, _onMouseDown: function(t) { var e = t.originalEvent;
+            this._mouseDownOrigin = L.point(e.clientX, e.clientY) }, _onMouseUp: function(e) { if (this._mouseDownOrigin) { var i = L.point(e.originalEvent.clientX, e.originalEvent.clientY).distanceTo(this._mouseDownOrigin);
+                Math.abs(i) < 9 * (t.devicePixelRatio || 1) && this.addVertex(e.latlng) }
+            this._mouseDownOrigin = null }, _updateFinishHandler: function() { var t = this._markers.length;
+            t > 1 && this._markers[t - 1].on("click", this._finishShape, this), t > 2 && this._markers[t - 2].off("click", this._finishShape, this) }, _createMarker: function(t) { var e = new L.Marker(t, { icon: this.options.icon, zIndexOffset: 2 * this.options.zIndexOffset }); return this._markerGroup.addLayer(e), e }, _updateGuide: function(t) { var e = this._markers.length;
+            e > 0 && (t = t || this._map.latLngToLayerPoint(this._currentLatLng), this._clearGuides(), this._drawGuide(this._map.latLngToLayerPoint(this._markers[e - 1].getLatLng()), t)) }, _updateTooltip: function(t) { var e = this._getTooltipText();
+            t && this._tooltip.updatePosition(t), this._errorShown || this._tooltip.updateContent(e) }, _drawGuide: function(t, e) { var i, o, a, s = Math.floor(Math.sqrt(Math.pow(e.x - t.x, 2) + Math.pow(e.y - t.y, 2))),
+                r = this.options.guidelineDistance,
+                n = this.options.maxGuideLineLength,
+                l = s > n ? s - n : r; for (this._guidesContainer || (this._guidesContainer = L.DomUtil.create("div", "leaflet-draw-guides", this._overlayPane)); s > l; l += this.options.guidelineDistance) i = l / s, o = { x: Math.floor(t.x * (1 - i) + i * e.x), y: Math.floor(t.y * (1 - i) + i * e.y) }, a = L.DomUtil.create("div", "leaflet-draw-guide-dash", this._guidesContainer), a.style.backgroundColor = this._errorShown ? this.options.drawError.color : this.options.shapeOptions.color, L.DomUtil.setPosition(a, o) }, _updateGuideColor: function(t) { if (this._guidesContainer)
+                for (var e = 0, i = this._guidesContainer.childNodes.length; i > e; e++) this._guidesContainer.childNodes[e].style.backgroundColor = t }, _clearGuides: function() { if (this._guidesContainer)
+                for (; this._guidesContainer.firstChild;) this._guidesContainer.removeChild(this._guidesContainer.firstChild) }, _getTooltipText: function() { var t, e, i = this.options.showLength; return 0 === this._markers.length ? t = { text: L.drawLocal.draw.handlers.polyline.tooltip.start } : (e = i ? this._getMeasurementString() : "", t = 1 === this._markers.length ? { text: L.drawLocal.draw.handlers.polyline.tooltip.cont, subtext: e } : { text: L.drawLocal.draw.handlers.polyline.tooltip.end, subtext: e }), t }, _updateRunningMeasure: function(t, e) { var i, o, a = this._markers.length;
+            1 === this._markers.length ? this._measurementRunningTotal = 0 : (i = a - (e ? 2 : 1), o = t.distanceTo(this._markers[i].getLatLng()), this._measurementRunningTotal += o * (e ? 1 : -1)) }, _getMeasurementString: function() { var t, e = this._currentLatLng,
+                i = this._markers[this._markers.length - 1].getLatLng(); return t = this._measurementRunningTotal + e.distanceTo(i), L.GeometryUtil.readableDistance(t, this.options.metric) }, _showErrorTooltip: function() { this._errorShown = !0, this._tooltip.showAsError().updateContent({ text: this.options.drawError.message }), this._updateGuideColor(this.options.drawError.color), this._poly.setStyle({ color: this.options.drawError.color }), this._clearHideErrorTimeout(), this._hideErrorTimeout = setTimeout(L.Util.bind(this._hideErrorTooltip, this), this.options.drawError.timeout) }, _hideErrorTooltip: function() { this._errorShown = !1, this._clearHideErrorTimeout(), this._tooltip.removeError().updateContent(this._getTooltipText()), this._updateGuideColor(this.options.shapeOptions.color), this._poly.setStyle({ color: this.options.shapeOptions.color }) }, _clearHideErrorTimeout: function() { this._hideErrorTimeout && (clearTimeout(this._hideErrorTimeout), this._hideErrorTimeout = null) }, _cleanUpShape: function() { this._markers.length > 1 && this._markers[this._markers.length - 1].off("click", this._finishShape, this) }, _fireCreatedEvent: function() { var t = new this.Poly(this._poly.getLatLngs(), this.options.shapeOptions);
+            L.Draw.Feature.prototype._fireCreatedEvent.call(this, t) } }), L.Draw.Polygon = L.Draw.Polyline.extend({ statics: { TYPE: "polygon" }, Poly: L.Polygon, options: { showArea: !1, shapeOptions: { stroke: !0, color: "#f06eaa", weight: 4, opacity: .5, fill: !0, fillColor: null, fillOpacity: .2, clickable: !0 } }, initialize: function(t, e) { L.Draw.Polyline.prototype.initialize.call(this, t, e), this.type = L.Draw.Polygon.TYPE }, _updateFinishHandler: function() { var t = this._markers.length;
+            1 === t && this._markers[0].on("click", this._finishShape, this), t > 2 && (this._markers[t - 1].on("dblclick", this._finishShape, this), t > 3 && this._markers[t - 2].off("dblclick", this._finishShape, this)) }, _getTooltipText: function() { var t, e; return 0 === this._markers.length ? t = L.drawLocal.draw.handlers.polygon.tooltip.start : this._markers.length < 3 ? t = L.drawLocal.draw.handlers.polygon.tooltip.cont : (t = L.drawLocal.draw.handlers.polygon.tooltip.end, e = this._getMeasurementString()), { text: t, subtext: e } }, _getMeasurementString: function() { var t = this._area; return t ? L.GeometryUtil.readableArea(t, this.options.metric) : null }, _shapeIsValid: function() { return this._markers.length >= 3 }, _vertexAdded: function() { if (!this.options.allowIntersection && this.options.showArea) { var t = this._poly.getLatLngs();
+                this._area = L.GeometryUtil.geodesicArea(t) } }, _cleanUpShape: function() { var t = this._markers.length;
+            t > 0 && (this._markers[0].off("click", this._finishShape, this), t > 2 && this._markers[t - 1].off("dblclick", this._finishShape, this)) } }), L.SimpleShape = {}, L.Draw.SimpleShape = L.Draw.Feature.extend({ options: { repeatMode: !1 }, initialize: function(t, e) { this._endLabelText = L.drawLocal.draw.handlers.simpleshape.tooltip.end, L.Draw.Feature.prototype.initialize.call(this, t, e) }, addHooks: function() { L.Draw.Feature.prototype.addHooks.call(this), this._map && (this._mapDraggable = this._map.dragging.enabled(), this._mapDraggable && this._map.dragging.disable(), this._container.style.cursor = "crosshair", this._tooltip.updateContent({ text: this._initialLabelText }), this._map.on("mousedown", this._onMouseDown, this).on("mousemove", this._onMouseMove, this)) }, removeHooks: function() { L.Draw.Feature.prototype.removeHooks.call(this), this._map && (this._mapDraggable && this._map.dragging.enable(), this._container.style.cursor = "", this._map.off("mousedown", this._onMouseDown, this).off("mousemove", this._onMouseMove, this), L.DomEvent.off(e, "mouseup", this._onMouseUp, this), this._shape && (this._map.removeLayer(this._shape), delete this._shape)), this._isDrawing = !1 }, _onMouseDown: function(t) { this._isDrawing = !0, this._startLatLng = t.latlng, L.DomEvent.on(e, "mouseup", this._onMouseUp, this).preventDefault(t.originalEvent) }, _onMouseMove: function(t) { var e = t.latlng;
+            this._tooltip.updatePosition(e), this._isDrawing && (this._tooltip.updateContent({ text: this._endLabelText }), this._drawShape(e)) }, _onMouseUp: function() { this._shape && this._fireCreatedEvent(), this.disable(), this.options.repeatMode && this.enable() } }), L.Draw.Rectangle = L.Draw.SimpleShape.extend({ statics: { TYPE: "rectangle" }, options: { shapeOptions: { stroke: !0, color: "#f06eaa", weight: 4, opacity: .5, fill: !0, fillColor: null, fillOpacity: .2, clickable: !0 } }, initialize: function(t, e) { this.type = L.Draw.Rectangle.TYPE, this._initialLabelText = L.drawLocal.draw.handlers.rectangle.tooltip.start, L.Draw.SimpleShape.prototype.initialize.call(this, t, e) }, _drawShape: function(t) { this._shape ? this._shape.setBounds(new L.LatLngBounds(this._startLatLng, t)) : (this._shape = new L.Rectangle(new L.LatLngBounds(this._startLatLng, t), this.options.shapeOptions), this._map.addLayer(this._shape)) }, _fireCreatedEvent: function() { var t = new L.Rectangle(this._shape.getBounds(), this.options.shapeOptions);
+            L.Draw.SimpleShape.prototype._fireCreatedEvent.call(this, t) } }), L.Draw.Circle = L.Draw.SimpleShape.extend({ statics: { TYPE: "circle" }, options: { shapeOptions: { stroke: !0, color: "#f06eaa", weight: 4, opacity: .5, fill: !0, fillColor: null, fillOpacity: .2, clickable: !0 }, showRadius: !0, metric: !0 }, initialize: function(t, e) { this.type = L.Draw.Circle.TYPE, this._initialLabelText = L.drawLocal.draw.handlers.circle.tooltip.start, L.Draw.SimpleShape.prototype.initialize.call(this, t, e) }, _drawShape: function(t) { this._shape ? this._shape.setRadius(this._startLatLng.distanceTo(t)) : (this._shape = new L.Circle(this._startLatLng, this._startLatLng.distanceTo(t), this.options.shapeOptions), this._map.addLayer(this._shape)) }, _fireCreatedEvent: function() { var t = new L.Circle(this._startLatLng, this._shape.getRadius(), this.options.shapeOptions);
+            L.Draw.SimpleShape.prototype._fireCreatedEvent.call(this, t) }, _onMouseMove: function(t) { var e, i = t.latlng,
+                o = this.options.showRadius,
+                a = this.options.metric;
+            this._tooltip.updatePosition(i), this._isDrawing && (this._drawShape(i), e = this._shape.getRadius().toFixed(1), this._tooltip.updateContent({ text: this._endLabelText, subtext: o ? "Radius: " + L.GeometryUtil.readableDistance(e, a) : "" })) } }), L.Draw.Marker = L.Draw.Feature.extend({ statics: { TYPE: "marker" }, options: { icon: new L.Icon.Default, repeatMode: !1, zIndexOffset: 2e3 }, initialize: function(t, e) { this.type = L.Draw.Marker.TYPE, L.Draw.Feature.prototype.initialize.call(this, t, e) }, addHooks: function() { L.Draw.Feature.prototype.addHooks.call(this), this._map && (this._tooltip.updateContent({ text: L.drawLocal.draw.handlers.marker.tooltip.start }), this._mouseMarker || (this._mouseMarker = L.marker(this._map.getCenter(), { icon: L.divIcon({ className: "leaflet-mouse-marker", iconAnchor: [20, 20], iconSize: [40, 40] }), opacity: 0, zIndexOffset: this.options.zIndexOffset })), this._mouseMarker.on("click", this._onClick, this).addTo(this._map), this._map.on("mousemove", this._onMouseMove, this)) }, removeHooks: function() { L.Draw.Feature.prototype.removeHooks.call(this), this._map && (this._marker && (this._marker.off("click", this._onClick, this), this._map.off("click", this._onClick, this).removeLayer(this._marker), delete this._marker), this._mouseMarker.off("click", this._onClick, this), this._map.removeLayer(this._mouseMarker), delete this._mouseMarker, this._map.off("mousemove", this._onMouseMove, this)) }, _onMouseMove: function(t) { var e = t.latlng;
+            this._tooltip.updatePosition(e), this._mouseMarker.setLatLng(e), this._marker ? (e = this._mouseMarker.getLatLng(), this._marker.setLatLng(e)) : (this._marker = new L.Marker(e, { icon: this.options.icon, zIndexOffset: this.options.zIndexOffset }), this._marker.on("click", this._onClick, this), this._map.on("click", this._onClick, this).addLayer(this._marker)) }, _onClick: function() { this._fireCreatedEvent(), this.disable(), this.options.repeatMode && this.enable() }, _fireCreatedEvent: function() { var t = new L.Marker(this._marker.getLatLng(), { icon: this.options.icon });
+            L.Draw.Feature.prototype._fireCreatedEvent.call(this, t) } }), L.Edit = L.Edit || {}, L.Edit.Poly = L.Handler.extend({ options: { icon: new L.DivIcon({ iconSize: new L.Point(8, 8), className: "leaflet-div-icon leaflet-editing-icon" }) }, initialize: function(t, e) { this._poly = t, L.setOptions(this, e) }, addHooks: function() { this._poly._map && (this._markerGroup || this._initMarkers(), this._poly._map.addLayer(this._markerGroup)) }, removeHooks: function() { this._poly._map && (this._poly._map.removeLayer(this._markerGroup), delete this._markerGroup, delete this._markers) }, updateMarkers: function() { this._markerGroup.clearLayers(), this._initMarkers() }, _initMarkers: function() { this._markerGroup || (this._markerGroup = new L.LayerGroup), this._markers = []; var t, e, i, o, a = this._poly._latlngs; for (t = 0, i = a.length; i > t; t++) o = this._createMarker(a[t], t), o.on("click", this._onMarkerClick, this), this._markers.push(o); var s, r; for (t = 0, e = i - 1; i > t; e = t++)(0 !== t || L.Polygon && this._poly instanceof L.Polygon) && (s = this._markers[e], r = this._markers[t], this._createMiddleMarker(s, r), this._updatePrevNext(s, r)) }, _createMarker: function(t, e) { var i = new L.Marker(t, { draggable: !0, icon: this.options.icon }); return i._origLatLng = t, i._index = e, i.on("drag", this._onMarkerDrag, this), i.on("dragend", this._fireEdit, this), this._markerGroup.addLayer(i), i }, _removeMarker: function(t) { var e = t._index;
+            this._markerGroup.removeLayer(t), this._markers.splice(e, 1), this._poly.spliceLatLngs(e, 1), this._updateIndexes(e, -1), t.off("drag", this._onMarkerDrag, this).off("dragend", this._fireEdit, this).off("click", this._onMarkerClick, this) }, _fireEdit: function() { this._poly.edited = !0, this._poly.fire("edit") }, _onMarkerDrag: function(t) { var e = t.target;
+            L.extend(e._origLatLng, e._latlng), e._middleLeft && e._middleLeft.setLatLng(this._getMiddleLatLng(e._prev, e)), e._middleRight && e._middleRight.setLatLng(this._getMiddleLatLng(e, e._next)), this._poly.redraw() }, _onMarkerClick: function(t) { var e = L.Polygon && this._poly instanceof L.Polygon ? 4 : 3,
+                i = t.target;
+            this._poly._latlngs.length < e || (this._removeMarker(i), this._updatePrevNext(i._prev, i._next), i._middleLeft && this._markerGroup.removeLayer(i._middleLeft), i._middleRight && this._markerGroup.removeLayer(i._middleRight), i._prev && i._next ? this._createMiddleMarker(i._prev, i._next) : i._prev ? i._next || (i._prev._middleRight = null) : i._next._middleLeft = null, this._fireEdit()) }, _updateIndexes: function(t, e) { this._markerGroup.eachLayer(function(i) { i._index > t && (i._index += e) }) }, _createMiddleMarker: function(t, e) { var i, o, a, s = this._getMiddleLatLng(t, e),
+                r = this._createMarker(s);
+            r.setOpacity(.6), t._middleRight = e._middleLeft = r, o = function() { var o = e._index;
+                r._index = o, r.off("click", i, this).on("click", this._onMarkerClick, this), s.lat = r.getLatLng().lat, s.lng = r.getLatLng().lng, this._poly.spliceLatLngs(o, 0, s), this._markers.splice(o, 0, r), r.setOpacity(1), this._updateIndexes(o, 1), e._index++, this._updatePrevNext(t, r), this._updatePrevNext(r, e), this._poly.fire("editstart") }, a = function() { r.off("dragstart", o, this), r.off("dragend", a, this), this._createMiddleMarker(t, r), this._createMiddleMarker(r, e) }, i = function() { o.call(this), a.call(this), this._fireEdit() }, r.on("click", i, this).on("dragstart", o, this).on("dragend", a, this), this._markerGroup.addLayer(r) }, _updatePrevNext: function(t, e) { t && (t._next = e), e && (e._prev = t) }, _getMiddleLatLng: function(t, e) { var i = this._poly._map,
+                o = i.project(t.getLatLng()),
+                a = i.project(e.getLatLng()); return i.unproject(o._add(a)._divideBy(2)) } }), L.Polyline.addInitHook(function() { this.editing || (L.Edit.Poly && (this.editing = new L.Edit.Poly(this), this.options.editable && this.editing.enable()), this.on("add", function() { this.editing && this.editing.enabled() && this.editing.addHooks() }), this.on("remove", function() { this.editing && this.editing.enabled() && this.editing.removeHooks() })) }), L.Edit = L.Edit || {}, L.Edit.SimpleShape = L.Handler.extend({ options: { moveIcon: new L.DivIcon({ iconSize: new L.Point(8, 8), className: "leaflet-div-icon leaflet-editing-icon leaflet-edit-move" }), resizeIcon: new L.DivIcon({ iconSize: new L.Point(8, 8), className: "leaflet-div-icon leaflet-editing-icon leaflet-edit-resize" }) }, initialize: function(t, e) { this._shape = t, L.Util.setOptions(this, e) }, addHooks: function() { this._shape._map && (this._map = this._shape._map, this._markerGroup || this._initMarkers(), this._map.addLayer(this._markerGroup)) }, removeHooks: function() { if (this._shape._map) { this._unbindMarker(this._moveMarker); for (var t = 0, e = this._resizeMarkers.length; e > t; t++) this._unbindMarker(this._resizeMarkers[t]);
+                this._resizeMarkers = null, this._map.removeLayer(this._markerGroup), delete this._markerGroup }
+            this._map = null }, updateMarkers: function() { this._markerGroup.clearLayers(), this._initMarkers() }, _initMarkers: function() { this._markerGroup || (this._markerGroup = new L.LayerGroup), this._createMoveMarker(), this._createResizeMarker() }, _createMoveMarker: function() {}, _createResizeMarker: function() {}, _createMarker: function(t, e) { var i = new L.Marker(t, { draggable: !0, icon: e, zIndexOffset: 10 }); return this._bindMarker(i), this._markerGroup.addLayer(i), i }, _bindMarker: function(t) { t.on("dragstart", this._onMarkerDragStart, this).on("drag", this._onMarkerDrag, this).on("dragend", this._onMarkerDragEnd, this) }, _unbindMarker: function(t) { t.off("dragstart", this._onMarkerDragStart, this).off("drag", this._onMarkerDrag, this).off("dragend", this._onMarkerDragEnd, this) }, _onMarkerDragStart: function(t) { var e = t.target;
+            e.setOpacity(0), this._shape.fire("editstart") }, _fireEdit: function() { this._shape.edited = !0, this._shape.fire("edit") }, _onMarkerDrag: function(t) { var e = t.target,
+                i = e.getLatLng();
+            e === this._moveMarker ? this._move(i) : this._resize(i), this._shape.redraw() }, _onMarkerDragEnd: function(t) { var e = t.target;
+            e.setOpacity(1), this._fireEdit() }, _move: function() {}, _resize: function() {} }), L.Edit = L.Edit || {}, L.Edit.Rectangle = L.Edit.SimpleShape.extend({ _createMoveMarker: function() { var t = this._shape.getBounds(),
+                e = t.getCenter();
+            this._moveMarker = this._createMarker(e, this.options.moveIcon) }, _createResizeMarker: function() { var t = this._getCorners();
+            this._resizeMarkers = []; for (var e = 0, i = t.length; i > e; e++) this._resizeMarkers.push(this._createMarker(t[e], this.options.resizeIcon)), this._resizeMarkers[e]._cornerIndex = e }, _onMarkerDragStart: function(t) { L.Edit.SimpleShape.prototype._onMarkerDragStart.call(this, t); var e = this._getCorners(),
+                i = t.target,
+                o = i._cornerIndex;
+            this._oppositeCorner = e[(o + 2) % 4], this._toggleCornerMarkers(0, o) }, _onMarkerDragEnd: function(t) { var e, i, o = t.target;
+            o === this._moveMarker && (e = this._shape.getBounds(), i = e.getCenter(), o.setLatLng(i)), this._toggleCornerMarkers(1), this._repositionCornerMarkers(), L.Edit.SimpleShape.prototype._onMarkerDragEnd.call(this, t) }, _move: function(t) { for (var e, i = this._shape.getLatLngs(), o = this._shape.getBounds(), a = o.getCenter(), s = [], r = 0, n = i.length; n > r; r++) e = [i[r].lat - a.lat, i[r].lng - a.lng], s.push([t.lat + e[0], t.lng + e[1]]);
+            this._shape.setLatLngs(s), this._repositionCornerMarkers() }, _resize: function(t) { var e;
+            this._shape.setBounds(L.latLngBounds(t, this._oppositeCorner)), e = this._shape.getBounds(), this._moveMarker.setLatLng(e.getCenter()) }, _getCorners: function() { var t = this._shape.getBounds(),
+                e = t.getNorthWest(),
+                i = t.getNorthEast(),
+                o = t.getSouthEast(),
+                a = t.getSouthWest(); return [e, i, o, a] }, _toggleCornerMarkers: function(t) { for (var e = 0, i = this._resizeMarkers.length; i > e; e++) this._resizeMarkers[e].setOpacity(t) }, _repositionCornerMarkers: function() { for (var t = this._getCorners(), e = 0, i = this._resizeMarkers.length; i > e; e++) this._resizeMarkers[e].setLatLng(t[e]) } }), L.Rectangle.addInitHook(function() { L.Edit.Rectangle && (this.editing = new L.Edit.Rectangle(this), this.options.editable && this.editing.enable()) }), L.Edit = L.Edit || {}, L.Edit.Circle = L.Edit.SimpleShape.extend({ _createMoveMarker: function() { var t = this._shape.getLatLng();
+            this._moveMarker = this._createMarker(t, this.options.moveIcon) }, _createResizeMarker: function() { var t = this._shape.getLatLng(),
+                e = this._getResizeMarkerPoint(t);
+            this._resizeMarkers = [], this._resizeMarkers.push(this._createMarker(e, this.options.resizeIcon)) }, _getResizeMarkerPoint: function(t) { var e = this._shape._radius * Math.cos(Math.PI / 4),
+                i = this._map.project(t); return this._map.unproject([i.x + e, i.y - e]) }, _move: function(t) { var e = this._getResizeMarkerPoint(t);
+            this._resizeMarkers[0].setLatLng(e), this._shape.setLatLng(t) }, _resize: function(t) { var e = this._moveMarker.getLatLng(),
+                i = e.distanceTo(t);
+            this._shape.setRadius(i) } }), L.Circle.addInitHook(function() { L.Edit.Circle && (this.editing = new L.Edit.Circle(this), this.options.editable && this.editing.enable()), this.on("add", function() { this.editing && this.editing.enabled() && this.editing.addHooks() }), this.on("remove", function() { this.editing && this.editing.enabled() && this.editing.removeHooks() }) }), L.LatLngUtil = { cloneLatLngs: function(t) { for (var e = [], i = 0, o = t.length; o > i; i++) e.push(this.cloneLatLng(t[i])); return e }, cloneLatLng: function(t) { return L.latLng(t.lat, t.lng) } }, L.GeometryUtil = L.extend(L.GeometryUtil || {}, { geodesicArea: function(t) { var e, i, o = t.length,
+                a = 0,
+                s = L.LatLng.DEG_TO_RAD; if (o > 2) { for (var r = 0; o > r; r++) e = t[r], i = t[(r + 1) % o], a += (i.lng - e.lng) * s * (2 + Math.sin(e.lat * s) + Math.sin(i.lat * s));
+                a = 6378137 * a * 6378137 / 2 } return Math.abs(a) }, readableArea: function(t, e) { var i; return e ? i = t >= 1e4 ? (1e-4 * t).toFixed(2) + " ha" : t.toFixed(2) + " m&sup2;" : (t *= .836127, i = t >= 3097600 ? (t / 3097600).toFixed(2) + " mi&sup2;" : t >= 4840 ? (t / 4840).toFixed(2) + " acres" : Math.ceil(t) + " yd&sup2;"), i }, readableDistance: function(t, e) { var i; return e ? i = t > 1e3 ? (t / 1e3).toFixed(2) + " km" : Math.ceil(t) + " m" : (t *= 1.09361, i = t > 1760 ? (t / 1760).toFixed(2) + " miles" : Math.ceil(t) + " yd"), i } }), L.Util.extend(L.LineUtil, { segmentsIntersect: function(t, e, i, o) { return this._checkCounterclockwise(t, i, o) !== this._checkCounterclockwise(e, i, o) && this._checkCounterclockwise(t, e, i) !== this._checkCounterclockwise(t, e, o) }, _checkCounterclockwise: function(t, e, i) { return (i.y - t.y) * (e.x - t.x) > (e.y - t.y) * (i.x - t.x) } }), L.Polyline.include({ intersects: function() { var t, e, i, o = this._originalPoints,
+                a = o ? o.length : 0; if (this._tooFewPointsForIntersection()) return !1; for (t = a - 1; t >= 3; t--)
+                if (e = o[t - 1], i = o[t], this._lineSegmentsIntersectsRange(e, i, t - 2)) return !0;
+            return !1 }, newLatLngIntersects: function(t, e) { return this._map ? this.newPointIntersects(this._map.latLngToLayerPoint(t), e) : !1 }, newPointIntersects: function(t, e) { var i = this._originalPoints,
+                o = i ? i.length : 0,
+                a = i ? i[o - 1] : null,
+                s = o - 2; return this._tooFewPointsForIntersection(1) ? !1 : this._lineSegmentsIntersectsRange(a, t, s, e ? 1 : 0) }, _tooFewPointsForIntersection: function(t) { var e = this._originalPoints,
+                i = e ? e.length : 0; return i += t || 0, !this._originalPoints || 3 >= i }, _lineSegmentsIntersectsRange: function(t, e, i, o) { var a, s, r = this._originalPoints;
+            o = o || 0; for (var n = i; n > o; n--)
+                if (a = r[n - 1], s = r[n], L.LineUtil.segmentsIntersect(t, e, a, s)) return !0;
+            return !1 } }), L.Polygon.include({ intersects: function() { var t, e, i, o, a, s = this._originalPoints; return this._tooFewPointsForIntersection() ? !1 : (t = L.Polyline.prototype.intersects.call(this)) ? !0 : (e = s.length, i = s[0], o = s[e - 1], a = e - 2, this._lineSegmentsIntersectsRange(o, i, a, 1)) } }), L.Control.Draw = L.Control.extend({ options: { position: "topleft", draw: {}, edit: !1 }, initialize: function(t) { if (L.version < "0.7") throw new Error("Leaflet.draw 0.2.3+ requires Leaflet 0.7.0+. Download latest from https://github.com/Leaflet/Leaflet/");
+            L.Control.prototype.initialize.call(this, t); var e, i;
+            this._toolbars = {}, L.DrawToolbar && this.options.draw && (i = new L.DrawToolbar(this.options.draw), e = L.stamp(i), this._toolbars[e] = i, this._toolbars[e].on("enable", this._toolbarEnabled, this)), L.EditToolbar && this.options.edit && (i = new L.EditToolbar(this.options.edit), e = L.stamp(i), this._toolbars[e] = i, this._toolbars[e].on("enable", this._toolbarEnabled, this)) }, onAdd: function(t) { var e, i = L.DomUtil.create("div", "leaflet-draw"),
+                o = !1,
+                a = "leaflet-draw-toolbar-top"; for (var s in this._toolbars) this._toolbars.hasOwnProperty(s) && (e = this._toolbars[s].addToolbar(t), e && (o || (L.DomUtil.hasClass(e, a) || L.DomUtil.addClass(e.childNodes[0], a), o = !0), i.appendChild(e))); return i }, onRemove: function() { for (var t in this._toolbars) this._toolbars.hasOwnProperty(t) && this._toolbars[t].removeToolbar() }, setDrawingOptions: function(t) { for (var e in this._toolbars) this._toolbars[e] instanceof L.DrawToolbar && this._toolbars[e].setOptions(t) }, _toolbarEnabled: function(t) { var e = "" + L.stamp(t.target); for (var i in this._toolbars) this._toolbars.hasOwnProperty(i) && i !== e && this._toolbars[i].disable() } }), L.Map.mergeOptions({ drawControlTooltips: !0, drawControl: !1 }), L.Map.addInitHook(function() { this.options.drawControl && (this.drawControl = new L.Control.Draw, this.addControl(this.drawControl)) }), L.Toolbar = L.Class.extend({
+        includes: [L.Mixin.Events],
+        initialize: function(t) { L.setOptions(this, t), this._modes = {}, this._actionButtons = [], this._activeMode = null },
+        enabled: function() { return null !== this._activeMode },
+        disable: function() { this.enabled() && this._activeMode.handler.disable() },
+        addToolbar: function(t) { var e, i = L.DomUtil.create("div", "leaflet-draw-section"),
+                o = 0,
+                a = this._toolbarClass || "",
+                s = this.getModeHandlers(t); for (this._toolbarContainer = L.DomUtil.create("div", "leaflet-draw-toolbar leaflet-bar"), this._map = t, e = 0; e < s.length; e++) s[e].enabled && this._initModeHandler(s[e].handler, this._toolbarContainer, o++, a, s[e].title); return o ? (this._lastButtonIndex = --o, this._actionsContainer = L.DomUtil.create("ul", "leaflet-draw-actions"), i.appendChild(this._toolbarContainer), i.appendChild(this._actionsContainer), i) : void 0 },
+        removeToolbar: function() { for (var t in this._modes) this._modes.hasOwnProperty(t) && (this._disposeButton(this._modes[t].button, this._modes[t].handler.enable, this._modes[t].handler), this._modes[t].handler.disable(), this._modes[t].handler.off("enabled", this._handlerActivated, this).off("disabled", this._handlerDeactivated, this));
+            this._modes = {}; for (var e = 0, i = this._actionButtons.length; i > e; e++) this._disposeButton(this._actionButtons[e].button, this._actionButtons[e].callback, this);
+            this._actionButtons = [], this._actionsContainer = null },
+        _initModeHandler: function(t, e, i, o, a) { var s = t.type;
+            this._modes[s] = {}, this._modes[s].handler = t, this._modes[s].button = this._createButton({ title: a, className: o + "-" + s, container: e, callback: this._modes[s].handler.enable, context: this._modes[s].handler }), this._modes[s].buttonIndex = i, this._modes[s].handler.on("enabled", this._handlerActivated, this).on("disabled", this._handlerDeactivated, this) },
+        _createButton: function(t) { var e = L.DomUtil.create("a", t.className || "", t.container); return e.href = "#", t.text && (e.innerHTML = t.text), t.title && (e.title = t.title), L.DomEvent.on(e, "click", L.DomEvent.stopPropagation).on(e, "mousedown", L.DomEvent.stopPropagation).on(e, "dblclick", L.DomEvent.stopPropagation).on(e, "click", L.DomEvent.preventDefault).on(e, "click", t.callback, t.context), e },
+        _disposeButton: function(t, e) { L.DomEvent.off(t, "click", L.DomEvent.stopPropagation).off(t, "mousedown", L.DomEvent.stopPropagation).off(t, "dblclick", L.DomEvent.stopPropagation).off(t, "click", L.DomEvent.preventDefault).off(t, "click", e) },
+        _handlerActivated: function(t) { this.disable(), this._activeMode = this._modes[t.handler], L.DomUtil.addClass(this._activeMode.button, "leaflet-draw-toolbar-button-enabled"), this._showActionsToolbar(), this.fire("enable") },
+        _handlerDeactivated: function() { this._hideActionsToolbar(), L.DomUtil.removeClass(this._activeMode.button, "leaflet-draw-toolbar-button-enabled"), this._activeMode = null, this.fire("disable") },
+        _createActions: function(t) { var e, i, o, a, s = this._actionsContainer,
+                r = this.getActions(t),
+                n = r.length; for (i = 0, o = this._actionButtons.length; o > i; i++) this._disposeButton(this._actionButtons[i].button, this._actionButtons[i].callback); for (this._actionButtons = []; s.firstChild;) s.removeChild(s.firstChild); for (var l = 0; n > l; l++) "enabled" in r[l] && !r[l].enabled || (e = L.DomUtil.create("li", "", s), a = this._createButton({ title: r[l].title, text: r[l].text, container: e, callback: r[l].callback, context: r[l].context }), this._actionButtons.push({ button: a, callback: r[l].callback })) },
+        _showActionsToolbar: function() {
+            var t = this._activeMode.buttonIndex,
+                e = this._lastButtonIndex,
+                i = this._activeMode.button.offsetTop - 1;
+            this._createActions(this._activeMode.handler), this._actionsContainer.style.top = i + "px", 0 === t && (L.DomUtil.addClass(this._toolbarContainer, "leaflet-draw-toolbar-notop"), L.DomUtil.addClass(this._actionsContainer, "leaflet-draw-actions-top")), t === e && (L.DomUtil.addClass(this._toolbarContainer, "leaflet-draw-toolbar-nobottom"), L.DomUtil.addClass(this._actionsContainer, "leaflet-draw-actions-bottom")), this._actionsContainer.style.display = "block"
+        },
+        _hideActionsToolbar: function() { this._actionsContainer.style.display = "none", L.DomUtil.removeClass(this._toolbarContainer, "leaflet-draw-toolbar-notop"), L.DomUtil.removeClass(this._toolbarContainer, "leaflet-draw-toolbar-nobottom"), L.DomUtil.removeClass(this._actionsContainer, "leaflet-draw-actions-top"), L.DomUtil.removeClass(this._actionsContainer, "leaflet-draw-actions-bottom") }
+    }), L.Tooltip = L.Class.extend({ initialize: function(t) { this._map = t, this._popupPane = t._panes.popupPane, this._container = t.options.drawControlTooltips ? L.DomUtil.create("div", "leaflet-draw-tooltip", this._popupPane) : null, this._singleLineLabel = !1 }, dispose: function() { this._container && (this._popupPane.removeChild(this._container), this._container = null) }, updateContent: function(t) { return this._container ? (t.subtext = t.subtext || "", 0 !== t.subtext.length || this._singleLineLabel ? t.subtext.length > 0 && this._singleLineLabel && (L.DomUtil.removeClass(this._container, "leaflet-draw-tooltip-single"), this._singleLineLabel = !1) : (L.DomUtil.addClass(this._container, "leaflet-draw-tooltip-single"), this._singleLineLabel = !0), this._container.innerHTML = (t.subtext.length > 0 ? '<span class="leaflet-draw-tooltip-subtext">' + t.subtext + "</span><br />" : "") + "<span>" + t.text + "</span>", this) : this }, updatePosition: function(t) { var e = this._map.latLngToLayerPoint(t),
+                i = this._container; return this._container && (i.style.visibility = "inherit", L.DomUtil.setPosition(i, e)), this }, showAsError: function() { return this._container && L.DomUtil.addClass(this._container, "leaflet-error-draw-tooltip"), this }, removeError: function() { return this._container && L.DomUtil.removeClass(this._container, "leaflet-error-draw-tooltip"), this } }), L.DrawToolbar = L.Toolbar.extend({ options: { polyline: {}, polygon: {}, rectangle: {}, circle: {}, marker: {} }, initialize: function(t) { for (var e in this.options) this.options.hasOwnProperty(e) && t[e] && (t[e] = L.extend({}, this.options[e], t[e]));
+            this._toolbarClass = "leaflet-draw-draw", L.Toolbar.prototype.initialize.call(this, t) }, getModeHandlers: function(t) { return [{ enabled: this.options.polyline, handler: new L.Draw.Polyline(t, this.options.polyline), title: L.drawLocal.draw.toolbar.buttons.polyline }, { enabled: this.options.polygon, handler: new L.Draw.Polygon(t, this.options.polygon), title: L.drawLocal.draw.toolbar.buttons.polygon }, { enabled: this.options.rectangle, handler: new L.Draw.Rectangle(t, this.options.rectangle), title: L.drawLocal.draw.toolbar.buttons.rectangle }, { enabled: this.options.circle, handler: new L.Draw.Circle(t, this.options.circle), title: L.drawLocal.draw.toolbar.buttons.circle }, { enabled: this.options.marker, handler: new L.Draw.Marker(t, this.options.marker), title: L.drawLocal.draw.toolbar.buttons.marker }] }, getActions: function(t) { return [{ enabled: t.deleteLastVertex, title: L.drawLocal.draw.toolbar.undo.title, text: L.drawLocal.draw.toolbar.undo.text, callback: t.deleteLastVertex, context: t }, { title: L.drawLocal.draw.toolbar.actions.title, text: L.drawLocal.draw.toolbar.actions.text, callback: this.disable, context: this }] }, setOptions: function(t) { L.setOptions(this, t); for (var e in this._modes) this._modes.hasOwnProperty(e) && t.hasOwnProperty(e) && this._modes[e].handler.setOptions(t[e]) } }), L.EditToolbar = L.Toolbar.extend({ options: { edit: { selectedPathOptions: { color: "#fe57a1", opacity: .6, dashArray: "10, 10", fill: !0, fillColor: "#fe57a1", fillOpacity: .1 } }, remove: {}, featureGroup: null }, initialize: function(t) { t.edit && ("undefined" == typeof t.edit.selectedPathOptions && (t.edit.selectedPathOptions = this.options.edit.selectedPathOptions), t.edit = L.extend({}, this.options.edit, t.edit)), t.remove && (t.remove = L.extend({}, this.options.remove, t.remove)), this._toolbarClass = "leaflet-draw-edit", L.Toolbar.prototype.initialize.call(this, t), this._selectedFeatureCount = 0 }, getModeHandlers: function(t) { var e = this.options.featureGroup; return [{ enabled: this.options.edit, handler: new L.EditToolbar.Edit(t, { featureGroup: e, selectedPathOptions: this.options.edit.selectedPathOptions }), title: L.drawLocal.edit.toolbar.buttons.edit }, { enabled: this.options.remove, handler: new L.EditToolbar.Delete(t, { featureGroup: e }), title: L.drawLocal.edit.toolbar.buttons.remove }] }, getActions: function() { return [{ title: L.drawLocal.edit.toolbar.actions.save.title, text: L.drawLocal.edit.toolbar.actions.save.text, callback: this._save, context: this }, { title: L.drawLocal.edit.toolbar.actions.cancel.title, text: L.drawLocal.edit.toolbar.actions.cancel.text, callback: this.disable, context: this }] }, addToolbar: function(t) { var e = L.Toolbar.prototype.addToolbar.call(this, t); return this._checkDisabled(), this.options.featureGroup.on("layeradd layerremove", this._checkDisabled, this), e }, removeToolbar: function() { this.options.featureGroup.off("layeradd layerremove", this._checkDisabled, this), L.Toolbar.prototype.removeToolbar.call(this) }, disable: function() { this.enabled() && (this._activeMode.handler.revertLayers(), L.Toolbar.prototype.disable.call(this)) }, _save: function() { this._activeMode.handler.save(), this._activeMode.handler.disable() }, _checkDisabled: function() { var t, e = this.options.featureGroup,
+                i = 0 !== e.getLayers().length;
+            this.options.edit && (t = this._modes[L.EditToolbar.Edit.TYPE].button, i ? L.DomUtil.removeClass(t, "leaflet-disabled") : L.DomUtil.addClass(t, "leaflet-disabled"), t.setAttribute("title", i ? L.drawLocal.edit.toolbar.buttons.edit : L.drawLocal.edit.toolbar.buttons.editDisabled)), this.options.remove && (t = this._modes[L.EditToolbar.Delete.TYPE].button, i ? L.DomUtil.removeClass(t, "leaflet-disabled") : L.DomUtil.addClass(t, "leaflet-disabled"), t.setAttribute("title", i ? L.drawLocal.edit.toolbar.buttons.remove : L.drawLocal.edit.toolbar.buttons.removeDisabled)) } }), L.EditToolbar.Edit = L.Handler.extend({ statics: { TYPE: "edit" }, includes: L.Mixin.Events, initialize: function(t, e) { if (L.Handler.prototype.initialize.call(this, t), this._selectedPathOptions = e.selectedPathOptions, this._featureGroup = e.featureGroup, !(this._featureGroup instanceof L.FeatureGroup)) throw new Error("options.featureGroup must be a L.FeatureGroup");
+            this._uneditedLayerProps = {}, this.type = L.EditToolbar.Edit.TYPE }, enable: function() {!this._enabled && this._hasAvailableLayers() && (this.fire("enabled", { handler: this.type }), this._map.fire("draw:editstart", { handler: this.type }), L.Handler.prototype.enable.call(this), this._featureGroup.on("layeradd", this._enableLayerEdit, this).on("layerremove", this._disableLayerEdit, this)) }, disable: function() { this._enabled && (this._featureGroup.off("layeradd", this._enableLayerEdit, this).off("layerremove", this._disableLayerEdit, this), L.Handler.prototype.disable.call(this), this._map.fire("draw:editstop", { handler: this.type }), this.fire("disabled", { handler: this.type })) }, addHooks: function() { var t = this._map;
+            t && (t.getContainer().focus(), this._featureGroup.eachLayer(this._enableLayerEdit, this), this._tooltip = new L.Tooltip(this._map), this._tooltip.updateContent({ text: L.drawLocal.edit.handlers.edit.tooltip.text, subtext: L.drawLocal.edit.handlers.edit.tooltip.subtext }), this._map.on("mousemove", this._onMouseMove, this)) }, removeHooks: function() { this._map && (this._featureGroup.eachLayer(this._disableLayerEdit, this), this._uneditedLayerProps = {}, this._tooltip.dispose(), this._tooltip = null, this._map.off("mousemove", this._onMouseMove, this)) }, revertLayers: function() { this._featureGroup.eachLayer(function(t) { this._revertLayer(t) }, this) }, save: function() { var t = new L.LayerGroup;
+            this._featureGroup.eachLayer(function(e) { e.edited && (t.addLayer(e), e.edited = !1) }), this._map.fire("draw:edited", { layers: t }) }, _backupLayer: function(t) { var e = L.Util.stamp(t);
+            this._uneditedLayerProps[e] || (t instanceof L.Polyline || t instanceof L.Polygon || t instanceof L.Rectangle ? this._uneditedLayerProps[e] = { latlngs: L.LatLngUtil.cloneLatLngs(t.getLatLngs()) } : t instanceof L.Circle ? this._uneditedLayerProps[e] = { latlng: L.LatLngUtil.cloneLatLng(t.getLatLng()), radius: t.getRadius() } : t instanceof L.Marker && (this._uneditedLayerProps[e] = { latlng: L.LatLngUtil.cloneLatLng(t.getLatLng()) })) }, _revertLayer: function(t) { var e = L.Util.stamp(t);
+            t.edited = !1, this._uneditedLayerProps.hasOwnProperty(e) && (t instanceof L.Polyline || t instanceof L.Polygon || t instanceof L.Rectangle ? t.setLatLngs(this._uneditedLayerProps[e].latlngs) : t instanceof L.Circle ? (t.setLatLng(this._uneditedLayerProps[e].latlng), t.setRadius(this._uneditedLayerProps[e].radius)) : t instanceof L.Marker && t.setLatLng(this._uneditedLayerProps[e].latlng)) }, _toggleMarkerHighlight: function(t) { if (t._icon) { var e = t._icon;
+                e.style.display = "none", L.DomUtil.hasClass(e, "leaflet-edit-marker-selected") ? (L.DomUtil.removeClass(e, "leaflet-edit-marker-selected"), this._offsetMarker(e, -4)) : (L.DomUtil.addClass(e, "leaflet-edit-marker-selected"), this._offsetMarker(e, 4)), e.style.display = "" } }, _offsetMarker: function(t, e) { var i = parseInt(t.style.marginTop, 10) - e,
+                o = parseInt(t.style.marginLeft, 10) - e;
+            t.style.marginTop = i + "px", t.style.marginLeft = o + "px" }, _enableLayerEdit: function(t) { var e, i = t.layer || t.target || t,
+                o = i instanceof L.Marker;
+            (!o || i._icon) && (this._backupLayer(i), this._selectedPathOptions && (e = L.Util.extend({}, this._selectedPathOptions), o ? this._toggleMarkerHighlight(i) : (i.options.previousOptions = L.Util.extend({ dashArray: null }, i.options), i instanceof L.Circle || i instanceof L.Polygon || i instanceof L.Rectangle || (e.fill = !1), i.setStyle(e))), o ? (i.dragging.enable(), i.on("dragend", this._onMarkerDragEnd)) : i.editing.enable()) }, _disableLayerEdit: function(t) { var e = t.layer || t.target || t;
+            e.edited = !1, this._selectedPathOptions && (e instanceof L.Marker ? this._toggleMarkerHighlight(e) : (e.setStyle(e.options.previousOptions), delete e.options.previousOptions)), e instanceof L.Marker ? (e.dragging.disable(), e.off("dragend", this._onMarkerDragEnd, this)) : e.editing.disable() }, _onMarkerDragEnd: function(t) { var e = t.target;
+            e.edited = !0 }, _onMouseMove: function(t) { this._tooltip.updatePosition(t.latlng) }, _hasAvailableLayers: function() { return 0 !== this._featureGroup.getLayers().length } }), L.EditToolbar.Delete = L.Handler.extend({ statics: { TYPE: "remove" }, includes: L.Mixin.Events, initialize: function(t, e) { if (L.Handler.prototype.initialize.call(this, t), L.Util.setOptions(this, e), this._deletableLayers = this.options.featureGroup, !(this._deletableLayers instanceof L.FeatureGroup)) throw new Error("options.featureGroup must be a L.FeatureGroup");
+            this.type = L.EditToolbar.Delete.TYPE }, enable: function() {!this._enabled && this._hasAvailableLayers() && (this.fire("enabled", { handler: this.type }), this._map.fire("draw:deletestart", { handler: this.type }), L.Handler.prototype.enable.call(this), this._deletableLayers.on("layeradd", this._enableLayerDelete, this).on("layerremove", this._disableLayerDelete, this)) }, disable: function() { this._enabled && (this._deletableLayers.off("layeradd", this._enableLayerDelete, this).off("layerremove", this._disableLayerDelete, this), L.Handler.prototype.disable.call(this), this._map.fire("draw:deletestop", { handler: this.type }), this.fire("disabled", { handler: this.type })) }, addHooks: function() { var t = this._map;
+            t && (t.getContainer().focus(), this._deletableLayers.eachLayer(this._enableLayerDelete, this), this._deletedLayers = new L.layerGroup, this._tooltip = new L.Tooltip(this._map), this._tooltip.updateContent({ text: L.drawLocal.edit.handlers.remove.tooltip.text }), this._map.on("mousemove", this._onMouseMove, this)) }, removeHooks: function() { this._map && (this._deletableLayers.eachLayer(this._disableLayerDelete, this), this._deletedLayers = null, this._tooltip.dispose(), this._tooltip = null, this._map.off("mousemove", this._onMouseMove, this)) }, revertLayers: function() { this._deletedLayers.eachLayer(function(t) { this._deletableLayers.addLayer(t) }, this) }, save: function() { this._map.fire("draw:deleted", { layers: this._deletedLayers }) }, _enableLayerDelete: function(t) { var e = t.layer || t.target || t;
+            e.on("click", this._removeLayer, this) }, _disableLayerDelete: function(t) { var e = t.layer || t.target || t;
+            e.off("click", this._removeLayer, this), this._deletedLayers.removeLayer(e) }, _removeLayer: function(t) { var e = t.layer || t.target || t;
+            this._deletableLayers.removeLayer(e), this._deletedLayers.addLayer(e) }, _onMouseMove: function(t) { this._tooltip.updatePosition(t.latlng) }, _hasAvailableLayers: function() { return 0 !== this._deletableLayers.getLayers().length } })
+}(window, document);
\ No newline at end of file
diff --git a/erpnext/public/js/leaflet/leaflet.js b/erpnext/public/js/leaflet/leaflet.js
new file mode 100755
index 0000000..41d9bb9
--- /dev/null
+++ b/erpnext/public/js/leaflet/leaflet.js
@@ -0,0 +1,771 @@
+/*
+ Leaflet 1.0.0-beta.2 (dd0faa1), a JS library for interactive maps. http://leafletjs.com
+ (c) 2010-2015 Vladimir Agafonkin, (c) 2010-2011 CloudMade
+*/
+! function(t, e, i) {
+    function n() { var e = t.L;
+        o.noConflict = function() { return t.L = e, this }, t.L = o }
+    var o = { version: "1.0.0-beta.2" };
+    "object" == typeof module && "object" == typeof module.exports ? module.exports = o : "function" == typeof define && define.amd && define(o), "undefined" != typeof t && n(), o.Util = { extend: function(t) { var e, i, n, o; for (i = 1, n = arguments.length; n > i; i++) { o = arguments[i]; for (e in o) t[e] = o[e] } return t }, create: Object.create || function() {
+                function t() {} return function(e) { return t.prototype = e, new t } }(), bind: function(t, e) { var i = Array.prototype.slice; if (t.bind) return t.bind.apply(t, i.call(arguments, 1)); var n = i.call(arguments, 2); return function() { return t.apply(e, n.length ? n.concat(i.call(arguments)) : arguments) } }, stamp: function(t) { return t._leaflet_id = t._leaflet_id || ++o.Util.lastId, t._leaflet_id }, lastId: 0, throttle: function(t, e, i) { var n, o, s, r; return r = function() { n = !1, o && (s.apply(i, o), o = !1) }, s = function() { n ? o = arguments : (t.apply(i, arguments), setTimeout(r, e), n = !0) } }, wrapNum: function(t, e, i) { var n = e[1],
+                    o = e[0],
+                    s = n - o; return t === n && i ? t : ((t - o) % s + s) % s + o }, falseFn: function() { return !1 }, formatNum: function(t, e) { var i = Math.pow(10, e || 5); return Math.round(t * i) / i }, trim: function(t) { return t.trim ? t.trim() : t.replace(/^\s+|\s+$/g, "") }, splitWords: function(t) { return o.Util.trim(t).split(/\s+/) }, setOptions: function(t, e) { t.hasOwnProperty("options") || (t.options = t.options ? o.Util.create(t.options) : {}); for (var i in e) t.options[i] = e[i]; return t.options }, getParamString: function(t, e, i) { var n = []; for (var o in t) n.push(encodeURIComponent(i ? o.toUpperCase() : o) + "=" + encodeURIComponent(t[o])); return (e && -1 !== e.indexOf("?") ? "&" : "?") + n.join("&") }, template: function(t, e) { return t.replace(o.Util.templateRe, function(t, n) { var o = e[n]; if (o === i) throw new Error("No value provided for variable " + t); return "function" == typeof o && (o = o(e)), o }) }, templateRe: /\{ *([\w_]+) *\}/g, isArray: Array.isArray || function(t) { return "[object Array]" === Object.prototype.toString.call(t) }, indexOf: function(t, e) { for (var i = 0; i < t.length; i++)
+                    if (t[i] === e) return i;
+                return -1 }, emptyImageUrl: "data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=" },
+        function() {
+            function e(e) { return t["webkit" + e] || t["moz" + e] || t["ms" + e] }
+
+            function i(e) { var i = +new Date,
+                    o = Math.max(0, 16 - (i - n)); return n = i + o, t.setTimeout(e, o) } var n = 0,
+                s = t.requestAnimationFrame || e("RequestAnimationFrame") || i,
+                r = t.cancelAnimationFrame || e("CancelAnimationFrame") || e("CancelRequestAnimationFrame") || function(e) { t.clearTimeout(e) };
+            o.Util.requestAnimFrame = function(e, n, r) { return r && s === i ? void e.call(n) : s.call(t, o.bind(e, n)) }, o.Util.cancelAnimFrame = function(e) { e && r.call(t, e) } }(), o.extend = o.Util.extend, o.bind = o.Util.bind, o.stamp = o.Util.stamp, o.setOptions = o.Util.setOptions, o.Class = function() {}, o.Class.extend = function(t) { var e = function() { this.initialize && this.initialize.apply(this, arguments), this.callInitHooks() },
+                i = e.__super__ = this.prototype,
+                n = o.Util.create(i);
+            n.constructor = e, e.prototype = n; for (var s in this) this.hasOwnProperty(s) && "prototype" !== s && (e[s] = this[s]); return t.statics && (o.extend(e, t.statics), delete t.statics), t.includes && (o.Util.extend.apply(null, [n].concat(t.includes)), delete t.includes), n.options && (t.options = o.Util.extend(o.Util.create(n.options), t.options)), o.extend(n, t), n._initHooks = [], n.callInitHooks = function() { if (!this._initHooksCalled) { i.callInitHooks && i.callInitHooks.call(this), this._initHooksCalled = !0; for (var t = 0, e = n._initHooks.length; e > t; t++) n._initHooks[t].call(this) } }, e }, o.Class.include = function(t) { o.extend(this.prototype, t) }, o.Class.mergeOptions = function(t) { o.extend(this.prototype.options, t) }, o.Class.addInitHook = function(t) { var e = Array.prototype.slice.call(arguments, 1),
+                i = "function" == typeof t ? t : function() { this[t].apply(this, e) };
+            this.prototype._initHooks = this.prototype._initHooks || [], this.prototype._initHooks.push(i) }, o.Evented = o.Class.extend({ on: function(t, e, i) { if ("object" == typeof t)
+                    for (var n in t) this._on(n, t[n], e);
+                else { t = o.Util.splitWords(t); for (var s = 0, r = t.length; r > s; s++) this._on(t[s], e, i) } return this }, off: function(t, e, i) { if (t)
+                    if ("object" == typeof t)
+                        for (var n in t) this._off(n, t[n], e);
+                    else { t = o.Util.splitWords(t); for (var s = 0, r = t.length; r > s; s++) this._off(t[s], e, i) }
+                else delete this._events; return this }, _on: function(t, e, i) { var n = this._events = this._events || {},
+                    s = i && i !== this && o.stamp(i); if (s) { var r = t + "_idx",
+                        a = t + "_len",
+                        h = n[r] = n[r] || {},
+                        l = o.stamp(e) + "_" + s;
+                    h[l] || (h[l] = { fn: e, ctx: i }, n[a] = (n[a] || 0) + 1) } else n[t] = n[t] || [], n[t].push({ fn: e }) }, _off: function(t, e, i) { var n = this._events,
+                    s = t + "_idx",
+                    r = t + "_len"; if (n) { if (!e) return delete n[t], delete n[s], void delete n[r]; var a, h, l, u, c, d = i && i !== this && o.stamp(i); if (d) c = o.stamp(e) + "_" + d, a = n[s], a && a[c] && (u = a[c], delete a[c], n[r]--);
+                    else if (a = n[t])
+                        for (h = 0, l = a.length; l > h; h++)
+                            if (a[h].fn === e) { u = a[h], a.splice(h, 1); break }
+                    u && (u.fn = o.Util.falseFn) } }, fire: function(t, e, i) { if (!this.listens(t, i)) return this; var n = o.Util.extend({}, e, { type: t, target: this }),
+                    s = this._events; if (s) { var r, a, h, l, u = s[t + "_idx"]; if (s[t])
+                        for (h = s[t].slice(), r = 0, a = h.length; a > r; r++) h[r].fn.call(this, n); for (l in u) u[l].fn.call(u[l].ctx, n) } return i && this._propagateEvent(n), this }, listens: function(t, e) { var i = this._events; if (i && (i[t] || i[t + "_len"])) return !0; if (e)
+                    for (var n in this._eventParents)
+                        if (this._eventParents[n].listens(t, e)) return !0;
+                return !1 }, once: function(t, e, i) { if ("object" == typeof t) { for (var n in t) this.once(n, t[n], e); return this } var s = o.bind(function() { this.off(t, e, i).off(t, s, i) }, this); return this.on(t, e, i).on(t, s, i) }, addEventParent: function(t) { return this._eventParents = this._eventParents || {}, this._eventParents[o.stamp(t)] = t, this }, removeEventParent: function(t) { return this._eventParents && delete this._eventParents[o.stamp(t)], this }, _propagateEvent: function(t) { for (var e in this._eventParents) this._eventParents[e].fire(t.type, o.extend({ layer: t.target }, t), !0) } });
+    var s = o.Evented.prototype;
+    s.addEventListener = s.on, s.removeEventListener = s.clearAllEventListeners = s.off, s.addOneTimeEventListener = s.once, s.fireEvent = s.fire, s.hasEventListeners = s.listens, o.Mixin = { Events: s },
+        function() { var i = navigator.userAgent.toLowerCase(),
+                n = e.documentElement,
+                s = "ActiveXObject" in t,
+                r = -1 !== i.indexOf("webkit"),
+                a = -1 !== i.indexOf("phantom"),
+                h = -1 !== i.search("android [23]"),
+                l = -1 !== i.indexOf("chrome"),
+                u = -1 !== i.indexOf("gecko") && !r && !t.opera && !s,
+                c = "undefined" != typeof orientation || -1 !== i.indexOf("mobile"),
+                d = !t.PointerEvent && t.MSPointerEvent,
+                _ = t.PointerEvent && navigator.pointerEnabled || d,
+                m = s && "transition" in n.style,
+                p = "WebKitCSSMatrix" in t && "m11" in new t.WebKitCSSMatrix && !h,
+                f = "MozPerspective" in n.style,
+                g = "OTransition" in n.style,
+                v = !t.L_NO_TOUCH && !a && (_ || "ontouchstart" in t || t.DocumentTouch && e instanceof t.DocumentTouch);
+            o.Browser = { ie: s, ielt9: s && !e.addEventListener, webkit: r, gecko: u, android: -1 !== i.indexOf("android"), android23: h, chrome: l, safari: !l && -1 !== i.indexOf("safari"), ie3d: m, webkit3d: p, gecko3d: f, opera12: g, any3d: !t.L_DISABLE_3D && (m || p || f) && !g && !a, mobile: c, mobileWebkit: c && r, mobileWebkit3d: c && p, mobileOpera: c && t.opera, mobileGecko: c && u, touch: !!v, msPointer: !!d, pointer: !!_, retina: (t.devicePixelRatio || t.screen.deviceXDPI / t.screen.logicalXDPI) > 1 } }(), o.Point = function(t, e, i) { this.x = i ? Math.round(t) : t, this.y = i ? Math.round(e) : e }, o.Point.prototype = { clone: function() { return new o.Point(this.x, this.y) }, add: function(t) { return this.clone()._add(o.point(t)) }, _add: function(t) { return this.x += t.x, this.y += t.y, this }, subtract: function(t) { return this.clone()._subtract(o.point(t)) }, _subtract: function(t) { return this.x -= t.x, this.y -= t.y, this }, divideBy: function(t) { return this.clone()._divideBy(t) }, _divideBy: function(t) { return this.x /= t, this.y /= t, this }, multiplyBy: function(t) { return this.clone()._multiplyBy(t) }, _multiplyBy: function(t) { return this.x *= t, this.y *= t, this }, scaleBy: function(t) { return new o.Point(this.x * t.x, this.y * t.y) }, unscaleBy: function(t) { return new o.Point(this.x / t.x, this.y / t.y) }, round: function() { return this.clone()._round() }, _round: function() { return this.x = Math.round(this.x), this.y = Math.round(this.y), this }, floor: function() { return this.clone()._floor() }, _floor: function() { return this.x = Math.floor(this.x), this.y = Math.floor(this.y), this }, ceil: function() { return this.clone()._ceil() }, _ceil: function() { return this.x = Math.ceil(this.x), this.y = Math.ceil(this.y), this }, distanceTo: function(t) { t = o.point(t); var e = t.x - this.x,
+                    i = t.y - this.y; return Math.sqrt(e * e + i * i) }, equals: function(t) { return t = o.point(t), t.x === this.x && t.y === this.y }, contains: function(t) { return t = o.point(t), Math.abs(t.x) <= Math.abs(this.x) && Math.abs(t.y) <= Math.abs(this.y) }, toString: function() { return "Point(" + o.Util.formatNum(this.x) + ", " + o.Util.formatNum(this.y) + ")" } }, o.point = function(t, e, n) { return t instanceof o.Point ? t : o.Util.isArray(t) ? new o.Point(t[0], t[1]) : t === i || null === t ? t : new o.Point(t, e, n) }, o.Bounds = function(t, e) { if (t)
+                for (var i = e ? [t, e] : t, n = 0, o = i.length; o > n; n++) this.extend(i[n]) }, o.Bounds.prototype = { extend: function(t) { return t = o.point(t), this.min || this.max ? (this.min.x = Math.min(t.x, this.min.x), this.max.x = Math.max(t.x, this.max.x), this.min.y = Math.min(t.y, this.min.y), this.max.y = Math.max(t.y, this.max.y)) : (this.min = t.clone(), this.max = t.clone()), this }, getCenter: function(t) { return new o.Point((this.min.x + this.max.x) / 2, (this.min.y + this.max.y) / 2, t) }, getBottomLeft: function() { return new o.Point(this.min.x, this.max.y) }, getTopRight: function() { return new o.Point(this.max.x, this.min.y) }, getSize: function() { return this.max.subtract(this.min) }, contains: function(t) { var e, i; return t = "number" == typeof t[0] || t instanceof o.Point ? o.point(t) : o.bounds(t), t instanceof o.Bounds ? (e = t.min, i = t.max) : e = i = t, e.x >= this.min.x && i.x <= this.max.x && e.y >= this.min.y && i.y <= this.max.y }, intersects: function(t) { t = o.bounds(t); var e = this.min,
+                    i = this.max,
+                    n = t.min,
+                    s = t.max,
+                    r = s.x >= e.x && n.x <= i.x,
+                    a = s.y >= e.y && n.y <= i.y; return r && a }, overlaps: function(t) { t = o.bounds(t); var e = this.min,
+                    i = this.max,
+                    n = t.min,
+                    s = t.max,
+                    r = s.x > e.x && n.x < i.x,
+                    a = s.y > e.y && n.y < i.y; return r && a }, isValid: function() { return !(!this.min || !this.max) } }, o.bounds = function(t, e) { return !t || t instanceof o.Bounds ? t : new o.Bounds(t, e) }, o.Transformation = function(t, e, i, n) { this._a = t, this._b = e, this._c = i, this._d = n }, o.Transformation.prototype = { transform: function(t, e) { return this._transform(t.clone(), e) }, _transform: function(t, e) { return e = e || 1, t.x = e * (this._a * t.x + this._b), t.y = e * (this._c * t.y + this._d), t }, untransform: function(t, e) { return e = e || 1, new o.Point((t.x / e - this._b) / this._a, (t.y / e - this._d) / this._c) } }, o.DomUtil = { get: function(t) { return "string" == typeof t ? e.getElementById(t) : t }, getStyle: function(t, i) { var n = t.style[i] || t.currentStyle && t.currentStyle[i]; if ((!n || "auto" === n) && e.defaultView) { var o = e.defaultView.getComputedStyle(t, null);
+                    n = o ? o[i] : null } return "auto" === n ? null : n }, create: function(t, i, n) { var o = e.createElement(t); return o.className = i, n && n.appendChild(o), o }, remove: function(t) { var e = t.parentNode;
+                e && e.removeChild(t) }, empty: function(t) { for (; t.firstChild;) t.removeChild(t.firstChild) }, toFront: function(t) { t.parentNode.appendChild(t) }, toBack: function(t) { var e = t.parentNode;
+                e.insertBefore(t, e.firstChild) }, hasClass: function(t, e) { if (t.classList !== i) return t.classList.contains(e); var n = o.DomUtil.getClass(t); return n.length > 0 && new RegExp("(^|\\s)" + e + "(\\s|$)").test(n) }, addClass: function(t, e) { if (t.classList !== i)
+                    for (var n = o.Util.splitWords(e), s = 0, r = n.length; r > s; s++) t.classList.add(n[s]);
+                else if (!o.DomUtil.hasClass(t, e)) { var a = o.DomUtil.getClass(t);
+                    o.DomUtil.setClass(t, (a ? a + " " : "") + e) } }, removeClass: function(t, e) { t.classList !== i ? t.classList.remove(e) : o.DomUtil.setClass(t, o.Util.trim((" " + o.DomUtil.getClass(t) + " ").replace(" " + e + " ", " "))) }, setClass: function(t, e) { t.className.baseVal === i ? t.className = e : t.className.baseVal = e }, getClass: function(t) { return t.className.baseVal === i ? t.className : t.className.baseVal }, setOpacity: function(t, e) { "opacity" in t.style ? t.style.opacity = e : "filter" in t.style && o.DomUtil._setOpacityIE(t, e) }, _setOpacityIE: function(t, e) { var i = !1,
+                    n = "DXImageTransform.Microsoft.Alpha"; try { i = t.filters.item(n) } catch (o) { if (1 === e) return }
+                e = Math.round(100 * e), i ? (i.Enabled = 100 !== e, i.Opacity = e) : t.style.filter += " progid:" + n + "(opacity=" + e + ")" }, testProp: function(t) { for (var i = e.documentElement.style, n = 0; n < t.length; n++)
+                    if (t[n] in i) return t[n];
+                return !1 }, setTransform: function(t, e, i) { var n = e || new o.Point(0, 0);
+                t.style[o.DomUtil.TRANSFORM] = (o.Browser.ie3d ? "translate(" + n.x + "px," + n.y + "px)" : "translate3d(" + n.x + "px," + n.y + "px,0)") + (i ? " scale(" + i + ")" : "") }, setPosition: function(t, e) { t._leaflet_pos = e, o.Browser.any3d ? o.DomUtil.setTransform(t, e) : (t.style.left = e.x + "px", t.style.top = e.y + "px") }, getPosition: function(t) { return t._leaflet_pos } },
+        function() { o.DomUtil.TRANSFORM = o.DomUtil.testProp(["transform", "WebkitTransform", "OTransform", "MozTransform", "msTransform"]); var i = o.DomUtil.TRANSITION = o.DomUtil.testProp(["webkitTransition", "transition", "OTransition", "MozTransition", "msTransition"]); if (o.DomUtil.TRANSITION_END = "webkitTransition" === i || "OTransition" === i ? i + "End" : "transitionend", "onselectstart" in e) o.DomUtil.disableTextSelection = function() { o.DomEvent.on(t, "selectstart", o.DomEvent.preventDefault) }, o.DomUtil.enableTextSelection = function() { o.DomEvent.off(t, "selectstart", o.DomEvent.preventDefault) };
+            else { var n = o.DomUtil.testProp(["userSelect", "WebkitUserSelect", "OUserSelect", "MozUserSelect", "msUserSelect"]);
+                o.DomUtil.disableTextSelection = function() { if (n) { var t = e.documentElement.style;
+                        this._userSelect = t[n], t[n] = "none" } }, o.DomUtil.enableTextSelection = function() { n && (e.documentElement.style[n] = this._userSelect, delete this._userSelect) } }
+            o.DomUtil.disableImageDrag = function() { o.DomEvent.on(t, "dragstart", o.DomEvent.preventDefault) }, o.DomUtil.enableImageDrag = function() { o.DomEvent.off(t, "dragstart", o.DomEvent.preventDefault) }, o.DomUtil.preventOutline = function(e) { for (; - 1 === e.tabIndex;) e = e.parentNode;
+                e && e.style && (o.DomUtil.restoreOutline(), this._outlineElement = e, this._outlineStyle = e.style.outline, e.style.outline = "none", o.DomEvent.on(t, "keydown", o.DomUtil.restoreOutline, this)) }, o.DomUtil.restoreOutline = function() { this._outlineElement && (this._outlineElement.style.outline = this._outlineStyle, delete this._outlineElement, delete this._outlineStyle, o.DomEvent.off(t, "keydown", o.DomUtil.restoreOutline, this)) } }(), o.LatLng = function(t, e, n) { if (isNaN(t) || isNaN(e)) throw new Error("Invalid LatLng object: (" + t + ", " + e + ")");
+            this.lat = +t, this.lng = +e, n !== i && (this.alt = +n) }, o.LatLng.prototype = { equals: function(t, e) { if (!t) return !1;
+                t = o.latLng(t); var n = Math.max(Math.abs(this.lat - t.lat), Math.abs(this.lng - t.lng)); return (e === i ? 1e-9 : e) >= n }, toString: function(t) { return "LatLng(" + o.Util.formatNum(this.lat, t) + ", " + o.Util.formatNum(this.lng, t) + ")" }, distanceTo: function(t) { return o.CRS.Earth.distance(this, o.latLng(t)) }, wrap: function() { return o.CRS.Earth.wrapLatLng(this) }, toBounds: function(t) { var e = 180 * t / 40075017,
+                    i = e / Math.cos(Math.PI / 180 * this.lat); return o.latLngBounds([this.lat - e, this.lng - i], [this.lat + e, this.lng + i]) }, clone: function() { return new o.LatLng(this.lat, this.lng, this.alt) } }, o.latLng = function(t, e, n) { return t instanceof o.LatLng ? t : o.Util.isArray(t) && "object" != typeof t[0] ? 3 === t.length ? new o.LatLng(t[0], t[1], t[2]) : 2 === t.length ? new o.LatLng(t[0], t[1]) : null : t === i || null === t ? t : "object" == typeof t && "lat" in t ? new o.LatLng(t.lat, "lng" in t ? t.lng : t.lon, t.alt) : e === i ? null : new o.LatLng(t, e, n) }, o.LatLngBounds = function(t, e) { if (t)
+                for (var i = e ? [t, e] : t, n = 0, o = i.length; o > n; n++) this.extend(i[n]) }, o.LatLngBounds.prototype = { extend: function(t) { var e, i, n = this._southWest,
+                    s = this._northEast; if (t instanceof o.LatLng) e = t, i = t;
+                else { if (!(t instanceof o.LatLngBounds)) return t ? this.extend(o.latLng(t) || o.latLngBounds(t)) : this; if (e = t._southWest, i = t._northEast, !e || !i) return this } return n || s ? (n.lat = Math.min(e.lat, n.lat), n.lng = Math.min(e.lng, n.lng), s.lat = Math.max(i.lat, s.lat), s.lng = Math.max(i.lng, s.lng)) : (this._southWest = new o.LatLng(e.lat, e.lng), this._northEast = new o.LatLng(i.lat, i.lng)), this }, pad: function(t) { var e = this._southWest,
+                    i = this._northEast,
+                    n = Math.abs(e.lat - i.lat) * t,
+                    s = Math.abs(e.lng - i.lng) * t; return new o.LatLngBounds(new o.LatLng(e.lat - n, e.lng - s), new o.LatLng(i.lat + n, i.lng + s)) }, getCenter: function() { return new o.LatLng((this._southWest.lat + this._northEast.lat) / 2, (this._southWest.lng + this._northEast.lng) / 2) }, getSouthWest: function() { return this._southWest }, getNorthEast: function() { return this._northEast }, getNorthWest: function() { return new o.LatLng(this.getNorth(), this.getWest()) }, getSouthEast: function() { return new o.LatLng(this.getSouth(), this.getEast()) }, getWest: function() { return this._southWest.lng }, getSouth: function() { return this._southWest.lat }, getEast: function() { return this._northEast.lng }, getNorth: function() { return this._northEast.lat }, contains: function(t) { t = "number" == typeof t[0] || t instanceof o.LatLng ? o.latLng(t) : o.latLngBounds(t); var e, i, n = this._southWest,
+                    s = this._northEast; return t instanceof o.LatLngBounds ? (e = t.getSouthWest(), i = t.getNorthEast()) : e = i = t, e.lat >= n.lat && i.lat <= s.lat && e.lng >= n.lng && i.lng <= s.lng }, intersects: function(t) { t = o.latLngBounds(t); var e = this._southWest,
+                    i = this._northEast,
+                    n = t.getSouthWest(),
+                    s = t.getNorthEast(),
+                    r = s.lat >= e.lat && n.lat <= i.lat,
+                    a = s.lng >= e.lng && n.lng <= i.lng; return r && a }, overlaps: function(t) { t = o.latLngBounds(t); var e = this._southWest,
+                    i = this._northEast,
+                    n = t.getSouthWest(),
+                    s = t.getNorthEast(),
+                    r = s.lat > e.lat && n.lat < i.lat,
+                    a = s.lng > e.lng && n.lng < i.lng; return r && a }, toBBoxString: function() { return [this.getWest(), this.getSouth(), this.getEast(), this.getNorth()].join(",") }, equals: function(t) { return t ? (t = o.latLngBounds(t), this._southWest.equals(t.getSouthWest()) && this._northEast.equals(t.getNorthEast())) : !1 }, isValid: function() { return !(!this._southWest || !this._northEast) } }, o.latLngBounds = function(t, e) { return !t || t instanceof o.LatLngBounds ? t : new o.LatLngBounds(t, e) }, o.Projection = {}, o.Projection.LonLat = { project: function(t) { return new o.Point(t.lng, t.lat) }, unproject: function(t) { return new o.LatLng(t.y, t.x) }, bounds: o.bounds([-180, -90], [180, 90]) }, o.Projection.SphericalMercator = { R: 6378137, MAX_LATITUDE: 85.0511287798, project: function(t) { var e = Math.PI / 180,
+                    i = this.MAX_LATITUDE,
+                    n = Math.max(Math.min(i, t.lat), -i),
+                    s = Math.sin(n * e); return new o.Point(this.R * t.lng * e, this.R * Math.log((1 + s) / (1 - s)) / 2) }, unproject: function(t) { var e = 180 / Math.PI; return new o.LatLng((2 * Math.atan(Math.exp(t.y / this.R)) - Math.PI / 2) * e, t.x * e / this.R) }, bounds: function() { var t = 6378137 * Math.PI; return o.bounds([-t, -t], [t, t]) }() }, o.CRS = { latLngToPoint: function(t, e) { var i = this.projection.project(t),
+                    n = this.scale(e); return this.transformation._transform(i, n) }, pointToLatLng: function(t, e) { var i = this.scale(e),
+                    n = this.transformation.untransform(t, i); return this.projection.unproject(n) }, project: function(t) { return this.projection.project(t) }, unproject: function(t) { return this.projection.unproject(t) }, scale: function(t) { return 256 * Math.pow(2, t) }, zoom: function(t) { return Math.log(t / 256) / Math.LN2 }, getProjectedBounds: function(t) { if (this.infinite) return null; var e = this.projection.bounds,
+                    i = this.scale(t),
+                    n = this.transformation.transform(e.min, i),
+                    s = this.transformation.transform(e.max, i); return o.bounds(n, s) }, wrapLatLng: function(t) { var e = this.wrapLng ? o.Util.wrapNum(t.lng, this.wrapLng, !0) : t.lng,
+                    i = this.wrapLat ? o.Util.wrapNum(t.lat, this.wrapLat, !0) : t.lat,
+                    n = t.alt; return o.latLng(i, e, n) } }, o.CRS.Simple = o.extend({}, o.CRS, { projection: o.Projection.LonLat, transformation: new o.Transformation(1, 0, -1, 0), scale: function(t) { return Math.pow(2, t) }, zoom: function(t) { return Math.log(t) / Math.LN2 }, distance: function(t, e) { var i = e.lng - t.lng,
+                    n = e.lat - t.lat; return Math.sqrt(i * i + n * n) }, infinite: !0 }), o.CRS.Earth = o.extend({}, o.CRS, { wrapLng: [-180, 180], R: 6378137, distance: function(t, e) { var i = Math.PI / 180,
+                    n = t.lat * i,
+                    o = e.lat * i,
+                    s = Math.sin(n) * Math.sin(o) + Math.cos(n) * Math.cos(o) * Math.cos((e.lng - t.lng) * i); return this.R * Math.acos(Math.min(s, 1)) } }), o.CRS.EPSG3857 = o.extend({}, o.CRS.Earth, { code: "EPSG:3857", projection: o.Projection.SphericalMercator, transformation: function() { var t = .5 / (Math.PI * o.Projection.SphericalMercator.R); return new o.Transformation(t, .5, -t, .5) }() }), o.CRS.EPSG900913 = o.extend({}, o.CRS.EPSG3857, { code: "EPSG:900913" }), o.CRS.EPSG4326 = o.extend({}, o.CRS.Earth, { code: "EPSG:4326", projection: o.Projection.LonLat, transformation: new o.Transformation(1 / 180, 1, -1 / 180, .5) }), o.Map = o.Evented.extend({
+            options: { crs: o.CRS.EPSG3857, fadeAnimation: !0, trackResize: !0, markerZoomAnimation: !0, maxBoundsViscosity: 0, transform3DLimit: 8388608 },
+            initialize: function(t, e) { e = o.setOptions(this, e), this._initContainer(t), this._initLayout(), this._onResize = o.bind(this._onResize, this), this._initEvents(), e.maxBounds && this.setMaxBounds(e.maxBounds), e.zoom !== i && (this._zoom = this._limitZoom(e.zoom)), e.center && e.zoom !== i && this.setView(o.latLng(e.center), e.zoom, { reset: !0 }), this._handlers = [], this._layers = {}, this._zoomBoundLayers = {}, this._sizeChanged = !0, this.callInitHooks(), this._addLayers(this.options.layers) },
+            setView: function(t, e) { return e = e === i ? this.getZoom() : e, this._resetView(o.latLng(t), e), this },
+            setZoom: function(t, e) { return this._loaded ? this.setView(this.getCenter(), t, { zoom: e }) : (this._zoom = t, this) },
+            zoomIn: function(t, e) { return this.setZoom(this._zoom + (t || 1), e) },
+            zoomOut: function(t, e) { return this.setZoom(this._zoom - (t || 1), e) },
+            setZoomAround: function(t, e, i) { var n = this.getZoomScale(e),
+                    s = this.getSize().divideBy(2),
+                    r = t instanceof o.Point ? t : this.latLngToContainerPoint(t),
+                    a = r.subtract(s).multiplyBy(1 - 1 / n),
+                    h = this.containerPointToLatLng(s.add(a)); return this.setView(h, e, { zoom: i }) },
+            _getBoundsCenterZoom: function(t, e) { e = e || {}, t = t.getBounds ? t.getBounds() : o.latLngBounds(t); var i = o.point(e.paddingTopLeft || e.padding || [0, 0]),
+                    n = o.point(e.paddingBottomRight || e.padding || [0, 0]),
+                    s = this.getBoundsZoom(t, !1, i.add(n));
+                s = e.maxZoom ? Math.min(e.maxZoom, s) : s; var r = n.subtract(i).divideBy(2),
+                    a = this.project(t.getSouthWest(), s),
+                    h = this.project(t.getNorthEast(), s),
+                    l = this.unproject(a.add(h).divideBy(2).add(r), s); return { center: l, zoom: s } },
+            fitBounds: function(t, e) { var i = this._getBoundsCenterZoom(t, e); return this.setView(i.center, i.zoom, e) },
+            fitWorld: function(t) { return this.fitBounds([
+                    [-90, -180],
+                    [90, 180]
+                ], t) },
+            panTo: function(t, e) { return this.setView(t, this._zoom, { pan: e }) },
+            panBy: function(t) { return this.fire("movestart"), this._rawPanBy(o.point(t)), this.fire("move"), this.fire("moveend") },
+            setMaxBounds: function(t) { return (t = o.latLngBounds(t)) ? (this.options.maxBounds && this.off("moveend", this._panInsideMaxBounds), this.options.maxBounds = t, this._loaded && this._panInsideMaxBounds(), this.on("moveend", this._panInsideMaxBounds)) : this.off("moveend", this._panInsideMaxBounds) },
+            setMinZoom: function(t) { return this.options.minZoom = t, this._loaded && this.getZoom() < this.options.minZoom ? this.setZoom(t) : this },
+            setMaxZoom: function(t) { return this.options.maxZoom = t, this._loaded && this.getZoom() > this.options.maxZoom ? this.setZoom(t) : this },
+            panInsideBounds: function(t, e) { this._enforcingBounds = !0; var i = this.getCenter(),
+                    n = this._limitCenter(i, this._zoom, o.latLngBounds(t)); return i.equals(n) ? this : (this.panTo(n, e), this._enforcingBounds = !1, this) },
+            invalidateSize: function(t) { if (!this._loaded) return this;
+                t = o.extend({ animate: !1, pan: !0 }, t === !0 ? { animate: !0 } : t); var e = this.getSize();
+                this._sizeChanged = !0, this._lastCenter = null; var i = this.getSize(),
+                    n = e.divideBy(2).round(),
+                    s = i.divideBy(2).round(),
+                    r = n.subtract(s); return r.x || r.y ? (t.animate && t.pan ? this.panBy(r) : (t.pan && this._rawPanBy(r), this.fire("move"), t.debounceMoveend ? (clearTimeout(this._sizeTimer), this._sizeTimer = setTimeout(o.bind(this.fire, this, "moveend"), 200)) : this.fire("moveend")), this.fire("resize", { oldSize: e, newSize: i })) : this },
+            stop: function() { return o.Util.cancelAnimFrame(this._flyToFrame), this._panAnim && this._panAnim.stop(), this },
+            addHandler: function(t, e) { if (!e) return this; var i = this[t] = new e(this); return this._handlers.push(i), this.options[t] && i.enable(), this },
+            remove: function() { this._initEvents(!0); try { delete this._container._leaflet } catch (t) { this._container._leaflet = i }
+                o.DomUtil.remove(this._mapPane), this._clearControlPos && this._clearControlPos(), this._clearHandlers(), this._loaded && this.fire("unload"); for (var e in this._layers) this._layers[e].remove(); return this },
+            createPane: function(t, e) { var i = "leaflet-pane" + (t ? " leaflet-" + t.replace("Pane", "") + "-pane" : ""),
+                    n = o.DomUtil.create("div", i, e || this._mapPane); return t && (this._panes[t] = n), n },
+            getCenter: function() { return this._checkIfLoaded(), this._lastCenter && !this._moved() ? this._lastCenter : this.layerPointToLatLng(this._getCenterLayerPoint()) },
+            getZoom: function() { return this._zoom },
+            getBounds: function() { var t = this.getPixelBounds(),
+                    e = this.unproject(t.getBottomLeft()),
+                    i = this.unproject(t.getTopRight()); return new o.LatLngBounds(e, i) },
+            getMinZoom: function() { return this.options.minZoom === i ? this._layersMinZoom || 0 : this.options.minZoom },
+            getMaxZoom: function() { return this.options.maxZoom === i ? this._layersMaxZoom === i ? 1 / 0 : this._layersMaxZoom : this.options.maxZoom },
+            getBoundsZoom: function(t, e, i) { t = o.latLngBounds(t); var n, s = this.getMinZoom() - (e ? 1 : 0),
+                    r = this.getMaxZoom(),
+                    a = this.getSize(),
+                    h = t.getNorthWest(),
+                    l = t.getSouthEast(),
+                    u = !0;
+                i = o.point(i || [0, 0]);
+                do s++, n = this.project(l, s).subtract(this.project(h, s)).add(i).floor(), u = e ? n.x < a.x || n.y < a.y : a.contains(n); while (u && r >= s); return u && e ? null : e ? s : s - 1 },
+            getSize: function() { return (!this._size || this._sizeChanged) && (this._size = new o.Point(this._container.clientWidth, this._container.clientHeight), this._sizeChanged = !1), this._size.clone() },
+            getPixelBounds: function(t, e) { var i = this._getTopLeftPoint(t, e); return new o.Bounds(i, i.add(this.getSize())) },
+            getPixelOrigin: function() { return this._checkIfLoaded(), this._pixelOrigin },
+            getPixelWorldBounds: function(t) { return this.options.crs.getProjectedBounds(t === i ? this.getZoom() : t) },
+            getPane: function(t) { return "string" == typeof t ? this._panes[t] : t },
+            getPanes: function() { return this._panes },
+            getContainer: function() { return this._container },
+            getZoomScale: function(t, e) { var n = this.options.crs; return e = e === i ? this._zoom : e, n.scale(t) / n.scale(e) },
+            getScaleZoom: function(t, e) { var n = this.options.crs; return e = e === i ? this._zoom : e, n.zoom(t * n.scale(e)) },
+            project: function(t, e) { return e = e === i ? this._zoom : e, this.options.crs.latLngToPoint(o.latLng(t), e) },
+            unproject: function(t, e) { return e = e === i ? this._zoom : e, this.options.crs.pointToLatLng(o.point(t), e) },
+            layerPointToLatLng: function(t) { var e = o.point(t).add(this.getPixelOrigin()); return this.unproject(e) },
+            latLngToLayerPoint: function(t) { var e = this.project(o.latLng(t))._round(); return e._subtract(this.getPixelOrigin()) },
+            wrapLatLng: function(t) { return this.options.crs.wrapLatLng(o.latLng(t)) },
+            distance: function(t, e) { return this.options.crs.distance(o.latLng(t), o.latLng(e)) },
+            containerPointToLayerPoint: function(t) { return o.point(t).subtract(this._getMapPanePos()) },
+            layerPointToContainerPoint: function(t) { return o.point(t).add(this._getMapPanePos()) },
+            containerPointToLatLng: function(t) { var e = this.containerPointToLayerPoint(o.point(t)); return this.layerPointToLatLng(e) },
+            latLngToContainerPoint: function(t) { return this.layerPointToContainerPoint(this.latLngToLayerPoint(o.latLng(t))) },
+            mouseEventToContainerPoint: function(t) { return o.DomEvent.getMousePosition(t, this._container) },
+            mouseEventToLayerPoint: function(t) { return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(t)) },
+            mouseEventToLatLng: function(t) { return this.layerPointToLatLng(this.mouseEventToLayerPoint(t)) },
+            _initContainer: function(t) { var e = this._container = o.DomUtil.get(t); if (!e) throw new Error("Map container not found."); if (e._leaflet) throw new Error("Map container is already initialized.");
+                o.DomEvent.addListener(e, "scroll", this._onScroll, this), e._leaflet = !0 },
+            _initLayout: function() { var t = this._container;
+                this._fadeAnimated = this.options.fadeAnimation && o.Browser.any3d, o.DomUtil.addClass(t, "leaflet-container" + (o.Browser.touch ? " leaflet-touch" : "") + (o.Browser.retina ? " leaflet-retina" : "") + (o.Browser.ielt9 ? " leaflet-oldie" : "") + (o.Browser.safari ? " leaflet-safari" : "") + (this._fadeAnimated ? " leaflet-fade-anim" : "")); var e = o.DomUtil.getStyle(t, "position"); "absolute" !== e && "relative" !== e && "fixed" !== e && (t.style.position = "relative"), this._initPanes(), this._initControlPos && this._initControlPos() },
+            _initPanes: function() { var t = this._panes = {};
+                this._paneRenderers = {}, this._mapPane = this.createPane("mapPane", this._container), o.DomUtil.setPosition(this._mapPane, new o.Point(0, 0)), this.createPane("tilePane"), this.createPane("shadowPane"), this.createPane("overlayPane"), this.createPane("markerPane"), this.createPane("popupPane"), this.options.markerZoomAnimation || (o.DomUtil.addClass(t.markerPane, "leaflet-zoom-hide"), o.DomUtil.addClass(t.shadowPane, "leaflet-zoom-hide")) },
+            _resetView: function(t, e) { o.DomUtil.setPosition(this._mapPane, new o.Point(0, 0)); var i = !this._loaded;
+                this._loaded = !0, e = this._limitZoom(e); var n = this._zoom !== e;
+                this._moveStart(n)._move(t, e)._moveEnd(n), this.fire("viewreset"), i && this.fire("load") },
+            _moveStart: function(t) { return t && this.fire("zoomstart"), this.fire("movestart") },
+            _move: function(t, e, n) { e === i && (e = this._zoom); var o = this._zoom !== e; return this._zoom = e, this._lastCenter = t, this._pixelOrigin = this._getNewPixelOrigin(t), o && this.fire("zoom", n), this.fire("move", n) },
+            _moveEnd: function(t) { return t && this.fire("zoomend"), this.fire("moveend") },
+            _rawPanBy: function(t) { o.DomUtil.setPosition(this._mapPane, this._getMapPanePos().subtract(t)) },
+            _getZoomSpan: function() { return this.getMaxZoom() - this.getMinZoom() },
+            _panInsideMaxBounds: function() { this._enforcingBounds || this.panInsideBounds(this.options.maxBounds) },
+            _checkIfLoaded: function() { if (!this._loaded) throw new Error("Set map center and zoom first.") },
+            _initEvents: function(e) { if (o.DomEvent) { this._targets = {}, this._targets[o.stamp(this._container)] = this; var i = e ? "off" : "on";
+                    o.DomEvent[i](this._container, "click dblclick mousedown mouseup mouseover mouseout mousemove contextmenu keypress", this._handleDOMEvent, this), this.options.trackResize && o.DomEvent[i](t, "resize", this._onResize, this), o.Browser.any3d && this.options.transform3DLimit && this[i]("moveend", this._onMoveEnd) } },
+            _onResize: function() { o.Util.cancelAnimFrame(this._resizeRequest), this._resizeRequest = o.Util.requestAnimFrame(function() { this.invalidateSize({ debounceMoveend: !0 }) }, this) },
+            _onScroll: function() { this._container.scrollTop = 0, this._container.scrollLeft = 0 },
+            _onMoveEnd: function() { var t = this._getMapPanePos();
+                Math.max(Math.abs(t.x), Math.abs(t.y)) >= this.options.transform3DLimit && this._resetView(this.getCenter(), this.getZoom()) },
+            _findEventTargets: function(t, e) { for (var i, n = [], s = "mouseout" === e || "mouseover" === e, r = t.target || t.srcElement; r;) { if (i = this._targets[o.stamp(r)], i && i.listens(e, !0)) { if (s && !o.DomEvent._isExternalTarget(r, t)) break; if (n.push(i), s) break } if (r === this._container) break;
+                    r = r.parentNode } return n.length || s || !o.DomEvent._isExternalTarget(r, t) || (n = [this]), n },
+            _handleDOMEvent: function(t) { if (this._loaded && !o.DomEvent._skipped(t)) { var e = "keypress" === t.type && 13 === t.keyCode ? "click" : t.type; if ("click" === t.type) { var i = o.Util.extend({}, t);
+                        i.type = "preclick", this._handleDOMEvent(i) } "mousedown" === e && o.DomUtil.preventOutline(t.target || t.srcElement), this._fireDOMEvent(t, e) } },
+            _fireDOMEvent: function(t, e, i) { if (!t._stopped && (i = (i || []).concat(this._findEventTargets(t, e)), i.length)) { var n = i[0]; if ("contextmenu" === e && n.listens(e, !0) && o.DomEvent.preventDefault(t), "click" !== t.type && "preclick" !== t.type || t._simulated || !this._draggableMoved(n)) { var s = { originalEvent: t }; if ("keypress" !== t.type) { var r = n instanceof o.Marker;
+                            s.containerPoint = r ? this.latLngToContainerPoint(n.getLatLng()) : this.mouseEventToContainerPoint(t), s.layerPoint = this.containerPointToLayerPoint(s.containerPoint), s.latlng = r ? n.getLatLng() : this.layerPointToLatLng(s.layerPoint) } for (var a = 0; a < i.length; a++)
+                            if (i[a].fire(e, s, !0), s.originalEvent._stopped || i[a].options.nonBubblingEvents && -1 !== o.Util.indexOf(i[a].options.nonBubblingEvents, e)) return } } },
+            _draggableMoved: function(t) { return t = t.options.draggable ? t : this, t.dragging && t.dragging.moved() || this.boxZoom && this.boxZoom.moved() },
+            _clearHandlers: function() { for (var t = 0, e = this._handlers.length; e > t; t++) this._handlers[t].disable() },
+            whenReady: function(t, e) { return this._loaded ? t.call(e || this, { target: this }) : this.on("load", t, e), this },
+            _getMapPanePos: function() { return o.DomUtil.getPosition(this._mapPane) || new o.Point(0, 0) },
+            _moved: function() { var t = this._getMapPanePos(); return t && !t.equals([0, 0]) },
+            _getTopLeftPoint: function(t, e) { var n = t && e !== i ? this._getNewPixelOrigin(t, e) : this.getPixelOrigin(); return n.subtract(this._getMapPanePos()) },
+            _getNewPixelOrigin: function(t, e) { var i = this.getSize()._divideBy(2); return this.project(t, e)._subtract(i)._add(this._getMapPanePos())._round() },
+            _latLngToNewLayerPoint: function(t, e, i) {
+                var n = this._getNewPixelOrigin(i, e);
+                return this.project(t, e)._subtract(n)
+            },
+            _getCenterLayerPoint: function() { return this.containerPointToLayerPoint(this.getSize()._divideBy(2)) },
+            _getCenterOffset: function(t) { return this.latLngToLayerPoint(t).subtract(this._getCenterLayerPoint()) },
+            _limitCenter: function(t, e, i) { if (!i) return t; var n = this.project(t, e),
+                    s = this.getSize().divideBy(2),
+                    r = new o.Bounds(n.subtract(s), n.add(s)),
+                    a = this._getBoundsOffset(r, i, e); return this.unproject(n.add(a), e) },
+            _limitOffset: function(t, e) { if (!e) return t; var i = this.getPixelBounds(),
+                    n = new o.Bounds(i.min.add(t), i.max.add(t)); return t.add(this._getBoundsOffset(n, e)) },
+            _getBoundsOffset: function(t, e, i) { var n = this.project(e.getNorthWest(), i).subtract(t.min),
+                    s = this.project(e.getSouthEast(), i).subtract(t.max),
+                    r = this._rebound(n.x, -s.x),
+                    a = this._rebound(n.y, -s.y); return new o.Point(r, a) },
+            _rebound: function(t, e) { return t + e > 0 ? Math.round(t - e) / 2 : Math.max(0, Math.ceil(t)) - Math.max(0, Math.floor(e)) },
+            _limitZoom: function(t) { var e = this.getMinZoom(),
+                    i = this.getMaxZoom(); return o.Browser.any3d || (t = Math.round(t)), Math.max(e, Math.min(i, t)) }
+        }), o.map = function(t, e) { return new o.Map(t, e) }, o.Layer = o.Evented.extend({ options: { pane: "overlayPane", nonBubblingEvents: [] }, addTo: function(t) { return t.addLayer(this), this }, remove: function() { return this.removeFrom(this._map || this._mapToAdd) }, removeFrom: function(t) { return t && t.removeLayer(this), this }, getPane: function(t) { return this._map.getPane(t ? this.options[t] || t : this.options.pane) }, addInteractiveTarget: function(t) { return this._map._targets[o.stamp(t)] = this, this }, removeInteractiveTarget: function(t) { return delete this._map._targets[o.stamp(t)], this }, _layerAdd: function(t) { var e = t.target;
+                e.hasLayer(this) && (this._map = e, this._zoomAnimated = e._zoomAnimated, this.getEvents && e.on(this.getEvents(), this), this.onAdd(e), this.getAttribution && this._map.attributionControl && this._map.attributionControl.addAttribution(this.getAttribution()), this.fire("add"), e.fire("layeradd", { layer: this })) } }), o.Map.include({ addLayer: function(t) { var e = o.stamp(t); return this._layers[e] ? t : (this._layers[e] = t, t._mapToAdd = this, t.beforeAdd && t.beforeAdd(this), this.whenReady(t._layerAdd, t), this) }, removeLayer: function(t) { var e = o.stamp(t); return this._layers[e] ? (this._loaded && t.onRemove(this), t.getAttribution && this.attributionControl && this.attributionControl.removeAttribution(t.getAttribution()), t.getEvents && this.off(t.getEvents(), t), delete this._layers[e], this._loaded && (this.fire("layerremove", { layer: t }), t.fire("remove")), t._map = t._mapToAdd = null, this) : this }, hasLayer: function(t) { return !!t && o.stamp(t) in this._layers }, eachLayer: function(t, e) { for (var i in this._layers) t.call(e, this._layers[i]); return this }, _addLayers: function(t) { t = t ? o.Util.isArray(t) ? t : [t] : []; for (var e = 0, i = t.length; i > e; e++) this.addLayer(t[e]) }, _addZoomLimit: function(t) {
+                (isNaN(t.options.maxZoom) || !isNaN(t.options.minZoom)) && (this._zoomBoundLayers[o.stamp(t)] = t, this._updateZoomLevels()) }, _removeZoomLimit: function(t) { var e = o.stamp(t);
+                this._zoomBoundLayers[e] && (delete this._zoomBoundLayers[e], this._updateZoomLevels()) }, _updateZoomLevels: function() { var t = 1 / 0,
+                    e = -(1 / 0),
+                    n = this._getZoomSpan(); for (var o in this._zoomBoundLayers) { var s = this._zoomBoundLayers[o].options;
+                    t = s.minZoom === i ? t : Math.min(t, s.minZoom), e = s.maxZoom === i ? e : Math.max(e, s.maxZoom) }
+                this._layersMaxZoom = e === -(1 / 0) ? i : e, this._layersMinZoom = t === 1 / 0 ? i : t, n !== this._getZoomSpan() && this.fire("zoomlevelschange") } }), o.Projection.Mercator = { R: 6378137, R_MINOR: 6356752.314245179, bounds: o.bounds([-20037508.34279, -15496570.73972], [20037508.34279, 18764656.23138]), project: function(t) { var e = Math.PI / 180,
+                    i = this.R,
+                    n = t.lat * e,
+                    s = this.R_MINOR / i,
+                    r = Math.sqrt(1 - s * s),
+                    a = r * Math.sin(n),
+                    h = Math.tan(Math.PI / 4 - n / 2) / Math.pow((1 - a) / (1 + a), r / 2); return n = -i * Math.log(Math.max(h, 1e-10)), new o.Point(t.lng * e * i, n) }, unproject: function(t) { for (var e, i = 180 / Math.PI, n = this.R, s = this.R_MINOR / n, r = Math.sqrt(1 - s * s), a = Math.exp(-t.y / n), h = Math.PI / 2 - 2 * Math.atan(a), l = 0, u = .1; 15 > l && Math.abs(u) > 1e-7; l++) e = r * Math.sin(h), e = Math.pow((1 - e) / (1 + e), r / 2), u = Math.PI / 2 - 2 * Math.atan(a * e) - h, h += u; return new o.LatLng(h * i, t.x * i / n) } }, o.CRS.EPSG3395 = o.extend({}, o.CRS.Earth, { code: "EPSG:3395", projection: o.Projection.Mercator, transformation: function() { var t = .5 / (Math.PI * o.Projection.Mercator.R); return new o.Transformation(t, .5, -t, .5) }() }), o.GridLayer = o.Layer.extend({ options: { pane: "tilePane", tileSize: 256, opacity: 1, zIndex: 1, updateWhenIdle: o.Browser.mobile, updateInterval: 200, attribution: null, bounds: null, minZoom: 0 }, initialize: function(t) { t = o.setOptions(this, t) }, onAdd: function() { this._initContainer(), this._levels = {}, this._tiles = {}, this._resetView(), this._update() }, beforeAdd: function(t) { t._addZoomLimit(this) }, onRemove: function(t) { o.DomUtil.remove(this._container), t._removeZoomLimit(this), this._container = null, this._tileZoom = null }, bringToFront: function() { return this._map && (o.DomUtil.toFront(this._container), this._setAutoZIndex(Math.max)), this }, bringToBack: function() { return this._map && (o.DomUtil.toBack(this._container), this._setAutoZIndex(Math.min)), this }, getAttribution: function() { return this.options.attribution }, getContainer: function() { return this._container }, setOpacity: function(t) { return this.options.opacity = t, this._updateOpacity(), this }, setZIndex: function(t) { return this.options.zIndex = t, this._updateZIndex(), this }, isLoading: function() { return this._loading }, redraw: function() { return this._map && (this._removeAllTiles(), this._update()), this }, getEvents: function() { var t = { viewreset: this._resetAll, zoom: this._resetView, moveend: this._onMoveEnd }; return this.options.updateWhenIdle || (this._onMove || (this._onMove = o.Util.throttle(this._onMoveEnd, this.options.updateInterval, this)), t.move = this._onMove), this._zoomAnimated && (t.zoomanim = this._animateZoom), t }, createTile: function() { return e.createElement("div") }, getTileSize: function() { var t = this.options.tileSize; return t instanceof o.Point ? t : new o.Point(t, t) }, _updateZIndex: function() { this._container && this.options.zIndex !== i && null !== this.options.zIndex && (this._container.style.zIndex = this.options.zIndex) }, _setAutoZIndex: function(t) { for (var e, i = this.getPane().children, n = -t(-(1 / 0), 1 / 0), o = 0, s = i.length; s > o; o++) e = i[o].style.zIndex, i[o] !== this._container && e && (n = t(n, +e));
+                isFinite(n) && (this.options.zIndex = n + t(-1, 1), this._updateZIndex()) }, _updateOpacity: function() { if (this._map && !o.Browser.ielt9 && this._map._fadeAnimated) { o.DomUtil.setOpacity(this._container, this.options.opacity); var t = +new Date,
+                        e = !1,
+                        i = !1; for (var n in this._tiles) { var s = this._tiles[n]; if (s.current && s.loaded) { var r = Math.min(1, (t - s.loaded) / 200);
+                            o.DomUtil.setOpacity(s.el, r), 1 > r ? e = !0 : (s.active && (i = !0), s.active = !0) } }
+                    i && !this._noPrune && this._pruneTiles(), e && (o.Util.cancelAnimFrame(this._fadeFrame), this._fadeFrame = o.Util.requestAnimFrame(this._updateOpacity, this)) } }, _initContainer: function() { this._container || (this._container = o.DomUtil.create("div", "leaflet-layer"), this._updateZIndex(), this.options.opacity < 1 && this._updateOpacity(), this.getPane().appendChild(this._container)) }, _updateLevels: function() { var t = this._tileZoom,
+                    e = this.options.maxZoom; for (var i in this._levels) this._levels[i].el.children.length || i === t ? this._levels[i].el.style.zIndex = e - Math.abs(t - i) : (o.DomUtil.remove(this._levels[i].el), delete this._levels[i]); var n = this._levels[t],
+                    s = this._map; return n || (n = this._levels[t] = {}, n.el = o.DomUtil.create("div", "leaflet-tile-container leaflet-zoom-animated", this._container), n.el.style.zIndex = e, n.origin = s.project(s.unproject(s.getPixelOrigin()), t).round(), n.zoom = t, this._setZoomTransform(n, s.getCenter(), s.getZoom()), o.Util.falseFn(n.el.offsetWidth)), this._level = n, n }, _pruneTiles: function() { var t, e, i = this._map.getZoom(); if (i > this.options.maxZoom || i < this.options.minZoom) return this._removeAllTiles(); for (t in this._tiles) e = this._tiles[t], e.retain = e.current; for (t in this._tiles)
+                    if (e = this._tiles[t], e.current && !e.active) { var n = e.coords;
+                        this._retainParent(n.x, n.y, n.z, n.z - 5) || this._retainChildren(n.x, n.y, n.z, n.z + 2) }
+                for (t in this._tiles) this._tiles[t].retain || this._removeTile(t) }, _removeAllTiles: function() { for (var t in this._tiles) this._removeTile(t) }, _resetAll: function() { for (var t in this._levels) o.DomUtil.remove(this._levels[t].el), delete this._levels[t];
+                this._removeAllTiles(), this._tileZoom = null, this._resetView() }, _retainParent: function(t, e, i, n) { var o = Math.floor(t / 2),
+                    s = Math.floor(e / 2),
+                    r = i - 1,
+                    a = o + ":" + s + ":" + r,
+                    h = this._tiles[a]; return h && h.active ? (h.retain = !0, !0) : (h && h.loaded && (h.retain = !0), r > n ? this._retainParent(o, s, r, n) : !1) }, _retainChildren: function(t, e, i, n) { for (var o = 2 * t; 2 * t + 2 > o; o++)
+                    for (var s = 2 * e; 2 * e + 2 > s; s++) { var r = o + ":" + s + ":" + (i + 1),
+                            a = this._tiles[r];
+                        a && a.active ? a.retain = !0 : (a && a.loaded && (a.retain = !0), n > i + 1 && this._retainChildren(o, s, i + 1, n)) } }, _resetView: function(t) { var e = t && (t.pinch || t.flyTo);
+                this._setView(this._map.getCenter(), this._map.getZoom(), e, e) }, _animateZoom: function(t) { this._setView(t.center, t.zoom, !0, t.noUpdate) }, _setView: function(t, e, n, o) { var s = Math.round(e);
+                (this.options.maxZoom !== i && s > this.options.maxZoom || this.options.minZoom !== i && s < this.options.minZoom) && (s = i); var r = s !== this._tileZoom;
+                (!o || r) && (this._tileZoom = s, this._abortLoading && this._abortLoading(), this._updateLevels(), this._resetGrid(), s !== i && this._update(t), n || this._pruneTiles(), this._noPrune = !!n), this._setZoomTransforms(t, e) }, _setZoomTransforms: function(t, e) { for (var i in this._levels) this._setZoomTransform(this._levels[i], t, e) }, _setZoomTransform: function(t, e, i) { var n = this._map.getZoomScale(i, t.zoom),
+                    s = t.origin.multiplyBy(n).subtract(this._map._getNewPixelOrigin(e, i)).round();
+                o.Browser.any3d ? o.DomUtil.setTransform(t.el, s, n) : o.DomUtil.setPosition(t.el, s) }, _resetGrid: function() { var t = this._map,
+                    e = t.options.crs,
+                    i = this._tileSize = this.getTileSize(),
+                    n = this._tileZoom,
+                    o = this._map.getPixelWorldBounds(this._tileZoom);
+                o && (this._globalTileRange = this._pxBoundsToTileRange(o)), this._wrapX = e.wrapLng && !this.options.noWrap && [Math.floor(t.project([0, e.wrapLng[0]], n).x / i.x), Math.ceil(t.project([0, e.wrapLng[1]], n).x / i.y)], this._wrapY = e.wrapLat && !this.options.noWrap && [Math.floor(t.project([e.wrapLat[0], 0], n).y / i.x), Math.ceil(t.project([e.wrapLat[1], 0], n).y / i.y)] }, _onMoveEnd: function() { this._map && !this._map._animatingZoom && this._resetView() }, _getTiledPixelBounds: function(t, e, i) { var n = this._map,
+                    s = n.getZoomScale(e, i),
+                    r = n.project(t, i).floor(),
+                    a = n.getSize().divideBy(2 * s); return new o.Bounds(r.subtract(a), r.add(a)) }, _update: function(t) { var n = this._map; if (n) { var s = n.getZoom(); if (t === i && (t = n.getCenter()), this._tileZoom !== i) { var r = this._getTiledPixelBounds(t, s, this._tileZoom),
+                            a = this._pxBoundsToTileRange(r),
+                            h = a.getCenter(),
+                            l = []; for (var u in this._tiles) this._tiles[u].current = !1; if (Math.abs(s - this._tileZoom) > 1) return void this._setView(t, s); for (var c = a.min.y; c <= a.max.y; c++)
+                            for (var d = a.min.x; d <= a.max.x; d++) { var _ = new o.Point(d, c); if (_.z = this._tileZoom, this._isValidTile(_)) { var m = this._tiles[this._tileCoordsToKey(_)];
+                                    m ? m.current = !0 : l.push(_) } }
+                        if (l.sort(function(t, e) { return t.distanceTo(h) - e.distanceTo(h) }), 0 !== l.length) { this._loading || (this._loading = !0, this.fire("loading")); var p = e.createDocumentFragment(); for (d = 0; d < l.length; d++) this._addTile(l[d], p);
+                            this._level.el.appendChild(p) } } } }, _isValidTile: function(t) { var e = this._map.options.crs; if (!e.infinite) { var i = this._globalTileRange; if (!e.wrapLng && (t.x < i.min.x || t.x > i.max.x) || !e.wrapLat && (t.y < i.min.y || t.y > i.max.y)) return !1 } if (!this.options.bounds) return !0; var n = this._tileCoordsToBounds(t); return o.latLngBounds(this.options.bounds).overlaps(n) }, _keyToBounds: function(t) { return this._tileCoordsToBounds(this._keyToTileCoords(t)) }, _tileCoordsToBounds: function(t) { var e = this._map,
+                    i = this.getTileSize(),
+                    n = t.scaleBy(i),
+                    s = n.add(i),
+                    r = e.wrapLatLng(e.unproject(n, t.z)),
+                    a = e.wrapLatLng(e.unproject(s, t.z)); return new o.LatLngBounds(r, a) }, _tileCoordsToKey: function(t) { return t.x + ":" + t.y + ":" + t.z }, _keyToTileCoords: function(t) { var e = t.split(":"),
+                    i = new o.Point(+e[0], +e[1]); return i.z = +e[2], i }, _removeTile: function(t) { var e = this._tiles[t];
+                e && (o.DomUtil.remove(e.el), delete this._tiles[t], this.fire("tileunload", { tile: e.el, coords: this._keyToTileCoords(t) })) }, _initTile: function(t) { o.DomUtil.addClass(t, "leaflet-tile"); var e = this.getTileSize();
+                t.style.width = e.x + "px", t.style.height = e.y + "px", t.onselectstart = o.Util.falseFn, t.onmousemove = o.Util.falseFn, o.Browser.ielt9 && this.options.opacity < 1 && o.DomUtil.setOpacity(t, this.options.opacity), o.Browser.android && !o.Browser.android23 && (t.style.WebkitBackfaceVisibility = "hidden") }, _addTile: function(t, e) { var i = this._getTilePos(t),
+                    n = this._tileCoordsToKey(t),
+                    s = this.createTile(this._wrapCoords(t), o.bind(this._tileReady, this, t));
+                this._initTile(s), this.createTile.length < 2 && o.Util.requestAnimFrame(o.bind(this._tileReady, this, t, null, s)), o.DomUtil.setPosition(s, i), this._tiles[n] = { el: s, coords: t, current: !0 }, e.appendChild(s), this.fire("tileloadstart", { tile: s, coords: t }) }, _tileReady: function(t, e, i) { if (this._map) { e && this.fire("tileerror", { error: e, tile: i, coords: t }); var n = this._tileCoordsToKey(t);
+                    i = this._tiles[n], i && (i.loaded = +new Date, this._map._fadeAnimated ? (o.DomUtil.setOpacity(i.el, 0), o.Util.cancelAnimFrame(this._fadeFrame), this._fadeFrame = o.Util.requestAnimFrame(this._updateOpacity, this)) : (i.active = !0, this._pruneTiles()), o.DomUtil.addClass(i.el, "leaflet-tile-loaded"), this.fire("tileload", { tile: i.el, coords: t }), this._noTilesToLoad() && (this._loading = !1, this.fire("load"))) } }, _getTilePos: function(t) { return t.scaleBy(this.getTileSize()).subtract(this._level.origin) }, _wrapCoords: function(t) { var e = new o.Point(this._wrapX ? o.Util.wrapNum(t.x, this._wrapX) : t.x, this._wrapY ? o.Util.wrapNum(t.y, this._wrapY) : t.y); return e.z = t.z, e }, _pxBoundsToTileRange: function(t) { var e = this.getTileSize(); return new o.Bounds(t.min.unscaleBy(e).floor(), t.max.unscaleBy(e).ceil().subtract([1, 1])) }, _noTilesToLoad: function() { for (var t in this._tiles)
+                    if (!this._tiles[t].loaded) return !1;
+                return !0 } }), o.gridLayer = function(t) { return new o.GridLayer(t) }, o.TileLayer = o.GridLayer.extend({ options: { maxZoom: 18, subdomains: "abc", errorTileUrl: "", zoomOffset: 0, maxNativeZoom: null, tms: !1, zoomReverse: !1, detectRetina: !1, crossOrigin: !1 }, initialize: function(t, e) { this._url = t, e = o.setOptions(this, e), e.detectRetina && o.Browser.retina && e.maxZoom > 0 && (e.tileSize = Math.floor(e.tileSize / 2), e.zoomOffset++, e.minZoom = Math.max(0, e.minZoom), e.maxZoom--), "string" == typeof e.subdomains && (e.subdomains = e.subdomains.split("")), o.Browser.android || this.on("tileunload", this._onTileRemove) }, setUrl: function(t, e) { return this._url = t, e || this.redraw(), this }, createTile: function(t, i) { var n = e.createElement("img"); return o.DomEvent.on(n, "load", o.bind(this._tileOnLoad, this, i, n)), o.DomEvent.on(n, "error", o.bind(this._tileOnError, this, i, n)), this.options.crossOrigin && (n.crossOrigin = ""), n.alt = "", n.src = this.getTileUrl(t), n }, getTileUrl: function(t) { return o.Util.template(this._url, o.extend({ r: this.options.detectRetina && o.Browser.retina && this.options.maxZoom > 0 ? "@2x" : "", s: this._getSubdomain(t), x: t.x, y: this.options.tms ? this._globalTileRange.max.y - t.y : t.y, z: this._getZoomForUrl() }, this.options)) }, _tileOnLoad: function(t, e) { o.Browser.ielt9 ? setTimeout(o.bind(t, this, null, e), 0) : t(null, e) }, _tileOnError: function(t, e, i) { var n = this.options.errorTileUrl;
+                n && (e.src = n), t(i, e) }, getTileSize: function() { var t = this._map,
+                    e = o.GridLayer.prototype.getTileSize.call(this),
+                    i = this._tileZoom + this.options.zoomOffset,
+                    n = this.options.maxNativeZoom; return null !== n && i > n ? e.divideBy(t.getZoomScale(n, i)).round() : e }, _onTileRemove: function(t) { t.tile.onload = null }, _getZoomForUrl: function() { var t = this.options,
+                    e = this._tileZoom; return t.zoomReverse && (e = t.maxZoom - e), e += t.zoomOffset, null !== t.maxNativeZoom ? Math.min(e, t.maxNativeZoom) : e }, _getSubdomain: function(t) { var e = Math.abs(t.x + t.y) % this.options.subdomains.length; return this.options.subdomains[e] }, _abortLoading: function() { var t, e; for (t in this._tiles) this._tiles[t].coords.z !== this._tileZoom && (e = this._tiles[t].el, e.onload = o.Util.falseFn, e.onerror = o.Util.falseFn, e.complete || (e.src = o.Util.emptyImageUrl, o.DomUtil.remove(e))) } }), o.tileLayer = function(t, e) { return new o.TileLayer(t, e) }, o.TileLayer.WMS = o.TileLayer.extend({ defaultWmsParams: { service: "WMS", request: "GetMap", version: "1.1.1", layers: "", styles: "", format: "image/jpeg", transparent: !1 }, options: { crs: null, uppercase: !1 }, initialize: function(t, e) { this._url = t; var i = o.extend({}, this.defaultWmsParams); for (var n in e) n in this.options || (i[n] = e[n]);
+                e = o.setOptions(this, e), i.width = i.height = e.tileSize * (e.detectRetina && o.Browser.retina ? 2 : 1), this.wmsParams = i }, onAdd: function(t) { this._crs = this.options.crs || t.options.crs, this._wmsVersion = parseFloat(this.wmsParams.version); var e = this._wmsVersion >= 1.3 ? "crs" : "srs";
+                this.wmsParams[e] = this._crs.code, o.TileLayer.prototype.onAdd.call(this, t) }, getTileUrl: function(t) { var e = this._tileCoordsToBounds(t),
+                    i = this._crs.project(e.getNorthWest()),
+                    n = this._crs.project(e.getSouthEast()),
+                    s = (this._wmsVersion >= 1.3 && this._crs === o.CRS.EPSG4326 ? [n.y, i.x, i.y, n.x] : [i.x, n.y, n.x, i.y]).join(","),
+                    r = o.TileLayer.prototype.getTileUrl.call(this, t); return r + o.Util.getParamString(this.wmsParams, r, this.options.uppercase) + (this.options.uppercase ? "&BBOX=" : "&bbox=") + s }, setParams: function(t, e) { return o.extend(this.wmsParams, t), e || this.redraw(), this } }), o.tileLayer.wms = function(t, e) { return new o.TileLayer.WMS(t, e) }, o.ImageOverlay = o.Layer.extend({ options: { opacity: 1, alt: "", interactive: !1 }, initialize: function(t, e, i) { this._url = t, this._bounds = o.latLngBounds(e), o.setOptions(this, i) }, onAdd: function() { this._image || (this._initImage(), this.options.opacity < 1 && this._updateOpacity()), this.options.interactive && (o.DomUtil.addClass(this._image, "leaflet-interactive"), this.addInteractiveTarget(this._image)), this.getPane().appendChild(this._image), this._reset() }, onRemove: function() { o.DomUtil.remove(this._image), this.options.interactive && this.removeInteractiveTarget(this._image) }, setOpacity: function(t) { return this.options.opacity = t, this._image && this._updateOpacity(), this }, setStyle: function(t) { return t.opacity && this.setOpacity(t.opacity), this }, bringToFront: function() { return this._map && o.DomUtil.toFront(this._image), this }, bringToBack: function() { return this._map && o.DomUtil.toBack(this._image), this }, setUrl: function(t) { return this._url = t, this._image && (this._image.src = t), this }, setBounds: function(t) { return this._bounds = t, this._map && this._reset(), this }, getAttribution: function() { return this.options.attribution }, getEvents: function() { var t = { zoom: this._reset, viewreset: this._reset }; return this._zoomAnimated && (t.zoomanim = this._animateZoom), t }, getBounds: function() { return this._bounds }, getElement: function() { return this._image }, _initImage: function() { var t = this._image = o.DomUtil.create("img", "leaflet-image-layer " + (this._zoomAnimated ? "leaflet-zoom-animated" : ""));
+                t.onselectstart = o.Util.falseFn, t.onmousemove = o.Util.falseFn, t.onload = o.bind(this.fire, this, "load"), this.options.crossOrigin && (t.crossOrigin = ""), t.src = this._url, t.alt = this.options.alt }, _animateZoom: function(t) { var e = this._map.getZoomScale(t.zoom),
+                    i = this._map._latLngToNewLayerPoint(this._bounds.getNorthWest(), t.zoom, t.center);
+                o.DomUtil.setTransform(this._image, i, e) }, _reset: function() { var t = this._image,
+                    e = new o.Bounds(this._map.latLngToLayerPoint(this._bounds.getNorthWest()), this._map.latLngToLayerPoint(this._bounds.getSouthEast())),
+                    i = e.getSize();
+                o.DomUtil.setPosition(t, e.min), t.style.width = i.x + "px", t.style.height = i.y + "px" }, _updateOpacity: function() { o.DomUtil.setOpacity(this._image, this.options.opacity) } }), o.imageOverlay = function(t, e, i) { return new o.ImageOverlay(t, e, i) }, o.Icon = o.Class.extend({ initialize: function(t) { o.setOptions(this, t) }, createIcon: function(t) { return this._createIcon("icon", t) }, createShadow: function(t) { return this._createIcon("shadow", t) }, _createIcon: function(t, e) { var i = this._getIconUrl(t); if (!i) { if ("icon" === t) throw new Error("iconUrl not set in Icon options (see the docs)."); return null } var n = this._createImg(i, e && "IMG" === e.tagName ? e : null); return this._setIconStyles(n, t), n }, _setIconStyles: function(t, e) { var i = this.options,
+                    n = o.point(i[e + "Size"]),
+                    s = o.point("shadow" === e && i.shadowAnchor || i.iconAnchor || n && n.divideBy(2, !0));
+                t.className = "leaflet-marker-" + e + " " + (i.className || ""), s && (t.style.marginLeft = -s.x + "px", t.style.marginTop = -s.y + "px"), n && (t.style.width = n.x + "px", t.style.height = n.y + "px") }, _createImg: function(t, i) { return i = i || e.createElement("img"), i.src = t, i }, _getIconUrl: function(t) { return o.Browser.retina && this.options[t + "RetinaUrl"] || this.options[t + "Url"] } }), o.icon = function(t) { return new o.Icon(t) }, o.Icon.Default = o.Icon.extend({ options: { iconSize: [25, 41], iconAnchor: [12, 41], popupAnchor: [1, -34], shadowSize: [41, 41] }, _getIconUrl: function(t) { var e = t + "Url"; if (this.options[e]) return this.options[e]; var i = o.Icon.Default.imagePath; if (!i) throw new Error("Couldn't autodetect L.Icon.Default.imagePath, set it manually."); return i + "/marker-" + t + (o.Browser.retina && "icon" === t ? "-2x" : "") + ".png" } }), o.Icon.Default.imagePath = function() { var t, i, n, o, s = e.getElementsByTagName("script"),
+                r = /[\/^]leaflet[\-\._]?([\w\-\._]*)\.js\??/; for (t = 0, i = s.length; i > t; t++)
+                if (n = s[t].src || "", n.match(r)) return o = n.split(r)[0], (o ? o + "/" : "") + "images" }(), o.Marker = o.Layer.extend({ options: { pane: "markerPane", nonBubblingEvents: ["click", "dblclick", "mouseover", "mouseout", "contextmenu"], icon: new o.Icon.Default, interactive: !0, keyboard: !0, zIndexOffset: 0, opacity: 1, riseOffset: 250 }, initialize: function(t, e) { o.setOptions(this, e), this._latlng = o.latLng(t) }, onAdd: function(t) { this._zoomAnimated = this._zoomAnimated && t.options.markerZoomAnimation, this._initIcon(), this.update() }, onRemove: function() { this.dragging && this.dragging.enabled() && (this.options.draggable = !0, this.dragging.removeHooks()), this._removeIcon(), this._removeShadow() }, getEvents: function() { var t = { zoom: this.update, viewreset: this.update }; return this._zoomAnimated && (t.zoomanim = this._animateZoom), t }, getLatLng: function() { return this._latlng }, setLatLng: function(t) { var e = this._latlng; return this._latlng = o.latLng(t), this.update(), this.fire("move", { oldLatLng: e, latlng: this._latlng }) }, setZIndexOffset: function(t) { return this.options.zIndexOffset = t, this.update() }, setIcon: function(t) { return this.options.icon = t, this._map && (this._initIcon(), this.update()), this._popup && this.bindPopup(this._popup, this._popup.options), this }, getElement: function() { return this._icon }, update: function() { if (this._icon) { var t = this._map.latLngToLayerPoint(this._latlng).round();
+                    this._setPos(t) } return this }, _initIcon: function() { var t = this.options,
+                    e = "leaflet-zoom-" + (this._zoomAnimated ? "animated" : "hide"),
+                    i = t.icon.createIcon(this._icon),
+                    n = !1;
+                i !== this._icon && (this._icon && this._removeIcon(), n = !0, t.title && (i.title = t.title), t.alt && (i.alt = t.alt)), o.DomUtil.addClass(i, e), t.keyboard && (i.tabIndex = "0"), this._icon = i, t.riseOnHover && this.on({ mouseover: this._bringToFront, mouseout: this._resetZIndex }); var s = t.icon.createShadow(this._shadow),
+                    r = !1;
+                s !== this._shadow && (this._removeShadow(), r = !0), s && o.DomUtil.addClass(s, e), this._shadow = s, t.opacity < 1 && this._updateOpacity(), n && (this.getPane().appendChild(this._icon), this._initInteraction()), s && r && this.getPane("shadowPane").appendChild(this._shadow) }, _removeIcon: function() { this.options.riseOnHover && this.off({ mouseover: this._bringToFront, mouseout: this._resetZIndex }), o.DomUtil.remove(this._icon), this.removeInteractiveTarget(this._icon), this._icon = null }, _removeShadow: function() { this._shadow && o.DomUtil.remove(this._shadow), this._shadow = null }, _setPos: function(t) { o.DomUtil.setPosition(this._icon, t), this._shadow && o.DomUtil.setPosition(this._shadow, t), this._zIndex = t.y + this.options.zIndexOffset, this._resetZIndex() }, _updateZIndex: function(t) { this._icon.style.zIndex = this._zIndex + t }, _animateZoom: function(t) { var e = this._map._latLngToNewLayerPoint(this._latlng, t.zoom, t.center).round();
+                this._setPos(e) }, _initInteraction: function() { if (this.options.interactive && (o.DomUtil.addClass(this._icon, "leaflet-interactive"), this.addInteractiveTarget(this._icon), o.Handler.MarkerDrag)) { var t = this.options.draggable;
+                    this.dragging && (t = this.dragging.enabled(), this.dragging.disable()), this.dragging = new o.Handler.MarkerDrag(this), t && this.dragging.enable() } }, setOpacity: function(t) { return this.options.opacity = t, this._map && this._updateOpacity(), this }, _updateOpacity: function() { var t = this.options.opacity;
+                o.DomUtil.setOpacity(this._icon, t), this._shadow && o.DomUtil.setOpacity(this._shadow, t) }, _bringToFront: function() { this._updateZIndex(this.options.riseOffset) }, _resetZIndex: function() { this._updateZIndex(0) } }), o.marker = function(t, e) { return new o.Marker(t, e) }, o.DivIcon = o.Icon.extend({ options: { iconSize: [12, 12], className: "leaflet-div-icon", html: !1 }, createIcon: function(t) { var i = t && "DIV" === t.tagName ? t : e.createElement("div"),
+                    n = this.options; return i.innerHTML = n.html !== !1 ? n.html : "", n.bgPos && (i.style.backgroundPosition = -n.bgPos.x + "px " + -n.bgPos.y + "px"), this._setIconStyles(i, "icon"), i }, createShadow: function() { return null } }), o.divIcon = function(t) { return new o.DivIcon(t) }, o.Map.mergeOptions({ closePopupOnClick: !0 }), o.Popup = o.Layer.extend({ options: { pane: "popupPane", minWidth: 50, maxWidth: 300, offset: [0, 7], autoPan: !0, autoPanPadding: [5, 5], closeButton: !0, autoClose: !0, zoomAnimation: !0 }, initialize: function(t, e) { o.setOptions(this, t), this._source = e }, onAdd: function(t) { this._zoomAnimated = this._zoomAnimated && this.options.zoomAnimation, this._container || this._initLayout(), t._fadeAnimated && o.DomUtil.setOpacity(this._container, 0), clearTimeout(this._removeTimeout), this.getPane().appendChild(this._container), this.update(), t._fadeAnimated && o.DomUtil.setOpacity(this._container, 1), t.fire("popupopen", { popup: this }), this._source && this._source.fire("popupopen", { popup: this }, !0) }, openOn: function(t) { return t.openPopup(this), this }, onRemove: function(t) { t._fadeAnimated ? (o.DomUtil.setOpacity(this._container, 0), this._removeTimeout = setTimeout(o.bind(o.DomUtil.remove, o.DomUtil, this._container), 200)) : o.DomUtil.remove(this._container), t.fire("popupclose", { popup: this }), this._source && this._source.fire("popupclose", { popup: this }, !0) }, getLatLng: function() { return this._latlng }, setLatLng: function(t) { return this._latlng = o.latLng(t), this._map && (this._updatePosition(), this._adjustPan()), this }, getContent: function() { return this._content }, setContent: function(t) { return this._content = t, this.update(), this }, getElement: function() { return this._container }, update: function() { this._map && (this._container.style.visibility = "hidden", this._updateContent(), this._updateLayout(), this._updatePosition(), this._container.style.visibility = "", this._adjustPan()) }, getEvents: function() { var t = { zoom: this._updatePosition, viewreset: this._updatePosition }; return this._zoomAnimated && (t.zoomanim = this._animateZoom), ("closeOnClick" in this.options ? this.options.closeOnClick : this._map.options.closePopupOnClick) && (t.preclick = this._close), this.options.keepInView && (t.moveend = this._adjustPan), t }, isOpen: function() { return !!this._map && this._map.hasLayer(this) }, bringToFront: function() { return this._map && o.DomUtil.toFront(this._container), this }, bringToBack: function() { return this._map && o.DomUtil.toBack(this._container), this }, _close: function() { this._map && this._map.closePopup(this) }, _initLayout: function() { var t = "leaflet-popup",
+                    e = this._container = o.DomUtil.create("div", t + " " + (this.options.className || "") + " leaflet-zoom-" + (this._zoomAnimated ? "animated" : "hide")); if (this.options.closeButton) { var i = this._closeButton = o.DomUtil.create("a", t + "-close-button", e);
+                    i.href = "#close", i.innerHTML = "&#215;", o.DomEvent.on(i, "click", this._onCloseButtonClick, this) } var n = this._wrapper = o.DomUtil.create("div", t + "-content-wrapper", e);
+                this._contentNode = o.DomUtil.create("div", t + "-content", n), o.DomEvent.disableClickPropagation(n).disableScrollPropagation(this._contentNode).on(n, "contextmenu", o.DomEvent.stopPropagation), this._tipContainer = o.DomUtil.create("div", t + "-tip-container", e), this._tip = o.DomUtil.create("div", t + "-tip", this._tipContainer) }, _updateContent: function() { if (this._content) { var t = this._contentNode,
+                        e = "function" == typeof this._content ? this._content(this._source || this) : this._content; if ("string" == typeof e) t.innerHTML = e;
+                    else { for (; t.hasChildNodes();) t.removeChild(t.firstChild);
+                        t.appendChild(e) }
+                    this.fire("contentupdate") } }, _updateLayout: function() { var t = this._contentNode,
+                    e = t.style;
+                e.width = "", e.whiteSpace = "nowrap"; var i = t.offsetWidth;
+                i = Math.min(i, this.options.maxWidth), i = Math.max(i, this.options.minWidth), e.width = i + 1 + "px", e.whiteSpace = "", e.height = ""; var n = t.offsetHeight,
+                    s = this.options.maxHeight,
+                    r = "leaflet-popup-scrolled";
+                s && n > s ? (e.height = s + "px", o.DomUtil.addClass(t, r)) : o.DomUtil.removeClass(t, r), this._containerWidth = this._container.offsetWidth }, _updatePosition: function() { if (this._map) { var t = this._map.latLngToLayerPoint(this._latlng),
+                        e = o.point(this.options.offset);
+                    this._zoomAnimated ? o.DomUtil.setPosition(this._container, t) : e = e.add(t); var i = this._containerBottom = -e.y,
+                        n = this._containerLeft = -Math.round(this._containerWidth / 2) + e.x;
+                    this._container.style.bottom = i + "px", this._container.style.left = n + "px" } }, _animateZoom: function(t) { var e = this._map._latLngToNewLayerPoint(this._latlng, t.zoom, t.center);
+                o.DomUtil.setPosition(this._container, e) }, _adjustPan: function() { if (!(!this.options.autoPan || this._map._panAnim && this._map._panAnim._inProgress)) { var t = this._map,
+                        e = this._container.offsetHeight,
+                        i = this._containerWidth,
+                        n = new o.Point(this._containerLeft, -e - this._containerBottom);
+                    this._zoomAnimated && n._add(o.DomUtil.getPosition(this._container)); var s = t.layerPointToContainerPoint(n),
+                        r = o.point(this.options.autoPanPadding),
+                        a = o.point(this.options.autoPanPaddingTopLeft || r),
+                        h = o.point(this.options.autoPanPaddingBottomRight || r),
+                        l = t.getSize(),
+                        u = 0,
+                        c = 0;
+                    s.x + i + h.x > l.x && (u = s.x + i - l.x + h.x), s.x - u - a.x < 0 && (u = s.x - a.x), s.y + e + h.y > l.y && (c = s.y + e - l.y + h.y), s.y - c - a.y < 0 && (c = s.y - a.y), (u || c) && t.fire("autopanstart").panBy([u, c]) } }, _onCloseButtonClick: function(t) { this._close(), o.DomEvent.stop(t) } }), o.popup = function(t, e) { return new o.Popup(t, e) }, o.Map.include({ openPopup: function(t, e, i) { return t instanceof o.Popup || (t = new o.Popup(i).setContent(t)), e && t.setLatLng(e), this.hasLayer(t) ? this : (this._popup && this._popup.options.autoClose && this.closePopup(), this._popup = t, this.addLayer(t)) }, closePopup: function(t) { return t && t !== this._popup || (t = this._popup, this._popup = null), t && this.removeLayer(t), this } }), o.Layer.include({ bindPopup: function(t, e) { return t instanceof o.Popup ? (o.setOptions(t, e), this._popup = t, t._source = this) : ((!this._popup || e) && (this._popup = new o.Popup(e, this)), this._popup.setContent(t)), this._popupHandlersAdded || (this.on({ click: this._openPopup, remove: this.closePopup, move: this._movePopup }), this._popupHandlersAdded = !0), this._originalPopupOffset = this._popup.options.offset, this }, unbindPopup: function() { return this._popup && (this.off({ click: this._openPopup, remove: this.closePopup, move: this._movePopup }), this._popupHandlersAdded = !1, this._popup = null), this }, openPopup: function(t, e) { if (t instanceof o.Layer || (e = t, t = this), t instanceof o.FeatureGroup)
+                    for (var i in this._layers) { t = this._layers[i]; break }
+                return e || (e = t.getCenter ? t.getCenter() : t.getLatLng()), this._popup && this._map && (this._popup.options.offset = this._popupAnchor(t), this._popup._source = t, this._popup.update(), this._map.openPopup(this._popup, e)), this }, closePopup: function() { return this._popup && this._popup._close(), this }, togglePopup: function(t) { return this._popup && (this._popup._map ? this.closePopup() : this.openPopup(t)), this }, isPopupOpen: function() { return this._popup.isOpen() }, setPopupContent: function(t) { return this._popup && this._popup.setContent(t), this }, getPopup: function() { return this._popup }, _openPopup: function(t) { var e = t.layer || t.target; if (this._popup && this._map) return e instanceof o.Path ? void this.openPopup(t.layer || t.target, t.latlng) : void(this._map.hasLayer(this._popup) && this._popup._source === e ? this.closePopup() : this.openPopup(e, t.latlng)) }, _popupAnchor: function(t) { var e = t._getPopupAnchor ? t._getPopupAnchor() : [0, 0],
+                    i = this._originalPopupOffset || o.Popup.prototype.options.offset; return o.point(e).add(i) }, _movePopup: function(t) { this._popup.setLatLng(t.latlng) } }), o.Marker.include({ _getPopupAnchor: function() { return this.options.icon.options.popupAnchor || [0, 0] } }), o.LayerGroup = o.Layer.extend({
+            initialize: function(t) { this._layers = {}; var e, i; if (t)
+                    for (e = 0, i = t.length; i > e; e++) this.addLayer(t[e]) },
+            addLayer: function(t) { var e = this.getLayerId(t); return this._layers[e] = t, this._map && this._map.addLayer(t), this },
+            removeLayer: function(t) {
+                var e = t in this._layers ? t : this.getLayerId(t);
+                return this._map && this._layers[e] && this._map.removeLayer(this._layers[e]),
+                    delete this._layers[e], this
+            },
+            hasLayer: function(t) { return !!t && (t in this._layers || this.getLayerId(t) in this._layers) },
+            clearLayers: function() { for (var t in this._layers) this.removeLayer(this._layers[t]); return this },
+            invoke: function(t) { var e, i, n = Array.prototype.slice.call(arguments, 1); for (e in this._layers) i = this._layers[e], i[t] && i[t].apply(i, n); return this },
+            onAdd: function(t) { for (var e in this._layers) t.addLayer(this._layers[e]) },
+            onRemove: function(t) { for (var e in this._layers) t.removeLayer(this._layers[e]) },
+            eachLayer: function(t, e) { for (var i in this._layers) t.call(e, this._layers[i]); return this },
+            getLayer: function(t) { return this._layers[t] },
+            getLayers: function() { var t = []; for (var e in this._layers) t.push(this._layers[e]); return t },
+            setZIndex: function(t) { return this.invoke("setZIndex", t) },
+            getLayerId: function(t) { return o.stamp(t) }
+        }), o.layerGroup = function(t) { return new o.LayerGroup(t) }, o.FeatureGroup = o.LayerGroup.extend({ addLayer: function(t) { return this.hasLayer(t) ? this : (t.addEventParent(this), o.LayerGroup.prototype.addLayer.call(this, t), this.fire("layeradd", { layer: t })) }, removeLayer: function(t) { return this.hasLayer(t) ? (t in this._layers && (t = this._layers[t]), t.removeEventParent(this), o.LayerGroup.prototype.removeLayer.call(this, t), this.fire("layerremove", { layer: t })) : this }, setStyle: function(t) { return this.invoke("setStyle", t) }, bringToFront: function() { return this.invoke("bringToFront") }, bringToBack: function() { return this.invoke("bringToBack") }, getBounds: function() { var t = new o.LatLngBounds; for (var e in this._layers) { var i = this._layers[e];
+                    t.extend(i.getBounds ? i.getBounds() : i.getLatLng()) } return t } }), o.featureGroup = function(t) { return new o.FeatureGroup(t) }, o.Renderer = o.Layer.extend({ options: { padding: .1 }, initialize: function(t) { o.setOptions(this, t), o.stamp(this) }, onAdd: function() { this._container || (this._initContainer(), this._zoomAnimated && o.DomUtil.addClass(this._container, "leaflet-zoom-animated")), this.getPane().appendChild(this._container), this._update() }, onRemove: function() { o.DomUtil.remove(this._container) }, getEvents: function() { var t = { viewreset: this._reset, zoomstart: this._onZoomStart, zoom: this._onZoom, moveend: this._update }; return this._zoomAnimated && (t.zoomanim = this._onAnimZoom), t }, _onAnimZoom: function(t) { this._updateTransform(t.center, t.zoom) }, _onZoom: function() { this._updateTransform(this._map.getCenter(), this._map.getZoom()) }, _onZoomStart: function() { this._update() }, _updateTransform: function(t, e) { var i = this._map.getZoomScale(e, this._zoom),
+                    n = o.DomUtil.getPosition(this._container),
+                    s = this._map.getSize().multiplyBy(.5 + this.options.padding),
+                    r = this._map.project(this._center, e),
+                    a = this._map.project(t, e),
+                    h = a.subtract(r),
+                    l = s.multiplyBy(-i).add(n).add(s).subtract(h);
+                o.DomUtil.setTransform(this._container, l, i) }, _reset: function() { this._update(), this._updateTransform(this._center, this._zoom) }, _update: function() { var t = this.options.padding,
+                    e = this._map.getSize(),
+                    i = this._map.containerPointToLayerPoint(e.multiplyBy(-t)).round();
+                this._bounds = new o.Bounds(i, i.add(e.multiplyBy(1 + 2 * t)).round()), this._center = this._map.getCenter(), this._zoom = this._map.getZoom() } }), o.Map.include({ getRenderer: function(t) { var e = t.options.renderer || this._getPaneRenderer(t.options.pane) || this.options.renderer || this._renderer; return e || (e = this._renderer = this.options.preferCanvas && o.canvas() || o.svg()), this.hasLayer(e) || this.addLayer(e), e }, _getPaneRenderer: function(t) { if ("overlayPane" === t || t === i) return !1; var e = this._paneRenderers[t]; return e === i && (e = o.SVG && o.svg({ pane: t }) || o.Canvas && o.canvas({ pane: t }), this._paneRenderers[t] = e), e } }), o.Path = o.Layer.extend({ options: { stroke: !0, color: "#3388ff", weight: 3, opacity: 1, lineCap: "round", lineJoin: "round", fillOpacity: .2, fillRule: "evenodd", interactive: !0 }, beforeAdd: function(t) { this._renderer = t.getRenderer(this) }, onAdd: function() { this._renderer._initPath(this), this._reset(), this._renderer._addPath(this) }, onRemove: function() { this._renderer._removePath(this) }, getEvents: function() { return { zoomend: this._project, moveend: this._update, viewreset: this._reset } }, redraw: function() { return this._map && this._renderer._updatePath(this), this }, setStyle: function(t) { return o.setOptions(this, t), this._renderer && this._renderer._updateStyle(this), this }, bringToFront: function() { return this._renderer && this._renderer._bringToFront(this), this }, bringToBack: function() { return this._renderer && this._renderer._bringToBack(this), this }, getElement: function() { return this._path }, _reset: function() { this._project(), this._update() }, _clickTolerance: function() { return (this.options.stroke ? this.options.weight / 2 : 0) + (o.Browser.touch ? 10 : 0) } }), o.LineUtil = { simplify: function(t, e) { if (!e || !t.length) return t.slice(); var i = e * e; return t = this._reducePoints(t, i), t = this._simplifyDP(t, i) }, pointToSegmentDistance: function(t, e, i) { return Math.sqrt(this._sqClosestPointOnSegment(t, e, i, !0)) }, closestPointOnSegment: function(t, e, i) { return this._sqClosestPointOnSegment(t, e, i) }, _simplifyDP: function(t, e) { var n = t.length,
+                    o = typeof Uint8Array != i + "" ? Uint8Array : Array,
+                    s = new o(n);
+                s[0] = s[n - 1] = 1, this._simplifyDPStep(t, s, e, 0, n - 1); var r, a = []; for (r = 0; n > r; r++) s[r] && a.push(t[r]); return a }, _simplifyDPStep: function(t, e, i, n, o) { var s, r, a, h = 0; for (r = n + 1; o - 1 >= r; r++) a = this._sqClosestPointOnSegment(t[r], t[n], t[o], !0), a > h && (s = r, h = a);
+                h > i && (e[s] = 1, this._simplifyDPStep(t, e, i, n, s), this._simplifyDPStep(t, e, i, s, o)) }, _reducePoints: function(t, e) { for (var i = [t[0]], n = 1, o = 0, s = t.length; s > n; n++) this._sqDist(t[n], t[o]) > e && (i.push(t[n]), o = n); return s - 1 > o && i.push(t[s - 1]), i }, clipSegment: function(t, e, i, n, o) { var s, r, a, h = n ? this._lastCode : this._getBitCode(t, i),
+                    l = this._getBitCode(e, i); for (this._lastCode = l;;) { if (!(h | l)) return [t, e]; if (h & l) return !1;
+                    s = h || l, r = this._getEdgeIntersection(t, e, s, i, o), a = this._getBitCode(r, i), s === h ? (t = r, h = a) : (e = r, l = a) } }, _getEdgeIntersection: function(t, e, i, n, s) { var r, a, h = e.x - t.x,
+                    l = e.y - t.y,
+                    u = n.min,
+                    c = n.max; return 8 & i ? (r = t.x + h * (c.y - t.y) / l, a = c.y) : 4 & i ? (r = t.x + h * (u.y - t.y) / l, a = u.y) : 2 & i ? (r = c.x, a = t.y + l * (c.x - t.x) / h) : 1 & i && (r = u.x, a = t.y + l * (u.x - t.x) / h), new o.Point(r, a, s) }, _getBitCode: function(t, e) { var i = 0; return t.x < e.min.x ? i |= 1 : t.x > e.max.x && (i |= 2), t.y < e.min.y ? i |= 4 : t.y > e.max.y && (i |= 8), i }, _sqDist: function(t, e) { var i = e.x - t.x,
+                    n = e.y - t.y; return i * i + n * n }, _sqClosestPointOnSegment: function(t, e, i, n) { var s, r = e.x,
+                    a = e.y,
+                    h = i.x - r,
+                    l = i.y - a,
+                    u = h * h + l * l; return u > 0 && (s = ((t.x - r) * h + (t.y - a) * l) / u, s > 1 ? (r = i.x, a = i.y) : s > 0 && (r += h * s, a += l * s)), h = t.x - r, l = t.y - a, n ? h * h + l * l : new o.Point(r, a) } }, o.Polyline = o.Path.extend({ options: { smoothFactor: 1 }, initialize: function(t, e) { o.setOptions(this, e), this._setLatLngs(t) }, getLatLngs: function() { return this._latlngs }, setLatLngs: function(t) { return this._setLatLngs(t), this.redraw() }, isEmpty: function() { return !this._latlngs.length }, closestLayerPoint: function(t) { for (var e, i, n = 1 / 0, s = null, r = o.LineUtil._sqClosestPointOnSegment, a = 0, h = this._parts.length; h > a; a++)
+                    for (var l = this._parts[a], u = 1, c = l.length; c > u; u++) { e = l[u - 1], i = l[u]; var d = r(t, e, i, !0);
+                        n > d && (n = d, s = r(t, e, i)) }
+                return s && (s.distance = Math.sqrt(n)), s }, getCenter: function() { var t, e, i, n, o, s, r, a = this._rings[0],
+                    h = a.length; if (!h) return null; for (t = 0, e = 0; h - 1 > t; t++) e += a[t].distanceTo(a[t + 1]) / 2; if (0 === e) return this._map.layerPointToLatLng(a[0]); for (t = 0, n = 0; h - 1 > t; t++)
+                    if (o = a[t], s = a[t + 1], i = o.distanceTo(s), n += i, n > e) return r = (n - e) / i, this._map.layerPointToLatLng([s.x - r * (s.x - o.x), s.y - r * (s.y - o.y)]) }, getBounds: function() { return this._bounds }, addLatLng: function(t, e) { return e = e || this._defaultShape(), t = o.latLng(t), e.push(t), this._bounds.extend(t), this.redraw() }, _setLatLngs: function(t) { this._bounds = new o.LatLngBounds, this._latlngs = this._convertLatLngs(t) }, _defaultShape: function() { return o.Polyline._flat(this._latlngs) ? this._latlngs : this._latlngs[0] }, _convertLatLngs: function(t) { for (var e = [], i = o.Polyline._flat(t), n = 0, s = t.length; s > n; n++) i ? (e[n] = o.latLng(t[n]), this._bounds.extend(e[n])) : e[n] = this._convertLatLngs(t[n]); return e }, _project: function() { this._rings = [], this._projectLatlngs(this._latlngs, this._rings); var t = this._clickTolerance(),
+                    e = new o.Point(t, -t);
+                this._bounds.isValid() && (this._pxBounds = new o.Bounds(this._map.latLngToLayerPoint(this._bounds.getSouthWest())._subtract(e), this._map.latLngToLayerPoint(this._bounds.getNorthEast())._add(e))) }, _projectLatlngs: function(t, e) { var i, n, s = t[0] instanceof o.LatLng,
+                    r = t.length; if (s) { for (n = [], i = 0; r > i; i++) n[i] = this._map.latLngToLayerPoint(t[i]);
+                    e.push(n) } else
+                    for (i = 0; r > i; i++) this._projectLatlngs(t[i], e) }, _clipPoints: function() { var t = this._renderer._bounds; if (this._parts = [], this._pxBounds && this._pxBounds.intersects(t)) { if (this.options.noClip) return void(this._parts = this._rings); var e, i, n, s, r, a, h, l = this._parts; for (e = 0, n = 0, s = this._rings.length; s > e; e++)
+                        for (h = this._rings[e], i = 0, r = h.length; r - 1 > i; i++) a = o.LineUtil.clipSegment(h[i], h[i + 1], t, i, !0), a && (l[n] = l[n] || [], l[n].push(a[0]), (a[1] !== h[i + 1] || i === r - 2) && (l[n].push(a[1]), n++)) } }, _simplifyPoints: function() { for (var t = this._parts, e = this.options.smoothFactor, i = 0, n = t.length; n > i; i++) t[i] = o.LineUtil.simplify(t[i], e) }, _update: function() { this._map && (this._clipPoints(), this._simplifyPoints(), this._updatePath()) }, _updatePath: function() { this._renderer._updatePoly(this) } }), o.polyline = function(t, e) { return new o.Polyline(t, e) }, o.Polyline._flat = function(t) { return !o.Util.isArray(t[0]) || "object" != typeof t[0][0] && "undefined" != typeof t[0][0] }, o.PolyUtil = {}, o.PolyUtil.clipPolygon = function(t, e, i) { var n, s, r, a, h, l, u, c, d, _ = [1, 4, 2, 8],
+                m = o.LineUtil; for (s = 0, u = t.length; u > s; s++) t[s]._code = m._getBitCode(t[s], e); for (a = 0; 4 > a; a++) { for (c = _[a], n = [], s = 0, u = t.length, r = u - 1; u > s; r = s++) h = t[s], l = t[r], h._code & c ? l._code & c || (d = m._getEdgeIntersection(l, h, c, e, i), d._code = m._getBitCode(d, e), n.push(d)) : (l._code & c && (d = m._getEdgeIntersection(l, h, c, e, i), d._code = m._getBitCode(d, e), n.push(d)), n.push(h));
+                t = n } return t }, o.Polygon = o.Polyline.extend({ options: { fill: !0 }, isEmpty: function() { return !this._latlngs.length || !this._latlngs[0].length }, getCenter: function() { var t, e, i, n, o, s, r, a, h, l = this._rings[0],
+                    u = l.length; if (!u) return null; for (s = r = a = 0, t = 0, e = u - 1; u > t; e = t++) i = l[t], n = l[e], o = i.y * n.x - n.y * i.x, r += (i.x + n.x) * o, a += (i.y + n.y) * o, s += 3 * o; return h = 0 === s ? l[0] : [r / s, a / s], this._map.layerPointToLatLng(h) }, _convertLatLngs: function(t) { var e = o.Polyline.prototype._convertLatLngs.call(this, t),
+                    i = e.length; return i >= 2 && e[0] instanceof o.LatLng && e[0].equals(e[i - 1]) && e.pop(), e }, _setLatLngs: function(t) { o.Polyline.prototype._setLatLngs.call(this, t), o.Polyline._flat(this._latlngs) && (this._latlngs = [this._latlngs]) }, _defaultShape: function() { return o.Polyline._flat(this._latlngs[0]) ? this._latlngs[0] : this._latlngs[0][0] }, _clipPoints: function() { var t = this._renderer._bounds,
+                    e = this.options.weight,
+                    i = new o.Point(e, e); if (t = new o.Bounds(t.min.subtract(i), t.max.add(i)), this._parts = [], this._pxBounds && this._pxBounds.intersects(t)) { if (this.options.noClip) return void(this._parts = this._rings); for (var n, s = 0, r = this._rings.length; r > s; s++) n = o.PolyUtil.clipPolygon(this._rings[s], t, !0), n.length && this._parts.push(n) } }, _updatePath: function() { this._renderer._updatePoly(this, !0) } }), o.polygon = function(t, e) { return new o.Polygon(t, e) }, o.Rectangle = o.Polygon.extend({ initialize: function(t, e) { o.Polygon.prototype.initialize.call(this, this._boundsToLatLngs(t), e) }, setBounds: function(t) { return this.setLatLngs(this._boundsToLatLngs(t)) }, _boundsToLatLngs: function(t) { return t = o.latLngBounds(t), [t.getSouthWest(), t.getNorthWest(), t.getNorthEast(), t.getSouthEast()] } }), o.rectangle = function(t, e) { return new o.Rectangle(t, e) }, o.CircleMarker = o.Path.extend({ options: { fill: !0, radius: 10 }, initialize: function(t, e) { o.setOptions(this, e), this._latlng = o.latLng(t), this._radius = this.options.radius }, setLatLng: function(t) { return this._latlng = o.latLng(t), this.redraw(), this.fire("move", { latlng: this._latlng }) }, getLatLng: function() { return this._latlng }, setRadius: function(t) { return this.options.radius = this._radius = t, this.redraw() }, getRadius: function() { return this._radius }, setStyle: function(t) { var e = t && t.radius || this._radius; return o.Path.prototype.setStyle.call(this, t), this.setRadius(e), this }, _project: function() { this._point = this._map.latLngToLayerPoint(this._latlng), this._updateBounds() }, _updateBounds: function() { var t = this._radius,
+                    e = this._radiusY || t,
+                    i = this._clickTolerance(),
+                    n = [t + i, e + i];
+                this._pxBounds = new o.Bounds(this._point.subtract(n), this._point.add(n)) }, _update: function() { this._map && this._updatePath() }, _updatePath: function() { this._renderer._updateCircle(this) }, _empty: function() { return this._radius && !this._renderer._bounds.intersects(this._pxBounds) } }), o.circleMarker = function(t, e) { return new o.CircleMarker(t, e) }, o.Circle = o.CircleMarker.extend({ initialize: function(t, e) { o.setOptions(this, e), this._latlng = o.latLng(t), this._mRadius = this.options.radius }, setRadius: function(t) { return this._mRadius = t, this.redraw() }, getRadius: function() { return this._mRadius }, getBounds: function() { var t = [this._radius, this._radiusY || this._radius]; return new o.LatLngBounds(this._map.layerPointToLatLng(this._point.subtract(t)), this._map.layerPointToLatLng(this._point.add(t))) }, setStyle: o.Path.prototype.setStyle, _project: function() { var t = this._latlng.lng,
+                    e = this._latlng.lat,
+                    i = this._map,
+                    n = i.options.crs; if (n.distance === o.CRS.Earth.distance) { var s = Math.PI / 180,
+                        r = this._mRadius / o.CRS.Earth.R / s,
+                        a = i.project([e + r, t]),
+                        h = i.project([e - r, t]),
+                        l = a.add(h).divideBy(2),
+                        u = i.unproject(l).lat,
+                        c = Math.acos((Math.cos(r * s) - Math.sin(e * s) * Math.sin(u * s)) / (Math.cos(e * s) * Math.cos(u * s))) / s;
+                    this._point = l.subtract(i.getPixelOrigin()), this._radius = isNaN(c) ? 0 : Math.max(Math.round(l.x - i.project([u, t - c]).x), 1), this._radiusY = Math.max(Math.round(l.y - a.y), 1) } else { var d = n.unproject(n.project(this._latlng).subtract([this._mRadius, 0]));
+                    this._point = i.latLngToLayerPoint(this._latlng), this._radius = this._point.x - i.latLngToLayerPoint(d).x }
+                this._updateBounds() } }), o.circle = function(t, e, i) { return "number" == typeof e && (e = o.extend({}, i, { radius: e })), new o.Circle(t, e) }, o.SVG = o.Renderer.extend({ _initContainer: function() { this._container = o.SVG.create("svg"), this._container.setAttribute("pointer-events", "none"), this._rootGroup = o.SVG.create("g"), this._container.appendChild(this._rootGroup) }, _update: function() { if (!this._map._animatingZoom || !this._bounds) { o.Renderer.prototype._update.call(this); var t = this._bounds,
+                        e = t.getSize(),
+                        i = this._container;
+                    this._svgSize && this._svgSize.equals(e) || (this._svgSize = e, i.setAttribute("width", e.x), i.setAttribute("height", e.y)), o.DomUtil.setPosition(i, t.min), i.setAttribute("viewBox", [t.min.x, t.min.y, e.x, e.y].join(" ")) } }, _initPath: function(t) { var e = t._path = o.SVG.create("path");
+                t.options.className && o.DomUtil.addClass(e, t.options.className), t.options.interactive && o.DomUtil.addClass(e, "leaflet-interactive"), this._updateStyle(t) }, _addPath: function(t) { this._rootGroup.appendChild(t._path), t.addInteractiveTarget(t._path) }, _removePath: function(t) { o.DomUtil.remove(t._path), t.removeInteractiveTarget(t._path) }, _updatePath: function(t) { t._project(), t._update() }, _updateStyle: function(t) { var e = t._path,
+                    i = t.options;
+                e && (i.stroke ? (e.setAttribute("stroke", i.color), e.setAttribute("stroke-opacity", i.opacity), e.setAttribute("stroke-width", i.weight), e.setAttribute("stroke-linecap", i.lineCap), e.setAttribute("stroke-linejoin", i.lineJoin), i.dashArray ? e.setAttribute("stroke-dasharray", i.dashArray) : e.removeAttribute("stroke-dasharray"), i.dashOffset ? e.setAttribute("stroke-dashoffset", i.dashOffset) : e.removeAttribute("stroke-dashoffset")) : e.setAttribute("stroke", "none"), i.fill ? (e.setAttribute("fill", i.fillColor || i.color), e.setAttribute("fill-opacity", i.fillOpacity), e.setAttribute("fill-rule", i.fillRule || "evenodd")) : e.setAttribute("fill", "none"), e.setAttribute("pointer-events", i.pointerEvents || (i.interactive ? "visiblePainted" : "none"))) }, _updatePoly: function(t, e) { this._setPath(t, o.SVG.pointsToPath(t._parts, e)) }, _updateCircle: function(t) { var e = t._point,
+                    i = t._radius,
+                    n = t._radiusY || i,
+                    o = "a" + i + "," + n + " 0 1,0 ",
+                    s = t._empty() ? "M0 0" : "M" + (e.x - i) + "," + e.y + o + 2 * i + ",0 " + o + 2 * -i + ",0 ";
+                this._setPath(t, s) }, _setPath: function(t, e) { t._path.setAttribute("d", e) }, _bringToFront: function(t) { o.DomUtil.toFront(t._path) }, _bringToBack: function(t) { o.DomUtil.toBack(t._path) } }), o.extend(o.SVG, { create: function(t) { return e.createElementNS("http://www.w3.org/2000/svg", t) }, pointsToPath: function(t, e) { var i, n, s, r, a, h, l = ""; for (i = 0, s = t.length; s > i; i++) { for (a = t[i], n = 0, r = a.length; r > n; n++) h = a[n], l += (n ? "L" : "M") + h.x + " " + h.y;
+                    l += e ? o.Browser.svg ? "z" : "x" : "" } return l || "M0 0" } }), o.Browser.svg = !(!e.createElementNS || !o.SVG.create("svg").createSVGRect), o.svg = function(t) { return o.Browser.svg || o.Browser.vml ? new o.SVG(t) : null }, o.Browser.vml = !o.Browser.svg && function() { try { var t = e.createElement("div");
+                t.innerHTML = '<v:shape adj="1"/>'; var i = t.firstChild; return i.style.behavior = "url(#default#VML)", i && "object" == typeof i.adj } catch (n) { return !1 } }(), o.SVG.include(o.Browser.vml ? { _initContainer: function() { this._container = o.DomUtil.create("div", "leaflet-vml-container") }, _update: function() { this._map._animatingZoom || o.Renderer.prototype._update.call(this) }, _initPath: function(t) { var e = t._container = o.SVG.create("shape");
+                o.DomUtil.addClass(e, "leaflet-vml-shape " + (this.options.className || "")), e.coordsize = "1 1", t._path = o.SVG.create("path"), e.appendChild(t._path), this._updateStyle(t) }, _addPath: function(t) { var e = t._container;
+                this._container.appendChild(e), t.options.interactive && t.addInteractiveTarget(e) }, _removePath: function(t) { var e = t._container;
+                o.DomUtil.remove(e), t.removeInteractiveTarget(e) }, _updateStyle: function(t) { var e = t._stroke,
+                    i = t._fill,
+                    n = t.options,
+                    s = t._container;
+                s.stroked = !!n.stroke, s.filled = !!n.fill, n.stroke ? (e || (e = t._stroke = o.SVG.create("stroke")), s.appendChild(e), e.weight = n.weight + "px", e.color = n.color, e.opacity = n.opacity, n.dashArray ? e.dashStyle = o.Util.isArray(n.dashArray) ? n.dashArray.join(" ") : n.dashArray.replace(/( *, *)/g, " ") : e.dashStyle = "", e.endcap = n.lineCap.replace("butt", "flat"), e.joinstyle = n.lineJoin) : e && (s.removeChild(e), t._stroke = null), n.fill ? (i || (i = t._fill = o.SVG.create("fill")), s.appendChild(i), i.color = n.fillColor || n.color, i.opacity = n.fillOpacity) : i && (s.removeChild(i), t._fill = null) }, _updateCircle: function(t) { var e = t._point.round(),
+                    i = Math.round(t._radius),
+                    n = Math.round(t._radiusY || i);
+                this._setPath(t, t._empty() ? "M0 0" : "AL " + e.x + "," + e.y + " " + i + "," + n + " 0,23592600") }, _setPath: function(t, e) { t._path.v = e }, _bringToFront: function(t) { o.DomUtil.toFront(t._container) }, _bringToBack: function(t) { o.DomUtil.toBack(t._container) } } : {}), o.Browser.vml && (o.SVG.create = function() { try { return e.namespaces.add("lvml", "urn:schemas-microsoft-com:vml"),
+                    function(t) { return e.createElement("<lvml:" + t + ' class="lvml">') } } catch (t) { return function(t) { return e.createElement("<" + t + ' xmlns="urn:schemas-microsoft.com:vml" class="lvml">') } } }()), o.Canvas = o.Renderer.extend({ onAdd: function() { o.Renderer.prototype.onAdd.call(this), this._layers = this._layers || {}, this._draw() }, _initContainer: function() { var t = this._container = e.createElement("canvas");
+                o.DomEvent.on(t, "mousemove", o.Util.throttle(this._onMouseMove, 32, this), this).on(t, "click dblclick mousedown mouseup contextmenu", this._onClick, this).on(t, "mouseout", this._handleMouseOut, this), this._ctx = t.getContext("2d") }, _update: function() { if (!this._map._animatingZoom || !this._bounds) { this._drawnLayers = {}, o.Renderer.prototype._update.call(this); var t = this._bounds,
+                        e = this._container,
+                        i = t.getSize(),
+                        n = o.Browser.retina ? 2 : 1;
+                    o.DomUtil.setPosition(e, t.min), e.width = n * i.x, e.height = n * i.y, e.style.width = i.x + "px", e.style.height = i.y + "px", o.Browser.retina && this._ctx.scale(2, 2), this._ctx.translate(-t.min.x, -t.min.y) } }, _initPath: function(t) { this._layers[o.stamp(t)] = t }, _addPath: o.Util.falseFn, _removePath: function(t) { t._removed = !0, this._requestRedraw(t) }, _updatePath: function(t) { this._redrawBounds = t._pxBounds, this._draw(!0), t._project(), t._update(), this._draw(), this._redrawBounds = null }, _updateStyle: function(t) { this._requestRedraw(t) }, _requestRedraw: function(t) { if (this._map) { var e = (t.options.weight || 0) + 1;
+                    this._redrawBounds = this._redrawBounds || new o.Bounds, this._redrawBounds.extend(t._pxBounds.min.subtract([e, e])), this._redrawBounds.extend(t._pxBounds.max.add([e, e])), this._redrawRequest = this._redrawRequest || o.Util.requestAnimFrame(this._redraw, this) } }, _redraw: function() { this._redrawRequest = null, this._draw(!0), this._draw(), this._redrawBounds = null }, _draw: function(t) { this._clear = t; var e, i = this._redrawBounds;
+                this._ctx.save(), i && (this._ctx.beginPath(), this._ctx.rect(i.min.x, i.min.y, i.max.x - i.min.x, i.max.y - i.min.y), this._ctx.clip()); for (var n in this._layers) e = this._layers[n], (!i || e._pxBounds.intersects(i)) && e._updatePath(), t && e._removed && (delete e._removed, delete this._layers[n]);
+                this._ctx.restore() }, _updatePoly: function(t, e) { var i, n, o, s, r = t._parts,
+                    a = r.length,
+                    h = this._ctx; if (a) { for (this._drawnLayers[t._leaflet_id] = t, h.beginPath(), i = 0; a > i; i++) { for (n = 0, o = r[i].length; o > n; n++) s = r[i][n], h[n ? "lineTo" : "moveTo"](s.x, s.y);
+                        e && h.closePath() }
+                    this._fillStroke(h, t) } }, _updateCircle: function(t) { if (!t._empty()) { var e = t._point,
+                        i = this._ctx,
+                        n = t._radius,
+                        o = (t._radiusY || n) / n;
+                    1 !== o && (i.save(), i.scale(1, o)), i.beginPath(), i.arc(e.x, e.y / o, n, 0, 2 * Math.PI, !1), 1 !== o && i.restore(), this._fillStroke(i, t) } }, _fillStroke: function(t, e) { var i = this._clear,
+                    n = e.options;
+                t.globalCompositeOperation = i ? "destination-out" : "source-over", n.fill && (t.globalAlpha = i ? 1 : n.fillOpacity, t.fillStyle = n.fillColor || n.color, t.fill(n.fillRule || "evenodd")), n.stroke && 0 !== n.weight && (t.globalAlpha = i ? 1 : n.opacity, e._prevWeight = t.lineWidth = i ? e._prevWeight + 1 : n.weight, t.strokeStyle = n.color, t.lineCap = n.lineCap, t.lineJoin = n.lineJoin, t.stroke()) }, _onClick: function(t) { var e = this._map.mouseEventToLayerPoint(t),
+                    i = []; for (var n in this._layers) this._layers[n]._containsPoint(e) && (o.DomEvent._fakeStop(t), i.push(this._layers[n]));
+                i.length && this._fireEvent(i, t) }, _onMouseMove: function(t) { if (this._map && !this._map.dragging._draggable._moving && !this._map._animatingZoom) { var e = this._map.mouseEventToLayerPoint(t);
+                    this._handleMouseOut(t, e), this._handleMouseHover(t, e) } }, _handleMouseOut: function(t, e) { var i = this._hoveredLayer;!i || "mouseout" !== t.type && i._containsPoint(e) || (o.DomUtil.removeClass(this._container, "leaflet-interactive"), this._fireEvent([i], t, "mouseout"), this._hoveredLayer = null) }, _handleMouseHover: function(t, e) { var i, n; if (!this._hoveredLayer)
+                    for (i in this._drawnLayers)
+                        if (n = this._drawnLayers[i], n.options.interactive && n._containsPoint(e)) { o.DomUtil.addClass(this._container, "leaflet-interactive"), this._fireEvent([n], t, "mouseover"), this._hoveredLayer = n; break }
+                this._hoveredLayer && this._fireEvent([this._hoveredLayer], t) }, _fireEvent: function(t, e, i) { this._map._fireDOMEvent(e, i || e.type, t) }, _bringToFront: o.Util.falseFn, _bringToBack: o.Util.falseFn }), o.Browser.canvas = function() { return !!e.createElement("canvas").getContext }(), o.canvas = function(t) { return o.Browser.canvas ? new o.Canvas(t) : null }, o.Polyline.prototype._containsPoint = function(t, e) { var i, n, s, r, a, h, l = this._clickTolerance(); if (!this._pxBounds.contains(t)) return !1; for (i = 0, r = this._parts.length; r > i; i++)
+                for (h = this._parts[i], n = 0, a = h.length, s = a - 1; a > n; s = n++)
+                    if ((e || 0 !== n) && o.LineUtil.pointToSegmentDistance(t, h[s], h[n]) <= l) return !0;
+            return !1 }, o.Polygon.prototype._containsPoint = function(t) { var e, i, n, s, r, a, h, l, u = !1; if (!this._pxBounds.contains(t)) return !1; for (s = 0, h = this._parts.length; h > s; s++)
+                for (e = this._parts[s], r = 0, l = e.length, a = l - 1; l > r; a = r++) i = e[r], n = e[a], i.y > t.y != n.y > t.y && t.x < (n.x - i.x) * (t.y - i.y) / (n.y - i.y) + i.x && (u = !u); return u || o.Polyline.prototype._containsPoint.call(this, t, !0) }, o.CircleMarker.prototype._containsPoint = function(t) { return t.distanceTo(this._point) <= this._radius + this._clickTolerance() }, o.GeoJSON = o.FeatureGroup.extend({ initialize: function(t, e) { o.setOptions(this, e), this._layers = {}, t && this.addData(t) }, addData: function(t) { var e, i, n, s = o.Util.isArray(t) ? t : t.features; if (s) { for (e = 0, i = s.length; i > e; e++) n = s[e], (n.geometries || n.geometry || n.features || n.coordinates) && this.addData(n); return this } var r = this.options; if (r.filter && !r.filter(t)) return this; var a = o.GeoJSON.geometryToLayer(t, r); return a ? (a.feature = o.GeoJSON.asFeature(t), a.defaultOptions = a.options, this.resetStyle(a), r.onEachFeature && r.onEachFeature(t, a), this.addLayer(a)) : this }, resetStyle: function(t) { return t.options = t.defaultOptions, this._setLayerStyle(t, this.options.style), this }, setStyle: function(t) { return this.eachLayer(function(e) { this._setLayerStyle(e, t) }, this) }, _setLayerStyle: function(t, e) { "function" == typeof e && (e = e(t.feature)), t.setStyle && t.setStyle(e) } }), o.extend(o.GeoJSON, { geometryToLayer: function(t, e) { var i, n, s, r, a = "Feature" === t.type ? t.geometry : t,
+                    h = a ? a.coordinates : null,
+                    l = [],
+                    u = e && e.pointToLayer,
+                    c = e && e.coordsToLatLng || this.coordsToLatLng; if (!h && !a) return null; switch (a.type) {
+                    case "Point":
+                        return i = c(h), u ? u(t, i) : new o.Marker(i);
+                    case "MultiPoint":
+                        for (s = 0, r = h.length; r > s; s++) i = c(h[s]), l.push(u ? u(t, i) : new o.Marker(i)); return new o.FeatureGroup(l);
+                    case "LineString":
+                    case "MultiLineString":
+                        return n = this.coordsToLatLngs(h, "LineString" === a.type ? 0 : 1, c), new o.Polyline(n, e);
+                    case "Polygon":
+                    case "MultiPolygon":
+                        return n = this.coordsToLatLngs(h, "Polygon" === a.type ? 1 : 2, c), new o.Polygon(n, e);
+                    case "GeometryCollection":
+                        for (s = 0, r = a.geometries.length; r > s; s++) { var d = this.geometryToLayer({ geometry: a.geometries[s], type: "Feature", properties: t.properties }, e);
+                            d && l.push(d) } return new o.FeatureGroup(l);
+                    default:
+                        throw new Error("Invalid GeoJSON object.") } }, coordsToLatLng: function(t) { return new o.LatLng(t[1], t[0], t[2]) }, coordsToLatLngs: function(t, e, i) { for (var n, o = [], s = 0, r = t.length; r > s; s++) n = e ? this.coordsToLatLngs(t[s], e - 1, i) : (i || this.coordsToLatLng)(t[s]), o.push(n); return o }, latLngToCoords: function(t) { return t.alt !== i ? [t.lng, t.lat, t.alt] : [t.lng, t.lat] }, latLngsToCoords: function(t, e, i) { for (var n = [], s = 0, r = t.length; r > s; s++) n.push(e ? o.GeoJSON.latLngsToCoords(t[s], e - 1, i) : o.GeoJSON.latLngToCoords(t[s])); return !e && i && n.push(n[0]), n }, getFeature: function(t, e) { return t.feature ? o.extend({}, t.feature, { geometry: e }) : o.GeoJSON.asFeature(e) }, asFeature: function(t) { return "Feature" === t.type ? t : { type: "Feature", properties: {}, geometry: t } } });
+    var r = { toGeoJSON: function() { return o.GeoJSON.getFeature(this, { type: "Point", coordinates: o.GeoJSON.latLngToCoords(this.getLatLng()) }) } };
+    o.Marker.include(r), o.Circle.include(r), o.CircleMarker.include(r), o.Polyline.prototype.toGeoJSON = function() { var t = !o.Polyline._flat(this._latlngs),
+            e = o.GeoJSON.latLngsToCoords(this._latlngs, t ? 1 : 0); return o.GeoJSON.getFeature(this, { type: (t ? "Multi" : "") + "LineString", coordinates: e }) }, o.Polygon.prototype.toGeoJSON = function() { var t = !o.Polyline._flat(this._latlngs),
+            e = t && !o.Polyline._flat(this._latlngs[0]),
+            i = o.GeoJSON.latLngsToCoords(this._latlngs, e ? 2 : t ? 1 : 0, !0); return t || (i = [i]), o.GeoJSON.getFeature(this, { type: (e ? "Multi" : "") + "Polygon", coordinates: i }) }, o.LayerGroup.include({ toMultiPoint: function() { var t = []; return this.eachLayer(function(e) { t.push(e.toGeoJSON().geometry.coordinates) }), o.GeoJSON.getFeature(this, { type: "MultiPoint", coordinates: t }) }, toGeoJSON: function() { var t = this.feature && this.feature.geometry && this.feature.geometry.type; if ("MultiPoint" === t) return this.toMultiPoint(); var e = "GeometryCollection" === t,
+                i = []; return this.eachLayer(function(t) { if (t.toGeoJSON) { var n = t.toGeoJSON();
+                    i.push(e ? n.geometry : o.GeoJSON.asFeature(n)) } }), e ? o.GeoJSON.getFeature(this, { geometries: i, type: "GeometryCollection" }) : { type: "FeatureCollection", features: i } } }), o.geoJson = function(t, e) { return new o.GeoJSON(t, e) };
+    var a = "_leaflet_events";
+    o.DomEvent = { on: function(t, e, i, n) { if ("object" == typeof e)
+                for (var s in e) this._on(t, s, e[s], i);
+            else { e = o.Util.splitWords(e); for (var r = 0, a = e.length; a > r; r++) this._on(t, e[r], i, n) } return this }, off: function(t, e, i, n) { if ("object" == typeof e)
+                for (var s in e) this._off(t, s, e[s], i);
+            else { e = o.Util.splitWords(e); for (var r = 0, a = e.length; a > r; r++) this._off(t, e[r], i, n) } return this }, _on: function(e, i, n, s) { var r = i + o.stamp(n) + (s ? "_" + o.stamp(s) : ""); if (e[a] && e[a][r]) return this; var h = function(i) { return n.call(s || e, i || t.event) },
+                l = h; return o.Browser.pointer && 0 === i.indexOf("touch") ? this.addPointerListener(e, i, h, r) : o.Browser.touch && "dblclick" === i && this.addDoubleTapListener ? this.addDoubleTapListener(e, h, r) : "addEventListener" in e ? "mousewheel" === i ? (e.addEventListener("DOMMouseScroll", h, !1), e.addEventListener(i, h, !1)) : "mouseenter" === i || "mouseleave" === i ? (h = function(i) { i = i || t.event, o.DomEvent._isExternalTarget(e, i) && l(i) }, e.addEventListener("mouseenter" === i ? "mouseover" : "mouseout", h, !1)) : ("click" === i && o.Browser.android && (h = function(t) { return o.DomEvent._filterClick(t, l) }), e.addEventListener(i, h, !1)) : "attachEvent" in e && e.attachEvent("on" + i, h), e[a] = e[a] || {}, e[a][r] = h, this }, _off: function(t, e, i, n) { var s = e + o.stamp(i) + (n ? "_" + o.stamp(n) : ""),
+                r = t[a] && t[a][s]; return r ? (o.Browser.pointer && 0 === e.indexOf("touch") ? this.removePointerListener(t, e, s) : o.Browser.touch && "dblclick" === e && this.removeDoubleTapListener ? this.removeDoubleTapListener(t, s) : "removeEventListener" in t ? "mousewheel" === e ? (t.removeEventListener("DOMMouseScroll", r, !1), t.removeEventListener(e, r, !1)) : t.removeEventListener("mouseenter" === e ? "mouseover" : "mouseleave" === e ? "mouseout" : e, r, !1) : "detachEvent" in t && t.detachEvent("on" + e, r), t[a][s] = null, this) : this }, stopPropagation: function(t) { return t.stopPropagation ? t.stopPropagation() : t.originalEvent ? t.originalEvent._stopped = !0 : t.cancelBubble = !0, o.DomEvent._skipped(t), this }, disableScrollPropagation: function(t) { return o.DomEvent.on(t, "mousewheel MozMousePixelScroll", o.DomEvent.stopPropagation) }, disableClickPropagation: function(t) { var e = o.DomEvent.stopPropagation; return o.DomEvent.on(t, o.Draggable.START.join(" "), e), o.DomEvent.on(t, { click: o.DomEvent._fakeStop, dblclick: e }) }, preventDefault: function(t) { return t.preventDefault ? t.preventDefault() : t.returnValue = !1, this }, stop: function(t) { return o.DomEvent.preventDefault(t).stopPropagation(t) }, getMousePosition: function(t, e) { if (!e) return new o.Point(t.clientX, t.clientY); var i = e.getBoundingClientRect(); return new o.Point(t.clientX - i.left - e.clientLeft, t.clientY - i.top - e.clientTop) }, getWheelDelta: function(t) { var e = 0; return t.wheelDelta && (e = t.wheelDelta / 120), t.detail && (e = -t.detail / 3), e }, _skipEvents: {}, _fakeStop: function(t) { o.DomEvent._skipEvents[t.type] = !0 }, _skipped: function(t) { var e = this._skipEvents[t.type]; return this._skipEvents[t.type] = !1, e }, _isExternalTarget: function(t, e) { var i = e.relatedTarget; if (!i) return !0; try { for (; i && i !== t;) i = i.parentNode } catch (n) { return !1 } return i !== t }, _filterClick: function(t, e) { var i = t.timeStamp || t.originalEvent.timeStamp,
+                n = o.DomEvent._lastClick && i - o.DomEvent._lastClick; return n && n > 100 && 500 > n || t.target._simulatedClick && !t._simulated ? void o.DomEvent.stop(t) : (o.DomEvent._lastClick = i, void e(t)) } }, o.DomEvent.addListener = o.DomEvent.on, o.DomEvent.removeListener = o.DomEvent.off, o.Draggable = o.Evented.extend({
+        statics: { START: o.Browser.touch ? ["touchstart", "mousedown"] : ["mousedown"], END: { mousedown: "mouseup", touchstart: "touchend", pointerdown: "touchend", MSPointerDown: "touchend" }, MOVE: { mousedown: "mousemove", touchstart: "touchmove", pointerdown: "touchmove", MSPointerDown: "touchmove" } },
+        initialize: function(t, e, i) { this._element = t, this._dragStartTarget = e || t, this._preventOutline = i },
+        enable: function() { this._enabled || (o.DomEvent.on(this._dragStartTarget, o.Draggable.START.join(" "), this._onDown, this), this._enabled = !0) },
+        disable: function() { this._enabled && (o.DomEvent.off(this._dragStartTarget, o.Draggable.START.join(" "), this._onDown, this), this._enabled = !1, this._moved = !1) },
+        _onDown: function(t) { if (this._moved = !1, !o.DomUtil.hasClass(this._element, "leaflet-zoom-anim") && !(o.Draggable._dragging || t.shiftKey || 1 !== t.which && 1 !== t.button && !t.touches) && this._enabled && (o.Draggable._dragging = !0, this._preventOutline && o.DomUtil.preventOutline(this._element), o.DomUtil.disableImageDrag(), o.DomUtil.disableTextSelection(), !this._moving)) { this.fire("down"); var i = t.touches ? t.touches[0] : t;
+                this._startPoint = new o.Point(i.clientX, i.clientY), this._startPos = this._newPos = o.DomUtil.getPosition(this._element), o.DomEvent.on(e, o.Draggable.MOVE[t.type], this._onMove, this).on(e, o.Draggable.END[t.type], this._onUp, this) } },
+        _onMove: function(t) {
+            if (t.touches && t.touches.length > 1) return void(this._moved = !0);
+            var i = t.touches && 1 === t.touches.length ? t.touches[0] : t,
+                n = new o.Point(i.clientX, i.clientY),
+                s = n.subtract(this._startPoint);
+            (s.x || s.y) && (o.Browser.touch && Math.abs(s.x) + Math.abs(s.y) < 3 || (o.DomEvent.preventDefault(t), this._moved || (this.fire("dragstart"), this._moved = !0, this._startPos = o.DomUtil.getPosition(this._element).subtract(s), o.DomUtil.addClass(e.body, "leaflet-dragging"), this._lastTarget = t.target || t.srcElement, o.DomUtil.addClass(this._lastTarget, "leaflet-drag-target")),
+                this._newPos = this._startPos.add(s), this._moving = !0, o.Util.cancelAnimFrame(this._animRequest), this._lastEvent = t, this._animRequest = o.Util.requestAnimFrame(this._updatePosition, this, !0)))
+        },
+        _updatePosition: function() { var t = { originalEvent: this._lastEvent };
+            this.fire("predrag", t), o.DomUtil.setPosition(this._element, this._newPos), this.fire("drag", t) },
+        _onUp: function() { o.DomUtil.removeClass(e.body, "leaflet-dragging"), this._lastTarget && (o.DomUtil.removeClass(this._lastTarget, "leaflet-drag-target"), this._lastTarget = null); for (var t in o.Draggable.MOVE) o.DomEvent.off(e, o.Draggable.MOVE[t], this._onMove, this).off(e, o.Draggable.END[t], this._onUp, this);
+            o.DomUtil.enableImageDrag(), o.DomUtil.enableTextSelection(), this._moved && this._moving && (o.Util.cancelAnimFrame(this._animRequest), this.fire("dragend", { distance: this._newPos.distanceTo(this._startPos) })), this._moving = !1, o.Draggable._dragging = !1 }
+    }), o.Handler = o.Class.extend({ initialize: function(t) { this._map = t }, enable: function() { this._enabled || (this._enabled = !0, this.addHooks()) }, disable: function() { this._enabled && (this._enabled = !1, this.removeHooks()) }, enabled: function() { return !!this._enabled } }), o.Map.mergeOptions({ dragging: !0, inertia: !o.Browser.android23, inertiaDeceleration: 3400, inertiaMaxSpeed: 1 / 0, easeLinearity: .2, worldCopyJump: !1 }), o.Map.Drag = o.Handler.extend({ addHooks: function() { if (!this._draggable) { var t = this._map;
+                this._draggable = new o.Draggable(t._mapPane, t._container), this._draggable.on({ down: this._onDown, dragstart: this._onDragStart, drag: this._onDrag, dragend: this._onDragEnd }, this), this._draggable.on("predrag", this._onPreDragLimit, this), t.options.worldCopyJump && (this._draggable.on("predrag", this._onPreDragWrap, this), t.on("zoomend", this._onZoomEnd, this), t.whenReady(this._onZoomEnd, this)) }
+            o.DomUtil.addClass(this._map._container, "leaflet-grab"), this._draggable.enable() }, removeHooks: function() { o.DomUtil.removeClass(this._map._container, "leaflet-grab"), this._draggable.disable() }, moved: function() { return this._draggable && this._draggable._moved }, _onDown: function() { this._map.stop() }, _onDragStart: function() { var t = this._map; if (this._map.options.maxBounds && this._map.options.maxBoundsViscosity) { var e = o.latLngBounds(this._map.options.maxBounds);
+                this._offsetLimit = o.bounds(this._map.latLngToContainerPoint(e.getNorthWest()).multiplyBy(-1), this._map.latLngToContainerPoint(e.getSouthEast()).multiplyBy(-1).add(this._map.getSize())), this._viscosity = Math.min(1, Math.max(0, this._map.options.maxBoundsViscosity)) } else this._offsetLimit = null;
+            t.fire("movestart").fire("dragstart"), t.options.inertia && (this._positions = [], this._times = []) }, _onDrag: function(t) { if (this._map.options.inertia) { var e = this._lastTime = +new Date,
+                    i = this._lastPos = this._draggable._absPos || this._draggable._newPos;
+                this._positions.push(i), this._times.push(e), e - this._times[0] > 50 && (this._positions.shift(), this._times.shift()) }
+            this._map.fire("move", t).fire("drag", t) }, _onZoomEnd: function() { var t = this._map.getSize().divideBy(2),
+                e = this._map.latLngToLayerPoint([0, 0]);
+            this._initialWorldOffset = e.subtract(t).x, this._worldWidth = this._map.getPixelWorldBounds().getSize().x }, _viscousLimit: function(t, e) { return t - (t - e) * this._viscosity }, _onPreDragLimit: function() { if (this._viscosity && this._offsetLimit) { var t = this._draggable._newPos.subtract(this._draggable._startPos),
+                    e = this._offsetLimit;
+                t.x < e.min.x && (t.x = this._viscousLimit(t.x, e.min.x)), t.y < e.min.y && (t.y = this._viscousLimit(t.y, e.min.y)), t.x > e.max.x && (t.x = this._viscousLimit(t.x, e.max.x)), t.y > e.max.y && (t.y = this._viscousLimit(t.y, e.max.y)), this._draggable._newPos = this._draggable._startPos.add(t) } }, _onPreDragWrap: function() { var t = this._worldWidth,
+                e = Math.round(t / 2),
+                i = this._initialWorldOffset,
+                n = this._draggable._newPos.x,
+                o = (n - e + i) % t + e - i,
+                s = (n + e + i) % t - e - i,
+                r = Math.abs(o + i) < Math.abs(s + i) ? o : s;
+            this._draggable._absPos = this._draggable._newPos.clone(), this._draggable._newPos.x = r }, _onDragEnd: function(t) { var e = this._map,
+                i = e.options,
+                n = !i.inertia || this._times.length < 2; if (e.fire("dragend", t), n) e.fire("moveend");
+            else { var s = this._lastPos.subtract(this._positions[0]),
+                    r = (this._lastTime - this._times[0]) / 1e3,
+                    a = i.easeLinearity,
+                    h = s.multiplyBy(a / r),
+                    l = h.distanceTo([0, 0]),
+                    u = Math.min(i.inertiaMaxSpeed, l),
+                    c = h.multiplyBy(u / l),
+                    d = u / (i.inertiaDeceleration * a),
+                    _ = c.multiplyBy(-d / 2).round();
+                _.x || _.y ? (_ = e._limitOffset(_, e.options.maxBounds), o.Util.requestAnimFrame(function() { e.panBy(_, { duration: d, easeLinearity: a, noMoveStart: !0, animate: !0 }) })) : e.fire("moveend") } } }), o.Map.addInitHook("addHandler", "dragging", o.Map.Drag), o.Map.mergeOptions({ doubleClickZoom: !0 }), o.Map.DoubleClickZoom = o.Handler.extend({ addHooks: function() { this._map.on("dblclick", this._onDoubleClick, this) }, removeHooks: function() { this._map.off("dblclick", this._onDoubleClick, this) }, _onDoubleClick: function(t) { var e = this._map,
+                i = e.getZoom(),
+                n = t.originalEvent.shiftKey ? Math.ceil(i) - 1 : Math.floor(i) + 1; "center" === e.options.doubleClickZoom ? e.setZoom(n) : e.setZoomAround(t.containerPoint, n) } }), o.Map.addInitHook("addHandler", "doubleClickZoom", o.Map.DoubleClickZoom), o.Map.mergeOptions({ scrollWheelZoom: !0, wheelDebounceTime: 40 }), o.Map.ScrollWheelZoom = o.Handler.extend({ addHooks: function() { o.DomEvent.on(this._map._container, { mousewheel: this._onWheelScroll, MozMousePixelScroll: o.DomEvent.preventDefault }, this), this._delta = 0 }, removeHooks: function() { o.DomEvent.off(this._map._container, { mousewheel: this._onWheelScroll, MozMousePixelScroll: o.DomEvent.preventDefault }, this) }, _onWheelScroll: function(t) { var e = o.DomEvent.getWheelDelta(t),
+                i = this._map.options.wheelDebounceTime;
+            this._delta += e, this._lastMousePos = this._map.mouseEventToContainerPoint(t), this._startTime || (this._startTime = +new Date); var n = Math.max(i - (+new Date - this._startTime), 0);
+            clearTimeout(this._timer), this._timer = setTimeout(o.bind(this._performZoom, this), n), o.DomEvent.stop(t) }, _performZoom: function() { var t = this._map,
+                e = this._delta,
+                i = t.getZoom();
+            t.stop(), e = e > 0 ? Math.ceil(e) : Math.floor(e), e = Math.max(Math.min(e, 4), -4), e = t._limitZoom(i + e) - i, this._delta = 0, this._startTime = null, e && ("center" === t.options.scrollWheelZoom ? t.setZoom(i + e) : t.setZoomAround(this._lastMousePos, i + e)) } }), o.Map.addInitHook("addHandler", "scrollWheelZoom", o.Map.ScrollWheelZoom), o.extend(o.DomEvent, { _touchstart: o.Browser.msPointer ? "MSPointerDown" : o.Browser.pointer ? "pointerdown" : "touchstart", _touchend: o.Browser.msPointer ? "MSPointerUp" : o.Browser.pointer ? "pointerup" : "touchend", addDoubleTapListener: function(t, e, i) {
+            function n(t) { var e; if (e = o.Browser.pointer ? o.DomEvent._pointersCount : t.touches.length, !(e > 1)) { var i = Date.now(),
+                        n = i - (r || i);
+                    a = t.touches ? t.touches[0] : t, h = n > 0 && l >= n, r = i } }
+
+            function s() { if (h && !a.cancelBubble) { if (o.Browser.pointer) { var t, i, n = {}; for (i in a) t = a[i], n[i] = t && t.bind ? t.bind(a) : t;
+                        a = n }
+                    a.type = "dblclick", e(a), r = null } } var r, a, h = !1,
+                l = 250,
+                u = "_leaflet_",
+                c = this._touchstart,
+                d = this._touchend; return t[u + c + i] = n, t[u + d + i] = s, t.addEventListener(c, n, !1), t.addEventListener(d, s, !1), this }, removeDoubleTapListener: function(t, e) { var i = "_leaflet_",
+                n = t[i + this._touchend + e]; return t.removeEventListener(this._touchstart, t[i + this._touchstart + e], !1), t.removeEventListener(this._touchend, n, !1), this } }), o.extend(o.DomEvent, { POINTER_DOWN: o.Browser.msPointer ? "MSPointerDown" : "pointerdown", POINTER_MOVE: o.Browser.msPointer ? "MSPointerMove" : "pointermove", POINTER_UP: o.Browser.msPointer ? "MSPointerUp" : "pointerup", POINTER_CANCEL: o.Browser.msPointer ? "MSPointerCancel" : "pointercancel", _pointers: {}, _pointersCount: 0, addPointerListener: function(t, e, i, n) { return "touchstart" === e ? this._addPointerStart(t, i, n) : "touchmove" === e ? this._addPointerMove(t, i, n) : "touchend" === e && this._addPointerEnd(t, i, n), this }, removePointerListener: function(t, e, i) { var n = t["_leaflet_" + e + i]; return "touchstart" === e ? t.removeEventListener(this.POINTER_DOWN, n, !1) : "touchmove" === e ? t.removeEventListener(this.POINTER_MOVE, n, !1) : "touchend" === e && (t.removeEventListener(this.POINTER_UP, n, !1), t.removeEventListener(this.POINTER_CANCEL, n, !1)), this }, _addPointerStart: function(t, i, n) { var s = o.bind(function(t) { "mouse" !== t.pointerType && t.pointerType !== t.MSPOINTER_TYPE_MOUSE && o.DomEvent.preventDefault(t), this._handlePointer(t, i) }, this); if (t["_leaflet_touchstart" + n] = s, t.addEventListener(this.POINTER_DOWN, s, !1), !this._pointerDocListener) { var r = o.bind(this._globalPointerUp, this);
+                e.documentElement.addEventListener(this.POINTER_DOWN, o.bind(this._globalPointerDown, this), !0), e.documentElement.addEventListener(this.POINTER_MOVE, o.bind(this._globalPointerMove, this), !0), e.documentElement.addEventListener(this.POINTER_UP, r, !0), e.documentElement.addEventListener(this.POINTER_CANCEL, r, !0), this._pointerDocListener = !0 } }, _globalPointerDown: function(t) { this._pointers[t.pointerId] = t, this._pointersCount++ }, _globalPointerMove: function(t) { this._pointers[t.pointerId] && (this._pointers[t.pointerId] = t) }, _globalPointerUp: function(t) { delete this._pointers[t.pointerId], this._pointersCount-- }, _handlePointer: function(t, e) { t.touches = []; for (var i in this._pointers) t.touches.push(this._pointers[i]);
+            t.changedTouches = [t], e(t) }, _addPointerMove: function(t, e, i) { var n = o.bind(function(t) {
+                (t.pointerType !== t.MSPOINTER_TYPE_MOUSE && "mouse" !== t.pointerType || 0 !== t.buttons) && this._handlePointer(t, e) }, this);
+            t["_leaflet_touchmove" + i] = n, t.addEventListener(this.POINTER_MOVE, n, !1) }, _addPointerEnd: function(t, e, i) { var n = o.bind(function(t) { this._handlePointer(t, e) }, this);
+            t["_leaflet_touchend" + i] = n, t.addEventListener(this.POINTER_UP, n, !1), t.addEventListener(this.POINTER_CANCEL, n, !1) } }), o.Map.mergeOptions({ touchZoom: o.Browser.touch && !o.Browser.android23, bounceAtZoomLimits: !0 }), o.Map.TouchZoom = o.Handler.extend({ addHooks: function() { o.DomEvent.on(this._map._container, "touchstart", this._onTouchStart, this) }, removeHooks: function() { o.DomEvent.off(this._map._container, "touchstart", this._onTouchStart, this) }, _onTouchStart: function(t) { var i = this._map; if (t.touches && 2 === t.touches.length && !i._animatingZoom && !this._zooming) { var n = i.mouseEventToContainerPoint(t.touches[0]),
+                    s = i.mouseEventToContainerPoint(t.touches[1]);
+                this._centerPoint = i.getSize()._divideBy(2), this._startLatLng = i.containerPointToLatLng(this._centerPoint), "center" !== i.options.touchZoom && (this._pinchStartLatLng = i.containerPointToLatLng(n.add(s)._divideBy(2))), this._startDist = n.distanceTo(s), this._startZoom = i.getZoom(), this._moved = !1, this._zooming = !0, i.stop(), o.DomEvent.on(e, "touchmove", this._onTouchMove, this).on(e, "touchend", this._onTouchEnd, this), o.DomEvent.preventDefault(t) } }, _onTouchMove: function(t) { if (t.touches && 2 === t.touches.length && this._zooming) { var e = this._map,
+                    i = e.mouseEventToContainerPoint(t.touches[0]),
+                    n = e.mouseEventToContainerPoint(t.touches[1]),
+                    s = i.distanceTo(n) / this._startDist; if (this._zoom = e.getScaleZoom(s, this._startZoom), "center" === e.options.touchZoom) { if (this._center = this._startLatLng, 1 === s) return } else { var r = i._add(n)._divideBy(2)._subtract(this._centerPoint); if (1 === s && 0 === r.x && 0 === r.y) return;
+                    this._center = e.unproject(e.project(this._pinchStartLatLng).subtract(r)) } if (e.options.bounceAtZoomLimits || !(this._zoom <= e.getMinZoom() && 1 > s || this._zoom >= e.getMaxZoom() && s > 1)) { this._moved || (e._moveStart(!0), this._moved = !0), o.Util.cancelAnimFrame(this._animRequest); var a = o.bind(e._move, e, this._center, this._zoom, { pinch: !0, round: !1 });
+                    this._animRequest = o.Util.requestAnimFrame(a, this, !0), o.DomEvent.preventDefault(t) } } }, _onTouchEnd: function() { if (!this._moved || !this._zooming) return void(this._zooming = !1);
+            this._zooming = !1, o.Util.cancelAnimFrame(this._animRequest), o.DomEvent.off(e, "touchmove", this._onTouchMove).off(e, "touchend", this._onTouchEnd); var t = this._zoom;
+            t = this._map._limitZoom(t - this._startZoom > 0 ? Math.ceil(t) : Math.floor(t)), this._map._animateZoom(this._center, t, !0, !0) } }), o.Map.addInitHook("addHandler", "touchZoom", o.Map.TouchZoom), o.Map.mergeOptions({ tap: !0, tapTolerance: 15 }), o.Map.Tap = o.Handler.extend({ addHooks: function() { o.DomEvent.on(this._map._container, "touchstart", this._onDown, this) }, removeHooks: function() { o.DomEvent.off(this._map._container, "touchstart", this._onDown, this) }, _onDown: function(t) { if (t.touches) { if (o.DomEvent.preventDefault(t), this._fireClick = !0, t.touches.length > 1) return this._fireClick = !1, void clearTimeout(this._holdTimeout); var i = t.touches[0],
+                    n = i.target;
+                this._startPos = this._newPos = new o.Point(i.clientX, i.clientY), n.tagName && "a" === n.tagName.toLowerCase() && o.DomUtil.addClass(n, "leaflet-active"), this._holdTimeout = setTimeout(o.bind(function() { this._isTapValid() && (this._fireClick = !1, this._onUp(), this._simulateEvent("contextmenu", i)) }, this), 1e3), this._simulateEvent("mousedown", i), o.DomEvent.on(e, { touchmove: this._onMove, touchend: this._onUp }, this) } }, _onUp: function(t) { if (clearTimeout(this._holdTimeout), o.DomEvent.off(e, { touchmove: this._onMove, touchend: this._onUp }, this), this._fireClick && t && t.changedTouches) { var i = t.changedTouches[0],
+                    n = i.target;
+                n && n.tagName && "a" === n.tagName.toLowerCase() && o.DomUtil.removeClass(n, "leaflet-active"), this._simulateEvent("mouseup", i), this._isTapValid() && this._simulateEvent("click", i) } }, _isTapValid: function() { return this._newPos.distanceTo(this._startPos) <= this._map.options.tapTolerance }, _onMove: function(t) { var e = t.touches[0];
+            this._newPos = new o.Point(e.clientX, e.clientY), this._simulateEvent("mousemove", e) }, _simulateEvent: function(i, n) { var o = e.createEvent("MouseEvents");
+            o._simulated = !0, n.target._simulatedClick = !0, o.initMouseEvent(i, !0, !0, t, 1, n.screenX, n.screenY, n.clientX, n.clientY, !1, !1, !1, !1, 0, null), n.target.dispatchEvent(o) } }), o.Browser.touch && !o.Browser.pointer && o.Map.addInitHook("addHandler", "tap", o.Map.Tap), o.Map.mergeOptions({ boxZoom: !0 }), o.Map.BoxZoom = o.Handler.extend({ initialize: function(t) { this._map = t, this._container = t._container, this._pane = t._panes.overlayPane }, addHooks: function() { o.DomEvent.on(this._container, "mousedown", this._onMouseDown, this) }, removeHooks: function() { o.DomEvent.off(this._container, "mousedown", this._onMouseDown, this) }, moved: function() { return this._moved }, _resetState: function() { this._moved = !1 }, _onMouseDown: function(t) { return !t.shiftKey || 1 !== t.which && 1 !== t.button ? !1 : (this._resetState(), o.DomUtil.disableTextSelection(), o.DomUtil.disableImageDrag(), this._startPoint = this._map.mouseEventToContainerPoint(t), void o.DomEvent.on(e, { contextmenu: o.DomEvent.stop, mousemove: this._onMouseMove, mouseup: this._onMouseUp, keydown: this._onKeyDown }, this)) }, _onMouseMove: function(t) { this._moved || (this._moved = !0, this._box = o.DomUtil.create("div", "leaflet-zoom-box", this._container), o.DomUtil.addClass(this._container, "leaflet-crosshair"), this._map.fire("boxzoomstart")), this._point = this._map.mouseEventToContainerPoint(t); var e = new o.Bounds(this._point, this._startPoint),
+                i = e.getSize();
+            o.DomUtil.setPosition(this._box, e.min), this._box.style.width = i.x + "px", this._box.style.height = i.y + "px" }, _finish: function() { this._moved && (o.DomUtil.remove(this._box), o.DomUtil.removeClass(this._container, "leaflet-crosshair")), o.DomUtil.enableTextSelection(), o.DomUtil.enableImageDrag(), o.DomEvent.off(e, { contextmenu: o.DomEvent.stop, mousemove: this._onMouseMove, mouseup: this._onMouseUp, keydown: this._onKeyDown }, this) }, _onMouseUp: function(t) { if ((1 === t.which || 1 === t.button) && (this._finish(), this._moved)) { setTimeout(o.bind(this._resetState, this), 0); var e = new o.LatLngBounds(this._map.containerPointToLatLng(this._startPoint), this._map.containerPointToLatLng(this._point));
+                this._map.fitBounds(e).fire("boxzoomend", { boxZoomBounds: e }) } }, _onKeyDown: function(t) { 27 === t.keyCode && this._finish() } }), o.Map.addInitHook("addHandler", "boxZoom", o.Map.BoxZoom), o.Map.mergeOptions({ keyboard: !0, keyboardPanOffset: 80, keyboardZoomOffset: 1 }), o.Map.Keyboard = o.Handler.extend({ keyCodes: { left: [37], right: [39], down: [40], up: [38], zoomIn: [187, 107, 61, 171], zoomOut: [189, 109, 54, 173] }, initialize: function(t) { this._map = t, this._setPanOffset(t.options.keyboardPanOffset), this._setZoomOffset(t.options.keyboardZoomOffset) }, addHooks: function() { var t = this._map._container;
+            t.tabIndex <= 0 && (t.tabIndex = "0"), o.DomEvent.on(t, { focus: this._onFocus, blur: this._onBlur, mousedown: this._onMouseDown }, this), this._map.on({ focus: this._addHooks, blur: this._removeHooks }, this) }, removeHooks: function() { this._removeHooks(), o.DomEvent.off(this._map._container, { focus: this._onFocus, blur: this._onBlur, mousedown: this._onMouseDown }, this), this._map.off({ focus: this._addHooks, blur: this._removeHooks }, this) }, _onMouseDown: function() { if (!this._focused) { var i = e.body,
+                    n = e.documentElement,
+                    o = i.scrollTop || n.scrollTop,
+                    s = i.scrollLeft || n.scrollLeft;
+                this._map._container.focus(), t.scrollTo(s, o) } }, _onFocus: function() { this._focused = !0, this._map.fire("focus") }, _onBlur: function() { this._focused = !1, this._map.fire("blur") }, _setPanOffset: function(t) { var e, i, n = this._panKeys = {},
+                o = this.keyCodes; for (e = 0, i = o.left.length; i > e; e++) n[o.left[e]] = [-1 * t, 0]; for (e = 0, i = o.right.length; i > e; e++) n[o.right[e]] = [t, 0]; for (e = 0, i = o.down.length; i > e; e++) n[o.down[e]] = [0, t]; for (e = 0, i = o.up.length; i > e; e++) n[o.up[e]] = [0, -1 * t] }, _setZoomOffset: function(t) { var e, i, n = this._zoomKeys = {},
+                o = this.keyCodes; for (e = 0, i = o.zoomIn.length; i > e; e++) n[o.zoomIn[e]] = t; for (e = 0, i = o.zoomOut.length; i > e; e++) n[o.zoomOut[e]] = -t }, _addHooks: function() { o.DomEvent.on(e, "keydown", this._onKeyDown, this) }, _removeHooks: function() { o.DomEvent.off(e, "keydown", this._onKeyDown, this) }, _onKeyDown: function(t) { if (!(t.altKey || t.ctrlKey || t.metaKey)) { var e, i = t.keyCode,
+                    n = this._map; if (i in this._panKeys) { if (n._panAnim && n._panAnim._inProgress) return;
+                    e = this._panKeys[i], t.shiftKey && (e = o.point(e).multiplyBy(3)), n.panBy(e), n.options.maxBounds && n.panInsideBounds(n.options.maxBounds) } else if (i in this._zoomKeys) n.setZoom(n.getZoom() + (t.shiftKey ? 3 : 1) * this._zoomKeys[i]);
+                else { if (27 !== i) return;
+                    n.closePopup() }
+                o.DomEvent.stop(t) } } }), o.Map.addInitHook("addHandler", "keyboard", o.Map.Keyboard), o.Handler.MarkerDrag = o.Handler.extend({ initialize: function(t) { this._marker = t }, addHooks: function() { var t = this._marker._icon;
+            this._draggable || (this._draggable = new o.Draggable(t, t, !0)), this._draggable.on({ dragstart: this._onDragStart, drag: this._onDrag, dragend: this._onDragEnd }, this).enable(), o.DomUtil.addClass(t, "leaflet-marker-draggable") }, removeHooks: function() { this._draggable.off({ dragstart: this._onDragStart, drag: this._onDrag, dragend: this._onDragEnd }, this).disable(), this._marker._icon && o.DomUtil.removeClass(this._marker._icon, "leaflet-marker-draggable") }, moved: function() { return this._draggable && this._draggable._moved }, _onDragStart: function() { this._marker.closePopup().fire("movestart").fire("dragstart") }, _onDrag: function(t) { var e = this._marker,
+                i = e._shadow,
+                n = o.DomUtil.getPosition(e._icon),
+                s = e._map.layerPointToLatLng(n);
+            i && o.DomUtil.setPosition(i, n), e._latlng = s, t.latlng = s, e.fire("move", t).fire("drag", t) }, _onDragEnd: function(t) { this._marker.fire("moveend").fire("dragend", t) } }), o.Control = o.Class.extend({ options: { position: "topright" }, initialize: function(t) { o.setOptions(this, t) }, getPosition: function() { return this.options.position }, setPosition: function(t) { var e = this._map; return e && e.removeControl(this), this.options.position = t, e && e.addControl(this), this }, getContainer: function() { return this._container }, addTo: function(t) { this.remove(), this._map = t; var e = this._container = this.onAdd(t),
+                i = this.getPosition(),
+                n = t._controlCorners[i]; return o.DomUtil.addClass(e, "leaflet-control"), -1 !== i.indexOf("bottom") ? n.insertBefore(e, n.firstChild) : n.appendChild(e), this }, remove: function() { return this._map ? (o.DomUtil.remove(this._container), this.onRemove && this.onRemove(this._map), this._map = null, this) : this }, _refocusOnMap: function(t) { this._map && t && t.screenX > 0 && t.screenY > 0 && this._map.getContainer().focus() } }), o.control = function(t) { return new o.Control(t) }, o.Map.include({ addControl: function(t) { return t.addTo(this), this }, removeControl: function(t) { return t.remove(), this }, _initControlPos: function() {
+            function t(t, s) { var r = i + t + " " + i + s;
+                e[t + s] = o.DomUtil.create("div", r, n) } var e = this._controlCorners = {},
+                i = "leaflet-",
+                n = this._controlContainer = o.DomUtil.create("div", i + "control-container", this._container);
+            t("top", "left"), t("top", "right"), t("bottom", "left"), t("bottom", "right") }, _clearControlPos: function() { o.DomUtil.remove(this._controlContainer) } }), o.Control.Zoom = o.Control.extend({ options: { position: "topleft", zoomInText: "+", zoomInTitle: "Zoom in", zoomOutText: "-", zoomOutTitle: "Zoom out" }, onAdd: function(t) { var e = "leaflet-control-zoom",
+                i = o.DomUtil.create("div", e + " leaflet-bar"),
+                n = this.options; return this._zoomInButton = this._createButton(n.zoomInText, n.zoomInTitle, e + "-in", i, this._zoomIn), this._zoomOutButton = this._createButton(n.zoomOutText, n.zoomOutTitle, e + "-out", i, this._zoomOut), this._updateDisabled(), t.on("zoomend zoomlevelschange", this._updateDisabled, this), i }, onRemove: function(t) { t.off("zoomend zoomlevelschange", this._updateDisabled, this) }, disable: function() { return this._disabled = !0, this._updateDisabled(), this }, enable: function() { return this._disabled = !1, this._updateDisabled(), this }, _zoomIn: function(t) { this._disabled || this._map.zoomIn(t.shiftKey ? 3 : 1) }, _zoomOut: function(t) { this._disabled || this._map.zoomOut(t.shiftKey ? 3 : 1) }, _createButton: function(t, e, i, n, s) { var r = o.DomUtil.create("a", i, n); return r.innerHTML = t, r.href = "#", r.title = e, o.DomEvent.on(r, "mousedown dblclick", o.DomEvent.stopPropagation).on(r, "click", o.DomEvent.stop).on(r, "click", s, this).on(r, "click", this._refocusOnMap, this), r }, _updateDisabled: function() { var t = this._map,
+                e = "leaflet-disabled";
+            o.DomUtil.removeClass(this._zoomInButton, e), o.DomUtil.removeClass(this._zoomOutButton, e), (this._disabled || t._zoom === t.getMinZoom()) && o.DomUtil.addClass(this._zoomOutButton, e), (this._disabled || t._zoom === t.getMaxZoom()) && o.DomUtil.addClass(this._zoomInButton, e) } }), o.Map.mergeOptions({ zoomControl: !0 }), o.Map.addInitHook(function() { this.options.zoomControl && (this.zoomControl = new o.Control.Zoom, this.addControl(this.zoomControl)) }), o.control.zoom = function(t) { return new o.Control.Zoom(t) }, o.Control.Attribution = o.Control.extend({ options: { position: "bottomright", prefix: '<a href="http://leafletjs.com" title="A JS library for interactive maps">Leaflet</a>' }, initialize: function(t) { o.setOptions(this, t), this._attributions = {} }, onAdd: function(t) { this._container = o.DomUtil.create("div", "leaflet-control-attribution"), o.DomEvent && o.DomEvent.disableClickPropagation(this._container); for (var e in t._layers) t._layers[e].getAttribution && this.addAttribution(t._layers[e].getAttribution()); return this._update(), this._container }, setPrefix: function(t) { return this.options.prefix = t, this._update(), this }, addAttribution: function(t) { return t ? (this._attributions[t] || (this._attributions[t] = 0), this._attributions[t]++, this._update(), this) : this }, removeAttribution: function(t) { return t ? (this._attributions[t] && (this._attributions[t]--, this._update()), this) : this }, _update: function() { if (this._map) { var t = []; for (var e in this._attributions) this._attributions[e] && t.push(e); var i = [];
+                this.options.prefix && i.push(this.options.prefix), t.length && i.push(t.join(", ")), this._container.innerHTML = i.join(" | ") } } }), o.Map.mergeOptions({ attributionControl: !0 }), o.Map.addInitHook(function() { this.options.attributionControl && (this.attributionControl = (new o.Control.Attribution).addTo(this)) }), o.control.attribution = function(t) { return new o.Control.Attribution(t) }, o.Control.Scale = o.Control.extend({ options: { position: "bottomleft", maxWidth: 100, metric: !0, imperial: !0 }, onAdd: function(t) { var e = "leaflet-control-scale",
+                i = o.DomUtil.create("div", e),
+                n = this.options; return this._addScales(n, e + "-line", i), t.on(n.updateWhenIdle ? "moveend" : "move", this._update, this), t.whenReady(this._update, this), i }, onRemove: function(t) { t.off(this.options.updateWhenIdle ? "moveend" : "move", this._update, this) }, _addScales: function(t, e, i) { t.metric && (this._mScale = o.DomUtil.create("div", e, i)), t.imperial && (this._iScale = o.DomUtil.create("div", e, i)) }, _update: function() { var t = this._map,
+                e = t.getSize().y / 2,
+                i = t.distance(t.containerPointToLatLng([0, e]), t.containerPointToLatLng([this.options.maxWidth, e]));
+            this._updateScales(i) }, _updateScales: function(t) { this.options.metric && t && this._updateMetric(t), this.options.imperial && t && this._updateImperial(t) }, _updateMetric: function(t) { var e = this._getRoundNum(t),
+                i = 1e3 > e ? e + " m" : e / 1e3 + " km";
+            this._updateScale(this._mScale, i, e / t) }, _updateImperial: function(t) { var e, i, n, o = 3.2808399 * t;
+            o > 5280 ? (e = o / 5280, i = this._getRoundNum(e), this._updateScale(this._iScale, i + " mi", i / e)) : (n = this._getRoundNum(o), this._updateScale(this._iScale, n + " ft", n / o)) }, _updateScale: function(t, e, i) { t.style.width = Math.round(this.options.maxWidth * i) + "px", t.innerHTML = e }, _getRoundNum: function(t) { var e = Math.pow(10, (Math.floor(t) + "").length - 1),
+                i = t / e; return i = i >= 10 ? 10 : i >= 5 ? 5 : i >= 3 ? 3 : i >= 2 ? 2 : 1, e * i } }), o.control.scale = function(t) { return new o.Control.Scale(t) }, o.Control.Layers = o.Control.extend({ options: { collapsed: !0, position: "topright", autoZIndex: !0, hideSingleBase: !1 }, initialize: function(t, e, i) { o.setOptions(this, i), this._layers = {}, this._lastZIndex = 0, this._handlingClick = !1; for (var n in t) this._addLayer(t[n], n); for (n in e) this._addLayer(e[n], n, !0) }, onAdd: function(t) { return this._initLayout(), this._update(), this._map = t, t.on("zoomend", this._checkDisabledLayers, this), this._container }, onRemove: function() { this._map.off("zoomend", this._checkDisabledLayers, this) }, addBaseLayer: function(t, e) { return this._addLayer(t, e), this._update() }, addOverlay: function(t, e) { return this._addLayer(t, e, !0), this._update() }, removeLayer: function(t) { return t.off("add remove", this._onLayerChange, this), delete this._layers[o.stamp(t)], this._update() }, _initLayout: function() { var t = "leaflet-control-layers",
+                e = this._container = o.DomUtil.create("div", t);
+            e.setAttribute("aria-haspopup", !0), o.DomEvent.disableClickPropagation(e), o.Browser.touch || o.DomEvent.disableScrollPropagation(e); var i = this._form = o.DomUtil.create("form", t + "-list"); if (this.options.collapsed) { o.Browser.android || o.DomEvent.on(e, { mouseenter: this._expand, mouseleave: this._collapse }, this); var n = this._layersLink = o.DomUtil.create("a", t + "-toggle", e);
+                n.href = "#", n.title = "Layers", o.Browser.touch ? o.DomEvent.on(n, "click", o.DomEvent.stop).on(n, "click", this._expand, this) : o.DomEvent.on(n, "focus", this._expand, this), o.DomEvent.on(i, "click", function() { setTimeout(o.bind(this._onInputClick, this), 0) }, this), this._map.on("click", this._collapse, this) } else this._expand();
+            this._baseLayersList = o.DomUtil.create("div", t + "-base", i), this._separator = o.DomUtil.create("div", t + "-separator", i), this._overlaysList = o.DomUtil.create("div", t + "-overlays", i), e.appendChild(i) }, _addLayer: function(t, e, i) { t.on("add remove", this._onLayerChange, this); var n = o.stamp(t);
+            this._layers[n] = { layer: t, name: e, overlay: i }, this.options.autoZIndex && t.setZIndex && (this._lastZIndex++, t.setZIndex(this._lastZIndex)) }, _update: function() { if (!this._container) return this;
+            o.DomUtil.empty(this._baseLayersList), o.DomUtil.empty(this._overlaysList); var t, e, i, n, s = 0; for (i in this._layers) n = this._layers[i], this._addItem(n), e = e || n.overlay, t = t || !n.overlay, s += n.overlay ? 0 : 1; return this.options.hideSingleBase && (t = t && s > 1, this._baseLayersList.style.display = t ? "" : "none"), this._separator.style.display = e && t ? "" : "none", this }, _onLayerChange: function(t) { this._handlingClick || this._update(); var e = this._layers[o.stamp(t.target)],
+                i = e.overlay ? "add" === t.type ? "overlayadd" : "overlayremove" : "add" === t.type ? "baselayerchange" : null;
+            i && this._map.fire(i, e) }, _createRadioElement: function(t, i) { var n = '<input type="radio" class="leaflet-control-layers-selector" name="' + t + '"' + (i ? ' checked="checked"' : "") + "/>",
+                o = e.createElement("div"); return o.innerHTML = n, o.firstChild }, _addItem: function(t) { var i, n = e.createElement("label"),
+                s = this._map.hasLayer(t.layer);
+            t.overlay ? (i = e.createElement("input"), i.type = "checkbox", i.className = "leaflet-control-layers-selector", i.defaultChecked = s) : i = this._createRadioElement("leaflet-base-layers", s), i.layerId = o.stamp(t.layer), o.DomEvent.on(i, "click", this._onInputClick, this); var r = e.createElement("span");
+            r.innerHTML = " " + t.name; var a = e.createElement("div");
+            n.appendChild(a), a.appendChild(i), a.appendChild(r); var h = t.overlay ? this._overlaysList : this._baseLayersList; return h.appendChild(n), this._checkDisabledLayers(), n }, _onInputClick: function() { var t, e, i, n = this._form.getElementsByTagName("input"),
+                o = [],
+                s = [];
+            this._handlingClick = !0; for (var r = n.length - 1; r >= 0; r--) t = n[r], e = this._layers[t.layerId].layer, i = this._map.hasLayer(e), t.checked && !i ? o.push(e) : !t.checked && i && s.push(e); for (r = 0; r < s.length; r++) this._map.removeLayer(s[r]); for (r = 0; r < o.length; r++) this._map.addLayer(o[r]);
+            this._handlingClick = !1, this._refocusOnMap() }, _expand: function() { o.DomUtil.addClass(this._container, "leaflet-control-layers-expanded"), this._form.style.height = null; var t = this._map._size.y - (this._container.offsetTop + 50);
+            t < this._form.clientHeight ? (o.DomUtil.addClass(this._form, "leaflet-control-layers-scrollbar"), this._form.style.height = t + "px") : o.DomUtil.removeClass(this._form, "leaflet-control-layers-scrollbar"), this._checkDisabledLayers() }, _collapse: function() { o.DomUtil.removeClass(this._container, "leaflet-control-layers-expanded") }, _checkDisabledLayers: function() { for (var t, e, n = this._form.getElementsByTagName("input"), o = this._map.getZoom(), s = n.length - 1; s >= 0; s--) t = n[s], e = this._layers[t.layerId].layer, t.disabled = e.options.minZoom !== i && o < e.options.minZoom || e.options.maxZoom !== i && o > e.options.maxZoom } }), o.control.layers = function(t, e, i) { return new o.Control.Layers(t, e, i) }, o.PosAnimation = o.Evented.extend({ run: function(t, e, i, n) { this.stop(), this._el = t, this._inProgress = !0, this._duration = i || .25, this._easeOutPower = 1 / Math.max(n || .5, .2), this._startPos = o.DomUtil.getPosition(t), this._offset = e.subtract(this._startPos), this._startTime = +new Date, this.fire("start"), this._animate() }, stop: function() { this._inProgress && (this._step(!0), this._complete()) }, _animate: function() { this._animId = o.Util.requestAnimFrame(this._animate, this), this._step() }, _step: function(t) { var e = +new Date - this._startTime,
+                i = 1e3 * this._duration;
+            i > e ? this._runFrame(this._easeOut(e / i), t) : (this._runFrame(1), this._complete()) }, _runFrame: function(t, e) { var i = this._startPos.add(this._offset.multiplyBy(t));
+            e && i._round(), o.DomUtil.setPosition(this._el, i), this.fire("step") }, _complete: function() { o.Util.cancelAnimFrame(this._animId), this._inProgress = !1, this.fire("end") }, _easeOut: function(t) { return 1 - Math.pow(1 - t, this._easeOutPower) } }), o.Map.include({ setView: function(t, e, n) { if (e = e === i ? this._zoom : this._limitZoom(e), t = this._limitCenter(o.latLng(t), e, this.options.maxBounds), n = n || {}, this.stop(), this._loaded && !n.reset && n !== !0) { n.animate !== i && (n.zoom = o.extend({ animate: n.animate }, n.zoom), n.pan = o.extend({ animate: n.animate, duration: n.duration }, n.pan)); var s = this._zoom !== e ? this._tryAnimatedZoom && this._tryAnimatedZoom(t, e, n.zoom) : this._tryAnimatedPan(t, n.pan); if (s) return clearTimeout(this._sizeTimer), this } return this._resetView(t, e), this }, panBy: function(t, e) { if (t = o.point(t).round(), e = e || {}, !t.x && !t.y) return this.fire("moveend"); if (e.animate !== !0 && !this.getSize().contains(t)) return this._resetView(this.unproject(this.project(this.getCenter()).add(t)), this.getZoom()), this; if (this._panAnim || (this._panAnim = new o.PosAnimation, this._panAnim.on({ step: this._onPanTransitionStep, end: this._onPanTransitionEnd }, this)), e.noMoveStart || this.fire("movestart"), e.animate !== !1) { o.DomUtil.addClass(this._mapPane, "leaflet-pan-anim"); var i = this._getMapPanePos().subtract(t);
+                this._panAnim.run(this._mapPane, i, e.duration || .25, e.easeLinearity) } else this._rawPanBy(t), this.fire("move").fire("moveend"); return this }, _onPanTransitionStep: function() { this.fire("move") }, _onPanTransitionEnd: function() { o.DomUtil.removeClass(this._mapPane, "leaflet-pan-anim"), this.fire("moveend") }, _tryAnimatedPan: function(t, e) { var i = this._getCenterOffset(t)._floor(); return (e && e.animate) === !0 || this.getSize().contains(i) ? (this.panBy(i, e), !0) : !1 } }), o.Map.mergeOptions({ zoomAnimation: !0, zoomAnimationThreshold: 4 });
+    var h = o.DomUtil.TRANSITION && o.Browser.any3d && !o.Browser.mobileOpera;
+    h && o.Map.addInitHook(function() { this._zoomAnimated = this.options.zoomAnimation, this._zoomAnimated && (this._createAnimProxy(), o.DomEvent.on(this._proxy, o.DomUtil.TRANSITION_END, this._catchTransitionEnd, this)) }), o.Map.include(h ? {
+        _createAnimProxy: function() {
+            var t = this._proxy = o.DomUtil.create("div", "leaflet-proxy leaflet-zoom-animated");
+            this._panes.mapPane.appendChild(t), this.on("zoomanim", function(e) { var i = o.DomUtil.TRANSFORM,
+                    n = t.style[i];
+                o.DomUtil.setTransform(t, this.project(e.center, e.zoom), this.getZoomScale(e.zoom, 1)), n === t.style[i] && this._animatingZoom && this._onZoomTransitionEnd() }, this), this.on("load moveend", function() {
+                var e = this.getCenter(),
+                    i = this.getZoom();
+                o.DomUtil.setTransform(t, this.project(e, i), this.getZoomScale(i, 1))
+            }, this)
+        },
+        _catchTransitionEnd: function(t) { this._animatingZoom && t.propertyName.indexOf("transform") >= 0 && this._onZoomTransitionEnd() },
+        _nothingToAnimate: function() { return !this._container.getElementsByClassName("leaflet-zoom-animated").length },
+        _tryAnimatedZoom: function(t, e, i) { if (this._animatingZoom) return !0; if (i = i || {}, !this._zoomAnimated || i.animate === !1 || this._nothingToAnimate() || Math.abs(e - this._zoom) > this.options.zoomAnimationThreshold) return !1; var n = this.getZoomScale(e),
+                s = this._getCenterOffset(t)._divideBy(1 - 1 / n); return i.animate === !0 || this.getSize().contains(s) ? (o.Util.requestAnimFrame(function() { this._moveStart(!0)._animateZoom(t, e, !0) }, this), !0) : !1 },
+        _animateZoom: function(t, e, i, n) { i && (this._animatingZoom = !0, this._animateToCenter = t, this._animateToZoom = e, o.DomUtil.addClass(this._mapPane, "leaflet-zoom-anim")), this.fire("zoomanim", { center: t, zoom: e, noUpdate: n }), setTimeout(o.bind(this._onZoomTransitionEnd, this), 250) },
+        _onZoomTransitionEnd: function() { this._animatingZoom && (o.DomUtil.removeClass(this._mapPane, "leaflet-zoom-anim"), o.Util.requestAnimFrame(function() { this._animatingZoom = !1, this._move(this._animateToCenter, this._animateToZoom)._moveEnd(!0) }, this)) }
+    } : {}), o.Map.include({ flyTo: function(t, e, n) {
+            function s(t) { var e = (v * v - g * g + (t ? -1 : 1) * L * L * y * y) / (2 * (t ? v : g) * L * y); return Math.log(Math.sqrt(e * e + 1) - e) }
+
+            function r(t) { return (Math.exp(t) - Math.exp(-t)) / 2 }
+
+            function a(t) { return (Math.exp(t) + Math.exp(-t)) / 2 }
+
+            function h(t) { return r(t) / a(t) }
+
+            function l(t) { return g * (a(x) / a(x + P * t)) }
+
+            function u(t) { return g * (a(x) * h(x + P * t) - r(x)) / L }
+
+            function c(t) { return 1 - Math.pow(1 - t, 1.5) }
+
+            function d() { var i = (Date.now() - b) / D,
+                    n = c(i) * w;
+                1 >= i ? (this._flyToFrame = o.Util.requestAnimFrame(d, this), this._move(this.unproject(_.add(m.subtract(_).multiplyBy(u(n) / y)), f), this.getScaleZoom(g / l(n), f), { flyTo: !0 })) : this._move(t, e)._moveEnd(!0) } if (n = n || {}, n.animate === !1 || !o.Browser.any3d) return this.setView(t, e, n);
+            this.stop(); var _ = this.project(this.getCenter()),
+                m = this.project(t),
+                p = this.getSize(),
+                f = this._zoom;
+            t = o.latLng(t), e = e === i ? f : e; var g = Math.max(p.x, p.y),
+                v = g * this.getZoomScale(f, e),
+                y = m.distanceTo(_) || 1,
+                P = 1.42,
+                L = P * P,
+                x = s(0),
+                b = Date.now(),
+                w = (s(1) - x) / P,
+                D = n.duration ? 1e3 * n.duration : 1e3 * w * .8; return this._moveStart(!0), d.call(this), this }, flyToBounds: function(t, e) { var i = this._getBoundsCenterZoom(t, e); return this.flyTo(i.center, i.zoom, e) } }), o.Map.include({ _defaultLocateOptions: { timeout: 1e4, watch: !1 }, locate: function(t) { if (t = this._locateOptions = o.extend({}, this._defaultLocateOptions, t), !("geolocation" in navigator)) return this._handleGeolocationError({ code: 0, message: "Geolocation not supported." }), this; var e = o.bind(this._handleGeolocationResponse, this),
+                i = o.bind(this._handleGeolocationError, this); return t.watch ? this._locationWatchId = navigator.geolocation.watchPosition(e, i, t) : navigator.geolocation.getCurrentPosition(e, i, t), this }, stopLocate: function() { return navigator.geolocation && navigator.geolocation.clearWatch && navigator.geolocation.clearWatch(this._locationWatchId), this._locateOptions && (this._locateOptions.setView = !1), this }, _handleGeolocationError: function(t) { var e = t.code,
+                i = t.message || (1 === e ? "permission denied" : 2 === e ? "position unavailable" : "timeout");
+            this._locateOptions.setView && !this._loaded && this.fitWorld(), this.fire("locationerror", { code: e, message: "Geolocation error: " + i + "." }) }, _handleGeolocationResponse: function(t) { var e = t.coords.latitude,
+                i = t.coords.longitude,
+                n = new o.LatLng(e, i),
+                s = n.toBounds(t.coords.accuracy),
+                r = this._locateOptions; if (r.setView) { var a = this.getBoundsZoom(s);
+                this.setView(n, r.maxZoom ? Math.min(a, r.maxZoom) : a) } var h = { latlng: n, bounds: s, timestamp: t.timestamp }; for (var l in t.coords) "number" == typeof t.coords[l] && (h[l] = t.coords[l]);
+            this.fire("locationfound", h) } })
+}(window, document);
\ No newline at end of file
diff --git a/erpnext/public/js/pos/pos_selected_item.html b/erpnext/public/js/pos/pos_selected_item.html
index 6f2772b..085e048 100644
--- a/erpnext/public/js/pos/pos_selected_item.html
+++ b/erpnext/public/js/pos/pos_selected_item.html
@@ -8,7 +8,7 @@
 		<input type="tel" class="form-control cell" disabled value="{%= price_list_rate %}"/>
 	</div>
 	<div class="pos-list-row">
-		<div class="cell">{{ __("Discount") }}:</div>
+		<div class="cell">{{ __("Discount") }}: %</div>
 		<input type="tel" class="form-control cell pos-item-disc" value="{%= discount_percentage %}">
 	</div>
 	<div class="pos-list-row">
diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js
index 7c274f1..740c3b9 100644
--- a/erpnext/public/js/setup_wizard.js
+++ b/erpnext/public/js/setup_wizard.js
@@ -15,34 +15,38 @@
 	{
 		// Domain
 		name: 'domain',
-		domains: ["all"],
-		title: __('Select your Domain'),
+		title: __('Select your Domains'),
 		fields: [
 			{
-				fieldname: 'domain', label: __('Domain'), fieldtype: 'Select',
+				fieldname: 'domains',
+				label: __('Domains'),
+				fieldtype: 'MultiCheck',
 				options: [
 					{ "label": __("Distribution"), "value": "Distribution" },
 					{ "label": __("Manufacturing"), "value": "Manufacturing" },
 					{ "label": __("Retail"), "value": "Retail" },
 					{ "label": __("Services"), "value": "Services" },
-					{ "label": __("Education (beta)"), "value": "Education" },
-					{"label": __("Healthcare (beta)"), "value": "Healthcare"}
+					{ "label": __("Healthcare (beta)"), "value": "Healthcare" },
+					{ "label": __("Education"), "value": "Education" },
+					{ "label": __("Agriculture (alpha)"), "value": "Agriculture" },
+					{"label": __("Non Profit (beta)"), "value": "Non Profit"}
 				], reqd: 1
 			},
 		],
 		// help: __('Select the nature of your business.'),
-		onload: function (slide) {
-			slide.get_input("domain").on("change", function () {
-				frappe.setup.domain = $(this).val();
-				frappe.wizard.refresh_slides();
-			});
+		validate: function () {
+			if (this.values.domains.length === 0) {
+				frappe.msgprint(__("Please select at least one domain."));
+				return false;
+			}
+			frappe.setup.domains = this.values.domains;
+			return true;
 		},
 	},
 
 	{
 		// Brand
 		name: 'brand',
-		domains: ["all"],
 		icon: "fa fa-bookmark",
 		title: __("The Brand"),
 		// help: __('Upload your letter head and logo. (you can edit them later).'),
@@ -56,14 +60,14 @@
 			},
 			{
 				fieldname: 'company_name',
-				label: frappe.setup.domain === 'Education' ?
+				label: frappe.setup.domains.includes('Education') ?
 					__('Institute Name') : __('Company Name'),
 				fieldtype: 'Data',
 				reqd: 1
 			},
 			{
 				fieldname: 'company_abbr',
-				label: frappe.setup.domain === 'Education' ?
+				label: frappe.setup.domains.includes('Education') ?
 					__('Institute Abbreviation') : __('Company Abbreviation'),
 				fieldtype: 'Data'
 			}
@@ -99,10 +103,9 @@
 	{
 		// Organisation
 		name: 'organisation',
-		domains: ["all"],
 		title: __("Your Organization"),
 		icon: "fa fa-building",
-		// help: (frappe.setup.domain === 'Education' ?
+		// help: frappe.setup.domains.includes('Education') ?
 		// 	__('The name of the institute for which you are setting up this system.') :
 		// 	__('The name of your company for which you are setting up this system.')),
 		fields: [
@@ -110,7 +113,7 @@
 				fieldname: 'company_tagline',
 				label: __('What does it do?'),
 				fieldtype: 'Data',
-				placeholder: frappe.setup.domain === 'Education' ?
+				placeholder: frappe.setup.domains.includes('Education') ?
 					__('e.g. "Primary School" or "University"') :
 					__('e.g. "Build tools for builders"'),
 				reqd: 1
@@ -204,7 +207,7 @@
 // default 1st Jan - 31st Dec
 
 erpnext.setup.fiscal_years = {
-	"Afghanistan": ["12-20", "12-21"],
+	"Afghanistan": ["12-21", "12-20"],
 	"Australia": ["07-01", "06-30"],
 	"Bangladesh": ["07-01", "06-30"],
 	"Canada": ["04-01", "03-31"],
@@ -222,20 +225,3 @@
 	"Thailand": ["10-01", "09-30"],
 	"United Kingdom": ["04-01", "03-31"],
 };
-
-// var test_values_edu = {
-// 	"language": "english",
-// 	"domain": "Education",
-// 	"country": "India",
-// 	"timezone": "Asia/Kolkata",
-// 	"currency": "INR",
-// 	"first_name": "Tester",
-// 	"email": "test@example.com",
-// 	"password": "test",
-// 	"company_name": "Hogwarts",
-// 	"company_abbr": "HS",
-// 	"company_tagline": "School for magicians",
-// 	"bank_account": "Gringotts Wizarding Bank",
-// 	"fy_start_date": "2016-04-01",
-// 	"fy_end_date": "2017-03-31"
-// }
diff --git a/erpnext/public/js/shopping_cart.js b/erpnext/public/js/shopping_cart.js
index e4e7440..0a3e0af 100644
--- a/erpnext/public/js/shopping_cart.js
+++ b/erpnext/public/js/shopping_cart.js
@@ -65,6 +65,9 @@
 
 	set_cart_count: function() {
 		var cart_count = getCookie("cart_count");
+		if(frappe.session.user==="Guest") {
+			cart_count = 0;
+		}
 
 		if(cart_count) {
 			$(".shopping-cart").toggleClass('hidden', false);
diff --git a/erpnext/public/js/templates/item_quick_entry.html b/erpnext/public/js/templates/item_quick_entry.html
new file mode 100644
index 0000000..6a5f36d
--- /dev/null
+++ b/erpnext/public/js/templates/item_quick_entry.html
@@ -0,0 +1,3 @@
+<div class="h6 uppercase" style="margin-top: 30px;">{{ __("Variant Attributes") }}</div>
+<div class="attributes hide-control">
+</div>
\ No newline at end of file
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index 47cda19..c83bcd6 100644
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -260,7 +260,7 @@
 			action: function(selections, args) {
 				let values = selections;
 				if(values.length === 0){
-					frappe.msgprint(__("Please select Quotations"))
+					frappe.msgprint(__("Please select {0}", [opts.source_doctype]))
 					return;
 				}
 				opts.source_name = values;
diff --git a/erpnext/public/js/utils/item_quick_entry.js b/erpnext/public/js/utils/item_quick_entry.js
new file mode 100644
index 0000000..ebb92da
--- /dev/null
+++ b/erpnext/public/js/utils/item_quick_entry.js
@@ -0,0 +1,408 @@
+frappe.provide('frappe.ui.form');
+
+frappe.ui.form.ItemQuickEntryForm = frappe.ui.form.QuickEntryForm.extend({
+	init: function(doctype, after_insert) {
+		this._super(doctype, after_insert);
+	},
+
+	render_dialog: function() {
+		this.mandatory = this.get_variant_fields().concat(this.mandatory);
+		this.mandatory = this.mandatory.concat(this.get_attributes_fields());
+		this._super();
+		this.init_post_render_dialog_operations();
+		this.preset_fields_for_template();
+		this.dialog.$wrapper.find('.edit-full').text(__('Edit in full page for more options like assets, serial nos, batches etc.'))
+	},
+
+	init_post_render_dialog_operations: function() {
+		this.dialog.fields_dict.attribute_html.$wrapper.append(frappe.render_template("item_quick_entry"));
+		this.init_for_create_variant_trigger();
+		this.init_for_item_template_trigger();
+		// explicitly hide manufacturing fields as hidden not working.
+		this.toggle_manufacturer_fields();
+		this.dialog.get_field("item_template").df.hidden = 1;
+		this.dialog.get_field("item_template").refresh();
+	},
+
+	register_primary_action: function() {
+		var me = this;
+		this.dialog.set_primary_action(__('Save'), function() {
+			if (me.dialog.working) return;
+
+			var data = me.dialog.get_values();
+			var variant_values = {};
+
+			if (me.dialog.fields_dict.create_variant.$input.prop("checked")) {
+				variant_values = me.get_variant_doc();
+				if (!Object.keys(variant_values).length) {
+					data = null;
+				}
+				variant_values.stock_uom = me.template_doc.stock_uom;
+				variant_values.item_group = me.template_doc.item_group;
+			}
+
+			if (data) {
+				me.dialog.working = true;
+				var values = me.update_doc();
+				//patch for manufacturer type variants as extend is overwriting it.
+				if (variant_values['variant_based_on'] == "Manufacturer") {
+					values['variant_based_on'] = "Manufacturer";
+				}
+				$.extend(variant_values, values);
+				me.insert(variant_values);
+			}
+		});
+	},
+
+	insert: function(variant_values) {
+		let me = this;
+		return new Promise(resolve => {
+			frappe.call({
+				method: "frappe.client.insert",
+				args: {
+					doc: variant_values
+				},
+				callback: function(r) {
+					me.dialog.hide();
+					// delete the old doc
+					frappe.model.clear_doc(me.dialog.doc.doctype, me.dialog.doc.name);
+					me.dialog.doc = r.message;
+					if (frappe._from_link) {
+						frappe.ui.form.update_calling_link(me.dialog.doc);
+					} else {
+						if (me.after_insert) {
+							me.after_insert(me.dialog.doc);
+						} else {
+							me.open_from_if_not_list();
+						}
+					}
+				},
+				error: function() {
+					me.open_doc();
+				},
+				always: function() {
+					me.dialog.working = false;
+					resolve(me.dialog.doc);
+				},
+				freeze: true
+			});
+		});
+	},
+
+	open_doc: function() {
+		this.dialog.hide();
+		this.update_doc();
+		if (this.dialog.fields_dict.create_variant.$input.prop("checked")) {
+			var template = this.dialog.fields_dict.item_template.input.value;
+			if (template)
+				frappe.set_route("Form", this.doctype, template);
+		} else {
+			frappe.set_route('Form', this.doctype, this.doc.name);
+		}
+	},
+
+	get_variant_fields: function() {
+		var variant_fields = [{
+			fieldname: "create_variant",
+			fieldtype: "Check",
+			label: __("Create Variant")
+		},
+		{
+			fieldname: 'item_template',
+			label: __('Item Template'),
+			reqd: 0,
+			fieldtype: 'Link',
+			options: "Item",
+			get_query: function() {
+				return {
+					filters: {
+						"has_variants": 1
+					}
+				};
+			}
+		}];
+
+		return variant_fields;
+	},
+
+	get_manufacturing_fields: function() {
+		this.manufacturer_fields = [{
+			fieldtype: 'Link',
+			options: 'Manufacturer',
+			label: 'Manufacturer',
+			fieldname: "manufacturer",
+			hidden: 1,
+			reqd: 0
+		}, {
+			fieldtype: 'Data',
+			label: 'Manufacturer Part Number',
+			fieldname: 'manufacturer_part_no',
+			hidden: 1,
+			reqd: 0
+		}];
+		return this.manufacturer_fields;
+	},
+
+	get_attributes_fields: function() {
+		var attribute_fields = [{
+			fieldname: 'attribute_html',
+			fieldtype: 'HTML'
+		}]
+
+		attribute_fields = attribute_fields.concat(this.get_manufacturing_fields());
+		return attribute_fields;
+	},
+
+	init_for_create_variant_trigger: function() {
+		var me = this;
+
+		this.dialog.fields_dict.create_variant.$input.on("click", function() {
+			me.preset_fields_for_template();
+			me.init_post_template_trigger_operations(false, [], true);
+		});
+	},
+
+	preset_fields_for_template: function() {
+		var for_variant = this.dialog.get_value('create_variant');
+
+		// setup template field, seen and mandatory if variant
+		let template_field = this.dialog.get_field("item_template");
+		template_field.df.reqd = for_variant;
+		template_field.set_value('');
+		template_field.df.hidden = !for_variant;
+		template_field.refresh();
+
+		// hide properties for variant
+		['item_code', 'item_name', 'item_group', 'stock_uom'].forEach((d) => {
+			let f = this.dialog.get_field(d);
+			f.df.hidden = for_variant;
+			f.refresh();
+		});
+
+		this.dialog.get_field('attribute_html').toggle(false);
+
+		// non mandatory for variants
+		['item_code', 'stock_uom', 'item_group'].forEach((d) => {
+			let f = this.dialog.get_field(d);
+			f.df.reqd = !for_variant;
+			f.refresh();
+		});
+
+	},
+
+	init_for_item_template_trigger: function() {
+		var me = this;
+
+		me.dialog.fields_dict["item_template"].df.onchange = () => {
+			var template = me.dialog.fields_dict.item_template.input.value;
+			me.template_doc = null;
+			if (template) {
+				frappe.call({
+					method: "frappe.client.get",
+					args: {
+						doctype: "Item",
+						name: template
+					},
+					callback: function(r) {
+						me.template_doc = r.message;
+						me.is_manufacturer = false;
+
+						if (me.template_doc.variant_based_on === "Manufacturer") {
+							me.init_post_template_trigger_operations(true, [], true);
+						} else {
+
+							me.init_post_template_trigger_operations(false, me.template_doc.attributes, false);
+							me.render_attributes(me.template_doc.attributes);
+						}
+					}
+				});
+			} else {
+				me.dialog.get_field('attribute_html').toggle(false);
+				me.init_post_template_trigger_operations(false, [], true);
+			}
+		}
+	},
+
+	init_post_template_trigger_operations: function(is_manufacturer, attributes, attributes_flag) {
+		this.attributes = attributes;
+		this.attribute_values = {};
+		this.attributes_count = attributes.length;
+
+		this.dialog.fields_dict.attribute_html.$wrapper.find(".attributes").empty();
+		this.is_manufacturer = is_manufacturer;
+		this.toggle_manufacturer_fields();
+		this.dialog.fields_dict.attribute_html.$wrapper.find(".attributes").toggleClass("hide-control", attributes_flag);
+		this.dialog.fields_dict.attribute_html.$wrapper.find(".attributes-header").toggleClass("hide-control", attributes_flag);
+	},
+
+	toggle_manufacturer_fields: function() {
+		var me = this;
+		$.each(this.manufacturer_fields, function(i, dialog_field) {
+			me.dialog.get_field(dialog_field.fieldname).df.hidden = !me.is_manufacturer;
+			me.dialog.get_field(dialog_field.fieldname).df.reqd = dialog_field.fieldname == 'manufacturer' ? me.is_manufacturer : false;
+			me.dialog.get_field(dialog_field.fieldname).refresh();
+		});
+	},
+
+	initiate_render_attributes: function() {
+		this.dialog.fields_dict.attribute_html.$wrapper.find(".attributes").empty();
+		this.render_attributes(this.attributes);
+	},
+
+	render_attributes: function(attributes) {
+		var me = this;
+
+		this.dialog.get_field('attribute_html').toggle(true);
+
+		$.each(attributes, function(index, row) {
+			var desc = "";
+			var fieldtype = "Data";
+			if (row.numeric_values) {
+				fieldtype = "Float";
+				desc = "Min Value: " + row.from_range + " , Max Value: " + row.to_range + ", in Increments of: " + row.increment;
+			}
+
+			me.init_make_control(fieldtype, row);
+			me[row.attribute].set_value(me.attribute_values[row.attribute] || "");
+			me[row.attribute].$wrapper.toggleClass("has-error", me.attribute_values[row.attribute] ? false : true);
+
+			// Set Label explicitly as make_control is not displaying label
+			$(me[row.attribute].label_area).text(__(row.attribute));
+
+			if (desc) {
+				$(repl(`<p class="help-box small text-muted hidden-xs">%(desc)s</p>`, {
+					"desc": desc
+				})).insertAfter(me[row.attribute].input_area);
+			}
+
+			if (!row.numeric_values) {
+				me.init_awesomplete_for_attribute(row);
+			} else {
+				me[row.attribute].$input.on("change", function() {
+					me.attribute_values[row.attribute] = $(this).val();
+					$(this).closest(".frappe-control").toggleClass("has-error", $(this).val() ? false : true);
+				});
+			}
+		});
+	},
+
+	init_make_control: function(fieldtype, row) {
+		this[row.attribute] = frappe.ui.form.make_control({
+			df: {
+				"fieldtype": fieldtype,
+				"label": row.attribute,
+				"fieldname": row.attribute,
+				"options": row.options || ""
+			},
+			parent: $(this.dialog.fields_dict.attribute_html.wrapper).find(".attributes"),
+			only_input: false
+		});
+		this[row.attribute].make_input();
+	},
+
+	init_awesomplete_for_attribute: function(row) {
+		var me = this;
+
+		this[row.attribute].input.awesomplete = new Awesomplete(this[row.attribute].input, {
+			minChars: 0,
+			maxItems: 99,
+			autoFirst: true,
+			list: [],
+		});
+
+		this[row.attribute].$input.on('input', function(e) {
+			frappe.call({
+				method: "frappe.client.get_list",
+				args: {
+					doctype: "Item Attribute Value",
+					filters: [
+						["parent", "=", $(e.target).attr("data-fieldname")],
+						["attribute_value", "like", e.target.value + "%"]
+					],
+					fields: ["attribute_value"]
+				},
+				callback: function(r) {
+					if (r.message) {
+						e.target.awesomplete.list = r.message.map(function(d) {
+							return d.attribute_value;
+						});
+					}
+				}
+			});
+		}).on('focus', function(e) {
+			$(e.target).val('').trigger('input');
+		}).on("awesomplete-close", function (e) {
+			me.attribute_values[$(e.target).attr("data-fieldname")] = e.target.value;
+			$(e.target).closest(".frappe-control").toggleClass("has-error", e.target.value ? false : true);
+		});
+	},
+
+	get_variant_doc: function() {
+		var me = this;
+		var variant_doc = {};
+		var attribute = this.validate_mandatory_attributes();
+
+		if (Object.keys(attribute).length) {
+			frappe.call({
+				method: "erpnext.controllers.item_variant.create_variant_doc_for_quick_entry",
+				args: {
+					"template": me.dialog.fields_dict.item_template.$input.val(),
+					args: attribute
+				},
+				async: false,
+				callback: function(r) {
+					if (Object.prototype.toString.call(r.message) == "[object Object]") {
+						variant_doc = r.message;
+					} else {
+						var msgprint_dialog = frappe.msgprint(__("Item Variant {0} already exists with same attributes", [repl('<a class="strong variant-click" data-item-code="%(item)s" \
+								>%(item)s</a>', {
+								item: r.message
+							})]));
+
+						msgprint_dialog.$wrapper.find(".variant-click").on("click", function() {
+							msgprint_dialog.hide();
+							me.dialog.hide();
+							if (frappe._from_link) {
+								frappe._from_link.set_value($(this).attr("data-item-code"));
+							} else {
+								frappe.set_route('Form', "Item", $(this).attr("data-item-code"));
+							}
+						});
+					}
+				}
+			})
+		}
+		return variant_doc;
+	},
+
+	validate_mandatory_attributes: function() {
+		var me = this;
+		var attribute = {};
+		var mandatory = [];
+
+		$.each(this.attributes, function(index, attr) {
+			var value = me.attribute_values[attr.attribute] || "";
+			if (value) {
+				attribute[attr.attribute] = attr.numeric_values ? flt(value) : value;
+			} else {
+				mandatory.push(attr.attribute);
+			}
+		})
+
+		if (mandatory.length) {
+			frappe.msgprint({
+				title: __('Missing Values Required'),
+				message: __('Following fields have missing values:') + '<br><br><ul><li>' + mandatory.join('<li>') + '</ul>',
+				indicator: 'orange'
+			});
+			return {};
+		}
+
+		if (this.is_manufacturer) {
+			$.each(this.manufacturer_fields, function(index, field) {
+				attribute[field.fieldname] = me.dialog.fields_dict[field.fieldname].input.value;
+			});
+		}
+		return attribute;
+	}
+});
\ No newline at end of file
diff --git a/erpnext/public/js/utils/serial_no_batch_selector.js b/erpnext/public/js/utils/serial_no_batch_selector.js
index 69e3d2f..f348746 100644
--- a/erpnext/public/js/utils/serial_no_batch_selector.js
+++ b/erpnext/public/js/utils/serial_no_batch_selector.js
@@ -98,11 +98,14 @@
 			let d = this.item;
 			if (d.has_serial_no && d.serial_no) {
 				this.dialog.set_value('serial_no', d.serial_no);
-			} else if (d.batch_no) {
+			}
+
+			if (d.batch_no) {
 				this.dialog.fields_dict.batches.df.data.push({
 					'batch_no': d.batch_no,
 					'actual_qty': d.actual_qty,
-					'selected_qty': d.qty
+					'selected_qty': d.qty,
+					'available_qty': d.actual_batch_qty
 				});
 
 				this.dialog.fields_dict.batches.grid.refresh();
@@ -204,7 +207,10 @@
 						label: __('Select Batch'),
 						in_list_view:1,
 						get_query: function() {
-							return {filters: {item: me.item_code }};
+							return {
+							    filters: {item: me.item_code },
+							    query: 'erpnext.controllers.queries.get_batch_numbers'
+					        };
 						},
 						onchange: function(e) {
 							let val = this.get_value();
diff --git a/erpnext/docs/user/manual/en/schools/Attendance/__init__.py b/erpnext/regional/print_format/detailed_tax_invoice/__init__.py
similarity index 100%
copy from erpnext/docs/user/manual/en/schools/Attendance/__init__.py
copy to erpnext/regional/print_format/detailed_tax_invoice/__init__.py
diff --git a/erpnext/regional/print_format/detailed_tax_invoice/detailed_tax_invoice.json b/erpnext/regional/print_format/detailed_tax_invoice/detailed_tax_invoice.json
new file mode 100644
index 0000000..e1c43e7
--- /dev/null
+++ b/erpnext/regional/print_format/detailed_tax_invoice/detailed_tax_invoice.json
@@ -0,0 +1,22 @@
+{
+ "align_labels_right": 0, 
+ "creation": "2017-12-07 16:26:06.648472", 
+ "custom_format": 0, 
+ "disabled": 0, 
+ "doc_type": "Sales Invoice", 
+ "docstatus": 0, 
+ "doctype": "Print Format", 
+ "font": "Default", 
+ "format_data": "[{\"fieldname\": \"print_heading_template\", \"fieldtype\": \"Custom HTML\", \"options\": \"<div class=\\\"print-heading\\\">\\t\\t\\t\\t<h2>TAX Invoice<br><small>{{ doc.name }}</small>\\t\\t\\t\\t</h2></div>\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"customer_name\", \"label\": \"Customer Name\"}, {\"print_hide\": 0, \"fieldname\": \"customer_name_in_arabic\", \"label\": \"Customer Name in Arabic\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"posting_date\", \"label\": \"Date\"}, {\"print_hide\": 0, \"fieldname\": \"project\", \"align\": \"left\", \"label\": \"Reverse Charge Applicable\"}, {\"fieldtype\": \"Section Break\", \"label\": \"Address\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"address_display\", \"label\": \"Address\"}, {\"print_hide\": 0, \"fieldname\": \"tax_id\", \"label\": \"Tax Id\"}, {\"print_hide\": 0, \"fieldname\": \"contact_display\", \"label\": \"Contact\"}, {\"print_hide\": 0, \"fieldname\": \"contact_mobile\", \"label\": \"Mobile No\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"company\", \"label\": \"Company\"}, {\"print_hide\": 0, \"fieldname\": \"company_address_display\", \"label\": \"Company Address\"}, {\"print_hide\": 0, \"fieldname\": \"company_trn\", \"label\": \"Company TRN\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"item_code\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"description\", \"print_width\": \"200px\"}, {\"print_hide\": 0, \"fieldname\": \"image\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"qty\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"uom\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"rate\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"tax_code\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"items\", \"label\": \"Items\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"total\", \"label\": \"Total\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"charge_type\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"row_id\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"account_head\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"cost_center\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"description\", \"print_width\": \"300px\"}, {\"print_hide\": 0, \"fieldname\": \"rate\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"tax_amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"total\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"tax_amount_after_discount_amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"base_tax_amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"base_total\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"base_tax_amount_after_discount_amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"item_wise_tax_detail\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"taxes\", \"label\": \"Sales Taxes and Charges\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"grand_total\", \"label\": \"Grand Total\"}, {\"print_hide\": 0, \"fieldname\": \"rounded_total\", \"label\": \"Rounded Total\"}, {\"print_hide\": 0, \"fieldname\": \"in_words\", \"align\": \"left\", \"label\": \"Tax Breakup\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"other_charges_calculation\", \"label\": \"Taxes and Charges Calculation\"}, {\"fieldtype\": \"Section Break\", \"label\": \"Terms\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"terms\", \"label\": \"Terms and Conditions Details\"}]", 
+ "idx": 0, 
+ "line_breaks": 0, 
+ "modified": "2017-12-11 12:16:02.774997", 
+ "modified_by": "Administrator", 
+ "module": "Regional", 
+ "name": "Detailed Tax Invoice", 
+ "owner": "Administrator", 
+ "print_format_builder": 1, 
+ "print_format_type": "Server", 
+ "show_section_headings": 0, 
+ "standard": "Yes"
+}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Attendance/__init__.py b/erpnext/regional/print_format/simplified_tax_invoice/__init__.py
similarity index 100%
copy from erpnext/docs/user/manual/en/schools/Attendance/__init__.py
copy to erpnext/regional/print_format/simplified_tax_invoice/__init__.py
diff --git a/erpnext/regional/print_format/simplified_tax_invoice/simplified_tax_invoice.json b/erpnext/regional/print_format/simplified_tax_invoice/simplified_tax_invoice.json
new file mode 100644
index 0000000..9609b87
--- /dev/null
+++ b/erpnext/regional/print_format/simplified_tax_invoice/simplified_tax_invoice.json
@@ -0,0 +1,22 @@
+{
+ "align_labels_right": 0, 
+ "creation": "2017-12-07 16:09:44.321242", 
+ "custom_format": 0, 
+ "disabled": 0, 
+ "doc_type": "Sales Invoice", 
+ "docstatus": 0, 
+ "doctype": "Print Format", 
+ "font": "Default", 
+ "format_data": "[{\"fieldname\": \"print_heading_template\", \"fieldtype\": \"Custom HTML\", \"options\": \"<div class=\\\"print-heading\\\">\\t\\t\\t\\t<h2>TAX Invoice<br><small>{{ doc.name }}</small>\\t\\t\\t\\t</h2></div>\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"customer_name\", \"label\": \"Customer Name\"}, {\"print_hide\": 0, \"fieldname\": \"customer_name_in_arabic\", \"label\": \"Customer Name in Arabic\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"posting_date\", \"label\": \"Date\"}, {\"fieldtype\": \"Section Break\", \"label\": \"Address\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"company\", \"label\": \"Company\"}, {\"print_hide\": 0, \"fieldname\": \"company_trn\", \"label\": \"Company TRN\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"company_address_display\", \"label\": \"Company Address\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"item_code\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"description\", \"print_width\": \"200px\"}, {\"print_hide\": 0, \"fieldname\": \"uom\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"tax_code\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"items\", \"label\": \"Items\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"total\", \"label\": \"Total\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"charge_type\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"row_id\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"account_head\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"cost_center\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"description\", \"print_width\": \"300px\"}, {\"print_hide\": 0, \"fieldname\": \"rate\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"tax_amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"total\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"tax_amount_after_discount_amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"base_tax_amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"base_total\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"base_tax_amount_after_discount_amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"item_wise_tax_detail\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"taxes\", \"label\": \"Sales Taxes and Charges\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"grand_total\", \"label\": \"Grand Total\"}, {\"print_hide\": 0, \"fieldname\": \"rounded_total\", \"label\": \"Rounded Total\"}, {\"print_hide\": 0, \"fieldname\": \"in_words\", \"align\": \"left\", \"label\": \"In Words\"}]", 
+ "idx": 0, 
+ "line_breaks": 0, 
+ "modified": "2017-12-11 12:32:00.136741", 
+ "modified_by": "Administrator", 
+ "module": "Regional", 
+ "name": "Simplified Tax Invoice", 
+ "owner": "Administrator", 
+ "print_format_builder": 1, 
+ "print_format_type": "Server", 
+ "show_section_headings": 0, 
+ "standard": "Yes"
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/regional/saudi_arabia/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/regional/saudi_arabia/__init__.py
diff --git a/erpnext/regional/saudi_arabia/setup.py b/erpnext/regional/saudi_arabia/setup.py
new file mode 100644
index 0000000..ecce77c
--- /dev/null
+++ b/erpnext/regional/saudi_arabia/setup.py
@@ -0,0 +1,14 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+
+from erpnext.regional.united_arab_emirates.setup import make_custom_fields, add_print_formats
+from erpnext.setup.setup_wizard.setup_wizard import create_sales_tax
+
+def setup(company=None, patch=True):
+	make_custom_fields()
+	add_print_formats()
+
+	if company:
+		create_sales_tax(company)
\ No newline at end of file
diff --git a/erpnext/docs/assets/img/schools/fees/__init__.py b/erpnext/regional/united_arab_emirates/__init__.py
similarity index 100%
copy from erpnext/docs/assets/img/schools/fees/__init__.py
copy to erpnext/regional/united_arab_emirates/__init__.py
diff --git a/erpnext/regional/united_arab_emirates/setup.py b/erpnext/regional/united_arab_emirates/setup.py
new file mode 100644
index 0000000..b1b3cc7
--- /dev/null
+++ b/erpnext/regional/united_arab_emirates/setup.py
@@ -0,0 +1,73 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+
+import frappe, os, json
+from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
+from erpnext.setup.setup_wizard.setup_wizard import create_sales_tax
+
+def setup(company=None, patch=True):
+	make_custom_fields()
+	add_print_formats()
+
+	if company:
+		create_sales_tax(company)
+
+def make_custom_fields():
+	invoice_fields = [
+		dict(fieldname='vat_section', label='VAT Details', fieldtype='Section Break',
+			insert_after='select_print_heading', print_hide=1, collapsible=1),
+		dict(fieldname='permit_no', label='Permit Number',
+			fieldtype='Data', insert_after='vat_section', print_hide=1),
+		dict(fieldname='reverse_charge_applicable', label='Reverse Charge Applicable',
+			fieldtype='Select', insert_after='permit_no', print_hide=1,
+			options='Y\nN', default='N')
+	]
+
+	purchase_invoice_fields = [
+			dict(fieldname='company_trn', label='Company TRN',
+				fieldtype='Read Only', insert_after='shipping_address',
+				options='company.tax_id', print_hide=1),
+			dict(fieldname='supplier_name_in_arabic', label='Supplier Name in Arabic',
+				fieldtype='Read Only', insert_after='supplier_name',
+				options='supplier.supplier_name_in_arabic', print_hide=1)
+		]
+
+	sales_invoice_fields = [
+			dict(fieldname='company_trn', label='Company TRN',
+				fieldtype='Read Only', insert_after='company_address',
+				options='company.tax_id', print_hide=1),
+			dict(fieldname='customer_name_in_arabic', label='Customer Name in Arabic',
+				fieldtype='Read Only', insert_after='customer_name',
+				options='customer.customer_name_in_arabic', print_hide=1),
+		]
+
+	tax_code_field = dict(fieldname='tax_code', label='Tax Code',
+		fieldtype='Read Only', options='item_code.tax_code', insert_after='description',
+		allow_on_submit=1, print_hide=1)
+
+	custom_fields = {
+		'Item': [
+			dict(fieldname='tax_code', label='Tax Code',
+				fieldtype='Data', insert_after='item_group'),
+		],
+		'Customer': [
+			dict(fieldname='customer_name_in_arabic', label='Customer Name in Arabic',
+				fieldtype='Data', insert_after='customer_name'),
+		],
+		'Supplier': [
+			dict(fieldname='supplier_name_in_arabic', label='Supplier Name in Arabic',
+				fieldtype='Data', insert_after='supplier_name'),
+		],
+		'Purchase Invoice': purchase_invoice_fields + invoice_fields,
+		'Sales Invoice': sales_invoice_fields + invoice_fields,
+		'Sales Invoice Item': [tax_code_field],
+		'Purchase Invoice Item': [tax_code_field]
+	}
+
+	create_custom_fields(custom_fields)
+
+def add_print_formats():
+	frappe.reload_doc("regional", "print_format", "detailed_tax_invoice")
+	frappe.reload_doc("regional", "print_format", "simplified_tax_invoice")
diff --git a/erpnext/restaurant/doctype/restaurant/test_restaurant.js b/erpnext/restaurant/doctype/restaurant/test_restaurant.js
index f4a1343..26de5d0 100644
--- a/erpnext/restaurant/doctype/restaurant/test_restaurant.js
+++ b/erpnext/restaurant/doctype/restaurant/test_restaurant.js
@@ -7,9 +7,18 @@
 
 	// number of asserts
 	assert.expect(2);
+	let customer =  {
+		"Test Customer 1": [
+			{customer_name: "Test Customer 1"}
+		],
+		"Test Customer 2": [
+			{customer_name: "Test Customer 2"}
+		]
+	};
 
 	frappe.run_serially([
 		// insert a new Restaurant
+		() => frappe.tests.setup_doctype('Customer', customer),				
 		() => {
 			return frappe.tests.make('Restaurant', [
 				// values to be set
diff --git a/erpnext/restaurant/doctype/restaurant_reservation/restaurant_reservation.js b/erpnext/restaurant/doctype/restaurant_reservation/restaurant_reservation.js
index 9218338..cebd105 100644
--- a/erpnext/restaurant/doctype/restaurant_reservation/restaurant_reservation.js
+++ b/erpnext/restaurant/doctype/restaurant_reservation/restaurant_reservation.js
@@ -2,6 +2,9 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Restaurant Reservation', {
+	setup: function(frm) {
+		frm.add_fetch('customer', 'customer_name', 'customer_name');
+	},
 	refresh: function(frm) {
 
 	}
diff --git a/erpnext/restaurant/doctype/restaurant_reservation/restaurant_reservation.py b/erpnext/restaurant/doctype/restaurant_reservation/restaurant_reservation.py
index 63a36f0..f96de44 100644
--- a/erpnext/restaurant/doctype/restaurant_reservation/restaurant_reservation.py
+++ b/erpnext/restaurant/doctype/restaurant_reservation/restaurant_reservation.py
@@ -12,30 +12,3 @@
 	def validate(self):
 		if not self.reservation_end_time:
 			self.reservation_end_time = get_datetime(self.reservation_time) + timedelta(hours=1)
-
-@frappe.whitelist()
-def get_events(start, end, filters=None):
-	"""Returns events for Gantt / Calendar view rendering.
-
-	:param start: Start date-time.
-	:param end: End date-time.
-	:param filters: Filters (JSON).
-	"""
-	from frappe.desk.calendar import get_event_conditions
-	conditions = get_event_conditions("Restaurant Reservation", filters)
-
-	data = frappe.db.sql("""select name, reservation_time,
-			reservation_end_time, customer_name, status, no_of_people
-		from
-			`tabRestaurant Reservation`
-		where
-			((ifnull(reservation_time, '0000-00-00')!= '0000-00-00') \
-				and (reservation_time <= %(end)s) \
-			or ((ifnull(reservation_end_time, '0000-00-00')!= '0000-00-00') \
-				and reservation_end_time >= %(start)s))
-		{conditions}""".format(conditions=conditions), {
-			"start": start,
-			"end": end
-		}, as_dict=True, update={"allDay": 0})
-
-	return data
diff --git a/erpnext/restaurant/doctype/restaurant_reservation/restaurant_reservation_calendar.js b/erpnext/restaurant/doctype/restaurant_reservation/restaurant_reservation_calendar.js
index 09e8f8d..fe3dc57 100644
--- a/erpnext/restaurant/doctype/restaurant_reservation/restaurant_reservation_calendar.js
+++ b/erpnext/restaurant/doctype/restaurant_reservation/restaurant_reservation_calendar.js
@@ -14,5 +14,5 @@
 			"label": __("Customer Name")
 		}
 	],
-	get_events_method: "erpnext.restaurant.doctype.restaurant_reservation.restaurant_reservation.get_events"
+	get_events_method: "frappe.desk.calendar.get_events"
 };
diff --git a/erpnext/schools/doctype/academic_term/academic_term.json b/erpnext/schools/doctype/academic_term/academic_term.json
deleted file mode 100644
index b4eb83d..0000000
--- a/erpnext/schools/doctype/academic_term/academic_term.json
+++ /dev/null
@@ -1,216 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "field:title", 
- "beta": 0, 
- "creation": "2015-09-08 17:19:19.158228", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 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": 0, 
-   "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "term_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Term Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "term_start_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Term Start Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "term_end_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Term End Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "title", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Title", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-06-30 08:21:45.897056", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Academic Term", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "name", 
- "sort_order": "DESC", 
- "title_field": "title", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/academic_term/test_academic_term.js b/erpnext/schools/doctype/academic_term/test_academic_term.js
deleted file mode 100644
index 688ad54..0000000
--- a/erpnext/schools/doctype/academic_term/test_academic_term.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Testing Setup Module in Schools
-QUnit.module('schools');
-
-QUnit.test('Test: Academic Term', function(assert){
-	assert.expect(4);
-	let done = assert.async();
-	frappe.run_serially([
-		() => {
-			return frappe.tests.make('Academic Term', [
-				{academic_year: '2016-17'},
-				{term_name: "Semester 1"},
-				{term_start_date: '2016-07-20'},
-				{term_end_date:'2017-06-20'},
-			]);
-		},
-		() => {
-			assert.ok(cur_frm.doc.academic_year=='2016-17');
-			assert.ok(cur_frm.doc.term_name=='Semester 1');
-			assert.ok(cur_frm.doc.term_start_date=='2016-07-20');
-			assert.ok(cur_frm.doc.term_end_date=='2017-06-20');
-		},
-		() => done()
-	]);
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/academic_year/academic_year.json b/erpnext/schools/doctype/academic_year/academic_year.json
deleted file mode 100644
index 3d8c4f8..0000000
--- a/erpnext/schools/doctype/academic_year/academic_year.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "field:academic_year_name", 
- "beta": 0, 
- "creation": "2015-09-07 12:49:51.303026", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 0, 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "academic_year_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Academic Year Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "year_start_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Year Start Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "year_end_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Year End Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-06-30 08:21:46.121105", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Academic Year", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/academic_year/test_academic_year.js b/erpnext/schools/doctype/academic_year/test_academic_year.js
deleted file mode 100644
index 7bf1772..0000000
--- a/erpnext/schools/doctype/academic_year/test_academic_year.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Testing Setup Module in Schools
-QUnit.module('schools');
-
-QUnit.test('Test: Academic Year', function(assert){
-	assert.expect(3);
-	let done = assert.async();
-	frappe.run_serially([
-		() => {
-			return frappe.tests.make('Academic Year', [
-				{academic_year_name: '2016-17'},
-				{year_start_date: '2016-07-20'},
-				{year_end_date:'2017-06-20'},
-			]);
-		},
-
-		() => {
-			assert.ok(cur_frm.doc.academic_year_name=='2016-17');
-			assert.ok(cur_frm.doc.year_start_date=='2016-07-20');
-			assert.ok(cur_frm.doc.year_end_date=='2017-06-20');
-		},
-		() => done()
-	]);
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_criteria/assessment_criteria.json b/erpnext/schools/doctype/assessment_criteria/assessment_criteria.json
deleted file mode 100644
index 2bbd2ef..0000000
--- a/erpnext/schools/doctype/assessment_criteria/assessment_criteria.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "field:assessment_criteria", 
- "beta": 0, 
- "creation": "2016-12-14 16:40:15.144115", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "assessment_criteria", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Assessment Criteria", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "assessment_criteria_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Assessment Criteria Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Assessment Criteria Group", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-06-30 08:21:46.211641", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Assessment Criteria", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_criteria/test_assessment_criteria.js b/erpnext/schools/doctype/assessment_criteria/test_assessment_criteria.js
deleted file mode 100644
index 6c0540e..0000000
--- a/erpnext/schools/doctype/assessment_criteria/test_assessment_criteria.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// School Assessment module
-QUnit.module('schools');
-
-QUnit.test('Test: Assessment Criteria', function(assert){
-	assert.expect(0);
-	let done = assert.async();
-	frappe.run_serially([
-		() => {
-			return frappe.tests.make('Assessment Criteria', [
-				{assessment_criteria: 'Pass'},
-				{assessment_criteria_group: 'Reservation'}
-			]);
-		},
-		() => done()
-	]);
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.json b/erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.json
deleted file mode 100644
index 7aa417f..0000000
--- a/erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "field:assessment_criteria_group", 
- "beta": 0, 
- "creation": "2017-01-27 15:17:38.855910", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "assessment_criteria_group", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Assessment Criteria Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-06-30 08:21:46.323964", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Assessment Criteria Group", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_criteria_group/test_assessment_criteria_group.js b/erpnext/schools/doctype/assessment_criteria_group/test_assessment_criteria_group.js
deleted file mode 100644
index 92dba1d..0000000
--- a/erpnext/schools/doctype/assessment_criteria_group/test_assessment_criteria_group.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// School Assessment module
-QUnit.module('schools');
-
-QUnit.test('Test: Assessment Criteria Group', function(assert){
-	assert.expect(0);
-	let done = assert.async();
-	frappe.run_serially([
-		() => {
-			return frappe.tests.make('Assessment Criteria Group', [
-				{assessment_criteria_group: 'Reservation'}
-			]);
-		},
-		() => done()
-	]);
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_group/assessment_group.json b/erpnext/schools/doctype/assessment_group/assessment_group.json
deleted file mode 100644
index 8c93bb2..0000000
--- a/erpnext/schools/doctype/assessment_group/assessment_group.json
+++ /dev/null
@@ -1,274 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "field:assessment_group_name", 
- "beta": 0, 
- "creation": "2016-08-04 04:42:48.319388", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "assessment_group_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Assessment Group Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "is_group", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Is Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_2", 
-   "fieldtype": "Section Break", 
-   "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, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "parent_assessment_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Parent Assessment Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Assessment Group", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "lft", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "lft", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "rgt", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "rgt", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "old_parent", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "old_parent", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Assessment Group", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-08-21 02:12:33.177318", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Assessment Group", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_group/test_assessment_group.js b/erpnext/schools/doctype/assessment_group/test_assessment_group.js
deleted file mode 100644
index aa6da47..0000000
--- a/erpnext/schools/doctype/assessment_group/test_assessment_group.js
+++ /dev/null
@@ -1,86 +0,0 @@
-// School Assessment module
-QUnit.module('schools');
-
-QUnit.test('Test: Assessment Group', function(assert){
-	assert.expect(4);
-	let done = assert.async();
-
-	frappe.run_serially([
-		() => frappe.set_route('Tree', 'Assessment Group'),
-
-		// Checking adding child without selecting any Node
-		() => frappe.tests.click_button('New'),
-		() => frappe.timeout(0.2),
-		() => {assert.equal($(`.msgprint`).text(), "Select a group node first.", "Error message success");},
-		() => frappe.tests.click_button('Close'),
-		() => frappe.timeout(0.2),
-
-		// Creating child nodes
-		() => frappe.tests.click_link('All Assessment Groups'),
-		() => frappe.map_group.make('Assessment-group-1'),
-		() => frappe.map_group.make('Assessment-group-2'),
-		() => frappe.map_group.make('Assessment-group-3'),
-		() => frappe.map_group.make('Assessment-group-4', "All Assessment Groups", 1),
-		() => frappe.tests.click_link('Assessment-group-4'),
-		() => frappe.map_group.make('Assessment-group-5', "Assessment-group-3", 0),
-
-		// Checking Edit button
-		() => frappe.timeout(0.5),
-		() => frappe.tests.click_link('Assessment-group-1'),
-		() => frappe.tests.click_button('Edit'),
-		() => frappe.timeout(0.5),
-		() => {assert.deepEqual(frappe.get_route(), ["Form", "Assessment Group", "Assessment-group-1"], "Edit route checks");},
-
-		// Deleting child Node
-		() => frappe.set_route('Tree', 'Assessment Group'),
-		() => frappe.timeout(0.5),
-		() => frappe.tests.click_link('Assessment-group-1'),
-		() => frappe.tests.click_button('Delete'),
-		() => frappe.timeout(0.5),
-		() => frappe.tests.click_button('Yes'),
-
-		// Renaming Child node
-		() => frappe.timeout(0.5),
-		() => frappe.tests.click_link('Assessment-group-2'),
-		() => frappe.tests.click_button('Rename'),
-		() => frappe.timeout(0.4),
-		() => cur_dialog.set_value('new_name', 'Assessment-group-6'),
-		() => frappe.tests.click_button('Rename'),
-		() => frappe.tests.click_button('Close'),
-
-		// Merging 2 child nodes into 1
-		() => frappe.timeout(0.5),
-		() => frappe.tests.click_link('Assessment-group-6'),
-		() => frappe.tests.click_button('Rename'),
-		() => frappe.timeout(0.4),
-		() => cur_dialog.set_value('merge', 1),
-		() => cur_dialog.set_value('new_name', 'Assessment-group-3'),
-		() => frappe.tests.click_button('Rename'),
-		() => frappe.tests.click_button('Close'),
-
-		// Checking Collapse and Expand button
-		() => frappe.timeout(1),
-		() => frappe.tests.click_link('Assessment-group-4'),
-		() => frappe.click_button('Collapse'),
-		() => frappe.tests.click_link('All Assessment Groups'),
-		() => frappe.click_button('Collapse'),
-		() => {assert.ok($('.opened').size() == 0, 'Collapsed');},
-		() => frappe.click_button('Expand'),
-		() => {assert.ok($('.opened').size() > 0, 'Expanded');},
-
-		() => done()
-	]);
-});
-
-frappe.map_group = {
-	make:function(assessment_group_name, parent_assessment_group = 'All Assessment Groups', is_group = 0){
-		return frappe.run_serially([
-			() => frappe.click_button('Add Child'),
-			() => frappe.timeout(0.2),
-			() => cur_dialog.set_value('is_group', is_group),
-			() => cur_dialog.set_value('assessment_group_name', assessment_group_name),
-			() => cur_dialog.set_value('parent_assessment_group', parent_assessment_group),
-			() => frappe.click_button('Create New'),
-		]);
-	}
-};
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_plan/assessment_plan.js b/erpnext/schools/doctype/assessment_plan/assessment_plan.js
deleted file mode 100644
index e83c4d3..0000000
--- a/erpnext/schools/doctype/assessment_plan/assessment_plan.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-cur_frm.add_fetch("student_group", "course", "course");
-cur_frm.add_fetch("examiner", "instructor_name", "examiner_name");
-cur_frm.add_fetch("supervisor", "instructor_name", "supervisor_name");
-cur_frm.add_fetch("course", "default_grading_scale", "grading_scale");
-
-frappe.ui.form.on("Assessment Plan", {
-    onload: function(frm) {
-        frm.set_query("assessment_group", function(doc, cdt, cdn) {
-            return{
-                filters: {
-                    'is_group': 0
-                }
-            }
-        });
-    },
-
-    refresh: function(frm) {
-        if (frm.doc.docstatus == 1) {
-            frm.add_custom_button(__("Assessment Result"), function() {
-                frappe.route_options = {
-                    assessment_plan: frm.doc.name,
-                    student_group: frm.doc.student_group
-                }
-                frappe.set_route("Form", "Assessment Result Tool");
-            });
-        }
-
-		frm.set_query('grading_scale', function(){
-			return {
-				filters: {
-					docstatus: 1
-				}
-			}
-		});
-    },
-
-	course: function(frm) {
-		if (frm.doc.course && frm.doc.maximum_assessment_score) {
-			frappe.call({
-				method: "erpnext.schools.api.get_assessment_criteria",
-				args: {
-					course: frm.doc.course
-				},
-				callback: function(r) {
-					if (r.message) {
-						frm.doc.assessment_criteria = [];
-						$.each(r.message, function(i, d) {
-							var row = frappe.model.add_child(frm.doc, "Assessment Plan Criteria", "assessment_criteria");
-							row.assessment_criteria = d.assessment_criteria;
-							row.maximum_score = d.weightage / 100 * frm.doc.maximum_assessment_score;
-						});
-					}
-					refresh_field("assessment_criteria");
-
-				}
-			});
-		}
-	},
-
-	maximum_assessment_score: function(frm) {
-		frm.trigger("course");
-	}
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_plan/assessment_plan.json b/erpnext/schools/doctype/assessment_plan/assessment_plan.json
deleted file mode 100644
index 265612b..0000000
--- a/erpnext/schools/doctype/assessment_plan/assessment_plan.json
+++ /dev/null
@@ -1,674 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "ASP.#####", 
- "beta": 0, 
- "creation": "2015-11-12 16:34:34.658092", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "assessment_name", 
-   "fieldtype": "Data", 
-   "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": "Assessment Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "student_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Student Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student Group", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "course", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Course", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Course", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "assessment_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Assessment Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Assessment Group", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "maximum_assessment_score", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Maximum Assessment Score", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "grading_scale", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Grading Scale", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Grading Scale", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "collapsible_depends_on": "", 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "section_break_5", 
-   "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": "Schedule", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Today", 
-   "fieldname": "schedule_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Schedule Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "room", 
-   "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": "Room", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Room", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "examiner", 
-   "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": "Examiner", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Instructor", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "examiner_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Examiner Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "from_time", 
-   "fieldtype": "Time", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "From Time", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "to_time", 
-   "fieldtype": "Time", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "To Time", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "supervisor", 
-   "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": "Supervisor", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Instructor", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "supervisor_name", 
-   "fieldtype": "Data", 
-   "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": "Supervisor Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_20", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "assessment_criteria", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Assessment Criteria", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Assessment Plan Criteria", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Assessment Plan", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "menu_index": 0, 
- "modified": "2017-06-30 08:21:46.535547", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Assessment Plan", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "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": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "assessment_name", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_plan/assessment_plan.py b/erpnext/schools/doctype/assessment_plan/assessment_plan.py
deleted file mode 100644
index a09f3ee..0000000
--- a/erpnext/schools/doctype/assessment_plan/assessment_plan.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-from frappe.model.document import Document
-import frappe
-from frappe import _
-
-class AssessmentPlan(Document):
-	def validate(self):
-		self.validate_overlap()
-		self.validate_max_score()
-		self.validate_assessment_criteria()
-
-	def validate_overlap(self):
-		"""Validates overlap for Student Group, Instructor, Room"""
-		
-		from erpnext.schools.utils import validate_overlap_for
-
-		#Validate overlapping course schedules.
-		if self.student_group:
-			validate_overlap_for(self, "Course Schedule", "student_group")
-		
-		validate_overlap_for(self, "Course Schedule", "instructor")
-		validate_overlap_for(self, "Course Schedule", "room")
-
-		#validate overlapping assessment schedules.
-		if self.student_group:
-			validate_overlap_for(self, "Assessment Plan", "student_group")
-		
-		validate_overlap_for(self, "Assessment Plan", "room")
-		validate_overlap_for(self, "Assessment Plan", "supervisor", self.supervisor)
-
-	def validate_max_score(self):
-		max_score = 0
-		for d in self.assessment_criteria:
-			max_score += d.maximum_score
-		if self.maximum_assessment_score != max_score:
-			frappe.throw(_("Sum of Scores of Assessment Criteria needs to be {0}.".format(self.maximum_assessment_score)))
-
-	def validate_assessment_criteria(self):
-		assessment_criteria_list = frappe.db.sql_list(''' select apc.assessment_criteria
-			from `tabAssessment Plan` ap , `tabAssessment Plan Criteria` apc
-			where ap.name = apc.parent and ap.course=%s and ap.student_group=%s and ap.assessment_group=%s
-			and ap.name != %s''', (self.course, self.student_group, self.assessment_group, self.name))
-		for d in self.assessment_criteria:
-			if d.assessment_criteria in assessment_criteria_list:
-				frappe.throw(_("You have already assessed for the assessment criteria {}.")
-					.format(frappe.bold(d.assessment_criteria)))
diff --git a/erpnext/schools/doctype/assessment_plan/test_assessment_plan.js b/erpnext/schools/doctype/assessment_plan/test_assessment_plan.js
deleted file mode 100644
index faa39bf..0000000
--- a/erpnext/schools/doctype/assessment_plan/test_assessment_plan.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// Testing Assessment Module in Schools
-QUnit.module('schools');
-
-QUnit.test('Test: Assessment Plan', function(assert){
-	assert.expect(6);
-	let done = assert.async();
-	let room_name, instructor_name, assessment_name;
-
-	frappe.run_serially([
-		() => frappe.db.get_value('Room', {'room_name': 'Room 1'}, 'name'),
-		(room) => {room_name = room.message.name;}, // Fetching Room name
-		() => frappe.db.get_value('Instructor', {'instructor_name': 'Instructor 1'}, 'name'),
-		(instructor) => {instructor_name = instructor.message.name;}, // Fetching Instructor name
-
-		() => {
-			return frappe.tests.make('Assessment Plan', [
-				{assessment_name: "Test-Mid-Term"},
-				{assessment_group: 'Assessment-group-5'},
-				{maximum_assessment_score: 100},
-				{student_group: 'test-course-wise-group-2'},
-				{course: 'Test_Sub'},
-				{grading_scale: 'GTU'},
-				{schedule_date: frappe.datetime.nowdate()},
-				{room: room_name},
-				{examiner: instructor_name},
-				{supervisor: instructor_name},
-				{from_time: "12:30:00"},
-				{to_time: "2:30:00"}
-			]);
-		},
-
-		() => {
-			assessment_name = cur_frm.doc.name; // Storing the name of current Assessment Plan
-			assert.equal(cur_frm.doc.assessment_criteria[0].assessment_criteria, 'Pass', 'Assessment Criteria auto-filled correctly');
-			assert.equal(cur_frm.doc.assessment_criteria[0].maximum_score, 100, 'Maximum score correctly set');
-		}, // Checking if the table was auto-filled upon selecting appropriate fields
-
-		() => frappe.timeout(1),
-		() => frappe.tests.click_button('Submit'),
-		() => frappe.timeout(0.5),
-		() => frappe.tests.click_button('Yes'),
-		() => frappe.timeout(0.5),
-		() => {assert.equal(cur_frm.doc.docstatus, 1, "Assessment Plan submitted successfully");},
-
-		() => frappe.click_button('Assessment Result'), // Checking out Assessment Result button option
-		() => frappe.timeout(0.5),
-		() => {
-			assert.deepEqual(frappe.get_route(), ["Form", "Assessment Result Tool"], 'Assessment Result properly linked');
-			assert.equal(cur_frm.doc.assessment_plan, assessment_name, 'Assessment correctly set');
-			assert.equal(cur_frm.doc.student_group, 'test-course-wise-group-2', 'Course for Assessment correctly set');
-		},
-		() => done()
-	]);
-});
diff --git a/erpnext/schools/doctype/assessment_plan_criteria/assessment_plan_criteria.json b/erpnext/schools/doctype/assessment_plan_criteria/assessment_plan_criteria.json
deleted file mode 100644
index cf985f6..0000000
--- a/erpnext/schools/doctype/assessment_plan_criteria/assessment_plan_criteria.json
+++ /dev/null
@@ -1,134 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "", 
- "beta": 0, 
- "creation": "2016-12-14 17:20:27.738226", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "assessment_criteria", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Assessment Criteria", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Assessment Criteria", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "maximum_score", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Maximum Score", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-06-30 08:21:46.732666", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Assessment Plan Criteria", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_result/assessment_result.js b/erpnext/schools/doctype/assessment_result/assessment_result.js
deleted file mode 100644
index 7bd1d19..0000000
--- a/erpnext/schools/doctype/assessment_result/assessment_result.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-cur_frm.add_fetch("student", "title", "student_name");
-cur_frm.add_fetch("assessment_plan", "grading_scale", "grading_scale");
-cur_frm.add_fetch("assessment_plan", "maximum_assessment_score", "maximum_score");
-
-frappe.ui.form.on("Assessment Result", {
-	assessment_plan: function(frm) {
-		if (frm.doc.assessment_plan) {
-			frappe.call({
-				method: "erpnext.schools.api.get_assessment_details",
-				args: {
-					assessment_plan: frm.doc.assessment_plan
-				},
-				callback: function(r) {
-					if (r.message) {
-						frm.doc.details = [];
-						$.each(r.message, function(i, d) {
-							var row = frappe.model.add_child(frm.doc, "Assessment Result Detail", "details");
-							row.assessment_criteria = d.assessment_criteria;
-							row.maximum_score = d.maximum_score;
-						});
-					}
-					refresh_field("details");
-				}
-			});
-		}
-	}
-});
-
-frappe.ui.form.on("Assessment Result Detail", {
-	score: function(frm, cdt, cdn) {
-		var d  = locals[cdt][cdn];
-		if (d.score >= d.maximum_score) {
-			frappe.throw(__("Score cannot be greater than Maximum Score"));
-		}
-		else {
-			frappe.call({
-				method: "erpnext.schools.api.get_grade",
-				args: {
-					grading_scale: frm.doc.grading_scale,
-					percentage: ((d.score/d.maximum_score) * 100)
-				},
-				callback: function(r) {
-					if (r.message) {
-						frappe.model.set_value(cdt, cdn, "grade", r.message);
-					}
-				}
-			});
-		}
-	}
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_result/assessment_result.json b/erpnext/schools/doctype/assessment_result/assessment_result.json
deleted file mode 100644
index 13b927c..0000000
--- a/erpnext/schools/doctype/assessment_result/assessment_result.json
+++ /dev/null
@@ -1,515 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "RES.######", 
- "beta": 0, 
- "creation": "2015-11-13 17:18:06.468332", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "student_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Student Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "assessment_plan", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Assessment Plan", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Assessment Plan", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "grading_scale", 
-   "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": "Grading Scale", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Grading Scale", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_5", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "details", 
-   "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": "Details", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Assessment Result Detail", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_8", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "maximum_score", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Maximum Score", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "total_score", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Total Score", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_11", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "grade", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Grade", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_13", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "comment", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Comment", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Assessment Result", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-08-31 15:39:24.813328", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Assessment Result", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "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
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_result/assessment_result.py b/erpnext/schools/doctype/assessment_result/assessment_result.py
deleted file mode 100644
index 3c036dd..0000000
--- a/erpnext/schools/doctype/assessment_result/assessment_result.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-from frappe.utils import flt
-from frappe.model.document import Document
-from erpnext.schools.api import get_grade
-from erpnext.schools.api import get_assessment_details
-from frappe.utils.csvutils import getlink
-
-
-class AssessmentResult(Document):
-	def validate(self):
-		if self.student and not self.student_name:
-			self.student_name = frappe.db.get_value("Student", self.student, "title")
-		self.grading_scale = frappe.db.get_value("Assessment Plan", self.assessment_plan, "grading_scale")
-		self.validate_maximum_score()
-		self.validate_grade()
-		self.validate_duplicate()
-
-	def validate_maximum_score(self):
-		self.maximum_score = frappe.db.get_value("Assessment Plan", self.assessment_plan, "maximum_assessment_score")
-		assessment_details = get_assessment_details(self.assessment_plan)
-		max_scores = {}
-		for d in assessment_details:
-			max_scores.update({d.assessment_criteria: d.maximum_score})
-
-		for d in self.details:
-			d.maximum_score = max_scores.get(d.assessment_criteria)
-			if d.score > d.maximum_score:
-				frappe.throw(_("Score cannot be greater than Maximum Score"))
-		
-	def validate_grade(self):
-		self.total_score = 0.0
-		for d in self.details:
-			d.grade = get_grade(self.grading_scale, (flt(d.score)/d.maximum_score)*100)
-			self.total_score += d.score
-		self.grade = get_grade(self.grading_scale, (self.total_score/self.maximum_score)*100)
-
-	def validate_duplicate(self):
-		assessment_result = frappe.get_list("Assessment Result", filters={"name": ("not in", [self.name]),
-			"student":self.student, "assessment_plan":self.assessment_plan, "docstatus":("!=", 2)})
-		if assessment_result:
-			frappe.throw(_("Assessment Result record {0} already exists.".format(getlink("Assessment Result",assessment_result[0].name))))
-
-
-
-
diff --git a/erpnext/schools/doctype/assessment_result/test_assessment_result.js b/erpnext/schools/doctype/assessment_result/test_assessment_result.js
deleted file mode 100644
index 1ed249a..0000000
--- a/erpnext/schools/doctype/assessment_result/test_assessment_result.js
+++ /dev/null
@@ -1,73 +0,0 @@
-// School Assessment module
-QUnit.module('schools');
-
-QUnit.test('Test: Assessment Result', function(assert){
-	assert.expect(25);
-	let done = assert.async();
-	let student_list = [];
-	let assessment_name;
-	let tasks = []
-
-	frappe.run_serially([
-		// Saving Assessment Plan name
-		() => frappe.db.get_value('Assessment Plan', {'assessment_name': 'Test-Mid-Term'}, 'name'),
-		(assessment_plan) => {assessment_name = assessment_plan.message.name;},
-		// Fetching list of Student for which Result is supposed to be set
-		() => frappe.set_route('Form', 'Assessment Plan', assessment_name),
-		() => frappe.timeout(1),
-		() => frappe.tests.click_button('Assessment Result'),
-		() => frappe.timeout(1),
-		() => cur_frm.refresh(),
-		() => frappe.timeout(1),
-		() => {
-			$("tbody tr").each( function(i, input){
-				student_list.push($(input).data().student);
-			});
-		},
-
-		// Looping through each student in the list and setting up their score
-		() => {
-			student_list.forEach(index => {
-				tasks.push(
-					() => frappe.set_route('List', 'Assessment Result', 'List'),
-					() => frappe.timeout(0.5),
-					() => frappe.tests.click_button('New'),
-					() => frappe.timeout(0.5),
-					() => cur_frm.set_value('student', index),
-					() => cur_frm.set_value('assessment_plan', assessment_name),
-					() => frappe.timeout(0.2),
-					() => cur_frm.doc.details[0].score = (39 + (15 * student_list.indexOf(index))),
-					() => cur_frm.save(),
-					() => frappe.timeout(0.5),
-
-					() => frappe.db.get_value('Assessment Plan', {'name': 'ASP00001'}, ['grading_scale', 'maximum_assessment_score']),
-					(assessment_plan) => {
-						assert.equal(cur_frm.doc.grading_scale, assessment_plan.message.grading_scale, 'Grading scale correctly fetched');
-						assert.equal(cur_frm.doc.maximum_score, assessment_plan.message.maximum_assessment_score, 'Maximum score correctly fetched');
-
-						frappe.call({
-							method: "erpnext.schools.api.get_grade",
-							args: {
-								"grading_scale": assessment_plan.message.grading_scale,
-								"percentage": cur_frm.doc.total_score
-							},
-							callback: function(r){
-								assert.equal(cur_frm.doc.grade, r.message, "Grade correctly calculated");
-							}
-						});
-					},
-
-					() => frappe.tests.click_button('Submit'),
-					() => frappe.timeout(0.5),
-					() => frappe.tests.click_button('Yes'),
-					() => frappe.timeout(0.5),
-					() => {assert.equal();},
-					() => {assert.equal(cur_frm.doc.docstatus, 1, "Submitted successfully");},
-				);
-			});
-			return frappe.run_serially(tasks);
-		},
-
-		() => done()
-	]);
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_result/test_assessment_result.py b/erpnext/schools/doctype/assessment_result/test_assessment_result.py
deleted file mode 100644
index 66e611c..0000000
--- a/erpnext/schools/doctype/assessment_result/test_assessment_result.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import frappe
-import unittest
-from erpnext.schools.api import get_grade
-
-# test_records = frappe.get_test_records('Assessment Result')
-
-class TestAssessmentResult(unittest.TestCase):
-	def test_grade(self):
-		grade = get_grade("_Test Grading Scale", 80)
-		self.assertEquals("A", grade)
-
-		grade = get_grade("_Test Grading Scale", 70)
-		self.assertEquals("B", grade)
-		
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_result_detail/assessment_result_detail.json b/erpnext/schools/doctype/assessment_result_detail/assessment_result_detail.json
deleted file mode 100644
index e7076bc..0000000
--- a/erpnext/schools/doctype/assessment_result_detail/assessment_result_detail.json
+++ /dev/null
@@ -1,194 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "", 
- "beta": 0, 
- "creation": "2016-12-14 17:44:35.583123", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 4, 
-   "fieldname": "assessment_criteria", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Assessment Criteria", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Assessment Criteria", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "maximum_score", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Maximum Score", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "score", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Score", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "grade", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Grade", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-06-30 08:21:47.068704", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Assessment Result Detail", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js b/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js
deleted file mode 100644
index dfa7b14..0000000
--- a/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-
-frappe.ui.form.on('Assessment Result Tool', {
-	setup: function(frm) {
-		frm.add_fetch("assessment_plan", "student_group", "student_group");
-	},
-
-	refresh: function(frm) {
-		if (frappe.route_options) {
-			frm.set_value("student_group", frappe.route_options.student_group);
-			frm.set_value("assessment_plan", frappe.route_options.assessment_plan);
-			frappe.route_options = null;
-		}
-		frm.disable_save();
-		frm.page.clear_indicator();
-		frm.trigger("assessment_plan");
-	},
-
-	assessment_plan: function(frm) {
-		frm.doc.show_submit = false;
-		if(frm.doc.assessment_plan) {
-			if (!frm.doc.student_group)
-				return
-			frappe.call({
-				method: "erpnext.schools.api.get_assessment_students",
-				args: {
-					"assessment_plan": frm.doc.assessment_plan,
-					"student_group": frm.doc.student_group
-				},
-				callback: function(r) {
-					frm.doc.students = r.message;
-					frm.events.render_table(frm);
-					for (let value of r.message) {
-						if (!value.docstatus) {
-							frm.doc.show_submit = true;
-							break;
-						}
-					}
-					frm.events.submit_result(frm);
-				}
-			});
-		}
-	},
-
-	render_table: function(frm) {
-		$(frm.fields_dict.result_html.wrapper).empty();
-		let assessment_plan = frm.doc.assessment_plan;
-		frappe.call({
-			method: "erpnext.schools.api.get_assessment_details",
-			args: {
-				assessment_plan: assessment_plan
-			},
-			callback: function(r) {
-				frm.events.get_marks(frm, r.message);
-			}
-		});
-	},
-
-	get_marks: function(frm, criteria_list) {
-		let max_total_score = 0;
-		criteria_list.forEach(function(c) {
-			max_total_score += c.maximum_score
-		});
-		var result_table = $(frappe.render_template('assessment_result_tool', {
-			frm: frm,
-			students: frm.doc.students,
-			criteria: criteria_list,
-			max_total_score: max_total_score
-		}));
-		result_table.appendTo(frm.fields_dict.result_html.wrapper);
-
-		result_table.on('change', 'input', function(e) {
-			let $input = $(e.target);
-			let student = $input.data().student;
-			let max_score = $input.data().maxScore;
-			let value = $input.val();
-			if(value < 0) {
-				$input.val(0);
-			} else if(value > max_score) {
-				$input.val(max_score);
-			}
-			let total_score = 0;
-			let student_scores = {};
-			student_scores["assessment_details"] = {}
-			result_table.find(`input[data-student=${student}].student-result-data`)
-				.each(function(el, input) {
-					let $input = $(input);
-					let criteria = $input.data().criteria;
-					let value = parseFloat($input.val());
-					if (value) {
-						student_scores["assessment_details"][criteria] = value;
-					}
-					total_score += value;
-			});
-			if(!Number.isNaN(total_score)) {
-				result_table.find(`span[data-student=${student}].total-score`).html(total_score);
-			}
-			if (Object.keys(student_scores["assessment_details"]).length === criteria_list.length) {
-				student_scores["student"] = student;
-				student_scores["total_score"] = total_score;
-				result_table.find(`[data-student=${student}].result-comment`)
-					.each(function(el, input){
-					student_scores["comment"] = $(input).val();
-				});
-				frappe.call({
-					method: "erpnext.schools.api.mark_assessment_result",
-					args: {
-						"assessment_plan": frm.doc.assessment_plan,
-						"scores": student_scores
-					},
-					callback: function(r) {
-						let assessment_result = r.message;
-						if (!frm.doc.show_submit) {
-							frm.doc.show_submit = true;
-							frm.events.submit_result;
-						}
-						for (var criteria of Object.keys(assessment_result.details)) {
-							result_table.find(`[data-criteria=${criteria}][data-student=${assessment_result
-								.student}].student-result-grade`).each(function(e1, input) {
-									$(input).html(assessment_result.details[criteria]);
-							});
-						}
-						result_table.find(`span[data-student=${assessment_result.student}].total-score-grade`).html(assessment_result.grade);
-						let link_span = result_table.find(`span[data-student=${assessment_result.student}].total-result-link`);
-						$(link_span).css("display", "block");
-						$(link_span).find("a").attr("href", "#Form/Assessment Result/"+assessment_result.name);
-					}
-				});
-			}
-		});
-	},
-
-	submit_result: function(frm) {
-		if (frm.doc.show_submit) {
-			frm.page.set_primary_action(__("Submit"), function() {
-				frappe.call({
-					method: "erpnext.schools.api.submit_assessment_results",
-					args: {
-						"assessment_plan": frm.doc.assessment_plan,
-						"student_group": frm.doc.student_group
-					},
-					callback: function(r) {
-						if (r.message) {
-							frappe.msgprint(__("{0} Result submittted", [r.message]));
-						} else {
-							frappe.msgprint(__("No Result to submit"));
-						}
-						frm.events.assessment_plan(frm);
-					}
-				});
-			});
-		}
-		else {
-			frm.page.clear_primary_action();
-		}
-	}
-});
diff --git a/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.json b/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.json
deleted file mode 100644
index 116fbad..0000000
--- a/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.json
+++ /dev/null
@@ -1,215 +0,0 @@
-{
- "allow_copy": 1, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2017-01-05 12:27:48.951036", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "fieldname": "assessment_plan", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Assessment Plan", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Assessment Plan", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "student_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Student Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student Group", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "assessment_plan", 
-   "fieldname": "section_break_5", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "result_html", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Result HTML", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 1, 
- "hide_toolbar": 1, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-11-08 11:51:43.247815", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Assessment Result Tool", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_result_tool/test_assessment_result_tool.js b/erpnext/schools/doctype/assessment_result_tool/test_assessment_result_tool.js
deleted file mode 100644
index 7d9c7d3..0000000
--- a/erpnext/schools/doctype/assessment_result_tool/test_assessment_result_tool.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// School Assessment module
-QUnit.module('schools');
-
-QUnit.test('Test: Assessment Result Tool', function(assert){
-	assert.expect(1);
-	let done = assert.async();
-	let i, count = 0, assessment_name;
-
-	frappe.run_serially([
-		// Saving Assessment Plan name
-		() => frappe.db.get_value('Assessment Plan', {'assessment_name': 'Test-Mid-Term'}, 'name'),
-		(assessment_plan) => {assessment_name = assessment_plan.message.name;},
-
-		() => frappe.set_route('Form', 'Assessment Plan', assessment_name),
-		() => frappe.timeout(1),
-		() => frappe.tests.click_button('Assessment Result'),
-		() => frappe.timeout(1),
-		() => cur_frm.refresh(),
-		() => frappe.timeout(1),
-		() => {
-			for(i = 2; i < $('tbody tr').size() * 4; i = (i + 4)){
-				if(($(`tbody td:eq("${i}")`) != "") && ($(`tbody td:eq("${i+1}")`) != ""))
-					count++;
-			}
-			assert.equal($('tbody tr').size(), count, 'All grades correctly displayed');
-		},
-		() => done()
-	]);
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course/course.json b/erpnext/schools/doctype/course/course.json
deleted file mode 100644
index d2f1722..0000000
--- a/erpnext/schools/doctype/course/course.json
+++ /dev/null
@@ -1,417 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "field:course_code", 
- "beta": 0, 
- "creation": "2015-09-07 12:39:55.181893", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "course_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Course Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "department", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Department", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Department", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "parent_course", 
-   "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": "Parent Course (Leave blank, if this isn't part of Parent Course)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "course_code", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Course Code", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "course_abbreviation", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Course Abbreviation", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_6", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "course_intro", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Course Intro", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "assessment", 
-   "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": "Assessment", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "default_grading_scale", 
-   "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": "Default Grading Scale", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Grading Scale", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "assessment_criteria", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Assessment Criteria", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Course Assessment Criteria", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "menu_index": 0, 
- "modified": "2017-06-30 08:21:47.260549", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Course", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "HR Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "search_fields": "course_name", 
- "show_name_in_global_search": 1, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course/test_course.js b/erpnext/schools/doctype/course/test_course.js
deleted file mode 100644
index 4866730..0000000
--- a/erpnext/schools/doctype/course/test_course.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// Testing Setup Module in Schools
-QUnit.module('schools');
-
-QUnit.test('test course', function(assert) {
-	assert.expect(8);
-	let done = assert.async();
-	frappe.run_serially([
-		() => {
-			return frappe.tests.make('Course', [
-				{course_name: 'Test_Subject'},
-				{course_code: 'Test_Sub'},
-				{department: 'Test Department'},
-				{course_abbreviation: 'Test_Sub'},
-				{course_intro: 'Test Subject Intro'},
-				{default_grading_scale: 'GTU'},
-				{assessment_criteria: [
-					[
-						{assessment_criteria: 'Pass'},
-						{weightage: 100}
-					]
-				]}
-			]);
-		},
-		() => {
-			assert.ok(cur_frm.doc.course_name == 'Test_Subject', 'Course name correctly set');
-			assert.ok(cur_frm.doc.course_code == 'Test_Sub', 'Course code correctly set');
-			assert.ok(cur_frm.doc.department == 'Test Department', 'Department selected correctly');
-			assert.ok(cur_frm.doc.course_abbreviation == 'Test_Sub');
-			assert.ok(cur_frm.doc.course_intro == 'Test Subject Intro');
-			assert.ok(cur_frm.doc.default_grading_scale == 'GTU', 'Grading scale selected correctly');
-			assert.ok(cur_frm.doc.assessment_criteria[0].assessment_criteria == 'Pass', 'Assessment criteria selected correctly');
-			assert.ok(cur_frm.doc.assessment_criteria[0].weightage == '100');
-		},
-		() => done()
-	]);
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course_assessment_criteria/course_assessment_criteria.json b/erpnext/schools/doctype/course_assessment_criteria/course_assessment_criteria.json
deleted file mode 100644
index 73d0487..0000000
--- a/erpnext/schools/doctype/course_assessment_criteria/course_assessment_criteria.json
+++ /dev/null
@@ -1,134 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "", 
- "beta": 0, 
- "creation": "2016-12-14 16:46:46.786353", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "assessment_criteria", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Assessment Criteria", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Assessment Criteria", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "weightage", 
-   "fieldtype": "Percent", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Weightage", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-06-30 08:21:47.420656", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Course Assessment Criteria", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course_schedule/course_schedule.js b/erpnext/schools/doctype/course_schedule/course_schedule.js
deleted file mode 100644
index 7778a6e..0000000
--- a/erpnext/schools/doctype/course_schedule/course_schedule.js
+++ /dev/null
@@ -1,16 +0,0 @@
-frappe.provide("schools")
-
-cur_frm.add_fetch("student_group", "course", "course")
-frappe.ui.form.on("Course Schedule", {
-	refresh: function(frm) {
-		if (!frm.doc.__islocal) {
-			frm.add_custom_button(__("Attendance"), function() {
-				frappe.route_options = {
-					based_on: "Course Schedule",
-					course_schedule: frm.doc.name
-				}
-				frappe.set_route("Form", "Student Attendance Tool");
-			});
-		}
-	}
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course_schedule/course_schedule.json b/erpnext/schools/doctype/course_schedule/course_schedule.json
deleted file mode 100644
index 68ef233..0000000
--- a/erpnext/schools/doctype/course_schedule/course_schedule.json
+++ /dev/null
@@ -1,461 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "naming_series:", 
- "beta": 0, 
- "creation": "2015-09-09 16:34:04.960369", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "student_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Student Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student Group", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "instructor", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Instructor", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Instructor", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "instructor_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": "Instructor Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "instructor.Instructor_name", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "SH", 
-   "fieldname": "naming_series", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Naming Series", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "SH", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 1, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "course", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Course", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Course", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_6", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Today", 
-   "fieldname": "schedule_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": "Schedule Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "room", 
-   "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": "Room", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Room", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_9", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "from_time", 
-   "fieldtype": "Time", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "From Time", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "to_time", 
-   "fieldtype": "Time", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "To Time", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "title", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Title", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "menu_index": 0, 
- "modified": "2017-06-30 08:21:47.516781", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Course Schedule", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "schedule_date", 
- "sort_order": "DESC", 
- "title_field": "title", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course_schedule/course_schedule.py b/erpnext/schools/doctype/course_schedule/course_schedule.py
deleted file mode 100644
index 845f5f5..0000000
--- a/erpnext/schools/doctype/course_schedule/course_schedule.py
+++ /dev/null
@@ -1,50 +0,0 @@
-	# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-from frappe.model.document import Document
-
-class CourseSchedule(Document):
-	def validate(self):
-		self.instructor_name = frappe.db.get_value("Instructor", self.instructor, "instructor_name")
-		self.set_title()
-		self.validate_course()
-		self.validate_date()
-		self.validate_overlap()
-	
-	def set_title(self):
-		"""Set document Title"""
-		self.title = self.course + " by " + (self.instructor_name if self.instructor_name else self.instructor)
-	
-	def validate_course(self):
-		group_based_on, course = frappe.db.get_value("Student Group", self.student_group, ["group_based_on", "course"])
-		if group_based_on == "Course":
-			self.course = course
-
-	def validate_date(self):
-		"""Validates if from_time is greater than to_time"""
-		if self.from_time > self.to_time:
-			frappe.throw(_("From Time cannot be greater than To Time."))
-	
-	def validate_overlap(self):
-		"""Validates overlap for Student Group, Instructor, Room"""
-		
-		from erpnext.schools.utils import validate_overlap_for
-
-		#Validate overlapping course schedules.
-		if self.student_group:
-			validate_overlap_for(self, "Course Schedule", "student_group")
-		
-		validate_overlap_for(self, "Course Schedule", "instructor")
-		validate_overlap_for(self, "Course Schedule", "room")
-
-		#validate overlapping assessment schedules.
-		if self.student_group:
-			validate_overlap_for(self, "Assessment Plan", "student_group")
-		
-		validate_overlap_for(self, "Assessment Plan", "room")
-		validate_overlap_for(self, "Assessment Plan", "supervisor", self.instructor)
-
diff --git a/erpnext/schools/doctype/course_schedule/course_schedule_calendar.js b/erpnext/schools/doctype/course_schedule/course_schedule_calendar.js
deleted file mode 100644
index 94ce720..0000000
--- a/erpnext/schools/doctype/course_schedule/course_schedule_calendar.js
+++ /dev/null
@@ -1,38 +0,0 @@
-frappe.views.calendar["Course Schedule"] = {
-	field_map: {
-		// from_datetime and to_datetime don't exist as docfields but are used in onload
-		"start": "from_datetime",
-		"end": "to_datetime",
-		"id": "name",
-		"title": "course",
-		"allDay": "allDay"
-	},
-	gantt: false,
-	filters: [
-		{
-			"fieldtype": "Link",
-			"fieldname": "student_group",
-			"options": "Student Group",
-			"label": __("Student Group")
-		},
-		{
-			"fieldtype": "Link",
-			"fieldname": "course",
-			"options": "Course",
-			"label": __("Course")
-		},
-		{
-			"fieldtype": "Link",
-			"fieldname": "instructor",
-			"options": "Instructor",
-			"label": __("Instructor")
-		},
-		{
-			"fieldtype": "Link",
-			"fieldname": "room",
-			"options": "Room",
-			"label": __("Room")
-		}
-	],
-	get_events_method: "erpnext.schools.api.get_course_schedule_events"
-}
diff --git a/erpnext/schools/doctype/course_schedule/test_course_schedule.py b/erpnext/schools/doctype/course_schedule/test_course_schedule.py
deleted file mode 100644
index f131382..0000000
--- a/erpnext/schools/doctype/course_schedule/test_course_schedule.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import frappe
-import unittest
-
-import datetime
-from frappe.utils import today, to_timedelta
-from erpnext.schools.utils import OverlapError
-
-# test_records = frappe.get_test_records('Course Schedule')
-
-class TestCourseSchedule(unittest.TestCase):
-	def test_student_group_conflict(self):
-		cs1 = make_course_schedule_test_record(simulate= True)
-
-		cs2 = make_course_schedule_test_record(schedule_date=cs1.schedule_date, from_time= cs1.from_time, 
-			to_time= cs1.to_time, instructor="_Test Instructor 2", room="RM0002", do_not_save= 1)
-		self.assertRaises(OverlapError, cs2.save)
-
-	def test_instructor_conflict(self):
-		cs1 = make_course_schedule_test_record(simulate= True)
-		
-		cs2 = make_course_schedule_test_record(from_time= cs1.from_time, to_time= cs1.to_time, 
-			student_group="Course-TC101-2014-2015 (_Test Academic Term)", room="RM0002", do_not_save= 1)
-		self.assertRaises(OverlapError, cs2.save)
-
-	def test_room_conflict(self):
-		cs1 = make_course_schedule_test_record(simulate= True)
-		
-		cs2 = make_course_schedule_test_record(from_time= cs1.from_time, to_time= cs1.to_time, 
-			student_group="Course-TC101-2014-2015 (_Test Academic Term)", instructor="_Test Instructor 2", do_not_save= 1)
-		self.assertRaises(OverlapError, cs2.save)
-		
-	def test_no_conflict(self):
-		cs1 = make_course_schedule_test_record(simulate= True)
-		
-		make_course_schedule_test_record(from_time= cs1.from_time, to_time= cs1.to_time, 
-			student_group="Course-TC102-2014-2015 (_Test Academic Term)", instructor="_Test Instructor 2", room="RM0002")
-
-def make_course_schedule_test_record(**args):
-	args = frappe._dict(args)
-
-	course_schedule = frappe.new_doc("Course Schedule")
-	course_schedule.student_group = args.student_group or "Course-TC101-2014-2015 (_Test Academic Term)"
-	course_schedule.course = args.course or "TC101"
-	course_schedule.instructor = args.instructor or "_Test Instructor"
-	course_schedule.room = args.room or "RM0001"
-	
-	course_schedule.schedule_date = args.schedule_date or today()
-	course_schedule.from_time = args.from_time or to_timedelta("01:00:00")
-	course_schedule.to_time = args.to_time or course_schedule.from_time + datetime.timedelta(hours= 1)
-
-	
-	if not args.do_not_save:
-		if args.simulate:
-			while True:
-				try:
-					course_schedule.save()
-					break
-				except OverlapError:
-					course_schedule.from_time = course_schedule.from_time + datetime.timedelta(minutes=10)
-					course_schedule.to_time = course_schedule.from_time + datetime.timedelta(hours= 1)
-		else:
-			course_schedule.save()
-
-	return course_schedule
diff --git a/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js b/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js
deleted file mode 100644
index f92f738..0000000
--- a/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-cur_frm.add_fetch("student_group", "program", "program");
-cur_frm.add_fetch("student_group", "course", "course");
-cur_frm.add_fetch("student_group", "academic_year", "academic_year");
-cur_frm.add_fetch("student_group", "academic_term", "academic_term");
-
-frappe.ui.form.on("Course Scheduling Tool", {
-
-	refresh: function(frm) {
-		frm.disable_save();
-		frm.page.set_primary_action(__("Schedule Course"), function() {
-			frappe.call({
-				method: "schedule_course",
-				doc: frm.doc
-			})
-		});
-	}
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.json b/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.json
deleted file mode 100644
index e0fc1e2..0000000
--- a/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.json
+++ /dev/null
@@ -1,642 +0,0 @@
-{
- "allow_copy": 1, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2015-09-23 15:37:38.108475", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "student_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Student Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student Group", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "course", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Course", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Course", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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": 0, 
-   "in_standard_filter": 0, 
-   "label": "Program", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Program", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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": 0, 
-   "in_standard_filter": 0, 
-   "label": "Academic Year", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Academic Year", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_6", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "instructor", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Instructor", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Instructor", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "instructor_name", 
-   "fieldtype": "Read Only", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Instructor Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "instructor.instructor_name", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_9", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "room", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Room", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Room", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_7", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "fieldname": "from_time", 
-   "fieldtype": "Time", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "From Time", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "fieldname": "course_start_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Course Start Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "day", 
-   "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": "Day", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nMonday\nTuesday\nWednesday\nThursday\nFriday\nSaturday\nSunday", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "rechedule", 
-   "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": "Rechedule", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_15", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "to_time", 
-   "fieldtype": "Time", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "To TIme", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "fieldname": "course_end_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Course End Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 1, 
- "hide_toolbar": 1, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "max_attachments": 0, 
- "menu_index": 0, 
- "modified": "2017-06-30 08:21:47.696063", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Course Scheduling Tool", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py b/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py
deleted file mode 100644
index 4e07922..0000000
--- a/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py
+++ /dev/null
@@ -1,101 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-import calendar
-from frappe import _
-from frappe.model.document import Document
-from frappe.utils import add_days, getdate
-from erpnext.schools.utils import OverlapError
-
-class CourseSchedulingTool(Document):
-	def schedule_course(self):
-		"""Creates course schedules as per specified parametes"""
-		
-		course_schedules= []
-		course_schedules_errors= []
-		rescheduled= []
-		reschedule_errors= []
-		
-		self.validate_mandatory()
-		self.validate_date()
-		self.instructor_name= frappe.db.get_value("Instructor", self.instructor, "instructor_name")
-
-		group_based_on, course = frappe.db.get_value("Student Group", self.student_group, ["group_based_on", "course"])
-		if group_based_on == "Course":
-			self.course = course	
-
-		if self.rechedule:
-			rescheduled, reschedule_errors = self.delete_course_schedule(rescheduled, reschedule_errors)
-		
-		date = self.course_start_date
-		while(date < self.course_end_date):
-			if self.day == calendar.day_name[getdate(date).weekday()]:
-				course_schedule = self.make_course_schedule(date)
-				try:
-					course_schedule.save()
-				except OverlapError:
-					course_schedules_errors.append(date)
-				else:
-					course_schedules.append(course_schedule.name + " on " + date)
-				
-				date = add_days(date, 7)
-			else:
-				date = add_days(date, 1)
-			
-		frappe.local.message_log = []
-		if course_schedules:
-			frappe.msgprint(_("Course Schedules created:") + "\n" + "\n".join(course_schedules))
-		if course_schedules_errors:
-			frappe.msgprint(_("There were errors while scheduling course on :") + "\n" + "\n".join(course_schedules_errors))
-		if rescheduled:
-			frappe.msgprint(_("Course Schedules deleted:") + "\n" + "\n".join(rescheduled))
-		if reschedule_errors:
-			frappe.msgprint(_("There were errors while deleting following schedules:") + "\n" + "\n".join(reschedule_errors))
-			
-	def validate_mandatory(self):
-		"""Validates all mandatory fields"""
-		
-		fields = ['course', 'room', 'instructor', 'from_time', 'to_time', 'course_start_date', 'course_end_date', 'day']
-		for d in  fields:
-			if not self.get(d):
-				frappe.throw(_("{0} is mandatory").format(self.meta.get_label(d)))	
-
-	def validate_date(self):
-		"""Validates if Course Start Date is greater than Course End Date"""
-		if self.course_start_date > self.course_end_date:
-			frappe.throw("Course Start Date cannot be greater than Course End Date.")
-
-	def delete_course_schedule(self, rescheduled, reschedule_errors):
-		"""Delete all course schedule within the Date range and specified filters"""
-		schedules = frappe.get_list("Course Schedule", fields=["name", "schedule_date"], filters = 
-			[["student_group", "=", self.student_group],
-			["course", "=", self.course],
-			["schedule_date", ">=", self.course_start_date], 
-			["schedule_date", "<=", self.course_end_date]])
-		for d in schedules:
-			try:
-				if self.day == calendar.day_name[getdate(d.schedule_date).weekday()]:
-					frappe.delete_doc("Course Schedule", d.name)
-					rescheduled.append(d.name)
-			except:
-				reschedule_errors.append(d.name)
-		return rescheduled, reschedule_errors
-			
-	def make_course_schedule(self, date):
-		"""Makes a new Course Schedule.
-		:param date: Date on which Course Schedule will be created."""
-		
-		course_schedule = frappe.new_doc("Course Schedule")
-		course_schedule.student_group = self.student_group
-		course_schedule.course = self.course
-		course_schedule.instructor = self.instructor
-		course_schedule.instructor_name = self.instructor_name
-		course_schedule.room = self.room
-		course_schedule.schedule_date= date
-		course_schedule.from_time= self.from_time
-		course_schedule.to_time= self.to_time
-		return course_schedule
-	
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fee_category/fee_category.json b/erpnext/schools/doctype/fee_category/fee_category.json
deleted file mode 100644
index 2b55f8d..0000000
--- a/erpnext/schools/doctype/fee_category/fee_category.json
+++ /dev/null
@@ -1,171 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "field:category_name", 
- "beta": 0, 
- "creation": "2015-09-16 13:01:10.448734", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "editable_grid": 0, 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "category_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "earning_name", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "description", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Description", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "description", 
-   "oldfieldtype": "Small Text", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "300px"
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-flag", 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "menu_index": 0, 
- "modified": "2017-11-02 17:57:18.069158", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Fee Category", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "search_fields": "description", 
- "show_name_in_global_search": 1, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fee_component/fee_component.json b/erpnext/schools/doctype/fee_component/fee_component.json
deleted file mode 100644
index ccf1f65..0000000
--- a/erpnext/schools/doctype/fee_component/fee_component.json
+++ /dev/null
@@ -1,169 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 1, 
- "autoname": "", 
- "beta": 0, 
- "creation": "2015-09-16 13:07:27.675453", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "editable_grid": 1, 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "fees_category", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Fees Category", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "earning_name", 
-   "oldfieldtype": "Data", 
-   "options": "Fee Category", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "description", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Description", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "description", 
-   "oldfieldtype": "Small Text", 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "300px"
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-flag", 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-09-11 16:48:07.810959", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Fee Component", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fee_schedule/fee_schedule.js b/erpnext/schools/doctype/fee_schedule/fee_schedule.js
deleted file mode 100644
index d834b88..0000000
--- a/erpnext/schools/doctype/fee_schedule/fee_schedule.js
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Fee Schedule', {
-	setup: function(frm) {
-		frm.add_fetch("fee_structure", "receivable_account", "receivable_account");
-		frm.add_fetch("fee_structure", "income_account", "income_account");
-		frm.add_fetch("fee_structure", "cost_center", "cost_center");
-	},
-
-	onload: function(frm) {
-		frm.set_query("receivable_account", function(doc) {
-			return {
-				filters: {
-					'account_type': 'Receivable',
-					'is_group': 0,
-					'company': doc.company
-				}
-			};
-		});
-		frm.set_query("income_account", function(doc) {
-			return {
-				filters: {
-					'account_type': 'Income Account',
-					'is_group': 0,
-					'company': doc.company
-				}
-			};
-		});
-		frm.set_query("student_group", "student_groups", function() {
-			return {
-				"program": frm.doc.program,
-				"academic_year": frm.doc.academic_year
-			};
-		});
-		frappe.realtime.on("fee_schedule_progress", function(data) {
-			if (data.reload && data.reload === 1) {
-				frm.reload_doc();
-			}
-			if (data.progress && data.progress === "0") {
-				frappe.msgprint(__("Fee records will be created in the background. In case of any error the error message will be updated in the Schedule."));
-			}
-			if (data.progress) {
-				let progress_bar = $(cur_frm.dashboard.progress_area).find(".progress-bar");
-				if (progress_bar) {
-					$(progress_bar).removeClass("progress-bar-danger").addClass("progress-bar-success progress-bar-striped");
-					$(progress_bar).css("width", data.progress+"%");
-				}
-			}
-		});
-	},
-
-	refresh: function(frm) {
-		if(!frm.doc.__islocal && frm.doc.__onload && frm.doc.__onload.dashboard_info &&
-			frm.doc.fee_creation_status=="Successful") {
-			var info = frm.doc.__onload.dashboard_info;
-			frm.dashboard.add_indicator(__('Total Collected: {0}', [format_currency(info.total_paid,
-				info.currency)]), 'blue');
-			frm.dashboard.add_indicator(__('Total Outstanding: {0}', [format_currency(info.total_unpaid,
-				info.currency)]), info.total_unpaid ? 'orange' : 'green');
-		}
-		if (frm.doc.fee_creation_status=="In Process") {
-			frm.dashboard.add_progress("Fee Creation Status", "0");
-		}
-		if (frm.doc.docstatus==1 && !frm.doc.fee_creation_status || frm.doc.fee_creation_status == "Failed") {
-			frm.add_custom_button(__('Create Fees'), function() {
-				frappe.call({
-					method: "create_fees",
-					doc: frm.doc,
-					callback: function() {
-						frm.refresh();
-					}
-				});
-			}, "fa fa-play", "btn-success");
-		}
-	},
-
-	fee_structure: function(frm) {
-		if (frm.doc.fee_structure) {
-			frappe.call({
-				method: "erpnext.schools.doctype.fee_schedule.fee_schedule.get_fee_structure",
-				args: {
-					"target_doc": frm.doc.name,
-					"source_name": frm.doc.fee_structure
-				},
-				callback: function(r) {
-					var doc = frappe.model.sync(r.message);
-					frappe.set_route("Form", doc[0].doctype, doc[0].name);
-				}
-			});
-		}
-	}
-});
-
-frappe.ui.form.on("Fee Schedule Student Group", {
-	student_group: function(frm, cdt, cdn) {
-		var row = locals[cdt][cdn];
-		frappe.call({
-			method: "erpnext.schools.doctype.fee_schedule.fee_schedule.get_total_students",
-			args: {
-				"student_group": row.student_group,
-				"academic_year": frm.doc.academic_year,
-				"academic_term": frm.doc.academic_term,
-				"student_category": frm.doc.student_category
-			},
-			callback: function(r) {
-				if(!r.exc) {
-					frappe.model.set_value(cdt, cdn, "total_students", r.message);
-				}
-			}
-		});
-	}
-})
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fee_schedule/fee_schedule.json b/erpnext/schools/doctype/fee_schedule/fee_schedule.json
deleted file mode 100644
index ab60911..0000000
--- a/erpnext/schools/doctype/fee_schedule/fee_schedule.json
+++ /dev/null
@@ -1,1110 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "naming_series:", 
- "beta": 1, 
- "creation": "2017-07-18 15:21:21.527136", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "fee_structure", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Fee Structure", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Fee Structure", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "due_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": "Due Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "naming_series", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Naming Series", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "FRQ.", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "fee_creation_status", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Fee Creation Status", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "\nIn Process\nFailed\nSuccessful", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "send_email", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Send Payment Request Email", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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": 0, 
-   "in_standard_filter": 0, 
-   "label": "Program", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Program", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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": 0, 
-   "in_standard_filter": 0, 
-   "label": "Academic Year", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Academic Year", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_10", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "currency", 
-   "fieldtype": "Link", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Currency", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "student_groups", 
-   "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": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Fee Schedule Student Group", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_14", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Fee Breakup for each student", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "components", 
-   "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": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Fee Component", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_16", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_18", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "fieldname": "total_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Total Amount per Student", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "grand_total", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Grand Total", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "grand_total_in_words", 
-   "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": "In Words", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "edit_printing_settings", 
-   "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": "Printing Settings", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "letter_head", 
-   "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": "Letter Head", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Letter Head", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_32", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "select_print_heading", 
-   "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": "Print Heading", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Print Heading", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 1, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "account", 
-   "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": "Accounting", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "receivable_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Receivable Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "income_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Income Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_39", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "cost_center", 
-   "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": "Cost Center", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Cost Center", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Institution", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Fee Schedule", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "", 
-   "columns": 0, 
-   "depends_on": "error_log", 
-   "fieldname": "section_break_31", 
-   "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": "Error Log", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "error_log", 
-   "fieldtype": "Read Only", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Error Log", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-11-02 17:55:22.851581", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Fee Schedule", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
-   "write": 1
-  }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fee_schedule/fee_schedule.py b/erpnext/schools/doctype/fee_schedule/fee_schedule.py
deleted file mode 100644
index 3e1dd0c..0000000
--- a/erpnext/schools/doctype/fee_schedule/fee_schedule.py
+++ /dev/null
@@ -1,133 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe, erpnext
-from frappe.model.document import Document
-from frappe.model.mapper import get_mapped_doc
-from frappe.utils import money_in_words
-from frappe.utils import cint, flt, cstr
-from frappe.utils.background_jobs import enqueue
-from frappe import _
-
-
-class FeeSchedule(Document):
-	def onload(self):
-		info = self.get_dashboard_info()
-		self.set_onload('dashboard_info', info)
-
-	def get_dashboard_info(self):
-		info = {
-			"total_paid": 0,
-			"total_unpaid": 0,
-			"currency": erpnext.get_company_currency(self.company)
-		}
-
-		fees_amount = frappe.db.sql("""select sum(grand_total), sum(outstanding_amount) from tabFees
-			where fee_schedule=%s and docstatus=1""", (self.name))
-
-		if fees_amount:
-			info["total_paid"] = flt(fees_amount[0][0]) - flt(fees_amount[0][1])
-			info["total_unpaid"] = flt(fees_amount[0][1])
-
-		return info
-
-	def validate(self):
-		self.calculate_total()
-
-	def calculate_total(self):
-		no_of_students = 0
-		for d in self.student_groups:
-			# if not d.total_students:
-			d.total_students = get_total_students(d.student_group, self.academic_year,
-				self.academic_term, self.student_category)
-			no_of_students += cint(d.total_students)
-		self.grand_total = no_of_students*self.total_amount
-		self.grand_total_in_words = money_in_words(self.grand_total)
-
-	def create_fees(self):
-		self.db_set("fee_creation_status", "In Process")
-		frappe.publish_realtime("fee_schedule_progress",
-			{"progress": "0", "reload": 1}, user=frappe.session.user)
-		enqueue(generate_fee, queue='default', timeout=6000, event='generate_fee',
-			fee_schedule=self.name)
-
-def generate_fee(fee_schedule):
-	doc = frappe.get_doc("Fee Schedule", fee_schedule)
-	error = False
-	total_records = sum([int(d.total_students) for d in doc.student_groups])
-	created_records = 0
-
-	if not total_records:
-		frappe.throw(_("Please setup Students under Student Groups"))
-
-	for d in doc.student_groups:
-		students = frappe.db.sql(""" select sg.program, sg.batch, sgs.student, sgs.student_name
-			from `tabStudent Group` sg, `tabStudent Group Student` sgs
-			where sg.name=%s and sg.name=sgs.parent and sgs.active=1""", d.student_group, as_dict=1)
-
-		for student in students:
-			try:
-				fees_doc = get_mapped_doc("Fee Schedule", fee_schedule,	{
-					"Fee Schedule": {
-						"doctype": "Fees",
-						"field_map": {
-							"name": "Fee Schedule"
-						}
-					}
-				})
-				fees_doc.student = student.student
-				fees_doc.student_name = student.student_name
-				fees_doc.program = student.program
-				fees_doc.student_batch = student.batch
-				fees_doc.send_payment_request = doc.send_email
-				fees_doc.save()
-				fees_doc.submit()
-				created_records += 1
-				frappe.publish_realtime("fee_schedule_progress", {"progress": str(int(created_records * 100/total_records))}, user=frappe.session.user)
-
-			except Exception as e:
-				error = True
-				err_msg = frappe.local.message_log and "\n\n".join(frappe.local.message_log) or cstr(e)
-
-	if error:
-		frappe.db.rollback()
-		frappe.db.set_value("Fee Schedule", fee_schedule, "fee_creation_status", "Failed")
-		frappe.db.set_value("Fee Schedule", fee_schedule, "error_log", err_msg)
-
-	else:
-		frappe.db.set_value("Fee Schedule", fee_schedule, "fee_creation_status", "Successful")
-		frappe.db.set_value("Fee Schedule", fee_schedule, "error_log", None)
-
-	frappe.publish_realtime("fee_schedule_progress",
-		{"progress": "100", "reload": 1}, user=frappe.session.user)
-
-
-@frappe.whitelist()
-def get_fee_structure(source_name,target_doc=None):
-	fee_request = get_mapped_doc("Fee Structure", source_name,
-		{"Fee Structure": {
-			"doctype": "Fee Schedule"
-		}}, ignore_permissions=True)
-	return fee_request
-
-@frappe.whitelist()
-def get_total_students(student_group, academic_year, academic_term=None, student_category=None):
-	conditions = ""
-	if student_category:
-		conditions = " and pe.student_category='{}'".format(frappe.db.escape(student_category))
-	if academic_term:
-		conditions = " and pe.academic_term='{}'".format(frappe.db.escape(academic_term))
-
-
-	return frappe.db.sql("""
-		select count(pe.name)
-		from `tabStudent Group Student` sgs, `tabProgram Enrollment` pe
-		where 
-			pe.student = sgs.student
-			and pe.academic_year = %s
-			and sgs.parent = %s
-			and sgs.active = 1
-			{conditions}
-	""".format(conditions=conditions), (academic_year, student_group))[0][0]
diff --git a/erpnext/schools/doctype/fee_schedule_program/fee_schedule_program.json b/erpnext/schools/doctype/fee_schedule_program/fee_schedule_program.json
deleted file mode 100644
index 42cc7bf..0000000
--- a/erpnext/schools/doctype/fee_schedule_program/fee_schedule_program.json
+++ /dev/null
@@ -1,133 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2017-03-23 17:46:55.712169", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "program", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Program", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Program", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "student_batch", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Student 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": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "total_students", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Total Students", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-08-22 16:24:40.547517", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Fee Schedule Program", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fee_schedule_student_group/fee_schedule_student_group.json b/erpnext/schools/doctype/fee_schedule_student_group/fee_schedule_student_group.json
deleted file mode 100644
index c80e320..0000000
--- a/erpnext/schools/doctype/fee_schedule_student_group/fee_schedule_student_group.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2017-03-23 17:55:52.476822", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "student_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Student Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student Group", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "total_students", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Total Students", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-08-22 16:23:12.337294", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Fee Schedule Student Group", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fee_structure/fee_structure.js b/erpnext/schools/doctype/fee_structure/fee_structure.js
deleted file mode 100644
index 300bdc8..0000000
--- a/erpnext/schools/doctype/fee_structure/fee_structure.js
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Fee Structure', {
-	setup: function(frm) {
-		frm.add_fetch("company", "default_receivable_account", "receivable_account");
-		frm.add_fetch("company", "default_income_account", "income_account");
-		frm.add_fetch("company", "cost_center", "cost_center");
-	},
-
-	onload: function(frm) {
-		frm.set_query("receivable_account", function(doc) {
-			return {
-				filters: {
-					'account_type': 'Receivable',
-					'is_group': 0,
-					'company': doc.company
-				}
-			};
-		});
-		frm.set_query("income_account", function(doc) {
-			return {
-				filters: {
-					'account_type': 'Income Account',
-					'is_group': 0,
-					'company': doc.company
-				}
-			};
-		});
-	},
-
-	refresh: function(frm) {
-		if(frm.doc.docstatus === 1) {
-			frm.add_custom_button(__("Make Fee Schedule"), function() {
-				frm.events.make_fee_schedule(frm);
-			});
-		}
-	},
-
-	make_fee_schedule: function(frm) {
-		frappe.model.open_mapped_doc({
-			method: "erpnext.schools.doctype.fee_structure.fee_structure.make_fee_schedule",
-			frm: frm
-		});
-	}
-});
-
-frappe.ui.form.on("Fee Component", {
-	amount: function(frm) {
-		var total_amount = 0;
-		for(var i=0;i<frm.doc.components.length;i++) {
-			total_amount += frm.doc.components[i].amount;
-		}
-		frm.set_value("total_amount", total_amount);
-	}
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fee_structure/fee_structure.json b/erpnext/schools/doctype/fee_structure/fee_structure.json
deleted file mode 100644
index 2ae0a48..0000000
--- a/erpnext/schools/doctype/fee_structure/fee_structure.json
+++ /dev/null
@@ -1,659 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "naming_series:", 
- "beta": 0, 
- "creation": "2015-09-16 13:03:20.430704", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "naming_series", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Naming Series", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "FS.", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 1, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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": 1, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Program", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "earning_name", 
-   "oldfieldtype": "Data", 
-   "options": "Program", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "academic_term", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Academic Term", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "description", 
-   "oldfieldtype": "Small Text", 
-   "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": 1, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "300px"
-  }, 
-  {
-   "allow_bulk_edit": 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": 0, 
-   "in_standard_filter": 0, 
-   "label": "Academic Year", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Academic Year", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_4", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "components", 
-   "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": "Components", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Fee Component", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_6", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_11", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "total_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Total Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "accounts", 
-   "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": "Accounts", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "fieldname": "receivable_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Receivable Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "income_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Income Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_16", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "cost_center", 
-   "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": "Cost Center", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Cost Center", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Fee Structure", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-flag", 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "menu_index": 0, 
- "modified": "2017-11-02 17:43:16.796845", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Fee Structure", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
-   "write": 1
-  }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "search_fields": "program, student_category, academic_year", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "program", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fees/fees.js b/erpnext/schools/doctype/fees/fees.js
deleted file mode 100644
index 4347308..0000000
--- a/erpnext/schools/doctype/fees/fees.js
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-
-frappe.ui.form.on("Fees", {
-	setup: function(frm) {
-		frm.add_fetch("fee_structure", "receivable_account", "receivable_account");
-		frm.add_fetch("fee_structure", "income_account", "income_account");
-		frm.add_fetch("fee_structure", "cost_center", "cost_center");
-	},
-
-	onload: function(frm){
-		frm.set_query("academic_term",function(){
-			return{
-				"filters":{
-					"academic_year": (frm.doc.academic_year)
-				}
-			};
-		});
-		frm.set_query("fee_structure",function(){
-			return{
-				"filters":{
-					"academic_year": (frm.doc.academic_year)
-				}
-			};
-		});
-		frm.set_query("receivable_account", function(doc) {
-			return {
-				filters: {
-					'account_type': 'Receivable',
-					'is_group': 0,
-					'company': doc.company
-				}
-			};
-		});
-		frm.set_query("income_account", function(doc) {
-			return {
-				filters: {
-					'account_type': 'Income Account',
-					'is_group': 0,
-					'company': doc.company
-				}
-			};
-		});
-		if (!frm.doc.posting_date) {
-			frm.doc.posting_date = frappe.datetime.get_today();
-		}
-	},
-
-	refresh: function(frm) {
-		if(frm.doc.docstatus == 0 && frm.doc.set_posting_time) {
-			frm.set_df_property('posting_date', 'read_only', 0);
-			frm.set_df_property('posting_time', 'read_only', 0);
-		} else {
-			frm.set_df_property('posting_date', 'read_only', 1);
-			frm.set_df_property('posting_time', 'read_only', 1);
-		}
-		if(frm.doc.docstatus===1) {
-			frm.add_custom_button(__('Accounting Ledger'), function() {
-				frappe.route_options = {
-					voucher_no: frm.doc.name,
-					from_date: frm.doc.posting_date,
-					to_date: frm.doc.posting_date,
-					company: frm.doc.company,
-					group_by_voucher: false
-				};
-				frappe.set_route("query-report", "General Ledger");
-			}, __("View"));
-		}
-		if(frm.doc.docstatus===1 && frm.doc.outstanding_amount>0) {
-			frm.add_custom_button(__("Payment Request"), function() {
-				frm.events.make_payment_request(frm);
-			}, __("Make"));
-			frm.page.set_inner_btn_group_as_primary(__("Make"));
-		}
-		if(frm.doc.docstatus===1 && frm.doc.outstanding_amount!=0) {
-			frm.add_custom_button(__("Payment"), function() {
-				frm.events.make_payment_entry(frm);
-			}, __("Make"));
-			frm.page.set_inner_btn_group_as_primary(__("Make"));
-		}
-	},
-
-	student: function(frm) {
-		if (frm.doc.student) {
-			frappe.call({
-				method:"erpnext.schools.api.get_current_enrollment",
-				args: {
-					"student": frm.doc.student,
-					"academic_year": frm.doc.academic_year
-				},
-				callback: function(r) {
-					if(r){
-						$.each(r.message, function(i, d) {
-							frm.set_value(i,d);
-						});
-					}
-				}
-			});
-		}
-	},
-
-	make_payment_request: function(frm) {
-		if (!frm.doc.student_email) {
-			frappe.msgprint(__("Please set the Email ID for the Student to send the Payment Request"));
-		} else {
-			frappe.call({
-				method:"erpnext.accounts.doctype.payment_request.payment_request.make_payment_request",
-				args: {
-					"dt": frm.doc.doctype,
-					"dn": frm.doc.name,
-					"recipient_id": frm.doc.student_email
-				},
-				callback: function(r) {
-					if(!r.exc){
-						var doc = frappe.model.sync(r.message);
-						frappe.set_route("Form", doc[0].doctype, doc[0].name);
-					}
-				}
-			});
-		}
-	},
-
-	make_payment_entry: function(frm) {
-		return frappe.call({
-			method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_payment_entry",
-			args: {
-				"dt": frm.doc.doctype,
-				"dn": frm.doc.name
-			},
-			callback: function(r) {
-				var doc = frappe.model.sync(r.message);
-				frappe.set_route("Form", doc[0].doctype, doc[0].name);
-			}
-		});
-	},
-
-	set_posting_time: function(frm) {
-		frm.refresh();
-	},
-
-	academic_term: function() {
-		frappe.ui.form.trigger("Fees", "program");
-	},
-
-	fee_structure: function(frm) {
-		frm.set_value("components" ,"");
-		if (frm.doc.fee_structure) {
-			frappe.call({
-				method: "erpnext.schools.api.get_fee_components",
-				args: {
-					"fee_structure": frm.doc.fee_structure
-				},
-				callback: function(r) {
-					if (r.message) {
-						$.each(r.message, function(i, d) {
-							var row = frappe.model.add_child(frm.doc, "Fee Component", "components");
-							row.fees_category = d.fees_category;
-							row.amount = d.amount;
-						});
-					}
-					refresh_field("components");
-					frm.trigger("calculate_total_amount");
-				}
-			});
-		}
-	},
-
-	calculate_total_amount: function(frm) {
-		var grand_total = 0;
-		for(var i=0;i<frm.doc.components.length;i++) {
-			grand_total += frm.doc.components[i].amount;
-		}
-		frm.set_value("grand_total", grand_total);
-	}
-});
-
-
-frappe.ui.form.on("Fee Component", {
-	amount: function(frm) {
-		frm.trigger("calculate_total_amount");
-	}
-});
diff --git a/erpnext/schools/doctype/fees/fees.json b/erpnext/schools/doctype/fees/fees.json
deleted file mode 100644
index f34caf7..0000000
--- a/erpnext/schools/doctype/fees/fees.json
+++ /dev/null
@@ -1,1387 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "naming_series:", 
- "beta": 1, 
- "creation": "2015-09-22 16:57:22.143710", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "naming_series", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Naming Series", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "FEE.", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 1, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "student_name", 
-   "fieldtype": "Data", 
-   "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": "student.title", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "fee_schedule", 
-   "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": "Fee Schedule", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Fee Schedule", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "fieldname": "include_payment", 
-   "fieldtype": "Check", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Include Payment", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "fieldname": "send_payment_request", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Send Payment Request", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Institution", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 1, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Today", 
-   "fieldname": "posting_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Date", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "posting_time", 
-   "fieldtype": "Time", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Posting Time", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.docstatus==0", 
-   "fieldname": "set_posting_time", 
-   "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": "Edit Posting Date and Time", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "due_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": "Due Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "student_details", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Student Details", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "program_enrollment", 
-   "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": "Program Enrollment", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Program Enrollment", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "student_batch", 
-   "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 Batch", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student Batch Name", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "student_email", 
-   "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": "Student Email", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Email", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_16", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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": 0, 
-   "in_standard_filter": 0, 
-   "label": "Academic Year", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Academic Year", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_7", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "currency", 
-   "fieldtype": "Link", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Currency", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "fee_structure", 
-   "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": "Fee Structure", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Fee Structure", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "components", 
-   "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": "Components", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Fee Component", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_10", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Fees", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_11", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "fieldname": "grand_total", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Grand Total", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "grand_total_in_words", 
-   "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": "In Words", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "fieldname": "paid_amount", 
-   "fieldtype": "Currency", 
-   "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": "Paid Amount", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "fieldname": "outstanding_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Outstanding Amount", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "edit_printing_settings", 
-   "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": "Printing Settings", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "letter_head", 
-   "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": "Letter Head", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Letter Head", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_32", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "select_print_heading", 
-   "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": "Print Heading", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Print Heading", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 1, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "account", 
-   "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": "Accounting", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "receivable_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Receivable Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "income_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Income Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_39", 
-   "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": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "cost_center", 
-   "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": "Cost Center", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Cost Center", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "data_42", 
-   "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, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "menu_index": 0, 
- "modified": "2017-11-02 17:31:47.155873", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Fees", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
-   "write": 1
-  }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "search_fields": "student, student_name", 
- "show_name_in_global_search": 1, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "student_name", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/grading_scale/grading_scale.json b/erpnext/schools/doctype/grading_scale/grading_scale.json
deleted file mode 100644
index fdaa8c6..0000000
--- a/erpnext/schools/doctype/grading_scale/grading_scale.json
+++ /dev/null
@@ -1,216 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 1, 
- "autoname": "field:grading_scale_name", 
- "beta": 0, 
- "creation": "2016-08-26 03:06:53.922972", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "grading_scale_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Grading Scale Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "description", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Description", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "grading_intervals_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Grading Scale Intervals", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "intervals", 
-   "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": "Intervals", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Grading Scale Interval", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Grading Scale", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-06-30 08:21:48.413400", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Grading Scale", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
-   "write": 1
-  }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/grading_scale/test_grading_scale.js b/erpnext/schools/doctype/grading_scale/test_grading_scale.js
deleted file mode 100644
index c686924..0000000
--- a/erpnext/schools/doctype/grading_scale/test_grading_scale.js
+++ /dev/null
@@ -1,102 +0,0 @@
-// School Assessment module
-QUnit.module('schools');
-
-QUnit.test('Test: Grading Scale', function(assert){
-	assert.expect(3);
-	let done = assert.async();
-	frappe.run_serially([
-		() => {
-			return frappe.tests.make('Grading Scale', [
-				{grading_scale_name: 'GTU'},
-				{description: 'The score will be set according to 100 based system.'},
-				{intervals: [
-					[
-						{grade_code: 'AA'},
-						{threshold: '95'},
-						{grade_description: 'First Class + Distinction'}
-					],
-					[
-						{grade_code: 'AB'},
-						{threshold: '90'},
-						{grade_description: 'First Class'}
-					],
-					[
-						{grade_code: 'BB'},
-						{threshold: '80'},
-						{grade_description: 'Distinction'}
-					],
-					[
-						{grade_code: 'BC'},
-						{threshold: '70'},
-						{grade_description: 'Second Class'}
-					],
-					[
-						{grade_code: 'CC'},
-						{threshold: '60'},
-						{grade_description: 'Third Class'}
-					],
-					[
-						{grade_code: 'CD'},
-						{threshold: '50'},
-						{grade_description: 'Average'}
-					],
-					[
-						{grade_code: 'DD'},
-						{threshold: '40'},
-						{grade_description: 'Pass'}
-					],
-					[
-						{grade_code: 'FF'},
-						{threshold: '0'},
-						{grade_description: 'Fail'}
-					],
-				]}
-			]);
-		},
-		() => {
-			return frappe.tests.make('Grading Scale', [
-				{grading_scale_name: 'GTU-2'},
-				{description: 'The score will be set according to 100 based system.'},
-				{intervals: [
-					[
-						{grade_code: 'AA'},
-						{threshold: '90'},
-						{grade_description: 'Distinction'}
-					],
-					[
-						{grade_code: 'FF'},
-						{threshold: '0'},
-						{grade_description: 'Fail'}
-					]
-				]}
-			]);
-		},
-
-		() => {
-			let grading_scale = ['GTU', 'GTU-2'];
-			let tasks = [];
-			grading_scale.forEach(index => {
-				tasks.push(
-					() => frappe.set_route('Form', 'Grading Scale', index),
-					() => frappe.timeout(0.5),
-					() => frappe.tests.click_button('Submit'),
-					() => frappe.timeout(0.5),
-					() => frappe.tests.click_button('Yes'),
-					() => {assert.equal(cur_frm.doc.docstatus, 1, 'Submitted successfully');}
-				);
-			});
-			return frappe.run_serially(tasks);
-		},
-
-		() => frappe.timeout(1),
-		() => frappe.set_route('Form', 'Grading Scale','GTU-2'),
-		() => frappe.timeout(0.5),
-		() => frappe.tests.click_button('Cancel'),
-		() => frappe.timeout(0.5),
-		() => frappe.tests.click_button('Yes'),
-		() => frappe.timeout(0.5),
-		() => {assert.equal(cur_frm.doc.docstatus, 2, 'Cancelled successfully');},
-
-		() => done()
-	]);
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/grading_scale_interval/grading_scale_interval.json b/erpnext/schools/doctype/grading_scale_interval/grading_scale_interval.json
deleted file mode 100644
index cee83e3..0000000
--- a/erpnext/schools/doctype/grading_scale_interval/grading_scale_interval.json
+++ /dev/null
@@ -1,133 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2016-08-26 03:11:09.591049", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "grade_code", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Grade Code", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "fieldname": "threshold", 
-   "fieldtype": "Percent", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Threshold", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "1", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "grade_description", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Grade Description", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-06-30 08:21:48.532524", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Grading Scale Interval", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/guardian/guardian.json b/erpnext/schools/doctype/guardian/guardian.json
deleted file mode 100644
index bc4cf4f..0000000
--- a/erpnext/schools/doctype/guardian/guardian.json
+++ /dev/null
@@ -1,517 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "GARD.####", 
- "beta": 0, 
- "creation": "2016-07-21 15:32:51.163292", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "guardian_name", 
-   "fieldtype": "Data", 
-   "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": "Guardian Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "email_address", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Email Address", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "mobile_number", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Mobile 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "alternate_number", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Alternate 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "date_of_birth", 
-   "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": "Date of Birth", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "education", 
-   "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": "Education", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "occupation", 
-   "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": "Occupation", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "designation", 
-   "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": "Designation", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "work_address", 
-   "fieldtype": "Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Work Address", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_13", 
-   "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": "Guardian Of ", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "students", 
-   "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": "Students", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Guardian Student", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_8", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Guardian Interests", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "interests", 
-   "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": "Interests", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Guardian Interest", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_field": "image", 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-06-30 08:21:48.630678", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Guardian", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 1, 
- "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": "guardian_name", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/guardian/test_guardian.js b/erpnext/schools/doctype/guardian/test_guardian.js
deleted file mode 100644
index a16ba08..0000000
--- a/erpnext/schools/doctype/guardian/test_guardian.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Testing Student Module in Schools
-QUnit.module('schools');
-
-QUnit.test('Test: Guardian', function(assert){
-	assert.expect(9);
-	let done = assert.async();
-	frappe.run_serially([
-		() => {
-			return frappe.tests.make('Guardian', [
-				{guardian_name: 'Test Guardian'},
-				{email_address: 'guardian@testmail.com'},
-				{mobile_number: 9898980000},
-				{alternate_number: 8989890000},
-				{date_of_birth: '1982-07-22'},
-				{education: 'Testing'},
-				{occupation: 'Testing'},
-				{designation: 'Testing'},
-				{work_address: 'Testing address'}
-			]);
-		},
-		() => {
-			assert.ok(cur_frm.doc.guardian_name == 'Test Guardian');
-			assert.ok(cur_frm.doc.email_address == 'guardian@testmail.com');
-			assert.ok(cur_frm.doc.mobile_number == 9898980000);
-			assert.ok(cur_frm.doc.alternate_number == 8989890000);
-			assert.ok(cur_frm.doc.date_of_birth == '1982-07-22');
-			assert.ok(cur_frm.doc.education == 'Testing');
-			assert.ok(cur_frm.doc.occupation == 'Testing');
-			assert.ok(cur_frm.doc.designation == 'Testing');
-			assert.ok(cur_frm.doc.work_address == 'Testing address');
-		},
-		() => done()
-	]);
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/guardian_interest/guardian_interest.json b/erpnext/schools/doctype/guardian_interest/guardian_interest.json
deleted file mode 100644
index aae2c55..0000000
--- a/erpnext/schools/doctype/guardian_interest/guardian_interest.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2016-07-25 07:19:55.113871", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "interest", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Interest", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Interest", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-06-30 08:21:48.827806", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Guardian Interest", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/guardian_student/guardian_student.json b/erpnext/schools/doctype/guardian_student/guardian_student.json
deleted file mode 100644
index 4242c9d..0000000
--- a/erpnext/schools/doctype/guardian_student/guardian_student.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2017-01-31 11:53:21.580099", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 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": 0, 
-   "in_list_view": 1, 
-   "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": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "student_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Student Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-06-30 08:21:48.957516", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Guardian Student", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/instructor/instructor.json b/erpnext/schools/doctype/instructor/instructor.json
deleted file mode 100644
index cd0b4f1..0000000
--- a/erpnext/schools/doctype/instructor/instructor.json
+++ /dev/null
@@ -1,249 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "naming_series:", 
- "beta": 0, 
- "creation": "2015-11-04 15:56:30.004034", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Other", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "instructor_name", 
-   "fieldtype": "Data", 
-   "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": "Instructor Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "employee", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Employee", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Employee", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_5", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "naming_series", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Naming Series", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "INS/", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 1, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "department", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Department", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Department", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_field": "image", 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "menu_index": 0, 
- "modified": "2017-08-25 01:03:14.602994", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Instructor", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "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": "instructor_name", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/instructor/instructor.py b/erpnext/schools/doctype/instructor/instructor.py
deleted file mode 100644
index ba179f7..0000000
--- a/erpnext/schools/doctype/instructor/instructor.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-from frappe.model.document import Document
-from frappe.model.naming import make_autoname
-
-class Instructor(Document):
-	def autoname(self):
-		naming_method = frappe.db.get_value("School Settings", None, "instructor_created_by")
-		if not naming_method:
-			frappe.throw(_("Please setup Instructor Naming System in School > School Settings"))
-		else:
-			if naming_method == 'Naming Series':
-				self.name = make_autoname(self.naming_series + '.####')
-			elif naming_method == 'Employee Number':
-				if not self.employee:
-					frappe.throw("Please select Employee")
-				self.name = self.employee
-			elif naming_method == 'Full Name':
-				self.name = self.instructor_name
diff --git a/erpnext/schools/doctype/instructor/test_instructor.js b/erpnext/schools/doctype/instructor/test_instructor.js
deleted file mode 100644
index a9e2561..0000000
--- a/erpnext/schools/doctype/instructor/test_instructor.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Testing Setup Module in Schools
-QUnit.module('schools');
-
-QUnit.test('Test: Instructor', function(assert){
-	assert.expect(2);
-	let done = assert.async();
-	frappe.run_serially([
-		() => {
-			return frappe.tests.make("Instructor", [
-				{instructor_name: 'Instructor 1'},
-				{department: 'Test Department'}
-			]);
-		},
-		() => {
-			assert.ok(cur_frm.doc.instructor_name == 'Instructor 1');
-			assert.ok(cur_frm.doc.department = 'Test Department');
-		},
-		() => done()
-	]);
-});
diff --git a/erpnext/schools/doctype/program/program.json b/erpnext/schools/doctype/program/program.json
deleted file mode 100644
index 46581a1..0000000
--- a/erpnext/schools/doctype/program/program.json
+++ /dev/null
@@ -1,277 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "field:program_code", 
- "beta": 0, 
- "creation": "2015-09-07 12:54:03.609282", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "program_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Program Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "department", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Department", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Department", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "program_code", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Program Code", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "program_abbreviation", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Program Abbreviation", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_5", 
-   "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": "Course", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "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 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, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "menu_index": 0, 
- "modified": "2017-11-02 18:08:20.823972", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Program", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "search_fields": "program_name", 
- "show_name_in_global_search": 1, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program/test_program.js b/erpnext/schools/doctype/program/test_program.js
deleted file mode 100644
index a14fe97..0000000
--- a/erpnext/schools/doctype/program/test_program.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Testing Setup Module in Schools
-QUnit.module('schools');
-
-QUnit.test('Test: Program', function(assert){
-	assert.expect(6);
-	let done = assert.async();
-	let fee_structure_code;
-	frappe.run_serially([
-		() => {
-			return frappe.tests.make('Program', [
-				{program_name: 'Standard Test'},
-				{program_code: 'Standard Test'},
-				{department: 'Test Department'},
-				{program_abbreviation: 'Standard Test'},
-				{courses: [
-					[
-						{course: 'Test_Sub'},
-						{required: true}
-					]
-				]}
-			]);
-		},
-
-		() => {
-			assert.ok(cur_frm.doc.program_name == 'Standard Test');
-			assert.ok(cur_frm.doc.program_code == 'Standard Test');
-			assert.ok(cur_frm.doc.department == 'Test Department');
-			assert.ok(cur_frm.doc.program_abbreviation == 'Standard Test');
-			assert.ok(cur_frm.doc.courses[0].course == 'Test_Sub');
-			assert.ok(cur_frm.doc.courses[0].required == true);
-		},
-		() => done()
-	]);
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program_course/program_course.json b/erpnext/schools/doctype/program_course/program_course.json
deleted file mode 100644
index 4922a95..0000000
--- a/erpnext/schools/doctype/program_course/program_course.json
+++ /dev/null
@@ -1,164 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2015-09-07 14:37:01.886859", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "course", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Course", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Course", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "course_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Course Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "course.course_name", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "required", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Mandatory", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "menu_index": 0, 
- "modified": "2017-06-30 08:21:49.313349", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Program Course", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program_enrollment/program_enrollment.js b/erpnext/schools/doctype/program_enrollment/program_enrollment.js
deleted file mode 100644
index 8418e85..0000000
--- a/erpnext/schools/doctype/program_enrollment/program_enrollment.js
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (c) 2016, Frappe and contributors
-// For license information, please see license.txt
-
-cur_frm.add_fetch('fee_structure', 'total_amount', 'amount');
-
-frappe.ui.form.on("Program Enrollment", {
-	onload: function(frm, cdt, cdn){
-		frm.set_query("academic_term", "fees", function(){
-			return{
-				"filters":{
-					"academic_year": (frm.doc.academic_year)
-				}
-			};
-		});
-
-		frm.fields_dict['fees'].grid.get_field('fee_structure').get_query = function(doc, cdt, cdn) {
-			var d = locals[cdt][cdn];
-			return {
-				filters: {'academic_term': d.academic_term}
-			}
-		};
-
-		if (frm.doc.program) {
-			frm.set_query("course", "courses", function(doc, cdt, cdn) {
-				return{
-					query: "erpnext.schools.doctype.program_enrollment.program_enrollment.get_program_courses",
-					filters: {
-						'program': frm.doc.program
-					}
-				}
-			});
-		}
-
-		frm.set_query("student", function() {
-			return{
-				query: "erpnext.schools.doctype.program_enrollment.program_enrollment.get_students",
-				filters: {
-					'academic_year': frm.doc.academic_year,
-					'academic_term': frm.doc.academic_term
-				}
-			}
-		});
-	},
-
-	program: function(frm) {
-		frm.events.get_courses(frm);
-		if (frm.doc.program) {
-			frappe.call({
-				method: "erpnext.schools.api.get_fee_schedule",
-				args: {
-					"program": frm.doc.program,
-					"student_category": frm.doc.student_category
-				},
-				callback: function(r) {
-					if(r.message) {
-						frm.set_value("fees" ,r.message);
-						frm.events.get_courses(frm);
-					}
-				}
-			});
-		}
-	},
-
-	student_category: function() {
-		frappe.ui.form.trigger("Program Enrollment", "program");
-	},
-
-	get_courses: function(frm) {
-		frm.set_value("courses",[]);
-		frappe.call({
-			method: "get_courses",
-			doc:frm.doc,
-			callback: function(r) {
-				if(r.message) {
-					frm.set_value("courses", r.message);
-				}
-			}
-		})
-	}
-});
diff --git a/erpnext/schools/doctype/program_enrollment/program_enrollment.json b/erpnext/schools/doctype/program_enrollment/program_enrollment.json
deleted file mode 100644
index f8a3b9e..0000000
--- a/erpnext/schools/doctype/program_enrollment/program_enrollment.json
+++ /dev/null
@@ -1,712 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "PE.#####", 
- "beta": 0, 
- "creation": "2015-12-02 12:58:32.916080", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "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": "student.title", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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\nSchool 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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, 
-   "unique": 0, 
-   "width": ""
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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, 
-   "unique": 0
-  }
- ], 
- "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": "2017-07-10 18:16:15.810616", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Program Enrollment", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "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
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program_enrollment/program_enrollment.py b/erpnext/schools/doctype/program_enrollment/program_enrollment.py
deleted file mode 100644
index 4e67908..0000000
--- a/erpnext/schools/doctype/program_enrollment/program_enrollment.py
+++ /dev/null
@@ -1,110 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-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
-
-class ProgramEnrollment(Document):
-	def validate(self):
-		self.validate_duplication()
-		if not self.student_name:
-			self.student_name = frappe.db.get_value("Student", self.student, "title")
-	
-	def on_submit(self):
-		self.update_student_joining_date()
-		self.make_fee_records()
-	
-	def validate_duplication(self):
-		enrollment = frappe.db.sql("""select name from `tabProgram Enrollment` where student= %s and program= %s 
-			and academic_year= %s and docstatus<2 and name != %s""", (self.student, self.program, self.academic_year, self.name))
-		if enrollment:
-			frappe.throw(_("Student is already enrolled."))
-	
-	def update_student_joining_date(self):
-		date = frappe.db.sql("select min(enrollment_date) from `tabProgram Enrollment` where student= %s", self.student)
-		frappe.db.set_value("Student", self.student, "joining_date", date)
-		
-	def make_fee_records(self):
-		from erpnext.schools.api import get_fee_components
-		fee_list = []
-		for d in self.fees:
-			fee_components = get_fee_components(d.fee_structure)
-			if fee_components:
-				fees = frappe.new_doc("Fees")
-				fees.update({
-					"student": self.student,
-					"academic_year": self.academic_year,
-					"academic_term": d.academic_term,
-					"fee_structure": d.fee_structure,
-					"program": self.program,
-					"due_date": d.due_date,
-					"student_name": self.student_name,
-					"program_enrollment": self.name,
-					"components": fee_components
-				})
-				
-				fees.save()
-				fees.submit()
-				fee_list.append(fees.name)
-		if fee_list:
-			fee_list = ["""<a href="#Form/Fees/%s" target="_blank">%s</a>""" % \
-				(fee, fee) for fee in fee_list]
-			msgprint(_("Fee Records Created - {0}").format(comma_and(fee_list)))
-
-	def get_courses(self):
-		return frappe.db.sql('''select course, course_name from `tabProgram Course` where parent = %s and required = 1''', (self.program), as_dict=1)
-
-
-@frappe.whitelist()
-def get_program_courses(doctype, txt, searchfield, start, page_len, filters):
-	if filters.get('program'):
-		return frappe.db.sql("""select course, course_name from `tabProgram Course`
-			where  parent = %(program)s and course like %(txt)s {match_cond}
-			order by
-				if(locate(%(_txt)s, course), locate(%(_txt)s, course), 99999),
-				idx desc,
-				`tabProgram Course`.course asc
-			limit {start}, {page_len}""".format(
-				match_cond=get_match_cond(doctype),
-				start=start,
-				page_len=page_len), {
-					"txt": "%{0}%".format(txt),
-					"_txt": txt.replace('%', ''),
-					"program": filters['program']
-				})
-
-
-@frappe.whitelist()
-def get_students(doctype, txt, searchfield, start, page_len, filters):
-	if not filters.get("academic_term"):
-		filters["academic_term"] = frappe.defaults.get_defaults().academic_term
-
-	if not filters.get("academic_year"):
-		filters["academic_year"] = frappe.defaults.get_defaults().academic_year
-
-	enrolled_students = frappe.get_list("Program Enrollment", filters={
-		"academic_term": filters.get('academic_term'),
-		"academic_year": filters.get('academic_year')
-	}, fields=["student"])
-
-	students = [d.student for d in enrolled_students] if enrolled_students else [""]
-
-	return frappe.db.sql("""select
-			name, title from tabStudent
-		where 
-			name not in (%s)
-		and 
-			`%s` LIKE %s
-		order by 
-			idx desc, name
-		limit %s, %s"""%(
-			", ".join(['%s']*len(students)), searchfield, "%s", "%s", "%s"),
-			tuple(students + ["%%%s%%" % txt, start, page_len]
-		)
-	)
-
diff --git a/erpnext/schools/doctype/program_enrollment_course/program_enrollment_course.json b/erpnext/schools/doctype/program_enrollment_course/program_enrollment_course.json
deleted file mode 100644
index a5a26ab..0000000
--- a/erpnext/schools/doctype/program_enrollment_course/program_enrollment_course.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2017-04-10 19:28:19.616308", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "course", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Course", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Course", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "course_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Course Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "course.course_name", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-06-30 08:21:49.637920", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Program Enrollment Course", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program_enrollment_fee/program_enrollment_fee.json b/erpnext/schools/doctype/program_enrollment_fee/program_enrollment_fee.json
deleted file mode 100644
index 8d2202a..0000000
--- a/erpnext/schools/doctype/program_enrollment_fee/program_enrollment_fee.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2016-05-19 05:52:56.322125", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "academic_term", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Academic Term", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Academic Term", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "fee_structure", 
-   "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": "Fee Structure", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Fee Structure", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "due_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Due Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-06-30 08:21:49.718726", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Program Enrollment Fee", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.json b/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.json
deleted file mode 100644
index 8f32df7..0000000
--- a/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.json
+++ /dev/null
@@ -1,368 +0,0 @@
-{
- "allow_copy": 1, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2016-06-10 03:01:05.178956", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 0, 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "get_students_from", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Get Students From", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nStudent Applicants\nProgram Enrollments", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "program", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Program", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Program", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "academic_year", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Academic Year", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Academic Year", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "get_students", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Get Students", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_5", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "students", 
-   "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": "Students", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Program Enrollment Tool 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": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_7", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.get_students_from==\"Program Enrollments\"", 
-   "fieldname": "new_program", 
-   "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": "New Program", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Program", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.get_students_from==\"Program Enrollments\"", 
-   "fieldname": "new_academic_year", 
-   "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": "New Academic Year", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Academic Year", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "enroll_students", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Enroll Students", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 1, 
- "hide_toolbar": 1, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-06-30 08:21:49.826296", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Program Enrollment Tool", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py b/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py
deleted file mode 100644
index d80f2f5..0000000
--- a/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-from frappe.model.document import Document
-from erpnext.schools.api import enroll_student
-
-class ProgramEnrollmentTool(Document):
-	def get_students(self):
-		if not self.get_students_from:
-			frappe.throw(_("Mandatory field - Get Students From"))
-		elif not self.program:
-			frappe.throw(_("Mandatory field - Program"))
-		elif not self.academic_year:
-			frappe.throw(_("Mandatory field - Academic Year"))
-		else:
-			if self.get_students_from == "Student Applicants":
-				students = frappe.db.sql("select name as student_applicant, title as student_name from \
-					`tabStudent Applicant` where program = %s and academic_year = %s",(self.program, self.academic_year), as_dict=1)
-			else:
-				students = frappe.db.sql("select student, student_name, student_batch_name from \
-					`tabProgram Enrollment` where program = %s and academic_year = %s",(self.program, self.academic_year), as_dict=1)
-				student_list = [d.student for d in students]
-
-				inactive_students = frappe.db.sql('''
-					select name as student, title as student_name from `tabStudent` where name in (%s) and enabled = 0''' %
-					', '.join(['%s']*len(student_list)), tuple(student_list), as_dict=1)
-
-				for student in students:
-					if student.student in [d.student for d in inactive_students]:
-						students.remove(student)
-
-		if students:
-			return students
-		else:
-			frappe.throw(_("No students Found"))
-			
-	def enroll_students(self):
-		for stud in self.students:
-			if stud.student:
-				prog_enrollment = frappe.new_doc("Program Enrollment")
-				prog_enrollment.student = stud.student
-				prog_enrollment.student_name = stud.student_name
-				prog_enrollment.student_batch_name = stud.student_batch_name
-				prog_enrollment.program = self.new_program
-				prog_enrollment.academic_year = self.new_academic_year
-				prog_enrollment.save()
-			elif stud.student_applicant:
-				prog_enrollment = enroll_student(stud.student_applicant)
-				prog_enrollment.academic_year = self.academic_year
-				prog_enrollment.save()
-		frappe.msgprint("Students have been enrolled.")
-			
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program_enrollment_tool_student/program_enrollment_tool_student.json b/erpnext/schools/doctype/program_enrollment_tool_student/program_enrollment_tool_student.json
deleted file mode 100644
index 50c9ac7..0000000
--- a/erpnext/schools/doctype/program_enrollment_tool_student/program_enrollment_tool_student.json
+++ /dev/null
@@ -1,164 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2016-06-10 03:29:02.539914", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "student_applicant", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Student Applicant", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student Applicant", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "student", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Student", 
-   "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": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "student_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Student Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-06-30 08:21:49.928790", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Program Enrollment Tool Student", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program_fee/program_fee.json b/erpnext/schools/doctype/program_fee/program_fee.json
deleted file mode 100644
index 673959a..0000000
--- a/erpnext/schools/doctype/program_fee/program_fee.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2016-05-19 05:52:56.322125", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "academic_term", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Academic Term", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Academic Term", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "fee_structure", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Fee Structure", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Fee Structure", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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": 1, 
-   "in_list_view": 1, 
-   "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "due_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Due Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-06-30 08:21:50.034899", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Program Fee", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/room/room.json b/erpnext/schools/doctype/room/room.json
deleted file mode 100644
index 8e672cc..0000000
--- a/erpnext/schools/doctype/room/room.json
+++ /dev/null
@@ -1,155 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "RM.####", 
- "beta": 0, 
- "creation": "2015-09-09 16:20:14.613061", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 0, 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "room_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Room Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "room_number", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Room 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "seating_capacity", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Seating Capacity", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "menu_index": 0, 
- "modified": "2017-06-30 08:21:50.145058", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Room", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "room_name", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/room/test_room.js b/erpnext/schools/doctype/room/test_room.js
deleted file mode 100644
index 0a93a85..0000000
--- a/erpnext/schools/doctype/room/test_room.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Testing Setup Module in Schools
-QUnit.module('schools');
-
-QUnit.test('Test: Room', function(assert){
-	assert.expect(3);
-	let done = assert.async();
-	frappe.run_serially([
-		() => {
-			return frappe.tests.make('Room', [
-				{room_name: 'Room 1'},
-				{room_number: '1'},
-				{seating_capacity: '60'},
-			]);
-		},
-		() => {
-			assert.ok(cur_frm.doc.room_name == 'Room 1');
-			assert.ok(cur_frm.doc.room_number = '1');
-			assert.ok(cur_frm.doc.seating_capacity = '60');
-		},
-		() => done()
-	]);
-});
diff --git a/erpnext/schools/doctype/school_house/school_house.json b/erpnext/schools/doctype/school_house/school_house.json
deleted file mode 100644
index e777939..0000000
--- a/erpnext/schools/doctype/school_house/school_house.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "field:house_name", 
- "beta": 0, 
- "creation": "2017-03-27 15:19:54.672995", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "house_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "House Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-06-30 08:21:50.250616", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "School House", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/school_settings/school_settings.js b/erpnext/schools/doctype/school_settings/school_settings.js
deleted file mode 100644
index 2707c42..0000000
--- a/erpnext/schools/doctype/school_settings/school_settings.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('School Settings', {
-	refresh: function(frm) {
-
-	}
-});
diff --git a/erpnext/schools/doctype/school_settings/school_settings.json b/erpnext/schools/doctype/school_settings/school_settings.json
deleted file mode 100644
index b6d9890..0000000
--- a/erpnext/schools/doctype/school_settings/school_settings.json
+++ /dev/null
@@ -1,307 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2017-04-05 13:33:04.519313", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "current_academic_year", 
-   "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": "Current Academic Year", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Academic Year", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "current_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": "Current 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "attendance_freeze_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": "Attendance Freeze Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.", 
-   "fieldname": "validate_batch", 
-   "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": "Validate Batch for Students in Student Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.", 
-   "fieldname": "validate_course", 
-   "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": "Validate Enrolled Course for Students in Student Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_7", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Full Name", 
-   "fieldname": "instructor_created_by", 
-   "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": "Instructor Records to be created by", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Full Name\nNaming Series\nEmployee Number", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-08-25 02:36:48.744456", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "School Settings", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 0, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/school_settings/school_settings.py b/erpnext/schools/doctype/school_settings/school_settings.py
deleted file mode 100644
index 88235cf..0000000
--- a/erpnext/schools/doctype/school_settings/school_settings.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-import frappe.defaults
-from frappe.model.document import Document
-
-school_keydict = {
-	# "key in defaults": "key in Global Defaults"
-	"academic_year": "current_academic_year",
-	"academic_term": "current_academic_term",
-	"validate_batch": "validate_batch",
-	"validate_course": "validate_course"
-}
-
-class SchoolSettings(Document):
-	def on_update(self):
-		"""update defaults"""
-		for key in school_keydict:
-			frappe.db.set_default(key, self.get(school_keydict[key], ''))
-
-		# clear cache
-		frappe.clear_cache()
-
-	def get_defaults(self):
-		return frappe.defaults.get_defaults()
-
-	def validate(self):
-		from frappe.custom.doctype.property_setter.property_setter import make_property_setter
-		if self.get('instructor_created_by')=='Naming Series':
-			make_property_setter('Instructor', "naming_series", "hidden", 0, "Check")
-		else:
-			make_property_setter('Instructor', "naming_series", "hidden", 1, "Check")
diff --git a/erpnext/schools/doctype/school_settings/test_school_settings.js b/erpnext/schools/doctype/school_settings/test_school_settings.js
deleted file mode 100644
index 6414056..0000000
--- a/erpnext/schools/doctype/school_settings/test_school_settings.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Testing Setup Module in Schools
-QUnit.module('schools');
-
-QUnit.test("Test: School Settings", function(assert){
-	assert.expect(3);
-	let done = assert.async();
-	frappe.run_serially([
-		() => frappe.set_route("List", "School Settings"),
-		() => frappe.timeout(0.4),
-		() => {
-			return frappe.tests.set_form_values(cur_frm, [
-				{current_academic_year: '2016-17'},
-				{current_academic_term: '2016-17 (Semester 1)'},
-				{attendance_freeze_date: '2016-07-20'}
-			]);
-		},
-		() => {
-			cur_frm.save();
-			assert.ok(cur_frm.doc.current_academic_year=="2016-17");
-			assert.ok(cur_frm.doc.current_academic_term=="2016-17 (Semester 1)");
-			assert.ok(cur_frm.doc.attendance_freeze_date=="2016-07-20");
-		},
-		() => done()
-	]);
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student/student.json b/erpnext/schools/doctype/student/student.json
deleted file mode 100644
index 4961c2d..0000000
--- a/erpnext/schools/doctype/student/student.json
+++ /dev/null
@@ -1,1175 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "naming_series:", 
- "beta": 0, 
- "creation": "2015-09-07 13:00:55.938280", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_1", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "1", 
-   "fieldname": "enabled", 
-   "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": "Enabled", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_3", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "first_name", 
-   "fieldtype": "Data", 
-   "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": "First Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "middle_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Middle Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "last_name", 
-   "fieldtype": "Data", 
-   "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": "Last Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "naming_series", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Naming Series", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "STUD.", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 1, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "student_email_id", 
-   "fieldtype": "Data", 
-   "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 Email Address", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 1
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "student_mobile_number", 
-   "fieldtype": "Data", 
-   "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 Mobile Number", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Today", 
-   "fieldname": "joining_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Joining Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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, 
-   "unique": 0, 
-   "width": "10"
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "collapsible_depends_on": "", 
-   "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": "Personal Details", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "date_of_birth", 
-   "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": "Date of Birth", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "blood_group", 
-   "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": "Blood Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nA+\nA-\nB+\nB-\nO+\nO-\nAB+\nAB-", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "gender", 
-   "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": "Gender", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nMale\nFemale\nOther", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "nationality", 
-   "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": "Nationality", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "student_applicant", 
-   "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 Applicant", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student Applicant", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_22", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Home Address", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "address_line_1", 
-   "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": "Address Line 1", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "address_line_2", 
-   "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": "Address Line 2", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "pincode", 
-   "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": "Pincode", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_20", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "city", 
-   "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": "City", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "state", 
-   "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": "State", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_18", 
-   "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": "Guardian Details", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "guardians", 
-   "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": "Guardians", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "section_break_20", 
-   "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": "Sibling Details", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Country", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "siblings", 
-   "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": "Siblings", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student Sibling", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "exit", 
-   "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": "Exit", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "date_of_leaving", 
-   "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": "Date of Leaving", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "leaving_certificate_number", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Leaving Certificate 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_31", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "reason_for_leaving", 
-   "fieldtype": "Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Reason For Leaving", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "fieldname": "title", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Title", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_field": "image", 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "menu_index": 0, 
- "modified": "2017-07-26 19:46:26.893441", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Student", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Instructor", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 0
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "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": "title", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_admission/student_admission.json b/erpnext/schools/doctype/student_admission/student_admission.json
deleted file mode 100644
index c35d5be..0000000
--- a/erpnext/schools/doctype/student_admission/student_admission.json
+++ /dev/null
@@ -1,398 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 1, 
- "allow_import": 0, 
- "allow_rename": 1, 
- "autoname": "", 
- "beta": 0, 
- "creation": "2016-09-13 03:05:27.154713", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 1, 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "title", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Title", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "route", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Route", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 1
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "application_form_route", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Application Form Route", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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": 1, 
-   "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "admission_start_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Admission Start Date", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "admission_end_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Admission End Date", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "published", 
-   "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": "Publish on website", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_5", 
-   "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": "Eligibility and Details", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "program_details", 
-   "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": "Eligibility and Details", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student Admission Program", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "introduction", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Introduction", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 1, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_published_field": "published", 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-10-02 15:16:44.386000", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Student Admission", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "route": "admissions", 
- "show_name_in_global_search": 1, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "title", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_admission/student_admission.py b/erpnext/schools/doctype/student_admission/student_admission.py
deleted file mode 100644
index e166b9b..0000000
--- a/erpnext/schools/doctype/student_admission/student_admission.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-from frappe.utils import nowdate
-from frappe.website.website_generator import WebsiteGenerator
-
-
-class StudentAdmission(WebsiteGenerator):
-	def autoname(self):
-		if not self.title:
-			self.title = self.get_title()
-		self.name = self.title
-
-	def validate(self):
-		if not self.route:		#pylint: disable=E0203
-			self.route = "admissions/" + "-".join(self.title.split(" "))
-
-	def get_context(self, context):
-		context.no_cache = 1
-		context.show_sidebar = True
-		context.title = self.title
-		context.parents = [{'name': 'admissions', 'title': _('All Student Admissions'), 'route': 'admissions' }]
-
-	def get_title(self):
-		return _("Admissions for {0}").format(self.academic_year)
-
-
-def get_list_context(context=None):
-	context.update({
-		"show_sidebar": True,
-		"title": _("Student Admissions"),
-		"get_list": get_admission_list,
-		"row_template": "schools/doctype/student_admission/templates/student_admission_row.html",
-	})
-
-def get_admission_list(doctype, txt, filters, limit_start, limit_page_length=20, order_by="modified"):
-	return frappe.db.sql('''select name, title, academic_year, modified, admission_start_date, route,
-		admission_end_date from `tabStudent Admission` where published=1 and admission_end_date >= %s
-		order by admission_end_date asc limit {0}, {1}
-		'''.format(limit_start, limit_page_length), [nowdate()], as_dict=1)
diff --git a/erpnext/schools/doctype/student_admission/test_student_admission.js b/erpnext/schools/doctype/student_admission/test_student_admission.js
deleted file mode 100644
index 767f237..0000000
--- a/erpnext/schools/doctype/student_admission/test_student_admission.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Testing Admission Module in Schools
-QUnit.module('schools');
-
-QUnit.test('Test: Student Admission', function(assert) {
-	assert.expect(10);
-	let done = assert.async();
-	frappe.run_serially([
-		() => {
-			return frappe.tests.make('Student Admission', [
-				{academic_year: '2016-17'},
-				{admission_start_date: '2016-04-20'},
-				{admission_end_date: '2016-05-31'},
-				{title: '2016-17 Admissions'},
-				{application_form_route: 'student-applicant'},
-				{introduction: 'Test intro'},
-				{program_details: [
-					[
-						{'program': 'Standard Test'},
-						{'application_fee': 1000},
-						{'applicant_naming_series': 'AP'},
-					]
-				]}
-			]);
-		},
-		() => cur_frm.save(),
-		() => {
-			assert.ok(cur_frm.doc.academic_year == '2016-17');
-			assert.ok(cur_frm.doc.admission_start_date == '2016-04-20');
-			assert.ok(cur_frm.doc.admission_end_date == '2016-05-31');
-			assert.ok(cur_frm.doc.title == '2016-17 Admissions');
-			assert.ok(cur_frm.doc.application_form_route == 'student-applicant');
-			assert.ok(cur_frm.doc.introduction == 'Test intro');
-			assert.ok(cur_frm.doc.program_details[0].program == 'Standard Test', 'Program correctly selected');
-			assert.ok(cur_frm.doc.program_details[0].application_fee == 1000);
-			assert.ok(cur_frm.doc.program_details[0].applicant_naming_series == 'AP');
-			assert.ok(cur_frm.doc.route == 'admissions/2016-17-Admissions', "Route successfully set");
-		},
-		() => done()
-	]);
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_admission_program/student_admission_program.json b/erpnext/schools/doctype/student_admission_program/student_admission_program.json
deleted file mode 100644
index 29bb57f..0000000
--- a/erpnext/schools/doctype/student_admission_program/student_admission_program.json
+++ /dev/null
@@ -1,222 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "", 
- "beta": 0, 
- "creation": "2017-09-15 12:59:43.207923", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "program", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Program", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Program", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "minimum_age", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Minimum Age", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "maximum_age", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Maximum Age", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "application_fee", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Application Fee", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "applicant_naming_series", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Naming Series (for Student Applicant)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-10-02 17:13:52.586218", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Student Admission Program", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_applicant/student_applicant.js b/erpnext/schools/doctype/student_applicant/student_applicant.js
deleted file mode 100644
index fdf16ba..0000000
--- a/erpnext/schools/doctype/student_applicant/student_applicant.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on("Student Applicant", {
-	setup: function(frm) {
-		frm.add_fetch("guardian", "guardian_name", "guardian_name");
-	},
-
-	refresh: function(frm) {
-		if(frm.doc.application_status== "Applied" && frm.doc.docstatus== 1 ) {
-			frm.add_custom_button(__("Approve"), function() {
-				frm.set_value("application_status", "Approved");
-				frm.save_or_update();
-
-			}, 'Actions');
-
-			frm.add_custom_button(__("Reject"), function() {
-				frm.set_value("application_status", "Rejected");
-				frm.save_or_update();
-			}, 'Actions');
-		}
-
-		if(frm.doc.application_status== "Approved" && frm.doc.docstatus== 1 ) {
-			frm.add_custom_button(__("Enroll"), function() {
-				frm.events.enroll(frm)
-			}).addClass("btn-primary");
-			frm.add_custom_button(__("Reject"), function() {
-				frm.set_value("application_status", "Rejected");
-				frm.save_or_update();
-			}, 'Actions');
-		}
-
-		frappe.realtime.on("enroll_student_progress", function(data) {
-			if(data.progress) {
-				frappe.hide_msgprint(true);
-				frappe.show_progress(__("Enrolling student"), data.progress[0],data.progress[1]);
-			}
-		})
-	},
-
-	enroll: function(frm) {
-		frappe.model.open_mapped_doc({
-			method: "erpnext.schools.api.enroll_student",
-			frm: frm
-		})
-	}
-});
-
-frappe.ui.form.on('Student Sibling', {
-	setup: function(frm) {
-		frm.add_fetch("student", "title", "full_name");
-		frm.add_fetch("student", "gender", "gender");
-		frm.add_fetch("student", "date_of_birth", "date_of_birth");
-	}
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_applicant/student_applicant.json b/erpnext/schools/doctype/student_applicant/student_applicant.json
deleted file mode 100644
index 578f84c..0000000
--- a/erpnext/schools/doctype/student_applicant/student_applicant.json
+++ /dev/null
@@ -1,1099 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "naming_series:", 
- "beta": 0, 
- "creation": "2015-09-11 11:50:09.740807", 
- "custom": 0, 
- "default_print_format": "", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "first_name", 
-   "fieldtype": "Data", 
-   "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": "First Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "middle_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Middle Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "last_name", 
-   "fieldtype": "Data", 
-   "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": "Last Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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": 1, 
-   "in_global_search": 1, 
-   "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "paid", 
-   "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": "Paid", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_8", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "naming_series", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Naming Series", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "AP", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 1, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.docstatus != 0", 
-   "fieldname": "application_status", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Application Status", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Applied\nApproved\nRejected\nAdmitted", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Today", 
-   "fieldname": "application_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": "Application Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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": 0, 
-   "in_standard_filter": 0, 
-   "label": "Academic Year", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Academic Year", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "student_admission", 
-   "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 Admission", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student Admission", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "collapsible_depends_on": "", 
-   "columns": 0, 
-   "fieldname": "section_break_4", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Personal Details", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "date_of_birth", 
-   "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": "Date of Birth", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "gender", 
-   "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": "Gender", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nMale\nFemale", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "blood_group", 
-   "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": "Blood Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nA+\nA-\nB+\nB-\nO+\nO-\nAB+\nAB-", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_12", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "student_email_id", 
-   "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": "Student Email Address", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 1
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "student_mobile_number", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Student Mobile 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "INDIAN", 
-   "fieldname": "nationality", 
-   "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": "Nationality", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "home_address", 
-   "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": "Home Address", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "address_line_1", 
-   "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": "Address Line 1", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "address_line_2", 
-   "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": "Address Line 2", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "pincode", 
-   "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": "Pincode", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_23", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "city", 
-   "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": "City", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "state", 
-   "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": "State", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "section_break_20", 
-   "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": "Guardian Details", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "guardians", 
-   "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": "Guardians", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "section_break_21", 
-   "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": "Sibling Details", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "siblings", 
-   "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": "Siblings", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student Sibling", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_23", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "title", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Title", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Student Applicant", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "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": "2017-08-23 06:12:36.996978", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Student Applicant", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "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": "title", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_applicant/tests/test_student_applicant.js b/erpnext/schools/doctype/student_applicant/tests/test_student_applicant.js
deleted file mode 100644
index a45b45a..0000000
--- a/erpnext/schools/doctype/student_applicant/tests/test_student_applicant.js
+++ /dev/null
@@ -1,95 +0,0 @@
-// Testing Admission module in Schools
-QUnit.module('schools');
-
-QUnit.test('Test: Student Applicant', function(assert){
-	assert.expect(24);
-	let done = assert.async();
-	let guradian_auto_code;
-	let guardian_name;
-	frappe.run_serially([
-		() => frappe.set_route('List', 'Guardian'),
-		() => frappe.timeout(0.5),
-		() => {$(`a:contains("Test Guardian"):visible`)[0].click();},
-		() => frappe.timeout(1),
-		() => {
-			guardian_name = cur_frm.doc.guardian_name;
-			guradian_auto_code = frappe.get_route()[2];
-		},
-		// Testing data entry for Student Applicant
-		() => {
-			return frappe.tests.make('Student Applicant',[
-				{first_name: 'Fname'},
-				{middle_name: 'Mname'},
-				{last_name: 'Lname'},
-				{program: 'Standard Test'},
-				{student_admission: '2016-17 Admissions'},
-				{academic_year: '2016-17'},
-				{date_of_birth: '1995-07-20'},
-				{student_email_id: 'test@testmail.com'},
-				{gender: 'Male'},
-				{student_mobile_number: '9898980000'},
-				{blood_group: 'O+'},
-				{address_line_1: 'Test appt, Test Society,'},
-				{address_line_2: 'Test district, Test city.'},
-				{city: 'Test'},
-				{state: 'Test'},
-				{pincode: '400086'}
-			]);
-		},
-		// Entry in Guardian child table
-		() => $('a:contains("Guardian Details"):visible').click(),
-		() => $('.btn:contains("Add Row"):visible').click(),
-		() => {
-			cur_frm.get_field("guardians").grid.grid_rows[0].doc.guardian = guradian_auto_code;
-			cur_frm.get_field("guardians").grid.grid_rows[0].doc.relation = "Father";
-			cur_frm.get_field("guardians").grid.grid_rows[0].doc.guardian_name = guardian_name;
-			$('a:contains("Guardian Details"):visible').click();
-		},
-		// Entry in Sibling child table
-		() => $('a:contains("Sibling Details"):visible').click(),
-		() => $('.btn:contains("Add Row"):visible').click(),
-		() => {
-			cur_frm.get_field("siblings").grid.grid_rows[0].doc.full_name = "Test Name";
-			cur_frm.get_field("siblings").grid.grid_rows[0].doc.gender = "Male";
-			cur_frm.get_field("siblings").grid.grid_rows[0].doc.institution = "Test Institution";
-			cur_frm.get_field("siblings").grid.grid_rows[0].doc.program = "Test Program";
-			cur_frm.get_field("siblings").grid.grid_rows[0].doc.date_of_birth = "1995-07-20";
-			$('span.hidden-xs.octicon.octicon-triangle-up').click();
-			cur_frm.save();
-		},
-		() => {
-			assert.ok(cur_frm.doc.first_name == 'Fname');
-			assert.ok(cur_frm.doc.middle_name == 'Mname');
-			assert.ok(cur_frm.doc.last_name == 'Lname');
-			assert.ok(cur_frm.doc.program == 'Standard Test', 'Program selected correctly');
-			assert.ok(cur_frm.doc.student_admission == '2016-17 Admissions', 'Student Admission entry correctly selected');
-			assert.ok(cur_frm.doc.academic_year == '2016-17');
-			assert.ok(cur_frm.doc.date_of_birth == '1995-07-20');
-			assert.ok(cur_frm.doc.student_email_id == 'test@testmail.com');
-			assert.ok(cur_frm.doc.gender == 'Male');
-			assert.ok(cur_frm.doc.student_mobile_number == '9898980000');
-			assert.ok(cur_frm.doc.blood_group == 'O+');
-			assert.ok(cur_frm.doc.address_line_1 == 'Test appt, Test Society,');
-			assert.ok(cur_frm.doc.address_line_2 == 'Test district, Test city.');
-			assert.ok(cur_frm.doc.city == 'Test');
-			assert.ok(cur_frm.doc.state == 'Test');
-			assert.ok(cur_frm.doc.pincode == '400086');
-		},
-		() => frappe.timeout(1),
-		() => $('a:contains("Guardian Details"):visible').click(),
-		() => {
-			assert.ok(cur_frm.get_field("guardians").grid.grid_rows[0].doc.guardian == guradian_auto_code, 'Guardian correctly selected from dropdown');
-			assert.ok(cur_frm.get_field("guardians").grid.grid_rows[0].doc.relation == 'Father');
-			assert.ok(cur_frm.get_field("guardians").grid.grid_rows[0].doc.guardian_name == guardian_name, 'Guardian name was correctly retrieved');
-		},
-		() => $('a:contains("Sibling Details"):visible').click(),
-		() => {
-			assert.ok(cur_frm.get_field("siblings").grid.grid_rows[0].doc.full_name == 'Test Name');
-			assert.ok(cur_frm.get_field("siblings").grid.grid_rows[0].doc.gender == 'Male');
-			assert.ok(cur_frm.get_field("siblings").grid.grid_rows[0].doc.institution == 'Test Institution');
-			assert.ok(cur_frm.get_field("siblings").grid.grid_rows[0].doc.program == 'Test Program');
-			assert.ok(cur_frm.get_field("siblings").grid.grid_rows[0].doc.date_of_birth == '1995-07-20');
-		},
-		() => done()
-	]);
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_applicant/tests/test_student_applicant_options.js b/erpnext/schools/doctype/student_applicant/tests/test_student_applicant_options.js
deleted file mode 100644
index d8877e6..0000000
--- a/erpnext/schools/doctype/student_applicant/tests/test_student_applicant_options.js
+++ /dev/null
@@ -1,110 +0,0 @@
-// Testing Admission module in Schools
-QUnit.module('schools');
-
-QUnit.test('test student applicant', function(assert){
-	assert.expect(11);
-	let done = assert.async();
-	let testing_status;
-	frappe.run_serially([
-		() => frappe.set_route('List', 'Student Applicant'),
-		() => frappe.timeout(0.5),
-		() => {$(`a:contains("Fname Mname Lname"):visible`)[0].click();},
-
-		// Checking different options
-		// 1. Moving forward with Submit
-		() => frappe.timeout(0.5),
-		() => frappe.tests.click_button('Submit'),
-		() => frappe.tests.click_button('Yes'),
-		() => frappe.timeout(0.5),
-		() => {
-			testing_status = $('span.indicator.orange').text();
-			assert.ok(testing_status.indexOf('Submit this document to confirm') == -1); // checking if submit has been successfull
-		},
-
-		// 2. Cancelling the Submit request
-		() => frappe.timeout(0.5),
-		() => frappe.tests.click_button('Cancel'),
-		() => frappe.tests.click_button('Yes'),
-		() => frappe.timeout(0.5),
-		() => {
-			testing_status = $('h1.editable-title').text();
-			assert.ok(testing_status.indexOf('Cancelled') != -1); // checking if cancel request has been successfull
-		},
-
-		// 3. Checking Amend option
-		() => frappe.timeout(0.5),
-		() => frappe.tests.click_button('Amend'),
-		() => cur_frm.doc.student_email_id = "test2@testmail.com", // updating email id since same id again is not allowed
-		() => cur_frm.save(),
-		() => frappe.timeout(0.5),
-		() => frappe.tests.click_button('Submit'),
-		() => frappe.tests.click_button('Yes'), // Submitting again after amend
-		() => {
-			testing_status = $('span.indicator.orange').text();
-			assert.ok(testing_status.indexOf('Submit this document to confirm') == -1); // checking if submit has been successfull after amend
-		},
-
-		// Checking different Application status option
-		() => {
-			testing_status = $('h1.editable-title').text();
-			assert.ok(testing_status.indexOf('Applied') != -1); // checking if Applied has been successfull
-		},
-		() => cur_frm.set_value('application_status', "Rejected"), // Rejected Status
-		() => frappe.tests.click_button('Update'),
-		() => {
-			testing_status = $('h1.editable-title').text();
-			assert.ok(testing_status.indexOf('Rejected') != -1); // checking if Rejected has been successfull
-		},
-		() => cur_frm.set_value('application_status', "Admitted"), // Admitted Status
-		() => frappe.tests.click_button('Update'),
-		() => {
-			testing_status = $('h1.editable-title').text();
-			assert.ok(testing_status.indexOf('Admitted') != -1); // checking if Admitted has been successfull
-		},
-		() => cur_frm.set_value('application_status', "Approved"), // Approved Status
-		() => frappe.tests.click_button('Update'),
-		() => {
-			testing_status = $('h1.editable-title').text();
-			assert.ok(testing_status.indexOf('Approved') != -1); // checking if Approved has been successfull
-		},
-
-		// Clicking on Enroll button should add the applicant's entry in Student doctype, and take you to Program Enrollment page
-		() => frappe.timeout(0.5),
-		() => frappe.tests.click_button('Enroll'),
-		() => frappe.timeout(0.5),
-		() => {
-			assert.ok(frappe.get_route()[0] == 'Form'); // Checking if the current page is Program Enrollment page or not
-			assert.ok(frappe.get_route()[1] == 'Program Enrollment');
-		},
-
-		// Routing to Student List to check if the Applicant's entry has been made or not
-		() => frappe.timeout(0.5),
-		() => frappe.set_route('List', 'Student'),
-		() => frappe.timeout(0.5),
-		() => {$(`a:contains("Fname Mname Lname"):visible`)[0].click();},
-		() => frappe.timeout(0.5),
-		() => {assert.ok(($(`h1.editable-title`).text()).indexOf('Enabled') != -1, 'Student entry successfully created');}, // Checking if the Student entry has been enabled
-		// Enrolling the Student into a Program
-		() => {$('.form-documents .row:nth-child(1) .col-xs-6:nth-child(1) .octicon-plus').click();},
-		() => frappe.timeout(1),
-		() => cur_frm.set_value('program', 'Standard Test'),
-		() => frappe.timeout(1),
-		() => {
-			cur_frm.set_value('student_category', 'Reservation');
-			cur_frm.set_value('student_batch_name', 'A');
-			cur_frm.set_value('academic_year', '2016-17');
-			cur_frm.set_value('academic_term', '2016-17 (Semester 1)');
-			cur_frm.set_value('school_house', 'Test_house');
-		},
-		() => cur_frm.save(),
-
-		// Submitting Program Enrollment form for our Test Student
-		() => frappe.timeout(1),
-		() => frappe.tests.click_button('Submit'),
-		() => frappe.tests.click_button('Yes'),
-		() => {
-			assert.ok(cur_frm.doc.docstatus == 1, "Program enrollment successfully submitted");
-		},
-		() => done()
-	]);
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_attendance/student_attendance.json b/erpnext/schools/doctype/student_attendance/student_attendance.json
deleted file mode 100644
index aa084cc..0000000
--- a/erpnext/schools/doctype/student_attendance/student_attendance.json
+++ /dev/null
@@ -1,280 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "SA.######", 
- "beta": 0, 
- "creation": "2015-11-05 15:20:23.045996", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 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": 1, 
-   "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "course_schedule", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Course Schedule", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Course Schedule", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "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": "Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "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": "student.title", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "student_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Student Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student Group", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Present", 
-   "fieldname": "status", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Status", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Present\nAbsent", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-06-30 08:21:51.223266", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Student Attendance", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "student_name", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_attendance/student_attendance.py b/erpnext/schools/doctype/student_attendance/student_attendance.py
deleted file mode 100644
index 6960296..0000000
--- a/erpnext/schools/doctype/student_attendance/student_attendance.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-from frappe import _
-from frappe.utils import cstr
-from erpnext.schools.api import get_student_group_students
-
-
-class StudentAttendance(Document):
-	def validate(self):
-		self.validate_date()
-		self.validate_mandatory()
-		self.validate_course_schedule()
-		self.validate_student()
-		self.validate_duplication()
-		
-	def validate_date(self):
-		if self.course_schedule:
-			self.date = frappe.db.get_value("Course Schedule", self.course_schedule, "schedule_date")
-	
-	def validate_mandatory(self):
-		if not (self.student_group or self.course_schedule):
-			frappe.throw(_("""Student Group or Course Schedule is mandatory"""))
-	
-	def validate_course_schedule(self):
-		if self.course_schedule:
-			self.student_group = frappe.db.get_value("Course Schedule", self.course_schedule, "student_group")
-	
-	def validate_student(self):
-		if self.course_schedule:
-			student_group = frappe.db.get_value("Course Schedule", self.course_schedule, "student_group")
-		else:
-			student_group = self.student_group
-		student_group_students = [d.student for d in get_student_group_students(student_group)]
-		if student_group and self.student not in student_group_students:
-			frappe.throw(_('''Student {0}: {1} does not belong to Student Group {2}'''.format(self.student, self.student_name, student_group)))
-
-	def validate_duplication(self):
-		"""Check if the Attendance Record is Unique"""
-		attendance_records=None
-		if self.course_schedule:
-			attendance_records= frappe.db.sql("""select name from `tabStudent Attendance` where \
-				student= %s and ifnull(course_schedule, '')= %s and name != %s""",
-				(self.student, cstr(self.course_schedule), self.name))
-		else:
-			attendance_records= frappe.db.sql("""select name from `tabStudent Attendance` where \
-				student= %s and student_group= %s and date= %s and name != %s and \
-				(course_schedule is Null or course_schedule='')""",
-				(self.student, self.student_group, self.date, self.name))
-			
-		if attendance_records:
-			frappe.throw(_("Attendance Record {0} exists against Student {1}")
-				.format(attendance_records[0][0], self.student))
diff --git a/erpnext/schools/doctype/student_attendance/test_student_attendance.js b/erpnext/schools/doctype/student_attendance/test_student_attendance.js
deleted file mode 100644
index af83e77..0000000
--- a/erpnext/schools/doctype/student_attendance/test_student_attendance.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// Testing Attendance Module in Schools
-QUnit.module('schools');
-
-QUnit.test('Test: Student Attendance', function(assert){
-	assert.expect(2);
-	let done = assert.async();
-	let student_code;
-
-	frappe.run_serially([
-		() => frappe.db.get_value('Student', {'student_email_id': 'test2@testmail.com'}, 'name'),
-		(student) => {student_code = student.message.name;}, // fetching student code from db
-
-		() => {
-			return frappe.tests.make('Student Attendance', [
-				{student: student_code},
-				{date: frappe.datetime.nowdate()},
-				{student_group: "test-batch-wise-group-2"},
-				{status: "Absent"}
-			]);
-		},
-
-		() => frappe.timeout(0.5),
-		() => {assert.equal(cur_frm.doc.status, "Absent", "Attendance correctly saved");},
-
-		() => frappe.timeout(0.5),
-		() => cur_frm.set_value("status", "Present"),
-		() => {assert.equal(cur_frm.doc.status, "Present", "Attendance correctly saved");},
-
-		() => done()
-	]);
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js
deleted file mode 100644
index 23ec408..0000000
--- a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js
+++ /dev/null
@@ -1,182 +0,0 @@
-// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-frappe.provide("schools")
-
-frappe.ui.form.on('Student Attendance Tool', {
-	onload: function(frm) {
-		frm.set_query("student_group", function() {
-			return {
-				"filters": {
-					"group_based_on": frm.doc.group_based_on
-				}
-			};
-		});
-	},
-
-	refresh: function(frm) {
-		if (frappe.route_options) {
-			frm.set_value("based_on", frappe.route_options.based_on);
-			frm.set_value("student_group", frappe.route_options.student_group);
-			frm.set_value("course_schedule", frappe.route_options.course_schedule);
-			frappe.route_options = null;
-		}
-		frm.disable_save();
-	},
-
-	based_on: function(frm) {
-		if (frm.doc.based_on == "Student Group") {
-			frm.set_value("course_schedule", "");
-		} else {
-			frm.set_value("student_group", "");
-		}
-	},
-
-	student_group: function(frm) {
-		if ((frm.doc.student_group && frm.doc.date) || frm.doc.course_schedule) {
-			var method = "erpnext.schools.doctype.student_attendance_tool.student_attendance_tool.get_student_attendance_records";
-
-			frappe.call({
-				method: method,
-				args: {
-					based_on: frm.doc.based_on,
-					student_group: frm.doc.student_group,
-					date: frm.doc.date,
-					course_schedule: frm.doc.course_schedule
-				},
-				callback: function(r) {
-					frm.events.get_students(frm, r.message);
-				}
-			})
-		}
-	},
-
-	date: function(frm) {
-		frm.trigger("student_group");
-	},
-
-	course_schedule: function(frm) {
-		frm.trigger("student_group");
-	},
-
-	get_students: function(frm, students) {
-		if (!frm.students_area) {
-			frm.students_area = $('<div>')
-				.appendTo(frm.fields_dict.students_html.wrapper);
-		}
-		students = students || [];
-		frm.students_editor = new schools.StudentsEditor(frm, frm.students_area, students)
-	}
-});
-
-
-schools.StudentsEditor = Class.extend({
-	init: function(frm, wrapper, students) {
-		this.wrapper = wrapper;
-		this.frm = frm;
-		if(students.length > 0) {
-			this.make(frm, students);
-		} else {
-			this.show_empty_state();
-		}
-	},
-	make: function(frm, students) {
-		var me = this;
-
-		$(this.wrapper).empty();
-		var student_toolbar = $('<p>\
-			<button class="btn btn-default btn-add btn-xs" style="margin-right: 5px;"></button>\
-			<button class="btn btn-xs btn-default btn-remove" style="margin-right: 5px;"></button>\
-			<button class="btn btn-default btn-primary btn-mark-att btn-xs"></button></p>').appendTo($(this.wrapper));
-
-		student_toolbar.find(".btn-add")
-			.html(__('Check all'))
-			.on("click", function() {
-				$(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
-					if (!$(check).prop("disabled")) {
-						check.checked = true;
-					}
-				});
-			});
-
-		student_toolbar.find(".btn-remove")
-			.html(__('Uncheck all'))
-			.on("click", function() {
-				$(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
-					if (!$(check).prop("disabled")) {
-						check.checked = false;
-					}
-				});
-			});
-
-		student_toolbar.find(".btn-mark-att")
-			.html(__('Mark Attendance'))
-			.on("click", function() {
-				$(me.wrapper.find(".btn-mark-att")).attr("disabled", true);
-				var studs = [];
-				$(me.wrapper.find('input[type="checkbox"]')).each(function(i, check) {
-					var $check = $(check);
-					studs.push({
-						student: $check.data().student,
-						student_name: $check.data().studentName,
-						group_roll_number: $check.data().group_roll_number,
-						disabled: $check.prop("disabled"),
-						checked: $check.is(":checked")
-					});
-				});
-
-				var students_present = studs.filter(function(stud) {
-					return !stud.disabled && stud.checked;
-				});
-
-				var students_absent = studs.filter(function(stud) {
-					return !stud.disabled && !stud.checked;
-				});
-
-				frappe.confirm(__("Do you want to update attendance?<br>Present: {0}\
-					<br>Absent: {1}", [students_present.length, students_absent.length]),
-					function() {	//ifyes
-						if(!frappe.request.ajax_count) {
-							frappe.call({
-								method: "erpnext.schools.api.mark_attendance",
-								freeze: true,
-								freeze_message: "Marking attendance",
-								args: {
-									"students_present": students_present,
-									"students_absent": students_absent,
-									"student_group": frm.doc.student_group,
-									"course_schedule": frm.doc.course_schedule,
-									"date": frm.doc.date
-								},
-								callback: function(r) {
-									$(me.wrapper.find(".btn-mark-att")).attr("disabled", false);
-									frm.trigger("student_group");
-								}
-							});
-						}
-					},
-					function() {	//ifno
-						$(me.wrapper.find(".btn-mark-att")).attr("disabled", false);
-					}
-				);
-			});
-
-		var htmls = students.map(function(student) {
-			return frappe.render_template("student_button", {
-				student: student.student,
-				student_name: student.student_name,
-				group_roll_number: student.group_roll_number,
-				status: student.status
-			})
-		});
-
-		$(htmls.join("")).appendTo(me.wrapper);
-	},
-
-	show_empty_state: function() {
-		$(this.wrapper).html(
-			`<div class="text-center text-muted" style="line-height: 100px;">
-				${__("No Students in")} ${this.frm.doc.student_group}
-			</div>`
-		);
-	}
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.json b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.json
deleted file mode 100644
index 5c28655..0000000
--- a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.json
+++ /dev/null
@@ -1,333 +0,0 @@
-{
- "allow_copy": 1, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2016-11-16 17:12:46.437539", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "fieldname": "based_on", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Based On", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student Group\nCourse Schedule", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Batch", 
-   "depends_on": "eval:doc.based_on == \"Student Group\"", 
-   "fieldname": "group_based_on", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Group Based On", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Batch\nCourse\nActivity", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.based_on ==\"Student Group\"", 
-   "fieldname": "student_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Student Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student Group", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.based_on ==\"Course Schedule\"", 
-   "fieldname": "course_schedule", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Course Schedule", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Course Schedule", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.based_on ==\"Student Group\"", 
-   "fieldname": "date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval: (doc.course_schedule \n|| (doc.student_group && doc.date))", 
-   "fieldname": "attendance", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Attendance", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "students_html", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Students HTML", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 1, 
- "hide_toolbar": 1, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-11-08 11:53:27.994112", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Student Attendance Tool", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Instructor", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_attendance_tool/test_student_attendance_tool.js b/erpnext/schools/doctype/student_attendance_tool/test_student_attendance_tool.js
deleted file mode 100644
index 3044f20..0000000
--- a/erpnext/schools/doctype/student_attendance_tool/test_student_attendance_tool.js
+++ /dev/null
@@ -1,85 +0,0 @@
-// Testing Attendance Module in Schools
-QUnit.module('schools');
-
-QUnit.test('Test: Student Attendace Tool', function(assert){
-	assert.expect(10);
-	let done = assert.async();
-	let i, count = 0;
-
-	frappe.run_serially([
-		() => frappe.timeout(0.2),
-		() => frappe.set_route('Form', 'Student Attendance Tool'),
-		() => frappe.timeout(0.5),
-
-		() => {
-			if(cur_frm.doc.based_on == 'Student Group' || cur_frm.doc.based_on == 'Course Schedule'){
-				cur_frm.doc.based_on = 'Student Group';
-				assert.equal(1, 1, 'Attendance basis correctly set');
-				cur_frm.set_value("group_based_on", 'Batch');
-				cur_frm.set_value("student_group", "test-batch-wise-group");
-				cur_frm.set_value("date", frappe.datetime.nowdate());
-			}
-		},
-		() => frappe.timeout(0.5),
-		() => {
-			assert.equal($('input.students-check').size(), 5, "Student list based on batch correctly fetched");
-			assert.equal(frappe.datetime.nowdate(), cur_frm.doc.date, 'Current date correctly set');
-
-			cur_frm.set_value("student_group", "test-batch-wise-group-2");
-			assert.equal($('input.students-check').size(), 5, "Student list based on batch 2 correctly fetched");
-
-			cur_frm.set_value("group_based_on", 'Course');
-
-			cur_frm.set_value("student_group", "test-course-wise-group");
-			assert.equal($('input.students-check').size(), 5, "Student list based on course correctly fetched");
-
-			cur_frm.set_value("student_group", "test-course-wise-group-2");
-			assert.equal($('input.students-check').size(), 5, "Student list based on course 2 correctly fetched");
-		},
-
-		() => frappe.timeout(1),
-		() => frappe.tests.click_button('Check all'), // Marking all Student as checked
-		() => {
-			for(i = 0; i < $('input.students-check').size(); i++){
-				if($('input.students-check')[i].checked == true)
-					count++;
-			}
-
-			if(count == $('input.students-check').size())
-				assert.equal($('input.students-check').size(), count, "All students marked checked");
-		},
-
-		() => frappe.timeout(1),
-		() => frappe.tests.click_button('Uncheck all'), // Marking all Student as unchecked
-		() => {
-			count = 0;
-			for(i = 0; i < $('input.students-check').size(); i++){
-				if(!($('input.students-check')[i].checked))
-					count++;
-			}
-
-			if(count == $('input.students-check').size())
-				assert.equal($('input.students-check').size(), count, "All students marked checked");
-		},
-
-		() => frappe.timeout(1),
-		() => frappe.tests.click_button('Check all'),
-		() => frappe.tests.click_button('Mark Attendance'),
-		() => frappe.timeout(1),
-		() => frappe.tests.click_button('Yes'),
-		() => frappe.timeout(1),
-		() => {
-			assert.equal($('.msgprint').text(), "Attendance has been marked successfully.", "Attendance successfully marked");
-			frappe.tests.click_button('Close');
-		},
-
-		() => frappe.timeout(1),
-		() => frappe.set_route('List', 'Student Attendance/List'),
-		() => frappe.timeout(1),
-		() => {
-			assert.equal(($('div.list-item').size() - 1), count, "Attendance list created");
-		},
-
-		() => done()
-	]);
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_batch_name/student_batch_name.json b/erpnext/schools/doctype/student_batch_name/student_batch_name.json
deleted file mode 100644
index 6b08487..0000000
--- a/erpnext/schools/doctype/student_batch_name/student_batch_name.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "field:batch_name", 
- "beta": 0, 
- "creation": "2016-11-17 18:45:57.965091", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "batch_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Batch Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-06-30 08:21:51.545155", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Student Batch Name", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_batch_name/test_student_batch_name.js b/erpnext/schools/doctype/student_batch_name/test_student_batch_name.js
deleted file mode 100644
index 6a10dc1..0000000
--- a/erpnext/schools/doctype/student_batch_name/test_student_batch_name.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Testing Setup Module in Schools
-QUnit.module('schools');
-
-QUnit.test('Test: Student Batch Name', function(assert){
-	assert.expect(1);
-	let done = assert.async();
-	frappe.run_serially([
-		() => {
-			return frappe.tests.make('Student Batch Name', [
-				{batch_name: 'A'}
-			]);
-		},
-		() => cur_frm.save(),
-		() => {
-			assert.ok(cur_frm.doc.batch_name=='A');
-		},
-		() => done()
-	]);
-});
diff --git a/erpnext/schools/doctype/student_category/student_category.json b/erpnext/schools/doctype/student_category/student_category.json
deleted file mode 100644
index ce4cb4e..0000000
--- a/erpnext/schools/doctype/student_category/student_category.json
+++ /dev/null
@@ -1,93 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "field:category", 
- "beta": 0, 
- "creation": "2016-09-05 06:28:33.679415", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "category", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Category", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-06-30 08:21:51.652539", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Student Category", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_category/test_student_category.js b/erpnext/schools/doctype/student_category/test_student_category.js
deleted file mode 100644
index 5e3109a..0000000
--- a/erpnext/schools/doctype/student_category/test_student_category.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Testing Setup Module in Schools
-QUnit.module('schools');
-
-QUnit.test('Test: Student Category', function(assert){
-	assert.expect(1);
-	let done = assert.async();
-	frappe.run_serially([
-		() => {
-			return frappe.tests.make('Student Category', [
-				{category: 'Reservation'}
-			]);
-		},
-		() => cur_frm.save(),
-		() => {
-			assert.ok(cur_frm.doc.name=='Reservation');
-		},
-		() => done()
-	]);
-});
diff --git a/erpnext/schools/doctype/student_group/student_group.js b/erpnext/schools/doctype/student_group/student_group.js
deleted file mode 100644
index 80355a8..0000000
--- a/erpnext/schools/doctype/student_group/student_group.js
+++ /dev/null
@@ -1,119 +0,0 @@
-cur_frm.add_fetch("student", "title", "student_name");
-
-frappe.ui.form.on("Student Group", {
-	onload: function(frm) {
-		frm.set_query("academic_term", function() {
-			return {
-				"filters": {
-					"academic_year": (frm.doc.academic_year)
-				}
-			};
-		});
-		if (!frm.__islocal) {
-			frm.set_query("student", "students", function() {
-				return{
-					query: "erpnext.schools.doctype.student_group.student_group.fetch_students",
-					filters: {
-						'academic_year': frm.doc.academic_year,
-						'group_based_on': frm.doc.group_based_on,
-						'academic_term': frm.doc.academic_term,
-						'program': frm.doc.program,
-						'batch': frm.doc.batch,
-						'course': frm.doc.course,
-						'student_group': frm.doc.name
-					}
-				}
-			});
-		}
-	},
-
-	refresh: function(frm) {
-		if (!frm.doc.__islocal) {
-			frm.add_custom_button(__("Attendance"), function() {
-				frappe.route_options = {
-					based_on: "Student Group",
-					student_group: frm.doc.name
-				}
-				frappe.set_route("List", "Student Attendance Tool");
-			});
-			frm.add_custom_button(__("Course Schedule"), function() {
-				frappe.route_options = {
-					student_group: frm.doc.name
-				}
-				frappe.set_route("List", "Course Schedule");
-			});
-			frm.add_custom_button(__("Assessment Plan"), function() {
-				frappe.route_options = {
-					student_group: frm.doc.name
-				}
-				frappe.set_route("List", "Assessment Plan");
-			});
-			frm.add_custom_button(__("Update Email Group"), function() {
-				frappe.call({
-					method: "erpnext.schools.api.update_email_group",
-					args: {
-						"doctype": "Student Group",
-						"name": frm.doc.name
-					}
-				});
-			});
-			frm.add_custom_button(__("Newsletter"), function() {
-				frappe.route_options = {
-					"Newsletter Email Group.email_group": frm.doc.name
-				}
-				frappe.set_route("List", "Newsletter");
-			});
-		}
-	},
-	
-	group_based_on: function(frm) {
-		if (frm.doc.group_based_on == "Batch") {
-			frm.doc.course = null;
-		}
-	},
-
-	get_students: function(frm) {
-		if (frm.doc.group_based_on == "Batch" || frm.doc.group_based_on == "Course") {
-			var student_list = [];
-			var max_roll_no = 0;
-			$.each(frm.doc.students, function(i,d) {
-				student_list.push(d.student);
-				if (d.group_roll_number>max_roll_no) {
-					max_roll_no = d.group_roll_number;
-				}
-			});
-			frappe.call({
-				method: "erpnext.schools.doctype.student_group.student_group.get_students",
-				args: {
-					"academic_year": frm.doc.academic_year,
-					"academic_term": frm.doc.academic_term,
-					"group_based_on": frm.doc.group_based_on,
-					"program": frm.doc.program,
-					"batch" : frm.doc.batch,
-					"course": frm.doc.course	
-				},
-				callback: function(r) {
-					if(r.message) {
-						$.each(r.message, function(i, d) {
-							if(!in_list(student_list, d.student)) {
-								var s = frm.add_child("students");
-								s.student = d.student;
-								s.student_name = d.student_name;
-								if (d.active === 0) {
-									s.active = 0;
-								}
-								s.group_roll_number = ++max_roll_no;
-							}
-						});
-						refresh_field("students");
-						frm.save();
-					} else {
-						frappe.msgprint(__("Student Group is already updated."))
-					}
-				}
-			})	
-		} else {
-			frappe.msgprint(__("Select students manually for the Activity based Group"));
-		}
-	}
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_group/student_group.json b/erpnext/schools/doctype/student_group/student_group.json
deleted file mode 100644
index 0a9b41a..0000000
--- a/erpnext/schools/doctype/student_group/student_group.json
+++ /dev/null
@@ -1,521 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "field:student_group_name", 
- "beta": 0, 
- "creation": "2015-09-07 12:55:52.072792", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 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": 0, 
-   "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": 0, 
-   "search_index": 0, 
-   "set_only_once": 1, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "group_based_on", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Group Based on", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nBatch\nCourse\nActivity", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "student_group_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Student Group Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Set 0 for no limit", 
-   "fieldname": "max_strength", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Max Strength", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "academic_term", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "program", 
-   "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": "Program", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Program", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "batch", 
-   "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": "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.group_based_on == 'Course'", 
-   "fieldname": "course", 
-   "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": 1, 
-   "label": "Course", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Course", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "collapsible_depends_on": "", 
-   "columns": 0, 
-   "depends_on": "eval:!doc.__islocal", 
-   "fieldname": "section_break_6", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Students", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "get_students", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Get Students", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "students", 
-   "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": "Students", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student Group 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": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_12", 
-   "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": "Instructors", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "instructors", 
-   "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": "Instructors", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student Group Instructor", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "menu_index": 0, 
- "modified": "2017-06-30 08:21:51.755519", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Student Group", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Instructor", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 0
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "search_fields": "program, batch, course", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_group/student_group.py b/erpnext/schools/doctype/student_group/student_group.py
deleted file mode 100644
index 950632b..0000000
--- a/erpnext/schools/doctype/student_group/student_group.py
+++ /dev/null
@@ -1,126 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-from frappe import _
-from erpnext.schools.utils import validate_duplicate_student
-from frappe.utils import cint
-
-class StudentGroup(Document):
-	def validate(self):
-		self.validate_mandatory_fields()
-		self.validate_strength()
-		self.validate_students()
-		self.validate_and_set_child_table_fields()
-		validate_duplicate_student(self.students)
-
-	def validate_mandatory_fields(self):
-		if self.group_based_on == "Course" and not self.course:
-			frappe.throw(_("Please select Course"))
-		if self.group_based_on == "Course" and (not self.program and self.batch):
-			frappe.throw(_("Please select Program"))
-		if self.group_based_on == "Batch" and not self.program:
-			frappe.throw(_("Please select Program"))
-
-	def validate_strength(self):
-		if self.max_strength and len(self.students) > self.max_strength:
-			frappe.throw(_("""Cannot enroll more than {0} students for this student group.""").format(self.max_strength))
-
-	def validate_students(self):
-		program_enrollment = get_program_enrollment(self.academic_year, self.academic_term, self.program, self.batch, self.course)
-		students = [d.student for d in program_enrollment] if program_enrollment else []
-		for d in self.students:
-			if not frappe.db.get_value("Student", d.student, "enabled") and d.active:
-				frappe.throw(_("{0} - {1} is inactive student".format(d.group_roll_number, d.student_name)))
-
-			if (self.group_based_on == "Batch") and cint(frappe.defaults.get_defaults().validate_batch)\
-				and d.student not in students:
-				frappe.throw(_("{0} - {1} is not enrolled in the Batch {2}".format(d.group_roll_number, d.student_name, self.batch)))
-
-			if (self.group_based_on == "Course") and cint(frappe.defaults.get_defaults().validate_course)\
-				and (d.student not in students):
-				frappe.throw(_("{0} - {1} is not enrolled in the Course {2}".format(d.group_roll_number, d.student_name, self.course)))
-
-	def validate_and_set_child_table_fields(self):
-		roll_numbers = [d.group_roll_number for d in self.students if d.group_roll_number]
-		max_roll_no = max(roll_numbers) if roll_numbers else 0
-		roll_no_list = []
-		for d in self.students:
-			if not d.student_name:
-				d.student_name = frappe.db.get_value("Student", d.student, "title")
-			if not d.group_roll_number:
-				max_roll_no += 1
-				d.group_roll_number = max_roll_no
-			if d.group_roll_number in roll_no_list:
-				frappe.throw(_("Duplicate roll number for student {0}".format(d.student_name)))
-			else:
-				roll_no_list.append(d.group_roll_number)
-
-@frappe.whitelist()
-def get_students(academic_year, group_based_on, academic_term=None, program=None, batch=None, course=None):
-	enrolled_students = get_program_enrollment(academic_year, academic_term, program, batch, course)
-
-	if enrolled_students:
-		student_list = []
-		for s in enrolled_students:
-			if frappe.db.get_value("Student", s.student, "enabled"):
-				s.update({"active": 1})
-			else:
-				s.update({"active": 0})
-			student_list.append(s)
-		return student_list
-	else:
-		frappe.msgprint(_("No students found"))
-		return []
-
-def get_program_enrollment(academic_year, academic_term=None, program=None, batch=None, course=None):
-	
-	condition1 = " "
-	condition2 = " "
-	if academic_term:
-		condition1 += " and pe.academic_term = %(academic_term)s"
-	if program:
-		condition1 += " and pe.program = %(program)s"
-	if batch:
-		condition1 += " and pe.student_batch_name = %(batch)s"
-	if course:
-		condition1 += " and pe.name = pec.parent and pec.course = %(course)s"
-		condition2 = ", `tabProgram Enrollment Course` pec"
-
-	return frappe.db.sql('''
-		select 
-			pe.student, pe.student_name 
-		from 
-			`tabProgram Enrollment` pe {condition2}
-		where
-			pe.academic_year = %(academic_year)s  {condition1}
-		order by
-			pe.student_name asc
-		'''.format(condition1=condition1, condition2=condition2),
-		({"academic_year": academic_year, "academic_term":academic_term, "program": program, "batch": batch, "course": course}), as_dict=1)
-
-
-@frappe.whitelist()
-def fetch_students(doctype, txt, searchfield, start, page_len, filters):
-	if filters.get("group_based_on") != "Activity":
-		enrolled_students = get_program_enrollment(filters.get('academic_year'), filters.get('academic_term'),
-			filters.get('program'), filters.get('batch'))
-		student_group_student = frappe.db.sql_list('''select student from `tabStudent Group Student` where parent=%s''',
-			(filters.get('student_group')))
-		students = ([d.student for d in enrolled_students if d.student not in student_group_student]
-			if enrolled_students else [""]) or [""]
-		return frappe.db.sql("""select name, title from tabStudent
-			where name in ({0}) and (`{1}` LIKE %s or title LIKE %s)
-			order by idx desc, name
-			limit %s, %s""".format(", ".join(['%s']*len(students)), searchfield),
-			tuple(students + ["%%%s%%" % txt, "%%%s%%" % txt, start, page_len]))
-	else:
-		return frappe.db.sql("""select name, title from tabStudent
-			where `{0}` LIKE %s or title LIKE %s
-			order by idx desc, name
-			limit %s, %s""".format(searchfield),
-			tuple(["%%%s%%" % txt, "%%%s%%" % txt, start, page_len]))
-
diff --git a/erpnext/schools/doctype/student_group/test_student_group.js b/erpnext/schools/doctype/student_group/test_student_group.js
deleted file mode 100644
index bee5067..0000000
--- a/erpnext/schools/doctype/student_group/test_student_group.js
+++ /dev/null
@@ -1,56 +0,0 @@
-// Testing Student Module in Schools
-QUnit.module('schools');
-
-QUnit.test('Test: Student Group', function(assert){
-	assert.expect(2);
-	let done = assert.async();
-	let group_based_on = ["test-batch-wise-group", "test-course-wise-group"];
-	let tasks = [];
-
-	frappe.run_serially([
-		// Creating a Batch and Course based group
-		() => {
-			return frappe.tests.make('Student Group', [
-				{academic_year: '2016-17'},
-				{academic_term: '2016-17 (Semester 1)'},
-				{program: "Standard Test"},
-				{group_based_on: 'Batch'},
-				{student_group_name: group_based_on[0]},
-				{max_strength: 10},
-				{batch: 'A'}
-			]);
-		},
-		() => {
-			return frappe.tests.make('Student Group', [
-				{academic_year: '2016-17'},
-				{academic_term: '2016-17 (Semester 1)'},
-				{program: "Standard Test"},
-				{group_based_on: 'Course'},
-				{student_group_name: group_based_on[1]},
-				{max_strength: 10},
-				{batch: 'A'},
-				{course: 'Test_Sub'},
-			]);
-		},
-
-		// Populating the created group with Students
-		() => {
-			tasks = [];
-			group_based_on.forEach(index => {
-				tasks.push(
-					() => frappe.timeout(0.5),
-					() => frappe.set_route("Form", ('Student Group/' + index)),
-					() => frappe.timeout(0.5),
-					() => frappe.tests.click_button('Get Students'),
-					() => frappe.timeout(1),
-					() => {
-						assert.equal(cur_frm.doc.students.length, 5, 'Successfully fetched list of students');
-					},
-				);
-			});
-			return frappe.run_serially(tasks);
-		},
-
-		() => done()
-	]);
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.json b/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.json
deleted file mode 100644
index a6ed989..0000000
--- a/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.json
+++ /dev/null
@@ -1,309 +0,0 @@
-{
- "allow_copy": 1, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2016-01-04 14:45:36.576933", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "academic_year", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Academic Year", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Academic Year", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Leave blank if you make students groups per year", 
-   "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "get_courses", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Get 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "program", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Program", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Program", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Leave unchecked if you don't want to consider batch while making course based groups. ", 
-   "fieldname": "separate_groups", 
-   "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": "Separate course based Group for every Batch", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_4", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "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": "Student Group Creation Tool 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": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 1, 
- "hide_toolbar": 1, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-07-17 21:57:35.602091", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Student Group Creation Tool", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py b/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py
deleted file mode 100644
index 649e5da..0000000
--- a/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py
+++ /dev/null
@@ -1,77 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-from frappe.model.document import Document
-from erpnext.schools.doctype.student_group.student_group import get_students
-
-class StudentGroupCreationTool(Document):
-	def get_courses(self):
-		group_list = []
-
-		batches = frappe.db.sql('''select name as batch from `tabStudent Batch Name`''', as_dict=1)
-		for batch in batches:
-			group_list.append({"group_based_on":"Batch", "batch":batch.batch})
-
-		courses = frappe.db.sql('''select course, course_name from `tabProgram Course` where parent=%s''',
-			(self.program), as_dict=1)
-		if self.separate_groups:
-			from itertools import product
-			course_list = product(courses,batches)
-			for course in course_list:
-				temp_dict = {}
-				temp_dict.update({"group_based_on":"Course"})
-				temp_dict.update(course[0])
-				temp_dict.update(course[1])
-				group_list.append(temp_dict)
-		else:
-			for course in courses:
-				course.update({"group_based_on":"Course"})
-				group_list.append(course)
-
-		for group in group_list:
-			if group.get("group_based_on") == "Batch":
-				student_group_name = self.program + "/" + group.get("batch") + "/" + (self.academic_term if self.academic_term else self.academic_year)
-				group.update({"student_group_name": student_group_name})
-			elif group.get("group_based_on") == "Course":
-				student_group_name = group.get("course") + "/" + self.program + ("/" + group.get("batch") if group.get("batch") else "") + "/" + (self.academic_term if self.academic_term else self.academic_year)
-				group.update({"student_group_name": student_group_name})
-
-		return group_list
-
-	def create_student_groups(self):
-		if not self.courses:
-			frappe.throw(_("""No Student Groups created."""))
-
-		l = len(self.courses)
-		for d in self.courses:
-			if not d.student_group_name:
-				frappe.throw(_("""Student Group Name is mandatory in row {0}""".format(d.idx)))
-
-			if d.group_based_on == "Course" and not d.course:
-				frappe.throw(_("""Course is mandatory in row {0}""".format(d.idx)))
-
-			if d.group_based_on == "Batch" and not d.batch:
-				frappe.throw(_("""Batch is mandatory in row {0}""".format(d.idx)))
-
-			frappe.publish_realtime('student_group_creation_progress', {"progress": [d.idx, l]}, user=frappe.session.user)
-
-			student_group = frappe.new_doc("Student Group")
-			student_group.student_group_name = d.student_group_name
-			student_group.group_based_on = d.group_based_on
-			student_group.program = self.program
-			student_group.course = d.course
-			student_group.batch = d.batch
-			student_group.max_strength = d.max_strength
-			student_group.academic_term = self.academic_term
-			student_group.academic_year = self.academic_year
-			student_list = get_students(self.academic_year, d.group_based_on, self.academic_term, self.program, d.batch, d.course)
-
-			for student in student_list:
-				student_group.append('students', student)
-			student_group.save()
-
-		frappe.msgprint(_("{0} Student Groups created.".format(l)))
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_group_creation_tool/test_student_group_creation_tool.js b/erpnext/schools/doctype/student_group_creation_tool/test_student_group_creation_tool.js
deleted file mode 100644
index a8567b3..0000000
--- a/erpnext/schools/doctype/student_group_creation_tool/test_student_group_creation_tool.js
+++ /dev/null
@@ -1,84 +0,0 @@
-QUnit.module('schools');
-
-QUnit.test('Test: Student Group Creation Tool', function(assert){
-	assert.expect(5);
-	let done = assert.async();
-	let instructor_code;
-
-	frappe.run_serially([
-		// Saving Instructor code beforehand
-		() => frappe.db.get_value('Instructor', {'instructor_name': 'Instructor 1'}, 'name'),
-		(instructor) => {instructor_code = instructor.message.name;},
-
-		// Setting up the creation tool to generate and save Student Group
-		() => frappe.set_route('Form', 'Student Group Creation Tool'),
-		() => frappe.timeout(0.5),
-		() => {
-			cur_frm.set_value("academic_year", "2016-17");
-			cur_frm.set_value("academic_term", "2016-17 (Semester 1)");
-			cur_frm.set_value("program", "Standard Test");
-			frappe.tests.click_button('Get Courses');
-		},
-		() => frappe.timeout(1),
-		() => {
-			let no_of_courses = $('input.grid-row-check.pull-left').size() - 1;
-			assert.equal(cur_frm.doc.courses.length, no_of_courses, 'Successfully created groups using the tool');
-		},
-
-		() => {
-			let d, grid, grid_row;
-
-			for(d = 0; d < cur_frm.doc.courses.length; d++)
-			{
-				grid = cur_frm.get_field("courses").grid;
-				grid_row = grid.get_row(d).toggle_view(true);
-				if(grid_row.doc.student_group_name == 'Standard Test/A/2016-17 (Semester 1)'){
-					grid_row.doc.max_strength = 10;
-					grid_row.doc.student_group_name = "test-batch-wise-group-2";
-					$(`.octicon.octicon-triangle-up`).click();
-					continue;
-				}
-				else if(grid_row.doc.student_group_name == 'Test_Sub/Standard Test/2016-17 (Semester 1)'){
-					grid_row.doc.max_strength = 10;
-					grid_row.doc.student_group_name = "test-course-wise-group-2";
-					$(`.octicon.octicon-triangle-up`).click();
-					continue;
-				}
-			}
-		},
-
-		// Generating Student Group
-		() => frappe.timeout(0.5),
-		() => frappe.tests.click_button("Create Student Groups"),
-		() => frappe.timeout(0.5),
-		() => frappe.tests.click_button("Close"),
-
-		// Goin to the generated group to set up student and instructor list
-		() => {
-			let group_name = ['Student Group/test-batch-wise-group-2', 'Student Group/test-course-wise-group-2'];
-			let tasks = [];
-			group_name.forEach(index => {
-				tasks.push(
-					() => frappe.timeout(1),
-					() => frappe.set_route("Form", index),
-					() => frappe.timeout(0.5),
-					() => {
-						assert.equal(cur_frm.doc.students.length, 5, 'Successfully fetched list of students');
-					},
-					() => frappe.timeout(0.5),
-					() => {
-						d = cur_frm.add_child('instructors');
-						d.instructor = instructor_code;
-						cur_frm.save();
-					},
-					() => {
-						assert.equal(cur_frm.doc.instructors.length, 1, 'Instructor detail stored successfully');
-					},
-				);
-			});
-			return frappe.run_serially(tasks);
-		},
-
-		() => done()
-	]);
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_group_creation_tool_course/student_group_creation_tool_course.json b/erpnext/schools/doctype/student_group_creation_tool_course/student_group_creation_tool_course.json
deleted file mode 100644
index d945d4b..0000000
--- a/erpnext/schools/doctype/student_group_creation_tool_course/student_group_creation_tool_course.json
+++ /dev/null
@@ -1,254 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2016-01-04 15:03:57.940079", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "group_based_on", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Group Based On", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nBatch\nCourse", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "course", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Course", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Course", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "batch", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "student_group_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Student Group Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "course_code", 
-   "fieldtype": "Read Only", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Course Code", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "course.course_name", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "max_strength", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Max Strength", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-05-15 14:18:23.435415", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Student Group Creation Tool Course", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_group_instructor/student_group_instructor.json b/erpnext/schools/doctype/student_group_instructor/student_group_instructor.json
deleted file mode 100644
index 541e9b3..0000000
--- a/erpnext/schools/doctype/student_group_instructor/student_group_instructor.json
+++ /dev/null
@@ -1,129 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2017-04-17 16:06:01.406768", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "instructor", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Instructor", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Instructor", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "instructor_name", 
-   "fieldtype": "Read Only", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Instructor Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "instructor.instructor_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, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-04-17 16:06:05.792863", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Student Group Instructor", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_group_student/student_group_student.json b/erpnext/schools/doctype/student_group_student/student_group_student.json
deleted file mode 100644
index 5fc434a..0000000
--- a/erpnext/schools/doctype/student_group_student/student_group_student.json
+++ /dev/null
@@ -1,186 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2015-09-11 15:14:58.501830", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "fields": [
-  {
-   "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": 0, 
-   "in_list_view": 1, 
-   "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "student_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Student Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "group_roll_number", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Group Roll 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, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "1", 
-   "fieldname": "active", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Active", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-04-12 14:56:07.532226", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Student Group Student", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_guardian/student_guardian.json b/erpnext/schools/doctype/student_guardian/student_guardian.json
deleted file mode 100644
index b5f9d88..0000000
--- a/erpnext/schools/doctype/student_guardian/student_guardian.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2016-09-01 14:28:39.174471", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "guardian", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Guardian", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "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": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "guardian_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Guardian Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "relation", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Relation", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nMother\nFather\nOthers", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-02-17 17:13:53.507571", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Student Guardian", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_language/student_language.json b/erpnext/schools/doctype/student_language/student_language.json
deleted file mode 100644
index f3b4eb1..0000000
--- a/erpnext/schools/doctype/student_language/student_language.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "field:language_name", 
- "beta": 0, 
- "creation": "2017-02-21 01:55:00.366273", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "language_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Language Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-02-22 13:03:48.600707", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Student Language", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "", 
- "track_changes": 1, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_leave_application/student_leave_application.json b/erpnext/schools/doctype/student_leave_application/student_leave_application.json
deleted file mode 100644
index a081e14..0000000
--- a/erpnext/schools/doctype/student_leave_application/student_leave_application.json
+++ /dev/null
@@ -1,357 +0,0 @@
-{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "autoname": "SLA.######",
- "beta": 0,
- "creation": "2016-11-28 15:38:54.793854",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "",
- "editable_grid": 1,
- "engine": "InnoDB",
- "fields": [
-  {
-   "allow_bulk_edit": 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,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "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": "student.title",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_3",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "from_date",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "From Date",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "to_date",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "To Date",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "Will show the student as Present in Student Monthly Attendance Report",
-   "fieldname": "mark_as_present",
-   "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": "Mark as Present",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "section_break_5",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "reason",
-   "fieldtype": "Text",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Reason",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "amended_from",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Amended From",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Student Leave Application",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
-  }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 1,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2017-07-17 21:57:57.804413",
- "modified_by": "Administrator",
- "module": "Schools",
- "name": "Student Leave Application",
- "name_case": "",
- "owner": "Administrator",
- "permissions": [
-  {
-   "amend": 1,
-   "apply_user_permissions": 0,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Instructor",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 1,
-   "write": 1
-  },
-  {
-   "amend": 1,
-   "apply_user_permissions": 0,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Academics User",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  }
- ],
- "quick_entry": 1,
- "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
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_leave_application/test_student_leave_application.js b/erpnext/schools/doctype/student_leave_application/test_student_leave_application.js
deleted file mode 100644
index d7a6973..0000000
--- a/erpnext/schools/doctype/student_leave_application/test_student_leave_application.js
+++ /dev/null
@@ -1,69 +0,0 @@
-// Testing Attendance Module in Schools
-QUnit.module('schools');
-
-QUnit.test('Test: Student Leave Application', function(assert){
-	assert.expect(4);
-	let done = assert.async();
-	let student_code;
-	let leave_code;
-	frappe.run_serially([
-		() => frappe.db.get_value('Student', {'student_email_id': 'test2@testmail.com'}, 'name'),
-		(student) => {student_code = student.message.name;}, // fetching student code from db
-
-		() => {
-			return frappe.tests.make('Student Leave Application', [
-				{student: student_code},
-				{from_date: '2017-08-02'},
-				{to_date: '2017-08-04'},
-				{mark_as_present: 0},
-				{reason: "Sick Leave."}
-			]);
-		},
-		() => frappe.tests.click_button('Submit'), // Submitting the leave application
-		() => frappe.timeout(0.7),
-		() => frappe.tests.click_button('Yes'),
-		() => frappe.timeout(0.7),
-		() => {
-			assert.equal(cur_frm.doc.docstatus, 1, "Submitted leave application");
-			leave_code = frappe.get_route()[2];
-		},
-		() => frappe.tests.click_button('Cancel'), // Cancelling the leave application
-		() => frappe.timeout(0.7),
-		() => frappe.tests.click_button('Yes'),
-		() => frappe.timeout(1),
-		() => {assert.equal(cur_frm.doc.docstatus, 2, "Cancelled leave application");},
-		() => frappe.tests.click_button('Amend'), // Amending the leave application
-		() => frappe.timeout(1),
-		() => {
-			cur_frm.doc.mark_as_present = 1;
-			cur_frm.save();
-		},
-		() => frappe.timeout(0.7),
-		() => frappe.tests.click_button('Submit'),
-		() => frappe.timeout(0.7),
-		() => frappe.tests.click_button('Yes'),
-		() => frappe.timeout(0.7),
-		() => {assert.equal(cur_frm.doc.amended_from, leave_code, "Amended successfully");},
-
-		() => frappe.timeout(0.5),
-		() => {
-			return frappe.tests.make('Student Leave Application', [
-				{student: student_code},
-				{from_date: '2017-08-07'},
-				{to_date: '2017-08-09'},
-				{mark_as_present: 0},
-				{reason: "Sick Leave."}
-			]);
-		},
-		() => frappe.tests.click_button('Submit'),
-		() => frappe.timeout(0.7),
-		() => frappe.tests.click_button('Yes'),
-		() => frappe.timeout(0.7),
-		() => {
-			assert.equal(cur_frm.doc.docstatus, 1, "Submitted leave application");
-			leave_code = frappe.get_route()[2];
-		},
-
-		() => done()
-	]);
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_log/student_log.json b/erpnext/schools/doctype/student_log/student_log.json
deleted file mode 100644
index 81d7026..0000000
--- a/erpnext/schools/doctype/student_log/student_log.json
+++ /dev/null
@@ -1,400 +0,0 @@
-{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "autoname": "SLog.####",
- "beta": 0,
- "creation": "2016-07-29 03:27:22.451772",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "",
- "editable_grid": 1,
- "engine": "InnoDB",
- "fields": [
-  {
-   "allow_bulk_edit": 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": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 1,
-   "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,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "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": "student.title",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "type",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Type",
-   "length": 0,
-   "no_copy": 0,
-   "options": "General\nAcademic\nMedical\nAchievement",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "date",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Date",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_3",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 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": 0,
-   "in_standard_filter": 0,
-   "label": "Academic Year",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Academic Year",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 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,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 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": 0,
-   "in_standard_filter": 0,
-   "label": "Program",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Program",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "student_batch",
-   "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 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,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "section_break_5",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "log",
-   "fieldtype": "Text Editor",
-   "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": "Log",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
-  }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2017-07-17 21:57:11.024049",
- "modified_by": "Administrator",
- "module": "Schools",
- "name": "Student Log",
- "name_case": "",
- "owner": "Administrator",
- "permissions": [
-  {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Academics User",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
-   "write": 1
-  }
- ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "restrict_to_domain": "Education",
- "show_name_in_global_search": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "title_field": "student_name",
- "track_changes": 0,
- "track_seen": 1
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_log/test_student_log.js b/erpnext/schools/doctype/student_log/test_student_log.js
deleted file mode 100644
index 8f8d152..0000000
--- a/erpnext/schools/doctype/student_log/test_student_log.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// Testing Student Module in Schools
-QUnit.module('schools');
-
-QUnit.test('Test: Student Log', function(assert){
-	assert.expect(9);
-	let done = assert.async();
-	let student_code;
-	frappe.run_serially([
-		() => frappe.db.get_value('Student', {'student_email_id': 'test2@testmail.com'}, 'name'),
-		(student) => {student_code = student.message.name;},
-		() => {
-			return frappe.tests.make("Student Log", [
-				{student: student_code},
-				{academic_year: '2016-17'},
-				{academic_term: '2016-17 (Semester 1)'},
-				{program: "Standard Test"},
-				{date: '2017-07-31'},
-				{student_batch: 'A'},
-				{log: 'This is Test log.'}
-			]);
-		},
-		() => {
-			assert.equal(cur_frm.doc.student, student_code, 'Student code was fetched properly');
-			assert.equal(cur_frm.doc.student_name, 'Fname Mname Lname', 'Student name was correctly auto-fetched');
-			assert.equal(cur_frm.doc.type, 'General', 'Default type selected');
-			assert.equal(cur_frm.doc.academic_year, '2016-17');
-			assert.equal(cur_frm.doc.academic_term, '2016-17 (Semester 1)');
-			assert.equal(cur_frm.doc.program, 'Standard Test', 'Program correctly selected');
-			assert.equal(cur_frm.doc.student_batch, 'A');
-			assert.equal(cur_frm.doc.date, '2017-07-31');
-			assert.equal(cur_frm.doc.log, 'This is Test log.');
-		},
-		() => done()
-	]);
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_sibling/student_sibling.json b/erpnext/schools/doctype/student_sibling/student_sibling.json
deleted file mode 100644
index fb698d9..0000000
--- a/erpnext/schools/doctype/student_sibling/student_sibling.json
+++ /dev/null
@@ -1,279 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2016-09-01 14:41:23.824083", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 0, 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "studying_in_same_institute", 
-   "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": "Studying in Same Institute", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "NO\nYES", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 3, 
-   "fieldname": "full_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Full Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 1, 
-   "fieldname": "gender", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Gender", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nMale\nFemale", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.studying_in_same_institute == \"YES\"", 
-   "fieldname": "student", 
-   "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 ID", 
-   "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": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "depends_on": "eval:doc.studying_in_same_institute == \"NO\"", 
-   "fieldname": "institution", 
-   "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": "Institution", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "program", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Program", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "date_of_birth", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Date of Birth", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-03-08 11:26:41.717041", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Student Sibling", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_siblings/student_siblings.json b/erpnext/schools/doctype/student_siblings/student_siblings.json
deleted file mode 100644
index 4f1ed02..0000000
--- a/erpnext/schools/doctype/student_siblings/student_siblings.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2016-09-01 14:41:23.824083", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "name1", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "gender", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Gender", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nMale\nFemale", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "date_of_birth", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Date of Birth", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2016-09-01 14:41:23.824083", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Student Siblings", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/schools/report/absent_student_report/absent_student_report.json b/erpnext/schools/report/absent_student_report/absent_student_report.json
deleted file mode 100644
index 3a2e85f..0000000
--- a/erpnext/schools/report/absent_student_report/absent_student_report.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "add_total_row": 0, 
- "apply_user_permissions": 1, 
- "creation": "2013-05-13 14:04:03", 
- "disabled": 0, 
- "docstatus": 0, 
- "doctype": "Report", 
- "idx": 3, 
- "is_standard": "Yes", 
- "modified": "2017-02-24 20:03:01.035036", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Absent Student Report", 
- "owner": "Administrator", 
- "ref_doctype": "Student Attendance", 
- "report_name": "Absent Student Report", 
- "report_type": "Script Report", 
- "roles": [
-  {
-   "role": "Academics User"
-  }
- ]
-}
\ No newline at end of file
diff --git a/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.json b/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.json
deleted file mode 100644
index 6b089d2..0000000
--- a/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "add_total_row": 0, 
- "apply_user_permissions": 1, 
- "creation": "2017-05-05 14:46:13.776133", 
- "disabled": 0, 
- "docstatus": 0, 
- "doctype": "Report", 
- "idx": 0, 
- "is_standard": "Yes", 
- "modified": "2017-05-05 14:47:18.080385", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Course wise Assessment Report", 
- "owner": "Administrator", 
- "ref_doctype": "Assessment Result", 
- "report_name": "Course wise Assessment Report", 
- "report_type": "Script Report", 
- "roles": [
-  {
-   "role": "Academics User"
-  }
- ]
-}
\ No newline at end of file
diff --git a/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py b/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py
deleted file mode 100644
index 492d738..0000000
--- a/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-from frappe.utils import flt
-from collections import defaultdict
-from erpnext.schools.api import get_grade
-
-
-def execute(filters=None):
-	data = []
-
-	args = frappe._dict()
-	args["assessment_group"] = filters.get("assessment_group")
-	if args["assessment_group"] == "All Assessment Groups":
-		frappe.throw(_("Please select the assessment group other than 'All Assessment Groups'"))
-
-	args["course"] = filters.get("course")
-	args["student_group"] = filters.get("student_group")
-
-
-	# find all assessment plan and related details linked with the given filters
-	def get_assessment_details():
-		if args["student_group"]:
-			cond = "and ap.student_group=%(student_group)s"
-		else:
-			cond = ''
-
-		assessment_plan = frappe.db.sql('''
-			select
-				ap.name, ap.student_group, ap.grading_scale, apc.assessment_criteria, apc.maximum_score as max_score
-			from
-				`tabAssessment Plan` ap, `tabAssessment Plan Criteria` apc
-			where
-				ap.assessment_group=%(assessment_group)s and ap.course=%(course)s and
-				ap.name=apc.parent and ap.docstatus=1 {0}
-			order by
-				apc.assessment_criteria'''.format(cond), (args), as_dict=1)
-
-		assessment_plan_list = list(set([d["name"] for d in assessment_plan]))
-		if not assessment_plan_list:
-			frappe.throw(_("No assessment plan linked with this assessment group"))
-
-		assessment_criteria_list = list(set([(d["assessment_criteria"],d["max_score"]) for d in assessment_plan]))
-		student_group_list = list(set([d["student_group"] for d in assessment_plan]))
-		total_maximum_score = flt(sum([flt(d[1]) for d in assessment_criteria_list]))
-		grading_scale = assessment_plan[0]["grading_scale"]
-
-		return assessment_plan_list, assessment_criteria_list, total_maximum_score, grading_scale, student_group_list
-
-
-	# get all the result and make a dict map student as the key and value as dict of result
-	def get_result_map():
-		result_dict = defaultdict(dict)
-		kounter = defaultdict(dict)
-		assessment_result = frappe.db.sql('''select ar.student, ard.assessment_criteria, ard.grade, ard.score
-			from `tabAssessment Result` ar, `tabAssessment Result Detail` ard
-			where ar.assessment_plan in (%s) and ar.name=ard.parent and ar.docstatus=1
-			order by ard.assessment_criteria''' %', '.join(['%s']*len(assessment_plan_list)),
-			tuple(assessment_plan_list), as_dict=1)
-
-		for result in assessment_result:
-			if "total_score" in result_dict[result.student]:
-				total_score = result_dict[result.student]["total_score"] + result.score
-			else:
-				total_score = result.score
-			total = get_grade(grading_scale, (total_score/total_maximum_score)*100)
-
-			if result.grade in kounter[result.assessment_criteria]:
-				kounter[result.assessment_criteria][result.grade] += 1
-			else:
-				kounter[result.assessment_criteria].update({result.grade: 1})
-
-			if "Total" not in kounter:
-				kounter["Total"] = {}
-
-			if "total" in result_dict[result.student]:
-				prev_grade = result_dict[result.student]["total"]
-				prev_grade_count = kounter["Total"].get(prev_grade) - 1
-				kounter["Total"].update({prev_grade: prev_grade_count})
-			latest_grade_count = kounter["Total"].get(total)+1 if kounter["Total"].get(total) else 1
-			kounter["Total"].update({total: latest_grade_count})
-
-			result_dict[result.student].update({
-					frappe.scrub(result.assessment_criteria): result.grade,
-					frappe.scrub(result.assessment_criteria)+"_score": result.score,
-					"total_score": total_score,
-					"total": total
-				})
-
-		return result_dict, kounter
-
-	# make data from the result dict
-	def get_data():
-		student_list = frappe.db.sql('''select sgs.student, sgs.student_name
-			from `tabStudent Group` sg, `tabStudent Group Student` sgs
-			where sg.name = sgs.parent and sg.name in (%s)
-			order by sgs.group_roll_number asc''' %', '.join(['%s']*len(student_group_list)),
-			tuple(student_group_list), as_dict=1)
-
-		for student in student_list:
-			student.update(result_dict[student.student])
-		return student_list
-
-
-	# get chart data
-	def get_chart():
-		grading_scale = frappe.db.get_value("Assessment Plan", list(assessment_plan_list)[0], "grading_scale")
-		grades = frappe.db.sql_list('''select grade_code from `tabGrading Scale Interval` where parent=%s''',
-			(grading_scale))
-		criteria_list = [d[0] for d in assessment_criteria_list] + ["Total"]
-		return get_chart_data(grades, criteria_list, kounter)
-
-
-	assessment_plan_list, assessment_criteria_list, total_maximum_score, grading_scale,\
-		student_group_list = get_assessment_details()
-	result_dict, kounter = get_result_map()
-	data = get_data()
-
-	columns = get_column(assessment_criteria_list, total_maximum_score)
-	chart = get_chart()
-	data_to_be_printed = [{
-		"assessment_plan": ", ".join(assessment_plan_list)
-	}]
-
-	return columns, data, None, chart, data_to_be_printed
-
-def get_column(assessment_criteria, total_maximum_score):
-	columns = [{
-		"fieldname": "student",
-		"label": _("Student ID"),
-		"fieldtype": "Link",
-		"options": "Student",
-		"width": 90
-	},
-	{
-		"fieldname": "student_name",
-		"label": _("Student Name"),
-		"fieldtype": "Data",
-		"width": 160
-	}]
-	for d in assessment_criteria:
-		columns.append({
-			"fieldname": frappe.scrub(d[0]),
-			"label": d[0],
-			"fieldtype": "Data",
-			"width": 110
-		})
-		columns.append({
-			"fieldname": frappe.scrub(d[0]) +"_score",
-			"label": "Score(" + str(int(d[1])) + ")",
-			"fieldtype": "Float",
-			"width": 100
-		})
-
-	columns += [{
-		"fieldname": "total",
-		"label": "Total",
-		"fieldtype": "Data",
-		"width": 100
-	},
-	{
-		"fieldname": "total_score",
-		"label": "Total Score("+ str(int(total_maximum_score)) + ")",
-		"fieldtype": "Float",
-		"width": 110
-	}]
-
-	return columns
-
-def get_chart_data(grades, assessment_criteria_list, kounter):
-	grades = sorted(grades)
-	datasets = []
-
-	for grade in grades:
-		tmp = frappe._dict({"values":[], "title": grade})
-		for criteria in assessment_criteria_list:
-			if grade in kounter[criteria]:
-				tmp["values"].append(kounter[criteria][grade])
-			else:
-				tmp["values"].append(0)
-		datasets.append(tmp)
-
-	return {
-		"data": {
-			"labels": assessment_criteria_list,
-			"datasets": datasets
-		},
-		"type": 'bar',
-	}
diff --git a/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.json b/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.json
deleted file mode 100644
index e822549..0000000
--- a/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "add_total_row": 0, 
- "apply_user_permissions": 1, 
- "creation": "2017-03-27 17:47:16.831433", 
- "disabled": 0, 
- "docstatus": 0, 
- "doctype": "Report", 
- "idx": 0, 
- "is_standard": "Yes", 
- "modified": "2017-03-27 18:34:08.867661", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Student and Guardian Contact Details", 
- "owner": "Administrator", 
- "ref_doctype": "Program Enrollment", 
- "report_name": "Student and Guardian Contact Details", 
- "report_type": "Script Report", 
- "roles": [
-  {
-   "role": "Instructor"
-  }, 
-  {
-   "role": "Academics User"
-  }
- ]
-}
\ No newline at end of file
diff --git a/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.json b/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.json
deleted file mode 100644
index 7851cbb..0000000
--- a/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "add_total_row": 0, 
- "apply_user_permissions": 1, 
- "creation": "2016-11-28 22:07:03.859124", 
- "disabled": 0, 
- "docstatus": 0, 
- "doctype": "Report", 
- "idx": 2, 
- "is_standard": "Yes", 
- "modified": "2017-02-24 20:02:33.773899", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Student Batch-Wise Attendance", 
- "owner": "Administrator", 
- "ref_doctype": "Student Attendance", 
- "report_name": "Student Batch-Wise Attendance", 
- "report_type": "Script Report", 
- "roles": [
-  {
-   "role": "Academics User"
-  }
- ]
-}
\ No newline at end of file
diff --git a/erpnext/schools/report/student_fee_collection/student_fee_collection.json b/erpnext/schools/report/student_fee_collection/student_fee_collection.json
deleted file mode 100644
index 5c63765..0000000
--- a/erpnext/schools/report/student_fee_collection/student_fee_collection.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "add_total_row": 0, 
- "apply_user_permissions": 1, 
- "creation": "2016-06-22 02:58:41.024538", 
- "disabled": 0, 
- "docstatus": 0, 
- "doctype": "Report", 
- "idx": 3, 
- "is_standard": "Yes", 
- "modified": "2017-10-25 11:59:26.003899", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Student Fee Collection", 
- "owner": "Administrator", 
- "query": "SELECT\n student as \"Student:Link/Student:200\",\n student_name as \"Student Name::200\",\n sum(paid_amount) as \"Paid Amount:Currency:150\",\n sum(outstanding_amount) as \"Outstanding Amount:Currency:150\",\n sum(grand_total) as \"Grand Total:Currency:150\"\nFROM\n `tabFees` \nGROUP BY\n student", 
- "ref_doctype": "Fees", 
- "report_name": "Student Fee Collection", 
- "report_type": "Query Report", 
- "roles": [
-  {
-   "role": "Academics User"
-  }
- ]
-}
\ No newline at end of file
diff --git a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js
deleted file mode 100644
index 943238e..0000000
--- a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-
-frappe.query_reports["Student Monthly Attendance Sheet"] = {
-	"filters": [{
-		"fieldname": "month",
-		"label": __("Month"),
-		"fieldtype": "Select",
-		"options": "Jan\nFeb\nMar\nApr\nMay\nJun\nJul\nAug\nSep\nOct\nNov\nDec",
-		"default": ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov",
-			"Dec"
-		][frappe.datetime.str_to_obj(frappe.datetime.get_today()).getMonth()],
-	},
-	{
-		"fieldname": "year",
-		"label": __("Year"),
-		"fieldtype": "Select",
-		"reqd": 1
-	},
-	{
-		"fieldname": "student_group",
-		"label": __("Student Group"),
-		"fieldtype": "Link",
-		"options": "Student Group",
-		"reqd": 1
-	}
-	],
-
-	"onload": function() {
-		return frappe.call({
-			method: "erpnext.schools.report.student_monthly_attendance_sheet.student_monthly_attendance_sheet.get_attendance_years",
-			callback: function(r) {
-				var year_filter = frappe.query_report_filters_by_name.year;
-				year_filter.df.options = r.message;
-				year_filter.df.default = r.message.split("\n")[0];
-				year_filter.refresh();
-				year_filter.set_input(year_filter.df.default);
-			}
-		});
-	}
-}
\ No newline at end of file
diff --git a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.json b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.json
deleted file mode 100644
index a6531de..0000000
--- a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "add_total_row": 0, 
- "apply_user_permissions": 1, 
- "creation": "2013-05-13 14:04:03", 
- "disabled": 0, 
- "docstatus": 0, 
- "doctype": "Report", 
- "idx": 3, 
- "is_standard": "Yes", 
- "modified": "2017-02-24 20:02:41.910358", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Student Monthly Attendance Sheet", 
- "owner": "Administrator", 
- "ref_doctype": "Student Attendance", 
- "report_name": "Student Monthly Attendance Sheet", 
- "report_type": "Script Report", 
- "roles": [
-  {
-   "role": "Academics User"
-  }
- ]
-}
\ No newline at end of file
diff --git a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py
deleted file mode 100644
index d869cec..0000000
--- a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.utils import cstr, cint, getdate, get_first_day, get_last_day, date_diff, add_days
-from frappe import msgprint, _
-from calendar import monthrange
-from erpnext.schools.api import get_student_group_students
-
-def execute(filters=None):
-	if not filters: filters = {}
-
-	from_date = get_first_day(filters["month"] + '-' + filters["year"])
-	to_date = get_last_day(filters["month"] + '-' + filters["year"])
-	total_days_in_month = date_diff(to_date, from_date) +1
-	columns = get_columns(total_days_in_month)
-	students = get_student_group_students(filters.get("student_group"),1)
-	students_list = get_students_list(students)
-	att_map = get_attendance_list(from_date, to_date, filters.get("student_group"), students_list)
-	data = []
-	for stud in students:
-		row = [stud.student, stud.student_name]
-		student_status = frappe.db.get_value("Student", stud.student, "enabled")
-		date = from_date
-		total_p = total_a = 0.0
-		for day in range(total_days_in_month):
-			status="None"
-			if att_map.get(stud.student):
-				status = att_map.get(stud.student).get(date, "None")
-			elif not student_status:
-				status = "Inactive"
-			else:
-				status = "None"
-			status_map = {"Present": "P", "Absent": "A", "None": "", "Inactive":"-"}
-			row.append(status_map[status])
-			if status == "Present":
-				total_p += 1
-			elif status == "Absent":
-				total_a += 1
-			date = add_days(date, 1)
-		row += [total_p, total_a]
-		data.append(row)
-	return columns, data
-
-def get_columns(days_in_month):
-	columns = [ _("Student") + ":Link/Student:90", _("Student Name") + "::150"]
-	for day in range(days_in_month):
-		columns.append(cstr(day+1) +"::20")
-	columns += [_("Total Present") + ":Int:95", _("Total Absent") + ":Int:90"]
-	return columns
-
-def get_students_list(students):
-	student_list = []
-	for stud in students:
-		student_list.append(stud.student)
-	return student_list
-
-def get_attendance_list(from_date, to_date, student_group, students_list):
-	attendance_list = frappe.db.sql('''select student, date, status 
-		from `tabStudent Attendance` where student_group = %s 
-		and date between %s and %s
-		order by student, date''',
-		(student_group, from_date, to_date), as_dict=1)
-	att_map = {}
-	students_with_leave_application = get_students_with_leave_application(from_date, to_date, students_list)
-	for d in attendance_list:
-		att_map.setdefault(d.student, frappe._dict()).setdefault(d.date, "")
-		if students_with_leave_application.get(d.date) and d.student in students_with_leave_application.get(d.date):
-			att_map[d.student][d.date] = "Present"
-		else:
-			att_map[d.student][d.date] = d.status
-	return att_map
-
-def get_students_with_leave_application(from_date, to_date, students_list):
-	leave_applications = frappe.db.sql("""
-		select student, from_date, to_date 
-		from `tabStudent Leave Application` 
-		where 
-			mark_as_present and docstatus = 1
-			and student in %(students)s
-			and (
-				from_date between %(from_date)s and %(to_date)s
-				or to_date between %(from_date)s and %(to_date)s
-				or (%(from_date)s between from_date and to_date and %(to_date)s between from_date and to_date)
-			)
-		""", {
-			"students": students_list,
-			"from_date": from_date,
-			"to_date": to_date
-		}, as_dict=True)
-	students_with_leaves= {}
-	for application in leave_applications:
-		for date in daterange(application.from_date, application.to_date):
-			students_with_leaves.setdefault(date, []).append(application.student)
-
-	return students_with_leaves
-
-def daterange(d1, d2):
-	import datetime
-	return (d1 + datetime.timedelta(days=i) for i in range((d2 - d1).days + 1))
-
-@frappe.whitelist()
-def get_attendance_years():
-	year_list = frappe.db.sql_list('''select distinct YEAR(date) from `tabStudent Attendance` ORDER BY YEAR(date) DESC''')
-	if not year_list:
-		year_list = [getdate().year]
-	return "\n".join(str(year) for year in year_list)
diff --git a/erpnext/schools/utils.py b/erpnext/schools/utils.py
deleted file mode 100644
index 2ca46d5..0000000
--- a/erpnext/schools/utils.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies and contributors
-# For lice
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-
-class OverlapError(frappe.ValidationError): pass
-
-def validate_overlap_for(doc, doctype, fieldname, value=None):
-	"""Checks overlap for specified field.
-	
-	:param fieldname: Checks Overlap for this field 
-	"""
-	
-	existing = get_overlap_for(doc, doctype, fieldname, value)
-	if existing:
-		frappe.throw(_("This {0} conflicts with {1} for {2} {3}").format(doc.doctype, existing.name,
-			doc.meta.get_label(fieldname) if not value else fieldname , value or doc.get(fieldname)), OverlapError)
-	
-def get_overlap_for(doc, doctype, fieldname, value=None):
-	"""Returns overlaping document for specified field.
-	
-	:param fieldname: Checks Overlap for this field 
-	"""
-
-	existing = frappe.db.sql("""select name, from_time, to_time from `tab{0}`
-		where `{1}`=%(val)s and schedule_date = %(schedule_date)s and
-		(
-			(from_time > %(from_time)s and from_time < %(to_time)s) or
-			(to_time > %(from_time)s and to_time < %(to_time)s) or
-			(%(from_time)s > from_time and %(from_time)s < to_time) or
-			(%(from_time)s = from_time and %(to_time)s = to_time))
-		and name!=%(name)s""".format(doctype, fieldname),
-		{
-			"schedule_date": doc.schedule_date,
-			"val": value or doc.get(fieldname),
-			"from_time": doc.from_time,
-			"to_time": doc.to_time,
-			"name": doc.name or "No Name"
-		}, as_dict=True)
-
-	return existing[0] if existing else None
-	
-def validate_duplicate_student(students):
-	unique_students= []
-	for stud in students:
-		if stud.student in unique_students:
-			frappe.throw(_("Student {0} - {1} appears Multiple times in row {2} & {3}")
-				.format(stud.student, stud.student_name, unique_students.index(stud.student)+1, stud.idx))
-		else:
-			unique_students.append(stud.student)
diff --git a/erpnext/schools/web_form/discussion/__init__.py b/erpnext/schools/web_form/discussion/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/schools/web_form/discussion/__init__.py
+++ /dev/null
diff --git a/erpnext/schools/web_form/discussion/discussion.js b/erpnext/schools/web_form/discussion/discussion.js
deleted file mode 100644
index 4130b0c..0000000
--- a/erpnext/schools/web_form/discussion/discussion.js
+++ /dev/null
@@ -1,4 +0,0 @@
-frappe.ready(function() {
-	var form = $('form[data-web-form="discussion"]'),
-		owner = form.attr('data-owner');
-})
\ No newline at end of file
diff --git a/erpnext/schools/web_form/discussion/discussion.json b/erpnext/schools/web_form/discussion/discussion.json
deleted file mode 100644
index 4a781d1..0000000
--- a/erpnext/schools/web_form/discussion/discussion.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
- "allow_comments": 1, 
- "allow_delete": 1, 
- "allow_edit": 1, 
- "allow_multiple": 1, 
- "creation": "2016-06-26 20:46:09.598755", 
- "doc_type": "Discussion", 
- "docstatus": 0, 
- "doctype": "Web Form", 
- "idx": 0, 
- "is_standard": 1, 
- "login_required": 1, 
- "modified": "2016-07-19 07:55:37.826664", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "discussion", 
- "owner": "Administrator", 
- "published": 1, 
- "route": "discussion", 
- "success_url": "", 
- "title": "Discussion", 
- "web_form_fields": [
-  {
-   "fieldname": "course", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "label": "Course", 
-   "options": "Course", 
-   "read_only": 1, 
-   "reqd": 0
-  }, 
-  {
-   "fieldname": "subject", 
-   "fieldtype": "Text", 
-   "hidden": 0, 
-   "label": "Subject", 
-   "read_only": 0, 
-   "reqd": 1
-  }, 
-  {
-   "fieldname": "description", 
-   "fieldtype": "Text", 
-   "hidden": 0, 
-   "label": "Description", 
-   "read_only": 0, 
-   "reqd": 0
-  }
- ]
-}
\ No newline at end of file
diff --git a/erpnext/schools/web_form/discussion/discussion.py b/erpnext/schools/web_form/discussion/discussion.py
deleted file mode 100644
index 23ff052..0000000
--- a/erpnext/schools/web_form/discussion/discussion.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from __future__ import unicode_literals
-
-import frappe
-
-def get_context(context=None):
-	pass
-
-def has_website_permission(doc, ptype, user, verbose=False):
-	return True
\ No newline at end of file
diff --git a/erpnext/schools/web_form/student_applicant/student_applicant.json b/erpnext/schools/web_form/student_applicant/student_applicant.json
deleted file mode 100644
index f87a147..0000000
--- a/erpnext/schools/web_form/student_applicant/student_applicant.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
- "accept_payment": 0, 
- "allow_comments": 0, 
- "allow_delete": 0, 
- "allow_edit": 1, 
- "allow_incomplete": 0, 
- "allow_multiple": 1, 
- "allow_print": 0, 
- "amount": 0.0, 
- "amount_based_on_field": 0, 
- "creation": "2016-09-22 13:10:10.792735", 
- "doc_type": "Student Applicant", 
- "docstatus": 0, 
- "doctype": "Web Form", 
- "idx": 0, 
- "is_standard": 1, 
- "login_required": 1, 
- "max_attachment_size": 0, 
- "modified": "2017-02-21 04:44:46.022738", 
- "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "student-applicant", 
- "owner": "Administrator", 
- "payment_button_label": "Buy Now", 
- "published": 1, 
- "route": "student-applicant", 
- "show_sidebar": 1, 
- "sidebar_items": [], 
- "success_url": "/student-applicant", 
- "title": "Student Applicant", 
- "web_form_fields": [
-  {
-   "fieldname": "first_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "label": "First Name", 
-   "max_length": 0, 
-   "max_value": 0, 
-   "read_only": 0, 
-   "reqd": 1
-  }, 
-  {
-   "fieldname": "middle_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "label": "Middle Name", 
-   "max_length": 0, 
-   "max_value": 0, 
-   "read_only": 0, 
-   "reqd": 0
-  }, 
-  {
-   "fieldname": "last_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "label": "Last Name", 
-   "max_length": 0, 
-   "max_value": 0, 
-   "read_only": 0, 
-   "reqd": 0
-  }, 
-  {
-   "fieldname": "image", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "label": "Image", 
-   "max_length": 0, 
-   "max_value": 0, 
-   "read_only": 0, 
-   "reqd": 0
-  }, 
-  {
-   "fieldname": "program", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "label": "Program", 
-   "max_length": 0, 
-   "max_value": 0, 
-   "options": "Program", 
-   "read_only": 0, 
-   "reqd": 1
-  }, 
-  {
-   "fieldname": "academic_year", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "label": "Academic Year", 
-   "max_length": 0, 
-   "max_value": 0, 
-   "options": "Academic Year", 
-   "read_only": 0, 
-   "reqd": 0
-  }, 
-  {
-   "fieldname": "date_of_birth", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "label": "Date of Birth", 
-   "max_length": 0, 
-   "max_value": 0, 
-   "read_only": 0, 
-   "reqd": 0
-  }, 
-  {
-   "fieldname": "blood_group", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "label": "Blood Group", 
-   "max_length": 0, 
-   "max_value": 0, 
-   "options": "\nA+\nA-\nB+\nB-\nO+\nO-\nAB+\nAB-", 
-   "read_only": 0, 
-   "reqd": 0
-  }, 
-  {
-   "fieldname": "student_email_id", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "label": "Student Email ID", 
-   "max_length": 0, 
-   "max_value": 0, 
-   "read_only": 0, 
-   "reqd": 0
-  }, 
-  {
-   "fieldname": "student_mobile_number", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "label": "Student Mobile Number", 
-   "max_length": 0, 
-   "max_value": 0, 
-   "read_only": 0, 
-   "reqd": 0
-  }, 
-  {
-   "default": "INDIAN", 
-   "fieldname": "nationality", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "label": "Nationality", 
-   "max_length": 0, 
-   "max_value": 0, 
-   "options": "", 
-   "read_only": 0, 
-   "reqd": 0
-  }, 
-  {
-   "fieldname": "address_line_1", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "label": "Address Line 1", 
-   "max_length": 0, 
-   "max_value": 0, 
-   "read_only": 0, 
-   "reqd": 0
-  }, 
-  {
-   "fieldname": "address_line_2", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "label": "Address Line 2", 
-   "max_length": 0, 
-   "max_value": 0, 
-   "read_only": 0, 
-   "reqd": 0
-  }, 
-  {
-   "fieldname": "pincode", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "label": "Pincode", 
-   "max_length": 0, 
-   "max_value": 0, 
-   "read_only": 0, 
-   "reqd": 0
-  }, 
-  {
-   "fieldname": "guardians", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "label": "Guardians", 
-   "max_length": 0, 
-   "max_value": 0, 
-   "options": "Student Guardian", 
-   "read_only": 0, 
-   "reqd": 0
-  }, 
-  {
-   "fieldname": "siblings", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "label": "Siblings", 
-   "max_length": 0, 
-   "max_value": 0, 
-   "options": "Student Sibling", 
-   "read_only": 0, 
-   "reqd": 0
-  }
- ]
-}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index 52c6b6d..fd9d0a1 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -786,7 +786,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
-   "collapsible_depends_on": "eval:doc.credit_days || doc.credit_limit", 
+   "collapsible_depends_on": "", 
    "columns": 0, 
    "fieldname": "credit_limit_section", 
    "fieldtype": "Section Break", 
@@ -797,7 +797,7 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Credit Limit", 
+   "label": "Credit Limit and Payment Terms", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -810,70 +810,7 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0, 
-   "width": "50%"
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "credit_days_based_on", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Credit Days Based On", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nFixed Days\nLast Day of the Next Month", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.credit_days_based_on=='Fixed Days'", 
-   "fieldname": "credit_days", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Credit Days", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "credit_days", 
-   "oldfieldtype": "Int", 
-   "permlevel": 1, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "width": ""
   }, 
   {
    "allow_bulk_edit": 0, 
@@ -911,6 +848,69 @@
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "payment_terms", 
+   "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": "Default Payment Terms Template", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Payment Terms Template", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "bypass_credit_limit_check_at_sales_order", 
+   "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": "Bypass credit limit check at Sales Order", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "customer_details", 
    "columns": 0, 
@@ -1202,7 +1202,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-07-24 00:55:07.445783", 
+ "modified": "2017-11-23 17:41:23.243421", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Customer", 
diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index 64cd190..8e45921 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -88,30 +88,44 @@
 					address.append('links', dict(link_doctype='Customer', link_name=self.name))
 					address.save()
 
-			lead = frappe.db.get_value("Lead", self.lead_name, ["lead_name", "email_id", "phone", "mobile_no", "gender", "salutation"], as_dict=True)
+			lead = frappe.db.get_value("Lead", self.lead_name, ["organization_lead", "lead_name", "email_id", "phone", "mobile_no", "gender", "salutation"], as_dict=True)
 
 			if not lead.lead_name:
 				frappe.throw(_("Please mention the Lead Name in Lead {0}").format(self.lead_name))
 
-			lead.lead_name = lead.lead_name.split(" ")
-			lead.first_name = lead.lead_name[0]
-			lead.last_name = " ".join(lead.lead_name[1:])
+			if lead.organization_lead:
+				contact_names = frappe.get_all('Dynamic Link', filters={
+									"parenttype":"Contact",
+									"link_doctype":"Lead",
+									"link_name":self.lead_name
+								}, fields=["parent as name"])
 
-			# create contact from lead
-			contact = frappe.new_doc('Contact')
-			contact.first_name = lead.first_name
-			contact.last_name = lead.last_name
-			contact.gender = lead.gender
-			contact.salutation = lead.salutation
-			contact.email_id = lead.email_id
-			contact.phone = lead.phone
-			contact.mobile_no = lead.mobile_no
-			contact.is_primary_contact = 1
-			contact.append('links', dict(link_doctype='Customer', link_name=self.name))
-			contact.flags.ignore_permissions = self.flags.ignore_permissions
-			contact.autoname()
-			if not frappe.db.exists("Contact", contact.name):
-				contact.insert()
+				for contact_name in contact_names:
+					contact = frappe.get_doc('Contact', contact_name.get('name'))
+					if not contact.has_link('Customer', self.name):
+						contact.append('links', dict(link_doctype='Customer', link_name=self.name))
+						contact.save()
+
+			else:
+				lead.lead_name = lead.lead_name.split(" ")
+				lead.first_name = lead.lead_name[0]
+				lead.last_name = " ".join(lead.lead_name[1:])
+
+				# create contact from lead
+				contact = frappe.new_doc('Contact')
+				contact.first_name = lead.first_name
+				contact.last_name = lead.last_name
+				contact.gender = lead.gender
+				contact.salutation = lead.salutation
+				contact.email_id = lead.email_id
+				contact.phone = lead.phone
+				contact.mobile_no = lead.mobile_no
+				contact.is_primary_contact = 1
+				contact.append('links', dict(link_doctype='Customer', link_name=self.name))
+				contact.flags.ignore_permissions = self.flags.ignore_permissions
+				contact.autoname()
+				if not frappe.db.exists("Contact", contact.name):
+					contact.insert()
 
 	def validate_name_with_customer_group(self):
 		if frappe.db.exists("Customer Group", self.name):
@@ -170,23 +184,30 @@
 			throw(_("Please contact to the user who have Sales Master Manager {0} role")
 				.format(" / " + credit_controller if credit_controller else ""))
 
-def get_customer_outstanding(customer, company):
+def get_customer_outstanding(customer, company, ignore_outstanding_sales_order=False):
 	# Outstanding based on GL Entries
-	outstanding_based_on_gle = frappe.db.sql("""select sum(debit) - sum(credit)
-		from `tabGL Entry` where party_type = 'Customer' and party = %s and company=%s""", (customer, company))
+	outstanding_based_on_gle = frappe.db.sql("""
+		select sum(debit) - sum(credit)
+		from `tabGL Entry`
+		where party_type = 'Customer' and party = %s and company=%s""", (customer, company))
 
 	outstanding_based_on_gle = flt(outstanding_based_on_gle[0][0]) if outstanding_based_on_gle else 0
 
 	# Outstanding based on Sales Order
-	outstanding_based_on_so = frappe.db.sql("""
-		select sum(base_grand_total*(100 - per_billed)/100)
-		from `tabSales Order`
-		where customer=%s and docstatus = 1 and company=%s
-		and per_billed < 100 and status != 'Closed'""", (customer, company))
+	outstanding_based_on_so = 0.0
 
-	outstanding_based_on_so = flt(outstanding_based_on_so[0][0]) if outstanding_based_on_so else 0.0
+	# if credit limit check is bypassed at sales order level,
+	# we should not consider outstanding Sales Orders, when customer credit balance report is run
+	if not ignore_outstanding_sales_order:
+		outstanding_based_on_so = frappe.db.sql("""
+			select sum(base_grand_total*(100 - per_billed)/100)
+			from `tabSales Order`
+			where customer=%s and docstatus = 1 and company=%s
+			and per_billed < 100 and status != 'Closed'""", (customer, company))
 
-	# Outstanding based on Delivery Note
+		outstanding_based_on_so = flt(outstanding_based_on_so[0][0]) if outstanding_based_on_so else 0.0
+
+	# Outstanding based on Delivery Note, which are not created against Sales Order
 	unmarked_delivery_note_items = frappe.db.sql("""select
 			dn_item.name, dn_item.amount, dn.base_net_total, dn.base_grand_total
 		from `tabDelivery Note` dn, `tabDelivery Note Item` dn_item
@@ -215,7 +236,8 @@
 	credit_limit = None
 
 	if customer:
-		credit_limit, customer_group = frappe.db.get_value("Customer", customer, ["credit_limit", "customer_group"])
+		credit_limit, customer_group = frappe.db.get_value("Customer",
+			customer, ["credit_limit", "customer_group"])
 
 		if not credit_limit:
 			credit_limit = frappe.db.get_value("Customer Group", customer_group, "credit_limit")
diff --git a/erpnext/selling/doctype/customer/test_customer.js b/erpnext/selling/doctype/customer/test_customer.js
new file mode 100644
index 0000000..65b81af
--- /dev/null
+++ b/erpnext/selling/doctype/customer/test_customer.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Customer", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Customer
+		() => frappe.tests.make('Customer', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/selling/doctype/customer/test_customer.py b/erpnext/selling/doctype/customer/test_customer.py
index 40ed6f9..45546e3 100644
--- a/erpnext/selling/doctype/customer/test_customer.py
+++ b/erpnext/selling/doctype/customer/test_customer.py
@@ -6,6 +6,7 @@
 import frappe
 import unittest
 
+from erpnext.accounts.party import get_due_date
 from frappe.test_runner import make_test_records
 from erpnext.exceptions import PartyFrozen, PartyDisabled
 from frappe.utils import flt
@@ -13,7 +14,7 @@
 from erpnext.tests.utils import create_test_contact_and_address
 
 test_ignore = ["Price List"]
-
+test_dependencies = ['Payment Term', 'Payment Terms Template']
 test_records = frappe.get_test_records('Customer')
 
 class TestCustomer(unittest.TestCase):
@@ -181,6 +182,35 @@
 		customer.credit_limit = flt(outstanding_amt - 100)
 		self.assertRaises(frappe.ValidationError, customer.save)
 
+	def test_customer_payment_terms(self):
+		frappe.db.set_value(
+			"Customer", "_Test Customer With Template", "payment_terms", "_Test Payment Term Template 3")
+
+		due_date = get_due_date("2016-01-22", "Customer", "_Test Customer With Template")
+		self.assertEqual(due_date, "2016-02-21")
+
+		due_date = get_due_date("2017-01-22", "Customer", "_Test Customer With Template")
+		self.assertEqual(due_date, "2017-02-21")
+
+		frappe.db.set_value(
+			"Customer", "_Test Customer With Template", "payment_terms", "_Test Payment Term Template 1")
+
+		due_date = get_due_date("2016-01-22", "Customer", "_Test Customer With Template")
+		self.assertEqual(due_date, "2016-02-29")
+
+		due_date = get_due_date("2017-01-22", "Customer", "_Test Customer With Template")
+		self.assertEqual(due_date, "2017-02-28")
+
+		frappe.db.set_value("Customer", "_Test Customer With Template", "payment_terms", "")
+
+		# No default payment term template attached
+		due_date = get_due_date("2016-01-22", "Customer", "_Test Customer")
+		self.assertEqual(due_date, "2016-01-22")
+
+		due_date = get_due_date("2017-01-22", "Customer", "_Test Customer")
+		self.assertEqual(due_date, "2017-01-22")
+
+
 def get_customer_dict(customer_name):
 	return {
 		 "customer_group": "_Test Customer Group",
diff --git a/erpnext/selling/doctype/customer/test_records.json b/erpnext/selling/doctype/customer/test_records.json
index 94f14ed..a012c1b 100644
--- a/erpnext/selling/doctype/customer/test_records.json
+++ b/erpnext/selling/doctype/customer/test_records.json
@@ -1,6 +1,20 @@
 [
  {
   "customer_group": "_Test Customer Group",
+  "customer_name": "_Test Customer With Template",
+  "customer_type": "Individual",
+  "doctype": "Customer",
+  "territory": "_Test Territory"
+ },
+ {
+  "customer_group": "_Test Customer Group",
+  "customer_name": "_Test Customer P",
+  "customer_type": "Individual",
+  "doctype": "Customer",
+  "territory": "_Test Territory"
+ },
+ {
+  "customer_group": "_Test Customer Group",
   "customer_name": "_Test Customer",
   "customer_type": "Individual",
   "doctype": "Customer",
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index fe41426..1fec2ed 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -222,6 +222,7 @@
    "label": "Customer Name", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "customer.customer_name", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -1294,6 +1295,36 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "total_net_weight", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Net Weight", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -2155,6 +2186,100 @@
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 0, 
+   "collapsible_depends_on": "", 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "payment_schedule_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payment Terms", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "payment_terms_template", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payment Terms Template", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Payment Terms Template", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "payment_schedule", 
+   "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": "Payment Schedule", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Payment Schedule", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "terms", 
    "columns": 0, 
@@ -2756,7 +2881,7 @@
  "istable": 0, 
  "max_attachments": 1, 
  "menu_index": 0, 
- "modified": "2017-09-19 11:22:15.268846", 
+ "modified": "2017-11-29 14:10:44.067669", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Quotation", 
diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py
index f0cce5f..6d9c170 100644
--- a/erpnext/selling/doctype/quotation/quotation.py
+++ b/erpnext/selling/doctype/quotation/quotation.py
@@ -168,6 +168,48 @@
 
 	return doclist
 
+@frappe.whitelist()
+def make_sales_invoice(source_name, target_doc=None):
+	return _make_sales_invoice(source_name, target_doc)
+
+def _make_sales_invoice(source_name, target_doc=None, ignore_permissions=False):
+	customer = _make_customer(source_name, ignore_permissions)
+
+	def set_missing_values(source, target):
+		if customer:
+			target.customer = customer.name
+			target.customer_name = customer.customer_name
+		target.ignore_pricing_rule = 1
+		target.flags.ignore_permissions = ignore_permissions
+		target.run_method("set_missing_values")
+		target.run_method("calculate_taxes_and_totals")
+
+	def update_item(obj, target, source_parent):
+		target.stock_qty = flt(obj.qty) * flt(obj.conversion_factor)
+
+	doclist = get_mapped_doc("Quotation", source_name, {
+			"Quotation": {
+				"doctype": "Sales Invoice",
+				"validation": {
+					"docstatus": ["=", 1]
+				}
+			},
+			"Quotation Item": {
+				"doctype": "Sales Invoice Item",
+				"postprocess": update_item
+			},
+			"Sales Taxes and Charges": {
+				"doctype": "Sales Taxes and Charges",
+				"add_if_empty": True
+			},
+			"Sales Team": {
+				"doctype": "Sales Team",
+				"add_if_empty": True
+			}
+		}, target_doc, set_missing_values, ignore_permissions=ignore_permissions)
+
+	return doclist	
+
 def _make_customer(source_name, ignore_permissions=False):
 	quotation = frappe.db.get_value("Quotation", source_name, ["lead", "order_type", "customer"])
 	if quotation and quotation[0] and not quotation[2]:
diff --git a/erpnext/selling/doctype/quotation/test_quotation.py b/erpnext/selling/doctype/quotation/test_quotation.py
index d7d84c7..e79d46a 100644
--- a/erpnext/selling/doctype/quotation/test_quotation.py
+++ b/erpnext/selling/doctype/quotation/test_quotation.py
@@ -8,7 +8,29 @@
 
 test_dependencies = ["Product Bundle"]
 
+
 class TestQuotation(unittest.TestCase):
+	def test_make_quotation_without_terms(self):
+		quotation = make_quotation(do_not_save=1)
+		self.assertFalse(quotation.get('payment_schedule'))
+
+		quotation.insert()
+
+		self.assertTrue(quotation.payment_schedule)
+
+	def test_make_sales_order_terms_not_copied(self):
+		from erpnext.selling.doctype.quotation.quotation import make_sales_order
+
+		quotation = frappe.copy_doc(test_records[0])
+		quotation.transaction_date = nowdate()
+		quotation.valid_till = add_months(quotation.transaction_date, 1)
+		quotation.insert()
+		quotation.submit()
+
+		sales_order = make_sales_order(quotation.name)
+
+		self.assertFalse(sales_order.get('payment_schedule'))
+
 	def test_make_sales_order(self):
 		from erpnext.selling.doctype.quotation.quotation import make_sales_order
 
@@ -33,6 +55,46 @@
 		sales_order.transaction_date = nowdate()
 		sales_order.insert()
 
+	def test_make_sales_order_with_terms(self):
+		from erpnext.selling.doctype.quotation.quotation import make_sales_order
+
+		quotation = frappe.copy_doc(test_records[0])
+		quotation.transaction_date = nowdate()
+		quotation.valid_till = add_months(quotation.transaction_date, 1)
+		quotation.update(
+			{"payment_terms_template": "_Test Payment Term Template"}
+		)
+		quotation.insert()
+
+		self.assertRaises(frappe.ValidationError, make_sales_order, quotation.name)
+		quotation.save()
+		quotation.submit()
+
+		self.assertEqual(quotation.payment_schedule[0].payment_amount, 8906.00)
+		self.assertEqual(quotation.payment_schedule[0].due_date, quotation.transaction_date)
+		self.assertEqual(quotation.payment_schedule[1].payment_amount, 8906.00)
+		self.assertEqual(quotation.payment_schedule[1].due_date, add_days(quotation.transaction_date, 30))
+
+		sales_order = make_sales_order(quotation.name)
+
+		self.assertEquals(sales_order.doctype, "Sales Order")
+		self.assertEquals(len(sales_order.get("items")), 1)
+		self.assertEquals(sales_order.get("items")[0].doctype, "Sales Order Item")
+		self.assertEquals(sales_order.get("items")[0].prevdoc_docname, quotation.name)
+		self.assertEquals(sales_order.customer, "_Test Customer")
+
+		sales_order.delivery_date = "2014-01-01"
+		sales_order.naming_series = "_T-Quotation-"
+		sales_order.transaction_date = nowdate()
+		sales_order.insert()
+
+		self.assertEqual(sales_order.payment_schedule[0].payment_amount, 8906.00)
+		self.assertEqual(sales_order.payment_schedule[0].due_date, quotation.transaction_date)
+		self.assertEqual(sales_order.payment_schedule[1].payment_amount, 8906.00)
+		self.assertEqual(
+			sales_order.payment_schedule[1].due_date, add_days(quotation.transaction_date, 30)
+		)
+
 	def test_valid_till(self):
 		from erpnext.selling.doctype.quotation.quotation import make_sales_order
 
diff --git a/erpnext/selling/doctype/quotation/tests/test_quotation.js b/erpnext/selling/doctype/quotation/tests/test_quotation.js
index 1683fa5..d69d799 100644
--- a/erpnext/selling/doctype/quotation/tests/test_quotation.js
+++ b/erpnext/selling/doctype/quotation/tests/test_quotation.js
@@ -1,5 +1,5 @@
 QUnit.test("test: quotation", function (assert) {
-	assert.expect(10);
+	assert.expect(12);
 	let done = assert.async();
 	frappe.run_serially([
 		() => {
@@ -10,7 +10,8 @@
 						{"item_code": "Test Product 1"},
 						{"qty": 5}
 					]]
-				}
+				},
+				{payment_terms_template: '_Test Payment Term Template UI'}
 			]);
 		},
 		() => {
@@ -18,7 +19,7 @@
 			assert.ok(cur_frm.doc.items[0].item_name == "Test Product 1", "Added Test Product 1");
 
 			// calculate_taxes_and_totals
-			assert.ok(cur_frm.doc.grand_total === 500, "Total Amount is correct");
+			assert.ok(cur_frm.doc.grand_total === 500, String(cur_frm.doc.grand_total));
 		},
 		() => cur_frm.set_value("customer_address", "Test1-Billing"),
 		() => cur_frm.set_value("shipping_address_name", "Test1-Warehouse"),
@@ -30,6 +31,7 @@
 		() => cur_frm.doc.items[0].rate = 200,
 		() => frappe.timeout(0.3),
 		() => cur_frm.set_value("tc_name", "Test Term 1"),
+		() => cur_frm.set_value("payment_schedule", []),
 		() => frappe.timeout(0.5),
 		() => cur_frm.save(),
 		() => {
@@ -47,6 +49,9 @@
 			// Check Terms and Condtions
 			assert.ok(cur_frm.doc.tc_name == "Test Term 1", "Terms and Conditions Checked");
 
+			assert.ok(cur_frm.doc.payment_terms_template, "Payment Terms Template is correct");
+			assert.ok(cur_frm.doc.payment_schedule.length > 0, "Payment Term Schedule is not empty");
+
 		},
 		() => done()
 	]);
diff --git a/erpnext/selling/doctype/quotation/tests/test_quotation_with_discount_on_grand_total.js b/erpnext/selling/doctype/quotation/tests/test_quotation_with_discount_on_grand_total.js
index b7b5a47..aeb5d1b 100644
--- a/erpnext/selling/doctype/quotation/tests/test_quotation_with_discount_on_grand_total.js
+++ b/erpnext/selling/doctype/quotation/tests/test_quotation_with_discount_on_grand_total.js
@@ -16,13 +16,15 @@
 				]},
 				{customer_address: 'Test1-Billing'},
 				{shipping_address_name: 'Test1-Shipping'},
-				{contact_person: 'Contact 1-Test Customer 1'}
+				{contact_person: 'Contact 1-Test Customer 1'},
+				{payment_terms_template: '_Test Payment Term Template UI'}
 			]);
 		},
 		() => {
 			return frappe.tests.set_form_values(cur_frm, [
 				{apply_discount_on:'Grand Total'},
-				{additional_discount_percentage:10}
+				{additional_discount_percentage:10},
+				{payment_schedule: []}
 			]);
 		},
 		() => cur_frm.save(),
diff --git a/erpnext/selling/doctype/quotation/tests/test_quotation_with_margin.js b/erpnext/selling/doctype/quotation/tests/test_quotation_with_margin.js
new file mode 100644
index 0000000..5b4224d
--- /dev/null
+++ b/erpnext/selling/doctype/quotation/tests/test_quotation_with_margin.js
@@ -0,0 +1,36 @@
+QUnit.module('Selling');
+
+QUnit.test("test quotation with margin", function(assert) {
+	assert.expect(3);
+	let done = assert.async();
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make('Quotation', [
+				{customer: 'Test Customer 1'},
+				{selling_price_list: 'Test-Selling-USD'},
+				{currency: 'USD'},
+				{items: [
+					[
+						{'item_code': 'Test Product 4'},
+						{'delivery_date': frappe.datetime.add_days(frappe.defaults.get_default("year_end_date"), 1)},
+						{'qty': 1},
+						{'margin_type': 'Percentage'},
+						{'margin_rate_or_amount': 20}
+					]
+				]}
+			]);
+		},
+		() => cur_frm.save(),
+		() => {
+			assert.ok(cur_frm.doc.items[0].rate_with_margin == 240, "Margin rate correct");
+			assert.ok(cur_frm.doc.items[0].base_rate_with_margin == cur_frm.doc.conversion_rate * 240, "Base margin rate correct");
+			assert.ok(cur_frm.doc.total == 240, "Amount correct");
+
+		},
+		() => frappe.tests.click_button('Submit'),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(0.3),
+		() => done()
+	]);
+});
+
diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json
index 3fc56fa..16aa46c 100644
--- a/erpnext/selling/doctype/quotation_item/quotation_item.json
+++ b/erpnext/selling/doctype/quotation_item/quotation_item.json
@@ -435,7 +435,7 @@
    "options": "UOM", 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "remember_last_selected_value": 0, 
@@ -467,7 +467,7 @@
    "precision": "", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -714,6 +714,7 @@
    "label": "Rate With Margin", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "currency", 
    "permlevel": 0, 
    "precision": "2", 
    "print_hide": 1, 
@@ -795,6 +796,38 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "eval:doc.margin_type && doc.price_list_rate && doc.margin_rate_or_amount", 
+   "fieldname": "base_rate_with_margin", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Rate With Margin (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break1", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1140,6 +1173,156 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "item_weight_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Weight Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "weight_per_unit", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Weight Per Unit", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_weight", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Weight", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_20", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "weight_uom", 
+   "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": "Weight UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
    "collapsible_depends_on": "eval:doc.warehouse", 
    "columns": 0, 
    "fieldname": "item_balance", 
@@ -1583,7 +1766,7 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-09-27 08:31:37.485134", 
+ "modified": "2017-11-30 13:58:52.861596", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Quotation Item", 
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index 6f70ebe..a6133c8 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -34,12 +34,16 @@
 
 		erpnext.queries.setup_warehouse_query(frm);
 	},
-	
+
 	delivery_date: function(frm) {
 		$.each(frm.doc.items || [], function(i, d) {
 			if(!d.delivery_date) d.delivery_date = frm.doc.delivery_date;
 		});
 		refresh_field("items");
+	},
+
+	onload_post_render: function(frm) {
+		frm.get_field("items").grid.set_multiple_add("item_code", "qty");
 	}
 });
 
@@ -48,7 +52,7 @@
 		if(!frm.doc.delivery_date) {
 			erpnext.utils.copy_value_in_all_row(frm.doc, cdt, cdn, "items", "delivery_date");
 		}
-	}	
+	}
 });
 
 erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend({
@@ -193,7 +197,7 @@
 					});
 					return;
 				}
-				else if(!r.message.every(function(d) { return !!d.pending_qty })) {
+				else if(!r.message) {
 					frappe.msgprint({
 						title: __('Production Order not created'),
 						message: __('Production Order already created for all items with BOM'),
@@ -213,6 +217,8 @@
 									}},
 								{fieldtype:'Float', fieldname:'pending_qty', reqd: 1,
 									label: __('Qty'), in_list_view:1},
+								{fieldtype:'Data', fieldname:'sales_order_item', reqd: 1,
+									label: __('Sales Order Item'), hidden:1}
 							],
 							get_data: function() {
 								return r.message
@@ -272,21 +278,21 @@
 
 	make_delivery_note_based_on_delivery_date: function() {
 		var me = this;
-		
+
 		var delivery_dates = [];
 		$.each(this.frm.doc.items || [], function(i, d) {
 			if(!delivery_dates.includes(d.delivery_date)) {
 				delivery_dates.push(d.delivery_date);
 			}
 		});
-		
+
 		var item_grid = this.frm.fields_dict["items"].grid;
 		if(!item_grid.get_selected().length && delivery_dates.length > 1) {
 			var dialog = new frappe.ui.Dialog({
 				title: __("Select Items based on Delivery Date"),
 				fields: [{fieldtype: "HTML", fieldname: "dates_html"}]
 			});
-			
+
 			var html = $(`
 				<div style="border: 1px solid #d1d8dd">
 					<div class="list-item list-item--head">
@@ -315,7 +321,7 @@
 					.map((i, el) => $(el).attr('data-date')).toArray();
 
 				if(!dates) return;
-				
+
 				$.each(dates, function(i, d) {
 					$.each(item_grid.grid_rows || [], function(j, row) {
 						if(row.doc.delivery_date == d) {
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 36f1284..cdd27ff 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -186,6 +186,7 @@
    "label": "Customer Name", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "customer.customer_name", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -1376,6 +1377,36 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "total_net_weight", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Net Weight", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -2318,10 +2349,9 @@
    "label": "Packed Items", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "packing_details", 
-   "oldfieldtype": "Table", 
    "options": "Packed Item", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
@@ -2336,6 +2366,99 @@
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 0, 
+   "collapsible_depends_on": "", 
+   "columns": 0, 
+   "fieldname": "payment_schedule_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payment Terms", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "payment_terms_template", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payment Terms Template", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Payment Terms Template", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "payment_schedule", 
+   "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": "Payment Schedule", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Payment Schedule", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "terms", 
    "columns": 0, 
@@ -3406,7 +3529,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-10-24 12:52:28.115742", 
+ "modified": "2017-11-29 13:43:33.076893", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order", 
@@ -3543,5 +3666,5 @@
  "timeline_field": "customer", 
  "title_field": "title", 
  "track_changes": 1, 
- "track_seen": 0
+ "track_seen": 1
 }
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index d928405..1c3354c 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -14,6 +14,7 @@
 from frappe.contacts.doctype.address.address import get_company_address
 from erpnext.controllers.selling_controller import SellingController
 from erpnext.accounts.doctype.subscription.subscription import get_next_schedule_date
+from erpnext.selling.doctype.customer.customer import check_credit_limit
 
 form_grid_templates = {
 	"items": "templates/form_grid/item_grid.html"
@@ -109,7 +110,7 @@
 				for d in self.get("items"):
 					if not d.delivery_date:
 						d.delivery_date = self.delivery_date
-					
+
 					if getdate(self.transaction_date) > getdate(d.delivery_date):
 						frappe.msgprint(_("Expected Delivery Date should be after Sales Order Date"),
 							indicator='orange', title=_('Warning'))
@@ -188,49 +189,68 @@
 	def update_project(self):
 		project_list = []
 		if self.project:
-				project = frappe.get_doc("Project", self.project)
-				project.flags.dont_sync_tasks = True
-				project.update_sales_costing()
-				project.save()
-				project_list.append(self.project)
+			project = frappe.get_doc("Project", self.project)
+			project.flags.dont_sync_tasks = True
+			project.update_sales_amount()
+			project.save()
+			project_list.append(self.project)
 
 	def check_credit_limit(self):
-		from erpnext.selling.doctype.customer.customer import check_credit_limit
-		check_credit_limit(self.customer, self.company)
+		# if bypass credit limit check is set to true (1) at sales order level,
+		# then we need not to check credit limit and vise versa
+		if not cint(frappe.db.get_value("Customer", self.customer, "bypass_credit_limit_check_at_sales_order")):
+			check_credit_limit(self.customer, self.company)
 
 	def check_nextdoc_docstatus(self):
 		# Checks Delivery Note
-		submit_dn = frappe.db.sql_list("""select t1.name from `tabDelivery Note` t1,`tabDelivery Note Item` t2
+		submit_dn = frappe.db.sql_list("""
+			select t1.name
+			from `tabDelivery Note` t1,`tabDelivery Note Item` t2
 			where t1.name = t2.parent and t2.against_sales_order = %s and t1.docstatus = 1""", self.name)
+
 		if submit_dn:
-			frappe.throw(_("Delivery Notes {0} must be cancelled before cancelling this Sales Order").format(comma_and(submit_dn)))
+			frappe.throw(_("Delivery Notes {0} must be cancelled before cancelling this Sales Order")
+				.format(comma_and(submit_dn)))
 
 		# Checks Sales Invoice
 		submit_rv = frappe.db.sql_list("""select t1.name
 			from `tabSales Invoice` t1,`tabSales Invoice Item` t2
 			where t1.name = t2.parent and t2.sales_order = %s and t1.docstatus = 1""",
 			self.name)
+
 		if submit_rv:
-			frappe.throw(_("Sales Invoice {0} must be cancelled before cancelling this Sales Order").format(comma_and(submit_rv)))
+			frappe.throw(_("Sales Invoice {0} must be cancelled before cancelling this Sales Order")
+				.format(comma_and(submit_rv)))
 
 		#check maintenance schedule
-		submit_ms = frappe.db.sql_list("""select t1.name from `tabMaintenance Schedule` t1,
-			`tabMaintenance Schedule Item` t2
+		submit_ms = frappe.db.sql_list("""
+			select t1.name
+			from `tabMaintenance Schedule` t1, `tabMaintenance Schedule Item` t2
 			where t2.parent=t1.name and t2.sales_order = %s and t1.docstatus = 1""", self.name)
+
 		if submit_ms:
-			frappe.throw(_("Maintenance Schedule {0} must be cancelled before cancelling this Sales Order").format(comma_and(submit_ms)))
+			frappe.throw(_("Maintenance Schedule {0} must be cancelled before cancelling this Sales Order")
+				.format(comma_and(submit_ms)))
 
 		# check maintenance visit
-		submit_mv = frappe.db.sql_list("""select t1.name from `tabMaintenance Visit` t1, `tabMaintenance Visit Purpose` t2
+		submit_mv = frappe.db.sql_list("""
+			select t1.name
+			from `tabMaintenance Visit` t1, `tabMaintenance Visit Purpose` t2
 			where t2.parent=t1.name and t2.prevdoc_docname = %s and t1.docstatus = 1""",self.name)
+
 		if submit_mv:
-			frappe.throw(_("Maintenance Visit {0} must be cancelled before cancelling this Sales Order").format(comma_and(submit_mv)))
+			frappe.throw(_("Maintenance Visit {0} must be cancelled before cancelling this Sales Order")
+				.format(comma_and(submit_mv)))
 
 		# check production order
-		pro_order = frappe.db.sql_list("""select name from `tabProduction Order`
+		pro_order = frappe.db.sql_list("""
+			select name
+			from `tabProduction Order`
 			where sales_order = %s and docstatus = 1""", self.name)
+
 		if pro_order:
-			frappe.throw(_("Production Order {0} must be cancelled before cancelling this Sales Order").format(comma_and(pro_order)))
+			frappe.throw(_("Production Order {0} must be cancelled before cancelling this Sales Order")
+				.format(comma_and(pro_order)))
 
 	def check_modified_date(self):
 		mod_db = frappe.db.get_value("Sales Order", self.name, "modified")
@@ -336,14 +356,16 @@
 				bom = get_default_bom_item(i.item_code)
 				if bom:
 					stock_qty = i.qty if i.doctype == 'Packed Item' else i.stock_qty
-					items.append(dict(
-						item_code= i.item_code,
-						bom = bom,
-						warehouse = i.warehouse,
-						pending_qty= stock_qty - flt(frappe.db.sql('''select sum(qty) from `tabProduction Order`
-							where production_item=%s and sales_order=%s''', (i.item_code, self.name))[0][0])
-					))
-
+					pending_qty= stock_qty - flt(frappe.db.sql('''select sum(qty) from `tabProduction Order`
+							where production_item=%s and sales_order=%s and sales_order_item = %s and docstatus<2''', (i.item_code, self.name, i.name))[0][0])
+					if pending_qty:
+						items.append(dict(
+							item_code= i.item_code,
+							bom = bom,
+							warehouse = i.warehouse,
+							pending_qty = pending_qty,
+							sales_order_item = i.name
+						))
 		return items
 
 	def on_recurring(self, reference_doc, subscription_doc):
@@ -462,10 +484,15 @@
 			else:
 				target.po_no = source.po_no
 
+		# Since the credit limit check is bypassed at sales order level,
+		# we need to check it at delivery note
+		if cint(frappe.db.get_value("Customer", source.customer, "bypass_credit_limit_check_at_sales_order")):
+			check_credit_limit(source.customer, source.company)
+
 		target.ignore_pricing_rule = 1
 		target.run_method("set_missing_values")
 		target.run_method("calculate_taxes_and_totals")
-		
+
 		# set company address
 		target.update(get_company_address(target.company))
 		if target.company_address:
@@ -526,6 +553,10 @@
 		target.run_method("set_missing_values")
 		target.run_method("calculate_taxes_and_totals")
 
+		# Since the credit limit check is bypassed at sales order level, we need to check it at sales invoice
+		if cint(frappe.db.get_value("Customer", source.customer, "bypass_credit_limit_check_at_sales_order")):
+			check_credit_limit(source.customer, source.company)
+
 		# set company address
 		target.update(get_company_address(target.company))
 		if target.company_address:
@@ -637,7 +668,7 @@
 
 	data = frappe.db.sql("""
 		select
-			`tabSales Order`.name, `tabSales Order`.customer_name, `tabSales Order`.status,
+			distinct `tabSales Order`.name, `tabSales Order`.customer_name, `tabSales Order`.status,
 			`tabSales Order`.delivery_status, `tabSales Order`.billing_status,
 			`tabSales Order Item`.delivery_date
 		from
@@ -774,6 +805,7 @@
 			qty=i['pending_qty'],
 			company=company,
 			sales_order=sales_order,
+			sales_order_item=i['sales_order_item'],
 			project=project,
 			fg_warehouse=i['warehouse']
 		)).insert()
diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.js b/erpnext/selling/doctype/sales_order/test_sales_order.js
new file mode 100644
index 0000000..57ed19b
--- /dev/null
+++ b/erpnext/selling/doctype/sales_order/test_sales_order.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Sales Order", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially('Sales Order', [
+		// insert a new Sales Order
+		() => frappe.tests.make([
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py
index 9c5c82e..f829961 100644
--- a/erpnext/selling/doctype/sales_order/test_sales_order.py
+++ b/erpnext/selling/doctype/sales_order/test_sales_order.py
@@ -10,6 +10,9 @@
 	import make_material_request, make_delivery_note, make_sales_invoice, WarehouseRequired
 from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
 from frappe.tests.test_permissions import set_user_permission_doctypes
+from erpnext.selling.doctype.sales_order.sales_order import make_production_orders
+import json
+
 
 class TestSalesOrder(unittest.TestCase):
 	def tearDown(self):
@@ -58,6 +61,32 @@
 		si1 = make_sales_invoice(so.name)
 		self.assertEquals(len(si1.get("items")), 0)
 
+	def test_make_sales_invoice_with_terms(self):
+		so = make_sales_order(do_not_submit=True)
+
+		self.assertRaises(frappe.ValidationError, make_sales_invoice, so.name)
+
+		so.update({"payment_terms_template": "_Test Payment Term Template"})
+
+		so.save()
+		so.submit()
+		si = make_sales_invoice(so.name)
+
+		self.assertEquals(len(si.get("items")), len(so.get("items")))
+		self.assertEquals(len(si.get("items")), 1)
+
+		si.insert()
+
+		self.assertEqual(si.payment_schedule[0].payment_amount, 500.0)
+		self.assertEqual(si.payment_schedule[0].due_date, so.transaction_date)
+		self.assertEqual(si.payment_schedule[1].payment_amount, 500.0)
+		self.assertEqual(si.payment_schedule[1].due_date, add_days(so.transaction_date, 30))
+
+		si.submit()
+
+		si1 = make_sales_invoice(so.name)
+		self.assertEquals(len(si1.get("items")), 0)
+
 	def test_update_qty(self):
 		so = make_sales_order()
 
@@ -123,7 +152,6 @@
 		so = make_sales_order()
 		self.assertEqual(get_reserved_qty(), existing_reserved_qty + 10)
 
-
 		dn = create_dn_against_so(so.name, 15)
 		self.assertEqual(get_reserved_qty(), existing_reserved_qty)
 
@@ -179,7 +207,6 @@
 		make_stock_entry(target="_Test Warehouse - _TC", qty=10, rate=100)
 		make_stock_entry(item="_Test Item Home Desktop 100", target="_Test Warehouse - _TC", qty=10, rate=100)
 
-
 		existing_reserved_qty_item1 = get_reserved_qty("_Test Item")
 		existing_reserved_qty_item2 = get_reserved_qty("_Test Item Home Desktop 100")
 
@@ -501,10 +528,73 @@
 
 		self.assertEquals(new_so.get("items")[0].rate, flt((price_list_rate*25)/100 + price_list_rate))
 		new_so.items[0].margin_rate_or_amount = 25
+		new_so.payment_schedule = []
+		new_so.save()
 		new_so.submit()
 
 		self.assertEquals(new_so.get("items")[0].rate, flt((price_list_rate*25)/100 + price_list_rate))
 
+	def test_terms_auto_added(self):
+		so = make_sales_order(do_not_save=1)
+
+		self.assertFalse(so.get('payment_schedule'))
+
+		so.insert()
+
+		self.assertTrue(so.get('payment_schedule'))
+
+	def test_terms_not_copied(self):
+		so = make_sales_order()
+		self.assertTrue(so.get('payment_schedule'))
+
+		si = make_sales_invoice(so.name)
+		self.assertFalse(si.get('payment_schedule'))
+
+	def test_terms_copied(self):
+		so = make_sales_order(do_not_copy=1, do_not_save=1)
+		so.payment_terms_template = '_Test Payment Term Template'
+		so.insert()
+		so.submit()
+		self.assertTrue(so.get('payment_schedule'))
+
+		si = make_sales_invoice(so.name)
+		si.insert()
+		self.assertTrue(si.get('payment_schedule'))
+
+	def test_make_production_order(self):
+		# Make a new Sales Order
+		so = make_sales_order(**{
+			"item_list": [{
+				"item_code": "_Test FG Item",
+				"qty": 10,
+				"rate":100	
+			},
+			{
+				"item_code": "_Test FG Item",
+				"qty": 20,
+				"rate":200	
+			}]
+		})
+
+		# Raise Production Orders
+		po_items= []
+		so_item_name= {}
+		for item in so.get_production_order_items():
+			po_items.append({
+				"warehouse": item.get("warehouse"),
+				"item_code": item.get("item_code"),
+				"pending_qty": item.get("pending_qty"),
+				"sales_order_item": item.get("sales_order_item"),
+				"bom": item.get("bom")
+			})
+			so_item_name[item.get("sales_order_item")]= item.get("pending_qty")
+		make_production_orders(json.dumps({"items":po_items}), so.name, so.company)
+		
+		# Check if Production Orders were raised
+		for item in so_item_name:
+			po_qty = frappe.db.sql("select sum(qty) from `tabProduction Order` where sales_order=%s and sales_order_item=%s", (so.name, item))
+			self.assertEquals(po_qty[0][0], so_item_name.get(item))
+
 def make_sales_order(**args):
 	so = frappe.new_doc("Sales Order")
 	args = frappe._dict(args)
@@ -539,6 +629,10 @@
 		so.insert()
 		if not args.do_not_submit:
 			so.submit()
+		else:
+			so.payment_schedule = []
+	else:
+		so.payment_schedule = []
 
 	return so
 
diff --git a/erpnext/selling/doctype/sales_order/tests/test_sales_order.js b/erpnext/selling/doctype/sales_order/tests/test_sales_order.js
index daa8131..939261c 100644
--- a/erpnext/selling/doctype/sales_order/tests/test_sales_order.js
+++ b/erpnext/selling/doctype/sales_order/tests/test_sales_order.js
@@ -1,7 +1,7 @@
 QUnit.module('Sales Order');
 
 QUnit.test("test sales order", function(assert) {
-	assert.expect(10);
+	assert.expect(12);
 	let done = assert.async();
 	frappe.run_serially([
 		() => {
@@ -19,7 +19,8 @@
 				{contact_person: 'Contact 1-Test Customer 1'},
 				{taxes_and_charges: 'TEST In State GST'},
 				{tc_name: 'Test Term 1'},
-				{terms: 'This is Test'}
+				{terms: 'This is Test'},
+				{payment_terms_template: '_Test Payment Term Template UI'}
 			]);
 		},
 		() => {
@@ -28,7 +29,7 @@
 				{currency: 'USD'}
 			]);
 		},
-		() => frappe.timeout(1),
+		() => frappe.timeout(1.5),
 		() => {
 			// get_item_details
 			assert.ok(cur_frm.doc.items[0].item_name=='Test Product 3', "Item name correct");
@@ -36,18 +37,24 @@
 			assert.ok(cur_frm.doc.taxes_and_charges=='TEST In State GST', "Tax details correct");
 			// get tax account head details
 			assert.ok(cur_frm.doc.taxes[0].account_head=='CGST - '+frappe.get_abbr(frappe.defaults.get_default('Company')), " Account Head abbr correct");
-			// calculate totals
-			assert.ok(cur_frm.doc.items[0].price_list_rate==250, "Item 1 price_list_rate");
-			assert.ok(cur_frm.doc.net_total== 1280.75, "net total correct ");
-			assert.ok(cur_frm.doc.base_grand_total== flt(1511.29* cur_frm.doc.conversion_rate, precision('base_grand_total')), "base round total correct ");
-			assert.ok(cur_frm.doc.grand_total== 1511.29 , "grand total correct ");
-			assert.ok(cur_frm.doc.rounded_total== 1511.30, "rounded total correct ");
 		},
 		() => cur_frm.save(),
 		() => frappe.timeout(1),
 		() => cur_frm.print_doc(),
 		() => frappe.timeout(1),
 		() => {
+			// Payment Terms
+			assert.ok(cur_frm.doc.payment_terms_template, "Payment Terms Template is correct");
+			assert.ok(cur_frm.doc.payment_schedule.length > 0, "Payment Term Schedule is not empty");
+
+			// totals
+			assert.ok(cur_frm.doc.items[0].price_list_rate==250, "Item 1 price_list_rate");
+			assert.ok(cur_frm.doc.net_total== 1280.75, "net total correct ");
+			assert.ok(cur_frm.doc.base_grand_total== flt(1511.29* cur_frm.doc.conversion_rate, precision('base_grand_total')), String(flt(1511.29* cur_frm.doc.conversion_rate, precision('base_grand_total')) + ' ' + cur_frm.doc.base_grand_total));
+			assert.ok(cur_frm.doc.grand_total== 1511.29 , "grand total correct ");
+			assert.ok(cur_frm.doc.rounded_total== 1511.30, "rounded total correct ");
+
+			// print format
 			assert.ok($('.btn-print-print').is(':visible'), "Print Format Available");
 			frappe.timeout(1);
 			assert.ok($(".section-break+ .section-break .column-break:nth-child(1) .data-field:nth-child(1) .value").text().includes("Billing Street 1"), "Print Preview Works As Expected");
diff --git a/erpnext/selling/doctype/sales_order/tests/test_sales_order_with_bypass_credit_limit_check.js b/erpnext/selling/doctype/sales_order/tests/test_sales_order_with_bypass_credit_limit_check.js
new file mode 100644
index 0000000..dbd58c1
--- /dev/null
+++ b/erpnext/selling/doctype/sales_order/tests/test_sales_order_with_bypass_credit_limit_check.js
@@ -0,0 +1,56 @@
+QUnit.module('Sales Order');
+
+QUnit.test("test_sales_order_with_bypass_credit_limit_check", function(assert) {
+//#PR : 10861, Author : ashish-greycube & jigneshpshah,  Email:mr.ashish.shah@gmail.com 
+	assert.expect(2);
+	let done = assert.async();
+	frappe.run_serially([
+		() => frappe.new_doc('Customer'),
+		() => frappe.timeout(1),
+		() => frappe.quick_entry.dialog.$wrapper.find('.edit-full').click(),
+		() => frappe.timeout(1),
+		() => cur_frm.set_value("customer_name", "Test Customer 10"),
+		() => cur_frm.set_value("credit_limit", 100.00),
+		() => cur_frm.set_value("bypass_credit_limit_check_at_sales_order", 1),
+		// save form
+		() => cur_frm.save(),
+		() => frappe.timeout(1),
+
+		() => frappe.new_doc('Item'),
+		() => frappe.timeout(1),
+		() => frappe.quick_entry.dialog.$wrapper.find('.edit-full').click(),
+		() => frappe.timeout(1),
+		() => cur_frm.set_value("item_code", "Test Product 10"),
+		() => cur_frm.set_value("item_group", "Products"),
+		() => cur_frm.set_value("standard_rate", 100),	
+		// save form
+		() => cur_frm.save(),
+		() => frappe.timeout(1),		
+
+		() => {
+			return frappe.tests.make('Sales Order', [
+				{customer: 'Test Customer 5'},
+				{items: [
+					[
+						{'delivery_date': frappe.datetime.add_days(frappe.defaults.get_default("year_end_date"), 1)},
+						{'qty': 5},
+						{'item_code': 'Test Product 10'},
+					]
+				]}
+
+			]);
+		},
+		() => cur_frm.save(),
+		() => frappe.tests.click_button('Submit'),
+		() => assert.equal("Confirm", cur_dialog.title,'confirmation for submit'),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(3),
+		() => {
+			
+			assert.ok(cur_frm.doc.status=="To Deliver and Bill", "It is submited. Credit limit is NOT checked for sales order");
+
+
+		},		
+		() => done()
+	]);
+});
diff --git a/erpnext/selling/doctype/sales_order/tests/test_sales_order_with_discount_on_grand_total.js b/erpnext/selling/doctype/sales_order/tests/test_sales_order_with_discount_on_grand_total.js
index 3247c85..de61a61 100644
--- a/erpnext/selling/doctype/sales_order/tests/test_sales_order_with_discount_on_grand_total.js
+++ b/erpnext/selling/doctype/sales_order/tests/test_sales_order_with_discount_on_grand_total.js
@@ -16,13 +16,15 @@
 				]},
 				{customer_address: 'Test1-Billing'},
 				{shipping_address_name: 'Test1-Shipping'},
-				{contact_person: 'Contact 1-Test Customer 1'}
+				{contact_person: 'Contact 1-Test Customer 1'},
+				{payment_terms_template: '_Test Payment Term Template UI'}
 			]);
 		},
 		() => {
 			return frappe.tests.set_form_values(cur_frm, [
 				{apply_discount_on:'Grand Total'},
-				{additional_discount_percentage:10}
+				{additional_discount_percentage:10},
+				{payment_schedule: []}
 			]);
 		},
 		() => cur_frm.save(),
diff --git a/erpnext/selling/doctype/sales_order/tests/test_sales_order_with_item_wise_discount.js b/erpnext/selling/doctype/sales_order/tests/test_sales_order_with_item_wise_discount.js
index c745374..2c48108 100644
--- a/erpnext/selling/doctype/sales_order/tests/test_sales_order_with_item_wise_discount.js
+++ b/erpnext/selling/doctype/sales_order/tests/test_sales_order_with_item_wise_discount.js
@@ -18,7 +18,8 @@
 				]},
 				{customer_address: 'Test1-Billing'},
 				{shipping_address_name: 'Test1-Shipping'},
-				{contact_person: 'Contact 1-Test Customer 1'}
+				{contact_person: 'Contact 1-Test Customer 1'},
+				{payment_terms_template: '_Test Payment Term Template UI'}
 			]);
 		},
 		() => cur_frm.save(),
diff --git a/erpnext/selling/doctype/sales_order/tests/test_sales_order_with_margin.js b/erpnext/selling/doctype/sales_order/tests/test_sales_order_with_margin.js
new file mode 100644
index 0000000..7426868
--- /dev/null
+++ b/erpnext/selling/doctype/sales_order/tests/test_sales_order_with_margin.js
@@ -0,0 +1,38 @@
+QUnit.module('Selling');
+
+QUnit.test("test sales order with margin", function(assert) {
+	assert.expect(3);
+	let done = assert.async();
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make('Sales Order', [
+				{customer:'Test Customer 1'},
+				{selling_price_list: 'Test-Selling-USD'},
+				{currency: 'USD'},
+				{items: [
+					[
+						{'item_code': 'Test Product 4'},
+						{'delivery_date': frappe.datetime.add_days(frappe.defaults.get_default("year_end_date"), 1)},
+						{'qty': 1},
+						{'margin_type': 'Amount'},
+						{'margin_rate_or_amount': 20}
+					]
+				]},
+			]);
+		},
+
+		() => cur_frm.save(),
+		() => {
+			// get_rate_details
+			assert.ok(cur_frm.doc.items[0].rate_with_margin == 220, "Margin rate correct");
+			assert.ok(cur_frm.doc.items[0].base_rate_with_margin == cur_frm.doc.conversion_rate * 220, "Base margin rate correct");
+			assert.ok(cur_frm.doc.total == 220, "Amount correct");
+		},
+
+		() => frappe.tests.click_button('Submit'),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(0.3),
+		() => done()
+	]);
+});
+
diff --git a/erpnext/selling/doctype/sales_order/tests/test_sales_order_without_bypass_credit_limit_check.js b/erpnext/selling/doctype/sales_order/tests/test_sales_order_without_bypass_credit_limit_check.js
new file mode 100644
index 0000000..4e81fb0
--- /dev/null
+++ b/erpnext/selling/doctype/sales_order/tests/test_sales_order_without_bypass_credit_limit_check.js
@@ -0,0 +1,60 @@
+QUnit.module('Sales Order');
+
+QUnit.test("test_sales_order_without_bypass_credit_limit_check", function(assert) {
+//#PR : 10861, Author : ashish-greycube & jigneshpshah,  Email:mr.ashish.shah@gmail.com 
+	assert.expect(2);
+	let done = assert.async();
+	frappe.run_serially([
+		() => frappe.new_doc('Customer'),
+		() => frappe.timeout(1),
+		() => frappe.quick_entry.dialog.$wrapper.find('.edit-full').click(),
+		() => frappe.timeout(1),
+		() => cur_frm.set_value("customer_name", "Test Customer 11"),
+		() => cur_frm.set_value("credit_limit", 100.00),
+		() => cur_frm.set_value("bypass_credit_limit_check_at_sales_order", 0),
+		// save form
+		() => cur_frm.save(),
+		() => frappe.timeout(1),
+
+		() => frappe.new_doc('Item'),
+		() => frappe.timeout(1),
+		() => frappe.click_link('Edit in full page'),
+		() => cur_frm.set_value("item_code", "Test Product 11"),
+		() => cur_frm.set_value("item_group", "Products"),
+		() => cur_frm.set_value("standard_rate", 100),	
+		// save form
+		() => cur_frm.save(),
+		() => frappe.timeout(1),		
+
+		() => {
+			return frappe.tests.make('Sales Order', [
+				{customer: 'Test Customer 11'},
+				{items: [
+					[
+						{'delivery_date': frappe.datetime.add_days(frappe.defaults.get_default("year_end_date"), 1)},
+						{'qty': 5},
+						{'item_code': 'Test Product 11'},
+					]
+				]}
+
+			]);
+		},
+		() => cur_frm.save(),
+		() => frappe.tests.click_button('Submit'),
+		() => assert.equal("Confirm", cur_dialog.title,'confirmation for submit'),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(3),
+		() => {
+		
+			if (cur_dialog.body.innerText.match(/^Credit limit has been crossed for customer.*$/)) 
+				{ 
+    				/*Match found */
+    				assert.ok(true, "Credit Limit crossed message received");
+				}
+			
+	
+		},
+		() => cur_dialog.cancel(),
+		() => done()
+	]);
+});
diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
index fd7b0f2..fe53e4d 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -465,7 +465,7 @@
    "options": "UOM", 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "remember_last_selected_value": 0, 
@@ -497,7 +497,7 @@
    "precision": "", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -744,6 +744,7 @@
    "label": "Rate With Margin", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
@@ -825,6 +826,38 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "eval:doc.margin_type && doc.price_list_rate && doc.margin_rate_or_amount", 
+   "fieldname": "base_rate_with_margin", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Rate With Margin (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "2", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_simple1", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1322,6 +1355,156 @@
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "item_weight_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Weight Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "weight_per_unit", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Weight Per Unit", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_weight", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Weight", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_21", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "weight_uom", 
+   "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": "Weight UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "warehouse_and_reference", 
@@ -1963,7 +2146,7 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-09-27 08:31:37.129537", 
+ "modified": "2017-11-30 14:05:39.173834", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order Item", 
diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.js b/erpnext/selling/page/point_of_sale/point_of_sale.js
index 6ac0a5f..f3599d5 100644
--- a/erpnext/selling/page/point_of_sale/point_of_sale.js
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.js
@@ -50,10 +50,9 @@
 				this.set_online_status();
 			},
 			() => this.setup_company(),
-			() => this.setup_pos_profile(),
+
 			() => this.make_new_invoice(),
 			() => {
-				this.bind_events();
 				frappe.dom.unfreeze();
 			},
 			() => this.page.set_title(__('Point of Sale'))
@@ -91,7 +90,6 @@
 		this.cart = new POSCart({
 			frm: this.frm,
 			wrapper: this.wrapper.find('.cart-container'),
-			pos_profile: this.pos_profile,
 			events: {
 				on_customer_change: (customer) => this.frm.set_value('customer', customer),
 				on_field_change: (item_code, field, value) => {
@@ -142,7 +140,7 @@
 	make_items() {
 		this.items = new POSItems({
 			wrapper: this.wrapper.find('.item-container'),
-			pos_profile: this.pos_profile,
+			frm: this.frm,
 			events: {
 				update_cart: (item, field, value) => {
 					if(!this.frm.doc.customer) {
@@ -170,7 +168,10 @@
 				value = item.serial_no + '\n'+ value;
 			}
 
-			if(field === 'qty' && (item.serial_no || item.batch_no)) {
+			// if actual_batch_qty and actual_qty if there is only one batch. In such
+			// a case, no point showing the dialog
+			if(field === 'qty' && (item.serial_no || item.batch_no)
+			    && (item.actual_batch_qty != item.actual_qty)) {
 				this.select_batch_and_serial_no(item);
 			} else {
 				this.update_item_in_frm(item, field, value)
@@ -194,7 +195,10 @@
 			.trigger('item_code', item.doctype, item.name)
 			.then(() => {
 				const show_dialog = item.has_serial_no || item.has_batch_no;
-				if (show_dialog && field == 'qty') {
+
+				// if actual_batch_qty and actual_qty if then there is only one batch. In such
+				// a case, no point showing the dialog
+				if (show_dialog && field == 'qty' && (item.actual_batch_qty != item.actual_qty)) {
 					// check has serial no/batch no and update cart
 					this.select_batch_and_serial_no(item);
 				} else {
@@ -273,35 +277,82 @@
 
 					this.toggle_editing();
 					this.set_form_action();
+					this.set_primary_action_in_modal();
 				}
 			});
 		});
 	}
 
-	bind_events() {
+	set_primary_action_in_modal() {
+		this.frm.msgbox = frappe.msgprint(
+			`<a class="btn btn-primary" onclick="cur_frm.print_preview.printit(true)" style="margin-right: 5px;">
+				${__('Print')}</a>
+			<a class="btn btn-default">
+				${__('New')}</a>`
+		);
 
+		$(this.frm.msgbox.body).find('.btn-default').on('click', () => {
+			this.frm.msgbox.hide();
+			this.make_new_invoice();
+		})
 	}
 
-	setup_pos_profile() {
-		return new Promise(resolve => {
-			frappe.call({
-				method: 'erpnext.stock.get_item_details.get_pos_profile',
-				args: {
-					company: this.company
+	change_pos_profile() {
+		return new Promise((resolve) => {
+			const on_submit = ({ pos_profile, set_as_default }) => {
+				if (pos_profile) {
+					this.frm.doc.pos_profile = pos_profile;
 				}
-			}).then(r => {
-				this.pos_profile = r.message;
 
-				if (!this.pos_profile) {
-					this.pos_profile = {
-						company: this.company,
-						currency: frappe.defaults.get_default('currency'),
-						selling_price_list: frappe.defaults.get_default('selling_price_list')
-					};
+				if (set_as_default) {
+					frappe.call({
+						method: "erpnext.accounts.doctype.pos_profile.pos_profile.set_default_profile",
+						args: {
+							'pos_profile': pos_profile,
+							'company': this.frm.doc.company
+						}
+					}).then(() => {
+						this.on_change_pos_profile();
+					});
+				} else {
+					this.on_change_pos_profile();
 				}
-				resolve();
+			}
+
+			frappe.prompt(this.get_promopt_fields(),
+				on_submit,
+				__('Select POS Profile')
+			);
+		});
+	}
+
+	on_change_pos_profile() {
+		this.set_pos_profile_data()
+			.then(() => {
+				this.reset_cart();
+				if (this.items) {
+					this.items.reset_items();
+				}
 			});
-		})
+	}
+
+	get_promopt_fields() {
+		return [{
+			fieldtype: 'Link',
+			label: __('POS Profile'),
+			options: 'POS Profile',
+			get_query: () => {
+				return {
+					query: 'erpnext.accounts.doctype.pos_profile.pos_profile.pos_profile_query',
+					filters: {
+						company: this.frm.doc.company
+					}
+				};
+			}
+		}, {
+			fieldtype: 'Check',
+			label: __('Set as default')
+		}];
 	}
 
 	setup_company() {
@@ -336,41 +387,50 @@
 		]);
 	}
 
+	reset_cart() {
+		this.cart.frm = this.frm;
+		this.cart.reset();
+		this.items.reset_search_field();
+	}
+
 	make_sales_invoice_frm() {
 		const doctype = 'Sales Invoice';
 		return new Promise(resolve => {
 			if (this.frm) {
-				this.frm = get_frm(this.pos_profile, this.frm);
+				this.frm = get_frm(this.frm);
 				resolve();
 			} else {
 				frappe.model.with_doctype(doctype, () => {
-					this.frm = get_frm(this.pos_profile);
+					this.frm = get_frm();
 					resolve();
 				});
 			}
 		});
 
-		function get_frm(pos_profile, _frm) {
+		function get_frm(_frm) {
 			const page = $('<div>');
 			const frm = _frm || new _f.Frm(doctype, page, false);
 			const name = frappe.model.make_new_doc_and_get_name(doctype, true);
 			frm.refresh(name);
 			frm.doc.items = [];
-			if(!frm.doc.company) {
-				frm.set_value('company', pos_profile.company);
-			}
 			frm.doc.is_pos = 1;
 			return frm;
 		}
 	}
 
 	set_pos_profile_data() {
+		this.frm.doc.company = this.company;
+
 		return new Promise(resolve => {
 			return this.frm.call({
 				doc: this.frm.doc,
 				method: "set_missing_values",
 			}).then((r) => {
 				if(!r.exc) {
+					if (!this.frm.doc.pos_profile) {
+						frappe.dom.unfreeze();
+						frappe.throw(__("POS Profile is required to use Point-of-Sale"));
+					}
 					this.frm.script_manager.trigger("update_stock");
 					frappe.model.set_default_values(this.frm.doc);
 					this.frm.cscript.calculate_taxes_and_totals();
@@ -381,8 +441,8 @@
 				}
 
 				resolve();
-			})
-		})
+			});
+		});
 	}
 
 	prepare_menu() {
@@ -406,6 +466,10 @@
 		this.page.add_menu_item(__('POS Settings'), function() {
 			frappe.set_route('Form', 'POS Settings');
 		});
+
+		this.page.add_menu_item(__('Change POS Profile'), function() {
+			me.change_pos_profile();
+		});
 	}
 
 	set_form_action() {
@@ -426,12 +490,11 @@
 };
 
 class POSCart {
-	constructor({frm, wrapper, pos_profile, events}) {
+	constructor({frm, wrapper, events}) {
 		this.frm = frm;
 		this.item_data = {};
 		this.wrapper = wrapper;
 		this.events = events;
-		this.pos_profile = pos_profile;
 		this.make();
 		this.bind_events();
 	}
@@ -497,7 +560,7 @@
 		this.wrapper.find('.grand-total-value').text(
 			format_currency(this.frm.doc.grand_total, this.frm.currency));
 
-		const customer = this.frm.doc.customer || this.pos_profile.customer;
+		const customer = this.frm.doc.customer;
 		this.customer_field.set_value(customer);
 	}
 
@@ -585,7 +648,6 @@
 	}
 
 	make_customer_field() {
-		let customer = this.frm.doc.customer || this.pos_profile['customer'];
 		this.customer_field = frappe.ui.form.make_control({
 			df: {
 				fieldtype: 'Link',
@@ -601,9 +663,7 @@
 			render_input: true
 		});
 
-		if (customer) {
-			this.customer_field.set_value(customer);
-		}
+		this.customer_field.set_value(this.frm.doc.customer);
 	}
 
 	make_numpad() {
@@ -868,19 +928,22 @@
 }
 
 class POSItems {
-	constructor({wrapper, pos_profile, events}) {
+	constructor({wrapper, frm, events}) {
 		this.wrapper = wrapper;
-		this.pos_profile = pos_profile;
+		this.frm = frm;
 		this.items = {};
 		this.events = events;
-		this.currency = this.pos_profile.currency;
+		this.currency = this.frm.doc.currency;
 
 		this.make_dom();
 		this.make_fields();
 
 		this.init_clusterize();
 		this.bind_events();
+		this.load_items_data();
+	}
 
+	load_items_data() {
 		// bootstrap with 20 items
 		this.get_items()
 			.then(({ items }) => {
@@ -890,6 +953,12 @@
 			});
 	}
 
+	reset_items() {
+		this.wrapper.find('.pos-items').empty();
+		this.init_clusterize();
+		this.load_items_data();
+	}
+
 	make_dom() {
 		this.wrapper.html(`
 			<div class="fields">
@@ -947,6 +1016,14 @@
 						this.filter_items({ item_group: item_group });
 					}
 				},
+				get_query: () => {
+					return {
+						query: 'erpnext.selling.page.point_of_sale.point_of_sale.item_group_query',
+						filters: {
+							pos_profile: this.frm.doc.pos_profile
+						}
+					};
+				}
 			},
 			parent: this.wrapper.find('.item-group-field'),
 			render_input: true
@@ -1113,9 +1190,10 @@
 				args: {
 					start,
 					page_length,
-					'price_list': this.pos_profile.selling_price_list,
+					'price_list': this.frm.doc.selling_price_list,
 					item_group,
-					search_value
+					search_value,
+					'pos_profile': this.frm.doc.pos_profile
 				}
 			}).then(r => {
 				// const { items, serial_no, batch_no } = r.message;
@@ -1430,4 +1508,4 @@
 		this.dialog.set_value("paid_amount", this.frm.doc.paid_amount);
 		this.dialog.set_value("outstanding_amount", this.frm.doc.outstanding_amount);
 	}
-}
\ No newline at end of file
+}
diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.py b/erpnext/selling/page/point_of_sale/point_of_sale.py
index 8dad0a3..d98a017 100644
--- a/erpnext/selling/page/point_of_sale/point_of_sale.py
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.py
@@ -4,9 +4,10 @@
 from __future__ import unicode_literals
 import frappe, json
 from frappe.utils.nestedset import get_root_of
+from erpnext.accounts.doctype.pos_profile.pos_profile import get_item_groups
 
 @frappe.whitelist()
-def get_items(start, page_length, price_list, item_group, search_value=""):
+def get_items(start, page_length, price_list, item_group, search_value="", pos_profile=None):
 	serial_no = ""
 	batch_no = ""
 	barcode = ""
@@ -33,6 +34,9 @@
 
 	item_code, condition = get_conditions(item_code, serial_no, batch_no, barcode)
 
+	if pos_profile:
+		condition += get_item_group_condition(pos_profile)
+
 	lft, rgt = frappe.db.get_value('Item Group', item_group, ['lft', 'rgt'])
 	# locate function is used to sort by closest match from the beginning of the value
 	res = frappe.db.sql("""select i.name as item_code, i.item_name, i.image as item_image,
@@ -95,3 +99,28 @@
 	doc.submit()
 
 	return doc
+
+def get_item_group_condition(pos_profile):
+	cond = "and 1=1"
+	item_groups = get_item_groups(pos_profile)
+	if item_groups:
+		cond = "and i.item_group in (%s)"%(', '.join(['%s']*len(item_groups)))
+
+	return cond % tuple(item_groups)
+
+def item_group_query(doctype, txt, searchfield, start, page_len, filters):
+	item_groups = []
+	cond = "1=1"
+	pos_profile= filters.get('pos_profile')
+
+	if pos_profile:
+		item_groups = get_item_groups(pos_profile)
+
+		if item_groups:
+			cond = "name in (%s)"%(', '.join(['%s']*len(item_groups)))
+			cond = cond % tuple(item_groups)
+
+	return frappe.db.sql(""" select distinct name from `tabItem Group`
+			where {condition} and (name like %(txt)s) limit {start}, {page_len}"""
+		.format(condition = cond, start=start, page_len= page_len),
+			{'txt': '%%%s%%' % txt})
diff --git a/erpnext/selling/page/point_of_sale/tests/test_point_of_sale.js b/erpnext/selling/page/point_of_sale/tests/test_point_of_sale.js
index c70d076..79d1700 100644
--- a/erpnext/selling/page/point_of_sale/tests/test_point_of_sale.js
+++ b/erpnext/selling/page/point_of_sale/tests/test_point_of_sale.js
@@ -4,7 +4,7 @@
 
 	frappe.run_serially([
 		() => frappe.set_route('point-of-sale'),
-		() => frappe.timeout(2),
+		() => frappe.timeout(3),
 		() => frappe.set_control('customer', 'Test Customer 1'),
 		() => frappe.timeout(0.2),
 		() => cur_frm.set_value('customer', 'Test Customer 1'),
diff --git a/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py b/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py
index 9075c3f..ffa4180 100644
--- a/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py
+++ b/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py
@@ -19,14 +19,19 @@
 
 	for d in customer_list:
 		row = []
-		outstanding_amt = get_customer_outstanding(d.name, filters.get("company"))
-		credit_limit = get_credit_limit(d.name, filters.get("company"))
+
+		outstanding_amt = get_customer_outstanding(d.name, filters.get("company"),
+			ignore_outstanding_sales_order=d.bypass_credit_limit_check_at_sales_order)
+
+		credit_limit = get_credit_limit(d.name, filters.get("company"))		
+
 		bal = flt(credit_limit) - flt(outstanding_amt)
 
 		if customer_naming_type == "Naming Series":
-			row = [d.name, d.customer_name, credit_limit, outstanding_amt, bal]
+			row = [d.name, d.customer_name, credit_limit, outstanding_amt, bal,
+				d.bypass_credit_limit_check_at_sales_order]
 		else:
-			row = [d.name, credit_limit, outstanding_amt, bal]
+			row = [d.name, credit_limit, outstanding_amt, bal, d.bypass_credit_limit_check_at_sales_order]
 
 		if credit_limit:
 			data.append(row)
@@ -35,8 +40,11 @@
 
 def get_columns(customer_naming_type):
 	columns = [
-		_("Customer") + ":Link/Customer:120", _("Credit Limit") + ":Currency:120",
-		_("Outstanding Amt") + ":Currency:100", _("Credit Balance") + ":Currency:120"
+		_("Customer") + ":Link/Customer:120",
+		_("Credit Limit") + ":Currency:120",
+		_("Outstanding Amt") + ":Currency:100",
+		_("Credit Balance") + ":Currency:120",
+		_("Bypass credit check at Sales Order ") + ":Check:240"
 	]
 
 	if customer_naming_type == "Naming Series":
@@ -50,5 +58,6 @@
 	if filters.get("customer"):
 		conditions += " where name = %(customer)s"
 
-	return frappe.db.sql("""select name, customer_name from `tabCustomer` %s""" 
-		% conditions, filters, as_dict=1)
+	return frappe.db.sql("""select name, customer_name,
+		bypass_credit_limit_check_at_sales_order from `tabCustomer` %s
+	""" % conditions, filters, as_dict=1)
\ No newline at end of file
diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js
index e9671c8..3d174b7 100644
--- a/erpnext/selling/sales_common.js
+++ b/erpnext/selling/sales_common.js
@@ -17,6 +17,13 @@
 	onload: function() {
 		this._super();
 		this.setup_queries();
+		this.frm.set_query('shipping_rule', function() {
+			return {
+				filters: {
+					"shipping_rule_type": "Selling"
+				}
+			};
+		});
 	},
 
 	setup_queries: function() {
@@ -191,6 +198,7 @@
 				},
 				callback:function(r){
 					if (in_list(['Delivery Note', 'Sales Invoice'], doc.doctype)) {
+					    me.set_batch_number(cdt, cdn);
 						me.batch_no(doc, cdt, cdn);
 					}
 				}
@@ -233,21 +241,6 @@
 		});
 	},
 
-	shipping_rule: function() {
-		var me = this;
-		if(this.frm.doc.shipping_rule) {
-			return this.frm.call({
-				doc: this.frm.doc,
-				method: "apply_shipping_rule",
-				callback: function(r) {
-					if(!r.exc) {
-						me.calculate_taxes_and_totals();
-					}
-				}
-			})
-		}
-	},
-
 	batch_no: function(doc, cdt, cdn) {
 		var me = this;
 		var item = frappe.get_doc(cdt, cdn);
@@ -343,7 +336,44 @@
 		} else {
 			this.frm.set_value("company_address_display", "");
 		}
-	}
+	},
+
+	conversion_factor: function(doc, cdt, cdn, dont_fetch_price_list_rate) {
+	    this._super(doc, cdt, cdn, dont_fetch_price_list_rate);
+		if(frappe.meta.get_docfield(cdt, "stock_qty", cdn)) {
+			this.set_batch_number(cdt, cdn);
+		}
+	},
+
+	qty: function(doc, cdt, cdn) {
+	    this._super(doc, cdt, cdn);
+		this.set_batch_number(cdt, cdn);
+	},
+
+	/* Determine appropriate batch number and set it in the form.
+	* @param {string} cdt - Document Doctype
+	* @param {string} cdn - Document name
+	*/
+	set_batch_number: function(cdt, cdn) {
+		const doc = frappe.get_doc(cdt, cdn);
+		if (doc && doc.has_batch_no) {
+			this._set_batch_number(doc);
+		}
+	},
+
+	_set_batch_number: function(doc) {
+		return frappe.call({
+			method: 'erpnext.stock.doctype.batch.batch.get_batch_no',
+			args: {'item_code': doc.item_code, 'warehouse': doc.warehouse, 'qty': flt(doc.qty) * flt(doc.conversion_factor)},
+			callback: function(r) {
+				if(r.message) {
+					frappe.model.set_value(doc.doctype, doc.name, 'batch_no', r.message);
+				} else {
+				    frappe.model.set_value(doc.doctype, doc.name, 'batch_no', r.message);
+				}
+			}
+		});
+	},
 });
 
 frappe.ui.form.on(cur_frm.doctype,"project", function(frm) {
diff --git a/erpnext/setup/doctype/company/company.js b/erpnext/setup/doctype/company/company.js
index 34ecf26..a0e11d6 100644
--- a/erpnext/setup/doctype/company/company.js
+++ b/erpnext/setup/doctype/company/company.js
@@ -96,6 +96,7 @@
 			method: "erpnext.accounts.doctype.account.chart_of_accounts.chart_of_accounts.get_charts_for_country",
 			args: {
 				"country": doc.country,
+				"with_standard": true
 			},
 			callback: function(r) {
 				if(!r.exc) {
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index f1b10a9..ce39ae1 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -1,2148 +1,2178 @@
 {
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "field:company_name",
- "beta": 0,
- "creation": "2013-04-10 08:35:39",
- "custom": 0,
- "description": "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Setup",
- "editable_grid": 0,
- "engine": "InnoDB",
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:company_name", 
+ "beta": 0, 
+ "creation": "2013-04-10 08:35:39", 
+ "custom": 0, 
+ "description": "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "details",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "company_name",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Company",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "company_name",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "company_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "",
-   "fieldname": "abbr",
-   "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": "Abbr",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "abbr",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "", 
+   "fieldname": "abbr", 
+   "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": "Abbr", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "abbr", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal && in_list(frappe.user_roles, \"System Manager\")",
-   "fieldname": "change_abbr",
-   "fieldtype": "Button",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Change Abbreviation",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal && in_list(frappe.user_roles, \"System Manager\")", 
+   "fieldname": "change_abbr", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Change Abbreviation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "cb0",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cb0", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "domain",
-   "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": "Domain",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Distribution\nManufacturing\nRetail\nServices\nEducation\nHealthcare\nOther",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "domain", 
+   "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": "Domain", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Domain", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "sales_settings",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Sales",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "sales_settings", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Sales", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "sales_monthly_history",
-   "fieldtype": "Small Text",
-   "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": "Sales Monthly History",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "sales_monthly_history", 
+   "fieldtype": "Small Text", 
+   "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": "Sales Monthly History", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "monthly_sales_target",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Monthly Sales Target",
-   "length": 0,
-   "no_copy": 0,
-   "options": "default_currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "monthly_sales_target", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Monthly Sales Target", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_goals",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_goals", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "total_monthly_sales",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Total Monthly Sales",
-   "length": 0,
-   "no_copy": 1,
-   "options": "default_currency",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_monthly_sales", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Monthly Sales", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "charts_section",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Values",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "charts_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Values", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "default_letter_head",
-   "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": "Default Letter Head",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Letter Head",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default_letter_head", 
+   "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": "Default Letter Head", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Letter Head", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "default_holiday_list",
-   "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": "Default Holiday List",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Holiday List",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default_holiday_list", 
+   "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": "Default Holiday List", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Holiday List", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "default_terms",
-   "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": "Default Terms",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Terms and Conditions",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default_terms", 
+   "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": "Default Terms", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Terms and Conditions", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "default_currency",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Currency",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default_currency", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Currency", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_10",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_10", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "country",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Country",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Country",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "country", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Country", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Country", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "create_chart_of_accounts_based_on",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Create Chart Of Accounts Based On",
-   "length": 0,
-   "no_copy": 0,
-   "options": "\nStandard Template\nExisting Company",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "create_chart_of_accounts_based_on", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Create Chart Of Accounts Based On", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nStandard Template\nExisting Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Standard Template\"",
-   "fieldname": "chart_of_accounts",
-   "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": "Chart Of Accounts Template",
-   "length": 0,
-   "no_copy": 1,
-   "options": "",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Standard Template\"", 
+   "fieldname": "chart_of_accounts", 
+   "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": "Chart Of Accounts Template", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Existing Company\"",
-   "fieldname": "existing_company",
-   "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": "Existing Company ",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Company",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Existing Company\"", 
+   "fieldname": "existing_company", 
+   "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": "Existing Company ", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0 
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "tax_id", 
+   "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": "Tax ID", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0 
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default_settings", 
+   "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": "Accounts Settings", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "default_settings",
-   "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": "Accounts Settings",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "default_bank_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Bank Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "default_bank_account", 
+   "oldfieldtype": "Link", 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "default_bank_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Bank Account",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "default_bank_account",
-   "oldfieldtype": "Link",
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "default_cash_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Cash Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "default_cash_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Cash Account",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "default_receivable_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Receivable Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "receivables_group", 
+   "oldfieldtype": "Link", 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "default_receivable_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Receivable Account",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "receivables_group",
-   "oldfieldtype": "Link",
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "round_off_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Round Off Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "round_off_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Round Off Account",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Account",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "write_off_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Write Off Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "write_off_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Write Off Account",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Account",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "exchange_gain_loss_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Exchange Gain / Loss Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "exchange_gain_loss_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Exchange Gain / Loss Account",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Account",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break0",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Column Break",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break0", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "default_payable_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Payable Account",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "payables_group",
-   "oldfieldtype": "Link",
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "default_payable_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Payable Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "payables_group", 
+   "oldfieldtype": "Link", 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "default_expense_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Cost of Goods Sold Account",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "default_expense_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Cost of Goods Sold Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "default_income_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Income Account",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "default_income_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Income Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "default_payroll_payable_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Payroll Payable Account",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Account",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "default_payroll_payable_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Payroll Payable Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "round_off_cost_center",
-   "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": "Round Off Cost Center",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Cost Center",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "round_off_cost_center", 
+   "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": "Round Off Cost Center", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "section_break_22",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_22", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "cost_center",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Cost Center",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Cost Center",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "cost_center", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Cost Center", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "credit_limit",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Credit Limit",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "credit_limit",
-   "oldfieldtype": "Currency",
-   "options": "default_currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "credit_limit", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Credit Limit", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "credit_limit", 
+   "oldfieldtype": "Currency", 
+   "options": "default_currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_26",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_26", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "credit_days_based_on",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Credit Days Based On",
-   "length": 0,
-   "no_copy": 0,
-   "options": "\nFixed Days\nLast Day of the Next Month",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "credit_days_based_on", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Credit Days Based On", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nFixed Days\nLast Day of the Next Month", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:(!doc.__islocal && doc.credit_days_based_on=='Fixed Days')",
-   "fieldname": "credit_days",
-   "fieldtype": "Int",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Credit Days",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "credit_days",
-   "oldfieldtype": "Int",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:(!doc.__islocal && doc.credit_days_based_on=='Fixed Days')", 
+   "fieldname": "credit_days", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Credit Days", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "credit_days", 
+   "oldfieldtype": "Int", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "auto_accounting_for_stock_settings",
-   "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": "Stock Settings",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "auto_accounting_for_stock_settings", 
+   "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": "Stock Settings", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "1",
-   "fieldname": "enable_perpetual_inventory",
-   "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": "Enable Perpetual Inventory",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "fieldname": "enable_perpetual_inventory", 
+   "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": "Enable Perpetual Inventory", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "default_inventory_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Inventory Account",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Account",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default_inventory_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Inventory Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "stock_adjustment_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Stock Adjustment Account",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "stock_adjustment_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Stock Adjustment Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_32",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_32", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "stock_received_but_not_billed",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Stock Received But Not Billed",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "stock_received_but_not_billed", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Stock Received But Not Billed", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "expenses_included_in_valuation",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Expenses Included In Valuation",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "expenses_included_in_valuation", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Expenses Included In Valuation", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "fixed_asset_depreciation_settings",
-   "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": "Fixed Asset Depreciation Settings",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "fixed_asset_depreciation_settings", 
+   "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": "Fixed Asset Depreciation Settings", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "accumulated_depreciation_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Accumulated Depreciation Account",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Account",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "accumulated_depreciation_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Accumulated Depreciation Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "depreciation_expense_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Depreciation Expense Account",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Account",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "depreciation_expense_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Depreciation Expense Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "series_for_depreciation_entry",
-   "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": "Series for Asset Depreciation Entry (Journal Entry)",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "series_for_depreciation_entry", 
+   "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": "Series for Asset Depreciation Entry (Journal Entry)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_40",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_40", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "disposal_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Gain/Loss Account on Asset Disposal",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Account",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "disposal_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Gain/Loss Account on Asset Disposal", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "depreciation_cost_center",
-   "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": "Asset Depreciation Cost Center",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Cost Center",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "depreciation_cost_center", 
+   "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": "Asset Depreciation Cost Center", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "For reference only.",
-   "fieldname": "company_info",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Company Info",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "For reference only.", 
+   "fieldname": "company_info", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company Info", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "address_html",
-   "fieldtype": "HTML",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "address_html", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break1",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Column Break",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "phone_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": "Phone No",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "phone_no",
-   "oldfieldtype": "Data",
-   "options": "Phone",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "phone_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": "Phone No", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "phone_no", 
+   "oldfieldtype": "Data", 
+   "options": "Phone", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "fax",
-   "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": "Fax",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "fax",
-   "oldfieldtype": "Data",
-   "options": "Phone",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "fax", 
+   "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": "Fax", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "fax", 
+   "oldfieldtype": "Data", 
+   "options": "Phone", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "email",
-   "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": "Email",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "email",
-   "oldfieldtype": "Data",
-   "options": "Email",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "email", 
+   "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": "Email", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "email", 
+   "oldfieldtype": "Data", 
+   "options": "Email", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "website",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Website",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "website",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "website", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Website", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "website", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "",
-   "fieldname": "registration_info",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "", 
+   "fieldname": "registration_info", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "Company registration numbers for your reference. Tax numbers etc.",
-   "fieldname": "registration_details",
-   "fieldtype": "Code",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Registration Details",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "registration_details",
-   "oldfieldtype": "Code",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Company registration numbers for your reference. Tax numbers etc.", 
+   "fieldname": "registration_details", 
+   "fieldtype": "Code", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Registration Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "registration_details", 
+   "oldfieldtype": "Code", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "delete_company_transactions",
-   "fieldtype": "Button",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Delete Company Transactions",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "delete_company_transactions", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Delete Company Transactions", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
   }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "fa fa-building",
- "idx": 1,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "menu_index": 0,
- "modified": "2017-09-06 15:08:44.360880",
- "modified_by": "mohan@annapurna.com",
- "module": "Setup",
- "name": "Company",
- "owner": "Administrator",
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "fa fa-building", 
+ "idx": 1, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2017-12-07 17:40:24.646920", 
+ "modified_by": "Administrator", 
+ "module": "Setup", 
+ "name": "Company", 
+ "owner": "Administrator", 
  "permissions": [
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 0,
-   "role": "Accounts User",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Employee",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Employee", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Sales User",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Sales User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Purchase User",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Purchase User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Stock User",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Stock User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Projects User",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Projects User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
   }
- ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 1,
- "sort_order": "ASC",
- "track_changes": 1,
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
+ "sort_order": "ASC", 
+ "track_changes": 1, 
  "track_seen": 0
-}
+}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index 4884c06..cebcd34 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -249,10 +249,10 @@
 			frappe.db.sql("""delete from `tabWarehouse` where company=%s""", self.name)
 
 		frappe.defaults.clear_default("company", value=self.name)
+		frappe.db.sql("delete from `tabMode of Payment Account` where company=%s", self.name)
 
 		# clear default accounts, warehouses from item
 		if warehouses:
-
 			for f in ["default_warehouse", "website_warehouse"]:
 				frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)"""
 					% (f, f, ', '.join(['%s']*len(warehouses))), tuple(warehouses))
@@ -324,7 +324,7 @@
 	path = frappe.get_app_path('erpnext', 'regional', frappe.scrub(company_doc.country))
 	if os.path.exists(path.encode("utf-8")):
 		frappe.get_attr("erpnext.regional.{0}.setup.setup"
-			.format(company_doc.country.lower()))(company_doc)
+			.format(frappe.scrub(company_doc.country)))(company_doc)
 
 def update_company_current_month_sales(company):
 	current_month_year = formatdate(today(), "MM-yyyy")
diff --git a/erpnext/setup/doctype/global_defaults/global_defaults.py b/erpnext/setup/doctype/global_defaults/global_defaults.py
index 9c6eb82..a39e246 100644
--- a/erpnext/setup/doctype/global_defaults/global_defaults.py
+++ b/erpnext/setup/doctype/global_defaults/global_defaults.py
@@ -57,7 +57,8 @@
 		self.disable_rounded_total = cint(self.disable_rounded_total)
 
 		# Make property setters to hide rounded total fields
-		for doctype in ("Quotation", "Sales Order", "Sales Invoice", "Delivery Note"):
+		for doctype in ("Quotation", "Sales Order", "Sales Invoice", "Delivery Note",
+			"Supplier Quotation", "Purchase Order"):
 			make_property_setter(doctype, "base_rounded_total", "hidden", self.disable_rounded_total, "Check")
 			make_property_setter(doctype, "base_rounded_total", "print_hide", 1, "Check")
 
@@ -69,6 +70,6 @@
 
 		# Make property setters to hide in words fields
 		for doctype in ("Quotation", "Sales Order", "Sales Invoice", "Delivery Note",
-						"Supplier Quotation", "Purchase Order", "Purchase Invoice", "Purchase Receipt"):
+				"Supplier Quotation", "Purchase Order", "Purchase Invoice", "Purchase Receipt"):
 			make_property_setter(doctype, "in_words", "hidden", self.disable_in_words, "Check")
 			make_property_setter(doctype, "in_words", "print_hide", self.disable_in_words, "Check")
diff --git a/erpnext/setup/doctype/item_group/item_group.py b/erpnext/setup/doctype/item_group/item_group.py
index 5dbbd62..5d3ef78 100644
--- a/erpnext/setup/doctype/item_group/item_group.py
+++ b/erpnext/setup/doctype/item_group/item_group.py
@@ -47,9 +47,6 @@
 
 			return self.route
 
-	def after_rename(self, olddn, newdn, merge=False):
-		NestedSet.after_rename(self, olddn, newdn, merge)
-
 	def on_trash(self):
 		NestedSet.on_trash(self)
 		WebsiteGenerator.on_trash(self)
@@ -60,7 +57,7 @@
 
 	def get_context(self, context):
 		context.show_search=True
-		context.page_length = 6
+		context.page_length = cint(frappe.db.get_single_value('Products Settings', 'products_per_page')) or 6
 		context.search_link = '/product_search'
 
 		start = int(frappe.form_dict.start or 0)
@@ -84,24 +81,26 @@
 	child_groups = ", ".join(['"' + frappe.db.escape(i[0]) + '"' for i in get_child_groups(product_group)])
 
 	# base query
-	query = """select name, item_name, item_code, route, image, website_image, thumbnail, item_group,
-			description, web_long_description as website_description
-		from `tabItem`
-		where show_in_website = 1
-			and disabled=0
-			and (end_of_life is null or end_of_life='0000-00-00' or end_of_life > %(today)s)
-			and (variant_of = '' or variant_of is null)
-			and (item_group in ({child_groups})
-			or name in (select parent from `tabWebsite Item Group` where item_group in ({child_groups})))
+	query = """select I.name, I.item_name, I.item_code, I.route, I.image, I.website_image, I.thumbnail, I.item_group,
+			I.description, I.web_long_description as website_description,
+			case when (S.actual_qty - S.reserved_qty) > 0 then 1 else 0 end as in_stock
+		from `tabItem` I
+		left join tabBin S on I.item_code = S.item_code and I.website_warehouse = S.warehouse
+		where I.show_in_website = 1
+			and I.disabled = 0
+			and (I.end_of_life is null or I.end_of_life='0000-00-00' or I.end_of_life > %(today)s)
+			and (I.variant_of = '' or I.variant_of is null)
+			and (I.item_group in ({child_groups})
+			or I.name in (select parent from `tabWebsite Item Group` where item_group in ({child_groups})))
 			""".format(child_groups=child_groups)
 	# search term condition
 	if search:
-		query += """ and (web_long_description like %(search)s
-				or item_name like %(search)s
-				or name like %(search)s)"""
+		query += """ and (I.web_long_description like %(search)s
+				or I.item_name like %(search)s
+				or I.name like %(search)s)"""
 		search = "%" + cstr(search) + "%"
 
-	query += """order by weightage desc, item_name, modified desc limit %s, %s""" % (start, limit)
+	query += """order by I.weightage desc, in_stock desc, I.item_name limit %s, %s""" % (start, limit)
 
 	data = frappe.db.sql(query, {"product_group": product_group,"search": search, "today": nowdate()}, as_dict=1)
 
diff --git a/erpnext/setup/doctype/supplier_type/supplier_type.json b/erpnext/setup/doctype/supplier_type/supplier_type.json
index 9b40e0f..d7d7084 100644
--- a/erpnext/setup/doctype/supplier_type/supplier_type.json
+++ b/erpnext/setup/doctype/supplier_type/supplier_type.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:supplier_type", 
@@ -12,6 +13,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -42,6 +44,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -71,12 +74,13 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "credit_days_based_on", 
-   "fieldtype": "Select", 
+   "fieldname": "payment_terms", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -84,39 +88,10 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Credit Days Based On", 
+   "label": "Default Payment Terms Template", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "\nFixed Days\nLast Day of the Next Month", 
-   "permlevel": 1, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.credit_days_based_on=='Fixed Days'", 
-   "fieldname": "credit_days", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Credit Days", 
-   "length": 0, 
-   "no_copy": 0, 
+   "options": "Payment Terms Template", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -130,6 +105,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -158,6 +134,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -189,18 +166,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-flag", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-20 13:25:25.641431", 
+ "modified": "2017-09-04 18:54:10.093500", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Supplier Type", 
diff --git a/erpnext/setup/doctype/supplier_type/test_supplier_type.js b/erpnext/setup/doctype/supplier_type/test_supplier_type.js
new file mode 100644
index 0000000..085dddd
--- /dev/null
+++ b/erpnext/setup/doctype/supplier_type/test_supplier_type.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Supplier Type", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Supplier Type
+		() => frappe.tests.make('Supplier Type', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/setup/setup_wizard/data/country_wise_tax.json b/erpnext/setup/setup_wizard/data/country_wise_tax.json
index cf320f3..0e4ba6b 100644
--- a/erpnext/setup/setup_wizard/data/country_wise_tax.json
+++ b/erpnext/setup/setup_wizard/data/country_wise_tax.json
@@ -1077,6 +1077,29 @@
 		}
 	},
 
+	"Saudi Arabia": {
+		"KSA VAT 5%": {
+			"account_name": "VAT 5%",
+			"tax_rate": 5.00
+		},
+		"KSA VAT Zero": {
+			"account_name": "VAT Zero",
+			"tax_rate": 0.00
+		},
+		"KSA VAT Exempted": {
+			"account_name": "VAT Exempted",
+			"tax_rate": 0.00
+		},
+		"KSA Excise 50%": {
+			"account_name": "Excise 50%",
+			"tax_rate": 50.00
+		},
+		"KSA Excise 100%": {
+			"account_name": "Excise 100%",
+			"tax_rate": 100.00
+		}
+	},
+
 	"Serbia": {
 		"Serbia Tax": {
 			"account_name": "VAT",
@@ -1311,6 +1334,29 @@
 		}
 	},
 
+	"United Arab Emirates": {
+		"UAE VAT 5%": {
+			"account_name": "VAT 5%",
+			"tax_rate": 5.00
+		},
+		"UAE VAT Zero": {
+			"account_name": "VAT Zero",
+			"tax_rate": 0.00
+		},
+		"UAE VAT Exempted": {
+			"account_name": "VAT Exempted",
+			"tax_rate": 0.00
+		},
+		"UAE Excise 50%": {
+			"account_name": "Excise 50%",
+			"tax_rate": 50.00
+		},
+		"UAE Excise 100%": {
+			"account_name": "Excise 100%",
+			"tax_rate": 100.00
+		}
+	},
+
 	"United Kingdom": {
 		"United Kingdom Tax": {
 			"account_name": "VAT",
diff --git a/erpnext/setup/setup_wizard/data/test_mfg.json b/erpnext/setup/setup_wizard/data/test_mfg.json
index b6ea665..efc5fa8 100644
--- a/erpnext/setup/setup_wizard/data/test_mfg.json
+++ b/erpnext/setup/setup_wizard/data/test_mfg.json
@@ -8,7 +8,7 @@
  "currency": "INR",
  "customer_1": "Test Customer 1",
  "customer_2": "Test Customer 2",
- "domain": "Manufacturing",
+ "domains": ["Manufacturing"],
  "email": "great@example.com",
  "full_name": "Great Tester",
  "fy_end_date": "2018-03-31",
diff --git a/erpnext/setup/setup_wizard/install_fixtures.py b/erpnext/setup/setup_wizard/install_fixtures.py
index 0f98214..68a1578 100644
--- a/erpnext/setup/setup_wizard/install_fixtures.py
+++ b/erpnext/setup/setup_wizard/install_fixtures.py
@@ -20,6 +20,8 @@
 		{ 'doctype': 'Domain', 'domain': 'Services'},
 		{ 'doctype': 'Domain', 'domain': 'Education'},
 		{ 'doctype': 'Domain', 'domain': 'Healthcare'},
+		{ 'doctype': 'Domain', 'domain': 'Agriculture'},
+		{ 'doctype': 'Domain', 'domain': 'Non Profit'},
 
 		# Setup Progress
 		{'doctype': "Setup Progress", "actions": [
@@ -44,6 +46,8 @@
 			{"action_name": "Add Rooms", "action_doctype": "Room", "min_doc_count": 1, "is_completed": 0,
 				"domains": '["Education"]' },
 			{"action_name": "Add Users", "action_doctype": "User", "min_doc_count": 4, "is_completed": 0,
+				"domains": '[]' },
+			{"action_name": "Add Letterhead", "action_doctype": "Letter Head", "min_doc_count": 1, "is_completed": 0,
 				"domains": '[]' }
 		]},
 
@@ -211,6 +215,12 @@
 		{'doctype': "Party Type", "party_type": "Customer"},
 		{'doctype': "Party Type", "party_type": "Supplier"},
 		{'doctype': "Party Type", "party_type": "Employee"},
+		{'doctype': "Party Type", "party_type": "Member"},
+
+		{'doctype': "Opportunity Type", "name": "Hub"},
+		{'doctype': "Opportunity Type", "name": _("Sales")},
+		{'doctype': "Opportunity Type", "name": _("Support")},
+		{'doctype': "Opportunity Type", "name": _("Maintenance")},
 
 		{'doctype': "Project Type", "project_type": "Internal"},
 		{'doctype': "Project Type", "project_type": "External"},
diff --git a/erpnext/setup/setup_wizard/sample_data.py b/erpnext/setup/setup_wizard/sample_data.py
index 43911f0..c302841 100644
--- a/erpnext/setup/setup_wizard/sample_data.py
+++ b/erpnext/setup/setup_wizard/sample_data.py
@@ -10,7 +10,7 @@
 from frappe import _
 from markdown2 import markdown
 
-def make_sample_data(domain, make_dependent = False):
+def make_sample_data(domains, make_dependent = False):
 	"""Create a few opportunities, quotes, material requests, issues, todos, projects
 	to help the user get started"""
 
@@ -28,7 +28,7 @@
 		if items and warehouses:
 			make_material_request(frappe.get_all("Item"))
 
-	make_projects(domain)
+	make_projects(domains)
 	import_email_alert()
 
 	frappe.db.commit()
@@ -38,7 +38,7 @@
 		"doctype": "Opportunity",
 		"enquiry_from": "Customer",
 		"customer": customer,
-		"enquiry_type": "Sales",
+		"opportunity_type": _("Sales"),
 		"with_items": 1
 	})
 
@@ -89,7 +89,7 @@
 def make_issue():
 	pass
 
-def make_projects(domain):
+def make_projects(domains):
 	current_date = frappe.utils.nowdate()
 	project = frappe.get_doc({
 		"doctype": "Project",
@@ -104,19 +104,19 @@
 			"file": "explore.md"
 		}]
 
-	if domain == 'Education':
+	if 'Education' in domains:
 		tasks += [
 			{
-				"title": _("Setup your School in ERPNext"),
+				"title": _("Setup your Institute in ERPNext"),
 				"start_date": current_date,
 				"end_date": frappe.utils.add_days(current_date, 1),
-				"file": "school_masters.md"
+				"file": "education_masters.md"
 			},
 			{
 				"title": "Setup Master Data",
 				"start_date": current_date,
 				"end_date": frappe.utils.add_days(current_date, 1),
-				"file": "school_masters.md"
+				"file": "education_masters.md"
 			}]
 
 	else:
diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py
index 28e617f..e861a96 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -39,8 +39,10 @@
 	create_logo(args)
 
 	frappe.local.message_log = []
+
+	domains = args.get('domains')
 	domain_settings = frappe.get_single('Domain Settings')
-	domain_settings.set_active_domains([args.get('domain')])
+	domain_settings.set_active_domains(domains)
 
 	frappe.db.commit()
 	login_as_first_user(args)
@@ -49,7 +51,7 @@
 	frappe.clear_cache()
 
 	try:
-		make_sample_data(args.get('domain'))
+		make_sample_data(domains)
 		frappe.clear_cache()
 	except:
 		# clear message
@@ -80,7 +82,7 @@
 			'country': args.get('country'),
 			'create_chart_of_accounts_based_on': 'Standard Template',
 			'chart_of_accounts': args.get('chart_of_accounts'),
-			'domain': args.get('domain')
+			'domain': args.get('domains')[0]
 		}).insert()
 
 		#Enable shopping cart
@@ -254,7 +256,9 @@
 
 		accounts = []
 		for i, name in enumerate(account_name):
-			accounts.append(make_tax_account(company, account_name[i], tax_rate[i]))
+			tax_account = make_tax_account(company, account_name[i], tax_rate[i])
+			if tax_account:
+				accounts.append(tax_account)
 
 		if accounts:
 			make_sales_and_purchase_tax_templates(accounts, template_name)
diff --git a/erpnext/setup/setup_wizard/tasks/education_masters.md b/erpnext/setup/setup_wizard/tasks/education_masters.md
new file mode 100644
index 0000000..d0887d2
--- /dev/null
+++ b/erpnext/setup/setup_wizard/tasks/education_masters.md
@@ -0,0 +1,9 @@
+Lets start making things in ERPNext that are representative of your institution.
+
+1. Make a list of **Programs** that you offer
+1. Add a few **Courses** that your programs cover
+1. Create **Academic Terms** and **Academic Years**
+1. Start adding **Students**
+1. Group your students into **Batches**
+
+Watch this video to learn more about ERPNext Education: https://www.youtube.com/watch?v=f6foQOyGzdA
diff --git a/erpnext/setup/setup_wizard/tasks/school_import_data.md b/erpnext/setup/setup_wizard/tasks/school_import_data.md
index c465b81..1fbe049 100644
--- a/erpnext/setup/setup_wizard/tasks/school_import_data.md
+++ b/erpnext/setup/setup_wizard/tasks/school_import_data.md
@@ -1,5 +1,5 @@
 Lets import some data! 💪💪
 
-If you are already running a school, you most likely have your Students in some spreadsheet file somewhere. Import it into ERPNext with the Data Import Tool.
+If you are already running a Institute, you most likely have your Students in some spreadsheet file somewhere. Import it into ERPNext with the Data Import Tool.
 
 Watch this video to get started: https://www.youtube.com/watch?v=Ta2Xx3QoK3E
\ No newline at end of file
diff --git a/erpnext/setup/setup_wizard/tasks/school_masters.md b/erpnext/setup/setup_wizard/tasks/school_masters.md
deleted file mode 100644
index 9103935..0000000
--- a/erpnext/setup/setup_wizard/tasks/school_masters.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Lets start making things in ERPNext that are representative of your institution.
-
-1. Make a list of **Programs** that you offer
-1. Add a few **Courses** that your programs cover
-1. Create **Academic Terms** and **Academic Years**
-1. Start adding **Students**
-1. Group your students into **Batches**
-
-Watch this video to learn more about ERPNext Schools: https://www.youtube.com/watch?v=f6foQOyGzdA
diff --git a/erpnext/setup/setup_wizard/test_setup_wizard.py b/erpnext/setup/setup_wizard/test_setup_wizard.py
index 97650f2..a489133 100644
--- a/erpnext/setup/setup_wizard/test_setup_wizard.py
+++ b/erpnext/setup/setup_wizard/test_setup_wizard.py
@@ -40,7 +40,7 @@
 	time.sleep(1)
 
 	# domain slide
-	driver.set_select("domain", "Manufacturing")
+	driver.set_multicheck("domains", ["Manufacturing"])
 	time.sleep(1)
 	driver.click(".next-btn")
 
diff --git a/erpnext/setup/utils.py b/erpnext/setup/utils.py
index 003a57c..5fcc3a2 100644
--- a/erpnext/setup/utils.py
+++ b/erpnext/setup/utils.py
@@ -41,7 +41,7 @@
 			"email"				:"test@erpnext.com",
 			"password"			:"test",
 			"chart_of_accounts" : "Standard",
-			"domain"			: "Manufacturing"
+			"domains"			: ["Manufacturing"],
 		})
 
 	frappe.db.sql("delete from `tabLeave Allocation`")
@@ -120,3 +120,18 @@
 	frappe.get_single('Domain Settings').set_active_domains(\
 		[d.name for d in domains])
 	add_all_roles_to('Administrator')
+
+
+def insert_record(records):
+	for r in records:
+		doc = frappe.new_doc(r.get("doctype"))
+		doc.update(r)
+		try:
+			doc.insert(ignore_permissions=True)
+		except frappe.DuplicateEntryError, e:
+			# pass DuplicateEntryError and continue
+			if e.args and e.args[0]==doc.doctype and e.args[1]==doc.name:
+				# make sure DuplicateEntryError is for the exact same doc and not a related doc
+				pass
+			else:
+				raise
diff --git a/erpnext/shopping_cart/cart.py b/erpnext/shopping_cart/cart.py
index 5c7d825..fcbb63c 100644
--- a/erpnext/shopping_cart/cart.py
+++ b/erpnext/shopping_cart/cart.py
@@ -10,8 +10,11 @@
 from erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings import get_shopping_cart_settings
 from frappe.utils.nestedset import get_root_of
 from erpnext.accounts.utils import get_account_name
+from erpnext.utilities.product import get_qty_in_stock
 
-class WebsitePriceListMissingError(frappe.ValidationError): pass
+
+class WebsitePriceListMissingError(frappe.ValidationError):
+	pass
 
 def set_cart_count(quotation=None):
 	if cint(frappe.db.get_singles_value("Shopping Cart Settings", "enabled")):
@@ -33,12 +36,15 @@
 
 	addresses = get_address_docs(party=party)
 
+	if not doc.customer_address and addresses:
+		update_cart_address("customer_address", addresses[0].name)
+
 	return {
 		"doc": decorate_quotation_doc(doc),
 		"shipping_addresses": [{"name": address.name, "display": address.display}
-			for address in addresses if address.address_type == "Shipping"],
+			for address in addresses],
 		"billing_addresses": [{"name": address.name, "display": address.display}
-			for address in addresses if address.address_type == "Billing"],
+			for address in addresses],
 		"shipping_rules": get_applicable_shipping_rules(party)
 	}
 
@@ -46,9 +52,8 @@
 def place_order():
 	quotation = _get_cart_quotation()
 	quotation.company = frappe.db.get_value("Shopping Cart Settings", None, "company")
-	for fieldname in ["customer_address", "shipping_address_name"]:
-		if not quotation.get(fieldname):
-			throw(_("{0} is required").format(quotation.meta.get_label(fieldname)))
+	if not quotation.get("customer_address"):
+		throw(_("{0} is required").format(_(quotation.meta.get_label("customer_address"))))
 
 	quotation.flags.ignore_permissions = True
 	quotation.submit()
@@ -61,6 +66,9 @@
 	sales_order = frappe.get_doc(_make_sales_order(quotation.name, ignore_permissions=True))
 	for item in sales_order.get("items"):
 		item.reserved_warehouse = frappe.db.get_value("Item", item.item_code, "website_warehouse") or None
+		item_stock = get_qty_in_stock(item.item_code, "website_warehouse")
+		if item.qty > item_stock.stock_qty[0][0]:
+			throw(_("Only {0} in stock for item {1}").format(item_stock.stock_qty[0][0], item.item_code))
 
 	sales_order.flags.ignore_permissions = True
 	sales_order.insert()
@@ -98,6 +106,7 @@
 	apply_cart_settings(quotation=quotation)
 
 	quotation.flags.ignore_permissions = True
+	quotation.payment_schedule = []
 	if not empty_card:
 		quotation.save()
 	else:
@@ -173,6 +182,7 @@
 
 	return doc
 
+
 def _get_cart_quotation(party=None):
 	'''Return the open Quotation of type "Shopping Cart" or make a new one'''
 	if not party:
@@ -194,6 +204,7 @@
 			"status": "Draft",
 			"docstatus": 0,
 			"__islocal": 1,
+			"payment_terms_template": "_Test Payment Term Template",
 			(party.doctype.lower()): party.name
 		})
 
diff --git a/erpnext/shopping_cart/test_shopping_cart.py b/erpnext/shopping_cart/test_shopping_cart.py
index 22b2895..0c94cd8 100644
--- a/erpnext/shopping_cart/test_shopping_cart.py
+++ b/erpnext/shopping_cart/test_shopping_cart.py
@@ -8,6 +8,9 @@
 from erpnext.shopping_cart.cart import _get_cart_quotation, update_cart, get_party
 from erpnext.tests.utils import create_test_contact_and_address
 
+
+test_dependencies = ['Payment Terms Template']
+
 class TestShoppingCart(unittest.TestCase):
 	"""
 		Note:
@@ -62,7 +65,6 @@
 		self.assertEquals(quotation.get("items")[0].qty, 1)
 		self.assertEquals(quotation.get("items")[0].amount, 10)
 
-
 		# add second item
 		update_cart("_Test Item 2", 1)
 		quotation = self.test_get_cart_customer()
@@ -127,6 +129,7 @@
 			"selling_price_list": "_Test Price List Rest of the World",
 			"currency": "USD",
 			"taxes_and_charges" : "_Test Tax 1",
+			"conversion_rate":1,
 			"transaction_date" : nowdate(),
 			"valid_till" : add_months(nowdate(), 1),
 			"items": [{
diff --git a/erpnext/stock/dashboard/item_dashboard.js b/erpnext/stock/dashboard/item_dashboard.js
index 113a2ef..3c334c4 100644
--- a/erpnext/stock/dashboard/item_dashboard.js
+++ b/erpnext/stock/dashboard/item_dashboard.js
@@ -80,7 +80,7 @@
 			$(frappe.render_template('item_dashboard_list', context)).appendTo(this.result);
 		} else {
 			var message = __(" Currently no stock available in any warehouse")
-			$("<span class='small'> <i class='fa fa-exclamation-triangle' aria-hidden='true'></i>"+message+"</span>").appendTo(this.result);
+			$("<span class='text-muted small'>"+message+"</span>").appendTo(this.result);
 		}
 	},
 	get_item_dashboard_data: function(data, max_count, show_item) {
diff --git a/erpnext/stock/doctype/batch/batch.js b/erpnext/stock/doctype/batch/batch.js
index d299ed1..677d0f0 100644
--- a/erpnext/stock/doctype/batch/batch.js
+++ b/erpnext/stock/doctype/batch/batch.js
@@ -24,6 +24,11 @@
 			frm.trigger('make_dashboard');
 		}
 	},
+	item: (frm) => {
+		frappe.db.get_value('Item', {name: frm.doc.item}, 'has_expiry_date', (r) => {
+			frm.toggle_reqd('expiry_date', r.has_expiry_date);
+		});
+	},
 	make_dashboard: (frm) => {
 		if(!frm.is_new()) {
 			frappe.call({
diff --git a/erpnext/stock/doctype/batch/batch.py b/erpnext/stock/doctype/batch/batch.py
index c58a98d..760643c 100644
--- a/erpnext/stock/doctype/batch/batch.py
+++ b/erpnext/stock/doctype/batch/batch.py
@@ -5,7 +5,8 @@
 import frappe
 from frappe import _
 from frappe.model.document import Document
-from frappe.utils import flt
+from frappe.utils import flt, cint
+
 
 class UnableToSelectBatchError(frappe.ValidationError): pass
 
@@ -53,16 +54,19 @@
 			from `tabStock Ledger Entry`
 			where warehouse=%s and batch_no=%s""",
 			(warehouse, batch_no))[0][0] or 0)
+
 	if batch_no and not warehouse:
 		out = frappe.db.sql('''select warehouse, sum(actual_qty) as qty
 			from `tabStock Ledger Entry`
 			where batch_no=%s
 			group by warehouse''', batch_no, as_dict=1)
+
 	if not batch_no and item_code and warehouse:
 		out = frappe.db.sql('''select batch_no, sum(actual_qty) as qty
 			from `tabStock Ledger Entry`
 			where item_code = %s and warehouse=%s
 			group by batch_no''', (item_code, warehouse), as_dict=1)
+
 	return out
 
 @frappe.whitelist()
@@ -114,21 +118,42 @@
 				if flt(batch_qty) < flt(qty):
 					frappe.throw(_("Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches").format(d.idx, d.batch_no, batch_qty, d.qty))
 
-def get_batch_no(item_code, warehouse, qty, throw=False):
-	'''get the smallest batch with for the given item_code, warehouse and qty'''
+@frappe.whitelist()
+def get_batch_no(item_code, warehouse, qty=1, throw=False):
+	"""
+	Get batch number using First Expiring First Out method.
+	:param item_code: `item_code` of Item Document
+	:param warehouse: name of Warehouse to check
+	:param qty: quantity of Items
+	:return: String represent batch number of batch with sufficient quantity else an empty String
+	"""
 
 	batch_no = None
-	batches = get_batch_qty(item_code = item_code, warehouse = warehouse)
-	if batches:
-		batches = sorted(batches, lambda a, b: 1 if a.qty > b.qty else -1)
-		for b in batches:
-			if b.qty >= qty:
-				batch_no = b.batch_no
-				# found!
-				break
+	batches = get_batches(item_code, warehouse, qty, throw)
+
+	for batch in batches:
+		if cint(qty) <= cint(batch.qty):
+			batch_no = batch.batch_id
+			break
 
 	if not batch_no:
 		frappe.msgprint(_('Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement').format(frappe.bold(item_code)))
-		if throw: raise UnableToSelectBatchError
+		if throw:
+			raise UnableToSelectBatchError
 
 	return batch_no
+
+
+def get_batches(item_code, warehouse, qty=1, throw=False):
+	batches = frappe.db.sql(
+		'select batch_id, sum(actual_qty) as qty from `tabBatch` join `tabStock Ledger Entry` '
+		'on `tabBatch`.batch_id = `tabStock Ledger Entry`.batch_no '
+		'where `tabStock Ledger Entry`.item_code = %s and  `tabStock Ledger Entry`.warehouse = %s '
+		'and (`tabBatch`.expiry_date >= CURDATE() or `tabBatch`.expiry_date IS NULL)'
+		'group by batch_id '
+		'order by `tabBatch`.expiry_date ASC, `tabBatch`.creation ASC',
+		(item_code, warehouse),
+		as_dict=True
+	)
+
+	return batches
diff --git a/erpnext/stock/doctype/batch/test_batch.py b/erpnext/stock/doctype/batch/test_batch.py
index eb3b48e..a327b2d 100644
--- a/erpnext/stock/doctype/batch/test_batch.py
+++ b/erpnext/stock/doctype/batch/test_batch.py
@@ -6,7 +6,7 @@
 from frappe.exceptions import ValidationError
 import unittest
 
-from erpnext.stock.doctype.batch.batch import get_batch_qty, UnableToSelectBatchError
+from erpnext.stock.doctype.batch.batch import get_batch_qty, UnableToSelectBatchError, get_batch_no
 
 class TestBatch(unittest.TestCase):
 
@@ -28,13 +28,13 @@
 		self.make_batch_item('ITEM-BATCH-1')
 
 		receipt = frappe.get_doc(dict(
-			doctype = 'Purchase Receipt',
-			supplier = '_Test Supplier',
-			items = [
+			doctype='Purchase Receipt',
+			supplier='_Test Supplier',
+			items=[
 				dict(
-					item_code = 'ITEM-BATCH-1',
-					qty = batch_qty,
-					rate = 10
+					item_code='ITEM-BATCH-1',
+					qty=batch_qty,
+					rate=10
 				)
 			]
 		)).insert()
@@ -74,28 +74,28 @@
 		'''Test automatic batch selection for outgoing items'''
 		batch_qty = 15
 		receipt = self.test_purchase_receipt(batch_qty)
+		item_code = 'ITEM-BATCH-1'
 
 		delivery_note = frappe.get_doc(dict(
-			doctype = 'Delivery Note',
-			customer = '_Test Customer',
-			company = receipt.company,
-			items = [
+			doctype='Delivery Note',
+			customer='_Test Customer',
+			company=receipt.company,
+			items=[
 				dict(
-					item_code = 'ITEM-BATCH-1',
-					qty = batch_qty,
-					rate = 10,
-					warehouse = receipt.items[0].warehouse
+					item_code=item_code,
+					qty=batch_qty,
+					rate=10,
+					warehouse=receipt.items[0].warehouse
 				)
 			]
 		)).insert()
 		delivery_note.submit()
 
-		# shipped with same batch
-		self.assertEquals(delivery_note.items[0].batch_no, receipt.items[0].batch_no)
-
-		# balance is 0
-		self.assertEquals(get_batch_qty(receipt.items[0].batch_no,
-			receipt.items[0].warehouse), 0)
+		# shipped from FEFO batch
+		self.assertEquals(
+			delivery_note.items[0].batch_no,
+			get_batch_no(item_code, receipt.items[0].warehouse, batch_qty)
+		)
 
 	def test_delivery_note_fail(self):
 		'''Test automatic batch selection for outgoing items'''
@@ -120,27 +120,27 @@
 
 		batch_qty = 16
 		receipt = self.test_purchase_receipt(batch_qty)
+		item_code = 'ITEM-BATCH-1'
 
 		stock_entry = frappe.get_doc(dict(
-			doctype = 'Stock Entry',
-			purpose = 'Material Issue',
-			company = receipt.company,
-			items = [
+			doctype='Stock Entry',
+			purpose='Material Issue',
+			company=receipt.company,
+			items=[
 				dict(
-					item_code = 'ITEM-BATCH-1',
-					qty = batch_qty,
-					s_warehouse = receipt.items[0].warehouse,
+					item_code=item_code,
+					qty=batch_qty,
+					s_warehouse=receipt.items[0].warehouse,
 				)
 			]
 		)).insert()
 		stock_entry.submit()
 
 		# assert same batch is selected
-		self.assertEqual(stock_entry.items[0].batch_no, receipt.items[0].batch_no)
-
-		# balance is 0
-		self.assertEquals(get_batch_qty(receipt.items[0].batch_no,
-			receipt.items[0].warehouse), 0)
+		self.assertEqual(
+			stock_entry.items[0].batch_no,
+			get_batch_no(item_code, receipt.items[0].warehouse, batch_qty)
+		)
 
 	def test_batch_split(self):
 		'''Test batch splitting'''
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index a41ae68..1f944e4 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -187,6 +187,7 @@
    "label": "Customer Name", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "customer.customer_name", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -1504,6 +1505,36 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "total_net_weight", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Net Weight", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -3610,7 +3641,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-09-19 11:21:59.084183", 
+ "modified": "2017-11-29 14:13:32.770027", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note", 
@@ -3727,5 +3758,5 @@
  "timeline_field": "customer", 
  "title_field": "title", 
  "track_changes": 1, 
- "track_seen": 0
+ "track_seen": 1
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
index 24e520c..c3dbb8d 100644
--- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
@@ -28,6 +28,7 @@
 		if not frappe.db.exists("Account", target_warehouse):
 			parent_account = frappe.db.get_value('Account',
 				{'company': company, 'is_group':1, 'account_type': 'Stock'},'name')
+
 			account = create_account(account_name="_Test Warehouse 1", \
 				account_type="Stock", parent_account= parent_account, company=company)
 			frappe.db.set_value('Warehouse', target_warehouse, 'account', account)
diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note_with_margin.js b/erpnext/stock/doctype/delivery_note/test_delivery_note_with_margin.js
new file mode 100644
index 0000000..21eb35c
--- /dev/null
+++ b/erpnext/stock/doctype/delivery_note/test_delivery_note_with_margin.js
@@ -0,0 +1,37 @@
+QUnit.module('Stock');
+
+QUnit.test("test delivery note with margin", function(assert) {
+	assert.expect(3);
+	let done = assert.async();
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make('Delivery Note', [
+				{customer:'Test Customer 1'},
+				{selling_price_list: 'Test-Selling-USD'},
+				{currency: 'USD'},
+				{items: [
+					[
+						{'item_code': 'Test Product 4'},
+						{'qty': 1},
+						{'margin_type': 'Amount'},
+						{'margin_rate_or_amount': 10}
+					]
+				]},
+			]);
+		},
+
+		() => cur_frm.save(),
+		() => {
+			// get_rate_details
+			assert.ok(cur_frm.doc.items[0].rate_with_margin == 210, "Margin rate correct");
+			assert.ok(cur_frm.doc.items[0].base_rate_with_margin == cur_frm.doc.conversion_rate * 210, "Base margin rate correct");
+			assert.ok(cur_frm.doc.total == 210, "Amount correct");
+		},
+
+		() => frappe.tests.click_button('Submit'),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(0.3),
+		() => done()
+	]);
+});
+
diff --git a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
index 4e1ea40..5487193 100644
--- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
+++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -464,7 +464,7 @@
    "options": "UOM", 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "remember_last_selected_value": 0, 
@@ -496,7 +496,7 @@
    "precision": "", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -743,6 +743,7 @@
    "label": "Rate With Margin", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "currency", 
    "permlevel": 0, 
    "precision": "2", 
    "print_hide": 1, 
@@ -824,6 +825,38 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "eval:doc.margin_type && doc.price_list_rate && doc.margin_rate_or_amount", 
+   "fieldname": "base_rate_with_margin", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Rate With Margin (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "2", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_1", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1226,6 +1259,156 @@
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "item_weight_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Weight Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "weight_per_unit", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Weight Per Unit", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_weight", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Weight", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_21", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "weight_uom", 
+   "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": "Weight UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "warehouse_and_reference", 
@@ -1956,7 +2139,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-09-27 08:31:38.768846", 
+ "modified": "2017-11-30 14:07:12.217563", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note Item", 
diff --git a/erpnext/schools/doctype/student_group/__init__.py b/erpnext/stock/doctype/delivery_stop/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/student_group/__init__.py
copy to erpnext/stock/doctype/delivery_stop/__init__.py
diff --git a/erpnext/stock/doctype/delivery_stop/delivery_stop.json b/erpnext/stock/doctype/delivery_stop/delivery_stop.json
new file mode 100644
index 0000000..311f70e
--- /dev/null
+++ b/erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -0,0 +1,606 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-10-16 16:46:28.166950", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "customer", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Customer", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Customer", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "address", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Address Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Address", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_6", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "customer_address", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Customer Address", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_7", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "contact", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Contact Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Contact", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_7", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "customer_contact", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Customer Contact", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_9", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "estimated_arrival", 
+   "fieldtype": "Time", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Estimated Arrival", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "details", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_12", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "select_delivery_notes", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Select/Unselect Delivery Notes", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_14", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "delivery_notes", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Delivery Notes", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_14", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "notified_by_email", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Notified by Email", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_18", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "email_sent_to", 
+   "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": "Email sent to", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-13 04:09:56.257540", 
+ "modified_by": "Administrator", 
+ "module": "Stock", 
+ "name": "Delivery Stop", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/delivery_stop/delivery_stop.py b/erpnext/stock/doctype/delivery_stop/delivery_stop.py
new file mode 100644
index 0000000..768d161
--- /dev/null
+++ b/erpnext/stock/doctype/delivery_stop/delivery_stop.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, newmatik.io / ESO Electronic Service Ottenbreit and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+class DeliveryStop(Document):
+	pass
diff --git a/erpnext/schools/doctype/student_group/__init__.py b/erpnext/stock/doctype/delivery_trip/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/student_group/__init__.py
copy to erpnext/stock/doctype/delivery_trip/__init__.py
diff --git a/erpnext/stock/doctype/delivery_trip/delivery_trip.js b/erpnext/stock/doctype/delivery_trip/delivery_trip.js
new file mode 100644
index 0000000..4091463
--- /dev/null
+++ b/erpnext/stock/doctype/delivery_trip/delivery_trip.js
@@ -0,0 +1,211 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Delivery Trip', {
+	setup: function(frm) {
+		frm.set_query("address", "delivery_stops", function(doc, cdt, cdn) {
+			var row = locals[cdt][cdn];
+			if (row.customer) {
+				return {
+					query: 'frappe.contacts.doctype.address.address.address_query',
+					filters: {
+						link_doctype: "Customer",
+						link_name: row.customer
+					}
+				};
+			}
+		})
+
+		frm.set_query("contact", "delivery_stops", function(doc, cdt, cdn) {
+			var row = locals[cdt][cdn];
+			if (row.customer) {
+				return {
+					query: 'frappe.contacts.doctype.contact.contact.contact_query',
+					filters: {
+						link_doctype: "Customer",
+						link_name: row.customer
+					}
+				};
+			}
+		})
+	},
+
+	refresh: function (frm) {
+		if (frm.doc.docstatus == 1 && frm.doc.delivery_stops.length > 0) {
+			frm.add_custom_button(__("Notify Customers via Email"), function () {
+				frm.trigger('notify_customers');
+			});
+		}
+	},
+
+	calculate_arrival_time: function (frm) {
+		frappe.call({
+			method: 'erpnext.stock.doctype.delivery_trip.delivery_trip.calculate_time_matrix',
+			freeze: true,
+			freeze_message: __("Updating estimated arrival times."),
+			args: {
+				name: frm.doc.name
+			},
+			callback: function (r) {
+				if (r.message.error) {
+					frappe.throw(__("Malformatted address for {0}, please fix to continue.",
+						[r.message.error.destination.address]));
+				}
+				frm.reload_doc();
+			}
+		});
+	},
+
+	notify_customers: function (frm) {
+		var owner_email = frm.doc.owner == "Administrator"
+			? frappe.user_info("Administrator").email
+			: frm.doc.owner;
+
+		$.each(frm.doc.delivery_stops || [], function (i, delivery_stop) {
+			if (!delivery_stop.delivery_notes) {
+				frappe.msgprint({
+					"message": __("No Delivery Note selected for Customer {}", [delivery_stop.customer]),
+					"title": __("Warning"),
+					"indicator": "orange",
+					"alert": 1
+				});
+			}
+		});
+		frappe.confirm(__("Do you want to notify all the customers by email?"), function () {
+			frappe.call({
+				method: "erpnext.stock.doctype.delivery_trip.delivery_trip.notify_customers",
+				args: {
+					"docname": frm.doc.name,
+					"date": frm.doc.date,
+					"driver": frm.doc.driver,
+					"vehicle": frm.doc.vehicle,
+					"sender_email": owner_email,
+					"sender_name": frappe.user.full_name(owner_email),
+					"delivery_notification": frm.doc.delivery_notification
+				}
+			});
+			frm.doc.email_notification_sent = true;
+			frm.refresh_field('email_notification_sent');
+		});
+	}
+});
+
+
+
+frappe.ui.form.on('Delivery Stop', {
+	customer: function (frm, cdt, cdn) {
+		var row = locals[cdt][cdn];
+		if(row.customer) {
+			frappe.call({
+				method: "erpnext.stock.doctype.delivery_trip.delivery_trip.get_contact_and_address",
+				args: {"name": row.customer},
+				callback: function (r) {
+					if (r.message) {
+						if (r.message["shipping_address"]) {
+							frappe.model.set_value(cdt, cdn, "address", r.message["shipping_address"].parent);
+						}
+						else {
+							frappe.model.set_value(cdt, cdn, "address", '');
+						}
+						if (r.message["contact_person"]) {
+							frappe.model.set_value(cdt, cdn, "contact", r.message["contact_person"].parent);
+						}
+						else {
+							frappe.model.set_value(cdt, cdn, "contact", '');
+						}
+					}
+					else {
+						frappe.model.set_value(cdt, cdn, "address", '');
+						frappe.model.set_value(cdt, cdn, "contact", '');
+					}
+				}
+			});
+		}
+	},
+	address: function (frm, cdt, cdn) {
+		var row = locals[cdt][cdn];
+		if(row.address) {
+			frappe.call({
+				method: "frappe.contacts.doctype.address.address.get_address_display",
+				args: {"address_dict": row.address},
+				callback: function (r) {
+					if (r.message) {
+						frappe.model.set_value(cdt, cdn, "customer_address", r.message);
+					}
+				}
+			});
+		} else {
+			frappe.model.set_value(cdt, cdn, "customer_address", "");
+		}
+	},
+
+	contact: function (frm, cdt, cdn) {
+		var row = locals[cdt][cdn];
+		if(row.contact) {
+			frappe.call({
+				method: "erpnext.stock.doctype.delivery_trip.delivery_trip.get_contact_display",
+				args: {"contact": row.contact},
+				callback: function (r) {
+					if (r.message) {
+						frappe.model.set_value(cdt, cdn, "customer_contact", r.message);
+					}
+				}
+			});
+		} else {
+			frappe.model.set_value(cdt, cdn, "customer_contact", "");
+		}
+	},
+
+	select_delivery_notes: function (frm, cdt, cdn) {
+		var row = locals[cdt][cdn];
+		frappe.call({
+			method: "erpnext.stock.doctype.delivery_trip.delivery_trip.get_delivery_notes",
+			args: {"customer": row.customer},
+			callback: function (r) {
+				var delivery_notes = [];
+				$.each(r.message, function (field, value) {
+					delivery_notes.push(value.name);
+				});
+				if (r.message) {
+					var d = new frappe.ui.Dialog({
+						title: __("Select Delivery Notes"),
+						fields: [{fieldtype: "HTML", fieldname: "delivery_notes_html"}]
+					});
+					var html = $(`
+						<div style="border: 1px solid #d1d8dd">
+							<div class="list-item list-item--head">
+								<div class="list-item__content list-item__content--flex-2">
+									${__('Delivery Notes')}
+								</div>
+							</div>
+							${delivery_notes.map(delivery_note => `
+								<div class="list-item">
+									<div class="list-item__content list-item__content--flex-2">
+										<label>
+										<input type="checkbox" data-delivery-note="${delivery_note}" checked="checked"/>
+										${delivery_note}
+										</label>
+									</div>
+								</div>
+							`).join("")}
+						</div>
+					`);
+
+					var delivery_notes_el = d.fields_dict.delivery_notes_html.$wrapper.html(html);
+
+					d.set_primary_action(__("Select"), function () {
+						var delivery_notes = delivery_notes_el.find('input[type=checkbox]:checked')
+							.map((i, el) => $(el).attr('data-delivery-note')).toArray();
+						if (!delivery_notes) return;
+						frappe.model.set_value(cdt, cdn, "delivery_notes", delivery_notes.join(","));
+						d.hide();
+					});
+					d.show();
+				}
+				else {
+					frappe.msgprint(__("No submitted Delivery Notes found"));
+				}
+			}
+		});
+	}
+});
\ No newline at end of file
diff --git a/erpnext/stock/doctype/delivery_trip/delivery_trip.json b/erpnext/stock/doctype/delivery_trip/delivery_trip.json
new file mode 100644
index 0000000..50e4999
--- /dev/null
+++ b/erpnext/stock/doctype/delivery_trip/delivery_trip.json
@@ -0,0 +1,578 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "naming_series:", 
+ "beta": 0, 
+ "creation": "2017-10-16 16:45:48.293335", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "TOUR-.#####", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "email_notification_sent", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Initial Email Notification Sent", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_3", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "departure_time", 
+   "fieldtype": "Time", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Departure Time", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "driver", 
+   "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": "Driver", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Driver", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "driver_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Driver Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "driver.full_name", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "vehicle", 
+   "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": "Vehicle", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Vehicle", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "delivery_service_stops", 
+   "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": "Delivery Stops", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "delivery_stops", 
+   "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": "Delivery Stop", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Delivery Stop", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!cur_frm.is_new()", 
+   "fieldname": "calculate_arrival_time", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Calculate Estimated Arrival Times", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_13", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Delivery Notification", 
+   "fieldname": "delivery_notification", 
+   "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": "Delivery Notification", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Standard Reply", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Delivery Trip", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-13 03:56:09.885801", 
+ "modified_by": "Administrator", 
+ "module": "Stock", 
+ "name": "Delivery Trip", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Fulfillment User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/delivery_trip/delivery_trip.py b/erpnext/stock/doctype/delivery_trip/delivery_trip.py
new file mode 100644
index 0000000..b5de330
--- /dev/null
+++ b/erpnext/stock/doctype/delivery_trip/delivery_trip.py
@@ -0,0 +1,202 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import datetime
+import frappe
+import googlemaps
+from frappe import _
+from frappe.model.document import Document
+from frappe.utils.user import get_user_fullname
+from frappe.utils import getdate
+from frappe.integrations.doctype.google_maps.google_maps import round_timedelta
+from frappe.integrations.doctype.google_maps.google_maps import format_address
+
+class DeliveryTrip(Document):
+	pass
+
+def get_default_contact(out, name):
+	contact_persons = frappe.db.sql(
+		"""
+			select parent,
+				(select is_primary_contact from tabContact c where c.name = dl.parent)
+			 	as is_primary_contact
+			from
+				`tabDynamic Link` dl
+			where
+				dl.link_doctype="Customer" and
+				dl.link_name=%s and
+				dl.parenttype = 'Contact'
+		""", (name), as_dict=1)
+
+	if contact_persons:
+		for out.contact_person in contact_persons:
+			if out.contact_person.is_primary_contact:
+				return out.contact_person
+		out.contact_person = contact_persons[0]
+		return out.contact_person
+	else:
+		return None
+
+def get_default_address(out, name):
+	shipping_addresses = frappe.db.sql(
+		"""
+			select parent,
+				(select is_shipping_address from tabAddress a where a.name=dl.parent) as is_shipping_address
+			from `tabDynamic Link` dl
+			where link_doctype="Customer"
+				and link_name=%s
+				and parenttype = 'Address'
+		""", (name), as_dict=1)
+
+	if shipping_addresses:
+		for out.shipping_address in shipping_addresses:
+			if out.shipping_address.is_shipping_address:
+				return out.shipping_address
+		out.shipping_address = shipping_addresses[0]
+		return out.shipping_address
+	else:
+		return None
+
+
+@frappe.whitelist()
+def get_contact_and_address(name):
+	out = frappe._dict()
+	get_default_contact(out, name)
+	get_default_address(out, name)
+	return out
+
+
+@frappe.whitelist()
+def get_contact_display(contact):
+	contact_info = frappe.db.get_value(
+		"Contact", contact,
+		["first_name", "last_name", "phone", "mobile_no"],
+	as_dict=1)
+	contact_info.html = """ <b>%(first_name)s %(last_name)s</b> <br> %(phone)s <br> %(mobile_no)s""" % {
+		"first_name": contact_info.first_name,
+		"last_name": contact_info.last_name or "",
+		"phone": contact_info.phone or "",
+		"mobile_no": contact_info.mobile_no or "",
+	}
+	return contact_info.html
+
+
+@frappe.whitelist()
+def get_delivery_notes(customer):
+	return frappe.db.get_all("Delivery Note", filters={
+		'customer': customer,
+		'docstatus': 1,
+		'status': ('!=', 'Completed')
+	})
+
+@frappe.whitelist()
+def calculate_time_matrix(name):
+	"""Calucation and round in closest 15 minutes, delivery stops"""
+
+	gmaps = frappe.db.get_value('Google Maps', None,
+		['client_key', 'enabled', 'home_address'], as_dict=1)
+
+	if not gmaps.enabled:
+		frappe.throw(_("Google Maps integration is not enabled"))
+
+	try:
+		gmaps_client = googlemaps.Client(key=gmaps.client_key)
+	except Exception as e:
+		frappe.throw(e.message)
+
+	secs_15min = 900
+	doc = frappe.get_doc('Delivery Trip', name)
+	departure_time = doc.departure_time
+	matrix_duration = []
+
+	for i, stop in enumerate(doc.delivery_stops):
+		if i == 0:
+			# The first row is the starting pointing
+			origin = gmaps.home_address
+			destination = format_address(doc.delivery_stops[i].address)
+			distance_calc = gmaps_client.distance_matrix(origin, destination)
+			matrix_duration.append(distance_calc)
+
+			try:
+				distance_secs = distance_calc['rows'][0]['elements'][0]['duration']['value']
+			except Exception as e:
+				frappe.throw(_("Error '{0}' occured. Arguments {1}.").format(e.message, e.args))
+
+			stop.estimated_arrival = round_timedelta(
+				departure_time + datetime.timedelta(0, distance_secs + secs_15min),
+				datetime.timedelta(minutes=15))
+		else:
+			# Calculation based on previous
+			origin = format_address(doc.delivery_stops[i - 1].address)
+			destination = format_address(doc.delivery_stops[i].address)
+			distance_calc = gmaps_client.distance_matrix(origin, destination)
+			matrix_duration.append(distance_calc)
+
+			try:
+				distance_secs = distance_calc['rows'][0]['elements'][0]['duration']['value']
+			except Exception as e:
+				frappe.throw(_("Error '{0}' occured. Arguments {1}.").format(e.message, e.args))
+
+			stop.estimated_arrival = round_timedelta(
+				doc.delivery_stops[i - 1].estimated_arrival +
+				datetime.timedelta(0, distance_secs + secs_15min), datetime.timedelta(minutes=15))
+		stop.save()
+		frappe.db.commit()
+
+	return matrix_duration
+
+@frappe.whitelist()
+def notify_customers(docname, date, driver, vehicle, sender_email, delivery_notification):
+	sender_name = get_user_fullname(sender_email)
+	delivery_stops = frappe.get_all('Delivery Stop', {"parent": docname})
+	attachments = []
+
+	for delivery_stop in delivery_stops:
+		delivery_stop_info = frappe.db.get_value(
+			"Delivery Stop",
+			delivery_stop.name,
+			["notified_by_email", "estimated_arrival", "details", "contact", "delivery_notes"],
+		as_dict=1)
+		contact_info = frappe.db.get_value("Contact", delivery_stop_info.contact,
+			["first_name", "last_name", "email_id", "gender"], as_dict=1)
+
+		if delivery_stop_info.delivery_notes:
+			delivery_notes = (delivery_stop_info.delivery_notes).split(",")
+			attachments = []
+			for delivery_note in delivery_notes:
+				default_print_format = frappe.get_value('Delivery Note', delivery_note, 'default_print_format')
+				attachments.append(
+					frappe.attach_print('Delivery Note',
+	 					 delivery_note,
+						 file_name="Delivery Note",
+						 print_format=default_print_format or "Standard"))
+
+		if not delivery_stop_info.notified_by_email and contact_info.email_id:
+			driver_info = frappe.db.get_value("Driver", driver, ["full_name", "cell_number"], as_dict=1)
+			sender_designation = frappe.db.get_value("Employee", sender_email, ["designation"])
+
+			estimated_arrival = str(delivery_stop_info.estimated_arrival)[:-3]
+			email_template = frappe.get_doc("Standard Reply", delivery_notification)
+			message = frappe.render_template(
+				email_template.response,
+				dict(contact_info=contact_info, sender_name=sender_name,
+					details=delivery_stop_info.details,
+					estimated_arrival=estimated_arrival,
+					date=getdate(date).strftime('%d.%m.%y'), vehicle=vehicle,
+					driver_info=driver_info,
+					sender_designation=sender_designation)
+			)
+			frappe.sendmail(
+				recipients=contact_info.email_id,
+				sender=sender_email,
+				message=message,
+				attachments=attachments,
+				subject=_(email_template.subject).format(getdate(date).strftime('%d.%m.%y'),
+					estimated_arrival))
+
+			frappe.db.set_value("Delivery Stop", delivery_stop.name, "notified_by_email", 1)
+			frappe.db.set_value("Delivery Stop", delivery_stop.name,
+				"email_sent_to", contact_info.email_id)
+			frappe.msgprint(_("Email sent to {0}").format(contact_info.email_id))
\ No newline at end of file
diff --git a/erpnext/stock/doctype/delivery_trip/test_delivery_trip.js b/erpnext/stock/doctype/delivery_trip/test_delivery_trip.js
new file mode 100644
index 0000000..b6d6d1a
--- /dev/null
+++ b/erpnext/stock/doctype/delivery_trip/test_delivery_trip.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Delivery Trip", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Delivery Trip
+		() => frappe.tests.make('Delivery Trip', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/stock/doctype/delivery_trip/test_delivery_trip.py b/erpnext/stock/doctype/delivery_trip/test_delivery_trip.py
new file mode 100644
index 0000000..4fe00c4
--- /dev/null
+++ b/erpnext/stock/doctype/delivery_trip/test_delivery_trip.py
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import erpnext
+import unittest
+from frappe.utils import nowdate, add_days
+from erpnext.tests.utils import create_test_contact_and_address
+from erpnext.stock.doctype.delivery_trip.delivery_trip import notify_customers, get_contact_and_address
+
+class TestDeliveryTrip(unittest.TestCase):
+	def setUp(self):
+		create_driver()
+		create_vehicle()
+		create_delivery_notfication()
+		create_test_contact_and_address()
+
+	def test_delivery_trip(self):
+		contact = get_contact_and_address("_Test Customer")
+
+		if not frappe.db.exists("Delivery Trip", "TOUR-00000"):
+			delivery_trip = frappe.new_doc("Delivery Trip")
+			delivery_trip.company = erpnext.get_default_company()
+			delivery_trip.date = add_days(nowdate(), 5)
+			delivery_trip.driver = "DRIVER-00001"
+			delivery_trip.vehicle = "JB 007"
+			delivery_trip.append("delivery_stops", {
+				"customer": "_Test Customer",
+				"address": contact.shipping_address.parent,
+				"contact": contact.contact_person.parent
+			})
+			delivery_trip.delivery_notification = 'Delivery Notification'
+			delivery_trip.insert()
+			sender_email = frappe.db.get_value("User", frappe.session.user, "email")
+			notify_customers(docname=delivery_trip.name, date=delivery_trip.date, driver=delivery_trip.driver,
+							 vehicle=delivery_trip.vehicle,
+							 sender_email=sender_email, delivery_notification=delivery_trip.delivery_notification)
+
+			self.assertEquals(delivery_trip.get("delivery_stops")[0].notified_by_email, 0)
+
+def create_driver():
+	if not frappe.db.exists("Driver", "Newton Scmander"):
+		driver = frappe.new_doc("Driver")
+		driver.full_name = "Newton Scmander"
+		driver.cell_number = "98343424242"
+		driver.license_number = "B809"
+		driver.insert()
+
+def create_delivery_notfication():
+	if not frappe.db.exists("Standard Reply", "Delivery Notification"):
+		frappe.get_doc({
+			'doctype': 'Standard Reply',
+			'name': 'Delivery Notification',
+			'response': 'Test Delivery Trip',
+			'subject': 'Test Subject',
+			'owner': frappe.session.user
+		}).insert()
+
+def create_vehicle():
+	if not frappe.db.exists("Vehicle", "JB 007"):
+		vehicle = frappe.get_doc({
+			"doctype": "Vehicle",
+			"license_plate": "JB 007",
+			"make": "Maruti",
+			"model": "PCM",
+			"last_odometer": 5000,
+			"acquisition_date": frappe.utils.nowdate(),
+			"location": "Mumbai",
+			"chassis_no": "1234ABCD",
+			"uom": "Litre",
+			"vehicle_value": frappe.utils.flt(500000)
+		})
+		vehicle.insert()
diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js
index 6f3fce5..aed6f41 100644
--- a/erpnext/stock/doctype/item/item.js
+++ b/erpnext/stock/doctype/item/item.js
@@ -57,9 +57,23 @@
 				frappe.set_route("List", "Item", {"variant_of": frm.doc.name});
 			}, __("View"));
 
-			frm.add_custom_button(__("Variant"), function() {
-				erpnext.item.make_variant(frm);
-			}, __("Make"));
+			frm.add_custom_button(__("Variant Details Report"), function() {
+				frappe.set_route("query-report", "Item Variant Details", {"item": frm.doc.name});
+			}, __("View"));
+
+			if(frm.doc.variant_based_on==="Item Attribute") {
+				frm.add_custom_button(__("Single Variant"), function() {
+					erpnext.item.show_single_variant_dialog(frm);
+				}, __("Make"));
+				frm.add_custom_button(__("Multiple Variants"), function() {
+					erpnext.item.show_multiple_variants_dialog(frm);
+				}, __("Make"));
+			} else {
+				frm.add_custom_button(__("Variant"), function() {
+					erpnext.item.show_modal_for_manufacturers(frm);
+				}, __("Make"));
+			}
+
 			frm.page.set_inner_btn_group_as_primary(__("Make"));
 		}
 		if (frm.doc.variant_of) {
@@ -74,19 +88,8 @@
 		}
 
 		erpnext.item.edit_prices_button(frm);
-
-		// make sensitive fields(has_serial_no, is_stock_item, valuation_method, has_batch_no)
-		// read only if any stock ledger entry exists
-		if (!frm.doc.__islocal && frm.doc.is_stock_item) {
-			frm.toggle_enable(['has_serial_no', 'is_stock_item', 'valuation_method', 'has_batch_no'],
-				(frm.doc.__onload && frm.doc.__onload.sle_exists=="exists") ? false : true);
-		}
-
 		erpnext.item.toggle_attributes(frm);
 
-		frm.toggle_enable("is_fixed_asset", (frm.doc.__islocal || (!frm.doc.is_stock_item &&
-			((frm.doc.__onload && frm.doc.__onload.asset_exists) ? false : true))));
-
 		frm.add_custom_button(__('Duplicate'), function() {
 			var new_item = frappe.model.copy_doc(frm.doc);
 			if(new_item.item_name===new_item.item_code) {
@@ -103,25 +106,18 @@
 				frappe.set_route("Form", "Item Variant Settings");
 			}, __("View"));
 		}
-
-		if(frm.doc.__onload && frm.doc.__onload.stock_exists) {
-			// Hide variants section if stock exists
-			frm.toggle_display("variants_section", 0);
-		}
 	},
 
 	validate: function(frm){
 		erpnext.item.weight_to_validate(frm);
 	},
 
-	image: function(frm) {
+	image: function() {
 		refresh_field("image_view");
 	},
 
 	is_fixed_asset: function(frm) {
-		if (frm.doc.is_fixed_asset) {
-			frm.set_value("is_stock_item", 0);
-		}
+		frm.set_value("is_stock_item", frm.doc.is_fixed_asset ? 0 : 1);
 	},
 
 	page_name: frappe.utils.warn_page_name_change,
@@ -281,14 +277,6 @@
 		}
 	},
 
-	make_variant: function(frm) {
-		if(frm.doc.variant_based_on==="Item Attribute") {
-			erpnext.item.show_modal_for_item_attribute_selection(frm);
-		} else {
-			erpnext.item.show_modal_for_manufacturers(frm);
-		}
-	},
-
 	show_modal_for_manufacturers: function(frm) {
 		var dialog = new frappe.ui.Dialog({
 			fields: [
@@ -319,7 +307,145 @@
 		dialog.show();
 	},
 
-	show_modal_for_item_attribute_selection: function(frm) {
+	show_multiple_variants_dialog: function(frm) {
+		var me = this;
+
+		if(me.multiple_variant_dialog) {
+			me.multiple_variant_dialog.show();
+			return;
+		}
+
+		let promises = [];
+		let attr_val_fields = {};
+
+		function make_fields_from_attribute_values(attr_dict) {
+			let fields = [];
+			Object.keys(attr_dict).forEach((name, i) => {
+				if(i % 3 === 0){
+					fields.push({fieldtype: 'Section Break'});
+				}
+				fields.push({fieldtype: 'Column Break', label: name});
+				attr_dict[name].forEach(value => {
+					fields.push({
+						fieldtype: 'Check',
+						label: value,
+						fieldname: value,
+						default: 0,
+						onchange: function() {
+							let selected_attributes = get_selected_attributes();
+							let lengths = [];
+							Object.keys(selected_attributes).map(key => {
+								lengths.push(selected_attributes[key].length);
+							});
+							if(lengths.includes(0)) {
+								me.multiple_variant_dialog.get_primary_btn().html(__("Make Variants"));
+								me.multiple_variant_dialog.disable_primary_action();
+							} else {
+								let no_of_combinations = lengths.reduce((a, b) => a * b, 1);
+								me.multiple_variant_dialog.get_primary_btn()
+									.html(__(
+										`Make ${no_of_combinations} Variant${no_of_combinations === 1 ? '' : 's'}`
+									));
+								me.multiple_variant_dialog.enable_primary_action();
+							}
+						}
+					});
+				});
+			});
+			return fields;
+		}
+
+		function make_and_show_dialog(fields) {
+			me.multiple_variant_dialog = new frappe.ui.Dialog({
+				title: __("Select Attribute Values"),
+				fields: [
+					{
+						fieldtype: "HTML",
+						fieldname: "help",
+						options: `<label class="control-label">
+							${__("Select at least one value from each of the attributes.")}
+						</label>`,
+					}
+				].concat(fields)
+			});
+
+			me.multiple_variant_dialog.set_primary_action(__("Make Variants"), () => {
+				let selected_attributes = get_selected_attributes();
+
+				me.multiple_variant_dialog.hide();
+				frappe.call({
+					method:"erpnext.controllers.item_variant.enqueue_multiple_variant_creation",
+					args: {
+						"item": frm.doc.name,
+						"args": selected_attributes
+					},
+					callback: function() {
+						frappe.show_alert({
+							message: __("Variant creation has been queued."),
+							indicator: 'orange'
+						});
+					}
+				});
+			});
+
+			$($(me.multiple_variant_dialog.$wrapper.find('.form-column'))
+				.find('.frappe-control')).css('margin-bottom', '0px');
+
+			me.multiple_variant_dialog.disable_primary_action();
+			me.multiple_variant_dialog.clear();
+			me.multiple_variant_dialog.show();
+		}
+
+		function get_selected_attributes() {
+			let selected_attributes = {};
+			me.multiple_variant_dialog.$wrapper.find('.form-column').each((i, col) => {
+				if(i===0) return;
+				let attribute_name = $(col).find('label').html();
+				selected_attributes[attribute_name] = [];
+				let checked_opts = $(col).find('.checkbox input');
+				checked_opts.each((i, opt) => {
+					if($(opt).is(':checked')) {
+						selected_attributes[attribute_name].push($(opt).attr('data-fieldname'));
+					}
+				});
+			});
+
+			return selected_attributes;
+		}
+
+		let attribute_names = frm.doc.attributes.map(d => d.attribute);
+
+		attribute_names.forEach(function(attribute) {
+			let p = new Promise(resolve => {
+				frappe.call({
+					method:"frappe.client.get_list",
+					args:{
+						doctype:"Item Attribute Value",
+						filters: [
+							["parent","=", attribute]
+						],
+						fields: ["attribute_value"]
+					}
+				}).then((r) => {
+					if(r.message) {
+						attr_val_fields[attribute] = r.message.map(function(d) { return d.attribute_value; });
+						resolve();
+					}
+				});
+			});
+
+			promises.push(p);
+
+		}, this);
+
+		Promise.all(promises).then(() => {
+			let fields = make_fields_from_attribute_values(attr_val_fields);
+			make_and_show_dialog(fields);
+		})
+
+	},
+
+	show_single_variant_dialog: function(frm) {
 		var fields = []
 
 		for(var i=0;i< frm.doc.attributes.length;i++){
@@ -469,5 +595,6 @@
 			// nothing to do with attributes, hide it
 			frm.toggle_display("attributes", false);
 		}
+		frm.layout.refresh_sections();
 	}
 });
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index fd85a50..a97a24f 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -1,3509 +1,3633 @@
 {
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "field:item_code",
- "beta": 0,
- "creation": "2013-05-03 10:45:46",
- "custom": 0,
- "default_print_format": "",
- "description": "A Product or a Service that is bought, sold or kept in stock.",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Setup",
- "editable_grid": 1,
- "engine": "InnoDB",
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:item_code", 
+ "beta": 0, 
+ "creation": "2013-05-03 10:45:46", 
+ "custom": 0, 
+ "default_print_format": "", 
+ "description": "A Product or a Service that is bought, sold or kept in stock.", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "name_and_description_section",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-flag",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "name_and_description_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "options": "fa fa-flag", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "naming_series",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Series",
-   "length": 0,
-   "no_copy": 0,
-   "options": "ITEM-",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 1,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "ITEM-", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "",
-   "fieldname": "item_code",
-   "fieldtype": "Data",
-   "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": "Item Code",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "item_code",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "", 
+   "fieldname": "item_code", 
+   "fieldtype": "Data", 
+   "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": "Item Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_code", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "variant_of",
-   "description": "If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",
-   "fieldname": "variant_of",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 1,
-   "label": "Variant Of",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Item",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "variant_of", 
+   "description": "If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified", 
+   "fieldname": "variant_of", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Variant Of", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item", 
+   "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": 1, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "item_name",
-   "fieldtype": "Data",
-   "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": "Item Name",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "item_name",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item_name", 
+   "fieldtype": "Data", 
+   "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": "Item Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "barcode",
-   "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": "Barcode",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "barcode", 
+   "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": "Barcode", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "",
-   "fieldname": "item_group",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Item Group",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "item_group",
-   "oldfieldtype": "Link",
-   "options": "Item Group",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "", 
+   "fieldname": "item_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Item Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_group", 
+   "oldfieldtype": "Link", 
+   "options": "Item Group", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "is_item_from_hub",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Is Item from Hub",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "is_item_from_hub", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Item from Hub", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "",
-   "fieldname": "stock_uom",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Unit of Measure",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "stock_uom",
-   "oldfieldtype": "Link",
-   "options": "UOM",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "", 
+   "fieldname": "stock_uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Unit of Measure", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "stock_uom", 
+   "oldfieldtype": "Link", 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break0",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break0", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "disabled",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Disabled",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "disabled", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Disabled", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "1",
-   "description": "",
-   "fieldname": "is_stock_item",
-   "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": "Maintain Stock",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "is_stock_item",
-   "oldfieldtype": "Select",
-   "options": "",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "description": "", 
+   "fieldname": "is_stock_item", 
+   "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": "Maintain Stock", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "is_stock_item", 
+   "oldfieldtype": "Select", 
+   "options": "", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:(doc.__islocal&&doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no)",
-   "fieldname": "opening_stock",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Opening Stock",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:(doc.__islocal&&doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no)", 
+   "fieldname": "opening_stock", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Opening Stock", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:(doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no)",
-   "fieldname": "valuation_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Valuation Rate",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:(doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no)", 
+   "fieldname": "valuation_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Valuation Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "standard_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Standard Selling Rate",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "standard_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Standard Selling Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "is_fixed_asset",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Is Fixed Asset",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "is_fixed_asset", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Fixed Asset", 
+   "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": 1, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "is_fixed_asset",
-   "fieldname": "asset_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": "Asset Category",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Asset 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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_fixed_asset", 
+   "fieldname": "asset_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": "Asset Category", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Asset 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, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "description": "",
-   "fieldname": "tolerance",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Allow over delivery or receipt upto this percent",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "tolerance",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "description": "", 
+   "fieldname": "tolerance", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Allow over delivery or receipt upto this percent", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "tolerance", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 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,
-   "options": "image",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 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, 
+   "options": "image", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "section_break_11",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Description",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "section_break_11", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "brand",
-   "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": "Brand",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "brand",
-   "oldfieldtype": "Link",
-   "options": "Brand",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "brand", 
+   "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": "Brand", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "brand", 
+   "oldfieldtype": "Link", 
+   "options": "Brand", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "description",
-   "fieldtype": "Text Editor",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Description",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "description",
-   "oldfieldtype": "Text",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "collapsible_depends_on": "is_stock_item",
-   "columns": 0,
-   "depends_on": "is_stock_item",
-   "fieldname": "inventory",
-   "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": "Inventory",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-truck",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "collapsible_depends_on": "is_stock_item", 
+   "columns": 0, 
+   "depends_on": "is_stock_item", 
+   "fieldname": "inventory", 
+   "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": "Inventory", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "options": "fa fa-truck", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "is_stock_item",
-   "description": "",
-   "fieldname": "default_warehouse",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Warehouse",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "default_warehouse",
-   "oldfieldtype": "Link",
-   "options": "Warehouse",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_stock_item", 
+   "description": "", 
+   "fieldname": "default_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "default_warehouse", 
+   "oldfieldtype": "Link", 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "2099-12-31",
-   "depends_on": "is_stock_item",
-   "fieldname": "end_of_life",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "End of Life",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "end_of_life",
-   "oldfieldtype": "Date",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "2099-12-31", 
+   "depends_on": "is_stock_item", 
+   "fieldname": "end_of_life", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "End of Life", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "end_of_life", 
+   "oldfieldtype": "Date", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "Purchase",
-   "fieldname": "default_material_request_type",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Material Request Type",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Purchase\nMaterial Transfer\nMaterial Issue\nManufacture",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Purchase", 
+   "fieldname": "default_material_request_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Material Request Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Purchase\nMaterial Transfer\nMaterial Issue\nManufacture", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "is_stock_item",
-   "fieldname": "column_break1",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Column Break",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_stock_item", 
+   "fieldname": "column_break1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "is_stock_item",
-   "fieldname": "valuation_method",
-   "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": "Valuation Method",
-   "length": 0,
-   "no_copy": 0,
-   "options": "\nFIFO\nMoving Average",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_stock_item", 
+   "fieldname": "valuation_method", 
+   "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": "Valuation Method", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nFIFO\nMoving Average", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:doc.is_stock_item",
-   "fieldname": "warranty_period",
-   "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": "Warranty Period (in days)",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "warranty_period",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.is_stock_item", 
+   "fieldname": "warranty_period", 
+   "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": "Warranty Period (in days)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "warranty_period", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "is_stock_item",
-   "description": "",
-   "fieldname": "net_weight",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Net Weight",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_stock_item", 
+   "description": "", 
+   "fieldname": "weight_per_unit", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Weight Per Unit", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:doc.is_stock_item",
-   "fieldname": "weight_uom",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Weight UOM",
-   "length": 0,
-   "no_copy": 0,
-   "options": "UOM",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.is_stock_item", 
+   "fieldname": "weight_uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Weight UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "depends_on": "is_stock_item",
-   "description": "",
-   "fieldname": "reorder_section",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Auto re-order",
-   "length": 0,
-   "no_copy": 0,
-   "options": "fa fa-rss",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "depends_on": "is_stock_item", 
+   "description": "", 
+   "fieldname": "reorder_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Auto re-order", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "fa fa-rss", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "description": "Will also apply for variants unless overrridden",
-   "fieldname": "reorder_levels",
-   "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": "Reorder level based on Warehouse",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Item Reorder",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "description": "Will also apply for variants unless overrridden", 
+   "fieldname": "reorder_levels", 
+   "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": "Reorder level based on Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item Reorder", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "unit_of_measure_conversion",
-   "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": "Units of Measure",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "unit_of_measure_conversion", 
+   "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": "Units of Measure", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "description": "Will also apply for variants",
-   "fieldname": "uoms",
-   "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": "UOMs",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "uom_conversion_details",
-   "oldfieldtype": "Table",
-   "options": "UOM Conversion Detail",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "description": "Will also apply for variants", 
+   "fieldname": "uoms", 
+   "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": "UOMs", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "uom_conversion_details", 
+   "oldfieldtype": "Table", 
+   "options": "UOM Conversion Detail", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "collapsible_depends_on": "eval:doc.has_batch_no || doc.has_serial_no",
-   "columns": 0,
-   "depends_on": "is_stock_item",
-   "fieldname": "serial_nos_and_batches",
-   "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": "Serial Nos and Batches",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "collapsible_depends_on": "eval:doc.has_batch_no || doc.has_serial_no", 
+   "columns": 0, 
+   "depends_on": "is_stock_item", 
+   "fieldname": "serial_nos_and_batches", 
+   "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": "Serial Nos and Batches", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "",
-   "depends_on": "eval:doc.is_stock_item",
-   "fieldname": "has_batch_no",
-   "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": "Has Batch No",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "has_batch_no",
-   "oldfieldtype": "Select",
-   "options": "",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "depends_on": "eval:doc.is_stock_item", 
+   "fieldname": "has_batch_no", 
+   "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": "Has Batch No", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "has_batch_no", 
+   "oldfieldtype": "Select", 
+   "options": "", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "has_batch_no",
-   "description": "",
-   "fieldname": "create_new_batch",
-   "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": "Automatically Create New Batch",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "has_batch_no", 
+   "description": "", 
+   "fieldname": "create_new_batch", 
+   "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": "Automatically Create New Batch", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_37",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "has_batch_no", 
+   "fieldname": "has_expiry_date", 
+   "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": "Has Expiry Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "",
-   "depends_on": "eval:doc.is_stock_item",
-   "description": "",
-   "fieldname": "has_serial_no",
-   "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": "Has Serial No",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "has_serial_no",
-   "oldfieldtype": "Select",
-   "options": "",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "has_batch_no", 
+   "fieldname": "retain_sample", 
+   "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": "Retain Sample", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "has_serial_no",
-   "description": "Example: ABCD.#####\nIf series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.",
-   "fieldname": "serial_no_series",
-   "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": "Serial Number Series",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval: (doc.retain_sample && doc.has_batch_no)", 
+   "description": "Maximum sample quantity that can be retained", 
+   "fieldname": "sample_quantity", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Max Sample Quantity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "collapsible_depends_on": "attributes",
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "variants_section",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Variants",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_37", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "0",
-   "depends_on": "eval:!doc.variant_of",
-   "description": "If this item has variants, then it cannot be selected in sales orders etc.",
-   "fieldname": "has_variants",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Has Variants",
-   "length": 0,
-   "no_copy": 1,
-   "options": "",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "depends_on": "eval:doc.is_stock_item", 
+   "description": "", 
+   "fieldname": "has_serial_no", 
+   "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": "Has Serial No", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "has_serial_no", 
+   "oldfieldtype": "Select", 
+   "options": "", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "Item Attribute",
-   "depends_on": "has_variants",
-   "fieldname": "variant_based_on",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Variant Based On",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Item Attribute\nManufacturer",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "has_serial_no", 
+   "description": "Example: ABCD.#####\nIf series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.", 
+   "fieldname": "serial_no_series", 
+   "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": "Serial Number Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:doc.has_variants && doc.variant_based_on==='Item Attribute'",
-   "fieldname": "attributes",
-   "fieldtype": "Table",
-   "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": "Attributes",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Item Variant Attribute",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "collapsible_depends_on": "attributes", 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "variants_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Variants", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "purchase_details",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Purchase Details",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-shopping-cart",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "depends_on": "eval:!doc.variant_of", 
+   "description": "If this item has variants, then it cannot be selected in sales orders etc.", 
+   "fieldname": "has_variants", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Has Variants", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "1",
-   "fieldname": "is_purchase_item",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Is Purchase Item",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Item Attribute", 
+   "depends_on": "has_variants", 
+   "fieldname": "variant_based_on", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Variant Based On", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item Attribute\nManufacturer", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "purchase_uom",
-   "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": "Default Purchase Unit of Measure",
-   "length": 0,
-   "no_copy": 0,
-   "options": "UOM",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:(doc.has_variants || doc.variant_of) && doc.variant_based_on==='Item Attribute'", 
+   "fieldname": "attributes", 
+   "fieldtype": "Table", 
+   "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": "Attributes", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Item Variant Attribute", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "0.00",
-   "depends_on": "is_stock_item",
-   "description": "",
-   "fieldname": "min_order_qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Minimum Order Qty",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "min_order_qty",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "purchase_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Purchase Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "options": "fa fa-shopping-cart", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "safety_stock",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Safety Stock",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "fieldname": "is_purchase_item", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Purchase Item", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "description": "Average time taken by the supplier to deliver",
-   "fieldname": "lead_time_days",
-   "fieldtype": "Int",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Lead Time in days",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "lead_time_days",
-   "oldfieldtype": "Int",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "purchase_uom", 
+   "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": "Default Purchase Unit of Measure", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "description": "",
-   "fieldname": "buying_cost_center",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Buying Cost Center",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "cost_center",
-   "oldfieldtype": "Link",
-   "options": "Cost Center",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0.00", 
+   "depends_on": "is_stock_item", 
+   "description": "", 
+   "fieldname": "min_order_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Minimum Order Qty", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "min_order_qty", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "description": "",
-   "fieldname": "expense_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Expense Account",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "purchase_account",
-   "oldfieldtype": "Link",
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "safety_stock", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Safety Stock", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "last_purchase_rate",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Last Purchase Rate",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "last_purchase_rate",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "purchase_details_cb", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "supplier_details",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Supplier Details",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "description": "Average time taken by the supplier to deliver", 
+   "fieldname": "lead_time_days", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Lead Time in days", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "lead_time_days", 
+   "oldfieldtype": "Int", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "default_supplier",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Supplier",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Supplier",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "description": "", 
+   "fieldname": "buying_cost_center", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Buying Cost Center", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "cost_center", 
+   "oldfieldtype": "Link", 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "delivered_by_supplier",
-   "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": "Delivered by Supplier (Drop Ship)",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "description": "", 
+   "fieldname": "expense_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Expense Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "purchase_account", 
+   "oldfieldtype": "Link", 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "manufacturer",
-   "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": "Manufacturer",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Manufacturer",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "last_purchase_rate", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Last Purchase Rate", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "last_purchase_rate", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "manufacturer_part_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": "Manufacturer Part Number",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "supplier_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Supplier Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "column_break2",
-   "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,
-   "label": "Item Code for Suppliers",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Column Break",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "default_supplier", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Supplier", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Supplier", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "delivered_by_supplier", 
+   "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": "Delivered by Supplier (Drop Ship)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "manufacturer", 
+   "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": "Manufacturer", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Manufacturer", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "manufacturer_part_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": "Manufacturer Part Number", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "column_break2", 
+   "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, 
+   "label": "Item Code for Suppliers", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "supplier_items",
-   "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": "Supplier Items",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Item Supplier",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "supplier_items", 
+   "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": "Supplier Items", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item Supplier", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "foreign_trade_details",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Foreign Trade Details",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "foreign_trade_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Foreign Trade Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "country_of_origin",
-   "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": "Country of Origin",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Country",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "country_of_origin", 
+   "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": "Country of Origin", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Country", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_59",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_59", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "customs_tariff_number",
-   "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": "Customs Tariff Number",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Customs Tariff Number",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "customs_tariff_number", 
+   "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": "Customs Tariff Number", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Customs Tariff Number", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "sales_details",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Sales Details",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-tag",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "sales_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Sales Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "options": "fa fa-tag", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "1",
-   "fieldname": "is_sales_item",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Is Sales Item",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "fieldname": "is_sales_item", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Sales Item", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "sales_uom",
-   "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": "Default Sales Unit of Measure",
-   "length": 0,
-   "no_copy": 0,
-   "options": "UOM",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "sales_uom", 
+   "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": "Default Sales Unit of Measure", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "income_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Income Account",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "income_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Income Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "selling_cost_center",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Selling Cost Center",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Cost Center",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "selling_cost_center", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Selling Cost Center", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "column_break3",
-   "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,
-   "label": "Customer Item Codes",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Column Break",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "column_break3", 
+   "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, 
+   "label": "Customer Item Codes", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "description": "",
-   "fieldname": "customer_items",
-   "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": "Customer Items",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Item Customer Detail",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "description": "", 
+   "fieldname": "customer_items", 
+   "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": "Customer Items", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item Customer Detail", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "max_discount",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Max Discount (%)",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "max_discount",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "max_discount", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Max Discount (%)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "max_discount", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "item_tax_section_break",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Item Tax",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-money",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "item_tax_section_break", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Tax", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "options": "fa fa-money", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "Will also apply for variants",
-   "fieldname": "taxes",
-   "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": "Taxes",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "item_tax",
-   "oldfieldtype": "Table",
-   "options": "Item Tax",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Will also apply for variants", 
+   "fieldname": "taxes", 
+   "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": "Taxes", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_tax", 
+   "oldfieldtype": "Table", 
+   "options": "Item Tax", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "inspection_criteria",
-   "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": "Inspection Criteria",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-search",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "inspection_criteria", 
+   "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": "Inspection Criteria", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "options": "fa fa-search", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "",
-   "fieldname": "inspection_required_before_purchase",
-   "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": "Inspection Required before Purchase",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "inspection_required",
-   "oldfieldtype": "Select",
-   "options": "",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "fieldname": "inspection_required_before_purchase", 
+   "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": "Inspection Required before Purchase", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "inspection_required", 
+   "oldfieldtype": "Select", 
+   "options": "", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "inspection_required_before_delivery",
-   "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": "Inspection Required before Delivery",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "inspection_required_before_delivery", 
+   "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": "Inspection Required before Delivery", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:(doc.inspection_required_before_purchase || doc.inspection_required_before_delivery)",
-   "description": "Will also apply to variants",
-   "fieldname": "quality_parameters",
-   "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": "Quality Parameters",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "item_specification_details",
-   "oldfieldtype": "Table",
-   "options": "Item Quality Inspection Parameter",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:(doc.inspection_required_before_purchase || doc.inspection_required_before_delivery)", 
+   "description": "Will also apply to variants", 
+   "fieldname": "quality_parameters", 
+   "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": "Quality Parameters", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_specification_details", 
+   "oldfieldtype": "Table", 
+   "options": "Item Quality Inspection Parameter", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "depends_on": "is_stock_item",
-   "fieldname": "manufacturing",
-   "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": "Manufacturing",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-cogs",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "depends_on": "is_stock_item", 
+   "fieldname": "manufacturing", 
+   "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": "Manufacturing", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "options": "fa fa-cogs", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "default_bom",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default BOM",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "default_bom",
-   "oldfieldtype": "Link",
-   "options": "BOM",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "default_bom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default BOM", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "default_bom", 
+   "oldfieldtype": "Link", 
+   "options": "BOM", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "",
-   "description": "If subcontracted to a vendor",
-   "fieldname": "is_sub_contracted_item",
-   "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": "Supply Raw Materials for Purchase",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "is_sub_contracted_item",
-   "oldfieldtype": "Select",
-   "options": "",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "description": "If subcontracted to a vendor", 
+   "fieldname": "is_sub_contracted_item", 
+   "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": "Supply Raw Materials for Purchase", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "is_sub_contracted_item", 
+   "oldfieldtype": "Select", 
+   "options": "", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_74",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_74", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "customer_code",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Customer Code",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "customer_code", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Customer Code", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "website_section",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Website",
-   "length": 0,
-   "no_copy": 0,
-   "options": "fa fa-globe",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "website_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Website", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "fa fa-globe", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.variant_of",
-   "fieldname": "show_in_website",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Show in Website",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.variant_of", 
+   "fieldname": "show_in_website", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Show in Website", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "variant_of",
-   "fieldname": "show_variant_in_website",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Show in Website (Variant)",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "variant_of", 
+   "fieldname": "show_variant_in_website", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Show in Website (Variant)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "fieldname": "route",
-   "fieldtype": "Small Text",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Route",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website", 
+   "fieldname": "route", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Route", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "description": "Items with higher weightage will be shown higher",
-   "fieldname": "weightage",
-   "fieldtype": "Int",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Weightage",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website", 
+   "description": "Items with higher weightage will be shown higher", 
+   "fieldname": "weightage", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Weightage", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "description": "Show a slideshow at the top of the page",
-   "fieldname": "slideshow",
-   "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": "Slideshow",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Website Slideshow",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website", 
+   "description": "Show a slideshow at the top of the page", 
+   "fieldname": "slideshow", 
+   "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": "Slideshow", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Website Slideshow", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "description": "Item Image (if not slideshow)",
-   "fieldname": "website_image",
-   "fieldtype": "Attach",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Image",
-   "length": 0,
-   "no_copy": 0,
-   "options": "",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website", 
+   "description": "Item Image (if not slideshow)", 
+   "fieldname": "website_image", 
+   "fieldtype": "Attach", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Image", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "thumbnail",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Thumbnail",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "thumbnail", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Thumbnail", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "cb72",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cb72", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "description": "Show \"In Stock\" or \"Not in Stock\" based on stock available in this warehouse.",
-   "fieldname": "website_warehouse",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Website Warehouse",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Warehouse",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website", 
+   "description": "Show \"In Stock\" or \"Not in Stock\" based on stock available in this warehouse.", 
+   "fieldname": "website_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Website Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "description": "List this Item in multiple groups on the website.",
-   "fieldname": "website_item_groups",
-   "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": "Website Item Groups",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Website Item Group",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website", 
+   "description": "List this Item in multiple groups on the website.", 
+   "fieldname": "website_item_groups", 
+   "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": "Website Item Groups", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Website Item Group", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "collapsible_depends_on": "website_specifications",
-   "columns": 0,
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "fieldname": "sb72",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Website Specifications",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "collapsible_depends_on": "website_specifications", 
+   "columns": 0, 
+   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website", 
+   "fieldname": "sb72", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Website Specifications", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "fieldname": "copy_from_item_group",
-   "fieldtype": "Button",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Copy From Item Group",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website", 
+   "fieldname": "copy_from_item_group", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Copy From Item Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "fieldname": "website_specifications",
-   "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": "Website Specifications",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Item Website Specification",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website", 
+   "fieldname": "website_specifications", 
+   "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": "Website Specifications", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item Website Specification", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "fieldname": "web_long_description",
-   "fieldtype": "Text Editor",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Website Description",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website", 
+   "fieldname": "web_long_description", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Website Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "total_projected_qty",
-   "fieldtype": "Float",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Total Projected Qty",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_projected_qty", 
+   "fieldtype": "Float", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Projected Qty", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:(!doc.is_item_from_hub)",
-   "fieldname": "hub_publishing_sb",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Hub Publishing Details",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:(!doc.is_item_from_hub)", 
+   "fieldname": "hub_publishing_sb", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Hub Publishing Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "0",
-   "description": "Publish Item to hub.erpnext.com",
-   "fieldname": "publish_in_hub",
-   "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": "Publish in Hub",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "description": "Publish Item to hub.erpnext.com", 
+   "fieldname": "publish_in_hub", 
+   "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": "Publish in Hub", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "hub_category_to_publish",
-   "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": "Hub Category to Publish",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Hub 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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "hub_category_to_publish", 
+   "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": "Hub Category to Publish", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Hub 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, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "Publish \"In Stock\" or \"Not in Stock\" on Hub based on stock available in this warehouse.",
-   "fieldname": "hub_warehouse",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Hub Warehouse",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Warehouse",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Publish \"In Stock\" or \"Not in Stock\" on Hub based on stock available in this warehouse.", 
+   "fieldname": "hub_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Hub Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "0",
-   "fieldname": "synced_with_hub",
-   "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": "Synced With Hub",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "synced_with_hub", 
+   "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": "Synced With Hub", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
   }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "fa fa-tag",
- "idx": 2,
- "image_field": "image",
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 1,
- "modified": "2017-10-25 14:08:02.948326",
- "modified_by": "Administrator",
- "module": "Stock",
- "name": "Item",
- "owner": "Administrator",
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "fa fa-tag", 
+ "idx": 2, 
+ "image_field": "image", 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 1, 
+ "modified": "2017-12-08 07:20:25.932499", 
+ "modified_by": "Administrator", 
+ "module": "Stock", 
+ "name": "Item", 
+ "owner": "Administrator", 
  "permissions": [
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Item Manager",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Item Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Stock Manager",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Stock Manager", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Stock User",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Stock User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Sales User",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Sales User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Purchase User",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Purchase User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Maintenance User",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Maintenance User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Accounts User",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Manufacturing User",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Manufacturing User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
   }
- ],
- "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
- "search_fields": "item_name,description,item_group,customer_code",
- "show_name_in_global_search": 1,
- "sort_field": "idx desc, modified desc",
- "sort_order": "DESC",
- "title_field": "item_name",
- "track_changes": 1,
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "search_fields": "item_name,description,item_group,customer_code", 
+ "show_name_in_global_search": 1, 
+ "sort_field": "idx desc, modified desc", 
+ "sort_order": "DESC", 
+ "title_field": "item_name", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index 6790176..df90ad9 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -9,6 +9,7 @@
 from frappe import msgprint, _
 from frappe.utils import (cstr, flt, cint, getdate, now_datetime, formatdate,
 	strip, get_timestamp, random_string)
+from frappe.utils.html_utils import clean_html
 from frappe.website.website_generator import WebsiteGenerator
 from erpnext.setup.doctype.item_group.item_group import invalidate_cache_for, get_parent_item_groups
 from frappe.website.render import clear_cache
@@ -30,14 +31,11 @@
 	def onload(self):
 		super(Item, self).onload()
 
-		self.set_onload('sle_exists', self.check_if_sle_exists())
+		self.set_onload('stock_exists', self.stock_ledger_created())
 		if self.is_fixed_asset:
 			asset = frappe.db.get_all("Asset", filters={"item_code": self.name, "docstatus": 1}, limit=1)
 			self.set_onload("asset_exists", True if asset else False)
 
-		if frappe.db.get_value('Stock Ledger Entry', {'item_code': self.name}):
-			self.set_onload('stock_exists', True)
-
 	def autoname(self):
 		if frappe.db.get_default("item_naming_by")=="Naming Series":
 			if self.variant_of:
@@ -69,9 +67,7 @@
 			self.set_opening_stock()
 
 	def validate(self):
-		self.before_update = None
-		if frappe.db.exists('Item', self.name):
-			self.before_update = frappe.get_doc('Item', self.name)
+		self.get_doc_before_save()
 
 		super(Item, self).validate()
 
@@ -82,6 +78,7 @@
 			self.description = self.item_name
 
 		self.validate_uom()
+		self.validate_description()
 		self.add_default_uom_in_conversion_factor_table()
 		self.validate_conversion_factor()
 		self.validate_item_type()
@@ -89,7 +86,6 @@
 		self.fill_customer_code()
 		self.check_item_tax()
 		self.validate_barcode()
-		self.cant_change()
 		self.validate_warehouse_for_reorder()
 		self.update_bom_item_desc()
 		self.synced_with_hub = 0
@@ -101,6 +97,7 @@
 		self.validate_website_image()
 		self.make_thumbnail()
 		self.validate_fixed_asset()
+		self.validate_retain_sample()
 
 		if not self.get("__islocal"):
 			self.old_item_group = frappe.db.get_value(self.doctype, self.name, "item_group")
@@ -115,6 +112,11 @@
 		self.update_item_price()
 		self.update_template_item()
 
+	def validate_description(self):
+		'''Clean HTML description if set'''
+		if cint(frappe.db.get_single_value('Stock Settings', 'clean_description_html')):
+			self.description = clean_html(self.description)
+
 	def add_price(self, price_list=None):
 		'''Add a new price'''
 		if not price_list:
@@ -247,6 +249,20 @@
 			if not self.asset_category:
 				frappe.throw(_("Asset Category is mandatory for Fixed Asset item"))
 
+			if self.stock_ledger_created():
+				frappe.throw(_("Cannot be a fixed asset item as Stock Ledger is created."))
+
+		if not self.is_fixed_asset:
+			asset = frappe.db.get_all("Asset", filters={"item_code": self.name, "docstatus": 1}, limit=1)
+			if asset:
+				frappe.throw(_('"Is Fixed Asset" cannot be unchecked, as Asset record exists against the item'))
+
+	def validate_retain_sample(self):
+		if self.retain_sample and not frappe.db.get_single_value('Stock Settings', 'sample_retention_warehouse'):
+			frappe.throw(_("Please select Sample Retention Warehouse in Stock Settings first"));
+		if self.retain_sample and not self.has_batch_no:
+			frappe.throw(_(" {0} Retain Sample is based on batch, please check Has Batch No to retain sample of item").format(self.item_code))
+
 	def get_context(self, context):
 		context.show_search=True
 		context.search_link = '/product_search'
@@ -456,62 +472,27 @@
 			if duplicate:
 				frappe.throw(_("Barcode {0} already used in Item {1}").format(self.barcode, duplicate[0][0]))
 
-	def cant_change(self):
-		if not self.get("__islocal"):
-			to_check = ("has_serial_no", "is_stock_item",
-				"valuation_method", "has_batch_no", "is_fixed_asset")
 
-			vals = frappe.db.get_value("Item", self.name, to_check, as_dict=True)
-			if not vals.get('valuation_method') and self.get('valuation_method'):
-				vals['valuation_method'] = frappe.db.get_single_value("Stock Settings", "valuation_method") or "FIFO"
-
-			if vals:
-				for key in to_check:
-					if cstr(self.get(key)) != cstr(vals.get(key)):
-						if not self.check_if_linked_document_exists(key):
-							break # no linked document, allowed
-						else:
-							frappe.throw(_("As there are existing transactions against item {0}, you can not change the value of {1}").format(self.name, frappe.bold(self.meta.get_label(key))))
-
-			if vals and not self.is_fixed_asset and self.is_fixed_asset != vals.is_fixed_asset:
-				asset = frappe.db.get_all("Asset", filters={"item_code": self.name, "docstatus": 1}, limit=1)
-				if asset:
-					frappe.throw(_('"Is Fixed Asset" cannot be unchecked, as Asset record exists against the item'))
-
-	def check_if_linked_document_exists(self, key):
-		linked_doctypes = ["Delivery Note Item", "Sales Invoice Item", "Purchase Receipt Item",
-			"Purchase Invoice Item", "Stock Entry Detail", "Stock Reconciliation Item"]
-
-		# For "Is Stock Item", following doctypes is important
-		# because reserved_qty, ordered_qty and requested_qty updated from these doctypes
-		if key == "is_stock_item":
-			linked_doctypes += ["Sales Order Item", "Purchase Order Item", "Material Request Item"]
-
-		for doctype in linked_doctypes:
-			if frappe.db.get_value(doctype, filters={"item_code": self.name, "docstatus": 1}) or \
-				frappe.db.get_value("Production Order",
-					filters={"production_item": self.name, "docstatus": 1}):
-				return True
-
+	def validate_warehouse_for_reorder(self):
+		'''Validate Reorder level table for duplicate and conditional mandatory'''
+		warehouse = []
 		for d in self.get("reorder_levels"):
+			if not d.warehouse_group:
+				d.warehouse_group = d.warehouse
+			if d.get("warehouse") and d.get("warehouse") not in warehouse:
+				warehouse += [d.get("warehouse")]
+			else:
+				frappe.throw(_("Row {0}: An Reorder entry already exists for this warehouse {1}")
+					.format(d.idx, d.warehouse), DuplicateReorderRows)
+
 			if d.warehouse_reorder_level and not d.warehouse_reorder_qty:
 				frappe.throw(_("Row #{0}: Please set reorder quantity").format(d.idx))
 
-	def validate_warehouse_for_reorder(self):
-		warehouse = []
-		for i in self.get("reorder_levels"):
-			if not i.warehouse_group:
-				i.warehouse_group = i.warehouse
-			if i.get("warehouse") and i.get("warehouse") not in warehouse:
-				warehouse += [i.get("warehouse")]
-			else:
-				frappe.throw(_("Row {0}: An Reorder entry already exists for this warehouse {1}")
-					.format(i.idx, i.warehouse), DuplicateReorderRows)
-
-	def check_if_sle_exists(self):
-		sle = frappe.db.sql("""select name from `tabStock Ledger Entry`
-			where item_code = %s""", self.name)
-		return sle and 'exists' or 'not exists'
+	def stock_ledger_created(self):
+		if not hasattr(self, '_stock_ledger_created'):
+			self._stock_ledger_created = len(frappe.db.sql("""select name from `tabStock Ledger Entry`
+				where item_code = %s limit 1""", self.name))
+		return self._stock_ledger_created
 
 	def validate_name_with_item_group(self):
 		# causes problem with tree build
@@ -638,19 +619,19 @@
 				template_item.save()
 
 	def update_variants(self):
-			if self.flags.dont_update_variants or \
-				frappe.db.get_single_value('Item Variant Settings', 'do_not_update_variants'):
-				return
-			if self.has_variants:
-				updated = []
-				variants = frappe.db.get_all("Item", fields=["item_code"], filters={"variant_of": self.name })
-				for d in variants:
-					variant = frappe.get_doc("Item", d)
-					copy_attributes_to_variant(self, variant)
-					variant.save()
-					updated.append(d.item_code)
-				if updated:
-					frappe.msgprint(_("Item Variants {0} updated").format(", ".join(updated)))
+		if self.flags.dont_update_variants or \
+			frappe.db.get_single_value('Item Variant Settings', 'do_not_update_variants'):
+			return
+		if self.has_variants:
+			updated = []
+			variants = frappe.db.get_all("Item", fields=["item_code"], filters={"variant_of": self.name })
+			for d in variants:
+				variant = frappe.get_doc("Item", d)
+				copy_attributes_to_variant(self, variant)
+				variant.save()
+				updated.append(d.item_code)
+			if updated:
+				frappe.msgprint(_("Item Variants {0} updated").format(", ".join(updated)))
 
 	def validate_has_variants(self):
 		if not self.has_variants and frappe.db.get_value("Item", self.name, "has_variants"):
@@ -658,10 +639,15 @@
 				frappe.throw(_("Item has variants."))
 
 	def validate_stock_exists_for_template_item(self):
-		if self.has_variants and \
-			frappe.db.get_value('Stock Ledger Entry', {'item_code': self.name}):
-			frappe.throw(_("As stock exists against an item {0}, you can not enable has variants property")
-				.format(self.name), StockExistsForTemplate)
+		if self.stock_ledger_created() and self._doc_before_save:
+			if (self._doc_before_save.has_variants != self.has_variants
+				or self._doc_before_save.variant_of != self.variant_of):
+				frappe.throw(_("Cannot change Variant properties after stock transction. You will have to make a new Item to do this.").format(self.name),
+					StockExistsForTemplate)
+
+			if self.has_variants or self.variant_of:
+				if not self.is_child_table_same('attributes'):
+					frappe.throw(_('Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item'))
 
 	def validate_uom(self):
 		if not self.get("__islocal"):
diff --git a/erpnext/stock/doctype/item/tests/test_item.js b/erpnext/stock/doctype/item/tests/test_item.js
new file mode 100644
index 0000000..5e3524e
--- /dev/null
+++ b/erpnext/stock/doctype/item/tests/test_item.js
@@ -0,0 +1,121 @@
+QUnit.module('stock');
+QUnit.test("test: item", function (assert) {
+	assert.expect(6);
+	let done = assert.async();
+	let keyboard_cost  = 800;
+	let screen_cost  = 4000;
+	let CPU_cost  = 15000;
+	let scrap_cost = 100;
+	let no_of_items_to_stock = 100;
+	let is_stock_item = 1;
+	frappe.run_serially([
+		// test item creation
+		() => frappe.set_route("List", "Item"),
+
+		// Create a keyboard item
+		() => frappe.tests.make(
+			"Item", [
+				{item_code: "Keyboard"},
+				{item_group: "Products"},
+				{is_stock_item: is_stock_item},
+				{standard_rate: keyboard_cost},
+				{opening_stock: no_of_items_to_stock},
+				{default_warehouse: "Stores - FT"}
+			]
+		),
+		() => {
+			assert.ok(cur_frm.doc.item_name.includes('Keyboard'),
+				'Item Keyboard created correctly');
+			assert.ok(cur_frm.doc.item_code.includes('Keyboard'),
+				'item_code for Keyboard set correctly');
+			assert.ok(cur_frm.doc.item_group.includes('Products'),
+				'item_group for Keyboard set correctly');
+			assert.equal(cur_frm.doc.is_stock_item, is_stock_item,
+				'is_stock_item for Keyboard set correctly');
+			assert.equal(cur_frm.doc.standard_rate, keyboard_cost,
+				'standard_rate for Keyboard set correctly');
+			assert.equal(cur_frm.doc.opening_stock, no_of_items_to_stock,
+				'opening_stock for Keyboard set correctly');
+		},
+
+		// Create a Screen item
+		() => frappe.tests.make(
+			"Item", [
+				{item_code: "Screen"},
+				{item_group: "Products"},
+				{is_stock_item: is_stock_item},
+				{standard_rate: screen_cost},
+				{opening_stock: no_of_items_to_stock},
+				{default_warehouse: "Stores - FT"}
+			]
+		),
+
+		// Create a CPU item
+		() => frappe.tests.make(
+			"Item", [
+				{item_code: "CPU"},
+				{item_group: "Products"},
+				{is_stock_item: is_stock_item},
+				{standard_rate: CPU_cost},
+				{opening_stock: no_of_items_to_stock},
+				{default_warehouse: "Stores - FT"}
+			]
+		),
+
+		// Create a laptop item
+		() => frappe.tests.make(
+			"Item", [
+				{item_code: "Laptop"},
+				{item_group: "Products"},
+				{default_warehouse: "Stores - FT"}
+			]
+		),
+		() => frappe.tests.make(
+			"Item", [
+				{item_code: "Computer"},
+				{item_group: "Products"},
+				{is_stock_item: 0},
+			]
+		),
+
+		// Create a scrap item
+		() => frappe.tests.make(
+			"Item", [
+				{item_code: "Scrap item"},
+				{item_group: "Products"},
+				{is_stock_item: is_stock_item},
+				{standard_rate: scrap_cost},
+				{opening_stock: no_of_items_to_stock},
+				{default_warehouse: "Stores - FT"}
+			]
+		),
+		() => frappe.tests.make(
+			"Item", [
+				{item_code: "Test Product 4"},
+				{item_group: "Products"},
+				{is_stock_item: 1},
+				{has_batch_no: 1},
+				{create_new_batch: 1},
+				{uoms:
+					[
+						[
+							{uom:"Unit"},
+							{conversion_factor: 10},
+						]
+					]
+				},
+				{taxes:
+					[
+						[
+							{tax_type:"SGST - "+frappe.get_abbr(frappe.defaults.get_default("Company"))},
+							{tax_rate: 0},
+						]
+					]},
+				{has_serial_no: 1},
+				{standard_rate: 100},
+				{opening_stock: 100},
+			]
+		),
+		() => done()
+	]);
+});
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_price/item_price.json b/erpnext/stock/doctype/item_price/item_price.json
index fee229f..fdc2df2 100644
--- a/erpnext/stock/doctype/item_price/item_price.json
+++ b/erpnext/stock/doctype/item_price/item_price.json
@@ -1,5 +1,6 @@
 {
- "allow_copy": 0,
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "ITEM-PRICE-.#####", 
@@ -14,6 +15,7 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -43,6 +45,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -72,6 +75,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -100,6 +104,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -128,6 +133,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -156,6 +162,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -165,7 +172,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0,
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "", 
@@ -184,6 +192,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -213,6 +222,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -244,6 +254,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -275,6 +286,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -302,6 +314,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -330,6 +343,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -357,19 +371,19 @@
    "set_only_once": 0, 
    "unique": 0
   }
- ],
+ ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-flag", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0,
- "is_submittable": 0,
+ "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-09-28 03:56:20.814993", 
+ "modified": "2017-12-01 13:03:53.397382", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Price", 
diff --git a/erpnext/stock/doctype/item_price/test_item_price.js b/erpnext/stock/doctype/item_price/test_item_price.js
new file mode 100644
index 0000000..8f2f289
--- /dev/null
+++ b/erpnext/stock/doctype/item_price/test_item_price.js
@@ -0,0 +1,22 @@
+QUnit.module('Stock');
+
+QUnit.test("test item price", function(assert) {
+	assert.expect(2);
+	let done = assert.async();
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make('Item Price', [
+				{price_list:'Test-Selling-USD'},
+				{item_code: 'Test Product 4'},
+				{price_list_rate: 200}
+			]);
+		},
+		() => cur_frm.save(),
+		() => {
+			assert.ok(cur_frm.doc.item_name == 'Test Product 4', "Item name correct");
+			assert.ok(cur_frm.doc.price_list_rate == 200, "Price list rate correct");
+		},
+		() => frappe.timeout(0.3),
+		() => done()
+	]);
+});
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_variant_attribute/item_variant_attribute.json b/erpnext/stock/doctype/item_variant_attribute/item_variant_attribute.json
index e5267db..1e55580 100644
--- a/erpnext/stock/doctype/item_variant_attribute/item_variant_attribute.json
+++ b/erpnext/stock/doctype/item_variant_attribute/item_variant_attribute.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "", 
@@ -12,16 +13,20 @@
  "editable_grid": 1, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "attribute", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Attribute", 
    "length": 0, 
    "no_copy": 0, 
@@ -31,6 +36,7 @@
    "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, 
@@ -38,16 +44,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -55,6 +65,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -62,9 +73,11 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "attribute_value", 
    "fieldtype": "Data", 
@@ -72,7 +85,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Attribute Value", 
    "length": 0, 
    "no_copy": 0, 
@@ -82,6 +97,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -89,9 +105,11 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "has_variants", 
    "fieldname": "numeric_values", 
    "fieldtype": "Check", 
@@ -99,7 +117,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Numeric Values", 
    "length": 0, 
    "no_copy": 0, 
@@ -108,6 +128,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -115,9 +136,11 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "numeric_values", 
    "fieldname": "section_break_4", 
    "fieldtype": "Section Break", 
@@ -125,7 +148,9 @@
    "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, 
@@ -133,6 +158,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -140,9 +166,11 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "from_range", 
    "fieldtype": "Float", 
@@ -150,7 +178,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "From Range", 
    "length": 0, 
    "no_copy": 0, 
@@ -159,6 +189,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -166,9 +197,11 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "increment", 
    "fieldtype": "Float", 
@@ -176,7 +209,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Increment", 
    "length": 0, 
    "no_copy": 0, 
@@ -185,6 +220,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -192,16 +228,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_8", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -209,6 +249,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -216,9 +257,11 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "fieldname": "to_range", 
    "fieldtype": "Float", 
@@ -226,7 +269,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "To Range", 
    "length": 0, 
    "no_copy": 0, 
@@ -235,6 +280,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -242,18 +288,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "", 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-11 03:28:01.395442", 
+ "modified": "2017-12-11 11:26:25.126350", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Variant Attribute", 
@@ -263,7 +309,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_variant_settings/item_variant_settings.json b/erpnext/stock/doctype/item_variant_settings/item_variant_settings.json
index 8bdd46c..8ad73d1 100644
--- a/erpnext/stock/doctype/item_variant_settings/item_variant_settings.json
+++ b/erpnext/stock/doctype/item_variant_settings/item_variant_settings.json
@@ -47,7 +47,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "description": "If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant", 
+   "description": "Fields will be copied over only at time of creation.", 
    "fieldname": "do_not_update_variants", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -57,7 +57,7 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Do not Update Variants", 
+   "label": "Do not update variants on save", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -144,7 +144,7 @@
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-11-08 11:38:12.821404", 
+ "modified": "2017-11-14 15:54:12.190518", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Variant Settings", 
diff --git a/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json b/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
index dbc6a88..1aaf73f 100644
--- a/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
+++ b/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "beta": 0, 
@@ -12,16 +13,18 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "description", 
-   "fieldtype": "Text Editor", 
+   "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Description", 
@@ -39,6 +42,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -49,6 +53,7 @@
    "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, 
@@ -66,6 +71,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -76,6 +82,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Amount", 
@@ -94,17 +101,17 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-12-20 05:44:54.700163", 
+ "modified": "2017-11-15 19:27:59.542487", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Landed Cost Taxes and Charges", 
@@ -114,7 +121,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py
index 59075c5..da310aa 100644
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -158,7 +158,7 @@
 						and material_request_item = %s and docstatus = 1""",
 						(self.name, d.name))[0][0])
 
-					if d.ordered_qty and d.ordered_qty > d.qty:
+					if d.ordered_qty and d.ordered_qty > d.stock_qty:
 						frappe.throw(_("The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}").format(d.ordered_qty, d.parent, d.qty, d.item_code))
 
@@ -170,11 +170,12 @@
 
 				frappe.db.set_value(d.doctype, d.name, "ordered_qty", d.ordered_qty)
 
+		target_ref_field = 'qty' if self.material_request_type == "Manufacture" else 'stock_qty'
 		self._update_percent_field({
 			"target_dt": "Material Request Item",
 			"target_parent_dt": self.doctype,
 			"target_parent_field": "per_ordered",
-			"target_ref_field": "qty",
+			"target_ref_field": target_ref_field,
 			"target_field": "ordered_qty",
 			"name": self.name,
 		}, update_modified)
@@ -216,9 +217,9 @@
 	target_doc.run_method("calculate_taxes_and_totals")
 
 def update_item(obj, target, source_parent):
-	target.conversion_factor = 1
-	target.qty = flt(obj.qty) - flt(obj.ordered_qty)
-	target.stock_qty = target.qty
+	target.conversion_factor = obj.conversion_factor
+	target.qty = flt(flt(obj.stock_qty) - flt(obj.ordered_qty))/ target.conversion_factor
+	target.stock_qty = (target.qty * target.conversion_factor)
 
 @frappe.whitelist()
 def make_purchase_order(source_name, target_doc=None):
@@ -242,7 +243,7 @@
 				["uom", "uom"]
 			],
 			"postprocess": update_item,
-			"condition": lambda doc: doc.ordered_qty < doc.qty
+			"condition": lambda doc: doc.ordered_qty < doc.stock_qty
 		}
 	}, target_doc, postprocess)
 
@@ -353,11 +354,11 @@
 @frappe.whitelist()
 def make_stock_entry(source_name, target_doc=None):
 	def update_item(obj, target, source_parent):
-		qty = flt(obj.qty) - flt(obj.ordered_qty) \
-			if flt(obj.qty) > flt(obj.ordered_qty) else 0
+		qty = flt(flt(obj.stock_qty) - flt(obj.ordered_qty))/ target.conversion_factor \
+			if flt(obj.stock_qty) > flt(obj.ordered_qty) else 0
 		target.qty = qty
-		target.transfer_qty = qty
-		target.conversion_factor = 1
+		target.transfer_qty = qty * obj.conversion_factor
+		target.conversion_factor = obj.conversion_factor
 
 		if source_parent.material_request_type == "Material Transfer":
 			target.t_warehouse = obj.warehouse
@@ -384,7 +385,7 @@
 				"uom": "stock_uom",
 			},
 			"postprocess": update_item,
-			"condition": lambda doc: doc.ordered_qty < doc.qty
+			"condition": lambda doc: doc.ordered_qty < doc.stock_qty
 		}
 	}, target_doc, set_missing_values)
 
@@ -405,7 +406,7 @@
 				prod_order.fg_warehouse = d.warehouse
 				prod_order.wip_warehouse = default_wip_warehouse
 				prod_order.description = d.description
-				prod_order.stock_uom = d.uom
+				prod_order.stock_uom = d.stock_uom
 				prod_order.expected_delivery_date = d.schedule_date
 				prod_order.sales_order = d.sales_order
 				prod_order.bom_no = get_item_details(d.item_code).bom_no
diff --git a/erpnext/stock/doctype/material_request/test_material_request.py b/erpnext/stock/doctype/material_request/test_material_request.py
index a24957e..83971d3 100644
--- a/erpnext/stock/doctype/material_request/test_material_request.py
+++ b/erpnext/stock/doctype/material_request/test_material_request.py
@@ -6,7 +6,7 @@
 
 from __future__ import unicode_literals
 import frappe, unittest, erpnext
-from frappe.utils import flt
+from frappe.utils import flt, today
 from erpnext.stock.doctype.material_request.material_request import raise_production_orders
 
 class TestMaterialRequest(unittest.TestCase):
@@ -558,5 +558,48 @@
 			item_code= %s and warehouse= %s """, (mr.items[0].item_code, mr.items[0].warehouse))[0][0]
 		self.assertEquals(requested_qty, new_requested_qty)
 
+	def test_multi_uom_for_purchase(self):
+		from erpnext.stock.doctype.material_request.material_request import make_purchase_order
+
+		mr = frappe.copy_doc(test_records[0])
+		mr.material_request_type = 'Purchase'
+		item = mr.items[0]
+		mr.schedule_date = today()
+
+		if not frappe.db.get_value('UOM Conversion Detail',
+			 {'parent': item.item_code, 'uom': 'Kg'}):
+			 item_doc = frappe.get_doc('Item', item.item_code)
+			 item_doc.append('uoms', {
+				 'uom': 'Kg',
+				 'conversion_factor': 5
+			 })
+			 item_doc.save(ignore_permissions=True)
+
+		item.uom = 'Kg'
+		for item in mr.items:
+			item.schedule_date = mr.schedule_date
+
+		mr.insert()
+		self.assertRaises(frappe.ValidationError, make_purchase_order,
+			mr.name)
+
+		mr = frappe.get_doc("Material Request", mr.name)
+		mr.submit()
+		item = mr.items[0]
+
+		self.assertEquals(item.uom, "Kg")
+		self.assertEquals(item.conversion_factor, 5.0)
+		self.assertEquals(item.stock_qty, flt(item.qty * 5))
+
+		po = make_purchase_order(mr.name)
+		self.assertEquals(po.doctype, "Purchase Order")
+		self.assertEquals(len(po.get("items")), len(mr.get("items")))
+
+		po.supplier = '_Test Supplier'
+		po.insert()
+		po.submit()
+		mr = frappe.get_doc("Material Request", mr.name)
+		self.assertEquals(mr.per_ordered, 100)
+
 test_dependencies = ["Currency Exchange", "BOM"]
 test_records = frappe.get_test_records('Material Request')
diff --git a/erpnext/stock/doctype/material_request_item/material_request_item.json b/erpnext/stock/doctype/material_request_item/material_request_item.json
index 5bf3f27..3434b4d 100644
--- a/erpnext/stock/doctype/material_request_item/material_request_item.json
+++ b/erpnext/stock/doctype/material_request_item/material_request_item.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
@@ -13,6 +14,7 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -46,6 +48,7 @@
    "width": "100px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -73,6 +76,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -105,6 +109,7 @@
    "width": "100px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -134,6 +139,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -166,6 +172,7 @@
    "width": "250px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -194,6 +201,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -223,6 +231,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -251,6 +260,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -283,11 +293,12 @@
    "width": "80px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "uom", 
+   "fieldname": "stock_uom", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -299,23 +310,21 @@
    "label": "Stock UOM", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "uom", 
-   "oldfieldtype": "Link", 
    "options": "UOM", 
    "permlevel": 0, 
-   "print_hide": 0, 
+   "precision": "", 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
-   "print_width": "70px", 
    "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "unique": 0, 
-   "width": "70px"
+   "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -349,6 +358,7 @@
    "width": "100px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -376,6 +386,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -409,6 +420,101 @@
    "width": "100px"
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "uom", 
+   "oldfieldtype": "Link", 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "70px", 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "70px"
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "conversion_factor", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "UOM Conversion Factor", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "stock_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Stock Qty", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -437,6 +543,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -469,6 +576,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -502,6 +610,7 @@
    "width": "100px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -532,6 +641,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -561,6 +671,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -591,6 +702,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -618,6 +730,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -650,6 +763,7 @@
    "width": "70px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -682,6 +796,7 @@
    "width": "70px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -711,6 +826,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -741,6 +857,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -771,17 +888,17 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-02-20 13:31:50.143583", 
+ "modified": "2017-10-25 17:18:59.974778", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Material Request Item", 
diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.py b/erpnext/stock/doctype/packing_slip/packing_slip.py
index 25fde08..ec5392f 100644
--- a/erpnext/stock/doctype/packing_slip/packing_slip.py
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.py
@@ -2,11 +2,13 @@
 # License: GNU General Public License v3. See license.txt
 
 from __future__ import unicode_literals
-import frappe
-from frappe.utils import flt, cint
-from frappe import _
 
+import frappe
+from frappe import _
+from frappe.model import no_value_fields
 from frappe.model.document import Document
+from frappe.utils import cint, flt
+
 
 class PackingSlip(Document):
 
@@ -84,11 +86,12 @@
 			* No. of Cases of this packing slip
 		"""
 
-		# also pick custom fields from delivery note
 		rows = [d.item_code for d in self.get("items")]
 
-		custom_fields = ', '.join(['dni.`{0}`'.format(d.fieldname) for d in \
-			frappe.get_meta("Delivery Note Item").get_custom_fields()])
+		# also pick custom fields from delivery note
+		custom_fields = ', '.join(['dni.`{0}`'.format(d.fieldname)
+			for d in frappe.get_meta("Delivery Note Item").get_custom_fields()
+			if d.fieldtype not in no_value_fields])
 
 		if custom_fields:
 			custom_fields = ', ' + custom_fields
diff --git a/erpnext/stock/doctype/price_list/price_list.json b/erpnext/stock/doctype/price_list/price_list.json
index be6673e..d160f8a 100644
--- a/erpnext/stock/doctype/price_list/price_list.json
+++ b/erpnext/stock/doctype/price_list/price_list.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:price_list_name", 
@@ -14,6 +15,7 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -43,6 +45,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -70,6 +73,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -100,6 +104,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -129,6 +134,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -157,6 +163,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -185,6 +192,37 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "price_not_uom_dependant", 
+   "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": "Price Not UOM Dependant", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -212,6 +250,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -242,18 +281,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-tags", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 1, 
- "modified": "2017-02-20 13:27:30.431064", 
+ "modified": "2017-12-01 16:55:00.243382", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Price List", 
diff --git a/erpnext/stock/doctype/price_list/test_price_list.js b/erpnext/stock/doctype/price_list/test_price_list.js
new file mode 100644
index 0000000..fe4e07b
--- /dev/null
+++ b/erpnext/stock/doctype/price_list/test_price_list.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Price List", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Price List
+		() => frappe.tests.make('Price List', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/stock/doctype/price_list/test_price_list_uom.js b/erpnext/stock/doctype/price_list/test_price_list_uom.js
new file mode 100644
index 0000000..526d0da
--- /dev/null
+++ b/erpnext/stock/doctype/price_list/test_price_list_uom.js
@@ -0,0 +1,58 @@
+QUnit.module('Price List');
+
+QUnit.test("test price list with uom dependancy", function(assert) {
+	assert.expect(2);
+	let done = assert.async();
+	frappe.run_serially([
+
+		() => frappe.set_route('Form', 'Price List', 'Standard Buying'),
+		() => {
+			cur_frm.set_value('price_not_uom_dependant','1');
+			frappe.timeout(1);
+		},
+		() => cur_frm.save(),
+
+		() => frappe.timeout(1),
+
+		() => {
+			return frappe.tests.make('Item Price', [
+				{price_list:'Standard Buying'},
+				{item_code: 'Test Product 3'},
+				{price_list_rate: 200}
+			]);
+		},
+
+		() => cur_frm.save(),
+
+		() => {
+			return frappe.tests.make('Purchase Order', [
+				{supplier: 'Test Supplier'},
+				{currency: 'INR'},
+				{buying_price_list: 'Standard Buying'},
+				{items: [
+					[
+						{"item_code": 'Test Product 3'},
+						{"schedule_date": frappe.datetime.add_days(frappe.datetime.now_date(), 2)},
+						{"uom": 'Nos'},
+						{"conversion_factor": 3}
+					]
+				]},
+
+			]);
+		},
+
+		() => cur_frm.save(),
+		() => frappe.timeout(0.3),
+
+		() => {
+			assert.ok(cur_frm.doc.items[0].item_name == 'Test Product 3', "Item code correct");
+			assert.ok(cur_frm.doc.items[0].price_list_rate == 200, "Price list rate correct");
+		},
+
+		() => frappe.tests.click_button('Submit'),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(1),
+
+		() => done()
+	]);
+});
\ No newline at end of file
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index 4447fb8..791b253 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -98,6 +98,7 @@
 				if(flt(this.frm.doc.per_billed) < 100) {
 					cur_frm.add_custom_button(__('Invoice'), this.make_purchase_invoice, __("Make"));
 				}
+				cur_frm.add_custom_button(__('Retention Stock Entry'), this.make_retention_stock_entry, __("Make"));
 
 				if(!this.frm.doc.subscription) {
 					cur_frm.add_custom_button(__('Subscription'), function() {
@@ -137,7 +138,26 @@
 
 	reopen_purchase_receipt: function() {
 		cur_frm.cscript.update_status("Submitted");
-	}
+	},
+
+	make_retention_stock_entry: function() {
+		frappe.call({
+			method: "erpnext.stock.doctype.stock_entry.stock_entry.move_sample_to_retention_warehouse",
+			args:{
+				"company": cur_frm.doc.company,
+				"items": cur_frm.doc.items
+			},
+			callback: function (r) {
+				if (r.message) {
+					var doc = frappe.model.sync(r.message)[0];
+					frappe.set_route("Form", doc.doctype, doc.name);
+				}
+				else {
+					frappe.msgprint(__("Retention Stock Entry already created or Sample Quantity not provided"));
+				}
+			}
+		});
+	},
 
 });
 
@@ -206,3 +226,36 @@
 	}
 	frm.toggle_reqd("supplier_warehouse", frm.doc.is_subcontracted==="Yes");
 });
+
+frappe.ui.form.on('Purchase Receipt Item', {
+	item_code: function(frm, cdt, cdn) {
+		var d = locals[cdt][cdn];
+		frappe.db.get_value('Item', {name: d.item_code}, 'sample_quantity', (r) => {
+			frappe.model.set_value(cdt, cdn, "sample_quantity", r.sample_quantity);
+		});
+	},
+	sample_quantity: function(frm, cdt, cdn) {
+		validate_sample_quantity(frm, cdt, cdn);
+	},
+	batch_no: function(frm, cdt, cdn) {
+		validate_sample_quantity(frm, cdt, cdn);
+	},
+});
+
+var validate_sample_quantity = function(frm, cdt, cdn) {
+	var d = locals[cdt][cdn];
+	if (d.sample_quantity) {
+		frappe.call({
+			method: 'erpnext.stock.doctype.stock_entry.stock_entry.validate_sample_quantity',
+			args: {
+				batch_no: d.batch_no,
+				item_code: d.item_code,
+				sample_quantity: d.sample_quantity,
+				qty: d.qty
+			},
+			callback: (r) => {
+				frappe.model.set_value(cdt, cdn, "sample_quantity", r.message);
+			}
+		});
+	}
+};
\ No newline at end of file
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index 113bbc2..8c86c8b 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -190,6 +190,7 @@
    "label": "Supplier Name", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "supplier.supplier_name", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -1290,8 +1291,38 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "total_net_weight", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Net Weight", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "description": "Add / Edit Taxes and Charges", 
-   "fieldname": "taxes_section", 
+   "fieldname": "taxes_charges_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -1355,6 +1386,95 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "shipping_col", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "shipping_rule", 
+   "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": "Shipping Rule", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Shipping Rule", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "taxes_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -3122,7 +3242,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-09-19 11:02:24.831340", 
+ "modified": "2017-11-29 14:15:10.309900", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Purchase Receipt", 
diff --git a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
index b7d3928..1b4cfd9 100755
--- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -493,7 +493,8 @@
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
-   "print_hide": 0, 
+   "precision": "", 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "remember_last_selected_value": 0, 
@@ -525,6 +526,7 @@
    "oldfieldtype": "Link", 
    "options": "UOM", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
@@ -592,6 +594,7 @@
    "oldfieldname": "conversion_factor", 
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
@@ -610,6 +613,69 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "retain_sample", 
+   "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": "Retain Sample", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "item_code.retain_sample", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "retain_sample", 
+   "fieldname": "sample_quantity", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Sample Quantity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "item_code.sample_quantity", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "rate_and_amount", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1157,6 +1223,156 @@
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "item_weight_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Weight Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "weight_per_unit", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Weight Per Unit", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_weight", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Weight", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_41", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "weight_uom", 
+   "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": "Weight UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "warehouse_and_reference", 
@@ -2074,7 +2290,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-08-07 14:59:43.198849", 
+ "modified": "2017-12-06 13:50:08.201145", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Purchase Receipt Item", 
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index d45db3e..40fc44d 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -4,7 +4,6 @@
 
 frappe.ui.form.on('Stock Entry', {
 	setup: function(frm) {
-
 		frm.set_query('production_order', function() {
 			return {
 				filters: [
@@ -15,6 +14,26 @@
 			}
 		});
 
+		frappe.db.get_value('Stock Settings', {name: 'Stock Settings'}, 'sample_retention_warehouse', (r) => {
+			if (r.sample_retention_warehouse) {
+				var filters = [
+							["Warehouse", 'company', '=', frm.doc.company],
+							["Warehouse", "is_group", "=",0],
+							['Warehouse', 'name', '!=', r.sample_retention_warehouse]
+						]
+				frm.set_query("from_warehouse", function() {
+					return {
+						filters: filters
+					};
+				});
+				frm.set_query("s_warehouse", "items", function() {
+					return {
+						filters: filters
+					};
+				});
+			}
+		});
+
 		frm.set_query('batch_no', 'items', function(doc, cdt, cdn) {
 			var item = locals[cdt][cdn];
 			if(!item.item_code) {
@@ -39,7 +58,6 @@
 			}
 		});
 	},
-
 	refresh: function(frm) {
 		if(!frm.doc.docstatus) {
 			frm.add_custom_button(__('Make Material Request'), function() {
@@ -66,9 +84,32 @@
 			});
 		}
 
+		if (frm.doc.docstatus===0) {
+			frm.add_custom_button(__('Purchase Invoice'), function() {
+				erpnext.utils.map_current_doc({
+					method: "erpnext.accounts.doctype.purchase_invoice.purchase_invoice.make_stock_entry",
+					source_doctype: "Purchase Invoice",
+					target: frm,
+					date_field: "posting_date",
+					setters: {
+						supplier: frm.doc.supplier || undefined,
+					},
+					get_query_filters: {
+						docstatus: 1
+					}
+				})
+			}, __("Get items from"));
+		}
+
 		if(frm.doc.company) {
 			frm.trigger("toggle_display_account_head");
 		}
+
+		if(frm.doc.docstatus==1 && frm.doc.purpose == "Material Receipt") {
+			frm.add_custom_button(__('Make Retention Stock Entry'), function () {
+				frm.trigger("make_retention_stock_entry");
+			});
+		}
 	},
 
 	purpose: function(frm) {
@@ -105,6 +146,25 @@
 		});
 	},
 
+	make_retention_stock_entry: function(frm) {
+		frappe.call({
+			method: "erpnext.stock.doctype.stock_entry.stock_entry.move_sample_to_retention_warehouse",
+			args:{
+				"company": frm.doc.company,
+				"items": frm.doc.items
+			},
+			callback: function (r) {
+				if (r.message) {
+					var doc = frappe.model.sync(r.message)[0];
+					frappe.set_route("Form", doc.doctype, doc.name);
+				}
+				else {
+					frappe.msgprint(__("Retention Stock Entry already created or Sample Quantity not provided"));
+				}
+			}
+		});
+	},
+
 	toggle_display_account_head: function(frm) {
 		var enabled = erpnext.is_perpetual_inventory_enabled(frm.doc.company);
 		frm.fields_dict["items"].grid.set_column_disp(["cost_center", "expense_account"], enabled);
@@ -310,9 +370,33 @@
 	},
 	cost_center: function(frm, cdt, cdn) {
 		erpnext.utils.copy_value_in_all_row(frm.doc, cdt, cdn, "items", "cost_center");
-	}
+	},
+	sample_quantity: function(frm, cdt, cdn) {
+		validate_sample_quantity(frm, cdt, cdn);
+	},
+	batch_no: function(frm, cdt, cdn) {
+		validate_sample_quantity(frm, cdt, cdn);
+	},
 });
 
+var validate_sample_quantity = function(frm, cdt, cdn) {
+	var d = locals[cdt][cdn];
+	if (d.sample_quantity && frm.doc.purpose == "Material Receipt") {
+		frappe.call({
+			method: 'erpnext.stock.doctype.stock_entry.stock_entry.validate_sample_quantity',
+			args: {
+				batch_no: d.batch_no,
+				item_code: d.item_code,
+				sample_quantity: d.sample_quantity,
+				qty: d.transfer_qty
+			},
+			callback: (r) => {
+				frappe.model.set_value(cdt, cdn, "sample_quantity", r.message);
+			}
+		});
+	}
+};
+
 frappe.ui.form.on('Landed Cost Taxes and Charges', {
 	amount: function(frm) {
 		frm.events.calculate_amount(frm);
@@ -558,6 +642,8 @@
 
 		this.frm.fields_dict["items"].grid.set_column_disp("s_warehouse", doc.purpose!='Material Receipt');
 		this.frm.fields_dict["items"].grid.set_column_disp("t_warehouse", doc.purpose!='Material Issue');
+		this.frm.fields_dict["items"].grid.set_column_disp("retain_sample", doc.purpose=='Material Receipt');
+		this.frm.fields_dict["items"].grid.set_column_disp("sample_quantity", doc.purpose=='Material Receipt');
 
 		this.frm.cscript.toggle_enable_bom();
 
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 4d79e13..4e87011 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -9,13 +9,14 @@
 from erpnext.stock.utils import get_incoming_rate
 from erpnext.stock.stock_ledger import get_previous_sle, NegativeStockError
 from erpnext.stock.get_item_details import get_bin_details, get_default_cost_center, get_conversion_factor
-from erpnext.stock.doctype.batch.batch import get_batch_no, set_batch_nos
+from erpnext.stock.doctype.batch.batch import get_batch_no, set_batch_nos, get_batch_qty
 from erpnext.manufacturing.doctype.bom.bom import validate_bom_no
 import json
 
 class IncorrectValuationRateError(frappe.ValidationError): pass
 class DuplicateEntryForProductionOrderError(frappe.ValidationError): pass
 class OperationsNotCompleteError(frappe.ValidationError): pass
+class MaxSampleAlreadyRetainedError(frappe.ValidationError): pass
 
 from erpnext.controllers.stock_controller import StockController
 
@@ -356,7 +357,7 @@
 				if not total_allowed:
 					frappe.throw(_("Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1}")
 						.format(se_item.item_code, self.purchase_order))
-				total_supplied = frappe.db.sql("""select sum(qty)
+				total_supplied = frappe.db.sql("""select sum(transfer_qty)
 					from `tabStock Entry Detail`, `tabStock Entry`
 					where `tabStock Entry`.purchase_order = %s
 						and `tabStock Entry`.docstatus = 1
@@ -365,8 +366,8 @@
 							(self.purchase_order, se_item.item_code))[0][0]
 
 				if total_supplied > total_allowed:
-					frappe.throw(_("Not allowed to tranfer more {0} than {1} against Purchase Order {2}").format(se_item.item_code,
-						total_allowed, self.purchase_order))
+					frappe.throw(_("Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3}")
+						.format(se_item.idx, se_item.item_code, total_allowed, self.purchase_order))
 
 	def validate_bom(self):
 		for d in self.get('items'):
@@ -472,7 +473,7 @@
 	def get_item_details(self, args=None, for_update=False):
 		item = frappe.db.sql("""select stock_uom, description, image, item_name,
 				expense_account, buying_cost_center, item_group, has_serial_no,
-				has_batch_no
+				has_batch_no, sample_quantity
 			from `tabItem`
 			where name = %s
 				and disabled=0
@@ -499,7 +500,8 @@
 			'basic_rate'			: 0,
 			'serial_no'				: '',
 			'has_serial_no'			: item.has_serial_no,
-			'has_batch_no'			: item.has_batch_no
+			'has_batch_no'			: item.has_batch_no,
+			'sample_quantity'		: item.sample_quantity
 		})
 		for d in [["Account", "expense_account", "default_expense_account"],
 			["Cost Center", "cost_center", "cost_center"]]:
@@ -767,7 +769,7 @@
 			se_child.description = item_dict[d]["description"]
 			se_child.uom = stock_uom
 			se_child.stock_uom = stock_uom
-			se_child.qty = flt(item_dict[d]["qty"])
+			se_child.qty = flt(item_dict[d]["qty"], se_child.precision("qty"))
 			se_child.expense_account = item_dict[d].get("expense_account") or expense_account
 			se_child.cost_center = item_dict[d].get("cost_center") or cost_center
 
@@ -777,7 +779,7 @@
 				se_child.t_warehouse = self.to_warehouse
 
 			# in stock uom
-			se_child.transfer_qty = flt(item_dict[d]["qty"])
+			se_child.transfer_qty = flt(item_dict[d]["qty"], se_child.precision("qty"))
 			se_child.conversion_factor = 1.00
 
 			# to be assigned for finished item
@@ -803,6 +805,40 @@
 						if getdate(self.posting_date) > getdate(expiry_date):
 							frappe.throw(_("Batch {0} of Item {1} has expired.").format(item.batch_no, item.item_code))
 
+
+@frappe.whitelist()
+def move_sample_to_retention_warehouse(company, items):
+	if isinstance(items, basestring):
+		items = json.loads(items)
+	retention_warehouse = frappe.db.get_single_value('Stock Settings', 'sample_retention_warehouse')
+	stock_entry = frappe.new_doc("Stock Entry")
+	stock_entry.company = company
+	stock_entry.purpose = "Material Transfer"
+	for item in items:
+		if item.get('sample_quantity') and item.get('batch_no'):
+			sample_quantity = validate_sample_quantity(item.get('item_code'), item.get('sample_quantity'), item.get('transfer_qty') or item.get('qty'), item.get('batch_no'))
+			if sample_quantity:
+				sample_serial_nos = ''
+				if item.get('serial_no'):
+					serial_nos = (item.get('serial_no')).split()
+					if serial_nos and len(serial_nos) > item.get('sample_quantity'):
+						serial_no_list = serial_nos[:-(len(serial_nos)-item.get('sample_quantity'))]
+						sample_serial_nos = '\n'.join(serial_no_list)
+				stock_entry.append("items", {
+					"item_code": item.get('item_code'),
+					"s_warehouse": item.get('t_warehouse'),
+					"t_warehouse": retention_warehouse,
+					"qty": item.get('sample_quantity'),
+					"basic_rate": item.get('valuation_rate'),
+					'uom': item.get('uom'),
+					'stock_uom': item.get('stock_uom'),
+					"conversion_factor": 1.0,
+					"serial_no": sample_serial_nos,
+					'batch_no': item.get('batch_no')
+				})
+	if stock_entry.get('items'):
+		return stock_entry.as_dict()
+
 @frappe.whitelist()
 def get_production_order_details(production_order):
 	production_order = frappe.get_doc("Production Order", production_order)
@@ -893,5 +929,24 @@
 			"actual_qty" : get_previous_sle(args).get("qty_after_transaction") or 0,
 			"basic_rate" : get_incoming_rate(args)
 		}
-
 	return ret
+
+@frappe.whitelist()
+def validate_sample_quantity(item_code, sample_quantity, qty, batch_no = None):
+	if cint(qty) < cint(sample_quantity):
+		frappe.throw(_("Sample quantity {0} cannot be more than received quantity {1}").format(sample_quantity, qty))
+	retention_warehouse = frappe.db.get_single_value('Stock Settings', 'sample_retention_warehouse')
+	retainted_qty = 0
+	if batch_no:
+		retainted_qty = get_batch_qty(batch_no, retention_warehouse, item_code)
+	max_retain_qty = frappe.get_value('Item', item_code, 'sample_quantity')
+	if retainted_qty >= max_retain_qty:
+		frappe.msgprint(_("Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.").
+			format(retainted_qty, batch_no, item_code, batch_no), alert=True)
+		sample_quantity = 0
+	qty_diff = max_retain_qty-retainted_qty
+	if cint(sample_quantity) > cint(qty_diff):
+		frappe.msgprint(_("Maximum Samples - {0} can be retained for Batch {1} and Item {2}.").
+			format(max_retain_qty, batch_no, item_code), alert=True)
+		sample_quantity = qty_diff
+	return sample_quantity
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
index 0aecb78..551ad9f2 100644
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -15,6 +15,7 @@
 from frappe.tests.test_permissions import set_user_permission_doctypes
 from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
 from erpnext.accounts.doctype.account.test_account import get_inventory_account
+from erpnext.stock.doctype.stock_entry.stock_entry import move_sample_to_retention_warehouse
 
 def get_sle(**args):
 	condition, values = "", []
@@ -613,6 +614,61 @@
 		s2.submit()
 		s2.cancel()
 
+	def test_retain_sample(self):
+		from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
+		from erpnext.stock.doctype.batch.batch import get_batch_qty
+		
+		create_warehouse("Test Warehouse for Sample Retention")
+		frappe.db.set_value("Stock Settings", None, "sample_retention_warehouse", "Test Warehouse for Sample Retention - _TC")
+		
+		item = frappe.new_doc("Item")
+		item.item_code = "Retain Sample Item"
+		item.item_name = "Retain Sample Item"
+		item.description = "Retain Sample Item"
+		item.item_group = "All Item Groups"
+		item.is_stock_item = 1
+		item.has_batch_no = 1
+		item.create_new_batch = 1
+		item.retain_sample = 1
+		item.sample_quantity = 4
+		item.save()
+
+		receipt_entry = frappe.new_doc("Stock Entry")
+		receipt_entry.company = "_Test Company"
+		receipt_entry.purpose = "Material Receipt"
+		receipt_entry.append("items", {
+			"item_code": item.item_code,
+			"t_warehouse": "_Test Warehouse - _TC",
+			"qty": 40,
+			"basic_rate": 12,
+			"cost_center": "_Test Cost Center - _TC",
+			"sample_quantity": 4
+		})
+		receipt_entry.insert()
+		receipt_entry.submit()
+
+		retention_data = move_sample_to_retention_warehouse(receipt_entry.company, receipt_entry.get("items"))
+		retention_entry = frappe.new_doc("Stock Entry")
+		retention_entry.company = retention_data.company
+		retention_entry.purpose = retention_data.purpose
+		retention_entry.append("items", {
+			"item_code": item.item_code,
+			"t_warehouse": "Test Warehouse for Sample Retention - _TC",
+			"s_warehouse": "_Test Warehouse - _TC",
+			"qty": 4,
+			"basic_rate": 12,
+			"cost_center": "_Test Cost Center - _TC",
+			"batch_no": receipt_entry.get("items")[0].batch_no
+		})
+		retention_entry.insert()
+		retention_entry.submit()
+
+		qty_in_usable_warehouse = get_batch_qty(receipt_entry.get("items")[0].batch_no, "_Test Warehouse - _TC", "_Test Item")
+		qty_in_retention_warehouse = get_batch_qty(receipt_entry.get("items")[0].batch_no, "Test Warehouse for Sample Retention - _TC", "_Test Item")
+		
+		self.assertEquals(qty_in_usable_warehouse, 36)
+		self.assertEquals(qty_in_retention_warehouse, 4)
+
 def make_serialized_item(item_code=None, serial_no=None, target_warehouse=None):
 	se = frappe.copy_doc(test_records[0])
 	se.get("items")[0].item_code = item_code or "_Test Serialized Item With Series"
diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
index 6afb54e..c7566d9 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
@@ -1,1282 +1,1345 @@
 {
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "autoname": "hash",
- "beta": 0,
- "creation": "2013-03-29 18:22:12",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Other",
- "editable_grid": 1,
- "engine": "InnoDB",
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "hash", 
+ "beta": 0, 
+ "creation": "2013-03-29 18:22:12", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Other", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "barcode",
-   "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": "Barcode",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "barcode", 
+   "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": "Barcode", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "section_break_2",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_2", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 2,
-   "fieldname": "s_warehouse",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Source Warehouse",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "s_warehouse",
-   "oldfieldtype": "Link",
-   "options": "Warehouse",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "s_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Source Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "s_warehouse", 
+   "oldfieldtype": "Link", 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "col_break1",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 2,
-   "fieldname": "t_warehouse",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Target Warehouse",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "t_warehouse",
-   "oldfieldtype": "Link",
-   "options": "Warehouse",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "t_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Target Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "t_warehouse", 
+   "oldfieldtype": "Link", 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "sec_break1",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "sec_break1", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 3,
-   "fieldname": "item_code",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 1,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Item Code",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "item_code",
-   "oldfieldtype": "Link",
-   "options": "Item",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 3, 
+   "fieldname": "item_code", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Item Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_code", 
+   "oldfieldtype": "Link", 
+   "options": "Item", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 1, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "col_break2",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "item_name",
-   "fieldtype": "Data",
-   "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": "Item Name",
-   "length": 0,
-   "no_copy": 0,
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item_name", 
+   "fieldtype": "Data", 
+   "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": "Item Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "section_break_8",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Description",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "section_break_8", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "description",
-   "fieldtype": "Text Editor",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Description",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "description",
-   "oldfieldtype": "Text",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "print_width": "300px",
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "300px", 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "300px"
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_10",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_10", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "image",
-   "fieldtype": "Attach",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "image", 
+   "fieldtype": "Attach", 
+   "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, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "image_view",
-   "fieldtype": "Image",
-   "hidden": 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": "Image View",
-   "length": 0,
-   "no_copy": 0,
-   "options": "image",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "image_view", 
+   "fieldtype": "Image", 
+   "hidden": 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": "Image View", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "image", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "quantity_and_rate",
-   "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": "Quantity and Rate",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "quantity_and_rate", 
+   "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": "Quantity and Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 3,
-   "fieldname": "qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Qty",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "qty",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 3, 
+   "fieldname": "qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Qty", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "qty", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "basic_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Basic Rate (as per Stock UOM)",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "incoming_rate",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "basic_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Basic Rate (as per Stock UOM)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "incoming_rate", 
+   "oldfieldtype": "Currency", 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "basic_amount",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Basic Amount",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "basic_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Basic Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "additional_cost",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Additional Cost",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "additional_cost", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Additional Cost", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "amount",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Amount",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "amount",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "amount", 
+   "oldfieldtype": "Currency", 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "valuation_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Valuation Rate",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "valuation_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Valuation Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "col_break3",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "uom",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "UOM",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "uom",
-   "oldfieldtype": "Link",
-   "options": "UOM",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "uom", 
+   "oldfieldtype": "Link", 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "conversion_factor",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Conversion Factor",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "conversion_factor",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "conversion_factor", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Conversion Factor", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "conversion_factor", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "stock_uom",
-   "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": "Stock UOM",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "stock_uom",
-   "oldfieldtype": "Link",
-   "options": "UOM",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "stock_uom", 
+   "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": "Stock UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "stock_uom", 
+   "oldfieldtype": "Link", 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "transfer_qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Qty as per Stock UOM",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "transfer_qty",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "transfer_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Qty as per Stock UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "transfer_qty", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "serial_no_batch",
-   "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": "Serial No / Batch",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "retain_sample", 
+   "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": "Retain Sample", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "item_code.retain_sample", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "serial_no",
-   "fieldtype": "Small Text",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Serial No",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "serial_no",
-   "oldfieldtype": "Text",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "retain_sample", 
+   "fieldname": "sample_quantity", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Sample Quantity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "col_break4",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "serial_no_batch", 
+   "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": "Serial No / Batch", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "batch_no",
-   "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": "Batch No",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "batch_no",
-   "oldfieldtype": "Link",
-   "options": "Batch",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "serial_no", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Serial No", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "serial_no", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "accounting",
-   "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": "Accounting",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:cint(erpnext.is_perpetual_inventory_enabled(parent.company))",
-   "fieldname": "expense_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Difference Account",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "batch_no", 
+   "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": "Batch No", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "batch_no", 
+   "oldfieldtype": "Link", 
+   "options": "Batch", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "col_break5",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "accounting", 
+   "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": "Accounting", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": ":Company",
-   "depends_on": "eval:cint(erpnext.is_perpetual_inventory_enabled(parent.company))",
-   "fieldname": "cost_center",
-   "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": "Cost Center",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Cost Center",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:cint(erpnext.is_perpetual_inventory_enabled(parent.company))", 
+   "fieldname": "expense_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Difference Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "more_info",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "More Information",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break5", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "allow_zero_valuation_rate",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Allow Zero Valuation Rate",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": ":Company", 
+   "depends_on": "eval:cint(erpnext.is_perpetual_inventory_enabled(parent.company))", 
+   "fieldname": "cost_center", 
+   "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": "Cost Center", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "actual_qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Actual Qty (at source/target)",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "actual_qty",
-   "oldfieldtype": "Read Only",
-   "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": 1,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "more_info", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "More Information", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "BOM No. for a Finished Good Item",
-   "fieldname": "bom_no",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "BOM No",
-   "length": 0,
-   "no_copy": 0,
-   "options": "BOM",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "allow_zero_valuation_rate", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Allow Zero Valuation Rate", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "col_break6",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "actual_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Actual Qty (at source/target)", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "actual_qty", 
+   "oldfieldtype": "Read Only", 
+   "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": 1, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "Material Request used to make this Stock Entry",
-   "fieldname": "material_request",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Material Request",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Material Request",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "BOM No. for a Finished Good Item", 
+   "fieldname": "bom_no", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "BOM No", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "BOM", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "material_request_item",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Material Request Item",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Material Request Item",
-   "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,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break6", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Material Request used to make this Stock Entry", 
+   "fieldname": "material_request", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Material Request", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Material Request", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "material_request_item", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Material Request Item", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Material Request Item", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
   }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 1,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 1,
- "max_attachments": 0,
- "modified": "2017-07-10 06:29:22.805345",
- "modified_by": "Administrator",
- "module": "Stock",
- "name": "Stock Entry Detail",
- "owner": "Administrator",
- "permissions": [],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_order": "ASC",
- "track_changes": 0,
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 1, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-14 12:46:51.828176", 
+ "modified_by": "Administrator", 
+ "module": "Stock", 
+ "name": "Stock Entry Detail", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
index 0f91e43..8c6e12e 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
@@ -55,7 +55,7 @@
 
 				item.current_qty = qty
 				item.current_valuation_rate = rate
-				self.difference_amount += (flt(item.qty or qty) * flt(item.valuation_rate or rate) - (flt(qty) * flt(rate)))
+				self.difference_amount += (flt(item.qty) * flt(item.valuation_rate or rate) - (flt(qty) * flt(rate)))
 				return True
 
 		items = filter(lambda d: _changed(d), self.items)
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json
index 4801d40..761f807 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.json
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "beta": 0, 
@@ -11,6 +12,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -22,6 +24,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Item Naming By", 
@@ -40,6 +43,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -51,6 +55,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Default Item Group", 
@@ -69,6 +74,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -79,6 +85,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Default Stock UOM", 
@@ -97,6 +104,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -107,6 +115,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Default Warehouse", 
@@ -126,6 +135,38 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "sample_retention_warehouse", 
+   "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": "Sample Retention Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -136,6 +177,7 @@
    "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, 
@@ -152,6 +194,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -162,6 +205,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Default Valuation Method", 
@@ -180,6 +224,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -191,6 +236,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Limit Percent", 
@@ -208,6 +254,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -219,6 +266,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Show Barcode Field", 
@@ -237,6 +285,38 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "fieldname": "clean_description_html", 
+   "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": "Convert Item Description to Clean HTML", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -247,6 +327,7 @@
    "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, 
@@ -264,6 +345,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -274,6 +356,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Auto insert Price List rate if missing", 
@@ -292,6 +375,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -302,6 +386,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Allow Negative Stock", 
@@ -319,6 +404,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -329,6 +415,7 @@
    "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, 
@@ -346,6 +433,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -357,6 +445,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Automatically Set Serial Nos based on FIFO", 
@@ -375,6 +464,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -385,6 +475,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Auto Material Request", 
@@ -402,6 +493,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -412,6 +504,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Raise Material Request when stock reaches re-order level", 
@@ -429,6 +522,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -439,6 +533,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Notify by Email on creation of automatic Material Request", 
@@ -456,6 +551,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -466,6 +562,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Freeze Stock Entries", 
@@ -483,6 +580,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -493,6 +591,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Stock Frozen Upto", 
@@ -510,6 +609,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -520,6 +620,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Freeze Stocks Older Than [Days]", 
@@ -537,6 +638,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -547,6 +649,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Role Allowed to edit frozen stock", 
@@ -565,18 +668,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-cog", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-16 02:18:58.187847", 
+ "modified": "2017-11-17 01:35:49.562613", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Settings", 
@@ -592,7 +695,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -607,6 +709,8 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.py b/erpnext/stock/doctype/stock_settings/stock_settings.py
index 186eaee..89ece33 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.py
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.py
@@ -7,6 +7,7 @@
 import frappe
 from frappe import _
 from frappe.model.document import Document
+from frappe.utils.html_utils import clean_html
 
 class StockSettings(Document):
 	def validate(self):
@@ -26,19 +27,34 @@
 		# show/hide barcode field
 		frappe.make_property_setter({'fieldname': 'barcode', 'property': 'hidden',
 			'value': 0 if self.show_barcode_field else 1})
-			
+
 		self.cant_change_valuation_method()
-		
+		self.validate_clean_description_html()
+
 	def cant_change_valuation_method(self):
 		db_valuation_method = frappe.db.get_single_value("Stock Settings", "valuation_method")
-		
+
 		if db_valuation_method and db_valuation_method != self.valuation_method:
-			# check if there are any stock ledger entries against items 
+			# check if there are any stock ledger entries against items
 			# which does not have it's own valuation method
 			sle = frappe.db.sql("""select name from `tabStock Ledger Entry` sle
-				where exists(select name from tabItem 
-					where name=sle.item_code and (valuation_method is null or valuation_method=''))
+				where exists(select name from tabItem
+					where name=sle.item_code and (valuation_method is null or valuation_method='')) limit 1
 			""")
-			
+
 			if sle:
-				frappe.throw(_("Can't change valuation method, as there are transactions against some items which does not have it's own valuation method"))
\ No newline at end of file
+				frappe.throw(_("Can't change valuation method, as there are transactions against some items which does not have it's own valuation method"))
+
+	def validate_clean_description_html(self):
+		if int(self.clean_description_html or 0) \
+			and not int(self.db_get('clean_description_html') or 0):
+			# changed to text
+			frappe.enqueue('erpnext.stock.doctype.stock_settings.stock_settings.clean_all_descriptions', now=frappe.flags.in_test)
+
+
+def clean_all_descriptions():
+	for item in frappe.get_all('Item', ['name', 'description']):
+		if item.description:
+			clean_description = clean_html(item.description)
+		if item.description != clean_description:
+			frappe.db.set_value('Item', item.name, 'description', clean_description)
diff --git a/erpnext/stock/doctype/stock_settings/test_stock_settings.js b/erpnext/stock/doctype/stock_settings/test_stock_settings.js
new file mode 100644
index 0000000..57d9fc6
--- /dev/null
+++ b/erpnext/stock/doctype/stock_settings/test_stock_settings.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Stock Settings", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Stock Settings
+		() => frappe.tests.make('Stock Settings', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/stock/doctype/stock_settings/test_stock_settings.py b/erpnext/stock/doctype/stock_settings/test_stock_settings.py
new file mode 100644
index 0000000..43c0c57
--- /dev/null
+++ b/erpnext/stock/doctype/stock_settings/test_stock_settings.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestStockSettings(unittest.TestCase):
+	def setUp(self):
+		settings = frappe.get_single('Stock Settings')
+		settings.clean_description_html = 0
+		settings.save()
+
+		frappe.delete_doc('Item', 'Item for description test')
+
+	def tearDown(self):
+		settings = frappe.get_single('Stock Settings')
+		settings.clean_description_html = 1
+		settings.save()
+
+	def test_settings(self):
+		item = frappe.get_doc(dict(
+			doctype = 'Item',
+			item_code = 'Item for description test',
+			item_group = 'Products',
+			description = '<p><span style="font-size: 12px;">Drawing No. 07-xxx-PO132<br></span><span style="font-size: 12px;">1800 x 1685 x 750<br></span><span style="font-size: 12px;">All parts made of Marine Ply<br></span><span style="font-size: 12px;">Top w/ Corian dd<br></span><span style="font-size: 12px;">CO, CS, VIP Day Cabin</span></p>'
+		)).insert()
+
+		settings = frappe.get_single('Stock Settings')
+		settings.clean_description_html = 1
+		settings.save()
+
+		item.reload()
+
+		self.assertEquals(item.description, '<p>Drawing No. 07-xxx-PO132<br>1800 x 1685 x 750<br>All parts made of Marine Ply<br>Top w/ Corian dd<br>CO, CS, VIP Day Cabin</p>')
+
+		item.delete()
+
+	def test_clean_html(self):
+		settings = frappe.get_single('Stock Settings')
+		settings.clean_description_html = 1
+		settings.save()
+
+		item = frappe.get_doc(dict(
+			doctype = 'Item',
+			item_code = 'Item for description test',
+			item_group = 'Products',
+			description = '<p><span style="font-size: 12px;">Drawing No. 07-xxx-PO132<br></span><span style="font-size: 12px;">1800 x 1685 x 750<br></span><span style="font-size: 12px;">All parts made of Marine Ply<br></span><span style="font-size: 12px;">Top w/ Corian dd<br></span><span style="font-size: 12px;">CO, CS, VIP Day Cabin</span></p>'
+		)).insert()
+
+		self.assertEquals(item.description, '<p>Drawing No. 07-xxx-PO132<br>1800 x 1685 x 750<br>All parts made of Marine Ply<br>Top w/ Corian dd<br>CO, CS, VIP Day Cabin</p>')
+
+		item.delete()
diff --git a/erpnext/stock/doctype/warehouse/warehouse.py b/erpnext/stock/doctype/warehouse/warehouse.py
index b0335d7..5186408 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.py
+++ b/erpnext/stock/doctype/warehouse/warehouse.py
@@ -57,13 +57,15 @@
 
 	def check_if_sle_exists(self):
 		return frappe.db.sql("""select name from `tabStock Ledger Entry`
-			where warehouse = %s""", self.name)
+			where warehouse = %s limit 1""", self.name)
 
 	def check_if_child_exists(self):
 		return frappe.db.sql("""select name from `tabWarehouse`
-			where parent_warehouse = %s""", self.name)
+			where parent_warehouse = %s limit 1""", self.name)
 
 	def before_rename(self, old_name, new_name, merge=False):
+		super(Warehouse, self).before_rename(old_name, new_name, merge)
+
 		# Add company abbr if not provided
 		new_warehouse = erpnext.encode_company_abbr(new_name, self.company)
 
@@ -77,19 +79,21 @@
 		return new_warehouse
 
 	def after_rename(self, old_name, new_name, merge=False):
+		super(Warehouse, self).after_rename(old_name, new_name, merge)
+
 		new_warehouse_name = self.get_new_warehouse_name_without_abbr(new_name)
 		self.db_set("warehouse_name", new_warehouse_name)
-				
+
 		if merge:
 			self.recalculate_bin_qty(new_name)
-			
+
 	def get_new_warehouse_name_without_abbr(self, name):
 		company_abbr = frappe.db.get_value("Company", self.company, "abbr")
 		parts = name.rsplit(" - ", 1)
-		
+
 		if parts[-1].lower() == company_abbr.lower():
 			name = parts[0]
-			
+
 		return name
 
 	def recalculate_bin_qty(self, new_name):
@@ -135,25 +139,19 @@
 			return 1
 
 @frappe.whitelist()
-def get_children():
+def get_children(doctype, parent=None, company=None, is_root=False):
 	from erpnext.stock.utils import get_stock_value_on
-	doctype = frappe.local.form_dict.get('doctype')
-	company = frappe.local.form_dict.get('company')
 
-	parent_field = 'parent_' + doctype.lower().replace(' ', '_')
-	parent = frappe.form_dict.get("parent") or ""
-
-	if parent == "Warehouses":
+	if is_root:
 		parent = ""
 
 	warehouses = frappe.db.sql("""select name as value,
 		is_group as expandable
-		from `tab{doctype}`
+		from `tabWarehouse`
 		where docstatus < 2
-		and ifnull(`{parent_field}`,'') = %s
+		and ifnull(`parent_warehouse`,'') = %s
 		and (`company` = %s or company is null or company = '')
-		order by name""".format(doctype=frappe.db.escape(doctype),
-		parent_field=frappe.db.escape(parent_field)), (parent, company), as_dict=1)
+		order by name""", (parent, company), as_dict=1)
 
 	# return warehouses
 	for wh in warehouses:
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index c8e0b16..0c9d0c7 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -11,6 +11,7 @@
 from frappe.model.meta import get_field_precision
 from erpnext.stock.doctype.batch.batch import get_batch_no
 
+
 @frappe.whitelist()
 def get_item_details(args):
 	"""
@@ -83,7 +84,9 @@
 
 		if out.has_batch_no and not args.get("batch_no"):
 			out.batch_no = get_batch_no(out.item_code, out.warehouse, out.qty)
-
+			actual_batch_qty = get_batch_qty(out.batch_no, out.warehouse, out.item_code)
+			if actual_batch_qty:
+				out.update(actual_batch_qty)
 
 	if args.transaction_date and item.lead_time_days:
 		out.schedule_date = out.lead_time_date = add_days(args.transaction_date,
@@ -113,6 +116,7 @@
 	set_transaction_type(args)
 	return args
 
+
 @frappe.whitelist()
 def get_item_code(barcode=None, serial_no=None):
 	if barcode:
@@ -126,6 +130,7 @@
 
 	return item_code
 
+
 def validate_item_details(args, item):
 	if not args.company:
 		throw(_("Please specify Company"))
@@ -133,14 +138,53 @@
 	from erpnext.stock.doctype.item.item import validate_end_of_life
 	validate_end_of_life(item.name, item.end_of_life, item.disabled)
 
-	if args.transaction_type=="selling" and cint(item.has_variants):
+	if args.transaction_type == "selling" and cint(item.has_variants):
 		throw(_("Item {0} is a template, please select one of its variants").format(item.name))
 
-	elif args.transaction_type=="buying" and args.doctype != "Material Request":
+	elif args.transaction_type == "buying" and args.doctype != "Material Request":
 		if args.get("is_subcontracted") == "Yes" and item.is_sub_contracted_item != 1:
 			throw(_("Item {0} must be a Sub-contracted Item").format(item.name))
 
+
 def get_basic_details(args, item):
+	"""
+	:param args: {
+			"item_code": "",
+			"warehouse": None,
+			"customer": "",
+			"conversion_rate": 1.0,
+			"selling_price_list": None,
+			"price_list_currency": None,
+			"price_list_uom_dependant": None,
+			"plc_conversion_rate": 1.0,
+			"doctype": "",
+			"name": "",
+			"supplier": None,
+			"transaction_date": None,
+			"conversion_rate": 1.0,
+			"buying_price_list": None,
+			"is_subcontracted": "Yes" / "No",
+			"ignore_pricing_rule": 0/1
+			"project": "",
+			barcode: "",
+			serial_no: "",
+			warehouse: "",
+			currency: "",
+			update_stock: "",
+			price_list: "",
+			company: "",
+			order_type: "",
+			is_pos: "",
+			ignore_pricing_rule: "",
+			project: "",
+			qty: "",
+			stock_qty: "",
+			conversion_factor: ""
+		}
+	:param item: `item_code` of Item object
+	:return: frappe._dict
+	"""
+
 	if not item:
 		item = frappe.get_doc("Item", args.get("item_code"))
 
@@ -150,15 +194,21 @@
 	from frappe.defaults import get_user_default_as_list
 	user_default_warehouse_list = get_user_default_as_list('Warehouse')
 	user_default_warehouse = user_default_warehouse_list[0] \
-		if len(user_default_warehouse_list)==1 else ""
+		if len(user_default_warehouse_list) == 1 else ""
 
 	warehouse = user_default_warehouse or item.default_warehouse or args.warehouse
 
+	material_request_type = ''
+	if args.get('doctype') == "Material Request":
+		material_request_type = frappe.db.get_value('Material Request',
+			args.get('name'), 'material_request_type')
+
 	#Set the UOM to the Default Sales UOM or Default Purchase UOM if configured in the Item Master
 	if not args.uom:
 		if args.get('doctype') in ['Quotation', 'Sales Order', 'Delivery Note', 'Sales Invoice']:
 			args.uom = item.sales_uom if item.sales_uom else item.stock_uom
-		elif args.get('doctype') in ['Purchase Order', 'Purchase Receipt', 'Purchase Invoice']:
+		elif (args.get('doctype') in ['Purchase Order', 'Purchase Receipt', 'Purchase Invoice']) or \
+			(args.get('doctype') == 'Material Request' and material_request_type == 'Purchase'):
 			args.uom = item.purchase_uom if item.purchase_uom else item.stock_uom
 		else:
 			args.uom = item.stock_uom
@@ -193,7 +243,9 @@
 		"supplier": item.default_supplier,
 		"update_stock": args.get("update_stock") if args.get('doctype') in ['Sales Invoice', 'Purchase Invoice'] else 0,
 		"delivered_by_supplier": item.delivered_by_supplier if args.get("doctype") in ["Sales Order", "Sales Invoice"] else 0,
-		"is_fixed_asset": item.is_fixed_asset
+		"is_fixed_asset": item.is_fixed_asset,
+		"weight_per_unit":item.weight_per_unit,
+		"weight_uom":item.weight_uom,
 	})
 
 	# calculate conversion factor
@@ -201,7 +253,7 @@
 		out.conversion_factor = 1.0
 	else:
 		out.conversion_factor = args.conversion_factor or \
-			get_conversion_factor(item.item_code, args.uom).get("conversion_factor")  or 1.0
+			get_conversion_factor(item.item_code, args.uom).get("conversion_factor") or 1.0
 
 	args.conversion_factor = out.conversion_factor
 	out.stock_qty = out.qty * out.conversion_factor
@@ -221,6 +273,7 @@
 
 	return out
 
+
 def get_default_income_account(args, item):
 	return (item.income_account
 		or args.income_account
@@ -259,8 +312,8 @@
 
 		out.price_list_rate = flt(price_list_rate) * flt(args.plc_conversion_rate) \
 			/ flt(args.conversion_rate)
-
-		out.price_list_rate = flt(out.price_list_rate * (args.conversion_factor or 1.0))
+		if not args.price_list_uom_dependant:
+			out.price_list_rate = flt(out.price_list_rate * (args.conversion_factor or 1.0))
 
 		if not out.price_list_rate and args.transaction_type=="buying":
 			from erpnext.stock.doctype.item.item import get_last_purchase_details
@@ -347,7 +400,7 @@
 	res = frappe._dict()
 
 	if not pos_profile:
-		pos_profile = get_pos_profile(company)
+		pos_profile = get_pos_profile(company, args.get('pos_profile'))
 
 	if pos_profile:
 		for fieldname in ("income_account", "cost_center", "warehouse", "expense_account"):
@@ -361,17 +414,32 @@
 	return res
 
 @frappe.whitelist()
-def get_pos_profile(company):
-	pos_profile = frappe.db.sql("""select * from `tabPOS Profile` where user = %s
-		and company = %s and ifnull(disabled,0) != 1""", (frappe.session['user'], company), as_dict=1)
+def get_pos_profile(company, pos_profile=None, user=None):
+	if pos_profile:
+		return frappe.get_doc('POS Profile', pos_profile)
+
+	if not user:
+		user = frappe.session['user']
+
+	pos_profile = frappe.db.sql("""select pf.*
+		from
+			`tabPOS Profile` pf, `tabPOS Profile User` pfu
+		where
+			pfu.parent = pf.name and pfu.user = %s and pf.company = %s
+			and pf.disabled = 0 and pfu.default=1""", (user, company), as_dict=1)
 
 	if not pos_profile:
-		pos_profile = frappe.db.sql("""select * from `tabPOS Profile`
-			where ifnull(user,'') = '' and company = %s and ifnull(disabled,0) != 1""", company, as_dict=1)
+		pos_profile = frappe.db.sql("""select pf.*
+			from
+				`tabPOS Profile` pf left join `tabPOS Profile User` pfu
+			on
+				pf.name = pfu.parent
+			where
+				ifnull(pfu.user, '') = '' and pf.company = %s
+				and pf.disabled = 0""", (company), as_dict=1)
 
 	return pos_profile and pos_profile[0] or None
 
-
 def get_serial_nos_by_fifo(args):
 	if frappe.db.get_single_value("Stock Settings", "automatically_set_serial_nos_based_on_fifo"):
 		return "\n".join(frappe.db.sql_list("""select name from `tabSerial No`
@@ -437,6 +505,7 @@
 			"conversion_rate": 1.0,
 			"selling_price_list": None,
 			"price_list_currency": None,
+			"price_list_uom_dependant": None,
 			"plc_conversion_rate": 1.0,
 			"doctype": "",
 			"name": "",
@@ -463,7 +532,7 @@
 			children.append(item_details)
 
 	if as_doc:
-		args.price_list_currency = parent.price_list_currency
+		args.price_list_currency = parent.price_list_currency,
 		args.plc_conversion_rate = parent.plc_conversion_rate
 		if args.get('items'):
 			for i, item in enumerate(args.get('items')):
@@ -498,11 +567,23 @@
 
 		return result.currency
 
+def get_price_list_uom_dependant(price_list):
+	if price_list:
+		result = frappe.db.get_value("Price List", {"name": price_list,
+			"enabled": 1}, ["name", "price_not_uom_dependant"], as_dict=True)
+
+		if not result:
+			throw(_("Price List {0} is disabled or does not exist").format(price_list))
+
+		return result.price_not_uom_dependant
+
+
 def get_price_list_currency_and_exchange_rate(args):
 	if not args.price_list:
 		return {}
 
 	price_list_currency = get_price_list_currency(args.price_list)
+	price_list_uom_dependant = get_price_list_uom_dependant(args.price_list)
 	plc_conversion_rate = args.plc_conversion_rate
 
 	if (not plc_conversion_rate) or (price_list_currency and args.price_list_currency \
@@ -513,6 +594,7 @@
 
 	return frappe._dict({
 		"price_list_currency": price_list_currency,
+		"price_list_uom_dependant": price_list_uom_dependant,
 		"plc_conversion_rate": plc_conversion_rate
 	})
 
diff --git a/erpnext/stock/reorder_item.py b/erpnext/stock/reorder_item.py
index 01a6a6d..456b434 100644
--- a/erpnext/stock/reorder_item.py
+++ b/erpnext/stock/reorder_item.py
@@ -90,11 +90,12 @@
 		
 		warehouse_doc = frappe.get_doc("Warehouse", warehouse)
 		
-		if warehouse_doc.parent_warehouse:
+		while warehouse_doc.parent_warehouse:
 			if not item_warehouse_projected_qty.get(item_code, {}).get(warehouse_doc.parent_warehouse):
 				item_warehouse_projected_qty.setdefault(item_code, {})[warehouse_doc.parent_warehouse] = flt(projected_qty)
 			else:
 				item_warehouse_projected_qty[item_code][warehouse_doc.parent_warehouse] += flt(projected_qty)
+			warehouse_doc = frappe.get_doc("Warehouse", warehouse_doc.parent_warehouse)
 				
 	return item_warehouse_projected_qty
 
@@ -127,19 +128,31 @@
 				for d in items:
 					d = frappe._dict(d)
 					item = frappe.get_doc("Item", d.item_code)
+					uom = item.stock_uom
+					conversion_factor = 1.0
+
+					if request_type == 'Purchase':
+						uom = item.purchase_uom or item.stock_uom
+						if uom != item.stock_uom:
+							conversion_factor = frappe.db.get_value("UOM Conversion Detail", 
+								{'parent': item.name, 'uom': uom}, 'conversion_factor') or 1.0
+
 					mr.append("items", {
 						"doctype": "Material Request Item",
 						"item_code": d.item_code,
 						"schedule_date": add_days(nowdate(),cint(item.lead_time_days)),
-						"uom":	item.stock_uom,
+						"qty": d.reorder_qty / conversion_factor,
+						"uom": uom,
+						"stock_uom": item.stock_uom,
 						"warehouse": d.warehouse,
 						"item_name": item.item_name,
 						"description": item.description,
 						"item_group": item.item_group,
-						"qty": d.reorder_qty,
 						"brand": item.brand,
 					})
 
+				schedule_dates = [d.schedule_date for d in mr.items]
+				mr.schedule_date = max(schedule_dates or [nowdate()])
 				mr.insert()
 				mr.submit()
 				mr_list.append(mr)
diff --git a/erpnext/schools/__init__.py b/erpnext/stock/report/item_price_stock/__init__.py
similarity index 100%
copy from erpnext/schools/__init__.py
copy to erpnext/stock/report/item_price_stock/__init__.py
diff --git a/erpnext/stock/report/item_price_stock/item_price_stock.js b/erpnext/stock/report/item_price_stock/item_price_stock.js
new file mode 100644
index 0000000..0bbc61b
--- /dev/null
+++ b/erpnext/stock/report/item_price_stock/item_price_stock.js
@@ -0,0 +1,14 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["Item Price Stock"] = {
+	"filters": [
+		{
+			"fieldname":"item_code",
+			"label": __("Item"),
+			"fieldtype": "Link",
+			"options": "Item"
+		}
+	]
+}
\ No newline at end of file
diff --git a/erpnext/stock/report/item_price_stock/item_price_stock.json b/erpnext/stock/report/item_price_stock/item_price_stock.json
new file mode 100644
index 0000000..3b2152f
--- /dev/null
+++ b/erpnext/stock/report/item_price_stock/item_price_stock.json
@@ -0,0 +1,44 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2017-12-06 17:01:48.727970", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "modified": "2017-12-06 17:01:48.727970", 
+ "modified_by": "Administrator", 
+ "module": "Stock", 
+ "name": "Item Price Stock", 
+ "owner": "Administrator", 
+ "ref_doctype": "Item", 
+ "report_name": "Item Price Stock", 
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Item Manager"
+  }, 
+  {
+   "role": "Stock Manager"
+  }, 
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Purchase User"
+  }, 
+  {
+   "role": "Maintenance User"
+  }, 
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Manufacturing User"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/stock/report/item_price_stock/item_price_stock.py b/erpnext/stock/report/item_price_stock/item_price_stock.py
new file mode 100644
index 0000000..95cf3db
--- /dev/null
+++ b/erpnext/stock/report/item_price_stock/item_price_stock.py
@@ -0,0 +1,95 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+
+def execute(filters=None):
+	columns, data = [], []
+	columns=get_columns()
+	data=get_data(filters,columns)
+	return columns, data
+
+def get_columns():
+	return [
+		_("Item Name") + ":Link/Item:150",
+		_("Warehouse") + ":Link/Warehouse:130",
+		_("Stock Available") + ":Float:120",
+		_("Buying Price List") + ":Data:130",
+		_("Buying Rate") + ":Currency:110",
+		_("Selling Price List") + ":Data:130",
+		_("Selling Rate") + ":Currency:110"
+	]
+
+def get_data(filters, columns):
+	item_price_qty_data = []
+	item_price_qty_data = get_item_price_qty_data(filters)
+	return item_price_qty_data
+
+def get_item_price_qty_data(filters):
+	item_dicts = []
+	conditions = ""
+	if filters.get("item_code"):
+		conditions += "where a.item_code=%(item_code)s"
+
+	item_results = frappe.db.sql("""select a.item_code as name,a.name as price_list_name,
+		b.warehouse as warehouse,b.actual_qty as actual_qty
+		from `tabItem Price` a left join `tabBin` b
+		ON a.item_code = b.item_code
+		{conditions}"""
+		.format(conditions=conditions),filters,as_dict=1)
+
+	price_list_names = ",".join(['"' + item['price_list_name'] + '"' for item in item_results])
+
+	buying_price_map = get_buying_price_map(price_list_names)
+	selling_price_map = get_selling_price_map(price_list_names)
+
+	item_dicts = [{"Item Name": d['name'],"Item Price List": d['price_list_name'],"Warehouse": d['warehouse'],
+				"Stock Available": d['actual_qty']} for d in item_results]
+	for item_dict in item_dicts:
+		price_list = item_dict["Item Price List"]
+		item_dict["Warehouse"] = item_dict["Warehouse"] or ""
+		item_dict["Stock Available"] = item_dict["Stock Available"] or 0
+		if buying_price_map.get(price_list):
+			item_dict["Buying Price List"] = buying_price_map.get(price_list)["Buying Price List"] or ""
+			item_dict["Buying Rate"] = buying_price_map.get(price_list)["Buying Rate"] or 0
+		if selling_price_map.get(price_list):
+			item_dict["Selling Price List"] = selling_price_map.get(price_list)["Selling Price List"] or ""
+			item_dict["Selling Rate"] = selling_price_map.get(price_list)["Selling Rate"] or 0
+	return item_dicts
+
+def get_buying_price_map(price_list_names):
+	buying_price = frappe.db.sql("""
+		select
+			name,price_list,price_list_rate
+		from
+			`tabItem Price`
+		where
+			name in ({price_list_names}) and buying=1
+		""".format(price_list_names=price_list_names),as_dict=1)
+	buying_price_map = {}
+	for d in buying_price:
+		name = d["name"]
+		buying_price_map[name] = {
+			"Buying Price List" :d["price_list"],
+			"Buying Rate" :d["price_list_rate"]
+		}
+	return buying_price_map
+
+def get_selling_price_map(price_list_names):
+	selling_price = frappe.db.sql("""
+		select
+			name,price_list,price_list_rate
+		from
+			`tabItem Price`
+		where
+			name in ({price_list_names}) and selling=1
+		""".format(price_list_names=price_list_names),as_dict=1)
+	selling_price_map = {}
+	for d in selling_price:
+		name = d["name"]
+		selling_price_map[name] = {
+			"Selling Price List" :d["price_list"],
+			"Selling Rate" :d["price_list_rate"]
+		}
+	return selling_price_map
\ No newline at end of file
diff --git a/erpnext/schools/__init__.py b/erpnext/stock/report/item_variant_details/__init__.py
similarity index 100%
copy from erpnext/schools/__init__.py
copy to erpnext/stock/report/item_variant_details/__init__.py
diff --git a/erpnext/stock/report/item_variant_details/item_variant_details.js b/erpnext/stock/report/item_variant_details/item_variant_details.js
new file mode 100644
index 0000000..78eab40
--- /dev/null
+++ b/erpnext/stock/report/item_variant_details/item_variant_details.js
@@ -0,0 +1,21 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["Item Variant Details"] = {
+	"filters": [
+		{
+			reqd: 1,
+			default: "",
+			options: "Item",
+			label: __("Item"),
+			fieldname: "item",
+			fieldtype: "Link",
+			get_query: () => {
+				return {
+					filters: { "has_variants": 1 }
+				}
+			}
+		}
+	]
+}
diff --git a/erpnext/stock/report/item_variant_details/item_variant_details.json b/erpnext/stock/report/item_variant_details/item_variant_details.json
new file mode 100644
index 0000000..1d27903
--- /dev/null
+++ b/erpnext/stock/report/item_variant_details/item_variant_details.json
@@ -0,0 +1,44 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2017-11-16 06:05:36.132547", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "modified": "2017-11-16 06:24:10.818276", 
+ "modified_by": "Administrator", 
+ "module": "Stock", 
+ "name": "Item Variant Details", 
+ "owner": "Administrator", 
+ "ref_doctype": "Item", 
+ "report_name": "Item Variant Details", 
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Maintenance User"
+  }, 
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Stock Manager"
+  }, 
+  {
+   "role": "Purchase User"
+  }, 
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Manufacturing User"
+  }, 
+  {
+   "role": "Item Manager"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/stock/report/item_variant_details/item_variant_details.py b/erpnext/stock/report/item_variant_details/item_variant_details.py
new file mode 100644
index 0000000..67b6b5f
--- /dev/null
+++ b/erpnext/stock/report/item_variant_details/item_variant_details.py
@@ -0,0 +1,180 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+
+def execute(filters=None):
+	columns = get_columns(filters.item)
+	data = get_data(filters.item)
+	return columns, data
+
+def get_data(item):
+	if not item:
+		return []
+	item_dicts = []
+
+	variant_results = frappe.db.sql("""select name from `tabItem`
+		where variant_of = %s""", item, as_dict=1)
+	variants = ",".join(['"' + variant['name'] + '"' for variant in variant_results])
+
+	order_count_map = get_open_sales_orders_map(variants)
+	stock_details_map = get_stock_details_map(variants)
+	buying_price_map = get_buying_price_map(variants)
+	selling_price_map = get_selling_price_map(variants)
+	attr_val_map = get_attribute_values_map(variants)
+
+	attribute_list = [d[0] for d in frappe.db.sql("""select attribute
+		from `tabItem Variant Attribute`
+		where parent in ({variants}) group by attribute""".format(variants=variants))]
+
+	# Prepare dicts
+	variant_dicts = [{"variant_name": d['name']} for d in variant_results]
+	for item_dict in variant_dicts:
+		name = item_dict["variant_name"]
+
+		for d in attribute_list:
+			item_dict[d] = attr_val_map[name][d]
+
+		item_dict["Open Orders"] = order_count_map.get(name) or 0
+
+		if stock_details_map.get(name):
+			item_dict["Inventory"] = stock_details_map.get(name)["Inventory"] or 0
+			item_dict["In Production"] = stock_details_map.get(name)["In Production"] or 0
+			item_dict["Available Selling"] = stock_details_map.get(name)["Available Selling"] or 0
+		else:
+			item_dict["Inventory"] = item_dict["In Production"] = item_dict["Available Selling"] = 0
+
+		item_dict["Avg. Buying Price List Rate"] = buying_price_map.get(name) or 0
+		item_dict["Avg. Selling Price List Rate"] = selling_price_map.get(name) or 0
+
+		item_dicts.append(item_dict)
+
+	return item_dicts
+
+def get_columns(item):
+	columns = [{
+		"fieldname": "variant_name",
+		"label": "Variant",
+		"fieldtype": "Link",
+		"options": "Item",
+		"width": 200
+	}]
+
+	item_doc = frappe.get_doc("Item", item)
+
+	for d in item_doc.attributes:
+		columns.append(d.attribute + ":Data:100")
+
+	columns += [_("Avg. Buying Price List Rate") + ":Currency:110", _("Avg. Selling Price List Rate") + ":Currency:110",
+		_("Inventory") + ":Float:100", _("In Production") + ":Float:100",
+		_("Open Orders") + ":Float:100", _("Available Selling") + ":Float:100"
+	]
+
+	return columns
+
+def get_open_sales_orders_map(variants):
+	open_sales_orders = frappe.db.sql("""
+		select
+			count(*) as count,
+			item_code
+		from
+			`tabSales Order Item`
+		where
+			docstatus = 1 and
+			qty > ifnull(delivered_qty, 0) and
+			item_code in ({variants})
+		group by
+			item_code
+	""".format(variants=variants), as_dict=1)
+
+	order_count_map = {}
+	for d in open_sales_orders:
+		order_count_map[d["item_code"]] = d["count"]
+
+	return order_count_map
+
+def get_stock_details_map(variants):
+	stock_details = frappe.db.sql("""
+		select
+			sum(planned_qty) as planned_qty,
+			sum(actual_qty) as actual_qty,
+			sum(projected_qty) as projected_qty,
+			item_code
+		from
+			`tabBin`
+		where
+			item_code in ({variants})
+		group by
+			item_code
+	""".format(variants=variants), as_dict=1)
+
+	stock_details_map = {}
+	for d in stock_details:
+		name = d["item_code"]
+		stock_details_map[name] = {
+			"Inventory" :d["actual_qty"],
+			"In Production" :d["planned_qty"],
+			"Available Selling" :d["projected_qty"]
+		}
+
+	return stock_details_map
+
+def get_buying_price_map(variants):
+	buying = frappe.db.sql("""
+		select
+			avg(price_list_rate) as avg_rate,
+			item_code
+		from
+			`tabItem Price`
+		where
+			item_code in ({variants}) and buying=1
+		group by
+			item_code
+		""".format(variants=variants), as_dict=1)
+
+	buying_price_map = {}
+	for d in buying:
+		buying_price_map[d["item_code"]] = d["avg_rate"]
+
+	return buying_price_map
+
+def get_selling_price_map(variants):
+	selling = frappe.db.sql("""
+		select
+			avg(price_list_rate) as avg_rate,
+			item_code
+		from
+			`tabItem Price`
+		where
+			item_code in ({variants}) and selling=1
+		group by
+			item_code
+		""".format(variants=variants), as_dict=1)
+
+	selling_price_map = {}
+	for d in selling:
+		selling_price_map[d["item_code"]] = d["avg_rate"]
+
+	return selling_price_map
+
+def get_attribute_values_map(variants):
+	list_attr = frappe.db.sql("""
+		select
+			attribute, attribute_value, parent
+		from
+			`tabItem Variant Attribute`
+		where
+			parent in ({variants})
+		""".format(variants=variants), as_dict=1)
+
+	attr_val_map = {}
+	for d in list_attr:
+		name = d["parent"]
+		if not attr_val_map.get(name):
+			attr_val_map[name] = {}
+
+		attr_val_map[name][d["attribute"]] = d["attribute_value"]
+
+	return attr_val_map
diff --git a/erpnext/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.json b/erpnext/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.json
index ed48a0f..58b1be4 100644
--- a/erpnext/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.json
+++ b/erpnext/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.json
@@ -1,5 +1,5 @@
 {
- "add_total_row": 0, 
+ "add_total_row": 1, 
  "apply_user_permissions": 1, 
  "creation": "2013-02-22 18:01:55", 
  "disabled": 0, 
@@ -7,7 +7,7 @@
  "doctype": "Report", 
  "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2017-09-18 12:28:49.322622", 
+ "modified": "2017-11-06 13:05:38.965229", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Ordered Items To Be Delivered", 
diff --git a/erpnext/stock/report/stock_balance/stock_balance.js b/erpnext/stock/report/stock_balance/stock_balance.js
index 90f4de0..4aa240d 100644
--- a/erpnext/stock/report/stock_balance/stock_balance.js
+++ b/erpnext/stock/report/stock_balance/stock_balance.js
@@ -40,5 +40,10 @@
 			"width": "80",
 			"options": "Warehouse"
 		},
+		{
+			"fieldname": "show_variant_attributes",
+			"label": __("Show Variant Attributes"),
+			"fieldtype": "Check"
+		},
 	]
 }
diff --git a/erpnext/stock/report/stock_balance/stock_balance.py b/erpnext/stock/report/stock_balance/stock_balance.py
index c3e3cc5..2948119 100644
--- a/erpnext/stock/report/stock_balance/stock_balance.py
+++ b/erpnext/stock/report/stock_balance/stock_balance.py
@@ -15,6 +15,7 @@
 	item_map = get_item_details(filters)
 	item_reorder_detail_map = get_item_reorder_details(filters)
 	iwb_map = get_item_warehouse_map(filters)
+	
 
 	data = []
 	for (company, item, warehouse) in sorted(iwb_map):
@@ -24,8 +25,8 @@
 		if item + warehouse in item_reorder_detail_map:
 			item_reorder_level = item_reorder_detail_map[item + warehouse]["warehouse_reorder_level"]
 			item_reorder_qty = item_reorder_detail_map[item + warehouse]["warehouse_reorder_qty"]
-			
-		data.append([item, item_map[item]["item_name"],
+
+		report_data = [item, item_map[item]["item_name"],
 			item_map[item]["item_group"],
 			item_map[item]["brand"],
 			item_map[item]["description"], warehouse,
@@ -37,7 +38,16 @@
 			item_reorder_level,
 			item_reorder_qty,
 			company
-		])
+		]
+
+		if filters.get('show_variant_attributes', 0) == 1:
+			variants_attributes = get_variants_attributes()
+			report_data += [item_map[item].get(i) for i in variants_attributes]
+
+		data.append(report_data)
+
+	if filters.get('show_variant_attributes', 0) == 1:
+		columns += ["{}:Data:100".format(i) for i in get_variants_attributes()]
 
 	return columns, data
 
@@ -188,10 +198,19 @@
 		condition = "where item_code=%s"
 		value = (filters.get("item_code"),)
 
-	items = frappe.db.sql("""select name, item_name, stock_uom, item_group, brand, description
-		from tabItem {condition}""".format(condition=condition), value, as_dict=1)
+	items = frappe.db.sql("""
+		select name, item_name, stock_uom, item_group, brand, description
+		from tabItem
+		{condition}
+	""".format(condition=condition), value, as_dict=1)
 
-	return dict((d.name , d) for d in items)
+	item_details = dict((d.name , d) for d in items)
+
+	if filters.get('show_variant_attributes', 0) == 1:
+		variant_values = get_variant_values_for(item_details.keys())
+		item_details = {k: v.update(variant_values.get(k, {})) for k, v in item_details.iteritems()}
+
+	return item_details
 
 def get_item_reorder_details(filters):
 	condition = ''
@@ -200,8 +219,11 @@
 		condition = "where parent=%s"
 		value = (filters.get("item_code"),)
 
-	item_reorder_details = frappe.db.sql("""select parent,warehouse,warehouse_reorder_qty,warehouse_reorder_level
-		from `tabItem Reorder` {condition}""".format(condition=condition), value, as_dict=1)
+	item_reorder_details = frappe.db.sql("""
+		select parent, warehouse, warehouse_reorder_qty, warehouse_reorder_level
+		from `tabItem Reorder`
+		{condition}
+	""".format(condition=condition), value, as_dict=1)
 
 	return dict((d.parent + d.warehouse, d) for d in item_reorder_details)
 
@@ -210,3 +232,20 @@
 		sle_count = flt(frappe.db.sql("""select count(name) from `tabStock Ledger Entry`""")[0][0])
 		if sle_count > 500000:
 			frappe.throw(_("Please set filter based on Item or Warehouse"))
+
+
+def get_variants_attributes():
+	'''Return all item variant attributes.'''
+	return [i.name for i in frappe.get_all('Item Attribute')]
+
+
+def get_variant_values_for(items):
+	'''Returns variant values for items.'''
+	attribute_map = {}
+	for attr in frappe.db.sql('''select parent, attribute, attribute_value
+		from `tabItem Variant Attribute` where parent in (%s)
+		''' % ", ".join(["%s"] * len(items)), tuple(items), as_dict=1):
+			attribute_map.setdefault(attr['parent'], {})
+			attribute_map[attr['parent']].update({attr['attribute']: attr['attribute_value']})
+
+	return attribute_map
\ No newline at end of file
diff --git a/erpnext/support/doctype/issue/issue.js b/erpnext/support/doctype/issue/issue.js
index 306736f..77c59f4 100644
--- a/erpnext/support/doctype/issue/issue.js
+++ b/erpnext/support/doctype/issue/issue.js
@@ -4,7 +4,7 @@
 	},
 
 	"refresh": function(frm) {
-		if(frm.doc.status==="Open") {
+		if(frm.doc.status!=="Closed") {
 			frm.add_custom_button(__("Close"), function() {
 				frm.set_value("status", "Closed");
 				frm.save();
diff --git a/erpnext/support/doctype/issue/issue.json b/erpnext/support/doctype/issue/issue.json
index 529ae89..137b088 100644
--- a/erpnext/support/doctype/issue/issue.json
+++ b/erpnext/support/doctype/issue/issue.json
@@ -105,11 +105,11 @@
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
-   "bold": 1, 
+   "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "mins_to_first_response", 
-   "fieldtype": "Float", 
+   "fieldname": "issue_type", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -117,14 +117,15 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Mins to First Response", 
+   "label": "Issue Type", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "Issue Type", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 1, 
+   "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -324,10 +325,10 @@
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
-   "collapsible": 0, 
+   "collapsible": 1, 
    "columns": 0, 
-   "fieldname": "column_break_9", 
-   "fieldtype": "Column Break", 
+   "fieldname": "response", 
+   "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -335,6 +336,7 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
+   "label": "Response", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -352,12 +354,11 @@
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "columns": 0, 
-   "depends_on": "eval:!doc.__islocal", 
-   "fieldname": "resolution_date", 
-   "fieldtype": "Datetime", 
+   "fieldname": "mins_to_first_response", 
+   "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -365,12 +366,11 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Resolution Date", 
+   "label": "Mins to First Response", 
    "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "resolution_date", 
-   "oldfieldtype": "Date", 
+   "no_copy": 0, 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
@@ -425,7 +425,7 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Contact", 
+   "label": "Reference", 
    "length": 0, 
    "no_copy": 0, 
    "options": "fa fa-pushpin", 
@@ -595,6 +595,36 @@
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
    "collapsible": 1, 
    "columns": 0, 
    "fieldname": "section_break_19", 
@@ -629,7 +659,7 @@
    "columns": 0, 
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "resolution_details", 
-   "fieldtype": "Text Editor", 
+   "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -752,8 +782,9 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "resolution_date", 
+   "fieldtype": "Datetime", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -761,14 +792,15 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Company", 
+   "label": "Resolution Date", 
    "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
+   "no_copy": 1, 
+   "oldfieldname": "resolution_date", 
+   "oldfieldtype": "Date", 
    "permlevel": 0, 
-   "print_hide": 1, 
+   "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -847,7 +879,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-06-13 14:29:19.581715", 
+ "modified": "2017-11-15 17:15:40.347362", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Issue", 
diff --git a/erpnext/support/doctype/issue/test_issue.js b/erpnext/support/doctype/issue/test_issue.js
new file mode 100644
index 0000000..c532ea4
--- /dev/null
+++ b/erpnext/support/doctype/issue/test_issue.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Issue", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Issue
+		() => frappe.tests.make('Issue', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/schools/doctype/__init__.py b/erpnext/support/doctype/issue_type/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/__init__.py
copy to erpnext/support/doctype/issue_type/__init__.py
diff --git a/erpnext/support/doctype/issue_type/issue_type.js b/erpnext/support/doctype/issue_type/issue_type.js
new file mode 100644
index 0000000..2b3d14e
--- /dev/null
+++ b/erpnext/support/doctype/issue_type/issue_type.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Issue Type', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/support/doctype/issue_type/issue_type.json b/erpnext/support/doctype/issue_type/issue_type.json
new file mode 100644
index 0000000..ee7add8
--- /dev/null
+++ b/erpnext/support/doctype/issue_type/issue_type.json
@@ -0,0 +1,115 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "Prompt", 
+ "beta": 0, 
+ "creation": "2017-10-06 12:53:34.714153", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-11-15 17:27:19.796807", 
+ "modified_by": "Administrator", 
+ "module": "Support", 
+ "name": "Issue Type", 
+ "name_case": "Title Case", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Support Team", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "search_fields": "", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/support/doctype/issue_type/issue_type.py b/erpnext/support/doctype/issue_type/issue_type.py
new file mode 100644
index 0000000..f95d09c
--- /dev/null
+++ b/erpnext/support/doctype/issue_type/issue_type.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class IssueType(Document):
+	pass
diff --git a/erpnext/support/doctype/issue_type/test_issue_type.js b/erpnext/support/doctype/issue_type/test_issue_type.js
new file mode 100644
index 0000000..9ef737b
--- /dev/null
+++ b/erpnext/support/doctype/issue_type/test_issue_type.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Issue Type", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Issue Type
+		() => frappe.tests.make('Issue Type', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/support/doctype/issue_type/test_issue_type.py b/erpnext/support/doctype/issue_type/test_issue_type.py
new file mode 100644
index 0000000..4e3b66a
--- /dev/null
+++ b/erpnext/support/doctype/issue_type/test_issue_type.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestIssueType(unittest.TestCase):
+	pass
diff --git a/erpnext/templates/includes/products_as_grid.html b/erpnext/templates/includes/products_as_grid.html
index 7a15c1f..b2437d3 100644
--- a/erpnext/templates/includes/products_as_grid.html
+++ b/erpnext/templates/includes/products_as_grid.html
@@ -3,8 +3,13 @@
 <a class="product-link" href="{{ route|abs_url }}">
 	<div class="col-sm-4 col-xs-4 product-image-wrapper">
 		<div class="product-image-img">
-		{{ product_image_square(thumbnail or website_image) }}
-		<div class="product-text" itemprop="name">{{ item_name }}</div>
+			{{ product_image_square(thumbnail or website_image) }}
+			<div class="product-text" itemprop="name">{{ item_name }}</div>
+			{% if in_stock %}
+				<div style='color: green'> <i class='fa fa-check'></i> {{ _("In stock") }}</div>
+			{% else %}
+				<div style='color: red'> <i class='fa fa-close'></i> {{ _("Not in stock") }}</div>
+			{% endif %}
 		</div>
 	</div>
 </a>
diff --git a/erpnext/accounts/doctype/asset/__init__.py b/erpnext/templates/pages/non_profit/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/asset/__init__.py
copy to erpnext/templates/pages/non_profit/__init__.py
diff --git a/erpnext/templates/pages/non_profit/join-chapter.html b/erpnext/templates/pages/non_profit/join-chapter.html
new file mode 100644
index 0000000..284e9c4
--- /dev/null
+++ b/erpnext/templates/pages/non_profit/join-chapter.html
@@ -0,0 +1,59 @@
+{% extends "templates/web.html" %}
+
+{% block page_content %}
+
+{% macro chapter_button() %}
+	<p><a href="/{{ chapter.route }}" class='btn btn-primary'>
+		Go to Chapter Page</a></p>
+{% endmacro %}
+{% if frappe.session.user=='Guest' %}
+	<p>Please signup and login to join this chapter</p>
+	<p><a href="/login?redirect-to=/{{ chapter.route }}" class='btn btn-primary'>Login</a></p>
+{% else %}
+	{% if already_member %}
+		<p>You are already a member of {{ chapter.title }}!</p>
+		{{ chapter_button() }}
+		<p><a href="">Leave Chapter</a></p>
+	{% else %}
+		{% if frappe.local.request.method=='POST' %}
+			<p>Welcome to chapter {{ chapter.title }}!</p>
+			{{ chapter_button() }}
+		{% else %}
+			<div style="padding: 20px 0;">
+				<div class="row">
+					<div class="col-lg-8 col-md-8">
+						<form name="user-intro" action="/join-chapter" method='POST'>
+							<div class="form-group">
+								<input name="name" class="hidden form-control" type="text"
+									value="{{chapter.name}}">
+								<input name="csrf_token" class="hidden  form-control" type="text"
+									value="{{frappe.session.csrf_token}}">
+							</div>
+							<div class="form-group">
+								<label for="user" class="">User Name</label>
+								<input name="user" class="form-control" type="text" value="{{ frappe.session.user }}">
+							</div>
+							<div class="form-group">
+								<label for="website_url" class="">Website URL</label>
+								<input name="website_url" required class="form-control" type="text"
+									placeholder="https://example.com" />
+							</div>
+							<div class="form-group">
+								<label for="introduction" class="">Introduction</label>
+								<textarea name="introduction" required class="form-control"
+									placeholder="Your profession and how you are associated with ERPNext"></textarea>
+							</div>
+							<div class="form-group">
+								<button type="Submit" id="update_member" class="btn btn-primary">
+									Submit</button>
+							</div>
+						</form>
+					</div>
+				</div>
+			</div>
+		{% endif %}
+	{% endif %}
+
+{% endif %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/erpnext/templates/pages/non_profit/join_chapter.js b/erpnext/templates/pages/non_profit/join_chapter.js
new file mode 100644
index 0000000..e2bc8bc
--- /dev/null
+++ b/erpnext/templates/pages/non_profit/join_chapter.js
@@ -0,0 +1,12 @@
+// Copyright (c) 2017, EOSSF and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Chapter Member', {
+	onsubmit: function (frm) {
+		console.log("here" + frappe.session.user)
+		// body...
+	}
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/templates/pages/non_profit/join_chapter.py b/erpnext/templates/pages/non_profit/join_chapter.py
new file mode 100644
index 0000000..78ef053
--- /dev/null
+++ b/erpnext/templates/pages/non_profit/join_chapter.py
@@ -0,0 +1,22 @@
+import frappe
+
+def get_context(context):
+	context.no_cache = True
+	chapter = frappe.get_doc('Chapter', frappe.form_dict.name)
+	if frappe.session.user!='Guest':
+		if frappe.session.user in [d.user for d in chapter.members]:
+			context.already_member = True
+		else:
+			if frappe.request.method=='GET':
+				pass
+			elif frappe.request.method=='POST':
+				chapter.append('members', dict(
+					user=frappe.session.user,
+					introduction=frappe.form_dict.introduction,
+					website_url=frappe.form_dict.website_url,
+					enabled=1
+				))
+				chapter.save(ignore_permissions=1)
+				frappe.db.commit()
+
+	context.chapter = chapter
diff --git a/erpnext/templates/pages/non_profit/leave-chapter.html b/erpnext/templates/pages/non_profit/leave-chapter.html
new file mode 100644
index 0000000..2f8452d
--- /dev/null
+++ b/erpnext/templates/pages/non_profit/leave-chapter.html
@@ -0,0 +1,16 @@
+{% extends "templates/web.html" %}
+<!-- 
+{% macro chapter_button() %}
+	<p><a href="/{{ chapter.route }}" class='btn btn-primary'>
+		Go to Chapter Page</a></p>
+{% endmacro %}
+ -->
+{% block page_content %}
+
+	{% if member_deleted %}
+		<p>You are not a member of {{ chapter.title }}!</p>
+		<p>Please signup and login to join this chapter</p>
+
+		<p><a href="/join-chapter?name={{ chapter.name }}" class='btn btn-primary'>Become Member agian</a></p>
+	{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/erpnext/templates/pages/non_profit/leave_chapter.py b/erpnext/templates/pages/non_profit/leave_chapter.py
new file mode 100644
index 0000000..6dbdeca
--- /dev/null
+++ b/erpnext/templates/pages/non_profit/leave_chapter.py
@@ -0,0 +1,15 @@
+import frappe
+
+def get_context(context):
+	context.no_cache = True
+	chapter = frappe.get_doc('Chapter', frappe.form_dict.name)
+	# if frappe.session.user!='Guest':
+	if frappe.session.user in [d.user for d in chapter.members]:
+		user = frappe.session.user
+		parent = frappe.form_dict.name
+		frappe.db.sql("""delete from `tabChapter Member` where parent = %s and user = %s """, (parent, user))
+		frappe.db.commit()
+
+	context.member_deleted = True
+
+	context.chapter = chapter
diff --git a/erpnext/templates/pages/order.html b/erpnext/templates/pages/order.html
index 8a495b1..3a6d225 100644
--- a/erpnext/templates/pages/order.html
+++ b/erpnext/templates/pages/order.html
@@ -20,7 +20,7 @@
 <div class="row transaction-subheading">
     <div class="col-xs-6">
         <span class="indicator {{ doc.indicator_color or ("blue" if doc.docstatus==1 else "darkgrey") }}">
-            {{ doc.indicator_title or doc.status or "Submitted" }}
+            {{ _(doc.indicator_title) or _(doc.status) or _("Submitted") }}
         </span>
 	</div>
     <div class="col-xs-6 text-muted text-right small">
diff --git a/erpnext/templates/pages/order.py b/erpnext/templates/pages/order.py
index 110eb57..2874047 100644
--- a/erpnext/templates/pages/order.py
+++ b/erpnext/templates/pages/order.py
@@ -24,6 +24,12 @@
 
 	context.enabled_checkout = frappe.get_doc("Shopping Cart Settings").enable_checkout
 
+	default_print_format = frappe.db.get_value('Property Setter', dict(property='default_print_format', doc_type=frappe.form_dict.doctype), "value")
+	if default_print_format:
+		context.print_format = default_print_format
+	else:
+		context.print_format = "Standard"
+
 	if not frappe.has_website_permission(context.doc):
 		frappe.throw(_("Not Permitted"), frappe.PermissionError)
 
diff --git a/erpnext/templates/pages/product_search.py b/erpnext/templates/pages/product_search.py
index 49f321d..a872f19 100644
--- a/erpnext/templates/pages/product_search.py
+++ b/erpnext/templates/pages/product_search.py
@@ -17,23 +17,25 @@
 	# limit = 12 because we show 12 items in the grid view
 
 	# base query
-	query = """select name, item_name, item_code, route, website_image, thumbnail, item_group,
-			description, web_long_description as website_description
-		from `tabItem`
-		where (show_in_website = 1 or show_variant_in_website = 1)
-			and disabled=0
-			and (end_of_life is null or end_of_life='0000-00-00' or end_of_life > %(today)s)"""
+	query = """select I.name, I.item_name, I.item_code, I.route, I.website_image, I.thumbnail, I.item_group,
+			I.description, I.web_long_description as website_description,
+			case when (S.actual_qty - S.reserved_qty) > 0 then 1 else 0 end as in_stock
+		from `tabItem` I
+		left join tabBin S on I.item_code = S.item_code and I.website_warehouse = S.warehouse
+		where (I.show_in_website = 1 or I.show_variant_in_website = 1)
+			and I.disabled = 0
+			and (I.end_of_life is null or I.end_of_life='0000-00-00' or I.end_of_life > %(today)s)"""
 
 	# search term condition
 	if search:
-		query += """ and (web_long_description like %(search)s
-				or description like %(search)s
-				or item_name like %(search)s
-				or name like %(search)s)"""
+		query += """ and (I.web_long_description like %(search)s
+				or I.description like %(search)s
+				or I.item_name like %(search)s
+				or I.name like %(search)s)"""
 		search = "%" + cstr(search) + "%"
 
 	# order by
-	query += """ order by weightage desc, idx desc, modified desc limit %s, %s""" % (cint(start), cint(limit))
+	query += """ order by I.weightage desc, in_stock desc, I.item_name limit %s, %s""" % (cint(start), cint(limit))
 
 	data = frappe.db.sql(query, {
 		"search": search,
diff --git a/erpnext/templates/utils.py b/erpnext/templates/utils.py
index 7ee3960..eb84bcc 100644
--- a/erpnext/templates/utils.py
+++ b/erpnext/templates/utils.py
@@ -9,16 +9,16 @@
 
 @frappe.whitelist(allow_guest=True)
 def send_message(subject="Website Query", message="", sender="", status="Open"):
-    from frappe.www.contact import send_message as website_send_message
-    lead = customer = None
+	from frappe.www.contact import send_message as website_send_message
+	lead = customer = None
 
-    website_send_message(subject, message, sender)
+	website_send_message(subject, message, sender)
 
-    customer = frappe.db.sql("""select distinct dl.link_name from `tabDynamic Link` dl 
-        left join `tabContact` c on dl.parent=c.name where dl.link_doctype='Customer' 
-        and c.email_id='{email_id}'""".format(email_id=sender))
+	customer = frappe.db.sql("""select distinct dl.link_name from `tabDynamic Link` dl
+		left join `tabContact` c on dl.parent=c.name where dl.link_doctype='Customer'
+		and c.email_id='{email_id}'""".format(email_id=sender))
 
-    if not customer:
+	if not customer:
 		lead = frappe.db.get_value('Lead', dict(email_id=sender))
 		if not lead:
 			new_lead = frappe.get_doc(dict(
@@ -27,33 +27,33 @@
 				lead_name = sender.split('@')[0].title()
 			)).insert(ignore_permissions=True)
 
-    opportunity = frappe.get_doc(dict(
-    	doctype ='Opportunity',
-    	enquiry_from = 'Customer' if customer else 'Lead',
-    	status = 'Open',
-    	title = subject,
-	contact_email = sender,
-    	to_discuss = message
-    ))
+	opportunity = frappe.get_doc(dict(
+		doctype ='Opportunity',
+		enquiry_from = 'Customer' if customer else 'Lead',
+		status = 'Open',
+		title = subject,
+		contact_email = sender,
+		to_discuss = message
+	))
 
-    if customer:
-        opportunity.customer = customer[0][0]
-    elif lead:
-        opportunity.lead = lead
-    else:
-        opportunity.lead = new_lead.name
+	if customer:
+		opportunity.customer = customer[0][0]
+	elif lead:
+		opportunity.lead = lead
+	else:
+		opportunity.lead = new_lead.name
 
-    opportunity.insert(ignore_permissions=True)
+	opportunity.insert(ignore_permissions=True)
 
-    comm = frappe.get_doc({
-    	"doctype":"Communication",
-    	"subject": subject,
-    	"content": message,
-    	"sender": sender,
-    	"sent_or_received": "Received",
-    	'reference_doctype': 'Opportunity',
-    	'reference_name': opportunity.name
-    })
-    comm.insert(ignore_permissions=True)
+	comm = frappe.get_doc({
+		"doctype":"Communication",
+		"subject": subject,
+		"content": message,
+		"sender": sender,
+		"sent_or_received": "Received",
+		'reference_doctype': 'Opportunity',
+		'reference_name': opportunity.name
+	})
+	comm.insert(ignore_permissions=True)
 
-    return "okay"
+	return "okay"
diff --git a/erpnext/tests/server/agriculture.txt b/erpnext/tests/server/agriculture.txt
new file mode 100644
index 0000000..3aae85a
--- /dev/null
+++ b/erpnext/tests/server/agriculture.txt
@@ -0,0 +1,5 @@
+Disease
+Crop
+Land Unit
+Crop Cycle
+Soil Texture
\ No newline at end of file
diff --git a/erpnext/tests/ui/agriculture.txt b/erpnext/tests/ui/agriculture.txt
new file mode 100644
index 0000000..4622bc0
--- /dev/null
+++ b/erpnext/tests/ui/agriculture.txt
@@ -0,0 +1,7 @@
+erpnext/agriculture/doctype/land_unit/test_land_unit.js
+erpnext/agriculture/doctype/fertilizer/test_fertilizer.js
+erpnext/agriculture/doctype/water_analysis/test_water_analysis.js
+erpnext/agriculture/doctype/disease/test_disease.js
+erpnext/agriculture/doctype/soil_texture/test_soil_texture.js
+erpnext/agriculture/doctype/crop/test_crop.js
+erpnext/agriculture/doctype/crop_cycle/test_crop_cycle.js
\ No newline at end of file
diff --git a/erpnext/tests/ui/make_fixtures.js b/erpnext/tests/ui/make_fixtures.js
index 949e92b..8c9e508 100644
--- a/erpnext/tests/ui/make_fixtures.js
+++ b/erpnext/tests/ui/make_fixtures.js
@@ -217,6 +217,25 @@
 			{price_list: '_Test Price List'},
 			{price_list_rate: 200}
 		]
+	},
+	"Payment Term": {
+		"_Test Payment Term": [
+			{payment_term_name: '_Test Payment Term'},
+			{due_date_based_on: 'Day(s) after invoice date'},
+			{invoice_portion: 100},
+			{credit_days: 0}
+		]
+	},
+	"Payment Terms Template": {
+		"_Test Payment Term Template UI": [
+			{template_name: "_Test Payment Term Template UI"},
+			{terms: [
+				[
+					{payment_term: '_Test Payment Term'},
+					{invoice_portion: 100}
+				]
+			]}
+		]
 	}
 });
 
diff --git a/erpnext/tests/ui/tests.txt b/erpnext/tests/ui/tests.txt
index e7de604..3749cb8 100644
--- a/erpnext/tests/ui/tests.txt
+++ b/erpnext/tests/ui/tests.txt
@@ -1,15 +1,13 @@
 erpnext/tests/ui/make_fixtures.js #long
-erpnext/setup/doctype/company/tests/test_company.js
-erpnext/accounts/doctype/account/test_account.js
-erpnext/accounts/doctype/account/test_make_tax_account.js
+erpnext/accounts/doctype/account/tests/test_account.js
+erpnext/accounts/doctype/account/tests/test_make_tax_account.js
+erpnext/accounts/doctype/account/tests/test_account_with_number.js
 erpnext/accounts/doctype/pricing_rule/test_pricing_rule.js
 erpnext/accounts/doctype/sales_taxes_and_charges_template/test_sales_taxes_and_charges_template.js
 erpnext/accounts/doctype/purchase_taxes_and_charges_template/test_purchase_taxes_and_charges_template.js
 erpnext/accounts/doctype/shipping_rule/test_shipping_rule.js
-erpnext/crm/doctype/lead/test_lead.js
 erpnext/crm/doctype/opportunity/test_opportunity.js
-erpnext/setup/doctype/company/tests/test_company_production.js
-erpnext/crm/doctype/item/test_item.js
+erpnext/stock/doctype/item/tests/test_item.js
 erpnext/selling/doctype/quotation/tests/test_quotation_with_discount_on_grand_total.js
 erpnext/selling/doctype/quotation/tests/test_quotation_with_item_wise_discount.js
 erpnext/selling/doctype/quotation/tests/test_quotation_with_multi_uom.js
@@ -41,17 +39,10 @@
 erpnext/hr/doctype/leave_control_panel/test_leave_control_panel.js
 erpnext/hr/doctype/leave_allocation/test_leave_allocation.js
 erpnext/hr/doctype/leave_application/test_leave_application.js
-erpnext/schools/doctype/academic_year/test_academic_year.js
-erpnext/schools/doctype/academic_term/test_academic_term.js
-erpnext/schools/doctype/school_settings/test_school_settings.js
-erpnext/schools/doctype/student_batch_name/test_student_batch_name.js
-erpnext/schools/doctype/student_category/test_student_category.js
-erpnext/schools/doctype/room/test_room.js
-erpnext/schools/doctype/instructor/test_instructor.js
 erpnext/stock/doctype/warehouse/test_warehouse.js
 erpnext/manufacturing/doctype/production_order/test_production_order.js #long
-erpnext/selling/page/point_of_sale/tests/test_point_of_sale.js
 erpnext/accounts/page/pos/test_pos.js
+erpnext/selling/page/point_of_sale/tests/test_point_of_sale.js
 erpnext/selling/doctype/product_bundle/test_product_bundle.js
 erpnext/stock/doctype/delivery_note/test_delivery_note.js
 erpnext/stock/doctype/material_request/tests/test_material_request.js
@@ -63,7 +54,6 @@
 erpnext/stock/doctype/stock_entry/tests/test_stock_entry_for_material_transfer.js
 erpnext/hr/doctype/salary_structure/test_salary_structure.js
 erpnext/hr/doctype/salary_slip/test_salary_slip.js
-erpnext/hr/doctype/process_payroll/test_process_payroll.js
 erpnext/hr/doctype/job_opening/test_job_opening.js
 erpnext/hr/doctype/job_applicant/test_job_applicant.js
 erpnext/hr/doctype/offer_letter/test_offer_letter.js
@@ -95,26 +85,6 @@
 erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_taxes_and_charges.js
 erpnext/buying/doctype/purchase_order/tests/test_purchase_order_receipt.js
 erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.js
-erpnext/schools/doctype/grading_scale/test_grading_scale.js
-erpnext/schools/doctype/assessment_criteria_group/test_assessment_criteria_group.js
-erpnext/schools/doctype/assessment_criteria/test_assessment_criteria.js
-erpnext/schools/doctype/course/test_course.js
-erpnext/schools/doctype/program/test_program.js
-erpnext/schools/doctype/guardian/test_guardian.js
-erpnext/schools/doctype/student_admission/test_student_admission.js
-erpnext/schools/doctype/student_applicant/tests/test_student_applicant_dummy_data.js
-erpnext/schools/doctype/student_applicant/tests/test_student_applicant.js
-erpnext/schools/doctype/student_applicant/tests/test_student_applicant_options.js
-erpnext/schools/doctype/student_log/test_student_log.js
-erpnext/schools/doctype/student_group/test_student_group.js
-erpnext/schools/doctype/student_group_creation_tool/test_student_group_creation_tool.js
-erpnext/schools/doctype/student_leave_application/test_student_leave_application.js
-erpnext/schools/doctype/student_attendance_tool/test_student_attendance_tool.js
-erpnext/schools/doctype/student_attendance/test_student_attendance.js
-erpnext/schools/doctype/assessment_group/test_assessment_group.js
-erpnext/schools/doctype/assessment_plan/test_assessment_plan.js
-erpnext/schools/doctype/assessment_result/test_assessment_result.js
-erpnext/schools/doctype/assessment_result_tool/test_assessment_result_tool.js
 erpnext/accounts/doctype/journal_entry/test_journal_entry.js
 erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.js
 erpnext/accounts/doctype/payment_entry/tests/test_payment_entry.js
@@ -129,7 +99,11 @@
 erpnext/accounts/doctype/sales_invoice/tests/test_sales_invoice_with_serialize_item.js
 erpnext/accounts/doctype/payment_entry/tests/test_payment_against_invoice.js
 erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_last_purchase_rate.js
-erpnext/restaurant/doctype/restaurant/test_restaurant.js
-erpnext/restaurant/doctype/restaurant_table/test_restaurant_table.js
-erpnext/restaurant/doctype/restaurant_menu/test_restaurant_menu.js
-erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js
+erpnext/projects/doctype/task/tests/test_task_tree.js
+erpnext/stock/doctype/item_price/test_item_price.js
+erpnext/stock/doctype/delivery_note/test_delivery_note_with_margin.js
+erpnext/selling/doctype/sales_order/tests/test_sales_order_with_margin.js
+erpnext/selling/doctype/quotation/tests/test_quotation_with_margin.js
+erpnext/accounts/doctype/sales_invoice/tests/test_sales_invoice_with_margin.js
+erpnext/hr/doctype/payroll_entry/test_set_salary_components.js
+erpnext/hr/doctype/payroll_entry/test_payroll_entry.js
diff --git a/erpnext/tests/ui/tests2.txt b/erpnext/tests/ui/tests2.txt
new file mode 100644
index 0000000..e410a83
--- /dev/null
+++ b/erpnext/tests/ui/tests2.txt
@@ -0,0 +1,46 @@
+erpnext/setup/doctype/company/tests/test_company.js
+erpnext/crm/doctype/lead/tests/test_lead_individual.js
+erpnext/crm/doctype/lead/tests/test_lead_organization.js
+erpnext/setup/doctype/company/tests/test_company_production.js
+erpnext/hr/doctype/leave_block_list/test_leave_block_list.js
+erpnext/hr/doctype/department/test_department.js
+erpnext/hr/doctype/designation/test_designation.js
+erpnext/education/doctype/academic_year/test_academic_year.js
+erpnext/education/doctype/academic_term/test_academic_term.js
+erpnext/education/doctype/education_settings/test_education_settings.js
+erpnext/education/doctype/student_batch_name/test_student_batch_name.js
+erpnext/education/doctype/student_category/test_student_category.js
+erpnext/education/doctype/room/test_room.js
+erpnext/education/doctype/instructor/test_instructor.js
+erpnext/education/doctype/grading_scale/test_grading_scale.js
+erpnext/education/doctype/assessment_criteria_group/test_assessment_criteria_group.js
+erpnext/education/doctype/assessment_criteria/test_assessment_criteria.js
+erpnext/education/doctype/course/test_course.js
+erpnext/education/doctype/program/test_program.js
+erpnext/education/doctype/guardian/test_guardian.js
+erpnext/education/doctype/student_admission/test_student_admission.js
+erpnext/education/doctype/student_applicant/tests/test_student_applicant_dummy_data.js
+erpnext/education/doctype/student_applicant/tests/test_student_applicant.js
+erpnext/education/doctype/student_applicant/tests/test_student_applicant_options.js
+erpnext/education/doctype/student_log/test_student_log.js
+erpnext/education/doctype/student_group/test_student_group.js
+erpnext/education/doctype/student_group_creation_tool/test_student_group_creation_tool.js
+erpnext/education/doctype/student_leave_application/test_student_leave_application.js
+erpnext/education/doctype/student_attendance_tool/test_student_attendance_tool.js
+erpnext/education/doctype/student_attendance/test_student_attendance.js
+erpnext/education/doctype/assessment_group/test_assessment_group.js
+erpnext/education/doctype/assessment_plan/test_assessment_plan.js
+erpnext/education/doctype/assessment_result/test_assessment_result.js
+erpnext/education/doctype/assessment_result_tool/test_assessment_result_tool.js
+erpnext/projects/doctype/task/tests/test_task_tree.js
+erpnext/restaurant/doctype/restaurant/test_restaurant.js
+erpnext/restaurant/doctype/restaurant_table/test_restaurant_table.js
+erpnext/restaurant/doctype/restaurant_menu/test_restaurant_menu.js
+erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js
+erpnext/non_profit/doctype/membership_type/test_membership_type.js
+erpnext/non_profit/doctype/member/test_member.js
+erpnext/non_profit/doctype/volunteer_type/test_volunteer_type.js
+erpnext/non_profit/doctype/volunteer/test_volunteer.js
+erpnext/non_profit/doctype/donor_type/test_donor_type.js
+erpnext/non_profit/doctype/donor/test_donor.js
+erpnext/non_profit/doctype/grant_application/test_grant_application.js
\ No newline at end of file
diff --git a/erpnext/translations/af.csv b/erpnext/translations/af.csv
index abc7ab0..a5f6767 100644
--- a/erpnext/translations/af.csv
+++ b/erpnext/translations/af.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Salaris af
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,registreer
 DocType: Patient,Divorced,geskei
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Items wat reeds gesinkroniseer is
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Laat item toe om verskeie kere in &#39;n transaksie te voeg
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Kanselleer Materiaal Besoek {0} voordat u hierdie Garantie-eis kanselleer
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Verbruikersprodukte
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Laat aanvaar
 DocType: Sales Partner,Dealer,handelaar
 DocType: Consultation,Investigations,ondersoeke
+DocType: Restaurant Order Entry,Click Enter To Add,Klik op Enter om by te voeg
 DocType: Employee,Rented,gehuur
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Toepasbaar vir gebruiker
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",Gestopte Produksie Orde kan nie gekanselleer word nie. Staak dit eers om te kanselleer
 DocType: Vehicle Service,Mileage,kilometers
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Wil jy hierdie bate regtig skrap?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Wil jy hierdie bate regtig skrap?
 DocType: Drug Prescription,Update Schedule,Dateer skedule op
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Kies Standaardverskaffer
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Geldeenheid word vereis vir Pryslys {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Gaan beskikbaarheid
 DocType: Job Applicant,Job Applicant,Werksaansoeker
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Dit is gebaseer op transaksies teen hierdie verskaffer. Sien die tydlyn hieronder vir besonderhede
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Geen meer resultate.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Wettig
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Werklike tipe belasting kan nie in Itemkoers in ry {0} ingesluit word nie.
 DocType: Bank Guarantee,Customer,kliënt
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Wisselkoers moet dieselfde wees as {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Kliënt naam
 DocType: Vehicle,Natural Gas,Natuurlike gas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Bankrekening kan nie as {0} genoem word nie.
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Bankrekening kan nie as {0} genoem word nie.
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Hoofde (of groepe) waarteen rekeningkundige inskrywings gemaak word en saldo&#39;s word gehandhaaf.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Uitstaande vir {0} kan nie minder as nul wees nie ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Daar is geen salarisstrokies ingedien om te verwerk nie.
 DocType: Manufacturing Settings,Default 10 mins,Verstek 10 minute
 DocType: Leave Type,Leave Type Name,Verlaat tipe naam
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Wys oop
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Dit is nodig om hierdie aksie vandag self te neem vir die bogenoemde herhalende
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Reeks suksesvol opgedateer
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Uitteken
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accurale Joernaal Inskrywing
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Bestelling Items wat ontvang moet word
 DocType: SMS Center,All Supplier Contact,Alle Verskaffer Kontak
 DocType: Support Settings,Support Settings,Ondersteuningsinstellings
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Verwagte einddatum kan nie minder wees as verwagte begin datum nie
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Verwagte einddatum kan nie minder wees as verwagte begin datum nie
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ry # {0}: Die tarief moet dieselfde wees as {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Nuwe Verlof Aansoek
 ,Batch Item Expiry Status,Batch Item Vervaldatum
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Bank Konsep
 DocType: Mode of Payment Account,Mode of Payment Account,Betaalmetode
 DocType: Consultation,Consultation,konsultasie
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Verkope en opbrengs
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Wys Varianten
 DocType: Academic Term,Academic Term,Akademiese Termyn
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,materiaal
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Gesondheidssorg
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Vertraging in betaling (Dae)
 DocType: Lab Prescription,Lab Prescription,Lab Voorskrif
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Sorteer volgens prys
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Diensuitgawes
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Serial Number: {0} is reeds in verkoopsfaktuur verwys: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,faktuur
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Serial Number: {0} is reeds in verkoopsfaktuur verwys: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,faktuur
 DocType: Maintenance Schedule Item,Periodicity,periodisiteit
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskale jaar {0} word vereis
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,verdediging
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Ry # {0}:
 DocType: Timesheet,Total Costing Amount,Totale kosteberekening
 DocType: Delivery Note,Vehicle No,Voertuignommer
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Kies asseblief Pryslys
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Kies asseblief Pryslys
 DocType: Accounts Settings,Currency Exchange Settings,Geldruilinstellings
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Ry # {0}: Betalingsdokument word benodig om die trekking te voltooi
 DocType: Production Order Operation,Work In Progress,Werk aan die gang
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Kies asseblief datum
 DocType: Employee,Holiday List,Vakansie Lys
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Stel asseblief die instrukteur se naamstelsel in Skool&gt; Skoolinstellings op
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,rekenmeester
+DocType: Hub Settings,Selling Price List,Verkooppryslys
 DocType: Patient,Tobacco Current Use,Tabak huidige gebruik
 DocType: Cost Center,Stock User,Voorraad gebruiker
 DocType: Company,Phone No,Telefoon nommer
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Kursusskedules geskep:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Nuut {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Nuut {0}: # {1}
 ,Sales Partners Commission,Verkope Vennootskommissie
 DocType: Purchase Invoice,Rounding Adjustment,Ronde aanpassing
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Afkorting kan nie meer as 5 karakters hê nie
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Ouer Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Verwysing: {0}, Item Kode: {1} en Kliënt: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,kg
-DocType: Student Log,Log,Meld
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Opening vir &#39;n werk.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Resultaat ingedien
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Resultaat ingedien
 DocType: Item Attribute,Increment,inkrement
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Tydsverloop
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Kies pakhuis ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Getroud
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Nie toegelaat vir {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Kry items van
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Voorraad kan nie opgedateer word teen afleweringsnota {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Voorraad kan nie opgedateer word teen afleweringsnota {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produk {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Geen items gelys nie
 DocType: Payment Reconciliation,Reconcile,versoen
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensioenfondse
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Volgende Depresiasie Datum kan nie voor Aankoopdatum wees nie
 DocType: Consultation,Consultation Date,Konsultasiedatum
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Produklys en ontdekking vir ERPNext-gebruikers
 DocType: SMS Center,All Sales Person,Alle Verkoopspersoon
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Maandelikse Verspreiding ** help jou om die begroting / teiken oor maande te versprei as jy seisoenaliteit in jou besigheid het.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Geen items gevind nie
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Salarisstruktuur ontbreek
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Geen items gevind nie
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Salarisstruktuur ontbreek
 DocType: Lead,Person Name,Persoon Naam
 DocType: Sales Invoice Item,Sales Invoice Item,Verkoopsfaktuur Item
 DocType: Account,Credit,krediet
 DocType: POS Profile,Write Off Cost Center,Skryf Koste Sentrum af
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",bv. &quot;Laerskool&quot; of &quot;Universiteit&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",bv. &quot;Laerskool&quot; of &quot;Universiteit&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Voorraadverslae
 DocType: Warehouse,Warehouse Detail,Warehouse Detail
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Kredietlimiet is gekruis vir kliënt {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Die Termyn Einddatum kan nie later wees as die Jaar Einde van die akademiese jaar waartoe die term gekoppel is nie (Akademiese Jaar ()). Korrigeer asseblief die datums en probeer weer.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Is Vaste Bate&quot; kan nie afgeskakel word nie, aangesien Bate-rekord teen die item bestaan"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Is Vaste Bate&quot; kan nie afgeskakel word nie, aangesien Bate-rekord teen die item bestaan"
 DocType: Vehicle Service,Brake Oil,Remolie
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kliënt&gt; Kliëntegroep&gt; Territorium
 DocType: Tax Rule,Tax Type,Belasting Tipe
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Belasbare Bedrag
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Jy is nie gemagtig om inskrywings by te voeg of op te dateer voor {0}
 DocType: BOM,Item Image (if not slideshow),Item Image (indien nie skyfievertoning nie)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,&#39;N Kliënt bestaan met dieselfde naam
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Uurtarief / 60) * Werklike operasietyd
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Ry # {0}: Verwysingsdokumenttipe moet een van koste-eis of joernaalinskrywing wees
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Kies BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Ry # {0}: Verwysingsdokumenttipe moet een van koste-eis of joernaalinskrywing wees
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Kies BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Koste van aflewerings
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Die vakansie op {0} is nie tussen die datum en die datum nie
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,Werknemerslening
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Aktiwiteit log:
 DocType: Fee Schedule,Send Payment Request Email,Stuur betalingsversoek-e-pos
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Item {0} bestaan nie in die stelsel nie of het verval
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Item {0} bestaan nie in die stelsel nie of het verval
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Eiendom
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Rekeningstaat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,farmaseutiese
@@ -210,17 +213,22 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Invoer Log
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Trek materiaal versoek van tipe Vervaardiging gebaseer op die bogenoemde kriteria
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Suksesvol ongeregistreer.
 DocType: Training Result Employee,Grade,graad
+DocType: Restaurant Table,No of Seats,Aantal plekke
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Om dinamiese vak by te voeg, gebruik jinja-tags soos <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Aflewer deur verskaffer
 DocType: SMS Center,All Contact,Alle Kontak
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Produksie bestelling wat reeds vir alle items met BOM geskep is
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Produksie bestelling wat reeds vir alle items met BOM geskep is
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Jaarlikse salaris
 DocType: Daily Work Summary,Daily Work Summary,Daaglikse werkopsomming
 DocType: Period Closing Voucher,Closing Fiscal Year,Afsluiting van fiskale jaar
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} is gevries
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Kies asseblief Bestaande Maatskappy om &#39;n Grafiek van Rekeninge te skep
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} is gevries
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Kies asseblief Bestaande Maatskappy om &#39;n Grafiek van Rekeninge te skep
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Voorraaduitgawes
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Kies Doelwinkel
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Kies Doelwinkel
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Voer asseblief voorkeur kontak e-pos in
 DocType: Program Enrollment,School Bus,Skoolbus
 DocType: Journal Entry,Contra Entry,Contra Entry
@@ -237,9 +245,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Laai die sjabloon af, vul toepaslike data in en heg die gewysigde lêer aan. Alle datums en werknemer kombinasie in die geselekteerde tydperk sal in die sjabloon kom, met bestaande bywoningsrekords"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Item {0} is nie aktief of die einde van die lewe is bereik nie
+DocType: Student Admission Program,Minimum Age,Minimum ouderdom
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Voorbeeld: Basiese Wiskunde
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om belasting in ry {0} in Item-tarief in te sluit, moet belasting in rye {1} ook ingesluit word"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Instellings vir HR Module
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Instellings vir HR Module
 DocType: SMS Center,SMS Center,Sms sentrum
 DocType: Sales Invoice,Change Amount,Verander bedrag
 DocType: BOM Update Tool,New BOM,Nuwe BOM
@@ -249,7 +258,7 @@
 DocType: Lead,Request Type,Versoek Tipe
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Maak werknemer
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,uitsaai
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Voeg kamers by
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Opstel af van POS (Online / Offline)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Uitvoering
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Besonderhede van die operasies uitgevoer.
 DocType: Serial No,Maintenance Status,Onderhoudstatus
@@ -272,6 +281,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Pryslys moet van toepassing wees vir koop of verkoop
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Installasiedatum kan nie voor afleweringsdatum vir Item {0} wees nie.
 DocType: Pricing Rule,Discount on Price List Rate (%),Afslag op pryslyskoers (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Biochemie
 DocType: Offer Letter,Select Terms and Conditions,Kies Terme en Voorwaardes
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,Uitwaarde
 DocType: Production Planning Tool,Sales Orders,Verkoopsbestellings
@@ -306,15 +316,15 @@
 DocType: Sales Partner,Reseller,Reseller
 DocType: Codification Table,Medical Code,Mediese Kode
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Indien gekontroleer, sal nie-voorraaditems in die Materiaalversoeke insluit."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Voer asseblief die maatskappy in
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Voer asseblief die maatskappy in
 DocType: Delivery Note Item,Against Sales Invoice Item,Teen Verkoopsfaktuur Item
 ,Production Orders in Progress,Produksiebestellings in voortsetting
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Netto kontant uit finansiering
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage is vol, het nie gestoor nie"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage is vol, het nie gestoor nie"
 DocType: Lead,Address & Contact,Adres &amp; Kontak
 DocType: Leave Allocation,Add unused leaves from previous allocations,Voeg ongebruikte blare by vorige toekennings by
 DocType: Sales Partner,Partner website,Vennoot webwerf
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Voeg Item by
+DocType: Restaurant Order Entry,Add Item,Voeg Item by
 DocType: Lab Test,Custom Result,Aangepaste resultaat
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Kontak naam
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kursus assesseringskriteria
@@ -327,7 +337,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Versoek om aankoop.
 DocType: Lab Test,Submitted Date,Datum gestuur
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Dit is gebaseer op die tydskrifte wat teen hierdie projek geskep is
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Netto betaal kan nie minder as 0 wees nie
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Netto betaal kan nie minder as 0 wees nie
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Om te stop met die stuur van herhalende fout kennisgewings van die stelsel, het ons die Gestremde veld in die intekening gekontroleer"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Slegs die geselekteerde verlof goedkeur kan hierdie verlof aansoek indien
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Aflosdatum moet groter wees as Datum van aansluiting
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Blare per jaar
@@ -336,9 +347,10 @@
 DocType: Email Digest,Profit & Loss,Wins en verlies
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,liter
 DocType: Task,Total Costing Amount (via Time Sheet),Totale kosteberekening (via tydblad)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Stel asseblief studente onder Studentegroepe op
 DocType: Item Website Specification,Item Website Specification,Item webwerf spesifikasie
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Verlaat geblokkeer
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Item {0} het sy einde van die lewe bereik op {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Item {0} het sy einde van die lewe bereik op {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Bankinskrywings
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,jaarlikse
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Voorraadversoening Item
@@ -347,7 +359,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Studente Groepskeppingsinstrument Kursus
 DocType: Lead,Do Not Contact,Moenie kontak maak nie
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,Mense wat by jou organisasie leer
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Die unieke ID vir die opsporing van alle herhalende fakture. Dit word gegenereer op inlewering.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Sagteware ontwikkelaar
 DocType: Item,Minimum Order Qty,Minimum bestelhoeveelheid
 DocType: Pricing Rule,Supplier Type,Verskaffer Tipe
@@ -357,16 +368,18 @@
 DocType: Item,Publish in Hub,Publiseer in Hub
 DocType: Student Admission,Student Admission,Studentetoelating
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Item {0} is gekanselleer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Materiaal Versoek
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Item {0} is gekanselleer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Materiaal Versoek
 DocType: Bank Reconciliation,Update Clearance Date,Dateer opruimingsdatum op
 DocType: Item,Purchase Details,Aankoopbesonderhede
 DocType: Patient Relation,Relation,verhouding
 DocType: Shipping Rule,Worldwide Shipping,Worldwide Shipping
 DocType: Patient Relation,Mother,moeder
+DocType: Restaurant Reservation,Reservation End Time,Besprekings eindtyd
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Bevestigde bestellings van kliënte.
 DocType: Purchase Receipt Item,Rejected Quantity,Afgekeurde hoeveelheid
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Betaling Versoek {0} geskep
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Betaling Versoek {0} geskep
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Lae Sensitiwiteit
 DocType: Notification Control,Notification Control,Kennisgewingbeheer
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Bevestig asseblief as jy jou opleiding voltooi het
 DocType: Lead,Suggestions,voorstelle
@@ -386,7 +399,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,E-pos salarisstrokie aan werknemer gebaseer op voorkeur e-pos gekies in Werknemer
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Die eerste verlof goedkeur in die lys sal ingestel word as die verstekverlof
 DocType: Tax Rule,Shipping County,Versending County
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Leer
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Leer
 DocType: Asset,Next Depreciation Date,Volgende Depresiasie Datum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktiwiteitskoste per werknemer
 DocType: Accounts Settings,Settings for Accounts,Instellings vir rekeninge
@@ -397,13 +410,13 @@
 DocType: Item,Synced With Hub,Gesinkroniseer met hub
 DocType: Vehicle,Fleet Manager,Vlootbestuurder
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Ry # {0}: {1} kan nie vir item {2} negatief wees nie
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Verkeerde wagwoord
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Verkeerde wagwoord
 DocType: Item,Variant Of,Variant Van
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Voltooide hoeveelheid kan nie groter wees as &#39;Hoeveelheid om te vervaardig&#39; nie
 DocType: Period Closing Voucher,Closing Account Head,Sluitingsrekeninghoof
 DocType: Employee,External Work History,Eksterne werkgeskiedenis
 DocType: Physician,Time per Appointment,Tyd per Aanstelling
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Omsendbriefverwysingsfout
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Omsendbriefverwysingsfout
 DocType: Appointment Type,Is Inpatient,Is binnepasiënt
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Voog 1 Naam
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,In Woorde (Uitvoer) sal sigbaar wees sodra jy die Afleweringsnota stoor.
@@ -412,19 +425,18 @@
 DocType: Lead,Industry,bedryf
 DocType: Employee,Job Profile,Werkprofiel
 DocType: BOM Item,Rate & Amount,Tarief en Bedrag
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Stel asseblief nommersreeks vir Bywoning via Setup&gt; Numbering Series
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Dit is gebaseer op transaksies teen hierdie maatskappy. Sien die tydlyn hieronder vir besonderhede
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Stel per e-pos in kennis van die skepping van outomatiese materiaalversoek
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,bestand
 DocType: Journal Entry,Multi Currency,Multi Geld
 DocType: Payment Reconciliation Invoice,Invoice Type,Faktuur Tipe
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kliënt&gt; Kliëntegroep&gt; Territorium
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Afleweringsnota
 DocType: Consultation,Encounter Impression,Encounter Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Opstel van Belasting
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Koste van Verkoop Bate
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,Betalinginskrywing is gewysig nadat jy dit getrek het. Trek dit asseblief weer.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} het twee keer in Itembelasting ingeskryf
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Opsomming vir hierdie week en hangende aktiwiteite
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} het twee keer in Itembelasting ingeskryf
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Opsomming vir hierdie week en hangende aktiwiteite
 DocType: Student Applicant,Admitted,toegelaat
 DocType: Workstation,Rent Cost,Huur koste
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Bedrag na waardevermindering
@@ -438,35 +450,34 @@
 DocType: Shipping Rule,Valid for Countries,Geldig vir lande
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Hierdie item is &#39;n sjabloon en kan nie in transaksies gebruik word nie. Itemkenmerke sal oor na die varianten gekopieer word, tensy &#39;Geen kopie&#39; ingestel is nie"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Totale bestelling oorweeg
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Werknemerbenaming (bv. HUB, Direkteur, ens.)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Werknemerbenaming (bv. HUB, Direkteur, ens.)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Koers waarop die kliënt geldeenheid omgeskakel word na die kliënt se basiese geldeenheid
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kursusskeduleringsinstrument
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ry # {0}: Aankoopfaktuur kan nie teen &#39;n bestaande bate gemaak word nie {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Dringend] Fout tydens die skep van herhalende% s vir% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Dringend] Fout tydens die skep van herhalende% s vir% s
 DocType: Item Tax,Tax Rate,Belastingkoers
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} reeds toegeken vir Werknemer {1} vir periode {2} tot {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Kies item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Kies item
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Aankoopfaktuur {0} is reeds ingedien
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Ry # {0}: lotnommer moet dieselfde wees as {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Skakel na nie-groep
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Batch (baie) van &#39;n item.
 DocType: C-Form Invoice Detail,Invoice Date,Faktuurdatum
 DocType: GL Entry,Debit Amount,Debietbedrag
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Daar kan slegs 1 rekening per maatskappy wees in {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Sien asseblief aangehegte
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Daar kan slegs 1 rekening per maatskappy wees in {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Sien asseblief aangehegte
 DocType: Purchase Order,% Received,% Ontvang
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Skep studentegroepe
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Opstel is reeds voltooi!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Opstel is reeds voltooi!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Kredietnota Bedrag
 DocType: Setup Progress Action,Action Document,Aksie Dokument
 ,Finished Goods,Voltooide goedere
 DocType: Delivery Note,Instructions,instruksies
 DocType: Quality Inspection,Inspected By,Geinspekteer deur
 DocType: Maintenance Visit,Maintenance Type,Onderhoudstipe
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} is nie in die Kursus ingeskryf nie {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Item Kode&gt; Itemgroep&gt; Handelsmerk
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} is nie in die Kursus ingeskryf nie {2}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Voeg items by
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Voeg items by
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Item Kwaliteit Inspeksie Parameter
 DocType: Leave Application,Leave Approver Name,Verlaat Goedgekeur Naam
 DocType: Depreciation Schedule,Schedule Date,Skedule Datum
@@ -486,7 +497,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Werksure
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Verander die begin- / huidige volgordenommer van &#39;n bestaande reeks.
 DocType: Dosage Strength,Strength,krag
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Skep &#39;n nuwe kliënt
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Skep &#39;n nuwe kliënt
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","As verskeie prysreglemente voortduur, word gebruikers gevra om Prioriteit handmatig in te stel om konflik op te los."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Skep bestellings
 ,Purchase Register,Aankoopregister
@@ -505,7 +516,7 @@
 DocType: Lab Test Template,Single,enkele
 DocType: Salary Slip,Total Loan Repayment,Totale Lening Terugbetaling
 DocType: Account,Cost of Goods Sold,Koste van goedere verkoop
-DocType: Purchase Invoice,Yearly,jaarlikse
+DocType: Subscription,Yearly,jaarlikse
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Voer asseblief Koste Sentrum in
 DocType: Drug Prescription,Dosage,dosis
 DocType: Journal Entry Account,Sales Order,Verkoopsbestelling
@@ -534,7 +545,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globale instellings vir alle vervaardigingsprosesse.
 DocType: Accounts Settings,Accounts Frozen Upto,Rekeninge Bevrore Upto
 DocType: SMS Log,Sent On,Gestuur
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Attribuut {0} het verskeie kere gekies in Attributes Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Attribuut {0} het verskeie kere gekies in Attributes Table
 DocType: HR Settings,Employee record is created using selected field. ,Werknemer rekord is geskep met behulp van geselekteerde veld.
 DocType: Sales Order,Not Applicable,Nie van toepassing nie
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Vakansie meester.
@@ -559,13 +570,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Totale blare toegeken is verpligtend
 DocType: Patient,AB Positive,AB Positief
 DocType: Job Opening,Description of a Job Opening,Beskrywing van &#39;n werksopening
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Hangende aktiwiteite vir vandag
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Hangende aktiwiteite vir vandag
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Bywoningsrekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Salaris Komponent vir tydlaar-gebaseerde betaalstaat.
 DocType: Sales Order Item,Used for Production Plan,Gebruik vir Produksieplan
 DocType: Employee Loan,Total Payment,Totale betaling
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tyd tussen bedrywighede (in mins)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} is gekanselleer sodat die aksie nie voltooi kan word nie
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} is gekanselleer sodat die aksie nie voltooi kan word nie
 DocType: Customer,Buyer of Goods and Services.,Koper van goedere en dienste.
 DocType: Journal Entry,Accounts Payable,Rekeninge betaalbaar
 DocType: Patient,Allergies,allergieë
@@ -577,22 +588,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Waarsku aankoop bestellings
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Lys &#39;n paar van jou kliënte. Hulle kan organisasies of individue wees.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Genoeg Onderdele om te Bou
+DocType: POS Profile User,POS Profile User,POS Profiel gebruiker
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Direkte inkomste
 DocType: Patient Appointment,Date TIme,Datum Tyd
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Kan nie filter op grond van rekening, indien gegroepeer volgens rekening nie"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Administratiewe Beampte
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Kies asseblief Kursus
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Kies asseblief Kursus
 DocType: Codification Table,Codification Table,Kodifikasietabel
 DocType: Timesheet Detail,Hrs,ure
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Kies asseblief Maatskappy
 DocType: Stock Entry Detail,Difference Account,Verskilrekening
 DocType: Purchase Invoice,Supplier GSTIN,Verskaffer GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Kan nie die taak toemaak nie aangesien die afhanklike taak {0} nie gesluit is nie.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,Vul asseblief die pakhuis in vir watter materiaalversoek opgeneem sal word
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Kan nie die taak toemaak nie aangesien die afhanklike taak {0} nie gesluit is nie.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Vul asseblief die pakhuis in vir watter materiaalversoek opgeneem sal word
 DocType: Production Order,Additional Operating Cost,Bykomende bedryfskoste
 DocType: Lab Test Template,Lab Routine,Lab Roetine
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,skoonheidsmiddels
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Om saam te voeg, moet die volgende eienskappe dieselfde wees vir beide items"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Om saam te voeg, moet die volgende eienskappe dieselfde wees vir beide items"
 DocType: Shipping Rule,Net Weight,Netto gewig
 DocType: Employee,Emergency Phone,Nood telefoon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,koop
@@ -602,7 +614,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Definieer asseblief graad vir Drempel 0%
 DocType: Sales Order,To Deliver,Om af te lewer
 DocType: Purchase Invoice Item,Item,item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Serie-item kan nie &#39;n breuk wees nie
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Hoë Sensitiwiteit
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Serie-item kan nie &#39;n breuk wees nie
 DocType: Journal Entry,Difference (Dr - Cr),Verskil (Dr - Cr)
 DocType: Account,Profit and Loss,Wins en Verlies
 DocType: Patient,Risk Factors,Risiko faktore
@@ -611,7 +624,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Bestuur van onderaanneming
 DocType: Vital Signs,Body Temperature,Liggaamstemperatuur
 DocType: Project,Project will be accessible on the website to these users,Projek sal op hierdie webwerf toeganklik wees
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Definieer Projek tipe.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Definieer Projek tipe.
 DocType: Supplier Scorecard,Weighting Function,Gewig Funksie
 DocType: Physician,OP Consulting Charge,OP Konsultasiekoste
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Stel jou
@@ -625,19 +638,19 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Toename kan nie 0 wees nie
 DocType: Production Planning Tool,Material Requirement,Materiaalvereiste
 DocType: Company,Delete Company Transactions,Verwyder maatskappytransaksies
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Verwysingsnommer en verwysingsdatum is verpligtend vir Banktransaksie
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Verwysingsnommer en verwysingsdatum is verpligtend vir Banktransaksie
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Voeg / verander belasting en heffings
 DocType: Payment Entry Reference,Supplier Invoice No,Verskafferfaktuurnr
 DocType: Territory,For reference,Vir verwysing
 DocType: Healthcare Settings,Appointment Confirmation,Aanstelling Bevestiging
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Sluiting (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,hallo
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Skuif item
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Skuif item
 DocType: Serial No,Warranty Period (Days),Garantie Periode (Dae)
 DocType: Installation Note Item,Installation Note Item,Installasie Nota Item
 DocType: Production Plan Item,Pending Qty,Hangende hoeveelheid
 DocType: Budget,Ignore,ignoreer
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} is nie aktief nie
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} is nie aktief nie
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Opstel tjek dimensies vir die druk
 DocType: Salary Slip,Salary Slip Timesheet,Salaris Slip Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Verskaffer Pakhuis verplig vir onderaanneming Aankoop Ontvangs
@@ -646,7 +659,7 @@
 DocType: Pricing Rule,Sales Partner,Verkoopsvennoot
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Alle verskaffer scorecards.
 DocType: Buying Settings,Purchase Receipt Required,Aankoop Ontvangs Benodig
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Waardasietarief is verpligtend indien Openingsvoorraad ingeskryf is
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,Waardasietarief is verpligtend indien Openingsvoorraad ingeskryf is
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Geen rekords gevind in die faktuur tabel nie
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Kies asseblief eers Maatskappy- en Partytipe
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Finansiële / boekjaar.
@@ -683,7 +696,7 @@
 DocType: Quotation,Quotation To,Aanhaling aan
 DocType: Lead,Middle Income,Middelinkomste
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Verstekeenheid van item vir item {0} kan nie direk verander word nie omdat jy reeds &#39;n transaksie (s) met &#39;n ander UOM gemaak het. Jy sal &#39;n nuwe item moet skep om &#39;n ander standaard UOM te gebruik.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Verstekeenheid van item vir item {0} kan nie direk verander word nie omdat jy reeds &#39;n transaksie (s) met &#39;n ander UOM gemaak het. Jy sal &#39;n nuwe item moet skep om &#39;n ander standaard UOM te gebruik.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Toegewysde bedrag kan nie negatief wees nie
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Stel asseblief die Maatskappy in
 DocType: Purchase Order Item,Billed Amt,Billed Amt
@@ -697,6 +710,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Kies Betaalrekening om Bankinskrywing te maak
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Skep werknemerrekords om blare, koste-eise en betaalstaat te bestuur"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Voorskrifperiode
+DocType: Restaurant Reservation,Restaurant Reservation,Restaurant bespreking
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Voorstel Skryf
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betaling Inskrywing Aftrek
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Nog &#39;n verkoopspersoon {0} bestaan uit dieselfde werknemer-ID
@@ -704,7 +718,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,meesters
 DocType: Assessment Plan,Maximum Assessment Score,Maksimum assesserings telling
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Dateer Bank Transaksiedatums op
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Tyd dop
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Tyd dop
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,DUPLIKAAT VIR TRANSPORTEUR
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskale Jaar Maatskappy
 DocType: Packing Slip Item,DN Detail,DN Detail
@@ -712,8 +726,9 @@
 DocType: Timesheet,Billed,billed
 DocType: Batch,Batch Description,Batch Beskrywing
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Skep studentegroepe
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Betaling Gateway rekening nie geskep nie, skep asseblief een handmatig."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Betaling Gateway rekening nie geskep nie, skep asseblief een handmatig."
 DocType: Supplier Scorecard,Per Year,Per jaar
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Nie in aanmerking vir toelating tot hierdie program soos per DOB nie
 DocType: Sales Invoice,Sales Taxes and Charges,Verkoopsbelasting en Heffings
 DocType: Employee,Organization Profile,Organisasie Profiel
 DocType: Vital Signs,Height (In Meter),Hoogte (In meter)
@@ -779,15 +794,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Belandkoste en koste geland
 DocType: Production Order Operation,Actual Start Time,Werklike Aanvangstyd
 DocType: BOM Operation,Operation Time,Operasie Tyd
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Voltooi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Voltooi
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Basis
 DocType: Timesheet,Total Billed Hours,Totale gefaktureerde ure
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Skryf af Bedrag
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Skryf af Bedrag
 DocType: Leave Block List Allow,Allow User,Laat gebruiker toe
 DocType: Journal Entry,Bill No,Rekening No
 DocType: Company,Gain/Loss Account on Asset Disposal,Wins / Verliesrekening op Bateverkope
 DocType: Vehicle Log,Service Details,Diensbesonderhede
-DocType: Purchase Invoice,Quarterly,kwartaallikse
+DocType: Subscription,Quarterly,kwartaallikse
 DocType: Lab Test Template,Grouped,gegroepeer
 DocType: Selling Settings,Delivery Note Required,Afleweringsnota benodig
 DocType: Bank Guarantee,Bank Guarantee Number,Bank waarborg nommer
@@ -796,12 +811,12 @@
 DocType: Student Attendance,Student Attendance,Studente Bywoning
 DocType: Sales Invoice Timesheet,Time Sheet,Tydstaat
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Grondstowwe gebaseer op
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Voer asseblief die itembesonderhede in
 DocType: Interest,Interest,belangstelling
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Voorverkope
 DocType: Purchase Receipt,Other Details,Ander besonderhede
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Lab Test,Test Template,Toets Sjabloon
+DocType: Restaurant Order Entry Item,Served,Bedien
 DocType: Account,Accounts,rekeninge
 DocType: Vehicle,Odometer Value (Last),Odometer Waarde (Laaste)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Templates van verskaffer tellingskaart kriteria.
@@ -813,25 +828,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Preview Salary Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Rekening {0} is verskeie kere ingevoer
 DocType: Account,Expenses Included In Valuation,Uitgawes Ingesluit in Waardasie
-DocType: Hub Settings,Seller City,Verkoper Stad
 ,Absent Student Report,Afwesige Studenteverslag
 DocType: Email Digest,Next email will be sent on:,Volgende e-pos sal gestuur word op:
 DocType: Offer Letter Term,Offer Letter Term,Bied briewe
 DocType: Supplier Scorecard,Per Week,Per week
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Item het variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Item het variante.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Totale Student
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Item {0} nie gevind nie
 DocType: Bin,Stock Value,Voorraadwaarde
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,"Fooi rekords sal geskep word in die agtergrond. In geval van &#39;n fout, sal die foutboodskap in die Bylae opgedateer word."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Maatskappy {0} bestaan nie
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} het fooi geldigheid tot {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} het fooi geldigheid tot {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Boomstipe
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Aantal verbruik per eenheid
 DocType: Serial No,Warranty Expiry Date,Garantie Vervaldatum
 DocType: Material Request Item,Quantity and Warehouse,Hoeveelheid en pakhuis
+DocType: Hub Settings,Unregister,Deregistreer
 DocType: Sales Invoice,Commission Rate (%),Kommissie Koers (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Kies asseblief Program
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Kies asseblief Program
 DocType: Project,Estimated Cost,Geskatte koste
 DocType: Purchase Order,Link to material requests,Skakel na materiaal versoeke
+DocType: Hub Settings,Publish,publiseer
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Ruimte
 DocType: Journal Entry,Credit Card Entry,Kredietkaartinskrywing
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Maatskappy en Rekeninge
@@ -842,13 +859,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Sluit geleentheid na dae
 ,Reserved,voorbehou
 DocType: Purchase Order,Supply Raw Materials,Voorsien grondstowwe
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Die datum waarop die volgende faktuur gegenereer sal word. Dit word gegenereer op inlewering.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Huidige bates
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} is nie &#39;n voorraaditem nie
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',Deel asseblief u terugvoering aan die opleiding deur op &#39;Training Feedback&#39; te klik en dan &#39;New&#39;
 DocType: Mode of Payment Account,Default Account,Verstek rekening
 DocType: Payment Entry,Received Amount (Company Currency),Ontvangde Bedrag (Maatskappy Geld)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,Lood moet gestel word indien Geleentheid van Lood gemaak word
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,Lood moet gestel word indien Geleentheid van Lood gemaak word
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Kies asseblief weekliks af
 DocType: Patient,O Negative,O Negatief
 DocType: Production Order Operation,Planned End Time,Beplande eindtyd
@@ -864,10 +880,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,energie
 DocType: Opportunity,Opportunity From,Geleentheid Van
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Maandelikse salarisverklaring.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Voeg Maatskappy by
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ry {0}: {1} Serial nommers benodig vir item {2}. U het {3} verskaf.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ry {0}: {1} Serial nommers benodig vir item {2}. U het {3} verskaf.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Kies asseblief &#39;n tabel
 DocType: BOM,Website Specifications,Webwerf spesifikasies
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} is &#39;n ongeldige e-posadres in &#39;Ontvangers&#39;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} is &#39;n ongeldige e-posadres in &#39;Ontvangers&#39;
 DocType: Special Test Items,Particulars,Besonderhede
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiotika.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Vanaf {0} van tipe {1}
@@ -875,11 +891,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Ry {0}: Omskakelfaktor is verpligtend
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",Veelvuldige prysreëls bestaan volgens dieselfde kriteria. Beslis asseblief konflik deur prioriteit toe te ken. Prys Reëls: {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,Kan BOM nie deaktiveer of kanselleer nie aangesien dit gekoppel is aan ander BOM&#39;s
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,Kan BOM nie deaktiveer of kanselleer nie aangesien dit gekoppel is aan ander BOM&#39;s
 DocType: Opportunity,Maintenance,onderhoud
 DocType: Item Attribute Value,Item Attribute Value,Item Attribuutwaarde
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Verkoopsveldtogte.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Maak tydrooster
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Maak tydrooster
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -917,12 +933,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Voer asseblief eers die item in
 DocType: Account,Liability,aanspreeklikheid
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Gekonfekteerde bedrag kan nie groter wees as eisbedrag in ry {0} nie.
+DocType: Salary Detail,Do not include in total,Sluit nie in totaal in nie
 DocType: Company,Default Cost of Goods Sold Account,Verstek koste van goedere verkoop rekening
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Pryslys nie gekies nie
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Pryslys nie gekies nie
 DocType: Employee,Family Background,Familie agtergrond
 DocType: Request for Quotation Supplier,Send Email,Stuur e-pos
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Waarskuwing: Ongeldige aanhangsel {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Geen toestemming nie
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Waarskuwing: Ongeldige aanhangsel {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Geen toestemming nie
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Aanhaling gevra
 DocType: Vital Signs,Heart Rate / Pulse,Hartslag / Pols
 DocType: Company,Default Bank Account,Verstekbankrekening
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Om te filter gebaseer op Party, kies Party Type eerste"
@@ -949,12 +967,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Itemreeks {idx}: {doctype} {docname} bestaan nie in die boks &#39;{doctype}&#39; tabel nie
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Rooster {0} is reeds voltooi of gekanselleer
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Geen take nie
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Die dag van die maand waarop die outomatiese faktuur gegenereer word, bv. 05, 28 ens"
 DocType: Item Variant Settings,Copy Fields to Variant,Kopieer velde na variant
 DocType: Asset,Opening Accumulated Depreciation,Opening Opgehoopte Waardevermindering
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Die telling moet minder as of gelyk wees aan 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Inskrywing Tool
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C-vorm rekords
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C-vorm rekords
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Kliënt en Verskaffer
 DocType: Email Digest,Email Digest Settings,Email Digest Settings
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Dankie vir u besigheid!
@@ -972,13 +989,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Aanhaling Status
 DocType: Maintenance Visit,Completion Status,Voltooiingsstatus
 DocType: HR Settings,Enter retirement age in years,Gee aftree-ouderdom in jare
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Teiken Warehouse
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Kies asseblief &#39;n pakhuis
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Teiken Warehouse
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Kies asseblief &#39;n pakhuis
 DocType: Cheque Print Template,Starting location from left edge,Begin plek vanaf linkerkant
 DocType: Item,Allow over delivery or receipt upto this percent,Laat oor die aflewering of kwitansie tot hierdie persentasie toe
 DocType: Stock Entry,STE-,STE
 DocType: Upload Attendance,Import Attendance,Invoer Bywoning
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Alle Itemgroepe
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Alle Itemgroepe
 DocType: Process Payroll,Activity Log,Aktiwiteit log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Netto wins / verlies
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Stel outomaties boodskap op indiening van transaksies.
@@ -990,7 +1007,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Geprojekteerde hoeveelheid
 DocType: Sales Invoice,Payment Due Date,Betaaldatum
 DocType: Drug Prescription,Interval UOM,Interval UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Item Variant {0} bestaan reeds met dieselfde eienskappe
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Item Variant {0} bestaan reeds met dieselfde eienskappe
+DocType: Item,Hub Publishing Details,Hub Publishing Details
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;Oopmaak&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Oop om te doen
 DocType: Notification Control,Delivery Note Message,Afleweringsnota Boodskap
@@ -1010,10 +1028,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: Grondstowwe kan nie dieselfde wees as hoofitem nie
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Totale Toepaslike Koste in Aankoopontvangste-items moet dieselfde wees as Totale Belasting en Heffings
 DocType: Sales Team,Incentives,aansporings
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Registreer vir Hub
 DocType: SMS Log,Requested Numbers,Gevraagde Getalle
 DocType: Production Planning Tool,Only Obtain Raw Materials,Verkry slegs grondstowwe
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Prestasiebeoordeling.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Aktiveer &#39;Gebruik vir winkelwagentje&#39;, aangesien winkelwagentjie geaktiveer is en daar moet ten minste een belastingreël vir die winkelwagentjie wees"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Aktiveer &#39;Gebruik vir winkelwagentje&#39;, aangesien winkelwagentjie geaktiveer is en daar moet ten minste een belastingreël vir die winkelwagentjie wees"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Betaling Inskrywing {0} is gekoppel aan bestelling {1}, maak seker of dit as voorskot in hierdie faktuur getrek word."
 DocType: Sales Invoice Item,Stock Details,Voorraadbesonderhede
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekwaarde
@@ -1032,12 +1051,14 @@
 DocType: Salary Slip,Working Days,Werksdae
 DocType: Serial No,Incoming Rate,Inkomende koers
 DocType: Packing Slip,Gross Weight,Totale gewig
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,Die naam van u maatskappy waarvoor u hierdie stelsel opstel.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Aktiveer Hub
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,Die naam van u maatskappy waarvoor u hierdie stelsel opstel.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Sluit vakansiedae in Totaal nr. van werksdae
 DocType: Job Applicant,Hold,hou
 DocType: Employee,Date of Joining,Datum van aansluiting
 DocType: Naming Series,Update Series,Update Series
 DocType: Supplier Quotation,Is Subcontracted,Is onderaanneming
+DocType: Restaurant Table,Minimum Seating,Minimum sitplek
 DocType: Item Attribute,Item Attribute Values,Item Attribuutwaardes
 DocType: Examination Result,Examination Result,Eksamenuitslag
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Aankoop Ontvangst
@@ -1048,13 +1069,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Kan nie tydgleuf in die volgende {0} dae vir operasie {1} vind nie
 DocType: Production Order,Plan material for sub-assemblies,Beplan materiaal vir sub-gemeentes
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Verkope Vennote en Territory
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} moet aktief wees
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} moet aktief wees
 DocType: Journal Entry,Depreciation Entry,Waardevermindering Inskrywing
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Kies asseblief die dokument tipe eerste
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Kanselleer materiaalbesoeke {0} voordat u hierdie onderhoudsbesoek kanselleer
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Reeksnommer {0} behoort nie aan item {1} nie
 DocType: Purchase Receipt Item Supplied,Required Qty,Vereiste aantal
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Pakhuise met bestaande transaksies kan nie na grootboek omskep word nie.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Pakhuise met bestaande transaksies kan nie na grootboek omskep word nie.
 DocType: Bank Reconciliation,Total Amount,Totale bedrag
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Prescription Duration,Number,aantal
@@ -1065,7 +1086,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Verkooppryslys
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Indien gekontroleer, sal &#39;n kliënt geskep word, gekarteer na Pasiënt. Pasiëntfakture sal teen hierdie kliënt geskep word. U kan ook bestaande kliënt kies terwyl u pasiënt skep."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publiseer om items te sinkroniseer
 DocType: Bank Reconciliation,Account Currency,Rekening Geld
 DocType: Lab Test,Sample ID,Voorbeeld ID
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Gee asseblief &#39;n afwykende rekening in die maatskappy
@@ -1074,11 +1094,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Werknemer {0} is nie aktief of bestaan nie
 DocType: Fee Structure,Components,komponente
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Gee asb. Bate-kategorie in Item {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Itemvarianante {0} opgedateer
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Itemvarianante {0} opgedateer
 DocType: Quality Inspection Reading,Reading 6,Lees 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Kan nie {0} {1} {2} sonder enige negatiewe uitstaande faktuur
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","gegenereer word. As dit vertraag word, moet u die veld &quot;Herhaal op Dag van Maand&quot; handmatig verander"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Kan nie {0} {1} {2} sonder enige negatiewe uitstaande faktuur
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Aankoopfaktuur Advance
-DocType: Hub Settings,Sync Now,Sink nou
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Ry {0}: Kredietinskrywing kan nie gekoppel word aan &#39;n {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Definieer begroting vir &#39;n finansiële jaar.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Verstek Bank / Kontant rekening sal outomaties opgedateer word in POS Invoice wanneer hierdie modus gekies word.
@@ -1090,13 +1111,13 @@
 DocType: Item,Is Purchase Item,Is Aankoop Item
 DocType: Asset,Purchase Invoice,Aankoopfaktuur
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail No
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Nuwe verkope faktuur
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Nuwe verkope faktuur
 DocType: Stock Entry,Total Outgoing Value,Totale uitgaande waarde
 DocType: Physician,Appointments,aanstellings
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Openingsdatum en sluitingsdatum moet binne dieselfde fiskale jaar wees
 DocType: Lead,Request for Information,Versoek vir inligting
 ,LeaderBoard,leader
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Sinkroniseer vanlyn fakture
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Sinkroniseer vanlyn fakture
 DocType: Payment Request,Paid,betaal
 DocType: Program Fee,Program Fee,Programfooi
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1115,11 +1136,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Bestelling Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Indirekte Inkomste
 DocType: Student Attendance Tool,Student Attendance Tool,Studente Bywoning Gereedskap
+DocType: Restaurant Menu,Price List (Auto created),Pryslys (Outomaties geskep)
 DocType: Cheque Print Template,Date Settings,Datum instellings
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,variansie
 ,Company Name,maatskappynaam
 DocType: SMS Center,Total Message(s),Totale boodskap (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Kies Item vir Oordrag
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Kies Item vir Oordrag
 DocType: Purchase Invoice,Additional Discount Percentage,Bykomende kortingspersentasie
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Bekyk &#39;n lys van al die hulpvideo&#39;s
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Kies rekeninghoof van die bank waar tjek gedeponeer is.
@@ -1136,6 +1158,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,meter
 DocType: Workstation,Electricity Cost,Elektrisiteitskoste
 DocType: HR Settings,Don't send Employee Birthday Reminders,Moenie Werknemer Verjaarsdag Herinnerings stuur nie
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Stoor instellings
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Gevraagde Produkte
 DocType: Item,Inspection Criteria,Inspeksiekriteria
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,oorgedra
 DocType: BOM Website Item,BOM Website Item,BOM Webwerf Item
@@ -1152,11 +1176,11 @@
 DocType: Journal Entry,Total Amount in Words,Totale bedrag in woorde
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Daar was &#39;n fout. Een moontlike rede kan wees dat u die vorm nie gestoor het nie. Kontak asseblief support@erpnext.com as die probleem voortduur.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,My winkelwagen
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Bestelling Tipe moet een van {0} wees.
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Bestelling Tipe moet een van {0} wees.
 DocType: Lead,Next Contact Date,Volgende kontak datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Opening Aantal
 DocType: Healthcare Settings,Appointment Reminder,Aanstelling Herinnering
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Voer asseblief die rekening vir Veranderingsbedrag in
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Voer asseblief die rekening vir Veranderingsbedrag in
 DocType: Student Batch Name,Student Batch Name,Studentejoernaal
 DocType: Consultation,Doctor,dokter
 DocType: Holiday List,Holiday List Name,Vakansie Lys Naam
@@ -1164,12 +1188,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Skedule Kursus
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Voorraadopsies
 DocType: Journal Entry Account,Expense Claim,Koste-eis
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Wil jy hierdie geskrapde bate regtig herstel?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Aantal vir {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Wil jy hierdie geskrapde bate regtig herstel?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Aantal vir {0}
 DocType: Leave Application,Leave Application,Los aansoek
 DocType: Patient,Patient Relation,Pasiëntverwantskap
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Verlof toekenningsgereedskap
+DocType: Item,Hub Category to Publish,Hub Kategorie om te publiseer
 DocType: Leave Block List,Leave Block List Dates,Los blokkie lys datums
+DocType: Sales Invoice,Billing Address GSTIN,Rekeningadres GSTIN
 DocType: Workstation,Net Hour Rate,Netto Uurtarief
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost Purchase Receipt
 DocType: Company,Default Terms,Standaard terme
@@ -1179,18 +1205,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Spesifiseer asseblief &#39;n {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Verwyder items sonder enige verandering in hoeveelheid of waarde.
 DocType: Delivery Note,Delivery To,Aflewering aan
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Eienskapstabel is verpligtend
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Eienskapstabel is verpligtend
 DocType: Production Planning Tool,Get Sales Orders,Verkoop bestellings
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} kan nie negatief wees nie
 DocType: Training Event,Self-Study,Selfstudie
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,afslag
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,afslag
 DocType: Asset,Total Number of Depreciations,Totale aantal afskrywings
 DocType: Sales Invoice Item,Rate With Margin,Beoordeel Met Marge
 DocType: Workstation,Wages,lone
 DocType: Task,Urgent,dringende
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Spesifiseer asseblief &#39;n geldige ry-ID vir ry {0} in tabel {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Kan nie veranderlike vind nie:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Kies asseblief &#39;n veld om van numpad te wysig
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Kies asseblief &#39;n veld om van numpad te wysig
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Gaan na die lessenaar en begin met die gebruik van ERPNext
 DocType: Item,Manufacturer,vervaardiger
 DocType: Landed Cost Item,Purchase Receipt Item,Aankoopontvangste item
@@ -1221,8 +1247,8 @@
 DocType: GL Entry,Against,teen
 DocType: Item,Default Selling Cost Center,Verstekverkoopsentrum
 DocType: Sales Partner,Implementation Partner,Implementeringsvennoot
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Poskode
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Verkoopsbestelling {0} is {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Poskode
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Verkoopsbestelling {0} is {1}
 DocType: Opportunity,Contact Info,Kontakbesonderhede
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Maak voorraadinskrywings
 DocType: Packing Slip,Net Weight UOM,Netto Gewig UOM
@@ -1233,6 +1259,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Kry weeklikse af datums
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Einddatum kan nie minder wees as die begin datum nie
 DocType: Sales Person,Select company name first.,Kies die maatskappy se naam eerste.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Laag na Hoog
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Aanhalings ontvang van verskaffers.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Vervang BOM en verander nuutste prys in alle BOM&#39;s
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Na {0} | {1} {2}
@@ -1251,7 +1278,7 @@
 DocType: Program Enrollment,Transportation,Vervoer
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Ongeldige kenmerk
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} moet ingedien word
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Hoeveelheid moet minder as of gelyk wees aan {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Hoeveelheid moet minder as of gelyk wees aan {0}
 DocType: SMS Center,Total Characters,Totale karakters
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Kies asseblief BOM in BOM-veld vir Item {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-vorm faktuur besonderhede
@@ -1266,7 +1293,7 @@
 ,Ordered Items To Be Billed,Bestelde items wat gefaktureer moet word
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Van Reeks moet minder wees as To Range
 DocType: Global Defaults,Global Defaults,Globale verstek
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Projek vennootskappe Uitnodiging
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Projek vennootskappe Uitnodiging
 DocType: Salary Slip,Deductions,aftrekkings
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Aksie Naam
@@ -1284,13 +1311,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Verkope Faktuur Vooruit
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Niks om te versoek nie
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Nog &#39;n begroting rekord &#39;{0}&#39; bestaan reeds teen {1} &#39;{2}&#39; vir fiskale jaar {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&#39;Werklike Aanvangsdatum&#39; kan nie groter wees as &#39;Werklike Einddatum&#39; nie.
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&#39;Werklike Aanvangsdatum&#39; kan nie groter wees as &#39;Werklike Einddatum&#39; nie.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,bestuur
 DocType: Cheque Print Template,Payer Settings,Betaler instellings
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dit sal aangeheg word aan die itemkode van die variant. As u afkorting byvoorbeeld &quot;SM&quot; is en die itemkode &quot;T-SHIRT&quot; is, sal die itemkode van die variant &quot;T-SHIRT-SM&quot; wees."
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Netto betaal (in woorde) sal sigbaar wees sodra jy die Salary Slip stoor.
 DocType: Purchase Invoice,Is Return,Is Terug
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,versigtigheid
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,versigtigheid
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Terug / Debiet Nota
 DocType: Price List Country,Price List Country,Pryslys Land
 DocType: Item,UOMs,UOMs
@@ -1305,17 +1332,18 @@
 DocType: Account,Balance Sheet,Balansstaat
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Kostesentrum vir item met itemkode &#39;
 DocType: Fee Validity,Valid Till,Geldig tot
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Betaalmetode is nie gekonfigureer nie. Kontroleer asseblief of die rekening op Betalingsmodus of op POS-profiel gestel is.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Betaalmetode is nie gekonfigureer nie. Kontroleer asseblief of die rekening op Betalingsmodus of op POS-profiel gestel is.
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Dieselfde item kan nie verskeie kere ingevoer word nie.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Verdere rekeninge kan onder Groepe gemaak word, maar inskrywings kan gemaak word teen nie-groepe"
 DocType: Lead,Lead,lood
 DocType: Email Digest,Payables,krediteure
 DocType: Course,Course Intro,Kursus Intro
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Voorraadinskrywing {0} geskep
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Stel asseblief nommersreeks vir Bywoning via Setup&gt; Numbering Series
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Voorraadinskrywing {0} geskep
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ry # {0}: Afgekeurde hoeveelheid kan nie in Aankoopopgawe ingevoer word nie
 ,Purchase Order Items To Be Billed,Items bestel om te bestel om gefaktureer te word
 DocType: Purchase Invoice Item,Net Rate,Netto tarief
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Kies asseblief &#39;n kliënt
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Kies asseblief &#39;n kliënt
 DocType: Purchase Invoice Item,Purchase Invoice Item,Aankoop faktuur item
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Voorraadgrootboekinskrywings en GL-inskrywings word vir die gekose Aankoopontvangste herposeer
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Item 1
@@ -1334,7 +1362,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Dupliseer ry {0} met dieselfde {1}
 ,Trial Balance,Proefbalans
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Fiskale jaar {0} nie gevind nie
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Opstel van werknemers
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Opstel van werknemers
 DocType: Sales Order,SO-,so-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Kies asseblief voorvoegsel eerste
 DocType: Employee,O-,O-
@@ -1346,12 +1374,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Bekyk Grootboek
 DocType: Grading Scale,Intervals,tussenposes
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,vroegste
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","&#39;N Itemgroep bestaan met dieselfde naam, verander die itemnaam of verander die naamgroep"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","&#39;N Itemgroep bestaan met dieselfde naam, verander die itemnaam of verander die naamgroep"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobiele Nr.
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Res van die wêreld
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Res van die wêreld
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Die item {0} kan nie Batch hê nie
 ,Budget Variance Report,Begrotingsverskilverslag
 DocType: Salary Slip,Gross Pay,Bruto besoldiging
+DocType: Item,Is Item from Hub,Is item van hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Ry {0}: Aktiwiteitstipe is verpligtend.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividende Betaal
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Rekeningkunde Grootboek
@@ -1361,8 +1390,9 @@
 DocType: Vehicle Log,Service Detail,Diensbesonderhede
 DocType: BOM,Item Description,Item Beskrywing
 DocType: Student Sibling,Student Sibling,Student Sibling
-DocType: Purchase Invoice,Is Recurring,Is herhalend
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Betaal af
 DocType: Purchase Invoice,Supplied Items,Voorsien Items
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Stel asseblief &#39;n aktiewe spyskaart vir Restaurant {0}
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Hoeveelheid om te vervaardig
 DocType: Email Digest,New Income,Nuwe inkomste
@@ -1372,6 +1402,7 @@
 ,Student and Guardian Contact Details,Student en voog Kontakbesonderhede
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Ry {0}: Vir verskaffer {0} E-pos adres is nodig om e-pos te stuur
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Tydelike opening
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Bekyk Hub
 ,Employee Leave Balance,Werknemerverlofbalans
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Saldo vir rekening {0} moet altyd {1} wees
 DocType: Patient Appointment,More Info,Meer inligting
@@ -1391,13 +1422,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Verkoopsbestelling {0} is nie geldig nie
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Waarsku vir nuwe versoek vir kwotasies
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Aankooporders help om jou aankope te beplan en op te volg
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Jammer, maatskappye kan nie saamgevoeg word nie"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Jammer, maatskappye kan nie saamgevoeg word nie"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Voorskrifte
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Die totale uitgawe / oordraghoeveelheid {0} in materiaalversoek {1} \ kan nie groter wees as versoekte hoeveelheid {2} vir item {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,klein
 DocType: Employee,Employee Number,Werknemernommer
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Saaknommer (s) wat reeds in gebruik is. Probeer uit geval nr {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Saaknommer (s) wat reeds in gebruik is. Probeer uit geval nr {0}
 DocType: Project,% Completed,% Voltooi
 ,Invoiced Amount (Exculsive Tax),Faktuurbedrag (Exklusiewe Belasting)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Item 2
@@ -1412,11 +1443,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Indirekte uitgawes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Ry {0}: Aantal is verpligtend
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Landbou
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sinkroniseer meesterdata
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sinkroniseer meesterdata
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,U produkte of dienste
 DocType: Special Test Items,Special Test Items,Spesiale toetsitems
 DocType: Mode of Payment,Mode of Payment,Betaalmetode
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Webwerfbeeld moet &#39;n publieke lêer of webwerf-URL wees
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Webwerfbeeld moet &#39;n publieke lêer of webwerf-URL wees
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Dit is &#39;n wortel-item groep en kan nie geredigeer word nie.
@@ -1424,24 +1455,23 @@
 DocType: Vehicle,Fuel UOM,Brandstof UOM
 DocType: Warehouse,Warehouse Contact Info,Warehouse Kontak Info
 DocType: Payment Entry,Write Off Difference Amount,Skryf af Verskilbedrag
-DocType: Purchase Invoice,Recurring Type,Herhalende Tipe
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: Werknemer e-pos nie gevind nie, vandaar e-pos nie gestuur nie"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: Werknemer e-pos nie gevind nie, vandaar e-pos nie gestuur nie"
 DocType: Item,Foreign Trade Details,Buitelandse Handel Besonderhede
+,Assessment Plan Status,Assesseringsplan Status
 DocType: Email Digest,Annual Income,Jaarlikse inkomste
 DocType: Serial No,Serial No Details,Rekeningnommer
 DocType: Purchase Invoice Item,Item Tax Rate,Item Belastingkoers
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,Kies asseblief dokter en datum
 DocType: Student Group Student,Group Roll Number,Groeprolnommer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",Vir {0} kan slegs kredietrekeninge gekoppel word teen &#39;n ander debietinskrywing
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totaal van alle taakgewigte moet wees: 1. Pas asseblief die gewigte van alle projektaakse dienooreenkomstig aan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Afleweringsnotasie {0} is nie ingedien nie
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totaal van alle taakgewigte moet wees: 1. Pas asseblief die gewigte van alle projektaakse dienooreenkomstig aan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Afleweringsnotasie {0} is nie ingedien nie
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Item {0} moet &#39;n Subkontrakteerde Item wees
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapitaal Uitrustings
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prysreël word eers gekies gebaseer op &#39;Apply On&#39; -veld, wat Item, Itemgroep of Handelsnaam kan wees."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Stel asseblief die Item Kode eerste
-DocType: Hub Settings,Seller Website,Verkoper se webwerf
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Stel asseblief die Item Kode eerste
 DocType: Item,ITEM-,item-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Totale toegewysde persentasie vir verkope span moet 100 wees
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Totale toegewysde persentasie vir verkope span moet 100 wees
 DocType: Sales Invoice Item,Edit Description,Wysig Beskrywing
 DocType: Antibiotic,Antibiotic,antibiotika
 ,Team Updates,Span Updates
@@ -1462,12 +1492,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Totaal (Maatskappy Geld)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Serienommer {0} het meer as een keer ingeskryf
 DocType: Depreciation Schedule,Journal Entry,Joernaalinskrywing
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} items aan die gang
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} items aan die gang
 DocType: Workstation,Workstation Name,Werkstasie Naam
 DocType: Grading Scale Interval,Grade Code,Graadkode
 DocType: POS Item Group,POS Item Group,POS Item Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} behoort nie aan item {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} behoort nie aan item {1}
 DocType: Sales Partner,Target Distribution,Teikenverspreiding
 DocType: Salary Slip,Bank Account No.,Bankrekeningnommer
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Dit is die nommer van die laaste geskep transaksie met hierdie voorvoegsel
@@ -1483,10 +1513,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Versoek vir Kwotasieverskaffer
 DocType: Healthcare Settings,Registration Message,Registrasie Boodskap
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Hardware
-DocType: Sales Order,Recurring Upto,Herhalende Upto
 DocType: Prescription Dosage,Prescription Dosage,Voorskrif Dosering
 DocType: Attendance,HR Manager,HR Bestuurder
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Kies asseblief &#39;n maatskappy
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Kies asseblief &#39;n maatskappy
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Privilege Verlof
 DocType: Purchase Invoice,Supplier Invoice Date,Verskaffer faktuur datum
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,per
@@ -1502,10 +1531,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Oorvleuelende toestande tussen:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Teen Joernaal-inskrywing {0} is reeds aangepas teen &#39;n ander bewysstuk
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Totale bestellingswaarde
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Kos
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Kos
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Veroudering Reeks 3
 DocType: Maintenance Schedule Item,No of Visits,Aantal besoeke
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Onderhoudskedule {0} bestaan teen {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Wil jy jou items na Hub publiseer?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,Inskrywing van student
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Geld van die sluitingsrekening moet {0} wees
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Som van punte vir alle doelwitte moet 100 wees. Dit is {0}
@@ -1516,9 +1546,9 @@
 DocType: Authorization Rule,Average Discount,Gemiddelde afslag
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Nut
-DocType: Purchase Invoice Item,Accounting,Rekeningkunde
+DocType: POS Profile,Accounting,Rekeningkunde
 DocType: Employee,EMP/,OBP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Kies asseblief bondels vir batch item
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Kies asseblief bondels vir batch item
 DocType: Asset,Depreciation Schedules,Waardeverminderingskedules
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Aansoek tydperk kan nie buite verlof toekenning tydperk
 DocType: Activity Cost,Projects,projekte
@@ -1534,7 +1564,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',Goedkeuringsstatus moet &#39;Goedgekeur&#39; of &#39;Afgekeur&#39; wees
 DocType: Physician,Contacts and Address,Kontakte en adres
 DocType: Purchase Invoice,Contact Person,Kontak persoon
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&#39;Verwagte begin datum&#39; kan nie groter wees as &#39;Verwagte einddatum&#39; nie
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&#39;Verwagte begin datum&#39; kan nie groter wees as &#39;Verwagte einddatum&#39; nie
 DocType: Course Scheduling Tool,Course End Date,Kursus Einddatum
 DocType: Holiday List,Holidays,vakansies
 DocType: Sales Order Item,Planned Quantity,Beplande hoeveelheid
@@ -1542,10 +1572,11 @@
 DocType: Item,Maintain Stock,Onderhou Voorraad
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Voorraadinskrywings wat reeds vir Produksie Orde geskep is
 DocType: Employee,Prefered Email,Voorkeur-e-pos
+DocType: Student Admission,Eligibility and Details,Geskiktheid en besonderhede
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Netto verandering in vaste bate
 DocType: Leave Control Panel,Leave blank if considered for all designations,Los leeg as dit oorweeg word vir alle benamings
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Heffing van tipe &#39;Werklik&#39; in ry {0} kan nie in Item Rate ingesluit word nie
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Maks: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Maks: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Vanaf Datetime
 DocType: Email Digest,For Company,Vir Maatskappy
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikasie-logboek.
@@ -1553,19 +1584,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Verskaffer Scorecard Scoring Variable
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Koopbedrag
 DocType: Sales Invoice,Shipping Address Name,Posadres
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Grafiek van rekeninge
 DocType: Material Request,Terms and Conditions Content,Terme en voorwaardes Inhoud
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,kan nie groter as 100 wees nie
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Item {0} is nie &#39;n voorraaditem nie
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Item {0} is nie &#39;n voorraaditem nie
 DocType: Maintenance Visit,Unscheduled,ongeskeduleerde
 DocType: Employee,Owned,Owned
 DocType: Salary Detail,Depends on Leave Without Pay,Hang af op verlof sonder betaling
 DocType: Pricing Rule,"Higher the number, higher the priority","Hoe hoër die getal, hoe hoër die prioriteit"
 ,Purchase Invoice Trends,Aankoop faktuur neigings
 DocType: Employee,Better Prospects,Beter vooruitsigte
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Ry # {0}: Die bondel {1} het slegs {2} aantal. Kies asseblief nog &#39;n bondel wat {3} aantal beskik of verdeel die ry in veelvoudige rye, om te lewer / uit te voer uit veelvuldige bondels"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Ry # {0}: Die bondel {1} het slegs {2} aantal. Kies asseblief nog &#39;n bondel wat {3} aantal beskik of verdeel die ry in veelvoudige rye, om te lewer / uit te voer uit veelvuldige bondels"
 DocType: Vehicle,License Plate,Lisensiebord
 DocType: Appraisal,Goals,Doelwitte
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Kies POS-profiel
 DocType: Warranty Claim,Warranty / AMC Status,Garantie / AMC Status
 ,Accounts Browser,Rekeninge Browser
 DocType: Payment Entry Reference,Payment Entry Reference,Betaling Inskrywingsverwysing
@@ -1583,7 +1614,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Werknemer kan nie aan homself rapporteer nie.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","As die rekening gevries is, is inskrywings toegelaat vir beperkte gebruikers."
 DocType: Email Digest,Bank Balance,Bankbalans
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Rekeningkundige Inskrywing vir {0}: {1} kan slegs in valuta gemaak word: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Rekeningkundige Inskrywing vir {0}: {1} kan slegs in valuta gemaak word: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Werkprofiel, kwalifikasies benodig ens."
 DocType: Journal Entry Account,Account Balance,Rekening balans
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Belastingreël vir transaksies.
@@ -1592,8 +1623,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Totale Belasting en Heffings (Maatskappy Geld)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Toon onverbonde fiskale jaar se P &amp; L saldo&#39;s
 DocType: Lab Test Template,Collection Details,Versamelingsbesonderhede
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","kies cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date van tabConsultation ct, `tabLab Prescription` cp waar ct.patient = &#39;{0}&#39; en cp.parent = ct. naam en cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Posbus
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Rekening {2} is onaktief
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Maak verkoopsbestellings om jou te help om jou werk te beplan en betyds te lewer
@@ -1610,7 +1639,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Packing Slip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Kantoorhuur
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Opstel SMS gateway instellings
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Invoer misluk!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Invoer misluk!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Nog geen adres bygevoeg nie.
 DocType: Workstation Working Hour,Workstation Working Hour,Werkstasie Werksuur
 DocType: Vital Signs,Blood Pressure,Bloeddruk
@@ -1635,7 +1664,7 @@
 DocType: Sales Invoice,Source,Bron
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Wys gesluit
 DocType: Leave Type,Is Leave Without Pay,Is Leave Without Pay
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Bate-kategorie is verpligtend vir vaste bate-item
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Bate-kategorie is verpligtend vir vaste bate-item
 DocType: Fee Validity,Fee Validity,Fooi Geldigheid
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Geen rekords gevind in die betalingstabel nie
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Hierdie {0} bots met {1} vir {2} {3}
@@ -1656,8 +1685,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Uitvoerende soektog
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Skep Lei
 DocType: Maintenance Schedule,Schedules,skedules
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,POS-profiel is nodig om Punt van Verkope te gebruik
 DocType: Purchase Invoice Item,Net Amount,Netto bedrag
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} is nie ingedien nie, sodat die aksie nie voltooi kan word nie"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} is nie ingedien nie, sodat die aksie nie voltooi kan word nie"
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail No
 DocType: Landed Cost Voucher,Additional Charges,Bykomende heffings
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Addisionele Kortingsbedrag (Maatskappy Geld)
@@ -1666,7 +1696,7 @@
 ,Support Hour Distribution,Ondersteuning Uurverspreiding
 DocType: Maintenance Visit,Maintenance Visit,Onderhoud Besoek
 DocType: Student,Leaving Certificate Number,Verlaat Sertifikaatnommer
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Aanstelling gekanselleer, hersien en kanselleer die faktuur {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Aanstelling gekanselleer, hersien en kanselleer die faktuur {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Beskikbare joernaal by Warehouse
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Dateer afdrukformaat op
 DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Help
@@ -1689,8 +1719,8 @@
 DocType: Patient,Tobacco Past Use,Tabak verleden gebruik
 DocType: Sales Invoice Item,Brand Name,Handelsnaam
 DocType: Purchase Receipt,Transporter Details,Vervoerder besonderhede
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Gebruiker {0} is reeds aan Geneesheer toegewys {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Standaard pakhuis is nodig vir geselekteerde item
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Gebruiker {0} is reeds aan Geneesheer toegewys {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Standaard pakhuis is nodig vir geselekteerde item
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Boks
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,Moontlike Verskaffer
 DocType: Budget,Monthly Distribution,Maandelikse Verspreiding
@@ -1700,7 +1730,7 @@
 DocType: Sales Partner,Sales Partner Target,Verkoopsvennoteiken
 DocType: Loan Type,Maximum Loan Amount,Maksimum leningsbedrag
 DocType: Pricing Rule,Pricing Rule,Prysreël
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Duplikaatrolnommer vir student {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Duplikaatrolnommer vir student {0}
 DocType: Budget,Action if Annual Budget Exceeded,Aksie indien jaarlikse begroting oorskry
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Materiaal Versoek om aankoop bestelling
 DocType: Shopping Cart Settings,Payment Success URL,Betaal Sukses-URL
@@ -1717,7 +1747,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} moet net een keer verskyn
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nie toegelaat om meer {0} as {1} teen aankooporder te verplaas nie {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Blare suksesvol toegeken vir {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Geen items om te pak nie
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Geen items om te pak nie
 DocType: Shipping Rule Condition,From Value,Uit Waarde
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Vervaardiging Hoeveelheid is verpligtend
 DocType: Employee Loan,Repayment Method,Terugbetaling Metode
@@ -1731,6 +1761,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Aandeleverpligtinge
 DocType: Purchase Invoice,Supplier Warehouse,Verskaffer Pakhuis
 DocType: Opportunity,Contact Mobile No,Kontak Mobielnr
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Kies Maatskappy
 ,Material Requests for which Supplier Quotations are not created,Materiële Versoeke waarvoor Verskaffer Kwotasies nie geskep word nie
 DocType: Student Group,Set 0 for no limit,Stel 0 vir geen limiet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Die dag (en) waarop u aansoek doen om verlof, is vakansiedae. Jy hoef nie aansoek te doen vir verlof nie."
@@ -1740,23 +1771,23 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Maak aanhaling
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Ander verslae
 DocType: Dependent Task,Dependent Task,Afhanklike taak
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Omskakelingsfaktor vir verstek Eenheid van maatstaf moet 1 in ry {0} wees.
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Omskakelingsfaktor vir verstek Eenheid van maatstaf moet 1 in ry {0} wees.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Verlof van tipe {0} kan nie langer wees as {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Probeer beplanningsaktiwiteite vir X dae van vooraf.
 DocType: HR Settings,Stop Birthday Reminders,Stop verjaardag herinnerings
 DocType: SMS Center,Receiver List,Ontvanger Lys
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Soek item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Soek item
 DocType: Patient Appointment,Referring Physician,Verwysende geneesheer
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Verbruik Bedrag
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Netto verandering in kontant
 DocType: Assessment Plan,Grading Scale,Graderingskaal
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Eenheid van maat {0} is meer as een keer in die Faktor Tabel ingevoer
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,Reeds afgehandel
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Eenheid van maat {0} is meer as een keer in die Faktor Tabel ingevoer
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,Reeds afgehandel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Voorraad in die hand
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Betaling Versoek bestaan reeds {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Koste van uitgereikte items
 DocType: Physician,Hospital,hospitaal
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Hoeveelheid moet nie meer wees as {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Hoeveelheid moet nie meer wees as {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Vorige finansiële jaar is nie gesluit nie
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Ouderdom (Dae)
 DocType: Quotation Item,Quotation Item,Kwotasie Item
@@ -1767,8 +1798,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Verskaffer Tipe meester.
 DocType: Purchase Order Item,Supplier Part Number,Verskaffer artikel nommer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Gesprek koers kan nie 0 of 1 wees nie
-DocType: Sales Invoice,Reference Document,Verwysingsdokument
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} is gekanselleer of gestop
+DocType: Subscription,Reference Document,Verwysingsdokument
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} is gekanselleer of gestop
 DocType: Accounts Settings,Credit Controller,Kredietbeheerder
 DocType: Delivery Note,Vehicle Dispatch Date,Voertuig Versending Datum
 DocType: Healthcare Settings,Default Medical Code Standard,Standaard Mediese Kode Standaard
@@ -1777,6 +1808,7 @@
 DocType: Company,Default Payable Account,Verstekbetaalbare rekening
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Instellings vir aanlyn-inkopies soos die versendingsreëls, pryslys ens."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% gefaktureer
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Sorteer volgens prys ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Gereserveerde hoeveelheid
 DocType: Party Account,Party Account,Partyrekening
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Menslike hulpbronne
@@ -1788,13 +1820,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Maak uitbetalinginskrywing
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Ry {0}: Voorskot teen Verskaffer moet debiet wees
 DocType: Company,Default Values,Verstekwaardes
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,(frekwensie) verteer
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,(frekwensie) verteer
 DocType: Expense Claim,Total Amount Reimbursed,Totale Bedrag vergoed
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Dit is gebaseer op logs teen hierdie Voertuig. Sien die tydlyn hieronder vir besonderhede
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Teen Verskafferfaktuur {0} gedateer {1}
 DocType: Customer,Default Price List,Standaard pryslys
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Bate Beweging rekord {0} geskep
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,U kan nie fiskale jaar {0} uitvee nie. Fiskale jaar {0} word as verstek in Globale instellings gestel
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Daar bestaan reeds &#39;n kliënt met dieselfde naam
 DocType: Journal Entry,Entry Type,Inskrywingstipe
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Geen assesseringsplan gekoppel aan hierdie assesseringsgroep nie
 ,Customer Credit Balance,Krediet Krediet Saldo
@@ -1804,7 +1837,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,pryse
 DocType: Quotation,Term Details,Termyn Besonderhede
 DocType: Project,Total Sales Cost (via Sales Order),Totale verkoopskoste (via verkoopsbestelling)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Kan nie meer as {0} studente vir hierdie studente groep inskryf nie.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Kan nie meer as {0} studente vir hierdie studente groep inskryf nie.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Loodtelling
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} moet groter as 0 wees
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapasiteitsbeplanning vir (Dae)
@@ -1820,9 +1853,11 @@
 DocType: Lab Test,Technician Name,Tegnikus Naam
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Ontkoppel betaling met kansellasie van faktuur
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Huidige Odometer lees ingevoer moet groter wees as die aanvanklike voertuig odometer {0}
+DocType: Restaurant Reservation,No Show,Geen vertoning
 DocType: Shipping Rule Country,Shipping Rule Country,Poslys Land
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Verlof en Bywoning
 DocType: Maintenance Visit,Partially Completed,Gedeeltelik voltooi
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Matige Sensitiwiteit
 DocType: Leave Type,Include holidays within leaves as leaves,Sluit vakansiedae in blare in as blare
 DocType: Sales Invoice,Packed Items,Gepakte items
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Waarborg Eis teen Serienommer
@@ -1839,13 +1874,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Betaalbedrag (Maatskappy Geld)
 DocType: Purchase Invoice,Additional Discount,Bykomende afslag
 DocType: Selling Settings,Selling Settings,Verkoop instellings
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Bevestig Aksie
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Aanlyn veilings
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Spesifiseer asb. Hoeveelheid of Waardasietempo of albei
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,vervulling
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Kyk in die winkelwagen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Bemarkingsuitgawes
 ,Item Shortage Report,Item kortverslag
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Gewig word genoem, \ nBelang ook &quot;Gewig UOM&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Gewig word genoem, \ nBelang ook &quot;Gewig UOM&quot;"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiaal Versoek gebruik om hierdie Voorraadinskrywing te maak
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Volgende Depresiasie Datum is verpligtend vir nuwe bate
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Afsonderlike kursusgebaseerde groep vir elke groep
@@ -1857,12 +1893,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Maak Rekeningkundige Inskrywing Vir Elke Voorraadbeweging
 DocType: Leave Allocation,Total Leaves Allocated,Totale blare toegeken
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Pakhuis benodig by ry nr {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Voer asseblief geldige finansiële jaar se begin- en einddatums in
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Voer asseblief geldige finansiële jaar se begin- en einddatums in
 DocType: Employee,Date Of Retirement,Datum van aftrede
 DocType: Upload Attendance,Get Template,Kry Sjabloon
 DocType: Material Request,Transferred,oorgedra
 DocType: Vehicle,Doors,deure
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext Setup Complete!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Versamel fooi vir pasiëntregistrasie
 DocType: Course Assessment Criteria,Weightage,weightage
 DocType: Purchase Invoice,Tax Breakup,Belastingafskrywing
@@ -1881,36 +1917,36 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","As hierdie item variante het, kan dit nie in verkoopsorders ens gekies word nie."
 DocType: Lead,Next Contact By,Volgende kontak deur
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Hoeveelheid benodig vir item {0} in ry {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Hoeveelheid benodig vir item {0} in ry {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},"Pakhuis {0} kan nie uitgevee word nie, aangesien die hoeveelheid vir item {1} bestaan"
 DocType: Quotation,Order Type,Bestelling Tipe
-DocType: Purchase Invoice,Notification Email Address,Kennisgewings-e-posadres
 ,Item-wise Sales Register,Item-wyse Verkope Register
 DocType: Asset,Gross Purchase Amount,Bruto aankoopbedrag
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Opening Saldo&#39;s
 DocType: Asset,Depreciation Method,Waardevermindering Metode
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,op die regte pad
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,op die regte pad
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Is hierdie belasting ingesluit in basiese tarief?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Totale teiken
 DocType: Job Applicant,Applicant for a Job,Aansoeker vir &#39;n werk
 DocType: Production Plan Material Request,Production Plan Material Request,Produksieplan Materiaal Versoek
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Geen Produksie Bestellings geskep nie
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Geen Produksie Bestellings geskep nie
 DocType: Stock Reconciliation,Reconciliation JSON,Versoening JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Te veel kolomme. Voer die verslag uit en druk dit uit met behulp van &#39;n sigbladprogram.
 DocType: Purchase Invoice Item,Batch No,Lotnommer
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Versoek vir kwotasie: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Laat meerdere verkope bestellings toe teen &#39;n kliënt se aankoopbestelling
 DocType: Student Group Instructor,Student Group Instructor,Studentegroepinstrukteur
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Main
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Main
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Stel voorvoegsel vir nommering van reekse op u transaksies
 DocType: Employee Attendance Tool,Employees HTML,Werknemers HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Standaard BOM ({0}) moet vir hierdie item of sy sjabloon aktief wees
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Standaard BOM ({0}) moet vir hierdie item of sy sjabloon aktief wees
 DocType: Employee,Leave Encashed?,Verlaten verlaat?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Geleentheid Van veld is verpligtend
 DocType: Email Digest,Annual Expenses,Jaarlikse uitgawes
 DocType: Item,Variants,variante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Maak &#39;n bestelling
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Maak &#39;n bestelling
 DocType: SMS Center,Send To,Stuur na
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Daar is nie genoeg verlofbalans vir Verlof-tipe {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Toegewysde bedrag
@@ -1926,6 +1962,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Studentegroep Sterkte
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Teen Joernaal Inskrywing {0} het geen ongeëwenaarde {1} inskrywing nie
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,evaluerings
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Opleidingsgebeure
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Duplikaatreeksnommer vir item {0} ingevoer
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,&#39;N Voorwaarde vir &#39;n verskepingsreël
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Kom asseblief in
@@ -1935,7 +1972,7 @@
 DocType: Sales Order,To Deliver and Bill,Om te lewer en rekening
 DocType: Student Group,Instructors,instrukteurs
 DocType: GL Entry,Credit Amount in Account Currency,Kredietbedrag in rekeninggeld
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} moet ingedien word
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} moet ingedien word
 DocType: Authorization Control,Authorization Control,Magtigingskontrole
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ry # {0}: Afgekeurde pakhuis is verpligtend teen verwerp item {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,betaling
@@ -1954,11 +1991,11 @@
 DocType: Quotation Item,Actual Qty,Werklike hoeveelheid
 DocType: Sales Invoice Item,References,verwysings
 DocType: Quality Inspection Reading,Reading 10,Lees 10
-DocType: Hub Settings,Hub Node,Hub Knoop
+DocType: Hub Category,Hub Node,Hub Knoop
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Jy het dubbele items ingevoer. Regstel asseblief en probeer weer.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Mede
 DocType: Asset Movement,Asset Movement,Batebeweging
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,Nuwe karretjie
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,Nuwe karretjie
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Item {0} is nie &#39;n seriële item nie
 DocType: SMS Center,Create Receiver List,Skep Ontvanger Lys
 DocType: Vehicle,Wheels,wiele
@@ -1972,15 +2009,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekommunikasie
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Dui aan dat die pakket deel van hierdie aflewering is (Slegs Konsep)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Maak betalinginskrywing
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Hoeveelheid vir item {0} moet minder wees as {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Hoeveelheid vir item {0} moet minder wees as {1}
 ,Sales Invoice Trends,Verkoopsfaktuur neigings
 DocType: Leave Application,Apply / Approve Leaves,Pas / keur Blare toe
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,vir
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,vir
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Kan slegs ry verwys as die lading tipe &#39;Op vorige rybedrag&#39; of &#39;Vorige ry totaal&#39; is
 DocType: Sales Order Item,Delivery Warehouse,Delivery Warehouse
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Boom van finansiële kostesentrums.
 DocType: Serial No,Delivery Document No,Afleweringsdokument No
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Stel asseblief &#39;Wins / Verliesrekening op Bateverkope&#39; in Maatskappy {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Stel asseblief &#39;Wins / Verliesrekening op Bateverkope&#39; in Maatskappy {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Kry Items Van Aankoop Ontvangste
 DocType: Serial No,Creation Date,Skeppingsdatum
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Item {0} verskyn verskeie kere in Pryslys {1}
@@ -1991,11 +2028,12 @@
 DocType: Student,Student Mobile Number,Student Mobiele Nommer
 DocType: Item,Has Variants,Het Varianten
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Update Response
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Jy het reeds items gekies van {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Jy het reeds items gekies van {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naam van die Maandelikse Verspreiding
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Lotnommer is verpligtend
 DocType: Sales Person,Parent Sales Person,Ouer Verkoopspersoon
-DocType: Purchase Invoice,Recurring Invoice,Herhalende faktuur
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Hoog na laag
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Kies die program eerste
 DocType: Patient Appointment,Patient Age,Pasiënt ouderdom
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Bestuur van projekte
 DocType: Supplier,Supplier of Goods or Services.,Verskaffer van goedere of dienste.
@@ -2003,8 +2041,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Verstek ontvangbare rekeninge wat gebruik moet word indien dit nie in Pasiënt gestel word nie. Konsultasiekoste.
 DocType: Vehicle Log,Fuel Price,Brandstofprys
 DocType: Budget,Budget,begroting
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Stel oop
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Vaste bate-item moet &#39;n nie-voorraaditem wees.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Stel oop
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Vaste bate-item moet &#39;n nie-voorraaditem wees.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Begroting kan nie teen {0} toegewys word nie, aangesien dit nie &#39;n Inkomste- of Uitgawe-rekening is nie"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,bereik
 DocType: Student Admission,Application Form Route,Aansoekvorm Roete
@@ -2018,12 +2056,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Item {0} is nie opgestel vir Serial Nos. Check Item Master
 DocType: Maintenance Visit,Maintenance Time,Onderhoudstyd
 ,Amount to Deliver,Bedrag om te lewer
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Dieselfde item is verskeie kere ingevoer. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Die Termyn Aanvangsdatum kan nie vroeër wees as die Jaar Begindatum van die akademiese jaar waaraan die term gekoppel is nie (Akademiese Jaar ()). Korrigeer asseblief die datums en probeer weer.
 DocType: Guardian,Guardian Interests,Voogbelange
 DocType: Naming Series,Current Value,Huidige waarde
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Verskeie fiskale jare bestaan vir die datum {0}. Stel asseblief die maatskappy in die fiskale jaar
 DocType: School Settings,Instructor Records to be created by,Instrukteur Rekords wat geskep moet word deur
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} geskep
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} geskep
 DocType: Delivery Note Item,Against Sales Order,Teen verkoopsbestelling
 ,Serial No Status,Serial No Status
 DocType: Payment Entry Reference,Outstanding,uitstaande
@@ -2033,10 +2072,10 @@
 						must be greater than or equal to {2}","Ry {0}: Om {1} periodicity te stel, moet die verskil tussen van en tot datum \ groter wees as of gelyk aan {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Dit is gebaseer op voorraadbeweging. Sien {0} vir besonderhede
 DocType: Pricing Rule,Selling,verkoop
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Bedrag {0} {1} afgetrek teen {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Bedrag {0} {1} afgetrek teen {2}
 DocType: Employee,Salary Information,Salarisinligting
 DocType: Sales Person,Name and Employee ID,Naam en Werknemer ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Betaaldatum kan nie voor die datum van inskrywing wees nie
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Betaaldatum kan nie voor die datum van inskrywing wees nie
 DocType: Website Item Group,Website Item Group,Webtuiste Itemgroep
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Pligte en Belastings
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Voer asseblief Verwysingsdatum in
@@ -2062,7 +2101,7 @@
 DocType: Issue,Resolution Details,Besluit Besonderhede
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,toekennings
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Aanvaarding kriteria
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Vul asseblief die Materiaal Versoeke in die tabel hierbo in
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Vul asseblief die Materiaal Versoeke in die tabel hierbo in
 DocType: Item Attribute,Attribute Name,Eienskap Naam
 DocType: BOM,Show In Website,Wys op die webwerf
 DocType: Shopping Cart Settings,Show Quantity in Website,Wys hoeveelheid in die webwerf
@@ -2071,7 +2110,7 @@
 DocType: Item Reorder,Check in (group),Check in (groep)
 ,Qty to Order,Hoeveelheid om te bestel
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Die rekeningkop onder aanspreeklikheid of ekwiteit, waarin wins / verlies bespreek sal word"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Gantt-grafiek van alle take.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Gantt-grafiek van alle take.
 DocType: Opportunity,Mins to First Response,Mins to First Response
 DocType: Pricing Rule,Margin Type,Marg Type
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} uur
@@ -2092,35 +2131,35 @@
 DocType: Patient,Surgical History,Chirurgiese Geskiedenis
 DocType: Employee,Resignation Letter Date,Bedankingsbrief Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Prysreëls word verder gefiltreer op grond van hoeveelheid.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Stel asseblief die datum van aansluiting vir werknemer {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Stel asseblief die datum van aansluiting vir werknemer {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Totale faktuurbedrag (via tydblad)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Herhaal kliëntinkomste
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) moet &#39;Expense Approver&#39; hê.
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Paar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Kies BOM en hoeveelheid vir produksie
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Kies BOM en hoeveelheid vir produksie
 DocType: Asset,Depreciation Schedule,Waardeverminderingskedule
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Verkope Partner Adresse en Kontakte
 DocType: Bank Reconciliation Detail,Against Account,Teen rekening
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Halfdag Datum moet tussen datum en datum wees
 DocType: Maintenance Schedule Detail,Actual Date,Werklike Datum
 DocType: Item,Has Batch No,Het lotnommer
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Jaarlikse faktuur: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Jaarlikse faktuur: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Goedere en Dienste Belasting (GST India)
 DocType: Delivery Note,Excise Page Number,Aksyns Bladsy Nommer
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Maatskappy, vanaf datum en datum is verpligtend"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Kry uit konsultasie
 DocType: Asset,Purchase Date,Aankoop datum
 DocType: Employee,Personal Details,Persoonlike inligting
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Stel asseblief &#39;Bate Waardevermindering Kostesentrum&#39; in Maatskappy {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Stel asseblief &#39;Bate Waardevermindering Kostesentrum&#39; in Maatskappy {0}
 ,Maintenance Schedules,Onderhoudskedules
 DocType: Task,Actual End Date (via Time Sheet),Werklike Einddatum (via Tydblad)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Bedrag {0} {1} teen {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Bedrag {0} {1} teen {2} {3}
 ,Quotation Trends,Aanhalingstendense
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Itemgroep nie genoem in itemmeester vir item {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Debiet Vir rekening moet &#39;n Ontvangbare rekening wees
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Debiet Vir rekening moet &#39;n Ontvangbare rekening wees
 DocType: Shipping Rule Condition,Shipping Amount,Posgeld
 DocType: Supplier Scorecard Period,Period Score,Periode telling
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Voeg kliënte by
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Voeg kliënte by
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Hangende bedrag
 DocType: Lab Test Template,Special,spesiale
 DocType: Purchase Invoice Item,Conversion Factor,Gesprekfaktor
@@ -2128,13 +2167,14 @@
 ,Vehicle Expenses,Voertuiguitgawes
 DocType: Serial No,Invoice Details,Faktuur besonderhede
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Verwagte waarde na nuttige lewensduur moet groter as of gelyk wees aan {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Begin aan
+DocType: Hub Category,Hub Category,Hub Kategorie
 DocType: Purchase Invoice,SEZ,Sez
 DocType: Purchase Receipt,Vehicle Number,Voertuignommer
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,Die datum waarop &#39;n herhalende faktuur sal stop
 DocType: Employee Loan,Loan Amount,Leningsbedrag
 DocType: Program Enrollment,Self-Driving Vehicle,Selfritvoertuig
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Verskaffer Scorecard Standing
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Ry {0}: Rekening van materiaal wat nie vir die item {1} gevind is nie.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Ry {0}: Rekening van materiaal wat nie vir die item {1} gevind is nie.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Totale toegekende blare {0} kan nie minder wees as reeds goedgekeurde blare {1} vir die tydperk nie
 DocType: Journal Entry,Accounts Receivable,Rekeninge ontvangbaar
 ,Supplier-Wise Sales Analytics,Verskaffer-Wise Sales Analytics
@@ -2145,7 +2185,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Ouerkursus (los leeg, indien dit nie deel is van die Ouerkursus nie)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Los leeg indien oorweeg word vir alle werknemer tipes
 DocType: Landed Cost Voucher,Distribute Charges Based On,Versprei koste gebaseer op
-apps/erpnext/erpnext/hooks.py +131,Timesheets,roosters
+apps/erpnext/erpnext/hooks.py +140,Timesheets,roosters
 DocType: HR Settings,HR Settings,HR instellings
 DocType: Salary Slip,net pay info,netto betaalinligting
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Hierdie waarde word opgedateer in die verstekverkooppryslys.
@@ -2156,7 +2196,7 @@
 DocType: Patient,B Positive,B Positief
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ry # {0}: Hoeveelheid moet 1 wees, aangesien item &#39;n vaste bate is. Gebruik asseblief aparte ry vir veelvuldige aantal."
 DocType: Leave Block List Allow,Leave Block List Allow,Laat blokblokkering toe
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr kan nie leeg of spasie wees nie
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr kan nie leeg of spasie wees nie
 DocType: Patient Medical Record,Patient Medical Record,Pasiënt Mediese Rekord
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Groep na Nie-Groep
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
@@ -2172,9 +2212,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Kan wisselkoers vir {0} tot {1} nie vind vir sleuteldatum {2}. Maak asseblief &#39;n Geldruilrekord handmatig
 DocType: POS Profile,Price List,Pryslys
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} is nou die standaard fiskale jaar. Herlaai asseblief u blaaier voordat die verandering in werking tree.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Uitgawe Eise
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Uitgawe Eise
 DocType: Issue,Support,ondersteuning
 ,BOM Search,BOM Soek
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Publiseer &quot;In voorraad&quot; of &quot;Nie in voorraad nie&quot; op Hub gebaseer op voorraad beskikbaar in hierdie pakhuis.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Sluiting (Opening + Totale)
 DocType: Vehicle,Fuel Type,Brandstoftipe
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Spesifiseer asseblief geldeenheid in die Maatskappy
@@ -2186,16 +2227,16 @@
 DocType: Healthcare Settings,Remind Before,Herinner Voor
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM Gespreksfaktor word benodig in ry {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Ry # {0}: Verwysingsdokumenttipe moet een van verkoopsbestelling, verkoopsfaktuur of tydskrifinskrywing wees"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Ry # {0}: Verwysingsdokumenttipe moet een van verkoopsbestelling, verkoopsfaktuur of tydskrifinskrywing wees"
 DocType: Salary Component,Deduction,aftrekking
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Ry {0}: Van tyd tot tyd is verpligtend.
 DocType: Stock Reconciliation Item,Amount Difference,Bedrag Verskil
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Itemprys bygevoeg vir {0} in Pryslys {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Itemprys bygevoeg vir {0} in Pryslys {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Voer asseblief die werknemer se ID van hierdie verkoopspersoon in
 DocType: Territory,Classification of Customers by region,Klassifikasie van kliënte volgens streek
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Verskilbedrag moet nul wees
 DocType: Project,Gross Margin,Bruto Marge
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Voer asseblief Produksie-item eerste in
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Voer asseblief Produksie-item eerste in
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Berekende Bankstaatbalans
 DocType: Normal Test Template,Normal Test Template,Normale toets sjabloon
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,gestremde gebruiker
@@ -2205,21 +2246,22 @@
 DocType: Salary Slip,Total Deduction,Totale aftrekking
 ,Production Analytics,Produksie Analytics
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Dit is gebaseer op transaksies teen hierdie pasiënt. Sien die tydlyn hieronder vir besonderhede
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Koste opgedateer
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Koste opgedateer
 DocType: Employee,Date of Birth,Geboortedatum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Item {0} is reeds teruggestuur
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiskale Jaar ** verteenwoordig &#39;n finansiële jaar. Alle rekeningkundige inskrywings en ander belangrike transaksies word opgespoor teen ** Fiskale Jaar **.
 DocType: Opportunity,Customer / Lead Address,Kliënt / Loodadres
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Verskaffer Scorecard Setup
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Waarskuwing: Ongeldige SSL-sertifikaat op aanhangsel {0}
-DocType: Student Admission,Eligibility,In aanmerking te kom
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Assesseringsplan Naam
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Waarskuwing: Ongeldige SSL-sertifikaat op aanhangsel {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Leiers help om sake te doen, voeg al jou kontakte en meer as jou leidrade by"
 DocType: Production Order Operation,Actual Operation Time,Werklike operasietyd
 DocType: Authorization Rule,Applicable To (User),Toepaslik op (Gebruiker)
 DocType: Purchase Taxes and Charges,Deduct,aftrek
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Pos beskrywing
 DocType: Student Applicant,Applied,Toegepaste
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Heropen
 DocType: Sales Invoice Item,Qty as per Stock UOM,Aantal per Voorraad UOM
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 Naam
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Spesiale karakters behalwe &quot;-&quot;, &quot;#&quot;, &quot;.&quot; en &quot;/&quot; word nie toegelaat in die benoeming van reekse nie"
@@ -2231,7 +2273,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Vervaardiging Bestuurder
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Volgnummer {0} is onder garantie tot en met {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Verdeel afleweringsnota in pakkette.
-apps/erpnext/erpnext/hooks.py +98,Shipments,verskepings
+apps/erpnext/erpnext/hooks.py +107,Shipments,verskepings
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Totale toegewysde bedrag (Maatskappy Geld)
 DocType: Purchase Order Item,To be delivered to customer,Om aan kliënt gelewer te word
 DocType: BOM,Scrap Material Cost,Skrootmateriaal Koste
@@ -2253,8 +2295,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Item Variant instellings
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Kies Maatskappy ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Los leeg indien oorweeg vir alle departemente
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Soorte indiensneming (permanent, kontrak, intern ens.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} is verpligtend vir item {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Soorte indiensneming (permanent, kontrak, intern ens.)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} is verpligtend vir item {1}
 DocType: Process Payroll,Fortnightly,tweeweeklikse
 DocType: Currency Exchange,From Currency,Van Geld
 DocType: Vital Signs,Weight (In Kilogram),Gewig (In Kilogram)
@@ -2278,7 +2320,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Klik asseblief op &#39;Generate Schedule&#39; om skedule te kry
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Daar was foute tydens die skrapping van die volgende skedules:
 DocType: Bin,Ordered Quantity,Bestelde Hoeveelheid
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",bv. &quot;Bou gereedskap vir bouers&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",bv. &quot;Bou gereedskap vir bouers&quot;
 DocType: Grading Scale,Grading Scale Intervals,Graderingskaalintervalle
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Rekeningkundige Inskrywing vir {2} kan slegs in valuta gemaak word: {3}
 DocType: Production Order,In Process,In proses
@@ -2301,11 +2343,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Met betaling van belasting
 DocType: Expense Claim Detail,Expense Claim Detail,Koste eis Detail
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLIKAAT VIR VERSKAFFER
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Kies asseblief die korrekte rekening
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Kies asseblief die korrekte rekening
 DocType: Item,Weight UOM,Gewig UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Salarisstruktuur Werknemer
 DocType: Patient,Blood Group,Bloedgroep
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,hangende
 DocType: Course,Course Name,Kursus naam
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Gebruikers wat &#39;n spesifieke werknemer se verlof aansoeke kan goedkeur
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Kantoor Uitrustingen
@@ -2324,7 +2365,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Pryse sal nie getoon word indien Pryslys nie vasgestel is nie
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Spesifiseer asseblief &#39;n land vir hierdie verskepingsreël of tjek wêreldwyd verskeping
 DocType: Stock Entry,Total Incoming Value,Totale Inkomende Waarde
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Debiet na is nodig
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Debiet na is nodig
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Tydskrifte help om tred te hou met tyd, koste en faktuur vir aktiwiteite wat deur u span gedoen is"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Aankooppryslys
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Templates van verskaffers telkaart veranderlikes.
@@ -2334,7 +2375,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Betaalversoening
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Kies asseblief Incharge Persoon se naam
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tegnologie
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Totaal Onbetaald: {0}
+DocType: Hub Settings,Unregister from Hub,Ontteken van Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Totaal Onbetaald: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Website Operasie
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Aanbod brief
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Genereer Materiaal Versoeke (MRP) en Produksie Bestellings.
@@ -2346,7 +2388,9 @@
 DocType: Physician Schedule Time Slot,To Time,Tot tyd
 DocType: Authorization Rule,Approving Role (above authorized value),Goedkeurende rol (bo gemagtigde waarde)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Krediet Vir rekening moet &#39;n betaalbare rekening wees
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} kan nie ouer of kind van {2} wees nie
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Kies asseblief Studentetoelating wat verpligtend is vir die betaalde studenteversoeker
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} kan nie ouer of kind van {2} wees nie
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Kies asseblief &#39;n Pryslys om pryse te publiseer
 DocType: Production Order Operation,Completed Qty,Voltooide aantal
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",Vir {0} kan slegs debietrekeninge gekoppel word teen &#39;n ander kredietinskrywing
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Pryslys {0} is gedeaktiveer
@@ -2358,36 +2402,38 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Reeksnommers benodig vir Item {1}. U het {2} verskaf.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Huidige Waardasietarief
 DocType: Item,Customer Item Codes,Kliënt Item Kodes
+DocType: Training Event,Advance,bevorder
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,om weer terug te keer.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Uitruil wins / verlies
 DocType: Opportunity,Lost Reason,Verlore Rede
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nuwe adres
 DocType: Quality Inspection,Sample Size,Steekproefgrootte
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Vul asseblief die kwitansie dokument in
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Al die items is reeds gefaktureer
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Spesifiseer asseblief &#39;n geldige &#39;From Case No.&#39;
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',Spesifiseer asseblief &#39;n geldige &#39;From Case No.&#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Verdere kostepunte kan onder Groepe gemaak word, maar inskrywings kan gemaak word teen nie-groepe"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Gebruikers en toestemmings
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Produksie bestellings gemaak: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Produksie bestellings gemaak: {0}
 DocType: Branch,Branch,tak
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Druk en Branding
 DocType: Company,Total Monthly Sales,Totale maandelikse verkope
 DocType: Bin,Actual Quantity,Werklike Hoeveelheid
 DocType: Shipping Rule,example: Next Day Shipping,Voorbeeld: Volgende Dag Pos
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Rekeningnommer {0} nie gevind nie
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Intekening is {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Intekening is {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Fooiskedule Program
 DocType: Fee Schedule Program,Student Batch,Studentejoernaal
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,kies * van `tabVital Signs` waar pasiënt = &#39;{0}&#39; bestel deur signs_date desc limit 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Maak Student
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Min Graad
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},U is genooi om saam te werk aan die projek: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Dokter nie beskikbaar op {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},U is genooi om saam te werk aan die projek: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Dokter nie beskikbaar op {0}
 DocType: Leave Block List Date,Block Date,Blok Datum
 DocType: Purchase Receipt,Supplier Delivery Note,Verskaffer Delivery Nota
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Doen nou aansoek
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Doen nou aansoek
 DocType: Purchase Invoice,E-commerce GSTIN,E-commerce GSTIN
 DocType: Sales Order,Not Delivered,Nie afgelewer nie
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Verwagte datum kan nie voor transaksiedatum wees nie
 ,Bank Clearance Summary,Bank Opruimingsopsomming
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Skep en bestuur daaglikse, weeklikse en maandelikse e-posverdelings."
 DocType: Appraisal Goal,Appraisal Goal,Evalueringsdoel
@@ -2395,12 +2441,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,geboue
 DocType: Fee Schedule,Fee Structure,Fooistruktuur
 DocType: Timesheet Detail,Costing Amount,Kosteberekening
-DocType: Student Admission,Application Fee,Aansoek fooi
+DocType: Student Admission Program,Application Fee,Aansoek fooi
 DocType: Process Payroll,Submit Salary Slip,Dien Salarisstrokie in
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maxiumm afslag vir Item {0} is {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Maxiumm afslag vir Item {0} is {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Invoer in grootmaat
 DocType: Sales Partner,Address & Contacts,Adres &amp; Kontakte
 DocType: SMS Log,Sender Name,Sender Naam
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Sorteer volgens Kriteria
 DocType: POS Profile,[Select],[Kies]
 DocType: Vital Signs,Blood Pressure (diastolic),Bloeddruk (diastoliese)
 DocType: SMS Log,Sent To,Gestuur na
@@ -2409,7 +2456,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Volgende kontak datum kan nie in die verlede wees nie
 DocType: Company,For Reference Only.,Slegs vir verwysing.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Geneesheer {0} nie beskikbaar op {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Kies lotnommer
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Kies lotnommer
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ongeldige {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,Verwysings Inv
@@ -2425,15 +2472,15 @@
 DocType: Normal Test Items,Require Result Value,Vereis Resultaatwaarde
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Saaknommer kan nie 0 wees nie
 DocType: Item,Show a slideshow at the top of the page,Wys &#39;n skyfievertoning bo-aan die bladsy
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,BOMs
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,winkels
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,BOMs
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,winkels
 DocType: Project Type,Projects Manager,Projekbestuurder
 DocType: Serial No,Delivery Time,Afleweringstyd
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Veroudering gebaseer op
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Aanstelling gekanselleer
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Aanstelling gekanselleer
 DocType: Item,End of Life,Einde van die lewe
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Reis
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Geen aktiewe of standaard Salarestruktuur vir werknemer {0} vir die gegewe datums gevind nie
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Reis
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Geen aktiewe of standaard Salarestruktuur vir werknemer {0} vir die gegewe datums gevind nie
 DocType: Leave Block List,Allow Users,Laat gebruikers toe
 DocType: Purchase Order,Customer Mobile No,Kliënt Mobiele Nr
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,herhalende
@@ -2442,12 +2489,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Dateer koste
 DocType: Item Reorder,Item Reorder,Item Herbestelling
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Toon Salary Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Oordragmateriaal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Oordragmateriaal
 DocType: Fees,Send Payment Request,Stuur betalingsversoek
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Spesifiseer die bedrywighede, bedryfskoste en gee &#39;n unieke operasie nee vir u bedrywighede."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Hierdie dokument is oor limiet deur {0} {1} vir item {4}. Maak jy &#39;n ander {3} teen dieselfde {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Stel asseblief herhaaldelik na die stoor
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Kies verander bedrag rekening
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Kies verander bedrag rekening
 DocType: Purchase Invoice,Price List Currency,Pryslys Geld
 DocType: Naming Series,User must always select,Gebruiker moet altyd kies
 DocType: Stock Settings,Allow Negative Stock,Laat negatiewe voorraad toe
@@ -2467,7 +2514,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,werknemer
 DocType: Sample Collection,Collected Time,Versamelde Tyd
 DocType: Company,Sales Monthly History,Verkope Maandelikse Geskiedenis
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Kies &#39;n bondel
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Kies &#39;n bondel
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} is ten volle gefaktureer
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Vital Signs
 DocType: Training Event,End Time,Eindtyd
@@ -2475,16 +2522,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Betaling aftrekkings of verlies
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standaardkontrakvoorwaardes vir Verkope of Aankope.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Groep per Voucher
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Is jy seker jy wil hierdie afspraak kanselleer?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Verkope Pyplyn
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Stel asseblief die verstek rekening in Salaris Komponent {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Vereis Aan
 DocType: Rename Tool,File to Rename,Lêer om hernoem te word
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Kies asseblief BOM vir item in ry {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Kies asseblief BOM vir item in ry {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Rekening {0} stem nie ooreen met Maatskappy {1} in rekeningmodus nie: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Spesifieke BOM {0} bestaan nie vir Item {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Onderhoudskedule {0} moet gekanselleer word voordat u hierdie verkooporder kanselleer
+DocType: POS Profile,Applicable for Users,Toepaslik vir gebruikers
 DocType: Notification Control,Expense Claim Approved,Koste-eis Goedgekeur
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Salaris Slip van werknemer {0} wat reeds vir hierdie tydperk geskep is
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Salaris Slip van werknemer {0} wat reeds vir hierdie tydperk geskep is
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,farmaseutiese
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Koste van gekoopte items
 DocType: Selling Settings,Sales Order Required,Verkope bestelling benodig
@@ -2508,6 +2557,7 @@
 DocType: Offer Letter,Accepted,aanvaar
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,organisasie
 DocType: BOM Update Tool,BOM Update Tool,BOM Update Tool
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Party rekening nie gespesifiseer nie, stel asseblief standaardpartytjie rekening in maatskappy"
 DocType: SG Creation Tool Course,Student Group Name,Student Groep Naam
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Fooie skep
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Maak asseblief seker dat u regtig alle transaksies vir hierdie maatskappy wil verwyder. Jou meesterdata sal bly soos dit is. Hierdie handeling kan nie ongedaan gemaak word nie.
@@ -2516,29 +2566,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kan nie groter wees as beplande quanitity ({2}) in Produksie Orde {3}
 DocType: Shipping Rule,Shipping Rule Label,Poslys van die skeepsreël
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Gebruikers Forum
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Grondstowwe kan nie leeg wees nie.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Kon nie voorraad opdateer nie, faktuur bevat druppelversending item."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Grondstowwe kan nie leeg wees nie.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Kon nie voorraad opdateer nie, faktuur bevat druppelversending item."
 DocType: Lab Test Sample,Lab Test Sample,Lab Test Voorbeeld
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Vinnige Blaar Inskrywing
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,U kan nie koers verander as BOM enige item genoem het nie
+DocType: Restaurant,Invoice Series Prefix,Faktuurreeksvoorvoegsel
 DocType: Employee,Previous Work Experience,Vorige werkservaring
 DocType: Stock Entry,For Quantity,Vir Hoeveelheid
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Tik asseblief Beplande hoeveelheid vir item {0} by ry {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Tik asseblief Beplande hoeveelheid vir item {0} by ry {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} is nie ingedien nie
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Versoeke vir items.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Afsonderlike produksie bestelling sal geskep word vir elke voltooide goeie item.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} moet negatief wees in ruil dokument
 ,Minutes to First Response for Issues,Notules tot eerste antwoord vir kwessies
 DocType: Purchase Invoice,Terms and Conditions1,Terme en Voorwaardes1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,Die naam van die instituut waarvoor u hierdie stelsel opstel.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,Die naam van die instituut waarvoor u hierdie stelsel opstel.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Rekeningkundige inskrywing wat tot op hierdie datum gevries is, kan niemand toelaat / verander nie, behalwe die rol wat hieronder gespesifiseer word."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Stoor asseblief die dokument voordat u die onderhoudskedule oprig
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Laaste prys opgedateer in alle BOM&#39;s
 DocType: Fee Schedule,Successful,Suksesvol
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projek Status
 DocType: UOM,Check this to disallow fractions. (for Nos),Kontroleer dit om breuke te ontbreek. (vir Nos)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Die volgende Produksie Bestellings is geskep:
-DocType: Student Admission,Naming Series (for Student Applicant),Naming Series (vir Studente Aansoeker)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Die volgende Produksie Bestellings is geskep:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Naming Series (vir Studente Aansoeker)
 DocType: Delivery Note,Transporter Name,Vervoerder Naam
 DocType: Authorization Rule,Authorized Value,Gemagtigde Waarde
 DocType: BOM,Show Operations,Wys Operasies
@@ -2562,7 +2613,7 @@
 ,Employees working on a holiday,Werknemers wat op vakansie werk
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Merk Aanbied
 DocType: Project,% Complete Method,% Volledige metode
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,dwelm
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,dwelm
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Onderhoud begin datum kan nie voor afleweringsdatum vir reeksnommer {0}
 DocType: Production Order,Actual End Date,Werklike Einddatum
 DocType: BOM,Operating Cost (Company Currency),Bedryfskoste (Maatskappy Geld)
@@ -2580,19 +2631,20 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Gebruiker kan nie dieselfde wees as gebruiker waarvan die reël van toepassing is op
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basiese tarief (soos per Voorraad UOM)
 DocType: SMS Log,No of Requested SMS,Geen versoekte SMS nie
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Verlof sonder betaal stem nie ooreen met goedgekeurde Verlof aansoek rekords
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Verlof sonder betaal stem nie ooreen met goedgekeurde Verlof aansoek rekords
 DocType: Campaign,Campaign-.####,Veldtog -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Volgende stappe
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Verskaf asseblief die gespesifiseerde items teen die beste moontlike tariewe
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Maak faktuur
 DocType: Selling Settings,Auto close Opportunity after 15 days,Vakansie sluit geleentheid na 15 dae
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Aankoopbestellings word nie toegelaat vir {0} weens &#39;n telkaart wat staan van {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Aankoopbestellings word nie toegelaat vir {0} weens &#39;n telkaart wat staan van {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Eindejaar
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Kwotasie / Lood%
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Kontrak Einddatum moet groter wees as Datum van aansluiting
 DocType: Vital Signs,Nutrition Values,Voedingswaardes
 DocType: Lab Test Template,Is billable,Is faktureerbaar
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Beide &quot;Fisiese Bylae&quot; en Tyd per Aanstelling &quot;moet vir Dr {0} gestel word.
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,&#39;N Derdeparty verspreider / handelaar / kommissie agent / geaffilieerde / reseller wat die maatskappye produkte vir &#39;n kommissie verkoop.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} teen aankooporder {1}
 DocType: Patient,Patient Demographics,Patient Demographics
@@ -2622,7 +2674,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","Standaard belasting sjabloon wat toegepas kan word op alle kooptransaksies. Hierdie sjabloon bevat &#39;n lys van belastingkoppe en ook ander uitgawes soos &quot;Versending&quot;, &quot;Versekering&quot;, &quot;Hantering&quot; ens. #### Nota Die belastingkoers wat u hier definieer, sal die standaard belastingkoers vir almal wees ** Items * *. As daar ** Items ** is wat verskillende tariewe het, moet hulle bygevoeg word in die ** Item Belasting ** tabel in die ** Item **-meester. #### Beskrywing van Kolomme 1. Berekeningstipe: - Dit kan wees op ** Netto Totaal ** (dit is die som van basiese bedrag). - ** Op Vorige Ry Totaal / Bedrag ** (vir kumulatiewe belasting of heffings). As u hierdie opsie kies, sal die belasting toegepas word as &#39;n persentasie van die vorige ry (in die belastingtabel) bedrag of totaal. - ** Werklike ** (soos genoem). 2. Rekeninghoof: Die rekeninggrootboek waaronder hierdie belasting geboekstaaf sal word. 3. Kosprys: Indien die belasting / heffing &#39;n inkomste (soos gestuur) of uitgawes is, moet dit teen &#39;n Kostepunt bespreek word. 4. Beskrywing: Beskrywing van die belasting (wat in fakture / aanhalings gedruk sal word). 5. Tarief: Belastingkoers. 6. Bedrag: Belastingbedrag. 7. Totaal: Kumulatiewe totaal tot hierdie punt. 8. Tik ry: As gebaseer op &quot;Vorige ry Total&quot;, kan jy die rynommer kies wat as basis vir hierdie berekening geneem sal word (standaard is die vorige ry). 9. Oorweeg belasting of koste vir: In hierdie afdeling kan u spesifiseer of die belasting / heffing slegs vir waardasie (nie &#39;n deel van die totaal) of slegs vir totale (nie waarde vir die item is nie) of vir beide. 10. Voeg of aftrekking: Of u die belasting wil byvoeg of aftrek."
 DocType: Homepage,Homepage,tuisblad
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Kies dokter ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',update tabConsultation set facture = &#39;{0}&#39; waar naam = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd Quantity
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Fooi Rekords Geskep - {0}
 DocType: Asset Category Account,Asset Category Account,Bate Kategorie Rekening
@@ -2633,7 +2684,7 @@
 DocType: Asset,Manual,handleiding
 DocType: Salary Component Account,Salary Component Account,Salaris Komponentrekening
 DocType: Global Defaults,Hide Currency Symbol,Versteek geldeenheid simbool
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","bv. Bank, Kontant, Kredietkaart"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","bv. Bank, Kontant, Kredietkaart"
 DocType: Lead Source,Source Name,Bron Naam
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Normale rustende bloeddruk in &#39;n volwassene is ongeveer 120 mmHg sistolies en 80 mmHg diastolies, afgekort &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Kredietnota
@@ -2652,16 +2703,16 @@
 DocType: Patient,Occupation,Beroep
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Ry {0}: Begindatum moet voor Einddatum wees
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Totaal (Aantal)
-DocType: Sales Invoice,This Document,Hierdie dokument
 DocType: Installation Note Item,Installed Qty,Geïnstalleerde hoeveelheid
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Dit kan wees as gevolg van sommige ongeldige e-posadresse in die
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Jy het bygevoeg
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Opleidingsresultaat
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Opleidingsresultaat
 DocType: Purchase Invoice,Is Paid,Is Betaalbaar
 DocType: Salary Structure,Total Earning,Totale verdienste
 DocType: Purchase Receipt,Time at which materials were received,Tyd waarteen materiaal ontvang is
 DocType: Stock Ledger Entry,Outgoing Rate,Uitgaande koers
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Organisasie tak meester.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Organisasie tak meester.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,of
 DocType: Sales Order,Billing Status,Rekeningstatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Gee &#39;n probleem aan
@@ -2676,7 +2727,8 @@
 DocType: Notification Control,Sales Order Message,Verkoopsvolgorde
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Stel verstekwaardes soos Maatskappy, Geld, Huidige fiskale jaar, ens."
 DocType: Payment Entry,Payment Type,Tipe van betaling
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Kies asseblief &#39;n bondel vir item {0}. Kan nie &#39;n enkele bondel vind wat aan hierdie vereiste voldoen nie
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Kies asseblief &#39;n bondel vir item {0}. Kan nie &#39;n enkele bondel vind wat aan hierdie vereiste voldoen nie
+DocType: Hub Category,Parent Category,Ouer Kategorie
 DocType: Process Payroll,Select Employees,Kies Werknemers
 DocType: Opportunity,Potential Sales Deal,Potensiële verkoopsooreenkoms
 DocType: Complaint,Complaints,klagtes
@@ -2713,7 +2765,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikasie van die pakket vir die aflewering (vir druk)
 DocType: Bin,Reserved Quantity,Gereserveerde hoeveelheid
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Voer asseblief &#39;n geldige e-posadres in
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Kies asseblief &#39;n item in die kar
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Kies asseblief &#39;n item in die kar
 DocType: Landed Cost Voucher,Purchase Receipt Items,Aankoopontvangste-items
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Aanpassings vorms
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,agterstallige
@@ -2723,15 +2775,15 @@
 DocType: Payment Request,Amount in customer's currency,Bedrag in kliënt se geldeenheid
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,aflewering
 DocType: Stock Reconciliation Item,Current Qty,Huidige hoeveelheid
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Voeg verskaffers by
+DocType: Restaurant Menu,Restaurant Menu,Restaurant Menu
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Vorige
 DocType: Appraisal Goal,Key Responsibility Area,Sleutelverantwoordelikheidsgebied
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Studentejoernaal help om bywoning, assessering en fooie vir studente op te spoor"
 DocType: Payment Entry,Total Allocated Amount,Totale toegewysde bedrag
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Stel verstekvoorraadrekening vir voortdurende voorraad
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Stel verstekvoorraadrekening vir voortdurende voorraad
 DocType: Item Reorder,Material Request Type,Materiaal Versoek Tipe
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accurale Joernaal Inskrywing vir salarisse vanaf {0} tot {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage is vol, het nie gestoor nie"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage is vol, het nie gestoor nie"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Ry {0}: UOM Gesprekfaktor is verpligtend
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Kamer kapasiteit
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,ref
@@ -2770,16 +2822,18 @@
 DocType: Project,Task Completion,Taak voltooiing
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Nie in voorraad nie
 DocType: Appraisal,HR User,HR gebruiker
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Belasting en heffings afgetrek
-apps/erpnext/erpnext/hooks.py +129,Issues,kwessies
+apps/erpnext/erpnext/hooks.py +138,Issues,kwessies
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status moet een van {0} wees
 DocType: Sales Invoice,Debit To,Debiet aan
+DocType: Restaurant Menu Item,Restaurant Menu Item,Restaurant Menu Item
 DocType: Delivery Note,Required only for sample item.,Slegs benodig vir monsteritem.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Werklike hoeveelheid na transaksie
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Geen salarisstrokie gevind tussen {0} en {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Geen salarisstrokie gevind tussen {0} en {1}
 ,Pending SO Items For Purchase Request,Hangende SO-items vir aankoopversoek
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Studente Toelatings
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} is gedeaktiveer
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Studente Toelatings
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} is gedeaktiveer
 DocType: Supplier,Billing Currency,Billing Valuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Ekstra groot
@@ -2802,6 +2856,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Noem asseblief geen besoeke benodig nie
 DocType: Stock Settings,Default Valuation Method,Verstekwaardasiemetode
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,fooi
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Werk aan die gang. Dit kan &#39;n rukkie neem.
 DocType: Vehicle Log,Fuel Qty,Brandstof Aantal
 DocType: Production Order Operation,Planned Start Time,Beplande aanvangstyd
 DocType: Course,Assessment,assessering
@@ -2847,27 +2902,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,Verskaffer se faktuurbesonderhede
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Uitgawe / Verskil rekening ({0}) moet &#39;n &#39;Wins of Verlies&#39; rekening wees
 DocType: Project,Copied From,Gekopieer vanaf
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Naam fout: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,tekort
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Naam fout: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,tekort
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} word nie geassosieer met {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Bywoning vir werknemer {0} is reeds gemerk
 DocType: Packing Slip,If more than one package of the same type (for print),As meer as een pakket van dieselfde tipe (vir druk)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Stel asseblief die standaardkliënt in Restaurantinstellings
 ,Salary Register,Salarisregister
 DocType: Warehouse,Parent Warehouse,Ouer Warehouse
 DocType: C-Form Invoice Detail,Net Total,Netto totaal
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Verstek BOM nie gevind vir Item {0} en Projek {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Verstek BOM nie gevind vir Item {0} en Projek {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Definieer verskillende leningstipes
 DocType: Bin,FCFS Rate,FCFS-tarief
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Uitstaande bedrag
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Tyd (in mins)
 DocType: Project Task,Working,Working
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Voorraadwinkel (EIEU)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Finansiële Jaar
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Finansiële Jaar
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} behoort nie aan Maatskappy {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,Kon nie kriteria telling funksie vir {0} oplos nie. Maak seker dat die formule geldig is.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Koste soos op
 DocType: Healthcare Settings,Out Patient Settings,Uit pasiënt instellings
 DocType: Account,Round Off,Afrond
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Hoeveelheid moet positief wees
 ,Requested Qty,Gevraagde hoeveelheid
 DocType: Tax Rule,Use for Shopping Cart,Gebruik vir inkopiesentrum
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Waarde {0} vir kenmerk {1} bestaan nie in die lys van geldige Item Attribuutwaardes vir Item {2} nie.
@@ -2876,7 +2933,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Kostes sal proporsioneel verdeel word op grond van die hoeveelheid of hoeveelheid van die produk, soos per u keuse"
 DocType: Maintenance Visit,Purposes,doeleindes
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Ten minste een item moet ingevul word met negatiewe hoeveelheid in ruil dokument
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Voeg kursusse by
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operasie {0} langer as enige beskikbare werksure in werkstasie {1}, breek die operasie in verskeie bewerkings af"
 ,Requested,versoek
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Geen opmerkings
@@ -2888,6 +2944,8 @@
 DocType: Employee Loan,Repaid/Closed,Terugbetaal / gesluit
 DocType: Item,Total Projected Qty,Totale Geprojekteerde Aantal
 DocType: Monthly Distribution,Distribution Name,Verspreidingsnaam
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Verskaffer&gt; Verskaffer Tipe
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Waardasietarief nie vir die item {0} gevind nie, wat vereis word om rekeningkundige inskrywings vir {1} {2} te doen. As die item as &#39;n nulwaardasyfersitem in die {1} verhandel, noem dit asseblief in die {1} Item-tabel. Andersins, skep asseblief &#39;n inkomende voorraadtransaksie vir die item of vermeld waardasietempo in die Item-rekord en probeer dan hierdie inskrywing in te dien / te kanselleer."
 DocType: Course,Course Code,Kursuskode
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Kwaliteitsinspeksie benodig vir item {0}
 DocType: POS Settings,Use POS in Offline Mode,Gebruik POS in aflyn modus
@@ -2898,14 +2956,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Bestuur Territory Tree.
 DocType: Journal Entry Account,Sales Invoice,Verkoopsfaktuur
 DocType: Journal Entry Account,Party Balance,Partybalans
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,Kies asseblief Verkoop afslag aan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Kies asseblief Verkoop afslag aan
 DocType: Company,Default Receivable Account,Verstek ontvangbare rekening
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Skep Bankinskrywing vir die totale salaris betaal vir die bogenoemde geselekteerde kriteria
 DocType: Physician,Physician Schedule,Geneeskundige Skedule
 DocType: Purchase Invoice,Deemed Export,Geagte Uitvoer
 DocType: Stock Entry,Material Transfer for Manufacture,Materiaal Oordrag vir Vervaardiging
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Afslagpersentasie kan óf teen &#39;n Pryslys óf vir alle Pryslys toegepas word.
-DocType: Purchase Invoice,Half-yearly,Halfjaarlikse
+DocType: Subscription,Half-yearly,Halfjaarlikse
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Rekeningkundige Inskrywing vir Voorraad
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,U het reeds geassesseer vir die assesseringskriteria ().
@@ -2934,13 +2992,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Ekstra Klein
 DocType: Company,Standard Template,Standaard Sjabloon
 DocType: Training Event,Theory,teorie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Waarskuwing: Materiaal Gevraagde hoeveelheid is minder as minimum bestelhoeveelheid
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Waarskuwing: Materiaal Gevraagde hoeveelheid is minder as minimum bestelhoeveelheid
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Rekening {0} is gevries
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Regspersoon / Filiaal met &#39;n afsonderlike Kaart van Rekeninge wat aan die Organisasie behoort.
 DocType: Payment Request,Mute Email,Demp e-pos
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Kos, drank en tabak"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Kan slegs betaling teen onbillike {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Kommissie koers kan nie groter as 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Kan slegs betaling teen onbillike {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Kommissie koers kan nie groter as 100
 DocType: Stock Entry,Subcontract,subkontrak
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Voer asseblief eers {0} in
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Geen antwoorde van
@@ -2958,10 +3016,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Kleur
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Assesseringsplan Kriteria
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Voorkom Aankooporders
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,vatbaar
 DocType: Patient Appointment,Scheduled,geskeduleer
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Versoek vir kwotasie.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Installeer asseblief die Naam van Werknemers in Menslike Hulpbronne&gt; MH-instellings
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Kies asseblief Item waar &quot;Voorraaditem&quot; is &quot;Nee&quot; en &quot;Is verkoopitem&quot; is &quot;Ja&quot; en daar is geen ander Produkpakket nie.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Kies kliënt
 DocType: Student Log,Academic,akademiese
 DocType: Patient,Personal and Social History,Persoonlike en Sosiale Geskiedenis
 DocType: Fee Schedule,Fee Breakup for each student,Fooi vir elke student
@@ -2971,7 +3030,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Waardasietempo
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,diesel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Pryslys Geldeenheid nie gekies nie
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Pryslys Geldeenheid nie gekies nie
 apps/erpnext/erpnext/config/healthcare.py +46,Results,Resultate
 ,Student Monthly Attendance Sheet,Student Maandelikse Bywoningsblad
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Werknemer {0} het reeds aansoek gedoen vir {1} tussen {2} en {3}
@@ -2986,7 +3045,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Bestuur verkoopsvennote.
 DocType: Quality Inspection,Inspection Type,Inspeksietipe
 DocType: Fee Validity,Visited yet,Nog besoek
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Pakhuise met bestaande transaksie kan nie na groep omskep word nie.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Pakhuise met bestaande transaksie kan nie na groep omskep word nie.
 DocType: Assessment Result Tool,Result HTML,Resultaat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Verval op
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Voeg studente by
@@ -3013,7 +3072,7 @@
 DocType: Healthcare Settings,Result Printed,Resultaat gedruk
 DocType: Asset Category Account,Depreciation Expense Account,Waardevermindering Uitgawe Rekening
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Proeftydperk
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Bekyk {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Bekyk {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Slegs blaar nodusse word in transaksie toegelaat
 DocType: Expense Claim,Expense Approver,Uitgawe Goedkeuring
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Ry {0}: Voorskot teen kliënt moet krediet wees
@@ -3024,7 +3083,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Tot Dattyd
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Kursusskedules uitgevee:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Logs vir die instandhouding van sms-leweringstatus
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Stel verkoopsdoel
 DocType: Accounts Settings,Make Payment via Journal Entry,Betaal via Joernaal Inskrywing
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Gedruk Op
 DocType: Item,Inspection Required before Delivery,Inspeksie benodig voor aflewering
@@ -3032,7 +3090,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Hangende aktiwiteite
 DocType: Patient Appointment,Reminded,herinner
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Jou organisasie
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Jou organisasie
 DocType: Fee Component,Fees Category,Gelde Kategorie
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Vul asseblief die verlig datum in.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
@@ -3044,7 +3102,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Herbestel vlak
 DocType: Company,Chart Of Accounts Template,Sjabloon van rekeninge
 DocType: Attendance,Attendance Date,Bywoningsdatum
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Itemprys opgedateer vir {0} in Pryslys {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Itemprys opgedateer vir {0} in Pryslys {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Salarisuitval gebaseer op verdienste en aftrekking.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Rekening met kinder nodusse kan nie na grootboek omgeskakel word nie
 DocType: Purchase Invoice Item,Accepted Warehouse,Aanvaarde pakhuis
@@ -3060,9 +3118,10 @@
 ,Employee Birthday,Werknemer Verjaarsdag
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Studente Batch Bywoningsgereedskap
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,Gekruiste Gekruis
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Geskeduleerde Upto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,&#39;N Akademiese term met hierdie&#39; Akademiese Jaar &#39;{0} en&#39; Termynnaam &#39;{1} bestaan reeds. Verander asseblief hierdie inskrywings en probeer weer.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Aangesien daar bestaande transaksies teen item {0} is, kan u nie die waarde van {1} verander nie"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Aangesien daar bestaande transaksies teen item {0} is, kan u nie die waarde van {1} verander nie"
 DocType: UOM,Must be Whole Number,Moet die hele getal wees
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nuwe blare toegeken (in dae)
 DocType: Purchase Invoice,Invoice Copy,Faktuurkopie
@@ -3072,7 +3131,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Faktuurnommer
 DocType: Shopping Cart Settings,Orders,bestellings
 DocType: Employee Leave Approver,Leave Approver,Verlaat Goedkeuring
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Kies asseblief &#39;n bondel
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Kies asseblief &#39;n bondel
 DocType: Assessment Group,Assessment Group Name,Assessering Groep Naam
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materiaal oorgedra vir Vervaardiging
 DocType: Expense Claim,"A user with ""Expense Approver"" role",&#39;N Gebruiker met &#39;n &quot;Expense Approver&quot; -rol
@@ -3087,7 +3146,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Tydperk sluitingsinskrywing
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Kies Departement ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Kostesentrum met bestaande transaksies kan nie na groep omskep word nie
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Bedrag {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Bedrag {0} {1} {2} {3}
 DocType: Account,Depreciation,waardevermindering
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Verskaffers)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Werknemersbywoningsinstrument
@@ -3098,9 +3157,11 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,Betalingsinskrywings {0} is nie gekoppel nie
 DocType: GL Entry,Voucher No,Voucher Nr
 ,Lead Owner Efficiency,Leier Eienaar Efficiency
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Gewildste
 DocType: Leave Allocation,Leave Allocation,Verlof toekenning
 DocType: Payment Request,Recipient Message And Payment Details,Ontvangersboodskap en Betaalbesonderhede
 DocType: Training Event,Trainer Email,Trainer E-pos
+DocType: Restaurant Reservation,No of People,Aantal mense
 DocType: Production Planning Tool,Include sub-contracted raw materials,Sluit onderkontrakteerde grondstowwe in
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Sjabloon van terme of kontrak.
 DocType: Purchase Invoice,Address and Contact,Adres en kontak
@@ -3108,10 +3169,11 @@
 DocType: Supplier,Last Day of the Next Month,Laaste Dag van die Volgende Maand
 DocType: Support Settings,Auto close Issue after 7 days,Outo sluit uitgawe na 7 dae
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Verlof kan nie voor {0} toegeken word nie, aangesien verlofbalans reeds in die toekomstige verlofrekordrekord {1} oorgedra is."
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: Vervaldatum / Verwysingsdatum oorskry toegelate kliënte kredietdae teen {0} dag (e)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: Vervaldatum / Verwysingsdatum oorskry toegelate kliënte kredietdae teen {0} dag (e)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Studente Aansoeker
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,OORSPRONG VIR ONTVANGER
 DocType: Asset Category Account,Accumulated Depreciation Account,Opgehoopte Waardeverminderingsrekening
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Hierdie e-pos is outogenerated
 DocType: Stock Settings,Freeze Stock Entries,Vries Voorraadinskrywings
 DocType: Program Enrollment,Boarding Student,Studente
 DocType: Asset,Expected Value After Useful Life,Verwagte Waarde Na Nuttige Lewe
@@ -3119,7 +3181,7 @@
 DocType: Activity Cost,Billing Rate,Rekeningkoers
 ,Qty to Deliver,Hoeveelheid om te lewer
 ,Stock Analytics,Voorraad Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Operasies kan nie leeg gelaat word nie
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Operasies kan nie leeg gelaat word nie
 DocType: Maintenance Visit Purpose,Against Document Detail No,Teen dokumentbesonderhede No
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Party Tipe is verpligtend
 DocType: Quality Inspection,Outgoing,uitgaande
@@ -3169,20 +3231,21 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Kry opdaterings
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Rekening {2} behoort nie aan Maatskappy {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Materiaalversoek {0} word gekanselleer of gestop
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Verlofbestuur
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Verlofbestuur
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Groep per rekening
 DocType: Sales Order,Fully Delivered,Volledig afgelewer
 DocType: Lead,Lower Income,Laer Inkomste
+DocType: Restaurant Order Entry,Current Order,Huidige bestelling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Bron en teiken pakhuis kan nie dieselfde wees vir ry {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Verskilrekening moet &#39;n Bate / Aanspreeklikheidsrekening wees, aangesien hierdie Voorraadversoening &#39;n Openingsinskrywing is"
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Gaan na Programme
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Aankoopordernommer benodig vir item {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Produksie bestelling nie geskep nie
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Produksie bestelling nie geskep nie
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;Vanaf datum&#39; moet na &#39;tot datum&#39; wees
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Kan nie status verander as student {0} is gekoppel aan studenteprogram nie {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Kan nie status verander as student {0} is gekoppel aan studenteprogram nie {1}
 DocType: Asset,Fully Depreciated,Ten volle gedepresieer
 ,Stock Projected Qty,Voorraad Geprojekteerde Aantal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Kliënt {0} behoort nie aan projek nie {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Kliënt {0} behoort nie aan projek nie {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Gemerkte Bywoning HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Aanhalings is voorstelle, bod wat jy aan jou kliënte gestuur het"
 DocType: Sales Order,Customer's Purchase Order,Kliënt se Aankoopbestelling
@@ -3193,8 +3256,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Stel asseblief die aantal afskrywings wat bespreek word
 DocType: Supplier Scorecard Period,Calculations,berekeninge
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Waarde of Hoeveelheid
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Produksies Bestellings kan nie opgewek word vir:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Produksies Bestellings kan nie opgewek word vir:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,minuut
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel Naming Series vir {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Invoice,Purchase Taxes and Charges,Koopbelasting en heffings
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Gaan na verskaffers
 ,Qty to Receive,Hoeveelheid om te ontvang
@@ -3207,7 +3271,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Krediet Vir rekening moet &#39;n balansstaatrekening wees
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Alle Verskaffer Tipes
 DocType: Global Defaults,Disable In Words,Deaktiveer in woorde
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,Item Kode is verpligtend omdat Item nie outomaties genommer is nie
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,Item Kode is verpligtend omdat Item nie outomaties genommer is nie
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Kwotasie {0} nie van tipe {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Onderhoudskedule item
 DocType: Sales Order,%  Delivered,% Afgelewer
@@ -3229,23 +3293,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Openingsaldo-ekwiteit
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,versoening
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,oorblywende
 DocType: Appraisal,Appraisal,evaluering
 DocType: Purchase Invoice,GST Details,GST Besonderhede
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},E-pos gestuur aan verskaffer {0}
+DocType: Item,Default Sales Unit of Measure,Standaard verkoopseenheid van maatreël
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum word herhaal
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Gemagtigde ondertekenaar
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Laat goedkeuring moet een van {0} wees
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Skep Fooie
-DocType: Hub Settings,Seller Email,Verkoper E-pos
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Totale Aankoopprys (via Aankoopfaktuur)
 DocType: Training Event,Start Time,Begin Tyd
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Kies Hoeveelheid
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Kies Hoeveelheid
 DocType: Customs Tariff Number,Customs Tariff Number,Doeanetariefnommer
 DocType: Patient Appointment,Patient Appointment,Pasiënt Aanstelling
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Goedkeurende rol kan nie dieselfde wees as die rol waarvan die reël van toepassing is op
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Uitschrijven van hierdie e-pos verhandeling
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Uitschrijven van hierdie e-pos verhandeling
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Kry Verskaffers By
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} nie gevind vir item {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Gaan na Kursusse
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Boodskap gestuur
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Rekening met kinder nodusse kan nie as grootboek gestel word nie
@@ -3258,10 +3325,12 @@
 DocType: Production Order,Material Transferred for Manufacturing,Materiaal oorgedra vir Vervaardiging
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Rekening {0} bestaan nie
 DocType: Project,Project Type,Projek Type
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Kinderopdrag bestaan vir hierdie taak. U kan hierdie taak nie uitvee nie.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Die teiken hoeveelheid of teikenwaarde is verpligtend.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Koste van verskeie aktiwiteite
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Geen meer resultate
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Koste van verskeie aktiwiteite
 DocType: Timesheet,Billing Details,Rekeningbesonderhede
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Bron en teiken pakhuis moet anders wees
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Bron en teiken pakhuis moet anders wees
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Nie toegelaat om voorraadtransaksies ouer as {0} by te werk nie.
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Volledig gefaktureer
@@ -3287,7 +3356,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Elektroniese oorbetaling
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Kyk alles
 DocType: Vehicle Log,Invoice Ref,Faktuur Ref
-DocType: Purchase Order,Recurring Order,Herhalende bestelling
 DocType: Company,Default Income Account,Standaard Inkomsterekening
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Kliëntegroep / Kliënt
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Onbekende fiskale jare Wins / verlies (Krediet)
@@ -3301,9 +3369,9 @@
 DocType: Patient,A Negative,&#39;N Negatiewe
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Niks meer om te wys nie.
 DocType: Lead,From Customer,Van kliënt
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,oproepe
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,oproepe
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,&#39;N Produk
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,groepe
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,groepe
 DocType: Project,Total Costing Amount (via Time Logs),Totale kosteberekening (via tydlogs)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Maak fooi skedule
 DocType: Purchase Order Item Supplied,Stock UOM,Voorraad UOM
@@ -3327,7 +3395,7 @@
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Blare en Vakansiedae
 DocType: School Settings,Current Academic Term,Huidige Akademiese Termyn
 DocType: Sales Order,Not Billed,Nie gefaktureer nie
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Beide pakhuise moet aan dieselfde maatskappy behoort
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Beide pakhuise moet aan dieselfde maatskappy behoort
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Nog geen kontakte bygevoeg nie.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Landed Cost Voucher Bedrag
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Wetsontwerpe wat deur verskaffers ingesamel word.
@@ -3336,7 +3404,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Korting Bedrag
 DocType: Purchase Invoice,Return Against Purchase Invoice,Keer terug teen aankoopfaktuur
 DocType: Item,Warranty Period (in days),Garantie Periode (in dae)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',Update `tabPatient Aanstelling &#39;stel sales_invoice =&#39; {0} &#39;waar naam =&#39; {1} &#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Verhouding met Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Netto kontant uit bedrywighede
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Item 4
@@ -3345,8 +3412,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Tydskrifinskrywingsrekening
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Studentegroep
 DocType: Shopping Cart Settings,Quotation Series,Kwotasie Reeks
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","&#39;N Item bestaan met dieselfde naam ({0}), verander asseblief die itemgroepnaam of hernoem die item"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Kies asseblief kliënt
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","&#39;N Item bestaan met dieselfde naam ({0}), verander asseblief die itemgroepnaam of hernoem die item"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Kies asseblief kliënt
 DocType: C-Form,I,Ek
 DocType: Company,Asset Depreciation Cost Center,Bate Waardevermindering Koste Sentrum
 DocType: Sales Order Item,Sales Order Date,Verkoopsvolgorde
@@ -3355,6 +3422,7 @@
 DocType: Assessment Plan,Assessment Plan,Assesseringsplan
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Kliënt {0} is geskep.
 DocType: Stock Settings,Limit Percent,Limiet persentasie
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Tans is geen voorraad beskikbaar in enige pakhuis nie
 ,Payment Period Based On Invoice Date,Betalingsperiode gebaseer op faktuurdatum
 DocType: Sample Collection,No. of print,Aantal drukwerk
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Ontbrekende geldeenheid wisselkoerse vir {0}
@@ -3410,13 +3478,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruto Betaling - Totale Aftrekking - Lening Terugbetaling
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,Huidige BOM en Nuwe BOM kan nie dieselfde wees nie
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Salaris Slip ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Salaris Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Datum van aftrede moet groter wees as datum van aansluiting
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Daar was foute tydens skeduleringskursusse:
 DocType: Sales Invoice,Against Income Account,Teen Inkomsterekening
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% afgelewer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Bestelde hoeveelheid {1} kan nie minder wees as die minimum bestelhoeveelheid {2} (gedefinieer in Item).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Bestelde hoeveelheid {1} kan nie minder wees as die minimum bestelhoeveelheid {2} (gedefinieer in Item).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Maandelikse Verspreidingspersentasie
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Log in as &#39;n ander gebruiker.
 DocType: Territory,Territory Targets,Territoriese teikens
 DocType: Delivery Note,Transporter Info,Transporter Info
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Stel asseblief die standaard {0} in Maatskappy {1}
@@ -3424,13 +3493,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Dieselfde verskaffer is al verskeie kere ingeskryf
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Bruto wins / verlies
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Aankoop bestelling Item verskaf
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Maatskappy se naam kan nie Maatskappy wees nie
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Maatskappy se naam kan nie Maatskappy wees nie
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Briefhoofde vir druk sjablone.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Titels vir druk templates, bv. Proforma-faktuur."
 DocType: Program Enrollment,Walking,Stap
 DocType: Student Guardian,Student Guardian,Studente Voog
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Waardasietoelae kan nie as Inklusief gemerk word nie
 DocType: POS Profile,Update Stock,Werk Voorraad
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,in die intekening
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Verskillende UOM vir items sal lei tot foutiewe (Totale) Netto Gewigwaarde. Maak seker dat die netto gewig van elke item in dieselfde UOM is.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM-koers
 DocType: Asset,Journal Entry for Scrap,Tydskrifinskrywing vir afval
@@ -3478,15 +3548,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Stelsel gebruiker (login) ID. Indien ingestel, sal dit vir alle HR-vorms verstek wees."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Vanaf {1}
 DocType: Task,depends_on,hang af van
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,In wagtyd vir die opdatering van die jongste prys in alle materiaal. Dit kan &#39;n paar minute neem.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,In wagtyd vir die opdatering van die jongste prys in alle materiaal. Dit kan &#39;n paar minute neem.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Naam van nuwe rekening. Nota: skep asseblief nie rekeninge vir kliënte en verskaffers nie
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Landverstandige standaard adres sjablonen
 DocType: Sales Order Item,Supplier delivers to Customer,Verskaffer lewer aan die kliënt
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Vorm / Item / {0}) is uit voorraad
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Verwysingsdatum kan nie na {0} wees nie.
+,Sales Payment Summary,Verkoopbetalingsopsomming
+DocType: Restaurant,Restaurant,restaurant
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Verwysingsdatum kan nie na {0} wees nie.
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data Invoer en Uitvoer
 DocType: Patient,Account Details,Rekeningbesonderhede
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Geen studente gevind
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Geen studente gevind
 DocType: Medical Department,Medical Department,Mediese Departement
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Verskaffer Scorecard Scoring Criteria
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Invoice Posting Date
@@ -3497,14 +3569,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Kies asseblief Posdatum voordat jy Party kies
 DocType: Program Enrollment,School House,Skoolhuis
 DocType: Serial No,Out of AMC,Uit AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Kies asseblief kwotasies
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Kies asseblief kwotasies
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Aantal afskrywings wat bespreek word, kan nie groter wees as die totale aantal afskrywings nie"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Maak onderhoudsbesoek
 DocType: Company,Default Cash Account,Standaard kontantrekening
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Maatskappy (nie kliënt of verskaffer) meester.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Dit is gebaseer op die bywoning van hierdie student
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Geen studente in
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Voeg meer items by of maak volledige vorm oop
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Voeg meer items by of maak volledige vorm oop
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Afleweringsnotas {0} moet gekanselleer word voordat u hierdie verkooporder kanselleer
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Gaan na gebruikers
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Betaalde bedrag + Skryf af Die bedrag kan nie groter as Grand Total wees nie
@@ -3524,37 +3596,40 @@
 DocType: Fee Schedule,Fee Schedule,Fooibedule
 DocType: Hub Settings,Publish Availability,Publiseer Beskikbaarheid
 DocType: Company,Create Chart Of Accounts Based On,Skep grafiek van rekeninge gebaseer op
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Kan dit nie omskakel na nie-groep. Kindertakke bestaan.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Geboortedatum kan nie groter wees as vandag nie.
 ,Stock Ageing,Voorraadveroudering
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Studente {0} bestaan teen studente aansoeker {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Ronde aanpassing (Maatskappy Geld)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Tydstaat
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Tydstaat
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} &#39;{1}&#39; is gedeaktiveer
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Stel as oop
 DocType: Cheque Print Template,Scanned Cheque,Geskandeerde tjek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Stuur outomatiese e-posse na Kontakte om transaksies in te dien.
 DocType: Timesheet,Total Billable Amount,Totale betaalbare bedrag
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Item 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Bestelling Inskrywing
 DocType: Purchase Order,Customer Contact Email,Kliënt Kontak Email
 DocType: Warranty Claim,Item and Warranty Details,Item en waarborgbesonderhede
 DocType: Sales Team,Contribution (%),Bydrae (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Let wel: Betalinginskrywing sal nie geskep word nie aangesien &#39;Kontant of Bankrekening&#39; nie gespesifiseer is nie
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Projek {0} bestaan reeds
 DocType: Medical Department,Nursing User,Verpleegkundige gebruiker
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,verantwoordelikhede
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Geldigheidsduur van hierdie aanhaling is beëindig.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Geldigheidsduur van hierdie aanhaling is beëindig.
 DocType: Expense Claim Account,Expense Claim Account,Koste-eisrekening
 DocType: Accounts Settings,Allow Stale Exchange Rates,Staaf wisselkoerse toe
 DocType: Sales Person,Sales Person Name,Verkooppersoon Naam
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Voer asseblief ten minste 1 faktuur in die tabel in
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Voeg gebruikers by
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Voeg gebruikers by
 DocType: POS Item Group,Item Group,Itemgroep
 DocType: Item,Safety Stock,Veiligheidsvoorraad
 DocType: Healthcare Settings,Healthcare Settings,Gesondheidsorginstellings
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Progress% vir &#39;n taak kan nie meer as 100 wees nie.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Progress% vir &#39;n taak kan nie meer as 100 wees nie.
 DocType: Stock Reconciliation Item,Before reconciliation,Voor versoening
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Na {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Belasting en heffings bygevoeg (Maatskappy Geld)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Itembelastingreeks {0} moet rekening hou met die tipe Belasting of Inkomste of Uitgawe of Belasbare
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Itembelastingreeks {0} moet rekening hou met die tipe Belasting of Inkomste of Uitgawe of Belasbare
 DocType: Sales Order,Partly Billed,Gedeeltelik gefaktureer
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Item {0} moet &#39;n vaste bate-item wees
 DocType: Item,Default BOM,Standaard BOM
@@ -3570,6 +3645,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,veranderlike
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Van afleweringsnota
 DocType: Student,Student Email Address,Student e-pos adres
+DocType: Item,Hub Warehouse,Hub Warehouse
 DocType: Physician Schedule Time Slot,From Time,Van tyd af
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Op voorraad:
 DocType: Notification Control,Custom Message,Aangepaste Boodskap
@@ -3577,9 +3653,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,Kontant of Bankrekening is verpligtend vir betaling van inskrywing
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Student Adres
 DocType: Purchase Invoice,Price List Exchange Rate,Pryslys wisselkoers
+DocType: POS Profile,POS Profile Name,POS Profiel Naam
 DocType: Purchase Invoice Item,Rate,Koers
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Adres Naam
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Adres Naam
 DocType: Stock Entry,From BOM,Van BOM
 DocType: Assessment Code,Assessment Code,Assesseringskode
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,basiese
@@ -3593,11 +3670,12 @@
 DocType: Salary Slip,Salary Structure,Salarisstruktuur
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,lugredery
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Uitgawe Materiaal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Uitgawe Materiaal
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,&#39;N Fout het voorgekom tydens die skep van herhalende
 DocType: Material Request Item,For Warehouse,Vir pakhuis
 DocType: Employee,Offer Date,Aanbod Datum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,kwotasies
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Jy is in die aflyn modus. Jy sal nie kan herlaai voordat jy netwerk het nie.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Jy is in die aflyn modus. Jy sal nie kan herlaai voordat jy netwerk het nie.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Geen studentegroepe geskep nie.
 DocType: Purchase Invoice Item,Serial No,Serienommer
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Maandelikse Terugbetalingsbedrag kan nie groter wees as Leningbedrag nie
@@ -3607,17 +3685,18 @@
 DocType: Salary Slip,Total Working Hours,Totale werksure
 DocType: Subscription,Next Schedule Date,Volgende skedule Datum
 DocType: Stock Entry,Including items for sub assemblies,Insluitende items vir sub-gemeentes
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Invoerwaarde moet positief wees
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Alle gebiede
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Invoerwaarde moet positief wees
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Alle gebiede
 DocType: Purchase Invoice,Items,items
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student is reeds ingeskryf.
 DocType: Fiscal Year,Year Name,Jaar Naam
 DocType: Process Payroll,Process Payroll,Proses betaalstaat
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Daar is meer vakansiedae as werksdae hierdie maand.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Daar is meer vakansiedae as werksdae hierdie maand.
 DocType: Product Bundle Item,Product Bundle Item,Produk Bundel Item
 DocType: Sales Partner,Sales Partner Name,Verkope Vennoot Naam
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Versoek vir kwotasies
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Versoek vir kwotasies
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimum faktuurbedrag
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,hematologie
 DocType: Normal Test Items,Normal Test Items,Normale toetsitems
 DocType: Student Language,Student Language,Studente Taal
 apps/erpnext/erpnext/config/selling.py +23,Customers,kliënte
@@ -3628,10 +3707,11 @@
 DocType: Issue,Opening Time,Openingstyd
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Van en tot datums benodig
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Sekuriteite en kommoditeitsuitruilings
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standaard eenheid van maatstaf vir variant &#39;{0}&#39; moet dieselfde wees as in Sjabloon &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standaard eenheid van maatstaf vir variant &#39;{0}&#39; moet dieselfde wees as in Sjabloon &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Bereken Gebaseer Op
 DocType: Delivery Note Item,From Warehouse,Uit pakhuis
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Geen items met die materiaal om te vervaardig
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Geen items met die materiaal om te vervaardig
+DocType: Restaurant,Default Customer,Verstekkliënt
 DocType: Assessment Plan,Supervisor Name,Toesighouer Naam
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Moenie bevestig of aanstelling geskep is vir dieselfde dag nie
 DocType: Program Enrollment Course,Program Enrollment Course,Programinskrywing Kursus
@@ -3658,7 +3738,7 @@
 DocType: Payment Entry,Internal Transfer,Interne Oordrag
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Kinderrekening bestaan vir hierdie rekening. Jy kan nie hierdie rekening uitvee nie.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Die teiken hoeveelheid of teikenwaarde is verpligtend
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Geen standaard BOM bestaan vir Item {0} nie.
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Geen standaard BOM bestaan vir Item {0} nie.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Kies asseblief die Posdatum eerste
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Openingsdatum moet voor sluitingsdatum wees
 DocType: Leave Control Panel,Carry Forward,Voort te sit
@@ -3693,6 +3773,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Totaal Aanwesig
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,Rekeningkundige state
 DocType: Drug Prescription,Hour,Uur
+DocType: Restaurant Order Entry,Last Sales Invoice,Laaste Verkoopfaktuur
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nuwe reeksnommer kan nie pakhuis hê nie. Pakhuis moet ingestel word deur Voorraadinskrywing of Aankoop Ontvangst
 DocType: Lead,Lead Type,Lood Tipe
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Jy is nie gemagtig om bladsye op Blokdata te keur nie
@@ -3727,64 +3808,66 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Skep gebruikers
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,gram
 DocType: Supplier Scorecard,Per Month,Per maand
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Hoeveelheid tot Vervaardiging moet groter as 0 wees.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Hoeveelheid tot Vervaardiging moet groter as 0 wees.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Besoek verslag vir onderhoudsoproep.
 DocType: Stock Entry,Update Rate and Availability,Update tarief en beskikbaarheid
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Persentasie wat u mag ontvang of meer lewer teen die hoeveelheid bestel. Byvoorbeeld: As jy 100 eenhede bestel het. en u toelae is 10%, dan mag u 110 eenhede ontvang."
 DocType: POS Customer Group,Customer Group,Kliëntegroep
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Nuwe batch ID (opsioneel)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Nuwe batch ID (opsioneel)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Uitgawe rekening is verpligtend vir item {0}
 DocType: BOM,Website Description,Webwerf beskrywing
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Netto verandering in ekwiteit
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,nuutste
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Kanselleer eers Aankoopfaktuur {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-pos adres moet uniek wees, bestaan reeds vir {0}"
 DocType: Serial No,AMC Expiry Date,AMC Vervaldatum
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,Kwitansie
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,Kwitansie
 ,Sales Register,Verkoopsregister
 DocType: Daily Work Summary Settings Company,Send Emails At,Stuur e-pos aan
 DocType: Quotation,Quotation Lost Reason,Kwotasie Verlore Rede
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Kies jou domein
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',kies * van tabPatient waar naam = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Transaksieverwysingsnommer {0} gedateer {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Transaksieverwysingsnommer {0} gedateer {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Daar is niks om te wysig nie.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Form View
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Opsomming vir hierdie maand en hangende aktiwiteite
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Form View
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Opsomming vir hierdie maand en hangende aktiwiteite
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Voeg gebruikers by jou organisasie, behalwe jouself."
 DocType: Customer Group,Customer Group Name,Kliënt Groep Naam
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Nog geen kliënte!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Nog geen kliënte!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Kontantvloeistaat
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lening Bedrag kan nie Maksimum Lening Bedrag van {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,lisensie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Verwyder asseblief hierdie faktuur {0} uit C-vorm {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Verwyder asseblief hierdie faktuur {0} uit C-vorm {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Kies asseblief Carry Forward as u ook die vorige fiskale jaar se balans wil insluit, verlaat na hierdie fiskale jaar"
 DocType: GL Entry,Against Voucher Type,Teen Voucher Tipe
 DocType: Physician,Phone (R),Telefoon (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Tydgleuwe bygevoeg
 DocType: Item,Attributes,eienskappe
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Aktiveer Sjabloon
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel Naming Series vir {0} via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Voer asseblief &#39;Skryf &#39;n rekening in
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Laaste bestellingsdatum
 DocType: Patient,B Negative,B Negatief
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Rekening {0} behoort nie aan maatskappy {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Reeksnommers in ry {0} stem nie ooreen met Afleweringsnota nie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Reeksnommers in ry {0} stem nie ooreen met Afleweringsnota nie
 DocType: Student,Guardian Details,Besonderhede van die voog
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Merk Bywoning vir meervoudige werknemers
 DocType: Vehicle,Chassis No,Chassisnr
 DocType: Payment Request,Initiated,geïnisieer
 DocType: Production Order,Planned Start Date,Geplande begin datum
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Kies asseblief &#39;n BOM
 DocType: Serial No,Creation Document Type,Skepping dokument tipe
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Einddatum moet groter wees as begin datum
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Einddatum moet groter wees as begin datum
 DocType: Leave Type,Is Encash,Is Encash
 DocType: Leave Allocation,New Leaves Allocated,Nuwe blare toegeken
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projek-wyse data is nie beskikbaar vir aanhaling nie
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Eindig op
 DocType: Project,Expected End Date,Verwagte einddatum
 DocType: Budget Account,Budget Amount,Begrotingsbedrag
 DocType: Appraisal Template,Appraisal Template Title,Appraisal Template Titel
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Vanaf datum {0} vir Werknemer {1} kan nie voor werknemer se aanvangsdatum wees nie {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,kommersiële
 DocType: Patient,Alcohol Current Use,Alkohol Huidige Gebruik
+DocType: Student Admission Program,Student Admission Program,Studente Toelatingsprogram
 DocType: Payment Entry,Account Paid To,Rekening betaal
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Ouer Item {0} mag nie &#39;n voorraaditem wees nie
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Alle Produkte of Dienste.
@@ -3793,30 +3876,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Budget vir rekening {1} teen {2} {3} is {4}. Dit sal oorskry met {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Ry {0} # Rekening moet van die tipe &#39;vaste bate&#39; wees
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Uit Aantal
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Reëls om die versendingsbedrag vir &#39;n verkoop te bereken
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,en ongeskik Gestremd in die
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Reeks is verpligtend
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansiële dienste
 DocType: Student Sibling,Student ID,Student ID
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Soorte aktiwiteite vir Time Logs
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Verskaffer e-pos
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Soorte aktiwiteite vir Time Logs
 DocType: Tax Rule,Sales,verkope
 DocType: Stock Entry Detail,Basic Amount,Basiese Bedrag
 DocType: Training Event,Exam,eksamen
 DocType: Complaint,Complaint,klagte
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Pakhuis benodig vir voorraad Item {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Pakhuis benodig vir voorraad Item {0}
 DocType: Leave Allocation,Unused leaves,Ongebruikte blare
 DocType: Patient,Alcohol Past Use,Alkohol Gebruik
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Billing State
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,oordrag
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Haal ontplof BOM (insluitend sub-gemeentes)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,oordrag
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Haal ontplof BOM (insluitend sub-gemeentes)
 DocType: Authorization Rule,Applicable To (Employee),Toepasbaar op (Werknemer)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Verpligte datum is verpligtend
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Verpligte datum is verpligtend
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Toename vir kenmerk {0} kan nie 0 wees nie
 DocType: Journal Entry,Pay To / Recd From,Betaal na / Recd From
 DocType: Naming Series,Setup Series,Opstelreeks
 DocType: Payment Reconciliation,To Invoice Date,Na faktuur datum
 DocType: Supplier,Contact HTML,Kontak HTML
 ,Inactive Customers,Onaktiewe kliënte
+DocType: Student Admission Program,Maximum Age,Maksimum ouderdom
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Aankoopontvangste
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Hoe prysreël is toegepas?
@@ -3835,6 +3920,7 @@
 DocType: GL Entry,Remarks,opmerkings
 DocType: Payment Entry,Account Paid From,Rekening betaal vanaf
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Grondstowwe Itemkode
+DocType: Task,Parent Task,Ouertaak
 DocType: Journal Entry,Write Off Based On,Skryf af gebaseer op
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Maak Lood
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Druk en skryfbehoeftes
@@ -3843,19 +3929,19 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salaris wat reeds vir die tydperk tussen {0} en {1} verwerk is, kan die verlengde aansoekperiode nie tussen hierdie datumreeks wees nie."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Installasie rekord vir &#39;n serienummer
 DocType: Guardian Interest,Guardian Interest,Voogbelang
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Stel verstekwaardes vir POS-fakture
 apps/erpnext/erpnext/config/hr.py +177,Training,opleiding
 DocType: Timesheet,Employee Detail,Werknemersbesonderhede
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 e-pos ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,Volgende Datum se dag en Herhaal op Dag van Maand moet gelyk wees
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Volgende Datum se dag en Herhaal op Dag van Maand moet gelyk wees
 DocType: Lab Prescription,Test Code,Toets Kode
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Instellings vir webwerf tuisblad
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ&#39;s word nie toegelaat vir {0} as gevolg van &#39;n telkaart wat staan van {1}
 DocType: Offer Letter,Awaiting Response,In afwagting van antwoord
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Bo
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Totale bedrag {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Ongeldige kenmerk {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Totale bedrag {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Ongeldige kenmerk {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Noem as nie-standaard betaalbare rekening
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Dieselfde item is verskeie kere ingevoer. {Lys}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Kies asseblief die assesseringsgroep anders as &#39;Alle assesseringsgroepe&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Ry {0}: Koste sentrum is nodig vir &#39;n item {1}
 DocType: Training Event Employee,Optional,opsioneel
@@ -3878,19 +3964,20 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Koste sentrum is verpligtend vir item {2}
 DocType: Vehicle,Policy No,Polisnr
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Kry Items van Produk Bundel
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Aangesien voorraad teen &#39;n item {0} bestaan, kan u nie die eienskappe van variante aanskakel nie"
 DocType: Asset,Straight Line,Reguit lyn
 DocType: Project User,Project User,Projekgebruiker
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,verdeel
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,verdeel
 DocType: GL Entry,Is Advance,Is vooruit
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Bywoning vanaf datum en bywoning tot datum is verpligtend
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,Tik asb. &#39;Ja&#39; of &#39;Nee&#39; in
+DocType: Item,Default Purchase Unit of Measure,Verstek aankoopeenheid van maatreël
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Laaste Kommunikasiedatum
 DocType: Sales Team,Contact No.,Kontaknommer.
 DocType: Bank Reconciliation,Payment Entries,Betalingsinskrywings
 DocType: Production Order,Scrap Warehouse,Scrap Warehouse
 DocType: Production Order,Check if material transfer entry is not required,Kyk of die invoer van materiaal oorplasing nie nodig is nie
 DocType: Program Enrollment Tool,Get Students From,Kry studente van
-DocType: Hub Settings,Seller Country,Verkoper Land
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publiseer items op die webwerf
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Groepeer jou studente in groepe
 DocType: Authorization Rule,Authorization Rule,Magtigingsreël
@@ -3900,7 +3987,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Verkoopsbelasting en Heffings Sjabloon
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Totaal (Krediet)
 DocType: Repayment Schedule,Payment Date,Betaaldatum
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nuwe batch hoeveelheid
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Nuwe batch hoeveelheid
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Auto &amp; Toebehore
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,Kon nie geweegde tellingfunksie oplos nie. Maak seker dat die formule geldig is.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Aantal bestellings
@@ -3918,6 +4005,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ry # {0}: Bate {1} kan nie ingedien word nie, dit is reeds {2}"
 DocType: Tax Rule,Billing Country,Billing Country
 DocType: Purchase Order Item,Expected Delivery Date,Verwagte afleweringsdatum
+DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurant bestellinginskrywing
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debiet en Krediet nie gelyk aan {0} # {1}. Verskil is {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Vermaak Uitgawes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Materiaal Versoek
@@ -3930,9 +4018,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Rekening met bestaande transaksie kan nie uitgevee word nie
 DocType: Vehicle,Last Carbon Check,Laaste Carbon Check
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Regskoste
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Kies asseblief die hoeveelheid op ry
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Kies asseblief die hoeveelheid op ry
 DocType: Purchase Invoice,Posting Time,Posietyd
 DocType: Timesheet,% Amount Billed,% Bedrag gefaktureer
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Tyd per Aanstelling&quot; is nie vir Dr {0} gestel nie. Voeg dit by die dokter se meester in.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefoon uitgawes
 DocType: Sales Partner,Logo,logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Kontroleer dit as u die gebruiker wil dwing om &#39;n reeks te kies voordat u dit stoor. Daar sal geen standaard wees as u dit kontroleer nie.
@@ -3943,6 +4032,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nuwe kliëntinkomste
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Reiskoste
 DocType: Maintenance Visit,Breakdown,Afbreek
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Voeg gepas veld in. Inskrywing in die doktipe {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Rekening: {0} met valuta: {1} kan nie gekies word nie
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Werk BOM koste outomaties via Scheduler, gebaseer op die jongste waarderings koers / prys lys koers / laaste aankoop koers van grondstowwe."
 DocType: Bank Reconciliation Detail,Cheque Date,Check Date
@@ -3967,7 +4057,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Totale faktuurbedrag (via tydlogs)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Verskaffer ID
 DocType: Payment Request,Payment Gateway Details,Betaling Gateway Besonderhede
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Hoeveelheid moet groter as 0 wees
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Hoeveelheid moet groter as 0 wees
 DocType: Journal Entry,Cash Entry,Kontant Inskrywing
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Kinder nodusse kan slegs geskep word onder &#39;Groep&#39; tipe nodusse
 DocType: Leave Application,Half Day Date,Halfdag Datum
@@ -3985,12 +4075,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Nota: Item {0} het verskeie kere ingeskryf
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Alle kontakte.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Maatskappy Afkorting
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Gebruiker {0} bestaan nie
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Gebruiker {0} bestaan nie
 DocType: Subscription,SUB-,SUB
 DocType: Item Attribute Value,Abbreviation,staat
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Betalinginskrywing bestaan reeds
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Nie outhroized sedert {0} oorskry limiete
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Salaris sjabloon meester.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Patologie
+DocType: Restaurant Order Entry,Restaurant Table,Restaurant Tafel
 DocType: Leave Type,Max Days Leave Allowed,Maksimum dae toegelaat
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Stel belastingreël vir inkopiesentrum
 DocType: Purchase Invoice,Taxes and Charges Added,Belasting en heffings bygevoeg
@@ -4002,10 +4094,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Aanhalings aan Leads of Customers.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rol Toegestaan om gevriesde voorraad te wysig
 ,Territory Target Variance Item Group-Wise,Territory Target Variance Item Group-Wise
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Alle kliënte groepe
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Alle kliënte groepe
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Opgehoop maandeliks
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} is verpligtend. Miskien is Geldwissel-rekord nie vir {1} tot {2} geskep nie.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Belasting sjabloon is verpligtend.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Belasting sjabloon is verpligtend.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Rekening {0}: Ouerrekening {1} bestaan nie
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Pryslyskoers (Maatskappy Geld)
 DocType: Products Settings,Products Settings,Produkte instellings
@@ -4031,12 +4123,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Item Wise Tax Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Instituut Afkorting
 ,Item-wise Price List Rate,Item-item Pryslys
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Verskaffer Kwotasie
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Verskaffer Kwotasie
 DocType: Quotation,In Words will be visible once you save the Quotation.,In Woorde sal sigbaar wees sodra jy die Kwotasie stoor.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Hoeveelheid ({0}) kan nie &#39;n breuk in ry {1} wees nie.
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Barcode {0} wat reeds in item {1} gebruik is
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Barcode {0} wat reeds in item {1} gebruik is
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Reëls vir die byvoeging van verskepingskoste.
 DocType: Item,Opening Stock,Openingsvoorraad
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kliënt word vereis
@@ -4054,9 +4146,8 @@
 DocType: Customer,From Lead,Van Lood
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Bestellings vrygestel vir produksie.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Kies fiskale jaar ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS-profiel wat nodig is om POS-inskrywing te maak
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS-profiel wat nodig is om POS-inskrywing te maak
 DocType: Program Enrollment Tool,Enroll Students,Teken studente in
-DocType: Hub Settings,Name Token,Naam Token
 DocType: Lab Test,Approved Date,Goedgekeurde Datum
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standaardverkope
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Ten minste een pakhuis is verpligtend
@@ -4074,7 +4165,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Menslike hulpbronne
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Betaalversoening Betaling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Belasting Bates
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Produksie bestelling is {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Produksie bestelling is {0}
 DocType: BOM Item,BOM No,BOM Nr
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Joernaal-inskrywing {0} het nie rekening {1} of alreeds teen ander geskenkbewyse aangepas nie
@@ -4094,7 +4185,7 @@
 DocType: Currency Exchange,To Currency,Om te Valuta
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Laat die volgende gebruikers toe om Laat aansoeke vir blokdae goed te keur.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Soorte koste-eis.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Verkoopsyfer vir item {0} is laer as sy {1}. Verkoopsyfer moet ten minste {2} wees
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Verkoopsyfer vir item {0} is laer as sy {1}. Verkoopsyfer moet ten minste {2} wees
 DocType: Item,Taxes,belasting
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Betaal en nie afgelewer nie
 DocType: Project,Default Cost Center,Verstek koste sentrum
@@ -4108,15 +4199,15 @@
 DocType: Employee Loan,Fully Disbursed,Volledig Uitbetaal
 DocType: Maintenance Visit,Customer Feedback,Kliëntterugvoer
 DocType: Account,Expense,koste
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Die telling kan nie groter as die maksimum telling wees nie
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Die telling kan nie groter as die maksimum telling wees nie
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Kliënte en Verskaffers
 DocType: Item Attribute,From Range,Van Reeks
 DocType: BOM,Set rate of sub-assembly item based on BOM,Stel koers van sub-items op basis van BOM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Sintaksfout in formule of toestand: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Sintaksfout in formule of toestand: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Daaglikse werkopsommingsinstellingsmaatskappy
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,Item {0} geïgnoreer omdat dit nie &#39;n voorraaditem is nie
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Dien hierdie Produksie Orde in vir verdere verwerking.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Dien hierdie Produksie Orde in vir verdere verwerking.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Om nie die prysreël in &#39;n bepaalde transaksie te gebruik nie, moet alle toepaslike prysreëls gedeaktiveer word."
 DocType: Assessment Group,Parent Assessment Group,Ouerassesseringsgroep
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Jobs
@@ -4133,12 +4224,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Stel asseblief die Maatskappyfilter leeg as Groep By &#39;Maatskappy&#39; is.
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Posdatum kan nie toekomstige datum wees nie
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Ry # {0}: reeksnommer {1} stem nie ooreen met {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,vir die herhaling van die herhalende
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Toevallige verlof
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Lab Test UOM.
 DocType: Batch,Batch ID,Lot ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Nota: {0}
 ,Delivery Note Trends,Delivery Notendendense
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Hierdie week se opsomming
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Hierdie week se opsomming
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Op voorraad Aantal
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Rekening: {0} kan slegs deur voorraadtransaksies opgedateer word
 DocType: Student Group Creation Tool,Get Courses,Kry kursusse
@@ -4152,7 +4244,6 @@
 DocType: Purchase Order,To Bill,Aan Bill
 DocType: Material Request,% Ordered,% Bestel
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Vir Kursusgebaseerde Studentegroep, sal die kursus vir elke student van die ingeskrewe Kursusse in Programinskrywing bekragtig word."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Tik E-pos adres geskei deur kommas, faktuur sal outomaties op &#39;n spesifieke datum gepos word"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,stukwerk
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Gem. Koopkoers
 DocType: Task,Actual Time (in Hours),Werklike tyd (in ure)
@@ -4166,7 +4257,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Item {0} is nie opgestel vir Serial Nos. Kolom moet leeg wees
 DocType: Accounts Settings,Accounts Settings,Rekeninge Instellings
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,goed te keur
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Geen resultaat om in te dien nie
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Geen resultaat om in te dien nie
 DocType: Customer,Sales Partner and Commission,Verkoopsvennoot en Kommissie
 DocType: Employee Loan,Rate of Interest (%) / Year,Rentekoers (%) / Jaar
 ,Project Quantity,Projek Hoeveelheid
@@ -4178,55 +4269,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Swart
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Item
 DocType: Account,Auditor,ouditeur
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} items geproduseer
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} items geproduseer
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Leer meer
 DocType: Cheque Print Template,Distance from top edge,Afstand van boonste rand
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Pryslys {0} is gedeaktiveer of bestaan nie
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Pryslys {0} is gedeaktiveer of bestaan nie
 DocType: Purchase Invoice,Return,terugkeer
 DocType: Production Order Operation,Production Order Operation,Produksie bestelling Operasie
 DocType: Pricing Rule,Disable,afskakel
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Betaalmetode is nodig om betaling te maak
 DocType: Project Task,Pending Review,Hangende beoordeling
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Aanstellings en konsultasies
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} is nie in die bondel {2} ingeskryf nie
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} is nie in die bondel {2} ingeskryf nie
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Bate {0} kan nie geskrap word nie, want dit is reeds {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Totale koste-eis (via koste-eis)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Merk afwesig
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Ry {0}: Geld van die BOM # {1} moet gelyk wees aan die gekose geldeenheid {2}
 DocType: Journal Entry Account,Exchange Rate,Wisselkoers
 DocType: Patient,Additional information regarding the patient,Bykomende inligting rakende die pasiënt
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Verkoopsbestelling {0} is nie ingedien nie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Verkoopsbestelling {0} is nie ingedien nie
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,Fooi-komponent
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Vloot bestuur
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Voeg items by
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Vloot bestuur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Voeg items by
 DocType: Cheque Print Template,Regular,gereelde
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Totale Gewig van alle Assesseringskriteria moet 100% wees.
-DocType: BOM,Last Purchase Rate,Laaste aankoopprys
+DocType: Purchase Order Item,Last Purchase Rate,Laaste aankoopprys
 DocType: Account,Asset,bate
 DocType: Project Task,Task ID,Taak ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Voorraad kan nie vir item {0} bestaan nie, aangesien dit variante het"
 DocType: Lab Test,Mobile,Mobile
 ,Sales Person-wise Transaction Summary,Verkope Persoonlike Transaksie Opsomming
 DocType: Training Event,Contact Number,Kontak nommer
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Warehouse {0} bestaan nie
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registreer Vir ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Warehouse {0} bestaan nie
 DocType: Monthly Distribution,Monthly Distribution Percentages,Maandelikse Verspreidingspersentasies
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Die gekose item kan nie Batch hê nie
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Waardasietarief nie vir die item {0} gevind nie, wat vereis word om rekeningkundige inskrywings vir {1} {2} te doen. As die item as &#39;n voorbeeld item in die {1} verhandel, noem dit asseblief in die {1} Item tabel. Andersins, skep asseblief &#39;n inkomende voorraadtransaksie vir die item of vermeld waardasietempo in die Item-rekord en probeer dan hierdie inskrywing in te dien / te kanselleer."
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% materiaal wat teen hierdie afleweringsnota afgelewer word
+DocType: Training Event,Has Certificate,Het sertifikaat
 DocType: Project,Customer Details,Kliënt Besonderhede
 DocType: Employee,Reports to,Verslae aan
 ,Unpaid Expense Claim,Onbetaalde koste-eis
 DocType: Payment Entry,Paid Amount,Betaalde bedrag
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Verken Verkoopsiklus
 DocType: Assessment Plan,Supervisor,toesighouer
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,Online
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,Online
 ,Available Stock for Packing Items,Beskikbare voorraad vir verpakking items
 DocType: Item Variant,Item Variant,Item Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Assesseringsresultate-instrument
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,"Bestellings wat ingedien is, kan nie uitgevee word nie"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,"Bestellings wat ingedien is, kan nie uitgevee word nie"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Rekeningbalans reeds in Debiet, jy mag nie &#39;Balans moet wees&#39; as &#39;Krediet&#39;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Gehalte bestuur
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Item {0} is gedeaktiveer
@@ -4246,7 +4336,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Ry # {0}: Tydsbesteding stryd met ry {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Laat zero waarderingspercentage toe
 DocType: Training Event Employee,Invited,Genooi
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Meervoudige aktiewe Salarisstrukture vir werknemer {0} vir die gegewe datums
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Meervoudige aktiewe Salarisstrukture vir werknemer {0} vir die gegewe datums
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Setup Gateway rekeninge.
 DocType: Employee,Employment Type,Indiensnemingstipe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Vaste Bates
@@ -4258,7 +4348,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Student e-pos ID
 DocType: Employee,Notice (days),Kennisgewing (dae)
 DocType: Tax Rule,Sales Tax Template,Sales Tax Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Kies items om die faktuur te stoor
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Kies items om die faktuur te stoor
 DocType: Employee,Encashment Date,Bevestigingsdatum
 DocType: Training Event,Internet,internet
 DocType: Special Test Template,Special Test Template,Spesiale Toets Sjabloon
@@ -4267,7 +4357,7 @@
 DocType: Production Order,Planned Operating Cost,Beplande bedryfskoste
 DocType: Academic Term,Term Start Date,Termyn Begindatum
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Oppentelling
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Bevestig asseblief aangehegte {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Bevestig asseblief aangehegte {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bankstaatbalans soos per Algemene Grootboek
 DocType: Job Applicant,Applicant Name,Aansoeker Naam
 DocType: Authorization Rule,Customer / Item Name,Kliënt / Item Naam
@@ -4287,7 +4377,7 @@
 DocType: Guardian,Guardian Of ,Voog van
 DocType: Grading Scale Interval,Threshold,Drumpel
 DocType: BOM Update Tool,Current BOM,Huidige BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Voeg serienommer by
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Voeg serienommer by
 DocType: Production Order Item,Available Qty at Source Warehouse,Beskikbare hoeveelheid by Source Warehouse
 apps/erpnext/erpnext/config/support.py +22,Warranty,waarborg
 DocType: Purchase Invoice,Debit Note Issued,Debiet Nota Uitgereik
@@ -4310,10 +4400,9 @@
 DocType: Account,Receivable,ontvangbaar
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ry # {0}: Nie toegelaat om Verskaffer te verander nie aangesien Aankoopbestelling reeds bestaan
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol wat toegelaat word om transaksies voor te lê wat groter is as kredietlimiete.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Kies items om te vervaardig
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Meesterdata-sinkronisering, dit kan tyd neem"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Kies items om te vervaardig
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Meesterdata-sinkronisering, dit kan tyd neem"
 DocType: Item,Material Issue,Materiële Uitgawe
-DocType: Hub Settings,Seller Description,Verkoper Beskrywing
 DocType: Employee Education,Qualification,kwalifikasie
 DocType: Item Price,Item Price,Itemprys
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Seep en wasmiddel
@@ -4321,7 +4410,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Van die tyd kan nie groter wees as die tyd nie.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,bestel
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,CV
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,CV
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"As dit geaktiveer is, sal die stelsel nie die velde van variante op die sjabloon opdateer nie, maar sal die data van onderstaande velde kopieer terwyl nuwe variant gemaak word"
 DocType: Salary Detail,Component,komponent
 DocType: Assessment Criteria,Assessment Criteria Group,Assesseringskriteria Groep
 DocType: Healthcare Settings,Patient Name By,Pasiënt Naam By
@@ -4331,7 +4421,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Voer asseblief &#39;n goedgekeurde rol of goedgekeurde gebruiker in
 DocType: Journal Entry,Write Off Entry,Skryf Uit Inskrywing
 DocType: BOM,Rate Of Materials Based On,Mate van materiaal gebaseer op
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Verskaffer&gt; Verskaffer Tipe
+DocType: Item Variant Settings,Do not Update Variants,Moenie variante opdateer nie
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Ondersteun Anaalkunde
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Ontmerk alles
 DocType: POS Profile,Terms and Conditions,Terme en voorwaardes
@@ -4340,7 +4430,7 @@
 DocType: Leave Block List,Applies to Company,Van toepassing op Maatskappy
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,Kan nie kanselleer nie aangesien ingevoerde Voorraadinskrywing {0} bestaan
 DocType: Employee Loan,Disbursement Date,Uitbetalingsdatum
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;Ontvangers&#39; is nie gespesifiseer nie
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Ontvangers&#39; is nie gespesifiseer nie
 DocType: BOM Update Tool,Update latest price in all BOMs,Werk die nuutste prys in alle BOM&#39;s
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Mediese Rekord
 DocType: Vehicle,Vehicle,voertuig
@@ -4355,14 +4445,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lei%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Bate Afskrywing en Saldo&#39;s
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Bedrag {0} {1} oorgedra vanaf {2} na {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Bedrag {0} {1} oorgedra vanaf {2} na {3}
 DocType: Sales Invoice,Get Advances Received,Kry voorskotte ontvang
 DocType: Email Digest,Add/Remove Recipients,Voeg / verwyder ontvangers
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Transaksie nie toegelaat teen gestop Produksie Orde {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Om hierdie fiskale jaar as verstek te stel, klik op &#39;Stel as verstek&#39;"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,aansluit
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,aansluit
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Tekort
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Item variant {0} bestaan met dieselfde eienskappe
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Item variant {0} bestaan met dieselfde eienskappe
 DocType: Employee Loan,Repay from Salary,Terugbetaal van Salaris
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Versoek betaling teen {0} {1} vir bedrag {2}
@@ -4375,7 +4465,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Verkoopsvolgepunt
 DocType: Salary Slip,Payment Days,Betalingsdae
 DocType: Patient,Dormant,dormant
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Pakhuise met kinderknope kan nie na grootboek omskep word nie
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Pakhuise met kinderknope kan nie na grootboek omskep word nie
 DocType: BOM,Manage cost of operations,Bestuur koste van bedrywighede
 DocType: Accounts Settings,Stale Days,Stale Days
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Wanneer enige van die gekontroleerde transaksies &quot;Submitted&quot; is, word &#39;n e-pos opspring outomaties geopen om &#39;n e-pos na die betrokke &quot;Kontak&quot; in die transaksie te stuur, met die transaksie as &#39;n aanhangsel. Die gebruiker kan of mag nie die e-pos stuur nie."
@@ -4389,10 +4479,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Rekeningnommer {0} is reeds ontvang
 ,Requested Items To Be Transferred,Gevraagde items wat oorgedra moet word
 DocType: Expense Claim,Vehicle Log,Voertuiglogboek
-DocType: Purchase Invoice,Recurring Id,Herhalende ID
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),Aanwesigheid van &#39;n koors (temp&gt; 38.5 ° C / 101.3 ° F of volgehoue temperatuur&gt; 38 ° C / 100.4 ° F)
 DocType: Customer,Sales Team Details,Verkoopspanbesonderhede
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Vee permanent uit?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Vee permanent uit?
 DocType: Expense Claim,Total Claimed Amount,Totale eisbedrag
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potensiële geleenthede vir verkoop.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Ongeldige {0}
@@ -4402,7 +4491,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Departement winkels
 ,Item Delivery Date,Item Afleweringsdatum
 DocType: Warehouse,PIN,SPELD
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Stel jou skool op in ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Stel jou skool op in ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Basisveranderingsbedrag (Maatskappygeld)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Geen rekeningkundige inskrywings vir die volgende pakhuise nie
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Stoor die dokument eerste.
@@ -4414,13 +4503,12 @@
 DocType: Task,Is Milestone,Is Milestone
 DocType: Daily Work Summary,Email Sent To,E-pos gestuur na
 DocType: Budget,Warn,waarsku
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Is jy seker jy wil ontsluit?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Enige ander opmerkings, noemenswaardige poging wat in die rekords moet plaasvind."
 DocType: BOM,Manufacturing User,Vervaardigingsgebruiker
 DocType: Purchase Invoice,Raw Materials Supplied,Grondstowwe voorsien
-DocType: Purchase Invoice,Recurring Print Format,Herhalende drukformaat
 DocType: C-Form,Series,reeks
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Geld van die pryslys {0} moet {1} of {2} wees.
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Voeg produkte by
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Geld van die pryslys {0} moet {1} of {2} wees.
 DocType: Appraisal,Appraisal Template,Appraisal Template
 DocType: Item Group,Item Classification,Item Klassifikasie
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Besigheids Ontwikkelings Bestuurder
@@ -4434,7 +4522,7 @@
 DocType: Item Attribute Value,Attribute Value,Attribuutwaarde
 ,Itemwise Recommended Reorder Level,Itemwise Recommended Reorder Level
 DocType: Salary Detail,Salary Detail,Salarisdetail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Kies asseblief eers {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Kies asseblief eers {0}
 DocType: Appointment Type,Physician,dokter
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Batch {0} van Item {1} is verval.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,konsultasies
@@ -4445,7 +4533,7 @@
 DocType: Salary Detail,Default Amount,Verstekbedrag
 DocType: Lab Test Template,Descriptive,beskrywende
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Pakhuis nie in die stelsel gevind nie
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Hierdie maand se opsomming
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Hierdie maand se opsomming
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kwaliteit Inspeksie Lees
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Vries voorraad ouer as` moet kleiner as% d dae wees.
 DocType: Tax Rule,Purchase Tax Template,Aankoop belasting sjabloon
@@ -4468,12 +4556,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Opleidingsgebeure / resultate
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Opgehoopte waardevermindering soos op
 DocType: Sales Invoice,C-Form Applicable,C-vorm van toepassing
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Operasie Tyd moet groter wees as 0 vir Operasie {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Operasie Tyd moet groter wees as 0 vir Operasie {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Pakhuis is verpligtend
 DocType: Supplier,Address and Contacts,Adres en Kontakte
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Gesprek Detail
 DocType: Program,Program Abbreviation,Program Afkorting
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Produksie bestelling kan nie teen &#39;n Item Sjabloon verhoog word nie
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Produksie bestelling kan nie teen &#39;n Item Sjabloon verhoog word nie
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Kostes word opgedateer in Aankoopontvangste teen elke item
 DocType: Warranty Claim,Resolved By,Besluit deur
 DocType: Bank Guarantee,Start Date,Begindatum
@@ -4499,26 +4587,27 @@
 DocType: Employee,Educational Qualification,opvoedkundige kwalifikasie
 DocType: Workstation,Operating Costs,Bedryfskoste
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Aksie indien opgehoopte maandelikse begroting oorskry
-DocType: Purchase Invoice,Submit on creation,Dien op die skepping in
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Geld vir {0} moet {1} wees
+DocType: Subscription,Submit on creation,Dien op die skepping in
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Geld vir {0} moet {1} wees
 DocType: Asset,Disposal Date,Vervreemdingsdatum
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-pos sal gestuur word aan alle Aktiewe Werknemers van die maatskappy op die gegewe uur, indien hulle nie vakansie het nie. Opsomming van antwoorde sal om middernag gestuur word."
 DocType: Employee Leave Approver,Employee Leave Approver,Werknemerverlofgoedkeuring
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Ry {0}: &#39;n Herbestellinginskrywing bestaan reeds vir hierdie pakhuis {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Kan nie verklaar word as verlore nie, omdat aanhaling gemaak is."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Opleiding Terugvoer
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Ry {0}: &#39;n Herbestellinginskrywing bestaan reeds vir hierdie pakhuis {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Kan nie verklaar word as verlore nie, omdat aanhaling gemaak is."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Opleiding Terugvoer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Produksie bestelling {0} moet ingedien word
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Verskaffer Scorecard Criteria
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Kies asseblief begin datum en einddatum vir item {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Kursus is verpligtend in ry {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Tot op datum kan nie voor die datum wees nie
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Voeg pryse by
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Voeg pryse by
 DocType: Batch,Parent Batch,Ouer-bondel
 DocType: Cheque Print Template,Cheque Print Template,Gaan afdruk sjabloon
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Grafiek van kostesentrums
 DocType: Lab Test Template,Sample Collection,Voorbeeld versameling
 ,Requested Items To Be Ordered,Gevraagde items om bestel te word
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,My Bestellings
 DocType: Price List,Price List Name,Pryslys Naam
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Daaglikse werkopsomming vir {0}
 DocType: Employee Loan,Totals,totale
@@ -4537,12 +4626,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} eenhede van {1} benodig in {2} op {3} {4} vir {5} om hierdie transaksie te voltooi.
 DocType: Fee Schedule,Student Category,Student Kategorie
 DocType: Announcement,Student,student
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Organisasie-eenheid (departement) meester.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Organisasie-eenheid (departement) meester.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Gaan na kamers
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Vul asseblief die boodskap in voordat u dit stuur
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,DUPLIKAAT VIR VERSKAFFER
 DocType: Email Digest,Pending Quotations,Hangende kwotasies
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Verkooppunt Profiel
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Verkooppunt Profiel
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Lab Test Configurations.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Onversekerde Lenings
 DocType: Cost Center,Cost Center Name,Koste Sentrum Naam
@@ -4552,6 +4641,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Totale Betaalde Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Boodskappe groter as 160 karakters word in verskeie boodskappe verdeel
 DocType: Purchase Receipt Item,Received and Accepted,Ontvang en aanvaar
+DocType: Hub Settings,Company and Seller Profile,Maatskappy en Verkoper Profiel
 ,GST Itemised Sales Register,GST Itemized Sales Register
 ,Serial No Service Contract Expiry,Serial No Service Contract Expiry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Jy kan nie dieselfde rekening op dieselfde tyd krediet en debiteer nie
@@ -4561,10 +4651,11 @@
 DocType: Item,Variant Based On,Variant gebaseer op
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Totale gewig toegeken moet 100% wees. Dit is {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Jou verskaffers
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Korrigeer asseblief die
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Kan nie as verlore gestel word nie aangesien verkoopsbestelling gemaak is.
 DocType: Request for Quotation Item,Supplier Part No,Verskaffer Deelnr
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan nie aftrek as die kategorie vir &#39;Waardasie&#39; of &#39;Vaulering en Totaal&#39; is nie.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Ontvang van
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Ontvang van
 DocType: Lead,Converted,Omgeskakel
 DocType: Item,Has Serial No,Het &#39;n serienummer
 DocType: Employee,Date of Issue,Datum van uitreiking
@@ -4572,7 +4663,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Soos vir die koop-instellings as aankoopversoek benodig == &#39;JA&#39;, dan moet u vir aankoop-kwitansie eers vir item {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Ry # {0}: Stel verskaffer vir item {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Ry {0}: Ure waarde moet groter as nul wees.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Webwerfbeeld {0} verbonde aan Item {1} kan nie gevind word nie
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Webwerfbeeld {0} verbonde aan Item {1} kan nie gevind word nie
 DocType: Issue,Content Type,Inhoud Tipe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,rekenaar
 DocType: Item,List this Item in multiple groups on the website.,Lys hierdie item in verskeie groepe op die webwerf.
@@ -4583,14 +4674,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Kry ongekonfronteerde inskrywings
 DocType: Payment Reconciliation,From Invoice Date,Vanaf faktuur datum
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Jy het nie toestemming om in te dien nie
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,Faktuurgeldeenheid moet gelyk wees aan óf die standaardmaatskappy se geldeenheid of partyrekening-geldeenheid
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Faktuurgeldeenheid moet gelyk wees aan óf die standaardmaatskappy se geldeenheid of partyrekening-geldeenheid
 DocType: Healthcare Settings,Laboratory Settings,Laboratorium instellings
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Verlaat Encashment
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Wat doen dit?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Na pakhuis
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Alle Studentetoelatings
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Wat doen dit?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Na pakhuis
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Alle Studentetoelatings
 ,Average Commission Rate,Gemiddelde Kommissie Koers
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,&#39;Het &#39;n serienummer&#39; kan nie &#39;Ja&#39; wees vir nie-voorraaditem
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,&#39;Het &#39;n serienummer&#39; kan nie &#39;Ja&#39; wees vir nie-voorraaditem
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Kies Status
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Bywoning kan nie vir toekomstige datums gemerk word nie
 DocType: Pricing Rule,Pricing Rule Help,Pricing Rule Help
@@ -4608,40 +4699,40 @@
 DocType: Item,Customer Code,Kliënt Kode
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Verjaardag Herinnering vir {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dae sedert Laaste bestelling
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Debiet Vir rekening moet &#39;n balansstaatrekening wees
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Debiet Vir rekening moet &#39;n balansstaatrekening wees
 DocType: Buying Settings,Naming Series,Naming Series
 DocType: Leave Block List,Leave Block List Name,Verlaat bloklys naam
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Versekering Aanvangsdatum moet minder wees as Versekerings-einddatum
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Stel asseblief die instrukteur se naamstelsel in Skool&gt; Skoolinstellings op
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Voorraadbates
 DocType: Timesheet,Production Detail,Produksie Detail
+DocType: Restaurant,Active Menu,Aktiewe kieslys
 DocType: Target Detail,Target Qty,Teiken Aantal
 DocType: Shopping Cart Settings,Checkout Settings,Checkout instellings
 DocType: Attendance,Present,teenwoordig
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Afleweringsnotasie {0} moet nie ingedien word nie
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Afleweringsnotasie {0} moet nie ingedien word nie
 DocType: Notification Control,Sales Invoice Message,Verkoopsfaktuurboodskap
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Sluitingsrekening {0} moet van die tipe Aanspreeklikheid / Ekwiteit wees
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Salaris Slip van werknemer {0} reeds geskep vir tydskrif {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Salaris Slip van werknemer {0} reeds geskep vir tydskrif {1}
 DocType: Vehicle Log,Odometer,odometer
 DocType: Sales Order Item,Ordered Qty,Bestelde hoeveelheid
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Item {0} is gedeaktiveer
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Item {0} is gedeaktiveer
 DocType: Stock Settings,Stock Frozen Upto,Voorraad Bevrore Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM bevat geen voorraaditem nie
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Projek aktiwiteit / taak.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM bevat geen voorraaditem nie
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Projek aktiwiteit / taak.
 DocType: Vehicle Log,Refuelling Details,Aanwending besonderhede
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Genereer Salarisstrokies
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Koop moet gekontroleer word, indien toepaslik vir is gekies as {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Korting moet minder as 100 wees
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Laaste aankoop koers nie gevind nie
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skryf af Bedrag (Maatskappy Geld)
 DocType: Sales Invoice Timesheet,Billing Hours,Rekeningure
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,Verstek BOM vir {0} nie gevind nie
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Ry # {0}: Stel asseblief die volgorde van hoeveelheid in
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Verstek BOM vir {0} nie gevind nie
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Ry # {0}: Stel asseblief die volgorde van hoeveelheid in
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Tik items om hulle hier te voeg
 DocType: Fees,Program Enrollment,Programinskrywing
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Cost Voucher
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Stel asseblief {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Herhaal op Dag van Maand
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} is onaktiewe student
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} is onaktiewe student
 DocType: Employee,Health Details,Gesondheids besonderhede
 DocType: Offer Letter,Offer Letter Terms,Bied die Boodskap Voorwaardes
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,"Om &#39;n Betalingsversoek te maak, is verwysingsdokument nodig"
@@ -4649,7 +4740,6 @@
 DocType: Employee External Work History,Salary,Salaris
 DocType: Serial No,Delivery Document Type,Afleweringsdokument Tipe
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Dien alle salarisstrokies in vir die bogenoemde geselekteerde kriteria
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Items gesinkroniseer
 DocType: Sales Order,Partly Delivered,Gedeeltelik afgelewer
 DocType: Email Digest,Receivables,debiteure
 DocType: Lead Source,Lead Source,Loodbron
@@ -4670,19 +4760,19 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Veroudering Reeks 2
 DocType: SG Creation Tool Course,Max Strength,Maksimum sterkte
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM vervang
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Kies items gebaseer op Afleweringsdatum
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Kies items gebaseer op Afleweringsdatum
 ,Sales Analytics,Verkope Analytics
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Beskikbaar {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Beskikbaar {0}
 ,Prospects Engaged But Not Converted,Vooruitsigte Betrokke Maar Nie Omskep
 DocType: Manufacturing Settings,Manufacturing Settings,Vervaardigingsinstellings
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,E-pos opstel
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Voog 1 Mobiele Nr
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Voer asseblief die standaard geldeenheid in Company Master in
 DocType: Stock Entry Detail,Stock Entry Detail,Voorraad Invoer Detail
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Daaglikse onthounotas
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Daaglikse onthounotas
 DocType: Products Settings,Home Page is Products,Tuisblad is Produkte
 ,Asset Depreciation Ledger,Bate Waardevermindering Grootboek
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Belastingreël strydig met {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Belastingreël strydig met {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nuwe rekening naam
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Grondstowwe Voorsien Koste
 DocType: Selling Settings,Settings for Selling Module,Instellings vir Verkoop Module
@@ -4696,8 +4786,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Item {0} moet &#39;n voorraaditem wees
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Verstek werk in voortgang Warehouse
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Verstekinstellings vir rekeningkundige transaksies.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Installeer asseblief die Naam van Werknemers in Menslike Hulpbronne&gt; MH-instellings
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Verwagte datum kan nie voor die materiaalversoekdatum wees nie
+DocType: Restaurant,Default Tax Template,Standaard belasting sjabloon
 DocType: Fees,Student Details,Studente Besonderhede
 DocType: Purchase Invoice Item,Stock Qty,Voorraad Aantal
 DocType: Employee Loan,Repayment Period in Months,Terugbetalingsperiode in maande
@@ -4715,8 +4806,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Gaan na items
 DocType: Sales Partner,Partner Type,Vennoot Tipe
 DocType: Purchase Taxes and Charges,Actual,werklike
+DocType: Restaurant Menu,Restaurant Manager,Restaurant Bestuurder
 DocType: Authorization Rule,Customerwise Discount,Kliënte afslag
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Tydrooster vir take.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Tydrooster vir take.
 DocType: Purchase Invoice,Against Expense Account,Teen koste rekening
 DocType: Production Order,Production Order,Produksie Orde
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Installasie Nota {0} is reeds ingedien
@@ -4724,7 +4816,6 @@
 DocType: Quotation Item,Against Docname,Teen Docname
 DocType: SMS Center,All Employee (Active),Alle werknemer (aktief)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Bekyk nou
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Kies die tydperk wanneer die faktuur outomaties sal gegenereer word
 DocType: BOM,Raw Material Cost,Grondstofkoste
 DocType: Item Reorder,Re-Order Level,Herbestellingsvlak
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Voer items en beplande hoeveelheid in waarvoor u produksieopdragte wil inwin of rou materiaal vir analise aflaai.
@@ -4737,23 +4828,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Verslag Tipe is verpligtend
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Pakhuis is verpligtend vir voorraad Item {0} in ry {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Voeg programme by
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Kleinhandel en Groothandel
 DocType: Issue,First Responded On,Eerste Reageer Op
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kruis lys van items in verskeie groepe
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiskale Jaar Begindatum en Fiskale Jaar Einddatum is reeds in fiskale jaar {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Opruimingsdatum opgedateer
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Gesplete bondel
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Gesplete bondel
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Suksesvol versoen
 DocType: Request for Quotation Supplier,Download PDF,Laai PDF af
 DocType: Production Order,Planned End Date,Beplande Einddatum
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Voer asseblief die skedule datum in
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Waar items gestoor word.
 DocType: Request for Quotation,Supplier Detail,Verskaffer Detail
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Fout in formule of toestand: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Fout in formule of toestand: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Gefaktureerde bedrag
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kriteria gewigte moet tot 100%
 DocType: Attendance,Attendance,Bywoning
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,Voorraaditems
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,Voorraaditems
 DocType: BOM,Materials,materiaal
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Indien nie gekontroleer nie, moet die lys by elke Departement gevoeg word waar dit toegepas moet word."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Source and Target Warehouse kan nie dieselfde wees nie
@@ -4771,6 +4862,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,Op Netto Totaal
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Waarde vir kenmerk {0} moet binne die omvang van {1} tot {2} in die inkremente van {3} vir Item {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Teiken pakhuis in ry {0} moet dieselfde wees as Produksie Orde
+DocType: Restaurant Reservation,Waitlisted,waglys
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Geld kan nie verander word nadat inskrywings gebruik gemaak is van &#39;n ander geldeenheid nie
 DocType: Vehicle Service,Clutch Plate,Koppelplaat
 DocType: Company,Round Off Account,Round Off Account
@@ -4787,7 +4879,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nuwe verkope persoon se naam
 DocType: Packing Slip,Gross Weight UOM,Bruto Gewig UOM
 DocType: Delivery Note Item,Against Sales Invoice,Teen Verkoopfaktuur
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Voer asseblief die reeksnommers vir die gekose item in
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Voer asseblief die reeksnommers vir die gekose item in
 DocType: Bin,Reserved Qty for Production,Gereserveerde hoeveelheid vir produksie
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Los ongeskik as jy nie joernaal wil oorweeg as jy kursusgebaseerde groepe maak nie.
 DocType: Asset,Frequency of Depreciation (Months),Frekwensie van waardevermindering (maande)
@@ -4798,7 +4890,7 @@
 DocType: Lab Test,Test Group,Toetsgroep
 DocType: Payment Reconciliation,Receivable / Payable Account,Ontvangbare / Betaalbare Rekening
 DocType: Delivery Note Item,Against Sales Order Item,Teen Verkooporder Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Spesifiseer asseblief kenmerkwaarde vir attribuut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Spesifiseer asseblief kenmerkwaarde vir attribuut {0}
 DocType: Item,Default Warehouse,Standaard pakhuis
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Begroting kan nie toegeken word teen Groeprekening {0}
 DocType: Healthcare Settings,Patient Registration,Pasiëntregistrasie
@@ -4827,6 +4919,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Verkoopspersoon
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Begroting en Koste Sentrum
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Veelvuldige verstekmodus van betaling is nie toegelaat nie
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,vir die
 ,Appointment Analytics,Aanstelling Analytics
 DocType: Vehicle Service,Half Yearly,Half jaarliks
 DocType: Lead,Blog Subscriber,Blog intekenaar
@@ -4844,7 +4937,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Kwotelling
 ,BOM Stock Report,BOM Voorraad Verslag
 DocType: Stock Reconciliation Item,Quantity Difference,Hoeveelheidsverskil
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Verwerking van betaalstaat
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Verwerking van betaalstaat
 DocType: Opportunity Item,Basic Rate,Basiese tarief
 DocType: GL Entry,Credit Amount,Kredietbedrag
 DocType: Cheque Print Template,Signatory Position,Ondertekenende Posisie
@@ -4858,12 +4951,12 @@
 DocType: Tax Rule,Tax Rule,Belastingreël
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Onderhou dieselfde tarief dwarsdeur verkoopsiklus
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Beplan tydstamme buite werkstasie werksure.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Kliënte in wachtrij
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} het nie &#39;n dokterskedule nie. Voeg dit by die dokter meester in
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Kliënte in wachtrij
 DocType: Student,Nationality,nasionaliteit
 ,Items To Be Requested,Items wat gevra moet word
-DocType: Purchase Order,Get Last Purchase Rate,Kry Laaste Aankoopprys
 DocType: Company,Company Info,Maatskappyinligting
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Kies of voeg nuwe kliënt by
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Kies of voeg nuwe kliënt by
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Koste sentrum is nodig om &#39;n koste-eis te bespreek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Toepassing van fondse (bates)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Dit is gebaseer op die bywoning van hierdie Werknemer
@@ -4871,6 +4964,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Debietrekening
 DocType: Fiscal Year,Year Start Date,Jaar Begindatum
 DocType: Attendance,Employee Name,Werknemer Naam
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restaurant bestellinginskrywing item
 DocType: Sales Invoice,Rounded Total (Company Currency),Afgerond Totaal (Maatskappy Geld)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Kan nie in Groep verskuil word nie omdat rekeningtipe gekies is.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} is gewysig. Herlaai asseblief.
@@ -4881,6 +4975,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Werknemervoordele
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Gepakte hoeveelheid moet gelyke hoeveelheid vir Item {0} in ry {1}
 DocType: Production Order,Manufactured Qty,Vervaardigde Aantal
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Invoice Created
 DocType: Purchase Receipt Item,Accepted Quantity,Geaccepteerde hoeveelheid
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Stel asseblief &#39;n standaard Vakansie Lys vir Werknemer {0} of Maatskappy {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} bestaan nie
@@ -4890,18 +4985,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ry nr {0}: Bedrag kan nie groter wees as hangende bedrag teen koste-eis {1} nie. Hangende bedrag is {2}
 DocType: Maintenance Schedule,Schedule,skedule
 DocType: Account,Parent Account,Ouerrekening
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Beskikbaar
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Beskikbaar
 DocType: Quality Inspection Reading,Reading 3,Lees 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Pryslys nie gevind of gedeaktiveer nie
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Pryslys nie gevind of gedeaktiveer nie
 DocType: Lab Test,Approved,goedgekeur
 DocType: Pricing Rule,Price,prys
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',Werknemer verlig op {0} moet gestel word as &#39;Links&#39;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Werknemer verlig op {0} moet gestel word as &#39;Links&#39;
+DocType: Hub Settings,Last Sync On,Laaste sinchroniseer op
 DocType: Guardian,Guardian,voog
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Evaluering {0} geskep vir Werknemer {1} in die gegewe datumreeks
 DocType: Employee,Education,onderwys
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,del
 DocType: Selling Settings,Campaign Naming By,Veldtog naam deur
 DocType: Employee,Current Address Is,Huidige adres Is
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Maandelikse verkoopsdoelwit (
@@ -4916,7 +5012,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Kursuskode:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Voer asseblief koste-rekening in
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ry # {0}: Verwysingsdokumenttipe moet een van Aankope, Aankoopfaktuur of Tydskrifinskrywing wees"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ry # {0}: Verwysingsdokumenttipe moet een van Aankope, Aankoopfaktuur of Tydskrifinskrywing wees"
 DocType: Employee,Current Address,Huidige adres
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","As die item &#39;n variant van &#39;n ander item is, sal beskrywing, beeld, prys, belasting ens van die sjabloon gestel word tensy dit spesifiek gespesifiseer word"
 DocType: Serial No,Purchase / Manufacture Details,Aankoop- / Vervaardigingsbesonderhede
@@ -4947,7 +5043,7 @@
 DocType: Hub Settings,Hub Settings,Hub-instellings
 DocType: Project,Gross Margin %,Bruto Marge%
 DocType: BOM,With Operations,Met bedrywighede
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Rekeningkundige inskrywings is reeds in geldeenheid {0} vir maatskappy {1} gemaak. Kies asseblief &#39;n ontvangbare of betaalbare rekening met valuta {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Rekeningkundige inskrywings is reeds in geldeenheid {0} vir maatskappy {1} gemaak. Kies asseblief &#39;n ontvangbare of betaalbare rekening met valuta {0}.
 DocType: Asset,Is Existing Asset,Is Bestaande Bate
 DocType: Salary Detail,Statistical Component,Statistiese komponent
 DocType: Warranty Claim,If different than customer address,As anders as kliënt adres
@@ -4955,13 +5051,14 @@
 DocType: BOM Operation,BOM Operation,BOM Operasie
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Op vorige rybedrag
 DocType: Student,Home Address,Huisadres
+DocType: Item,Has Expiry Date,Het vervaldatum
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Item Variant instellings.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Oordrag Bate
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,Oordrag Bate
 DocType: POS Profile,POS Profile,POS Profiel
 DocType: Training Event,Event Name,Gebeurtenis Naam
 DocType: Physician,Phone (Office),Telefoon (Kantoor)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,Toegang
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Toelating vir {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,Toegang
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Toelating vir {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Seisoenaliteit vir die opstel van begrotings, teikens ens."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Veranderlike Naam
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Item {0} is &#39;n sjabloon, kies asseblief een van sy variante"
@@ -4970,7 +5067,7 @@
 DocType: Assessment Plan,Room,kamer
 DocType: Purchase Order,Advance Paid,Voorskot Betaal
 DocType: Item,Item Tax,Itembelasting
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Materiaal aan verskaffer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Materiaal aan verskaffer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Aksynsfaktuur
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Drempel {0}% verskyn meer as een keer
 DocType: Expense Claim,Employees Email Id,Werknemers E-pos ID
@@ -4981,32 +5078,30 @@
 DocType: Program,Program Name,Program Naam
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Oorweeg Belasting of Heffing vir
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Werklike hoeveelheid is verpligtend
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} het tans &#39;n {1} Verskaffer Scorecard, en aankope bestellings aan hierdie verskaffer moet met omsigtigheid uitgereik word."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} het tans &#39;n {1} Verskaffer Scorecard, en aankope bestellings aan hierdie verskaffer moet met omsigtigheid uitgereik word."
 DocType: Employee Loan,Loan Type,Lening Tipe
 DocType: Scheduling Tool,Scheduling Tool,Skeduleringsinstrument
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Kredietkaart
 DocType: BOM,Item to be manufactured or repacked,Item wat vervaardig of herverpak moet word
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Verstekinstellings vir voorraadtransaksies.
-DocType: Purchase Invoice,Next Date,Volgende Datum
 DocType: Employee Education,Major/Optional Subjects,Hoofvakke / Opsionele Vakke
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
+DocType: Hub Settings,Suspended,opgeskort
 DocType: Training Event,Attendees,deelnemers
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Hier kan jy familie besonderhede soos naam en beroep van ouer, gade en kinders handhaaf"
 DocType: Academic Term,Term End Date,Termyn Einddatum
-DocType: Hub Settings,Seller Name,Verkoper Naam
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Belasting en heffings afgetrek (Maatskappy Geld)
 DocType: Item Group,General Settings,Algemene instellings
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Van Geld en Geld kan nie dieselfde wees nie
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Voeg instrukteurs by
 DocType: Stock Entry,Repack,herverpak
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,U moet die vorm stoor voordat u verder gaan
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Kies asseblief die Maatskappy eerste
 DocType: Item Attribute,Numeric Values,Numeriese waardes
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Heg Logo aan
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Voorraadvlakke
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Voorraadvlakke
 DocType: Customer,Commission Rate,Kommissie Koers
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Geskep {0} telkaarte vir {1} tussen:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Maak Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Maak Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blok verlaat aansoeke per departement.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Betalingstipe moet een van ontvang, betaal en interne oordrag wees"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -5021,11 +5116,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Kapitaalvoorraad
 DocType: Shopping Cart Settings,Show Public Attachments,Wys publieke aanhangsels
 DocType: Packing Slip,Package Weight Details,Pakket Gewig Besonderhede
+DocType: Restaurant Reservation,Reservation Time,Besprekingstyd
 DocType: Payment Gateway Account,Payment Gateway Account,Betaling Gateway rekening
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Na betaling voltooiing herlei gebruiker na geselekteerde bladsy.
 DocType: Company,Existing Company,Bestaande Maatskappy
 DocType: Healthcare Settings,Result Emailed,Resultaat ge-e-pos
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",Belastingkategorie is verander na &quot;Totaal&quot; omdat al die items nie-voorraaditems is
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Item Kode&gt; Itemgroep&gt; Handelsmerk
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Kies asseblief &#39;n CSV-lêer
 DocType: Student Leave Application,Mark as Present,Merk as Aanwesig
 DocType: Supplier Scorecard,Indicator Color,Indicator Kleur
@@ -5050,11 +5147,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Maak Studentejoernaal
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Is vorentoe
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Kry items van BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Kry items van BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lood Tyddae
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Ry # {0}: Posdatum moet dieselfde wees as aankoopdatum {1} van bate {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Kontroleer of die Student by die Instituut se koshuis woon.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Vul asseblief die bestellings in die tabel hierbo in
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Vul asseblief die bestellings in die tabel hierbo in
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Nie ingedien salarisstrokies nie
 ,Stock Summary,Voorraadopsomming
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Oordra &#39;n bate van een pakhuis na &#39;n ander
@@ -5070,5 +5167,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Ry {0}: Debietinskrywing kan nie met &#39;n {1} gekoppel word nie.
 DocType: Journal Entry,Subscription Section,Subskripsie afdeling
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Rekening {0} bestaan nie
+DocType: Training Event,Training Program,Opleidingsprogram
 DocType: Account,Cash,kontant
 DocType: Employee,Short biography for website and other publications.,Kort biografie vir webwerf en ander publikasies.
diff --git a/erpnext/translations/am.csv b/erpnext/translations/am.csv
index 1717658..0ff5b45 100644
--- a/erpnext/translations/am.csv
+++ b/erpnext/translations/am.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,ደመወዝ ሁነታ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,መዝግብ
 DocType: Patient,Divorced,በፍቺ
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,ንጥሎች አስቀድመው የተመሳሰሉ
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,ንጥል አንድ ግብይት ውስጥ በርካታ ጊዜያት መታከል ፍቀድ
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,የቁስ ይጎብኙ {0} ይህን የዋስትና የይገባኛል ጥያቄ በመሰረዝ በፊት ይቅር
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,የሸማቾች ምርቶች
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Approvers ውጣ
 DocType: Sales Partner,Dealer,ሻጭ
 DocType: Consultation,Investigations,ምርመራዎች
+DocType: Restaurant Order Entry,Click Enter To Add,ለማከል አስገባን ጠቅ ያድርጉ
 DocType: Employee,Rented,ተከራይቷል
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,ተጠቃሚ ተገቢነት
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","አቁሟል የምርት ትዕዛዝ ሊሰረዝ አይችልም, ለመሰረዝ መጀመሪያ Unstop"
 DocType: Vehicle Service,Mileage,ርቀት
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,እርግጠኛ ነዎት ይህን ንብረት ቁራጭ ትፈልጋለህ?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,እርግጠኛ ነዎት ይህን ንብረት ቁራጭ ትፈልጋለህ?
 DocType: Drug Prescription,Update Schedule,መርሐግብርን ያዘምኑ
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,ይምረጡ ነባሪ አቅራቢ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},የምንዛሬ ዋጋ ዝርዝር ያስፈልጋል {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,ተገኝነትን ያረጋግጡ
 DocType: Job Applicant,Job Applicant,ሥራ አመልካች
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,ይሄ በዚህ አቅራቢው ላይ ግብይቶችን ላይ የተመሠረተ ነው. ዝርዝሮችን ለማግኘት ከታች ያለውን የጊዜ ይመልከቱ
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,ተጨማሪ ውጤቶች የሉም.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,ሕጋዊ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},ትክክለኛው ዓይነት የግብር ረድፍ ውስጥ ንጥል ተመን ውስጥ ሊካተቱ አይችሉም {0}
 DocType: Bank Guarantee,Customer,ደምበኛ
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),የውጭ ምንዛሪ ተመን ጋር ተመሳሳይ መሆን አለበት {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,የደንበኛ ስም
 DocType: Vehicle,Natural Gas,የተፈጥሮ ጋዝ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},የባንክ ሂሳብ እንደ የሚባል አይችልም {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},የባንክ ሂሳብ እንደ የሚባል አይችልም {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ኃላፊዎች (ወይም ቡድኖች) ይህም ላይ አካውንቲንግ ግቤቶችን ናቸው እና ሚዛን ጠብቆ ነው.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),ያልተከፈሉ {0} ሊሆን አይችልም ከ ዜሮ ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,ወደ ሥራ ለመግባት የሚያስፈልጉ የደመወዝ ሠሌዳዎች የሉም.
 DocType: Manufacturing Settings,Default 10 mins,10 ደቂቃ ነባሪ
 DocType: Leave Type,Leave Type Name,አይነት ስም ውጣ
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,ክፍት አሳይ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,ዛሬም ይህንን እርምጃ እራሱ ከላይ ከተጠቀሰበት ጊዜ መውሰድ አስፈላጊ ነው
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,ተከታታይ በተሳካ ሁኔታ ዘምኗል
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,ጨርሰህ ውጣ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural ጆርናል Entry ተረክቧል
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,የግዢ ትዕዛዝ ንጥሎች ይቀበሉ ዘንድ
 DocType: SMS Center,All Supplier Contact,ሁሉም አቅራቢው ያግኙን
 DocType: Support Settings,Support Settings,የድጋፍ ቅንብሮች
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,የሚጠበቀው የማብቂያ ቀን የተጠበቀው የመጀመሪያ ቀን ያነሰ መሆን አይችልም
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,የሚጠበቀው የማብቂያ ቀን የተጠበቀው የመጀመሪያ ቀን ያነሰ መሆን አይችልም
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,የረድፍ # {0}: ተመን ጋር ተመሳሳይ መሆን አለበት {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,አዲስ ፈቃድ ማመልከቻ
 ,Batch Item Expiry Status,ባች ንጥል የሚቃጠልበት ሁኔታ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,ባንክ ረቂቅ
 DocType: Mode of Payment Account,Mode of Payment Account,የክፍያ መለያ ሁነታ
 DocType: Consultation,Consultation,ምክክር
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,ሽያጭ እና ተመላሾች
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,አሳይ አይነቶች
 DocType: Academic Term,Academic Term,ትምህርታዊ የሚቆይበት ጊዜ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,ቁሳዊ
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,የጤና ጥበቃ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ክፍያ መዘግየት (ቀኖች)
 DocType: Lab Prescription,Lab Prescription,ላብራቶሪ መድኃኒት
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,በ ዋጋ ለይ
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,የአገልግሎት የወጪ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},መለያ ቁጥር: {0} አስቀድሞ የሽያጭ ደረሰኝ ውስጥ የተጠቆመው ነው: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,የዋጋ ዝርዝር
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},መለያ ቁጥር: {0} አስቀድሞ የሽያጭ ደረሰኝ ውስጥ የተጠቆመው ነው: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,የዋጋ ዝርዝር
 DocType: Maintenance Schedule Item,Periodicity,PERIODICITY
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,በጀት ዓመት {0} ያስፈልጋል
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,መከላከያ
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,የረድፍ # {0}:
 DocType: Timesheet,Total Costing Amount,ጠቅላላ የኳንቲቲ መጠን
 DocType: Delivery Note,Vehicle No,የተሽከርካሪ ምንም
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,የዋጋ ዝርዝር እባክዎ ይምረጡ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,የዋጋ ዝርዝር እባክዎ ይምረጡ
 DocType: Accounts Settings,Currency Exchange Settings,የምንዛሬ ልውውጥ ቅንብሮች
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,የረድፍ # {0}: የክፍያ ሰነዱን trasaction ለማጠናቀቅ ያስፈልጋል
 DocType: Production Order Operation,Work In Progress,ገና በሂደት ላይ ያለ ስራ
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,ቀን ይምረጡ
 DocType: Employee,Holiday List,የበዓል ዝርዝር
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,እባክዎ የመምህርውን ስም ማዕክል ስርዓት ውስጥ በትምህርት ቤት&gt; የትምህርት ቤት ቅንጅቶች ያዋቅሩ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,ሒሳብ ሠራተኛ
+DocType: Hub Settings,Selling Price List,የዋጋ ዝርዝር ዋጋ
 DocType: Patient,Tobacco Current Use,የትምባሆ ወቅታዊ አጠቃቀም
 DocType: Cost Center,Stock User,የአክሲዮን ተጠቃሚ
 DocType: Company,Phone No,ስልክ የለም
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,እርግጥ ነው መርሐግብሮች ተፈጥሯል:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},አዲስ {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},አዲስ {0}: # {1}
 ,Sales Partners Commission,የሽያጭ አጋሮች ኮሚሽን
 DocType: Purchase Invoice,Rounding Adjustment,የመደለያ ማስተካከያ
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,ከ 5 በላይ ቁምፊዎች ሊኖሩት አይችልም ምህጻረ ቃል
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,የወላጅ ዝርዝር DOCNAME
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","ማጣቀሻ: {0}, የእቃ ኮድ: {1} እና የደንበኞች: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,ኪግ
-DocType: Student Log,Log,ምዝግብ ማስታወሻ
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,የሥራ ዕድል።
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} ውጤት ተገዝቷል
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} ውጤት ተገዝቷል
 DocType: Item Attribute,Increment,ጨምር
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,የጊዜ ወሰን
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,መጋዘን ይምረጡ ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,ያገባ
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},አይፈቀድም {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,ከ ንጥሎችን ያግኙ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},የአክሲዮን አሰጣጥ ማስታወሻ ላይ መዘመን አይችልም {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},የአክሲዮን አሰጣጥ ማስታወሻ ላይ መዘመን አይችልም {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},የምርት {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,የተዘረዘሩት ምንም ንጥሎች የሉም
 DocType: Payment Reconciliation,Reconcile,ያስታርቅ
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,የጡረታ ፈንድ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,ቀጣይ የእርጅና ቀን ግዢ ቀን በፊት ሊሆን አይችልም
 DocType: Consultation,Consultation Date,የምክክር ቀን
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,የምርት ዝርዝር እና ግኝት ለ ERPNext ተጠቃሚዎች
 DocType: SMS Center,All Sales Person,ሁሉም ሽያጭ ሰው
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ወርሃዊ ስርጭት ** የእርስዎን ንግድ ውስጥ ወቅታዊ ቢኖራችሁ ወራት በመላ በጀት / ዒላማ ለማሰራጨት ይረዳል.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,ንጥሎች አልተገኘም
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,ደመወዝ መዋቅር ይጎድላል
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,ንጥሎች አልተገኘም
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,ደመወዝ መዋቅር ይጎድላል
 DocType: Lead,Person Name,ሰው ስም
 DocType: Sales Invoice Item,Sales Invoice Item,የሽያጭ ደረሰኝ ንጥል
 DocType: Account,Credit,የሥዕል
 DocType: POS Profile,Write Off Cost Center,ወጪ ማዕከል ጠፍቷል ይጻፉ
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",ለምሳሌ &quot;አንደኛ ደረጃ ትምህርት ቤት&quot; ወይም &quot;ዩኒቨርሲቲ&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",ለምሳሌ &quot;አንደኛ ደረጃ ትምህርት ቤት&quot; ወይም &quot;ዩኒቨርሲቲ&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,የክምችት ሪፖርቶች
 DocType: Warehouse,Warehouse Detail,የመጋዘን ዝርዝር
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},የክሬዲት ገደብ ደንበኛ ተሻገሩ ተደርጓል {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,የሚለው ቃል መጨረሻ ቀን በኋላ የሚለው ቃል ጋር የተያያዘ ነው ይህም ወደ የትምህርት ዓመት ዓመት መጨረሻ ቀን በላይ መሆን አይችልም (የትምህርት ዓመት {}). ቀናት ለማረም እና እንደገና ይሞክሩ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",የንብረት ዘገባ ንጥል ላይ አለ እንደ ካልተደረገበት ሊሆን አይችልም &quot;ቋሚ ንብረት ነው&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",የንብረት ዘገባ ንጥል ላይ አለ እንደ ካልተደረገበት ሊሆን አይችልም &quot;ቋሚ ንብረት ነው&quot;
 DocType: Vehicle Service,Brake Oil,ፍሬን ኦይል
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ደንበኛ&gt; የሽያጭ ቡድን&gt; ግዛት
 DocType: Tax Rule,Tax Type,የግብር አይነት
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,ግብር የሚከፈልበት መጠን
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},ከእናንተ በፊት ግቤቶችን ማከል ወይም ዝማኔ ስልጣን አይደለም {0}
 DocType: BOM,Item Image (if not slideshow),ንጥል ምስል (የተንሸራታች አይደለም ከሆነ)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,አንድ የደንበኛ በተመሳሳይ ስም አለ
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ሰዓት ተመን / 60) * ትክክለኛ ኦፕሬሽን ሰዓት
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,ረድፍ # {0}: የማጣቀሻ ሰነድ አይነት ከክፍያ መጠየቂያ ወይም የጆርናል ምዝገባ አንድ አካል መሆን አለበት
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,ይምረጡ BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,ረድፍ # {0}: የማጣቀሻ ሰነድ አይነት ከክፍያ መጠየቂያ ወይም የጆርናል ምዝገባ አንድ አካል መሆን አለበት
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,ይምረጡ BOM
 DocType: SMS Log,SMS Log,ኤስ ኤም ኤስ ምዝግብ ማስታወሻ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,የደረሱ ንጥሎች መካከል ወጪ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} ላይ ያለው የበዓል ቀን ጀምሮ እና ቀን ወደ መካከል አይደለም
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,የሰራተኛ ብድር
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,የእንቅስቃሴ ምዝግብ ማስታወሻ:
 DocType: Fee Schedule,Send Payment Request Email,የክፍያ ጥያቄ ኤሜል ይላኩ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,{0} ንጥል ሥርዓት ውስጥ የለም ወይም ጊዜው አልፎበታል
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,{0} ንጥል ሥርዓት ውስጥ የለም ወይም ጊዜው አልፎበታል
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,መጠነሰፊ የቤት ግንባታ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,መለያ መግለጫ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ፋርማሱቲካልስ
@@ -210,17 +213,22 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,አስመጣ ምዝግብ ማስታወሻ
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,ከላይ መስፈርቶች ላይ የተመሠረቱ አይነት ማምረት በቁሳዊ ረገድ ጥያቄ ይጎትቱ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,በተሳካ ሁኔታ አልተመዘገበም.
 DocType: Training Result Employee,Grade,ደረጃ
+DocType: Restaurant Table,No of Seats,የመቀመጫዎች ቁጥር
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","ተለዋዋጭ ርዕሰ ጉዳይን ለማከል, እንደ እንዲህ ያሉ የጃንጃ መለያን ይጠቀሙ <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,አቅራቢ በ ደርሷል
 DocType: SMS Center,All Contact,ሁሉም እውቂያ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,የምርት ትዕዛዝ አስቀድሞ BOM ጋር ሁሉም ንጥሎች የተፈጠሩ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,የምርት ትዕዛዝ አስቀድሞ BOM ጋር ሁሉም ንጥሎች የተፈጠሩ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,ዓመታዊ ደመወዝ
 DocType: Daily Work Summary,Daily Work Summary,ዕለታዊ የስራ ማጠቃለያ
 DocType: Period Closing Voucher,Closing Fiscal Year,በጀት ዓመት መዝጊያ
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} የታሰሩ ነው
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,መለያዎች ገበታ ለመፍጠር የወቅቱ ኩባንያ ይምረጡ
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} የታሰሩ ነው
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,መለያዎች ገበታ ለመፍጠር የወቅቱ ኩባንያ ይምረጡ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,የክምችት ወጪ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ዒላማ መጋዘን ይምረጡ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,ዒላማ መጋዘን ይምረጡ
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,ተመራጭ የእውቂያ ኢሜይል ያስገቡ
 DocType: Program Enrollment,School Bus,የትምህርት ቤት አውቶቡስ
 DocType: Journal Entry,Contra Entry,Contra የሚመዘገብ መረጃ
@@ -237,9 +245,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","ወደ መለጠፊያ አውርድ ተገቢ የውሂብ መሙላት እና የተሻሻለው ፋይል ማያያዝ. በተመረጠው ክፍለ ጊዜ ውስጥ ሁሉም ቀኖች እና ሠራተኛ ጥምረት አሁን ያሉ ክትትል መዛግብት ጋር, በአብነት ውስጥ ይመጣል"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,{0} ንጥል ንቁ አይደለም ወይም የሕይወት መጨረሻ ደርሷል
+DocType: Student Admission Program,Minimum Age,ትንሹ የእድሜ
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,ምሳሌ: መሰረታዊ የሂሳብ ትምህርት
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ንጥል መጠን ረድፍ {0} ውስጥ ግብርን ማካተት, ረድፎች ውስጥ ቀረጥ {1} ደግሞ መካተት አለበት"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,የሰው ሀይል ሞዱል ቅንብሮች
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,የሰው ሀይል ሞዱል ቅንብሮች
 DocType: SMS Center,SMS Center,ኤስ ኤም ኤስ ማዕከል
 DocType: Sales Invoice,Change Amount,ለውጥ መጠን
 DocType: BOM Update Tool,New BOM,አዲስ BOM
@@ -249,7 +258,7 @@
 DocType: Lead,Request Type,ጥያቄ አይነት
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,የሰራተኛ አድርግ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ብሮድካስቲንግ
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,ክፍሎች አክል
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),የ POS (በኦንላይን / ከመስመር ውጭ) የመጫኛ ሞድ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,ማስፈጸም
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ስለ ስራዎች ዝርዝሮች ፈጽሟል.
 DocType: Serial No,Maintenance Status,ጥገና ሁኔታ
@@ -272,6 +281,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,የዋጋ ዝርዝር መግዛት እና መሸጥ ተፈጻሚ መሆን አለበት
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},ጭነትን ቀን ንጥል ለ የመላኪያ ቀን በፊት ሊሆን አይችልም {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),የዋጋ ዝርዝር ተመን ላይ ቅናሽ (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,ባዮኬሚስትሪ
 DocType: Offer Letter,Select Terms and Conditions,ይምረጡ ውሎች እና ሁኔታዎች
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,ውጪ ዋጋ
 DocType: Production Planning Tool,Sales Orders,የሽያጭ ትዕዛዞች
@@ -306,15 +316,15 @@
 DocType: Sales Partner,Reseller,ሻጭ
 DocType: Codification Table,Medical Code,የህክምና ኮድ
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","ከተመረጠ, ቁሳዊ ጥያቄዎች ውስጥ ያልሆኑ-የአክሲዮን ንጥሎች ያካትታል."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,ኩባንያ ያስገቡ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,ኩባንያ ያስገቡ
 DocType: Delivery Note Item,Against Sales Invoice Item,የሽያጭ ደረሰኝ ንጥል ላይ
 ,Production Orders in Progress,በሂደት ላይ የምርት ትዕዛዞች
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,በገንዘብ ከ የተጣራ ገንዘብ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","የአካባቢ ማከማቻ ሙሉ ነው, ሊያድን አይችልም ነበር"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","የአካባቢ ማከማቻ ሙሉ ነው, ሊያድን አይችልም ነበር"
 DocType: Lead,Address & Contact,አድራሻ እና ዕውቂያ
 DocType: Leave Allocation,Add unused leaves from previous allocations,ወደ ቀዳሚው አመዳደብ ጀምሮ ጥቅም ላይ ያልዋለ ቅጠሎችን አክል
 DocType: Sales Partner,Partner website,የአጋር ድር ጣቢያ
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,ንጥል አክል
+DocType: Restaurant Order Entry,Add Item,ንጥል አክል
 DocType: Lab Test,Custom Result,ብጁ ውጤት
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,የዕውቂያ ስም
 DocType: Course Assessment Criteria,Course Assessment Criteria,የኮርስ ግምገማ መስፈርት
@@ -327,7 +337,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ግዢ ይጠይቁ.
 DocType: Lab Test,Submitted Date,የተረከበት ቀን
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,ይሄ በዚህ ፕሮጀክት ላይ የተፈጠረውን ጊዜ ሉሆች ላይ የተመሠረተ ነው
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,የተጣራ ክፍያ ከ 0 መሆን አይችልም
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,የተጣራ ክፍያ ከ 0 መሆን አይችልም
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",በስርዓቱ ተደጋጋሚ የስህተት ማሳወቂያን መላክ ለማቆም በመመዝገቢያ ውስጥ የነቃ መስክን መርምረናል
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,ብቻ የተመረጠው ፈቃድ አጽዳቂ ይህ ፈቃድ ማመልከቻ ማስገባት ይችላሉ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,ቀን የሚያስታግሱ በመቀላቀል ቀን የበለጠ መሆን አለበት
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,ዓመት በአንድ ማምለኩን
@@ -336,9 +347,10 @@
 DocType: Email Digest,Profit & Loss,ትርፍ እና ኪሳራ
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Litre
 DocType: Task,Total Costing Amount (via Time Sheet),(ጊዜ ሉህ በኩል) ጠቅላላ ዋጋና መጠን
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,እባክዎ ተማሪዎች በተማሪዎች ቡድኖች ውስጥ ያዋቅሯቸው
 DocType: Item Website Specification,Item Website Specification,ንጥል የድር ጣቢያ ዝርዝር
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ውጣ የታገዱ
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},ንጥል {0} ላይ ሕይወት ፍጻሜው ላይ ደርሷል {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},ንጥል {0} ላይ ሕይወት ፍጻሜው ላይ ደርሷል {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,ባንክ ግቤቶችን
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,ዓመታዊ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,የክምችት ማስታረቅ ንጥል
@@ -347,7 +359,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,የተማሪ ቡድን የፈጠራ መሣሪያ ኮርስ
 DocType: Lead,Do Not Contact,ያነጋግሩ አትበል
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,በእርስዎ ድርጅት ውስጥ የሚያስተምሩ ሰዎች
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,ሁሉም ተደጋጋሚ ደረሰኞችን መከታተያ የ ልዩ መታወቂያ. ማስገባት ላይ የመነጨ ነው.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,ሶፍትዌር ገንቢ
 DocType: Item,Minimum Order Qty,የስራ ልምድ ትዕዛዝ ብዛት
 DocType: Pricing Rule,Supplier Type,አቅራቢው አይነት
@@ -357,17 +368,19 @@
 DocType: Item,Publish in Hub,ማዕከል ውስጥ አትም
 DocType: Student Admission,Student Admission,የተማሪ ምዝገባ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,{0} ንጥል ተሰርዟል
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,ቁሳዊ ጥያቄ
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,{0} ንጥል ተሰርዟል
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,ቁሳዊ ጥያቄ
 DocType: Bank Reconciliation,Update Clearance Date,አዘምን መልቀቂያ ቀን
 DocType: Item,Purchase Details,የግዢ ዝርዝሮች
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},የግዥ ትዕዛዝ ውስጥ &#39;ጥሬ እቃዎች አቅርቦት&#39; ሠንጠረዥ ውስጥ አልተገኘም ንጥል {0} {1}
 DocType: Patient Relation,Relation,ዘመድ
 DocType: Shipping Rule,Worldwide Shipping,ዓለም አቀፍ መላኪያ
 DocType: Patient Relation,Mother,እናት
+DocType: Restaurant Reservation,Reservation End Time,የተያዘ የመቆያ ጊዜ
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,ደንበኞች ከ ተረጋግጧል ትዕዛዞች.
 DocType: Purchase Receipt Item,Rejected Quantity,ውድቅ ብዛት
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,የክፍያ ጥያቄ {0} ተፈጥሯል
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,የክፍያ ጥያቄ {0} ተፈጥሯል
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,ዝቅተኛ አነቃቂነት
 DocType: Notification Control,Notification Control,የማሳወቂያ ቁጥጥር
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,እባክህ ሥልጠናህን ካጠናቀቅህ በኋላ አረጋግጥ
 DocType: Lead,Suggestions,ጥቆማዎች
@@ -387,7 +400,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,የተቀጣሪ ውስጥ የተመረጡ ተመራጭ ኢሜይል ላይ የተመሠረተ ሰራተኛ ኢሜይሎች የደመወዝ ወረቀት
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,በዝርዝሩ ውስጥ የመጀመሪያው ፈቃድ አጽዳቂ ነባሪ ፈቃድ አጽዳቂ ተዘጋጅቷል ይሆናል
 DocType: Tax Rule,Shipping County,የመርከብ ካውንቲ
-apps/erpnext/erpnext/config/desktop.py +158,Learn,ይወቁ
+apps/erpnext/erpnext/config/desktop.py +159,Learn,ይወቁ
 DocType: Asset,Next Depreciation Date,ቀጣይ የእርጅና ቀን
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,የተቀጣሪ በአንድ እንቅስቃሴ ወጪ
 DocType: Accounts Settings,Settings for Accounts,መለያዎች ቅንብሮች
@@ -398,13 +411,13 @@
 DocType: Item,Synced With Hub,ማዕከል ጋር ተመሳስሏል
 DocType: Vehicle,Fleet Manager,መርከቦች ሥራ አስኪያጅ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},የረድፍ # {0}: {1} ንጥል አሉታዊ ሊሆን አይችልም {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,የተሳሳተ የይለፍ ቃል
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,የተሳሳተ የይለፍ ቃል
 DocType: Item,Variant Of,ነው ተለዋጭ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',ይልቅ &#39;ብዛት ለማምረት&#39; ተጠናቋል ብዛት የበለጠ መሆን አይችልም
 DocType: Period Closing Voucher,Closing Account Head,የመለያ ኃላፊ በመዝጋት ላይ
 DocType: Employee,External Work History,ውጫዊ የስራ ታሪክ
 DocType: Physician,Time per Appointment,በሰዓት / በቀጠሮ
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,ክብ ማጣቀሻ ስህተት
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,ክብ ማጣቀሻ ስህተት
 DocType: Appointment Type,Is Inpatient,ታካሚ ማለት ነው
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 ስም
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,የ የመላኪያ ማስታወሻ ማስቀመጥ አንዴ ቃላት (ላክ) ውስጥ የሚታይ ይሆናል.
@@ -413,19 +426,18 @@
 DocType: Lead,Industry,ኢንድስትሪ
 DocType: Employee,Job Profile,የሥራው መገለጫ
 DocType: BOM Item,Rate & Amount,ደረጃ እና ምን ያህል መጠን
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,እባክዎ በአካባቢያዊ ቅንጅቶች በኩል የቁጥር ተከታታይ ቁጥሮች ያስተካክሉ&gt; በማስተካከል ተከታታይ ቁጥር
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,ይህ በኩባንያው ግዥዎች ላይ የተመሠረተ ነው. ለዝርዝሮች ከታች ያለውን የጊዜ መስመር ይመልከቱ
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ራስ-ሰር የቁስ ጥያቄ መፍጠር ላይ በኢሜይል አሳውቅ
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,መቋቋም የሚችል
 DocType: Journal Entry,Multi Currency,ባለብዙ ምንዛሬ
 DocType: Payment Reconciliation Invoice,Invoice Type,የደረሰኝ አይነት
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ደንበኛ&gt; የሽያጭ ቡድን&gt; ግዛት
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,የመላኪያ ማስታወሻ
 DocType: Consultation,Encounter Impression,የግፊት ማሳያ
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,ግብሮች በማቀናበር ላይ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,የተሸጠ ንብረት ዋጋ
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,አንተም አፈረሰ በኋላ የክፍያ Entry ተቀይሯል. እንደገና ጎትተው እባክህ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} ንጥል ግብር ውስጥ ሁለት ጊዜ ገብቶ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,በዚህ ሳምንት እና በመጠባበቅ ላይ ያሉ እንቅስቃሴዎች ማጠቃለያ
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} ንጥል ግብር ውስጥ ሁለት ጊዜ ገብቶ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,በዚህ ሳምንት እና በመጠባበቅ ላይ ያሉ እንቅስቃሴዎች ማጠቃለያ
 DocType: Student Applicant,Admitted,አምኗል
 DocType: Workstation,Rent Cost,የቤት ኪራይ ወጪ
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,መጠን መቀነስ በኋላ
@@ -439,36 +451,35 @@
 DocType: Shipping Rule,Valid for Countries,አገሮች የሚሰራ
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ይህ ንጥል አብነት ነው ግብይቶች ላይ ሊውል አይችልም. &#39;ምንም ቅዳ »ከተዋቀረ በስተቀር ንጥል ባህሪዎች ልዩነቶች ወደ ላይ ይገለበጣሉ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,እንደሆነ የመሠከሩለት ጠቅላላ ትዕዛዝ
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","የተቀጣሪ ስያሜ (ለምሳሌ ሥራ አስፈጻሚ, ዳይሬክተር ወዘተ)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","የተቀጣሪ ስያሜ (ለምሳሌ ሥራ አስፈጻሚ, ዳይሬክተር ወዘተ)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,የደንበኛ ምንዛሬ ደንበኛ መሰረታዊ ምንዛሬ በመለወጥ ነው በ ተመን
 DocType: Course Scheduling Tool,Course Scheduling Tool,የኮርስ ዕቅድ መሣሪያ
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},የረድፍ # {0}: የግዢ ደረሰኝ አንድ ነባር ንብረት ላይ ማድረግ አይቻልም {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[አስቸኳይ] ለ% s ተደጋጋሚ% s በመፍጠር ላይ ሳለ ስህተት
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[አስቸኳይ] ለ% s ተደጋጋሚ% s በመፍጠር ላይ ሳለ ስህተት
 DocType: Item Tax,Tax Rate,የግብር ተመን
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} አስቀድሞ የሰራተኛ የተመደበው {1} ወደ ጊዜ {2} ለ {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,ንጥል ምረጥ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,ንጥል ምረጥ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,የደረሰኝ {0} አስቀድሞ ገብቷል ነው ይግዙ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},የረድፍ # {0}: የጅምላ ምንም እንደ አንድ አይነት መሆን አለበት {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,ያልሆኑ ቡድን መቀየር
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,አንድ ንጥል ባች (ዕጣ).
 DocType: C-Form Invoice Detail,Invoice Date,የደረሰኝ ቀን
 DocType: GL Entry,Debit Amount,ዴት መጠን
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},ብቻ በ ኩባንያ በአንድ 1 መለያ ሊኖር ይችላል {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,አባሪ ይመልከቱ
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},ብቻ በ ኩባንያ በአንድ 1 መለያ ሊኖር ይችላል {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,አባሪ ይመልከቱ
 DocType: Purchase Order,% Received,% ደርሷል
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,የተማሪ ቡድኖች ይፍጠሩ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,ማዋቀር አስቀድሞ ሙሉ !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,ማዋቀር አስቀድሞ ሙሉ !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,የብድር ማስታወሻ መጠን
 DocType: Setup Progress Action,Action Document,የእርምጃ ሰነድ
 ,Finished Goods,ጨርሷል ምርቶች
 DocType: Delivery Note,Instructions,መመሪያዎች
 DocType: Quality Inspection,Inspected By,በ ለመመርመር
 DocType: Maintenance Visit,Maintenance Type,ጥገና አይነት
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} የቀየረ ውስጥ አልተመዘገበም ነው {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,የእንጥል ኮድ&gt; የንጥል ቡድን&gt; ግሩፕ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} የቀየረ ውስጥ አልተመዘገበም ነው {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},ተከታታይ አይ {0} የመላኪያ ማስታወሻ የእርሱ ወገን አይደለም {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext ማሳያ
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,ንጥሎች አክል
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,ንጥሎች አክል
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,ንጥል ጥራት ምርመራ መለኪያ
 DocType: Leave Application,Leave Approver Name,አጽዳቂ ስም ውጣ
 DocType: Depreciation Schedule,Schedule Date,መርሐግብር ቀን
@@ -488,7 +499,7 @@
 DocType: Salary Slip Timesheet,Working Hours,የስራ ሰዓት
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,አንድ ነባር ተከታታይ ጀምሮ / የአሁኑ ቅደም ተከተል ቁጥር ለውጥ.
 DocType: Dosage Strength,Strength,ጥንካሬ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,አዲስ ደንበኛ ይፍጠሩ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,አዲስ ደንበኛ ይፍጠሩ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","በርካታ የዋጋ ደንቦች አይችሉአትም የሚቀጥሉ ከሆነ, ተጠቃሚዎች ግጭት ለመፍታት በእጅ ቅድሚያ ለማዘጋጀት ይጠየቃሉ."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,የግዢ ትዕዛዞች ፍጠር
 ,Purchase Register,የግዢ ይመዝገቡ
@@ -507,7 +518,7 @@
 DocType: Lab Test Template,Single,ያላገባ
 DocType: Salary Slip,Total Loan Repayment,ጠቅላላ ብድር የሚያየን
 DocType: Account,Cost of Goods Sold,የዕቃዎችና ወጪ የተሸጡ
-DocType: Purchase Invoice,Yearly,በየአመቱ
+DocType: Subscription,Yearly,በየአመቱ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,ወጪ ማዕከል ያስገቡ
 DocType: Drug Prescription,Dosage,የመመገቢያ
 DocType: Journal Entry Account,Sales Order,የሽያጭ ትዕዛዝ
@@ -537,7 +548,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,"በሙሉ አቅማቸው ባለማምረታቸው, ሂደቶች ዓለም አቀፍ ቅንብሮች."
 DocType: Accounts Settings,Accounts Frozen Upto,Frozen እስከሁለት መለያዎች
 DocType: SMS Log,Sent On,ላይ የተላከ
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,አይነታ {0} አይነታዎች ሠንጠረዥ ውስጥ በርካታ ጊዜ ተመርጠዋል
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,አይነታ {0} አይነታዎች ሠንጠረዥ ውስጥ በርካታ ጊዜ ተመርጠዋል
 DocType: HR Settings,Employee record is created using selected field. ,የተቀጣሪ መዝገብ የተመረጠው መስክ በመጠቀም የተፈጠረ ነው.
 DocType: Sales Order,Not Applicable,ተፈፃሚ የማይሆን
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,የበዓል ጌታ.
@@ -562,13 +573,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,የተመደበ ጠቅላላ ቅጠሎች የግዴታ ነው
 DocType: Patient,AB Positive,AB አዎንታዊ ነው
 DocType: Job Opening,Description of a Job Opening,የክፍት ሥራው ዝርዝር
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,በዛሬው ጊዜ በመጠባበቅ ላይ እንቅስቃሴዎች
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,በዛሬው ጊዜ በመጠባበቅ ላይ እንቅስቃሴዎች
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,የ ተሳትፎ ሬኮርዱ.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet የተመሠረተ ለደምዎዝ ደመወዝ ክፍለ አካል.
 DocType: Sales Order Item,Used for Production Plan,የምርት ዕቅድ ላይ ውሏል
 DocType: Employee Loan,Total Payment,ጠቅላላ ክፍያ
 DocType: Manufacturing Settings,Time Between Operations (in mins),(ደቂቃዎች ውስጥ) ክወናዎች መካከል ሰዓት
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,"{0} {1} እርምጃ ሊጠናቀቅ አልቻለም, ስለዚህ ተሰርዟል"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,"{0} {1} እርምጃ ሊጠናቀቅ አልቻለም, ስለዚህ ተሰርዟል"
 DocType: Customer,Buyer of Goods and Services.,ዕቃዎችና አገልግሎቶች የገዢ.
 DocType: Journal Entry,Accounts Payable,ተከፋይ መለያዎች
 DocType: Patient,Allergies,አለርጂዎች
@@ -580,22 +591,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,የግዢ ትዕዛዞችን ያስጠንቅቁ
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,የእርስዎ ደንበኞች መካከል ጥቂቶቹን ዘርዝር. እነዚህ ድርጅቶች ወይም ግለሰቦች ሊሆን ይችላል.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,በቂ ክፍሎች መመሥረት የሚቻለው
+DocType: POS Profile User,POS Profile User,POS የመገለጫ ተጠቃሚ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,ቀጥታ ገቢ
 DocType: Patient Appointment,Date TIme,ቀን እቅድ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","መለያ ተመድበው ከሆነ, መለያ ላይ የተመሠረተ ማጣሪያ አይቻልም"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,አስተዳደር ክፍል ኃላፊ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,ኮርስ ይምረጡ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,ኮርስ ይምረጡ
 DocType: Codification Table,Codification Table,የማጣቀሻ ሰንጠረዥ
 DocType: Timesheet Detail,Hrs,ሰዓቶች
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,ኩባንያ ይምረጡ
 DocType: Stock Entry Detail,Difference Account,ልዩነት መለያ
 DocType: Purchase Invoice,Supplier GSTIN,አቅራቢ GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,በሥሯ ተግባር {0} ዝግ አይደለም የቅርብ ተግባር አይችሉም.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,የቁስ ጥያቄ ይነሣል ለዚህም መጋዘን ያስገቡ
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,በሥሯ ተግባር {0} ዝግ አይደለም የቅርብ ተግባር አይችሉም.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,የቁስ ጥያቄ ይነሣል ለዚህም መጋዘን ያስገቡ
 DocType: Production Order,Additional Operating Cost,ተጨማሪ ስርዓተ ወጪ
 DocType: Lab Test Template,Lab Routine,ላብራቶሪ መደበኛ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,መዋቢያዎች
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","ማዋሃድ, የሚከተሉትን ንብረቶች ሁለቱም ንጥሎች ጋር ተመሳሳይ መሆን አለበት"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","ማዋሃድ, የሚከተሉትን ንብረቶች ሁለቱም ንጥሎች ጋር ተመሳሳይ መሆን አለበት"
 DocType: Shipping Rule,Net Weight,የተጣራ ክብደት
 DocType: Employee,Emergency Phone,የአደጋ ጊዜ ስልክ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,ግዛ
@@ -605,7 +617,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,ገደብ 0% የሚሆን ክፍል ለመወሰን እባክዎ
 DocType: Sales Order,To Deliver,ለማዳን
 DocType: Purchase Invoice Item,Item,ንጥል
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,ተከታታይ ምንም ንጥል ክፍልፋይ ሊሆን አይችልም
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,ከፍተኛ ስበት
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,ተከታታይ ምንም ንጥል ክፍልፋይ ሊሆን አይችልም
 DocType: Journal Entry,Difference (Dr - Cr),ልዩነት (ዶክተር - CR)
 DocType: Account,Profit and Loss,ትርፍ ማጣት
 DocType: Patient,Risk Factors,የጭንቀት ሁኔታዎች
@@ -614,7 +627,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,ማኔጂንግ Subcontracting
 DocType: Vital Signs,Body Temperature,የሰውነት ሙቀት
 DocType: Project,Project will be accessible on the website to these users,ፕሮጀክት በእነዚህ ተጠቃሚዎች ወደ ድረ ገጽ ላይ ተደራሽ ይሆናል
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,የፕሮጀክት አይነት ይግለጹ.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,የፕሮጀክት አይነት ይግለጹ.
 DocType: Supplier Scorecard,Weighting Function,የክብደት ተግባር
 DocType: Physician,OP Consulting Charge,የ OP የምክር አገልግሎት ክፍያ
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,ያዘጋጁት
@@ -628,7 +641,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,ጭማሬ 0 መሆን አይችልም
 DocType: Production Planning Tool,Material Requirement,ቁሳዊ ተፈላጊ
 DocType: Company,Delete Company Transactions,ኩባንያ ግብይቶች ሰርዝ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,ማጣቀሻ የለም እና የማጣቀሻ ቀን ባንክ ግብይት ግዴታ ነው
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,ማጣቀሻ የለም እና የማጣቀሻ ቀን ባንክ ግብይት ግዴታ ነው
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ አርትዕ ግብሮች እና ክፍያዎች ያክሉ
 DocType: Payment Entry Reference,Supplier Invoice No,አቅራቢ ደረሰኝ የለም
 DocType: Territory,For reference,ለማጣቀሻ
@@ -636,12 +649,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions",መሰረዝ አይቻልም መለያ የለም {0}: ይህ የአክሲዮን ግብይቶች ላይ የዋለው እንደ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),የመመዝገቢያ ጊዜ (CR)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,ሰላም
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,አንቀሳቅስ ንጥል
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,አንቀሳቅስ ንጥል
 DocType: Serial No,Warranty Period (Days),የዋስትና ክፍለ ጊዜ (ቀኖች)
 DocType: Installation Note Item,Installation Note Item,የአጫጫን ማስታወሻ ንጥል
 DocType: Production Plan Item,Pending Qty,በመጠባበቅ ላይ ብዛት
 DocType: Budget,Ignore,ችላ
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} ንቁ አይደለም
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} ንቁ አይደለም
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,የህትመት ማዋቀር ቼክ ልኬቶችን
 DocType: Salary Slip,Salary Slip Timesheet,የቀጣሪ Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ንዑስ-በኮንትራት የግዢ ደረሰኝ ለማግኘት የግዴታ በአቅራቢዎች መጋዘን
@@ -650,7 +663,7 @@
 DocType: Pricing Rule,Sales Partner,የሽያጭ አጋር
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,ሁሉም የአቅራቢ መለኪያ ካርዶች.
 DocType: Buying Settings,Purchase Receipt Required,የግዢ ደረሰኝ ያስፈልጋል
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,የመክፈቻ የአክሲዮን ገብቶ ከሆነ ግምቱ ተመን የግዴታ ነው
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,የመክፈቻ የአክሲዮን ገብቶ ከሆነ ግምቱ ተመን የግዴታ ነው
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,በ የደረሰኝ ሠንጠረዥ ውስጥ አልተገኘም ምንም መዝገቦች
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,በመጀመሪያ ኩባንያ እና የፓርቲ አይነት ይምረጡ
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,የፋይናንስ / የሂሳብ ዓመት ነው.
@@ -687,7 +700,7 @@
 DocType: Quotation,Quotation To,ወደ ጥቅስ
 DocType: Lead,Middle Income,የመካከለኛ ገቢ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),በመክፈት ላይ (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,እናንተ አስቀድሞ ከሌላ UOM አንዳንድ ግብይት (ዎች) ምክንያቱም ንጥል ለ ይለኩ ነባሪ ክፍል {0} በቀጥታ ሊቀየር አይችልም. የተለየ ነባሪ UOM ለመጠቀም አዲስ ንጥል መፍጠር አለብዎት.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,እናንተ አስቀድሞ ከሌላ UOM አንዳንድ ግብይት (ዎች) ምክንያቱም ንጥል ለ ይለኩ ነባሪ ክፍል {0} በቀጥታ ሊቀየር አይችልም. የተለየ ነባሪ UOM ለመጠቀም አዲስ ንጥል መፍጠር አለብዎት.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,የተመደበ መጠን አሉታዊ መሆን አይችልም
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,ካምፓኒው ማዘጋጀት እባክዎ
 DocType: Purchase Order Item,Billed Amt,የሚከፈል Amt
@@ -701,6 +714,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,ይምረጡ የክፍያ መለያ ባንክ የሚመዘገብ ለማድረግ
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","ቅጠሎች, ወጪዎች እና የመክፈል ዝርዝር ለማስተዳደር የሰራተኛ መዝገብ ይፍጠሩ"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,የመድኃኒት ጊዜ
+DocType: Restaurant Reservation,Restaurant Reservation,የምግብ ቤት ቦታ ማስያዣ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,ሐሳብ መጻፍ
 DocType: Payment Entry Deduction,Payment Entry Deduction,የክፍያ Entry ተቀናሽ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,ሌላው የሽያጭ ሰው {0} ተመሳሳይ የሰራተኛ መታወቂያ ጋር አለ
@@ -708,7 +722,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,ጌቶች
 DocType: Assessment Plan,Maximum Assessment Score,ከፍተኛ ግምገማ ውጤት
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,አዘምን ባንክ የግብይት ቀኖች
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,የጊዜ ትራኪንግ
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,የጊዜ ትራኪንግ
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,አጓጓዥ የተባዙ
 DocType: Fiscal Year Company,Fiscal Year Company,በጀት ዓመት ኩባንያ
 DocType: Packing Slip Item,DN Detail,DN ዝርዝር
@@ -716,8 +730,9 @@
 DocType: Timesheet,Billed,የሚከፈል
 DocType: Batch,Batch Description,ባች መግለጫ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,የተማሪ ቡድኖችን መፍጠር
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","ክፍያ ማስተናገጃ መለያ አልተፈጠረም, በእጅ አንድ ፍጠር."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","ክፍያ ማስተናገጃ መለያ አልተፈጠረም, በእጅ አንድ ፍጠር."
 DocType: Supplier Scorecard,Per Year,በዓመት
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,በእያንዳንዱ DOB ውስጥ በዚህ ፕሮግራም ውስጥ ለመግባት ብቁ አይደሉም
 DocType: Sales Invoice,Sales Taxes and Charges,የሽያጭ ግብሮች እና ክፍያዎች
 DocType: Employee,Organization Profile,ድርጅት መገለጫ
 DocType: Vital Signs,Height (In Meter),ቁመት (በሜትር)
@@ -753,7 +768,7 @@
 DocType: Student Batch Name,Batch Name,ባች ስም
 DocType: Fee Validity,Max number of visit,ከፍተኛ የጎብኝ ቁጥር
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet ተፈጥሯል:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},የክፍያ ሁነታ ላይ ነባሪ በጥሬ ገንዘብ ወይም በባንክ መለያ ማዘጋጀት እባክዎ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},የክፍያ ሁነታ ላይ ነባሪ በጥሬ ገንዘብ ወይም በባንክ መለያ ማዘጋጀት እባክዎ {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,ይመዝገቡ
 DocType: GST Settings,GST Settings,GST ቅንብሮች
 DocType: Selling Settings,Customer Naming By,በ የደንበኛ አሰያየም
@@ -785,15 +800,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ደረስን ወጪ ግብሮች እና ክፍያዎች
 DocType: Production Order Operation,Actual Start Time,ትክክለኛው የማስጀመሪያ ሰዓት
 DocType: BOM Operation,Operation Time,ኦፕሬሽን ሰዓት
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,ጪረሰ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,ጪረሰ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,መሠረት
 DocType: Timesheet,Total Billed Hours,ጠቅላላ የሚከፈል ሰዓቶች
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,መጠን ጠፍቷል ይጻፉ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,መጠን ጠፍቷል ይጻፉ
 DocType: Leave Block List Allow,Allow User,ተጠቃሚ ፍቀድ
 DocType: Journal Entry,Bill No,ቢል ምንም
 DocType: Company,Gain/Loss Account on Asset Disposal,የንብረት ማስወገድ ላይ ረብ / ማጣት መለያ
 DocType: Vehicle Log,Service Details,የአገልግሎት ዝርዝሮች
-DocType: Purchase Invoice,Quarterly,የሩብ ዓመት
+DocType: Subscription,Quarterly,የሩብ ዓመት
 DocType: Lab Test Template,Grouped,የተደረደሩ
 DocType: Selling Settings,Delivery Note Required,የመላኪያ ማስታወሻ ያስፈልጋል
 DocType: Bank Guarantee,Bank Guarantee Number,ባንክ ዋስትና ቁጥር
@@ -802,12 +817,12 @@
 DocType: Student Attendance,Student Attendance,የተማሪ የትምህርት ክትትል
 DocType: Sales Invoice Timesheet,Time Sheet,የጊዜ ሉህ
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush ጥሬ እቃዎች ላይ የተመረኮዘ ላይ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,ንጥል ዝርዝሮችን ያስገቡ
 DocType: Interest,Interest,ዝንባሌ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,ቅድመ ሽያጭ
 DocType: Purchase Receipt,Other Details,ሌሎች ዝርዝሮች
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,አብነት ሞክር
+DocType: Restaurant Order Entry Item,Served,ያገለገለ
 DocType: Account,Accounts,መለያዎች
 DocType: Vehicle,Odometer Value (Last),ቆጣሪው ዋጋ (የመጨረሻ)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,የአቅራቢዎች የውጤት መለኪያ መስፈርት ደንቦች.
@@ -819,25 +834,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,ቅድመ-የቀጣሪ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,መለያ {0} በርካታ ጊዜ ገብቷል ታይቷል
 DocType: Account,Expenses Included In Valuation,ወጪዎች ግምቱ ውስጥ ተካቷል
-DocType: Hub Settings,Seller City,ሻጭ ከተማ
 ,Absent Student Report,ብርቅ የተማሪ ሪፖርት
 DocType: Email Digest,Next email will be sent on:,ቀጣይ ኢሜይል ላይ ይላካል:
 DocType: Offer Letter Term,Offer Letter Term,ደብዳቤ የሚቆይበት ጊዜ ሊያቀርብ
 DocType: Supplier Scorecard,Per Week,በሳምንት
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,ንጥል ተለዋጮች አለው.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,ንጥል ተለዋጮች አለው.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,ጠቅላላ ተማሪ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,ንጥል {0} አልተገኘም
 DocType: Bin,Stock Value,የክምችት እሴት
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,የክፍያ መዝገቦች ከበስተጀርባ ይወጣሉ. ማንኛውም ስህተት ካለ የስህተት መልዕክቱ በሰዓቱ ውስጥ ይሻሻላል.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,ኩባንያ {0} የለም
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} እስከ {1} ድረስ የአገልግሎት ክፍያ አለው.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} እስከ {1} ድረስ የአገልግሎት ክፍያ አለው.
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,የዛፍ አይነት
 DocType: BOM Explosion Item,Qty Consumed Per Unit,ብዛት አሃድ በእያንዳንዱ ፍጆታ
 DocType: Serial No,Warranty Expiry Date,የዋስትና የሚቃጠልበት ቀን
 DocType: Material Request Item,Quantity and Warehouse,ብዛት እና መጋዘን
+DocType: Hub Settings,Unregister,ከምዝገባ አውጣ
 DocType: Sales Invoice,Commission Rate (%),ኮሚሽን ተመን (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,እባክዎ ይምረጡ ፕሮግራም
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,እባክዎ ይምረጡ ፕሮግራም
 DocType: Project,Estimated Cost,የተገመተው ወጪ
 DocType: Purchase Order,Link to material requests,ቁሳዊ ጥያቄዎች አገናኝ
+DocType: Hub Settings,Publish,አትም
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,ኤሮስፔስ
 DocType: Journal Entry,Credit Card Entry,ክሬዲት ካርድ Entry
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,ኩባንያ እና መለያዎች
@@ -848,13 +865,12 @@
 DocType: Selling Settings,Close Opportunity After Days,ቀናት በኋላ ዝጋ አጋጣሚ
 ,Reserved,የተያዘ
 DocType: Purchase Order,Supply Raw Materials,አቅርቦት ጥሬ እቃዎች
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,ቀጣዩ የክፍያ መጠየቂያ ይፈጠራል ከተደረገባቸው ቀን. ማስገባት ላይ የመነጨ ነው.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,የአሁኑ ንብረቶች
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} አንድ የአክሲዮን ንጥል አይደለም
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',በ &quot;Training Feedback&quot; እና &quot;New&quot; ላይ ጠቅ በማድረግ ግብረመልስዎን ለስልጠና ያጋሩ.
 DocType: Mode of Payment Account,Default Account,ነባሪ መለያ
 DocType: Payment Entry,Received Amount (Company Currency),ተቀብሏል መጠን (የኩባንያ የምንዛሬ)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,ዕድል አመራር የተሰራ ከሆነ ግንባር መዘጋጀት አለበት
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,ዕድል አመራር የተሰራ ከሆነ ግንባር መዘጋጀት አለበት
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,ሳምንታዊ ጠፍቷል ቀን ይምረጡ
 DocType: Patient,O Negative,ኦ አሉታዊ
 DocType: Production Order Operation,Planned End Time,የታቀደ መጨረሻ ሰዓት
@@ -870,10 +886,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,ኃይል
 DocType: Opportunity,Opportunity From,ከ አጋጣሚ
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,ወርሃዊ ደመወዝ መግለጫ.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,ኩባንያ አክል
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ረድፍ {0}: {1} የቁጥር ቁጥሮች ለ Item {2} ያስፈልጋሉ. {3} ሰጥተሃል.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ረድፍ {0}: {1} የቁጥር ቁጥሮች ለ Item {2} ያስፈልጋሉ. {3} ሰጥተሃል.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,እባክህ ሰንጠረዥ ምረጥ
 DocType: BOM,Website Specifications,የድር ጣቢያ ዝርዝር
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} በ &#39;ተቀባዮች&#39; ውስጥ ልክ ያልሆነ የኢሜይል አድራሻ ነው.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} በ &#39;ተቀባዮች&#39; ውስጥ ልክ ያልሆነ የኢሜይል አድራሻ ነው.
 DocType: Special Test Items,Particulars,ዝርዝሮች
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,አንቲባዮቲክ.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: ከ {0} አይነት {1}
@@ -881,11 +897,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,ረድፍ {0}: የልወጣ ምክንያት የግዴታ ነው
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","በርካታ ዋጋ ደንቦች ተመሳሳይ መስፈርት ጋር አለ, ቅድሚያ ሰጥቷቸዋል ግጭት ለመፍታት ይሞክሩ. ዋጋ: ሕጎች: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,አቦዝን ወይም ሌሎች BOMs ጋር የተያያዘ ነው እንደ BOM ማስቀረት አይቻልም
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,አቦዝን ወይም ሌሎች BOMs ጋር የተያያዘ ነው እንደ BOM ማስቀረት አይቻልም
 DocType: Opportunity,Maintenance,ጥገና
 DocType: Item Attribute Value,Item Attribute Value,ንጥል ዋጋ የአይነት
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,የሽያጭ ዘመቻዎች.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Timesheet አድርግ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Timesheet አድርግ
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -923,12 +939,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,መጀመሪያ ንጥል ያስገቡ
 DocType: Account,Liability,ኃላፊነት
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ማዕቀብ መጠን ረድፍ ውስጥ የይገባኛል ጥያቄ መጠን መብለጥ አይችልም {0}.
+DocType: Salary Detail,Do not include in total,በአጠቃላይ አያካትቱ
 DocType: Company,Default Cost of Goods Sold Account,ጥሪታቸውንም እየሸጡ መለያ ነባሪ ዋጋ
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,የዋጋ ዝርዝር አልተመረጠም
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,የዋጋ ዝርዝር አልተመረጠም
 DocType: Employee,Family Background,የቤተሰብ ዳራ
 DocType: Request for Quotation Supplier,Send Email,ኢሜይል ይላኩ
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},ማስጠንቀቂያ: ልክ ያልሆነ አባሪ {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,ምንም ፍቃድ
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},ማስጠንቀቂያ: ልክ ያልሆነ አባሪ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,ምንም ፍቃድ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,ጥቅስ ተጠይቋል
 DocType: Vital Signs,Heart Rate / Pulse,የልብ ምት / የልብ ምት
 DocType: Company,Default Bank Account,ነባሪ የባንክ ሂሳብ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",የድግስ ላይ የተመሠረተ ለማጣራት ይምረጡ ፓርቲ በመጀመሪያ ይተይቡ
@@ -955,12 +973,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ንጥል ረድፍ {idx}: {doctype} {DOCNAME} ከላይ ውስጥ የለም &#39;{doctype} »ሰንጠረዥ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} አስቀድሞ የተጠናቀቁ ወይም ተሰርዟል
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ምንም ተግባራት
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ራስ መጠየቂያ 05, 28, ወዘተ ለምሳሌ ይፈጠራል ይህም ላይ ያለው ወር ቀን"
 DocType: Item Variant Settings,Copy Fields to Variant,መስኮችን ወደ ስሪቶች ገልብጥ
 DocType: Asset,Opening Accumulated Depreciation,ክምችት መቀነስ በመክፈት ላይ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ነጥብ 5 ያነሰ ወይም እኩል መሆን አለበት
 DocType: Program Enrollment Tool,Program Enrollment Tool,ፕሮግራም ምዝገባ መሣሪያ
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,ሲ-ቅጽ መዝገቦች
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,ሲ-ቅጽ መዝገቦች
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,የደንበኛ እና አቅራቢው
 DocType: Email Digest,Email Digest Settings,የኢሜይል ጥንቅር ቅንብሮች
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,የእርስዎን ንግድ እናመሰግናለን!
@@ -978,13 +995,13 @@
 DocType: Request for Quotation Supplier,Quote Status,የኹናቴ ሁኔታ
 DocType: Maintenance Visit,Completion Status,የማጠናቀቂያ ሁኔታ
 DocType: HR Settings,Enter retirement age in years,ዓመታት ውስጥ ጡረታ ዕድሜ ያስገቡ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,ዒላማ መጋዘን
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,አንድ መጋዘን ይምረጡ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,ዒላማ መጋዘን
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,አንድ መጋዘን ይምረጡ
 DocType: Cheque Print Template,Starting location from left edge,ግራ ጠርዝ አካባቢ በመጀመር ላይ
 DocType: Item,Allow over delivery or receipt upto this percent,ይህ በመቶ እስከሁለት ርክክብ ወይም ደረሰኝ ላይ ፍቀድ
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,አስመጣ ክትትል
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,ሁሉም ንጥል ቡድኖች
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,ሁሉም ንጥል ቡድኖች
 DocType: Process Payroll,Activity Log,የእንቅስቃሴ ምዝግብ ማስታወሻ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,የተጣራ ትርፍ / ማጣት
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,በራስ-ሰር ግብይቶች ማቅረቢያ ላይ መልዕክት ያዘጋጁ.
@@ -996,7 +1013,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,ፕሮጀክት ብዛት
 DocType: Sales Invoice,Payment Due Date,ክፍያ መጠናቀቅ ያለበት ቀን
 DocType: Drug Prescription,Interval UOM,የጊዜ ክፍተት UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,ንጥል ተለዋጭ {0} ቀድሞውኑ ተመሳሳይ ባሕርያት ጋር አለ
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,ንጥል ተለዋጭ {0} ቀድሞውኑ ተመሳሳይ ባሕርያት ጋር አለ
+DocType: Item,Hub Publishing Details,ሃቢ የህትመት ዝርዝሮች
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;በመክፈት ላይ&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ማድረግ ወደ ክፈት
 DocType: Notification Control,Delivery Note Message,የመላኪያ ማስታወሻ መልዕክት
@@ -1016,10 +1034,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,እቃ # {0}: ጥሬ እቃው እንደ ዋናው አይነት ተመሳሳይ መሆን አይችልም
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,የግዢ ደረሰኝ ንጥሎች ሰንጠረዥ ውስጥ ጠቅላላ የሚመለከታቸው ክፍያዎች ጠቅላላ ግብሮች እና ክፍያዎች እንደ አንድ አይነት መሆን አለበት
 DocType: Sales Team,Incentives,ማበረታቻዎች
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,ለግንባር ይመዝገቡ
 DocType: SMS Log,Requested Numbers,ተጠይቋል ዘኍልቍ
 DocType: Production Planning Tool,Only Obtain Raw Materials,ብቻ ጥሬ እቃዎች ያግኙ
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,የአፈጻጸም መርምር.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",ማንቃት ወደ ግዢ ሳጥን ጨመር የነቃ ነው እንደ &#39;ወደ ግዢ ሳጥን ጨመር ተጠቀም&#39; እና ወደ ግዢ ሳጥን ጨመር ቢያንስ አንድ የግብር ሕግ ሊኖር ይገባል
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",ማንቃት ወደ ግዢ ሳጥን ጨመር የነቃ ነው እንደ &#39;ወደ ግዢ ሳጥን ጨመር ተጠቀም&#39; እና ወደ ግዢ ሳጥን ጨመር ቢያንስ አንድ የግብር ሕግ ሊኖር ይገባል
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",የክፍያ Entry {0} ትዕዛዝ በዚህ መጠየቂያ ውስጥ አስቀድሞ እንደ አፈረሰ ያለበት ከሆነ {1} ፈትሽ ላይ የተያያዘ ነው.
 DocType: Sales Invoice Item,Stock Details,የክምችት ዝርዝሮች
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,የፕሮጀክት ዋጋ
@@ -1038,12 +1057,14 @@
 DocType: Salary Slip,Working Days,ተከታታይ የስራ ቀናት
 DocType: Serial No,Incoming Rate,ገቢ ተመን
 DocType: Packing Slip,Gross Weight,ጠቅላላ ክብደት
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,የእርስዎን ኩባንያ ስም ስለ እናንተ ይህ ሥርዓት ማዋቀር ነው.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,ማዕከሉን አንቃ
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,የእርስዎን ኩባንያ ስም ስለ እናንተ ይህ ሥርዓት ማዋቀር ነው.
 DocType: HR Settings,Include holidays in Total no. of Working Days,ምንም ጠቅላላ በዓላት ያካትቱ. የስራ ቀናት
 DocType: Job Applicant,Hold,ያዝ
 DocType: Employee,Date of Joining,በመቀላቀል ቀን
 DocType: Naming Series,Update Series,አዘምን ተከታታይ
 DocType: Supplier Quotation,Is Subcontracted,Subcontracted ነው
+DocType: Restaurant Table,Minimum Seating,አነስተኛ ቦታ መያዝ
 DocType: Item Attribute,Item Attribute Values,ንጥል መገለጫ ባህሪ እሴቶች
 DocType: Examination Result,Examination Result,ምርመራ ውጤት
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,የግዢ ደረሰኝ
@@ -1054,13 +1075,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},ድርጊቱ ለ ቀጣዩ {0} ቀናት ውስጥ ጊዜ ማስገቢያ ማግኘት አልተቻለም {1}
 DocType: Production Order,Plan material for sub-assemblies,ንዑስ-አብያተ ክርስቲያናት ለ እቅድ ቁሳዊ
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,የሽያጭ አጋሮች እና ግዛት
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} ገባሪ መሆን አለበት
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} ገባሪ መሆን አለበት
 DocType: Journal Entry,Depreciation Entry,የእርጅና Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,በመጀመሪያ ስለ ሰነዱ አይነት ይምረጡ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ይህ ጥገና ይጎብኙ በመሰረዝ በፊት ይቅር ቁሳዊ ጥገናዎች {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},ተከታታይ አይ {0} ንጥል የእርሱ ወገን አይደለም {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,ያስፈልጋል ብዛት
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,አሁን ያሉ ግብይት ጋር መጋዘኖችን የመቁጠር ወደ ሊቀየር አይችልም.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,አሁን ያሉ ግብይት ጋር መጋዘኖችን የመቁጠር ወደ ሊቀየር አይችልም.
 DocType: Bank Reconciliation,Total Amount,አጠቃላይ ድምሩ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,የኢንተርኔት ህትመት
 DocType: Prescription Duration,Number,ቁጥር
@@ -1071,7 +1092,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,የሽያጭ ዋጋ ዝርዝር
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.",ምልክት ከተደረገ ደንበኛው ታካሚን ይመርጣል. የታካሚ ደረሰኞች በዚህ ደንበኛ ላይ ይወጣሉ. ታካሚን በመፍጠር ላይ እያለ ነባር ደንበኛ መምረጥም ይችላሉ.
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,ንጥሎችን ለማስመር ያትሙ
 DocType: Bank Reconciliation,Account Currency,መለያ ምንዛሬ
 DocType: Lab Test,Sample ID,የናሙና መታወቂያ
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,ኩባንያ ውስጥ ዙር ጠፍቷል መለያ መጥቀስ እባክዎ
@@ -1080,11 +1100,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,{0} ተቀጣሪ ንቁ አይደለም ወይም የለም
 DocType: Fee Structure,Components,ክፍሎች
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},ንጥል ውስጥ የንብረት ምድብ ያስገቡ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,ንጥል አይነቶች {0} ዘምኗል
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,ንጥል አይነቶች {0} ዘምኗል
 DocType: Quality Inspection Reading,Reading 6,6 ማንበብ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,አይደለም {0} {1} {2} ያለ ማንኛውም አሉታዊ ግሩም መጠየቂያ ማድረግ ይችላል
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","እንዲፈጠር. ዘግይቶ ከሆነ, «በወር ቀን ውስጥ ይድገሙት» የሚለውን መስክ እራስዎ መቀየር አለብዎት"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,አይደለም {0} {1} {2} ያለ ማንኛውም አሉታዊ ግሩም መጠየቂያ ማድረግ ይችላል
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,የደረሰኝ የቅድሚያ ግዢ
-DocType: Hub Settings,Sync Now,አሁን አመሳስል
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},ረድፍ {0}: የሥዕል ግቤት ጋር ሊገናኝ አይችልም አንድ {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,አንድ የገንዘብ ዓመት በጀት ይግለጹ.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,ይህ ሁነታ በሚመረጥ ጊዜ ነባሪ ባንክ / በጥሬ ገንዘብ መለያ በራስ-ሰር POS ደረሰኝ ውስጥ ይዘምናል.
@@ -1096,13 +1117,13 @@
 DocType: Item,Is Purchase Item,የግዢ ንጥል ነው
 DocType: Asset,Purchase Invoice,የግዢ ደረሰኝ
 DocType: Stock Ledger Entry,Voucher Detail No,የቫውቸር ዝርዝር የለም
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,አዲስ የሽያጭ ደረሰኝ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,አዲስ የሽያጭ ደረሰኝ
 DocType: Stock Entry,Total Outgoing Value,ጠቅላላ የወጪ ዋጋ
 DocType: Physician,Appointments,ቀጠሮዎች
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,ቀን እና መዝጊያ ቀን በመክፈት ተመሳሳይ በጀት ዓመት ውስጥ መሆን አለበት
 DocType: Lead,Request for Information,መረጃ ጥያቄ
 ,LeaderBoard,የመሪዎች ሰሌዳ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,አመሳስል ከመስመር ደረሰኞች
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,አመሳስል ከመስመር ደረሰኞች
 DocType: Payment Request,Paid,የሚከፈልበት
 DocType: Program Fee,Program Fee,ፕሮግራም ክፍያ
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1121,11 +1142,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,ትዕዛዝ ንጥል ይግዙ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,ቀጥተኛ ያልሆነ ገቢ
 DocType: Student Attendance Tool,Student Attendance Tool,የተማሪ የትምህርት ክትትል መሣሪያ
+DocType: Restaurant Menu,Price List (Auto created),የዋጋ ዝርዝር (በራስ የተፈጠረ)
 DocType: Cheque Print Template,Date Settings,ቀን ቅንብሮች
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,ልዩነት
 ,Company Name,የድርጅት ስም
 DocType: SMS Center,Total Message(s),ጠቅላላ መልዕክት (ዎች)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,ሰደዳ ይምረጡ ንጥል
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,ሰደዳ ይምረጡ ንጥል
 DocType: Purchase Invoice,Additional Discount Percentage,ተጨማሪ የቅናሽ መቶኛ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,ሁሉም እርዳታ ቪዲዮዎች ዝርዝር ይመልከቱ
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ቼክ ገቢ የት ባንኩ መለያ ምረጥ ራስ.
@@ -1142,6 +1164,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,መቁጠሪያ
 DocType: Workstation,Electricity Cost,ኤሌክትሪክ ወጪ
 DocType: HR Settings,Don't send Employee Birthday Reminders,የተቀጣሪ የልደት አስታዋሾች አትላክ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,ቅንብሮችን ያስቀምጡ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,የተጠየቁ ምርቶች
 DocType: Item,Inspection Criteria,የምርመራ መስፈርት
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,ተዘዋውሯል
 DocType: BOM Website Item,BOM Website Item,BOM የድር ጣቢያ ንጥል
@@ -1158,11 +1182,11 @@
 DocType: Journal Entry,Total Amount in Words,ቃላት ውስጥ ጠቅላላ መጠን
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,አንድ ስህተት ነበር. አንዱ ሊሆን ምክንያት በቅጹ አላስቀመጡም ሊሆን ይችላል. ችግሩ ከቀጠለ support@erpnext.com ያነጋግሩ.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,የእኔ ጨመር
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},ትዕዛዝ አይነት ውስጥ አንዱ መሆን አለበት {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},ትዕዛዝ አይነት ውስጥ አንዱ መሆን አለበት {0}
 DocType: Lead,Next Contact Date,ቀጣይ የእውቂያ ቀን
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,ብዛት በመክፈት ላይ
 DocType: Healthcare Settings,Appointment Reminder,የቀጠሮ ማስታወሻ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,ለውጥ መጠን ለ መለያ ያስገቡ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,ለውጥ መጠን ለ መለያ ያስገቡ
 DocType: Student Batch Name,Student Batch Name,የተማሪ የቡድን ስም
 DocType: Consultation,Doctor,ዶክተር
 DocType: Holiday List,Holiday List Name,የበዓል ዝርዝር ስም
@@ -1170,12 +1194,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,መርሐግብር ኮርስ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,የክምችት አማራጮች
 DocType: Journal Entry Account,Expense Claim,የወጪ የይገባኛል ጥያቄ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,በእርግጥ ይህን በመዛጉ ንብረት እነበረበት መመለስ ትፈልጋለህ?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},ለ ብዛት {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,በእርግጥ ይህን በመዛጉ ንብረት እነበረበት መመለስ ትፈልጋለህ?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},ለ ብዛት {0}
 DocType: Leave Application,Leave Application,አይተውህም ማመልከቻ
 DocType: Patient,Patient Relation,የታካሚ ግንኙነት
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,ምደባዎች መሣሪያ ውጣ
+DocType: Item,Hub Category to Publish,Hub ምድብ ወደ ህትመት
 DocType: Leave Block List,Leave Block List Dates,አግድ ዝርዝር ቀኖች ውጣ
+DocType: Sales Invoice,Billing Address GSTIN,የክፍያ አድራሻ GSTIN
 DocType: Workstation,Net Hour Rate,የተጣራ ሰዓት ተመን
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,አርፏል ወጪ የግዢ ደረሰኝ
 DocType: Company,Default Terms,ነባሪ ውል
@@ -1185,18 +1211,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},ይጥቀሱ እባክዎ {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,ብዛት ወይም ዋጋ ላይ ምንም ለውጥ ጋር የተወገዱ ንጥሎች.
 DocType: Delivery Note,Delivery To,ወደ መላኪያ
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,አይነታ ሠንጠረዥ የግዴታ ነው
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,አይነታ ሠንጠረዥ የግዴታ ነው
 DocType: Production Planning Tool,Get Sales Orders,የሽያጭ ትዕዛዞች ያግኙ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} አሉታዊ መሆን አይችልም
 DocType: Training Event,Self-Study,በራስ ጥናት ማድረግ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,የዋጋ ቅናሽ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,የዋጋ ቅናሽ
 DocType: Asset,Total Number of Depreciations,Depreciations አጠቃላይ ብዛት
 DocType: Sales Invoice Item,Rate With Margin,ኅዳግ ጋር ፍጥነት
 DocType: Workstation,Wages,ደመወዝ
 DocType: Task,Urgent,አስቸኳይ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},ሰንጠረዥ ውስጥ ረድፍ {0} ትክክለኛ የረድፍ መታወቂያ እባክዎን ለይተው {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,ተለዋዋጭ መለየት አልተቻለም:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,እባክዎ ከፓፖፓድ ለማርትዕ መስክ ይምረጡ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,እባክዎ ከፓፖፓድ ለማርትዕ መስክ ይምረጡ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,ወደ ዴስክቶፕ ሂድ እና ERPNext መጠቀም ጀምር
 DocType: Item,Manufacturer,ባለፉብሪካ
 DocType: Landed Cost Item,Purchase Receipt Item,የግዢ ደረሰኝ ንጥል
@@ -1227,8 +1253,8 @@
 DocType: GL Entry,Against,ላይ
 DocType: Item,Default Selling Cost Center,ነባሪ ሽያጭ ወጪ ማዕከል
 DocType: Sales Partner,Implementation Partner,የትግበራ አጋር
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,አካባቢያዊ መለያ ቁጥር
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},የሽያጭ ትዕዛዝ {0} ነው {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,አካባቢያዊ መለያ ቁጥር
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},የሽያጭ ትዕዛዝ {0} ነው {1}
 DocType: Opportunity,Contact Info,የመገኛ አድራሻ
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,የክምችት ግቤቶችን ማድረግ
 DocType: Packing Slip,Net Weight UOM,የተጣራ ክብደት UOM
@@ -1239,6 +1265,7 @@
 DocType: Holiday List,Get Weekly Off Dates,ሳምንታዊ ጠፍቷል ቀኖች ያግኙ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,የማብቂያ ቀን ከመጀመሪያ ቀን ያነሰ መሆን አይችልም
 DocType: Sales Person,Select company name first.,በመጀመሪያ ይምረጡ የኩባንያ ስም.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,ከዝቅተኛ ወደ ከፍተኛ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ጥቅሶች አቅራቢዎች ደርሷል.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOM ን ይተኩ እና በሁሉም የ BOM ዎች ውስጥ አዲስ ዋጋን ያዘምኑ
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},ወደ {0} | {1} {2}
@@ -1257,7 +1284,7 @@
 DocType: Program Enrollment,Transportation,መጓጓዣ
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,ልክ ያልሆነ መገለጫ ባህሪ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} መቅረብ አለበት
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},ብዛት ይልቅ ያነሰ ወይም እኩል መሆን አለበት {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},ብዛት ይልቅ ያነሰ ወይም እኩል መሆን አለበት {0}
 DocType: SMS Center,Total Characters,ጠቅላላ ቁምፊዎች
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},ንጥል ለ BOM መስክ ውስጥ BOM ይምረጡ {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,ሲ-ቅጽ የደረሰኝ ዝርዝር
@@ -1272,7 +1299,7 @@
 ,Ordered Items To Be Billed,የዕቃው ንጥሎች እንዲከፍሉ ለማድረግ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,ክልል ያነሰ መሆን አለበት ከ ይልቅ ወደ ክልል
 DocType: Global Defaults,Global Defaults,ዓለም አቀፍ ነባሪዎች
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,ፕሮጀክት ትብብር ማስታወቂያ
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,ፕሮጀክት ትብብር ማስታወቂያ
 DocType: Salary Slip,Deductions,ቅናሽ
 DocType: Leave Allocation,LAL/,ሱንደር /
 DocType: Setup Progress Action,Action Name,የእርምጃ ስም
@@ -1290,13 +1317,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,የሽያጭ ደረሰኝ የቅድሚያ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,ምንም ነገር መጠየቅ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},ሌላው የበጀት መዝገብ «{0}» አስቀድሞ ላይ አለ {1} «{2}» በጀት ዓመት ለ {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&#39;ትክክለኛው የማስጀመሪያ ቀን&#39; &#39;ትክክለኛው መጨረሻ ቀን&#39; በላይ ሊሆን አይችልም
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&#39;ትክክለኛው የማስጀመሪያ ቀን&#39; &#39;ትክክለኛው መጨረሻ ቀን&#39; በላይ ሊሆን አይችልም
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,አስተዳደር
 DocType: Cheque Print Template,Payer Settings,ከፋዩ ቅንብሮች
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ይህ ተለዋጭ ያለውን ንጥል ኮድ ተጨምሯል ይሆናል. የእርስዎ በምህፃረ ቃል &quot;SM&quot; ነው; ለምሳሌ ያህል, ንጥል ኮድ &quot;ቲሸርት&quot;, &quot;ቲሸርት-SM&quot; ይሆናል ተለዋጭ ያለውን ንጥል ኮድ ነው"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,የ የቀጣሪ ለማዳን አንዴ (ቃላት) የተጣራ ክፍያ የሚታይ ይሆናል.
 DocType: Purchase Invoice,Is Return,መመለሻ ነው
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,ጥንቃቄ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,ጥንቃቄ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,ተመለስ / ዴቢት ማስታወሻ
 DocType: Price List Country,Price List Country,የዋጋ ዝርዝር አገር
 DocType: Item,UOMs,UOMs
@@ -1311,17 +1338,18 @@
 DocType: Account,Balance Sheet,ወጭና ገቢ ሂሳብ መመዝገቢያ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',&#39;ንጥል ኮድ ጋር ንጥል ለማግኘት ማዕከል ያስከፍላል
 DocType: Fee Validity,Valid Till,ልክ ነጠ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","የክፍያ ሁነታ አልተዋቀረም. የመለያ ክፍያዎች ሁነታ ላይ ወይም POS መገለጫ ላይ ተዘጋጅቷል እንደሆነ, ያረጋግጡ."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","የክፍያ ሁነታ አልተዋቀረም. የመለያ ክፍያዎች ሁነታ ላይ ወይም POS መገለጫ ላይ ተዘጋጅቷል እንደሆነ, ያረጋግጡ."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,ብዙ ጊዜ ተመሳሳይ ንጥል ሊገቡ አይችሉም.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","ተጨማሪ መለያዎች ቡድኖች ስር ሊሆን ይችላል, ነገር ግን ግቤቶች ያልሆኑ ቡድኖች ላይ ሊሆን ይችላል"
 DocType: Lead,Lead,አመራር
 DocType: Email Digest,Payables,Payables
 DocType: Course,Course Intro,የኮርስ መግቢያ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,የክምችት Entry {0} ተፈጥሯል
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,እባክዎ በአካባቢያዊ ቅንጅቶች በኩል የቁጥር ተከታታይ ቁጥሮች ያስተካክሉ&gt; በማስተካከል ተከታታይ ቁጥር
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,የክምችት Entry {0} ተፈጥሯል
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,የረድፍ # {0}: ብዛት ግዢ መመለስ ውስጥ ገብቶ ሊሆን አይችልም ተቀባይነት አላገኘም
 ,Purchase Order Items To Be Billed,የግዢ ትዕዛዝ ንጥሎች እንዲከፍሉ ለማድረግ
 DocType: Purchase Invoice Item,Net Rate,የተጣራ ተመን
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,እባክዎ ደንበኛ ይምረጡ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,እባክዎ ደንበኛ ይምረጡ
 DocType: Purchase Invoice Item,Purchase Invoice Item,የደረሰኝ ንጥል ይግዙ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,የክምችት የሒሳብ መዝገብ ግቤቶች እና GL ግቤቶችን ለተመረጠው የግዢ ደረሰኞች ለ ዳግም ከተለጠፈ ነው
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,ንጥል 1
@@ -1340,7 +1368,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},ጋር የተባዛ ረድፍ {0} ተመሳሳይ {1}
 ,Trial Balance,በችሎት ሒሳብ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,አልተገኘም በጀት ዓመት {0}
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,ሰራተኞች በማቀናበር ላይ
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,ሰራተኞች በማቀናበር ላይ
 DocType: Sales Order,SO-,ነቅሸ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,መጀመሪያ ቅድመ ቅጥያ ይምረጡ
 DocType: Employee,O-,O-
@@ -1352,12 +1380,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,ይመልከቱ የሒሳብ መዝገብ
 DocType: Grading Scale,Intervals,ክፍተቶች
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,የጥንቶቹ
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","አንድ ንጥል ቡድን በተመሳሳይ ስም አለ, ወደ ንጥል ስም መቀየር ወይም ንጥል ቡድን ዳግም መሰየም እባክዎ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","አንድ ንጥል ቡድን በተመሳሳይ ስም አለ, ወደ ንጥል ስም መቀየር ወይም ንጥል ቡድን ዳግም መሰየም እባክዎ"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,የተማሪ የተንቀሳቃሽ ስልክ ቁጥር
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,ወደ ተቀረው ዓለም
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,ወደ ተቀረው ዓለም
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,የ ንጥል {0} ባች ሊኖረው አይችልም
 ,Budget Variance Report,በጀት ልዩነት ሪፖርት
 DocType: Salary Slip,Gross Pay,አጠቃላይ ክፍያ
+DocType: Item,Is Item from Hub,ንጥል ከዋኝ ነው
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,ረድፍ {0}: የእንቅስቃሴ አይነት የግዴታ ነው.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,ትርፍ የሚከፈልበት
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,አካውንቲንግ የሒሳብ መዝገብ
@@ -1367,8 +1396,9 @@
 DocType: Vehicle Log,Service Detail,የአገልግሎት ዝርዝር
 DocType: BOM,Item Description,ንጥል መግለጫ
 DocType: Student Sibling,Student Sibling,የተማሪ ወይም እህቴ
-DocType: Purchase Invoice,Is Recurring,ተደጋጋሚ ነው
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,የክፍያ ሁኔታ
 DocType: Purchase Invoice,Supplied Items,እጠነቀቅማለሁ ንጥሎች
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},እባክዎ ለምድቤ {{0} ንቁ የሆነ ምናሌ ያዘጋጁ.
 DocType: Student,STUD.,ያሸበረቁ.
 DocType: Production Order,Qty To Manufacture,ለማምረት ብዛት
 DocType: Email Digest,New Income,አዲስ ገቢ
@@ -1378,6 +1408,7 @@
 ,Student and Guardian Contact Details,የተማሪ እና አሳዳጊ ያግኙን ዝርዝሮች
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,ረድፍ {0}: አቅራቢ ለማግኘት {0} የኢሜይል አድራሻ ኢሜይል መላክ ያስፈልጋል
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,ጊዜያዊ በመክፈት ላይ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,ማዕከሉን ይመልከቱ
 ,Employee Leave Balance,የሰራተኛ ፈቃድ ሒሳብ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},መለያ ቀሪ {0} ሁልጊዜ መሆን አለበት {1}
 DocType: Patient Appointment,More Info,ተጨማሪ መረጃ
@@ -1397,13 +1428,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,የሽያጭ ትዕዛዝ {0} ልክ ያልሆነ ነው
 DocType: Supplier Scorecard,Warn for new Request for Quotations,ለማብራሪያዎች አዲስ ጥያቄ አስጠንቅቅ
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,የግዢ ትዕዛዞች ዕቅድ ለማገዝ እና ግዢዎች ላይ መከታተል
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","ይቅርታ, ኩባንያዎች ይዋሃዳሉ አይችልም"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","ይቅርታ, ኩባንያዎች ይዋሃዳሉ አይችልም"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,የሙከራ ምርመራዎች ትዕዛዝ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",ሐሳብ ጥያቄ ውስጥ ጠቅላላ እትም / ማስተላለፍ ብዛት {0} {1} \ ንጥል ለ የተጠየቀው ብዛት {2} በላይ ሊሆን አይችልም {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,ትንሽ
 DocType: Employee,Employee Number,የሰራተኛ ቁጥር
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},የጉዳይ አይ (ዎች) አስቀድሞ ስራ ላይ ነው. መያዣ ማንም ከ ይሞክሩ {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},የጉዳይ አይ (ዎች) አስቀድሞ ስራ ላይ ነው. መያዣ ማንም ከ ይሞክሩ {0}
 DocType: Project,% Completed,% ተጠናቋል
 ,Invoiced Amount (Exculsive Tax),በደረሰኝ የተቀመጠው መጠን (Exculsive ታክስ)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,ንጥል 2
@@ -1418,11 +1449,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,በተዘዋዋሪ ወጪዎች
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,ረድፍ {0}: ብዛት የግዴታ ነው
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,ግብርና
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,አመሳስል መምህር ውሂብ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,አመሳስል መምህር ውሂብ
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,የእርስዎ ምርቶች ወይም አገልግሎቶች
 DocType: Special Test Items,Special Test Items,ልዩ የፈተና ንጥሎች
 DocType: Mode of Payment,Mode of Payment,የክፍያ ሁነታ
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,የድር ጣቢያ ምስል ይፋዊ ፋይል ወይም ድር ጣቢያ ዩ አር ኤል መሆን አለበት
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,የድር ጣቢያ ምስል ይፋዊ ፋይል ወይም ድር ጣቢያ ዩ አር ኤል መሆን አለበት
 DocType: Student Applicant,AP,የ AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,ይህ ሥር ንጥል ቡድን ነው እና አርትዕ ሊደረግ አይችልም.
@@ -1430,24 +1461,23 @@
 DocType: Vehicle,Fuel UOM,የነዳጅ UOM
 DocType: Warehouse,Warehouse Contact Info,መጋዘን የእውቂያ መረጃ
 DocType: Payment Entry,Write Off Difference Amount,ለችግሮችህ መጠን ጠፍቷል ይጻፉ
-DocType: Purchase Invoice,Recurring Type,ተደጋጋሚ አይነት
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent",{0}: የሰራተኛ ኢሜይል አልተገኘም: ከዚህ አልተላከም ኢሜይል
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent",{0}: የሰራተኛ ኢሜይል አልተገኘም: ከዚህ አልተላከም ኢሜይል
 DocType: Item,Foreign Trade Details,የውጭ ንግድ ዝርዝሮች
+,Assessment Plan Status,የግምገማ ዕቅድ ሁኔታ
 DocType: Email Digest,Annual Income,አመታዊ ገቢ
 DocType: Serial No,Serial No Details,ተከታታይ ምንም ዝርዝሮች
 DocType: Purchase Invoice Item,Item Tax Rate,ንጥል የግብር ተመን
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,እባክዎን ሐኪም እና ቀናትን ይምረጡ
 DocType: Student Group Student,Group Roll Number,የቡድን ጥቅል ቁጥር
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0}: ብቻ የክሬዲት መለያዎች ሌላ ዴቢት ግቤት ላይ የተገናኘ ሊሆን ይችላል
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,ሁሉ ተግባር ክብደት ጠቅላላ 1. መሰረት በሁሉም የፕሮጀክቱ ተግባራት ክብደት ለማስተካከል እባክዎ መሆን አለበት
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,የመላኪያ ማስታወሻ {0} ማቅረብ አይደለም
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,ሁሉ ተግባር ክብደት ጠቅላላ 1. መሰረት በሁሉም የፕሮጀክቱ ተግባራት ክብደት ለማስተካከል እባክዎ መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,የመላኪያ ማስታወሻ {0} ማቅረብ አይደለም
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,ንጥል {0} አንድ ንዑስ-ኮንትራት ንጥል መሆን አለበት
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,የካፒታል ዕቃዎች
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","የዋጋ ደ መጀመሪያ ላይ በመመስረት ነው ንጥል, ንጥል ቡድን ወይም የምርት ስም ሊሆን ይችላል, ይህም መስክ ላይ ተግብር. &#39;"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,እባክህ መጀመሪያ የንጥል ኮድ አዘጋጅ
-DocType: Hub Settings,Seller Website,ሻጭ ድር ጣቢያ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,እባክህ መጀመሪያ የንጥል ኮድ አዘጋጅ
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,የሽያጭ ቡድን ጠቅላላ የተመደበ መቶኛ 100 መሆን አለበት
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,የሽያጭ ቡድን ጠቅላላ የተመደበ መቶኛ 100 መሆን አለበት
 DocType: Sales Invoice Item,Edit Description,አርትዕ መግለጫ
 DocType: Antibiotic,Antibiotic,አንቲባዮቲክ
 ,Team Updates,ቡድን ዝማኔዎች
@@ -1468,12 +1498,12 @@
 DocType: Purchase Invoice,Total (Company Currency),ጠቅላላ (የኩባንያ የምንዛሬ)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,{0} መለያ ቁጥር ከአንድ ጊዜ በላይ ገባ
 DocType: Depreciation Schedule,Journal Entry,ጆርናል የሚመዘገብ መረጃ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,በሂደት ላይ {0} ንጥሎች
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,በሂደት ላይ {0} ንጥሎች
 DocType: Workstation,Workstation Name,ከገቢር ስም
 DocType: Grading Scale Interval,Grade Code,ኛ ክፍል ኮድ
 DocType: POS Item Group,POS Item Group,POS ንጥል ቡድን
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ጥንቅር ኢሜይል:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} ንጥል የእርሱ ወገን አይደለም {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} ንጥል የእርሱ ወገን አይደለም {1}
 DocType: Sales Partner,Target Distribution,ዒላማ ስርጭት
 DocType: Salary Slip,Bank Account No.,የባንክ ሂሳብ ቁጥር
 DocType: Naming Series,This is the number of the last created transaction with this prefix,ይህ የዚህ ቅጥያ ጋር የመጨረሻ የፈጠረው የግብይት ቁጥር ነው
@@ -1489,10 +1519,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,ትዕምርተ አቅራቢ ጥያቄ
 DocType: Healthcare Settings,Registration Message,የምዝገባ መልዕክት
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,ሃርድዌር
-DocType: Sales Order,Recurring Upto,ተደጋጋሚ እስከሁለት
 DocType: Prescription Dosage,Prescription Dosage,የመድኃኒት መመዘኛ
 DocType: Attendance,HR Manager,የሰው ሀይል አስተዳደር
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,አንድ ኩባንያ እባክዎ ይምረጡ
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,አንድ ኩባንያ እባክዎ ይምረጡ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,መብት ውጣ
 DocType: Purchase Invoice,Supplier Invoice Date,አቅራቢው ደረሰኝ ቀን
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,በሰዓት
@@ -1508,10 +1537,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,መካከል ተገኝቷል ከተደራቢ ሁኔታ:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,ጆርናል ላይ የሚመዘገብ {0} አስቀድሞ አንዳንድ ሌሎች ቫውቸር ላይ ማስተካከያ ነው
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,ጠቅላላ ትዕዛዝ እሴት
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,ምግብ
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,ምግብ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,ጥበቃና ክልል 3
 DocType: Maintenance Schedule Item,No of Visits,ጉብኝቶች አይ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},ጥገና ፕሮግራም {0} ላይ አለ {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,ንጥሎችዎን ወደ መገናኛ ማተም ይፈልጋሉ?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,የተመዝጋቢው ተማሪ
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},የ በመዝጋት መለያ ምንዛሬ መሆን አለበት {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},ለሁሉም ግቦች ነጥቦች ድምር ነው 100. መሆን አለበት {0}
@@ -1522,9 +1552,9 @@
 DocType: Authorization Rule,Average Discount,አማካይ ቅናሽ
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,መገልገያዎች
-DocType: Purchase Invoice Item,Accounting,አካውንቲንግ
+DocType: POS Profile,Accounting,አካውንቲንግ
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,በስብስብ ንጥል ቡድኖች ይምረጡ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,በስብስብ ንጥል ቡድኖች ይምረጡ
 DocType: Asset,Depreciation Schedules,የእርጅና መርሐግብሮች
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,የማመልከቻው ወቅት ውጪ ፈቃድ አመዳደብ ጊዜ ሊሆን አይችልም
 DocType: Activity Cost,Projects,ፕሮጀክቶች
@@ -1540,7 +1570,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',የማጽደቅ ሁኔታ &#39;የጸደቀ&#39; ወይም &#39;ተቀባይነት አላገኘም »መሆን አለበት
 DocType: Physician,Contacts and Address,እውቂያዎች እና አድራሻ
 DocType: Purchase Invoice,Contact Person,የሚያነጋግሩት ሰው
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&#39;የሚጠበቀው መጀመሪያ ቀን&#39; ከዜሮ በላይ &#39;የሚጠበቀው መጨረሻ ቀን&#39; ሊሆን አይችልም
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&#39;የሚጠበቀው መጀመሪያ ቀን&#39; ከዜሮ በላይ &#39;የሚጠበቀው መጨረሻ ቀን&#39; ሊሆን አይችልም
 DocType: Course Scheduling Tool,Course End Date,የኮርስ መጨረሻ ቀን
 DocType: Holiday List,Holidays,በዓላት
 DocType: Sales Order Item,Planned Quantity,የታቀደ ብዛት
@@ -1548,10 +1578,11 @@
 DocType: Item,Maintain Stock,የአክሲዮን ይኑራችሁ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,ቀደም ሲል የምርት ትዕዛዝ የተፈጠሩ ስቶክ ግቤቶችን
 DocType: Employee,Prefered Email,Prefered ኢሜይል
+DocType: Student Admission,Eligibility and Details,ብቁነት እና ዝርዝሮች
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,ቋሚ ንብረት ውስጥ የተጣራ ለውጥ
 DocType: Leave Control Panel,Leave blank if considered for all designations,ሁሉንም ስያሜዎች እየታሰቡ ከሆነ ባዶውን ይተው
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,አይነት &#39;ትክክለኛው&#39; ረድፍ ውስጥ ኃላፊነት {0} ንጥል ተመን ውስጥ ሊካተቱ አይችሉም
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},ከፍተኛ: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},ከፍተኛ: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,ከ DATETIME
 DocType: Email Digest,For Company,ኩባንያ ለ
 apps/erpnext/erpnext/config/support.py +17,Communication log.,ኮሙኒኬሽን መዝገብ.
@@ -1559,19 +1590,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,የአምራች ውጤት መሥሪያ ካርታ ተለዋዋጭ ነጥብ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,የግዢ መጠን
 DocType: Sales Invoice,Shipping Address Name,የሚላክበት አድራሻ ስም
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,መለያዎች ገበታ
 DocType: Material Request,Terms and Conditions Content,ውል እና ሁኔታዎች ይዘት
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,የበለጠ ከ 100 በላይ ሊሆን አይችልም
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,{0} ንጥል ከአክሲዮን ንጥል አይደለም
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,{0} ንጥል ከአክሲዮን ንጥል አይደለም
 DocType: Maintenance Visit,Unscheduled,E ሶችን
 DocType: Employee,Owned,ባለቤትነት የተያዘ
 DocType: Salary Detail,Depends on Leave Without Pay,ይክፈሉ ያለ ፈቃድ ላይ የተመካ ነው
 DocType: Pricing Rule,"Higher the number, higher the priority",ቁጥሩ ከፍ ከፍ ቅድሚያ
 ,Purchase Invoice Trends,የደረሰኝ በመታየት ላይ ይግዙ
 DocType: Employee,Better Prospects,የተሻለ ተስፋ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","የረድፍ # {0}: የ ስብስብ {1} ብቻ {2} ብዛት አለው. የሚገኙ {3} ብዛት ያለው ሌላ ስብስብ ለመምረጥ ወይም በርካታ ቡድኖች ከ / ጉዳይ ለማድረስ, በርካታ ረድፎች ወደ ረድፍ ተከፋፍለው እባክዎ"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","የረድፍ # {0}: የ ስብስብ {1} ብቻ {2} ብዛት አለው. የሚገኙ {3} ብዛት ያለው ሌላ ስብስብ ለመምረጥ ወይም በርካታ ቡድኖች ከ / ጉዳይ ለማድረስ, በርካታ ረድፎች ወደ ረድፍ ተከፋፍለው እባክዎ"
 DocType: Vehicle,License Plate,ታርጋ ቁጥር
 DocType: Appraisal,Goals,ግቦች
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,POS የመረጥን ፕሮፋይል
 DocType: Warranty Claim,Warranty / AMC Status,የዋስትና / AMC ሁኔታ
 ,Accounts Browser,መለያዎች አሳሽ
 DocType: Payment Entry Reference,Payment Entry Reference,የክፍያ Entry ማጣቀሻ
@@ -1589,7 +1620,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,የተቀጣሪ ራሱን ሪፖርት አይችልም.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","መለያ የታሰሩ ከሆነ, ግቤቶች የተገደቡ ተጠቃሚዎች ይፈቀዳል."
 DocType: Email Digest,Bank Balance,ባንክ ሒሳብ
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ብቻ ነው ምንዛሬ ውስጥ ሊደረጉ ይችላሉ: {0} ለ በኢኮኖሚክስ የሚመዘገብ {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ብቻ ነው ምንዛሬ ውስጥ ሊደረጉ ይችላሉ: {0} ለ በኢኮኖሚክስ የሚመዘገብ {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","ኢዮብ መገለጫ, ብቃት ያስፈልጋል ወዘተ"
 DocType: Journal Entry Account,Account Balance,የመለያ ቀሪ ሂሳብ
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,ግብይቶች ለ የግብር ሕግ.
@@ -1598,8 +1629,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),ጠቅላላ ግብሮች እና ክፍያዎች (ኩባንያ ምንዛሬ)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,ያልተዘጋ በጀት ዓመት አ &amp; ኤል ሚዛን አሳይ
 DocType: Lab Test Template,Collection Details,የስብስብ ዝርዝሮች
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date ከ tabConsultation ct, `tabLab የታዘዘበት ሐኪድ &#39;ct.patient =&#39; {0} &#39;እና cp.parent = ct. ስም እና cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,መላኪያ መለያ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: መለያ {2} ንቁ አይደለም
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,የሽያጭ ትዕዛዞች የእርስዎን ሥራ ዕቅድ ለመርዳት ላይ-ጊዜ ለማቅረብ አድርግ
@@ -1616,7 +1645,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,ማሸጊያ የማያፈስ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,የቢሮ ኪራይ
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,አዋቅር ኤስ ፍኖት ቅንብሮች
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,ማስመጣት አልተሳካም!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,ማስመጣት አልተሳካም!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,ምንም አድራሻ ገና ታክሏል.
 DocType: Workstation Working Hour,Workstation Working Hour,ከገቢር የሥራ ሰዓት
 DocType: Vital Signs,Blood Pressure,የደም ግፊት
@@ -1641,7 +1670,7 @@
 DocType: Sales Invoice,Source,ምንጭ
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,አሳይ ተዘግቷል
 DocType: Leave Type,Is Leave Without Pay,ይክፈሉ ያለ ውጣ ነው
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,የንብረት ምድብ ቋሚ ንብረት ንጥል ግዴታ ነው
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,የንብረት ምድብ ቋሚ ንብረት ንጥል ግዴታ ነው
 DocType: Fee Validity,Fee Validity,የአገልግሎት ክፍያ ዋጋ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,በክፍያ ሠንጠረዥ ውስጥ አልተገኘም ምንም መዝገቦች
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},ይህን {0} ግጭቶች {1} ለ {2} {3}
@@ -1662,8 +1691,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,አስፈፃሚ ፍለጋ
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,እርሳሶች ፍጠር
 DocType: Maintenance Schedule,Schedules,መርሐግብሮች
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,POS የመሸጫ ቦታን ለመጠቀም POS የመጠየቅ ግዴታ አለበት
 DocType: Purchase Invoice Item,Net Amount,የተጣራ መጠን
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} እርምጃ ሊጠናቀቅ አልቻለም, ስለዚህ ገብቷል አልተደረገም"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} እርምጃ ሊጠናቀቅ አልቻለም, ስለዚህ ገብቷል አልተደረገም"
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM ዝርዝር የለም
 DocType: Landed Cost Voucher,Additional Charges,ተጨማሪ ክፍያዎች
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),ተጨማሪ የቅናሽ መጠን (የኩባንያ ምንዛሬ)
@@ -1672,7 +1702,7 @@
 ,Support Hour Distribution,የድጋፍ ሰአቶች ስርጭት
 DocType: Maintenance Visit,Maintenance Visit,ጥገና ይጎብኙ
 DocType: Student,Leaving Certificate Number,የሰርቲፊኬት ቁጥር በመውጣት ላይ
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","ቀጠሮ ተሰርዟል, እባክዎ የክፍያ መጠየቂያ {0} ን ይከልሱ እና ይተዉት"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","ቀጠሮ ተሰርዟል, እባክዎ የክፍያ መጠየቂያ {0} ን ይከልሱ እና ይተዉት"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,መጋዘን ላይ ይገኛል የጅምላ ብዛት
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,አዘምን ማተም ቅርጸት
 DocType: Landed Cost Voucher,Landed Cost Help,አረፈ ወጪ እገዛ
@@ -1695,8 +1725,8 @@
 DocType: Patient,Tobacco Past Use,የትምባሆ ጊዜ ያለፈበት አጠቃቀም
 DocType: Sales Invoice Item,Brand Name,የምርት ስም
 DocType: Purchase Receipt,Transporter Details,አጓጓዥ ዝርዝሮች
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},ተጠቃሚ {0} አስቀድሞም ለሐኪም ተመድቦለታል {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,ነባሪ መጋዘን የተመረጠው ንጥል ያስፈልጋል
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},ተጠቃሚ {0} አስቀድሞም ለሐኪም ተመድቦለታል {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,ነባሪ መጋዘን የተመረጠው ንጥል ያስፈልጋል
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,ሳጥን
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,በተቻለ አቅራቢ
 DocType: Budget,Monthly Distribution,ወርሃዊ ስርጭት
@@ -1706,7 +1736,7 @@
 DocType: Sales Partner,Sales Partner Target,የሽያጭ ባልደረባ ዒላማ
 DocType: Loan Type,Maximum Loan Amount,ከፍተኛ የብድር መጠን
 DocType: Pricing Rule,Pricing Rule,የዋጋ አሰጣጥ ደንብ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},ተማሪ የተባዙ ጥቅል ቁጥር {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},ተማሪ የተባዙ ጥቅል ቁጥር {0}
 DocType: Budget,Action if Annual Budget Exceeded,እርምጃ ዓመታዊ በጀት የታለፈው ከሆነ
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,ትዕዛዝ ግዢ ቁሳዊ ጥያቄ
 DocType: Shopping Cart Settings,Payment Success URL,ክፍያ ስኬት ዩ አር ኤል
@@ -1723,7 +1753,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} ጊዜ ብቻ ነው ሊታይ ይገባል
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},ተጨማሪ ይተላለፍ የማይፈቀድላቸው {0} ከ {1} የግዥ ትዕዛዝ ላይ {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},ለ በተሳካ ሁኔታ የተመደበ ማምለኩን {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,ምንም ንጥሎች ለመሸከፍ
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,ምንም ንጥሎች ለመሸከፍ
 DocType: Shipping Rule Condition,From Value,እሴት ከ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,ከማኑፋክቸሪንግ ብዛት የግዴታ ነው
 DocType: Employee Loan,Repayment Method,ብድር መክፈል ስልት
@@ -1737,6 +1767,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,የክምችት ተጠያቂነቶች
 DocType: Purchase Invoice,Supplier Warehouse,አቅራቢው መጋዘን
 DocType: Opportunity,Contact Mobile No,የእውቂያ ሞባይል የለም
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,ኩባንያ ይምረጡ
 ,Material Requests for which Supplier Quotations are not created,አቅራቢው ጥቅሶች የተፈጠሩ አይደሉም ይህም ቁሳዊ ጥያቄዎች
 DocType: Student Group,Set 0 for no limit,ምንም ገደብ ለ 0 አዘጋጅ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,እርስዎ ፈቃድ የሚያመለክቱ ናቸው ላይ ያለው ቀን (ዎች) በዓላት ናቸው. እናንተ ፈቃድን ለማግኘት ማመልከት አይገባም.
@@ -1746,24 +1777,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,ትዕምርተ አድርግ
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,ሌሎች ሪፖርቶች
 DocType: Dependent Task,Dependent Task,ጥገኛ ተግባር
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},የመለኪያ ነባሪ ክፍል ለ ልወጣ ምክንያቶች ረድፍ ውስጥ 1 መሆን አለበት {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},የመለኪያ ነባሪ ክፍል ለ ልወጣ ምክንያቶች ረድፍ ውስጥ 1 መሆን አለበት {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},አይነት ፈቃድ {0} በላይ ሊሆን አይችልም {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,አስቀድሞ X ቀኖች ለ ቀዶ ዕቅድ ይሞክሩ.
 DocType: HR Settings,Stop Birthday Reminders,አቁም የልደት ቀን አስታዋሾች
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},ኩባንያ ውስጥ ነባሪ የደመወዝ ክፍያ ሊከፈል መለያ ማዘጋጀት እባክዎ {0}
 DocType: SMS Center,Receiver List,ተቀባይ ዝርዝር
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,የፍለጋ ንጥል
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,የፍለጋ ንጥል
 DocType: Patient Appointment,Referring Physician,ሐኪሙን በመጥቀስ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ፍጆታ መጠን
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,በጥሬ ገንዘብ ውስጥ የተጣራ ለውጥ
 DocType: Assessment Plan,Grading Scale,አሰጣጥ በስምምነት
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ይለኩ {0} መለኪያ የልወጣ ምክንያቶች የርዕስ ማውጫ ውስጥ ከአንድ ጊዜ በላይ ገባ ተደርጓል
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,ቀድሞውኑ ተጠናቋል
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ይለኩ {0} መለኪያ የልወጣ ምክንያቶች የርዕስ ማውጫ ውስጥ ከአንድ ጊዜ በላይ ገባ ተደርጓል
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,ቀድሞውኑ ተጠናቋል
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,የእጅ ውስጥ የአክሲዮን
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},የክፍያ መጠየቂያ አስቀድሞ አለ {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,የተሰጠው ንጥሎች መካከል ወጪ
 DocType: Physician,Hospital,ሆስፒታል
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},ብዛት የበለጠ መሆን አለበት {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},ብዛት የበለጠ መሆን አለበት {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,ቀዳሚ የፋይናንስ ዓመት ዝግ ነው
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),የእድሜ (ቀኖች)
 DocType: Quotation Item,Quotation Item,ትዕምርተ ንጥል
@@ -1774,8 +1805,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,አቅራቢው አይነት ጌታቸው.
 DocType: Purchase Order Item,Supplier Part Number,አቅራቢው ክፍል ቁጥር
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,የልወጣ ተመን 0 ወይም 1 መሆን አይችልም
-DocType: Sales Invoice,Reference Document,የማጣቀሻ ሰነድ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} ተሰርዟል ወይም አቁሟል ነው
+DocType: Subscription,Reference Document,የማጣቀሻ ሰነድ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} ተሰርዟል ወይም አቁሟል ነው
 DocType: Accounts Settings,Credit Controller,የብድር መቆጣጠሪያ
 DocType: Delivery Note,Vehicle Dispatch Date,የተሽከርካሪ አስወገደ ቀን
 DocType: Healthcare Settings,Default Medical Code Standard,ነባሪ የሕክምና ኮድ መደበኛ
@@ -1784,6 +1815,7 @@
 DocType: Company,Default Payable Account,ነባሪ ተከፋይ መለያ
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","እንደ የመላኪያ ደንቦች, የዋጋ ዝርዝር ወዘተ እንደ በመስመር ላይ ግዢ ጋሪ ቅንብሮች"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% የሚከፈል
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,በ .. ተራ አስይዝ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,የተጠበቁ ናቸው ብዛት
 DocType: Party Account,Party Account,የድግስ መለያ
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,የሰው ሀይል አስተዳደር
@@ -1795,13 +1827,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,የሚያጠብ የገባበት አድርግ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,ረድፍ {0}: አቅራቢው ላይ በቅድሚያ ዘዴዎ መሆን አለበት
 DocType: Company,Default Values,ነባሪ ዋጋዎች
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{ድግግሞሽ} ጥንቅር
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{ድግግሞሽ} ጥንቅር
 DocType: Expense Claim,Total Amount Reimbursed,ጠቅላላ መጠን ይመለስላቸዋል
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,ይሄ በዚህ ተሽከርካሪ ላይ መዝገቦች ላይ የተመሠረተ ነው. ዝርዝሮችን ለማግኘት ከታች ያለውን የጊዜ ይመልከቱ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},አቅራቢው ላይ የደረሰኝ {0} የተዘጋጀው {1}
 DocType: Customer,Default Price List,ነባሪ ዋጋ ዝርዝር
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,የንብረት እንቅስቃሴ መዝገብ {0} ተፈጥሯል
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,አንተ መሰረዝ አይችሉም በጀት ዓመት {0}. በጀት ዓመት {0} አቀፍ ቅንብሮች ውስጥ እንደ ነባሪ ተዘጋጅቷል
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,ተመሳሳይ ስም ያለው ደንበኛ አስቀድሞ አለ
 DocType: Journal Entry,Entry Type,ግቤት አይነት
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,በዚህ ግምገማ ቡድን ጋር የተያያዘ ምንም ምዘና ዕቅድ
 ,Customer Credit Balance,የደንበኛ የሥዕል ቀሪ
@@ -1811,7 +1844,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,የዋጋ
 DocType: Quotation,Term Details,የሚለው ቃል ዝርዝሮች
 DocType: Project,Total Sales Cost (via Sales Order),ጠቅላላ የሽያጭ ዋጋ (የሽያጭ ትዕዛዝ በኩል)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,ይህ ተማሪ ቡድን {0} ተማሪዎች በላይ መመዝገብ አይችልም.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,ይህ ተማሪ ቡድን {0} ተማሪዎች በላይ መመዝገብ አይችልም.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,በእርሳስ ቆጠራ
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 የበለጠ መሆን አለበት
 DocType: Manufacturing Settings,Capacity Planning For (Days),(ቀኖች) ያህል አቅም ዕቅድ
@@ -1827,9 +1860,11 @@
 DocType: Lab Test,Technician Name,የቴክኒክ ስም
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,የደረሰኝ ስረዛ ላይ ክፍያ አታገናኝ
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},ገባ የአሁኑ Odometer ንባብ የመጀመሪያ የተሽከርካሪ Odometer የበለጠ መሆን አለበት {0}
+DocType: Restaurant Reservation,No Show,አልመጣም
 DocType: Shipping Rule Country,Shipping Rule Country,መላኪያ ደንብ አገር
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,ውጣ እና ክትትል
 DocType: Maintenance Visit,Partially Completed,በከፊል የተጠናቀቁ
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,መጠነኛ የችኮላ
 DocType: Leave Type,Include holidays within leaves as leaves,ቅጠሎች እንደ ቅጠል ውስጥ በዓላት አካትት
 DocType: Sales Invoice,Packed Items,የታሸጉ ንጥሎች
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,መለያ ቁጥር ላይ የዋስትና የይገባኛል ጥያቄ
@@ -1846,13 +1881,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),የሚከፈልበት መጠን (የኩባንያ የምንዛሬ)
 DocType: Purchase Invoice,Additional Discount,ተጨማሪ ቅናሽ
 DocType: Selling Settings,Selling Settings,ቅንብሮች መሸጥ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,እርምጃን አረጋግጥ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,የመስመር ላይ ጨረታዎች
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,ብዛት ወይም ዋጋ ትመና Rate ወይም ሁለቱንም ይግለጹ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,መፈጸም
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,ጨመር ውስጥ ይመልከቱ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,የገበያ ወጪ
 ,Item Shortage Report,ንጥል እጥረት ሪፖርት
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","የክብደት \ n ደግሞ &quot;የክብደት UOM&quot; አውሳ, ተጠቅሷል"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","የክብደት \ n ደግሞ &quot;የክብደት UOM&quot; አውሳ, ተጠቅሷል"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ቁሳዊ ጥያቄ ይህ የአክሲዮን የሚመዘገብ ለማድረግ ስራ ላይ የሚውለው
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,ቀጣይ የእርጅና ቀን አዲስ ንብረት ግዴታ ነው
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,እያንዳንዱ ባች ለ የተለየ አካሄድ የተመሠረተ ቡድን
@@ -1864,12 +1900,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,እያንዳንዱ የአክሲዮን ንቅናቄ ለ በአካውንቲንግ የሚመዘገብ አድርግ
 DocType: Leave Allocation,Total Leaves Allocated,ጠቅላላ ቅጠሎች የተመደበ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},ረድፍ ምንም ያስፈልጋል መጋዘን {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,ልክ የፋይናንስ ዓመት የመጀመሪያ እና መጨረሻ ቀኖች ያስገቡ
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,ልክ የፋይናንስ ዓመት የመጀመሪያ እና መጨረሻ ቀኖች ያስገቡ
 DocType: Employee,Date Of Retirement,ጡረታ ነው ቀን
 DocType: Upload Attendance,Get Template,አብነት ያግኙ
 DocType: Material Request,Transferred,ተላልፈዋል
 DocType: Vehicle,Doors,በሮች
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext ማዋቀር ተጠናቋል!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext ማዋቀር ተጠናቋል!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,ለታካሚ ምዝገባ የከፈሉ
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,የግብር የፈጠረብኝን
@@ -1888,36 +1924,36 @@
 DocType: Employee,AB+,ኤቢ +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","ይህ ንጥል ተለዋጮች ያለው ከሆነ, ከዚያም የሽያጭ ትዕዛዞች ወዘተ መመረጥ አይችልም"
 DocType: Lead,Next Contact By,በ ቀጣይ እውቂያ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},ረድፍ ውስጥ ንጥል {0} ያስፈልጋል ብዛት {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},ረድፍ ውስጥ ንጥል {0} ያስፈልጋል ብዛት {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},የብዛት ንጥል የለም እንደ መጋዘን {0} ሊሰረዝ አይችልም {1}
 DocType: Quotation,Order Type,ትዕዛዝ አይነት
-DocType: Purchase Invoice,Notification Email Address,ማሳወቂያ ኢሜይል አድራሻ
 ,Item-wise Sales Register,ንጥል-ጥበብ የሽያጭ መመዝገቢያ
 DocType: Asset,Gross Purchase Amount,አጠቃላይ የግዢ መጠን
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,ክፍት እጆችን መክፈቻ
 DocType: Asset,Depreciation Method,የእርጅና ስልት
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,ከመስመር ውጭ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,ከመስመር ውጭ
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,መሰረታዊ ተመን ውስጥ ተካትቷል ይህ ታክስ ነው?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,ጠቅላላ ዒላማ
 DocType: Job Applicant,Applicant for a Job,ሥራ አመልካች
 DocType: Production Plan Material Request,Production Plan Material Request,የምርት ዕቅድ የቁሳዊ ጥያቄ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,የተፈጠረ ምንም የምርት ትዕዛዞች
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,የተፈጠረ ምንም የምርት ትዕዛዞች
 DocType: Stock Reconciliation,Reconciliation JSON,ማስታረቅ JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,በጣም ብዙ አምዶች. ሪፖርቱን ለመላክ እና የተመን መተግበሪያ በመጠቀም ያትሙ.
 DocType: Purchase Invoice Item,Batch No,የጅምላ የለም
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},የሽያጭ ጥያቄ: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,አንድ የደንበኛ የግዢ ትዕዛዝ ላይ በርካታ የሽያጭ ትዕዛዞች ፍቀድ
 DocType: Student Group Instructor,Student Group Instructor,የተማሪ ቡድን አስተማሪ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 ተንቀሳቃሽ አይ
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,ዋና
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,ዋና
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,ተለዋጭ
 DocType: Naming Series,Set prefix for numbering series on your transactions,በእርስዎ ግብይቶች ላይ ተከታታይ ቁጥር አዘጋጅ ቅድመ ቅጥያ
 DocType: Employee Attendance Tool,Employees HTML,ተቀጣሪዎች ኤችቲኤምኤል
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,ነባሪ BOM ({0}) ይህ ንጥል ወይም አብነት ገባሪ መሆን አለበት
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,ነባሪ BOM ({0}) ይህ ንጥል ወይም አብነት ገባሪ መሆን አለበት
 DocType: Employee,Leave Encashed?,Encashed ይውጡ?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,መስክ ከ አጋጣሚ የግዴታ ነው
 DocType: Email Digest,Annual Expenses,ዓመታዊ ወጪዎች
 DocType: Item,Variants,ተለዋጮች
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,የግዢ ትዕዛዝ አድርግ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,የግዢ ትዕዛዝ አድርግ
 DocType: SMS Center,Send To,ወደ ላክ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},አይተውህም አይነት የሚበቃ ፈቃድ ቀሪ የለም {0}
 DocType: Payment Reconciliation Payment,Allocated amount,በጀት መጠን
@@ -1933,6 +1969,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,የተማሪ ቡድን ጥንካሬ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,ጆርናል ላይ የሚመዘገብ {0} ማንኛውም ያላገኘውን {1} ግቤት የለውም
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,ማስተመኖች
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,የስልጠና ዝግጅቶች
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},ተከታታይ ምንም ንጥል ገባ አባዛ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,አንድ መላኪያ አገዛዝ አንድ ሁኔታ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,ያስገቡ
@@ -1942,7 +1979,7 @@
 DocType: Sales Order,To Deliver and Bill,አድርስ እና ቢል
 DocType: Student Group,Instructors,መምህራን
 DocType: GL Entry,Credit Amount in Account Currency,መለያ ምንዛሬ ውስጥ የብድር መጠን
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} መቅረብ አለበት
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} መቅረብ አለበት
 DocType: Authorization Control,Authorization Control,ፈቀዳ ቁጥጥር
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},የረድፍ # {0}: መጋዘን አላገኘም ውድቅ ንጥል ላይ ግዴታ ነው {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,ክፍያ
@@ -1961,11 +1998,11 @@
 DocType: Quotation Item,Actual Qty,ትክክለኛ ብዛት
 DocType: Sales Invoice Item,References,ማጣቀሻዎች
 DocType: Quality Inspection Reading,Reading 10,10 ማንበብ
-DocType: Hub Settings,Hub Node,ማዕከል መስቀለኛ መንገድ
+DocType: Hub Category,Hub Node,ማዕከል መስቀለኛ መንገድ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,አንተ የተባዙ ንጥሎች አስገብተዋል. ለማስተካከል እና እንደገና ይሞክሩ.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,የሥራ ጓደኛ
 DocType: Asset Movement,Asset Movement,የንብረት ንቅናቄ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,አዲስ ጨመር
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,አዲስ ጨመር
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} ንጥል አንድ serialized ንጥል አይደለም
 DocType: SMS Center,Create Receiver List,ተቀባይ ዝርዝር ፍጠር
 DocType: Vehicle,Wheels,መንኮራኩሮች
@@ -1979,15 +2016,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,ቴሌ ኮሙኒካሲዮን
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),የጥቅል ይህን የመላኪያ (ብቻ ረቂቅ) አንድ ክፍል እንደሆነ ይጠቁማል
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,የክፍያ Entry አድርግ
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},ንጥል ለ ብዛት {0} ያነሰ መሆን አለበት {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},ንጥል ለ ብዛት {0} ያነሰ መሆን አለበት {1}
 ,Sales Invoice Trends,የሽያጭ ደረሰኝ አዝማሚያዎች
 DocType: Leave Application,Apply / Approve Leaves,ቅጠሎች አጽድቅ / ተግብር
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,ያህል
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,ያህል
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',ወይም &#39;ቀዳሚ ረድፍ ጠቅላላ&#39; &#39;ቀዳሚ የረድፍ መጠን ላይ&#39; ክፍያ አይነት ከሆነ ብቻ ነው ረድፍ ሊያመለክት ይችላል
 DocType: Sales Order Item,Delivery Warehouse,የመላኪያ መጋዘን
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,የገንዘብ ወጪ ማዕከላት ዛፍ.
 DocType: Serial No,Delivery Document No,ማቅረቢያ ሰነድ የለም
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},ኩባንያ ውስጥ &#39;የንብረት ማስወገድ ላይ ቅሰም / ኪሳራ ሒሳብ&#39; ለማዘጋጀት እባክዎ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},ኩባንያ ውስጥ &#39;የንብረት ማስወገድ ላይ ቅሰም / ኪሳራ ሒሳብ&#39; ለማዘጋጀት እባክዎ {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,የግዢ ደረሰኞች ከ ንጥሎች ያግኙ
 DocType: Serial No,Creation Date,የተፈጠረበት ቀን
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},{0} ንጥል ዋጋ ዝርዝር ውስጥ ብዙ ጊዜ ይገኛል {1}
@@ -1998,11 +2035,12 @@
 DocType: Student,Student Mobile Number,የተማሪ የተንቀሳቃሽ ስልክ ቁጥር
 DocType: Item,Has Variants,ተለዋጮች አለው
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,ምላሽ ስጥ
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},ከዚህ ቀደም ከ ንጥሎች ተመርጠዋል ሊሆን {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},ከዚህ ቀደም ከ ንጥሎች ተመርጠዋል ሊሆን {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ወደ ወርሃዊ ስርጭት ስም
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ባች መታወቂያ ግዴታ ነው
 DocType: Sales Person,Parent Sales Person,የወላጅ ሽያጭ ሰው
-DocType: Purchase Invoice,Recurring Invoice,ተደጋጋሚ ደረሰኝ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,ከከፍተኛው ወደ ዝቅተኛ
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,መጀመሪያ ፕሮግራሙን ይምረጡ
 DocType: Patient Appointment,Patient Age,የታካሚ ዕድሜ
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,ፕሮጀክቶች ማስተዳደር
 DocType: Supplier,Supplier of Goods or Services.,ምርቶች ወይም አገልግሎቶች አቅራቢ.
@@ -2010,8 +2048,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,በታካሚ ውስጥ ካልተቀመጠ የምክር መክፈያ ክፍያን ለመተካት ካልተወሰዱ የሚጠቀሙባቸው ነባሪ ሂሳቦች.
 DocType: Vehicle Log,Fuel Price,የነዳጅ ዋጋ
 DocType: Budget,Budget,ባጀት
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,ክፍት የሚሆን
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,የተወሰነ የንብረት ንጥል ያልሆነ-የአክሲዮን ንጥል መሆን አለበት.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,ክፍት የሚሆን
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,የተወሰነ የንብረት ንጥል ያልሆነ-የአክሲዮን ንጥል መሆን አለበት.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","ይህ የገቢ ወይም የወጪ መለያ አይደለም እንደ በጀት, ላይ {0} ሊመደብ አይችልም"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,አሳክቷል
 DocType: Student Admission,Application Form Route,ማመልከቻ ቅጽ መስመር
@@ -2025,12 +2063,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,{0} ንጥል መለያ ቁጥሮች ለ ማዋቀር አይደለም. ንጥል ጌታ ይመልከቱ
 DocType: Maintenance Visit,Maintenance Time,ጥገና ሰዓት
 ,Amount to Deliver,መጠን ለማዳን
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},አንድ አይነት ንጥል ብዙ ጊዜ ተጨምሯል. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,የሚለው ቃል መጀመሪያ ቀን የሚለው ቃል ጋር የተያያዘ ነው ይህም ወደ የትምህርት ዓመት ዓመት የመጀመሪያ ቀን ከ ቀደም ሊሆን አይችልም (የትምህርት ዓመት {}). ቀናት ለማረም እና እንደገና ይሞክሩ.
 DocType: Guardian,Guardian Interests,አሳዳጊ ፍላጎቶች
 DocType: Naming Series,Current Value,የአሁኑ ዋጋ
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,በርካታ የበጀት ዓመታት ቀን {0} አገልግሎቶች አሉ. በጀት ዓመት ውስጥ ኩባንያ ማዘጋጀት እባክዎ
 DocType: School Settings,Instructor Records to be created by,የአስተማሪው መዝገብ በ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} ተፈጥሯል
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} ተፈጥሯል
 DocType: Delivery Note Item,Against Sales Order,የሽያጭ ትዕዛዝ ላይ
 ,Serial No Status,ተከታታይ ምንም ሁኔታ
 DocType: Payment Entry Reference,Outstanding,ያልተከፈለ
@@ -2040,10 +2079,10 @@
 						must be greater than or equal to {2}","ረድፍ {0}: ለማቀናበር {1} PERIODICITY, እንዲሁም ቀን \ ወደ መካከል ልዩነት ይልቅ የበለጠ ወይም እኩል መሆን አለበት {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,ይህ የአክሲዮን እንቅስቃሴ ላይ የተመሠረተ ነው. ይመልከቱ {0} ዝርዝር መረጃ ለማግኘት
 DocType: Pricing Rule,Selling,ሽያጭ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},የገንዘብ መጠን {0} {1} ላይ የሚቀነስ {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},የገንዘብ መጠን {0} {1} ላይ የሚቀነስ {2}
 DocType: Employee,Salary Information,ደመወዝ መረጃ
 DocType: Sales Person,Name and Employee ID,ስም እና የሰራተኛ መታወቂያ
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,መጠናቀቅ ያለበት ቀን ቀን መለጠፍ በፊት ሊሆን አይችልም
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,መጠናቀቅ ያለበት ቀን ቀን መለጠፍ በፊት ሊሆን አይችልም
 DocType: Website Item Group,Website Item Group,የድር ጣቢያ ንጥል ቡድን
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,ተግባርና ግብሮች
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,የማጣቀሻ ቀን ያስገቡ
@@ -2069,7 +2108,7 @@
 DocType: Issue,Resolution Details,ጥራት ዝርዝሮች
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,አመዳደብ
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,ቅበላ መስፈርቶች
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,ከላይ በሰንጠረዡ ውስጥ ቁሳዊ ጥያቄዎች ያስገቡ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,ከላይ በሰንጠረዡ ውስጥ ቁሳዊ ጥያቄዎች ያስገቡ
 DocType: Item Attribute,Attribute Name,ስም ይስጡ
 DocType: BOM,Show In Website,ድር ጣቢያ ውስጥ አሳይ
 DocType: Shopping Cart Settings,Show Quantity in Website,ድረ ውስጥ ብዛት አሳይ
@@ -2078,7 +2117,7 @@
 DocType: Item Reorder,Check in (group),(ቡድን) ውስጥ ይመልከቱ
 ,Qty to Order,ለማዘዝ ብዛት
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","ትርፍ / ማጣት ላስያዙበት ይሆናል ውስጥ ተጠያቂነት ወይም የፍትሃዊነት ስር መለያ ራስ,"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,ሁሉም ተግባራት Gantt ገበታ.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,ሁሉም ተግባራት Gantt ገበታ.
 DocType: Opportunity,Mins to First Response,በመጀመሪያ ምላሽ ወደ ደቂቃዎች
 DocType: Pricing Rule,Margin Type,ህዳግ አይነት
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} ሰዓታት
@@ -2099,35 +2138,35 @@
 DocType: Patient,Surgical History,የቀዶ ጥገና ታሪክ
 DocType: Employee,Resignation Letter Date,የሥራ መልቀቂያ ደብዳቤ ቀን
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,የዋጋ ደንቦች ተጨማሪ በብዛት ላይ ተመስርተው ይጣራሉ.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},ሠራተኛ ለማግኘት በመቀላቀል ቀን ማዘጋጀት እባክዎ {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},ሠራተኛ ለማግኘት በመቀላቀል ቀን ማዘጋጀት እባክዎ {0}
 DocType: Task,Total Billing Amount (via Time Sheet),ጠቅላላ የሂሳብ አከፋፈል መጠን (ጊዜ ሉህ በኩል)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ድገም የደንበኛ ገቢ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ሚና &#39;የወጪ አጽዳቂ&#39; ሊኖረው ይገባል
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,ሁለት
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,ለምርት BOM እና ብዛት ይምረጡ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,ለምርት BOM እና ብዛት ይምረጡ
 DocType: Asset,Depreciation Schedule,የእርጅና ፕሮግራም
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,የሽያጭ አጋር አድራሻዎች እና እውቂያዎች
 DocType: Bank Reconciliation Detail,Against Account,መለያ ላይ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,ግማሽ ቀን ቀን ቀን ጀምሮ እና ቀን ወደ መካከል መሆን አለበት
 DocType: Maintenance Schedule Detail,Actual Date,ትክክለኛ ቀን
 DocType: Item,Has Batch No,የጅምላ አይ አለው
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},ዓመታዊ አከፋፈል: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},ዓመታዊ አከፋፈል: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),የቁሳቁስና የአገለግሎት ቀረጥ (GST ህንድ)
 DocType: Delivery Note,Excise Page Number,ኤክሳይስ የገጽ ቁጥር
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","ኩባንያ, ቀን ጀምሮ እና ቀን ወደ የግዴታ ነው"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,ከማማከር
 DocType: Asset,Purchase Date,የተገዛበት ቀን
 DocType: Employee,Personal Details,የግል መረጃ
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},ኩባንያ ውስጥ &#39;የንብረት የእርጅና ወጪ ማዕከል&#39; ለማዘጋጀት እባክዎ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},ኩባንያ ውስጥ &#39;የንብረት የእርጅና ወጪ ማዕከል&#39; ለማዘጋጀት እባክዎ {0}
 ,Maintenance Schedules,ጥገና ፕሮግራም
 DocType: Task,Actual End Date (via Time Sheet),ትክክለኛው መጨረሻ ቀን (ሰዓት ሉህ በኩል)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},የገንዘብ መጠን {0} {1} ላይ {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},የገንዘብ መጠን {0} {1} ላይ {2} {3}
 ,Quotation Trends,በትዕምርተ ጥቅስ አዝማሚያዎች
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},ንጥል ቡድን ንጥል ንጥል ጌታ ውስጥ የተጠቀሰው አይደለም {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,መለያ ወደ ዴቢት አንድ የሚሰበሰብ መለያ መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,መለያ ወደ ዴቢት አንድ የሚሰበሰብ መለያ መሆን አለበት
 DocType: Shipping Rule Condition,Shipping Amount,መላኪያ መጠን
 DocType: Supplier Scorecard Period,Period Score,የዘፈን ነጥብ
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,ደንበኞች ያክሉ
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,ደንበኞች ያክሉ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,በመጠባበቅ ላይ ያለ መጠን
 DocType: Lab Test Template,Special,ልዩ
 DocType: Purchase Invoice Item,Conversion Factor,የልወጣ መንስኤ
@@ -2135,13 +2174,14 @@
 ,Vehicle Expenses,የተሽከርካሪ ወጪ
 DocType: Serial No,Invoice Details,የደረሰኝ ዝርዝሮች
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},ጠቃሚ ሕይወት በኋላ የተጠበቀው ዋጋ ይበልጣል ወይም እኩል መሆን አለበት {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,ጀምር
+DocType: Hub Category,Hub Category,Hub ምድብ
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,የተሽከርካሪ ቁጥር
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,ተደጋጋሚ መጠየቂያ ማቆም ይሆናል ከተደረገባቸው ቀን
 DocType: Employee Loan,Loan Amount,የብድር መጠን
 DocType: Program Enrollment,Self-Driving Vehicle,የራስ-መንዳት ተሽከርካሪ
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,የአቅራቢ ካርድ መስጫ ቋሚ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},ረድፍ {0}: ቁሳቁሶች መካከል ቢል ንጥል አልተገኘም {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},ረድፍ {0}: ቁሳቁሶች መካከል ቢል ንጥል አልተገኘም {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,ጠቅላላ የተመደበ ቅጠሎች {0} ያነሰ ሊሆን አይችልም ጊዜ ቀድሞውኑ ጸድቀዋል ቅጠሎች {1} ከ
 DocType: Journal Entry,Accounts Receivable,ለመቀበል የሚቻሉ አካውንቶች
 ,Supplier-Wise Sales Analytics,አቅራቢው-ጥበበኛ የሽያጭ ትንታኔ
@@ -2152,7 +2192,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","የወላጅ ኮርስ (በዚህ ወላጅ የትምህርት ክፍል አይደለም ከሆነ, ባዶ ይተዉት)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,ሁሉም ሠራተኛ አይነቶች ተደርጎ ከሆነ ባዶውን ይተው
 DocType: Landed Cost Voucher,Distribute Charges Based On,አሰራጭ ክፍያዎች ላይ የተመሠረተ
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,የሰው ኃይል ቅንብሮች
 DocType: Salary Slip,net pay info,የተጣራ ክፍያ መረጃ
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,ይህ ዋጋ በነባሪው የሽያጭ ዋጋ ዝርዝር ውስጥ ይዘምናል.
@@ -2163,7 +2203,7 @@
 DocType: Patient,B Positive,ቢ አዎንታዊ
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",የረድፍ # {0}: ንጥል ቋሚ ንብረት ነው እንደ ብዛት: 1 መሆን አለበት. በርካታ ብዛት የተለያየ ረድፍ ይጠቀሙ.
 DocType: Leave Block List Allow,Leave Block List Allow,አግድ ዝርዝር ፍቀድ ይነሱ
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr ባዶ ወይም ባዶ መሆን አይችልም
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr ባዶ ወይም ባዶ መሆን አይችልም
 DocType: Patient Medical Record,Patient Medical Record,ታካሚ የሕክምና መዝገብ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,ያልሆኑ ቡድን ቡድን
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ስፖርት
@@ -2179,9 +2219,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,ለ ምንዛሬ ተመን ማግኘት አልተቻለም {0} ወደ {1} ቁልፍ ቀን {2}. እራስዎ ምንዛሪ ልውውጥ መዝገብ ለመፍጠር እባክዎ
 DocType: POS Profile,Price List,የዋጋ ዝርዝር
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ነባሪ በጀት ዓመት አሁን ነው. ለውጡ ተግባራዊ ለማግኘት እባክዎ አሳሽዎን ያድሱ.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,የወጪ የይገባኛል ጥያቄዎች
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,የወጪ የይገባኛል ጥያቄዎች
 DocType: Issue,Support,ድጋፍ
 ,BOM Search,BOM ፍለጋ
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",በዚህ መጋዘን ውስጥ ባለው ክምችት ላይ &quot;ውክልና አልደረሰም&quot; የሚለውን በ Hub ላይ ያትሙ.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),የመመዝገቢያ ጊዜ (+ ድምሮች መክፈት)
 DocType: Vehicle,Fuel Type,የነዳጅ አይነት
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,ኩባንያ ውስጥ ምንዛሬ ይግለጹ
@@ -2193,16 +2234,16 @@
 DocType: Healthcare Settings,Remind Before,ከዚህ በፊት አስታውሳ
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM የመለወጥ ምክንያት ረድፍ ውስጥ ያስፈልጋል {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",የረድፍ # {0}: የማጣቀሻ ሰነድ ዓይነት የሽያጭ ትዕዛዝ አንዱ ሽያጭ ደረሰኝ ወይም ጆርናል የሚመዘገብ መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",የረድፍ # {0}: የማጣቀሻ ሰነድ ዓይነት የሽያጭ ትዕዛዝ አንዱ ሽያጭ ደረሰኝ ወይም ጆርናል የሚመዘገብ መሆን አለበት
 DocType: Salary Component,Deduction,ቅናሽ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,ረድፍ {0}: ሰዓት ጀምሮ እና ሰዓት ወደ የግዴታ ነው.
 DocType: Stock Reconciliation Item,Amount Difference,መጠን ያለው ልዩነት
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},ንጥል ዋጋ ለ ታክሏል {0} የዋጋ ዝርዝር ውስጥ {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},ንጥል ዋጋ ለ ታክሏል {0} የዋጋ ዝርዝር ውስጥ {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,ይህ የሽያጭ ሰው የሰራተኛ መታወቂያ ያስገቡ
 DocType: Territory,Classification of Customers by region,ክልል በ ደንበኞች መካከል ምደባ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,ልዩነት መጠን ዜሮ መሆን አለበት
 DocType: Project,Gross Margin,ግዙፍ ኅዳግ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,በመጀመሪያ የምርት ንጥል ያስገቡ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,በመጀመሪያ የምርት ንጥል ያስገቡ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,የተሰላው ባንክ መግለጫ ቀሪ
 DocType: Normal Test Template,Normal Test Template,መደበኛ የሙከራ ቅንብር
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ተሰናክሏል ተጠቃሚ
@@ -2212,21 +2253,22 @@
 DocType: Salary Slip,Total Deduction,ጠቅላላ ተቀናሽ
 ,Production Analytics,የምርት ትንታኔ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,ይህ በ E ዚህ ህመምተኛ ላይ የተደረጉ ግብይቶች ላይ የተመሠረተ ነው. ለዝርዝሮች ከታች ያለውን የጊዜ መስመር ይመልከቱ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,ወጪ ዘምኗል
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,ወጪ ዘምኗል
 DocType: Employee,Date of Birth,የትውልድ ቀን
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,ንጥል {0} አስቀድሞ ተመለሱ ተደርጓል
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** በጀት ዓመት ** አንድ የፋይናንስ ዓመት ይወክላል. ሁሉም የሂሳብ ግቤቶች እና ሌሎች ዋና ዋና ግብይቶች ** ** በጀት ዓመት ላይ ክትትል ነው.
 DocType: Opportunity,Customer / Lead Address,ደንበኛ / በእርሳስ አድራሻ
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,የአቅራቢን የመሳሪያ ካርድ ማዋቀር
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},ማስጠንቀቂያ: አባሪ ላይ ልክ ያልሆነ SSL ሰርቲፊኬት {0}
-DocType: Student Admission,Eligibility,የብቁነት
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,የግምገማ ዕቅድ ስም
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},ማስጠንቀቂያ: አባሪ ላይ ልክ ያልሆነ SSL ሰርቲፊኬት {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","እርሳሶች የንግድ, ሁሉም እውቂያዎች እና ተጨማሪ ይመራል እንደ ለማከል ለማገዝ"
 DocType: Production Order Operation,Actual Operation Time,ትክክለኛው ኦፕሬሽን ሰዓት
 DocType: Authorization Rule,Applicable To (User),የሚመለከታቸው ለማድረግ (ተጠቃሚ)
 DocType: Purchase Taxes and Charges,Deduct,ቀነሰ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,የሥራው ዝርዝር
 DocType: Student Applicant,Applied,የተተገበረ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,ዳግም-ክፈት
 DocType: Sales Invoice Item,Qty as per Stock UOM,ብዛት የአክሲዮን UOM መሰረት
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 ስም
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","በስተቀር ልዩ ቁምፊዎች &quot;-&quot; &quot;.&quot;, &quot;#&quot; እና &quot;/&quot; ተከታታይ እየሰየሙ ውስጥ አይፈቀድም"
@@ -2238,7 +2280,7 @@
 DocType: Request for Quotation,Manufacturing Manager,የማምረቻ አስተዳዳሪ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},ተከታታይ አይ {0} እስከሁለት ዋስትና ስር ነው {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,ጥቅሎች ወደ ክፈል ማቅረቢያ ማስታወሻ.
-apps/erpnext/erpnext/hooks.py +98,Shipments,ማዕድኑን
+apps/erpnext/erpnext/hooks.py +107,Shipments,ማዕድኑን
 DocType: Payment Entry,Total Allocated Amount (Company Currency),ጠቅላላ የተመደበ መጠን (የኩባንያ የምንዛሬ)
 DocType: Purchase Order Item,To be delivered to customer,የደንበኛ እስኪደርስ ድረስ
 DocType: BOM,Scrap Material Cost,ቁራጭ ቁሳዊ ወጪ
@@ -2260,8 +2302,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,ንጥል ተለዋጭ ቅንብሮች
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,ኩባንያ ይምረጡ ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,ሁሉም ክፍሎች እየታሰቡ ከሆነ ባዶውን ይተው
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","የሥራ ዓይነቶች (ቋሚ, ውል, እሥረኛ ወዘተ)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} ንጥል ግዴታ ነው {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","የሥራ ዓይነቶች (ቋሚ, ውል, እሥረኛ ወዘተ)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} ንጥል ግዴታ ነው {1}
 DocType: Process Payroll,Fortnightly,በየሁለት ሳምንቱ
 DocType: Currency Exchange,From Currency,ምንዛሬ ከ
 DocType: Vital Signs,Weight (In Kilogram),ክብደት (በኪልግራም)
@@ -2285,7 +2327,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,ፕሮግራም ለማግኘት &#39;ፍጠር ፕሮግራም »ላይ ጠቅ ያድርጉ
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,የሚከተሉትን መርሐግብሮችን በመሰረዝ ላይ ሳለ ስህተቶች ነበሩ:
 DocType: Bin,Ordered Quantity,የዕቃው መረጃ ብዛት
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",ለምሳሌ &quot;ግንበኞች ለ መሣሪያዎች ገንባ&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",ለምሳሌ &quot;ግንበኞች ለ መሣሪያዎች ገንባ&quot;
 DocType: Grading Scale,Grading Scale Intervals,አሰጣጥ በስምምነት ጣልቃ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {2} ለ ዲግሪ Entry ብቻ ምንዛሬ ውስጥ ሊደረጉ ይችላሉ: {3}
 DocType: Production Order,In Process,በሂደት ላይ
@@ -2308,11 +2350,10 @@
 DocType: Purchase Invoice,With Payment of Tax,በግብር ክፍያ
 DocType: Expense Claim Detail,Expense Claim Detail,የወጪ የይገባኛል ጥያቄ ዝርዝር
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,አቅራቢ ለማግኘት TRIPLICATE
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,ትክክለኛውን መለያ ይምረጡ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,ትክክለኛውን መለያ ይምረጡ
 DocType: Item,Weight UOM,የክብደት UOM
 DocType: Salary Structure Employee,Salary Structure Employee,ደመወዝ መዋቅር ሰራተኛ
 DocType: Patient,Blood Group,የደም ቡድን
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,በመጠባበቅ ላይ
 DocType: Course,Course Name,የኮርሱ ስም
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,በአንድ የተወሰነ ሠራተኛ ፈቃድ መተግበሪያዎች ማጽደቅ የሚችሉ ተጠቃሚዎች
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,ቢሮ ዕቃዎች
@@ -2331,7 +2372,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,የዋጋ ዝርዝር ካልተዋቀረ ዋጋዎች አይታይም
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,ለዚህ መላኪያ አገዛዝ አንድ አገር መግለጽ ወይም ዓለም አቀፍ መላኪያ ያረጋግጡ
 DocType: Stock Entry,Total Incoming Value,ጠቅላላ ገቢ ዋጋ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,ዴት ወደ ያስፈልጋል
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,ዴት ወደ ያስፈልጋል
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets በእርስዎ ቡድን እንዳደረገ activites ጊዜ, ወጪ እና የማስከፈያ እንዲከታተሉ ለመርዳት"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,የግዢ ዋጋ ዝርዝር
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,የአቅራቢዎች የውጤት መለኪያዎች አብነቶች.
@@ -2341,7 +2382,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,የክፍያ ማስታረቅ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Incharge ሰው ስም ይምረጡ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,ቴክኖሎጂ
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},ጠቅላላ የማይከፈላቸው: {0}
+DocType: Hub Settings,Unregister from Hub,ከሃበር ከምዝገባ አውጣ
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},ጠቅላላ የማይከፈላቸው: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM ድር ጣቢያ ኦፕሬሽን
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,ደብዳቤ አበርክቱ
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,ቁሳዊ ጥያቄዎች (MRP) እና የምርት ትዕዛዞች ፍጠር.
@@ -2353,7 +2395,9 @@
 DocType: Physician Schedule Time Slot,To Time,ጊዜ ወደ
 DocType: Authorization Rule,Approving Role (above authorized value),(ፍቃድ ዋጋ በላይ) ሚና ማጽደቅ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,መለያ ወደ ብድር የሚከፈል መለያ መሆን አለበት
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM Recursion: {0} መካከል ወላጅ ወይም ልጅ ሊሆን አይችልም {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,ለክፍያ ለተማሪው የሚያስፈልገውን የተማሪ ቅበላ የሚለውን እባክዎ ይምረጡ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM Recursion: {0} መካከል ወላጅ ወይም ልጅ ሊሆን አይችልም {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,እባክዎን የዋጋ ዝርዝር ለማተም ዋጋ ዝርዝርን ይምረጡ
 DocType: Production Order Operation,Completed Qty,ተጠናቋል ብዛት
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",{0}: ብቻ ዴቢት መለያዎች ሌላ ክሬዲት ግቤት ላይ የተገናኘ ሊሆን ይችላል
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,የዋጋ ዝርዝር {0} ተሰናክሏል
@@ -2365,38 +2409,39 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} ንጥል ያስፈልጋል መለያ ቁጥር {1}. ያቀረቡት {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,የአሁኑ ግምቱ ተመን
 DocType: Item,Customer Item Codes,የደንበኛ ንጥል ኮዶች
+DocType: Training Event,Advance,ቅድሚያ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,የ Exchange ቅሰም / ማጣት
 DocType: Opportunity,Lost Reason,የጠፋ ምክንያት
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,አዲስ አድራሻ
 DocType: Quality Inspection,Sample Size,የናሙና መጠን
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,ደረሰኝ ሰነድ ያስገቡ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,ሁሉም ንጥሎች ቀደም ሲል ደረሰኝ ተደርጓል
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;የጉዳይ ቁጥር ከ&#39; አንድ ልክ ይግለጹ
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',&#39;የጉዳይ ቁጥር ከ&#39; አንድ ልክ ይግለጹ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,ተጨማሪ ወጪ ማዕከላት ቡድኖች ስር ሊሆን ይችላል ነገር ግን ግቤቶች ያልሆኑ ቡድኖች ላይ ሊሆን ይችላል
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ተጠቃሚዎች እና ፈቃዶች
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},የምርት ትዕዛዞች ተፈጠረ: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},የምርት ትዕዛዞች ተፈጠረ: {0}
 DocType: Branch,Branch,ቅርንጫፍ
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ፕሪንቲንግ እና የምርት
 DocType: Company,Total Monthly Sales,ጠቅላላ የወጪ ሽያጭ
 DocType: Bin,Actual Quantity,ትክክለኛ ብዛት
 DocType: Shipping Rule,example: Next Day Shipping,ለምሳሌ: ቀጣይ ቀን መላኪያ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,አልተገኘም ተከታታይ ምንም {0}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},ምዝገባው {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},ምዝገባው {0}
 DocType: Fee Schedule Program,Fee Schedule Program,የክፍያ መርሐግብር ፕሮግራም
 DocType: Fee Schedule Program,Student Batch,የተማሪ ባች
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,በሽተኛ = &#39;{0}&#39; ትዕዛዝ በታይዘዞች 1 ገደብ ላይ ምልክት ያድርጉ
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,የተማሪ አድርግ
 DocType: Supplier Scorecard Scoring Standing,Min Grade,አነስተኛ ደረጃ
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},እርስዎ ፕሮጀክት ላይ ተባበር ተጋብዘዋል: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},ሐኪሙ በ {0} ላይ አይገኝም
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},እርስዎ ፕሮጀክት ላይ ተባበር ተጋብዘዋል: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},ሐኪሙ በ {0} ላይ አይገኝም
 DocType: Leave Block List Date,Block Date,አግድ ቀን
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},በዶክትሪፕስ {0} ዶላር መስክ የደንበኝነት ምዝገባ መታወቂያ ያክሉ
 DocType: Purchase Receipt,Supplier Delivery Note,የአቅራቢ ማቅረቢያ ማስታወሻ
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,አሁኑኑ ያመልክቱ
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,አሁኑኑ ያመልክቱ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},ትክክለኛው ብዛት {0} / መጠበቅ ብዛት {1}
 DocType: Purchase Invoice,E-commerce GSTIN,ኢ-commerce GSTIN
 DocType: Sales Order,Not Delivered,ደርሷል አይደለም
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,የተጠበቀው ቀን ከክ ል ቀን በፊት መሆን አይችልም
 ,Bank Clearance Summary,የባንክ መልቀቂያ ማጠቃለያ
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","ይፍጠሩ እና, ዕለታዊ ሳምንታዊ እና ወርሃዊ የኢሜይል ዜናዎች ያስተዳድሩ."
 DocType: Appraisal Goal,Appraisal Goal,ግምገማ ግብ
@@ -2404,12 +2449,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,ሕንፃዎች
 DocType: Fee Schedule,Fee Structure,ክፍያ መዋቅር
 DocType: Timesheet Detail,Costing Amount,ዋጋና የዋጋ መጠን
-DocType: Student Admission,Application Fee,የመተግበሪያ ክፍያ
+DocType: Student Admission Program,Application Fee,የመተግበሪያ ክፍያ
 DocType: Process Payroll,Submit Salary Slip,የቀጣሪ አስገባ
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,ንጥል {0} ነው {1}% ለ Maxiumm ቅናሽ
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,ንጥል {0} ነው {1}% ለ Maxiumm ቅናሽ
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,የጅምላ ውስጥ አስመጣ
 DocType: Sales Partner,Address & Contacts,አድራሻ እና እውቂያዎች
 DocType: SMS Log,Sender Name,የላኪ ስም
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,በመስፈርት ደርድር
 DocType: POS Profile,[Select],[ምረጥ]
 DocType: Vital Signs,Blood Pressure (diastolic),የደም ግፊት (ዳቲኮል)
 DocType: SMS Log,Sent To,ወደ ተልኳል
@@ -2418,7 +2464,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,ቀጣይ የእውቂያ ቀን ያለፈ መሆን አይችልም
 DocType: Company,For Reference Only.,ማጣቀሻ ያህል ብቻ.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},ሀኪም {0} በ {1} ላይ አይገኝም
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,ምረጥ የጅምላ አይ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,ምረጥ የጅምላ አይ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},ልክ ያልሆነ {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,የማጣቀሻ ማመልከቻ
@@ -2434,15 +2480,15 @@
 DocType: Normal Test Items,Require Result Value,የ ውጤት ውጤት እሴት
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,የጉዳይ ቁጥር 0 መሆን አይችልም
 DocType: Item,Show a slideshow at the top of the page,በገጹ ላይኛው ክፍል ላይ አንድ ስላይድ ትዕይንት አሳይ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,መደብሮች
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,መደብሮች
 DocType: Project Type,Projects Manager,ፕሮጀክቶች ሥራ አስኪያጅ
 DocType: Serial No,Delivery Time,የማስረከቢያ ቀን ገደብ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,ላይ የተመሠረተ ጥበቃና
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,ቀጠሮ ተሰርዟል
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,ቀጠሮ ተሰርዟል
 DocType: Item,End of Life,የሕይወት መጨረሻ
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,ጉዞ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,ለተሰጠው ቀናት ሠራተኛ {0} አልተገኘም ምንም ንቁ ወይም ነባሪ ደመወዝ መዋቅር
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,ጉዞ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,ለተሰጠው ቀናት ሠራተኛ {0} አልተገኘም ምንም ንቁ ወይም ነባሪ ደመወዝ መዋቅር
 DocType: Leave Block List,Allow Users,ተጠቃሚዎች ፍቀድ
 DocType: Purchase Order,Customer Mobile No,የደንበኛ ተንቀሳቃሽ ምንም
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,ተደጋጋሚ
@@ -2451,12 +2497,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,አዘምን ወጪ
 DocType: Item Reorder,Item Reorder,ንጥል አስይዝ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,አሳይ የቀጣሪ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,አስተላልፍ ሐሳብ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,አስተላልፍ ሐሳብ
 DocType: Fees,Send Payment Request,የክፍያ ጥያቄን ላክ
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","የ ክወናዎች, የክወና ወጪ ይጥቀሱ እና ቀዶ ሕክምና ምንም ልዩ ክወና መስጠት."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ይህ ሰነድ በ ገደብ በላይ ነው {0} {1} ንጥል {4}. እናንተ እያደረግን ነው በዚያው ላይ ሌላ {3} {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,በማስቀመጥ ላይ በኋላ ተደጋጋሚ ማዘጋጀት እባክዎ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,ይምረጡ ለውጥ መጠን መለያ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,ይምረጡ ለውጥ መጠን መለያ
 DocType: Purchase Invoice,Price List Currency,የዋጋ ዝርዝር ምንዛሬ
 DocType: Naming Series,User must always select,ተጠቃሚው ሁልጊዜ መምረጥ አለብዎ
 DocType: Stock Settings,Allow Negative Stock,አሉታዊ የአክሲዮን ፍቀድ
@@ -2476,7 +2522,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,ተቀጣሪ
 DocType: Sample Collection,Collected Time,የተሰበሰበበት ጊዜ
 DocType: Company,Sales Monthly History,ሽያጭ ወርሃዊ ታሪክ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,ምረጥ ባች
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,ምረጥ ባች
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} ሙሉ በሙሉ እንዲከፍሉ ነው
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,ወሳኝ ምልክቶች
 DocType: Training Event,End Time,መጨረሻ ሰዓት
@@ -2484,16 +2530,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,የክፍያ ተቀናሾች ወይም ማጣት
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,የሽያጭ ወይም ግዢ መደበኛ የኮንትራት ውል.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,ቫውቸር መድብ
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,እርግጠኛ ነዎት ይህንን ቀጠሮ መሰረዝ ይፈልጋሉ?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,የሽያጭ Pipeline
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},ደመወዝ ክፍለ አካል ውስጥ ነባሪ መለያ ማዘጋጀት እባክዎ {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,ያስፈልጋል ላይ
 DocType: Rename Tool,File to Rename,ዳግም ሰይም ፋይል
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},ረድፍ ውስጥ ንጥል ለማግኘት BOM ይምረጡ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},ረድፍ ውስጥ ንጥል ለማግኘት BOM ይምረጡ {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},መለያ {0} {1} መለያ ሁነታ ውስጥ ኩባንያ ጋር አይዛመድም: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},ንጥል ለማግኘት የለም የተጠቀሰዉ BOM {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ጥገና ፕሮግራም {0} ይህን የሽያጭ ትዕዛዝ በመሰረዝ በፊት ተሰርዟል አለበት
+DocType: POS Profile,Applicable for Users,ለተጠቃሚዎች የሚመለከት
 DocType: Notification Control,Expense Claim Approved,የወጪ የይገባኛል ጥያቄ ተፈቅዷል
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,ሠራተኛ የቀጣሪ {0} አስቀድሞ በዚህ ጊዜ የተፈጠሩ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,ሠራተኛ የቀጣሪ {0} አስቀድሞ በዚህ ጊዜ የተፈጠሩ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,የህክምና
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,የተገዙ ንጥሎች መካከል ወጪ
 DocType: Selling Settings,Sales Order Required,የሽያጭ ትዕዛዝ ያስፈልጋል
@@ -2517,6 +2565,7 @@
 DocType: Offer Letter,Accepted,ተቀባይነት አግኝቷል
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,ድርጅት
 DocType: BOM Update Tool,BOM Update Tool,የ BOM ማሻሻያ መሳሪያ
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","የፓርቲ መለያ አልተጠቀሰም, እባክዎ በድርጅት ውስጥ ያለውን የነባሪ አካል ያቀናብሩ"
 DocType: SG Creation Tool Course,Student Group Name,የተማሪ የቡድን ስም
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,ክፍያዎች በመፍጠር
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,በእርግጥ ይህ ኩባንያ ሁሉንም ግብይቶችን መሰረዝ ይፈልጋሉ እርግጠኛ ይሁኑ. ነው እንደ ዋና ውሂብ ይቆያል. ይህ እርምጃ ሊቀለበስ አይችልም.
@@ -2525,29 +2574,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ታቅዶ quanitity መብለጥ አይችልም ({2}) በምርት ላይ ትእዛዝ {3}
 DocType: Shipping Rule,Shipping Rule Label,መላኪያ ደንብ መሰየሚያ
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,የተጠቃሚ መድረክ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,ጥሬ እቃዎች ባዶ መሆን አይችልም.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","የአክሲዮን ማዘመን አልተቻለም, መጠየቂያ ጠብታ መላኪያ ንጥል ይዟል."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,ጥሬ እቃዎች ባዶ መሆን አይችልም.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","የአክሲዮን ማዘመን አልተቻለም, መጠየቂያ ጠብታ መላኪያ ንጥል ይዟል."
 DocType: Lab Test Sample,Lab Test Sample,የቤተ ሙከራ የሙከራ ናሙና
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,ፈጣን ጆርናል የሚመዘገብ መረጃ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM ማንኛውም ንጥል agianst የተጠቀሰው ከሆነ መጠን መቀየር አይችሉም
+DocType: Restaurant,Invoice Series Prefix,ደረሰኝ የተከታታይ ቅደም ተከተል
 DocType: Employee,Previous Work Experience,ቀዳሚ የሥራ ልምድ
 DocType: Stock Entry,For Quantity,ብዛት ለ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},ረድፍ ላይ ንጥል {0} ለማግኘት የታቀደ ብዛት ያስገቡ {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},ረድፍ ላይ ንጥል {0} ለማግኘት የታቀደ ብዛት ያስገቡ {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} ማቅረብ አይደለም
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,ንጥሎች ጥያቄዎች.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,መለየት ምርት ትዕዛዝ እያንዳንዱ በተፈጸመ ጥሩ ንጥል ይፈጠራል.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} መመለሻ ሰነድ ላይ አሉታዊ መሆን አለበት
 ,Minutes to First Response for Issues,ጉዳዮች የመጀመርያ ምላሽ ደቂቃ
 DocType: Purchase Invoice,Terms and Conditions1,ውል እና Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,ተቋሙ ስም ስለ እናንተ ይህ ሥርዓት ማዋቀር ነው.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,ተቋሙ ስም ስለ እናንተ ይህ ሥርዓት ማዋቀር ነው.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","ከዚህ ቀን ድረስ በበረዶ ዲግሪ ግቤት, ማንም / ማድረግ ከዚህ በታች በተጠቀሰው ሚና በስተቀር ግቤት መቀየር ይችላል."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,የጥገና ፕሮግራም ለማመንጨት በፊት ሰነዱን ያስቀምጡ
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,በመጨረሻው ዋጋ በሁሉም የቢዝነስ እሴቶች ውስጥ ተዘምኗል
 DocType: Fee Schedule,Successful,ስኬታማ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,የፕሮጀክት ሁኔታ
 DocType: UOM,Check this to disallow fractions. (for Nos),ክፍልፋዮች እንዲከለክል ይህን ይመልከቱ. (ቁጥሮች ለ)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,የሚከተሉት የምርት ትዕዛዞች ተፈጥረው ነበር:
-DocType: Student Admission,Naming Series (for Student Applicant),ተከታታይ እየሰየሙ (የተማሪ አመልካች ለ)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,የሚከተሉት የምርት ትዕዛዞች ተፈጥረው ነበር:
+DocType: Student Admission Program,Naming Series (for Student Applicant),ተከታታይ እየሰየሙ (የተማሪ አመልካች ለ)
 DocType: Delivery Note,Transporter Name,አጓጓዥ ስም
 DocType: Authorization Rule,Authorized Value,የተፈቀደላቸው እሴት
 DocType: BOM,Show Operations,አሳይ ክወናዎች
@@ -2571,7 +2621,7 @@
 ,Employees working on a holiday,አንድ በዓል ላይ የሚሰሩ ሰራተኞች
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,ማርቆስ አቅርብ
 DocType: Project,% Complete Method,% ተጠናቋል ስልት
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,መድሃኒት
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,መድሃኒት
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},ጥገና መጀመሪያ ቀን መለያ አይ ለ የመላኪያ ቀን በፊት ሊሆን አይችልም {0}
 DocType: Production Order,Actual End Date,ትክክለኛ መጨረሻ ቀን
 DocType: BOM,Operating Cost (Company Currency),የክወና ወጪ (የኩባንያ የምንዛሬ)
@@ -2589,13 +2639,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,የተጠቃሚ ማጽደቅ ያለውን አገዛዝ ወደ የሚመለከታቸው ነው ተጠቃሚ ጋር ተመሳሳይ መሆን አይችልም
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),መሠረታዊ ተመን (ከወሰደው UOM መሰረት)
 DocType: SMS Log,No of Requested SMS,ተጠይቋል ኤስ የለም
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,ተቀባይነት ፈቃድ ማመልከቻ መዛግብት ጋር አይዛመድም Pay ያለ ይነሱ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,ተቀባይነት ፈቃድ ማመልከቻ መዛግብት ጋር አይዛመድም Pay ያለ ይነሱ
 DocType: Campaign,Campaign-.####,የዘመቻ -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ቀጣይ እርምጃዎች
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,ምርጥ በተቻለ ፍጥነት በተጠቀሰው ንጥሎች አቅርብ
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,የገንዘብ መጠየቂያ ደረሰኝ አድርግ
 DocType: Selling Settings,Auto close Opportunity after 15 days,15 ቀናት በኋላ ራስ የቅርብ አጋጣሚ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,የግዢ ትዕዛዞች በ {1} ውጤት መስጫ ነጥብ ምክንያት ለ {0} አይፈቀዱም.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,የግዢ ትዕዛዞች በ {1} ውጤት መስጫ ነጥብ ምክንያት ለ {0} አይፈቀዱም.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,የመጨረሻ ዓመት
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / በእርሳስ%
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,ውሌ መጨረሻ ቀን በመቀላቀል ቀን የበለጠ መሆን አለበት
@@ -2631,7 +2681,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","ሁሉም የግዢ የግብይት ሊተገበር የሚችል መደበኛ ግብር አብነት. ይህን አብነት ወዘተ #### ሁሉንም ** ንጥሎች መደበኛ የግብር ተመን ይሆናል እዚህ ላይ ለመግለጽ የግብር ተመን ልብ በል &quot;አያያዝ&quot;, ግብር ራሶች እና &quot;መላኪያ&quot;, &quot;ዋስትና&quot; ያሉ ደግሞ ሌሎች ወጪ ራሶች ዝርዝር ሊይዝ ይችላል * *. የተለያየ መጠን ያላቸው ** ዘንድ ** ንጥሎች አሉ ከሆነ, እነርሱ ** ንጥል ግብር ውስጥ መታከል አለበት ** የ ** ንጥል ** ጌታ ውስጥ ሰንጠረዥ. #### አምዶች መግለጫ 1. የስሌት አይነት: - ይህ (መሠረታዊ መጠን ድምር ነው) ** ኔት ጠቅላላ ** ላይ ሊሆን ይችላል. - ** ቀዳሚ የረድፍ ጠቅላላ / መጠን ** ላይ (ድምር ግብሮች ወይም ክፍያዎች). ይህን አማራጭ ይምረጡ ከሆነ, የግብር መጠን ወይም ጠቅላላ (ግብር ሰንጠረዥ ውስጥ) ቀዳሚው ረድፍ መቶኛ አድርገው ተግባራዊ ይደረጋል. - ** ** ትክክለኛው (እንደተጠቀሰው). 2. መለያ ኃላፊ: ይህን ግብር 3. ወጪ ማዕከል ላስያዙበት ይሆናል ይህም ስር መለያ የመቁጠር: ግብር / ክፍያ (መላኪያ ያሉ) ገቢ ነው ወይም ገንዘብ ከሆነ አንድ ወጪ ማዕከል ላይ ላስያዙበት አለበት. 4. መግለጫ: ግብር መግለጫ (ይህ ደረሰኞች / ጥቅሶች ውስጥ የታተመ ይሆናል). 5. ምት: የግብር ተመን. 6. መጠን: የግብር መጠን. 7. ጠቅላላ: ይህን ነጥብ ድምር ድምር. 8. ረድፍ አስገባ: ላይ የተመሠረተ ከሆነ &quot;ቀዳሚ የረድፍ ጠቅላላ&quot; ይህን ስሌት አንድ መሠረት (ነባሪ ቀዳሚው ረድፍ ነው) እንደ ይወሰዳሉ ይህም ረድፍ ቁጥር መምረጥ ይችላሉ. 9. ስለ ታክስ ወይም ክፍያ እንመልከት: የግብር / ክስ ከግምቱ ብቻ ነው (ጠቅላላ ክፍል ሳይሆን) ወይም ብቻ ነው (ወደ ንጥል እሴት መጨመር አይደለም) ጠቅላላ ወይም ለሁለቱም ከሆነ በዚህ ክፍል ውስጥ መግለጽ ይችላሉ. 10. አክል ወይም ተቀናሽ: ማከል ወይም የታክስ ተቀናሽ ይፈልጋሉ ይሁን."
 DocType: Homepage,Homepage,መነሻ ገጽ
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,ሐኪም ይምረጡ ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',ዝማኔ ትርጉምን ማካካሻ ጥያቄ &lt;invoice = &#39;{0}&#39; እና ስም = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd ብዛት
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},ክፍያ መዛግብት ፈጥሯል - {0}
 DocType: Asset Category Account,Asset Category Account,የንብረት ምድብ መለያ
@@ -2643,7 +2692,7 @@
 DocType: Asset,Manual,መምሪያ መጽሐፍ
 DocType: Salary Component Account,Salary Component Account,ደመወዝ አካል መለያ
 DocType: Global Defaults,Hide Currency Symbol,የምንዛሬ ምልክት ደብቅ
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","ለምሳሌ ባንክ, በጥሬ ገንዘብ, ክሬዲት ካርድ"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","ለምሳሌ ባንክ, በጥሬ ገንዘብ, ክሬዲት ካርድ"
 DocType: Lead Source,Source Name,ምንጭ ስም
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","በሰውነት ውስጥ መደበኛ የደም ግፊት ማረፊያ ወደ 120 mmHg ሲሊሲየም ሲሆን 80mmHg ዲያስቶሊክ, &quot;120 / 80mmHg&quot;"
 DocType: Journal Entry,Credit Note,የተሸጠ ዕቃ ሲመለስ የሚሰጥ ወረቀት
@@ -2662,16 +2711,16 @@
 DocType: Patient,Occupation,ሞያ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,ረድፍ {0}: የመጀመሪያ ቀን ከመጨረሻ ቀን በፊት መሆን አለበት
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),ጠቅላላ (ብዛት)
-DocType: Sales Invoice,This Document,ይህ ሰነድ
 DocType: Installation Note Item,Installed Qty,ተጭኗል ብዛት
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,ይሄ በ ውስጥ ባሉ አንዳንድ ልክ ያልሆኑ የኢሜል አድራሻዎች ምክንያት ሊሆን ይችላል
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,አልፈዋል
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,ስልጠና ውጤት
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,ስልጠና ውጤት
 DocType: Purchase Invoice,Is Paid,የሚከፈልበት ነው
 DocType: Salary Structure,Total Earning,ጠቅላላ ማግኘት
 DocType: Purchase Receipt,Time at which materials were received,ቁሳቁስ ተሰጥቷቸዋል ነበር ይህም በ ጊዜ
 DocType: Stock Ledger Entry,Outgoing Rate,የወጪ ተመን
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,ድርጅት ቅርንጫፍ ጌታቸው.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,ድርጅት ቅርንጫፍ ጌታቸው.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,ወይም
 DocType: Sales Order,Billing Status,አከፋፈል ሁኔታ
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ችግር ሪፖርት ያድርጉ
@@ -2686,7 +2735,8 @@
 DocType: Notification Control,Sales Order Message,የሽያጭ ትዕዛዝ መልዕክት
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","ወዘተ ኩባንያ, የምንዛሬ, የአሁኑ የበጀት ዓመት, እንደ አዘጋጅ ነባሪ እሴቶች"
 DocType: Payment Entry,Payment Type,የክፍያ አይነት
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ንጥል አንድ ባች ይምረጡ {0}. ይህን መስፈርት በሚያሟላ አንድ ነጠላ ባች ማግኘት አልተቻለም
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ንጥል አንድ ባች ይምረጡ {0}. ይህን መስፈርት በሚያሟላ አንድ ነጠላ ባች ማግኘት አልተቻለም
+DocType: Hub Category,Parent Category,ወላጅ ምድብ
 DocType: Process Payroll,Select Employees,ይምረጡ ሰራተኞች
 DocType: Opportunity,Potential Sales Deal,እምቅ የሽያጭ የስምምነት
 DocType: Complaint,Complaints,ቅሬታዎች
@@ -2723,7 +2773,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),የማቅረብ ያለውን ጥቅል መታወቂያ (የህትመት ለ)
 DocType: Bin,Reserved Quantity,የተያዘ ብዛት
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,ልክ የሆነ የኢሜይል አድራሻ ያስገቡ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,እባክዎ በእቃ ውስጥ አንድ ንጥል ይምረጡ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,እባክዎ በእቃ ውስጥ አንድ ንጥል ይምረጡ
 DocType: Landed Cost Voucher,Purchase Receipt Items,የግዢ ደረሰኝ ንጥሎች
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,ማበጀት ቅጾች
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,Arrear
@@ -2733,15 +2783,15 @@
 DocType: Payment Request,Amount in customer's currency,ደንበኛ ምንዛሬ መጠን
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,ርክክብ
 DocType: Stock Reconciliation Item,Current Qty,የአሁኑ ብዛት
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,አቅራቢዎችን ያክሉ
+DocType: Restaurant Menu,Restaurant Menu,የምግብ ቤት ምናሌ
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,የቀድሞው
 DocType: Appraisal Goal,Key Responsibility Area,ቁልፍ ኃላፊነት አካባቢ
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","የተማሪ ቡድኖች እናንተ ተማሪዎች ክትትልን, ግምገማዎች እና ክፍያዎች ይከታተሉ ለመርዳት"
 DocType: Payment Entry,Total Allocated Amount,ጠቅላላ የተመደበ መጠን
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,ዘላቂ በመጋዘኑ አዘጋጅ ነባሪ ቆጠራ መለያ
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,ዘላቂ በመጋዘኑ አዘጋጅ ነባሪ ቆጠራ መለያ
 DocType: Item Reorder,Material Request Type,ቁሳዊ ጥያቄ አይነት
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},{0} ከ ደምወዝ ለ Accural ጆርናል የሚመዘገብ {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage ሙሉ ነው, ሊያድን አይችልም ነበር"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage ሙሉ ነው, ሊያድን አይችልም ነበር"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,ረድፍ {0}: UOM የልወጣ ምክንያት የግዴታ ነው
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,የቦታ መጠን
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,ማጣቀሻ
@@ -2780,16 +2830,18 @@
 DocType: Project,Task Completion,ተግባር ማጠናቀቂያ
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,አይደለም የክምችት ውስጥ
 DocType: Appraisal,HR User,የሰው ሀይል ተጠቃሚ
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,ግብሮች እና ክፍያዎች ይቀነሳል
-apps/erpnext/erpnext/hooks.py +129,Issues,ችግሮች
+apps/erpnext/erpnext/hooks.py +138,Issues,ችግሮች
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},ሁኔታ ውስጥ አንዱ መሆን አለበት {0}
 DocType: Sales Invoice,Debit To,ወደ ዴቢት
+DocType: Restaurant Menu Item,Restaurant Menu Item,የምግብ ቤት ምናሌ ንጥል
 DocType: Delivery Note,Required only for sample item.,ብቻ ናሙና ንጥል ያስፈልጋል.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ግብይት በኋላ ትክክለኛው ብዛት
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},መካከል ምንም ደመወዝ ወረቀት {0} እና {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},መካከል ምንም ደመወዝ ወረቀት {0} እና {1}
 ,Pending SO Items For Purchase Request,የግዢ ጥያቄ ስለዚህ ንጥሎች በመጠባበቅ ላይ
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,የተማሪ ምዝገባ
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} ተሰናክሏል
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,የተማሪ ምዝገባ
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} ተሰናክሏል
 DocType: Supplier,Billing Currency,አከፋፈል ምንዛሬ
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,በጣም ትልቅ
@@ -2812,6 +2864,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,የሚያስፈልግ ጉብኝቶች ምንም መጥቀስ እባክዎ
 DocType: Stock Settings,Default Valuation Method,ነባሪ ዋጋ ትመና ዘዴው
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,ክፍያ
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,በሂደት ላይ ያለ ዝማኔ. የተወሰነ ጊዜ ሊወስድ ይችላል.
 DocType: Vehicle Log,Fuel Qty,የነዳጅ ብዛት
 DocType: Production Order Operation,Planned Start Time,የታቀደ መጀመሪያ ጊዜ
 DocType: Course,Assessment,ግምገማ
@@ -2827,7 +2880,7 @@
 DocType: Price List,Price List Master,የዋጋ ዝርዝር መምህር
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ማዘጋጀት እና ዒላማዎች ለመከታተል እንዲችሉ ሁሉም የሽያጭ ግብይቶች በርካታ ** የሽያጭ አካላት ** ላይ መለያ ተሰጥተዋቸዋል ይችላል.
 ,S.O. No.,ምት ቁ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},ቀዳሚ ከ ደንበኛ ለመፍጠር እባክዎ {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},ቀዳሚ ከ ደንበኛ ለመፍጠር እባክዎ {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,ታካሚን ይምረጡ
 DocType: Price List,Applicable for Countries,አገሮች የሚመለከታቸው
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,የመግቢያ ስም
@@ -2858,27 +2911,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,አቅራቢ የደረሰኝ ዝርዝሮች
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ወጪ / መማሩ መለያ ({0}) አንድ &#39;ትርፍ ወይም ኪሳራ&#39; መለያ መሆን አለበት
 DocType: Project,Copied From,ከ ተገልብጧል
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},ስም ስህተት: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,እጦት
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},ስም ስህተት: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,እጦት
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} ጋር የተያያዘ አይደለም {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ሠራተኛ {0} ክትትልን አስቀድሞ ምልክት ነው
 DocType: Packing Slip,If more than one package of the same type (for print),ከሆነ ተመሳሳይ ዓይነት ከአንድ በላይ ጥቅል (የህትመት ለ)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,እባክዎ በሆቴሎች ቅንጅቶች ውስጥ ነባሪ ደንበኛ ያዘጋጁ
 ,Salary Register,ደመወዝ ይመዝገቡ
 DocType: Warehouse,Parent Warehouse,የወላጅ መጋዘን
 DocType: C-Form Invoice Detail,Net Total,የተጣራ ጠቅላላ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},ነባሪ BOM ንጥል አልተገኘም {0} እና ፕሮጀክት {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},ነባሪ BOM ንጥል አልተገኘም {0} እና ፕሮጀክት {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,የተለያዩ የብድር ዓይነቶችን በይን
 DocType: Bin,FCFS Rate,FCFS ተመን
 DocType: Payment Reconciliation Invoice,Outstanding Amount,ያልተከፈሉ መጠን
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),(ደቂቃዎች ውስጥ) ሰዓት
 DocType: Project Task,Working,በመስራት ላይ
 DocType: Stock Ledger Entry,Stock Queue (FIFO),የክምችት ወረፋ (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,የፋይናንስ ዓመት
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,የፋይናንስ ዓመት
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} ኩባንያ የእርሱ ወገን አይደለም {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,ለ {0} የፍልስፍና ውጤት ተግባር መፍታት አልተቻለም. ቀመሩ በትክክል መሆኑን ያረጋግጡ.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,እንደ ላይ ወጪ
 DocType: Healthcare Settings,Out Patient Settings,የታካሚ ትዕዛዞች ቅንጅቶች
 DocType: Account,Round Off,ጠፍቷል በዙሪያቸው
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,መጠኑ አዎንታዊ መሆን አለበት
 ,Requested Qty,የተጠየቀው ብዛት
 DocType: Tax Rule,Use for Shopping Cart,ወደ ግዢ ሳጥን ጨመር ተጠቀም
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},እሴት {0} አይነታ {1} ንጥል ለ እሴቶች የአይነት ልክ ንጥል ዝርዝር ውስጥ የለም {2}
@@ -2887,7 +2942,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","ክፍያዎች ተመጣጣኝ መጠን በእርስዎ ምርጫ መሠረት, ንጥል ብዛት ወይም መጠን ላይ በመመርኮዝ መሰራጨት ይሆናል"
 DocType: Maintenance Visit,Purposes,ዓላማዎች
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,ቢያንስ አንድ ንጥል መመለሻ ሰነድ ላይ አሉታዊ ብዛት ጋር መግባት አለበት
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,ኮርሶችን መጨመር
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ድርጊቱ {0} ከገቢር ውስጥ ማንኛውም የሚገኙ የሥራ ሰዓት በላይ {1}, በርካታ ስራዎች ወደ ቀዶ አፈርሳለሁ"
 ,Requested,ተጠይቋል
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,ምንም መግለጫዎች
@@ -2899,6 +2953,8 @@
 DocType: Employee Loan,Repaid/Closed,/ ይመልስ ተዘግቷል
 DocType: Item,Total Projected Qty,ጠቅላላ ፕሮጀክት ብዛት
 DocType: Monthly Distribution,Distribution Name,የስርጭት ስም
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,አቅራቢ&gt; አቅራቢ አይነት
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","የ {1} {2} የሂሳብ መመዝገቢያዎችን ለማቅረብ የሚያስፈልገውን የንጥል አይነት {0} አልተገኘም. ንጥሉ በ {1} ላይ የዜሮ ደረጃ አሰጣጥ ንጥል ነገርን እየቀጠረ ከሆነ እባክዎ በ {1} ንጥል ሰንጠረዥ ውስጥ ይጥቀሱ. አለበለዚያ እባክዎን ለእጩ ንጥል የገቢ የእዳ ልውውጥ ግብይትን ይንገሩን ወይም በአይገባሪው መዝገብ ውስጥ ጠቋሚ ግምት ይለዩ, ከዚያም ይህንን ግቤት / ማስገባት ይሞክሩ."
 DocType: Course,Course Code,የኮርስ ኮድ
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},ንጥል ያስፈልጋል ጥራት ምርመራ {0}
 DocType: POS Settings,Use POS in Offline Mode,POS ን ከመስመር ውጪ ሁነታ ይጠቀሙ
@@ -2909,14 +2965,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,ግዛት ዛፍ ያቀናብሩ.
 DocType: Journal Entry Account,Sales Invoice,የሽያጭ ደረሰኝ
 DocType: Journal Entry Account,Party Balance,የድግስ ሒሳብ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,ቅናሽ ላይ ተግብር እባክዎ ይምረጡ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,ቅናሽ ላይ ተግብር እባክዎ ይምረጡ
 DocType: Company,Default Receivable Account,ነባሪ የሚሰበሰብ መለያ
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ከላይ የተመረጡ መስፈርት የሚከፈለው ጠቅላላ ደመወዝ ስለ ባንክ የሚመዘገብ መረጃ ይፍጠሩ
 DocType: Physician,Physician Schedule,የሐኪም ዕቅድ
 DocType: Purchase Invoice,Deemed Export,የሚታወቀው
 DocType: Stock Entry,Material Transfer for Manufacture,ማምረት ቁሳዊ ማስተላለፍ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,የቅናሽ መቶኛ አንድ ዋጋ ዝርዝር ላይ ወይም ሁሉንም የዋጋ ዝርዝር ለማግኘት ወይም ተግባራዊ ሊሆኑ ይችላሉ.
-DocType: Purchase Invoice,Half-yearly,ግማሽ-ዓመታዊ
+DocType: Subscription,Half-yearly,ግማሽ-ዓመታዊ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,የአክሲዮን ለ አካውንቲንግ Entry
 DocType: Lab Test,LabTest Approver,LabTest አፀደቀ
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,ቀድሞውንም ግምገማ መስፈርት ከገመገምን {}.
@@ -2945,13 +3001,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,የበለጠ አነስተኛ
 DocType: Company,Standard Template,መደበኛ አብነት
 DocType: Training Event,Theory,ፍልስፍና
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,ማስጠንቀቂያ: ብዛት ጠይቀዋል ሐሳብ ያለው አነስተኛ ትዕዛዝ ብዛት ያነሰ ነው
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,ማስጠንቀቂያ: ብዛት ጠይቀዋል ሐሳብ ያለው አነስተኛ ትዕዛዝ ብዛት ያነሰ ነው
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,መለያ {0} የታሰሩ ነው
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ወደ ድርጅት ንብረት መለያዎች የተለየ ሰንጠረዥ ጋር ሕጋዊ አካሌ / ንዑስ.
 DocType: Payment Request,Mute Email,ድምጸ-ኢሜይል
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","የምግብ, መጠጥ እና ትንባሆ"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},ብቻ ላይ ክፍያ ማድረግ ትችላለህ ያለተጠየቀበት {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,ኮሚሽን መጠን ከዜሮ በላይ 100 ሊሆን አይችልም
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},ብቻ ላይ ክፍያ ማድረግ ትችላለህ ያለተጠየቀበት {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,ኮሚሽን መጠን ከዜሮ በላይ 100 ሊሆን አይችልም
 DocType: Stock Entry,Subcontract,በሰብ
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,በመጀመሪያ {0} ያስገቡ
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,ምንም ምላሾች
@@ -2969,10 +3025,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,ቀለም
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,ግምገማ ዕቅድ መስፈርት
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,የግዢ ትዕዛዞችን ይከላከሉ
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,በቀላሉ ሊታወቅ የሚችል
 DocType: Patient Appointment,Scheduled,የተያዘለት
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,ጥቅስ ለማግኘት ይጠይቁ.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,እባክዎ የሰራተኛ ስም ማስቀመጫ ሲስተም በሰብል ሪሶርስ&gt; HR ቅንጅቶች ያዘጋጁ
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",&quot;አይ&quot; እና &quot;የሽያጭ ንጥል ነው&quot; &quot;የአክሲዮን ንጥል ነው&quot; የት &quot;አዎ&quot; ነው ንጥል ይምረጡ እና ሌላ የምርት ጥቅል አለ እባክህ
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,ደንበኞችን ይምረጡ
 DocType: Student Log,Academic,የቀለም
 DocType: Patient,Personal and Social History,የግል እና ማህበራዊ ታሪክ
 DocType: Fee Schedule,Fee Breakup for each student,ለእያንዳንዱ ተማሪ ክፍያ ይፈጽማል
@@ -2982,7 +3039,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,ግምቱ ተመን
 DocType: Stock Reconciliation,SR/,ድራይቨር /
 DocType: Vehicle,Diesel,በናፍጣ
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,የዋጋ ዝርዝር ምንዛሬ አልተመረጠም
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,የዋጋ ዝርዝር ምንዛሬ አልተመረጠም
 apps/erpnext/erpnext/config/healthcare.py +46,Results,ውጤቶች
 ,Student Monthly Attendance Sheet,የተማሪ ወርሃዊ ክትትል ሉህ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},የተቀጣሪ {0} ቀድሞውኑ A መልክተው አድርጓል {1} መካከል {2} እና {3}
@@ -2997,7 +3054,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,የሽያጭ አጋሮች ያቀናብሩ.
 DocType: Quality Inspection,Inspection Type,የምርመራ አይነት
 DocType: Fee Validity,Visited yet,ጉብኝት ገና
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,አሁን ያሉ ግብይት ጋር መጋዘኖችን ቡድን ሊቀየር አይችልም.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,አሁን ያሉ ግብይት ጋር መጋዘኖችን ቡድን ሊቀየር አይችልም.
 DocType: Assessment Result Tool,Result HTML,ውጤት ኤችቲኤምኤል
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ጊዜው የሚያልፍበት
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,ተማሪዎች ያክሉ
@@ -3024,7 +3081,7 @@
 DocType: Healthcare Settings,Result Printed,ውጤት ታተመ
 DocType: Asset Category Account,Depreciation Expense Account,የእርጅና የወጪ መለያ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,የሙከራ ጊዜ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},አሳይ {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},አሳይ {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ብቻ ቅጠል እባጮች ግብይት ውስጥ ይፈቀዳሉ
 DocType: Expense Claim,Expense Approver,የወጪ አጽዳቂ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,ረድፍ {0}: የደንበኛ ላይ በቅድሚያ ክሬዲት መሆን አለበት
@@ -3035,7 +3092,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,DATETIME ወደ
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,እርግጥ ነው መርሐግብሮች ተሰርዟል:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,ኤስኤምኤስ የመላኪያ ሁኔታ የመጠበቅ ምዝግብ ማስታወሻዎች
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,የሽያጭ ዒላማ ያዘጋጁ
 DocType: Accounts Settings,Make Payment via Journal Entry,ጆርናል Entry በኩል ክፍያ አድርግ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Printed ላይ
 DocType: Item,Inspection Required before Delivery,የምርመራው አሰጣጥ በፊት የሚያስፈልግ
@@ -3043,7 +3099,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,በመጠባበቅ ላይ እንቅስቃሴዎች
 DocType: Patient Appointment,Reminded,አስታውሷል
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,የእርስዎ ድርጅት
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,የእርስዎ ድርጅት
 DocType: Fee Component,Fees Category,ክፍያዎች ምድብ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,ቀን ማስታገሻ ያስገቡ.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
@@ -3055,7 +3111,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,አስይዝ ደረጃ
 DocType: Company,Chart Of Accounts Template,መለያዎች አብነት ነው ገበታ
 DocType: Attendance,Attendance Date,በስብሰባው ቀን
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},የእቃ ዋጋ {0} ውስጥ የዋጋ ዝርዝር ዘምኗል {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},የእቃ ዋጋ {0} ውስጥ የዋጋ ዝርዝር ዘምኗል {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ማግኘት እና ተቀናሽ ላይ የተመሠረተ ደመወዝ መፈረካከስ.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,ልጅ እንደ አንጓዎች ጋር መለያ ያሰኘንን ወደ ሊቀየር አይችልም
 DocType: Purchase Invoice Item,Accepted Warehouse,ተቀባይነት መጋዘን
@@ -3071,9 +3127,10 @@
 ,Employee Birthday,የሰራተኛ የልደት ቀን
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,የተማሪ ባች ክትትል መሣሪያ
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,ገደብ የምታገናኝ
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,መርሃግብር የተያዘለት እስከ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ቬንቸር ካፒታል
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,ይህ &#39;የትምህርት ዓመት&#39; ጋር አንድ የትምህርት ቃል {0} እና &#39;ተርም ስም «{1} አስቀድሞ አለ. እነዚህ ግቤቶችን ይቀይሩ እና እንደገና ይሞክሩ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}",ንጥል {0} ላይ ነባር ግብይቶች አሉ እንደ አንተ ያለውን ዋጋ መለወጥ አይችሉም {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}",ንጥል {0} ላይ ነባር ግብይቶች አሉ እንደ አንተ ያለውን ዋጋ መለወጥ አይችሉም {1}
 DocType: UOM,Must be Whole Number,ሙሉ ቁጥር መሆን አለበት
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(ቀኖች ውስጥ) የተመደበ አዲስ ቅጠሎች
 DocType: Purchase Invoice,Invoice Copy,የደረሰኝ ቅዳ
@@ -3083,7 +3140,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,የክፍያ መጠየቂያ ቁጥር
 DocType: Shopping Cart Settings,Orders,ትዕዛዞች
 DocType: Employee Leave Approver,Leave Approver,አጽዳቂ ውጣ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,ስብስብ ይምረጡ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,ስብስብ ይምረጡ
 DocType: Assessment Group,Assessment Group Name,ግምገማ ቡድን ስም
 DocType: Manufacturing Settings,Material Transferred for Manufacture,ቁሳዊ ማምረት ለ ተላልፈዋል
 DocType: Expense Claim,"A user with ""Expense Approver"" role",&quot;የወጪ አጽዳቂ&quot; ሚና ጋር አንድ ተጠቃሚ
@@ -3098,7 +3155,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,ክፍለ ጊዜ መዝጊያ Entry
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,መምሪያ ይምረጡ ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,አሁን ያሉ ግብይቶችን ጋር ወጪ ማዕከል ቡድን ሊቀየር አይችልም
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},የገንዘብ መጠን {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},የገንዘብ መጠን {0} {1} {2} {3}
 DocType: Account,Depreciation,የእርጅና
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),አቅራቢው (ዎች)
 DocType: Employee Attendance Tool,Employee Attendance Tool,የሰራተኛ ክትትል መሣሪያ
@@ -3109,10 +3166,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,የክፍያ ምዝግቦችን {0}-un ጋር የተገናኘ ነው
 DocType: GL Entry,Voucher No,ቫውቸር ምንም
 ,Lead Owner Efficiency,ቀዳሚ ባለቤት ቅልጥፍና
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,በ ጣ ም ታ ዋ ቂ
 DocType: Leave Allocation,Leave Allocation,ምደባዎች ውጣ
 DocType: Payment Request,Recipient Message And Payment Details,የተቀባይ መልዕክት እና የክፍያ ዝርዝሮች
 DocType: Training Event,Trainer Email,አሰልጣኝ ኢሜይል
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,የተፈጠረ ቁሳዊ ጥያቄዎች {0}
+DocType: Restaurant Reservation,No of People,የሰዎች ቁጥር
 DocType: Production Planning Tool,Include sub-contracted raw materials,ንዑስ-ኮንትራት ጥሬ ዕቃዎች አካትት
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,ውሎች ወይም ውል አብነት.
 DocType: Purchase Invoice,Address and Contact,አድራሻ እና ዕውቂያ
@@ -3121,10 +3180,11 @@
 DocType: Supplier,Last Day of the Next Month,ወደ ቀጣዩ ወር የመጨረሻ ቀን
 DocType: Support Settings,Auto close Issue after 7 days,7 ቀናት በኋላ ራስ የቅርብ እትም
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","በፊት የተመደበ አይችልም ይተዉት {0}, ፈቃድ ቀሪ አስቀድሞ የማስቀመጫ-በሚተላለፈው ወደፊት ፈቃድ አመዳደብ መዝገብ ውስጥ ቆይቷል እንደ {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ማስታወሻ: የፍትህ / ማጣቀሻ ቀን {0} ቀን አይፈቀድም የደንበኛ ክሬዲት ቀናት አልፏል (ዎች)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ማስታወሻ: የፍትህ / ማጣቀሻ ቀን {0} ቀን አይፈቀድም የደንበኛ ክሬዲት ቀናት አልፏል (ዎች)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,የተማሪ ማመልከቻ
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ተቀባይ ORIGINAL
 DocType: Asset Category Account,Accumulated Depreciation Account,ሲጠራቀሙ የእርጅና መለያ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,ይሄ ኢሜይል በራስ-መርሐግብር ነው
 DocType: Stock Settings,Freeze Stock Entries,አርጋ Stock ግቤቶችን
 DocType: Program Enrollment,Boarding Student,የመሳፈሪያ የተማሪ
 DocType: Asset,Expected Value After Useful Life,ጠቃሚ ሕይወት በኋላ የሚጠበቀው እሴት
@@ -3132,7 +3192,7 @@
 DocType: Activity Cost,Billing Rate,አከፋፈል ተመን
 ,Qty to Deliver,ለማዳን ብዛት
 ,Stock Analytics,የክምችት ትንታኔ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,ክወናዎች ባዶ ሊተው አይችልም
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,ክወናዎች ባዶ ሊተው አይችልም
 DocType: Maintenance Visit Purpose,Against Document Detail No,የሰነድ ዝርዝር ላይ የለም
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,የድግስ አይነት ግዴታ ነው
 DocType: Quality Inspection,Outgoing,የወጪ
@@ -3154,7 +3214,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,የ እንቅስቃሴ ላይ የተመሠረተ ቡድን በእጅ ይምረጡ ተማሪዎች
 DocType: Journal Entry,User Remark,የተጠቃሚ አስተያየት
 DocType: Lead,Market Segment,ገበያ ክፍሉ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},የሚከፈልበት መጠን ጠቅላላ አሉታዊ የላቀ መጠን መብለጥ አይችልም {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},የሚከፈልበት መጠን ጠቅላላ አሉታዊ የላቀ መጠን መብለጥ አይችልም {0}
 DocType: Supplier Scorecard Period,Variables,ልዩነቶች
 DocType: Employee Internal Work History,Employee Internal Work History,የተቀጣሪ ውስጣዊ የስራ ታሪክ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),የመመዝገቢያ ጊዜ (ዶክተር)
@@ -3183,21 +3243,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ዝማኔዎች አግኝ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: መለያ {2} ኩባንያ የእርሱ ወገን አይደለም {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,ቁሳዊ ጥያቄ {0} ተሰርዟል ወይም አቁሟል ነው
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,አስተዳደር ውጣ
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,አስተዳደር ውጣ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,መለያ ቡድን
 DocType: Sales Order,Fully Delivered,ሙሉ በሙሉ ደርሷል
 DocType: Lead,Lower Income,የታችኛው ገቢ
+DocType: Restaurant Order Entry,Current Order,የአሁን ትዕዛዝ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},የመነሻ እና የመድረሻ መጋዘን ረድፍ ጋር ተመሳሳይ መሆን አይችልም {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ይህ የክምችት ማስታረቅ አንድ በመክፈት Entry በመሆኑ ልዩነት መለያ, አንድ ንብረት / የተጠያቂነት ዓይነት መለያ መሆን አለበት"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},በመገኘቱ መጠን የብድር መጠን መብለጥ አይችልም {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,ወደ ፕሮግራሞች ሂድ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},ንጥል ያስፈልጋል ትዕዛዝ ቁጥር ይግዙ {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,የምርት ትዕዛዝ አልተፈጠረም
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,የምርት ትዕዛዝ አልተፈጠረም
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;ቀን ጀምሮ&#39; በኋላ &#39;እስከ ቀን&#39; መሆን አለበት
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ተማሪ ሁኔታ መለወጥ አይቻልም {0} የተማሪ ማመልከቻ ጋር የተያያዘ ነው {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},ተማሪ ሁኔታ መለወጥ አይቻልም {0} የተማሪ ማመልከቻ ጋር የተያያዘ ነው {1}
 DocType: Asset,Fully Depreciated,ሙሉ በሙሉ የቀነሰበት
 ,Stock Projected Qty,የክምችት ብዛት የታቀደበት
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},ይኸው የእርሱ ወገን አይደለም {0} የደንበኛ ፕሮጀክት ወደ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},ይኸው የእርሱ ወገን አይደለም {0} የደንበኛ ፕሮጀክት ወደ {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,ምልክት ተደርጎበታል ክትትል ኤችቲኤምኤል
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","ጥቅሶች, የእርስዎ ደንበኞች ልከዋል ተጫራቾች ሀሳቦች ናቸው"
 DocType: Sales Order,Customer's Purchase Order,ደንበኛ የግዢ ትዕዛዝ
@@ -3208,8 +3269,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Depreciations ብዛት የተመዘገበ ማዘጋጀት እባክዎ
 DocType: Supplier Scorecard Period,Calculations,ስሌቶች
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,እሴት ወይም ብዛት
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,ፕሮዳክሽን ትዕዛዞች ስለ ማጽደቅም የተነሣውን አይችልም:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,ፕሮዳክሽን ትዕዛዞች ስለ ማጽደቅም የተነሣውን አይችልም:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,ደቂቃ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,እባክዎን በቅንብር&gt; ቅንጅቶች&gt; የስምሪት ስሞች በኩል በ {0} ስም ማዕቀብ ያዘጋጁ
 DocType: Purchase Invoice,Purchase Taxes and Charges,ግብሮች እና ክፍያዎች ይግዙ
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,ወደ አቅራቢዎች ይሂዱ
 ,Qty to Receive,ይቀበሉ ዘንድ ብዛት
@@ -3222,7 +3284,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,መለያ ወደ ክሬዲት ሚዛን ሉህ መለያ መሆን አለበት
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,ሁሉም አቅራቢው አይነቶች
 DocType: Global Defaults,Disable In Words,ቃላት ውስጥ አሰናክል
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"ንጥል በራስ-ሰር ቁጥር አይደለም, ምክንያቱም ንጥል ኮድ የግዴታ ነው"
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,"ንጥል በራስ-ሰር ቁጥር አይደለም, ምክንያቱም ንጥል ኮድ የግዴታ ነው"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},ጥቅስ {0} ሳይሆን አይነት {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,ጥገና ፕሮግራም ንጥል
 DocType: Sales Order,%  Delivered,% ደርሷል
@@ -3244,23 +3306,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,በመክፈት ላይ ቀሪ ፍትህ
 DocType: Lead,CRM,ሲ
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,ማስታረቅ
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,የቀረ
 DocType: Appraisal,Appraisal,ግምት
 DocType: Purchase Invoice,GST Details,የ GST ዝርዝሮች
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},አቅራቢ ተልኳል ኢሜይል ወደ {0}
+DocType: Item,Default Sales Unit of Measure,ነባሪ የሽያጭ ብዜት መለኪያ
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,ቀን ተደግሟል
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,የተፈቀደላቸው የፈራሚ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},ውስጥ አንዱ መሆን አለበት አጽዳቂ ይነሱ {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,ክፍያዎች ይፍጠሩ
-DocType: Hub Settings,Seller Email,ሻጭ ኢሜይል
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ጠቅላላ የግዢ ዋጋ (የግዢ ደረሰኝ በኩል)
 DocType: Training Event,Start Time,ጀምር ሰዓት
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,ይምረጡ ብዛት
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,ይምረጡ ብዛት
 DocType: Customs Tariff Number,Customs Tariff Number,የጉምሩክ ታሪፍ ቁጥር
 DocType: Patient Appointment,Patient Appointment,የታካሚ ቀጠሮ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,ሚና ማጽደቅ ያለውን አገዛዝ ወደ የሚመለከታቸው ነው ሚና ጋር ተመሳሳይ ሊሆን አይችልም
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,ይህን የኢሜይል ጥንቅር ምዝገባ ይውጡ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,ይህን የኢሜይል ጥንቅር ምዝገባ ይውጡ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,አቅራቢዎችን በ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} ለንጥል {1} አልተገኘም
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,ወደ ኮርሶች ይሂዱ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,መልዕክት ተልኳል
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,ልጅ እንደ አንጓዎች ጋር መለያ የመቁጠር ሊዘጋጅ አይችልም
@@ -3273,11 +3338,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,ቁሳዊ ማኑፋክቸሪንግ ለ ተላልፈዋል
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,መለያ {0} ነው አይደለም አለ
 DocType: Project,Project Type,የፕሮጀክት አይነት
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,ለዚህ ተግባር ስራ አስኪያጅ ስራ ተገኝቷል. ይህን ተግባር መሰረዝ አይችሉም.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ወይ ዒላማ ብዛት ወይም የዒላማ መጠን የግዴታ ነው.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,የተለያዩ እንቅስቃሴዎች ወጪ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,ምንም ተጨማሪ ውጤቶች የሉም
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,የተለያዩ እንቅስቃሴዎች ወጪ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","ወደ ክስተቶች በማቀናበር ላይ {0}, የሽያጭ አካላት ከታች ያለውን ጋር ተያይዞ ሠራተኛው የተጠቃሚ መታወቂያ የለውም ጀምሮ {1}"
 DocType: Timesheet,Billing Details,አከፋፈል ዝርዝሮች
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,የመነሻ እና የመድረሻ መጋዘን የተለየ መሆን አለበት
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,የመነሻ እና የመድረሻ መጋዘን የተለየ መሆን አለበት
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},አይደለም በላይ የቆዩ የአክሲዮን ግብይቶችን ለማዘመን አይፈቀድላቸውም {0}
 DocType: Purchase Invoice Item,PR Detail,የህዝብ ግንኙነት ዝርዝር
 DocType: Sales Order,Fully Billed,ሙሉ በሙሉ የሚከፈል
@@ -3303,7 +3370,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,የሃዋላ ገንዘብ መላኪያ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,ሁሉንም ይመልከቱ
 DocType: Vehicle Log,Invoice Ref,የደረሰኝ ዳኛ
-DocType: Purchase Order,Recurring Order,ተደጋጋሚ ትዕዛዝ
 DocType: Company,Default Income Account,ነባሪ ገቢ መለያ
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,የደንበኛ ቡድን / የደንበኛ
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),ያልተዘጋ የፊስካል ዓመት ትርፍ / ኪሣራ (ምንጭ)
@@ -3317,9 +3383,9 @@
 DocType: Patient,A Negative,አሉታዊ
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,የበለጠ ምንም ነገር ለማሳየት.
 DocType: Lead,From Customer,የደንበኛ ከ
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,ጊዜ ጥሪዎች
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,ጊዜ ጥሪዎች
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,ምርት
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,ቡድኖች
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,ቡድኖች
 DocType: Project,Total Costing Amount (via Time Logs),ጠቅላላ የኳንቲቲ መጠን (ጊዜ ምዝግብ ማስታወሻዎች በኩል)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,የክፍያ ዕቅድ ያወጣሉ
 DocType: Purchase Order Item Supplied,Stock UOM,የክምችት UOM
@@ -3343,7 +3409,7 @@
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,ቅጠሎች እና የበዓል
 DocType: School Settings,Current Academic Term,የአሁኑ የትምህርት የሚቆይበት ጊዜ
 DocType: Sales Order,Not Billed,የሚከፈል አይደለም
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,ሁለቱም መጋዘን ተመሳሳይ ኩባንያ አባል መሆን
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,ሁለቱም መጋዘን ተመሳሳይ ኩባንያ አባል መሆን
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,ምንም እውቂያዎች ገና ታክሏል.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,አርፏል ወጪ ቫውቸር መጠን
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,አቅራቢዎች ያሳደጉት ደረሰኞች.
@@ -3352,7 +3418,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,የቅናሽ መጠን
 DocType: Purchase Invoice,Return Against Purchase Invoice,ላይ የግዢ ደረሰኝ ይመለሱ
 DocType: Item,Warranty Period (in days),(ቀናት ውስጥ) የዋስትና ክፍለ ጊዜ
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',"«tabPatient» ቀጠሮ ያዘዘበት «set_invoice = &#39;{0}&#39; ያካትታል, እና ስም = &#39;{1}&#39;"
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Guardian1 ጋር በተያያዘ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,ክወናዎች ከ የተጣራ ገንዘብ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,ንጥል 4
@@ -3361,8 +3426,8 @@
 DocType: Journal Entry Account,Journal Entry Account,ጆርናል Entry መለያ
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,የተማሪ ቡድን
 DocType: Shopping Cart Settings,Quotation Series,በትዕምርተ ጥቅስ ተከታታይ
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","አንድ ንጥል በተመሳሳይ ስም አለ ({0}), ወደ ንጥል የቡድን ስም መቀየር ወይም ንጥል ዳግም መሰየም እባክዎ"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,የደንበኛ ይምረጡ
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","አንድ ንጥል በተመሳሳይ ስም አለ ({0}), ወደ ንጥል የቡድን ስም መቀየር ወይም ንጥል ዳግም መሰየም እባክዎ"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,የደንበኛ ይምረጡ
 DocType: C-Form,I,እኔ
 DocType: Company,Asset Depreciation Cost Center,የንብረት ዋጋ መቀነስ ወጪ ማዕከል
 DocType: Sales Order Item,Sales Order Date,የሽያጭ ትዕዛዝ ቀን
@@ -3371,6 +3436,7 @@
 DocType: Assessment Plan,Assessment Plan,ግምገማ ዕቅድ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,ደንበኛ {0} ተፈጥሯል.
 DocType: Stock Settings,Limit Percent,ገድብ መቶኛ
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,በአሁኑ ጊዜ በማንኛውም መጋዘን ውስጥ ምንም አክሲዮስ የለም
 ,Payment Period Based On Invoice Date,ደረሰኝ ቀን ላይ የተመሠረተ የክፍያ ክፍለ ጊዜ
 DocType: Sample Collection,No. of print,የህትመት ብዛት
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},ለ የጠፋ የገንዘብ ምንዛሪ ተመኖች {0}
@@ -3426,13 +3492,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,ጠቅላላ ክፍያ - ጠቅላላ ተቀናሽ - የብድር የሚያየን
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,የአሁኑ BOM ኒው BOM ተመሳሳይ መሆን አይችልም
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,የቀጣሪ መታወቂያ
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,የቀጣሪ መታወቂያ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,ጡረታ መካከል ቀን በመቀላቀል ቀን የበለጠ መሆን አለበት
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,ላይ እርግጥ ነው መርሐግብር ላይ ሳለ ስህተቶች ነበሩ:
 DocType: Sales Invoice,Against Income Account,የገቢ መለያ ላይ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% ደርሷል
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ንጥል {0}: የዕቃው ብዛት {1} ዝቅተኛ ትዕዛዝ ብዛት {2} (ንጥል ፍቺ) ይልቅ ያነሰ ሊሆን አይችልም.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ንጥል {0}: የዕቃው ብዛት {1} ዝቅተኛ ትዕዛዝ ብዛት {2} (ንጥል ፍቺ) ይልቅ ያነሰ ሊሆን አይችልም.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ወርሃዊ ስርጭት መቶኛ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,እባክህ እንደ ሌላ ተጠቃሚ ግባ.
 DocType: Territory,Territory Targets,ግዛት ዒላማዎች
 DocType: Delivery Note,Transporter Info,አጓጓዥ መረጃ
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},ኩባንያ ውስጥ ነባሪ {0} ለማዘጋጀት እባክዎ {1}
@@ -3440,13 +3507,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,ተመሳሳይ አቅራቢ በርካታ ጊዜ ገብቷል ታይቷል
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,አጠቃላይ ትርፍ / ማጣት
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,ትዕዛዝ ንጥል አቅርቦት ይግዙ
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,የኩባንያ ስም ኩባንያ ሊሆን አይችልም
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,የኩባንያ ስም ኩባንያ ሊሆን አይችልም
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,የህትመት አብነቶች ለ ደብዳቤ ኃላፊዎች.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,የህትመት አብነቶች ለ የማዕረግ Proforma የደረሰኝ ምህበርን.
 DocType: Program Enrollment,Walking,በእግር መሄድ
 DocType: Student Guardian,Student Guardian,የተማሪ አሳዳጊ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,ግምቱ አይነት ክፍያዎች ያካተተ ምልክት ተደርጎበታል አይችልም
 DocType: POS Profile,Update Stock,አዘምን Stock
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,በመመዝገቢያ ውስጥ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,ንጥሎች በተለያዩ UOM ትክክል (ጠቅላላ) የተጣራ ክብደት ዋጋ ሊመራ ይችላል. እያንዳንዱ ንጥል የተጣራ ክብደት ተመሳሳይ UOM ውስጥ መሆኑን እርግጠኛ ይሁኑ.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM ተመን
 DocType: Asset,Journal Entry for Scrap,ቁራጭ ለ ጆርናል የሚመዘገብ መረጃ
@@ -3494,15 +3562,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","የስርዓት የተጠቃሚ (መግቢያ) መታወቂያ. ከተዋቀረ ከሆነ, ለሁሉም የሰው ሃይል ቅጾች ነባሪ ይሆናል."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: ከ {1}
 DocType: Task,depends_on,እንደ ሁኔታው
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,በሁሉም የሂሳብ ማሻሻያ ሂሳቦች ውስጥ የቅርብ ጊዜውን ዋጋ ለማዘመን ሰልፍ ተደርጎ. ጥቂት ደቂቃዎችን ሊወስድ ይችላል.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,በሁሉም የሂሳብ ማሻሻያ ሂሳቦች ውስጥ የቅርብ ጊዜውን ዋጋ ለማዘመን ሰልፍ ተደርጎ. ጥቂት ደቂቃዎችን ሊወስድ ይችላል.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,አዲስ መለያ ስም. ማስታወሻ: ደንበኞች እና አቅራቢዎች መለያዎችን መፍጠር እባክዎ
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,አገር ጥበብ ነባሪ አድራሻ አብነቶች
 DocType: Sales Order Item,Supplier delivers to Customer,አቅራቢው የደንበኛ ወደ ያድነዋል
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ፎርም / ንጥል / {0}) የአክሲዮን ውጭ ነው
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},ምክንያት / ማጣቀሻ ቀን በኋላ መሆን አይችልም {0}
+,Sales Payment Summary,የሽያጭ ክፍያ አጭር መግለጫ
+DocType: Restaurant,Restaurant,ምግብ ቤት
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},ምክንያት / ማጣቀሻ ቀን በኋላ መሆን አይችልም {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,የውሂብ ያስመጡ እና ወደ ውጪ ላክ
 DocType: Patient,Account Details,የመለያ ዝርዝሮች
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,ምንም ተማሪዎች አልተገኙም
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,ምንም ተማሪዎች አልተገኙም
 DocType: Medical Department,Medical Department,የሕክምና መምሪያ
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,የአምራች ነጥብ መሥፈርት የማጣሪያ መስፈርት
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,የደረሰኝ መለጠፍ ቀን
@@ -3513,7 +3583,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,ፓርቲ በመምረጥ በፊት መለጠፍ ቀን ይምረጡ
 DocType: Program Enrollment,School House,ትምህርት ቤት
 DocType: Serial No,Out of AMC,AMC ውጪ
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,ጥቅሶች ይምረጡ
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,ጥቅሶች ይምረጡ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,የተመዘገበ Depreciations ቁጥር Depreciations አጠቃላይ ብዛት በላይ ሊሆን አይችልም
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,የጥገና ጉብኝት አድርግ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,የሽያጭ መምህር አስተዳዳሪ {0} ሚና ያላቸው ተጠቃሚው ወደ ያነጋግሩ
@@ -3521,7 +3591,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,ኩባንያ (አይደለም የደንበኛ ወይም አቅራቢው) ጌታው.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ይህ የዚህ ተማሪ በስብሰባው ላይ የተመሠረተ ነው
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,ምንም ተማሪዎች ውስጥ
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,ተጨማሪ ንጥሎች ወይም ክፍት ሙሉ ቅጽ ያክሉ
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,ተጨማሪ ንጥሎች ወይም ክፍት ሙሉ ቅጽ ያክሉ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,የመላኪያ ማስታወሻዎች {0} ይህን የሽያጭ ትዕዛዝ በመሰረዝ በፊት ተሰርዟል አለበት
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,ወደ ተጠቃሚዎች ሂድ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,የሚከፈልበት መጠን መጠን ግራንድ ጠቅላላ በላይ ሊሆን አይችልም ጠፍቷል ጻፍ; +
@@ -3541,37 +3611,40 @@
 DocType: Fee Schedule,Fee Schedule,ክፍያ ፕሮግራም
 DocType: Hub Settings,Publish Availability,ተገኝነት አትም
 DocType: Company,Create Chart Of Accounts Based On,መለያዎች ላይ የተመሠረተ ላይ ነው ገበታ ፍጠር
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,ለቡድን ያልሆኑ ወደ መለወጥ አይችልም. የልጅ ተግባራት ይገኛሉ.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,የትውልድ ቀን በዛሬው ጊዜ በላይ ሊሆን አይችልም.
 ,Stock Ageing,የክምችት ጥበቃና
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},ተማሪ {0} ተማሪ አመልካች ላይ እንዳሉ {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),የሬጅ ማስተካከያ (የኩባንያው የገንዘብ ምንዛሬ)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Timesheet
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Timesheet
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} »{1}» ተሰናክሏል
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ክፍት እንደ አዘጋጅ
 DocType: Cheque Print Template,Scanned Cheque,የተቃኘው ቼክ
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,በማስገባት ላይ ግብይቶች ላይ እውቂያዎች ራስ-ሰር ኢሜይሎች ይላኩ.
 DocType: Timesheet,Total Billable Amount,ጠቅላላ የሚከፈልበት መጠን
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,ንጥል 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,ትዕዛዝ ግቤት
 DocType: Purchase Order,Customer Contact Email,የደንበኛ የዕውቂያ ኢሜይል
 DocType: Warranty Claim,Item and Warranty Details,ንጥል እና ዋስትና መረጃ
 DocType: Sales Team,Contribution (%),መዋጮ (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ማስታወሻ: የክፍያ Entry ጀምሮ አይፈጠርም &#39;በጥሬ ገንዘብ ወይም በባንክ አካውንት&#39; አልተገለጸም
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,ፕሮጀክት {0} አስቀድሞም ይገኛል
 DocType: Medical Department,Nursing User,የነርሶች ተጠቃሚ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,ሃላፊነቶች
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,የዚህ ጥቅስ ዋጋ ያለው ጊዜ ተጠናቅቋል.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,የዚህ ጥቅስ ዋጋ ያለው ጊዜ ተጠናቅቋል.
 DocType: Expense Claim Account,Expense Claim Account,የወጪ የይገባኛል ጥያቄ መለያ
 DocType: Accounts Settings,Allow Stale Exchange Rates,የተለመዱ ትውልዶች ፍቀድ
 DocType: Sales Person,Sales Person Name,የሽያጭ ሰው ስም
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,በሰንጠረዡ ላይ ቢያንስ 1 መጠየቂያ ያስገቡ
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,ተጠቃሚዎችን ያክሉ
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,ተጠቃሚዎችን ያክሉ
 DocType: POS Item Group,Item Group,ንጥል ቡድን
 DocType: Item,Safety Stock,የደህንነት Stock
 DocType: Healthcare Settings,Healthcare Settings,የጤና እንክብካቤ ቅንብሮች
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,አንድ ተግባር በሂደት ላይ ለ% ከ 100 በላይ ሊሆን አይችልም.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,አንድ ተግባር በሂደት ላይ ለ% ከ 100 በላይ ሊሆን አይችልም.
 DocType: Stock Reconciliation Item,Before reconciliation,እርቅ በፊት
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},ወደ {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ግብሮች እና ክፍያዎች ታክሏል (የኩባንያ የምንዛሬ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ንጥል ግብር ረድፍ {0} አይነት ታክስ ወይም ገቢ ወይም የወጪ ወይም እንዳንከብድበት ምክንያት ሊኖረው ይገባል
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ንጥል ግብር ረድፍ {0} አይነት ታክስ ወይም ገቢ ወይም የወጪ ወይም እንዳንከብድበት ምክንያት ሊኖረው ይገባል
 DocType: Sales Order,Partly Billed,በከፊል የሚከፈል
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,ንጥል {0} አንድ ቋሚ የንብረት ንጥል መሆን አለበት
 DocType: Item,Default BOM,ነባሪ BOM
@@ -3587,6 +3660,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,ተለዋጭ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,የመላኪያ ማስታወሻ ከ
 DocType: Student,Student Email Address,የተማሪ የኢሜይል አድራሻ
+DocType: Item,Hub Warehouse,የመጋዘን ማከማቻ መጋዘን
 DocType: Physician Schedule Time Slot,From Time,ሰዓት ጀምሮ
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,ለሽያጭ የቀረበ እቃ:
 DocType: Notification Control,Custom Message,ብጁ መልዕክት
@@ -3594,9 +3668,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,በጥሬ ገንዘብ ወይም የባንክ ሂሳብ ክፍያ ግቤት ለማድረግ ግዴታ ነው
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,የተማሪ አድራሻ
 DocType: Purchase Invoice,Price List Exchange Rate,የዋጋ ዝርዝር ምንዛሪ ተመን
+DocType: POS Profile,POS Profile Name,POS የመገለጫ ስም
 DocType: Purchase Invoice Item,Rate,ደረጃ ይስጡ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,እሥረኛ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,አድራሻ ስም
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,አድራሻ ስም
 DocType: Stock Entry,From BOM,BOM ከ
 DocType: Assessment Code,Assessment Code,ግምገማ ኮድ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,መሠረታዊ
@@ -3610,11 +3685,12 @@
 DocType: Salary Slip,Salary Structure,ደመወዝ መዋቅር
 DocType: Account,Bank,ባንክ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,የአየር መንገድ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,እትም ይዘት
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,እትም ይዘት
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,ተደጋጋሚነትን በመፍጠር ላይ ስህተት አጋጥሟል
 DocType: Material Request Item,For Warehouse,መጋዘን ለ
 DocType: Employee,Offer Date,ቅናሽ ቀን
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ጥቅሶች
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,ከመስመር ውጪ ሁነታ ላይ ነው ያሉት. እርስዎ መረብ ድረስ ዳግም አይችሉም.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,ከመስመር ውጪ ሁነታ ላይ ነው ያሉት. እርስዎ መረብ ድረስ ዳግም አይችሉም.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,ምንም የተማሪ ቡድኖች ተፈጥሯል.
 DocType: Purchase Invoice Item,Serial No,መለያ ቁጥር
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,ወርሃዊ የሚያየን መጠን ብድር መጠን በላይ ሊሆን አይችልም
@@ -3624,17 +3700,18 @@
 DocType: Salary Slip,Total Working Hours,ጠቅላላ የሥራ ሰዓቶች
 DocType: Subscription,Next Schedule Date,ቀጣይ የጊዜ ሰሌዳ
 DocType: Stock Entry,Including items for sub assemblies,ንዑስ አብያተ ክርስቲያናት ለ ንጥሎችን በማካተት ላይ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,ያስገቡ እሴት አዎንታዊ መሆን አለበት
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,ሁሉም ግዛቶች
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,ያስገቡ እሴት አዎንታዊ መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,ሁሉም ግዛቶች
 DocType: Purchase Invoice,Items,ንጥሎች
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,ተማሪው አስቀድሞ ተመዝግቧል.
 DocType: Fiscal Year,Year Name,ዓመት ስም
 DocType: Process Payroll,Process Payroll,ሂደት የደመወዝ ክፍያ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,ተከታታይ የሥራ ቀናት በላይ በዓላት በዚህ ወር አሉ.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,ተከታታይ የሥራ ቀናት በላይ በዓላት በዚህ ወር አሉ.
 DocType: Product Bundle Item,Product Bundle Item,የምርት ጥቅል ንጥል
 DocType: Sales Partner,Sales Partner Name,የሽያጭ የአጋር ስም
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,ጥቅሶች ጠይቅ
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,ጥቅሶች ጠይቅ
 DocType: Payment Reconciliation,Maximum Invoice Amount,ከፍተኛው የደረሰኝ የገንዘብ መጠን
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,ሄማቶሎጂ
 DocType: Normal Test Items,Normal Test Items,መደበኛ የተሞሉ ንጥሎች
 DocType: Student Language,Student Language,የተማሪ ቋንቋ
 apps/erpnext/erpnext/config/selling.py +23,Customers,ደንበኞች
@@ -3645,10 +3722,11 @@
 DocType: Issue,Opening Time,የመክፈቻ ሰዓት
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,እንዲሁም ያስፈልጋል ቀናት ወደ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,ዋስትና እና ምርት ልውውጥ
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ተለዋጭ ለ ይለኩ ነባሪ ክፍል «{0}» መለጠፊያ ውስጥ እንደ አንድ አይነት መሆን አለበት &#39;{1} »
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ተለዋጭ ለ ይለኩ ነባሪ ክፍል «{0}» መለጠፊያ ውስጥ እንደ አንድ አይነት መሆን አለበት &#39;{1} »
 DocType: Shipping Rule,Calculate Based On,የተመረኮዘ ላይ ማስላት
 DocType: Delivery Note Item,From Warehouse,መጋዘን ከ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,ዕቃዎች መካከል ቢል ጋር ምንም ንጥሎች ለማምረት
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,ዕቃዎች መካከል ቢል ጋር ምንም ንጥሎች ለማምረት
+DocType: Restaurant,Default Customer,ነባሪ ደንበኛ
 DocType: Assessment Plan,Supervisor Name,ሱፐርቫይዘር ስም
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,ቀጠሮው ለተመሳሳይ ቀን መደረግ እንዳለበት አረጋግጡ
 DocType: Program Enrollment Course,Program Enrollment Course,ፕሮግራም ምዝገባ ኮርስ
@@ -3675,7 +3753,7 @@
 DocType: Payment Entry,Internal Transfer,ውስጣዊ ማስተላለፍ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,የልጅ መለያ ለዚህ መለያ አለ. ይህን መለያ መሰረዝ አይችሉም.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ወይ የዒላማ ብዛት ወይም የዒላማ መጠን የግዴታ ነው
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},ምንም ነባሪ BOM ንጥል የለም {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},ምንም ነባሪ BOM ንጥል የለም {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,በመጀመሪያ መለጠፍ ቀን ይምረጡ
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,ቀን በመክፈት ቀን መዝጋት በፊት መሆን አለበት
 DocType: Leave Control Panel,Carry Forward,አስተላልፍ መሸከም
@@ -3710,6 +3788,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,ጠቅላላ አቅርብ
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,አካውንቲንግ መግለጫ
 DocType: Drug Prescription,Hour,ሰአት
+DocType: Restaurant Order Entry,Last Sales Invoice,የመጨረሻው የሽያጭ ደረሰኝ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,አዲስ መለያ ምንም መጋዘን ሊኖረው አይችልም. መጋዘን የክምችት Entry ወይም የግዢ ደረሰኝ በ መዘጋጀት አለበት
 DocType: Lead,Lead Type,በእርሳስ አይነት
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,አንተ አግድ ቀኖች ላይ ቅጠል ለማፅደቅ ስልጣን አይደለም
@@ -3744,63 +3823,66 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,ተጠቃሚዎች ፍጠር
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,ግራም
 DocType: Supplier Scorecard,Per Month,በ ወር
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,ለማምረት ብዛት 0 የበለጠ መሆን አለበት.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,ለማምረት ብዛት 0 የበለጠ መሆን አለበት.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,የጥገና ጥሪ ሪፖርት ይጎብኙ.
 DocType: Stock Entry,Update Rate and Availability,አዘምን ደረጃ እና ተገኝነት
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,መቶኛ መቀበል ወይም አዘዘ መጠን ላይ ተጨማሪ ማድረስ ይፈቀዳል. ለምሳሌ: 100 ቤቶች ትእዛዝ ከሆነ. እና በል ከዚያም 110 ቤቶች ለመቀበል የተፈቀደላቸው 10% ነው.
 DocType: POS Customer Group,Customer Group,የደንበኛ ቡድን
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),አዲስ ባች መታወቂያ (አማራጭ)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),አዲስ ባች መታወቂያ (አማራጭ)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},ወጪ መለያ ንጥል ግዴታ ነው {0}
 DocType: BOM,Website Description,የድር ጣቢያ መግለጫ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ፍትህ ውስጥ የተጣራ ለውጥ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,እጅግ በጣም አዲስ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,በመጀመሪያ የግዢ ደረሰኝ {0} ይቅር እባክዎ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","የኢሜይል አድራሻ አስቀድሞ ስለ አለ, ልዩ መሆን አለበት {0}"
 DocType: Serial No,AMC Expiry Date,AMC የሚቃጠልበት ቀን
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,ደረሰኝ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,ደረሰኝ
 ,Sales Register,የሽያጭ መመዝገቢያ
 DocType: Daily Work Summary Settings Company,Send Emails At,ላይ ኢሜይሎች ላክ
 DocType: Quotation,Quotation Lost Reason,ጥቅስ የጠፋ ምክንያት
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,የጎራ ይምረጡ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},የግብይት ማጣቀሻ ምንም {0} የተዘጋጀው {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},የግብይት ማጣቀሻ ምንም {0} የተዘጋጀው {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,አርትዕ ለማድረግ ምንም ነገር የለም.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,የቅፅ እይታ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,በዚህ ወር እና በመጠባበቅ ላይ ያሉ እንቅስቃሴዎች ማጠቃለያ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,የቅፅ እይታ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,በዚህ ወር እና በመጠባበቅ ላይ ያሉ እንቅስቃሴዎች ማጠቃለያ
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.",ከርስዎ ውጭ ሌሎችን ወደ እርስዎ ድርጅት ያክሏቸው.
 DocType: Customer Group,Customer Group Name,የደንበኛ የቡድን ስም
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,ገና ምንም ደንበኞች!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,ገና ምንም ደንበኞች!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,የገንዘብ ፍሰት መግለጫ
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},የብድር መጠን ከፍተኛ የብድር መጠን መብለጥ አይችልም {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,ፈቃድ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},ሲ-ቅጽ ይህን የደረሰኝ {0} ያስወግዱ እባክዎ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},ሲ-ቅጽ ይህን የደረሰኝ {0} ያስወግዱ እባክዎ {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,እናንተ ደግሞ ካለፈው በጀት ዓመት ሚዛን በዚህ የበጀት ዓመት ወደ ቅጠሎች ማካተት የሚፈልጉ ከሆነ ወደፊት አኗኗራችሁ እባክዎ ይምረጡ
 DocType: GL Entry,Against Voucher Type,ቫውቸር አይነት ላይ
 DocType: Physician,Phone (R),ስልክ (አር)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,የሰዓት ማስገቢያዎች ታክለዋል
 DocType: Item,Attributes,ባህሪያት
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,አብነት አንቃ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,እባክዎን በቅንብር&gt; ቅንጅቶች&gt; የስምሪት ስሞች በኩል በ {0} ስም ማዕቀብ ያዘጋጁ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,መለያ ጠፍቷል ይጻፉ ያስገቡ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,የመጨረሻ ትዕዛዝ ቀን
 DocType: Patient,B Negative,ቢ አሉታዊ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},መለያ {0} ነው ኩባንያ ንብረት አይደለም {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,{0} ረድፍ ላይ መለያ ቁጥር አሰጣጥ ማስታወሻ ጋር አይዛመድም
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,{0} ረድፍ ላይ መለያ ቁጥር አሰጣጥ ማስታወሻ ጋር አይዛመድም
 DocType: Student,Guardian Details,አሳዳጊ ዝርዝሮች
 DocType: C-Form,C-Form,ሲ-ቅጽ
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,በርካታ ሠራተኞች ምልክት ክትትል
 DocType: Vehicle,Chassis No,ለጥንካሬ ምንም
 DocType: Payment Request,Initiated,A ነሳሽነት
 DocType: Production Order,Planned Start Date,የታቀደ መጀመሪያ ቀን
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,እባክዎን BOM ይምረጡ
 DocType: Serial No,Creation Document Type,የፍጥረት የሰነድ አይነት
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,የማብቂያ ቀን ከመጀመሪያ ቀን በላይ መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,የማብቂያ ቀን ከመጀመሪያ ቀን በላይ መሆን አለበት
 DocType: Leave Type,Is Encash,Encash ነው
 DocType: Leave Allocation,New Leaves Allocated,አዲስ ቅጠሎች የተመደበ
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,ፕሮጀክት-ጥበብ ውሂብ ትዕምርተ አይገኝም
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,መጨረሻ ላይ
 DocType: Project,Expected End Date,የሚጠበቀው መጨረሻ ቀን
 DocType: Budget Account,Budget Amount,የበጀት መጠን
 DocType: Appraisal Template,Appraisal Template Title,ግምገማ አብነት ርዕስ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},ቀን ከ {0} ለ የሰራተኛ {1} ሠራተኛ የአምላክ በመቀላቀል ቀን በፊት ሊሆን አይችልም {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,ንግድ
 DocType: Patient,Alcohol Current Use,የአልኮል መጠጥ አጠቃቀም
+DocType: Student Admission Program,Student Admission Program,የተማሪ መግቢያ ፕሮግራም
 DocType: Payment Entry,Account Paid To,መለያ ወደ የሚከፈልበት
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,የወላጅ ንጥል {0} አንድ የአክሲዮን ንጥል መሆን የለበትም
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,ሁሉም ምርቶች ወይም አገልግሎቶች.
@@ -3809,30 +3891,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},መለያ {0} በጀት {1} ላይ {2} {3} ነው {4}. ይህ በ መብለጥ ይሆናል {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',ረድፍ {0} # መለያ አይነት መሆን አለበት &#39;ቋሚ ንብረት&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,ብዛት ውጪ
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,ደንቦች አንድ የሚሸጥ የመላኪያ መጠን ለማስላት
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,እና ያልተነካነ በ ውስጥ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,ተከታታይ ግዴታ ነው
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,የፋይናንስ አገልግሎቶች
 DocType: Student Sibling,Student ID,የተማሪ መታወቂያ
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,ጊዜ ምዝግብ እንቅስቃሴዎች አይነቶች
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,የአቅራቢ ኢሜይል
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,ጊዜ ምዝግብ እንቅስቃሴዎች አይነቶች
 DocType: Tax Rule,Sales,የሽያጭ
 DocType: Stock Entry Detail,Basic Amount,መሰረታዊ መጠን
 DocType: Training Event,Exam,ፈተና
 DocType: Complaint,Complaint,ቅሬታ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},የመጋዘን የአክሲዮን ንጥል ያስፈልጋል {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},የመጋዘን የአክሲዮን ንጥል ያስፈልጋል {0}
 DocType: Leave Allocation,Unused leaves,ያልዋለ ቅጠሎች
 DocType: Patient,Alcohol Past Use,አልኮል ጊዜ ያለፈበት አጠቃቀም
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,CR
 DocType: Tax Rule,Billing State,አከፋፈል መንግስት
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,ያስተላልፉ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),(ንዑስ-አብያተ ክርስቲያናት ጨምሮ) ፈንድቶ BOM ሰብስብ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,ያስተላልፉ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),(ንዑስ-አብያተ ክርስቲያናት ጨምሮ) ፈንድቶ BOM ሰብስብ
 DocType: Authorization Rule,Applicable To (Employee),የሚመለከታቸው ለማድረግ (ሰራተኛ)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,መጠናቀቅ ያለበት ቀን የግዴታ ነው
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,መጠናቀቅ ያለበት ቀን የግዴታ ነው
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,አይነታ ጭማሬ {0} 0 መሆን አይችልም
 DocType: Journal Entry,Pay To / Recd From,ከ / Recd ወደ ይክፈሉ
 DocType: Naming Series,Setup Series,ማዋቀር ተከታታይ
 DocType: Payment Reconciliation,To Invoice Date,ቀን ደረሰኝ
 DocType: Supplier,Contact HTML,የእውቂያ ኤችቲኤምኤል
 ,Inactive Customers,ያልነቁ ደንበኞች
+DocType: Student Admission Program,Maximum Age,ከፍተኛው ዕድሜ
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,የግዢ ደረሰኞች
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,እንዴት የዋጋ ደንብ ተግባራዊ ነው?
@@ -3851,6 +3935,7 @@
 DocType: GL Entry,Remarks,አስተያየት
 DocType: Payment Entry,Account Paid From,መለያ ከ የሚከፈልበት
 DocType: Purchase Order Item Supplied,Raw Material Item Code,ጥሬ ሐሳብ ያለው ንጥል ኮድ
+DocType: Task,Parent Task,የወላጅ ተግባር
 DocType: Journal Entry,Write Off Based On,ላይ የተመሠረተ ላይ ጠፍቷል ይጻፉ
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,ሊድ አድርግ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,አትም የጽህፈት
@@ -3859,19 +3944,19 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","ደመወዝ አስቀድሞ {0} እና {1}, ለዚህ የቀን ክልል መካከል ሊሆን አይችልም የማመልከቻ ጊዜ ተወው መካከል ለተወሰነ ጊዜ በሂደት ላይ."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,አንድ መለያ ቁጥር መጫን መዝገብ
 DocType: Guardian Interest,Guardian Interest,አሳዳጊ የወለድ
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,ለ POS መጋሪያዎች ነባሪ ዋጋዎችን ያዋቅሩ
 apps/erpnext/erpnext/config/hr.py +177,Training,ልምምድ
 DocType: Timesheet,Employee Detail,የሰራተኛ ዝርዝር
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ኢሜይል መታወቂያ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,በሚቀጥለው ቀን ቀን እና እኩል መሆን አለበት ወር ቀን ላይ ይድገሙ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,በሚቀጥለው ቀን ቀን እና እኩል መሆን አለበት ወር ቀን ላይ ይድገሙ
 DocType: Lab Prescription,Test Code,የሙከራ ኮድ
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,ድር መነሻ ገጽ ቅንብሮች
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},በ {0} ነጥብ የምርጫ ካርድ ደረጃ ምክንያት በ {0} አይፈቀድም RFQs አይፈቀዱም.
 DocType: Offer Letter,Awaiting Response,ምላሽ በመጠባበቅ ላይ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,ከላይ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},ጠቅላላ መጠን {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},ልክ ያልሆነ አይነታ {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},ጠቅላላ መጠን {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},ልክ ያልሆነ አይነታ {0} {1}
 DocType: Supplier,Mention if non-standard payable account,መጥቀስ መደበኛ ያልሆኑ ተከፋይ ሂሳብ ከሆነ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},ተመሳሳይ ንጥል በርካታ ጊዜ ገብቷል ተደርጓል. {ዝርዝር}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',&#39;ሁሉም ግምገማ ቡድኖች&#39; ይልቅ ሌላ ግምገማ ቡድን ይምረጡ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},ረድፍ {0}: ወለድ ማዕከሉን ለአንድ ንጥል {1} ያስፈልጋል
 DocType: Training Event Employee,Optional,አማራጭ
@@ -3894,19 +3979,20 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ወጪ ማዕከል ንጥል ግዴታ ነው; {2}
 DocType: Vehicle,Policy No,መመሪያ የለም
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,የምርት ጥቅል ከ ንጥሎች ያግኙ
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property",ክምችት በንጥል {0} ላይ እንደመሆኑ መጠን የተለያየ ንብረት መፍጠር አይችሉም
 DocType: Asset,Straight Line,ቀጥተኛ መስመር
 DocType: Project User,Project User,የፕሮጀክት ተጠቃሚ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,ሰነጠቀ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,ሰነጠቀ
 DocType: GL Entry,Is Advance,የቅድሚያ ነው
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,ቀን ወደ ቀን እና የትምህርት ክትትል ጀምሮ በስብሰባው የግዴታ ነው
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,አዎ ወይም አይ እንደ &#39;Subcontracted ነው&#39; ያስገቡ
+DocType: Item,Default Purchase Unit of Measure,የመለኪያ ግዢ መለኪያ ክፍል
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,የመጨረሻው ኮሙኒኬሽን ቀን
 DocType: Sales Team,Contact No.,የእውቂያ ቁጥር
 DocType: Bank Reconciliation,Payment Entries,የክፍያ ግቤቶች
 DocType: Production Order,Scrap Warehouse,ቁራጭ መጋዘን
 DocType: Production Order,Check if material transfer entry is not required,ቁሳዊ ማስተላለፍ ግቤት አያስፈልግም ከሆነ ያረጋግጡ
 DocType: Program Enrollment Tool,Get Students From,ከ ተማሪዎች ያግኙ
-DocType: Hub Settings,Seller Country,ሻጭ አገር
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,ድህረ ገጽ ላይ ንጥሎች አትም
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,ቀድመህ ቡድን የእርስዎን ተማሪዎች
 DocType: Authorization Rule,Authorization Rule,የፈቃድ አሰጣጥ ደንብ
@@ -3916,7 +4002,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,የሽያጭ ግብሮች እና ክፍያዎች አብነት
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),ጠቅላላ (ምንጭ)
 DocType: Repayment Schedule,Payment Date,የክፍያ ቀን
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,አዲስ የጅምላ ብዛት
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,አዲስ የጅምላ ብዛት
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,አልባሳት እና ማሟያዎች
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,የተመጣጠነ የውጤት ተግባርን መፍታት አልተቻለም. ቀመሩ በትክክል መሆኑን ያረጋግጡ.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,ትዕዛዝ ቁጥር
@@ -3934,6 +4020,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","የረድፍ # {0}: የንብረት {1} ማስገባት አይችልም, ቀድሞውንም ነው {2}"
 DocType: Tax Rule,Billing Country,አከፋፈል አገር
 DocType: Purchase Order Item,Expected Delivery Date,የሚጠበቀው የመላኪያ ቀን
+DocType: Restaurant Order Entry,Restaurant Order Entry,የምግብ ቤት የመግቢያ ግቢ
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ዴቢት እና የብድር {0} ለ # እኩል አይደለም {1}. ልዩነት ነው; {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,መዝናኛ ወጪ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,የቁስ ጥያቄ አድርግ
@@ -3946,9 +4033,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,ነባር የግብይት ጋር መለያ ሊሰረዝ አይችልም
 DocType: Vehicle,Last Carbon Check,የመጨረሻው ካርቦን ፈትሽ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,የህግ ወጪዎች
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,ረድፍ ላይ ብዛት ይምረጡ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,ረድፍ ላይ ብዛት ይምረጡ
 DocType: Purchase Invoice,Posting Time,መለጠፍ ሰዓት
 DocType: Timesheet,% Amount Billed,% መጠን የሚከፈል
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;የሰዓቱ በእያንዳንዱ ቀጠሮ&quot; ለዶክተር {0} አልተዘጋጀም.በሐኪም መምህር ላይ አክለው.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,የስልክ ወጪ
 DocType: Sales Partner,Logo,አርማ
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,ሳያስቀምጡ በፊት ተከታታይ ለመምረጥ ተጠቃሚው ለማስገደድ የሚፈልጉ ከሆነ ይህን ምልክት ያድርጉ. ይህን ለማረጋገጥ ከሆነ ምንም ነባሪ ይሆናል.
@@ -3959,6 +4047,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,አዲስ ደንበኛ ገቢ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,የጉዞ ወጪ
 DocType: Maintenance Visit,Breakdown,መሰባበር
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},ብጁ ዶሴ ዶክተሩን በዶክትሪፕስ {0} ውስጥ ያክሉ
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,መለያ: {0} ምንዛሬ ጋር: {1} መመረጥ አይችልም
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",በቅርብ ጊዜ የተመን ዋጋ / የዋጋ ዝርዝር / በመጨረሻው የጥሬ ዕቃ ዋጋ ላይ በመመርኮዝ የወኪል ማስተካከያውን በጊዜ መርሐግብር በኩል በራስሰር ያስከፍላል.
 DocType: Bank Reconciliation Detail,Cheque Date,ቼክ ቀን
@@ -3983,7 +4072,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),ጠቅላላ የሂሳብ አከፋፈል መጠን (ጊዜ ምዝግብ ማስታወሻዎች በኩል)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,አቅራቢ መታወቂያ
 DocType: Payment Request,Payment Gateway Details,ክፍያ ፍኖት ዝርዝሮች
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,ብዛት 0 የበለጠ መሆን አለበት
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,ብዛት 0 የበለጠ መሆን አለበት
 DocType: Journal Entry,Cash Entry,ጥሬ ገንዘብ የሚመዘገብ መረጃ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,የልጆች እባጮች ብቻ &#39;ቡድን&#39; አይነት አንጓዎች ስር ሊፈጠር ይችላል
 DocType: Leave Application,Half Day Date,ግማሾቹ ቀን ቀን
@@ -4001,12 +4090,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,ማስታወሻ: ንጥል {0} በርካታ ጊዜ ገብቷል
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,ሁሉም እውቅያዎች.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,ኩባንያ ምህፃረ ቃል
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,አባል {0} የለም
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,አባል {0} የለም
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,ማላጠር
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,የክፍያ Entry አስቀድሞ አለ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} ገደብ አልፏል ጀምሮ authroized አይደለም
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,ደመወዝ አብነት ጌታቸው.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,ፓዮሎጂ
+DocType: Restaurant Order Entry,Restaurant Table,የምግብ ቤት ሰንጠረዥ
 DocType: Leave Type,Max Days Leave Allowed,ከፍተኛ ቀኖች ፈቃድ ተፈቅዷል
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,ወደ ግዢ ሳጥን ጨመር ያዘጋጁ ግብር ደንብ
 DocType: Purchase Invoice,Taxes and Charges Added,ግብሮች እና ክፍያዎች ታክሏል
@@ -4018,10 +4109,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,የሚመራ ወይም ደንበኞች ወደ በመጥቀስ.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ሚና የታሰረው የአክሲዮን አርትዕ ማድረግ ተፈቅዷል
 ,Territory Target Variance Item Group-Wise,ክልል ዒላማ ልዩነት ንጥል ቡድን ጥበበኛ
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,ሁሉም የደንበኛ ቡድኖች
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,ሁሉም የደንበኛ ቡድኖች
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,ሲጠራቀሙ ወርሃዊ
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} የግዴታ ነው. ምናልባት የገንዘብ ምንዛሪ ዘገባ {1} {2} ዘንድ አልተፈጠረም ነው.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,የግብር መለጠፊያ የግዴታ ነው.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,የግብር መለጠፊያ የግዴታ ነው.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,መለያ {0}: የወላጅ መለያ {1} የለም
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),ዋጋ ዝርዝር ተመን (የኩባንያ የምንዛሬ)
 DocType: Products Settings,Products Settings,ምርቶች ቅንብሮች
@@ -4047,12 +4138,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ንጥል ጥበበኛ የግብር ዝርዝር
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,ተቋም ምህፃረ ቃል
 ,Item-wise Price List Rate,ንጥል-ጥበብ ዋጋ ዝርዝር ተመን
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,አቅራቢው ትዕምርተ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,አቅራቢው ትዕምርተ
 DocType: Quotation,In Words will be visible once you save the Quotation.,የ ትዕምርተ ማስቀመጥ አንዴ ቃላት ውስጥ የሚታይ ይሆናል.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},ብዛት ({0}) ረድፍ ውስጥ ክፍልፋይ ሊሆን አይችልም {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},የአሞሌ {0} አስቀድሞ ንጥል ውስጥ ጥቅም ላይ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},የአሞሌ {0} አስቀድሞ ንጥል ውስጥ ጥቅም ላይ {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,የመላኪያ ወጪዎች ለማከል ደንቦች.
 DocType: Item,Opening Stock,በመክፈት ላይ የአክሲዮን
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ደንበኛ ያስፈልጋል
@@ -4070,9 +4161,8 @@
 DocType: Customer,From Lead,ሊድ ከ
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ትዕዛዞች ምርት ከእስር.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,በጀት ዓመት ይምረጡ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS መገለጫ POS የሚመዘገብ ለማድረግ ያስፈልጋል
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS መገለጫ POS የሚመዘገብ ለማድረግ ያስፈልጋል
 DocType: Program Enrollment Tool,Enroll Students,ተማሪዎች ይመዝገቡ
-DocType: Hub Settings,Name Token,ስም ማስመሰያ
 DocType: Lab Test,Approved Date,የተፈቀደበት ቀን
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,መደበኛ ሽያጭ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,ቢያንስ አንድ መጋዘን የግዴታ ነው
@@ -4090,7 +4180,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,የሰው ኃይል
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,የክፍያ ማስታረቅ ክፍያ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,የግብር ንብረቶች
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},የምርት ትዕዛዝ ቆይቷል {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},የምርት ትዕዛዝ ቆይቷል {0}
 DocType: BOM Item,BOM No,BOM ምንም
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,ጆርናል Entry {0} {1} ወይም አስቀድመው በሌሎች ቫውቸር ጋር የሚዛመድ መለያ የለውም
@@ -4110,7 +4200,7 @@
 DocType: Currency Exchange,To Currency,ምንዛሬ ወደ
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,የሚከተሉት ተጠቃሚዎች የማገጃ ቀናት ፈቃድ መተግበሪያዎች ማጽደቅ ፍቀድ.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,የወጪ የይገባኛል ዓይነቶች.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ንጥል ፍጥነት መሸጥ {0} ያነሰ ነው ያለው {1}. ተመን መሸጥ መሆን አለበት atleast {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ንጥል ፍጥነት መሸጥ {0} ያነሰ ነው ያለው {1}. ተመን መሸጥ መሆን አለበት atleast {2}
 DocType: Item,Taxes,ግብሮች
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,የሚከፈልበት እና ደርሷል አይደለም
 DocType: Project,Default Cost Center,ነባሪ ዋጋ ማዕከል
@@ -4124,15 +4214,15 @@
 DocType: Employee Loan,Fully Disbursed,ሙሉ በሙሉ በመገኘቱ
 DocType: Maintenance Visit,Customer Feedback,የደንበኛ ግብረ መልስ
 DocType: Account,Expense,ወጭ
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,ውጤት ከፍተኛ ነጥብ በላይ ሊሆን አይችልም
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,ውጤት ከፍተኛ ነጥብ በላይ ሊሆን አይችልም
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,ደንበኞች እና አቅራቢዎች
 DocType: Item Attribute,From Range,ክልል ከ
 DocType: BOM,Set rate of sub-assembly item based on BOM,በ BOM መነሻ በማድረግ ንዑስ ንፅፅር ንጥልን ያቀናብሩ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},ቀመር ወይም ሁኔታ ውስጥ የአገባብ ስህተት: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},ቀመር ወይም ሁኔታ ውስጥ የአገባብ ስህተት: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,ዕለታዊ የሥራ ማጠቃለያ ቅንብሮች ኩባንያ
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,ይህ ጀምሮ ችላ ንጥል {0} አንድ የአክሲዮን ንጥል አይደለም
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,ተጨማሪ ሂደት ይህን የምርት ትዕዛዝ ያስገቡ.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,ተጨማሪ ሂደት ይህን የምርት ትዕዛዝ ያስገቡ.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",በተወሰነ ግብይት ውስጥ የዋጋ ሕግ ተግባራዊ ሳይሆን ወደ ሁሉም የሚመለከታቸው የዋጋ ደንቦች መሰናከል ያለበት.
 DocType: Assessment Group,Parent Assessment Group,የወላጅ ግምገማ ቡድን
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,ሥራዎች
@@ -4149,12 +4239,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',የቡድን በ «ኩባንያ &#39;ከሆነ ኩባንያ ባዶ ማጣሪያ ያዘጋጁ እባክዎ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,መለጠፍ ቀን ወደፊት ቀን ሊሆን አይችልም
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},የረድፍ # {0}: መለያ አይ {1} ጋር አይዛመድም {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,ተደጋጋሚውን ለመፍጠር
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,ተራ ፈቃድ
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,የቤተ ሙከራ ፈተና UOM.
 DocType: Batch,Batch ID,ባች መታወቂያ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},ማስታወሻ: {0}
 ,Delivery Note Trends,የመላኪያ ማስታወሻ በመታየት ላይ ያሉ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,ይህ ሳምንት ማጠቃለያ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,ይህ ሳምንት ማጠቃለያ
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,የክምችት ብዛት ውስጥ
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,መለያ: {0} ብቻ የአክሲዮን ግብይቶች በኩል መዘመን ይችላሉ
 DocType: Student Group Creation Tool,Get Courses,ኮርሶች ያግኙ
@@ -4168,7 +4259,6 @@
 DocType: Purchase Order,To Bill,ቢል
 DocType: Material Request,% Ordered,% የዕቃው መረጃ
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","የትምህርት የተመሠረተ የተማሪዎች ቡድን, የቀየረ ፕሮግራም ምዝገባ ውስጥ የተመዘገቡ ኮርሶች ጀምሮ ለእያንዳንዱ ተማሪ ሊረጋገጥ ይሆናል."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","በኮማ የተለዩ ያስገቡ የኢሜይል አድራሻ, የክፍያ መጠየቂያ የተወሰነ ቀን ላይ በራስ-ሰር በፖስታ ቤት ይሆናል"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,ጭማቂዎች
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,አማካኝ. ሊገዙ ተመን
 DocType: Task,Actual Time (in Hours),(ሰዓቶች ውስጥ) ትክክለኛ ሰዓት
@@ -4182,7 +4272,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,{0} ንጥል መለያ ቁጥሮች ለ ማዋቀር አይደለም. አምድ ባዶ መሆን አለበት
 DocType: Accounts Settings,Accounts Settings,ቅንብሮች መለያዎች
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,ማጽደቅ
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,ለማስገባት ምንም ውጤት የለም
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,ለማስገባት ምንም ውጤት የለም
 DocType: Customer,Sales Partner and Commission,የሽያጭ አጋር እና ኮሚሽን
 DocType: Employee Loan,Rate of Interest (%) / Year,በፍላጎት ላይ (%) / የዓመቱ ይስጡት
 ,Project Quantity,የፕሮጀክት ብዛት
@@ -4194,55 +4284,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,ጥቁር
 DocType: BOM Explosion Item,BOM Explosion Item,BOM ፍንዳታ ንጥል
 DocType: Account,Auditor,ኦዲተር
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,ምርት {0} ንጥሎች
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,ምርት {0} ንጥሎች
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,ተጨማሪ እወቅ
 DocType: Cheque Print Template,Distance from top edge,ከላይ ጠርዝ ያለው ርቀት
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,የዋጋ ዝርዝር {0} ተሰናክሏል ወይም የለም
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,የዋጋ ዝርዝር {0} ተሰናክሏል ወይም የለም
 DocType: Purchase Invoice,Return,ተመለስ
 DocType: Production Order Operation,Production Order Operation,የምርት ትዕዛዝ ኦፕሬሽን
 DocType: Pricing Rule,Disable,አሰናክል
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,የክፍያ ሁነታ ክፍያ ለመሥራት የግድ አስፈላጊ ነው
 DocType: Project Task,Pending Review,በመጠባበቅ ላይ ያለ ክለሳ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,ቀጠሮዎችና ምክክሮች
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} በ ባች ውስጥ አልተመዘገበም ነው {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} በ ባች ውስጥ አልተመዘገበም ነው {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",አስቀድሞ እንደ የንብረት {0} በመዛጉ አይችልም {1}
 DocType: Task,Total Expense Claim (via Expense Claim),(የወጪ የይገባኛል በኩል) ጠቅላላ የወጪ የይገባኛል ጥያቄ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,ማርቆስ የተዉ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ረድፍ {0}: ወደ BOM # ምንዛሬ {1} በተመረጠው ምንዛሬ እኩል መሆን አለበት {2}
 DocType: Journal Entry Account,Exchange Rate,የመለወጫ ተመን
 DocType: Patient,Additional information regarding the patient,በሽተኛውን በተመለከተ ተጨማሪ መረጃ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,የሽያጭ ትዕዛዝ {0} ማቅረብ አይደለም
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,የሽያጭ ትዕዛዝ {0} ማቅረብ አይደለም
 DocType: Homepage,Tag Line,መለያ መስመር
 DocType: Fee Component,Fee Component,የክፍያ ክፍለ አካል
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,መርከቦች አስተዳደር
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,ከ ንጥሎችን ያክሉ
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,መርከቦች አስተዳደር
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,ከ ንጥሎችን ያክሉ
 DocType: Cheque Print Template,Regular,መደበኛ
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,ሁሉም የግምገማ መስፈርት ጠቅላላ Weightage 100% መሆን አለበት
-DocType: BOM,Last Purchase Rate,የመጨረሻው የግዢ ተመን
+DocType: Purchase Order Item,Last Purchase Rate,የመጨረሻው የግዢ ተመን
 DocType: Account,Asset,የንብረት
 DocType: Project Task,Task ID,ተግባር መታወቂያ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,ንጥል ለማግኘት መኖር አይችሉም የአክሲዮን {0} ጀምሮ ተለዋጮች አለው
 DocType: Lab Test,Mobile,ሞባይል
 ,Sales Person-wise Transaction Summary,የሽያጭ ሰው-ጥበብ የግብይት ማጠቃለያ
 DocType: Training Event,Contact Number,የእውቂያ ቁጥር
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,መጋዘን {0} የለም
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext ማዕከል ለማግኘት ይመዝገቡ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,መጋዘን {0} የለም
 DocType: Monthly Distribution,Monthly Distribution Percentages,ወርሃዊ የስርጭት መቶኛ
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,የተመረጠው ንጥል ባች ሊኖረው አይችልም
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","ግምቱ መጠን ለ የሂሳብ ግቤቶች ማድረግ ያስፈልጋል ይህም ንጥል {0}, ለ አልተገኘም {1} {2}. ንጥል ውስጥ ናሙና ንጥል እንደ ልውውጥ ከሆነ {1} ን, {1} ንጥል ሠንጠረዥ ውስጥ መጥቀስ እባክህ. አለበለዚያ, / ካስረከቡ ይሞክሩ ይህን ግቤት በመሰረዝ ከዚያም ንጥል መዝገብ ውስጥ ንጥል ወይም የተጠቀሰ ነገር ግምቱ መጠን አንድ ገቢ የአክሲዮን ግብይት መፍጠር, እና እባክህ"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,ቁሳቁሶችን% ይህን የመላኪያ ማስታወሻ ላይ አሳልፎ
+DocType: Training Event,Has Certificate,ሰርቲፊኬት አለው
 DocType: Project,Customer Details,የደንበኛ ዝርዝሮች
 DocType: Employee,Reports to,ወደ ሪፖርቶች
 ,Unpaid Expense Claim,ያለክፍያ የወጪ የይገባኛል ጥያቄ
 DocType: Payment Entry,Paid Amount,የሚከፈልበት መጠን
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,የሽያጭ ዑደት ያስሱ
 DocType: Assessment Plan,Supervisor,ተቆጣጣሪ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,የመስመር ላይ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,የመስመር ላይ
 ,Available Stock for Packing Items,ማሸግ ንጥሎች አይገኝም የአክሲዮን
 DocType: Item Variant,Item Variant,ንጥል ተለዋጭ
 DocType: Assessment Result Tool,Assessment Result Tool,ግምገማ ውጤት መሣሪያ
 DocType: BOM Scrap Item,BOM Scrap Item,BOM ቁራጭ ንጥል
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,የተረከቡት ትዕዛዞች ሊሰረዝ አይችልም
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,የተረከቡት ትዕዛዞች ሊሰረዝ አይችልም
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","አስቀድሞ ዴቢት ውስጥ ቀሪ ሒሳብ, አንተ &#39;ምንጭ&#39; እንደ &#39;ሚዛናዊ መሆን አለብህ&#39; እንዲያዘጋጁ ያልተፈቀደላቸው ነው"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,የጥራት ሥራ አመራር
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,{0} ንጥል ተሰናክሏል
@@ -4262,7 +4351,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},የረድፍ # {0}: ረድፍ ጋር ጊዜዎች ግጭቶች {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,ዜሮ ከግምቱ ተመን ፍቀድ
 DocType: Training Event Employee,Invited,የተጋበዙ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,ለተሰጠው ቀናት ሠራተኛ {0} አልተገኘም በርካታ ገባሪ ደመወዝ መዋቅሮች
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,ለተሰጠው ቀናት ሠራተኛ {0} አልተገኘም በርካታ ገባሪ ደመወዝ መዋቅሮች
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,አዋቅር ጌትዌይ መለያዎች.
 DocType: Employee,Employment Type,የቅጥር ዓይነት
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,ቋሚ ንብረት
@@ -4274,7 +4363,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,የተማሪ የኢሜይል መታወቂያ
 DocType: Employee,Notice (days),ማስታወቂያ (ቀናት)
 DocType: Tax Rule,Sales Tax Template,የሽያጭ ግብር አብነት
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,ወደ መጠየቂያ ለማስቀመጥ ንጥሎችን ምረጥ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,ወደ መጠየቂያ ለማስቀመጥ ንጥሎችን ምረጥ
 DocType: Employee,Encashment Date,Encashment ቀን
 DocType: Training Event,Internet,በይነመረብ
 DocType: Special Test Template,Special Test Template,ልዩ የፍተሻ አብነት
@@ -4283,7 +4372,7 @@
 DocType: Production Order,Planned Operating Cost,የታቀደ ስርዓተ ወጪ
 DocType: Academic Term,Term Start Date,የሚለው ቃል መጀመሪያ ቀን
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp ቆጠራ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},ለማግኘት እባክዎ አባሪ {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},ለማግኘት እባክዎ አባሪ {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,አጠቃላይ የሒሳብ መዝገብ መሠረት የባንክ መግለጫ ቀሪ
 DocType: Job Applicant,Applicant Name,የአመልካች ስም
 DocType: Authorization Rule,Customer / Item Name,ደንበኛ / ንጥል ስም
@@ -4303,7 +4392,7 @@
 DocType: Guardian,Guardian Of ,ነው አሳዳጊ
 DocType: Grading Scale Interval,Threshold,ምድራክ
 DocType: BOM Update Tool,Current BOM,የአሁኑ BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,ተከታታይ ምንም አክል
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,ተከታታይ ምንም አክል
 DocType: Production Order Item,Available Qty at Source Warehouse,ምንጭ መጋዘን ላይ ይገኛል ብዛት
 apps/erpnext/erpnext/config/support.py +22,Warranty,ዋስ
 DocType: Purchase Invoice,Debit Note Issued,ዴት ማስታወሻ ቀርቧል
@@ -4326,10 +4415,9 @@
 DocType: Account,Receivable,የሚሰበሰብ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,የረድፍ # {0}: የግዢ ትዕዛዝ አስቀድሞ አለ እንደ አቅራቢው ለመለወጥ አይፈቀድም
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,ካልተዋቀረ የብድር ገደብ መብለጥ መሆኑን ግብይቶችን ማቅረብ አይፈቀድም ነው ሚና.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,ለማምረት ንጥሎች ይምረጡ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","መምህር ውሂብ ማመሳሰል, ይህ የተወሰነ ጊዜ ሊወስድ ይችላል"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,ለማምረት ንጥሎች ይምረጡ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","መምህር ውሂብ ማመሳሰል, ይህ የተወሰነ ጊዜ ሊወስድ ይችላል"
 DocType: Item,Material Issue,ቁሳዊ ችግር
-DocType: Hub Settings,Seller Description,ሻጭ መግለጫ
 DocType: Employee Education,Qualification,እዉቀት
 DocType: Item Price,Item Price,ንጥል ዋጋ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,ሳሙና እና ሳሙና
@@ -4337,7 +4425,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,ከጊዜ ወደ ጊዜ በላይ ሊሆን አይችልም.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,የተንቀሳቃሽ ምስል እና ቪዲዮ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,የዕቃው መረጃ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,እንደ ገና መጀመር
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,እንደ ገና መጀመር
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,ከነቃ ስርዓቱ አብነት ያላቸውን ተለዋጭ መስኮች ዝምሎ አያስተናግድም ነገር ግን አዲስ ስሪት ሲያደርግ ከታች የተዘረዘሩትን መስኮች ውሂብ ይገለብጣል
 DocType: Salary Detail,Component,ክፍል
 DocType: Assessment Criteria,Assessment Criteria Group,የግምገማ መስፈርት ቡድን
 DocType: Healthcare Settings,Patient Name By,የታካሚ ስም በ
@@ -4347,7 +4436,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,ሚና በማፅደቅ ወይም የተጠቃሚ በማፅደቅ ያስገቡ
 DocType: Journal Entry,Write Off Entry,Entry ጠፍቷል ይጻፉ
 DocType: BOM,Rate Of Materials Based On,ደረጃ ይስጡ እቃዎች ላይ የተመረኮዘ ላይ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,አቅራቢ&gt; አቅራቢ አይነት
+DocType: Item Variant Settings,Do not Update Variants,ተለዋዋጭዎችን አዘምን
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,የድጋፍ Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,ሁሉንም አታመልክት
 DocType: POS Profile,Terms and Conditions,አተገባበሩና መመሪያው
@@ -4356,7 +4445,7 @@
 DocType: Leave Block List,Applies to Company,ኩባንያ የሚመለከተው ለ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,ገብቷል የክምችት Entry {0} መኖሩን ምክንያቱም ማስቀረት አይቻልም
 DocType: Employee Loan,Disbursement Date,ከተዛወሩ ቀን
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;ተቀባዮች&#39; አልተገለፀም
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;ተቀባዮች&#39; አልተገለፀም
 DocType: BOM Update Tool,Update latest price in all BOMs,በሁሉም የ BOM ዎች ውስጥ የቅርብ ጊዜውን ዋጋ ያዘምኑ
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,የህክምና መዝገብ
 DocType: Vehicle,Vehicle,ተሽከርካሪ
@@ -4371,14 +4460,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / በእርሳስ%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,የንብረት Depreciations እና ሚዛን
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},የገንዘብ መጠን {0} {1} ይተላለፋል {2} ወደ {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},የገንዘብ መጠን {0} {1} ይተላለፋል {2} ወደ {3}
 DocType: Sales Invoice,Get Advances Received,እድገት ተቀብሏል ያግኙ
 DocType: Email Digest,Add/Remove Recipients,ተቀባዮች አክል / አስወግድ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},ግብይት ቆሟል ምርት ላይ አይፈቀድም ትዕዛዝ {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",", ነባሪ በዚህ በጀት ዓመት ለማዘጋጀት &#39;ነባሪ አዘጋጅ »ላይ ጠቅ ያድርጉ"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,ተቀላቀል
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,ተቀላቀል
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,እጥረት ብዛት
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,ንጥል ተለዋጭ {0} ተመሳሳይ ባሕርያት ጋር አለ
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,ንጥል ተለዋጭ {0} ተመሳሳይ ባሕርያት ጋር አለ
 DocType: Employee Loan,Repay from Salary,ደመወዝ ከ ልከፍለው
 DocType: Leave Application,LAP/,ጭን /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},ላይ ክፍያ በመጠየቅ ላይ {0} {1} መጠን ለ {2}
@@ -4391,7 +4480,7 @@
 DocType: Sales Invoice Item,Sales Order Item,የሽያጭ ትዕዛዝ ንጥል
 DocType: Salary Slip,Payment Days,የክፍያ ቀኖች
 DocType: Patient,Dormant,ዋልጌ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,ልጅ እንደ አንጓዎች ጋር መጋዘኖችን ያሰኘንን ወደ ሊቀየር አይችልም
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,ልጅ እንደ አንጓዎች ጋር መጋዘኖችን ያሰኘንን ወደ ሊቀየር አይችልም
 DocType: BOM,Manage cost of operations,ስራዎች ወጪ ያቀናብሩ
 DocType: Accounts Settings,Stale Days,የቆዳ ቀናቶች
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","በተደረገባቸው ግብይቶች ማንኛውም &quot;ገብቷል&quot; ጊዜ, የኢሜይል ብቅ-ባይ በራስ-ሰር አባሪ እንደ ግብይት ጋር, በግብይቱ ውስጥ ተያይዞ &quot;እውቅያ&quot; ኢሜይል ለመላክ ይከፈታል. ተጠቃሚው ይችላል ወይም ኢሜይል መላክ ይችላል."
@@ -4405,10 +4494,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,ተከታታይ አይ {0} አስቀድሞ ደርሷል
 ,Requested Items To Be Transferred,ተጠይቋል ንጥሎች መወሰድ
 DocType: Expense Claim,Vehicle Log,የተሽከርካሪ ምዝግብ ማስታወሻ
-DocType: Purchase Invoice,Recurring Id,ተደጋጋሚ መታወቂያ
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),ትኩሳት (የሙቀት&gt; 38.5 ° ሴ / 101.3 ° ፋ ወይም ዘላቂነት&gt; 38 ° C / 100.4 ° ፋ)
 DocType: Customer,Sales Team Details,የሽያጭ ቡድን ዝርዝሮች
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,እስከመጨረሻው ይሰረዝ?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,እስከመጨረሻው ይሰረዝ?
 DocType: Expense Claim,Total Claimed Amount,ጠቅላላ የቀረበበት የገንዘብ መጠን
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,መሸጥ የሚሆን እምቅ ዕድል.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},ልክ ያልሆነ {0}
@@ -4418,7 +4506,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,መምሪያ መደብሮች
 ,Item Delivery Date,የንጥል ማቅረብ ቀን
 DocType: Warehouse,PIN,ፒን
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,ERPNext ውስጥ ማዋቀር ትምህርት ቤት
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,ERPNext ውስጥ ማዋቀር ትምህርት ቤት
 DocType: Sales Invoice,Base Change Amount (Company Currency),የመሠረት ለውጥ መጠን (የኩባንያ የምንዛሬ)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,የሚከተሉትን መጋዘኖችን ምንም የሂሳብ ግቤቶች
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,በመጀመሪያ ሰነዱን አስቀምጥ.
@@ -4430,13 +4518,12 @@
 DocType: Task,Is Milestone,ያበረከተ ነው
 DocType: Daily Work Summary,Email Sent To,ኢሜይል ተልኳል
 DocType: Budget,Warn,አስጠንቅቅ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,ለመመዝገብ ይፈልጋሉ?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ሌሎች ማንኛውም አስተያየት, መዝገቦች ውስጥ መሄድ ዘንድ ትኩረት የሚስብ ጥረት."
 DocType: BOM,Manufacturing User,ማኑፋክቸሪንግ ተጠቃሚ
 DocType: Purchase Invoice,Raw Materials Supplied,ጥሬ እቃዎች አቅርቦት
-DocType: Purchase Invoice,Recurring Print Format,ተደጋጋሚ የህትመት ቅርጸት
 DocType: C-Form,Series,ተከታታይ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},የዋጋ ዝርዝር {0} ልኬት {1} ወይም {2} መሆን አለበት
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,ምርቶችን አክል
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},የዋጋ ዝርዝር {0} ልኬት {1} ወይም {2} መሆን አለበት
 DocType: Appraisal,Appraisal Template,ግምገማ አብነት
 DocType: Item Group,Item Classification,ንጥል ምደባ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,የንግድ ልማት ሥራ አስኪያጅ
@@ -4450,7 +4537,7 @@
 DocType: Item Attribute Value,Attribute Value,ዋጋ ይስጡ
 ,Itemwise Recommended Reorder Level,Itemwise አስይዝ ደረጃ የሚመከር
 DocType: Salary Detail,Salary Detail,ደመወዝ ዝርዝር
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,በመጀመሪያ {0} እባክዎ ይምረጡ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,በመጀመሪያ {0} እባክዎ ይምረጡ
 DocType: Appointment Type,Physician,ሐኪም
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,ንጥል ባች {0} {1} ጊዜው አልፎበታል.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,ምክክሮች
@@ -4461,7 +4548,7 @@
 DocType: Salary Detail,Default Amount,ነባሪ መጠን
 DocType: Lab Test Template,Descriptive,ገላጭ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,መጋዘን ሥርዓት ውስጥ አልተገኘም
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,በዚህ ወር የሰጠው ማጠቃለያ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,በዚህ ወር የሰጠው ማጠቃለያ
 DocType: Quality Inspection Reading,Quality Inspection Reading,የጥራት ምርመራ ንባብ
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`እሰር አክሲዮኖች የቆየ Than`% d ቀኖች ያነሰ መሆን ይኖርበታል.
 DocType: Tax Rule,Purchase Tax Template,የግብር አብነት ግዢ
@@ -4484,12 +4571,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,ክስተቶች / ውጤቶች ማሠልጠን
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,እንደ ላይ የእርጅና ሲጠራቀሙ
 DocType: Sales Invoice,C-Form Applicable,ሲ-ቅጽ የሚመለከታቸው
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},ኦፕሬሽን ጊዜ ክወና ለ ከ 0 በላይ መሆን አለበት {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},ኦፕሬሽን ጊዜ ክወና ለ ከ 0 በላይ መሆን አለበት {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,መጋዘን የግዴታ ነው
 DocType: Supplier,Address and Contacts,አድራሻ እና እውቂያዎች
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM ልወጣ ዝርዝር
 DocType: Program,Program Abbreviation,ፕሮግራም ምህፃረ ቃል
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,የምርት ትዕዛዝ አንድ ንጥል መለጠፊያ ላይ ይነሣሉ አይችልም
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,የምርት ትዕዛዝ አንድ ንጥል መለጠፊያ ላይ ይነሣሉ አይችልም
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,ክፍያዎች እያንዳንዱ ንጥል ላይ የግዢ ደረሰኝ ውስጥ መዘመን ነው
 DocType: Warranty Claim,Resolved By,በ የተፈታ
 DocType: Bank Guarantee,Start Date,ቀን ጀምር
@@ -4515,26 +4602,27 @@
 DocType: Employee,Educational Qualification,ተፈላጊ የትምህርት ደረጃ
 DocType: Workstation,Operating Costs,ማስኬጃ ወጪዎች
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,እርምጃ ወርኃዊ በጀት የታለፈው ሲጠራቀሙ ከሆነ
-DocType: Purchase Invoice,Submit on creation,ፍጥረት ላይ አስገባ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},የመገበያያ ገንዘብ {0} ይህ ሊሆን ግድ ነውና {1}
+DocType: Subscription,Submit on creation,ፍጥረት ላይ አስገባ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},የመገበያያ ገንዘብ {0} ይህ ሊሆን ግድ ነውና {1}
 DocType: Asset,Disposal Date,ማስወገድ ቀን
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","እነርሱ በዓል ከሌለዎት ኢሜይሎችን, በተሰጠው ሰዓት ላይ ኩባንያ ሁሉ ንቁ ሠራተኞች ይላካል. ምላሾች ማጠቃለያ እኩለ ሌሊት ላይ ይላካል."
 DocType: Employee Leave Approver,Employee Leave Approver,የሰራተኛ ፈቃድ አጽዳቂ
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},ረድፍ {0}: አንድ አስይዝ ግቤት አስቀድመው የዚህ መጋዘን ለ አለ {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","ትዕምርተ ተደርጓል ምክንያቱም, እንደ የጠፋ ማወጅ አይቻልም."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,ስልጠና ግብረ መልስ
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},ረድፍ {0}: አንድ አስይዝ ግቤት አስቀድመው የዚህ መጋዘን ለ አለ {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","ትዕምርተ ተደርጓል ምክንያቱም, እንደ የጠፋ ማወጅ አይቻልም."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,ስልጠና ግብረ መልስ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,ትዕዛዝ {0} መቅረብ አለበት ፕሮዳክሽን
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,የአምራች ነጥብ መሥፈርት መስፈርት
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},ንጥል ለ የመጀመሪያ ቀን እና ማብቂያ ቀን ይምረጡ {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},ኮርስ ረድፍ ላይ ግዴታ ነው {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ቀን ወደ ቀን ጀምሮ በፊት መሆን አይችልም
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,/ አርትዕ ዋጋዎች አክል
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,/ አርትዕ ዋጋዎች አክል
 DocType: Batch,Parent Batch,የወላጅ ባች
 DocType: Cheque Print Template,Cheque Print Template,ቼክ የህትመት አብነት
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,ወጪ ማዕከላት ገበታ
 DocType: Lab Test Template,Sample Collection,የናሙና ስብስብ
 ,Requested Items To Be Ordered,ተጠይቋል ንጥሎች ሊደረደር ወደ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,የእኔ ትዕዛዞች
 DocType: Price List,Price List Name,የዋጋ ዝርዝር ስም
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},ለ ዕለታዊ የሥራ ማጠቃለያ {0}
 DocType: Employee Loan,Totals,ድምሮች
@@ -4553,12 +4641,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1} ውስጥ አስፈላጊ {2} ላይ {3} {4} {5} ይህን ግብይት ለማጠናቀቅ ለ አሃዶች.
 DocType: Fee Schedule,Student Category,የተማሪ ምድብ
 DocType: Announcement,Student,ተማሪ
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,የድርጅት ክፍል (ዲፓርትመንት) ጌታው.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,የድርጅት ክፍል (ዲፓርትመንት) ጌታው.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,ወደ ክፍሎች ይሂዱ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,ከመላክዎ በፊት መልዕክት ያስገቡ
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,አቅራቢ የተባዙ
 DocType: Email Digest,Pending Quotations,ጥቅሶች በመጠባበቅ ላይ
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,ነጥብ-መካከል-ሽያጭ መገለጫ
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,ነጥብ-መካከል-ሽያጭ መገለጫ
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,የሙከራ የሙከራ ውቅሮች.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,ደህንነቱ ያልተጠበቀ ብድሮች
 DocType: Cost Center,Cost Center Name,ኪሳራ ማዕከል ስም
@@ -4568,6 +4656,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,ጠቅላላ የክፍያ Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 ቁምፊዎች በላይ መልዕክቶች በርካታ መልዕክቶች ይከፋፈላሉ
 DocType: Purchase Receipt Item,Received and Accepted,ተቀብሏል እና ተቀባይነት
+DocType: Hub Settings,Company and Seller Profile,የኩባንያ እና የሻጭ መገለጫ
 ,GST Itemised Sales Register,GST የተሰሉ የሽያጭ መመዝገቢያ
 ,Serial No Service Contract Expiry,ተከታታይ ምንም አገልግሎት ኮንትራት የሚቃጠልበት
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,አንተ ክሬዲት እና በተመሳሳይ ጊዜ ተመሳሳይ መለያ ዘዴዎ አይችልም
@@ -4577,10 +4666,11 @@
 DocType: Item,Variant Based On,ተለዋጭ የተመረኮዘ ላይ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},100% መሆን አለበት የተመደበ ጠቅላላ weightage. ይህ ነው {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,የእርስዎ አቅራቢዎች
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,እባክዎ ያስተካክሉ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,የሽያጭ ትዕዛዝ ነው እንደ የጠፋ እንደ ማዘጋጀት አልተቻለም.
 DocType: Request for Quotation Item,Supplier Part No,አቅራቢው ክፍል የለም
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',በምድብ «ግምቱ &#39;ወይም&#39; Vaulation እና ጠቅላላ &#39;ነው ጊዜ ቀነሰ አይቻልም
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,ከ ተቀብሏል
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,ከ ተቀብሏል
 DocType: Lead,Converted,የተቀየሩ
 DocType: Item,Has Serial No,ተከታታይ ምንም አለው
 DocType: Employee,Date of Issue,የተሰጠበት ቀን
@@ -4588,7 +4678,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","የ ሊገዙ ቅንብሮች መሰረት የግዥ Reciept ያስፈልጋል == &#39;አዎ&#39; ከዚያም የግዥ ደረሰኝ ለመፍጠር, የተጠቃሚ ንጥል መጀመሪያ የግዢ ደረሰኝ መፍጠር አለብዎት ከሆነ {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},የረድፍ # {0}: ንጥል አዘጋጅ አቅራቢው {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,ረድፍ {0}: ሰዓቶች ዋጋ ከዜሮ በላይ መሆን አለበት.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,ንጥል {1} ጋር ተያይዞ ድር ጣቢያ ምስል {0} ሊገኝ አልቻለም
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,ንጥል {1} ጋር ተያይዞ ድር ጣቢያ ምስል {0} ሊገኝ አልቻለም
 DocType: Issue,Content Type,የይዘት አይነት
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,ኮምፕዩተር
 DocType: Item,List this Item in multiple groups on the website.,ድር ላይ በርካታ ቡድኖች ውስጥ ይህን ንጥል ዘርዝር.
@@ -4599,14 +4689,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled ግቤቶችን ያግኙ
 DocType: Payment Reconciliation,From Invoice Date,የደረሰኝ ቀን ጀምሮ
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,ለማስገባት ፈቃድ የልዎትም
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,አከፋፈል ምንዛሬ ወይም ነባሪ comapany ምንዛሬ ወይም ወገን መለያ ምንዛሬ ጋር እኩል መሆን አለባቸው
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,አከፋፈል ምንዛሬ ወይም ነባሪ comapany ምንዛሬ ወይም ወገን መለያ ምንዛሬ ጋር እኩል መሆን አለባቸው
 DocType: Healthcare Settings,Laboratory Settings,የላቦራቶሪ ቅንብሮች
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Encashment ውጣ
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,ምን ያደርጋል?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,መጋዘን ወደ
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,ሁሉም የተማሪ ምዝገባ
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,ምን ያደርጋል?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,መጋዘን ወደ
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,ሁሉም የተማሪ ምዝገባ
 ,Average Commission Rate,አማካኝ ኮሚሽን ተመን
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,&#39;አዎ&#39; መሆን ያልሆኑ-የአክሲዮን ንጥል አይችልም &#39;መለያ ምንም አለው&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,&#39;አዎ&#39; መሆን ያልሆኑ-የአክሲዮን ንጥል አይችልም &#39;መለያ ምንም አለው&#39;
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,ሁኔታን ይምረጡ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,በስብሰባው ወደፊት ቀናት ምልክት ሊሆን አይችልም
 DocType: Pricing Rule,Pricing Rule Help,የዋጋ አሰጣጥ ደንብ እገዛ
@@ -4624,40 +4714,40 @@
 DocType: Item,Customer Code,የደንበኛ ኮድ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},ለ የልደት አስታዋሽ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,የመጨረሻ ትዕዛዝ ጀምሮ ቀናት
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,መለያ ወደ ዴቢት አንድ ሚዛን ሉህ መለያ መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,መለያ ወደ ዴቢት አንድ ሚዛን ሉህ መለያ መሆን አለበት
 DocType: Buying Settings,Naming Series,መሰየምን ተከታታይ
 DocType: Leave Block List,Leave Block List Name,አግድ ዝርዝር ስም ውጣ
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ኢንሹራንስ የመጀመሪያ ቀን መድን የመጨረሻ ቀን ያነሰ መሆን አለበት
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,እባክዎ የመምህርውን ስም ማዕክል ስርዓት ውስጥ በትምህርት ቤት&gt; የትምህርት ቤት ቅንጅቶች ያዋቅሩ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,የክምችት ንብረቶች
 DocType: Timesheet,Production Detail,የምርት ዝርዝር
+DocType: Restaurant,Active Menu,ገባሪ ምናሌ
 DocType: Target Detail,Target Qty,ዒላማ ብዛት
 DocType: Shopping Cart Settings,Checkout Settings,Checkout ቅንብሮች
 DocType: Attendance,Present,ስጦታ
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,የመላኪያ ማስታወሻ {0} መቅረብ የለበትም
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,የመላኪያ ማስታወሻ {0} መቅረብ የለበትም
 DocType: Notification Control,Sales Invoice Message,የሽያጭ ደረሰኝ መልዕክት
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,መለያ {0} መዝጊያ አይነት ተጠያቂነት / ፍትህ መሆን አለበት
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},ሠራተኛ ደመወዝ ማዘዥ {0} አስቀድሞ ጊዜ ወረቀት የተፈጠሩ {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},ሠራተኛ ደመወዝ ማዘዥ {0} አስቀድሞ ጊዜ ወረቀት የተፈጠሩ {1}
 DocType: Vehicle Log,Odometer,ቆጣሪው
 DocType: Sales Order Item,Ordered Qty,የዕቃው መረጃ ብዛት
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,ንጥል {0} ተሰናክሏል
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,ንጥል {0} ተሰናክሏል
 DocType: Stock Settings,Stock Frozen Upto,የክምችት Frozen እስከሁለት
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM ማንኛውም የአክሲዮን ንጥል አልያዘም
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,የፕሮጀክት እንቅስቃሴ / ተግባር.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM ማንኛውም የአክሲዮን ንጥል አልያዘም
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,የፕሮጀክት እንቅስቃሴ / ተግባር.
 DocType: Vehicle Log,Refuelling Details,Refuelling ዝርዝሮች
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,ደመወዝ ቡቃያ አመንጭ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","የሚመለከታቸው ያህል ሆኖ ተመርጧል ከሆነ መግዛትና, ምልክት መደረግ አለበት {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ቅናሽ ከ 100 መሆን አለበት
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,የመጨረሻው የግዢ መጠን አልተገኘም
 DocType: Purchase Invoice,Write Off Amount (Company Currency),መጠን ጠፍቷል ጻፍ (የኩባንያ የምንዛሬ)
 DocType: Sales Invoice Timesheet,Billing Hours,አከፋፈል ሰዓቶች
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,{0} አልተገኘም ነባሪ BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,የረድፍ # {0}: ዳግምስርዓትአስይዝ ብዛት ማዘጋጀት እባክዎ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,{0} አልተገኘም ነባሪ BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,የረድፍ # {0}: ዳግምስርዓትአስይዝ ብዛት ማዘጋጀት እባክዎ
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,እዚህ ላይ ማከል ንጥሎችን መታ
 DocType: Fees,Program Enrollment,ፕሮግራም ምዝገባ
 DocType: Landed Cost Voucher,Landed Cost Voucher,አረፈ ወጪ ቫውቸር
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},ማዘጋጀት እባክዎ {0}
-DocType: Purchase Invoice,Repeat on Day of Month,የወር ቀን ላይ ይድገሙ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} የቦዘነ ተማሪ ነው
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} የቦዘነ ተማሪ ነው
 DocType: Employee,Health Details,የጤና ዝርዝሮች
 DocType: Offer Letter,Offer Letter Terms,ደብዳቤ ውል አበርክቱ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,"የማጣቀሻ ሰነድ ያስፈልጋል ክፍያ ጥያቄ ለመፍጠር,"
@@ -4665,7 +4755,6 @@
 DocType: Employee External Work History,Salary,ደመወዝ
 DocType: Serial No,Delivery Document Type,የመላኪያ የሰነድ አይነት
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,ከላይ የተመረጡ መስፈርት ሁሉ የደምወዝ አስገባ
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} ንጥሎች የተመሳሰለ
 DocType: Sales Order,Partly Delivered,በከፊል ደርሷል
 DocType: Email Digest,Receivables,ከማግኘት
 DocType: Lead Source,Lead Source,በእርሳስ ምንጭ
@@ -4686,19 +4775,19 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,ጥበቃና ክልል 2
 DocType: SG Creation Tool Course,Max Strength,ከፍተኛ ጥንካሬ
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM ተተክቷል
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,በሚላክበት ቀን መሰረት የሆኑ ንጥሎችን ይምረጡ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,በሚላክበት ቀን መሰረት የሆኑ ንጥሎችን ይምረጡ
 ,Sales Analytics,የሽያጭ ትንታኔ
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},ይገኛል {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},ይገኛል {0}
 ,Prospects Engaged But Not Converted,ተስፋ ታጭተዋል ግን አይለወጡም
 DocType: Manufacturing Settings,Manufacturing Settings,ማኑፋክቸሪንግ ቅንብሮች
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,ኢሜይል በማቀናበር ላይ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 ተንቀሳቃሽ አይ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,የኩባንያ መምህር ውስጥ ነባሪ ምንዛሬ ያስገቡ
 DocType: Stock Entry Detail,Stock Entry Detail,የክምችት Entry ዝርዝር
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,ዕለታዊ አስታዋሾች
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,ዕለታዊ አስታዋሾች
 DocType: Products Settings,Home Page is Products,መነሻ ገጽ ምርቶች ነው
 ,Asset Depreciation Ledger,የንብረት ዋጋ መቀነስ የሒሳብ መዝገብ
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},ጋር ግብር ደንብ ግጭቶች {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},ጋር ግብር ደንብ ግጭቶች {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,አዲስ መለያ ስም
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,ጥሬ እቃዎች አቅርቦት ወጪ
 DocType: Selling Settings,Settings for Selling Module,ሞዱል መሸጥ ቅንብሮች
@@ -4712,8 +4801,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,ንጥል {0} ከአክሲዮን ንጥል መሆን አለበት
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,የሂደት መጋዘን ውስጥ ነባሪ ሥራ
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,የሂሳብ ግብይቶች ነባሪ ቅንብሮች.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,እባክዎ የሰራተኛ ስም ማስቀመጫ ሲስተም በሰብል ሪሶርስ&gt; HR ቅንጅቶች ያዘጋጁ
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,የሚጠበቀው ቀን የቁስ ጥያቄ ቀን በፊት ሊሆን አይችልም
+DocType: Restaurant,Default Tax Template,ነባሪ የግብር አብነት
 DocType: Fees,Student Details,የተማሪ ዝርዝሮች
 DocType: Purchase Invoice Item,Stock Qty,የአክሲዮን ብዛት
 DocType: Employee Loan,Repayment Period in Months,ወራት ውስጥ ብድር መክፈል ክፍለ ጊዜ
@@ -4731,8 +4821,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,ወደ ንጥሎች ሂድ
 DocType: Sales Partner,Partner Type,የአጋርነት አይነት
 DocType: Purchase Taxes and Charges,Actual,ትክክለኛ
+DocType: Restaurant Menu,Restaurant Manager,የምግብ ቤት አደራጅ
 DocType: Authorization Rule,Customerwise Discount,Customerwise ቅናሽ
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,ተግባራት ለ Timesheet.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,ተግባራት ለ Timesheet.
 DocType: Purchase Invoice,Against Expense Account,የወጪ ሒሳብ ላይ
 DocType: Production Order,Production Order,የምርት ትዕዛዝ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,የአጫጫን ማስታወሻ {0} አስቀድሞ ገብቷል
@@ -4740,7 +4831,6 @@
 DocType: Quotation Item,Against Docname,DOCNAME ላይ
 DocType: SMS Center,All Employee (Active),ሁሉም ሰራተኛ (ንቁ)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,አሁን ይመልከቱ
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,ደረሰኝ በራስ-ሰር ይፈጠራል ጊዜ ክፍለ ጊዜ ይምረጡ
 DocType: BOM,Raw Material Cost,ጥሬ የቁሳዊ ወጪ
 DocType: Item Reorder,Re-Order Level,ዳግም-ትዕዛዝ ደረጃ
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,እርስዎ የምርት ትዕዛዞችን ማሳደግ ወይም ትንተና ጥሬ ዕቃዎች ማውረድ ይፈልጋሉ ለዚህም ንጥሎች እና የታቀዱ ብዛት ያስገቡ.
@@ -4753,23 +4843,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,ሪፖርት አይነት ግዴታ ነው
 DocType: Item,Serial Number Series,መለያ ቁጥር ተከታታይ
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},የመጋዘን ረድፍ ውስጥ የአክሲዮን ንጥል {0} ግዴታ ነው {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,ፕሮግራሞችን አክል
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,በችርቻሮ እና የጅምላ
 DocType: Issue,First Responded On,መጀመሪያ ላይ ምላሽ ሰጥተዋል
 DocType: Website Item Group,Cross Listing of Item in multiple groups,በርካታ ቡድኖች ውስጥ ንጥል መስቀል ዝርዝር
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},በጀት ዓመት የመጀመሪያ ቀን እና በጀት ዓመት መጨረሻ ቀን አስቀድሞ በጀት ዓመት ውስጥ ነው የሚዘጋጁት {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,መልቀቂያ ቀን ዘምኗል
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,ክፈል ባች
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,ክፈል ባች
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,በተሳካ ሁኔታ የታረቀ
 DocType: Request for Quotation Supplier,Download PDF,PDF አውርድ
 DocType: Production Order,Planned End Date,የታቀደ የማብቂያ ቀን
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,እባክዎ የጊዜ ሰሌዳውን ያስገቡ
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,ንጥሎች የት ይከማቻሉ.
 DocType: Request for Quotation,Supplier Detail,በአቅራቢዎች ዝርዝር
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},ቀመር ወይም ሁኔታ ውስጥ ስህተት: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},ቀመር ወይም ሁኔታ ውስጥ ስህተት: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,በደረሰኝ የተቀመጠው መጠን
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,የመመዘኛ ክብደት እስከ 100%
 DocType: Attendance,Attendance,መገኘት
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,የአክሲዮን ንጥሎች
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,የአክሲዮን ንጥሎች
 DocType: BOM,Materials,እቃዎች
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","ምልክት አልተደረገበትም ከሆነ, ዝርዝር ተግባራዊ መሆን አለበት የት እያንዳንዱ ክፍል መታከል አለባቸው."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,ምንጭ እና ዒላማ መጋዘን ተመሳሳይ መሆን አይችልም
@@ -4787,6 +4877,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,የተጣራ ጠቅላላ ላይ
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},{0} አይነታ እሴት ክልል ውስጥ መሆን አለበት {1} ወደ {2} ላይ በመጨመር {3} ንጥል ለ {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,{0} ረድፍ ላይ ዒላማ መጋዘን ምርት ትዕዛዝ አንድ አይነት መሆን አለበት
+DocType: Restaurant Reservation,Waitlisted,ተጠባባቂ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,የመገበያያ ገንዘብ አንዳንድ ሌሎች የምንዛሬ በመጠቀም ግቤቶች በማድረጉ በኋላ ሊቀየር አይችልም
 DocType: Vehicle Service,Clutch Plate,ክላች ፕሌት
 DocType: Company,Round Off Account,መለያ ጠፍቷል በዙሪያቸው
@@ -4803,7 +4894,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,አዲስ የሽያጭ ሰው ስም
 DocType: Packing Slip,Gross Weight UOM,ጠቅላላ ክብደት UOM
 DocType: Delivery Note Item,Against Sales Invoice,የሽያጭ ደረሰኝ ላይ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,serialized ንጥል ሲሪያል ቁጥሮችን ያስገቡ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,serialized ንጥል ሲሪያል ቁጥሮችን ያስገቡ
 DocType: Bin,Reserved Qty for Production,ለምርት ብዛት የተያዘ
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,እርስዎ ኮርስ ላይ የተመሠረቱ ቡድኖች በማድረግ ላይ ሳለ ባች ከግምት የማይፈልጉ ከሆነ አልተመረጠም ተወው.
 DocType: Asset,Frequency of Depreciation (Months),የእርጅና ድግግሞሽ (ወራት)
@@ -4814,7 +4905,7 @@
 DocType: Lab Test,Test Group,የሙከራ ቡድን
 DocType: Payment Reconciliation,Receivable / Payable Account,የሚሰበሰብ / ሊከፈል መለያ
 DocType: Delivery Note Item,Against Sales Order Item,የሽያጭ ትዕዛዝ ንጥል ላይ
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},አይነታ እሴት የአይነት ይግለጹ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},አይነታ እሴት የአይነት ይግለጹ {0}
 DocType: Item,Default Warehouse,ነባሪ መጋዘን
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},በጀት ቡድን መለያ ላይ ሊመደብ አይችልም {0}
 DocType: Healthcare Settings,Patient Registration,ታካሚ ምዝገባ
@@ -4843,6 +4934,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,የሽያጭ ሰው
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,በጀት እና ወጪ ማዕከል
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,ባለብዙ ነባሪ የክፍያ ስልት አይፈቀድም
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,ለ
 ,Appointment Analytics,የቀጠሮ ትንታኔ
 DocType: Vehicle Service,Half Yearly,ግማሽ ዓመታዊ
 DocType: Lead,Blog Subscriber,የጦማር የተመዝጋቢ
@@ -4860,7 +4952,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,quot ቆጠራ
 ,BOM Stock Report,BOM ስቶክ ሪፖርት
 DocType: Stock Reconciliation Item,Quantity Difference,የብዛት ለውጥ አምጥተዋል
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,በመስራት ላይ የደመወዝ ክፍያ
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,በመስራት ላይ የደመወዝ ክፍያ
 DocType: Opportunity Item,Basic Rate,መሰረታዊ ደረጃ
 DocType: GL Entry,Credit Amount,የብድር መጠን
 DocType: Cheque Print Template,Signatory Position,ፈራሚ የስራ መደቡ
@@ -4874,12 +4966,12 @@
 DocType: Tax Rule,Tax Rule,ግብር ደንብ
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,የሽያጭ ዑደት ዘመናት በሙሉ አንድ አይነት ተመን ይኑራችሁ
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,ከገቢር የሥራ ሰዓት ውጪ ጊዜ መዝገቦች ያቅዱ.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,ወረፋ ውስጥ ደንበኞች
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,ዶክተር {0} የሐኪም ፕሮግራም የለውም. በሀኪም መምህር ውስጥ ያክሉት
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,ወረፋ ውስጥ ደንበኞች
 DocType: Student,Nationality,ዘር
 ,Items To Be Requested,ንጥሎች ተጠይቋል መሆን ወደ
-DocType: Purchase Order,Get Last Purchase Rate,የመጨረሻው ግዢ ተመን ያግኙ
 DocType: Company,Company Info,የኩባንያ መረጃ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,ይምረጡ ወይም አዲስ ደንበኛ ለማከል
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,ይምረጡ ወይም አዲስ ደንበኛ ለማከል
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,በወጪ ማዕከል አንድ ወጪ የይገባኛል ጥያቄ መያዝ ያስፈልጋል
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ፈንድ (ንብረት) ውስጥ ማመልከቻ
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ይህ የዚህ ሰራተኛ መካከል በስብሰባው ላይ የተመሠረተ ነው
@@ -4887,6 +4979,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,ዴት መለያ
 DocType: Fiscal Year,Year Start Date,ዓመት መጀመሪያ ቀን
 DocType: Attendance,Employee Name,የሰራተኛ ስም
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,የምግብ ቤት ዕቃ ማስገቢያ ንጥል
 DocType: Sales Invoice,Rounded Total (Company Currency),የከበበ ጠቅላላ (የኩባንያ የምንዛሬ)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,የመለያ አይነት ተመርጧል ነው ምክንያቱም ቡድን ጋር በድብቅ አይቻልም.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} ተቀይሯል. እባክዎ ያድሱ.
@@ -4897,6 +4990,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,የሰራተኛ ጥቅማ ጥቅም
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},የታሸጉ የብዛት ረድፍ ውስጥ ንጥል {0} ለ ብዛት ጋር እኩል መሆን አለባቸው {1}
 DocType: Production Order,Manufactured Qty,የሚመረተው ብዛት
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,ደረሰኝ ተፈጥሯል
 DocType: Purchase Receipt Item,Accepted Quantity,ተቀባይነት ብዛት
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},የተቀጣሪ ነባሪ በዓል ዝርዝር ለማዘጋጀት እባክዎ {0} ወይም ኩባንያ {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} ነው አይደለም አለ
@@ -4906,18 +5000,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ረድፍ አይ {0}: መጠን የወጪ የይገባኛል ጥያቄ {1} ላይ የገንዘብ መጠን በመጠባበቅ በላይ ሊሆን አይችልም. በመጠባበቅ መጠን ነው {2}
 DocType: Maintenance Schedule,Schedule,ፕሮግራም
 DocType: Account,Parent Account,የወላጅ መለያ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,ይገኛል
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,ይገኛል
 DocType: Quality Inspection Reading,Reading 3,3 ማንበብ
 ,Hub,ማዕከል
 DocType: GL Entry,Voucher Type,የቫውቸር አይነት
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,የዋጋ ዝርዝር አልተገኘም ወይም ተሰናክሏል አይደለም
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,የዋጋ ዝርዝር አልተገኘም ወይም ተሰናክሏል አይደለም
 DocType: Lab Test,Approved,ጸድቋል
 DocType: Pricing Rule,Price,ዋጋ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',{0} መዘጋጀት አለበት ላይ እፎይታ ሠራተኛ &#39;ግራ&#39; እንደ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',{0} መዘጋጀት አለበት ላይ እፎይታ ሠራተኛ &#39;ግራ&#39; እንደ
+DocType: Hub Settings,Last Sync On,የመጨረሻው አስምር በርቷል
 DocType: Guardian,Guardian,ሞግዚት
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ግምገማ {0} {1} በተሰጠው ቀን ክልል ውስጥ የሰራተኛ የተፈጠሩ
 DocType: Employee,Education,ትምህርት
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,Del
 DocType: Selling Settings,Campaign Naming By,በ የዘመቻ አሰያየም
 DocType: Employee,Current Address Is,የአሁኑ አድራሻ ነው
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,ወርሃዊ የሽያጭ ዒላማ (
@@ -4932,7 +5027,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,የኮርስ ኮድ:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,የወጪ ሒሳብ ያስገቡ
 DocType: Account,Stock,አክሲዮን
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","የረድፍ # {0}: የማጣቀሻ ሰነድ ዓይነት የግዢ ትዕዛዝ አንዱ, የግዥ ደረሰኝ ወይም ጆርናል የሚመዘገብ መሆን አለበት"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","የረድፍ # {0}: የማጣቀሻ ሰነድ ዓይነት የግዢ ትዕዛዝ አንዱ, የግዥ ደረሰኝ ወይም ጆርናል የሚመዘገብ መሆን አለበት"
 DocType: Employee,Current Address,ወቅታዊ አድራሻ
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","በግልጽ ካልተገለጸ በስተቀር ንጥል ከዚያም መግለጫ, ምስል, ዋጋ, ግብር አብነቱን ከ ማዘጋጀት ይሆናል ወዘተ ሌላ ንጥል ተለዋጭ ከሆነ"
 DocType: Serial No,Purchase / Manufacture Details,የግዢ / ማምረት ዝርዝሮች
@@ -4963,7 +5058,7 @@
 DocType: Hub Settings,Hub Settings,ማዕከል ቅንብሮች
 DocType: Project,Gross Margin %,ግዙፍ ኅዳግ %
 DocType: BOM,With Operations,ክወናዎች ጋር
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,ዲግሪ ግቤቶች አስቀድሞ ምንዛሬ ተደርገዋል {0} ድርጅት {1}. ምንዛሬ ጋር አንድ እንደተቀበለ ወይም ተከፋይ ሂሳብ ይምረጡ {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,ዲግሪ ግቤቶች አስቀድሞ ምንዛሬ ተደርገዋል {0} ድርጅት {1}. ምንዛሬ ጋር አንድ እንደተቀበለ ወይም ተከፋይ ሂሳብ ይምረጡ {0}.
 DocType: Asset,Is Existing Asset,ንብረት አሁን ነው
 DocType: Salary Detail,Statistical Component,ስታስቲክስ ክፍለ አካል
 DocType: Warranty Claim,If different than customer address,የደንበኛ አድራሻ የተለየ ከሆነ
@@ -4971,13 +5066,14 @@
 DocType: BOM Operation,BOM Operation,BOM ኦፕሬሽን
 DocType: Purchase Taxes and Charges,On Previous Row Amount,ቀዳሚ ረድፍ መጠን ላይ
 DocType: Student,Home Address,የቤት አድራሻ
+DocType: Item,Has Expiry Date,የፍርድ ቀን አለው
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,ንጥል ተለዋጭ ቅንብሮች.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,አስተላልፍ ንብረት
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,አስተላልፍ ንብረት
 DocType: POS Profile,POS Profile,POS መገለጫ
 DocType: Training Event,Event Name,የክስተት ስም
 DocType: Physician,Phone (Office),ስልክ (ጽ / ቤት)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,መግባት
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},ለ የመግቢያ {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,መግባት
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},ለ የመግቢያ {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","ቅንብር በጀቶችን, ዒላማዎች ወዘተ ወቅታዊ"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,ተለዋዋጭ ስም
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","{0} ንጥል አብነት ነው, በውስጡ ከተለዋጮችዎ አንዱ ይምረጡ"
@@ -4986,7 +5082,7 @@
 DocType: Assessment Plan,Room,ክፍል
 DocType: Purchase Order,Advance Paid,የቅድሚያ ክፍያ የሚከፈልበት
 DocType: Item,Item Tax,ንጥል ግብር
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,አቅራቢው ቁሳዊ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,አቅራቢው ቁሳዊ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,ኤክሳይስ ደረሰኝ
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% ከአንድ ጊዜ በላይ ይመስላል
 DocType: Expense Claim,Employees Email Id,ሰራተኞች ኢሜይል መታወቂያ
@@ -4997,32 +5093,30 @@
 DocType: Program,Program Name,የፕሮግራም ስም
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,ለ ታክስ ወይም ክፍያ ተመልከት
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,ትክክለኛው ብዛት የግዴታ ነው
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} በአሁኑ ጊዜ {1} የአቅጣጫ ጠቋሚ የመቁጠሪያ መለያ ደረጃ አለው, እና ለእዚህ አቅራቢ ግዢ ትዕዛዞች በጥንቃቄ ማስቀመጥ አለበት."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} በአሁኑ ጊዜ {1} የአቅጣጫ ጠቋሚ የመቁጠሪያ መለያ ደረጃ አለው, እና ለእዚህ አቅራቢ ግዢ ትዕዛዞች በጥንቃቄ ማስቀመጥ አለበት."
 DocType: Employee Loan,Loan Type,የብድር አይነት
 DocType: Scheduling Tool,Scheduling Tool,ዕቅድ ማውጫ መሣሪያ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,የዱቤ ካርድ
 DocType: BOM,Item to be manufactured or repacked,ንጥል የሚመረተው ወይም repacked ዘንድ
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,የአክሲዮን ግብይቶች ነባሪ ቅንብሮች.
-DocType: Purchase Invoice,Next Date,ቀጣይ ቀን
 DocType: Employee Education,Major/Optional Subjects,ሜጀር / አማራጭ ጉዳዮች
 DocType: Sales Invoice Item,Drop Ship,ጣል መርከብ
+DocType: Hub Settings,Suspended,ታግዷል
 DocType: Training Event,Attendees,የስብሰባው
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","እዚህ ጋር ስም እና ወላጅ, የትዳር ጓደኛ እና ልጆች ወረራ እንደ ቤተሰብ ዝርዝሮች ጠብቀን መኖር እንችላለን"
 DocType: Academic Term,Term End Date,የሚለው ቃል መጨረሻ ቀን
-DocType: Hub Settings,Seller Name,የሻጭ ስም
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),ግብሮች እና ክፍያዎች ተቀናሽ (የኩባንያ የምንዛሬ)
 DocType: Item Group,General Settings,ጠቅላላ ቅንብሮች
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,ገንዘብና ጀምሮ እና ምንዛሬ ወደ አንድ ዓይነት ሊሆኑ አይችሉም
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,መማሪያዎችን ጨምር
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,ከመቀጠልዎ በፊት ቅጽ አስቀምጥ አለበት
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,እባክዎ መጀመሪያ ኩባንያውን ይምረጡ
 DocType: Item Attribute,Numeric Values,ቁጥራዊ እሴቶች
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,አርማ ያያይዙ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,የክምችት ደረጃዎች
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,የክምችት ደረጃዎች
 DocType: Customer,Commission Rate,ኮሚሽን ተመን
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,በ {1} መካከል {0} የካታኬት ካርዶች በ:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,ተለዋጭ አድርግ
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,ተለዋጭ አድርግ
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,መምሪያ አግድ ፈቃድ መተግበሪያዎች.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","የክፍያ ዓይነት, ተቀበል አንዱ መሆን ይክፈሉ እና የውስጥ ትልልፍ አለበት"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,ትንታኔ
@@ -5037,11 +5131,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,አቢይ Stock
 DocType: Shopping Cart Settings,Show Public Attachments,የህዝብ አባሪዎች አሳይ
 DocType: Packing Slip,Package Weight Details,የጥቅል ክብደት ዝርዝሮች
+DocType: Restaurant Reservation,Reservation Time,ቦታ ማስያዣ ሰዓት
 DocType: Payment Gateway Account,Payment Gateway Account,ክፍያ ፍኖት መለያ
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,የክፍያ ማጠናቀቂያ በኋላ የተመረጠውን ገጽ ተጠቃሚ አቅጣጫ አዙር.
 DocType: Company,Existing Company,አሁን ያለው ኩባንያ
 DocType: Healthcare Settings,Result Emailed,ውጤት ተልኳል
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",ሁሉም ንጥሎች ያልሆኑ የአክሲዮን ንጥሎች ናቸው ምክንያቱም የግብር ምድብ &quot;ጠቅላላ&quot; ወደ ተቀይሯል
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,የእንጥል ኮድ&gt; የንጥል ቡድን&gt; ግሩፕ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,የ CSV ፋይል ይምረጡ
 DocType: Student Leave Application,Mark as Present,አቅርብ ምልክት አድርግበት
 DocType: Supplier Scorecard,Indicator Color,ጠቋሚ ቀለም
@@ -5066,11 +5162,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,የተማሪ ባች አድርግ
 DocType: Fee Schedule,FRQ.,ፈካሚ.
 DocType: Leave Type,Is Carry Forward,አስተላልፍ አኗኗራችሁ ነው
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,BOM ከ ንጥሎች ያግኙ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,BOM ከ ንጥሎች ያግኙ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ሰዓት ቀኖች ሊመራ
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},የረድፍ # {0}: ቀን መለጠፍ የግዢ ቀን ጋር ተመሳሳይ መሆን አለበት {1} ንብረት {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,የተማሪ ተቋም ዎቹ ሆስተል ላይ የሚኖር ከሆነ ይህን ምልክት ያድርጉ.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,ከላይ በሰንጠረዡ ውስጥ የሽያጭ ትዕዛዞች ያስገቡ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,ከላይ በሰንጠረዡ ውስጥ የሽያጭ ትዕዛዞች ያስገቡ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,ደመወዝ ቡቃያ ገብቷል አይደለም
 ,Stock Summary,የአክሲዮን ማጠቃለያ
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,እርስ በርሳችሁ መጋዘን አንድ ንብረት ማስተላለፍ
@@ -5086,5 +5182,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ረድፍ {0}: ዴት ግቤት ጋር ሊገናኝ አይችልም አንድ {1}
 DocType: Journal Entry,Subscription Section,የምዝገባ ክፍል
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,መለያ {0} የለም
+DocType: Training Event,Training Program,የሥልጠና ፕሮግራም
 DocType: Account,Cash,ጥሬ ገንዘብ
 DocType: Employee,Short biography for website and other publications.,ድር ጣቢያ እና ሌሎች ጽሑፎች አጭር የሕይወት ታሪክ.
diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index 823deec..b462c4e 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,طريقة تحصيل الراتب
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,تسجيل
 DocType: Patient,Divorced,مطلقة
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,تمت مزامنة البنود
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,السماح بإضافة البند عدة مرات في معاملة
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,إلغاء الزيارة {0} قبل إلغاء طلب الضمانة
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,منتجات المستهلك
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,المخول بالموافقة على الإجازة
 DocType: Sales Partner,Dealer,تاجر
 DocType: Consultation,Investigations,تحقيقات
+DocType: Restaurant Order Entry,Click Enter To Add,انقر على إنتر للإضافة
 DocType: Employee,Rented,مؤجر
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,ينطبق على العضو
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",لا يمكن إلغاء توقفت أمر الإنتاج، نزع السدادة لأول مرة إلغاء
-DocType: Vehicle Service,Mileage,عدد الأميال
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,هل تريد حقا  تخريد هذه الأصول؟
+DocType: Vehicle Service,Mileage,المسافة المقطوعة
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,هل تريد حقا  تخريد هذه الأصول؟
 DocType: Drug Prescription,Update Schedule,تحديث الجدول الزمني
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,حدد الافتراضي مزود
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},العملة مطلوبة لقائمة الأسعار {0}
@@ -31,23 +32,23 @@
 DocType: Patient Appointment,Check availability,التحقق من الصلاحية
 DocType: Job Applicant,Job Applicant,طالب الوظيفة
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,ويستند هذا على المعاملات مقابل هذا المورد. انظر الجدول الزمني أدناه للاطلاع على التفاصيل
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,لا مزيد من النتائج.
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,القانونية
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,قانوني
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Actual type tax cannot be included in Item rate in row {0}
 DocType: Bank Guarantee,Customer,Customer
 DocType: Purchase Receipt Item,Required By,المطلوبة من قبل
-DocType: Delivery Note,Return Against Delivery Note,العودة ضد تسليم مذكرة
+DocType: Delivery Note,Return Against Delivery Note,البضاعة المعادة مقابل اشعار تسليم
 DocType: Purchase Order,% Billed,% فوترت
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),يجب أن يكون سعر الصرف نفس {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,اسم العميل
 DocType: Vehicle,Natural Gas,غاز طبيعي
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},لا يمكن تسمية الحساب المصرفي باسم {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},لا يمكن تسمية الحساب المصرفي باسم {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,رؤساء (أو مجموعات) التي تتم ضد القيود المحاسبية ويتم الاحتفاظ التوازنات.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),غير المسددة ل {0} لا يمكن أن يكون أقل من الصفر ( {1} )
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,لم يتم تقديم أي قسائم مرتبات مقدمة.
 DocType: Manufacturing Settings,Default 10 mins,افتراضي 10 دقيقة
 DocType: Leave Type,Leave Type Name,اسم نوع الاجازة
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,عرض مفتوح
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,ومن الضروري اتخاذ هذا الإجراء اليوم نفسه من أجل تكرار ذكره أعلاه
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,تم تحديث الترقيم المتسلسل بنجاح
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,دفع
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,قيد دفتر يومية استحقاقي تم تقديمه
@@ -56,19 +57,20 @@
 ,Purchase Order Items To Be Received,تم استلام اصناف امر الشراء
 DocType: SMS Center,All Supplier Contact,بيانات اتصال جميع الموردين
 DocType: Support Settings,Support Settings,إعدادات الدعم
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,لا يمكن أن يكون (تاريخ الانتهاء المتوقع) قبل (تاريخ البدء المتوقع)
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,لا يمكن أن يكون (تاريخ الانتهاء المتوقع) قبل (تاريخ البدء المتوقع)
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,الصف # {0}: تقييم يجب أن يكون نفس {1} {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,طلب إجازة جديدة
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,طلب إجازة جديد
 ,Batch Item Expiry Status,حالة انتهاء صلاحية الدفعة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,خطاب ضمان مصرفي
 DocType: Mode of Payment Account,Mode of Payment Account,طريقة حساب الدفع
 DocType: Consultation,Consultation,تشاور
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,المبيعات والعائدات
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,اظهار المتغيرات
 DocType: Academic Term,Academic Term,الفصل الدراسي
-apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,مادة
+apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,مواد
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +670,Quantity,كمية
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,جدول الحسابات لا يمكن أن يكون فارغا.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),(القروض (الخصوم
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),القروض (الخصوم)
 DocType: Employee Education,Year of Passing,سنة التخرج
 DocType: Item,Country of Origin,بلد المنشأ
 apps/erpnext/erpnext/templates/includes/product_page.js +24,In Stock,متوفر
@@ -79,63 +81,63 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,الرعاية الصحية
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),التأخير في الدفع (أيام)
 DocType: Lab Prescription,Lab Prescription,وصفة المختبر
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,فرز حسب السعر
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,نفقات الصيانة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},الرقم التسلسلي: {0} تم الإشارة إليه من قبل في فاتورة المبيعات: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,فاتورة
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},الرقم التسلسلي: {0} تم الإشارة إليه من قبل في فاتورة المبيعات: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,فاتورة
 DocType: Maintenance Schedule Item,Periodicity,دورية
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,السنة المالية {0} مطلوبة
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,المحاماة
 DocType: Salary Component,Abbr,اسم مختصر
 DocType: Appraisal Goal,Score (0-5),نقاط (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},صف {0} {1} {2} لا يتطابق مع {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},الصف {0}: {1} {2} لا يتطابق مع {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,الصف # {0}
 DocType: Timesheet,Total Costing Amount,المبلغ الكلي التكاليف
 DocType: Delivery Note,Vehicle No,السيارة لا
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,يرجى تحديد قائمة الأسعار
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,يرجى تحديد قائمة الأسعار
 DocType: Accounts Settings,Currency Exchange Settings,إعدادات صرف العملات
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,الصف # {0}:  مستند الدفع مطلوب لإتمام المعاملة
 DocType: Production Order Operation,Work In Progress,التقدم في العمل
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,يرجى تحديد التاريخ
 DocType: Employee,Holiday List,قائمة العطلات
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,يرجى الإعداد المعلم نظام تسمية في المدرسة&gt; إعدادات المدرسة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,محاسب
+DocType: Hub Settings,Selling Price List,قائمة أسعار البيع
 DocType: Patient,Tobacco Current Use,التبغ الاستخدام الحالي
 DocType: Cost Center,Stock User,مخزون العضو
 DocType: Company,Phone No,رقم الهاتف
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,الجداول الزمنية للمقررالتي تم إنشاؤها:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},جديد {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},جديد {0}: # {1}
 ,Sales Partners Commission,عمولة المناديب
 DocType: Purchase Invoice,Rounding Adjustment,تعديل التقريب
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,الاختصار لا يمكن أن يكون أكثر من 5 أحرف
 DocType: Physician Schedule Time Slot,Physician Schedule Time Slot,الطبيب الجدول الزمني فتحة الوقت
 DocType: Payment Request,Payment Request,طلب الدفع
 DocType: Asset,Value After Depreciation,قيمة بعد الاستهلاك
-DocType: Employee,O+,O +
+DocType: Employee,O+,O+
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +18,Related,ذات صلة
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,تاريخ الحضور لا يمكن أن يكون قبل تاريخ إلتحاق الموظف بالعمل
 DocType: Grading Scale,Grading Scale Name,الدرجات اسم النطاق
 DocType: Subscription,Repeat on Day,كرر يوم
 apps/erpnext/erpnext/accounts/doctype/account/account.js +41,This is a root account and cannot be edited.,.هذا حساب جذري و لايمكن تعديله
 DocType: Sales Invoice,Company Address,عنوان الشركة
-DocType: BOM,Operations,عمليات
+DocType: BOM,Operations,العمليات
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},لا يمكن تحديد التخويل على أساس الخصم ل {0}
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",إرفاق ملف csv مع عمودين، واحدة للاسم القديم واحدة للاسم الجديد
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ليس في أي سنة مالية نشطة.
 DocType: Packed Item,Parent Detail docname,الأم تفاصيل docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",المرجع: {0}، رمز العنصر: {1} والعميل: {2}
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,كجم
-DocType: Student Log,Log,سجل
-apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,.فتح للحصول على وظيفة
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} النتيجة المقدمة
+apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,إعلان عن وظيفة شاغرة
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} النتيجة المقدمة
 DocType: Item Attribute,Increment,الزيادة
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,الفترة الزمنية
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,حدد مستودع ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,الدعاية
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,يتم إدخال نفس الشركة أكثر من مرة
 DocType: Patient,Married,متزوج
-apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},لا يجوز لل{0}
+apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},غير مسموح به {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,الحصول على البنود من
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},لا يمكن تحديث المخزون ضد تسليم مذكرة {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},لا يمكن تحديث المخزون ضد تسليم مذكرة {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},المنتج {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,لم يتم إدراج أية عناصر
 DocType: Payment Reconciliation,Reconcile,توفيق
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,صناديق التقاعد
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,تاريخ الاستهلاك التالي لا يمكن أن يكون قبل تاريخ الشراء
 DocType: Consultation,Consultation Date,تاريخ التشاور
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,قائمة المنتجات واكتشاف المستخدمين إربينكست
 DocType: SMS Center,All Sales Person,كل مندوبى البيع
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** التوزيع الشهري ** يساعدك على توزيع  الهدف أو الميزانية على مدى عدة شهور إذا كان لديك موسمية في عملك.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,لا وجدت وحدات
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,هيكل الراتب مفقودة
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,لايوجد بنود
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,هيكل الراتب مفقودة
 DocType: Lead,Person Name,اسم الشخص
 DocType: Sales Invoice Item,Sales Invoice Item,فاتورة مبيعات السلعة
 DocType: Account,Credit,دائن
 DocType: POS Profile,Write Off Cost Center,شطب مركز التكلفة
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""","مثلا ""المدرسة الابتدائية"" أو ""الجامعة"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""","مثلا ""المدرسة الابتدائية"" أو ""الجامعة"""
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,تقارير المخزون
 DocType: Warehouse,Warehouse Detail,تفاصيل المستودع
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},تم تجاوز الحد المسموح به للدين للزبون {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,تاريخ نهاية المدة لا يمكن أن يكون في وقت لاحق من تاريخ نهاية السنة للعام الدراسي الذي يرتبط مصطلح (السنة الأكاديمية {}). يرجى تصحيح التواريخ وحاول مرة أخرى.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""اصل ثابت"" لا يمكن أن يكون غير محدد، حيث يوجد سجل أصول مقابل البند"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""اصل ثابت"" لا يمكن أن يكون غير محدد، حيث يوجد سجل أصول مقابل البند"
 DocType: Vehicle Service,Brake Oil,زيت الفرامل
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,العميل&gt; مجموعة العملاء&gt; الإقليم
 DocType: Tax Rule,Tax Type,نوع الضريبة
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,المبلغ الخاضع للضريبة
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},غير مصرح لك لإضافة أو تحديث الإدخالات قبل {0}
 DocType: BOM,Item Image (if not slideshow),صورة البند (إن لم يكن عرض شرائح)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,الزبون موجود بنفس الاسم
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(سعر الساعة / 60) * وقت العمل الفعلي
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,الصف # {0}: يجب أن يكون نوع المستند المرجعي واحدا من &quot;مطالبة النفقات&quot; أو &quot;دفتر اليومية&quot;
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,حدد مكتب الإدارة
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,الصف # {0}: يجب أن يكون نوع المستند المرجعي واحدا من &quot;مطالبة النفقات&quot; أو &quot;دفتر اليومية&quot;
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,حدد مكتب الإدارة
 DocType: SMS Log,SMS Log,SMS سجل رسائل
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,تكلفة البنود المسلمة
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,عطلة على {0} ليست بين من تاريخ وإلى تاريخ
@@ -175,30 +178,30 @@
 DocType: Quality Inspection,Get Specification Details,الحصول على تفاصيل المواصفات
 apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,قوالب ترتيب الموردين.
 DocType: Lead,Interested,مهتم
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +171,Opening,افتتاح
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +171,Opening,افتتاحي
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},من {0} إلى {1}
 DocType: Item,Copy From Item Group,نسخة من المجموعة السلعة
 DocType: Journal Entry,Opening Entry,فتح دخول
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,حساب الدفع فقط
-DocType: Employee Loan,Repay Over Number of Periods,سداد أكثر من عدد فترات
+DocType: Employee Loan,Repay Over Number of Periods,سداد على عدد فترات
 DocType: Stock Entry,Additional Costs,تكاليف إضافية
 apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,لا يمكن تحويل حساب جرت عليه أي عملية إلى تصنيف مجموعة
 DocType: Lead,Product Enquiry,الإستفسار عن المنتج
 DocType: Academic Term,Schools,مرفق تعليمي
 DocType: School Settings,Validate Batch for Students in Student Group,التحقق من صحة الدفعة للطلاب في مجموعة الطلاب
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},لا يوجد سجل إجازة تم العثور عليه للموظف {0} في {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},لا يوجد سجل ايجازات للموظف {0} عند {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,فضلا ادخل الشركة اولا
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +358,Please select Company first,يرجى تحديد الشركة أولا
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +358,Please select Company first,يرجى اختيار الشركة أولاً
 DocType: Employee Education,Under Graduate,دبلومة
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,الهدف في
 DocType: BOM,Total Cost,التكلفة الكلية لل
 DocType: Journal Entry Account,Employee Loan,قرض الموظف
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,سجل النشاطات:
 DocType: Fee Schedule,Send Payment Request Email,إرسال طلب الدفع البريد الإلكتروني
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,البند {0} غير موجود في النظام أو انتهت صلاحيته
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,البند {0} غير موجود في النظام أو انتهت صلاحيته
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,العقارات
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,كشف حساب
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,الصيدلة
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,الصيدليات
 DocType: Purchase Invoice Item,Is Fixed Asset,هو الأصول الثابتة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +234,"Available qty is {0}, you need {1}",الكمية المتوفرة {0}، تحتاج {1}
 DocType: Expense Claim Detail,Claim Amount,قيمة المطالبة
@@ -210,17 +213,22 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,سجل الادخالات
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,سحب المواد طلب من نوع صناعة بناء على المعايير المذكورة أعلاه
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,تم إلغاء التسجيل بنجاح.
 DocType: Training Result Employee,Grade,درجة
+DocType: Restaurant Table,No of Seats,عدد المقاعد
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","لإضافة موضوع ديناميكي، استخدم علامات جينيا مثل <div style=""""><pre style=""""> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,سلمت من قبل المورد
 DocType: SMS Center,All Contact,جميع جهات الاتصال
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,أمر الإنتاج التي تم إنشاؤها بالفعل لجميع البنود مع مكتب الإدارة
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,أمر الإنتاج تم إنشاؤه بالفعل لجميع البنود في قائمة المواد
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,الراتب السنوي
 DocType: Daily Work Summary,Daily Work Summary,ملخص العمل اليومي
 DocType: Period Closing Voucher,Closing Fiscal Year,إغلاق السنة المالية
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} مجمد
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,يرجى تحديد الشركة الحالية لإنشاء مخطط الحسابات
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} مجمد
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,الرجاء اختيار الشركة الحالية لإنشاء دليل الحسابات
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,مصاريف المخزون
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,حدد مستودع الهدف
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,حدد مستودع الهدف
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,الرجاء إدخال البريد الإلكتروني لجهة الاتصال المفضلة
 DocType: Program Enrollment,School Bus,باص المدرسة
 DocType: Journal Entry,Contra Entry,الدخول كونترا
@@ -235,27 +243,27 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +149,At least one mode of payment is required for POS invoice.,يلزم استخدام طريقة دفع واحدة على الأقل لفاتورة نقطة البيع.
 DocType: Products Settings,Show Products as a List,عرض المنتجات كقائمة
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
-All dates and employee combination in the selected period will come in the template, with existing attendance records","نزيل النموذج، واملء البيانات المناسبة ثم حمل الملف المعدل.
- جميع التواريخ و الموظفيين الموجودة في الفترة المختارة سيأتي في النموذج، مع سجلات الحضور الحالية"
+All dates and employee combination in the selected period will come in the template, with existing attendance records",تحميل قالب، وملء البيانات المناسبة وإرفاق الملف المعدل. جميع التواريخ والجمع بين الموظفين في الفترة المختارة سيأتي في القالب، مع سجلات الحضور القائمة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,البند {0} غير نشط أو تم التوصل إلى نهاية الحياة
+DocType: Student Admission Program,Minimum Age,الحد الإدنى للعمر
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,مثال: الرياضيات الأساسية
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",ل تشمل الضريبة في الصف {0} في معدل الإغلاق ، {1} ويجب أيضا تضمين الضرائب في الصفوف
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,إعدادات وحدة الموارد البشرية
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,إعدادات وحدة الموارد البشرية
 DocType: SMS Center,SMS Center,مركز رسائل SMS
 DocType: Sales Invoice,Change Amount,تغيير المبلغ
-DocType: BOM Update Tool,New BOM,BOM جديدة
+DocType: BOM Update Tool,New BOM,قائمة مواد جديدة
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +117,Please enter Delivery Date,الرجاء إدخال تاريخ التسليم
-DocType: Depreciation Schedule,Make Depreciation Entry,انشئ مدخل استهلاك
+DocType: Depreciation Schedule,Make Depreciation Entry,انشئ قيد استهلاك
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,طلب نوع
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,أنشئ موظف
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,إذاعة
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,إضافة غرف
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),وضع الإعداد بوس (الانترنت / غير متصل)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,تنفيذ
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,تفاصيل التشغيل أنجزت.
 DocType: Serial No,Maintenance Status,حالة الصيانة
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: المورد مطلوب  بالمقابلة بالحساب الدائن {2}
-apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,البنود والتسعير
+apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,البنود والتسعيرات
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},مجموع الساعات: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},(من التاريخ) يجب أن يكون ضمن السنة المالية. بافتراض (من التاريخ) = {0}
 DocType: Drug Prescription,Interval,فترة
@@ -263,7 +271,7 @@
 DocType: Interest,Academics User,المستخدمين الأكادميين
 DocType: Cheque Print Template,Amount In Figure,المبلغ في الشكل
 DocType: Employee Loan Application,Loan Info,معلومات قرض
-apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,خطة للزيارات الصيانة.
+apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,التخطيط لزيارات الصيانة.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,المورد بطاقة الأداء
 DocType: POS Profile,Customer Groups,المجموعات العملاء
 apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,القوائم المالية
@@ -273,8 +281,9 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,يجب ان تكون قائمة الأسعار منطبقه للشراء او البيع
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},تاريخ التركيب لا يمكن أن يكون قبل تاريخ التسليم للبند {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),معدل الخصم على قائمة الأسعار (٪)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,الكيمياء الحيوية
 DocType: Offer Letter,Select Terms and Conditions,اختر الشروط والأحكام
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,القيمة خارج
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,القيمة الخارجه
 DocType: Production Planning Tool,Sales Orders,أوامر البيع
 DocType: Purchase Taxes and Charges,Valuation,تقييم
 ,Purchase Order Trends,اتجهات امر الشراء
@@ -284,7 +293,7 @@
 DocType: SG Creation Tool Course,SG Creation Tool Course,سان جرمان إنشاء ملعب أداة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Insufficient Stock,المالية غير كافية
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,تعطيل تخطيط القدرات وتتبع الوقت
-DocType: Email Digest,New Sales Orders,أوامر المبيعات الجديدة
+DocType: Email Digest,New Sales Orders,طلب مبيعات جديد
 DocType: Bank Guarantee,Bank Account,حساب مصرفي
 DocType: Leave Type,Allow Negative Balance,السماح للرصيد بالسالب
 apps/erpnext/erpnext/projects/doctype/project_type/project_type.py +13,You cannot delete Project Type 'External',لا يمكنك حذف نوع المشروع &#39;خارجي&#39;
@@ -299,47 +308,49 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +51,Update Email Group,تحديث البريد الإلكتروني من مجموعة
 DocType: Sales Invoice,Is Opening Entry,تم افتتاح الدخول
 DocType: Lab Test Template,"If unchecked, the item wont be appear in Sales Invoice, but can be used in group test creation. ",إذا لم يتم تحديده، لن يظهر العنصر في فاتورة المبيعات، ولكن يمكن استخدامه في إنشاء اختبار المجموعة.
-DocType: Customer Group,Mention if non-standard receivable account applicable,أذكر إذا غير القياسية حساب القبض ينطبق
+DocType: Customer Group,Mention if non-standard receivable account applicable,أذكر إذا كان حساب المدينين المطبق ليس حساب المدينين الافتراضي
 DocType: Course Schedule,Instructor Name,اسم المحاضر
 DocType: Supplier Scorecard,Criteria Setup,إعداد المعايير
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,For Warehouse is required before Submit,(الي المخزن) مطلوب قبل التقديم
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,تلقى على
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,وردت في
 DocType: Sales Partner,Reseller,بائع التجزئة
 DocType: Codification Table,Medical Code,القانون الطبي
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.",إذا تم، سيكون لتضمين عناصر غير الأسهم في طلبات المواد.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,يرجى إدخال الشركة
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,الرجاء إدخل الشركة
 DocType: Delivery Note Item,Against Sales Invoice Item,مقابل بند فاتورة المبيعات
 ,Production Orders in Progress,أوامر الإنتاج في التقدم
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,صافي النقد من التمويل
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save",التخزين المحلي كامل، لم ينقذ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save",التخزين المحلي ممتلئ، لم يتم الحفظ
 DocType: Lead,Address & Contact,معلومات الاتصال والعنوان
 DocType: Leave Allocation,Add unused leaves from previous allocations,إضافة الاجازات غير المستخدمة من المخصصات السابقة
 DocType: Sales Partner,Partner website,موقع الشريك
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,اضافة بند
+DocType: Restaurant Order Entry,Add Item,اضافة بند
 DocType: Lab Test,Custom Result,نتيجة مخصصة
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,اسم جهة الاتصال
 DocType: Course Assessment Criteria,Course Assessment Criteria,معايير تقييم المقرر التعليمي
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,أنشئ كشف رواتب للمعايير المذكورة أعلاه.
-DocType: POS Customer Group,POS Customer Group,المجموعة العملاء POS
-DocType: Cheque Print Template,Line spacing for amount in words,تباعد الأسطر المبلغ في الكلمات
+DocType: POS Customer Group,POS Customer Group,مجموعة عملاء نقطة البيع
+DocType: Cheque Print Template,Line spacing for amount in words,سطر فارغ للمبلغ بالحروف
 DocType: Vehicle,Additional Details,تفاصيل اضافية
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Assessment Plan: ,خطة التقييم:
-apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,لا يوجد وصف معين
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,لم يتم اعطاء وصف
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,طلب للشراء.
 DocType: Lab Test,Submitted Date,تاريخ تقديمه
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,ويستند هذا على جداول زمنية خلق ضد هذا المشروع
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,صافي الأجور لا يمكن أن يكون أقل من 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,فقط الموافق علي الإجاز المختار يمكنه الموافقة علي طلب إيجازة
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,تاريخ المغادرة يجب أن يكون أكبر من تاريخ الالتحاق بالعمل
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,الإجازات في السنة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"صف {0}: يرجى التحقق ""هل المسبق ضد حساب {1} إذا كان هذا هو إدخال مسبق."
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,صافي الأجر لا يمكن أن يكون أقل من 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",لإيقاف إرسال إشعارات الخطأ المتكررة من النظام، حددنا الحقل المعطل في الاشتراك
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,فقط المخول بالموافقة علي الإجازات الذي تم اختياره يمكنه تقديم (طلب الاجازة) هذا
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,تاريخ ترك العمل يجب أن يكون بعد تاريخ الالتحاق بالعمل
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,الأجزات في السنة
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"الصف {0}: يرجى اختيار ""دفعة مقدمة"" مقابل الحساب {1} إذا كان هذا الادخال دفعة مقدمة."
 apps/erpnext/erpnext/stock/utils.py +212,Warehouse {0} does not belong to company {1},مستودع {0} لا تنتمي إلى شركة {1}
-DocType: Email Digest,Profit & Loss,خسارة الأرباح
+DocType: Email Digest,Profit & Loss,الخسارة و الأرباح
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,لتر
 DocType: Task,Total Costing Amount (via Time Sheet),إجمالي حساب التكاليف المبلغ (عبر ورقة الوقت)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,يرجى إعداد الطلاب تحت مجموعات الطلاب
 DocType: Item Website Specification,Item Website Specification,البند مواصفات الموقع
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,إجازة محظورة
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},البند {0} قد وصل إلى نهاية عمره في {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},البند {0} قد وصل إلى نهاية عمره في {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,مدخلات البنك
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,سنوي
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,جرد عناصر المخزون
@@ -347,8 +358,7 @@
 DocType: Material Request Item,Min Order Qty,الحد الأدنى من ترتيب الكمية
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,دورة المجموعة الطلابية أداة الخلق
 DocType: Lead,Do Not Contact,عدم الاتصال
-apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,الناس الذين يعلمون في مؤسستك
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,المعرف الفريد لتتبع جميع الفواتير المتكررة. يتم إنشاؤها على تقديم.
+apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,الأشخاص الذين يعلمون في مؤسستك
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,البرنامج المطور
 DocType: Item,Minimum Order Qty,الحد الأدنى لطلب الكمية
 DocType: Pricing Rule,Supplier Type,المورد نوع
@@ -358,77 +368,78 @@
 DocType: Item,Publish in Hub,نشر في المحور
 DocType: Student Admission,Student Admission,قبول الطلاب
 ,Terretory,إقليم
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,تم إلغاء البند {0}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,طلب المواد
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,تم إلغاء البند {0}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,طلب مواد
 DocType: Bank Reconciliation,Update Clearance Date,تحديث تاريخ التخليص
 DocType: Item,Purchase Details,تفاصيل شراء
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"الصنف {0} غير موجودة في ""مواد الخام المتوفره"" الجدول في أمر الشراء {1}"
 DocType: Patient Relation,Relation,علاقة
 DocType: Shipping Rule,Worldwide Shipping,الشحن في جميع أنحاء العالم
 DocType: Patient Relation,Mother,أم
+DocType: Restaurant Reservation,Reservation End Time,وقت انتهاء الحجز
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,طلبات مؤكدة من الزبائن.
 DocType: Purchase Receipt Item,Rejected Quantity,الكمية المرفوضة
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,تم إنشاء طلب الدفع {0}
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,تم إنشاء طلب الدفع {0}
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,حساسية منخفضة
 DocType: Notification Control,Notification Control,إعلام التحكم
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,يرجى تأكيد بمجرد الانتهاء من التدريب الخاص بك
 DocType: Lead,Suggestions,اقتراحات
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,تعيين مجموعة من الحكمة الإغلاق الميزانيات على هذا الإقليم. يمكنك أيضا تضمين الموسمية عن طريق تعيين التوزيع.
 DocType: Healthcare Settings,Create documents for sample collection,إنشاء مستندات لجمع العينات
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +276,Payment against {0} {1} cannot be greater than Outstanding Amount {2},دفع ضد {0} {1} لا يمكن أن يكون أكبر من قيمة المعلقة {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +276,Payment against {0} {1} cannot be greater than Outstanding Amount {2},الدفعة مقابل {0} {1} لا يمكن أن تكون أكبر من المبلغ القائم {2}
 DocType: Supplier,Address HTML,عنوان HTML
 DocType: Lead,Mobile No.,رقم الجوال
 DocType: Maintenance Schedule,Generate Schedule,إنشاء جدول
 DocType: Purchase Invoice Item,Expense Head,عنوان المصروف
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Please select Charge Type first,الرجاء اختيار نوع التهمة الأولى
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Please select Charge Type first,يرجى تحديد نوع الرسوم أولا
 DocType: Student Group Student,Student Group Student,مجموعة طالب طالب
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,آخر
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,اخير
 DocType: Vehicle Service,Inspection,فحص
 DocType: Supplier Scorecard Scoring Standing,Max Grade,ماكس الصف
-DocType: Email Digest,New Quotations,تسعيرات جديدة
+DocType: Email Digest,New Quotations,عرض مسعر جديد
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,ارسال كشف الراتب إلي البريد الاكتروني المفضل من قبل الموظف
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,سيتم تعيين أول المخول بالموافقة على الإجازة في القائمة علي انه الافتراضي
 DocType: Tax Rule,Shipping County,مقاطعة البريدية
-apps/erpnext/erpnext/config/desktop.py +158,Learn,تعلم
-DocType: Asset,Next Depreciation Date,الاستهلاك المقبل التاريخ
+apps/erpnext/erpnext/config/desktop.py +159,Learn,تعلم
+DocType: Asset,Next Depreciation Date,تاريخ االاستهالك التالي
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,تكلفة النشاط لكل موظف
 DocType: Accounts Settings,Settings for Accounts,إعدادات الحسابات
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +663,Supplier Invoice No exists in Purchase Invoice {0},المورد فاتورة لا يوجد في شراء الفاتورة {0}
-apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,ادارة شجرة رجل المبيعات
+apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,إدارة هيكلية موظفي المبيعات.
 DocType: Job Applicant,Cover Letter,محتويات الرسالة المرفقة
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,الشيكات المعلقة والودائع لمسح
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,الشيكات و الإيداعات المعلقة لتوضيح او للمقاصة
 DocType: Item,Synced With Hub,مزامن مع المحور
 DocType: Vehicle,Fleet Manager,مدير قافلة المركبات
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},صف # {0}: {1} لا يمكن أن يكون سلبيا لمادة {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,كلمة مرور خاطئة
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,كلمة مرور خاطئة
 DocType: Item,Variant Of,البديل من
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"الكمية المصنعة لا يمكن أن تكون أكبر من ""الكمية لتصنيع"""
 DocType: Period Closing Voucher,Closing Account Head,اقفال حساب المركز الرئيسي
 DocType: Employee,External Work History,سجل العمل الخارجي
 DocType: Physician,Time per Appointment,الوقت لكل موعد
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Circular Reference Error
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Circular Reference Error
 DocType: Appointment Type,Is Inpatient,هو المرضى الداخليين
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,اسم Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,بالحروف (تصدير) سوف تكون مرئية بمجرد حفظ اشعار التسليم.
 DocType: Cheque Print Template,Distance from left edge,المسافة من الحافة اليسرى
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} وحدات من [{1}] (# نموذج / البند / {1}) وجدت في [{2}] (# نموذج / مخزن/ {2})
 DocType: Lead,Industry,صناعة
-DocType: Employee,Job Profile,الملف الوظيفي
+DocType: Employee,Job Profile,نبذه عن الوظيفه
 DocType: BOM Item,Rate & Amount,معدل وكمية
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,يرجى إعداد سلسلة الترقيم للحضور عن طريق الإعداد&gt; سلسلة الترقيم
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,يستند ذلك إلى معامالت ضد هذه الشركة. انظر الجدول الزمني أدناه للحصول على التفاصيل
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,إبلاغ عن طريق البريد الإلكتروني على خلق مادة التلقائي طلب
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,مقاومة
 DocType: Journal Entry,Multi Currency,متعدد العملات
 DocType: Payment Reconciliation Invoice,Invoice Type,نوع الفاتورة
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,العميل&gt; مجموعة العملاء&gt; الإقليم
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,اشعار تسليم
 DocType: Consultation,Encounter Impression,لقاء الانطباع
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,إعداد الضرائب
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,تكلفة الأصول المباعة
-apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,لقد تم تعديل دفع الدخول بعد سحبها. يرجى تسحبه مرة أخرى.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} ادخل مرتين في ضريبة البند
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,ملخص لهذا الأسبوع والأنشطة المعلقة
+apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,تم تعديل تدوين مدفوعات بعد سحبه. يرجى سحبه مرة أخرى.
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} ادخل مرتين في ضريبة البند
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,ملخص لهذا الأسبوع والأنشطة المعلقة
 DocType: Student Applicant,Admitted,قُبل
-DocType: Workstation,Rent Cost,الإيجار التكلفة
+DocType: Workstation,Rent Cost,تكلفة الإيجار
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,القيمة بعد الاستهلاك
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,الأحداث القادمة
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +85,Please select month and year,الرجاء اختيار الشهر والسنة
@@ -440,36 +451,35 @@
 DocType: Shipping Rule,Valid for Countries,صالحة للبلدان
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"هذا البند هو قالب ولا يمكن استخدامها في المعاملات المالية. سيتم نسخ سمات البند أكثر في المتغيرات ما لم يتم تعيين ""لا نسخ '"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,إجمالي الطلب المعتبر
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",المسمى الوظيفي للموظف (مثل الرئيس التنفيذي او مدير الحسابات الخ.. )
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).",المسمى الوظيفي للموظف (مثل الرئيس التنفيذي او مدير الحسابات الخ.. )
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,المعدل الذي يتم تحويل العملة إلى عملة الأساس العملاء العميل
 DocType: Course Scheduling Tool,Course Scheduling Tool,أداة الجدول الزمني للمقرر التعليمي
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},الصف # {0}: لا يمكن أن يتم شراء فاتورة مقابل الأصول الموجودة {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[عاجل] حدث خطأ أثناء إنشاء٪ s متكررة ل٪ s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[عاجل] حدث خطأ أثناء إنشاء٪ s متكررة ل٪ s
 DocType: Item Tax,Tax Rate,معدل الضريبة
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} تم تخصيصه بالفعل للموظف {1} للفترة {2} إلى {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,اختر البند
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,اختر البند
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,فاتورة الشراء {0} تم ترحيلها من قبل
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},الصف # {0}: لا دفعة ويجب أن يكون نفس {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,تحويل الي تصنيف (غير المجموعه)
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,رقم الباتش للبند
 DocType: C-Form Invoice Detail,Invoice Date,تاريخ الفاتورة
 DocType: GL Entry,Debit Amount,مبلغ مدين
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},يمكن أن يكون هناك سوى 1 في حساب الشركة في {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,يرجى الإطلاع على المرفقات
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},يمكن أن يكون هناك سوى 1 في حساب الشركة في {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,يرجى الإطلاع على المرفقات
 DocType: Purchase Order,% Received,تم استلام٪
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,إنشاء مجموعات الطلاب
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,الإعداد الكامل بالفعل !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,الإعداد الكامل بالفعل !
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,ملاحظة الائتمان المبلغ
 DocType: Setup Progress Action,Action Document,وثيقة الإجراء
 ,Finished Goods,السلع تامة الصنع
 DocType: Delivery Note,Instructions,تعليمات
 DocType: Quality Inspection,Inspected By,تفتيش من قبل
 DocType: Maintenance Visit,Maintenance Type,صيانة نوع
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} غير مسجل في الدورة {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,رمز البند&gt; مجموعة المنتجات&gt; العلامة التجارية
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} غير مسجل في الدورة {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},رقم المسلسل {0} لا تنتمي إلى التسليم ملاحظة {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext تجريبي
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,إضافة بنود
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,إضافة بنود
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,معلمة البند التفتيش الجودة
 DocType: Leave Application,Leave Approver Name,أسم الموافق علي الاجازة
 DocType: Depreciation Schedule,Schedule Date,جدول التسجيل
@@ -489,7 +499,7 @@
 DocType: Salary Slip Timesheet,Working Hours,ساعات العمل
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,تغيير رقم تسلسل بدء / الحالي من سلسلة الموجودة.
 DocType: Dosage Strength,Strength,قوة
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,إنشاء زبون جديد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,إنشاء زبون جديد
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",إذا استمر ظهور قواعد تسعير المتعددة، يطلب من المستخدمين تعيين الأولوية يدويا لحل التعارض.
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,إنشاء أمر شراء
 ,Purchase Register,سجل شراء
@@ -499,16 +509,16 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) يجب أن يمتلك صلاحية (المخول بالموافقة علي الاجازات)
 DocType: Purchase Receipt,Vehicle Date,مركبة التسجيل
 DocType: Student Log,Medical,طبي
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,السبب لفقدان
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,قيادي المالك لا يمكن أن يكون نفس الرصاص
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,سبب الفقدان
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,(مالك الزبون المحتمل) لا يمكن أن يكون نفسه (الزبون المحتمل)
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,القيمة المخصص لا يمكن ان تكون أكبر من القيمة غير المعدلة
-DocType: Announcement,Receiver,المتلقي
+DocType: Announcement,Receiver,المستلم
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},مغلق محطة العمل في التواريخ التالية وفقا لقائمة عطلة: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,الفرص
 DocType: Lab Test Template,Single,أعزب
 DocType: Salary Slip,Total Loan Repayment,إجمالي سداد القروض
 DocType: Account,Cost of Goods Sold,تكلفة البضاعة المباعة
-DocType: Purchase Invoice,Yearly,سنويا
+DocType: Subscription,Yearly,سنويا
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,الرجاء إدخال مركز التكلفة
 DocType: Drug Prescription,Dosage,جرعة
 DocType: Journal Entry Account,Sales Order,طلبات العملاء
@@ -520,17 +530,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +209,Classrooms/ Laboratories etc where lectures can be scheduled.,الفصول الدراسية / المختبرات وغيرها حيث يمكن جدولة المحاضرات.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,الرجاء إدخال اسم الشركة اولاً
 DocType: Purchase Invoice,Supplier Name,اسم المورد
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,قراءة دليل ERPNext
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,اقرا دليل مستخدم  ERPNext
 DocType: Account,Is Group,هل مجموعة
 DocType: Email Digest,Pending Purchase Orders,اوامر الشراء المعلقة
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,حدد الرقم التسلسلي بناءً على FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,التحقق من رقم الفتورة المرسلة من المورد مميز (ليس متكرر)
 DocType: Vehicle Service,Oil Change,تغيير زيت
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','الى الحالة  رقم' لا يمكن أن يكون أقل من 'من الحالة رقم'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Non Profit,غير ربحي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Non Profit,غير ربحية
 DocType: Production Order,Not Started,لم تبدأ
 DocType: Lead,Channel Partner,شريك القناة
-DocType: Account,Old Parent,العمر الرئيسي
+DocType: Account,Old Parent,الحساب الأب السابق
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,حقل إلزامي - السنة الأكاديمية
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,تخصيص النص الاستهلالي الذي يذهب كجزء من أن البريد الإلكتروني. كل معاملة له نص منفصل استهلالي.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +157,Please set default payable account for the company {0},يرجى تعيين الحساب الافتراضي المستحق للشركة {0}
@@ -538,7 +548,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,إعدادات العالمية لجميع عمليات التصنيع.
 DocType: Accounts Settings,Accounts Frozen Upto,حسابات مجمدة حتى
 DocType: SMS Log,Sent On,ارسلت في
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,تم اختيار الخاصية {0} عدة مرات في جدول الخصائص
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,تم اختيار الخاصية {0} عدة مرات في جدول الخصائص
 DocType: HR Settings,Employee record is created using selected field. ,يتم إنشاء سجل الموظف باستخدام الحقل المحدد.
 DocType: Sales Order,Not Applicable,لا ينطبق
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,العطلة الرئيسية
@@ -563,13 +573,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,مجموع الإجازات المخصصة إلزامية
 DocType: Patient,AB Positive,أب إيجابي
 DocType: Job Opening,Description of a Job Opening,وصف وظيفة شاغرة
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,الأنشطة في انتظار لهذا اليوم
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,الأنشطة في انتظار لهذا اليوم
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,سجل الحضور.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,مكون الرواتب لكشف المرتبات على أساس الجدول الزمني.
 DocType: Sales Order Item,Used for Production Plan,تستخدم لخطة الإنتاج
 DocType: Employee Loan,Total Payment,إجمالي الدفعة
 DocType: Manufacturing Settings,Time Between Operations (in mins),الوقت بين العمليات (في دقيقة)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} تم إلغاؤه لذلك لا يمكن إكمال الإجراء
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} تم إلغاؤه لذلك لا يمكن إكمال الإجراء
 DocType: Customer,Buyer of Goods and Services.,مشتري السلع والخدمات.
 DocType: Journal Entry,Accounts Payable,ذمم دائنة
 DocType: Patient,Allergies,الحساسية
@@ -579,34 +589,36 @@
 DocType: Pricing Rule,Valid Upto,صالحة لغاية
 DocType: Training Event,Workshop,ورشة عمل
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,تحذير أوامر الشراء
-apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,قائمة قليلة من الزبائن. يمكن أن تكون المنظمات أو الأفراد.
+apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,أدرج بعض من زبائنك. ويمكن أن تكون منظمات أو أفراد.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,يكفي لبناء أجزاء
+DocType: POS Profile User,POS Profile User,نقاط البيع الشخصية الملف الشخصي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,دخل مباشر
 DocType: Patient Appointment,Date TIme,تاريخ التاريخ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",لا يمكن الفلتره علي اساس (الحساب)، إذا تم وضعه في مجموعة على اساس (حساب)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,موظف إداري
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,الرجاء تحديد الدورة التدريبية
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,الرجاء تحديد الدورة التدريبية
 DocType: Codification Table,Codification Table,جدول التدوين
 DocType: Timesheet Detail,Hrs,ساعات
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,يرجى تحديد الشركة
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,يرجى اختيار الشركة
 DocType: Stock Entry Detail,Difference Account,حساب الفرق
 DocType: Purchase Invoice,Supplier GSTIN,مورد غستين
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,لا يمكن إغلاق المهمة لان المهمة التابعة لها {0} غير مغلقة.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,من فضلك ادخل مستودع لل والتي سيتم رفع طلب المواد
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,لا يمكن إغلاق المهمة لان المهمة التابعة لها {0} غير مغلقة.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,الرجاء إدخال المخزن الذي سيتم رفع طلب المواد اليه
 DocType: Production Order,Additional Operating Cost,تكاليف تشغيل  اضافية
 DocType: Lab Test Template,Lab Routine,مختبر الروتينية
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,مستحضرات التجميل
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items",لدمج ، يجب أن يكون نفس الخصائص التالية ل كلا البندين
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items",لدمج ، يجب أن يكون نفس الخصائص التالية ل كلا البندين
 DocType: Shipping Rule,Net Weight,الوزن الصافي
 DocType: Employee,Emergency Phone,هاتف حالات الطوارئ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,يشترى
 ,Serial No Warranty Expiry,المسلسل لا عودة انتهاء الاشتراك
-DocType: Sales Invoice,Offline POS Name,حاليا اسم POS
+DocType: Sales Invoice,Offline POS Name,الاسم على نقطة البيع
 apps/erpnext/erpnext/utilities/user_progress.py +159,Student Application,تطبيق الطالب
-apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,يرجى تحديد الدرجة لعتبة 0٪
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,يرجى تحديد المستوى للحد 0%
 DocType: Sales Order,To Deliver,لتسليم
 DocType: Purchase Invoice Item,Item,بند
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,المسلسل أي بند لا يمكن أن يكون جزء
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,حساسية عالية
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,المسلسل أي بند لا يمكن أن يكون جزء
 DocType: Journal Entry,Difference (Dr - Cr),الفرق ( الدكتور - الكروم )
 DocType: Account,Profit and Loss,الربح والخسارة
 DocType: Patient,Risk Factors,عوامل الخطر
@@ -615,7 +627,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,إدارة التعاقد من الباطن
 DocType: Vital Signs,Body Temperature,درجة حرارة الجسم
 DocType: Project,Project will be accessible on the website to these users,والمشروع أن تكون متاحة على الموقع الإلكتروني لهؤلاء المستخدمين
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,تعريف نوع المشروع.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,تعريف نوع المشروع.
 DocType: Supplier Scorecard,Weighting Function,وظيفة الترجيح
 DocType: Physician,OP Consulting Charge,أوب كونسولتينغ تشارج
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,إعداد الخاص بك
@@ -629,7 +641,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,لا يمكن أن تكون الزيادة 0
 DocType: Production Planning Tool,Material Requirement,متطلبات المواد
 DocType: Company,Delete Company Transactions,حذف العمليات التجارية للشركة
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,إشارة لا ومرجعية التسجيل إلزامي لالمعاملات المصرفية
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,رقم المرجع و تاريخ المرجع إلزامي للمعاملة المصرفية
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,إضافة / تعديل الضرائب والرسوم
 DocType: Payment Entry Reference,Supplier Invoice No,رقم فاتورة المورد
 DocType: Territory,For reference,للرجوع إليها
@@ -637,12 +649,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions",لا يمكن حذف الرقم التسلسلي {0}، لانه يتم استخدامها في قيود المخزون
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),إغلاق (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,مرحبا
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,نقل العنصر
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,نقل بند
 DocType: Serial No,Warranty Period (Days),فترة الضمان (أيام)
 DocType: Installation Note Item,Installation Note Item,ملاحظة تثبيت الإغلاق
 DocType: Production Plan Item,Pending Qty,الكمية التي قيد الانتظار
 DocType: Budget,Ignore,تجاهل
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} غير نشطة
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} غير نشطة
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,أبعاد الاختيار الإعداد للطباعة
 DocType: Salary Slip,Salary Slip Timesheet,كشف راتب معتمد علي سجل التوقيت
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,المورد مستودع إلزامية ل إيصال الشراء التعاقد من الباطن
@@ -650,16 +662,16 @@
 DocType: Sales Invoice,Total Commission,مجموع العمولة
 DocType: Pricing Rule,Sales Partner,شريك المبيعات
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,جميع سكوريكاردز المورد.
-DocType: Buying Settings,Purchase Receipt Required,مطلوب إيصال الشراء
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,تقييم أسعار إلزامي إذا فتح المخزون دخل
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,لا توجد في جدول الفاتورة السجلات
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,يرجى تحديد الشركة وحزب النوع الأول
+DocType: Buying Settings,Purchase Receipt Required,إيصال استلام المشتريات مطلوب
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,تقييم أسعار إلزامي إذا فتح المخزون دخل
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,لم يتم العثور على أي سجلات في جدول الفواتير
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,يرجى تحديد الشركة ونوع الطرف المعني أولا
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,مالي / سنة محاسبية.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,القيم المتراكمة
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged",عذراَ ، ارقام المسلسل لا يمكن دمجها
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +63,Territory is Required in POS Profile,مطلوب الإقليم في الملف الشخصي نقاط البيع
 DocType: Supplier,Prevent RFQs,منع رفق
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,أنشئ طلب بيع
+apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,أنشاء طلب مبيعات
 DocType: Project Task,Project Task,عمل مشروع
 ,Lead Id,معرف مبادرة البيع
 DocType: C-Form Invoice Detail,Grand Total,المجموع الإجمالي
@@ -668,27 +680,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +4,Item Cart,سلة البنود
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +38,Fiscal Year Start Date should not be greater than Fiscal Year End Date,يجب ألا يكون تاريخ بداية السنة المالية قبل تاريخ نهاية السنة المالية
 DocType: Issue,Resolution,قرار
-DocType: C-Form,IV,رابعا
+DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +76,Delivered: {0},تسليم: {0}
-DocType: Expense Claim,Payable Account,حساب المستحق
+DocType: Expense Claim,Payable Account,حساب الدائنين
 DocType: Payment Entry,Type of Payment,نوع الدفع
 DocType: Sales Order,Billing and Delivery Status,الفوترة والدفع الحالة
 DocType: Job Applicant,Resume Attachment,السيرة الذاتية
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,العملاء المكررين
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,الزبائن المكررين
 DocType: Leave Control Panel,Allocate,تخصيص
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +804,Sales Return,مبيعات المعاده
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,ملاحظة: مجموع الاجازات المخصصة {0} لا ينبغي أن يكون أقل من الاجازات الموافق عليها {1} للفترة
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,ملاحظة: مجموع الإجازات المخصصة {0} لا ينبغي أن تكون أقل من الإجازات المعتمدة بالفعل {1} للفترة
 ,Total Stock Summary,ملخص إجمالي المخزون
-DocType: Announcement,Posted By,منشور من طرف
+DocType: Announcement,Posted By,منشور من قبل
 DocType: Item,Delivered by Supplier (Drop Ship),سلمت من قبل مورد (هبوط السفينة)
 DocType: Healthcare Settings,Confirmation Message,رسالة تأكيد
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,قاعدة بيانات الزبائن المحتملين.
 DocType: Authorization Rule,Customer or Item,زبون أو بند
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,قاعدة بيانات الزبائن
-DocType: Quotation,Quotation To,تسعيرة إلى
+DocType: Quotation,Quotation To,مناقصة لـ
 DocType: Lead,Middle Income,الدخل المتوسط
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),افتتاح (الكروم )
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,وحدة القياس الافتراضية للالبند {0} لا يمكن تغيير مباشرة لأنك قدمت بالفعل بعض المعاملات (s) مع UOM آخر. سوف تحتاج إلى إنشاء عنصر جديد لاستخدام افتراضي مختلف UOM.
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),افتتاحي (Cr)
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,وحدة القياس الافتراضية للالبند {0} لا يمكن تغيير مباشرة لأنك قدمت بالفعل بعض المعاملات (s) مع UOM آخر. سوف تحتاج إلى إنشاء عنصر جديد لاستخدام افتراضي مختلف UOM.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,لا يمكن أن يكون القيمة المخصص سالبة
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,يرجى تعيين الشركة
 DocType: Purchase Order Item,Billed Amt,فوترة AMT
@@ -698,18 +710,19 @@
 DocType: Employee Loan Application,Total Payable Interest,مجموع الفوائد الدائنة
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +59,Total Outstanding: {0},المجموع: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,فاتورة المبيعات الجدول الزمني
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},مطلوب المرجعية لا والمراجع التسجيل لل {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},رقم المرجع وتاريخ المرجع مطلوب ل {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,اختار الحساب الذي سوف تدفع منه
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll",إنشاء سجلات موظف لإدارة الإجازات والمطالبة بالنفقات والرواتب
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,فترة الوصفة الطبية
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,الكتابة الاقتراح
+DocType: Restaurant Reservation,Restaurant Reservation,حجز المطعم
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,تجهيز العروض
 DocType: Payment Entry Deduction,Payment Entry Deduction,دفع الاشتراك خصم
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,مندوب مبيعات آخر {0} موجود بنفس رقم هوية الموظف
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests",إذا تحققت، والمواد الخام للعناصر التي هي ستدرج في طلبات المواد المتعاقد عليها دون
-apps/erpnext/erpnext/config/healthcare.py +61,Masters,البيانات الرئيسية
-DocType: Assessment Plan,Maximum Assessment Score,نتيجة تقييم القصوى
+apps/erpnext/erpnext/config/healthcare.py +61,Masters,الماستر(البيانات الرئيسية)
+DocType: Assessment Plan,Maximum Assessment Score,النتيجة القصوى للتقييم
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,تواريخ عملية البنك التحديث
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,تتبع الوقت
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,تتبع الوقت
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,مكره للارسال
 DocType: Fiscal Year Company,Fiscal Year Company,السنة المالية للشركة
 DocType: Packing Slip Item,DN Detail,DN التفاصيل
@@ -717,8 +730,9 @@
 DocType: Timesheet,Billed,توصف
 DocType: Batch,Batch Description,وصف الباتش
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,إنشاء مجموعات الطلاب
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.",حساب بوابة الدفع غير مخلوق، يرجى إنشاء واحد يدويا.
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.",حساب بوابة الدفع لم يتم انشاءه، يرجى إنشاء واحد يدويا.
 DocType: Supplier Scorecard,Per Year,كل سنة
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,غير مؤهل للقبول في هذا البرنامج حسب دوب
 DocType: Sales Invoice,Sales Taxes and Charges,الضرائب على المبيعات والرسوم
 DocType: Employee,Organization Profile,ملف المؤسسة
 DocType: Vital Signs,Height (In Meter),الارتفاع (بالمتر)
@@ -741,10 +755,10 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,صافي التغير في المخزون
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,إدارة قروض الموظفين
 DocType: Employee,Passport Number,رقم جواز السفر
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,العلاقة مع Guardian2
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,العلاقة مع ولي الامر 2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +120,Manager,مدير
 DocType: Payment Entry,Payment From / To,الدفع من / إلى
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +127,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},الحد الائتماني الجديد هو أقل من المبلغ المستحق الحالي للعميل. الحد الائتماني يجب أن يكون على الأقل {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +127,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},الحد المسموح به للدين الجديد أقل من المبلغ  الحالي المستحق على الزبون. يجب أن يكون الحد المسموح به للدين على الأقل {0}
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'على أساس' و 'المجموعة حسب' لا يمكن أن يكونا نفس الشيء
 DocType: Sales Person,Sales Person Targets,اهداف رجل المبيعات
 DocType: Installation Note,IN-,في-
@@ -754,7 +768,7 @@
 DocType: Student Batch Name,Batch Name,اسم الدفعة
 DocType: Fee Validity,Max number of visit,الحد الأقصى لعدد الزيارات
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,الجدول الزمني الانشاء:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},الرجاء تعيين النقدية الافتراضي أو حساب مصرفي في طريقة الدفع {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},يرجى تعيين حساب النقد أو الحساب المصرفيالافتراضي لطريقة الدفع {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,سجل
 DocType: GST Settings,GST Settings,إعدادات غست
 DocType: Selling Settings,Customer Naming By,تسمية العملاء بواسطة
@@ -769,32 +783,32 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests,اختبارات المختبر
 DocType: Quotation Item,Item Balance,البند الميزان
 DocType: Sales Invoice,Packing List,قائمة التعبئة
-apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,تحديد موردين لأمر الشراء.
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,النشر
-DocType: Activity Cost,Projects User,مشاريع العضو
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,اوامر شراء تم اصدارها للموردين.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,نشر
+DocType: Activity Cost,Projects User,مستخدم مشاريع
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,مستهلك
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +157,{0}: {1} not found in Invoice Details table,{0}: {1} غير موجود في جدول تفاصيل الفواتير
-DocType: Company,Round Off Cost Center,جولة قبالة مركز التكلفة
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +227,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,صيانة زيارة {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
+DocType: Company,Round Off Cost Center,مركز التكلفة الخاص بالتقريب
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +227,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,يجب إلغاء زيارة الصيانة {0} قبل إلغاء طلب المبيعات
 DocType: Item,Material Transfer,لنقل المواد
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,تعذر العثور على مسار ل
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +211,Opening (Dr),افتتاح ( الدكتور )
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},يجب أن يكون الطابع الزمني بالإرسال بعد {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +211,Opening (Dr),افتتاحي  (Dr)
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},الطابع الزمني للترحيل يجب أن يكون بعد {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,لجعل المستندات المتكررة
 ,GST Itemised Purchase Register,غست موزعة شراء سجل
 DocType: Employee Loan,Total Interest Payable,مجموع الفائدة الواجب دفعها
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,الضرائب التكلفة هبطت والرسوم
 DocType: Production Order Operation,Actual Start Time,الفعلي وقت البدء
-DocType: BOM Operation,Operation Time,عملية الوقت
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,إنهاء
+DocType: BOM Operation,Operation Time,زمن التشغيل
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,إنهاء
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,الاساسي
 DocType: Timesheet,Total Billed Hours,مجموع الساعات وصفت
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,شطب المبلغ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,شطب المبلغ
 DocType: Leave Block List Allow,Allow User,تسمح للمستخدم
 DocType: Journal Entry,Bill No,رقم الفاتورة
 DocType: Company,Gain/Loss Account on Asset Disposal,حساب الربح / الخسارة الخاص بالتخلص من الأصول
 DocType: Vehicle Log,Service Details,تفاصيل الخدمة
-DocType: Purchase Invoice,Quarterly,فصلي
+DocType: Subscription,Quarterly,فصلي
 DocType: Lab Test Template,Grouped,مجمعة
 DocType: Selling Settings,Delivery Note Required,ملاحظة التسليم مطلوبة
 DocType: Bank Guarantee,Bank Guarantee Number,رقم ضمان البنك
@@ -803,42 +817,44 @@
 DocType: Student Attendance,Student Attendance,الحضور طالب
 DocType: Sales Invoice Timesheet,Time Sheet,ورقة الوقت
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush المواد الخام مبني على
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,يرجى إدخال تفاصيل البند
 DocType: Interest,Interest,فائدة
-apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,قبل المبيعات
+apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,قبل البيع
 DocType: Purchase Receipt,Other Details,تفاصيل أخرى
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,نموذج الاختبار
+DocType: Restaurant Order Entry Item,Served,خدم
 DocType: Account,Accounts,حسابات
-DocType: Vehicle,Odometer Value (Last),قيمة عداد المسافات (الأخيرة)
+DocType: Vehicle,Odometer Value (Last),قراءة عداد المسافات (الأخيرة)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,نماذج من معايير بطاقة الأداء المورد.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Marketing,تسويق
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +290,Payment Entry is already created,يتم إنشاء دفع الاشتراك بالفعل
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Marketing,التسويق
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +290,Payment Entry is already created,تدوين المدفوعات تم انشاؤه بالفعل
 DocType: Request for Quotation,Get Suppliers,الحصول على الموردين
 DocType: Purchase Receipt Item Supplied,Current Stock,المخزون الحالية
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} does not linked to Item {2},الصف # {0}: الأصول {1} لا ترتبط البند {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,معاينة كشف الراتب
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,الحساب {0} تم إدخاله عدة مرات
 DocType: Account,Expenses Included In Valuation,المصروفات متضمنة في تقييم السعر
-DocType: Hub Settings,Seller City,مدينة البائع
 ,Absent Student Report,تقرير طالب متغيب
-DocType: Email Digest,Next email will be sent on:,سيتم إرسال البريد الإلكتروني التالي على:
+DocType: Email Digest,Next email will be sent on:,سيتم إرسال البريد الإلكترونية التالي في :
 DocType: Offer Letter Term,Offer Letter Term,تقديم رسالة الأجل
 DocType: Supplier Scorecard,Per Week,في الاسبوع
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,البند لديه متغيرات.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,البند لديه متغيرات.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,إجمالي الطالب
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,البند {0} لم يتم العثور على
 DocType: Bin,Stock Value,قيمة المخزون
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,سيتم إنشاء سجلات الرسوم في الخلفية. في حالة وجود أي خطأ سيتم تحديث رسالة الخطأ في الجدول.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,الشركة {0} غير موجودة
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} له صلاحية الرسوم حتى {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} له صلاحية الرسوم حتى {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,نوع الشجرة
 DocType: BOM Explosion Item,Qty Consumed Per Unit,الكمية المستهلكة لكل وحدة
 DocType: Serial No,Warranty Expiry Date,ضمان تاريخ الانتهاء
 DocType: Material Request Item,Quantity and Warehouse,الكمية والنماذج
+DocType: Hub Settings,Unregister,إلغاء تسجيل
 DocType: Sales Invoice,Commission Rate (%),نسبة العمولة (٪)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,يرجى تحديد البرنامج
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,يرجى تحديد البرنامج
 DocType: Project,Estimated Cost,التكلفة التقديرية
 DocType: Purchase Order,Link to material requests,رابط لطلبات المادية
+DocType: Hub Settings,Publish,نشر
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,الفضاء
 DocType: Journal Entry,Credit Card Entry,إدخال بطاقة إئتمان
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,الشركة و الحسابات
@@ -849,14 +865,13 @@
 DocType: Selling Settings,Close Opportunity After Days,فرصة قريبة بعد يوم
 ,Reserved,محجوز
 DocType: Purchase Order,Supply Raw Materials,توريد المواد الخام
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,التاريخ الذي سيتم إنشاء الفاتورة القادمة. يتم إنشاؤها على تقديم.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,أصول متداولة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} ليس من نوع المخزون
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',يرجى حصة ملاحظاتك للتدريب من خلال النقر على &quot;التدريب ردود الفعل&quot; ثم &quot;جديد&quot;
 DocType: Mode of Payment Account,Default Account,الافتراضي حساب
 DocType: Payment Entry,Received Amount (Company Currency),تلقى المبلغ (شركة العملات)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,يجب تحديد مبادرة البيع اذ كانة فرصة البيع من مبادرة بيع
-apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,الرجاء اختيار يوم عطلة أسبوعي
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,يجب تعيين (الزبون المحتمل) إذا كانت (الفرص) جاءت من زبون محتمل
+apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,الرجاء اختيار يوم العطلة الاسبوعي
 DocType: Patient,O Negative,O سلبي
 DocType: Production Order Operation,Planned End Time,وقت الانتهاء المخطط له
 ,Sales Person Target Variance Item Group-Wise,الشخص المبيعات المستهدفة الفرق البند المجموعة الحكيم
@@ -871,22 +886,22 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,طاقة
 DocType: Opportunity,Opportunity From,فرصة من
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,بيان الراتب الشهري.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,إضافة شركة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,الصف {0}: {1} الأرقام التسلسلية المطلوبة للبند {2}. لقد قدمت {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,الصف {0}: {1} الأرقام التسلسلية المطلوبة للبند {2}. لقد قدمت {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,يرجى تحديد جدول
 DocType: BOM,Website Specifications,موقع المواصفات
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} هو عنوان بريد إلكتروني غير صالح في &quot;المستلمين&quot;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} هو عنوان بريد إلكتروني غير صالح في &quot;المستلمين&quot;
 DocType: Special Test Items,Particulars,تفاصيل
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,مضاد حيوي.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: من {0} من نوع {1}
 DocType: Warranty Claim,CI-,CI-
-apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,الصف {0}: تحويل عامل إلزامي
+apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,الصف {0}: معامل التحويل إلزامي
 DocType: Employee,A+,+A
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",قواعد الأسعار متعددة موجود مع نفس المعايير، يرجى حل النزاع عن طريق تعيين الأولوية. قواعد السعر: {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,لا يمكن تعطيل أو إلغاء قائمة المواد لانها مترابطة مع قوائم مواد اخرى
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",توجد قواعد أسعار متعددة بنفس المعايير، يرجى حل النزاع عن طريق تعيين الأولوية. قاعدة السعر: {0}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,لا يمكن تعطيل أو إلغاء قائمة المواد لانها مترابطة مع قوائم مواد اخرى
 DocType: Opportunity,Maintenance,صيانة
 DocType: Item Attribute Value,Item Attribute Value,البند قيمة السمة
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,حملات المبيعات
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,أنشئ جدول زمني
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,أنشاء سجل توقيت
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -940,21 +955,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,نفقات صيانة المكاتب
 apps/erpnext/erpnext/utilities/user_progress.py +51,Go to ,اذهب إلى
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,إعداد حساب بريد إلكتروني
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,الرجاء إدخال العنصر الأول
-DocType: Account,Liability,مسئولية
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,الرجاء إدخال البند أولا
+DocType: Account,Liability,الخصوم
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,لا يمكن أن يكون المبلغ الموافق عليه أكبر من مبلغ المطالبة في الصف {0}.
+DocType: Salary Detail,Do not include in total,لا تدرج في المجموع
 DocType: Company,Default Cost of Goods Sold Account,الحساب الافتراضي لتكلفة البضائع المباعة
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,قائمة الأسعار غير محددة
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,قائمة الأسعار غير محددة
 DocType: Employee,Family Background,معلومات عن العائلة
 DocType: Request for Quotation Supplier,Send Email,إرسال بريد الإلكتروني
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},تحذير: مرفق غير صالح {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,لا يوجد تصريح
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},تحذير: مرفق غير صالح {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,لا يوجد تصريح
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,طلب اقتباس
 DocType: Vital Signs,Heart Rate / Pulse,معدل ضربات القلب / نبض
 DocType: Company,Default Bank Account,حساب مصرفي افتراضي
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",لتصفية استنادا الحزب، حدد حزب النوع الأول
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&quot;الأوراق المالية التحديث&quot; لا يمكن التحقق من أنه لم يتم تسليم المواد عن طريق {0}
 DocType: Vehicle,Acquisition Date,تاريخ شراء المركبة
-apps/erpnext/erpnext/utilities/user_progress.py +125,Nos,غ
+apps/erpnext/erpnext/utilities/user_progress.py +125,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,البنود ذات الاهمية العالية سوف تظهر بالاعلى
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,تفاصيل التسويات المصرفية
 apps/erpnext/erpnext/controllers/accounts_controller.py +549,Row #{0}: Asset {1} must be submitted,الصف # {0}: الأصول {1} يجب أن تقدم
@@ -974,13 +991,12 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: الحساب {2} لا يمكن أن يكون مجموعة
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,البند الصف {IDX}: {DOCTYPE} {} DOCNAME لا وجود له في أعلاه &#39;{DOCTYPE} المائدة
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,الجدول الزمني {0} بالفعل منتهي أو ملغى
-apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,أية مهام
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",في يوم من الشهر الذي سيتم إنشاء فاتورة السيارات سبيل المثال 05، 28 الخ
+apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,لايوجد مهام
 DocType: Item Variant Settings,Copy Fields to Variant,نسخ الحقول إلى متغير
-DocType: Asset,Opening Accumulated Depreciation,فتح الاستهلاك المتراكم
+DocType: Asset,Opening Accumulated Depreciation,الاستهلاك التراكمي الافتتاحي
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,يجب أن تكون النتيجة أقل من أو يساوي 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,أداة انتساب برنامج
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,سجلات النموذج - س
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,سجلات النموذج - س
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,الزبون والمورد
 DocType: Email Digest,Email Digest Settings,إعدادات الملخصات المرسله عبر الايميل
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,شكرا لك على عملك!
@@ -989,36 +1005,37 @@
 ,Production Order Stock Report,الإنتاج ترتيب تقرير المخزون
 apps/erpnext/erpnext/config/healthcare.py +148,Sensitivity Naming.,حساسية التسمية.
 DocType: HR Settings,Retirement Age,سن التقاعد
-DocType: Bin,Moving Average Rate,الانتقال متوسط معدل
+DocType: Bin,Moving Average Rate,معدل المتوسط المتحرك
 DocType: Production Planning Tool,Select Items,اختر العناصر
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} مقابل الفاتورة {1} بتاريخ {2}
 apps/erpnext/erpnext/utilities/user_progress.py +24,Setup Institution,مؤسسة الإعداد
 DocType: Program Enrollment,Vehicle/Bus Number,رقم المركبة / الحافلة
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,الجدول الزمني للمقرر
-DocType: Request for Quotation Supplier,Quote Status,اقتباس الحالة
+DocType: Request for Quotation Supplier,Quote Status,حالة المناقصة
 DocType: Maintenance Visit,Completion Status,استكمال الحالة
 DocType: HR Settings,Enter retirement age in years,أدخل سن التقاعد بالسنوات
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,المخزن المستهدف
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,يرجى تحديد مستودع
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,المخزن المستهدف
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,يرجى تحديد مستودع
 DocType: Cheque Print Template,Starting location from left edge,بدءا الموقع من الحافة اليسرى
 DocType: Item,Allow over delivery or receipt upto this percent,سماح على تسليم أو استلام تصل هذه النسبة
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,سجل الحضور
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,جميع المجموعات البند
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,مجموعات جميع الاصناف
 DocType: Process Payroll,Activity Log,سجل النشاط
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,صافي الربح / الخسارة
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,يشغل تلقائيا على طلب التزويد ب (رد الفعل) على أساس الشروط.
 DocType: Production Order,Item To Manufacture,السلعة لتصنيع
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} الحالة هي {2}
-DocType: Employee,Provide Email Address registered in company,تقديم عنوان البريد الإلكتروني المسجل في شركة
+DocType: Employee,Provide Email Address registered in company,تزويد بعنوان البريد الإلكتروني المسجل في شركة
 DocType: Shopping Cart Settings,Enable Checkout,تمكين الخروج
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,مدفوعات امر الشراء
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,الكمية المتوقعة
 DocType: Sales Invoice,Payment Due Date,تاريخ استحقاق السداد
 DocType: Drug Prescription,Interval UOM,الفاصل الزمني أوم
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,السلعة البديلة {0} موجود بالفعل مع نفس الصفات
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;فتح&#39;
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,توسيع المهام
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,متغير البند {0} موجود بالفعل مع نفس الخصائص
+DocType: Item,Hub Publishing Details,هاب تفاصيل النشر
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening','افتتاحي'
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,الاعمال للانجاز المفتوحة
 DocType: Notification Control,Delivery Note Message,ملاحظة تسليم رسالة
 DocType: Lab Test Template,Result Format,تنسيق النتيجة
 DocType: Expense Claim,Expenses,النفقات
@@ -1026,7 +1043,7 @@
 ,Purchase Receipt Trends,شراء اتجاهات الإيصال
 DocType: Process Payroll,Bimonthly,نصف شهري
 DocType: Vehicle Service,Brake Pad,وسادة الفرامل
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Research & Development,البحوث والتنمية
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Research & Development,البحث و التطوير
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,القيمة لإصدار فاتورة
 DocType: Company,Registration Details,تفاصيل التسجيل
 DocType: Timesheet,Total Billed Amount,المبلغ الكلي وصفت
@@ -1036,13 +1053,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,بوم # {0}: المواد الخام لا يمكن أن يكون نفس البند الرئيسي
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,مجموع الرسوم المطبقة في شراء طاولة إيصال عناصر يجب أن يكون نفس مجموع الضرائب والرسوم
 DocType: Sales Team,Incentives,الحوافز
-DocType: SMS Log,Requested Numbers,أرقام طلب
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,سجل في هاب
+DocType: SMS Log,Requested Numbers,الأرقام المطلوبة
 DocType: Production Planning Tool,Only Obtain Raw Materials,الحصول فقط مواد أولية
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,تقييم الأداء.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",تمكين &quot;استخدام لسلة التسوق، كما تم تمكين سلة التسوق وأن يكون هناك واحد على الأقل القاعدة الضريبية لسلة التسوق
-apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",يرتبط دفع الدخول {0} ضد بالدفع {1}، معرفة ما اذا كان ينبغي أن يتم سحبها كما تقدم في هذه الفاتورة.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",تمكين &quot;استخدام لسلة التسوق، كما تم تمكين سلة التسوق وأن يكون هناك واحد على الأقل القاعدة الضريبية لسلة التسوق
+apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",تدوين المدفوعات {0} مترابط مع الطلب {1}، تحقق مما اذا كان ينبغي أن يتم سحبها كدفعة مقدمة في هذه الفاتورة.
 DocType: Sales Invoice Item,Stock Details,تفاصيل المخزون
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,المشروع القيمة
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,قيمة المشروع
 apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,نقطة البيع
 DocType: Fee Schedule,Fee Creation Status,حالة إنشاء الرسوم
 DocType: Vehicle Log,Odometer Reading,قراءة عداد المسافات
@@ -1058,29 +1076,31 @@
 DocType: Salary Slip,Working Days,أيام عمل
 DocType: Serial No,Incoming Rate,معدل الواردة
 DocType: Packing Slip,Gross Weight,الوزن الإجمالي
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,اسم الشركة التي كنت تقوم بإعداد هذا النظام.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,تمكين المحور
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,اسم الشركة التي كنت تقوم بإعداد هذا النظام.
 DocType: HR Settings,Include holidays in Total no. of Working Days,العطلات تحسب من ضمن أيام العمل
 DocType: Job Applicant,Hold,معلق
 DocType: Employee,Date of Joining,تاريخ الالتحاق بالعمل
 DocType: Naming Series,Update Series,تحديث الرقم المتسلسل
 DocType: Supplier Quotation,Is Subcontracted,وتعاقد من الباطن
+DocType: Restaurant Table,Minimum Seating,الحد الأدنى للجلوس
 DocType: Item Attribute,Item Attribute Values,قيم سمة العنصر
 DocType: Examination Result,Examination Result,نتيجة الامتحان
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,ايصال شراء
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,إيصال استلام مشتريات
 ,Received Items To Be Billed,العناصر الواردة إلى أن توصف
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Submitted Salary Slips,تم تقديم كشوفات رواتب
 apps/erpnext/erpnext/config/accounts.py +311,Currency exchange rate master.,الماستر الخاص بأسعار صرف العملات.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +198,Reference Doctype must be one of {0},يجب أن يكون إشارة DOCTYPE واحد من {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +198,Reference Doctype must be one of {0},يجب أن يكون مرجع DOCTYPE واحد من {0}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},تعذر العثور على فتحة الزمنية في {0} الأيام القليلة القادمة للعملية {1}
 DocType: Production Order,Plan material for sub-assemblies,المواد خطة للجمعيات الفرعي
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,المناديب و المناطق
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,قائمة المواد {0} يجب أن تكون نشطة
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,قائمة المواد {0} يجب أن تكون نشطة
 DocType: Journal Entry,Depreciation Entry,انخفاض الدخول
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,الرجاء اختيار نوع الوثيقة الأولى
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,يرجى تحديد نوع الوثيقة أولاً
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,إلغاء المواد الخاصة بالزيارة {0} قبل إلغاء زيارة الصيانة هذه
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},رقم المسلسل {0} لا ينتمي إلى البند {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,مطلوب الكمية
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,المستودعات مع الصفقة الحالية لا يمكن أن يتم تحويلها إلى دفتر الأستاذ.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,المستودعات مع الصفقة الحالية لا يمكن أن يتم تحويلها إلى دفتر الأستاذ.
 DocType: Bank Reconciliation,Total Amount,المبلغ الكلي لل
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,نشر على شبكة الإنترنت
 DocType: Prescription Duration,Number,رقم
@@ -1091,21 +1111,21 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,قائمة مبيعات الأسعار
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.",إذا تم تحديده، سيتم إنشاء عميل، يتم تعيينه إلى المريض. سيتم إنشاء فواتير المرضى ضد هذا العميل. يمكنك أيضا تحديد العميل الحالي أثناء إنشاء المريض.
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,نشر لمزامنة البنود
 DocType: Bank Reconciliation,Account Currency,عملة الحساب
 DocType: Lab Test,Sample ID,رقم تعريف العينة
-apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,يرجى ذكر جولة معطلة حساب في الشركة
+apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,يرجى ذكر حساب التقريب في الشركة
 DocType: Purchase Receipt,Range,نطاق
 DocType: Supplier,Default Payable Accounts,الحسابات الدائنة الافتراضي
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,الموظف {0} غير نشط أو غير موجود
 DocType: Fee Structure,Components,مكونات
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},{0} الرجاء إدخال فئة الأصول في البند
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,البند المتغيرات {0} تحديث
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},الرجاء إدخال فئة الأصول في البند {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,تم تحديث متغيرات البند {0}
 DocType: Quality Inspection Reading,Reading 6,قراءة 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,{0} {1} {2} لا يمكن  من دون أي فاتورة قائمة سالبة
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this",التي سيتم إنشاؤها. إذا تأخرت، سيكون لديك لتغيير يدويا &quot;كرر في يوم من الشهر&quot; حقل من هذا
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,{0} {1} {2} لا يمكن  من دون أي فاتورة قائمة سالبة
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,عربون  فاتورة الشراء
-DocType: Hub Settings,Sync Now,مزامنة الآن
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},صف {0}: لا يمكن ربط دخول الائتمان مع {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},صف {0}: لا يمكن ربط قيد دائن مع {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,تحديد ميزانية السنة المالية
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,حساب الخزنه / البنك المعتاد سوف يعدل تلقائي في فاتورة نقاط البيع عند اختيار الوضع
 DocType: Lead,LEAD-,قيادة-
@@ -1116,17 +1136,17 @@
 DocType: Item,Is Purchase Item,شراء صنف
 DocType: Asset,Purchase Invoice,فاتورة شراء
 DocType: Stock Ledger Entry,Voucher Detail No,تفاصيل قسيمة لا
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,فاتورة مبيعات جديدة
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,فاتورة مبيعات جديدة
 DocType: Stock Entry,Total Outgoing Value,إجمالي القيمة الصادرة
 DocType: Physician,Appointments,تعيينات
-apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,يجب فتح التسجيل وتاريخ الإنتهاء تكون ضمن نفس السنة المالية
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,تاريخ الافتتاح و تاريخ الاغلاق يجب ان تكون ضمن نفس السنة المالية
 DocType: Lead,Request for Information,طلب المعلومات
 ,LeaderBoard,المتصدرين
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,تزامن غير متصل الفواتير
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,تزامن غير متصل الفواتير
 DocType: Payment Request,Paid,مدفوع
 DocType: Program Fee,Program Fee,رسوم البرنامج
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
-It also updates latest price in all the BOMs.",استبدال بوم معين في جميع بومس الأخرى حيث يتم استخدامه. وسوف تحل محل ارتباط بوم القديم، وتكلفة التحديث وتجديد &quot;بوم انفجار البند&quot; الجدول وفقا ل بوم جديد. كما يقوم بتحديث أحدث الأسعار في جميع بومس.
+It also updates latest price in all the BOMs.","استبدال قائمة مواد معينة في جميع قوائم المواد الأخرى حيث يتم استخدامها. وسوف تحل محل  قائمة المواد القديمة، تحديث التكلفة وتجديد ""قائمة المواد التي تحتوي بنود مفصصه"" الجدول وفقا لقائمة المواد جديد"
 DocType: Salary Slip,Total in words,إجمالي بالحروف
 DocType: Material Request Item,Lead Time Date,تاريخ و وقت مبادرة البيع
 DocType: Guardian,Guardian Name,اسم ولي الأمر
@@ -1141,11 +1161,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,صنف امر الشراء
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,دخل غير مباشرة
 DocType: Student Attendance Tool,Student Attendance Tool,أداة طالب الحضور
+DocType: Restaurant Menu,Price List (Auto created),قائمة الأسعار (تم إنشاؤها تلقائيا)
 DocType: Cheque Print Template,Date Settings,إعدادات التاريخ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,فرق
 ,Company Name,اسم الشركة
 DocType: SMS Center,Total Message(s),مجموع الرسائل ( ق )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,اختر البند لنقل
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,اختر البند لنقل
 DocType: Purchase Invoice,Additional Discount Percentage,نسبة خصم إضافي
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,عرض قائمة من جميع ملفات الفيديو مساعدة
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,حدد رئيس حساب في البنك حيث أودع الاختيار.
@@ -1153,15 +1174,17 @@
 DocType: Pricing Rule,Max Qty,أعلى الكمية
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice",صف {0}: فاتورة {1} غير صالح، قد يتم إلغاء / لا وجود لها. \ الرجاء إدخال الفاتورة صحيحة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,صف {0}: الدفع مقابل مبيعات / طلب شراء ينبغي دائما أن تكون علامة مسبقا
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,صف {0}: الدفعة مقابل طلب مبيعات / طلب شراء ينبغي ان يكون دائما معلامة  كدفعة مقدمة
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,كيماويات
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,حساب الخزنه / البنك المعتاد سوف يعدل تلقائي في القيود اليوميه للمرتب عند اختيار الوضع.
-DocType: BOM,Raw Material Cost(Company Currency),الخام المواد التكلفة (شركة العملات)
+DocType: BOM,Raw Material Cost(Company Currency),تكلفة المواد الخام (عملة الشركة)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,كل الأصناف قد تم ترحيلها من قبل لأمر الانتاج هذا.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},الصف # {0}: لا يمكن أن يكون المعدل أكبر من المعدل المستخدم في {1} {2}
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,متر
 DocType: Workstation,Electricity Cost,تكلفة الكهرباء
 DocType: HR Settings,Don't send Employee Birthday Reminders,عدم ارسال تذكير للموضفين بأعياد الميلاد
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,احفظ التغييرات
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,المنتجات المطلوبة
 DocType: Item,Inspection Criteria,معايير التفتيش
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,نقلها
 DocType: BOM Website Item,BOM Website Item,بند الموقع الالكتروني بقائمة المواد
@@ -1178,11 +1201,11 @@
 DocType: Journal Entry,Total Amount in Words,المبلغ الكلي في كلمات
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,كان هناك خطأ . يمكن أن يكون أحد الأسباب المحتملة التي قد لا يتم حفظ النموذج. يرجى الاتصال support@erpnext.com إذا استمرت المشكلة.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,سلتي
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},يجب أن يكون النظام نوع واحد من {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},يجب أن يكون نوع الطلب واحدا من {0}
 DocType: Lead,Next Contact Date,تاريخ جهة الاتصال التالية
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,فتح الكمية
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,الكمية الافتتاحية
 DocType: Healthcare Settings,Appointment Reminder,تذكير التعيين
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,الرجاء إدخال حساب لتغيير المبلغ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,الرجاء إدخال حساب لتغيير القيمة
 DocType: Student Batch Name,Student Batch Name,طالب اسم دفعة
 DocType: Consultation,Doctor,طبيب
 DocType: Holiday List,Holiday List Name,اسم قائمة العطلات
@@ -1190,13 +1213,15 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,دورة الجدول الزمني
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,خيارات المخزون
 DocType: Journal Entry Account,Expense Claim,طلب النفقات
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,هل تريد حقا  استعادة هذه الأصول المخردة ؟
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},الكمية ل{0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,هل تريد حقا  استعادة هذه الأصول المخردة ؟
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},الكمية ل {0}
 DocType: Leave Application,Leave Application,طلب اجازة
 DocType: Patient,Patient Relation,علاقة المريض
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,أداة تخصيص الإجازة
+DocType: Item,Hub Category to Publish,فئة المحور للنشر
 DocType: Leave Block List,Leave Block List Dates,التواريخ الممنوع اخذ اجازة فيها
-DocType: Workstation,Net Hour Rate,صافي معدل ساعة
+DocType: Sales Invoice,Billing Address GSTIN,عنوان إرسال الفواتير غستين
+DocType: Workstation,Net Hour Rate,صافي سعر الساعة
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,تكاليف المشتريات المستلمة
 DocType: Company,Default Terms,الشروط الافتراضية
 DocType: Supplier Scorecard Period,Criteria,المعايير
@@ -1205,18 +1230,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},الرجاء تحديد {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,العناصر إزالتها مع أي تغيير في كمية أو قيمة.
 DocType: Delivery Note,Delivery To,التسليم إلى
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,جدول الخصائص إلزامي
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,جدول الخصائص إلزامي
 DocType: Production Planning Tool,Get Sales Orders,الحصول على أوامر البيع
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} لا يمكن أن يكون سالبا
 DocType: Training Event,Self-Study,دراسة ذاتية
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,خصم
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,خصم
 DocType: Asset,Total Number of Depreciations,إجمالي عدد التلفيات
 DocType: Sales Invoice Item,Rate With Margin,معدل مع الهامش
 DocType: Workstation,Wages,أجور
 DocType: Task,Urgent,عاجل
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},يرجى تحديد هوية الصف صالحة لصف {0} في الجدول {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,تعذر العثور على متغير:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,الرجاء تحديد حقل لتعديله من المفكرة
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,الرجاء تحديد حقل لتعديله من المفكرة
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,ERPNext اذهب إلى سطح المكتب والبدء في استخدام
 DocType: Item,Manufacturer,الصانع
 DocType: Landed Cost Item,Purchase Receipt Item,اصناف استلام الشراء
@@ -1234,7 +1259,7 @@
 DocType: Purchase Invoice,Returns,عائدات
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,مستودع WIP
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},الرقم التسلسلي {0} تحت عقد الصيانة حتى {1}
-apps/erpnext/erpnext/config/hr.py +35,Recruitment,تجنيد
+apps/erpnext/erpnext/config/hr.py +35,Recruitment,التوظيف
 DocType: Lead,Organization Name,اسم المنظمة
 DocType: Tax Rule,Shipping State,الدولة الشحن
 ,Projected Quantity as Source,المتوقع الكمية كمصدر
@@ -1247,24 +1272,25 @@
 DocType: GL Entry,Against,مقابل
 DocType: Item,Default Selling Cost Center,الافتراضي البيع مركز التكلفة
 DocType: Sales Partner,Implementation Partner,شريك التنفيذ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,الرمز البريدي
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},اوامر البيع {0} {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,الرمز البريدي
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},اوامر البيع {0} {1}
 DocType: Opportunity,Contact Info,معلومات الاتصال
-apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,جعل الأسهم مقالات
+apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,إنشاء إدخالات مخزون
 DocType: Packing Slip,Net Weight UOM,الوزن الصافي لوحدة القياس
 DocType: Item,Default Supplier,مزود الافتراضي
 DocType: Manufacturing Settings,Over Production Allowance Percentage,أكثر من الإنتاج بدل النسبة المئوية
-DocType: Employee Loan,Repayment Schedule,جدول السداد
+DocType: Employee Loan,Repayment Schedule,الجدول الزمني للسداد
 DocType: Shipping Rule Condition,Shipping Rule Condition,حالة قاعدة الشحن
 DocType: Holiday List,Get Weekly Off Dates,الحصول على مواعيد الإيقاف الأسبوعي
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,(تاريخ الانتهاء) لا يمكن أن يكون أقل من (تاريخ البدء)
 DocType: Sales Person,Select company name first.,حدد اسم الشركة الأول.
-apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,الاقتباسات الواردة من الموردين.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,من أسفل إلى أعلى
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,عروض تم استقبالها من الموردين.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,استبدال بوم وتحديث أحدث الأسعار في جميع بومس
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},إلى {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,متوسط العمر
 DocType: School Settings,Attendance Freeze Date,تاريخ تجميد الحضور
-apps/erpnext/erpnext/utilities/user_progress.py +89,List a few of your suppliers. They could be organizations or individuals.,قائمة قليلة من الموردين الخاصة بك . يمكن أن تكون المنظمات أو الأفراد.
+apps/erpnext/erpnext/utilities/user_progress.py +89,List a few of your suppliers. They could be organizations or individuals.,ادرج بعض من الموردين الخاصين بك. ويمكن أن يكونوا منظمات أو أفراد.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,عرض جميع المنتجات
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),الحد الأدنى لسن الرصاص (أيام)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +57,All BOMs,كل قوائم المواد
@@ -1273,13 +1299,13 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +407,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,تحذير : سيقوم النظام لا تحقق بالمغالاة في الفواتير منذ مبلغ القطعة ل {0} في {1} هو صفر
 DocType: Journal Entry,Make Difference Entry,جعل دخول الفرق
 DocType: Upload Attendance,Attendance From Date,الحضور من تاريخ
-DocType: Appraisal Template Goal,Key Performance Area,معيار التقييم
+DocType: Appraisal Template Goal,Key Performance Area,وصف معيار التقييم
 DocType: Program Enrollment,Transportation,النقل
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,خاصية غير صالحة
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} يجب أن يتم تقديمه
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},يجب أن تكون الكمية أقل من أو يساوي إلى {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},يجب أن تكون الكمية أقل من أو تساوي {0}
 DocType: SMS Center,Total Characters,مجموع أحرف
-apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},يرجى تحديد BOM في الحقل BOM القطعة ل{0}
+apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},يرجى تحديد قائمة المواد في الحقل (قائمة المواد) للبند {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,تفاصيل الفاتورة نموذج - س
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,دفع فاتورة المصالحة
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42,Contribution %,المساهمة %
@@ -1287,12 +1313,12 @@
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,ارقام تسجيل الشركة و ارقام ملفات الضرائب..... الخ
 DocType: Sales Partner,Distributor,موزع
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,التسوق شحن العربة القاعدة
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +233,Production Order {0} must be cancelled before cancelling this Sales Order,إنتاج النظام {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
-apps/erpnext/erpnext/public/js/controllers/transaction.js +68,Please set 'Apply Additional Discount On',الرجاء تعيين &#39;تطبيق خصم إضافي على&#39;
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +233,Production Order {0} must be cancelled before cancelling this Sales Order,يجب إلغاء امر الانتاج {0} قبل إلغاء طلب المبيعات
+apps/erpnext/erpnext/public/js/controllers/transaction.js +68,Please set 'Apply Additional Discount On',يرجى تحديد 'تطبيق خصم إضافي على'
 ,Ordered Items To Be Billed,أمرت البنود التي يتعين صفت
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,(من المدى) يجب أن يكون أقل من (إلى المدى)
 DocType: Global Defaults,Global Defaults,افتراضيات العالمية
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,مشروع التعاون دعوة
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,دعوة للمشاركة في المشاريع
 DocType: Salary Slip,Deductions,استقطاعات
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,اسم الإجراء
@@ -1308,40 +1334,41 @@
 apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,فتح ميزان المحاسبة
 ,GST Sales Register,غست مبيعات التسجيل
 DocType: Sales Invoice Advance,Sales Invoice Advance,فاتورة مبيعات المقدمة
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,شيء أن تطلب
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,لا شيء للطلب
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"""تاريخ البدء الفعلي"" لا يمكن أن يكون بعد ""تاريخ الانتهاء الفعلي"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,إدارة
-DocType: Cheque Print Template,Payer Settings,إعدادات دافع
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"""تاريخ البدء الفعلي"" لا يمكن أن يكون بعد ""تاريخ الانتهاء الفعلي"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,الإدارة
+DocType: Cheque Print Template,Payer Settings,إعدادات الدافع
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","سيتم إلحاق هذا إلى بند رمز للمتغير. على سبيل المثال، إذا اختصار الخاص بك هو ""SM""، ورمز البند هو ""T-SHIRT""، رمز العنصر المتغير سيكون ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,صافي الأجر (بالحروف) تكون مرئية بمجرد حفظ كشف راتب.
 DocType: Purchase Invoice,Is Return,هو العائد
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,الحذر
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,عودة / الخصم ملاحظة
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,الحذر
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,ارجاع / اشعار مدين
 DocType: Price List Country,Price List Country,قائمة الأسعار البلد
 DocType: Item,UOMs,وحدات القياس
 apps/erpnext/erpnext/stock/utils.py +205,{0} valid serial nos for Item {1},{0} أرقام تسلسلية صالحة للبند {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,لا يمكن تغيير رمز السلعة للرقم التسلسلي
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +26,POS Profile {0} already created for user: {1} and company {2},الملف POS {0} خلقت بالفعل للمستخدم: {1} وشركة {2}
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +26,POS Profile {0} already created for user: {1} and company {2},الملف نقطة البيع {0} تم إنشاؤها مسبقا للمستخدم: {1} والشركة {2}
 DocType: Sales Invoice Item,UOM Conversion Factor,عامل تحويل وحدة القياس
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +23,Please enter Item Code to get Batch Number,الرجاء إدخال رمز المدينة للحصول على رقم الدفعة
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +23,Please enter Item Code to get Batch Number,الرجاء إدخال كود البند للحصول على رقم باتش
 DocType: Stock Settings,Default Item Group,المجموعة الافتراضية للمواد
-DocType: Employee Loan,Partially Disbursed,المصروفة جزئيا
+DocType: Employee Loan,Partially Disbursed,صرف جزئ
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,مزود قاعدة البيانات.
 DocType: Account,Balance Sheet,المركز المالي
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',مركز تكلفة للبند مع كود البند '
 DocType: Fee Validity,Valid Till,صالح حتى
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",لم يتم تكوين طريقة الدفع. يرجى مراجعة، وإذا كان قد تم إعداد الحساب على طريقة الدفع أو على الملف الشخصي نقاط البيع.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",(طريقة الدفع) لم يتم ضبطها. يرجى التحقق، ما إذا كان كان تم تعيين حساب على (طريقة الدفع) أو على (ملف نقاط البيع).
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,لا يمكن إدخال البند نفسه عدة مرات.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",يمكن إنشاء المزيد من الحسابات تحت المجموعة، لكن إدخالات القيود يمكن ان تكون فقط مقابل  حسابات فردية و ليست مجموعة
 DocType: Lead,Lead,مبادرة بيع
-DocType: Email Digest,Payables,الذمم الدائنة
+DocType: Email Digest,Payables,الواجب دفعها (دائنة)
 DocType: Course,Course Intro,مقدمة على المقرر التعليمي
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,الأسهم الدخول {0} خلق
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,يرجى إعداد سلسلة الترقيم للحضور عن طريق الإعداد&gt; سلسلة الترقيم
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,الأسهم الدخول {0} خلق
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,الصف # {0} مرفوض الكمية لا يمكن إدخالها في شراء العودة
 ,Purchase Order Items To Be Billed,تم اصدار فاتورة لأصناف امر الشراء
 DocType: Purchase Invoice Item,Net Rate,صافي معدل
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,يرجى تحديد عميل
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,يرجى تحديد عميل
 DocType: Purchase Invoice Item,Purchase Invoice Item,اصناف فاتورة المشتريات
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,ويرسل الأوراق المالية ليدجر مقالات وGL مقالات لشراء شهادات مختارة
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,البند 1
@@ -1360,25 +1387,26 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},صف مكرر {0} مع نفس {1}
 ,Trial Balance,ميزان المراجعة
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,السنة المالية {0} غير موجودة
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,إعداد الموظفين
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,إعداد الموظفين
 DocType: Sales Order,SO-,وبالتالي-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,الرجاء اختيار البادئة الأولى
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,الرجاء اختيار البادئة اولا
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +185,Research,بحث
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +185,Research,ابحاث
 DocType: Maintenance Visit Purpose,Work Done,العمل المنجز
-apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,يرجى تحديد سمة واحدة على الأقل في الجدول سمات
+apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,يرجى تحديد خاصية واحدة على الأقل في جدول (الخاصيات)
 DocType: Announcement,All Students,جميع الطلاب
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,البند {0} يجب أن يكون بند لايتعلق بالمخزون
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,.عرض حساب الاستاد
 DocType: Grading Scale,Intervals,فترات
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,اسبق
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group",توجد مجموعة بند بنفس الاسم، يرجى تغيير اسم البند أو إعادة تسمية مجموعة البند
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group",توجد مجموعة بند بنفس الاسم، يرجى تغيير اسم البند أو إعادة تسمية مجموعة البند
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,رقم موبايل الطالب
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,بقية العالم
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,بقية العالم
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,العنصر {0} لا يمكن أن يكون دفعة
 ,Budget Variance Report,تقرير إنحرافات الموازنة
 DocType: Salary Slip,Gross Pay,إجمالي الأجور
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,صف {0}: نوع آخر إلزامي.
+DocType: Item,Is Item from Hub,هو البند من المحور
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,الصف {0}: نوع النشاط إلزامي.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,توزيع الأرباح
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,محاسبة حساب الاستاد
 DocType: Stock Reconciliation,Difference Amount,مقدار الفرق
@@ -1387,17 +1415,19 @@
 DocType: Vehicle Log,Service Detail,خدمة التفاصيل
 DocType: BOM,Item Description,وصف البند
 DocType: Student Sibling,Student Sibling,الشقيق طالب
-DocType: Purchase Invoice,Is Recurring,غير متكرر
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,طريقة الدفع
 DocType: Purchase Invoice,Supplied Items,الأصناف الموردة
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},الرجاء تعيين قائمة نشطة لمطعم {0}
 DocType: Student,STUD.,عشيق.
 DocType: Production Order,Qty To Manufacture,الكمية للتصنيع
-DocType: Email Digest,New Income,الدخل الجديد
+DocType: Email Digest,New Income,دخل جديد
 DocType: School Settings,School Settings,إعدادات المدرسة
-DocType: Buying Settings,Maintain same rate throughout purchase cycle,الحفاظ على نفس معدل طوال دورة  الشراء
+DocType: Buying Settings,Maintain same rate throughout purchase cycle,الحفاظ على نفس السعر طوال دورة  الشراء
 DocType: Opportunity Item,Opportunity Item,فرصة السلعة
 ,Student and Guardian Contact Details,طالب والجارديان تفاصيل الاتصال
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,صف {0}: بالنسبة للمورد مطلوب {0} عنوان البريد الإلكتروني لإرسال البريد الإلكتروني
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,الصف {0}: للمورد {0} عنوان البريد الالكتروني مطلوب ليتم إرسال الايميل
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,افتتاحي مؤقت
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,مشاهدة ملف هاب
 ,Employee Leave Balance,رصيد اجازات الموظف
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},يجب أن يكون رصيد الحساب {0} دائما {1}
 DocType: Patient Appointment,More Info,المزيد من المعلومات
@@ -1412,18 +1442,18 @@
 DocType: Supplier Quotation Item,Lead Time in days,المهلة بالايام
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,ملخص الحسابات الدائنة
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +337,Payment of salary from {0} to {1},دفع الراتب من {0} إلى {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},غير مخول لتحرير الحساب المجمد {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},غير مخول بتعديل الحساب المجمد {0}
 DocType: Journal Entry,Get Outstanding Invoices,الحصول على فواتير معلقة
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,اوامر البيع {0} غير صالحه
 DocType: Supplier Scorecard,Warn for new Request for Quotations,تحذير لطلب جديد للاقتباسات
-apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,أوامر الشراء تساعدك على تخطيط والمتابعة على مشترياتك
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged",عذراً، الشركات لا يمكن دمجها
+apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,أوامر الشراء تساعدك على تخطيط ومتابعة مشترياتك
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged",عذراً، الشركات لا يمكن دمجها
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,وصفات اختبار المختبر
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",إجمالي كمية العدد / نقل {0} في المواد طلب {1} \ لا يمكن أن يكون أكبر من الكمية المطلوبة {2} لالبند {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,صغير
 DocType: Employee,Employee Number,رقم الموظف
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},الحالة رقم ( ق ) قيد الاستخدام بالفعل. محاولة من القضية لا { 0 }
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},الحالة رقم ( ق ) قيد الاستخدام بالفعل. محاولة من القضية لا { 0 }
 DocType: Project,% Completed,٪ مكتمل
 ,Invoiced Amount (Exculsive Tax),المبلغ فواتير ( Exculsive الضرائب )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,البند 2
@@ -1438,11 +1468,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,نفقات غير مباشرة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,الصف {0}: الكمية إلزامي
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,الزراعة
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,مزامنة البيانات الرئيسية
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,مزامنة البيانات الرئيسية
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,المنتجات أو الخدمات الخاصة بك
 DocType: Special Test Items,Special Test Items,عناصر الاختبار الخاصة
 DocType: Mode of Payment,Mode of Payment,طريقة الدفع
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,وينبغي أن يكون موقع صورة ملف العامة أو عنوان الموقع
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,وينبغي أن يكون موقع صورة ملف العامة أو عنوان الموقع
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,فاتورة المواد
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,هذه هي مجموعة البند الجذرية والتي لا يمكن تحريرها.
@@ -1450,24 +1480,23 @@
 DocType: Vehicle,Fuel UOM,وحدة قياس الوقود
 DocType: Warehouse,Warehouse Contact Info,معلومات اتصال المستودع
 DocType: Payment Entry,Write Off Difference Amount,شطب الفرق المبلغ
-DocType: Purchase Invoice,Recurring Type,نوع المتكررة
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent",{0}: البريد الإلكتروني للموظف غير موجود، وبالتالي لن يتم إرسال البريد الإلكتروني
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent",{0}: البريد الإلكتروني للموظف غير موجود، وبالتالي لن يتم إرسال البريد الإلكتروني
 DocType: Item,Foreign Trade Details,الخارجية تفاصيل تجارة
+,Assessment Plan Status,حالة خطة التقييم
 DocType: Email Digest,Annual Income,الدخل السنوي
 DocType: Serial No,Serial No Details,تفاصيل المسلسل
 DocType: Purchase Invoice Item,Item Tax Rate,السلعة معدل ضريبة
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,يرجى اختيار الطبيب والتاريخ
 DocType: Student Group Student,Group Roll Number,رقم لفة المجموعة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",ل{0}، فقط حساب الدائن يمكن ربطه مقابل قيد مدين أخر
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,يجب أن يكون مجموع كل الأوزان مهمة 1. الرجاء ضبط أوزان جميع المهام المشروع وفقا لذلك
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,اشعار تسليم {0} لم يتم تقديمها
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,يجب أن يكون مجموع كل الأوزان مهمة 1. الرجاء ضبط أوزان جميع المهام المشروع وفقا لذلك
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,اشعار تسليم {0} لم يتم تقديمها
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,البند {0} يجب أن يكون عنصر التعاقد الفرعي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,المعدات الكبيرة
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",يتم تحديد قاعدة الأسعار على أساس حقل 'تطبق في' ، التي يمكن أن تكون بند، مجموعة بنود او علامة التجارية.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,يرجى تعيين رمز العنصر أولا
-DocType: Hub Settings,Seller Website,البائع موقع
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",خاصية قاعدة التسعير يمكن تطبيقها على  بند، فئة بنود او علامة التجارية.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,يرجى تعيين رمز العنصر أولا
 DocType: Item,ITEM-,بند-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,مجموع النسبة المئوية المخصصة ل فريق المبيعات يجب أن يكون 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,مجموع النسبة المئوية المخصصة ل فريق المبيعات يجب أن يكون 100
 DocType: Sales Invoice Item,Edit Description,تحرير الوصف
 DocType: Antibiotic,Antibiotic,مضاد حيوي
 ,Team Updates,فريق التحديثات
@@ -1482,18 +1511,18 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +47,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","يمكن أن يكون هناك واحد فقط الشحن القاعدة الحالة مع 0 أو قيمة فارغة ل "" إلى القيمة """
 DocType: Authorization Rule,Transaction,صفقة
 DocType: Patient Appointment,Duration,المدة الزمنية
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,ملاحظة: مركز التكلفة هذا هو مجموعة. لا يمكن إجراء القيود المحاسبية مقابل المجموعات
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,ملاحظة: مركز التكلفة هذا هو مجموعة. لا يمكن إجراء القيود المحاسبية مقابل المجموعات.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,يوجد مستودع الطفل لهذا المستودع. لا يمكنك حذف هذا المستودع.
 DocType: Item,Website Item Groups,مجموعات الأصناف للموقع
 DocType: Purchase Invoice,Total (Company Currency),مجموع (شركة العملات)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,الرقم التسلسلي {0} دخلت أكثر من مرة
-DocType: Depreciation Schedule,Journal Entry,إدخال دفتر اليومية
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} العنصر قيد الأستخدام
+DocType: Depreciation Schedule,Journal Entry,قيد يومية
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} العنصر قيد الأستخدام
 DocType: Workstation,Workstation Name,اسم محطة العمل
 DocType: Grading Scale Interval,Grade Code,كود الصف
-DocType: POS Item Group,POS Item Group,POS البند المجموعة
+DocType: POS Item Group,POS Item Group,مجموعة المواد لنقطة البيع
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,الملخصات من خلال البريد الإلكتروني:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},قائمة المواد {0} لا تنتمي إلى البند {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},قائمة المواد {0} لا تنتمي إلى البند {1}
 DocType: Sales Partner,Target Distribution,هدف التوزيع
 DocType: Salary Slip,Bank Account No.,رقم الحساب في البك
 DocType: Naming Series,This is the number of the last created transaction with this prefix,هذا هو عدد المعاملات التي تم إنشاؤها باستخدام مشاركة هذه البادئة
@@ -1509,11 +1538,10 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,طلب تسعيرة مزود
 DocType: Healthcare Settings,Registration Message,رسالة التسجيل
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,هاردوير
-DocType: Sales Order,Recurring Upto,المتكررة لغاية
 DocType: Prescription Dosage,Prescription Dosage,وصفة الجرعة
 DocType: Attendance,HR Manager,مدير الموارد البشرية
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,الرجاء اختيار الشركة
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,امتياز الإجازة
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,الرجاء اختيار الشركة
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,إجازة الامتياز
 DocType: Purchase Invoice,Supplier Invoice Date,المورد فاتورة التسجيل
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,لكل
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,تحتاج إلى تمكين سلة التسوق
@@ -1525,13 +1553,14 @@
 ,BOM Browser,BOM متصفح
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,يرجى تحديث حالتك لهذا الحدث التدريبي
 DocType: Purchase Taxes and Charges,Add or Deduct,إضافة أو خصم
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,الظروف المتداخلة وجدت بين:
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,تم العثور على شروط متداخلة بين:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Against Journal Entry {0} is already adjusted against some other voucher
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,مجموع قيمة الطلب
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,طعام
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,طعام
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,مدى العمر 3
 DocType: Maintenance Schedule Item,No of Visits,لا الزيارات
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},جدول الصيانة {0} موجود ضد {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,هل تريد نشر العناصر على المحور؟
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,تسجيل الطالب
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},عملة الحساب الختامي يجب أن تكون {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},مجموع النقاط لجميع الأهداف يجب أن يكون 100. ومن {0}
@@ -1542,9 +1571,9 @@
 DocType: Authorization Rule,Average Discount,متوسط التخفيض
 DocType: Purchase Invoice Item,UOM,وحدق القياس
 DocType: Rename Tool,Utilities,خدمات
-DocType: Purchase Invoice Item,Accounting,المحاسبة
+DocType: POS Profile,Accounting,المحاسبة
 DocType: Employee,EMP/,/EMP
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,يرجى تحديد دفعات لعنصر مطابق
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,يرجى تحديد دفعات لعنصر مطابق
 DocType: Asset,Depreciation Schedules,جداول الاستهلاك الزمني
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,فترة الطلب لا يمكن أن تكون خارج نطاق فترة الاجازات المخصصة
 DocType: Activity Cost,Projects,مشاريع
@@ -1560,7 +1589,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',حالة الموافقة يجب ان تكون (موافق عليه) او (مرفوض)
 DocType: Physician,Contacts and Address,جهات الاتصال والعنوان
 DocType: Purchase Invoice,Contact Person,الشخص الذي يمكن الاتصال به
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"""تاريخ البدء المتوقع"" لا يمكن أن يكون بعد ""تاريخ الانتهاء المتوقع"""
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""تاريخ البدء المتوقع"" لا يمكن أن يكون بعد ""تاريخ الانتهاء المتوقع"""
 DocType: Course Scheduling Tool,Course End Date,تاريخ انتهاء المقرر التعليمي
 DocType: Holiday List,Holidays,العطلات
 DocType: Sales Order Item,Planned Quantity,المخطط الكمية
@@ -1568,30 +1597,31 @@
 DocType: Item,Maintain Stock,منتج يخزن
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,مدخلات المخزون التي تم إنشاؤها من قبل لأمر الإنتاج
 DocType: Employee,Prefered Email,البريد الإلكتروني المفضل
+DocType: Student Admission,Eligibility and Details,الأهلية والتفاصيل
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,صافي التغير في الأصول الثابتة
 DocType: Leave Control Panel,Leave blank if considered for all designations,اتركها فارغه اذا كنت تريد تطبيقها لجميع المسميات الوظيفية
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,الرسوم من النوع (فعلي) في الصف {0} لا يمكن تضمينها في سعر البند
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},الحد الأقصى: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},الحد الأقصى: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,من (التاريخ والوقت)
 DocType: Email Digest,For Company,للشركة
 apps/erpnext/erpnext/config/support.py +17,Communication log.,سجل التواصل.
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.",تم تعطيل طلب تسعيرة للوصول من البوابة، لمزيد من الإعدادات البوابة الاختيار.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.",تم تعطيل الوصول إلى طلب عرض الاسعار من خلال البوابة الالكترونية، للمزيد تحقق من إعدادات البوابة الالكترونية.
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,سجل الأداء بطاقة الأداء المتغير
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,قيمة الشراء
 DocType: Sales Invoice,Shipping Address Name,الشحن العنوان الاسم
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,دليل الحسابات
 DocType: Material Request,Terms and Conditions Content,محتويات الشروط والأحكام
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,لا يمكن أن يكون أكبر من 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,البند {0} ليس بند مخزون
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,البند {0} ليس بند مخزون
 DocType: Maintenance Visit,Unscheduled,غير المجدولة
-DocType: Employee,Owned,مالك
+DocType: Employee,Owned,مملوك
 DocType: Salary Detail,Depends on Leave Without Pay,يعتمد على إجازة بدون مرتب
 DocType: Pricing Rule,"Higher the number, higher the priority",الرقم الأعلى له أولوية أكبر
 ,Purchase Invoice Trends,اتجهات فاتورة الشراء
 DocType: Employee,Better Prospects,آفاق أفضل
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",الصف # {0}: الدفعة {1} فقط {2} الكمية. يرجى تحديد دفعة أخرى توفر {3} الكمية أو تقسيم الصف إلى صفوف متعددة، لتسليم / إصدار من دفعات متعددة
-DocType: Vehicle,License Plate,لوحة معدنية
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",الصف # {0}: الدفعة {1} فقط {2} الكمية. يرجى تحديد دفعة أخرى توفر {3} الكمية أو تقسيم الصف إلى صفوف متعددة، لتسليم / إصدار من دفعات متعددة
+DocType: Vehicle,License Plate,لوحة الترخيص
 DocType: Appraisal,Goals,الأهداف
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,حدد ملف تعريف نقاط البيع
 DocType: Warranty Claim,Warranty / AMC Status,الضمان / AMC الحالة
 ,Accounts Browser,متصفح الحسابات
 DocType: Payment Entry Reference,Payment Entry Reference,دفع الدخول المرجعي
@@ -1610,7 +1640,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,الموظف لا يمكن أن يقدم تقارير إلى نفسه.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",إذا الحساب مجمد، يسمح بالدخول إلى المستخدمين المحددين.
 DocType: Email Digest,Bank Balance,الرصيد المصرفي
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},قيد محاسبي لي {0}: {1} يمكن إجراؤه بالعملة: {2} فقط
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},قيد محاسبي لي {0}: {1} يمكن إجراؤه بالعملة: {2} فقط
 DocType: Job Opening,"Job profile, qualifications required etc.",الملف الوظيفي ، المؤهلات المطلوبة الخ
 DocType: Journal Entry Account,Account Balance,رصيد حسابك
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,القاعدة الضريبية للمعاملات.
@@ -1619,11 +1649,9 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),مجموع الضرائب والرسوم (عملة الشركة)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,تظهر P &amp; L أرصدة السنة المالية غير مغلق ل
 DocType: Lab Test Template,Collection Details,تفاصيل المجموعة
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0",سيليكت cp.name، cp.test_code، cp.parent، cp.invoice، ct.physician، ct.consultation_date from tabConsultation ct، `تابلب prescription` كب حيث ct.patient = &#39;{0}&#39; و cp.parent = كت. نيم و cp.test_created = 0
 DocType: Shipping Rule,Shipping Account,حساب الشحن
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: الحساب {2} غير نشط
-apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,جعل أوامر البيع لمساعدتك على خطة العمل الخاصة بك وتسليم في الوقت المحدد
+apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,أنشاء طلبات مبيعات لمساعدتك على وضع خطة لعملك وتسليمه في الوقت المحدد
 DocType: Quality Inspection,Readings,قراءات
 DocType: Stock Entry,Total Additional Costs,مجموع التكاليف الإضافية
 DocType: Course Schedule,SH,SH
@@ -1634,11 +1662,11 @@
 DocType: Shipping Rule Condition,To Value,إلى القيمة
 DocType: Asset Movement,Stock Manager,مدير المخزن
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},مستودع مصدر إلزامي ل صف {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,زلة التعبئة
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,قائمة بمحتويات الشحنة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,ايجار مكتب
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,إعدادات العبارة  SMS
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,فشل الاستيراد !
-apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,لا يوجد عنوان مضاف.
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,فشل الاستيراد !
+apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,لم تتم إضافة أي عنوان حتى الآن.
 DocType: Workstation Working Hour,Workstation Working Hour,محطة العمل ساعة العمل
 DocType: Vital Signs,Blood Pressure,ضغط الدم
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +121,Analyst,المحلل
@@ -1653,25 +1681,25 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Government,حكومة
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,المطالبة بالنفقات {0} بالفعل موجوده في سجل المركبة
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Institute Name,اسم المؤسسة
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,الرجاء إدخال سداد المبلغ
-apps/erpnext/erpnext/config/stock.py +305,Item Variants,المتغيرات البند
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,الرجاء إدخال قيمة السداد
+apps/erpnext/erpnext/config/stock.py +305,Item Variants,متغيرات البند
 DocType: Company,Services,الخدمات
 DocType: HR Settings,Email Salary Slip to Employee,إرسال كشف الراتب للموظفين بالبريد الالكتروني
-DocType: Cost Center,Parent Cost Center,الأم تكلفة مركز
+DocType: Cost Center,Parent Cost Center,مركز التكلفة الأب
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1017,Select Possible Supplier,اختر مزود ممكن
 DocType: Sales Invoice,Source,المصدر
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,مشاهدة مغلقة
 DocType: Leave Type,Is Leave Without Pay,إجازة بدون راتب
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,فئة الأصول إلزامي لبند الأصول الثابتة
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,فئة الأصول إلزامي لبند الأصول الثابتة
 DocType: Fee Validity,Fee Validity,صلاحية الرسوم
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,لا توجد في جدول الدفع السجلات
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,لم يتم العثور على أية سجلات في جدول الدفعات
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},هذا {0} يتعارض مع {1} عن {2} {3}
 DocType: Student Attendance Tool,Students HTML,طلاب HTML
 DocType: POS Profile,Apply Discount,تطبيق التخفيض
 DocType: GST HSN Code,GST HSN Code,غست هسن كود
 DocType: Employee External Work History,Total Experience,مجموع الخبرة
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,مشاريع مفتوحة
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,Packing Slip(s) cancelled,تم إلغاء كشف/كشوف التعبئة
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,Packing Slip(s) cancelled,القائمة بمحتويات الشحنة إلغاؤها
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,التدفق النقد من الاستثمار
 DocType: Program Course,Program Course,دورة برنامج
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,رسوم الشحن
@@ -1683,25 +1711,26 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,البحث التنفيذي
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,إنشاء زبائن المحتملين
 DocType: Maintenance Schedule,Schedules,جداول
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,مطلوب بوس الشخصي لاستخدام نقطة البيع
 DocType: Purchase Invoice Item,Net Amount,صافي القيمة
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} لم يتم إرسالها، ولذلك لا يمكن إكمال الإجراء
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} لم يتم إرسالها، ولذلك لا يمكن إكمال الإجراء
 DocType: Purchase Order Item Supplied,BOM Detail No,رقم تفاصيل فاتورة الموارد
 DocType: Landed Cost Voucher,Additional Charges,تكاليف إضافية
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),مقدار الخصم الاضافي (بعملة الشركة)
 DocType: Supplier Scorecard,Supplier Scorecard,بطاقة أداء المورد
-apps/erpnext/erpnext/accounts/doctype/account/account.js +21,Please create new account from Chart of Accounts.,.يرجى إنشاء حساب جديد من دليل الحسابات
+apps/erpnext/erpnext/accounts/doctype/account/account.js +21,Please create new account from Chart of Accounts.,يرجى إنشاء حساب جديد من دليل الحسابات.
 ,Support Hour Distribution,دعم توزيع ساعة
 DocType: Maintenance Visit,Maintenance Visit,صيانة زيارة
 DocType: Student,Leaving Certificate Number,ترك رقم الشهادة
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}",تم إلغاء التعيين، يرجى مراجعة وإلغاء الفاتورة {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}",تم إلغاء التعيين، يرجى مراجعة وإلغاء الفاتورة {0}
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,الكمية المتاحة من الباتش فى المخزن
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,تحديث تنسيق الطباعة
 DocType: Landed Cost Voucher,Landed Cost Help,هبطت التكلفة مساعدة
 DocType: Purchase Invoice,Select Shipping Address,حدد عنوان الشحن
 DocType: Leave Block List,Block Holidays on important days.,حظر الاجازات في الايام المهمة
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +71,Accounts Receivable Summary,ملخص الحسابات المدينة
-DocType: Employee Loan,Monthly Repayment Amount,الشهري مبلغ السداد
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,الرجاء ضع للمستخدم (ID) في سجل الموظف لوضع الدور الوظيفي للموظف
+DocType: Employee Loan,Monthly Repayment Amount,قيمة السداد الشهري
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,الرجاء حدد هوية المستخدم في سجلات الموظف للتمكن من تحديد الدور الوظيفي للموظف
 DocType: UOM,UOM Name,اسم وحدة القايس
 DocType: GST HSN Code,HSN Code,رمز هسن
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,قيمة المساهمة
@@ -1716,20 +1745,20 @@
 DocType: Patient,Tobacco Past Use,التبغ الماضي استخدام
 DocType: Sales Invoice Item,Brand Name,العلامة التجارية اسم
 DocType: Purchase Receipt,Transporter Details,تفاصيل نقل
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},تم تعيين المستخدم {0} بالفعل إلى الطبيب {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,مطلوب المخزن الافتراضي للبند المحدد
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},تم تعيين المستخدم {0} بالفعل إلى الطبيب {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,المستودع الافتراضي للصنف المحدد متطلب
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,صندوق
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,مزود الممكن
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,مورد محتمل
 DocType: Budget,Monthly Distribution,التوزيع الشهري
-apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,قائمة المتلقي هو فارغ. يرجى إنشاء قائمة استقبال
+apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,قائمة المرسل اليهم فارغة. يرجى إنشاء قائمة المرسل اليهم
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Healthcare (beta),الرعاية الصحية (إصدار تجريبي)
 DocType: Production Plan Sales Order,Production Plan Sales Order,أمر الإنتاج خطة المبيعات
 DocType: Sales Partner,Sales Partner Target,المبلغ المطلوب للمندوب
 DocType: Loan Type,Maximum Loan Amount,أعلى قيمة للقرض
 DocType: Pricing Rule,Pricing Rule,قاعدة التسعير
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},رقم لفة مكرر للطالب {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},رقم لفة مكرر للطالب {0}
 DocType: Budget,Action if Annual Budget Exceeded,الإجراء إذا تجاوزت الميزانية السنوية المخصصة
-apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,الخامات المطلوبه لأمر الشراء
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Material Request to Purchase Order
 DocType: Shopping Cart Settings,Payment Success URL,رابط نجاح الدفع
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},لا يوجد عاد هذا البند {1} في {2} {3} الصف # {0}
 DocType: Purchase Receipt,PREC-,PREC-
@@ -1738,13 +1767,13 @@
 DocType: Consultation,Medical Coding,الترميز الطبي
 DocType: Healthcare Settings,Reminder Message,رسالة تذكير
 ,Lead Name,اسم مبادرة البيع
-,POS,POS
+,POS,نقطة البيع
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +310,Opening Stock Balance,فتح البورصة الميزان
+apps/erpnext/erpnext/config/stock.py +310,Opening Stock Balance,الرصيد الافتتاحي للمخزون
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} يجب أن يظهر مرة واحدة فقط
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},غير مسموح بتحويل اكثر {0} من {1} مقابل امر الشراء {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},الاجازات خصصت بنجاح ل {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,لا توجد عناصر لحزمة
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,لا توجد عناصر لحزمة
 DocType: Shipping Rule Condition,From Value,من القيمة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,تصنيع الكمية إلزامي
 DocType: Employee Loan,Repayment Method,طريقة السداد
@@ -1754,40 +1783,41 @@
 apps/erpnext/erpnext/utilities/activation.py +118,"Students are at the heart of the system, add all your students",الطلاب في قلب النظام، إضافة كل ما تبذلونه من الطلاب
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},الصف # {0}: تاريخ التخليص {1} لا يمكن أن يكون قبل تاريخ شيكات {2}
 DocType: Company,Default Holiday List,قائمة العطل الافتراضية
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +190,Row {0}: From Time and To Time of {1} is overlapping with {2},صف {0}: من الوقت وإلى وقت {1} ومتداخلة مع {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +190,Row {0}: From Time and To Time of {1} is overlapping with {2},صف {0}: (من الوقت) و (إلى وقت) ل {1}  يتداخل مع {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,خصوم المخزون
 DocType: Purchase Invoice,Supplier Warehouse,المورد مستودع
 DocType: Opportunity,Contact Mobile No,الاتصال المحمول لا
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,حدد الشركة
 ,Material Requests for which Supplier Quotations are not created,طلبات المواد التي الاقتباسات مورد لا يتم إنشاء
 DocType: Student Group,Set 0 for no limit,مجموعة 0 لأي حد
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,اليوم (أيام) التي تقدم بطلب للحصول على إجازة هي العطل.لا تحتاج إلى تقديم طلب للحصول الإجازة.
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,إعادة إرسال البريد الإلكتروني الدفع
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,إعادة إرسال الدفعة عبر البريد الإلكتروني
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,مهمة جديدة
 DocType: Consultation,Appointment,موعد
-apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,جعل الاقتباس
+apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,انشاء عرض اسعار
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,تقارير أخرى
 DocType: Dependent Task,Dependent Task,مهمة تابعة
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},معامل التحويل الافتراضي لوحدة القياس يجب أن يكون 1 في الصف {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},إجازة من نوع {0} لا يمكن أن تكون أطول من {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},معامل التحويل الافتراضي لوحدة القياس يجب أن يكون 1 في الصف {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},نوع الاجازة {0} لا يمكن أن يكون أطول من {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,محاولة التخطيط لعمليات لX أيام مقدما.
 DocType: HR Settings,Stop Birthday Reminders,ايقاف التذكير بأعياد الميلاد
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},الرجاء تحديد الحساب افتراضي لدفع الرواتب في الشركة {0}
-DocType: SMS Center,Receiver List,قائمة المرسل اليهم
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,بحث البند
+DocType: SMS Center,Receiver List,قائمة الاستقبال
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,بحث البند
 DocType: Patient Appointment,Referring Physician,يشير الطبيب
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,القيمة المستهلكة
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,صافي التغير في النقد
 DocType: Assessment Plan,Grading Scale,مقياس الدرجات
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,وحدة القياس {0} تم إدخال أكثر من مرة واحدة في معامل التحويل الجدول
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,أنجزت بالفعل
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,وحدة القياس {0} تم إدخال أكثر من مرة واحدة في معامل التحويل الجدول
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,أنجزت بالفعل
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,الأسهم، إلى داخل، أعطى
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},دفع طلب بالفعل {0}
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},طلب الدفعة موجود بالفعل {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,تكلفة المواد المصروفة
 DocType: Physician,Hospital,مستشفى
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},لا يجب أن تكون الكمية أكثر من {0}
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,لم يتم إغلاق سابقة المالية السنة
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},الكمية يجب ألا تكون أكثر من {0}
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,السنة المالية السابقة ليست مغلقة
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),العمر (أيام)
-DocType: Quotation Item,Quotation Item,عنصر تسعيرة
+DocType: Quotation Item,Quotation Item,بند المناقصة
 DocType: Customer,Customer POS Id,الرقم التعريفي لنقاط البيع للعملاء
 DocType: Account,Account Name,اسم الحساب
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,(من تاريخ) لا يمكن أن يكون أكبر (الي التاريخ)
@@ -1795,34 +1825,36 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,المورد الرئيسي نوع .
 DocType: Purchase Order Item,Supplier Part Number,رقم قطعة المورد
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,لا يمكن أن يكون معدل التحويل 0 أو 1
-DocType: Sales Invoice,Reference Document,وثيقة مرجعية
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} ملغى أو موقف
+DocType: Subscription,Reference Document,وثيقة مرجعية
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} ملغى أو موقف
 DocType: Accounts Settings,Credit Controller,مراقب الرصيد دائن
 DocType: Delivery Note,Vehicle Dispatch Date,سيارة الإرسال التسجيل
 DocType: Healthcare Settings,Default Medical Code Standard,المعايير الطبية الافتراضية
 DocType: Purchase Invoice Item,HSN/SAC,HSN / SAC
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +234,Purchase Receipt {0} is not submitted,استلام المشتريات {0} غير مرحل
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +234,Purchase Receipt {0} is not submitted,إيصال استلام المشتريات {0} لم يتم تقديمه
 DocType: Company,Default Payable Account,حساب الدائنون الافتراضي
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",إعدادات عربة التسوق مثل قواعد الشحن، وقائمة الأسعار الخ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}٪ مفوترة
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,ترتيب حسب السعر ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,الكمية المحجوزة
 DocType: Party Account,Party Account,حساب طرف
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,الموارد البشرية
 DocType: Lead,Upper Income,الدخل الأعلى
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +41,Reject,رفض
+apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +41,Reject,ارفض
 DocType: Journal Entry Account,Debit in Company Currency,الخصم في الشركة العملات
 DocType: BOM Item,BOM Item,بند قائمة المواد
 DocType: Appraisal,For Employee,للموظف
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,جعل صرف الدخول
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,الصف {0}: تقدم ضد مورد يجب بخصم
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,أنشي قيد صرق قرض
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,الصف {0}:  الدفعة المقدمة مقابل المورد يجب أن تكون مدين
 DocType: Company,Default Values,قيم افتراضية
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{التردد} الخلاصه
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{التردد} الخلاصه
 DocType: Expense Claim,Total Amount Reimbursed,مجموع المبلغ المسدد
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,وذلك بناء على السجلات مقابل هذه المركبة. للمزيد انظر التسلسل الزمني أدناه
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},مقابل فاتورة المورد {0} بتاريخ {1}
 DocType: Customer,Default Price List,قائمة الأسعار الافتراضي
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,سجل حركة الأصول {0} تم إنشاؤه
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,لا يمكنك حذف السنة المالية {0}. تم تحديد السنة المالية {0} كأفتراضي في الإعدادات الشاملة
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,يوجد عميل يحمل الاسم نفسه من قبل
 DocType: Journal Entry,Entry Type,نوع الدخول
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,لم يتم ربط أي خطة تقييم مع مجموعة التقييم هذه
 ,Customer Credit Balance,رصيد العميل
@@ -1832,11 +1864,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,التسعير
 DocType: Quotation,Term Details,تفاصيل الشروط
 DocType: Project,Total Sales Cost (via Sales Order),إجمالي تكلفة المبيعات (عبر أمر المبيعات)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,لا يمكن تسجيل أكثر من {0} طلاب لمجموعة الطلاب هذه.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,لا يمكن تسجيل أكثر من {0} طلاب لمجموعة الطلاب هذه.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,عدد الرصاص
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} يجب أن يكون أكبر من 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),القدرة على التخطيط لل(أيام)
-apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,المشتريات
+apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,الشراء
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,لا شيء من هذه البنود يكون أي تغيير في كمية أو قيمة.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,حقل إلزامي - البرنامج
 DocType: Special Test Template,Result Component,مكون النتيجة
@@ -1848,9 +1880,11 @@
 DocType: Lab Test,Technician Name,اسم فني
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,إلغاء ربط الدفع على إلغاء الفاتورة
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},ينبغي أن تكون القراءة الحالية لعداد المسافات اكبر من القراءة السابقة لعداد المسافات للمركبة {0}
+DocType: Restaurant Reservation,No Show,لا إظهار
 DocType: Shipping Rule Country,Shipping Rule Country,بلد قاعدة الشحن
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,إجازة والحضور
+apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,الاجازات و الحضور
 DocType: Maintenance Visit,Partially Completed,أنجزت جزئيا
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,حساسية معتدلة
 DocType: Leave Type,Include holidays within leaves as leaves,ايام العطل التي ضمن الإجازات تحسب إجازة
 DocType: Sales Invoice,Packed Items,عناصر معبأة
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,المطالبة الضمان ضد رقم المسلسل
@@ -1867,13 +1901,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),المبلغ المدفوع ( بعملة الشركة )
 DocType: Purchase Invoice,Additional Discount,خصم إضافي
 DocType: Selling Settings,Selling Settings,إعدادات البيع
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,تأكيد الإجراء
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,مزادات على الانترنت
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,يرجى تحديد الكمية أو التقييم إما قيم أو كليهما
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,استيفاء
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,عرض في العربة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,نفقات تسويقية
 ,Item Shortage Report,تقرير نقص السلعة
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","يذكر الوزن، \n يرجى ذكر ""الوزن UOM"" للغاية"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","يذكر الوزن، \n يرجى ذكر ""الوزن UOM"" للغاية"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,طلب المواد المستخدمة لانشاء الحركة المخزنية
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,تاريخ الاستهلاك التالي للأصول الجديدة الزامي
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,مجموعة منفصلة بالطبع مقرها لكل دفعة
@@ -1882,15 +1917,15 @@
 DocType: Drug Prescription,Dosage by time interval,الجرعة بواسطة الفاصل الزمني
 ,Student Fee Collection,طالب رسوم مجموعة
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +23,Appointment Duration (mins),الموعد المحدد (دقيقة)
-DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,اكتب قيد يوميه لكل حركة مخزنية ؟
+DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,اعمل قيد محاسبي لكل حركة للمخزون
 DocType: Leave Allocation,Total Leaves Allocated,إجمالي الاجازات المخصصة
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},مستودع المطلوبة في صف لا {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,الرجاء إدخال ساري المفعول بداية السنة المالية وتواريخ نهاية
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,الرجاء إدخال تاريخ بداية السنة المالية وتاريخ النهاية
 DocType: Employee,Date Of Retirement,تاريخ التقاعد
 DocType: Upload Attendance,Get Template,الحصول على نموذج
 DocType: Material Request,Transferred,نقل
 DocType: Vehicle,Doors,الأبواب
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,اكتمل الإعداد ERPNext !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,اكتمل الإعداد ERPNext !
 DocType: Healthcare Settings,Collect Fee for Patient Registration,تحصيل رسوم تسجيل المريض
 DocType: Course Assessment Criteria,Weightage,الوزن
 DocType: Purchase Invoice,Tax Breakup,تفكيك الضرائب
@@ -1898,7 +1933,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,"{0} {1}: مركز التكلفة مطلوب لحساب 'الربح والخسارة' {2}. 
 يرجى إعداد مركز تكلفة افتراضي للشركة."
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +118,A Customer Group exists with same name please change the Customer name or rename the Customer Group,يوجد تصنيف مجموعة زبائن بنفس الاسم يرجى تغيير اسم الزبون أو إعادة تسمية مجموعة الزبائن
-apps/erpnext/erpnext/public/js/templates/contact_list.html +37,New Contact,اتصال جديد
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,New Contact,جهة اتصال جديدة
 DocType: Territory,Parent Territory,الأم الأرض
 DocType: Sales Invoice,Place of Supply,مكان التوريد
 DocType: Quality Inspection Reading,Reading 2,القراءة 2
@@ -1910,36 +1945,36 @@
 DocType: Employee,AB+,+AB
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",إذا كان هذا البند لديها بدائل، فإنه لا يمكن اختيارها في أوامر البيع الخ
 DocType: Lead,Next Contact By,جهة الاتصال التالية بواسطة
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},الكمية المطلوبة للبند {0} في الصف {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},الكمية المطلوبة للبند {0} في الصف {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},مستودع {0} لا يمكن حذف كما توجد كمية القطعة ل {1}
 DocType: Quotation,Order Type,نوع الطلب
-DocType: Purchase Invoice,Notification Email Address,عنوان البريد الإلكتروني الإخطار
 ,Item-wise Sales Register,سجل مبيعات الصنف
 DocType: Asset,Gross Purchase Amount,اجمالي مبلغ المشتريات
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,أرصدة الافتتاح
 DocType: Asset,Depreciation Method,طريقة الاستهلاك
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,غير متصل
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,غير متصل بالإنترنت
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,هل هذه الضريبة متضمنة في الاسعار الأساسية؟
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,إجمالي المستهدف
 DocType: Job Applicant,Applicant for a Job,المتقدم للحصول على وظيفة
 DocType: Production Plan Material Request,Production Plan Material Request,إنتاج خطة المواد طلب
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,لا أوامر الإنتاج التي تم إنشاؤها
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,لم يتم إنشاء أمر الأنتاج
 DocType: Stock Reconciliation,Reconciliation JSON,المصالحة JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,عدد كبير جدا من الأعمدة. تصدير التقرير وطباعته باستخدام تطبيق جدول البيانات.
 DocType: Purchase Invoice Item,Batch No,رقم دفعة
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},طلب تسعير: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,السماح بعدة أوامر البيع ضد طلب شراء العميل
 DocType: Student Group Instructor,Student Group Instructor,مجموعة الطالب
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 رقم الجوال
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,رئيسي
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,رئيسي
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,مختلف
 DocType: Naming Series,Set prefix for numbering series on your transactions,تحديد بادئة للترقيم المتسلسل على المعاملات الخاصة بك
 DocType: Employee Attendance Tool,Employees HTML,الموظفين HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,يجب أن يكون قائمة المواد الافتراضية ({0}) نشطه لهذا البند أو نمودجه
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,يجب أن تكون قائمة المواد الافتراضية ({0}) نشطه لهذا الصنف أو قوالبه
 DocType: Employee,Leave Encashed?,إجازات مصروفة نقداً؟
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,فرصة من الحقل إلزامي
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,(الفرصة من) حقل إلزامي
 DocType: Email Digest,Annual Expenses,المصروفات السنوية
 DocType: Item,Variants,المتغيرات
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,قم بعمل امر الشراء
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,انشاء طلب شراء
 DocType: SMS Center,Send To,أرسل إلى
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},ليس هناك ما يكفي من توازن إجازة لإجازة نوع {0}
 DocType: Payment Reconciliation Payment,Allocated amount,المبلغ المخصص
@@ -1955,19 +1990,20 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,قوة الطالب
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,مقابل قيد اليومية {0} ليس لديه  أي قيد {1} غيرمتطابق
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,تقييمات
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,أحداث التدريب
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},تكرار المسلسل لا دخل القطعة ل {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,شرط للحصول على قانون الشحن
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,تفضل
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,من فضلك ادخل
 apps/erpnext/erpnext/controllers/accounts_controller.py +423,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",لا يمكن اعادة فوترة البند {0} في الصف {1} أكثر من {2}.للسماح باعادة تحديث الفاتورة، يرجى التحديد في إعدادات الشراء
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +212,Please set filter based on Item or Warehouse,الرجاء تعيين مرشح بناء على البند أو مستودع
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +212,Please set filter based on Item or Warehouse,يرجى ضبط الفلتر على أساس البند أو المخزن
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),وزن صافي من هذه الحزمة. (تحسب تلقائيا مجموع الوزن الصافي للسلعة)
 DocType: Sales Order,To Deliver and Bill,لتسليم وبيل
 DocType: Student Group,Instructors,المحاضرون
 DocType: GL Entry,Credit Amount in Account Currency,المبلغ الدائن بعملة الحساب
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,قائمة المواد {0} يجب تقديمها
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,قائمة المواد {0} يجب تقديمها
 DocType: Authorization Control,Authorization Control,التحكم في الترخيص
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},الصف # {0}: رفض مستودع إلزامي ضد رفض البند {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,دفعة
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,دفع
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.",مستودع {0} غير مرتبط بأي حساب، يرجى ذكر الحساب في سجل المستودع أو تعيين حساب المخزون الافتراضي في الشركة {1}.
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,إدارة طلباتك
 DocType: Production Order Operation,Actual Time and Cost,الوقت الفعلي والتكلفة
@@ -1983,11 +2019,11 @@
 DocType: Quotation Item,Actual Qty,الكمية الفعلية
 DocType: Sales Invoice Item,References,المراجع
 DocType: Quality Inspection Reading,Reading 10,قراءة 10
-DocType: Hub Settings,Hub Node,المحور عقدة
+DocType: Hub Category,Hub Node,المحور عقدة
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,لقد دخلت عناصر مكررة . يرجى تصحيح و حاول مرة أخرى.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,مساعد
 DocType: Asset Movement,Asset Movement,حركة الأصول
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,سلة جديدة
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,سلة جديدة
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,البند {0} ليس بند لديه رقم تسلسلي
 DocType: SMS Center,Create Receiver List,إنشاء قائمة استقبال
 DocType: Vehicle,Wheels,عجلات
@@ -2000,16 +2036,16 @@
 DocType: Purchase Receipt Item Supplied,Consumed Qty,تستهلك الكمية
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,الاتصالات السلكية واللاسلكية
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),يشير إلى أن الحزمة هو جزء من هذا التسليم (مشروع فقط)
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,انشئ مدخل دفع
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},كمية القطعة ل {0} يجب أن يكون أقل من {1}
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,انشئ تدوين مدفوعات
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},كمية القطعة ل {0} يجب أن يكون أقل من {1}
 ,Sales Invoice Trends,اتجاهات فاتورة المبيعات
 DocType: Leave Application,Apply / Approve Leaves,تقديم / الموافقة على أجازة
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,لأجل
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,لأجل
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'
 DocType: Sales Order Item,Delivery Warehouse,مستودع تسليم
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,شجرة من مراكز التكلفة المالية.
 DocType: Serial No,Delivery Document No,الوثيقة لا تسليم
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},"يرجى تحديد ""احساب لربح / الخسارة عند التخلص من الأصول"" للشركة {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},"يرجى تحديد ""احساب لربح / الخسارة عند التخلص من الأصول"" للشركة {0}"
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,الحصول على أصناف من إيصالات الشراء
 DocType: Serial No,Creation Date,تاريخ الإنشاء
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},يظهر البند {0} عدة مرات في قائمة الأسعار {1}
@@ -2020,11 +2056,12 @@
 DocType: Student,Student Mobile Number,طالب عدد موبايل
 DocType: Item,Has Variants,يحتوي على متغيرات
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,تحديث الرد
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},لقد حددت العناصر من {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},لقد حددت العناصر من {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,اسم التوزيع الشهري
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,معرف الدفعة إلزامي
 DocType: Sales Person,Parent Sales Person,رجل المبيعات الرئيسي
-DocType: Purchase Invoice,Recurring Invoice,فاتورة المتكررة
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,من الأعلى إلى الأقل
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,حدد البرنامج أولا
 DocType: Patient Appointment,Patient Age,عمر المريض
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,إدارة المشاريع
 DocType: Supplier,Supplier of Goods or Services.,المورد من السلع أو الخدمات.
@@ -2032,14 +2069,14 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,الحسابات المستحقة القبض الافتراضية لاستخدامها إذا لم يتم تعيين في المريض لحجز رسوم التشاور.
 DocType: Vehicle Log,Fuel Price,أسعار الوقود
 DocType: Budget,Budget,ميزانية
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,تعيين فتح
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,بند الأصول الثابتة يجب أن لا يكون بند مخزون.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,تعيين فتح
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,بند الأصول الثابتة يجب أن لا يكون بند مخزون.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",لا يمكن تعيين الميزانية مقابل {0}، حيث إنها ليست حسابا للدخل أو للمصروفات
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,محقق
 DocType: Student Admission,Application Form Route,مسار إستمارة التقديم
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,إقليم / العملاء
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,ترك نوع {0} لا يمكن تخصيصها لأنها إجازة بدون راتب
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},يجب أن يكون المبلغ المخصص {1} أقل من أو يساوي الفاتورة المبلغ المستحق {2} الصف {0}
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,نوع الإجازة {0} لا يمكن تخصيصها الي موظف لانها إجازة بدون مرتب
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},صف {0}: يجب أن يكون المبلغ المخصص {1} أقل من أو يساوي فاتورة المبلغ القائم {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,وبعبارة تكون مرئية بمجرد حفظ فاتورة المبيعات.
 DocType: Lead,Follow Up,متابعة
 DocType: Item,Is Sales Item,صنف المبيعات
@@ -2047,12 +2084,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,البند {0} ليس الإعداد لل سيد رقم التسلسلي تاريخ المغادرة
 DocType: Maintenance Visit,Maintenance Time,وقت الصيانة
 ,Amount to Deliver,المبلغ تسليم
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},تم إدخال نفس العنصر عدة مرات. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,تاريخ البدء الأجل لا يمكن أن يكون أقدم من تاريخ بداية السنة للعام الدراسي الذي يرتبط مصطلح (السنة الأكاديمية {}). يرجى تصحيح التواريخ وحاول مرة أخرى.
 DocType: Guardian,Guardian Interests,الجارديان الهوايات
 DocType: Naming Series,Current Value,القيمة الحالية
-apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,توجد السنوات المالية متعددة للتاريخ {0}. يرجى وضع الشركة في السنة المالية
+apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,توجد سنوات مالية متعددة للتاريخ {0}. يرجى تحديد الشركة في السنة المالية
 DocType: School Settings,Instructor Records to be created by,سجلات المعلم ليتم إنشاؤها من قبل
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} تم انشاؤه
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} تم انشاؤه
 DocType: Delivery Note Item,Against Sales Order,مقابل طلب مبيعات
 ,Serial No Status,حالة رقم المسلسل
 DocType: Payment Entry Reference,Outstanding,معلقة
@@ -2062,13 +2100,13 @@
 						must be greater than or equal to {2}",الصف {0}: لتعيين {1} دوريا، الفرق بين من تاريخ وإلى تاريخ \ يجب أن يكون أكبر من أو يساوي {2}
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,ويستند هذا على حركة المخزون. راجع {0} لمزيد من التفاصيل
 DocType: Pricing Rule,Selling,بيع
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},مبلغ {0} {1} خصم مقابل {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},مبلغ {0} {1} خصم مقابل {2}
 DocType: Employee,Salary Information,معلومات عن الراتب
 DocType: Sales Person,Name and Employee ID,الاسم والرقم الوظيفي
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,لا يمكن أن يكون تاريخ الاستحقاق قبل تاريخ الترحيل
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,لا يمكن أن يكون تاريخ الاستحقاق قبل تاريخ الترحيل
 DocType: Website Item Group,Website Item Group,مجموعة الأصناف للموقع
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,الرسوم والضرائب
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,من فضلك ادخل تاريخ المرجعي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,من فضلك ادخل تاريخ المرجع
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} لا يمكن فلترة المدفوعات المدخلة  {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,جدول السلعة الذي سيظهر في الموقع
 DocType: Purchase Order Item Supplied,Supplied Qty,الموردة الكمية
@@ -2091,7 +2129,7 @@
 DocType: Issue,Resolution Details,قرار تفاصيل
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,المخصصات
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,معايير القبول
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,الرجاء إدخال طلبات المواد في الجدول أعلاه
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,الرجاء إدخال طلبات المواد في الجدول أعلاه
 DocType: Item Attribute,Attribute Name,السمة اسم
 DocType: BOM,Show In Website,تظهر في الموقع
 DocType: Shopping Cart Settings,Show Quantity in Website,تظهر الكمية في الموقع
@@ -2100,7 +2138,7 @@
 DocType: Item Reorder,Check in (group),تحقق في (مجموعة)
 ,Qty to Order,الكمية للطلب
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked",رئيس الحساب تحت المسؤولية أو الأسهم، والتي سيتم حجز الربح / الخسارة
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,مخطط جانت لجميع المهام.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,مخطط جانت لجميع المهام.
 DocType: Opportunity,Mins to First Response,دقيقة لأول رد
 DocType: Pricing Rule,Margin Type,نوع الهامش
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} ساعات
@@ -2110,9 +2148,9 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +98,Available slots,الفتحات المتاحة
 DocType: C-Form Invoice Detail,Invoice No,رقم الفاتورة
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +350,Make Payment,قم بالدفع
-DocType: Room,Room Name,اسم الغرفة
+DocType: Room,Room Name,اسم القاعة
 DocType: Prescription Duration,Prescription Duration,مدة الوصفة الطبية
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",لا يمكن تطبيق الإجازة / إلغاءها قبل {0}، حيث تم بالفعل تحويل رصيد الإجازة في سجل تخصيص الإجازات المستقبلية {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",الاجازة لا يمكن تطبيقها او إلغائها قبل {0}، لان رصيد الإجازات قد تم تحويله الي سجل تخصيص إجازات مستقبلي {1}
 DocType: Activity Cost,Costing Rate,سعر التكلفة
 apps/erpnext/erpnext/config/selling.py +229,Customer Addresses And Contacts,عنوان العميل ومعلومات الاتصال الخاصة به
 ,Campaign Efficiency,كفاءة الحملة
@@ -2120,36 +2158,36 @@
 DocType: Payment Entry,Transaction ID,رقم المعاملات
 DocType: Patient,Surgical History,التاريخ الجراحي
 DocType: Employee,Resignation Letter Date,تاريخ رسالة الإستقالة
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,يتم تصفية قواعد التسعير على أساس الكمية .
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},يرجى تحديد تاريخ الالتحاق بالموظف {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,كما تتم فلترت قواعد التسعير على أساس الكمية.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},يرجى تحديد تاريخ الالتحاق بالموظف {0}
 DocType: Task,Total Billing Amount (via Time Sheet),المبلغ الكلي الفواتير (عبر ورقة الوقت)
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,الإيرادات العملاء المكررين
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ايرادات الزبائن المكررين
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) يجب أن يمتلك الصلاحية (بالمخول بالموافقة على النفقات)
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,زوج
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,حدد مكتب الإدارة والكمية للإنتاج
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,حدد مكتب الإدارة والكمية للإنتاج
 DocType: Asset,Depreciation Schedule,جدول الاستهلاك الزمني
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,عناوين شركاء المبيعات والاتصالات
 DocType: Bank Reconciliation Detail,Against Account,مقابل الحساب
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,يجب أن يكون تاريخ نصف يوم ما بين التاريخ والتاريخ
 DocType: Maintenance Schedule Detail,Actual Date,التاريخ الفعلي
 DocType: Item,Has Batch No,ودفعة واحدة لا
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},الفواتير السنوية:  {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},الفواتير السنوية:  {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),ضريبة السلع والخدمات (ضريبة السلع والخدمات الهند)
 DocType: Delivery Note,Excise Page Number,رقم صفحة الضريبة
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory",(الشركة) و (من تاريخ) و (إلى تاريخ) تكون إلزامية
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,الحصول على من التشاور
 DocType: Asset,Purchase Date,تاريخ الشراء
-DocType: Employee,Personal Details,تفاصيل شخصية
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},"{0} يرجى تحديد ""مركز تكلفة استهلاك الأصول"" للشركة"
+DocType: Employee,Personal Details,تفاصيل شخصي
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},"يرجى تحديد ""مركز تكلفة استهلاك الأصول"" للشركة {0}"
 ,Maintenance Schedules,جداول الصيانة
 DocType: Task,Actual End Date (via Time Sheet),تاريخ الإنتهاء الفعلي (عبر ورقة الوقت)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},مبلغ {0} {1} مقابل {2} {3}
-,Quotation Trends,مجرى التسعيرات
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},مبلغ {0} {1} مقابل {2} {3}
+,Quotation Trends,مؤشرات المناقصة
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},فئة البند غير مذكورة في ماستر البند لهذا البند {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,مدين لحساب يجب أن يكون حساب مدين
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,مدين لحساب يجب أن يكون حساب مدين
 DocType: Shipping Rule Condition,Shipping Amount,مبلغ الشحن
 DocType: Supplier Scorecard Period,Period Score,فترة النتيجة
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,إضافة العملاء
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,إضافة العملاء
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,في انتظار المبلغ
 DocType: Lab Test Template,Special,خاص
 DocType: Purchase Invoice Item,Conversion Factor,معامل التحويل
@@ -2157,13 +2195,14 @@
 ,Vehicle Expenses,مصاريف السيارة
 DocType: Serial No,Invoice Details,تفاصيل الفاتورة
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},{0} العمر الافتراضي النافع المتوقع يجب أن يكون أكبر من أو يساوي
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,ابدأ
+DocType: Hub Category,Hub Category,فئة المحور
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,عدد المركبات
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,التاريخ الذي سيتم فاتورة المتكررة وقف
-DocType: Employee Loan,Loan Amount,مبلغ القرض
+DocType: Employee Loan,Loan Amount,قيمة القرض
 DocType: Program Enrollment,Self-Driving Vehicle,سيارة ذاتية القيادة
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,المورد بطاقة الأداء الدائمة
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},صف {0}: من مواد مشروع القانون لم يتم العثور على هذا البند {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},صف {0}: من مواد مشروع القانون لم يتم العثور على هذا البند {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,مجموع الأوراق المخصصة {0} لا يمكن أن يكون أقل من الأوراق وافق بالفعل {1} للفترة
 DocType: Journal Entry,Accounts Receivable,حسابات القبض
 ,Supplier-Wise Sales Analytics,المورد حكيم المبيعات تحليلات
@@ -2174,18 +2213,18 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)",دورة الأم (ترك فارغة، إذا لم يكن هذا جزءا من دورة الآباء)
 DocType: Leave Control Panel,Leave blank if considered for all employee types,اتركها فارغه اذا كنت تريد تطبيقها لجميع انواع الموظفين
 DocType: Landed Cost Voucher,Distribute Charges Based On,توزيع الرسوم بناء على
-apps/erpnext/erpnext/hooks.py +131,Timesheets,الجداول الزمنية
+apps/erpnext/erpnext/hooks.py +140,Timesheets,الجداول الزمنية
 DocType: HR Settings,HR Settings,إعدادات الموارد البشرية
 DocType: Salary Slip,net pay info,معلومات صافي الأجر
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,يتم تحديث هذه القيمة في قائمة أسعار المبيعات الافتراضية.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,Expense Claim is pending approval. Only the Expense Approver can update status.,(المطالبة بالنفقات) بانتظار الموافقة. فقط المخول بالموافق على النفقات يمكنه تحديث الحالة.
-DocType: Email Digest,New Expenses,مصاريف جديدة
+DocType: Email Digest,New Expenses,مصاريف او نفقات جديدة
 DocType: Purchase Invoice,Additional Discount Amount,مقدار الخصم الاضافي
 DocType: Consultation,Patient Details,تفاصيل المريض
 DocType: Patient,B Positive,B إيجابي
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",الصف # {0}: يجب أن يكون العدد 1، والبند هو أصل ثابت. الرجاء استخدام صف منفصل عن الكمية متعددة.
 DocType: Leave Block List Allow,Leave Block List Allow,تفعيل قائمة الإجازات المحظورة
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,الاسم المختصر لا يمكن أن يكون فارغاً او بها فضاء
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,الاسم المختصر لا يمكن أن يكون فارغاً او بها فضاء
 DocType: Patient Medical Record,Patient Medical Record,السجل الطبي للمريض
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,(من تصنيف (مجموعة) إلى تصنيف (غير المجموعة
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,الرياضة
@@ -2201,58 +2240,60 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,تعذر العثور على سعر الصرف من {0} إلى {1} لتاريخ المفتاح {2}. يرجى إنشاء سجل صرف العملات يدويا
 DocType: POS Profile,Price List,قائمة الأسعار
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} هو الآن السنة المالية الافتراضية. يرجى تحديث المتصفح حتى يصبح التغيير ساري المفعول.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,مطالبات بالنفقات
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,مطالبات بالنفقات
 DocType: Issue,Support,الدعم
 ,BOM Search,BOM البحث
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",نشر &quot;في الأوراق المالية&quot; أو &quot;غير متوفر&quot; على المحور استنادا إلى الأسهم المتوفرة في هذا المستودع.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),الإغلاق (الافتتاحي + المجاميع)
 DocType: Vehicle,Fuel Type,نوع الوقود
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,يرجى تحديد العملة في الشركة
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,يرجى تحديد العملة للشركة
 DocType: Workstation,Wages per hour,الأجور في الساعة
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},توازن الأسهم في الدفعة {0} ستصبح سلبية {1} القطعة ل{2} في {3} مستودع
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,تم رفع طلبات المواد التالية تلقائيا بناء على مستوى اعادة الطلب للبنود
-DocType: Email Digest,Pending Sales Orders,في انتظار أوامر البيع
+DocType: Email Digest,Pending Sales Orders,طلبات مبيعات معلقة
 apps/erpnext/erpnext/controllers/accounts_controller.py +279,Account {0} is invalid. Account Currency must be {1},الحساب {0} غير صحيح. يجب أن تكون عملة الحساب {1}
 DocType: Healthcare Settings,Remind Before,تذكير من قبل
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},معامل تحويل وحدة القياس مطلوب في الصف: {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",الصف # {0}: يجب أن يكون مرجع نوع الوثيقة واحدة من ترتيب المبيعات، مبيعات فاتورة أو إدخال دفتر اليومية
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",الصف # {0}: يجب أن يكون مرجع نوع الوثيقة واحدة من ترتيب المبيعات، مبيعات فاتورة أو إدخال دفتر اليومية
 DocType: Salary Component,Deduction,خصم
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,صف {0}: من الوقت وإلى وقت إلزامي.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,صف {0}: (من الوقت) و (إلى وقت) تكون إلزامية.
 DocType: Stock Reconciliation Item,Amount Difference,مقدار الفرق
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},سعر السلعة تم اضافتة لـ {0} في قائمة الأسعار {1}
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,الرجاء إدخال رقم الموظف من رجل المبيعات هذا
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},سعر السلعة تم اضافتة لـ {0} في قائمة الأسعار {1}
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,الرجاء إدخال (رقم هوية الموظف) لمندوب المبيعات هذا
 DocType: Territory,Classification of Customers by region,تصنيف العملاء حسب المنطقة
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,يجب أن يكون فرق القيمة يساوي صفر
 DocType: Project,Gross Margin,هامش الربح الإجمالي
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,من فضلك ادخل إنتاج السلعة الأولى
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,الرجاء إدخال بند الإنتاج أولا
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,حساب رصيد الحساب المصرفي
 DocType: Normal Test Template,Normal Test Template,قالب الاختبار العادي
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,المستخدم معطل
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +764,Quotation,تسعيرة
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +764,Quotation,عرض أسعار
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +957,Cannot set a received RFQ to No Quote,لا يمكن تعيين رفق وردت إلى أي اقتباس
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,مجموع الخصم
 ,Production Analytics,تحليلات إنتاج
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,ويستند هذا إلى المعاملات ضد هذا المريض. انظر الجدول الزمني أدناه للحصول على التفاصيل
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,تم تحديث التكلفة
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,تم تحديث التكلفة
 DocType: Employee,Date of Birth,تاريخ الميلاد
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,تمت إرجاع البند {0} من قبل
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** السنة المالية ** تمثل السنة المالية. يتم تتبع جميع القيود المحاسبية والمعاملات الرئيسية الأخرى مقابل ** السنة المالية **.
 DocType: Opportunity,Customer / Lead Address,الزبون/ عنوان الزبون المحتمل
 DocType: Patient,DOB,تاريخ الميلاد
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,إعداد بطاقة الأداء المورد
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},تحذير: شهادة SSL غير صالحة في المرفق {0}
-DocType: Student Admission,Eligibility,جدارة
-apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads",يؤدي مساعدتك في الحصول على العمل، إضافة كافة جهات الاتصال الخاصة بك وأكثر من ذلك كما يؤدي بك
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,اسم خطة التقييم
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},تحذير: شهادة SSL غير صالحة في المرفق {0}
+apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads",الزبائن المحتملين يساعدونك في الحصول على العمل، إضافة جميع جهات الاتصال الخاصة بك وأكثر من ذلك كزبائن محتملين
 DocType: Production Order Operation,Actual Operation Time,الفعلي وقت التشغيل
 DocType: Authorization Rule,Applicable To (User),قابلة للتطبيق على (المستخدم)
 DocType: Purchase Taxes and Charges,Deduct,خصم
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,المسمى الوظيفي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,الوصف الوظيفي
 DocType: Student Applicant,Applied,طُبق
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,إعادة فتح
 DocType: Sales Invoice Item,Qty as per Stock UOM,الكمية حسب السهم لوحدة قياس السهم
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,اسم Guardian2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","أحرف خاصة باستثناء ""-"" "".""، ""#""، و""/"" غير مسموح به في تسمية الترقيم المتسلسل"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",تتبع الحملات المبيعات. تتبع يؤدي، الاقتباسات، ترتيب المبيعات الخ من الحملات لقياس العائد على الاستثمار.
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",تتبع حملات المبيعات. تتبع الزبون المحتمل، العروض، طلبات المبيعات ... الخ من الحملات لقياس العائد على الاستثمار.
 DocType: Expense Claim,Approver,المخول بالموافقة
 ,SO Qty,كمية طلبات الشراء
 DocType: Guardian,Work Address,عنوان العمل
@@ -2260,7 +2301,7 @@
 DocType: Request for Quotation,Manufacturing Manager,مدير التصنيع
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},الرقم التسلسلي  {0} تحت الضمان حتى {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,ملاحظة تقسيم التوصيل في حزم.
-apps/erpnext/erpnext/hooks.py +98,Shipments,شحنات
+apps/erpnext/erpnext/hooks.py +107,Shipments,شحنات
 DocType: Payment Entry,Total Allocated Amount (Company Currency),إجمالي المبلغ المخصص (شركة العملات)
 DocType: Purchase Order Item,To be delivered to customer,ليتم تسليمها إلى العملاء
 DocType: BOM,Scrap Material Cost,التكلفة الخردة المواد
@@ -2277,17 +2318,17 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +29,-Above,-أعلى
 DocType: Employee Loan,Employee Loan Account,حساب قرض الحاص بالموظف
 DocType: Leave Application,Total Leave Days,مجموع أيام الإجازة
-DocType: Email Digest,Note: Email will not be sent to disabled users,ملاحظة: لن يتم إرسالها إلى البريد الإلكتروني للمستخدمين ذوي الاحتياجات الخاصة
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,عدد التفاعل
+DocType: Email Digest,Note: Email will not be sent to disabled users,ملاحظة: لن يتم إرسال الايميل إلى المستخدم الغير نشط
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,عدد مرات التفاعل
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,إعدادات فاريانت العنصر
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,حدد الشركة ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,اتركها فارغه اذا كنت تريد تطبيقها لجميع الأقسام
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",أنواع التوظيف (دائم أو عقد او متدرب الخ).
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} إلزامي للبند {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).",أنواع التوظيف (دائم أو عقد او متدرب الخ).
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} إلزامي للبند {1}
 DocType: Process Payroll,Fortnightly,مرة كل اسبوعين
 DocType: Currency Exchange,From Currency,من العملة
 DocType: Vital Signs,Weight (In Kilogram),الوزن (بالكيلوجرام)
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",يرجى تحديد المبلغ المخصص، نوع الفاتورة ورقم الفاتورة في أتلست صف واحد
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",الرجاء تحديد القيمة المخصصة و نوع الفاتورة ورقم الفاتورة على الأقل  في صف واحد
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,تكلفة الشراء الجديد
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +97,Sales Order required for Item {0},اوامر البيع المطلوبة القطعة ل {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),معدل (عملة الشركة)
@@ -2306,23 +2347,23 @@
 DocType: Bank Guarantee,Bank Guarantee,ضمان بنكي
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"يرجى النقر على ""إنشاء الجدول الزمني"" للحصول على الجدول الزمني"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,كانت هناك أخطاء أثناء حذف الجداول التالية:
-DocType: Bin,Ordered Quantity,أمرت الكمية
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","مثلا ""أدوات البناء للبنائين"""
+DocType: Bin,Ordered Quantity,الكمية التي تم طلبها
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","مثلا ""أدوات البناء للبنائين"""
 DocType: Grading Scale,Grading Scale Intervals,فواصل درجات مقياس
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: قيد محاسبي ل {2} يمكن ان يتم فقط بالعملة : {3}
 DocType: Production Order,In Process,في عملية
-DocType: Authorization Rule,Itemwise Discount,Itemwise الخصم
+DocType: Authorization Rule,Itemwise Discount,التخفيض من ناحية البنود
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,شجرة الحسابات المالية.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} مقابل طلب مبيعات {1}
 DocType: Account,Fixed Asset,الأصول الثابتة
 apps/erpnext/erpnext/config/stock.py +320,Serialized Inventory,جرد المتسلسلة
 DocType: Employee Loan,Account Info,معلومات الحساب
-DocType: Activity Type,Default Billing Rate,سعر الفوترة افتراضي
+DocType: Activity Type,Default Billing Rate,سعر الفوترة الافتراضي
 DocType: Fees,Include Payment,تضمين الدفع
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} تم إنشاء مجموعات الطلاب.
 DocType: Sales Invoice,Total Billing Amount,المبلغ الكلي الفواتير
 apps/erpnext/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py +17,There must be a default incoming Email Account enabled for this to work. Please setup a default incoming Email Account (POP/IMAP) and try again.,يجب أن يكون هناك حساب البريد الإلكتروني الافتراضي واردة لهذا العمل. يرجى إعداد حساب بريد إلكتروني واردة الافتراضي (POP / IMAP) وحاول مرة أخرى.
-DocType: Healthcare Settings,Receivable Account,حساب المستحق
+DocType: Healthcare Settings,Receivable Account,حساب مدين
 apps/erpnext/erpnext/controllers/accounts_controller.py +553,Row #{0}: Asset {1} is already {2},الصف # {0}: الأصول {1} هو بالفعل {2}
 DocType: Quotation Item,Stock Balance,رصيد المخزون
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,ترتيب مبيعات لدفع
@@ -2330,11 +2371,10 @@
 DocType: Purchase Invoice,With Payment of Tax,مع دفع الضرائب
 DocType: Expense Claim Detail,Expense Claim Detail,تفاصيل  المطالبة بالنفقات
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,تريبليكات للمورد
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,يرجى تحديد الحساب الصحيح
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,يرجى اختيارالحساب الصحيح
 DocType: Item,Weight UOM,وحدة قياس الوزن
 DocType: Salary Structure Employee,Salary Structure Employee,هيكلية مرتب الموظف
 DocType: Patient,Blood Group,فصيلة الدم
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,ريثما
 DocType: Course,Course Name,اسم المقرر التعليمي
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,المستخدمين الذين يمكنهم الموافقة على الطلبات إجازة موظف معين
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,أدوات مكتبية
@@ -2351,11 +2391,11 @@
 DocType: BOM Scrap Item,Basic Amount (Company Currency),المبلغ الأساسي (عملة الشركة )
 DocType: Student,Guardians,أولياء الأمور
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,لن تظهر الأسعار إذا لم يتم تعيين قائمة الأسعار
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,يرجى تحديد بلد لهذا الشحن القاعدة أو تحقق من جميع أنحاء العالم الشحن
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,يرجى تحديد البلد لقاعدة الشحن هذه أو اختيار شحن لجميع أنحاء العالم
 DocType: Stock Entry,Total Incoming Value,إجمالي القيمة الواردة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,مدين الي مطلوب
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,مدين الي مطلوب
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",الجداول الزمنية تساعد على الحفاظ على المسار من الوقت والتكلفة وإعداد الفواتير للنشاطات الذي قام به فريقك
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,قائمة اسعار المشتريات
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,قائمة أسعار الشراء
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,نماذج من متغيرات بطاقة الأداء المورد.
 DocType: Offer Letter Term,Offer Term,عرض عمل
 DocType: Quality Inspection,Quality Manager,مدير الجودة
@@ -2363,7 +2403,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,دفع المصالحة
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,يرجى تحديد اسم الشخص المسؤول
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,تكنولوجيا
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},عدد غير مدفوع: {0}
+DocType: Hub Settings,Unregister from Hub,إلغاء التسجيل من هاب
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},عدد غير مدفوع: {0}
 DocType: BOM Website Operation,BOM Website Operation,عملية الموقع الالكتروني بقائمة المواد
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,عرض عمل
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,انشاء طلبات مواد وأوامر إنتاج.
@@ -2371,15 +2412,17 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +76,Total Invoiced Amt,إجمالي الفاتورة AMT
 DocType: Supplier,Warn RFQs,تحذير رفق
 DocType: BOM,Conversion Rate,معدل التحويل
-apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,بحث منتوج
+apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,بحث عن منتج
 DocType: Physician Schedule Time Slot,To Time,إلى وقت
 DocType: Authorization Rule,Approving Role (above authorized value),الدور الوظيفي الذي لديه صلاحية الموافقة على قيمة اعلى من القيمة المرخص بها
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,دائن الى حساب يجب أن يكون حساب دائن
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},تكرار قائمة المواد: {0} لا يمكن ان يكون أب او أبن من {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,يرجى اختيار قبول الطالب الذي هو إلزامي للمتقدم طالب طالب
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},تكرار قائمة المواد: {0} لا يمكن ان يكون أب او أبن من {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,يرجى تحديد قائمة الأسعار لنشر التسعير
 DocType: Production Order Operation,Completed Qty,الكمية المنتهية
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",ل{0}، فقط حساب المدين يمكن ربطه مقابل قيد دائن أخر
-apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,قائمة الأسعار {0} تم تعطيل
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},صف {0}: اكتمال الكمية لا يمكن أن يكون أكثر من {1} لتشغيل {2}
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,قائمة الأسعار {0} معطله
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},الصف {0}: الكمية المكتملة لا يمكن أن تكون أكثر من {1} للعملية {2}
 DocType: Manufacturing Settings,Allow Overtime,تسمح العمل الإضافي
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",المسلسل البند {0} لا يمكن تحديثه باستخدام الأسهم المصالحة، يرجى استخدام دخول الأسهم
 DocType: Training Event Employee,Training Event Employee,تدريب الموظف للحدث
@@ -2387,38 +2430,39 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} الرقم التسلسلي مطلوب للعنصر {1}. لقد قدمت {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,معدل التقييم الحالي
 DocType: Item,Customer Item Codes,كود صنف العميل
+DocType: Training Event,Advance,تقدم
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,لجعل تكرار مرة أخرى.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,أرباح / خسائر الناتجة عن صرف العملة
 DocType: Opportunity,Lost Reason,فقد السبب
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,عنوان جديد
 DocType: Quality Inspection,Sample Size,حجم العينة
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,الرجاء إدخال الوثيقة إيصال
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,كل الأصناف قد تم فوترتها من قبل
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',الرجاء تحديد صالح &#39;من القضية رقم&#39;
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',الرجاء تحديد صالح &#39;من القضية رقم&#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Further cost centers can be made under Groups but entries can be made against non-Groups
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,المستخدمين والأذونات
 DocType: Vehicle Log,VLOG.,مدونة فيديو.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},أوامر إنتاج المنشأة: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},اوامر انتاج تم انشاؤها: {0}
 DocType: Branch,Branch,فرع
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,الطباعة و العلامات التجارية
 DocType: Company,Total Monthly Sales,إجمالي المبيعات الشهرية
 DocType: Bin,Actual Quantity,الكمية الفعلية
 DocType: Shipping Rule,example: Next Day Shipping,مثال:شحن اليوم التالي
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,الرقم التسلسلي {0} غير موجود
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},تم الاشتراك {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},تم الاشتراك {0}
 DocType: Fee Schedule Program,Fee Schedule Program,برنامج جدول الرسوم
 DocType: Fee Schedule Program,Student Batch,دفعة طالب
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,حدد * من علامة التبويب علامات التبويب فيتفيت حيث المريض = &#39;{0}&#39; ترتيب قبل sign_date ديسك الحد 1
-apps/erpnext/erpnext/utilities/activation.py +119,Make Student,جعل الطلاب
+apps/erpnext/erpnext/utilities/activation.py +119,Make Student,أنشاء طالب
 DocType: Supplier Scorecard Scoring Standing,Min Grade,دقيقة الصف
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},لقد وجهت الدعوة إلى التعاون في هذا المشروع: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},طبيب غير متوفر على {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},لقد وجهت الدعوة إلى التعاون في هذا المشروع: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},طبيب غير متوفر على {0}
 DocType: Leave Block List Date,Block Date,تاريخ الحظر
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},إضافة معرف اشتراك حقل مخصص في نوع المستند {0}
 DocType: Purchase Receipt,Supplier Delivery Note,المورد تسليم مذكرة
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,تقدم الآن
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,تقدم الآن
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},الكمية الفعلية {0} / الكمية المنتظره {1}
 DocType: Purchase Invoice,E-commerce GSTIN,التجارة الإلكترونية غستين
 DocType: Sales Order,Not Delivered,ولا يتم توريدها
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,لا يمكن أن يكون التاريخ المتوقع قبل تاريخ المعاملة
 ,Bank Clearance Summary,ملخص التخليص البنكى
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",إنشاء وإدارة البريد الإلكتروني يوميا وأسبوعية وشهرية .
 DocType: Appraisal Goal,Appraisal Goal,الغاية من التقييم
@@ -2426,21 +2470,22 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,المباني
 DocType: Fee Schedule,Fee Structure,هيكلية الرسوم
 DocType: Timesheet Detail,Costing Amount,تكلف مبلغ
-DocType: Student Admission,Application Fee,رسوم الإستمارة
+DocType: Student Admission Program,Application Fee,رسوم الإستمارة
 DocType: Process Payroll,Submit Salary Slip,الموافقة كشف الرواتب
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,خصم Maxiumm القطعة ل {0} {1} ٪
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,أعلي تخفبض للبند {0} هو {1}٪
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,استيراد بكميات كبيرة
 DocType: Sales Partner,Address & Contacts,معلومات الاتصال والعنوان
 DocType: SMS Log,Sender Name,اسم المرسل
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,فرز حسب المعايير
 DocType: POS Profile,[Select],[اختر ]
 DocType: Vital Signs,Blood Pressure (diastolic),ضغط الدم (الانبساطي)
 DocType: SMS Log,Sent To,يرسل الى
 DocType: Payment Request,Make Sales Invoice,انشاء فاتورة المبيعات
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,البرامج الالكترونية
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,التالي اتصل بنا التسجيل لا يمكن أن يكون في الماضي
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,(تاريخ الاتصال التالي) لا يمكن أن تكون في الماضي
 DocType: Company,For Reference Only.,للإشارة او المرجعية فقط.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},طبيب {0} غير متوفر على {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,حدد الدفعة رقم
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,حدد الدفعة رقم
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},غير صالح {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,ريفيرانس إنف
@@ -2456,15 +2501,15 @@
 DocType: Normal Test Items,Require Result Value,تتطلب قيمة النتيجة
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,القضية رقم لا يمكن أن يكون 0
 DocType: Item,Show a slideshow at the top of the page,تظهر الشرائح في أعلى الصفحة
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,قوائم المواد
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,مخازن
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,قوائم المواد
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,مخازن
 DocType: Project Type,Projects Manager,مدير المشاريع
 DocType: Serial No,Delivery Time,وقت التسليم
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,العمرعلى أساس
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,تم إلغاء التعيين
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,تم إلغاء التعيين
 DocType: Item,End of Life,نهاية الحياة
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,السفر
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,لا يوجد هيكل راتب افتراضي نشط للموظف {0} للتواريخ المحددة
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,السفر
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,لا يوجد هيكل راتب افتراضيي نشط للموظف {0} للتواريخ المحددة
 DocType: Leave Block List,Allow Users,السماح للمستخدمين
 DocType: Purchase Order,Customer Mobile No,العميل رقم هاتفك الجوال
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,تواتري
@@ -2473,12 +2518,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,تحديث التكلفة
 DocType: Item Reorder,Item Reorder,البند إعادة ترتيب
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,عرض كشف الراتب
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,نقل المواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,نقل المواد
 DocType: Fees,Send Payment Request,إرسال طلب الدفع
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",تحديد العمليات ، وتكلفة التشغيل وإعطاء عملية فريدة من نوعها لا لل عمليات الخاصة بك.
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,هذه الوثيقة هي على حد كتبها {0} {1} لمادة {4}. وجعل لكم آخر {3} ضد نفسه {2}؟
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,الرجاء تعيين المتكررة بعد إنقاذ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,حساب كمية حدد التغيير
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,يرجى تحديد (تكرار) بعد الحفظ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,حساب كمية حدد التغيير
 DocType: Purchase Invoice,Price List Currency,قائمة الأسعار العملات
 DocType: Naming Series,User must always select,يجب دائما مستخدم تحديد
 DocType: Stock Settings,Allow Negative Stock,السماح بالقيم السالبة للمخزون
@@ -2498,7 +2543,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,موظف
 DocType: Sample Collection,Collected Time,الوقت الذي تم جمعه
 DocType: Company,Sales Monthly History,المبيعات التاريخ الشهري
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,حدد الدفعة
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,حدد الدفعة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} قدمت الفواتير بشكل كامل
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,علامات حيوية
 DocType: Training Event,End Time,وقت الانتهاء
@@ -2506,22 +2551,24 @@
 DocType: Payment Entry,Payment Deductions or Loss,خصومات الدفع أو الخسارة
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,شروط العقد القياسية للمبيعات أو للمشتريات .
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,المجموعة بواسطة قسيمة
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,هل تريد بالتأكيد إلغاء هذا الموعد؟
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,خط أنابيب المبيعات
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},الرجاء تحديد حساب افتراضي في مكون الراتب {0}
-apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,المطلوبة على
+apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,مطلوب في
 DocType: Rename Tool,File to Rename,إعادة تسمية الملف
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},الرجاء تحديد BOM لعنصر في الصف {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},الرجاء تحديد قائمة المواد للبند في الصف {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},الحساب {0} لا يتطابق مع الشركة {1} في طريقة الحساب: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},محدد BOM {0} غير موجود القطعة ل{1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,{0} يجب أن يتم إلغاء جدول الصيانة قبل إلغاء هذا الأمر المبيعات
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,يجب إلغاء الجدول الزمني للصيانة {0} قبل إلغاء طلب المبيعات
+DocType: POS Profile,Applicable for Users,ينطبق على المستخدمين
 DocType: Notification Control,Expense Claim Approved,اعتمد طلب النفقات
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,كشف الراتب للموظف {0} تم إنشاؤه لهذه الفترة
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,كشف الراتب للموظف {0} تم إنشاؤه لهذه الفترة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,الأدوية
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,تكلفة البنود التي تم شراؤها
 DocType: Selling Settings,Sales Order Required,اوامر البيع المطلوبة
 DocType: Purchase Invoice,Credit To,دائن الى
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,الزبائن المحتملين النشطاء / زبائن
-DocType: Employee Education,Post Graduate,إجازة علية
+DocType: Employee Education,Post Graduate,إجازة عاليه
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,صيانة جدول التفاصيل
 DocType: Supplier Scorecard,Warn for new Purchase Orders,تحذير لأوامر الشراء الجديدة
 DocType: Quality Inspection Reading,Reading 9,قراءة 9
@@ -2533,43 +2580,45 @@
 DocType: Request for Quotation Supplier,No Quote,لا اقتباس
 DocType: Warranty Claim,Raised By,التي أثارها
 DocType: Payment Gateway Account,Payment Account,حساب الدفع
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +880,Please specify Company to proceed,يرجى تحديد الشركة للمضي قدما
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,صافي التغير في حسابات المقبوضات
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +880,Please specify Company to proceed,يرجى تحديد الشركة للمتابعة
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,صافي التغير في الحسابات المدينة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Compensatory Off,تعويض
 DocType: Offer Letter,Accepted,مقبول
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,منظمة
 DocType: BOM Update Tool,BOM Update Tool,أداة تحديث بوم
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company",لم يتم تحديد حساب الحزب، يرجى الإعداد الافتراضي حساب الحزب في الشركة
 DocType: SG Creation Tool Course,Student Group Name,اسم المجموعة الطلابية
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,إنشاء الرسوم
-apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,من فضلك تأكد من حقا تريد حذف جميع المعاملات لهذه الشركة. ستبقى البيانات الرئيسية الخاصة بك كما هو. لا يمكن التراجع عن هذا الإجراء.
-DocType: Room,Room Number,رقم الغرفة
+apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,يرجى التأكد من أنك تريد حقا حذف جميع المعاملات لهذه الشركة. ستبقى بياناتك الرئيسية (الماستر) كما هيا. لا يمكن التراجع عن هذا الإجراء.
+DocType: Room,Room Number,رقم القاعة
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},مرجع غير صالح {0} {1}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) لا يمكن أن يكون أكبر من الكمية المخطط لها ({2}) في أمر الإنتاج {3}
 DocType: Shipping Rule,Shipping Rule Label,ملصق قاعدة الشحن
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,المنتدى المستعمل
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,لا يمكن ترك المواد الخام فارغة.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.",تعذر تحديث المخزون، الفاتورة تحتوي علي بند مبعد الشحن.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,لا يمكن ترك المواد الخام فارغة.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.",تعذر تحديث المخزون، الفاتورة تحتوي علي بند مبعد الشحن.
 DocType: Lab Test Sample,Lab Test Sample,عينة اختبار المختبر
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,خيارات مجلة الدخول
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,قيد دفتر يومية سريع
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,لا يمكنك تغيير السعر اذا قائمة المواد جعلت مقابل أي بند
-DocType: Employee,Previous Work Experience,خبرة العمل السابقة
+DocType: Restaurant,Invoice Series Prefix,بادئة سلسلة الفاتورة
+DocType: Employee,Previous Work Experience,خبرة العمل السابق
 DocType: Stock Entry,For Quantity,لالكمية
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},يرجى إدخال الكمية المخططة القطعة ل {0} في {1} الصف
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},الرجاء إدخال الكمية المخططة للبند {0} في الصف {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} لم يتم تقديمه
-apps/erpnext/erpnext/config/stock.py +27,Requests for items.,طلبات البنود.
+apps/erpnext/erpnext/config/stock.py +27,Requests for items.,طلبات للبنود.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,سيتم إنشاء منفصلة أمر الإنتاج لمادة جيدة لكل النهائي.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} يجب أن يكون سالبة في وثيقة الارجاع
 ,Minutes to First Response for Issues,دقائق إلى الاستجابة الأولى لقضايا
 DocType: Purchase Invoice,Terms and Conditions1,1 الشروط والأحكام
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,اسم المعهد الذي كنت تقوم بإعداد هذا النظام.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,اسم المعهد الذي كنت تقوم بإعداد هذا النظام.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",القيود المحاسبية مجمده حتى هذا التاريخ،  لا أحد يستطيع أن يفعل أو تعديل القيود باستثناء الدور المحدد أدناه.
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,يرجى حفظ المستند قبل إنشاء جدول الصيانة
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,أحدث سعر تحديثها في جميع بومس
 DocType: Fee Schedule,Successful,ناجح
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,حالة المشروع
 DocType: UOM,Check this to disallow fractions. (for Nos),حدد هذا الخيار لعدم السماح بالكسور مع الارقام (for Nos)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,تم إنشاء أوامر الإنتاج التالية:
-DocType: Student Admission,Naming Series (for Student Applicant),تسمية تسلسلية (الطالب مقدم الطلب)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,تم إنشاء أوامر الإنتاج التالية:
+DocType: Student Admission Program,Naming Series (for Student Applicant),تسمية تسلسلية (الطالب مقدم الطلب)
 DocType: Delivery Note,Transporter Name,نقل اسم
 DocType: Authorization Rule,Authorized Value,القيمة المرخص بها
 DocType: BOM,Show Operations,مشاهدة العمليات
@@ -2591,12 +2640,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,شجرة فواتير المواد
 DocType: Student,Joining Date,تاريخ الانضمام
 ,Employees working on a holiday,الموظفون يعملون في يوم العطلة
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,حدد الحاضر
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,حدد كحضور
 DocType: Project,% Complete Method,الطريقة الكاملة٪
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,المخدرات
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,المخدرات
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},لا يمكن أن يكون تاريخ بدء الصيانة قبل تاريخ التسليم لرقم التسلسلي {0}
 DocType: Production Order,Actual End Date,تاريخ الإنتهاء الفعلي
-DocType: BOM,Operating Cost (Company Currency),تكاليف التشغيل ( بعملة الشركة )
+DocType: BOM,Operating Cost (Company Currency),تكاليف التشغيل (عملة الشركة)
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),قابلة للتطبيق على (الدور الوظيفي)
 DocType: BOM Update Tool,Replace BOM,استبدال بوم
@@ -2611,19 +2660,20 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,الموافقة العضو لا يمكن أن يكون نفس المستخدم القاعدة تنطبق على
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),التسعير الاساسي استنادأ لوحدة القياس
 DocType: SMS Log,No of Requested SMS,رقم رسائل SMS  التي طلبت
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,الإجازة بدون راتب لا تتطابق مع سجلات (طلب الإجازة) الموافق عليها
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,الإجازة بدون راتب لا تتطابق مع سجلات (طلب الإجازة) الموافق عليها
 DocType: Campaign,Campaign-.####,حملة # # # #
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,خطوات القادمة
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,يرجى تزويد البنود المحددة بأفضل الأسعار الممكنة
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,الخطوات القادمة
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,يرجى تزويدنا بالبنود المحددة بأفضل الأسعار الممكنة
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,جعل الفاتورة
 DocType: Selling Settings,Auto close Opportunity after 15 days,السيارات فرصة قريبة بعد 15 يوما
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,لا يسمح بأوامر الشراء {0} بسبب وضع بطاقة النقاط {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,لا يسمح بأوامر الشراء {0} بسبب وضع بطاقة النقاط {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,نهاية السنة
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,كوت / ليد٪
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,مناقصة / زبون محتمل٪
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,يجب أن يكون تاريخ انتهاء العقد بعد تاريخ الالتحاق بالعمل
 DocType: Vital Signs,Nutrition Values,قيم التغذية
 DocType: Lab Test Template,Is billable,هو قابل للفوترة
 DocType: Delivery Note,DN-,-DN
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",يجب تعيين كل من &quot;جدول الطبيب&quot; ووقت لكل تعيين &quot;للدكتور {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,موزع طرف ثالث / وكيل / دلّال / شريك / بائع التجزئة الذي يبيع منتجات الشركات مقابل عمولة.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} مقابل أمر الشراء {1}
 DocType: Patient,Patient Demographics,الخصائص الديمغرافية للمرضى
@@ -2673,19 +2723,18 @@
  10. إضافة أو اقتطاع: إذا كنت ترغب في إضافة أو خصم الضرائب."
 DocType: Homepage,Homepage,الصفحة الرئيسية
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,حدد الطبيب ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',أوبديت تابكونسولتاتيون سيت إنفواس = &#39;{0}&#39; وير نيم = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd الكمية
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},سجلات الرسوم  تم انشاؤها - {0}
 DocType: Asset Category Account,Asset Category Account,حساب فئة الأصول
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +117,Cannot produce more Item {0} than Sales Order quantity {1},لا يمكن أن تنتج المزيد من البند {0} اكثر من كمية طلب المبيعات {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,الحركة المخزنية {0} غير مسجلة
 DocType: Payment Reconciliation,Bank / Cash Account,البنك حساب / النقدية
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,التالي اتصل بنا عن طريق لا يمكن أن يكون نفس عنوان البريد الإلكتروني الرصاص
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,(جهة الاتصال التالية) لا يمكن أن يكون نفس (عنوان البريد الإلكتروني للزبون المحتمل)
 DocType: Tax Rule,Billing City,مدينة الفوترة
-DocType: Asset,Manual,كتيب
+DocType: Asset,Manual,يدوي
 DocType: Salary Component Account,Salary Component Account,حساب مكون الراتب
 DocType: Global Defaults,Hide Currency Symbol,إخفاء رمز العملة
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card",على سبيل المثال المصرف، نقدا، بطاقة الائتمان
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card",على سبيل المثال المصرف، نقدا، بطاقة الائتمان
 DocType: Lead Source,Source Name,اسم المصدر
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""",ضغط الدم الطبيعي يستريح في الكبار هو ما يقرب من 120 ملم زئبقي الانقباضي، و 80 ملم زئبق الانبساطي، مختصر &quot;120/80 ملم زئبق&quot;
 DocType: Journal Entry,Credit Note,ملاحظة الائتمان
@@ -2704,38 +2753,39 @@
 DocType: Patient,Occupation,الاحتلال
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,الصف {0} : يجب أن يكون تاريخ بدء قبل تاريخ الانتهاء
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),إجمالي (الكمية)
-DocType: Sales Invoice,This Document,هذا المستند
 DocType: Installation Note Item,Installed Qty,الكميات الثابتة
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,قد يكون هذا بسبب بعض عناوين البريد الإلكتروني غير الصالحة في
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,لقد أضفت
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,نتيجة التدريب
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,نتيجة التدريب
 DocType: Purchase Invoice,Is Paid,مدفوع
 DocType: Salary Structure,Total Earning,إجمالي الدخل
 DocType: Purchase Receipt,Time at which materials were received,الوقت الذي وردت المواد
 DocType: Stock Ledger Entry,Outgoing Rate,أسعار المنتهية ولايته
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,فرع المؤسسة الرئيسية .
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,الماستر الخاص بفروع المؤسسة.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,أو
 DocType: Sales Order,Billing Status,الحالة الفواتير
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,أبلغ عن مشكلة
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Education (beta),التعليم (تجريبي)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,نفقات المرافق
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 فوق
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 و أكثر
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,الصف # {0}: إدخال دفتر اليومية {1} لا يكن لديك حساب {2} أو بالفعل يضاهي ضد قسيمة أخرى
 DocType: Supplier Scorecard Criteria,Criteria Weight,معايير الوزن
 DocType: Buying Settings,Default Buying Price List,قائمة اسعار الشراء الافتراضية
 DocType: Process Payroll,Salary Slip Based on Timesheet,كشف الرواتب بناء على سجل التوقيت
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +113,No employee for the above selected criteria OR salary slip already created,لا يوجد موظف للمعايير المحددة أعلاه أو كشف راتب تم إنشاؤها مسبقا
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +113,No employee for the above selected criteria OR salary slip already created,لا يوجد موظف للمعايير المحددة أعلاه أو ان كشف الراتب تم إنشاؤها مسبقا
 DocType: Notification Control,Sales Order Message,رسالة اوامر البيع
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",تعيين القيم الافتراضية مثل الشركة، والعملة، والسنة المالية الحالية، وما إلى ذلك.
 DocType: Payment Entry,Payment Type,الدفع نوع
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,الرجاء تحديد دفعة للعنصر {0}. تعذر العثور على دفعة واحدة تستوفي هذا المطلب
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,الرجاء تحديد دفعة للعنصر {0}. تعذر العثور على دفعة واحدة تستوفي هذا المطلب
+DocType: Hub Category,Parent Category,القسم الرئيسي
 DocType: Process Payroll,Select Employees,حدد الموظفين
 DocType: Opportunity,Potential Sales Deal,المبيعات المحتملة صفقة
 DocType: Complaint,Complaints,شكاوي
 DocType: Payment Entry,Cheque/Reference Date,تاريخ الصك / السند المرجع
 DocType: Purchase Invoice,Total Taxes and Charges,مجموع الضرائب والرسوم
 DocType: Employee,Emergency Contact,الاتصال في حالات الطوارئ
-DocType: Bank Reconciliation Detail,Payment Entry,دفع الدخول
+DocType: Bank Reconciliation Detail,Payment Entry,تدوينات المدفوعات
 DocType: Item,Quality Parameters,معايير الجودة
 ,sales-browser,مبيعات متصفح
 apps/erpnext/erpnext/accounts/doctype/account/account.js +73,Ledger,حساب الاستاد
@@ -2751,21 +2801,21 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Receipt document must be submitted,يجب تقديم وثيقة استلام
 DocType: Purchase Invoice Item,Received Qty,تلقى الكمية
 DocType: Stock Entry Detail,Serial No / Batch,رقم المسلسل / الدفعة
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +320,Not Paid and Not Delivered,لا المدفوع ويتم تسليم
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +320,Not Paid and Not Delivered,لم يتم الدفع ولم يتم التسليم
 DocType: Product Bundle,Parent Item,البند الاصلي
 DocType: Account,Account Type,نوع الحساب
 DocType: Delivery Note,DN-RET-,-DN-RET
-apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,لا أوراق الزمن
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,ترك نوع {0} لا يمكن إعادة توجيهها ترحيل
+apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,لا يوجد سجل التوقيت
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,نوع الإجازة {0} لا يمكن ان ترحل الي العام التالي
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"لم يتم إنشاء جدول الصيانة لجميع البنود. يرجى النقر على ""إنشاء الجدول الزمني"""
 ,To Produce,لإنتاج
 apps/erpnext/erpnext/config/hr.py +93,Payroll,دفع الرواتب
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included"
-apps/erpnext/erpnext/utilities/activation.py +101,Make User,جعل العضو
+apps/erpnext/erpnext/utilities/activation.py +101,Make User,أنشاء مستخدم
 DocType: Packing Slip,Identification of the package for the delivery (for print),تحديد حزمة لتسليم (للطباعة)
 DocType: Bin,Reserved Quantity,الكمية المحجوزة
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,الرجاء إدخال عنوان بريد إلكتروني صالح
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,الرجاء تحديد عنصر في العربة
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,الرجاء تحديد عنصر في العربة
 DocType: Landed Cost Voucher,Purchase Receipt Items,شراء قطع الإيصال
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Customizing Forms
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,متأخر
@@ -2775,15 +2825,15 @@
 DocType: Payment Request,Amount in customer's currency,المبلغ بعملة العميل
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,تسليم
 DocType: Stock Reconciliation Item,Current Qty,الكمية الحالية
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,إضافة الموردين
+DocType: Restaurant Menu,Restaurant Menu,قائمة المطاعم
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,السابق
-DocType: Appraisal Goal,Key Responsibility Area,معيار التقييم
+DocType: Appraisal Goal,Key Responsibility Area,وصف معيار التقييم
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",دفعات طالب تساعدك على تتبع الحضور، وتقييمات والرسوم للطلاب
 DocType: Payment Entry,Total Allocated Amount,إجمالي المبلغ المخصص
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,تعيين حساب المخزون الافتراضي للمخزون الدائم
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,تعيين حساب المخزون الافتراضي للمخزون الدائم
 DocType: Item Reorder,Material Request Type,طلب نوع المواد
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},قيد دفتر يومية استحقاقي للرواتب من {0} إلى {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save",التخزين المحلي هو الكامل، لم ينقذ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save",التخزين المحلي ممتلئة، لم يتم الحفظ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,الصف {0}: معامل تحويل وحدة القياس إلزامي
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,سعة الغرفة
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,المرجع
@@ -2796,7 +2846,7 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,إخفاء المعرف الضريبي العملاء من المعاملات المبيعات
 DocType: Upload Attendance,Upload HTML,رفع HTML
 DocType: Employee,Relieving Date,تاريخ المغادرة
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",قاعدة الاسعار تم تكوينها لتستبدل قوائم الاسعار / عرف نسبة الخصم  بناء على معيير معينة
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",خاصية قاعدة التسعير تم تكوينها لتقوم بعمليات اعادة كتابة لقوائم الاسعار و تحديد نسبة التخفيض، استنادا إلى بعض المعايير.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,لا يمكن إلا أن تتغير مستودع عبر الحركات المخزنية/ التوصيل ملاحظة / شراء الإيصال
 DocType: Employee Education,Class / Percentage,الفئة / النسبة المئوية
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +130,Head of Marketing and Sales,رئيس التسويق والمبيعات
@@ -2804,8 +2854,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","إذا تم وضع قاعدة تسعيرعلى اسعار  فإنه سيتم اعادة كتابة قائمة الأسعار. السعر الذي حددته  قاعدة التسعير سيكون هو السعر النهائي، لذلك لا يجب تطبيق أي خصم آخر. لذلك في المعاملات مثل طلب المبيعات او طلب شراء غيرها وسيتم جلبها في الحقل 'السعر'، بدلا من الحقل ""قائمة الأسعار ""."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,المسار يؤدي حسب نوع الصناعة .
 DocType: Item Supplier,Item Supplier,البند مزود
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1107,Please enter Item Code to get batch no,الرجاء إدخال رمز المدينة للحصول على دفعة لا
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +827,Please select a value for {0} quotation_to {1},يرجى تحديد قيمة ل {0} {1} quotation_to
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1107,Please enter Item Code to get batch no,الرجاء إدخال كود البند للحصول على رقم الدفعة
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +827,Please select a value for {0} quotation_to {1},يرجى اختيار قيمة ل {0} عرض مسعر إلى {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,جميع العناوين.
 DocType: Company,Stock Settings,إعدادات المخزون
 apps/erpnext/erpnext/accounts/doctype/account/account.py +199,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",دمج غير ممكن إلا إذا الخصائص التالية هي نفسها في كل السجلات. هي المجموعة، نوع الجذر، شركة
@@ -2813,25 +2863,27 @@
 DocType: Task,% Progress,٪ التقدم
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,الربح / الخسارة عند التخلص من الأصول
 DocType: Task,Depends on Tasks,يعتمد على المهام
-apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,إدارة مجموعة العملاء شجرة .
+apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,إدارة هيكلية مجموعات الزبائن.
 DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,يمكن عرض المرفقات بدون تمكين سلة التسوق
 DocType: Normal Test Items,Result Value,قيمة النتيجة
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,اسم مركز تكلفة جديد
 DocType: Leave Control Panel,Leave Control Panel,لوحة تحكم الأجازات
 DocType: Project,Task Completion,إنجاز المهمة
-apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,ليس في المخزون
+apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,غير متوفر
 DocType: Appraisal,HR User,مستخدم الموارد البشرية
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,نقاط البيع؟
 DocType: Purchase Invoice,Taxes and Charges Deducted,خصم الضرائب والرسوم
-apps/erpnext/erpnext/hooks.py +129,Issues,قضايا
+apps/erpnext/erpnext/hooks.py +138,Issues,قضايا
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},يجب أن تكون حالة واحدة من {0}
 DocType: Sales Invoice,Debit To,الخصم ل
-DocType: Delivery Note,Required only for sample item.,المطلوب فقط لمادة العينة.
+DocType: Restaurant Menu Item,Restaurant Menu Item,مطعم القائمة البند
+DocType: Delivery Note,Required only for sample item.,مطلوب فقط لبند عينة.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,الكمية الفعلية بعد العملية
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},لا يوجد كشف راتب بين {0} و {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},لا يوجد كشف راتب بين {0} و {1}
 ,Pending SO Items For Purchase Request,اصناف كتيرة معلقة  لطلب الشراء
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,قبول الطلاب
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} معطل
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,قبول الطلاب
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} معطل
 DocType: Supplier,Billing Currency,الفواتير العملات
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,كبير جدا
@@ -2843,7 +2895,7 @@
 DocType: Journal Entry,Total Credit,إجمالي الائتمان
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},موجود آخر {0} # {1} ضد حركة مخزنية {2}: تحذير
 apps/erpnext/erpnext/utilities/user_progress_utils.py +51,Local,محلي
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),(القروض والسلفيات (الأصول
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),القروض والسلفيات (الأصول)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,مدينون
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +195,Large,كبير
 DocType: Homepage Featured Product,Homepage Featured Product,الصفحة الرئيسية المنتج المميز
@@ -2854,6 +2906,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,يرجى ذكر عدد الزيارات المطلوبة
 DocType: Stock Settings,Default Valuation Method,أسلوب التقييم الافتراضي
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,رسوم
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,التحديث قيد التقدم. قد يستغرق بعض الوقت.
 DocType: Vehicle Log,Fuel Qty,كمية الوقود
 DocType: Production Order Operation,Planned Start Time,المخططة بداية
 DocType: Course,Assessment,تقييم
@@ -2863,17 +2916,17 @@
 DocType: Sensitivity Test Items,Sensitivity Test Items,حساسية اختبار العناصر
 DocType: Fees,Fees,رسوم
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,تحديد سعر الصرف لتحويل عملة إلى أخرى
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +158,Quotation {0} is cancelled,اقتباس {0} تم إلغاء
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +158,Quotation {0} is cancelled,العرض المسعر {0} تم إلغائه
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Outstanding Amount,إجمالي المبلغ المستحق
 DocType: Sales Partner,Targets,أهداف
 DocType: Price List,Price List Master,قائمة الأسعار ماستر
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,جميع معاملات البيع يمكن ان تكون مشارة لعدة ** موظفين مبيعات** بحيث يمكنك تعيين و مراقبة اهداف البيع المحددة
 ,S.O. No.,S.O. رقم
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},يرجى إنشاء العملاء من الرصاص {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},يرجى إنشاء زبون من الزبون المحتمل {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,حدد المريض
 DocType: Price List,Applicable for Countries,ينطبق على البلدان
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,اسم المعلمة
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"يمكن فقط الموافقة علي طلب ايجازة في الحالة ""مقبولة"" و ""مرفوض"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,يمكن فقط تقديم  (طلب الاجازة ) الذي حالته (موافق عليه) و (مرفوض)
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},طالب اسم المجموعة هو إلزامي في الصف {0}
 DocType: Homepage,Products to be shown on website homepage,المنتجات التي سيتم عرضها على موقعه الإلكتروني
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,هذه هي مجموعة العملاء الجذرية والتي لا يمكن تحريرها.
@@ -2912,27 +2965,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,المورد تفاصيل الفاتورة
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,حساب نفقات / قروق ({0}) يجب ان يكون حساب ارباح و خسائر
 DocType: Project,Copied From,تم نسخها من
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},خطأ اسم : {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,نقص
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},خطأ اسم : {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,نقص
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} غير مترابط مع {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,تم وضع علامة حضور للموظف {0} بالفعل
 DocType: Packing Slip,If more than one package of the same type (for print),إذا كان أكثر من حزمة واحدة من نفس النوع (للطباعة)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,يرجى تعيين العملاء الافتراضي في إعدادات المطعم
 ,Salary Register,راتب التسجيل
 DocType: Warehouse,Parent Warehouse,المستودع الأصل
 DocType: C-Form Invoice Detail,Net Total,صافي المجموع
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},لم يتم العثور على بوم الافتراضي للعنصر {0} والمشروع {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},لم يتم العثور على بوم الافتراضي للعنصر {0} والمشروع {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,تحديد أنواع القروض المختلفة
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,المبلغ المعلقة
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),الوقت (دقيقة)
 DocType: Project Task,Working,عامل
 DocType: Stock Ledger Entry,Stock Queue (FIFO),الأسهم قائمة انتظار (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,سنة مالية
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,سنة مالية
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} لا تنتمي إلى شركة {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,تعذر حل الدالة سكور للمعايير {0}. تأكد من أن الصيغة صالحة.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,التكلفة كما في
 DocType: Healthcare Settings,Out Patient Settings,خارج إعدادات المريض
-DocType: Account,Round Off,ختم
+DocType: Account,Round Off,تقريب
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,يجب أن تكون الكمية إيجابية
 ,Requested Qty,الكمية المطلبة
 DocType: Tax Rule,Use for Shopping Cart,استخدم لسلة التسوق
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},قيمة {0} لسمة {1} غير موجود في قائمة صحيحة البند السمة قيم البند {2}
@@ -2941,8 +2996,7 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",وسيتم توزيع تستند رسوم متناسب على الكمية البند أو كمية، حسب اختيارك
 DocType: Maintenance Visit,Purposes,أغراض
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,يجب إدخال بند واحد على الأقل مع كمية سالبة في وثيقة الارجاع
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,إضافة دورات
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",عملية {0} أطول من أي ساعات العمل المتاحة في محطة {1}، وتحطيم العملية في عمليات متعددة
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",العملية {0} أطول من أي ساعات عمل متاحة في محطة العمل {1}، قسم العملية إلى عمليات متعددة
 ,Requested,طلب
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,لا ملاحظات
 DocType: Purchase Invoice,Overdue,تأخير
@@ -2950,27 +3004,29 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,الحساب الجذري يجب أن يكون  مجموعة
 DocType: Consultation,Drug Prescription,وصفة الدواء
 DocType: Fees,FEE.,FEE.
-DocType: Employee Loan,Repaid/Closed,تسديده / مغلق
+DocType: Employee Loan,Repaid/Closed,سداد / مغلق
 DocType: Item,Total Projected Qty,توقعات مجموع الكمية
 DocType: Monthly Distribution,Distribution Name,توزيع الاسم
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,المورد&gt; المورد نوع
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",لم يتم العثور على معدل التقييم للبند {0}، المطلوب القيام به إدخالات المحاسبة ل {1} {2}. إذا كان العنصر يتم التعامل به على أنه عنصر معدل تقييم صفر في {1}، يرجى ذكر أنه في جدول {1} إيتم. خلاف ذلك، يرجى إنشاء معاملة الأسهم الواردة لهذا البند أو ذكر معدل التقييم في سجل البند، ثم حاول تقديم / إلغاء هذا الإدخال
 DocType: Course,Course Code,كود المقرر التعليمي
-apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},التفتيش الجودة المطلوبة القطعة ل {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},فحص الجودة مطلوب للبند {0}
 DocType: POS Settings,Use POS in Offline Mode,استخدام بوس في وضع غير متصل بالشبكة
 DocType: Supplier Scorecard,Supplier Variables,متغيرات المورد
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,المعدل الذي يتم تحويل العملة إلى عملة العميل قاعدة الشركة
 DocType: Purchase Invoice Item,Net Rate (Company Currency),صافي السعر ( بعملة الشركة )
 DocType: Salary Detail,Condition and Formula Help,مساعدة باستخدام الصيغ و الشروط
-apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,إدارة شجرة الإقليم.
+apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,ادارة هيكلية الأقاليم.
 DocType: Journal Entry Account,Sales Invoice,فاتورة مبيعات
 DocType: Journal Entry Account,Party Balance,ميزان الحزب
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,الرجاء حدد تطبيق خصم على
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,الرجاء اختيار (تطبيق تخفيض على)
 DocType: Company,Default Receivable Account,حساب المدينون الأفتراضي
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,أنشئ قيد محاسبي إجمالي للرواتب المدفوعة وفقاً للمعايير المحددة أعلاه
 DocType: Physician,Physician Schedule,جدول الطبيب
 DocType: Purchase Invoice,Deemed Export,يعتبر التصدير
 DocType: Stock Entry,Material Transfer for Manufacture,نقل المواد لتصنيع
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,نسبة الخصم يمكن تطبيقها إما مقابل قائمة الأسعار محددة أو لجميع قائمة الأسعار.
-DocType: Purchase Invoice,Half-yearly,نصف سنوية
+DocType: Subscription,Half-yearly,نصف سنوية
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,القيود المحاسبية للمخزون
 DocType: Lab Test,LabTest Approver,لابتيست أبروفر
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,لقد سبق أن قيمت معايير التقييم {}.
@@ -2980,16 +3036,16 @@
 DocType: Sales Invoice,Customer Address,عنوان العميل
 DocType: Employee Loan,Loan Details,تفاصيل القرض
 DocType: Company,Default Inventory Account,حساب المخزون الافتراضي
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,صف {0}: يجب أن تكتمل الكمية أكبر من الصفر.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,الصف {0}: يجب أن تكون الكمية المكتملة أكبر من الصفر.
 DocType: Antibiotic,Antibiotic Name,اسم المضادات الحيوية
 DocType: Purchase Invoice,Apply Additional Discount On,تطبيق خصم إضافي على
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,اختر صنف...
 DocType: Account,Root Type,نوع الجذر
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +132,Row # {0}: Cannot return more than {1} for Item {2},الصف # {0}: لا يمكن إرجاع أكثر من {1} للالبند {2}
-apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +45,Plot,مؤامرة
+apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +45,Plot,مخطط
 DocType: Item Group,Show this slideshow at the top of the page,تظهر هذه الشرائح في أعلى الصفحة
-DocType: BOM,Item UOM,وحدة قياس السلعة
+DocType: BOM,Item UOM,وحدة قياس البند
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),مبلغ الضريبة بعد خصم مبلغ (شركة العملات)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},المستودع المستهدف إلزامي لصف {0}
 DocType: Cheque Print Template,Primary Settings,الإعدادات الأولية
@@ -2999,13 +3055,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,صغير جدا
 DocType: Company,Standard Template,قالب قياسي
 DocType: Training Event,Theory,نظرية
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,تحذير : كمية المواد المطلوبة  هي أقل من الحد الأدنى للطلب الكمية
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,تحذير : كمية المواد المطلوبة  هي أقل من الحد الأدنى للطلب الكمية
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,الحساب {0} مجمّد
-DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,كيان قانوني / الفرعية مع مخطط مستقل للحسابات تابعة للمنظمة.
+DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,الكيان القانوني و الشركات التابعة التى لها لدليل حسابات منفصل تنتمي إلى المنظمة.
 DocType: Payment Request,Mute Email,كتم البريد الإلكتروني
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",الأغذية والمشروبات والتبغ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},يمكن إجراء دفعة فقط مقابل فاتورة غير مدفوعة {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,لا يمكن أن تكون نسبة العمولة أكبر من 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},يمكن إجراء دفعة فقط مقابل فاتورة غير مدفوعة {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,لا يمكن أن تكون نسبة العمولة أكبر من 100
 DocType: Stock Entry,Subcontract,قام بمقاولة فرعية
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,الرجاء إدخال {0} أولا
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,لا توجد ردود من
@@ -3023,10 +3079,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,اللون
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,معايير خطة تقييم
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,منع أوامر الشراء
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,سريع التأثر
 DocType: Patient Appointment,Scheduled,من المقرر
-apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,طلب للحصول على الاقتباس.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,الرجاء الإعداد نظام تسمية الموظف في الموارد البشرية&gt; إعدادات الموارد البشرية
-apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",يرجى تحديد عنصر، حيث قال &quot;هل البند الأسهم&quot; هو &quot;لا&quot; و &quot;هل المبيعات البند&quot; هو &quot;نعم&quot; وليس هناك حزمة المنتجات الأخرى
+apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,طلب للحصول على عرض مسعر.
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","الرجاء اختيار البند حيث ""هل بند مخزون"" يكون ""لا"" و ""هل بند مبيعات"" يكون ""نعم"" وليس هناك حزم منتجات اخرى"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,حدد العميل
 DocType: Student Log,Academic,أكاديمي
 DocType: Patient,Personal and Social History,التاريخ الشخصي والاجتماعي
 DocType: Fee Schedule,Fee Breakup for each student,رسوم فصل لكل طالب
@@ -3036,11 +3093,11 @@
 DocType: Purchase Invoice Item,Valuation Rate,تقييم قيم
 DocType: Stock Reconciliation,SR/,ريال سعودى/
 DocType: Vehicle,Diesel,ديزل
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,قائمة أسعار العملات غير محددة
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,قائمة أسعار العملات غير محددة
 apps/erpnext/erpnext/config/healthcare.py +46,Results,النتائج
 ,Student Monthly Attendance Sheet,طالب ورقة الحضور الشهري
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},الموظف {0} قد تقدم بطلب ل {1} بين {2} و {3}
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,المشروع تاريخ البدء
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,تاريخ بدء المشروع
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +5,Until,حتى
 DocType: Rename Tool,Rename Log,إعادة تسمية الدخول
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,مجموعة الطالب أو جدول الدورات إلزامي
@@ -3051,7 +3108,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,ادارة شركاء المبيعات.
 DocType: Quality Inspection,Inspection Type,نوع التفتيش
 DocType: Fee Validity,Visited yet,تمت الزيارة
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,المستودعات مع الصفقة الحالية لا يمكن أن يتم تحويلها إلى المجموعة.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,المستودعات مع الصفقة الحالية لا يمكن أن يتم تحويلها إلى المجموعة.
 DocType: Assessment Result Tool,Result HTML,نتيجة HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,تنتهي صلاحيته في
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,أضف طلاب
@@ -3078,44 +3135,43 @@
 DocType: Healthcare Settings,Result Printed,النتيجة المطبوعة
 DocType: Asset Category Account,Depreciation Expense Account,حساب نفقات الاستهلاك
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,فترة الاختبار
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},عرض {0}
-DocType: Customer Group,Only leaf nodes are allowed in transaction,ويسمح العقد ورقة فقط في المعاملة
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},عرض {0}
+DocType: Customer Group,Only leaf nodes are allowed in transaction,المصنف ليس مجموعة فقط مسموح به في المعاملات
 DocType: Expense Claim,Expense Approver,موافق النفقات
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,الصف {0}: يجب أن يكون مقدما ضد العملاء الائتمان
-apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,(من تصنيف (غير المجموعة) إلى تصنيف ( المجموعة
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,الصف {0}:  الدفعة المقدمة مقابل الزبائن يجب أن تكون دائن
+apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,من تصنيف (غير المجموعة) إلى تصنيف ( المجموعة)
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +58,Batch is mandatory in row {0},الدفعة إلزامية على التوالي {0}
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,شراء السلعة استلام الموردة
 DocType: Payment Entry,Pay,دفع
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,إلى التاريخ والوقت
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,تم حذف الجداول الزمنية للمقرر:
-apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,سجلات للحفاظ على حالة تسليم الرسائل القصيرة
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,تعيين هدف المبيعات
-DocType: Accounts Settings,Make Payment via Journal Entry,جعل الدفع عن طريق إدخال دفتر اليومية
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,المطبوعة على
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,سجلات للحفاظ على  حالات التسليم لرسائل
+DocType: Accounts Settings,Make Payment via Journal Entry,قم بالدفع عن طريق قيد دفتر اليومية
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,طبع في
 DocType: Item,Inspection Required before Delivery,التفتيش المطلوبة قبل تسليم
 DocType: Item,Inspection Required before Purchase,التفتيش المطلوبة قبل الشراء
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,الأنشطة المعلقة
 DocType: Patient Appointment,Reminded,ذكر
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,مؤسستك
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,مؤسستك
 DocType: Fee Component,Fees Category,فئة الرسوم
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,من فضلك ادخل تاريخ المغادرة.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,من فضلك ادخل تاريخ ترك العمل.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,القيمة
 DocType: Supplier Scorecard,Notify Employee,إعلام الموظف
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,أدخل اسم الحملة إذا كان مصدر من التحقيق هو حملة
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,ناشري الصحف
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,ناشر الصحف
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,اختر السنة المالية
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +114,Expected Delivery Date should be after Sales Order Date,يجب أن يكون تاريخ التسليم المتوقع بعد تاريخ أمر المبيعات
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,إعادة ترتيب مستوى
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,مستوى اعادة الطلب
 DocType: Company,Chart Of Accounts Template,نمودج  دليل الحسابات
 DocType: Attendance,Attendance Date,تاريخ الحضور
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},العنصر السعر تحديث ل{0} في قائمة الأسعار {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},العنصر السعر تحديث ل{0} في قائمة الأسعار {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,تقسيم الراتب بناءَ على الكسب والاستقطاع.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,الحساب المتفرع منه عقدة ابن لايمكن ان يحول الي حساب دفتر استاد
 DocType: Purchase Invoice Item,Accepted Warehouse,مستودع مقبول
-DocType: Bank Reconciliation Detail,Posting Date,تاريخ النشر
+DocType: Bank Reconciliation Detail,Posting Date,تاريخ الترحيل
 DocType: Item,Valuation Method,تقييم الطريقة
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,حدد نصف يوم
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,حدد كنصف يوم
 DocType: Sales Invoice,Sales Team,فريق المبيعات
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,تكرار دخول
 DocType: Program Enrollment Tool,Get Students,الحصول على الطلاب
@@ -3124,10 +3180,11 @@
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,وبعبارة تكون مرئية بمجرد حفظ ترتيب المبيعات.
 ,Employee Birthday,عيد ميلاد موظف
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,طالب أداة دفعة الحضور
-apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,الحد عبرت
+apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,الحدود تجاوزت
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,مجدولة
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,رأس المال الاستثماري
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"يوجد بالفعل فصل دراسي  مع ""السنة الدراسية"" {0} و ""اسم الفصل"" {1}. يرجى تعديل هذه الإدخالات والمحاولة مرة أخرى."
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}",بما أن هناك معاملات موجودة مقابل البند {0}، لا يمكنك تغيير قيمة {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}",بما أن هناك معاملات موجودة مقابل البند {0}، لا يمكنك تغيير قيمة {1}
 DocType: UOM,Must be Whole Number,يجب أن يكون عدد صحيح
 DocType: Leave Control Panel,New Leaves Allocated (In Days),الإجازات الجديدة المخصصة (بالأيام)
 DocType: Purchase Invoice,Invoice Copy,نسخة الفاتورة
@@ -3136,8 +3193,8 @@
 DocType: Pricing Rule,Discount Percentage,نسبة الخصم
 DocType: Payment Reconciliation Invoice,Invoice Number,رقم الفاتورة
 DocType: Shopping Cart Settings,Orders,أوامر
-DocType: Employee Leave Approver,Leave Approver,الموافق علي الاجازات
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,يرجى تحديد دفعة
+DocType: Employee Leave Approver,Leave Approver,المخول بالموافقة علي الاجازات
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,يرجى تحديد دفعة
 DocType: Assessment Group,Assessment Group Name,اسم المجموعة التقييم
 DocType: Manufacturing Settings,Material Transferred for Manufacture,المواد المنقولة لغرض صناعة
 DocType: Expense Claim,"A user with ""Expense Approver"" role",المستخدم المخول بالموافقة علي النفقات
@@ -3149,10 +3206,10 @@
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,جميع الوظائف
 DocType: Sales Order,% of materials billed against this Sales Order,٪ من المواد فوترت مقابل أمر المبيعات
 DocType: Program Enrollment,Mode of Transportation,طريقة النقل
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,بدء فترة الإغلاق
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,قيد مدة ختامي
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,حدد القسم ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,مركز التكلفة مع المعاملات الحالية لا يمكن تحويلها إلى مجموعة
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},القيمة {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},القيمة {0} {1} {2} {3}
 DocType: Account,Depreciation,إستهلاك
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),المورد (ق)
 DocType: Employee Attendance Tool,Employee Attendance Tool,أداة الحضور للموظفين
@@ -3160,13 +3217,15 @@
 DocType: Supplier,Credit Limit,الحد الائتماني
 DocType: Production Plan Sales Order,Salse Order Date,Salse ترتيب التاريخ
 DocType: Salary Component,Salary Component,مكون الراتب
-apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,مقالات دفع {0} والامم المتحدة ومرتبطة
+apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,تدوين مدفوعات {0} غير مترابطة
 DocType: GL Entry,Voucher No,رقم السند
 ,Lead Owner Efficiency,يؤدي كفاءة المالك
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,الأكثر شعبية
 DocType: Leave Allocation,Leave Allocation,تخصيص إجازة
 DocType: Payment Request,Recipient Message And Payment Details,مستلم رسالة وتفاصيل الدفع
 DocType: Training Event,Trainer Email,بريد المدرب الإلكتروني
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,طلبات المواد {0} خلق
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,تم إنشاء طلبات المواد {0}
+DocType: Restaurant Reservation,No of People,أي من الناس
 DocType: Production Planning Tool,Include sub-contracted raw materials,وتشمل المواد الخام مع مقاولين من الباطن
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,قالب الشروط أو العقد.
 DocType: Purchase Invoice,Address and Contact,العناوين و التواصل
@@ -3174,11 +3233,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Stock cannot be updated against Purchase Receipt {0},لا يمكن تحديث المخزون ضد إيصال الشراء {0}
 DocType: Supplier,Last Day of the Next Month,اليوم الأخير من الشهر المقبل
 DocType: Support Settings,Auto close Issue after 7 days,السيارات قضية وثيقة بعد 7 أيام
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",إجازة لا يمكن تخصيصها قبل {0}، كما كان رصيد الإجازة بالفعل في السجل تخصيص إجازة في المستقبل إعادة توجيهها تحمل {1}
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ملاحظة: نظرا / المرجعي تاريخ يتجاوز المسموح أيام الائتمان العملاء التي كتبها {0} يوم (s)
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",لا يمكن تخصيص اجازة قبل {0}، لان رصيد الإجازات قد تم تحوبله الي سجل تخصيص اجازات مستقبلي {1}
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ملاحظة: تاريخ الاستحقاق أو المرجع يتجاوز الأيام المسموح بها بالدين للزبون بقدر{0} يوم
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,مقدم الطلب طالب
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,الأصل للمستلم
 DocType: Asset Category Account,Accumulated Depreciation Account,حساب الاستهلاك المتراكم
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,تم إنشاء هذا البريد الإلكتروني تلقائيا
 DocType: Stock Settings,Freeze Stock Entries,تجميد مقالات المالية
 DocType: Program Enrollment,Boarding Student,طالب الصعود
 DocType: Asset,Expected Value After Useful Life,القيمة المتوقعة بعد حياة مفيدة
@@ -3186,9 +3246,9 @@
 DocType: Activity Cost,Billing Rate,سعر الفوترة
 ,Qty to Deliver,الكمية للتسليم
 ,Stock Analytics,تحليلات المخزون
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,لا يمكن ترك (العمليات) فارغة
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,لا يمكن ترك (العمليات) فارغة
 DocType: Maintenance Visit Purpose,Against Document Detail No,مقابل المستند التفصيلى رقم
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,النوع حزب إلزامي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,نوع الطرف المعني إلزامي
 DocType: Quality Inspection,Outgoing,المنتهية ولايته
 DocType: Material Request,Requested For,طلب لل
 DocType: Quotation Item,Against Doctype,DOCTYPE ضد
@@ -3199,7 +3259,7 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +111,Asset {0} must be submitted,الأصول {0} يجب تقديمه
 DocType: Fee Schedule Program,Total Students,مجموع الطلاب
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},سجل الحضور {0} موجود مقابل الطالب {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},إشارة # {0} بتاريخ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},المرجع # {0} بتاريخ {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,تم إلغاء الاستهلاك بسبب التخلص من الأصول
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,إدارة العناوين
 DocType: Asset,Item Code,كود البند
@@ -3208,7 +3268,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,حدد الطلاب يدويا لمجموعة الأنشطة القائمة
 DocType: Journal Entry,User Remark,ملاحظة المستخدم
 DocType: Lead,Market Segment,سوق القطاع
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},المبلغ المدفوع لا يمكن أن يكون أكبر من إجمالي المبلغ المستحق السلبي {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},المبلغ المدفوع لا يمكن أن يكون أكبر من إجمالي المبلغ القائم السالب {0}
 DocType: Supplier Scorecard Period,Variables,المتغيرات
 DocType: Employee Internal Work History,Employee Internal Work History,سجل عمل الموظف داخل الشركة
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),إغلاق (Dr)
@@ -3219,7 +3279,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},الحساب {0} لا يتطابق مع الشركة {1}
 DocType: School Settings,Current Academic Year,السنة الدراسية الحالية
 DocType: Stock Settings,Default Stock UOM,افتراضي وحدة قياس السهم
-DocType: Asset,Number of Depreciations Booked,عدد من التلفيات حجزت
+DocType: Asset,Number of Depreciations Booked,عدد الاستهلاكات المستنفده مسبقا
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},مقابل قرض للموظف: {0}
 DocType: Landed Cost Item,Receipt Document,وثيقة استلام
 DocType: Production Planning Tool,Create Material Requests,إنشاء طلبات المواد
@@ -3236,24 +3296,25 @@
 DocType: Attendance,On Leave,في إجازة
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,الحصول على التحديثات
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: الحساب {2} لا ينتمي إلى الشركة {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,طلب المواد {0} تم إلغاء أو توقف
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,إدارة تصاريح الخروج
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,طلب المواد {0} تم إلغاء أو توقيفه
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,إدارة تصاريح الخروج
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,مجموعة بواسطة حساب
 DocType: Sales Order,Fully Delivered,سلمت بالكامل
 DocType: Lead,Lower Income,دخل أدنى
+DocType: Restaurant Order Entry,Current Order,النظام الحالي
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},مصدر و مستودع الهدف لا يمكن أن يكون نفس الصف ل {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","حساب الفروقات سجب ان يكون نوع حساب الأصول / الخصوم, بحيث مطابقة المخزون بأدخال الأفتتاحي"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},المبلغ الصروف لا يمكن أن يكون أكبر من المبلغ المخصص للقرض {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,انتقل إلى البرامج
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},مطلوب رقم امر الشراء للصنف {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,إنتاج النظام لم يخلق
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,لم يتم إنشاء امر الانتاج
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""من تاريخ "" يجب أن يكون بعد "" إلى تاريخ """
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},لا يمكن تغيير الحالة  لان الطالب {0} مترابط مع استمارة الطالب {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},لا يمكن تغيير الحالة  لان الطالب {0} مترابط مع استمارة الطالب {1}
 DocType: Asset,Fully Depreciated,استهلكت بالكامل
 ,Stock Projected Qty,كمية المخزون المتوقعة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},الزبونى {0} لا ينتمي إلى المشروع {1}
-DocType: Employee Attendance Tool,Marked Attendance HTML,تم تسجيل حضور HTML
-apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",الاقتباسات هي المقترحات، والعطاءات التي تم إرسالها لعملائك
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},الزبونى {0} لا ينتمي إلى المشروع {1}
+DocType: Employee Attendance Tool,Marked Attendance HTML,حضور مسجل HTML
+apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",عروض المسعره هي المقترحات، و المناقصات التي تم إرسالها للزبائن
 DocType: Sales Order,Customer's Purchase Order,طلب شراء الزبون
 DocType: Consultation,Patient,صبور
 apps/erpnext/erpnext/config/stock.py +117,Serial No and Batch,رقم المسلسل و الدفعة
@@ -3262,8 +3323,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,الرجاء تعيين عدد الاستهلاكات المستنفده مسبقا
 DocType: Supplier Scorecard Period,Calculations,العمليات الحسابية
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,القيمة أو الكمية
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,لا يمكن أن تثار أوامر الإنتاج من أجل:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,لا يمكن أن تثار أوامر الإنتاج من أجل:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,دقيقة
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,يرجى تعيين سلسلة التسمية ل {0} عبر الإعداد&gt; إعدادات&gt; تسمية السلسلة
 DocType: Purchase Invoice,Purchase Taxes and Charges,الضرائب والرسوم الشراء
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,الذهاب إلى الموردين
 ,Qty to Receive,الكمية للاستلام
@@ -3276,8 +3338,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,دائن الى حساب يجب أن يكون من حسابات قائمة المركز المالي
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,جميع أنواع  الموردين
 DocType: Global Defaults,Disable In Words,تعطيل بالحروف
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,كود البند إلزامي لأنه لا يتم ترقيم او تكويد البند تلقائيا
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},اقتباس {0} ليست من نوع {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,كود البند إلزامي لأنه لا يتم ترقيم او تكويد البند تلقائيا
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},عرض مسعر {0} ليس من النوع {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,صيانة جدول السلعة
 DocType: Sales Order,%  Delivered,تم إيصاله٪
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,يرجى تعيين معرف البريد الإلكتروني للطالب لإرسال طلب الدفع
@@ -3286,38 +3348,40 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,حساب السحب من البنك بدون رصيد
 DocType: Patient,Patient ID,معرف المريض
 DocType: Physician Schedule,Schedule Name,اسم الجدول الزمني
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,أنشئ كشف راتب
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,أنشاء كشف رانب
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +813,Add All Suppliers,إضافة جميع الموردين
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +81,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,الصف # {0}: المبلغ المخصص لا يمكن أن يكون أكبر من المبلغ المستحق.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,تصفح قائمة المواد
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,القروض المضمونة
 DocType: Purchase Invoice,Edit Posting Date and Time,تحرير تاريخ النشر والوقت
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},الرجاء ضبط الحسابات المتعلقة الاستهلاك في الفئة الأصول {0} أو شركة {1}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},يرجى تحديد الحسابات المتعلقة بالاستهلاك في فئة الأصول {0} أو الشركة {1}
 DocType: Lab Test Groups,Normal Range,المعدل الطبيعي
 DocType: Academic Term,Academic Year,السنة الدراسية
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,الرصيد الافتتاحي لحقوق الملكية
 DocType: Lead,CRM,إدارة علاقات الزبائن
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,تصالح
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,المتبقية
 DocType: Appraisal,Appraisal,تقييم
 DocType: Purchase Invoice,GST Details,غست التفاصيل
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},الايميل تم ارساله إلى المورد {0}
+DocType: Item,Default Sales Unit of Measure,وحدة المبيعات الافتراضية للقياس
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,التاريخ مكرر
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,المخول بالتوقيع
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},"الموافق على الإجازة يجب ان يكون واحد من 
-{0}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},المخول بالموافقة على الإجازات يجب ان يكون واحد من {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,إنشاء رسوم
-DocType: Hub Settings,Seller Email,البريد الإلكتروني للبائع
 DocType: Project,Total Purchase Cost (via Purchase Invoice),مجموع تكلفة الشراء (عن طريق شراء الفاتورة)
 DocType: Training Event,Start Time,توقيت البدء
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,إختيار الكمية
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,إختيار الكمية
 DocType: Customs Tariff Number,Customs Tariff Number,رقم التعريفة الجمركية
 DocType: Patient Appointment,Patient Appointment,تعيين المريض
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Approving Role cannot be same as role the rule is Applicable To
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,إلغاء الاشتراك من هذا البريد الإلكتروني دايجست
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,إلغاء الاشتراك من هذا البريد الإلكتروني دايجست
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,الحصول على الموردين من قبل
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} لم يتم العثور على العنصر {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,انتقل إلى الدورات التدريبية
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,رسالة المرسلة
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,تم ارسال الرسالة
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,الحساب الذي لديه حسابات فرعية لا يمكن تعيينه كحساب استاد
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,المعدل الذي يتم تحويل سعر العملة العملة الأساسية القائمة لالعملاء
@@ -3328,17 +3392,19 @@
 DocType: Production Order,Material Transferred for Manufacturing,المواد المنقولة لغرض التصنيع
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,الحساب {0} غير موجود
 DocType: Project,Project Type,نوع المشروع
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,مهمة الطفل موجودة لهذه المهمة. لا يمكنك حذف هذه المهمة.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,الكمية المستهدفة أو المبلغ المستهدف إلزامي
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,تكلفة الأنشطة المختلفة
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,لا مزيد من النتائج
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,تكلفة الأنشطة المختلفة
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",وضع الأحداث إلى {0}، لأن الموظف المرفقة أدناه الأشخاص المبيعات لايوجد هوية المستخدم {1}
 DocType: Timesheet,Billing Details,تفاصيل الفاتورة
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,ويجب أن تكون مصدر ومستودع الهدف مختلفة
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,ويجب أن تكون مصدر ومستودع الهدف مختلفة
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},لا يسمح لتحديث المعاملات المخزنية أقدم من {0}
 DocType: Purchase Invoice Item,PR Detail,PR التفاصيل
 DocType: Sales Order,Fully Billed,وصفت تماما
 DocType: Vital Signs,BMI,مؤشر كتلة الجسم
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,النقدية الحاضرة
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +136,Delivery warehouse required for stock item {0},مخزن التسليم مطلوب لبند المخزون {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +136,Delivery warehouse required for stock item {0},مخزن التسليم متطلب للصنف المخزني : {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),الوزن الكلي للحزمة. الوزن الصافي عادة + تغليف المواد الوزن. (للطباعة)
 apps/erpnext/erpnext/schools/doctype/course/course.js +3,Program,برنامج
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,يسمح للمستخدمين مع هذا الدور لضبط الحسابات المجمدة و إنشاء / تعديل القيود المحاسبية على حسابات مجمدة
@@ -3358,34 +3424,33 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,حوالة مصرفية
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,حدد الكل
 DocType: Vehicle Log,Invoice Ref,مرجع الفاتورة
-DocType: Purchase Order,Recurring Order,ترتيب متكرر
 DocType: Company,Default Income Account,حساب الدخل الافتراضي
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,تصنيف مجموعة الزبون / الزبائن
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),غير مغلقة سنتين الماليتين الربح / الخسارة (الائتمان)
 DocType: Sales Invoice,Time Sheets,جداول زمنية
 DocType: Lab Test Template,Change In Item,تغيير في البند
-DocType: Payment Gateway Account,Default Payment Request Message,الافتراضي الدفع طلب رسالة
+DocType: Payment Gateway Account,Default Payment Request Message,رسالة 'طلب الدفع' الافتراضيه
 DocType: Item Group,Check this if you want to show in website,التحقق من ذلك إذا كنت تريد أن تظهر في الموقع
 apps/erpnext/erpnext/config/accounts.py +142,Banking and Payments,المدفوعات و الأعمال المصرفية
 ,Welcome to ERPNext,مرحبا بكم في ERPNext
-apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,تؤدي إلى الاقتباس
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Lead to Quotation
 DocType: Patient,A Negative,سلبي
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,لا شيء أكثر لإظهار.
 DocType: Lead,From Customer,من العملاء
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,مكالمات هاتفية
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,مكالمات هاتفية
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,منتج
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,دفعات
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,دفعات
 DocType: Project,Total Costing Amount (via Time Logs),المبلغ الكلي التكاليف (عبر الزمن سجلات)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,جعل جدول الرسوم
 DocType: Purchase Order Item Supplied,Stock UOM,وحدة قياس السهم
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +230,Purchase Order {0} is not submitted,امر الشراء {0} لم يرحل
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +230,Purchase Order {0} is not submitted,أمر الشراء {0} لم يتم تقديمه
 DocType: Vital Signs,Normal reference range for an adult is 16–20 breaths/minute (RCP 2012),النطاق المرجعي الطبيعي للكبار هو 16-20 نفسا / دقيقة (رسيب 2012)
 DocType: Customs Tariff Number,Tariff Number,عدد التعرفة
 DocType: Production Order Item,Available Qty at WIP Warehouse,الكمية المتوفرة في مستودع ويب
-apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,المتوقع
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,المخطط له
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +222,Serial No {0} does not belong to Warehouse {1},رقم المسلسل {0} لا ينتمي إلى مستودع {1}
-apps/erpnext/erpnext/controllers/status_updater.py +174,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ملاحظة : سوف النظام لا تحقق الإفراط التسليم و الإفراط في حجز القطعة ل {0} حيث الكمية أو المبلغ 0
-DocType: Notification Control,Quotation Message,رسالة التسعيرة
+apps/erpnext/erpnext/controllers/status_updater.py +174,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ملاحظة: لن يتحقق النظام من التسليم الزائد والحجز الزائد للبند {0} حيث أن الكمية أو القيمة هي 0
+DocType: Notification Control,Quotation Message,خطاب المناقصة
 DocType: Employee Loan,Employee Loan Application,طلب قرض لموظف
 DocType: Issue,Opening Date,تاريخ الفتح
 apps/erpnext/erpnext/schools/api.py +80,Attendance has been marked successfully.,تم وضع علامة الحضور بنجاح.
@@ -3398,8 +3463,8 @@
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,الإجازات والعطلات
 DocType: School Settings,Current Academic Term,المدة الأكاديمية الحالية
 DocType: Sales Order,Not Billed,لا صفت
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,كلا مستودع يجب أن تنتمي إلى نفس الشركة
-apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,وأضافت أي اتصالات حتى الان.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,كلا مستودع يجب أن تنتمي إلى نفس الشركة
+apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,لم تتم إضافة أي جهات اتصال حتى الآن.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,التكلفة هبطت قيمة قسيمة
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,فواتير حولت من قبل الموردين.
 DocType: POS Profile,Write Off Account,شطب حساب
@@ -3407,17 +3472,16 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,قيمة الخصم
 DocType: Purchase Invoice,Return Against Purchase Invoice,العودة ضد شراء فاتورة
 DocType: Item,Warranty Period (in days),فترة الضمان (بالأيام)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',أوبديت `تاب باتينت أبوانتمنت` سيت sales_invoice = &#39;{0}&#39; وير نيم = &#39;{1}&#39;
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,العلاقة مع Guardian1
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,صافي التدفقات النقدية من العمليات
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,العلاقة مع ولي الامر 1
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,صافي النقد من العمليات
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,البند 4
 DocType: Student Admission,Admission End Date,تاريخ انتهاء القبول
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +30,Sub-contracting,التعاقد من الباطن
 DocType: Journal Entry Account,Journal Entry Account,حساب إدخال القيود اليومية
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,المجموعة الطلابية
 DocType: Shopping Cart Settings,Quotation Series,سلسلة تسعيرات
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",يوجد بند بنفس الاسم ({0})، يرجى تغيير اسم مجموعة البند أو إعادة تسمية البند
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,الرجاء تحديد العملاء
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item",يوجد بند بنفس الاسم ({0})، يرجى تغيير اسم مجموعة البند أو إعادة تسمية البند
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,الرجاء تحديد الزبون
 DocType: C-Form,I,أنا
 DocType: Company,Asset Depreciation Cost Center,مركز تكلفة إستهلاك الأصول
 DocType: Sales Order Item,Sales Order Date,تاريخ اوامر البيع
@@ -3426,27 +3490,28 @@
 DocType: Assessment Plan,Assessment Plan,خطة التقييم
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,تم إنشاء العميل {0}.
 DocType: Stock Settings,Limit Percent,الحد في المئة
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,حاليا لا يوجد مخزون متاح في أي مستودع
 ,Payment Period Based On Invoice Date,طريقة الدفع بناء على تاريخ الفاتورة
 DocType: Sample Collection,No. of print,رقم الطباعة
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},في عداد المفقودين أسعار صرف العملات ل{0}
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},أسعار صرف العملات مفقودة ل {0}
 DocType: Assessment Plan,Examiner,ممتحن
 DocType: Patient Relation,Siblings,الأخوة والأخوات
 DocType: Journal Entry,Stock Entry,إدخال مخزون
 DocType: Payment Entry,Payment References,المراجع الدفع
 DocType: C-Form,C-FORM-,C-نموذج-
 DocType: Vehicle,Insurance Details,تفاصيل التأمين
-DocType: Account,Payable,المستحقة
+DocType: Account,Payable,واجب الدفع
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,الرجاء إدخال فترات السداد
 apps/erpnext/erpnext/shopping_cart/cart.py +365,Debtors ({0}),المدينين ({0})
 DocType: Pricing Rule,Margin,هامش
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,العملاء الجدد
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,الزبائن الجدد
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,الربح الإجمالي٪
 DocType: Appraisal Goal,Weightage (%),الوزن(٪)
 DocType: Bank Reconciliation Detail,Clearance Date,تاريخ الاستحقاق
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,تقرير التقييم
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,إجمالي مبلغ الشراء إلزامي
 DocType: Lead,Address Desc,معالجة التفاصيل
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +101,Party is mandatory,الطرف إلزامي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +101,Party is mandatory,الطرف المعني إلزامي
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,اسم الموضوع
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,يجب اختيار واحدة من الخيارات على الاقل اما البيع او الشراء
@@ -3468,52 +3533,54 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,تم إنشاء فاتورة المبيعات {0}
 DocType: Employee,Confirmation Date,تاريخ التأكيد
 DocType: C-Form,Total Invoiced Amount,إجمالي مبلغ الفاتورة
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +49,Min Qty can not be greater than Max Qty,الحد الأدنى من الكمية لا يمكن أن تكون أكبر من الحد الاعلى من الكمية
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +49,Min Qty can not be greater than Max Qty,الكمية الادنى لايمكن ان تكون اكبر من الكمية الاعلى
 DocType: Account,Accumulated Depreciation,إستهلاك متراكم
 DocType: Supplier Scorecard Scoring Standing,Standing Name,اسم الدائمة
 DocType: Stock Entry,Customer or Supplier Details,العملاء أو الموردين بيانات
 DocType: Employee Loan Application,Required by Date,مطلوب حسب التاريخ
 DocType: Lead,Lead Owner,مسئول مبادرة البيع
-DocType: Bin,Requested Quantity,الكمية المطلبة
+DocType: Bin,Requested Quantity,الكمية المطلوبة
 DocType: Patient,Marital Status,الحالة الإجتماعية
 DocType: Stock Settings,Auto Material Request,طلب مواد تلقائي
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,متوفر (كمية باتش) عند (من المخزن)
 DocType: Customer,CUST-,-CUST
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,اجمالي الأجر - إجمالي الخصم - سداد القروض
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,قائمة المواد الحالية و قائمة المواد الجديد لا يمكن أن تكون نفس بعضهما
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,هوية كشف الراتب
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,هوية كشف الراتب
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,تاريخ التقاعد يجب أن يكون بعد تاريخ الالتحاق بالعمل
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,كانت هناك أخطاء أثناء جدولة الدورة على:
 DocType: Sales Invoice,Against Income Account,مقابل حساب الدخل
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}٪ تم التسليم
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,البند {0} الكمية المطلوبة {1} لا يمكن أن تكون أقل من الحد الأدنى للطلب {2} (المحددة في البند).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,البند {0} الكمية المطلوبة {1} لا يمكن أن تكون أقل من الحد الأدنى للطلب {2} (المحددة في البند).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,الشهرية توزيع النسبة المئوية
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,الرجاء تسجيل الدخول كمستخدم آخر.
 DocType: Territory,Territory Targets,الاقاليم المستهدفة
 DocType: Delivery Note,Transporter Info,نقل معلومات
-apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},الرجاء تعيين الافتراضي {0} في شركة {1}
+apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},يرجى تعيين {0} الافتراضي للشركة {1}
 DocType: Cheque Print Template,Starting position from top edge,بدءا من موقف من أعلى الحافة
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,تم إدخال المورد نفسه عدة مرات
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,الربح الإجمالي / الخسارة
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,الأصناف المزوده بامر الشراء
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,اسم الشركة لا يمكن أن تكون شركة
-apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,عنوان الرسالة لطباعة النماذج
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,اسم الشركة لا يمكن أن تكون شركة
+apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,رؤس الرسائل لقوالب الطباعة.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,عناوين نماذج الطباعة مثل الفاتورة الأولية.
 DocType: Program Enrollment,Walking,المشي
 DocType: Student Guardian,Student Guardian,الجارديان طالب
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,اتهامات نوع التقييم لا يمكن وضع علامة الشاملة
 DocType: POS Profile,Update Stock,تحديث المخزون
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,في الاشتراك
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,سوف UOM مختلفة لعناصر تؤدي إلى غير صحيحة ( مجموع ) صافي قيمة الوزن . تأكد من أن الوزن الصافي من كل عنصر في نفس UOM .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,سعر قائمة المواد
-DocType: Asset,Journal Entry for Scrap,إدخال دفتر اليومية للخردة
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,يرجى سحب العناصر من التسليم ملاحظة
-apps/erpnext/erpnext/accounts/utils.py +467,Journal Entries {0} are un-linked,مجلة مقالات {0} هي الامم المتحدة ومرتبطة
-apps/erpnext/erpnext/config/crm.py +92,"Record of all communications of type email, phone, chat, visit, etc.",سجل جميع الاتصالات من نوع البريد الإلكتروني، الهاتف، والدردشة، والزيارة، الخ
+DocType: Asset,Journal Entry for Scrap,قيد دفتر يومية للتخريد
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,يرجى سحب البنوود من اشعار التسليم
+apps/erpnext/erpnext/accounts/utils.py +467,Journal Entries {0} are un-linked,إدخالات قيد يومية {0} غير مترابطة
+apps/erpnext/erpnext/config/crm.py +92,"Record of all communications of type email, phone, chat, visit, etc.",تسجيل جميع اتصالات البريد الإلكتروني، الهاتف، والدردشة، والزيارة، الخ
 DocType: Supplier Scorecard Scoring Standing,Supplier Scorecard Scoring Standing,المورد بطاقة الأداء التهديف الدائمة
 DocType: Manufacturer,Manufacturers used in Items,المصنعين المستخدمة في وحدات
-apps/erpnext/erpnext/accounts/general_ledger.py +168,Please mention Round Off Cost Center in Company,يرجى ذكر جولة معطلة مركز التكلفة في الشركة
+apps/erpnext/erpnext/accounts/general_ledger.py +168,Please mention Round Off Cost Center in Company,يرجى ذكر مركز التكلفة الخاص بالتقريب في الشركة
 DocType: Purchase Invoice,Terms,الأحكام
 DocType: Academic Term,Term Name,اسم المدى
-DocType: Buying Settings,Purchase Order Required,مطلوب امر الشراء
+DocType: Buying Settings,Purchase Order Required,أمر الشراء مطلوب
 ,Item-wise Sales History,الحركة التاريخيه للمبيعات وفقا للصنف
 DocType: Expense Claim,Total Sanctioned Amount,الإجمالي الكمية الموافق عليه
 ,Purchase Analytics,تحليلات المشتريات
@@ -3524,7 +3591,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,هذا هو الشخص المبيعات الجذرية والتي لا يمكن تحريرها.
 DocType: Salary Detail,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ",إذا تم تحديده، فإن القيمة المحددة أو المحسوبة في هذا المكون لن تساهم في الأرباح أو الاستقطاعات. ومع ذلك، فإنه يمكن الإشارة إلى القيمة من قبل المكونات الأخرى التي يمكن أن تضاف أو خصمها.
 ,Stock Ledger,سجل المخزن
-apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},معدل: {0}
+apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},السعر: {0}
 DocType: Company,Exchange Gain / Loss Account,حساب الربح / الخسارة الناتتج عن الصرف
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,الموظف والحضور
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},يجب أن يكون هدف واحد من {0}
@@ -3540,8 +3607,8 @@
 DocType: Company,Default Letter Head,رأس الرسالة الأفتراضي
 DocType: Purchase Order,Get Items from Open Material Requests,الحصول على عناصر من طلبات فتح المواد
 DocType: Lab Test Template,Standard Selling Rate,مستوى البيع السعر
-DocType: Account,Rate at which this tax is applied,المعدل الذي يتم تطبيق هذه الضريبة
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +65,Reorder Qty,إعادة ترتيب الكميه
+DocType: Account,Rate at which this tax is applied,السعر الذي يتم فيه تطبيق هذه الضريبة
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +65,Reorder Qty,الكمية المحددة عند اعادة الطلب
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,فرص العمل الحالية
 DocType: Company,Stock Adjustment Account,حساب تسوية الأوراق المالية
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,لا تصلح
@@ -3549,39 +3616,41 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",هوية مستخدم النظام (تسجيل الدخول). إذا وضع، وسوف تصبح الافتراضية لكافة أشكال HR.
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: من {1}
 DocType: Task,depends_on,يعتمد على
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,قائمة الانتظار لتحديث أحدث الأسعار في جميع بيل المواد. قد يستغرق بضع دقائق.
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,اسم الحساب الجديد. ملاحظة: الرجاء عدم إنشاء حسابات للعملاء والموردين
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,قائمة الانتظار لتحديث أحدث الأسعار في جميع بيل المواد. قد يستغرق بضع دقائق.
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,اسم الحساب الجديد. ملاحظة: الرجاء عدم إنشاء حسابات للزبائن والموردين
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,نماذج العناوين الافتراضية للبلدان
 DocType: Sales Order Item,Supplier delivers to Customer,المورد يسلم للعميل
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# نموذج / البند / {0}) انتهى من المخزن
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},تاريخ الاستحقاق أو المرجع لا يمكن أن يكون بعد {0}
+,Sales Payment Summary,ملخص دفع المبيعات
+DocType: Restaurant,Restaurant,مطعم
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},تاريخ الاستحقاق أو المرجع لا يمكن أن يكون بعد {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,استيراد وتصدير البيانات
 DocType: Patient,Account Details,تفاصيل الحساب
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,أي طالب يتم العثور
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,لم يتم العثور على أي طلاب
 DocType: Medical Department,Medical Department,القسم الطبي
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,معايير سجل نقاط الأداء للموردين
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,تاريخ ترحيل الفاتورة
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,باع
 DocType: Sales Invoice,Rounded Total,تقريب إجمالي
 DocType: Product Bundle,List items that form the package.,عناصر القائمة التي تشكل الحزمة.
-apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,يجب أن تكون نسبة تخصيص تساوي 100 ٪
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,يرجى تحديد تاريخ النشر قبل اختيار الحزب
+apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,مجموع النسب المخصصة يجب ان تساوي 100 %
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,يرجى اختيار تاريخ الترحيل قبل اختيار الطرف المعني
 DocType: Program Enrollment,School House,مدرسة دار
 DocType: Serial No,Out of AMC,من AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,يرجى تحديد عروض الأسعار
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,يرجى تحديد عروض الأسعار
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,عدد الاستهلاكات المستنفده مسبقا لا يمكن أن يكون أكبر من إجمالي عدد الاستهلاكات خلال العمر الافتراضي النافع
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,إنشاء زيارة صيانة
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,يرجى الاتصال للمستخدم الذين لديهم مدير المبيعات ماستر {0} دور
-DocType: Company,Default Cash Account,حساب النقد الافتراضي
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,يرجى الاتصال بالمستخدم الذي لديه دور مدير المبيعات الماستر {0}
+DocType: Company,Default Cash Account,حساب النقدية الافتراضي
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,ماستر الشركة (ليس زبون أو مورد).
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ويستند هذا على حضور هذا الطالب
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,لا يوجد طلاب في
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,إضافة المزيد من البنود أو فتح نموذج كامل
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,إضافة المزيد من البنود أو فتح نموذج كامل
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,يجب إلغاء اشعار تسليم {0} قبل إلغاء طلب المبيعات
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,انتقل إلى المستخدمين
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,المبلغ المدفوع + شطب المبلغ لا يمكن أن يكون أكبر من المجموع الكلي
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ليس رقم الدفعة صالحة للصنف {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},ملاحظة: لا يوجد رصيد إجازة كاف لنوع الإجازة {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},ملاحظة: لا يوجد رصيد إجازات كافي لنوع الإجازة {0}
 apps/erpnext/erpnext/regional/india/utils.py +15,Invalid GSTIN or Enter NA for Unregistered,غستين غير صالح أو أدخل نا لغير المسجلين
 DocType: Training Event,Seminar,ندوة
 DocType: Program Enrollment Fee,Program Enrollment Fee,رسوم التسجيل برنامج
@@ -3596,42 +3665,45 @@
 DocType: Fee Schedule,Fee Schedule,جدول التكاليف
 DocType: Hub Settings,Publish Availability,نشر توافر
 DocType: Company,Create Chart Of Accounts Based On,إنشاء دليل الحسابات استنادا إلى
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,لا يمكن تحويله إلى غير مجموعة. مهام الطفل موجودة.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,تاريخ الميلاد لا يمكن أن يكون بعد تاريخ اليوم.
 ,Stock Ageing,الأسهم شيخوخة
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},طالب {0} موجودة ضد طالب طالب {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),تعديل التقريب (عملة الشركة)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,ساعات العمل
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,ساعات العمل
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' معطل
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,على النحو المفتوحة
 DocType: Cheque Print Template,Scanned Cheque,الممسوحة ضوئيا شيك
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,إرسال رسائل البريد الإلكتروني التلقائي لاتصالات على المعاملات تقديم.
 DocType: Timesheet,Total Billable Amount,المبلغ الكلي القابل للمحاسبة
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,البند 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,ادخال الطلبية
 DocType: Purchase Order,Customer Contact Email,العملاء الاتصال البريد الإلكتروني
 DocType: Warranty Claim,Item and Warranty Details,البند والضمان تفاصيل
 DocType: Sales Team,Contribution (%),مساهمة (٪)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"ملاحظة : لن يتم إنشاء الدفع منذ دخول ' النقد أو البنك الحساب "" لم يتم تحديد"
+apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"ملاحظة : لن يتم إنشاء تدوين المدفوعات نظرا لأن "" حساب النقد او المصرف"" لم يتم تحديده"
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,المشروع {0} موجود بالفعل
 DocType: Medical Department,Nursing User,التمريض المستخدم
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,المسؤوليات
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,انتهت فترة صلاحية هذا الاقتباس.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,انتهت فترة صلاحية هذا الاقتباس.
 DocType: Expense Claim Account,Expense Claim Account,حساب المطالبة بالنفقات
 DocType: Accounts Settings,Allow Stale Exchange Rates,السماح لأسعار الصرف الثابتة
 DocType: Sales Person,Sales Person Name,اسم رجل المبيعات
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,الرجاء إدخال الاقل فاتورة 1 في الجدول
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,إضافة مستخدمين
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,إضافة مستخدمين
 DocType: POS Item Group,Item Group,مجموعة السلعة
 DocType: Item,Safety Stock,سهم سلامة
 DocType: Healthcare Settings,Healthcare Settings,إعدادات الرعاية الصحية
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,التقدم٪ لمهمة لا يمكن أن يكون أكثر من 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,التقدم٪ لاي مهمة لا يمكن أن تكون أكثر من 100.
 DocType: Stock Reconciliation Item,Before reconciliation,قبل المصالحة
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},إلى {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),الضرائب والرسوم المضافة (عملة الشركة)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ضريبة السلعة صف {0} يجب أن يكون في الاعتبار نوع ضريبة أو الدخل أو المصروفات أو رسوم
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ضريبة البند في الصف {0} يجب أن يكون لديها حساب من نوع حساب ضرائب أو حساب دخل أو حساب نفقات أو حساب خاضع للرسوم
 DocType: Sales Order,Partly Billed,تم فوترتها جزئيا
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,البند {0} يجب أن يكون بند أصول ثابتة
 DocType: Item,Default BOM,الافتراضي BOM
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Debit Note Amount,مبلغ مذكرة الخصم
-apps/erpnext/erpnext/setup/doctype/company/company.js +60,Please re-type company name to confirm,الرجاء إعادة الكتابة اسم الشركة لتأكيد
+apps/erpnext/erpnext/setup/doctype/company/company.js +60,Please re-type company name to confirm,يرجى إعادة كتابة اسم الشركة للتأكيد
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +79,Total Outstanding Amt,إجمالي المعلقة AMT
 DocType: Journal Entry,Printing Settings,إعدادات الطباعة
 DocType: Sales Invoice,Include Payment (POS),تشمل الدفع (POS)
@@ -3642,6 +3714,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,متغير
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,من اشعار التسليم
 DocType: Student,Student Email Address,طالب عنوان البريد الإلكتروني
+DocType: Item,Hub Warehouse,مركز مستودع
 DocType: Physician Schedule Time Slot,From Time,من وقت
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,متوفر:
 DocType: Notification Control,Custom Message,رسالة مخصصة
@@ -3649,47 +3722,50 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,النقد أو الحساب المصرفي إلزامي لإجراء الدفع
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,عنوان الطالب
 DocType: Purchase Invoice,Price List Exchange Rate,معدل سعر صرف قائمة
+DocType: POS Profile,POS Profile Name,بوس اسم الملف الشخصي
 DocType: Purchase Invoice Item,Rate,معدل
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,المتدرب
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,اسم العنوان
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,اسم العنوان
 DocType: Stock Entry,From BOM,من BOM
 DocType: Assessment Code,Assessment Code,كود التقييم
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,الأساسي
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,يتم تجميد المعاملات المخزنية قبل {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"الرجاء انقر على ""إنشاء الجدول الزمني"""
 apps/erpnext/erpnext/config/stock.py +195,"e.g. Kg, Unit, Nos, m","على سبيل المثال كجم، متر,وحدة،"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,المرجعية لا إلزامي إذا كنت دخلت التاريخ المرجعي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,رقم المرجع  إلزامي إذا أدخلت تاريخ المرجع
 DocType: Bank Reconciliation Detail,Payment Document,وثيقة الدفع
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,حدث خطأ أثناء تقييم صيغة المعايير
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,يجب أن يكون تاريخ الالتحاق بالعمل بعد تاريخ الميلاد
 DocType: Salary Slip,Salary Structure,هيكل المرتبات
 DocType: Account,Bank,مصرف
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,الطيران
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,قضية المواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,قضية المواد
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,حدث خطأ أثناء إنشاء متكرر
 DocType: Material Request Item,For Warehouse,لمستودع
-DocType: Employee,Offer Date,تاريخ العرض
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,الاقتباسات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,كنت في وضع غير متصل بالشبكة. أنت لن تكون قادرة على تحميل حتى يكون لديك شبكة
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,لا مجموعات الطلاب خلقت.
+DocType: Employee,Offer Date,تاريخ العرض الخاص بالوظيفة
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,عروض مسعرة
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,كنت في وضع غير متصل بالشبكة. أنت لن تكون قادرة على تحميل حتى يكون لديك شبكة
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,لم يتم إنشاء مجموعات الطلاب.
 DocType: Purchase Invoice Item,Serial No,رقم المسلسل
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,السداد الشهري المبلغ لا يمكن أن يكون أكبر من مبلغ القرض
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,قيمة السداد الشهري لا يمكن أن يكون أكبر من قيمة القرض
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,الرجاء إدخال تفاصيل الصيانة أولا
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,الصف # {0}: تاريخ التسليم المتوقع لا يمكن أن يكون قبل تاريخ أمر الشراء
 DocType: Purchase Invoice,Print Language,لغة الطباعة
 DocType: Salary Slip,Total Working Hours,مجموع ساعات العمل
 DocType: Subscription,Next Schedule Date,تاريخ الجدول التالي
 DocType: Stock Entry,Including items for sub assemblies,بما في ذلك السلع للمجموعات الفرعية
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,إدخال القيمة يجب أن يكون موجبا
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,جميع الأقاليم
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,إدخال القيمة يجب أن يكون موجبا
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,جميع الأقاليم
 DocType: Purchase Invoice,Items,البنود
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,والتحق بالفعل طالب.
 DocType: Fiscal Year,Year Name,اسم العام
 DocType: Process Payroll,Process Payroll,عملية دفع الرواتب
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,هناك عطلات أكثر من أيام العمل في هذا الشهر.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,هناك عطلات أكثر من أيام العمل في هذا الشهر.
 DocType: Product Bundle Item,Product Bundle Item,المنتج حزمة البند
 DocType: Sales Partner,Sales Partner Name,اسم المندوب
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,طلب الاقتباسات
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,طلب عروض مسعره
 DocType: Payment Reconciliation,Maximum Invoice Amount,الحد الأقصى للمبلغ الفاتورة
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,مبحث الدم
 DocType: Normal Test Items,Normal Test Items,عناصر الاختبار العادية
 DocType: Student Language,Student Language,اللغة طالب
 apps/erpnext/erpnext/config/selling.py +23,Customers,الزبائن
@@ -3700,10 +3776,11 @@
 DocType: Issue,Opening Time,يفتح من الساعة
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,التواريخ من وإلى مطلوبة
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,الأوراق المالية والبورصات
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',وحدة القياس الافتراضية للمتغير '{0}' يجب أن تكون كما في النمودج '{1}'
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',وحدة القياس الافتراضية للمتغير '{0}' يجب أن تكون كما في النمودج '{1}'
 DocType: Shipping Rule,Calculate Based On,إحسب الربح بناء على
 DocType: Delivery Note Item,From Warehouse,من المخزن
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,لا الأصناف مع بيل من مواد لتصنيع
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,لا توجد بنود في قائمة المواد للتصنيع
+DocType: Restaurant,Default Customer,العميل الافتراضي
 DocType: Assessment Plan,Supervisor Name,اسم المشرف
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,لا تؤكد إذا تم إنشاء التعيين لنفس اليوم
 DocType: Program Enrollment Course,Program Enrollment Course,دورة التسجيل في البرنامج
@@ -3730,9 +3807,9 @@
 DocType: Payment Entry,Internal Transfer,نقل داخلي
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,يوجد حساب ابن مرتبط بهذا الحساب لهذا لا يمكنك حذف هذا الحساب.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,الكمية المستهدفة أو المبلغ المستهدف إلزامي
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},لا توجد BOM الافتراضي القطعة ل {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,يرجى تحديد تاريخ النشر لأول مرة
-apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,يجب فتح التسجيل يكون قبل تاريخ الإنتهاء
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},لا توجد BOM الافتراضي القطعة ل {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,يرجى تحديد تاريخ الترحيل أولا
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,تاريخ الافتتاح يجب ان يكون قبل تاريخ الاغلاق
 DocType: Leave Control Panel,Carry Forward,المضي قدما
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,مركز التكلفة مع المعاملات الحالية لا يمكن تحويلها إلى حساب استاد
 DocType: Department,Days for which Holidays are blocked for this department.,أيام العطلات غير المسموح بأخد إجازة فيها لهذا القسم.
@@ -3745,7 +3822,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,آخر الاتصالات
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +355,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"لا يمكن الخصم عندما تكون الفئة ""التقييم"" أو ""التقييم والإجمالي"""
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +234,Serial Nos Required for Serialized Item {0},مسلسل نص مطلوب لل مسلسل البند {0}
-apps/erpnext/erpnext/config/accounts.py +152,Match Payments with Invoices,سداد الفواتير من التحصيلات
+apps/erpnext/erpnext/config/accounts.py +152,Match Payments with Invoices,مطابقة المدفوعات مع الفواتير
 DocType: Journal Entry,Bank Entry,حركة بنكية
 DocType: Authorization Rule,Applicable To (Designation),قابلة للتطبيق على (المسمى الوظيفي)
 ,Profitability Analysis,تحليل الربحية
@@ -3765,19 +3842,20 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,إجمالي الحضور
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,البيانات المحاسبية
 DocType: Drug Prescription,Hour,الساعة
+DocType: Restaurant Order Entry,Last Sales Invoice,آخر فاتورة المبيعات
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,المسلسل الجديد غير ممكن للمستودع . يجب ان يكون المستودع مجهز من حركة المخزون او المشتريات المستلمة
 DocType: Lead,Lead Type,نوع مبادرة البيع
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,غير مصرح لك الموافقة على المغادرات التي في التواريخ المحظورة
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +383,All these items have already been invoiced,تم فوترة كل هذه البنود
 DocType: Company,Monthly Sales Target,هدف المبيعات الشهرية
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},يمكن الموافقة عليها بواسطة {0}
-DocType: Item,Default Material Request Type,افتراضي مادة نوع الطلب
+DocType: Item,Default Material Request Type,النوع الافتراضي لـ مستند 'طلب مواد'
 DocType: Supplier Scorecard,Evaluation Period,فترة التقييم
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,غير معروف
 DocType: Shipping Rule,Shipping Rule Conditions,شروط قاعدة الشحن
 DocType: Purchase Invoice,Export Type,نوع التصدير
 DocType: BOM Update Tool,The new BOM after replacement,وBOM الجديدة بعد استبدال
-,Point of Sale,نقااط البيع
+,Point of Sale,نقطة بيع
 DocType: Payment Entry,Received Amount,المبلغ الوارد
 DocType: Patient,Widow,أرملة
 DocType: GST Settings,GSTIN Email Sent On,غستن تم إرسال البريد الإلكتروني
@@ -3799,144 +3877,149 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,إنشاء المستخدمين
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,قرام
 DocType: Supplier Scorecard,Per Month,كل شهر
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,يجب أن تكون الكمية لصنع أكبر من 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,"""الكمية لتصنيع"" يجب أن تكون أكبر من 0."
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,تقرير زيارة للدعوة الصيانة.
 DocType: Stock Entry,Update Rate and Availability,معدل التحديث والتوفر
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,النسبة المئوية يسمح لك لتلقي أو تقديم المزيد من ضد الكمية المطلوبة. على سبيل المثال: إذا كنت قد أمرت 100 وحدة. و10٪ ثم يسمح بدل الخاص بك لتلقي 110 وحدة.
 DocType: POS Customer Group,Customer Group,مجموعة العميل
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),معرف الدفعة الجديد (اختياري)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),معرف الدفعة الجديد (اختياري)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},اجباري حساب النفقات للصنف {0}
 DocType: BOM,Website Description,وصف الموقع
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,صافي التغير في حقوق المساهمين
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,صافي التغير في حقوق الملكية
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,الأحدث
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,يرجى إلغاء فاتورة المشتريات {0} أولاً
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",يجب أن يكون عنوان البريد الإلكتروني فريد من نوعه، موجود بالفعل ل{0}
 DocType: Serial No,AMC Expiry Date,AMC تاريخ انتهاء الاشتراك
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,إيصال
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,إيصال
 ,Sales Register,سجل مبيعات
 DocType: Daily Work Summary Settings Company,Send Emails At,إرسال رسائل البريد الإلكتروني في
-DocType: Quotation,Quotation Lost Reason,خسارة التسعيرة بسبب
+DocType: Quotation,Quotation Lost Reason,سبب خسارة المناقصة
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,حدد المجال الخاص بك
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',حدد * من تابباتينت حيث نيم = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},إشارة عملية لا {0} بتاريخ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},إشارة عملية لا {0} بتاريخ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,لا يوجد شيء لتحريره
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,عرض النموذج
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,ملخص لهذا الشهر والأنشطة المعلقة
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,عرض النموذج
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,ملخص لهذا الشهر والأنشطة المعلقة
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.",أضف مستخدمين إلى مؤسستك، بخلاف نفسك.
 DocType: Customer Group,Customer Group Name,أسم فئة الزبون
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,لا العملاء حتى الآن!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,لا زبائن حتى الان!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,بيان التدفقات النقدية
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},مبلغ القرض لا يمكن أن يتجاوز مبلغ القرض الحد الأقصى ل{0}
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},لا يمكن أن تتجاوز قيمة القرض الحد الأقصى المحدد للقروض {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,رخصة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},الرجاء إزالة هذا فاتورة {0} من C-نموذج {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},الرجاء إزالة هذا فاتورة {0} من C-نموذج {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,الرجاء تحديد المضي قدما إذا كنت تريد ان تتضمن اجازات السنة السابقة
 DocType: GL Entry,Against Voucher Type,مقابل إيصال  نوع
 DocType: Physician,Phone (R),الهاتف (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,تمت إضافة الفواصل الزمنية
 DocType: Item,Attributes,سمات
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,تمكين القالب
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,يرجى تعيين سلسلة التسمية ل {0} عبر الإعداد&gt; إعدادات&gt; تسمية السلسلة
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,الرجاء إدخال شطب الحساب
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,تاريخ آخر أمر
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,الرجاء إدخال حساب الشطب
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,تاريخ آخر طلب
 DocType: Patient,B Negative,B سلبي
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},الحساب {0} لا ينتمي إلى الشركة {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,لا تتطابق الأرقام التسلسلية في الصف {0} مع ملاحظة التسليم
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,لا تتطابق الأرقام التسلسلية في الصف {0} مع ملاحظة التسليم
 DocType: Student,Guardian Details,تفاصيل ولي الأمر
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,وضع علامة الحضور لعدة موظفين
 DocType: Vehicle,Chassis No,رقم الشاسيه
 DocType: Payment Request,Initiated,بدأت
 DocType: Production Order,Planned Start Date,المخطط لها تاريخ بدء
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,يرجى تحديد بوم
 DocType: Serial No,Creation Document Type,نوع الوثيقة إنشاء
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,يجب أن يكون تاريخ الانتهاء أكبر من تاريخ البدء
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,يجب أن يكون تاريخ الانتهاء أكبر من تاريخ البدء
 DocType: Leave Type,Is Encash,هل الإجازات غير المستخدمة مدفوعة
 DocType: Leave Allocation,New Leaves Allocated,إنشاء تخصيص إجازة جديدة
-apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,بيانات المشروع من الحكمة ليست متاحة لل اقتباس
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,البيانات الخاصة بالمشروع غير متوفرة للعرض المسعر
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,ينتهي في
 DocType: Project,Expected End Date,تاريخ الإنتهاء المتوقع
 DocType: Budget Account,Budget Amount,قيمة الميزانية
 DocType: Appraisal Template,Appraisal Template Title,عنوان نموذج التقييم
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},(من تاريخ) {0} للموظف {1} لا يمكن أن يكون قبل تاريخ التحاقه {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,تجاري
 DocType: Patient,Alcohol Current Use,الكحول الاستخدام الحالي
+DocType: Student Admission Program,Student Admission Program,برنامج قبول الطالب
 DocType: Payment Entry,Account Paid To,حساب مدفوع ل
-apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,البند الأصل {0} لا يجب أن يكون بند مخزون
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,البند الأب {0} يجب ألا يكون بند مخزون
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,جميع المنتجات أو الخدمات.
 DocType: Expense Claim,More Details,مزيد من التفاصيل
 DocType: Supplier Quotation,Supplier Address,عنوان المورد
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',صف {0} يجب أن يكون # حساب من نوع &quot;الأصول الثابتة&quot;
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,من الكمية
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,قواعد لحساب كمية الشحن لبيع
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,كمية خارجة
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,و أونككيد معطل في
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,الترقيم المتسلسل إلزامي
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,الخدمات المالية
 DocType: Student Sibling,Student ID,هوية الطالب
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,أنواع الأنشطة لسجلات الوقت
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,مورد البريد الإلكتروني
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,أنواع الأنشطة لسجلات الوقت
 DocType: Tax Rule,Sales,مبيعات
 DocType: Stock Entry Detail,Basic Amount,المبلغ الأساسي
 DocType: Training Event,Exam,امتحان
 DocType: Complaint,Complaint,شكوى
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},مستودع الأسهم المطلوبة لل تفاصيل {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},مستودع الأسهم المطلوبة لل تفاصيل {0}
 DocType: Leave Allocation,Unused leaves,إجازات غير مستخدمة
 DocType: Patient,Alcohol Past Use,الكحول الماضي استخدام
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,الدولة الفواتير
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,نقل
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),جلب BOM انفجرت (بما في ذلك المجالس الفرعية)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,نقل
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),جلب BOM انفجرت (بما في ذلك المجالس الفرعية)
 DocType: Authorization Rule,Applicable To (Employee),قابلة للتطبيق على (الموظف)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,(تاريخ الاستحقاق) إلزامي
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,(تاريخ الاستحقاق) إلزامي
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,الاضافة للخاصية {0} لا يمكن أن تكون 0
 DocType: Journal Entry,Pay To / Recd From,دفع إلى / من Recd
 DocType: Naming Series,Setup Series,إعداد الترقيم المتسلسل
 DocType: Payment Reconciliation,To Invoice Date,إلى تاريخ الفاتورة
 DocType: Supplier,Contact HTML,الاتصال HTML
 ,Inactive Customers,العملاء الغير النشطين
+DocType: Student Admission Program,Maximum Age,الحد الأقصى للعمر
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,إيصالات شراء
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,كيف يتم تطبيق خاصية قاعدة التسعير ؟
 DocType: Stock Entry,Delivery Note No,ملاحظة لا تسليم
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created",إذا تحققت، شراء فقط وسيتم إدراج طلبات المواد على المواد الخام النهائية في طلبات المواد. خلاف ذلك، سيتم إنشاء طلبات المواد لبنود الأم
-DocType: Cheque Print Template,Message to show,رسالة لاظهار
-DocType: Company,Retail,بيع بالتجزئة
+DocType: Cheque Print Template,Message to show,رسالة للإظهار
+DocType: Company,Retail,بيع قطاعي
 DocType: Attendance,Absent,غائب
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,حزمة المنتج
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,حزم المنتجات
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,تعذر العثور على النتيجة بدءا من {0}. يجب أن يكون لديك درجات دائمة تغطي 0 إلى 100
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},الصف {0}: إشارة غير صالحة {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},الصف {0}: مرجع غير صالحة {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,شراء قالب الضرائب والرسوم
 DocType: Upload Attendance,Download Template,تنزيل نموذج
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: إما مبلغ دائن أو مدين مطلوب ل{2}
-DocType: GL Entry,Remarks,تصريحات
+DocType: GL Entry,Remarks,ملاحظات
 DocType: Payment Entry,Account Paid From,حساب مدفوع من
 DocType: Purchase Order Item Supplied,Raw Material Item Code,قانون المواد الخام المدينة
+DocType: Task,Parent Task,المهمة الرئيسية
 DocType: Journal Entry,Write Off Based On,شطب بناء على
-apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,جعل الرصاص
+apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,إنشاء زبون محتمل
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,طباعة وقرطاسية
 DocType: Stock Settings,Show Barcode Field,مشاهدة الباركود الميدان
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,Send Supplier Emails,إرسال رسائل البريد الإلكتروني مزود
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",الراتب تمت انجازه بالفعل للفترة بين {0} و {1}،طلب اجازة لا يمكن أن تكون بين هذا النطاق الزمني.
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,سجل التركيبات للرقم التسلسلي
 DocType: Guardian Interest,Guardian Interest,الجارديان الفائدة
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,إعداد القيم الافتراضية لفواتير نقاط البيع
 apps/erpnext/erpnext/config/hr.py +177,Training,التدريب
 DocType: Timesheet,Employee Detail,تفاصيل الموظف
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 معرف البريد الإلكتروني
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,اليوم التالي التاريخ وكرر في يوم من شهر يجب أن يكون على قدم المساواة
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,يوم (التاريخ التالي) و (كرر في اليوم من شهر) يجب أن تكون متساوية
 DocType: Lab Prescription,Test Code,رمز الاختبار
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,إعدادات موقعه الإلكتروني
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},لا يسمح ب رفق ل {0} بسبب وضع بطاقة الأداء ل {1}
 DocType: Offer Letter,Awaiting Response,انتظار الرد
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,فوق
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},إجمالي المبلغ {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},خاصية غير صالحة {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},إجمالي المبلغ {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},خاصية غير صالحة {0} {1}
 DocType: Supplier,Mention if non-standard payable account,أذكر إذا كان الحساب غير القياسي مستحق الدفع
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},تم إدخال نفس البند عدة مرات.
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',يرجى اختيار مجموعة التقييم بخلاف &quot;جميع مجموعات التقييم&quot;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},الصف {0}: مركز التكلفة مطلوب لعنصر {1}
 DocType: Training Event Employee,Optional,اختياري
 DocType: Salary Slip,Earning & Deduction,الكسب و الخصم
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,.اختياري . سيتم استخدام هذا الإعداد لتصفية في المعاملات المختلفة.
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,اختياري . سيتم استخدام هذا الإعداد لفلترت المعاملات المختلفة.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,معدل التقييم السالب غير مسموح به
 DocType: Holiday List,Weekly Off,العطلة الأسبوعية
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",على سبيل المثال 2012، 2013
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +96,Provisional Profit / Loss (Credit),الربح المؤقت / الخسارة (الائتمان)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +96,Provisional Profit / Loss (Credit),الربح / الخسارة المؤقته (دائن)
 DocType: Sales Invoice,Return Against Sales Invoice,العودة ضد فاتورة المبيعات
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,البند 5
 DocType: Serial No,Creation Time,تاريخ الإنشاء
@@ -3945,24 +4028,25 @@
 DocType: Sales Invoice,Product Bundle Help,المنتج حزمة مساعدة
 ,Monthly Attendance Sheet,ورقة الحضور الشهرية
 DocType: Production Order Item,Production Order Item,الإنتاج ترتيب البند
-apps/erpnext/erpnext/healthcare/report/lab_test_report/lab_test_report.py +15,No record found,العثور على أي سجل
+apps/erpnext/erpnext/healthcare/report/lab_test_report/lab_test_report.py +15,No record found,لا يوجد سجلات
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,تكلفة الأصول الملغاة او المخردة
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: مركز التكلفة إلزامي للبند {2}
-DocType: Vehicle,Policy No,السياسة لا
+DocType: Vehicle,Policy No,رقم بوليصة التأمين
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,الحصول على أصناف من حزمة المنتج
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property",كما يوجد مخزون مقابل عنصر {0}، لا يمكنك تمكين الخاصية المتغيرات
 DocType: Asset,Straight Line,خط مستقيم
 DocType: Project User,Project User,المشروع العضو
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,انشق، مزق
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,انشق، مزق
 DocType: GL Entry,Is Advance,هل مقدم
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,(الحضور من التاريخ) و (الحضور إلى التاريخ) تكون إلزامية
-apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,"يرجى إدخال "" التعاقد من الباطن "" كما نعم أو لا"
+apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,"الرجاء إدخال ""هل تعاقد بالباطن"" ب نعم أو لا"
+DocType: Item,Default Purchase Unit of Measure,وحدة الشراء الافتراضية للقياس
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,تاريخ الاتصال الأخير
 DocType: Sales Team,Contact No.,الاتصال رقم
-DocType: Bank Reconciliation,Payment Entries,مقالات الدفع
+DocType: Bank Reconciliation,Payment Entries,ادخال دفعات
 DocType: Production Order,Scrap Warehouse,الخردة مستودع
 DocType: Production Order,Check if material transfer entry is not required,تحقق مما إذا كان إدخال نقل المواد غير مطلوب
 DocType: Program Enrollment Tool,Get Students From,الحصول على الطلاب من
-DocType: Hub Settings,Seller Country,بلد البائع
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,نشر عناصر على الموقع
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,مجموعة الطلاب على دفعات
 DocType: Authorization Rule,Authorization Rule,قاعدة الترخيص
@@ -3972,16 +4056,16 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,قالب الضرائب على المبيعات والرسوم
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),الإجمالي (الائتمان)
 DocType: Repayment Schedule,Payment Date,تاريخ الدفعة
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,جديد دفعة الكمية
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,جديد دفعة الكمية
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,ملابس واكسسوارات
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,تعذر حل وظيفة النتيجة المرجحة. تأكد من أن الصيغة صالحة.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,رقم الطلب
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / بانر التي سوف تظهر في الجزء العلوي من قائمة المنتجات.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,تحديد شروط لحساب كمية الشحن
-DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,دور السماح للتعيين الحسابات المجمدة وتحرير مقالات المجمدة
+DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,الدور الوظيفي يسمح له بتجميد الحسابات و تعديل القيود المجمدة
 DocType: Supplier Scorecard Scoring Variable,Path,مسار
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,لا يمكن تحويل مركز التكلفة إلى حساب دفتر الأستاذ لانه مرتبط بعقدة ابن
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +56,Opening Value,القيمة افتتاح
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +56,Opening Value,القيمة الافتتاحية
 DocType: Salary Detail,Formula,صيغة
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,المسلسل #
 DocType: Lab Test Template,Lab Test Template,قالب اختبار المختبر
@@ -3990,6 +4074,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",الصف # {0}: الأصول {1} لا يمكن أن تقدم، هو بالفعل {2}
 DocType: Tax Rule,Billing Country,بلد إرسال الفواتير
 DocType: Purchase Order Item,Expected Delivery Date,تاريخ التسليم المتوقع
+DocType: Restaurant Order Entry,Restaurant Order Entry,مطعم دخول الطلب
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,المدين و الدائن غير متساوي ل {0} # {1}. الفرق هو {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,نفقات الترفيه
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,جعل المواد طلب
@@ -4000,21 +4085,22 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,كمية غير صالحة المحدد لمادة {0} . يجب أن تكون كمية أكبر من 0.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,طلبات الحصول على إجازة.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,لا يمكن حذف حساب جرت عليه أي عملية
-DocType: Vehicle,Last Carbon Check,الكربون الماضي تحقق
+DocType: Vehicle,Last Carbon Check,آخر تحقق للكربون
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,نفقات قانونية
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,يرجى تحديد الكمية على الصف
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,يرجى تحديد الكمية على الصف
 DocType: Purchase Invoice,Posting Time,نشر التوقيت
 DocType: Timesheet,% Amount Billed,المبلغ٪ صفت
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,نفقات الهاتف
 DocType: Sales Partner,Logo,شعار
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,التحقق من ذلك إذا كنت تريد لإجبار المستخدم لتحديد سلسلة قبل الحفظ. لن يكون هناك الافتراضي إذا قمت بتحديد هذا.
 apps/erpnext/erpnext/stock/get_item_details.py +135,No Item with Serial No {0},أي عنصر مع المسلسل لا {0}
-DocType: Email Digest,Open Notifications,الإخطارات المفتوحة
+DocType: Email Digest,Open Notifications,فتح الإشعارات
 DocType: Payment Entry,Difference Amount (Company Currency),فروق المبلغ ( عملة الشركة ) .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,النفقات المباشرة
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,إيرادات العملاء الجدد
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,ايرادات الزبائن الجدد
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,نفقات السفر
 DocType: Maintenance Visit,Breakdown,انهيار
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},إضافة اشتراك حقل مخصص في نوع المستند {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,الحساب: {0} مع العملة: {1} لا يمكن اختياره
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",تحديث تكلفة بوم تلقائيا عبر جدولة، استنادا إلى أحدث معدل التقييم / سعر قائمة معدل / آخر معدل شراء المواد الخام.
 DocType: Bank Reconciliation Detail,Cheque Date,تاريخ الشيك
@@ -4025,21 +4111,21 @@
 DocType: Appraisal,HR,الموارد البشرية
 DocType: Program Enrollment,Enrollment Date,تاريخ التسجيل
 DocType: Healthcare Settings,Out Patient SMS Alerts,خارج التنبيهات سمز المريض
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Probation,امتحان
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Probation,فترة التجربة
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,مكون الراتب
 DocType: Program Enrollment Tool,New Academic Year,العام الدراسي الجديد
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +762,Return / Credit Note,عودة / الائتمان ملاحظة
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +762,Return / Credit Note,ارجاع / اشعار دائن
 DocType: Stock Settings,Auto insert Price List rate if missing,إدراج تلقائي لقائمة الأسعار إن لم تكن موجودة
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +23,Total Paid Amount,إجمالي المبلغ المدفوع
 DocType: Production Order Item,Transferred Qty,نقل الكمية
 apps/erpnext/erpnext/config/learn.py +11,Navigating,التنقل
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Planning,تخطيط
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Planning,التخطيط
 DocType: Material Request,Issued,نشر
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +14,Student Activity,نشاط الطالب
 DocType: Project,Total Billing Amount (via Time Logs),المبلغ الكلي الفواتير (عبر الزمن سجلات)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,المورد رقم
 DocType: Payment Request,Payment Gateway Details,تفاصيل الدفع بوابة
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,الكمية يجب ان تكون أكبر من 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,الكمية يجب ان تكون أكبر من 0
 DocType: Journal Entry,Cash Entry,الدخول النقدية
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,العقد التابعة يمكن أن تنشأ إلا في إطار العقد نوع &#39;المجموعة&#39;
 DocType: Leave Application,Half Day Date,تاريخ نصف اليوم
@@ -4048,21 +4134,23 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",نوع الإجازة مثل اضطرارية، مرضية الخ.
 DocType: Email Digest,Send regular summary reports via Email.,إرسال تقارير موجزة منتظمة عبر البريد الإلكتروني.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +254,Please set default account in Expense Claim Type {0},الرجاء تعيين الحساب الافتراضي في نوع المطالبة النفقات {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +254,Please set default account in Expense Claim Type {0},الرجاء تعيين الحساب الافتراضي في (نوع المطالبة بالنفقات) {0}
 DocType: Assessment Result,Student Name,أسم الطالب
 DocType: Brand,Item Manager,مدير البند
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,رواتب واجبة الدفع
 DocType: Buying Settings,Default Supplier Type,نوع المورد الافتراضي
 DocType: Production Order,Total Operating Cost,إجمالي تكاليف التشغيل
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,ملاحظة : البند {0} دخلت عدة مرات
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,ملاحظة: تم ادخل البند {0} عدة مرات
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,جميع جهات الاتصال.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,اختصار الشركة
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,المستخدم {0} غير موجود
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,المستخدم {0} غير موجود
 DocType: Subscription,SUB-,الفرعية-
 DocType: Item Attribute Value,Abbreviation,اسم مختصر
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,الدفع دخول موجود بالفعل
-apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,لا أوثرويزيد منذ {0} يتجاوز الحدود
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,تدوين المدفوعات موجود بالفعل
+apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,غير مخول عندما {0} تتجاوز الحدود
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,.نموذج الراتب الرئيس
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,علم الأمراض
+DocType: Restaurant Order Entry,Restaurant Table,طاولة المطعم
 DocType: Leave Type,Max Days Leave Allowed,أقصى ايام اجازة مسموح بها
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,مجموعة القاعدة الضريبية لعربة التسوق
 DocType: Purchase Invoice,Taxes and Charges Added,أضيفت الضرائب والرسوم
@@ -4071,13 +4159,13 @@
 DocType: Project,Task Progress,تقدم مهمة
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,عربة
 ,Qty to Transfer,الكمية للنقل
-apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,اقتباسات لعروض أو العملاء.
+apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,قدم عروض مسعرة للزبائن المحتملين أو الزبائن المتعامل معهم سابقا.
 DocType: Stock Settings,Role Allowed to edit frozen stock,دور الأليفة لتحرير الأسهم المجمدة
 ,Territory Target Variance Item Group-Wise,الأراضي المستهدفة الفرق البند المجموعة الحكيم
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,جميع مجموعات الزبائن
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,جميع مجموعات الزبائن
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,متراكمة شهريا
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} إلزامي. ربما لم يتم إنشاء سجل سعر صرف العملة ل{1} إلى {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,قالب الضرائب إلزامي.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,قالب الضرائب إلزامي.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,الحساب {0}: الحسابه الأب {1} غير موجود
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),قائمة الأسعار معدل (عملة الشركة)
 DocType: Products Settings,Products Settings,إعدادات المنتجات
@@ -4103,12 +4191,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,الحكيم البند ضريبة التفاصيل
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,اختصار المؤسسة
 ,Item-wise Price List Rate,معدل قائمة الأسعار للصنف
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,اقتباس المورد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,اقتباس المورد
 DocType: Quotation,In Words will be visible once you save the Quotation.,وبعبارة تكون مرئية بمجرد حفظ اقتباس.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},الكمية ({0}) لا يمكن أن تكون جزءا من الصف {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,-ATT
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},الباركود {0} مستخدمة بالفعل في البند {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},الباركود {0} مستخدم بالفعل في الصنف {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,قواعد لإضافة تكاليف الشحن.
 DocType: Item,Opening Stock,فتح المخزون
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,الزبون مطلوب
@@ -4125,11 +4213,10 @@
 Updated via 'Time Log'","في دقائق 
  تحديث عبر 'وقت دخول """
 DocType: Customer,From Lead,من الزبون المحتمل
-apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,أوامر الإفراج عن الإنتاج.
+apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,أوامر أصدرت للإنتاج.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,اختر السنة المالية ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS الملف المطلوب لجعل الدخول POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,ملف نقطة البيع مطلوب للقيام بإدخال خاص بنقطة البيع
 DocType: Program Enrollment Tool,Enroll Students,تسجيل الطلاب
-DocType: Hub Settings,Name Token,اسم رمز
 DocType: Lab Test,Approved Date,تاريخ الموافقة
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,البيع القياسية
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,واحدة على الاقل مستودع إلزامي
@@ -4147,18 +4234,18 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Human Resource
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,دفع المصالحة الدفع
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,ضريبية الأصول
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},كان طلب الإنتاج {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},كان طلب الإنتاج {0}
 DocType: BOM Item,BOM No,رقم قائمة المواد
 DocType: Instructor,INS/,/INS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,إدخال دفتر اليومية {0} ليس لديه حساب {1} أو بالفعل يقابل ضد قسيمة أخرى
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,قيد دفتر اليومية {0} ليس لديه حساب {1} أو قد تم مطابقته مع إيصال أخرى
 DocType: Item,Moving Average,المتوسط المتحرك
 DocType: BOM Update Tool,The BOM which will be replaced,وBOM التي سيتم استبدالها
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,المعدات الإلكترونية
 DocType: Account,Debit,مدين
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,يجب تخصيص الإجازات في مضاعفات 0.5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,يجب تخصيص الإجازات في مضاعفات 0.5 (مثلا 10.5 يوم او 4.5 او 30 يوم او 1 يوم)
 DocType: Production Order,Operation Cost,التكلفة العملية
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,رفع الحضور من ملف CSV.
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,آمت المتميز
+apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,القيمة القائمة
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,تحديد أهداف المجموعة السلعة الحكيم لهذا الشخص المبيعات.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],تجميد الأرصدة أقدم من [ أيام]
 apps/erpnext/erpnext/controllers/accounts_controller.py +535,Row #{0}: Asset is mandatory for fixed asset purchase/sale,الصف # {0}: الأصول إلزامي لشراء الأصول الثابتة / بيع
@@ -4167,55 +4254,56 @@
 DocType: Currency Exchange,To Currency,إلى العملات
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,السماح للمستخدمين التاليين للموافقة على طلبات الحصول على إجازة في الأيام المحظورة
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,أنواع النفقات المطلوبة.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},سعر البيع للبند {0} أقل من {1}. يجب أن يكون سعر البيع على الأقل {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},سعر البيع للبند {0} أقل من {1}. يجب أن يكون سعر البيع على الأقل {2}
 DocType: Item,Taxes,الضرائب
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,دفعت ولم يتم تسليمها
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,تم الدفع ولم يتم التسليم
 DocType: Project,Default Cost Center,مركز التكلفة الافتراضي
 DocType: Bank Guarantee,End Date,نهاية التاريخ
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,قيود المخزون
 DocType: Budget,Budget Accounts,حسابات الميزانية
 DocType: Employee,Internal Work History,سجل العمل الداخلي
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,قيمة الاستهلاك المتراكمة
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,الأسهم الخاصة
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,رأس المال الخاص
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,مورد بطاقة الأداء المتغير
 DocType: Employee Loan,Fully Disbursed,تم صرفها بالكامل
 DocType: Maintenance Visit,Customer Feedback,ملاحظات الزبائن
 DocType: Account,Expense,نفقة
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,النتيجة لا يمكن أن يكون أكبر من درجة القصوى
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,النتيجة لا يمكن أن يكون أكبر من درجة القصوى
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,العملاء والموردين
 DocType: Item Attribute,From Range,من المدى
 DocType: BOM,Set rate of sub-assembly item based on BOM,تعيين معدل عنصر التجميع الفرعي استنادا إلى بوم
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},خطأ في بناء الصيغة أو الشرط: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},خطأ في بناء الصيغة أو الشرط: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,إعدادات ملخص العمل اليومي للشركة
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,تم تجاهل البند {0} لأنه ليس بند مخزون
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,يقدم هذا ترتيب الإنتاج لمزيد من المعالجة .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,يقدم هذا ترتيب الإنتاج لمزيد من المعالجة .
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",للا ينطبق قاعدة التسعير في معاملة معينة، يجب تعطيل جميع قوانين التسعير المعمول بها.
-DocType: Assessment Group,Parent Assessment Group,المجموعة تقييم الوالدين
+DocType: Assessment Group,Parent Assessment Group,مجموعة التقييم الأب
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,وظائف
 ,Sales Order Trends,مجرى طلبات البيع
 DocType: Employee,Held On,عقدت في
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,إنتاج البند
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,بند انتاج
 ,Employee Information,معلومات الموظف
 DocType: Stock Entry Detail,Additional Cost,تكلفة إضافية
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",لا يمكن الفلتره علي اساس (رقم الأيصال)، إذا تم وضعه في مجموعة على اساس (ايصال)
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +891,Make Supplier Quotation,أنشئ تسعيرة مورد
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +891,Make Supplier Quotation,إنشاء عرض مسعر خاص بالمورد
 DocType: Quality Inspection,Incoming,الوارد
 apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.py +47,Assessment Result record {0} already exists.,سجل نتيجة التقييم {0} موجود بالفعل.
-DocType: BOM,Materials Required (Exploded),المواد المطلوبة (انفجرت)
+DocType: BOM,Materials Required (Exploded),المواد المطلوبة (مفصصة)
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',الرجاء تعيين فلتر الشركة فارغا إذا كانت المجموعة بي هي &#39;كومباني&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,تاريخ النشر لا يمكن أن يكون تاريخ مستقبلي
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},الصف # {0}: المسلسل لا {1} لا يتطابق مع {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,لتوليد المتكررة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,أجازة عادية
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,اختبار مختبر أوم.
 DocType: Batch,Batch ID,هوية الباتش
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},ملاحظة : {0}
 ,Delivery Note Trends,ملاحظة اتجاهات التسليم
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,ملخص هذا الأسبوع
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,ملخص هذا الأسبوع
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,في سوق الأسهم الكمية
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,الحساب: {0} لا يمكن تحديثه إلا من خلال معاملات المخزون
 DocType: Student Group Creation Tool,Get Courses,الحصول على دورات
-DocType: GL Entry,Party,الطرف
+DocType: GL Entry,Party,الطرف المعني
 DocType: Healthcare Settings,Patient Name,اسم المريض
 DocType: Variant Field,Variant Field,الحقل البديل
 DocType: Sales Order,Delivery Date,تاريخ التسليم
@@ -4225,8 +4313,7 @@
 DocType: Purchase Order,To Bill,لبيل
 DocType: Material Request,% Ordered,٪ تم طلبها
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",بالنسبة للطلاب مجموعة مقرها دورة، سيتم التحقق من صحة الدورة لكل طالب من الدورات المسجلة في التسجيل البرنامج.
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date",أدخل عنوان البريد الإلكتروني مفصولة بفواصل، سيرسل فاتورة تلقائيا على تاريخ معين
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,العمل مقاولة
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,الأجرة المدفوعة لكمية العمل المنجز
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,متوسط  سعر شراء
 DocType: Task,Actual Time (in Hours),الوقت الفعلي (بالساعات)
 DocType: Employee,History In Company,الحركة التاريخيه في الشركة
@@ -4234,12 +4321,12 @@
 DocType: Drug Prescription,Description/Strength,الوصف / القوة
 DocType: Stock Ledger Entry,Stock Ledger Entry,حركة سجل المخزن
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +82,Same item has been entered multiple times,تم إدخال البند نفسه عدة مرات
-DocType: Department,Leave Block List,قائمة الإجازات المحظورة
+DocType: Department,Leave Block List,قائمة الايام المحضور الإجازة فيها
 DocType: Sales Invoice,Tax ID,البطاقة الضريبية
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,البند {0} ليس الإعداد ل مسلسل رقم العمود يجب أن يكون فارغا
 DocType: Accounts Settings,Accounts Settings,إعدادات الحسابات
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,وافق
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,لا توجد نتيجة لإرسال
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,لا توجد نتيجة لإرسال
 DocType: Customer,Sales Partner and Commission,مبيعات الشريك واللجنة
 DocType: Employee Loan,Rate of Interest (%) / Year,معدل الفائدة (٪) / السنة
 ,Project Quantity,مشروع الكمية
@@ -4251,60 +4338,59 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,أسود
 DocType: BOM Explosion Item,BOM Explosion Item,قائمة المواد للبند المفصص
 DocType: Account,Auditor,مدقق الحسابات
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} عناصر منتجة
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} عناصر منتجة
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,أعرف أكثر
 DocType: Cheque Print Template,Distance from top edge,المسافة من الحافة العلوية
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,قائمة الأسعار {0} تعطيل أو لا وجود لها
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,قائمة الأسعار {0} تعطيل أو لا وجود لها
 DocType: Purchase Invoice,Return,عودة
 DocType: Production Order Operation,Production Order Operation,أمر الإنتاج عملية
 DocType: Pricing Rule,Disable,تعطيل
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,طريقة الدفع مطلوبة لإجراء الدفع
 DocType: Project Task,Pending Review,في انتظار المراجعة
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,التعيينات والمشاورات
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} غير مسجل في الدفعة {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} غير مسجل في الدفعة {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",الأصول {0} لا يمكن تخريده، لانه بالفعل {1}
 DocType: Task,Total Expense Claim (via Expense Claim),مجموع المطالبة المصاريف (عبر مطالبات مصاريف)
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,حدد الغائب
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},الصف {0}:  عملة قائمة المواد يجب أن تكون# {1} يجب ان تكون مساوية للعملة المحددة {2}
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,حدد كغائب
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},الصف {0}: عملة قائمة المواد يجب أن تكون# {1} يجب ان تكون مساوية للعملة المحددة {2}
 DocType: Journal Entry Account,Exchange Rate,سعر الصرف
 DocType: Patient,Additional information regarding the patient,معلومات إضافية عن المريض
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,اوامر البيع {0} لم ترسل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,اوامر البيع {0} لم ترسل
 DocType: Homepage,Tag Line,شعار
 DocType: Fee Component,Fee Component,مكون رسوم
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,إدارة أسطول المركبات
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,إضافة بنود من
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,إدارة أسطول المركبات
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,إضافة بنود من
 DocType: Cheque Print Template,Regular,منتظم
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,يجب أن يكون الترجيح الكلي لجميع معايير التقييم 100٪
-DocType: BOM,Last Purchase Rate,أخر سعر توريد
+DocType: Purchase Order Item,Last Purchase Rate,آخر سعر الشراء
 DocType: Account,Asset,الأصول
 DocType: Project Task,Task ID,رقم المهمة
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,الأوراق المالية لا يمكن أن توجد القطعة ل{0} منذ ديه المتغيرات
 DocType: Lab Test,Mobile,التليفون المحمول
 ,Sales Person-wise Transaction Summary,ملخص المبيعات بناء على رجل المبيعات
 DocType: Training Event,Contact Number,رقم الاتصال
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,مستودع {0} غير موجود
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,تسجيل في ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,مستودع {0} غير موجود
 DocType: Monthly Distribution,Monthly Distribution Percentages,النسب المئوية لتوزيع الشهرية
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,العنصر المحدد لا يمكن أن يكون دفعة
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",معدل التقييم لم يتم العثور على هذا البند {0}، وهو مطلوب للقيام القيود المحاسبية لل{1} {2}. إذا كان العنصر هو يتعاملون كبند عينة في {1}، يرجى ذكر ذلك في {1} الجدول البند. خلاف ذلك، يرجى إنشاء معاملة الأسهم واردة بالنسبة لمعدل تقييم البند أو ذكر في السجل عنصر، ثم حاول سوبميتنغ / إلغاء هذا الدخول
 DocType: Delivery Note,% of materials delivered against this Delivery Note,٪ من المواد التي تم تسليمها مقابل اشعار التسليم هذا
+DocType: Training Event,Has Certificate,لديه شهادة
 DocType: Project,Customer Details,تفاصيل العميل
 DocType: Employee,Reports to,إرسال التقارير إلى
 ,Unpaid Expense Claim,غير المسددة المطالبة النفقات
 DocType: Payment Entry,Paid Amount,المبلغ المدفوع
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,استكشاف دورة المبيعات
 DocType: Assessment Plan,Supervisor,مشرف
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,على الانترنت
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,متصل بالإنترنت
 ,Available Stock for Packing Items,المخزون المتاج للأصناف المعبأة
 DocType: Item Variant,Item Variant,السلعة  البديلة
 DocType: Assessment Result Tool,Assessment Result Tool,أداة نتيجة التقييم
 DocType: BOM Scrap Item,BOM Scrap Item,البند الخردة بقائمة المواد
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,لا يمكن حذف أوامر المقدمة
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,لا يمكن حذف أوامر المقدمة
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",رصيد الحساب رصيد مدين، لا يسمح لك بتغييره 'الرصيد يجب أن يكون دائن'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,إدارة الجودة
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,البند {0} تم تعطيله
-DocType: Employee Loan,Repay Fixed Amount per Period,سداد مبلغ ثابت في الفترة
-apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},الرجاء إدخال كمية القطعة ل {0}
+DocType: Employee Loan,Repay Fixed Amount per Period,سداد قيمة ثابتة لكل فترة
+apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},الرجاء إدخال الكمية للبند {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +78,Credit Note Amt,ملاحظة ائتمان
 DocType: Employee External Work History,Employee External Work History,سجل عمل الموظف خارج الشركة
 DocType: Tax Rule,Purchase,الشراء
@@ -4319,7 +4405,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},الصف # {0} الصراعات مواقيت مع صف واحد {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,السماح صفر معدل التقييم
 DocType: Training Event Employee,Invited,دعوة
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,وجود اكثر من هيكل راتب نشط للموظف {0} للتواريخ المحددة
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,وجود اكثر من هيكل راتب نشط للموظف {0} للتواريخ المحددة
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,إعدادت بوابة الحسايات.
 DocType: Employee,Employment Type,نوع الوظيفة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,الاصول الثابتة
@@ -4329,9 +4415,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,فترة الطلب لا يمكن أن تكون خلال فترتى تخصيص اجازات مختلفتين
 DocType: Item Group,Default Expense Account,حساب النفقات الإفتراضي
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,طالب معرف البريد الإلكتروني
-DocType: Employee,Notice (days),إشعار (أيام )
+DocType: Employee,Notice (days),إشعار (أيام)
 DocType: Tax Rule,Sales Tax Template,قالب ضريبة المبيعات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,تحديد عناصر لحفظ الفاتورة
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,تحديد عناصر لحفظ الفاتورة
 DocType: Employee,Encashment Date,تاريخ التحصيل
 DocType: Training Event,Internet,الإنترنت
 DocType: Special Test Template,Special Test Template,قالب اختبار خاص
@@ -4340,7 +4426,7 @@
 DocType: Production Order,Planned Operating Cost,المخطط تكاليف التشغيل
 DocType: Academic Term,Term Start Date,المدى تاريخ بدء
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,أوب كونت
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},تجدون طيه {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},الرجاء جد {0} # {1} المرفقه
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,كشف رصيد الحساب المصرفي وفقا لدفتر الأستاذ العام
 DocType: Job Applicant,Applicant Name,اسم طالب الوظيفة
 DocType: Authorization Rule,Customer / Item Name,الزبون / أسم البند
@@ -4353,14 +4439,14 @@
 Note: BOM = Bill of Materials",مجموعة الإجمالية للعناصر ** ** في البند ** ** آخر. وهذا مفيد إذا كنت تجميع لبعض الأصناف ** ** في حزمة ويمكنك الحفاظ على المخزون من الأصناف ** معبأة ** وليس مجموع ** ** البند. حزمة ** ** البند سيكون &quot;هل البند الأسهم&quot; ب &quot;لا&quot; و &quot;هل المبيعات البند&quot; ب &quot;نعم&quot;. على سبيل المثال: إذا كنت تبيع أجهزة الكمبيوتر المحمولة وحقائب تحمل على الظهر بشكل منفصل ولها سعر خاص اذا كان الزبون يشتري على حد سواء، ثم لاب توب + حقيبة الظهر ستكون حزمة المنتج عنصر جديد. ملاحظة: BOM = من مواد مشروع القانون
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},رقم المسلسل إلزامي القطعة ل {0}
 DocType: Item Variant Attribute,Attribute,سمة
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,يرجى تحديد من / أن يتراوح
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,يرجى التحديد المدي من و إلى
 DocType: Serial No,Under AMC,تحت AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,يتم حساب معدل تقييم البند النظر هبطت تكلفة مبلغ قسيمة
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,الإعدادات الافتراضية لمعاملات البيع.
 DocType: Guardian,Guardian Of ,الجارديان
 DocType: Grading Scale Interval,Threshold,العتبة
 DocType: BOM Update Tool,Current BOM,قائمة المواد الحالية
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,إضافة رقم تسلسلي
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,إضافة رقم تسلسلي
 DocType: Production Order Item,Available Qty at Source Warehouse,الكمية المتاحة في مستودع المصدر
 apps/erpnext/erpnext/config/support.py +22,Warranty,الضمان
 DocType: Purchase Invoice,Debit Note Issued,تم اصدار مذكرة الخصم
@@ -4375,36 +4461,36 @@
 DocType: Company,Distribution,توزيع
 DocType: Lab Test,Report Preference,تفضيل التقرير
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +129,Project Manager,مدير المشروع
-,Quoted Item Comparison,ونقلت البند مقارنة
+,Quoted Item Comparison,مقارنة بند المناقصة
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},التداخل في التسجيل بين {0} و {1}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Dispatch,ارسال
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +73,Max discount allowed for item: {0} is {1}%,أعلى خصم مسموح به للمنتج : {0} هو  {1}٪
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +73,Max discount allowed for item: {0} is {1}%,الحد الاعلى المسموح به في التخفيض للمنتج : {0} هو  {1}٪
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,صافي قيمة الأصول كما في
-DocType: Account,Receivable,القبض
+DocType: Account,Receivable,مستحق
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,الصف # {0}: غير مسموح لتغيير مورد السلعة كما طلب شراء موجود بالفعل
-DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,الدور الذي يسمح بتقديم المعاملات التي تتجاوز حدود الائتمان تعيين.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,حدد العناصر لتصنيع
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time",مزامنة البيانات الرئيسية، قد يستغرق بعض الوقت
+DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,الدور الوظيفي الذي يسمح له بتقديم المعاملات التي تتجاوز حدود الدين المحددة.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,حدد العناصر لتصنيع
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time",مزامنة البيانات الماستر قد يستغرق بعض الوقت
 DocType: Item,Material Issue,صرف مواد
-DocType: Hub Settings,Seller Description,وصف البائع
 DocType: Employee Education,Qualification,المؤهل
 DocType: Item Price,Item Price,سعر السلعة
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,الصابون والمنظفات
 DocType: BOM,Show Items,إظهار العناصر
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,(من الوقت) لا يمكن أن يكون بعد من (الي الوقت).
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,الصور المتحركة والفيديو
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,أمر
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,استئنف
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,تم طلبه
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,استئنف
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,إذا تم تمكين ثم النظام لن يتم تحديث حقول المتغيرات من القالب ولكن سيتم نسخ البيانات من الحقول المذكورة أدناه في حين جعل البديل الجديد
 DocType: Salary Detail,Component,مكون
 DocType: Assessment Criteria,Assessment Criteria Group,مجموعة معايير تقييم
 DocType: Healthcare Settings,Patient Name By,اسم المريض بي
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},{0} الاستهلاك المتراكم الافتتاحي  يجب أن يكون أقل من أو يساوي
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},الاستهلاك المتراكم الافتتاحي  يجب أن يكون أقل من أو يساوي {0}
 DocType: Warehouse,Warehouse Name,اسم المستودع
 DocType: Naming Series,Select Transaction,حدد المعاملات
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,الرجاء إدخال الموافقة أو الموافقة دور العضو
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,الرجاء إدخال الدور الوظيفي المخول بالتصديق أو المستخدم المخول بالتصديق
 DocType: Journal Entry,Write Off Entry,شطب الدخول
-DocType: BOM,Rate Of Materials Based On,معدل المواد التي تقوم على
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,المورد&gt; المورد نوع
+DocType: BOM,Rate Of Materials Based On,سعرالمواد استنادا على
+DocType: Item Variant Settings,Do not Update Variants,لا تحديث المتغيرات
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics الدعم
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,الغاء الكل
 DocType: POS Profile,Terms and Conditions,الشروط والأحكام
@@ -4413,7 +4499,7 @@
 DocType: Leave Block List,Applies to Company,ينطبق على شركة
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,لا يمكن الإلغاء لان هناك تدوينات مخزون مقدمة {0} موجوده
 DocType: Employee Loan,Disbursement Date,تاريخ الصرف
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,لم يتم تحديد &quot;المستلمين&quot;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,لم يتم تحديد &quot;المستلمين&quot;
 DocType: BOM Update Tool,Update latest price in all BOMs,تحديث آخر الأسعار في جميع بومس
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,السجل الطبي
 DocType: Vehicle,Vehicle,مركبة
@@ -4428,17 +4514,17 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,أوب / ليد٪
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,إستهلاك الأصول والأرصدة
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},القيمة {0} {1} نقلت من {2} إلى {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},القيمة {0} {1} نقلت من {2} إلى {3}
 DocType: Sales Invoice,Get Advances Received,الحصول على السلف المتلقاة
 DocType: Email Digest,Add/Remove Recipients,إضافة / إزالة المستلمين
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},الصفقة لا يسمح ضد توقفت أمر الإنتاج {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",""" لتحديد هذه السنة المالية كافتراضي ، انقر على "" تحديد كافتراضي"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,انضم
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,انضم
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,نقص الكمية
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,السلعة البديلة {0} موجود مع نفس الصفات
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,متغير البند {0} موجود بنفس الخاصية
 DocType: Employee Loan,Repay from Salary,سداد من الراتب
 DocType: Leave Application,LAP/,LAP /
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},طلب دفع مقابل {0} {1} لمبلغ {2}
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},طلب الدفعة مقابل {0} {1} لقيمة {2}
 DocType: Salary Slip,Salary Slip,كشف الراتب
 DocType: Lead,Lost Quotation,تسعيرة خسر
 apps/erpnext/erpnext/utilities/user_progress.py +200,Student Batches,دفعات الطالب
@@ -4448,7 +4534,7 @@
 DocType: Sales Invoice Item,Sales Order Item,ترتيب المبيعات الإغلاق
 DocType: Salary Slip,Payment Days,أيام الدفع
 DocType: Patient,Dormant,هاجع
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,المستودعات مع العقد التابعة لا يمكن أن يتم تحويلها إلى ليدجر
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,المستودعات مع العقد التابعة لا يمكن أن يتم تحويلها إلى ليدجر
 DocType: BOM,Manage cost of operations,إدارة تكلفة العمليات
 DocType: Accounts Settings,Stale Days,أيام قديمة
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",عند &quot;المقدمة&quot; أي من المعاملات تم، بريد الكتروني المنبثقة تلقائيا فتح لإرسال بريد الكتروني الى &quot;الاتصال&quot; المرتبطة في تلك المعاملة، مع الصفقة كمرفق. يجوز للمستخدم أو قد لا إرسال البريد الإلكتروني.
@@ -4462,12 +4548,11 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,رقم المسلسل {0} وقد وردت بالفعل
 ,Requested Items To Be Transferred,العناصر المطلوبة على أن يتم تحويلها
 DocType: Expense Claim,Vehicle Log,دخول السيارة
-DocType: Purchase Invoice,Recurring Id,رقم المتكررة
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),وجود حمى (درجة الحرارة&gt; 38.5 درجة مئوية / 101.3 درجة فهرنهايت أو درجة حرارة ثابتة&gt; 38 درجة مئوية / 100.4 درجة فهرنهايت)
 DocType: Customer,Sales Team Details,تفاصيل فريق المبيعات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,الحذف بشكل نهائي؟
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,الحذف بشكل نهائي؟
 DocType: Expense Claim,Total Claimed Amount,إجمالي المبلغ المطالب به
-apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,فرص محتملة للبيع.
+apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,فرص بيع محتملة.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},غير صالح {0}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Sick Leave,الإجازات المرضية
 DocType: Email Digest,Email Digest,ملخص مرسل عن طريق الايميل
@@ -4475,7 +4560,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,متجر متعدد الاقسام
 ,Item Delivery Date,تاريخ تسليم السلعة
 DocType: Warehouse,PIN,دبوس
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,إعداد مدرستك في ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,إعداد مدرستك في ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),مدى تغيير المبلغ الأساسي (عملة الشركة )
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,لا القيود المحاسبية للمستودعات التالية
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,حفظ المستند أولا.
@@ -4483,17 +4568,16 @@
 DocType: Company,Change Abbreviation,تغيير الاختصار
 DocType: Expense Claim Detail,Expense Date,تاريخ النفقات
 DocType: Item,Max Discount (%),أعلى خصم (٪)
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,كمية آخر طلب
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,قيمة آخر طلب
 DocType: Task,Is Milestone,هو معلم
 DocType: Daily Work Summary,Email Sent To,تم ارسال الايميل الي
 DocType: Budget,Warn,تحذير
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,هل تريد بالتأكيد إلغاء التسجيل؟
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",أي ملاحظات أخرى، والجهود الجديرة بالذكر التي ينبغي أن تدون في السجلات.
-DocType: BOM,Manufacturing User,عضو التصنيع
+DocType: BOM,Manufacturing User,مستخدم التصنيع
 DocType: Purchase Invoice,Raw Materials Supplied,المواد الخام الموردة
-DocType: Purchase Invoice,Recurring Print Format,تنسيق طباعة متكرر
 DocType: C-Form,Series,سلسلة ترقيم الوثيقة
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},العملة من قائمة الأسعار {0} يجب أن تكون {1} أو {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,إضافة منتجات
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},العملة من قائمة الأسعار {0} يجب أن تكون {1} أو {2}
 DocType: Appraisal,Appraisal Template,نموذج التقييم
 DocType: Item Group,Item Classification,تصنيف البند
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,مدير تطوير الأعمال
@@ -4507,7 +4591,7 @@
 DocType: Item Attribute Value,Attribute Value,السمة القيمة
 ,Itemwise Recommended Reorder Level,يوصى به Itemwise إعادة ترتيب مستوى
 DocType: Salary Detail,Salary Detail,تفاصيل الراتب
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,الرجاء اختيار {0} الأولى
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,الرجاء اختيار {0} أولاً
 DocType: Appointment Type,Physician,الطبيب المعالج
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,دفعة {0} من البند {1} قد انتهت صلاحيتها.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,المشاورات
@@ -4518,7 +4602,7 @@
 DocType: Salary Detail,Default Amount,المبلغ الافتراضي
 DocType: Lab Test Template,Descriptive,وصفي
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,لم يتم العثور على المستودع في النظام
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,ملخص هذا الشهر
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,ملخص هذا الشهر
 DocType: Quality Inspection Reading,Quality Inspection Reading,جودة التفتيش القراءة
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,` تجميد المخزون الأقدم من يجب أن يكون أقل من ٪ d يوم ` .
 DocType: Tax Rule,Purchase Tax Template,شراء قالب الضرائب
@@ -4532,21 +4616,21 @@
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,سجلات الموظفين
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,يرجى تعيين تاريخ استهلاك التالي
 DocType: HR Settings,Payroll Settings,إعدادات دفع الرواتب
-apps/erpnext/erpnext/config/accounts.py +154,Match non-linked Invoices and Payments.,غير مطابقة الفواتير والمدفوعات المرتبطة.
+apps/erpnext/erpnext/config/accounts.py +154,Match non-linked Invoices and Payments.,مطابقة الفواتيرالغير مترابطة والمدفوعات.
 DocType: POS Settings,POS Settings,إعدادات نقاط البيع
-apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,طلب مكان
-DocType: Email Digest,New Purchase Orders,اوامر الشراء الجديده
+apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,تقديم الطلب
+DocType: Email Digest,New Purchase Orders,أوامر شراء جديدة
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,الجذر لا يمكن أن يكون لديه مركز تكلفة أب
 apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,اختر الماركة ...
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,التدريب الأحداث / النتائج
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,الاستهلاك المتراكم كما في
 DocType: Sales Invoice,C-Form Applicable,C-نموذج قابل للتطبيق
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},عملية الوقت يجب أن تكون أكبر من 0 لعملية {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},يجب أن يكون وقت العملية أكبر من 0 للعملية {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,المستودع إلزامي
 DocType: Supplier,Address and Contacts,عناوين واتصالات
 DocType: UOM Conversion Detail,UOM Conversion Detail,تفاصيل تحويل وحدة القياس
 DocType: Program,Program Abbreviation,اختصار برنامج
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,لا يمكن رفع إنتاج النظام ضد قالب البند
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,لا يمكن رفع أمر الإنتاج مقابل نمودج البند
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,تحديث الرسوم في اضافة المشتريات لكل صنف
 DocType: Warranty Claim,Resolved By,حلها عن طريق
 DocType: Bank Guarantee,Start Date,تاريخ البدء
@@ -4566,32 +4650,33 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,إزالة البند إذا الرسوم لا تنطبق على هذا البند
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,يجب أن تكون العملة المعاملة نفس العملة بوابة الدفع
 DocType: Payment Entry,Receive,تسلم
-apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,الاقتباسات:
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,عروض مسعرة:
 DocType: Maintenance Visit,Fully Completed,يكتمل
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}٪ مكتمل
 DocType: Employee,Educational Qualification,المؤهلات العلمية
 DocType: Workstation,Operating Costs,تكاليف التشغيل
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,الإجراء إذا تجاوزت المخصصات الشهرية بالميزانية
-DocType: Purchase Invoice,Submit on creation,إرسال على خلق
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},العملة {0} يجب أن تكون {1}
+DocType: Subscription,Submit on creation,إرسال على خلق
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},العملة {0} يجب أن تكون {1}
 DocType: Asset,Disposal Date,تاريخ التخلص
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",سيتم إرسال رسائل البريد الإلكتروني لجميع الموظفين العاملين في الشركة في ساعة معينة، إذا لم يكن لديهم عطلة. سيتم إرسال ملخص الردود في منتصف الليل.
 DocType: Employee Leave Approver,Employee Leave Approver,المخول بالموافقة علي اجازات الموظفين
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: إدخال إعادة ترتيب موجود بالفعل لهذا المستودع {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.",لا يمكن ان تعلن بانها فقدت ، لأنه تم تقديم عرض مسعر.
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,ردود الفعل على التدريب
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: إدخال إعادة الطلب موجود بالفعل لهذا المخزن {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.",لا يمكن ان تعلن بانها فقدت ، لأنه تم تقديم عرض مسعر.
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,ردود الفعل على التدريب
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,إنتاج النظام {0} يجب أن تقدم
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,معايير بطاقة تقييم الموردين
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},الرجاء تحديد تاريخ البدء وتاريخ الانتهاء للبند {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},المقرر إلزامية في الصف {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,(الى تاريخ) لا يمكن ان يكون قبل (من تاريخ)
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,إضافة و تعديل الأسعار
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,إضافة و تعديل الأسعار
 DocType: Batch,Parent Batch,دفعة الأم
 DocType: Cheque Print Template,Cheque Print Template,نمودج طباعة الصك
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,دليل مراكز التكلفة
 DocType: Lab Test Template,Sample Collection,جمع العينات
 ,Requested Items To Be Ordered,البنود المطلوبة إلى أن يؤمر
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,بلدي أوامر
 DocType: Price List,Price List Name,قائمة الأسعار اسم
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},ملخص العمل اليومي ل{0}
 DocType: Employee Loan,Totals,المجاميع
@@ -4609,13 +4694,13 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Valid till date cannot be before transaction date,صالحة حتى تاريخ لا يمكن أن يكون قبل تاريخ المعاملة
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} وحدات من {1} لازمة ل {2} في {3} {4} ل {5} لإكمال هذه المعاملة.
 DocType: Fee Schedule,Student Category,طالب الفئة
-DocType: Announcement,Student,طالب علم
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,وحدة المؤسسة ( قسم) الرئيسي.
+DocType: Announcement,Student,طالب
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,الماستر الخاص بأقسام المؤسسة.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,انتقل إلى الغرف
-apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,من فضلك ادخل الرسالة قبل إرسالها
+apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,الرجاء إدخال الرسالة قبل الإرسال
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,تنويه للمورد
-DocType: Email Digest,Pending Quotations,في انتظار الاقتباسات
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,نقطة من بيع الشخصي
+DocType: Email Digest,Pending Quotations,عروض مسعرة معلقة
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,ملف نقطة البيع
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,تكوينات اختبار المختبر.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,القروض غير المضمونة
 DocType: Cost Center,Cost Center Name,اسم مركز تكلفة
@@ -4623,8 +4708,9 @@
 DocType: HR Settings,Max working hours against Timesheet,اقصى عدد ساعات عمل بسجل التوقيت
 DocType: Maintenance Schedule Detail,Scheduled Date,المقرر تاريخ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,مجموع المبالغ المدفوعة AMT
-DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,الرسائل المحتوية على اكثر من 160 حرف ستقسم الى عدة رسائل
+DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,سيتم تقسيم الرسائل التي تزيد عن 160 حرفا إلى رسائل متعددة
 DocType: Purchase Receipt Item,Received and Accepted,تلقت ومقبول
+DocType: Hub Settings,Company and Seller Profile,الشركة والبائع الملف الشخصي
 ,GST Itemised Sales Register,غست موزعة المبيعات التسجيل
 ,Serial No Service Contract Expiry,مسلسل العقد لا انتهاء الاشتراك خدمة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,لا يمكنك الائتمان والخصم نفس الحساب في نفس الوقت
@@ -4634,36 +4720,37 @@
 DocType: Item,Variant Based On,البديل القائم على
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},يجب أن يكون مجموع الترجيح تعيين 100 ٪ . فمن {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,الموردون
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,يرجى تصحيح
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,لا يمكن تحديدها كمفقودة اذا تم انشاء طلب المبيعات.
 DocType: Request for Quotation Item,Supplier Part No,رقم قطعة المورد
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"لا يمكن الخصم عندما تكون الفئة ""التقييم"" أو ""التقييم والإجمالي"""
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,مستلم من
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,مستلم من
 DocType: Lead,Converted,تحويل
 DocType: Item,Has Serial No,يحتوي على رقم تسلسلي
 DocType: Employee,Date of Issue,تاريخ الإصدار
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +24,{0}: From {0} for {1},{0}: من {0} ل{1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",وفقا لإعدادات الشراء في حالة شراء ريسيبت مطلوب == &#39;نعم&#39;، ثم لإنشاء فاتورة الشراء، يحتاج المستخدم إلى إنشاء إيصال الشراء أولا للبند {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},الصف # {0}: تعيين مورد للالبند {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,صف {0}: يجب أن تكون قيمة ساعات أكبر من الصفر.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,الموقع صورة {0} تعلق على البند {1} لا يمكن العثور
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,صف {0}: يجب أن تكون قيمة الساعات أكبر من الصفر.
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,الموقع صورة {0} تعلق على البند {1} لا يمكن العثور
 DocType: Issue,Content Type,نوع المحتوى
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,الحاسوب
 DocType: Item,List this Item in multiple groups on the website.,قائمة هذا البند في مجموعات متعددة على شبكة الانترنت.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,يرجى تعيين مجموعة العملاء الافتراضية والأقاليم في إعدادات البيع
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +323,Please check Multi Currency option to allow accounts with other currency,يرجى التحقق من خيار العملات المتعددة للسماح حسابات مع عملة أخرى
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +323,Please check Multi Currency option to allow accounts with other currency,يرجى اختيار الخيار عملات متعددة للسماح بحسابات مع عملة أخرى
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +85,Item: {0} does not exist in the system,البند: {0} غير موجود في النظام
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,.أنت غير مخول لتغيير القيم المجمدة
 DocType: Payment Reconciliation,Get Unreconciled Entries,الحصول على مدخلات لم تتم تسويتها
 DocType: Payment Reconciliation,From Invoice Date,من تاريخ الفاتورة
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,ليس لديك إذن الإرسال
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,يجب أن تكون العملة التى تقدم بها الفواتير نفس العملة الافتراضية للشركة أو نفس عملة حساب الطرف المعني
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,يجب أن تكون العملة التى تقدم بها الفواتير نفس العملة الافتراضية للشركة أو نفس عملة حساب الطرف المعني
 DocType: Healthcare Settings,Laboratory Settings,إعدادات المختبر
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,إجازات صرفت نقدا
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,مجال عمل الشركة؟
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,لمستودع
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,قبول جميع الطلاب
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,الإجازات مدفوعة
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,مجال عمل الشركة؟
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,لمستودع
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,قبول جميع الطلاب
 ,Average Commission Rate,متوسط العمولة
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,"""لهُ رقم تسلسل""  لا يمكن ان يكون ""نعم"" لبند غير قابل للتخزين"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,"""لهُ رقم تسلسل""  لا يمكن ان يكون ""نعم"" لبند غير قابل للتخزين"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,حدد الحالة
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,لا يمكن اثبات الحضور لتاريخ مستقبلي
 DocType: Pricing Rule,Pricing Rule Help,تعليمات قاعدة التسعير
@@ -4681,40 +4768,40 @@
 DocType: Item,Customer Code,كود العميل
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},التذكير بعيد ميلاد {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,الأيام منذ آخر طلب
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,مدين لحساب يجب أن يكون حساب قائمة المركز المالي
-DocType: Buying Settings,Naming Series,تسمية تسلسلية
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,مدين لحساب يجب أن يكون حساب قائمة المركز المالي
+DocType: Buying Settings,Naming Series,التسمية التسلسلية
 DocType: Leave Block List,Leave Block List Name,اسم قائمة الإجازات المحظورة
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,يجب أن يكون تاريخ بداية التأمين قبل  تاريخ نهاية التأمين
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,يرجى الإعداد المعلم نظام تسمية في المدرسة&gt; إعدادات المدرسة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,اصول المخزون
 DocType: Timesheet,Production Detail,إنتاج التفاصيل
+DocType: Restaurant,Active Menu,القائمة النشطة
 DocType: Target Detail,Target Qty,الهدف الكمية
 DocType: Shopping Cart Settings,Checkout Settings,إعدادات الدفع
 DocType: Attendance,Present,حاضر
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,تسليم مذكرة {0} يجب ألا تكون مسجلة
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,تسليم مذكرة {0} يجب ألا تكون مسجلة
 DocType: Notification Control,Sales Invoice Message,فاتورة مبيعات رسالة
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,حساب ختامي {0} يجب أن يكون من نوع الخصومات/ حقوق الملكية
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},كشف الراتب للموظف {0} تم إنشاؤه لسجل التوقيت {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},كشف الراتب للموظف {0} تم إنشاؤه لسجل التوقيت {1}
 DocType: Vehicle Log,Odometer,عداد المسافات
 DocType: Sales Order Item,Ordered Qty,أمرت الكمية
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,تم تعطيل البند {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,تم تعطيل البند {0}
 DocType: Stock Settings,Stock Frozen Upto,المخزون المجمدة لغاية
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,فاتورة الموارد لا تحتوي على أي عنصر مخزون
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,مشروع النشاط / المهمة.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,فاتورة الموارد لا تحتوي على أي عنصر مخزون
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,نشاط او مهمة لمشروع .
 DocType: Vehicle Log,Refuelling Details,تفاصيل إعادة التزود بالوقود
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,إنشاء كشوفات الرواتب
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}",يجب أن يتم التحقق الشراء، إذا تم تحديد مطبق للك {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,يجب أن يكون الخصم أقل من 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,سعر اخر شراء غير موجود
 DocType: Purchase Invoice,Write Off Amount (Company Currency),شطب المبلغ (شركة العملات)
 DocType: Sales Invoice Timesheet,Billing Hours,ساعات الفواتير
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,لم يتم العثور على قائمة المواد الافتراضي لي {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,الصف # {0}: الرجاء تعيين كمية إعادة الطلب
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,لم يتم العثور على قائمة المواد الافتراضي لي {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,الصف # {0}: الرجاء تعيين كمية إعادة الطلب
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,انقر على العناصر لإضافتها هنا
-DocType: Fees,Program Enrollment,برنامج التسجيل
+DocType: Fees,Program Enrollment,ادراج البرنامج
 DocType: Landed Cost Voucher,Landed Cost Voucher,هبطت التكلفة قسيمة
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},الرجاء تعيين {0}
-DocType: Purchase Invoice,Repeat on Day of Month,تكرار في يوم من شهر
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} طالب غير نشط
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} طالب غير نشط
 DocType: Employee,Health Details,تفاصيل الحالة الصحية
 DocType: Offer Letter,Offer Letter Terms,شروط عرض عمل
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,لإنشاء مستند مرجع طلب الدفع مطلوب
@@ -4722,9 +4809,8 @@
 DocType: Employee External Work History,Salary,الراتب
 DocType: Serial No,Delivery Document Type,تسليم الوثيقة نوع
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,الموافقة علي جميع كشوفات الرواتب حسب المعايير المذكورة أعلاه
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} بنود تم مزامنتها
 DocType: Sales Order,Partly Delivered,سلمت جزئيا
-DocType: Email Digest,Receivables,المستحقات
+DocType: Email Digest,Receivables,المستحقات للغير (مدينة)
 DocType: Lead Source,Lead Source,مصدر مبادرة البيع
 DocType: Customer,Additional information regarding the customer.,معلومات إضافية عن الزبون.
 DocType: Quality Inspection Reading,Reading 5,قراءة 5
@@ -4744,37 +4830,38 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,مدى العمر 2
 DocType: SG Creation Tool Course,Max Strength,أعلى القوة
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,تم استبدال قائمة المواد
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,حدد العناصر بناء على تاريخ التسليم
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,حدد العناصر بناء على تاريخ التسليم
 ,Sales Analytics,تحليلات المبيعات
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},متاح {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},متاح {0}
 ,Prospects Engaged But Not Converted,آفاق تشارك ولكن لم تتحول
 DocType: Manufacturing Settings,Manufacturing Settings,إعدادات التصنيع
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,إعداد البريد الإلكتروني
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 رقم الجوال
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,فضلا ادخل العملة المعتاده في الشركة الرئيسيه
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,الرجاء إدخال العملة الافتراضية في شركة الرئيسية
 DocType: Stock Entry Detail,Stock Entry Detail,تفاصيل ادخال المخزون
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,تذكيرات يومية
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,تذكيرات يومية
 DocType: Products Settings,Home Page is Products,الصفحة الرئيسية المنتجات غير
 ,Asset Depreciation Ledger,دفتر حسابات استهلاك الأصول
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},تضارب القاعدة الضريبية مع {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},تضارب القاعدة الضريبية مع {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,اسم الحساب الجديد
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,المواد الخام الموردة التكلفة
 DocType: Selling Settings,Settings for Selling Module,إعدادات لبيع وحدة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Customer Service,خدمة الزبائن
 DocType: BOM,Thumbnail,المصغرات
-DocType: Item Customer Detail,Item Customer Detail,البند تفاصيل العملاء
-apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,.عرض مرشح وظيفة
+DocType: Item Customer Detail,Item Customer Detail,تفاصيل الزبون لهذا البند
+apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,عرض عمل للمرشح للوظيفة
 DocType: Notification Control,Prompt for Email on Submission of,المطالبة البريد الالكتروني على تقديم
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,مجموع الأوراق المخصصة هي أكثر من أيام في الفترة
 DocType: Pricing Rule,Percentage,النسبة المئوية
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,البند {0} يجب أن يكون البند الأسهم
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,افتراضي العمل في مستودع التقدم
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,الإعدادات الافتراضية للمعاملات التجارية.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,الرجاء الإعداد نظام تسمية الموظف في الموارد البشرية&gt; إعدادات الموارد البشرية
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,التاريخ المتوقع لا يمكن أن يكون قبل تاريخ طلب المواد
+DocType: Restaurant,Default Tax Template,نموذج الضرائب الافتراضي
 DocType: Fees,Student Details,تفاصيل الطالب
 DocType: Purchase Invoice Item,Stock Qty,الأسهم الكمية
-DocType: Employee Loan,Repayment Period in Months,فترة السداد في شهرين
+DocType: Employee Loan,Repayment Period in Months,فترة السداد بالأشهر
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,خطأ: هوية غير صالحة؟
 DocType: Naming Series,Update Series Number,تحديث الرقم المتسلسل
 DocType: Account,Equity,حقوق الملكية
@@ -4789,8 +4876,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,انتقل إلى العناصر
 DocType: Sales Partner,Partner Type,نوع الشريك
 DocType: Purchase Taxes and Charges,Actual,فعلي
+DocType: Restaurant Menu,Restaurant Manager,مدير المطعم
 DocType: Authorization Rule,Customerwise Discount,التخفيض من ناحية الزبائن
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,الجدول الزمني للمهام.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,الجدول الزمني للمهام.
 DocType: Purchase Invoice,Against Expense Account,مقابل حساب المصاريف
 DocType: Production Order,Production Order,الإنتاج ترتيب
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,اشعار تركيب {0} سبق تقديمه
@@ -4798,12 +4886,11 @@
 DocType: Quotation Item,Against Docname,مقابل المستند
 DocType: SMS Center,All Employee (Active),جميع الموظفين (نشط)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,عرض الآن
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,حدد الفترة التي سيتم إنشاء فاتورة تلقائيا
 DocType: BOM,Raw Material Cost,تكلفة المواد الخام
 DocType: Item Reorder,Re-Order Level,إعادة ترتيب مستوى
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,إدخال عناصر والكمية المخططة التي تريد رفع أوامر الإنتاج أو تحميل المواد الخام لتحليلها.
 apps/erpnext/erpnext/projects/doctype/project/project.js +64,Gantt Chart,مخطط جانت
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Part-time,جزئي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Part-time,دوام جزئى
 DocType: Employee,Applicable Holiday List,قائمة العطلات القابلة للتطبيق
 DocType: Employee,Cheque,شيك
 DocType: Training Event,Employee Emails,رسائل البريد الإلكتروني للموظفين
@@ -4811,23 +4898,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,نوع التقرير إلزامي
 DocType: Item,Serial Number Series,المسلسل عدد سلسلة
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},المستودع إلزامي لصنف المخزون  {0} في الصف {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,إضافة برامج
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,تجارة بالجملة والتجزئة
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,بيع بالتجزئة والجملة
 DocType: Issue,First Responded On,أجاب أولا على
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Listing of Item in multiple groups
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},تم تحديد تاريخ بداية السنة المالية و تاريخ نهاية السنة المالية للسنة المالية {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,تم تحديث تاريخ  الاستحقاق
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,تقسيم دفعة
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,تقسيم دفعة
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,التوفيق بنجاح
 DocType: Request for Quotation Supplier,Download PDF,تحميل PDF
 DocType: Production Order,Planned End Date,تاريخ الانتهاء المخطط لها
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,الرجاء إدخال تاريخ الجدول
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,حيث يتم تخزين العناصر.
 DocType: Request for Quotation,Supplier Detail,المورد التفاصيل
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},خطأ في الصيغة أو الشرط: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},خطأ في الصيغة أو الشرط: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,قيمة الفواتير
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,يجب أن تضيف معايير الأوزان ما يصل إلى 100٪
 DocType: Attendance,Attendance,الحضور
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,المخزن عناصر
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,المخزن عناصر
 DocType: BOM,Materials,المواد
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",إذا لم يتم الاختيار، فان القائمة ستضاف إلى كل قسم حيث لابد من تطبيقها.
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,المخزن المصدر و المخزن المستهدف  لا يمكن أن يكون واحدا
@@ -4838,46 +4925,47 @@
 DocType: Period Closing Voucher,Period Closing Voucher,فترة الإغلاق قسيمة
 DocType: Consultation,Review Details,تفاصيل المراجعة
 DocType: Dosage Form,Dosage Form,شكل جرعات
-apps/erpnext/erpnext/config/selling.py +67,Price List master.,قائمة الأسعار الرئيسية.
+apps/erpnext/erpnext/config/selling.py +67,Price List master.,الماستر الخاص بقائمة الأسعار.
 DocType: Task,Review Date,مراجعة تاريخ
 DocType: Company,Series for Asset Depreciation Entry (Journal Entry),سلسلة دخول الأصول (دخول دفتر اليومية)
 DocType: Purchase Invoice,Advance Payments,دفعات مقدمة
 DocType: Purchase Taxes and Charges,On Net Total,على إجمالي صافي
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},يجب أن تكون قيمة للسمة {0} ضمن مجموعة من {1} إلى {2} في الزيادات من {3} لالبند {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,المستودع المستهدف في الصف {0} يجب أن يكون نفس ترتيب الإنتاج
+DocType: Restaurant Reservation,Waitlisted,على قائمة الانتظار
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,لا يمكن تغيير العملة بعد إجراء إدخالات باستخدام بعض العملات الأخرى
 DocType: Vehicle Service,Clutch Plate,صفائح التعشيق
 DocType: Company,Round Off Account,جولة قبالة حساب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,نفقات إدارية
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,الاستشارات
-DocType: Customer Group,Parent Customer Group,الأم العملاء مجموعة
+DocType: Customer Group,Parent Customer Group,الفئة الأب للزبون
 DocType: Journal Entry,Subscription,اشتراك
 DocType: Purchase Invoice,Contact Email,عنوان البريد الإلكتروني
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,إنشاء الرسوم معلقة
 DocType: Appraisal Goal,Score Earned,نقاط المكتسبة
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +229,Notice Period,فترة إشعار
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +229,Notice Period,مدة الاشعار
 DocType: Asset Category,Asset Category Name,اسم فئة الأصول
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,هذا هو الجذر الأرض والتي لا يمكن تحريرها.
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,اسم رجل المبيعات الجديد
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,اسم مندوب المبيعات جديد
 DocType: Packing Slip,Gross Weight UOM,الوزن الإجمالي UOM
 DocType: Delivery Note Item,Against Sales Invoice,مقابل فاتورة المبيعات
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,الرجاء إدخال الأرقام التسلسلية للبند المتسلسل
-DocType: Bin,Reserved Qty for Production,محفوظة الكمية للإنتاج
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,الرجاء إدخال الأرقام التسلسلية للبند المتسلسل
+DocType: Bin,Reserved Qty for Production,الكمية المحجوزة للانتاج
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ترك دون تحديد إذا كنت لا ترغب في النظر في دفعة مع جعل مجموعات مقرها بالطبع.
 DocType: Asset,Frequency of Depreciation (Months),تواتر او تكرار الاستهلاك (أشهر)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +493,Credit Account,حساب دائن
 DocType: Landed Cost Item,Landed Cost Item,هبطت تكلفة السلعة
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,إظهار القيم صفر
-DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,كمية البند تم الحصول عليها بعد تصنيع / إعادة التعبئة من كميات معينة من المواد الخام
+DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,الكمية من البنود التي تم الحصول عليها بعد التصنيع / إعادة التعبئة من الكميات المعطاء من المواد الخام
 DocType: Lab Test,Test Group,مجموعة الاختبار
 DocType: Payment Reconciliation,Receivable / Payable Account,القبض / حساب الدائنة
 DocType: Delivery Note Item,Against Sales Order Item,مقابل بند طلب مبيعات
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},يرجى تحديد قيمة السمة للسمة {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},يرجى تحديد قيمة الخاصية {0}
 DocType: Item,Default Warehouse,النماذج الافتراضية
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budget cannot be assigned against Group Account {0}
 DocType: Healthcare Settings,Patient Registration,تسجيل المريض
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,الرجاء إدخال مركز تكلفة الأب
-DocType: Delivery Note,Print Without Amount,طباعة دون المبلغ
+DocType: Delivery Note,Print Without Amount,طباعة بدون قيمة
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,تاريخ الاستهلاك
 DocType: Issue,Support Team,فريق الدعم
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),انتهاء (في يوم)
@@ -4893,7 +4981,7 @@
 DocType: Assessment Result,Total Score,مجموع النقاط
 DocType: Journal Entry,Debit Note,ملاحظة الخصم
 DocType: Stock Entry,As per Stock UOM,وفقا للأوراق UOM
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,لا انتهى
+apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,ساري المفعول
 DocType: Student Log,Achievement,إنجاز
 DocType: Batch,Source Document Type,نوع المستند المصدر
 DocType: Journal Entry,Total Debit,مجموع الخصم
@@ -4901,6 +4989,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,رجل المبيعات
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,الميزانيه و مركز التكلفة
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,لا يسمح بوضع الدفع الافتراضي المتعدد
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,ل
 ,Appointment Analytics,تعيين أناليتيكش
 DocType: Vehicle Service,Half Yearly,نصف سنوي
 DocType: Lead,Blog Subscriber,مدونه المشترك
@@ -4918,26 +5007,26 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,عدد النقاط
 ,BOM Stock Report,تقرير الأسهم BOM
 DocType: Stock Reconciliation Item,Quantity Difference,الكمية الفرق
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,معالجة دفع الرواتب
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,عمليات دفع الرواتب
 DocType: Opportunity Item,Basic Rate,قيم الأساسية
 DocType: GL Entry,Credit Amount,مبلغ دائن
 DocType: Cheque Print Template,Signatory Position,الوظيفة الموقعة
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,على النحو المفقودة
 DocType: Timesheet,Total Billable Hours,مجموع الساعات فوترة
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,إيصال دفع ملاحظة
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,إشعار إيصال الدفع
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,ويستند هذا على المعاملات ضد هذا العميل. انظر الجدول الزمني أدناه للاطلاع على التفاصيل
 DocType: Supplier,Credit Days Based On,اليوم الإئتماني بناء على
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +161,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},يجب أن يكون المبلغ المخصص {1} أقل من أو يساوي مقدار الدفع الدخول {2}: صف {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +161,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},صف {0}: يجب أن يكون المبلغ المخصص {1} أقل من أو يساوي قيمة تدوين المدفوعات {2}
 ,Course wise Assessment Report,تقرير التقييم الحكيم للدورة
 DocType: Tax Rule,Tax Rule,القاعدة الضريبية
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,الحفاظ على نفس معدل خلال دورة المبيعات
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,تخطيط سجلات الوقت خارج ساعات العمل محطة العمل.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,الزبائن في قائمة الانتظار
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,الدكتور {0} ليس لديه جدول الأطباء. إضافته في سيد الطبيب
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,الزبائن في قائمة الانتظار
 DocType: Student,Nationality,جنسية
 ,Items To Be Requested,البنود يمكن طلبه
-DocType: Purchase Order,Get Last Purchase Rate,الحصول على آخر سعر شراء
 DocType: Company,Company Info,معلومات عن الشركة
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,تحديد أو إضافة عميل جديد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,تحديد أو إضافة عميل جديد
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,مركز التكلفة مطلوب لتسجيل المطالبة بالنفقات
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),استخدام الاموال (الأصول)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ويستند هذا على حضور هذا الموظف
@@ -4945,52 +5034,55 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,حساب مدين
 DocType: Fiscal Year,Year Start Date,تاريخ بدء العام
 DocType: Attendance,Employee Name,اسم الموظف
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,مطعم دخول البند البند
 DocType: Sales Invoice,Rounded Total (Company Currency),المشاركات تقريب (العملة الشركة)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,لا يمكن تحويل الحساب إلى تصنيف مجموعة لأن نوع الحساب تم اختياره.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,تم تعديل {0} {1}، يرجى تحديث الصفحة من المتصفح
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,وقف المستخدمين من طلب إجازة في الأيام التالية.
-apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,مبلغ الشراء
+apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,قيمة الشراء
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +259,Supplier Quotation {0} created,المورد الاقتباس {0} خلق
 apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,نهاية العام لا يمكن أن يكون قبل بداية العام
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,الميزات للموظف
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},الكمية المعبأة يجب أن تساوي كمية المادة ل {0} في {1} الصف
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},الكمية المعبأة يجب ان تساي كمية البند {0} في الصف {1}
 DocType: Production Order,Manufactured Qty,الكمية المصنعة
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,تم إنشاء الفاتورة
 DocType: Purchase Receipt Item,Accepted Quantity,كمية مقبولة
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},يرجى تحديد قائمة العطل الافتراضية للموظف {0} وشركة {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},يرجى تحديد قائمة العطل الافتراضية للموظف {0} أو الشركة {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} غير موجود
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +75,Select Batch Numbers,حدد أرقام الدفعة
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,فواتير حولت للزبائن.
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,معرف المشروع
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,هوية المشروع
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},الصف لا {0}: مبلغ لا يمكن أن يكون أكبر من ريثما المبلغ من النفقات المطالبة {1}. في انتظار المبلغ {2}
 DocType: Maintenance Schedule,Schedule,جدول
-DocType: Account,Parent Account,الحساب الأصل
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,متاح
+DocType: Account,Parent Account,حساب اب
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,متاح
 DocType: Quality Inspection Reading,Reading 3,قراءة 3
 ,Hub,محور
 DocType: GL Entry,Voucher Type,نوع السند
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,قائمة الأسعار لم يتم العثور أو تعطيلها
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,قائمة الأسعار غير موجودة أو تم تعطيلها
 DocType: Lab Test,Approved,موافق عليه
 DocType: Pricing Rule,Price,السعر
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',الموظف الذي ترك العمل في {0} يجب أن يتم تحديده ' مغادر '
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',الموظف الذي ترك العمل في {0} يجب أن يتم تحديده ' مغادر '
+DocType: Hub Settings,Last Sync On,آخر مزامنة تشغيل
 DocType: Guardian,Guardian,وصي
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,تقييم الاداء {0} تم إنشاؤه للموظف {1} في النطاق الزمني المحدد
 DocType: Employee,Education,التعليم
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,حذف
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,حذف
 DocType: Selling Settings,Campaign Naming By,حملة التسمية بواسطة
 DocType: Employee,Current Address Is,العنوان الحالي هو
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,هدف المبيعات الشهرية (
 apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,تم التعديل
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +41,"Optional. Sets company's default currency, if not specified.",.اختياري. ضبط العملة الافتراضية للشركة، إذا لم يتم تحديدها.
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +41,"Optional. Sets company's default currency, if not specified.",اختياري. تحديد العملة الافتراضية للشركة، إذا لم يتم تحديدها.
 DocType: Sales Invoice,Customer GSTIN,العميل غستين
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,القيود المحاسبية لدفتر اليومية
 DocType: Delivery Note Item,Available Qty at From Warehouse,متوفر (كمية ) عند (من المخزن)
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,الرجاء تحديد سجل الموظف أولا.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,الرجاء اختيارسجل الموظف أولا.
 DocType: POS Profile,Account for Change Amount,حساب لتغيير المبلغ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},الصف {0}: حزب / حساب لا يتطابق مع {1} / {2} في {3} {4}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,رمز المقرر:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,الرجاء إدخال حساب المصاريف
 DocType: Account,Stock,المخزون
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",الصف # {0}: يجب أن يكون مرجع نوع الوثيقة واحدة من طلب شراء، شراء فاتورة أو إدخال دفتر اليومية
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",الصف # {0}: يجب أن يكون مرجع نوع الوثيقة واحدة من طلب شراء، شراء فاتورة أو إدخال دفتر اليومية
 DocType: Employee,Current Address,العنوان الحالي
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",إذا كان البند هو البديل من بند آخر ثم وصف، صورة، والتسعير، والضرائب سيتم تعيين غيرها من القالب، ما لم يذكر صراحة
 DocType: Serial No,Purchase / Manufacture Details,تفاصيل شراء / تصنيع
@@ -5011,7 +5103,7 @@
 DocType: Stock Entry,Default Target Warehouse,المخزن الافتراضي المستهدف
 DocType: Purchase Invoice,Net Total (Company Currency),صافي الأجمالي ( بعملة الشركة )
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,تاريخ نهاية السنة لا يمكن أن يكون أقدم من تاريخ بداية السنة. يرجى تصحيح التواريخ وحاول مرة أخرى.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,الصف {0}: نوع الحزب والحزب لا ينطبق إلا على المقبوضات / حسابات المدفوعات
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,الصف {0}: نوع الطرف المعني والطرف المعني قابل للتطبيق فقط مع الحسابات المدينة و الدائنة
 DocType: Notification Control,Purchase Receipt Message,رسالة إيصال شراء
 DocType: BOM,Scrap Items,الخردة الأصناف
 DocType: Production Order,Actual Start Date,تاريخ البدء الفعلي
@@ -5021,7 +5113,7 @@
 DocType: Hub Settings,Hub Settings,إعدادات المحور
 DocType: Project,Gross Margin %,هامش إجمالي٪
 DocType: BOM,With Operations,مع عمليات
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,تم إدخال قيود محاسبية بالعملة {0} للشركة {1}. يرجى تحديد الحساب المدين أو الحساب الدائن بالعملة {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,تم إدخال قيود محاسبية بالعملة {0} للشركة {1}. يرجى تحديد الحساب المدين أو الحساب الدائن بالعملة {0}.
 DocType: Asset,Is Existing Asset,هل أصل موجود
 DocType: Salary Detail,Statistical Component,العنصر الإحصائي
 DocType: Warranty Claim,If different than customer address,إذا كان مختلفا عن عنوان العميل
@@ -5029,77 +5121,78 @@
 DocType: BOM Operation,BOM Operation,عملية قائمة المواد
 DocType: Purchase Taxes and Charges,On Previous Row Amount,على المبلغ الصف السابق
 DocType: Student,Home Address,عنوان المنزل
+DocType: Item,Has Expiry Date,تاريخ انتهاء الصلاحية
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,إعدادات فاريانت العنصر.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,نقل الأصول
-DocType: POS Profile,POS Profile,POS الملف الشخصي
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,نقل الأصول
+DocType: POS Profile,POS Profile,الملف الشخصي لنقطة البيع
 DocType: Training Event,Event Name,اسم الحدث
 DocType: Physician,Phone (Office),الهاتف (المكتب)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,القبول
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},القبول ل {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,القبول
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},القبول ل {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.",موسمية لوضع الميزانيات والأهداف الخ
 DocType: Supplier Scorecard Scoring Variable,Variable Name,اسم المتغير
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",{0} البند هو قالب، يرجى اختيار واحد من مشتقاته
 DocType: Asset,Asset Category,فئة الأصول
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,صافي الأجور لا يمكن أن يكون بالسالب
-DocType: Assessment Plan,Room,غرفة
+DocType: Assessment Plan,Room,قاعة
 DocType: Purchase Order,Advance Paid,مسبقا المدفوعة
 DocType: Item,Item Tax,ضريبة السلعة
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,المواد للمورد ل
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,مواد للمورد
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,المكوس الفاتورة
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}٪ يظهر أكثر من مرة
 DocType: Expense Claim,Employees Email Id,البريد الإلكتروني  للموظف
-DocType: Employee Attendance Tool,Marked Attendance,تم تسجيل حضور
+DocType: Employee Attendance Tool,Marked Attendance,حضور مسجل
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,الخصوم المتداولة
 apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,إرسال SMS الشامل لجهات الاتصال الخاصة بك
 DocType: Patient,A Positive,ايجابي
 DocType: Program,Program Name,إسم البرنامج
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,النظر في ضريبة أو رسم ل
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,الكمية الفعلية هي إلزامية
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} لديها حاليا {1} بطاقة أداء بطاقة الموردين، ويجب إصدار أوامر الشراء إلى هذا المورد بحذر.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} لديها حاليا {1} بطاقة أداء بطاقة الموردين، ويجب إصدار أوامر الشراء إلى هذا المورد بحذر.
 DocType: Employee Loan,Loan Type,نوع القرض
 DocType: Scheduling Tool,Scheduling Tool,أداة الجدولة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,بطاقة ائتمان
-DocType: BOM,Item to be manufactured or repacked,السلعة ليتم تصنيعها أو إعادة تعبئتها
+DocType: BOM,Item to be manufactured or repacked,البند الذي سيتم تصنيعه أو إعادة تعبئته
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,الإعدادات الافتراضية لمعاملات المخزون.
-DocType: Purchase Invoice,Next Date,تاريخ القادمة
 DocType: Employee Education,Major/Optional Subjects,المواد الرئيسية والاختيارية التي تم دراستها
 DocType: Sales Invoice Item,Drop Ship,هبوط السفينة
+DocType: Hub Settings,Suspended,معلق
 DocType: Training Event,Attendees,الحضور
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",هنا يمكنك إدراج تفاصيل عائلية مثل اسم العائلة ومهنة الزوج، الوالدين والأطفال
 DocType: Academic Term,Term End Date,المدى تاريخ الانتهاء
-DocType: Hub Settings,Seller Name,اسم البائع
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),الضرائب والرسوم مقطوعة (عملة الشركة)
 DocType: Item Group,General Settings,الإعدادات العامة
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,(من عملة) و (إلى عملة) لا يمكن أن تكون نفسها
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,إضافة المدربين
 DocType: Stock Entry,Repack,أعد حزم
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,يجب حفظ النموذج قبل الشروع
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,يرجى تحديد الشركة أولا
 DocType: Item Attribute,Numeric Values,قيم رقمية
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,إرفاق الشعار
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,تحديد المستوى
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,تحديد المستوى
 DocType: Customer,Commission Rate,نسبة العمولة
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,تم إنشاء {0} بطاقات الأداء {1} بين:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,أنشئ متغير
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,أنشئ متغير
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,طلبات ايجازات محظورة من قبل القسم
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer",يجب أن يكون نوع دفعة واحدة من استلام والدفع ونقل الداخلي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer",يجب أن يكون نوع الدفعة واحدة من الاتي اما استلام او دفع او نقل داخلي
 apps/erpnext/erpnext/config/selling.py +179,Analytics,التحليلات
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,السلة فارغة
 DocType: Vehicle,Model,نموذج
 DocType: Production Order,Actual Operating Cost,الفعلية تكاليف التشغيل
 DocType: Payment Entry,Cheque/Reference No,رقم الصك / السند المرجع
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,. الجذرلا يمكن تعديل
+apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,الجذرلا يمكن تعديل.
 DocType: Item,Units of Measure,وحدات القياس
 DocType: Manufacturing Settings,Allow Production on Holidays,السماح الإنتاج على عطلات
 DocType: Sales Order,Customer's Purchase Order Date,تاريخ امر الشراء العميل
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,رأس المال
 DocType: Shopping Cart Settings,Show Public Attachments,عرض المرفقات العامة
 DocType: Packing Slip,Package Weight Details,تفاصيل حزمة الوزن
+DocType: Restaurant Reservation,Reservation Time,وقت الحجز
 DocType: Payment Gateway Account,Payment Gateway Account,دفع حساب البوابة
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,اعاده توجيه المستخدم الى الصفحات المحدده بعد اكتمال عمليه الدفع
 DocType: Company,Existing Company,الشركة الحالية
 DocType: Healthcare Settings,Result Emailed,النتيجة عبر البريد الإلكتروني
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",تم تغيير فئة الضرائب إلى &quot;توتال&quot; لأن جميع العناصر هي عناصر غير مخزون
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,رمز البند&gt; مجموعة المنتجات&gt; العلامة التجارية
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,يرجى اختيار ملف CSV
 DocType: Student Leave Application,Mark as Present,إجعلها الحاضر
 DocType: Supplier Scorecard,Indicator Color,لون المؤشر
@@ -5115,34 +5208,35 @@
 DocType: Batch,Expiry Date,تاريخ انتهاء الصلاحية
 DocType: Healthcare Settings,Employee name and designation in print,اسم الموظف وتعيينه في الطباعة
 ,accounts-browser,متصفح الحسابات
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +351,Please select Category first,الرجاء اختيار الفئة الأولى
-apps/erpnext/erpnext/config/projects.py +13,Project master.,المشروع الرئيسي.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +351,Please select Category first,الرجاء اختيار الفئة اولا
+apps/erpnext/erpnext/config/projects.py +13,Project master.,الماستر الخاص بالمشاريع.
 apps/erpnext/erpnext/controllers/status_updater.py +209,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",للسماح الإفراط في الفواتير أو الإفراط في الطلب، وتحديث &quot;بدل&quot; في إعدادات المالية أو البند.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,لا تظهر أي رمز مثل $  بجانب العملات.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(نصف يوم)
 DocType: Supplier,Credit Days,الائتمان أيام
-apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,جعل دفعة الطلبة
+apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,إنشاء دفعة من الطلبة
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,هل تضاف في العام التالي
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,BOM الحصول على أصناف من
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,يوم ووقت مبادرة البيع
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,تنزيل الاصناف من BOM
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,المدة الزمنية بين بدء وإنهاء عملية الإنتاج
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},الصف # {0}: تاريخ النشر يجب أن يكون نفس تاريخ الشراء {1} من الأصول {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,تحقق من ذلك إذا كان الطالب يقيم في نزل المعهد.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,الرجاء إدخال أوامر البيع في الجدول أعلاه
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,الرجاء إدخال طلب المبيعات في الجدول أعلاه
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,كشوفات الرواتب لم يتم تقديمها
 ,Stock Summary,ملخص الأوراق المالية
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,نقل رصيدا من مستودع واحد إلى آخر
 DocType: Vehicle,Petrol,بنزين
-apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Party Type and Party is required for Receivable / Payable account {1},الصف {0}: مطلوب نوع الحزب وحزب المقبوضات / حسابات المدفوعات {1}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,المرجع التسجيل
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,قائمة المواد
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Party Type and Party is required for Receivable / Payable account {1},الصف {0}: نوع الطرف المعني والطرف المعني مطلوب للحسابات المدينة / الدائنة {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,تاريخ المرجع
 DocType: Employee,Reason for Leaving,سبب ترك العمل
-DocType: BOM Operation,Operating Cost(Company Currency),تكاليف التشغيل ( بعملة الشركة )
+DocType: BOM Operation,Operating Cost(Company Currency),تكاليف التشغيل (عملة الشركة)
 DocType: Employee Loan Application,Rate of Interest,معدل الفائدة
 DocType: Expense Claim Detail,Sanctioned Amount,القيمة المقرر صرفه
 DocType: GL Entry,Is Opening,هل قيد افتتاحي
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},لا يمكن ربط الخصم المباشر الإدخال مع {1} الصف {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},الصف {0}: لا يمكن ربط قيد مدين مع {1}
 DocType: Journal Entry,Subscription Section,قسم الاشتراك
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,حساب {0} غير موجود
+DocType: Training Event,Training Program,برنامج تدريب
 DocType: Account,Cash,نقد
 DocType: Employee,Short biography for website and other publications.,نبذة على موقع الويب وغيره من المنشورات.
diff --git a/erpnext/translations/bg.csv b/erpnext/translations/bg.csv
index 9bb102e..f72f810 100644
--- a/erpnext/translations/bg.csv
+++ b/erpnext/translations/bg.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Mode Заплата
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Регистрирам
 DocType: Patient,Divorced,Разведен
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Позициите са вече синхронизирани
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Оставя т да бъдат добавени няколко пъти в една сделка
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,"Отмени Материал посещение {0}, преди да анулирате този гаранционен иск"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Потребителски продукти
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Одобряващи отсъствия
 DocType: Sales Partner,Dealer,Търговец
 DocType: Consultation,Investigations,Изследвания
+DocType: Restaurant Order Entry,Click Enter To Add,Щракнете върху Enter to Add
 DocType: Employee,Rented,Отдаден под наем
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Приложимо за User
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Спряно производство Поръчка не може да бъде отменено, отпуши го първо да отмените"
 DocType: Vehicle Service,Mileage,километраж
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Наистина ли искате да се бракувате от този актив?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Наистина ли искате да се бракувате от този актив?
 DocType: Drug Prescription,Update Schedule,Актуализиране на график
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Избор на доставчик по подразбиране
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Изисква се валута за Ценоразпис {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Провери наличността
 DocType: Job Applicant,Job Applicant,Кандидат За Работа
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Това се основава на сделки срещу този доставчик. Вижте график по-долу за повече подробности
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Няма повече резултати.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Правен
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Актуалния вид данък не може да бъде включен в цената на артикула от ред {0}
 DocType: Bank Guarantee,Customer,Клиент
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Валутен курс трябва да бъде същата като {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Име на клиента
 DocType: Vehicle,Natural Gas,Природен газ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Банкова сметка не може да бъде с име като {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Банкова сметка не може да бъде с име като {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (или групи), срещу които са направени счетоводни записвания и баланси се поддържат."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Изключително за {0} не може да бъде по-малък от нула ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Няма изпратени заплата за обработка.
 DocType: Manufacturing Settings,Default 10 mins,По подразбиране 10 минути
 DocType: Leave Type,Leave Type Name,Тип отсъствие - Име
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Покажи отворен
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Необходимо е само днес да предприемем това действие за споменатото по-горе повтаряне
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Номерацията е успешно обновена
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Поръчка
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Начисляване на заплати - Изпратено
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Покупка Поръчка артикули да бъдат получени
 DocType: SMS Center,All Supplier Contact,All доставчика Свържи се с
 DocType: Support Settings,Support Settings,Настройки на модул Поддръжка
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Очаквано Крайна дата не може да бъде по-малко от очакваното Начална дата
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Очаквано Крайна дата не може да бъде по-малко от очакваното Начална дата
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Курсове трябва да е същото като {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Нова молба за отсъствие
 ,Batch Item Expiry Status,Партида - Статус на срок на годност
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Банков чек
 DocType: Mode of Payment Account,Mode of Payment Account,Вид на разплащателна сметка
 DocType: Consultation,Consultation,консултация
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Продажби и връщания
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Покажи Варианти
 DocType: Academic Term,Academic Term,Академик Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Материал
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Грижа за здравето
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Забавяне на плащане (дни)
 DocType: Lab Prescription,Lab Prescription,Лабораторни предписания
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Сортирай по цена
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Expense Service
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Сериен номер: {0} вече е посочен в фактурата за продажби: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Фактура
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Сериен номер: {0} вече е посочен в фактурата за продажби: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Периодичност
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Фискална година {0} се изисква
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Отбрана
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Ред # {0}:
 DocType: Timesheet,Total Costing Amount,Общо Остойностяване сума
 DocType: Delivery Note,Vehicle No,Превозно средство - Номер
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Моля изберете Ценоразпис
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Моля изберете Ценоразпис
 DocType: Accounts Settings,Currency Exchange Settings,Настройки за обмяна на валута
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Row {0}: платежен документ се изисква за завършване на trasaction
 DocType: Production Order Operation,Work In Progress,Незавършено производство
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,"Моля, изберете дата"
 DocType: Employee,Holiday List,Списък на празиниците
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,"Моля, настройте системата за назначаване на инструктори в училище&gt; Училищни настройки"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Счетоводител
+DocType: Hub Settings,Selling Price List,Ценова листа за продажба
 DocType: Patient,Tobacco Current Use,Тютюновата текуща употреба
 DocType: Cost Center,Stock User,Склад за потребителя
 DocType: Company,Phone No,Телефон No
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,"Списъци на курса, създадени:"
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Нов {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Нов {0} # {1}
 ,Sales Partners Commission,Комисионна за Търговски партньори
 DocType: Purchase Invoice,Rounding Adjustment,Настройка на закръгляването
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Съкращение не може да има повече от 5 символа
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Родител Подробности docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Референция: {0}, кода на елемента: {1} и клиента: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Кг
-DocType: Student Log,Log,Журнал
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Откриване на работа.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Резултатът е изпратен
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Резултатът е изпратен
 DocType: Item Attribute,Increment,Увеличение
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Период от време
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Изберете склад ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Омъжена
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Не е разрешен за {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Вземете елементи от
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Фондова не може да бъде актуализиран срещу Бележка за доставка {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Фондова не може да бъде актуализиран срещу Бележка за доставка {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Продукт {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Няма изброени елементи
 DocType: Payment Reconciliation,Reconcile,Съгласувайте
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пенсионни фондове
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Следваща дата на амортизация не може да бъде преди датата на покупка
 DocType: Consultation,Consultation Date,Дата на консултацията
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Списък на продуктите и откриване за ERPNext потребители
 DocType: SMS Center,All Sales Person,Всички продажби Person
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Месечно Разпределение ** ви помага да разпределите бюджета / целеви разходи през месеците, ако имате сезонност в бизнеса си."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Не са намерени
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Заплата Структура Липсващ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Не са намерени
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Заплата Структура Липсващ
 DocType: Lead,Person Name,Лице Име
 DocType: Sales Invoice Item,Sales Invoice Item,Фактурата за продажба - позиция
 DocType: Account,Credit,Кредит
 DocType: POS Profile,Write Off Cost Center,Разходен център за отписване
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",например &quot;Основно училище&quot; или &quot;университет&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",например &quot;Основно училище&quot; или &quot;университет&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Сток Доклади
 DocType: Warehouse,Warehouse Detail,Скалд - Детайли
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Кредитен лимит е бил надхвърлен за клиенти {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term крайна дата не може да бъде по-късно от края на годината Дата на учебната година, към който е свързан терминът (Academic Година {}). Моля, коригирайте датите и опитайте отново."
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Е фиксиран актив"" не може да бъде размаркирано, докато съществува запис за елемента"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Е фиксиран актив"" не може да бъде размаркирано, докато съществува запис за елемента"
 DocType: Vehicle Service,Brake Oil,Спирачна течност
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Група клиенти&gt; Територия
 DocType: Tax Rule,Tax Type,Данъчна тип
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Облагаема сума
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Вие не можете да добавяте или актуализация записи преди {0}
 DocType: BOM,Item Image (if not slideshow),Позиция - снимка (ако не слайдшоу)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Съществува Customer със същото име
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(надница на час / 60) * действително отработено време
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Ред # {0}: Референтният Тип на документа трябва да е от декларация за разходи или запис в дневника
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Изберете BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Ред # {0}: Референтният Тип на документа трябва да е от декларация за разходи или запис в дневника
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Изберете BOM
 DocType: SMS Log,SMS Log,SMS Журнал
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Разходи за доставени изделия
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Отпускът на {0} не е между От Дата и До  дата
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,Служител кредит
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Журнал на дейностите:
 DocType: Fee Schedule,Send Payment Request Email,Изпращане на имейл с искане за плащане
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Позиция {0} не съществува в системата или е с изтекъл срок
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Позиция {0} не съществува в системата или е с изтекъл срок
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Недвижим имот
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Извлечение от сметка
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Фармации
@@ -210,17 +213,22 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Журнал на импорта
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Издърпайте Материал Искане на тип Производство на базата на горните критерии
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Успешно е било регистрирано.
 DocType: Training Result Employee,Grade,Клас
+DocType: Restaurant Table,No of Seats,Брой на седалките
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","За да добавите динамичен обект, използвайте джиджи тагове като <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Доставени от доставчик
 DocType: SMS Center,All Contact,Всички контакти
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Производство Поръчка вече е създаден за всички артикули с BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Производство Поръчка вече е създаден за всички артикули с BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Годишна заплата
 DocType: Daily Work Summary,Daily Work Summary,Ежедневната работа Резюме
 DocType: Period Closing Voucher,Closing Fiscal Year,Приключване на финансовата година
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} е замразен
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Моля изберете съществуващо дружество за създаване на сметкоплан
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} е замразен
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Моля изберете съществуващо дружество за създаване на сметкоплан
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Сток Разходи
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Изберете склад - цел
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Изберете склад - цел
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Моля, въведете Предпочитан контакт Email"
 DocType: Program Enrollment,School Bus,Училищен автобус
 DocType: Journal Entry,Contra Entry,Обратно записване
@@ -237,9 +245,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Изтеглете шаблони, попълнете необходимите данни и се прикрепва на текущото изображение. Всички дати и служител комбинация в избрания период ще дойде в шаблона, със съществуващите записи посещаемост"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Позиция {0} не е активна или е достигнат  края на жизнения й цикъл
+DocType: Student Admission Program,Minimum Age,Минимална възраст
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Пример: Основни математика
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","За да включват курортна такса в ред {0} в скоростта на т, данъци в редове {1} трябва да се включат и"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Настройки за модул ТРЗ
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Настройки за модул ТРЗ
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Промяна сума
 DocType: BOM Update Tool,New BOM,Нова спецификация на материал
@@ -249,7 +258,7 @@
 DocType: Lead,Request Type,Заявка Тип
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Създай Служител
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Радиопредаване
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Добави стаи
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Режим на настройка на POS (онлайн / офлайн)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Изпълнение
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Подробности за извършените операции.
 DocType: Serial No,Maintenance Status,Статус на поддръжка
@@ -272,6 +281,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Ценоразписът трябва да е за покупка или продажба
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Дата на монтаж не може да бъде преди датата на доставка за позиция {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Отстъпка от Ценоразпис (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,биохимия
 DocType: Offer Letter,Select Terms and Conditions,Изберете Общи условия
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,Изх. стойност
 DocType: Production Planning Tool,Sales Orders,Поръчки за продажба
@@ -306,15 +316,15 @@
 DocType: Sales Partner,Reseller,Reseller
 DocType: Codification Table,Medical Code,Медицински кодекс
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Ако е избрано, ще включва не-склад продукта в материала искания."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,"Моля, въведете Company"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,"Моля, въведете Company"
 DocType: Delivery Note Item,Against Sales Invoice Item,Срещу ред от фактура за продажба
 ,Production Orders in Progress,Производствени поръчки в процес на извършване
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Нетни парични средства от Финансиране
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage е пълен, не беше записан"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage е пълен, не беше записан"
 DocType: Lead,Address & Contact,Адрес и контакти
 DocType: Leave Allocation,Add unused leaves from previous allocations,Добави неизползвани отпуски от предишни разпределения
 DocType: Sales Partner,Partner website,Партньорски уебсайт
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Добави елемент
+DocType: Restaurant Order Entry,Add Item,Добави елемент
 DocType: Lab Test,Custom Result,Потребителски резултат
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Контакт - име
 DocType: Course Assessment Criteria,Course Assessment Criteria,Критерии за оценка на курса
@@ -327,7 +337,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Заявка за покупка.
 DocType: Lab Test,Submitted Date,Изпратена дата
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Това се основава на графици създадените срещу този проект
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Net Pay не може да бъде по-малко от 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Net Pay не може да бъде по-малко от 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","За да престанете да изпращате известия за повтарящи се грешки от системата, проверихме полето &quot;Забранено&quot; в абонамента"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Само избраният Оставете одобряващ да подадете този отпуск Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Облекчаване дата трябва да е по-голяма от Дата на Присъединяване
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Отпуск на година
@@ -336,9 +347,10 @@
 DocType: Email Digest,Profit & Loss,Печалба & загуба
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Литър
 DocType: Task,Total Costing Amount (via Time Sheet),Общо Остойностяване сума (чрез Time Sheet)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,"Моля, настройте студентите под групи студенти"
 DocType: Item Website Specification,Item Website Specification,Позиция Website Specification
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Оставете Блокиран
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Позиция {0} е достигнала края на своя живот на {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Позиция {0} е достигнала края на своя живот на {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Банкови записи
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Годишен
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Склад за помирение Точка
@@ -347,7 +359,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Група инструмент за създаване на курса
 DocType: Lead,Do Not Contact,Не притеснявайте
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,"Хората, които учат във вашата организация"
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Уникалния идентификационен код за проследяване на всички повтарящи се фактури. Той се генерира на представи.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Разработчик на софтуер
 DocType: Item,Minimum Order Qty,Минимално количество за поръчка
 DocType: Pricing Rule,Supplier Type,Доставчик Тип
@@ -357,17 +368,19 @@
 DocType: Item,Publish in Hub,Публикувай в Hub
 DocType: Student Admission,Student Admission,прием на студенти
 ,Terretory,Територия
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Точка {0} е отменена
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Заявка за материал
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Точка {0} е отменена
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Заявка за материал
 DocType: Bank Reconciliation,Update Clearance Date,Актуализация Клирънсът Дата
 DocType: Item,Purchase Details,Закупуване - Детайли
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Позиция {0} не е открита в ""суровини Доставени""в Поръчката {1}"
 DocType: Patient Relation,Relation,Връзка
 DocType: Shipping Rule,Worldwide Shipping,Работна станция - Доставка
 DocType: Patient Relation,Mother,майка
+DocType: Restaurant Reservation,Reservation End Time,Време за край на резервацията
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Потвърдените поръчки от клиенти.
 DocType: Purchase Receipt Item,Rejected Quantity,Отхвърлени Количество
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Заявката за плащане {0} бе създадена
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Заявката за плащане {0} бе създадена
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Ниска чувствителност
 DocType: Notification Control,Notification Control,Контрол на уведомления
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,"Моля, потвърдете, след като завършите обучението си"
 DocType: Lead,Suggestions,Предложения
@@ -387,7 +400,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Имейли заплата приплъзване на служител на базата на предпочитан имейл избран в Employee
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Първият Оставете одобряващ в списъка ще бъде избран по подразбиране Оставете одобряващ
 DocType: Tax Rule,Shipping County,Доставка Област
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Уча
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Уча
 DocType: Asset,Next Depreciation Date,Следваща дата на амортизация
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Разходите за дейността според Служител
 DocType: Accounts Settings,Settings for Accounts,Настройки за сметки
@@ -398,13 +411,13 @@
 DocType: Item,Synced With Hub,Синхронизирано с хъб
 DocType: Vehicle,Fleet Manager,Мениджър на автопарк
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Ред {0} {1} не може да бъде отрицателен за позиция {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Грешна Парола
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Грешна Парола
 DocType: Item,Variant Of,Вариант на
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"Изпълнено Количество не може да бъде по-голямо от ""Количество за производство"""
 DocType: Period Closing Voucher,Closing Account Head,Закриване на профила Head
 DocType: Employee,External Work History,Външно работа
 DocType: Physician,Time per Appointment,Време за назначаване
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Циклична референция - Грешка
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Циклична референция - Грешка
 DocType: Appointment Type,Is Inpatient,Е стационар
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Наименование Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Словом (износ) ще бъде видим след като запазите складовата разписка.
@@ -413,19 +426,18 @@
 DocType: Lead,Industry,Индустрия
 DocType: Employee,Job Profile,Работа - профил
 DocType: BOM Item,Rate & Amount,Оцени и сума
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Моля, настроите серийна номерация за участие чрез настройка&gt; Серия за номериране"
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Това се основава на транзакции срещу тази компания. За подробности вижте хронологията по-долу
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Изпращайте по имейл за създаване на автоматично искане за материали
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,устойчив
 DocType: Journal Entry,Multi Currency,Много валути
 DocType: Payment Reconciliation Invoice,Invoice Type,Вид фактура
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Група клиенти&gt; Територия
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Складова разписка
 DocType: Consultation,Encounter Impression,Среща впечатление
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Създаване Данъци
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Разходи за продадения актив
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,"Записът за плащане е променен, след като е прочетено. Моля, изтеглете го отново."
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} е въведен два пъти в данък за позиция
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Резюме за тази седмица и предстоящи дейности
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} е въведен два пъти в данък за позиция
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Резюме за тази седмица и предстоящи дейности
 DocType: Student Applicant,Admitted,Приети
 DocType: Workstation,Rent Cost,Разход за наем
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Сума след амортизация
@@ -439,36 +451,35 @@
 DocType: Shipping Rule,Valid for Countries,Важи за Държави
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Тази позиция е шаблон и не може да се използва в сделките. Елемент атрибути ще бъдат копирани в вариантите освен &quot;Не Copy&quot; е зададен
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Общо Поръчка Смятан
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Наименование на служителите (например главен изпълнителен директор, директор и т.н.)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Наименование на служителите (например главен изпълнителен директор, директор и т.н.)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Скоростта, с която Customer валути се превръща в основна валута на клиента"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Инструмент за създаване на график на курса
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row {0}: Покупка на фактура не може да се направи срещу съществуващ актив {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Urgent] Грешка при създаване на повтарящи се% s за% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Urgent] Грешка при създаване на повтарящи се% s за% s
 DocType: Item Tax,Tax Rate,Данъчна Ставка
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},"{0} вече разпределена за Служител {1} за период {2} {3}, за да"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Изберете Точка
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Изберете Точка
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Фактурата за покупка {0} вече е изпратена
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Не трябва да е същото като {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Конвертиране в не-Група
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Партида на дадена позиция.
 DocType: C-Form Invoice Detail,Invoice Date,Дата на фактура
 DocType: GL Entry,Debit Amount,Дебит сума
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Може да има само един акаунт нза тази фирма в {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,"Моля, вижте прикачения файл"
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Може да има само един акаунт нза тази фирма в {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,"Моля, вижте прикачения файл"
 DocType: Purchase Order,% Received,% Получени
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Създаване на ученически групи
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Настройката е вече изпълнена !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Настройката е вече изпълнена !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Кредитна бележка Сума
 DocType: Setup Progress Action,Action Document,Документ за действие
 ,Finished Goods,Готова продукция
 DocType: Delivery Note,Instructions,Инструкции
 DocType: Quality Inspection,Inspected By,Инспектирани от
 DocType: Maintenance Visit,Maintenance Type,Тип Поддръжка
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} не е записан в курса {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код на елемента&gt; Група на елементите&gt; Марка
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} не е записан в курса {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Сериен № {0} не принадлежи на стокова разписка {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Демо
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Добави елементи
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Добави елементи
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Позиция проверка на качеството на параметър
 DocType: Leave Application,Leave Approver Name,Одобряващ отсъствия - Име
 DocType: Depreciation Schedule,Schedule Date,График Дата
@@ -488,7 +499,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Работно Време
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Промяна на изходния / текущия номер за последователност на съществуваща серия.
 DocType: Dosage Strength,Strength,сила
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Създаване на нов клиент
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Създаване на нов клиент
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ако няколко ценови правила продължават да преобладават, потребителите се приканват да се настрои приоритет ръчно да разрешите конфликт."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Създаване на поръчки за покупка
 ,Purchase Register,Покупка Регистрация
@@ -507,7 +518,7 @@
 DocType: Lab Test Template,Single,Единичен
 DocType: Salary Slip,Total Loan Repayment,Общо кредит за погасяване
 DocType: Account,Cost of Goods Sold,Себестойност на продадените стоки
-DocType: Purchase Invoice,Yearly,Годишно
+DocType: Subscription,Yearly,Годишно
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,"Моля, въведете Cost Center"
 DocType: Drug Prescription,Dosage,дозиране
 DocType: Journal Entry Account,Sales Order,Поръчка за продажба
@@ -537,7 +548,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобални настройки за всички производствени процеси.
 DocType: Accounts Settings,Accounts Frozen Upto,Замразени Сметки до
 DocType: SMS Log,Sent On,Изпратено на
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Умение {0} избрани няколко пъти в атрибути на маса
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Умение {0} избрани няколко пъти в атрибути на маса
 DocType: HR Settings,Employee record is created using selected field. ,Запис на служителите е създаден с помощта на избран област.
 DocType: Sales Order,Not Applicable,Не Е Приложимо
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Основен празник
@@ -562,13 +573,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Общо отсъствия разпределени е задължително
 DocType: Patient,AB Positive,AB Положителен
 DocType: Job Opening,Description of a Job Opening,Описание на позиция за работа
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Предстоящите дейности за днес
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Предстоящите дейности за днес
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Присъствие запис.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Заплата Компонент за график базирани работни заплати.
 DocType: Sales Order Item,Used for Production Plan,Използвани за производство на План
 DocType: Employee Loan,Total Payment,Общо плащане
 DocType: Manufacturing Settings,Time Between Operations (in mins),Време между операциите (в минути)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,"{0} {1} е анулиран, затова действието не може да бъде завършено"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,"{0} {1} е анулиран, затова действието не може да бъде завършено"
 DocType: Customer,Buyer of Goods and Services.,Купувач на стоки и услуги.
 DocType: Journal Entry,Accounts Payable,Задължения
 DocType: Patient,Allergies,алергии
@@ -580,22 +591,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Предупреждавайте поръчки за покупка
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Изброите някои от вашите клиенти. Те могат да бъдат организации или индивидуални лица.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Достатъчно Части за изграждане
+DocType: POS Profile User,POS Profile User,Потребителски потребителски профил на POS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Преки приходи
 DocType: Patient Appointment,Date TIme,Време за среща
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Не може да се филтрира по сметка, ако е групирано по сметка"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Административният директор
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,"Моля, изберете Курс"
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,"Моля, изберете Курс"
 DocType: Codification Table,Codification Table,Кодификационна таблица
 DocType: Timesheet Detail,Hrs,Часове
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Моля изберете фирма
 DocType: Stock Entry Detail,Difference Account,Разлика Акаунт
 DocType: Purchase Invoice,Supplier GSTIN,Доставчик GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Не може да се затвори задача, тъй като зависим задача {0} не е затворена."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,"Моля, въведете Warehouse, за които ще бъдат повдигнати Материал Искане"
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Не може да се затвори задача, тъй като зависим задача {0} не е затворена."
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Моля, въведете Warehouse, за които ще бъдат повдигнати Материал Искане"
 DocType: Production Order,Additional Operating Cost,Допълнителна експлоатационни разходи
 DocType: Lab Test Template,Lab Routine,Рутинна лаборатория
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Козметика
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","За да се слеят, следните свойства трябва да са едни и същи и за двете позиции"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","За да се слеят, следните свойства трябва да са едни и същи и за двете позиции"
 DocType: Shipping Rule,Net Weight,Нето Тегло
 DocType: Employee,Emergency Phone,Телефон за спешни
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Купи
@@ -605,7 +617,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,"Моля, определете степен за Threshold 0%"
 DocType: Sales Order,To Deliver,Да достави
 DocType: Purchase Invoice Item,Item,Артикул
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Сериен № - позиция не може да бъде част
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Висока чувствителност
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Сериен № - позиция не може да бъде част
 DocType: Journal Entry,Difference (Dr - Cr),Разлика (Dr - Cr)
 DocType: Account,Profit and Loss,Приходи и разходи
 DocType: Patient,Risk Factors,Рискови фактори
@@ -614,7 +627,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Управление Подизпълнители
 DocType: Vital Signs,Body Temperature,Температура на тялото
 DocType: Project,Project will be accessible on the website to these users,Проектът ще бъде достъпен на интернет страницата на тези потребители
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Определете типа на проекта.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Определете типа на проекта.
 DocType: Supplier Scorecard,Weighting Function,Функция за тежест
 DocType: Physician,OP Consulting Charge,Разходи за консултации по ОП
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Настройте вашето
@@ -628,7 +641,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Увеличаване не може да бъде 0
 DocType: Production Planning Tool,Material Requirement,Материал Изискване
 DocType: Company,Delete Company Transactions,Изтриване на транзакциите на фирма
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Референтен Не и Референтен Дата е задължително за Bank сделка
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Референтен Не и Референтен Дата е задължително за Bank сделка
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Добавяне / Редактиране на данъци и такси
 DocType: Payment Entry Reference,Supplier Invoice No,Доставчик - Фактура номер
 DocType: Territory,For reference,За референция
@@ -636,12 +649,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Не може да се изтрие Пореден № {0}, тъй като се използва в транзакции с материали"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Закриване (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Здравейте
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Преместване на елемент
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Преместване на елемент
 DocType: Serial No,Warranty Period (Days),Гаранционен период (дни)
 DocType: Installation Note Item,Installation Note Item,Монтаж Забележка Точка
 DocType: Production Plan Item,Pending Qty,Чакащо Количество
 DocType: Budget,Ignore,Игнорирай
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} не е активен
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} не е активен
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Проверете настройките размери за печат
 DocType: Salary Slip,Salary Slip Timesheet,Заплата Slip график
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Доставчик склад е задължителен за подизпълнители с разписка за покупка
@@ -650,7 +663,7 @@
 DocType: Pricing Rule,Sales Partner,Търговски партньор
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Всички оценъчни карти на доставчици.
 DocType: Buying Settings,Purchase Receipt Required,Покупка Квитанция Задължително
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Оценка процент е задължително, ако влезе Откриване Фондова"
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,"Оценка процент е задължително, ако влезе Откриване Фондова"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Не са намерени записи в таблицата с фактури
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Моля изберете Company и Party Type първи
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Финансови / Счетоводство година.
@@ -687,7 +700,7 @@
 DocType: Quotation,Quotation To,Оферта до
 DocType: Lead,Middle Income,Среден доход
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Откриване (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Default мерната единица за т {0} не може да се променя директно, защото вече сте направили някаква сделка (и) с друга мерна единица. Вие ще трябва да се създаде нова т да използвате различен Default мерна единица."
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Default мерната единица за т {0} не може да се променя директно, защото вече сте направили някаква сделка (и) с друга мерна единица. Вие ще трябва да се създаде нова т да използвате различен Default мерна единица."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Отпусната сума не може да бъде отрицателна
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,"Моля, задайте фирмата"
 DocType: Purchase Order Item,Billed Amt,Фактурирана Сума
@@ -701,6 +714,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,"Изберете профил на плащане, за да се направи Bank Влизане"
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Създаване на записи на наети да управляват листа, претенции за разходи и заплати"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Период на предписване
+DocType: Restaurant Reservation,Restaurant Reservation,Ресторант Резервация
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Предложение за писане
 DocType: Payment Entry Deduction,Payment Entry Deduction,Плащането - отстъпка/намаление
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Съществува друга продажбите Person {0} със същия Employee ID
@@ -708,7 +722,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Masters
 DocType: Assessment Plan,Maximum Assessment Score,Максимална оценка
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Актуализация банка Дати Транзакционните
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,проследяване на времето
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,проследяване на времето
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,КОПИЕ ЗА ТРАНСПОРТА
 DocType: Fiscal Year Company,Fiscal Year Company,Фискална година - Компания
 DocType: Packing Slip Item,DN Detail,DN Подробности
@@ -716,8 +730,9 @@
 DocType: Timesheet,Billed,Фактурирана
 DocType: Batch,Batch Description,Партида Описание
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Създаване на студентски групи
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Плащане Gateway профил не е създаден, моля създадете една ръчно."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Плащане Gateway профил не е създаден, моля създадете една ръчно."
 DocType: Supplier Scorecard,Per Year,На година
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Не отговарят на условията за приемане в тази програма съгласно DOB
 DocType: Sales Invoice,Sales Taxes and Charges,Продажби данъци и такси
 DocType: Employee,Organization Profile,Организация на профил
 DocType: Vital Signs,Height (In Meter),Височина (в метър)
@@ -753,7 +768,7 @@
 DocType: Student Batch Name,Batch Name,Партида Име
 DocType: Fee Validity,Max number of visit,Максимален брой посещения
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,График създаден:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},"Моля, задайте по подразбиране в брой или  по банкова сметка за начин на плащане {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},"Моля, задайте по подразбиране в брой или  по банкова сметка за начин на плащане {0}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,Записване
 DocType: GST Settings,GST Settings,Настройки за GST
 DocType: Selling Settings,Customer Naming By,Задаване на име на клиента от
@@ -785,15 +800,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Приземи Разходни данъци и такси
 DocType: Production Order Operation,Actual Start Time,Действително Начално Време
 DocType: BOM Operation,Operation Time,Операция - време
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,завършек
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,завършек
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,база
 DocType: Timesheet,Total Billed Hours,Общо Фактурирани Часа
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Сума за отписване
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Сума за отписване
 DocType: Leave Block List Allow,Allow User,Позволи на потребителя
 DocType: Journal Entry,Bill No,Фактура - Номер
 DocType: Company,Gain/Loss Account on Asset Disposal,Печалба / Загуба на профила за продажба на активи
 DocType: Vehicle Log,Service Details,Детайли за услугата
-DocType: Purchase Invoice,Quarterly,Тримесечно
+DocType: Subscription,Quarterly,Тримесечно
 DocType: Lab Test Template,Grouped,Групирани
 DocType: Selling Settings,Delivery Note Required,Складова разписка е задължителна
 DocType: Bank Guarantee,Bank Guarantee Number,Номер на банковата гаранция
@@ -802,12 +817,12 @@
 DocType: Student Attendance,Student Attendance,Student Присъствие
 DocType: Sales Invoice Timesheet,Time Sheet,Time Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Изписване на суровини въз основа на
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,"Моля, въведете данните т"
 DocType: Interest,Interest,Лихва
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Предварителни продажби
 DocType: Purchase Receipt,Other Details,Други детайли
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Доставчик
 DocType: Lab Test,Test Template,Тестов шаблон
+DocType: Restaurant Order Entry Item,Served,Сервира
 DocType: Account,Accounts,Сметки
 DocType: Vehicle,Odometer Value (Last),Километраж Стойност (Последна)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Шаблони на критериите за оценка на доставчика.
@@ -819,25 +834,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Преглед на фиш за заплата
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Сметка {0} е била въведена на няколко пъти
 DocType: Account,Expenses Included In Valuation,"Разходи, включени в остойностяване"
-DocType: Hub Settings,Seller City,Продавач - Град
 ,Absent Student Report,Доклад за отсъствия на учащи се
 DocType: Email Digest,Next email will be sent on:,Следващият имейл ще бъде изпратен на:
 DocType: Offer Letter Term,Offer Letter Term,Оферта - Писмо - Условия
 DocType: Supplier Scorecard,Per Week,На седмица
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Позицията има варианти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Позицията има варианти.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Общо студент
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Точка {0} не е намерена
 DocType: Bin,Stock Value,Стойността на наличностите
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,Записите за таксите ще бъдат създадени във фонов режим. В случай на грешка съобщението за грешка ще бъде актуализирано в графиката.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Компания {0} не съществува
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} има валидност до {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} има валидност до {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Tree Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Количество Консумирано на бройка
 DocType: Serial No,Warranty Expiry Date,Гаранция - Дата на изтичане
 DocType: Material Request Item,Quantity and Warehouse,Количество и Склад
+DocType: Hub Settings,Unregister,Отмяна на регистрацията
 DocType: Sales Invoice,Commission Rate (%),Комисионен процент (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,"Моля, изберете Програма"
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,"Моля, изберете Програма"
 DocType: Project,Estimated Cost,Очаквани разходи
 DocType: Purchase Order,Link to material requests,Препратка към материални искания
+DocType: Hub Settings,Publish,публикувам
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Космически
 DocType: Journal Entry,Credit Card Entry,Кредитна карта - Запис
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Компания и сметки
@@ -848,13 +865,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Затвори възможността след брой дни
 ,Reserved,Резервирано
 DocType: Purchase Order,Supply Raw Materials,Доставка на суровини
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Датата, на която ще се генерира следващата фактура. Тя се генерира при изпращане."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Текущи активи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} не е в наличност
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',"Моля, споделете отзивите си към обучението, като кликнете върху &quot;Обратна връзка за обучението&quot; и след това върху &quot;Ново&quot;"
 DocType: Mode of Payment Account,Default Account,Сметка по подрозбиране
 DocType: Payment Entry,Received Amount (Company Currency),Получената сума (фирмена валута)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,"Потенциален клиент трябва да се настрои, ако възможност е създадена за потенциален клиент"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,"Потенциален клиент трябва да се настрои, ако възможност е създадена за потенциален клиент"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Моля изберете седмичен почивен ден
 DocType: Patient,O Negative,O Отрицателно
 DocType: Production Order Operation,Planned End Time,Планирано Крайно време
@@ -870,10 +886,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Енергия
 DocType: Opportunity,Opportunity From,Възможност - От
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Месечно извлечение заплата.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Добавяне на фирма
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,"Ред {0}: {1} Серийни номера, изисквани за елемент {2}. Предоставихте {3}."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,"Ред {0}: {1} Серийни номера, изисквани за елемент {2}. Предоставихте {3}."
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,"Моля, изберете таблица"
 DocType: BOM,Website Specifications,Сайт Спецификации
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} е невалиден имейл адрес в полето &quot;Получатели&quot;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} е невалиден имейл адрес в полето &quot;Получатели&quot;
 DocType: Special Test Items,Particulars,подробности
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Антибиотик.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: От {0} от вид {1}
@@ -881,11 +897,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Row {0}: Превръщане Factor е задължително
 DocType: Employee,A+,A+
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Няколко правила за цените съществува по същите критерии, моля, разрешаване на конфликти чрез възлагане приоритет. Правила Цена: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не може да деактивирате или да отмените BOM тъй като е свързан с други спецификации на материали (BOM)
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не може да деактивирате или да отмените BOM тъй като е свързан с други спецификации на материали (BOM)
 DocType: Opportunity,Maintenance,Поддръжка
 DocType: Item Attribute Value,Item Attribute Value,Позиция атрибут - Стойност
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Продажби кампании.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Въведи отчет на време
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Въведи отчет на време
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -923,12 +939,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,"Моля, въведете Точка първа"
 DocType: Account,Liability,Отговорност
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционирани сума не може да бъде по-голяма от претенция Сума в Row {0}.
+DocType: Salary Detail,Do not include in total,Не включвайте общо
 DocType: Company,Default Cost of Goods Sold Account,Себестойност на продадените стоки - Сметка по подразбиране
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Не е избран ценоразпис
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Не е избран ценоразпис
 DocType: Employee,Family Background,Семейна среда
 DocType: Request for Quotation Supplier,Send Email,Изпрати е-мейл
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Внимание: Невалиден прикачен файл {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Няма разрешение
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Внимание: Невалиден прикачен файл {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Няма разрешение
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Заявката е поискана
 DocType: Vital Signs,Heart Rate / Pulse,Сърдечна честота / импулс
 DocType: Company,Default Bank Account,Банкова сметка по подразб.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","За да филтрирате базирани на партия, изберете страна Напишете първия"
@@ -955,12 +973,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Точка Row {IDX}: {DOCTYPE} {DOCNAME} не съществува в по-горе &quot;{DOCTYPE}&quot; на маса
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,График {0} вече е завършен или анулиран
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Няма задачи
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Денят от месеца, на която автоматичната фактура ще бъде генерирана например 05, 28 и т.н."
 DocType: Item Variant Settings,Copy Fields to Variant,Копиране на полетата до вариант
 DocType: Asset,Opening Accumulated Depreciation,Начална начислената амортизация
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Резултати трябва да бъде по-малка или равна на 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Програма за записване Tool
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,Cи-форма записи
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,Cи-форма записи
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Клиенти и доставчици
 DocType: Email Digest,Email Digest Settings,Имейл преглед Settings
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Благодаря ви за вашия бизнес!
@@ -978,13 +995,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Статус на цитата
 DocType: Maintenance Visit,Completion Status,Статус на Завършване
 DocType: HR Settings,Enter retirement age in years,Въведете пенсионна възраст в години
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Целеви склад
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,"Моля, изберете склад"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Целеви склад
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,"Моля, изберете склад"
 DocType: Cheque Print Template,Starting location from left edge,Започвайки място от левия край
 DocType: Item,Allow over delivery or receipt upto this percent,Оставя се в продължение на доставка или получаване до запълването този процент
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Импорт - Присъствие
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Всички стокови групи
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Всички стокови групи
 DocType: Process Payroll,Activity Log,Журнал на дейностите
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Нетна печалба / загуба
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Автоматично композира съобщение при представяне на сделките.
@@ -996,7 +1013,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Прогнозно Количество
 DocType: Sales Invoice,Payment Due Date,Дължимото плащане Дата
 DocType: Drug Prescription,Interval UOM,Интервал UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Позиция Variant {0} вече съществува с едни и същи атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Позиция Variant {0} вече съществува с едни и същи атрибути
+DocType: Item,Hub Publishing Details,Подробна информация за издателя
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',"""Начален баланс"""
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Open To Do
 DocType: Notification Control,Delivery Note Message,Складова разписка - Съобщение
@@ -1016,10 +1034,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: Суровината не може да бъде същата като основната позиция
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Общо приложими такси в Покупка получаване артикули маса трябва да са същите, както Общо данъци и такси"
 DocType: Sales Team,Incentives,Стимули
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Регистрирайте се за центъра
 DocType: SMS Log,Requested Numbers,Желани номера
 DocType: Production Planning Tool,Only Obtain Raw Materials,Снабдете Само суровини
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Оценката на изпълнението.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Активирането на &quot;Използване на количката&quot;, тъй като количката е включен и трябва да има най-малко една данъчна правило за количката"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Активирането на &quot;Използване на количката&quot;, тъй като количката е включен и трябва да има най-малко една данъчна правило за количката"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Плащането Влизане {0} е свързан срещу Поръчка {1}, проверете дали тя трябва да се извади като предварително в тази фактура."
 DocType: Sales Invoice Item,Stock Details,Фондова Детайли
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Проект - Стойност
@@ -1038,12 +1057,14 @@
 DocType: Salary Slip,Working Days,Работни дни
 DocType: Serial No,Incoming Rate,Постъпили Курсове
 DocType: Packing Slip,Gross Weight,Брутно Тегло
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,"Името на Вашата фирма, за която искате да създадете тази система."
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Активиране на хъб
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,"Името на Вашата фирма, за която искате да създадете тази система."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Включи празници в общия брой на работните дни
 DocType: Job Applicant,Hold,Държа
 DocType: Employee,Date of Joining,Дата на Присъединяване
 DocType: Naming Series,Update Series,Актуализация Номериране
 DocType: Supplier Quotation,Is Subcontracted,Преотстъпват
+DocType: Restaurant Table,Minimum Seating,Минимално сядане
 DocType: Item Attribute,Item Attribute Values,Позиция атрибут - Стойности
 DocType: Examination Result,Examination Result,Разглеждане Резултати
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Покупка Разписка
@@ -1054,13 +1075,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Не може да се намери време слот за следващия {0} ден за операция {1}
 DocType: Production Order,Plan material for sub-assemblies,План материал за частите
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Търговски дистрибутори и територия
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} трябва да бъде активен
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} трябва да бъде активен
 DocType: Journal Entry,Depreciation Entry,Амортизация - Запис
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Моля, изберете вида на документа първо"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Отменете Материал Посещения {0} преди да анулирате тази поддръжка посещение
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Сериен № {0} не принадлежи на позиция {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Необходим Количество
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Складове с действащото сделка не може да се превърнат в книга.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Складове с действащото сделка не може да се превърнат в книга.
 DocType: Bank Reconciliation,Total Amount,Обща Сума
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Prescription Duration,Number,номер
@@ -1071,7 +1092,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Продажби Ценоразпис
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Ако е поставена отметка, клиентът ще бъде създаден, преместен на пациента. Фактурите за пациента ще бъдат създадени срещу този клиент. Можете също така да изберете съществуващ клиент, докато създавате пациент."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,"Публикуване, за да синхронизирате елементи"
 DocType: Bank Reconciliation,Account Currency,Валута на сметката
 DocType: Lab Test,Sample ID,Идентификатор на образец
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,"Моля, посочете закръглят Account в Company"
@@ -1080,11 +1100,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Служител {0} не е активен или не съществува
 DocType: Fee Structure,Components,Компоненти
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},"Моля, въведете Asset Категория т {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Позиция Варианти {0} актуализиран
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Позиция Варианти {0} актуализиран
 DocType: Quality Inspection Reading,Reading 6,Четене 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Не може да {0} {1} {2} без отрицателна неплатена фактура
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","да бъдат генерирани. Ако бъде забавено, ще трябва да промените ръчно полето &quot;Повторение на деня на месеца&quot; на това"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Не може да {0} {1} {2} без отрицателна неплатена фактура
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Фактурата за покупка - аванс
-DocType: Hub Settings,Sync Now,Синхронизирай сега
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit влизане не може да бъде свързана с {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Определяне на бюджета за финансовата година.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Сметка за банка/каса по подразбиране ще се актуализира автоматично в POS фактура, когато е избран този режим."
@@ -1096,13 +1117,13 @@
 DocType: Item,Is Purchase Item,Дали Покупка Точка
 DocType: Asset,Purchase Invoice,Фактура за покупка
 DocType: Stock Ledger Entry,Voucher Detail No,Ваучер Деайли Номер
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Нова фактурата за продажба
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Нова фактурата за продажба
 DocType: Stock Entry,Total Outgoing Value,Общо Изходящ Value
 DocType: Physician,Appointments,Назначения
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Откриване Дата и крайния срок трябва да бъде в рамките на същата фискална година
 DocType: Lead,Request for Information,Заявка за информация
 ,LeaderBoard,Списък с водачите
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Синхронизиране на офлайн Фактури
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Синхронизиране на офлайн Фактури
 DocType: Payment Request,Paid,Платен
 DocType: Program Fee,Program Fee,Такса програма
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1121,11 +1142,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Поръчка за покупка Точка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Непряк доход
 DocType: Student Attendance Tool,Student Attendance Tool,Student Присъствие Tool
+DocType: Restaurant Menu,Price List (Auto created),Ценоразпис (създадено автоматично)
 DocType: Cheque Print Template,Date Settings,Дата Настройки
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Вариране
 ,Company Name,Име на фирмата
 DocType: SMS Center,Total Message(s),Общо съобщения
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Изберете артикул за прехвърляне
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Изберете артикул за прехвърляне
 DocType: Purchase Invoice,Additional Discount Percentage,Допълнителна отстъпка Процент
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Вижте списък на всички помощни видеоклипове
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Изберете акаунт шеф на банката, в която е депозирана проверка."
@@ -1142,6 +1164,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,метър
 DocType: Workstation,Electricity Cost,Разход за ток
 DocType: HR Settings,Don't send Employee Birthday Reminders,Не изпращайте на служителите напомняне за рождени дни
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Запазване на настройките
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Заявени продукти
 DocType: Item,Inspection Criteria,Критериите за инспекция
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Прехвърлен
 DocType: BOM Website Item,BOM Website Item,BOM Website позиция
@@ -1158,11 +1182,11 @@
 DocType: Journal Entry,Total Amount in Words,Обща сума - Словом
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Имаше грешка. Една вероятна причина може да бъде, че не сте запаметили формата. Моля, свържете се support@erpnext.com ако проблемът не бъде отстранен."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Моята количка
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Тип поръчка трябва да е един от {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Тип поръчка трябва да е един от {0}
 DocType: Lead,Next Contact Date,Следваща дата за контакт
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Начално Количество
 DocType: Healthcare Settings,Appointment Reminder,Напомняне за назначаване
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,"Моля, въведете Account за промяна сума"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,"Моля, въведете Account за промяна сума"
 DocType: Student Batch Name,Student Batch Name,Student Batch Име
 DocType: Consultation,Doctor,Лекар
 DocType: Holiday List,Holiday List Name,Име на списък на празниците
@@ -1170,12 +1194,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,График на курса
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Сток Options
 DocType: Journal Entry Account,Expense Claim,Expense претенция
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Наистина ли искате да възстановите този бракуван актив?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Количество за {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Наистина ли искате да възстановите този бракуван актив?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Количество за {0}
 DocType: Leave Application,Leave Application,Заявяване на отсъствия
 DocType: Patient,Patient Relation,Отношение на пациента
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Инструмент за разпределение на остъствията
+DocType: Item,Hub Category to Publish,Категория хъб за публикуване
 DocType: Leave Block List,Leave Block List Dates,Оставете Block Списък Дати
+DocType: Sales Invoice,Billing Address GSTIN,Адрес за фактуриране GSTIN
 DocType: Workstation,Net Hour Rate,Net Hour Курсове
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Кацнал на разхода за закупуване Разписка
 DocType: Company,Default Terms,Условия по подразбиране
@@ -1185,18 +1211,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},"Моля, посочете {0}"
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Премахнати артикули с никаква промяна в количеството или стойността.
 DocType: Delivery Note,Delivery To,Доставка до
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Умение маса е задължително
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Умение маса е задължително
 DocType: Production Planning Tool,Get Sales Orders,Вземи поръчките за продажби
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} не може да бъде отрицателно
 DocType: Training Event,Self-Study,Самоподготовка
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Отстъпка
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Отстъпка
 DocType: Asset,Total Number of Depreciations,Общ брой на амортизации
 DocType: Sales Invoice Item,Rate With Margin,Оцени с марджин
 DocType: Workstation,Wages,Заплати
 DocType: Task,Urgent,Спешно
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},"Моля, посочете валиден Row ID за ред {0} в таблица {1}"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Променливата не може да се намери:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,"Моля, изберете поле, което да редактирате от numpad"
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,"Моля, изберете поле, което да редактирате от numpad"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Отидете на работния плот и започнете да използвате ERPNext
 DocType: Item,Manufacturer,Производител
 DocType: Landed Cost Item,Purchase Receipt Item,Покупка Квитанция Точка
@@ -1227,8 +1253,8 @@
 DocType: GL Entry,Against,Срещу
 DocType: Item,Default Selling Cost Center,Разходен център за продажби по подразбиране
 DocType: Sales Partner,Implementation Partner,Партньор за внедряване
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Пощенски код
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Поръчка за продажба {0} е {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Пощенски код
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Поръчка за продажба {0} е {1}
 DocType: Opportunity,Contact Info,Информация за контакт
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Въвеждане на складови записи
 DocType: Packing Slip,Net Weight UOM,Нето тегло мерна единица
@@ -1239,6 +1265,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Вземи Седмични почивни дни
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Крайна дата не може да бъде по-малка от началната дата
 DocType: Sales Person,Select company name first.,Изберете име на компанията на първо място.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,От ниска до висока
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Оферти получени от доставчици.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Заменете BOM и актуализирайте последната цена във всички BOM
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},За  {0} | {1} {2}
@@ -1257,7 +1284,7 @@
 DocType: Program Enrollment,Transportation,Транспорт
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Невалиден атрибут
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} трябва да бъде изпратено
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Количеството трябва да бъде по-малко или равно на {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Количеството трябва да бъде по-малко или равно на {0}
 DocType: SMS Center,Total Characters,Общо знаци
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Моля изберете BOM BOM в полето за позиция {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Детайли на Cи-форма Фактура
@@ -1272,7 +1299,7 @@
 ,Ordered Items To Be Billed,"Поръчани артикули, които да се фактурират"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,От диапазон трябва да бъде по-малко от До диапазон
 DocType: Global Defaults,Global Defaults,Глобални настройки по подразбиране
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Проект Collaboration Покана
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Проект Collaboration Покана
 DocType: Salary Slip,Deductions,Удръжки
 DocType: Leave Allocation,LAL/,LAL/
 DocType: Setup Progress Action,Action Name,Име на действието
@@ -1290,13 +1317,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Фактурата за продажба - Аванс
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Няма нищо за заявка
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Друг рекорд Бюджет &quot;{0}&quot; вече съществува срещу {1} {2} &quot;за фискалната година {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"""Актуалната Начална дата"" не може да бъде след  ""Актуалната Крайна дата"""
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"""Актуалната Начална дата"" не може да бъде след  ""Актуалната Крайна дата"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Управление
 DocType: Cheque Print Template,Payer Settings,Настройки платеца
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Това ще бъде приложена към Кодекса Точка на варианта. Например, ако вашият съкращението е &quot;SM&quot;, а кодът на елемент е &quot;ТЕНИСКА&quot;, кодът позиция на варианта ще бъде &quot;ТЕНИСКА-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net Pay (словом) ще бъде видим след като спаси квитанцията за заплата.
 DocType: Purchase Invoice,Is Return,Дали Return
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Внимание
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Внимание
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Връщане / дебитно известие
 DocType: Price List Country,Price List Country,Ценоразпис - Държава
 DocType: Item,UOMs,Мерни единици
@@ -1311,17 +1338,18 @@
 DocType: Account,Balance Sheet,Баланс
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Разходен център за позиция с Код '
 DocType: Fee Validity,Valid Till,Валиден До
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режимът на плащане не е конфигуриран. Моля, проверете, дали сметката е настроен на режим на плащания или на POS профил."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режимът на плащане не е конфигуриран. Моля, проверете, дали сметката е настроен на режим на плащания или на POS профил."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Същата позиция не може да бъде въведена  няколко пъти.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Допълнителни сметки могат да бъдат направени по групи, но записи могат да бъдат направени по отношение на не-групи"
 DocType: Lead,Lead,Потенциален клиент
 DocType: Email Digest,Payables,Задължения
 DocType: Course,Course Intro,Въведение - Курс
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Фондова Влизане {0} е създаден
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Моля, настроите серийна номерация за участие чрез настройка&gt; Серия за номериране"
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Фондова Влизане {0} е създаден
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: отхвърля Количество не могат да бъдат вписани в Покупка Return
 ,Purchase Order Items To Be Billed,"Покупка Поръчка артикули, които се таксуват"
 DocType: Purchase Invoice Item,Net Rate,Нетен коефициент
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,"Моля, изберете клиент"
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,"Моля, изберете клиент"
 DocType: Purchase Invoice Item,Purchase Invoice Item,"Фактурата за покупка, т"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Сток Леджър Вписванията и GL Записите са изказани за избраните покупка Приходите
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Позиция 1
@@ -1340,7 +1368,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Дублиран ред {0} със същия {1}
 ,Trial Balance,Оборотна ведомост
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Фискална година {0} не е намерена
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Създаване Служители
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Създаване Служители
 DocType: Sales Order,SO-,SO-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Моля изберете префикс първо
 DocType: Employee,O-,О-
@@ -1352,12 +1380,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Показване на счетоводна книга
 DocType: Grading Scale,Intervals,Интервали
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Най-ранната
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Артикул Group съществува със същото име, моля да промените името на елемент или преименувате група т"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Артикул Group съществува със същото име, моля да промените името на елемент или преименувате група т"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Останалата част от света
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Останалата част от света
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Продуктът {0} не може да има партида
 ,Budget Variance Report,Бюджет Вариацията Доклад
 DocType: Salary Slip,Gross Pay,Брутно възнаграждение
+DocType: Item,Is Item from Hub,Елементът е от Центъра
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Ред {0}: Вид дейност е задължително.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Дивиденти - изплащани
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Счетоводен Дневник
@@ -1367,8 +1396,9 @@
 DocType: Vehicle Log,Service Detail,Детайли за услуга
 DocType: BOM,Item Description,Позиция Описание
 DocType: Student Sibling,Student Sibling,Student Sibling
-DocType: Purchase Invoice,Is Recurring,Дали повтарящо
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Режимът на плащане
 DocType: Purchase Invoice,Supplied Items,Доставени артикули
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},"Моля, задайте активно меню за ресторант {0}"
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Количество за производство
 DocType: Email Digest,New Income,Нови приходи
@@ -1378,6 +1408,7 @@
 ,Student and Guardian Contact Details,Студентски и Guardian Данни за контакт
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,"Row {0}: За доставчика {0} имейл адрес е необходим, за да изпратите имейл"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Временно Откриване
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Преглед на Центъра
 ,Employee Leave Balance,Служител - полагащ се отпуск в дни
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Балансът на сметке {0} винаги трябва да е {1}
 DocType: Patient Appointment,More Info,Повече Информация
@@ -1397,13 +1428,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Поръчка за продажба {0} не е валидна
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Предупреждавайте за нова заявка за оферти
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Поръчки помогнат да планирате и проследяване на вашите покупки
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Съжаляваме, компаниите не могат да бъдат слети"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Съжаляваме, компаниите не могат да бъдат слети"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Предписания за лабораторни тестове
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Общото количество на емисията / Transfer {0} в Подемно-Искане {1} \ не може да бъде по-голяма от поискани количества {2} за т {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Малък
 DocType: Employee,Employee Number,Брой на служителите
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Дело Номер (а) вече се ползва. Опитайте от Дело Номер {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Дело Номер (а) вече се ползва. Опитайте от Дело Номер {0}
 DocType: Project,% Completed,% Завършен
 ,Invoiced Amount (Exculsive Tax),Сума по фактура (без данък)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Позиция 2
@@ -1418,11 +1449,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Непреки разходи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Row {0}: Кол е задължително
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Земеделие
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Синхронизиране на основни данни
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Синхронизиране на основни данни
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Вашите продукти или услуги
 DocType: Special Test Items,Special Test Items,Специални тестови елементи
 DocType: Mode of Payment,Mode of Payment,Начин на плащане
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Сайт на снимката трябва да бъде държавна файл или уеб сайт URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Сайт на снимката трябва да бъде държавна файл или уеб сайт URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Това е главната позиция група и не може да се редактира.
@@ -1430,24 +1461,23 @@
 DocType: Vehicle,Fuel UOM,мерна единица гориво
 DocType: Warehouse,Warehouse Contact Info,Склад - Информация за контакт
 DocType: Payment Entry,Write Off Difference Amount,Сметка за разлики от отписване
-DocType: Purchase Invoice,Recurring Type,Повтарящо Type
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: Имейлът на служителя не е намерен, следователно не е изпратен имейл"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: Имейлът на служителя не е намерен, следователно не е изпратен имейл"
 DocType: Item,Foreign Trade Details,Външна търговия - Детайли
+,Assessment Plan Status,Статус на плана за оценка
 DocType: Email Digest,Annual Income,Годишен доход
 DocType: Serial No,Serial No Details,Сериен № - Детайли
 DocType: Purchase Invoice Item,Item Tax Rate,Позиция данъчна ставка
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,Моля изберете Лекар и дата
 DocType: Student Group Student,Group Roll Number,Номер на ролката в групата
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки могат да бъдат свързани с друг запис дебитна"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Общо за всички работни тежести трябва да бъде 1. Моля, коригира теглото на всички задачи по проекта съответно"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Складова разписка {0} не е подадена
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Общо за всички работни тежести трябва да бъде 1. Моля, коригира теглото на всички задачи по проекта съответно"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Складова разписка {0} не е подадена
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Позиция {0} трябва да бъде позиция за подизпълнители
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Капиталови Активи
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ценообразуване правило е първият избран на базата на &quot;Нанесете върху&quot; област, която може да бъде т, т Group или търговска марка."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,"Моля, първо задайте кода на елемента"
-DocType: Hub Settings,Seller Website,Продавач Website
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,"Моля, първо задайте кода на елемента"
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Общо разпределят процентно за екип по продажбите трябва да бъде 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Общо разпределят процентно за екип по продажбите трябва да бъде 100
 DocType: Sales Invoice Item,Edit Description,Редактиране на Описание
 DocType: Antibiotic,Antibiotic,антибиотик
 ,Team Updates,Екип - промени
@@ -1468,12 +1498,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Общо (фирмена валута)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Сериен номер {0} влезли повече от веднъж
 DocType: Depreciation Schedule,Journal Entry,Вестник Влизане
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} артикула са в производство
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} артикула са в производство
 DocType: Workstation,Workstation Name,Работна станция - Име
 DocType: Grading Scale Interval,Grade Code,Код на клас
 DocType: POS Item Group,POS Item Group,POS Позиция Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email бюлетин:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} не принадлежи към позиция {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} не принадлежи към позиция {1}
 DocType: Sales Partner,Target Distribution,Цел - Разпределение
 DocType: Salary Slip,Bank Account No.,Банкова сметка номер
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Това е поредният номер на последната създадена сделката с този префикс
@@ -1489,10 +1519,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Запитване за оферта  - Доставчик
 DocType: Healthcare Settings,Registration Message,Регистрационно съобщение
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Хардуер
-DocType: Sales Order,Recurring Upto,повтарящо Upto
 DocType: Prescription Dosage,Prescription Dosage,Дозировка за рецепта
 DocType: Attendance,HR Manager,ЧР мениджър
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Моля изберете фирма
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Моля изберете фирма
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Privilege отпуск
 DocType: Purchase Invoice,Supplier Invoice Date,Доставчик Дата Invoice
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,на
@@ -1508,10 +1537,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Припокриване условия намерени между:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Against Journal Entry {0} is already adjusted against some other voucher
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Обща стойност на поръчката
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Храна
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Храна
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Застаряването на населението Range 3
 DocType: Maintenance Schedule Item,No of Visits,Брои на Посещения
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Графикът за поддръжка {0} съществува срещу {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Искате ли да публикувате елементите си в Центъра?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,Записване на студент
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валута на Затварянето Сметката трябва да е {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Сума от точки за всички цели трябва да бъде 100. Това е {0}
@@ -1522,9 +1552,9 @@
 DocType: Authorization Rule,Average Discount,Средна отстъпка
 DocType: Purchase Invoice Item,UOM,мерна единица
 DocType: Rename Tool,Utilities,Комунални услуги
-DocType: Purchase Invoice Item,Accounting,Счетоводство
+DocType: POS Profile,Accounting,Счетоводство
 DocType: Employee,EMP/,EMP/
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,"Моля, изберете партиди за договорени покупки"
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,"Моля, изберете партиди за договорени покупки"
 DocType: Asset,Depreciation Schedules,Амортизационни Списъци
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Срок за кандидатстване не може да бъде извън отпуск период на разпределение
 DocType: Activity Cost,Projects,Проекти
@@ -1540,7 +1570,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',Одобрение Status трябва да бъде &quot;Одобрена&quot; или &quot;Отхвърлени&quot;
 DocType: Physician,Contacts and Address,Контакти и адрес
 DocType: Purchase Invoice,Contact Person,Лице за контакт
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"""Очаквана начална дата"" не може да бъде след ""Очаквана крайна дата"""
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""Очаквана начална дата"" не може да бъде след ""Очаквана крайна дата"""
 DocType: Course Scheduling Tool,Course End Date,Курс Крайна дата
 DocType: Holiday List,Holidays,Ваканция
 DocType: Sales Order Item,Planned Quantity,Планирано количество
@@ -1548,10 +1578,11 @@
 DocType: Item,Maintain Stock,Поддържане на наличности
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Вписване в запасите вече създадени за производствена поръчка
 DocType: Employee,Prefered Email,Предпочитан Email
+DocType: Student Admission,Eligibility and Details,Допустимост и подробности
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Нетна промяна в дълготрайни материални активи
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Оставете празно, ако се отнася за всички наименования"
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge от тип &quot;Край&quot; в ред {0} не могат да бъдат включени в т Курсове
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Макс: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Макс: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,От дата/час
 DocType: Email Digest,For Company,За компания
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Комуникации - журнал.
@@ -1559,19 +1590,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Профил за проследяване на проследяващия доставчик
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Сума на покупките
 DocType: Sales Invoice,Shipping Address Name,Адрес за доставка Име
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Сметкоплан
 DocType: Material Request,Terms and Conditions Content,Правила и условия - съдържание
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,не може да бъде по-голямо от 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Позиция {0} е не-в-наличност позиция
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Позиция {0} е не-в-наличност позиция
 DocType: Maintenance Visit,Unscheduled,Нерепаративен
 DocType: Employee,Owned,Собственост
 DocType: Salary Detail,Depends on Leave Without Pay,Зависи от неплатен отпуск
 DocType: Pricing Rule,"Higher the number, higher the priority","По-голямо число, по-висок приоритет"
 ,Purchase Invoice Trends,Фактурата за покупка Trends
 DocType: Employee,Better Prospects,По-добри перспективи
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Ред # {0}: Партидата {1} има само {2} qty. Моля, изберете друга партида, която има {3} qty на разположение или разделете реда на няколко реда, за да достави / издаде от няколко партиди"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Ред # {0}: Партидата {1} има само {2} qty. Моля, изберете друга партида, която има {3} qty на разположение или разделете реда на няколко реда, за да достави / издаде от няколко партиди"
 DocType: Vehicle,License Plate,Регистрационен номер
 DocType: Appraisal,Goals,Цели
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Изберете POS профил
 DocType: Warranty Claim,Warranty / AMC Status,Гаранция / AMC Status
 ,Accounts Browser,Браузър на сметки
 DocType: Payment Entry Reference,Payment Entry Reference,Плащане - Референция
@@ -1589,7 +1620,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Служител не може да докладва пред самия себе си.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ако сметката е замразено, записи право да ограничават потребителите."
 DocType: Email Digest,Bank Balance,Баланс на банка
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Счетоводен запис за {0}: {1} може да се направи само във валута: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Счетоводен запис за {0}: {1} може да се направи само във валута: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Профил на работа, необходими квалификации и т.н."
 DocType: Journal Entry Account,Account Balance,Баланс на Сметка
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Данъчно правило за транзакции.
@@ -1598,8 +1629,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Общо данъци и такси (фирмена валута)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Покажи незатворен фискална година L баланси P &amp;
 DocType: Lab Test Template,Collection Details,Подробности за колекцията
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","изберете cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date от tabConsultation ct, `tabLab Предписание` cp където ct.patient = &#39;{0}&#39; и cp.parent = ct. име и cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Доставка Акаунт
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Сметка {2} е неактивна
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Направи Поръчки за продажби да ви помогнат да планират работата си и доставят по-време
@@ -1616,7 +1645,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Приемо-предавателен протокол
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Офис под наем
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Настройки Setup SMS Gateway
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Импортирането неуспешно!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Импортирането неуспешно!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Не е добавен адрес все още.
 DocType: Workstation Working Hour,Workstation Working Hour,Работна станция - Работно време
 DocType: Vital Signs,Blood Pressure,Кръвно налягане
@@ -1641,7 +1670,7 @@
 DocType: Sales Invoice,Source,Източник
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Покажи затворен
 DocType: Leave Type,Is Leave Without Pay,Дали си тръгне без Pay
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Asset Категория е задължително за Фиксирана позиция в актива
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Asset Категория е задължително за Фиксирана позиция в актива
 DocType: Fee Validity,Fee Validity,Валидност на таксата
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Не са намерени в таблицата за плащане записи
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Този {0} е в конфликт с {1} за {2} {3}
@@ -1662,8 +1691,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Създаване потенциален клиент
 DocType: Maintenance Schedule,Schedules,Графици
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,Профилът на POS е необходим за използване на Point-of-Sale
 DocType: Purchase Invoice Item,Net Amount,Нетна сума
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} не е изпратена, така че действието не може да бъде завършено"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} не е изпратена, така че действието не може да бъде завършено"
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Детайли Номер
 DocType: Landed Cost Voucher,Additional Charges,Допълнителни такси
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Допълнителна отстъпка сума (във Валута на Фирмата)
@@ -1672,7 +1702,7 @@
 ,Support Hour Distribution,Разпределение на часовете за поддръжка
 DocType: Maintenance Visit,Maintenance Visit,Поддръжка посещение
 DocType: Student,Leaving Certificate Number,Оставянето Сертификат номер
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Анулирано назначаване, Моля, прегледайте и анулирайте фактурата {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Анулирано назначаване, Моля, прегледайте и анулирайте фактурата {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Свободно Batch Количество в склада
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Актуализация на Print Format
 DocType: Landed Cost Voucher,Landed Cost Help,Поземлен Cost Помощ
@@ -1695,8 +1725,8 @@
 DocType: Patient,Tobacco Past Use,Използване на тютюн в миналото
 DocType: Sales Invoice Item,Brand Name,Марка Име
 DocType: Purchase Receipt,Transporter Details,Превозвач Детайли
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Потребител {0} вече е назначен за лекар {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Изисква се склад по подразбиране за избрания елемент
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Потребител {0} вече е назначен за лекар {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Изисква се склад по подразбиране за избрания елемент
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Кутия
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,Възможен доставчик
 DocType: Budget,Monthly Distribution,Месечно разпределение
@@ -1706,7 +1736,7 @@
 DocType: Sales Partner,Sales Partner Target,Търговски партньор - Цел
 DocType: Loan Type,Maximum Loan Amount,Максимален Размер на заема
 DocType: Pricing Rule,Pricing Rule,Ценообразуване Правило
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Дублиран номер на ролката за ученик {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Дублиран номер на ролката за ученик {0}
 DocType: Budget,Action if Annual Budget Exceeded,"Действие в случай, че, Годишния Бюджет е превишен"
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Заявка за материал към поръчка за покупка
 DocType: Shopping Cart Settings,Payment Success URL,Успешно плащане URL
@@ -1723,7 +1753,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} трябва да се появи само веднъж
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Не е позволено да прехвърляйте повече {0} от {1} срещу Поръчката {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Листата Разпределен успешно в продължение на {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Няма елементи за опаковане
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Няма елементи за опаковане
 DocType: Shipping Rule Condition,From Value,От стойност
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Произвеждано количество е задължително
 DocType: Employee Loan,Repayment Method,Възстановяване Метод
@@ -1737,6 +1767,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Сток Задължения
 DocType: Purchase Invoice,Supplier Warehouse,Доставчик Склад
 DocType: Opportunity,Contact Mobile No,Контакт - мобилен номер
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Изберете фирма
 ,Material Requests for which Supplier Quotations are not created,Материал Исканията за които не са създадени Доставчик Цитати
 DocType: Student Group,Set 0 for no limit,Определете 0 за без лимит
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Деня (и), на който кандидатствате за отпуск е празник. Не е нужно да кандидатствате за отпуск."
@@ -1746,24 +1777,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Направи оферта
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Други справки
 DocType: Dependent Task,Dependent Task,Зависима задача
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Коефициент на преобразуване за неизпълнение единица мярка трябва да бъде 1 в ред {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Коефициент на преобразуване за неизпълнение единица мярка трябва да бъде 1 в ред {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Разрешение за типа {0} не може да бъде по-дълъг от {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Опитайте планира операции за Х дни предварително.
 DocType: HR Settings,Stop Birthday Reminders,Stop напомняне за рождени дни
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},"Моля, задайте по подразбиране ТРЗ Задължения профил в Company {0}"
 DocType: SMS Center,Receiver List,Получател - Списък
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Търсене позиция
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Търсене позиция
 DocType: Patient Appointment,Referring Physician,Препращащ лекар
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Консумирана Сума
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Нетна промяна в паричната наличност
 DocType: Assessment Plan,Grading Scale,Оценъчна скала
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Мерна единица {0} е въведен повече от веднъж в реализациите Factor Таблица
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,вече приключи
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Мерна единица {0} е въведен повече от веднъж в реализациите Factor Таблица
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,вече приключи
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Склад в ръка
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Вече съществува заявка за плащане {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Разходите за изписани стоки
 DocType: Physician,Hospital,Болница
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Количество не трябва да бъде повече от {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Количество не трябва да бъде повече от {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Предходната финансова година не е затворена
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Възраст (дни)
 DocType: Quotation Item,Quotation Item,Оферта Позиция
@@ -1774,8 +1805,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Доставчик Type майстор.
 DocType: Purchase Order Item,Supplier Part Number,Доставчик Част номер
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Обменен курс не може да бъде 0 или 1
-DocType: Sales Invoice,Reference Document,Референтен документ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{1} {0} е отменен или спрян
+DocType: Subscription,Reference Document,Референтен документ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{1} {0} е отменен или спрян
 DocType: Accounts Settings,Credit Controller,Кредит контрольор
 DocType: Delivery Note,Vehicle Dispatch Date,Камион Дата на изпращане
 DocType: Healthcare Settings,Default Medical Code Standard,Стандартен стандарт за медицински кодове
@@ -1784,6 +1815,7 @@
 DocType: Company,Default Payable Account,Сметка за задължения по подразбиране
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Настройки за онлайн пазарска количка като правилата за доставка, ценоразпис т.н."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Начислен
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Сортирай по Цена ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Запазено Количество
 DocType: Party Account,Party Account,Сметка на компания
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Човешки Ресурси
@@ -1795,13 +1827,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Направи Изплащането Влизане
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Advance срещу доставчик трябва да се задължи
 DocType: Company,Default Values,Стойности по подразбиране
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequency} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Frequency} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Обща сума възстановена
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Това се основава на трупи срещу това превозно средство. Вижте график по-долу за повече подробности
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Срещу фактура от доставчик {0} от {1}
 DocType: Customer,Default Price List,Ценоразпис по подразбиране
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,запис Движение Asset {0} е създаден
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Вие не можете да изтривате фискална година {0}. Фискална година {0} е зададена по подразбиране в Global Settings
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Клиент със същото име вече съществува
 DocType: Journal Entry,Entry Type,Влизане Type
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,"Няма план за оценка, свързан с тази група за оценка"
 ,Customer Credit Balance,Клиентско кредитно салдо
@@ -1811,7 +1844,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Ценообразуване
 DocType: Quotation,Term Details,Условия - Детайли
 DocType: Project,Total Sales Cost (via Sales Order),Обща продажна цена (чрез поръчка за продажба)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Не може да се запишат повече от {0} студенти за този студентска група.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Не може да се запишат повече от {0} студенти за този студентска група.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Водещ брой
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} трябва да е по-голяма от 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Планиране на капацитет за (дни)
@@ -1827,9 +1860,11 @@
 DocType: Lab Test,Technician Name,Име на техник
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Прекратяване на връзката с плащане при анулиране на фактура
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Current показание на километража влязъл трябва да бъде по-голяма от първоначалната Vehicle километража {0}
+DocType: Restaurant Reservation,No Show,Няма показване
 DocType: Shipping Rule Country,Shipping Rule Country,Доставка Правило Country
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Оставете и Присъствие
 DocType: Maintenance Visit,Partially Completed,Частично завършени
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Умерена чувствителност
 DocType: Leave Type,Include holidays within leaves as leaves,Включи празници в рамките на отпуските като отпуски
 DocType: Sales Invoice,Packed Items,Опаковани артикули
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Гаранция иск срещу Serial No.
@@ -1846,13 +1881,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Платената сума (фирмена валути)
 DocType: Purchase Invoice,Additional Discount,Допълнителна отстъпка
 DocType: Selling Settings,Selling Settings,Продажби - Настройка
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Потвърдете действието
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Онлайн Търгове
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Моля, посочете или Количество или остойностяване цена, или и двете"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,изпълняване
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Виж в кошницата
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Разходите за маркетинг
 ,Item Shortage Report,Позиция Недостиг Доклад
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тегло се споменава, \ nМоля спомена &quot;Тегло мерна единица&quot; твърде"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тегло се споменава, \ nМоля спомена &quot;Тегло мерна единица&quot; твърде"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Материал Заявка използва за направата на този запас Влизане
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Следваща дата на амортизация е задължителна за нов актив
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Разделна курсова група за всяка партида
@@ -1864,12 +1900,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Направи счетоводен запис за всеки склад Movement
 DocType: Leave Allocation,Total Leaves Allocated,Общо Leaves Отпуснати
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Склад се изисква за ред номер {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,"Моля, въведете валиден Финансова година Начални и крайни дати"
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,"Моля, въведете валиден Финансова година Начални и крайни дати"
 DocType: Employee,Date Of Retirement,Дата на пенсиониране
 DocType: Upload Attendance,Get Template,Вземи шаблон
 DocType: Material Request,Transferred,Прехвърлен
 DocType: Vehicle,Doors,Врати
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext инсталирането приключи!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext инсталирането приключи!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Съберете такса за регистрация на пациента
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,Данъчно разделяне
@@ -1888,36 +1924,36 @@
 DocType: Employee,AB+,AB+
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ако този елемент има варианти, то не може да бъде избран в поръчки за продажба и т.н."
 DocType: Lead,Next Contact By,Следваща Контакт с
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},"Количество, необходимо за елемент {0} на ред {1}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},"Количество, необходимо за елемент {0} на ред {1}"
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},"Склад {0} не може да се изтрие, тъй като съществува количество за артикул {1}"
 DocType: Quotation,Order Type,Тип поръчка
-DocType: Purchase Invoice,Notification Email Address,Имейл адрес за уведомления
 ,Item-wise Sales Register,Точка-мъдър Продажби Регистрация
 DocType: Asset,Gross Purchase Amount,Брутна сума на покупката
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Начални салда
 DocType: Asset,Depreciation Method,Метод на амортизация
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Извън линия
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Извън линия
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,"Това ли е данък, включен в основната ставка?"
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Общо Цел
 DocType: Job Applicant,Applicant for a Job,Заявител на Job
 DocType: Production Plan Material Request,Production Plan Material Request,Производство План Материал Заявка
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Няма създадени производствени поръчки
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Няма създадени производствени поръчки
 DocType: Stock Reconciliation,Reconciliation JSON,Равнение JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Твърде много колони. Експортирайте доклада и го отпечатайте с помощта на приложение за електронни таблици.
 DocType: Purchase Invoice Item,Batch No,Партиден №
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Искане за оферта: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,"Оставя множество Продажби Поръчки срещу поръчка на клиента,"
 DocType: Student Group Instructor,Student Group Instructor,Инструктор на група студенти
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Не
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Основен
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Основен
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Вариант
 DocType: Naming Series,Set prefix for numbering series on your transactions,Определете префикс за номериране серия от вашите сделки
 DocType: Employee Attendance Tool,Employees HTML,Служители HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,BOM по подразбиране ({0}) трябва да бъде активен за тази позиция или шаблон
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,BOM по подразбиране ({0}) трябва да бъде активен за тази позиция или шаблон
 DocType: Employee,Leave Encashed?,Отсъствието е платено?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"""Възможност - От"" полето е задължително"
 DocType: Email Digest,Annual Expenses,годишните разходи
 DocType: Item,Variants,Варианти
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Направи поръчка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Направи поръчка
 DocType: SMS Center,Send To,Изпрати на
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Няма достатъчно отпуск баланс за отпуск Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Отпусната сума
@@ -1933,6 +1969,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Студентска група
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Against Journal Entry {0} does not have any unmatched {1} entry
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,оценки
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Събития за обучение
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Дублиран Пореден № за позиция {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Условие за Правило за Доставка
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,"Моля, въведете"
@@ -1942,7 +1979,7 @@
 DocType: Sales Order,To Deliver and Bill,Да се доставят и фактурира
 DocType: Student Group,Instructors,инструктори
 DocType: GL Entry,Credit Amount in Account Currency,Кредитна сметка във валута на сметката
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} трябва да бъде изпратен
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} трябва да бъде изпратен
 DocType: Authorization Control,Authorization Control,Разрешение Control
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: отхвърля Warehouse е задължително срещу отхвърли т {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Плащане
@@ -1961,11 +1998,11 @@
 DocType: Quotation Item,Actual Qty,Действително Количество
 DocType: Sales Invoice Item,References,Препратки
 DocType: Quality Inspection Reading,Reading 10,Четене 10
-DocType: Hub Settings,Hub Node,Hub Node
+DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Въвели сте дублиращи се елементи. Моля, поправи и опитай отново."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Сътрудник
 DocType: Asset Movement,Asset Movement,Asset движение
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,Нова пазарска количка
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,Нова пазарска количка
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Позиция {0} не е сериализирани позиция
 DocType: SMS Center,Create Receiver List,Създаване на списък за получаване
 DocType: Vehicle,Wheels,Колела
@@ -1979,15 +2016,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Телекомуникации
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Показва, че опаковката е част от тази доставка (Само Проект)"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Въвеждане на плащане
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Количество за позиция {0} трябва да е по-малко от {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Количество за позиция {0} трябва да е по-малко от {1}
 ,Sales Invoice Trends,Тенденциите във фактурите за продажба
 DocType: Leave Application,Apply / Approve Leaves,Нанесете / Одобряване Leaves
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,За
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,За
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Може да се отнася ред само ако типът такса е ""На предишния ред - Сума"" или ""Предишния ред - Общо"""
 DocType: Sales Order Item,Delivery Warehouse,Склад за доставка
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Дърво на разходните центрове.
 DocType: Serial No,Delivery Document No,Доставка документ №
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},"Моля, задайте &quot;Печалба / Загуба на профила за изхвърляне на активи&quot; в компания {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},"Моля, задайте &quot;Печалба / Загуба на профила за изхвърляне на активи&quot; в компания {0}"
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Вземи елементите от Квитанция за покупки
 DocType: Serial No,Creation Date,Дата на създаване
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Точка {0} се среща няколко пъти в Ценоразпис {1}
@@ -1998,11 +2035,12 @@
 DocType: Student,Student Mobile Number,Student мобилен номер
 DocType: Item,Has Variants,Има варианти
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Актуализиране на отговора
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Вие вече сте избрали елементи от {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Вие вече сте избрали елементи от {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Име на месец Дистрибуцията
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Идентификационният номер на партидата е задължителен
 DocType: Sales Person,Parent Sales Person,Родител Продажби Person
-DocType: Purchase Invoice,Recurring Invoice,Повтарящо Invoice
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,От висока до ниска
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Първо изберете програмата
 DocType: Patient Appointment,Patient Age,Възраст на пациента
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Управление на Проекти
 DocType: Supplier,Supplier of Goods or Services.,Доставчик на стоки или услуги.
@@ -2010,8 +2048,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"По подразбиране сметки за вземания, които трябва да се използват, ако не са зададени в Пациента да резервира такси за консултация."
 DocType: Vehicle Log,Fuel Price,цена на гориво
 DocType: Budget,Budget,Бюджет
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Задайте Отвори
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Дълготраен актив позиция трябва да бъде елемент не-склад.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Задайте Отвори
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Дълготраен актив позиция трябва да бъде елемент не-склад.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Бюджет не могат да бъдат причислени към {0}, тъй като това не е сметка за приход или разход"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Постигнато
 DocType: Student Admission,Application Form Route,Заявление форма Път
@@ -2025,12 +2063,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Позиция {0} не е настройка за серийни номера. Проверете настройките.
 DocType: Maintenance Visit,Maintenance Time,Поддръжка на времето
 ,Amount to Deliver,Сума за Избави
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Същият елемент е въведен няколко пъти. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Дата на срока Start не може да бъде по-рано от началото на годината Дата на учебната година, към който е свързан терминът (Academic Година {}). Моля, коригирайте датите и опитайте отново."
 DocType: Guardian,Guardian Interests,Guardian Интереси
 DocType: Naming Series,Current Value,Текуща стойност
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Съществуват множество фискални години за датата {0}. Моля, задайте компания в фискална година"
 DocType: School Settings,Instructor Records to be created by,"Инструктори, които трябва да бъдат създадени от"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} е създаден(а)
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} е създаден(а)
 DocType: Delivery Note Item,Against Sales Order,Срещу поръчка за продажба
 ,Serial No Status,Сериен № - Статус
 DocType: Payment Entry Reference,Outstanding,неизплатен
@@ -2040,10 +2079,10 @@
 						must be greater than or equal to {2}","Ред {0}: Към комплектът {1} периодичност, разлика между от и към днешна дата \ трябва да бъде по-голямо от или равно на {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Това се основава на склад движение. Вижте {0} за подробности
 DocType: Pricing Rule,Selling,Продажба
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Сума {0} {1} приспада срещу {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Сума {0} {1} приспада срещу {2}
 DocType: Employee,Salary Information,Заплата
 DocType: Sales Person,Name and Employee ID,Име и Employee ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,"Падежа, не може да бъде, преди дата на осчетоводяване"
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,"Падежа, не може да бъде, преди дата на осчетоводяване"
 DocType: Website Item Group,Website Item Group,Website т Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Мита и такси
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Моля, въведете Референтна дата"
@@ -2069,7 +2108,7 @@
 DocType: Issue,Resolution Details,Резолюция Детайли
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Разпределянето
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Критерии за приемане
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Моля, въведете Материал Исканията в таблицата по-горе"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,"Моля, въведете Материал Исканията в таблицата по-горе"
 DocType: Item Attribute,Attribute Name,Име на атрибута
 DocType: BOM,Show In Website,Покажи в уебсайта
 DocType: Shopping Cart Settings,Show Quantity in Website,Покажи Количество в сайта
@@ -2078,7 +2117,7 @@
 DocType: Item Reorder,Check in (group),Проверете в (група)
 ,Qty to Order,Количество към поръчка
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Главата на сметка при пасив или капиталов, в които ще се отчитат печалба / загуба"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Гант диаграма на всички задачи.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Гант диаграма на всички задачи.
 DocType: Opportunity,Mins to First Response,Минути до първи отговор
 DocType: Pricing Rule,Margin Type,Тип марж
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} часа
@@ -2099,35 +2138,35 @@
 DocType: Patient,Surgical History,Хирургическа история
 DocType: Employee,Resignation Letter Date,Дата на молбата за напускане
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Правилата за ценообразуване са допълнително филтрирани въз основа на количеството.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},"Моля, задайте датата на присъединяване за служител {0}"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},"Моля, задайте датата на присъединяване за служител {0}"
 DocType: Task,Total Billing Amount (via Time Sheet),Обща сума за плащане (чрез Time Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Повторете Приходи Customer
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) трябва да има роля ""Одобряващ разходи"""
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Двойка
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Изберете BOM и Количество за производство
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Изберете BOM и Количество за производство
 DocType: Asset,Depreciation Schedule,Амортизационен план
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Адреси и контакти за партньори за продажби
 DocType: Bank Reconciliation Detail,Against Account,Срещу Сметка
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,"Половин ден Дата трябва да бъде между ""От Дата"" и ""До дата"""
 DocType: Maintenance Schedule Detail,Actual Date,Действителна дата
 DocType: Item,Has Batch No,Има партиден №
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Годишно плащане: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Годишно плащане: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Данъци за стоки и услуги (GST Индия)
 DocType: Delivery Note,Excise Page Number,Акцизите Page Number
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Компания, От дата и До дата е задължително"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Изтеглете от Консултация
 DocType: Asset,Purchase Date,Дата на закупуване
 DocType: Employee,Personal Details,Лични Данни
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},"Моля, задайте &quot;Асет Амортизация Cost Center&quot; в компания {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},"Моля, задайте &quot;Асет Амортизация Cost Center&quot; в компания {0}"
 ,Maintenance Schedules,Графици за поддръжка
 DocType: Task,Actual End Date (via Time Sheet),Действително Крайна дата (чрез Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Сума {0} {1} срещу {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Сума {0} {1} срещу {2} {3}
 ,Quotation Trends,Оферта Тенденции
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Позиция Group не са посочени в т майстор за т {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Дебитиране на сметката трябва да е сметка за вземания
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Дебитиране на сметката трябва да е сметка за вземания
 DocType: Shipping Rule Condition,Shipping Amount,Доставка Сума
 DocType: Supplier Scorecard Period,Period Score,Период Резултат
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Добавете клиенти
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Добавете клиенти
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,До Сума
 DocType: Lab Test Template,Special,Специален
 DocType: Purchase Invoice Item,Conversion Factor,Коефициент на преобразуване
@@ -2135,13 +2174,14 @@
 ,Vehicle Expenses,Камион Разходи
 DocType: Serial No,Invoice Details,Данни за фактурите
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Очаквана стойност след полезен живот трябва да бъде по-голяма или равна на {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Започнете
+DocType: Hub Category,Hub Category,Категория хъб
 DocType: Purchase Invoice,SEZ,СИЗ
 DocType: Purchase Receipt,Vehicle Number,Номер на превозно средство
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Датата, на която повтарящите се фактури ще бъдат спрени"
 DocType: Employee Loan,Loan Amount,Заета сума
 DocType: Program Enrollment,Self-Driving Vehicle,Самоходно превозно средство
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Стойност на таблицата с доставчици
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Ред {0}: Спецификация на материалите не е намерена за позиция {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Ред {0}: Спецификация на материалите не е намерена за позиция {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Общо отпуснати листа {0} не могат да бъдат по-малки от вече одобрените листа {1} за периода
 DocType: Journal Entry,Accounts Receivable,Вземания
 ,Supplier-Wise Sales Analytics,Доставчик мъдър анализ на продажбите
@@ -2152,7 +2192,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Основен курс (Оставете празно, ако това не е част от курса за родители)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Оставете празно, ако важи за всички видове наети лица"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Разпредели такси на базата на
-apps/erpnext/erpnext/hooks.py +131,Timesheets,График (Отчет)
+apps/erpnext/erpnext/hooks.py +140,Timesheets,График (Отчет)
 DocType: HR Settings,HR Settings,Настройки на човешките ресурси (ЧР)
 DocType: Salary Slip,net pay info,Нет Инфо.БГ заплащане
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Тази стойност се актуализира в ценовата листа по подразбиране.
@@ -2163,7 +2203,7 @@
 DocType: Patient,B Positive,B Положителен
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row {0}: Кол трябва да бъде 1, като елемент е дълготраен актив. Моля, използвайте отделен ред за множествена бр."
 DocType: Leave Block List Allow,Leave Block List Allow,Оставете Block List Позволете
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Съкращение не може да бъде празно или интервал
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Съкращение не може да бъде празно или интервал
 DocType: Patient Medical Record,Patient Medical Record,Медицински запис на пациента
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Група към не-група
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спортове
@@ -2179,9 +2219,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,"Не може да се намери валутен курс за {0} до {1} за ключова дата {2}. Моля, създайте ръчно запис на валута"
 DocType: POS Profile,Price List,Ценова Листа
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} сега е по подразбиране фискална година. Моля, опреснете браузъра си за да влезе в сила промяната."
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Разходните Вземания
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Разходните Вземания
 DocType: Issue,Support,Поддръжка
 ,BOM Search,BOM Търсене
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.","Публикувайте &quot;На склад&quot; или &quot;Не на склад&quot; на Hub въз основа на наличностите, налични в този склад."
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Закриване (откриване + Общо)
 DocType: Vehicle,Fuel Type,гориво
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Моля, посочете валута във фирмата"
@@ -2193,16 +2234,16 @@
 DocType: Healthcare Settings,Remind Before,Напомняй преди
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Мерна единица - фактор на превръщане се изисква на ред {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row {0}: Референтен Document Type трябва да бъде един от продажбите Поръчка, продажба на фактура или вестник Влизане"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row {0}: Референтен Document Type трябва да бъде един от продажбите Поръчка, продажба на фактура или вестник Влизане"
 DocType: Salary Component,Deduction,Намаление
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Ред {0}: От време и До време - е задължително.
 DocType: Stock Reconciliation Item,Amount Difference,сума Разлика
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Елемент Цена добавя за {0} в Ценовата листа {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Елемент Цена добавя за {0} в Ценовата листа {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Моля, въведете Id Служител на този търговец"
 DocType: Territory,Classification of Customers by region,Класификация на клиентите по регион
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Разликата в сумата трябва да бъде нула
 DocType: Project,Gross Margin,Брутна печалба
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,"Моля, въведете Производство Точка първа"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,"Моля, въведете Производство Точка първа"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Изчисли Баланс на банково извлечение
 DocType: Normal Test Template,Normal Test Template,Нормален тестов шаблон
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,забранени потребители
@@ -2212,21 +2253,22 @@
 DocType: Salary Slip,Total Deduction,Общо Приспадане
 ,Production Analytics,Производство - Анализи
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Това се основава на транзакции срещу този пациент. За подробности вижте графиката по-долу
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Разходите са обновени
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Разходите са обновени
 DocType: Employee,Date of Birth,Дата на раждане
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Позиция {0} вече е върната
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Фискална година ** представлява финансова година. Всички счетоводни записвания и други големи движения се записват към ** Фискална година **.
 DocType: Opportunity,Customer / Lead Address,Клиент / Потенциален клиент - Адрес
 DocType: Patient,DOB,Дата на раждане
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Настройка на таблицата с доставчици
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Внимание: Invalid сертификат SSL за закрепване {0}
-DocType: Student Admission,Eligibility,избираемост
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Име на плана за оценка
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Внимание: Invalid сертификат SSL за закрепване {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Leads ви помогне да получите бизнес, добавете всичките си контакти и повече като си клиенти"
 DocType: Production Order Operation,Actual Operation Time,Действително време за операцията
 DocType: Authorization Rule,Applicable To (User),Приложими по отношение на (User)
 DocType: Purchase Taxes and Charges,Deduct,Приспада
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Описание На Работа
 DocType: Student Applicant,Applied,приложен
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Re-отворена
 DocType: Sales Invoice Item,Qty as per Stock UOM,Количество по мерна единица на склад
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Наименование Guardian2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специални знаци с изключение на &quot;-&quot; &quot;.&quot;, &quot;#&quot;, и &quot;/&quot; не е позволено в именуване серия"
@@ -2238,7 +2280,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Мениджър производство
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Сериен № {0} е в гаранция до  {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Split Бележка за доставка в пакети.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Пратки
+apps/erpnext/erpnext/hooks.py +107,Shipments,Пратки
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Общата отпусната сума (Company валути)
 DocType: Purchase Order Item,To be delivered to customer,Да бъде доставен на клиент
 DocType: BOM,Scrap Material Cost,Скрап Cost
@@ -2260,8 +2302,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Настройки на варианта на елемента
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Изберете компания ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Оставете празно, ако важи за всички отдели"
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Видове наемане на работа (постоянни, договорни, стажант и т.н.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} е задължително за Артикул {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Видове наемане на работа (постоянни, договорни, стажант и т.н.)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} е задължително за Артикул {1}
 DocType: Process Payroll,Fortnightly,всеки две седмици
 DocType: Currency Exchange,From Currency,От валута
 DocType: Vital Signs,Weight (In Kilogram),Тегло (в килограми)
@@ -2285,7 +2327,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Моля, кликнете върху &quot;Генериране Schedule&quot;, за да получите график"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Имаше грешки при изтриването на следните схеми:
 DocType: Bin,Ordered Quantity,Поръчано количество
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",например &quot;Билд инструменти за строители&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",например &quot;Билд инструменти за строители&quot;
 DocType: Grading Scale,Grading Scale Intervals,Оценъчна скала - Интервали
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: осчетоводяване за {2} може да се направи само във валута: {3}
 DocType: Production Order,In Process,В Процес
@@ -2308,11 +2350,10 @@
 DocType: Purchase Invoice,With Payment of Tax,С изплащане на данък
 DocType: Expense Claim Detail,Expense Claim Detail,Expense претенция Подробности
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,ТРИПЛИКАТ ЗА ДОСТАВЧИК
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Моля изберете правилния акаунт
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Моля изберете правилния акаунт
 DocType: Item,Weight UOM,Тегло мерна единица
 DocType: Salary Structure Employee,Salary Structure Employee,Структура на заплащането на служителите
 DocType: Patient,Blood Group,Кръвна група
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,В очакване на
 DocType: Course,Course Name,Наименование на курс
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Потребителите, които могат да одобряват заявленията за отпуск специфичен служителя"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Офис оборудване
@@ -2331,7 +2372,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Цените няма да се показват, ако ценова листа не е настроено"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Моля, посочете държава за тази доставка правило или проверете Worldwide Доставка"
 DocType: Stock Entry,Total Incoming Value,Общо Incoming Value
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Дебит сметка се изисква
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Дебит сметка се изисква
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Графици, за да следите на времето, разходите и таксуването по дейности, извършени от вашия екип"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Покупка Ценоразпис
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Шаблони на променливите на таблицата с резултатите от доставчика.
@@ -2341,7 +2382,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Плащания - Засичане
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Моля изберете име Incharge Лице
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Технология
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Общо Неплатени: {0}
+DocType: Hub Settings,Unregister from Hub,Отписване от Центъра
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Общо Неплатени: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Website Операция
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Оферта - Писмо
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Генериране Материал Исканията (MRP) и производствени поръчки.
@@ -2353,7 +2395,9 @@
 DocType: Physician Schedule Time Slot,To Time,До време
 DocType: Authorization Rule,Approving Role (above authorized value),Приемане Role (над разрешено стойност)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Кредитът на сметка трябва да бъде Платим акаунт
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия: {0} не може да бъде родител или дете на {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Моля, изберете Студентски прием, който е задължителен за платения кандидат за студент"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия: {0} не може да бъде родител или дете на {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,"Моля, изберете Ценоразпис, за да публикувате ценообразуване"
 DocType: Production Order Operation,Completed Qty,Изпълнено Количество
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само дебитни сметки могат да бъдат свързани с друга кредитна влизане"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Ценоразпис {0} е деактивиран
@@ -2365,38 +2409,39 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} серийни номера, необходими за т {1}. Вие сте предоставили {2}."
 DocType: Stock Reconciliation Item,Current Valuation Rate,Курс на преоценка
 DocType: Item,Customer Item Codes,Клиентски Елемент кодове
+DocType: Training Event,Advance,напредък
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,за повторно извършване отново.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange Печалба / загуба
 DocType: Opportunity,Lost Reason,Причина за загубата
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Нов адрес
 DocType: Quality Inspection,Sample Size,Размер на извадката
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,"Моля, въведете Получаване на документация"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Всички елементи вече са фактурирани
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Моля, посочете валиден &quot;От Case No.&quot;"
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',"Моля, посочете валиден &quot;От Case No.&quot;"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Допълнителни разходни центрове могат да бъдат направени по групи, но записи могат да бъдат направени по отношение на не-групи"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Потребители и права
 DocType: Vehicle Log,VLOG.,ВЛОГ.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Производствени поръчки Създаден: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Производствени поръчки Създаден: {0}
 DocType: Branch,Branch,Клон
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Печат и Branding
 DocType: Company,Total Monthly Sales,Общо месечни продажби
 DocType: Bin,Actual Quantity,Действителното количество
 DocType: Shipping Rule,example: Next Day Shipping,Например: Доставка на следващия ден
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Сериен № {0} не е намерен
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Абонаментът е {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Абонаментът е {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Програма за таксуване на таксите
 DocType: Fee Schedule Program,Student Batch,Student Batch
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,"изберете * от &quot;tabVital Signs&quot;, където пациентът = &#39;{0}&#39; подредете по signs_date desc limit 1"
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Създаване на Студент
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Мин
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Вие сте били поканени да си сътрудничат по проекта: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Лекарят не е налице на {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Вие сте били поканени да си сътрудничат по проекта: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Лекарят не е налице на {0}
 DocType: Leave Block List Date,Block Date,Блокиране - Дата
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Добавете идентификационния номер на абонамента за персонализирано поле в доктория {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Бележка за доставка на доставчик
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Запиши се сега
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Запиши се сега
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Действителен брой {0} / Брой чакащи {1}
 DocType: Purchase Invoice,E-commerce GSTIN,Електронна търговия GSTIN
 DocType: Sales Order,Not Delivered,Не е доставен
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Очакваната дата не може да бъде преди датата на транзакцията
 ,Bank Clearance Summary,Резюме - Банков Клирънс
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Създаване и управление на дневни, седмични и месечни имейл бюлетини."
 DocType: Appraisal Goal,Appraisal Goal,Оценка Goal
@@ -2404,12 +2449,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Сгради
 DocType: Fee Schedule,Fee Structure,Структура на таксите
 DocType: Timesheet Detail,Costing Amount,Остойностяване Сума
-DocType: Student Admission,Application Fee,Такса за кандидатстване
+DocType: Student Admission Program,Application Fee,Такса за кандидатстване
 DocType: Process Payroll,Submit Salary Slip,Знаете Заплата Slip
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Максимална отстъпка за позиция {0} е {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Максимална отстъпка за позиция {0} е {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Масов импорт
 DocType: Sales Partner,Address & Contacts,Адрес и контакти
 DocType: SMS Log,Sender Name,Подател Име
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Сортиране по критерии
 DocType: POS Profile,[Select],[Избор]
 DocType: Vital Signs,Blood Pressure (diastolic),Кръвно налягане (диастолично)
 DocType: SMS Log,Sent To,Изпратени На
@@ -2418,7 +2464,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Следваща дата за контакт не може да е в миналото
 DocType: Company,For Reference Only.,Само за справка.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Лекарят {0} не е налице на {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Изберете партида №
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Изберете партида №
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Невалиден {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,Референтен инв
@@ -2434,15 +2480,15 @@
 DocType: Normal Test Items,Require Result Value,Изискайте резултатна стойност
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Дело Номер не може да бъде 0
 DocType: Item,Show a slideshow at the top of the page,Покажи на слайдшоу в горната част на страницата
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,списъците с материали
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Магазини
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,списъците с материали
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Магазини
 DocType: Project Type,Projects Manager,Мениджър Проекти
 DocType: Serial No,Delivery Time,Време За Доставка
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Застаряването на населението на базата на
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Анулирането е анулирано
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Анулирането е анулирано
 DocType: Item,End of Life,Края на живота
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Пътуване
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Не активна или по подразбиране Заплата Структура намери за служител {0} за дадените дати
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Пътуване
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Не активна или по подразбиране Заплата Структура намери за служител {0} за дадените дати
 DocType: Leave Block List,Allow Users,Позволяват на потребителите
 DocType: Purchase Order,Customer Mobile No,Клиент - мобилен номер
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Повтарящ се
@@ -2451,12 +2497,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Актуализация на стойността
 DocType: Item Reorder,Item Reorder,Позиция Пренареждане
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Покажи фиш за заплата
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Прехвърляне на материал
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Прехвърляне на материал
 DocType: Fees,Send Payment Request,Изпращане на искане за плащане
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Посочете операции, оперативни разходи и да даде уникална операция не на вашите операции."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Този документ е над ограничението от {0} {1} за елемент {4}. Възможно ли е да направи друг {3} срещу същите {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,"Моля, задайте повтарящи след спасяването"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,количество сметка Select промяна
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,количество сметка Select промяна
 DocType: Purchase Invoice,Price List Currency,Ценоразпис на валути
 DocType: Naming Series,User must always select,Потребителят трябва винаги да избере
 DocType: Stock Settings,Allow Negative Stock,Оставя Negative Фондова
@@ -2476,7 +2522,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Служител
 DocType: Sample Collection,Collected Time,Събрано време
 DocType: Company,Sales Monthly History,Месечна история на продажбите
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Изберете партида
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Изберете партида
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} е напълно таксуван
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Жизнени знаци
 DocType: Training Event,End Time,End Time
@@ -2484,16 +2530,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Плащане Удръжки или загуба
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Стандартни договорни условия за покупко-продажба или покупка.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Групирай по Ваучер
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Наистина ли искате да отмените тази среща?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Pipeline Продажби
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},"Моля, задайте профила по подразбиране в Заплата Компонент {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Необходим на
 DocType: Rename Tool,File to Rename,Файл за Преименуване
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Моля изберете BOM за позиция в Row {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Моля изберете BOM за позиция в Row {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Профилът {0} не съвпада с фирмата {1} в режим на профила: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Предвидени BOM {0} не съществува за позиция {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График за поддръжка {0} трябва да се отмени преди да се анулира тази поръчка за продажба
+DocType: POS Profile,Applicable for Users,Приложимо за потребители
 DocType: Notification Control,Expense Claim Approved,Expense претенция Одобрен
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Заплата поднасяне на служител {0} вече е създаден за този период
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Заплата поднасяне на служител {0} вече е създаден за този период
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Лекарствена
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Разходи за закупени стоки
 DocType: Selling Settings,Sales Order Required,Поръчка за продажба е задължителна
@@ -2517,6 +2565,7 @@
 DocType: Offer Letter,Accepted,Приет
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,организация
 DocType: BOM Update Tool,BOM Update Tool,Инструмент за актуализиране на буквите
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Не е посочен партиден профил, моля, настроите стандартната партия в компанията"
 DocType: SG Creation Tool Course,Student Group Name,Наименование Student Group
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Създаване на такси
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Моля, уверете се, че наистина искате да изтриете всички сделки за тази компания. Вашите основни данни ще останат, тъй като е. Това действие не може да бъде отменено."
@@ -2525,29 +2574,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) не може да бъде по-голямо от планирано количество ({2}) в производствена поръчка {3}
 DocType: Shipping Rule,Shipping Rule Label,Доставка Правило Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,потребителски форум
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Суровини - не могат да бъдат празни.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Не можа да се актуализира склад, фактура съдържа капка корабоплаването т."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Суровини - не могат да бъдат празни.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Не можа да се актуализира склад, фактура съдържа капка корабоплаването т."
 DocType: Lab Test Sample,Lab Test Sample,Лабораторна проба за изпитване
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Quick вестник Влизане
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Вие не можете да променяте скоростта, ако BOM споменато agianst всеки елемент"
+DocType: Restaurant,Invoice Series Prefix,Префикс на серията фактури
 DocType: Employee,Previous Work Experience,Предишен трудов опит
 DocType: Stock Entry,For Quantity,За Количество
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Моля, въведете Планиран Количество за позиция {0} на ред {1}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},"Моля, въведете Планиран Количество за позиция {0} на ред {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} не е изпратена
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Искания за предмети.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Отделно производство цел ще бъде създаден за всеки завършен добра позиция.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,"{0} трябва да бъде отрицателен, в документа за замяна"
 ,Minutes to First Response for Issues,Минути за първи отговор на проблем
 DocType: Purchase Invoice,Terms and Conditions1,Условия за ползване - 1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,"Името на института, за който искате да създадете тази система."
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,"Името на института, за който искате да създадете тази система."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Счетоводен запис, замразени до тази дата, никой не може да направи / промени  записите с изключение на ролята посочена по-долу"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Моля, запишете документа преди да генерира план за поддръжка"
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Последна актуализирана цена във всички спецификации
 DocType: Fee Schedule,Successful,Успешен
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Статус на проекта
 DocType: UOM,Check this to disallow fractions. (for Nos),Маркирайте това да забраниш фракции. (За NOS)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Създадени са следните производствени поръчки:
-DocType: Student Admission,Naming Series (for Student Applicant),Поредни Номера (за Кандидат студент)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Създадени са следните производствени поръчки:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Поредни Номера (за Кандидат студент)
 DocType: Delivery Note,Transporter Name,Превозвач Име
 DocType: Authorization Rule,Authorized Value,Оторизирана сума
 DocType: BOM,Show Operations,Показване на операции
@@ -2571,7 +2621,7 @@
 ,Employees working on a holiday,"Служителите, които работят по празници"
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Отбележи присъствие
 DocType: Project,% Complete Method,% Изпълнен Метод
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Лекарство
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Лекарство
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Старт поддръжка дата не може да бъде преди датата на доставка в сериен № {0}
 DocType: Production Order,Actual End Date,Действителна Крайна дата
 DocType: BOM,Operating Cost (Company Currency),Експлоатационни разходи (фирмена валута)
@@ -2589,19 +2639,20 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Приемане Потребителят не може да бъде същата като потребителското правилото е приложим за
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Основен курс (по мерна единица на артикула)
 DocType: SMS Log,No of Requested SMS,Брои на заявени SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Неплатен отпуск не съвпада с одобрените записи оставите приложението
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Неплатен отпуск не съвпада с одобрените записи оставите приложението
 DocType: Campaign,Campaign-.####,Кампания -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следващи стъпки
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,"Моля, доставете определени елементи на възможно най-добрите цени"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Направи Invoice
 DocType: Selling Settings,Auto close Opportunity after 15 days,Автоматично затваряне на възможността в 15-дневен срок
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Поръчките за покупка не се допускат за {0} поради стойността на {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Поръчките за покупка не се допускат за {0} поради стойността на {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Край Година
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Цитат / Водещ%
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Договор Крайна дата трябва да бъде по-голяма от Дата на Присъединяване
 DocType: Vital Signs,Nutrition Values,Хранителни стойности
 DocType: Lab Test Template,Is billable,Таксува се
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",И двата &quot;Програма за лекари&quot; и &quot;Време за назначаване&quot; трябва да бъдат зададени за Dr {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Трето лице дистрибутор / дилър / комисионер / афилиат / търговец, който продава на фирми продукти срещу комисионна."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} по Поръчка {1}
 DocType: Patient,Patient Demographics,Демографски данни за пациентите
@@ -2631,7 +2682,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","Standard данък шаблон, който може да се прилага за всички сделки по закупуване. Този шаблон може да съдържа списък на данъчните глави, а също и други разходни глави като &quot;доставка&quot;, &quot;Застраховане&quot;, &quot;Работа&quot; и др #### Забележка Данъчната ставка определяте тук ще бъде стандартната данъчна ставка за всички ** т * *. Ако има ** артикули **, които имат различни цени, те трябва да се добавят в ** т Данъчно ** маса в ** т ** капитана. #### Описание на Колони 1. изчисляване на типа: - Това може да бъде по ** Net Общо ** (която е сума от основна сума). - ** На предишния ред Общо / Сума ** (за кумулативни данъци и такси). Ако изберете тази опция, данъкът ще бъде приложен като процент от предходния ред (в данъчната таблицата) сума, или общо. - ** Жилищна ** (както е посочено). 2. Сметка Head: книга сметката по която този данък ще бъде резервирана 3. Cost Center: Ако данъчната / таксата е доход (като корабоплаването) или разходи тя трябва да бъде резервирана срещу разходен център. 4. Описание: Описание на данъка (който ще бъде отпечатан в фактури / кавичките). 5. Оценка: Данъчна ставка. 6. Размер: Сума на таксата. 7. Общо: натрупаното общо до този момент. 8. Въведете Row: Ако въз основа на &quot;Previous Row Total&quot; можете да изберете номера на реда, които ще бъдат взети като база за изчислението (по подразбиране е предходния ред). 9. Помислете данък или такса за: В този раздел можете да посочите, ако данъчната / таксата е само за остойностяване (не е част от общия брой), или само за общата (не добавя стойност към елемента) или и за двете. 10. Добавяне или Приспада: Независимо дали искате да добавите или приспадане на данъка."
 DocType: Homepage,Homepage,Начална страница
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Изберете лекар ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',табло за актуализиранеКонференция за задаване на фактура = &#39;{0}&#39; където име = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd Количество
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Такса - записи създадени - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Категория профил
@@ -2643,7 +2693,7 @@
 DocType: Asset,Manual,наръчник
 DocType: Salary Component Account,Salary Component Account,Заплата Компонент - Сметка
 DocType: Global Defaults,Hide Currency Symbol,Скриване на валутен символ
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","напр банков превод, в брой, с кредитна карта"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","напр банков превод, в брой, с кредитна карта"
 DocType: Lead Source,Source Name,Източник Име
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Нормалното покой на кръвното налягане при възрастен е приблизително 120 mmHg систолично и 80 mmHg диастолично, съкратено &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Кредитно Известие
@@ -2662,16 +2712,16 @@
 DocType: Patient,Occupation,Професия
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: Началната дата трябва да е преди крайната дата
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Общо (количество)
-DocType: Sales Invoice,This Document,Този документ
 DocType: Installation Note Item,Installed Qty,Инсталирано количество
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Това може да се дължи на някои невалидни имейл адреси в
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Вие добавихте
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Обучение Резултати
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Обучение Резултати
 DocType: Purchase Invoice,Is Paid,се заплаща
 DocType: Salary Structure,Total Earning,Общо Приходи
 DocType: Purchase Receipt,Time at which materials were received,При която бяха получени материали Time
 DocType: Stock Ledger Entry,Outgoing Rate,Изходящ Курс
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Браншова организация майстор.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Браншова организация майстор.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,или
 DocType: Sales Order,Billing Status,(Фактура) Статус
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Докладвай проблем
@@ -2686,7 +2736,8 @@
 DocType: Notification Control,Sales Order Message,Поръчка за продажба - Съобщение
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Задайте стойности по подразбиране, като Company, валути, текущата фискална година, и т.н."
 DocType: Payment Entry,Payment Type,Вид на плащане
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Моля, изберете партида за елемент {0}. Не може да се намери една партида, която отговаря на това изискване"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Моля, изберете партида за елемент {0}. Не може да се намери една партида, която отговаря на това изискване"
+DocType: Hub Category,Parent Category,Категория на родителите
 DocType: Process Payroll,Select Employees,Изберете Служители
 DocType: Opportunity,Potential Sales Deal,Потенциални Продажби Deal
 DocType: Complaint,Complaints,Жалби
@@ -2723,7 +2774,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),Наименование на пакета за доставка (за печат)
 DocType: Bin,Reserved Quantity,Запазено Количество
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,"Моля, въведете валиден имейл адрес"
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,"Моля, изберете елемент в количката"
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,"Моля, изберете елемент в количката"
 DocType: Landed Cost Voucher,Purchase Receipt Items,Покупка Квитанция артикули
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Персонализиране Форми
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,задълженост
@@ -2733,15 +2784,15 @@
 DocType: Payment Request,Amount in customer's currency,Сума във валута на клиента
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Доставка
 DocType: Stock Reconciliation Item,Current Qty,Текущо количество
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Добавяне на доставчици
+DocType: Restaurant Menu,Restaurant Menu,Ресторант Меню
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Предишна
 DocType: Appraisal Goal,Key Responsibility Area,Ключова област на отговорност
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Студентски Партидите ви помогне да следите на посещаемост, оценки и такси за студенти"
 DocType: Payment Entry,Total Allocated Amount,Общата отпусната сума
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Задайте профил по подразбиране за инвентара за вечни запаси
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Задайте профил по подразбиране за инвентара за вечни запаси
 DocType: Item Reorder,Material Request Type,Заявка за материал - тип
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Начисляване на заплати от {0} до {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage е пълен, не беше записан"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage е пълен, не беше записан"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: мерна единица реализациите Factor е задължително
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Капацитет на помещението
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref
@@ -2780,16 +2831,18 @@
 DocType: Project,Task Completion,Задача Изпълнение
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Не е в наличност
 DocType: Appraisal,HR User,ЧР потребителя
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Данъци и такси - Удръжки
-apps/erpnext/erpnext/hooks.py +129,Issues,Изписвания
+apps/erpnext/erpnext/hooks.py +138,Issues,Изписвания
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Статус трябва да бъде един от {0}
 DocType: Sales Invoice,Debit To,Дебит към
+DocType: Restaurant Menu Item,Restaurant Menu Item,Ресторант
 DocType: Delivery Note,Required only for sample item.,Изисква се само за проба т.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Действително Количество След Трансакция
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Няма фишове за заплата намерени между {0} и {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Няма фишове за заплата намерени между {0} и {1}
 ,Pending SO Items For Purchase Request,Чакащи позиции от поръчки за продажба по искане за покупка
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Учебен
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} е деактивиран
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Учебен
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} е деактивиран
 DocType: Supplier,Billing Currency,(Фактура) Валута
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Много Голям
@@ -2812,6 +2865,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Моля, не споменете на посещенията, изисквани"
 DocType: Stock Settings,Default Valuation Method,Метод на оценка по подразбиране
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,Такса
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Актуализираното актуализиране. Може да отнеме известно време.
 DocType: Vehicle Log,Fuel Qty,Количество на горивото
 DocType: Production Order Operation,Planned Start Time,Планиран начален час
 DocType: Course,Assessment,Оценяване
@@ -2827,7 +2881,7 @@
 DocType: Price List,Price List Master,Ценоразпис - основен
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Всички продажби Сделки могат да бъдат маркирани с множество ** продавачи **, така че можете да настроите и да наблюдават цели."
 ,S.O. No.,S.O. No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},"Моля, създайте Customer от Lead {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},"Моля, създайте Customer от Lead {0}"
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Изберете Patient
 DocType: Price List,Applicable for Countries,Приложимо за Държави
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Име на параметъра
@@ -2858,27 +2912,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,Доставчик Данни за фактурата
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Expense / Разлика сметка ({0}) трябва да бъде партида на &quot;печалбата или загубата&quot;
 DocType: Project,Copied From,Копирано от
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Наименование грешка: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,недостиг
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Наименование грешка: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,недостиг
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} не е свързан с {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Присъствие на служител {0} вече е маркирана
 DocType: Packing Slip,If more than one package of the same type (for print),Ако повече от един пакет от същия тип (за печат)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,"Моля, задайте клиент по подразбиране в настройките на ресторанта"
 ,Salary Register,Заплата Регистрирайте се
 DocType: Warehouse,Parent Warehouse,Склад - Родител
 DocType: C-Form Invoice Detail,Net Total,Нето Общо
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Стандартният BOM не е намерен за елемент {0} и проект {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Стандартният BOM не е намерен за елемент {0} и проект {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Определяне на различни видове кредитни
 DocType: Bin,FCFS Rate,FCFS Курсове
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Дължима сума
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Времето (в минути)
 DocType: Project Task,Working,Работната
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Фондова Queue (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Финансова година
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Финансова година
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} не принадлежи на компания {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,"Функцията за оценка на критериите за {0} не можа да бъде решена. Уверете се, че формулата е валидна."
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,"Разходи, тъй като на"
 DocType: Healthcare Settings,Out Patient Settings,Настройки на пациента
 DocType: Account,Round Off,Закръглявам
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Количеството трябва да е положително
 ,Requested Qty,Заявено Количество
 DocType: Tax Rule,Use for Shopping Cart,Използвайте за количката
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},"Стойност {0} за Умение {1}, не съществува в списъка с валиден т Умение Стойности за т {2}"
@@ -2887,7 +2943,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Таксите ще бъдат разпределени пропорционално на базата на т Количество или количество, според вашия избор"
 DocType: Maintenance Visit,Purposes,Цели
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Поне един елемент следва да бъде вписано с отрицателна величина в замяна документ
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Добавете курсове
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операция {0} по-дълго от всички налични работни часа в работно {1}, съборят операцията в множество операции"
 ,Requested,Заявени
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Няма забележки
@@ -2899,6 +2954,8 @@
 DocType: Employee Loan,Repaid/Closed,Платени / Затворен
 DocType: Item,Total Projected Qty,Общото прогнозно Количество
 DocType: Monthly Distribution,Distribution Name,Дистрибутор - Име
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Доставчик&gt; Тип доставчик
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Процентът на оценка не е намерен за елемент {0}, от който се изисква да извършва счетоводни записи за {1} {2}. Ако елементът извършва транзакция като елемент с нулева стойност в {1}, моля посочете това в таблицата {1} Елемент. В противен случай, моля, създайте транзакция за входящ фонд за артикула или споменете коефициента на оценка в регистрационния артикул и след това опитайте да подадете / анулирате този запис"
 DocType: Course,Course Code,Код на курса
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},"Инспекция на качеството, необходимо за т {0}"
 DocType: POS Settings,Use POS in Offline Mode,Използвайте POS в режим Офлайн
@@ -2909,14 +2966,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Управление на дърво на територията
 DocType: Journal Entry Account,Sales Invoice,Фактурата за продажба
 DocType: Journal Entry Account,Party Balance,Компания - баланс
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,"Моля изберете ""Прилагане на остъпка на"""
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,"Моля изберете ""Прилагане на остъпка на"""
 DocType: Company,Default Receivable Account,Сметка за  вземания по подразбиране
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Създайте Bank вписване на обща заплата за над избрани критерии
 DocType: Physician,Physician Schedule,Програма за лекари
 DocType: Purchase Invoice,Deemed Export,Смятан за износ
 DocType: Stock Entry,Material Transfer for Manufacture,Прехвърляне на материал за Производство
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Отстъпка Процент може да бъде приложена или за ценоразпис или за всички ценови листи (ценоразписи).
-DocType: Purchase Invoice,Half-yearly,Полугодишен
+DocType: Subscription,Half-yearly,Полугодишен
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Счетоводен запис за Складова наличност
 DocType: Lab Test,LabTest Approver,LabTest Схема
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Вече оценихте критериите за оценка {}.
@@ -2945,13 +3002,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Extra Small
 DocType: Company,Standard Template,Стандартен шаблон
 DocType: Training Event,Theory,Теория
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал Заявени Количество е по-малко от минималното Поръчка Количество
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал Заявени Количество е по-малко от минималното Поръчка Количество
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Сметка {0} е замразена
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Юридическо лице / Дъщерно дружество с отделен сметкоплан, част от организацията."
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Храни, напитки и тютюневи изделия"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Мога да направи плащане само срещу нетаксуван {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Ставка на Комисията не може да бъде по-голяма от 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Мога да направи плащане само срещу нетаксуван {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Ставка на Комисията не може да бъде по-голяма от 100
 DocType: Stock Entry,Subcontract,Подизпълнение
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,"Моля, въведете {0} първо"
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Няма отговори от
@@ -2969,10 +3026,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Цвят
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,План за оценка Критерии
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Предотвратяване на поръчки за покупка
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Податлив
 DocType: Patient Appointment,Scheduled,Планиран
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Запитване за оферта.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Моля, настройте система за наименуване на служители в Човешки ресурси&gt; Настройки за персонала"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Моля изберете позиция, където &quot;е Фондова Позиция&quot; е &quot;Не&quot; и &quot;Е-продажба точка&quot; е &quot;Да&quot; и няма друг Bundle продукта"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Изберете Клиент
 DocType: Student Log,Academic,Академичен
 DocType: Patient,Personal and Social History,Лична и социална история
 DocType: Fee Schedule,Fee Breakup for each student,Разпределение на таксите за всеки студент
@@ -2982,7 +3040,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Оценка Оценка
 DocType: Stock Reconciliation,SR/,SR/
 DocType: Vehicle,Diesel,дизел
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Не е избрана валута на ценоразписа
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Не е избрана валута на ценоразписа
 apps/erpnext/erpnext/config/healthcare.py +46,Results,Резултати
 ,Student Monthly Attendance Sheet,Student Месечен Присъствие Sheet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Служител {0} вече е подал молба за {1} между {2} и {3}
@@ -2997,7 +3055,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Управление на дистрибутори.
 DocType: Quality Inspection,Inspection Type,Тип Инспекция
 DocType: Fee Validity,Visited yet,Посетена още
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Складове с действащото сделка не може да се превърнат в група.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Складове с действащото сделка не може да се превърнат в група.
 DocType: Assessment Result Tool,Result HTML,Резултати HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Изтича на
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Добави студенти
@@ -3024,7 +3082,7 @@
 DocType: Healthcare Settings,Result Printed,Резултат отпечатан
 DocType: Asset Category Account,Depreciation Expense Account,Сметка за амортизационните разходи
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Изпитателен Срок
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Преглед на {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Преглед на {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Само листните възли са позволени в транзакция
 DocType: Expense Claim,Expense Approver,Expense одобряващ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Row {0}: Advance срещу Клиентът трябва да бъде кредити
@@ -3035,7 +3093,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Към дата и час
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Списъци на курса изтрити:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Дневници за поддържане състоянието на доставка на SMS
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Задайте цел за продажби
 DocType: Accounts Settings,Make Payment via Journal Entry,Направи Плащане чрез вестник Влизане
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,отпечатан на
 DocType: Item,Inspection Required before Delivery,Инспекция е изисквана преди доставка
@@ -3043,7 +3100,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Предстоящите дейности
 DocType: Patient Appointment,Reminded,Спомнил
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Вашата организация
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Вашата организация
 DocType: Fee Component,Fees Category,Такси - Категория
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,"Моля, въведете облекчаване дата."
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
@@ -3055,7 +3112,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Пренареждане Level
 DocType: Company,Chart Of Accounts Template,Сметкоплан - Шаблон
 DocType: Attendance,Attendance Date,Присъствие Дата
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Елемент Цена актуализиран за {0} в Ценовата листа {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Елемент Цена актуализиран за {0} в Ценовата листа {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Заплата раздялата въз основа на доходите и приспадане.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Сметка с подсметки не може да бъде превърнати в Главна счетоводна книга
 DocType: Purchase Invoice Item,Accepted Warehouse,Приет Склад
@@ -3071,9 +3128,10 @@
 ,Employee Birthday,Рожден ден на Служител
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Batch Присъствие Tool
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,Преминат лимит
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Планирано до
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Рисков капитал
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Един учебен план с това &quot;Учебна година&quot; {0} и &quot;Срок име&quot; {1} вече съществува. Моля, променете тези записи и опитайте отново."
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Тъй като има съществуващи операции срещу т {0}, не можете да промените стойността на {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Тъй като има съществуващи операции срещу т {0}, не можете да промените стойността на {1}"
 DocType: UOM,Must be Whole Number,Трябва да е цяло число
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Нови листа Отпуснати (в дни)
 DocType: Purchase Invoice,Invoice Copy,Фактура - копие
@@ -3083,7 +3141,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Номер на фактура
 DocType: Shopping Cart Settings,Orders,Поръчки
 DocType: Employee Leave Approver,Leave Approver,Одобряващ отсъствия
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,"Моля, изберете партида"
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,"Моля, изберете партида"
 DocType: Assessment Group,Assessment Group Name,Име Оценка Group
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Материалът е прехвърлен за Производство
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Потребител с роля "" Одобряващ разходи"""
@@ -3098,7 +3156,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Месечно приключване - запис
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Изберете отдел ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Разходен център със съществуващи операции не може да бъде превърнат в група
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Сума {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Сума {0} {1} {2} {3}
 DocType: Account,Depreciation,Амортизация
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Доставчик (ци)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Инструмент - Служител Присъствие
@@ -3109,10 +3167,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,Плащане Entries {0} са не-свързани
 DocType: GL Entry,Voucher No,Ваучер №
 ,Lead Owner Efficiency,Водеща ефективност на собственика
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Най - известен
 DocType: Leave Allocation,Leave Allocation,Оставете Разпределение
 DocType: Payment Request,Recipient Message And Payment Details,Получател на съобщението и данни за плащане
 DocType: Training Event,Trainer Email,Trainer Email
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Заявки за материал {0} създадени
+DocType: Restaurant Reservation,No of People,Брой хора
 DocType: Production Planning Tool,Include sub-contracted raw materials,Включи възложени на подизпълнители суровини
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Шаблон за условия или договор.
 DocType: Purchase Invoice,Address and Contact,Адрес и контакти
@@ -3121,10 +3181,11 @@
 DocType: Supplier,Last Day of the Next Month,Последен ден на следващия месец
 DocType: Support Settings,Auto close Issue after 7 days,Автоматично затваряне на проблема след 7 дни
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Отпуск не могат да бъдат разпределени преди {0}, като баланс отпуск вече е ръчен изпраща в записа на бъдещото разпределение отпуск {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забележка: Поради / Референция Дата надвишава право кредитни клиент дни от {0} ден (и)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забележка: Поради / Референция Дата надвишава право кредитни клиент дни от {0} ден (и)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Заявител
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ОРИГИНАЛ ЗА ПОЛУЧАТЕЛЯ
 DocType: Asset Category Account,Accumulated Depreciation Account,Сметка за Натрупана амортизация
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Този имейл е автоматично генериран
 DocType: Stock Settings,Freeze Stock Entries,Фиксиране на вписване в запасите
 DocType: Program Enrollment,Boarding Student,Студент на борда
 DocType: Asset,Expected Value After Useful Life,Очакваната стойност След Полезна Life
@@ -3132,7 +3193,7 @@
 DocType: Activity Cost,Billing Rate,(Фактура) Курс
 ,Qty to Deliver,Количество за доставка
 ,Stock Analytics,Анализи на наличностите
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Операциите не могат да бъдат оставени празни
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Операциите не могат да бъдат оставени празни
 DocType: Maintenance Visit Purpose,Against Document Detail No,Against Document Detail No
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Тип Компания е задължително
 DocType: Quality Inspection,Outgoing,Изходящ
@@ -3154,7 +3215,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,"Изберете ръчно студентите за групата, базирана на дейности"
 DocType: Journal Entry,User Remark,Потребителска забележка
 DocType: Lead,Market Segment,Пазарен сегмент
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Платената сума не може да бъде по-голям от общия изключително отрицателна сума {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Платената сума не може да бъде по-голям от общия изключително отрицателна сума {0}
 DocType: Supplier Scorecard Period,Variables,Променливи
 DocType: Employee Internal Work History,Employee Internal Work History,Служител Вътрешен - История на работа
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Закриване (Dr)
@@ -3183,21 +3244,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Получаване на актуализации
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Сметка {2} не принадлежи на компания {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Искане за материал {0} е отменен или спрян
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Управление на отсътствията
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Управление на отсътствията
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Групирай по Сметка
 DocType: Sales Order,Fully Delivered,Напълно Доставени
 DocType: Lead,Lower Income,По-ниски доходи
+DocType: Restaurant Order Entry,Current Order,Текуща поръчка
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Източник и целеви склад не могат да бъдат един и същ за ред {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разлика трябва да се вида на актива / Отговорност сметка, тъй като това Фондова Помирението е Откриване Влизане"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Платената сума не може да бъде по-голяма от кредит сума {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Отидете на Програми
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},"Поръчка за покупка брой, необходим за т {0}"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Производствената поръчка не е създадена
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Производствената поръчка не е създадена
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""От дата"" трябва да е преди ""До дата"""
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Не може да се промени статута си на студент {0} е свързан с прилагането студент {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Не може да се промени статута си на студент {0} е свързан с прилагането студент {1}
 DocType: Asset,Fully Depreciated,напълно амортизирани
 ,Stock Projected Qty,Фондова Прогнозно Количество
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Клиент {0} не принадлежи на проекта {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Клиент {0} не принадлежи на проекта {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Маркирано като присъствие HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Оферта са предложения, оферти, изпратени до клиентите"
 DocType: Sales Order,Customer's Purchase Order,Поръчка на Клиента
@@ -3208,8 +3270,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Моля, задайте Брой амортизации Резервирано"
 DocType: Supplier Scorecard Period,Calculations,Изчисленията
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Стойност или Количество
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Productions поръчки не могат да бъдат повдигнати за:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Productions поръчки не могат да бъдат повдигнати за:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Минута
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Моля, задайте Naming Series за {0} чрез Setup&gt; Settings&gt; Naming Series"
 DocType: Purchase Invoice,Purchase Taxes and Charges,Покупка данъци и такси
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Отидете на Доставчици
 ,Qty to Receive,Количество за получаване
@@ -3222,7 +3285,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Кредит на сметката трябва да бъде балансова сметка
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Всички Видове Доставчик
 DocType: Global Defaults,Disable In Words,"Изключване ""С думи"""
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Код е задължително, тъй като номерацията не е автоматична"
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,"Код е задължително, тъй като номерацията не е автоматична"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Оферта {0} не от типа {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,График за техническо обслужване - позиция
 DocType: Sales Order,%  Delivered,% Доставени
@@ -3244,23 +3307,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Началното салдо Капитал
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,помирение
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,оставащ
 DocType: Appraisal,Appraisal,Оценка
 DocType: Purchase Invoice,GST Details,GST Детайли
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},Изпратен имейл доставчика {0}
+DocType: Item,Default Sales Unit of Measure,Единица по продажби по подразбиране
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Датата се повтаря
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Оторизиран подпис
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Одобряващ отсъствия трябва да бъде един от {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Създаване на такси
-DocType: Hub Settings,Seller Email,Продавач Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Общата покупна цена на придобиване (чрез покупка на фактура)
 DocType: Training Event,Start Time,Начален Час
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Изберете Количество
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Изберете Количество
 DocType: Customs Tariff Number,Customs Tariff Number,Тарифен номер Митници
 DocType: Patient Appointment,Patient Appointment,Назначаване на пациент
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Приемане роля не може да бъде същата като ролята на правилото се прилага за
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Отписване от този Email бюлетин
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Отписване от този Email бюлетин
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Вземи доставчици от
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} не е намерен за елемент {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Отидете на Курсове
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Съобщението е изпратено
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Сметка с деца възли не могат да бъдат определени като книга
@@ -3273,11 +3339,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,"Материал, прехвърлен за производство"
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Сметка {0} не съществува
 DocType: Project,Project Type,Тип на проекта
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Детската задача съществува за тази задача. Не можете да изтриете тази задача.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Или целта Количество или целева сума е задължително.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Разходи за други дейности
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Няма повече резултати
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Разходи за други дейности
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Създаване на събитията в {0}, тъй като Работника прикрепен към по-долу, купува Лицата не разполага с потребителско име {1}"
 DocType: Timesheet,Billing Details,Детайли за фактура
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Източник и целеви склад трябва да бъде различен
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Източник и целеви склад трябва да бъде различен
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Не е позволено да се актуализира борсови сделки по-стари от {0}
 DocType: Purchase Invoice Item,PR Detail,PR Подробности
 DocType: Sales Order,Fully Billed,Напълно фактуриран
@@ -3303,7 +3371,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Банков Превод
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Избери всичко
 DocType: Vehicle Log,Invoice Ref,Фактура Референция
-DocType: Purchase Order,Recurring Order,Повтарящо Поръчка
 DocType: Company,Default Income Account,Сметка за приходи - по подразбиране
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Група клиенти / Клиент
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Незатворено данъчни години печалба / загуба (кредит)
@@ -3317,9 +3384,9 @@
 DocType: Patient,A Negative,Отрицателен
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Нищо повече за показване.
 DocType: Lead,From Customer,От клиент
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Призовава
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Призовава
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Продукт
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,Партиди
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,Партиди
 DocType: Project,Total Costing Amount (via Time Logs),Общо Остойностяване сума (чрез Time Logs)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Направете график на таксите
 DocType: Purchase Order Item Supplied,Stock UOM,Склад - мерна единица
@@ -3343,7 +3410,7 @@
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Отпуски и Празници
 DocType: School Settings,Current Academic Term,Настоящ академичен срок
 DocType: Sales Order,Not Billed,Не фактуриран
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,И двата склада трябва да принадлежат към една и съща фирма
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,И двата склада трябва да принадлежат към една и съща фирма
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,"Не са добавени контакти, все още."
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Поземлен Cost Ваучер Сума
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Фактури издадени от доставчици.
@@ -3352,7 +3419,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Отстъпка Сума
 DocType: Purchase Invoice,Return Against Purchase Invoice,Върнете Срещу фактурата за покупка
 DocType: Item,Warranty Period (in days),Гаранционен срок (в дни)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',"актуализация `tabPatient назначаването`, зададен sales_invoice = &#39;{0}&#39; where name = &#39;{1}&#39;"
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Връзка с Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Нетни парични средства от Текуща дейност
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Позиция 4
@@ -3361,8 +3427,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Вестник Влизане Акаунт
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student Group
 DocType: Shopping Cart Settings,Quotation Series,Оферта Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Една статия, съществува със същото име ({0}), моля да промените името на стокова група или преименувате елемента"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Моля изберете клиент
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Една статия, съществува със същото име ({0}), моля да промените името на стокова група или преименувате елемента"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Моля изберете клиент
 DocType: C-Form,I,аз
 DocType: Company,Asset Depreciation Cost Center,Център за амортизация на разходите Асет
 DocType: Sales Order Item,Sales Order Date,Поръчка за продажба - Дата
@@ -3371,6 +3437,7 @@
 DocType: Assessment Plan,Assessment Plan,План за оценка
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Клиент {0} е създаден.
 DocType: Stock Settings,Limit Percent,Процент лимит
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Понастоящем няма налични запаси в нито един склад
 ,Payment Period Based On Invoice Date,Заплащане Период на базата на датата на фактурата
 DocType: Sample Collection,No. of print,Брой разпечатки
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Липсва обменен курс за валута {0}
@@ -3426,13 +3493,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Общо Приспадане - кредит за погасяване
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,Текущ BOM и нов BOM не могат да бъдат едни и същи
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Фиш за заплата ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Фиш за заплата ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Дата на пенсиониране трябва да е по-голяма от Дата на Присъединяване
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Имаше грешки при насрочване курс по:
 DocType: Sales Invoice,Against Income Account,Срещу Приходна Сметка
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Доставени
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Точка {0}: Поръчано Количество {1} не може да бъде по-малък от минималния Количество цел {2} (дефинирана в точка).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Точка {0}: Поръчано Количество {1} не може да бъде по-малък от минималния Количество цел {2} (дефинирана в точка).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Месечено процентно разпределение
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,"Моля, влезте като друг потребител."
 DocType: Territory,Territory Targets,Територия Цели
 DocType: Delivery Note,Transporter Info,Превозвач Информация
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},"Моля, задайте по подразбиране {0} в Company {1}"
@@ -3440,13 +3508,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Същият доставчик е бил въведен няколко пъти
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Брутна печалба / загуба
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Поръчка за покупка приложените аксесоари
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Името на фирмата не може да е Company
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Името на фирмата не може да е Company
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Бланки за шаблони за печат.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Заглавия за шаблони за печат, например проформа фактура."
 DocType: Program Enrollment,Walking,ходене
 DocType: Student Guardian,Student Guardian,Student Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Такси тип оценка не може маркирани като Inclusive
 DocType: POS Profile,Update Stock,Актуализация Наличности
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,в абонамента
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Different мерна единица за елементи ще доведе до неправилно (Total) Нетна стойност на теглото. Уверете се, че нетното тегло на всеки артикул е в една и съща мерна единица."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Курс
 DocType: Asset,Journal Entry for Scrap,Вестник Влизане за скрап
@@ -3494,15 +3563,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System Потребител (вход) ID. Ако е зададено, че ще стане по подразбиране за всички форми на човешките ресурси."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: От {1}
 DocType: Task,depends_on,зависи от
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Нарежда се за актуализиране на последната цена във всички сметки. Може да отнеме няколко минути.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Нарежда се за актуализиране на последната цена във всички сметки. Може да отнеме няколко минути.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Име на нов профил. Забележка: Моля, не създават сметки за клиенти и доставчици"
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Шаблон на адрес по подразбиране за държавата
 DocType: Sales Order Item,Supplier delivers to Customer,Доставчик доставя на Клиента
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Форма / позиция / {0}) е изчерпана
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Поради / Референтен дата не може да бъде след {0}
+,Sales Payment Summary,Резюме на плащанията за продажби
+DocType: Restaurant,Restaurant,Ресторант
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Поради / Референтен дата не може да бъде след {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Внос и експорт на данни
 DocType: Patient,Account Details,детайли за акаунта
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Няма намерени студенти
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Няма намерени студенти
 DocType: Medical Department,Medical Department,Медицински отдел
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Критерий за оценяване на доставчиците на Scorecard
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Фактура - дата на осчетоводяване
@@ -3513,7 +3584,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,"Моля, изберете дата на завеждане, преди да изберете страна"
 DocType: Program Enrollment,School House,училище Къща
 DocType: Serial No,Out of AMC,Няма AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,"Моля, изберете Оферти"
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,"Моля, изберете Оферти"
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Брой на амортизации Договорени не може да бъде по-голям от общия брой амортизации
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Създаване на Посещение за поддръжка
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,"Моля, свържете се с потребител, който има {0} роля Продажби Майстор на мениджъра"
@@ -3521,7 +3592,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Company (не клиент или доставчик) майстор.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Това се основава на присъствието на този Student
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Няма студенти в
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Добавете още предмети или отворен пълна форма
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Добавете още предмети или отворен пълна форма
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Складовата разписка {0} трябва да се отмени преди да анулирате тази поръчка за продажба
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Отидете на Потребители
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Платената сума + отписана сума не може да бъде по-голяма от обща сума
@@ -3541,37 +3612,40 @@
 DocType: Fee Schedule,Fee Schedule,График за такса
 DocType: Hub Settings,Publish Availability,Публикуване Наличност
 DocType: Company,Create Chart Of Accounts Based On,Създаване на индивидуален сметкоплан на базата на
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Не може да се конвертира в не-група. Децата работят.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,"Дата на раждане не може да бъде по-голяма, отколкото е днес."
 ,Stock Ageing,Склад за живот на възрастните хора
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Студент {0} съществува срещу ученик кандидат {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Корекция на закръгляването (валута на компанията)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,график
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,график
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} &quot;{1}&quot; е деактивирана
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Задай като Отворен
 DocType: Cheque Print Template,Scanned Cheque,Сканиран чек
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Изпрати автоматични имейли в Контакти при подаването на сделки.
 DocType: Timesheet,Total Billable Amount,Общо фактурирания сума
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Позиция 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Поръчката влизане
 DocType: Purchase Order,Customer Contact Email,Клиент - email за контакти
 DocType: Warranty Claim,Item and Warranty Details,Позиция и подробности за гаранцията
 DocType: Sales Team,Contribution (%),Принос (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Забележка: Плащане Влизане няма да се създали от &quot;пари или с банкова сметка&quot; Не е посочено
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Проект {0} вече съществува
 DocType: Medical Department,Nursing User,Потребител на сестрински грижи
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Отговорности
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Периодът на валидност на тази котировка е приключил.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Периодът на валидност на тази котировка е приключил.
 DocType: Expense Claim Account,Expense Claim Account,Expense претенция профил
 DocType: Accounts Settings,Allow Stale Exchange Rates,Разрешаване на стационарни обменни курсове
 DocType: Sales Person,Sales Person Name,Търговец - Име
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Моля, въведете поне една фактура в таблицата"
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Добави Потребители
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Добави Потребители
 DocType: POS Item Group,Item Group,Група позиции
 DocType: Item,Safety Stock,Безопасен запас
 DocType: Healthcare Settings,Healthcare Settings,Настройки на здравеопазването
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Прогресът в % на задача не може да бъде повече от 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Прогресът в % на задача не може да бъде повече от 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Преди изравняване
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},За  {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Данъци и такси - Добавени (фирмена валута)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Позиция Tax Row {0} Трябва да имате предвид тип данък или приход или разход или Дължими
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Позиция Tax Row {0} Трябва да имате предвид тип данък или приход или разход или Дължими
 DocType: Sales Order,Partly Billed,Частично фактурирани
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Позиция {0} трябва да е дълготраен актив
 DocType: Item,Default BOM,BOM по подразбиране
@@ -3587,6 +3661,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,променлив
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,От Стокова разписка
 DocType: Student,Student Email Address,Student имейл адрес
+DocType: Item,Hub Warehouse,Службата за складове
 DocType: Physician Schedule Time Slot,From Time,От време
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,В наличност:
 DocType: Notification Control,Custom Message,Персонализирано съобщение
@@ -3594,9 +3669,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,Брой или банкова сметка е задължителна за въвеждане на плащане
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Студентски адрес
 DocType: Purchase Invoice,Price List Exchange Rate,Ценоразпис Валутен курс
+DocType: POS Profile,POS Profile Name,Името на профила на POS
 DocType: Purchase Invoice Item,Rate,Ед. Цена
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Интерниран
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Адрес Име
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Адрес Име
 DocType: Stock Entry,From BOM,От BOM
 DocType: Assessment Code,Assessment Code,Код за оценка
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Основен
@@ -3610,11 +3686,12 @@
 DocType: Salary Slip,Salary Structure,Структура Заплата
 DocType: Account,Bank,Банка
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авиолиния
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Изписване на материал
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Изписване на материал
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Възникна грешка при създаването на повтарящи се
 DocType: Material Request Item,For Warehouse,За склад
 DocType: Employee,Offer Date,Оферта - Дата
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Оферти
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,"Вие сте в офлайн режим. Вие няма да бъдете в състояние да презареждате, докато нямате мрежа."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,"Вие сте в офлайн режим. Вие няма да бъдете в състояние да презареждате, докато нямате мрежа."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Няма създаден студентски групи.
 DocType: Purchase Invoice Item,Serial No,Сериен Номер
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Месечна погасителна сума не може да бъде по-голяма от Размер на заема
@@ -3624,17 +3701,18 @@
 DocType: Salary Slip,Total Working Hours,Общо работни часове
 DocType: Subscription,Next Schedule Date,Следваща дата на графика
 DocType: Stock Entry,Including items for sub assemblies,Включително артикули за под събрания
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,"Въведете стойност, която да бъде положителна"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Всички територии
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,"Въведете стойност, която да бъде положителна"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Всички територии
 DocType: Purchase Invoice,Items,Позиции
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student вече е регистриран.
 DocType: Fiscal Year,Year Name,Година Име
 DocType: Process Payroll,Process Payroll,Process Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Има повече почивки от работни дни в този месец.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Има повече почивки от работни дни в този месец.
 DocType: Product Bundle Item,Product Bundle Item,Каталог Bundle Точка
 DocType: Sales Partner,Sales Partner Name,Търговски партньор - Име
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Запитвания за оферти
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Запитвания за оферти
 DocType: Payment Reconciliation,Maximum Invoice Amount,Максимална сума на фактурата
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,хематология
 DocType: Normal Test Items,Normal Test Items,Нормални тестови елементи
 DocType: Student Language,Student Language,Student Език
 apps/erpnext/erpnext/config/selling.py +23,Customers,Клиенти
@@ -3645,10 +3723,11 @@
 DocType: Issue,Opening Time,Наличност - Време
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,От и до датите са задължителни
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Ценни книжа и стоковите борси
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Default мерната единица за Variant &#39;{0}&#39; трябва да бъде същото, както в Template &quot;{1}&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Default мерната единица за Variant &#39;{0}&#39; трябва да бъде същото, както в Template &quot;{1}&quot;"
 DocType: Shipping Rule,Calculate Based On,Изчислете на основата на
 DocType: Delivery Note Item,From Warehouse,От склад
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Не артикули с Бил на материали за производство на
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Не артикули с Бил на материали за производство на
+DocType: Restaurant,Default Customer,Потребител по подразбиране
 DocType: Assessment Plan,Supervisor Name,Наименование на надзорник
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Не потвърждавайте дали среща е създадена за същия ден
 DocType: Program Enrollment Course,Program Enrollment Course,Курс за записване на програмата
@@ -3675,7 +3754,7 @@
 DocType: Payment Entry,Internal Transfer,вътрешен трансфер
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Предвид Child съществува за този профил. Не можете да изтриете този профил.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Или целта Количество или целева сума е задължителна
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Няма спецификация на материал по подразбиране за позиция {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Няма спецификация на материал по подразбиране за позиция {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,"Моля, изберете първо счетоводна дата"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Откриване Дата трябва да е преди крайната дата
 DocType: Leave Control Panel,Carry Forward,Пренасяне
@@ -3710,6 +3789,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Общо Present
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,Счетоводни отчети
 DocType: Drug Prescription,Hour,Час
+DocType: Restaurant Order Entry,Last Sales Invoice,Последна фактура за продажби
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,New Serial Не може да има Warehouse. Warehouse трябва да бъде определен от Фондова Влизане или покупка Разписка
 DocType: Lead,Lead Type,Тип потенциален клиент
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Вие нямате право да одобри листата на Блок Дати
@@ -3744,64 +3824,66 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Създаване на потребители
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,грам
 DocType: Supplier Scorecard,Per Month,На месец
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Количество за Производство трябва да е по-голямо от 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Количество за Производство трябва да е по-голямо от 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Посетете доклад за поддръжка повикване.
 DocType: Stock Entry,Update Rate and Availability,Актуализация Курсове и Наличност
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Процент ви е позволено да получи или достави повече от поръчаното количество. Например: Ако сте поръчали 100 единици. и си Allowance е 10% след което се оставя да се получи 110 единици.
 DocType: POS Customer Group,Customer Group,Група клиенти
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Нов идентификационен номер на партидата (незадължително)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Нов идентификационен номер на партидата (незадължително)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Разходна сметка е задължително за покупка {0}
 DocType: BOM,Website Description,Website Описание
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Нетна промяна в собствения капитал
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Най-новият
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Моля анулирайте фактурата за покупка {0} първо
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail адрес трябва да бъде уникален, вече съществува за {0}"
 DocType: Serial No,AMC Expiry Date,AMC срок на годност
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,Касова бележка
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,Касова бележка
 ,Sales Register,Продажбите Регистрация
 DocType: Daily Work Summary Settings Company,Send Emails At,Изпрати имейли до
 DocType: Quotation,Quotation Lost Reason,Оферта Причина за загубване
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Изберете вашия домейн
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',"изберете * от tabPatient, където името = &#39;{0}&#39;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Справка за сделката не {0} от {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Справка за сделката не {0} от {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,"Няма нищо, за да редактирате."
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Изглед на формата
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Резюме за този месец и предстоящи дейности
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Изглед на формата
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Резюме за този месец и предстоящи дейности
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Добавете потребители към вашата организация, различни от вас."
 DocType: Customer Group,Customer Group Name,Група клиенти - Име
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Все още няма клиенти!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Все още няма клиенти!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Отчет за паричните потоци
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Размер на кредита не може да надвишава сума на максимален заем  {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Разрешително
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},"Моля, премахнете тази фактура {0} от C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},"Моля, премахнете тази фактура {0} от C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Моля изберете прехвърляне, ако и вие искате да се включат предходната фискална година баланс оставя на тази фискална година"
 DocType: GL Entry,Against Voucher Type,Срещу ваучер Вид
 DocType: Physician,Phone (R),Телефон (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Добавени са времеви слотове
 DocType: Item,Attributes,Атрибути
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Активиране на шаблона
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Моля, задайте Naming Series за {0} чрез Setup&gt; Settings&gt; Naming Series"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,"Моля, въведете отпишат Акаунт"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Последна Поръчка Дата
 DocType: Patient,B Negative,B Отрицателен
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Сметка {0} не принадлежи на фирма {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Серийните номера в ред {0} не съвпадат с бележката за доставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Серийните номера в ред {0} не съвпадат с бележката за доставка
 DocType: Student,Guardian Details,Guardian Детайли
 DocType: C-Form,C-Form,Cи-Форма
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Маркирай присъствие за множество служители
 DocType: Vehicle,Chassis No,Шаси Номер
 DocType: Payment Request,Initiated,Образувани
 DocType: Production Order,Planned Start Date,Планирана начална дата
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,"Моля, изберете BOM"
 DocType: Serial No,Creation Document Type,Създаване на тип документ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Крайната дата трябва да е по-голяма от началната дата
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Крайната дата трябва да е по-голяма от началната дата
 DocType: Leave Type,Is Encash,Дали инкасира
 DocType: Leave Allocation,New Leaves Allocated,Нови листа Отпуснати
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Project-мъдър данни не е достъпно за оферта
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Край на
 DocType: Project,Expected End Date,Очаквано Крайна дата
 DocType: Budget Account,Budget Amount,Бюджет сума
 DocType: Appraisal Template,Appraisal Template Title,Оценка Template Title
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},От Дата {0} за служителите {1} не може да бъде преди да се присъедини Дата служител {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Търговски
 DocType: Patient,Alcohol Current Use,Алкохолът текуща употреба
+DocType: Student Admission Program,Student Admission Program,Програма за прием на студенти
 DocType: Payment Entry,Account Paid To,Сметка за плащане към
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Родител позиция {0} не трябва да бъде позиция с наличности
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Всички продукти или услуги.
@@ -3810,30 +3892,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Бюджет за сметка {1} по {2} {3} е {4}. Той ще буде превишен с {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Row {0} # партида трябва да е от тип &quot;дълготраен актив&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Изх. Количество
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Правила за изчисляване на сумата на пратката за продажба
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,и отключен Disabled в
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Номерацията е задължителна
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Финансови Услуги
 DocType: Student Sibling,Student ID,Student ID
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Видове дейности за времето за Logs
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Имейл на доставчик
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Видове дейности за времето за Logs
 DocType: Tax Rule,Sales,Търговски
 DocType: Stock Entry Detail,Basic Amount,Основна сума
 DocType: Training Event,Exam,Изпит
 DocType: Complaint,Complaint,оплакване
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Склад се изисква за артикул {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Склад се изисква за артикул {0}
 DocType: Leave Allocation,Unused leaves,Неизползваните отпуски
 DocType: Patient,Alcohol Past Use,Използване на алкохол в миналото
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,(Фактура) Състояние
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Прехвърляне
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Изважда се взриви BOM (включително монтажните възли)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Прехвърляне
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Изважда се взриви BOM (включително монтажните възли)
 DocType: Authorization Rule,Applicable To (Employee),Приложими по отношение на (Employee)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Срок за плащане е задължителен
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Срок за плащане е задължителен
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Увеличаване на атрибут {0} не може да бъде 0
 DocType: Journal Entry,Pay To / Recd From,Плати на / Получи от
 DocType: Naming Series,Setup Series,Настройка на номерацията
 DocType: Payment Reconciliation,To Invoice Date,Към датата на фактурата
 DocType: Supplier,Contact HTML,Контакт - HTML
 ,Inactive Customers,Неактивни Клиенти
+DocType: Student Admission Program,Maximum Age,Максимална възраст
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Изкупните Приходи
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Как правилото за ценообразуване се прилага?
@@ -3852,6 +3936,7 @@
 DocType: GL Entry,Remarks,Забележки
 DocType: Payment Entry,Account Paid From,Сметка за плащане от
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Суровина - Код
+DocType: Task,Parent Task,Родителска задача
 DocType: Journal Entry,Write Off Based On,Отписване на базата на
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Създаване на Възможност
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Печат и консумативи
@@ -3860,19 +3945,19 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Заплата вече обработени за период между {0} и {1}, Оставете период заявление не може да бъде между този период от време."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Монтаж запис за сериен номер
 DocType: Guardian Interest,Guardian Interest,Guardian Интерес
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Настройване на стандартните стойности за POS фактури
 apps/erpnext/erpnext/config/hr.py +177,Training,Обучение
 DocType: Timesheet,Employee Detail,Служител - Детайли
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Идентификационен номер на имейл за Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,ден Next Дата и Повторение на Ден на месец трябва да бъде равна
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,ден Next Дата и Повторение на Ден на месец трябва да бъде равна
 DocType: Lab Prescription,Test Code,Тестов код
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Настройки за уебсайт страница
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},Не са разрешени RFQ за {0} поради наличието на {1}
 DocType: Offer Letter,Awaiting Response,Очаква отговор
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Горе
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Обща сума {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Невалиден атрибут {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Обща сума {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Невалиден атрибут {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Посочете дали е нестандартна платима сметка
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Същият елемент е въведен няколко пъти. {Списък}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',"Моля, изберете групата за оценка, различна от &quot;Всички групи за оценка&quot;"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Ред {0}: Изисква се разходен център за елемент {1}
 DocType: Training Event Employee,Optional,по избор
@@ -3895,19 +3980,20 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Разходен Център е задължително за {2}
 DocType: Vehicle,Policy No,Полица номер
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Вземи елементите  от продуктов пакет
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Тъй като съществува запас срещу елемент {0}, не можете да активирате свойства на варианти"
 DocType: Asset,Straight Line,Права
 DocType: Project User,Project User,Потребител в проект
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,разцепване
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,разцепване
 DocType: GL Entry,Is Advance,Е аванс
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Присъствие От Дата и зрители към днешна дата е задължително
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,"Моля, изберете ""е от подизпълнител"" като Да или Не"
+DocType: Item,Default Purchase Unit of Measure,Елемент за мярка по подразбиране за покупка
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Дата на Последна комуникация
 DocType: Sales Team,Contact No.,Контакт - номер
 DocType: Bank Reconciliation,Payment Entries,Записи на плащане
 DocType: Production Order,Scrap Warehouse,скрап Warehouse
 DocType: Production Order,Check if material transfer entry is not required,Проверете дали не се изисква въвеждане на материал за прехвърляне
 DocType: Program Enrollment Tool,Get Students From,Вземете студентите от
-DocType: Hub Settings,Seller Country,Продавач - Държава
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Публикуване Теми на Website
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Група вашите ученици в партиди
 DocType: Authorization Rule,Authorization Rule,Разрешение Правило
@@ -3917,7 +4003,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Продажби данъци и такси - шаблон
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Общо (кредит)
 DocType: Repayment Schedule,Payment Date,Дата за плащане
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Нова партида - колич.
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Нова партида - колич.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Облекло &amp; Аксесоари
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,"Функцията за претеглена оценка не можа да бъде решена. Уверете се, че формулата е валидна."
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Брой на Поръчка
@@ -3935,6 +4021,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row {0}: Asset {1} не може да бъде представен, той вече е {2}"
 DocType: Tax Rule,Billing Country,(Фактура) Държава
 DocType: Purchase Order Item,Expected Delivery Date,Очаквана дата на доставка
+DocType: Restaurant Order Entry,Restaurant Order Entry,Реклама в ресторанта
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебитни и кредитни не е равно на {0} # {1}. Разликата е {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Представителни Разходи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Направи Материал Заявка
@@ -3947,9 +4034,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Сметка със съществуващa трансакция не може да бъде изтрита
 DocType: Vehicle,Last Carbon Check,Последна проверка на въглерода
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Правни разноски
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,"Моля, изберете количество на ред"
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,"Моля, изберете количество на ред"
 DocType: Purchase Invoice,Posting Time,Време на осчетоводяване
 DocType: Timesheet,% Amount Billed,% Фактурирана сума
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Време за назначаване&quot; не е зададено за д-р {0}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Разходите за телефония
 DocType: Sales Partner,Logo,Лого
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Маркирайте това, ако искате да задължите потребителя да избере серия преди да запише. Няма да има по подразбиране, ако маркирате това."
@@ -3960,6 +4048,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Customer приходите
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Пътни Разходи
 DocType: Maintenance Visit,Breakdown,Авария
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Добавяне на абонамент за персонализирано поле в доctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Сметка: {0} с валута: не може да бъде избран {1}
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Актуализиране на BOM струва автоматично чрез Scheduler, въз основа на последната скорост на оценка / ценоразпис / последната сума на покупката на суровини."
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Дата
@@ -3984,7 +4073,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Общо Billing сума (чрез Time Logs)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Id на доставчик
 DocType: Payment Request,Payment Gateway Details,Gateway за плащания - Детайли
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Количество трябва да бъде по-голямо от 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Количество трябва да бъде по-голямо от 0
 DocType: Journal Entry,Cash Entry,Каса - Запис
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,"Подвъзли могат да се създават само при възли от тип ""група"""
 DocType: Leave Application,Half Day Date,Половин ден - Дата
@@ -4002,12 +4091,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Забележка: Елемент {0} е въведен няколко пъти
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Всички контакти.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Компания - Съкращение
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Потребителят {0} не съществува
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Потребителят {0} не съществува
 DocType: Subscription,SUB-,под-
 DocType: Item Attribute Value,Abbreviation,Абревиатура
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Плащането вече съществува
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Не authroized тъй {0} надхвърля границите
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Заплата шаблон майстор.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,патология
+DocType: Restaurant Order Entry,Restaurant Table,Ресторант Таблица
 DocType: Leave Type,Max Days Leave Allowed,Максимални дни позволени за отпуск
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Определете данъчни правила за количката
 DocType: Purchase Invoice,Taxes and Charges Added,Данъци и такси - Добавени
@@ -4019,10 +4110,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Оферта до потенциални клиенти или клиенти.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Роля за редактиране замразена
 ,Territory Target Variance Item Group-Wise,Територия Target Вариацията т Group-Wise
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Всички групи клиенти
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Всички групи клиенти
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Натрупвано месечно
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} е задължително. Може би запис за обменни курсове на валута не е създаден от {1} към {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Данъчен шаблон е задължителен.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Данъчен шаблон е задължителен.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Сметка {0}: Родителска сметка {1} не съществува
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ценоразпис Rate (Company валути)
 DocType: Products Settings,Products Settings,Продукти - Настройки
@@ -4048,12 +4139,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Позиция Wise Tax Подробности
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Институт Съкращение
 ,Item-wise Price List Rate,Точка-мъдър Ценоразпис Курсове
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Доставчик оферта
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Доставчик оферта
 DocType: Quotation,In Words will be visible once you save the Quotation.,Словом ще бъде видим след като запазите офертата.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Количеството ({0}) не може да бъде част от реда {1}
 DocType: Consultation,C-,° С-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Баркод {0} вече се използва в ред {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Баркод {0} вече се използва в ред {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Правила за добавяне на транспортни разходи.
 DocType: Item,Opening Stock,Начална наличност
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Изисква се Клиент
@@ -4071,9 +4162,8 @@
 DocType: Customer,From Lead,От потенциален клиент
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Поръчки пуснати за производство.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Изберете фискална година ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS профил изисква да направи POS Влизане
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS профил изисква да направи POS Влизане
 DocType: Program Enrollment Tool,Enroll Students,Прием на студенти
-DocType: Hub Settings,Name Token,Име Token
 DocType: Lab Test,Approved Date,Одобрена дата
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Поне един склад е задължително
@@ -4091,7 +4181,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Човешки Ресурси
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Заплащане помирение плащане
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Данъчни активи
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Производствената поръчка е {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Производствената поръчка е {0}
 DocType: BOM Item,BOM No,BOM Номер
 DocType: Instructor,INS/,INS/
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Вестник Влизане {0} не разполага сметка {1} или вече съвпадащи срещу друг ваучер
@@ -4111,7 +4201,7 @@
 DocType: Currency Exchange,To Currency,За валута
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Позволете на следните потребители да одобрят Оставете Applications за блокови дни.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Видове разноски иск.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Процентът на продажбата за елемент {0} е по-нисък от {1}. Процентът на продажба трябва да бъде най-малко {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Процентът на продажбата за елемент {0} е по-нисък от {1}. Процентът на продажба трябва да бъде най-малко {2}
 DocType: Item,Taxes,Данъци
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Платени и недоставени
 DocType: Project,Default Cost Center,Разходен център по подразбиране
@@ -4125,15 +4215,15 @@
 DocType: Employee Loan,Fully Disbursed,пълното изразходване на средствата
 DocType: Maintenance Visit,Customer Feedback,Обратна връзка на клиент
 DocType: Account,Expense,Разход
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,"Рейтинг не може да бъде по-голяма, отколкото Максимална оценка"
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,"Рейтинг не може да бъде по-голяма, отколкото Максимална оценка"
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Клиенти и доставчици
 DocType: Item Attribute,From Range,От диапазон
 DocType: BOM,Set rate of sub-assembly item based on BOM,Задайте скорост на елемента на подменю въз основа на BOM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Синтактична грешка във формула или състояние: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Синтактична грешка във формула или състояние: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Ежедневната работа Обобщение на настройките Company
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,"Позиция {0} е игнорирана, тъй като тя не е елемент от склад"
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Изпратете този производствена поръчка за по-нататъшна обработка.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Изпратете този производствена поръчка за по-нататъшна обработка.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","За да не се прилага ценообразуване правило в дадена сделка, всички приложими правила за ценообразуване трябва да бъдат забранени."
 DocType: Assessment Group,Parent Assessment Group,Родител Група оценка
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Работни места
@@ -4150,12 +4240,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Моля, поставете фирмения филтър празен, ако Group By е &quot;Company&quot;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Публикуване Дата не може да бъде бъдеща дата
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Пореден № {1} не съвпада с {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,за генериране на повтарящи се
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Регулярен отпуск
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Лабораторен тест UOM.
 DocType: Batch,Batch ID,Партида Номер
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Забележка: {0}
 ,Delivery Note Trends,Складова разписка - Тенденции
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Тази Седмица Резюме
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Тази Седмица Резюме
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,В наличност брой
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Сметка: {0} може да се актуализира само чрез Складови трансакции
 DocType: Student Group Creation Tool,Get Courses,Вземете курсове
@@ -4169,7 +4260,6 @@
 DocType: Purchase Order,To Bill,Да се фактурира
 DocType: Material Request,% Ordered,% Поръчани
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","За курсовата студентска група, курсът ще бъде валидиран за всеки студент от записаните курсове по програма за записване."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Въведете имейл адрес, разделени със запетаи, фактура ще бъде изпратен автоматично на определена дата"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Работа заплащана на парче
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Ср. Курс купува
 DocType: Task,Actual Time (in Hours),Действителното време (в часове)
@@ -4183,7 +4273,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Точка {0} не е настройка за серийни номера. Колоната трябва да бъде празно
 DocType: Accounts Settings,Accounts Settings,Настройки на Сметки
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,одобрявам
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Няма отговор за изпращане
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Няма отговор за изпращане
 DocType: Customer,Sales Partner and Commission,Търговски партньор и комисионни
 DocType: Employee Loan,Rate of Interest (%) / Year,Лихвен процент (%) / Година
 ,Project Quantity,Проект Количество
@@ -4195,55 +4285,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Черен
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Детайла позиция
 DocType: Account,Auditor,Одитор
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} произведени артикули
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} произведени артикули
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Научете повече
 DocType: Cheque Print Template,Distance from top edge,Разстояние от горния ръб
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Ценоразпис {0} е забранено или не съществува
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Ценоразпис {0} е забранено или не съществува
 DocType: Purchase Invoice,Return,Връщане
 DocType: Production Order Operation,Production Order Operation,Поръчка за производство - Операция
 DocType: Pricing Rule,Disable,Изключване
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Начин на плащане се изисква за извършване на плащане
 DocType: Project Task,Pending Review,До Review
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Назначения и консултации
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} не е записан в пакета {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} не е записан в пакета {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} не може да се бракува, тъй като вече е {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Общо разход претенция (чрез Expense претенция)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Маркирай като отсъстващ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Валута на BOM # {1} трябва да бъде равна на избраната валута {2}
 DocType: Journal Entry Account,Exchange Rate,Обменен курс
 DocType: Patient,Additional information regarding the patient,Допълнителна информация относно пациента
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Поръчка за продажба {0} не е изпратена
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Поръчка за продажба {0} не е изпратена
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,Такса Компонент
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Управление на автопарка
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Добавяне на елементи от
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Управление на автопарка
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Добавяне на елементи от
 DocType: Cheque Print Template,Regular,Редовен
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Общо Weightage на всички Критерии за оценка трябва да бъде 100%
-DocType: BOM,Last Purchase Rate,Курс при Последна Покупка
+DocType: Purchase Order Item,Last Purchase Rate,Курс при Последна Покупка
 DocType: Account,Asset,Придобивка
 DocType: Project Task,Task ID,Задача ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Фондова не може да съществува за позиция {0}, тъй като има варианти"
 DocType: Lab Test,Mobile,Подвижен
 ,Sales Person-wise Transaction Summary,Цели на търговец -  Резюме на транзакцията
 DocType: Training Event,Contact Number,Телефон за контакти
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Склад {0} не съществува
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Регистрирайте се за ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Склад {0} не съществува
 DocType: Monthly Distribution,Monthly Distribution Percentages,Месечено процентно разпределение
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Избраният елемент не може да има партида
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","скорост на оценка не е намерен за позицията от {0}, което е необходимо да направите, счетоводни записвания за {1} {2}. Ако елементът е сключване на сделки като елемент проба в {1}, моля се спомене, че в {1} таблицата елемент. В противен случай, моля, създайте входящо фондова сделка за скоростта на оценка елемент или споменава в регистъра на т, и след това опитайте да изпращате / анулиране на този пост"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% от материали доставени по тази Бележка за доставка
+DocType: Training Event,Has Certificate,Има сертификат
 DocType: Project,Customer Details,Клиент - Детайли
 DocType: Employee,Reports to,Справки до
 ,Unpaid Expense Claim,Неплатен Expense Претенция
 DocType: Payment Entry,Paid Amount,Платената сума
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Разгледайте цикъла на продажбите
 DocType: Assessment Plan,Supervisor,Ръководител
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,На линия
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,На линия
 ,Available Stock for Packing Items,"Свободно фондова за артикули, Опаковки"
 DocType: Item Variant,Item Variant,Артикул вариант
 DocType: Assessment Result Tool,Assessment Result Tool,Оценка Резултати Tool
 DocType: BOM Scrap Item,BOM Scrap Item,BOM позиция за брак
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Подадените поръчки не могат да бъдат изтрити
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Подадените поръчки не могат да бъдат изтрити
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Баланса на сметката вече е в 'Дебит'. Не е позволено да задавате 'Балансът задължително трябва да бъде в Кребит'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Управление на качеството
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Позиция {0} е деактивирана
@@ -4263,7 +4352,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: тайминги конфликти с ред {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Позволете нивото на нулева стойност
 DocType: Training Event Employee,Invited,Поканен
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Множество намерени за служител {0} за дадените дати активни конструкции за заплати
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Множество намерени за служител {0} за дадените дати активни конструкции за заплати
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Gateway сметки за настройка.
 DocType: Employee,Employment Type,Тип заетост
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Дълготрайни активи
@@ -4275,7 +4364,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Известие (дни)
 DocType: Tax Rule,Sales Tax Template,Данъка върху продажбите - Шаблон
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,"Изберете артикули, за да запазите фактурата"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,"Изберете артикули, за да запазите фактурата"
 DocType: Employee,Encashment Date,Инкасо Дата
 DocType: Training Event,Internet,интернет
 DocType: Special Test Template,Special Test Template,Специален тестов шаблон
@@ -4284,7 +4373,7 @@
 DocType: Production Order,Planned Operating Cost,Планиран експлоатационни разходи
 DocType: Academic Term,Term Start Date,Условия - Начална дата
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Приложено Ви изпращаме {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Приложено Ви изпращаме {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Банково извлечение по Главна книга
 DocType: Job Applicant,Applicant Name,Заявител Име
 DocType: Authorization Rule,Customer / Item Name,Клиент / Име на артикул
@@ -4304,7 +4393,7 @@
 DocType: Guardian,Guardian Of ,пазител на
 DocType: Grading Scale Interval,Threshold,праг
 DocType: BOM Update Tool,Current BOM,Текущ BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Добави Сериен №
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Добави Сериен №
 DocType: Production Order Item,Available Qty at Source Warehouse,Налични количества в склада на източника
 apps/erpnext/erpnext/config/support.py +22,Warranty,Гаранция
 DocType: Purchase Invoice,Debit Note Issued,Дебитно известие - Издадено
@@ -4327,10 +4416,9 @@
 DocType: Account,Receivable,За получаване
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Не е позволено да се промени Доставчик като вече съществува поръчка
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Роля, която е оставена да се представят сделки, които надвишават кредитни лимити, определени."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Изберете артикули за Производство
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Магистър синхронизиране на данни, това може да отнеме известно време,"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Изберете артикули за Производство
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Магистър синхронизиране на данни, това може да отнеме известно време,"
 DocType: Item,Material Issue,Изписване на материал
-DocType: Hub Settings,Seller Description,Продавач Описание
 DocType: Employee Education,Qualification,Квалификация
 DocType: Item Price,Item Price,Елемент Цена
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Сапуни & почистващи препарати
@@ -4338,7 +4426,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,"""От време"" не може да бъде по-голямо отколкото на ""До време""."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Поръчан
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Продължи
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Продължи
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Ако е активирана, системата няма да актуализира полетата на вариантите от шаблона, но ще копира данните от посочените по-долу полета, докато прави нов вариант"
 DocType: Salary Detail,Component,Компонент
 DocType: Assessment Criteria,Assessment Criteria Group,Критерии за оценка Group
 DocType: Healthcare Settings,Patient Name By,Име на пациента по
@@ -4348,7 +4437,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Моля, въведете Приемане Role или одобряването на потребителя"
 DocType: Journal Entry,Write Off Entry,Въвеждане на отписване
 DocType: BOM,Rate Of Materials Based On,Курсове на материали на основата на
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Доставчик&gt; Тип доставчик
+DocType: Item Variant Settings,Do not Update Variants,Не актуализирайте вариантите
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Поддръжка Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Махнете отметката от всичко
 DocType: POS Profile,Terms and Conditions,Правила и условия
@@ -4357,7 +4446,7 @@
 DocType: Leave Block List,Applies to Company,Отнася се за Фирма
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,"Не може да се отмени, защото {0} съществуват операции за този материал"
 DocType: Employee Loan,Disbursement Date,Изплащане - Дата
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&quot;Получатели&quot; не са посочени
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&quot;Получатели&quot; не са посочени
 DocType: BOM Update Tool,Update latest price in all BOMs,Актуализирайте последната цена във всички спецификации
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Медицински запис
 DocType: Vehicle,Vehicle,Превозно средство
@@ -4372,14 +4461,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Оп / Олово%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Активи амортизации и баланси
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Сума {0} {1} прехвърля от {2} до {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Сума {0} {1} прехвърля от {2} до {3}
 DocType: Sales Invoice,Get Advances Received,Вземи Получени аванси
 DocType: Email Digest,Add/Remove Recipients,Добавяне / Премахване на Получатели
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Транзакцията не е разрешена срещу спряна поръчка за производство {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","За да зададете тази фискална година, като по подразбиране, щракнете върху &quot;По подразбиране&quot;"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Присъедини
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Присъедини
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Недостиг Количество
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
 DocType: Employee Loan,Repay from Salary,Погасяване от Заплата
 DocType: Leave Application,LAP/,LAP/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Искане за плащане срещу {0} {1} за количество {2}
@@ -4392,7 +4481,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Поръчка за продажба - позиция
 DocType: Salary Slip,Payment Days,Плащане Дни
 DocType: Patient,Dormant,спящ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Складове с деца възли не могат да бъдат превърнати в Леджър
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Складове с деца възли не могат да бъдат превърнати в Леджър
 DocType: BOM,Manage cost of operations,Управление на разходите за дейността
 DocType: Accounts Settings,Stale Days,Старши дни
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Когато някоя от проверени сделките се &quot;Изпратен&quot;, имейл изскачащ автоматично отваря, за да изпратите електронно писмо до свързаната с &quot;контакт&quot; в тази сделка, със сделката като прикачен файл. Потребителят може или не може да изпрати имейл."
@@ -4406,10 +4495,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Сериен № {0} е бил вече получен
 ,Requested Items To Be Transferred,Желани артикули да бъдат прехвърлени
 DocType: Expense Claim,Vehicle Log,Превозното средство - Журнал
-DocType: Purchase Invoice,Recurring Id,Повтарящо Id
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Наличие на треска (температура&gt; 38,5 ° С или поддържана температура&gt; 38 ° C / 100,4 ° F)"
 DocType: Customer,Sales Team Details,Търговски отдел - Детайли
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Изтриете завинаги?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Изтриете завинаги?
 DocType: Expense Claim,Total Claimed Amount,Общо заявена Сума
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Потенциалните възможности за продажби.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Невалиден {0}
@@ -4419,7 +4507,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Универсални Магазини
 ,Item Delivery Date,Дата на доставка на елемента
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Настройте своето училище в ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Настройте своето училище в ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Базовата ресто сума (Валута на компанията)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Няма счетоводни записвания за следните складове
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Записване на документа на първо място.
@@ -4431,13 +4519,12 @@
 DocType: Task,Is Milestone,Е Milestone
 DocType: Daily Work Summary,Email Sent To,"Писмо, изпратено до"
 DocType: Budget,Warn,Предупреждавай
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Наистина ли искате да се отпишете?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Всякакви други забележки, отбелязване на усилието, които трябва да отиде в регистрите."
 DocType: BOM,Manufacturing User,Потребител - производство
 DocType: Purchase Invoice,Raw Materials Supplied,Суровини - доставени
-DocType: Purchase Invoice,Recurring Print Format,Повтарящо Print Format
 DocType: C-Form,Series,Номерация
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Валутата на ценовата листа {0} трябва да бъде {1} или {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Добавяне на продукти
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Валутата на ценовата листа {0} трябва да бъде {1} или {2}
 DocType: Appraisal,Appraisal Template,Оценка Template
 DocType: Item Group,Item Classification,Класификация на позиция
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Мениджър Бизнес развитие
@@ -4451,7 +4538,7 @@
 DocType: Item Attribute Value,Attribute Value,Атрибут Стойност
 ,Itemwise Recommended Reorder Level,Itemwise Препоръчано Пренареждане Level
 DocType: Salary Detail,Salary Detail,Заплата Подробности
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Моля изберете {0} първо
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Моля изберете {0} първо
 DocType: Appointment Type,Physician,лекар
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Партида {0} на артикул {1} е изтекла.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Консултации
@@ -4462,7 +4549,7 @@
 DocType: Salary Detail,Default Amount,Сума по подразбиране
 DocType: Lab Test Template,Descriptive,описателен
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Складът не е открит в системата
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Резюме този месец
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Резюме този месец
 DocType: Quality Inspection Reading,Quality Inspection Reading,Проверка на качеството Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Замрази наличности по-стари от` трябва да бъде по-малък от %d дни.
 DocType: Tax Rule,Purchase Tax Template,Покупка Tax Template
@@ -4485,12 +4572,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Обучителни събития / резултати
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Натрупана амортизация към
 DocType: Sales Invoice,C-Form Applicable,Cи-форма приложима
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Операция - времето трябва да е по-голямо от 0 за операция {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Операция - времето трябва да е по-голямо от 0 за операция {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Склад е задължителен
 DocType: Supplier,Address and Contacts,Адрес и контакти
 DocType: UOM Conversion Detail,UOM Conversion Detail,Мерна единица - превръщане - детайли
 DocType: Program,Program Abbreviation,програма Съкращение
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Производство на поръчката не може да бъде повдигнато срещу т Template
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Производство на поръчката не може да бъде повдигнато срещу т Template
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Такси се обновяват на изкупните Квитанция за всяка стока
 DocType: Warranty Claim,Resolved By,Разрешен от
 DocType: Bank Guarantee,Start Date,Начална Дата
@@ -4516,26 +4603,27 @@
 DocType: Employee,Educational Qualification,Образователно-квалификационна
 DocType: Workstation,Operating Costs,Оперативни разходи
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Действие в случай, че сумарния месечен Бюджет е превишен"
-DocType: Purchase Invoice,Submit on creation,Подаване на създаване
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Валутна за {0} трябва да е {1}
+DocType: Subscription,Submit on creation,Подаване на създаване
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Валутна за {0} трябва да е {1}
 DocType: Asset,Disposal Date,Отписване - Дата
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Имейли ще бъдат изпратени на всички активни служители на компанията в даден час, ако те не разполагат с почивка. Обобщение на отговорите ще бъдат изпратени в полунощ."
 DocType: Employee Leave Approver,Employee Leave Approver,Служител одобряващ отпуски
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Един запис Пренареждане вече съществува за този склад {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Не може да се обяви като загубена, защото е направена оферта."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,обучение Обратна връзка
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Един запис Пренареждане вече съществува за този склад {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Не може да се обяви като загубена, защото е направена оферта."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,обучение Обратна връзка
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Производство Поръчка {0} трябва да бъде представено
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Критерии за таблицата с показателите за доставчиците
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Моля изберете Начална дата и крайна дата за позиция {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Курс е задължителен на ред {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Към днешна дата не може да бъде преди от дата
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Добавяне / Редактиране на цените
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Добавяне / Редактиране на цените
 DocType: Batch,Parent Batch,Родителска партида
 DocType: Cheque Print Template,Cheque Print Template,Чек шаблони за печат
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Списък на Разходни центрове
 DocType: Lab Test Template,Sample Collection,Колекция от проби
 ,Requested Items To Be Ordered,Заявени продукти за да поръчка
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Моите поръчки
 DocType: Price List,Price List Name,Ценоразпис Име
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Ежедневната работа Обобщение за {0}
 DocType: Employee Loan,Totals,Общо
@@ -4554,12 +4642,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,"{0} единици от {1} са необходими в {2} на {3} {4} за {5}, за да завършите тази транзакция."
 DocType: Fee Schedule,Student Category,Student Категория
 DocType: Announcement,Student,Студент
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Организация единица (отдел) майстор.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Организация единица (отдел) майстор.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Отидете в Стаите
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Моля, въведете съобщение, преди да изпратите"
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,КОПИЕ ЗА ДОСТАВЧИКА
 DocType: Email Digest,Pending Quotations,До цитати
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,POS профил
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,POS профил
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Конфигурации на лабораторни тестове.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Необезпечени кредити
 DocType: Cost Center,Cost Center Name,Разходен център - Име
@@ -4569,6 +4657,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,"Общата сума, изплатена Amt"
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,"Съобщения по-големи от 160 знака, ще бъдат разделени на няколко съобщения"
 DocType: Purchase Receipt Item,Received and Accepted,Получена и приета
+DocType: Hub Settings,Company and Seller Profile,Профил на фирмата и продавача
 ,GST Itemised Sales Register,GST Подробен регистър на продажбите
 ,Serial No Service Contract Expiry,Сериен № - Договор за услуги - Дата на изтичане
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Вие не можете да кредитирате и дебитирате същия акаунт едновременно
@@ -4578,10 +4667,11 @@
 DocType: Item,Variant Based On,Вариант на базата на
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Общо weightage определен да бъде 100%. Това е {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Вашите доставчици
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,"Моля, поправете"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Не може да се определи като загубена тъй като поръчка за продажба е направена.
 DocType: Request for Quotation Item,Supplier Part No,Доставчик Част номер
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Не може да се приспадне при категория е за &quot;оценка&quot; или &quot;Vaulation и Total&quot;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Получени от
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Получени от
 DocType: Lead,Converted,Преобразуван
 DocType: Item,Has Serial No,Има сериен номер
 DocType: Employee,Date of Issue,Дата на издаване
@@ -4589,7 +4679,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Както е описано в Настройки за купуване, ако се изисква изискване за покупка == &quot;ДА&quot;, за да се създаде фактура за покупка, потребителят трябва първо да създаде разписка за покупка за елемент {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Row # {0}: Определете доставчик за т {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Row {0}: Часове стойност трябва да е по-голяма от нула.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,"Сайт на снимката {0}, прикрепена към т {1} не може да бъде намерена"
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,"Сайт на снимката {0}, прикрепена към т {1} не може да бъде намерена"
 DocType: Issue,Content Type,Съдържание Тип
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Компютър
 DocType: Item,List this Item in multiple groups on the website.,Списък този продукт в няколко групи в сайта.
@@ -4600,14 +4690,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Вземи неизравнени записвания
 DocType: Payment Reconciliation,From Invoice Date,От Дата на фактура
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Нямате разрешение за изпращане
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,Валутата за фактуриране трябва да бъде същата като валута на фирмата или на клиентската сметка
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Валутата за фактуриране трябва да бъде същата като валута на фирмата или на клиентската сметка
 DocType: Healthcare Settings,Laboratory Settings,Лабораторни настройки
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Оставете Инкасо
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Какво прави?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,До склад
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Всички Учебен
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Какво прави?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,До склад
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Всички Учебен
 ,Average Commission Rate,Средна Комисията Курсове
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,'Има сериен номер' не може да бъде 'Да' за нескладируеми стоки
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,'Има сериен номер' не може да бъде 'Да' за нескладируеми стоки
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Изберете Статус
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Присъствие не може да бъде маркиран за бъдещи дати
 DocType: Pricing Rule,Pricing Rule Help,Ценообразуване Правило Помощ
@@ -4625,40 +4715,40 @@
 DocType: Item,Customer Code,Клиент - Код
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Напомняне за рожден ден за {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дни след последната поръчка
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Дебит на сметка трябва да бъде балансова сметка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Дебит на сметка трябва да бъде балансова сметка
 DocType: Buying Settings,Naming Series,Поредни Номера
 DocType: Leave Block List,Leave Block List Name,Оставете Block List Име
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Застраховка Начална дата трябва да бъде по-малка от застраховка Крайна дата
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,"Моля, настройте системата за назначаване на инструктори в училище&gt; Училищни настройки"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Наличност на Активи
 DocType: Timesheet,Production Detail,Производство - детайли
+DocType: Restaurant,Active Menu,Активно меню
 DocType: Target Detail,Target Qty,Целево Количество
 DocType: Shopping Cart Settings,Checkout Settings,Поръчка - Настройки
 DocType: Attendance,Present,Настояще
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Складова разписка {0} не трябва да бъде подадена
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Складова разписка {0} не трябва да бъде подадена
 DocType: Notification Control,Sales Invoice Message,Съобщение - Фактура за продажба
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Закриване на профила {0} трябва да е от тип Отговорност / Equity
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Заплата поднасяне на служител {0} вече е създаден за времето лист {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Заплата поднасяне на служител {0} вече е създаден за времето лист {1}
 DocType: Vehicle Log,Odometer,одометър
 DocType: Sales Order Item,Ordered Qty,Поръчано Количество
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Точка {0} е деактивирана
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Точка {0} е деактивирана
 DocType: Stock Settings,Stock Frozen Upto,Фондова Frozen Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM не съдържа материали / стоки
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Дейността на проект / задача.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM не съдържа материали / стоки
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Дейността на проект / задача.
 DocType: Vehicle Log,Refuelling Details,Зареждане с гориво - Детайли
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Генериране на фишове за заплати
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Купуването трябва да се провери, ако е маркирано като {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Отстъпката трябва да е по-малко от 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Курс при последна покупка не е намерен
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Сума за отписване (фирмена валута)
 DocType: Sales Invoice Timesheet,Billing Hours,Фактурирани часове
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,BOM по подразбиране за {0} не е намерен
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,"Row # {0}: Моля, задайте повторна поръчка количество"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM по подразбиране за {0} не е намерен
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,"Row # {0}: Моля, задайте повторна поръчка количество"
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,"Докоснете елементи, за да ги добавите тук"
 DocType: Fees,Program Enrollment,програма за записване
 DocType: Landed Cost Voucher,Landed Cost Voucher,Поземлен Cost Ваучер
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Моля, задайте {0}"
-DocType: Purchase Invoice,Repeat on Day of Month,Повторете в ден от месеца
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} е неактивен студент
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} е неактивен студент
 DocType: Employee,Health Details,Здравни Детайли
 DocType: Offer Letter,Offer Letter Terms,Оферта Писмо Условия
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,"За да създадете референтен документ за искане за плащане, се изисква"
@@ -4666,7 +4756,6 @@
 DocType: Employee External Work History,Salary,Заплата
 DocType: Serial No,Delivery Document Type,Тип документ за Доставка
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Знаете всички фишове за заплати за над избрани критерии
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} артикули са синхронизирани
 DocType: Sales Order,Partly Delivered,Частично Доставени
 DocType: Email Digest,Receivables,Вземания
 DocType: Lead Source,Lead Source,Потенциален клиент - Източник
@@ -4687,19 +4776,19 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Застаряването на населението Range 2
 DocType: SG Creation Tool Course,Max Strength,Максимална здравина
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM заменя
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Изберете Елементи въз основа на Дата на доставка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Изберете Елементи въз основа на Дата на доставка
 ,Sales Analytics,Анализ на продажбите
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Налични {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Налични {0}
 ,Prospects Engaged But Not Converted,"Перспективи, ангажирани, но не преобразувани"
 DocType: Manufacturing Settings,Manufacturing Settings,Настройки производство
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Настройване на Email
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Mobile Не
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,"Моля, въведете подразбиране валута през Company магистър"
 DocType: Stock Entry Detail,Stock Entry Detail,Склад за вписване Подробности
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Дневни Напомняния
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Дневни Напомняния
 DocType: Products Settings,Home Page is Products,Начална страница е Продукти
 ,Asset Depreciation Ledger,Asset Амортизация Леджър
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Данъчно правило противоречи с {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Данъчно правило противоречи с {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Нова сметка - Име
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Цена на доставени суровини
 DocType: Selling Settings,Settings for Selling Module,Настройки на модул - Продажба
@@ -4713,8 +4802,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Позиция {0} трябва да бъде позиция със следене на наличности
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Склад за незав.производство по подразбиране
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Настройките по подразбиране за счетоводни операции.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Моля, настройте система за наименуване на служители в Човешки ресурси&gt; Настройки за персонала"
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Очаквана дата не може да бъде преди Материал Заявка Дата
+DocType: Restaurant,Default Tax Template,Стандартен данъчен шаблон
 DocType: Fees,Student Details,Студентски детайли
 DocType: Purchase Invoice Item,Stock Qty,Коефициент на запас
 DocType: Employee Loan,Repayment Period in Months,Възстановяването Период в месеци
@@ -4732,8 +4822,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Отидете на елементи
 DocType: Sales Partner,Partner Type,Тип родител
 DocType: Purchase Taxes and Charges,Actual,Действителен
+DocType: Restaurant Menu,Restaurant Manager,Мениджър на ресторант
 DocType: Authorization Rule,Customerwise Discount,Отстъпка на ниво клиент
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,График за изпълнение на задачите.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,График за изпълнение на задачите.
 DocType: Purchase Invoice,Against Expense Account,Срещу Разходна Сметка
 DocType: Production Order,Production Order,Поръчка за производство
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Монтаж - Забележка {0} вече е била изпратена
@@ -4741,7 +4832,6 @@
 DocType: Quotation Item,Against Docname,Срещу Документ
 DocType: SMS Center,All Employee (Active),All Employee (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Вижте сега
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Изберете периода, когато фактурата ще бъде генериран автоматично"
 DocType: BOM,Raw Material Cost,Разходи за суровини
 DocType: Item Reorder,Re-Order Level,Re-Поръчка Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Въведете предмети и планирано Количество, за които искате да се повиши производствените поръчки или да изтеглите суровини за анализ."
@@ -4754,23 +4844,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Тип на отчета е задължително
 DocType: Item,Serial Number Series,Сериен номер Series
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Изисква се склад за артикул {0} на ред {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Добавяне на програми
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Търговия на дребно и едро
 DocType: Issue,First Responded On,Първо отговорили на
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Обява на артикул в няколко групи
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фискална година Начални дата и фискална година Крайна дата вече са определени в Фискална година {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Дата на клирънсът е актуализирана
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Разделна партида
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Разделна партида
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Успешно съгласувани
 DocType: Request for Quotation Supplier,Download PDF,Изтегляне на PDF
 DocType: Production Order,Planned End Date,Планирана Крайна дата
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,"Моля, въведете график Дата"
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Когато елементите са съхранени.
 DocType: Request for Quotation,Supplier Detail,Доставчик - детайли
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Грешка във формула или състояние: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Грешка във формула или състояние: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Фактурирана сума
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Теглата на критериите трябва да достигнат до 100%
 DocType: Attendance,Attendance,Посещаемост
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,Артикулите за наличност
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,Артикулите за наличност
 DocType: BOM,Materials,Материали
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ако не се проверява, списъкът ще трябва да бъдат добавени към всеки отдел, където тя трябва да се приложи."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Източник и целеви склад не може да бъде един и същ
@@ -4788,6 +4878,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,На Net Общо
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Цена Умение {0} трябва да бъде в интервала от {1} до {2} в стъпките на {3} за т {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Целеви склад в ред {0} трябва да е същият като в производствената поръчка
+DocType: Restaurant Reservation,Waitlisted,Waitlisted
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,"Валутна не може да се промени, след като записи с помощта на някои друга валута"
 DocType: Vehicle Service,Clutch Plate,Съединител Плейт
 DocType: Company,Round Off Account,Закръгляне - Акаунт
@@ -4804,7 +4895,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Нов отговорник за продажби - Име
 DocType: Packing Slip,Gross Weight UOM,Бруто тегло мерна единица
 DocType: Delivery Note Item,Against Sales Invoice,Срещу фактура за продажба
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,"Моля, въведете серийни номера за сериализирани елементи"
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,"Моля, въведете серийни номера за сериализирани елементи"
 DocType: Bin,Reserved Qty for Production,Резервирано Количество за производство
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Оставете без отметка, ако не искате да разгледате партида, докато правите курсови групи."
 DocType: Asset,Frequency of Depreciation (Months),Честота на амортизация (месеца)
@@ -4815,7 +4906,7 @@
 DocType: Lab Test,Test Group,Тестова група
 DocType: Payment Reconciliation,Receivable / Payable Account,Вземания / дължими суми Акаунт
 DocType: Delivery Note Item,Against Sales Order Item,Срещу ред от поръчка за продажба
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},"Моля, посочете Умение Цена атрибут {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},"Моля, посочете Умение Цена атрибут {0}"
 DocType: Item,Default Warehouse,Склад по подразбиране
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Бюджетът не може да бъде назначен срещу Group Account {0}
 DocType: Healthcare Settings,Patient Registration,Регистриране на пациента
@@ -4844,6 +4935,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Търговец
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Бюджет и Разходен център
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Не е разрешен няколко начина на плащане по подразбиране
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,за
 ,Appointment Analytics,Анализ за назначаване
 DocType: Vehicle Service,Half Yearly,Полугодишна
 DocType: Lead,Blog Subscriber,Блог - Абонат
@@ -4861,7 +4953,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Брой на квотите
 ,BOM Stock Report,BOM Доклад за наличност
 DocType: Stock Reconciliation Item,Quantity Difference,Количествена разлика
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Обработка на заплати
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Обработка на заплати
 DocType: Opportunity Item,Basic Rate,Основен курс
 DocType: GL Entry,Credit Amount,Кредитна сметка
 DocType: Cheque Print Template,Signatory Position,подписалите Позиция
@@ -4875,12 +4967,12 @@
 DocType: Tax Rule,Tax Rule,Данъчна Правило
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Поддържане и съща ставка През Продажби Cycle
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Планирайте времето трупи извън Workstation работно време.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Клиентите на опашката
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Д-р {0} няма Програма за лекари. Добавете го в главния лекар
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Клиентите на опашката
 DocType: Student,Nationality,националност
 ,Items To Be Requested,Позиции които да бъдат поискани
-DocType: Purchase Order,Get Last Purchase Rate,Вземи курс от последна покупка
 DocType: Company,Company Info,Информация за компанията
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Изберете или добавите нов клиент
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Изберете или добавите нов клиент
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,"Разходен център е необходим, за да осчетоводите разход"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Прилагане на средства (активи)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Това се основава на присъствието на този служител
@@ -4888,6 +4980,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Дебит сметка
 DocType: Fiscal Year,Year Start Date,Година Начална дата
 DocType: Attendance,Employee Name,Служител Име
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Рекламен елемент за поръчка на ресторант
 DocType: Sales Invoice,Rounded Total (Company Currency),Общо закръглено (фирмена валута)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Не може да се покров Group, защото е избран типа на профила."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,"{0} {1} е променен. Моля, опреснете."
@@ -4898,6 +4991,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Доходи на наети лица
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Опакованото количество трябва да е равно на количество за артикул {0} на ред {1}
 DocType: Production Order,Manufactured Qty,Произведено Количество
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Създадена е фактура
 DocType: Purchase Receipt Item,Accepted Quantity,Прието Количество
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},"Моля, задайте по подразбиране Holiday Списък на служителите {0} или Фирма {1}"
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} не съществува
@@ -4907,18 +5001,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row Не {0}: сума не може да бъде по-голяма, отколкото До сума срещу Expense претенция {1}. До сума е {2}"
 DocType: Maintenance Schedule,Schedule,Разписание
 DocType: Account,Parent Account,Родител Акаунт
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Наличен
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Наличен
 DocType: Quality Inspection Reading,Reading 3,Четене 3
 ,Hub,Главина
 DocType: GL Entry,Voucher Type,Тип Ваучер
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Ценоразписът не е намерен или е деактивиран
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Ценоразписът не е намерен или е деактивиран
 DocType: Lab Test,Approved,Одобрен
 DocType: Pricing Rule,Price,Цена
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',Служител облекчение на {0} трябва да се зададе като &quot;Ляв&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Служител облекчение на {0} трябва да се зададе като &quot;Ляв&quot;
+DocType: Hub Settings,Last Sync On,Последно синхронизиране включено
 DocType: Guardian,Guardian,пазач
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Оценка {0} е създадена за Employee {1} в даден период от време
 DocType: Employee,Education,Образование
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Дел
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,Дел
 DocType: Selling Settings,Campaign Naming By,Задаване на име на кампания
 DocType: Employee,Current Address Is,Настоящият адрес е
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Месечна цел за продажби (
@@ -4933,7 +5028,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Код на курса:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,"Моля, въведете Expense Account"
 DocType: Account,Stock,Наличност
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row {0}: Референтен Document Type трябва да бъде един от поръчка за покупка, покупка на фактура или вестник Влизане"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row {0}: Референтен Document Type трябва да бъде един от поръчка за покупка, покупка на фактура или вестник Влизане"
 DocType: Employee,Current Address,Настоящ Адрес
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ако елемент е вариант на друга позиция след това описание, изображение, ценообразуване, данъци и т.н., ще бъдат определени от шаблона, освен ако изрично е посочено"
 DocType: Serial No,Purchase / Manufacture Details,Покупка / Производство Детайли
@@ -4964,7 +5059,7 @@
 DocType: Hub Settings,Hub Settings,Настройки Hub
 DocType: Project,Gross Margin %,Брутна печалба %
 DocType: BOM,With Operations,С операции
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Счетоводни записи вече са направени във валута {0} за компанията {1}. Моля изберете вземания или платима сметка с валута {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Счетоводни записи вече са направени във валута {0} за компанията {1}. Моля изберете вземания или платима сметка с валута {0}.
 DocType: Asset,Is Existing Asset,Е съществуваща дълготр.актив
 DocType: Salary Detail,Statistical Component,Статистически компонент
 DocType: Warranty Claim,If different than customer address,Ако е различен от адреса на клиента
@@ -4972,13 +5067,14 @@
 DocType: BOM Operation,BOM Operation,BOM Операция
 DocType: Purchase Taxes and Charges,On Previous Row Amount,На предишния ред Сума
 DocType: Student,Home Address,Начален адрес
+DocType: Item,Has Expiry Date,Има дата на изтичане
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Настройки на варианта на елемента.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Прехвърляне на активи
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,Прехвърляне на активи
 DocType: POS Profile,POS Profile,POS профил
 DocType: Training Event,Event Name,Име на събитието
 DocType: Physician,Phone (Office),Телефон (офис)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,Прием
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Прием за {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,Прием
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Прием за {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Сезонността за определяне на бюджетите, цели и т.н."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Име на променливата
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Позиция {0} е шаблон, моля изберете една от неговите варианти"
@@ -4987,7 +5083,7 @@
 DocType: Assessment Plan,Room,Стая
 DocType: Purchase Order,Advance Paid,Авансово изплатени суми
 DocType: Item,Item Tax,Позиция - Данък
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Материал на доставчик
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Материал на доставчик
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Акцизите Invoice
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Праг за {0}% се появява повече от веднъж
 DocType: Expense Claim,Employees Email Id,Служители Email Id
@@ -4998,32 +5094,30 @@
 DocType: Program,Program Name,програма Наименование
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Помислете за данък или такса за
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Действително Количество е задължително
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} понастоящем има {1} карта на Доставчика за покупки и поръчките за покупка на този доставчик трябва да се издават с повишено внимание.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} понастоящем има {1} карта на Доставчика за покупки и поръчките за покупка на този доставчик трябва да се издават с повишено внимание.
 DocType: Employee Loan,Loan Type,Вид на кредита
 DocType: Scheduling Tool,Scheduling Tool,Scheduling Tool
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Кредитна Карта
 DocType: BOM,Item to be manufactured or repacked,Т да се произвеждат или преопаковани
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Настройките по подразбиране транзакции със стоки.
-DocType: Purchase Invoice,Next Date,Следващата дата
 DocType: Employee Education,Major/Optional Subjects,Основни / избираеми предмети
 DocType: Sales Invoice Item,Drop Ship,Капка Корабно
+DocType: Hub Settings,Suspended,окачен
 DocType: Training Event,Attendees,Присъстващи
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Тук можете да поддържат семейните детайли като името и професията на майка, съпруга и деца"
 DocType: Academic Term,Term End Date,Условия - Крайна дата
-DocType: Hub Settings,Seller Name,Продавач Име
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Данъци и такси - Удръжки (фирмена валута)
 DocType: Item Group,General Settings,Основни настройки
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,От Валута и да валути не могат да бъдат едни и същи
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Добавете инструктори
 DocType: Stock Entry,Repack,Опаковайте
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,"Вие трябва да запазите формата, преди да продължите"
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,"Моля, първо изберете фирмата"
 DocType: Item Attribute,Numeric Values,Числови стойности
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Прикрепете Logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,запасите
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,запасите
 DocType: Customer,Commission Rate,Комисионен Курс
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Създадохте {0} scorecards за {1} между:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Направи вариант
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Направи вариант
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Блокиране на молби за отсъствия по отдел.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Вид на плащане трябва да бъде един от получаване, плащане или вътрешен трансфер"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,анализ
@@ -5038,11 +5132,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Капитал
 DocType: Shopping Cart Settings,Show Public Attachments,Показване на публичните прикачени файлове
 DocType: Packing Slip,Package Weight Details,Тегло на пакет - Детайли
+DocType: Restaurant Reservation,Reservation Time,Време за резервация
 DocType: Payment Gateway Account,Payment Gateway Account,Плащане Портал Акаунт
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,След плащане завършване пренасочи потребителското към избраната страница.
 DocType: Company,Existing Company,Съществуващите Company
 DocType: Healthcare Settings,Result Emailed,Резултатът е изпратен по имейл
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","Категорията &quot;Данъци&quot; е променена на &quot;Общо&quot;, тъй като всички теми са неакции"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код на елемента&gt; Група на елементите&gt; Марка
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Моля изберете файл CSV
 DocType: Student Leave Application,Mark as Present,Маркирай като настояще
 DocType: Supplier Scorecard,Indicator Color,Цвят на индикатора
@@ -5067,11 +5163,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Направи Student Batch
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Е пренасяне
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Вземи позициите от BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Вземи позициите от BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Време за въвеждане - Дни
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row {0}: Публикуване Дата трябва да е същото като датата на покупка {1} на актив {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Проверете това, ако студентът пребивава в хостел на института."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Моля, въведете Поръчки за продажби в таблицата по-горе"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Моля, въведете Поръчки за продажби в таблицата по-горе"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Не е изпратен фиш за заплата
 ,Stock Summary,фондова Резюме
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Прехвърляне на актив от един склад в друг
@@ -5087,5 +5183,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: дебитна не може да бъде свързана с {1}
 DocType: Journal Entry,Subscription Section,Абонаментна секция
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Сметка {0} не съществува
+DocType: Training Event,Training Program,Програма за обучение
 DocType: Account,Cash,Каса (Пари в брой)
 DocType: Employee,Short biography for website and other publications.,Кратка биография за уебсайт и други публикации.
diff --git a/erpnext/translations/bn.csv b/erpnext/translations/bn.csv
index 0d37698..fd79c56 100644
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,বেতন মোড
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,নিবন্ধন
 DocType: Patient,Divorced,তালাকপ্রাপ্ত
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,আইটেম ইতিমধ্যে সিঙ্ক
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,আইটেম একটি লেনদেনের মধ্যে একাধিক বার যুক্ত করা সম্ভব
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,উপাদান যান {0} এই পাটা দাবি বাতিল আগে বাতিল
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,ভোগ্যপণ্য
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Approvers ত্যাগ
 DocType: Sales Partner,Dealer,ব্যাপারী
 DocType: Consultation,Investigations,তদন্ত
+DocType: Restaurant Order Entry,Click Enter To Add,যোগ করতে এন্টার ক্লিক করুন
 DocType: Employee,Rented,ভাড়াটে
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,ব্যবহারকারী জন্য প্রযোজ্য
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","থামানো উৎপাদন অর্ডার বাতিল করা যাবে না, বাতিল করতে এটি প্রথম দুর"
 DocType: Vehicle Service,Mileage,যত মাইল দীর্ঘ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,আপনি কি সত্যিই এই সম্পদ স্ক্র্যাপ করতে চান?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,আপনি কি সত্যিই এই সম্পদ স্ক্র্যাপ করতে চান?
 DocType: Drug Prescription,Update Schedule,আপডেট সূচি
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,নির্বাচন ডিফল্ট সরবরাহকারী
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},মুদ্রাটির মূল্য তালিকা জন্য প্রয়োজন {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,গ্রহণযোগ্যতা যাচাই
 DocType: Job Applicant,Job Applicant,কাজ আবেদনকারী
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,এই সরবরাহকারী বিরুদ্ধে লেনদেনের উপর ভিত্তি করে তৈরি. বিস্তারিত জানার জন্য নিচের টাইমলাইনে দেখুন
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,কোন ফলাফল.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,আইনগত
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},প্রকৃত টাইপ ট্যাক্স সারিতে আইটেম রেট অন্তর্ভুক্ত করা যাবে না {0}
 DocType: Bank Guarantee,Customer,ক্রেতা
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),এক্সচেঞ্জ রেট হিসাবে একই হতে হবে {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ক্রেতার নাম
 DocType: Vehicle,Natural Gas,প্রাকৃতিক গ্যাস
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},ব্যাংক অ্যাকাউন্ট হিসেবে নামকরণ করা যাবে না {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},ব্যাংক অ্যাকাউন্ট হিসেবে নামকরণ করা যাবে না {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"প্রধান (বা গ্রুপ), যার বিরুদ্ধে হিসাব থেকে তৈরি করা হয় এবং উদ্বৃত্ত বজায় রাখা হয়."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),বিশিষ্ট {0} হতে পারে না শূন্য কম ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,প্রসারিত করতে কোন জমা বেতন স্লিপ আছে।
 DocType: Manufacturing Settings,Default 10 mins,10 মিনিট ডিফল্ট
 DocType: Leave Type,Leave Type Name,প্রকার নাম ত্যাগ
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,খোলা দেখাও
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,উপরে উল্লিখিত পুনরাবৃত্তির জন্য নিজেই আজ এই পদক্ষেপ নেওয়া প্রয়োজন
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,সিরিজ সফলভাবে আপডেট
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,চেকআউট
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural জার্নাল এন্ট্রি জমা
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,ক্রয় আদেশ আইটেম গ্রহন করা
 DocType: SMS Center,All Supplier Contact,সমস্ত সরবরাহকারী যোগাযোগ
 DocType: Support Settings,Support Settings,সাপোর্ট সেটিং
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,সমাপ্তি প্রত্যাশিত তারিখ প্রত্যাশিত স্টার্ট জন্ম কম হতে পারে না
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,সমাপ্তি প্রত্যাশিত তারিখ প্রত্যাশিত স্টার্ট জন্ম কম হতে পারে না
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,সারি # {0}: হার হিসাবে একই হতে হবে {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,নিউ ছুটি আবেদন
 ,Batch Item Expiry Status,ব্যাচ আইটেম মেয়াদ শেষ হওয়ার স্থিতি
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,ব্যাংক খসড়া
 DocType: Mode of Payment Account,Mode of Payment Account,পেমেন্ট একাউন্ট এর মোড
 DocType: Consultation,Consultation,পরামর্শ
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,বিক্রয় এবং রিটার্নস
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,দেখান রুপভেদ
 DocType: Academic Term,Academic Term,একাডেমিক টার্ম
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,উপাদান
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,স্বাস্থ্যের যত্ন
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),পেমেন্ট মধ্যে বিলম্ব (দিন)
 DocType: Lab Prescription,Lab Prescription,ল্যাব প্রেসক্রিপশন
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,মূল্য অনুসারে সাজান
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,পরিষেবা ব্যায়ের
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},ক্রমিক সংখ্যা: {0} ইতিমধ্যে বিক্রয় চালান উল্লেখ করা হয়: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,চালান
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},ক্রমিক সংখ্যা: {0} ইতিমধ্যে বিক্রয় চালান উল্লেখ করা হয়: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,চালান
 DocType: Maintenance Schedule Item,Periodicity,পর্যাবৃত্তি
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,অর্থবছরের {0} প্রয়োজন বোধ করা হয়
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,প্রতিরক্ষা
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,সারি # {0}:
 DocType: Timesheet,Total Costing Amount,মোট খোয়াতে পরিমাণ
 DocType: Delivery Note,Vehicle No,যানবাহন কোন
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,মূল্য তালিকা নির্বাচন করুন
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,মূল্য তালিকা নির্বাচন করুন
 DocType: Accounts Settings,Currency Exchange Settings,মুদ্রা বিনিময় সেটিংস
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,সারি # {0}: পেমেন্ট ডকুমেন্ট trasaction সম্পন্ন করার জন্য প্রয়োজন বোধ করা হয়
 DocType: Production Order Operation,Work In Progress,কাজ চলছে
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,দয়া করে তারিখ নির্বাচন
 DocType: Employee,Holiday List,ছুটির তালিকা
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,দয়া করে স্কুলে শিক্ষক নামকরণ পদ্ধতি সেটআপ করুন&gt; স্কুল সেটিংস
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,হিসাবরক্ষক
+DocType: Hub Settings,Selling Price List,মূল্য তালিকা বিক্রি
 DocType: Patient,Tobacco Current Use,তামাক বর্তমান ব্যবহার
 DocType: Cost Center,Stock User,স্টক ইউজার
 DocType: Company,Phone No,ফোন নম্বর
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,কোর্স সূচী সৃষ্টি
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},নতুন {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},নতুন {0}: # {1}
 ,Sales Partners Commission,সেলস পার্টনার্স কমিশন
 DocType: Purchase Invoice,Rounding Adjustment,রাউন্ডিং সামঞ্জস্য
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,অধিক 5 অক্ষর থাকতে পারে না সমাহার
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,মূল বিস্তারিত docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","রেফারেন্স: {0}, আইটেম কোড: {1} এবং গ্রাহক: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,কেজি
-DocType: Student Log,Log,লগিন
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,একটি কাজের জন্য খোলা.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} ফলাফল জমা দেওয়া হয়েছে
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} ফলাফল জমা দেওয়া হয়েছে
 DocType: Item Attribute,Increment,বৃদ্ধি
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Timespan
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,ওয়ারহাউস নির্বাচন ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,বিবাহিত
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},অনুমোদিত নয় {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,থেকে আইটেম পান
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},শেয়ার হুণ্ডি বিরুদ্ধে আপডেট করা যাবে না {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},শেয়ার হুণ্ডি বিরুদ্ধে আপডেট করা যাবে না {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},প্রোডাক্ট {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,তালিকাভুক্ত কোনো আইটেম
 DocType: Payment Reconciliation,Reconcile,মিলনসাধন করা
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,অবসর বৃত্তি পেনশন ভাতা তহবিল
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,পরবর্তী অবচয় তারিখ আগে ক্রয়ের তারিখ হতে পারে না
 DocType: Consultation,Consultation Date,পরামর্শ তারিখ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNext ব্যবহারকারীদের জন্য পণ্য তালিকা এবং আবিষ্কার
 DocType: SMS Center,All Sales Person,সব বিক্রয় ব্যক্তি
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** মাসিক বিতরণ ** আপনি যদি আপনার ব্যবসার মধ্যে ঋতু আছে আপনি মাস জুড়ে বাজেট / উদ্দিষ্ট বিতরণ করতে সাহায্য করে.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,না আইটেম পাওয়া যায়নি
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,বেতন কাঠামো অনুপস্থিত
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,না আইটেম পাওয়া যায়নি
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,বেতন কাঠামো অনুপস্থিত
 DocType: Lead,Person Name,ব্যক্তির নাম
 DocType: Sales Invoice Item,Sales Invoice Item,বিক্রয় চালান আইটেম
 DocType: Account,Credit,জমা
 DocType: POS Profile,Write Off Cost Center,খরচ কেন্দ্র বন্ধ লিখুন
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""","যেমন, &quot;প্রাথমিক স্কুল&quot; বা &quot;বিশ্ববিদ্যালয়&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""","যেমন, &quot;প্রাথমিক স্কুল&quot; বা &quot;বিশ্ববিদ্যালয়&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,স্টক রিপোর্ট
 DocType: Warehouse,Warehouse Detail,ওয়ারহাউস বিস্তারিত
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},ক্রেডিট সীমা গ্রাহকের জন্য পার হয়েছে {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,টার্ম শেষ তারিখ পরে একাডেমিক ইয়ার বছর শেষ তারিখ যা শব্দটি সংযুক্ত করা হয় না হতে পারে (শিক্ষাবর্ষ {}). তারিখ সংশোধন করে আবার চেষ্টা করুন.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",", অবারিত হতে পারে না যেমন অ্যাসেট রেকর্ড আইটেমটি বিরুদ্ধে বিদ্যমান &quot;ফিক্সড সম্পদ&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",", অবারিত হতে পারে না যেমন অ্যাসেট রেকর্ড আইটেমটি বিরুদ্ধে বিদ্যমান &quot;ফিক্সড সম্পদ&quot;"
 DocType: Vehicle Service,Brake Oil,ব্রেক অয়েল
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গোষ্ঠী&gt; টেরিটরি
 DocType: Tax Rule,Tax Type,ট্যাক্স ধরন
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,করযোগ্য অর্থ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},আপনি আগে এন্ট্রি যোগ করতে অথবা আপডেট করার জন্য অনুমতিপ্রাপ্ত নন {0}
 DocType: BOM,Item Image (if not slideshow),আইটেম ইমেজ (ছবি না হলে)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,একটি গ্রাহক এই একই নামের
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ঘন্টা হার / ৬০) * প্রকৃত অপারেশন টাইম
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,সারি # {0}: রেফারেন্স দস্তাবেজ প্রকার ব্যয় দাবি বা জার্নাল এন্ট্রি এক হতে হবে
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,BOM নির্বাচন
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,সারি # {0}: রেফারেন্স দস্তাবেজ প্রকার ব্যয় দাবি বা জার্নাল এন্ট্রি এক হতে হবে
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,BOM নির্বাচন
 DocType: SMS Log,SMS Log,এসএমএস লগ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,বিতরণ আইটেম খরচ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,এ {0} ছুটির মধ্যে তারিখ থেকে এবং তারিখ থেকে নয়
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,কর্মচারী ঋণ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,কার্য বিবরণ:
 DocType: Fee Schedule,Send Payment Request Email,পেমেন্ট অনুরোধ ইমেইল পাঠান
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,{0} আইটেম সিস্টেমে কোন অস্তিত্ব নেই অথবা মেয়াদ শেষ হয়ে গেছে
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,{0} আইটেম সিস্টেমে কোন অস্তিত্ব নেই অথবা মেয়াদ শেষ হয়ে গেছে
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,আবাসন
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,অ্যাকাউন্ট বিবৃতি
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ফার্মাসিউটিক্যালস
@@ -210,17 +213,22 @@
 DocType: Employee,B-,বি-
 DocType: Upload Attendance,Import Log,আমদানি লগ
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,টানুন উপরে মাপকাঠির ভিত্তিতে টাইপ প্রস্তুত উপাদান অনুরোধ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,সফলভাবে অনিবন্ধিত.
 DocType: Training Result Employee,Grade,শ্রেণী
+DocType: Restaurant Table,No of Seats,আসন সংখ্যা নেই
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","ডাইনামিক বিষয় যোগ করতে, jinja ট্যাগ ব্যবহার করুন <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,সরবরাহকারী দ্বারা বিতরণ
 DocType: SMS Center,All Contact,সমস্ত যোগাযোগ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,উত্পাদনের অর্ডার ইতিমধ্যে BOM সঙ্গে সব আইটেম জন্য সৃষ্টি
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,উত্পাদনের অর্ডার ইতিমধ্যে BOM সঙ্গে সব আইটেম জন্য সৃষ্টি
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,বার্ষিক বেতন
 DocType: Daily Work Summary,Daily Work Summary,দৈনন্দিন কাজ সারাংশ
 DocType: Period Closing Voucher,Closing Fiscal Year,ফিস্ক্যাল বছর সমাপ্তি
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} হিমায়িত করা
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,দয়া করে হিসাব চার্ট তৈরি করার জন্য বিদ্যমান কোম্পানী নির্বাচন
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} হিমায়িত করা
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,দয়া করে হিসাব চার্ট তৈরি করার জন্য বিদ্যমান কোম্পানী নির্বাচন
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,স্টক খরচ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,নির্বাচন উদ্দিষ্ট ওয়্যারহাউস
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,নির্বাচন উদ্দিষ্ট ওয়্যারহাউস
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,অনুগ্রহ করে লিখুন পছন্দের যোগাযোগ ইমেইল
 DocType: Program Enrollment,School Bus,স্কুল বাস
 DocType: Journal Entry,Contra Entry,বিরূদ্ধে এণ্ট্রি
@@ -237,9 +245,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", টেমপ্লেট ডাউনলোড উপযুক্ত তথ্য পূরণ করুন এবং পরিবর্তিত ফাইল সংযুক্ত. আপনার নির্বাচিত সময়ের মধ্যে সব তারিখগুলি এবং কর্মচারী সমন্বয় বিদ্যমান উপস্থিতি রেকর্ড সঙ্গে, টেমপ্লেট আসবে"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,{0} আইটেম সক্রিয় নয় বা জীবনের শেষ হয়েছে পৌঁছেছেন
+DocType: Student Admission Program,Minimum Age,সর্বনিম্ন বয়স
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,উদাহরণ: বেসিক গণিত
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","আইটেম রেট সারি {0} মধ্যে ট্যাক্স সহ, সারি করের {1} এছাড়াও অন্তর্ভুক্ত করা আবশ্যক"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,এইচআর মডিউল ব্যবহার সংক্রান্ত সেটিংস Comment
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,এইচআর মডিউল ব্যবহার সংক্রান্ত সেটিংস Comment
 DocType: SMS Center,SMS Center,এসএমএস কেন্দ্র
 DocType: Sales Invoice,Change Amount,পরিমাণ পরিবর্তন
 DocType: BOM Update Tool,New BOM,নতুন BOM
@@ -249,7 +258,7 @@
 DocType: Lead,Request Type,অনুরোধ টাইপ
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,কর্মচারী করুন
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,সম্প্রচার
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,রুম যোগ করুন
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),পিওএস (অনলাইন / অফলাইন) সেটআপ মোড
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,সম্পাদন
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,অপারেশনের বিবরণ সম্পন্ন.
 DocType: Serial No,Maintenance Status,রক্ষণাবেক্ষণ অবস্থা
@@ -272,6 +281,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,মূল্যতালিকা কেনা বা বিক্রি জন্য প্রযোজ্য হতে হবে
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},ইনস্টলেশনের তারিখ আইটেমের জন্য ডেলিভারি তারিখের আগে হতে পারে না {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),মূল্য তালিকা রেট বাট্টা (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,প্রাণরসায়ন
 DocType: Offer Letter,Select Terms and Conditions,নির্বাচন শর্তাবলী
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,আউট মূল্য
 DocType: Production Planning Tool,Sales Orders,বিক্রয় আদেশ
@@ -306,15 +316,15 @@
 DocType: Sales Partner,Reseller,রিসেলার
 DocType: Codification Table,Medical Code,মেডিকেল কোড
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","যদি চেক করা, উপাদান অনুরোধ অ স্টক আইটেম অন্তর্ভুক্ত করা হবে."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,কোম্পানী লিখুন দয়া করে
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,কোম্পানী লিখুন দয়া করে
 DocType: Delivery Note Item,Against Sales Invoice Item,বিক্রয় চালান আইটেমটি বিরুদ্ধে
 ,Production Orders in Progress,প্রগতি উৎপাদন আদেশ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,অর্থায়ন থেকে নিট ক্যাশ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","স্থানীয় সঞ্চয়স্থান পূর্ণ, সংরক্ষণ করা হয়নি"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","স্থানীয় সঞ্চয়স্থান পূর্ণ, সংরক্ষণ করা হয়নি"
 DocType: Lead,Address & Contact,ঠিকানা ও যোগাযোগ
 DocType: Leave Allocation,Add unused leaves from previous allocations,আগের বরাদ্দ থেকে অব্যবহৃত পাতার করো
 DocType: Sales Partner,Partner website,অংশীদার ওয়েবসাইট
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,আইটেম যোগ করুন
+DocType: Restaurant Order Entry,Add Item,আইটেম যোগ করুন
 DocType: Lab Test,Custom Result,কাস্টম ফলাফল
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,যোগাযোগের নাম
 DocType: Course Assessment Criteria,Course Assessment Criteria,কোর্সের অ্যাসেসমেন্ট নির্ণায়ক
@@ -327,7 +337,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,কেনার জন্য অনুরোধ জানান.
 DocType: Lab Test,Submitted Date,জমা দেওয়া তারিখ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,এই সময় শীট এই প্রকল্পের বিরুদ্ধে নির্মিত উপর ভিত্তি করে
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,নিট পে 0 কম হতে পারে না
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,নিট পে 0 কম হতে পারে না
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","সিস্টেম থেকে পুনরাবৃত্তিমূলক ত্রুটির নোটিফিকেশন প্রেরণ বন্ধ করতে, আমরা সাবস্ক্রিপশনটিতে অক্ষম ক্ষেত্র চেক করেছি"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,শুধু নির্বাচিত ছুটি রাজসাক্ষী এই ছুটি আবেদন জমা দিতে পারেন
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,তারিখ মুক্তিদান যোগদান তারিখ থেকে বড় হওয়া উচিত
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,প্রতি বছর পত্রাদি
@@ -336,9 +347,10 @@
 DocType: Email Digest,Profit & Loss,লাভ ক্ষতি
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,লিটার
 DocType: Task,Total Costing Amount (via Time Sheet),মোট খোয়াতে পরিমাণ (টাইম শিট মাধ্যমে)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,ছাত্রদের অধীন ছাত্রদের সেটআপ করুন
 DocType: Item Website Specification,Item Website Specification,আইটেম ওয়েবসাইট স্পেসিফিকেশন
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ত্যাগ অবরুদ্ধ
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},আইটেম {0} জীবনের তার শেষ পৌঁছেছে {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},আইটেম {0} জীবনের তার শেষ পৌঁছেছে {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,ব্যাংক দাখিলা
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,বার্ষিক
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,শেয়ার রিকনসিলিয়েশন আইটেম
@@ -347,7 +359,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,শিক্ষার্থীর গ্রুপ সৃষ্টি টুল কোর্স
 DocType: Lead,Do Not Contact,যোগাযোগ না
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,যাদের কাছে আপনার প্রতিষ্ঠানের পড়ান
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,সব আবর্তক চালান ট্র্যাকিং জন্য অনন্য আইডি. এটি জমা দিতে হবে নির্মাণ করা হয়.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,সফ্টওয়্যার ডেভেলপার
 DocType: Item,Minimum Order Qty,নূন্যতম আদেশ Qty
 DocType: Pricing Rule,Supplier Type,সরবরাহকারী ধরন
@@ -357,17 +368,19 @@
 DocType: Item,Publish in Hub,হাব প্রকাশ
 DocType: Student Admission,Student Admission,ছাত্র-ছাত্রী ভর্তি
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,উপাদানের জন্য অনুরোধ
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,উপাদানের জন্য অনুরোধ
 DocType: Bank Reconciliation,Update Clearance Date,আপডেট পরিস্কারের তারিখ
 DocType: Item,Purchase Details,ক্রয় বিবরণ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ক্রয় করার &#39;কাঁচামাল সরবরাহ করা&#39; টেবিলের মধ্যে পাওয়া আইটেম {0} {1}
 DocType: Patient Relation,Relation,সম্পর্ক
 DocType: Shipping Rule,Worldwide Shipping,বিশ্বব্যাপী শিপিং
 DocType: Patient Relation,Mother,মা
+DocType: Restaurant Reservation,Reservation End Time,রিজার্ভেশন এন্ড টাইম
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,গ্রাহকরা থেকে নিশ্চিত আদেশ.
 DocType: Purchase Receipt Item,Rejected Quantity,প্রত্যাখ্যাত পরিমাণ
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,পেমেন্ট অনুরোধ {0} তৈরি করা
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,পেমেন্ট অনুরোধ {0} তৈরি করা
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,কম সংবেদনশীলতা
 DocType: Notification Control,Notification Control,বিজ্ঞপ্তি নিয়ন্ত্রণ
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,আপনি একবার আপনার প্রশিক্ষণ সম্পন্ন হয়েছে নিশ্চিত করুন
 DocType: Lead,Suggestions,পরামর্শ
@@ -387,7 +400,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,কর্মচারী থেকে ইমেল বেতন স্লিপ কর্মচারী নির্বাচিত পছন্দসই ই-মেইল উপর ভিত্তি করে
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,যদি তালিকার প্রথম ছুটি রাজসাক্ষী ডিফল্ট ছুটি রাজসাক্ষী হিসাবে নির্ধারণ করা হবে
 DocType: Tax Rule,Shipping County,শিপিং কাউন্টি
-apps/erpnext/erpnext/config/desktop.py +158,Learn,শেখা
+apps/erpnext/erpnext/config/desktop.py +159,Learn,শেখা
 DocType: Asset,Next Depreciation Date,পরবর্তী অবচয় তারিখ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,কর্মচারী প্রতি কার্যকলাপ খরচ
 DocType: Accounts Settings,Settings for Accounts,অ্যাকাউন্ট এর জন্য সেটিং
@@ -398,13 +411,13 @@
 DocType: Item,Synced With Hub,হাব সঙ্গে synced
 DocType: Vehicle,Fleet Manager,দ্রুত ব্যবস্থাপক
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},সারি # {0}: {1} আইটেমের জন্য নেতিবাচক হতে পারে না {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,ভুল গুপ্তশব্দ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,ভুল গুপ্তশব্দ
 DocType: Item,Variant Of,মধ্যে variant
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',চেয়ে &#39;স্টক প্রস্তুত করতে&#39; সম্পন্ন Qty বৃহত্তর হতে পারে না
 DocType: Period Closing Voucher,Closing Account Head,অ্যাকাউন্ট হেড সমাপ্তি
 DocType: Employee,External Work History,বাহ্যিক কাজের ইতিহাস
 DocType: Physician,Time per Appointment,প্রতি অ্যাপয়েন্টমেন্ট সময়
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,সার্কুলার রেফারেন্স ত্রুটি
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,সার্কুলার রেফারেন্স ত্রুটি
 DocType: Appointment Type,Is Inpatient,ইনপেশেন্ট
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 নাম
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,আপনি হুণ্ডি সংরক্ষণ একবার শব্দ (রপ্তানি) দৃশ্যমান হবে.
@@ -413,19 +426,18 @@
 DocType: Lead,Industry,শিল্প
 DocType: Employee,Job Profile,চাকরি বৃত্তান্ত
 DocType: BOM Item,Rate & Amount,হার এবং পরিমাণ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,অনুগ্রহ করে সেটআপ&gt; নম্বরিং সিরিজ এর মাধ্যমে উপস্থিতি জন্য ধারাবাহিক সংখ্যা নির্ধারণ করুন
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,এই কোম্পানি বিরুদ্ধে লেনদেন উপর ভিত্তি করে। বিস্তারিত জানার জন্য নীচের টাইমলাইনে দেখুন
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,স্বয়ংক্রিয় উপাদান অনুরোধ নির্মাণের ইমেইল দ্বারা সূচিত
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,প্রতিরোধী
 DocType: Journal Entry,Multi Currency,বিভিন্ন দেশের মুদ্রা
 DocType: Payment Reconciliation Invoice,Invoice Type,চালান প্রকার
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গোষ্ঠী&gt; টেরিটরি
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,চালান পত্র
 DocType: Consultation,Encounter Impression,এনকোডেড ইমপ্রেসন
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,করের আপ সেট
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,বিক্রি অ্যাসেট খরচ
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,আপনি এটি টানা পরে পেমেন্ট ভুক্তি নথীটি পরিবর্তিত হয়েছে. আবার এটি টান করুন.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} আইটেম ট্যাক্সে দুইবার প্রবেশ করা হয়েছে
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,এই সপ্তাহে এবং স্থগিত কার্যক্রম জন্য সারসংক্ষেপ
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} আইটেম ট্যাক্সে দুইবার প্রবেশ করা হয়েছে
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,এই সপ্তাহে এবং স্থগিত কার্যক্রম জন্য সারসংক্ষেপ
 DocType: Student Applicant,Admitted,ভর্তি
 DocType: Workstation,Rent Cost,ভাড়া খরচ
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,পরিমাণ অবচয় পর
@@ -439,36 +451,35 @@
 DocType: Shipping Rule,Valid for Countries,দেশ সমূহ জন্য বৈধ
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"এই আইটেমটি একটি টেমপ্লেট এবং লেনদেনের ক্ষেত্রে ব্যবহার করা যাবে না. &#39;কোন কপি করো&#39; সেট করা হয়, যদি না আইটেম বৈশিষ্ট্যাবলী ভিন্নতা মধ্যে ধরে কপি করা হবে"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,বিবেচিত মোট আদেশ
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","কর্মচারী উপাধি (যেমন সিইও, পরিচালক ইত্যাদি)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","কর্মচারী উপাধি (যেমন সিইও, পরিচালক ইত্যাদি)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"গ্রাহক একক গ্রাহকের বেস কারেন্সি রূপান্তরিত হয়, যা এ হার"
 DocType: Course Scheduling Tool,Course Scheduling Tool,কোর্সের পূর্বপরিকল্পনা টুল
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},সারি # {0}: ক্রয় চালান একটি বিদ্যমান সম্পদ বিরুদ্ধে করা যাবে না {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[ঊর্ধ্বতন]% s এর জন্য% s পুনরাবৃত্তি তৈরির সময় ত্রুটি
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[ঊর্ধ্বতন]% s এর জন্য% s পুনরাবৃত্তি তৈরির সময় ত্রুটি
 DocType: Item Tax,Tax Rate,করের হার
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ইতিমধ্যে কর্মচারী জন্য বরাদ্দ {1} সময়ের {2} জন্য {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,পছন্দ করো
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,পছন্দ করো
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,চালান {0} ইতিমধ্যেই জমা ক্রয়
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},সারি # {0}: ব্যাচ কোন হিসাবে একই হতে হবে {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,অ দলের রূপান্তর
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,একটি আইটেম এর ব্যাচ (অনেক).
 DocType: C-Form Invoice Detail,Invoice Date,চালান তারিখ
 DocType: GL Entry,Debit Amount,ডেবিট পরিমাণ
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},শুধুমাত্র এ কোম্পানির প্রতি 1 অ্যাকাউন্ট থাকতে পারে {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,অনুগ্রহ পূর্বক সংযুক্তি দেখুন
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},শুধুমাত্র এ কোম্পানির প্রতি 1 অ্যাকাউন্ট থাকতে পারে {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,অনুগ্রহ পূর্বক সংযুক্তি দেখুন
 DocType: Purchase Order,% Received,% গৃহীত
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ছাত্র সংগঠনগুলো তৈরি করুন
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,সেটআপ ইতিমধ্যে সম্পূর্ণ !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,সেটআপ ইতিমধ্যে সম্পূর্ণ !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,ক্রেডিট নোট পরিমাণ
 DocType: Setup Progress Action,Action Document,অ্যাকশন ডকুমেন্ট
 ,Finished Goods,সমাপ্ত পণ্য
 DocType: Delivery Note,Instructions,নির্দেশনা
 DocType: Quality Inspection,Inspected By,পরিদর্শন
 DocType: Maintenance Visit,Maintenance Type,রক্ষণাবেক্ষণ টাইপ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} কোর্সের মধ্যে নাম নথিভুক্ত করা হয় না {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,আইটেম কোড&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} কোর্সের মধ্যে নাম নথিভুক্ত করা হয় না {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},সিরিয়াল কোন {0} হুণ্ডি অন্তর্গত নয় {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext ডেমো
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,উপকরণ অ্যাড
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,উপকরণ অ্যাড
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,আইটেম গুণ পরিদর্শন পরামিতি
 DocType: Leave Application,Leave Approver Name,রাজসাক্ষী নাম
 DocType: Depreciation Schedule,Schedule Date,সূচি তারিখ
@@ -488,7 +499,7 @@
 DocType: Salary Slip Timesheet,Working Hours,কর্মঘন্টা
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,একটি বিদ্যমান সিরিজের শুরু / বর্তমান ক্রম সংখ্যা পরিবর্তন করুন.
 DocType: Dosage Strength,Strength,শক্তি
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,একটি নতুন গ্রাহক তৈরি করুন
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,একটি নতুন গ্রাহক তৈরি করুন
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",একাধিক দামে ব্যাপা চলতে থাকে তবে ব্যবহারকারীরা সংঘাতের সমাধান করতে নিজে অগ্রাধিকার সেট করতে বলা হয়.
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,ক্রয় আদেশ তৈরি করুন
 ,Purchase Register,ক্রয় নিবন্ধন
@@ -507,7 +518,7 @@
 DocType: Lab Test Template,Single,একক
 DocType: Salary Slip,Total Loan Repayment,মোট ঋণ পরিশোধ
 DocType: Account,Cost of Goods Sold,বিক্রি সামগ্রীর খরচ
-DocType: Purchase Invoice,Yearly,বাত্সরিক
+DocType: Subscription,Yearly,বাত্সরিক
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,খরচ কেন্দ্র লিখুন দয়া করে
 DocType: Drug Prescription,Dosage,ডোজ
 DocType: Journal Entry Account,Sales Order,বিক্রয় আদেশ
@@ -537,7 +548,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,সব উত্পাদন প্রক্রিয়া জন্য গ্লোবাল সেটিংস.
 DocType: Accounts Settings,Accounts Frozen Upto,হিমায়িত পর্যন্ত অ্যাকাউন্ট
 DocType: SMS Log,Sent On,পাঠানো
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,গুন {0} আরোপ ছক মধ্যে একাধিক বার নির্বাচিত
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,গুন {0} আরোপ ছক মধ্যে একাধিক বার নির্বাচিত
 DocType: HR Settings,Employee record is created using selected field. ,কর্মচারী রেকর্ড নির্বাচিত ক্ষেত্র ব্যবহার করে নির্মিত হয়.
 DocType: Sales Order,Not Applicable,প্রযোজ্য নয়
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,হলিডে মাস্টার.
@@ -562,13 +573,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,বরাদ্দ মোট পাতার বাধ্যতামূলক
 DocType: Patient,AB Positive,এবি ইতিবাচক
 DocType: Job Opening,Description of a Job Opening,একটি কাজের খোলার বর্ণনা
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,আজকের জন্য মুলতুবি কার্যক্রম
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,আজকের জন্য মুলতুবি কার্যক্রম
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,উপস্থিতি দলিল.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড ভিত্তিক মাইনে জন্য বেতন কম্পোনেন্ট.
 DocType: Sales Order Item,Used for Production Plan,উৎপাদন পরিকল্পনা জন্য ব্যবহৃত
 DocType: Employee Loan,Total Payment,মোট পরিশোধ
 DocType: Manufacturing Settings,Time Between Operations (in mins),(মিনিট) অপারেশনস মধ্যে সময়
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,"{0} {1} বাতিল করা হয়েছে, যাতে কর্ম সম্পন্ন করা যাবে না"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,"{0} {1} বাতিল করা হয়েছে, যাতে কর্ম সম্পন্ন করা যাবে না"
 DocType: Customer,Buyer of Goods and Services.,পণ্য ও সার্ভিসেস ক্রেতা.
 DocType: Journal Entry,Accounts Payable,পরিশোধযোগ্য হিসাব
 DocType: Patient,Allergies,এলার্জি
@@ -580,22 +591,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,ক্রয় অর্ডারগুলি সতর্ক করুন
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,আপনার গ্রাহকদের কয়েক তালিকা. তারা সংগঠন বা ব্যক্তি হতে পারে.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,পর্যাপ্ত যন্ত্রাংশ তৈরি করুন
+DocType: POS Profile User,POS Profile User,পিওএস প্রোফাইল ব্যবহারকারী
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,সরাসরি আয়
 DocType: Patient Appointment,Date TIme,তারিখ সময়
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",অ্যাকাউন্ট দ্বারা গ্রুপকৃত তাহলে অ্যাকাউন্ট উপর ভিত্তি করে ফিল্টার করতে পারবে না
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,প্রশাসনিক কর্মকর্তা
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,দয়া করে কোর্সের নির্বাচন
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,দয়া করে কোর্সের নির্বাচন
 DocType: Codification Table,Codification Table,সংশোধনী সারণি
 DocType: Timesheet Detail,Hrs,ঘন্টা
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,কোম্পানি নির্বাচন করুন
 DocType: Stock Entry Detail,Difference Account,পার্থক্য অ্যাকাউন্ট
 DocType: Purchase Invoice,Supplier GSTIN,সরবরাহকারী GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,তার নির্ভরশীল টাস্ক {0} বন্ধ না হয় বন্ধ টাস্ক না পারেন.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,"উপাদান অনুরোধ উত্থাপিত হবে, যার জন্য গুদাম লিখুন দয়া করে"
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,তার নির্ভরশীল টাস্ক {0} বন্ধ না হয় বন্ধ টাস্ক না পারেন.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"উপাদান অনুরোধ উত্থাপিত হবে, যার জন্য গুদাম লিখুন দয়া করে"
 DocType: Production Order,Additional Operating Cost,অতিরিক্ত অপারেটিং খরচ
 DocType: Lab Test Template,Lab Routine,ল্যাব রাউটিং
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,অঙ্গরাগ
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items",মার্জ করার জন্য নিম্নলিখিত বৈশিষ্ট্য উভয় আইটেম জন্য একই হতে হবে
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items",মার্জ করার জন্য নিম্নলিখিত বৈশিষ্ট্য উভয় আইটেম জন্য একই হতে হবে
 DocType: Shipping Rule,Net Weight,প্রকৃত ওজন
 DocType: Employee,Emergency Phone,জরুরী ফোন
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,কেনা
@@ -605,7 +617,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,দয়া করে প্রারম্ভিক মান 0% গ্রেড নির্ধারণ
 DocType: Sales Order,To Deliver,প্রদান করা
 DocType: Purchase Invoice Item,Item,আইটেম
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,সিরিয়াল কোন আইটেমের একটি ভগ্নাংশ হতে পারে না
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,উচ্চ সংবেদনশীলতা
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,সিরিয়াল কোন আইটেমের একটি ভগ্নাংশ হতে পারে না
 DocType: Journal Entry,Difference (Dr - Cr),পার্থক্য (ডাঃ - CR)
 DocType: Account,Profit and Loss,লাভ এবং ক্ষতি
 DocType: Patient,Risk Factors,ঝুঁকির কারণ
@@ -614,7 +627,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,ম্যানেজিং প্রণীত
 DocType: Vital Signs,Body Temperature,শরীরের তাপমাত্রা
 DocType: Project,Project will be accessible on the website to these users,প্রকল্প এই ব্যবহারকারীর জন্য ওয়েবসাইটে অ্যাক্সেস করা যাবে
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,প্রকল্প টাইপ নির্ধারণ করুন
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,প্রকল্প টাইপ নির্ধারণ করুন
 DocType: Supplier Scorecard,Weighting Function,ওয়েটিং ফাংশন
 DocType: Physician,OP Consulting Charge,ওপ কনসাল্টিং চার্জ
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,আপনার সেটআপ করুন
@@ -628,7 +641,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,বর্ধিত 0 হতে পারবেন না
 DocType: Production Planning Tool,Material Requirement,উপাদান প্রয়োজন
 DocType: Company,Delete Company Transactions,কোম্পানি লেনদেন মুছে
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,রেফারেন্স কোন ও রেফারেন্স তারিখ ব্যাংক লেনদেনের জন্য বাধ্যতামূলক
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,রেফারেন্স কোন ও রেফারেন্স তারিখ ব্যাংক লেনদেনের জন্য বাধ্যতামূলক
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ সম্পাদনা কর ও চার্জ যোগ
 DocType: Payment Entry Reference,Supplier Invoice No,সরবরাহকারী চালান কোন
 DocType: Territory,For reference,অবগতির জন্য
@@ -636,12 +649,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","মুছে ফেলা যায় না সিরিয়াল কোন {0}, এটা শেয়ার লেনদেনের ক্ষেত্রে ব্যবহার করা হয় যেমন"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),বন্ধ (যোগাযোগ Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,হ্যালো
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,আইটেম সরান
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,আইটেম সরান
 DocType: Serial No,Warranty Period (Days),পাটা কাল (দিন)
 DocType: Installation Note Item,Installation Note Item,ইনস্টলেশন নোট আইটেম
 DocType: Production Plan Item,Pending Qty,মুলতুবি Qty
 DocType: Budget,Ignore,উপেক্ষা করা
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} সক্রিয় নয়
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} সক্রিয় নয়
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,সেটআপ চেক মুদ্রণের জন্য মাত্রা
 DocType: Salary Slip,Salary Slip Timesheet,বেতন স্লিপ শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,উপ-সংকুচিত কেনার রসিদ জন্য বাধ্যতামূলক সরবরাহকারী ওয়্যারহাউস
@@ -650,7 +663,7 @@
 DocType: Pricing Rule,Sales Partner,বিক্রয় অংশীদার
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,সমস্ত সরবরাহকারী স্কোরকার্ড
 DocType: Buying Settings,Purchase Receipt Required,কেনার রসিদ প্রয়োজনীয়
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,যদি খোলা স্টক প্রবেশ মূল্যনির্ধারণ হার বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,যদি খোলা স্টক প্রবেশ মূল্যনির্ধারণ হার বাধ্যতামূলক
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,চালান টেবিল অন্তর্ভুক্ত কোন রেকর্ড
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,প্রথম কোম্পানি ও অনুষ্ঠান প্রকার নির্বাচন করুন
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,আর্থিক / অ্যাকাউন্টিং বছর.
@@ -687,7 +700,7 @@
 DocType: Quotation,Quotation To,উদ্ধৃতি
 DocType: Lead,Middle Income,মধ্য আয়
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),খোলা (যোগাযোগ Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,আপনি ইতিমধ্যে অন্য UOM সঙ্গে কিছু লেনদেন (গুলি) করেছেন কারণ আইটেম জন্য মেজার ডিফল্ট ইউনিট {0} সরাসরি পরিবর্তন করা যাবে না. আপনি একটি ভিন্ন ডিফল্ট UOM ব্যবহার করার জন্য একটি নতুন আইটেম তৈরি করতে হবে.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,আপনি ইতিমধ্যে অন্য UOM সঙ্গে কিছু লেনদেন (গুলি) করেছেন কারণ আইটেম জন্য মেজার ডিফল্ট ইউনিট {0} সরাসরি পরিবর্তন করা যাবে না. আপনি একটি ভিন্ন ডিফল্ট UOM ব্যবহার করার জন্য একটি নতুন আইটেম তৈরি করতে হবে.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,বরাদ্দ পরিমাণ নেতিবাচক হতে পারে না
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,কোম্পানির সেট করুন
 DocType: Purchase Order Item,Billed Amt,দেখানো হয়েছিল মাসিক
@@ -701,6 +714,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,নির্বাচন পেমেন্ট একাউন্ট ব্যাংক এণ্ট্রি করতে
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","পাতা, ব্যয় দাবী এবং মাইনে পরিচালনা করতে কর্মচারী রেকর্ড তৈরি করুন"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,প্রেসক্রিপশন পিরিয়ড
+DocType: Restaurant Reservation,Restaurant Reservation,রেস্টুরেন্ট রিজার্ভেশন
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,প্রস্তাবনা লিখন
 DocType: Payment Entry Deduction,Payment Entry Deduction,পেমেন্ট এণ্ট্রি সিদ্ধান্তগ্রহণ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,অন্য বিক্রয় ব্যক্তি {0} একই কর্মচারী আইডি দিয়ে বিদ্যমান
@@ -708,7 +722,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,মাস্টার্স
 DocType: Assessment Plan,Maximum Assessment Score,সর্বোচ্চ অ্যাসেসমেন্ট স্কোর
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,আপডেট ব্যাংক লেনদেন তারিখগুলি
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,সময় ট্র্যাকিং
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,সময় ট্র্যাকিং
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,পরিবহনকারী ক্ষেত্রে সদৃশ
 DocType: Fiscal Year Company,Fiscal Year Company,অর্থবছরের কোম্পানি
 DocType: Packing Slip Item,DN Detail,ডিএন বিস্তারিত
@@ -716,8 +730,9 @@
 DocType: Timesheet,Billed,বিল
 DocType: Batch,Batch Description,ব্যাচ বিবরণ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,ছাত্র গ্রুপ তৈরি করা হচ্ছে
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","পেমেন্ট গেটওয়ে অ্যাকাউন্ট আমি ক্রীড়াচ্ছলে সৃষ্টি করিনি, এক ম্যানুয়ালি তৈরি করুন."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","পেমেন্ট গেটওয়ে অ্যাকাউন্ট আমি ক্রীড়াচ্ছলে সৃষ্টি করিনি, এক ম্যানুয়ালি তৈরি করুন."
 DocType: Supplier Scorecard,Per Year,প্রতি বছরে
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,DOB অনুযায়ী এই প্রোগ্রামে ভর্তির জন্য যোগ্য নয়
 DocType: Sales Invoice,Sales Taxes and Charges,বিক্রয় করের ও চার্জ
 DocType: Employee,Organization Profile,সংস্থার প্রোফাইল
 DocType: Vital Signs,Height (In Meter),উচ্চতা (মিটার)
@@ -753,7 +768,7 @@
 DocType: Student Batch Name,Batch Name,ব্যাচ নাম
 DocType: Fee Validity,Max number of visit,দেখার সর্বাধিক সংখ্যা
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড তৈরি করা হয়েছে:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},পেমেন্ট মোডে ডিফল্ট ক্যাশ বা ব্যাংক একাউন্ট সেট করুন {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},পেমেন্ট মোডে ডিফল্ট ক্যাশ বা ব্যাংক একাউন্ট সেট করুন {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,নথিভুক্ত করা
 DocType: GST Settings,GST Settings,GST সেটিং
 DocType: Selling Settings,Customer Naming By,গ্রাহক নেমিং
@@ -785,15 +800,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ল্যান্ড খরচ কর ও শুল্ক
 DocType: Production Order Operation,Actual Start Time,প্রকৃত আরম্ভের সময়
 DocType: BOM Operation,Operation Time,অপারেশন টাইম
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,শেষ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,শেষ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,ভিত্তি
 DocType: Timesheet,Total Billed Hours,মোট বিল ঘন্টা
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,পরিমাণ বন্ধ লিখুন
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,পরিমাণ বন্ধ লিখুন
 DocType: Leave Block List Allow,Allow User,অনুমতি
 DocType: Journal Entry,Bill No,বিল কোন
 DocType: Company,Gain/Loss Account on Asset Disposal,অ্যাসেট নিষ্পত্তির লাভ / ক্ষতির হিসাব
 DocType: Vehicle Log,Service Details,পরিষেবা বিশদ
-DocType: Purchase Invoice,Quarterly,ত্রৈমাসিক
+DocType: Subscription,Quarterly,ত্রৈমাসিক
 DocType: Lab Test Template,Grouped,গোষ্ঠীবদ্ধ
 DocType: Selling Settings,Delivery Note Required,ডেলিভারি নোট প্রয়োজনীয়
 DocType: Bank Guarantee,Bank Guarantee Number,ব্যাংক গ্যারান্টি নম্বর
@@ -802,12 +817,12 @@
 DocType: Student Attendance,Student Attendance,ছাত্র এ্যাটেনডেন্স
 DocType: Sales Invoice Timesheet,Time Sheet,টাইম শিট
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush কাঁচামালের ভিত্তিতে
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,আইটেম বিবরণ লিখুন দয়া করে
 DocType: Interest,Interest,স্বার্থ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,প্রাক সেলস
 DocType: Purchase Receipt,Other Details,অন্যান্য বিস্তারিত
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,টেস্ট টেমপ্লেট
+DocType: Restaurant Order Entry Item,Served,জারি
 DocType: Account,Accounts,অ্যাকাউন্ট
 DocType: Vehicle,Odometer Value (Last),দূরত্বমাপণী মূল্য (শেষ)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,সরবরাহকারী স্কোরকার্ড মাপদণ্ডের টেমপ্লেট।
@@ -819,25 +834,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,প্রি বেতন স্লিপ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,অ্যাকাউন্ট {0} একাধিক বার প্রবেশ করানো হয়েছে
 DocType: Account,Expenses Included In Valuation,খরচ মূল্যনির্ধারণ অন্তর্ভুক্ত
-DocType: Hub Settings,Seller City,বিক্রেতা সিটি
 ,Absent Student Report,অনুপস্থিত শিক্ষার্থীর প্রতিবেদন
 DocType: Email Digest,Next email will be sent on:,পরবর্তী ইমেলে পাঠানো হবে:
 DocType: Offer Letter Term,Offer Letter Term,পত্র টার্ম প্রস্তাব
 DocType: Supplier Scorecard,Per Week,প্রতি সপ্তাহে
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,আইটেম ভিন্নতা আছে.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,আইটেম ভিন্নতা আছে.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,মোট ছাত্র
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,আইটেম {0} পাওয়া যায়নি
 DocType: Bin,Stock Value,স্টক মূল্য
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,ব্যাকগ্রাউন্ডে ফি রেকর্ড তৈরি করা হবে। কোনও ত্রুটির ক্ষেত্রে ত্রুটি বার্তাটি শেল্ডে আপডেট করা হবে।
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,কোম্পানির {0} অস্তিত্ব নেই
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} পর্যন্ত ফি বৈধতা আছে {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} পর্যন্ত ফি বৈধতা আছে {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,বৃক্ষ ধরন
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Qty ইউনিট প্রতি ক্ষয়প্রাপ্ত
 DocType: Serial No,Warranty Expiry Date,পাটা মেয়াদ শেষ হওয়ার তারিখ
 DocType: Material Request Item,Quantity and Warehouse,পরিমাণ এবং ওয়্যারহাউস
+DocType: Hub Settings,Unregister,নিবন্ধন মুক্ত
 DocType: Sales Invoice,Commission Rate (%),কমিশন হার (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,দয়া করে নির্বাচন করুন প্রোগ্রাম
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,দয়া করে নির্বাচন করুন প্রোগ্রাম
 DocType: Project,Estimated Cost,আনুমানিক খরচ
 DocType: Purchase Order,Link to material requests,উপাদান অনুরোধ লিংক
+DocType: Hub Settings,Publish,প্রকাশ করা
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,বিমান উড্ডয়ন এলাকা
 DocType: Journal Entry,Credit Card Entry,ক্রেডিট কার্ড এন্ট্রি
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,কোম্পানি অ্যান্ড অ্যাকাউন্টস
@@ -848,13 +865,12 @@
 DocType: Selling Settings,Close Opportunity After Days,বন্ধ সুযোগ দিন পরে
 ,Reserved,সংরক্ষিত
 DocType: Purchase Order,Supply Raw Materials,সাপ্লাই কাঁচামালের
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,পরের চালান তৈরি করা হবে কোন তারিখে. এটি জমা দিতে হবে নির্মাণ করা হয়.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,চলতি সম্পদ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} একটি স্টক আইটেম নয়
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',প্রশিক্ষণ &#39;প্রতিক্রিয়া&#39; এবং তারপর &#39;নতুন&#39; ক্লিক করে প্রশিক্ষণ আপনার প্রতিক্রিয়া ভাগ করুন
 DocType: Mode of Payment Account,Default Account,ডিফল্ট একাউন্ট
 DocType: Payment Entry,Received Amount (Company Currency),প্রাপ্তঃ পরিমাণ (কোম্পানি মুদ্রা)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,সুযোগ লিড থেকে তৈরি করা হয় তাহলে লিড নির্ধারণ করা আবশ্যক
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,সুযোগ লিড থেকে তৈরি করা হয় তাহলে লিড নির্ধারণ করা আবশ্যক
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,সাপ্তাহিক ছুটির দিন নির্বাচন করুন
 DocType: Patient,O Negative,হে নেতিবাচক
 DocType: Production Order Operation,Planned End Time,পরিকল্পনা শেষ সময়
@@ -870,10 +886,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,শক্তি
 DocType: Opportunity,Opportunity From,থেকে সুযোগ
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,মাসিক বেতন বিবৃতি.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,কোম্পানি যোগ করুন
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,সারি {0}: {1} আইটেমের জন্য প্রয়োজনীয় সিরিয়াল নম্বর {2}। আপনি {3} প্রদান করেছেন।
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,সারি {0}: {1} আইটেমের জন্য প্রয়োজনীয় সিরিয়াল নম্বর {2}। আপনি {3} প্রদান করেছেন।
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,একটি টেবিল নির্বাচন করুন
 DocType: BOM,Website Specifications,ওয়েবসাইট উল্লেখ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} &#39;প্রাপকদের&#39; একটি অবৈধ ইমেল ঠিকানা
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} &#39;প্রাপকদের&#39; একটি অবৈধ ইমেল ঠিকানা
 DocType: Special Test Items,Particulars,বিবরণ
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,এন্টিবায়োটিক।
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: টাইপ {1} এর {0} থেকে
@@ -881,11 +897,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,সারি {0}: রূপান্তর ফ্যাক্টর বাধ্যতামূলক
 DocType: Employee,A+,একটি A
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","একাধিক দাম বিধি একই মানদণ্ড সঙ্গে বিদ্যমান, অগ্রাধিকার বরাদ্দ করে সংঘাত সমাধান করুন. দাম নিয়মাবলী: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,নিষ্ক্রিয় অথবা অন্য BOMs সাথে সংযুক্ত করা হয় হিসাবে BOM বাতিল করতে পারেন না
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,নিষ্ক্রিয় অথবা অন্য BOMs সাথে সংযুক্ত করা হয় হিসাবে BOM বাতিল করতে পারেন না
 DocType: Opportunity,Maintenance,রক্ষণাবেক্ষণ
 DocType: Item Attribute Value,Item Attribute Value,আইটেম মান গুন
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,সেলস প্রচারণা.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড করুন
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড করুন
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -923,12 +939,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,প্রথম আইটেম লিখুন দয়া করে
 DocType: Account,Liability,দায়
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,অনুমোদিত পরিমাণ সারি মধ্যে দাবি করে বেশি পরিমাণে হতে পারে না {0}.
+DocType: Salary Detail,Do not include in total,মোট অন্তর্ভুক্ত করবেন না
 DocType: Company,Default Cost of Goods Sold Account,জিনিষপত্র বিক্রি অ্যাকাউন্ট ডিফল্ট খরচ
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,মূল্যতালিকা নির্বাচিত না
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,মূল্যতালিকা নির্বাচিত না
 DocType: Employee,Family Background,পারিবারিক ইতিহাস
 DocType: Request for Quotation Supplier,Send Email,বার্তা পাঠাও
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},সতর্কবাণী: অবৈধ সংযুক্তি {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,অনুমতি নেই
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},সতর্কবাণী: অবৈধ সংযুক্তি {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,অনুমতি নেই
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,উদ্ধৃতি অনুরোধ
 DocType: Vital Signs,Heart Rate / Pulse,হার্ট রেট / পালস
 DocType: Company,Default Bank Account,ডিফল্ট ব্যাঙ্ক অ্যাকাউন্ট
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","পার্টি উপর ভিত্তি করে ফিল্টার করুন, নির্বাচন পার্টি প্রথম টাইপ"
@@ -955,12 +973,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,আইটেম সারি {idx}: {DOCTYPE} {DOCNAME} উপরে বিদ্যমান নেই &#39;{DOCTYPE}&#39; টেবিল
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড {0} ইতিমধ্যে সম্পন্ন বা বাতিল করা হয়েছে
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,কোন কর্ম
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","অটো চালান 05, 28 ইত্যাদি যেমন তৈরি করা হবে যা মাসের দিন"
 DocType: Item Variant Settings,Copy Fields to Variant,ক্ষেত্রগুলি থেকে বৈকল্পিক কপি করুন
 DocType: Asset,Opening Accumulated Depreciation,খোলা সঞ্চিত অবচয়
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,স্কোর 5 থেকে কম বা সমান হবে
 DocType: Program Enrollment Tool,Program Enrollment Tool,প্রোগ্রাম তালিকাভুক্তি টুল
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,সি-ফরম রেকর্ড
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,সি-ফরম রেকর্ড
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,গ্রাহক এবং সরবরাহকারী
 DocType: Email Digest,Email Digest Settings,ইমেইল ডাইজেস্ট সেটিংস
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,আপনার ব্যবসার জন্য আপনাকে ধন্যবাদ!
@@ -978,13 +995,13 @@
 DocType: Request for Quotation Supplier,Quote Status,উদ্ধৃতি অবস্থা
 DocType: Maintenance Visit,Completion Status,শেষ অবস্থা
 DocType: HR Settings,Enter retirement age in years,বছরে অবসরের বয়স লিখুন
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,উদ্দিষ্ট ওয়্যারহাউস
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,দয়া করে একটি গুদাম নির্বাচন
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,উদ্দিষ্ট ওয়্যারহাউস
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,দয়া করে একটি গুদাম নির্বাচন
 DocType: Cheque Print Template,Starting location from left edge,বাম প্রান্ত থেকে অবস্থান শুরু হচ্ছে
 DocType: Item,Allow over delivery or receipt upto this percent,এই শতাংশ পর্যন্ত বিতরণ বা প্রাপ্তি ধরে মঞ্জুরি
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,আমদানি এ্যাটেনডেন্স
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,সকল আইটেম গ্রুপ
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,সকল আইটেম গ্রুপ
 DocType: Process Payroll,Activity Log,কার্য বিবরণ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,নিট লাভ / ক্ষতি
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,স্বয়ংক্রিয়ভাবে লেনদেন জমা বার্তা রচনা.
@@ -996,7 +1013,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,অভিক্ষিপ্ত Qty
 DocType: Sales Invoice,Payment Due Date,পরিশোধযোগ্য তারিখ
 DocType: Drug Prescription,Interval UOM,অন্তর্বর্তী UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,আইটেম ভেরিয়েন্ট {0} ইতিমধ্যে একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,আইটেম ভেরিয়েন্ট {0} ইতিমধ্যে একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
+DocType: Item,Hub Publishing Details,হাব প্রকাশনা বিবরণ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',' শুরু'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,কি জন্য উন্মুক্ত
 DocType: Notification Control,Delivery Note Message,হুণ্ডি পাঠান
@@ -1016,10 +1034,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: কাঁচামাল প্রধান আইটেমের মত একইরকম হতে পারে না
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ক্রয় রশিদ সামগ্রী টেবিলের মোট প্রযোজ্য চার্জ মোট কর ও চার্জ হিসাবে একই হতে হবে
 DocType: Sales Team,Incentives,ইনসেনটিভ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,হাব জন্য নিবন্ধন
 DocType: SMS Log,Requested Numbers,অনুরোধ করা নাম্বার
 DocType: Production Planning Tool,Only Obtain Raw Materials,শুধু তাই কাঁচামালের
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,কর্মক্ষমতা মূল্যায়ন.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","সক্ষম করা হলে, &#39;শপিং কার্ট জন্য প্রদর্শন করো&#39; এ শপিং কার্ট যেমন সক্রিয় করা হয় এবং শপিং কার্ট জন্য অন্তত একটি ট্যাক্স নিয়ম আছে উচিত"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","সক্ষম করা হলে, &#39;শপিং কার্ট জন্য প্রদর্শন করো&#39; এ শপিং কার্ট যেমন সক্রিয় করা হয় এবং শপিং কার্ট জন্য অন্তত একটি ট্যাক্স নিয়ম আছে উচিত"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","পেমেন্ট এণ্ট্রি {0} অর্ডার {1}, চেক যদি এটা এই চালান অগ্রিম হিসেবে টানা করা উচিত বিরুদ্ধে সংযুক্ত করা হয়."
 DocType: Sales Invoice Item,Stock Details,স্টক Details
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,প্রকল্প মূল্য
@@ -1038,12 +1057,14 @@
 DocType: Salary Slip,Working Days,কর্মদিবস
 DocType: Serial No,Incoming Rate,ইনকামিং হার
 DocType: Packing Slip,Gross Weight,মোট ওজন
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,"আপনার কোম্পানির নাম, যার জন্য আপনি এই সিস্টেম সেট আপ করা হয়."
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,হাব সক্রিয় করুন
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,"আপনার কোম্পানির নাম, যার জন্য আপনি এই সিস্টেম সেট আপ করা হয়."
 DocType: HR Settings,Include holidays in Total no. of Working Days,কোন মোট মধ্যে ছুটির অন্তর্ভুক্ত. কার্যদিবসের
 DocType: Job Applicant,Hold,রাখা
 DocType: Employee,Date of Joining,যোগদান তারিখ
 DocType: Naming Series,Update Series,আপডেট সিরিজ
 DocType: Supplier Quotation,Is Subcontracted,আউটসোর্স হয়
+DocType: Restaurant Table,Minimum Seating,ন্যূনতম আসন
 DocType: Item Attribute,Item Attribute Values,আইটেম বৈশিষ্ট্য মূল্যবোধ
 DocType: Examination Result,Examination Result,পরীক্ষার ফলাফল
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,কেনার রশিদ
@@ -1054,13 +1075,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},অপারেশন জন্য পরের {0} দিন টাইম স্লটে এটি অক্ষম {1}
 DocType: Production Order,Plan material for sub-assemblies,উপ-সমাহারকে পরিকল্পনা উপাদান
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,সেলস অংশীদার এবং টেরিটরি
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} সক্রিয় হতে হবে
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} সক্রিয় হতে হবে
 DocType: Journal Entry,Depreciation Entry,অবচয় এণ্ট্রি
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,প্রথম ডকুমেন্ট টাইপ নির্বাচন করুন
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,এই রক্ষণাবেক্ষণ পরিদর্শন বাতিল আগে বাতিল উপাদান ভিজিট {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},সিরিয়াল কোন {0} আইটেম অন্তর্গত নয় {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,প্রয়োজনীয় Qty
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,বিদ্যমান লেনদেনের সঙ্গে গুদাম খাতা থেকে রূপান্তর করা যাবে না.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,বিদ্যমান লেনদেনের সঙ্গে গুদাম খাতা থেকে রূপান্তর করা যাবে না.
 DocType: Bank Reconciliation,Total Amount,মোট পরিমাণ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,ইন্টারনেট প্রকাশনা
 DocType: Prescription Duration,Number,সংখ্যা
@@ -1071,7 +1092,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,বিক্রয় মূল্য তালিকা
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","যদি চেক করা হয়, একটি গ্রাহক তৈরি করা হবে, রোগীর কাছে ম্যাপ করা হবে এই গ্রাহকের বিরুদ্ধে রোগীর ইনভয়েসিস তৈরি করা হবে। আপনি পেশেন্ট তৈরির সময় বিদ্যমান গ্রাহক নির্বাচন করতে পারেন।"
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,আইটেম সিঙ্ক প্রকাশ করুন
 DocType: Bank Reconciliation,Account Currency,অ্যাকাউন্ট মুদ্রা
 DocType: Lab Test,Sample ID,নমুনা আইডি
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,কোম্পানি এ সুসম্পন্ন অ্যাকাউন্ট উল্লেখ করতে হবে
@@ -1080,11 +1100,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,{0} কর্মচারী সক্রিয় নয় বা কোন অস্তিত্ব নেই
 DocType: Fee Structure,Components,উপাদান
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},আইটেম মধ্যে লিখুন দয়া করে অ্যাসেট শ্রেণী {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,আইটেম রুপভেদ {0} আপডেট
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,আইটেম রুপভেদ {0} আপডেট
 DocType: Quality Inspection Reading,Reading 6,6 পঠন
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,না {0} {1} {2} ছাড়া কোনো নেতিবাচক অসামান্য চালান Can
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","উত্পন্ন করা হবে বিলম্বিত হলে, আপনাকে এই &quot;মাস মাসের পুনরাবৃত্তি&quot; ক্ষেত্রটিকে ম্যানুয়ালি পরিবর্তন করতে হবে"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,না {0} {1} {2} ছাড়া কোনো নেতিবাচক অসামান্য চালান Can
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,চালান অগ্রিম ক্রয়
-DocType: Hub Settings,Sync Now,সিঙ্ক এখন
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},সারি {0}: ক্রেডিট এন্ট্রি সঙ্গে যুক্ত করা যাবে না একটি {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,একটি অর্থবছরের বাজেট নির্ধারণ করুন.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,এই মোড নির্বাচন করা হলে ডিফল্ট ব্যাঙ্ক / ক্যাশ অ্যাকাউন্ট স্বয়ংক্রিয়ভাবে পিওএস চালান মধ্যে আপডেট করা হবে.
@@ -1096,13 +1117,13 @@
 DocType: Item,Is Purchase Item,ক্রয় আইটেম
 DocType: Asset,Purchase Invoice,ক্রয় চালান
 DocType: Stock Ledger Entry,Voucher Detail No,ভাউচার বিস্তারিত কোন
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,নতুন সেলস চালান
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,নতুন সেলস চালান
 DocType: Stock Entry,Total Outgoing Value,মোট আউটগোয়িং মূল্য
 DocType: Physician,Appointments,কলকব্জা
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,তারিখ এবং শেষ তারিখ খোলার একই অর্থবছরের মধ্যে হওয়া উচিত
 DocType: Lead,Request for Information,তথ্যের জন্য অনুরোধ
 ,LeaderBoard,লিডারবোর্ড
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,সিঙ্ক অফলাইন চালান
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,সিঙ্ক অফলাইন চালান
 DocType: Payment Request,Paid,প্রদত্ত
 DocType: Program Fee,Program Fee,প্রোগ্রাম ফি
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1121,11 +1142,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,আদেশ আইটেম ক্রয়
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,পরোক্ষ আয়
 DocType: Student Attendance Tool,Student Attendance Tool,ছাত্র এ্যাটেনডেন্স টুল
+DocType: Restaurant Menu,Price List (Auto created),মূল্য তালিকা (অটো তৈরি)
 DocType: Cheque Print Template,Date Settings,তারিখ সেটিং
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,অনৈক্য
 ,Company Name,কোমপানির নাম
 DocType: SMS Center,Total Message(s),মোট বার্তা (গুলি)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,স্থানান্তর জন্য নির্বাচন আইটেম
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,স্থানান্তর জন্য নির্বাচন আইটেম
 DocType: Purchase Invoice,Additional Discount Percentage,অতিরিক্ত ছাড় শতাংশ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,সব সাহায্য ভিডিওর একটি তালিকা দেখুন
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,চেক জমা ছিল ব্যাংকের নির্বাচন অ্যাকাউন্ট মাথা.
@@ -1142,6 +1164,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,মিটার
 DocType: Workstation,Electricity Cost,বিদ্যুৎ খরচ
 DocType: HR Settings,Don't send Employee Birthday Reminders,কর্মচারী জন্মদিনের রিমাইন্ডার পাঠাবেন না
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,সেটিংস সংরক্ষণ করুন
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,অনুরোধ পণ্য
 DocType: Item,Inspection Criteria,ইন্সপেকশন নির্ণায়ক
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,স্থানান্তরিত
 DocType: BOM Website Item,BOM Website Item,BOM ওয়েবসাইট আইটেম
@@ -1158,11 +1182,11 @@
 DocType: Journal Entry,Total Amount in Words,শব্দ মধ্যে মোট পরিমাণ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,সেখানে একটা ভুল ছিল. এক সম্ভাব্য কারণ আপনার ফর্ম সংরক্ষণ করেন নি যে হতে পারে. সমস্যা থেকে গেলে support@erpnext.com সাথে যোগাযোগ করুন.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,আমার ট্রলি
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},যাতে টাইপ এক হতে হবে {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},যাতে টাইপ এক হতে হবে {0}
 DocType: Lead,Next Contact Date,পরের যোগাযোগ তারিখ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Qty খোলা
 DocType: Healthcare Settings,Appointment Reminder,নিয়োগ অনুস্মারক
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,পরিমাণ পরিবর্তন অ্যাকাউন্ট প্রবেশ করুন
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,পরিমাণ পরিবর্তন অ্যাকাউন্ট প্রবেশ করুন
 DocType: Student Batch Name,Student Batch Name,ছাত্র ব্যাচ নাম
 DocType: Consultation,Doctor,ডাক্তার
 DocType: Holiday List,Holiday List Name,ছুটির তালিকা নাম
@@ -1170,12 +1194,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,সূচি কোর্স
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,বিকল্প তহবিল
 DocType: Journal Entry Account,Expense Claim,ব্যয় দাবি
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,আপনি কি সত্যিই এই বাতিল সম্পদ পুনরুদ্ধার করতে চান না?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},জন্য Qty {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,আপনি কি সত্যিই এই বাতিল সম্পদ পুনরুদ্ধার করতে চান না?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},জন্য Qty {0}
 DocType: Leave Application,Leave Application,আবেদন কর
 DocType: Patient,Patient Relation,রোগীর সম্পর্ক
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,অ্যালোকেশন টুল ত্যাগ
+DocType: Item,Hub Category to Publish,হাব বিভাগ প্রকাশ করতে
 DocType: Leave Block List,Leave Block List Dates,ব্লক তালিকা তারিখগুলি ছেড়ে
+DocType: Sales Invoice,Billing Address GSTIN,বিলিং ঠিকানা জিএসটিআইএন
 DocType: Workstation,Net Hour Rate,নিট ঘন্টা হার
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,ল্যান্ড খরচ কেনার রসিদ
 DocType: Company,Default Terms,ডিফল্ট শর্তাবলী
@@ -1185,18 +1211,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},উল্লেখ করুন একটি {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,পরিমাণ বা মান কোন পরিবর্তনের সঙ্গে সরানো আইটেম.
 DocType: Delivery Note,Delivery To,বিতরণ
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,গুন টেবিল বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,গুন টেবিল বাধ্যতামূলক
 DocType: Production Planning Tool,Get Sales Orders,বিক্রয় আদেশ পান
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} নেতিবাচক হতে পারে না
 DocType: Training Event,Self-Study,নিজ পাঠ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,ডিসকাউন্ট
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,ডিসকাউন্ট
 DocType: Asset,Total Number of Depreciations,মোট Depreciations সংখ্যা
 DocType: Sales Invoice Item,Rate With Margin,মার্জিন সঙ্গে হার
 DocType: Workstation,Wages,মজুরি
 DocType: Task,Urgent,জরুরী
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},টেবিলের সারি {0} জন্য একটি বৈধ সারি আইডি উল্লেখ করুন {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,পরিবর্তনশীল খুঁজে পাওয়া যায়নি:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,নমপ্যাড থেকে সম্পাদনা করার জন্য দয়া করে একটি ক্ষেত্র নির্বাচন করুন
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,নমপ্যাড থেকে সম্পাদনা করার জন্য দয়া করে একটি ক্ষেত্র নির্বাচন করুন
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,ডেস্কটপে যান এবং ERPNext ব্যবহার শুরু
 DocType: Item,Manufacturer,উত্পাদক
 DocType: Landed Cost Item,Purchase Receipt Item,কেনার রসিদ আইটেম
@@ -1227,8 +1253,8 @@
 DocType: GL Entry,Against,বিরুদ্ধে
 DocType: Item,Default Selling Cost Center,ডিফল্ট বিক্রি খরচ কেন্দ্র
 DocType: Sales Partner,Implementation Partner,বাস্তবায়ন অংশীদার
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,জিপ কোড
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},বিক্রয় আদেশ {0} হল {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,জিপ কোড
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},বিক্রয় আদেশ {0} হল {1}
 DocType: Opportunity,Contact Info,যোগাযোগের তথ্য
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,শেয়ার দাখিলা তৈরীর
 DocType: Packing Slip,Net Weight UOM,নিট ওজন UOM
@@ -1239,6 +1265,7 @@
 DocType: Holiday List,Get Weekly Off Dates,সাপ্তাহিক ছুটি তারিখগুলি করুন
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,শেষ তারিখ জন্ম কম হতে পারে না
 DocType: Sales Person,Select company name first.,প্রথমটি বেছে নিন কোম্পানির নাম.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,কম থেকে বেশি
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,এবার সরবরাহকারী থেকে প্রাপ্ত.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOM প্রতিস্থাপন করুন এবং সমস্ত BOMs মধ্যে সর্বশেষ মূল্য আপডেট করুন
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},করুন {0} | {1} {2}
@@ -1257,7 +1284,7 @@
 DocType: Program Enrollment,Transportation,পরিবহন
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,অবৈধ অ্যাট্রিবিউট
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} দাখিল করতে হবে
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},পরিমাণ থেকে কম বা সমান হতে হবে {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},পরিমাণ থেকে কম বা সমান হতে হবে {0}
 DocType: SMS Center,Total Characters,মোট অক্ষর
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},আইটেম জন্য BOM ক্ষেত্রের মধ্যে BOM নির্বাচন করুন {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,সি-ফরম চালান বিস্তারিত
@@ -1272,7 +1299,7 @@
 ,Ordered Items To Be Billed,আদেশ আইটেম বিল তৈরি করা
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,বিন্যাস কম হতে হয়েছে থেকে চেয়ে পরিসীমা
 DocType: Global Defaults,Global Defaults,আন্তর্জাতিক ডিফল্ট
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,প্রকল্প সাহায্য আমন্ত্রণ
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,প্রকল্প সাহায্য আমন্ত্রণ
 DocType: Salary Slip,Deductions,Deductions
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,কর্ম নাম
@@ -1290,13 +1317,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,বিক্রয় চালান অগ্রিম
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,কিছুই অনুরোধ করতে
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},আরেকটি বাজেট রেকর্ড &#39;{0}&#39; ইতিমধ্যে বিরুদ্ধে বিদ্যমান {1} &#39;{2}&#39; অর্থবছরের জন্য {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','প্রকৃত আরম্ভের তারিখ' কখনই 'প্রকৃত শেষ তারিখ' থেকে বেশি হতে পারে না
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','প্রকৃত আরম্ভের তারিখ' কখনই 'প্রকৃত শেষ তারিখ' থেকে বেশি হতে পারে না
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,ম্যানেজমেন্ট
 DocType: Cheque Print Template,Payer Settings,প্রদায়ক সেটিংস
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","এই বৈকল্পিক আইটেম কোড যোগ করা হবে. আপনার সমাহার &quot;এস এম&quot;, এবং উদাহরণস্বরূপ, যদি আইটেমটি কোড &quot;টি-শার্ট&quot;, &quot;টি-শার্ট-এস এম&quot; হতে হবে বৈকল্পিক আইটেমটি কোড"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,আপনি বেতন স্লিপ সংরক্ষণ একবার (কথায়) নিট পে দৃশ্যমান হবে.
 DocType: Purchase Invoice,Is Return,ফিরে যেতে হবে
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,সতর্কতা
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,সতর্কতা
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,রিটার্ন / ডেবিট নোট
 DocType: Price List Country,Price List Country,মূল্যতালিকা দেশ
 DocType: Item,UOMs,UOMs
@@ -1311,17 +1338,18 @@
 DocType: Account,Balance Sheet,হিসাবনিকাশপত্র
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',&#39;আইটেম কোড দিয়ে আইটেমের জন্য কেন্দ্র উড়ানের তালিকাটি
 DocType: Fee Validity,Valid Till,বৈধ পর্যন্ত
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","পেমেন্ট মোড কনফিগার করা হয়নি. অনুগ্রহ করে পরীক্ষা করুন, কিনা অ্যাকাউন্ট পেমেন্ট মোড বা পিওএস প্রোফাইল উপর স্থাপন করা হয়েছে."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","পেমেন্ট মোড কনফিগার করা হয়নি. অনুগ্রহ করে পরীক্ষা করুন, কিনা অ্যাকাউন্ট পেমেন্ট মোড বা পিওএস প্রোফাইল উপর স্থাপন করা হয়েছে."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,একই আইটেম একাধিক বার প্রবেশ করানো যাবে না.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","আরও অ্যাকাউন্ট দলের অধীনে করা যেতে পারে, কিন্তু এন্ট্রি অ গ্রুপের বিরুদ্ধে করা যেতে পারে"
 DocType: Lead,Lead,লিড
 DocType: Email Digest,Payables,Payables
 DocType: Course,Course Intro,কোর্সের মুখ্য পৃষ্ঠা Privacy Policy
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,শেয়ার এণ্ট্রি {0} সৃষ্টি
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,অনুগ্রহ করে সেটআপ&gt; নম্বরিং সিরিজ এর মাধ্যমে উপস্থিতি জন্য ধারাবাহিক সংখ্যা নির্ধারণ করুন
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,শেয়ার এণ্ট্রি {0} সৃষ্টি
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,সারি # {0}: স্টক ক্রয় ফেরত মধ্যে প্রবেশ করা যাবে না প্রত্যাখ্যাত
 ,Purchase Order Items To Be Billed,ক্রয় আদেশ আইটেম বিল তৈরি করা
 DocType: Purchase Invoice Item,Net Rate,নিট হার
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,একটি গ্রাহক নির্বাচন করুন
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,একটি গ্রাহক নির্বাচন করুন
 DocType: Purchase Invoice Item,Purchase Invoice Item,চালান আইটেম ক্রয়
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,স্টক লেজার দাখিলা এবং GL সাজপোশাকটি নির্বাচিত ক্রয় রসিদ জন্য রিপোস্ট হয়
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,আইটেম 1
@@ -1340,7 +1368,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},সদৃশ সারিতে {0} একই {1}
 ,Trial Balance,ট্রায়াল ব্যালেন্স
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,অর্থবছরের {0} পাওয়া যায়নি
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,এমপ্লয়িজ স্থাপনের
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,এমপ্লয়িজ স্থাপনের
 DocType: Sales Order,SO-,SO-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,প্রথম উপসর্গ নির্বাচন করুন
 DocType: Employee,O-,o-
@@ -1352,12 +1380,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,দেখুন লেজার
 DocType: Grading Scale,Intervals,অন্তর
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,পুরনো
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","একটি আইটেম গ্রুপ একই নামের সঙ্গে বিদ্যমান, আইটেমের নাম পরিবর্তন বা আইটেম গ্রুপ নামান্তর করুন"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","একটি আইটেম গ্রুপ একই নামের সঙ্গে বিদ্যমান, আইটেমের নাম পরিবর্তন বা আইটেম গ্রুপ নামান্তর করুন"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,শিক্ষার্থীর মোবাইল নং
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,বিশ্বের বাকি
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,বিশ্বের বাকি
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,আইটেম {0} ব্যাচ থাকতে পারে না
 ,Budget Variance Report,বাজেট ভেদাংক প্রতিবেদন
 DocType: Salary Slip,Gross Pay,গ্রস পে
+DocType: Item,Is Item from Hub,হাব থেকে আইটেম
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,সারি {0}: কার্যকলাপ প্রকার বাধ্যতামূলক.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,লভ্যাংশ দেওয়া
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,অ্যাকাউন্টিং লেজার
@@ -1367,8 +1396,9 @@
 DocType: Vehicle Log,Service Detail,পরিষেবা বিস্তারিত
 DocType: BOM,Item Description,পন্নের বর্ণনা
 DocType: Student Sibling,Student Sibling,ছাত্র অমুসলিম
-DocType: Purchase Invoice,Is Recurring,পুনরাবৃত্ত হয়
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,পরিশোধের মাধ্যম
 DocType: Purchase Invoice,Supplied Items,সরবরাহকৃত চলছে
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},রেস্টুরেন্ট {0} জন্য একটি সক্রিয় মেনু সেট করুন
 DocType: Student,STUD.,প্রজননের জন্য নিযুক্ত.
 DocType: Production Order,Qty To Manufacture,উত্পাদনপ্রণালী Qty
 DocType: Email Digest,New Income,নতুন আয়
@@ -1378,6 +1408,7 @@
 ,Student and Guardian Contact Details,ছাত্র এবং গার্ডিয়ান যোগাযোগের তথ্য
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,সারি {0}: সরবরাহকারী জন্য {0} ইমেল ঠিকানা ইমেল পাঠাতে প্রয়োজন বোধ করা হয়
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,অস্থায়ী খোলা
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,দেখুন হাব
 ,Employee Leave Balance,কর্মচারী ছুটি ভারসাম্য
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},অ্যাকাউন্টের জন্য ব্যালেন্স {0} সবসময় হতে হবে {1}
 DocType: Patient Appointment,More Info,অধিক তথ্য
@@ -1397,13 +1428,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,বিক্রয় আদেশ {0} বৈধ নয়
 DocType: Supplier Scorecard,Warn for new Request for Quotations,উদ্ধৃতি জন্য নতুন অনুরোধের জন্য সতর্কতা
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,ক্রয় আদেশ আপনি পরিকল্পনা সাহায্য এবং আপনার ক্রয়ের উপর ফলোআপ
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","দুঃখিত, কোম্পানি মার্জ করা যাবে না"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","দুঃখিত, কোম্পানি মার্জ করা যাবে না"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,ল্যাব টেস্ট প্রেসক্রিপশন
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",মোট ইস্যু / স্থানান্তর পরিমাণ {0} উপাদান অনুরোধ মধ্যে {1} \ আইটেম জন্য অনুরোধ পরিমাণ {2} তার চেয়ে অনেক বেশী হতে পারে না {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,ছোট
 DocType: Employee,Employee Number,চাকুরিজীবী সংখ্যা
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},মামলা নং (গুলি) ইতিমধ্যে ব্যবহারে রয়েছে. মামলা নং থেকে কর {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},মামলা নং (গুলি) ইতিমধ্যে ব্যবহারে রয়েছে. মামলা নং থেকে কর {0}
 DocType: Project,% Completed,% সম্পন্ন হয়েছে
 ,Invoiced Amount (Exculsive Tax),Invoiced পরিমাণ (Exculsive ট্যাক্স)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,আইটেম 2
@@ -1418,11 +1449,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,পরোক্ষ খরচ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,সারি {0}: Qty বাধ্যতামূলক
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,কৃষি
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,সিঙ্ক মাস্টার ডেটা
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,সিঙ্ক মাস্টার ডেটা
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,আপনার পণ্য বা সেবা
 DocType: Special Test Items,Special Test Items,বিশেষ টেস্ট আইটেম
 DocType: Mode of Payment,Mode of Payment,পেমেন্ট মোড
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,ওয়েবসাইট চিত্র একটি পাবলিক ফাইল বা ওয়েবসাইট URL হওয়া উচিত
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,ওয়েবসাইট চিত্র একটি পাবলিক ফাইল বা ওয়েবসাইট URL হওয়া উচিত
 DocType: Student Applicant,AP,পি
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,এটি একটি root আইটেমটি গ্রুপ এবং সম্পাদনা করা যাবে না.
@@ -1430,24 +1461,23 @@
 DocType: Vehicle,Fuel UOM,জ্বালানীর UOM
 DocType: Warehouse,Warehouse Contact Info,ওয়ারহাউস যোগাযোগের তথ্য
 DocType: Payment Entry,Write Off Difference Amount,বন্ধ লিখতে পার্থক্য পরিমাণ
-DocType: Purchase Invoice,Recurring Type,আবর্তক ধরন
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: কর্মচারী ইমেল পাওয়া যায়নি, অত: পর না পাঠানো ই-মেইল"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: কর্মচারী ইমেল পাওয়া যায়নি, অত: পর না পাঠানো ই-মেইল"
 DocType: Item,Foreign Trade Details,বৈদেশিক বানিজ্য বিবরণ
+,Assessment Plan Status,মূল্যায়ন পরিকল্পনা স্থিতি
 DocType: Email Digest,Annual Income,বার্ষিক আয়
 DocType: Serial No,Serial No Details,সিরিয়াল কোন বিবরণ
 DocType: Purchase Invoice Item,Item Tax Rate,আইটেমটি ট্যাক্স হার
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,দয়া করে চিকিত্সক এবং তারিখ নির্বাচন করুন
 DocType: Student Group Student,Group Roll Number,গ্রুপ রোল নম্বর
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, শুধুমাত্র ক্রেডিট অ্যাকাউন্ট অন্য ডেবিট এন্ট্রি বিরুদ্ধে সংযুক্ত করা যাবে জন্য"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,সব কাজের ওজন মোট হওয়া উচিত 1. অনুযায়ী সব প্রকল্পের কাজগুলো ওজন নিয়ন্ত্রন করুন
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,হুণ্ডি {0} দাখিল করা হয় না
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,সব কাজের ওজন মোট হওয়া উচিত 1. অনুযায়ী সব প্রকল্পের কাজগুলো ওজন নিয়ন্ত্রন করুন
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,হুণ্ডি {0} দাখিল করা হয় না
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,আইটেম {0} একটি সাব-সংকুচিত আইটেম হতে হবে
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,ক্যাপিটাল উপকরণ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","প্রাইসিং রুল প্রথম উপর ভিত্তি করে নির্বাচন করা হয় আইটেম, আইটেম গ্রুপ বা ব্র্যান্ড হতে পারে, যা ক্ষেত্র &#39;প্রয়োগ&#39;."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,প্রথম আইটেম কোড প্রথম সেট করুন
-DocType: Hub Settings,Seller Website,বিক্রেতা ওয়েবসাইট
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,প্রথম আইটেম কোড প্রথম সেট করুন
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,সেলস টিম জন্য মোট বরাদ্দ শতাংশ 100 হওয়া উচিত
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,সেলস টিম জন্য মোট বরাদ্দ শতাংশ 100 হওয়া উচিত
 DocType: Sales Invoice Item,Edit Description,সম্পাদনা বিবরণ
 DocType: Antibiotic,Antibiotic,জীবাণু-প্রতিরোধী
 ,Team Updates,টিম আপডেট
@@ -1468,12 +1498,12 @@
 DocType: Purchase Invoice,Total (Company Currency),মোট (কোম্পানি একক)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,{0} সিরিয়াল নম্বর একবারের বেশি প্রবেশ
 DocType: Depreciation Schedule,Journal Entry,জার্নাল এন্ট্রি
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} প্রগতিতে আইটেম
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} প্রগতিতে আইটেম
 DocType: Workstation,Workstation Name,ওয়ার্কস্টেশন নাম
 DocType: Grading Scale Interval,Grade Code,গ্রেড কোড
 DocType: POS Item Group,POS Item Group,পিওএস আইটেম গ্রুপ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ডাইজেস্ট ইমেল:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} আইটেম অন্তর্গত নয় {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} আইটেম অন্তর্গত নয় {1}
 DocType: Sales Partner,Target Distribution,উদ্দিষ্ট ডিস্ট্রিবিউশনের
 DocType: Salary Slip,Bank Account No.,ব্যাংক একাউন্ট নং
 DocType: Naming Series,This is the number of the last created transaction with this prefix,এই উপসর্গবিশিষ্ট সর্বশেষ নির্মিত লেনদেনের সংখ্যা
@@ -1489,10 +1519,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,উদ্ধৃতি সরবরাহকারী জন্য অনুরোধ
 DocType: Healthcare Settings,Registration Message,নিবন্ধন বার্তা
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,হার্ডওয়্যারের
-DocType: Sales Order,Recurring Upto,পুনরাবৃত্ত পর্যন্ত
 DocType: Prescription Dosage,Prescription Dosage,প্রেসক্রিপশন ডোজ
 DocType: Attendance,HR Manager,মানবসম্পদ ব্যবস্থাপক
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,একটি কোম্পানি নির্বাচন করুন
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,একটি কোম্পানি নির্বাচন করুন
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,সুবিধা বাতিল ছুটি
 DocType: Purchase Invoice,Supplier Invoice Date,সরবরাহকারী চালান তারিখ
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,প্রতি
@@ -1508,10 +1537,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,মধ্যে পাওয়া ওভারল্যাপিং শর্ত:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,জার্নাল বিরুদ্ধে এণ্ট্রি {0} ইতিমধ্যে অন্য কিছু ভাউচার বিরুদ্ধে স্থায়ী হয়
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,মোট আদেশ মান
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,খাদ্য
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,খাদ্য
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,বুড়ো রেঞ্জ 3
 DocType: Maintenance Schedule Item,No of Visits,ভিজিট কোন
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},রক্ষণাবেক্ষণ সূচি {0} বিরুদ্ধে বিদ্যমান {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,আপনি হাব আপনার আইটেম প্রকাশ করতে চান?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,নথিভুক্ত হচ্ছে ছাত্র
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},অ্যাকাউন্ট বন্ধ মুদ্রা হতে হবে {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},সব লক্ষ্য জন্য পয়েন্ট সমষ্টি এটা হয় 100 হতে হবে {0}
@@ -1522,9 +1552,9 @@
 DocType: Authorization Rule,Average Discount,গড় মূল্য ছাড়ের
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,ইউটিলিটি
-DocType: Purchase Invoice Item,Accounting,হিসাবরক্ষণ
+DocType: POS Profile,Accounting,হিসাবরক্ষণ
 DocType: Employee,EMP/,ইএমপি /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,শ্রেণীবদ্ধ আইটেমের জন্য ব্যাচ দয়া করে নির্বাচন করুন
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,শ্রেণীবদ্ধ আইটেমের জন্য ব্যাচ দয়া করে নির্বাচন করুন
 DocType: Asset,Depreciation Schedules,অবচয় সূচী
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,আবেদনের সময় বাইরে ছুটি বরাদ্দ সময়ের হতে পারে না
 DocType: Activity Cost,Projects,প্রকল্প
@@ -1540,7 +1570,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',অনুমোদন অবস্থা &#39;অনুমোদিত&#39; বা &#39;পরিত্যক্ত&#39; হতে হবে
 DocType: Physician,Contacts and Address,পরিচিতি এবং ঠিকানা
 DocType: Purchase Invoice,Contact Person,ব্যক্তি যোগাযোগ
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','প্রত্যাশিত শুরুর তারিখ' কখনও 'প্রত্যাশিত শেষ তারিখ' এর চেয়ে বড় হতে পারে না
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','প্রত্যাশিত শুরুর তারিখ' কখনও 'প্রত্যাশিত শেষ তারিখ' এর চেয়ে বড় হতে পারে না
 DocType: Course Scheduling Tool,Course End Date,কোর্স শেষ তারিখ
 DocType: Holiday List,Holidays,ছুটির
 DocType: Sales Order Item,Planned Quantity,পরিকল্পনা পরিমাণ
@@ -1548,10 +1578,11 @@
 DocType: Item,Maintain Stock,শেয়ার বজায়
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,ইতিমধ্যে উৎপাদন অর্ডার নির্মিত শেয়ার সাজপোশাকটি
 DocType: Employee,Prefered Email,Prefered ইমেইল
+DocType: Student Admission,Eligibility and Details,যোগ্যতা এবং বিবরণ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,পরিসম্পদ মধ্যে নিট পরিবর্তন
 DocType: Leave Control Panel,Leave blank if considered for all designations,সব প্রশিক্ষণে জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,টাইপ &#39;প্রকৃত&#39; সারিতে ভারপ্রাপ্ত {0} আইটেম রেট মধ্যে অন্তর্ভুক্ত করা যাবে না
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},সর্বোচ্চ: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},সর্বোচ্চ: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Datetime থেকে
 DocType: Email Digest,For Company,কোম্পানি জন্য
 apps/erpnext/erpnext/config/support.py +17,Communication log.,যোগাযোগ লগ ইন করুন.
@@ -1559,19 +1590,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,সরবরাহকারী স্কোরকার্ড ভেরিয়েবল স্কোরিং
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,রাজধানীতে পরিমাণ
 DocType: Sales Invoice,Shipping Address Name,শিপিং ঠিকানা নাম
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,হিসাবরক্ষনের তালিকা
 DocType: Material Request,Terms and Conditions Content,শর্তাবলী কনটেন্ট
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,এর চেয়ে বড় 100 হতে পারে না
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
 DocType: Maintenance Visit,Unscheduled,অনির্ধারিত
 DocType: Employee,Owned,মালিক
 DocType: Salary Detail,Depends on Leave Without Pay,বিনা বেতনে ছুটি উপর নির্ভর করে
 DocType: Pricing Rule,"Higher the number, higher the priority","উচ্চ নম্বর, উচ্চ অগ্রাধিকার"
 ,Purchase Invoice Trends,চালান প্রবণতা ক্রয়
 DocType: Employee,Better Prospects,ভাল সম্ভাবনা
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","সারি # {0}: ব্যাচ {1} শুধুমাত্র {2} Qty এ হয়েছে। দয়া করে অন্য একটি ব্যাচ যা {3} Qty এ উপলব্ধ নির্বাচন করুন অথবা একাধিক সারি মধ্যে সারি বিভক্ত, একাধিক ব্যাচ থেকে আমাদের প্রদান / সমস্যাটি"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","সারি # {0}: ব্যাচ {1} শুধুমাত্র {2} Qty এ হয়েছে। দয়া করে অন্য একটি ব্যাচ যা {3} Qty এ উপলব্ধ নির্বাচন করুন অথবা একাধিক সারি মধ্যে সারি বিভক্ত, একাধিক ব্যাচ থেকে আমাদের প্রদান / সমস্যাটি"
 DocType: Vehicle,License Plate,অনুমতি ফলক
 DocType: Appraisal,Goals,গোল
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,পিওএস প্রোফাইল নির্বাচন করুন
 DocType: Warranty Claim,Warranty / AMC Status,পাটা / এএমসি স্থিতি
 ,Accounts Browser,অ্যাকাউন্ট ব্রাউজার
 DocType: Payment Entry Reference,Payment Entry Reference,পেমেন্ট এন্ট্রি রেফারেন্স
@@ -1589,7 +1620,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,কর্মচারী নিজেকে প্রতিবেদন করতে পারবে না.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","অ্যাকাউন্ট নিথর হয় তাহলে, এন্ট্রি সীমিত ব্যবহারকারীদের অনুমতি দেওয়া হয়."
 DocType: Email Digest,Bank Balance,অধিকোষস্থিতি
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} শুধুমাত্র মুদ্রা তৈরি করা যাবে: {0} জন্য অ্যাকাউন্টিং এণ্ট্রি {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} শুধুমাত্র মুদ্রা তৈরি করা যাবে: {0} জন্য অ্যাকাউন্টিং এণ্ট্রি {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","পেশা প্রফাইল, যোগ্যতা প্রয়োজন ইত্যাদি"
 DocType: Journal Entry Account,Account Balance,হিসাবের পরিমান
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,লেনদেনের জন্য ট্যাক্স রুল.
@@ -1598,8 +1629,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),মোট কর ও শুল্ক (কোম্পানি একক)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,বন্ধ না অর্থবছরে পি &amp; এল ভারসাম্যকে দেখান
 DocType: Lab Test Template,Collection Details,সংগ্রহের বিবরণ
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","cp.etc_cache নামক cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date থেকে ট্যাব কনসকেটেশন সিটি, `ট্যাবলেট প্রেসক্রিপশন` সিপি যেখানে ct.patient = &#39;{0}&#39; এবং cp.parent = ct নির্বাচন করুন। নাম এবং cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,শিপিং অ্যাকাউন্ট
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: অ্যাকাউন্ট {2} নিষ্ক্রীয়
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,সেলস আদেশ আপনি আপনার কাজ পরিকল্পনা সাহায্য এবং আপনার জন্য-সময় বিলি করুন
@@ -1616,7 +1645,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,প্যাকিং স্লিপ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,অফিস ভাড়া
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,সেটআপ এসএমএস গেটওয়ে সেটিংস
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,আমদানি ব্যর্থ!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,আমদানি ব্যর্থ!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,কোনো ঠিকানা এখনো যোগ.
 DocType: Workstation Working Hour,Workstation Working Hour,ওয়ার্কস্টেশন কাজ ঘন্টা
 DocType: Vital Signs,Blood Pressure,রক্তচাপ
@@ -1641,7 +1670,7 @@
 DocType: Sales Invoice,Source,উত্স
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,দেখান বন্ধ
 DocType: Leave Type,Is Leave Without Pay,বিনা বেতনে ছুটি হয়
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,অ্যাসেট শ্রেণী ফিক্সড অ্যাসেট আইটেমের জন্য বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,অ্যাসেট শ্রেণী ফিক্সড অ্যাসেট আইটেমের জন্য বাধ্যতামূলক
 DocType: Fee Validity,Fee Validity,ফি বৈধতা
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,পেমেন্ট টেবিল অন্তর্ভুক্ত কোন রেকর্ড
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},এই {0} সঙ্গে দ্বন্দ্ব {1} জন্য {2} {3}
@@ -1662,8 +1691,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,নির্বাহী অনুসন্ধান
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,বাড়ে তৈরি করুন
 DocType: Maintenance Schedule,Schedules,সূচী
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,পয়েন্ট-অফ-সেল ব্যবহার করার জন্য পিওএস প্রোফাইল প্রয়োজন
 DocType: Purchase Invoice Item,Net Amount,থোক
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} জমা দেওয়া হয়েছে করেননি তাই কর্ম সম্পন্ন করা যাবে না
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} জমা দেওয়া হয়েছে করেননি তাই কর্ম সম্পন্ন করা যাবে না
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM বিস্তারিত কোন
 DocType: Landed Cost Voucher,Additional Charges,অতিরিক্ত চার্জ
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),অতিরিক্ত মূল্য ছাড়ের পরিমাণ (কোম্পানি একক)
@@ -1672,7 +1702,7 @@
 ,Support Hour Distribution,সাপোর্ট ঘন্টা বিতরণ
 DocType: Maintenance Visit,Maintenance Visit,রক্ষণাবেক্ষণ পরিদর্শন
 DocType: Student,Leaving Certificate Number,লিভিং সার্টিফিকেট নম্বর
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","নিয়োগ বাতিল, দয়া করে পর্যালোচনা করুন এবং চালান বাতিল করুন {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","নিয়োগ বাতিল, দয়া করে পর্যালোচনা করুন এবং চালান বাতিল করুন {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,ওয়্যারহাউস এ উপলব্ধ ব্যাচ Qty
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,আপডেট প্রিন্ট বিন্যাস
 DocType: Landed Cost Voucher,Landed Cost Help,ল্যান্ড খরচ সাহায্য
@@ -1695,8 +1725,8 @@
 DocType: Patient,Tobacco Past Use,তামাকের অতীত ব্যবহার
 DocType: Sales Invoice Item,Brand Name,পরিচিতিমুলক নাম
 DocType: Purchase Receipt,Transporter Details,স্থানান্তরকারী বিস্তারিত
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},ব্যবহারকারী {0} ইতিমধ্যেই চিকিত্সককে নিযুক্ত করা হয়েছে {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,ডিফল্ট গুদাম নির্বাচিত আইটেমের জন্য প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},ব্যবহারকারী {0} ইতিমধ্যেই চিকিত্সককে নিযুক্ত করা হয়েছে {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,ডিফল্ট গুদাম নির্বাচিত আইটেমের জন্য প্রয়োজন বোধ করা হয়
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,বক্স
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,সম্ভাব্য সরবরাহকারী
 DocType: Budget,Monthly Distribution,মাসিক বন্টন
@@ -1706,7 +1736,7 @@
 DocType: Sales Partner,Sales Partner Target,বিক্রয় অংশীদার উদ্দিষ্ট
 DocType: Loan Type,Maximum Loan Amount,সর্বোচ্চ ঋণের পরিমাণ
 DocType: Pricing Rule,Pricing Rule,প্রাইসিং রুল
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},শিক্ষার্থীর জন্য ডুপ্লিকেট রোল নম্বর {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},শিক্ষার্থীর জন্য ডুপ্লিকেট রোল নম্বর {0}
 DocType: Budget,Action if Annual Budget Exceeded,যদি বার্ষিক বাজেট অতিক্রম করেছে অ্যাকশন
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,আদেশ ক্রয় উপাদানের জন্য অনুরোধ
 DocType: Shopping Cart Settings,Payment Success URL,পেমেন্ট সাফল্য ইউআরএল
@@ -1723,7 +1753,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} শুধুমাত্র একবার প্রদর্শিত হতে হবে
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},আরো tranfer করা অনুমোদিত নয় {0} চেয়ে {1} ক্রয় আদেশের বিরুদ্ধে {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},সাফল্যের বরাদ্দ পাতার {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,কোনও আইটেম প্যাক
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,কোনও আইটেম প্যাক
 DocType: Shipping Rule Condition,From Value,মূল্য থেকে
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,উৎপাদন পরিমাণ বাধ্যতামূলক
 DocType: Employee Loan,Repayment Method,পরিশোধ পদ্ধতি
@@ -1737,6 +1767,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,শেয়ার দায়
 DocType: Purchase Invoice,Supplier Warehouse,সরবরাহকারী ওয়্যারহাউস
 DocType: Opportunity,Contact Mobile No,যোগাযোগ মোবাইল নম্বর
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,কোম্পানী নির্বাচন করুন
 ,Material Requests for which Supplier Quotations are not created,"সরবরাহকারী এবার তৈরি করা যাবে না, যার জন্য উপাদান অনুরোধ"
 DocType: Student Group,Set 0 for no limit,কোন সীমা 0 সেট
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"আপনি ছুটি জন্য আবেদন করেন, যা প্রথম দিন (গুলি) ছুটির হয়. আপনি চলে জন্য আবেদন করার প্রয়োজন নেই."
@@ -1746,24 +1777,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,উদ্ধৃতি করা
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,অন্যান্য রিপোর্ট
 DocType: Dependent Task,Dependent Task,নির্ভরশীল কার্য
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},মেজার ডিফল্ট ইউনিট জন্য রূপান্তর গুণনীয়ক সারিতে 1 হতে হবে {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},মেজার ডিফল্ট ইউনিট জন্য রূপান্তর গুণনীয়ক সারিতে 1 হতে হবে {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},ধরনের ছুটি {0} চেয়ে বেশি হতে পারেনা {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,অগ্রিম এক্স দিনের জন্য অপারেশন পরিকল্পনা চেষ্টা করুন.
 DocType: HR Settings,Stop Birthday Reminders,বন্ধ করুন জন্মদিনের রিমাইন্ডার
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},কোম্পানির মধ্যে ডিফল্ট বেতনের প্রদেয় অ্যাকাউন্ট নির্ধারণ করুন {0}
 DocType: SMS Center,Receiver List,রিসিভার তালিকা
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,অনুসন্ধান আইটেম
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,অনুসন্ধান আইটেম
 DocType: Patient Appointment,Referring Physician,উল্লেখ চিকিৎসক
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ক্ষয়প্রাপ্ত পরিমাণ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,ক্যাশ মধ্যে নিট পরিবর্তন
 DocType: Assessment Plan,Grading Scale,শূন্য স্কেল
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,মেজার {0} এর ইউনিট রূপান্তর ফ্যাক্টর ছক একাধিকবার প্রবেশ করানো হয়েছে
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,ইতিমধ্যে সম্পন্ন
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,মেজার {0} এর ইউনিট রূপান্তর ফ্যাক্টর ছক একাধিকবার প্রবেশ করানো হয়েছে
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,ইতিমধ্যে সম্পন্ন
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,শেয়ার হাতে
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},পেমেন্ট অনুরোধ ইতিমধ্যেই বিদ্যমান {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,প্রথম প্রকাশ আইটেম খরচ
 DocType: Physician,Hospital,হাসপাতাল
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},পরিমাণ বেশী হবে না {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},পরিমাণ বেশী হবে না {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,গত অর্থবছরের বন্ধ হয়নি
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),বয়স (দিন)
 DocType: Quotation Item,Quotation Item,উদ্ধৃতি আইটেম
@@ -1774,8 +1805,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,সরবরাহকারী প্রকার মাস্টার.
 DocType: Purchase Order Item,Supplier Part Number,সরবরাহকারী পার্ট সংখ্যা
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,রূপান্তরের হার 0 বা 1 হতে পারে না
-DocType: Sales Invoice,Reference Document,রেফারেন্স নথি
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} বাতিল বা বন্ধ করা
+DocType: Subscription,Reference Document,রেফারেন্স নথি
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} বাতিল বা বন্ধ করা
 DocType: Accounts Settings,Credit Controller,ক্রেডিট কন্ট্রোলার
 DocType: Delivery Note,Vehicle Dispatch Date,যানবাহন ডিসপ্যাচ তারিখ
 DocType: Healthcare Settings,Default Medical Code Standard,ডিফল্ট মেডিকেল কোড স্ট্যান্ডার্ড
@@ -1784,6 +1815,7 @@
 DocType: Company,Default Payable Account,ডিফল্ট প্রদেয় অ্যাকাউন্ট
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","যেমন গ্রেপ্তার নিয়ম, মূল্যতালিকা ইত্যাদি হিসাবে অনলাইন শপিং কার্ট এর সেটিংস"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% চালান করা হয়েছে
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,মূল্য অনুসারে সাজান ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,সংরক্ষিত Qty
 DocType: Party Account,Party Account,পক্ষের অ্যাকাউন্টে
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,মানব সম্পদ
@@ -1795,13 +1827,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,বিতরণ এণ্ট্রি করুন
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,সারি {0}: সরবরাহকারীর বিরুদ্ধে অগ্রিম ডেবিট করা হবে
 DocType: Company,Default Values,ডিফল্ট মান
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{ফ্রিকোয়েন্সি} ডাইজেস্ট
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{ফ্রিকোয়েন্সি} ডাইজেস্ট
 DocType: Expense Claim,Total Amount Reimbursed,মোট পরিমাণ শিশুবের
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,এই যানবাহন বিরুদ্ধে লগ উপর ভিত্তি করে তৈরি. বিস্তারিত জানার জন্য নিচের টাইমলাইনে দেখুন
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},সরবরাহকারী বিরুদ্ধে চালান {0} তারিখের {1}
 DocType: Customer,Default Price List,ডিফল্ট মূল্য তালিকা
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,অ্যাসেট আন্দোলন রেকর্ড {0} সৃষ্টি
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,আপনি মুছে ফেলতে পারবেন না অর্থবছরের {0}. অর্থবছরের {0} গ্লোবাল সেটিংস এ ডিফল্ট হিসাবে সেট করা হয়
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,একই নামের একটি গ্রাহক ইতিমধ্যে বিদ্যমান
 DocType: Journal Entry,Entry Type,এন্ট্রি টাইপ
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,কোন মূল্যায়ন পরিকল্পনা এই মূল্যায়নের দলের সঙ্গে সংযুক্ত
 ,Customer Credit Balance,গ্রাহকের ক্রেডিট ব্যালেন্স
@@ -1811,7 +1844,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,প্রাইসিং
 DocType: Quotation,Term Details,টার্ম বিস্তারিত
 DocType: Project,Total Sales Cost (via Sales Order),মোট বিক্রয় খরচ (বিক্রয় আদেশ এর মাধ্যমে)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,{0} এই ছাত্র দলের জন্য ছাত্রদের তুলনায় আরো নথিভুক্ত করা যায় না.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,{0} এই ছাত্র দলের জন্য ছাত্রদের তুলনায় আরো নথিভুক্ত করা যায় না.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,লিড কাউন্ট
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,"{0}, 0 থেকে বেশী হতে হবে"
 DocType: Manufacturing Settings,Capacity Planning For (Days),(দিন) জন্য ক্ষমতা পরিকল্পনা
@@ -1827,9 +1860,11 @@
 DocType: Lab Test,Technician Name,প্রযুক্তিবিদ নাম
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,চালান বাতিলের পেমেন্ট লিঙ্কমুক্ত
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},বর্তমান দূরত্বমাপণী পড়া প্রবেশ প্রাথমিক যানবাহন ওডোমিটার চেয়ে বড় হতে হবে {0}
+DocType: Restaurant Reservation,No Show,না দেখান
 DocType: Shipping Rule Country,Shipping Rule Country,শিপিং রুল দেশ
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,ত্যাগ এবং অ্যাটেনডেন্স
 DocType: Maintenance Visit,Partially Completed,আংশিকভাবে সম্পন্ন
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,মাঝারি সংবেদনশীলতা
 DocType: Leave Type,Include holidays within leaves as leaves,পাতার হিসাবে পাতার মধ্যে ছুটির অন্তর্ভুক্ত
 DocType: Sales Invoice,Packed Items,বস্তাবন্দী আইটেম
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,ক্রমিক নং বিরুদ্ধে পাটা দাবি
@@ -1846,13 +1881,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),প্রদত্ত পরিমাণ (কোম্পানি একক)
 DocType: Purchase Invoice,Additional Discount,অতিরিক্ত ছাড়
 DocType: Selling Settings,Selling Settings,সেটিংস বিক্রি
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,অ্যাকশন নিশ্চিত করুন
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,অনলাইন নিলাম
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,পরিমাণ বা মূল্যনির্ধারণ হার বা উভয়ই উল্লেখ করুন
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,সিদ্ধি
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,কার্ট দেখুন
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,বিপণন খরচ
 ,Item Shortage Report,আইটেম পত্র
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ওজন \ n দয়া খুব &quot;ওজন UOM&quot; উল্লেখ, উল্লেখ করা হয়"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ওজন \ n দয়া খুব &quot;ওজন UOM&quot; উল্লেখ, উল্লেখ করা হয়"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,উপাদানের জন্য অনুরোধ এই স্টক এন্ট্রি করতে ব্যবহৃত
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,পরবর্তী অবচয় তারিখ নতুন সম্পদের জন্য বাধ্যতামূলক
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,প্রত্যেক ব্যাচ জন্য আলাদা কোর্স ভিত্তিক গ্রুপ
@@ -1864,12 +1900,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,প্রতি স্টক আন্দোলনের জন্য অ্যাকাউন্টিং এন্ট্রি করতে
 DocType: Leave Allocation,Total Leaves Allocated,মোট পাতার বরাদ্দ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},সারি কোন সময়ে প্রয়োজনীয় গুদাম {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,বৈধ আর্থিক বছরের শুরু এবং শেষ তারিখগুলি লিখুন দয়া করে
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,বৈধ আর্থিক বছরের শুরু এবং শেষ তারিখগুলি লিখুন দয়া করে
 DocType: Employee,Date Of Retirement,অবসর তারিখ
 DocType: Upload Attendance,Get Template,টেমপ্লেট করুন
 DocType: Material Request,Transferred,স্থানান্তরিত
 DocType: Vehicle,Doors,দরজা
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext সেটআপ সম্পূর্ণ!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext সেটআপ সম্পূর্ণ!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,রোগীর নিবন্ধন জন্য ফি সংগ্রহ করুন
 DocType: Course Assessment Criteria,Weightage,গুরুত্ব
 DocType: Purchase Invoice,Tax Breakup,ট্যাক্স ছুটি
@@ -1888,36 +1924,36 @@
 DocType: Employee,AB+,এবি + +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","এই আইটেমটি ভিন্নতা আছে, তাহলে এটি বিক্রয় আদেশ ইত্যাদি নির্বাচন করা যাবে না"
 DocType: Lead,Next Contact By,পরবর্তী যোগাযোগ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},সারিতে আইটেম {0} জন্য প্রয়োজনীয় পরিমাণ {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},সারিতে আইটেম {0} জন্য প্রয়োজনীয় পরিমাণ {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},পরিমাণ আইটেমটি জন্য বিদ্যমান হিসাবে ওয়্যারহাউস {0} মোছা যাবে না {1}
 DocType: Quotation,Order Type,যাতে টাইপ
-DocType: Purchase Invoice,Notification Email Address,বিজ্ঞপ্তি ইমেল ঠিকানা
 ,Item-wise Sales Register,আইটেম-জ্ঞানী সেলস নিবন্ধন
 DocType: Asset,Gross Purchase Amount,গ্রস ক্রয়ের পরিমাণ
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,খোলা ব্যালেন্স
 DocType: Asset,Depreciation Method,অবচয় পদ্ধতি
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,অফলাইন
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,অফলাইন
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,মৌলিক হার মধ্যে অন্তর্ভুক্ত এই খাজনা?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,মোট লক্ষ্যমাত্রা
 DocType: Job Applicant,Applicant for a Job,একটি কাজের জন্য আবেদনকারী
 DocType: Production Plan Material Request,Production Plan Material Request,উৎপাদন পরিকল্পনা উপাদান অনুরোধ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,নির্মিত কোন উৎপাদন আদেশ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,নির্মিত কোন উৎপাদন আদেশ
 DocType: Stock Reconciliation,Reconciliation JSON,রিকনসিলিয়েশন JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,অনেক কলাম. প্রতিবেদন এবং রফতানি একটি স্প্রেডশীট অ্যাপ্লিকেশন ব্যবহার করে তা প্রিন্ট করা হবে.
 DocType: Purchase Invoice Item,Batch No,ব্যাচ নাম্বার
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},উদ্ধৃতি জন্য অনুরোধ: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,একটি গ্রাহকের ক্রয় আদেশের বিরুদ্ধে একাধিক বিক্রয় আদেশ মঞ্জুরি
 DocType: Student Group Instructor,Student Group Instructor,শিক্ষার্থীর গ্রুপ প্রশিক্ষক
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 মোবাইল কোন
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,প্রধান
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,প্রধান
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,বৈকল্পিক
 DocType: Naming Series,Set prefix for numbering series on your transactions,আপনার লেনদেনের উপর সিরিজ সংখ্যায়ন জন্য সেট উপসর্গ
 DocType: Employee Attendance Tool,Employees HTML,এমপ্লয়িজ এইচটিএমএল
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,ডিফল্ট BOM ({0}) এই আইটেমটি বা তার টেমপ্লেট জন্য সক্রিয় হতে হবে
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,ডিফল্ট BOM ({0}) এই আইটেমটি বা তার টেমপ্লেট জন্য সক্রিয় হতে হবে
 DocType: Employee,Leave Encashed?,Encashed ত্যাগ করবেন?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ক্ষেত্রের থেকে সুযোগ বাধ্যতামূলক
 DocType: Email Digest,Annual Expenses,বার্ষিক খরচ
 DocType: Item,Variants,রুপভেদ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,ক্রয় আদেশ করা
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,ক্রয় আদেশ করা
 DocType: SMS Center,Send To,পাঠানো
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},ছুটি টাইপ জন্য যথেষ্ট ছুটি ভারসাম্য নেই {0}
 DocType: Payment Reconciliation Payment,Allocated amount,বরাদ্দ পরিমাণ
@@ -1933,6 +1969,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,শিক্ষার্থীর গ্রুপ স্ট্রেংথ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,জার্নাল বিরুদ্ধে এণ্ট্রি {0} কোনো অপ্রতিম {1} এন্ট্রি নেই
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,appraisals
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,প্রশিক্ষণ ইভেন্টস
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},সিরিয়াল কোন আইটেম জন্য প্রবেশ সদৃশ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,একটি শিপিং শাসনের জন্য একটি শর্ত
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,অনুগ্রহ করে প্রবেশ করুন
@@ -1942,7 +1979,7 @@
 DocType: Sales Order,To Deliver and Bill,রক্ষা কর এবং বিল থেকে
 DocType: Student Group,Instructors,প্রশিক্ষক
 DocType: GL Entry,Credit Amount in Account Currency,অ্যাকাউন্টের মুদ্রা মধ্যে ক্রেডিট পরিমাণ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} দাখিল করতে হবে
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} দাখিল করতে হবে
 DocType: Authorization Control,Authorization Control,অনুমোদন কন্ট্রোল
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},সারি # {0}: ওয়্যারহাউস প্রত্যাখ্যাত প্রত্যাখ্যান আইটেম বিরুদ্ধে বাধ্যতামূলক {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,প্রদান
@@ -1961,11 +1998,11 @@
 DocType: Quotation Item,Actual Qty,প্রকৃত স্টক
 DocType: Sales Invoice Item,References,তথ্যসূত্র
 DocType: Quality Inspection Reading,Reading 10,10 পঠন
-DocType: Hub Settings,Hub Node,হাব নোড
+DocType: Hub Category,Hub Node,হাব নোড
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,আপনি ডুপ্লিকেট জিনিস প্রবেশ করে. ত্রুটিমুক্ত এবং আবার চেষ্টা করুন.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,সহযোগী
 DocType: Asset Movement,Asset Movement,অ্যাসেট আন্দোলন
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,নিউ কার্ট
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,নিউ কার্ট
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} আইটেম ধারাবাহিকভাবে আইটেম নয়
 DocType: SMS Center,Create Receiver List,রিসিভার তালিকা তৈরি করুন
 DocType: Vehicle,Wheels,চাকা
@@ -1979,15 +2016,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,টেলিযোগাযোগ
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),বাক্স এই বন্টন (শুধু খসড়া) একটি অংশ কিনা তা চিহ্নিত
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,পেমেন্ট এন্ট্রি করতে
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},আইটেমের জন্য পরিমাণ {0} চেয়ে কম হতে হবে {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},আইটেমের জন্য পরিমাণ {0} চেয়ে কম হতে হবে {1}
 ,Sales Invoice Trends,বিক্রয় চালান প্রবণতা
 DocType: Leave Application,Apply / Approve Leaves,পাতার অনুমোদন / প্রয়োগ
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,জন্য
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,জন্য
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',বা &#39;পূর্ববর্তী সারি মোট&#39; &#39;পূর্ববর্তী সারি পরিমাণ&#39; চার্জ টাইপ শুধুমাত্র যদি সারিতে পাঠাতে পারেন
 DocType: Sales Order Item,Delivery Warehouse,ডেলিভারি ওয়্যারহাউস
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,আর্থিক খরচ কেন্দ্রগুলি বৃক্ষ.
 DocType: Serial No,Delivery Document No,ডেলিভারি ডকুমেন্ট
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},কোম্পানি &#39;অ্যাসেট নিষ্পত্তির লাভ / ক্ষতির অ্যাকাউন্ট&#39; নির্ধারণ করুন {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},কোম্পানি &#39;অ্যাসেট নিষ্পত্তির লাভ / ক্ষতির অ্যাকাউন্ট&#39; নির্ধারণ করুন {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,ক্রয় রসিদ থেকে জানানোর পান
 DocType: Serial No,Creation Date,তৈরির তারিখ
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},{0} আইটেমের মূল্য তালিকা একাধিক বার প্রদর্শিত {1}
@@ -1998,11 +2035,12 @@
 DocType: Student,Student Mobile Number,শিক্ষার্থীর মোবাইল নম্বর
 DocType: Item,Has Variants,ধরন আছে
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,প্রতিক্রিয়া আপডেট করুন
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},আপনি ইতিমধ্যে থেকে আইটেম নির্বাচন করা আছে {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},আপনি ইতিমধ্যে থেকে আইটেম নির্বাচন করা আছে {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,মাসিক বন্টন নাম
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ব্যাচ আইডি বাধ্যতামূলক
 DocType: Sales Person,Parent Sales Person,মূল সেলস পারসন
-DocType: Purchase Invoice,Recurring Invoice,পুনরাবৃত্ত চালান
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,উচ্চ থেকে নিম্ন
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,প্রোগ্রাম প্রথম নির্বাচন করুন
 DocType: Patient Appointment,Patient Age,রোগীর বয়স
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,প্রকল্প পরিচালনার
 DocType: Supplier,Supplier of Goods or Services.,পণ্য বা সেবার সরবরাহকারী.
@@ -2010,8 +2048,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,পরামর্শদাতা চার্জগুলি বুক করতে রোগীর ক্ষেত্রে সেট না করা হলে ডিফল্ট গ্রহণযোগ্য অ্যাকাউন্টগুলি ব্যবহার করা হবে।
 DocType: Vehicle Log,Fuel Price,জ্বালানীর দাম
 DocType: Budget,Budget,বাজেট
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,খুলুন সেট করুন
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,পরিসম্পদ আইটেম একটি অ স্টক আইটেম হতে হবে.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,খুলুন সেট করুন
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,পরিসম্পদ আইটেম একটি অ স্টক আইটেম হতে হবে.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",এটি একটি আয় বা ব্যয় অ্যাকাউন্ট না হিসাবে বাজেট বিরুদ্ধে {0} নিয়োগ করা যাবে না
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,অর্জন
 DocType: Student Admission,Application Form Route,আবেদনপত্র রুট
@@ -2025,12 +2063,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,{0} আইটেম সিরিয়াল আমরা জন্য সেটআপ নয়. আইটেম মাস্টার চেক
 DocType: Maintenance Visit,Maintenance Time,রক্ষণাবেক্ষণ সময়
 ,Amount to Deliver,পরিমাণ প্রদান করতে
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},একই আইটেম বহুবার প্রবেশ করা হয়েছে। {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,টার্ম শুরুর তারিখ চেয়ে একাডেমিক ইয়ার ইয়ার স্টার্ট তারিখ যা শব্দটি সংযুক্ত করা হয় তার আগে না হতে পারে (শিক্ষাবর্ষ {}). তারিখ সংশোধন করে আবার চেষ্টা করুন.
 DocType: Guardian,Guardian Interests,গার্ডিয়ান রুচি
 DocType: Naming Series,Current Value,বর্তমান মূল্য
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,একাধিক অর্থ বছরের তারিখ {0} জন্য বিদ্যমান. অর্থবছরে কোম্পানির নির্ধারণ করুন
 DocType: School Settings,Instructor Records to be created by,প্রশিক্ষক রেকর্ডস দ্বারা তৈরি করা হবে
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} তৈরি হয়েছে
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} তৈরি হয়েছে
 DocType: Delivery Note Item,Against Sales Order,সেলস আদেশের বিরুদ্ধে
 ,Serial No Status,সিরিয়াল কোন স্ট্যাটাস
 DocType: Payment Entry Reference,Outstanding,অনিষ্পন্ন
@@ -2040,10 +2079,10 @@
 						must be greater than or equal to {2}","সারি {0}: সেট করুন {1} পর্যায়কাল, থেকে এবং তারিখ \ করার মধ্যে পার্থক্য এর চেয়ে বড় বা সমান হবে {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,এই স্টক আন্দোলনের উপর ভিত্তি করে তৈরি. দেখুন {0} বিস্তারিত জানতে
 DocType: Pricing Rule,Selling,বিক্রি
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},পরিমাণ {0} {1} বিরুদ্ধে কাটা {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},পরিমাণ {0} {1} বিরুদ্ধে কাটা {2}
 DocType: Employee,Salary Information,বেতন তথ্য
 DocType: Sales Person,Name and Employee ID,নাম ও কর্মী ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,দরুন জন্ম তারিখ পোস্ট করার আগে হতে পারে না
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,দরুন জন্ম তারিখ পোস্ট করার আগে হতে পারে না
 DocType: Website Item Group,Website Item Group,ওয়েবসাইট আইটেমটি গ্রুপ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,কর্তব্য এবং কর
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,রেফারেন্স তারিখ লিখুন দয়া করে
@@ -2069,7 +2108,7 @@
 DocType: Issue,Resolution Details,রেজোলিউশনের বিবরণ
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,বরাে
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,গ্রহণযোগ্য বৈশিষ্ট্য
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,উপরে টেবিল উপাদান অনুরোধ দয়া করে প্রবেশ করুন
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,উপরে টেবিল উপাদান অনুরোধ দয়া করে প্রবেশ করুন
 DocType: Item Attribute,Attribute Name,নাম গুন
 DocType: BOM,Show In Website,ওয়েবসাইট দেখান
 DocType: Shopping Cart Settings,Show Quantity in Website,ওয়েবসাইট মধ্যে পরিমাণ দেখান
@@ -2078,7 +2117,7 @@
 DocType: Item Reorder,Check in (group),চেক ইন করুন (গ্রুপ)
 ,Qty to Order,অর্ডার Qty
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","দায় বা ইক্যুইটি অধীনে অ্যাকাউন্ট মাথা, যা লাভ / ক্ষতি বুকিং করা হবে"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,সমস্ত কাজগুলো Gantt চার্ট.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,সমস্ত কাজগুলো Gantt চার্ট.
 DocType: Opportunity,Mins to First Response,প্রথম প্রতিক্রিয়া মিনিট
 DocType: Pricing Rule,Margin Type,মার্জিন প্রকার
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} ঘন্টা
@@ -2099,35 +2138,35 @@
 DocType: Patient,Surgical History,অস্ত্রোপচারের ইতিহাস
 DocType: Employee,Resignation Letter Date,পদত্যাগ পত্র তারিখ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,দামে আরও পরিমাণের উপর ভিত্তি করে ফিল্টার করা হয়.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},কর্মচারী জন্য যোগদানের তারিখ সেট করুন {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},কর্মচারী জন্য যোগদানের তারিখ সেট করুন {0}
 DocType: Task,Total Billing Amount (via Time Sheet),মোট বিলিং পরিমাণ (টাইম শিট মাধ্যমে)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,পুনরাবৃত্ত গ্রাহক রাজস্ব
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ভূমিকা &#39;ব্যয় রাজসাক্ষী&#39; থাকতে হবে
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,জুড়ি
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,উত্পাদনের জন্য BOM এবং Qty নির্বাচন
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,উত্পাদনের জন্য BOM এবং Qty নির্বাচন
 DocType: Asset,Depreciation Schedule,অবচয় সূচি
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,সেলস অংশীদার ঠিকানা ও যোগাযোগ
 DocType: Bank Reconciliation Detail,Against Account,অ্যাকাউন্টের বিরুদ্ধে
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,অর্ধদিবস তারিখ তারিখ থেকে এবং তারিখ থেকে মধ্যবর্তী হওয়া উচিত
 DocType: Maintenance Schedule Detail,Actual Date,সঠিক তারিখ
 DocType: Item,Has Batch No,ব্যাচ কোন আছে
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},বার্ষিক বিলিং: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},বার্ষিক বিলিং: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),দ্রব্য এবং পরিষেবা কর (GST ভারত)
 DocType: Delivery Note,Excise Page Number,আবগারি পৃষ্ঠা সংখ্যা
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","কোম্পানি, তারিখ থেকে এবং তারিখ থেকে বাধ্যতামূলক"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,পরামর্শ থেকে পান
 DocType: Asset,Purchase Date,ক্রয় তারিখ
 DocType: Employee,Personal Details,ব্যক্তিগত বিবরণ
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},কোম্পানি &#39;অ্যাসেট অবচয় খরচ কেন্দ্র&#39; নির্ধারণ করুন {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},কোম্পানি &#39;অ্যাসেট অবচয় খরচ কেন্দ্র&#39; নির্ধারণ করুন {0}
 ,Maintenance Schedules,রক্ষণাবেক্ষণ সময়সূচী
 DocType: Task,Actual End Date (via Time Sheet),প্রকৃত শেষ তারিখ (টাইম শিট মাধ্যমে)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},পরিমাণ {0} {1} বিরুদ্ধে {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},পরিমাণ {0} {1} বিরুদ্ধে {2} {3}
 ,Quotation Trends,উদ্ধৃতি প্রবণতা
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},আইটেমটি গ্রুপ আইটেমের জন্য আইটেম মাস্টার উল্লেখ না {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,অ্যাকাউন্ট ডেবিট একটি গ্রহনযোগ্য অ্যাকাউন্ট থাকতে হবে
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,অ্যাকাউন্ট ডেবিট একটি গ্রহনযোগ্য অ্যাকাউন্ট থাকতে হবে
 DocType: Shipping Rule Condition,Shipping Amount,শিপিং পরিমাণ
 DocType: Supplier Scorecard Period,Period Score,সময়কাল স্কোর
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,গ্রাহকরা যোগ করুন
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,গ্রাহকরা যোগ করুন
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,অপেক্ষারত পরিমাণ
 DocType: Lab Test Template,Special,বিশেষ
 DocType: Purchase Invoice Item,Conversion Factor,রূপান্তর ফ্যাক্টর
@@ -2135,13 +2174,14 @@
 ,Vehicle Expenses,গাড়ির খরচ
 DocType: Serial No,Invoice Details,চালান বিস্তারিত
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},দরকারী জীবন পর প্রত্যাশিত মান এর চেয়ে বড় বা সমান হতে হবে {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,শুরু করা যাক
+DocType: Hub Category,Hub Category,হাব বিভাগ
 DocType: Purchase Invoice,SEZ,এসইজেড
 DocType: Purchase Receipt,Vehicle Number,গাড়ির সংখ্যা
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,আবর্তক চালান বন্ধ করা হবে কোন তারিখে
 DocType: Employee Loan,Loan Amount,ঋণের পরিমাণ
 DocType: Program Enrollment,Self-Driving Vehicle,স্বচালিত যানবাহন
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,সরবরাহকারী স্কোরকার্ড স্থায়ী
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},সারি {0}: সামগ্রী বিল আইটেমের জন্য পাওয়া যায়নি {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},সারি {0}: সামগ্রী বিল আইটেমের জন্য পাওয়া যায়নি {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,সর্বমোট পাতার {0} কম হতে পারে না সময়ের জন্য ইতিমধ্যেই অনুমোদন পাতার {1} চেয়ে
 DocType: Journal Entry,Accounts Receivable,গ্রহনযোগ্য অ্যাকাউন্ট
 ,Supplier-Wise Sales Analytics,সরবরাহকারী প্রজ্ঞাময় বিক্রয় বিশ্লেষণ
@@ -2152,7 +2192,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","মূল কোর্স (ফাঁকা ছেড়ে দিন, যদি এই মূল কোর্সের অংশ নয়)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,সব কর্মচারী ধরনের জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন
 DocType: Landed Cost Voucher,Distribute Charges Based On,বিতরণ অভিযোগে নির্ভরশীল
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,এইচআর সেটিংস
 DocType: Salary Slip,net pay info,নেট বিল তথ্য
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,এই মান ডিফল্ট সেলস মূল্য তালিকাতে আপডেট করা হয়।
@@ -2163,7 +2203,7 @@
 DocType: Patient,B Positive,বি ইতিবাচক
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","সারি # {0}: Qty, 1 হবে যেমন আইটেম একটি নির্দিষ্ট সম্পদ. একাধিক Qty এ জন্য পৃথক সারি ব্যবহার করুন."
 DocType: Leave Block List Allow,Leave Block List Allow,ব্লক মঞ্জুর তালিকা ত্যাগ
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,সংক্ষিপ্তকরণ ফাঁকা বা স্থান হতে পারে না
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,সংক্ষিপ্তকরণ ফাঁকা বা স্থান হতে পারে না
 DocType: Patient Medical Record,Patient Medical Record,রোগীর চিকিৎসা রেকর্ড
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,অ-গ্রুপ গ্রুপ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,স্পোর্টস
@@ -2179,9 +2219,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,জন্য বিনিময় হার খুঁজে পাওয়া যায়নি {0} এ {1} কী তারিখের জন্য {2}। একটি মুদ্রা বিনিময় রেকর্ড ম্যানুয়ালি তৈরি করুন
 DocType: POS Profile,Price List,মূল্য তালিকা
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ডিফল্ট অর্থবছরের এখন হয়. পরিবর্তন কার্যকর করার জন্য আপনার ব্রাউজার রিফ্রেশ করুন.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,ব্যয় দাবি
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,ব্যয় দাবি
 DocType: Issue,Support,সমর্থন
 ,BOM Search,খোঁজো
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",এই গুদামে পাওয়া স্টকের উপর ভিত্তি করে &quot;স্টক ইন&quot; বা &quot;স্টক ইন নয়&quot; প্রকাশ করুন।
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),বন্ধ (+ + সমগ্র খোলা)
 DocType: Vehicle,Fuel Type,জ্বালানীর ধরণ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,কোম্পানি মুদ্রা উল্লেখ করুন
@@ -2193,16 +2234,16 @@
 DocType: Healthcare Settings,Remind Before,আগে স্মরণ করিয়ে দিন
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM রূপান্তর ফ্যাক্টর সারিতে প্রয়োজন বোধ করা হয় {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","সারি # {0}: রেফারেন্স ডকুমেন্ট প্রকার সেলস অর্ডার এক, সেলস চালান বা জার্নাল এন্ট্রি করতে হবে"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","সারি # {0}: রেফারেন্স ডকুমেন্ট প্রকার সেলস অর্ডার এক, সেলস চালান বা জার্নাল এন্ট্রি করতে হবে"
 DocType: Salary Component,Deduction,সিদ্ধান্তগ্রহণ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,সারি {0}: সময় থেকে এবং সময় বাধ্যতামূলক.
 DocType: Stock Reconciliation Item,Amount Difference,পরিমাণ পার্থক্য
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},আইটেমের মূল্য জন্য যোগ {0} মূল্যতালিকা {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},আইটেমের মূল্য জন্য যোগ {0} মূল্যতালিকা {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,এই বিক্রয় ব্যক্তির কর্মী ID লিখুন দয়া করে
 DocType: Territory,Classification of Customers by region,অঞ্চল গ্রাহকের সাইট
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,পার্থক্য পরিমাণ শূন্য হতে হবে
 DocType: Project,Gross Margin,গ্রস মার্জিন
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,প্রথম উত্পাদন আইটেম লিখুন দয়া করে
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,প্রথম উত্পাদন আইটেম লিখুন দয়া করে
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,হিসাব ব্যাংক ব্যালেন্সের
 DocType: Normal Test Template,Normal Test Template,সাধারণ টেস্ট টেমপ্লেট
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,প্রতিবন্ধী ব্যবহারকারী
@@ -2212,21 +2253,22 @@
 DocType: Salary Slip,Total Deduction,মোট সিদ্ধান্তগ্রহণ
 ,Production Analytics,উত্পাদনের অ্যানালিটিক্স
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,এই রোগীর বিরুদ্ধে লেনদেনের উপর নির্ভর করে। বিস্তারিত জানার জন্য নীচের টাইমলাইনে দেখুন
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,খরচ আপডেট
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,খরচ আপডেট
 DocType: Employee,Date of Birth,জন্ম তারিখ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,আইটেম {0} ইতিমধ্যে ফেরত দেয়া হয়েছে
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** অর্থবছরের ** একটি অর্থবছরে প্রতিনিধিত্ব করে. সব হিসাব ভুক্তি এবং অন্যান্য প্রধান লেনদেন ** ** অর্থবছরের বিরুদ্ধে ট্র্যাক করা হয়.
 DocType: Opportunity,Customer / Lead Address,গ্রাহক / লিড ঠিকানা
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,সরবরাহকারী স্কোরকার্ড সেটআপ
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},সতর্কবাণী: সংযুক্তি অবৈধ SSL সার্টিফিকেট {0}
-DocType: Student Admission,Eligibility,নির্বাচিত হইবার যোগ্যতা
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,মূল্যায়ন পরিকল্পনা নাম
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},সতর্কবাণী: সংযুক্তি অবৈধ SSL সার্টিফিকেট {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","বিশালাকার আপনি ব্যবসা, আপনার বিশালাকার হিসাবে সব আপনার পরিচিতি এবং আরো যোগ পেতে সাহায্য"
 DocType: Production Order Operation,Actual Operation Time,প্রকৃত অপারেশন টাইম
 DocType: Authorization Rule,Applicable To (User),প্রযোজ্য (ব্যবহারকারী)
 DocType: Purchase Taxes and Charges,Deduct,বিয়োগ করা
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,কাজের বর্ণনা
 DocType: Student Applicant,Applied,ফলিত
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,পুনরায় খুলুন
 DocType: Sales Invoice Item,Qty as per Stock UOM,স্টক Qty UOM অনুযায়ী
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 নাম
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","ব্যাপারটি তেমন বিশেষ অক্ষর &quot;-&quot; &quot;.&quot;, &quot;#&quot;, এবং &quot;/&quot; সিরিজ নামকরণ অনুমোদিত নয়"
@@ -2238,7 +2280,7 @@
 DocType: Request for Quotation,Manufacturing Manager,উৎপাদন ম্যানেজার
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},সিরিয়াল কোন {0} পর্যন্ত ওয়ারেন্টি বা তার কম বয়সী {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,প্যাকেজ বিভক্ত হুণ্ডি.
-apps/erpnext/erpnext/hooks.py +98,Shipments,চালানে
+apps/erpnext/erpnext/hooks.py +107,Shipments,চালানে
 DocType: Payment Entry,Total Allocated Amount (Company Currency),সর্বমোট পরিমাণ (কোম্পানি মুদ্রা)
 DocType: Purchase Order Item,To be delivered to customer,গ্রাহকের মধ্যে বিতরণ করা হবে
 DocType: BOM,Scrap Material Cost,স্ক্র্যাপ উপাদান খরচ
@@ -2260,8 +2302,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,আইটেম বৈকল্পিক সেটিংস
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,কোম্পানি নির্বাচন ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,সব বিভাগের জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","কর্মসংস্থান প্রকারভেদ (স্থায়ী, চুক্তি, অন্তরীণ ইত্যাদি)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} আইটেমের জন্য বাধ্যতামূলক {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","কর্মসংস্থান প্রকারভেদ (স্থায়ী, চুক্তি, অন্তরীণ ইত্যাদি)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} আইটেমের জন্য বাধ্যতামূলক {1}
 DocType: Process Payroll,Fortnightly,পাক্ষিক
 DocType: Currency Exchange,From Currency,মুদ্রা থেকে
 DocType: Vital Signs,Weight (In Kilogram),ওজন (কিলোগ্রামে)
@@ -2285,7 +2327,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,সময়সূচী পেতে &#39;নির্মাণ সূচি&#39; তে ক্লিক করুন
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,ত্রুটিযুক্ত নিম্নলিখিত সময়সূচী মোছার সময় ছিল:
 DocType: Bin,Ordered Quantity,আদেশ পরিমাণ
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",যেমন &quot;নির্মাতা জন্য সরঞ্জাম তৈরি করুন&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",যেমন &quot;নির্মাতা জন্য সরঞ্জাম তৈরি করুন&quot;
 DocType: Grading Scale,Grading Scale Intervals,শূন্য স্কেল অন্তরাল
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1} {2} জন্য অ্যাকাউন্টিং এণ্ট্রি শুধুমাত্র মুদ্রা তৈরি করা যাবে না: {3}
 DocType: Production Order,In Process,প্রক্রিয়াধীন
@@ -2308,11 +2350,10 @@
 DocType: Purchase Invoice,With Payment of Tax,ট্যাক্স পরিশোধ সঙ্গে
 DocType: Expense Claim Detail,Expense Claim Detail,ব্যয় দাবি বিস্তারিত
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,সরবরাহকারী জন্য তৃতীয়ক
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,সঠিক অ্যাকাউন্ট নির্বাচন করুন
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,সঠিক অ্যাকাউন্ট নির্বাচন করুন
 DocType: Item,Weight UOM,ওজন UOM
 DocType: Salary Structure Employee,Salary Structure Employee,বেতন কাঠামো কর্মচারী
 DocType: Patient,Blood Group,রক্তের গ্রুপ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,বিচারাধীন
 DocType: Course,Course Name,কোর্সের নাম
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,একটি নির্দিষ্ট কর্মচারী হুকুমে অ্যাপ্লিকেশন অনুমোদন করতে পারেন ব্যবহারকারীরা
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,অফিস সরঞ্জাম
@@ -2331,7 +2372,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,দাম দেখানো হবে না যদি মূল্য তালিকা নির্ধারণ করা হয় না
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,এই নৌ-শাসনের জন্য একটি দেশ উল্লেখ বা বিশ্বব্যাপী শিপিং চেক করুন
 DocType: Stock Entry,Total Incoming Value,মোট ইনকামিং মূল্য
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,ডেবিট প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,ডেবিট প্রয়োজন বোধ করা হয়
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets সাহায্য আপনার দলের দ্বারা সম্পন্ন তৎপরতা জন্য সময়, খরচ এবং বিলিং ট্র্যাক রাখতে"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ক্রয়মূল্য তালিকা
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,সরবরাহকারী স্কোরকার্ড ভেরিয়েবলের টেমপ্লেট
@@ -2341,7 +2382,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,পেমেন্ট রিকনসিলিয়েশন
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,ইনচার্জ ব্যক্তির নাম নির্বাচন করুন
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,প্রযুক্তি
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},মোট অপ্রদত্ত: {0}
+DocType: Hub Settings,Unregister from Hub,হাব থেকে নিবন্ধন বাতিল
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},মোট অপ্রদত্ত: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM ওয়েবসাইট অপারেশন
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,প্রস্তাবপত্র
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,উপাদান অনুরোধ (এমআরপি) অ্যান্ড প্রোডাকশন আদেশ নির্মাণ করা হয়.
@@ -2353,7 +2395,9 @@
 DocType: Physician Schedule Time Slot,To Time,সময়
 DocType: Authorization Rule,Approving Role (above authorized value),(কঠিন মূল্য উপরে) ভূমিকা অনুমোদন
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,একাউন্টে ক্রেডিট একটি প্রদেয় অ্যাকাউন্ট থাকতে হবে
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} এর পিতা বা মাতা বা সন্তান হতে পারবেন না {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,অনুগ্রহ করে ছাত্র ভর্তি নির্বাচন করুন যা প্রদত্ত শিক্ষার্থী আবেদনকারীর জন্য বাধ্যতামূলক
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} এর পিতা বা মাতা বা সন্তান হতে পারবেন না {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,মূল্য প্রকাশ করার জন্য একটি মূল্য তালিকা নির্বাচন করুন
 DocType: Production Order Operation,Completed Qty,সমাপ্ত Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","{0}, শুধুমাত্র ডেবিট অ্যাকাউন্ট অন্য ক্রেডিট এন্ট্রি বিরুদ্ধে সংযুক্ত করা যাবে জন্য"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,মূল্যতালিকা {0} নিষ্ক্রিয় করা হয়
@@ -2365,38 +2409,39 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} আইটেম জন্য প্রয়োজন সিরিয়াল নাম্বার {1}. আপনার দেওয়া {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,বর্তমান মূল্যনির্ধারণ হার
 DocType: Item,Customer Item Codes,গ্রাহক আইটেম সঙ্কেত
+DocType: Training Event,Advance,আগাম
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,আবার পুনরাবৃত্তির জন্য
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,এক্সচেঞ্জ লাভ / ক্ষতির
 DocType: Opportunity,Lost Reason,লস্ট কারণ
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,নতুন ঠিকানা
 DocType: Quality Inspection,Sample Size,সাধারন মাপ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,রশিদ ডকুমেন্ট লিখুন দয়া করে
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,সকল আইটেম ইতিমধ্যে invoiced হয়েছে
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;কেস নং থেকে&#39; একটি বৈধ উল্লেখ করুন
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',&#39;কেস নং থেকে&#39; একটি বৈধ উল্লেখ করুন
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,অতিরিক্ত খরচ সেন্টার গ্রুপ অধীন করা যেতে পারে কিন্তু এন্ট্রি অ গ্রুপের বিরুদ্ধে করা যেতে পারে
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ব্যবহারকারী এবং অনুমতি
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},উত্পাদনের আদেশ তৈরী করা হয়েছে: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},উত্পাদনের আদেশ তৈরী করা হয়েছে: {0}
 DocType: Branch,Branch,শাখা
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ছাপানো ও ব্র্যান্ডিং
 DocType: Company,Total Monthly Sales,মোট মাসিক বিক্রয়
 DocType: Bin,Actual Quantity,প্রকৃত পরিমাণ
 DocType: Shipping Rule,example: Next Day Shipping,উদাহরণস্বরূপ: আগামী দিন গ্রেপ্তার
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,পাওয়া না সিরিয়াল কোন {0}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},সাবস্ক্রিপশন {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},সাবস্ক্রিপশন {0}
 DocType: Fee Schedule Program,Fee Schedule Program,ফি শিগগির প্রোগ্রাম
 DocType: Fee Schedule Program,Student Batch,ছাত্র ব্যাচ
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,&#39;ট্যাব ভ্যালু সাইনস&#39; থেকে * নির্বাচন করুন যেখানে রোগীর = &#39;{0}&#39; ক্রম অনুসারে লাইন_দন্ডের সীমা 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,স্টুডেন্ট করুন
 DocType: Supplier Scorecard Scoring Standing,Min Grade,ন্যূনতম গ্রেড
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},আপনি প্রকল্পের সহযোগীতা করার জন্য আমন্ত্রণ জানানো হয়েছে: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},চিকিত্সক {0} এ উপলব্ধ নয়
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},আপনি প্রকল্পের সহযোগীতা করার জন্য আমন্ত্রণ জানানো হয়েছে: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},চিকিত্সক {0} এ উপলব্ধ নয়
 DocType: Leave Block List Date,Block Date,ব্লক তারিখ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Doctype {0} কাস্টম ক্ষেত্রের সাবস্ক্রিপশন আইডি যোগ করুন
 DocType: Purchase Receipt,Supplier Delivery Note,সরবরাহকারী ডেলিভারি নোট
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,এখন আবেদন কর
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,এখন আবেদন কর
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},প্রকৃত করে চলছে {0} / অপেক্ষা করে চলছে {1}
 DocType: Purchase Invoice,E-commerce GSTIN,ই-কমার্স জিএসটিআইএন
 DocType: Sales Order,Not Delivered,বিতরিত হয় নি
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,প্রত্যাশিত তারিখ লেনদেন তারিখ আগে হতে পারে না
 ,Bank Clearance Summary,ব্যাংক পরিস্কারের সংক্ষিপ্ত
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","তৈরি করুন এবং দৈনিক, সাপ্তাহিক এবং মাসিক ইমেল digests পরিচালনা."
 DocType: Appraisal Goal,Appraisal Goal,মূল্যায়ন গোল
@@ -2404,12 +2449,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,ভবন
 DocType: Fee Schedule,Fee Structure,ফি গঠন
 DocType: Timesheet Detail,Costing Amount,খোয়াতে পরিমাণ
-DocType: Student Admission,Application Fee,আবেদন ফী
+DocType: Student Admission Program,Application Fee,আবেদন ফী
 DocType: Process Payroll,Submit Salary Slip,বেতন স্লিপ জমা
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,আইটেম {0} হল {1}% জন্য Maxiumm ছাড়
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,আইটেম {0} হল {1}% জন্য Maxiumm ছাড়
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,বাল্ক মধ্যে আমদানি
 DocType: Sales Partner,Address & Contacts,ঠিকানা ও যোগাযোগ
 DocType: SMS Log,Sender Name,প্রেরকের নাম
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,মাপদণ্ড দ্বারা বাছাই
 DocType: POS Profile,[Select],[নির্বাচন]
 DocType: Vital Signs,Blood Pressure (diastolic),রক্তচাপ (ডায়স্টোলিক)
 DocType: SMS Log,Sent To,প্রেরিত
@@ -2418,7 +2464,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,পরবর্তী যোগাযোগ তারিখ অতীতে হতে পারে না
 DocType: Company,For Reference Only.,শুধুমাত্র রেফারেন্সের জন্য.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},চিকিত্সক {0} {1} এ উপলব্ধ নয়
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,ব্যাচ নির্বাচন কোন
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,ব্যাচ নির্বাচন কোন
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},অকার্যকর {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,রেফারেন্স INV
@@ -2434,15 +2480,15 @@
 DocType: Normal Test Items,Require Result Value,ফলাফল মান প্রয়োজন
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,মামলা নং 0 হতে পারবেন না
 DocType: Item,Show a slideshow at the top of the page,পৃষ্ঠার উপরের একটি স্লাইডশো প্রদর্শন
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,দোকান
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,দোকান
 DocType: Project Type,Projects Manager,প্রকল্প ম্যানেজার
 DocType: Serial No,Delivery Time,প্রসবের সময়
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,উপর ভিত্তি করে বুড়ো
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,নিয়োগ বাতিল
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,নিয়োগ বাতিল
 DocType: Item,End of Life,জীবনের শেষে
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,ভ্রমণ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,প্রদত্ত তারিখ জন্য কর্মচারী {0} জন্য পাওয়া যায়নি সক্রিয় বা ডিফল্ট বেতন কাঠামো
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,ভ্রমণ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,প্রদত্ত তারিখ জন্য কর্মচারী {0} জন্য পাওয়া যায়নি সক্রিয় বা ডিফল্ট বেতন কাঠামো
 DocType: Leave Block List,Allow Users,ব্যবহারকারীদের মঞ্জুরি
 DocType: Purchase Order,Customer Mobile No,গ্রাহক মোবাইল কোন
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,আবৃত্ত
@@ -2451,12 +2497,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,আপডেট খরচ
 DocType: Item Reorder,Item Reorder,আইটেম অনুসারে পুনঃক্রম করুন
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,বেতন দেখান স্লিপ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,ট্রান্সফার উপাদান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,ট্রান্সফার উপাদান
 DocType: Fees,Send Payment Request,অর্থ প্রদানের অনুরোধ পাঠান
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","অপারেশন, অপারেটিং খরচ উল্লেখ করুন এবং আপনার কাজকর্মকে কোন একটি অনন্য অপারেশন দিতে."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,এই দস্তাবেজটি দ্বারা সীমা উত্তীর্ণ {0} {1} আইটেমের জন্য {4}. আপনি তৈরি করছেন আরেকটি {3} একই বিরুদ্ধে {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,সংরক্ষণ পরে আবর্তক নির্ধারণ করুন
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,নির্বাচন পরিবর্তনের পরিমাণ অ্যাকাউন্ট
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,নির্বাচন পরিবর্তনের পরিমাণ অ্যাকাউন্ট
 DocType: Purchase Invoice,Price List Currency,মূল্যতালিকা মুদ্রা
 DocType: Naming Series,User must always select,ব্যবহারকারী সবসময় নির্বাচন করতে হবে
 DocType: Stock Settings,Allow Negative Stock,নেতিবাচক শেয়ার মঞ্জুরি
@@ -2476,7 +2522,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,কর্মচারী
 DocType: Sample Collection,Collected Time,সংগ্রহকৃত সময়
 DocType: Company,Sales Monthly History,বিক্রয় মাসিক ইতিহাস
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,ব্যাচ নির্বাচন
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,ব্যাচ নির্বাচন
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} সম্পূর্ণরূপে বিল করা হয়েছে
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,গুরুত্বপূর্ণ চিহ্ন
 DocType: Training Event,End Time,শেষ সময়
@@ -2484,16 +2530,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,পেমেন্ট Deductions বা হ্রাস
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,সেলস বা কেনার জন্য আদর্শ চুক্তি পদ.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,ভাউচার দ্বারা গ্রুপ
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,আপনি কি এই অ্যাপয়েন্টমেন্টটি বাতিল করতে চান?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,সেলস পাইপলাইন
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},বেতন কম্পোনেন্ট এর ডিফল্ট অ্যাকাউন্ট সেট করুন {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,প্রয়োজনীয় উপর
 DocType: Rename Tool,File to Rename,পুনঃনামকরণ করা ফাইল
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},সারি মধ্যে আইটেম জন্য BOM দয়া করে নির্বাচন করুন {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},সারি মধ্যে আইটেম জন্য BOM দয়া করে নির্বাচন করুন {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},অ্যাকাউন্ট {0} {1} অ্যাকাউন্টের মোডে কোম্পানির সঙ্গে মিলছে না: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},আইটেম জন্য বিদ্যমান নয় নির্দিষ্ট BOM {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,রক্ষণাবেক্ষণ সূচি {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
+DocType: POS Profile,Applicable for Users,ব্যবহারকারীদের জন্য প্রযোজ্য
 DocType: Notification Control,Expense Claim Approved,ব্যয় দাবি অনুমোদিত
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,কর্মচারীর বেতন স্লিপ {0} ইতিমধ্যে এই সময়ের জন্য সৃষ্টি
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,কর্মচারীর বেতন স্লিপ {0} ইতিমধ্যে এই সময়ের জন্য সৃষ্টি
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,ফার্মাসিউটিক্যাল
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ক্রয় আইটেম খরচ
 DocType: Selling Settings,Sales Order Required,সেলস আদেশ প্রয়োজন
@@ -2517,6 +2565,7 @@
 DocType: Offer Letter,Accepted,গৃহীত
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,সংগঠন
 DocType: BOM Update Tool,BOM Update Tool,BOM আপডেট সরঞ্জাম
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","পার্টি অ্যাকাউন্ট নির্দিষ্ট না, দয়া করে কোম্পানির মধ্যে ডিফল্ট পার্টি অ্যাকাউন্ট স্থাপন করুন"
 DocType: SG Creation Tool Course,Student Group Name,স্টুডেন্ট গ্রুপের নাম
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,ফি তৈরি করা
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"আপনি কি সত্যিই এই কোম্পানির জন্য সব লেনদেন মুছে ফেলতে চান, নিশ্চিত করুন. হিসাবে এটা আপনার মাস্টার ডেটা থাকবে. এই ক্রিয়াটি পূর্বাবস্থায় ফেরানো যাবে না."
@@ -2525,29 +2574,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) পরিকল্পনা quanitity তার চেয়ে অনেক বেশী হতে পারে না ({2}) উত্পাদন আদেশ {3}
 DocType: Shipping Rule,Shipping Rule Label,শিপিং রুল ট্যাগ
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ব্যবহারকারী ফোরাম
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,কাঁচামালের ফাঁকা থাকতে পারে না.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","স্টক আপডেট করা যায়নি, চালান ড্রপ শিপিং আইটেমটি রয়েছে."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,কাঁচামালের ফাঁকা থাকতে পারে না.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","স্টক আপডেট করা যায়নি, চালান ড্রপ শিপিং আইটেমটি রয়েছে."
 DocType: Lab Test Sample,Lab Test Sample,ল্যাব পরীক্ষার নমুনা
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,দ্রুত জার্নাল এন্ট্রি
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM কোন আইটেম agianst উল্লেখ তাহলে আপনি হার পরিবর্তন করতে পারবেন না
+DocType: Restaurant,Invoice Series Prefix,ইনভয়েস সিরিজ প্রিফিক্স
 DocType: Employee,Previous Work Experience,আগের কাজের অভিজ্ঞতা
 DocType: Stock Entry,For Quantity,পরিমাণ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},সারিতে আইটেম {0} জন্য পরিকল্পনা Qty লিখুন দয়া করে {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},সারিতে আইটেম {0} জন্য পরিকল্পনা Qty লিখুন দয়া করে {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} দাখিল করা হয় না
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,আইটেম জন্য অনুরোধ.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,পৃথক উত্পাদন যাতে প্রতিটি সমাপ্ত ভাল আইটেমের জন্য তৈরি করা হবে.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} রিটার্ন নথিতে অবশ্যই নেতিবাচক হতে হবে
 ,Minutes to First Response for Issues,সমস্যার জন্য প্রথম প্রতিক্রিয়া মিনিট
 DocType: Purchase Invoice,Terms and Conditions1,শর্তাবলী এবং Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,"ইনস্টিটিউটের নাম, যার জন্য আপনি এই সিস্টেম সেট আপ করা হয়."
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,"ইনস্টিটিউটের নাম, যার জন্য আপনি এই সিস্টেম সেট আপ করা হয়."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","এই ডেট নিথর অ্যাকাউন্টিং এন্ট্রি, কেউ / না নিম্নোল্লিখিত শর্ত ভূমিকা ছাড়া এন্ট্রি পরিবর্তন করতে পারেন."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,রক্ষণাবেক্ষণ সময়সূচী উৎপাদিত আগে নথি সংরক্ষণ করুন
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,সমস্ত BOMs মধ্যে সর্বশেষ মূল্য আপডেট
 DocType: Fee Schedule,Successful,সফল
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,প্রোজেক্ট অবস্থা
 DocType: UOM,Check this to disallow fractions. (for Nos),ভগ্নাংশ অননুমোদন এই পরীক্ষা. (আমরা জন্য)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,নিম্নলিখিত উত্পাদনের আদেশ তৈরি করা হয়েছে:
-DocType: Student Admission,Naming Series (for Student Applicant),সিরিজ নেমিং (স্টুডেন্ট আবেদনকারীর জন্য)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,নিম্নলিখিত উত্পাদনের আদেশ তৈরি করা হয়েছে:
+DocType: Student Admission Program,Naming Series (for Student Applicant),সিরিজ নেমিং (স্টুডেন্ট আবেদনকারীর জন্য)
 DocType: Delivery Note,Transporter Name,স্থানান্তরকারী নাম
 DocType: Authorization Rule,Authorized Value,কঠিন মূল্য
 DocType: BOM,Show Operations,দেখান অপারেশনস
@@ -2571,7 +2621,7 @@
 ,Employees working on a holiday,একটি ছুটিতে কাজ এমপ্লয়িজ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,মার্ক বর্তমান
 DocType: Project,% Complete Method,% সম্পূর্ণ পদ্ধতি
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,ঔষধ
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,ঔষধ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},রক্ষণাবেক্ষণ আরম্ভের তারিখ সিরিয়াল কোন জন্য ডেলিভারি তারিখের আগে হতে পারে না {0}
 DocType: Production Order,Actual End Date,প্রকৃত শেষ তারিখ
 DocType: BOM,Operating Cost (Company Currency),অপারেটিং খরচ (কোম্পানি মুদ্রা)
@@ -2589,13 +2639,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,ব্যবহারকারী অনুমোদন নিয়ম প্রযোজ্য ব্যবহারকারী হিসাবে একই হতে পারে না
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),মৌলিক হার (স্টক UOM অনুযায়ী)
 DocType: SMS Log,No of Requested SMS,অনুরোধ করা এসএমএস এর কোন
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,বিনা বেতনে ছুটি অনুমোদিত ছুটি অ্যাপ্লিকেশন রেকর্ডের সঙ্গে মিলছে না
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,বিনা বেতনে ছুটি অনুমোদিত ছুটি অ্যাপ্লিকেশন রেকর্ডের সঙ্গে মিলছে না
 DocType: Campaign,Campaign-.####,প্রচারাভিযান -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,পরবর্তী ধাপ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,সম্ভাব্য সর্বোত্তম হারে নির্দিষ্ট আইটেম সরবরাহ অনুগ্রহ
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,চালান করুন
 DocType: Selling Settings,Auto close Opportunity after 15 days,15 দিন পর অটো বন্ধ সুযোগ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} এর স্কোরকার্ড স্থানের কারণে {0} জন্য ক্রয় অর্ডার অনুমোদিত নয়।
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} এর স্কোরকার্ড স্থানের কারণে {0} জন্য ক্রয় অর্ডার অনুমোদিত নয়।
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,শেষ বছর
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / লিড%
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,চুক্তি শেষ তারিখ যোগদান তারিখ থেকে বড় হওয়া উচিত
@@ -2631,7 +2681,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","সমস্ত ক্রয় লেনদেন প্রয়োগ করা যেতে পারে যে স্ট্যান্ডার্ড ট্যাক্স টেমপ্লেট. এই টেমপ্লেটটি ইত্যাদি #### আপনি সব ** জানানোর জন্য স্ট্যান্ডার্ড ট্যাক্স হার হবে এখানে নির্ধারণ করহার দ্রষ্টব্য &quot;হ্যান্ডলিং&quot;, ট্যাক্স মাথা এবং &quot;কোটি টাকার&quot;, &quot;বীমা&quot; মত অন্যান্য ব্যয় মাথা তালিকায় থাকতে পারে * *. বিভিন্ন হারে আছে ** যে ** আইটেম আছে, তাহলে তারা ** আইটেম ট্যাক্স যোগ করা হবে ** ** ** আইটেম মাস্টার টেবিল. #### কলাম বর্ণনা 1. গণনা টাইপ: - এই (যে মৌলিক পরিমাণ যোগফল) ** একুন ** উপর হতে পারে. - ** পূর্ববর্তী সারি মোট / পরিমাণ ** উপর (ক্রমসঞ্চিত করের বা চার্জের জন্য). যদি আপনি এই অপশনটি নির্বাচন করা হলে, ট্যাক্স পরিমাণ অথবা মোট (ট্যাক্স টেবিলে) পূর্ববর্তী সারির শতকরা হিসেবে প্রয়োগ করা হবে. - ** ** প্রকৃত (হিসাবে উল্লেখ করেছে). 2. অ্যাকাউন্ট প্রধানঃ এই ট্যাক্স 3. খরচ কেন্দ্র বুকিং করা হবে যার অধীনে অ্যাকাউন্ট খতিয়ান: ট্যাক্স / চার্জ (শিপিং মত) একটি আয় হয় বা ব্যয় যদি এটি একটি খরচ কেন্দ্র বিরুদ্ধে বুক করা প্রয়োজন. 4. বিবরণ: ট্যাক্স বর্ণনা (যে চালানে / কোট ছাপা হবে). 5. রেট: ট্যাক্স হার. 6. পরিমাণ: ট্যাক্স পরিমাণ. 7. মোট: এই বিন্দু ক্রমপুঞ্জিত মোট. 8. সারি প্রবেশ করান: উপর ভিত্তি করে যদি &quot;পূর্ববর্তী সারি মোট&quot; আপনি এই গণনা জন্য একটি বেস (ডিফল্ট পূর্ববর্তী সারির হয়) হিসাবে গ্রহণ করা হবে, যা সারি সংখ্যা নির্বাচন করতে পারবেন. 9. জন্য ট্যাক্স বা চার্জ ধরে নেবেন: ট্যাক্স / চার্জ মূল্যনির্ধারণ জন্য শুধুমাত্র (মোট না একটি অংশ) বা শুধুমাত্র (আইটেমটি মান যোগ না) মোট জন্য অথবা উভয়ের জন্য তাহলে এই অংশে আপনি নির্ধারণ করতে পারবেন. 10. করো অথবা বিয়োগ: আপনি যোগ করতে অথবা ট্যাক্স কেটে করতে চান কিনা."
 DocType: Homepage,Homepage,হোম পেজ
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,চিকিত্সক নির্বাচন করুন ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',আপডেট ট্যাব কনসেন্টেশন সেট ইনভয়েস = &#39;{0}&#39; যেখানে নাম = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd পরিমাণ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},ফি রেকর্ডস নির্মিত - {0}
 DocType: Asset Category Account,Asset Category Account,অ্যাসেট শ্রেণী অ্যাকাউন্ট
@@ -2643,7 +2692,7 @@
 DocType: Asset,Manual,ম্যানুয়াল
 DocType: Salary Component Account,Salary Component Account,বেতন কম্পোনেন্ট অ্যাকাউন্ট
 DocType: Global Defaults,Hide Currency Symbol,মুদ্রা প্রতীক লুকান
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","যেমন ব্যাংক, ক্যাশ, ক্রেডিট কার্ড"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","যেমন ব্যাংক, ক্যাশ, ক্রেডিট কার্ড"
 DocType: Lead Source,Source Name,উত্স নাম
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","প্রাপ্তবয়স্কদের মধ্যে স্বাভাবিক বিশ্রামহীন রক্তচাপ প্রায় 120 mmHg systolic এবং 80 mmHg ডায়স্টোলিক, সংক্ষিপ্ত &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,ক্রেডিট নোট
@@ -2662,16 +2711,16 @@
 DocType: Patient,Occupation,পেশা
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,সারি {0}: আরম্ভের তারিখ শেষ তারিখের আগে হওয়া আবশ্যক
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),মোট (Qty)
-DocType: Sales Invoice,This Document,এই নথীটি
 DocType: Installation Note Item,Installed Qty,ইনস্টল Qty
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,এই কারণে কিছু অবৈধ ইমেইল ঠিকানা হতে পারে
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,আপনি যোগ করেছেন
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,প্রশিক্ষণ ফল
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,প্রশিক্ষণ ফল
 DocType: Purchase Invoice,Is Paid,পরিশোধ
 DocType: Salary Structure,Total Earning,মোট আয়
 DocType: Purchase Receipt,Time at which materials were received,"উপকরণ গৃহীত হয়েছে, যা এ সময়"
 DocType: Stock Ledger Entry,Outgoing Rate,আউটগোয়িং কলের হার
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,সংস্থার শাখা মাস্টার.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,সংস্থার শাখা মাস্টার.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,বা
 DocType: Sales Order,Billing Status,বিলিং অবস্থা
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,একটি সমস্যা রিপোর্ট
@@ -2686,7 +2735,8 @@
 DocType: Notification Control,Sales Order Message,বিক্রয় আদেশ পাঠান
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","ইত্যাদি কোম্পানি, মুদ্রা, চলতি অর্থবছরে, মত ডিফল্ট মান"
 DocType: Payment Entry,Payment Type,শোধের ধরণ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,দয়া করে আইটেমটি জন্য একটি ব্যাচ নির্বাচন {0}। একটি একক ব্যাচ যে এই প্রয়োজনীয়তা পরিপূর্ণ খুঁজে পাওয়া যায়নি
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,দয়া করে আইটেমটি জন্য একটি ব্যাচ নির্বাচন {0}। একটি একক ব্যাচ যে এই প্রয়োজনীয়তা পরিপূর্ণ খুঁজে পাওয়া যায়নি
+DocType: Hub Category,Parent Category,মূল বিভাগ
 DocType: Process Payroll,Select Employees,নির্বাচন এমপ্লয়িজ
 DocType: Opportunity,Potential Sales Deal,সম্ভাব্য বিক্রয় ডীল
 DocType: Complaint,Complaints,অভিযোগ
@@ -2723,7 +2773,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),প্রসবের জন্য প্যাকেজের আইডেন্টিফিকেশন (প্রিন্ট জন্য)
 DocType: Bin,Reserved Quantity,সংরক্ষিত পরিমাণ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,বৈধ ইমেইল ঠিকানা লিখুন
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,কার্ট একটি আইটেম নির্বাচন করুন
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,কার্ট একটি আইটেম নির্বাচন করুন
 DocType: Landed Cost Voucher,Purchase Receipt Items,কেনার রসিদ চলছে
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,কাস্টমাইজ ফরম
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,পশ্চাদ্বর্তিতা
@@ -2733,15 +2783,15 @@
 DocType: Payment Request,Amount in customer's currency,গ্রাহকের মুদ্রার পরিমাণ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,বিলি
 DocType: Stock Reconciliation Item,Current Qty,বর্তমান স্টক
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,সরবরাহকারী জুড়ুন
+DocType: Restaurant Menu,Restaurant Menu,রেস্টুরেন্ট মেনু
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,পূর্ববর্তী
 DocType: Appraisal Goal,Key Responsibility Area,কী দায়িত্ব ফোন
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","ছাত্র ব্যাচ আপনি উপস্থিতি, মূল্যায়ন এবং ছাত্রদের জন্য ফি ট্র্যাক সাহায্য"
 DocType: Payment Entry,Total Allocated Amount,সর্বমোট পরিমাণ
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,চিরস্থায়ী জায় জন্য ডিফল্ট জায় অ্যাকাউন্ট সেট
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,চিরস্থায়ী জায় জন্য ডিফল্ট জায় অ্যাকাউন্ট সেট
 DocType: Item Reorder,Material Request Type,উপাদান অনুরোধ টাইপ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},থেকে {0} বেতন জন্য Accural জার্নাল এন্ট্রি {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","স্থানীয় সঞ্চয়স্থান পূর্ণ, সংরক্ষণ করা হয়নি"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","স্থানীয় সঞ্চয়স্থান পূর্ণ, সংরক্ষণ করা হয়নি"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,সারি {0}: UOM রূপান্তর ফ্যাক্টর বাধ্যতামূলক
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,রুম ক্যাপাসিটি
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,সুত্র
@@ -2780,16 +2830,18 @@
 DocType: Project,Task Completion,কাজটি সমাপ্তির
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,মজুদ নাই
 DocType: Appraisal,HR User,এইচআর ব্যবহারকারী
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,পিওএস?
 DocType: Purchase Invoice,Taxes and Charges Deducted,কর ও শুল্ক বাদ
-apps/erpnext/erpnext/hooks.py +129,Issues,সমস্যা
+apps/erpnext/erpnext/hooks.py +138,Issues,সমস্যা
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},স্থিতি এক হতে হবে {0}
 DocType: Sales Invoice,Debit To,ডেবিট
+DocType: Restaurant Menu Item,Restaurant Menu Item,রেস্টুরেন্ট মেনু আইটেম
 DocType: Delivery Note,Required only for sample item.,শুধুমাত্র নমুনা আইটেমের জন্য প্রয়োজনীয়.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,লেনদেন পরে আসল Qty
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},কোন বেতন স্লিপ মধ্যে পাওয়া {0} এবং {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},কোন বেতন স্লিপ মধ্যে পাওয়া {0} এবং {1}
 ,Pending SO Items For Purchase Request,ক্রয় অনুরোধ জন্য তাই চলছে অপেক্ষারত
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,স্টুডেন্ট অ্যাডমিশন
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} নিষ্ক্রিয় করা
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,স্টুডেন্ট অ্যাডমিশন
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} নিষ্ক্রিয় করা
 DocType: Supplier,Billing Currency,বিলিং মুদ্রা
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,অতি বৃহদাকার
@@ -2812,6 +2864,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,প্রয়োজনীয় ভিজিট কোন উল্লেখ করুন
 DocType: Stock Settings,Default Valuation Method,ডিফল্ট মূল্যনির্ধারণ পদ্ধতি
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,ফী
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,অগ্রগতি আপডেট. এটি একটি সময় নিতে পারে.
 DocType: Vehicle Log,Fuel Qty,জ্বালানীর Qty
 DocType: Production Order Operation,Planned Start Time,পরিকল্পনা শুরুর সময়
 DocType: Course,Assessment,অ্যাসেসমেন্ট
@@ -2827,7 +2880,7 @@
 DocType: Price List,Price List Master,মূল্য তালিকা মাস্টার
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,আপনি সেট এবং নির্দেশকের লক্ষ্যমাত্রা নজর রাখতে পারেন যাতে সব বিক্রয় লেনদেন একাধিক ** বিক্রয় ব্যক্তি ** বিরুদ্ধে ট্যাগ করা যায়.
 ,S.O. No.,তাই নং
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},লিড থেকে গ্রাহক তৈরি করুন {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},লিড থেকে গ্রাহক তৈরি করুন {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,রোগীর নির্বাচন করুন
 DocType: Price List,Applicable for Countries,দেশ সমূহ জন্য প্রযোজ্য
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,পরামিতি নাম
@@ -2858,27 +2911,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,সরবরাহকারী চালানের বিশদ বিবরণ
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ব্যয় / পার্থক্য অ্যাকাউন্ট ({0}) একটি &#39;লাভ বা ক্ষতি&#39; অ্যাকাউন্ট থাকতে হবে
 DocType: Project,Copied From,থেকে অনুলিপি
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},নাম ত্রুটি: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,স্বল্পতা
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},নাম ত্রুটি: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,স্বল্পতা
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} সঙ্গে যুক্ত নেই {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,কর্মচারী {0} উপস্থিতির ইতিমধ্যে চিহ্নিত করা হয়
 DocType: Packing Slip,If more than one package of the same type (for print),তাহলে একই ধরনের একাধিক বাক্স (প্রিন্ট জন্য)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,রেস্টুরেন্ট সেটিংস এ ডিফল্ট গ্রাহক সেট করুন
 ,Salary Register,বেতন নিবন্ধন
 DocType: Warehouse,Parent Warehouse,পেরেন্ট ওয়্যারহাউস
 DocType: C-Form Invoice Detail,Net Total,সর্বমোট
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},ডিফল্ট BOM আইটেমের জন্য পাওয়া যায়নি {0} এবং প্রকল্প {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},ডিফল্ট BOM আইটেমের জন্য পাওয়া যায়নি {0} এবং প্রকল্প {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,বিভিন্ন ঋণ ধরনের নির্ধারণ
 DocType: Bin,FCFS Rate,FCFs হার
 DocType: Payment Reconciliation Invoice,Outstanding Amount,বাকির পরিমাণ
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),সময় (মিনিট)
 DocType: Project Task,Working,ওয়ার্কিং
 DocType: Stock Ledger Entry,Stock Queue (FIFO),শেয়ার সারি (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,আর্থিক বছর
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,আর্থিক বছর
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} কোম্পানি অন্তর্গত নয় {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,{0} এর জন্য মানদণ্ড স্কোর ফাংশন সমাধান করা যায়নি। নিশ্চিত করুন সূত্রটি বৈধ।
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,যেমন খরচ
 DocType: Healthcare Settings,Out Patient Settings,আউট রোগী সেটিংস
 DocType: Account,Round Off,সুসম্পন্ন করা
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,পরিমাণ ইতিবাচক হতে হবে
 ,Requested Qty,অনুরোধ করা Qty
 DocType: Tax Rule,Use for Shopping Cart,শপিং কার্ট জন্য ব্যবহার করুন
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},মূল্য {0} অ্যাট্রিবিউট জন্য {1} বৈধ বিষয়ের তালিকায় বিদ্যমান নয় আইটেম জন্য মূল্যবোধ অ্যাট্রিবিউট {2}
@@ -2887,7 +2942,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","চার্জ আনুপাতিক আপনার নির্বাচন অনুযায়ী, আইটেম Qty বা পরিমাণ উপর ভিত্তি করে বিতরণ করা হবে"
 DocType: Maintenance Visit,Purposes,উদ্দেশ্যসমূহ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,অন্তত একটি আইটেম ফিরে নথিতে নেতিবাচক পরিমাণ সঙ্গে প্রবেশ করা উচিত
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,কোর্স যোগ করুন
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","অপারেশন {0} ওয়ার্কস্টেশন কোনো উপলব্ধ কাজের সময় চেয়ে দীর্ঘতর {1}, একাধিক অপারেশন মধ্যে অপারেশন ভাঙ্গিয়া"
 ,Requested,অনুরোধ করা
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,কোন মন্তব্য
@@ -2899,6 +2953,8 @@
 DocType: Employee Loan,Repaid/Closed,শোধ / বন্ধ
 DocType: Item,Total Projected Qty,মোট অভিক্ষিপ্ত Qty
 DocType: Monthly Distribution,Distribution Name,বন্টন নাম
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","আইটেম {0} জন্য মূল্যমানের হার পাওয়া যায়নি, যা {1} {2} এর জন্য অ্যাকাউন্টিং এন্ট্রি করতে হবে। যদি আইটেমটি {1} এ শূন্য মূল্যায়ন হারের আইটেম হিসাবে রূপান্তরিত হয় তবে দয়া করে {1} আইটেম টেবিলে উল্লেখ করুন। অন্যথায়, আইটেমের জন্য একটি ইনকামিং স্টক লেনদেন তৈরি করুন বা আইটেম রেকর্ডে মূল্যায়ন হার উল্লেখ করুন, এবং তারপর এই এন্ট্রি জমা / বাতিল করার চেষ্টা করুন"
 DocType: Course,Course Code,কোর্স কোড
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},আইটেম জন্য প্রয়োজনীয় মান পরিদর্শন {0}
 DocType: POS Settings,Use POS in Offline Mode,অফলাইন মোডে পিওএস ব্যবহার করুন
@@ -2909,14 +2965,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,টেরিটরি গাছ পরিচালনা.
 DocType: Journal Entry Account,Sales Invoice,বিক্রয় চালান
 DocType: Journal Entry Account,Party Balance,পার্টি ব্যালেন্স
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,ডিসকাউন্ট উপর প্রয়োগ নির্বাচন করুন
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,ডিসকাউন্ট উপর প্রয়োগ নির্বাচন করুন
 DocType: Company,Default Receivable Account,ডিফল্ট গ্রহনযোগ্য অ্যাকাউন্ট
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,উপরে নির্বাচিত মানদণ্ডের জন্য প্রদত্ত মোট বেতন জন্য ব্যাংক এনট্রি নির্মাণ
 DocType: Physician,Physician Schedule,চিকিত্সক সূচি
 DocType: Purchase Invoice,Deemed Export,ডেমিড এক্সপোর্ট
 DocType: Stock Entry,Material Transfer for Manufacture,প্রস্তুত জন্য উপাদান স্থানান্তর
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,ডিসকাউন্ট শতাংশ একটি মূল্য তালিকা বিরুদ্ধে বা সব মূল্য তালিকা জন্য হয় প্রয়োগ করা যেতে পারে.
-DocType: Purchase Invoice,Half-yearly,অর্ধ বার্ষিক
+DocType: Subscription,Half-yearly,অর্ধ বার্ষিক
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,স্টক জন্য অ্যাকাউন্টিং এণ্ট্রি
 DocType: Lab Test,LabTest Approver,LabTest আবির্ভাব
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,"আপনি ইতিমধ্যে মূল্যায়ন মানদণ্ডের জন্য মূল্যায়ন করে নিলে, {}।"
@@ -2945,13 +3001,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,অতিরিক্ত ছোট
 DocType: Company,Standard Template,স্ট্যান্ডার্ড টেমপ্লেট
 DocType: Training Event,Theory,তত্ত্ব
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,সতর্কতা: Qty অনুরোধ উপাদান নূন্যতম অর্ডার QTY কম হয়
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,সতর্কতা: Qty অনুরোধ উপাদান নূন্যতম অর্ডার QTY কম হয়
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,অ্যাকাউন্ট {0} নিথর হয়
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,সংস্থার একাত্মতার অ্যাকাউন্টের একটি পৃথক চার্ট সঙ্গে আইনি সত্তা / সাবসিডিয়ারি.
 DocType: Payment Request,Mute Email,নিঃশব্দ ইমেইল
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","খাদ্য, পানীয় ও তামাকের"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},শুধুমাত্র বিরুদ্ধে পেমেন্ট করতে পারবেন যেতে উদ্ভাবনী উপায় {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,কমিশন হার তার চেয়ে অনেক বেশী 100 হতে পারে না
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},শুধুমাত্র বিরুদ্ধে পেমেন্ট করতে পারবেন যেতে উদ্ভাবনী উপায় {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,কমিশন হার তার চেয়ে অনেক বেশী 100 হতে পারে না
 DocType: Stock Entry,Subcontract,ঠিকা
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,প্রথম {0} লিখুন দয়া করে
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,থেকে কোন জবাব
@@ -2969,10 +3025,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,রঙিন
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,অ্যাসেসমেন্ট পরিকল্পনা নির্ণায়ক
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,ক্রয় আদেশ আটকান
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,সমর্থ
 DocType: Patient Appointment,Scheduled,তালিকাভুক্ত
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,উদ্ধৃতি জন্য অনুরোধ.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,মানব সম্পদে কর্মচারী নেমিং সিস্টেম&gt; এইচআর সেটিংস সেট আপ করুন
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","&quot;না&quot; এবং &quot;বিক্রয় আইটেম&quot; &quot;শেয়ার আইটেম&quot; যেখানে &quot;হ্যাঁ&quot; হয় আইটেম নির্বাচন করুন এবং অন্য কোন পণ্য সমষ্টি নেই, অনুগ্রহ করে"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,গ্রাহক নির্বাচন করুন
 DocType: Student Log,Academic,একাডেমিক
 DocType: Patient,Personal and Social History,ব্যক্তিগত ও সামাজিক ইতিহাস
 DocType: Fee Schedule,Fee Breakup for each student,প্রতিটি ছাত্র জন্য ফি ভাঙ্গন
@@ -2982,7 +3039,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,মূল্যনির্ধারণ হার
 DocType: Stock Reconciliation,SR/,এসআর /
 DocType: Vehicle,Diesel,ডীজ়ল্
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,মূল্য তালিকা মুদ্রা একক নির্বাচন করবেন
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,মূল্য তালিকা মুদ্রা একক নির্বাচন করবেন
 apps/erpnext/erpnext/config/healthcare.py +46,Results,ফলাফল
 ,Student Monthly Attendance Sheet,শিক্ষার্থীর মাসের এ্যাটেনডেন্স পত্রক
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},কর্মচারী {0} ইতিমধ্যে আবেদন করেছেন {1} মধ্যে {2} এবং {3}
@@ -2997,7 +3054,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,সেলস পার্টনার্স সেকেন্ড.
 DocType: Quality Inspection,Inspection Type,ইন্সপেকশন ধরন
 DocType: Fee Validity,Visited yet,এখনো পরিদর্শন
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,বিদ্যমান লেনদেনের সঙ্গে গুদাম গ্রুপে রূপান্তর করা যাবে না.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,বিদ্যমান লেনদেনের সঙ্গে গুদাম গ্রুপে রূপান্তর করা যাবে না.
 DocType: Assessment Result Tool,Result HTML,ফল এইচটিএমএল
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,মেয়াদ শেষ
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,শিক্ষার্থীরা যোগ
@@ -3023,7 +3080,7 @@
 DocType: Healthcare Settings,Result Printed,ফলাফল মুদ্রিত
 DocType: Asset Category Account,Depreciation Expense Account,অবচয় ব্যায়ের অ্যাকাউন্ট
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,অবেক্ষাধীন সময়ের
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},{0} দেখুন
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},{0} দেখুন
 DocType: Customer Group,Only leaf nodes are allowed in transaction,শুধু পাতার নোড লেনদেনের অনুমতি দেওয়া হয়
 DocType: Expense Claim,Expense Approver,ব্যয় রাজসাক্ষী
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,সারি {0}: গ্রাহক বিরুদ্ধে অগ্রিম ক্রেডিট হতে হবে
@@ -3034,7 +3091,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Datetime করুন
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,কোর্স সূচী মোছা হয়েছে:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,SMS বিতরণ অবস্থা বজায় রাখার জন্য লগ
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,সেলস টার্গেট সেট করুন
 DocType: Accounts Settings,Make Payment via Journal Entry,জার্নাল এন্ট্রি মাধ্যমে টাকা প্রাপ্তির
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,মুদ্রিত উপর
 DocType: Item,Inspection Required before Delivery,পরিদর্শন ডেলিভারি আগে প্রয়োজনীয়
@@ -3042,7 +3098,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,মুলতুবি কার্যক্রম
 DocType: Patient Appointment,Reminded,মনে করানো
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,তোমার অর্গানাইজেশন
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,তোমার অর্গানাইজেশন
 DocType: Fee Component,Fees Category,ফি শ্রেণী
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,তারিখ মুক্তিদান লিখুন.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
@@ -3054,7 +3110,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,পুনর্বিন্যাস স্তর
 DocType: Company,Chart Of Accounts Template,একাউন্টস টেমপ্লেটের চার্ট
 DocType: Attendance,Attendance Date,এ্যাটেনডেন্স তারিখ
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},আইটেম দাম {0} মূল্য তালিকা জন্য আপডেট {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},আইটেম দাম {0} মূল্য তালিকা জন্য আপডেট {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,আদায় এবং সিদ্ধান্তগ্রহণ উপর ভিত্তি করে বেতন ছুটি.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,সন্তানের নোড সঙ্গে অ্যাকাউন্ট লেজার রূপান্তরিত করা যাবে না
 DocType: Purchase Invoice Item,Accepted Warehouse,গৃহীত ওয়্যারহাউস
@@ -3070,9 +3126,10 @@
 ,Employee Birthday,কর্মচারী জন্মদিনের
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,ছাত্র ব্যাচ এ্যাটেনডেন্স টুল
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,সীমা অতিক্রম
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,নির্ধারিত পর্যন্ত
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ভেনচার ক্যাপিটাল
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,এই &#39;একাডেমিক ইয়ার&#39; দিয়ে একটি একাডেমিক শব্দটি {0} এবং &#39;টার্ম নাম&#39; {1} আগে থেকেই আছে. এই এন্ট্রি পরিবর্তন করে আবার চেষ্টা করুন.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","আইটেম {0} বিরুদ্ধে বিদ্যমান লেনদেন আছে, আপনার মান পরিবর্তন করতে পারবেন না {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","আইটেম {0} বিরুদ্ধে বিদ্যমান লেনদেন আছে, আপনার মান পরিবর্তন করতে পারবেন না {1}"
 DocType: UOM,Must be Whole Number,গোটা সংখ্যা হতে হবে
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(দিন) বরাদ্দ নতুন পাতার
 DocType: Purchase Invoice,Invoice Copy,চালান কপি
@@ -3082,7 +3139,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,চালান নম্বর
 DocType: Shopping Cart Settings,Orders,আদেশ
 DocType: Employee Leave Approver,Leave Approver,রাজসাক্ষী ত্যাগ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,দয়া করে একটি ব্যাচ নির্বাচন
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,দয়া করে একটি ব্যাচ নির্বাচন
 DocType: Assessment Group,Assessment Group Name,অ্যাসেসমেন্ট গ্রুপের নাম
 DocType: Manufacturing Settings,Material Transferred for Manufacture,উপাদান প্রস্তুত জন্য বদলিকৃত
 DocType: Expense Claim,"A user with ""Expense Approver"" role",&quot;ব্যয় রাজসাক্ষী&quot; ভূমিকা সাথে একজন ব্যবহারকারী
@@ -3097,7 +3154,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,সময়কাল সমাপন ভুক্তি
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,বিভাগ নির্বাচন করুন ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,বিদ্যমান লেনদেন সঙ্গে খরচ কেন্দ্র গ্রুপ রূপান্তরিত করা যাবে না
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},পরিমাণ {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},পরিমাণ {0} {1} {2} {3}
 DocType: Account,Depreciation,অবচয়
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),সরবরাহকারী (গুলি)
 DocType: Employee Attendance Tool,Employee Attendance Tool,কর্মী হাজিরা টুল
@@ -3108,10 +3165,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,পেমেন্ট দাখিলা {0} উন-লিঙ্ক আছে
 DocType: GL Entry,Voucher No,ভাউচার কোন
 ,Lead Owner Efficiency,লিড মালিক দক্ষতা
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,সবচেয়ে জনপ্রিয়
 DocType: Leave Allocation,Leave Allocation,অ্যালোকেশন ত্যাগ
 DocType: Payment Request,Recipient Message And Payment Details,প্রাপক বার্তা এবং পেমেন্ট বিবরণ
 DocType: Training Event,Trainer Email,প্রশিক্ষকদের ইমেইল
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,তৈরি উপাদান অনুরোধ {0}
+DocType: Restaurant Reservation,No of People,মানুষের সংখ্যা
 DocType: Production Planning Tool,Include sub-contracted raw materials,উপ-সংকুচিত কাঁচামাল অন্তর্ভুক্ত
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,পদ বা চুক্তি টেমপ্লেট.
 DocType: Purchase Invoice,Address and Contact,ঠিকানা ও যোগাযোগ
@@ -3120,10 +3179,11 @@
 DocType: Supplier,Last Day of the Next Month,পরবর্তী মাসের শেষ দিন
 DocType: Support Settings,Auto close Issue after 7 days,7 দিন পরে অটো বন্ধ ইস্যু
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","আগে বরাদ্দ করা না যাবে ছেড়ে {0}, ছুটি ভারসাম্য ইতিমধ্যে হ্যান্ড ফরওয়ার্ড ভবিষ্যতে ছুটি বরাদ্দ রেকর্ড হয়েছে হিসাবে {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),উল্লেখ্য: দরুন / রেফারেন্স তারিখ {0} দিন দ্বারা অনুমোদিত গ্রাহকের ক্রেডিট দিন অতিক্রম (গুলি)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),উল্লেখ্য: দরুন / রেফারেন্স তারিখ {0} দিন দ্বারা অনুমোদিত গ্রাহকের ক্রেডিট দিন অতিক্রম (গুলি)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,ছাত্র আবেদনকারীর
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,প্রাপকের জন্য মূল
 DocType: Asset Category Account,Accumulated Depreciation Account,সঞ্চিত অবচয় অ্যাকাউন্ট
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,এই ইমেলটি স্বয়ংক্রিয়ভাবে তৈরি করা হয়েছে
 DocType: Stock Settings,Freeze Stock Entries,ফ্রিজ শেয়ার সাজপোশাকটি
 DocType: Program Enrollment,Boarding Student,বোর্ডিং শিক্ষার্থীর
 DocType: Asset,Expected Value After Useful Life,প্রত্যাশিত মান দরকারী জীবন পর
@@ -3131,7 +3191,7 @@
 DocType: Activity Cost,Billing Rate,বিলিং রেট
 ,Qty to Deliver,বিতরণ Qty
 ,Stock Analytics,স্টক বিশ্লেষণ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,অপারেশনস ফাঁকা রাখা যাবে না
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,অপারেশনস ফাঁকা রাখা যাবে না
 DocType: Maintenance Visit Purpose,Against Document Detail No,ডকুমেন্ট বিস্তারিত বিরুদ্ধে কোন
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,পার্টির প্রকার বাধ্যতামূলক
 DocType: Quality Inspection,Outgoing,বহির্গামী
@@ -3153,7 +3213,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,ভ্রমণ ভিত্তিক গ্রুপ জন্য ম্যানুয়ালি ছাত্র নির্বাচন
 DocType: Journal Entry,User Remark,ব্যবহারকারী মন্তব্য
 DocType: Lead,Market Segment,মার্কেটের অংশ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Paid পরিমাণ মোট নেতিবাচক অসামান্য পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Paid পরিমাণ মোট নেতিবাচক অসামান্য পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {0}
 DocType: Supplier Scorecard Period,Variables,ভেরিয়েবল
 DocType: Employee Internal Work History,Employee Internal Work History,কর্মচারী অভ্যন্তরীণ কাজের ইতিহাস
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),বন্ধ (ড)
@@ -3182,21 +3242,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,আপডেট পান
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: অ্যাকাউন্ট {2} কোম্পানির অন্তর্গত নয় {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,উপাদানের জন্য অনুরোধ {0} বাতিল বা বন্ধ করা হয়
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,ম্যানেজমেন্ট ত্যাগ
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,ম্যানেজমেন্ট ত্যাগ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,অ্যাকাউন্ট দ্বারা গ্রুপ
 DocType: Sales Order,Fully Delivered,সম্পূর্ণ বিতরণ
 DocType: Lead,Lower Income,নিম্ন আয়
+DocType: Restaurant Order Entry,Current Order,বর্তমান আদেশ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},সোর্স ও টার্গেট গুদাম সারির এক হতে পারে না {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","এই স্টক রিকনসিলিয়েশন একটি খোলা এণ্ট্রি যেহেতু পার্থক্য অ্যাকাউন্ট, একটি সম্পদ / দায় ধরনের অ্যাকাউন্ট থাকতে হবে"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},বিতরণ পরিমাণ ঋণ পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,প্রোগ্রামে যান
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},আইটেম জন্য প্রয়োজন ক্রম সংখ্যা ক্রয় {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,উত্পাদনের অর্ডার তৈরি করা না
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,উত্পাদনের অর্ডার তৈরি করা না
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','তারিখ থেকে' অবশ্যই 'তারিখ পর্যন্ত' এর পরে হতে হবে
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ছাত্র হিসাবে অবস্থা পরিবর্তন করা যাবে না {0} ছাত্র আবেদনপত্রের সাথে সংযুক্ত করা হয় {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},ছাত্র হিসাবে অবস্থা পরিবর্তন করা যাবে না {0} ছাত্র আবেদনপত্রের সাথে সংযুক্ত করা হয় {1}
 DocType: Asset,Fully Depreciated,সম্পূর্ণরূপে মূল্যমান হ্রাস
 ,Stock Projected Qty,স্টক Qty অনুমিত
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},অন্তর্গত নয় {0} গ্রাহক প্রকল্পের {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},অন্তর্গত নয় {0} গ্রাহক প্রকল্পের {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,চিহ্নিত এ্যাটেনডেন্স এইচটিএমএল
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","উদ্ধৃতি প্রস্তাব, দর আপনি আপনার গ্রাহকদের কাছে পাঠানো হয়েছে"
 DocType: Sales Order,Customer's Purchase Order,গ্রাহকের ক্রয় আদেশ
@@ -3207,8 +3268,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Depreciations সংখ্যা বুক নির্ধারণ করুন
 DocType: Supplier Scorecard Period,Calculations,গণনাগুলি
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,মূল্য বা স্টক
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,প্রোডাকসন্স আদেশ জন্য উত্থাপিত করা যাবে না:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,প্রোডাকসন্স আদেশ জন্য উত্থাপিত করা যাবে না:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,মিনিট
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} সেটআপের মাধ্যমে&gt; সেটিংস&gt; নামকরণ সিরিজ জন্য নামকরণ সিরিজ সেট করুন
 DocType: Purchase Invoice,Purchase Taxes and Charges,কর ও শুল্ক ক্রয়
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,সরবরাহকারী যান
 ,Qty to Receive,জখন Qty
@@ -3221,7 +3283,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,একাউন্টে ক্রেডিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,সমস্ত সরবরাহকারী প্রকারভেদ
 DocType: Global Defaults,Disable In Words,শব্দ অক্ষম
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"আইটেম স্বয়ংক্রিয়ভাবে গণনা করা হয়, কারণ আইটেমটি কোড বাধ্যতামূলক"
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,"আইটেম স্বয়ংক্রিয়ভাবে গণনা করা হয়, কারণ আইটেমটি কোড বাধ্যতামূলক"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},উদ্ধৃতি {0} না টাইপ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,রক্ষণাবেক্ষণ সময়সূচী আইটেমটি
 DocType: Sales Order,%  Delivered,% বিতরণ করা হয়েছে
@@ -3243,23 +3305,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,খোলা ব্যালেন্স ইকুইটি
 DocType: Lead,CRM,সিআরএম
 DocType: Purchase Invoice,N,এন
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,পুনর্মিলন
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,অবশিষ্ট
 DocType: Appraisal,Appraisal,গুণগ্রাহিতা
 DocType: Purchase Invoice,GST Details,জিএসটি বিশ্লেষণ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},সরবরাহকারী পাঠানো ইমেল {0}
+DocType: Item,Default Sales Unit of Measure,পরিমাপের ডিফল্ট সেলস ইউনিট
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,তারিখ পুনরাবৃত্তি করা হয়
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,অনুমোদিত স্বাক্ষরকারী
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},এক হতে হবে রাজসাক্ষী ত্যাগ {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,ফি তৈরি করুন
-DocType: Hub Settings,Seller Email,বিক্রেতা ইমেইল
 DocType: Project,Total Purchase Cost (via Purchase Invoice),মোট ক্রয় খরচ (ক্রয় চালান মাধ্যমে)
 DocType: Training Event,Start Time,সময় শুরু
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,পরিমাণ বাছাই কর
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,পরিমাণ বাছাই কর
 DocType: Customs Tariff Number,Customs Tariff Number,কাস্টমস ট্যারিফ সংখ্যা
 DocType: Patient Appointment,Patient Appointment,রোগীর অ্যাপয়েন্টমেন্ট
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,ভূমিকা অনুমোদন নিয়ম প্রযোজ্য ভূমিকা হিসাবে একই হতে পারে না
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,এই ইমেইল ডাইজেস্ট থেকে সদস্যতা রদ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,এই ইমেইল ডাইজেস্ট থেকে সদস্যতা রদ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,দ্বারা সরবরাহকারী পেতে
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},আইটেম {1} জন্য পাওয়া যায়নি {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,কোর্স যান
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,বার্তা পাঠানো
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,সন্তানের নোড সঙ্গে অ্যাকাউন্ট খতিয়ান হিসাবে সেট করা যাবে না
@@ -3272,11 +3337,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,উপাদান উৎপাদন জন্য বদলিকৃত
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,অ্যাকাউন্ট {0} না বিদ্যমান
 DocType: Project,Project Type,প্রকল্প ধরন
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,এই টাস্কের জন্য শিশু টাস্ক বিদ্যমান। আপনি এই টাস্কটি মুছতে পারবেন না।
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,উভয় ক্ষেত্রেই লক্ষ্য Qty বা টার্গেট পরিমাণ বাধ্যতামূলক.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,বিভিন্ন কার্যক্রম খরচ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,আর ফলাফল নেই
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,বিভিন্ন কার্যক্রম খরচ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","জন্য ইভেন্ট নির্ধারণ {0}, যেহেতু কর্মচারী সেলস ব্যক্তি নিচে সংযুক্ত একটি ইউজার আইডি নেই {1}"
 DocType: Timesheet,Billing Details,পূর্ণ রূপ প্রকাশ
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,উত্স এবং লক্ষ্য গুদাম আলাদা হতে হবে
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,উত্স এবং লক্ষ্য গুদাম আলাদা হতে হবে
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},বেশী না পুরোনো স্টক লেনদেন হালনাগাদ করার অনুমতি {0}
 DocType: Purchase Invoice Item,PR Detail,জনসংযোগ বিস্তারিত
 DocType: Sales Order,Fully Billed,সম্পূর্ণ দেখানো হয়েছিল
@@ -3302,7 +3369,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,ওয়্যার ট্রান্সফার
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,সবগুলু যাচাই করুন
 DocType: Vehicle Log,Invoice Ref,চালান সুত্র
-DocType: Purchase Order,Recurring Order,আবর্তক অর্ডার
 DocType: Company,Default Income Account,ডিফল্ট আয় অ্যাকাউন্ট
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,গ্রাহক গ্রুপ / গ্রাহক
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),বন্ধ না অর্থবছরে লাভ / ক্ষতি (ক্রেডিট)
@@ -3316,9 +3382,9 @@
 DocType: Patient,A Negative,একটি নেতিবাচক
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,আর কিছুই দেখানোর জন্য।
 DocType: Lead,From Customer,গ্রাহকের কাছ থেকে
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,কল
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,কল
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,আক্তি পন্ন
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,ব্যাচ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,ব্যাচ
 DocType: Project,Total Costing Amount (via Time Logs),মোট খোয়াতে পরিমাণ (সময় লগসমূহ মাধ্যমে)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,ফি শেল্ড তৈরি করুন
 DocType: Purchase Order Item Supplied,Stock UOM,শেয়ার UOM
@@ -3342,7 +3408,7 @@
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,পত্রাদি এবং হলিডে
 DocType: School Settings,Current Academic Term,বর্তমান একাডেমিক টার্ম
 DocType: Sales Order,Not Billed,বিল না
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,উভয় ওয়্যারহাউস একই কোম্পানির অন্তর্গত নয়
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,উভয় ওয়্যারহাউস একই কোম্পানির অন্তর্গত নয়
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,কোনো পরিচিতি এখনো যোগ.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,ল্যান্ড কস্ট ভাউচার পরিমাণ
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,প্রস্তাব উত্থাপিত বিল.
@@ -3351,7 +3417,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,হ্রাসকৃত মুল্য
 DocType: Purchase Invoice,Return Against Purchase Invoice,বিরুদ্ধে ক্রয় চালান আসতে
 DocType: Item,Warranty Period (in days),(দিন) ওয়্যারেন্টি সময়কাল
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',আপডেট করুন &#39;ট্যাব পেটেন্ট অ্যাপয়েন্টমেন্ট&#39; সেট বিক্রয়_ইনভাইস = &#39;{0}&#39; যেখানে নাম = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Guardian1 সাথে সর্ম্পক
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,অপারেশন থেকে নিট ক্যাশ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,আইটেম 4
@@ -3360,8 +3425,8 @@
 DocType: Journal Entry Account,Journal Entry Account,জার্নাল এন্ট্রি অ্যাকাউন্ট
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,শিক্ষার্থীর গ্রুপ
 DocType: Shopping Cart Settings,Quotation Series,উদ্ধৃতি সিরিজের
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","একটি আইটেম একই নামের সঙ্গে বিদ্যমান ({0}), আইটেম গ্রুপের নাম পরিবর্তন বা আইটেম নামান্তর করুন"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,দয়া করে গ্রাহক নির্বাচন
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","একটি আইটেম একই নামের সঙ্গে বিদ্যমান ({0}), আইটেম গ্রুপের নাম পরিবর্তন বা আইটেম নামান্তর করুন"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,দয়া করে গ্রাহক নির্বাচন
 DocType: C-Form,I,আমি
 DocType: Company,Asset Depreciation Cost Center,অ্যাসেট অবচয় মূল্য কেন্দ্র
 DocType: Sales Order Item,Sales Order Date,বিক্রয় আদেশ তারিখ
@@ -3370,6 +3435,7 @@
 DocType: Assessment Plan,Assessment Plan,অ্যাসেসমেন্ট প্ল্যান
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,গ্রাহক {0} তৈরি করা হয়।
 DocType: Stock Settings,Limit Percent,সীমা শতকরা
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,বর্তমানে কোন গুদামে কোন স্টক উপলব্ধ নেই
 ,Payment Period Based On Invoice Date,চালান তারিখ উপর ভিত্তি করে পরিশোধ সময়সীমার
 DocType: Sample Collection,No. of print,মুদ্রণের সংখ্যা
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},নিখোঁজ মুদ্রা বিনিময় হার {0}
@@ -3425,13 +3491,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,গ্রস পে - মোট সিদ্ধান্তগ্রহণ - ঋণ পরিশোধ
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,বর্তমান BOM এবং নতুন BOM একই হতে পারে না
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,বেতন স্লিপ আইডি
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,বেতন স্লিপ আইডি
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,অবসর তারিখ যোগদান তারিখ থেকে বড় হওয়া উচিত
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,ত্রুটিযুক্ত অবশ্যই নির্ধারণ করার সময় ছিল:
 DocType: Sales Invoice,Against Income Account,আয় অ্যাকাউন্টের বিরুদ্ধে
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% বিতরণ করা হয়েছে
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,আইটেম {0}: আদেশ Qty {1} সর্বনিম্ন ক্রম Qty {2} (আইটেমটি সংজ্ঞায়িত) কম হতে পারে না.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,আইটেম {0}: আদেশ Qty {1} সর্বনিম্ন ক্রম Qty {2} (আইটেমটি সংজ্ঞায়িত) কম হতে পারে না.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,মাসিক বন্টন শতকরা
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,অন্য ব্যবহারকারী হিসাবে লগইন করুন দয়া করে
 DocType: Territory,Territory Targets,টেরিটরি লক্ষ্যমাত্রা
 DocType: Delivery Note,Transporter Info,স্থানান্তরকারী তথ্য
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},ডিফল্ট {0} কোম্পানি নির্ধারণ করুন {1}
@@ -3439,13 +3506,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,একই সরবরাহকারী একাধিক বার প্রবেশ করানো হয়েছে
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,গ্রস লাভ / ক্ষতি
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,অর্ডার আইটেমটি সরবরাহ ক্রয়
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,কোম্পানির নাম কোম্পানি হতে পারে না
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,কোম্পানির নাম কোম্পানি হতে পারে না
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,মুদ্রণ টেমপ্লেট জন্য পত্র নেতৃবৃন্দ.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,মুদ্রণ টেমপ্লেট শিরোনাম চালানকল্প যেমন.
 DocType: Program Enrollment,Walking,চলাফেরা
 DocType: Student Guardian,Student Guardian,ছাত্র গার্ডিয়ান
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,মূল্যনির্ধারণ টাইপ চার্জ সমেত হিসাবে চিহ্নিত করতে পারেন না
 DocType: POS Profile,Update Stock,আপডেট শেয়ার
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,সাবস্ক্রিপশন মধ্যে
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,আইটেম জন্য বিভিন্ন UOM ভুল (মোট) নিট ওজন মান হতে হবে. প্রতিটি আইটেমের নিট ওজন একই UOM হয় তা নিশ্চিত করুন.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM হার
 DocType: Asset,Journal Entry for Scrap,স্ক্র্যাপ জন্য জার্নাল এন্ট্রি
@@ -3493,15 +3561,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","সিস্টেম ব্যবহারকারী (লগইন) আইডি. সেট, এটি সব এইচআর ফরম জন্য ডিফল্ট হয়ে যাবে."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1} থেকে
 DocType: Task,depends_on,নির্ভর করে
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,সমস্ত বিল উপকরণ মধ্যে সর্বশেষ মূল্য আপডেট করার জন্য সারিবদ্ধ। এটি কয়েক মিনিট সময় নিতে পারে।
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,সমস্ত বিল উপকরণ মধ্যে সর্বশেষ মূল্য আপডেট করার জন্য সারিবদ্ধ। এটি কয়েক মিনিট সময় নিতে পারে।
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,নতুন একাউন্টের নাম. উল্লেখ্য: গ্রাহকদের এবং সরবরাহকারী জন্য অ্যাকাউন্ট তৈরি করবেন না দয়া করে
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,দেশ অনুযায়ী ডিফল্ট ঠিকানা টেমপ্লেট
 DocType: Sales Order Item,Supplier delivers to Customer,সরবরাহকারী গ্রাহক যাও বিতরণ
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ফরম / আইটেম / {0}) স্টক আউট
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},দরুন / রেফারেন্স তারিখ পরে হতে পারে না {0}
+,Sales Payment Summary,বিক্রয় পেমেন্ট সারসংক্ষেপ
+DocType: Restaurant,Restaurant,রেস্টুরেন্ট
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},দরুন / রেফারেন্স তারিখ পরে হতে পারে না {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ডেটা আমদানি ও রপ্তানি
 DocType: Patient,Account Details,বিস্তারিত হিসাব
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,কোন ছাত্র পাওয়া
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,কোন ছাত্র পাওয়া
 DocType: Medical Department,Medical Department,চিকিৎসা বিভাগ
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,সরবরাহকারী স্কোরকার্ড স্কোরিং মাপদণ্ড
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,চালান পোস্টিং তারিখ
@@ -3512,7 +3582,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,দয়া করে পার্টির নির্বাচন সামনে পোস্টিং তারিখ নির্বাচন
 DocType: Program Enrollment,School House,স্কুল হাউস
 DocType: Serial No,Out of AMC,এএমসি আউট
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,উদ্ধৃতি দয়া করে নির্বাচন করুন
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,উদ্ধৃতি দয়া করে নির্বাচন করুন
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,বুক Depreciations সংখ্যা মোট Depreciations সংখ্যা তার চেয়ে অনেক বেশী হতে পারে না
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,রক্ষণাবেক্ষণ দর্শন করা
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,সেলস মাস্টার ম্যানেজার {0} ভূমিকা আছে যারা ব্যবহারকারীর সাথে যোগাযোগ করুন
@@ -3520,7 +3590,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,কোম্পানি (না গ্রাহক বা সরবরাহকারীর) মাস্টার.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,এই শিক্ষার্থী উপস্থিতির উপর ভিত্তি করে
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,কোন শিক্ষার্থীরা
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,আরো আইটেম বা খোলা পূর্ণ ফর্ম যোগ
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,আরো আইটেম বা খোলা পূর্ণ ফর্ম যোগ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,প্রসবের নোট {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,ব্যবহারকারীদের কাছে যান
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,প্রদত্ত পরিমাণ পরিমাণ সর্বমোট তার চেয়ে অনেক বেশী হতে পারে না বন্ধ লিখুন + +
@@ -3540,37 +3610,40 @@
 DocType: Fee Schedule,Fee Schedule,ফি সময়সূচী
 DocType: Hub Settings,Publish Availability,সহজলভ্যতা প্রকাশ
 DocType: Company,Create Chart Of Accounts Based On,হিসাব উপর ভিত্তি করে চার্ট তৈরি করুন
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,এটি অ-গ্রুপে রূপান্তর করা যাবে না শিশু কাজগুলি বিদ্যমান।
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,জন্ম তারিখ আজ তার চেয়ে অনেক বেশী হতে পারে না.
 ,Stock Ageing,শেয়ার বুড়ো
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},ছাত্র {0} ছাত্র আবেদনকারী বিরুদ্ধে অস্তিত্ব {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),গোলাকার সমন্বয় (কোম্পানী মুদ্রা)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' নিষ্ক্রিয়
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ওপেন হিসাবে সেট করুন
 DocType: Cheque Print Template,Scanned Cheque,স্ক্যান করা চেক
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,জমা লেনদেনের পরিচিতিতে স্বয়ংক্রিয় ইমেল পাঠান.
 DocType: Timesheet,Total Billable Amount,মোট বিলযোগ্য পরিমাণ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,আইটেম 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,অর্ডার এন্ট্রি
 DocType: Purchase Order,Customer Contact Email,গ্রাহক যোগাযোগ ইমেইল
 DocType: Warranty Claim,Item and Warranty Details,আইটেম এবং পাটা বিবরণ
 DocType: Sales Team,Contribution (%),অবদান (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,উল্লেখ্য: পেমেন্ট ভুক্তি থেকে তৈরি করা হবে না &#39;ক্যাশ বা ব্যাংক একাউন্ট&#39; উল্লেখ করা হয়নি
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,প্রকল্প {0} ইতিমধ্যে বিদ্যমান
 DocType: Medical Department,Nursing User,নার্সিং ব্যবহারকারী
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,দায়িত্ব
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,এই উদ্ধৃতির বৈধতা মেয়াদ শেষ হয়েছে।
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,এই উদ্ধৃতির বৈধতা মেয়াদ শেষ হয়েছে।
 DocType: Expense Claim Account,Expense Claim Account,ব্যয় দাবি অ্যাকাউন্ট
 DocType: Accounts Settings,Allow Stale Exchange Rates,স্টেলা এক্সচেঞ্জের হার মঞ্জুর করুন
 DocType: Sales Person,Sales Person Name,সেলস পারসন নাম
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,টেবিলের অন্তত 1 চালান লিখুন দয়া করে
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,ব্যবহারকারী যুক্ত করুন
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,ব্যবহারকারী যুক্ত করুন
 DocType: POS Item Group,Item Group,আইটেমটি গ্রুপ
 DocType: Item,Safety Stock,নিরাপত্তা স্টক
 DocType: Healthcare Settings,Healthcare Settings,স্বাস্থ্যসেবা সেটিংস
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,একটি কাজের জন্য অগ্রগতি% 100 জনেরও বেশি হতে পারে না.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,একটি কাজের জন্য অগ্রগতি% 100 জনেরও বেশি হতে পারে না.
 DocType: Stock Reconciliation Item,Before reconciliation,পুনর্মিলন আগে
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},করুন {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),কর ও চার্জ যোগ (কোম্পানি একক)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,আইটেমটি ট্যাক্স সারি {0} টাইপ ট্যাক্স বা আয় বা ব্যয় বা প্রদেয় এর একাউন্ট থাকতে হবে
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,আইটেমটি ট্যাক্স সারি {0} টাইপ ট্যাক্স বা আয় বা ব্যয় বা প্রদেয় এর একাউন্ট থাকতে হবে
 DocType: Sales Order,Partly Billed,আংশিক দেখানো হয়েছিল
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,আইটেম {0} একটি ফিক্সড অ্যাসেট আইটেম হতে হবে
 DocType: Item,Default BOM,ডিফল্ট BOM
@@ -3586,6 +3659,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,পরিবর্তনশীল
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,ডেলিভারি নোট থেকে
 DocType: Student,Student Email Address,ছাত্র ইমেইল ঠিকানা
+DocType: Item,Hub Warehouse,হাব গুদামঘর
 DocType: Physician Schedule Time Slot,From Time,সময় থেকে
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,স্টক ইন:
 DocType: Notification Control,Custom Message,নিজস্ব বার্তা
@@ -3593,9 +3667,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,ক্যাশ বা ব্যাংক একাউন্ট পেমেন্ট এন্ট্রি করার জন্য বাধ্যতামূলক
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,শিক্ষার্থীর ঠিকানা
 DocType: Purchase Invoice,Price List Exchange Rate,মূল্য তালিকা বিনিময় হার
+DocType: POS Profile,POS Profile Name,পিওএস প্রোফাইল নাম
 DocType: Purchase Invoice Item,Rate,হার
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,অন্তরীণ করা
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,ঠিকানা নাম
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,ঠিকানা নাম
 DocType: Stock Entry,From BOM,BOM থেকে
 DocType: Assessment Code,Assessment Code,অ্যাসেসমেন্ট কোড
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,মৌলিক
@@ -3609,11 +3684,12 @@
 DocType: Salary Slip,Salary Structure,বেতন কাঠামো
 DocType: Account,Bank,ব্যাংক
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,বিমানসংস্থা
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,ইস্যু উপাদান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,ইস্যু উপাদান
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,পুনরাবৃত্তি তৈরির সময় একটি ত্রুটি ঘটেছে
 DocType: Material Request Item,For Warehouse,গুদাম জন্য
 DocType: Employee,Offer Date,অপরাধ তারিখ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,উদ্ধৃতি
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,আপনি অফলাইন মোডে হয়. আপনি যতক্ষণ না আপনি নেটওয়ার্ক আছে রিলোড করতে সক্ষম হবে না.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,আপনি অফলাইন মোডে হয়. আপনি যতক্ষণ না আপনি নেটওয়ার্ক আছে রিলোড করতে সক্ষম হবে না.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,কোন ছাত্র সংগঠনের সৃষ্টি.
 DocType: Purchase Invoice Item,Serial No,ক্রমিক নং
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,মাসিক পরিশোধ পরিমাণ ঋণের পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না
@@ -3623,17 +3699,18 @@
 DocType: Salary Slip,Total Working Hours,মোট ওয়ার্কিং ঘন্টা
 DocType: Subscription,Next Schedule Date,পরবর্তী তালিকা তারিখ
 DocType: Stock Entry,Including items for sub assemblies,সাব সমাহারকে জিনিস সহ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,লিখুন মান ধনাত্মক হবে
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,সমস্ত অঞ্চল
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,লিখুন মান ধনাত্মক হবে
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,সমস্ত অঞ্চল
 DocType: Purchase Invoice,Items,চলছে
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,ছাত্র ইতিমধ্যে নথিভুক্ত করা হয়.
 DocType: Fiscal Year,Year Name,সাল নাম
 DocType: Process Payroll,Process Payroll,প্রক্রিয়া বেতনের
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,কার্যদিবসের তুলনায় আরো ছুটির এই মাস আছে.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,কার্যদিবসের তুলনায় আরো ছুটির এই মাস আছে.
 DocType: Product Bundle Item,Product Bundle Item,পণ্য সমষ্টি আইটেম
 DocType: Sales Partner,Sales Partner Name,বিক্রয় অংশীদার নাম
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,উদ্ধৃতি জন্য অনুরোধ
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,উদ্ধৃতি জন্য অনুরোধ
 DocType: Payment Reconciliation,Maximum Invoice Amount,সর্বাধিক চালান পরিমাণ
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,হেমাটোলজি
 DocType: Normal Test Items,Normal Test Items,সাধারণ টেস্ট আইটেম
 DocType: Student Language,Student Language,ছাত্র ভাষা
 apps/erpnext/erpnext/config/selling.py +23,Customers,গ্রাহকদের
@@ -3644,10 +3721,11 @@
 DocType: Issue,Opening Time,খোলার সময়
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,থেকে এবং প্রয়োজনীয় তারিখগুলি
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,সিকিউরিটিজ ও পণ্য বিনিময়ের
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',বৈকল্পিক জন্য মেজার ডিফল্ট ইউনিট &#39;{0}&#39; টেমপ্লেট হিসাবে একই হতে হবে &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',বৈকল্পিক জন্য মেজার ডিফল্ট ইউনিট &#39;{0}&#39; টেমপ্লেট হিসাবে একই হতে হবে &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ভিত্তি করে গণনা
 DocType: Delivery Note Item,From Warehouse,গুদাম থেকে
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,সামগ্রী বিল দিয়ে কোন সামগ্রী উত্পাদনপ্রণালী
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,সামগ্রী বিল দিয়ে কোন সামগ্রী উত্পাদনপ্রণালী
+DocType: Restaurant,Default Customer,ডিফল্ট গ্রাহক
 DocType: Assessment Plan,Supervisor Name,সুপারভাইজার নাম
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,একই দিনের জন্য অ্যাপয়েন্টমেন্ট তৈরি করা হয় কিনা তা নিশ্চিত করবেন না
 DocType: Program Enrollment Course,Program Enrollment Course,প্রোগ্রাম তালিকাভুক্তি কোর্সের
@@ -3674,7 +3752,7 @@
 DocType: Payment Entry,Internal Transfer,অভ্যন্তরীণ স্থানান্তর
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,শিশু অ্যাকাউন্ট এই অ্যাকাউন্টের জন্য বিদ্যমান. আপনি এই অ্যাকাউন্ট মুছে ফেলতে পারবেন না.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,উভয় ক্ষেত্রেই লক্ষ্য Qty বা টার্গেট পরিমাণ বাধ্যতামূলক
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},কোন ডিফল্ট BOM আইটেমটি জন্য বিদ্যমান {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},কোন ডিফল্ট BOM আইটেমটি জন্য বিদ্যমান {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,প্রথম পোস্টিং তারিখ নির্বাচন করুন
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,তারিখ খোলার তারিখ বন্ধ করার আগে করা উচিত
 DocType: Leave Control Panel,Carry Forward,সামনে আগাও
@@ -3709,6 +3787,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,মোট বর্তমান
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,অ্যাকাউন্টিং বিবৃতি
 DocType: Drug Prescription,Hour,ঘন্টা
+DocType: Restaurant Order Entry,Last Sales Invoice,শেষ সেলস ইনভয়েস
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,নতুন সিরিয়াল কোন গুদাম থাকতে পারে না. গুদাম স্টক এন্ট্রি বা কেনার রসিদ দ্বারা নির্ধারণ করা হবে
 DocType: Lead,Lead Type,লিড ধরন
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,আপনি ব্লক তারিখগুলি উপর পাতার অনুমোদন যথাযথ অনুমতি নেই
@@ -3743,64 +3822,66 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,তৈরি করুন ব্যবহারকারীরা
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,গ্রাম
 DocType: Supplier Scorecard,Per Month,প্রতি মাসে
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,প্রস্তুত পরিমাণ 0 থেকে বড় হওয়া উচিত.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,প্রস্তুত পরিমাণ 0 থেকে বড় হওয়া উচিত.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,রক্ষণাবেক্ষণ কল জন্য প্রতিবেদন দেখুন.
 DocType: Stock Entry,Update Rate and Availability,হালনাগাদ হার এবং প্রাপ্যতা
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,শতকরা আপনি পাবেন বা আদেশ পরিমাণ বিরুদ্ধে আরো বিলি করার অনুমতি দেওয়া হয়. উদাহরণস্বরূপ: আপনি 100 ইউনিট আদেশ আছে. এবং আপনার ভাতা তারপর আপনি 110 ইউনিট গ্রহণ করার অনুমতি দেওয়া হয় 10% হয়.
 DocType: POS Customer Group,Customer Group,গ্রাহক গ্রুপ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),নিউ ব্যাচ আইডি (ঐচ্ছিক)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),নিউ ব্যাচ আইডি (ঐচ্ছিক)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},ব্যয় অ্যাকাউন্ট আইটেমের জন্য বাধ্যতামূলক {0}
 DocType: BOM,Website Description,ওয়েবসাইট বর্ণনা
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ইক্যুইটি মধ্যে নিট পরিবর্তন
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,নতুন
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,ক্রয় চালান {0} বাতিল অনুগ্রহ প্রথম
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ই-মেইল ঠিকানা অবশ্যই ইউনিক হতে হবে, ইতিমধ্যে অস্তিত্বমান {0}"
 DocType: Serial No,AMC Expiry Date,এএমসি মেয়াদ শেষ হওয়ার তারিখ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,প্রাপ্তি
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,প্রাপ্তি
 ,Sales Register,সেলস নিবন্ধন
 DocType: Daily Work Summary Settings Company,Send Emails At,ইমেইল পাঠান এ
 DocType: Quotation,Quotation Lost Reason,উদ্ধৃতি লস্ট কারণ
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,আপনার ডোমেইন নির্বাচন করুন
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',ট্যাব প্যাটেন্ট থেকে * নির্বাচন করুন যেখানে নাম = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},লেনদেন রেফারেন্স কোন {0} তারিখের {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},লেনদেন রেফারেন্স কোন {0} তারিখের {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,সম্পাদনা করার কিছুই নেই.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,ফর্ম দেখুন
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,এই মাস এবং স্থগিত কার্যক্রম জন্য সারসংক্ষেপ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,ফর্ম দেখুন
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,এই মাস এবং স্থগিত কার্যক্রম জন্য সারসংক্ষেপ
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","আপনার প্রতিষ্ঠান ছাড়া ব্যবহারকারীদের যোগ করুন, আপনার নিজের চেয়ে অন্য।"
 DocType: Customer Group,Customer Group Name,গ্রাহক গ্রুপ নাম
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,এখনও কোন গ্রাহকরা!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,এখনও কোন গ্রাহকরা!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,ক্যাশ ফ্লো বিবৃতি
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ঋণের পরিমাণ সর্বোচ্চ ঋণের পরিমাণ বেশি হতে পারে না {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,লাইসেন্স
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},সি-ফরম থেকে এই চালান {0} মুছে ফেলুন দয়া করে {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},সি-ফরম থেকে এই চালান {0} মুছে ফেলুন দয়া করে {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,এছাড়াও আপনি আগের অর্থবছরের ভারসাম্য এই অর্থবছরের ছেড়ে অন্তর্ভুক্ত করতে চান তাহলে এগিয়ে দয়া করে নির্বাচন করুন
 DocType: GL Entry,Against Voucher Type,ভাউচার টাইপ বিরুদ্ধে
 DocType: Physician,Phone (R),ফোন (আর)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,সময় স্লট যোগ করা
 DocType: Item,Attributes,আরোপ করা
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,টেমপ্লেট সক্ষম করুন
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} সেটআপের মাধ্যমে&gt; সেটিংস&gt; নামকরণ সিরিজ জন্য নামকরণ সিরিজ সেট করুন
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,"অ্যাকাউন্ট বন্ধ লিখতে লিখতে, অনুগ্রহ করে"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,শেষ আদেশ তারিখ
 DocType: Patient,B Negative,বি নেতিবাচক
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},অ্যাকাউন্ট {0} আছে কোম্পানীর জন্যে না {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,{0} সারিতে সিরিয়াল নম্বর দিয়ে ডেলিভারি নোট মেলে না
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,{0} সারিতে সিরিয়াল নম্বর দিয়ে ডেলিভারি নোট মেলে না
 DocType: Student,Guardian Details,গার্ডিয়ান বিবরণ
 DocType: C-Form,C-Form,সি-ফরম
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,একাধিক কর্মীদের জন্য মার্ক এ্যাটেনডেন্স
 DocType: Vehicle,Chassis No,চেসিস কোন
 DocType: Payment Request,Initiated,প্রবর্তিত
 DocType: Production Order,Planned Start Date,পরিকল্পনা শুরুর তারিখ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,একটি BOM নির্বাচন করুন
 DocType: Serial No,Creation Document Type,ক্রিয়েশন ডকুমেন্ট টাইপ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,শেষ তারিখ শুরু তারিখের চেয়ে বেশি হওয়া আবশ্যক
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,শেষ তারিখ শুরু তারিখের চেয়ে বেশি হওয়া আবশ্যক
 DocType: Leave Type,Is Encash,ভাঙ্গান হয়
 DocType: Leave Allocation,New Leaves Allocated,নতুন পাতার বরাদ্দ
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,প্রকল্প-ভিত্তিক তথ্য উদ্ধৃতি জন্য উপলব্ধ নয়
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,শেষ
 DocType: Project,Expected End Date,সমাপ্তি প্রত্যাশিত তারিখ
 DocType: Budget Account,Budget Amount,বাজেট পরিমাণ
 DocType: Appraisal Template,Appraisal Template Title,মূল্যায়ন টেমপ্লেট শিরোনাম
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},তারিখ থেকে {0} জন্য কর্মচারী {1} আগে কর্মী যোগদান তারিখ হতে পারে না {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,ব্যবসায়িক
 DocType: Patient,Alcohol Current Use,অ্যালকোহল বর্তমান ব্যবহার
+DocType: Student Admission Program,Student Admission Program,ছাত্র ভর্তি প্রোগ্রাম
 DocType: Payment Entry,Account Paid To,অ্যাকাউন্টে অর্থ প্রদান করা
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,মূল আইটেমটি {0} একটি স্টক আইটেম হবে না
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,সব পণ্য বা সেবা.
@@ -3809,30 +3890,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} অ্যাকাউন্টের জন্য বাজেট {1} বিরুদ্ধে {2} {3} হল {4}. এটা দ্বারা অতিক্রম করবে {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',সারি {0} # অ্যাকাউন্ট ধরনের হতে হবে &#39;ফিক্সড অ্যাসেট&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Qty আউট
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,বিধি একটি বিক্রয়ের জন্য শিপিং পরিমাণ নিরূপণ করা
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,এবং নিষ্ক্রিয় মধ্যে অক্ষম
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,সিরিজ বাধ্যতামূলক
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,অর্থনৈতিক সেবা
 DocType: Student Sibling,Student ID,শিক্ষার্থী আইডি
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,টাইম লগ জন্য ক্রিয়াকলাপ প্রকারভেদ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,সরবরাহকারী ইমেল
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,টাইম লগ জন্য ক্রিয়াকলাপ প্রকারভেদ
 DocType: Tax Rule,Sales,সেলস
 DocType: Stock Entry Detail,Basic Amount,বেসিক পরিমাণ
 DocType: Training Event,Exam,পরীক্ষা
 DocType: Complaint,Complaint,অভিযোগ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},গুদাম স্টক আইটেম জন্য প্রয়োজন {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},গুদাম স্টক আইটেম জন্য প্রয়োজন {0}
 DocType: Leave Allocation,Unused leaves,অব্যবহৃত পাতার
 DocType: Patient,Alcohol Past Use,অ্যালকোহল অতীত ব্যবহার
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,CR
 DocType: Tax Rule,Billing State,বিলিং রাজ্য
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,হস্তান্তর
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),(সাব-সমাহারগুলি সহ) অপ্রমাণিত BOM পান
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,হস্তান্তর
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),(সাব-সমাহারগুলি সহ) অপ্রমাণিত BOM পান
 DocType: Authorization Rule,Applicable To (Employee),প্রযোজ্য (কর্মচারী)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,দরুন জন্ম বাধ্যতামূলক
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,দরুন জন্ম বাধ্যতামূলক
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,অ্যাট্রিবিউট জন্য বর্ধিত {0} 0 হতে পারবেন না
 DocType: Journal Entry,Pay To / Recd From,থেকে / Recd যেন পে
 DocType: Naming Series,Setup Series,সেটআপ সিরিজ
 DocType: Payment Reconciliation,To Invoice Date,তারিখ চালান
 DocType: Supplier,Contact HTML,যোগাযোগ এইচটিএমএল
 ,Inactive Customers,নিষ্ক্রিয় গ্রাহকরা
+DocType: Student Admission Program,Maximum Age,সর্বোচ্চ বয়স
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,ক্রয় রসিদের
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,কিভাবে প্রাইসিং নিয়ম প্রয়োগ করা হয়?
@@ -3851,6 +3934,7 @@
 DocType: GL Entry,Remarks,মন্তব্য
 DocType: Payment Entry,Account Paid From,অ্যাকাউন্ট থেকে অর্থ প্রদান করা
 DocType: Purchase Order Item Supplied,Raw Material Item Code,কাঁচামাল আইটেম কোড
+DocType: Task,Parent Task,বাবা টাস্ক
 DocType: Journal Entry,Write Off Based On,ভিত্তি করে লিখুন বন্ধ
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,লিড করুন
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,মুদ্রণ করুন এবং স্টেশনারি
@@ -3859,19 +3943,19 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","বেতন ইতিমধ্যে মধ্যে {0} এবং {1}, আবেদন সময়ের ত্যাগ এই তারিখ সীমার মধ্যে হতে পারে না সময়ের জন্য প্রক্রিয়া."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,একটি সিরিয়াল নং জন্য ইনস্টলেশন রেকর্ড
 DocType: Guardian Interest,Guardian Interest,গার্ডিয়ান সুদ
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,পিওএস ইনভয়েসেসের জন্য ডিফল্ট মান সেটআপ করুন
 apps/erpnext/erpnext/config/hr.py +177,Training,প্রশিক্ষণ
 DocType: Timesheet,Employee Detail,কর্মচারী বিস্তারিত
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ইমেইল আইডি
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,পরবর্তী তারিখ দিবস এবং মাসের দিন পুনরাবৃত্তি সমান হতে হবে
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,পরবর্তী তারিখ দিবস এবং মাসের দিন পুনরাবৃত্তি সমান হতে হবে
 DocType: Lab Prescription,Test Code,পরীক্ষার কোড
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,ওয়েবসাইট হোমপেজে জন্য সেটিংস
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},{1} এর স্কোরকার্ড স্থানের কারণে {0} জন্য RFQs অনুমোদিত নয়
 DocType: Offer Letter,Awaiting Response,প্রতিক্রিয়ার জন্য অপেক্ষা
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,উপরে
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},মোট পরিমাণ {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},অবৈধ অ্যাট্রিবিউট {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},মোট পরিমাণ {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},অবৈধ অ্যাট্রিবিউট {0} {1}
 DocType: Supplier,Mention if non-standard payable account,উল্লেখ করো যদি অ-মানক প্রদেয় অ্যাকাউন্ট
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},একই আইটেমকে একাধিক বার প্রবেশ করা হয়েছে। {তালিকা}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',দয়া করে মূল্যায়ন &#39;সমস্ত অ্যাসেসমেন্ট গোষ্ঠীসমূহ&#39; ছাড়া অন্য গোষ্ঠী নির্বাচন করুন
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},সারি {0}: একটি কেনার জন্য খরচ কেন্দ্র প্রয়োজন {1}
 DocType: Training Event Employee,Optional,ঐচ্ছিক
@@ -3894,19 +3978,20 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: খরচ কেন্দ্র আইটেম জন্য বাধ্যতামূলক {2}
 DocType: Vehicle,Policy No,নীতি কোন
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,পণ্য সমষ্টি থেকে আইটেম পেতে
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","যেহেতু স্টক একটি আইটেম {0} বিরুদ্ধে বিদ্যমান আছে, আপনি ভ্যারিয়েন্ট সম্পত্তি সক্ষম করতে পারবেন না"
 DocType: Asset,Straight Line,সোজা লাইন
 DocType: Project User,Project User,প্রকল্প ব্যবহারকারী
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,বিভক্ত করা
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,বিভক্ত করা
 DocType: GL Entry,Is Advance,অগ্রিম
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,জন্ম তারিখ এবং উপস্থিত এ্যাটেনডেন্স বাধ্যতামূলক
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,হ্যাঁ অথবা না হিসাবে &#39;আউটসোর্স থাকলে&#39; দয়া করে প্রবেশ করুন
+DocType: Item,Default Purchase Unit of Measure,পরিমাপের ডিফল্ট ক্রয় ইউনিট
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,গত কমিউনিকেশন তারিখ
 DocType: Sales Team,Contact No.,যোগাযোগের নম্বর.
 DocType: Bank Reconciliation,Payment Entries,পেমেন্ট দাখিলা
 DocType: Production Order,Scrap Warehouse,স্ক্র্যাপ ওয়্যারহাউস
 DocType: Production Order,Check if material transfer entry is not required,যদি বস্তুগত স্থানান্তর এন্ট্রি প্রয়োজন হয় না চেক করুন
 DocType: Program Enrollment Tool,Get Students From,থেকে শিক্ষার্থীরা পান
-DocType: Hub Settings,Seller Country,বিক্রেতা দেশ
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,ওয়েবসাইটে আইটেম প্রকাশ
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,ব্যাচে Group আপনার ছাত্র
 DocType: Authorization Rule,Authorization Rule,অনুমোদন রুল
@@ -3916,7 +4001,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,বিক্রয় করের এবং চার্জ টেমপ্লেট
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),মোট (ক্রেডিট)
 DocType: Repayment Schedule,Payment Date,টাকা প্রদানের তারিখ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,নিউ ব্যাচ চলছে
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,নিউ ব্যাচ চলছে
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,পোশাক ও আনুষাঙ্গিক
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,ওজনযুক্ত স্কোর ফাংশন সমাধান করা যায়নি। নিশ্চিত করুন সূত্রটি বৈধ।
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,অর্ডার সংখ্যা
@@ -3934,6 +4019,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","সারি # {0}: অ্যাসেট {1} জমা দেওয়া যাবে না, এটা আগে থেকেই {2}"
 DocType: Tax Rule,Billing Country,বিলিং দেশ
 DocType: Purchase Order Item,Expected Delivery Date,প্রত্যাশিত প্রসবের তারিখ
+DocType: Restaurant Order Entry,Restaurant Order Entry,রেস্টুরেন্ট অর্ডার এন্ট্রি
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ডেবিট ও ক্রেডিট {0} # জন্য সমান নয় {1}. পার্থক্য হল {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,আমোদ - প্রমোদ খরচ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,উপাদান অনুরোধ করুন
@@ -3946,9 +4032,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,বিদ্যমান লেনদেনের সঙ্গে অ্যাকাউন্ট মুছে ফেলা যাবে না
 DocType: Vehicle,Last Carbon Check,সর্বশেষ কার্বন চেক
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,আইনি খরচ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,দয়া করে সারিতে পরিমাণ নির্বাচন
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,দয়া করে সারিতে পরিমাণ নির্বাচন
 DocType: Purchase Invoice,Posting Time,পোস্টিং সময়
 DocType: Timesheet,% Amount Billed,% পরিমাণ চালান করা হয়েছে
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;সময় প্রতি নিয়োগ&quot; ডাঃ জন্য সেট করা হয়েছে &quot;{0}। চিকিত্সক মাস্টার মধ্যে এটি যোগ করুন।
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,টেলিফোন খরচ
 DocType: Sales Partner,Logo,লোগো
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,আপনি সংরক্ষণের আগে একটি সিরিজ নির্বাচন করুন ব্যবহারকারীর বাধ্য করতে চান তাহলে এই পরীক্ষা. আপনি এই পরীক্ষা যদি কোন ডিফল্ট থাকবে.
@@ -3959,6 +4046,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,নতুন গ্রাহক রাজস্ব
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,ভ্রমণ খরচ
 DocType: Maintenance Visit,Breakdown,ভাঙ্গন
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},কাস্টম ক্ষেত্র যোগ করুন doctype {0} মধ্যে সাবস্ক্রিপশন
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,অ্যাকাউন্ট: {0} একক সঙ্গে: {1} নির্বাচন করা যাবে না
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",সর্বশেষ মূল্যনির্ধারণ হার / মূল্য তালিকা হার / কাঁচামালের সর্বশেষ ক্রয়ের হারের ভিত্তিতে স্বয়ংক্রিয়ভাবে নির্ধারিত BOM- এর মূল্য নির্ধারনের মাধ্যমে।
 DocType: Bank Reconciliation Detail,Cheque Date,চেক তারিখ
@@ -3983,7 +4071,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),মোট বিলিং পরিমাণ (সময় লগসমূহ মাধ্যমে)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,সরবরাহকারী আইডি
 DocType: Payment Request,Payment Gateway Details,পেমেন্ট গেটওয়ে বিস্তারিত
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,পরিমাণ 0 তুলনায় বড় হওয়া উচিত
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,পরিমাণ 0 তুলনায় বড় হওয়া উচিত
 DocType: Journal Entry,Cash Entry,ক্যাশ এণ্ট্রি
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,শিশু নোড শুধুমাত্র &#39;গ্রুপ&#39; টাইপ নোড অধীনে তৈরি করা যেতে পারে
 DocType: Leave Application,Half Day Date,অর্ধদিবস তারিখ
@@ -4001,12 +4089,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,উল্লেখ্য: আইটেম {0} একাধিক বার প্রবেশ
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,সকল যোগাযোগ.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,কোম্পানি সমাহার
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,ব্যবহারকারী {0} অস্তিত্ব নেই
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,ব্যবহারকারী {0} অস্তিত্ব নেই
 DocType: Subscription,SUB-,সাব-
 DocType: Item Attribute Value,Abbreviation,সংক্ষেপ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,পেমেন্ট এণ্ট্রি আগে থেকেই আছে
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,"{0} সীমা অতিক্রম করে, যেহেতু authroized না"
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,বেতন টেমপ্লেট মাস্টার.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,রোগবিদ্যা
+DocType: Restaurant Order Entry,Restaurant Table,রেস্টুরেন্ট টেবিল
 DocType: Leave Type,Max Days Leave Allowed,সর্বাধিক দিন ছেড়ে প্রেজেন্টেশন
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,শপিং কার্ট জন্য সেট করের রুল
 DocType: Purchase Invoice,Taxes and Charges Added,কর ও চার্জ যোগ
@@ -4018,10 +4108,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,বিশালাকার বা গ্রাহকরা কোট.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ভূমিকা হিমায়িত শেয়ার সম্পাদনা করতে পারবেন
 ,Territory Target Variance Item Group-Wise,টেরিটরি উদ্দিষ্ট ভেদাংক আইটেমটি গ্রুপ-প্রজ্ঞাময়
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,সকল গ্রাহকের গ্রুপ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,সকল গ্রাহকের গ্রুপ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,সঞ্চিত মাসিক
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} বাধ্যতামূলক. হয়তো মুদ্রা বিনিময় রেকর্ড {1} {2} করার জন্য তৈরি করা হয় না.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,ট্যাক্স টেমপ্লেট বাধ্যতামূলক.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,ট্যাক্স টেমপ্লেট বাধ্যতামূলক.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,অ্যাকাউন্ট {0}: মূল অ্যাকাউন্ট {1} অস্তিত্ব নেই
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),মূল্যতালিকা হার (কোম্পানি একক)
 DocType: Products Settings,Products Settings,পণ্য সেটিংস
@@ -4047,12 +4137,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,আইটেম অনুযায়ী ট্যাক্স বিস্তারিত
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,ইনস্টিটিউট সমাহার
 ,Item-wise Price List Rate,আইটেম-জ্ঞানী মূল্য তালিকা হার
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,সরবরাহকারী উদ্ধৃতি
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,সরবরাহকারী উদ্ধৃতি
 DocType: Quotation,In Words will be visible once you save the Quotation.,আপনি উধৃতি সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},পরিমাণ ({0}) সারিতে ভগ্নাংশ হতে পারে না {1}
 DocType: Consultation,C-,সি
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},বারকোড {0} ইতিমধ্যে আইটেম ব্যবহৃত {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},বারকোড {0} ইতিমধ্যে আইটেম ব্যবহৃত {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,শিপিং খরচ যোগ করার জন্য বিধি.
 DocType: Item,Opening Stock,খোলা স্টক
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,গ্রাহক প্রয়োজন বোধ করা হয়
@@ -4070,9 +4160,8 @@
 DocType: Customer,From Lead,লিড
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,আদেশ উৎপাদনের জন্য মুক্তি.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,ফিস্ক্যাল বছর নির্বাচন ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,পিওএস প্রোফাইল পিওএস এন্ট্রি করতে প্রয়োজন
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,পিওএস প্রোফাইল পিওএস এন্ট্রি করতে প্রয়োজন
 DocType: Program Enrollment Tool,Enroll Students,শিক্ষার্থীরা তালিকাভুক্ত
-DocType: Hub Settings,Name Token,নাম টোকেন
 DocType: Lab Test,Approved Date,অনুমোদিত তারিখ
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,স্ট্যান্ডার্ড বিক্রি
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,অন্তত একটি গুদাম বাধ্যতামূলক
@@ -4090,7 +4179,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,মানব সম্পদ
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,পেমেন্ট পুনর্মিলন পরিশোধের
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,ট্যাক্স সম্পদ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},উত্পাদনের অর্ডার হয়েছে {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},উত্পাদনের অর্ডার হয়েছে {0}
 DocType: BOM Item,BOM No,BOM কোন
 DocType: Instructor,INS/,আইএনএস /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,জার্নাল এন্ট্রি {0} {1} বা ইতিমধ্যে অন্যান্য ভাউচার বিরুদ্ধে মিলেছে অ্যাকাউন্ট নেই
@@ -4110,7 +4199,7 @@
 DocType: Currency Exchange,To Currency,মুদ্রা
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,নিম্নলিখিত ব্যবহারকারীদের ব্লক দিনের জন্য চলে যায় অ্যাপ্লিকেশন অনুমোদন করার অনুমতি দিন.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,ব্যয় দাবি প্রকারভেদ.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},তার {1} আইটেমের জন্য হার বিক্রী {0} চেয়ে কম। বিক্রী হার কত হওয়া উচিত অন্তত {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},তার {1} আইটেমের জন্য হার বিক্রী {0} চেয়ে কম। বিক্রী হার কত হওয়া উচিত অন্তত {2}
 DocType: Item,Taxes,কর
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,প্রদত্ত এবং বিতরিত হয় নি
 DocType: Project,Default Cost Center,ডিফল্ট খরচের কেন্দ্র
@@ -4124,15 +4213,15 @@
 DocType: Employee Loan,Fully Disbursed,সম্পূর্ণ বিতরণ
 DocType: Maintenance Visit,Customer Feedback,গ্রাহকের প্রতিক্রিয়া
 DocType: Account,Expense,ব্যয়
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,স্কোর সর্বোচ্চ স্কোর চেয়ে অনেক বেশী হতে পারে না
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,স্কোর সর্বোচ্চ স্কোর চেয়ে অনেক বেশী হতে পারে না
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,গ্রাহক এবং সরবরাহকারী
 DocType: Item Attribute,From Range,পরিসর থেকে
 DocType: BOM,Set rate of sub-assembly item based on BOM,বোমের উপর ভিত্তি করে উপ-সমাবেশের আইটেম সেট করুন
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},সূত্র বা অবস্থায় বাক্যগঠন ত্রুটি: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},সূত্র বা অবস্থায় বাক্যগঠন ত্রুটি: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,দৈনন্দিন কাজের সংক্ষিপ্ত সেটিংস কোম্পানি
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,এটা যেহেতু উপেক্ষা আইটেম {0} একটি স্টক আইটেমটি নয়
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,আরও প্রক্রিয়াকরণের জন্য এই উৎপাদন অর্ডার জমা.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,আরও প্রক্রিয়াকরণের জন্য এই উৎপাদন অর্ডার জমা.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","একটি নির্দিষ্ট লেনদেনে প্রাইসিং নিয়ম প্রযোজ্য না করার জন্য, সমস্ত প্রযোজ্য দামে নিষ্ক্রিয় করা উচিত."
 DocType: Assessment Group,Parent Assessment Group,পেরেন্ট অ্যাসেসমেন্ট গ্রুপ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,জবস
@@ -4149,12 +4238,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',দয়া করে কোম্পানির ফাঁকা ফিল্টার সেট করুন যদি একদল &#39;কোম্পানি&#39; হল
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,পোস্টিং তারিখ ভবিষ্যতে তারিখে হতে পারে না
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},সারি # {0}: সিরিয়াল কোন {1} সঙ্গে মেলে না {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,পুনরাবৃত্তির জন্য প্রস্তুত
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,নৈমিত্তিক ছুটি
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,ল্যাব টেস্ট UOM
 DocType: Batch,Batch ID,ব্যাচ আইডি
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},উল্লেখ্য: {0}
 ,Delivery Note Trends,হুণ্ডি প্রবণতা
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,এই সপ্তাহের সংক্ষিপ্ত
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,এই সপ্তাহের সংক্ষিপ্ত
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,স্টক Qty ইন
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,অ্যাকাউন্ট: {0} শুধুমাত্র স্টক লেনদেনের মাধ্যমে আপডেট করা যাবে
 DocType: Student Group Creation Tool,Get Courses,কোর্স করুন
@@ -4168,7 +4258,6 @@
 DocType: Purchase Order,To Bill,বিল
 DocType: Material Request,% Ordered,% আদেশ
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","কোর্সের ভিত্তিক স্টুডেন্ট গ্রুপের জন্য, কোর্স প্রোগ্রাম তালিকাভুক্তি মধ্যে নাম নথিভুক্ত কোর্স থেকে শিক্ষার্থীর জন্য যাচাই করা হবে না।"
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","লিখুন ইমেইল ঠিকানা কমা দ্বারা পৃথক, চালান নির্দিষ্ট তারিখে স্বয়ংক্রিয়ভাবে পাঠানো হবে"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,ফুরণ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,গড়. রাজধানীতে হার
 DocType: Task,Actual Time (in Hours),(ঘন্টায়) প্রকৃত সময়
@@ -4182,7 +4271,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,{0} আইটেম সিরিয়াল আমরা জন্য সেটআপ নয়. কলাম ফাঁকা রাখা আবশ্যক
 DocType: Accounts Settings,Accounts Settings,সেটিংস অ্যাকাউন্ট
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,অনুমোদন করা
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,কোন ফলাফল জমা নেই
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,কোন ফলাফল জমা নেই
 DocType: Customer,Sales Partner and Commission,বিক্রয় অংশীদার এবং কমিশন
 DocType: Employee Loan,Rate of Interest (%) / Year,ইন্টারেস্ট (%) / বর্ষসেরা হার
 ,Project Quantity,প্রকল্প পরিমাণ
@@ -4194,55 +4283,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,কালো
 DocType: BOM Explosion Item,BOM Explosion Item,BOM বিস্ফোরণ আইটেম
 DocType: Account,Auditor,নিরীক্ষক
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} উত্পাদিত আইটেম
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} উত্পাদিত আইটেম
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,আরও জানুন
 DocType: Cheque Print Template,Distance from top edge,উপরের প্রান্ত থেকে দূরত্ব
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,মূল্য তালিকা {0} অক্ষম করা থাকে বা কোন অস্তিত্ব নেই
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,মূল্য তালিকা {0} অক্ষম করা থাকে বা কোন অস্তিত্ব নেই
 DocType: Purchase Invoice,Return,প্রত্যাবর্তন
 DocType: Production Order Operation,Production Order Operation,উৎপাদন অর্ডার অপারেশন
 DocType: Pricing Rule,Disable,অক্ষম
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,পেমেন্ট মোড একটি পেমেন্ট করতে প্রয়োজন বোধ করা হয়
 DocType: Project Task,Pending Review,মুলতুবি পর্যালোচনা
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,নিয়োগ এবং পরামর্শ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ব্যাচ মধ্যে নাম নথিভুক্ত করা হয় না {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ব্যাচ মধ্যে নাম নথিভুক্ত করা হয় না {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","অ্যাসেট {0}, বাতিল করা যাবে না এটা আগে থেকেই {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),(ব্যয় দাবি মাধ্যমে) মোট ব্যয় দাবি
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,মার্ক অনুপস্থিত
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},সারি {0}: BOM # মুদ্রা {1} নির্বাচিত মুদ্রার সমান হতে হবে {2}
 DocType: Journal Entry Account,Exchange Rate,বিনিময় হার
 DocType: Patient,Additional information regarding the patient,রোগীর সম্পর্কে অতিরিক্ত তথ্য
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,বিক্রয় আদেশ {0} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,বিক্রয় আদেশ {0} দাখিল করা হয় না
 DocType: Homepage,Tag Line,ট্যাগ লাইন
 DocType: Fee Component,Fee Component,ফি কম্পোনেন্ট
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,দ্রুতগামী ব্যবস্থাপনা
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,থেকে আইটেম যোগ করুন
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,দ্রুতগামী ব্যবস্থাপনা
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,থেকে আইটেম যোগ করুন
 DocType: Cheque Print Template,Regular,নিয়মিত
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,সব অ্যাসেসমেন্ট নির্ণায়ক মোট গুরুত্ব 100% হতে হবে
-DocType: BOM,Last Purchase Rate,শেষ কেনার হার
+DocType: Purchase Order Item,Last Purchase Rate,শেষ কেনার হার
 DocType: Account,Asset,সম্পদ
 DocType: Project Task,Task ID,টাস্ক আইডি
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,আইটেম জন্য উপস্থিত হতে পারে না শেয়ার {0} থেকে ভিন্নতা আছে
 DocType: Lab Test,Mobile,মোবাইল
 ,Sales Person-wise Transaction Summary,সেলস পারসন অনুসার লেনদেন সংক্ষিপ্ত
 DocType: Training Event,Contact Number,যোগাযোগ নম্বর
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,ওয়ারহাউস {0} অস্তিত্ব নেই
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext হাব জন্য নিবন্ধন
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,ওয়ারহাউস {0} অস্তিত্ব নেই
 DocType: Monthly Distribution,Monthly Distribution Percentages,মাসিক বন্টন শতকরা
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,নির্বাচিত আইটেমের ব্যাচ থাকতে পারে না
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","মূল্যনির্ধারণ হার আইটেম {0}, যার জন্য অ্যাকাউন্টিং এন্ট্রি করতে প্রয়োজন বোধ করা হয় জন্য পাওয়া যায়নি {1} {2}. আইটেম একটি নমুনা আইটেম হিসাবে লেনদেন করা হলে {1}, যে {1} আইটেম টেবিলে উল্লেখ করুন. অন্যথায়, দয়া করে আইটেম রেকর্ডে আইটেমটি বা উল্লেখ মূল্যনির্ধারণ হার জন্য একটি ইনকামিং স্টক লেনদেনের তৈরি করুন এবং তারপর / সাবমিট চেষ্টা এই এন্ট্রি বাতিলের"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,উপকরণ% এই হুণ্ডি বিরুদ্ধে বিতরণ
+DocType: Training Event,Has Certificate,শংসাপত্র আছে
 DocType: Project,Customer Details,কাস্টমার বিস্তারিত
 DocType: Employee,Reports to,রিপোর্ট হতে
 ,Unpaid Expense Claim,অবৈতনিক ব্যয় দাবি
 DocType: Payment Entry,Paid Amount,দেওয়া পরিমাণ
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,বিক্রয় চক্র এক্সপ্লোর পরিচালনা করুন
 DocType: Assessment Plan,Supervisor,কর্মকর্তা
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,অনলাইন
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,অনলাইন
 ,Available Stock for Packing Items,প্যাকিং আইটেম জন্য উপলব্ধ স্টক
 DocType: Item Variant,Item Variant,আইটেম ভেরিয়েন্ট
 DocType: Assessment Result Tool,Assessment Result Tool,অ্যাসেসমেন্ট রেজাল্ট টুল
 DocType: BOM Scrap Item,BOM Scrap Item,BOM স্ক্র্যাপ আইটেম
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,জমা করা অফার মোছা যাবে না
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,জমা করা অফার মোছা যাবে না
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ইতিমধ্যে ডেবিট অ্যাকাউন্ট ব্যালেন্স, আপনি &#39;ক্রেডিট&#39; হিসেবে &#39;ব্যালেন্স করতে হবে&#39; সেট করার অনুমতি দেওয়া হয় না"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,গুনমান ব্যবস্থাপনা
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,আইটেম {0} অক্ষম করা হয়েছে
@@ -4262,7 +4350,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},সারি # {0}: সারিতে সঙ্গে উপস্থাপনার দ্বন্দ্ব {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,জিরো মূল্যনির্ধারণ রেট অনুমতি দিন
 DocType: Training Event Employee,Invited,আমন্ত্রিত
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,একাধিক সক্রিয় বেতন কাঠামো দেওয়া তারিখগুলি জন্য কর্মচারী {0} পাওয়া যায়নি
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,একাধিক সক্রিয় বেতন কাঠামো দেওয়া তারিখগুলি জন্য কর্মচারী {0} পাওয়া যায়নি
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,সেটআপ গেটওয়ে অ্যাকাউন্ট.
 DocType: Employee,Employment Type,কর্মসংস্থান প্রকার
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,নির্দিষ্ট পরিমান সম্পত্তি
@@ -4274,7 +4362,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,স্টুডেন্ট ইমেইল আইডি
 DocType: Employee,Notice (days),নোটিশ (দিন)
 DocType: Tax Rule,Sales Tax Template,সেলস ট্যাক্স টেমপ্লেট
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,চালান সংরক্ষণ আইটেম নির্বাচন করুন
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,চালান সংরক্ষণ আইটেম নির্বাচন করুন
 DocType: Employee,Encashment Date,নগদীকরণ তারিখ
 DocType: Training Event,Internet,ইন্টারনেটের
 DocType: Special Test Template,Special Test Template,বিশেষ টেস্ট টেমপ্লেট
@@ -4283,7 +4371,7 @@
 DocType: Production Order,Planned Operating Cost,পরিকল্পনা অপারেটিং খরচ
 DocType: Academic Term,Term Start Date,টার্ম শুরুর তারিখ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,OPP কাউন্ট
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},এটি সংযুক্ত {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},এটি সংযুক্ত {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,জেনারেল লেজার অনুযায়ী ব্যাংক ব্যালেন্সের
 DocType: Job Applicant,Applicant Name,আবেদনকারীর নাম
 DocType: Authorization Rule,Customer / Item Name,গ্রাহক / আইটেম নাম
@@ -4303,7 +4391,7 @@
 DocType: Guardian,Guardian Of ,অভিভাবক
 DocType: Grading Scale Interval,Threshold,গোবরাট
 DocType: BOM Update Tool,Current BOM,বর্তমান BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,সিরিয়াল কোন যোগ
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,সিরিয়াল কোন যোগ
 DocType: Production Order Item,Available Qty at Source Warehouse,উত্স ওয়্যারহাউস এ উপলব্ধ করে চলছে
 apps/erpnext/erpnext/config/support.py +22,Warranty,পাটা
 DocType: Purchase Invoice,Debit Note Issued,ডেবিট নোট ইস্যু
@@ -4326,10 +4414,9 @@
 DocType: Account,Receivable,প্রাপ্য
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,সারি # {0}: ক্রয় আদেশ ইতিমধ্যেই বিদ্যমান হিসাবে সরবরাহকারী পরিবর্তন করার অনুমতি নেই
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,সেট ক্রেডিট সীমা অতিক্রম লেনদেন জমা করার অনুমতি দেওয়া হয় যে ভূমিকা.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,উত্পাদনপ্রণালী চলছে নির্বাচন
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","মাস্টার ডেটা সিঙ্ক করা, এটা কিছু সময় নিতে পারে"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,উত্পাদনপ্রণালী চলছে নির্বাচন
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","মাস্টার ডেটা সিঙ্ক করা, এটা কিছু সময় নিতে পারে"
 DocType: Item,Material Issue,উপাদান ইস্যু
-DocType: Hub Settings,Seller Description,বিক্রেতা বিবরণ
 DocType: Employee Education,Qualification,যোগ্যতা
 DocType: Item Price,Item Price,আইটেমের মূল্য
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,সাবান ও ডিটারজেন্ট
@@ -4337,7 +4424,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,সময় সময় তার চেয়ে অনেক বেশী হতে পারে না.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,মোশন পিকচার ও ভিডিও
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,আদেশ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,জীবনবৃত্তান্ত
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,জীবনবৃত্তান্ত
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,যদি সক্ষম করা থাকে তবে সিস্টেমটি টেমপ্লেটের ভ্যারিয়েন্টের ক্ষেত্রগুলি আপডেট করবে না কিন্তু নতুন বৈকল্পিক রূপে নীচের উল্লিখিত ক্ষেত্রগুলির ডেটা অনুলিপি করবে
 DocType: Salary Detail,Component,উপাদান
 DocType: Assessment Criteria,Assessment Criteria Group,অ্যাসেসমেন্ট নির্ণায়ক গ্রুপ
 DocType: Healthcare Settings,Patient Name By,রোগীর নাম দ্বারা
@@ -4347,7 +4435,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,ভূমিকা অনুমোদন বা ব্যবহারকারী অনুমদন লিখুন দয়া করে
 DocType: Journal Entry,Write Off Entry,এন্ট্রি বন্ধ লিখুন
 DocType: BOM,Rate Of Materials Based On,হার উপকরণ ভিত্তি করে
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
+DocType: Item Variant Settings,Do not Update Variants,বৈকল্পিক আপডেট করবেন না
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,সাপোর্ট Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,সব অচিহ্নিত
 DocType: POS Profile,Terms and Conditions,শর্তাবলী
@@ -4356,7 +4444,7 @@
 DocType: Leave Block List,Applies to Company,প্রতিষ্ঠানের ক্ষেত্রে প্রযোজ্য
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,জমা স্টক এণ্ট্রি {0} থাকার কারণে বাতিল করতে পারেন না
 DocType: Employee Loan,Disbursement Date,ব্যয়ন তারিখ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;প্রাপক&#39; নির্দিষ্ট না
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;প্রাপক&#39; নির্দিষ্ট না
 DocType: BOM Update Tool,Update latest price in all BOMs,সমস্ত BOMs মধ্যে সর্বশেষ মূল্য আপডেট করুন
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,মেডিকেল সংরক্ষণ
 DocType: Vehicle,Vehicle,বাহন
@@ -4371,14 +4459,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,OPP / লিড%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,অ্যাসেট Depreciations এবং উদ্বৃত্ত
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},পরিমাণ {0} {1} থেকে স্থানান্তরিত {2} থেকে {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},পরিমাণ {0} {1} থেকে স্থানান্তরিত {2} থেকে {3}
 DocType: Sales Invoice,Get Advances Received,উন্নতির গৃহীত করুন
 DocType: Email Digest,Add/Remove Recipients,প্রাপক Add / Remove
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},লেনদেন বন্ধ উত্পাদনের বিরুদ্ধে অনুমতি না করার {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",", ডিফল্ট হিসাবে চলতি অর্থবছরেই সেট করতে &#39;ডিফল্ট হিসাবে সেট করুন&#39; ক্লিক করুন"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,যোগদান
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,যোগদান
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,ঘাটতি Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,আইটেম বৈকল্পিক {0} একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,আইটেম বৈকল্পিক {0} একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
 DocType: Employee Loan,Repay from Salary,বেতন থেকে শুধা
 DocType: Leave Application,LAP/,ভাঁজ/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},বিরুদ্ধে পেমেন্ট অনুরোধ {0} {1} পরিমাণ জন্য {2}
@@ -4391,7 +4479,7 @@
 DocType: Sales Invoice Item,Sales Order Item,সেলস অর্ডার আইটেমটি
 DocType: Salary Slip,Payment Days,পেমেন্ট দিন
 DocType: Patient,Dormant,সুপ্ত
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,সন্তানের নোড সঙ্গে গুদাম খাতা থেকে রূপান্তর করা যাবে না
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,সন্তানের নোড সঙ্গে গুদাম খাতা থেকে রূপান্তর করা যাবে না
 DocType: BOM,Manage cost of operations,অপারেশনের খরচ পরিচালনা
 DocType: Accounts Settings,Stale Days,স্টাইল দিন
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","চেক লেনদেনের কোনো &quot;জমা&quot; করা হয়, তখন একটি ইমেল পপ-আপ স্বয়ংক্রিয়ভাবে একটি সংযুক্তি হিসাবে লেনদেনের সঙ্গে, যে লেনদেনে যুক্ত &quot;যোগাযোগ&quot; একটি ইমেল পাঠাতে খোলা. ব্যবহারকারী may অথবা ইমেইল পাঠাতে পারে."
@@ -4405,10 +4493,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,সিরিয়াল কোন {0} ইতিমধ্যে গৃহীত হয়েছে
 ,Requested Items To Be Transferred,অনুরোধ করা চলছে স্থানান্তর করা
 DocType: Expense Claim,Vehicle Log,যানবাহন লগ
-DocType: Purchase Invoice,Recurring Id,পুনরাবৃত্ত আইডি
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),একটি জ্বরের উপস্থিতি (তাপমাত্রা&gt; 38.5 ° সে / 101.3 ° ফা বা স্থায়ী তাপ&gt; 38 ° সে / 100.4 ° ফা)
 DocType: Customer,Sales Team Details,সেলস টিম বিবরণ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,স্থায়ীভাবে মুছে ফেলতে চান?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,স্থায়ীভাবে মুছে ফেলতে চান?
 DocType: Expense Claim,Total Claimed Amount,দাবি মোট পরিমাণ
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,বিক্রি জন্য সম্ভাব্য সুযোগ.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},অকার্যকর {0}
@@ -4418,7 +4505,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ডিপার্টমেন্ট স্টোর
 ,Item Delivery Date,আইটেম ডেলিভারি তারিখ
 DocType: Warehouse,PIN,পিন
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,সেটআপ ERPNext আপনার স্কুল
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,সেটআপ ERPNext আপনার স্কুল
 DocType: Sales Invoice,Base Change Amount (Company Currency),বেস পরিবর্তন পরিমাণ (কোম্পানি মুদ্রা)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,নিম্নলিখিত গুদাম জন্য কোন হিসাব এন্ট্রি
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,প্রথম নথি সংরক্ষণ করুন.
@@ -4430,13 +4517,12 @@
 DocType: Task,Is Milestone,মাইলফলক
 DocType: Daily Work Summary,Email Sent To,ইমেইল পাঠানো
 DocType: Budget,Warn,সতর্ক করো
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,আপনি নিশ্চিত নন যে আপনি নিবন্ধন করতে চান?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","অন্য কোন মন্তব্য, রেকর্ড মধ্যে যেতে হবে যে উল্লেখযোগ্য প্রচেষ্টা."
 DocType: BOM,Manufacturing User,উৎপাদন ব্যবহারকারী
 DocType: Purchase Invoice,Raw Materials Supplied,কাঁচামালের সরবরাহ
-DocType: Purchase Invoice,Recurring Print Format,পুনরাবৃত্ত মুদ্রণ বিন্যাস
 DocType: C-Form,Series,সিরিজ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},মূল্য তালিকা মুদ্রা {0} {1} বা {2} হতে হবে
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,পণ্য যোগ করুন
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},মূল্য তালিকা মুদ্রা {0} {1} বা {2} হতে হবে
 DocType: Appraisal,Appraisal Template,মূল্যায়ন টেমপ্লেট
 DocType: Item Group,Item Classification,আইটেম সাইট
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,ব্যবসা উন্নয়ন ব্যবস্থাপক
@@ -4450,7 +4536,7 @@
 DocType: Item Attribute Value,Attribute Value,মূল্য গুন
 ,Itemwise Recommended Reorder Level,Itemwise রেকর্ডার শ্রেনী প্রস্তাবিত
 DocType: Salary Detail,Salary Detail,বেতন বিস্তারিত
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,প্রথম {0} দয়া করে নির্বাচন করুন
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,প্রথম {0} দয়া করে নির্বাচন করুন
 DocType: Appointment Type,Physician,চিকিত্সক
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,আইটেম এর ব্যাচ {0} {1} মেয়াদ শেষ হয়ে গেছে.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,আলোচনা
@@ -4461,7 +4547,7 @@
 DocType: Salary Detail,Default Amount,ডিফল্ট পরিমাণ
 DocType: Lab Test Template,Descriptive,বর্ণনামূলক
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,ওয়্যারহাউস সিস্টেম অন্তর্ভুক্ত না
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,এই মাস এর সংক্ষিপ্ত
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,এই মাস এর সংক্ষিপ্ত
 DocType: Quality Inspection Reading,Quality Inspection Reading,গুণ পরিদর্শন ফাইন্যান্স
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`ফ্রিজ স্টক পুরাতন Than`% D দিন চেয়ে কম হওয়া দরকার.
 DocType: Tax Rule,Purchase Tax Template,ট্যাক্স টেমপ্লেট ক্রয়
@@ -4484,12 +4570,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,প্রশিক্ষণ ঘটনাবলী / ফলাফল
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,যেমন উপর অবচয় সঞ্চিত
 DocType: Sales Invoice,C-Form Applicable,সি-ফরম প্রযোজ্য
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},অপারেশন টাইম অপারেশন জন্য তার চেয়ে অনেক বেশী 0 হতে হবে {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},অপারেশন টাইম অপারেশন জন্য তার চেয়ে অনেক বেশী 0 হতে হবে {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,ওয়ারহাউস বাধ্যতামূলক
 DocType: Supplier,Address and Contacts,ঠিকানা এবং পরিচিতি
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM রূপান্তর বিস্তারিত
 DocType: Program,Program Abbreviation,প্রোগ্রাম সমাহার
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,উৎপাদন অর্ডার একটি আইটেম টেমপ্লেট বিরুদ্ধে উত্থাপিত হতে পারবেন না
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,উৎপাদন অর্ডার একটি আইটেম টেমপ্লেট বিরুদ্ধে উত্থাপিত হতে পারবেন না
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,চার্জ প্রতিটি আইটেমের বিরুদ্ধে কেনার রসিদ মধ্যে আপডেট করা হয়
 DocType: Warranty Claim,Resolved By,দ্বারা এই সমস্যাগুলি সমাধান
 DocType: Bank Guarantee,Start Date,শুরুর তারিখ
@@ -4515,26 +4601,27 @@
 DocType: Employee,Educational Qualification,শিক্ষাগত যোগ্যতা
 DocType: Workstation,Operating Costs,অপারেটিং খরচ
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,অ্যাকশন যদি সঞ্চিত মাসিক বাজেট অতিক্রম করেছে
-DocType: Purchase Invoice,Submit on creation,জমা দিন সৃষ্টির উপর
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},মুদ্রা {0} হবে জন্য {1}
+DocType: Subscription,Submit on creation,জমা দিন সৃষ্টির উপর
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},মুদ্রা {0} হবে জন্য {1}
 DocType: Asset,Disposal Date,নিষ্পত্তি তারিখ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ইমেল দেওয়া ঘন্টা এ কোম্পানির সব সক্রিয় এমপ্লয়িজ পাঠানো হবে, যদি তারা ছুটির দিন না. প্রতিক্রিয়া সংক্ষিপ্তসার মধ্যরাতে পাঠানো হবে."
 DocType: Employee Leave Approver,Employee Leave Approver,কর্মী ছুটি রাজসাক্ষী
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},সারি {0}: একটি রেকর্ডার এন্ট্রি ইতিমধ্যে এই গুদাম জন্য বিদ্যমান {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","উদ্ধৃতি দেয়া হয়েছে, কারণ যত হারিয়ে ডিক্লেয়ার করতে পারেন না."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,প্রশিক্ষণ প্রতিক্রিয়া
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},সারি {0}: একটি রেকর্ডার এন্ট্রি ইতিমধ্যে এই গুদাম জন্য বিদ্যমান {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","উদ্ধৃতি দেয়া হয়েছে, কারণ যত হারিয়ে ডিক্লেয়ার করতে পারেন না."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,প্রশিক্ষণ প্রতিক্রিয়া
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,অর্ডার {0} দাখিল করতে হবে উৎপাদন
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,সরবরাহকারী স্কোরকার্ড সার্টিফিকেট
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},আইটেম জন্য আরম্ভের তারিখ ও শেষ তারিখ নির্বাচন করুন {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},কোর্সের সারিতে বাধ্যতামূলক {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,তারিখ থেকে তারিখের আগে হতে পারে না
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,/ সম্পাদনা বর্ণনা করো
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,/ সম্পাদনা বর্ণনা করো
 DocType: Batch,Parent Batch,মূল ব্যাচ
 DocType: Cheque Print Template,Cheque Print Template,চেক প্রিন্ট টেমপ্লেট
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,খরচ কেন্দ্র এর চার্ট
 DocType: Lab Test Template,Sample Collection,নমুনা সংগ্রহ
 ,Requested Items To Be Ordered,অনুরোধ করা চলছে আদেশ করা
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,আমার আদেশ
 DocType: Price List,Price List Name,মূল্যতালিকা নাম
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},জন্য দৈনন্দিন কাজ সারাংশ {0}
 DocType: Employee Loan,Totals,সমগ্র
@@ -4553,12 +4640,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1} প্রয়োজন {2} উপর {3} {4} {5} এই লেনদেন সম্পন্ন করার জন্য ইউনিট.
 DocType: Fee Schedule,Student Category,ছাত্র শ্রেণী
 DocType: Announcement,Student,ছাত্র
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,সংগঠনের ইউনিটের (ডিপার্টমেন্ট) মাস্টার.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,সংগঠনের ইউনিটের (ডিপার্টমেন্ট) মাস্টার.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,রুম এ যান
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,পাঠানোর আগে বার্তা লিখতে
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,সরবরাহকারী ক্ষেত্রে সদৃশ
 DocType: Email Digest,Pending Quotations,উদ্ধৃতি অপেক্ষারত
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,পয়েন্ট অফ বিক্রয় প্রোফাইল
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,পয়েন্ট অফ বিক্রয় প্রোফাইল
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,ল্যাব টেস্ট কনফিগারেশন
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,জামানতবিহীন ঋণ
 DocType: Cost Center,Cost Center Name,খরচ কেন্দ্র নাম
@@ -4568,6 +4655,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,মোট পরিশোধিত মাসিক
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 অক্ষরের বেশী বেশী বার্তা একাধিক বার্তা বিভক্ত করা হবে
 DocType: Purchase Receipt Item,Received and Accepted,গৃহীত হয়েছে এবং গৃহীত
+DocType: Hub Settings,Company and Seller Profile,কোম্পানী এবং বিক্রেতা প্রোফাইল
 ,GST Itemised Sales Register,GST আইটেমাইজড সেলস নিবন্ধন
 ,Serial No Service Contract Expiry,সিরিয়াল কোন সার্ভিস চুক্তি মেয়াদ উত্তীর্ন
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,আপনি ক্রেডিট এবং একই সময়ে একই অ্যাকাউন্ট ডেবিট পারবেন না
@@ -4577,10 +4665,11 @@
 DocType: Item,Variant Based On,ভেরিয়েন্ট উপর ভিত্তি করে
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},100% হওয়া উচিত নির্ধারিত মোট গুরুত্ব. এটা হল {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,আপনার সরবরাহকারীদের
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,দয়া করে সংশোধন করুন
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,বিক্রয় আদেশ তৈরি করা হয় যেমন বিচ্ছিন্ন সেট করা যায় না.
 DocType: Request for Quotation Item,Supplier Part No,সরবরাহকারী পার্ট কোন
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',কেটে যাবে না যখন আরো মূল্যনির্ধারণ &#39;বা&#39; Vaulation এবং মোট &#39;জন্য নয়
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,থেকে পেয়েছি
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,থেকে পেয়েছি
 DocType: Lead,Converted,ধর্মান্তরিত
 DocType: Item,Has Serial No,সিরিয়াল কোন আছে
 DocType: Employee,Date of Issue,প্রদান এর তারিখ
@@ -4588,7 +4677,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","ক্রয় সেটিংস অনুযায়ী ক্রয় Reciept প্রয়োজনীয় == &#39;হ্যাঁ, তারপর ক্রয় চালান তৈরি করার জন্য, ব্যবহারকারী আইটেমের জন্য প্রথম ক্রয় রশিদ তৈরি করতে হবে যদি {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},সারি # {0}: আইটেমের জন্য সেট সরবরাহকারী {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,সারি {0}: ঘন্টা মান শূন্য থেকে বড় হওয়া উচিত.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,আইটেম {1} সংযুক্ত ওয়েবসাইট চিত্র {0} পাওয়া যাবে না
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,আইটেম {1} সংযুক্ত ওয়েবসাইট চিত্র {0} পাওয়া যাবে না
 DocType: Issue,Content Type,কোন ধরনের
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,কম্পিউটার
 DocType: Item,List this Item in multiple groups on the website.,ওয়েবসাইটে একাধিক গ্রুপ এই আইটেম তালিকা.
@@ -4599,14 +4688,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,অসমর্পিত এন্ট্রি পেতে
 DocType: Payment Reconciliation,From Invoice Date,চালান তারিখ থেকে
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,আপনার কাছে জমা দেওয়ার অনুমতি নেই
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,বিলিং মুদ্রা পারেন ডিফল্ট comapany মুদ্রা বা পক্ষের অ্যাকাউন্টে মুদ্রার সমান হতে হবে
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,বিলিং মুদ্রা পারেন ডিফল্ট comapany মুদ্রা বা পক্ষের অ্যাকাউন্টে মুদ্রার সমান হতে হবে
 DocType: Healthcare Settings,Laboratory Settings,ল্যাবরেটরি সেটিংস
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,নগদীকরণ ত্যাগ
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,এটার কাজ কি?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,গুদাম থেকে
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,সকল স্টুডেন্ট অ্যাডমিশন
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,এটার কাজ কি?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,গুদাম থেকে
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,সকল স্টুডেন্ট অ্যাডমিশন
 ,Average Commission Rate,গড় কমিশন হার
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,'সিরিয়াল নং আছে' কখনই নন-ষ্টক আইটেমের ক্ষেত্রে 'হ্যাঁ' হতে পারবে না
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,'সিরিয়াল নং আছে' কখনই নন-ষ্টক আইটেমের ক্ষেত্রে 'হ্যাঁ' হতে পারবে না
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,স্থিতি নির্বাচন করুন
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,এ্যাটেনডেন্স ভবিষ্যতে তারিখগুলি জন্য চিহ্নিত করা যাবে না
 DocType: Pricing Rule,Pricing Rule Help,প্রাইসিং শাসন সাহায্য
@@ -4624,40 +4713,40 @@
 DocType: Item,Customer Code,গ্রাহক কোড
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},জন্য জন্মদিনের স্মারক {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,শেষ আদেশ থেকে দিনের
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,অ্যাকাউন্ট ডেবিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,অ্যাকাউন্ট ডেবিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
 DocType: Buying Settings,Naming Series,নামকরণ সিরিজ
 DocType: Leave Block List,Leave Block List Name,ব্লক তালিকা নাম
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,বীমা তারিখ শুরু তুলনায় বীমা শেষ তারিখ কম হওয়া উচিত
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,দয়া করে স্কুলে শিক্ষক নামকরণ পদ্ধতি সেটআপ করুন&gt; স্কুল সেটিংস
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,স্টক সম্পদ
 DocType: Timesheet,Production Detail,উত্পাদনের বিস্তারিত
+DocType: Restaurant,Active Menu,সক্রিয় মেনু
 DocType: Target Detail,Target Qty,উদ্দিষ্ট Qty
 DocType: Shopping Cart Settings,Checkout Settings,চেকআউট সেটিং
 DocType: Attendance,Present,বর্তমান
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,হুণ্ডি {0} সম্পন্ন করা সম্ভব নয়
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,হুণ্ডি {0} সম্পন্ন করা সম্ভব নয়
 DocType: Notification Control,Sales Invoice Message,বিক্রয় চালান পাঠান
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,অ্যাকাউন্ট {0} সমাপ্তি ধরনের দায় / ইক্যুইটি হওয়া আবশ্যক
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},কর্মচারীর বেতন স্লিপ {0} ইতিমধ্যে সময় শীট জন্য নির্মিত {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},কর্মচারীর বেতন স্লিপ {0} ইতিমধ্যে সময় শীট জন্য নির্মিত {1}
 DocType: Vehicle Log,Odometer,দূরত্বমাপণী
 DocType: Sales Order Item,Ordered Qty,আদেশ Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,আইটেম {0} নিষ্ক্রিয় করা হয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,আইটেম {0} নিষ্ক্রিয় করা হয়
 DocType: Stock Settings,Stock Frozen Upto,শেয়ার হিমায়িত পর্যন্ত
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM কোনো স্টক আইটেম নেই
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,প্রকল্পের কার্যকলাপ / টাস্ক.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM কোনো স্টক আইটেম নেই
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,প্রকল্পের কার্যকলাপ / টাস্ক.
 DocType: Vehicle Log,Refuelling Details,ফুয়েলিং বিস্তারিত
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,বেতন Slips নির্মাণ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","প্রযোজ্য হিসাবে নির্বাচিত করা হয় তাহলে কেনার, চেক করা আবশ্যক {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,বাট্টা কম 100 হতে হবে
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,সর্বশেষ ক্রয় হার পাওয়া যায়নি
 DocType: Purchase Invoice,Write Off Amount (Company Currency),পরিমাণ বন্ধ লিখুন (কোম্পানি একক)
 DocType: Sales Invoice Timesheet,Billing Hours,বিলিং ঘন্টা
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,জন্য {0} পাওয়া ডিফল্ট BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,সারি # {0}: পুনর্বিন্যাস পরিমাণ সেট করুন
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,জন্য {0} পাওয়া ডিফল্ট BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,সারি # {0}: পুনর্বিন্যাস পরিমাণ সেট করুন
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,তাদের এখানে যোগ করার জন্য আইটেম ট্যাপ
 DocType: Fees,Program Enrollment,প্রোগ্রাম তালিকাভুক্তি
 DocType: Landed Cost Voucher,Landed Cost Voucher,ল্যান্ড কস্ট ভাউচার
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},সেট করুন {0}
-DocType: Purchase Invoice,Repeat on Day of Month,মাস দিন পুনরাবৃত্তি
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} নিষ্ক্রিয় ছাত্র-ছাত্রী
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} নিষ্ক্রিয় ছাত্র-ছাত্রী
 DocType: Employee,Health Details,স্বাস্থ্য বিবরণ
 DocType: Offer Letter,Offer Letter Terms,পত্র ব্যাপারে প্রস্তাব
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,একটি পেমেন্ট অনুরোধ রেফারেন্স ডকুমেন্ট প্রয়োজন বোধ করা হয় তৈরি করতে
@@ -4665,7 +4754,6 @@
 DocType: Employee External Work History,Salary,বেতন
 DocType: Serial No,Delivery Document Type,ডেলিভারি ডকুমেন্ট টাইপ
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,উপরে নির্বাচিত মানদণ্ডের জন্য সব বেতন স্লিপ জমা
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} জিনিসসমূহ সিঙ্ক করা হয়েছে
 DocType: Sales Order,Partly Delivered,আংশিক বিতরণ
 DocType: Email Digest,Receivables,সম্ভাব্য
 DocType: Lead Source,Lead Source,সীসা উৎস
@@ -4686,19 +4774,19 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,বুড়ো বিন্যাস 2
 DocType: SG Creation Tool Course,Max Strength,সর্বোচ্চ শক্তি
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM প্রতিস্থাপিত
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,ডেলিভারি তারিখ উপর ভিত্তি করে আইটেম নির্বাচন করুন
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,ডেলিভারি তারিখ উপর ভিত্তি করে আইটেম নির্বাচন করুন
 ,Sales Analytics,বিক্রয় বিশ্লেষণ
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},উপলভ্য {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},উপলভ্য {0}
 ,Prospects Engaged But Not Converted,প্রসপেক্টস সম্পর্কে রয়েছেন কিন্তু রূপান্তর করা
 DocType: Manufacturing Settings,Manufacturing Settings,উৎপাদন সেটিংস
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,ইমেইল সেট আপ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 মোবাইল কোন
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,কোম্পানি মাস্টার ডিফল্ট মুদ্রা লিখুন দয়া করে
 DocType: Stock Entry Detail,Stock Entry Detail,শেয়ার এন্ট্রি বিস্তারিত
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,দৈনিক অনুস্মারক
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,দৈনিক অনুস্মারক
 DocType: Products Settings,Home Page is Products,হোম পেজ পণ্য
 ,Asset Depreciation Ledger,অ্যাসেট অবচয় লেজার
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},সাথে ট্যাক্স রুল দ্বন্দ্ব {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},সাথে ট্যাক্স রুল দ্বন্দ্ব {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,নতুন অ্যাকাউন্ট নাম
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,কাঁচামালের সরবরাহ খরচ
 DocType: Selling Settings,Settings for Selling Module,মডিউল বিক্রী জন্য সেটিংস
@@ -4712,8 +4800,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,আইটেম {0} একটি স্টক আইটেম হতে হবে
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,প্রগতি গুদাম ডিফল্ট কাজ
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,অ্যাকাউন্টিং লেনদেনের জন্য ডিফল্ট সেটিংস.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,মানব সম্পদে কর্মচারী নেমিং সিস্টেম&gt; এইচআর সেটিংস সেট আপ করুন
 DocType: Maintenance Visit,MV,এমভি
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,প্রত্যাশিত তারিখ উপাদান অনুরোধ তারিখের আগে হতে পারে না
+DocType: Restaurant,Default Tax Template,ডিফল্ট ট্যাক্স টেমপ্লেট
 DocType: Fees,Student Details,ছাত্রের বিবরণ
 DocType: Purchase Invoice Item,Stock Qty,স্টক Qty
 DocType: Employee Loan,Repayment Period in Months,মাস মধ্যে ঋণ পরিশোধের সময় সীমা
@@ -4731,8 +4820,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,আইটেমগুলিতে যান
 DocType: Sales Partner,Partner Type,সাথি ধরন
 DocType: Purchase Taxes and Charges,Actual,আসল
+DocType: Restaurant Menu,Restaurant Manager,রেস্টুরেন্ট ম্যানেজার
 DocType: Authorization Rule,Customerwise Discount,Customerwise ছাড়
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,কাজের জন্য শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,কাজের জন্য শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড.
 DocType: Purchase Invoice,Against Expense Account,ব্যয় অ্যাকাউন্টের বিরুদ্ধে
 DocType: Production Order,Production Order,উৎপাদন অর্ডার
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,ইনস্টলেশন উল্লেখ্য {0} ইতিমধ্যেই জমা দেওয়া হয়েছে
@@ -4740,7 +4830,6 @@
 DocType: Quotation Item,Against Docname,Docname বিরুদ্ধে
 DocType: SMS Center,All Employee (Active),সকল কর্মচারী (অনলাইনে)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,এখন দেখুন
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,চালান স্বয়ংক্রিয়ভাবে উত্পন্ন করা হবে যখন কাল নির্বাচন
 DocType: BOM,Raw Material Cost,কাঁচামাল খরচ
 DocType: Item Reorder,Re-Order Level,পুনর্বিন্যাস স্তর
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"আপনি প্রকাশনা আদেশ বাড়াতে বা বিশ্লেষণের জন্য কাঁচামাল ডাউনলোড করতে চান, যার জন্য জিনিস এবং পরিকল্পনা Qty লিখুন."
@@ -4753,23 +4842,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,প্রতিবেদন প্রকার বাধ্যতামূলক
 DocType: Item,Serial Number Series,ক্রমিক সংখ্যা সিরিজ
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},ওয়্যারহাউস সারিতে স্টক আইটেম {0} জন্য বাধ্যতামূলক {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,প্রোগ্রাম যোগ করুন
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,খুচরা পাইকারি
 DocType: Issue,First Responded On,প্রথম প্রতিক্রিয়া
 DocType: Website Item Group,Cross Listing of Item in multiple groups,একাধিক গ্রুপ আইটেমের ক্রস তালিকা
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},অর্থবছরের আরম্ভের তারিখ ও ফিস্ক্যাল বছর শেষ তারিখ ইতিমধ্যে অর্থবছরে নির্ধারণ করা হয় {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,পরিস্কারের তারিখ আপডেট
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,স্প্লিট ব্যাচ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,স্প্লিট ব্যাচ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,সফলভাবে মীমাংসা
 DocType: Request for Quotation Supplier,Download PDF,ডাউনলোড পিডিএফ
 DocType: Production Order,Planned End Date,পরিকল্পনা শেষ তারিখ
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,অনুগ্রহ করে সূচি তারিখ লিখুন
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,আইটেম কোথায় সংরক্ষণ করা হয়.
 DocType: Request for Quotation,Supplier Detail,সরবরাহকারী বিস্তারিত
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},সূত্র বা অবস্থায় ত্রুটি: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},সূত্র বা অবস্থায় ত্রুটি: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Invoiced পরিমাণ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,পরিমাপ ওজন 100% পর্যন্ত যোগ করা আবশ্যক
 DocType: Attendance,Attendance,উপস্থিতি
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,শেয়ার চলছে
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,শেয়ার চলছে
 DocType: BOM,Materials,উপকরণ
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","সংযত না হলে, তালিকা থেকে এটি প্রয়োগ করা হয়েছে যেখানে প্রতিটি ডিপার্টমেন্ট যোগ করা হবে."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,উত্স ও উদ্দিষ্ট গুদাম একই হতে পারে না
@@ -4787,6 +4876,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,একুন উপর
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},{0} অ্যাট্রিবিউট মূল্য পরিসীমা মধ্যে হতে হবে {1} থেকে {2} এর ইনক্রিমেন্ট নামের মধ্যে {3} আইটেম জন্য {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,{0} সারিতে উদ্দিষ্ট গুদাম উৎপাদন অর্ডার হিসাবে একই হতে হবে
+DocType: Restaurant Reservation,Waitlisted,অপেক্ষমান তালিকার
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,মুদ্রা একক কিছু অন্যান্য মুদ্রা ব্যবহার এন্ট্রি করার পর পরিবর্তন করা যাবে না
 DocType: Vehicle Service,Clutch Plate,ক্লাচ প্লেট
 DocType: Company,Round Off Account,অ্যাকাউন্ট বন্ধ বৃত্তাকার
@@ -4803,7 +4893,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,নতুন সেলস পারসন নাম
 DocType: Packing Slip,Gross Weight UOM,গ্রস ওজন UOM
 DocType: Delivery Note Item,Against Sales Invoice,বিক্রয় চালান বিরুদ্ধে
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,ধারাবাহিকভাবে আইটেমের জন্য সিরিয়াল নম্বর লিখুন দয়া করে
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,ধারাবাহিকভাবে আইটেমের জন্য সিরিয়াল নম্বর লিখুন দয়া করে
 DocType: Bin,Reserved Qty for Production,উত্পাদনের জন্য Qty সংরক্ষিত
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,চেকমুক্ত রেখে যান আপনি ব্যাচ বিবেচনা করার সময় অবশ্যই ভিত্তিক দলের উপার্জন করতে চাই না।
 DocType: Asset,Frequency of Depreciation (Months),অবচয় এর ফ্রিকোয়েন্সি (মাস)
@@ -4814,7 +4904,7 @@
 DocType: Lab Test,Test Group,টেস্ট গ্রুপ
 DocType: Payment Reconciliation,Receivable / Payable Account,গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্ট
 DocType: Delivery Note Item,Against Sales Order Item,বিক্রয় আদেশ আইটেমটি বিরুদ্ধে
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},অ্যাট্রিবিউট মূল্য গুন উল্লেখ করুন {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},অ্যাট্রিবিউট মূল্য গুন উল্লেখ করুন {0}
 DocType: Item,Default Warehouse,ডিফল্ট ওয়্যারহাউস
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},বাজেট গ্রুপ অ্যাকাউন্ট বিরুদ্ধে নিয়োগ করা যাবে না {0}
 DocType: Healthcare Settings,Patient Registration,রোগীর নিবন্ধন
@@ -4843,6 +4933,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,সেলস পারসন
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,বাজেট এবং খরচ কেন্দ্র
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,পেমেন্ট একাধিক ডিফল্ট মোড অনুমতি দেওয়া হয় না
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,জন্য
 ,Appointment Analytics,নিয়োগের বিশ্লেষণ
 DocType: Vehicle Service,Half Yearly,অর্ধ বার্ষিক
 DocType: Lead,Blog Subscriber,ব্লগ গ্রাহক
@@ -4860,7 +4951,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,quot কাউন্ট
 ,BOM Stock Report,BOM স্টক রিপোর্ট
 DocType: Stock Reconciliation Item,Quantity Difference,পরিমাণ পার্থক্য
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,প্রসেসিং বেতনের
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,প্রসেসিং বেতনের
 DocType: Opportunity Item,Basic Rate,মৌলিক হার
 DocType: GL Entry,Credit Amount,ক্রেডিট পরিমাণ
 DocType: Cheque Print Template,Signatory Position,স্বাক্ষরকারী অবস্থান
@@ -4874,12 +4965,12 @@
 DocType: Tax Rule,Tax Rule,ট্যাক্স রুল
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,বিক্রয় চক্র সর্বত্র একই হার বজায় রাখা
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,ওয়ার্কস্টেশন ওয়ার্কিং সময়ের বাইরে সময় লগ পরিকল্পনা করুন.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,সারিতে গ্রাহকরা
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,ডঃ {0} এর কোন চিকিৎসক নেই। চিকিত্সক মাস্টার মধ্যে এটি যোগ করুন
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,সারিতে গ্রাহকরা
 DocType: Student,Nationality,জাতীয়তা
 ,Items To Be Requested,চলছে অনুরোধ করা
-DocType: Purchase Order,Get Last Purchase Rate,শেষ কেনার হার পেতে
 DocType: Company,Company Info,প্রতিষ্ঠানের তথ্য
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,নির্বাচন বা নতুন গ্রাহক যোগ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,নির্বাচন বা নতুন গ্রাহক যোগ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,খরচ কেন্দ্র একটি ব্যয় দাবি বুক করতে প্রয়োজন বোধ করা হয়
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ফান্ডস (সম্পদ) এর আবেদন
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,এই কর্মচারী উপস্থিতি উপর ভিত্তি করে
@@ -4887,6 +4978,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,ডেবিট অ্যাকাউন্ট
 DocType: Fiscal Year,Year Start Date,বছরের শুরু তারিখ
 DocType: Attendance,Employee Name,কর্মকর্তার নাম
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,রেস্টুরেন্ট অর্ডার এন্ট্রি আইটেম
 DocType: Sales Invoice,Rounded Total (Company Currency),গোলাকৃতি মোট (কোম্পানি একক)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"অ্যাকাউন্ট ধরন নির্বাচন করা হয়, কারণ গ্রুপের গোপন করা যাবে না."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} নথীটি পরিবর্তিত হয়েছে. রিফ্রেশ করুন.
@@ -4897,6 +4989,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,কর্মচারীর সুবিধা
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},বস্তাবন্দী পরিমাণ সারিতে আইটেম {0} জন্য পরিমাণ সমান নয় {1}
 DocType: Production Order,Manufactured Qty,শিল্পজাত Qty
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,ইনভয়েস
 DocType: Purchase Receipt Item,Accepted Quantity,গৃহীত পরিমাণ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},একটি ডিফল্ট কর্মচারী জন্য হলিডে তালিকা নির্ধারণ করুন {0} বা কোম্পানির {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} বিদ্যমান নয়
@@ -4906,18 +4999,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},সারি কোন {0}: পরিমাণ ব্যয় দাবি {1} বিরুদ্ধে পরিমাণ অপেক্ষারত তার চেয়ে অনেক বেশী হতে পারে না. অপেক্ষারত পরিমাণ {2}
 DocType: Maintenance Schedule,Schedule,সময়সূচি
 DocType: Account,Parent Account,মূল অ্যাকাউন্ট
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,উপলভ্য
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,উপলভ্য
 DocType: Quality Inspection Reading,Reading 3,3 পড়া
 ,Hub,হাব
 DocType: GL Entry,Voucher Type,ভাউচার ধরন
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,মূল্য তালিকা পাওয়া বা প্রতিবন্ধী না
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,মূল্য তালিকা পাওয়া বা প্রতিবন্ধী না
 DocType: Lab Test,Approved,অনুমোদিত
 DocType: Pricing Rule,Price,মূল্য
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',{0} নির্ধারণ করা আবশ্যক উপর অব্যাহতিপ্রাপ্ত কর্মচারী &#39;বাম&#39; হিসাবে
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',{0} নির্ধারণ করা আবশ্যক উপর অব্যাহতিপ্রাপ্ত কর্মচারী &#39;বাম&#39; হিসাবে
+DocType: Hub Settings,Last Sync On,শেষ সিঙ্ক অন
 DocType: Guardian,Guardian,অভিভাবক
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,মূল্যায়ন {0} {1} প্রদত্ত সময়সীমার মধ্যে কর্মচারী জন্য তৈরি
 DocType: Employee,Education,শিক্ষা
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,দেল
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,দেল
 DocType: Selling Settings,Campaign Naming By,প্রচারে নেমিং
 DocType: Employee,Current Address Is,বর্তমান ঠিকানা
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,মাসিক বিক্রয় লক্ষ্য (
@@ -4932,7 +5026,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,কোর্স কোড:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,ব্যয় অ্যাকাউন্ট লিখুন দয়া করে
 DocType: Account,Stock,স্টক
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","সারি # {0}: রেফারেন্স ডকুমেন্ট প্রকার ক্রয় আদেশ এক, ক্রয় চালান বা জার্নাল এন্ট্রি করতে হবে"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","সারি # {0}: রেফারেন্স ডকুমেন্ট প্রকার ক্রয় আদেশ এক, ক্রয় চালান বা জার্নাল এন্ট্রি করতে হবে"
 DocType: Employee,Current Address,বর্তমান ঠিকানা
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","স্পষ্টভাবে উল্লেখ তবে আইটেমটি তারপর বর্ণনা, চিত্র, প্রাইসিং, করের টেমপ্লেট থেকে নির্ধারণ করা হবে ইত্যাদি অন্য আইটেম একটি বৈকল্পিক যদি"
 DocType: Serial No,Purchase / Manufacture Details,ক্রয় / প্রস্তুত বিস্তারিত
@@ -4963,7 +5057,7 @@
 DocType: Hub Settings,Hub Settings,হাব সেটিংস
 DocType: Project,Gross Margin %,গ্রস মার্জিন%
 DocType: BOM,With Operations,অপারেশন সঙ্গে
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,হিসাব থেকে ইতিমধ্যে মুদ্রা তৈরি করা হয়েছে {0} কোম্পানির জন্য {1}. মুদ্রা একক সঙ্গে একটি প্রাপ্য বা প্রদেয় অ্যাকাউন্ট নির্বাচন করুন {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,হিসাব থেকে ইতিমধ্যে মুদ্রা তৈরি করা হয়েছে {0} কোম্পানির জন্য {1}. মুদ্রা একক সঙ্গে একটি প্রাপ্য বা প্রদেয় অ্যাকাউন্ট নির্বাচন করুন {0}.
 DocType: Asset,Is Existing Asset,বিদ্যমান সম্পদ
 DocType: Salary Detail,Statistical Component,পরিসংখ্যানগত কম্পোনেন্ট
 DocType: Warranty Claim,If different than customer address,গ্রাহক অঙ্ক চেয়ে ভিন্ন যদি
@@ -4971,13 +5065,14 @@
 DocType: BOM Operation,BOM Operation,BOM অপারেশন
 DocType: Purchase Taxes and Charges,On Previous Row Amount,পূর্ববর্তী সারি পরিমাণ
 DocType: Student,Home Address,বাসার ঠিকানা
+DocType: Item,Has Expiry Date,মেয়াদ শেষের তারিখ আছে
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,আইটেম বৈকল্পিক সেটিংস
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,ট্রান্সফার অ্যাসেট
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,ট্রান্সফার অ্যাসেট
 DocType: POS Profile,POS Profile,পিওএস প্রোফাইল
 DocType: Training Event,Event Name,অনুষ্ঠানের নাম
 DocType: Physician,Phone (Office),ফোন (অফিস)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,স্বীকারোক্তি
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},জন্য অ্যাডমিশন {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,স্বীকারোক্তি
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},জন্য অ্যাডমিশন {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","সেটিং বাজেটের, লক্ষ্যমাত্রা ইত্যাদি জন্য ঋতু"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,পরিবর্তনশীল নাম
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","{0} আইটেম একটি টেমপ্লেট, তার ভিন্নতা একটি নির্বাচন করুন"
@@ -4986,7 +5081,7 @@
 DocType: Assessment Plan,Room,কক্ষ
 DocType: Purchase Order,Advance Paid,অগ্রিম প্রদত্ত
 DocType: Item,Item Tax,আইটেমটি ট্যাক্স
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,সরবরাহকারী উপাদান
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,সরবরাহকারী উপাদান
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,আবগারি চালান
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,ট্রেশহোল্ড {0}% একবারের বেশি প্রদর্শিত
 DocType: Expense Claim,Employees Email Id,এমপ্লয়িজ ইমেইল আইডি
@@ -4997,32 +5092,30 @@
 DocType: Program,Program Name,প্রোগ্রাম নাম
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,জন্য ট্যাক্স বা চার্জ ধরে নেবেন
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,প্রকৃত স্টক বাধ্যতামূলক
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} বর্তমানে একটি {1} সরবরাহকারী স্কোরকার্ড দাঁড়িয়ে আছে, এবং এই সরবরাহকারীকে ক্রয় আদেশগুলি সতর্কতার সাথে জারি করা উচিত।"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} বর্তমানে একটি {1} সরবরাহকারী স্কোরকার্ড দাঁড়িয়ে আছে, এবং এই সরবরাহকারীকে ক্রয় আদেশগুলি সতর্কতার সাথে জারি করা উচিত।"
 DocType: Employee Loan,Loan Type,ঋণ প্রকার
 DocType: Scheduling Tool,Scheduling Tool,পূর্বপরিকল্পনা টুল
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,ক্রেডিট কার্ড
 DocType: BOM,Item to be manufactured or repacked,আইটেম শিল্পজাত বা repacked করা
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,শেয়ার লেনদেনের জন্য ডিফল্ট সেটিংস.
-DocType: Purchase Invoice,Next Date,পরবর্তী তারিখ
 DocType: Employee Education,Major/Optional Subjects,মেজর / ঐচ্ছিক বিষয়াবলী
 DocType: Sales Invoice Item,Drop Ship,ড্রপ জাহাজ
+DocType: Hub Settings,Suspended,স্থগিত
 DocType: Training Event,Attendees,অংশগ্রহণকারীগণ
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","এখানে আপনি নামের এবং পিতা বা মাতা, স্ত্রী ও সন্তানদের বৃত্তি মত পরিবার বিবরণ স্থাপন করতে পারে"
 DocType: Academic Term,Term End Date,টার্ম শেষ তারিখ
-DocType: Hub Settings,Seller Name,বিক্রেতা নাম
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),কর ও শুল্ক বাদ (কোম্পানি একক)
 DocType: Item Group,General Settings,সাধারণ বিন্যাস
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,মুদ্রা থেকে এবং মুদ্রার একই হতে পারে না
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,প্রশিক্ষক যোগ করুন
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,অগ্রসর হবার আগে ফর্ম সংরক্ষণ করতে হবে
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,প্রথম কোম্পানি নির্বাচন করুন
 DocType: Item Attribute,Numeric Values,সাংখ্যিক মান
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,লোগো সংযুক্ত
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,স্টক মাত্রা
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,স্টক মাত্রা
 DocType: Customer,Commission Rate,কমিশন হার
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,{1} এর জন্য {1} স্কোরকার্ড তৈরি করেছেন:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,ভেরিয়েন্ট করুন
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,ভেরিয়েন্ট করুন
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,ডিপার্টমেন্ট দ্বারা ব্লক ছেড়ে অ্যাপ্লিকেশন.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","পেমেন্ট টাইপ, জখন এক হতে হবে বেতন ও ইন্টারনাল ট্রান্সফার"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,বৈশ্লেষিক ন্যায়
@@ -5037,11 +5130,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,মূলধন
 DocType: Shopping Cart Settings,Show Public Attachments,জন সংযুক্তিসমূহ দেখান
 DocType: Packing Slip,Package Weight Details,প্যাকেজ ওজন বিস্তারিত
+DocType: Restaurant Reservation,Reservation Time,সংরক্ষণের সময়
 DocType: Payment Gateway Account,Payment Gateway Account,পেমেন্ট গেটওয়ে অ্যাকাউন্টে
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,পেমেন্ট সম্পন্ন করার পর নির্বাচিত পৃষ্ঠাতে ব্যবহারকারী পুনর্নির্দেশ.
 DocType: Company,Existing Company,বিদ্যমান কোম্পানী
 DocType: Healthcare Settings,Result Emailed,ফলাফল ইমেল
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",ট্যাক্স শ্রেণী &quot;মোট&quot; এ পরিবর্তন করা হয়েছে কারণ সব আইটেম অ স্টক আইটেম নেই
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,আইটেম কোড&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,একটি CSV ফাইল নির্বাচন করুন
 DocType: Student Leave Application,Mark as Present,বর্তমান হিসাবে চিহ্নিত করুন
 DocType: Supplier Scorecard,Indicator Color,নির্দেশক রঙ
@@ -5066,11 +5161,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,স্টুডেন্ট ব্যাচ করুন
 DocType: Fee Schedule,FRQ.,FRQ।
 DocType: Leave Type,Is Carry Forward,এগিয়ে বহন করা হয়
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,BOM থেকে জানানোর পান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,BOM থেকে জানানোর পান
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,সময় দিন লিড
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},সারি # {0}: পোস্টিং তারিখ ক্রয় তারিখ হিসাবে একই হতে হবে {1} সম্পত্তির {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,এই চেক শিক্ষার্থীর ইন্সটিটিউটের হোস্টেল এ অবস্থিত হয়।
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,উপরে টেবিল এ সেলস অর্ডার প্রবেশ করুন
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,উপরে টেবিল এ সেলস অর্ডার প্রবেশ করুন
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,জমা দেওয়া হয়নি বেতন Slips
 ,Stock Summary,শেয়ার করুন সংক্ষিপ্ত
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,অন্য এক গুদাম থেকে একটি সম্পদ ট্রান্সফার
@@ -5086,5 +5181,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},সারি {0}: ডেবিট এন্ট্রি সঙ্গে যুক্ত করা যাবে না একটি {1}
 DocType: Journal Entry,Subscription Section,সাবস্ক্রিপশন বিভাগ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,অ্যাকাউন্ট {0} অস্তিত্ব নেই
+DocType: Training Event,Training Program,প্রশিক্ষণ প্রোগ্রাম
 DocType: Account,Cash,নগদ
 DocType: Employee,Short biography for website and other publications.,ওয়েবসাইট ও অন্যান্য প্রকাশনা সংক্ষিপ্ত জীবনী.
diff --git a/erpnext/translations/bs.csv b/erpnext/translations/bs.csv
index 4f3a9cf..11cb13f 100644
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Plaća način
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Registrujte se
 DocType: Patient,Divorced,Rastavljen
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Predmeti već sinhronizovani
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Dozvolite Stavka treba dodati više puta u transakciji
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Odustani Materijal {0} Posjeti prije otkazivanja ova garancija potraživanje
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Ostavite odobravateljima
 DocType: Sales Partner,Dealer,Trgovac
 DocType: Consultation,Investigations,Istrage
+DocType: Restaurant Order Entry,Click Enter To Add,Kliknite Enter za dodavanje
 DocType: Employee,Rented,Iznajmljuje
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Primjenjivo za korisnika
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zaustavila proizvodnju Naredba se ne može otkazati, odčepiti to prvi koji će otkazati"
 DocType: Vehicle Service,Mileage,kilometraža
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Da li zaista želite da ukine ove imovine?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Da li zaista želite da ukine ove imovine?
 DocType: Drug Prescription,Update Schedule,Raspored ažuriranja
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Izaberite snabdjevač
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Valuta je potreban za Cjenovnik {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Provjera dostupnosti
 DocType: Job Applicant,Job Applicant,Posao podnositelj
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Ovo se zasniva na transakcije protiv tog dobavljača. Pogledajte vremenski okvir ispod za detalje
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nema više rezultata.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Pravni
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Stvarni tip porez ne može biti uključen u stopu stavka u nizu {0}
 DocType: Bank Guarantee,Customer,Kupci
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Tečajna lista moraju biti isti kao {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Naziv kupca
 DocType: Vehicle,Natural Gas,prirodni gas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Žiro račun ne može biti imenovan kao {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Žiro račun ne može biti imenovan kao {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Heads (ili grupe) protiv kojih Računovodstvo unosi se izrađuju i sredstva se održavaju.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Izvanredna za {0} ne može biti manji od nule ( {1} )
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Nema podnesenih plata za obradu.
 DocType: Manufacturing Settings,Default 10 mins,Uobičajeno 10 min
 DocType: Leave Type,Leave Type Name,Ostavite ime tipa
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Pokaži otvoren
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Neophodno je i danas preduzeti ovu akciju za gore pomenuto ponavljanje
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Serija Updated uspješno
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Provjeri
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural Journal Entry Postavio
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Narudžbenica Proizvodi treba primiti
 DocType: SMS Center,All Supplier Contact,Svi kontakti dobavljača
 DocType: Support Settings,Support Settings,podrška Postavke
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Očekivani Završni datum ne može biti manji od očekivanog datuma Početak
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Očekivani Završni datum ne može biti manji od očekivanog datuma Početak
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Rate moraju biti isti kao {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Novi dopust Primjena
 ,Batch Item Expiry Status,Batch Stavka Status isteka
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Bank Nacrt
 DocType: Mode of Payment Account,Mode of Payment Account,Način plaćanja računa
 DocType: Consultation,Consultation,Konsultacije
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Prodaja i povratak
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Show Varijante
 DocType: Academic Term,Academic Term,akademski Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,materijal
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Zdravstvena zaštita
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Kašnjenje u plaćanju (Dani)
 DocType: Lab Prescription,Lab Prescription,Lab recept
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Sortiraj po cijeni
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Servis rashodi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijski broj: {0} je već spomenut u prodaje Faktura: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Faktura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijski broj: {0} je već spomenut u prodaje Faktura: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskalna godina {0} je potrebno
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrana
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Ukupno Costing iznos
 DocType: Delivery Note,Vehicle No,Ne vozila
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Molimo odaberite Cjenik
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Molimo odaberite Cjenik
 DocType: Accounts Settings,Currency Exchange Settings,Postavke razmjene valuta
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Row # {0}: Isplata dokument je potrebno za završetak trasaction
 DocType: Production Order Operation,Work In Progress,Radovi u toku
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Molimo izaberite datum
 DocType: Employee,Holiday List,Lista odmora
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Molimo vas da postavite sistem imenovanja instruktora u školi&gt; Postavke škole
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Računovođa
+DocType: Hub Settings,Selling Price List,Prodajni cjenik
 DocType: Patient,Tobacco Current Use,Upotreba duvana
 DocType: Cost Center,Stock User,Stock korisnika
 DocType: Company,Phone No,Telefonski broj
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Rasporedi Course stvorio:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Novi {0}: {1} #
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Novi {0}: {1} #
 ,Sales Partners Commission,Prodaja Partneri komisija
 DocType: Purchase Invoice,Rounding Adjustment,Prilagođavanje zaokruživanja
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Skraćeni naziv ne može imati više od 5 znakova
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Roditelj Detalj docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referenca: {0}, Šifra: {1} i kupaca: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,kg
-DocType: Student Log,Log,Prijavite
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Otvaranje za posao.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Rezultat je podnet
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Rezultat je podnet
 DocType: Item Attribute,Increment,Prirast
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Vremenski razmak
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Odaberite Warehouse ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Oženjen
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Nije dozvoljeno za {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Get stavke iz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Proizvod {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,No stavke navedene
 DocType: Payment Reconciliation,Reconcile,pomiriti
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,mirovinskim fondovima
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Sljedeća Amortizacija datum ne može biti prije Datum kupovine
 DocType: Consultation,Consultation Date,Datum konsultacije
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Spisak proizvoda i otkrivanje za korisnike ERPNext
 DocType: SMS Center,All Sales Person,Svi prodavači
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Mjesečna distribucija ** će Vam pomoći distribuirati budžeta / Target preko mjeseca ako imate sezonalnost u vaše poslovanje.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Nije pronađenim predmetima
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Plaća Struktura Missing
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Nije pronađenim predmetima
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Plaća Struktura Missing
 DocType: Lead,Person Name,Ime osobe
 DocType: Sales Invoice Item,Sales Invoice Item,Stavka fakture prodaje
 DocType: Account,Credit,Kredit
 DocType: POS Profile,Write Off Cost Center,Otpis troška
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",npr &quot;Osnovna škola&quot; ili &quot;Univerzitet&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",npr &quot;Osnovna škola&quot; ili &quot;Univerzitet&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Stock Izvještaji
 DocType: Warehouse,Warehouse Detail,Detalji o skladištu
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prešla za kupca {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Termin Završni datum ne može biti kasnije od kraja godine Datum akademske godine za koji je vezana pojam (akademska godina {}). Molimo ispravite datume i pokušajte ponovo.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Da li je osnovno sredstvo&quot; ne može biti označeno, kao rekord imovine postoji u odnosu na stavku"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Da li je osnovno sredstvo&quot; ne može biti označeno, kao rekord imovine postoji u odnosu na stavku"
 DocType: Vehicle Service,Brake Oil,Brake ulje
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klijent&gt; Grupa klijenata&gt; Teritorija
 DocType: Tax Rule,Tax Type,Vrste poreza
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,oporezivi iznos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Niste ovlašteni za dodati ili ažurirati unose prije {0}
 DocType: BOM,Item Image (if not slideshow),Slika proizvoda (ako nije slide prikaz)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Kupac postoji s istim imenom
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Satnica / 60) * Puna radno vrijeme
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Red # {0}: Referentni tip dokumenta mora biti jedan od potraživanja troškova ili unosa dnevnika
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Izaberite BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Red # {0}: Referentni tip dokumenta mora biti jedan od potraživanja troškova ili unosa dnevnika
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Izaberite BOM
 DocType: SMS Log,SMS Log,SMS log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Troškovi isporučenih Predmeti
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Na odmor na {0} nije između Od datuma i Do datuma
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,zaposlenik kredita
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Dnevnik aktivnosti:
 DocType: Fee Schedule,Send Payment Request Email,Pošaljite zahtev za plaćanje
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Artikal {0} ne postoji u sustavu ili je istekao
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Artikal {0} ne postoji u sustavu ili je istekao
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nekretnine
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Izjava o računu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Lijekovi
@@ -210,17 +213,22 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Uvoz Prijavite
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Povucite Materijal Zahtjev tipa proizvoda na bazi navedene kriterije
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Uspešno neregistrovani.
 DocType: Training Result Employee,Grade,razred
+DocType: Restaurant Table,No of Seats,Broj sedišta
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Da biste dodali dinamički predmet, koristite oznake tipa jinja <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Isporučuje dobavljač
 DocType: SMS Center,All Contact,Svi kontakti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Proizvodnog naloga već stvorena za sve stavke sa BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Proizvodnog naloga već stvorena za sve stavke sa BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Godišnja zarada
 DocType: Daily Work Summary,Daily Work Summary,Svakodnevni rad Pregled
 DocType: Period Closing Voucher,Closing Fiscal Year,Zatvaranje Fiskalna godina
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} je smrznuto
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Molimo odaberite postojećeg društva za stvaranje Kontni plan
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} je smrznuto
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Molimo odaberite postojećeg društva za stvaranje Kontni plan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Stock Troškovi
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Odaberite Target Skladište
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Odaberite Target Skladište
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Unesite Preferred Kontakt mail
 DocType: Program Enrollment,School Bus,Školski autobus
 DocType: Journal Entry,Contra Entry,Contra Entry
@@ -238,9 +246,10 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Preuzmite Template, popunite odgovarajuće podatke i priložite modifikovani datoteku.
  Svi datumi i zaposlenog kombinacija u odabranom periodu doći će u predlošku, sa postojećim pohađanje evidencije"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Stavka {0} nije aktivan ili kraj života je postignut
+DocType: Student Admission Program,Minimum Age,Minimalna dob
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Primjer: Osnovni Matematika
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To uključuje porez u redu {0} u stopu točke , porezi u redovima {1} također moraju biti uključeni"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Podešavanja modula ljudskih resursa
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Podešavanja modula ljudskih resursa
 DocType: SMS Center,SMS Center,SMS centar
 DocType: Sales Invoice,Change Amount,Promjena Iznos
 DocType: BOM Update Tool,New BOM,Novi BOM
@@ -250,7 +259,7 @@
 DocType: Lead,Request Type,Zahtjev Tip
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Make zaposlenih
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,radiodifuzija
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Dodaj sobe
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Način podešavanja POS (Online / Offline)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,izvršenje
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detalji o poslovanju obavlja.
 DocType: Serial No,Maintenance Status,Održavanje statusa
@@ -273,6 +282,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cjenik mora biti primjenjiv za kupnju ili prodaju
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Datum Instalacija ne može biti prije datuma isporuke za točke {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Popust na cijenu List stopa (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Biokemija
 DocType: Offer Letter,Select Terms and Conditions,Odaberite uvjeti
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,out vrijednost
 DocType: Production Planning Tool,Sales Orders,Sales Orders
@@ -307,15 +317,15 @@
 DocType: Sales Partner,Reseller,Prodavač
 DocType: Codification Table,Medical Code,Medicinski kod
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Ako je označeno, će uključivati ne-stanju proizvodi u Industrijska zahtjevima."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Unesite tvrtke
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Unesite tvrtke
 DocType: Delivery Note Item,Against Sales Invoice Item,Protiv prodaje fakture Item
 ,Production Orders in Progress,Radni nalozi u tijeku
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Neto gotovine iz aktivnosti finansiranja
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage je puna, nije spasio"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage je puna, nije spasio"
 DocType: Lead,Address & Contact,Adresa i kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj neiskorišteni lišće iz prethodnog izdvajanja
 DocType: Sales Partner,Partner website,website partner
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Dodaj stavku
+DocType: Restaurant Order Entry,Add Item,Dodaj stavku
 DocType: Lab Test,Custom Result,Prilagođeni rezultat
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Kontakt ime
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kriteriji procjene naravno
@@ -328,7 +338,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Zahtjev za kupnju.
 DocType: Lab Test,Submitted Date,Datum podnošenja
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,To se temelji na vrijeme listovi stvorio protiv ovog projekta
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Neto Pay ne može biti manja od 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Neto Pay ne može biti manja od 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Da biste zaustavili slanje ponavljajućih obaveštenja o greškama iz sistema, u pretplatu smo označili polje Disabled"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Samoodabrani Ostavite Odobritelj može podnijeti ovo ostaviti aplikacija
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Olakšavanja Datum mora biti veći od dana ulaska u
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Ostavlja per Godina
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,Dobiti i gubitka
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Litre
 DocType: Task,Total Costing Amount (via Time Sheet),Ukupno Costing Iznos (preko Time Sheet)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Molimo da podesite studente pod studentskim grupama
 DocType: Item Website Specification,Item Website Specification,Specifikacija web stranice artikla
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Ostavite blokirani
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Artikal {0} je dosegao svoj rok trajanja na {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Artikal {0} je dosegao svoj rok trajanja na {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,banka unosi
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,godišnji
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Pomirenje Item
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Creation Tool Course
 DocType: Lead,Do Not Contact,Ne kontaktirati
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,Ljudi koji predaju u vašoj organizaciji
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Jedinstveni ID za praćenje svih ponavljajući fakture. To je izrađen podnijeti.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimalna količina za naručiti
 DocType: Pricing Rule,Supplier Type,Dobavljač Tip
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,Objavite u Hub
 DocType: Student Admission,Student Admission,student Ulaz
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Artikal {0} je otkazan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Materijal zahtjev
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Artikal {0} je otkazan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Materijal zahtjev
 DocType: Bank Reconciliation,Update Clearance Date,Ažurirajte provjeri datum
 DocType: Item,Purchase Details,Kupnja Detalji
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Stavka {0} nije pronađena u &#39;sirovine Isporučuje&#39; sto u narudžbenice {1}
 DocType: Patient Relation,Relation,Odnos
 DocType: Shipping Rule,Worldwide Shipping,Dostavom diljem svijeta
 DocType: Patient Relation,Mother,majka
+DocType: Restaurant Reservation,Reservation End Time,Vreme završetka rezervacije
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Potvrđene narudžbe od kupaca.
 DocType: Purchase Receipt Item,Rejected Quantity,Odbijen Količina
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Zahtev za plaćanje {0} kreiran
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Zahtev za plaćanje {0} kreiran
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Niska osetljivost
 DocType: Notification Control,Notification Control,Obavijest kontrola
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Potvrdite kad završite obuku
 DocType: Lead,Suggestions,Prijedlozi
@@ -388,7 +401,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,E-poruke plate slip zaposlenog na osnovu preferirani mail izabrane u zaposlenih
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Prvi dopust Odobritelj na popisu će se postaviti kao zadani Odobritelj dopust
 DocType: Tax Rule,Shipping County,Dostava županije
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Učiti
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Učiti
 DocType: Asset,Next Depreciation Date,Sljedeća Amortizacija Datum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivnost Trošak po zaposlenom
 DocType: Accounts Settings,Settings for Accounts,Postavke za račune
@@ -399,13 +412,13 @@
 DocType: Item,Synced With Hub,Pohranjen Hub
 DocType: Vehicle,Fleet Manager,Fleet Manager
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} ne može biti negativan za stavku {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Pogrešna lozinka
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Pogrešna lozinka
 DocType: Item,Variant Of,Varijanta
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Završene Qty ne može biti veća od 'Količina za proizvodnju'
 DocType: Period Closing Voucher,Closing Account Head,Zatvaranje računa šefa
 DocType: Employee,External Work History,Vanjski History Work
 DocType: Physician,Time per Appointment,Vreme po imenovanju
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Kružna Reference Error
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Kružna Reference Error
 DocType: Appointment Type,Is Inpatient,Je stacionarno
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 ime
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Riječima (izvoz) će biti vidljivo nakon što spremite otpremnicu.
@@ -414,19 +427,18 @@
 DocType: Lead,Industry,Industrija
 DocType: Employee,Job Profile,posao Profile
 DocType: BOM Item,Rate & Amount,Stopa i količina
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molimo da podesite serije brojeva za prisustvo preko Setup&gt; Serija numeracije
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Ovo se zasniva na transakcijama protiv ove kompanije. Pogledajte detalje u nastavku
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Obavijesti putem e-pošte na stvaranje automatskog Materijal Zahtjeva
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Otporno
 DocType: Journal Entry,Multi Currency,Multi valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Tip fakture
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klijent&gt; Grupa klijenata&gt; Teritorija
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Otpremnica
 DocType: Consultation,Encounter Impression,Encounter Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Postavljanje Poreza
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Troškovi prodate imovine
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,Plaćanje Entry je izmijenjena nakon što ste ga izvukao. Molimo vas da se ponovo povucite.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0}pritisnite dva puta u sifri poreza
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Pregled za ovaj tjedan i aktivnostima na čekanju
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0}pritisnite dva puta u sifri poreza
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Pregled za ovaj tjedan i aktivnostima na čekanju
 DocType: Student Applicant,Admitted,Prihvaćen
 DocType: Workstation,Rent Cost,Rent cost
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Iznos nakon Amortizacija
@@ -440,36 +452,35 @@
 DocType: Shipping Rule,Valid for Countries,Vrijedi za zemlje
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ovaj proizvod predložak i ne može se koristiti u transakcijama. Stavka atributi će se kopirati u više varijanti, osim 'Ne Copy ""je postavljena"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Ukupno Order Smatran
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Zvanje zaposlenog ( npr. CEO , direktor i sl. ) ."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Zvanje zaposlenog ( npr. CEO , direktor i sl. ) ."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Stopa po kojoj Kupac valuta se pretvaraju u kupca osnovne valute
 DocType: Course Scheduling Tool,Course Scheduling Tool,Naravno rasporedu Tool
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: fakturi ne može se protiv postojeće imovine {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Hitno] Greška prilikom kreiranja ponavljajućeg% s za% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Hitno] Greška prilikom kreiranja ponavljajućeg% s za% s
 DocType: Item Tax,Tax Rate,Porezna stopa
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} već izdvojeno za zaposlenog {1} {2} za razdoblje do {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Odaberite Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Odaberite Item
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Kupnja Račun {0} već je podnijela
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: serijski br mora biti isti kao {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Pretvoriti u non-Group
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Serija (puno) proizvoda.
 DocType: C-Form Invoice Detail,Invoice Date,Datum fakture
 DocType: GL Entry,Debit Amount,Debit Iznos
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Tu može biti samo 1 račun po kompanije u {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Pogledajte prilog
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Tu može biti samo 1 račun po kompanije u {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Pogledajte prilog
 DocType: Purchase Order,% Received,% Primljeno
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Napravi studentske grupe
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Podešavanja je već okončano!!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Podešavanja je već okončano!!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Kredit Napomena Iznos
 DocType: Setup Progress Action,Action Document,Akcioni dokument
 ,Finished Goods,gotovih proizvoda
 DocType: Delivery Note,Instructions,Instrukcije
 DocType: Quality Inspection,Inspected By,Provjereno od strane
 DocType: Maintenance Visit,Maintenance Type,Održavanje Tip
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} nije upisanim na predmetu {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Šifra proizvoda&gt; Grupa proizvoda&gt; Marka
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} nije upisanim na predmetu {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serijski Ne {0} ne pripada isporuke Napomena {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Dodaj Predmeti
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Dodaj Predmeti
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parametar provjere kvalitete artikala
 DocType: Leave Application,Leave Approver Name,Ostavite Approver Ime
 DocType: Depreciation Schedule,Schedule Date,Raspored Datum
@@ -489,7 +500,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Radno vrijeme
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Promjena polaznu / tekući redni broj postojeće serije.
 DocType: Dosage Strength,Strength,Snaga
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Kreiranje novog potrošača
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Kreiranje novog potrošača
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ako više Cijene pravila i dalje prevladavaju, korisnici su zamoljeni da postavite prioritet ručno riješiti sukob."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Napravi Narudžbenice
 ,Purchase Register,Kupnja Registracija
@@ -508,7 +519,7 @@
 DocType: Lab Test Template,Single,Singl
 DocType: Salary Slip,Total Loan Repayment,Ukupno otplate kredita
 DocType: Account,Cost of Goods Sold,Troškovi prodane robe
-DocType: Purchase Invoice,Yearly,Godišnji
+DocType: Subscription,Yearly,Godišnji
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Unesite troška
 DocType: Drug Prescription,Dosage,Doziranje
 DocType: Journal Entry Account,Sales Order,Narudžbe kupca
@@ -538,7 +549,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Global postavke za sve proizvodne procese.
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Frozen Upto
 DocType: SMS Log,Sent On,Poslano na adresu
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Atribut {0} odabrani više puta u atributi tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Atribut {0} odabrani više puta u atributi tabeli
 DocType: HR Settings,Employee record is created using selected field. ,Zapis o radniku je kreiran odabirom polja .
 DocType: Sales Order,Not Applicable,Nije primjenjivo
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Majstor za odmor .
@@ -563,13 +574,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Ukupno lišće dodijeljena je obavezno
 DocType: Patient,AB Positive,AB Pozitivan
 DocType: Job Opening,Description of a Job Opening,Opis posla Otvaranje
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Aktivnostima na čekanju za danas
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Aktivnostima na čekanju za danas
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Gledatelja rekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Plaća Komponenta za obračun plata na osnovu timesheet.
 DocType: Sales Order Item,Used for Production Plan,Koristi se za plan proizvodnje
 DocType: Employee Loan,Total Payment,Ukupna uplata
 DocType: Manufacturing Settings,Time Between Operations (in mins),Vrijeme između operacije (u min)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} je otkazan tako da akcija ne može završiti
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} je otkazan tako da akcija ne može završiti
 DocType: Customer,Buyer of Goods and Services.,Kupac robe i usluga.
 DocType: Journal Entry,Accounts Payable,Naplativa konta
 DocType: Patient,Allergies,Alergije
@@ -581,22 +592,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Upozoravajte narudžbenice
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Navedite nekoliko svojih kupaca. Oni mogu biti tvrtke ili fizičke osobe.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Dosta dijelova za izgradnju
+DocType: POS Profile User,POS Profile User,POS korisnik profila
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Direktni prihodi
 DocType: Patient Appointment,Date TIme,Date TIme
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Ne možete filtrirati na temelju računa , ako grupirani po računu"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Administrativni službenik
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Molimo odaberite predmeta
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Molimo odaberite predmeta
 DocType: Codification Table,Codification Table,Tabela kodifikacije
 DocType: Timesheet Detail,Hrs,Hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Molimo odaberite Company
 DocType: Stock Entry Detail,Difference Account,Konto razlike
 DocType: Purchase Invoice,Supplier GSTIN,dobavljač GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Ne možete zatvoriti zadatak kao zavisne zadatak {0} nije zatvoren.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,Unesite skladište za koje Materijal Zahtjev će biti podignuta
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Ne možete zatvoriti zadatak kao zavisne zadatak {0} nije zatvoren.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Unesite skladište za koje Materijal Zahtjev će biti podignuta
 DocType: Production Order,Additional Operating Cost,Dodatni operativnih troškova
 DocType: Lab Test Template,Lab Routine,Lab Routine
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,kozmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
 DocType: Shipping Rule,Net Weight,Neto težina
 DocType: Employee,Emergency Phone,Hitna Telefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,kupiti
@@ -606,7 +618,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Molimo vas da definirati razred za Threshold 0%
 DocType: Sales Order,To Deliver,Dostaviti
 DocType: Purchase Invoice Item,Item,Artikl
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Serijski br stavka ne može biti frakcija
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Visoka osetljivost
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Serijski br stavka ne može biti frakcija
 DocType: Journal Entry,Difference (Dr - Cr),Razlika ( dr. - Cr )
 DocType: Account,Profit and Loss,Račun dobiti i gubitka
 DocType: Patient,Risk Factors,Faktori rizika
@@ -615,7 +628,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Upravljanje Subcontracting
 DocType: Vital Signs,Body Temperature,Temperatura tela
 DocType: Project,Project will be accessible on the website to these users,Projekt će biti dostupna na web stranici ovih korisnika
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Definišite tip projekta.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Definišite tip projekta.
 DocType: Supplier Scorecard,Weighting Function,Funkcija ponderiranja
 DocType: Physician,OP Consulting Charge,OP Konsalting Charge
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Postavite svoj
@@ -629,7 +642,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Prirast ne može biti 0
 DocType: Production Planning Tool,Material Requirement,Materijal Zahtjev
 DocType: Company,Delete Company Transactions,Izbrišite Company Transakcije
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Poziv na broj i referentni datum je obavezan za transakcije banke
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Poziv na broj i referentni datum je obavezan za transakcije banke
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Dodaj / uredi poreze i troškove
 DocType: Payment Entry Reference,Supplier Invoice No,Dobavljač Račun br
 DocType: Territory,For reference,Za referencu
@@ -637,12 +650,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Ne možete izbrisati serijski broj {0}, koji se koristi u prodaji transakcije"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Zatvaranje (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,zdravo
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Move Stavka
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Move Stavka
 DocType: Serial No,Warranty Period (Days),Jamstveni period (dani)
 DocType: Installation Note Item,Installation Note Item,Napomena instalacije proizvoda
 DocType: Production Plan Item,Pending Qty,U očekivanju Količina
 DocType: Budget,Ignore,Ignorirati
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} nije aktivan
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} nije aktivan
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,dimenzije ček setup za štampanje
 DocType: Salary Slip,Salary Slip Timesheet,Plaća Slip Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dobavljač skladišta obvezan je za sub - ugovoreni kupiti primitka
@@ -651,7 +664,7 @@
 DocType: Pricing Rule,Sales Partner,Prodajni partner
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Sve ispostavne kartice.
 DocType: Buying Settings,Purchase Receipt Required,Kupnja Potvrda Obvezno
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Vrednovanje Rate je obavezno ako ušla Otvaranje Stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,Vrednovanje Rate je obavezno ako ušla Otvaranje Stock
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nisu pronađeni u tablici fakturu
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Molimo najprije odaberite Društva i Party Tip
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Financijska / obračunska godina .
@@ -688,7 +701,7 @@
 DocType: Quotation,Quotation To,Ponuda za
 DocType: Lead,Middle Income,Srednji Prihodi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),P.S. (Pot)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Uobičajeno mjerna jedinica za artikl {0} ne može se mijenjati izravno, jer ste već napravili neke transakcije (e) sa drugim UOM. Morat ćete stvoriti nove stavke koristiti drugačiji Uobičajeno UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Uobičajeno mjerna jedinica za artikl {0} ne može se mijenjati izravno, jer ste već napravili neke transakcije (e) sa drugim UOM. Morat ćete stvoriti nove stavke koristiti drugačiji Uobičajeno UOM."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Dodijeljeni iznos ne može biti negativan
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Molimo vas da postavite poduzeća
 DocType: Purchase Order Item,Billed Amt,Naplaćeni izn
@@ -702,6 +715,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Izaberite plaćanje računa da banke Entry
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Kreiranje evidencije zaposlenih za upravljanje lišće, trošak potraživanja i platnom spisku"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Period receptora
+DocType: Restaurant Reservation,Restaurant Reservation,Rezervacija restorana
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Pisanje prijedlog
 DocType: Payment Entry Deduction,Payment Entry Deduction,Plaćanje Entry Odbitak
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Još jedna osoba Sales {0} postoji s istim ID zaposlenih
@@ -709,7 +723,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Majstori
 DocType: Assessment Plan,Maximum Assessment Score,Maksimalan rezultat procjene
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Update Bank Transakcijski Termini
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Time Tracking
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Time Tracking
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,DUPLICATE ZA TRANSPORTER
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskalna godina Company
 DocType: Packing Slip Item,DN Detail,DN detalj
@@ -717,8 +731,9 @@
 DocType: Timesheet,Billed,Naplaćeno
 DocType: Batch,Batch Description,Batch Opis
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Stvaranje grupa studenata
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Payment Gateway računa kreiranu, molimo vas da napravite ručno."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Payment Gateway računa kreiranu, molimo vas da napravite ručno."
 DocType: Supplier Scorecard,Per Year,Godišnje
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Nije prihvatljiv za prijem u ovom programu prema DOB-u
 DocType: Sales Invoice,Sales Taxes and Charges,Prodaja Porezi i naknade
 DocType: Employee,Organization Profile,Profil organizacije
 DocType: Vital Signs,Height (In Meter),Visina (u metrima)
@@ -754,7 +769,7 @@
 DocType: Student Batch Name,Batch Name,Batch ime
 DocType: Fee Validity,Max number of visit,Maksimalan broj poseta
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet created:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,upisati
 DocType: GST Settings,GST Settings,PDV Postavke
 DocType: Selling Settings,Customer Naming By,Kupac Imenovanje By
@@ -786,15 +801,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Sleteo Troškovi poreza i naknada
 DocType: Production Order Operation,Actual Start Time,Stvarni Start Time
 DocType: BOM Operation,Operation Time,Operacija Time
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,završiti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,završiti
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,baza
 DocType: Timesheet,Total Billed Hours,Ukupno Fakturisana Hours
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Napišite paušalni iznos
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Napišite paušalni iznos
 DocType: Leave Block List Allow,Allow User,Dopusti korisnika
 DocType: Journal Entry,Bill No,Račun br
 DocType: Company,Gain/Loss Account on Asset Disposal,Dobitak / gubitak računa na Asset Odlaganje
 DocType: Vehicle Log,Service Details,usluga Detalji
-DocType: Purchase Invoice,Quarterly,Kvartalno
+DocType: Subscription,Quarterly,Kvartalno
 DocType: Lab Test Template,Grouped,Grupisano
 DocType: Selling Settings,Delivery Note Required,Potrebna je otpremnica
 DocType: Bank Guarantee,Bank Guarantee Number,Bankarska garancija Broj
@@ -803,12 +818,12 @@
 DocType: Student Attendance,Student Attendance,student Posjeta
 DocType: Sales Invoice Timesheet,Time Sheet,Time Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush sirovine na osnovu
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Unesite Detalji
 DocType: Interest,Interest,interes
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre Sales
 DocType: Purchase Receipt,Other Details,Ostali detalji
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,Test Template
+DocType: Restaurant Order Entry Item,Served,Servirano
 DocType: Account,Accounts,Konta
 DocType: Vehicle,Odometer Value (Last),Odometar vrijednost (Zadnje)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Šabloni za kriterijume rezultata dobavljača.
@@ -820,25 +835,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Preview Plaća Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Račun {0} je ušao više puta
 DocType: Account,Expenses Included In Valuation,Troškovi uključeni u vrednovanje
-DocType: Hub Settings,Seller City,Prodavač City
 ,Absent Student Report,Odsutan Student Report
 DocType: Email Digest,Next email will be sent on:,Sljedeća e-mail će biti poslan na:
 DocType: Offer Letter Term,Offer Letter Term,Ponuda Pismo Term
 DocType: Supplier Scorecard,Per Week,Po tjednu
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Stavka ima varijante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Stavka ima varijante.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Total Student
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Stavka {0} nije pronađena
 DocType: Bin,Stock Value,Stock vrijednost
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,"Evidencije o naknadi će biti stvorene u pozadini. U slučaju bilo kakve greške, poruka o grešci će se ažurirati u Rasporedu."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Kompanija {0} ne postoji
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} ima važeću tarifu do {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} ima važeću tarifu do {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Tip stabla
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Kol Potrošeno po jedinici
 DocType: Serial No,Warranty Expiry Date,Datum isteka jamstva
 DocType: Material Request Item,Quantity and Warehouse,Količina i skladišta
+DocType: Hub Settings,Unregister,Odjavite se
 DocType: Sales Invoice,Commission Rate (%),Komisija stopa (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Molimo odaberite program
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Molimo odaberite program
 DocType: Project,Estimated Cost,Procijenjeni troškovi
 DocType: Purchase Order,Link to material requests,Link za materijal zahtjeva
+DocType: Hub Settings,Publish,Objavite
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Zračno-kosmički prostor
 DocType: Journal Entry,Credit Card Entry,Credit Card Entry
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Company i računi
@@ -849,13 +866,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Zatvori Opportunity Nakon nekoliko dana
 ,Reserved,Rezervirano
 DocType: Purchase Order,Supply Raw Materials,Supply sirovine
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Datuma na koji će biti generiran pored fakture. Ona se stvara na dostavi.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Dugotrajna imovina
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} ne postoji na zalihama.
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',"Molimo vas podelite svoje povratne informacije na trening klikom na &#39;Feedback Feedback&#39;, a zatim &#39;New&#39;"
 DocType: Mode of Payment Account,Default Account,Podrazumjevani konto
 DocType: Payment Entry,Received Amount (Company Currency),Primljeni Iznos (Company Valuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,Lead mora biti postavljen ako je prilika iz njega izrađena
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,Lead mora biti postavljen ako je prilika iz njega izrađena
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Odaberite tjednik off dan
 DocType: Patient,O Negative,O Negativ
 DocType: Production Order Operation,Planned End Time,Planirani End Time
@@ -871,10 +887,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,energija
 DocType: Opportunity,Opportunity From,Prilika od
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mjesečna plaća izjava.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Dodaj kompaniju
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Red {0}: {1} Serijski brojevi potrebni za stavku {2}. Proveli ste {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Red {0}: {1} Serijski brojevi potrebni za stavku {2}. Proveli ste {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Izaberite tabelu
 DocType: BOM,Website Specifications,Web Specifikacije
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} je nevažeća adresa e-pošte u &#39;Primaocima&#39;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} je nevažeća adresa e-pošte u &#39;Primaocima&#39;
 DocType: Special Test Items,Particulars,Posebnosti
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiotik.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Od {0} {1} tipa
@@ -882,11 +898,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Više pravila Cijena postoji sa istim kriterijima, molimo vas da riješe sukob dodjelom prioriteta. Cijena pravila: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne može se isključiti ili otkaže BOM kao što je povezano s drugim Boms
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne može se isključiti ili otkaže BOM kao što je povezano s drugim Boms
 DocType: Opportunity,Maintenance,Održavanje
 DocType: Item Attribute Value,Item Attribute Value,Stavka vrijednost atributa
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Prodajne kampanje.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Make Timesheet
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Make Timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -943,12 +959,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Unesite predmeta prvi
 DocType: Account,Liability,Odgovornost
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionisano Iznos ne može biti veći od potraživanja Iznos u nizu {0}.
+DocType: Salary Detail,Do not include in total,Ne uključujte u potpunosti
 DocType: Company,Default Cost of Goods Sold Account,Uobičajeno Nabavna vrednost prodate robe računa
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Popis Cijena ne bira
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Popis Cijena ne bira
 DocType: Employee,Family Background,Obitelj Pozadina
 DocType: Request for Quotation Supplier,Send Email,Pošaljite e-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Bez dozvole
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Bez dozvole
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Citiraj zatraženo
 DocType: Vital Signs,Heart Rate / Pulse,Srčana brzina / impuls
 DocType: Company,Default Bank Account,Zadani bankovni račun
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Da biste filtrirali na osnovu stranke, izaberite Party prvog tipa"
@@ -975,12 +993,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Stavka Row {idx}: {doctype} {docname} ne postoji u gore &#39;{doctype}&#39; sto
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} je već završen ili otkazan
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,No zadataka
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Na dan u mjesecu na kojima auto faktura će biti generiran npr 05, 28 itd"
 DocType: Item Variant Settings,Copy Fields to Variant,Kopiraj polja na varijantu
 DocType: Asset,Opening Accumulated Depreciation,Otvaranje Ispravka vrijednosti
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Ocjena mora biti manja od ili jednaka 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Upis Tool
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C - Form zapisi
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C - Form zapisi
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Kupaca i dobavljača
 DocType: Email Digest,Email Digest Settings,E-pošta Postavke
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Hvala vam za vaše poslovanje!
@@ -998,13 +1015,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Quote Status
 DocType: Maintenance Visit,Completion Status,Završetak Status
 DocType: HR Settings,Enter retirement age in years,Unesite dob za odlazak u penziju u godinama
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Ciljana galerija
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Molimo odaberite skladište
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Ciljana galerija
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Molimo odaberite skladište
 DocType: Cheque Print Template,Starting location from left edge,Početna lokacija od lijevog ruba
 DocType: Item,Allow over delivery or receipt upto this percent,Dozvolite preko isporuke ili primitka upto ovu posto
 DocType: Stock Entry,STE-,ste-
 DocType: Upload Attendance,Import Attendance,Uvoz posjećenost
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Sve grupe artikala
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Sve grupe artikala
 DocType: Process Payroll,Activity Log,Dnevnik aktivnosti
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Neto dobit / gubitak
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatski nova poruka na podnošenje transakcija .
@@ -1016,7 +1033,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Projektovana kolicina
 DocType: Sales Invoice,Payment Due Date,Plaćanje Due Date
 DocType: Drug Prescription,Interval UOM,Interval UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Stavka Variant {0} već postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Stavka Variant {0} već postoji s istim atributima
+DocType: Item,Hub Publishing Details,Detalji izdavanja stanice
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;Otvaranje&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Open To Do
 DocType: Notification Control,Delivery Note Message,Otpremnica - poruka
@@ -1036,10 +1054,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: Sirovi materijal ne može biti isti kao i glavna stavka
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Ukupno Primjenjivo Optužbe na račun za prodaju Predmeti sto mora biti isti kao Ukupni porezi i naknada
 DocType: Sales Team,Incentives,Poticaji
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Registrujte se za Hub
 DocType: SMS Log,Requested Numbers,Traženi brojevi
 DocType: Production Planning Tool,Only Obtain Raw Materials,Nabavite samo sirovine
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Ocjenjivanje.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Omogućavanje &#39;Koristi se za korpa &quot;, kao košarica je omogućen i treba da postoji barem jedan poreza pravilo za Košarica"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Omogućavanje &#39;Koristi se za korpa &quot;, kao košarica je omogućen i treba da postoji barem jedan poreza pravilo za Košarica"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Plaćanje Entry {0} je povezan protiv Order {1}, proverite da li treba da se povuče kao napredak u ovom računu."
 DocType: Sales Invoice Item,Stock Details,Stock Detalji
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Vrijednost Projekta
@@ -1058,12 +1077,14 @@
 DocType: Salary Slip,Working Days,Radnih dana
 DocType: Serial No,Incoming Rate,Dolazni Stopa
 DocType: Packing Slip,Gross Weight,Bruto težina
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,Ime vaše tvrtke za koje ste postavljanje ovog sustava .
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Omogući Hub
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,Ime vaše tvrtke za koje ste postavljanje ovog sustava .
 DocType: HR Settings,Include holidays in Total no. of Working Days,Uključi odmor u ukupnom. radnih dana
 DocType: Job Applicant,Hold,Zadrži
 DocType: Employee,Date of Joining,Datum pristupa
 DocType: Naming Series,Update Series,Update serija
 DocType: Supplier Quotation,Is Subcontracted,Je podugovarati
+DocType: Restaurant Table,Minimum Seating,Minimalno sedenje
 DocType: Item Attribute,Item Attribute Values,Stavka Atributi vrijednosti
 DocType: Examination Result,Examination Result,ispitivanje Rezultat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Račun kupnje
@@ -1074,13 +1095,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},U nemogućnosti da pronađe termin u narednih {0} dana za operaciju {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materijal za podsklopove
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Prodaja Partneri i teritorija
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} mora biti aktivna
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} mora biti aktivna
 DocType: Journal Entry,Depreciation Entry,Amortizacija Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Molimo odaberite vrstu dokumenta prvi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Odustani Posjeta materijala {0} prije otkazivanja ovog održavanja pohod
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serijski Ne {0} ne pripada točki {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Potrebna Kol
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Skladišta sa postojećim transakcija se ne može pretvoriti u knjizi.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Skladišta sa postojećim transakcija se ne može pretvoriti u knjizi.
 DocType: Bank Reconciliation,Total Amount,Ukupan iznos
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet izdavaštvo
 DocType: Prescription Duration,Number,Broj
@@ -1091,7 +1112,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Sales Cjenovnik
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Ako se proveri, biće kreiran korisnik, mapiran na Pacijent. Pacijentove fakture će biti stvorene protiv ovog Korisnika. Takođe možete izabrati postojećeg kupca prilikom stvaranja Pacijenta."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Objavite za sinhronizaciju stavke
 DocType: Bank Reconciliation,Account Currency,Valuta račun
 DocType: Lab Test,Sample ID,Primer uzorka
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Navedite zaokružimo računa u Company
@@ -1100,11 +1120,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Radnik {0} nije aktivan ili ne postoji
 DocType: Fee Structure,Components,komponente
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Molimo vas da unesete imovine Kategorija tačke {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Stavka Varijante {0} ažurirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Stavka Varijante {0} ažurirani
 DocType: Quality Inspection Reading,Reading 6,Čitanje 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Ne mogu {0} {1} {2} bez ikakvih negativnih izuzetan fakture
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","da se generiše. Ako je odloženo, morate ručno promijeniti polje &quot;Ponovi na dan dana&quot; ovoga"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Ne mogu {0} {1} {2} bez ikakvih negativnih izuzetan fakture
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Narudzbine avans
-DocType: Hub Settings,Sync Now,Sync Sada
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: Kredit stavka ne može se povezati sa {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Definirajte budžet za finansijsku godinu.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Zadana banka / novčani račun će se automatski ažurirati prema POS računu, kada je ovaj mod odabran."
@@ -1116,13 +1137,13 @@
 DocType: Item,Is Purchase Item,Je dobavljivi proizvod
 DocType: Asset,Purchase Invoice,Narudzbine
 DocType: Stock Ledger Entry,Voucher Detail No,Bon Detalj Ne
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Prodaja novih Račun
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Prodaja novih Račun
 DocType: Stock Entry,Total Outgoing Value,Ukupna vrijednost Odlazni
 DocType: Physician,Appointments,Imenovanja
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Datum otvaranja i zatvaranja datum bi trebao biti u istoj fiskalnoj godini
 DocType: Lead,Request for Information,Zahtjev za informacije
 ,LeaderBoard,leaderboard
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Sync Offline Fakture
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Sync Offline Fakture
 DocType: Payment Request,Paid,Plaćen
 DocType: Program Fee,Program Fee,naknada za program
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1141,11 +1162,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Narudžbenica predmet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Neizravni dohodak
 DocType: Student Attendance Tool,Student Attendance Tool,Student Posjeta Tool
+DocType: Restaurant Menu,Price List (Auto created),Cenovnik (Automatski kreiran)
 DocType: Cheque Print Template,Date Settings,Datum Postavke
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Varijacija
 ,Company Name,Naziv preduzeća
 DocType: SMS Center,Total Message(s),Ukupno poruka ( i)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Izaberite Stavka za transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Izaberite Stavka za transfer
 DocType: Purchase Invoice,Additional Discount Percentage,Dodatni popust Procenat
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Pogledaj listu svih snimke Pomoć
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Odaberite račun šefa banke gdje je ček bio pohranjen.
@@ -1162,6 +1184,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,metar
 DocType: Workstation,Electricity Cost,Troškovi struje
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne šaljite podsjetnik za rođendan zaposlenika
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Sačuvaj postavke
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Traženi proizvodi
 DocType: Item,Inspection Criteria,Inspekcijski Kriteriji
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Prenose
 DocType: BOM Website Item,BOM Website Item,BOM Web Stavka
@@ -1178,11 +1202,11 @@
 DocType: Journal Entry,Total Amount in Words,Ukupan iznos riječima
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Došlo je do pogreške . Jedan vjerojatan razlog bi mogao biti da niste spremili obrazac. Molimo kontaktirajte support@erpnext.com ako se problem ne riješi .
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Moja košarica
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Tip narudžbe mora biti jedan od {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Tip narudžbe mora biti jedan od {0}
 DocType: Lead,Next Contact Date,Datum sledeceg kontaktiranja
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Otvaranje Kol
 DocType: Healthcare Settings,Appointment Reminder,Pamćenje imenovanja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Unesite račun za promjene Iznos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Unesite račun za promjene Iznos
 DocType: Student Batch Name,Student Batch Name,Student Batch Ime
 DocType: Consultation,Doctor,Doktor
 DocType: Holiday List,Holiday List Name,Naziv liste odmora
@@ -1190,12 +1214,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Raspored predmeta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Stock Opcije
 DocType: Journal Entry Account,Expense Claim,Rashodi polaganja
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Da li zaista želite da vratite ovaj ukinut imovine?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Količina za {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Da li zaista želite da vratite ovaj ukinut imovine?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Količina za {0}
 DocType: Leave Application,Leave Application,Ostavite aplikaciju
 DocType: Patient,Patient Relation,Relacija pacijenta
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Ostavite raspodjele alat
+DocType: Item,Hub Category to Publish,Glavna kategorija za objavljivanje
 DocType: Leave Block List,Leave Block List Dates,Ostavite datumi lista blokiranih
+DocType: Sales Invoice,Billing Address GSTIN,Adresa za obračun GSTIN
 DocType: Workstation,Net Hour Rate,Neto Hour Rate
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Sletio Trošak Kupnja Potvrda
 DocType: Company,Default Terms,Uobičajeno Uvjeti
@@ -1205,18 +1231,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Navedite {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Ukloniti stavke bez promjene u količini ili vrijednosti.
 DocType: Delivery Note,Delivery To,Dostava za
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Atribut sto je obavezno
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Atribut sto je obavezno
 DocType: Production Planning Tool,Get Sales Orders,Kreiraj narudžbe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ne može biti negativna
 DocType: Training Event,Self-Study,Samo-studiranje
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Popust
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Popust
 DocType: Asset,Total Number of Depreciations,Ukupan broj Amortizacija
 DocType: Sales Invoice Item,Rate With Margin,Stopu sa margina
 DocType: Workstation,Wages,Plata
 DocType: Task,Urgent,Hitan
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Molimo navedite važeću Row ID za redom {0} {1} u tabeli
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Nije moguće pronaći varijablu:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Molimo izaberite polje za uređivanje iz numpad-a
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Molimo izaberite polje za uređivanje iz numpad-a
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Idite na radnu površinu i početi koristiti ERPNext
 DocType: Item,Manufacturer,Proizvođač
 DocType: Landed Cost Item,Purchase Receipt Item,Kupnja Potvrda predmet
@@ -1247,8 +1273,8 @@
 DocType: GL Entry,Against,Protiv
 DocType: Item,Default Selling Cost Center,Zadani trošak prodaje
 DocType: Sales Partner,Implementation Partner,Provedba partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Poštanski broj
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Prodajnog naloga {0} je {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Poštanski broj
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Prodajnog naloga {0} je {1}
 DocType: Opportunity,Contact Info,Kontakt Informacije
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Izrada Stock unosi
 DocType: Packing Slip,Net Weight UOM,Težina mjerna jedinica
@@ -1259,6 +1285,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Nabavite Tjedno Off datumi
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Datum završetka ne može biti manja od početnog datuma
 DocType: Sales Person,Select company name first.,Prvo odaberite naziv preduzeća.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Niska do visoka
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ponude dobijene od dobavljača.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Zamijenite BOM i ažurirajte najnoviju cijenu u svim BOM
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Za {0} | {1} {2}
@@ -1277,7 +1304,7 @@
 DocType: Program Enrollment,Transportation,Prevoznik
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Invalid Atributi
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} mora biti podnesen
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Količina mora biti manji ili jednak {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Količina mora biti manji ili jednak {0}
 DocType: SMS Center,Total Characters,Ukupno Likovi
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Molimo odaberite BOM BOM u polje za Stavka {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Obrazac Račun Detalj
@@ -1292,7 +1319,7 @@
 ,Ordered Items To Be Billed,Naručeni artikli za naplatu
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Od opseg mora biti manji od u rasponu
 DocType: Global Defaults,Global Defaults,Globalne zadane postavke
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Projekt Collaboration Poziv
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Projekt Collaboration Poziv
 DocType: Salary Slip,Deductions,Odbici
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Naziv akcije
@@ -1310,13 +1337,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Predujam prodajnog računa
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Ništa se zatražiti
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Još jedan budžet rekord &#39;{0}&#39; već postoji protiv {1} &#39;{2}&#39; za fiskalnu godinu {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"' Stvarni datum početka ' ne može biti veći od stvarnog datuma završetka """
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"' Stvarni datum početka ' ne može biti veći od stvarnog datuma završetka """
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,upravljanje
 DocType: Cheque Print Template,Payer Settings,Payer Postavke
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ovo će biti dodan na Šifra za varijantu. Na primjer, ako je vaš skraćenica ""SM"", a stavka kod je ""T-SHIRT"", stavka kod varijante će biti ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Neto plaća (riječima) će biti vidljiva nakon što spremite klizne plaće.
 DocType: Purchase Invoice,Is Return,Je li povratak
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Oprez
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Oprez
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Povratak / Debit Napomena
 DocType: Price List Country,Price List Country,Cijena Lista država
 DocType: Item,UOMs,UOMs
@@ -1331,17 +1358,18 @@
 DocType: Account,Balance Sheet,Završni račun
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Troška Za Stavke sa Šifra '
 DocType: Fee Validity,Valid Till,Valid Till
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Način plaćanja nije konfiguriran. Molimo provjerite da li račun je postavljena o načinu plaćanja ili na POS profilu.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Način plaćanja nije konfiguriran. Molimo provjerite da li račun je postavljena o načinu plaćanja ili na POS profilu.
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Isti stavka ne može se upisati više puta.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Dalje računa može biti pod Grupe, ali unosa može biti protiv ne-Grupe"
 DocType: Lead,Lead,Potencijalni kupac
 DocType: Email Digest,Payables,Obveze
 DocType: Course,Course Intro,Naravno Intro
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Stock Entry {0} stvorio
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molimo da podesite serije brojeva za prisustvo preko Setup&gt; Serija numeracije
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Stock Entry {0} stvorio
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Odbijena Količina ne može unijeti u Kupovina Povratak
 ,Purchase Order Items To Be Billed,Narudžbenica Proizvodi se naplaćuje
 DocType: Purchase Invoice Item,Net Rate,Neto stopa
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Izaberite kupca
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Izaberite kupca
 DocType: Purchase Invoice Item,Purchase Invoice Item,Narudzbine stavki
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Ledger unosi i GL unosi se ponovo postavila za odabrane Kupovina Primici
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Stavku 1
@@ -1360,7 +1388,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Dupli red {0} sa istim {1}
 ,Trial Balance,Pretresno bilanca
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađen
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Postavljanje Zaposlenih
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Postavljanje Zaposlenih
 DocType: Sales Order,SO-,SO-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Odaberite prefiks prvi
 DocType: Employee,O-,O-
@@ -1372,12 +1400,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Pogledaj Ledger
 DocType: Grading Scale,Intervals,intervali
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najstarije
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Ostatak svijeta
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Ostatak svijeta
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Stavka {0} ne može imati Batch
 ,Budget Variance Report,Proračun varijance Prijavi
 DocType: Salary Slip,Gross Pay,Bruto plaća
+DocType: Item,Is Item from Hub,Je stavka iz Hub-a
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Red {0}: Aktivnost Tip je obavezno.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Isplaćene dividende
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Računovodstvo Ledger
@@ -1387,8 +1416,9 @@
 DocType: Vehicle Log,Service Detail,Servis Detail
 DocType: BOM,Item Description,Opis artikla
 DocType: Student Sibling,Student Sibling,student Polubrat
-DocType: Purchase Invoice,Is Recurring,Je li se ponavlja
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Način plaćanja
 DocType: Purchase Invoice,Supplied Items,Isporučenog pribora
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Molimo aktivirajte meni za restoran {0}
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Količina za proizvodnju
 DocType: Email Digest,New Income,novi prihod
@@ -1398,6 +1428,7 @@
 ,Student and Guardian Contact Details,Student i Guardian Kontakt detalji
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Red {0}: Za dobavljač {0}-mail adresa je potrebno za slanje e-mail
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Privremeno Otvaranje
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,View Hub
 ,Employee Leave Balance,Zaposlenik napuste balans
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Bilans konta {0} uvijek mora biti {1}
 DocType: Patient Appointment,More Info,Više informacija
@@ -1417,13 +1448,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Upozorite na novi zahtev za citate
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Narudžbenice vam pomoći planirati i pratiti na kupovinu
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Testiranje laboratorijskih testova
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Ukupne emisije / Transfer količina {0} u Industrijska Zahtjev {1} \ ne može biti veća od tražene količine {2} za Stavka {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Mali
 DocType: Employee,Employee Number,Broj radnika
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Slučaj Ne ( i) je već u uporabi . Pokušajte s predmetu broj {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Slučaj Ne ( i) je već u uporabi . Pokušajte s predmetu broj {0}
 DocType: Project,% Completed,Završen%
 ,Invoiced Amount (Exculsive Tax),Dostavljeni iznos ( Exculsive poreza )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Stavku 2
@@ -1438,11 +1469,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Neizravni troškovi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Red {0}: Količina je obvezno
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Poljoprivreda
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Vaši proizvodi ili usluge
 DocType: Special Test Items,Special Test Items,Specijalne testne jedinice
 DocType: Mode of Payment,Mode of Payment,Način plaćanja
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Sajt slika treba da bude javni datoteke ili web stranice URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Sajt slika treba da bude javni datoteke ili web stranice URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,To jekorijen stavka grupa i ne može se mijenjati .
@@ -1450,24 +1481,23 @@
 DocType: Vehicle,Fuel UOM,gorivo UOM
 DocType: Warehouse,Warehouse Contact Info,Kontakt informacije skladišta
 DocType: Payment Entry,Write Off Difference Amount,Otpis Razlika Iznos
-DocType: Purchase Invoice,Recurring Type,Ponavljajući Tip
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent",{0}: e-mail nije poslat jer e-mail zaposlenog nije pronađen
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent",{0}: e-mail nije poslat jer e-mail zaposlenog nije pronađen
 DocType: Item,Foreign Trade Details,Vanjske trgovine Detalji
+,Assessment Plan Status,Status plana procjene
 DocType: Email Digest,Annual Income,Godišnji prihod
 DocType: Serial No,Serial No Details,Serijski nema podataka
 DocType: Purchase Invoice Item,Item Tax Rate,Poreska stopa artikla
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,Izaberite lekar i datum
 DocType: Student Group Student,Group Roll Number,Grupa Roll Broj
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, samo kredit računa može biti povezan protiv drugog ulaska debit"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Ukupno sve težine zadatka treba da bude 1. Molimo prilagodite težine svih zadataka projekta u skladu s tim
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Ukupno sve težine zadatka treba da bude 1. Molimo prilagodite težine svih zadataka projekta u skladu s tim
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Stavka {0} mora bitisklopljen ugovor artikla
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapitalni oprema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cijene Pravilo prvo se bira na temelju 'Nanesite na' terenu, koji može biti točka, točka Grupa ili Brand."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Molimo prvo postavite kod za stavku
-DocType: Hub Settings,Seller Website,Prodavač Website
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Molimo prvo postavite kod za stavku
 DocType: Item,ITEM-,Artikl-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Ukupno dodijeljeno postotak za prodajni tim bi trebao biti 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Ukupno dodijeljeno postotak za prodajni tim bi trebao biti 100
 DocType: Sales Invoice Item,Edit Description,Uredi opis
 DocType: Antibiotic,Antibiotic,Antibiotik
 ,Team Updates,Team Updates
@@ -1488,12 +1518,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Ukupno (Company valuta)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Serijski broj {0} ušao više puta
 DocType: Depreciation Schedule,Journal Entry,Časopis Stupanje
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} stavke u tijeku
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} stavke u tijeku
 DocType: Workstation,Workstation Name,Ime Workstation
 DocType: Grading Scale Interval,Grade Code,Grade Kod
 DocType: POS Item Group,POS Item Group,POS Stavka Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} ne pripada Stavka {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} ne pripada Stavka {1}
 DocType: Sales Partner,Target Distribution,Ciljana Distribucija
 DocType: Salary Slip,Bank Account No.,Žiro račun broj
 DocType: Naming Series,This is the number of the last created transaction with this prefix,To je broj zadnjeg stvorio transakcije s ovim prefiksom
@@ -1509,10 +1539,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Zahtjev za ponudu dobavljač
 DocType: Healthcare Settings,Registration Message,Poruka za upis
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Hardver
-DocType: Sales Order,Recurring Upto,Ponavljajući Upto
 DocType: Prescription Dosage,Prescription Dosage,Dosage na recept
 DocType: Attendance,HR Manager,Šef ljudskih resursa
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Molimo odaberite poduzeća
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Molimo odaberite poduzeća
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Privilege dopust
 DocType: Purchase Invoice,Supplier Invoice Date,Dobavljač Datum fakture
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,po
@@ -1528,10 +1557,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Preklapanje uvjeti nalaze između :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Protiv Journal Entry {0} je već prilagođen protiv nekih drugih vaučer
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Ukupna vrijednost Order
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Hrana
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Hrana
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Starenje Range 3
 DocType: Maintenance Schedule Item,No of Visits,Bez pregleda
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Održavanje Raspored {0} postoji protiv {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Da li želite objaviti svoje stavke u Hub?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,upisa student
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta zatvaranja računa mora biti {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Zbir bodova za sve ciljeve bi trebao biti 100. To je {0}
@@ -1542,9 +1572,9 @@
 DocType: Authorization Rule,Average Discount,Prosječni popust
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Komunalne usluge
-DocType: Purchase Invoice Item,Accounting,Računovodstvo
+DocType: POS Profile,Accounting,Računovodstvo
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Molimo odaberite serija za dozirana stavku
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Molimo odaberite serija za dozirana stavku
 DocType: Asset,Depreciation Schedules,Amortizacija rasporedi
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Period aplikacija ne može biti razdoblje raspodjele izvan odsustva
 DocType: Activity Cost,Projects,Projekti
@@ -1560,7 +1590,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',"Status Odobrenje mora biti ""Odobreno"" ili "" Odbijeno """
 DocType: Physician,Contacts and Address,Kontakti i adresa
 DocType: Purchase Invoice,Contact Person,Kontakt osoba
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',""" Očekivani datum početka ' ne može biti veći od očekivanog datuma završetka"""
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',""" Očekivani datum početka ' ne može biti veći od očekivanog datuma završetka"""
 DocType: Course Scheduling Tool,Course End Date,Naravno Završni datum
 DocType: Holiday List,Holidays,Praznici
 DocType: Sales Order Item,Planned Quantity,Planirana količina
@@ -1568,10 +1598,11 @@
 DocType: Item,Maintain Stock,Održavati Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Stock unosi već stvorene za proizvodnju Order
 DocType: Employee,Prefered Email,Prefered mail
+DocType: Student Admission,Eligibility and Details,Prihvatljivost i Detalji
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Neto promjena u fiksnoj Asset
 DocType: Leave Control Panel,Leave blank if considered for all designations,Ostavite prazno ako smatra za sve oznake
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Od datuma i vremena
 DocType: Email Digest,For Company,Za tvrtke
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Dnevni pregled komunikacije
@@ -1579,19 +1610,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Dobavljač Scorecard Scoring Variable
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Iznos nabavke
 DocType: Sales Invoice,Shipping Address Name,Dostava adresa Ime
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Šifarnik konta
 DocType: Material Request,Terms and Conditions Content,Uvjeti sadržaj
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,ne može biti veća od 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Stavka {0} nijestock Stavka
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Stavka {0} nijestock Stavka
 DocType: Maintenance Visit,Unscheduled,Neplanski
 DocType: Employee,Owned,U vlasništvu
 DocType: Salary Detail,Depends on Leave Without Pay,Ovisi o neplaćeni odmor
 DocType: Pricing Rule,"Higher the number, higher the priority","Veći broj, veći prioritet"
 ,Purchase Invoice Trends,Trendovi kupnje proizvoda
 DocType: Employee,Better Prospects,Bolji izgledi
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Row # {0}: Odgovor batch {1} ima samo {2} Količina. Molimo odaberite neku drugu seriju koja ima {3} Količina dostupna ili podijeliti red u više redova, za isporuku / pitanje iz više serija"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Row # {0}: Odgovor batch {1} ima samo {2} Količina. Molimo odaberite neku drugu seriju koja ima {3} Količina dostupna ili podijeliti red u više redova, za isporuku / pitanje iz više serija"
 DocType: Vehicle,License Plate,registarska tablica
 DocType: Appraisal,Goals,Golovi
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Izaberite POS profil
 DocType: Warranty Claim,Warranty / AMC Status,Jamstveni / AMC Status
 ,Accounts Browser,Šifrarnik konta
 DocType: Payment Entry Reference,Payment Entry Reference,Plaćanje Entry Reference
@@ -1610,7 +1641,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Zaposleni ne može prijaviti samog sebe.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ako je račun zamrznut , unosi dopušteno ograničene korisnike ."
 DocType: Email Digest,Bank Balance,Banka Balance
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Knjiženju za {0}: {1} može se vršiti samo u valuti: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Knjiženju za {0}: {1} može se vršiti samo u valuti: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil posla , kvalifikacijama i sl."
 DocType: Journal Entry Account,Account Balance,Bilans konta
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Porez pravilo za transakcije.
@@ -1619,8 +1650,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Ukupno Porezi i naknade (Društvo valuta)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Pokaži Neriješeni fiskalnu godinu P &amp; L salda
 DocType: Lab Test Template,Collection Details,Detalji o kolekciji
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","izaberite cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date iz tabConsultation ct, `tabLab Prescription` cp gdje ct.patient = &#39;{0}&#39; i cp.parent = ct. ime i cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Konto transporta
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Račun {2} je neaktivan
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Make Prodajni nalozi će vam pomoći da planirate svoj rad i dostaviti na vreme
@@ -1637,7 +1666,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Odreskom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,najam ureda
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Postavke Setup SMS gateway
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Uvoz nije uspio!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Uvoz nije uspio!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Još nema unijete adrese.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Radno vrijeme
 DocType: Vital Signs,Blood Pressure,Krvni pritisak
@@ -1662,7 +1691,7 @@
 DocType: Sales Invoice,Source,Izvor
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Show zatvoren
 DocType: Leave Type,Is Leave Without Pay,Ostavi se bez plate
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Asset Kategorija je obavezno za Fixed stavku imovine
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Asset Kategorija je obavezno za Fixed stavku imovine
 DocType: Fee Validity,Fee Validity,Vrijednost naknade
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nisu pronađeni u tablici plaćanja
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ovo {0} sukobe sa {1} za {2} {3}
@@ -1683,8 +1712,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Napravi Leads
 DocType: Maintenance Schedule,Schedules,Rasporedi
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,POS profil je potreban za korištenje Point-of-Sale
 DocType: Purchase Invoice Item,Net Amount,Neto iznos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} nije dostavljen tako akciju nije moguće dovršiti
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} nije dostavljen tako akciju nije moguće dovršiti
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM detalji - broj
 DocType: Landed Cost Voucher,Additional Charges,dodatnih troškova
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatni popust Iznos (Company valuta)
@@ -1693,7 +1723,7 @@
 ,Support Hour Distribution,Podrška Distribucija sata
 DocType: Maintenance Visit,Maintenance Visit,Posjeta za odrzavanje
 DocType: Student,Leaving Certificate Number,Maturom Broj
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Imenovanje je otkazano, molimo pregledajte i otkažite fakturu {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Imenovanje je otkazano, molimo pregledajte i otkažite fakturu {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Dostupno Batch Količina na Skladište
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Update Print Format
 DocType: Landed Cost Voucher,Landed Cost Help,Sleteo Cost Pomoć
@@ -1716,8 +1746,8 @@
 DocType: Patient,Tobacco Past Use,Korišćenje prošlosti duvana
 DocType: Sales Invoice Item,Brand Name,Naziv brenda
 DocType: Purchase Receipt,Transporter Details,Transporter Detalji
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Korisnik {0} je već dodeljen lekaru {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Uobičajeno skladište je potreban za izabranu stavku
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Korisnik {0} je već dodeljen lekaru {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Uobičajeno skladište je potreban za izabranu stavku
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Kutija
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,moguće dobavljač
 DocType: Budget,Monthly Distribution,Mjesečni Distribucija
@@ -1727,7 +1757,7 @@
 DocType: Sales Partner,Sales Partner Target,Prodaja partner Target
 DocType: Loan Type,Maximum Loan Amount,Maksimalni iznos kredita
 DocType: Pricing Rule,Pricing Rule,cijene Pravilo
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Duplikat broj roll za studentske {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Duplikat broj roll za studentske {0}
 DocType: Budget,Action if Annual Budget Exceeded,Akcija ako Godišnji budžet Exceeded
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Materijal Zahtjev za narudžbenice
 DocType: Shopping Cart Settings,Payment Success URL,Plaćanje Uspjeh URL
@@ -1744,7 +1774,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} se mora pojaviti samo jednom
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nije dozvoljeno da se više tranfer {0} od {1} protiv narudžbenice {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Lišće Dodijeljeni uspješno za {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nema stavki za omot
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Nema stavki za omot
 DocType: Shipping Rule Condition,From Value,Od Vrijednost
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Proizvodnja Količina je obvezno
 DocType: Employee Loan,Repayment Method,otplata Način
@@ -1758,6 +1788,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Stock Obveze
 DocType: Purchase Invoice,Supplier Warehouse,Dobavljač galerija
 DocType: Opportunity,Contact Mobile No,Kontak GSM
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Izaberite kompaniju
 ,Material Requests for which Supplier Quotations are not created,Materijalni Zahtjevi za koje Supplier Citati nisu stvorene
 DocType: Student Group,Set 0 for no limit,Set 0 za no limit
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dan (e) na koje se prijavljujete za odmor su praznici. Vi ne trebate podnijeti zahtjev za dozvolu.
@@ -1767,24 +1798,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Make ponudu
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Ostali izveštaji
 DocType: Dependent Task,Dependent Task,Zavisna Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Ostavite tipa {0} ne može biti duži od {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Pokušajte planiraju operacije za X dana unaprijed.
 DocType: HR Settings,Stop Birthday Reminders,Zaustavi Rođendan Podsjetnici
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Molimo podesite Uobičajeno plaće plaćaju račun poduzeća {0}
 DocType: SMS Center,Receiver List,Lista primalaca
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Traži Stavka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Traži Stavka
 DocType: Patient Appointment,Referring Physician,Referentni lekar
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Consumed Iznos
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Neto promjena u gotovini
 DocType: Assessment Plan,Grading Scale,Pravilo Scale
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,već završena
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,već završena
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock u ruci
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Plaćanje Zahtjev već postoji {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Troškovi Izdata Predmeti
 DocType: Physician,Hospital,Bolnica
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Količina ne smije biti više od {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Količina ne smije biti više od {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Prethodne finansijske godine nije zatvoren
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Starost (dani)
 DocType: Quotation Item,Quotation Item,Artikl iz ponude
@@ -1795,8 +1826,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Dobavljač Vrsta majstor .
 DocType: Purchase Order Item,Supplier Part Number,Dobavljač Broj dijela
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Stopa pretvorbe ne može biti 0 ili 1
-DocType: Sales Invoice,Reference Document,referentni dokument
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} je otkazan ili zaustavljen
+DocType: Subscription,Reference Document,referentni dokument
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} je otkazan ili zaustavljen
 DocType: Accounts Settings,Credit Controller,Kreditne kontroler
 DocType: Delivery Note,Vehicle Dispatch Date,Vozilo Dispatch Datum
 DocType: Healthcare Settings,Default Medical Code Standard,Standardni medicinski kodni standard
@@ -1805,6 +1836,7 @@
 DocType: Company,Default Payable Account,Uobičajeno računa se plaća
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Postavke za online kupovinu košaricu poput shipping pravila, cjenik i sl"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Fakturisana
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Sortiraj po cijeni ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Rezervirano Kol
 DocType: Party Account,Party Account,Party račun
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Ljudski resursi
@@ -1816,13 +1848,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Make isplata Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Red {0}: Advance protiv Dobavljač mora biti debitne
 DocType: Company,Default Values,Default vrijednosti
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frekvencija} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Frekvencija} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Ukupan iznos nadoknađeni
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ovo se zasniva na rezanje protiv ovog vozila. Pogledajte vremenski okvir ispod za detalje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Protiv Dobavljač fakture {0} od {1}
 DocType: Customer,Default Price List,Zadani cjenik
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,rekord Asset pokret {0} stvorio
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ne možete izbrisati fiskalnu godinu {0}. Fiskalna godina {0} je postavljen kao zadani u Globalne postavke
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Kupac sa istim imenom već postoji
 DocType: Journal Entry,Entry Type,Entry Tip
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Nema plana procjene povezani sa ovom grupom procjena
 ,Customer Credit Balance,Customer Credit Balance
@@ -1832,7 +1865,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,cijene
 DocType: Quotation,Term Details,Oročeni Detalji
 DocType: Project,Total Sales Cost (via Sales Order),Ukupna prodaja troškova (putem prodajnog naloga)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Ne može upisati više od {0} studenata za ovu grupa studenata.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Ne može upisati više od {0} studenata za ovu grupa studenata.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead Count
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} mora biti veći od 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapacitet planiranje (Dana)
@@ -1848,9 +1881,11 @@
 DocType: Lab Test,Technician Name,Ime tehničara
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Odvajanje Plaćanje o otkazivanju fakture
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Trenutno čitanje Odometar ušli bi trebao biti veći od početnog kilometraže vozila {0}
+DocType: Restaurant Reservation,No Show,Ne Show
 DocType: Shipping Rule Country,Shipping Rule Country,Dostava Pravilo Country
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Ostavite i posjećenost
 DocType: Maintenance Visit,Partially Completed,Djelomično Završeni
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Umerena osetljivost
 DocType: Leave Type,Include holidays within leaves as leaves,Uključiti praznika u roku od lišća što je lišće
 DocType: Sales Invoice,Packed Items,Pakirano Predmeti
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garantni rok protiv Serial No.
@@ -1867,13 +1902,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Uplaćeni iznos (poduzeća Valuta)
 DocType: Purchase Invoice,Additional Discount,Dodatni popust
 DocType: Selling Settings,Selling Settings,Podešavanja prodaje
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Potvrdi akciju
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online aukcije
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Navedite ili količini ili vrednovanja Ocijenite ili oboje
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,ispunjenje
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Pogledaj u košaricu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Troškovi marketinga
 ,Item Shortage Report,Nedostatak izvješća za artikal
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spominje, \n Navedite ""Težina UOM"" previše"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spominje, \n Navedite ""Težina UOM"" previše"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materijal Zahtjev se koristi da bi se ova Stock unos
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Sljedeća Amortizacija Datum je obavezan za nove imovine
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Poseban grupe na osnovu naravno za svaku seriju
@@ -1885,12 +1921,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Provjerite knjiženje za svaki burzi pokreta
 DocType: Leave Allocation,Total Leaves Allocated,Ukupno Lišće Dodijeljeni
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Skladište potrebno na red No {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Molimo vas da unesete važeću finansijsku godinu datume početka i završetka
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Molimo vas da unesete važeću finansijsku godinu datume početka i završetka
 DocType: Employee,Date Of Retirement,Datum odlaska u mirovinu
 DocType: Upload Attendance,Get Template,Kreiraj predložak
 DocType: Material Request,Transferred,prebačen
 DocType: Vehicle,Doors,vrata
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext Setup Complete!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Prikupiti naknadu za registraciju pacijenta
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,porez Raspad
@@ -1909,36 +1945,36 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ako ova stavka ima varijante, onda ne može biti izabran u prodaji naloge itd"
 DocType: Lead,Next Contact By,Sledeci put kontaktirace ga
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Količina potrebna za točke {0} je u redu {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Količina potrebna za točke {0} je u redu {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Skladište {0} ne može biti izbrisano ako na njemu ima artikal {1}
 DocType: Quotation,Order Type,Vrsta narudžbe
-DocType: Purchase Invoice,Notification Email Address,Obavijest E-mail adresa
 ,Item-wise Sales Register,Stavka-mudri prodaja registar
 DocType: Asset,Gross Purchase Amount,Bruto Kupovina Iznos
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Početni balansi
 DocType: Asset,Depreciation Method,Način Amortizacija
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Offline
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je li ovo pristojba uključena u osnovne stope?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Ukupna ciljna
 DocType: Job Applicant,Applicant for a Job,Kandidat za posao
 DocType: Production Plan Material Request,Production Plan Material Request,Proizvodni plan materijala Upit
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Nema Radni nalozi stvoreni
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Nema Radni nalozi stvoreni
 DocType: Stock Reconciliation,Reconciliation JSON,Pomirenje JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Previše stupovi. Izvesti izvješće i ispisati pomoću aplikacije za proračunske tablice.
 DocType: Purchase Invoice Item,Batch No,Broj serije
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Zahtjev za ponudu: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Dopustite više prodajnih naloga protiv narudžbenicu Kupca
 DocType: Student Group Instructor,Student Group Instructor,Student Group Instruktor
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Nema
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Glavni
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Glavni
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Varijanta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Postavite prefiks za numeriranje niza na svoje transakcije
 DocType: Employee Attendance Tool,Employees HTML,Zaposleni HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Uobičajeno BOM ({0}) mora biti aktivna za ovu stavku ili njegove predložak
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Uobičajeno BOM ({0}) mora biti aktivna za ovu stavku ili njegove predložak
 DocType: Employee,Leave Encashed?,Ostavite Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Prilika iz polja je obavezna
 DocType: Email Digest,Annual Expenses,Godišnji troškovi
 DocType: Item,Variants,Varijante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Provjerite narudžbenice
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Provjerite narudžbenice
 DocType: SMS Center,Send To,Pošalji na adresu
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Izdvojena iznosu
@@ -1954,6 +1990,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Student Group Strength
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Protiv Journal Entry {0} nema premca {1} unos
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Appraisals
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Događaji obuke
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Dupli serijski broj je unešen za artikl {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,A uvjet za Shipping Pravilo
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Molimo unesite
@@ -1963,7 +2000,7 @@
 DocType: Sales Order,To Deliver and Bill,Dostaviti i Bill
 DocType: Student Group,Instructors,instruktori
 DocType: GL Entry,Credit Amount in Account Currency,Iznos kredita u računu valuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} mora biti dostavljena
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} mora biti dostavljena
 DocType: Authorization Control,Authorization Control,Odobrenje kontrole
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Odbijena Skladište je obavezno protiv odbijen Stavka {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Plaćanje
@@ -1982,11 +2019,11 @@
 DocType: Quotation Item,Actual Qty,Stvarna kol
 DocType: Sales Invoice Item,References,Reference
 DocType: Quality Inspection Reading,Reading 10,Čitanje 10
-DocType: Hub Settings,Hub Node,Hub Node
+DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Unijeli duple stavke . Molimo ispraviti i pokušajte ponovno .
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Pomoćnik
 DocType: Asset Movement,Asset Movement,Asset pokret
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,novi Košarica
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,novi Košarica
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Stavka {0} nijeserijaliziranom predmeta
 DocType: SMS Center,Create Receiver List,Kreiraj listu primalaca
 DocType: Vehicle,Wheels,Wheels
@@ -2000,15 +2037,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikacije
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Ukazuje da je paket je dio ove isporuke (samo nacrti)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Napravite unos Plaćanje
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Količina za točku {0} mora biti manji od {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Količina za točku {0} mora biti manji od {1}
 ,Sales Invoice Trends,Trendovi prodajnih računa
 DocType: Leave Application,Apply / Approve Leaves,Nanesite / Odobri Leaves
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Za
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Za
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Može se odnositi red samo akotip zadužen je "" Na prethodni red Iznos 'ili' prethodnog retka Total '"
 DocType: Sales Order Item,Delivery Warehouse,Isporuka Skladište
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Tree financijskih troškova centara.
 DocType: Serial No,Delivery Document No,Dokument isporuke br
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Molimo podesite &#39;dobitak / gubitak računa na Asset Odlaganje&#39; u kompaniji {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Molimo podesite &#39;dobitak / gubitak računa na Asset Odlaganje&#39; u kompaniji {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Get Predmeti iz otkupa Primici
 DocType: Serial No,Creation Date,Datum stvaranja
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Artikal {0} se pojavljuje više puta u cjeniku {1}
@@ -2019,11 +2056,12 @@
 DocType: Student,Student Mobile Number,Student Broj mobilnog
 DocType: Item,Has Variants,Ima Varijante
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Update Response
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Vi ste već odabrane stavke iz {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Vi ste već odabrane stavke iz {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naziv Mjesečni distribucije
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID je obavezno
 DocType: Sales Person,Parent Sales Person,Roditelj Prodaja Osoba
-DocType: Purchase Invoice,Recurring Invoice,Ponavljajući Račun
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Visoka do niska
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Prvo izaberite program
 DocType: Patient Appointment,Patient Age,Pacijentsko doba
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Upravljanje projektima
 DocType: Supplier,Supplier of Goods or Services.,Dobavljač robe ili usluga.
@@ -2031,8 +2069,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Podrazumevani računi potraživanja koji će se koristiti ako nisu postavljeni u Pacijentu da rezervišu Konsultacije.
 DocType: Vehicle Log,Fuel Price,Cena goriva
 DocType: Budget,Budget,Budžet
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Set Open
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Osnovnih sredstava Stavka mora biti ne-stock stavku.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Set Open
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Osnovnih sredstava Stavka mora biti ne-stock stavku.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budžet se ne može dodijeliti protiv {0}, jer to nije prihod ili rashod račun"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Ostvareni
 DocType: Student Admission,Application Form Route,Obrazac za prijavu Route
@@ -2046,12 +2084,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Stavka {0} nije dobro postavljen za gospodara , serijski brojevi Provjera"
 DocType: Maintenance Visit,Maintenance Time,Održavanje Vrijeme
 ,Amount to Deliver,Iznose Deliver
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Ista stavka je uneta više puta. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Termin Ozljede Datum ne može biti ranije od godine Početak Datum akademske godine za koji je vezana pojam (akademska godina {}). Molimo ispravite datume i pokušajte ponovo.
 DocType: Guardian,Guardian Interests,Guardian Interesi
 DocType: Naming Series,Current Value,Trenutna vrijednost
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Višestruki fiskalne godine postoje za datum {0}. Molimo podesite kompanije u fiskalnoj godini
 DocType: School Settings,Instructor Records to be created by,Instruktorske zapise koje kreira
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} kreirao
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} kreirao
 DocType: Delivery Note Item,Against Sales Order,Protiv prodajnog naloga
 ,Serial No Status,Serijski Bez Status
 DocType: Payment Entry Reference,Outstanding,izvanredan
@@ -2062,10 +2101,10 @@
  mora biti veći ili jednak {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,To se temelji na zalihama pokreta. Vidi {0} za detalje
 DocType: Pricing Rule,Selling,Prodaja
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Broj {0} {1} oduzeti protiv {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Broj {0} {1} oduzeti protiv {2}
 DocType: Employee,Salary Information,Plaća informacije
 DocType: Sales Person,Name and Employee ID,Ime i ID zaposlenika
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
 DocType: Website Item Group,Website Item Group,Web stranica artikla Grupa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Carine i porezi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Unesite Referentni datum
@@ -2091,7 +2130,7 @@
 DocType: Issue,Resolution Details,Detalji o rjesenju problema
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,izdvajanja
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Kriterij prihvaćanja
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Molimo unesite materijala Zahtjevi u gornjoj tablici
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Molimo unesite materijala Zahtjevi u gornjoj tablici
 DocType: Item Attribute,Attribute Name,Atributi Ime
 DocType: BOM,Show In Website,Pokaži Na web stranice
 DocType: Shopping Cart Settings,Show Quantity in Website,Pokaži Količina u Web stranice
@@ -2100,7 +2139,7 @@
 DocType: Item Reorder,Check in (group),Check in (grupa)
 ,Qty to Order,Količina za narudžbu
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Glava račun pod odgovornošću ili Equity, u kojoj će se rezervirati Dobit / Gubitak"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Gantogram svih zadataka.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Gantogram svih zadataka.
 DocType: Opportunity,Mins to First Response,Min First Response
 DocType: Pricing Rule,Margin Type,Margina Tip
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} sati
@@ -2121,35 +2160,35 @@
 DocType: Patient,Surgical History,Hirurška istorija
 DocType: Employee,Resignation Letter Date,Ostavka Pismo Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Pravilnik o određivanju cijena dodatno se filtrira na temelju količine.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Molimo vas da postavite datum ulaska za zaposlenog {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Molimo vas da postavite datum ulaska za zaposlenog {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Ukupno Billing Iznos (preko Time Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ponovite Customer prihoda
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) mora imati rolu 'odobravanje troskova'
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Par
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Odaberite BOM i količina za proizvodnju
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Odaberite BOM i količina za proizvodnju
 DocType: Asset,Depreciation Schedule,Amortizacija Raspored
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Prodajni partner adrese i kontakti
 DocType: Bank Reconciliation Detail,Against Account,Protiv računa
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Poludnevni datum treba biti između Od datuma i Do datuma
 DocType: Maintenance Schedule Detail,Actual Date,Stvarni datum
 DocType: Item,Has Batch No,Je Hrpa Ne
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Godišnji Billing: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Godišnji Billing: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Poreska dobara i usluga (PDV Indija)
 DocType: Delivery Note,Excise Page Number,Trošarina Broj stranice
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Kompanija, Od datuma i do danas je obavezno"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Izlazite iz konsultacije
 DocType: Asset,Purchase Date,Datum kupovine
 DocType: Employee,Personal Details,Osobni podaci
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Molimo podesite &#39;Asset Amortizacija troškova Center&#39; u kompaniji {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Molimo podesite &#39;Asset Amortizacija troškova Center&#39; u kompaniji {0}
 ,Maintenance Schedules,Rasporedi održavanja
 DocType: Task,Actual End Date (via Time Sheet),Stvarni Završni datum (preko Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Broj {0} {1} protiv {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Broj {0} {1} protiv {2} {3}
 ,Quotation Trends,Trendovi ponude
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Stavka artikla se ne spominje u master artiklu za artikal {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Debit na račun mora biti potraživanja računa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Debit na račun mora biti potraživanja računa
 DocType: Shipping Rule Condition,Shipping Amount,Iznos transporta
 DocType: Supplier Scorecard Period,Period Score,Ocena perioda
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Dodaj Kupci
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Dodaj Kupci
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Iznos na čekanju
 DocType: Lab Test Template,Special,Poseban
 DocType: Purchase Invoice Item,Conversion Factor,Konverzijski faktor
@@ -2157,13 +2196,14 @@
 ,Vehicle Expenses,Troškovi vozila
 DocType: Serial No,Invoice Details,Račun Detalji
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Očekivana vrijednost nakon koristan život mora biti veći ili jednak {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Počnite
+DocType: Hub Category,Hub Category,Glavna kategorija
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Broj vozila
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,Datum na koji se ponavlja faktura će se zaustaviti
 DocType: Employee Loan,Loan Amount,Iznos kredita
 DocType: Program Enrollment,Self-Driving Vehicle,Self-vožnje vozila
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Standing Scorecard Standing
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Red {0}: Bill materijala nije pronađen za stavku {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Red {0}: Bill materijala nije pronađen za stavku {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Ukupno izdvojene lišće {0} ne može biti manja od već odobrenih lišće {1} za period
 DocType: Journal Entry,Accounts Receivable,Konto potraživanja
 ,Supplier-Wise Sales Analytics,Supplier -mudar prodaje Analytics
@@ -2174,7 +2214,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Roditelja za golf (Ostavite prazno, ako to nije dio roditelja naravno)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Ostavite prazno ako smatra za sve tipove zaposlenika
 DocType: Landed Cost Voucher,Distribute Charges Based On,Podijelite Optužbe na osnovu
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,Podešavanja ljudskih resursa
 DocType: Salary Slip,net pay info,neto plata info
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Ova vrijednost se ažurira na listi podrazumevanih prodajnih cijena.
@@ -2185,7 +2225,7 @@
 DocType: Patient,B Positive,B Pozitivan
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Količina mora biti 1, kao stavka je osnovno sredstvo. Molimo koristite posebnom redu za više kom."
 DocType: Leave Block List Allow,Leave Block List Allow,Ostavite Blok Popis Dopustite
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Skraćeno ne može biti prazan ili prostora
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Skraćeno ne može biti prazan ili prostora
 DocType: Patient Medical Record,Patient Medical Record,Medicinski zapis pacijenta
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Grupa Non-grupa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sportovi
@@ -2201,9 +2241,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Nije moguće pronaći kurs za {0} do {1} za ključni datum {2}. Molimo vas da ručno stvoriti Mjenjačnica rekord
 DocType: POS Profile,Price List,Cjenik
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} je podrazumijevana Fiskalna godina . Osvježite svoj browserda bi se izmjene primijenile.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Trošak potraživanja
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Trošak potraživanja
 DocType: Issue,Support,Podrška
 ,BOM Search,BOM pretraga
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Objavite &quot;Na lageru&quot; ili &quot;Nema na lageru&quot; na Hub-u na osnovu raspoloživih zaliha u ovom skladištu.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Zatvaranje (Otvaranje + Ukupno)
 DocType: Vehicle,Fuel Type,Vrsta goriva
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Navedite valuta u Company
@@ -2215,16 +2256,16 @@
 DocType: Healthcare Settings,Remind Before,Podsjeti prije
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Faktor UOM pretvorbe je potrebno u redu {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Referenca Vrsta dokumenta mora biti jedan od prodajnog naloga, prodaje fakture ili Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Referenca Vrsta dokumenta mora biti jedan od prodajnog naloga, prodaje fakture ili Journal Entry"
 DocType: Salary Component,Deduction,Odbitak
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Red {0}: Od vremena i do vremena je obavezno.
 DocType: Stock Reconciliation Item,Amount Difference,iznos Razlika
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Stavka Cijena je dodao za {0} u {1} Cjenik
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Stavka Cijena je dodao za {0} u {1} Cjenik
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Unesite zaposlenih Id ove prodaje osoba
 DocType: Territory,Classification of Customers by region,Klasifikacija Kupci po regiji
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Razlika iznos mora biti nula
 DocType: Project,Gross Margin,Bruto marža
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Unesite Proizvodnja predmeta prvi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Unesite Proizvodnja predmeta prvi
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Izračunato Banka bilans
 DocType: Normal Test Template,Normal Test Template,Normalni testni šablon
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,invaliditetom korisnika
@@ -2234,21 +2275,22 @@
 DocType: Salary Slip,Total Deduction,Ukupno Odbitak
 ,Production Analytics,proizvodnja Analytics
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Ovo se zasniva na transakcijama protiv ovog pacijenta. Za detalje pogledajte vremenski okvir ispod
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Troškova Ažurirano
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Troškova Ažurirano
 DocType: Employee,Date of Birth,Datum rođenja
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Artikal {0} je već vraćen
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiskalna godina ** predstavlja finansijske godine. Svi računovodstvene stavke i drugih većih transakcija se prate protiv ** Fiskalna godina **.
 DocType: Opportunity,Customer / Lead Address,Kupac / Adresa Lead-a
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Podešavanje Scorecard-a
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL certifikat o prilogu {0}
-DocType: Student Admission,Eligibility,kvalifikovanost
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Naziv plana procene
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL certifikat o prilogu {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Leads biste se lakše poslovanje, dodati sve svoje kontakte i još kao vodi"
 DocType: Production Order Operation,Actual Operation Time,Stvarni Operation Time
 DocType: Authorization Rule,Applicable To (User),Odnosi se na (Upute)
 DocType: Purchase Taxes and Charges,Deduct,Odbiti
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Opis posla
 DocType: Student Applicant,Applied,Applied
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Ponovno otvorena
 DocType: Sales Invoice Item,Qty as per Stock UOM,Količina po burzi UOM
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 ime
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specijalni znakovi osim ""-"" ""."", ""#"", i ""/"" nije dozvoljeno u imenovanju serije"
@@ -2260,7 +2302,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Proizvodnja Manager
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serijski Ne {0} je pod jamstvom upto {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Split otpremnici u paketima.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Pošiljke
+apps/erpnext/erpnext/hooks.py +107,Shipments,Pošiljke
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Ukupan dodijeljeni iznos (Company Valuta)
 DocType: Purchase Order Item,To be delivered to customer,Dostaviti kupcu
 DocType: BOM,Scrap Material Cost,Otpadnog materijala troškova
@@ -2282,8 +2324,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Postavke varijante postavki
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Odaberite preduzeće...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Ostavite prazno ako smatra za sve odjele
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Vrste zapošljavanja ( trajni ugovor , pripravnik i sl. ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} je obavezno za tu stavku {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Vrste zapošljavanja ( trajni ugovor , pripravnik i sl. ) ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} je obavezno za tu stavku {1}
 DocType: Process Payroll,Fortnightly,četrnaestodnevni
 DocType: Currency Exchange,From Currency,Od novca
 DocType: Vital Signs,Weight (In Kilogram),Težina (u kilogramu)
@@ -2307,7 +2349,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Molimo kliknite na ""Generiraj raspored ' kako bi dobili raspored"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,"Bilo je grešaka, dok brisanja sljedeće raspored:"
 DocType: Bin,Ordered Quantity,Naručena količina
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","na primjer "" Izgraditi alate za graditelje """
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","na primjer "" Izgraditi alate za graditelje """
 DocType: Grading Scale,Grading Scale Intervals,Pravilo Scale Intervali
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Računovodstvo Ulaz za {2} može se vršiti samo u valuti: {3}
 DocType: Production Order,In Process,U procesu
@@ -2330,11 +2372,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Uz plaćanje poreza
 DocType: Expense Claim Detail,Expense Claim Detail,Rashodi Zahtjev Detalj
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Tri primjerka ZA SUPPLIER
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Molimo odaberite ispravan račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Molimo odaberite ispravan račun
 DocType: Item,Weight UOM,Težina UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Plaća Struktura zaposlenih
 DocType: Patient,Blood Group,Krvna grupa
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Čekanje
 DocType: Course,Course Name,Naziv predmeta
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Korisnici koji može odobriti odsustvo aplikacije određenu zaposlenog
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,uredske opreme
@@ -2353,7 +2394,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Cijene neće biti prikazan ako nije postavljena Cjenik
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Molimo navedite zemlju za ovaj Dostava pravilo ili provjeriti dostavom diljem svijeta
 DocType: Stock Entry,Total Incoming Value,Ukupna vrijednost Incoming
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,To je potrebno Debit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,To je potrebno Debit
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomoći pratiti vremena, troškova i naplate za aktivnostima obavlja svoj tim"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kupoprodajna cijena List
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Šabloni varijabli indeksa dobavljača.
@@ -2363,7 +2404,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Pomirenje plaćanja
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Odaberite incharge ime osobe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,tehnologija
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Ukupno Neplaćeni: {0}
+DocType: Hub Settings,Unregister from Hub,Odjavite se iz Hub-a
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Ukupno Neplaćeni: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Web Operacija
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Ponuda Pismo
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generirajte Materijal Upiti (MRP) i radne naloge.
@@ -2375,7 +2417,9 @@
 DocType: Physician Schedule Time Slot,To Time,Za vrijeme
 DocType: Authorization Rule,Approving Role (above authorized value),Odobravanje ulogu (iznad ovlašteni vrijednost)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Credit na račun mora biti računa se plaćaju
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija : {0} ne može biti roditelj ili dijete od {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Molimo izaberite Studentski prijem koji je obavezan za učeniku koji je platio
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija : {0} ne može biti roditelj ili dijete od {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Izaberite cjenovnik za objavljivanje cijene
 DocType: Production Order Operation,Completed Qty,Završen Kol
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Za {0}, samo debitne račune mogu povezati protiv druge kreditne unos"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Cjenik {0} je onemogućen
@@ -2387,38 +2431,39 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serijski brojevi potrebni za artikal {1}. koji ste trazili {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Trenutno Vrednovanje Rate
 DocType: Item,Customer Item Codes,Customer Stavka Codes
+DocType: Training Event,Advance,Advance
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,zbog ponovnog ponavljanja.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange dobitak / gubitak
 DocType: Opportunity,Lost Reason,Razlog gubitka
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nova adresa
 DocType: Quality Inspection,Sample Size,Veličina uzorka
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Unesite dokument o prijemu
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Svi artikli su već fakturisani
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Navedite važeću &#39;iz Predmet br&#39;
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',Navedite važeću &#39;iz Predmet br&#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Dalje troška mogu biti pod Grupe, ali unosa može biti protiv ne-Grupe"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Korisnici i dozvole
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Radne naloge Napisano: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Radne naloge Napisano: {0}
 DocType: Branch,Branch,Ogranak
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tiskanje i brendiranje
 DocType: Company,Total Monthly Sales,Ukupna mesečna prodaja
 DocType: Bin,Actual Quantity,Stvarna količina
 DocType: Shipping Rule,example: Next Day Shipping,Primjer: Sljedeći dan Dostava
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} nije pronađena
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Pretplata je bila {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Pretplata je bila {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Program raspoređivanja naknada
 DocType: Fee Schedule Program,Student Batch,student Batch
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,izaberite * iz `tabVital Signs` gdje je pacijent = &#39;{0}&#39; porudžbina znakom_date desc 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Make Student
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Min razred
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Vi ste pozvani da surađuju na projektu: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Lekar nije dostupan na {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Vi ste pozvani da surađuju na projektu: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Lekar nije dostupan na {0}
 DocType: Leave Block List Date,Block Date,Blok Datum
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Dodaj korisnički pretplatnički polje u doktipu {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Napomena o isporuci dobavljača
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Prijavite se sada
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Prijavite se sada
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Stvarni Količina {0} / Waiting Količina {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-trgovina GSTIN
 DocType: Sales Order,Not Delivered,Ne Isporučeno
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Očekivani datum ne može biti pre Datum transakcije
 ,Bank Clearance Summary,Razmak banka Sažetak
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Stvaranje i upravljanje dnevne , tjedne i mjesečne e razgradnju ."
 DocType: Appraisal Goal,Appraisal Goal,Procjena gol
@@ -2426,12 +2471,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,zgrade
 DocType: Fee Schedule,Fee Structure,naknada Struktura
 DocType: Timesheet Detail,Costing Amount,Costing Iznos
-DocType: Student Admission,Application Fee,naknada aplikacija
+DocType: Student Admission Program,Application Fee,naknada aplikacija
 DocType: Process Payroll,Submit Salary Slip,Slanje plaće Slip
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maxiumm popusta za točke {0} je {1} %
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Maxiumm popusta za točke {0} je {1} %
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Uvoz u rinfuzi
 DocType: Sales Partner,Address & Contacts,Adresa i kontakti
 DocType: SMS Log,Sender Name,Ime / Naziv pošiljaoca
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Sortiraj prema kriterijumima
 DocType: POS Profile,[Select],[ izaberite ]
 DocType: Vital Signs,Blood Pressure (diastolic),Krvni pritisak (dijastolni)
 DocType: SMS Log,Sent To,Poslati
@@ -2440,7 +2486,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Sljedeća Kontakt datum ne može biti u prošlosti
 DocType: Company,For Reference Only.,Za referencu samo.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Lekar {0} nije dostupan na {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Izaberite serijski br
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Izaberite serijski br
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},{1}: Invalid {0}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,Reference Inv
@@ -2456,15 +2502,15 @@
 DocType: Normal Test Items,Require Result Value,Zahtevaj vrednost rezultata
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Slučaj broj ne može biti 0
 DocType: Item,Show a slideshow at the top of the page,Prikaži slideshow na vrhu stranice
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,prodavaonice
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,prodavaonice
 DocType: Project Type,Projects Manager,Projektni menadzer
 DocType: Serial No,Delivery Time,Vrijeme isporuke
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Starenje temelju On
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Imenovanje je otkazano
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Imenovanje je otkazano
 DocType: Item,End of Life,Kraj života
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,putovanje
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Nema aktivnih ili zadani Plaća Struktura nađeni za zaposlenog {0} za navedeni datumi
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,putovanje
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Nema aktivnih ili zadani Plaća Struktura nađeni za zaposlenog {0} za navedeni datumi
 DocType: Leave Block List,Allow Users,Omogućiti korisnicima
 DocType: Purchase Order,Customer Mobile No,Mobilni broj kupca
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Ponavlja
@@ -2473,12 +2519,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Update cost
 DocType: Item Reorder,Item Reorder,Ponovna narudžba artikla
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Pokaži Plaća Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Prijenos materijala
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Prijenos materijala
 DocType: Fees,Send Payment Request,Pošaljite zahtev za plaćanje
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Navedite operacija, operativni troškovi i dati jedinstven radom najkasnije do svojih operacija ."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ovaj dokument je preko granice po {0} {1} za stavku {4}. Da li što još {3} u odnosu na isti {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Molimo podesite ponavljaju nakon spremanja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Izaberite promjene iznos računa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Izaberite promjene iznos računa
 DocType: Purchase Invoice,Price List Currency,Cjenik valuta
 DocType: Naming Series,User must always select,Korisničko uvijek mora odabrati
 DocType: Stock Settings,Allow Negative Stock,Dopustite negativnu zalihu
@@ -2498,7 +2544,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Radnik
 DocType: Sample Collection,Collected Time,Prikupljeno vreme
 DocType: Company,Sales Monthly History,Prodaja mesečne istorije
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Izaberite Batch
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Izaberite Batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} je u potpunosti naplaćeno
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Vitalni znaci
 DocType: Training Event,End Time,End Time
@@ -2506,16 +2552,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Plaćanje Smanjenja ili gubitak
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardni uvjeti ugovora za prodaju ili kupnju.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Grupa po jamcu
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Da li ste sigurni da želite da otkažete ovaj termin?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,prodaja Pipeline
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Molimo podesite zadani račun u Plaća Komponenta {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Potrebna On
 DocType: Rename Tool,File to Rename,File da biste preimenovali
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Molimo odaberite BOM za Stavka zaredom {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Molimo odaberite BOM za Stavka zaredom {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Računa {0} ne odgovara Company {1} u režimu računa: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Navedene BOM {0} ne postoji za Stavka {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Raspored održavanja {0} mora biti otkazana prije poništenja ovu prodajnog naloga
+DocType: POS Profile,Applicable for Users,Primenljivo za korisnike
 DocType: Notification Control,Expense Claim Approved,Rashodi Zahtjev odobren
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Plaća listić od zaposlenika {0} već kreirali za ovaj period
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Plaća listić od zaposlenika {0} već kreirali za ovaj period
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,farmaceutski
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Troškovi Kupljene stavke
 DocType: Selling Settings,Sales Order Required,Prodajnog naloga Obvezno
@@ -2539,6 +2587,7 @@
 DocType: Offer Letter,Accepted,Prihvaćeno
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,organizacija
 DocType: BOM Update Tool,BOM Update Tool,Alat za ažuriranje BOM
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Partijski račun nije naveden, molimo postavite podrazumevani račun stranke u preduzeću"
 DocType: SG Creation Tool Course,Student Group Name,Student Ime grupe
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Kreiranje naknada
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Molimo Vas da proverite da li ste zaista želite izbrisati sve transakcije za ovu kompaniju. Tvoj gospodar podaci će ostati kao što je to. Ova akcija se ne može poništiti.
@@ -2547,29 +2596,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne može biti veći nego što je planirana kolicina ({2}) u proizvodnoj porudzbini {3}
 DocType: Shipping Rule,Shipping Rule Label,Naziv pravila transporta
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,User Forum
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Sirovine ne može biti prazan.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Nije mogao ažurirati zaliha, faktura sadrži drop shipping stavke."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Sirovine ne može biti prazan.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Nije mogao ažurirati zaliha, faktura sadrži drop shipping stavke."
 DocType: Lab Test Sample,Lab Test Sample,Primjer laboratorijskog testa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Brzi unos u dnevniku
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Ne možete promijeniti brzinu ako BOM spomenuo agianst bilo predmet
+DocType: Restaurant,Invoice Series Prefix,Prefix serije računa
 DocType: Employee,Previous Work Experience,Radnog iskustva
 DocType: Stock Entry,For Quantity,Za količina
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Unesite Planirano Qty za točku {0} na redu {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Unesite Planirano Qty za točku {0} na redu {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} nije proslijedjen
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Zahtjevi za stavke.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Poseban proizvodnja kako će biti izrađen za svakog gotovog dobrom stavke.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} mora biti negativan za uzvrat dokumentu
 ,Minutes to First Response for Issues,Minuta na prvi odgovor na pitanja
 DocType: Purchase Invoice,Terms and Conditions1,Odredbe i Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,U ime Instituta za koju se postavljanje ovog sistema.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,U ime Instituta za koju se postavljanje ovog sistema.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Knjiženje zamrznuta do tog datuma, nitko ne može učiniti / mijenjati ulazak, osim uloge naveden u nastavku."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Molimo spremite dokument prije stvaranja raspored za održavanje
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Posljednja cijena ažurirana u svim BOM
 DocType: Fee Schedule,Successful,Uspešno
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status projekta
 DocType: UOM,Check this to disallow fractions. (for Nos),Provjerite to da ne dopušta frakcija. (Za br)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,stvoreni su sljedeći nalozi:
-DocType: Student Admission,Naming Series (for Student Applicant),Imenovanje serija (za studentske Podnositelj zahtjeva)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,stvoreni su sljedeći nalozi:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Imenovanje serija (za studentske Podnositelj zahtjeva)
 DocType: Delivery Note,Transporter Name,Transporter Ime
 DocType: Authorization Rule,Authorized Value,Ovlašteni Vrijednost
 DocType: BOM,Show Operations,Pokaži operacije
@@ -2593,7 +2643,7 @@
 ,Employees working on a holiday,Radnici koji rade na odmoru
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Present
 DocType: Project,% Complete Method,% Complete Način
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Lijek
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Lijek
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Održavanje datum početka ne može biti prije datuma isporuke za rednim brojem {0}
 DocType: Production Order,Actual End Date,Stvarni datum završetka
 DocType: BOM,Operating Cost (Company Currency),Operativni trošak (Company Valuta)
@@ -2611,19 +2661,20 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Korisnik koji odobrava ne može biti isti kao i korisnik na kojeg se odnosi pravilo.
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (kao po akciji UOM)
 DocType: SMS Log,No of Requested SMS,Nema traženih SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Ostavite bez plate ne odgovara odobrenim Records Ostaviti Primjena
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Ostavite bez plate ne odgovara odobrenim Records Ostaviti Primjena
 DocType: Campaign,Campaign-.####,Kampanja-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Sljedeći koraci
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Molimo vas da dostavite navedene stavke na najbolji mogući stope
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Napravite fakturu
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto blizu Opportunity nakon 15 dana
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Narudžbe za kupovinu nisu dozvoljene za {0} zbog stanja kartice koja se nalazi na {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Narudžbe za kupovinu nisu dozvoljene za {0} zbog stanja kartice koja se nalazi na {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,do kraja godine
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Ugovor Datum završetka mora biti veći od dana ulaska u
 DocType: Vital Signs,Nutrition Values,Vrednosti ishrane
 DocType: Lab Test Template,Is billable,Da li se može naplatiti
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Oba &quot;Raspored lekara&quot; i vrijeme po imenovanju &quot;moraju biti postavljeni za dr {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,A treće strane distributera / trgovca / komisije agent / affiliate / prodavače koji prodaje kompanije proizvoda za proviziju.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} protiv narudzbine dobavljacu {1}
 DocType: Patient,Patient Demographics,Demografija pacijenta
@@ -2673,7 +2724,6 @@
  10. Dodavanje ili Oduzeti: Bilo da želite dodati ili oduzeti porez."
 DocType: Homepage,Homepage,homepage
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Izaberite lekar ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',update tabConsultation set invoice = &#39;{0}&#39; gdje ime = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,RecD Količina
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Naknada Records Kreirano - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Kategorija računa
@@ -2685,7 +2735,7 @@
 DocType: Asset,Manual,priručnik
 DocType: Salary Component Account,Salary Component Account,Plaća Komponenta računa
 DocType: Global Defaults,Hide Currency Symbol,Sakrij simbol valute
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","npr. banka, gotovina, kreditne kartice"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","npr. banka, gotovina, kreditne kartice"
 DocType: Lead Source,Source Name,izvor ime
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Normalni krvni pritisak pri odraslima je oko 120 mmHg sistolnog, a dijastolni 80 mmHg, skraćeni &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Kreditne Napomena
@@ -2704,16 +2754,16 @@
 DocType: Patient,Occupation,okupacija
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Red {0} : Datum početka mora biti prije datuma završetka
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Ukupno (Qty)
-DocType: Sales Invoice,This Document,ovaj dokument
 DocType: Installation Note Item,Installed Qty,Instalirana kol
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Ovo može biti zbog nekih nevažećih e-mail adresa u
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Dodali ste
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,trening Rezultat
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,trening Rezultat
 DocType: Purchase Invoice,Is Paid,plaća
 DocType: Salary Structure,Total Earning,Ukupna zarada
 DocType: Purchase Receipt,Time at which materials were received,Vrijeme u kojem su materijali primili
 DocType: Stock Ledger Entry,Outgoing Rate,Odlazni Rate
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Organizacija grana majstor .
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Organizacija grana majstor .
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,ili
 DocType: Sales Order,Billing Status,Status naplate
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Prijavi problem
@@ -2728,7 +2778,8 @@
 DocType: Notification Control,Sales Order Message,Poruka narudžbe kupca
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Zadane vrijednosti kao što su tvrtke , valute , tekuće fiskalne godine , itd."
 DocType: Payment Entry,Payment Type,Vrsta plaćanja
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Molimo odaberite serijom za Stavka {0}. Nije moguće pronaći jednu seriju koja ispunjava ovaj zahtjev
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Molimo odaberite serijom za Stavka {0}. Nije moguće pronaći jednu seriju koja ispunjava ovaj zahtjev
+DocType: Hub Category,Parent Category,Kategorija roditelja
 DocType: Process Payroll,Select Employees,Odaberite Zaposleni
 DocType: Opportunity,Potential Sales Deal,Potencijalni Sales Deal
 DocType: Complaint,Complaints,Žalbe
@@ -2765,7 +2816,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikacija paketa za dostavu (za tisak)
 DocType: Bin,Reserved Quantity,Rezervirano Količina
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Molimo vas da unesete važeću e-mail adresu
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Molimo izaberite stavku u korpi
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Molimo izaberite stavku u korpi
 DocType: Landed Cost Voucher,Purchase Receipt Items,Primka proizvoda
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Prilagođavanje Obrasci
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,zaostatak
@@ -2775,15 +2826,15 @@
 DocType: Payment Request,Amount in customer's currency,Iznos u valuti kupca
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Isporuka
 DocType: Stock Reconciliation Item,Current Qty,Trenutno Količina
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Dodajte dobavljače
+DocType: Restaurant Menu,Restaurant Menu,Restoran meni
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,prev
 DocType: Appraisal Goal,Key Responsibility Area,Područje odgovornosti
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Student Paketi pomoći da pratiti prisustvo, procjene i naknade za studente"
 DocType: Payment Entry,Total Allocated Amount,Ukupan dodijeljeni iznos
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Postaviti zadani račun inventar za trajnu inventar
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Postaviti zadani račun inventar za trajnu inventar
 DocType: Item Reorder,Material Request Type,Materijal Zahtjev Tip
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural Journal Entry za plate od {0} do {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage je puna, nije spasio"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage je puna, nije spasio"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Red {0}: UOM Faktor konverzije je obavezno
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Kapacitet sobe
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref.
@@ -2822,16 +2873,18 @@
 DocType: Project,Task Completion,zadatak Završetak
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Nije raspoloživo
 DocType: Appraisal,HR User,HR korisnika
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Porezi i naknade oduzeti
-apps/erpnext/erpnext/hooks.py +129,Issues,Pitanja
+apps/erpnext/erpnext/hooks.py +138,Issues,Pitanja
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status mora biti jedan od {0}
 DocType: Sales Invoice,Debit To,Rashodi za
+DocType: Restaurant Menu Item,Restaurant Menu Item,Restoran Menu Item
 DocType: Delivery Note,Required only for sample item.,Potrebna je samo za primjer stavke.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Stvarna količina nakon transakcije
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Bez plaće slip pronađena između {0} i {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Bez plaće slip pronađena između {0} i {1}
 ,Pending SO Items For Purchase Request,Otvorena SO Proizvodi za zahtjev za kupnju
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,student Prijemni
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} je onemogućena
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,student Prijemni
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} je onemogućena
 DocType: Supplier,Billing Currency,Valuta plaćanja
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Ekstra veliki
@@ -2854,6 +2907,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Molimo spomenuti nema posjeta potrebnih
 DocType: Stock Settings,Default Valuation Method,Zadana metoda vrednovanja
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,provizija
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Ažuriranje je u toku. Možda će potrajati neko vrijeme.
 DocType: Vehicle Log,Fuel Qty,gorivo Količina
 DocType: Production Order Operation,Planned Start Time,Planirani Start Time
 DocType: Course,Assessment,procjena
@@ -2869,7 +2923,7 @@
 DocType: Price List,Price List Master,Cjenik Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Sve Sales Transakcije mogu biti označena protiv više osoba ** ** Sales, tako da možete postaviti i pratiti ciljeve."
 ,S.O. No.,S.O. Ne.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Kreirajte Kupca iz Poslovne prilike {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Kreirajte Kupca iz Poslovne prilike {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Izaberite Pacijent
 DocType: Price List,Applicable for Countries,Za zemlje u
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Ime parametra
@@ -2912,27 +2966,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,Dobavljač Račun Detalji
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Rashodi / Razlika računa ({0}) mora biti račun 'dobit ili gubitak'
 DocType: Project,Copied From,kopira iz
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Ime greška: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,nedostatak
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Ime greška: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,nedostatak
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} ne u vezi sa {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Gledatelja za zaposlenika {0} već označen
 DocType: Packing Slip,If more than one package of the same type (for print),Ako je više od jedan paket od iste vrste (za tisak)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Podesite podrazumevani kupac u podešavanjima restorana
 ,Salary Register,Plaća Registracija
 DocType: Warehouse,Parent Warehouse,Parent Skladište
 DocType: C-Form Invoice Detail,Net Total,Osnovica
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Uobičajeno sastavnice nije pronađen za Stavka {0} i projekt {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Uobičajeno sastavnice nije pronađen za Stavka {0} i projekt {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Definirati različite vrste kredita
 DocType: Bin,FCFS Rate,FCFS Stopa
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Izvanredna Iznos
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Time (u min)
 DocType: Project Task,Working,U toku
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Kataloški red (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Finansijska godina
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Finansijska godina
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} ne pripada preduzecu {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,Nije moguće riješiti funkciju rezultata za {0}. Proverite da li je formula validna.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Koštaju kao na
 DocType: Healthcare Settings,Out Patient Settings,Out Pacijent Settings
 DocType: Account,Round Off,Zaokružiti
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Količina mora biti pozitivna
 ,Requested Qty,Traženi Kol
 DocType: Tax Rule,Use for Shopping Cart,Koristiti za Košarica
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Vrijednost {0} za Atributi {1} ne postoji u listu važećih Stavka Atributi vrijednosti za Stavka {2}
@@ -2941,7 +2997,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Naknade će se distribuirati proporcionalno na osnovu stavka količina ili iznos, po svom izboru"
 DocType: Maintenance Visit,Purposes,Namjene
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Atleast jednu stavku treba upisati s negativnim količine za uzvrat dokumentu
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Dodaj kurseve
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacija {0} više od bilo koje dostupne radnog vremena u radnu stanicu {1}, razbijaju rad u više operacija"
 ,Requested,Tražena
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,No Napomene
@@ -2953,6 +3008,8 @@
 DocType: Employee Loan,Repaid/Closed,Otplaćen / Closed
 DocType: Item,Total Projected Qty,Ukupni planirani Količina
 DocType: Monthly Distribution,Distribution Name,Naziv distribucije
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dobavljač&gt; Tip dobavljača
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Stopa procene nije pronađena za stavku {0}, koja je obavezna da izvrši računovodstvene unose za {1} {2}. Ako je stavka transakcija kao stavka nulte stope procjene u {1}, molimo vas da navedete to u tabeli {1} Item. U suprotnom, molimo vas da kreirate dolaznu transakciju sa akcijama za stavku ili da navedete stopu procene u zapisu Stavke, a zatim pokušajte da podnesete / poništite ovaj unos"
 DocType: Course,Course Code,Šifra predmeta
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Provera kvaliteta potrebna za točke {0}
 DocType: POS Settings,Use POS in Offline Mode,Koristite POS u Offline načinu
@@ -2963,14 +3020,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Spisak teritorija - upravljanje.
 DocType: Journal Entry Account,Sales Invoice,Faktura prodaje
 DocType: Journal Entry Account,Party Balance,Party Balance
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,Molimo odaberite Apply popusta na
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Molimo odaberite Apply popusta na
 DocType: Company,Default Receivable Account,Uobičajeno Potraživanja račun
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Kreirajte banke unos za ukupne zarade isplaćene za gore odabrane kriterije
 DocType: Physician,Physician Schedule,Raspored lekara
 DocType: Purchase Invoice,Deemed Export,Pretpostavljeni izvoz
 DocType: Stock Entry,Material Transfer for Manufacture,Prijenos materijala za izradu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Postotak popusta se može neovisno primijeniti prema jednom ili za više cjenika.
-DocType: Purchase Invoice,Half-yearly,Polugodišnje
+DocType: Subscription,Half-yearly,Polugodišnje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Računovodstvo Entry za Stock
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Ste već ocijenili za kriterije procjene {}.
@@ -2999,13 +3056,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Extra Small
 DocType: Company,Standard Template,standard Template
 DocType: Training Event,Theory,teorija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Upozorenje : Materijal tražena količina manja nego minimalna narudžba kol
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Upozorenje : Materijal tražena količina manja nego minimalna narudžba kol
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Konto {0} je zamrznut
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pravna osoba / Podružnica sa zasebnim kontnom pripadaju Organizacije.
 DocType: Payment Request,Mute Email,Mute-mail
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Hrana , piće i duhan"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Mogu samo napraviti uplatu protiv nenaplaćenu {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Proviziju ne može biti veća od 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Mogu samo napraviti uplatu protiv nenaplaćenu {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Proviziju ne može biti veća od 100
 DocType: Stock Entry,Subcontract,Podugovor
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Unesite {0} prvi
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Nema odgovora od
@@ -3023,10 +3080,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Boja
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Kriteriji Plan Procjena
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Sprečite kupovne naloge
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Podložno
 DocType: Patient Appointment,Scheduled,Planirano
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Upit za ponudu.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Molimo da podesite sistem imenovanja zaposlenih u ljudskim resursima&gt; HR Settings
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Molimo odaberite Stavka u kojoj &quot;Je Stock Stavka&quot; je &quot;ne&quot; i &quot;Da li je prodaja Stavka&quot; je &quot;Da&quot;, a nema drugog Bundle proizvoda"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Izaberite Kupca
 DocType: Student Log,Academic,akademski
 DocType: Patient,Personal and Social History,Lična i društvena istorija
 DocType: Fee Schedule,Fee Breakup for each student,Naknada za svaki student
@@ -3036,7 +3094,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Vrednovanje Stopa
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,dizel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Cjenik valuta ne bira
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Cjenik valuta ne bira
 apps/erpnext/erpnext/config/healthcare.py +46,Results,Rezultati
 ,Student Monthly Attendance Sheet,Student Mjesečni Posjeta list
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Radnik {0} je već aplicirao za {1} iymeđu {2} i {3}
@@ -3051,7 +3109,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Upravljanje prodajnih partnera.
 DocType: Quality Inspection,Inspection Type,Inspekcija Tip
 DocType: Fee Validity,Visited yet,Posjećeno još
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Skladišta sa postojećim transakcija se ne može pretvoriti u grupi.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Skladišta sa postojećim transakcija se ne može pretvoriti u grupi.
 DocType: Assessment Result Tool,Result HTML,rezultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ističe
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Dodaj Studenti
@@ -3078,7 +3136,7 @@
 DocType: Healthcare Settings,Result Printed,Result Printed
 DocType: Asset Category Account,Depreciation Expense Account,Troškovi amortizacije računa
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Probni rad
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Pregled {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Pregled {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Samo leaf čvorovi su dozvoljeni u transakciji
 DocType: Expense Claim,Expense Approver,Rashodi Approver
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Red {0}: Advance protiv Klijent mora biti kredit
@@ -3089,7 +3147,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,To datuma i vremena
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Rasporedi Kurs izbrisan:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Dnevnici za održavanje sms statusa isporuke
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Podesite prodajnu cenu
 DocType: Accounts Settings,Make Payment via Journal Entry,Izvršiti uplatu preko Journal Entry
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,otisnut na
 DocType: Item,Inspection Required before Delivery,Inspekcija Potrebna prije isporuke
@@ -3097,7 +3154,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Aktivnosti na čekanju
 DocType: Patient Appointment,Reminded,Podsetio
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Vaša organizacija
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Vaša organizacija
 DocType: Fee Component,Fees Category,naknade Kategorija
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Unesite olakšavanja datum .
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
@@ -3109,7 +3166,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Ponovno red Level
 DocType: Company,Chart Of Accounts Template,Kontni plan Template
 DocType: Attendance,Attendance Date,Gledatelja Datum
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Artikal Cijena ažuriranje za {0} u Cjenik {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Artikal Cijena ažuriranje za {0} u Cjenik {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plaća raspada temelju zarađivati i odbitka.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Konto sa pod-kontima se ne može pretvoriti u glavnoj knjizi
 DocType: Purchase Invoice Item,Accepted Warehouse,Prihvaćeno skladište
@@ -3125,9 +3182,10 @@
 ,Employee Birthday,Rođendani zaposlenih
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Batch Posjeta Tool
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,limit Crossed
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Planirani Upto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Preduzetnički kapital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Akademski pojam sa ovim &quot;akademska godina&quot; {0} i &#39;Term Ime&#39; {1} već postoji. Molimo vas da mijenjati ove stavke i pokušati ponovo.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Kao što je već postoje transakcije protiv stavku {0}, ne možete promijeniti vrijednost {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Kao što je već postoje transakcije protiv stavku {0}, ne možete promijeniti vrijednost {1}"
 DocType: UOM,Must be Whole Number,Mora biti cijeli broj
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Novi Lišće alociran (u danima)
 DocType: Purchase Invoice,Invoice Copy,Račun Copy
@@ -3137,7 +3195,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Račun broj
 DocType: Shopping Cart Settings,Orders,Narudžbe
 DocType: Employee Leave Approver,Leave Approver,Ostavite odobravatelju
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Molimo odaberite serije
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Molimo odaberite serije
 DocType: Assessment Group,Assessment Group Name,Procjena Ime grupe
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materijal za Preneseni Proizvodnja
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Korisnik sa ""Rashodi Approver"" ulogu"
@@ -3152,7 +3210,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Period zatvaranja Entry
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Izaberite Odeljenje ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Troška s postojećim transakcija ne može se prevesti u skupini
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Broj {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Broj {0} {1} {2} {3}
 DocType: Account,Depreciation,Amortizacija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dobavljač (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Alat za evidenciju dolaznosti radnika
@@ -3163,10 +3221,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,Plaćanje Unosi {0} su un-povezani
 DocType: GL Entry,Voucher No,Bon Ne
 ,Lead Owner Efficiency,Lead Vlasnik efikasnost
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Najpopularniji
 DocType: Leave Allocation,Leave Allocation,Ostavite Raspodjela
 DocType: Payment Request,Recipient Message And Payment Details,Primalac poruka i plaćanju
 DocType: Training Event,Trainer Email,trener-mail
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Materijalni Zahtjevi {0} stvorio
+DocType: Restaurant Reservation,No of People,Broj ljudi
 DocType: Production Planning Tool,Include sub-contracted raw materials,Uključiti pod ugovorom sirovina
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Predložak termina ili ugovor.
 DocType: Purchase Invoice,Address and Contact,Adresa i kontakt
@@ -3175,10 +3235,11 @@
 DocType: Supplier,Last Day of the Next Month,Zadnji dan narednog mjeseca
 DocType: Support Settings,Auto close Issue after 7 days,Auto blizu izdanje nakon 7 dana
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Ostavite se ne može dodijeliti prije {0}, kao odsustvo ravnoteža je već carry-proslijeđen u budućnosti rekord raspodjeli odsustvo {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Napomena: Zbog / Reference Datum premašuje dozvoljeni dana kreditnu kupca {0} dan (a)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Napomena: Zbog / Reference Datum premašuje dozvoljeni dana kreditnu kupca {0} dan (a)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,student zahtjeva
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL primatelja
 DocType: Asset Category Account,Accumulated Depreciation Account,Ispravka vrijednosti računa
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Ovaj e-mail je autogenerisan
 DocType: Stock Settings,Freeze Stock Entries,Zamrzavanje Stock Unosi
 DocType: Program Enrollment,Boarding Student,Boarding Student
 DocType: Asset,Expected Value After Useful Life,Očekivana vrijednost Nakon Korisni Life
@@ -3186,7 +3247,7 @@
 DocType: Activity Cost,Billing Rate,Billing Rate
 ,Qty to Deliver,Količina za dovođenje
 ,Stock Analytics,Stock Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Operacije se ne može ostati prazno
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Operacije se ne može ostati prazno
 DocType: Maintenance Visit Purpose,Against Document Detail No,Protiv dokumenta Detalj No
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Party Tip je obavezno
 DocType: Quality Inspection,Outgoing,Društven
@@ -3208,7 +3269,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Izbor studenata ručno za grupe aktivnosti na osnovu
 DocType: Journal Entry,User Remark,Upute Zabilješka
 DocType: Lead,Market Segment,Tržišni segment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Uplaćeni iznos ne može biti veći od ukupnog broja negativnih preostali iznos {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Uplaćeni iznos ne može biti veći od ukupnog broja negativnih preostali iznos {0}
 DocType: Supplier Scorecard Period,Variables,Varijable
 DocType: Employee Internal Work History,Employee Internal Work History,Istorija rada zaposlenog u preduzeću
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Zatvaranje (Dr)
@@ -3237,21 +3298,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Get Updates
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Račun {2} ne pripada kompaniji {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Materijal Zahtjev {0} je otkazan ili zaustavljen
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Ostavite Management
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Ostavite Management
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Grupa po računu
 DocType: Sales Order,Fully Delivered,Potpuno Isporučeno
 DocType: Lead,Lower Income,Niži Prihodi
+DocType: Restaurant Order Entry,Current Order,Trenutna porudžbina
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Izvor i ciljna skladište ne može biti isti za redom {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika račun mora biti tip imovine / odgovornošću obzir, jer je to Stock Pomirenje je otvor za ulaz"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Isplaćeni iznos ne može biti veći od Iznos kredita {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Idi na programe
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Proizvodnog naloga kreiranu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Proizvodnog naloga kreiranu
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"' Od datuma ' mora biti poslije ' Do datuma"""
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Ne može promijeniti status studenta {0} je povezana s primjenom student {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Ne može promijeniti status studenta {0} je povezana s primjenom student {1}
 DocType: Asset,Fully Depreciated,potpuno je oslabio
 ,Stock Projected Qty,Projektovana kolicina na zalihama
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Kupac {0} ne pripada projektu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Kupac {0} ne pripada projektu {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Označena Posjećenost HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Citati su prijedlozi, ponude koje ste poslali svojim kupcima"
 DocType: Sales Order,Customer's Purchase Order,Narudžbenica kupca
@@ -3262,8 +3324,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Molimo podesite Broj Amortizacija Booked
 DocType: Supplier Scorecard Period,Calculations,Izračunavanje
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,"Vrijednost, ili kol"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Productions naloga ne može biti podignuta za:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Productions naloga ne može biti podignuta za:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Minuta
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Molimo postavite Naming Series za {0} preko Setup&gt; Settings&gt; Series Naming
 DocType: Purchase Invoice,Purchase Taxes and Charges,Kupnja Porezi i naknade
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Idite na dobavljače
 ,Qty to Receive,Količina za primanje
@@ -3276,7 +3339,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Kredit na račun mora biti bilans stanja računa
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Sve vrste dobavljača
 DocType: Global Defaults,Disable In Words,Onemogućena u Words
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,Kod artikla je obvezan jer artikli nisu automatski numerirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,Kod artikla je obvezan jer artikli nisu automatski numerirani
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Ponuda {0} nije tip {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Raspored održavanja stavki
 DocType: Sales Order,%  Delivered,Isporučeno%
@@ -3298,23 +3361,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Početno stanje Equity
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Pomirenje
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,ostali
 DocType: Appraisal,Appraisal,Procjena
 DocType: Purchase Invoice,GST Details,Detalji GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},E-mail poslati na dobavljač {0}
+DocType: Item,Default Sales Unit of Measure,Podrazumevana jedinica prodaje mjere
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum se ponavlja
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Ovlašteni potpisnik
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Ostavite odobritelj mora biti jedan od {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Kreiraj naknade
-DocType: Hub Settings,Seller Email,Prodavač-mail
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Ukupno TROŠKA (preko fakturi)
 DocType: Training Event,Start Time,Start Time
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Odaberite Količina
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Odaberite Količina
 DocType: Customs Tariff Number,Customs Tariff Number,Carinski tarifni broj
 DocType: Patient Appointment,Patient Appointment,Imenovanje pacijenta
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Odobravanje ulogu ne mogu biti isti kao i ulogepravilo odnosi se na
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Odjavili od ovog mail Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Odjavili od ovog mail Digest
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Uzmite dobavljača
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} nije pronađen za stavku {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Idi na kurseve
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Poruka je poslana
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Račun s djetetom čvorovi se ne može postaviti kao glavnu knjigu
@@ -3327,11 +3393,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Materijal Prebačen za izradu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Račun {0} ne postoji
 DocType: Project,Project Type,Vrsta projekta
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Zadatak za djecu postoji za ovaj zadatak. Ne možete da izbrišete ovaj zadatak.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Ili meta Količina ili ciljani iznos je obavezna .
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Troškova različitih aktivnosti
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Nema više rezultata
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Troškova različitih aktivnosti
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Postavljanje Događanja u {0}, jer zaposleni u prilogu ispod prodaje osoba nema korisniku ID {1}"
 DocType: Timesheet,Billing Details,Billing Detalji
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Izvor i meta skladište mora biti drugačiji
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Izvor i meta skladište mora biti drugačiji
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Nije dopušteno osvježavanje burzovnih transakcija stariji od {0}
 DocType: Purchase Invoice Item,PR Detail,PR Detalj
 DocType: Sales Order,Fully Billed,Potpuno Naplaćeno
@@ -3357,7 +3425,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Provjerite sve
 DocType: Vehicle Log,Invoice Ref,Račun Ref
-DocType: Purchase Order,Recurring Order,Ponavljajući Order
 DocType: Company,Default Income Account,Zadani račun prihoda
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Vrsta djelatnosti Kupaca / Kupci
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Neriješeni fiskalne godine dobit / gubitak (kredit)
@@ -3371,9 +3438,9 @@
 DocType: Patient,A Negative,Negativan
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Ništa više pokazati.
 DocType: Lead,From Customer,Od kupca
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Pozivi
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Pozivi
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,A Product
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,serija
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,serija
 DocType: Project,Total Costing Amount (via Time Logs),Ukupni troskovi ( iz Time Log-a)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Napravite raspored naknada
 DocType: Purchase Order Item Supplied,Stock UOM,Kataloški UOM
@@ -3397,7 +3464,7 @@
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Lišće i privatnom
 DocType: School Settings,Current Academic Term,Trenutni Academic Term
 DocType: Sales Order,Not Billed,Ne Naplaćeno
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Oba skladišta moraju pripadati istom preduzeću
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Oba skladišta moraju pripadati istom preduzeću
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Još nema ni jednog unijetog kontakta.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Sleteo Cost vaučera Iznos
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Mjenice podigao dobavljače.
@@ -3406,7 +3473,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Iznos rabata
 DocType: Purchase Invoice,Return Against Purchase Invoice,Vratiti protiv fakturi
 DocType: Item,Warranty Period (in days),Jamstveni period (u danima)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',update `tabPatient Appointment` postavite sales_invoice = &#39;{0}&#39; gdje ime = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Odnos sa Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Neto novčani tok od operacije
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Stavka 4
@@ -3415,8 +3481,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry račun
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,student Group
 DocType: Shopping Cart Settings,Quotation Series,Citat serije
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Stavka postoji s istim imenom ( {0} ) , molimo promijenite ime stavku grupe ili preimenovati stavku"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Molimo odaberite kupac
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Stavka postoji s istim imenom ( {0} ) , molimo promijenite ime stavku grupe ili preimenovati stavku"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Molimo odaberite kupac
 DocType: C-Form,I,ja
 DocType: Company,Asset Depreciation Cost Center,Asset Amortizacija troškova Center
 DocType: Sales Order Item,Sales Order Date,Datum narudžbe kupca
@@ -3425,6 +3491,7 @@
 DocType: Assessment Plan,Assessment Plan,plan procjene
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Klijent {0} je kreiran.
 DocType: Stock Settings,Limit Percent,limit Procenat
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Trenutno nema dostupnih trgovina na zalihama
 ,Payment Period Based On Invoice Date,Razdoblje za naplatu po Datum fakture
 DocType: Sample Collection,No. of print,Broj otiska
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Nedostaje Valuta Tečaj za {0}
@@ -3480,13 +3547,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruto Pay - Ukupno odbitak - Otplata kredita
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,Trenutni troškovnik i novi troškovnik ne mogu biti isti
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Plaća Slip ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Plaća Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Datum umirovljenja mora biti veći od datuma pristupa
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,"Bilo je grešaka, dok zakazivanje kurs na:"
 DocType: Sales Invoice,Against Income Account,Protiv računu dohotka
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Isporučeno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Stavka {0}: {1} Naručena količina ne može biti manji od minimalnog bi Količina {2} (iz točke).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Stavka {0}: {1} Naručena količina ne može biti manji od minimalnog bi Količina {2} (iz točke).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mjesečni Distribucija Postotak
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Molimo prijavite se kao drugi korisnik.
 DocType: Territory,Territory Targets,Teritorij Mete
 DocType: Delivery Note,Transporter Info,Transporter Info
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Molimo podesite default {0} u kompaniji {1}
@@ -3494,13 +3562,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Istog dobavljača je ušao više puta
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Bruto dobit / gubitak
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Narudžbenica artikla Isporuka
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Kompanija Ime ne može biti poduzeća
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Kompanija Ime ne može biti poduzeća
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Zaglavlja za ispis predložaka.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Naslovi za ispis predložaka pr Predračuna.
 DocType: Program Enrollment,Walking,hodanje
 DocType: Student Guardian,Student Guardian,student Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Prijava tip vrednovanja ne može označiti kao Inclusive
 DocType: POS Profile,Update Stock,Ažurirajte Stock
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,u pretplati
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Različite mjerne jedinice proizvoda će dovesti do ukupne pogrešne neto težine. Budite sigurni da je neto težina svakog proizvoda u istoj mjernoj jedinici.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,Journal Entry za otpad
@@ -3548,15 +3617,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","ID korisnika sustava. Ako je postavljen, postat će zadani za sve HR oblike."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1} Od
 DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Očekuje se ažuriranje najnovije cene u svim materijalima. Može potrajati nekoliko minuta.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Očekuje se ažuriranje najnovije cene u svim materijalima. Može potrajati nekoliko minuta.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Ime novog računa. Napomena: Molimo vas da ne stvaraju račune za kupcima i dobavljačima
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Država mudar zadana adresa predlošci
 DocType: Sales Order Item,Supplier delivers to Customer,Dobavljač dostavlja kupaca
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# obrazac / Stavka / {0}) je out of stock
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Zbog / Reference Datum ne može biti nakon {0}
+,Sales Payment Summary,Sažetak prodaje plata
+DocType: Restaurant,Restaurant,Restoran
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Zbog / Reference Datum ne može biti nakon {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Podataka uvoz i izvoz
 DocType: Patient,Account Details,Detalji konta
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,No studenti Found
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,No studenti Found
 DocType: Medical Department,Medical Department,Medicinski odjel
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Kriterijumi bodovanja rezultata ocenjivanja dobavljača
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Račun Datum knjiženja
@@ -3567,7 +3638,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Molimo odaberite Datum knjiženja prije izbora stranke
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Od AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Molimo odaberite Citati
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Molimo odaberite Citati
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Broj Amortizacija Booked ne može biti veća od Ukupan broj Amortizacija
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Provjerite održavanja Posjetite
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,Molimo kontaktirajte za korisnike koji imaju Sales Manager Master {0} ulogu
@@ -3575,7 +3646,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Društvo ( ne kupaca i dobavljača ) majstor .
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,To se temelji na prisustvo ovog Student
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,No Studenti u
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Dodaj više stavki ili otvoreni punu formu
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Dodaj više stavki ili otvoreni punu formu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnica {0} mora biti otkazana prije poništenja ove narudžbenice
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Idite na Korisnike
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Uplaćeni iznos + otpis iznos ne može biti veći od SVEUKUPNO
@@ -3595,37 +3666,40 @@
 DocType: Fee Schedule,Fee Schedule,naknada Raspored
 DocType: Hub Settings,Publish Availability,Objavite Dostupnost
 DocType: Company,Create Chart Of Accounts Based On,Napravite Kontni plan na osnovu
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Ne mogu ga pretvoriti u ne-grupu. Postoje zadaci za decu.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Datum rođenja ne može biti veći nego što je danas.
 ,Stock Ageing,Kataloški Starenje
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Student {0} postoje protiv podnosioca prijave student {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Prilagođavanje zaokruživanja (valuta kompanije)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,kontrolna kartica
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,kontrolna kartica
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' je onemogućeno
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Postavi status Otvoreno
 DocType: Cheque Print Template,Scanned Cheque,skeniranim Ček
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Pošaljite e-poštu automatski da Kontakti na podnošenje transakcija.
 DocType: Timesheet,Total Billable Amount,Ukupno naplative iznos
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Stavka 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Unos naloga
 DocType: Purchase Order,Customer Contact Email,Email kontakta kupca
 DocType: Warranty Claim,Item and Warranty Details,Stavka i garancija Detalji
 DocType: Sales Team,Contribution (%),Doprinos (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Napomena : Stupanje Plaćanje neće biti izrađen od ' Gotovina ili bankovni račun ' nije naveden
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Projekat {0} već postoji
 DocType: Medical Department,Nursing User,Korisnik medicinske sestre
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Odgovornosti
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Rok važnosti ove ponude je završen.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Rok važnosti ove ponude je završen.
 DocType: Expense Claim Account,Expense Claim Account,Rashodi Preuzmi računa
 DocType: Accounts Settings,Allow Stale Exchange Rates,Dozvolite stare kurseve
 DocType: Sales Person,Sales Person Name,Ime referenta prodaje
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Unesite atleast jedan račun u tablici
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Dodaj Korisnici
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Dodaj Korisnici
 DocType: POS Item Group,Item Group,Grupa artikla
 DocType: Item,Safety Stock,Sigurnost Stock
 DocType: Healthcare Settings,Healthcare Settings,Postavke zdravstvene zaštite
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Napredak% za zadatak ne može biti više od 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Napredak% za zadatak ne može biti više od 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Prije nego pomirenje
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Za {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Porezi i naknade uvrštenja (Društvo valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Stavka Porezna Row {0} mora imati račun tipa poreza ili prihoda i rashoda ili naplativ
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Stavka Porezna Row {0} mora imati račun tipa poreza ili prihoda i rashoda ili naplativ
 DocType: Sales Order,Partly Billed,Djelomično Naplaćeno
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Stavka {0} mora biti osnovna sredstva stavka
 DocType: Item,Default BOM,Zadani BOM
@@ -3641,6 +3715,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,varijabla
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Od otpremnici
 DocType: Student,Student Email Address,Student-mail adresa
+DocType: Item,Hub Warehouse,Hub skladište
 DocType: Physician Schedule Time Slot,From Time,S vremena
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Na raspolaganju:
 DocType: Notification Control,Custom Message,Prilagođena poruka
@@ -3648,9 +3723,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,Novac ili bankovni račun je obvezna za izradu ulazak plaćanje
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,student adresa
 DocType: Purchase Invoice,Price List Exchange Rate,Cjenik tečajna
+DocType: POS Profile,POS Profile Name,POS Profil Ime
 DocType: Purchase Invoice Item,Rate,VPC
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,stažista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Adresa ime
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Adresa ime
 DocType: Stock Entry,From BOM,Iz BOM
 DocType: Assessment Code,Assessment Code,procjena Kod
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Osnovni
@@ -3664,11 +3740,12 @@
 DocType: Salary Slip,Salary Structure,Plaća Struktura
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aviokompanija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Tiketi - materijal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Tiketi - materijal
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Došlo je do greške prilikom stvaranja ponavljajuće
 DocType: Material Request Item,For Warehouse,Za galeriju
 DocType: Employee,Offer Date,ponuda Datum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citati
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Vi ste u isključenom modu. Nećete biti u mogućnosti da ponovo sve dok imate mrežu.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Vi ste u isključenom modu. Nećete biti u mogućnosti da ponovo sve dok imate mrežu.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,No studentskih grupa stvorio.
 DocType: Purchase Invoice Item,Serial No,Serijski br
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Mjesečna otplate iznos ne može biti veći od iznos kredita
@@ -3678,17 +3755,18 @@
 DocType: Salary Slip,Total Working Hours,Ukupno Radno vrijeme
 DocType: Subscription,Next Schedule Date,Sledeći datum rasporeda
 DocType: Stock Entry,Including items for sub assemblies,Uključujući i stavke za pod sklopova
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Unesite vrijednost mora biti pozitivan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Sve teritorije
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Unesite vrijednost mora biti pozitivan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Sve teritorije
 DocType: Purchase Invoice,Items,Artikli
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student je već upisana.
 DocType: Fiscal Year,Year Name,Naziv godine
 DocType: Process Payroll,Process Payroll,Proces plaće
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Postoji više odmor nego radnih dana ovog mjeseca .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Postoji više odmor nego radnih dana ovog mjeseca .
 DocType: Product Bundle Item,Product Bundle Item,Proizvod Bundle Stavka
 DocType: Sales Partner,Sales Partner Name,Prodaja Ime partnera
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Zahtjev za ponudu
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Zahtjev za ponudu
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimalni iznos fakture
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hematologija
 DocType: Normal Test Items,Normal Test Items,Normalni testovi
 DocType: Student Language,Student Language,student Jezik
 apps/erpnext/erpnext/config/selling.py +23,Customers,Kupci
@@ -3699,10 +3777,11 @@
 DocType: Issue,Opening Time,Radno vrijeme
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Od i Do datuma zahtijevanih
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vrijednosni papiri i robne razmjene
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Uobičajeno mjerna jedinica za varijantu &#39;{0}&#39; mora biti isti kao u obrascu &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Uobičajeno mjerna jedinica za varijantu &#39;{0}&#39; mora biti isti kao u obrascu &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Izračun zasnovan na
 DocType: Delivery Note Item,From Warehouse,Od Skladište
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Nema artikala sa Bill materijala za proizvodnju
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Nema artikala sa Bill materijala za proizvodnju
+DocType: Restaurant,Default Customer,Podrazumevani korisnik
 DocType: Assessment Plan,Supervisor Name,Supervizor ime
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Ne potvrdite da li je zakazan termin za isti dan
 DocType: Program Enrollment Course,Program Enrollment Course,Program Upis predmeta
@@ -3729,7 +3808,7 @@
 DocType: Payment Entry,Internal Transfer,Interna Transfer
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Dijete računa postoji za taj račun . Ne možete izbrisati ovaj račun .
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Ili meta Količina ili ciljani iznos je obvezna
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Ne default BOM postoji točke {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Ne default BOM postoji točke {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Molimo najprije odaberite Datum knjiženja
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Otvaranje Datum bi trebao biti prije zatvaranja datum
 DocType: Leave Control Panel,Carry Forward,Prenijeti
@@ -3764,6 +3843,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Ukupno Present
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,knjigovodstvene isprave
 DocType: Drug Prescription,Hour,Sat
+DocType: Restaurant Order Entry,Last Sales Invoice,Poslednja prodaja faktura
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Novi serijski broj ne može imati skladište. Skladište mora biti postavljen od strane burze upisu ili kupiti primitka
 DocType: Lead,Lead Type,Tip potencijalnog kupca
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Niste ovlašteni za odobravanje lišće na bloku Termini
@@ -3798,64 +3878,66 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,kreiranje korisnika
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,gram
 DocType: Supplier Scorecard,Per Month,Mjesečno
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Posjetite izvješće za održavanje razgovora.
 DocType: Stock Entry,Update Rate and Availability,Ažuriranje Rate i raspoloživost
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Postotak koju smiju primiti ili isporučiti više od naručene količine. Na primjer: Ako ste naručili 100 jedinica. i tvoj ispravak je 10% onda se smiju primati 110 jedinica.
 DocType: POS Customer Group,Customer Group,Vrsta djelatnosti Kupaca
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),New Batch ID (opcionalno)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),New Batch ID (opcionalno)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Rashodi račun je obvezna za predmet {0}
 DocType: BOM,Website Description,Web stranica Opis
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Neto promjena u kapitalu
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Najnoviji
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Molimo vas da otkaže fakturi {0} prvi
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail adresa mora biti jedinstvena, već postoji za {0}"
 DocType: Serial No,AMC Expiry Date,AMC Datum isteka
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,priznanica
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,priznanica
 ,Sales Register,Prodaja Registracija
 DocType: Daily Work Summary Settings Company,Send Emails At,Pošalji e-mailova
 DocType: Quotation,Quotation Lost Reason,Razlog nerealizirane ponude
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Odaberite Domain
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',izaberite * iz tabPatient gdje ime = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Transakcija Ref {0} od {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Transakcija Ref {0} od {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ne postoji ništa za uređivanje .
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Form View
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Sažetak za ovaj mjesec i aktivnostima na čekanju
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Form View
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Sažetak za ovaj mjesec i aktivnostima na čekanju
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Dodajte korisnike u svoju organizaciju, osim sebe."
 DocType: Customer Group,Customer Group Name,Naziv vrste djelatnosti Kupca
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Ne Kupci još!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Ne Kupci još!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Izvještaj o novčanim tokovima
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Iznos kredita ne može biti veći od Maksimalni iznos kredita od {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licenca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Molimo vas da uklonite ovu fakture {0} iz C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Molimo vas da uklonite ovu fakture {0} iz C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Molimo odaberite prenositi ako želite uključiti prethodnoj fiskalnoj godini je ravnoteža ostavlja na ovoj fiskalnoj godini
 DocType: GL Entry,Against Voucher Type,Protiv voucher vrsti
 DocType: Physician,Phone (R),Telefon (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Dodato je vremenska utrka
 DocType: Item,Attributes,Atributi
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Omogući šablon
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Molimo postavite Naming Series za {0} preko Setup&gt; Settings&gt; Series Naming
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Unesite otpis račun
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Last Order Datum
 DocType: Patient,B Negative,B Negativno
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Računa {0} ne pripada kompaniji {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Serijski brojevi u nizu {0} ne odgovara otpremnica
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Serijski brojevi u nizu {0} ne odgovara otpremnica
 DocType: Student,Guardian Details,Guardian Detalji
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Prisustvo za više zaposlenih
 DocType: Vehicle,Chassis No,šasija Ne
 DocType: Payment Request,Initiated,Inicirao
 DocType: Production Order,Planned Start Date,Planirani Ozljede Datum
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Izaberite BOM
 DocType: Serial No,Creation Document Type,Tip stvaranje dokumenata
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Krajnji datum mora biti veći od početnog datuma
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Krajnji datum mora biti veći od početnog datuma
 DocType: Leave Type,Is Encash,Je li unovčiti
 DocType: Leave Allocation,New Leaves Allocated,Novi Leaves Dodijeljeni
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projekat - mudar podaci nisu dostupni za ponudu
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Završi
 DocType: Project,Expected End Date,Očekivani Datum završetka
 DocType: Budget Account,Budget Amount,budžet Iznos
 DocType: Appraisal Template,Appraisal Template Title,Procjena Predložak Naslov
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Od datuma {0} za zaposlenog {1} ne može biti prije ulaska Datum zaposlenog {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,trgovački
 DocType: Patient,Alcohol Current Use,Upotreba alkohola
+DocType: Student Admission Program,Student Admission Program,Studentski program za prijem studenata
 DocType: Payment Entry,Account Paid To,Račun Paid To
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Roditelj Stavka {0} ne smije biti Stock Item
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Svi proizvodi i usluge.
@@ -3864,30 +3946,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budžeta za računa {1} protiv {2} {3} je {4}. To će premašiti po {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Red {0} # računa mora biti tipa &#39;osnovna sredstva&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Od kol
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Pravila za izračun shipping iznos za prodaju
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,i unchcked Onemogućeno u
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Serija je obvezno
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,financijske usluge
 DocType: Student Sibling,Student ID,student ID
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Vrste aktivnosti za vrijeme Trupci
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,E-pošta dobavljača
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Vrste aktivnosti za vrijeme Trupci
 DocType: Tax Rule,Sales,Prodaja
 DocType: Stock Entry Detail,Basic Amount,Osnovni iznos
 DocType: Training Event,Exam,ispit
 DocType: Complaint,Complaint,Žalba
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
 DocType: Leave Allocation,Unused leaves,Neiskorišteni lišće
 DocType: Patient,Alcohol Past Use,Upotreba alkohola u prošlosti
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,State billing
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Prijenos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Prijenos
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
 DocType: Authorization Rule,Applicable To (Employee),Odnosi se na (Radnik)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Due Date je obavezno
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Due Date je obavezno
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Prirast za Atributi {0} ne može biti 0
 DocType: Journal Entry,Pay To / Recd From,Platiti Da / RecD Od
 DocType: Naming Series,Setup Series,Postavljanje Serija
 DocType: Payment Reconciliation,To Invoice Date,Da biste Datum računa
 DocType: Supplier,Contact HTML,Kontakt HTML
 ,Inactive Customers,neaktivnih kupaca
+DocType: Student Admission Program,Maximum Age,Maksimalno doba
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Kupovina Primici
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Kako se primjenjuje pravilo cijena?
@@ -3906,6 +3990,7 @@
 DocType: GL Entry,Remarks,Primjedbe
 DocType: Payment Entry,Account Paid From,Računa isplaćuju iz
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Sirovine Stavka Šifra
+DocType: Task,Parent Task,Zadatak roditelja
 DocType: Journal Entry,Write Off Based On,Otpis na temelju
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Make Olovo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Print i pribora
@@ -3914,19 +3999,19 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Plaća je već pripremljena za period od {0} i {1}, Ostavi period aplikacija ne može da bude između tog datuma opseg."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Instalacijski zapis za serijski broj
 DocType: Guardian Interest,Guardian Interest,Guardian interesa
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Podesi podrazumevane vrednosti za POS Račune
 apps/erpnext/erpnext/config/hr.py +177,Training,trening
 DocType: Timesheet,Employee Detail,Detalji o radniku
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Email ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,Sljedeći datum dan i Ponovite na Dan Mjesec mora biti jednak
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Sljedeći datum dan i Ponovite na Dan Mjesec mora biti jednak
 DocType: Lab Prescription,Test Code,Test Code
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Postavke za web stranice homepage
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ-ovi nisu dozvoljeni za {0} zbog stanja karte za rezultat {1}
 DocType: Offer Letter,Awaiting Response,Čeka se odgovor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Iznad
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Ukupni iznos {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Nevažeći atributa {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Ukupni iznos {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Nevažeći atributa {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Navesti ukoliko nestandardnog plaća račun
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Isto artikal je ušao više puta. {List}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',"Molimo odaberite grupu procjene, osim &#39;Svi Procjena grupe&#39;"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Red {0}: Troškovni centar je potreban za stavku {1}
 DocType: Training Event Employee,Optional,Neobavezno
@@ -3949,19 +4034,20 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: trošak je obvezan za artikal {2}
 DocType: Vehicle,Policy No,Politika Nema
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Saznajte Predmeti od Bundle proizvoda
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Pošto postoji zaliha u odnosu na stavku {0}, ne možete omogućiti svojstvo varijanti"
 DocType: Asset,Straight Line,Duž
 DocType: Project User,Project User,Korisnik projekta
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Podijeliti
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Podijeliti
 DocType: GL Entry,Is Advance,Je avans
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Gledatelja Od datuma i posjećenost do sada je obvezno
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,Unesite ' Je podugovoren ' kao da ili ne
+DocType: Item,Default Purchase Unit of Measure,Podrazumevana jedinica kupovine mjere
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Zadnje Komunikacija Datum
 DocType: Sales Team,Contact No.,Kontakt broj
 DocType: Bank Reconciliation,Payment Entries,plaćanje unosi
 DocType: Production Order,Scrap Warehouse,Scrap Skladište
 DocType: Production Order,Check if material transfer entry is not required,Provjerite da li se ne traži upis prenosa materijala
 DocType: Program Enrollment Tool,Get Students From,Get Studenti iz
-DocType: Hub Settings,Seller Country,Prodavač Država
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Objavite Artikli na sajtu
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Grupa svojim učenicima u serijama
 DocType: Authorization Rule,Authorization Rule,Autorizacija Pravilo
@@ -3971,7 +4057,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Prodaja poreza i naknada Template
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Ukupno (kredit)
 DocType: Repayment Schedule,Payment Date,Datum plaćanja
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,New Batch Količina
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,New Batch Količina
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Odjeća i modni dodaci
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,Nije moguće riješiti funkciju ponderisane ocjene. Proverite da li je formula validna.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Broj Order
@@ -3989,6 +4075,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} ne može se podnijeti, to je već {2}"
 DocType: Tax Rule,Billing Country,Billing Country
 DocType: Purchase Order Item,Expected Delivery Date,Očekivani rok isporuke
+DocType: Restaurant Order Entry,Restaurant Order Entry,Restoran za unos naloga
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debitne i kreditne nije jednaka za {0} {1} #. Razlika je u tome {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Zabava Troškovi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Make Materijal Upit
@@ -4001,9 +4088,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Konto sa postojećim transakcijama se ne može izbrisati
 DocType: Vehicle,Last Carbon Check,Zadnji Carbon Check
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Pravni troškovi
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Molimo odaberite Količina na red
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Molimo odaberite Količina na red
 DocType: Purchase Invoice,Posting Time,Objavljivanje Vrijeme
 DocType: Timesheet,% Amount Billed,% Naplaćenog iznosa
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Vreme po imenovanju&quot; nije postavljeno za Dr {0}. Dodajte ga u glavu lekara.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefonski troškovi
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Označite ovo ako želite prisiliti korisniku odabir seriju prije spremanja. Tu će biti zadana ako to provjerili.
@@ -4014,6 +4102,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Customer prihoda
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,putni troškovi
 DocType: Maintenance Visit,Breakdown,Slom
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Dodajte prilagođeno polje Pretplata u doctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Račun: {0} s valutnom: {1} se ne mogu odabrati
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Automatsko ažuriranje troškova BOM-a putem Planera, na osnovu najnovije procene stope / cenovnika / poslednje stope sirovina."
 DocType: Bank Reconciliation Detail,Cheque Date,Datum čeka
@@ -4038,7 +4127,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Ukupna naplata (iz Time Log-a)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Dobavljač Id
 DocType: Payment Request,Payment Gateway Details,Payment Gateway Detalji
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Količina bi trebao biti veći od 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Količina bi trebao biti veći od 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Dijete čvorovi se mogu kreirati samo pod &#39;Grupa&#39; tipa čvorova
 DocType: Leave Application,Half Day Date,Pola dana datum
@@ -4056,12 +4145,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Napomena : Stavka {0} upisan je više puta
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Svi kontakti.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Skraćeni naziv preduzeća
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Korisnik {0} ne postoji
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Korisnik {0} ne postoji
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Skraćenica
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Plaćanje Entry već postoji
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ne authroized od {0} prelazi granice
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Plaća predložak majstor .
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Patologija
+DocType: Restaurant Order Entry,Restaurant Table,Restoran Stol
 DocType: Leave Type,Max Days Leave Allowed,Max Dani Ostavite dopuštenih
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Set poreza Pravilo za košarica
 DocType: Purchase Invoice,Taxes and Charges Added,Porezi i naknade Dodano
@@ -4073,10 +4164,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Ponude za kupce ili potencijalne kupce.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Uloga dopuštenih urediti smrznute zalihe
 ,Territory Target Variance Item Group-Wise,Teritorij Target varijance artikla Group - Wise
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Sve grupe kupaca
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Sve grupe kupaca
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,akumulirani Mjesečno
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda knjigovodstveni zapis nije kreiran za {1} na {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Porez Template je obavezno.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Porez Template je obavezno.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Konto {0}: Nadređeni konto {1} ne postoji
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cjenik stopa (Društvo valuta)
 DocType: Products Settings,Products Settings,Proizvodi Postavke
@@ -4102,12 +4193,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Stavka Wise Porezna Detalj
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Institut Skraćenica
 ,Item-wise Price List Rate,Stavka - mudar Cjenovnik Ocijenite
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Dobavljač Ponuda
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Dobavljač Ponuda
 DocType: Quotation,In Words will be visible once you save the Quotation.,U riječi će biti vidljiv nakon što spremite ponudu.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Količina ({0}) ne može biti frakcija u nizu {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Barkod {0} se već koristi u artiklu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Barkod {0} se već koristi u artiklu {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Pravila za dodavanjem troškove prijevoza .
 DocType: Item,Opening Stock,otvaranje Stock
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kupac je obavezan
@@ -4126,9 +4217,8 @@
 DocType: Customer,From Lead,Od Lead-a
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Narudžbe objavljen za proizvodnju.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Odaberite fiskalnu godinu ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS Profil potrebno da bi POS upis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS Profil potrebno da bi POS upis
 DocType: Program Enrollment Tool,Enroll Students,upisati studenti
-DocType: Hub Settings,Name Token,Ime Token
 DocType: Lab Test,Approved Date,Odobreni datum
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardna prodaja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Atleast jednom skladištu je obavezno
@@ -4146,7 +4236,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Human Resource
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pomirenje Plaćanje Plaćanje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,porezna imovina
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Proizvodnja Poretka bio je {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Proizvodnja Poretka bio je {0}
 DocType: BOM Item,BOM No,BOM br.
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} nema obzir {1} ili su već usklađene protiv drugih vaučer
@@ -4166,7 +4256,7 @@
 DocType: Currency Exchange,To Currency,Valutno
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Dopusti sljedeći korisnici odobriti ostavite aplikacije za blok dana.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Vrste Rashodi zahtjevu.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},stopa za stavke prodaje {0} je niža od {1}. stopa prodaje bi trebao biti atleast {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},stopa za stavke prodaje {0} je niža od {1}. stopa prodaje bi trebao biti atleast {2}
 DocType: Item,Taxes,Porezi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Platio i nije dostavila
 DocType: Project,Default Cost Center,Standard Cost Center
@@ -4180,15 +4270,15 @@
 DocType: Employee Loan,Fully Disbursed,potpuno Isplaćeno
 DocType: Maintenance Visit,Customer Feedback,Ocjena Kupca
 DocType: Account,Expense,rashod
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Rezultat ne može biti veća od maksimalne Score
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Rezultat ne može biti veća od maksimalne Score
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Kupci i dobavljači
 DocType: Item Attribute,From Range,Od Range
 DocType: BOM,Set rate of sub-assembly item based on BOM,Postavite brzinu stavke podkomponenta na osnovu BOM-a
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Sintaksa greška u formuli ili stanja: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Sintaksa greška u formuli ili stanja: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Svakodnevni rad Pregled Postavke kompanije
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,Artikal {0} se ignorira budući da nije skladišni artikal
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Pošaljite ovaj radnog naloga za daljnju obradu .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Pošaljite ovaj radnog naloga za daljnju obradu .
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Da se ne primjenjuje pravilo Cijene u određenoj transakciji, svim primjenjivim pravilima cijena bi trebala biti onemogućen."
 DocType: Assessment Group,Parent Assessment Group,Parent Procjena Group
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Posao
@@ -4205,12 +4295,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Molimo podesite Company filter prazno ako Skupina Od je &#39;Company&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Datum knjiženja ne može biti u budućnosti
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: {1} Serial No ne odgovara {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,za stvaranje ponavljajuće
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Casual dopust
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Lab Test UOM.
 DocType: Batch,Batch ID,ID serije
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Napomena : {0}
 ,Delivery Note Trends,Trendovi otpremnica
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Ovonedeljnom Pregled
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Ovonedeljnom Pregled
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Na skladištu Količina
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Račun: {0} može ažurirati samo preko Stock Transakcije
 DocType: Student Group Creation Tool,Get Courses,Get kursevi
@@ -4224,7 +4315,6 @@
 DocType: Purchase Order,To Bill,To Bill
 DocType: Material Request,% Ordered,% Poruceno
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Za studentske grupe na osnovu Naravno, kurs će biti potvrđeni za svakog studenta iz upisao jezika u upisu Programa."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","odvojene zarezima Unesite e-mail adresa, račun će biti automatski poslati poštom na određeni datum"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,rad plaćen na akord
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Prosj. Buying Rate
 DocType: Task,Actual Time (in Hours),Stvarno vrijeme (u satima)
@@ -4238,7 +4328,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Stavka {0} nije setup za serijski brojevi Stupac mora biti prazan
 DocType: Accounts Settings,Accounts Settings,Podešavanja konta
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,odobriti
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Nije rezultat koji se šalje
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Nije rezultat koji se šalje
 DocType: Customer,Sales Partner and Commission,Prodajnog partnera i Komisije
 DocType: Employee Loan,Rate of Interest (%) / Year,Kamatnu stopu (%) / godina
 ,Project Quantity,projekt Količina
@@ -4250,55 +4340,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Crn
 DocType: BOM Explosion Item,BOM Explosion Item,BOM eksplozije artikla
 DocType: Account,Auditor,Revizor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} artikala proizvedenih
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} artikala proizvedenih
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Nauči više
 DocType: Cheque Print Template,Distance from top edge,Udaljenost od gornje ivice
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Popis Cijena {0} je isključena ili ne postoji
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Popis Cijena {0} je isključena ili ne postoji
 DocType: Purchase Invoice,Return,Povratak
 DocType: Production Order Operation,Production Order Operation,Proizvodnja Order Operation
 DocType: Pricing Rule,Disable,Ugasiti
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Način plaćanja je potrebno izvršiti uplatu
 DocType: Project Task,Pending Review,Na čekanju
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Imenovanja i konsultacije
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nije upisana u Batch {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nije upisana u Batch {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} ne može biti ukinuta, jer je već {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Ukupni rashodi potraživanja (preko rashodi potraživanje)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Odsutan
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Red {0}: Valuta sastavnicu # {1} treba da bude jednaka odabrane valute {2}
 DocType: Journal Entry Account,Exchange Rate,Tečaj
 DocType: Patient,Additional information regarding the patient,Dodatne informacije o pacijentu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,naknada Komponenta
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Fleet Management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Dodaj stavke iz
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Fleet Management
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Dodaj stavke iz
 DocType: Cheque Print Template,Regular,redovan
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Ukupno weightage svih Kriteriji ocjenjivanja mora biti 100%
-DocType: BOM,Last Purchase Rate,Zadnja kupovna cijena
+DocType: Purchase Order Item,Last Purchase Rate,Zadnja kupovna cijena
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Zadatak ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock ne može postojati za Stavka {0} od ima varijante
 DocType: Lab Test,Mobile,Mobilni
 ,Sales Person-wise Transaction Summary,Prodaja Osobne mudar Transakcija Sažetak
 DocType: Training Event,Contact Number,Kontakt broj
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Skladište {0} ne postoji
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registracije ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Skladište {0} ne postoji
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mjesečni Distribucija Procenat
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Izabrana stavka ne može imati Batch
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","stopa vrednovanja nije pronađen za Stavka {0}, koja je potrebna da uradi unosa računovodstvo za {1} {2}. Ako je stavka transakcijama kao uzorak stavka u {1}, molimo Vas da spomenuti da je u {1} Stavka stola. U suprotnom, molim te stvoriti dolazni zaliha transakcija za stopa vrednovanja stavku ili spominje u Stavka zapisnik, a zatim pokušajte podnošenja i popunjavanja / otkazivanje ovaj unos"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materijala dostavljenih protiv ove otpremnici
+DocType: Training Event,Has Certificate,Ima sertifikat
 DocType: Project,Customer Details,Korisnički podaci
 DocType: Employee,Reports to,Izvještaji za
 ,Unpaid Expense Claim,Neplaćeni Rashodi Preuzmi
 DocType: Payment Entry,Paid Amount,Plaćeni iznos
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Istražite kola prodaje
 DocType: Assessment Plan,Supervisor,nadzornik
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,online
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,online
 ,Available Stock for Packing Items,Raspoloživo stanje za pakirane proizvode
 DocType: Item Variant,Item Variant,Stavka Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Procjena Alat Rezultat
 DocType: BOM Scrap Item,BOM Scrap Item,BOM otpad Stavka
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Dostavljeni nalozi se ne može izbrisati
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Dostavljeni nalozi se ne može izbrisati
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje računa već u zaduženje, ne smiju postaviti 'ravnoteža se mora' kao 'kreditne'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,upravljanja kvalitetom
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Stavka {0} je onemogućena
@@ -4318,7 +4407,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: Timings sukobi s redom {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Dozvolite Zero Vrednovanje Rate
 DocType: Training Event Employee,Invited,pozvan
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Više aktivnih Plaća Strukture nađeni za zaposlenog {0} za navedeni datumi
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Više aktivnih Plaća Strukture nađeni za zaposlenog {0} za navedeni datumi
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Podešavanje Gateway račune.
 DocType: Employee,Employment Type,Zapošljavanje Tip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Dugotrajna imovina
@@ -4330,7 +4419,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Student-mail ID
 DocType: Employee,Notice (days),Obavijest (dani )
 DocType: Tax Rule,Sales Tax Template,Porez na promet Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Odaberite stavke za spremanje fakture
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Odaberite stavke za spremanje fakture
 DocType: Employee,Encashment Date,Encashment Datum
 DocType: Training Event,Internet,Internet
 DocType: Special Test Template,Special Test Template,Specijalni test šablon
@@ -4339,7 +4428,7 @@
 DocType: Production Order,Planned Operating Cost,Planirani operativnih troškova
 DocType: Academic Term,Term Start Date,Term Ozljede Datum
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},U prilogu {0} {1} #
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},U prilogu {0} {1} #
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Banka bilans po glavnoj knjizi
 DocType: Job Applicant,Applicant Name,Podnositelj zahtjeva Ime
 DocType: Authorization Rule,Customer / Item Name,Kupac / Stavka Ime
@@ -4359,7 +4448,7 @@
 DocType: Guardian,Guardian Of ,Guardian Of
 DocType: Grading Scale Interval,Threshold,prag
 DocType: BOM Update Tool,Current BOM,Trenutni BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Dodaj serijski broj
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Dodaj serijski broj
 DocType: Production Order Item,Available Qty at Source Warehouse,Dostupno Količina na izvoru Skladište
 apps/erpnext/erpnext/config/support.py +22,Warranty,garancija
 DocType: Purchase Invoice,Debit Note Issued,Debit Napomena Zadani
@@ -4382,10 +4471,9 @@
 DocType: Account,Receivable,potraživanja
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Nije dozvoljeno da se promijeniti dobavljača kao narudžbenicu već postoji
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Uloga koja je dopušteno podnijeti transakcije koje premašuju kreditnih ograničenja postavljena.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Odaberi stavke za proizvodnju
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Master podataka sinhronizaciju, to bi moglo da potraje"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Odaberi stavke za proizvodnju
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Master podataka sinhronizaciju, to bi moglo da potraje"
 DocType: Item,Material Issue,Materijal Issue
-DocType: Hub Settings,Seller Description,Prodavač Opis
 DocType: Employee Education,Qualification,Kvalifikacija
 DocType: Item Price,Item Price,Cijena artikla
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sapun i deterdžent
@@ -4393,7 +4481,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Od vremena ne može biti veća nego vremena.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Naručeno
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Nastavi
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Nastavi
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Ako je omogućeno, sistem neće ažurirati polja varijanti iz šablona, ali će kopirati podatke iz dolje navedenih polja dok pravite novu varijantu"
 DocType: Salary Detail,Component,sastavni
 DocType: Assessment Criteria,Assessment Criteria Group,Kriteriji procjene Group
 DocType: Healthcare Settings,Patient Name By,Ime pacijenta
@@ -4403,7 +4492,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Unesite Odobravanje ulogu ili Odobravanje korisnike
 DocType: Journal Entry,Write Off Entry,Napišite Off Entry
 DocType: BOM,Rate Of Materials Based On,Stopa materijali na temelju
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dobavljač&gt; Tip dobavljača
+DocType: Item Variant Settings,Do not Update Variants,Ne ažurirajte varijante
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Podrska za Analitiku
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Poništi sve
 DocType: POS Profile,Terms and Conditions,Odredbe i uvjeti
@@ -4412,7 +4501,7 @@
 DocType: Leave Block List,Applies to Company,Odnosi se na preduzeće
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,"Ne mogu otkazati , jer podnijela Stock Stupanje {0} postoji"
 DocType: Employee Loan,Disbursement Date,datuma isplate
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;Primaoci&#39; nisu navedeni
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Primaoci&#39; nisu navedeni
 DocType: BOM Update Tool,Update latest price in all BOMs,Ažurirajte najnoviju cenu u svim BOM
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Medicinski zapis
 DocType: Vehicle,Vehicle,vozilo
@@ -4427,14 +4516,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Imovine Amortizacija i vage
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Broj {0} {1} je prešao iz {2} u {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Broj {0} {1} je prešao iz {2} u {3}
 DocType: Sales Invoice,Get Advances Received,Kreiraj avansno primanje
 DocType: Email Digest,Add/Remove Recipients,Dodaj / ukloni primaoce
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Transakcija nije dopuštena protiv zaustavljena proizvodnja Reda {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Za postavljanje ove fiskalne godine kao zadano , kliknite na "" Set as Default '"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,pristupiti
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,pristupiti
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Nedostatak Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Stavka varijanta {0} postoji sa istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Stavka varijanta {0} postoji sa istim atributima
 DocType: Employee Loan,Repay from Salary,Otplatiti iz Plata
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Tražeći isplatu protiv {0} {1} za iznos {2}
@@ -4447,7 +4536,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Stavka narudžbe kupca
 DocType: Salary Slip,Payment Days,Plaćanja Dana
 DocType: Patient,Dormant,skriven
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Skladišta s djecom čvorovi se ne može pretvoriti u Ledger
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Skladišta s djecom čvorovi se ne može pretvoriti u Ledger
 DocType: BOM,Manage cost of operations,Upravljanje troškove poslovanja
 DocType: Accounts Settings,Stale Days,Zastareli dani
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Kada bilo koji od provjerenih transakcija &quot;Postavio&quot;, e-mail pop-up automatski otvorio poslati e-mail na povezane &quot;Kontakt&quot; u toj transakciji, s transakcijom u privitku. Korisnik može ili ne može poslati e-mail."
@@ -4461,10 +4550,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serijski Ne {0} već je primila
 ,Requested Items To Be Transferred,Traženi stavki za prijenos
 DocType: Expense Claim,Vehicle Log,vozilo se Prijavite
-DocType: Purchase Invoice,Recurring Id,Ponavljajući Id
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Prisustvo groznice (temperatura&gt; 38,5 ° C / 101,3 ° F ili trajna temperatura&gt; 38 ° C / 100,4 ° F)"
 DocType: Customer,Sales Team Details,Prodaja Team Detalji
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Obrisati trajno?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Obrisati trajno?
 DocType: Expense Claim,Total Claimed Amount,Ukupno Zatražio Iznos
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potencijalne prilike za prodaju.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Invalid {0}
@@ -4474,7 +4562,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Robne kuće
 ,Item Delivery Date,Datum isporuke artikla
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Podešavanje vaše škole u ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Podešavanje vaše škole u ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Promijeni Iznos (Company Valuta)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Nema računovodstvene unosi za sljedeće skladišta
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Spremite dokument prvi.
@@ -4486,13 +4574,12 @@
 DocType: Task,Is Milestone,je Milestone
 DocType: Daily Work Summary,Email Sent To,E-mail poslat
 DocType: Budget,Warn,Upozoriti
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Da li ste sigurni da želite da se odjavite?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bilo koji drugi primjedbe, napomenuti napor koji treba da ide u evidenciji."
 DocType: BOM,Manufacturing User,Proizvodnja korisnika
 DocType: Purchase Invoice,Raw Materials Supplied,Sirovine nabavlja
-DocType: Purchase Invoice,Recurring Print Format,Ponavlja Format
 DocType: C-Form,Series,serija
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Valuta cenovnika {0} mora biti {1} ili {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Dodajte proizvode
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Valuta cenovnika {0} mora biti {1} ili {2}
 DocType: Appraisal,Appraisal Template,Procjena Predložak
 DocType: Item Group,Item Classification,Stavka Klasifikacija
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Business Development Manager
@@ -4506,7 +4593,7 @@
 DocType: Item Attribute Value,Attribute Value,Vrijednost atributa
 ,Itemwise Recommended Reorder Level,Itemwise Preporučio redoslijeda Level
 DocType: Salary Detail,Salary Detail,Plaća Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Odaberite {0} Prvi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Odaberite {0} Prvi
 DocType: Appointment Type,Physician,Lekar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Batch {0} od {1} Stavka je istekla.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Konsultacije
@@ -4517,7 +4604,7 @@
 DocType: Salary Detail,Default Amount,Zadani iznos
 DocType: Lab Test Template,Descriptive,Deskriptivno
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Skladište nije pronađeno u sistemu
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Ovaj mjesec je sažetak
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Ovaj mjesec je sažetak
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvaliteta Inspekcija čitanje
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`blokiraj zalihe starije od podrazumijevanog manje od % d dana .
 DocType: Tax Rule,Purchase Tax Template,Porez na promet Template
@@ -4540,12 +4627,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Treninga / Rezultati
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Ispravka vrijednosti kao na
 DocType: Sales Invoice,C-Form Applicable,C-obrascu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Vrijeme rada mora biti veći od 0 za rad {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Vrijeme rada mora biti veći od 0 za rad {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Skladište je obavezno
 DocType: Supplier,Address and Contacts,Adresa i kontakti
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM pretvorbe Detalj
 DocType: Program,Program Abbreviation,program Skraćenica
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Proizvodnja Nalog ne može biti podignuta protiv Item Template
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Proizvodnja Nalog ne može biti podignuta protiv Item Template
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Naknade se ažuriraju u Kupovina Prijem protiv svaku stavku
 DocType: Warranty Claim,Resolved By,Riješen Do
 DocType: Bank Guarantee,Start Date,Datum početka
@@ -4571,26 +4658,27 @@
 DocType: Employee,Educational Qualification,Obrazovne kvalifikacije
 DocType: Workstation,Operating Costs,Operativni troškovi
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Akcija ako Akumulirani Mjesečni budžet Exceeded
-DocType: Purchase Invoice,Submit on creation,Dostavi na stvaranju
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Valuta za {0} mora biti {1}
+DocType: Subscription,Submit on creation,Dostavi na stvaranju
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Valuta za {0} mora biti {1}
 DocType: Asset,Disposal Date,odlaganje Datum
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E će biti poslana svim aktivnih radnika kompanije u datom sat, ako nemaju odmor. Sažetak odgovora će biti poslan u ponoć."
 DocType: Employee Leave Approver,Employee Leave Approver,Osoba koja odobrava izlaske zaposlenima
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Unos Ponovno red već postoji za to skladište {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Ne može proglasiti izgubili , jer citat je napravio ."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,trening Feedback
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Unos Ponovno red već postoji za to skladište {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Ne može proglasiti izgubili , jer citat je napravio ."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,trening Feedback
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Proizvodnja Red {0} mora biti podnesen
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Kriterijumi za ocenjivanje dobavljača
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Molimo odaberite datum početka i datum završetka za točke {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Kurs je obavezno u redu {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Do danas ne može biti prije od datuma
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Dodaj / Uredi cijene
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Dodaj / Uredi cijene
 DocType: Batch,Parent Batch,roditelja Batch
 DocType: Cheque Print Template,Cheque Print Template,Ček Ispis Template
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Grafikon troškovnih centara
 DocType: Lab Test Template,Sample Collection,Prikupljanje uzoraka
 ,Requested Items To Be Ordered,Traženi Proizvodi se mogu naručiti
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Moje narudžbe
 DocType: Price List,Price List Name,Cjenik Ime
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Svakodnevni rad Pregled za {0}
 DocType: Employee Loan,Totals,Ukupan rezultat
@@ -4609,12 +4697,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} jedinicama {1} potrebno {2} na {3} {4} za {5} da završi ovu transakciju.
 DocType: Fee Schedule,Student Category,student Kategorija
 DocType: Announcement,Student,student
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Organizacija jedinica ( odjela ) majstor .
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Organizacija jedinica ( odjela ) majstor .
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Idite u Sobe
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Unesite poruku prije slanja
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,DUPLICATE ZA SUPPLIER
 DocType: Email Digest,Pending Quotations,U očekivanju Citati
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Point-of-prodaju profil
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Point-of-prodaju profil
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Konfiguracije laboratorijskih testova.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,unsecured krediti
 DocType: Cost Center,Cost Center Name,Troška Name
@@ -4624,6 +4712,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Ukupno Paid Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Poruka veća od 160 karaktera će biti odvojena u više poruka
 DocType: Purchase Receipt Item,Received and Accepted,Primljeni i prihvaćeni
+DocType: Hub Settings,Company and Seller Profile,Profil firme i prodavca
 ,GST Itemised Sales Register,PDV Specificirane prodaje Registracija
 ,Serial No Service Contract Expiry,Serijski Bez isteka Ugovor o pružanju usluga
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Ne možete kreditnim i debitnim isti račun u isto vrijeme
@@ -4633,10 +4722,11 @@
 DocType: Item,Variant Based On,Varijanta na osnovu
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Ukupno bi trebalo biti dodijeljena weightage 100 % . To je {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Vaši dobavljači
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Molim vas ispravite
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Ne mogu se postaviti kao izgubljen kao prodajnog naloga je napravio .
 DocType: Request for Quotation Item,Supplier Part No,Dobavljač dio br
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Ne mogu odbiti kada kategorija je za &#39;Vrednovanje&#39; ili &#39;Vaulation i Total&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Dobili od
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Dobili od
 DocType: Lead,Converted,Pretvoreno
 DocType: Item,Has Serial No,Ima serijski br
 DocType: Employee,Date of Issue,Datum izdavanja
@@ -4644,7 +4734,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Prema Kupnja Postavke ako Kupovina Reciept željeni == &#39;DA&#39;, onda za stvaranje fakturi, korisnik treba prvo stvoriti račun za prodaju za stavku {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Row # {0}: Set dobavljač za stavku {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Red {0}: Radno vrijednost mora biti veća od nule.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Sajt Slika {0} prilogu Stavka {1} ne može biti pronađena
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Sajt Slika {0} prilogu Stavka {1} ne može biti pronađena
 DocType: Issue,Content Type,Vrsta sadržaja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Računar
 DocType: Item,List this Item in multiple groups on the website.,Popis ovaj predmet u više grupa na web stranici.
@@ -4655,14 +4745,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Kreiraj neusklađene ulaze
 DocType: Payment Reconciliation,From Invoice Date,Iz Datum računa
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Nemate dozvolu za slanje
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,Billing valuti mora biti jednak ili default comapany valuta ili stranka račun valuti
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Billing valuti mora biti jednak ili default comapany valuta ili stranka račun valuti
 DocType: Healthcare Settings,Laboratory Settings,Laboratorijske postavke
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Ostavite unovčenja
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Što učiniti ?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Za skladište
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Svi Student Prijemni
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Što učiniti ?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Za skladište
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Svi Student Prijemni
 ,Average Commission Rate,Prosječna stopa komisija
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,' Ima serijski broj ' ne može biti ' Da ' za artikle bez zalihe
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,' Ima serijski broj ' ne može biti ' Da ' za artikle bez zalihe
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Izaberite Status
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Gledatelji ne može biti označena za budući datum
 DocType: Pricing Rule,Pricing Rule Help,Cijene Pravilo Pomoć
@@ -4680,40 +4770,40 @@
 DocType: Item,Customer Code,Kupac Šifra
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Rođendan Podsjetnik za {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dana od posljednje narudžbe
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Zaduženja na račun mora biti bilans stanja računa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Zaduženja na račun mora biti bilans stanja računa
 DocType: Buying Settings,Naming Series,Imenovanje serije
 DocType: Leave Block List,Leave Block List Name,Ostavite popis imena Block
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Datum osiguranje Početak bi trebao biti manji od datuma osiguranje Kraj
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Molimo vas da postavite sistem imenovanja instruktora u školi&gt; Postavke škole
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,dionicama u vrijednosti
 DocType: Timesheet,Production Detail,proizvodnja Detail
+DocType: Restaurant,Active Menu,Aktivni meni
 DocType: Target Detail,Target Qty,Ciljana Kol
 DocType: Shopping Cart Settings,Checkout Settings,Plaćanje Postavke
 DocType: Attendance,Present,Sadašnje
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Otpremnica {0} ne smije biti potvrđena
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Otpremnica {0} ne smije biti potvrđena
 DocType: Notification Control,Sales Invoice Message,Poruka prodajnog  računa
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Zatvaranje računa {0} mora biti tipa odgovornosti / Equity
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Plaća listić od zaposlenika {0} već kreirali za vrijeme stanja {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Plaća listić od zaposlenika {0} već kreirali za vrijeme stanja {1}
 DocType: Vehicle Log,Odometer,mjerač za pređeni put
 DocType: Sales Order Item,Ordered Qty,Naručena kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Stavka {0} je onemogućeno
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Stavka {0} je onemogućeno
 DocType: Stock Settings,Stock Frozen Upto,Kataloški Frozen Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM ne sadrži nikakve zaliha stavka
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Projektna aktivnost / zadatak.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM ne sadrži nikakve zaliha stavka
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Projektna aktivnost / zadatak.
 DocType: Vehicle Log,Refuelling Details,Dopuna goriva Detalji
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generiranje plaće gaćice
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Kupnja treba provjeriti, ako je primjenjivo za odabrano kao {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabatt mora biti manji od 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Zadnje kupovinu stopa nije pronađen
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Otpis Iznos (poduzeća Valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Billing Hours
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,Uobičajeno sastavnice za {0} nije pronađen
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Row # {0}: Molimo set Ponovno redj količinu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Uobičajeno sastavnice za {0} nije pronađen
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Row # {0}: Molimo set Ponovno redj količinu
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Dodirnite stavke da biste ih dodali ovdje
 DocType: Fees,Program Enrollment,Upis program
 DocType: Landed Cost Voucher,Landed Cost Voucher,Sleteo Cost vaučera
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Molimo postavite {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Ponovite na dan u mjesecu
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} je neaktivan student
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} je neaktivan student
 DocType: Employee,Health Details,Zdravlje Detalji
 DocType: Offer Letter,Offer Letter Terms,Ponuda Pismo Uvjeti
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Za kreiranje plaćanja Zahtjev je potrebno referentni dokument
@@ -4721,7 +4811,6 @@
 DocType: Employee External Work History,Salary,Plata
 DocType: Serial No,Delivery Document Type,Dokument isporuke - tip
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Slanje sve plaće gaćice za gore odabranih kriterija
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Atikli azurirani
 DocType: Sales Order,Partly Delivered,Djelomično Isporučeno
 DocType: Email Digest,Receivables,Potraživanja
 DocType: Lead Source,Lead Source,Izvor potencijalnog kupca
@@ -4743,19 +4832,19 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Starenje Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Snaga
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM zamijenjeno
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Izaberite stavke na osnovu datuma isporuke
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Izaberite stavke na osnovu datuma isporuke
 ,Sales Analytics,Prodajna analitika
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Dostupno {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Dostupno {0}
 ,Prospects Engaged But Not Converted,Izgledi Engaged Ali ne pretvaraju
 DocType: Manufacturing Settings,Manufacturing Settings,Proizvodnja Settings
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Postavljanje e-pošte
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Mobile Nema
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Unesite zadanu valutu u tvrtki Master
 DocType: Stock Entry Detail,Stock Entry Detail,Kataloški Stupanje Detalj
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Dnevni podsjetnik
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Dnevni podsjetnik
 DocType: Products Settings,Home Page is Products,Početna stranica su proizvodi
 ,Asset Depreciation Ledger,Asset Amortizacija Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Porez pravilo sukoba sa {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Porez pravilo sukoba sa {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Naziv novog naloga
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Sirovine Isporuka Troškovi
 DocType: Selling Settings,Settings for Selling Module,Postavke za prodaju modul
@@ -4769,8 +4858,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Stavka {0} mora bitistock Stavka
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Uobičajeno Work in Progress Skladište
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Zadane postavke za računovodstvene poslove.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Molimo da podesite sistem imenovanja zaposlenih u ljudskim resursima&gt; HR Settings
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Očekivani datum ne može biti prije Materijal Zahtjev Datum
+DocType: Restaurant,Default Tax Template,Podrazumevani obrazac poreza
 DocType: Fees,Student Details,Student Detalji
 DocType: Purchase Invoice Item,Stock Qty,zalihama Količina
 DocType: Employee Loan,Repayment Period in Months,Rok otplate u mjesecima
@@ -4788,8 +4878,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Idi na stavke
 DocType: Sales Partner,Partner Type,Partner Tip
 DocType: Purchase Taxes and Charges,Actual,Stvaran
+DocType: Restaurant Menu,Restaurant Manager,Restoran menadžer
 DocType: Authorization Rule,Customerwise Discount,Customerwise Popust
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Timesheet za zadatke.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Timesheet za zadatke.
 DocType: Purchase Invoice,Against Expense Account,Protiv Rashodi račun
 DocType: Production Order,Production Order,Proizvodnja Red
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Napomena instalacije {0} je već potvrđena
@@ -4797,7 +4888,6 @@
 DocType: Quotation Item,Against Docname,Protiv Docname
 DocType: SMS Center,All Employee (Active),Svi zaposleni (aktivni)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Pregled Sada
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Odaberite razdoblje kada faktura će biti generiran automatski
 DocType: BOM,Raw Material Cost,Troškovi sirovina
 DocType: Item Reorder,Re-Order Level,Re-order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Unesite stavke i planirani Količina za koje želite povećati proizvodne naloge ili preuzimanje sirovine za analizu.
@@ -4810,23 +4900,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Vrsta izvjestaja je obavezna
 DocType: Item,Serial Number Series,Serijski broj serije
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Skladište je obvezno za skladišne proizvode {0} u redu {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Dodaj programe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Trgovina na veliko i
 DocType: Issue,First Responded On,Prvi put odgovorio dana
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Oglas tačke u više grupa
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiskalna godina Datum početka i datum završetka fiskalne godine već su postavljeni u fiskalnoj godini {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Razmak Datum ažurira
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split Batch
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Uspješno Pomirio
 DocType: Request for Quotation Supplier,Download PDF,Preuzmi PDF
 DocType: Production Order,Planned End Date,Planirani Završni datum
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Molimo unesite datum rasporeda
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Gdje predmeti su pohranjeni.
 DocType: Request for Quotation,Supplier Detail,dobavljač Detail
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Greška u formuli ili stanja: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Greška u formuli ili stanja: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Fakturisanog
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Tegovi kriterijuma moraju dodati do 100%
 DocType: Attendance,Attendance,Pohađanje
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,Stock Predmeti
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,Stock Predmeti
 DocType: BOM,Materials,Materijali
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ako nije označeno, popis će biti dodan u svakom odjela gdje se mora primjenjivati."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Izvor i Target skladište ne može biti isto
@@ -4844,6 +4934,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,Na Net Total
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Vrijednost za Atributi {0} mora biti u rasponu od {1} na {2} u koracima od {3} za Stavka {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Target skladište u redu {0} mora biti ista kao Production Order
+DocType: Restaurant Reservation,Waitlisted,Waitlisted
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Valuta ne mogu se mijenjati nakon što unose preko neke druge valute
 DocType: Vehicle Service,Clutch Plate,kvačila
 DocType: Company,Round Off Account,Zaokružiti račun
@@ -4860,7 +4951,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Ime prodaja novih lica
 DocType: Packing Slip,Gross Weight UOM,Bruto težina UOM
 DocType: Delivery Note Item,Against Sales Invoice,Protiv prodaje fakture
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Unesite serijski brojevi za serijalizovanoj stavku
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Unesite serijski brojevi za serijalizovanoj stavku
 DocType: Bin,Reserved Qty for Production,Rezervirano Količina za proizvodnju
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Ostavite nekontrolisano ako ne želite uzeti u obzir batch prilikom donošenja grupe naravno na bazi.
 DocType: Asset,Frequency of Depreciation (Months),Učestalost amortizacije (mjeseci)
@@ -4871,7 +4962,7 @@
 DocType: Lab Test,Test Group,Test grupa
 DocType: Payment Reconciliation,Receivable / Payable Account,Potraživanja / Account plaćaju
 DocType: Delivery Note Item,Against Sales Order Item,Protiv naloga prodaje Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Molimo navedite vrijednost atributa za atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Molimo navedite vrijednost atributa za atribut {0}
 DocType: Item,Default Warehouse,Glavno skladište
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budžet se ne može dodijeliti protiv grupe računa {0}
 DocType: Healthcare Settings,Patient Registration,Registracija pacijenata
@@ -4900,6 +4991,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Referent prodaje
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Budžet i troškova Center
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Višestruki način plaćanja nije dozvoljen
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,za
 ,Appointment Analytics,Imenovanje analitike
 DocType: Vehicle Service,Half Yearly,Polu godišnji
 DocType: Lead,Blog Subscriber,Blog pretplatnik
@@ -4917,7 +5009,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,quot Count
 ,BOM Stock Report,BOM Stock Report
 DocType: Stock Reconciliation Item,Quantity Difference,Količina Razlika
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Obrada Payroll
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Obrada Payroll
 DocType: Opportunity Item,Basic Rate,Osnovna stopa
 DocType: GL Entry,Credit Amount,Iznos kredita
 DocType: Cheque Print Template,Signatory Position,potpisnik Pozicija
@@ -4931,12 +5023,12 @@
 DocType: Tax Rule,Tax Rule,Porez pravilo
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Održavati ista stopa Tijekom cijele prodajni ciklus
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planirajte vrijeme za rezanje izvan Workstation Radno vrijeme.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Kupci u Queue
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} nema raspored lekara. Dodajte ga u majstora lekara
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Kupci u Queue
 DocType: Student,Nationality,državljanstvo
 ,Items To Be Requested,Potraživani artikli
-DocType: Purchase Order,Get Last Purchase Rate,Kreiraj zadnju nabavnu cijenu
 DocType: Company,Company Info,Podaci o preduzeću
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Odaberite ili dodati novi kupac
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Odaberite ili dodati novi kupac
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Troška je potrebno rezervirati trošak tvrdnju
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Primjena sredstava ( aktiva )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,To se temelji na prisustvo ovog zaposlenih
@@ -4944,6 +5036,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Zaduži račun
 DocType: Fiscal Year,Year Start Date,Početni datum u godini
 DocType: Attendance,Employee Name,Ime i prezime radnika
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restoran za unos stavke
 DocType: Sales Invoice,Rounded Total (Company Currency),Zaobljeni Ukupno (Društvo valuta)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Ne mogu da konvertovanje Group, jer je izabran Account Type."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} je izmijenjen . Osvježite stranicu.
@@ -4954,6 +5047,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Primanja zaposlenih
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Prepuna količina mora biti jednaka količina za točku {0} je u redu {1}
 DocType: Production Order,Manufactured Qty,Proizvedeno Kol
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Izrada fakture
 DocType: Purchase Receipt Item,Accepted Quantity,Prihvaćena količina
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Molimo podesite default odmor Lista za zaposlenog {0} ili kompanije {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} ne postoji
@@ -4963,18 +5057,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},No red {0}: Iznos ne može biti veći od čekanju Iznos protiv rashodi potraživanje {1}. Na čekanju iznos je {2}
 DocType: Maintenance Schedule,Schedule,Raspored
 DocType: Account,Parent Account,Roditelj račun
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Dostupno
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Dostupno
 DocType: Quality Inspection Reading,Reading 3,Čitanje 3
 ,Hub,Čvor
 DocType: GL Entry,Voucher Type,Bon Tip
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Cjenik nije pronađena ili invaliditetom
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Cjenik nije pronađena ili invaliditetom
 DocType: Lab Test,Approved,Odobreno
 DocType: Pricing Rule,Price,Cijena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo '
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo '
+DocType: Hub Settings,Last Sync On,Poslednja sinhronizacija uključena
 DocType: Guardian,Guardian,staratelj
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Procjena {0} stvorena za zaposlenika {1} u određenom razdoblju
 DocType: Employee,Education,Obrazovanje
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,del
 DocType: Selling Settings,Campaign Naming By,Imenovanje kampanja po
 DocType: Employee,Current Address Is,Trenutni Adresa je
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Mesečna prodajna meta (
@@ -4989,7 +5084,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Šifra predmeta:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Unesite trošak računa
 DocType: Account,Stock,Zaliha
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Referenca Vrsta dokumenta mora biti jedan od Narudžbenice, fakturi ili Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Referenca Vrsta dokumenta mora biti jedan od Narudžbenice, fakturi ili Journal Entry"
 DocType: Employee,Current Address,Trenutna adresa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ako proizvod varijanta druge stavke onda opis, slike, cijene, poreze itd će biti postavljena iz predloška, osim ako izričito navedeno"
 DocType: Serial No,Purchase / Manufacture Details,Kupnja / Proizvodnja Detalji
@@ -5020,7 +5115,7 @@
 DocType: Hub Settings,Hub Settings,Hub Settings
 DocType: Project,Gross Margin %,Bruto marža %
 DocType: BOM,With Operations,Uz operacije
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Računovodstvo stavke su već učinjeni u valuti {0} {1} za firmu. Molimo odaberite potraživanja ili platiti račun s valutnom {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Računovodstvo stavke su već učinjeni u valuti {0} {1} za firmu. Molimo odaberite potraživanja ili platiti račun s valutnom {0}.
 DocType: Asset,Is Existing Asset,Je Postojeći imovine
 DocType: Salary Detail,Statistical Component,statistička komponenta
 DocType: Warranty Claim,If different than customer address,Ako se razlikuje od kupaca adresu
@@ -5028,13 +5123,14 @@
 DocType: BOM Operation,BOM Operation,BOM operacija
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Na prethodnu Row visini
 DocType: Student,Home Address,Kućna adresa
+DocType: Item,Has Expiry Date,Ima datum isteka
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Postavke varijante postavki.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transfer imovine
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,Transfer imovine
 DocType: POS Profile,POS Profile,POS profil
 DocType: Training Event,Event Name,Naziv događaja
 DocType: Physician,Phone (Office),Telefon (Office)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,upis
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Priznanja za {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,upis
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Priznanja za {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Sezonski za postavljanje budžeta, ciljeva itd"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Ime promenljive
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Stavka {0} je predložak, odaberite jednu od njegovih varijanti"
@@ -5043,7 +5139,7 @@
 DocType: Assessment Plan,Room,soba
 DocType: Purchase Order,Advance Paid,Advance Paid
 DocType: Item,Item Tax,Porez artikla
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Materijal dobavljaču
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Materijal dobavljaču
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Akcizama Račun
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Prag {0}% se pojavljuje više od jednom
 DocType: Expense Claim,Employees Email Id,Zaposlenici Email ID
@@ -5054,32 +5150,30 @@
 DocType: Program,Program Name,Naziv programa
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Razmislite poreza ili pristojbi za
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Stvarni Qty je obavezno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} trenutno ima {1} Scorecard stava, a narudžbine za ovaj dobavljač treba izdati oprezno."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} trenutno ima {1} Scorecard stava, a narudžbine za ovaj dobavljač treba izdati oprezno."
 DocType: Employee Loan,Loan Type,Vrsta kredita
 DocType: Scheduling Tool,Scheduling Tool,zakazivanje alata
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,kreditna kartica
 DocType: BOM,Item to be manufactured or repacked,Artikal će biti proizveden ili prepakiran
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Zadane postavke za burzovne transakcije.
-DocType: Purchase Invoice,Next Date,Sljedeći datum
 DocType: Employee Education,Major/Optional Subjects,Glavni / Izborni predmeti
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
+DocType: Hub Settings,Suspended,Suspendirano
 DocType: Training Event,Attendees,Polaznici
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Ovdje možete održavati obiteljske pojedinosti kao što su ime i okupacije roditelja, supružnika i djecu"
 DocType: Academic Term,Term End Date,Term Završni datum
-DocType: Hub Settings,Seller Name,Ime Prodavač
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Porezi i naknade Umanjenja (Društvo valuta)
 DocType: Item Group,General Settings,General Settings
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Od valute i valuta ne mogu biti isti
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Add Instructors
 DocType: Stock Entry,Repack,Prepakovati
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Morate spremiti obrazac prije nastavka
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Molimo prvo odaberite Kompaniju
 DocType: Item Attribute,Numeric Values,Brojčane vrijednosti
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Priložiti logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Stock Nivoi
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Stock Nivoi
 DocType: Customer,Commission Rate,Komisija Stopa
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Napravljene {0} pokazivačke karte za {1} između:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Make Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Make Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blok ostaviti aplikacija odjelu.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Plaćanje Tip mora biti jedan od Primi, Pay i unutrašnje Transfer"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analitika
@@ -5094,11 +5188,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Kapitala
 DocType: Shopping Cart Settings,Show Public Attachments,Pokaži Javna Prilozi
 DocType: Packing Slip,Package Weight Details,Težina paketa - detalji
+DocType: Restaurant Reservation,Reservation Time,Vrijeme rezervacije
 DocType: Payment Gateway Account,Payment Gateway Account,Payment Gateway računa
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Nakon završetka uplate preusmjeriti korisnika na odabrani stranicu.
 DocType: Company,Existing Company,postojeći Company
 DocType: Healthcare Settings,Result Emailed,Rezultat poslat
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","Porez Kategorija je promijenjen u &quot;Total&quot;, jer svi proizvodi bez stanju proizvodi"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Šifra proizvoda&gt; Grupa proizvoda&gt; Marka
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Odaberite CSV datoteku
 DocType: Student Leave Application,Mark as Present,Mark kao Present
 DocType: Supplier Scorecard,Indicator Color,Boja boje
@@ -5123,11 +5219,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Make Student Batch
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Je Carry Naprijed
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Potencijalni kupac - ukupno dana
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Slanje poruka Datum mora biti isti kao i datum kupovine {1} od imovine {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Označite ovu ako student boravi na Instituta Hostel.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Molimo unesite Prodajni nalozi u gornjoj tablici
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Molimo unesite Prodajni nalozi u gornjoj tablici
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Nije dostavila Plaća Slips
 ,Stock Summary,Stock Pregled
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Transfer imovine iz jednog skladišta u drugo
@@ -5143,5 +5239,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debitne stavka ne može se povezati sa {1}
 DocType: Journal Entry,Subscription Section,Subscription Section
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Konto {0} ne postoji
+DocType: Training Event,Training Program,Program obuke
 DocType: Account,Cash,Gotovina
 DocType: Employee,Short biography for website and other publications.,Kratka biografija za web stranice i druge publikacije.
diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv
index d92f875..fa48354 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Salary Mode
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Registre
 DocType: Patient,Divorced,Divorciat
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Productes ja sincronitzen
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permetre article a afegir diverses vegades en una transacció
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancel·la material Visita {0} abans de cancel·lar aquest reclam de garantia
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Productes de Consum
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Aprovadors d'absències
 DocType: Sales Partner,Dealer,Comerciant
 DocType: Consultation,Investigations,Investigacions
+DocType: Restaurant Order Entry,Click Enter To Add,Feu clic a Intro per afegir
 DocType: Employee,Rented,Llogat
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Aplicable per a l&#39;usuari
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Detingut ordre de producció no es pot cancel·lar, unstop primer per cancel·lar"
 DocType: Vehicle Service,Mileage,quilometratge
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,De veres voleu rebutjar aquest actiu?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,De veres voleu rebutjar aquest actiu?
 DocType: Drug Prescription,Update Schedule,Actualitza la programació
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Tria un proveïdor predeterminat
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Informa de la divisa pera la Llista de preus {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Comprova disponibilitat
 DocType: Job Applicant,Job Applicant,Job Applicant
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Això es basa en transaccions amb aquest proveïdor. Veure cronologia avall per saber més
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,No hi ha més resultats.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Legal
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Impost de tipus real no pot ser inclòs en el preu de l&#39;article a la fila {0}
 DocType: Bank Guarantee,Customer,Client
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Tipus de canvi ha de ser el mateix que {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nom del client
 DocType: Vehicle,Natural Gas,Gas Natural
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Compte bancari no pot ser nomenat com {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Compte bancari no pot ser nomenat com {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Capçaleres (o grups) contra els quals es mantenen els assentaments comptables i els saldos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Excedent per {0} no pot ser menor que zero ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,No hi ha enviaments salaris enviats per processar.
 DocType: Manufacturing Settings,Default 10 mins,Per defecte 10 minuts
 DocType: Leave Type,Leave Type Name,Deixa Tipus Nom
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Mostra oberts
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,És necessari prendre aquesta acció avui mateix per a l&#39;esmentat recurrent
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Sèrie actualitzat correctament
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,caixa
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural entrada de diari Enviat
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Articles a rebre de l'ordre de compra
 DocType: SMS Center,All Supplier Contact,Contacte de Tot el Proveïdor
 DocType: Support Settings,Support Settings,Configuració de respatller
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Esperat Data de finalització no pot ser inferior a Data prevista d&#39;inici
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Esperat Data de finalització no pot ser inferior a Data prevista d&#39;inici
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Taxa ha de ser el mateix que {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Nova aplicació Deixar
 ,Batch Item Expiry Status,Lots article Estat de caducitat
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Lletra bancària
 DocType: Mode of Payment Account,Mode of Payment Account,Mode de Compte de Pagament
 DocType: Consultation,Consultation,Consulta
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Vendes i devolucions
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Mostra variants
 DocType: Academic Term,Academic Term,període acadèmic
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,material
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sanitari
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Retard en el pagament (dies)
 DocType: Lab Prescription,Lab Prescription,Prescripció del laboratori
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Ordena per Preu
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,despesa servei
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de sèrie: {0} ja es fa referència en factura de venda: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Factura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de sèrie: {0} ja es fa referència en factura de venda: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodicitat
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Any fiscal {0} és necessari
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensa
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Fila # {0}:
 DocType: Timesheet,Total Costing Amount,Suma càlcul del cost total
 DocType: Delivery Note,Vehicle No,Vehicle n
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Seleccionla llista de preus
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Seleccionla llista de preus
 DocType: Accounts Settings,Currency Exchange Settings,Configuració de canvi de divises
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Fila # {0}: No es requereix document de pagament per completar la trasaction
 DocType: Production Order Operation,Work In Progress,Treball en curs
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Si us plau seleccioni la data
 DocType: Employee,Holiday List,Llista de vacances
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Configureu el sistema de nomenclatura d&#39;instructor a l&#39;escola&gt; Configuració de l&#39;escola
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Accountant
+DocType: Hub Settings,Selling Price List,Llista de preus de venda
 DocType: Patient,Tobacco Current Use,Ús del corrent del tabac
 DocType: Cost Center,Stock User,Fotografia de l&#39;usuari
 DocType: Company,Phone No,Telèfon No
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Calendari de cursos creats:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Nou {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Nou {0}: # {1}
 ,Sales Partners Commission,Comissió dels revenedors
 DocType: Purchase Invoice,Rounding Adjustment,Ajust de redondeig
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Abreviatura no pot tenir més de 5 caràcters
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Docname Detall de Pares
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referència: {0}, Codi de l&#39;article: {1} i el Client: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kg
-DocType: Student Log,Log,Sessió
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,L'obertura per a una ocupació.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Resultat enviat
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Resultat enviat
 DocType: Item Attribute,Increment,Increment
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Lapse de temps
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Seleccioneu Magatzem ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Casat
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},No està permès per {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Obtenir articles de
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},L'estoc no es pot actualitzar contra la Nota de Lliurament {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},L'estoc no es pot actualitzar contra la Nota de Lliurament {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Producte {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,No hi ha elements que s&#39;enumeren
 DocType: Payment Reconciliation,Reconcile,Conciliar
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fons de Pensions
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Següent Depreciació La data no pot ser anterior a la data de compra
 DocType: Consultation,Consultation Date,Data de consulta
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Llistat de productes i descobriment per als usuaris d&#39;ERPNext
 DocType: SMS Center,All Sales Person,Tot el personal de vendes
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ** Distribució mensual ajuda a distribuir el pressupost / Target a través de mesos si té l&#39;estacionalitat del seu negoci.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,No articles trobats
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Falta Estructura salarial
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,No articles trobats
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Falta Estructura salarial
 DocType: Lead,Person Name,Nom de la Persona
 DocType: Sales Invoice Item,Sales Invoice Item,Factura Sales Item
 DocType: Account,Credit,Crèdit
 DocType: POS Profile,Write Off Cost Center,Escriu Off Centre de Cost
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""","per exemple, &quot;escola primària&quot; o &quot;Universitat&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""","per exemple, &quot;escola primària&quot; o &quot;Universitat&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Informes d&#39;arxiu
 DocType: Warehouse,Warehouse Detail,Detall Magatzem
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Límit de crèdit s'ha creuat pel client {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"La data final de durada no pot ser posterior a la data de cap d&#39;any de l&#39;any acadèmic a què està vinculat el terme (any acadèmic {}). Si us plau, corregeixi les dates i torna a intentar-ho."
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""És actiu fix"" no pot estar sense marcar, ja que hi ha registre d'actius contra l'element"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""És actiu fix"" no pot estar sense marcar, ja que hi ha registre d'actius contra l'element"
 DocType: Vehicle Service,Brake Oil,oli dels frens
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clients&gt; Territori
 DocType: Tax Rule,Tax Type,Tipus d&#39;Impostos
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,base imposable
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},No té permisos per afegir o actualitzar les entrades abans de {0}
 DocType: BOM,Item Image (if not slideshow),Imatge de l'article (si no hi ha presentació de diapositives)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Hi ha un client amb el mateix nom
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hora Tarifa / 60) * Temps real de l&#39;Operació
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Fila # {0}: el tipus de document de referència ha de ser un de reclam de despeses o d&#39;entrada de diari
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Seleccioneu la llista de materials
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Fila # {0}: el tipus de document de referència ha de ser un de reclam de despeses o d&#39;entrada de diari
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Seleccioneu la llista de materials
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Cost dels articles lliurats
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,El dia de festa en {0} no és entre De la data i Fins a la data
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,préstec empleat
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Registre d'activitat:
 DocType: Fee Schedule,Send Payment Request Email,Enviar correu electrònic de sol·licitud de pagament
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,L'Article {0} no existeix en el sistema o ha caducat
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,L'Article {0} no existeix en el sistema o ha caducat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Real Estate
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Estat de compte
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmacèutics
@@ -210,17 +213,22 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Importa registre
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Tire Sol·licitud de materials de tipus Fabricació en base als criteris anteriors
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,S&#39;ha registrat sense èxit.
 DocType: Training Result Employee,Grade,grau
+DocType: Restaurant Table,No of Seats,No de seients
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Per afegir un tema dinàmic, utilitzeu etiquetes com ara jinja <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Lliurat per proveïdor
 DocType: SMS Center,All Contact,Tots els contactes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Ordre de producció ja s&#39;ha creat per a tots els elements amb la llista de materials
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Ordre de producció ja s&#39;ha creat per a tots els elements amb la llista de materials
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Salari Anual
 DocType: Daily Work Summary,Daily Work Summary,Resum diari de Treball
 DocType: Period Closing Voucher,Closing Fiscal Year,Tancant l'Any Fiscal
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} està congelat
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Seleccioneu empresa ja existent per a la creació del pla de comptes
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} està congelat
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Seleccioneu empresa ja existent per a la creació del pla de comptes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Despeses d'estoc
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Selecciona una destinació de dipòsit
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Selecciona una destinació de dipòsit
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Si us plau, introdueixi preferit del contacte de correu electrònic"
 DocType: Program Enrollment,School Bus,Autobús escolar
 DocType: Journal Entry,Contra Entry,Entrada Contra
@@ -238,9 +246,10 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Descarregueu la plantilla, omplir les dades adequades i adjuntar l'arxiu modificat.
  Totes les dates i empleat combinació en el període seleccionat vindrà a la plantilla, amb els registres d'assistència existents"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,L'article {0} no està actiu o ha arribat al final de la seva vida
+DocType: Student Admission Program,Minimum Age,Edat mínima
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Exemple: Matemàtiques Bàsiques
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Per incloure l'impost a la fila {0} en la tarifa d'article, els impostos a les files {1} també han de ser inclosos"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Ajustaments per al Mòdul de Recursos Humans
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Ajustaments per al Mòdul de Recursos Humans
 DocType: SMS Center,SMS Center,Centre d'SMS
 DocType: Sales Invoice,Change Amount,Import de canvi
 DocType: BOM Update Tool,New BOM,Nova llista de materials
@@ -250,7 +259,7 @@
 DocType: Lead,Request Type,Tipus de sol·licitud
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,fer Empleat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Radiodifusió
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Afegir habitacions
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Mode de configuració de TPV (en línia o fora de línia)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Execució
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Els detalls de les operacions realitzades.
 DocType: Serial No,Maintenance Status,Estat de manteniment
@@ -273,6 +282,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Llista de preus ha de ser aplicable per comprar o vendre
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Data d'instal·lació no pot ser abans de la data de lliurament d'article {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Descompte Preu de llista Taxa (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Bioquímica
 DocType: Offer Letter,Select Terms and Conditions,Selecciona Termes i Condicions
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,valor fora
 DocType: Production Planning Tool,Sales Orders,Ordres de venda
@@ -307,15 +317,15 @@
 DocType: Sales Partner,Reseller,Revenedor
 DocType: Codification Table,Medical Code,Codi mèdic
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Si se selecciona, s&#39;inclouran productes no estan en estoc en les sol·licituds de materials."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Si us plau entra l'Empresa
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Si us plau entra l'Empresa
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra la factura de venda d'articles
 ,Production Orders in Progress,Ordres de producció en Construcció
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Efectiu net de Finançament
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage està ple, no va salvar"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage està ple, no va salvar"
 DocType: Lead,Address & Contact,Direcció i Contacte
 DocType: Leave Allocation,Add unused leaves from previous allocations,Afegir les fulles no utilitzats de les assignacions anteriors
 DocType: Sales Partner,Partner website,lloc web de col·laboradors
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Afegeix element
+DocType: Restaurant Order Entry,Add Item,Afegeix element
 DocType: Lab Test,Custom Result,Resultat personalitzat
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Nom de Contacte
 DocType: Course Assessment Criteria,Course Assessment Criteria,Criteris d&#39;avaluació del curs
@@ -328,7 +338,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Sol·licitud de venda.
 DocType: Lab Test,Submitted Date,Data enviada
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Això es basa en la taula de temps creats en contra d&#39;aquest projecte
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Pay Net no pot ser menor que 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Pay Net no pot ser menor que 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Per deixar d&#39;enviar notificacions de errors repetitives del sistema, hem marcat el camp Desactivat a la subscripció"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Només l'aprovador d'absències seleccionat pot presentar aquesta sol·licitud
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Alleujar data ha de ser major que la data de Unir
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Deixa per any
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,D&#39;pèrdues i guanys
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,litre
 DocType: Task,Total Costing Amount (via Time Sheet),Càlcul del cost total Monto (a través de fulla d&#39;hores)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Configureu els estudiants sota grups d&#39;estudiants
 DocType: Item Website Specification,Item Website Specification,Especificacions d'article al Web
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Absència bloquejada
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Article {0} ha arribat a la seva fi de vida del {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Article {0} ha arribat a la seva fi de vida del {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,entrades bancàries
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Estoc Reconciliació article
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Curs eina de creació de grup d&#39;alumnes
 DocType: Lead,Do Not Contact,No entri en contacte
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,Les persones que ensenyen en la seva organització
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,L'identificador únic per al seguiment de totes les factures recurrents. Es genera a enviar.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Desenvolupador de Programari
 DocType: Item,Minimum Order Qty,Quantitat de comanda mínima
 DocType: Pricing Rule,Supplier Type,Tipus de Proveïdor
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,Publicar en el Hub
 DocType: Student Admission,Student Admission,Admissió d&#39;Estudiants
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,L'article {0} està cancel·lat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Sol·licitud de materials
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,L'article {0} està cancel·lat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Sol·licitud de materials
 DocType: Bank Reconciliation,Update Clearance Date,Actualització Data Liquidació
 DocType: Item,Purchase Details,Informació de compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Article {0} no es troba en &#39;matèries primeres subministrades&#39; taula en l&#39;Ordre de Compra {1}
 DocType: Patient Relation,Relation,Relació
 DocType: Shipping Rule,Worldwide Shipping,Enviament mundial
 DocType: Patient Relation,Mother,Mare
+DocType: Restaurant Reservation,Reservation End Time,Hora de finalització de la reserva
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Comandes en ferm dels clients.
 DocType: Purchase Receipt Item,Rejected Quantity,Quantitat Rebutjada
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,S&#39;ha creat la {0} sol·licitud de pagament
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,S&#39;ha creat la {0} sol·licitud de pagament
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Baixa sensibilitat
 DocType: Notification Control,Notification Control,Control de Notificació
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Confirmeu una vegada hagueu completat la vostra formació
 DocType: Lead,Suggestions,Suggeriments
@@ -388,7 +401,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Els correus electrònics de lliscament salarial als empleats basades en el correu electrònic preferit seleccionat en Empleat
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,El primer aprovadorde d'absències de la llista s'establirà com a predeterminat
 DocType: Tax Rule,Shipping County,Comtat d&#39;enviament
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Aprendre
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Aprendre
 DocType: Asset,Next Depreciation Date,Següent Depreciació Data
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Cost Activitat per Empleat
 DocType: Accounts Settings,Settings for Accounts,Ajustaments de Comptes
@@ -399,13 +412,13 @@
 DocType: Item,Synced With Hub,Sincronitzat amb Hub
 DocType: Vehicle,Fleet Manager,Fleet Manager
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Fila # {0}: {1} no pot ser negatiu per a l&#39;element {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Contrasenya Incorrecta
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Contrasenya Incorrecta
 DocType: Item,Variant Of,Variant de
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Completat Quantitat no pot ser major que 'Cant de Fabricació'
 DocType: Period Closing Voucher,Closing Account Head,Tancant el Compte principal
 DocType: Employee,External Work History,Historial de treball extern
 DocType: Physician,Time per Appointment,Temps per cita
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Referència Circular Error
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Referència Circular Error
 DocType: Appointment Type,Is Inpatient,És internat
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,nom Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,En paraules (exportació) seran visibles quan es desi l'albarà de lliurament.
@@ -414,19 +427,18 @@
 DocType: Lead,Industry,Indústria
 DocType: Employee,Job Profile,Perfil Laboral
 DocType: BOM Item,Rate & Amount,Preu i quantitat
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configureu la sèrie de numeració per assistència mitjançant la configuració&gt; Sèrie de numeració
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Això es basa en operacions contra aquesta empresa. Vegeu la línia de temps a continuació per obtenir detalls
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificació per correu electrònic a la creació de la Sol·licitud de materials automàtica
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Resistent
 DocType: Journal Entry,Multi Currency,Multi moneda
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipus de Factura
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clients&gt; Territori
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Nota de lliurament
 DocType: Consultation,Encounter Impression,Impressió de trobada
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Configuració d&#39;Impostos
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Cost d&#39;actiu venut
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,"Entrada de pagament ha estat modificat després es va tirar d'ell. Si us plau, tiri d'ella de nou."
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} entrat dues vegades en l'Impost d'article
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Resum per a aquesta setmana i activitats pendents
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} entrat dues vegades en l'Impost d'article
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Resum per a aquesta setmana i activitats pendents
 DocType: Student Applicant,Admitted,acceptat
 DocType: Workstation,Rent Cost,Cost de lloguer
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Després quantitat Depreciació
@@ -440,36 +452,35 @@
 DocType: Shipping Rule,Valid for Countries,Vàlid per als Països
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Aquest article és una plantilla i no es pot utilitzar en les transaccions. Atributs article es copiaran en les variants menys que s'estableix 'No Copy'
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total de la comanda Considerat
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Designació de l'empleat (per exemple, director general, director, etc.)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Designació de l'empleat (per exemple, director general, director, etc.)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Canvi al qual la divisa del client es converteix la moneda base del client
 DocType: Course Scheduling Tool,Course Scheduling Tool,Eina de Programació de golf
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Fila # {0}: Factura de compra no es pot fer front a un actiu existent {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Urgent] S&#39;ha produït un error en crear% s per a% s recurrents
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Urgent] S&#39;ha produït un error en crear% s per a% s recurrents
 DocType: Item Tax,Tax Rate,Tax Rate
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ja assignat a empleat {1} per al període {2} a {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Seleccioneu Producte
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Seleccioneu Producte
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,La Factura de compra {0} ja està Presentada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lot No ha de ser igual a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convertir la no-Group
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Lots (lot) d'un element.
 DocType: C-Form Invoice Detail,Invoice Date,Data de la factura
 DocType: GL Entry,Debit Amount,Suma Dèbit
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Només pot haver 1 compte per l&#39;empresa en {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,"Si us plau, vegeu el document adjunt"
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Només pot haver 1 compte per l&#39;empresa en {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,"Si us plau, vegeu el document adjunt"
 DocType: Purchase Order,% Received,% Rebut
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Crear grups d&#39;estudiants
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Configuració acabada !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Configuració acabada !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Nota de Crèdit Monto
 DocType: Setup Progress Action,Action Document,Document d&#39;Acció
 ,Finished Goods,Béns Acabats
 DocType: Delivery Note,Instructions,Instruccions
 DocType: Quality Inspection,Inspected By,Inspeccionat per
 DocType: Maintenance Visit,Maintenance Type,Tipus de Manteniment
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} no està inscrit en el curs {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Codi d&#39;article&gt; Grup d&#39;elements&gt; Marca
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} no està inscrit en el curs {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},El número de sèrie {0} no pertany a la nota de lliurament {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,demostració ERPNext
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Afegir els articles
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Afegir els articles
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Article de qualitat de paràmetres d'Inspecció
 DocType: Leave Application,Leave Approver Name,Nom de l'aprovador d'absències
 DocType: Depreciation Schedule,Schedule Date,Horari Data
@@ -489,7 +500,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Hores de Treball
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Canviar el número de seqüència inicial/actual d'una sèrie existent.
 DocType: Dosage Strength,Strength,Força
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Crear un nou client
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Crear un nou client
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Si hi ha diverses regles de preus vàlides, es demanarà als usuaris que estableixin la prioritat manualment per resoldre el conflicte."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Crear ordres de compra
 ,Purchase Register,Compra de Registre
@@ -508,7 +519,7 @@
 DocType: Lab Test Template,Single,Solter
 DocType: Salary Slip,Total Loan Repayment,El reemborsament total del préstec
 DocType: Account,Cost of Goods Sold,Cost de Vendes
-DocType: Purchase Invoice,Yearly,Anual
+DocType: Subscription,Yearly,Anual
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Si us plau entra el centre de cost
 DocType: Drug Prescription,Dosage,Dosificació
 DocType: Journal Entry Account,Sales Order,Ordre de Venda
@@ -538,7 +549,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,La configuració global per a tots els processos de fabricació.
 DocType: Accounts Settings,Accounts Frozen Upto,Comptes bloquejats fins a
 DocType: SMS Log,Sent On,Enviar on
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Atribut {0} seleccionat diverses vegades en la taula Atributs
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Atribut {0} seleccionat diverses vegades en la taula Atributs
 DocType: HR Settings,Employee record is created using selected field. ,Es crea el registre d'empleat utilitzant el camp seleccionat.
 DocType: Sales Order,Not Applicable,No Aplicable
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Mestre de vacances.
@@ -563,13 +574,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Fulles totals assignats és obligatori
 DocType: Patient,AB Positive,AB Positiu
 DocType: Job Opening,Description of a Job Opening,Descripció d'una oferta de treball
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Activitats pendents per avui
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Activitats pendents per avui
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Registre d'assistència.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,El component salarial per a la nòmina de part d&#39;hores basat.
 DocType: Sales Order Item,Used for Production Plan,S'utilitza per al Pla de Producció
 DocType: Employee Loan,Total Payment,El pagament total
 DocType: Manufacturing Settings,Time Between Operations (in mins),Temps entre operacions (en minuts)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} es va cancel·lar pel que l&#39;acció no es pot completar
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} es va cancel·lar pel que l&#39;acció no es pot completar
 DocType: Customer,Buyer of Goods and Services.,Compradors de Productes i Serveis.
 DocType: Journal Entry,Accounts Payable,Comptes Per Pagar
 DocType: Patient,Allergies,Al·lèrgies
@@ -581,22 +592,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Aviseu comandes de compra
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Enumerar alguns dels seus clients. Podrien ser les organitzacions o individus.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Peces suficient per construir
+DocType: POS Profile User,POS Profile User,Usuari de perfil de TPV
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Ingrés Directe
 DocType: Patient Appointment,Date TIme,Data i hora
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","No es pot filtrar en funció del compte, si agrupats per Compte"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Oficial Administratiu
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Seleccioneu de golf
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Seleccioneu de golf
 DocType: Codification Table,Codification Table,Taula de codificació
 DocType: Timesheet Detail,Hrs,hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Seleccioneu de l&#39;empresa
 DocType: Stock Entry Detail,Difference Account,Compte de diferències
 DocType: Purchase Invoice,Supplier GSTIN,GSTIN proveïdor
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,No es pot tancar tasca com no tanca la seva tasca depèn {0}.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,Si us plau indica el Magatzem en què es faràa la Sol·licitud de materials
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,No es pot tancar tasca com no tanca la seva tasca depèn {0}.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Si us plau indica el Magatzem en què es faràa la Sol·licitud de materials
 DocType: Production Order,Additional Operating Cost,Cost addicional de funcionament
 DocType: Lab Test Template,Lab Routine,Rutina de laboratori
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Productes cosmètics
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Per fusionar, propietats han de ser el mateix per a tots dos articles"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Per fusionar, propietats han de ser el mateix per a tots dos articles"
 DocType: Shipping Rule,Net Weight,Pes Net
 DocType: Employee,Emergency Phone,Telèfon d'Emergència
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,comprar
@@ -606,7 +618,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,"Si us plau, defineixi el grau de Llindar 0%"
 DocType: Sales Order,To Deliver,Per Lliurar
 DocType: Purchase Invoice Item,Item,Article
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Nº de sèrie article no pot ser una fracció
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Alta sensibilitat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Nº de sèrie article no pot ser una fracció
 DocType: Journal Entry,Difference (Dr - Cr),Diferència (Dr - Cr)
 DocType: Account,Profit and Loss,Pèrdues i Guanys
 DocType: Patient,Risk Factors,Factors de risc
@@ -615,7 +628,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Subcontractació Gestió
 DocType: Vital Signs,Body Temperature,Temperatura corporal
 DocType: Project,Project will be accessible on the website to these users,Projecte serà accessible a la pàgina web a aquests usuaris
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Defineix el tipus de projecte.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Defineix el tipus de projecte.
 DocType: Supplier Scorecard,Weighting Function,Funció de ponderació
 DocType: Physician,OP Consulting Charge,OP Consultancy Charge
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Configura el vostre
@@ -629,7 +642,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Increment no pot ser 0
 DocType: Production Planning Tool,Material Requirement,Requirement de Material
 DocType: Company,Delete Company Transactions,Eliminar Transaccions Empresa
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,No de referència i data de referència és obligatòria per a les transaccions bancàries
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,No de referència i data de referència és obligatòria per a les transaccions bancàries
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Afegeix / Edita les taxes i càrrecs
 DocType: Payment Entry Reference,Supplier Invoice No,Número de Factura de Proveïdor
 DocType: Territory,For reference,Per referència
@@ -637,12 +650,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","No es pot eliminar de sèrie n {0}, ja que s&#39;utilitza en les transaccions de valors"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Tancament (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Hola
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,moure element
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,moure element
 DocType: Serial No,Warranty Period (Days),Període de garantia (Dies)
 DocType: Installation Note Item,Installation Note Item,Nota d'instal·lació de l'article
 DocType: Production Plan Item,Pending Qty,Pendent Quantitat
 DocType: Budget,Ignore,Ignorar
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} no està actiu
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} no està actiu
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,dimensions de verificació de configuració per a la impressió
 DocType: Salary Slip,Salary Slip Timesheet,Part d&#39;hores de salari de lliscament
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Magatzem obligatori per rebut de compra de subcontractació de proveïdors
@@ -651,7 +664,7 @@
 DocType: Pricing Rule,Sales Partner,Soci de vendes
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Tots els quadres de comandament del proveïdor.
 DocType: Buying Settings,Purchase Receipt Required,Es requereix rebut de compra
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Valoració dels tipus és obligatòria si l&#39;obertura Stock entrar
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,Valoració dels tipus és obligatòria si l&#39;obertura Stock entrar
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,No es troben en la taula de registres de factures
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Seleccioneu de l'empresa i el Partit Tipus primer
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Exercici comptabilitat /.
@@ -688,7 +701,7 @@
 DocType: Quotation,Quotation To,Oferta per
 DocType: Lead,Middle Income,Ingrés Mig
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Obertura (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unitat de mesura per defecte per a l&#39;article {0} no es pot canviar directament perquè ja ha realitzat alguna transacció (s) amb una altra UOM. Vostè haurà de crear un nou element a utilitzar un UOM predeterminat diferent.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unitat de mesura per defecte per a l&#39;article {0} no es pot canviar directament perquè ja ha realitzat alguna transacció (s) amb una altra UOM. Vostè haurà de crear un nou element a utilitzar un UOM predeterminat diferent.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Suma assignat no pot ser negatiu
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Si us plau ajust la Companyia
 DocType: Purchase Order Item,Billed Amt,Quantitat facturada
@@ -702,6 +715,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Seleccionar el compte de pagament per fer l&#39;entrada del Banc
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Crear registres dels empleats per gestionar les fulles, les reclamacions de despeses i nòmina"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Període de recepta
+DocType: Restaurant Reservation,Restaurant Reservation,Reserva de restaurants
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Redacció de propostes
 DocType: Payment Entry Deduction,Payment Entry Deduction,El pagament Deducció d&#39;entrada
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Hi ha una altra Sales Person {0} amb el mateix ID d&#39;empleat
@@ -709,7 +723,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Màsters
 DocType: Assessment Plan,Maximum Assessment Score,Puntuació màxima d&#39;Avaluació
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Dates de les transaccions d&#39;actualització del Banc
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,temps de seguiment
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,temps de seguiment
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,Duplicat per TRANSPORTADOR
 DocType: Fiscal Year Company,Fiscal Year Company,Any fiscal Companyia
 DocType: Packing Slip Item,DN Detail,Detall DN
@@ -717,8 +731,9 @@
 DocType: Timesheet,Billed,Facturat
 DocType: Batch,Batch Description,Descripció lots
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,La creació de grups d&#39;estudiants
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Pagament de comptes de porta d&#39;enllaç no es crea, si us plau crear una manualment."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Pagament de comptes de porta d&#39;enllaç no es crea, si us plau crear una manualment."
 DocType: Supplier Scorecard,Per Year,Per any
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,No és elegible per a l&#39;admissió en aquest programa segons la DOB
 DocType: Sales Invoice,Sales Taxes and Charges,Els impostos i càrrecs de venda
 DocType: Employee,Organization Profile,Perfil de l'organització
 DocType: Vital Signs,Height (In Meter),Alçada (en metro)
@@ -754,7 +769,7 @@
 DocType: Student Batch Name,Batch Name,Nom del lot
 DocType: Fee Validity,Max number of visit,Nombre màxim de visites
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Part d&#39;hores de creació:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},"Si us plau, estableix pagament en efectiu o Compte bancari predeterminat a la Forma de pagament {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},"Si us plau, estableix pagament en efectiu o Compte bancari predeterminat a la Forma de pagament {0}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,inscriure
 DocType: GST Settings,GST Settings,ajustaments GST
 DocType: Selling Settings,Customer Naming By,Customer Naming By
@@ -786,15 +801,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Impostos i Càrrecs Landed Cost
 DocType: Production Order Operation,Actual Start Time,Temps real d'inici
 DocType: BOM Operation,Operation Time,Temps de funcionament
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,acabat
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,acabat
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,base
 DocType: Timesheet,Total Billed Hours,Total d&#39;hores facturades
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Anota la quantitat
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Anota la quantitat
 DocType: Leave Block List Allow,Allow User,Permetre a l'usuari
 DocType: Journal Entry,Bill No,Factura Número
 DocType: Company,Gain/Loss Account on Asset Disposal,Compte guany / pèrdua en la disposició d&#39;actius
 DocType: Vehicle Log,Service Details,Detalls del servei
-DocType: Purchase Invoice,Quarterly,Trimestral
+DocType: Subscription,Quarterly,Trimestral
 DocType: Lab Test Template,Grouped,Agrupats
 DocType: Selling Settings,Delivery Note Required,Nota de lliurament Obligatòria
 DocType: Bank Guarantee,Bank Guarantee Number,Nombre de Garantia Bancària
@@ -803,12 +818,12 @@
 DocType: Student Attendance,Student Attendance,Assistència de l&#39;estudiant
 DocType: Sales Invoice Timesheet,Time Sheet,Horari
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush matèries primeres Based On
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Entra els detalls de l'article
 DocType: Interest,Interest,interès
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,abans de la compra
 DocType: Purchase Receipt,Other Details,Altres detalls
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplir
 DocType: Lab Test,Test Template,Plantilla de prova
+DocType: Restaurant Order Entry Item,Served,Servit
 DocType: Account,Accounts,Comptes
 DocType: Vehicle,Odometer Value (Last),Valor del comptaquilòmetres (última)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Plantilles de criteri de quadre de comandament de proveïdors.
@@ -820,25 +835,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Salari vista prèvia de lliscament
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Compte {0} s&#39;ha introduït diverses vegades
 DocType: Account,Expenses Included In Valuation,Despeses incloses en la valoració
-DocType: Hub Settings,Seller City,Ciutat del venedor
 ,Absent Student Report,Informe de l&#39;alumne absent
 DocType: Email Digest,Next email will be sent on:,El següent correu electrònic s'enviarà a:
 DocType: Offer Letter Term,Offer Letter Term,Present Carta Termini
 DocType: Supplier Scorecard,Per Week,Per setmana
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,L&#39;article té variants.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,L&#39;article té variants.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Total d&#39;estudiants
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Article {0} no trobat
 DocType: Bin,Stock Value,Estoc Valor
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,"Els registres de tarifes es crearan en segon pla. En cas d&#39;error, el missatge d&#39;error s&#39;actualitzarà a l&#39;Agenda."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Companyia {0} no existeix
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} té validesa de tarifa fins a {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} té validesa de tarifa fins a {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Tipus Arbre
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Quantitat consumida per unitat
 DocType: Serial No,Warranty Expiry Date,Data final de garantia
 DocType: Material Request Item,Quantity and Warehouse,Quantitat i Magatzem
+DocType: Hub Settings,Unregister,Anul·lar la baixa
 DocType: Sales Invoice,Commission Rate (%),Comissió (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Seleccioneu Programa
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Seleccioneu Programa
 DocType: Project,Estimated Cost,cost estimat
 DocType: Purchase Order,Link to material requests,Enllaç a les sol·licituds de materials
+DocType: Hub Settings,Publish,Publica
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aeroespacial
 DocType: Journal Entry,Credit Card Entry,Introducció d'una targeta de crèdit
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Empresa i Comptabilitat
@@ -849,13 +866,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Tancar Oportunitat Després Dies
 ,Reserved,Reservat
 DocType: Purchase Order,Supply Raw Materials,Subministrament de Matèries Primeres
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La data en què es genera la següent factura. Es genera a enviar.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Actiu Corrent
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} no és un article d'estoc
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',"Compartiu els vostres comentaris a la formació fent clic a &quot;Feedback de formació&quot; i, a continuació, &quot;Nou&quot;"
 DocType: Mode of Payment Account,Default Account,Compte predeterminat
 DocType: Payment Entry,Received Amount (Company Currency),Quantitat rebuda (Companyia de divises)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,S'ha d'indicar el client potencial si la oportunitat té el seu origen en un client potencial
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,S'ha d'indicar el client potencial si la oportunitat té el seu origen en un client potencial
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Si us plau seleccioni el dia lliure setmanal
 DocType: Patient,O Negative,O negatiu
 DocType: Production Order Operation,Planned End Time,Planificació de Temps Final
@@ -871,10 +887,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Oportunitat De
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Nòmina mensual.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Afegeix empresa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Fila {0}: {1} Nombres de sèrie obligatoris per a l&#39;element {2}. Heu proporcionat {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Fila {0}: {1} Nombres de sèrie obligatoris per a l&#39;element {2}. Heu proporcionat {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Seleccioneu una taula
 DocType: BOM,Website Specifications,Especificacions del lloc web
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} és una adreça electrònica no vàlida a &quot;Destinataris&quot;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} és una adreça electrònica no vàlida a &quot;Destinataris&quot;
 DocType: Special Test Items,Particulars,Particulars
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiòtics.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Des {0} de tipus {1}
@@ -882,11 +898,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Fila {0}: el factor de conversió és obligatori
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Regles Preu múltiples existeix amb el mateix criteri, si us plau, resoldre els conflictes mitjançant l&#39;assignació de prioritat. Regles de preus: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,No es pot desactivar o cancel·lar BOM ja que està vinculat amb altres llistes de materials
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,No es pot desactivar o cancel·lar BOM ja que està vinculat amb altres llistes de materials
 DocType: Opportunity,Maintenance,Manteniment
 DocType: Item Attribute Value,Item Attribute Value,Element Atribut Valor
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Campanyes de venda.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,fer part d&#39;hores
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,fer part d&#39;hores
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -943,12 +959,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Si us plau entra primer l'article
 DocType: Account,Liability,Responsabilitat
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Import sancionat no pot ser major que la reclamació Quantitat a la fila {0}.
+DocType: Salary Detail,Do not include in total,No s&#39;inclouen en total
 DocType: Company,Default Cost of Goods Sold Account,Cost per defecte del compte mercaderies venudes
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Llista de preus no seleccionat
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Llista de preus no seleccionat
 DocType: Employee,Family Background,Antecedents de família
 DocType: Request for Quotation Supplier,Send Email,Enviar per correu electrònic
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Advertència: no vàlida Adjunt {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,No permission
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Advertència: no vàlida Adjunt {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,No permission
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Cita sol·licitada
 DocType: Vital Signs,Heart Rate / Pulse,Taxa / pols del cor
 DocType: Company,Default Bank Account,Compte bancari per defecte
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Per filtrar la base de la festa, seleccioneu Partit Escrigui primer"
@@ -975,12 +993,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Element Fila {} idx: {} {DOCTYPE docname} no existeix en l&#39;anterior &#39;{} tipus de document&#39; taula
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Part d&#39;hores {0} ja s&#39;hagi completat o cancel·lat
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,No hi ha tasques
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","El dia del mes en què es generarà factura acte per exemple 05, 28, etc."
 DocType: Item Variant Settings,Copy Fields to Variant,Copia els camps a la variant
 DocType: Asset,Opening Accumulated Depreciation,L&#39;obertura de la depreciació acumulada
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score ha de ser menor que o igual a 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Eina d&#39;Inscripció Programa
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,Registres C-Form
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,Registres C-Form
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Clients i Proveïdors
 DocType: Email Digest,Email Digest Settings,Ajustos del processador d'emails
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Gràcies pel teu negoci!
@@ -998,13 +1015,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Estat de cotització
 DocType: Maintenance Visit,Completion Status,Estat de finalització
 DocType: HR Settings,Enter retirement age in years,Introdueixi l&#39;edat de jubilació en anys
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Magatzem destí
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Seleccioneu un magatzem
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Magatzem destí
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Seleccioneu un magatzem
 DocType: Cheque Print Template,Starting location from left edge,Posició inicial des la vora esquerra
 DocType: Item,Allow over delivery or receipt upto this percent,Permetre sobre el lliurament o recepció fins aquest percentatge
 DocType: Stock Entry,STE-,Stephen
 DocType: Upload Attendance,Import Attendance,Importa Assistència
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Tots els grups d'articles
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Tots els grups d'articles
 DocType: Process Payroll,Activity Log,Registre d'activitat
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Guany/Pèrdua neta
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Compondre automàticament el missatge en la presentació de les transaccions.
@@ -1016,7 +1033,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Quantitat projectada
 DocType: Sales Invoice,Payment Due Date,Data de pagament
 DocType: Drug Prescription,Interval UOM,Interval UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Article Variant {0} ja existeix amb els mateixos atributs
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Article Variant {0} ja existeix amb els mateixos atributs
+DocType: Item,Hub Publishing Details,Detalls de publicació del Hub
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;Obertura&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Obert a fer
 DocType: Notification Control,Delivery Note Message,Missatge de la Nota de lliurament
@@ -1036,10 +1054,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: el material brut no pot ser igual que l&#39;element principal
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total d&#39;comissions aplicables en la compra Taula de rebuts Els articles han de ser iguals que les taxes totals i càrrecs
 DocType: Sales Team,Incentives,Incentius
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Registreu-vos per a un concentrador
 DocType: SMS Log,Requested Numbers,Números sol·licitats
 DocType: Production Planning Tool,Only Obtain Raw Materials,Només obtenció de matèries primeres
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,L'avaluació de l'acompliment.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Habilitació d &#39; «ús de Compres&#39;, com cistella de la compra és activat i ha d&#39;haver almenys una regla fiscal per Compres"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Habilitació d &#39; «ús de Compres&#39;, com cistella de la compra és activat i ha d&#39;haver almenys una regla fiscal per Compres"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Entrada de pagament {0} està enllaçat amb l&#39;Ordre {1}, comprovar si s&#39;ha de llençar com avanç en aquesta factura."
 DocType: Sales Invoice Item,Stock Details,Estoc detalls
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor de Projecte
@@ -1058,12 +1077,14 @@
 DocType: Salary Slip,Working Days,Dies feiners
 DocType: Serial No,Incoming Rate,Incoming Rate
 DocType: Packing Slip,Gross Weight,Pes Brut
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,El nom de la teva empresa per a la qual està creant aquest sistema.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Activa el concentrador
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,El nom de la teva empresa per a la qual està creant aquest sistema.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Inclou vacances en el número total de dies laborables
 DocType: Job Applicant,Hold,Mantenir
 DocType: Employee,Date of Joining,Data d'ingrés
 DocType: Naming Series,Update Series,Actualitza Sèries
 DocType: Supplier Quotation,Is Subcontracted,Es subcontracta
+DocType: Restaurant Table,Minimum Seating,Seient mínim
 DocType: Item Attribute,Item Attribute Values,Element Valors d'atributs
 DocType: Examination Result,Examination Result,examen Resultat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Albarà de compra
@@ -1074,13 +1095,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Incapaç de trobar la ranura de temps en els pròxims {0} dies per a l&#39;operació {1}
 DocType: Production Order,Plan material for sub-assemblies,Material de Pla de subconjunts
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Punts de venda i Territori
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} ha d'estar activa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} ha d'estar activa
 DocType: Journal Entry,Depreciation Entry,Entrada depreciació
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Si us plau. Primer seleccioneu el tipus de document
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancel·la Visites Materials {0} abans de cancel·lar aquesta visita de manteniment
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},El número de Sèrie {0} no pertany a l'article {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Quantitat necessària
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Complexos de dipòsit de transaccions existents no es poden convertir en el llibre major.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Complexos de dipòsit de transaccions existents no es poden convertir en el llibre major.
 DocType: Bank Reconciliation,Total Amount,Quantitat total
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publicant a Internet
 DocType: Prescription Duration,Number,Número
@@ -1091,7 +1112,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Llista de preus de venda
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Si està marcada, es crearà un client, assignat a Pacient. Les factures del pacient es crearan contra aquest client. També podeu seleccionar el client existent mentre feu el pacient."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicar sincronitzar articles
 DocType: Bank Reconciliation,Account Currency,Compte moneda
 DocType: Lab Test,Sample ID,Identificador de mostra
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,"Si us plau, Compte Off rodona a l&#39;empresa"
@@ -1100,11 +1120,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,L'Empleat {0} no està actiu o no existeix
 DocType: Fee Structure,Components,components
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},"Si us plau, introdueixi categoria d&#39;actius en el punt {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Article Variants {0} actualitza
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Article Variants {0} actualitza
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,No es pot {0} {1} {2} sense cap factura pendent negatiu
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","per generar. Si es retarda, haurà de canviar manualment el camp &quot;Repetir el dia del mes&quot;"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,No es pot {0} {1} {2} sense cap factura pendent negatiu
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de compra anticipada
-DocType: Hub Settings,Sync Now,Sincronitza ara
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Fila {0}: entrada de crèdit no pot vincular amb un {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Definir pressupost per a un exercici.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,El compte bancs/efectiu predeterminat s'actualitzarà automàticament a les factures de TPV quan es selecciona aquest.
@@ -1116,13 +1137,13 @@
 DocType: Item,Is Purchase Item,És Compra d'articles
 DocType: Asset,Purchase Invoice,Factura de Compra
 DocType: Stock Ledger Entry,Voucher Detail No,Número de detall del comprovant
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Nova factura de venda
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Nova factura de venda
 DocType: Stock Entry,Total Outgoing Value,Valor Total sortint
 DocType: Physician,Appointments,Cites
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Data i Data de Tancament d&#39;obertura ha de ser dins el mateix any fiscal
 DocType: Lead,Request for Information,Sol·licitud d'Informació
 ,LeaderBoard,Leaderboard
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Les factures sincronització sense connexió
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Les factures sincronització sense connexió
 DocType: Payment Request,Paid,Pagat
 DocType: Program Fee,Program Fee,tarifa del programa
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1141,11 +1162,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Ordre de compra d'articles
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Ingressos Indirectes
 DocType: Student Attendance Tool,Student Attendance Tool,Eina d&#39;assistència dels estudiants
+DocType: Restaurant Menu,Price List (Auto created),Llista de preus (creada automàticament)
 DocType: Cheque Print Template,Date Settings,Configuració de la data
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Desacord
 ,Company Name,Nom de l'Empresa
 DocType: SMS Center,Total Message(s),Total Missatge(s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Seleccionar element de Transferència
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Seleccionar element de Transferència
 DocType: Purchase Invoice,Additional Discount Percentage,Percentatge de descompte addicional
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Veure una llista de tots els vídeos d&#39;ajuda
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Seleccioneu cap compte del banc on xec va ser dipositat.
@@ -1162,6 +1184,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Metre
 DocType: Workstation,Electricity Cost,Cost d'electricitat
 DocType: HR Settings,Don't send Employee Birthday Reminders,No envieu Empleat recordatoris d'aniversari
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Desa configuració
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Productes sol·licitats
 DocType: Item,Inspection Criteria,Criteris d'Inspecció
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Transferit
 DocType: BOM Website Item,BOM Website Item,BOM lloc web d&#39;articles
@@ -1178,11 +1202,11 @@
 DocType: Journal Entry,Total Amount in Words,Suma total en Paraules
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"S'ha produït un error. Una raó probable podria ser que no ha guardat el formulari. Si us plau, poseu-vos en contacte amb support@erpnext.com si el problema persisteix."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Carro de la compra
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Tipus d'ordre ha de ser un de {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Tipus d'ordre ha de ser un de {0}
 DocType: Lead,Next Contact Date,Data del següent contacte
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Quantitat d'obertura
 DocType: Healthcare Settings,Appointment Reminder,Recordatori de cites
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,"Si us plau, introdueixi el compte per al Canvi Monto"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,"Si us plau, introdueixi el compte per al Canvi Monto"
 DocType: Student Batch Name,Student Batch Name,Lot Nom de l&#39;estudiant
 DocType: Consultation,Doctor,Doctor
 DocType: Holiday List,Holiday List Name,Nom de la Llista de vacances
@@ -1190,12 +1214,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Calendari de Cursos
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Opcions sobre accions
 DocType: Journal Entry Account,Expense Claim,Compte de despeses
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,De veres voleu restaurar aquest actiu rebutjat?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Quantitat de {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,De veres voleu restaurar aquest actiu rebutjat?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Quantitat de {0}
 DocType: Leave Application,Leave Application,Deixar Aplicació
 DocType: Patient,Patient Relation,Relació del pacient
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Deixa Eina d'Assignació
+DocType: Item,Hub Category to Publish,Categoria de concentradora per publicar
 DocType: Leave Block List,Leave Block List Dates,Deixa llista de blocs dates
+DocType: Sales Invoice,Billing Address GSTIN,Adreça de facturació GSTIN
 DocType: Workstation,Net Hour Rate,Hora taxa neta
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost rebut de compra
 DocType: Company,Default Terms,Termes predeterminats
@@ -1205,18 +1231,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Si us plau especificar un {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Elements retirats sense canvi en la quantitat o el valor.
 DocType: Delivery Note,Delivery To,Lliurar a
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Taula d&#39;atributs és obligatori
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Taula d&#39;atributs és obligatori
 DocType: Production Planning Tool,Get Sales Orders,Rep ordres de venda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} no pot ser negatiu
 DocType: Training Event,Self-Study,Acte estudi
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Descompte
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Descompte
 DocType: Asset,Total Number of Depreciations,Nombre total d&#39;amortitzacions
 DocType: Sales Invoice Item,Rate With Margin,Amb la taxa de marge
 DocType: Workstation,Wages,Salari
 DocType: Task,Urgent,Urgent
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},"Si us plau, especifiqueu un ID de fila vàlida per a la fila {0} a la taula {1}"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,No es pot trobar la variable:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Seleccioneu un camp per editar des del teclat numèric
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Seleccioneu un camp per editar des del teclat numèric
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Aneu a l&#39;escriptori i començar a utilitzar ERPNext
 DocType: Item,Manufacturer,Fabricant
 DocType: Landed Cost Item,Purchase Receipt Item,Rebut de compra d'articles
@@ -1247,8 +1273,8 @@
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Per defecte Centre de Cost de Venda
 DocType: Sales Partner,Implementation Partner,Soci d'Aplicació
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Codi ZIP
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Vendes Sol·licitar {0} és {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Codi ZIP
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Vendes Sol·licitar {0} és {1}
 DocType: Opportunity,Contact Info,Informació de Contacte
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Fer comentaris Imatges
 DocType: Packing Slip,Net Weight UOM,Pes net UOM
@@ -1259,6 +1285,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Get Weekly Off Dates
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Data de finalització no pot ser inferior a data d'inici
 DocType: Sales Person,Select company name first.,Seleccioneu el nom de l'empresa en primer lloc.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Baixa a alta
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ofertes rebudes dels proveïdors.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Substituïu BOM i actualitzeu el preu més recent en totes les BOM
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Per {0} | {1} {2}
@@ -1277,7 +1304,7 @@
 DocType: Program Enrollment,Transportation,Transports
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Atribut no vàlid
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} s'ha de Presentar
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},La quantitat ha de ser menor que o igual a {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},La quantitat ha de ser menor que o igual a {0}
 DocType: SMS Center,Total Characters,Personatges totals
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Seleccioneu la llista de materials en el camp de llista de materials per al punt {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Invoice Detail
@@ -1292,7 +1319,7 @@
 ,Ordered Items To Be Billed,Els articles comandes a facturar
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,De Gamma ha de ser menor que en la nostra gamma
 DocType: Global Defaults,Global Defaults,Valors per defecte globals
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Invitació del Projecte de Col·laboració
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Invitació del Projecte de Col·laboració
 DocType: Salary Slip,Deductions,Deduccions
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Nom de l&#39;acció
@@ -1310,13 +1337,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura proforma
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Res per sol·licitar
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Un altre rècord Pressupost &#39;{0}&#39; ja existeix en contra {1} &#39;{2}&#39; per a l&#39;any fiscal {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',La 'Data d'Inici Real' no pot ser major que la 'Data de Finalització Real'
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',La 'Data d'Inici Real' no pot ser major que la 'Data de Finalització Real'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Administració
 DocType: Cheque Print Template,Payer Settings,Configuració del pagador
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Això s'afegeix al Codi de l'article de la variant. Per exemple, si la seva abreviatura és ""SM"", i el codi de l'article és ""samarreta"", el codi de l'article de la variant serà ""SAMARRETA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,El sou net (en paraules) serà visible un cop que es guardi la nòmina.
 DocType: Purchase Invoice,Is Return,És la tornada
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Precaució
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Precaució
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Retorn / dèbit Nota
 DocType: Price List Country,Price List Country,Preu de llista País
 DocType: Item,UOMs,UOMS
@@ -1331,17 +1358,18 @@
 DocType: Account,Balance Sheet,Balanç
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Centre de cost per l'article amb Codi d'article '
 DocType: Fee Validity,Valid Till,Vàlid fins a
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode de pagament no està configurat. Si us plau, comproveu, si el compte s&#39;ha establert en la manera de pagament o en punts de venda perfil."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode de pagament no està configurat. Si us plau, comproveu, si el compte s&#39;ha establert en la manera de pagament o en punts de venda perfil."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,El mateix article no es pot introduir diverses vegades.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Altres comptes es poden fer en grups, però les entrades es poden fer contra els no Grups"
 DocType: Lead,Lead,Client potencial
 DocType: Email Digest,Payables,Comptes per Pagar
 DocType: Course,Course Intro,curs Introducció
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,De l&#39;entrada {0} creat
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configureu la sèrie de numeració per assistència mitjançant la configuració&gt; Sèrie de numeració
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,De l&#39;entrada {0} creat
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: No aprovat Quantitat no es pot introduir en la Compra de Retorn
 ,Purchase Order Items To Be Billed,Ordre de Compra articles a facturar
 DocType: Purchase Invoice Item,Net Rate,Taxa neta
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Seleccioneu un client
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Seleccioneu un client
 DocType: Purchase Invoice Item,Purchase Invoice Item,Compra Factura article
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Les entrades d'ajust d'estocs i les entrades de GL estan inserits en els rebuts de compra seleccionats
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Article 1
@@ -1360,7 +1388,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Duplicar fila {0} amb el mateix {1}
 ,Trial Balance,Balanç provisional
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Any fiscal {0} no trobat
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Configuració d&#39;Empleats
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Configuració d&#39;Empleats
 DocType: Sales Order,SO-,TAN-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Seleccioneu el prefix primer
 DocType: Employee,O-,O-
@@ -1372,12 +1400,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Veure Ledger
 DocType: Grading Scale,Intervals,intervals
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Earliest
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Hi ha un grup d'articles amb el mateix nom, si us plau, canvieu el nom de l'article o del grup d'articles"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Hi ha un grup d'articles amb el mateix nom, si us plau, canvieu el nom de l'article o del grup d'articles"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Nº d&#39;Estudiants mòbil
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Resta del món
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Resta del món
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,L'article {0} no pot tenir per lots
 ,Budget Variance Report,Pressupost Variància Reportar
 DocType: Salary Slip,Gross Pay,Sou brut
+DocType: Item,Is Item from Hub,És l&#39;element del centre
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Fila {0}: Tipus d&#39;activitat és obligatòria.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividends pagats
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Comptabilitat principal
@@ -1387,8 +1416,9 @@
 DocType: Vehicle Log,Service Detail,Detall del servei
 DocType: BOM,Item Description,Descripció de l'Article
 DocType: Student Sibling,Student Sibling,germà de l&#39;estudiant
-DocType: Purchase Invoice,Is Recurring,És recurrent
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Mètode de pagament
 DocType: Purchase Invoice,Supplied Items,Articles subministrats
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Establiu un menú actiu per al restaurant {0}
 DocType: Student,STUD.,Stud.
 DocType: Production Order,Qty To Manufacture,Quantitat a fabricar
 DocType: Email Digest,New Income,nou Ingrés
@@ -1398,6 +1428,7 @@
 ,Student and Guardian Contact Details,Alumne i tutor detalls de contacte
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Fila {0}: Per proveïdor es requereix {0} Adreça de correu electrònic per enviar correu electrònic
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Obertura Temporal
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Veure concentrador
 ,Employee Leave Balance,Balanç d'absències d'empleat
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Balanç per compte {0} ha de ser sempre {1}
 DocType: Patient Appointment,More Info,Més Info
@@ -1417,13 +1448,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Vendes Sol·licitar {0} no és vàlid
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Adverteu una nova sol·licitud de pressupostos
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Les ordres de compra li ajudarà a planificar i donar seguiment a les seves compres
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Ho sentim, les empreses no poden fusionar-"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Ho sentim, les empreses no poden fusionar-"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Prescripcions de proves de laboratori
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",La quantitat total d&#39;emissió / Transferència {0} en la Sol·licitud de material {1} \ no pot ser major que la quantitat sol·licitada {2} per a l&#39;article {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Petit
 DocType: Employee,Employee Number,Número d'empleat
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Cas No (s) ja en ús. Intenta Cas n {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Cas No (s) ja en ús. Intenta Cas n {0}
 DocType: Project,% Completed,% Completat
 ,Invoiced Amount (Exculsive Tax),Quantitat facturada (Impost exculsive)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Article 2
@@ -1438,11 +1469,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Despeses Indirectes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Fila {0}: Quantitat és obligatori
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sincronització de dades mestres
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sincronització de dades mestres
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Els Productes o Serveis de la teva companyia
 DocType: Special Test Items,Special Test Items,Elements de prova especials
 DocType: Mode of Payment,Mode of Payment,Forma de pagament
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Lloc web imatge ha de ser un arxiu públic o URL del lloc web
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Lloc web imatge ha de ser un arxiu públic o URL del lloc web
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,This is a root item group and cannot be edited.
@@ -1450,24 +1481,23 @@
 DocType: Vehicle,Fuel UOM,UOM de combustible
 DocType: Warehouse,Warehouse Contact Info,Informació del contacte del magatzem
 DocType: Payment Entry,Write Off Difference Amount,Amortitzar import de la diferència
-DocType: Purchase Invoice,Recurring Type,Tipus Recurrent
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: No s&#39;ha trobat el correu electrònic dels empleats, per tant, no correu electrònic enviat"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: No s&#39;ha trobat el correu electrònic dels empleats, per tant, no correu electrònic enviat"
 DocType: Item,Foreign Trade Details,Detalls estrangera Comerç
+,Assessment Plan Status,Estat del pla d&#39;avaluació
 DocType: Email Digest,Annual Income,Renda anual
 DocType: Serial No,Serial No Details,Serial No Detalls
 DocType: Purchase Invoice Item,Item Tax Rate,Element Tipus impositiu
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,Seleccioneu Metge i Data
 DocType: Student Group Student,Group Roll Number,Nombre Rotllo Grup
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Per {0}, només els comptes de crèdit es poden vincular amb un altre seient de dèbit"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total de tots els pesos de tasques ha de ser 1. Si us plau ajusta els pesos de totes les tasques del projecte en conseqüència
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,La Nota de lliurament {0} no està presentada
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total de tots els pesos de tasques ha de ser 1. Si us plau ajusta els pesos de totes les tasques del projecte en conseqüència
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,La Nota de lliurament {0} no està presentada
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Article {0} ha de ser un subcontractada article
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Capital Equipments
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regla preus es selecciona per primera basada en 'Aplicar On' camp, que pot ser d'article, grup d'articles o Marca."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Configureu primer el codi de l&#39;element
-DocType: Hub Settings,Seller Website,Venedor Lloc Web
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Configureu primer el codi de l&#39;element
 DocType: Item,ITEM-,ARTICLE-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,El Percentatge del total assignat per a l'equip de vendes ha de ser de 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,El Percentatge del total assignat per a l'equip de vendes ha de ser de 100
 DocType: Sales Invoice Item,Edit Description,Descripció
 DocType: Antibiotic,Antibiotic,Antibiòtics
 ,Team Updates,actualitzacions equip
@@ -1488,12 +1518,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Total (Companyia moneda)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Nombre de sèrie {0} va entrar més d'una vegada
 DocType: Depreciation Schedule,Journal Entry,Entrada de diari
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} articles en procés
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} articles en procés
 DocType: Workstation,Workstation Name,Nom de l'Estació de treball
 DocType: Grading Scale Interval,Grade Code,codi grau
 DocType: POS Item Group,POS Item Group,POS Grup d&#39;articles
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Enviar Resum:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} no pertany a Punt {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} no pertany a Punt {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Salary Slip,Bank Account No.,Compte Bancari No.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Aquest és el nombre de l'última transacció creat amb aquest prefix
@@ -1509,10 +1539,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Sol·licitud de Cotització Proveïdor
 DocType: Healthcare Settings,Registration Message,Missatge de registre
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Maquinari
-DocType: Sales Order,Recurring Upto,Fins que es repeteix
 DocType: Prescription Dosage,Prescription Dosage,Dosificació de recepta
 DocType: Attendance,HR Manager,Gerent de Recursos Humans
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Seleccioneu una Empresa
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Seleccioneu una Empresa
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Data Factura Proveïdor
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,per
@@ -1528,10 +1557,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,La superposició de les condicions trobades entre:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Contra Diari entrada {0} ja s'ajusta contra algun altre bo
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Valor Total de la comanda
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Menjar
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Menjar
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Rang 3 Envelliment
 DocType: Maintenance Schedule Item,No of Visits,Número de Visites
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Programa de manteniment {0} existeix en contra de {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Voleu publicar els vostres elements al concentrador?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,estudiant que s&#39;inscriu
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Divisa del compte de clausura ha de ser {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma de punts per a totes les metes ha de ser 100. És {0}
@@ -1542,9 +1572,9 @@
 DocType: Authorization Rule,Average Discount,Descompte Mig
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Utilitats
-DocType: Purchase Invoice Item,Accounting,Comptabilitat
+DocType: POS Profile,Accounting,Comptabilitat
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Seleccioneu lots per lots per al punt
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Seleccioneu lots per lots per al punt
 DocType: Asset,Depreciation Schedules,programes de depreciació
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Període d&#39;aplicació no pot ser període d&#39;assignació llicència fos
 DocType: Activity Cost,Projects,Projectes
@@ -1560,7 +1590,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',"Estat d'aprovació ha de ser ""Aprovat"" o ""Rebutjat"""
 DocType: Physician,Contacts and Address,Contactes i adreça
 DocType: Purchase Invoice,Contact Person,Persona De Contacte
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',La 'Data Prevista d'Inici' no pot ser major que la 'Data de Finalització Prevista'
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',La 'Data Prevista d'Inici' no pot ser major que la 'Data de Finalització Prevista'
 DocType: Course Scheduling Tool,Course End Date,Curs Data de finalització
 DocType: Holiday List,Holidays,Vacances
 DocType: Sales Order Item,Planned Quantity,Quantitat planificada
@@ -1568,10 +1598,11 @@
 DocType: Item,Maintain Stock,Mantenir Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Imatges de entrades ja creades per Ordre de Producció
 DocType: Employee,Prefered Email,preferit per correu electrònic
+DocType: Student Admission,Eligibility and Details,Elegibilitat i detalls
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Canvi net en actius fixos
 DocType: Leave Control Panel,Leave blank if considered for all designations,Deixar en blanc si es considera per a totes les designacions
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Càrrec del tipus 'real' a la fila {0} no pot ser inclòs en la partida Rate
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,A partir de data i hora
 DocType: Email Digest,For Company,Per a l'empresa
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Registre de Comunicació.
@@ -1579,19 +1610,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Quadre de puntuació de proveïdors Variable
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Import Comprar
 DocType: Sales Invoice,Shipping Address Name,Nom de l'Adreça d'enviament
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Pla General de Comptabilitat
 DocType: Material Request,Terms and Conditions Content,Contingut de Termes i Condicions
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,no pot ser major que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Article {0} no és un article d'estoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Article {0} no és un article d'estoc
 DocType: Maintenance Visit,Unscheduled,No programada
 DocType: Employee,Owned,Propietat de
 DocType: Salary Detail,Depends on Leave Without Pay,Depèn de la llicència sense sou
 DocType: Pricing Rule,"Higher the number, higher the priority","Més gran sigui el nombre, més gran és la prioritat"
 ,Purchase Invoice Trends,Tendències de les Factures de Compra
 DocType: Employee,Better Prospects,Millors perspectives
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Fila # {0}: El lot {1} té solament {2} Quant. Si us plau seleccioni un altre lot que té {3} Cant disponible o dividir la fila en diverses files, per lliurar / tema des de diversos lots"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Fila # {0}: El lot {1} té solament {2} Quant. Si us plau seleccioni un altre lot que té {3} Cant disponible o dividir la fila en diverses files, per lliurar / tema des de diversos lots"
 DocType: Vehicle,License Plate,Matrícula
 DocType: Appraisal,Goals,Objectius
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Selecciona el perfil de POS
 DocType: Warranty Claim,Warranty / AMC Status,Garantia / Estat de l'AMC
 ,Accounts Browser,Comptes Browser
 DocType: Payment Entry Reference,Payment Entry Reference,El pagament d&#39;entrada de referència
@@ -1610,7 +1641,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Empleat no pot informar-se a si mateix.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si el compte està bloquejat, només es permeten entrades alguns usuaris."
 DocType: Email Digest,Bank Balance,Balanç de Banc
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Entrada de Comptabilitat per a {0}: {1} només pot fer-se en moneda: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Entrada de Comptabilitat per a {0}: {1} només pot fer-se en moneda: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil del lloc, formació necessària, etc."
 DocType: Journal Entry Account,Account Balance,Saldo del compte
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Regla fiscal per a les transaccions.
@@ -1619,8 +1650,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Impostos i càrrecs (En la moneda de la Companyia)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Mostra P &amp; L saldos sense tancar l&#39;exercici fiscal
 DocType: Lab Test Template,Collection Details,Detalls de la col·lecció
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","seleccioneu cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date de tabConsultation ct, `tabLab Prescription` cp on ct.patient = &#39;{0}&#39; i cp.parent = ct. nom i cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Compte d'Enviaments
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Compte {2} està inactiu
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Fan comandes de client per ajudar-lo a planificar el seu treball i lliurament del temps de funcionament
@@ -1637,7 +1666,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Llista de presència
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,lloguer de l'oficina
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Paràmetres de configuració de Porta de SMS
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Error en importar!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Error en importar!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Sense direcció no afegeix encara.
 DocType: Workstation Working Hour,Workstation Working Hour,Estació de treball Hores de Treball
 DocType: Vital Signs,Blood Pressure,Pressió sanguínea
@@ -1662,7 +1691,7 @@
 DocType: Sales Invoice,Source,Font
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mostra tancada
 DocType: Leave Type,Is Leave Without Pay,Es llicencia sense sou
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Categoria actiu és obligatori per a la partida de l&#39;actiu fix
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Categoria actiu és obligatori per a la partida de l&#39;actiu fix
 DocType: Fee Validity,Fee Validity,Valida tarifes
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,No hi ha registres a la taula de Pagaments
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Aquest {0} conflictes amb {1} de {2} {3}
@@ -1683,8 +1712,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Cerca d'Executius
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,crear Vendes
 DocType: Maintenance Schedule,Schedules,Horaris
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,El perfil de la TPV és obligatori per utilitzar Point-of-Sale
 DocType: Purchase Invoice Item,Net Amount,Import Net
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} no s&#39;ha presentat de manera que l&#39;acció no es pot completar
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} no s&#39;ha presentat de manera que l&#39;acció no es pot completar
 DocType: Purchase Order Item Supplied,BOM Detail No,Detall del BOM No
 DocType: Landed Cost Voucher,Additional Charges,Els càrrecs addicionals
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Import addicional de descompte (moneda Company)
@@ -1693,7 +1723,7 @@
 ,Support Hour Distribution,Distribució horària de suport
 DocType: Maintenance Visit,Maintenance Visit,Manteniment Visita
 DocType: Student,Leaving Certificate Number,Deixant Nombre de certificat
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","S&#39;ha cancel·lat la cita, revisa i canvia la factura {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","S&#39;ha cancel·lat la cita, revisa i canvia la factura {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Disponible lot Quantitat en magatzem
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Format d&#39;impressió d&#39;actualització
 DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Ajuda
@@ -1716,8 +1746,8 @@
 DocType: Patient,Tobacco Past Use,Ús del passat del tabac
 DocType: Sales Invoice Item,Brand Name,Marca
 DocType: Purchase Receipt,Transporter Details,Detalls Transporter
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},L&#39;usuari {0} ja està assignat al metge {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Es requereix dipòsit per omissió per a l&#39;element seleccionat
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},L&#39;usuari {0} ja està assignat al metge {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Es requereix dipòsit per omissió per a l&#39;element seleccionat
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Caixa
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,possible Proveïdor
 DocType: Budget,Monthly Distribution,Distribució Mensual
@@ -1727,7 +1757,7 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 DocType: Loan Type,Maximum Loan Amount,La quantitat màxima del préstec
 DocType: Pricing Rule,Pricing Rule,Regla preus
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},nombre de rotllo duplicat per a l&#39;estudiant {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},nombre de rotllo duplicat per a l&#39;estudiant {0}
 DocType: Budget,Action if Annual Budget Exceeded,Acció Si el pressupost anual va superar
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Sol·licitud de materials d&#39;Ordre de Compra
 DocType: Shopping Cart Settings,Payment Success URL,Pagament URL Èxit
@@ -1744,7 +1774,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} ha d'aparèixer només una vegada
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},No es permet Tranfer més {0} de {1} contra l&#39;Ordre de Compra {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Les fulles Numerat amb èxit per {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,No hi ha articles per embalar
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,No hi ha articles per embalar
 DocType: Shipping Rule Condition,From Value,De Valor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Quantitat de fabricació és obligatori
 DocType: Employee Loan,Repayment Method,Mètode d&#39;amortització
@@ -1758,6 +1788,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Stock Liabilities
 DocType: Purchase Invoice,Supplier Warehouse,Magatzem Proveïdor
 DocType: Opportunity,Contact Mobile No,Contacte Mòbil No
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Seleccioneu l&#39;empresa
 ,Material Requests for which Supplier Quotations are not created,Les sol·licituds de material per als quals no es creen Ofertes de Proveïdor
 DocType: Student Group,Set 0 for no limit,Ajust 0 indica sense límit
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,El dia (s) en el qual està sol·licitant la llicència són els dies festius. Vostè no necessita sol·licitar l&#39;excedència.
@@ -1767,24 +1798,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Fer Cita
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,altres informes
 DocType: Dependent Task,Dependent Task,Tasca dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de conversió per a la unitat de mesura per defecte ha de ser d'1 a la fila {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de conversió per a la unitat de mesura per defecte ha de ser d'1 a la fila {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Una absència del tipus {0} no pot ser de més de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Intenta operacions per a la planificació de X dies d&#39;antelació.
 DocType: HR Settings,Stop Birthday Reminders,Aturar recordatoris d'aniversari
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},"Si us plau, estableix nòmina compte per pagar per defecte en l&#39;empresa {0}"
 DocType: SMS Center,Receiver List,Llista de receptors
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,cerca article
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,cerca article
 DocType: Patient Appointment,Referring Physician,Metge que fa referència
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantitat consumida
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Canvi Net en Efectiu
 DocType: Assessment Plan,Grading Scale,Escala de Qualificació
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,La unitat de mesura {0} s'ha introduït més d'una vegada a la taula de valors de conversió
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,ja acabat
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,La unitat de mesura {0} s'ha introduït més d'una vegada a la taula de valors de conversió
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,ja acabat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,A la mà de la
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Sol·licitud de pagament ja existeix {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost d'articles Emeses
 DocType: Physician,Hospital,Hospital
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},La quantitat no ha de ser més de {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},La quantitat no ha de ser més de {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Exercici anterior no està tancada
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Edat (dies)
 DocType: Quotation Item,Quotation Item,Cita d'article
@@ -1795,8 +1826,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Taula mestre de tipus de proveïdor
 DocType: Purchase Order Item,Supplier Part Number,PartNumber del proveïdor
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,La taxa de conversió no pot ser 0 o 1
-DocType: Sales Invoice,Reference Document,Document de referència
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} està cancel·lat o parat
+DocType: Subscription,Reference Document,Document de referència
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} està cancel·lat o parat
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Vehicle Dispatch Date
 DocType: Healthcare Settings,Default Medical Code Standard,Codi per defecte de codi mèdic
@@ -1805,6 +1836,7 @@
 DocType: Company,Default Payable Account,Compte per Pagar per defecte
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Ajustaments per a la compra en línia, com les normes d'enviament, llista de preus, etc."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Anunciat
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Ordena per preu ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reservats Quantitat
 DocType: Party Account,Party Account,Compte Partit
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Recursos Humans
@@ -1816,13 +1848,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Fer l&#39;entrada de desemborsament
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Fila {0}: Avanç contra el Proveïdor ha de afeblir
 DocType: Company,Default Values,Valors Predeterminats
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{} La freqüència Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{} La freqüència Digest
 DocType: Expense Claim,Total Amount Reimbursed,Suma total reemborsat
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Això es basa en els registres contra aquest vehicle. Veure cronologia avall per saber més
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Contra Proveïdor Factura {0} {1} datat
 DocType: Customer,Default Price List,Llista de preus per defecte
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,registrar el moviment d&#39;actius {0} creat
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,No es pot eliminar l&#39;any fiscal {0}. Any fiscal {0} s&#39;estableix per defecte en la configuració global
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Ja existeix un client amb el mateix nom
 DocType: Journal Entry,Entry Type,Tipus d&#39;entrada
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Sense pla d&#39;avaluació relacionat amb aquest grup d&#39;avaluació
 ,Customer Credit Balance,Saldo de crèdit al Client
@@ -1832,7 +1865,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,la fixació de preus
 DocType: Quotation,Term Details,Detalls termini
 DocType: Project,Total Sales Cost (via Sales Order),Cost total de vendes (a través d&#39;ordres de venda)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,No es pot inscriure més de {0} estudiants d&#39;aquest grup d&#39;estudiants.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,No es pot inscriure més de {0} estudiants d&#39;aquest grup d&#39;estudiants.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Comptador de plom
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} ha de ser més gran que 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planificació de la capacitat per a (Dies)
@@ -1848,9 +1881,11 @@
 DocType: Lab Test,Technician Name,Tècnic Nom
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Desvinculació de Pagament a la cancel·lació de la factura
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Lectura actual del odòmetre entrat ha de ser més gran que el comptaquilòmetres inicial {0}
+DocType: Restaurant Reservation,No Show,No hi ha espectacle
 DocType: Shipping Rule Country,Shipping Rule Country,Regla País d&#39;enviament
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Deixa i Assistència
 DocType: Maintenance Visit,Partially Completed,Va completar parcialment
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Sensibilitat moderada
 DocType: Leave Type,Include holidays within leaves as leaves,Inclogui les vacances dins de les fulles com les fulles
 DocType: Sales Invoice,Packed Items,Dinar Articles
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Reclamació de garantia davant el No. de sèrie
@@ -1867,13 +1902,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Suma Pagat (Companyia moneda)
 DocType: Purchase Invoice,Additional Discount,Descompte addicional
 DocType: Selling Settings,Selling Settings,La venda d'Ajustaments
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Confirma l&#39;acció
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Subhastes en línia
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Si us plau especificar Quantitat o valoració de tipus o ambdós
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Realització
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,veure Cistella
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Despeses de Màrqueting
 ,Item Shortage Report,Informe d'escassetat d'articles
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","S'esmenta Pes, \n Si us plau, ""Pes UOM"" massa"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","S'esmenta Pes, \n Si us plau, ""Pes UOM"" massa"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Sol·licitud de material utilitzat per fer aquesta entrada Stock
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,La depreciació propera data és obligatori per als nous actius
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Grup basat curs separat per a cada lot
@@ -1885,12 +1921,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Feu Entrada Comptabilitat Per Cada moviment d'estoc
 DocType: Leave Allocation,Total Leaves Allocated,Absències totals assignades
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Magatzem requerit a la fila n {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,"Si us plau, introdueixi Any vàlida Financera dates inicial i final"
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,"Si us plau, introdueixi Any vàlida Financera dates inicial i final"
 DocType: Employee,Date Of Retirement,Data de la jubilació
 DocType: Upload Attendance,Get Template,Aconsegueix Plantilla
 DocType: Material Request,Transferred,transferit
 DocType: Vehicle,Doors,portes
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,Configuració ERPNext completa!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,Configuració ERPNext completa!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Recull la tarifa per al registre del pacient
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,desintegració impostos
@@ -1909,36 +1945,36 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si aquest article té variants, llavors no pot ser seleccionada en les comandes de venda, etc."
 DocType: Lead,Next Contact By,Següent Contactar Per
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Quantitat necessària per Punt {0} a la fila {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Quantitat necessària per Punt {0} a la fila {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Magatzem {0} no es pot eliminar com existeix quantitat d'article {1}
 DocType: Quotation,Order Type,Tipus d'ordre
-DocType: Purchase Invoice,Notification Email Address,Dir Adreça de correu electrònic per notificacions
 ,Item-wise Sales Register,Tema-savi Vendes Registre
 DocType: Asset,Gross Purchase Amount,Compra import brut
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Balanços d&#39;obertura
 DocType: Asset,Depreciation Method,Mètode de depreciació
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,desconnectat
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,desconnectat
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Aqeust impost està inclòs a la tarifa bàsica?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Totals de l'objectiu
 DocType: Job Applicant,Applicant for a Job,Sol·licitant d'ocupació
 DocType: Production Plan Material Request,Production Plan Material Request,Producció Sol·licitud Pla de materials
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,No hi ha ordres de fabricació creades
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,No hi ha ordres de fabricació creades
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliació JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Massa columnes. Exporta l'informe i utilitza una aplicació de full de càlcul.
 DocType: Purchase Invoice Item,Batch No,Lot número
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Sol·licitud de cotització: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permetre diverses ordres de venda en contra d&#39;un client Ordre de Compra
 DocType: Student Group Instructor,Student Group Instructor,Instructor grup d&#39;alumnes
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Sense Guardian2 mòbil
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Inici
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Inici
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establir prefix de numeracions seriades a les transaccions
 DocType: Employee Attendance Tool,Employees HTML,Els empleats HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Per defecte la llista de materials ({0}) ha d&#39;estar actiu per aquest material o la seva plantilla
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Per defecte la llista de materials ({0}) ha d&#39;estar actiu per aquest material o la seva plantilla
 DocType: Employee,Leave Encashed?,Leave Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Oportunitat de camp és obligatori
 DocType: Email Digest,Annual Expenses,Les despeses anuals
 DocType: Item,Variants,Variants
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Feu l'Ordre de Compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Feu l'Ordre de Compra
 DocType: SMS Center,Send To,Enviar a
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},There is not enough leave balance for Leave Type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Monto assignat
@@ -1954,6 +1990,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Força grup d&#39;alumnes
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Contra Diari entrada {0} no té cap {1} entrada inigualable
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,taxacions
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Esdeveniments de formació
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Número de sèrie duplicat per l'article {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Una condició per a una regla d'enviament
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,"Si us plau, entra"
@@ -1963,7 +2000,7 @@
 DocType: Sales Order,To Deliver and Bill,Per Lliurar i Bill
 DocType: Student Group,Instructors,els instructors
 DocType: GL Entry,Credit Amount in Account Currency,Suma de crèdit en compte Moneda
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} ha de ser presentat
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} ha de ser presentat
 DocType: Authorization Control,Authorization Control,Control d'Autorització
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Fila # {0}: Magatzem Rebutjat és obligatori en la partida rebutjada {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Pagament
@@ -1982,11 +2019,11 @@
 DocType: Quotation Item,Actual Qty,Actual Quantitat
 DocType: Sales Invoice Item,References,Referències
 DocType: Quality Inspection Reading,Reading 10,Reading 10
-DocType: Hub Settings,Hub Node,Node Hub
+DocType: Hub Category,Hub Node,Node Hub
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Has introduït articles duplicats. Si us plau, rectifica-ho i torna a intentar-ho."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Associat
 DocType: Asset Movement,Asset Movement,moviment actiu
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,nou carro
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,nou carro
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Article {0} no és un article serialitzat
 DocType: SMS Center,Create Receiver List,Crear Llista de receptors
 DocType: Vehicle,Wheels,rodes
@@ -2000,15 +2037,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicacions
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que el paquet és una part d'aquest lliurament (Només Projecte)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Feu Entrada Pagament
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Quantitat d'articles per {0} ha de ser menor de {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Quantitat d'articles per {0} ha de ser menor de {1}
 ,Sales Invoice Trends,Tendències de Factures de Vendes
 DocType: Leave Application,Apply / Approve Leaves,Aplicar / Aprovar Fulles
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Per
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Per
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Pot referir fila només si el tipus de càrrega és 'On Anterior Suma Fila ""o"" Anterior Fila Total'"
 DocType: Sales Order Item,Delivery Warehouse,Magatzem Lliurament
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Arbre de Centres de costos financers.
 DocType: Serial No,Delivery Document No,Lliurament document nº
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Ajust &#39;Compte / Pèrdua de beneficis per alienacions d&#39;actius&#39; en la seva empresa {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Ajust &#39;Compte / Pèrdua de beneficis per alienacions d&#39;actius&#39; en la seva empresa {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Obtenir els articles des dels rebuts de compra
 DocType: Serial No,Creation Date,Data de creació
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Article {0} apareix diverses vegades en el Preu de llista {1}
@@ -2019,11 +2056,12 @@
 DocType: Student,Student Mobile Number,Nombre mòbil Estudiant
 DocType: Item,Has Variants,Té variants
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Actualitza la resposta
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Ja ha seleccionat articles de {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Ja ha seleccionat articles de {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nom de la Distribució Mensual
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Identificació del lot és obligatori
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
-DocType: Purchase Invoice,Recurring Invoice,Factura Recurrent
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Alt a baix
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Seleccioneu primer el programa
 DocType: Patient Appointment,Patient Age,Edat del pacient
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Gestió de Projectes
 DocType: Supplier,Supplier of Goods or Services.,Proveïdor de productes o serveis.
@@ -2031,8 +2069,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Compte per cobrar per defecte que s&#39;utilitzarà si no s&#39;estableix a Patient per reservar càrrecs de consulta.
 DocType: Vehicle Log,Fuel Price,Preu del combustible
 DocType: Budget,Budget,Pressupost
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Estableix obert
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Actius Fixos L&#39;article ha de ser una posició no de magatzem.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Estableix obert
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Actius Fixos L&#39;article ha de ser una posició no de magatzem.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Pressupost no es pot assignar en contra {0}, ja que no és un compte d&#39;ingressos o despeses"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Aconseguit
 DocType: Student Admission,Application Form Route,Ruta Formulari de Sol·licitud
@@ -2046,12 +2084,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,L'Article {0} no està configurat per a números de sèrie. Comprova la configuració d'articles
 DocType: Maintenance Visit,Maintenance Time,Temps de manteniment
 ,Amount to Deliver,La quantitat a Deliver
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},S&#39;ha introduït el mateix element diverses vegades. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"El Termini Data d&#39;inici no pot ser anterior a la data d&#39;inici d&#39;any de l&#39;any acadèmic a què està vinculat el terme (any acadèmic {}). Si us plau, corregeixi les dates i torna a intentar-ho."
 DocType: Guardian,Guardian Interests,Interessos de la guarda
 DocType: Naming Series,Current Value,Valor actual
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Hi ha diversos exercicis per a la data {0}. Si us plau, estableix la companyia en l&#39;exercici fiscal"
 DocType: School Settings,Instructor Records to be created by,Instructor Records a ser creat per
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} creat
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} creat
 DocType: Delivery Note Item,Against Sales Order,Contra l'Ordre de Venda
 ,Serial No Status,Estat del número de sèrie
 DocType: Payment Entry Reference,Outstanding,Excepcional
@@ -2062,10 +2101,10 @@
  ha de ser més gran que o igual a {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Això es basa en el moviment de valors. Veure {0} per a més detalls
 DocType: Pricing Rule,Selling,Vendes
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Suma {0} {1} presenta disminuint {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Suma {0} {1} presenta disminuint {2}
 DocType: Employee,Salary Information,Informació sobre sous
 DocType: Sales Person,Name and Employee ID,Nom i ID d'empleat
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Data de venciment no pot ser anterior Data de comptabilització
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Data de venciment no pot ser anterior Data de comptabilització
 DocType: Website Item Group,Website Item Group,Lloc web Grup d'articles
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Taxes i impostos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Si us plau, introduïu la data de referència"
@@ -2091,7 +2130,7 @@
 DocType: Issue,Resolution Details,Resolució Detalls
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,les assignacions
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Criteris d'acceptació
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Si us plau, introdueixi Les sol·licituds de material a la taula anterior"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,"Si us plau, introdueixi Les sol·licituds de material a la taula anterior"
 DocType: Item Attribute,Attribute Name,Nom del Atribut
 DocType: BOM,Show In Website,Mostra en el lloc web
 DocType: Shopping Cart Settings,Show Quantity in Website,Quantitat mostrar a la pàgina web
@@ -2100,7 +2139,7 @@
 DocType: Item Reorder,Check in (group),El procés de registre (grup)
 ,Qty to Order,Quantitat de comanda
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","El capçal compte sota passiu o patrimoni, en el qual serà reservat Guany / Pèrdua"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Diagrama de Gantt de totes les tasques.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Diagrama de Gantt de totes les tasques.
 DocType: Opportunity,Mins to First Response,Minuts fins a la primera resposta
 DocType: Pricing Rule,Margin Type,tipus marge
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} hores
@@ -2121,35 +2160,35 @@
 DocType: Patient,Surgical History,Història quirúrgica
 DocType: Employee,Resignation Letter Date,Carta de renúncia Data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Regles de les tarifes es filtren més basat en la quantitat.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Si us plau ajust la data d&#39;incorporació dels empleats {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Si us plau ajust la data d&#39;incorporació dels empleats {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Facturació quantitat total (a través de fulla d&#39;hores)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repetiu els ingressos dels clients
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ha de tenir rol 'aprovador de despeses'
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Parell
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Seleccioneu la llista de materials i d&#39;Unitats de Producció
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Seleccioneu la llista de materials i d&#39;Unitats de Producció
 DocType: Asset,Depreciation Schedule,Programació de la depreciació
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Les adreces soci de vendes i contactes
 DocType: Bank Reconciliation Detail,Against Account,Contra Compte
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Mig dia de la data ha d&#39;estar entre De la data i Fins a la data
 DocType: Maintenance Schedule Detail,Actual Date,Data actual
 DocType: Item,Has Batch No,Té número de lot
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Facturació anual: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Facturació anual: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Béns i serveis (GST Índia)
 DocType: Delivery Note,Excise Page Number,Excise Page Number
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Company, des de la data i fins a la data és obligatòria"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Accedeix a la Consulta
 DocType: Asset,Purchase Date,Data de compra
 DocType: Employee,Personal Details,Dades Personals
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Ajust &#39;Centre de l&#39;amortització del cost de l&#39;actiu&#39; a l&#39;empresa {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Ajust &#39;Centre de l&#39;amortització del cost de l&#39;actiu&#39; a l&#39;empresa {0}
 ,Maintenance Schedules,Programes de manteniment
 DocType: Task,Actual End Date (via Time Sheet),Data de finalització real (a través de fulla d&#39;hores)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Suma {0} {1} {2} contra {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Suma {0} {1} {2} contra {3}
 ,Quotation Trends,Quotation Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Grup L'article no esmenta en mestre d'articles per a l'article {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Dèbit al compte ha de ser un compte per cobrar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Dèbit al compte ha de ser un compte per cobrar
 DocType: Shipping Rule Condition,Shipping Amount,Total de l'enviament
 DocType: Supplier Scorecard Period,Period Score,Puntuació de períodes
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Afegir Clients
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Afegir Clients
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,A l'espera de l'Import
 DocType: Lab Test Template,Special,Especial
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversió
@@ -2157,13 +2196,14 @@
 ,Vehicle Expenses,Les despeses de vehicles
 DocType: Serial No,Invoice Details,Detalls de la factura
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Valor esperat després de la vida útil ha de ser major o igual a {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Comença
+DocType: Hub Category,Hub Category,Categoria de concentrador
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Nombre de vehicles
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,La data en què s'atura la factura recurrent
 DocType: Employee Loan,Loan Amount,Total del préstec
 DocType: Program Enrollment,Self-Driving Vehicle,Vehicle auto-conducció
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Quadre de comandament del proveïdor
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Fila {0}: Llista de materials que no es troba per a l&#39;element {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Fila {0}: Llista de materials que no es troba per a l&#39;element {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Total de fulls assignades {0} no pot ser inferior a les fulles ja aprovats {1} per al període
 DocType: Journal Entry,Accounts Receivable,Comptes Per Cobrar
 ,Supplier-Wise Sales Analytics,Proveïdor-Wise Vendes Analytics
@@ -2174,7 +2214,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Curs per a Pares (Deixar en blanc, si això no és part del Curs per a Pares)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Deixar en blanc si es considera per a tot tipus d'empleats
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir els càrrecs en base a
-apps/erpnext/erpnext/hooks.py +131,Timesheets,taula de temps
+apps/erpnext/erpnext/hooks.py +140,Timesheets,taula de temps
 DocType: HR Settings,HR Settings,Configuració de recursos humans
 DocType: Salary Slip,net pay info,Dades de la xarxa de pagament
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Aquest valor s&#39;actualitza a la llista de preus de venda predeterminada.
@@ -2185,7 +2225,7 @@
 DocType: Patient,B Positive,B Positiu
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Fila # {0}: Quantitat ha de ser 1, com a element és un actiu fix. Si us plau, utilitzeu fila separada per al qty múltiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Leave Block List Allow
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr no pot estar en blanc o l&#39;espai
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr no pot estar en blanc o l&#39;espai
 DocType: Patient Medical Record,Patient Medical Record,Registre mèdic del pacient
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Grup de No-Grup
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Esports
@@ -2201,9 +2241,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,"No s&#39;ha pogut trobar el tipus de canvi per a {0} a {1} per a la data clau {2}. Si us plau, crear un registre de canvi manual"
 DocType: POS Profile,Price List,Llista de preus
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} és ara l'Any Fiscal.oer defecte Si us plau, actualitzi el seu navegador perquè el canvi tingui efecte."
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Les reclamacions de despeses
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Les reclamacions de despeses
 DocType: Issue,Support,Suport
 ,BOM Search,BOM Cercar
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Publica &quot;En existència&quot; o &quot;No està en existència&quot; al Hub basant-se en les existències disponibles en aquest magatzem.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Tancament (Obertura + totals)
 DocType: Vehicle,Fuel Type,Tipus de combustible
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Si us plau, especifiqui la moneda a l'empresa"
@@ -2215,16 +2256,16 @@
 DocType: Healthcare Settings,Remind Before,Recordeu abans
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Es requereix el factor de conversió de la UOM a la fila {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Fila # {0}: Tipus de document de referència ha de ser una d&#39;ordres de venda, factura de venda o entrada de diari"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Fila # {0}: Tipus de document de referència ha de ser una d&#39;ordres de venda, factura de venda o entrada de diari"
 DocType: Salary Component,Deduction,Deducció
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Fila {0}: Del temps i el temps és obligatori.
 DocType: Stock Reconciliation Item,Amount Difference,diferència suma
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Article Preu afegit per {0} en Preu de llista {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Article Preu afegit per {0} en Preu de llista {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Introdueixi Empleat Id d&#39;aquest venedor
 DocType: Territory,Classification of Customers by region,Classificació dels clients per regió
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Diferència La quantitat ha de ser zero
 DocType: Project,Gross Margin,Marge Brut
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Si us plau indica primer l'Article a Producció
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Si us plau indica primer l'Article a Producció
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Calculat equilibri extracte bancari
 DocType: Normal Test Template,Normal Test Template,Plantilla de prova normal
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,desactivat usuari
@@ -2234,21 +2275,22 @@
 DocType: Salary Slip,Total Deduction,Deducció total
 ,Production Analytics,Anàlisi de producció
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Això es basa en operacions contra aquest pacient. Vegeu la línia de temps a continuació per obtenir detalls
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Cost Actualitzat
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Cost Actualitzat
 DocType: Employee,Date of Birth,Data de naixement
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Article {0} ja s'ha tornat
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Any Fiscal ** representa un exercici financer. Els assentaments comptables i altres transaccions importants es segueixen contra ** Any Fiscal **.
 DocType: Opportunity,Customer / Lead Address,Client / Direcció Plom
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Configuració del quadre de comandaments del proveïdor
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Avís: certificat SSL no vàlid en la inclinació {0}
-DocType: Student Admission,Eligibility,Elegibilitat
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Nom del pla d&#39;avaluació
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Avís: certificat SSL no vàlid en la inclinació {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Cables ajuden a obtenir negoci, posar tots els seus contactes i més com els seus clients potencials"
 DocType: Production Order Operation,Actual Operation Time,Temps real de funcionament
 DocType: Authorization Rule,Applicable To (User),Aplicable a (Usuari)
 DocType: Purchase Taxes and Charges,Deduct,Deduir
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Descripció del Treball
 DocType: Student Applicant,Applied,aplicat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Torna a obrir
 DocType: Sales Invoice Item,Qty as per Stock UOM,La quantitat d'existències ha d'estar expresada en la UDM
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,nom Guardian2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caràcters especials excepte ""-"" ""."", ""#"", i ""/"" no permès en el nomenament de sèrie"
@@ -2260,7 +2302,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Gerent de Fàbrica
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},El número de sèrie {0} està en garantia fins {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Dividir nota de lliurament en paquets.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Els enviaments
+apps/erpnext/erpnext/hooks.py +107,Shipments,Els enviaments
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Total assignat (Companyia de divises)
 DocType: Purchase Order Item,To be delivered to customer,Per ser lliurat al client
 DocType: BOM,Scrap Material Cost,Cost de materials de rebuig
@@ -2282,8 +2324,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Configuració de la variant de l&#39;element
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Seleccioneu l'empresa ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Deixar en blanc si es considera per a tots els departaments
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tipus d'ocupació (permanent, contractats, intern etc.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} és obligatori per l'article {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Tipus d'ocupació (permanent, contractats, intern etc.)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} és obligatori per l'article {1}
 DocType: Process Payroll,Fortnightly,quinzenal
 DocType: Currency Exchange,From Currency,De la divisa
 DocType: Vital Signs,Weight (In Kilogram),Pes (en quilogram)
@@ -2307,7 +2349,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Si us plau, feu clic a ""Generar la Llista d'aconseguir horari"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,S&#39;han produït errors mentre esborra següents horaris:
 DocType: Bin,Ordered Quantity,Quantitat demanada
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","per exemple ""Construir eines per als constructors """
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","per exemple ""Construir eines per als constructors """
 DocType: Grading Scale,Grading Scale Intervals,Intervals de classificació en l&#39;escala
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Entrada de Comptabilitat per a {2} només pot fer-se en moneda: {3}
 DocType: Production Order,In Process,En procés
@@ -2330,11 +2372,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Amb el pagament de l&#39;impost
 DocType: Expense Claim Detail,Expense Claim Detail,Reclamació de detall de despesa
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Triplicat per PROVEÏDOR
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Seleccioneu el compte correcte
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Seleccioneu el compte correcte
 DocType: Item,Weight UOM,UDM del pes
 DocType: Salary Structure Employee,Salary Structure Employee,Empleat Estructura salarial
 DocType: Patient,Blood Group,Grup sanguini
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Pendent
 DocType: Course,Course Name,Nom del curs
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Els usuaris que poden aprovar les sol·licituds de llicència d'un empleat específic
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Material d'oficina
@@ -2353,7 +2394,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Els preus no es mostren si la llista de preus no s&#39;ha establert
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Si us plau, especifiqui un país d&#39;aquesta Regla de la tramesa o del check Enviament mundial"
 DocType: Stock Entry,Total Incoming Value,Valor Total entrant
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Es requereix dèbit per
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Es requereix dèbit per
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Taula de temps ajuden a mantenir la noció del temps, el cost i la facturació d&#39;activitats realitzades pel seu equip"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Llista de preus de Compra
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Plantilles de variables de quadre de comandament de proveïdors.
@@ -2363,7 +2404,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Reconciliació de Pagaments
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Si us plau, seleccioneu el nom de la persona al càrrec"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tecnologia
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Total no pagat: {0}
+DocType: Hub Settings,Unregister from Hub,Desenregistreu del Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Total no pagat: {0}
 DocType: BOM Website Operation,BOM Website Operation,Operació Pàgina Web de llista de materials
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Carta De Oferta
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generar sol·licituds de materials (MRP) i ordres de producció.
@@ -2375,7 +2417,9 @@
 DocType: Physician Schedule Time Slot,To Time,Per Temps
 DocType: Authorization Rule,Approving Role (above authorized value),Aprovar Rol (per sobre del valor autoritzat)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Crèdit al compte ha de ser un compte per pagar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM recursiu: {0} no pot ser pare o fill de {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Si us plau, seleccioneu Admissió d&#39;estudiants que és obligatòria per al sol·licitant estudiant pagat"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM recursiu: {0} no pot ser pare o fill de {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Seleccioneu una llista de preus per publicar preus
 DocType: Production Order Operation,Completed Qty,Quantitat completada
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Per {0}, només els comptes de dèbit poden ser enllaçats amb una altra entrada de crèdit"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,La llista de preus {0} està deshabilitada
@@ -2387,38 +2431,39 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Números de sèrie necessaris per Punt {1}. Vostè ha proporcionat {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Valoració actual Taxa
 DocType: Item,Customer Item Codes,Codis dels clients
+DocType: Training Event,Advance,Avanç
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,per tornar a fer-ho de manera recurrent.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Guany en Canvi / Pèrdua
 DocType: Opportunity,Lost Reason,Raó Perdut
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nova adreça
 DocType: Quality Inspection,Sample Size,Mida de la mostra
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,"Si us plau, introdueixi recepció de documents"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,S'han facturat tots els articles
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Si us plau, especifica un 'Des del Cas Número' vàlid"
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',"Si us plau, especifica un 'Des del Cas Número' vàlid"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Centres de costos addicionals es poden fer en grups, però les entrades es poden fer contra els no Grups"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Usuaris i permisos
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Ordres de fabricació creades: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Ordres de fabricació creades: {0}
 DocType: Branch,Branch,Branca
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Printing and Branding
 DocType: Company,Total Monthly Sales,Vendes mensuals totals
 DocType: Bin,Actual Quantity,Quantitat real
 DocType: Shipping Rule,example: Next Day Shipping,exemple: Enviament Dia següent
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} no trobat
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},La subscripció ha estat {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},La subscripció ha estat {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Programa de tarifes Programa
 DocType: Fee Schedule Program,Student Batch,lot estudiant
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,seleccioneu * de `tabVital Signs` on pacient = &#39;{0}&#39; per sign_date desc límit 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,fer Estudiant
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Grau mínim
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Se li ha convidat a col·laborar en el projecte: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},El metge no està disponible a {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Se li ha convidat a col·laborar en el projecte: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},El metge no està disponible a {0}
 DocType: Leave Block List Date,Block Date,Bloquejar Data
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Afegiu un identificador de subscripció de camp personalitzat a la doctype {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Nota de lliurament del proveïdor
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Aplicar ara
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Aplicar ara
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Quantitat real {0} / tot esperant Quantitat {1}
 DocType: Purchase Invoice,E-commerce GSTIN,Comerç electrònic GSTIN
 DocType: Sales Order,Not Delivered,No Lliurat
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,La data prevista no es pot fer abans de la data de la transacció
 ,Bank Clearance Summary,Resum Liquidació del Banc
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Creació i gestió de resums de correu electrònic diàries, setmanals i mensuals."
 DocType: Appraisal Goal,Appraisal Goal,Avaluació Meta
@@ -2426,12 +2471,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,edificis
 DocType: Fee Schedule,Fee Structure,Estructura de tarifes
 DocType: Timesheet Detail,Costing Amount,Pago Monto
-DocType: Student Admission,Application Fee,Taxa de sol·licitud
+DocType: Student Admission Program,Application Fee,Taxa de sol·licitud
 DocType: Process Payroll,Submit Salary Slip,Presentar nòmina
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maxim descompte per article {0} és {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Maxim descompte per article {0} és {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importació a granel
 DocType: Sales Partner,Address & Contacts,Direcció i contactes
 DocType: SMS Log,Sender Name,Nom del remitent
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Ordenar per Criteria
 DocType: POS Profile,[Select],[Seleccionar]
 DocType: Vital Signs,Blood Pressure (diastolic),Pressió sanguínia (diastòlica)
 DocType: SMS Log,Sent To,Enviat A
@@ -2440,7 +2486,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Següent Contacte La data no pot ser en el passat
 DocType: Company,For Reference Only.,Només de referència.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},El metge {0} no està disponible a {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Seleccioneu Lot n
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Seleccioneu Lot n
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},No vàlida {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,Referència Inv
@@ -2456,15 +2502,15 @@
 DocType: Normal Test Items,Require Result Value,Requereix un valor de resultat
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Cas No. No pot ser 0
 DocType: Item,Show a slideshow at the top of the page,Mostra una presentació de diapositives a la part superior de la pàgina
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Botigues
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Botigues
 DocType: Project Type,Projects Manager,Gerent de Projectes
 DocType: Serial No,Delivery Time,Temps de Lliurament
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Envelliment basat en
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,S&#39;ha cancel·lat la cita
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,S&#39;ha cancel·lat la cita
 DocType: Item,End of Life,Final de la Vida
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Viatges
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Sense estructura activa o salari per defecte trobat d&#39;empleat {0} per a les dates indicades
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Viatges
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Sense estructura activa o salari per defecte trobat d&#39;empleat {0} per a les dates indicades
 DocType: Leave Block List,Allow Users,Permetre que usuaris
 DocType: Purchase Order,Customer Mobile No,Client Mòbil No
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Periódico
@@ -2473,12 +2519,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Actualització de Costos
 DocType: Item Reorder,Item Reorder,Punt de reorden
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Slip Mostra Salari
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Transferir material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Transferir material
 DocType: Fees,Send Payment Request,Enviar sol·licitud de pagament
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especifiqueu les operacions, el cost d'operació i dona una número d'operació únic a les operacions."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Aquest document està per sobre del límit de {0} {1} per a l&#39;element {4}. Estàs fent una altra {3} contra el mateix {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Si us plau conjunt recurrent després de guardar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Seleccioneu el canvi import del compte
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Seleccioneu el canvi import del compte
 DocType: Purchase Invoice,Price List Currency,Price List Currency
 DocType: Naming Series,User must always select,Usuari sempre ha de seleccionar
 DocType: Stock Settings,Allow Negative Stock,Permetre existències negatives
@@ -2498,7 +2544,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Empleat
 DocType: Sample Collection,Collected Time,Temps recopilats
 DocType: Company,Sales Monthly History,Historial mensual de vendes
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Seleccioneu lot
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Seleccioneu lot
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} està totalment facturat
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Signes vitals
 DocType: Training Event,End Time,Hora de finalització
@@ -2506,16 +2552,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Les deduccions de pagament o pèrdua
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Condicions contractuals estàndard per Vendes o la compra.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Agrupa per comprovants
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Estàs segur que vols cancel·lar aquesta cita?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,pipeline vendes
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Si us plau valor predeterminat en compte Salari El component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Requerit Per
 DocType: Rename Tool,File to Rename,Arxiu per canviar el nom de
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Seleccioneu la llista de materials per a l&#39;article a la fila {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Seleccioneu la llista de materials per a l&#39;article a la fila {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Compte {0} no coincideix amb el de la seva empresa {1} en la manera de compte: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},BOM especificat {0} no existeix la partida {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programa de manteniment {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
+DocType: POS Profile,Applicable for Users,Aplicable per als usuaris
 DocType: Notification Control,Expense Claim Approved,Compte de despeses Aprovat
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Nòmina dels empleats {0} ja creat per a aquest període
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Nòmina dels empleats {0} ja creat per a aquest període
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Farmacèutic
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,El cost d'articles comprats
 DocType: Selling Settings,Sales Order Required,Ordres de venda Obligatori
@@ -2539,6 +2587,7 @@
 DocType: Offer Letter,Accepted,Acceptat
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,organització
 DocType: BOM Update Tool,BOM Update Tool,Eina d&#39;actualització de la BOM
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","El compte de partit no s&#39;especifica, configureu el compte de partit predeterminat a l&#39;empresa"
 DocType: SG Creation Tool Course,Student Group Name,Nom del grup d&#39;estudiant
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Creació de tarifes
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Si us plau, assegureu-vos que realment voleu esborrar totes les transaccions d&#39;aquesta empresa. Les seves dades mestres romandran tal com és. Aquesta acció no es pot desfer."
@@ -2547,29 +2596,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) no pot ser major que quanitity planejat ({2}) en l'ordre de la producció {3}
 DocType: Shipping Rule,Shipping Rule Label,Regla Etiqueta d'enviament
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Fòrum d&#39;Usuaris
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Matèries primeres no poden estar en blanc.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","No s&#39;ha pogut actualitzar valors, factura conté els articles de l&#39;enviament de la gota."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Matèries primeres no poden estar en blanc.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","No s&#39;ha pogut actualitzar valors, factura conté els articles de l&#39;enviament de la gota."
 DocType: Lab Test Sample,Lab Test Sample,Exemple de prova de laboratori
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Seient Ràpida
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,No es pot canviar la tarifa si el BOM va cap a un article
+DocType: Restaurant,Invoice Series Prefix,Prefix de la sèrie de factures
 DocType: Employee,Previous Work Experience,Experiència laboral anterior
 DocType: Stock Entry,For Quantity,Per Quantitat
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Si us plau entra la quantitat Planificada per l'article {0} a la fila {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Si us plau entra la quantitat Planificada per l'article {0} a la fila {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} no está presentat
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Sol·licituds d'articles.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Per a la producció per separat es crearà per a cada bon article acabat.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} ha de ser negatiu en el document de devolució
 ,Minutes to First Response for Issues,Minuts fins a la primera resposta per Temes
 DocType: Purchase Invoice,Terms and Conditions1,Termes i Condicions 1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,El nom de l&#39;institut per al qual està configurant aquest sistema.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,El nom de l&#39;institut per al qual està configurant aquest sistema.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Assentament comptable congelat fins ara, ningú pot fer / modificar entrada excepte paper s'especifica a continuació."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Si us plau, guardi el document abans de generar el programa de manteniment"
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Últim preu actualitzat a totes les BOM
 DocType: Fee Schedule,Successful,Èxit
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Estat del Projecte
 DocType: UOM,Check this to disallow fractions. (for Nos),Habiliteu aquesta opció per no permetre fraccions. (Per números)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Es van crear les següents ordres de fabricació:
-DocType: Student Admission,Naming Series (for Student Applicant),Sèrie de nomenclatura (per Estudiant Sol·licitant)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Es van crear les següents ordres de fabricació:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Sèrie de nomenclatura (per Estudiant Sol·licitant)
 DocType: Delivery Note,Transporter Name,Nom Transportista
 DocType: Authorization Rule,Authorized Value,Valor Autoritzat
 DocType: BOM,Show Operations,Mostra Operacions
@@ -2593,7 +2643,7 @@
 ,Employees working on a holiday,Els empleats que treballen en un dia festiu
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Marc Present
 DocType: Project,% Complete Method,Mètode complet%
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Drogues
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Drogues
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Data d'inici de manteniment no pot ser abans de la data de lliurament pel número de sèrie {0}
 DocType: Production Order,Actual End Date,Data de finalització actual
 DocType: BOM,Operating Cost (Company Currency),Cost de funcionament (Companyia de divises)
@@ -2611,19 +2661,20 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Approving User cannot be same as user the rule is Applicable To
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Taxa Bàsica (segons de la UOM)
 DocType: SMS Log,No of Requested SMS,No de SMS sol·licitada
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Llicència sense sou no coincideix amb els registres de llicències d&#39;aplicacions aprovades
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Llicència sense sou no coincideix amb els registres de llicències d&#39;aplicacions aprovades
 DocType: Campaign,Campaign-.####,Campanya-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Propers passos
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Si us plau subministrar els elements especificats en les millors taxes possibles
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Fer Factura
 DocType: Selling Settings,Auto close Opportunity after 15 days,Tancament automàtic després de 15 dies d&#39;Oportunitats
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Les ordres de compra no estan permeses per {0} a causa d&#39;un quadre de comandament de peu de {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Les ordres de compra no estan permeses per {0} a causa d&#39;un quadre de comandament de peu de {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,De cap d&#39;any
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot /% Plom
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,La Data de finalització del contracte ha de ser major que la data d'inici
 DocType: Vital Signs,Nutrition Values,Valors nutricionals
 DocType: Lab Test Template,Is billable,És facturable
 DocType: Delivery Note,DN-,DN
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Tant &quot;Programació mèdica&quot; com Time Per Appointment &quot;s&#39;han d&#39;establir per al Dr {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un distribuïdor de tercers / distribuïdor / comissió de l'agent / de la filial / distribuïdor que ven els productes de les empreses d'una comissió.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} contra l'Ordre de Compra {1}
 DocType: Patient,Patient Demographics,Demografia del pacient
@@ -2673,7 +2724,6 @@
  10. Afegir o deduir: Si vostè vol afegir o deduir l'impost."
 DocType: Homepage,Homepage,pàgina principal
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Seleccioneu el metge ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',Actualitza el conjunt tabConsultation invoice = &#39;{0}&#39; on name = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd Quantitat
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Els registres d&#39;honoraris creats - {0}
 DocType: Asset Category Account,Asset Category Account,Compte categoria d&#39;actius
@@ -2685,7 +2735,7 @@
 DocType: Asset,Manual,manual
 DocType: Salary Component Account,Salary Component Account,Compte Nòmina Component
 DocType: Global Defaults,Hide Currency Symbol,Amaga Símbol de moneda
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","per exemple bancària, Efectiu, Targeta de crèdit"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","per exemple bancària, Efectiu, Targeta de crèdit"
 DocType: Lead Source,Source Name,font Nom
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","La pressió arterial normal en un adult és d&#39;aproximadament 120 mmHg sistòlica i 80 mmHg diastòlica, abreujada &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Nota de Crèdit
@@ -2704,16 +2754,16 @@
 DocType: Patient,Occupation,ocupació
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Fila {0}: Data d'inici ha de ser anterior Data de finalització
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Quantitat)
-DocType: Sales Invoice,This Document,aquest document
 DocType: Installation Note Item,Installed Qty,Quantitat instal·lada
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Això podria ser degut a algunes adreces electròniques no vàlides a la
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Heu afegit
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,formació Resultat
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,formació Resultat
 DocType: Purchase Invoice,Is Paid,es paga
 DocType: Salary Structure,Total Earning,Benefici total
 DocType: Purchase Receipt,Time at which materials were received,Moment en què es van rebre els materials
 DocType: Stock Ledger Entry,Outgoing Rate,Sortint Rate
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Organization branch master.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Organization branch master.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,o
 DocType: Sales Order,Billing Status,Estat de facturació
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Informa d'un problema
@@ -2728,7 +2778,8 @@
 DocType: Notification Control,Sales Order Message,Sol·licitar Sales Missatge
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Establir valors predeterminats com a Empresa, vigència actual any fiscal, etc."
 DocType: Payment Entry,Payment Type,Tipus de Pagament
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Seleccioneu un lot d&#39;articles per {0}. No és possible trobar un únic lot que compleix amb aquest requisit
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Seleccioneu un lot d&#39;articles per {0}. No és possible trobar un únic lot que compleix amb aquest requisit
+DocType: Hub Category,Parent Category,Categoria primària
 DocType: Process Payroll,Select Employees,Seleccioneu Empleats
 DocType: Opportunity,Potential Sales Deal,Tracte de vendes potencials
 DocType: Complaint,Complaints,Queixes
@@ -2765,7 +2816,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),La identificació del paquet per al lliurament (per imprimir)
 DocType: Bin,Reserved Quantity,Quantitat reservades
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,"Si us plau, introdueixi l&#39;adreça de correu electrònic vàlida"
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Seleccioneu un article al carretó
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Seleccioneu un article al carretó
 DocType: Landed Cost Voucher,Purchase Receipt Items,Rebut de compra d'articles
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formes Personalització
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,arriar
@@ -2775,15 +2826,15 @@
 DocType: Payment Request,Amount in customer's currency,Suma de la moneda del client
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Lliurament
 DocType: Stock Reconciliation Item,Current Qty,Quantitat actual
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Afegeix proveïdors
+DocType: Restaurant Menu,Restaurant Menu,Menú de restaurant
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,anterior
 DocType: Appraisal Goal,Key Responsibility Area,Àrea de Responsabilitat clau
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Els lots dels estudiants ajuden a realitzar un seguiment d&#39;assistència, avaluacions i quotes per als estudiants"
 DocType: Payment Entry,Total Allocated Amount,total assignat
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Establir compte d&#39;inventari predeterminat d&#39;inventari perpetu
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Establir compte d&#39;inventari predeterminat d&#39;inventari perpetu
 DocType: Item Reorder,Material Request Type,Material de Sol·licitud Tipus
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Entrada de diari Accural per a salaris de {0} a {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage està plena, no va salvar"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage està plena, no va salvar"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Fila {0}: UOM factor de conversió és obligatori
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Capacitat de l&#39;habitació
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Àrbitre
@@ -2822,16 +2873,18 @@
 DocType: Project,Task Completion,Finalització de tasques
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,No en Stock
 DocType: Appraisal,HR User,HR User
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,TPV?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Impostos i despeses deduïdes
-apps/erpnext/erpnext/hooks.py +129,Issues,Qüestions
+apps/erpnext/erpnext/hooks.py +138,Issues,Qüestions
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Estat ha de ser un {0}
 DocType: Sales Invoice,Debit To,Per Dèbit
+DocType: Restaurant Menu Item,Restaurant Menu Item,Element del menú del restaurant
 DocType: Delivery Note,Required only for sample item.,Només és necessari per l'article de mostra.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Actual Quantitat Després de Transacció
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Sense nòmina trobat entre {0} i {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Sense nòmina trobat entre {0} i {1}
 ,Pending SO Items For Purchase Request,A l'espera dels Articles de la SO per la sol·licitud de compra
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Admissió d&#39;Estudiants
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} està desactivat
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Admissió d&#39;Estudiants
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} està desactivat
 DocType: Supplier,Billing Currency,Facturació moneda
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Extra gran
@@ -2854,6 +2907,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Si us plau, no de visites requerides"
 DocType: Stock Settings,Default Valuation Method,Mètode de valoració predeterminat
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,quota
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Actualització en progrés. Pot trigar un temps.
 DocType: Vehicle Log,Fuel Qty,Quantitat de combustible
 DocType: Production Order Operation,Planned Start Time,Planificació de l'hora d'inici
 DocType: Course,Assessment,valoració
@@ -2869,7 +2923,7 @@
 DocType: Price List,Price List Master,Llista de preus Mestre
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Totes les transaccions de venda es poden etiquetar contra múltiples venedors ** ** perquè pugui establir i monitoritzar metes.
 ,S.O. No.,S.O. No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},"Si us plau, crea Client a partir del client potencial {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},"Si us plau, crea Client a partir del client potencial {0}"
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Seleccioneu el pacient
 DocType: Price List,Applicable for Countries,Aplicable per als Països
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Nom del paràmetre
@@ -2912,27 +2966,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,Detalls de la factura del proveïdor
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"El compte de despeses / diferències ({0}) ha de ser un compte ""Guany o Pèrdua '"
 DocType: Project,Copied From,de copiat
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Nom d&#39;error: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,escassetat
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Nom d&#39;error: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,escassetat
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} no associada a {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Assistència per a l'empleat {0} ja està marcat
 DocType: Packing Slip,If more than one package of the same type (for print),Si més d'un paquet del mateix tipus (per impressió)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Establiu el client predeterminat a la Configuració del restaurant
 ,Salary Register,salari Registre
 DocType: Warehouse,Parent Warehouse,Magatzem dels pares
 DocType: C-Form Invoice Detail,Net Total,Total Net
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Per defecte la llista de materials que no es troba d&#39;article {0} i {1} Projecte
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Per defecte la llista de materials que no es troba d&#39;article {0} i {1} Projecte
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Definir diversos tipus de préstecs
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Quantitat Pendent
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Temps (en minuts)
 DocType: Project Task,Working,Treballant
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Estoc de cua (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Any financer
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Any financer
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} no pertany a l'empresa {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,No s&#39;ha pogut resoldre la funció de puntuació de criteris per a {0}. Assegureu-vos que la fórmula sigui vàlida.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,costar en
 DocType: Healthcare Settings,Out Patient Settings,Fora de configuració del pacient
 DocType: Account,Round Off,Arrodonir
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,La quantitat ha de ser positiva
 ,Requested Qty,Sol·licitat Quantitat
 DocType: Tax Rule,Use for Shopping Cart,L&#39;ús per Compres
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},El valor {0} per a l&#39;atribut {1} no existeix a la llista de valors d&#39;atributs d&#39;article vàlid per al punt {2}
@@ -2941,7 +2997,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Els càrrecs es distribuiran proporcionalment basen en Quantitat o import de l'article, segons la teva selecció"
 DocType: Maintenance Visit,Purposes,Propòsits
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Almenys un element ha de introduir-se amb quantitat negativa en el document de devolució
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Afegeix cursos
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operació {0} ja que qualsevol temps de treball disponibles a l&#39;estació de treball {1}, trencar l&#39;operació en múltiples operacions"
 ,Requested,Comanda
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Sense Observacions
@@ -2953,6 +3008,8 @@
 DocType: Employee Loan,Repaid/Closed,Reemborsat / Tancat
 DocType: Item,Total Projected Qty,Quantitat total projectada
 DocType: Monthly Distribution,Distribution Name,Distribution Name
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Proveïdor&gt; Tipus de proveïdor
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","No s&#39;ha trobat el percentatge de valoració de l&#39;element {0}, que es requereix per fer entrades de comptabilitat per {1} {2}. Si l&#39;element es transacciona com a element de la taxa de valoració zero a {1}, mencioneu-lo a la taula {1} Element. En cas contrari, creeu una transacció d&#39;accions entrants per l&#39;element o mencioneu el percentatge de valoració al registre de l&#39;element i, a continuació, intenteu enviar / cancel·lar aquesta entrada."
 DocType: Course,Course Code,Codi del curs
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Inspecció de qualitat requerida per a l'article {0}
 DocType: POS Settings,Use POS in Offline Mode,Utilitzeu TPV en mode fora de línia
@@ -2963,14 +3020,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Administrar Territori arbre.
 DocType: Journal Entry Account,Sales Invoice,Factura de vendes
 DocType: Journal Entry Account,Party Balance,Equilibri Partit
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,Seleccioneu Aplicar descompte en les
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Seleccioneu Aplicar descompte en les
 DocType: Company,Default Receivable Account,Predeterminat Compte per Cobrar
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Crear entrada del banc per al sou total pagat pels criteris anteriorment seleccionats
 DocType: Physician,Physician Schedule,Horari del metge
 DocType: Purchase Invoice,Deemed Export,Es considera exportar
 DocType: Stock Entry,Material Transfer for Manufacture,Transferència de material per a la fabricació
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,El percentatge de descompte es pot aplicar ja sigui contra una llista de preus o per a tot Llista de Preus.
-DocType: Purchase Invoice,Half-yearly,Semestral
+DocType: Subscription,Half-yearly,Semestral
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Entrada Comptabilitat de Stock
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Vostè ja ha avaluat pels criteris d&#39;avaluació {}.
@@ -2999,13 +3056,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Extra Petit
 DocType: Company,Standard Template,plantilla estàndard
 DocType: Training Event,Theory,teoria
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Advertència: La quantitat de Material sol·licitada és inferior a la Quantitat mínima
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Advertència: La quantitat de Material sol·licitada és inferior a la Quantitat mínima
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,El compte {0} està bloquejat
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entitat Legal / Subsidiari amb un gràfic separat de comptes que pertanyen a l'Organització.
 DocType: Payment Request,Mute Email,Silenciar-mail
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentació, begudes i tabac"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Només es pot fer el pagament contra facturats {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,La Comissió no pot ser major que 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Només es pot fer el pagament contra facturats {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,La Comissió no pot ser major que 100
 DocType: Stock Entry,Subcontract,Subcontracte
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,"Si us plau, introdueixi {0} primer"
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,No hi ha respostes des
@@ -3023,10 +3080,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Color
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Criteris d&#39;avaluació del pla
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Evitar les comandes de compra
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Susceptible
 DocType: Patient Appointment,Scheduled,Programat
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Sol · licitud de pressupost.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configureu el sistema de nomenclatura d&#39;empleats en recursos humans&gt; Configuració de recursos humans
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Seleccioneu l&#39;ítem on &quot;És de la Element&quot; és &quot;No&quot; i &quot;És d&#39;articles de venda&quot; és &quot;Sí&quot;, i no hi ha un altre paquet de producte"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Seleccioneu el client
 DocType: Student Log,Academic,acadèmic
 DocType: Patient,Personal and Social History,Història personal i social
 DocType: Fee Schedule,Fee Breakup for each student,Taxa d&#39;interrupció per cada estudiant
@@ -3036,7 +3094,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Tarifa de Valoració
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,dièsel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,No s'ha escollit una divisa per la llista de preus
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,No s'ha escollit una divisa per la llista de preus
 apps/erpnext/erpnext/config/healthcare.py +46,Results,Resultats
 ,Student Monthly Attendance Sheet,Estudiant Full d&#39;Assistència Mensual
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},L'Empleat {0} ja ha sol·licitat {1} entre {2} i {3}
@@ -3051,7 +3109,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Administrar Punts de vendes.
 DocType: Quality Inspection,Inspection Type,Tipus d'Inspecció
 DocType: Fee Validity,Visited yet,Visitat encara
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Complexos de transacció existents no poden ser convertits en grup.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Complexos de transacció existents no poden ser convertits en grup.
 DocType: Assessment Result Tool,Result HTML,El resultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Caduca el
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Afegir estudiants
@@ -3078,7 +3136,7 @@
 DocType: Healthcare Settings,Result Printed,Resultat imprès
 DocType: Asset Category Account,Depreciation Expense Account,Compte de despeses de depreciació
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Període De Prova
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Visualitza {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Visualitza {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Només els nodes fulla es permet l'entrada de transaccions
 DocType: Expense Claim,Expense Approver,Aprovador de despeses
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Fila {0}: Avanç contra el Client ha de ser de crèdit
@@ -3089,7 +3147,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,To Datetime
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Calendari de cursos eliminen:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Registres per mantenir l&#39;estat de lliurament de sms
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Estableix la destinació de vendes
 DocType: Accounts Settings,Make Payment via Journal Entry,Fa el pagament via entrada de diari
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,impresa:
 DocType: Item,Inspection Required before Delivery,Inspecció requerida abans del lliurament
@@ -3097,7 +3154,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Activitats pendents
 DocType: Patient Appointment,Reminded,Recordat
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,la seva Organització
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,la seva Organització
 DocType: Fee Component,Fees Category,taxes Categoria
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Please enter relieving date.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
@@ -3109,7 +3166,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Nivell de Reabastecimiento
 DocType: Company,Chart Of Accounts Template,Gràfic de la plantilla de Comptes
 DocType: Attendance,Attendance Date,Assistència Data
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Article Preu s&#39;actualitza per {0} de la llista de preus {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Article Preu s&#39;actualitza per {0} de la llista de preus {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Salary breakup based on Earning and Deduction.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Compta amb nodes secundaris no es pot convertir en llibre major
 DocType: Purchase Invoice Item,Accepted Warehouse,Magatzem Acceptat
@@ -3125,9 +3182,10 @@
 ,Employee Birthday,Aniversari d'Empleat
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Eina de lots d&#39;Assistència de l&#39;Estudiant
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,límit creuades
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Programat fins a
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Un terme acadèmic amb això &#39;Any Acadèmic&#39; {0} i &#39;Nom terme&#39; {1} ja existeix. Si us plau, modificar aquestes entrades i torneu a intentar."
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Com que hi ha transaccions existents contra l&#39;element {0}, no es pot canviar el valor de {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Com que hi ha transaccions existents contra l&#39;element {0}, no es pot canviar el valor de {1}"
 DocType: UOM,Must be Whole Number,Ha de ser nombre enter
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Noves Fulles Assignats (en dies)
 DocType: Purchase Invoice,Invoice Copy,Còpia de la factura
@@ -3137,7 +3195,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Número de factura
 DocType: Shopping Cart Settings,Orders,Ordres
 DocType: Employee Leave Approver,Leave Approver,Aprovador d'absències
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Seleccioneu un lot
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Seleccioneu un lot
 DocType: Assessment Group,Assessment Group Name,Nom del grup d&#39;avaluació
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material transferit per a la Fabricació
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Un usuari amb rol de ""Aprovador de despeses"""
@@ -3152,7 +3210,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Entrada de Tancament de Període
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Selecciona departament ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Un Centre de costos amb transaccions existents no es pot convertir en grup
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Suma {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Suma {0} {1} {2} {3}
 DocType: Account,Depreciation,Depreciació
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveïdor (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Empleat Eina Assistència
@@ -3163,10 +3221,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,Les entrades de pagament {0} són no-relacionat
 DocType: GL Entry,Voucher No,Número de comprovant
 ,Lead Owner Efficiency,Eficiència plom propietari
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,El més popular
 DocType: Leave Allocation,Leave Allocation,Assignació d'absència
 DocType: Payment Request,Recipient Message And Payment Details,Missatge receptor i formes de pagament
 DocType: Training Event,Trainer Email,entrenador correu electrònic
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Sol·licituds de material {0} creats
+DocType: Restaurant Reservation,No of People,No de la gent
 DocType: Production Planning Tool,Include sub-contracted raw materials,Inclogui matèries primeres subcontractats
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Plantilla de termes o contracte.
 DocType: Purchase Invoice,Address and Contact,Direcció i Contacte
@@ -3175,10 +3235,11 @@
 DocType: Supplier,Last Day of the Next Month,Últim dia del mes
 DocType: Support Settings,Auto close Issue after 7 days,Tancament automàtic d&#39;emissió després de 7 dies
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixi no poden ser distribuïdes abans {0}, com a balanç de la llicència ja ha estat remès equipatge al futur registre d&#39;assignació de permís {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: A causa / Data de referència supera permesos dies de crèdit de clients per {0} dia (es)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: A causa / Data de referència supera permesos dies de crèdit de clients per {0} dia (es)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,estudiant sol·licitant
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL PER RECEPTOR
 DocType: Asset Category Account,Accumulated Depreciation Account,Compte de depreciació acumulada
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Aquest correu electrònic està autogenerat
 DocType: Stock Settings,Freeze Stock Entries,Freeze Imatges entrades
 DocType: Program Enrollment,Boarding Student,Estudiant d&#39;embarcament
 DocType: Asset,Expected Value After Useful Life,Valor esperat després de la vida útil
@@ -3186,7 +3247,7 @@
 DocType: Activity Cost,Billing Rate,Taxa de facturació
 ,Qty to Deliver,Quantitat a lliurar
 ,Stock Analytics,Imatges Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Les operacions no poden deixar-se en blanc
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Les operacions no poden deixar-se en blanc
 DocType: Maintenance Visit Purpose,Against Document Detail No,Contra Detall del document núm
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Tipus del partit és obligatori
 DocType: Quality Inspection,Outgoing,Extravertida
@@ -3208,7 +3269,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Estudiants seleccionats de forma manual per al grup basat en activitats
 DocType: Journal Entry,User Remark,Observació de l'usuari
 DocType: Lead,Market Segment,Sector de mercat
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},La quantitat pagada no pot ser superior a la quantitat pendent negativa total de {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},La quantitat pagada no pot ser superior a la quantitat pendent negativa total de {0}
 DocType: Supplier Scorecard Period,Variables,Les variables
 DocType: Employee Internal Work History,Employee Internal Work History,Historial de treball intern de l'empleat
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Tancament (Dr)
@@ -3237,21 +3298,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obtenir actualitzacions
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Compte {2} no pertany a l&#39;empresa {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Material de Sol·licitud {0} es cancel·la o s'atura
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Deixa Gestió
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Deixa Gestió
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Agrupa Per Comptes
 DocType: Sales Order,Fully Delivered,Totalment Lliurat
 DocType: Lead,Lower Income,Lower Income
+DocType: Restaurant Order Entry,Current Order,Ordre actual
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Font i el magatzem de destinació no pot ser igual per fila {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Compte diferència ha de ser un tipus de compte d&#39;Actius / Passius, ja que aquest arxiu reconciliació és una entrada d&#39;Obertura"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Suma desemborsat no pot ser més gran que Suma del préstec {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Vés als programes
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Número d'ordre de Compra per {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Ordre de producció no s&#39;ha creat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Ordre de producció no s&#39;ha creat
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Des de la data' ha de ser després de 'A data'
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},No es pot canviar l&#39;estat d&#39;estudiant {0} està vinculada amb l&#39;aplicació de l&#39;estudiant {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},No es pot canviar l&#39;estat d&#39;estudiant {0} està vinculada amb l&#39;aplicació de l&#39;estudiant {1}
 DocType: Asset,Fully Depreciated,Estant totalment amortitzats
 ,Stock Projected Qty,Quantitat d'estoc previst
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Client {0} no pertany a projectar {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Client {0} no pertany a projectar {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Assistència marcat HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Les cites són propostes, les ofertes que ha enviat als seus clients"
 DocType: Sales Order,Customer's Purchase Order,Àrea de clients Ordre de Compra
@@ -3262,8 +3324,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Si us plau, ajusteu el número d&#39;amortitzacions Reservats"
 DocType: Supplier Scorecard Period,Calculations,Càlculs
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Valor o Quantitat
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Comandes produccions no poden ser criats per:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Comandes produccions no poden ser criats per:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Minut
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Estableix la sèrie de noms per a {0} mitjançant la configuració&gt; Configuració&gt; Sèrie de nomenclatura
 DocType: Purchase Invoice,Purchase Taxes and Charges,Compra Impostos i Càrrecs
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Aneu als proveïdors
 ,Qty to Receive,Quantitat a Rebre
@@ -3276,7 +3339,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Crèdit al compte ha de ser un compte de Balanç
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Tots els tipus de proveïdors
 DocType: Global Defaults,Disable In Words,En desactivar Paraules
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,El codi de l'article és obligatori perquè no s'havia numerat automàticament
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,El codi de l'article és obligatori perquè no s'havia numerat automàticament
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Cita {0} no del tipus {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programa de manteniment d'articles
 DocType: Sales Order,%  Delivered,% Lliurat
@@ -3298,23 +3361,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Saldo inicial Equitat
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Reconciliació
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,restant
 DocType: Appraisal,Appraisal,Avaluació
 DocType: Purchase Invoice,GST Details,Detalls de GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},El correu electrònic enviat al proveïdor {0}
+DocType: Item,Default Sales Unit of Measure,Unitat de vendes predeterminada de mesura
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data repetida
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Signant Autoritzat
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},L'aprovador d'absències ha de ser un de {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Crea tarifes
-DocType: Hub Settings,Seller Email,Electrònic
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Cost total de compra (mitjançant compra de la factura)
 DocType: Training Event,Start Time,Hora d'inici
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Seleccioneu Quantitat
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Seleccioneu Quantitat
 DocType: Customs Tariff Number,Customs Tariff Number,Nombre aranzel duaner
 DocType: Patient Appointment,Patient Appointment,Cita del pacient
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,El rol d'aprovador no pot ser el mateix que el rol al que la regla s'ha d'aplicar
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Donar-se de baixa d&#39;aquest butlletí per correu electrònic
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Donar-se de baixa d&#39;aquest butlletí per correu electrònic
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Obteniu proveïdors per
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} no s&#39;ha trobat per a l&#39;element {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Anar als cursos
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Missatge enviat
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Compta amb nodes secundaris no es pot establir com a llibre major
@@ -3327,11 +3393,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Material transferit per a la Fabricació
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,{0} no existeix Compte
 DocType: Project,Project Type,Tipus de Projecte
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Existeix una tasca infantil per a aquesta tasca. No podeu suprimir aquesta tasca.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Tan quantitat destí com Quantitat són obligatoris.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Cost de diverses activitats
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,No hi ha més resultats
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Cost de diverses activitats
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Configura els esdeveniments a {0}, ja que l&#39;empleat que estigui connectat a la continuació venedors no té un ID d&#39;usuari {1}"
 DocType: Timesheet,Billing Details,Detalls de facturació
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Origen i destí de dipòsit han de ser diferents
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Origen i destí de dipòsit han de ser diferents
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},No es permet actualitzar les transaccions de valors més grans de {0}
 DocType: Purchase Invoice Item,PR Detail,Detall PR
 DocType: Sales Order,Fully Billed,Totalment Anunciat
@@ -3357,7 +3425,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Transferència Bancària
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Marqueu totes les
 DocType: Vehicle Log,Invoice Ref,Ref factura
-DocType: Purchase Order,Recurring Order,Ordre Recurrent
 DocType: Company,Default Income Account,Compte d'Ingressos predeterminat
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Grup de Clients / Client
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Sense tancar els anys fiscals guanys / pèrdues (de crèdit)
@@ -3371,9 +3438,9 @@
 DocType: Patient,A Negative,A negatiu
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Res més que mostrar.
 DocType: Lead,From Customer,De Client
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Trucades
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Trucades
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Un producte
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,lots
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,lots
 DocType: Project,Total Costing Amount (via Time Logs),Suma total del càlcul del cost (a través dels registres de temps)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Feu horari de tarifes
 DocType: Purchase Order Item Supplied,Stock UOM,UDM de l'Estoc
@@ -3397,7 +3464,7 @@
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Les fulles i les vacances
 DocType: School Settings,Current Academic Term,Període acadèmic actual
 DocType: Sales Order,Not Billed,No Anunciat
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Tant Magatzem ha de pertànyer al mateix Company
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Tant Magatzem ha de pertànyer al mateix Company
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Encara no hi ha contactes.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Landed Cost Monto Voucher
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Bills plantejades pels proveïdors.
@@ -3406,7 +3473,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Quantitat de Descompte
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retorn Contra Compra Factura
 DocType: Item,Warranty Period (in days),Període de garantia (en dies)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',Actualitza el paquet &quot;cita de tabPatient&quot; sales_invoice = &#39;{0}&#39; on name = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Relació amb Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Efectiu net de les operacions
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Article 4
@@ -3415,8 +3481,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Compte entrada de diari
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grup d&#39;Estudiants
 DocType: Shopping Cart Settings,Quotation Series,Sèrie Cotització
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Hi ha un element amb el mateix nom ({0}), canvieu el nom de grup d'articles o canviar el nom de l'element"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Seleccioneu al client
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Hi ha un element amb el mateix nom ({0}), canvieu el nom de grup d'articles o canviar el nom de l'element"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Seleccioneu al client
 DocType: C-Form,I,jo
 DocType: Company,Asset Depreciation Cost Center,Centre de l&#39;amortització del cost dels actius
 DocType: Sales Order Item,Sales Order Date,Sol·licitar Sales Data
@@ -3425,6 +3491,7 @@
 DocType: Assessment Plan,Assessment Plan,pla d&#39;avaluació
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,S&#39;ha creat el client {0}.
 DocType: Stock Settings,Limit Percent,límit de percentatge
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Actualment no hi ha existències disponibles en cap magatzem
 ,Payment Period Based On Invoice Date,Període de pagament basat en Data de la factura
 DocType: Sample Collection,No. of print,Nº d&#39;impressió
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Manca de canvi de moneda per {0}
@@ -3480,13 +3547,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pagament Brut - Deducció total - Pagament de Préstecs
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,El BOM actual i el nou no poden ser el mateix
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Salari Slip ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Salari Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Data de la jubilació ha de ser major que la data del contracte
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Va haver-hi errors en programar el curs:
 DocType: Sales Invoice,Against Income Account,Contra el Compte d'Ingressos
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Lliurat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Article {0}: Quantitat ordenada {1} no pot ser menor que el qty comanda mínima {2} (definit en l&#39;article).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Article {0}: Quantitat ordenada {1} no pot ser menor que el qty comanda mínima {2} (definit en l&#39;article).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mensual Distribució percentual
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Inicieu sessió com un altre usuari.
 DocType: Territory,Territory Targets,Objectius Territori
 DocType: Delivery Note,Transporter Info,Informació del transportista
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Si us plau ajust per defecte {0} a l&#39;empresa {1}
@@ -3494,13 +3562,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Mateix proveïdor s&#39;ha introduït diverses vegades
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Utilitat Bruta / Pèrdua
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Article de l'ordre de compra Subministrat
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Nom de l&#39;empresa no pot ser l&#39;empresa
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Nom de l&#39;empresa no pot ser l&#39;empresa
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Caps de lletres per a les plantilles d'impressió.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títols per a plantilles d'impressió, per exemple, factura proforma."
 DocType: Program Enrollment,Walking,per caminar
 DocType: Student Guardian,Student Guardian,Guardià de l&#39;estudiant
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Càrrecs de tipus de valoració no poden marcat com Inclòs
 DocType: POS Profile,Update Stock,Actualització de Stock
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,en la subscripció
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UDMs diferents per als articles provocarà pesos nets (Total) erronis. Assegureu-vos que pes net de cada article és de la mateixa UDM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,Entrada de diari de la ferralla
@@ -3548,15 +3617,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System User (login) ID. If set, it will become default for all HR forms."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Des {1}
 DocType: Task,depends_on,depèn de
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,En cua per actualitzar l&#39;últim preu en tota la factura de materials. Pot trigar uns quants minuts.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,En cua per actualitzar l&#39;últim preu en tota la factura de materials. Pot trigar uns quants minuts.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nom del nou compte. Nota: Si us plau no crear comptes de clients i proveïdors
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,País savi defecte Plantilles de direcció
 DocType: Sales Order Item,Supplier delivers to Customer,Proveïdor lliura al Client
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (#Form/Item/{0}) està esgotat
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},A causa / Data de referència no pot ser posterior a {0}
+,Sales Payment Summary,Resum de pagaments de vendes
+DocType: Restaurant,Restaurant,Restaurant
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},A causa / Data de referència no pot ser posterior a {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Les dades d&#39;importació i exportació
 DocType: Patient,Account Details,Detalls del compte
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,No s&#39;han trobat estudiants
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,No s&#39;han trobat estudiants
 DocType: Medical Department,Medical Department,Departament Mèdic
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Punts de referència del proveïdor Criteris de puntuació
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Data de la factura d&#39;enviament
@@ -3567,7 +3638,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Seleccioneu Data d&#39;entrada abans de seleccionar la festa
 DocType: Program Enrollment,School House,Casa de l&#39;escola
 DocType: Serial No,Out of AMC,Fora d'AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Seleccioneu Cites
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Seleccioneu Cites
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Nombre de Depreciacions reserva no pot ser més gran que el nombre total d&#39;amortitzacions
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Feu Manteniment Visita
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,"Si us plau, poseu-vos en contacte amb l'usuari que té vendes Mestre Director de {0} paper"
@@ -3575,7 +3646,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Companyia (no client o proveïdor) mestre.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Això es basa en la presència d&#39;aquest Estudiant
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,No Estudiants en
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Afegir més elements o forma totalment oberta
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Afegir més elements o forma totalment oberta
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Albarans {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Aneu als usuaris
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Quantitat pagada + s'amortitza La quantitat no pot ser més gran que la Gran Total
@@ -3595,37 +3666,40 @@
 DocType: Fee Schedule,Fee Schedule,Llista de tarifes
 DocType: Hub Settings,Publish Availability,Publicar disponibilitat
 DocType: Company,Create Chart Of Accounts Based On,Crear pla de comptes basada en
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,No es pot convertir a no grup. Existeixen tasques infantils.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Data de naixement no pot ser més gran que l&#39;actual.
 ,Stock Ageing,Estoc Envelliment
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Estudiant {0} existeix contra l&#39;estudiant sol·licitant {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Ajust d&#39;arrodoniment (moneda d&#39;empresa)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Horari
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Horari
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' es desactiva
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Posar com a obert
 DocType: Cheque Print Template,Scanned Cheque,escanejada Xec
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar correus electrònics automàtics als Contactes al Presentar les transaccions
 DocType: Timesheet,Total Billable Amount,Suma total facturable
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Article 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Entrada de comanda
 DocType: Purchase Order,Customer Contact Email,Client de correu electrònic de contacte
 DocType: Warranty Claim,Item and Warranty Details,Objecte i de garantia Detalls
 DocType: Sales Team,Contribution (%),Contribució (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Nota: L'entrada de pagament no es crearà perquè no s'ha especificat 'Caixa o compte bancari"""
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,El projecte {0} ja existeix
 DocType: Medical Department,Nursing User,Usuari d&#39;infermeria
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Responsabilitats
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,El període de validesa d&#39;aquesta cita ha finalitzat.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,El període de validesa d&#39;aquesta cita ha finalitzat.
 DocType: Expense Claim Account,Expense Claim Account,Compte de Despeses
 DocType: Accounts Settings,Allow Stale Exchange Rates,Permet els tipus d&#39;intercanvi moderats
 DocType: Sales Person,Sales Person Name,Nom del venedor
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Si us plau, introdueixi almenys 1 factura a la taula"
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Afegir usuaris
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Afegir usuaris
 DocType: POS Item Group,Item Group,Grup d'articles
 DocType: Item,Safety Stock,seguretat de la
 DocType: Healthcare Settings,Healthcare Settings,Configuració assistencial
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,% D&#39;avanç per a una tasca no pot contenir més de 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,% D&#39;avanç per a una tasca no pot contenir més de 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Abans de la reconciliació
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Per {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impostos i Càrrecs Afegits (Divisa de la Companyia)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,La fila de l'impost d'article {0} ha de tenir en compte el tipus d'impostos o ingressos o despeses o imposable
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,La fila de l'impost d'article {0} ha de tenir en compte el tipus d'impostos o ingressos o despeses o imposable
 DocType: Sales Order,Partly Billed,Parcialment Facturat
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Element {0} ha de ser un element d&#39;actiu fix
 DocType: Item,Default BOM,BOM predeterminat
@@ -3641,6 +3715,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,variable
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,De la nota de lliurament
 DocType: Student,Student Email Address,Estudiant Adreça de correu electrònic
+DocType: Item,Hub Warehouse,Hub Warehouse
 DocType: Physician Schedule Time Slot,From Time,From Time
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,En Stock:
 DocType: Notification Control,Custom Message,Missatge personalitzat
@@ -3648,10 +3723,11 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,Diners en efectiu o compte bancari és obligatòria per a realitzar el registre de pagaments
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Direcció de l&#39;estudiant
 DocType: Purchase Invoice,Price List Exchange Rate,Tipus de canvi per a la llista de preus
+DocType: POS Profile,POS Profile Name,Nom del perfil de la TPV
 DocType: Purchase Invoice Item,Rate,Tarifa
 DocType: Purchase Invoice Item,Rate,Tarifa
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,nom direcció
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,nom direcció
 DocType: Stock Entry,From BOM,A partir de la llista de materials
 DocType: Assessment Code,Assessment Code,codi avaluació
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Bàsic
@@ -3665,11 +3741,12 @@
 DocType: Salary Slip,Salary Structure,Estructura salarial
 DocType: Account,Bank,Banc
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aerolínia
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Material Issue
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Material Issue
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,S&#39;ha produït un error en crear-lo recurrent
 DocType: Material Request Item,For Warehouse,Per Magatzem
 DocType: Employee,Offer Date,Data d'Oferta
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Cites
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Vostè està en mode fora de línia. Vostè no serà capaç de recarregar fins que tingui la xarxa.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Vostè està en mode fora de línia. Vostè no serà capaç de recarregar fins que tingui la xarxa.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,No hi ha grups d&#39;estudiants van crear.
 DocType: Purchase Invoice Item,Serial No,Número de sèrie
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Quantitat Mensual La devolució no pot ser més gran que Suma del préstec
@@ -3679,17 +3756,18 @@
 DocType: Salary Slip,Total Working Hours,Temps de treball total
 DocType: Subscription,Next Schedule Date,Next Schedule Date
 DocType: Stock Entry,Including items for sub assemblies,Incloent articles per subconjunts
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Introduir el valor ha de ser positiu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Tots els territoris
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Introduir el valor ha de ser positiu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Tots els territoris
 DocType: Purchase Invoice,Items,Articles
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Estudiant ja està inscrit.
 DocType: Fiscal Year,Year Name,Nom Any
 DocType: Process Payroll,Process Payroll,Process Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Hi ha més vacances que els dies de treball aquest mes.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Hi ha més vacances que els dies de treball aquest mes.
 DocType: Product Bundle Item,Product Bundle Item,Producte Bundle article
 DocType: Sales Partner,Sales Partner Name,Nom del revenedor
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Sol·licitud de Cites
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Sol·licitud de Cites
 DocType: Payment Reconciliation,Maximum Invoice Amount,Import Màxim Factura
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hematologia
 DocType: Normal Test Items,Normal Test Items,Elements de prova normals
 DocType: Student Language,Student Language,idioma de l&#39;estudiant
 apps/erpnext/erpnext/config/selling.py +23,Customers,clients
@@ -3700,10 +3778,11 @@
 DocType: Issue,Opening Time,Temps d'obertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Des i Fins a la data sol·licitada
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & Commodity Exchanges
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitat de mesura per defecte per Variant &#39;{0}&#39; ha de ser el mateix que a la plantilla &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitat de mesura per defecte per Variant &#39;{0}&#39; ha de ser el mateix que a la plantilla &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calcula a causa del
 DocType: Delivery Note Item,From Warehouse,De Magatzem
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,No hi ha articles amb la llista de materials per a la fabricació de
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,No hi ha articles amb la llista de materials per a la fabricació de
+DocType: Restaurant,Default Customer,Client per defecte
 DocType: Assessment Plan,Supervisor Name,Nom del supervisor
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,No confirmeu si es crea una cita per al mateix dia
 DocType: Program Enrollment Course,Program Enrollment Course,I matrícula Programa
@@ -3730,7 +3809,7 @@
 DocType: Payment Entry,Internal Transfer,transferència interna
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Compte Nen existeix per aquest compte. No es pot eliminar aquest compte.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Cal la Quantitat destí i la origen
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},No hi ha una llista de materials per defecte d'article {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},No hi ha una llista de materials per defecte d'article {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Seleccioneu Data de comptabilització primer
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Data d&#39;obertura ha de ser abans de la data de Tancament
 DocType: Leave Control Panel,Carry Forward,Portar endavant
@@ -3765,6 +3844,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Present total
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,Les declaracions de comptabilitat
 DocType: Drug Prescription,Hour,Hora
+DocType: Restaurant Order Entry,Last Sales Invoice,Factura de la darrera compra
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nou Nombre de sèrie no pot tenir Warehouse. Magatzem ha de ser ajustat per Stock entrada o rebut de compra
 DocType: Lead,Lead Type,Tipus de client potencial
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,No està autoritzat per aprovar els fulls de bloquejar les dates
@@ -3799,64 +3879,66 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,crear usuaris
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,gram
 DocType: Supplier Scorecard,Per Month,Per mes
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Quantitat de Fabricació ha de ser major que 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Quantitat de Fabricació ha de ser major que 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Visita informe de presa de manteniment.
 DocType: Stock Entry,Update Rate and Availability,Actualització de tarifes i disponibilitat
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Percentatge que se li permet rebre o lliurar més en contra de la quantitat demanada. Per exemple: Si vostè ha demanat 100 unitats. i el subsidi és de 10%, llavors se li permet rebre 110 unitats."
 DocType: POS Customer Group,Customer Group,Grup de Clients
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Nou lot d&#39;identificació (opcional)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Nou lot d&#39;identificació (opcional)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},El compte de despeses és obligatòria per a cada element {0}
 DocType: BOM,Website Description,Descripció del lloc web
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Canvi en el Patrimoni Net
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,El més nou
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,"Si us plau, cancel·lar Factura de Compra {0} primera"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adreça de correu electrònic ha de ser únic, ja existeix per {0}"
 DocType: Serial No,AMC Expiry Date,AMC Data de caducitat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,rebut
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,rebut
 ,Sales Register,Registre de vendes
 DocType: Daily Work Summary Settings Company,Send Emails At,En enviar correus electrònics
 DocType: Quotation,Quotation Lost Reason,Cita Perduda Raó
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Seleccioni el seu domini
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',seleccioneu * de tabPatient on name = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Referència de la transacció no {0} {1} datat
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Referència de la transacció no {0} {1} datat
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,No hi ha res a editar.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Vista de formularis
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Resum per a aquest mes i activitats pendents
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Vista de formularis
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Resum per a aquest mes i activitats pendents
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Afegiu usuaris a la vostra organització, a part de tu mateix."
 DocType: Customer Group,Customer Group Name,Nom del grup al Client
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Els clients no hi ha encara!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Els clients no hi ha encara!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Estat de fluxos d&#39;efectiu
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Suma del préstec no pot excedir quantitat màxima del préstec de {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,llicència
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},"Si us plau, elimini aquest Factura {0} de C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},"Si us plau, elimini aquest Factura {0} de C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Seleccioneu Carry Forward si també voleu incloure el balanç de l'any fiscal anterior deixa a aquest any fiscal
 DocType: GL Entry,Against Voucher Type,Contra el val tipus
 DocType: Physician,Phone (R),Telèfon (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,S&#39;han afegit franges horàries
 DocType: Item,Attributes,Atributs
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Habilita la plantilla
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Configureu la sèrie de noms per a {0} a través de la configuració&gt; Configuració&gt; Sèrie de nomenclatura
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Si us plau indica el Compte d'annotació
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Darrera Data de comanda
 DocType: Patient,B Negative,B negatiu
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Compte {0} no pertany a la companyia de {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Números de sèrie en fila {0} no coincideix amb la nota de lliurament
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Números de sèrie en fila {0} no coincideix amb la nota de lliurament
 DocType: Student,Guardian Details,guardià detalls
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Marc d&#39;Assistència per a diversos empleats
 DocType: Vehicle,Chassis No,nº de xassís
 DocType: Payment Request,Initiated,Iniciada
 DocType: Production Order,Planned Start Date,Data d'inici prevista
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Seleccioneu un BOM
 DocType: Serial No,Creation Document Type,Creació de tipus de document
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,La data de finalització ha de ser superior a la data d&#39;inici
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,La data de finalització ha de ser superior a la data d&#39;inici
 DocType: Leave Type,Is Encash,És convertirà en efectiu
 DocType: Leave Allocation,New Leaves Allocated,Noves absències Assignades
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Dades-Project savi no està disponible per a la cita
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Finalitza
 DocType: Project,Expected End Date,Esperat Data de finalització
 DocType: Budget Account,Budget Amount,pressupost Monto
 DocType: Appraisal Template,Appraisal Template Title,Títol de plantilla d'avaluació
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},A partir de la data {0} per al Empleat {1} no pot ser abans d&#39;unir-se Data d&#39;empleat {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Comercial
 DocType: Patient,Alcohol Current Use,Alcohol ús actual
+DocType: Student Admission Program,Student Admission Program,Programa d&#39;admissió dels estudiants
 DocType: Payment Entry,Account Paid To,Compte pagat fins
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Article Pare {0} no ha de ser un arxiu d&#39;articles
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Tots els Productes o Serveis.
@@ -3865,30 +3947,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Pressupost per al compte {1} contra {2} {3} {4} és. Es superarà per {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Fila {0} # El compte ha de ser de tipus &quot;Actiu Fix&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Quantitat de sortida
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Regles per calcular l'import d'enviament per a una venda
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,i desactivat deshabilitat al
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Sèries és obligatori
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Serveis Financers
 DocType: Student Sibling,Student ID,Identificació de l&#39;estudiant
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Tipus d&#39;activitats per als registres de temps
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Email del proveïdor
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Tipus d&#39;activitats per als registres de temps
 DocType: Tax Rule,Sales,Venda
 DocType: Stock Entry Detail,Basic Amount,Suma Bàsic
 DocType: Training Event,Exam,examen
 DocType: Complaint,Complaint,Queixa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Magatzem necessari per a l'article d'estoc {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Magatzem necessari per a l'article d'estoc {0}
 DocType: Leave Allocation,Unused leaves,Fulles no utilitzades
 DocType: Patient,Alcohol Past Use,Ús del passat alcohòlic
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Estat de facturació
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transferència
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Fetch exploded BOM (including sub-assemblies)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Transferència
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Fetch exploded BOM (including sub-assemblies)
 DocType: Authorization Rule,Applicable To (Employee),Aplicable a (Empleat)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Data de venciment és obligatori
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Data de venciment és obligatori
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Increment de Atribut {0} no pot ser 0
 DocType: Journal Entry,Pay To / Recd From,Pagar a/Rebut de
 DocType: Naming Series,Setup Series,Sèrie d'instal·lació
 DocType: Payment Reconciliation,To Invoice Date,Per Factura
 DocType: Supplier,Contact HTML,Contacte HTML
 ,Inactive Customers,Els clients inactius
+DocType: Student Admission Program,Maximum Age,Edat màxima
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Rebut de compra
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Com s'aplica la regla de preus?
@@ -3907,6 +3991,7 @@
 DocType: GL Entry,Remarks,Observacions
 DocType: Payment Entry,Account Paid From,De compte de pagament
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Matèria Prima Codi de l'article
+DocType: Task,Parent Task,Tasca dels pares
 DocType: Journal Entry,Write Off Based On,Anotació basada en
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,fer plom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Impressió i papereria
@@ -3915,19 +4000,19 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salari ja processada per al període entre {0} i {1}, Deixa període d&#39;aplicació no pot estar entre aquest interval de dates."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Registre d'instal·lació per a un nº de sèrie
 DocType: Guardian Interest,Guardian Interest,guardià interès
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Configuració dels valors predeterminats per a les factures de POS
 apps/erpnext/erpnext/config/hr.py +177,Training,formació
 DocType: Timesheet,Employee Detail,Detall dels empleats
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ID de correu electrònic
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,L&#39;endemà de la data i Repetir en el dia del mes ha de ser igual
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,L&#39;endemà de la data i Repetir en el dia del mes ha de ser igual
 DocType: Lab Prescription,Test Code,Codi de prova
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Ajustos per a la pàgina d&#39;inici pàgina web
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},Les RFQ no estan permeses per {0} a causa d&#39;un quadre de comandament de peu de {1}
 DocType: Offer Letter,Awaiting Response,Espera de la resposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Per sobre de
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Import total {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},atribut no vàlid {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Import total {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},atribut no vàlid {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Esmentar si compta per pagar no estàndard
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},El mateix article s&#39;ha introduït diverses vegades. {Llista}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',"Si us plau, seleccioneu el grup d&#39;avaluació que no sigui &#39;Tots els grups d&#39;avaluació&#39;"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Fila {0}: es requereix centre de costos per a un element {1}
 DocType: Training Event Employee,Optional,Opcional
@@ -3950,19 +4035,20 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centre de Cost és obligatori per l'article {2}
 DocType: Vehicle,Policy No,sense política
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Obtenir elements del paquet del producte
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Com existeix existència contra un element {0}, no podeu activar propietats de variants"
 DocType: Asset,Straight Line,Línia recta
 DocType: Project User,Project User,usuari projecte
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,divisió
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,divisió
 DocType: GL Entry,Is Advance,És Avanç
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Assistència Des de la data i Assistència a la data és obligatori
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,"Si us plau, introdueixi 'subcontractació' com Sí o No"
+DocType: Item,Default Purchase Unit of Measure,Unitat de compra predeterminada de la mesura
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Darrera data de Comunicació
 DocType: Sales Team,Contact No.,Número de Contacte
 DocType: Bank Reconciliation,Payment Entries,Les entrades de pagament
 DocType: Production Order,Scrap Warehouse,Magatzem de ferralla
 DocType: Production Order,Check if material transfer entry is not required,Comproveu si no es requereix l&#39;entrada de transferència de material
 DocType: Program Enrollment Tool,Get Students From,Rep estudiants de
-DocType: Hub Settings,Seller Country,Venedor País
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publicar articles per pàgina web
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Agrupar seus estudiants en lots
 DocType: Authorization Rule,Authorization Rule,Regla d'Autorització
@@ -3972,7 +4058,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Impostos i càrrecs de venda de plantilla
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Total (de crèdit)
 DocType: Repayment Schedule,Payment Date,Data de pagament
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nou lot Quantitat
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Nou lot Quantitat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Roba i Accessoris
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,No s&#39;ha pogut resoldre la funció de puntuació ponderada. Assegureu-vos que la fórmula sigui vàlida.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Número d'ordre
@@ -3990,6 +4076,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Fila # {0}: l&#39;element {1} no pot ser presentat, el que ja és {2}"
 DocType: Tax Rule,Billing Country,Facturació País
 DocType: Purchase Order Item,Expected Delivery Date,Data de lliurament esperada
+DocType: Restaurant Order Entry,Restaurant Order Entry,Entrada de comanda de restaurant
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Dèbit i Crèdit no és igual per a {0} # {1}. La diferència és {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Despeses d'Entreteniment
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Fer Sol·licitud de materials
@@ -4002,9 +4089,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Un compte amb transaccions no es pot eliminar
 DocType: Vehicle,Last Carbon Check,Últim control de Carboni
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Despeses legals
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Si us plau seleccioni la quantitat al corredor
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Si us plau seleccioni la quantitat al corredor
 DocType: Purchase Invoice,Posting Time,Temps d'enviament
 DocType: Timesheet,% Amount Billed,% Import Facturat
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Temps per cita&quot; no s&#39;ha establert per al Dr {0}. Afegiu-lo al mestre de metge.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Despeses telefòniques
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Seleccioneu aquesta opció si voleu obligar l'usuari a seleccionar una sèrie abans de desar. No hi haurà cap valor per defecte si marca aquesta.
@@ -4015,6 +4103,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nous ingressos al Client
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Despeses de viatge
 DocType: Maintenance Visit,Breakdown,Breakdown
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Afegeix una subscripció de camp personalitzada a la doctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Compte: {0} amb la divisa: {1} no es pot seleccionar
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Actualitza el cost de la BOM automàticament mitjançant Scheduler, en funció de la taxa de valoració / tarifa de preu més recent / la darrera tarifa de compra de matèries primeres."
 DocType: Bank Reconciliation Detail,Cheque Date,Data Xec
@@ -4039,7 +4128,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Suma total de facturació (a través dels registres de temps)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Identificador de Proveïdor
 DocType: Payment Request,Payment Gateway Details,Passarel·la de Pagaments detalls
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Quantitat ha de ser més gran que 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Quantitat ha de ser més gran que 0
 DocType: Journal Entry,Cash Entry,Entrada Efectiu
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Els nodes fills només poden ser creats sota els nodes de tipus &quot;grup&quot;
 DocType: Leave Application,Half Day Date,Medi Dia Data
@@ -4057,12 +4146,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Nota: L'article {0} entrat diverses vegades
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Tots els contactes.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Abreviatura de l'empresa
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,L'usuari {0} no existeix
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,L'usuari {0} no existeix
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Abreviatura
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Entrada de pagament ja existeix
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,No distribuïdor oficial autoritzat des {0} excedeix els límits
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Salary template master.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Patologia
+DocType: Restaurant Order Entry,Restaurant Table,Taula de restaurants
 DocType: Leave Type,Max Days Leave Allowed,Màxim de dies d'absència permesos
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Estableixi la regla fiscal de carret de la compra
 DocType: Purchase Invoice,Taxes and Charges Added,Impostos i càrregues afegides
@@ -4074,10 +4165,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Cotitzacions a clients potencials o a clients.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Paper animals d'editar estoc congelat
 ,Territory Target Variance Item Group-Wise,Territori de destinació Variància element de grup-Wise
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Tots els Grups de clients
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Tots els Grups de clients
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,acumulat Mensual
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} és obligatori. Potser el registre de canvi de divisa no es crea per {1} a {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Plantilla d&#39;impostos és obligatori.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Plantilla d&#39;impostos és obligatori.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Compte {0}: el compte superior {1} no existeix
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifa de preus (en la moneda de la companyia)
 DocType: Products Settings,Products Settings,productes Ajustaments
@@ -4103,12 +4194,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detall d'impostos de tots els articles
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Institut Abreviatura
 ,Item-wise Price List Rate,Llista de Preus de tarifa d'article
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Cita Proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Cita Proveïdor
 DocType: Quotation,In Words will be visible once you save the Quotation.,En paraules seran visibles un cop que es guarda la Cotització.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Quantitat ({0}) no pot ser una fracció a la fila {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Barcode {0} ja utilitzat en el punt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Barcode {0} ja utilitzat en el punt {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Regles per afegir les despeses d'enviament.
 DocType: Item,Opening Stock,l&#39;obertura de la
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Es requereix client
@@ -4127,9 +4218,8 @@
 DocType: Customer,From Lead,De client potencial
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Comandes llançades per a la producció.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Seleccioneu l'Any Fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS perfil requerit per fer l&#39;entrada POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS perfil requerit per fer l&#39;entrada POS
 DocType: Program Enrollment Tool,Enroll Students,inscriure els estudiants
-DocType: Hub Settings,Name Token,Nom Token
 DocType: Lab Test,Approved Date,Data aprovada
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Almenys un magatzem és obligatori
@@ -4147,7 +4237,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Recursos Humans
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Payment Reconciliation Payment
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Actius per impostos
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Producció Ordre ha estat {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Producció Ordre ha estat {0}
 DocType: BOM Item,BOM No,No BOM
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Seient {0} no té compte {1} o ja compara amb un altre bo
@@ -4167,7 +4257,7 @@
 DocType: Currency Exchange,To Currency,Per moneda
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Deixi els següents usuaris per aprovar sol·licituds de llicència per a diversos dies de bloc.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Tipus de Compte de despeses.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},tarifa per a la venda d&#39;element {0} és més baix que el seu {1}. tipus venedor ha de tenir una antiguitat {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},tarifa per a la venda d&#39;element {0} és més baix que el seu {1}. tipus venedor ha de tenir una antiguitat {2}
 DocType: Item,Taxes,Impostos
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,A càrrec i no lliurats
 DocType: Project,Default Cost Center,Centre de cost predeterminat
@@ -4181,15 +4271,15 @@
 DocType: Employee Loan,Fully Disbursed,desemborsat en la seva totalitat
 DocType: Maintenance Visit,Customer Feedback,Comentaris del client
 DocType: Account,Expense,Despesa
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Els resultats no pot ser més gran que puntuació màxim
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Els resultats no pot ser més gran que puntuació màxim
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Clients i proveïdors
 DocType: Item Attribute,From Range,De Gamma
 DocType: BOM,Set rate of sub-assembly item based on BOM,Estableix el tipus d&#39;element de subconjunt basat en BOM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Error de sintaxi en la fórmula o condició: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Error de sintaxi en la fórmula o condició: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Treball Diari resum de la configuració de l&#39;empresa
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,Article {0} ignorat ja que no és un article d'estoc
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Presentar aquesta ordre de producció per al seu posterior processament.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Presentar aquesta ordre de producció per al seu posterior processament.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Per no aplicar la Regla de preus en una transacció en particular, totes les normes sobre tarifes aplicables han de ser desactivats."
 DocType: Assessment Group,Parent Assessment Group,Pares Grup d&#39;Avaluació
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,ocupacions
@@ -4206,12 +4296,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Si us plau ajust empresa de filtres en blanc si és Agrupa per &#39;empresa&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Data d&#39;entrada no pot ser data futura
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Fila # {0}: Nombre de sèrie {1} no coincideix amb {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,per generar el recurrent
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Deixar Casual
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Prova de laboratori UOM.
 DocType: Batch,Batch ID,Identificació de lots
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Nota: {0}
 ,Delivery Note Trends,Nota de lliurament Trends
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Resum de la setmana
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Resum de la setmana
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,En estoc Quantitat
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,El compte: {0} només pot ser actualitzat a través de transaccions d'estoc
 DocType: Student Group Creation Tool,Get Courses,obtenir Cursos
@@ -4225,7 +4316,6 @@
 DocType: Purchase Order,To Bill,Per Bill
 DocType: Material Request,% Ordered,Demanem%
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Per grup d&#39;alumnes basat curs, aquest serà validat per cada estudiant dels cursos matriculats en el Programa d&#39;Inscripció."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Introduir adreça de correu electrònic separades per comes, la factura serà enviada automàticament en data determinada"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Treball a preu fet
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Quota de compra mitja
 DocType: Task,Actual Time (in Hours),Temps real (en hores)
@@ -4239,7 +4329,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,L'Article {0} no està configurat per números de sèrie. La columna ha d'estar en blanc
 DocType: Accounts Settings,Accounts Settings,Ajustaments de comptabilitat
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,aprovar
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Cap resultat per enviar
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Cap resultat per enviar
 DocType: Customer,Sales Partner and Commission,Soci de vendes i de la Comissió
 DocType: Employee Loan,Rate of Interest (%) / Year,Taxa d&#39;interès (%) / Any
 ,Project Quantity,projecte Quantitat
@@ -4251,55 +4341,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Negre
 DocType: BOM Explosion Item,BOM Explosion Item,Explosió de BOM d'article
 DocType: Account,Auditor,Auditor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} articles produïts
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} articles produïts
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Aprèn més
 DocType: Cheque Print Template,Distance from top edge,Distància des de la vora superior
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,El preu de llista {0} està desactivat o no existeix
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,El preu de llista {0} està desactivat o no existeix
 DocType: Purchase Invoice,Return,Retorn
 DocType: Production Order Operation,Production Order Operation,Ordre de Producció Operació
 DocType: Pricing Rule,Disable,Desactiva
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Forma de pagament es requereix per fer un pagament
 DocType: Project Task,Pending Review,Pendent de Revisió
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Nomenaments i consultes
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} no està inscrit en el Lot {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} no està inscrit en el Lot {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Actius {0} no pot ser rebutjada, com ja ho és {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Reclamació de despeses totals (a través de despeses)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Marc Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Fila {0}: Divisa de la llista de materials # {1} ha de ser igual a la moneda seleccionada {2}
 DocType: Journal Entry Account,Exchange Rate,Tipus De Canvi
 DocType: Patient,Additional information regarding the patient,Informació addicional sobre el pacient
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Comanda de client {0} no es presenta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Comanda de client {0} no es presenta
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Quota de components
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Gestió de Flotes
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Afegir elements de
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Gestió de Flotes
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Afegir elements de
 DocType: Cheque Print Template,Regular,regular
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Coeficient de ponderació total de tots els criteris d&#39;avaluació ha de ser del 100%
-DocType: BOM,Last Purchase Rate,Darrera Compra Rate
+DocType: Purchase Order Item,Last Purchase Rate,Darrera Compra Rate
 DocType: Account,Asset,Basa
 DocType: Project Task,Task ID,Tasca ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Estoc no pot existir per al punt {0} ja té variants
 DocType: Lab Test,Mobile,Mòbil
 ,Sales Person-wise Transaction Summary,Resum de transaccions de vendes Persona-savi
 DocType: Training Event,Contact Number,Nombre de contacte
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,El magatzem {0} no existeix
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrar ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,El magatzem {0} no existeix
 DocType: Monthly Distribution,Monthly Distribution Percentages,Els percentatges de distribució mensuals
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,L'element seleccionat no pot tenir per lots
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","taxa de valorització no trobat per a l&#39;element {0}, que es requereix per fer assentaments comptables per {1} {2}. Si l&#39;article està tramitant com un element de la mostra en el {1}, si us plau esmentar que a la taula {1} article. Altrament, si us plau crea una transacció d&#39;accions d&#39;entrada per a la taxa de valorització article o menció en el registre d&#39;articles i, a continuació, tractar d&#39;enviar / cancel·lació d&#39;aquesta entrada"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% de materials lliurats d'aquesta Nota de Lliurament
+DocType: Training Event,Has Certificate,Té un certificat
 DocType: Project,Customer Details,Dades del client
 DocType: Employee,Reports to,Informes a
 ,Unpaid Expense Claim,Reclamació de despeses no pagats
 DocType: Payment Entry,Paid Amount,Quantitat pagada
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Exploreu el cicle de vendes
 DocType: Assessment Plan,Supervisor,supervisor
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,en línia
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,en línia
 ,Available Stock for Packing Items,Estoc disponible per articles d'embalatge
 DocType: Item Variant,Item Variant,Article Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Eina resultat de l&#39;avaluació
 DocType: BOM Scrap Item,BOM Scrap Item,La llista de materials de ferralla d&#39;articles
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,comandes presentats no es poden eliminar
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,comandes presentats no es poden eliminar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo del compte ja en dèbit, no se li permet establir ""El balanç ha de ser"" com ""crèdit"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Gestió de la Qualitat
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Element {0} ha estat desactivat
@@ -4319,7 +4408,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Fila # {0}: conflictes Timings amb fila {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Permetre zero taxa de valorització
 DocType: Training Event Employee,Invited,convidat
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Múltiples estructures salarials actius trobats per a l&#39;empleat {0} per a les dates indicades
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Múltiples estructures salarials actius trobats per a l&#39;empleat {0} per a les dates indicades
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Configuració de comptes de porta d&#39;enllaç.
 DocType: Employee,Employment Type,Tipus d'Ocupació
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Actius Fixos
@@ -4331,7 +4420,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Estudiant ID de correu electrònic
 DocType: Employee,Notice (days),Avís (dies)
 DocType: Tax Rule,Sales Tax Template,Plantilla d&#39;Impost a les Vendes
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Seleccioneu articles per estalviar la factura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Seleccioneu articles per estalviar la factura
 DocType: Employee,Encashment Date,Data Cobrament
 DocType: Training Event,Internet,Internet
 DocType: Special Test Template,Special Test Template,Plantilla de prova especial
@@ -4340,7 +4429,7 @@
 DocType: Production Order,Planned Operating Cost,Planejat Cost de funcionament
 DocType: Academic Term,Term Start Date,Termini Data d&#39;Inici
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Comte del OPP
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Troba adjunt {0} #{1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Troba adjunt {0} #{1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Equilibri extracte bancari segons Comptabilitat General
 DocType: Job Applicant,Applicant Name,Nom del sol·licitant
 DocType: Authorization Rule,Customer / Item Name,Client / Nom de l'article
@@ -4360,7 +4449,7 @@
 DocType: Guardian,Guardian Of ,El guarda de
 DocType: Grading Scale Interval,Threshold,Llindar
 DocType: BOM Update Tool,Current BOM,BOM actual
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Afegir Número de sèrie
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Afegir Número de sèrie
 DocType: Production Order Item,Available Qty at Source Warehouse,Quantitats disponibles a Font Magatzem
 apps/erpnext/erpnext/config/support.py +22,Warranty,garantia
 DocType: Purchase Invoice,Debit Note Issued,Nota de dèbit Publicat
@@ -4383,10 +4472,9 @@
 DocType: Account,Receivable,Compte per cobrar
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: No es permet canviar de proveïdors com l&#39;Ordre de Compra ja existeix
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol al que es permet presentar les transaccions que excedeixin els límits de crèdit establerts.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Seleccionar articles a Fabricació
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Mestre sincronització de dades, que podria portar el seu temps"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Seleccionar articles a Fabricació
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Mestre sincronització de dades, que podria portar el seu temps"
 DocType: Item,Material Issue,Material Issue
-DocType: Hub Settings,Seller Description,Venedor Descripció
 DocType: Employee Education,Qualification,Qualificació
 DocType: Item Price,Item Price,Preu d'article
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sabó i Detergent
@@ -4394,7 +4482,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Des del temps no pot ser més gran que en tant.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Cinema i vídeo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenat
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Resum
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Resum
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Si està habilitat, el sistema no actualitzarà els camps de les variants de la plantilla, sinó que copiarà les dades dels camps esmentats a continuació fent una nova variant."
 DocType: Salary Detail,Component,component
 DocType: Assessment Criteria,Assessment Criteria Group,Criteris d&#39;avaluació del Grup
 DocType: Healthcare Settings,Patient Name By,Nom del pacient mitjançant
@@ -4404,7 +4493,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Si us plau entra el rol d'aprovació o l'usuari aprovador
 DocType: Journal Entry,Write Off Entry,Escriu Off Entrada
 DocType: BOM,Rate Of Materials Based On,Tarifa de materials basats en
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Proveïdor&gt; Tipus de proveïdor
+DocType: Item Variant Settings,Do not Update Variants,No actualitzeu les variants
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Suport
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,desactivar tot
 DocType: POS Profile,Terms and Conditions,Condicions
@@ -4413,7 +4502,7 @@
 DocType: Leave Block List,Applies to Company,S'aplica a l'empresa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,No es pot cancel·lar perquè l'entrada d'estoc {0} ja ha estat Presentada
 DocType: Employee Loan,Disbursement Date,Data de desemborsament
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,No s&#39;especifiquen els &quot;destinataris&quot;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,No s&#39;especifiquen els &quot;destinataris&quot;
 DocType: BOM Update Tool,Update latest price in all BOMs,Actualitzeu el preu més recent en totes les BOM
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Registre mèdic
 DocType: Vehicle,Vehicle,vehicle
@@ -4428,14 +4517,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,OPP /% Plom
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Les depreciacions d&#39;actius i saldos
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Suma {0} {1} transferit des {2} a {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Suma {0} {1} transferit des {2} a {3}
 DocType: Sales Invoice,Get Advances Received,Obtenir les bestretes rebudes
 DocType: Email Digest,Add/Remove Recipients,Afegir / Treure Destinataris
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},No es permet la transacció cap a l'ordre de producció aturada {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Per establir aquest any fiscal predeterminat, feu clic a ""Estableix com a predeterminat"""
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,unir-se
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,unir-se
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Quantitat escassetat
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Hi ha la variant d&#39;article {0} amb mateixos atributs
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Hi ha la variant d&#39;article {0} amb mateixos atributs
 DocType: Employee Loan,Repay from Salary,Pagar del seu sou
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Sol·licitant el pagament contra {0} {1} per la quantitat {2}
@@ -4448,7 +4537,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Sol·licitar Sales Item
 DocType: Salary Slip,Payment Days,Dies de pagament
 DocType: Patient,Dormant,latent
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Magatzems amb nodes secundaris no poden ser convertits en llibre major
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Magatzems amb nodes secundaris no poden ser convertits en llibre major
 DocType: BOM,Manage cost of operations,Administrar cost de les operacions
 DocType: Accounts Settings,Stale Days,Stale Days
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Quan es ""Presenta"" alguna de les operacions marcades, s'obre automàticament un correu electrònic emergent per enviar un correu electrònic al ""Contacte"" associat a aquesta transacció, amb la transacció com un arxiu adjunt. L'usuari pot decidir enviar, o no, el correu electrònic."
@@ -4462,10 +4551,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Nombre de sèrie {0} ja s'ha rebut
 ,Requested Items To Be Transferred,Articles sol·licitats per a ser transferits
 DocType: Expense Claim,Vehicle Log,Inicia vehicle
-DocType: Purchase Invoice,Recurring Id,Recurrent Aneu
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Presència d&#39;una febre (temperatura&gt; 38,5 ° C / 101.3 ° F o temperatura sostinguda&gt; 38 ° C / 100.4 ° F)"
 DocType: Customer,Sales Team Details,Detalls de l'Equip de Vendes
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Eliminar de forma permanent?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Eliminar de forma permanent?
 DocType: Expense Claim,Total Claimed Amount,Suma total del Reclamat
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Els possibles oportunitats de venda.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},No vàlida {0}
@@ -4475,7 +4563,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Grans Magatzems
 ,Item Delivery Date,Data de lliurament de l&#39;article
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Configuració del seu School a ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Configuració del seu School a ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base quantitat de canvi (moneda de l&#39;empresa)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,No hi ha assentaments comptables per als següents magatzems
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Deseu el document primer.
@@ -4487,13 +4575,12 @@
 DocType: Task,Is Milestone,és Milestone
 DocType: Daily Work Summary,Email Sent To,Correu electrònic enviat a
 DocType: Budget,Warn,Advertir
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Esteu segur que voleu cancel·lar el registre?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Altres observacions, esforç notable que ha d&#39;anar en els registres."
 DocType: BOM,Manufacturing User,Usuari de fabricació
 DocType: Purchase Invoice,Raw Materials Supplied,Matèries primeres subministrades
-DocType: Purchase Invoice,Recurring Print Format,Recurrent Format d&#39;impressió
 DocType: C-Form,Series,Sèrie
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},La moneda de la llista de preus {0} ha de ser {1} o {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Afegir productes
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},La moneda de la llista de preus {0} ha de ser {1} o {2}
 DocType: Appraisal,Appraisal Template,Plantilla d'Avaluació
 DocType: Item Group,Item Classification,Classificació d'articles
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Gerent de Desenvolupament de Negocis
@@ -4507,7 +4594,7 @@
 DocType: Item Attribute Value,Attribute Value,Atribut Valor
 ,Itemwise Recommended Reorder Level,Nivell d'articles recomanat per a tornar a passar comanda
 DocType: Salary Detail,Salary Detail,Detall de sous
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Seleccioneu {0} primer
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Seleccioneu {0} primer
 DocType: Appointment Type,Physician,Metge
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Lot {0} de {1} article ha expirat.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Consultes
@@ -4518,7 +4605,7 @@
 DocType: Salary Detail,Default Amount,Default Amount
 DocType: Lab Test Template,Descriptive,Descriptiva
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Magatzem no trobat al sistema
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Resum d&#39;aquest Mes
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Resum d&#39;aquest Mes
 DocType: Quality Inspection Reading,Quality Inspection Reading,Qualitat de Lectura d'Inspecció
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Bloqueja els estocs més antics que' ha de ser menor de %d dies.
 DocType: Tax Rule,Purchase Tax Template,Compra Plantilla Tributària
@@ -4541,12 +4628,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,L&#39;entrenament d&#39;Esdeveniments / Resultats
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,La depreciació acumulada com a
 DocType: Sales Invoice,C-Form Applicable,C-Form Applicable
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Temps de funcionament ha de ser major que 0 per a l&#39;operació {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Temps de funcionament ha de ser major que 0 per a l&#39;operació {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Magatzem és obligatori
 DocType: Supplier,Address and Contacts,Direcció i contactes
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detall UOM Conversió
 DocType: Program,Program Abbreviation,abreviatura programa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Ordre de fabricació no es pot aixecar en contra d&#39;una plantilla d&#39;article
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Ordre de fabricació no es pot aixecar en contra d&#39;una plantilla d&#39;article
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Els càrrecs s'actualitzen amb els rebuts de compra contra cada un dels articles
 DocType: Warranty Claim,Resolved By,Resolta Per
 DocType: Bank Guarantee,Start Date,Data De Inici
@@ -4572,26 +4659,27 @@
 DocType: Employee,Educational Qualification,Capacitació per a l'Educació
 DocType: Workstation,Operating Costs,Costos Operatius
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Acció si s&#39;acumula pressupost mensual excedit
-DocType: Purchase Invoice,Submit on creation,Presentar a la creació
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Moneda per {0} ha de ser {1}
+DocType: Subscription,Submit on creation,Presentar a la creació
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Moneda per {0} ha de ser {1}
 DocType: Asset,Disposal Date,disposició Data
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Els correus electrònics seran enviats a tots els empleats actius de l&#39;empresa a l&#39;hora determinada, si no tenen vacances. Resum de les respostes serà enviat a la mitjanit."
 DocType: Employee Leave Approver,Employee Leave Approver,Empleat Deixar aprovador
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada Reordenar ja existeix per aquest magatzem {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","No es pot declarar com perdut, perquè s'han fet ofertes"
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Formació de vots
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada Reordenar ja existeix per aquest magatzem {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","No es pot declarar com perdut, perquè s'han fet ofertes"
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Formació de vots
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,L'Ordre de Producció {0} ha d'estar Presentada
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Criteris de quadre de comandament de proveïdors
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Seleccioneu data d'inici i data de finalització per a l'article {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Per descomptat és obligatori a la fila {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Fins a la data no pot ser anterior a partir de la data
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc Doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Afegeix / Edita Preus
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Afegeix / Edita Preus
 DocType: Batch,Parent Batch,lots dels pares
 DocType: Cheque Print Template,Cheque Print Template,Plantilla d&#39;impressió de xecs
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Gràfic de centres de cost
 DocType: Lab Test Template,Sample Collection,Col.lecció de mostres
 ,Requested Items To Be Ordered,Articles sol·licitats serà condemnada
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Les meves comandes
 DocType: Price List,Price List Name,nom de la llista de preus
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Resum diari de treball per a {0}
 DocType: Employee Loan,Totals,Totals
@@ -4610,12 +4698,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} unitats de {1} necessària en {2} sobre {3} {4} {5} per completar aquesta transacció.
 DocType: Fee Schedule,Student Category,categoria estudiant
 DocType: Announcement,Student,Estudiant
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Unitat d'Organització (departament) mestre.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Unitat d'Organització (departament) mestre.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Anar a Sales
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Si us plau, escriviu el missatge abans d'enviar-"
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,Duplicat per PROVEÏDOR
 DocType: Email Digest,Pending Quotations,A l&#39;espera de Cites
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Punt de Venda Perfil
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Punt de Venda Perfil
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Configuracions de prova de laboratori.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Préstecs sense garantia
 DocType: Cost Center,Cost Center Name,Nom del centre de cost
@@ -4625,6 +4713,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Total pagat Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Els missatges de més de 160 caràcters es divideixen en diversos missatges
 DocType: Purchase Receipt Item,Received and Accepted,Rebut i acceptat
+DocType: Hub Settings,Company and Seller Profile,Perfil de l&#39;empresa i del venedor
 ,GST Itemised Sales Register,GST Detallat registre de vendes
 ,Serial No Service Contract Expiry,Número de sèrie del contracte de venciment del servei
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,No es pot configurar el mateix compte com crèdit i dèbit a la vegada
@@ -4634,10 +4723,11 @@
 DocType: Item,Variant Based On,En variant basada
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},El pes total assignat ha de ser 100%. És {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Els seus Proveïdors
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Correu la correcció
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,No es pot establir tan perdut com està feta d'ordres de venda.
 DocType: Request for Quotation Item,Supplier Part No,Proveïdor de part
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',No es pot deduir que és la categoria de &#39;de Valoració &quot;o&quot; Vaulation i Total&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Rebut des
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Rebut des
 DocType: Lead,Converted,Convertit
 DocType: Item,Has Serial No,No té de sèrie
 DocType: Employee,Date of Issue,Data d'emissió
@@ -4645,7 +4735,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","D&#39;acord amb la configuració de comprar si compra Reciept Obligatori == &#39;SÍ&#39;, a continuació, per a la creació de la factura de compra, l&#39;usuari necessita per crear rebut de compra per al primer element {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunt de Proveïdors per a l&#39;element {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Fila {0}: valor Hores ha de ser més gran que zero.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Lloc web Imatge {0} unit a l&#39;article {1} no es pot trobar
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Lloc web Imatge {0} unit a l&#39;article {1} no es pot trobar
 DocType: Issue,Content Type,Tipus de Contingut
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Ordinador
 DocType: Item,List this Item in multiple groups on the website.,Fes una llista d'articles en diversos grups en el lloc web.
@@ -4656,14 +4746,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Aconsegueix entrades no reconciliades
 DocType: Payment Reconciliation,From Invoice Date,Des Data de la factura
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,No teniu permís per enviar
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,"moneda de facturació ha de ser igual a la moneda o divisa de compte del partit, ja sigui per defecte de comapany"
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,"moneda de facturació ha de ser igual a la moneda o divisa de compte del partit, ja sigui per defecte de comapany"
 DocType: Healthcare Settings,Laboratory Settings,Configuració del Laboratori
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,deixa Cobrament
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Què fa?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Magatzem destí
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Tots Admissió d&#39;Estudiants
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Què fa?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Magatzem destí
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Tots Admissió d&#39;Estudiants
 ,Average Commission Rate,Comissió de Tarifes mitjana
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,'Té Num de Sèrie' no pot ser 'Sí' per a items que no estan a l'estoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,'Té Num de Sèrie' no pot ser 'Sí' per a items que no estan a l'estoc
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Selecciona l&#39;estat
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,No es poden entrar assistències per dates futures
 DocType: Pricing Rule,Pricing Rule Help,Ajuda de la Regla de preus
@@ -4681,40 +4771,40 @@
 DocType: Item,Customer Code,Codi de Client
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Recordatori d'aniversari per {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dies des de l'última comanda
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Dèbit al compte ha de ser un compte de Balanç
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Dèbit al compte ha de ser un compte de Balanç
 DocType: Buying Settings,Naming Series,Sèrie de nomenclatura
 DocType: Leave Block List,Leave Block List Name,Deixa Nom Llista de bloqueig
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,data d&#39;inici d&#39;assegurança ha de ser inferior a la data d&#39;Assegurances Fi
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Configureu el sistema de nomenclatura d&#39;instructor a l&#39;escola&gt; Configuració de l&#39;escola
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Actius
 DocType: Timesheet,Production Detail,Detall de producció
+DocType: Restaurant,Active Menu,Menú actiu
 DocType: Target Detail,Target Qty,Objectiu Quantitat
 DocType: Shopping Cart Settings,Checkout Settings,Comanda Ajustaments
 DocType: Attendance,Present,Present
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,La Nota de lliurament {0} no es pot presentar
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,La Nota de lliurament {0} no es pot presentar
 DocType: Notification Control,Sales Invoice Message,Missatge de Factura de vendes
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Compte {0} Cloenda ha de ser de Responsabilitat / Patrimoni
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},La relliscada de sou de l&#39;empleat {0} ja creat per al full de temps {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},La relliscada de sou de l&#39;empleat {0} ja creat per al full de temps {1}
 DocType: Vehicle Log,Odometer,comptaquilòmetres
 DocType: Sales Order Item,Ordered Qty,Quantitat demanada
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Article {0} està deshabilitat
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Article {0} està deshabilitat
 DocType: Stock Settings,Stock Frozen Upto,Estoc bloquejat fins a
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM no conté cap article comuna
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Activitat del projecte / tasca.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM no conté cap article comuna
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Activitat del projecte / tasca.
 DocType: Vehicle Log,Refuelling Details,Detalls de repostatge
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generar Salari Slips
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Compra de comprovar, si es selecciona aplicable Perquè {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Descompte ha de ser inferior a 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,taxa de compra d&#39;última no trobat
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Escriu Off Import (Companyia moneda)
 DocType: Sales Invoice Timesheet,Billing Hours,Hores de facturació
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,BOM per defecte per {0} no trobat
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Fila # {0}: Configureu la quantitat de comanda
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM per defecte per {0} no trobat
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Fila # {0}: Configureu la quantitat de comanda
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Toc els articles a afegir aquí
 DocType: Fees,Program Enrollment,programa d&#39;Inscripció
 DocType: Landed Cost Voucher,Landed Cost Voucher,Val Landed Cost
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Si us plau, estableix {0}"
-DocType: Purchase Invoice,Repeat on Day of Month,Repetiu el Dia del Mes
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} és estudiant inactiu
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} és estudiant inactiu
 DocType: Employee,Health Details,Detalls de la Salut
 DocType: Offer Letter,Offer Letter Terms,Oferir Termes de lletres
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Per a crear una sol·licitud de pagament es requereix document de referència
@@ -4722,7 +4812,6 @@
 DocType: Employee External Work History,Salary,Salari
 DocType: Serial No,Delivery Document Type,Tipus de document de lliurament
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Presenta totes les nòmines amb els criteris anteriorment seleccionats
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} articles sincronitzen
 DocType: Sales Order,Partly Delivered,Parcialment Lliurat
 DocType: Email Digest,Receivables,Cobrables
 DocType: Lead Source,Lead Source,Origen de clients potencials
@@ -4743,19 +4832,19 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Rang 2 Envelliment
 DocType: SG Creation Tool Course,Max Strength,força màx
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM reemplaçat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Seleccioneu els elements segons la data de lliurament
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Seleccioneu els elements segons la data de lliurament
 ,Sales Analytics,Analytics de venda
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Disponible {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Disponible {0}
 ,Prospects Engaged But Not Converted,Perspectives Enganxat Però no es converteix
 DocType: Manufacturing Settings,Manufacturing Settings,Ajustaments de Manufactura
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configuració de Correu
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Sense Guardian1 mòbil
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Si us plau ingressi moneda per defecte en l'empresa Mestre
 DocType: Stock Entry Detail,Stock Entry Detail,Detall de les entrades d'estoc
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Recordatoris diaris
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Recordatoris diaris
 DocType: Products Settings,Home Page is Products,Home Page is Products
 ,Asset Depreciation Ledger,La depreciació d&#39;actius Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Conflictes norma fiscal amb {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Conflictes norma fiscal amb {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nou Nom de compte
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Cost matèries primeres subministrades
 DocType: Selling Settings,Settings for Selling Module,Ajustos Mòdul de vendes
@@ -4769,8 +4858,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Article {0} ha de ser un d'article de l'estoc
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Per defecte Work In Progress Magatzem
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Ajustos predeterminats per a les operacions comptables.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configureu el sistema de nomenclatura d&#39;empleats en recursos humans&gt; Configuració de recursos humans
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Data prevista no pot ser anterior material Data de sol·licitud
+DocType: Restaurant,Default Tax Template,Plantilla d&#39;impostos predeterminada
 DocType: Fees,Student Details,Detalls dels estudiants
 DocType: Purchase Invoice Item,Stock Qty,existència Quantitat
 DocType: Employee Loan,Repayment Period in Months,Termini de devolució en Mesos
@@ -4788,8 +4878,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Vés als elements
 DocType: Sales Partner,Partner Type,Tipus de Partner
 DocType: Purchase Taxes and Charges,Actual,Reial
+DocType: Restaurant Menu,Restaurant Manager,Gerent de restaurant
 DocType: Authorization Rule,Customerwise Discount,Customerwise Descompte
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Part d&#39;hores per a les tasques.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Part d&#39;hores per a les tasques.
 DocType: Purchase Invoice,Against Expense Account,Contra el Compte de Despeses
 DocType: Production Order,Production Order,Ordre de Producció
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,La Nota d'Instal·lació {0} ja s'ha presentat
@@ -4797,7 +4888,6 @@
 DocType: Quotation Item,Against Docname,Contra DocName
 DocType: SMS Center,All Employee (Active),Tot Empleat (Actiu)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Veure ara
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Seleccioneu el període en què la factura es generarà de forma automàtica
 DocType: BOM,Raw Material Cost,Matèria primera Cost
 DocType: Item Reorder,Re-Order Level,Re-Order Nivell
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Introduïu articles i Quantitat prevista per a les que desitja elevar les ordres de producció o descàrrega de matèries primeres per a la seva anàlisi.
@@ -4810,23 +4900,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Tipus d'informe és obligatori
 DocType: Item,Serial Number Series,Nombre de sèrie de la sèrie
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},El magatzem és obligatòria per l'article d'estoc {0} a la fila {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Afegeix programes
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Al detall i a l'engròs
 DocType: Issue,First Responded On,Primer respost el
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Creu Fitxa d'article en diversos grups
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Any fiscal Data d'Inici i Final de l'exercici fiscal data ja es troben en l'Any Fiscal {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Liquidació Data s&#39;actualitza
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split batch
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Reconciliats amb èxit
 DocType: Request for Quotation Supplier,Download PDF,descarregar PDF
 DocType: Production Order,Planned End Date,Planejat Data de finalització
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Introduïu Calendari de data
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Lloc d'emmagatzematge dels articles.
 DocType: Request for Quotation,Supplier Detail,Detall del proveïdor
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Error en la fórmula o condició: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Error en la fórmula o condició: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Quantitat facturada
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Els pesos dels criteris han de sumar fins al 100%
 DocType: Attendance,Attendance,Assistència
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,stockItems
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,stockItems
 DocType: BOM,Materials,Materials
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Si no està habilitada, la llista haurà de ser afegit a cada departament en què s'ha d'aplicar."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Origen i destí de dipòsit no pot ser el mateix
@@ -4844,6 +4934,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,En total net
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Valor de l&#39;atribut {0} ha d&#39;estar dins del rang de {1} a {2} en els increments de {3} per a l&#39;article {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,El magatzem de destinació de la fila {0} ha de ser igual que l'Ordre de Producció
+DocType: Restaurant Reservation,Waitlisted,Waitlisted
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Moneda no es pot canviar després de fer entrades utilitzant alguna altra moneda
 DocType: Vehicle Service,Clutch Plate,placa d&#39;embragatge
 DocType: Company,Round Off Account,Per arrodonir el compte
@@ -4860,7 +4951,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nom nou encarregat de vendes
 DocType: Packing Slip,Gross Weight UOM,Pes brut UDM
 DocType: Delivery Note Item,Against Sales Invoice,Contra la factura de venda
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,"Si us plau, introdueixi els números de sèrie per a l&#39;article serialitzat"
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,"Si us plau, introdueixi els números de sèrie per a l&#39;article serialitzat"
 DocType: Bin,Reserved Qty for Production,Quantitat reservada per a la Producció
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Deixa sense marcar si no vol tenir en compte per lots alhora que els grups basats en curs.
 DocType: Asset,Frequency of Depreciation (Months),Freqüència de Depreciació (Mesos)
@@ -4871,7 +4962,7 @@
 DocType: Lab Test,Test Group,Grup de prova
 DocType: Payment Reconciliation,Receivable / Payable Account,Compte de cobrament / pagament
 DocType: Delivery Note Item,Against Sales Order Item,Contra l'Ordre de Venda d'articles
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},"Si us plau, especifiqui Atribut Valor de l&#39;atribut {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},"Si us plau, especifiqui Atribut Valor de l&#39;atribut {0}"
 DocType: Item,Default Warehouse,Magatzem predeterminat
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Pressupost no es pot assignar contra comptes de grup {0}
 DocType: Healthcare Settings,Patient Registration,Registre de pacients
@@ -4900,6 +4991,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Sales Person
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Pressupost i de centres de cost
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,No es permet el mode de pagament múltiple per defecte
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,per a la
 ,Appointment Analytics,Anàlisi de cites
 DocType: Vehicle Service,Half Yearly,Semestrals
 DocType: Lead,Blog Subscriber,Bloc subscriptor
@@ -4917,7 +5009,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Comte quot
 ,BOM Stock Report,La llista de materials d&#39;Informe
 DocType: Stock Reconciliation Item,Quantity Difference,quantitat Diferència
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Processament de Nòmina
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Processament de Nòmina
 DocType: Opportunity Item,Basic Rate,Tarifa Bàsica
 DocType: GL Entry,Credit Amount,Suma de crèdit
 DocType: Cheque Print Template,Signatory Position,posició signatari
@@ -4931,12 +5023,12 @@
 DocType: Tax Rule,Tax Rule,Regla Fiscal
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Mantenir la mateixa tarifa durant tot el cicle de vendes
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planegi registres de temps fora de les hores de treball Estació de treball.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Els clients en cua
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} no té una fitxa mèdica. Afegiu-lo al mestre de metge
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Els clients en cua
 DocType: Student,Nationality,nacionalitat
 ,Items To Be Requested,Articles que s'han de demanar
-DocType: Purchase Order,Get Last Purchase Rate,Obtenir Darrera Tarifa de compra
 DocType: Company,Company Info,Qui Som
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Seleccionar o afegir nou client
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Seleccionar o afegir nou client
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Centre de cost és requerit per reservar una reclamació de despeses
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicació de Fons (Actius)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Això es basa en la presència d&#39;aquest empleat
@@ -4944,6 +5036,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Compte Dèbit
 DocType: Fiscal Year,Year Start Date,Any Data d'Inici
 DocType: Attendance,Employee Name,Nom de l'Empleat
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Element de l&#39;entrada a la comanda del restaurant
 DocType: Sales Invoice,Rounded Total (Company Currency),Total arrodonit (en la divisa de la companyia)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,No es pot encoberta al grup perquè es selecciona Tipus de compte.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,"{0} {1} ha estat modificat. Si us plau, actualitzia"
@@ -4954,6 +5047,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Beneficis als empleats
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Quantitat embalada ha de ser igual a la quantitat d'articles per {0} a la fila {1}
 DocType: Production Order,Manufactured Qty,Quantitat fabricada
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Factura creada
 DocType: Purchase Receipt Item,Accepted Quantity,Quantitat Acceptada
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},"Si us plau, estableix una llista predeterminada de festa per Empleat {0} o de la seva empresa {1}"
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} no existeix
@@ -4963,18 +5057,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila n {0}: Munto no pot ser major que l&#39;espera Monto al Compte de despeses de {1}. A l&#39;espera de Monto és {2}
 DocType: Maintenance Schedule,Schedule,Horari
 DocType: Account,Parent Account,Compte primària
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Disponible
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Disponible
 DocType: Quality Inspection Reading,Reading 3,Lectura 3
 ,Hub,Cub
 DocType: GL Entry,Voucher Type,Tipus de Vals
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,La llista de preus no existeix o està deshabilitada
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,La llista de preus no existeix o està deshabilitada
 DocType: Lab Test,Approved,Aprovat
 DocType: Pricing Rule,Price,Preu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',Empleat rellevat en {0} ha de ser establert com 'Esquerra'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Empleat rellevat en {0} ha de ser establert com 'Esquerra'
+DocType: Hub Settings,Last Sync On,Última sincronització activada
 DocType: Guardian,Guardian,tutor
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Appraisal {0} creat per Empleat {1} en l'interval de dates determinat
 DocType: Employee,Education,Educació
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,del
 DocType: Selling Settings,Campaign Naming By,Naming de Campanya Per
 DocType: Employee,Current Address Is,L'adreça actual és
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Orientació mensual de vendes (
@@ -4989,7 +5084,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Codi del curs:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Si us plau ingressi Compte de Despeses
 DocType: Account,Stock,Estoc
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Fila # {0}: Tipus de document de referència ha de ser un l&#39;ordre de compra, factura de compra o d&#39;entrada de diari"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Fila # {0}: Tipus de document de referència ha de ser un l&#39;ordre de compra, factura de compra o d&#39;entrada de diari"
 DocType: Employee,Current Address,Adreça actual
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Si l'article és una variant d'un altre article llavors descripció, imatges, preus, impostos etc s'establirà a partir de la plantilla a menys que s'especifiqui explícitament"
 DocType: Serial No,Purchase / Manufacture Details,Compra / Detalls de Fabricació
@@ -5020,7 +5115,7 @@
 DocType: Hub Settings,Hub Settings,Ajustaments Hub
 DocType: Project,Gross Margin %,Marge Brut%
 DocType: BOM,With Operations,Amb Operacions
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Assentaments comptables ja s&#39;han fet en moneda {0} per a la companyia de {1}. Seleccioneu un compte per cobrar o per pagar amb la moneda {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Assentaments comptables ja s&#39;han fet en moneda {0} per a la companyia de {1}. Seleccioneu un compte per cobrar o per pagar amb la moneda {0}.
 DocType: Asset,Is Existing Asset,És existent d&#39;actius
 DocType: Salary Detail,Statistical Component,component estadística
 DocType: Warranty Claim,If different than customer address,Si és diferent de la direcció del client
@@ -5028,13 +5123,14 @@
 DocType: BOM Operation,BOM Operation,BOM Operació
 DocType: Purchase Taxes and Charges,On Previous Row Amount,A limport de la fila anterior
 DocType: Student,Home Address,Adreça de casa
+DocType: Item,Has Expiry Date,Té data de caducitat
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Configuració de la variant de l&#39;element.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,actius transferència
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,actius transferència
 DocType: POS Profile,POS Profile,POS Perfil
 DocType: Training Event,Event Name,Nom de l&#39;esdeveniment
 DocType: Physician,Phone (Office),Telèfon (oficina)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,admissió
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Les admissions per {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,admissió
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Les admissions per {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","L'estacionalitat d'establir pressupostos, objectius, etc."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Nom de la variable
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Article {0} és una plantilla, per favor seleccioni una de les seves variants"
@@ -5043,7 +5139,7 @@
 DocType: Assessment Plan,Room,habitació
 DocType: Purchase Order,Advance Paid,Bestreta pagada
 DocType: Item,Item Tax,Impost d'article
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Materials de Proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Materials de Proveïdor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Impostos Especials Factura
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Llindar {0}% apareix més d&#39;una vegada
 DocType: Expense Claim,Employees Email Id,Empleats Identificació de l'email
@@ -5054,32 +5150,30 @@
 DocType: Program,Program Name,Nom del programa
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Consider Tax or Charge for
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,La quantitat actual és obligatòria
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} té actualment un {1} Quadre de comandament del proveïdor en peu, i les ordres de compra d&#39;aquest proveïdor s&#39;han de fer amb precaució."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} té actualment un {1} Quadre de comandament del proveïdor en peu, i les ordres de compra d&#39;aquest proveïdor s&#39;han de fer amb precaució."
 DocType: Employee Loan,Loan Type,Tipus de préstec
 DocType: Scheduling Tool,Scheduling Tool,Eina de programació
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Targeta De Crèdit
 DocType: BOM,Item to be manufactured or repacked,Article que es fabricarà o embalarà de nou
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Ajustos per defecte per a les transaccions de valors.
-DocType: Purchase Invoice,Next Date,Següent Data
 DocType: Employee Education,Major/Optional Subjects,Major/Optional Subjects
 DocType: Sales Invoice Item,Drop Ship,Nau de la gota
+DocType: Hub Settings,Suspended,Suspès
 DocType: Training Event,Attendees,els assistents
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aquí pot mantenir els detalls de la família com el nom i ocupació dels pares, cònjuge i fills"
 DocType: Academic Term,Term End Date,Termini Data de finalització
-DocType: Hub Settings,Seller Name,Nom del venedor
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impostos i despeses deduïdes (Companyia moneda)
 DocType: Item Group,General Settings,Configuració general
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Des moneda i moneda no pot ser el mateix
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Afegeix instructors
 DocType: Stock Entry,Repack,Torneu a embalar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Has de desar el formulari abans de continuar
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Seleccioneu primer la companyia
 DocType: Item Attribute,Numeric Values,Els valors numèrics
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Adjuntar Logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Els nivells d&#39;existències
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Els nivells d&#39;existències
 DocType: Customer,Commission Rate,Percentatge de comissió
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,S&#39;ha creat {0} quadres de paràgraf per {1} entre:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Fer Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Fer Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquejar sol·licituds d'absències per departament.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Tipus de pagament ha de ser un Rebre, Pagar i Transferència interna"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analítica
@@ -5094,11 +5188,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Capital Social
 DocType: Shopping Cart Settings,Show Public Attachments,Mostra adjunts Públiques
 DocType: Packing Slip,Package Weight Details,Pes del paquet Detalls
+DocType: Restaurant Reservation,Reservation Time,Temps de reserva
 DocType: Payment Gateway Account,Payment Gateway Account,Compte Passarel·la de Pagament
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Després de la realització del pagament redirigir l&#39;usuari a la pàgina seleccionada.
 DocType: Company,Existing Company,companyia existent
 DocType: Healthcare Settings,Result Emailed,Resultat enviat per correu electrònic
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",Categoria impost ha estat canviat a &quot;total&quot; perquè tots els articles són articles no estan en estoc
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Codi d&#39;article&gt; Grup d&#39;elements&gt; Marca
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Seleccioneu un arxiu csv
 DocType: Student Leave Application,Mark as Present,Marcar com a present
 DocType: Supplier Scorecard,Indicator Color,Color indicador
@@ -5123,11 +5219,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Fer lots Estudiant
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Is Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Obtenir elements de la llista de materials
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Obtenir elements de la llista de materials
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Temps de Lliurament Dies
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Fila # {0}: Data de comptabilització ha de ser la mateixa que la data de compra {1} d&#39;actius {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Comprovar això si l&#39;estudiant està residint a l&#39;alberg de l&#39;Institut.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Si us plau, introdueixi les comandes de client a la taula anterior"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Si us plau, introdueixi les comandes de client a la taula anterior"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,No Enviat a salaris relliscades
 ,Stock Summary,Resum de la
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Transferir un actiu d&#39;un magatzem a un altre
@@ -5143,5 +5239,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Fila {0}: seient de dèbit no pot vincular amb un {1}
 DocType: Journal Entry,Subscription Section,Secció de subscripció
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,El compte {0} no existeix
+DocType: Training Event,Training Program,Programa d&#39;entrenament
 DocType: Account,Cash,Efectiu
 DocType: Employee,Short biography for website and other publications.,Breu biografia de la pàgina web i altres publicacions.
diff --git a/erpnext/translations/cs.csv b/erpnext/translations/cs.csv
index fb087c3..bbd251b 100644
--- a/erpnext/translations/cs.csv
+++ b/erpnext/translations/cs.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Mode Plat
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Registrovat
 DocType: Patient,Divorced,Rozvedený
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Položky již synchronizovat
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Povolit položky, které se přidávají vícekrát v transakci"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Materiál Navštivte {0} před zrušením této záruční reklamaci Zrušit
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Spotřební zboží
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Schvalovatelé dovolených
 DocType: Sales Partner,Dealer,Dealer
 DocType: Consultation,Investigations,Vyšetřování
+DocType: Restaurant Order Entry,Click Enter To Add,Klepněte na tlačítko Zadat pro přidání
 DocType: Employee,Rented,Pronajato
 DocType: Purchase Order,PO-,po-
 DocType: POS Profile,Applicable for User,Použitelné pro Uživatele
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zastavil výrobu Objednat nelze zrušit, uvolnit ho nejprve zrušit"
 DocType: Vehicle Service,Mileage,Najeto
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Opravdu chcete zrušit tuto pohledávku?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Opravdu chcete zrušit tuto pohledávku?
 DocType: Drug Prescription,Update Schedule,Aktualizovat plán
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Vybrat Výchozí Dodavatel
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Měna je vyžadováno pro Ceníku {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Zkontrolujte dostupnost
 DocType: Job Applicant,Job Applicant,Job Žadatel
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,To je založeno na transakcích proti tomuto dodavateli. Viz časovou osu níže podrobnosti
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Žádné další výsledky.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Právní
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Aktuální typ daň nemůže být zahrnutý v ceně Položka v řádku {0}
 DocType: Bank Guarantee,Customer,Zákazník
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Exchange Rate musí být stejná jako {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Jméno zákazníka
 DocType: Vehicle,Natural Gas,Zemní plyn
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Bankovní účet nemůže být jmenován jako {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Bankovní účet nemůže být jmenován jako {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (nebo skupiny), proti nimž účetní zápisy jsou vyrobeny a stav je veden."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Vynikající pro {0} nemůže být nižší než nula ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Neprovádějí se žádné předání platů.
 DocType: Manufacturing Settings,Default 10 mins,Výchozí 10 min
 DocType: Leave Type,Leave Type Name,Jméno typu absence
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Ukázat otevřené
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Je nutné tuto akci učinit i dnes pro výše uvedené opakování
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Řada Aktualizováno Úspěšně
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Odhlásit se
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural Zápis do deníku Vložené
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Položky vydané objednávky k přijetí
 DocType: SMS Center,All Supplier Contact,Vše Dodavatel Kontakt
 DocType: Support Settings,Support Settings,Nastavení podpůrných
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,"Očekávané Datum ukončení nemůže být nižší, než se očekávalo data zahájení"
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,"Očekávané Datum ukončení nemůže být nižší, než se očekávalo data zahájení"
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Řádek # {0}: Cena musí být stejné, jako {1}: {2} ({3} / {4})"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,New Leave Application
 ,Batch Item Expiry Status,Batch položky vypršení platnosti Stav
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Bank Návrh
 DocType: Mode of Payment Account,Mode of Payment Account,Způsob platby účtu
 DocType: Consultation,Consultation,Konzultace
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Prodej a výnosy
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Zobrazit Varianty
 DocType: Academic Term,Academic Term,Akademický Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiál
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Péče o zdraví
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Zpoždění s platbou (dny)
 DocType: Lab Prescription,Lab Prescription,Lab Předpis
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Seřadit podle ceny
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Service Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Sériové číslo: {0} je již uvedeno v prodejní faktuře: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Faktura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Sériové číslo: {0} je již uvedeno v prodejní faktuře: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodicita
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskální rok {0} je vyžadována
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrana
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Řádek č. {0}:
 DocType: Timesheet,Total Costing Amount,Celková kalkulace Částka
 DocType: Delivery Note,Vehicle No,Vozidle
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,"Prosím, vyberte Ceník"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,"Prosím, vyberte Ceník"
 DocType: Accounts Settings,Currency Exchange Settings,Nastavení směnného kurzu
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Řádek # {0}: Platba dokument je nutné k dokončení trasaction
 DocType: Production Order Operation,Work In Progress,Na cestě
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,"Prosím, vyberte datum"
 DocType: Employee,Holiday List,Seznam dovolené
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Nastavte prosím systém instruktorů ve škole&gt; Nastavení školy
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Účetní
+DocType: Hub Settings,Selling Price List,Prodejní ceník
 DocType: Patient,Tobacco Current Use,Aktuální tabákové použití
 DocType: Cost Center,Stock User,Sklad Uživatel
 DocType: Company,Phone No,Telefon
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Plány kurzu vytvořil:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Nový {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Nový {0}: # {1}
 ,Sales Partners Commission,Obchodní partneři Komise
 DocType: Purchase Invoice,Rounding Adjustment,Nastavení zaoblení
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Zkratka nesmí mít více než 5 znaků
@@ -124,18 +127,17 @@
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Odkaz: {0}, kód položky: {1} a zákazník: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kg
-DocType: Student Log,Log,Log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Otevření o zaměstnání.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Výsledek byl předložen
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Výsledek byl předložen
 DocType: Item Attribute,Increment,Přírůstek
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Časové rozpětí
-apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Vyberte Warehouse ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Vyberte sklad ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklama
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Stejný Společnost je zapsána více než jednou
 DocType: Patient,Married,Ženatý
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Není dovoleno {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Položka získaná z
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Žádné položky nejsou uvedeny
 DocType: Payment Reconciliation,Reconcile,Srovnat
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Penzijní fondy
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Vedle Odpisy datum nemůže být před zakoupením Datum
 DocType: Consultation,Consultation Date,Datum konzultace
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Výpis produktů a objevy pro uživatele ERPNext
 DocType: SMS Center,All Sales Person,Všichni obchodní zástupci
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Měsíční Distribuce ** umožňuje distribuovat Rozpočet / Target celé měsíce, pokud máte sezónnosti ve vaší firmě."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Nebyl nalezen položek
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Plat Struktura Chybějící
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Nebyl nalezen položek
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Plat Struktura Chybějící
 DocType: Lead,Person Name,Osoba Jméno
 DocType: Sales Invoice Item,Sales Invoice Item,Položka prodejní faktury
 DocType: Account,Credit,Úvěr
 DocType: POS Profile,Write Off Cost Center,Odepsat nákladové středisko
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",například &quot;Základní škola&quot; nebo &quot;univerzita&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",například &quot;Základní škola&quot; nebo &quot;univerzita&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Stock Reports
 DocType: Warehouse,Warehouse Detail,Sklad Detail
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Úvěrový limit byla překročena o zákazníka {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Termínovaný Datum ukončení nemůže být později než v roce Datum ukončení akademického roku, ke kterému termín je spojena (akademický rok {}). Opravte data a zkuste to znovu."
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Je Fixed Asset&quot; nemůže být bez povšimnutí, protože existuje Asset záznam proti položce"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Je Fixed Asset&quot; nemůže být bez povšimnutí, protože existuje Asset záznam proti položce"
 DocType: Vehicle Service,Brake Oil,Brake Oil
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Skupina zákazníků&gt; Území
 DocType: Tax Rule,Tax Type,Daňové Type
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Zdanitelná částka
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Nejste oprávněni přidávat nebo aktualizovat údaje před {0}
 DocType: BOM,Item Image (if not slideshow),Item Image (ne-li slideshow)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Zákazník existuje se stejným názvem
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hodinová sazba / 60) * Skutečný čas operace
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Řádek # {0}: Referenční typ dokumentu musí být jedním z nákladového tvrzení nebo záznamu v deníku
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Vybrat BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Řádek # {0}: Referenční typ dokumentu musí být jedním z nákladového tvrzení nebo záznamu v deníku
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Vybrat BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Náklady na dodávaných výrobků
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Dovolená na {0} není mezi Datum od a do dnešního dne
@@ -195,11 +198,11 @@
 DocType: Journal Entry Account,Employee Loan,zaměstnanec Loan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Aktivita Log:
 DocType: Fee Schedule,Send Payment Request Email,Odeslat e-mail s žádostí o platbu
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Bod {0} neexistuje v systému nebo vypršela
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Bod {0} neexistuje v systému nebo vypršela
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nemovitost
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Výpis z účtu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutické
-DocType: Purchase Invoice Item,Is Fixed Asset,Je dlouhodobého majetku
+DocType: Purchase Invoice Item,Is Fixed Asset,Je dlouhodobý majetek
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +234,"Available qty is {0}, you need {1}","K dispozici je množství {0}, musíte {1}"
 DocType: Expense Claim Detail,Claim Amount,Nárok Částka
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +51,Duplicate customer group found in the cutomer group table,Duplicitní skupinu zákazníků uvedeny v tabulce na knihy zákazníků skupiny
@@ -210,17 +213,22 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Záznam importu
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Vytáhněte Materiál Žádost typu Výroba na základě výše uvedených kritérií
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Úspěšně bylo zrušeno registrace.
 DocType: Training Result Employee,Grade,Školní známka
+DocType: Restaurant Table,No of Seats,Počet sedadel
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Chcete-li přidat dynamický objekt, použijte jinja tagy jako <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Dodává se podle dodavatele
 DocType: SMS Center,All Contact,Vše Kontakt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Výrobní zakázka již vytvořili u všech položek s BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Výrobní zakázka již vytvořili u všech položek s BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Roční Plat
 DocType: Daily Work Summary,Daily Work Summary,Denní práce Souhrn
 DocType: Period Closing Voucher,Closing Fiscal Year,Uzavření fiskálního roku
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} je zmrazený
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Vyberte existující společnosti pro vytváření účtový rozvrh
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} je zmrazený
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Vyberte existující společnosti pro vytváření účtový rozvrh
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Stock Náklady
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Vyberte objekt Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Vyberte objekt Target Warehouse
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Prosím, zadejte Preferred Kontakt e-mail"
 DocType: Program Enrollment,School Bus,Školní autobus
 DocType: Journal Entry,Contra Entry,Contra Entry
@@ -238,9 +246,10 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Stáhněte si šablony, vyplňte potřebné údaje a přiložte upravený soubor.
  Všechny termíny a zaměstnanec kombinaci ve zvoleném období přijde v šabloně, se stávajícími evidence docházky"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,"Bod {0} není aktivní, nebo byl dosažen konec života"
+DocType: Student Admission Program,Minimum Age,Minimální věk
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Příklad: Základní Mathematics
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Nastavení pro HR modul
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Nastavení pro HR modul
 DocType: SMS Center,SMS Center,SMS centrum
 DocType: Sales Invoice,Change Amount,změna Částka
 DocType: BOM Update Tool,New BOM,Nový BOM
@@ -250,7 +259,7 @@
 DocType: Lead,Request Type,Typ požadavku
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Udělat zaměstnance
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Vysílání
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Přidat pokoje
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Režim nastavení POS (Online / Offline)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Provedení
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Podrobnosti o prováděných operací.
 DocType: Serial No,Maintenance Status,Status Maintenance
@@ -273,6 +282,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Ceník musí být použitelný pro nákup nebo prodej
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Datum Instalace nemůže být před datem dodání pro bod {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Sleva na Ceník Rate (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Biochemie
 DocType: Offer Letter,Select Terms and Conditions,Vyberte Podmínky
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,limitu
 DocType: Production Planning Tool,Sales Orders,Prodejní objednávky
@@ -307,15 +317,15 @@
 DocType: Sales Partner,Reseller,Reseller
 DocType: Codification Table,Medical Code,Lékařský zákoník
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Zda zaškrtnuto, zahrne neskladové položky v požadavcích materiálu."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,"Prosím, zadejte společnost"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,"Prosím, zadejte společnost"
 DocType: Delivery Note Item,Against Sales Invoice Item,Proti položce vydané faktury
 ,Production Orders in Progress,Zakázka na výrobu v Progress
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Čistý peněžní tok z financování
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","Místní úložiště je plná, nezachránil"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","Místní úložiště je plná, nezachránil"
 DocType: Lead,Address & Contact,Adresa a kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Přidat nevyužité listy z předchozích přídělů
 DocType: Sales Partner,Partner website,webové stránky Partner
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Přidat položku
+DocType: Restaurant Order Entry,Add Item,Přidat položku
 DocType: Lab Test,Custom Result,Vlastní výsledek
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Kontakt Jméno
 DocType: Course Assessment Criteria,Course Assessment Criteria,Hodnotící kritéria hřiště
@@ -328,7 +338,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Žádost o koupi.
 DocType: Lab Test,Submitted Date,Datum odeslání
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,To je založeno na časových výkazů vytvořených proti tomuto projektu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Čistý Pay nemůže být nižší než 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Čistý Pay nemůže být nižší než 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Chcete-li zastavit odesílání upozornění na opakované chyby ze systému, jsme v odběru zkontrolovali pole Zakázáno"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Pouze vybraný Leave schvalovač může podat této dovolené aplikaci
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Uvolnění Datum musí být větší než Datum spojování
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Dovolených za rok
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,Ztráta zisku
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Litr
 DocType: Task,Total Costing Amount (via Time Sheet),Celková kalkulace Částka (přes Time Sheet)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,"Prosím, nastavte studenty pod studentskými skupinami"
 DocType: Item Website Specification,Item Website Specification,Položka webových stránek Specifikace
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Absence blokována
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,bankovní Příspěvky
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Roční
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Reklamní Odsouhlasení Item
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Creation Tool hřiště
 DocType: Lead,Do Not Contact,Nekontaktujte
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,"Lidé, kteří vyučují ve vaší organizaci"
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Unikátní ID pro sledování všech opakující faktury. To je generován na odeslat.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimální objednávka Množství
 DocType: Pricing Rule,Supplier Type,Dodavatel Type
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,Publikovat v Hub
 DocType: Student Admission,Student Admission,Student Vstupné
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Položka {0} je zrušen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Požadavek na materiál
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Položka {0} je zrušen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Požadavek na materiál
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizace Výprodej Datum
 DocType: Item,Purchase Details,Nákup Podrobnosti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Položka {0} nebyl nalezen v &quot;suroviny dodané&quot; tabulky v objednávce {1}
 DocType: Patient Relation,Relation,Vztah
 DocType: Shipping Rule,Worldwide Shipping,Celosvětově doprava
 DocType: Patient Relation,Mother,Matka
+DocType: Restaurant Reservation,Reservation End Time,Doba ukončení rezervace
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Potvrzené objednávky od zákazníků.
 DocType: Purchase Receipt Item,Rejected Quantity,Odmíntnuté množství
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Byla vytvořena žádost o platbu {0}
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Byla vytvořena žádost o platbu {0}
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Nízká citlivost
 DocType: Notification Control,Notification Control,Oznámení Control
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Potvrďte prosím po dokončení školení
 DocType: Lead,Suggestions,Návrhy
@@ -388,7 +401,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,"E-maily výplatní pásce, aby zaměstnanci na základě přednostního e-mailu vybraného v zaměstnaneckých"
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,První Leave schvalovač v seznamu bude nastaven jako výchozí Leave schvalujícího
 DocType: Tax Rule,Shipping County,vodní doprava County
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Učit se
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Učit se
 DocType: Asset,Next Depreciation Date,Vedle Odpisy Datum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Náklady na činnost na jednoho zaměstnance
 DocType: Accounts Settings,Settings for Accounts,Nastavení účtů
@@ -399,13 +412,13 @@
 DocType: Item,Synced With Hub,Synchronizovány Hub
 DocType: Vehicle,Fleet Manager,Fleet manager
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Řádek # {0}: {1} nemůže být negativní na položku {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Špatné Heslo
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Špatné Heslo
 DocType: Item,Variant Of,Varianta
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"Dokončené množství nemůže být větší než ""Množství do výroby"""
 DocType: Period Closing Voucher,Closing Account Head,Závěrečný účet hlava
 DocType: Employee,External Work History,Vnější práce History
 DocType: Physician,Time per Appointment,Čas na jednu schůzku
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Kruhové Referenční Chyba
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Kruhové Referenční Chyba
 DocType: Appointment Type,Is Inpatient,Je hospitalizován
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Jméno Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Ve slovech (export) budou viditelné, jakmile uložíte doručení poznámku."
@@ -414,19 +427,18 @@
 DocType: Lead,Industry,Průmysl
 DocType: Employee,Job Profile,Job Profile
 DocType: BOM Item,Rate & Amount,Cena a částka
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosím, nastavte číselnou sérii pro Účast přes Nastavení&gt; Číslovací série"
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Toto je založeno na transakcích proti této společnosti. Více informací naleznete v časové ose níže
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Upozornit e-mailem na tvorbu automatických Materiál Poptávka
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Odolný
 DocType: Journal Entry,Multi Currency,Více měn
 DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktury
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Skupina zákazníků&gt; Území
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Dodací list
 DocType: Consultation,Encounter Impression,Setkání s impresi
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Nastavení Daně
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Náklady prodaných aktiv
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,"Vstup Platba byla změněna poté, co ji vytáhl. Prosím, vytáhněte ji znovu."
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} vloženo dvakrát v Daňové Položce
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Shrnutí pro tento týden a probíhajícím činnostem
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} vloženo dvakrát v Daňové Položce
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Shrnutí pro tento týden a probíhajícím činnostem
 DocType: Student Applicant,Admitted,"připustil,"
 DocType: Workstation,Rent Cost,Rent Cost
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Částka po odpisech
@@ -440,36 +452,35 @@
 DocType: Shipping Rule,Valid for Countries,"Platí pro země,"
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Tento bod je šablona a nemůže být použit v transakcích. Atributy položky budou zkopírovány do variant, pokud je nastaveno ""No Copy"""
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Celková objednávka Zvážil
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Označení zaměstnanců (např CEO, ředitel atd.)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Označení zaměstnanců (např CEO, ředitel atd.)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Sazba, za kterou je měna zákazníka převedena na základní měnu zákazníka"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Samozřejmě Plánování Tool
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Řádek # {0}: faktury nelze provést vůči stávajícímu aktivu {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Urgentní] Chyba při vytváření opakujících se% s pro% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Urgentní] Chyba při vytváření opakujících se% s pro% s
 DocType: Item Tax,Tax Rate,Tax Rate
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} již přidělené pro zaměstnance {1} na dobu {2} až {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Select Položka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Select Položka
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"Row # {0}: Batch No musí být stejné, jako {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Převést na non-Group
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Šarže položky.
 DocType: C-Form Invoice Detail,Invoice Date,Datum Fakturace
 DocType: GL Entry,Debit Amount,Debetní Částka
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Tam může být pouze 1 účet na společnosti v {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,"Prosím, viz příloha"
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Tam může být pouze 1 účet na společnosti v {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,"Prosím, viz příloha"
 DocType: Purchase Order,% Received,% Přijaté
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Vytvoření skupiny studentů
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Setup již dokončen !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Setup již dokončen !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Částka kreditní poznámky
 DocType: Setup Progress Action,Action Document,Akční dokument
 ,Finished Goods,Hotové zboží
 DocType: Delivery Note,Instructions,Instrukce
 DocType: Quality Inspection,Inspected By,Zkontrolován
 DocType: Maintenance Visit,Maintenance Type,Typ Maintenance
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} není zařazen do kurzu {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položek&gt; Značka
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} není zařazen do kurzu {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Pořadové číslo {0} není součástí dodávky Poznámka: {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Přidat položky
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Přidat položky
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Položka Kontrola jakosti Parametr
 DocType: Leave Application,Leave Approver Name,Jméno schvalovatele dovolené
 DocType: Depreciation Schedule,Schedule Date,Plán Datum
@@ -489,7 +500,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Pracovní doba
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Změnit výchozí / aktuální pořadové číslo existujícího série.
 DocType: Dosage Strength,Strength,Síla
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Vytvořit nový zákazník
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Vytvořit nový zákazník
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Je-li více pravidla pro tvorbu cen i nadále přednost, jsou uživatelé vyzváni k nastavení priority pro vyřešení konfliktu."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Vytvoření objednávek
 ,Purchase Register,Nákup Register
@@ -508,7 +519,7 @@
 DocType: Lab Test Template,Single,Jednolůžkový
 DocType: Salary Slip,Total Loan Repayment,Celková splátky
 DocType: Account,Cost of Goods Sold,Náklady na prodej zboží
-DocType: Purchase Invoice,Yearly,Ročně
+DocType: Subscription,Yearly,Ročně
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,"Prosím, zadejte nákladové středisko"
 DocType: Drug Prescription,Dosage,Dávkování
 DocType: Journal Entry Account,Sales Order,Prodejní objednávky
@@ -538,7 +549,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globální nastavení pro všechny výrobní procesy.
 DocType: Accounts Settings,Accounts Frozen Upto,Účty Frozen aľ
 DocType: SMS Log,Sent On,Poslán na
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Atribut {0} vybraný několikrát v atributech tabulce
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Atribut {0} vybraný několikrát v atributech tabulce
 DocType: HR Settings,Employee record is created using selected field. ,Záznam Zaměstnanec je vytvořena pomocí vybrané pole.
 DocType: Sales Order,Not Applicable,Nehodí se
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday master.
@@ -563,13 +574,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Celkem listy přidělené je povinné
 DocType: Patient,AB Positive,AB pozitivní
 DocType: Job Opening,Description of a Job Opening,Popis jednoho volných pozic
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Nevyřízené aktivity pro dnešek
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Nevyřízené aktivity pro dnešek
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Účast rekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Plat komponent pro mzdy časového rozvrhu.
 DocType: Sales Order Item,Used for Production Plan,Používá se pro výrobní plán
 DocType: Employee Loan,Total Payment,Celková platba
 DocType: Manufacturing Settings,Time Between Operations (in mins),Doba mezi operací (v min)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,"{0} {1} je zrušena, takže akce nemůže být dokončena"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,"{0} {1} je zrušena, takže akce nemůže být dokončena"
 DocType: Customer,Buyer of Goods and Services.,Kupující zboží a služeb.
 DocType: Journal Entry,Accounts Payable,Účty za úplatu
 DocType: Patient,Allergies,Alergie
@@ -581,22 +592,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Upozornění na nákupní objednávky
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Seznam několik svých zákazníků. Ty by mohly být organizace nebo jednotlivci.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Dost Části vybudovat
+DocType: POS Profile User,POS Profile User,Uživatel profilu POS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Přímý příjmů
 DocType: Patient Appointment,Date TIme,Čas schůzky
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Nelze filtrovat na základě účtu, pokud seskupeny podle účtu"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Správní ředitel
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Vyberte možnost Kurz
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Vyberte možnost Kurz
 DocType: Codification Table,Codification Table,Kodifikační tabulka
 DocType: Timesheet Detail,Hrs,hod
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,"Prosím, vyberte Company"
 DocType: Stock Entry Detail,Difference Account,Rozdíl účtu
 DocType: Purchase Invoice,Supplier GSTIN,Dodavatel GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Nelze zavřít úkol, jak jeho závislý úkol {0} není uzavřen."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,"Prosím, zadejte sklad, který bude materiál žádosti předložené"
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Nelze zavřít úkol, jak jeho závislý úkol {0} není uzavřen."
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Prosím, zadejte sklad, který bude materiál žádosti předložené"
 DocType: Production Order,Additional Operating Cost,Další provozní náklady
 DocType: Lab Test Template,Lab Routine,Lab Rutine
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
 DocType: Shipping Rule,Net Weight,Hmotnost
 DocType: Employee,Emergency Phone,Nouzový telefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Koupit
@@ -606,7 +618,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Zadejte prosím stupeň pro Threshold 0%
 DocType: Sales Order,To Deliver,Dodat
 DocType: Purchase Invoice Item,Item,Položka
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Sériové žádná položka nemůže být zlomkem
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Vysoká citlivost
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Sériové žádná položka nemůže být zlomkem
 DocType: Journal Entry,Difference (Dr - Cr),Rozdíl (Dr - Cr)
 DocType: Account,Profit and Loss,Zisky a ztráty
 DocType: Patient,Risk Factors,Rizikové faktory
@@ -615,7 +628,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Správa Subdodávky
 DocType: Vital Signs,Body Temperature,Tělesná teplota
 DocType: Project,Project will be accessible on the website to these users,Projekt bude k dispozici na webových stránkách k těmto uživatelům
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Definujte typ projektu.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Definujte typ projektu.
 DocType: Supplier Scorecard,Weighting Function,Funkce vážení
 DocType: Physician,OP Consulting Charge,Konzultační poplatek OP
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Nastavte si
@@ -629,7 +642,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Přírůstek nemůže být 0
 DocType: Production Planning Tool,Material Requirement,Požadavek materiálu
 DocType: Company,Delete Company Transactions,Smazat transakcí Company
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Referenční číslo a referenční datum je povinný pro bankovní transakce
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Referenční číslo a referenční datum je povinný pro bankovní transakce
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Přidat / Upravit daní a poplatků
 DocType: Payment Entry Reference,Supplier Invoice No,Dodavatelské faktury č
 DocType: Territory,For reference,Pro srovnání
@@ -637,12 +650,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Nelze odstranit Pořadové číslo {0}, který se používá na skladě transakcích"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Uzavření (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Ahoj
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Přemístit položku
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Přemístit položku
 DocType: Serial No,Warranty Period (Days),Záruční doba (dny)
 DocType: Installation Note Item,Installation Note Item,Poznámka k instalaci bod
 DocType: Production Plan Item,Pending Qty,Čekající Množství
 DocType: Budget,Ignore,Ignorovat
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} není aktivní
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} není aktivní
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Zkontrolujte nastavení rozměry pro tisk
 DocType: Salary Slip,Salary Slip Timesheet,Plat Slip časový rozvrh
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dodavatel Warehouse povinné pro subdodavatelskou doklad o zakoupení
@@ -651,7 +664,7 @@
 DocType: Pricing Rule,Sales Partner,Sales Partner
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Všechna hodnocení dodavatelů.
 DocType: Buying Settings,Purchase Receipt Required,Příjmka je vyžadována
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Ocenění Rate je povinné, pokud zadaná počátečním stavem zásob"
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,"Cena je povinná, pokud je zadán počáteční stav zásob"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nalezené v tabulce faktury Žádné záznamy
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Vyberte první společnost a Party Typ
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Finanční / Účetní rok.
@@ -680,7 +693,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Poznámka: Celkový počet alokovaných listy {0} by neměla být menší než které již byly schváleny listy {1} pro období
 ,Total Stock Summary,Shrnutí souhrnného stavu
 DocType: Announcement,Posted By,Přidal
-DocType: Item,Delivered by Supplier (Drop Ship),Dodává Dodavatelem (Drop Ship)
+DocType: Item,Delivered by Supplier (Drop Ship),Dodáváno dodavatelem (Drop Ship)
 DocType: Healthcare Settings,Confirmation Message,Potvrzovací zpráva
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Databáze potenciálních zákazníků.
 DocType: Authorization Rule,Customer or Item,Zákazník nebo položka
@@ -688,7 +701,7 @@
 DocType: Quotation,Quotation To,Nabídka k
 DocType: Lead,Middle Income,Středními příjmy
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Otvor (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Výchozí měrná jednotka bodu {0} nemůže být změněna přímo, protože jste už nějaké transakce (y) s jiným nerozpuštěných. Budete muset vytvořit novou položku použít jiný výchozí UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Výchozí měrná jednotka bodu {0} nemůže být změněna přímo, protože jste už nějaké transakce (y) s jiným nerozpuštěných. Budete muset vytvořit novou položku použít jiný výchozí UOM."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Přidělená částka nemůže být záporná
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Nastavte společnost
 DocType: Purchase Order Item,Billed Amt,Účtovaného Amt
@@ -702,6 +715,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,"Vybrat Platební účet, aby Bank Entry"
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Vytvořit Zaměstnanecké záznamy pro správu listy, prohlášení o výdajích a mezd"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Předepsaná doba
+DocType: Restaurant Reservation,Restaurant Reservation,Rezervace restaurace
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Návrh Psaní
 DocType: Payment Entry Deduction,Payment Entry Deduction,Platba Vstup dedukce
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Další prodeje osoba {0} existuje se stejným id zaměstnance
@@ -709,7 +723,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Masters
 DocType: Assessment Plan,Maximum Assessment Score,Maximální skóre Assessment
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Transakční Data aktualizace Bank
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Time Tracking
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Time Tracking
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,DUPLIKÁT PRO TRANSPORTER
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskální rok Společnosti
 DocType: Packing Slip Item,DN Detail,DN Detail
@@ -717,8 +731,9 @@
 DocType: Timesheet,Billed,Fakturováno
 DocType: Batch,Batch Description,Popis Šarže
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Vytváření studentských skupin
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Platební brána účet nevytvořili, prosím, vytvořte ručně."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Platební brána účet nevytvořili, prosím, vytvořte ručně."
 DocType: Supplier Scorecard,Per Year,Za rok
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Není způsobilý pro přijetí do tohoto programu podle DOB
 DocType: Sales Invoice,Sales Taxes and Charges,Prodej Daně a poplatky
 DocType: Employee,Organization Profile,Profil organizace
 DocType: Vital Signs,Height (In Meter),Výška (v metru)
@@ -754,7 +769,7 @@
 DocType: Student Batch Name,Batch Name,Batch Name
 DocType: Fee Validity,Max number of visit,Maximální počet návštěv
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Časového rozvrhu vytvoření:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,Zapsat
 DocType: GST Settings,GST Settings,Nastavení GST
 DocType: Selling Settings,Customer Naming By,Zákazník Pojmenování By
@@ -786,15 +801,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Přistál nákladů daně a poplatky
 DocType: Production Order Operation,Actual Start Time,Skutečný čas začátku
 DocType: BOM Operation,Operation Time,Čas operace
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Dokončit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Dokončit
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Báze
 DocType: Timesheet,Total Billed Hours,Celkem Předepsané Hodiny
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Odepsat Částka
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Odepsat Částka
 DocType: Leave Block List Allow,Allow User,Umožňuje uživateli
 DocType: Journal Entry,Bill No,Bill No
 DocType: Company,Gain/Loss Account on Asset Disposal,Zisk / ztráty na majetku likvidaci
 DocType: Vehicle Log,Service Details,Podrobnosti o službě
-DocType: Purchase Invoice,Quarterly,Čtvrtletně
+DocType: Subscription,Quarterly,Čtvrtletně
 DocType: Lab Test Template,Grouped,Skupinové
 DocType: Selling Settings,Delivery Note Required,Delivery Note Povinné
 DocType: Bank Guarantee,Bank Guarantee Number,Číslo bankovní záruky
@@ -803,12 +818,12 @@
 DocType: Student Attendance,Student Attendance,Student Účast
 DocType: Sales Invoice Timesheet,Time Sheet,Rozvrh hodin
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Se zpětným suroviny na základě
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,"Prosím, zadejte podrobnosti položky"
 DocType: Interest,Interest,Zajímat
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Předprodej
 DocType: Purchase Receipt,Other Details,Další podrobnosti
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Lab Test,Test Template,Testovací šablona
+DocType: Restaurant Order Entry Item,Served,Podával
 DocType: Account,Accounts,Účty
 DocType: Vehicle,Odometer Value (Last),Údaj měřiče ujeté vzdálenosti (Last)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Šablony kritérií kritérií pro dodavatele.
@@ -820,25 +835,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Preview výplatní pásce
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Účet {0} byl zadán vícekrát
 DocType: Account,Expenses Included In Valuation,Náklady ceně oceňování
-DocType: Hub Settings,Seller City,Prodejce City
 ,Absent Student Report,Absent Student Report
 DocType: Email Digest,Next email will be sent on:,Další e-mail bude odeslán dne:
 DocType: Offer Letter Term,Offer Letter Term,Nabídka Letter Term
 DocType: Supplier Scorecard,Per Week,Za týden
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Položka má varianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Položka má varianty.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Celkový počet studentů
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Položka {0} nebyl nalezen
 DocType: Bin,Stock Value,Reklamní Value
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,V pozadí budou vytvořeny záznamy o poplatcích. V případě jakékoliv chyby bude chybová zpráva aktualizována v rozvrhu.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Společnost {0} neexistuje
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} má platnost až do {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} má platnost až do {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Tree Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Množství spotřebované na jednotku
 DocType: Serial No,Warranty Expiry Date,Záruka Datum vypršení platnosti
 DocType: Material Request Item,Quantity and Warehouse,Množství a sklad
+DocType: Hub Settings,Unregister,Zrušit registraci
 DocType: Sales Invoice,Commission Rate (%),Výše provize (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Vyberte prosím Program
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Vyberte prosím Program
 DocType: Project,Estimated Cost,Odhadované náklady
 DocType: Purchase Order,Link to material requests,Odkaz na materiálních požadavků
+DocType: Hub Settings,Publish,Publikovat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
 DocType: Journal Entry,Credit Card Entry,Vstup Kreditní karta
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Společnost a účty
@@ -849,13 +866,12 @@
 DocType: Selling Settings,Close Opportunity After Days,V blízkosti Příležitost po několika dnech
 ,Reserved,Rezervováno
 DocType: Purchase Order,Supply Raw Materials,Dodávek surovin
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Datum, kdy bude vygenerován příští faktury. To je generován na odeslat."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Oběžná aktiva
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} není skladová položka
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',Podělte se o své připomínky k tréninku kliknutím na &quot;Tréninkové připomínky&quot; a poté na &quot;Nové&quot;
 DocType: Mode of Payment Account,Default Account,Výchozí účet
 DocType: Payment Entry,Received Amount (Company Currency),Přijaté Částka (Company měna)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,Lead musí být nastaven pokud je Příležitost vyrobena z leadu
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,Lead musí být nastaven pokud je Příležitost vyrobena z leadu
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Prosím, vyberte týdenní off den"
 DocType: Patient,O Negative,O Negativní
 DocType: Production Order Operation,Planned End Time,Plánované End Time
@@ -871,10 +887,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Příležitost Z
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Měsíční plat prohlášení.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Přidat společnost
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Řádek {0}: {1} Sériová čísla vyžadovaná pro položku {2}. Poskytli jste {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Řádek {0}: {1} Sériová čísla vyžadovaná pro položku {2}. Poskytli jste {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Vyberte prosím tabulku
 DocType: BOM,Website Specifications,Webových stránek Specifikace
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} je neplatná e-mailová adresa v adresáři &quot;Příjemci&quot;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} je neplatná e-mailová adresa v adresáři &quot;Příjemci&quot;
 DocType: Special Test Items,Particulars,Podrobnosti
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiotikum.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Od {0} typu {1}
@@ -882,11 +898,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
 DocType: Employee,A+,A+
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Více Cena pravidla existuje u stejných kritérií, prosím vyřešit konflikt tím, že přiřadí prioritu. Cena Pravidla: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nelze deaktivovat nebo zrušit BOM, jak to souvisí s ostatními kusovníky"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nelze deaktivovat nebo zrušit BOM, jak to souvisí s ostatními kusovníky"
 DocType: Opportunity,Maintenance,Údržba
 DocType: Item Attribute Value,Item Attribute Value,Položka Hodnota atributu
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Prodej kampaně.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Udělat TimeSheet
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Udělat TimeSheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -943,12 +959,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,"Prosím, nejdřív zadejte položku"
 DocType: Account,Liability,Odpovědnost
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionována Částka nemůže být větší než reklamace Částka v řádku {0}.
+DocType: Salary Detail,Do not include in total,Nezahrnujte celkem
 DocType: Company,Default Cost of Goods Sold Account,Výchozí Náklady na prodané zboží účtu
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Ceník není zvolen
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Ceník není zvolen
 DocType: Employee,Family Background,Rodinné poměry
 DocType: Request for Quotation Supplier,Send Email,Odeslat email
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Varování: Neplatná Příloha {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Nemáte oprávnění
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Varování: Neplatná Příloha {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Nemáte oprávnění
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Požadovaná citace
 DocType: Vital Signs,Heart Rate / Pulse,Srdeční frekvence / puls
 DocType: Company,Default Bank Account,Výchozí Bankovní účet
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Chcete-li filtrovat na základě Party, vyberte typ Party první"
@@ -975,12 +993,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Položka Row {idx}: {typ_dokumentu} {} DOCNAME neexistuje v předchozím &#39;{typ_dokumentu}&#39; tabulka
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Časového rozvrhu {0} je již dokončena nebo zrušena
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,žádné úkoly
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den měsíce, ve kterém auto faktura bude generován například 05, 28 atd"
 DocType: Item Variant Settings,Copy Fields to Variant,Kopírování polí na variantu
 DocType: Asset,Opening Accumulated Depreciation,Otevření Oprávky
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Skóre musí být menší než nebo rovna 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Tool zápis
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C-Form záznamy
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C-Form záznamy
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Zákazník a Dodavatel
 DocType: Email Digest,Email Digest Settings,Nastavení e-mailu Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Děkuji za Váš obchod!
@@ -998,13 +1015,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Citace Stav
 DocType: Maintenance Visit,Completion Status,Dokončení Status
 DocType: HR Settings,Enter retirement age in years,Zadejte věk odchodu do důchodu v letech
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Warehouse
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Vyberte prosím sklad
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Target Warehouse
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Vyberte prosím sklad
 DocType: Cheque Print Template,Starting location from left edge,Počínaje umístění od levého okraje
 DocType: Item,Allow over delivery or receipt upto this percent,Nechte přes dodávku nebo příjem aľ tohoto procenta
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Importovat Docházku
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Všechny skupiny položek
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Všechny skupiny položek
 DocType: Process Payroll,Activity Log,Aktivita Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Čistý zisk / ztráta
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automaticky napsat vzkaz na předkládání transakcí.
@@ -1016,7 +1033,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Předpokládané množství
 DocType: Sales Invoice,Payment Due Date,Splatno dne
 DocType: Drug Prescription,Interval UOM,Interval UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Bod Variant {0} již existuje se stejnými vlastnostmi
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Bod Variant {0} již existuje se stejnými vlastnostmi
+DocType: Item,Hub Publishing Details,Podrobnosti o publikování Hubu
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&quot;Otevření&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Otevřená dělat
 DocType: Notification Control,Delivery Note Message,Delivery Note Message
@@ -1030,16 +1048,17 @@
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Částka k Fakturaci
 DocType: Company,Registration Details,Registrace Podrobnosti
 DocType: Timesheet,Total Billed Amount,Celková částka Fakturovaný
-DocType: Item Reorder,Re-Order Qty,Re-Order Množství
+DocType: Item Reorder,Re-Order Qty,Objednané množství při znovuobjednání
 DocType: Leave Block List Date,Leave Block List Date,Nechte Block List Datum
 DocType: Pricing Rule,Price or Discount,Cena nebo Sleva
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: Surovina nemůže být stejná jako hlavní položka
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Celkový počet použitelných poplatcích v dokladu o koupi zboží, které tabulky musí být stejná jako celkem daní a poplatků"
 DocType: Sales Team,Incentives,Pobídky
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Zaregistrujte se do Hubu
 DocType: SMS Log,Requested Numbers,Požadované Čísla
 DocType: Production Planning Tool,Only Obtain Raw Materials,Vypsat pouze slkadový materiál
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Hodnocení výkonu.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Povolení &quot;použití pro nákupního košíku&quot;, jak je povoleno Nákupní košík a tam by měla být alespoň jedna daňová pravidla pro Košík"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Povolení &quot;použití pro nákupního košíku&quot;, jak je povoleno Nákupní košík a tam by měla být alespoň jedna daňová pravidla pro Košík"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Platba Vstup {0} je propojen na objednávku {1}, zkontrolujte, zda by měl být tažen za pokrok v této faktuře."
 DocType: Sales Invoice Item,Stock Details,Sklad Podrobnosti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Hodnota projektu
@@ -1058,12 +1077,14 @@
 DocType: Salary Slip,Working Days,Pracovní dny
 DocType: Serial No,Incoming Rate,Příchozí Rate
 DocType: Packing Slip,Gross Weight,Hrubá hmotnost
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,"Název vaší společnosti, pro kterou nastavení tohoto systému."
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Povolit Hub
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,"Název vaší společnosti, pro kterou nastavení tohoto systému."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Zahrnout dovolenou v celkovém. pracovních dní
 DocType: Job Applicant,Hold,Držet
 DocType: Employee,Date of Joining,Datum přistoupení
 DocType: Naming Series,Update Series,Řada Aktualizace
 DocType: Supplier Quotation,Is Subcontracted,Subdodavatelům
+DocType: Restaurant Table,Minimum Seating,Minimální počet sedadel
 DocType: Item Attribute,Item Attribute Values,Položka Hodnoty atributů
 DocType: Examination Result,Examination Result,vyšetření Výsledek
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Příjemka
@@ -1074,13 +1095,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Nelze najít časový úsek v příštích {0} dní k provozu {1}
 DocType: Production Order,Plan material for sub-assemblies,Plán materiál pro podsestavy
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Obchodní partneři a teritoria
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} musí být aktivní
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} musí být aktivní
 DocType: Journal Entry,Depreciation Entry,odpisy Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Vyberte první typ dokumentu
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Zrušit Materiál Návštěvy {0} před zrušením tohoto návštěv údržby
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Pořadové číslo {0} nepatří k bodu {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Požadované množství
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Sklady se stávajícími transakce nelze převést na knihy.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Sklady se stávajícími transakce nelze převést na knihy.
 DocType: Bank Reconciliation,Total Amount,Celková částka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Prescription Duration,Number,Číslo
@@ -1091,7 +1112,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Prodejní ceník
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Pokud je zaškrtnuto, vytvoří se zákazník, mapovaný na pacienta. Faktury pacientů budou vytvořeny proti tomuto zákazníkovi. Při vytváření pacienta můžete také vybrat existujícího zákazníka."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publikování synchronizovat položky
 DocType: Bank Reconciliation,Account Currency,Měna účtu
 DocType: Lab Test,Sample ID,ID vzorku
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,"Prosím, uveďte zaokrouhlit účet v společnosti"
@@ -1100,11 +1120,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Zaměstnanec {0} není aktivní nebo neexistuje
 DocType: Fee Structure,Components,Komponenty
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},"Prosím, zadejte Kategorie majetku v položce {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Bod Varianty {0} aktualizováno
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Bod Varianty {0} aktualizováno
 DocType: Quality Inspection Reading,Reading 6,Čtení 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Nelze {0} {1} {2} bez negativních vynikající faktura
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","generovat. Pokud je opožděno, musíte ručně změnit pole &quot;Opakovat v den měsíce&quot;"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Nelze {0} {1} {2} bez negativních vynikající faktura
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Záloha přijaté faktury
-DocType: Hub Settings,Sync Now,Sync teď
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit záznam nemůže být spojována s {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Definovat rozpočet pro finanční rok.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Výchozí účet Bank / Cash budou automaticky aktualizovány v POS faktury, pokud je zvolen tento režim."
@@ -1116,13 +1137,13 @@
 DocType: Item,Is Purchase Item,je Nákupní Položka
 DocType: Asset,Purchase Invoice,Přijatá faktura
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail No
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Nová prodejní faktura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Nová prodejní faktura
 DocType: Stock Entry,Total Outgoing Value,Celková hodnota Odchozí
 DocType: Physician,Appointments,Setkání
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Datum zahájení a datem ukončení by mělo být v rámci stejného fiskální rok
 DocType: Lead,Request for Information,Žádost o informace
 ,LeaderBoard,LeaderBoard
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Sync Offline Faktury
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Sync Offline Faktury
 DocType: Payment Request,Paid,Placený
 DocType: Program Fee,Program Fee,Program Fee
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1141,11 +1162,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Položka vydané objednávky
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Nepřímé příjmy
 DocType: Student Attendance Tool,Student Attendance Tool,Student Účast Tool
+DocType: Restaurant Menu,Price List (Auto created),Ceník (vytvořeno automaticky)
 DocType: Cheque Print Template,Date Settings,Datum Nastavení
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Odchylka
 ,Company Name,Název společnosti
 DocType: SMS Center,Total Message(s),Celkem zpráv (y)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Vybrat položku pro převod
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Vybrat položku pro převod
 DocType: Purchase Invoice,Additional Discount Percentage,Další slevy Procento
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Zobrazit seznam všech nápovědy videí
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vyberte účet šéf banky, kde byla uložena kontrola."
@@ -1162,6 +1184,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Metr
 DocType: Workstation,Electricity Cost,Cena elektřiny
 DocType: HR Settings,Don't send Employee Birthday Reminders,Neposílejte zaměstnance připomenutí narozenin
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Uložit nastavení
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Požadované produkty
 DocType: Item,Inspection Criteria,Inspekční Kritéria
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Převedené
 DocType: BOM Website Item,BOM Website Item,BOM Website Item
@@ -1178,11 +1202,11 @@
 DocType: Journal Entry,Total Amount in Words,Celková částka slovy
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Došlo k chybě. Jedním z důvodů by mohlo být pravděpodobné, že jste uložili formulář. Obraťte se prosím na support@erpnext.com Pokud problém přetrvává."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Můj košík
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Typ objednávky musí být jedním z {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Typ objednávky musí být jedním z {0}
 DocType: Lead,Next Contact Date,Další Kontakt Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Otevření POČET
 DocType: Healthcare Settings,Appointment Reminder,Připomenutí pro jmenování
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,"Prosím, zadejte účet pro změnu Částka"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,"Prosím, zadejte účet pro změnu Částka"
 DocType: Student Batch Name,Student Batch Name,Student Batch Name
 DocType: Consultation,Doctor,Doktor
 DocType: Holiday List,Holiday List Name,Název seznamu dovolené
@@ -1190,12 +1214,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,rozvrh
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Akciové opce
 DocType: Journal Entry Account,Expense Claim,Hrazení nákladů
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Opravdu chcete obnovit tento vyřazen aktivum?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Množství pro {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Opravdu chcete obnovit tento vyřazen aktivum?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Množství pro {0}
 DocType: Leave Application,Leave Application,Požadavek na absenci
 DocType: Patient,Patient Relation,Vztah pacienta
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Nástroj pro přidělování dovolených
+DocType: Item,Hub Category to Publish,Kategorie Hubu k publikování
 DocType: Leave Block List,Leave Block List Dates,Nechte Block List termíny
+DocType: Sales Invoice,Billing Address GSTIN,Fakturační adresa GSTIN
 DocType: Workstation,Net Hour Rate,Net Hour Rate
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Přistál Náklady doklad o koupi
 DocType: Company,Default Terms,Výchozí podmínky
@@ -1205,18 +1231,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Zadejte {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Odstraněné položky bez změny množství nebo hodnoty.
 DocType: Delivery Note,Delivery To,Doručení do
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Atribut tabulka je povinné
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Atribut tabulka je povinné
 DocType: Production Planning Tool,Get Sales Orders,Získat Prodejní objednávky
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} nemůže být negativní
 DocType: Training Event,Self-Study,Samostudium
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Sleva
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Sleva
 DocType: Asset,Total Number of Depreciations,Celkový počet Odpisy
 DocType: Sales Invoice Item,Rate With Margin,Míra s marží
 DocType: Workstation,Wages,Mzdy
 DocType: Task,Urgent,Naléhavý
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Zadejte prosím platný řádek ID řádku tabulky {0} {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Nelze najít proměnnou:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,"Vyberte pole, které chcete upravit z čísla"
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,"Vyberte pole, které chcete upravit z čísla"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Přejděte na plochu a začít používat ERPNext
 DocType: Item,Manufacturer,Výrobce
 DocType: Landed Cost Item,Purchase Receipt Item,Položka příjemky
@@ -1247,8 +1273,8 @@
 DocType: GL Entry,Against,Proti
 DocType: Item,Default Selling Cost Center,Výchozí Center Prodejní cena
 DocType: Sales Partner,Implementation Partner,Implementačního partnera
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,PSČ
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Prodejní objednávky {0} {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,PSČ
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Prodejní objednávky {0} {1}
 DocType: Opportunity,Contact Info,Kontaktní informace
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Tvorba přírůstků zásob
 DocType: Packing Slip,Net Weight UOM,Hmotnost UOM
@@ -1259,6 +1285,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Získejte týdenní Off termíny
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Datum ukončení nesmí být menší než data zahájení
 DocType: Sales Person,Select company name first.,Vyberte název společnosti jako první.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Nízká až vysoká
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Nabídka obdržená od Dodavatelů.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Nahraďte kusovníku a aktualizujte nejnovější cenu ve všech kusovnících
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Chcete-li {0} | {1} {2}
@@ -1277,7 +1304,7 @@
 DocType: Program Enrollment,Transportation,Doprava
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Neplatný Atribut
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} musí být odeslaný
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Množství musí být menší než nebo rovno {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Množství musí být menší než nebo rovno {0}
 DocType: SMS Center,Total Characters,Celkový počet znaků
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Vyberte kusovník Bom oblasti k bodu {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Faktura Detail
@@ -1292,7 +1319,7 @@
 ,Ordered Items To Be Billed,Objednané zboží fakturovaných
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,"Z rozsahu, musí být nižší než na Range"
 DocType: Global Defaults,Global Defaults,Globální Výchozí
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Projekt spolupráce Pozvánka
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Projekt spolupráce Pozvánka
 DocType: Salary Slip,Deductions,Odpočty
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Název akce
@@ -1310,13 +1337,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Prodejní faktury Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Nic požadovat
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Další rekord Rozpočet &#39;{0}&#39; již existuje proti {1} &#39;{2}&#39; za fiskální rok {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"""Skutečné datum zahájení"" nemůže být větší než ""Skutečné datum ukončení"""
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"""Skutečné datum zahájení"" nemůže být větší než ""Skutečné datum ukončení"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Řízení
 DocType: Cheque Print Template,Payer Settings,Nastavení plátce
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To bude připojen na položku zákoníku varianty. Například, pokud vaše zkratka je ""SM"", a položka je kód ""T-SHIRT"", položka kód varianty bude ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Čistá Pay (slovy) budou viditelné, jakmile uložíte výplatní pásce."
 DocType: Purchase Invoice,Is Return,Je Return
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Pozor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Pozor
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Return / vrubopis
 DocType: Price List Country,Price List Country,Ceník Země
 DocType: Item,UOMs,UOMs
@@ -1331,17 +1358,18 @@
 DocType: Account,Balance Sheet,Rozvaha
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',"Nákladové středisko u položky s Kód položky """
 DocType: Fee Validity,Valid Till,Platný do
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Režim platba není nakonfigurován. Prosím zkontrolujte, zda je účet byl nastaven na režim plateb nebo na POS Profilu."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Režim platba není nakonfigurován. Prosím zkontrolujte, zda je účet byl nastaven na režim plateb nebo na POS Profilu."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Stejnou položku nelze zadat vícekrát.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Další účty mohou být vyrobeny v rámci skupiny, ale údaje lze proti non-skupin"
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Závazky
 DocType: Course,Course Intro,Samozřejmě Intro
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Skladovou kartu {0} vytvořil
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosím, nastavte číselnou sérii pro Účast přes Nastavení&gt; Číslovací série"
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Skladovou pohyb {0} vytvořil
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Řádek # {0}: Zamítnutí Množství nemůže být zapsán do kupní Návrat
 ,Purchase Order Items To Be Billed,Položky vydané objednávky k fakturaci
 DocType: Purchase Invoice Item,Net Rate,Čistá míra
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Vyberte zákazníka
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Vyberte zákazníka
 DocType: Purchase Invoice Item,Purchase Invoice Item,Položka přijaté faktury
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Sériové Ledger Přihlášky a GL položky jsou zveřejňována pro vybrané Nákupní Příjmy
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Položka 1
@@ -1360,7 +1388,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Duplicitní řádek {0} se stejným {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Fiskální rok {0} nebyl nalezen
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Nastavení Zaměstnanci
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Nastavení Zaměstnanci
 DocType: Sales Order,SO-,TAK-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,"Prosím, vyberte první prefix"
 DocType: Employee,O-,Ó-
@@ -1372,12 +1400,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,View Ledger
 DocType: Grading Scale,Intervals,intervaly
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Nejstarší
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Položka Group existuje se stejným názvem, prosím, změnit název položky nebo přejmenovat skupinu položek"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Skupina položek již existuje. Prosím, změňte název položky nebo přejmenujte skupinu položek"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Zbytek světa
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Zbytek světa
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Položka {0} nemůže mít dávku
 ,Budget Variance Report,Rozpočet Odchylka Report
 DocType: Salary Slip,Gross Pay,Hrubé mzdy
+DocType: Item,Is Item from Hub,Je položka z Hubu
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Řádek {0}: typ činnosti je povinná.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividendy placené
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Účetní Ledger
@@ -1387,8 +1416,9 @@
 DocType: Vehicle Log,Service Detail,servis Detail
 DocType: BOM,Item Description,Položka Popis
 DocType: Student Sibling,Student Sibling,Student Sourozenec
-DocType: Purchase Invoice,Is Recurring,Je Opakující
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Způsob platby
 DocType: Purchase Invoice,Supplied Items,Dodávané položky
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Nastavte prosím aktivní nabídku Restaurant {0}
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Množství K výrobě
 DocType: Email Digest,New Income,New příjmů
@@ -1398,6 +1428,7 @@
 ,Student and Guardian Contact Details,Student a Guardian Kontaktní údaje
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Řádek {0}: Pro dodavatele je zapotřebí {0} E-mailová adresa pro odeslání e-mailu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Dočasné Otevření
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Zobrazit Hub
 ,Employee Leave Balance,Zaměstnanec Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Zůstatek na účtě {0} musí být vždy {1}
 DocType: Patient Appointment,More Info,Více informací
@@ -1406,7 +1437,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +148,Example: Masters in Computer Science,Příklad: Masters v informatice
 DocType: Purchase Invoice,Rejected Warehouse,Zamítnuto Warehouse
 DocType: GL Entry,Against Voucher,Proti poukazu
-DocType: Item,Default Buying Cost Center,Výchozí Center Nákup Cost
+DocType: Item,Default Buying Cost Center,Výchozí středisko nákupu
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Chcete-li získat to nejlepší z ERPNext, doporučujeme vám nějaký čas trvat, a sledovat tyto nápovědy videa."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +74, to ,na
 DocType: Supplier Quotation Item,Lead Time in days,Čas leadu ve dnech
@@ -1417,19 +1448,19 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Upozornit na novou žádost o nabídky
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Objednávky pomohou při plánování a navázat na vašich nákupech
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Předpisy pro laboratorní testy
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Celkové emise / přenosu množství {0} v hmotné Request {1} \ nemůže být vyšší než požadované množství {2} pro položku {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Malý
 DocType: Employee,Employee Number,Počet zaměstnanců
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Případ číslo (čísla) již v provozu. Zkuste se věc č {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Případ číslo (čísla) již v provozu. Zkuste se věc č {0}
 DocType: Project,% Completed,% Dokončeno
 ,Invoiced Amount (Exculsive Tax),Fakturovaná částka (bez daně)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Položka 2
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,Training Event
-DocType: Item,Auto re-order,Auto re-order
+DocType: Item,Auto re-order,Automatické znovuobjednání
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Celkem Dosažená
 DocType: Employee,Place of Issue,Místo vydání
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Contract,Smlouva
@@ -1438,11 +1469,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Nepřímé náklady
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Row {0}: Množství je povinný
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Zemědělství
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Vaše Produkty nebo Služby
 DocType: Special Test Items,Special Test Items,Speciální zkušební položky
 DocType: Mode of Payment,Mode of Payment,Způsob platby
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Webové stránky Image by měla být veřejná souboru nebo webové stránky URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Webové stránky Image by měla být veřejná souboru nebo webové stránky URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Jedná se o skupinu kořen položky a nelze upravovat.
@@ -1450,24 +1481,23 @@
 DocType: Vehicle,Fuel UOM,palivo UOM
 DocType: Warehouse,Warehouse Contact Info,Sklad Kontaktní informace
 DocType: Payment Entry,Write Off Difference Amount,Odepsat Difference Částka
-DocType: Purchase Invoice,Recurring Type,Opakující se Typ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: e-mail zaměstnanec nebyl nalezen, a proto je pošta neposlal"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: e-mail zaměstnanec nebyl nalezen, a proto je pošta neposlal"
 DocType: Item,Foreign Trade Details,Zahraniční obchod Podrobnosti
+,Assessment Plan Status,Stav plánu hodnocení
 DocType: Email Digest,Annual Income,Roční příjem
 DocType: Serial No,Serial No Details,Serial No Podrobnosti
 DocType: Purchase Invoice Item,Item Tax Rate,Sazba daně položky
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,Zvolte lékaře a datum
 DocType: Student Group Student,Group Roll Number,Číslo role skupiny
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Pro {0}, tak úvěrové účty mohou být propojeny na jinou položku debetní"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Součet všech vah úkol by měl být 1. Upravte váhy všech úkolů projektu v souladu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Součet všech vah úkol by měl být 1. Upravte váhy všech úkolů projektu v souladu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Položka {0} musí být Subdodavatelské Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapitálové Vybavení
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ceny Pravidlo je nejprve vybrána na základě ""Použít na"" oblasti, které mohou být položky, položky skupiny nebo značky."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Nejprve nastavte kód položky
-DocType: Hub Settings,Seller Website,Prodejce Website
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Nejprve nastavte kód položky
 DocType: Item,ITEM-,POLOŽKA-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Celkové přidělené procento prodejní tým by měl být 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Celkové přidělené procento prodejní tým by měl být 100
 DocType: Sales Invoice Item,Edit Description,Upravit popis
 DocType: Antibiotic,Antibiotic,Antibiotikum
 ,Team Updates,tým Aktualizace
@@ -1488,12 +1518,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Total (Company měny)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Výrobní číslo {0} přihlášeno více než jednou
 DocType: Depreciation Schedule,Journal Entry,Zápis do deníku
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} položky v probíhající
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} položky v probíhající
 DocType: Workstation,Workstation Name,Meno pracovnej stanice
 DocType: Grading Scale Interval,Grade Code,Grade Code
 DocType: POS Item Group,POS Item Group,POS položky Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Salary Slip,Bank Account No.,Bankovní účet č.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,To je číslo poslední vytvořené transakci s tímto prefixem
@@ -1509,10 +1539,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Žádost o cenovou nabídku dodavatele
 DocType: Healthcare Settings,Registration Message,Registrační zpráva
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Technické vybavení
-DocType: Sales Order,Recurring Upto,opakující Až
 DocType: Prescription Dosage,Prescription Dosage,Dávkování na předpis
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Vyberte společnost
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Vyberte společnost
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Dodavatelské faktury Datum
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,za
@@ -1528,10 +1557,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Překrývající podmínky nalezeno mezi:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Proti věstníku Entry {0} je již nastavena proti jiným poukaz
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Celková hodnota objednávky
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Jídlo
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Jídlo
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Stárnutí Rozsah 3
 DocType: Maintenance Schedule Item,No of Visits,Počet návštěv
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Plán údržby {0} existuje proti {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Chcete publikovat své položky do Hubu?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,učící studenta
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},"Měna závěrečného účtu, musí být {0}"
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Součet bodů za všech cílů by mělo být 100. Je {0}
@@ -1542,9 +1572,9 @@
 DocType: Authorization Rule,Average Discount,Průměrná sleva
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Utilities
-DocType: Purchase Invoice Item,Accounting,Účetnictví
+DocType: POS Profile,Accounting,Účetnictví
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Zvolte dávky pro doručenou položku
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Zvolte dávky pro doručenou položku
 DocType: Asset,Depreciation Schedules,odpisy Plány
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Období pro podávání žádostí nemůže být alokační období venku volno
 DocType: Activity Cost,Projects,Projekty
@@ -1560,18 +1590,19 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',"Stav schválení musí být ""schváleno"" nebo ""Zamítnuto"""
 DocType: Physician,Contacts and Address,Kontakty a adresa
 DocType: Purchase Invoice,Contact Person,Kontaktní osoba
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"""Očekávané datum započetí"" nemůže být větší než ""Očekávané datum ukončení"""
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""Očekávané datum započetí"" nemůže být větší než ""Očekávané datum ukončení"""
 DocType: Course Scheduling Tool,Course End Date,Konec Samozřejmě Datum
 DocType: Holiday List,Holidays,Prázdniny
 DocType: Sales Order Item,Planned Quantity,Plánované Množství
 DocType: Purchase Invoice Item,Item Tax Amount,Částka Daně Položky
-DocType: Item,Maintain Stock,Udržovat Stock
+DocType: Item,Maintain Stock,Udržovat stav zásob
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Fotky Položky již vytvořené pro výrobní zakázku
 DocType: Employee,Prefered Email,preferovaný Email
+DocType: Student Admission,Eligibility and Details,Způsobilost a podrobnosti
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Čistá změna ve stálých aktiv
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Ponechte prázdné, pokud se to považuje za všechny označení"
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Od datetime
 DocType: Email Digest,For Company,Pro Společnost
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Komunikační protokol.
@@ -1579,19 +1610,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Variabilní skóre skóre dodavatele skóre
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Nákup Částka
 DocType: Sales Invoice,Shipping Address Name,Název dodací adresy
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Diagram účtů
 DocType: Material Request,Terms and Conditions Content,Podmínky Content
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,nemůže být větší než 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Položka {0} není skladem
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Položka {0} není skladem
 DocType: Maintenance Visit,Unscheduled,Neplánovaná
 DocType: Employee,Owned,Vlastník
 DocType: Salary Detail,Depends on Leave Without Pay,Závisí na dovolené bez nároku na mzdu
 DocType: Pricing Rule,"Higher the number, higher the priority","Vyšší číslo, vyšší priorita"
 ,Purchase Invoice Trends,Trendy přijatách faktur
 DocType: Employee,Better Prospects,Lepší vyhlídky
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Řádek # {0}: Dávka {1} má pouze {2} qty. Vyberte prosím jinou dávku, která má k dispozici {3} qty nebo rozdělit řádek do více řádků, doručit / vydávat z více dávek"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Řádek # {0}: Dávka {1} má pouze {2} qty. Vyberte prosím jinou dávku, která má k dispozici {3} qty nebo rozdělit řádek do více řádků, doručit / vydávat z více dávek"
 DocType: Vehicle,License Plate,poznávací značka
 DocType: Appraisal,Goals,Cíle
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Zvolte Profil POS
 DocType: Warranty Claim,Warranty / AMC Status,Záruka / AMC Status
 ,Accounts Browser,Účty Browser
 DocType: Payment Entry Reference,Payment Entry Reference,Platba Vstup reference
@@ -1610,7 +1641,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Zaměstnanec nemůže odpovídat sám sobě.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","V případě, že účet je zamrzlý, položky mohou omezeným uživatelům."
 DocType: Email Digest,Bank Balance,Bank Balance
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Účetní záznam pro {0}: {1} mohou být prováděny pouze v měně: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Účetní záznam pro {0}: {1} mohou být prováděny pouze v měně: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil Job, požadované kvalifikace atd."
 DocType: Journal Entry Account,Account Balance,Zůstatek na účtu
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Daňové Pravidlo pro transakce.
@@ -1619,8 +1650,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Celkem Daně a poplatky (Company Měnové)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Ukázat P &amp; L zůstatky neuzavřený fiskální rok je
 DocType: Lab Test Template,Collection Details,Podrobnosti o kolekci
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","vyberte cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date z tabConsultation ct, `tabLab Předpis &#39;cp kde ct.patient =&#39; {0} &#39;a cp.parent = ct. název a cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Přepravní účtu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Účet {2} je neaktivní
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,"Udělat Prodejní objednávky, které vám pomohou plánovat svou práci a doručit na čas"
@@ -1637,7 +1666,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Balící list
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Pronájem kanceláře
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Nastavení SMS brány
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import se nezdařil!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import se nezdařil!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Žádná adresa přidán dosud.
 DocType: Workstation Working Hour,Workstation Working Hour,Pracovní stanice Pracovní Hour
 DocType: Vital Signs,Blood Pressure,Krevní tlak
@@ -1662,7 +1691,7 @@
 DocType: Sales Invoice,Source,Zdroj
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Show uzavřen
 DocType: Leave Type,Is Leave Without Pay,Je odejít bez Pay
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Asset kategorie je povinný pro položku dlouhodobých aktiv
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Asset kategorie je povinný pro položku dlouhodobých aktiv
 DocType: Fee Validity,Fee Validity,Platnost poplatku
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nalezené v tabulce platby Žádné záznamy
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Tato {0} je v rozporu s {1} o {2} {3}
@@ -1683,8 +1712,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,vytvoření vede
 DocType: Maintenance Schedule,Schedules,Plány
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,Profil POS je vyžadován pro použití prodejního místa
 DocType: Purchase Invoice Item,Net Amount,Čistá částka
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} nebyla odeslána, takže akce nemůže být dokončena"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} nebyla odeslána, takže akce nemůže být dokončena"
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail No
 DocType: Landed Cost Voucher,Additional Charges,Další poplatky
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatečná sleva Částka (Měna Company)
@@ -1693,7 +1723,7 @@
 ,Support Hour Distribution,Distribuce hodinové podpory
 DocType: Maintenance Visit,Maintenance Visit,Maintenance Visit
 DocType: Student,Leaving Certificate Number,Vysvědčení číslo
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Schůzka zrušena, zkontrolujte a zrušte fakturu {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Schůzka zrušena, zkontrolujte a zrušte fakturu {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,K dispozici šarže Množství ve skladu
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Aktualizace Print Format
 DocType: Landed Cost Voucher,Landed Cost Help,Přistálo Náklady Help
@@ -1716,8 +1746,8 @@
 DocType: Patient,Tobacco Past Use,Použití tabáku v minulosti
 DocType: Sales Invoice Item,Brand Name,Jméno značky
 DocType: Purchase Receipt,Transporter Details,Transporter Podrobnosti
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Uživatel {0} je již přiřazen lékaři {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Výchozí sklad je vyžadováno pro vybraná položka
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Uživatel {0} je již přiřazen lékaři {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Výchozí sklad je vyžadováno pro vybraná položka
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Krabice
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,možné Dodavatel
 DocType: Budget,Monthly Distribution,Měsíční Distribution
@@ -1727,7 +1757,7 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 DocType: Loan Type,Maximum Loan Amount,Maximální výše úvěru
 DocType: Pricing Rule,Pricing Rule,Ceny Pravidlo
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Duplicitní číslo role pro studenty {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Duplicitní číslo role pro studenty {0}
 DocType: Budget,Action if Annual Budget Exceeded,Akční Pokud jde o roční rozpočet překročen
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Materiál Žádost o příkazu k nákupu
 DocType: Shopping Cart Settings,Payment Success URL,Platba Úspěch URL
@@ -1740,11 +1770,11 @@
 ,Lead Name,Jméno leadu
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +310,Opening Stock Balance,Otevření Sklad Balance
+apps/erpnext/erpnext/config/stock.py +310,Opening Stock Balance,Počáteční cena zásob
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} musí být uvedeny pouze jednou
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Není povoleno, aby transfer více {0} než {1} proti Objednávky {2}"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Dovolená úspěšně přidělena {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Žádné položky k balení
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Žádné položky k balení
 DocType: Shipping Rule Condition,From Value,Od hodnoty
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Výrobní množství je povinné
 DocType: Employee Loan,Repayment Method,splácení Metoda
@@ -1758,6 +1788,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Stock Závazky
 DocType: Purchase Invoice,Supplier Warehouse,Dodavatel Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt Mobil
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Vyberte společnost
 ,Material Requests for which Supplier Quotations are not created,Materiál Žádosti o které Dodavatel citace nejsou vytvořeny
 DocType: Student Group,Set 0 for no limit,Nastavte 0 pro žádný limit
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"V den, kdy (y), na které žádáte o povolení jsou prázdniny. Nemusíte požádat o volno."
@@ -1767,24 +1798,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Vytvořit nabídku
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Ostatní zprávy
 DocType: Dependent Task,Dependent Task,Závislý Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Absence typu {0} nemůže být delší než {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Zkuste plánování operací pro X dní předem.
 DocType: HR Settings,Stop Birthday Reminders,Zastavit připomenutí narozenin
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},"Prosím nastavit výchozí mzdy, splatnou účet ve firmě {0}"
 DocType: SMS Center,Receiver List,Přijímač Seznam
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Hledání položky
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Hledání položky
 DocType: Patient Appointment,Referring Physician,Odpovídající lékař
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Spotřebovaném množství
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Čistá změna v hotovosti
 DocType: Assessment Plan,Grading Scale,Klasifikační stupnice
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,již byly dokončeny
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,již byly dokončeny
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Skladem v ruce
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Platba Poptávka již existuje {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Náklady na vydaných položek
 DocType: Physician,Hospital,NEMOCNICE
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Množství nesmí být větší než {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Množství nesmí být větší než {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Předchozí finanční rok není uzavřen
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Stáří (dny)
 DocType: Quotation Item,Quotation Item,Položka Nabídky
@@ -1795,8 +1826,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Dodavatel Type master.
 DocType: Purchase Order Item,Supplier Part Number,Dodavatel Číslo dílu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Míra konverze nemůže být 0 nebo 1
-DocType: Sales Invoice,Reference Document,referenční dokument
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} je zrušena nebo zastavena
+DocType: Subscription,Reference Document,referenční dokument
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} je zrušena nebo zastavena
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Vozidlo Dispatch Datum
 DocType: Healthcare Settings,Default Medical Code Standard,Výchozí standard zdravotnického kódu
@@ -1805,6 +1836,7 @@
 DocType: Company,Default Payable Account,Výchozí Splatnost účtu
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Nastavení pro on-line nákupního košíku, jako jsou pravidla dopravu, ceník atd"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% účtovano
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Seřadit podle Cena ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserved Množství
 DocType: Party Account,Party Account,Party účtu
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Lidské zdroje
@@ -1816,13 +1848,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Udělat vyplácení Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Řádek {0}: Advance proti dodavatelem musí být odepsat
 DocType: Company,Default Values,Výchozí hodnoty
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frekvence} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Frekvence} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Celkové částky proplacené
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,To je založeno na protokolech proti tomuto vozidlu. Viz časovou osu níže podrobnosti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Proti faktuře dodavatele {0} ze dne {1}
 DocType: Customer,Default Price List,Výchozí Ceník
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Záznam Asset Pohyb {0} vytvořil
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nelze odstranit fiskální rok {0}. Fiskální rok {0} je nastaven jako výchozí v globálním nastavení
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Zákazník se stejným jménem již existuje
 DocType: Journal Entry,Entry Type,Entry Type
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,V této hodnotící skupině není spojen žádný plán hodnocení
 ,Customer Credit Balance,Zákazník Credit Balance
@@ -1832,7 +1865,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Stanovení ceny
 DocType: Quotation,Term Details,Termín Podrobnosti
 DocType: Project,Total Sales Cost (via Sales Order),Celkové prodejní náklady (prostřednictvím objednávky prodeje)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Nemůže přihlásit více než {0} studentů na této studentské skupiny.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Nemůže přihlásit více než {0} studentů na této studentské skupiny.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Počet vedoucích
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} musí být větší než 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Plánování kapacit Pro (dny)
@@ -1848,9 +1881,11 @@
 DocType: Lab Test,Technician Name,Jméno technika
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Odpojit Platba o zrušení faktury
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Aktuální stavu km vstoupil by měla být větší než počáteční měřiče ujeté vzdálenosti {0}
+DocType: Restaurant Reservation,No Show,Žádné vystoupení
 DocType: Shipping Rule Country,Shipping Rule Country,Přepravní Pravidlo Země
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Nechat docházky
 DocType: Maintenance Visit,Partially Completed,Částečně Dokončeno
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Mírná citlivost
 DocType: Leave Type,Include holidays within leaves as leaves,Zahrnout dovolenou v listech jsou listy
 DocType: Sales Invoice,Packed Items,Zabalené položky
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Reklamační proti sériového čísla
@@ -1867,13 +1902,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Uhrazená částka (firemní měna)
 DocType: Purchase Invoice,Additional Discount,Další slevy
 DocType: Selling Settings,Selling Settings,Prodejní Nastavení
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Potvrďte akci
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Aukce online
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Uveďte prosím buď Množství nebo ocenění Cena, nebo obojí"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Splnění
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Zobrazit Košík
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Marketingové náklady
 ,Item Shortage Report,Položka Nedostatek Report
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnost je uvedeno, \n uveďte prosím ""váha UOM"" příliš"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnost je uvedeno, \n uveďte prosím ""váha UOM"" příliš"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Zadaný požadavek materiálu k výrobě této skladové karty
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Vedle Odpisy Datum je povinné pro nové aktivum
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Samostatná skupina založená na kurzu pro každou dávku
@@ -1885,18 +1921,18 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Ujistěte se účetní položka pro každý pohyb zásob
 DocType: Leave Allocation,Total Leaves Allocated,Celkem Leaves Přidělené
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Warehouse vyžadováno při Row No {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Zadejte prosím platnou finanční rok datum zahájení a ukončení
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Zadejte prosím platnou finanční rok datum zahájení a ukončení
 DocType: Employee,Date Of Retirement,Datum odchodu do důchodu
 DocType: Upload Attendance,Get Template,Získat šablonu
 DocType: Material Request,Transferred,Přestoupil
 DocType: Vehicle,Doors,dveře
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext Setup Complete!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Vybírat poplatek za registraci pacienta
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,Rozdělení daní
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Je zapotřebí nákladového střediska pro &#39;zisku a ztráty &quot;účtu {2}. Prosím nastavit výchozí nákladového střediska pro společnost.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +118,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Zákaznická Skupina existuje se stejným názvem, prosím změnit název zákazníka nebo přejmenujte skupinu zákazníků"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +118,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Zákaznická Skupina existuje se stejným názvem, prosím změňte název zákazníka nebo přejmenujte skupinu zákazníků"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +37,New Contact,Nový kontakt
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Sales Invoice,Place of Supply,Místo dodávky
@@ -1909,36 +1945,36 @@
 DocType: Employee,AB+,AB+
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Pokud je tato položka má varianty, pak to nemůže být vybrána v prodejních objednávek atd"
 DocType: Lead,Next Contact By,Další Kontakt By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Množství požadované pro bodě {0} v řadě {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Množství požadované pro bodě {0} v řadě {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},"Sklad {0} nelze smazat, protože existuje množství k položce {1}"
 DocType: Quotation,Order Type,Typ objednávky
-DocType: Purchase Invoice,Notification Email Address,Oznámení e-mailová adresa
 ,Item-wise Sales Register,Item-moudrý Sales Register
 DocType: Asset,Gross Purchase Amount,Gross Částka nákupu
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Počáteční zůstatky
 DocType: Asset,Depreciation Method,odpisy Metoda
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Offline
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je to poplatek v ceně základní sazbě?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Celkem Target
 DocType: Job Applicant,Applicant for a Job,Žadatel o zaměstnání
 DocType: Production Plan Material Request,Production Plan Material Request,Výroba Poptávka Plán Materiál
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Žádné výrobní zakázky vytvořené
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Žádné výrobní zakázky vytvořené
 DocType: Stock Reconciliation,Reconciliation JSON,Odsouhlasení JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Příliš mnoho sloupců. Export zprávu a vytiskněte jej pomocí aplikace tabulky.
 DocType: Purchase Invoice Item,Batch No,Č. šarže
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Žádost o nabídku: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Povolit více Prodejní objednávky proti Zákazníka Objednávky
 DocType: Student Group Instructor,Student Group Instructor,Instruktor skupiny studentů
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Žádné
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Hlavní
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Hlavní
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Varianta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavit prefix pro číslování série na vašich transakcí
 DocType: Employee Attendance Tool,Employees HTML,zaměstnanci HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Výchozí BOM ({0}) musí být aktivní pro tuto položku nebo jeho šablony
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Výchozí BOM ({0}) musí být aktivní pro tuto položku nebo jeho šablony
 DocType: Employee,Leave Encashed?,Dovolená proplacena?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Ze hřiště je povinné
 DocType: Email Digest,Annual Expenses,roční náklady
 DocType: Item,Variants,Varianty
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Proveďte objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Proveďte objednávky
 DocType: SMS Center,Send To,Odeslat
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Není dost bilance dovolenou na vstup typ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Přidělené sumy
@@ -1954,6 +1990,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Síla skupiny studentů
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Proti věstníku Vstup {0} nemá bezkonkurenční {1} vstupu
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,ocenění
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Školení
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Duplicitní Pořadové číslo vstoupil k bodu {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Podmínka pro pravidla dopravy
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Prosím Vstupte
@@ -1963,7 +2000,7 @@
 DocType: Sales Order,To Deliver and Bill,Dodat a Bill
 DocType: Student Group,Instructors,instruktoři
 DocType: GL Entry,Credit Amount in Account Currency,Kreditní Částka v měně účtu
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} musí být předloženy
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} musí být předloženy
 DocType: Authorization Control,Authorization Control,Autorizace Control
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Řádek # {0}: Zamítnutí Warehouse je povinná proti zamítnuté bodu {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Platba
@@ -1982,11 +2019,11 @@
 DocType: Quotation Item,Actual Qty,Skutečné Množství
 DocType: Sales Invoice Item,References,Reference
 DocType: Quality Inspection Reading,Reading 10,Čtení 10
-DocType: Hub Settings,Hub Node,Hub Node
+DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Zadali jste duplicitní položky. Prosím, opravu a zkuste to znovu."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Spolupracovník
 DocType: Asset Movement,Asset Movement,Asset Movement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,New košík
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,New košík
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Položka {0} není serializovat položky
 DocType: SMS Center,Create Receiver List,Vytvořit přijímače seznam
 DocType: Vehicle,Wheels,kola
@@ -2000,15 +2037,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikace
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Označuje, že balíček je součástí této dodávky (Pouze návrhu)"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Učinit vstup platby
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Množství k bodu {0} musí být menší než {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Množství k bodu {0} musí být menší než {1}
 ,Sales Invoice Trends,Prodejní faktury Trendy
 DocType: Leave Application,Apply / Approve Leaves,Použít / Schválit listy
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Pro
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Pro
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Se může vztahovat řádku, pouze pokud typ poplatku je ""On předchozí řady Částka"" nebo ""předchozí řady Total"""
-DocType: Sales Order Item,Delivery Warehouse,Dodávka Warehouse
+DocType: Sales Order Item,Delivery Warehouse,Sklad pro příjem
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Strom Nákl.střediska finančních.
 DocType: Serial No,Delivery Document No,Dodávka dokument č
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Prosím nastavte &quot;/ ZTRÁTY zisk z aktiv odstraňováním&quot; ve firmě {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Prosím nastavte &quot;/ ZTRÁTY zisk z aktiv odstraňováním&quot; ve firmě {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Položka získaná z dodacího listu
 DocType: Serial No,Creation Date,Datum vytvoření
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Položka {0} se objeví několikrát v Ceníku {1}
@@ -2019,11 +2056,12 @@
 DocType: Student,Student Mobile Number,Student Číslo mobilního telefonu
 DocType: Item,Has Variants,Má varianty
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Aktualizace odpovědi
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Již jste vybrané položky z {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Již jste vybrané položky z {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Název měsíční výplatou
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Číslo šarže je povinné
 DocType: Sales Person,Parent Sales Person,Parent obchodník
-DocType: Purchase Invoice,Recurring Invoice,Opakující se faktury
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Vysoká až nízká
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Nejprve vyberte program
 DocType: Patient Appointment,Patient Age,Věk pacienta
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Správa projektů
 DocType: Supplier,Supplier of Goods or Services.,Dodavatel zboží nebo služeb.
@@ -2031,8 +2069,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Standardní pohledávky, které mají být použity, pokud nejsou nastaveny v Pacientovi pro rezervaci konzultačních poplatků."
 DocType: Vehicle Log,Fuel Price,palivo Cena
 DocType: Budget,Budget,Rozpočet
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Nastavit Otevřít
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Fixed Asset položky musí být non-skladová položka.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Nastavit Otevřít
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Fixed Asset položky musí být non-skladová položka.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Rozpočet nelze přiřadit proti {0}, protože to není výnos nebo náklad účet"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Dosažená
 DocType: Student Admission,Application Form Route,Přihláška Trasa
@@ -2042,16 +2080,17 @@
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"Ve slovech budou viditelné, jakmile uložíte prodejní faktury."
 DocType: Lead,Follow Up,Následovat
 DocType: Item,Is Sales Item,Je Sales Item
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Položka Group Tree
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Strom skupin položek
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Položka {0} není nastavení pro Serial č. Zkontrolujte, zda master položku"
 DocType: Maintenance Visit,Maintenance Time,Údržba Time
 ,Amount to Deliver,"Částka, která má dodávat"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Stejná položka byla zadána několikrát. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Termínovaný Datum zahájení nemůže být dříve než v roce datum zahájení akademického roku, ke kterému termín je spojena (akademický rok {}). Opravte data a zkuste to znovu."
 DocType: Guardian,Guardian Interests,Guardian Zájmy
 DocType: Naming Series,Current Value,Current Value
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Několik fiskálních let existují pro data {0}. Prosím nastavte společnost ve fiskálním roce
 DocType: School Settings,Instructor Records to be created by,"Záznamy instruktorů, které mají být vytvořeny"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} vytvořil
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} vytvořil
 DocType: Delivery Note Item,Against Sales Order,Proti přijaté objednávce
 ,Serial No Status,Serial No Status
 DocType: Payment Entry Reference,Outstanding,Vynikající
@@ -2062,10 +2101,10 @@
  musí být větší než nebo rovno {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,To je založeno na akciovém pohybu. Viz {0} Podrobnosti
 DocType: Pricing Rule,Selling,Prodejní
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Množství {0} {1} odečíst proti {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Množství {0} {1} odečíst proti {2}
 DocType: Employee,Salary Information,Vyjednávání o platu
 DocType: Sales Person,Name and Employee ID,Jméno a ID zaměstnance
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
 DocType: Website Item Group,Website Item Group,Website Item Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Odvody a daně
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Prosím, zadejte Referenční den"
@@ -2091,7 +2130,7 @@
 DocType: Issue,Resolution Details,Rozlišení Podrobnosti
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alokace
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Kritéria přijetí
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Prosím, zadejte Žádosti materiál ve výše uvedené tabulce"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,"Prosím, zadejte Žádosti materiál ve výše uvedené tabulce"
 DocType: Item Attribute,Attribute Name,Název atributu
 DocType: BOM,Show In Website,Show pro webové stránky
 DocType: Shopping Cart Settings,Show Quantity in Website,Vykazují množství webových stránek
@@ -2100,7 +2139,7 @@
 DocType: Item Reorder,Check in (group),Check in (skupina)
 ,Qty to Order,Množství k objednávce
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Účet hlavu pod závazkem nebo vlastním kapitálem, ve kterém budou Zisk / ztráta rezervovat"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Ganttův diagram všech zadaných úkolů.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Ganttův diagram všech zadaných úkolů.
 DocType: Opportunity,Mins to First Response,Min First Response
 DocType: Pricing Rule,Margin Type,Typ Marže
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} hodin
@@ -2121,35 +2160,35 @@
 DocType: Patient,Surgical History,Chirurgická historie
 DocType: Employee,Resignation Letter Date,Rezignace Letter Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Pravidla pro stanovení sazeb jsou dále filtrována na základě množství.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Nastavte prosím datum zapojení pro zaměstnance {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Nastavte prosím datum zapojení pro zaměstnance {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Celková částka Billing (přes Time Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repeat Customer Příjmy
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), musí mít roli ""Schvalovatel výdajů"""
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Pár
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Vyberte BOM a Množství pro výrobu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Vyberte BOM a Množství pro výrobu
 DocType: Asset,Depreciation Schedule,Plán odpisy
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Adresy prodejních partnerů a kontakty
 DocType: Bank Reconciliation Detail,Against Account,Proti účet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Half Day Date by měla být v rozmezí Datum od a do dnešního dne
 DocType: Maintenance Schedule Detail,Actual Date,Skutečné datum
 DocType: Item,Has Batch No,Má číslo šarže
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Roční Billing: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Roční Billing: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Daň z zboží a služeb (GST India)
 DocType: Delivery Note,Excise Page Number,Spotřební Číslo stránky
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Firma, Datum od a do dnešního dne je povinná"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Získejte z konzultace
 DocType: Asset,Purchase Date,Datum nákupu
 DocType: Employee,Personal Details,Osobní data
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Prosím nastavte &quot;odpisy majetku nákladové středisko&quot; ve firmě {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Prosím nastavte &quot;odpisy majetku nákladové středisko&quot; ve firmě {0}
 ,Maintenance Schedules,Plány údržby
 DocType: Task,Actual End Date (via Time Sheet),Skutečné datum ukončení (přes Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Množství {0} {1} na {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Množství {0} {1} na {2} {3}
 ,Quotation Trends,Uvozovky Trendy
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Položka Group není uvedeno v položce mistra na položku {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
 DocType: Shipping Rule Condition,Shipping Amount,Částka - doprava
 DocType: Supplier Scorecard Period,Period Score,Skóre období
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Přidat zákazníky
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Přidat zákazníky
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Čeká Částka
 DocType: Lab Test Template,Special,Speciální
 DocType: Purchase Invoice Item,Conversion Factor,Konverzní faktor
@@ -2157,13 +2196,14 @@
 ,Vehicle Expenses,Náklady pro auta
 DocType: Serial No,Invoice Details,Podrobnosti faktury
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},"Očekávané hodnoty po celou dobu životnosti, musí být větší než nebo rovna {0}"
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Začněte dál
+DocType: Hub Category,Hub Category,Kategorie Hubu
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Číslo vozidla
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Datum, kdy opakující se faktura bude zastaví"
 DocType: Employee Loan,Loan Amount,Částka půjčky
 DocType: Program Enrollment,Self-Driving Vehicle,Samohybné vozidlo
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Dodávka tabulky dodavatelů
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Řádek {0}: Kusovník nebyl nalezen pro výtisku {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Řádek {0}: Kusovník nebyl nalezen pro výtisku {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Celkové přidělené listy {0} nemůže být nižší než již schválených listy {1} pro období
 DocType: Journal Entry,Accounts Receivable,Pohledávky
 ,Supplier-Wise Sales Analytics,Dodavatel-Wise Prodej Analytics
@@ -2174,7 +2214,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Mateřský kurz (nechte prázdné, pokud toto není součástí mateřského kurzu)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Ponechte prázdné, pokud se to považuje za ubytování ve všech typech zaměstnanců"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuovat poplatků na základě
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,Nastavení HR
 DocType: Salary Slip,net pay info,Čistý plat info
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Tato hodnota je aktualizována v seznamu výchozích prodejních cen.
@@ -2185,7 +2225,7 @@
 DocType: Patient,B Positive,B Pozitivní
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Řádek # {0}: Množství musí být 1, když je položka investičního majetku. Prosím použít samostatný řádek pro vícenásobné Mn."
 DocType: Leave Block List Allow,Leave Block List Allow,Nechte Block List Povolit
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Zkratka nemůže být prázdný znak nebo mezera
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Zkratka nemůže být prázdný znak nebo mezera
 DocType: Patient Medical Record,Patient Medical Record,Záznam pacienta
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Skupina na Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportovní
@@ -2201,9 +2241,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Nelze najít kurz {0} až {1} pro klíčový den {2}. Ručně vytvořte záznam o směnném kurzu
 DocType: POS Profile,Price List,Ceník
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} je nyní výchozí fiskální rok. Prosím aktualizujte svůj prohlížeč aby se změny projevily.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Nákladové Pohledávky
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Nákladové Pohledávky
 DocType: Issue,Support,Podpora
 ,BOM Search,Vyhledání kusovníku
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Publikujte &quot;na skladě&quot; nebo &quot;není na skladě&quot; na Hubu na základě skladových zásob dostupných v tomto skladu.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Uzavření (Otevření + součty)
 DocType: Vehicle,Fuel Type,Druh paliva
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Uveďte prosím měnu, ve společnosti"
@@ -2215,16 +2256,16 @@
 DocType: Healthcare Settings,Remind Before,Připomenout dříve
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM Konverzní faktor je nutné v řadě {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Řádek # {0}: Reference Document Type musí být jedním ze zakázky odběratele, prodejní faktury nebo Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Řádek # {0}: Reference Document Type musí být jedním ze zakázky odběratele, prodejní faktury nebo Journal Entry"
 DocType: Salary Component,Deduction,Dedukce
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Řádek {0}: From Time a na čas je povinná.
 DocType: Stock Reconciliation Item,Amount Difference,výše Rozdíl
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Položka Cena přidán pro {0} v Ceníku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Položka Cena přidán pro {0} v Ceníku {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Prosím, zadejte ID zaměstnance z tohoto prodeje osoby"
 DocType: Territory,Classification of Customers by region,Rozdělení zákazníků podle krajů
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Rozdíl Částka musí být nula
 DocType: Project,Gross Margin,Hrubá marže
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,"Prosím, zadejte první výrobní položku"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,"Prosím, zadejte první výrobní položku"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Vypočtená výpis z bankovního účtu zůstatek
 DocType: Normal Test Template,Normal Test Template,Normální šablona testu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,zakázané uživatelské
@@ -2234,21 +2275,22 @@
 DocType: Salary Slip,Total Deduction,Celkem Odpočet
 ,Production Analytics,výrobní Analytics
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,To je založeno na transakcích proti tomuto pacientovi. Podrobnosti viz časová osa níže
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Náklady Aktualizováno
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Náklady Aktualizováno
 DocType: Employee,Date of Birth,Datum narození
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Bod {0} již byla vrácena
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiskální rok ** představuje finanční rok. Veškeré účetní záznamy a další významné transakce jsou sledovány proti ** fiskální rok **.
 DocType: Opportunity,Customer / Lead Address,Zákazník / Lead Address
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Nastavení tabulky dodavatelů
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Varování: Neplatný certifikát SSL na přílohu {0}
-DocType: Student Admission,Eligibility,Způsobilost
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Název plánu hodnocení
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Varování: Neplatný certifikát SSL na přílohu {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Vede vám pomohou podnikání, přidejte všechny své kontakty a více jak svých potenciálních zákazníků"
 DocType: Production Order Operation,Actual Operation Time,Aktuální Provozní doba
 DocType: Authorization Rule,Applicable To (User),Vztahující se na (Uživatel)
 DocType: Purchase Taxes and Charges,Deduct,Odečíst
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Popis Práce
 DocType: Student Applicant,Applied,Aplikovaný
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Znovu otevřít
 DocType: Sales Invoice Item,Qty as per Stock UOM,Množství podle Stock nerozpuštěných
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Jméno Guardian2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciální znaky kromě ""-"". """", ""#"", a ""/"" není povoleno v pojmenování řady"
@@ -2260,7 +2302,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Výrobní ředitel
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Pořadové číslo {0} je v záruce aľ {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Rozdělit dodací list do balíčků.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Zásilky
+apps/erpnext/erpnext/hooks.py +107,Shipments,Zásilky
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Celková alokovaná částka (Company měna)
 DocType: Purchase Order Item,To be delivered to customer,Chcete-li být doručeno zákazníkovi
 DocType: BOM,Scrap Material Cost,Šrot Material Cost
@@ -2282,8 +2324,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Nastavení varianty položky
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Vyberte společnost ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Ponechte prázdné, pokud se to považuje za všechna oddělení"
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Druhy pracovního poměru (trvalý, smluv, stážista atd.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} je povinná k položce {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Druhy pracovního poměru (trvalý, smluv, stážista atd.)"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} je povinná k položce {1}
 DocType: Process Payroll,Fortnightly,Čtrnáctidenní
 DocType: Currency Exchange,From Currency,Od Měny
 DocType: Vital Signs,Weight (In Kilogram),Hmotnost (v kilogramech)
@@ -2307,7 +2349,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Prosím, klikněte na ""Generovat Schedule"", aby se plán"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Došlo k chybám během odstraňování tohoto schématu:
 DocType: Bin,Ordered Quantity,Objednané množství
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","např ""Stavět nástroje pro stavitele """
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","např ""Stavět nástroje pro stavitele """
 DocType: Grading Scale,Grading Scale Intervals,Třídění dílků
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Účetní Vstup pro {2} mohou být prováděny pouze v měně: {3}
 DocType: Production Order,In Process,V procesu
@@ -2330,11 +2372,10 @@
 DocType: Purchase Invoice,With Payment of Tax,S platbou daně
 DocType: Expense Claim Detail,Expense Claim Detail,Detail úhrady výdajů
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICATE PRO DODAVATELE
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,"Prosím, vyberte správný účet"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,"Prosím, vyberte správný účet"
 DocType: Item,Weight UOM,Hmotnostní jedn.
 DocType: Salary Structure Employee,Salary Structure Employee,Plat struktura zaměstnanců
 DocType: Patient,Blood Group,Krevní Skupina
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Až do
 DocType: Course,Course Name,Název kurzu
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Uživatelé, kteří si vyhoví žádosti konkrétního zaměstnance volno"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Kancelářské Vybavení
@@ -2353,7 +2394,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Ceny nebude zobrazeno, pokud Ceník není nastaven"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Uveďte prosím zemi, k tomuto Shipping pravidla nebo zkontrolovat Celosvětová doprava"
 DocType: Stock Entry,Total Incoming Value,Celková hodnota Příchozí
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Debetní K je vyžadováno
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Debetní K je vyžadováno
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomůže udržet přehled o času, nákladů a účtování pro aktivit hotový svého týmu"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Nákupní Ceník
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Šablony proměnných tabulky dodavatelů dodavatelů.
@@ -2363,7 +2404,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Platba Odsouhlasení
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Prosím, vyberte incharge jméno osoby"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technologie
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Celkové nezaplacené: {0}
+DocType: Hub Settings,Unregister from Hub,Zrušte registraci z Hubu
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Celkové nezaplacené: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Webové stránky Provoz
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Nabídka Letter
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generování materiálu Požadavky (MRP) a výrobní zakázky.
@@ -2375,7 +2417,9 @@
 DocType: Physician Schedule Time Slot,To Time,Chcete-li čas
 DocType: Authorization Rule,Approving Role (above authorized value),Schválení role (nad oprávněné hodnoty)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Připsat na účet musí být Splatnost účet
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM rekurze: {0} nemůže být rodič nebo dítě {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Vyberte studentský vstup, který je povinný pro žáka placeného studenta"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM rekurze: {0} nemůže být rodič nebo dítě {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Vyberte ceník pro publikování cen
 DocType: Production Order Operation,Completed Qty,Dokončené Množství
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Pro {0}, tak debetní účty mohou být spojeny proti jinému připsání"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Ceník {0} je zakázána
@@ -2385,40 +2429,41 @@
 DocType: Training Event Employee,Training Event Employee,Vzdělávání zaměstnanců Event
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +6,Add Time Slots,Přidat časové úseky
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Sériová čísla požadované pro položky {1}. Poskytli jste {2}.
-DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuální ocenění Rate
+DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuální ocenění
 DocType: Item,Customer Item Codes,Zákazník Položka Kódy
+DocType: Training Event,Advance,Záloha
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,pro opětovné opakování.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange zisk / ztráta
 DocType: Opportunity,Lost Reason,Důvod ztráty
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nová adresa
 DocType: Quality Inspection,Sample Size,Velikost vzorku
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,"Prosím, zadejte převzetí dokumentu"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Všechny položky již byly fakturovány
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Uveďte prosím platný ""Od věci č '"
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',"Uveďte prosím platný ""Od věci č '"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Další nákladová střediska mohou být vyrobeny v rámci skupiny, ale položky mohou být provedeny proti non-skupin"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Uživatelé a oprávnění
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Výrobní zakázky Vytvořeno: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Výrobní zakázky Vytvořeno: {0}
 DocType: Branch,Branch,Větev
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tisk a identita
 DocType: Company,Total Monthly Sales,Celkový měsíční prodej
 DocType: Bin,Actual Quantity,Skutečné Množství
 DocType: Shipping Rule,example: Next Day Shipping,Příklad: Next Day Shipping
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Pořadové číslo {0} nebyl nalezen
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Předplatné bylo {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Předplatné bylo {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Program rozpisu poplatků
 DocType: Fee Schedule Program,Student Batch,Student Batch
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,"vyberte * z &quot;tabVital Signs&quot;, kde patient = &#39;{0}&#39; objednat podle signs_date desc limit 1"
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Udělat Student
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Min Grade
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Byli jste pozváni ke spolupráci na projektu: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Lékař není k dispozici na {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Byli jste pozváni ke spolupráci na projektu: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Lékař není k dispozici na {0}
 DocType: Leave Block List Date,Block Date,Block Datum
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Přidejte vlastní ID předplatného do pole doctype {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Dodávka Dodavatelská poznámka
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Použít teď
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Použít teď
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Aktuální počet {0} / Čekací počet {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-commerce GSTIN
 DocType: Sales Order,Not Delivered,Ne vyhlášeno
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Předpokládaný datum nemůže být před datem transakce
 ,Bank Clearance Summary,Souhrn bankovního zúčtování
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Vytvářet a spravovat denní, týdenní a měsíční e-mailové digest."
 DocType: Appraisal Goal,Appraisal Goal,Posouzení Goal
@@ -2426,12 +2471,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,budovy
 DocType: Fee Schedule,Fee Structure,Struktura poplatků
 DocType: Timesheet Detail,Costing Amount,Kalkulace Částka
-DocType: Student Admission,Application Fee,poplatek za podání žádosti
+DocType: Student Admission Program,Application Fee,poplatek za podání žádosti
 DocType: Process Payroll,Submit Salary Slip,Odeslat výplatní pásce
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maxiumm sleva na položky {0} {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Maxiumm sleva na položky {0} {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Dovoz hromadnou
 DocType: Sales Partner,Address & Contacts,Adresa a kontakty
 DocType: SMS Log,Sender Name,Jméno odesílatele
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Řadit podle kritérií
 DocType: POS Profile,[Select],[Vybrat]
 DocType: Vital Signs,Blood Pressure (diastolic),Krevní tlak (diastolický)
 DocType: SMS Log,Sent To,Odeslána
@@ -2440,7 +2486,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Následující Kontakt datum nemůže být v minulosti
 DocType: Company,For Reference Only.,Pouze orientační.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Lékař {0} není dostupný v {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Vyberte číslo šarže
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Vyberte číslo šarže
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Neplatný {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PInv-RET-
 DocType: Fee Validity,Reference Inv,Odkaz Inv
@@ -2456,29 +2502,29 @@
 DocType: Normal Test Items,Require Result Value,Požadovat hodnotu výsledku
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Případ č nemůže být 0
 DocType: Item,Show a slideshow at the top of the page,Ukazují prezentaci v horní části stránky
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,kusovníky
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Zásoba
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,kusovníky
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Zásoba
 DocType: Project Type,Projects Manager,Správce projektů
 DocType: Serial No,Delivery Time,Dodací lhůta
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Stárnutí dle
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Jmenování zrušeno
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Jmenování zrušeno
 DocType: Item,End of Life,Konec životnosti
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Cestování
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Žádný aktivní nebo implicitní Plat Struktura nalezených pro zaměstnance {0} pro dané termíny
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Cestování
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Žádný aktivní nebo implicitní Plat Struktura nalezených pro zaměstnance {0} pro dané termíny
 DocType: Leave Block List,Allow Users,Povolit uživatele
 DocType: Purchase Order,Customer Mobile No,Zákazník Mobile Žádné
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Opakující se
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Sledovat samostatné výnosy a náklady pro vertikál produktu nebo divizí.
 DocType: Rename Tool,Rename Tool,Přejmenování
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Aktualizace Cost
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Aktualizace nákladů
 DocType: Item Reorder,Item Reorder,Položka Reorder
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Show výplatní pásce
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Přenos materiálu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Přenos materiálu
 DocType: Fees,Send Payment Request,Odeslat žádost o platbu
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Zadejte operací, provozní náklady a dávají jedinečnou operaci ne své operace."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Tento dokument je nad hranicí {0} {1} pro položku {4}. Děláte si jiný {3} proti stejné {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Prosím nastavte opakující se po uložení
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Vybrat změna výše účet
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Vybrat změna výše účet
 DocType: Purchase Invoice,Price List Currency,Ceník Měna
 DocType: Naming Series,User must always select,Uživatel musí vždy vybrat
 DocType: Stock Settings,Allow Negative Stock,Povolit Negativní Sklad
@@ -2498,7 +2544,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Zaměstnanec
 DocType: Sample Collection,Collected Time,Shromážděný čas
 DocType: Company,Sales Monthly History,Měsíční historie prodeje
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Vyberte možnost Dávka
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Vyberte možnost Dávka
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} je plně fakturováno
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Známky života
 DocType: Training Event,End Time,End Time
@@ -2506,16 +2552,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Platební srážky nebo ztráta
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardní smluvní podmínky pro prodej nebo koupi.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Seskupit podle Poukazu
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Opravdu chcete tuto schůzku zrušit?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,prodejní Pipeline
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Prosím nastavit výchozí účet platu Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Povinné On
 DocType: Rename Tool,File to Rename,Soubor k přejmenování
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Prosím, vyberte BOM pro položku v řádku {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Prosím, vyberte BOM pro položku v řádku {0}"
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Účet {0} neodpovídá společnosti {1} v účtu účtu: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Stanovená BOM {0} neexistuje k bodu {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plán údržby {0} musí být zrušena před zrušením této prodejní objednávky
+DocType: POS Profile,Applicable for Users,Platí pro uživatele
 DocType: Notification Control,Expense Claim Approved,Uhrazení výdajů schváleno
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Výplatní pásce zaměstnance {0} již vytvořili pro toto období
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Výplatní pásce zaměstnance {0} již vytvořili pro toto období
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Farmaceutické
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Náklady na zakoupené zboží
 DocType: Selling Settings,Sales Order Required,Prodejní objednávky Povinné
@@ -2539,6 +2587,7 @@
 DocType: Offer Letter,Accepted,Přijato
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Organizace
 DocType: BOM Update Tool,BOM Update Tool,Nástroj pro aktualizaci kusovníku
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Party účet není zadán, prosím nastavte výchozí účet ve společnosti"
 DocType: SG Creation Tool Course,Student Group Name,Jméno Student Group
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Vytváření poplatků
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Ujistěte se, že opravdu chcete vymazat všechny transakce pro tuto společnost. Vaše kmenová data zůstanou, jak to je. Tuto akci nelze vrátit zpět."
@@ -2547,29 +2596,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) nemůže být větší, než plánované množství ({2}), ve výrobní objednávce {3}"
 DocType: Shipping Rule,Shipping Rule Label,Přepravní Pravidlo Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,User Forum
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Nelze aktualizovat zásob, faktura obsahuje pokles lodní dopravy zboží."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Nelze aktualizovat zásob, faktura obsahuje pokles lodní dopravy zboží."
 DocType: Lab Test Sample,Lab Test Sample,Laboratorní testovací vzorek
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Rychlý vstup Journal
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Nemůžete změnit sazbu, kdyby BOM zmínil agianst libovolné položky"
+DocType: Restaurant,Invoice Series Prefix,Předvolba série faktur
 DocType: Employee,Previous Work Experience,Předchozí pracovní zkušenosti
 DocType: Stock Entry,For Quantity,Pro Množství
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Prosím, zadejte Plánované Množství k bodu {0} na řádku {1}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},"Prosím, zadejte Plánované Množství k bodu {0} na řádku {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} není odesláno
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Žádosti o položky.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Samostatná výrobní objednávka bude vytvořena pro každou dokončenou dobrou položku.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} musí být negativní ve vratném dokumentu
 ,Minutes to First Response for Issues,Zápisy do první reakce na otázky
 DocType: Purchase Invoice,Terms and Conditions1,Podmínky a podmínek1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,Název institutu pro který nastavujete tento systém.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,Název institutu pro který nastavujete tento systém.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Účetní záznam zmrazeny až do tohoto data, nikdo nemůže dělat / upravit položku kromě role uvedeno níže."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Prosím, uložit dokument před generováním plán údržby"
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Poslední cena byla aktualizována ve všech kusovnících
 DocType: Fee Schedule,Successful,Úspěšný
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Stav projektu
 DocType: UOM,Check this to disallow fractions. (for Nos),"Zkontrolujte, zda to zakázat frakce. (U č)"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Následující Výrobní zakázky byly vytvořeny:
-DocType: Student Admission,Naming Series (for Student Applicant),Pojmenování Series (pro studentské přihlašovatel)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Následující Výrobní zakázky byly vytvořeny:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Pojmenování Series (pro studentské přihlašovatel)
 DocType: Delivery Note,Transporter Name,Přepravce Název
 DocType: Authorization Rule,Authorized Value,Autorizovaný Hodnota
 DocType: BOM,Show Operations,Zobrazit Operations
@@ -2593,7 +2643,7 @@
 ,Employees working on a holiday,Zaměstnanci pracující na dovolenou
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Současnost
 DocType: Project,% Complete Method,Dokončeno% Method
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Lék
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Lék
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Datum zahájení údržby nemůže být před datem dodání pro pořadové číslo {0}
 DocType: Production Order,Actual End Date,Skutečné datum ukončení
 DocType: BOM,Operating Cost (Company Currency),Provozní náklady (Company měna)
@@ -2611,19 +2661,20 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Schválení Uživatel nemůže být stejná jako uživatel pravidlo se vztahuje na
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Základní sazba (dle Stock nerozpuštěných)
 DocType: SMS Log,No of Requested SMS,Počet žádaným SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Nechat bez nároku na odměnu nesouhlasí se schválenými záznamů nechat aplikaci
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Nechat bez nároku na odměnu nesouhlasí se schválenými záznamů nechat aplikaci
 DocType: Campaign,Campaign-.####,Kampaň-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Další kroky
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Prosím dodávat uvedené položky na nejlepší možné ceny
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Proveďte faktury
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto v blízkosti Příležitost po 15 dnech
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Příkazy na nákup nejsou pro {0} povoleny kvůli postavení skóre {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Příkazy na nákup nejsou pro {0} povoleny kvůli postavení skóre {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,konec roku
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Smlouva Datum ukončení musí být větší než Datum spojování
 DocType: Vital Signs,Nutrition Values,Výživové hodnoty
 DocType: Lab Test Template,Is billable,Je fakturován
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}","Musí být nastaven jak &quot;Lékařský plán&quot;, tak i čas na setkání &quot;pro lékaře {0}"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Distributor / dealer / jednatel / partner / prodejce, který prodává produkty společnosti za provizi."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} proti nákupní objednávce {1}
 DocType: Patient,Patient Demographics,Demografie pacientů
@@ -2673,19 +2724,18 @@
  10. Přidat nebo odečítat: Ať už chcete přidat nebo odečíst daň."
 DocType: Homepage,Homepage,Domovská stránka
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Vyberte lékaře ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',karta updateConsultation set faktura = &#39;{0}&#39; kde jméno = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd Množství
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Fee Records Vytvořil - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Kategorie Account
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +117,Cannot produce more Item {0} than Sales Order quantity {1},Nelze produkují více položku {0} než prodejní objednávky množství {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Skladová karta {0} není založena
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Skladový pohyb {0} není založen
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Peněžní účet
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Následující Kontakt Tím nemůže být stejný jako hlavní e-mailovou adresu
 DocType: Tax Rule,Billing City,Fakturace City
 DocType: Asset,Manual,Manuál
 DocType: Salary Component Account,Salary Component Account,Účet plat Component
 DocType: Global Defaults,Hide Currency Symbol,Skrýt symbol měny
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","např. banka, hotovost, kreditní karty"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","např. banka, hotovost, kreditní karty"
 DocType: Lead Source,Source Name,Název zdroje
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Normální klidový krevní tlak u dospělého pacienta je přibližně 120 mmHg systolický a 80 mmHg diastolický, zkráceně &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Dobropis
@@ -2704,16 +2754,16 @@
 DocType: Patient,Occupation,Povolání
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,"Row {0}: datum zahájení, musí být před koncem roku Datum"
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (ks)
-DocType: Sales Invoice,This Document,Tento dokument
 DocType: Installation Note Item,Installed Qty,Instalované množství
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Mohlo to být způsobeno některými neplatnými e-mailovými adresami v adresáři
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Přidali jste
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Trénink Výsledek
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Trénink Výsledek
 DocType: Purchase Invoice,Is Paid,se vyplácí
 DocType: Salary Structure,Total Earning,Celkem Zisk
 DocType: Purchase Receipt,Time at which materials were received,"Čas, kdy bylo přijato materiály"
 DocType: Stock Ledger Entry,Outgoing Rate,Odchozí Rate
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Organizace větev master.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Organizace větev master.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,nebo
 DocType: Sales Order,Billing Status,Status Fakturace
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Nahlásit problém
@@ -2728,7 +2778,8 @@
 DocType: Notification Control,Sales Order Message,Prodejní objednávky Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Nastavit jako výchozí hodnoty, jako je společnost, měna, aktuálním fiskálním roce, atd"
 DocType: Payment Entry,Payment Type,Typ platby
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vyberte položku Dávka pro položku {0}. Nelze najít jednu dávku, která splňuje tento požadavek"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vyberte položku Dávka pro položku {0}. Nelze najít jednu dávku, která splňuje tento požadavek"
+DocType: Hub Category,Parent Category,Rodičovská Kategorie
 DocType: Process Payroll,Select Employees,Vybrat Zaměstnanci
 DocType: Opportunity,Potential Sales Deal,Potenciální prodej
 DocType: Complaint,Complaints,Stížnosti
@@ -2765,7 +2816,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikace balíčku pro dodávky (pro tisk)
 DocType: Bin,Reserved Quantity,Vyhrazeno Množství
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Zadejte platnou e-mailovou adresu
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Vyberte prosím položku v košíku
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Vyberte prosím položku v košíku
 DocType: Landed Cost Voucher,Purchase Receipt Items,Položky příjemky
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Přizpůsobení Formuláře
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,nedoplatek
@@ -2775,15 +2826,15 @@
 DocType: Payment Request,Amount in customer's currency,Částka v měně zákazníka
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Dodávka
 DocType: Stock Reconciliation Item,Current Qty,Aktuální Množství
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Přidat dodavatele
+DocType: Restaurant Menu,Restaurant Menu,Nabídka restaurací
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Předch
 DocType: Appraisal Goal,Key Responsibility Area,Key Odpovědnost Area
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Student Šarže pomůže sledovat docházku, posudky a poplatků pro studenty"
 DocType: Payment Entry,Total Allocated Amount,Celková alokovaná částka
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Nastavte výchozí inventář pro trvalý inventář
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Nastavte výchozí inventář pro trvalý inventář
 DocType: Item Reorder,Material Request Type,Materiál Typ požadavku
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural Zápis do deníku na platy od {0} do {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","Místní úložiště je plné, nezachránil"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","Místní úložiště je plné, nezachránil"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Řádek {0}: UOM Konverzní faktor je povinné
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Kapacita místností
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref
@@ -2797,7 +2848,7 @@
 DocType: Upload Attendance,Upload HTML,Nahrát HTML
 DocType: Employee,Relieving Date,Uvolnění Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Ceny Pravidlo je vyrobena přepsat Ceník / definovat slevy procenta, na základě určitých kritérií."
-DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Sklad je možné provést pouze prostřednictvím Skladová karta / dodací list / nákupní doklad
+DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Změnu skladu je možné provést pouze prostřednictvím Skladového pohybu / dodacím listem / nákupním dokladem
 DocType: Employee Education,Class / Percentage,Třída / Procento
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +130,Head of Marketing and Sales,Vedoucí marketingu a prodeje
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Income Tax,Daň z příjmů
@@ -2822,16 +2873,18 @@
 DocType: Project,Task Completion,úkol Dokončení
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Není skladem
 DocType: Appraisal,HR User,HR User
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Daně a odečtené
-apps/erpnext/erpnext/hooks.py +129,Issues,Problémy
+apps/erpnext/erpnext/hooks.py +138,Issues,Problémy
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Stav musí být jedním z {0}
 DocType: Sales Invoice,Debit To,Debetní K
+DocType: Restaurant Menu Item,Restaurant Menu Item,Položka nabídky restaurace
 DocType: Delivery Note,Required only for sample item.,Požadováno pouze pro položku vzorku.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Skutečné Množství Po transakci
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Žádné výplatní pásce nalezena mezi {0} a {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Žádné výplatní pásce nalezena mezi {0} a {1}
 ,Pending SO Items For Purchase Request,"Do doby, než SO položky k nákupu Poptávka"
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Student Přijímací
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} je zakázán
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Student Přijímací
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} je zakázán
 DocType: Supplier,Billing Currency,Fakturace Měna
 DocType: Sales Invoice,SINV-RET-,Sinv-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Extra Velké
@@ -2848,12 +2901,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +195,Large,Velký
 DocType: Homepage Featured Product,Homepage Featured Product,Úvodní Doporučené zboží
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +236,All Assessment Groups,Všechny skupiny Assessment
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nový sklad Name
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Název nového skladu
 apps/erpnext/erpnext/accounts/report/financial_statements.py +233,Total {0} ({1}),Celkem {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Území
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Prosím, uveďte počet požadovaných návštěv"
 DocType: Stock Settings,Default Valuation Method,Výchozí metoda ocenění
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,Poplatek
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Aktualizace probíhá. Může chvíli trvat.
 DocType: Vehicle Log,Fuel Qty,palivo Množství
 DocType: Production Order Operation,Planned Start Time,Plánované Start Time
 DocType: Course,Assessment,Posouzení
@@ -2869,7 +2923,7 @@
 DocType: Price List,Price List Master,Ceník Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Všechny prodejní transakce mohou být označeny proti více ** prodejcům **, takže si můžete nastavit a sledovat cíle."
 ,S.O. No.,SO Ne.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Prosím vytvořte Zákazník z olova {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Prosím vytvořte Zákazník z olova {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Vyberte pacienta
 DocType: Price List,Applicable for Countries,Pro země
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Název parametru
@@ -2912,27 +2966,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,Dodavatel fakturační údaje
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Náklady / Rozdíl účtu ({0}), musí být ""zisk nebo ztráta"" účet"
 DocType: Project,Copied From,Zkopírován z
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Název chyba: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Nedostatek
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Název chyba: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,Nedostatek
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} není spojeno s {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Účast na zaměstnance {0} je již označen
 DocType: Packing Slip,If more than one package of the same type (for print),Pokud je více než jeden balík stejného typu (pro tisk)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Nastavte výchozího zákazníka v nastavení restaurace
 ,Salary Register,plat Register
-DocType: Warehouse,Parent Warehouse,Parent Warehouse
+DocType: Warehouse,Parent Warehouse,Nadřízený sklad
 DocType: C-Form Invoice Detail,Net Total,Net Total
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Výchozí kusovník nebyl nalezen pro položku {0} a projekt {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Výchozí kusovník nebyl nalezen pro položku {0} a projekt {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Definovat různé typy půjček
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Dlužné částky
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Čas (v min)
 DocType: Project Task,Working,Pracovní
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Sklad fronty (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Finanční rok
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Finanční rok
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} nepatří do Společnosti {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,"Nelze vyřešit funkci skóre kritérií pro {0}. Zkontrolujte, zda je vzorec platný."
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Stát jak na
 DocType: Healthcare Settings,Out Patient Settings,Out Nastavení pacienta
 DocType: Account,Round Off,Zaokrouhlit
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Množství musí být kladné
 ,Requested Qty,Požadované množství
 DocType: Tax Rule,Use for Shopping Cart,Použití pro Košík
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Hodnota {0} atributu {1} neexistuje v seznamu platného bodu Hodnoty atributů pro položky {2}
@@ -2941,7 +2997,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Poplatky budou rozděleny úměrně na základě položky Množství nebo částkou, dle Vašeho výběru"
 DocType: Maintenance Visit,Purposes,Cíle
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Aspoň jedna položka by měla být zadána s negativním množství ve vratném dokumentu
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Přidat kurzy
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Provoz {0} déle, než všech dostupných pracovních hodin v pracovní stanici {1}, rozložit provoz do několika operací"
 ,Requested,Požadované
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Žádné poznámky
@@ -2953,6 +3008,8 @@
 DocType: Employee Loan,Repaid/Closed,Splacena / Zavřeno
 DocType: Item,Total Projected Qty,Celková předpokládaná Množství
 DocType: Monthly Distribution,Distribution Name,Distribuce Name
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dodavatel&gt; Typ dodavatele
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Hodnota ocenění nebyla nalezena u položky {0}, která je povinna provést účetní záznamy za {1} {2}. Pokud položka transakce probíhá jako položka s nulovou hodnotou v {1}, uveďte ji v tabulce {1} položky. V opačném případě prosím vytvořte příchozí akciovou transakci pro položku nebo zmiňte ohodnocení v záznamu o položce a zkuste odeslat / zrušit tuto položku"
 DocType: Course,Course Code,Kód předmětu
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Kontrola kvality potřebný k bodu {0}
 DocType: POS Settings,Use POS in Offline Mode,Používejte POS v režimu offline
@@ -2963,14 +3020,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Správa Territory strom.
 DocType: Journal Entry Account,Sales Invoice,Prodejní faktury
 DocType: Journal Entry Account,Party Balance,Balance Party
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,"Prosím, vyberte Použít Sleva na"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,"Prosím, vyberte Použít Sleva na"
 DocType: Company,Default Receivable Account,Výchozí pohledávek účtu
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Vytvoření bankovní položka pro celkové vyplacené mzdy za výše zvolených kritérií
 DocType: Physician,Physician Schedule,Lékařský rozvrh
 DocType: Purchase Invoice,Deemed Export,Považován za export
 DocType: Stock Entry,Material Transfer for Manufacture,Materiál Přenos: Výroba
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Sleva v procentech lze použít buď proti Ceníku nebo pro všechny Ceníku.
-DocType: Purchase Invoice,Half-yearly,Pololetní
+DocType: Subscription,Half-yearly,Pololetní
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Účetní položka na skladě
 DocType: Lab Test,LabTest Approver,Nástroj LabTest
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Již jste hodnotili kritéria hodnocení {}.
@@ -2999,13 +3056,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Extra Malé
 DocType: Company,Standard Template,standardní šablona
 DocType: Training Event,Theory,Teorie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Upozornění: Materiál Požadované množství je menší než minimální objednávka Množství
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Upozornění: Materiál Požadované množství je menší než minimální objednávka Množství
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Účet {0} je zmrazen
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Právní subjekt / dceřiná společnost s oddělenou Graf účtů, které patří do organizace."
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Potraviny, nápoje a tabák"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Lze provést pouze platbu proti nevyfakturované {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Rychlost Komise nemůže být větší než 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Lze provést pouze platbu proti nevyfakturované {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Rychlost Komise nemůže být větší než 100
 DocType: Stock Entry,Subcontract,Subdodávka
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,"Prosím, zadejte {0} jako první"
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Žádné odpovědi od
@@ -3023,20 +3080,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Barevné
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Plan Assessment Criteria
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Zabránit nákupním objednávkám
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Citlivý
 DocType: Patient Appointment,Scheduled,Plánované
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Žádost o cenovou nabídku.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosím, nastavte systém pro pojmenování zaměstnanců v oblasti lidských zdrojů&gt; Nastavení HR"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Prosím, vyberte položku, kde &quot;Je skladem,&quot; je &quot;Ne&quot; a &quot;je Sales Item&quot; &quot;Ano&quot; a není tam žádný jiný produkt Bundle"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Vyberte zákazníka
 DocType: Student Log,Academic,Akademický
 DocType: Patient,Personal and Social History,Osobní a sociální historie
 DocType: Fee Schedule,Fee Breakup for each student,Rozdělení poplatků za každého studenta
 apps/erpnext/erpnext/controllers/accounts_controller.py +476,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Celková záloha ({0}) na objednávku {1} nemůže být větší než celkový součet ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vyberte měsíční výplatou na nerovnoměrně distribuovat cílů napříč měsíců.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Změnit kód
-DocType: Purchase Invoice Item,Valuation Rate,Ocenění Rate
+DocType: Purchase Invoice Item,Valuation Rate,Ocenění
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,motorová nafta
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Ceníková Měna není zvolena
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Ceníková Měna není zvolena
 apps/erpnext/erpnext/config/healthcare.py +46,Results,výsledky
 ,Student Monthly Attendance Sheet,Student měsíční návštěvnost Sheet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Zaměstnanec {0} již požádal o {1} mezi {2} a {3}
@@ -3051,7 +3109,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Správa prodejních partnerů.
 DocType: Quality Inspection,Inspection Type,Kontrola Type
 DocType: Fee Validity,Visited yet,Ještě navštěvováno
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Sklady se stávajícími transakce nelze převést na skupinu.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Sklady se stávajícími transakce nelze převést na skupinu.
 DocType: Assessment Result Tool,Result HTML,výsledek HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,vyprší dne
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Přidejte studenty
@@ -3078,7 +3136,7 @@
 DocType: Healthcare Settings,Result Printed,Tiskový výsledek
 DocType: Asset Category Account,Depreciation Expense Account,Odpisy Náklady účtu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Zkušební doba
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Zobrazit {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Zobrazit {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Pouze koncové uzly jsou povoleny v transakci
 DocType: Expense Claim,Expense Approver,Schvalovatel výdajů
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Řádek {0}: Advance proti zákazník musí být úvěr
@@ -3089,7 +3147,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Chcete-li datetime
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Plány kurzu zrušuje:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Protokoly pro udržení stavu doručení sms
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Nastavte cíl prodeje
 DocType: Accounts Settings,Make Payment via Journal Entry,Provést platbu přes Journal Entry
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Vytištěno na
 DocType: Item,Inspection Required before Delivery,Inspekce Požadované před porodem
@@ -3097,7 +3154,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Nevyřízené Aktivity
 DocType: Patient Appointment,Reminded,Připomenuto
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Vaše organizace
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Vaše organizace
 DocType: Fee Component,Fees Category,Kategorie poplatky
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Zadejte zmírnění datum.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
@@ -3109,12 +3166,12 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Změna pořadí Level
 DocType: Company,Chart Of Accounts Template,Účtový rozvrh šablony
 DocType: Attendance,Attendance Date,Účast Datum
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Položka Cena aktualizován pro {0} v Ceníku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Položka Cena aktualizován pro {0} v Ceníku {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plat rozpad na základě Zisk a dedukce.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Účet s podřízenými uzly nelze převést na hlavní účetní knihu
-DocType: Purchase Invoice Item,Accepted Warehouse,Schválené Sklad
+DocType: Purchase Invoice Item,Accepted Warehouse,Schválený sklad
 DocType: Bank Reconciliation Detail,Posting Date,Datum zveřejnění
-DocType: Item,Valuation Method,Ocenění Method
+DocType: Item,Valuation Method,Metoda ocenění
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Mark Půldenní
 DocType: Sales Invoice,Sales Team,Prodejní tým
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Duplicitní záznam
@@ -3125,19 +3182,20 @@
 ,Employee Birthday,Narozeniny zaměstnance
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Batch Účast Tool
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,Limit zkříženými
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Naplánováno až
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Akademický termín s tímto &quot;akademický rok &#39;{0} a&quot; Jméno Termín&#39; {1} již existuje. Upravte tyto položky a zkuste to znovu.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}",Stejně jako existují nějaké transakce proti položce {0} nelze změnit hodnotu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}",Stejně jako existují nějaké transakce proti položce {0} nelze změnit hodnotu {1}
 DocType: UOM,Must be Whole Number,Musí být celé číslo
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nové Listy Přidělené (ve dnech)
 DocType: Purchase Invoice,Invoice Copy,Kopie faktury
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Pořadové číslo {0} neexistuje
-DocType: Sales Invoice Item,Customer Warehouse (Optional),Zákazník Warehouse (volitelně)
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Zákaznický sklad (volitelně)
 DocType: Pricing Rule,Discount Percentage,Sleva v procentech
 DocType: Payment Reconciliation Invoice,Invoice Number,Číslo faktury
 DocType: Shopping Cart Settings,Orders,Objednávky
 DocType: Employee Leave Approver,Leave Approver,Schvalovatel absenece
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Vyberte dávku
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Vyberte dávku
 DocType: Assessment Group,Assessment Group Name,Název skupiny Assessment
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Převádí jaderný materiál pro Výroba
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Uživatel s rolí ""Schvalovatel výdajů"""
@@ -3152,7 +3210,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Období Uzávěrka Entry
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Vyberte oddělení ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Nákladové středisko se stávajícími transakcemi nelze převést do skupiny
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Množství {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Množství {0} {1} {2} {3}
 DocType: Account,Depreciation,Znehodnocení
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dodavatel (é)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Docházky zaměstnanců Tool
@@ -3163,10 +3221,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,Platební Příspěvky {0} jsou un-spojený
 DocType: GL Entry,Voucher No,Voucher No
 ,Lead Owner Efficiency,Vedoucí účinnost vlastníka
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Nejoblíbenější
 DocType: Leave Allocation,Leave Allocation,Přidelení dovolené
 DocType: Payment Request,Recipient Message And Payment Details,Příjemce zprávy a platebních informací
 DocType: Training Event,Trainer Email,trenér Email
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Materiál Žádosti {0} vytvořené
+DocType: Restaurant Reservation,No of People,Počet lidí
 DocType: Production Planning Tool,Include sub-contracted raw materials,Zahrnout sub-smluvní suroviny
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Šablona podmínek nebo smlouvy.
 DocType: Purchase Invoice,Address and Contact,Adresa a Kontakt
@@ -3175,10 +3235,11 @@
 DocType: Supplier,Last Day of the Next Month,Poslední den následujícího měsíce
 DocType: Support Settings,Auto close Issue after 7 days,Auto v blízkosti Issue po 7 dnech
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Dovolená nemůže být přiděleny před {0}, protože rovnováha dovolené již bylo carry-předávány v budoucí přidělení dovolenou záznamu {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Poznámka: Z důvodu / Referenční datum překračuje povolené zákazníků úvěrové dní od {0} den (s)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Poznámka: Z důvodu / Referenční datum překračuje povolené zákazníků úvěrové dní od {0} den (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Žadatel
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINÁL PRO PŘÍJEMCE
 DocType: Asset Category Account,Accumulated Depreciation Account,Účet oprávek
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Tento e-mail je automaticky generován
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Příspěvky
 DocType: Program Enrollment,Boarding Student,Stravující student
 DocType: Asset,Expected Value After Useful Life,Očekávaná hodnota po celou dobu životnosti
@@ -3186,7 +3247,7 @@
 DocType: Activity Cost,Billing Rate,Fakturace Rate
 ,Qty to Deliver,Množství k dodání
 ,Stock Analytics,Stock Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Operace nemůže být prázdné
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Operace nemůže být prázdné
 DocType: Maintenance Visit Purpose,Against Document Detail No,Proti Detail dokumentu č
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Typ strana je povinná
 DocType: Quality Inspection,Outgoing,Vycházející
@@ -3208,7 +3269,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Vyberte studenty ručně pro skupinu založenou na aktivitách
 DocType: Journal Entry,User Remark,Uživatel Poznámka
 DocType: Lead,Market Segment,Segment trhu
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Zaplacená částka nemůže být vyšší než celkový negativní dlužné částky {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Zaplacená částka nemůže být vyšší než celkový negativní dlužné částky {0}
 DocType: Supplier Scorecard Period,Variables,Proměnné
 DocType: Employee Internal Work History,Employee Internal Work History,Interní historie práce zaměstnance
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Uzavření (Dr)
@@ -3237,21 +3298,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Získat aktualizace
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Účet {2} nepatří do společnosti {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Materiál Request {0} je zrušena nebo zastavena
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Správa absencí
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Správa absencí
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Seskupit podle účtu
 DocType: Sales Order,Fully Delivered,Plně Dodáno
 DocType: Lead,Lower Income,S nižšími příjmy
+DocType: Restaurant Order Entry,Current Order,Aktuální objednávka
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Zdroj a cíl sklad nemůže být stejná pro řádek {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Rozdíl účet musí být typu aktiv / Odpovědnost účet, protože to Reklamní Smíření je Entry Otevření"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Zaplacené částky nemůže být větší než Výše úvěru {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Přejděte na položku Programy
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Výrobní příkaz nebyl vytvořen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Výrobní příkaz nebyl vytvořen
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Datum DO"" musí být po ""Datum OD"""
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Nemůže změnit statut studenta {0} je propojen s aplikací studentské {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Nemůže změnit statut studenta {0} je propojen s aplikací studentské {1}
 DocType: Asset,Fully Depreciated,plně odepsán
 ,Stock Projected Qty,Reklamní Plánovaná POČET
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Výrazná Účast HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Citace jsou návrhy, nabídky jste svým zákazníkům odeslané"
 DocType: Sales Order,Customer's Purchase Order,Zákazníka Objednávka
@@ -3262,8 +3324,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Prosím nastavte Počet Odpisy rezervováno
 DocType: Supplier Scorecard Period,Calculations,Výpočty
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Hodnota nebo Množství
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Productions Objednávky nemůže být zvýšena pro:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Productions Objednávky nemůže být zvýšena pro:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Minuta
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte prosím jmenovací řadu pro {0} přes Nastavení&gt; Nastavení&gt; Pojmenování
 DocType: Purchase Invoice,Purchase Taxes and Charges,Nákup Daně a poplatky
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Přejděte na dodavatele
 ,Qty to Receive,Množství pro příjem
@@ -3276,7 +3339,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Připsat na účet musí být účtu Rozvaha
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Všechny typy Dodavatele
 DocType: Global Defaults,Disable In Words,Zakázat ve slovech
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Kód položky je povinné, protože položka není automaticky číslovány"
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,"Kód položky je povinné, protože položka není automaticky číslovány"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Nabídka {0} není typu {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Plán údržby Item
 DocType: Sales Order,%  Delivered,% Dodáno
@@ -3298,23 +3361,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Počáteční stav Equity
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Smíření
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Zbývající
 DocType: Appraisal,Appraisal,Ocenění
 DocType: Purchase Invoice,GST Details,Podrobnosti GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},E-mailu zaslaného na dodavatele {0}
+DocType: Item,Default Sales Unit of Measure,Výchozí prodejní jednotka měření
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum se opakuje
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Prokurista
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Schvalovatel absence musí být jedním z {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Vytvořte poplatky
-DocType: Hub Settings,Seller Email,Prodávající E-mail
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Celkové pořizovací náklady (přes nákupní faktury)
 DocType: Training Event,Start Time,Start Time
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Zvolte množství
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Zvolte množství
 DocType: Customs Tariff Number,Customs Tariff Number,Celního sazebníku
 DocType: Patient Appointment,Patient Appointment,Setkání pacienta
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Schválení role nemůže být stejná jako role pravidlo se vztahuje na
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Odhlásit se z tohoto Email Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Odhlásit se z tohoto Email Digest
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Získejte dodavatele
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} nebyl nalezen pro položku {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Přejděte na Kurzy
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Zpráva byla odeslána
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Účet s podřízené uzly nelze nastavit jako hlavní knihy
@@ -3327,11 +3393,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Materiál Přenesená pro výrobu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Účet {0} neexistuje
 DocType: Project,Project Type,Typ projektu
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Dětská úloha existuje pro tuto úlohu. Tuto úlohu nelze odstranit.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Buď cílové množství nebo cílová částka je povinná.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Náklady na různých aktivit
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Žádné další výsledky
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Náklady na různých aktivit
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Nastavení událostí do {0}, protože zaměstnanec připojena k níže prodejcům nemá ID uživatele {1}"
 DocType: Timesheet,Billing Details,fakturační údaje
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Zdrojové a cílové sklad se musí lišit
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Zdrojové a cílové sklad se musí lišit
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Není dovoleno měnit obchodů s akciemi starší než {0}
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Plně Fakturovaný
@@ -3357,7 +3425,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Bankovní převod
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Zkontrolovat vše
 DocType: Vehicle Log,Invoice Ref,Faktura Ref
-DocType: Purchase Order,Recurring Order,Opakující se objednávky
 DocType: Company,Default Income Account,Účet Default příjmů
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Zákazník Group / Customer
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Neuzavřený fiskálních let Zisk / ztráta (Credit)
@@ -3371,9 +3438,9 @@
 DocType: Patient,A Negative,Negativní
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Nic víc ukázat.
 DocType: Lead,From Customer,Od Zákazníka
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Volá
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Volá
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Produkt
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,Dávky
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,Dávky
 DocType: Project,Total Costing Amount (via Time Logs),Celková kalkulace Částka (přes Time Záznamy)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Udělat rozpis poplatků
 DocType: Purchase Order Item Supplied,Stock UOM,Reklamní UOM
@@ -3397,7 +3464,7 @@
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Listy a Holiday
 DocType: School Settings,Current Academic Term,Aktuální akademické označení
 DocType: Sales Order,Not Billed,Ne Účtovaný
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Oba Sklady musí patřit do stejné společnosti
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Oba Sklady musí patřit do stejné společnosti
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Žádné kontakty přidán dosud.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Přistál Náklady Voucher Částka
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Směnky vznesené dodavately
@@ -3406,7 +3473,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Částka slevy
 DocType: Purchase Invoice,Return Against Purchase Invoice,Návrat proti nákupní faktury
 DocType: Item,Warranty Period (in days),Záruční doba (ve dnech)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',aktualizovat `tabPatient Appointment` nastavit sales_invoice = &#39;{0}&#39; kde name = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Souvislost s Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Čistý peněžní tok z provozní
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Bod 4
@@ -3415,8 +3481,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Zápis do deníku Účet
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student Group
 DocType: Shopping Cart Settings,Quotation Series,Číselná řada nabídek
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Položka existuje se stejným názvem ({0}), prosím, změnit název skupiny položky nebo přejmenovat položku"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Vyberte zákazníka
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Položka existuje se stejným názvem ({0}), prosím, změnit název skupiny položky nebo přejmenovat položku"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Vyberte zákazníka
 DocType: C-Form,I,já
 DocType: Company,Asset Depreciation Cost Center,Asset Odpisy nákladového střediska
 DocType: Sales Order Item,Sales Order Date,Prodejní objednávky Datum
@@ -3425,12 +3491,13 @@
 DocType: Assessment Plan,Assessment Plan,Plan Assessment
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Zákazník {0} je vytvořen.
 DocType: Stock Settings,Limit Percent,Limit Procento
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,V současné době žádné skladové zásoby nejsou k dispozici
 ,Payment Period Based On Invoice Date,Platební období na základě data vystavení faktury
 DocType: Sample Collection,No. of print,Počet tisku
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Chybí Směnárna Kurzy pro {0}
 DocType: Assessment Plan,Examiner,Zkoušející
 DocType: Patient Relation,Siblings,sourozenci
-DocType: Journal Entry,Stock Entry,Skladová karta
+DocType: Journal Entry,Stock Entry,Skladový pohyb
 DocType: Payment Entry,Payment References,Platební Reference
 DocType: C-Form,C-FORM-,C-form-
 DocType: Vehicle,Insurance Details,pojištění Podrobnosti
@@ -3480,13 +3547,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Hrubé mzdy - Total dedukce - splátky
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,Aktuální BOM a nový BOM nemůže být stejný
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Plat Slip ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Plat Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,"Datum odchodu do důchodu, musí být větší než Datum spojování"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,"Došlo k chybám, zatímco rozvrhování kurz na:"
 DocType: Sales Invoice,Against Income Account,Proti účet příjmů
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% dodáno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Položka {0}: Objednané množství {1} nemůže být nižší než minimální Objednané množství {2} (definované v bodu).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Položka {0}: Objednané množství {1} nemůže být nižší než minimální Objednané množství {2} (definované v bodu).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Měsíční Distribution Procento
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Přihlaste se jako další uživatel.
 DocType: Territory,Territory Targets,Území Cíle
 DocType: Delivery Note,Transporter Info,Transporter Info
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Prosím nastavit výchozí {0} ve firmě {1}
@@ -3494,13 +3562,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Stejný dodavatel byl zadán vícekrát
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Hrubý zisk / ztráta
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Dodané položky vydané objednávky
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Název společnosti nemůže být Company
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Název společnosti nemůže být Company
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Hlavičkové listy pro tisk šablon.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Tituly na tiskových šablon, např zálohové faktury."
 DocType: Program Enrollment,Walking,Chůze
 DocType: Student Guardian,Student Guardian,Student Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Poplatky typu ocenění může není označen jako Inclusive
 DocType: POS Profile,Update Stock,Aktualizace skladem
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,v předplatném
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Různé UOM položky povede k nesprávné (celkem) Čistá hmotnost hodnoty. Ujistěte se, že čistá hmotnost každé položky je ve stejném nerozpuštěných."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,Zápis do deníku do šrotu
@@ -3538,7 +3607,7 @@
 DocType: Cheque Print Template,Width of amount in word,Šířka částky ve slově
 DocType: Company,Default Letter Head,Výchozí hlavičkový
 DocType: Purchase Order,Get Items from Open Material Requests,Položka získaná z žádostí Otevřít Materiál
-DocType: Lab Test Template,Standard Selling Rate,Standardní prodejní kurz
+DocType: Lab Test Template,Standard Selling Rate,Standardní prodejní cena
 DocType: Account,Rate at which this tax is applied,"Sazba, při které se používá tato daň"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +65,Reorder Qty,Změna pořadí Množství
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Aktuální pracovní příležitosti
@@ -3548,15 +3617,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System User (login) ID. Pokud je nastaveno, stane se výchozí pro všechny formy HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Z {1}
 DocType: Task,depends_on,záleží na
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Naladil se na aktualizaci nejnovější ceny ve všech kusovnících. Může to trvat několik minut.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Naladil se na aktualizaci nejnovější ceny ve všech kusovnících. Může to trvat několik minut.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Název nového účtu. Poznámka: Prosím, vytvářet účty pro zákazníky a dodavateli"
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Země moudrý výchozí adresa Templates
 DocType: Sales Order Item,Supplier delivers to Customer,Dodavatel doručí zákazníkovi
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Položka / {0}) není na skladě
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Vzhledem / Referenční datum nemůže být po {0}
+,Sales Payment Summary,Přehled plateb prodeje
+DocType: Restaurant,Restaurant,Restaurace
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Vzhledem / Referenční datum nemůže být po {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Import dat a export
 DocType: Patient,Account Details,Údaje o účtu
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Žádní studenti Nalezené
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Žádní studenti Nalezené
 DocType: Medical Department,Medical Department,Lékařské oddělení
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Kritéria hodnocení skóre dodavatele skóre
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Faktura Datum zveřejnění
@@ -3567,7 +3638,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,"Prosím, vyberte Datum zveřejnění před výběrem Party"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Vyberte prosím citace
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Vyberte prosím citace
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Počet Odpisy rezervováno nemůže být větší než celkový počet Odpisy
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Proveďte návštěv údržby
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,"Prosím, kontaktujte pro uživatele, kteří mají obchodní manažer ve skupině Master {0} roli"
@@ -3575,7 +3646,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Company (nikoliv zákazník nebo dodavatel) master.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,To je založeno na účasti tohoto studenta
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Žádné studenty v
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Přidat další položky nebo otevřené plné formě
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Přidat další položky nebo otevřené plné formě
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dodací listy {0} musí být zrušena před zrušením této prodejní objednávky
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Přejděte na položku Uživatelé
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Uhrazená částka + odepsaná částka nesmí být větší než celková částka
@@ -3591,41 +3662,44 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Nesprávný počet hlavní knihy záznamů nalezen. Pravděpodobně jste zvolili nesprávný účet v transakci.
 DocType: Employee,Prefered Contact Email,Preferovaný Kontaktní e-mail
 DocType: Cheque Print Template,Cheque Width,Šek Šířka
-DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Ověření prodejní cena výtisku proti platbě nebo ocenění Rate
+DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Ověření prodejní ceny položky proti nákupní ceně nebo ocenění
 DocType: Fee Schedule,Fee Schedule,poplatek Plán
 DocType: Hub Settings,Publish Availability,Publikování Dostupnost
 DocType: Company,Create Chart Of Accounts Based On,Vytvořte účtový rozvrh založený na
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Nelze jej převést na jinou než skupinu. Dětské úkoly existují.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Datum narození nemůže být větší než dnes.
 ,Stock Ageing,Reklamní Stárnutí
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Existují Student {0} proti uchazeč student {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Úprava zaokrouhlení (měna společnosti)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Rozvrh hodin
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Rozvrh hodin
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' je vypnuté
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nastavit jako Otevřít
 DocType: Cheque Print Template,Scanned Cheque,skenovaných Šek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Posílat automatické e-maily na Kontakty na předložení transakcí.
 DocType: Timesheet,Total Billable Amount,Celková částka Zúčtovatelná
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Položka 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Zadání objednávky
 DocType: Purchase Order,Customer Contact Email,Zákazník Kontaktní e-mail
 DocType: Warranty Claim,Item and Warranty Details,Položka a Záruka Podrobnosti
 DocType: Sales Team,Contribution (%),Příspěvek (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Poznámka: Položka Platba nebude vytvořili, protože ""v hotovosti nebo bankovním účtu"" nebyl zadán"
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Projekt {0} již existuje
 DocType: Medical Department,Nursing User,Ošetřujícího uživatele
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Odpovědnost
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Platnost této nabídky skončila.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Platnost této nabídky skončila.
 DocType: Expense Claim Account,Expense Claim Account,Náklady na pojistná Account
 DocType: Accounts Settings,Allow Stale Exchange Rates,Povolit stávající kurzy měn
 DocType: Sales Person,Sales Person Name,Prodej Osoba Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Zadejte prosím aspoň 1 fakturu v tabulce
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Přidat uživatele
-DocType: POS Item Group,Item Group,Položka Group
-DocType: Item,Safety Stock,bezpečnostní Sklad
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Přidat uživatele
+DocType: POS Item Group,Item Group,Skupina položek
+DocType: Item,Safety Stock,Bezpečné skladové množství
 DocType: Healthcare Settings,Healthcare Settings,Nastavení zdravotní péče
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Pokrok% za úkol nemůže být více než 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Pokrok% za úkol nemůže být více než 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Před smíření
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Chcete-li {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Daně a poplatky Přidal (Company měna)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Položka Tax Row {0} musí mít účet typu daní či výnosů nebo nákladů, nebo Vyměřovací"
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Položka Tax Row {0} musí mít účet typu daní či výnosů nebo nákladů, nebo Vyměřovací"
 DocType: Sales Order,Partly Billed,Částečně Účtovaný
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Item {0} musí být dlouhodobá aktiva položka
 DocType: Item,Default BOM,Výchozí BOM
@@ -3641,6 +3715,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,Proměnná
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Z Dodacího Listu
 DocType: Student,Student Email Address,Student E-mailová adresa
+DocType: Item,Hub Warehouse,Hub Warehouse
 DocType: Physician Schedule Time Slot,From Time,Času od
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Na skladě:
 DocType: Notification Control,Custom Message,Custom Message
@@ -3648,9 +3723,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,V hotovosti nebo bankovním účtu je povinný pro výrobu zadání platebního
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Studentská adresa
 DocType: Purchase Invoice,Price List Exchange Rate,Katalogová cena Exchange Rate
+DocType: POS Profile,POS Profile Name,Název profilu POS
 DocType: Purchase Invoice Item,Rate,Cena
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Internovat
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,adresa Jméno
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,adresa Jméno
 DocType: Stock Entry,From BOM,Od BOM
 DocType: Assessment Code,Assessment Code,Kód Assessment
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Základní
@@ -3664,11 +3740,12 @@
 DocType: Salary Slip,Salary Structure,Plat struktura
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Letecká linka
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Vydání Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Vydání Material
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Při vytváření opakování se vyskytla chyba
 DocType: Material Request Item,For Warehouse,Pro Sklad
 DocType: Employee,Offer Date,Nabídka Date
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citace
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,"Jste v režimu offline. Nebudete moci obnovit stránku, dokud nebudete na síťi."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,"Jste v režimu offline. Nebudete moci obnovit stránku, dokud nebudete na síťi."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Žádné studentské skupiny vytvořen.
 DocType: Purchase Invoice Item,Serial No,Výrobní číslo
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Měsíční splátka částka nemůže být větší než Výše úvěru
@@ -3678,17 +3755,18 @@
 DocType: Salary Slip,Total Working Hours,Celkové pracovní doby
 DocType: Subscription,Next Schedule Date,Další rozvrh datum
 DocType: Stock Entry,Including items for sub assemblies,Včetně položek pro podsestav
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Zadejte hodnota musí být kladná
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Všechny území
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Zadejte hodnota musí být kladná
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Všechny území
 DocType: Purchase Invoice,Items,Položky
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student je již zapsáno.
 DocType: Fiscal Year,Year Name,Jméno roku
 DocType: Process Payroll,Process Payroll,Proces Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Existují další svátky než pracovních dnů tento měsíc.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Existují další svátky než pracovních dnů tento měsíc.
 DocType: Product Bundle Item,Product Bundle Item,Product Bundle Item
 DocType: Sales Partner,Sales Partner Name,Sales Partner Name
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Žádost o citátů
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Žádost o citátů
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maximální částka faktury
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hematologie
 DocType: Normal Test Items,Normal Test Items,Normální testovací položky
 DocType: Student Language,Student Language,Student Language
 apps/erpnext/erpnext/config/selling.py +23,Customers,zákazníci
@@ -3699,10 +3777,11 @@
 DocType: Issue,Opening Time,Otevírací doba
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Data OD a DO jsou vyžadována
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Cenné papíry a komoditních burzách
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Výchozí měrná jednotka varianty &#39;{0}&#39; musí být stejný jako v Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Výchozí měrná jednotka varianty &#39;{0}&#39; musí být stejný jako v Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Vypočítat založené na
 DocType: Delivery Note Item,From Warehouse,Ze skladu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Žádné položky s Billem materiálů k výrobě
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Žádné položky s Billem materiálů k výrobě
+DocType: Restaurant,Default Customer,Výchozí zákazník
 DocType: Assessment Plan,Supervisor Name,Jméno Supervisor
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Nepotvrzujte, zda je událost vytvořena ve stejný den"
 DocType: Program Enrollment Course,Program Enrollment Course,Program pro zápis do programu
@@ -3729,7 +3808,7 @@
 DocType: Payment Entry,Internal Transfer,vnitřní Převod
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Dětské konto existuje pro tento účet. Nemůžete smazat tento účet.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Buď cílové množství nebo cílová částka je povinná
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,"Prosím, vyberte nejprve Datum zveřejnění"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Datum zahájení by měla být před uzávěrky
 DocType: Leave Control Panel,Carry Forward,Převádět
@@ -3764,13 +3843,14 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Celkem Present
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,účetní závěrka
 DocType: Drug Prescription,Hour,Hodina
+DocType: Restaurant Order Entry,Last Sales Invoice,Poslední prodejní faktura
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nové seriové číslo nemůže mít záznam skladu. Sklad musí být nastaven přes skladovou kartu nebo nákupní doklad
 DocType: Lead,Lead Type,Typ leadu
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Nejste oprávněni schvalovat listí na bloku Termíny
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +383,All these items have already been invoiced,Všechny tyto položky již byly fakturovány
 DocType: Company,Monthly Sales Target,Měsíční prodejní cíl
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Může být schválena {0}
-DocType: Item,Default Material Request Type,Výchozí materiál Typ požadavku
+DocType: Item,Default Material Request Type,Výchozí typ požadavku na zásobování
 DocType: Supplier Scorecard,Evaluation Period,Hodnocené období
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,Neznámý
 DocType: Shipping Rule,Shipping Rule Conditions,Přepravní Článek Podmínky
@@ -3798,64 +3878,66 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Vytvořit uživatele
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,Gram
 DocType: Supplier Scorecard,Per Month,Za měsíc
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,"Množství, které má výroba musí být větší než 0 ° C."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,"Množství, které má výroba musí být větší než 0 ° C."
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Navštivte zprávu pro volání údržby.
 DocType: Stock Entry,Update Rate and Availability,Obnovovací rychlost a dostupnost
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procento máte možnost přijímat nebo dodávat více proti objednaného množství. Například: Pokud jste si objednali 100 kusů. a váš příspěvek je 10%, pak máte možnost získat 110 jednotek."
 DocType: POS Customer Group,Customer Group,Zákazník Group
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Nové číslo dávky (volitelné)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Nové číslo dávky (volitelné)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Účtet nákladů je povinný pro položku {0}
 DocType: BOM,Website Description,Popis webu
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Čistá změna ve vlastním kapitálu
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Nejnovější
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Zrušte faktuře {0} první
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mailová adresa musí být jedinečná, již existuje pro {0}"
 DocType: Serial No,AMC Expiry Date,AMC Datum vypršení platnosti
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,Příjem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,Příjem
 ,Sales Register,Sales Register
 DocType: Daily Work Summary Settings Company,Send Emails At,Posílat e-maily At
 DocType: Quotation,Quotation Lost Reason,Důvod ztráty nabídky
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Vyberte si doménu
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',vyberte * z tabPatient kde name = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Referenční transakce no {0} ze dne {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Referenční transakce no {0} ze dne {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Není nic upravovat.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Zobrazení formuláře
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Shrnutí pro tento měsíc a probíhajícím činnostem
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Zobrazení formuláře
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Shrnutí pro tento měsíc a probíhajícím činnostem
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Přidejte uživatele do vaší organizace, kromě vás."
 DocType: Customer Group,Customer Group Name,Zákazník Group Name
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Zatím žádné zákazníky!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Zatím žádné zákazníky!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Přehled o peněžních tocích
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Výše úvěru nesmí být vyšší než Maximální výše úvěru částku {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licence
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Prosím, vyberte převádět pokud chcete také zahrnout uplynulý fiskální rok bilance listy tohoto fiskálního roku"
 DocType: GL Entry,Against Voucher Type,Proti poukazu typu
 DocType: Physician,Phone (R),Telefon (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Byly přidány časové úseky
 DocType: Item,Attributes,Atributy
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Povolit šablonu
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte prosím jmenovací řadu pro {0} přes Nastavení&gt; Nastavení&gt; Pojmenování
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,"Prosím, zadejte odepsat účet"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Datum poslední objednávky
 DocType: Patient,B Negative,B Negativní
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Účet {0} nepatří společnosti {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Sériová čísla v řádku {0} neodpovídají poznámce k doručení
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Sériová čísla v řádku {0} neodpovídají poznámce k doručení
 DocType: Student,Guardian Details,Guardian Podrobnosti
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark docházky pro více zaměstnanců
 DocType: Vehicle,Chassis No,podvozek Žádné
 DocType: Payment Request,Initiated,Zahájil
 DocType: Production Order,Planned Start Date,Plánované datum zahájení
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Vyberte kusovníku
 DocType: Serial No,Creation Document Type,Tvorba Typ dokumentu
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Datum ukončení musí být větší než datum zahájení
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Datum ukončení musí být větší než datum zahájení
 DocType: Leave Type,Is Encash,Je inkasovat
 DocType: Leave Allocation,New Leaves Allocated,Nové Listy Přidělené
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Data dle projektu nejsou k dispozici pro nabídku
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Ukončete
 DocType: Project,Expected End Date,Očekávané datum ukončení
 DocType: Budget Account,Budget Amount,rozpočet Částka
 DocType: Appraisal Template,Appraisal Template Title,Posouzení Template Název
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Datum od {0} pro zaměstnance {1} nemůže být před nástupem Datum zaměstnance {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Obchodní
 DocType: Patient,Alcohol Current Use,Alkohol Současné použití
+DocType: Student Admission Program,Student Admission Program,Studentský přijímací program
 DocType: Payment Entry,Account Paid To,Účet Věnována
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent Item {0} nesmí být skladem
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Všechny výrobky nebo služby.
@@ -3864,30 +3946,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Rozpočet na účet {1} proti {2} {3} je {4}. To bude přesahovat o {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Řádek {0} # účet musí být typu &quot;Fixed Asset&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Out Množství
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Pravidla pro výpočet výše přepravní na prodej
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,a zrušeno Zakázáno v
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Série je povinné
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finanční služby
 DocType: Student Sibling,Student ID,Student ID
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Typy činností pro Time Záznamy
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,E-mail dodavatele
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Typy činností pro Time Záznamy
 DocType: Tax Rule,Sales,Prodej
 DocType: Stock Entry Detail,Basic Amount,Základní částka
 DocType: Training Event,Exam,Zkouška
 DocType: Complaint,Complaint,Stížnost
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
 DocType: Leave Allocation,Unused leaves,Nepoužité listy
 DocType: Patient,Alcohol Past Use,Alkohol v minulosti
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Fakturace State
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Převod
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Převod
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
 DocType: Authorization Rule,Applicable To (Employee),Vztahující se na (Employee)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Datum splatnosti je povinné
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Datum splatnosti je povinné
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Přírůstek pro atribut {0} nemůže být 0
 DocType: Journal Entry,Pay To / Recd From,Platit K / Recd Z
 DocType: Naming Series,Setup Series,Nastavení číselných řad
 DocType: Payment Reconciliation,To Invoice Date,Chcete-li data vystavení faktury
 DocType: Supplier,Contact HTML,Kontakt HTML
 ,Inactive Customers,neaktivní zákazníci
+DocType: Student Admission Program,Maximum Age,Maximální věk
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Příjmky
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Jak je pravidlo platby aplikováno?
@@ -3906,6 +3990,7 @@
 DocType: GL Entry,Remarks,Poznámky
 DocType: Payment Entry,Account Paid From,Účet jsou placeni z prostředků
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Surovina Kód položky
+DocType: Task,Parent Task,Rodičovská úloha
 DocType: Journal Entry,Write Off Based On,Odepsat založené na
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Udělat Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Tisk a papírnictví
@@ -3914,24 +3999,24 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Plat již zpracovány pro období mezi {0} a {1}, ponechte dobu použitelnosti nemůže být mezi tomto časovém období."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Instalace rekord pro sériové číslo
 DocType: Guardian Interest,Guardian Interest,Guardian Zájem
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Nastavení výchozích hodnot pro POS faktury
 apps/erpnext/erpnext/config/hr.py +177,Training,Výcvik
 DocType: Timesheet,Employee Detail,Detail zaměstnanec
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ID e-mailu Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,den následujícímu dni a Opakujte na den v měsíci se musí rovnat
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,den následujícímu dni a Opakujte na den v měsíci se musí rovnat
 DocType: Lab Prescription,Test Code,Testovací kód
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Nastavení titulní stránce webu
 DocType: Offer Letter,Awaiting Response,Čeká odpověď
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Výše
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Celková částka {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Neplatný atribut {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Celková částka {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Neplatný atribut {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Uvedete-li neštandardní splatný účet
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Stejná položka byla zadána několikrát. {seznam}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Vyberte jinou skupinu hodnocení než skupinu Všechny skupiny
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Řádek {0}: pro položku {1} je požadováno nákladové středisko.
 DocType: Training Event Employee,Optional,Volitelný
 DocType: Salary Slip,Earning & Deduction,Výdělek a dedukce
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Volitelné. Toto nastavení bude použito k filtrování v různých transakcí.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativní ocenění Rate není povoleno
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativní ocenění není povoleno
 DocType: Holiday List,Weekly Off,Týdenní Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Pro např 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +96,Provisional Profit / Loss (Credit),Prozatímní Zisk / ztráta (Credit)
@@ -3948,19 +4033,20 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Nákladové středisko je povinný údaj pro položku {2}
 DocType: Vehicle,Policy No,Ne politika
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Položka získaná ze souboru výrobků
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Protože existuje zásoba proti položce {0}, nemůžete povolit vlastnosti variant"
 DocType: Asset,Straight Line,Přímka
 DocType: Project User,Project User,projekt Uživatel
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Rozdělit
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Rozdělit
 DocType: GL Entry,Is Advance,Je Zálohová
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Účast Datum od a docházky do dnešního dne je povinná
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,"Prosím, zadejte ""subdodavatelům"" jako Ano nebo Ne"
+DocType: Item,Default Purchase Unit of Measure,Výchozí nákupní měrná jednotka
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Poslední datum komunikace
 DocType: Sales Team,Contact No.,Kontakt Číslo
 DocType: Bank Reconciliation,Payment Entries,Platební Příspěvky
 DocType: Production Order,Scrap Warehouse,šrot Warehouse
 DocType: Production Order,Check if material transfer entry is not required,"Zkontrolujte, zda není požadováno zadání materiálu"
 DocType: Program Enrollment Tool,Get Students From,Získat studenty z
-DocType: Hub Settings,Seller Country,Prodejce Country
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publikovat položky na webových stránkách
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Skupina vaši studenti v dávkách
 DocType: Authorization Rule,Authorization Rule,Autorizační pravidlo
@@ -3970,7 +4056,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Prodej Daně a poplatky šablony
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Celkový (Credit)
 DocType: Repayment Schedule,Payment Date,Datum splatnosti
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nové dávkové množství
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Nové dávkové množství
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Oblečení a doplňky
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,"Nelze vyřešit funkci váženého skóre. Zkontrolujte, zda je vzorec platný."
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Číslo objednávky
@@ -3988,6 +4074,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Řádek # {0}: Asset {1} nemůže být předložen, je již {2}"
 DocType: Tax Rule,Billing Country,Fakturace Země
 DocType: Purchase Order Item,Expected Delivery Date,Očekávané datum dodání
+DocType: Restaurant Order Entry,Restaurant Order Entry,Vstup do objednávky restaurace
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetní a kreditní nerovná za {0} # {1}. Rozdíl je v tom {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Výdaje na reprezentaci
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Udělat Materiál Request
@@ -4000,9 +4087,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Účet s transakcemi nemůže být smazán
 DocType: Vehicle,Last Carbon Check,Poslední Carbon Check
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Výdaje na právní služby
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Vyberte množství v řadě
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Vyberte množství v řadě
 DocType: Purchase Invoice,Posting Time,Čas zadání
 DocType: Timesheet,% Amount Billed,% Fakturované částky
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Čas na schůzku&quot; nebyl nastaven pro Dr {0}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefonní Náklady
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Zaškrtněte, pokud chcete, aby uživateli vybrat sérii před uložením. Tam bude žádná výchozí nastavení, pokud jste zkontrolovat."
@@ -4013,6 +4101,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nový zákazník Příjmy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Cestovní výdaje
 DocType: Maintenance Visit,Breakdown,Rozbor
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Přidání vlastního pole Subscription do doctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Účet: {0} s měnou: {1} nelze vybrat
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Aktualizujte náklady na BOM automaticky pomocí programu Plánovač, založený na nejnovější hodnotící sazbě / ceníku / posledním nákupu surovin."
 DocType: Bank Reconciliation Detail,Cheque Date,Šek Datum
@@ -4037,7 +4126,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Celkem Billing Částka (přes Time Záznamy)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Dodavatel Id
 DocType: Payment Request,Payment Gateway Details,Platební brána Podrobnosti
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Množství by měla být větší než 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Množství by měla být větší než 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Podřízené uzly mohou být vytvořeny pouze na základě typu uzly &quot;skupina&quot;
 DocType: Leave Application,Half Day Date,Half Day Date
@@ -4055,12 +4144,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Poznámka: Položka {0} vstoupil vícekrát
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Všechny kontakty.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Zkratka Company
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Uživatel: {0} neexistuje
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Uživatel: {0} neexistuje
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Zkratka
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Platba Entry již existuje
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Není authroized od {0} překročí limity
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Plat master šablona.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Patologie
+DocType: Restaurant Order Entry,Restaurant Table,Restaurace Tabulka
 DocType: Leave Type,Max Days Leave Allowed,Max Days Leave povolena
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Sada Daňové Pravidlo pro nákupního košíku
 DocType: Purchase Invoice,Taxes and Charges Added,Daně a poplatky přidané
@@ -4072,10 +4163,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Nabídka pro Lead nebo pro Zákazníka
 DocType: Stock Settings,Role Allowed to edit frozen stock,Role povoleno upravovat zmrazené zásoby
 ,Territory Target Variance Item Group-Wise,Území Cílová Odchylka Item Group-Wise
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Všechny skupiny zákazníků
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Všechny skupiny zákazníků
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,nahromaděné za měsíc
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možná není vytvořen záznam směnného kurzu pro {1} na {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Daňová šablona je povinné.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Daňová šablona je povinné.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Účet {0}: Nadřazený účet {1} neexistuje
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ceník Rate (Company měny)
 DocType: Products Settings,Products Settings,Nastavení Produkty
@@ -4101,14 +4192,14 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Položka Wise Tax Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,institut Zkratka
 ,Item-wise Price List Rate,Item-moudrý Ceník Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Dodavatel Nabídka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Dodavatel Nabídka
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Ve slovech budou viditelné, jakmile uložíte nabídku."
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Množství ({0}) nemůže být zlomek v řádku {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Pravidla pro přidávání náklady na dopravu.
-DocType: Item,Opening Stock,otevření Sklad
+DocType: Item,Opening Stock,Počáteční stav zásob
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Je nutná zákazník
 DocType: Lab Test,Result Date,Datum výsledku
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} je povinné pro návrat
@@ -4125,9 +4216,8 @@
 DocType: Customer,From Lead,Od Leadu
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Objednávky uvolněna pro výrobu.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Vyberte fiskálního roku ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,"POS Profile požadováno, aby POS Vstup"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,"POS Profile požadováno, aby POS Vstup"
 DocType: Program Enrollment Tool,Enroll Students,zapsat studenti
-DocType: Hub Settings,Name Token,Jméno Token
 DocType: Lab Test,Approved Date,Datum schválení
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardní prodejní
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Alespoň jeden sklad je povinný
@@ -4145,7 +4235,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Lidské Zdroje
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Platba Odsouhlasení Platba
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Daňové Aktiva
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Produkční objednávka byla {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Produkční objednávka byla {0}
 DocType: BOM Item,BOM No,Číslo kusovníku
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Zápis do deníku {0} nemá účet {1} nebo již uzavřeno proti ostatním poukaz
@@ -4165,7 +4255,7 @@
 DocType: Currency Exchange,To Currency,Chcete-li měny
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Nechte následující uživatelé schválit Žádost o dovolenou.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Druhy výdajů nároku.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Prodejní cena pro položku {0} je nižší než její {1}. Míra prodeje by měla být nejméně {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Prodejní cena pro položku {0} je nižší než její {1}. Míra prodeje by měla být nejméně {2}
 DocType: Item,Taxes,Daně
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Uhrazené a nedoručené
 DocType: Project,Default Cost Center,Výchozí Center Náklady
@@ -4179,15 +4269,15 @@
 DocType: Employee Loan,Fully Disbursed,zcela vyčerpán
 DocType: Maintenance Visit,Customer Feedback,Zpětná vazba od zákazníků
 DocType: Account,Expense,Výdaj
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Skóre nemůže být větší než maximum bodů
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Skóre nemůže být větší než maximum bodů
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Zákazníci a dodavatelé
 DocType: Item Attribute,From Range,Od Rozsah
-DocType: BOM,Set rate of sub-assembly item based on BOM,Nastavte rychlost položky podsestavy na základě kusovníku
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},syntaktická chyba ve vzorci nebo stavu: {0}
+DocType: BOM,Set rate of sub-assembly item based on BOM,Nastavte ocenění položky podsestavy na základě kusovníku
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},syntaktická chyba ve vzorci nebo stavu: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Každodenní práci Souhrnné Nastavení Company
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,"Položka {0} ignorována, protože to není skladem"
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Odeslat tento výrobní zakázka pro další zpracování.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Odeslat tento výrobní zakázka pro další zpracování.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Nechcete-li použít Ceník článek v dané transakce, by měly být všechny platné pravidla pro tvorbu cen zakázáno."
 DocType: Assessment Group,Parent Assessment Group,Mateřská skupina Assessment
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Jobs
@@ -4204,12 +4294,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Nastavte filtr společnosti prázdný, pokud je Skupina By je &#39;Company&#39;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Vysílání datum nemůže být budoucí datum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Řádek # {0}: Výrobní číslo {1} neodpovídá {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,pro generování opakování
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Casual Leave
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Laboratorní test UOM.
 DocType: Batch,Batch ID,Šarže ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Poznámka: {0}
 ,Delivery Note Trends,Dodací list Trendy
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Tento týden Shrnutí
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Tento týden Shrnutí
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Na skladě Množství
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Účet: {0} lze aktualizovat pouze prostřednictvím Skladových Transakcí
 DocType: Student Group Creation Tool,Get Courses,Získat kurzy
@@ -4223,7 +4314,6 @@
 DocType: Purchase Order,To Bill,Billa
 DocType: Material Request,% Ordered,% objednáno
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Pro kurzovou studentskou skupinu bude kurz pro každého studenta ověřen z přihlášených kurzů při zápisu do programu.
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Zadejte e-mailové adresy oddělené čárkami, faktura bude automaticky zaslán na určitému datu"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Úkolová práce
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Avg. Nákup Rate
 DocType: Task,Actual Time (in Hours),Skutečná doba (v hodinách)
@@ -4237,7 +4327,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Položka {0} není nastavení pro Serial č. Sloupec musí být prázdný
 DocType: Accounts Settings,Accounts Settings,Nastavení účtu
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,Schvalovat
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Žádný výsledek k odeslání
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Žádný výsledek k odeslání
 DocType: Customer,Sales Partner and Commission,Prodej Partner a Komise
 DocType: Employee Loan,Rate of Interest (%) / Year,Úroková sazba (%) / rok
 ,Project Quantity,projekt Množství
@@ -4249,55 +4339,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Černá
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Item
 DocType: Account,Auditor,Auditor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} předměty vyrobené
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} předměty vyrobené
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Další informace
 DocType: Cheque Print Template,Distance from top edge,Vzdálenost od horního okraje
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Ceníková cena {0} je zakázáno nebo neexistuje
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Ceníková cena {0} je zakázáno nebo neexistuje
 DocType: Purchase Invoice,Return,Zpáteční
 DocType: Production Order Operation,Production Order Operation,Výrobní zakázka Operace
 DocType: Pricing Rule,Disable,Zakázat
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Způsob platby je povinen provést platbu
 DocType: Project Task,Pending Review,Čeká Review
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Setkání a konzultace
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} není zapsána v dávce {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} není zapsána v dávce {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Aktiva {0} nemůže být vyhozen, jak je tomu již {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense Claim (via Expense nároku)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Řádek {0}: Měna BOM # {1} by se měla rovnat vybrané měně {2}
 DocType: Journal Entry Account,Exchange Rate,Exchange Rate
 DocType: Patient,Additional information regarding the patient,Další informace týkající se pacienta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
 DocType: Homepage,Tag Line,tag linka
 DocType: Fee Component,Fee Component,poplatek Component
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Fleet management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Přidat položky z
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Fleet management
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Přidat položky z
 DocType: Cheque Print Template,Regular,Pravidelný
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Celková weightage všech hodnotících kritérií musí být 100%
-DocType: BOM,Last Purchase Rate,Poslední nákupní sazba
+DocType: Purchase Order Item,Last Purchase Rate,Poslední nákupní sazba
 DocType: Account,Asset,Majetek
 DocType: Project Task,Task ID,Task ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Sklad nemůže existovat k bodu {0}, protože má varianty"
 DocType: Lab Test,Mobile,"mobilní, pohybliví"
 ,Sales Person-wise Transaction Summary,Prodej Person-moudrý Shrnutí transakce
 DocType: Training Event,Contact Number,Kontaktní číslo
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Sklad {0} neexistuje
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrace pro ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Sklad {0} neexistuje
 DocType: Monthly Distribution,Monthly Distribution Percentages,Měsíční Distribuční Procenta
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Vybraná položka nemůže mít dávku
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Ocenění sazba nebyl nalezen na výtisku {0}, který je k tomu účetních zápisů pro požadovanou {1} {2}. Pokud je položka transakci jako položka vzorek v {1}, prosím zmínit, že v {1} položky tabulky. V opačném případě vytvořte příchozí transakce akcie za položku nebo zmínka sazby ocenění v záznamu položku a potom zkuste odevzdání / zrušení této položky"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materiálů doručeno proti tomuto dodacímu listu
+DocType: Training Event,Has Certificate,Má certifikát
 DocType: Project,Customer Details,Podrobnosti zákazníků
 DocType: Employee,Reports to,Zprávy
 ,Unpaid Expense Claim,Neplacené Náklady na pojistná
 DocType: Payment Entry,Paid Amount,Uhrazené částky
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Prozkoumejte prodejní cyklus
 DocType: Assessment Plan,Supervisor,Dozorce
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,Online
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,Online
 ,Available Stock for Packing Items,K dispozici skladem pro balení položek
 DocType: Item Variant,Item Variant,Položka Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Assessment Tool Výsledek
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Předložené objednávky nelze smazat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Předložené objednávky nelze smazat
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Zůstatek na účtu již v inkasa, není dovoleno stanovit ""Balance musí být"" jako ""úvěru"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Řízení kvality
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Item {0} byl zakázán
@@ -4317,7 +4406,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: časování v rozporu s řadou {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Povolit nulovou míru oceňování
 DocType: Training Event Employee,Invited,Pozván
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Více aktivní Plat Structures nalezených pro zaměstnance {0} pro dané termíny
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Více aktivní Plat Structures nalezených pro zaměstnance {0} pro dané termíny
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Nastavení brány účty.
 DocType: Employee,Employment Type,Typ zaměstnání
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Dlouhodobý majetek
@@ -4325,11 +4414,11 @@
 ,GST Purchase Register,GST Nákupní registr
 ,Cash Flow,Tok peněz
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Období pro podávání žádostí nemůže být na dvou alokace záznamy
-DocType: Item Group,Default Expense Account,Výchozí výdajového účtu
+DocType: Item Group,Default Expense Account,Výchozí výdajový účet
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Student ID e-mailu
 DocType: Employee,Notice (days),Oznámení (dny)
 DocType: Tax Rule,Sales Tax Template,Daň z prodeje Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,"Vyberte položky, které chcete uložit fakturu"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,"Vyberte položky, které chcete uložit fakturu"
 DocType: Employee,Encashment Date,Inkaso Datum
 DocType: Training Event,Internet,Internet
 DocType: Special Test Template,Special Test Template,Speciální zkušební šablona
@@ -4338,7 +4427,7 @@
 DocType: Production Order,Planned Operating Cost,Plánované provozní náklady
 DocType: Academic Term,Term Start Date,Termín Datum zahájení
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},V příloze naleznete {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},V příloze naleznete {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Výpis z bankovního účtu zůstatek podle hlavní knihy
 DocType: Job Applicant,Applicant Name,Žadatel Název
 DocType: Authorization Rule,Customer / Item Name,Zákazník / Název zboží
@@ -4358,7 +4447,7 @@
 DocType: Guardian,Guardian Of ,strážce
 DocType: Grading Scale Interval,Threshold,Práh
 DocType: BOM Update Tool,Current BOM,Aktuální BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Přidat Sériové číslo
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Přidat Sériové číslo
 DocType: Production Order Item,Available Qty at Source Warehouse,Dostupné množství v zdrojovém skladu
 apps/erpnext/erpnext/config/support.py +22,Warranty,Záruka
 DocType: Purchase Invoice,Debit Note Issued,Vydání dluhopisu
@@ -4381,10 +4470,9 @@
 DocType: Account,Receivable,Pohledávky
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Řádek # {0}: Není povoleno měnit dodavatele, objednávky již existuje"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Role, která se nechá podat transakcí, které přesahují úvěrové limity."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Vyberte položky do Výroba
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Kmenová data synchronizace, může to trvat nějaký čas"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Vyberte položky do Výroba
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Kmenová data synchronizace, může to trvat nějaký čas"
 DocType: Item,Material Issue,Material Issue
-DocType: Hub Settings,Seller Description,Prodejce Popis
 DocType: Employee Education,Qualification,Kvalifikace
 DocType: Item Price,Item Price,Položka Cena
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap & Detergent
@@ -4392,7 +4480,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Od doby nemůže být větší než na čas.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Objednáno
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Životopis
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Životopis
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Pokud je tato možnost povolena, systém nebude aktualizovat pole variant z šablony, ale zkopíruje data níže uvedených polí při vytváření nové varianty"
 DocType: Salary Detail,Component,Komponent
 DocType: Assessment Criteria,Assessment Criteria Group,Hodnotící kritéria Group
 DocType: Healthcare Settings,Patient Name By,Jméno pacienta
@@ -4401,8 +4490,8 @@
 DocType: Naming Series,Select Transaction,Vybrat Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Zadejte Schvalování role nebo Schvalování Uživatel
 DocType: Journal Entry,Write Off Entry,Odepsat Vstup
-DocType: BOM,Rate Of Materials Based On,Hodnotit materiálů na bázi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dodavatel&gt; Typ dodavatele
+DocType: BOM,Rate Of Materials Based On,Ocenění materiálů na bázi
+DocType: Item Variant Settings,Do not Update Variants,Neaktualizujte varianty
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Podpora Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Zrušte všechny
 DocType: POS Profile,Terms and Conditions,Podmínky
@@ -4411,7 +4500,7 @@
 DocType: Leave Block List,Applies to Company,Platí pro firmy
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,"Nelze zrušit, protože existuje skladový záznam {0}"
 DocType: Employee Loan,Disbursement Date,výplata Datum
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&quot;Příjemci&quot; nejsou specifikováni
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&quot;Příjemci&quot; nejsou specifikováni
 DocType: BOM Update Tool,Update latest price in all BOMs,Aktualizujte nejnovější cenu všech kusovníků
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Zdravotní záznam
 DocType: Vehicle,Vehicle,Vozidlo
@@ -4426,14 +4515,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Olovo%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Odpisy a zůstatků
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Množství {0} {1} převedena z {2} na {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Množství {0} {1} převedena z {2} na {3}
 DocType: Sales Invoice,Get Advances Received,Získat přijaté zálohy
 DocType: Email Digest,Add/Remove Recipients,Přidat / Odebrat příjemce
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Transakce není povoleno proti zastavila výrobu Objednat {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Chcete-li nastavit tento fiskální rok jako výchozí, klikněte na tlačítko ""Nastavit jako výchozí"""
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Připojit
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Připojit
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Nedostatek Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
 DocType: Employee Loan,Repay from Salary,Splatit z platu
 DocType: Leave Application,LAP/,ÚSEK/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Požadovala vyplacení proti {0} {1} na částku {2}
@@ -4446,7 +4535,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Prodejní objednávky Item
 DocType: Salary Slip,Payment Days,Platební dny
 DocType: Patient,Dormant,Spící
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Sklady s podřízené uzly nelze převést do hlavní účetní knihy
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Sklady s podřízené uzly nelze převést do hlavní účetní knihy
 DocType: BOM,Manage cost of operations,Správa nákladů na provoz
 DocType: Accounts Settings,Stale Days,Stale Days
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Když některý z kontrolovaných operací je ""Odesláno"", email pop-up automaticky otevřeny poslat e-mail na přidružené ""Kontakt"" v této transakci, s transakcí jako přílohu. Uživatel může, ale nemusí odeslat e-mail."
@@ -4460,10 +4549,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Pořadové číslo {0} již obdržel
 ,Requested Items To Be Transferred,Požadované položky mají být převedeny
 DocType: Expense Claim,Vehicle Log,jízd
-DocType: Purchase Invoice,Recurring Id,Opakující se Id
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Přítomnost horečky (teplota&gt; 38,5 ° C nebo trvalá teplota&gt; 38 ° C / 100,4 ° F)"
 DocType: Customer,Sales Team Details,Podrobnosti prodejní tým
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Smazat trvale?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Smazat trvale?
 DocType: Expense Claim,Total Claimed Amount,Celkem žalované částky
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potenciální příležitosti pro prodej.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Neplatný {0}
@@ -4473,7 +4561,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Obchodní domy
 ,Item Delivery Date,Datum dodání položky
 DocType: Warehouse,PIN,KOLÍK
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Nastavte si škola v ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Nastavte si škola v ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Základna Změna Částka (Company měna)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Žádné účetní záznamy pro následující sklady
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Uložte dokument jako první.
@@ -4485,13 +4573,12 @@
 DocType: Task,Is Milestone,Je milník
 DocType: Daily Work Summary,Email Sent To,E-mailem odeslaným
 DocType: Budget,Warn,Varovat
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Opravdu chcete zrušit registraci?
 DocType: Appraisal,"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."
 DocType: BOM,Manufacturing User,Výroba Uživatel
 DocType: Purchase Invoice,Raw Materials Supplied,Dodává suroviny
-DocType: Purchase Invoice,Recurring Print Format,Opakující Print Format
 DocType: C-Form,Series,Série
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Měna ceníku {0} musí být {1} nebo {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Přidat produkty
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Měna ceníku {0} musí být {1} nebo {2}
 DocType: Appraisal,Appraisal Template,Posouzení Template
 DocType: Item Group,Item Classification,Položka Klasifikace
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Business Development Manager
@@ -4505,7 +4592,7 @@
 DocType: Item Attribute Value,Attribute Value,Hodnota atributu
 ,Itemwise Recommended Reorder Level,Itemwise Doporučené Změna pořadí Level
 DocType: Salary Detail,Salary Detail,plat Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,"Prosím, nejprve vyberte {0}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,"Prosím, nejprve vyberte {0}"
 DocType: Appointment Type,Physician,Lékař
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Šarže {0} položky {1} vypršela.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Konzultace
@@ -4516,7 +4603,7 @@
 DocType: Salary Detail,Default Amount,Výchozí částka
 DocType: Lab Test Template,Descriptive,Popisný
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Sklad nebyl nalezen v systému
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Tento měsíc je shrnutí
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Tento měsíc je shrnutí
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalita Kontrola Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Zmrazit zásoby starší než` by mělo být nižší než %d dnů.
 DocType: Tax Rule,Purchase Tax Template,Spotřební daň šablony
@@ -4539,12 +4626,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Události / výsledky školení
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Oprávky i na
 DocType: Sales Invoice,C-Form Applicable,C-Form Použitelné
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Čas operace musí být větší než 0 pro operaci {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Čas operace musí být větší než 0 pro operaci {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Sklad je povinné
 DocType: Supplier,Address and Contacts,Adresa a kontakty
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM konverze Detail
 DocType: Program,Program Abbreviation,Program Zkratka
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Výrobní zakázka nemůže být vznesena proti šablony položky
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Výrobní zakázka nemůže být vznesena proti šablony položky
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Poplatky jsou aktualizovány v dokladu o koupi na každou položku
 DocType: Warranty Claim,Resolved By,Vyřešena
 DocType: Bank Guarantee,Start Date,Datum zahájení
@@ -4570,26 +4657,27 @@
 DocType: Employee,Educational Qualification,Vzdělávací Kvalifikace
 DocType: Workstation,Operating Costs,Provozní náklady
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Akční pokud souhrnné měsíční rozpočet překročen
-DocType: Purchase Invoice,Submit on creation,Předložení návrhu na vytvoření
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Měna pro {0} musí být {1}
+DocType: Subscription,Submit on creation,Předložení návrhu na vytvoření
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Měna pro {0} musí být {1}
 DocType: Asset,Disposal Date,Likvidace Datum
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-maily budou zaslány všem aktivním zaměstnancům společnosti v danou hodinu, pokud nemají dovolenou. Shrnutí odpovědí budou zaslány do půlnoci."
 DocType: Employee Leave Approver,Employee Leave Approver,Zaměstnanec Leave schvalovač
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Nelze prohlásit za ztracený, protože citace byla provedena."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Trénink Feedback
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Nelze prohlásit za ztracený, protože citace byla provedena."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Trénink Feedback
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Výrobní zakázka {0} musí být předloženy
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Kritéria dodavatele skóre karty
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},"Prosím, vyberte Počáteční datum a koncové datum pro položku {0}"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Samozřejmě je povinné v řadě {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,K dnešnímu dni nemůže být dříve od data
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Přidat / Upravit ceny
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Přidat / Upravit ceny
 DocType: Batch,Parent Batch,Nadřazená dávka
 DocType: Cheque Print Template,Cheque Print Template,Šek šablony tisku
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Diagram nákladových středisek
 DocType: Lab Test Template,Sample Collection,Kolekce vzorků
 ,Requested Items To Be Ordered,Požadované položky je třeba objednat
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Moje objednávky
 DocType: Price List,Price List Name,Ceník Jméno
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Každodenní práci Shrnutí pro {0}
 DocType: Employee Loan,Totals,Součty
@@ -4608,12 +4696,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} jednotek {1} zapotřebí {2} o {3} {4} na {5} pro dokončení této transakce.
 DocType: Fee Schedule,Student Category,Student Kategorie
 DocType: Announcement,Student,Student
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Organizace jednotka (departement) master.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Organizace jednotka (departement) master.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Jděte do pokojů
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Prosím, zadejte zprávu před odesláním"
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,DUPLIKÁT PRO DODAVATELE
 DocType: Email Digest,Pending Quotations,Čeká na citace
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Point-of-Sale Profil
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Point-of-Sale Profil
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Konfigurace laboratorních testů.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Nezajištěných úvěrů
 DocType: Cost Center,Cost Center Name,Jméno nákladového střediska
@@ -4623,6 +4711,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Celkem uhrazeno Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Zprávy větší než 160 znaků bude rozdělena do více zpráv
 DocType: Purchase Receipt Item,Received and Accepted,Obdrženo a přijato
+DocType: Hub Settings,Company and Seller Profile,Profil společnosti a prodávajícího
 ,GST Itemised Sales Register,GST Itemized Sales Register
 ,Serial No Service Contract Expiry,Pořadové číslo Servisní smlouva vypršení platnosti
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Nemůžete dělat kreditní a debetní záznam na stejný účet ve stejnou dobu.
@@ -4632,10 +4721,11 @@
 DocType: Item,Variant Based On,Varianta založená na
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Celková weightage přiřazen by měla být 100%. Je {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Vaši Dodavatelé
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Opravte prosím
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,"Nelze nastavit jako Ztraceno, protože je přijata objednávka."
 DocType: Request for Quotation Item,Supplier Part No,Žádný dodavatel Part
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nemůže odečíst, pokud kategorie je pro &quot;ocenění&quot; nebo &quot;Vaulation a Total&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Přijaté Od
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Přijaté Od
 DocType: Lead,Converted,Převedené
 DocType: Item,Has Serial No,Má Sériové číslo
 DocType: Employee,Date of Issue,Datum vydání
@@ -4643,7 +4733,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Podle nákupních nastavení, pokud je požadováno nákupní požadavek == &#39;ANO&#39;, pak pro vytvoření nákupní faktury musí uživatel nejprve vytvořit doklad o nákupu pro položku {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Řádek # {0}: Nastavte Dodavatel pro položku {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Řádek {0}: doba hodnota musí být větší než nula.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Webové stránky Image {0} připojuje k bodu {1} nelze nalézt
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Webové stránky Image {0} připojuje k bodu {1} nelze nalézt
 DocType: Issue,Content Type,Typ obsahu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Počítač
 DocType: Item,List this Item in multiple groups on the website.,Seznam tuto položku ve více skupinách na internetových stránkách.
@@ -4654,14 +4744,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Získat smířit záznamů
 DocType: Payment Reconciliation,From Invoice Date,Z faktury Datum
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Nemáte oprávnění k odeslání
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,Fakturační měna se musí rovnat měny nebo účtu strana peněz buď výchozího comapany je
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Fakturační měna se musí rovnat měny nebo účtu strana peněz buď výchozího comapany je
 DocType: Healthcare Settings,Laboratory Settings,Laboratorní nastavení
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Nechat inkasa
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Co to dělá?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Do skladu
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Všechny Student Přijímací
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Co to dělá?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Do skladu
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Všechny Student Přijímací
 ,Average Commission Rate,Průměrná cena Komise
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemůže být ""Ano"" pro neskladové zboží"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemůže být ""Ano"" pro neskladové zboží"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Vyberte možnost Stav
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Účast nemůže být označen pro budoucí data
 DocType: Pricing Rule,Pricing Rule Help,Ceny Pravidlo Help
@@ -4675,44 +4765,44 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Řádek {0}: Exchange Rate je povinné
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID není nastavena pro zaměstnance {0}
 DocType: Vehicle,Vehicle Value,Hodnota vozidla
-DocType: Stock Entry,Default Source Warehouse,Výchozí zdroj Warehouse
+DocType: Stock Entry,Default Source Warehouse,Výchozí zdrojový sklad
 DocType: Item,Customer Code,Code zákazníků
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Narozeninová připomínka pro {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Počet dnů od poslední objednávky
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Debetní Na účet musí být účtu Rozvaha
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Debetní Na účet musí být účtu Rozvaha
 DocType: Buying Settings,Naming Series,Číselné řady
 DocType: Leave Block List,Leave Block List Name,Nechte Jméno Block List
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Datum pojištění startu by měla být menší než pojištění koncovým datem
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Nastavte prosím systém instruktorů ve škole&gt; Nastavení školy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Aktiva
 DocType: Timesheet,Production Detail,výroba Detail
+DocType: Restaurant,Active Menu,Aktivní nabídka
 DocType: Target Detail,Target Qty,Target Množství
 DocType: Shopping Cart Settings,Checkout Settings,Pokladna Nastavení
 DocType: Attendance,Present,Současnost
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Delivery Note {0} nesmí být předloženy
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Delivery Note {0} nesmí být předloženy
 DocType: Notification Control,Sales Invoice Message,Prodejní faktury Message
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Závěrečný účet {0} musí být typu odpovědnosti / Equity
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Výplatní pásce zaměstnance {0} již vytvořili pro časové list {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Výplatní pásce zaměstnance {0} již vytvořili pro časové list {1}
 DocType: Vehicle Log,Odometer,Počítadlo ujetých kilometrů
 DocType: Sales Order Item,Ordered Qty,Objednáno Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Položka {0} je zakázána
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Položka {0} je zakázána
 DocType: Stock Settings,Stock Frozen Upto,Reklamní Frozen aľ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM neobsahuje žádnou skladovou položku
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Projektová činnost / úkol.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM neobsahuje žádnou skladovou položku
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Projektová činnost / úkol.
 DocType: Vehicle Log,Refuelling Details,Tankovací Podrobnosti
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generování výplatních páskách
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Nákup musí být zkontrolováno, v případě potřeby pro vybrán jako {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Sleva musí být menší než 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Poslední cena při platbě nebyl nalezen
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Odepsat Částka (Company měny)
 DocType: Sales Invoice Timesheet,Billing Hours,Billing Hodiny
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,Výchozí BOM pro {0} nebyl nalezen
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Řádek # {0}: Prosím nastavte množství objednací
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Výchozí BOM pro {0} nebyl nalezen
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Řádek # {0}: Prosím nastavte množství objednací
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Klepnutím na položky je můžete přidat zde
 DocType: Fees,Program Enrollment,Registrace do programu
 DocType: Landed Cost Voucher,Landed Cost Voucher,Přistálo Náklady Voucher
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Prosím nastavte {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Opakujte na den v měsíci
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} je neaktivní student
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} je neaktivní student
 DocType: Employee,Health Details,Zdravotní Podrobnosti
 DocType: Offer Letter,Offer Letter Terms,Nabídka Letter Podmínky
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,"Chcete-li vytvořit referenční dokument žádosti o platbu, je třeba"
@@ -4720,7 +4810,6 @@
 DocType: Employee External Work History,Salary,Plat
 DocType: Serial No,Delivery Document Type,Dodávka Typ dokumentu
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Odeslat všechny výplatní pásky pro výše zvolených kritérií
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} položky synchronizovány
 DocType: Sales Order,Partly Delivered,Částečně vyhlášeno
 DocType: Email Digest,Receivables,Pohledávky
 DocType: Lead Source,Lead Source,Olovo Source
@@ -4742,19 +4831,19 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Stárnutí rozsah 2
 DocType: SG Creation Tool Course,Max Strength,Max Síla
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM nahradil
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Vyberte položky podle data doručení
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Vyberte položky podle data doručení
 ,Sales Analytics,Prodejní Analytics
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},K dispozici {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},K dispozici {0}
 ,Prospects Engaged But Not Converted,"Perspektivy zapojení, ale nekonverze"
 DocType: Manufacturing Settings,Manufacturing Settings,Výrobní nastavení
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Nastavení e-mail
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Mobile Žádné
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Zadejte prosím výchozí měnu v podniku Mistr
-DocType: Stock Entry Detail,Stock Entry Detail,Detail skladové karty
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Denní Upomínky
+DocType: Stock Entry Detail,Stock Entry Detail,Detail pohybu na skladu
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Denní Upomínky
 DocType: Products Settings,Home Page is Products,Domovskou stránkou je stránka Produkty.
 ,Asset Depreciation Ledger,Asset Odpisy Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Daňové Pravidlo Konflikty s {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Daňové Pravidlo Konflikty s {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nový název účtu
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Dodává se nákladů na suroviny
 DocType: Selling Settings,Settings for Selling Module,Nastavení pro prodej Module
@@ -4768,8 +4857,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Položka {0} musí být skladem
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Výchozí práci ve skladu Progress
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Výchozí nastavení účetních transakcí.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosím, nastavte systém pro pojmenování zaměstnanců v oblasti lidských zdrojů&gt; Nastavení HR"
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Očekávané datum nemůže být před Materiál Poptávka Datum
+DocType: Restaurant,Default Tax Template,Výchozí daňová šablona
 DocType: Fees,Student Details,Podrobnosti studenta
 DocType: Purchase Invoice Item,Stock Qty,Množství zásob
 DocType: Employee Loan,Repayment Period in Months,Splácení doba v měsících
@@ -4787,8 +4877,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Přejděte na položky
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Aktuální
+DocType: Restaurant Menu,Restaurant Manager,Manažer restaurace
 DocType: Authorization Rule,Customerwise Discount,Sleva podle zákazníka
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Časového rozvrhu pro úkoly.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Časového rozvrhu pro úkoly.
 DocType: Purchase Invoice,Against Expense Account,Proti výdajového účtu
 DocType: Production Order,Production Order,Výrobní Objednávka
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Poznámka k instalaci {0} již byla odeslána
@@ -4796,9 +4887,8 @@
 DocType: Quotation Item,Against Docname,Proti Docname
 DocType: SMS Center,All Employee (Active),Všichni zaměstnanci (Aktivní)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Zobrazit nyní
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Vyberte období, kdy faktura budou generovány automaticky"
 DocType: BOM,Raw Material Cost,Cena surovin
-DocType: Item Reorder,Re-Order Level,Re-Order Level
+DocType: Item Reorder,Re-Order Level,Úroveň pro znovuobjednání
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Zadejte položku a požadované množství ks, které chcete zadat do výroby, nebo si stáhněte soupis materiálu na skladu pro výrobu."
 apps/erpnext/erpnext/projects/doctype/project/project.js +64,Gantt Chart,Pruhový diagram
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Part-time,Part-time
@@ -4809,23 +4899,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Report Type je povinné
 DocType: Item,Serial Number Series,Sériové číslo Series
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Sklad je povinný pro skladovou položku {0} na řádku {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Přidat programy
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Maloobchod a velkoobchod
 DocType: Issue,First Responded On,Prvně odpovězeno dne
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Výpis zboží v několika skupinách
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Datum zahájení a  Datum ukončení Fiskálního roku jsou již stanoveny ve fiskálním roce {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Světlá Datum aktualizováno
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split Batch
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Úspěšně smířeni
 DocType: Request for Quotation Supplier,Download PDF,Stáhnout PDF
 DocType: Production Order,Planned End Date,Plánované datum ukončení
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Zadejte prosím datum rozvrhu
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,"Tam, kde jsou uloženy předměty."
 DocType: Request for Quotation,Supplier Detail,dodavatel Detail
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Chyba ve vzorci nebo stavu: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Chyba ve vzorci nebo stavu: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Fakturovaná částka
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kritéria váhy musí obsahovat až 100%
 DocType: Attendance,Attendance,Účast
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,sklade
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,sklade
 DocType: BOM,Materials,Materiály
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Pokud není zatrženo, seznam bude muset být přidány ke každé oddělení, kde má být použit."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Zdrojové a cílové skladů nemohou být stejné
@@ -4843,6 +4933,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,On Net Celkem
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Hodnota atributu {0} musí být v rozmezí od {1} až {2} v krocích po {3} pro item {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Target sklad v řádku {0} musí být stejná jako výrobní zakázky
+DocType: Restaurant Reservation,Waitlisted,Vyčkejte
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Měna nemůže být změněn po provedení položky pomocí jiné měně
 DocType: Vehicle Service,Clutch Plate,Kotouč spojky
 DocType: Company,Round Off Account,Zaokrouhlovací účet
@@ -4859,7 +4950,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Jméno Nová Sales Osoba
 DocType: Packing Slip,Gross Weight UOM,Hrubá Hmotnost UOM
 DocType: Delivery Note Item,Against Sales Invoice,Proti prodejní faktuře
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Zadejte sériová čísla pro serializovanou položku
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Zadejte sériová čísla pro serializovanou položku
 DocType: Bin,Reserved Qty for Production,Vyhrazeno Množství pro výrobu
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Ponechte nekontrolované, pokud nechcete dávat pozor na dávku při sestavování kurzových skupin."
 DocType: Asset,Frequency of Depreciation (Months),Frekvence odpisy (měsíce)
@@ -4870,8 +4961,8 @@
 DocType: Lab Test,Test Group,Testovací skupina
 DocType: Payment Reconciliation,Receivable / Payable Account,Pohledávky / závazky účet
 DocType: Delivery Note Item,Against Sales Order Item,Proti položce přijaté objednávky
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Uveďte prosím atributu Hodnota atributu {0}
-DocType: Item,Default Warehouse,Výchozí Warehouse
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Uveďte prosím atributu Hodnota atributu {0}
+DocType: Item,Default Warehouse,Výchozí sklad
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Rozpočet nemůže být přiřazena na skupinový účet {0}
 DocType: Healthcare Settings,Patient Registration,Registrace pacienta
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Prosím, zadejte nákladové středisko mateřský"
@@ -4895,10 +4986,11 @@
 DocType: Student Log,Achievement,Úspěch
 DocType: Batch,Source Document Type,Zdrojový typ dokumentu
 DocType: Journal Entry,Total Debit,Celkem Debit
-DocType: Manufacturing Settings,Default Finished Goods Warehouse,Výchozí hotových výrobků Warehouse
+DocType: Manufacturing Settings,Default Finished Goods Warehouse,Výchozí sklad hotových výrobků
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Prodej Osoba
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Rozpočet a nákladového střediska
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Vícenásobný výchozí způsob platby není povolen
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,pro
 ,Appointment Analytics,Aplikace Analytics
 DocType: Vehicle Service,Half Yearly,Pololetní
 DocType: Lead,Blog Subscriber,Blog Subscriber
@@ -4916,7 +5008,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Počet kvotů
 ,BOM Stock Report,BOM Sklad Zpráva
 DocType: Stock Reconciliation Item,Quantity Difference,množství Rozdíl
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Zpracování mezd
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Zpracování mezd
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Výše úvěru
 DocType: Cheque Print Template,Signatory Position,Signatář Position
@@ -4930,12 +5022,12 @@
 DocType: Tax Rule,Tax Rule,Daňové Pravidlo
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Udržovat stejná sazba po celou dobu prodejního cyklu
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Naplánujte čas protokoly mimo Workstation pracovních hodin.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Zákazníci ve frontě
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Doktor {0} nemá plán lékařů. Přidejte jej do mistra lékaře
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Zákazníci ve frontě
 DocType: Student,Nationality,Národnost
 ,Items To Be Requested,Položky se budou vyžadovat
-DocType: Purchase Order,Get Last Purchase Rate,Získejte posledního nákupu Cena
 DocType: Company,Company Info,Společnost info
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Vyberte nebo přidání nového zákazníka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Vyberte nebo přidání nového zákazníka
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Nákladové středisko je nutné rezervovat výdajů nárok
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplikace fondů (aktiv)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,To je založeno na účasti základu tohoto zaměstnance
@@ -4943,6 +5035,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Debetní účet
 DocType: Fiscal Year,Year Start Date,Datum Zahájení Roku
 DocType: Attendance,Employee Name,Jméno zaměstnance
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Položka objednávky restaurace
 DocType: Sales Invoice,Rounded Total (Company Currency),Celkem zaokrouhleno (měna solečnosti)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Nelze skryté do skupiny, protože je požadovaný typ účtu."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} byl změněn. Prosím aktualizujte.
@@ -4953,6 +5046,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Zaměstnanecké benefity
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Balíčky množství se musí rovnat množství pro položku {0} v řadě {1}
 DocType: Production Order,Manufactured Qty,Vyrobeno Množství
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Faktura byla vytvořena
 DocType: Purchase Receipt Item,Accepted Quantity,Schválené Množství
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Prosím nastavit výchozí Holiday List pro zaměstnance {0} nebo {1} Company
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} neexistuje
@@ -4962,18 +5056,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Řádek č {0}: Částka nemůže být větší než Čekající Částka proti Expense nároku {1}. Do doby, než množství je {2}"
 DocType: Maintenance Schedule,Schedule,Plán
 DocType: Account,Parent Account,Nadřazený účet
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,K dispozici
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,K dispozici
 DocType: Quality Inspection Reading,Reading 3,Čtení 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
 DocType: Lab Test,Approved,Schválený
 DocType: Pricing Rule,Price,Cena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left"""
+DocType: Hub Settings,Last Sync On,Poslední synchronizace je zapnutá
 DocType: Guardian,Guardian,poručník
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Posouzení {0} vytvořil pro zaměstnance {1} v daném časovém období
 DocType: Employee,Education,Vzdělání
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,Del
 DocType: Selling Settings,Campaign Naming By,Kampaň Pojmenování By
 DocType: Employee,Current Address Is,Aktuální adresa je
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Měsíční prodejní cíl (
@@ -4988,7 +5083,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Kód předmětu:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,"Prosím, zadejte výdajového účtu"
 DocType: Account,Stock,Sklad
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Řádek # {0}: Reference Document Type musí být jedním z objednávky, faktury nebo Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Řádek # {0}: Reference Document Type musí být jedním z objednávky, faktury nebo Journal Entry"
 DocType: Employee,Current Address,Aktuální adresa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Je-li položka je varianta další položku pak popis, obraz, oceňování, daní atd bude stanoven ze šablony, pokud není výslovně uvedeno"
 DocType: Serial No,Purchase / Manufacture Details,Nákup / Výroba Podrobnosti
@@ -5006,7 +5101,7 @@
 DocType: Production Plan Item,Planned Qty,Plánované Množství
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +121,Total Tax,Total Tax
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Pro Množství (Vyrobeno ks) je povinné
-DocType: Stock Entry,Default Target Warehouse,Výchozí Target Warehouse
+DocType: Stock Entry,Default Target Warehouse,Výchozí cílový sklad
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Company Měna)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,Rok Datum ukončení nesmí být starší než datum Rok Start. Opravte data a zkuste to znovu.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Řádek {0}: Typ Party Party a je použitelná pouze proti pohledávky / závazky účtu
@@ -5019,7 +5114,7 @@
 DocType: Hub Settings,Hub Settings,Nastavení Hub
 DocType: Project,Gross Margin %,Hrubá Marže %
 DocType: BOM,With Operations,S operacemi
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Položky účetnictví již byly provedeny v měně, {0} pro firmu {1}. Vyberte pohledávky a závazku účet s měnou {0}."
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Položky účetnictví již byly provedeny v měně, {0} pro firmu {1}. Vyberte pohledávky a závazku účet s měnou {0}."
 DocType: Asset,Is Existing Asset,Je existujícímu aktivu
 DocType: Salary Detail,Statistical Component,Statistická složka
 DocType: Warranty Claim,If different than customer address,Pokud se liší od adresy zákazníka
@@ -5027,13 +5122,14 @@
 DocType: BOM Operation,BOM Operation,BOM Operation
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Na předchozí řady Částka
 DocType: Student,Home Address,Domácí adresa
+DocType: Item,Has Expiry Date,Má datum vypršení platnosti
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Nastavení varianty položky.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Převod majetku
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,Převod majetku
 DocType: POS Profile,POS Profile,POS Profile
 DocType: Training Event,Event Name,Název události
 DocType: Physician,Phone (Office),Telefon (kancelář)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,Přijetí
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Přijímací řízení pro {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,Přijetí
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Přijímací řízení pro {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Sezónnost pro nastavení rozpočtů, cíle atd."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Název proměnné
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Položka {0} je šablona, prosím vyberte jednu z jeho variant"
@@ -5042,7 +5138,7 @@
 DocType: Assessment Plan,Room,Pokoj
 DocType: Purchase Order,Advance Paid,Vyplacené zálohy
 DocType: Item,Item Tax,Daň Položky
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Materiál Dodavateli
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Materiál Dodavateli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Spotřební Faktura
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Práh {0}% objeví více než jednou
 DocType: Expense Claim,Employees Email Id,Zaměstnanci Email Id
@@ -5053,32 +5149,30 @@
 DocType: Program,Program Name,Název programu
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Zvažte daň či poplatek za
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Skutečné Množství je povinné
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} v současné době disponuje {1} hodnotící tabulkou dodavatelů a objednávky na nákup tohoto dodavatele by měly být vydány s opatrností.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} v současné době disponuje {1} hodnotící tabulkou dodavatelů a objednávky na nákup tohoto dodavatele by měly být vydány s opatrností.
 DocType: Employee Loan,Loan Type,Typ úvěru
 DocType: Scheduling Tool,Scheduling Tool,Plánování Tool
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Kreditní karta
 DocType: BOM,Item to be manufactured or repacked,Položka k výrobě nebo zabalení
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Výchozí nastavení pro akciových transakcí.
-DocType: Purchase Invoice,Next Date,Další data
 DocType: Employee Education,Major/Optional Subjects,Hlavní / Volitelné předměty
 DocType: Sales Invoice Item,Drop Ship,Drop Loď
+DocType: Hub Settings,Suspended,Pozastaveno
 DocType: Training Event,Attendees,Účastníci
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Zde si můžete udržovat rodinné detailů, jako jsou jméno a povolání rodičem, manželem a dětmi"
 DocType: Academic Term,Term End Date,Termín Datum ukončení
-DocType: Hub Settings,Seller Name,Prodejce Name
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Daně a poplatky odečteny (Company měna)
 DocType: Item Group,General Settings,Obecné nastavení
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Z měny a měny nemůže být stejné
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Přidat instruktory
 DocType: Stock Entry,Repack,Přebalit
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Musíte Uložte formulář před pokračováním
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Nejprve vyberte společnost
 DocType: Item Attribute,Numeric Values,Číselné hodnoty
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Připojit Logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Sklad Úrovně
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Sklad Úrovně
 DocType: Customer,Commission Rate,Výše provize
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Vytvořili {0} skóre pro {1} mezi:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Udělat Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Udělat Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Aplikace Block dovolené podle oddělení.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer",Typ platby musí být jedním z příjem Pay a interní převod
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analytika
@@ -5093,11 +5187,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Základní kapitál
 DocType: Shopping Cart Settings,Show Public Attachments,Zobrazit veřejné přílohy
 DocType: Packing Slip,Package Weight Details,Hmotnost balení Podrobnosti
+DocType: Restaurant Reservation,Reservation Time,Čas rezervace
 DocType: Payment Gateway Account,Payment Gateway Account,Platební brána účet
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Po dokončení platby přesměrovat uživatele na vybrané stránky.
 DocType: Company,Existing Company,stávající Company
 DocType: Healthcare Settings,Result Emailed,Výsledkem byl emailem
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","Daňová kategorie byla změněna na &quot;Celkem&quot;, protože všechny položky jsou položky, které nejsou skladem"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položek&gt; Značka
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Vyberte soubor csv
 DocType: Student Leave Application,Mark as Present,Označit jako dárek
 DocType: Supplier Scorecard,Indicator Color,Barva indikátoru
@@ -5122,11 +5218,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Udělat Student Batch
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Je převádět
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Položka získaná z BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Položka získaná z BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Dodací lhůta dny
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Řádek # {0}: Vysílání datum musí být stejné jako datum nákupu {1} aktiva {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Zkontrolujte, zda student bydlí v Hostelu ústavu."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Prosím, zadejte Prodejní objednávky v tabulce výše"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Prosím, zadejte Prodejní objednávky v tabulce výše"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Nepředloženo výplatních páskách
 ,Stock Summary,Sklad Souhrn
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Převést aktiva z jednoho skladu do druhého
@@ -5142,5 +5238,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: záporný nemůže být spojována s {1}
 DocType: Journal Entry,Subscription Section,Sekce odběru
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Účet {0} neexistuje
+DocType: Training Event,Training Program,Tréninkový program
 DocType: Account,Cash,V hotovosti
 DocType: Employee,Short biography for website and other publications.,Krátký životopis na internetové stránky a dalších publikací.
diff --git a/erpnext/translations/da-DK.csv b/erpnext/translations/da-DK.csv
index 5e1f02f..67f0c1c 100644
--- a/erpnext/translations/da-DK.csv
+++ b/erpnext/translations/da-DK.csv
@@ -7,7 +7,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,'Total','Total'
 DocType: Selling Settings,Selling Settings,Salg af indstillinger
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Selling Beløb
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,"Bly skal indstilles, hvis Opportunity er lavet af Lead"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,"Bly skal indstilles, hvis Opportunity er lavet af Lead"
 DocType: Item,Default Selling Cost Center,Standard Selling Cost center
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Above
 DocType: Pricing Rule,Selling,Selling
diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv
index bd13e91..4e99754 100644
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Løn-tilstand
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Tilmeld
 DocType: Patient,Divorced,Skilt
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Varer allerede synkroniseret
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Tillad vare der skal tilføjes flere gange i en transaktion
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,"Annuller Materiale Besøg {0}, før den annullerer denne garanti krav"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Forbrugerprodukter
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Fraværsgodkendere
 DocType: Sales Partner,Dealer,Forhandler
 DocType: Consultation,Investigations,Undersøgelser
+DocType: Restaurant Order Entry,Click Enter To Add,Klik på Enter for at tilføje
 DocType: Employee,Rented,Lejet
 DocType: Purchase Order,PO-,IO-
 DocType: POS Profile,Applicable for User,Gældende for bruger
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Stoppet produktionsordre kan ikke annulleres, Unstop det første til at annullere"
 DocType: Vehicle Service,Mileage,Kilometerpenge
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Vil du virkelig kassere dette anlægsaktiv?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Vil du virkelig kassere dette anlægsaktiv?
 DocType: Drug Prescription,Update Schedule,Opdateringsplan
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Vælg Standard Leverandør
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Valuta er nødvendig for prisliste {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Tjek tilgængelighed
 DocType: Job Applicant,Job Applicant,Ansøger
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Dette er baseret på transaktioner for denne leverandør. Se tidslinje nedenfor for detaljer
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ikke flere resultater.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Juridisk
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},"Faktiske type skat, kan ikke indgå i vare sats i række {0}"
 DocType: Bank Guarantee,Customer,Kunde
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Vekselkurs skal være det samme som {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Kundennavn
 DocType: Vehicle,Natural Gas,Naturgas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Bankkonto kan ikke blive navngivet som {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Bankkonto kan ikke blive navngivet som {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Hoveder (eller grupper) mod hvilken regnskabsposter er lavet og balancer opretholdes.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Enestående for {0} kan ikke være mindre end nul ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Der er ikke indgivet lønlister til behandling.
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 min
 DocType: Leave Type,Leave Type Name,Fraværstypenavn
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Vis åben
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Det er nødvendigt at tage denne handling i dag selv for ovennævnte tilbagevendende
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Nummerserien opdateret
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,bestilling
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural Kassekladde Indsendt
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,"Købsordre, der modtages"
 DocType: SMS Center,All Supplier Contact,Alle Leverandør Kontakt
 DocType: Support Settings,Support Settings,Support Indstillinger
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Forventet slutdato kan ikke være mindre end forventet startdato
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Forventet slutdato kan ikke være mindre end forventet startdato
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Pris skal være samme som {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Ny fraværsanmodning
 ,Batch Item Expiry Status,Partivare-udløbsstatus
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Bank Draft
 DocType: Mode of Payment Account,Mode of Payment Account,Betalingsmådekonto
 DocType: Consultation,Consultation,Konsultation
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Salg og retur
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Vis varianter
 DocType: Academic Term,Academic Term,Akademisk betegnelse
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiale
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Health Care
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Forsinket betaling (dage)
 DocType: Lab Prescription,Lab Prescription,Lab Prescription
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Sorter efter Pris
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,tjenesten Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} er allerede refereret i salgsfaktura: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Faktura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} er allerede refereret i salgsfaktura: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Hyppighed
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Regnskabsår {0} er påkrævet
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Forsvar
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Række # {0}:
 DocType: Timesheet,Total Costing Amount,Total Costing Beløb
 DocType: Delivery Note,Vehicle No,Køretøjsnr.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Vælg venligst prisliste
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Vælg venligst prisliste
 DocType: Accounts Settings,Currency Exchange Settings,Valutavekslingsindstillinger
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Row # {0}: Betaling dokument er nødvendig for at fuldføre trasaction
 DocType: Production Order Operation,Work In Progress,Varer i arbejde
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Vælg venligst dato
 DocType: Employee,Holiday List,Helligdagskalender
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Opsæt venligst instruktørens navngivningssystem i skolen&gt; skoleindstillinger
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Revisor
+DocType: Hub Settings,Selling Price List,Salgsprisliste
 DocType: Patient,Tobacco Current Use,Tobaks nuværende anvendelse
 DocType: Cost Center,Stock User,Lagerbruger
 DocType: Company,Phone No,Telefonnr.
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Kursusskema oprettet:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Ny {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Ny {0}: # {1}
 ,Sales Partners Commission,Forhandlerprovision
 DocType: Purchase Invoice,Rounding Adjustment,Afrundingsjustering
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Forkortelse kan ikke have mere end 5 tegn
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Reference: {0}, varekode: {1} og kunde: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kg
-DocType: Student Log,Log,Log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Rekruttering
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Resultat indsendt
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Resultat indsendt
 DocType: Item Attribute,Increment,Tilvækst
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Tidsperiode
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Vælg lager ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Gift
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Ikke tilladt for {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Hent varer fra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Lager kan ikke opdateres mod følgeseddel {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Lager kan ikke opdateres mod følgeseddel {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Ingen emner opført
 DocType: Payment Reconciliation,Reconcile,Forene
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionskasser
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Næste afskrivningsdato kan ikke være før købsdatoen
 DocType: Consultation,Consultation Date,Høringsdato
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Produktliste og opdagelse for ERPNext-brugere
 DocType: SMS Center,All Sales Person,Alle salgsmedarbejdere
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Månedlig Distribution ** hjælper dig distribuere Budget / Target tværs måneder, hvis du har sæsonudsving i din virksomhed."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Ikke varer fundet
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Lønstruktur mangler
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Ikke varer fundet
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Lønstruktur mangler
 DocType: Lead,Person Name,Navn
 DocType: Sales Invoice Item,Sales Invoice Item,Salgsfakturavare
 DocType: Account,Credit,Kredit
 DocType: POS Profile,Write Off Cost Center,Afskriv omkostningssted
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",fx &quot;Primary School&quot; eller &quot;University&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",fx &quot;Primary School&quot; eller &quot;University&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Stock Rapporter
 DocType: Warehouse,Warehouse Detail,Lagerinformation
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Credit grænsen er krydset for kunde {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Den Term Slutdato kan ikke være senere end året Slutdato af skoleåret, som udtrykket er forbundet (Studieår {}). Ret de datoer og prøv igen."
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Er anlægsaktiv"" kan ikke være umarkeret, da der eksisterer et anlægsaktiv på varen"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Er anlægsaktiv"" kan ikke være umarkeret, da der eksisterer et anlægsaktiv på varen"
 DocType: Vehicle Service,Brake Oil,Bremse Oil
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 DocType: Tax Rule,Tax Type,Skat Type
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Skattepligtigt beløb
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Du har ikke tilladelse til at tilføje eller opdatere poster før {0}
 DocType: BOM,Item Image (if not slideshow),Varebillede (hvis ikke lysbilledshow)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,En Kunde eksisterer med samme navn
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Timesats / 60) * TidsforbrugIMinutter
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Reference Document Type skal være en af Expense Claim eller Journal Entry
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Vælg stykliste
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Reference Document Type skal være en af Expense Claim eller Journal Entry
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Vælg stykliste
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Omkostninger ved Leverede varer
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Ferien på {0} er ikke mellem Fra dato og Til dato
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,Medarbejderlån
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Aktivitet Log:
 DocType: Fee Schedule,Send Payment Request Email,Send betalingsanmodning e-mail
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Vare {0} findes ikke i systemet eller er udløbet
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Vare {0} findes ikke i systemet eller er udløbet
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Real Estate
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Kontoudtog
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Lægemidler
@@ -210,17 +213,22 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Import-log
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Hent materialeanmodning af typen Fremstilling på grundlag af de ovennævnte kriterier
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Successivt uregistreret.
 DocType: Training Result Employee,Grade,Grad
+DocType: Restaurant Table,No of Seats,Ingen pladser
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>",For at tilføje dynamisk emne skal du bruge jinja tags som <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>
 DocType: Sales Invoice Item,Delivered By Supplier,Leveret af Leverandøren
 DocType: SMS Center,All Contact,Alle Kontakt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Produktionsordre allerede skabt for alle poster med BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Produktionsordre allerede skabt for alle poster med BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Årsløn
 DocType: Daily Work Summary,Daily Work Summary,Daglige arbejde Summary
 DocType: Period Closing Voucher,Closing Fiscal Year,Lukning regnskabsår
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} er frosset
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Vælg eksisterende firma for at danne kontoplanen
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} er frosset
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Vælg eksisterende firma for at danne kontoplanen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Stock Udgifter
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Vælg Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Vælg Target Warehouse
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Indtast foretrukket kontakt e-mail
 DocType: Program Enrollment,School Bus,Skolebus
 DocType: Journal Entry,Contra Entry,Contra indtastning
@@ -237,9 +245,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Download skabelon, fylde relevante data og vedhæfte den ændrede fil. Alle datoer og medarbejder kombination i den valgte periode vil komme i skabelonen, med eksisterende fremmøde optegnelser"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Vare {0} er ikke aktiv eller slutningen af livet er nået
+DocType: Student Admission Program,Minimum Age,Mindstealder
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Eksempel: Grundlæggende Matematik
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hvis du vil medtage skat i række {0} i Item sats, skatter i rækker {1} skal også medtages"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Indstillinger for HR modul
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Indstillinger for HR modul
 DocType: SMS Center,SMS Center,SMS-center
 DocType: Sales Invoice,Change Amount,ændring beløb
 DocType: BOM Update Tool,New BOM,Ny stykliste
@@ -249,7 +258,7 @@
 DocType: Lead,Request Type,Anmodningstype
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Opret medarbejder
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Broadcasting
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Tilføj værelser
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Opsætningstilstand for POS (Online / Offline)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Udførelse
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Oplysninger om de gennemførte transaktioner.
 DocType: Serial No,Maintenance Status,Vedligeholdelsesstatus
@@ -272,6 +281,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prisliste skal være gældende for at købe eller sælge
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Installation dato kan ikke være før leveringsdato for Item {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Rabat på prisliste Rate (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Biokemi
 DocType: Offer Letter,Select Terms and Conditions,Vælg betingelser
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,Out Value
 DocType: Production Planning Tool,Sales Orders,Salgsordrer
@@ -306,15 +316,15 @@
 DocType: Sales Partner,Reseller,Forhandler
 DocType: Codification Table,Medical Code,Medicinsk kode
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Hvis markeret, vil ikke-lagervarer i materialeanmodningerne blive medtaget."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Indtast firma
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Indtast firma
 DocType: Delivery Note Item,Against Sales Invoice Item,Mod salgsfakturavarer
 ,Production Orders in Progress,Igangværende produktionsordrer
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Netto kontant fra Finansiering
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage er fuld, kan ikke gemme"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage er fuld, kan ikke gemme"
 DocType: Lead,Address & Contact,Adresse og kontaktperson
 DocType: Leave Allocation,Add unused leaves from previous allocations,Tilføj ubrugt fravær fra tidligere tildelinger
 DocType: Sales Partner,Partner website,Partner hjemmeside
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Tilføj vare
+DocType: Restaurant Order Entry,Add Item,Tilføj vare
 DocType: Lab Test,Custom Result,Brugerdefineret resultat
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Kontaktnavn
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kriterier for kursusvurdering
@@ -327,7 +337,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Indkøbsanmodning.
 DocType: Lab Test,Submitted Date,Indsendt dato
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Dette er baseret på de timesedler oprettes imod denne sag
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Nettoløn kan ikke være mindre end 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Nettoløn kan ikke være mindre end 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","For at stoppe med at sende gentagne fejlmeddelelser fra systemet, har vi markeret Deaktiveret felt i abonnementet"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Kun den valgte fraværsgodkender kan godkende denne fraværsansøgning
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Fratrædelsesdato skal være større end ansættelsesdato
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Fravær pr. år
@@ -336,20 +347,20 @@
 DocType: Email Digest,Profit & Loss,Profit &amp; Loss
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,liter
 DocType: Task,Total Costing Amount (via Time Sheet),Totale omkostninger (via tidsregistrering)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Opsæt venligst studerende under elevgrupper
 DocType: Item Website Specification,Item Website Specification,Varebeskrivelse til hjemmesiden
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Fravær blokeret
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af sin levetid på {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af sin levetid på {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Bank Entries
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Årligt
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Lagerafstemningsvare
 DocType: Stock Entry,Sales Invoice No,Salgsfakturanr.
-DocType: Material Request Item,Min Order Qty,Min prisen evt
+DocType: Material Request Item,Min Order Qty,Min. ordremængde
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Elevgruppeværktøj til dannelse af fag
 DocType: Lead,Do Not Contact,Må ikke komme i kontakt
-apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,"Mennesker, der underviser i din organisation"
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Den unikke id til at spore alle tilbagevendende fakturaer. Det genereres på send.
+apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,Personer der underviser i din organisation
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Software Developer
-DocType: Item,Minimum Order Qty,Minimum Antal
+DocType: Item,Minimum Order Qty,Minimum ordremængde
 DocType: Pricing Rule,Supplier Type,Leverandørtype
 DocType: Course Scheduling Tool,Course Start Date,Kursusstartdato
 ,Student Batch-Wise Attendance,Fremmøde efter elevgrupper
@@ -357,17 +368,19 @@
 DocType: Item,Publish in Hub,Offentliggør i Hub
 DocType: Student Admission,Student Admission,Studerende optagelse
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Vare {0} er aflyst
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Materialeanmodning
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Vare {0} er aflyst
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Materialeanmodning
 DocType: Bank Reconciliation,Update Clearance Date,Opdatering Clearance Dato
 DocType: Item,Purchase Details,Indkøbsdetaljer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Vare {0} ikke fundet i &quot;Raw Materials Leveres &#39;bord i Indkøbsordre {1}
 DocType: Patient Relation,Relation,Relation
 DocType: Shipping Rule,Worldwide Shipping,Levering til hele verden
 DocType: Patient Relation,Mother,Mor
+DocType: Restaurant Reservation,Reservation End Time,Reservation Slut Tid
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Bekræftede ordrer fra kunder.
 DocType: Purchase Receipt Item,Rejected Quantity,Afvist Mængde
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Betalingsanmodning {0} oprettet
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Betalingsanmodning {0} oprettet
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Lav følsomhed
 DocType: Notification Control,Notification Control,Meddelelse Kontrol
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,"Bekræft venligst, når du har afsluttet din træning"
 DocType: Lead,Suggestions,Forslag
@@ -387,7 +400,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,"Lønseddel sendes til medarbejderen på e-mail, på baggrund af den foretrukne e-mailadresse der er valgt for medarbejderen"
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"Den første fraværsgodkender i listen, vil blive markeret som standard-fraværsgodkender"
 DocType: Tax Rule,Shipping County,Anvendes ikke
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Hjælp
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Hjælp
 DocType: Asset,Next Depreciation Date,Næste afskrivningsdato
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivitet Omkostninger per Medarbejder
 DocType: Accounts Settings,Settings for Accounts,Indstillinger for regnskab
@@ -398,13 +411,13 @@
 DocType: Item,Synced With Hub,Synkroniseret med Hub
 DocType: Vehicle,Fleet Manager,Fleet manager
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Rækken # {0}: {1} kan ikke være negativ for vare {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Forkert adgangskode
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Forkert adgangskode
 DocType: Item,Variant Of,Variant af
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Afsluttet Antal kan ikke være større end &#39;antal til Fremstilling&#39;
 DocType: Period Closing Voucher,Closing Account Head,Lukning konto Hoved
 DocType: Employee,External Work History,Ekstern Work History
 DocType: Physician,Time per Appointment,Tid pr. Ansættelse
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Cirkulær reference Fejl
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Cirkulær reference Fejl
 DocType: Appointment Type,Is Inpatient,Er sygeplejerske
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 Navn
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"I ord (udlæsning) vil være synlig, når du gemmer følgesedlen."
@@ -413,19 +426,18 @@
 DocType: Lead,Industry,Branche
 DocType: Employee,Job Profile,Stillingsprofil
 DocType: BOM Item,Rate & Amount,Pris &amp; Beløb
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Venligst opsæt nummereringsserier for Tilstedeværelse via Opsætning&gt; Nummereringsserie
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Dette er baseret på transaktioner mod denne virksomhed. Se tidslinjen nedenfor for detaljer
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Give besked på e-mail om oprettelse af automatiske materialeanmodninger
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Resistente
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Fakturatype
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Følgeseddel
 DocType: Consultation,Encounter Impression,Encounter Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Opsætning Skatter
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Udgifter Solgt Asset
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,"Betaling indtastning er blevet ændret, efter at du trak det. Venligst trække det igen."
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} indtastet to gange i varemoms
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Resumé for denne uge og verserende aktiviteter
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} indtastet to gange i varemoms
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Resumé for denne uge og verserende aktiviteter
 DocType: Student Applicant,Admitted,Advokat
 DocType: Workstation,Rent Cost,Leje Omkostninger
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Beløb efter afskrivninger
@@ -439,36 +451,35 @@
 DocType: Shipping Rule,Valid for Countries,Gælder for lande
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Dette element er en skabelon, og kan ikke anvendes i transaktioner. Item attributter kopieres over i varianterne medmindre &#39;Ingen Copy &quot;er indstillet"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Samlet Order Anses
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Medarbejderbetegnelse (fx CEO, direktør osv.)"
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Medarbejderbetegnelse (fx CEO, direktør osv.)"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Hastighed, hvormed kunden Valuta omdannes til kundens basisvaluta"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kursusplanlægningsværktøj
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Køb Faktura kan ikke foretages mod en eksisterende aktiv {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Urgent] Fejl under oprettelse af tilbagevendende% s for% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Urgent] Fejl under oprettelse af tilbagevendende% s for% s
 DocType: Item Tax,Tax Rate,Skat
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} allerede afsat til Medarbejder {1} for perioden {2} til {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Vælg Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Vælg Item
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede godkendt
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Række # {0}: Partinr. skal være det samme som {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Konverter til ikke-Group
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Batch (parti) af en vare.
 DocType: C-Form Invoice Detail,Invoice Date,Fakturadato
 DocType: GL Entry,Debit Amount,Debetbeløb
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Der kan kun være 1 konto pr. firma i {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Se venligst vedhæftede fil
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Der kan kun være 1 konto pr. firma i {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Se venligst vedhæftede fil
 DocType: Purchase Order,% Received,% Modtaget
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Opret Elevgrupper
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Opsætning Allerede Complete !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Opsætning Allerede Complete !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Kredit Note Beløb
 DocType: Setup Progress Action,Action Document,Handlingsdokument
 ,Finished Goods,Færdigvarer
 DocType: Delivery Note,Instructions,Instruktioner
 DocType: Quality Inspection,Inspected By,Kontrolleret af
 DocType: Maintenance Visit,Maintenance Type,Vedligeholdelsestype
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} er ikke tilmeldt kurset {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Varenummer&gt; Varegruppe&gt; Mærke
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} er ikke tilmeldt kurset {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serienummer {0} hører ikke til følgeseddel {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Tilføj varer
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Tilføj varer
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Kvalitetskontrolparameter
 DocType: Leave Application,Leave Approver Name,Fraværsgodkendernavn
 DocType: Depreciation Schedule,Schedule Date,Tidsplan Dato
@@ -488,7 +499,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Arbejdstider
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Skift start / aktuelle sekvensnummer af en eksisterende serie.
 DocType: Dosage Strength,Strength,Styrke
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Opret ny kunde
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Opret ny kunde
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Hvis flere Priser Regler fortsat gældende, er brugerne bedt om at indstille prioritet manuelt for at løse konflikter."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Opret indkøbsordrer
 ,Purchase Register,Indkøb Register
@@ -507,7 +518,7 @@
 DocType: Lab Test Template,Single,Enkeltværelse
 DocType: Salary Slip,Total Loan Repayment,Samlet lån til tilbagebetaling
 DocType: Account,Cost of Goods Sold,Vareforbrug
-DocType: Purchase Invoice,Yearly,Årlig
+DocType: Subscription,Yearly,Årlig
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Indtast omkostningssted
 DocType: Drug Prescription,Dosage,Dosering
 DocType: Journal Entry Account,Sales Order,Salgsordre
@@ -537,7 +548,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globale indstillinger for alle produktionsprocesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Regnskab Frozen Op
 DocType: SMS Log,Sent On,Sendt On
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valgt flere gange i attributter Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valgt flere gange i attributter Tabel
 DocType: HR Settings,Employee record is created using selected field. ,Medarbejder rekord er oprettet ved hjælp valgte felt.
 DocType: Sales Order,Not Applicable,ikke gældende
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Ferie mester.
@@ -562,13 +573,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Tildelt fravær allokeret i alt er obligatorisk
 DocType: Patient,AB Positive,AB Positive
 DocType: Job Opening,Description of a Job Opening,Beskrivelse af en ledig stilling
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Afventende aktiviteter for i dag
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Afventende aktiviteter for i dag
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Fremmøde rekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Lønart til tidsregistering
 DocType: Sales Order Item,Used for Production Plan,Bruges til Produktionsplan
 DocType: Employee Loan,Total Payment,Samlet betaling
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (i minutter)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,"{0} {1} er annulleret, så handlingen kan ikke gennemføres"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,"{0} {1} er annulleret, så handlingen kan ikke gennemføres"
 DocType: Customer,Buyer of Goods and Services.,Køber af varer og tjenesteydelser.
 DocType: Journal Entry,Accounts Payable,Kreditor
 DocType: Patient,Allergies,allergier
@@ -580,22 +591,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Advarer indkøbsordrer
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Nævn et par af dine kunder. Disse kunne være firmaer eller privatpersoner.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Nok Dele til Build
+DocType: POS Profile User,POS Profile User,POS profil bruger
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Direkte indkomst
 DocType: Patient Appointment,Date TIme,Dato Tid
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Kan ikke filtrere baseret på konto, hvis grupperet efter konto"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Kontorfuldmægtig
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Vælg kursus
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Vælg kursus
 DocType: Codification Table,Codification Table,Kodifikationstabel
 DocType: Timesheet Detail,Hrs,timer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Vælg firma
 DocType: Stock Entry Detail,Difference Account,Differencekonto
 DocType: Purchase Invoice,Supplier GSTIN,Leverandør GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Opgaven kan ikke lukkes, da dens afhængige opgave {0} ikke er lukket."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,Indtast venligst lager for hvilket materialeanmodning vil blive rejst
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Opgaven kan ikke lukkes, da dens afhængige opgave {0} ikke er lukket."
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Indtast venligst lager for hvilket materialeanmodning vil blive rejst
 DocType: Production Order,Additional Operating Cost,Yderligere driftsomkostninger
 DocType: Lab Test Template,Lab Routine,Lab Rutine
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","At fusionere, skal følgende egenskaber være ens for begge poster"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","At fusionere, skal følgende egenskaber være ens for begge poster"
 DocType: Shipping Rule,Net Weight,Nettovægt
 DocType: Employee,Emergency Phone,Emergency Phone
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Køb
@@ -605,7 +617,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Angiv venligst lønklasse for Tærskel 0%
 DocType: Sales Order,To Deliver,Til at levere
 DocType: Purchase Invoice Item,Item,Vare
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Serienummervare kan ikke være en brøkdel
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Høj følsomhed
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Serienummervare kan ikke være en brøkdel
 DocType: Journal Entry,Difference (Dr - Cr),Difference (Dr - Cr)
 DocType: Account,Profit and Loss,Resultatopgørelse
 DocType: Patient,Risk Factors,Risikofaktorer
@@ -614,7 +627,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Håndtering af underleverancer
 DocType: Vital Signs,Body Temperature,Kropstemperatur
 DocType: Project,Project will be accessible on the website to these users,Sagen vil være tilgængelig på hjemmesiden for disse brugere
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Definer projekttype.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Definer projekttype.
 DocType: Supplier Scorecard,Weighting Function,Vægtningsfunktion
 DocType: Physician,OP Consulting Charge,OP Consulting Charge
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Opsæt din
@@ -628,7 +641,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Tilvækst kan ikke være 0
 DocType: Production Planning Tool,Material Requirement,Material Requirement
 DocType: Company,Delete Company Transactions,Slet Company Transaktioner
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Referencenummer og reference Dato er obligatorisk for Bank transaktion
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Referencenummer og reference Dato er obligatorisk for Bank transaktion
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tilføj / rediger Skatter og Afgifter
 DocType: Payment Entry Reference,Supplier Invoice No,Leverandør fakturanr.
 DocType: Territory,For reference,For reference
@@ -636,12 +649,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan ikke slette serienummer {0}, eftersom det bruges på lagertransaktioner"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Lukning (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Hej
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Flyt vare
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Flyt vare
 DocType: Serial No,Warranty Period (Days),Garantiperiode (dage)
 DocType: Installation Note Item,Installation Note Item,Installation Bemærk Vare
 DocType: Production Plan Item,Pending Qty,Afventende antal
 DocType: Budget,Ignore,Ignorér
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} er ikke aktiv
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} er ikke aktiv
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Anvendes ikke
 DocType: Salary Slip,Salary Slip Timesheet,Lønseddel Timeseddel
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverandør Warehouse obligatorisk for underentreprise købskvittering
@@ -650,7 +663,7 @@
 DocType: Pricing Rule,Sales Partner,Forhandler
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Alle leverandør scorecards.
 DocType: Buying Settings,Purchase Receipt Required,Købskvittering påkrævet
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Værdiansættelsesværdi er obligatorisk, hvis Åbning Stock indtastet"
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,"Værdiansættelsesværdi er obligatorisk, hvis Åbning Stock indtastet"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Ingen poster i faktureringstabellen
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Vælg Company og Party Type først
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Finansiel / regnskabsår.
@@ -687,7 +700,7 @@
 DocType: Quotation,Quotation To,Tilbud til
 DocType: Lead,Middle Income,Midterste indkomst
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Åbning (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Standard måleenhed for Item {0} kan ikke ændres direkte, fordi du allerede har gjort nogle transaktion (er) med en anden UOM. Du bliver nødt til at oprette en ny konto for at bruge en anden Standard UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Standard måleenhed for Item {0} kan ikke ændres direkte, fordi du allerede har gjort nogle transaktion (er) med en anden UOM. Du bliver nødt til at oprette en ny konto for at bruge en anden Standard UOM."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Tildelte beløb kan ikke være negativ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Angiv venligst selskabet
 DocType: Purchase Order Item,Billed Amt,Billed Amt
@@ -701,6 +714,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Vælg Betalingskonto til bankbetalingerne
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Opret Medarbejder optegnelser til at styre blade, udgiftsopgørelser og løn"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Receptperiode
+DocType: Restaurant Reservation,Restaurant Reservation,Restaurant Reservation
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Forslag Skrivning
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betaling indtastning Fradrag
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,En anden salgsmedarbejder {0} eksisterer med samme Medarbejder-id
@@ -708,7 +722,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Masters
 DocType: Assessment Plan,Maximum Assessment Score,Maksimal Score Assessment
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Opdatering Bank transaktionstidspunkterne
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Tidsregistrering
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Tidsregistrering
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,DUPLICERER FOR TRANSPORTØR
 DocType: Fiscal Year Company,Fiscal Year Company,Fiscal År Company
 DocType: Packing Slip Item,DN Detail,DN Detail
@@ -716,8 +730,9 @@
 DocType: Timesheet,Billed,Billed
 DocType: Batch,Batch Description,Partibeskrivelse
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Oprettelse af elevgrupper
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Betaling Gateway konto ikke oprettet, skal du oprette en manuelt."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Betaling Gateway konto ikke oprettet, skal du oprette en manuelt."
 DocType: Supplier Scorecard,Per Year,Per år
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Ikke berettiget til optagelse i dette program i henhold til DOB
 DocType: Sales Invoice,Sales Taxes and Charges,Salg Moms og afgifter
 DocType: Employee,Organization Profile,Organisationsprofil
 DocType: Vital Signs,Height (In Meter),Højde (i meter)
@@ -753,7 +768,7 @@
 DocType: Student Batch Name,Batch Name,Partinavn
 DocType: Fee Validity,Max number of visit,Maks antal besøg
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timeseddel oprettet:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Indstil standard Kontant eller bank konto i mode for betaling {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Indstil standard Kontant eller bank konto i mode for betaling {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,Indskrive
 DocType: GST Settings,GST Settings,GST-indstillinger
 DocType: Selling Settings,Customer Naming By,Kundenavngivning af
@@ -785,15 +800,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landede Cost Skatter og Afgifter
 DocType: Production Order Operation,Actual Start Time,Faktisk starttid
 DocType: BOM Operation,Operation Time,Operation Time
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Slutte
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Slutte
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Grundlag
 DocType: Timesheet,Total Billed Hours,Total Billed Timer
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Skriv Off Beløb
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Skriv Off Beløb
 DocType: Leave Block List Allow,Allow User,Tillad Bruger
 DocType: Journal Entry,Bill No,Bill Ingen
 DocType: Company,Gain/Loss Account on Asset Disposal,Gevinst/tabskonto vedr. salg af anlægsaktiv
 DocType: Vehicle Log,Service Details,Service Detaljer
-DocType: Purchase Invoice,Quarterly,Kvartalsvis
+DocType: Subscription,Quarterly,Kvartalsvis
 DocType: Lab Test Template,Grouped,grupperet
 DocType: Selling Settings,Delivery Note Required,Følgeseddel er påkrævet
 DocType: Bank Guarantee,Bank Guarantee Number,Bankgaranti nummer
@@ -802,12 +817,12 @@
 DocType: Student Attendance,Student Attendance,Student Fremmøde
 DocType: Sales Invoice Timesheet,Time Sheet,Tidsregistrering
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush råstoffer baseret på
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Indtast venligst varedetaljer
 DocType: Interest,Interest,Interesse
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre-Sale
 DocType: Purchase Receipt,Other Details,Andre detaljer
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Lab Test,Test Template,Test skabelon
+DocType: Restaurant Order Entry Item,Served,serveret
 DocType: Account,Accounts,Regnskab
 DocType: Vehicle,Odometer Value (Last),Kilometerstand (sidste aflæsning)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Skabeloner af leverandør scorecard kriterier.
@@ -819,25 +834,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Lønseddel kladde
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Konto {0} er indtastet flere gange
 DocType: Account,Expenses Included In Valuation,Udgifter inkluderet i Værdiansættelse
-DocType: Hub Settings,Seller City,Sælger By
 ,Absent Student Report,Ikke-tilstede studerende rapport
 DocType: Email Digest,Next email will be sent on:,Næste email vil blive sendt på:
 DocType: Offer Letter Term,Offer Letter Term,Ansættelsesvilkår
 DocType: Supplier Scorecard,Per Week,Per uge
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Vare har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Vare har varianter.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Samlet studerende
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Vare {0} ikke fundet
 DocType: Bin,Stock Value,Stock Value
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,Gebyroptegnelser oprettes i baggrunden. I tilfælde af en fejl vil fejlmeddelelsen blive opdateret i skemaet.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Firma {0} findes ikke
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} har gebyrgyldighed indtil {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} har gebyrgyldighed indtil {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Tree Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Antal Consumed Per Unit
 DocType: Serial No,Warranty Expiry Date,Garanti udløbsdato
 DocType: Material Request Item,Quantity and Warehouse,Mængde og lager
+DocType: Hub Settings,Unregister,Afmeld
 DocType: Sales Invoice,Commission Rate (%),Provisionssats (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Vælg venligst Program
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Vælg venligst Program
 DocType: Project,Estimated Cost,Anslåede omkostninger
 DocType: Purchase Order,Link to material requests,Link til materialeanmodninger
+DocType: Hub Settings,Publish,Offentliggøre
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
 DocType: Journal Entry,Credit Card Entry,Credit Card indtastning
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Firma og regnskab
@@ -848,19 +865,18 @@
 DocType: Selling Settings,Close Opportunity After Days,Luk salgsmulighed efter dage
 ,Reserved,Reserveret
 DocType: Purchase Order,Supply Raw Materials,Supply råmaterialer
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Datoen, hvor den næste faktura vil blive dannet. Den dannes ved godkendelsen."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Omsætningsaktiver
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} er ikke en lagervare
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',Del venligst din feedback til træningen ved at klikke på &#39;Træningsfejl&#39; og derefter &#39;Ny&#39;
 DocType: Mode of Payment Account,Default Account,Standard-konto
 DocType: Payment Entry,Received Amount (Company Currency),Modtaget beløb (firmavaluta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,"""Er emne"" skal markeres, hvis salgsmulighed er lavet fra emne"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,"""Er emne"" skal markeres, hvis salgsmulighed er lavet fra emne"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Vælg ugentlig fridag
 DocType: Patient,O Negative,O Negativ
 DocType: Production Order Operation,Planned End Time,Planlagt sluttid
 ,Sales Person Target Variance Item Group-Wise,Salg Person Target Variance Item Group-Wise
 apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Konto med eksisterende transaktion kan ikke konverteres til finans
-DocType: Delivery Note,Customer's Purchase Order No,Kundens Indkøbsordre Nej
+DocType: Delivery Note,Customer's Purchase Order No,Kundens indkøbsordrenr.
 DocType: Budget,Budget Against,Budget Against
 DocType: Employee,Cell Number,Mobiltelefonnr.
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Automatisk materialeanmodning dannet
@@ -870,10 +886,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energi
 DocType: Opportunity,Opportunity From,Salgsmulighed fra
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Månedlige lønseddel.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Tilføj firma
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Række {0}: {1} Serienumre er nødvendige for punkt {2}. Du har angivet {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Række {0}: {1} Serienumre er nødvendige for punkt {2}. Du har angivet {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Vælg venligst en tabel
 DocType: BOM,Website Specifications,Website Specifikationer
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} er en ugyldig e-mail-adresse i &#39;Modtagere&#39;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} er en ugyldig e-mail-adresse i &#39;Modtagere&#39;
 DocType: Special Test Items,Particulars,Oplysninger
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiotikum.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Fra {0} af typen {1}
@@ -881,11 +897,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Række {0}: konverteringsfaktor er obligatorisk
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Flere Pris Regler eksisterer med samme kriterier, skal du løse konflikter ved at tildele prioritet. Pris Regler: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Kan ikke deaktivere eller annullere en stykliste, som det er forbundet med andre styklister"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Kan ikke deaktivere eller annullere en stykliste, som det er forbundet med andre styklister"
 DocType: Opportunity,Maintenance,Vedligeholdelse
 DocType: Item Attribute Value,Item Attribute Value,Item Attribut Værdi
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Salgskampagner.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Opret tidsregistreringskladde
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Opret tidsregistreringskladde
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -909,7 +925,7 @@
 DocType: Employee,Bank A/C No.,Bank A / C No.
 DocType: Bank Guarantee,Project,Sag
 DocType: Quality Inspection Reading,Reading 7,Reading 7
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,Delvist Bestilt
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,Delvist bestilt
 DocType: Lab Test,Lab Test,Lab Test
 DocType: Expense Claim Detail,Expense Claim Type,Udlægstype
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardindstillinger for Indkøbskurv
@@ -923,18 +939,20 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Indtast vare først
 DocType: Account,Liability,Passiver
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Bevilliget beløb kan ikke være større end udlægsbeløbet i række {0}.
+DocType: Salary Detail,Do not include in total,Inkluder ikke i alt
 DocType: Company,Default Cost of Goods Sold Account,Standard vareforbrug konto
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Prisliste ikke valgt
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Prisliste ikke valgt
 DocType: Employee,Family Background,Familiebaggrund
 DocType: Request for Quotation Supplier,Send Email,Send e-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Advarsel: ugyldig vedhæftet fil {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Ingen tilladelse
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Advarsel: ugyldig vedhæftet fil {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Ingen tilladelse
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Citat krævet
 DocType: Vital Signs,Heart Rate / Pulse,Hjertefrekvens / puls
 DocType: Company,Default Bank Account,Standard bankkonto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Hvis du vil filtrere baseret på Party, skal du vælge Party Type først"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Opdater lager' kan ikke markeres, fordi varerne ikke leveres via {0}"
 DocType: Vehicle,Acquisition Date,Erhvervelsesdato
-apps/erpnext/erpnext/utilities/user_progress.py +125,Nos,Nos
+apps/erpnext/erpnext/utilities/user_progress.py +125,Nos,Nummerserie
 DocType: Item,Items with higher weightage will be shown higher,Elementer med højere weightage vises højere
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Afstemning Detail
 apps/erpnext/erpnext/controllers/accounts_controller.py +549,Row #{0}: Asset {1} must be submitted,Række # {0}: Aktiv {1} skal godkendes
@@ -955,12 +973,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Item Row {IDX}: {doctype} {DOCNAME} findes ikke i ovenstående &#39;{doctype}&#39; tabel
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Tidsregistreringskladde {0} er allerede afsluttet eller annulleret
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Ingen opgaver
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den dag i den måned, hvor auto faktura vil blive genereret f.eks 05, 28 osv"
 DocType: Item Variant Settings,Copy Fields to Variant,Kopier felt til variant
 DocType: Asset,Opening Accumulated Depreciation,Åbning Akkumulerede afskrivninger
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score skal være mindre end eller lig med 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Tilmelding Tool
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C-Form optegnelser
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C-Form optegnelser
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Kunde og leverandør
 DocType: Email Digest,Email Digest Settings,Indstillinger for e-mail nyhedsbreve
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Tak for din forretning!
@@ -978,13 +995,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Citat Status
 DocType: Maintenance Visit,Completion Status,Afslutning status
 DocType: HR Settings,Enter retirement age in years,Indtast pensionsalderen i år
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Warehouse
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Vælg venligst et lager
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Target Warehouse
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Vælg venligst et lager
 DocType: Cheque Print Template,Starting location from left edge,Start fra venstre kant
 DocType: Item,Allow over delivery or receipt upto this percent,Tillad levering eller modtagelse op til denne procent
 DocType: Stock Entry,STE-,Ste-
 DocType: Upload Attendance,Import Attendance,Importér fremmøde
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Alle varegrupper
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Alle varegrupper
 DocType: Process Payroll,Activity Log,Activity Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Nettoresultat
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatisk skrive besked på indsendelse af transaktioner.
@@ -996,7 +1013,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Forventet antal
 DocType: Sales Invoice,Payment Due Date,Sidste betalingsdato
 DocType: Drug Prescription,Interval UOM,Interval UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Item Variant {0} findes allerede med samme attributter
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Item Variant {0} findes allerede med samme attributter
+DocType: Item,Hub Publishing Details,Hub Publishing Detaljer
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening','Åbner'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Åbn Opgaver
 DocType: Notification Control,Delivery Note Message,Følgeseddelmeddelelse
@@ -1016,10 +1034,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: Råmateriale kan ikke være det samme som hovedartikel
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total gældende takster i købskvitteringsvaretabel skal være det samme som de samlede skatter og afgifter
 DocType: Sales Team,Incentives,Incitamenter
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Tilmeld dig Hub
 DocType: SMS Log,Requested Numbers,Anmodet Numbers
 DocType: Production Planning Tool,Only Obtain Raw Materials,Kun Opnå råstoffer
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Præstationsvurdering.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Aktivering »anvendelse til indkøbskurv"", som indkøbskurv er aktiveret, og der skal være mindst én momsregel til Indkøbskurven"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Aktivering »anvendelse til indkøbskurv"", som indkøbskurv er aktiveret, og der skal være mindst én momsregel til Indkøbskurven"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Betaling indtastning {0} er forbundet mod Order {1}, kontrollere, om det skal trækkes forhånd i denne faktura."
 DocType: Sales Invoice Item,Stock Details,Stock Detaljer
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Sagsværdi
@@ -1038,12 +1057,14 @@
 DocType: Salary Slip,Working Days,Arbejdsdage
 DocType: Serial No,Incoming Rate,Indgående sats
 DocType: Packing Slip,Gross Weight,Bruttovægt
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,"Navnet på dit firma, som du oprette i dette system."
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Aktivér Hub
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,"Navnet på dit firma, som du oprette i dette system."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Medtag helligdage i det totale antal arbejdsdage
 DocType: Job Applicant,Hold,Hold
 DocType: Employee,Date of Joining,Ansættelsesdato
 DocType: Naming Series,Update Series,Opdatering Series
 DocType: Supplier Quotation,Is Subcontracted,Underentreprise
+DocType: Restaurant Table,Minimum Seating,Mindste plads
 DocType: Item Attribute,Item Attribute Values,Item Egenskab Værdier
 DocType: Examination Result,Examination Result,eksamensresultat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Købskvittering
@@ -1054,13 +1075,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Kan ikke finde Time Slot i de næste {0} dage til Operation {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materiale til sub-enheder
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Forhandlere og områder
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,Stykliste {0} skal være aktiv
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,Stykliste {0} skal være aktiv
 DocType: Journal Entry,Depreciation Entry,Afskrivninger indtastning
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Vælg dokumenttypen først
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,"Annuller Materiale Besøg {0}, før den annullerer denne vedligeholdelse Besøg"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serienummer {0} hører ikke til vare {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Nødvendigt antal
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Lager med eksisterende transaktioner kan ikke konverteres til Finans.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Lager med eksisterende transaktioner kan ikke konverteres til Finans.
 DocType: Bank Reconciliation,Total Amount,Samlet beløb
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Prescription Duration,Number,Nummer
@@ -1071,7 +1092,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Salgsprisliste
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Hvis markeret, oprettes en kunde, der er kortlagt til patienten. Patientfakturaer vil blive oprettet mod denne kunde. Du kan også vælge eksisterende kunde, mens du opretter patient."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Udgive synkronisere emner
 DocType: Bank Reconciliation,Account Currency,Konto Valuta
 DocType: Lab Test,Sample ID,Prøve ID
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Henvis Round Off-konto i selskabet
@@ -1080,11 +1100,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Medarbejder {0} er ikke aktiv eller findes ikke
 DocType: Fee Structure,Components,Lønarter
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Indtast Asset kategori i Item {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Item Varianter {0} opdateret
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Item Varianter {0} opdateret
 DocType: Quality Inspection Reading,Reading 6,Læsning 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Kan ikke {0} {1} {2} uden nogen negativ udestående faktura
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","at blive genereret. Hvis forsinket, skal du manuelt ændre feltet &quot;Gentag på dag i måneden&quot; her"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Kan ikke {0} {1} {2} uden nogen negativ udestående faktura
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Købsfaktura Advance
-DocType: Hub Settings,Sync Now,Synkroniser nu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Række {0}: Kredit indgang ikke kan knyttes med en {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Definer budget for et regnskabsår.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Standard Bank / Kontant-konto vil automatisk blive opdateret i POS faktura, når denne tilstand er valgt."
@@ -1096,13 +1117,13 @@
 DocType: Item,Is Purchase Item,Er Indkøbsvare
 DocType: Asset,Purchase Invoice,Købsfaktura
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail Nej
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Nye salgsfaktura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Nye salgsfaktura
 DocType: Stock Entry,Total Outgoing Value,Samlet værdi udgående
 DocType: Physician,Appointments,Udnævnelser
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Åbning Dato og Closing Datoen skal ligge inden samme regnskabsår
 DocType: Lead,Request for Information,Anmodning om information
 ,LeaderBoard,LEADERBOARD
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Synkroniser Offline fakturaer
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Synkroniser Offline fakturaer
 DocType: Payment Request,Paid,Betalt
 DocType: Program Fee,Program Fee,Program Fee
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1121,11 +1142,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Indkøbsordre vare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Indirekte Indkomst
 DocType: Student Attendance Tool,Student Attendance Tool,Student Deltagelse Tool
+DocType: Restaurant Menu,Price List (Auto created),Prisliste (Auto oprettet)
 DocType: Cheque Print Template,Date Settings,Datoindstillinger
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Varians
 ,Company Name,Firmaets navn
 DocType: SMS Center,Total Message(s),Besked (er) i alt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Vælg Item for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Vælg Item for Transfer
 DocType: Purchase Invoice,Additional Discount Percentage,Ekstra rabatprocent
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Se en liste over alle hjælpevideoerne
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Anvendes ikke
@@ -1142,6 +1164,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Måler
 DocType: Workstation,Electricity Cost,Elektricitetsomkostninger
 DocType: HR Settings,Don't send Employee Birthday Reminders,Send ikke medarbejderfødselsdags- påmindelser
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Gem indstillinger
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Ønskede produkter
 DocType: Item,Inspection Criteria,Kontrolkriterier
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Overført
 DocType: BOM Website Item,BOM Website Item,BOM Website Item
@@ -1158,11 +1182,11 @@
 DocType: Journal Entry,Total Amount in Words,Samlet beløb i Words
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Der opstod en fejl. En sandsynlig årsag kan være, at du ikke har gemt formularen. Kontakt venligst support@erpnext.com hvis problemet fortsætter."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Indkøbskurv
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Bestil type skal være en af {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Bestil type skal være en af {0}
 DocType: Lead,Next Contact Date,Næste kontakt d.
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Åbning Antal
 DocType: Healthcare Settings,Appointment Reminder,Aftalens påmindelse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Indtast konto for returbeløb
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Indtast konto for returbeløb
 DocType: Student Batch Name,Student Batch Name,Elevgruppenavn
 DocType: Consultation,Doctor,Læge
 DocType: Holiday List,Holiday List Name,Helligdagskalendernavn
@@ -1170,12 +1194,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Kursusskema
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Aktieoptioner
 DocType: Journal Entry Account,Expense Claim,Udlæg
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Vil du virkelig gendanne dette kasserede anlægsaktiv?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Antal for {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Vil du virkelig gendanne dette kasserede anlægsaktiv?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Antal for {0}
 DocType: Leave Application,Leave Application,Ansøg om fravær
 DocType: Patient,Patient Relation,Patientrelation
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Fraværstildelingsværktøj
+DocType: Item,Hub Category to Publish,Hub kategori til udgivelse
 DocType: Leave Block List,Leave Block List Dates,Fraværsblokeringsdatoer
+DocType: Sales Invoice,Billing Address GSTIN,Faktureringsadresse GSTIN
 DocType: Workstation,Net Hour Rate,Netto timeløn
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost købskvittering
 DocType: Company,Default Terms,Standardvilkår
@@ -1185,18 +1211,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Angiv en {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Fjernede elementer uden nogen ændringer i mængde eller værdi.
 DocType: Delivery Note,Delivery To,Levering Til
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Attributtabellen er obligatorisk
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Attributtabellen er obligatorisk
 DocType: Production Planning Tool,Get Sales Orders,Hent salgsordrer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} kan ikke være negativ
 DocType: Training Event,Self-Study,Selvstudie
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Rabat
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Rabat
 DocType: Asset,Total Number of Depreciations,Samlet antal afskrivninger
 DocType: Sales Invoice Item,Rate With Margin,Vurder med margen
 DocType: Workstation,Wages,Løn
 DocType: Task,Urgent,Hurtigst muligt
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Angiv en gyldig Row ID for rækken {0} i tabel {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Kan ikke finde variabel:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Vælg venligst et felt for at redigere fra numpad
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Vælg venligst et felt for at redigere fra numpad
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Gå til skrivebordet og begynd at bruge ERPNext
 DocType: Item,Manufacturer,Producent
 DocType: Landed Cost Item,Purchase Receipt Item,Købskvittering vare
@@ -1227,8 +1253,8 @@
 DocType: GL Entry,Against,Imod
 DocType: Item,Default Selling Cost Center,Standard salgsomkostningssted
 DocType: Sales Partner,Implementation Partner,Implementering Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Postnummer
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Salgsordre {0} er {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Postnummer
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Salgsordre {0} er {1}
 DocType: Opportunity,Contact Info,Kontaktinformation
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Making Stock Angivelser
 DocType: Packing Slip,Net Weight UOM,Nettovægt vægtenhed
@@ -1239,6 +1265,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Hent ugentlige fridage til kalenderen
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Slutdato kan ikke være mindre end Startdato
 DocType: Sales Person,Select company name first.,Vælg firmanavn først.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Lav til Høj
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Tilbud modtaget fra leverandører.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Erstat BOM og opdater seneste pris i alle BOM&#39;er
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Til {0} | {1} {2}
@@ -1257,7 +1284,7 @@
 DocType: Program Enrollment,Transportation,Transport
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Ugyldig Attribut
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} skal godkendes
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Antal skal være mindre end eller lig med {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Antal skal være mindre end eller lig med {0}
 DocType: SMS Center,Total Characters,Total tegn
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Vælg BOM i BOM vilkår for Item {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Faktura Detail
@@ -1272,7 +1299,7 @@
 ,Ordered Items To Be Billed,Bestilte varer at blive faktureret
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Fra Range skal være mindre end at ligge
 DocType: Global Defaults,Global Defaults,Globale indstillinger
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Invitation til sagssamarbejde
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Invitation til sagssamarbejde
 DocType: Salary Slip,Deductions,Fradrag
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Handlingsnavn
@@ -1290,13 +1317,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Salgsfaktura Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Intet at anmode om
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},En anden Budget rekord &#39;{0}&#39; findes allerede mod {1} &#39;{2}&#39; for regnskabsåret {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','Faktisk startdato' kan ikke være større end 'Faktisk slutdato'
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','Faktisk startdato' kan ikke være større end 'Faktisk slutdato'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Ledelse
 DocType: Cheque Print Template,Payer Settings,payer Indstillinger
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dette vil blive føjet til varen af varianten. For eksempel, hvis dit forkortelse er ""SM"", og varenummeret er ""T-SHIRT"", så vil variantens varenummer blive ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettoløn (i ord) vil være synlig, når du gemmer lønsedlen."
 DocType: Purchase Invoice,Is Return,Er Return
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Advarsel
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Advarsel
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Retur / debetnota
 DocType: Price List Country,Price List Country,Prislisteland
 DocType: Item,UOMs,Enheder
@@ -1311,17 +1338,18 @@
 DocType: Account,Balance Sheet,Balance
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Omkostningssted for vare med varenr. '
 DocType: Fee Validity,Valid Till,Gyldig til
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betalingsmåde er ikke konfigureret. Kontroller, om konto er blevet indstillet på betalingsmåden eller på Kassesystemprofilen."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betalingsmåde er ikke konfigureret. Kontroller, om konto er blevet indstillet på betalingsmåden eller på Kassesystemprofilen."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Samme vare kan ikke indtastes flere gange.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Kan gøres yderligere konti under grupper, men oplysningerne kan gøres mod ikke-grupper"
 DocType: Lead,Lead,Emne
 DocType: Email Digest,Payables,Gæld
 DocType: Course,Course Intro,Kursusintroduktion
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Lagerindtastning {0} oprettet
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Venligst opsæt nummereringsserier for Tilstedeværelse via Opsætning&gt; Nummereringsserie
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Lagerindtastning {0} oprettet
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Afvist Antal kan ikke indtastes i Indkøb Return
 ,Purchase Order Items To Be Billed,Indkøbsordre varer til fakturering
 DocType: Purchase Invoice Item,Net Rate,Nettosats
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Vælg venligst en kunde
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Vælg venligst en kunde
 DocType: Purchase Invoice Item,Purchase Invoice Item,Købsfaktura Item
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Lagerposter og finansposter er posteret om  for de valgte købskvitteringer
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Vare 1
@@ -1340,7 +1368,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Duplikér række {0} med samme {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Regnskabsår {0} blev ikke fundet
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Opsætning af Medarbejdere
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Opsætning af Medarbejdere
 DocType: Sales Order,SO-,SO-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Vælg venligst præfiks først
 DocType: Employee,O-,O-
@@ -1352,12 +1380,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Se kladde
 DocType: Grading Scale,Intervals,Intervaller
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Der eksisterer en varegruppe med samme navn, og du bedes derfor ændre varenavnet eller omdøbe varegruppen"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Der eksisterer en varegruppe med samme navn, og du bedes derfor ændre varenavnet eller omdøbe varegruppen"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Studerende mobiltelefonnr.
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Resten af verden
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Resten af verden
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Vare {0} kan ikke have parti
 ,Budget Variance Report,Budget Variance Report
 DocType: Salary Slip,Gross Pay,Bruttoløn
+DocType: Item,Is Item from Hub,Er vare fra nav
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Række {0}: Aktivitetstypen er obligatorisk.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Betalt udbytte
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Regnskab Ledger
@@ -1367,8 +1396,9 @@
 DocType: Vehicle Log,Service Detail,service Detail
 DocType: BOM,Item Description,Varebeskrivelse
 DocType: Student Sibling,Student Sibling,Student Søskende
-DocType: Purchase Invoice,Is Recurring,Er Tilbagevendende
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Betaling tilstand
 DocType: Purchase Invoice,Supplied Items,Medfølgende varer
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Indstil en aktiv menu for Restaurant {0}
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Antal at producere
 DocType: Email Digest,New Income,Ny Indkomst
@@ -1378,6 +1408,7 @@
 ,Student and Guardian Contact Details,Studerende og Guardian Kontaktoplysninger
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Række {0}: For leverandør {0} E-mail-adresse er nødvendig for at sende e-mail
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Midlertidig åbning
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Se nav
 ,Employee Leave Balance,Medarbejder Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Balance for konto {0} skal altid være {1}
 DocType: Patient Appointment,More Info,Mere info
@@ -1397,13 +1428,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Salgsordre {0} er ikke gyldig
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Advar om ny anmodning om tilbud
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Indkøbsordrer hjælpe dig med at planlægge og følge op på dine køb
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Prescriptions
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Den samlede overførselsmængde {0} i materialeanmodning {1} \ kan ikke være større end den anmodede mængde {2} for vare {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Lille
 DocType: Employee,Employee Number,Medarbejdernr.
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},"(E), der allerede er i brug Case Ingen. Prøv fra sag {0}"
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},"(E), der allerede er i brug Case Ingen. Prøv fra sag {0}"
 DocType: Project,% Completed,% afsluttet
 ,Invoiced Amount (Exculsive Tax),Faktureret beløb (exculsive Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Vare 2
@@ -1418,11 +1449,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Indirekte udgifter
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Række {0}: Antal er obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Landbrug
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Dine produkter eller tjenester
 DocType: Special Test Items,Special Test Items,Særlige testelementer
 DocType: Mode of Payment,Mode of Payment,Betalingsmåde
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Website Billede bør være en offentlig fil eller webadresse
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Website Billede bør være en offentlig fil eller webadresse
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,Stykliste
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Dette er en rod-varegruppe og kan ikke redigeres.
@@ -1430,24 +1461,23 @@
 DocType: Vehicle,Fuel UOM,Brændstofsenhed
 DocType: Warehouse,Warehouse Contact Info,Lagerkontaktinformation
 DocType: Payment Entry,Write Off Difference Amount,Skriv Off Forskel Beløb
-DocType: Purchase Invoice,Recurring Type,Tilbagevendende Type
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: Medarbejderens e-mail er ikke fundet, og derfor er e-mailen ikke sendt"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: Medarbejderens e-mail er ikke fundet, og derfor er e-mailen ikke sendt"
 DocType: Item,Foreign Trade Details,Udenrigshandel Detaljer
+,Assessment Plan Status,Evalueringsplan Status
 DocType: Email Digest,Annual Income,Årlige indkomst
 DocType: Serial No,Serial No Details,Serienummeroplysninger
 DocType: Purchase Invoice Item,Item Tax Rate,Varemoms-%
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,Vælg venligst læge og dato
 DocType: Student Group Student,Group Roll Number,Gruppe Roll nummer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan kun kredit konti knyttes mod en anden debet post
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totalen for vægtningen af alle opgaver skal være 1. Juster vægten af alle sagsopgaver i overensstemmelse hermed
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Følgeseddel {0} er ikke godkendt
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totalen for vægtningen af alle opgaver skal være 1. Juster vægten af alle sagsopgaver i overensstemmelse hermed
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Følgeseddel {0} er ikke godkendt
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Vare {0} skal være en underentreprise Vare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Capital Udstyr
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prisfastsættelsesregel skal først baseres på feltet 'Gælder for', som kan indeholde vare, varegruppe eller varemærke."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Indstil varenummeret først
-DocType: Hub Settings,Seller Website,Sælger Website
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Indstil varenummeret først
 DocType: Item,ITEM-,VARE-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Samlede fordelte procentdel for salgsteam bør være 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Samlede fordelte procentdel for salgsteam bør være 100
 DocType: Sales Invoice Item,Edit Description,Rediger beskrivelse
 DocType: Antibiotic,Antibiotic,Antibiotikum
 ,Team Updates,Team opdateringer
@@ -1468,12 +1498,12 @@
 DocType: Purchase Invoice,Total (Company Currency),I alt (firmavaluta)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Serienummer {0} indtastet mere end én gang
 DocType: Depreciation Schedule,Journal Entry,Kassekladde
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} igangværende varer
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} igangværende varer
 DocType: Workstation,Workstation Name,Workstation Navn
 DocType: Grading Scale Interval,Grade Code,Grade kode
 DocType: POS Item Group,POS Item Group,Kassesystem-varegruppe
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail nyhedsbrev:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},Stykliste {0} hører ikke til vare {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},Stykliste {0} hører ikke til vare {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Salary Slip,Bank Account No.,Bankkonto No.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Dette er antallet af sidste skabte transaktionen med dette præfiks
@@ -1489,10 +1519,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Anmodning om tilbud Leverandør
 DocType: Healthcare Settings,Registration Message,Registreringsmeddelelse
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Hardware
-DocType: Sales Order,Recurring Upto,tilbagevendende Op
 DocType: Prescription Dosage,Prescription Dosage,Receptpligtig dosering
 DocType: Attendance,HR Manager,HR-chef
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Vælg firma
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Vælg firma
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Privilege Forlad
 DocType: Purchase Invoice,Supplier Invoice Date,Leverandør fakturadato
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,om
@@ -1508,10 +1537,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Overlappende betingelser fundet mellem:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Mod Kassekladde {0} er allerede justeret mod et andet bilag
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Samlet ordreværdi
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Mad
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Mad
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing Range 3
 DocType: Maintenance Schedule Item,No of Visits,Antal besøg
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Vedligeholdelsesplan {0} eksisterer imod {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Vil du udgive dine artikler til hub?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,tilmelding elev
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta for Lukning Der skal være {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Sum af point for alle mål skal være 100. Det er {0}
@@ -1522,9 +1552,9 @@
 DocType: Authorization Rule,Average Discount,Gennemsnitlig rabat
 DocType: Purchase Invoice Item,UOM,Enhed
 DocType: Rename Tool,Utilities,Forsyningsvirksomheder
-DocType: Purchase Invoice Item,Accounting,Regnskab
+DocType: POS Profile,Accounting,Regnskab
 DocType: Employee,EMP/,MA/
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Vælg venligst batches for batched item
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Vælg venligst batches for batched item
 DocType: Asset,Depreciation Schedules,Afskrivninger Tidsplaner
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Ansøgningsperiode kan ikke være uden for orlov tildelingsperiode
 DocType: Activity Cost,Projects,Sager
@@ -1540,7 +1570,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',Godkendelsesstatus skal &quot;Godkendt&quot; eller &quot;Afvist&quot;
 DocType: Physician,Contacts and Address,Kontakter og adresse
 DocType: Purchase Invoice,Contact Person,Kontaktperson
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Forventet startdato' kan ikke være større end 'Forventet slutdato '
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','Forventet startdato' kan ikke være større end 'Forventet slutdato '
 DocType: Course Scheduling Tool,Course End Date,Kursus slutdato
 DocType: Holiday List,Holidays,Helligdage
 DocType: Sales Order Item,Planned Quantity,Planlagt mængde
@@ -1548,10 +1578,11 @@
 DocType: Item,Maintain Stock,Vedligehold lageret
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Stock Entries allerede skabt til produktionsordre
 DocType: Employee,Prefered Email,foretrukket Email
+DocType: Student Admission,Eligibility and Details,Støtteberettigelse og detaljer
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Nettoændring i anlægsaktiver
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lad feltet stå tomt hvis det skal gælde for alle betegnelser
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Afgift af typen &#39;Actual &quot;i rækken {0} kan ikke indgå i Item Rate
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Fra datotid
 DocType: Email Digest,For Company,Til firma
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikation log.
@@ -1559,19 +1590,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Leverandør Scorecard Scoringsvariabel
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Køb Beløb
 DocType: Sales Invoice,Shipping Address Name,Leveringsadressenavn
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Kontoplan
 DocType: Material Request,Terms and Conditions Content,Vilkår og -betingelsesindhold
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,må ikke være større end 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Vare {0} er ikke en lagervare
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Vare {0} er ikke en lagervare
 DocType: Maintenance Visit,Unscheduled,Uplanlagt
 DocType: Employee,Owned,Ejet
 DocType: Salary Detail,Depends on Leave Without Pay,Afhænger af fravær uden løn
 DocType: Pricing Rule,"Higher the number, higher the priority","Desto højere tallet er, jo højere prioritet"
 ,Purchase Invoice Trends,Købsfaktura Trends
 DocType: Employee,Better Prospects,Bedre udsigter
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Række # {0}: Parti {1} har kun {2} mængde. Vælg venligst et andet parti, der har {3} antal tilgængelige eller opdel rækken i flere rækker for at kunne levere fra flere partier"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Række # {0}: Parti {1} har kun {2} mængde. Vælg venligst et andet parti, der har {3} antal tilgængelige eller opdel rækken i flere rækker for at kunne levere fra flere partier"
 DocType: Vehicle,License Plate,Nummerplade
 DocType: Appraisal,Goals,Mål
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Vælg POS-profil
 DocType: Warranty Claim,Warranty / AMC Status,Garanti / AMC status
 ,Accounts Browser,Konti Browser
 DocType: Payment Entry Reference,Payment Entry Reference,Betalingspost reference
@@ -1589,7 +1620,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Medarbejder kan ikke referere til sig selv.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hvis kontoen er frossen, er poster lov til begrænsede brugere."
 DocType: Email Digest,Bank Balance,Bank Balance
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Regnskab Punktet om {0}: {1} kan kun foretages i valuta: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Regnskab Punktet om {0}: {1} kan kun foretages i valuta: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Stillingsprofil, kvalifikationskrav mv."
 DocType: Journal Entry Account,Account Balance,Kontosaldo
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Momsregel til transaktioner.
@@ -1598,8 +1629,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Moms i alt (firmavaluta)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Vis uafsluttede finanspolitiske års P &amp; L balancer
 DocType: Lab Test Template,Collection Details,Indsamlingsdetaljer
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","vælg cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date fra tabConsultation ct, `tabLab Prescription` cp hvor ct.patient = &#39;{0}&#39; og cp.parent = ct. navn og cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Forsendelse konto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Konto {2} er inaktiv
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Opret salgsordrer til at hjælpe dig med at planlægge dit arbejde og levere til tiden
@@ -1616,7 +1645,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Pakkeseddel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Kontorleje
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Opsætning SMS gateway-indstillinger
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import mislykkedes!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import mislykkedes!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Ingen adresse tilføjet endnu.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Working Hour
 DocType: Vital Signs,Blood Pressure,Blodtryk
@@ -1641,7 +1670,7 @@
 DocType: Sales Invoice,Source,Kilde
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Vis lukket
 DocType: Leave Type,Is Leave Without Pay,Er fravær uden løn
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Aktivkategori er obligatorisk for en anlægsaktivvare
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Aktivkategori er obligatorisk for en anlægsaktivvare
 DocType: Fee Validity,Fee Validity,Gebyrets gyldighed
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Ingen resultater i Payment tabellen
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Dette {0} konflikter med {1} for {2} {3}
@@ -1662,8 +1691,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Opret emner
 DocType: Maintenance Schedule,Schedules,Tidsplaner
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,POS-profil er påkrævet for at bruge Point-of-Sale
 DocType: Purchase Invoice Item,Net Amount,Nettobeløb
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} er ikke indsendt, så handlingen kan ikke gennemføres"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} er ikke indsendt, så handlingen kan ikke gennemføres"
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nej
 DocType: Landed Cost Voucher,Additional Charges,Ekstragebyrer
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Ekstra rabatbeløb (firmavaluta)
@@ -1672,7 +1702,7 @@
 ,Support Hour Distribution,Support Time Distribution
 DocType: Maintenance Visit,Maintenance Visit,Vedligeholdelsesbesøg
 DocType: Student,Leaving Certificate Number,Leaving Certificate Number
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Aftale annulleret, bedes gennemgå og annullere fakturaen {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Aftale annulleret, bedes gennemgå og annullere fakturaen {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Tilgængeligt batch-antal på lageret
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Opdater Print Format
 DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Hjælp
@@ -1695,8 +1725,8 @@
 DocType: Patient,Tobacco Past Use,Tidligere brug af tobak
 DocType: Sales Invoice Item,Brand Name,Varemærkenavn
 DocType: Purchase Receipt,Transporter Details,Transporter Detaljer
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Bruger {0} er allerede tildelt Læger {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Standardlageret er påkrævet for den valgte vare
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Bruger {0} er allerede tildelt Læger {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Standardlageret er påkrævet for den valgte vare
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Kasse
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,mulig leverandør
 DocType: Budget,Monthly Distribution,Månedlig Distribution
@@ -1706,7 +1736,7 @@
 DocType: Sales Partner,Sales Partner Target,Forhandlermål
 DocType: Loan Type,Maximum Loan Amount,Maksimalt lånebeløb
 DocType: Pricing Rule,Pricing Rule,Prisfastsættelsesregel
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Dupliceringsrulle nummer for studerende {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Dupliceringsrulle nummer for studerende {0}
 DocType: Budget,Action if Annual Budget Exceeded,Action hvis årlige budgetplan overskredet
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Materialeanmodning til indkøbsordre
 DocType: Shopping Cart Settings,Payment Success URL,Betaling gennemført URL
@@ -1723,7 +1753,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} må kun optræde én gang
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ikke tilladt at overføre mere {0} end {1} mod indkøbsordre {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Fravær blev succesfuldt tildelt til {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Ingen varer at pakke
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Ingen varer at pakke
 DocType: Shipping Rule Condition,From Value,Fra Value
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Produktionmængde er obligatorisk
 DocType: Employee Loan,Repayment Method,tilbagebetaling Metode
@@ -1737,6 +1767,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Stock Passiver
 DocType: Purchase Invoice,Supplier Warehouse,Leverandør Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt mobiltelefonnr.
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Vælg firma
 ,Material Requests for which Supplier Quotations are not created,Materialeanmodninger under hvilke leverandørtilbud ikke er oprettet
 DocType: Student Group,Set 0 for no limit,Sæt 0 for ingen grænse
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Den dag (e), som du ansøger om orlov er helligdage. Du har brug for ikke søge om orlov."
@@ -1746,24 +1777,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Opret tilbud
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Andre rapporter
 DocType: Dependent Task,Dependent Task,Afhængig opgave
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Måleenhed skal være 1 i række {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Måleenhed skal være 1 i række {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Fravær af typen {0} må ikke vare længere end {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prøv at planlægge operationer for X dage i forvejen.
 DocType: HR Settings,Stop Birthday Reminders,Stop Fødselsdag Påmindelser
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Venligst sæt Standard Payroll Betales konto i Company {0}
 DocType: SMS Center,Receiver List,Modtageroversigt
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Søg Vare
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Søg Vare
 DocType: Patient Appointment,Referring Physician,Refererende læge
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Forbrugt Mængde
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Nettoændring i kontanter
 DocType: Assessment Plan,Grading Scale,karakterbekendtgørelsen
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Måleenhed {0} er indtastet mere end én gang i Conversion Factor Table
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,Allerede afsluttet
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Måleenhed {0} er indtastet mere end én gang i Conversion Factor Table
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,Allerede afsluttet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock i hånden
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Betalingsanmodning findes allerede {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Omkostninger ved Udstedte Varer
 DocType: Physician,Hospital,Sygehus
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Antal må ikke være mere end {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Antal må ikke være mere end {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Foregående regnskabsår er ikke lukket
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Alder (dage)
 DocType: Quotation Item,Quotation Item,Tilbudt vare
@@ -1774,8 +1805,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Leverandørtype-master.
 DocType: Purchase Order Item,Supplier Part Number,Leverandør Part Number
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Omregningskurs kan ikke være 0 eller 1
-DocType: Sales Invoice,Reference Document,referencedokument
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} er aflyst eller stoppet
+DocType: Subscription,Reference Document,referencedokument
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} er aflyst eller stoppet
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Køretøj Dispatch Dato
 DocType: Healthcare Settings,Default Medical Code Standard,Standard Medical Code Standard
@@ -1784,6 +1815,7 @@
 DocType: Company,Default Payable Account,Standard Betales konto
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Indstillinger for online indkøbskurv, såsom forsendelsesregler, prisliste mv."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Faktureret
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Sorter efter Pris ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserveret mængde
 DocType: Party Account,Party Account,Party Account
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Medarbejdere
@@ -1795,13 +1827,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Make Udbetaling indtastning
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Række {0}: Advance mod Leverandøren skal debitere
 DocType: Company,Default Values,Standardværdier
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequency} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Frequency} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Samlede godtgjorte beløb
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Dette er baseret på kørebogen for køretøjet. Se tidslinje nedenfor for detaljer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Imod Leverandør Faktura {0} dateret {1}
 DocType: Customer,Default Price List,Standardprisliste
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Asset Movement rekord {0} skabt
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Du kan ikke slette Fiscal År {0}. Regnskabsår {0} er indstillet som standard i Globale indstillinger
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,En kunde med samme navn eksisterer allerede
 DocType: Journal Entry,Entry Type,Posttype
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Ingen vurderingsplan knyttet til denne vurderingsgruppe
 ,Customer Credit Balance,Customer Credit Balance
@@ -1811,7 +1844,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Priser
 DocType: Quotation,Term Details,Betingelsesdetaljer
 DocType: Project,Total Sales Cost (via Sales Order),Samlet salgsomkostninger (via salgsordre)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Kan ikke tilmelde mere end {0} studerende til denne elevgruppe.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Kan ikke tilmelde mere end {0} studerende til denne elevgruppe.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead Count
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} skal være større end 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapacitet Planlægning For (dage)
@@ -1827,9 +1860,11 @@
 DocType: Lab Test,Technician Name,Tekniker navn
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Fjern link Betaling ved Annullering af faktura
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Aktuel kilometerstand indtastet bør være større end Køretøjets indledende kilometerstand {0}
+DocType: Restaurant Reservation,No Show,Ingen Vis
 DocType: Shipping Rule Country,Shipping Rule Country,Forsendelsesregelland
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Fravær og fremmøde
 DocType: Maintenance Visit,Partially Completed,Delvist afsluttet
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Moderat følsomhed
 DocType: Leave Type,Include holidays within leaves as leaves,Medtag helligdage indenfor fraværsperioden som fravær
 DocType: Sales Invoice,Packed Items,Pakkede varer
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garantikrav mod serienummer
@@ -1846,13 +1881,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Betalt beløb (firmavaluta)
 DocType: Purchase Invoice,Additional Discount,Ekstra rabat
 DocType: Selling Settings,Selling Settings,Salgsindstillinger
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Bekræft handling
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Auktioner
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Angiv venligst enten mængde eller værdiansættelsebeløb eller begge
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Opfyldelse
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Se i indkøbskurven
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Markedsføringsomkostninger
 ,Item Shortage Report,Item Mangel Rapport
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vægt er nævnt, \ nVenligst nævne &quot;Weight UOM&quot; for"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vægt er nævnt, \ nVenligst nævne &quot;Weight UOM&quot; for"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materialeanmodning brugt til denne lagerpost
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Næste afskrivningsdato er obligatorisk for nye aktiver
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Separat kursusbaseret gruppe for hver batch
@@ -1864,12 +1900,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Lav Regnskab indtastning For hver Stock Movement
 DocType: Leave Allocation,Total Leaves Allocated,Tildelt fravær i alt
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Lager kræves på rækkenr. {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Indtast venligst det gyldige regnskabsårs start- og slutdatoer
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Indtast venligst det gyldige regnskabsårs start- og slutdatoer
 DocType: Employee,Date Of Retirement,Dato for pensionering
 DocType: Upload Attendance,Get Template,Hent skabelon
 DocType: Material Request,Transferred,overført
 DocType: Vehicle,Doors,Døre
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext opsætning er afsluttet !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext opsætning er afsluttet !
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Indsamle gebyr for patientregistrering
 DocType: Course Assessment Criteria,Weightage,Vægtning
 DocType: Purchase Invoice,Tax Breakup,Skatteafbrydelse
@@ -1886,38 +1922,38 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +61,Select Item (optional),Vælg emne (valgfrit)
 DocType: Fee Schedule Student Group,Fee Schedule Student Group,Fee Schedule Student Group
 DocType: Employee,AB+,AB +
-DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Hvis denne vare har varianter, så det kan ikke vælges i salgsordrer mv"
+DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Hvis denne vare har varianter, kan den ikke vælges i salgsordrer mv"
 DocType: Lead,Next Contact By,Næste kontakt af
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},"Mængde, der kræves for Item {0} i række {1}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},"Mængde, der kræves for Item {0} i række {1}"
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},"Lager {0} kan ikke slettes, da der eksisterer et antal varer {1} på lageret"
 DocType: Quotation,Order Type,Bestil Type
-DocType: Purchase Invoice,Notification Email Address,Meddelelse E-mailadresse
 ,Item-wise Sales Register,Vare-wise Sales Register
 DocType: Asset,Gross Purchase Amount,Bruttokøbesum
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Åbning af saldi
 DocType: Asset,Depreciation Method,Afskrivningsmetode
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Offline
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Er denne Tax inkluderet i Basic Rate?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Samlet Target
 DocType: Job Applicant,Applicant for a Job,Ansøger
 DocType: Production Plan Material Request,Production Plan Material Request,Produktionsplan-Materialeanmodning
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Ingen produktionsordrer oprettet
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Ingen produktionsordrer oprettet
 DocType: Stock Reconciliation,Reconciliation JSON,Afstemning JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,For mange kolonner. Udlæs rapporten og udskriv den ved hjælp af et regnearksprogram.
 DocType: Purchase Invoice Item,Batch No,Partinr.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Anmodning om tilbud: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Tillad flere salgsordrer mod kundens indkøbsordre
 DocType: Student Group Instructor,Student Group Instructor,Studentgruppeinstruktør
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Formynder 2 mobiltelefonnr.
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Hoved
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Hoved
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Sæt præfiks for nummerering serie om dine transaktioner
 DocType: Employee Attendance Tool,Employees HTML,Medarbejdere HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Standard stykliste ({0}) skal være aktiv for denne vare eller dens skabelon
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Standard stykliste ({0}) skal være aktiv for denne vare eller dens skabelon
 DocType: Employee,Leave Encashed?,Skal fravær udbetales?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Salgsmulighed Fra-feltet er obligatorisk
 DocType: Email Digest,Annual Expenses,årlige Omkostninger
 DocType: Item,Variants,Varianter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Opret indkøbsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Opret indkøbsordre
 DocType: SMS Center,Send To,Send til
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Der er ikke nok dage til rådighed til fraværstype {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Tildelte beløb
@@ -1933,6 +1969,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Studentgruppens styrke
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Mod Kassekladde {0} har ikke nogen uovertruffen {1} indgang
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Medarbejdervurderinger
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Træningsarrangementer
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Doppelte serienumre er indtastet for vare {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Betingelse for en forsendelsesregel
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Kom ind
@@ -1942,7 +1979,7 @@
 DocType: Sales Order,To Deliver and Bill,At levere og Bill
 DocType: Student Group,Instructors,Instruktører
 DocType: GL Entry,Credit Amount in Account Currency,Credit Beløb i Konto Valuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,Stykliste {0} skal godkendes
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,Stykliste {0} skal godkendes
 DocType: Authorization Control,Authorization Control,Authorization Kontrol
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Række # {0}: Afvist Warehouse er obligatorisk mod afvist element {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Betaling
@@ -1961,11 +1998,11 @@
 DocType: Quotation Item,Actual Qty,Faktiske Antal
 DocType: Sales Invoice Item,References,Referencer
 DocType: Quality Inspection Reading,Reading 10,Reading 10
-DocType: Hub Settings,Hub Node,Hub Node
+DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Du har indtastet dubletter. Venligst rette, og prøv igen."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Associate
 DocType: Asset Movement,Asset Movement,Asset Movement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,Ny kurv
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,Ny kurv
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Vare {0} er ikke en serienummervare
 DocType: SMS Center,Create Receiver List,Opret Modtager liste
 DocType: Vehicle,Wheels,Hjul
@@ -1979,15 +2016,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekommunikation
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Angiver, at pakken er en del af denne leverance (Kun udkast)"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Indtast indbetaling
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Mængde for vare {0} skal være mindre end {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Mængde for vare {0} skal være mindre end {1}
 ,Sales Invoice Trends,Salgsfaktura Trends
 DocType: Leave Application,Apply / Approve Leaves,Anvend / Godkend fravær
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,For
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,For
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Kan henvise rækken, hvis gebyret type er &#39;On Forrige Row Beløb &quot;eller&quot; Forrige Row alt&#39;"
 DocType: Sales Order Item,Delivery Warehouse,Levering Warehouse
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Tree of finansielle omkostningssteder.
 DocType: Serial No,Delivery Document No,Levering dokument nr
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},"Sæt venligst ""Gevinst/tabskonto vedr. salg af anlægsaktiv"" i firma {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},"Sæt venligst ""Gevinst/tabskonto vedr. salg af anlægsaktiv"" i firma {0}"
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Hent varer fra købskvitteringer
 DocType: Serial No,Creation Date,Oprettet d.
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Vare {0} forekommer flere gange i prisliste {1}
@@ -1998,11 +2035,12 @@
 DocType: Student,Student Mobile Number,Studerende mobiltelefonnr.
 DocType: Item,Has Variants,Har Varianter
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Opdater svar
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Du har allerede valgt elementer fra {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Du har allerede valgt elementer fra {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Navnet på den månedlige Distribution
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Parti-id er obligatorisk
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
-DocType: Purchase Invoice,Recurring Invoice,Tilbagevendende Faktura
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Høj til lav
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Vælg programmet først
 DocType: Patient Appointment,Patient Age,Patientalder
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Håndtering af sager
 DocType: Supplier,Supplier of Goods or Services.,Leverandør af varer eller tjenesteydelser.
@@ -2010,8 +2048,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Standardfordelbare konti, der skal bruges, hvis de ikke er indstillet til patienten for at bestille konsultationsafgifter."
 DocType: Vehicle Log,Fuel Price,Brændstofpris
 DocType: Budget,Budget,Budget
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Sæt Åbn
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Anlægsaktiv-varen skal være en ikke-lagervare.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Sæt Åbn
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Anlægsaktiv-varen skal være en ikke-lagervare.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget kan ikke tildeles mod {0}, da det ikke er en indtægt eller omkostning konto"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Opnået
 DocType: Student Admission,Application Form Route,Ansøgningsskema Route
@@ -2025,12 +2063,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Vare {0} er ikke sat op til serienumre. Tjek vare-masteren
 DocType: Maintenance Visit,Maintenance Time,Vedligeholdelsestid
 ,Amount to Deliver,"Beløb, Deliver"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Samme vare er indtastet flere gange. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Betingelsernes startdato kan ikke være tidligere end startdatoen for skoleåret, som udtrykket er forbundet med (Studieår {}). Ret venligst datoerne og prøv igen."
 DocType: Guardian,Guardian Interests,Guardian Interesser
 DocType: Naming Series,Current Value,Aktuel værdi
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Flere regnskabsår findes for den dato {0}. Indstil selskab i regnskabsåret
 DocType: School Settings,Instructor Records to be created by,"Instruktør Records, der skal oprettes af"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} oprettet
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} oprettet
 DocType: Delivery Note Item,Against Sales Order,Mod kundeordre
 ,Serial No Status,Serienummerstatus
 DocType: Payment Entry Reference,Outstanding,Udestående
@@ -2040,10 +2079,10 @@
 						must be greater than or equal to {2}","Række {0}: For at indstille {1} periodicitet, skal forskellen mellem fra og til dato \ være større end eller lig med {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Dette er baseret på lager bevægelse. Se {0} for detaljer
 DocType: Pricing Rule,Selling,Salg
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Mængden {0} {1} trækkes mod {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Mængden {0} {1} trækkes mod {2}
 DocType: Employee,Salary Information,Løn Information
 DocType: Sales Person,Name and Employee ID,Navn og medarbejdernr.
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Forfaldsdato kan ikke være før bogføringsdatoen
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Forfaldsdato kan ikke være før bogføringsdatoen
 DocType: Website Item Group,Website Item Group,Hjemmeside-varegruppe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Skatter og afgifter
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Indtast referencedato
@@ -2069,7 +2108,7 @@
 DocType: Issue,Resolution Details,Løsningsdetaljer
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Tildelinger af fravær
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Acceptkriterier
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Indtast materialeanmodninger i ovenstående tabel
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Indtast materialeanmodninger i ovenstående tabel
 DocType: Item Attribute,Attribute Name,Attribut Navn
 DocType: BOM,Show In Website,Vis på hjemmesiden
 DocType: Shopping Cart Settings,Show Quantity in Website,Vis Mængde i Website
@@ -2078,7 +2117,7 @@
 DocType: Item Reorder,Check in (group),Check i (gruppe)
 ,Qty to Order,Antal til ordre
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Kontoen under passiver eller egenkapital, i hviken gevinst/tab vil blive bogført"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Gantt-diagram af alle opgaver.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Gantt-diagram af alle opgaver.
 DocType: Opportunity,Mins to First Response,Minutter til første reaktion
 DocType: Pricing Rule,Margin Type,Margin Type
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} timer
@@ -2099,35 +2138,35 @@
 DocType: Patient,Surgical History,Kirurgisk historie
 DocType: Employee,Resignation Letter Date,Udmeldelse Brev Dato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Prisfastsættelsesregler er yderligere filtreret på mængden.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Angiv ansættelsesdatoen for medarbejder {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Angiv ansættelsesdatoen for medarbejder {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Faktureret beløb i alt (via Tidsregistrering)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Omsætning gamle kunder
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), skal have rollen 'Udlægsgodkender'"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Par
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Vælg stykliste og produceret antal
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Vælg stykliste og produceret antal
 DocType: Asset,Depreciation Schedule,Afskrivninger Schedule
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Forhandleradresser og kontakter
 DocType: Bank Reconciliation Detail,Against Account,Mod konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Halv Dag Dato skal være mellem Fra dato og Til dato
 DocType: Maintenance Schedule Detail,Actual Date,Faktisk dato
 DocType: Item,Has Batch No,Har partinr.
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Årlig fakturering: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Årlig fakturering: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Varer og tjenesteydelser Skat (GST Indien)
 DocType: Delivery Note,Excise Page Number,Excise Sidetal
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Company, Fra dato og Til dato er obligatorisk"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Få fra Høring
 DocType: Asset,Purchase Date,Købsdato
 DocType: Employee,Personal Details,Personlige oplysninger
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Venligst sæt &#39;Asset Afskrivninger Omkostninger Centers i Company {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Venligst sæt &#39;Asset Afskrivninger Omkostninger Centers i Company {0}
 ,Maintenance Schedules,Vedligeholdelsesplaner
 DocType: Task,Actual End Date (via Time Sheet),Faktisk Slutdato (via Tidsregistreringen)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Mængden {0} {1} mod {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Mængden {0} {1} mod {2} {3}
 ,Quotation Trends,Tilbud trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Varegruppe ikke er nævnt i vare-masteren for vare {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Debit-Til konto skal være et tilgodehavende konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Debit-Til konto skal være et tilgodehavende konto
 DocType: Shipping Rule Condition,Shipping Amount,Forsendelsesmængde
 DocType: Supplier Scorecard Period,Period Score,Periode score
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Tilføj kunder
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Tilføj kunder
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Afventende beløb
 DocType: Lab Test Template,Special,Særlig
 DocType: Purchase Invoice Item,Conversion Factor,Konverteringsfaktor
@@ -2135,13 +2174,14 @@
 ,Vehicle Expenses,Køretøjsudgifter
 DocType: Serial No,Invoice Details,Faktura detaljer
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Forventet værdi efter brugstid skal være større end eller lig med {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Start på
+DocType: Hub Category,Hub Category,Nav kategori
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Køretøjsnummer
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Den dato, hvor tilbagevendende faktura vil blive stoppe"
 DocType: Employee Loan,Loan Amount,Lånebeløb
 DocType: Program Enrollment,Self-Driving Vehicle,Selvkørende køretøj
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Leverandør Scorecard Standing
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Række {0}: stykliste ikke fundet for vare {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Række {0}: stykliste ikke fundet for vare {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Samlede fordelte blade {0} kan ikke være mindre end allerede godkendte blade {1} for perioden
 DocType: Journal Entry,Accounts Receivable,Tilgodehavender
 ,Supplier-Wise Sales Analytics,Salgsanalyser pr. leverandør
@@ -2152,7 +2192,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Overordnet kursus (markér ikke, hvis dette ikke er en del af et overordnet kursus)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Lad feltet stå tomt, hvis det skal gælde for alle medarbejdertyper"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuere afgifter baseret på
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Tidsregistreringskladder
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Tidsregistreringskladder
 DocType: HR Settings,HR Settings,HR-indstillinger
 DocType: Salary Slip,net pay info,nettoløn info
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Denne værdi opdateres i standard salgsprislisten.
@@ -2163,7 +2203,7 @@
 DocType: Patient,B Positive,B positiv
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Række # {0}: Antal skal være én, eftersom varen er et anlægsaktiv. Brug venligst separat række til flere antal."
 DocType: Leave Block List Allow,Leave Block List Allow,Tillad blokerede fraværsansøgninger
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
 DocType: Patient Medical Record,Patient Medical Record,Patient Medical Record
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Gruppe til ikke-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
@@ -2179,9 +2219,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Kan ikke finde valutakurs for {0} til {1} for nøgle dato {2}. Opret venligst en valutaudvekslingsoptegnelse manuelt
 DocType: POS Profile,Price List,Prisliste
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} er nu standard regnskabsår. Opdater venligst din browser for at ændringen træder i kraft.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Udlæg
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Udlæg
 DocType: Issue,Support,Support
 ,BOM Search,BOM Søg
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Udgiv &quot;På lager&quot; eller &quot;Ikke på lager&quot; på Hub baseret på lager tilgængelig på dette lager.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Lukning (Åbning + Totals)
 DocType: Vehicle,Fuel Type,Brændstofstype
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Angiv venligst valuta i firmaet
@@ -2193,16 +2234,16 @@
 DocType: Healthcare Settings,Remind Before,Påmind før
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM Omregningsfaktor kræves i række {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Række # {0}: referencedokumenttype skal være en af følgende: salgsordre, salgsfaktura eller kassekladde"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Række # {0}: referencedokumenttype skal være en af følgende: salgsordre, salgsfaktura eller kassekladde"
 DocType: Salary Component,Deduction,Fradrag
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Række {0}: Fra tid og til tid er obligatorisk.
 DocType: Stock Reconciliation Item,Amount Difference,Differencebeløb
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Varepris tilføjet for {0} i prisliste {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Varepris tilføjet for {0} i prisliste {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Indtast venligst Medarbejder Id dette salg person
 DocType: Territory,Classification of Customers by region,Klassifikation af kunder efter region
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Differencebeløb skal være nul
 DocType: Project,Gross Margin,Gross Margin
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Indtast venligst Produktion Vare først
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Indtast venligst Produktion Vare først
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Beregnede kontoudskrift balance
 DocType: Normal Test Template,Normal Test Template,Normal testskabelon
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Deaktiveret bruger
@@ -2212,21 +2253,22 @@
 DocType: Salary Slip,Total Deduction,Fradrag i alt
 ,Production Analytics,Produktionsanalyser
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Dette er baseret på transaktioner mod denne patient. Se tidslinjen nedenfor for detaljer
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Omkostninger opdateret
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Omkostninger opdateret
 DocType: Employee,Date of Birth,Fødselsdato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Element {0} er allerede blevet returneret
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Regnskabsår ** repræsenterer et regnskabsår. Alle regnskabsposteringer og andre større transaktioner spores mod ** regnskabsår **.
 DocType: Opportunity,Customer / Lead Address,Kunde / Emne Adresse
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Leverandør Scorecard Setup
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldigt SSL-certifikat på vedhæftet fil {0}
-DocType: Student Admission,Eligibility,Berettigelse
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Evalueringsplan Navn
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldigt SSL-certifikat på vedhæftet fil {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Leads hjælpe dig virksomhed, tilføje alle dine kontakter, og flere som din fører"
 DocType: Production Order Operation,Actual Operation Time,Faktiske Operation Time
 DocType: Authorization Rule,Applicable To (User),Gælder for (Bruger)
 DocType: Purchase Taxes and Charges,Deduct,Fratræk
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Stillingsbeskrivelse
 DocType: Student Applicant,Applied,Anvendt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Genåbne
 DocType: Sales Invoice Item,Qty as per Stock UOM,Mængde pr. lagerenhed
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 Navn
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specialtegn undtagen &quot;-&quot; &quot;.&quot;, &quot;#&quot;, og &quot;/&quot; ikke tilladt i navngivning serie"
@@ -2238,7 +2280,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Produktionschef
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serienummer {0} er under garanti op til {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Opdel følgeseddel i pakker.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Forsendelser
+apps/erpnext/erpnext/hooks.py +107,Shipments,Forsendelser
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Samlet tildelte beløb (Company Currency)
 DocType: Purchase Order Item,To be delivered to customer,Der skal leveres til kunden
 DocType: BOM,Scrap Material Cost,Skrot materialeomkostninger
@@ -2260,8 +2302,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Variantindstillinger
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Vælg firma ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Lad feltet stå tomt, hvis det skal gælde for alle afdelinger"
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Typer af beskæftigelse (permanent, kontrakt, praktikant osv)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} er obligatorisk for vare {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Typer af beskæftigelse (permanent, kontrakt, praktikant osv)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} er obligatorisk for vare {1}
 DocType: Process Payroll,Fortnightly,Hver 14. dag
 DocType: Currency Exchange,From Currency,Fra Valuta
 DocType: Vital Signs,Weight (In Kilogram),Vægt (i kilogram)
@@ -2285,7 +2327,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Klik på &quot;Generer Schedule &#39;for at få tidsplan
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Der var fejl under sletning af følgende skemaer:
 DocType: Bin,Ordered Quantity,Bestilt antal
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",fx &quot;Byg værktøjer til bygherrer&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",fx &quot;Byg værktøjer til bygherrer&quot;
 DocType: Grading Scale,Grading Scale Intervals,Grading Scale Intervaller
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Regnskab Overgang til {2} kan kun foretages i valuta: {3}
 DocType: Production Order,In Process,I Process
@@ -2308,11 +2350,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Med betaling af skat
 DocType: Expense Claim Detail,Expense Claim Detail,Udlægsdetalje
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLIKAT FOR LEVERANDØR
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Vælg korrekt konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Vælg korrekt konto
 DocType: Item,Weight UOM,Vægtenhed
 DocType: Salary Structure Employee,Salary Structure Employee,Lønstruktur medarbejder
 DocType: Patient,Blood Group,Blood Group
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Afventer
 DocType: Course,Course Name,Kursusnavn
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Brugere, der kan godkende en bestemt medarbejders orlov applikationer"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Kontorudstyr
@@ -2331,7 +2372,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Priserne vil ikke blive vist, hvis prisliste ikke er indstillet"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Angiv et land for denne forsendelsesregel eller check ""Levering til hele verden"""
 DocType: Stock Entry,Total Incoming Value,Samlet værdi indgående
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Debet-til skal angives
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Debet-til skal angives
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Tidskladder hjælper med at holde styr på tid, omkostninger og fakturering for aktiviteter udført af dit team"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Indkøbsprisliste
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Skabeloner af leverandør scorecard variabler.
@@ -2341,7 +2382,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Afstemning af betalinger
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Vælg Incharge Person navn
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Sum ubetalt: {0}
+DocType: Hub Settings,Unregister from Hub,Afmeld fra Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Sum ubetalt: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Website Operation
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Ansættelsesbrev
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Opret materialeanmodninger og produktionsordrer
@@ -2353,7 +2395,9 @@
 DocType: Physician Schedule Time Slot,To Time,Til Time
 DocType: Authorization Rule,Approving Role (above authorized value),Godkendelse (over autoriserede værdi) Rolle
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Kredit til konto skal være en Betales konto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan ikke være forælder eller barn af {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Vælg venligst Student Admission, som er obligatorisk for den betalte studentansøger"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan ikke være forælder eller barn af {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Vælg venligst en prisliste for at offentliggøre priser
 DocType: Production Order Operation,Completed Qty,Afsluttet Antal
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",For {0} kan kun betalingskort konti knyttes mod en anden kredit post
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Prisliste {0} er deaktiveret
@@ -2365,38 +2409,39 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} serienumre, der kræves for vare {1}. Du har angivet {2}."
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuel Værdiansættelsesbeløb
 DocType: Item,Customer Item Codes,Kunde varenumre
+DocType: Training Event,Advance,Rykke
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,for at gøre tilbagevendende igen.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange Gevinst / Tab
 DocType: Opportunity,Lost Reason,Tabsårsag
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Ny adresse
 DocType: Quality Inspection,Sample Size,Sample Size
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Indtast Kvittering Dokument
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Alle varer er allerede blevet faktureret
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Angiv en gyldig &quot;Fra sag nr &#39;
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',Angiv en gyldig &quot;Fra sag nr &#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Yderligere omkostninger centre kan foretages under Grupper men indtastninger kan foretages mod ikke-grupper
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Brugere og tilladelser
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Produktionsordrer Oprettet: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Produktionsordrer Oprettet: {0}
 DocType: Branch,Branch,Filial
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Udskriving
 DocType: Company,Total Monthly Sales,Samlet salg pr. måned
 DocType: Bin,Actual Quantity,Faktiske Mængde
 DocType: Shipping Rule,example: Next Day Shipping,eksempel: Næste dages levering
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serienummer {0} ikke fundet
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Abonnementet har været {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Abonnementet har været {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Fee Schedule Program
 DocType: Fee Schedule Program,Student Batch,Elevgruppe
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,vælg * fra `tabVital Signs` hvor patient = &#39;{0}&#39; rækkefølge af signs_date desc limit 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Opret studerende
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Min Grade
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Du er blevet inviteret til at samarbejde om sag: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Læge ikke tilgængelig på {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Du er blevet inviteret til at samarbejde om sag: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Læge ikke tilgængelig på {0}
 DocType: Leave Block List Date,Block Date,Blokeringsdato
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Tilføj brugerdefineret felt Abonnements-id i doktypen {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Leverandør levering Note
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Ansøg nu
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Ansøg nu
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Faktisk antal {0} / ventende antal {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-handel GSTIN
 DocType: Sales Order,Not Delivered,Ikke leveret
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Forventet dato kan ikke være før transaktionsdato
 ,Bank Clearance Summary,Bank Clearance Summary
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Opret og administrér de daglige, ugentlige og månedlige e-mail-nyhedsbreve."
 DocType: Appraisal Goal,Appraisal Goal,Vurderingsmål
@@ -2404,12 +2449,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Bygninger
 DocType: Fee Schedule,Fee Structure,Gebyr struktur
 DocType: Timesheet Detail,Costing Amount,Koster Beløb
-DocType: Student Admission,Application Fee,Tilmeldingsgebyr
+DocType: Student Admission Program,Application Fee,Tilmeldingsgebyr
 DocType: Process Payroll,Submit Salary Slip,Godkend lønseddel
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maksimal rabat for vare {0} er {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Maksimal rabat for vare {0} er {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import i bulk
 DocType: Sales Partner,Address & Contacts,Adresse & kontaktpersoner
 DocType: SMS Log,Sender Name,Afsendernavn
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Sorter efter kriterier
 DocType: POS Profile,[Select],[Vælg]
 DocType: Vital Signs,Blood Pressure (diastolic),Blodtryk (diastolisk)
 DocType: SMS Log,Sent To,Sendt Til
@@ -2418,7 +2464,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Næste kontakt d. kan ikke være i fortiden
 DocType: Company,For Reference Only.,Kun til reference.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Læge {0} ikke tilgængelig på {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Vælg partinr.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Vælg partinr.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ugyldig {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-Retsinformation
 DocType: Fee Validity,Reference Inv,Reference Inv
@@ -2434,15 +2480,15 @@
 DocType: Normal Test Items,Require Result Value,Kræver resultatværdi
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case No. ikke være 0
 DocType: Item,Show a slideshow at the top of the page,Vis et diasshow på toppen af siden
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,styklister
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Butikker
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,styklister
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Butikker
 DocType: Project Type,Projects Manager,Projekter manager
 DocType: Serial No,Delivery Time,Leveringstid
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Aldring Baseret på
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Afstemning annulleret
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Afstemning annulleret
 DocType: Item,End of Life,End of Life
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Rejser
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Ingen aktiv eller standard-lønstruktur fundet for medarbejder {0} for de givne datoer
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Rejser
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Ingen aktiv eller standard-lønstruktur fundet for medarbejder {0} for de givne datoer
 DocType: Leave Block List,Allow Users,Tillad brugere
 DocType: Purchase Order,Customer Mobile No,Kunde mobiltelefonnr.
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Tilbagevendende
@@ -2451,12 +2497,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Opdatering Omkostninger
 DocType: Item Reorder,Item Reorder,Genbestil vare
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Vis lønseddel
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Transfer Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Transfer Materiale
 DocType: Fees,Send Payment Request,Send betalingsanmodning
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Angiv operationer, driftsomkostninger og giver en unik Operation nej til dine operationer."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dette dokument er over grænsen ved {0} {1} for vare {4}. Er du gør en anden {3} mod samme {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Venligst sæt tilbagevendende efter besparelse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Vælg ændringsstørrelse konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Vælg ændringsstørrelse konto
 DocType: Purchase Invoice,Price List Currency,Prisliste Valuta
 DocType: Naming Series,User must always select,Brugeren skal altid vælge
 DocType: Stock Settings,Allow Negative Stock,Tillad negativ lagerbeholdning
@@ -2476,7 +2522,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Medarbejder
 DocType: Sample Collection,Collected Time,Samlet tid
 DocType: Company,Sales Monthly History,Salg Månedlig historie
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Vælg Batch
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Vælg Batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} er fuldt faktureret
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Vitale tegn
 DocType: Training Event,End Time,End Time
@@ -2484,16 +2530,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Betalings Fradrag eller Tab
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardkontraktvilkår for Salg eller Indkøb.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Sortér efter Bilagstype
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,"Er du sikker på, at du vil annullere denne aftale?"
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Salgspipeline
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Angiv standardkonto i lønart {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Forfalder den
 DocType: Rename Tool,File to Rename,Fil der skal omdøbes
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Vælg BOM for Item i række {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Vælg BOM for Item i række {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Konto {0} stemmer ikke overens med virksomhed {1} i kontoens tilstand: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Specificeret stykliste {0} findes ikke for vare {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelsesplan {0} skal annulleres, før denne salgsordre kan annulleres"
+DocType: POS Profile,Applicable for Users,Gælder for brugere
 DocType: Notification Control,Expense Claim Approved,Udlæg godkendt
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Lønseddel for medarbejder {0} er allerede oprettet for denne periode
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Lønseddel for medarbejder {0} er allerede oprettet for denne periode
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Farmaceutiske
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Omkostninger ved Købte varer
 DocType: Selling Settings,Sales Order Required,Salgsordre påkrævet
@@ -2517,6 +2565,7 @@
 DocType: Offer Letter,Accepted,Accepteret
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Organisation
 DocType: BOM Update Tool,BOM Update Tool,BOM Update Tool
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Party konto ikke specificeret, bedes du oprette standard party konto i firmaet"
 DocType: SG Creation Tool Course,Student Group Name,Elevgruppenavn
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Oprettelse af gebyrer
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Kontroller, at du virkelig ønsker at slette alle transaktioner for dette selskab. Dine stamdata vil forblive som den er. Denne handling kan ikke fortrydes."
@@ -2525,29 +2574,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kan ikke være større end planlagt antal ({2}) på produktionsordre {3}
 DocType: Shipping Rule,Shipping Rule Label,Forsendelseregeltekst
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Brugerforum
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Råmaterialer kan ikke være tom.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Kunne ikke opdatere lager, faktura indeholder drop shipping element."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Råmaterialer kan ikke være tom.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Kunne ikke opdatere lager, faktura indeholder drop shipping element."
 DocType: Lab Test Sample,Lab Test Sample,Lab Test prøve
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Hurtig kassekladde
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Du kan ikke ændre kurs, hvis BOM nævnt agianst ethvert element"
+DocType: Restaurant,Invoice Series Prefix,Faktura Serie Prefix
 DocType: Employee,Previous Work Experience,Tidligere erhvervserfaring
 DocType: Stock Entry,For Quantity,For Mængde
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Indtast venligst Planned Antal for Item {0} på rækken {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Indtast venligst Planned Antal for Item {0} på rækken {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} er ikke godkendt
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Anmodning om.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,"Vil blive oprettet separat produktion, for hver færdigvare god element."
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} skal være negativ til gengæld dokument
 ,Minutes to First Response for Issues,Minutter til First Response for Issues
 DocType: Purchase Invoice,Terms and Conditions1,Vilkår og betingelser 1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,"Navnet på det institut, som du konfigurerer dette system."
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,"Navnet på det institut, som du konfigurerer dette system."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Kontering frosset op til denne dato, kan ingen gøre / ændre post undtagen rolle angivet nedenfor."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Gem venligst dokumentet, før generere vedligeholdelsesplan"
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Seneste pris opdateret i alle BOMs
 DocType: Fee Schedule,Successful,Vellykket
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Sagsstatus
 DocType: UOM,Check this to disallow fractions. (for Nos),Markér dette for at forbyde fraktioner. (For NOS)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Følgende produktionsordrer blev dannet:
-DocType: Student Admission,Naming Series (for Student Applicant),Navngivningsnummerserie (for elevansøger)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Følgende produktionsordrer blev dannet:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Navngivningsnummerserie (for elevansøger)
 DocType: Delivery Note,Transporter Name,Transporter Navn
 DocType: Authorization Rule,Authorized Value,Autoriseret Værdi
 DocType: BOM,Show Operations,Vis Operations
@@ -2571,7 +2621,7 @@
 ,Employees working on a holiday,"Medarbejdere, der arbejder på en helligdag"
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Marker tilstede
 DocType: Project,% Complete Method,% Complete Method
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Medicin
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Medicin
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Vedligeholdelsesstartdato kan ikke være før leveringsdato for serienummer {0}
 DocType: Production Order,Actual End Date,Faktisk slutdato
 DocType: BOM,Operating Cost (Company Currency),Driftsomkostninger (Company Valuta)
@@ -2589,19 +2639,20 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Godkendelse Brugeren kan ikke være det samme som brugeren er reglen gælder for
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Grundlæggende sats (som pr. lagerenhed)
 DocType: SMS Log,No of Requested SMS,Antal  af forespurgte SMS'er
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Fravær uden løn stemmer ikke med de godkendte fraværsansøgninger
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Fravær uden løn stemmer ikke med de godkendte fraværsansøgninger
 DocType: Campaign,Campaign-.####,Kampagne -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Næste skridt
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Angiv venligst de angivne poster på de bedste mulige priser
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Make Faktura
 DocType: Selling Settings,Auto close Opportunity after 15 days,Luk automatisk salgsmulighed efter 15 dage
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Indkøbsordrer er ikke tilladt for {0} på grund af et scorecard stående på {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Indkøbsordrer er ikke tilladt for {0} på grund af et scorecard stående på {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Slutår
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Tilbud/emne %
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Fratrædelsesdato skal være større end ansættelsesdato
 DocType: Vital Signs,Nutrition Values,Ernæringsværdier
 DocType: Lab Test Template,Is billable,Kan faktureres
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Både &quot;Physician Schedule&quot; og Time Per Appointment &quot;skal indstilles til Dr {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"En distributør, forhandler, sælger eller butik, der sælger firmaets varer og tjenesteydelser mod en provision."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} mod indkøbsordre {1}
 DocType: Patient,Patient Demographics,Patient Demografi
@@ -2631,7 +2682,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","Standard momsskabelon, der kan anvendes på alle købstransaktioner. Denne skabelon kan indeholde liste over skatte- hoveder og også andre bekostning hoveder som ""Shipping"", ""forsikring"", ""Håndtering"" osv #### Bemærk Skatteprocenten du definerer her, vil være standard skattesats for alle ** Varer * *. Hvis der er ** Varer **, der har forskellige satser, skal de tilsættes i ** Item Skat ** bord i ** Item ** mester. #### Beskrivelse af kolonner 1. Beregning Type: - Dette kan være på ** Net Total ** (dvs. summen af grundbeløb). - ** På Forrige Row Total / Beløb ** (for kumulative skatter eller afgifter). Hvis du vælger denne mulighed, vil skatten blive anvendt som en procentdel af den forrige række (på skatteområdet tabel) beløb eller total. - ** Faktisk ** (som nævnt). 2. Konto Hoved: Account Finans hvorunder denne afgift vil være reserveret 3. Cost Center: Hvis skatten / afgiften er en indtægt (som shipping) eller omkostninger det skal reserveres mod en Cost Center. 4. Beskrivelse: Beskrivelse af skat (som vil blive trykt i fakturaer / citater). 5. Pris: Skatteprocent. 6. Beløb: Skat beløb. 7. Samlet: Kumulativ total til dette punkt. 8. Indtast Række: Hvis baseret på ""Forrige Row alt"" kan du vælge den række nummer, som vil blive taget som en base for denne beregning (standard er den forrige række). 9. Overvej Skat eller Gebyr for: I dette afsnit kan du angive, om skatten / afgiften er kun for værdiansættelse (ikke en del af det samlede) eller kun for total (ikke tilføre værdi til emnet) eller til begge. 10. Tilføj eller fratrække: Uanset om du ønsker at tilføje eller fratrække afgiften."
 DocType: Homepage,Homepage,Hjemmeside
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Vælg læge ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',Opdater tabConsultation set faktura = &#39;{0}&#39; hvor navn = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,RECD Mængde
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Fee Records Oprettet - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Kategori konto
@@ -2643,7 +2693,7 @@
 DocType: Asset,Manual,Manuel
 DocType: Salary Component Account,Salary Component Account,Lønrtskonto
 DocType: Global Defaults,Hide Currency Symbol,Skjul Valuta Symbol
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","fx Bank, Kontant, Kreditkort"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","fx Bank, Kontant, Kreditkort"
 DocType: Lead Source,Source Name,Kilde Navn
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Normal hvilende blodtryk hos en voksen er ca. 120 mmHg systolisk og 80 mmHg diastolisk, forkortet &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Kreditnota
@@ -2662,16 +2712,16 @@
 DocType: Patient,Occupation,Beskæftigelse
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Række {0}: Start dato skal være før slutdato
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),I alt (antal)
-DocType: Sales Invoice,This Document,Dette dokument
 DocType: Installation Note Item,Installed Qty,Antal installeret
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Dette kan skyldes nogle ugyldige e-mailadresser i
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Du tilføjede
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Træning Resultat
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Træning Resultat
 DocType: Purchase Invoice,Is Paid,er betalt
 DocType: Salary Structure,Total Earning,Samlet Earning
 DocType: Purchase Receipt,Time at which materials were received,"Tidspunkt, hvor materialer blev modtaget"
 DocType: Stock Ledger Entry,Outgoing Rate,Udgående Rate
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Organisation filial-master.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Organisation filial-master.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,eller
 DocType: Sales Order,Billing Status,Faktureringsstatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Rapporter et problem
@@ -2686,7 +2736,8 @@
 DocType: Notification Control,Sales Order Message,Salgsordrebesked
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Indstil standardværdier som Firma, Valuta, indeværende regnskabsår, m.v."
 DocType: Payment Entry,Payment Type,Betalingstype
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vælg venligst et parti for vare {0}. Kunne ikke finde et eneste parti, der opfylder dette krav"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vælg venligst et parti for vare {0}. Kunne ikke finde et eneste parti, der opfylder dette krav"
+DocType: Hub Category,Parent Category,Forældre kategori
 DocType: Process Payroll,Select Employees,Vælg Medarbejdere
 DocType: Opportunity,Potential Sales Deal,Potentielle Sales Deal
 DocType: Complaint,Complaints,klager
@@ -2723,7 +2774,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikation af emballagen for levering (til print)
 DocType: Bin,Reserved Quantity,Reserveret mængde
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Indtast venligst en gyldig e-mailadresse
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Vælg venligst et emne i vognen
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Vælg venligst et emne i vognen
 DocType: Landed Cost Voucher,Purchase Receipt Items,Købskvittering varer
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Tilpasning Forms
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,bagud
@@ -2733,15 +2784,15 @@
 DocType: Payment Request,Amount in customer's currency,Beløb i kundens valuta
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Levering
 DocType: Stock Reconciliation Item,Current Qty,Aktuel Antal
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Tilføj leverandører
+DocType: Restaurant Menu,Restaurant Menu,Restaurant Menu
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,forrige
 DocType: Appraisal Goal,Key Responsibility Area,Key Responsibility Area
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Elevgrupper hjælper dig med at administrere fremmøde, vurderinger og gebyrer for eleverne"
 DocType: Payment Entry,Total Allocated Amount,Samlet bevilgede beløb
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Indstil standard lagerkonto for evigvarende opgørelse
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Indstil standard lagerkonto for evigvarende opgørelse
 DocType: Item Reorder,Material Request Type,Materialeanmodningstype
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural Kassekladde til løn fra {0} til {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage er fuld, kan ikke gemme"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage er fuld, kan ikke gemme"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Række {0}: Enhedskode-konverteringsfaktor er obligatorisk
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Rum Kapacitet
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref
@@ -2780,16 +2831,18 @@
 DocType: Project,Task Completion,Opgaveafslutning
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Ikke på lager
 DocType: Appraisal,HR User,HR-bruger
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Skatter og Afgifter Fratrukket
-apps/erpnext/erpnext/hooks.py +129,Issues,Spørgsmål
+apps/erpnext/erpnext/hooks.py +138,Issues,Spørgsmål
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status skal være en af {0}
 DocType: Sales Invoice,Debit To,Debit Til
+DocType: Restaurant Menu Item,Restaurant Menu Item,Restaurant menupunkt
 DocType: Delivery Note,Required only for sample item.,Kræves kun for prøve element.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Aktuel Antal Efter Transaktion
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Ingen lønseddel fundet mellem {0} og {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Ingen lønseddel fundet mellem {0} og {1}
 ,Pending SO Items For Purchase Request,Afventende salgsordre-varer til indkøbsanmodning
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Studerende optagelser
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} er deaktiveret
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Studerende optagelser
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} er deaktiveret
 DocType: Supplier,Billing Currency,Fakturering Valuta
 DocType: Sales Invoice,SINV-RET-,SF-RET
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Extra Large
@@ -2812,6 +2865,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Henvis ikke af besøg, der kræves"
 DocType: Stock Settings,Default Valuation Method,Standard værdiansættelsesmetode
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,Betaling
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Opdatering i gang. Det kan tage et stykke tid.
 DocType: Vehicle Log,Fuel Qty,Brændstofmængde
 DocType: Production Order Operation,Planned Start Time,Planlagt starttime
 DocType: Course,Assessment,Vurdering
@@ -2827,7 +2881,7 @@
 DocType: Price List,Price List Master,Master-Prisliste
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alt salg Transaktioner kan mærkes mod flere ** Sales Personer **, så du kan indstille og overvåge mål."
 ,S.O. No.,SÅ No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Opret kunde fra emne {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Opret kunde fra emne {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Vælg patient
 DocType: Price List,Applicable for Countries,Gældende for lande
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Parameternavn
@@ -2858,27 +2912,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,Leverandør fakturadetaljer
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Udgifts- differencekonto ({0}) skal være en resultatskonto
 DocType: Project,Copied From,Kopieret fra
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Navn fejl: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Mangel
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Navn fejl: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,Mangel
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} ikke tilknyttet {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Fremmøde til medarbejder {0} er allerede markeret
 DocType: Packing Slip,If more than one package of the same type (for print),Hvis mere end én pakke af samme type (til udskrivning)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Indstil standardkunde i Restaurantindstillinger
 ,Salary Register,Løn Register
 DocType: Warehouse,Parent Warehouse,Forældre Warehouse
 DocType: C-Form Invoice Detail,Net Total,Netto i alt
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Standard BOM ikke fundet for Item {0} og Project {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Standard BOM ikke fundet for Item {0} og Project {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Definer forskellige låneformer
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Udestående beløb
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Tid (i minutter)
 DocType: Project Task,Working,Working
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock kø (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Finansielt år
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Finansielt år
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} tilhører ikke firmaet {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,"Kunne ikke løse kriteriernes scorefunktion for {0}. Sørg for, at formlen er gyldig."
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Omkostninger som på
 DocType: Healthcare Settings,Out Patient Settings,Ud patientindstillinger
 DocType: Account,Round Off,Afrundninger
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Mængden skal være positiv
 ,Requested Qty,Anmodet mængde
 DocType: Tax Rule,Use for Shopping Cart,Bruges til Indkøbskurv
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Værdi {0} for Attribut {1} findes ikke på listen over gyldige Item Attribut Værdier for Item {2}
@@ -2887,7 +2943,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Afgifter vil blive fordelt forholdsmæssigt baseret på post qty eller mængden, som pr dit valg"
 DocType: Maintenance Visit,Purposes,Formål
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Mindst ét element skal indtastes med negativt mængde gengæld dokument
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Tilføj kurser
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Betjening {0} længere end alle tilgængelige arbejdstimer i arbejdsstation {1}, nedbryde driften i flere operationer"
 ,Requested,Anmodet
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Ingen bemærkninger
@@ -2899,6 +2954,8 @@
 DocType: Employee Loan,Repaid/Closed,Tilbagebetales / Lukket
 DocType: Item,Total Projected Qty,Den forventede samlede Antal
 DocType: Monthly Distribution,Distribution Name,Distribution Name
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Værdiansættelsesrate ikke fundet for posten {0}, som er påkrævet for at foretage regnskabsposter for {1} {2}. Hvis varen handler som en nulværdieringsgrad i {1}, skal du nævne det i {1} Item-tabellen. Ellers skal du oprette en indgående aktietransaktion for varen eller nævne værdiansættelsesfrekvensen i vareposten og derefter forsøge at indsende / annullere denne post"
 DocType: Course,Course Code,Kursuskode
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Kvalitetskontrol kræves for vare {0}
 DocType: POS Settings,Use POS in Offline Mode,Brug POS i offline-tilstand
@@ -2909,14 +2966,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Administrer Område-træ.
 DocType: Journal Entry Account,Sales Invoice,Salgsfaktura
 DocType: Journal Entry Account,Party Balance,Party Balance
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,Vælg Anvend Rabat på
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Vælg Anvend Rabat på
 DocType: Company,Default Receivable Account,Standard Tilgodehavende konto
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Opret Bank Punktet om den samlede løn for de ovenfor valgte kriterier
 DocType: Physician,Physician Schedule,Læge Schema
 DocType: Purchase Invoice,Deemed Export,Forsøgt eksport
 DocType: Stock Entry,Material Transfer for Manufacture,Materiale Transfer til Fremstilling
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Rabat Procent kan anvendes enten mod en prisliste eller for alle prisliste.
-DocType: Purchase Invoice,Half-yearly,Halvårlig
+DocType: Subscription,Half-yearly,Halvårlig
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Regnskab Punktet om Stock
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Du har allerede vurderet for bedømmelseskriterierne {}.
@@ -2945,13 +3002,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Extra Small
 DocType: Company,Standard Template,Standardskabelon
 DocType: Training Event,Theory,Teori
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Anmodet materialemængde er mindre end minimum ordremængden
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Anmodet materialemængde er mindre end minimum ordremængden
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Konto {0} er spærret
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juridisk enhed / Datterselskab med en separat Kontoplan tilhører organisationen.
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Mad, drikke og tobak"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Kan kun gøre betaling mod faktureret {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Provisionssats kan ikke være større end 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Kan kun gøre betaling mod faktureret {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Provisionssats kan ikke være større end 100
 DocType: Stock Entry,Subcontract,Underleverance
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Indtast venligst {0} først
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Ingen svar fra
@@ -2969,10 +3026,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Farve
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Vurdering Plan Kriterier
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Forhindre indkøbsordrer
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,modtagelig
 DocType: Patient Appointment,Scheduled,Planlagt
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Anmodning om tilbud.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Opsæt venligst medarbejdernavnesystem i menneskelige ressourcer&gt; HR-indstillinger
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Vælg venligst en vare, hvor ""Er lagervare"" er ""nej"" og ""Er salgsvare"" er ""Ja"", og der er ingen anden produktpakke"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Vælg kunde
 DocType: Student Log,Academic,Akademisk
 DocType: Patient,Personal and Social History,Personlig og social historie
 DocType: Fee Schedule,Fee Breakup for each student,Fee Breakup for hver elev
@@ -2982,7 +3040,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Værdiansættelsesbeløb
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Prisliste Valuta ikke valgt
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Prisliste Valuta ikke valgt
 apps/erpnext/erpnext/config/healthcare.py +46,Results,Resultater
 ,Student Monthly Attendance Sheet,Student Månedlig Deltagelse Sheet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Medarbejder {0} har allerede ansøgt om {1} mellem {2} og {3}
@@ -2997,7 +3055,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Administrér forhandlere.
 DocType: Quality Inspection,Inspection Type,Kontroltype
 DocType: Fee Validity,Visited yet,Besøgt endnu
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Lager med eksisterende transaktion kan ikke konverteres til gruppen.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Lager med eksisterende transaktion kan ikke konverteres til gruppen.
 DocType: Assessment Result Tool,Result HTML,resultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Udløber på
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Tilføj studerende
@@ -3024,7 +3082,7 @@
 DocType: Healthcare Settings,Result Printed,Resultat trykt
 DocType: Asset Category Account,Depreciation Expense Account,Afskrivninger udgiftskonto
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Prøvetid
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Se {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Se {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Kun blade noder er tilladt i transaktionen
 DocType: Expense Claim,Expense Approver,Udlægsgodkender
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Række {0}: Advance mod Kunden skal være kredit
@@ -3035,7 +3093,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Til datotid
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Kursusskema udgår:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Logs for opretholdelse sms leveringsstatus
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Indstil salgsmål
 DocType: Accounts Settings,Make Payment via Journal Entry,Foretag betaling via kassekladden
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Trykt On
 DocType: Item,Inspection Required before Delivery,Kontrol påkrævet før levering
@@ -3043,7 +3100,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Afventende aktiviteter
 DocType: Patient Appointment,Reminded,mindet
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Din organisation
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Din organisation
 DocType: Fee Component,Fees Category,Gebyrer Kategori
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Indtast lindre dato.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
@@ -3051,11 +3108,11 @@
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Indtast navnet på kampagne, hvis kilden undersøgelsesudvalg er kampagne"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Dagbladsudgivere
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Vælg regnskabsår
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +114,Expected Delivery Date should be after Sales Order Date,Forventet Leveringsdato skal være efter salgsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +114,Expected Delivery Date should be after Sales Order Date,Forventet leveringsdato skal være efter salgsordredato
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Genbestil Level
 DocType: Company,Chart Of Accounts Template,Kontoplan Skabelon
 DocType: Attendance,Attendance Date,Fremmødedato
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Vareprisen opdateret for {0} i prisliste {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Vareprisen opdateret for {0} i prisliste {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Lønnen opdelt på tillæg og fradrag.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Konto med barneknudepunkter kan ikke konverteres til finans
 DocType: Purchase Invoice Item,Accepted Warehouse,Accepteret lager
@@ -3071,9 +3128,10 @@
 ,Employee Birthday,Medarbejder Fødselsdag
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Elevgruppe fremmødeværktøj
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,Grænse overskredet
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Planlagt Upto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"En akademisk betegnelse for denne ""skoleår '{0} og"" betingelsesnavn' {1} findes allerede. Korrigér venligst og prøv igen."
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Da der er eksisterende transaktioner mod element {0}, kan du ikke ændre værdien af {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Da der er eksisterende transaktioner mod element {0}, kan du ikke ændre værdien af {1}"
 DocType: UOM,Must be Whole Number,Skal være hele tal
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nyt fravær tildelt (i dage)
 DocType: Purchase Invoice,Invoice Copy,Faktura kopi
@@ -3083,7 +3141,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
 DocType: Shopping Cart Settings,Orders,Ordrer
 DocType: Employee Leave Approver,Leave Approver,Fraværsgodkender
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Vælg venligst et parti
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Vælg venligst et parti
 DocType: Assessment Group,Assessment Group Name,Assessment Group Name
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materiale Overført til Fremstilling
 DocType: Expense Claim,"A user with ""Expense Approver"" role",En bruger med 'Udlægsgodkender'-rolle
@@ -3098,7 +3156,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Periode Lukning indtastning
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Vælg afdelingen ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Omkostningssted med eksisterende transaktioner kan ikke konverteres til gruppe
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Mængden {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Mængden {0} {1} {2} {3}
 DocType: Account,Depreciation,Afskrivninger
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverandør (er)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Medarbejder Deltagerliste Værktøj
@@ -3109,10 +3167,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,Betalings Entries {0} er un-linked
 DocType: GL Entry,Voucher No,Bilagsnr.
 ,Lead Owner Efficiency,Lederegenskaber Effektivitet
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Mest populære
 DocType: Leave Allocation,Leave Allocation,Fraværstildeling
 DocType: Payment Request,Recipient Message And Payment Details,Modtager Besked Og Betalingsoplysninger
 DocType: Training Event,Trainer Email,Trainer Email
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Materialeanmodning {0} oprettet
+DocType: Restaurant Reservation,No of People,Ingen af mennesker
 DocType: Production Planning Tool,Include sub-contracted raw materials,Medtag underleverandører råmaterialer
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Skabelon til vilkår eller kontrakt.
 DocType: Purchase Invoice,Address and Contact,Adresse og kontaktperson
@@ -3121,10 +3181,11 @@
 DocType: Supplier,Last Day of the Next Month,Sidste dag i den næste måned
 DocType: Support Settings,Auto close Issue after 7 days,Auto tæt Issue efter 7 dage
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Fravær kan ikke fordeles inden {0}, da fraværssaldoen allerede har været carry-fremsendt i fremtiden orlov tildeling rekord {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Bemærk: forfalden / reference Dato overstiger tilladte kredit dage efter {0} dag (e)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Bemærk: forfalden / reference Dato overstiger tilladte kredit dage efter {0} dag (e)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Ansøger
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,OPRINDELIGT FOR RECIPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,Akkumuleret Afskrivninger konto
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Denne email er autogenereret
 DocType: Stock Settings,Freeze Stock Entries,Frys Stock Entries
 DocType: Program Enrollment,Boarding Student,Boarding Student
 DocType: Asset,Expected Value After Useful Life,Forventet værdi efter forventet brugstid
@@ -3132,7 +3193,7 @@
 DocType: Activity Cost,Billing Rate,Faktureringssats
 ,Qty to Deliver,Antal at levere
 ,Stock Analytics,Lageranalyser
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Operationer kan ikke være tomt
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Operationer kan ikke være tomt
 DocType: Maintenance Visit Purpose,Against Document Detail No,Imod Dokument Detail Nej
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Party Typen er obligatorisk
 DocType: Quality Inspection,Outgoing,Udgående
@@ -3154,7 +3215,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Vælg studerende manuelt for aktivitetsbaseret gruppe
 DocType: Journal Entry,User Remark,Brugerbemærkning
 DocType: Lead,Market Segment,Markedssegment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Betalt beløb kan ikke være større end den samlede negative udestående beløb {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Betalt beløb kan ikke være større end det samlede negative udestående beløb {0}
 DocType: Supplier Scorecard Period,Variables,Variable
 DocType: Employee Internal Work History,Employee Internal Work History,Medarbejder Intern Arbejde Historie
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Lukning (dr)
@@ -3183,24 +3244,25 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Modtag nyhedsbrev
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Konto {2} tilhører ikke firma {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Materialeanmodning {0} er annulleret eller stoppet
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Fraværsadministration
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Fraværsadministration
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Sortér efter konto
 DocType: Sales Order,Fully Delivered,Fuldt Leveres
 DocType: Lead,Lower Income,Lavere indkomst
+DocType: Restaurant Order Entry,Current Order,Nuværende ordre
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Kilde og mål lageret ikke kan være ens for rækken {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differencebeløbet skal være af kontotypen Aktiv / Fordring, da denne lagerafstemning er en åbningsbalance"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Udbetalte beløb kan ikke være større end Lånebeløb {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Gå til Programmer
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Indkøbsordrenr. påkrævet for vare {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Produktionsordre ikke oprettet
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Produktionsordre ikke oprettet
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Fra dato' skal være efter 'Til dato'
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Kan ikke ændre status som studerende {0} er forbundet med student ansøgning {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Kan ikke ændre status som studerende {0} er forbundet med student ansøgning {1}
 DocType: Asset,Fully Depreciated,fuldt afskrevet
 ,Stock Projected Qty,Stock Forventet Antal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Kunden {0} hører ikke til sag {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Kunden {0} hører ikke til sag {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Markant Deltagelse HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Citater er forslag, bud, du har sendt til dine kunder"
-DocType: Sales Order,Customer's Purchase Order,Kundens Indkøbsordre
+DocType: Sales Order,Customer's Purchase Order,Kundens indkøbsordre
 DocType: Consultation,Patient,Patient
 apps/erpnext/erpnext/config/stock.py +117,Serial No and Batch,Serienummer og parti
 DocType: Warranty Claim,From Company,Fra firma
@@ -3208,8 +3270,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Venligst sæt Antal Afskrivninger Reserveret
 DocType: Supplier Scorecard Period,Calculations,Beregninger
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Værdi eller mængde
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Productions Ordrer kan ikke hæves til:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Productions Ordrer kan ikke hæves til:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Minut
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Indstil navngivningsserien for {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Invoice,Purchase Taxes and Charges,Indkøb Moms og afgifter
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Gå til leverandører
 ,Qty to Receive,Antal til Modtag
@@ -3222,7 +3285,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Kredit til konto skal være en balance konto
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Alle leverandørtyper
 DocType: Global Defaults,Disable In Words,Deaktiver i ord
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Varenr. er obligatorisk, fordi varen ikke nummereres automatisk"
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,"Varenr. er obligatorisk, fordi varen ikke nummereres automatisk"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Tilbud {0} ikke af typen {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vedligeholdelse Skema Vare
 DocType: Sales Order,%  Delivered,% Leveret
@@ -3230,7 +3293,7 @@
 DocType: Production Order,PRO-,PRO-
 DocType: Patient,Medical History,Medicinsk historie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Bank kassekredit
-DocType: Patient,Patient ID,Patient ID
+DocType: Patient,Patient ID,Patient-ID
 DocType: Physician Schedule,Schedule Name,Planlægningsnavn
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Opret lønseddel
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +813,Add All Suppliers,Tilføj alle leverandører
@@ -3244,23 +3307,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Åbning Balance Egenkapital
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Afstemning
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Resterende
 DocType: Appraisal,Appraisal,Vurdering
 DocType: Purchase Invoice,GST Details,GST Detaljer
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},E-mail sendt til leverandør {0}
+DocType: Item,Default Sales Unit of Measure,Standard salgsforanstaltning
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datoen er gentaget
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Tegningsberettiget
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Fraværsgodkender skal være en af {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Opret gebyrer
-DocType: Hub Settings,Seller Email,Sælger Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Samlet anskaffelsespris (via købsfaktura)
 DocType: Training Event,Start Time,Start Time
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Vælg antal
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Vælg antal
 DocType: Customs Tariff Number,Customs Tariff Number,Toldtarif nummer
-DocType: Patient Appointment,Patient Appointment,Patientavn
+DocType: Patient Appointment,Patient Appointment,Patientaftale
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Godkendelse Rolle kan ikke være det samme som rolle reglen gælder for
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Afmeld dette e-mail-nyhedsbrev
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Afmeld dette e-mail-nyhedsbrev
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Få leverandører af
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} ikke fundet for punkt {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Gå til kurser
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Besked sendt
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Konto med barn noder kan ikke indstilles som hovedbog
@@ -3273,11 +3339,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Materiale Overført til Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Konto {0} findes ikke
 DocType: Project,Project Type,Sagstype
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Børneopgave eksisterer for denne opgave. Du kan ikke slette denne opgave.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Enten target qty eller målbeløbet er obligatorisk.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Omkostninger ved forskellige aktiviteter
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Ikke flere resultater
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Omkostninger ved forskellige aktiviteter
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Sætter begivenheder til {0}, da den til medarbejderen tilknyttede salgsmedarbejder {1} ikke har et brugernavn"
 DocType: Timesheet,Billing Details,Faktureringsoplysninger
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Kilde og mål lager skal være forskellige
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Kilde og mål lager skal være forskellige
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Ikke tilladt at opdatere lagertransaktioner ældre end {0}
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Fuldt Billed
@@ -3303,7 +3371,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Bankoverførsel
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Vælg alle
 DocType: Vehicle Log,Invoice Ref,Fakturareference
-DocType: Purchase Order,Recurring Order,Tilbagevendende Order
 DocType: Company,Default Income Account,Standard Indkomst konto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Kundegruppe / Kunde
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Uafsluttede regnskabsår Profit / Loss (Credit)
@@ -3317,9 +3384,9 @@
 DocType: Patient,A Negative,En negativ
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Intet mere at vise.
 DocType: Lead,From Customer,Fra kunde
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Opkald
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Opkald
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Et produkt
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,partier
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,partier
 DocType: Project,Total Costing Amount (via Time Logs),Total Costing Beløb (via Time Logs)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Lav gebyrplan
 DocType: Purchase Order Item Supplied,Stock UOM,Lagerenhed
@@ -3342,8 +3409,8 @@
 DocType: Healthcare Settings,Default income accounts to be used if not set in Physician to book Consultation charges.,"Standardindkomstkonti, der skal bruges, hvis det ikke er fastsat i Læge at bestille Høringsgebyrer."
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Ferie og fravær
 DocType: School Settings,Current Academic Term,Nuværende akademisk betegnelse
-DocType: Sales Order,Not Billed,Ikke Billed
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Begge lagre skal høre til samme firma
+DocType: Sales Order,Not Billed,Ikke faktureret
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Begge lagre skal høre til samme firma
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Ingen kontakter tilføjet endnu.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Landed Cost Voucher Beløb
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Regninger oprettet af leverandører.
@@ -3352,7 +3419,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Rabatbeløb
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retur Against købsfaktura
 DocType: Item,Warranty Period (in days),Garantiperiode (i dage)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',opdatér `tabPatient Appointment` sæt sales_invoice = &#39;{0}&#39; hvor navn = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Forholdet til Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Netto kontant fra drift
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Vare 4
@@ -3361,8 +3427,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Kassekladde konto
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Elevgruppe
 DocType: Shopping Cart Settings,Quotation Series,Tilbudsnummer
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","En vare eksisterer med samme navn ({0}), og du bedes derfor ændre navnet på varegruppen eller omdøbe varen"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Vælg venligst kunde
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","En vare eksisterer med samme navn ({0}), og du bedes derfor ændre navnet på varegruppen eller omdøbe varen"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Vælg venligst kunde
 DocType: C-Form,I,jeg
 DocType: Company,Asset Depreciation Cost Center,Asset Afskrivninger Omkostninger center
 DocType: Sales Order Item,Sales Order Date,Salgsordredato
@@ -3371,6 +3437,7 @@
 DocType: Assessment Plan,Assessment Plan,Plan Assessment
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Kunden {0} er oprettet.
 DocType: Stock Settings,Limit Percent,Begrænsningsprocent
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Der er i øjeblikket ingen lager på lageret
 ,Payment Period Based On Invoice Date,Betaling Periode Baseret på Fakturadato
 DocType: Sample Collection,No. of print,Antal udskrifter
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Manglende Valutakurser for {0}
@@ -3426,13 +3493,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruttoløn - Fradrag i alt - Tilbagebetaling af lån
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,Nuværende stykliste og ny stykliste må ikke være ens
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Lønseddel id
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Lønseddel id
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Pensioneringsdato skal være større end ansættelsesdato
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Der var fejl under planlægning af kursus:
 DocType: Sales Invoice,Against Income Account,Mod Indkomst konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Leveret
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Vare {0}: Bestilte qty {1} kan ikke være mindre end minimum ordreantal {2} (defineret i punkt).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Vare {0}: Bestilte qty {1} kan ikke være mindre end minimum ordreantal {2} (defineret i punkt).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månedlig Distribution Procent
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Log venligst ind som en anden bruger.
 DocType: Territory,Territory Targets,Områdemål
 DocType: Delivery Note,Transporter Info,Transporter Info
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Indstil standard {0} i Company {1}
@@ -3440,13 +3508,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Samme leverandør er indtastet flere gange
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Gross Profit / Loss
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Indkøbsordre leveret vare
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Firmaets navn kan ikke være Firma
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Firmaets navn kan ikke være Firma
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Brevhoveder til udskriftsskabeloner.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Tekster til udskriftsskabeloner fx Proforma-faktura.
 DocType: Program Enrollment,Walking,gåture
 DocType: Student Guardian,Student Guardian,Student Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Værdiansættelse typen omkostninger ikke er markeret som Inclusive
 DocType: POS Profile,Update Stock,Opdatering Stock
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,i abonnementet
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Forskellige UOM for elementer vil føre til forkert (Total) Vægt værdi. Sørg for, at Nettovægt for hvert punkt er i den samme UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,Kassekladde til skrot
@@ -3494,15 +3563,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System Bruger (login) ID. Hvis sat, vil det blive standard for alle HR-formularer."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Fra {1}
 DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Kø for opdatering af seneste pris i alle Materialebevis. Det kan tage et par minutter.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Kø for opdatering af seneste pris i alle Materialebevis. Det kan tage et par minutter.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Navn på ny konto. Bemærk: Du må ikke oprette konti for kunder og leverandører
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Standard-adresseskabeloner sorteret efter lande
 DocType: Sales Order Item,Supplier delivers to Customer,Leverandøren leverer til Kunden
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Vare / {0}) er udsolgt
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Due / reference Dato kan ikke være efter {0}
+,Sales Payment Summary,Salgsbetalingsoversigt
+DocType: Restaurant,Restaurant,Restaurant
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Due / reference Dato kan ikke være efter {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Dataind- og udlæsning
 DocType: Patient,Account Details,konto detaljer
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Ingen studerende Fundet
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Ingen studerende Fundet
 DocType: Medical Department,Medical Department,Medicinsk afdeling
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Leverandør Scorecard Scoring Criteria
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Faktura Bogføringsdato
@@ -3513,7 +3584,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Vælg Bogføringsdato før du vælger Party
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Ud af AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Vælg venligst Citater
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Vælg venligst Citater
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antal Afskrivninger Reserverede kan ikke være større end alt Antal Afskrivninger
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Make Vedligeholdelse Besøg
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,"Kontakt venligst til den bruger, der har Sales Master manager {0} rolle"
@@ -3521,7 +3592,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) herre.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Dette er baseret på deltagelse af denne Student
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Ingen studerende i
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Tilføj flere varer eller åben fulde form
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Tilføj flere varer eller åben fulde form
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,"Følgesedler {0} skal annulleres, før den salgsordre annulleres"
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Gå til Brugere
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Betalt beløb + Skriv Off Beløb kan ikke være større end beløb i alt
@@ -3541,37 +3612,40 @@
 DocType: Fee Schedule,Fee Schedule,Fee Schedule
 DocType: Hub Settings,Publish Availability,Offentliggøre Tilgængelighed
 DocType: Company,Create Chart Of Accounts Based On,Opret kontoplan baseret på
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Kan ikke konvertere det til ikke-gruppe. Børneopgaver eksisterer.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Fødselsdato kan ikke være større end i dag.
 ,Stock Ageing,Stock Ageing
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Student {0} findes mod studerende ansøger {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Afrundingsjustering (Company Valuta)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Tidsregistrering
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Tidsregistrering
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} &#39;{1}&#39; er deaktiveret
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Sæt som Open
 DocType: Cheque Print Template,Scanned Cheque,Anvendes ikke
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Sende automatiske e-mails til Kontakter på Indsendelse transaktioner.
 DocType: Timesheet,Total Billable Amount,Samlet faktureres Beløb
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Vare 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Ordreindgang
 DocType: Purchase Order,Customer Contact Email,Kundeservicekontakt e-mail
 DocType: Warranty Claim,Item and Warranty Details,Item og garanti Detaljer
 DocType: Sales Team,Contribution (%),Bidrag (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Bemærk: Betaling indtastning vil ikke blive oprettet siden &#39;Kontant eller bank konto&#39; er ikke angivet
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Projekt {0} eksisterer allerede
 DocType: Medical Department,Nursing User,Sygeplejerske bruger
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Ansvar
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Gyldighedsperioden for dette citat er afsluttet.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Gyldighedsperioden for dette citat er afsluttet.
 DocType: Expense Claim Account,Expense Claim Account,Udlægskonto
 DocType: Accounts Settings,Allow Stale Exchange Rates,Tillad forældede valutakurser
 DocType: Sales Person,Sales Person Name,Salgsmedarbejdernavn
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Indtast venligst mindst en faktura i tabellen
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Tilføj brugere
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Tilføj brugere
 DocType: POS Item Group,Item Group,Varegruppe
 DocType: Item,Safety Stock,Minimum lagerbeholdning
 DocType: Healthcare Settings,Healthcare Settings,Sundhedsindstillinger
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Fremskridt-% for en opgave kan ikke være mere end 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Fremskridt-% for en opgave kan ikke være mere end 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Før forsoning
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Til {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skatter og Afgifter Tilføjet (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Varemoms række {0} skal have en konto med 
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Varemoms række {0} skal have en konto med 
 typen moms, indtægt, omkostning eller kan debiteres"
 DocType: Sales Order,Partly Billed,Delvist faktureret
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Vare {0} skal være en anlægsaktiv-vare
@@ -3588,6 +3662,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,Variabel
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Fra følgeseddel
 DocType: Student,Student Email Address,Studerende e-mailadresse
+DocType: Item,Hub Warehouse,Hub Lager
 DocType: Physician Schedule Time Slot,From Time,Fra Time
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,På lager:
 DocType: Notification Control,Custom Message,Tilpasset Message
@@ -3595,9 +3670,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,Kontant eller bankkonto skal indtastes for post
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Studentadresse
 DocType: Purchase Invoice,Price List Exchange Rate,Prisliste valutakurs
+DocType: POS Profile,POS Profile Name,POS-profilnavn
 DocType: Purchase Invoice Item,Rate,Sats
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Adresse Navn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Adresse Navn
 DocType: Stock Entry,From BOM,Fra stykliste
 DocType: Assessment Code,Assessment Code,Assessment Code
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Grundlæggende
@@ -3611,11 +3687,12 @@
 DocType: Salary Slip,Salary Structure,Lønstruktur
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Flyselskab
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Issue Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Issue Materiale
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Der opstod en fejl under oprettelse af tilbagevendende
 DocType: Material Request Item,For Warehouse,Til lager
 DocType: Employee,Offer Date,Dato
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Tilbud
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,"Du er i offline-tilstand. Du vil ikke være i stand til at genindlæse, indtil du har netværk igen."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,"Du er i offline-tilstand. Du vil ikke være i stand til at genindlæse, indtil du har netværk igen."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Ingen elevgrupper oprettet.
 DocType: Purchase Invoice Item,Serial No,Serienummer
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Månedlig tilbagebetaling beløb kan ikke være større end Lånebeløb
@@ -3625,17 +3702,18 @@
 DocType: Salary Slip,Total Working Hours,Arbejdstid i alt
 DocType: Subscription,Next Schedule Date,Næste planlægningsdato
 DocType: Stock Entry,Including items for sub assemblies,Herunder elementer til sub forsamlinger
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Indtast værdien skal være positiv
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Alle områder
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Indtast værdien skal være positiv
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Alle områder
 DocType: Purchase Invoice,Items,Varer
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student er allerede tilmeldt.
 DocType: Fiscal Year,Year Name,År navn
 DocType: Process Payroll,Process Payroll,Lønafregning
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Der er flere helligdage end arbejdsdage i denne måned.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Der er flere helligdage end arbejdsdage i denne måned.
 DocType: Product Bundle Item,Product Bundle Item,Produktpakkevare
 DocType: Sales Partner,Sales Partner Name,Forhandlernavn
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Anmodning om tilbud
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Anmodning om tilbud
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimalt fakturabeløb
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hæmatologi
 DocType: Normal Test Items,Normal Test Items,Normale testelementer
 DocType: Student Language,Student Language,Student Sprog
 apps/erpnext/erpnext/config/selling.py +23,Customers,Kunder
@@ -3646,10 +3724,11 @@
 DocType: Issue,Opening Time,Åbning tid
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Fra og Til dato kræves
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Værdipapirer og Commodity Exchanges
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard måleenhed for Variant &#39;{0}&#39; skal være samme som i skabelon &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard måleenhed for Variant &#39;{0}&#39; skal være samme som i skabelon &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Beregn baseret på
 DocType: Delivery Note Item,From Warehouse,Fra lager
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Ingen stykliste-varer at fremstille
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Ingen stykliste-varer at fremstille
+DocType: Restaurant,Default Customer,Standardkunden
 DocType: Assessment Plan,Supervisor Name,supervisor Navn
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Bekræft ikke, om en aftale er oprettet for samme dag"
 DocType: Program Enrollment Course,Program Enrollment Course,Tilmeldingskursusprogramm
@@ -3676,7 +3755,7 @@
 DocType: Payment Entry,Internal Transfer,Intern overførsel
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Eksisterer barn konto til denne konto. Du kan ikke slette denne konto.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Enten target qty eller målbeløbet er obligatorisk
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Ingen standard-stykliste eksisterer for vare {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Ingen standard-stykliste eksisterer for vare {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Vælg bogføringsdato først
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,"Åbning Dato bør være, før Closing Dato"
 DocType: Leave Control Panel,Carry Forward,Benyt fortsat fravær fra sidste regnskabsår
@@ -3711,6 +3790,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Samlet tilstede
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,Regnskabsoversigter
 DocType: Drug Prescription,Hour,Time
+DocType: Restaurant Order Entry,Last Sales Invoice,Sidste salgsfaktura
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nyt serienummer kan ikke have lager angivet. Lageret skal sættes ved lagerindtastning eller købskvittering
 DocType: Lead,Lead Type,Emnetype
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Du er ikke autoriseret til at godkende fravær på blokerede dage
@@ -3745,64 +3825,66 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Opret Brugere
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,Gram
 DocType: Supplier Scorecard,Per Month,Om måneden
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Mængde til Fremstilling skal være større end 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Mængde til Fremstilling skal være større end 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Besøg rapport til vedligeholdelse opkald.
 DocType: Stock Entry,Update Rate and Availability,Opdatér priser og tilgængelighed
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procentdel, du får lov til at modtage eller levere mere mod den bestilte mængde. For eksempel: Hvis du har bestilt 100 enheder. og din Allowance er 10%, så du får lov til at modtage 110 enheder."
 DocType: POS Customer Group,Customer Group,Kundegruppe
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Nyt partinr. (valgfri)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Nyt partinr. (valgfri)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Udgiftskonto er obligatorisk for element {0}
 DocType: BOM,Website Description,Hjemmesidebeskrivelse
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Nettoændring i Equity
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Nyeste
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Annullér købsfaktura {0} først
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mailadresse skal være unik, findes allerede for {0}"
 DocType: Serial No,AMC Expiry Date,AMC Udløbsdato
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,Kvittering
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,Kvittering
 ,Sales Register,Salgs Register
 DocType: Daily Work Summary Settings Company,Send Emails At,Send e-mails på
 DocType: Quotation,Quotation Lost Reason,Tilbud afvist - årsag
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Vælg dit domæne
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',vælg * fra tabPatient hvor navn = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Transaktion henvisning ingen {0} dateret {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Transaktion henvisning ingen {0} dateret {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Der er intet at redigere.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Formularvisning
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Resumé for denne måned og verserende aktiviteter
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Formularvisning
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Resumé for denne måned og verserende aktiviteter
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Tilføj brugere til din organisation, bortset fra dig selv."
 DocType: Customer Group,Customer Group Name,Kundegruppenavn
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Ingen kunder endnu!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Ingen kunder endnu!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Pengestrømsanalyse
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeløb kan ikke overstige det maksimale lånebeløb på {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licens
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Fjern denne faktura {0} fra C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Fjern denne faktura {0} fra C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Vælg dette felt, hvis du også ønsker at inkludere foregående regnskabsår fraværssaldo til indeværende regnskabsår"
 DocType: GL Entry,Against Voucher Type,Mod Bilagstype
 DocType: Physician,Phone (R),Telefon (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Time slots tilføjet
 DocType: Item,Attributes,Attributter
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Aktivér skabelon
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Indstil navngivningsserien for {0} via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Indtast venligst Skriv Off konto
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Sidste ordredato
 DocType: Patient,B Negative,B Negativ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konto {0} ikke hører til virksomheden {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Serienumre i række {0} stemmer ikke overens med Leveringsnotat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Serienumre i række {0} stemmer ikke overens med Leveringsnotat
 DocType: Student,Guardian Details,Guardian Detaljer
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Deltagelse for flere medarbejdere
 DocType: Vehicle,Chassis No,Stelnummer
 DocType: Payment Request,Initiated,Indledt
 DocType: Production Order,Planned Start Date,Planlagt startdato
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Vælg venligst en BOM
 DocType: Serial No,Creation Document Type,Oprettet dokumenttype
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Slutdato skal være større end startdato
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Slutdato skal være større end startdato
 DocType: Leave Type,Is Encash,Er indløse
 DocType: Leave Allocation,New Leaves Allocated,Nye fravær Allokeret
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Sagsdata er ikke tilgængelige for tilbuddet
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Slut på
 DocType: Project,Expected End Date,Forventet slutdato
 DocType: Budget Account,Budget Amount,Budget Beløb
 DocType: Appraisal Template,Appraisal Template Title,Vurderingsskabelonnavn
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},"Fradato {0} for medarbekder {1} kan ikke være, før medarbejderens ansættelsesdato {2}"
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Kommerciel
 DocType: Patient,Alcohol Current Use,Alkohol Nuværende Brug
+DocType: Student Admission Program,Student Admission Program,Studenter Adgangsprogram
 DocType: Payment Entry,Account Paid To,Konto Betalt Til
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Overordnet bare {0} må ikke være en lagervare
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Alle produkter eller tjenesteydelser.
@@ -3811,30 +3893,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budget for konto {1} mod {2} {3} er {4}. Det vil overstige med {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Række {0} # konto skal være af typen 'Anlægsaktiv'
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Out Antal
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Regler til at beregne forsendelsesmængden for et salg
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,og unchcked Disabled in the
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Nummerserien er obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financial Services
 DocType: Student Sibling,Student ID,Studiekort
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Typer af aktiviteter for Time Logs
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Leverandør Email
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Typer af aktiviteter for Time Logs
 DocType: Tax Rule,Sales,Salg
 DocType: Stock Entry Detail,Basic Amount,Grundbeløb
 DocType: Training Event,Exam,Eksamen
 DocType: Complaint,Complaint,Klage
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Lager kræves for lagervare {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Lager kræves for lagervare {0}
 DocType: Leave Allocation,Unused leaves,Ubrugte blade
 DocType: Patient,Alcohol Past Use,Alkohol tidligere brug
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Anvendes ikke
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Overførsel
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Hent eksploderede BOM (herunder underenheder)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Overførsel
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Hent eksploderede BOM (herunder underenheder)
 DocType: Authorization Rule,Applicable To (Employee),Gælder for (Medarbejder)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Forfaldsdato er obligatorisk
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Forfaldsdato er obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Tilvækst til Attribut {0} kan ikke være 0
 DocType: Journal Entry,Pay To / Recd From,Betal Til / RECD Fra
 DocType: Naming Series,Setup Series,Opsætning af nummerserier
 DocType: Payment Reconciliation,To Invoice Date,Til fakturadato
 DocType: Supplier,Contact HTML,Kontakt HTML
 ,Inactive Customers,Inaktive kunder
+DocType: Student Admission Program,Maximum Age,Maksimal alder
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Købskvitteringer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Hvordan anvendes en prisfastsættelsesregel?
@@ -3853,6 +3937,7 @@
 DocType: GL Entry,Remarks,Bemærkninger
 DocType: Payment Entry,Account Paid From,Konto Betalt Fra
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Råmateriale varenr.
+DocType: Task,Parent Task,Forældreopgave
 DocType: Journal Entry,Write Off Based On,Skriv Off baseret på
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Opret emne
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Print og papirvarer
@@ -3861,19 +3946,19 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Løn allerede behandlet for perioden {0} til {1}, ferie ansøgningsperiode kan ikke være i dette datointerval."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Installationspost for et serienummer
 DocType: Guardian Interest,Guardian Interest,Guardian Renter
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Indstil standardværdier for POS-fakturaer
 apps/erpnext/erpnext/config/hr.py +177,Training,Uddannelse
 DocType: Timesheet,Employee Detail,Medarbejderoplysninger
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Email ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,Næste dagsdato og Gentagelsesdag i måneden skal være ens
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Næste dagsdato og Gentagelsesdag i måneden skal være ens
 DocType: Lab Prescription,Test Code,Testkode
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Indstillinger for hjemmesidens startside
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ&#39;er er ikke tilladt for {0} på grund af et scorecard stående på {1}
 DocType: Offer Letter,Awaiting Response,Afventer svar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Frem
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Samlede beløb {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Ugyldig attribut {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Samlede beløb {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Ugyldig attribut {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Angiv hvis ikke-standard betalingskonto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Samme vare er indtastet flere gange. {liste}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Vælg venligst vurderingsgruppen bortset fra &#39;Alle vurderingsgrupper&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Række {0}: Omkostningscenter er påkrævet for en vare {1}
 DocType: Training Event Employee,Optional,Valgfri
@@ -3890,25 +3975,26 @@
 DocType: Patient,Other Risk Factors,Andre risikofaktorer
 DocType: Sales Invoice,Product Bundle Help,Produktpakkehjælp
 ,Monthly Attendance Sheet,Månedlig Deltagelse Sheet
-DocType: Production Order Item,Production Order Item,Produktionsordre Item
+DocType: Production Order Item,Production Order Item,Produktionsordrevare
 apps/erpnext/erpnext/healthcare/report/lab_test_report/lab_test_report.py +15,No record found,Ingen post fundet
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Udgifter kasseret anlægsaktiv
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Omkostningssted er obligatorisk for vare {2}
 DocType: Vehicle,Policy No,Politik Ingen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Hent varer fra produktpakke
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Som lager eksisterer imod en vare {0}, kan du ikke aktivere har varianter egenskab"
 DocType: Asset,Straight Line,Lineær afskrivning
 DocType: Project User,Project User,Sagsbruger
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Dele
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Dele
 DocType: GL Entry,Is Advance,Er Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Fremmøde fradato og Fremmøde tildato er obligatoriske
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,Indtast &quot;underentreprise&quot; som Ja eller Nej
+DocType: Item,Default Purchase Unit of Measure,Standardindkøbsenhed
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Sidste kommunikationsdato
 DocType: Sales Team,Contact No.,Kontaktnr.
 DocType: Bank Reconciliation,Payment Entries,Betalings Entries
 DocType: Production Order,Scrap Warehouse,Skrotlager
 DocType: Production Order,Check if material transfer entry is not required,"Kontroller, om materialetilførsel ikke er påkrævet"
 DocType: Program Enrollment Tool,Get Students From,Hent studerende fra
-DocType: Hub Settings,Seller Country,Sælgers land
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Vis varer på hjemmesiden
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Opdel dine elever i grupper
 DocType: Authorization Rule,Authorization Rule,Autorisation Rule
@@ -3918,7 +4004,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Salg Moms- og afgiftsskabelon
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),I alt (kredit)
 DocType: Repayment Schedule,Payment Date,Betalingsdato
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Ny partimængde
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Ny partimængde
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Beklædning og tilbehør
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,"Kunne ikke løse vægtet scoringsfunktion. Sørg for, at formlen er gyldig."
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Antal Order
@@ -3936,6 +4022,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} kan ikke indsendes, er det allerede {2}"
 DocType: Tax Rule,Billing Country,Faktureringsland
 DocType: Purchase Order Item,Expected Delivery Date,Forventet leveringsdato
+DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurant Order Entry
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet og kredit ikke ens for {0} # {1}. Forskellen er {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Repræsentationsudgifter
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Opret materialeanmodning
@@ -3948,9 +4035,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Konto med eksisterende transaktion kan ikke slettes
 DocType: Vehicle,Last Carbon Check,Sidste synsdato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Advokatudgifter
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Vælg venligst antal på række
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Vælg venligst antal på række
 DocType: Purchase Invoice,Posting Time,Bogføringsdato og -tid
 DocType: Timesheet,% Amount Billed,% Faktureret beløb
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Tid pr. Ansættelse&quot; er ikke blevet indstillet til Dr {0}. Tilføj det i læge mester.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefonudgifter
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Markér dette hvis du ønsker at tvinge brugeren til at vælge en serie før du gemmer. Der vil ikke være standard, hvis du markerer dette."
@@ -3961,6 +4049,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Omsætning nye kunder
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Rejseudgifter
 DocType: Maintenance Visit,Breakdown,Sammenbrud
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Tilføj brugerdefineret felt Abonnement i doktypen {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan ikke vælges {1}
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Opdater BOM omkostninger automatisk via Scheduler, baseret på seneste værdiansættelsesrate / prisliste sats / sidste købspris for råvarer."
 DocType: Bank Reconciliation Detail,Cheque Date,Anvendes ikke
@@ -3985,7 +4074,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Faktureringsbeløb i alt (via Time Logs)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Leverandør id
 DocType: Payment Request,Payment Gateway Details,Betaling Gateway Detaljer
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Mængde bør være større end 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Mængde bør være større end 0
 DocType: Journal Entry,Cash Entry,indtastning af kontanter
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Child noder kan kun oprettes under &#39;koncernens typen noder
 DocType: Leave Application,Half Day Date,Halv dag dato
@@ -4003,12 +4092,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Bemærk: Varer {0} indtastet flere gange
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Alle kontakter.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Firma-forkortelse
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Brugeren {0} eksisterer ikke
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Brugeren {0} eksisterer ikke
 DocType: Subscription,SUB-,SUB
 DocType: Item Attribute Value,Abbreviation,Forkortelse
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Betaling indtastning findes allerede
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ikke authroized da {0} overskrider grænser
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Løn skabelon mester.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Patologi
+DocType: Restaurant Order Entry,Restaurant Table,Restaurantbord
 DocType: Leave Type,Max Days Leave Allowed,Maksimalt antal tilladte fraværsdage
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Sæt momsregel for indkøbskurv
 DocType: Purchase Invoice,Taxes and Charges Added,Skatter og Afgifter Tilføjet
@@ -4020,10 +4111,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Tilbud til emner eller kunder.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle Tilladt at redigere frosne lager
 ,Territory Target Variance Item Group-Wise,Områdemål Variance Item Group-Wise
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Alle kundegrupper
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Alle kundegrupper
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Akkumuleret månedlig
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Måske Valutaveksling record er ikke skabt for {1} til {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Momsskabelon er obligatorisk.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Momsskabelon er obligatorisk.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Konto {0}: Forældre-konto {1} findes ikke
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prisliste Rate (Company Valuta)
 DocType: Products Settings,Products Settings,Produkter Indstillinger
@@ -4049,12 +4140,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Item Wise Tax Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Institut Forkortelse
 ,Item-wise Price List Rate,Item-wise Prisliste Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Leverandørtilbud
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Leverandørtilbud
 DocType: Quotation,In Words will be visible once you save the Quotation.,"""I Ord"" vil være synlig, når du gemmer tilbuddet."
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Mængde ({0}) kan ikke være en brøkdel i række {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i vare {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i vare {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Regler for at tilføje forsendelsesomkostninger.
 DocType: Item,Opening Stock,Åbning Stock
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kunde skal angives
@@ -4070,11 +4161,10 @@
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",i minutter Opdateret via &#39;Time Log&#39;
 DocType: Customer,From Lead,Fra Emne
-apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Ordrer frigives til produktion.
+apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Ordrer frigivet til produktion.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Vælg regnskabsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS profil kræves for at gøre POS indtastning
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS profil kræves for at gøre POS indtastning
 DocType: Program Enrollment Tool,Enroll Students,Tilmeld Studerende
-DocType: Hub Settings,Name Token,Navn Token
 DocType: Lab Test,Approved Date,Godkendt dato
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard salg
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Mindst ét lager skal angives
@@ -4092,7 +4182,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Menneskelige Ressourcer
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Betaling Afstemning Betaling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Skatteaktiver
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Produktionsordre har været {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Produktionsordre har været {0}
 DocType: BOM Item,BOM No,Styklistenr.
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Kassekladde {0} har ikke konto {1} eller allerede matchet mod andre kupon
@@ -4112,7 +4202,7 @@
 DocType: Currency Exchange,To Currency,Til Valuta
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Tillad følgende brugere til at godkende fraværsansøgninger på blokerede dage.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Udlægstyper.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Salgsprisen for vare {0} er lavere end dens {1}. Salgsprisen skal være mindst {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Salgsprisen for vare {0} er lavere end dens {1}. Salgsprisen skal være mindst {2}
 DocType: Item,Taxes,Moms
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Betalt og ikke leveret
 DocType: Project,Default Cost Center,Standard omkostningssted
@@ -4126,15 +4216,15 @@
 DocType: Employee Loan,Fully Disbursed,fuldt udbetalt
 DocType: Maintenance Visit,Customer Feedback,Kundefeedback
 DocType: Account,Expense,Udlæg
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Score kan ikke være større end maksimal score
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Score kan ikke være større end maksimal score
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Kunder og Leverandører
 DocType: Item Attribute,From Range,Fra Range
 DocType: BOM,Set rate of sub-assembly item based on BOM,Indstil sats for underenhedspost baseret på BOM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Syntaks fejl i formel eller tilstand: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Syntaks fejl i formel eller tilstand: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Daglige arbejde Resumé Indstillinger Firma
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,"Vare {0} ignoreres, da det ikke er en lagervare"
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Indsend denne produktionsordre til videre forarbejdning.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Indsend denne produktionsordre til videre forarbejdning.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Hvis du ikke vil anvende Prisfastsættelse Regel i en bestemt transaktion, bør alle gældende Priser Regler deaktiveres."
 DocType: Assessment Group,Parent Assessment Group,Parent Group Assessment
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Stillinger
@@ -4151,12 +4241,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Indstil Firmafilter blankt, hvis Group By er &#39;Company&#39;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Bogføringsdato kan ikke være en fremtidig dato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Række # {0}: serienummer {1} matcher ikke med {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,for at generere den tilbagevendende
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Casual Leave
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Lab Test UOM.
 DocType: Batch,Batch ID,Parti-id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Bemærk: {0}
 ,Delivery Note Trends,Følgeseddel Tendenser
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Denne uges oversigt
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Denne uges oversigt
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,På lager Antal
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan kun opdateres via Lagertransaktioner
 DocType: Student Group Creation Tool,Get Courses,Hent kurser
@@ -4170,7 +4261,6 @@
 DocType: Purchase Order,To Bill,Til Bill
 DocType: Material Request,% Ordered,% Bestilt
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",For kursusbaseret studentegruppe vil kurset blive valideret for hver elev fra de tilmeldte kurser i programtilmelding.
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Indtast e-mail-adresse adskilt af kommaer, vil faktura blive sendt automatisk på bestemt dato"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Akkordarbejde
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Gns. købssats
 DocType: Task,Actual Time (in Hours),Faktisk tid (i timer)
@@ -4184,7 +4274,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Vare {0} er ikke opsat til serienumre. Kolonnen skal være tom
 DocType: Accounts Settings,Accounts Settings,Kontoindstillinger
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,Godkende
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Intet resultat at indsende
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Intet resultat at indsende
 DocType: Customer,Sales Partner and Commission,Forhandler og provision
 DocType: Employee Loan,Rate of Interest (%) / Year,Rente (%) / år
 ,Project Quantity,Sagsmængde
@@ -4196,55 +4286,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Sort
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Vare
 DocType: Account,Auditor,Revisor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} varer produceret
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} varer produceret
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Lær mere
 DocType: Cheque Print Template,Distance from top edge,Afstand fra overkanten
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Prisliste {0} er deaktiveret eller findes ikke
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Prisliste {0} er deaktiveret eller findes ikke
 DocType: Purchase Invoice,Return,Retur
 DocType: Production Order Operation,Production Order Operation,Produktionsordre Operation
 DocType: Pricing Rule,Disable,Deaktiver
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Betalingsmåde er forpligtet til at foretage en betaling
 DocType: Project Task,Pending Review,Afventende anmeldelse
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Udnævnelser og konsultationer
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} er ikke indskrevet i batch {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} er ikke indskrevet i batch {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Anlægsaktiv {0} kan ikke kasseres, da det allerede er {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Udlæg ialt (via Udlæg)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Markér ikke-tilstede
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Række {0}: Valuta af BOM # {1} skal være lig med den valgte valuta {2}
 DocType: Journal Entry Account,Exchange Rate,Vekselkurs
 DocType: Patient,Additional information regarding the patient,Yderligere oplysninger om patienten
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Salgsordre {0} er ikke godkendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Salgsordre {0} er ikke godkendt
 DocType: Homepage,Tag Line,tag Linje
 DocType: Fee Component,Fee Component,Gebyr Component
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Firmabiler
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Tilføj varer fra
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Firmabiler
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Tilføj varer fra
 DocType: Cheque Print Template,Regular,Fast
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Samlet vægtning af alle vurderingskriterier skal være 100%
-DocType: BOM,Last Purchase Rate,Sidste købsværdi
+DocType: Purchase Order Item,Last Purchase Rate,Sidste købsværdi
 DocType: Account,Asset,Anlægsaktiv
 DocType: Project Task,Task ID,Opgave-id
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock kan ikke eksistere for Item {0} da har varianter
 DocType: Lab Test,Mobile,Mobil
 ,Sales Person-wise Transaction Summary,SalgsPerson Transaktion Totaler
 DocType: Training Event,Contact Number,Kontaktnummer
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Lager {0} eksisterer ikke
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Tilmeld dig ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Lager {0} eksisterer ikke
 DocType: Monthly Distribution,Monthly Distribution Percentages,Månedlige Distribution Procenter
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Den valgte vare kan ikke have parti
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Værdiansættelse fald ikke fundet for Item {0}, som er forpligtet til at gøre regnskabsmæssige poster for {1} {2}. Hvis varen er transaktionsomkostninger som en prøve post i nævne {1}, bedes der i {1} Item bord. Ellers skal du oprette en indgående bestand transaktion for elementet eller omtale værdiansættelse sats i Item rekord, og derefter prøve submiting / annullering denne post"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% af materialer leveret mod denne følgeseddel
+DocType: Training Event,Has Certificate,Har certifikat
 DocType: Project,Customer Details,Kunde Detaljer
 DocType: Employee,Reports to,Rapporter til
 ,Unpaid Expense Claim,Ubetalt udlæg
 DocType: Payment Entry,Paid Amount,Betalt beløb
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Udforsk salgscyklus
 DocType: Assessment Plan,Supervisor,Tilsynsførende
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,Online
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,Online
 ,Available Stock for Packing Items,Tilgængelig Stock til Emballerings- Varer
 DocType: Item Variant,Item Variant,Varevariant
 DocType: Assessment Result Tool,Assessment Result Tool,Assessment Resultat Tool
 DocType: BOM Scrap Item,BOM Scrap Item,Stykliste skrotvare
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Godkendte ordrer kan ikke slettes
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Godkendte ordrer kan ikke slettes
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Konto balance er debit. Du har ikke lov til at ændre 'Balancetype' til 'kredit'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Kvalitetssikring
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Vare {0} er blevet deaktiveret
@@ -4264,7 +4353,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: tider konflikter med rækken {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Tillad nulværdi
 DocType: Training Event Employee,Invited,inviteret
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Flere aktive lønstrukturer fundet for medarbejder {0} for de givne datoer
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Flere aktive lønstrukturer fundet for medarbejder {0} for de givne datoer
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Opsætning Gateway konti.
 DocType: Employee,Employment Type,Beskæftigelsestype
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Anlægsaktiver
@@ -4276,7 +4365,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Varsel (dage)
 DocType: Tax Rule,Sales Tax Template,Salg Momsskabelon
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Vælg elementer for at gemme fakturaen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Vælg elementer for at gemme fakturaen
 DocType: Employee,Encashment Date,Indløsningsdato
 DocType: Training Event,Internet,Internet
 DocType: Special Test Template,Special Test Template,Special Test Skabelon
@@ -4285,7 +4374,7 @@
 DocType: Production Order,Planned Operating Cost,Planlagte driftsomkostninger
 DocType: Academic Term,Term Start Date,Betingelser startdato
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Vedlagt {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Vedlagt {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Kontoudskrift balance pr Finans
 DocType: Job Applicant,Applicant Name,Ansøgernavn
 DocType: Authorization Rule,Customer / Item Name,Kunde / Varenavn
@@ -4305,7 +4394,7 @@
 DocType: Guardian,Guardian Of ,Guardian Of
 DocType: Grading Scale Interval,Threshold,Grænseværdi
 DocType: BOM Update Tool,Current BOM,Aktuel stykliste
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Tilføj serienummer
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Tilføj serienummer
 DocType: Production Order Item,Available Qty at Source Warehouse,Tilgængelig mængde på Source Warehouse
 apps/erpnext/erpnext/config/support.py +22,Warranty,Garanti
 DocType: Purchase Invoice,Debit Note Issued,Debit Note Udstedt
@@ -4328,10 +4417,9 @@
 DocType: Account,Receivable,Tilgodehavende
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Række # {0}: Ikke tilladt at skifte leverandør, da indkøbsordre allerede findes"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, som får lov til at indsende transaktioner, der overstiger kredit grænser."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Vælg varer til Produktion
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Master data synkronisering, kan det tage nogen tid"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Vælg varer til Produktion
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Master data synkronisering, kan det tage nogen tid"
 DocType: Item,Material Issue,Materiale Issue
-DocType: Hub Settings,Seller Description,Sælger Beskrivelse
 DocType: Employee Education,Qualification,Kvalifikation
 DocType: Item Price,Item Price,Varepris
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sæbe &amp; Vaskemiddel
@@ -4339,7 +4427,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Fra Tiden kan ikke være større end til anden.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestilt
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Genoptag
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Genoptag
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Hvis aktiveret, vil systemet ikke opdatere variantfeltene fra skabelonen, men kopierer dataene i nedenstående felter, mens der oprettes en ny variant"
 DocType: Salary Detail,Component,Lønart
 DocType: Assessment Criteria,Assessment Criteria Group,Vurderingskriterier Group
 DocType: Healthcare Settings,Patient Name By,Patientnavn By
@@ -4349,7 +4438,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Indtast Godkendelse Rolle eller godkender Bruger
 DocType: Journal Entry,Write Off Entry,Skriv Off indtastning
 DocType: BOM,Rate Of Materials Based On,Rate Of materialer baseret på
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
+DocType: Item Variant Settings,Do not Update Variants,Opdater ikke varianter
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Support Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Fravælg alle
 DocType: POS Profile,Terms and Conditions,Betingelser
@@ -4358,7 +4447,7 @@
 DocType: Leave Block List,Applies to Company,Gælder for hele firmaet
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,"Kan ikke annullere, for en godkendt lagerindtastning {0} eksisterer"
 DocType: Employee Loan,Disbursement Date,Udbetaling Dato
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;Modtagere&#39; er ikke angivet
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Modtagere&#39; er ikke angivet
 DocType: BOM Update Tool,Update latest price in all BOMs,Opdater seneste pris i alle BOM&#39;er
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Medicinsk post
 DocType: Vehicle,Vehicle,Køretøj
@@ -4373,14 +4462,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MANM-
 ,Asset Depreciations and Balances,Asset Afskrivninger og Vægte
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Mængden {0} {1} overført fra {2} til {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Mængden {0} {1} overført fra {2} til {3}
 DocType: Sales Invoice,Get Advances Received,Få forskud
 DocType: Email Digest,Add/Remove Recipients,Tilføj / fjern modtagere
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Transaktion ikke tilladt mod stoppet produktionsordre {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","For at indstille dette regnskabsår som standard, skal du klikke på &#39;Vælg som standard&#39;"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Tilslutte
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Tilslutte
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Mangel Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
 DocType: Employee Loan,Repay from Salary,Tilbagebetale fra Løn
 DocType: Leave Application,LAP/,ANFR/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Anmodning betaling mod {0} {1} for beløb {2}
@@ -4393,7 +4482,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Salgsordrevare
 DocType: Salary Slip,Payment Days,Betalingsdage
 DocType: Patient,Dormant,hvilende
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Lager med referencer kan ikke konverteres til finans
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Lager med referencer kan ikke konverteres til finans
 DocType: BOM,Manage cost of operations,Administrer udgifter til operationer
 DocType: Accounts Settings,Stale Days,Forældede dage
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Når nogen af de kontrollerede transaktioner er &quot;Indsendt&quot;, en e-pop-up automatisk åbnet til at sende en e-mail til den tilknyttede &quot;Kontakt&quot; i denne transaktion, med transaktionen som en vedhæftet fil. Brugeren kan eller ikke kan sende e-mailen."
@@ -4407,10 +4496,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serienummer {0} er allerede blevet modtaget
 ,Requested Items To Be Transferred,"Anmodet Varer, der skal overføres"
 DocType: Expense Claim,Vehicle Log,Kørebog
-DocType: Purchase Invoice,Recurring Id,Tilbagevendende Id
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Tilstedeværelse af feber (temp&gt; 38,5 ° C eller vedvarende temperatur&gt; 38 ° C / 100,4 ° F)"
 DocType: Customer,Sales Team Details,Salgs Team Detaljer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Slet permanent?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Slet permanent?
 DocType: Expense Claim,Total Claimed Amount,Total krævede beløb
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potentielle muligheder for at sælge.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Ugyldig {0}
@@ -4420,7 +4508,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Varehuse
 ,Item Delivery Date,Leveringsdato for vare
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Opsætning din skole i ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Opsætning din skole i ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base ændring beløb (Company Currency)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Ingen bogføring for følgende lagre
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Gem dokumentet først.
@@ -4432,13 +4520,12 @@
 DocType: Task,Is Milestone,Er Milestone
 DocType: Daily Work Summary,Email Sent To,E-mail til
 DocType: Budget,Warn,Advar
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,"Er du sikker på, at du vil afregistrere?"
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Alle andre bemærkninger, bemærkelsesværdigt indsats, skal gå i registrene."
 DocType: BOM,Manufacturing User,Produktionsbruger
 DocType: Purchase Invoice,Raw Materials Supplied,Leverede råvarer
-DocType: Purchase Invoice,Recurring Print Format,Tilbagevendende Print Format
 DocType: C-Form,Series,Nummerserie
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Valuta på prislisten {0} skal være {1} eller {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Tilføj produkter
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Valuta på prislisten {0} skal være {1} eller {2}
 DocType: Appraisal,Appraisal Template,Vurderingsskabelon
 DocType: Item Group,Item Classification,Item Klassifikation
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Business Development Manager
@@ -4452,7 +4539,7 @@
 DocType: Item Attribute Value,Attribute Value,Attribut Værdi
 ,Itemwise Recommended Reorder Level,Itemwise Anbefalet genbestillings Level
 DocType: Salary Detail,Salary Detail,Løn Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Vælg {0} først
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Vælg {0} først
 DocType: Appointment Type,Physician,Læge
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Batch {0} af varer {1} er udløbet.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Høringer
@@ -4463,7 +4550,7 @@
 DocType: Salary Detail,Default Amount,Standard Mængde
 DocType: Lab Test Template,Descriptive,Beskrivende
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Lager ikke fundet i systemet
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Denne måneds Summary
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Denne måneds Summary
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalitetskontrol-aflæsning
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Frys lager ældre end` skal være mindre end %d dage.
 DocType: Tax Rule,Purchase Tax Template,Indkøb Momsskabelon
@@ -4486,12 +4573,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Træningsarrangementer / Resultater
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Akkumulerede afskrivninger som på
 DocType: Sales Invoice,C-Form Applicable,C-anvendelig
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Driftstid skal være større end 0 til drift {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Driftstid skal være større end 0 til drift {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Lager er obligatorisk
 DocType: Supplier,Address and Contacts,Adresse og kontaktpersoner
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Konvertering Detail
 DocType: Program,Program Abbreviation,Program Forkortelse
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Produktionsordre kan ikke rejses mod en Vare skabelon
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Produktionsordre kan ikke rejses mod en Vare skabelon
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Afgifter er opdateret i købskvitteringen for hver enkelt vare
 DocType: Warranty Claim,Resolved By,Løst af
 DocType: Bank Guarantee,Start Date,Startdato
@@ -4517,26 +4604,27 @@
 DocType: Employee,Educational Qualification,Uddannelseskvalifikation
 DocType: Workstation,Operating Costs,Driftsomkostninger
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Action hvis Akkumulerede Månedligt budget overskredet
-DocType: Purchase Invoice,Submit on creation,Godkend ved oprettelse
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Valuta for {0} skal være {1}
+DocType: Subscription,Submit on creation,Godkend ved oprettelse
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Valuta for {0} skal være {1}
 DocType: Asset,Disposal Date,Salgsdato
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-mails vil blive sendt til alle aktive medarbejdere i selskabet ved den givne time, hvis de ikke har ferie. Sammenfatning af svarene vil blive sendt ved midnat."
 DocType: Employee Leave Approver,Employee Leave Approver,Medarbejder Leave Godkender
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Række {0}: En Genbestil indgang findes allerede for dette lager {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklæres tabt, fordi tilbud er afgivet."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Træning Feedback
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Række {0}: En Genbestil indgang findes allerede for dette lager {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklæres tabt, fordi tilbud er afgivet."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Træning Feedback
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Produktionsordre {0} skal godkendes
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Leverandør Scorecard Criteria
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Vælg Start og slutdato for Item {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Kursus er obligatorisk i række {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Til dato kan ikke være før fra dato
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Tilføj / rediger priser
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Tilføj / rediger priser
 DocType: Batch,Parent Batch,Overordnet parti
 DocType: Cheque Print Template,Cheque Print Template,Anvendes ikke
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Diagram af omkostningssteder
 DocType: Lab Test Template,Sample Collection,Prøveopsamling
 ,Requested Items To Be Ordered,Anmodet Varer skal bestilles
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Mine ordrer
 DocType: Price List,Price List Name,Prislistenavn
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Daglige arbejde Summary for {0}
 DocType: Employee Loan,Totals,Totaler
@@ -4555,12 +4643,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} enheder af {1} behov i {2} på {3} {4} til {5} for at gennemføre denne transaktion.
 DocType: Fee Schedule,Student Category,Studerendekategori
 DocType: Announcement,Student,Studerende
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Organisationsenheds-master.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Organisationsenheds-master.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Gå til værelser
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Indtast venligst en meddelelse, før du sender"
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,DUPLIKATE FOR LEVERANDØR
 DocType: Email Digest,Pending Quotations,Afventende tilbud
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Kassesystemprofil
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Kassesystemprofil
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Lab Test Configurations.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Usikrede lån
 DocType: Cost Center,Cost Center Name,Omkostningsstednavn
@@ -4570,6 +4658,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Total Betalt Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Beskeder større end 160 tegn vil blive opdelt i flere meddelelser
 DocType: Purchase Receipt Item,Received and Accepted,Modtaget og accepteret
+DocType: Hub Settings,Company and Seller Profile,Firma og Sælger Profil
 ,GST Itemised Sales Register,GST Itemized Sales Register
 ,Serial No Service Contract Expiry,Serienummer Servicekontrakt-udløb
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Du kan ikke kreditere og debitere samme konto på samme tid
@@ -4579,10 +4668,11 @@
 DocType: Item,Variant Based On,Variant Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Samlet weightage tildelt skulle være 100%. Det er {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Dine Leverandører
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Ret venligst
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Kan ikke indstilles som Lost som Sales Order er foretaget.
 DocType: Request for Quotation Item,Supplier Part No,Leverandør varenummer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan ikke fratrække når kategori er for &quot;Værdiansættelse&quot; eller &quot;Vaulation og Total &#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Modtaget fra
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Modtaget fra
 DocType: Lead,Converted,Konverteret
 DocType: Item,Has Serial No,Har serienummer
 DocType: Employee,Date of Issue,Udstedt den
@@ -4590,7 +4680,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","I henhold til købsindstillingerne, hvis købsmodtagelse er påkrævet == &#39;JA&#39; og derefter for at oprette købsfaktura, skal brugeren først oprette købsmodtagelse for vare {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Række # {0}: Indstil Leverandør for vare {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Række {0}: Timer værdi skal være større end nul.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Website Billede {0} er knyttet til Vare {1} kan ikke findes
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Website Billede {0} er knyttet til Vare {1} kan ikke findes
 DocType: Issue,Content Type,Indholdstype
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computer
 DocType: Item,List this Item in multiple groups on the website.,Liste denne vare i flere grupper på hjemmesiden.
@@ -4601,14 +4691,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Hent ikke-afstemte poster
 DocType: Payment Reconciliation,From Invoice Date,Fra fakturadato
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Du har ikke tilladelse til at indsende
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,Faktureringsvaluta skal være lig med enten firmaets standardvaluta eller partens kontovaluta
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Faktureringsvaluta skal være lig med enten firmaets standardvaluta eller partens kontovaluta
 DocType: Healthcare Settings,Laboratory Settings,Laboratorieindstillinger
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Udbetal fravær
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Hvad gør det?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Til lager
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Alle Student Indlæggelser
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Hvad gør det?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Til lager
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Alle Student Indlæggelser
 ,Average Commission Rate,Gennemsnitlig provisionssats
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,'Har serienummer' kan ikke være 'Ja' for ikke-lagerførte vare
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,'Har serienummer' kan ikke være 'Ja' for ikke-lagerførte vare
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Vælg Status
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Fremmøde kan ikke markeres for fremtidige datoer
 DocType: Pricing Rule,Pricing Rule Help,Hjælp til prisfastsættelsesregel
@@ -4626,40 +4716,40 @@
 DocType: Item,Customer Code,Kundekode
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Birthday Reminder for {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dage siden sidste ordre
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Debit-Til konto skal være en balance konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Debit-Til konto skal være en balance konto
 DocType: Buying Settings,Naming Series,Navngivningsnummerserie
 DocType: Leave Block List,Leave Block List Name,Blokering af fraværsansøgninger
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Forsikring Startdato skal være mindre end Forsikring Slutdato
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Opsæt venligst instruktørens navngivningssystem i skolen&gt; skoleindstillinger
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Lageraktiver
 DocType: Timesheet,Production Detail,Produktion Detail
+DocType: Restaurant,Active Menu,Aktiv Menu
 DocType: Target Detail,Target Qty,Target Antal
 DocType: Shopping Cart Settings,Checkout Settings,Kassen Indstillinger
 DocType: Attendance,Present,Tilstede
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Følgeseddel {0} må ikke godkendes
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Følgeseddel {0} må ikke godkendes
 DocType: Notification Control,Sales Invoice Message,Salgfakturabesked
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Lukningskonto {0} skal være af typen Passiver / Egenkapital
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Medarbejder {0} lønseddel er allerede overført til tidsregistreringskladde {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Medarbejder {0} lønseddel er allerede overført til tidsregistreringskladde {1}
 DocType: Vehicle Log,Odometer,kilometertæller
 DocType: Sales Order Item,Ordered Qty,Bestilt antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Vare {0} er deaktiveret
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Vare {0} er deaktiveret
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Op
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,Stykliste indeholder ikke nogen lagervarer
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Sagsaktivitet / opgave.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,Stykliste indeholder ikke nogen lagervarer
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Sagsaktivitet / opgave.
 DocType: Vehicle Log,Refuelling Details,Brændstofpåfyldningsdetaljer
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generer lønsedler
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Indkøb skal kontrolleres, om nødvendigt er valgt som {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabat skal være mindre end 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Sidste købsværdi ikke fundet
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skriv Off Beløb (Company Valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Fakturerede timer
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,Standard stykliste for {0} blev ikke fundet
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Række # {0}: Venligst sæt genbestille mængde
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Standard stykliste for {0} blev ikke fundet
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Række # {0}: Venligst sæt genbestille mængde
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Tryk på elementer for at tilføje dem her
 DocType: Fees,Program Enrollment,Program Tilmelding
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Cost Voucher
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Indstil {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Gentag på dag i måneden
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} er inaktiv studerende
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} er inaktiv studerende
 DocType: Employee,Health Details,Sundhedsdetaljer
 DocType: Offer Letter,Offer Letter Terms,Ansættelsesvilkår
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,For at oprette en betalingsanmodning kræves referencedokument
@@ -4667,7 +4757,6 @@
 DocType: Employee External Work History,Salary,Løn
 DocType: Serial No,Delivery Document Type,Levering Dokumenttype
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Godkend alle lønsedler for de ovenfor valgte kriterier
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,synkroniseret {0} varer
 DocType: Sales Order,Partly Delivered,Delvist leveret
 DocType: Email Digest,Receivables,Tilgodehavender
 DocType: Lead Source,Lead Source,Lead Source
@@ -4688,19 +4777,19 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Strength
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,Stykliste erstattet
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Vælg varer baseret på Leveringsdato
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Vælg varer baseret på Leveringsdato
 ,Sales Analytics,Salgsanalyser
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Tilgængelige {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Tilgængelige {0}
 ,Prospects Engaged But Not Converted,Udsigter Engageret men ikke konverteret
 DocType: Manufacturing Settings,Manufacturing Settings,Produktion Indstillinger
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Opsætning af E-mail
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Formynder 1 mobiltelefonnr.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Indtast standardvaluta i Firma-masteren
 DocType: Stock Entry Detail,Stock Entry Detail,Lagerindtastningsdetaljer
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Daglige påmindelser
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Daglige påmindelser
 DocType: Products Settings,Home Page is Products,Home Page er Produkter
 ,Asset Depreciation Ledger,Asset Afskrivninger Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Momsregel konflikter med {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Momsregel konflikter med {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Ny Kontonavn
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Raw Materials Leveres Cost
 DocType: Selling Settings,Settings for Selling Module,Indstillinger for salgsmodul
@@ -4714,8 +4803,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Vare {0} skal være en lagervare
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard varer-i-arbejde-lager
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Standardindstillinger regnskabsmæssige transaktioner.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Opsæt venligst medarbejdernavnesystem i menneskelige ressourcer&gt; HR-indstillinger
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Forventet dato kan ikke være før materialeanmodningsdatoen
+DocType: Restaurant,Default Tax Template,Standard skat skabelon
 DocType: Fees,Student Details,Studentoplysninger
 DocType: Purchase Invoice Item,Stock Qty,Antal på lager
 DocType: Employee Loan,Repayment Period in Months,Tilbagebetaling Periode i måneder
@@ -4733,8 +4823,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Gå til varer
 DocType: Sales Partner,Partner Type,Partnertype
 DocType: Purchase Taxes and Charges,Actual,Faktiske
+DocType: Restaurant Menu,Restaurant Manager,Restaurantchef
 DocType: Authorization Rule,Customerwise Discount,Customerwise Discount
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Timeseddel til opgaver.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Timeseddel til opgaver.
 DocType: Purchase Invoice,Against Expense Account,Mod udgiftskonto
 DocType: Production Order,Production Order,Produktionsordre
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Installation Bemærk {0} er allerede blevet indsendt
@@ -4742,7 +4833,6 @@
 DocType: Quotation Item,Against Docname,Mod Docname
 DocType: SMS Center,All Employee (Active),Alle medarbejdere (aktive)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Se nu
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Vælg den periode, hvor fakturaen vil blive genereret automatisk"
 DocType: BOM,Raw Material Cost,Råmaterialeomkostninger
 DocType: Item Reorder,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Indtast poster og planlagt qty, som du ønsker at hæve produktionsordrer eller downloade råmaterialer til analyse."
@@ -4755,23 +4845,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Kontotype er obligatorisk
 DocType: Item,Serial Number Series,Serienummer-nummerserie
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Lager er obligatorisk for lagervare {0} i række {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Tilføj programmer
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Detail &amp; Wholesale
 DocType: Issue,First Responded On,Først svarede den
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Notering af Item i flere grupper
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Regnskabsår Start Dato og Skatteårsafslutning Dato allerede sat i regnskabsåret {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Clearance Dato opdateret
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Opdel parti
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Opdel parti
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Succesfuld Afstemt
 DocType: Request for Quotation Supplier,Download PDF,Download PDF
 DocType: Production Order,Planned End Date,Planlagt slutdato
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Indtast venligst planlægningsdato
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Hvor varer er på lager.
 DocType: Request for Quotation,Supplier Detail,Leverandør Detail
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Fejl i formel eller betingelse: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Fejl i formel eller betingelse: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Faktureret beløb
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kriterier vægt skal tilføje op til 100%
 DocType: Attendance,Attendance,Fremmøde
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,Lagervarer
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,Lagervarer
 DocType: BOM,Materials,Materialer
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Hvis ikke afkrydset, skal hver afdeling vælges, hvor det skal anvendes."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Kilde og Target Warehouse kan ikke være samme
@@ -4789,6 +4879,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,On Net Total
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Værdi for Egenskab {0} skal være inden for området af {1} og {2} i intervaller af {3} til konto {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Target lager i rækken {0} skal være samme som produktionsordre
+DocType: Restaurant Reservation,Waitlisted,venteliste
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Valuta kan ikke ændres efter at poster ved hjælp af nogle anden valuta
 DocType: Vehicle Service,Clutch Plate,clutch Plate
 DocType: Company,Round Off Account,Afrundningskonto
@@ -4805,7 +4896,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Navn på ny salgsmedarbejder
 DocType: Packing Slip,Gross Weight UOM,Bruttovægtenhed
 DocType: Delivery Note Item,Against Sales Invoice,Mod salgsfaktura
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Indtast serienumre for serialiseret vare
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Indtast serienumre for serialiseret vare
 DocType: Bin,Reserved Qty for Production,Reserveret Antal for Produktion
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Markér ikke, hvis du ikke vil overveje batch mens du laver kursusbaserede grupper."
 DocType: Asset,Frequency of Depreciation (Months),Hyppigheden af afskrivninger (måneder)
@@ -4816,7 +4907,7 @@
 DocType: Lab Test,Test Group,Testgruppe
 DocType: Payment Reconciliation,Receivable / Payable Account,Tilgodehavende / Betales konto
 DocType: Delivery Note Item,Against Sales Order Item,Mod Sales Order Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Angiv Attribut Værdi for attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Angiv Attribut Værdi for attribut {0}
 DocType: Item,Default Warehouse,Standard-lager
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budget kan ikke tildeles mod Group konto {0}
 DocType: Healthcare Settings,Patient Registration,Patientregistrering
@@ -4845,6 +4936,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Salgsmedarbejder
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Budget og Omkostningssted
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Flere standard betalingsmåder er ikke tilladt
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,for
 ,Appointment Analytics,Aftale Analytics
 DocType: Vehicle Service,Half Yearly,Halvårlig
 DocType: Lead,Blog Subscriber,Blog Subscriber
@@ -4862,7 +4954,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Citeringsantal
 ,BOM Stock Report,BOM Stock Rapport
 DocType: Stock Reconciliation Item,Quantity Difference,Mængdeforskel
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Lønadministration
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Lønadministration
 DocType: Opportunity Item,Basic Rate,Grundlæggende Rate
 DocType: GL Entry,Credit Amount,Kreditbeløb
 DocType: Cheque Print Template,Signatory Position,undertegnende holdning
@@ -4876,12 +4968,12 @@
 DocType: Tax Rule,Tax Rule,Momsregel
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Oprethold Samme Rate Gennem Sales Cycle
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planlæg tid logs uden Workstation arbejdstid.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Kunder i kø
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} har ikke en lægeplan. Tilføj det i læge mester
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Kunder i kø
 DocType: Student,Nationality,Nationalitet
 ,Items To Be Requested,Varer til bestilling
-DocType: Purchase Order,Get Last Purchase Rate,Hent sidste købssats
 DocType: Company,Company Info,Firmainformation
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Vælg eller tilføj ny kunde
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Vælg eller tilføj ny kunde
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Omkostningssted er forpligtet til at bestille et udlæg
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse af midler (Aktiver)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Dette er baseret på deltagelse af denne Medarbejder
@@ -4889,6 +4981,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Debetkonto
 DocType: Fiscal Year,Year Start Date,År Startdato
 DocType: Attendance,Employee Name,Medarbejdernavn
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restaurant Bestillingsartikel
 DocType: Sales Invoice,Rounded Total (Company Currency),Afrundet i alt (firmavaluta)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Kan ikke skjult til gruppen, fordi Kontotype er valgt."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} er blevet ændret. Venligst opdater.
@@ -4899,6 +4992,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Personalegoder
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Pakket mængde skal være lig mængde for vare {0} i række {1}
 DocType: Production Order,Manufactured Qty,Fremstillet mængde
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Faktura er oprettet
 DocType: Purchase Receipt Item,Accepted Quantity,Mængde
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Angiv en standard helligdagskalender for medarbejder {0} eller firma {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} eksisterer ikke
@@ -4908,18 +5002,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rækkenr. {0}: Beløb kan ikke være større end Udestående Beløb overfor Udlæg {1}. Udestående Beløb er {2}
 DocType: Maintenance Schedule,Schedule,Køreplan
 DocType: Account,Parent Account,Parent Konto
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Tilgængelig
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Tilgængelig
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Bilagstype
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Prisliste ikke fundet eller deaktiveret
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Prisliste ikke fundet eller deaktiveret
 DocType: Lab Test,Approved,Godkendt
 DocType: Pricing Rule,Price,Pris
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',Medarbejder lettet på {0} skal indstilles som &quot;Left&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Medarbejder lettet på {0} skal indstilles som &quot;Left&quot;
+DocType: Hub Settings,Last Sync On,Sidste synkronisering
 DocType: Guardian,Guardian,Guardian
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Vurdering {0} dannet for medarbejder {1} i det givne datointerval
 DocType: Employee,Education,Uddannelse
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Slet
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,Slet
 DocType: Selling Settings,Campaign Naming By,Kampagne Navngivning Af
 DocType: Employee,Current Address Is,Nuværende adresse er
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Månedligt salgsmål (
@@ -4934,7 +5029,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Kursuskode:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Indtast venligst udgiftskonto
 DocType: Account,Stock,Lager
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: referencedokument Type skal være en af indkøbsordre, købsfaktura eller Kassekladde"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: referencedokument Type skal være en af indkøbsordre, købsfaktura eller Kassekladde"
 DocType: Employee,Current Address,Nuværende adresse
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Hvis varen er en variant af et andet element derefter beskrivelse, billede, prissætning, skatter mv vil blive fastsat fra skabelonen medmindre det udtrykkeligt er angivet"
 DocType: Serial No,Purchase / Manufacture Details,Indkøbs- og produktionsdetaljer
@@ -4965,7 +5060,7 @@
 DocType: Hub Settings,Hub Settings,Hub Indstillinger
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,Med Operations
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Regnskabsposteringer er allerede foretaget i valuta {0} for virksomheden {1}. Vælg tilgodehavendets eller gældens konto med valuta {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Regnskabsposteringer er allerede foretaget i valuta {0} for virksomheden {1}. Vælg tilgodehavendets eller gældens konto med valuta {0}.
 DocType: Asset,Is Existing Asset,Er eksisterende aktiv
 DocType: Salary Detail,Statistical Component,Statistisk komponent
 DocType: Warranty Claim,If different than customer address,Hvis anderledes end kundeadresse
@@ -4973,13 +5068,14 @@
 DocType: BOM Operation,BOM Operation,BOM Operation
 DocType: Purchase Taxes and Charges,On Previous Row Amount,På Forrige Row Beløb
 DocType: Student,Home Address,Hjemmeadresse
+DocType: Item,Has Expiry Date,Har udløbsdato
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Variantindstillinger.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transfer Asset
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,Transfer Asset
 DocType: POS Profile,POS Profile,Kassesystemprofil
 DocType: Training Event,Event Name,begivenhed Navn
-DocType: Physician,Phone (Office),Telefon (Office)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,Adgang
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Indlæggelser for {0}
+DocType: Physician,Phone (Office),Telefon (kontor)
+apps/erpnext/erpnext/hooks.py +147,Admission,Adgang
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Indlæggelser for {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Sæsonudsving til indstilling budgetter, mål etc."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Variabelt navn
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Vare {0} er en skabelon, skal du vælge en af dens varianter"
@@ -4988,7 +5084,7 @@
 DocType: Assessment Plan,Room,Værelse
 DocType: Purchase Order,Advance Paid,Forudbetalt
 DocType: Item,Item Tax,Varemoms
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Materiale til leverandøren
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Materiale til leverandøren
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Skattestyrelsen Faktura
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Grænsen {0}% forekommer mere end én gang
 DocType: Expense Claim,Employees Email Id,Medarbejdere Email Id
@@ -4999,32 +5095,30 @@
 DocType: Program,Program Name,Programnavn
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Overvej Skat eller Gebyr for
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiske Antal er obligatorisk
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} har for øjeblikket en {1} leverandør scorecard stående, og købsordrer til denne leverandør bør udstedes med forsigtighed."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} har for øjeblikket en {1} leverandør scorecard stående, og købsordrer til denne leverandør bør udstedes med forsigtighed."
 DocType: Employee Loan,Loan Type,Lånetype
 DocType: Scheduling Tool,Scheduling Tool,Planlægning Tool
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Kreditkort
 DocType: BOM,Item to be manufactured or repacked,"Element, der skal fremstilles eller forarbejdes"
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Standardindstillinger for lagertransaktioner.
-DocType: Purchase Invoice,Next Date,Næste dato
 DocType: Employee Education,Major/Optional Subjects,Større / Valgfag
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
+DocType: Hub Settings,Suspended,Suspenderet
 DocType: Training Event,Attendees,Deltagere
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Her kan du opretholde familiens detaljer såsom navn og beskæftigelse af forældre, ægtefælle og børn"
 DocType: Academic Term,Term End Date,Betingelser slutdato
-DocType: Hub Settings,Seller Name,Sælger Navn
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Skatter og Afgifter Fratrukket (Company Valuta)
 DocType: Item Group,General Settings,Generelle indstillinger
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Fra Valuta og Til valuta ikke kan være samme
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Tilføj instruktører
 DocType: Stock Entry,Repack,Pak om
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,"Du skal gemme formularen, før du fortsætter"
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Vælg venligst firmaet først
 DocType: Item Attribute,Numeric Values,Numeriske værdier
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Vedhæft Logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,lagrene
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,lagrene
 DocType: Customer,Commission Rate,Provisionssats
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Oprettet {0} scorecards for {1} mellem:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Opret Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Opret Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blokér fraværsansøgninger pr. afdeling.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Betaling Type skal være en af Modtag, Pay og Intern Transfer"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analyser
@@ -5035,15 +5129,17 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Root kan ikke redigeres.
 DocType: Item,Units of Measure,Måleenheder
 DocType: Manufacturing Settings,Allow Production on Holidays,Tillad produktion på helligdage
-DocType: Sales Order,Customer's Purchase Order Date,Kundens Indkøbsordre Dato
+DocType: Sales Order,Customer's Purchase Order Date,Kundens indkøbsordredato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Capital Stock
 DocType: Shopping Cart Settings,Show Public Attachments,Vis offentlige vedhæftede filer
 DocType: Packing Slip,Package Weight Details,Pakkevægtdetaljer
+DocType: Restaurant Reservation,Reservation Time,Reservationstid
 DocType: Payment Gateway Account,Payment Gateway Account,Betaling Gateway konto
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Efter betaling afslutning omdirigere brugeren til valgte side.
 DocType: Company,Existing Company,Eksisterende firma
 DocType: Healthcare Settings,Result Emailed,Resultat sendt
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","Skatkategori er blevet ændret til &quot;Total&quot;, fordi alle genstande er ikke-lagerartikler"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Varenummer&gt; Varegruppe&gt; Mærke
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Vælg en CSV-fil
 DocType: Student Leave Application,Mark as Present,Markér som tilstede
 DocType: Supplier Scorecard,Indicator Color,Indikator Farve
@@ -5068,11 +5164,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Masseopret elever
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Er fortsat fravær fra sidste regnskabsår
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Hent varer fra stykliste
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Hent varer fra stykliste
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time dage
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Række # {0}: Bogføringsdato skal være den samme som købsdatoen {1} af aktivet {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Tjek dette, hvis den studerende er bosiddende på instituttets Hostel."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Indtast salgsordrer i ovenstående tabel
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Indtast salgsordrer i ovenstående tabel
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Ikke-godkendte lønsedler
 ,Stock Summary,Stock Summary
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Overfør et aktiv fra et lager til et andet
@@ -5088,5 +5184,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Række {0}: Debit indgang ikke kan knyttes med en {1}
 DocType: Journal Entry,Subscription Section,Abonnementsafdeling
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Konto {0} findes ikke
+DocType: Training Event,Training Program,Træningsprogram
 DocType: Account,Cash,Kontanter
 DocType: Employee,Short biography for website and other publications.,Kort biografi for hjemmesiden og andre publikationer.
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index f6bc844..e80e9f4 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Gehaltsmodus
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Neu registrieren
 DocType: Patient,Divorced,Geschieden
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Artikel sind bereits synchronisiert
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Zulassen, dass ein Artikel mehrfach in einer Transaktion hinzugefügt werden kann"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Materialkontrolle {0} stornieren vor Abbruch dieses Garantieantrags
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Verbrauchsgüter
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Urlaubsgenehmiger
 DocType: Sales Partner,Dealer,Händler
 DocType: Consultation,Investigations,Untersuchungen
+DocType: Restaurant Order Entry,Click Enter To Add,Klicken Sie zum Hinzufügen auf Hinzufügen.
 DocType: Employee,Rented,Gemietet
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Anwenden für Benutzer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",Angehaltener Fertigungsauftrag kann nicht storniert werden. Bitte zuerst den Fertigungsauftrag fortsetzen um ihn dann zu stornieren
 DocType: Vehicle Service,Mileage,Kilometerstand
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Wollen Sie wirklich diese Anlageklasse zu Schrott?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Möchten Sie diesen Gegenstand wirklich entsorgen?
 DocType: Drug Prescription,Update Schedule,Aktualisierungsplan
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Standard -Lieferant auswählen
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Währung für Preisliste {0} erforderlich
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Verfügbarkeit prüfen
 DocType: Job Applicant,Job Applicant,Bewerber
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Dies basiert auf Transaktionen gegen diesen Lieferanten. Siehe Zeitleiste unten für Details
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Keine weiteren Ergebnisse.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Rechtswesen
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Tatsächliche Steuerart kann nicht im Artikelpreis in Zeile {0} beinhaltet sein
 DocType: Bank Guarantee,Customer,Kunde
@@ -41,28 +41,30 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Wechselkurs muss derselbe wie {0} {1} ({2}) sein
 DocType: Sales Invoice,Customer Name,Kundenname
 DocType: Vehicle,Natural Gas,Erdgas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Bankname {0} ungültig
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Bankname {0} ungültig
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Typen (oder Gruppen), zu denen Buchungseinträge vorgenommen und Salden geführt werden."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Ausstände für {0} können nicht kleiner als Null sein ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Es gibt keine eingereichten Salary Slips zu verarbeiten.
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 Minuten
 DocType: Leave Type,Leave Type Name,Bezeichnung der Abwesenheit
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,zeigen open
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,"Es ist notwendig, diese Handlung heute selbst für die oben erwähnten wiederkehrenden zu nehmen"
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Nummernkreise erfolgreich geändert
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Auschecken
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural Journal Entry Eingereicht
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural Journaleintrag eingereicht
 DocType: Pricing Rule,Apply On,Anwenden auf
 DocType: Item Price,Multiple Item prices.,Mehrere verschiedene Artikelpreise
 ,Purchase Order Items To Be Received,Eingehende Lieferantenauftrags-Artikel
 DocType: SMS Center,All Supplier Contact,Alle Lieferantenkontakte
 DocType: Support Settings,Support Settings,Support-Einstellungen
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Voraussichtliches Enddatum kann nicht vor dem voraussichtlichen Startdatum liegen
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Voraussichtliches Enddatum kann nicht vor dem voraussichtlichen Startdatum liegen
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Zeile #{0}: Preis muss derselbe wie {1}: {2} ({3} / {4}) sein
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Neuer Urlaubsantrag
 ,Batch Item Expiry Status,Stapelobjekt Ablauf-Status
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Bankwechsel
 DocType: Mode of Payment Account,Mode of Payment Account,Art des Zahlungskontos
 DocType: Consultation,Consultation,Beratung
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Umsatz und Retouren
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Varianten anzeigen
 DocType: Academic Term,Academic Term,Semester
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Stoff
@@ -72,16 +74,17 @@
 DocType: Employee Education,Year of Passing,Abschlussjahr
 DocType: Item,Country of Origin,Herkunftsland
 apps/erpnext/erpnext/templates/includes/product_page.js +24,In Stock,Auf Lager
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Offene Punkte
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,offene Probleme
 DocType: Production Plan Item,Production Plan Item,Artikel auf dem Produktionsplan
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Benutzer {0} ist bereits Mitarbeiter {1} zugewiesen
 DocType: Lab Test Groups,Add new line,Neue Zeile hinzufügen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Gesundheitswesen
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Zahlungsverzug (Tage)
 DocType: Lab Prescription,Lab Prescription,Labor Rezept
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Nach Preis sortieren
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Dienstzeitaufwand
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Seriennummer: {0} wird bereits in der Verkaufsrechnung referenziert: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Rechnung
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Seriennummer: {0} wird bereits in der Verkaufsrechnung referenziert: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Rechnung
 DocType: Maintenance Schedule Item,Periodicity,Häufigkeit
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiscal Year {0} ist erforderlich
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Verteidigung
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Zeile # {0}:
 DocType: Timesheet,Total Costing Amount,Gesamtkalkulation Betrag
 DocType: Delivery Note,Vehicle No,Fahrzeug-Nr.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Bitte eine Preisliste auswählen
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Bitte eine Preisliste auswählen
 DocType: Accounts Settings,Currency Exchange Settings,Währungsaustausch Einstellungen
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,"Row # {0}: Zahlungsbeleg ist erforderlich, um die trasaction abzuschließen"
 DocType: Production Order Operation,Work In Progress,Laufende Arbeit/-en
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Bitte wählen Sie Datum
 DocType: Employee,Holiday List,Urlaubsübersicht
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Bitte Setup Instructor Naming System in der Schule&gt; Schule Einstellungen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Buchhalter
+DocType: Hub Settings,Selling Price List,Verkaufspreisliste
 DocType: Patient,Tobacco Current Use,Tabakstrom Verwendung
 DocType: Cost Center,Stock User,Benutzer Lager
 DocType: Company,Phone No,Telefonnummer
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Kurstermine erstellt:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Neu {0}: #{1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Neu {0}: #{1}
 ,Sales Partners Commission,Vertriebspartner-Provision
 DocType: Purchase Invoice,Rounding Adjustment,Rundungseinstellung
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Abkürzung darf nicht länger als 5 Zeichen sein
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Übergeordnetes Detail Dokumentenname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referenz: {0}, Item Code: {1} und Kunde: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,kg
-DocType: Student Log,Log,Log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Stellenausschreibung
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Ergebnis submittiert
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Ergebnis übermittelt
 DocType: Item Attribute,Increment,Schrittweite
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Zeitspanne
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Lager auswählen ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Verheiratet
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Nicht zulässig für {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Holen Sie Elemente aus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Lager kann nicht mit Lieferschein {0} aktualisiert werden
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Lager kann nicht mit Lieferschein {0} aktualisiert werden
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Keine Artikel aufgeführt
 DocType: Payment Reconciliation,Reconcile,Abgleichen
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionsfonds
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Weiter Abschreibungen Datum kann nicht vor dem Kauf Datum
 DocType: Consultation,Consultation Date,Konsultationsdatum
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Produktliste und Erkennung für ERPNext-Benutzer
 DocType: SMS Center,All Sales Person,Alle Vertriebsmitarbeiter
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Monatliche Ausschüttung ** hilft Ihnen, das Budget / Ziel über Monate zu verteilen, wenn Sie Saisonalität in Ihrem Unternehmen haben."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Nicht Artikel gefunden
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Gehaltsstruktur Fehlende
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Nicht Artikel gefunden
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Gehaltsstruktur Fehlende
 DocType: Lead,Person Name,Name der Person
 DocType: Sales Invoice Item,Sales Invoice Item,Ausgangsrechnungs-Artikel
 DocType: Account,Credit,Haben
 DocType: POS Profile,Write Off Cost Center,Kostenstelle für Abschreibungen
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""","z.B. ""Grundschule"" oder ""Universität"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""","z.B. ""Grundschule"" oder ""Universität"""
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Auf Berichte
 DocType: Warehouse,Warehouse Detail,Lagerdetail
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Kreditlimit für Kunde {0} {1}/{2} wurde überschritten
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Der Begriff Enddatum kann nicht später sein als das Jahr Enddatum des Akademischen Jahres an dem der Begriff verknüpft ist (Akademisches Jahr {}). Bitte korrigieren Sie die Daten und versuchen Sie es erneut.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Ist Anlagevermögen"" kann nicht deaktiviert werden, da Anlagebuchung gegen den Artikel vorhanden"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Ist Anlagevermögen"" kann nicht deaktiviert werden, da Anlagebuchung gegen den Artikel vorhanden"
 DocType: Vehicle Service,Brake Oil,Bremsöl
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundengruppe&gt; Gebiet
 DocType: Tax Rule,Tax Type,Steuerart
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Steuerpflichtiger Betrag
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Sie haben keine Berechtigung Buchungen vor {0} hinzuzufügen oder zu aktualisieren
 DocType: BOM,Item Image (if not slideshow),Artikelbild (wenn keine Diashow)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Es existiert bereits ein Kunde mit dem gleichen Namen
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Stundensatz / 60) * tatsächliche Betriebszeit
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Referenzdokumenttyp muss einer der Kostenansprüche oder des Journaleintrags sein
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Wählen Sie BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Referenzdokumenttyp muss einer der Kostenansprüche oder des Journaleintrags sein
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Wählen Sie BOM
 DocType: SMS Log,SMS Log,SMS-Protokoll
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Aufwendungen für gelieferte Artikel
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Der Urlaub am {0} ist nicht zwischen dem Von-Datum und dem Bis-Datum
@@ -179,23 +182,23 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},Von {0} bis {1}
 DocType: Item,Copy From Item Group,Von Artikelgruppe kopieren
 DocType: Journal Entry,Opening Entry,Eröffnungsbuchung
-apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Konto Pay Nur
+apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,reines Zahlungskonto
 DocType: Employee Loan,Repay Over Number of Periods,Repay über Anzahl der Perioden
 DocType: Stock Entry,Additional Costs,Zusätzliche Kosten
 apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Ein Konto mit bestehenden Transaktionen kann nicht in eine Gruppe umgewandelt werden
 DocType: Lead,Product Enquiry,Produktanfrage
 DocType: Academic Term,Schools,Schulen
-DocType: School Settings,Validate Batch for Students in Student Group,Validate Batch für Studierende in der Studentengruppe
+DocType: School Settings,Validate Batch for Students in Student Group,Validiere Charge für Studierende in der Studentengruppe
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Kein Urlaubssatz für Mitarbeiter gefunden {0} von {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Bitte zuerst die Firma angeben
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +358,Please select Company first,Bitte zuerst Firma auswählen
 DocType: Employee Education,Under Graduate,Schulabgänger
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Ziel auf
 DocType: BOM,Total Cost,Gesamtkosten
-DocType: Journal Entry Account,Employee Loan,Arbeitnehmerdarlehen
+DocType: Journal Entry Account,Employee Loan,MItarbeiterdarlehen
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Aktivitätsprotokoll:
 DocType: Fee Schedule,Send Payment Request Email,Sende Zahlungsauftrag E-Mail
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Artikel {0} ist nicht im System vorhanden oder abgelaufen
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Artikel {0} ist nicht im System vorhanden oder abgelaufen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Immobilien
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Kontoauszug
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaprodukte
@@ -210,17 +213,22 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Importprotokoll
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Ziehen Werkstoff Anfrage des Typs Herstellung auf der Basis der oben genannten Kriterien
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Erfolgreich nicht registriert.
 DocType: Training Result Employee,Grade,Klasse
+DocType: Restaurant Table,No of Seats,Anzahl der Sitze
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Um dynamisches Thema hinzuzufügen, benutze Jinja-Tags wie <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Geliefert von Lieferant
 DocType: SMS Center,All Contact,Alle Kontakte
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Fertigungsauftrag bereits für alle Positionen mit BOM erstellt
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Fertigungsauftrag bereits für alle Positionen mit BOM erstellt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Jahresgehalt
 DocType: Daily Work Summary,Daily Work Summary,tägliche Arbeitszusammenfassung
 DocType: Period Closing Voucher,Closing Fiscal Year,Abschluss des Geschäftsjahres
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} ist gesperrt
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Bitte wählen Sie Bestehende Unternehmen für die Erstellung von Konten
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} ist gesperrt
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Bitte wählen Sie Bestehende Unternehmen für die Erstellung von Konten
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Lagerkosten
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Wählen Sie Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Wählen Sie Target Warehouse
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Bitte geben Sie Bevorzugte Kontakt per E-Mail
 DocType: Program Enrollment,School Bus,Schulbus
 DocType: Journal Entry,Contra Entry,Gegenbuchung
@@ -237,9 +245,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Vorlage herunterladen, passende Daten eintragen und geänderte Datei anfügen. Alle Termine und Mitarbeiter-Kombinationen im gewählten Zeitraum werden in die Vorlage übernommen, inklusive der bestehenden Anwesenheitslisten"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Artikel {0} ist nicht aktiv oder hat das Ende der Lebensdauer erreicht
+DocType: Student Admission Program,Minimum Age,Mindestalter
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Beispiel: Basismathematik
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Um Steuern im Artikelpreis in Zeile {0} einzubeziehen, müssen Steuern in den Zeilen {1} ebenfalls einbezogen sein"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Einstellungen für das Personal-Modul
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Einstellungen für das Personal-Modul
 DocType: SMS Center,SMS Center,SMS-Center
 DocType: Sales Invoice,Change Amount,Anzahl ändern
 DocType: BOM Update Tool,New BOM,Neue Stückliste
@@ -249,18 +258,18 @@
 DocType: Lead,Request Type,Anfragetyp
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Mitarbeiter anlegen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Rundfunk
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Zimmer hinzufügen
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Einrichtungsmodus des POS (Online / Offline)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Ausführung
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Details der durchgeführten Arbeitsgänge
 DocType: Serial No,Maintenance Status,Wartungsstatus
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Der Lieferant ist gegen Kreditorenkonto erforderlich {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Für das Kreditorenkonto ist ein Lieferant erforderlich {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Artikel und Preise
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Stundenzahl: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},"Von-Datum sollte im Geschäftsjahr liegen. Unter der Annahme, Von-Datum = {0}"
 DocType: Drug Prescription,Interval,Intervall
 DocType: Customer,Individual,Einzelperson
 DocType: Interest,Academics User,Benutzer: Lehre
-DocType: Cheque Print Template,Amount In Figure,Betrag In Abbildung
+DocType: Cheque Print Template,Amount In Figure,Betrag als Zahl
 DocType: Employee Loan Application,Loan Info,Darlehensinformation
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan für Wartungsbesuche
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Supplier Scorecard Zeitraum
@@ -272,6 +281,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Preisliste muss für Einkauf oder Vertrieb gültig sein
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Installationsdatum kann nicht vor dem Liefertermin für Artikel {0} liegen
 DocType: Pricing Rule,Discount on Price List Rate (%),Rabatt auf die Preisliste (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Biochemie
 DocType: Offer Letter,Select Terms and Conditions,Bitte Geschäftsbedingungen auswählen
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,Out Wert
 DocType: Production Planning Tool,Sales Orders,Kundenaufträge
@@ -281,7 +291,7 @@
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Die Angebotsanfrage kann durch einen Klick auf den folgenden Link abgerufen werden
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Urlaube für ein Jahr zuordnen
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Creation Tool-Kurs
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Insufficient Stock,Unzureichende Auf
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Insufficient Stock,mengelnde Lagermenge
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Kapazitätsplanung und Zeiterfassung deaktivieren
 DocType: Email Digest,New Sales Orders,Neue Kundenaufträge
 DocType: Bank Guarantee,Bank Account,Bankkonto
@@ -293,9 +303,9 @@
 DocType: Production Order Operation,Updated via 'Time Log',"Aktualisiert über ""Zeitprotokoll"""
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +427,Advance amount cannot be greater than {0} {1},Anzahlung kann nicht größer sein als {0} {1}
 DocType: Naming Series,Series List for this Transaction,Nummernkreise zu diesem Vorgang
-DocType: Company,Enable Perpetual Inventory,Enable Perpetual Inventory aktivieren
+DocType: Company,Enable Perpetual Inventory,Permanente Inventur aktivieren
 DocType: Company,Default Payroll Payable Account,Standardabrechnungskreditorenkonto
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +51,Update Email Group,Update-E-Mail-Gruppe
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +51,Update Email Group,E-Mail-Gruppe aktualisieren
 DocType: Sales Invoice,Is Opening Entry,Ist Eröffnungsbuchung
 DocType: Lab Test Template,"If unchecked, the item wont be appear in Sales Invoice, but can be used in group test creation. ","Wenn nicht markiert, wird das Element nicht in der Verkaufsrechnung angezeigt, sondern kann bei der Gruppentesterstellung verwendet werden."
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Vermerken, wenn kein Standard-Forderungskonto verwendbar ist"
@@ -306,15 +316,15 @@
 DocType: Sales Partner,Reseller,Wiederverkäufer
 DocType: Codification Table,Medical Code,Medizinischer Code
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Wenn diese Option aktiviert, wird nicht auf Lager gehalten im Materialanforderungen enthalten."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Bitte Firmenname angeben
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Bitte Firmenname angeben
 DocType: Delivery Note Item,Against Sales Invoice Item,Zu Ausgangsrechnungs-Position
 ,Production Orders in Progress,Fertigungsaufträge in Arbeit
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Nettocashflow aus Finanzierung
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage ist voll, nicht gespeichert"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage ist voll, nicht gespeichert"
 DocType: Lead,Address & Contact,Adresse & Kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Ungenutzten Urlaub von vorherigen Zuteilungen hinzufügen
 DocType: Sales Partner,Partner website,Partner-Website
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Artikel hinzufügen
+DocType: Restaurant Order Entry,Add Item,Artikel hinzufügen
 DocType: Lab Test,Custom Result,Benutzerdefiniertes Ergebnis
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Ansprechpartner
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kursbeurteilungskriterien
@@ -322,12 +332,13 @@
 DocType: POS Customer Group,POS Customer Group,POS Kundengruppe
 DocType: Cheque Print Template,Line spacing for amount in words,Zeilenabstand für Betrag in Worten
 DocType: Vehicle,Additional Details,Weitere Details
-apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Assessment Plan: ,Bewertungsplan:
+apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Assessment Plan: ,Beurteilungsplan:
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Keine Beschreibung angegeben
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Lieferantenanfrage
 DocType: Lab Test,Submitted Date,Eingeschriebenes Datum
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Dies wird auf der Grundlage der Zeitblätter gegen dieses Projekt erstellt
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Net Pay kann nicht kleiner als 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Net Pay kann nicht kleiner als 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Um das Senden von sich wiederholenden Fehlerbenachrichtigungen aus dem System zu beenden, haben wir das Feld Deaktiviert im Abonnement aktiviert."
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Nur der ausgewählte Urlaubsgenehmiger kann Urlaubsgenehmigungen übertragen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Freitstellungsdatum muss nach dem Eintrittsdatum liegen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Abwesenheiten pro Jahr
@@ -336,9 +347,10 @@
 DocType: Email Digest,Profit & Loss,Profiteinbuße
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Liter
 DocType: Task,Total Costing Amount (via Time Sheet),Gesamtkostenbetrag (über Arbeitszeitblatt)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Bitte richten Sie Schüler unter Schülergruppen ein
 DocType: Item Website Specification,Item Website Specification,Artikel-Webseitenspezifikation
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Urlaub gesperrt
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Artikel {0} hat das Ende seiner Lebensdauer erreicht zum Datum {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Artikel {0} hat das Ende seiner Lebensdauer erreicht zum Datum {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Bank-Einträge
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Jährlich
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Bestandsabgleich-Artikel
@@ -347,7 +359,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Creation Tool-Kurs
 DocType: Lead,Do Not Contact,Nicht Kontakt aufnehmen
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,"Menschen, die in Ihrer Organisation lehren"
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Die eindeutige ID für die Nachverfolgung aller wiederkehrenden Rechnungen. Wird beim Übertragen erstellt.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Software-Entwickler
 DocType: Item,Minimum Order Qty,Mindestbestellmenge
 DocType: Pricing Rule,Supplier Type,Lieferantentyp
@@ -357,17 +368,19 @@
 DocType: Item,Publish in Hub,Im Hub veröffentlichen
 DocType: Student Admission,Student Admission,Studenten Eintritt
 ,Terretory,Region
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Artikel {0} wird storniert
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Materialanfrage
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Artikel {0} wird storniert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Materialanfrage
 DocType: Bank Reconciliation,Update Clearance Date,Abwicklungsdatum aktualisieren
 DocType: Item,Purchase Details,Einkaufsdetails
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Artikel {0} in Tabelle ""Rohmaterialien geliefert"" des Lieferantenauftrags {1} nicht gefunden"
 DocType: Patient Relation,Relation,Beziehung
 DocType: Shipping Rule,Worldwide Shipping,Weltweiter Versand
 DocType: Patient Relation,Mother,Mutter
+DocType: Restaurant Reservation,Reservation End Time,Reservierungsendzeit
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Bestätigte Aufträge von Kunden
 DocType: Purchase Receipt Item,Rejected Quantity,Ausschuss-Menge
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Zahlungsauftrag {0} erstellt
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Zahlungsauftrag {0} erstellt
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Geringe Empfindlichkeit
 DocType: Notification Control,Notification Control,Benachrichtungseinstellungen
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,"Bitte bestätigen Sie, sobald Sie Ihre Ausbildung abgeschlossen haben"
 DocType: Lead,Suggestions,Vorschläge
@@ -381,13 +394,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Please select Charge Type first,Bitte zuerst Chargentyp auswählen
 DocType: Student Group Student,Student Group Student,Student Group Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Neueste(r/s)
-DocType: Vehicle Service,Inspection,Inspektion
+DocType: Vehicle Service,Inspection,Kontrolle
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Max Grade
 DocType: Email Digest,New Quotations,Neue Angebote
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,E-Mails Gehaltsabrechnung an Mitarbeiter auf Basis von bevorzugten E-Mail in Mitarbeiter ausgewählt
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Der erste Urlaubsgenehmiger auf der Liste wird als standardmäßiger Urlaubsgenehmiger festgesetzt
 DocType: Tax Rule,Shipping County,Versand-Landesbezirk/-Gemeinde/-Kreis
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Lernen
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Lernen
 DocType: Asset,Next Depreciation Date,Nächstes Abschreibungsdatum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivitätskosten je Mitarbeiter
 DocType: Accounts Settings,Settings for Accounts,Konteneinstellungen
@@ -398,13 +411,13 @@
 DocType: Item,Synced With Hub,Synchronisiert mit Hub
 DocType: Vehicle,Fleet Manager,Flottenmanager
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} kann für Artikel nicht negativ sein {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Falsches Passwort
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Falsches Passwort
 DocType: Item,Variant Of,Variante von
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"Gefertigte Menge kann nicht größer sein als ""Menge für Herstellung"""
 DocType: Period Closing Voucher,Closing Account Head,Bezeichnung des Abschlusskontos
 DocType: Employee,External Work History,Externe Arbeits-Historie
 DocType: Physician,Time per Appointment,Zeit pro Termin
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Zirkelschluss-Fehler
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Zirkelschluss-Fehler
 DocType: Appointment Type,Is Inpatient,Ist stationär
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 Namen
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"""In Worten (Export)"" wird sichtbar, sobald Sie den Lieferschein speichern."
@@ -413,19 +426,18 @@
 DocType: Lead,Industry,Industrie
 DocType: Employee,Job Profile,Stellenbeschreibung
 DocType: BOM Item,Rate & Amount,Rate &amp; Betrag
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Bitte nummerieren Sie die Nummerierung für die Teilnahme über Setup&gt; Nummerierung Serie
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Dies beruht auf Transaktionen gegen diese Gesellschaft. Siehe Zeitleiste unten für Details
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Bei Erstellung einer automatischen Materialanfrage per E-Mail benachrichtigen
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Beständig
 DocType: Journal Entry,Multi Currency,Unterschiedliche Währungen
 DocType: Payment Reconciliation Invoice,Invoice Type,Rechnungstyp
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundengruppe&gt; Territorium
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Lieferschein
 DocType: Consultation,Encounter Impression,Begegnung Eindruck
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Steuern einrichten
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Herstellungskosten der verkauften Vermögens
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Herstellungskosten des verkauften Vermögens
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,"Zahlungsbuchung wurde geändert, nachdem sie abgerufen wurde. Bitte erneut abrufen."
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} in Artikelsteuer doppelt eingegeben
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Zusammenfassung für diese Woche und anstehende Aktivitäten
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} in Artikelsteuer doppelt eingegeben
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Zusammenfassung für diese Woche und anstehende Aktivitäten
 DocType: Student Applicant,Admitted,Zugelassen
 DocType: Workstation,Rent Cost,Mietkosten
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Betrag nach Abschreibungen
@@ -439,40 +451,39 @@
 DocType: Shipping Rule,Valid for Countries,Gültig für folgende Länder
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Dieser Artikel ist eine Vorlage und kann nicht in Transaktionen verwendet werden. Artikelattribute werden in die Varianten kopiert, es sein denn es wurde ""nicht kopieren"" ausgewählt"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Geschätzte Summe der Bestellungen
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Mitarbeiterbezeichnung (z. B. Geschäftsführer, Direktor etc.)"
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Mitarbeiterbezeichnung (z. B. Geschäftsführer, Direktor etc.)"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Kurs, zu dem die Kundenwährung in die Basiswährung des Kunden umgerechnet wird"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kursplanung Werkzeug
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Kauf Rechnung kann nicht gegen einen bereits bestehenden Asset vorgenommen werden {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Dringend] Fehler beim Erstellen von wiederkehrenden% s für% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Dringend] Fehler beim Erstellen von wiederkehrenden% s für% s
 DocType: Item Tax,Tax Rate,Steuersatz
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} bereits an Mitarbeiter {1} zugeteilt für den Zeitraum {2} bis {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Artikel auswählen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Artikel auswählen
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Eingangsrechnung {0} wurde bereits übertragen
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Zeile # {0}: Chargennummer muss dieselbe sein wie {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,In nicht-Gruppe umwandeln
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Charge (Los) eines Artikels
 DocType: C-Form Invoice Detail,Invoice Date,Rechnungsdatum
 DocType: GL Entry,Debit Amount,Soll-Betrag
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Es kann nur EIN Konto pro Unternehmen in {0} {1} geben
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Bitte Anhang beachten
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Es kann nur EIN Konto pro Unternehmen in {0} {1} geben
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Bitte Anhang beachten
 DocType: Purchase Order,% Received,% erhalten
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Erstellen Studentengruppen
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Einrichtungsvorgang bereits abgeschlossen!!
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Studentengruppen erstellen
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Einrichtungsvorgang bereits abgeschlossen!!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Gutschriftbetrag
-DocType: Setup Progress Action,Action Document,Handlungsdokument
+DocType: Setup Progress Action,Action Document,Aktions-Dokument
 ,Finished Goods,Fertigerzeugnisse
 DocType: Delivery Note,Instructions,Anweisungen
-DocType: Quality Inspection,Inspected By,Geprüft von
+DocType: Quality Inspection,Inspected By,kontrolliert durch
 DocType: Maintenance Visit,Maintenance Type,Wartungstyp
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} ist nicht im Kurs {2} eingeschrieben
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Artikelgruppe&gt; Marke
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} ist nicht im Kurs {2} eingeschrieben
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Seriennummer {0} gehört nicht zu Lieferschein {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Mehrere Artikel hinzufügen
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Mehrere Artikel hinzufügen
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parameter der Artikel-Qualitätsprüfung
 DocType: Leave Application,Leave Approver Name,Name des Urlaubsgenehmigers
 DocType: Depreciation Schedule,Schedule Date,Geplantes Datum
-apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Das Ergebnis, Abzüge und andere Gehaltskomponenten"
+apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Gehalt, Abzüge und andere Gehaltskomponenten"
 DocType: Packed Item,Packed Item,Verpackter Artikel
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Standardeinstellungen für Einkaufstransaktionen
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Aktivitätskosten bestehen für Arbeitnehmer {0} zur Aktivitätsart {1}
@@ -488,11 +499,11 @@
 DocType: Salary Slip Timesheet,Working Hours,Arbeitszeit
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Anfangs- / Ist-Wert eines Nummernkreises ändern.
 DocType: Dosage Strength,Strength,Stärke
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Erstellen Sie einen neuen Kunden
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Erstellen Sie einen neuen Kunden
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Wenn mehrere Preisregeln weiterhin gleichrangig gelten, werden die Benutzer aufgefordert, Vorrangregelungen manuell zu erstellen, um den Konflikt zu lösen."
-apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Erstellen von Bestellungen
+apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Bestellungen erstellen
 ,Purchase Register,Übersicht über Einkäufe
-DocType: Course Scheduling Tool,Rechedule,Rechedule
+DocType: Course Scheduling Tool,Rechedule,neu Terminieren
 DocType: Landed Cost Item,Applicable Charges,Anfallende Gebühren
 DocType: Workstation,Consumable Cost,Verbrauchskosten
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) muss die Rolle ""Urlaubsgenehmiger"" haben"
@@ -500,14 +511,14 @@
 DocType: Student Log,Medical,Medizinisch
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Grund für das Verlieren
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Lead-Besitzer können nicht gleich dem Lead sein
-apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Geschätzter Betrag kann nicht größer sein als nicht angepasster Betrag
+apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Zugeteilter Betrag kann nicht größer sein als nicht angepasster Betrag
 DocType: Announcement,Receiver,Empfänger
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Arbeitsplatz ist an folgenden Tagen gemäß der Urlaubsliste geschlossen: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Chancen
 DocType: Lab Test Template,Single,Ledig
 DocType: Salary Slip,Total Loan Repayment,Insgesamt Loan Rückzahlung
 DocType: Account,Cost of Goods Sold,Selbstkosten
-DocType: Purchase Invoice,Yearly,Jährlich
+DocType: Subscription,Yearly,Jährlich
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Bitte die Kostenstelle eingeben
 DocType: Drug Prescription,Dosage,Dosierung
 DocType: Journal Entry Account,Sales Order,Kundenauftrag
@@ -537,14 +548,14 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Allgemeine Einstellungen für alle Fertigungsprozesse
 DocType: Accounts Settings,Accounts Frozen Upto,Konten gesperrt bis
 DocType: SMS Log,Sent On,Gesendet am
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Attribut {0} mehrfach in Attributetabelle ausgewäht
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Attribut {0} mehrfach in Attributetabelle ausgewäht
 DocType: HR Settings,Employee record is created using selected field. ,Mitarbeiter-Datensatz wird erstellt anhand des ausgewählten Feldes.
 DocType: Sales Order,Not Applicable,Nicht anwenden
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Stammdaten zum Urlaub
 DocType: Request for Quotation Item,Required Date,Angefragtes Datum
 DocType: Delivery Note,Billing Address,Rechnungsadresse
 DocType: BOM,Costing,Kalkulation
-DocType: Tax Rule,Billing County,Rechnungs-Landesbezirk/-Gemeinde/-Kreis
+DocType: Tax Rule,Billing County,Rechnung: Landesbezirk - Gemeinde - Kreis
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Wenn aktiviert, wird der Steuerbetrag als bereits in den Druckkosten enthalten erachtet."
 DocType: Request for Quotation,Message for Supplier,Nachricht für Lieferanten
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Gesamtmenge
@@ -560,15 +571,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Kann die Bewertungsmethode nicht ändern, da es Transaktionen gegen einige Posten gibt, für die es keine eigene Bewertungsmethode gibt"
 apps/erpnext/erpnext/config/healthcare.py +133,Test Sample Master.,Test Muster Meister.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Die Gesamtmenge des zugeteilten Urlaubs ist zwingend erforderlich
-DocType: Patient,AB Positive,AB Positiv
+DocType: Patient,AB Positive,AB +
 DocType: Job Opening,Description of a Job Opening,Stellenbeschreibung
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Ausstehende Aktivitäten für heute
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Ausstehende Aktivitäten für heute
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Anwesenheitsnachweis
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Gehaltskomponente für Zeiterfassung basierte Abrechnung.
 DocType: Sales Order Item,Used for Production Plan,Wird für den Produktionsplan verwendet
 DocType: Employee Loan,Total Payment,Gesamtzahlung
 DocType: Manufacturing Settings,Time Between Operations (in mins),Zeit zwischen den Arbeitsgängen (in Minuten)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,"{0} {1} wurde abgebrochen, deshalb kann die Aktion nicht abgeschlossen werden"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,"{0} {1} wurde abgebrochen, deshalb kann die Aktion nicht abgeschlossen werden"
 DocType: Customer,Buyer of Goods and Services.,Käufer von Waren und Dienstleistungen.
 DocType: Journal Entry,Accounts Payable,Verbindlichkeiten
 DocType: Patient,Allergies,Allergien
@@ -580,22 +591,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Warnung Bestellungen
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Bitte ein paar Kunden angeben. Dies können Firmen oder Einzelpersonen sein.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Genug Teile zu bauen
+DocType: POS Profile User,POS Profile User,POS-Profilbenutzer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Direkte Erträge
 DocType: Patient Appointment,Date TIme,Terminzeit
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Wenn nach Konto gruppiert wurde, kann nicht auf Grundlage des Kontos gefiltert werden."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Administrativer Benutzer
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Bitte wählen Sie Kurs
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Bitte wählen Sie Kurs
 DocType: Codification Table,Codification Table,Kodifizierungstabelle
 DocType: Timesheet Detail,Hrs,Std
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Bitte Firma auswählen
 DocType: Stock Entry Detail,Difference Account,Differenzkonto
 DocType: Purchase Invoice,Supplier GSTIN,Lieferant GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Aufgabe kann nicht geschlossen werden, da die von ihr abhängige Aufgabe {0} nicht geschlossen ist."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,"Bitte das Lager eingeben, für das eine Materialanfrage erhoben wird"
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Aufgabe kann nicht geschlossen werden, da die von ihr abhängige Aufgabe {0} nicht geschlossen ist."
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Bitte das Lager eingeben, für das eine Materialanfrage erhoben wird"
 DocType: Production Order,Additional Operating Cost,Zusätzliche Betriebskosten
 DocType: Lab Test Template,Lab Routine,Laborroutine
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Um zwei Produkte zusammenzuführen, müssen folgende Eigenschaften für beide Produkte gleich sein"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Um zwei Produkte zusammenzuführen, müssen folgende Eigenschaften für beide Produkte gleich sein"
 DocType: Shipping Rule,Net Weight,Nettogewicht
 DocType: Employee,Emergency Phone,Notruf
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Kaufen
@@ -605,7 +617,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Bitte definieren Sie Grade for Threshold 0%
 DocType: Sales Order,To Deliver,Auszuliefern
 DocType: Purchase Invoice Item,Item,Artikel
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Serien-Nr Element kann nicht ein Bruchteil sein
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Hohe Empfindlichkeit
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Serien-Nr Element kann nicht ein Bruchteil sein
 DocType: Journal Entry,Difference (Dr - Cr),Differenz (Soll - Haben)
 DocType: Account,Profit and Loss,Gewinn und Verlust
 DocType: Patient,Risk Factors,Risikofaktoren
@@ -614,7 +627,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Unteraufträge vergeben
 DocType: Vital Signs,Body Temperature,Körpertemperatur
 DocType: Project,Project will be accessible on the website to these users,Projekt wird auf der Website für diese Benutzer zugänglich sein
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Projekttyp definieren
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Projekttyp definieren
 DocType: Supplier Scorecard,Weighting Function,Gewichtungsfunktion
 DocType: Physician,OP Consulting Charge,OP Beratungsgebühr
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Richten Sie Ihre
@@ -628,7 +641,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Schrittweite kann nicht 0 sein
 DocType: Production Planning Tool,Material Requirement,Materialbedarf
 DocType: Company,Delete Company Transactions,Löschen der Transaktionen dieser Firma
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Referenznummer und Referenzdatum ist obligatorisch für Bankengeschäft
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Referenznummer und Referenzdatum ist obligatorisch für Bankengeschäft
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Hinzufügen/Bearbeiten von Steuern und Abgaben
 DocType: Payment Entry Reference,Supplier Invoice No,Lieferantenrechnungsnr.
 DocType: Territory,For reference,Zu Referenzzwecken
@@ -636,12 +649,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Die Seriennummer {0} kann nicht gelöscht werden, da sie in Lagertransaktionen verwendet wird"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Schlußstand (Haben)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Hallo
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Element verschieben
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Element verschieben
 DocType: Serial No,Warranty Period (Days),Garantiefrist (Tage)
 DocType: Installation Note Item,Installation Note Item,Bestandteil des Installationshinweises
 DocType: Production Plan Item,Pending Qty,Ausstehende Menge
 DocType: Budget,Ignore,Ignorieren
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} ist nicht aktiv
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} ist nicht aktiv
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Setup-Kontrollmaße für den Druck
 DocType: Salary Slip,Salary Slip Timesheet,Gehaltszettel Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Lieferantenlager notwendig für Kaufbeleg aus Unteraufträgen
@@ -650,7 +663,7 @@
 DocType: Pricing Rule,Sales Partner,Vertriebspartner
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Alle Lieferanten-Scorecards.
 DocType: Buying Settings,Purchase Receipt Required,Kaufbeleg notwendig
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Bewertungskurs ist obligatorisch, wenn Öffnung Stock eingegeben"
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,"Bewertungskurs ist obligatorisch, wenn Öffnung Stock eingegeben"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Keine Datensätze in der Rechnungstabelle gefunden
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Bitte zuerst Firma und Gruppentyp auswählen
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Finanz-/Rechnungsjahr
@@ -687,7 +700,7 @@
 DocType: Quotation,Quotation To,Angebot für
 DocType: Lead,Middle Income,Mittleres Einkommen
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Anfangssstand (Haben)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Die Standard-Maßeinheit für Artikel {0} kann nicht direkt geändert werden, weil Sie bereits einige Transaktionen mit einer anderen Maßeinheit durchgeführt haben. Sie müssen einen neuen Artikel erstellen, um eine andere Standard-Maßeinheit verwenden zukönnen."
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Die Standard-Maßeinheit für Artikel {0} kann nicht direkt geändert werden, weil Sie bereits einige Transaktionen mit einer anderen Maßeinheit durchgeführt haben. Sie müssen einen neuen Artikel erstellen, um eine andere Standard-Maßeinheit verwenden zukönnen."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Zugewiesene Menge kann nicht negativ sein
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Bitte setzen Sie das Unternehmen
 DocType: Purchase Order Item,Billed Amt,Rechnungsbetrag
@@ -701,6 +714,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Wählen Sie Zahlungskonto zu machen Bank Eintrag
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Erstellen Sie Mitarbeiterdaten Blätter, Spesenabrechnung und Gehaltsabrechnung zu verwalten"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Verschreibungszeitraum
+DocType: Restaurant Reservation,Restaurant Reservation,Restaurant Reservierung
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Verfassen von Angeboten
 DocType: Payment Entry Deduction,Payment Entry Deduction,Zahlungsabzug
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Ein weiterer Vertriebsmitarbeiter {0} existiert bereits mit der gleichen Mitarbeiter ID
@@ -708,16 +722,17 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Stämme
 DocType: Assessment Plan,Maximum Assessment Score,Maximale Beurteilung Score
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Update-Bankgeschäftstermine
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Zeiterfassung
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Zeiterfassung
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,DUPLIKAT FÜR TRANSPORTER
 DocType: Fiscal Year Company,Fiscal Year Company,Geschäftsjahr Firma
 DocType: Packing Slip Item,DN Detail,DN-Detail
 DocType: Training Event,Conference,Konferenz
 DocType: Timesheet,Billed,Abgerechnet
 DocType: Batch,Batch Description,Chargenbeschreibung
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Schaffung von Studentengruppen
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Payment Gateway-Konto nicht erstellt haben, erstellen Sie bitte ein manuell."
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Erstelle Studentengruppen
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Payment Gateway-Konto nicht erstellt haben, erstellen Sie bitte ein manuell."
 DocType: Supplier Scorecard,Per Year,Pro Jahr
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Nicht für die Aufnahme in dieses Programm nach DOB geeignet
 DocType: Sales Invoice,Sales Taxes and Charges,Umsatzsteuern und Gebühren auf den Verkauf
 DocType: Employee,Organization Profile,Firmenprofil
 DocType: Vital Signs,Height (In Meter),Höhe (In Meter)
@@ -731,14 +746,14 @@
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Einzelheiten zu Rechnungs-/Journalbuchungen
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' nicht im Geschäftsjahr {2}
 DocType: Buying Settings,Settings for Buying Module,Einstellungen Einkauf
-apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Asset-{0} gehört nicht zur Gesellschaft {1}
+apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Anlagewert-{0} gehört nicht zur Firma {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,Bitte zuerst Kaufbeleg eingeben
 DocType: Buying Settings,Supplier Naming By,Bezeichnung des Lieferanten nach
 DocType: Activity Type,Default Costing Rate,Standardkosten
 DocType: Maintenance Schedule,Maintenance Schedule,Wartungsplan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Dann werden Preisregeln bezogen auf Kunde, Kundengruppe, Region, Lieferant, Lieferantentyp, Kampagne, Vertriebspartner usw. ausgefiltert"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Nettoveränderung des Bestands
-apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Mitarbeiter Darlehensverwaltung
+apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Verwaltung der Mitarbeiterdarlehen
 DocType: Employee,Passport Number,Passnummer
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Beziehung mit Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +120,Manager,Leiter
@@ -753,7 +768,7 @@
 DocType: Student Batch Name,Batch Name,Chargenname
 DocType: Fee Validity,Max number of visit,Maximaler Besuch
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet erstellt:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},"Bitte Standardeinstellungen für Kassen- oder Bankkonto in ""Zahlungsart"" {0} setzen"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},"Bitte Standardeinstellungen für Kassen- oder Bankkonto in ""Zahlungsart"" {0} setzen"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,Einschreiben
 DocType: GST Settings,GST Settings,GST-Einstellungen
 DocType: Selling Settings,Customer Naming By,Benennung der Kunden nach
@@ -762,7 +777,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,In Gruppe umwandeln
 DocType: Activity Cost,Activity Type,Aktivitätsart
 DocType: Request for Quotation,For individual supplier,Für einzelne Anbieter
-DocType: BOM Operation,Base Hour Rate(Company Currency),Basis Stunden-Rate (Gesellschaft Währung)
+DocType: BOM Operation,Base Hour Rate(Company Currency),Basis Stundensatz (Gesellschaft Währung)
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Gelieferte Menge
 DocType: Supplier,Fixed Days,Stichtage
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests,Labortests
@@ -785,15 +800,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Einstandspreis Steuern und Gebühren
 DocType: Production Order Operation,Actual Start Time,Tatsächliche Startzeit
 DocType: BOM Operation,Operation Time,Zeit für einen Arbeitsgang
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Fertig
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Base
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Fertig
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Basis
 DocType: Timesheet,Total Billed Hours,Insgesamt Angekündigt Stunden
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Abschreibungs-Betrag
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Abschreibungs-Betrag
 DocType: Leave Block List Allow,Allow User,Benutzer zulassen
 DocType: Journal Entry,Bill No,Rechnungsnr.
 DocType: Company,Gain/Loss Account on Asset Disposal,Gewinn / Verlustrechnung auf die Veräußerung von Vermögenswerten
 DocType: Vehicle Log,Service Details,Service Details
-DocType: Purchase Invoice,Quarterly,Quartalsweise
+DocType: Subscription,Quarterly,Quartalsweise
 DocType: Lab Test Template,Grouped,Gruppiert
 DocType: Selling Settings,Delivery Note Required,Lieferschein erforderlich
 DocType: Bank Guarantee,Bank Guarantee Number,Bankgarantie Nummer
@@ -802,14 +817,14 @@
 DocType: Student Attendance,Student Attendance,Schülerzahl
 DocType: Sales Invoice Timesheet,Time Sheet,Zeitblatt
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Rückmeldung Rohmaterialien auf Basis von
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Bitte Artikel-Details angeben
-DocType: Interest,Interest,Interessieren
+DocType: Interest,Interest,Zinsen
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Vorverkauf
 DocType: Purchase Receipt,Other Details,Sonstige Einzelheiten
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Lab Test,Test Template,Testvorlage
+DocType: Restaurant Order Entry Item,Served,Serviert
 DocType: Account,Accounts,Rechnungswesen
-DocType: Vehicle,Odometer Value (Last),Odometer Wert (Last)
+DocType: Vehicle,Odometer Value (Last),(letzter) Tachostand
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Vorlagen der Lieferanten-Scorecard-Kriterien.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +290,Payment Entry is already created,Payment Eintrag bereits erstellt
@@ -819,44 +834,45 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Vorschau Gehaltsabrechnung
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Konto {0} wurde mehrmals eingegeben
 DocType: Account,Expenses Included In Valuation,In der Bewertung enthaltene Aufwendungen
-DocType: Hub Settings,Seller City,Stadt des Verkäufers
 ,Absent Student Report,Bericht: Abwesende Studenten
 DocType: Email Digest,Next email will be sent on:,Nächste E-Mail wird gesendet am:
 DocType: Offer Letter Term,Offer Letter Term,Gültigkeit des Angebotsschreibens
 DocType: Supplier Scorecard,Per Week,Pro Woche
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Artikel hat Varianten.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Artikel hat Varianten.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Gesamtstudent
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Artikel {0} nicht gefunden
 DocType: Bin,Stock Value,Lagerwert
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,Fee-Aufzeichnungen werden im Hintergrund erstellt. Im Falle eines Fehlers wird die Fehlermeldung im Zeitplan aktualisiert.
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,Gebühren-Aufzeichnungen werden im Hintergrund erstellt. Im Falle eines Fehlers wird die Fehlermeldung im Zeitplan aktualisiert.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Gesellschaft {0} existiert nicht
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} hat die Gültigkeitsdauer bis {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} hat die Gültigkeitsdauer bis {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Struktur-Typ
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Verbrauchte Menge pro Einheit
 DocType: Serial No,Warranty Expiry Date,Ablaufsdatum der Garantie
 DocType: Material Request Item,Quantity and Warehouse,Menge und Lager
+DocType: Hub Settings,Unregister,Registrierung aufheben
 DocType: Sales Invoice,Commission Rate (%),Provisionssatz (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Bitte wählen Sie Programm
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Bitte wählen Sie Programm
 DocType: Project,Estimated Cost,Geschätzte Kosten
-DocType: Purchase Order,Link to material requests,Link zu Materialanforderungen
+DocType: Purchase Order,Link to material requests,mit Materialanforderungen verknüpfen
+DocType: Hub Settings,Publish,Veröffentlichen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Luft- und Raumfahrt
 DocType: Journal Entry,Credit Card Entry,Kreditkarten-Buchung
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Firma und Konten
-apps/erpnext/erpnext/config/healthcare.py +108,Appointment Type Master,Terminart Master
+apps/erpnext/erpnext/config/healthcare.py +108,Appointment Type Master,Termintyp-Master
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,Von Lieferanten erhaltene Ware
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +58,In Value,Wert bei
 DocType: Lead,Campaign Name,Kampagnenname
-DocType: Selling Settings,Close Opportunity After Days,Schließen Gelegenheit nach Tagen
+DocType: Selling Settings,Close Opportunity After Days,Gelegenheit schliessen nach
 ,Reserved,Reserviert
 DocType: Purchase Order,Supply Raw Materials,Rohmaterial bereitstellen
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Das Datum, an dem die nächste Rechnung erstellt wird. Erstellung erfolgt beim Übertragen."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Umlaufvermögen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} ist kein Lagerartikel
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',"Bitte teilen Sie Ihr Feedback mit dem Training ab, indem Sie auf &#39;Training Feedback&#39; und dann &#39;New&#39; klicken."
 DocType: Mode of Payment Account,Default Account,Standardkonto
 DocType: Payment Entry,Received Amount (Company Currency),Erhaltene Menge (Gesellschaft Währung)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,"Lead muss eingestellt werden, wenn eine Opportunity aus dem Lead entsteht"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,"Lead muss eingestellt werden, wenn eine Opportunity aus dem Lead entsteht"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Bitte die wöchentlichen Auszeittage auswählen
-DocType: Patient,O Negative,O Negativ
+DocType: Patient,O Negative,0 -
 DocType: Production Order Operation,Planned End Time,Geplante Endzeit
 ,Sales Person Target Variance Item Group-Wise,Artikelgruppenbezogene Zielabweichung des Vertriebsmitarbeiters
 apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Ein Konto mit bestehenden Transaktionen kann nicht in ein Kontoblatt umgewandelt werden
@@ -870,10 +886,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Chance von
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Monatliche Gehaltsabrechnung
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Unternehmen hinzufügen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Zeile {0}: {1} Für den Eintrag {2} benötigte Seriennummern. Du hast {3} zur Verfügung gestellt.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Zeile {0}: {1} Für den Eintrag {2} benötigte Seriennummern. Du hast {3} zur Verfügung gestellt.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Bitte wählen Sie eine Tabelle
 DocType: BOM,Website Specifications,Webseiten-Spezifikationen
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',"{0} ist eine ungültige E-Mail-Adresse in ""Empfänger"""
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',"{0} ist eine ungültige E-Mail-Adresse in ""Empfänger"""
 DocType: Special Test Items,Particulars,Einzelheiten
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiotikum.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Von {0} vom Typ {1}
@@ -881,11 +897,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Row {0}: Umrechnungsfaktor ist zwingend erfoderlich
 DocType: Employee,A+,A+
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Es sind mehrere Preisregeln mit gleichen Kriterien vorhanden, lösen Sie Konflikte, indem Sie Prioritäten zuweisen. Preis Regeln: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Stückliste kann nicht deaktiviert oder storniert werden, weil sie mit anderen Stücklisten verknüpft ist"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Stückliste kann nicht deaktiviert oder storniert werden, weil sie mit anderen Stücklisten verknüpft ist"
 DocType: Opportunity,Maintenance,Wartung
 DocType: Item Attribute Value,Item Attribute Value,Attributwert des Artikels
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Vertriebskampagnen
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Machen Sie Timesheet
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Machen Sie Timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -932,8 +948,8 @@
 DocType: Lab Test,Lab Test,Labortest
 DocType: Expense Claim Detail,Expense Claim Type,Art der Aufwandsabrechnung
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardeinstellungen für den Warenkorb
-apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +26,Add Timeslots,Timeslots hinzufügen
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Asset-verschrottet über Journaleintrag {0}
+apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +26,Add Timeslots,Zeitfenster hinzufügen
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Gegenstand entsorgt über Journaleintrag {0}
 DocType: Employee Loan,Interest Income Account,Zinserträge Konto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotechnologie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Büro-Wartungskosten
@@ -942,12 +958,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Bitte zuerst den Artikel angeben
 DocType: Account,Liability,Verbindlichkeit
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Genehmigter Betrag kann nicht größer als geforderter Betrag in Zeile {0} sein.
+DocType: Salary Detail,Do not include in total,Nicht in Summe
 DocType: Company,Default Cost of Goods Sold Account,Standard-Herstellkosten
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Preisliste nicht ausgewählt
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Preisliste nicht ausgewählt
 DocType: Employee,Family Background,Familiärer Hintergrund
 DocType: Request for Quotation Supplier,Send Email,E-Mail absenden
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Warnung: Ungültige Anlage {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Keine Berechtigung
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Warnung: Ungültige Anlage {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Keine Berechtigung
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Angebot angefordert
 DocType: Vital Signs,Heart Rate / Pulse,Herzfrequenz / Puls
 DocType: Company,Default Bank Account,Standardbankkonto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Um auf der Grundlage von Gruppen zu filtern, bitte zuerst den Gruppentyp wählen"
@@ -966,7 +984,7 @@
 DocType: Warehouse,Tree Details,Baum-Details
 DocType: Training Event,Event Status,Event Status
 ,Support Analytics,Support-Analyse
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +352,"If you have any questions, please get back to us.","Wenn Sie Fragen haben, wenden Sie sich bitte an uns zurück zu bekommen."
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +352,"If you have any questions, please get back to us.","Wenn Sie Fragen haben, wenden Sie sich bitte an uns."
 DocType: Item,Website Warehouse,Webseiten-Lager
 DocType: Payment Reconciliation,Minimum Invoice Amount,Mindestabrechnung
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Kostenstelle {2} gehört nicht zur Firma {3}
@@ -974,17 +992,16 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Artikel Row {idx}: {} {Doctype docname} existiert nicht in der oben &#39;{Doctype}&#39; Tisch
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} ist bereits abgeschlossen oder abgebrochen
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,keine Vorgänge
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Der Tag des Monats, an welchem eine automatische Rechnung erstellt wird, z. B. 05, 28 usw."
-DocType: Item Variant Settings,Copy Fields to Variant,Kopiere Felder auf Variant
+DocType: Item Variant Settings,Copy Fields to Variant,Kopiere Felder auf Varianten
 DocType: Asset,Opening Accumulated Depreciation,Öffnungs Kumulierte Abschreibungen
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Punktzahl muß kleiner oder gleich 5 sein
 DocType: Program Enrollment Tool,Program Enrollment Tool,Programm-Enrollment-Tool
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,Kontakt-Formular Datensätze
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,Kontakt-Formular Datensätze
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Kunde und Lieferant
 DocType: Email Digest,Email Digest Settings,Einstellungen zum täglichen E-Mail-Bericht
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Vielen Dank für Ihr Unternehmen!
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Support-Anfragen von Kunden
-DocType: Setup Progress Action,Action Doctype,Aktion Doctype
+DocType: Setup Progress Action,Action Doctype,Aktions-Doctype
 ,Production Order Stock Report,Fertigungsauftrag Stock Report
 apps/erpnext/erpnext/config/healthcare.py +148,Sensitivity Naming.,Empfindlichkeitsnaming.
 DocType: HR Settings,Retirement Age,Rentenalter
@@ -997,13 +1014,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Zitat Status
 DocType: Maintenance Visit,Completion Status,Fertigstellungsstatus
 DocType: HR Settings,Enter retirement age in years,Geben Sie das Rentenalter in Jahren
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Eingangslager
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Bitte wählen Sie ein Lager aus
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Eingangslager
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Bitte wählen Sie ein Lager aus
 DocType: Cheque Print Template,Starting location from left edge,Startposition vom linken Rand
 DocType: Item,Allow over delivery or receipt upto this percent,Überlieferung bis zu diesem Prozentsatz zulassen
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Import von Anwesenheiten
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Alle Artikelgruppen
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Alle Artikelgruppen
 DocType: Process Payroll,Activity Log,Aktivitätsprotokoll
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Nettogewinn/-verlust
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatisch beim Übertragen von Transaktionen Mitteilungen verfassen
@@ -1015,9 +1032,10 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Geplante Menge
 DocType: Sales Invoice,Payment Due Date,Zahlungsstichtag
 DocType: Drug Prescription,Interval UOM,Intervall UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert bereits
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert bereits
+DocType: Item,Hub Publishing Details,Hub-Veröffentlichungsdetails
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',"""Eröffnung"""
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,To do unbearbeitet
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,offene Aufgaben
 DocType: Notification Control,Delivery Note Message,Lieferschein-Nachricht
 DocType: Lab Test Template,Result Format,Ergebnisformat
 DocType: Expense Claim,Expenses,Ausgaben
@@ -1032,19 +1050,20 @@
 DocType: Item Reorder,Re-Order Qty,Nachbestellmenge
 DocType: Leave Block List Date,Leave Block List Date,Urlaubssperrenliste Datum
 DocType: Pricing Rule,Price or Discount,Preis oder Rabatt
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,Stückliste # {0}: Rohstoff kann nicht gleich sein wie Hauptgegenstand
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,Stückliste # {0}: Rohstoff kann nicht gleich dem Artikel sein.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Gesamt Die Gebühren in Kauf Eingangspositionen Tabelle muss als Gesamt Steuern und Abgaben gleich sein
 DocType: Sales Team,Incentives,Anreize
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Registrieren Sie sich für Hub
 DocType: SMS Log,Requested Numbers,Angeforderte Nummern
 DocType: Production Planning Tool,Only Obtain Raw Materials,Erhalten Sie nur Rohstoffe
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Mitarbeiterbeurteilung
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Aktivieren &quot;Verwendung für Einkaufswagen&quot;, wie Einkaufswagen aktiviert ist und es sollte mindestens eine Steuerregel für Einkaufswagen sein"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Aktivieren &quot;Verwendung für Einkaufswagen&quot;, wie Einkaufswagen aktiviert ist und es sollte mindestens eine Steuerregel für Einkaufswagen sein"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Zahlung {0} ist mit der Bestellung {1} verknüpft, überprüfen Sie bitte, ob es als Anteil in dieser Rechnung gezogen werden sollte."
 DocType: Sales Invoice Item,Stock Details,Lagerdetails
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projektwert
 apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Verkaufsstelle
-DocType: Fee Schedule,Fee Creation Status,Fee-Erstellungsstatus
-DocType: Vehicle Log,Odometer Reading,Kilometerstand
+DocType: Fee Schedule,Fee Creation Status,Status Gebührenermittlung
+DocType: Vehicle Log,Odometer Reading,Tachostand
 apps/erpnext/erpnext/accounts/doctype/account/account.py +119,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konto bereits im Haben, es ist nicht mehr möglich das Konto als Sollkonto festzulegen"
 DocType: Account,Balance must be,Saldo muss sein
 DocType: Hub Settings,Publish Pricing,Preise veröffentlichen
@@ -1052,17 +1071,19 @@
 ,Available Qty,Verfügbare Menge
 DocType: Purchase Taxes and Charges,On Previous Row Total,Auf vorherige Zeilensumme
 DocType: Purchase Invoice Item,Rejected Qty,Abgelehnt Menge
-DocType: Setup Progress Action,Action Field,Aktionsfeld
+DocType: Setup Progress Action,Action Field,Aktions-Feld
 DocType: Healthcare Settings,Manage Customer,Kunden verwalten
 DocType: Salary Slip,Working Days,Arbeitstage
 DocType: Serial No,Incoming Rate,Eingangsbewertung
 DocType: Packing Slip,Gross Weight,Bruttogewicht
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,"Name der Firma, für die dieses System eingerichtet wird."
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Hub aktivieren
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,"Name der Firma, für die dieses System eingerichtet wird."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Urlaub in die Gesamtzahl der Arbeitstage mit einbeziehen
 DocType: Job Applicant,Hold,Anhalten
 DocType: Employee,Date of Joining,Eintrittsdatum
 DocType: Naming Series,Update Series,Nummernkreise aktualisieren
 DocType: Supplier Quotation,Is Subcontracted,Ist Untervergabe
+DocType: Restaurant Table,Minimum Seating,Mindestbestuhlung
 DocType: Item Attribute,Item Attribute Values,Artikel-Attributwerte
 DocType: Examination Result,Examination Result,Prüfungsergebnis
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Kaufbeleg
@@ -1073,13 +1094,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},In den nächsten {0} Tagen kann für den Arbeitsgang {1} kein Zeitfenster gefunden werden
 DocType: Production Order,Plan material for sub-assemblies,Materialplanung für Unterbaugruppen
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Vertriebspartner und Territorium
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,Stückliste {0} muss aktiv sein
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,Stückliste {0} muss aktiv sein
 DocType: Journal Entry,Depreciation Entry,Abschreibungs Eintrag
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Bitte zuerst den Dokumententyp auswählen
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Materialkontrolle {0} stornieren vor Abbruch dieses Wartungsbesuchs
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Seriennummer {0} gehört nicht zu Artikel {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Erforderliche Anzahl
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Lagerhäuser mit bestehenden Transaktion kann nicht in Ledger umgewandelt werden.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Lagerhäuser mit bestehenden Transaktion kann nicht in Ledger umgewandelt werden.
 DocType: Bank Reconciliation,Total Amount,Gesamtsumme
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Veröffentlichung im Internet
 DocType: Prescription Duration,Number,Nummer
@@ -1090,7 +1111,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Verkaufspreisliste
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Wenn aktiviert, wird ein Kunde erstellt, der Patient zugeordnet ist. Patientenrechnungen werden gegen diesen Kunden angelegt. Sie können den vorhandenen Kunden auch beim Erstellen von Patient auswählen."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,"Veröffentlichen, um Elemente zu synchronisieren"
 DocType: Bank Reconciliation,Account Currency,Kontenwährung
 DocType: Lab Test,Sample ID,Muster-ID
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Bitte Abschlusskonto in Firma vermerken
@@ -1099,11 +1119,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Mitarbeiter {0} ist nicht aktiv oder existiert nicht
 DocType: Fee Structure,Components,Komponenten
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Bitte geben Sie Anlagekategorie in Artikel {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Artikelvarianten {0} aktualisiert
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Artikelvarianten {0} aktualisiert
 DocType: Quality Inspection Reading,Reading 6,Ablesewert 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Kann nicht {0} {1} {2} ohne negative ausstehende Rechnung
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","erzeugt werden Wenn Sie verspätet sind, müssen Sie das Feld &quot;Wiederholen am Tag des Monats&quot; manuell ändern"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Kann nicht {0} {1} {2} ohne negative ausstehende Rechnung
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Vorkasse zur Eingangsrechnung
-DocType: Hub Settings,Sync Now,Jetzt synchronisieren
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Zeile {0}: Habenbuchung kann nicht mit ein(em) {1} verknüpft werden
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Budget für ein Geschäftsjahr angeben.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Standard Bank-/Geldkonto wird automatisch in Kassenbon aktualisiert, wenn dieser Modus ausgewählt ist."
@@ -1111,17 +1132,17 @@
 DocType: Employee,Permanent Address Is,Feste Adresse ist
 DocType: Production Order Operation,Operation completed for how many finished goods?,Für wie viele fertige Erzeugnisse wurde der Arbeitsgang abgeschlossen?
 apps/erpnext/erpnext/public/js/setup_wizard.js +47,The Brand,Die Marke
-DocType: Employee,Exit Interview Details,Details zum Austrittsgespräch verlassen
+DocType: Employee,Exit Interview Details,Details zum Austrittsgespräch
 DocType: Item,Is Purchase Item,Ist Einkaufsartikel
 DocType: Asset,Purchase Invoice,Eingangsrechnung
 DocType: Stock Ledger Entry,Voucher Detail No,Belegdetail-Nr.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Neue Ausgangsrechnung
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Neue Ausgangsrechnung
 DocType: Stock Entry,Total Outgoing Value,Gesamtwert Auslieferungen
 DocType: Physician,Appointments,Termine
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Eröffnungsdatum und Abschlussdatum sollten im gleichen Geschäftsjahr sein
 DocType: Lead,Request for Information,Informationsanfrage
 ,LeaderBoard,Bestenliste
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Sync Offline-Rechnungen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Sync Offline-Rechnungen
 DocType: Payment Request,Paid,Bezahlt
 DocType: Program Fee,Program Fee,Programmgebühr
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1140,11 +1161,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Lieferantenauftrags-Artikel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Indirekte Erträge
 DocType: Student Attendance Tool,Student Attendance Tool,Schülerteilnahme Werkzeug
+DocType: Restaurant Menu,Price List (Auto created),Preisliste (automatisch erstellt)
 DocType: Cheque Print Template,Date Settings,Datums-Einstellungen
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Abweichung
 ,Company Name,Firmenname
 DocType: SMS Center,Total Message(s),Summe Nachricht(en)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Artikel für Übertrag auswählen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Artikel für Übertrag auswählen
 DocType: Purchase Invoice,Additional Discount Percentage,Zusätzlicher prozentualer Rabatt
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Sehen Sie eine Liste aller Hilfe-Videos
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Bezeichnung des Kontos bei der Bank, bei der der Scheck eingereicht wurde, auswählen."
@@ -1161,9 +1183,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Meter
 DocType: Workstation,Electricity Cost,Stromkosten
 DocType: HR Settings,Don't send Employee Birthday Reminders,Keine Mitarbeitergeburtstagserinnerungen senden
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Einstellungen speichern
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Angeforderte Produkte
 DocType: Item,Inspection Criteria,Prüfkriterien
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Übergeben
-DocType: BOM Website Item,BOM Website Item,BOM Webseite Artikel
+DocType: BOM Website Item,BOM Website Item,BOM Webseitenartikel
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,Upload your letter head and logo. (you can edit them later).,Briefkopf und Logo hochladen. (Beides kann später noch bearbeitet werden.)
 DocType: Timesheet Detail,Bill,Rechnung
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Weiter Abschreibungen Datum wird als vergangenes Datum eingegeben
@@ -1173,15 +1197,15 @@
 DocType: Purchase Invoice,Get Advances Paid,Gezahlte Anzahlungen aufrufen
 DocType: Item,Automatically Create New Batch,Automatisch neue Charge erstellen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Make ,Erstellen
-DocType: Student Admission,Admission Start Date,Der Eintritt Startdatum
+DocType: Student Admission,Admission Start Date,Stichtag zum Zulassungsbeginn
 DocType: Journal Entry,Total Amount in Words,Gesamtsumme in Worten
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Es ist ein Fehler aufgetreten. Ein möglicher Grund könnte sein, dass Sie das Formular nicht gespeichert haben. Bitte kontaktieren Sie support@erpnext.com wenn das Problem weiterhin besteht."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Mein Warenkorb
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Bestelltyp muss aus {0} sein
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Bestelltyp muss aus {0} sein
 DocType: Lead,Next Contact Date,Nächstes Kontaktdatum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Anfangsmenge
 DocType: Healthcare Settings,Appointment Reminder,Termin Erinnerung
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Bitte geben Sie Konto für Änderungsbetrag
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Bitte geben Sie Konto für Änderungsbetrag
 DocType: Student Batch Name,Student Batch Name,Studentenstapelname
 DocType: Consultation,Doctor,Arzt
 DocType: Holiday List,Holiday List Name,Urlaubslistenname
@@ -1189,12 +1213,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Unterrichtszeiten
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Lager-Optionen
 DocType: Journal Entry Account,Expense Claim,Aufwandsabrechnung
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Wollen Sie wirklich dieses verschrottet Asset wiederherzustellen?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Menge für {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Wollen Sie dieses entsorgte Gut wirklich wiederherstellen?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Menge für {0}
 DocType: Leave Application,Leave Application,Urlaubsantrag
 DocType: Patient,Patient Relation,Patientenbeziehung
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Urlaubszuordnungs-Werkzeug
+DocType: Item,Hub Category to Publish,Zu veröffentlichende Hub-Kategorie
 DocType: Leave Block List,Leave Block List Dates,Urlaubssperrenliste Termine
+DocType: Sales Invoice,Billing Address GSTIN,Rechnungsadresse Steuernummer
 DocType: Workstation,Net Hour Rate,Nettostundensatz
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Einstandspreis-Kaufbeleg
 DocType: Company,Default Terms,Allgemeine Geschäftsbedingungen
@@ -1204,18 +1230,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Bitte geben Sie eine {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Artikel wurden ohne Veränderung der Menge oder des Wertes entfernt.
 DocType: Delivery Note,Delivery To,Lieferung an
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Attributtabelle ist zwingend erforderlich
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Attributtabelle ist zwingend erforderlich
 DocType: Production Planning Tool,Get Sales Orders,Kundenaufträge aufrufen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} kann nicht negativ sein
 DocType: Training Event,Self-Study,Selbststudium
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Rabatt
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Rabatt
 DocType: Asset,Total Number of Depreciations,Gesamtzahl der abschreibungen
-DocType: Sales Invoice Item,Rate With Margin,Bewerten Sie mit Margin
+DocType: Sales Invoice Item,Rate With Margin,Betrag mit Marge
 DocType: Workstation,Wages,Lohn
 DocType: Task,Urgent,Dringend
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Bitte eine gültige Zeilen-ID für die Zeile {0} in Tabelle {1} angeben
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Variable kann nicht gefunden werden:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Bitte wähle ein Feld aus numpad aus
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Bitte wähle ein Feld aus numpad aus
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Gehen Sie zum Desktop und starten Sie ERPNext
 DocType: Item,Manufacturer,Hersteller
 DocType: Landed Cost Item,Purchase Receipt Item,Kaufbeleg-Artikel
@@ -1228,7 +1254,7 @@
 DocType: Serial No,Creation Document No,Belegerstellungs-Nr.
 DocType: Issue,Issue,Anfrage
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation_dashboard.py +11,Records,Aufzeichnungen
-DocType: Asset,Scrapped,Verschrottet
+DocType: Asset,Scrapped,Entsorgt
 apps/erpnext/erpnext/config/stock.py +200,"Attributes for Item Variants. e.g Size, Color etc.","Attribute für Artikelvarianten, z. B. Größe, Farbe usw."
 DocType: Purchase Invoice,Returns,Kehrt zurück
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,Fertigungslager
@@ -1246,8 +1272,8 @@
 DocType: GL Entry,Against,Zu
 DocType: Item,Default Selling Cost Center,Standard-Vertriebskostenstelle
 DocType: Sales Partner,Implementation Partner,Umsetzungspartner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Postleitzahl
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Kundenauftrag {0} ist {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Postleitzahl
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Kundenauftrag {0} ist {1}
 DocType: Opportunity,Contact Info,Kontakt-Information
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Lagerbuchungen erstellen
 DocType: Packing Slip,Net Weight UOM,Nettogewichtmaßeinheit
@@ -1258,6 +1284,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Wöchentliche Abwesenheitstermine abrufen
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Enddatum kann nicht vor Startdatum liegen
 DocType: Sales Person,Select company name first.,Zuerst den Firmennamen auswählen.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Tief bis hoch
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Angebote von Lieferanten
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Ersetzen Sie die Stückliste und aktualisieren Sie den aktuellen Preis in allen Stücklisten
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},An {0} | {1} {2}
@@ -1274,9 +1301,9 @@
 DocType: Upload Attendance,Attendance From Date,Anwesenheit von Datum
 DocType: Appraisal Template Goal,Key Performance Area,Entscheidender Leistungsbereich
 DocType: Program Enrollment,Transportation,Transport
-apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Invalid Attribute
+apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Ungültige Attribute
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} muss vorgelegt werden
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Menge muss kleiner oder gleich {0} sein
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Menge muss kleiner oder gleich {0} sein
 DocType: SMS Center,Total Characters,Gesamtanzahl Zeichen
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Bitte aus dem Stücklistenfeld eine Stückliste für Artikel {0} auswählen
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Kontakt-Formular Rechnungsdetail
@@ -1291,7 +1318,7 @@
 ,Ordered Items To Be Billed,"Bestellte Artikel, die abgerechnet werden müssen"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Von-Bereich muss kleiner sein als Bis-Bereich
 DocType: Global Defaults,Global Defaults,Allgemeine Voreinstellungen
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Projekt-Zusammenarbeit Einladung
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Projekt-Zusammenarbeit Einladung
 DocType: Salary Slip,Deductions,Abzüge
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Aktionsname
@@ -1308,14 +1335,14 @@
 ,GST Sales Register,GST Verkaufsregister
 DocType: Sales Invoice Advance,Sales Invoice Advance,Anzahlung auf Ausgangsrechnung
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Nichts anzufragen
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Ein weiteres Budget record &#39;{0}&#39; existiert bereits gegen {1} {2} &#39;für das Geschäftsjahr {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"Das ""Tatsächliche Startdatum"" kann nicht nach dem  ""Tatsächlichen Enddatum"" liegen"
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Ein weitere Budgetplan  '{0}' existiert bereits gegen {1} {2} 'für das Geschäftsjahr {3}
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"Das ""Tatsächliche Startdatum"" kann nicht nach dem  ""Tatsächlichen Enddatum"" liegen"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Verwaltung
 DocType: Cheque Print Template,Payer Settings,Payer Einstellungen
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dies wird an den Artikelcode der Variante angehängt. Beispiel: Wenn Ihre Abkürzung ""SM"" und der Artikelcode ""T-SHIRT"" sind, so ist der Artikelcode der Variante ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettolohn (in Worten) wird angezeigt, sobald Sie die Gehaltsabrechnung speichern."
 DocType: Purchase Invoice,Is Return,Ist Rückgabe
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Vorsicht
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Vorsicht
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Return / Lastschrift
 DocType: Price List Country,Price List Country,Preisliste Land
 DocType: Item,UOMs,Maßeinheiten
@@ -1330,22 +1357,23 @@
 DocType: Account,Balance Sheet,Bilanz
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Kostenstelle für den Artikel mit der Artikel-Nr.
 DocType: Fee Validity,Valid Till,Gültig bis
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Zahlungsmittel ist nicht konfiguriert. Bitte überprüfen Sie, ob ein Konto in den Zahlungsmodi oder in einem Verkaufsstellen-Profil eingestellt wurde."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Zahlungsmittel ist nicht konfiguriert. Bitte überprüfen Sie, ob ein Konto in den Zahlungsmodi oder in einem Verkaufsstellen-Profil eingestellt wurde."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Das gleiche Einzelteil kann nicht mehrfach eingegeben werden.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Weitere Konten können unter Gruppen angelegt werden, aber Buchungen können zu nicht-Gruppen erstellt werden"
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Verbindlichkeiten
 DocType: Course,Course Intro,Kurs Intro
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Auf Eintrag {0} erstellt
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Bitte richten Sie die Nummerierungsserie für die Anwesenheit über Setup&gt; Nummerierungsserie ein
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Auf Eintrag {0} erstellt
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Zeile #{0}: Abgelehnte Menge kann nicht in Kaufrückgabe eingegeben werden
 ,Purchase Order Items To Be Billed,"Bei Lieferanten bestellte Artikel, die noch abgerechnet werden müssen"
 DocType: Purchase Invoice Item,Net Rate,Nettopreis
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Bitte wählen Sie einen Kunden aus
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Bitte wählen Sie einen Kunden aus
 DocType: Purchase Invoice Item,Purchase Invoice Item,Eingangsrechnungs-Artikel
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Buchungen auf das Lagerbuch und Hauptbuch-Buchungen werden für die gewählten Kaufbelege umgebucht
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Position 1
 DocType: Holiday,Holiday,Urlaub
-DocType: Support Settings,Close Issue After Days,Schließen Ausgabe nach Tagen
+DocType: Support Settings,Close Issue After Days,Vorfall schließen nach
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Freilassen, wenn für alle Filialen gültig"
 DocType: Bank Guarantee,Validity in Days,Gültigkeit in Tagen
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},Kontaktformular nicht anwendbar auf  Rechnung: {0}
@@ -1359,7 +1387,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Doppelte Zeile {0} mit dem gleichen {1}
 ,Trial Balance,Probebilanz
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Das Geschäftsjahr {0} nicht gefunden
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Mitarbeiter anlegen
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Mitarbeiter anlegen
 DocType: Sales Order,SO-,DAMIT-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Bitte zuerst Präfix auswählen
 DocType: Employee,O-,O-
@@ -1367,16 +1395,17 @@
 DocType: Maintenance Visit Purpose,Work Done,Arbeit erledigt
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Bitte geben Sie mindestens ein Attribut in der Attributtabelle ein
 DocType: Announcement,All Students,Alle Schüler
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Artikel {0} muss eine Nichtlagerposition sein
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Artikel {0} darf kein Lagerartikel sein
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Hauptbuch anzeigen
 DocType: Grading Scale,Intervals,Intervalle
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Frühestens
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group",Eine Artikelgruppe mit dem gleichen Namen existiert bereits. Bitte den Artikelnamen ändern oder die Artikelgruppe umbenennen
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group",Eine Artikelgruppe mit dem gleichen Namen existiert bereits. Bitte den Artikelnamen ändern oder die Artikelgruppe umbenennen
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobil-Nr
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Rest der Welt
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Rest der Welt
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Der Artikel {0} kann keine Charge haben
 ,Budget Variance Report,Budget-Abweichungsbericht
 DocType: Salary Slip,Gross Pay,Bruttolohn
+DocType: Item,Is Item from Hub,Ist ein Gegenstand aus dem Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Row {0}: Leistungsart ist obligatorisch.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Ausgeschüttete Dividenden
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Hauptbuch
@@ -1386,8 +1415,9 @@
 DocType: Vehicle Log,Service Detail,Service Detail
 DocType: BOM,Item Description,Artikelbeschreibung
 DocType: Student Sibling,Student Sibling,Studenten Geschwister
-DocType: Purchase Invoice,Is Recurring,ist wiederkehrend
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Zahlungsweise
 DocType: Purchase Invoice,Supplied Items,Gelieferte Artikel
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Bitte setzen Sie ein aktives Menü für Restaurant {0}
 DocType: Student,STUD.,ZUCHT.
 DocType: Production Order,Qty To Manufacture,Herzustellende Menge
 DocType: Email Digest,New Income,Neuer Verdienst
@@ -1395,8 +1425,9 @@
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Gleiche Preise während des gesamten Einkaufszyklus beibehalten
 DocType: Opportunity Item,Opportunity Item,Chance-Artikel
 ,Student and Guardian Contact Details,Student and Guardian Kontaktdaten
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Row {0}: Für Anbieter {0} E-Mail-Adresse ist erforderlich E-Mail senden
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,"Zeile {0}: um E-Mails senden zu können, ist eine E-Mail-Adresse für den Anbieter {0} erforderlich."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Temporäre Eröffnungskonten
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Hub anzeigen
 ,Employee Leave Balance,Übersicht der Urlaubskonten der Mitarbeiter
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Saldo für Konto {0} muss immer {1} sein
 DocType: Patient Appointment,More Info,Weitere Informationen
@@ -1416,13 +1447,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Kundenauftrag {0} ist nicht gültig
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Warnung für neue Angebotsanfrage
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Bestellungen helfen Ihnen bei der Planung und Follow-up auf Ihre Einkäufe
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged",Verzeihung! Firmen können nicht zusammengeführt werden
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged",Verzeihung! Firmen können nicht zusammengeführt werden
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Labortestverordnungen
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Die gesamte Ausgabe / Transfer Menge {0} in Material anfordern {1} \ kann nicht größer sein als die angeforderte Menge {2} für Artikel {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Klein
 DocType: Employee,Employee Number,Mitarbeiternummer
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Fall-Nr. (n) bereits in Verwendung. Versuchen Sie eine Fall-Nr. ab {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Fall-Nr. (n) bereits in Verwendung. Versuchen Sie eine Fall-Nr. ab {0}
 DocType: Project,% Completed,% abgeschlossen
 ,Invoiced Amount (Exculsive Tax),Rechnungsbetrag (ohne MwSt.)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Position 2
@@ -1437,11 +1468,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Indirekte Aufwendungen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Zeile {0}: Menge ist zwingend erforderlich
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Landwirtschaft
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Ihre Produkte oder Dienstleistungen
 DocType: Special Test Items,Special Test Items,Spezielle Testartikel
 DocType: Mode of Payment,Mode of Payment,Zahlungsweise
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Das Webseiten-Bild sollte eine öffentliche Datei oder eine Webseiten-URL sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Das Webseiten-Bild sollte eine öffentliche Datei oder eine Webseiten-URL sein
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,Stückliste
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Dies ist eine Root-Artikelgruppe und kann nicht bearbeitet werden.
@@ -1449,31 +1480,30 @@
 DocType: Vehicle,Fuel UOM,Kraftstoff UOM
 DocType: Warehouse,Warehouse Contact Info,Kontaktinformation des Lager
 DocType: Payment Entry,Write Off Difference Amount,Differenzbetrag Abschreibung
-DocType: Purchase Invoice,Recurring Type,Wiederholungstyp
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: Mitarbeiter E-Mail nicht gefunden, E-Mail daher nicht gesendet"
-DocType: Item,Foreign Trade Details,Foreign Trade Details
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: Mitarbeiter E-Mail nicht gefunden, E-Mail daher nicht gesendet"
+DocType: Item,Foreign Trade Details,Außenhandelsdetails
+,Assessment Plan Status,Status des Bewertungsplans
 DocType: Email Digest,Annual Income,Jährliches Einkommen
 DocType: Serial No,Serial No Details,Details zur Seriennummer
 DocType: Purchase Invoice Item,Item Tax Rate,Artikelsteuersatz
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,Bitte wählen Sie Arzt und Datum
 DocType: Student Group Student,Group Roll Number,Gruppenrolle Nummer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",Für {0} können nur Habenkonten mit einer weiteren Sollbuchung verknüpft werden
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Summe aller Aufgabe Gewichte sollten 1. Bitte stellen Sie Gewichte aller Projektaufgaben werden entsprechend
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Lieferschein {0} ist nicht gebucht
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Summe aller Aufgabe Gewichte sollten 1. Bitte stellen Sie Gewichte aller Projektaufgaben werden entsprechend
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Lieferschein {0} ist nicht gebucht
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Artikel {0} muss ein unterbeauftragter Artikel sein
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Betriebsvermögen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Die Preisregel wird zunächst basierend auf dem Feld ""Anwenden auf"" ausgewählt. Dieses kann ein Artikel, eine Artikelgruppe oder eine Marke sein."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Bitte legen Sie zuerst den Itemcode fest
-DocType: Hub Settings,Seller Website,Webseite des Verkäufers
-DocType: Item,ITEM-,ARTIKEL-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Insgesamt verteilte Prozentmenge für Vertriebsteam sollte 100 sein
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Bitte legen Sie zuerst den Itemcode fest
+DocType: Item,ITEM-,ARTKL-
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Insgesamt verteilte Prozentmenge für Vertriebsteam sollte 100 sein
 DocType: Sales Invoice Item,Edit Description,Beschreibung bearbeiten
 DocType: Antibiotic,Antibiotic,Antibiotikum
 ,Team Updates,Team-Updates
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +885,For Supplier,Für Lieferant
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Das Festlegen des Kontotyps hilft bei der Auswahl dieses Kontos bei Transaktionen.
 DocType: Purchase Invoice,Grand Total (Company Currency),Gesamtbetrag (Firmenwährung)
-apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Erstellen Sie das Druckformat
+apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Druckformat erstellen
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +5,Fee Created,Fee Erstellt
 apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},Hat keinen Artikel finden genannt {0}
 DocType: Supplier Scorecard Criteria,Criteria Formula,Kriterien Formel
@@ -1482,17 +1512,17 @@
 DocType: Authorization Rule,Transaction,Transaktion
 DocType: Patient Appointment,Duration,Dauer
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Hinweis: Diese Kostenstelle ist eine Gruppe. Buchungen können nicht zu Gruppen erstellt werden.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Kinderlager existiert für dieses Lager. Sie können diese Lager nicht löschen.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Es sind Unterlager für dieses Lager vorhanden. Sie können dieses Lager daher nicht löschen.
 DocType: Item,Website Item Groups,Webseiten-Artikelgruppen
 DocType: Purchase Invoice,Total (Company Currency),Gesamtsumme (Firmenwährung)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Seriennummer {0} wurde mehrfach erfasst
 DocType: Depreciation Schedule,Journal Entry,Buchungssatz
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} Elemente in Bearbeitung
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} Elemente in Bearbeitung
 DocType: Workstation,Workstation Name,Name des Arbeitsplatzes
 DocType: Grading Scale Interval,Grade Code,Grade-Code
 DocType: POS Item Group,POS Item Group,POS Artikelgruppe
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Täglicher E-Mail-Bericht:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},Stückliste {0} gehört nicht zum Artikel {1}
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-Mail-Bericht:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},Stückliste {0} gehört nicht zum Artikel {1}
 DocType: Sales Partner,Target Distribution,Aufteilung der Zielvorgaben
 DocType: Salary Slip,Bank Account No.,Bankkonto-Nr.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Dies ist die Nummer der letzten erstellten Transaktion mit diesem Präfix
@@ -1503,15 +1533,14 @@
 DocType: Quality Inspection Reading,Reading 8,Ablesewert 8
 DocType: Sales Partner,Agent,Beauftragter
 DocType: Purchase Invoice,Taxes and Charges Calculation,Berechnung der Steuern und Gebühren
-DocType: Accounts Settings,Book Asset Depreciation Entry Automatically,Buchen Sie den Asset Depreciation Entry automatisch
+DocType: Accounts Settings,Book Asset Depreciation Entry Automatically,Vermögensabschreibung automatisch verbuchen
 DocType: BOM Operation,Workstation,Arbeitsplatz
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Angebotsanfrage Lieferant
 DocType: Healthcare Settings,Registration Message,Registrierungsnachricht
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Hardware
-DocType: Sales Order,Recurring Upto,Wiederholt sich bis
 DocType: Prescription Dosage,Prescription Dosage,Verschreibungspflichtige Dosierung
 DocType: Attendance,HR Manager,Leiter der Personalabteilung
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Bitte ein Unternehmen auswählen
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Bitte ein Unternehmen auswählen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Bevorzugter Urlaub
 DocType: Purchase Invoice,Supplier Invoice Date,Lieferantenrechnungsdatum
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,pro
@@ -1527,10 +1556,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Überlagernde Bedingungen gefunden zwischen:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,"""Zu Buchungssatz"" {0} ist bereits mit einem anderen Beleg abgeglichen"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Gesamtbestellwert
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Lebensmittel
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Lebensmittel
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Alter Bereich 3
 DocType: Maintenance Schedule Item,No of Visits,Anzahl der Besuche
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Wartungsplan {0} existiert gegen {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Möchten Sie Ihre Artikel im Hub veröffentlichen?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,einschreibende Student
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Die Währung des Abschlusskontos muss {0} sein
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Summe der Punkte für alle Ziele sollte 100 sein. Aktueller Stand {0}
@@ -1541,9 +1571,9 @@
 DocType: Authorization Rule,Average Discount,Durchschnittlicher Rabatt
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Dienstprogramme
-DocType: Purchase Invoice Item,Accounting,Buchhaltung
-DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Bitte wählen Sie Chargen für Chargen
+DocType: POS Profile,Accounting,Buchhaltung
+DocType: Employee,EMP/,MA/
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Bitte wählen Sie Chargen für Chargen
 DocType: Asset,Depreciation Schedules,Abschreibungen Termine
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Beantragter Zeitraum kann nicht außerhalb der beantragten Urlaubszeit liegen
 DocType: Activity Cost,Projects,Projekte
@@ -1559,7 +1589,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',"Genehmigungsstatus muss ""Genehmigt"" oder ""Abgelehnt"" sein"
 DocType: Physician,Contacts and Address,Kontakte und Adresse
 DocType: Purchase Invoice,Contact Person,Kontaktperson
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"""Voraussichtliches Startdatum"" kann nicht nach dem ""Voraussichtlichen Enddatum"" liegen"
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""Voraussichtliches Startdatum"" kann nicht nach dem ""Voraussichtlichen Enddatum"" liegen"
 DocType: Course Scheduling Tool,Course End Date,Kurs Enddatum
 DocType: Holiday List,Holidays,Ferien
 DocType: Sales Order Item,Planned Quantity,Geplante Menge
@@ -1567,10 +1597,11 @@
 DocType: Item,Maintain Stock,Lager verwalten
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Es wurden bereits Lagerbuchungen zum Fertigungsauftrag erstellt
 DocType: Employee,Prefered Email,Bevorzugte E-Mail
+DocType: Student Admission,Eligibility and Details,Teilnahmeberechtigung und Details
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Nettoveränderung des Anlagevermögens
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Freilassen, wenn für alle Einstufungen gültig"
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Kosten für den Typ ""real"" in Zeile {0} können nicht in den Artikelpreis mit eingeschlossen werden"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Von Datum und Uhrzeit
 DocType: Email Digest,For Company,Für Firma
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikationsprotokoll
@@ -1578,19 +1609,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Einkaufsbetrag
 DocType: Sales Invoice,Shipping Address Name,Lieferadresse Bezeichnung
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Kontenplan
 DocType: Material Request,Terms and Conditions Content,Allgemeine Geschäftsbedingungen Inhalt
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,Kann nicht größer als 100 sein
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Artikel {0} ist kein Lagerartikel
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Artikel {0} ist kein Lagerartikel
 DocType: Maintenance Visit,Unscheduled,Außerplanmäßig
 DocType: Employee,Owned,Im Besitz von
 DocType: Salary Detail,Depends on Leave Without Pay,Hängt von unbezahltem Urlaub ab
 DocType: Pricing Rule,"Higher the number, higher the priority","Je höher die Zahl, desto höher die Priorität"
 ,Purchase Invoice Trends,Trendanalyse Eingangsrechnungen
 DocType: Employee,Better Prospects,Bessere Vorhersage
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Zeile # {0}: Der Batch {1} hat nur {2} Menge. Bitte wähle eine andere Charge aus, die {3} Menge zur Verfügung hat oder die Zeile in mehrere Zeilen aufteilt, um aus mehreren Chargen zu liefern / auszutauschen"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Zeile # {0}: Der Batch {1} hat nur {2} Menge. Bitte wähle eine andere Charge aus, die {3} Menge zur Verfügung hat oder die Zeile in mehrere Zeilen aufteilt, um aus mehreren Chargen zu liefern / auszutauschen"
 DocType: Vehicle,License Plate,Nummernschild
 DocType: Appraisal,Goals,Ziele
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Kassenprofil auswählen
 DocType: Warranty Claim,Warranty / AMC Status,Status der Garantie / des jährlichen Wartungsvertrags
 ,Accounts Browser,Kontenbrowser
 DocType: Payment Entry Reference,Payment Entry Reference,Zahlungsreferenz
@@ -1608,24 +1639,22 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Mitarbeiter können nicht an sich selbst Bericht erstatten
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Wenn das Konto gesperrt ist, sind einem eingeschränkten Benutzerkreis Buchungen erlaubt."
 DocType: Email Digest,Bank Balance,Kontostand
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Eine Buchung für {0}: {1} kann nur in der Währung: {2} vorgenommen werden
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Eine Buchung für {0}: {1} kann nur in der Währung: {2} vorgenommen werden
 DocType: Job Opening,"Job profile, qualifications required etc.","Stellenbeschreibung, erforderliche Qualifikationen usw."
 DocType: Journal Entry Account,Account Balance,Kontostand
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Steuerregel für Transaktionen
 DocType: Rename Tool,Type of document to rename.,"Dokumententyp, der umbenannt werden soll."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Ein Kunde ist für das Eingangskonto {2} erforderlich
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Für das Eingangskonto {2} ist ein Kunde erforderlich
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Gesamte Steuern und Gebühren (Firmenwährung)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Gewinn- und Verlustrechnung für nicht geschlossenes Finanzjahr zeigen.
 DocType: Lab Test Template,Collection Details,Sammlungsdetails
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date von tabConsultation ct, `tabLab Prescription` cp wo ct.patient = &#39;{0}&#39; und cp.parent = ct. name und cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Versandkonto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Konto {2} ist inaktiv
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,"Kundenaufträge anlegen, um Arbeit zu planen und pünktliche Lieferung sicherzustellen"
 DocType: Quality Inspection,Readings,Ablesungen
 DocType: Stock Entry,Total Additional Costs,Gesamte Zusatzkosten
 DocType: Course Schedule,SH,Sch
-DocType: BOM,Scrap Material Cost(Company Currency),Schrottmaterialkosten (Gesellschaft Währung)
+DocType: BOM,Scrap Material Cost(Company Currency),Ausschussmaterialkosten (Firmenwährung)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Sub Assemblies,Unterbaugruppen
 DocType: Asset,Asset Name,Asset-Name
 DocType: Project,Task Weight,Vorgangsgewichtung
@@ -1635,7 +1664,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Packzettel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Büromiete
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Einstellungen für SMS-Gateway verwalten
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import fehlgeschlagen!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import fehlgeschlagen!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Noch keine Adresse hinzugefügt.
 DocType: Workstation Working Hour,Workstation Working Hour,Arbeitsplatz-Arbeitsstunde
 DocType: Vital Signs,Blood Pressure,Blutdruck
@@ -1650,17 +1679,17 @@
 DocType: Item,Item Attribute,Artikelattribut
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Government,Regierung
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Kostenabrechnung {0} existiert bereits für das Fahrzeug Log
-apps/erpnext/erpnext/public/js/setup_wizard.js +60,Institute Name,Institut Namens
+apps/erpnext/erpnext/public/js/setup_wizard.js +60,Institute Name,Name des Institutes
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Bitte geben Sie Rückzahlungsbetrag
 apps/erpnext/erpnext/config/stock.py +305,Item Variants,Artikelvarianten
 DocType: Company,Services,Dienstleistungen
-DocType: HR Settings,Email Salary Slip to Employee,E-Mail-Gehaltsabrechnung an Mitarbeiter
+DocType: HR Settings,Email Salary Slip to Employee,Gehaltsabrechnung per E-Mail an Mitarbeiter senden
 DocType: Cost Center,Parent Cost Center,Übergeordnete Kostenstelle
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1017,Select Possible Supplier,Wählen Mögliche Lieferant
 DocType: Sales Invoice,Source,Quelle
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Zeige geschlossen
 DocType: Leave Type,Is Leave Without Pay,Ist unbezahlter Urlaub
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Anlagekategorie ist obligatorisch für Posten des Anlagevermögens
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Anlagekategorie ist obligatorisch für Posten des Anlagevermögens
 DocType: Fee Validity,Fee Validity,Gebührengültigkeit
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,"Keine Datensätze in der Tabelle ""Zahlungen"" gefunden"
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Diese {0} Konflikte mit {1} von {2} {3}
@@ -1668,21 +1697,22 @@
 DocType: POS Profile,Apply Discount,Rabatt anwenden
 DocType: GST HSN Code,GST HSN Code,GST HSN Code
 DocType: Employee External Work History,Total Experience,Gesamterfahrung
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Offene Projekte
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,offene Projekte
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,Packing Slip(s) cancelled,Packzettel storniert
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Cashflow aus Investitionen
 DocType: Program Course,Program Course,Programm Kurs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Fracht- und Versandkosten
-DocType: Homepage,Company Tagline for website homepage,Unternehmen Untertitel für Internet-Homepage
+DocType: Homepage,Company Tagline for website homepage,Unternehmensschlagzeile für die Internet-Homepage
 DocType: Item Group,Item Group Name,Name der Artikelgruppe
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Genommen
 DocType: Student,Date of Leaving,Austrittsdatum
 DocType: Pricing Rule,For Price List,Für Preisliste
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Direktsuche
-apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,erstellen Leads
+apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Leads erstellen
 DocType: Maintenance Schedule,Schedules,Zeitablaufpläne
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,"POS-Profil ist erforderlich, um Point-of-Sale zu verwenden"
 DocType: Purchase Invoice Item,Net Amount,Nettobetrag
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} sind nicht gebucht, deshalb kann die Aktion nicht abgeschlossen werden"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} sind nicht gebucht, deshalb kann die Aktion nicht abgeschlossen werden"
 DocType: Purchase Order Item Supplied,BOM Detail No,Stückliste Detailnr.
 DocType: Landed Cost Voucher,Additional Charges,Zusätzliche Kosten
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Zusätzlicher Rabatt (Firmenwährung)
@@ -1691,9 +1721,9 @@
 ,Support Hour Distribution,Stützzeitverteilung
 DocType: Maintenance Visit,Maintenance Visit,Wartungsbesuch
 DocType: Student,Leaving Certificate Number,Leaving Certificate Nummer
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Termin storniert, Bitte überprüfen und stornieren Sie die Rechnung {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}",der Termin wurde abgesagt. Bitte Rechnung {0} prüfen und abbrechen bzw. stornieren.
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Verfügbare Losgröße im Lager
-apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Aktualisieren Drucken Format
+apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Druckformat aktualisieren
 DocType: Landed Cost Voucher,Landed Cost Help,Hilfe zum Einstandpreis
 DocType: Purchase Invoice,Select Shipping Address,Lieferadresse auswählen
 DocType: Leave Block List,Block Holidays on important days.,Urlaub an wichtigen Tagen sperren.
@@ -1706,7 +1736,7 @@
 DocType: Purchase Invoice,Shipping Address,Lieferadresse
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,"Dieses Werkzeug hilft Ihnen dabei, die Menge und die Bewertung von Bestand im System zu aktualisieren oder zu ändern. Es wird in der Regel verwendet, um die Systemwerte und den aktuellen Bestand Ihrer Lager zu synchronisieren."
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"""In Worten"" wird sichtbar, sobald Sie den Lieferschein speichern."
-DocType: Expense Claim,EXP,EXP
+DocType: Expense Claim,EXP,BA
 apps/erpnext/erpnext/config/stock.py +205,Brand master.,Stammdaten zur Marke
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} erscheint mehrfach in Zeile {2} &amp; {3}
 DocType: Healthcare Settings,Manage Sample Collection,Probenahme sammeln
@@ -1714,8 +1744,8 @@
 DocType: Patient,Tobacco Past Use,Tabak Verwendung
 DocType: Sales Invoice Item,Brand Name,Bezeichnung der Marke
 DocType: Purchase Receipt,Transporter Details,Informationen zum Transporteur
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Benutzer {0} ist bereits dem Arzt {1} zugeordnet
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Standard Lager wird für das ausgewählte Element erforderlich
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Benutzer {0} ist bereits dem Arzt {1} zugeordnet
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Standard Lager wird für das ausgewählte Element erforderlich
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Kiste
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,Mögliche Lieferant
 DocType: Budget,Monthly Distribution,Monatsbezogene Verteilung
@@ -1725,7 +1755,7 @@
 DocType: Sales Partner,Sales Partner Target,Vertriebspartner-Ziel
 DocType: Loan Type,Maximum Loan Amount,Maximaler Darlehensbetrag
 DocType: Pricing Rule,Pricing Rule,Preisregel
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Duplikatrolle für Schüler {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Duplikatrolle für Schüler {0}
 DocType: Budget,Action if Annual Budget Exceeded,Erwünschte Aktion bei überschrittenem jährlichem Budget
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Von der Materialanfrage zum Lieferantenauftrag
 DocType: Shopping Cart Settings,Payment Success URL,Payment Success URL
@@ -1742,7 +1772,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} darf nur einmal vorkommen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Übertragung von mehr {0} als {1} mit Lieferantenauftrag {2} nicht erlaubt
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Erfolgreich zugewiesene Abwesenheiten für {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Keine Artikel zum Verpacken
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Keine Artikel zum Verpacken
 DocType: Shipping Rule Condition,From Value,Von-Wert
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Eingabe einer Fertigungsmenge ist erforderlich
 DocType: Employee Loan,Repayment Method,Rückzahlweg
@@ -1756,33 +1786,34 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Lager-Verbindlichkeiten
 DocType: Purchase Invoice,Supplier Warehouse,Lieferantenlager
 DocType: Opportunity,Contact Mobile No,Kontakt-Mobiltelefonnummer
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Unternehmen auswählen
 ,Material Requests for which Supplier Quotations are not created,"Materialanfragen, für die keine Lieferantenangebote erstellt werden"
 DocType: Student Group,Set 0 for no limit,Stellen Sie 0 für keine Grenze
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Der Tag/die Tage, für den/die Sie Urlaub beantragen, sind Ferien. Deshalb müssen Sie keinen Urlaub beantragen."
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Erneut senden Zahlung per E-Mail
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Zahlungsemail erneut senden
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Neuer Vorgang
 DocType: Consultation,Appointment,Termin
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Angebot erstellen
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Weitere Berichte
 DocType: Dependent Task,Dependent Task,Abhängiger Vorgang
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Umrechnungsfaktor für Standardmaßeinheit muss in Zeile {0} 1 sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Umrechnungsfaktor für Standardmaßeinheit muss in Zeile {0} 1 sein
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Abwesenheit vom Typ {0} kann nicht länger sein als {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Arbeitsgänge für X Tage im Voraus planen.
 DocType: HR Settings,Stop Birthday Reminders,Geburtstagserinnerungen ausschalten
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Bitte setzen Sie Standard-Abrechnungskreditorenkonto in Gesellschaft {0}
 DocType: SMS Center,Receiver List,Empfängerliste
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Suche Artikel
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Suche Artikel
 DocType: Patient Appointment,Referring Physician,Auf den Physiker bezogen
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Verbrauchte Menge
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Nettoveränderung der Barmittel
 DocType: Assessment Plan,Grading Scale,Bewertungsskala
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Maßeinheit {0} wurde mehr als einmal in die Umrechnungsfaktor-Tabelle eingetragen
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,Schon erledigt
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Maßeinheit {0} wurde mehr als einmal in die Umrechnungsfaktor-Tabelle eingetragen
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,Schon erledigt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock In Hand
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Zahlungsanordnung bereits vorhanden ist {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Aufwendungen für in Umlauf gebrachte Artikel
 DocType: Physician,Hospital,Krankenhaus
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Menge darf nicht mehr als {0} sein
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Menge darf nicht mehr als {0} sein
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Zurück Geschäftsjahr nicht geschlossen
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Alter (Tage)
 DocType: Quotation Item,Quotation Item,Angebotsposition
@@ -1793,8 +1824,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Stammdaten zum Lieferantentyp
 DocType: Purchase Order Item,Supplier Part Number,Lieferanten-Artikelnummer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Umrechnungskurs kann nicht 0 oder 1 sein
-DocType: Sales Invoice,Reference Document,Referenzdokument
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} wird abgebrochen oder  beendet
+DocType: Subscription,Reference Document,Referenzdokument
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} wird abgebrochen oder  beendet
 DocType: Accounts Settings,Credit Controller,Kredit-Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Datum des Versands mit dem Fahrzeug
 DocType: Healthcare Settings,Default Medical Code Standard,Default Medical Code Standard
@@ -1803,6 +1834,7 @@
 DocType: Company,Default Payable Account,Standard-Verbindlichkeitenkonto
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Einstellungen zum Warenkorb, z.B. Versandregeln, Preislisten usw."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% berechnet
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Sortieren nach Preis ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reservierte Menge
 DocType: Party Account,Party Account,Gruppenkonto
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Personalwesen
@@ -1814,13 +1846,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Machen Disbursement Eintrag
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Voraus gegen Lieferant muss belasten werden
 DocType: Company,Default Values,Standardwerte
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequenz} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Frequenz} Übersicht
 DocType: Expense Claim,Total Amount Reimbursed,Gesamterstattungsbetrag
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Dies basiert auf Protokollen gegen dieses Fahrzeug. Siehe Zeitleiste unten für Details
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Zu Eingangsrechnung {0} vom {1}
 DocType: Customer,Default Price List,Standardpreisliste
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Asset-Bewegung Datensatz {0} erstellt
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Sie können das Geschäftsjahr {0} nicht löschen. Das Geschäftsjahr {0} ist als Standard in den globalen Einstellungen festgelegt
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Ein Kunde mit demselben Namen existiert bereits
 DocType: Journal Entry,Entry Type,Buchungstyp
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Kein Bewertungsplan mit dieser Bewertungsgruppe verknüpft
 ,Customer Credit Balance,Kunden-Kreditlinien
@@ -1830,8 +1863,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Preisgestaltung
 DocType: Quotation,Term Details,Details der Geschäftsbedingungen
 DocType: Project,Total Sales Cost (via Sales Order),Gesamtverkaufskosten (über Kundenauftrag)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Kann nicht mehr als {0} Studenten für diese Studentengruppe einschreiben.
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead Count
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Kann nicht mehr als {0} Studenten für diese Studentengruppe einschreiben.
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Anazhl Leads
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} muss größer 0 sein
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapazitätsplanung für (Tage)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Beschaffung
@@ -1845,10 +1878,12 @@
 DocType: Pricing Rule,Applicable For,Anwenden für
 DocType: Lab Test,Technician Name,Techniker Name
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Unlink Zahlung auf Annullierung der Rechnung
-apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},"Aktuelle Kilometerstand eingetragen werden, sollte größer sein als Anfangskilometerstand {0}"
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Der eingegebene aktuelle Kilometerstand sollte größer sein als der Anfangskilometerstand {0}
+DocType: Restaurant Reservation,No Show,Keine Show
 DocType: Shipping Rule Country,Shipping Rule Country,Versandregel für Land
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Urlaub und Anwesenheit
 DocType: Maintenance Visit,Partially Completed,Teilweise abgeschlossen
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Moderate Empfindlichkeit
 DocType: Leave Type,Include holidays within leaves as leaves,Urlaube innerhalb von Abwesenheiten als Abwesenheiten mit einbeziehen
 DocType: Sales Invoice,Packed Items,Verpackte Artikel
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garantieantrag zu Serien-Nr.
@@ -1865,13 +1900,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Gezahlter Betrag (Firmenwährung)
 DocType: Purchase Invoice,Additional Discount,Zusätzlicher Rabatt
 DocType: Selling Settings,Selling Settings,Vertriebseinstellungen
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Aktion bestätigen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online-Auktionen
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Bitte entweder die Menge oder den Wertansatz oder beides eingeben
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Erfüllung
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Ansicht Warenkorb
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Marketingkosten
 ,Item Shortage Report,Artikelengpass-Bericht
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Gewicht ist angegeben, bitte auch ""Gewichts-Maßeinheit"" angeben"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Gewicht ist angegeben, bitte auch ""Gewichts-Maßeinheit"" angeben"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materialanfrage wurde für die Erstellung dieser Lagerbuchung verwendet
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Weiter Abschreibungen Datum ist obligatorisch für neue Anlage
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Separate Kursbasierte Gruppe für jede Charge
@@ -1879,16 +1915,16 @@
 DocType: Fee Category,Fee Category,Preis Kategorie
 DocType: Drug Prescription,Dosage by time interval,Dosierung nach Zeitintervall
 ,Student Fee Collection,Studiengebühren Sammlung
-apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +23,Appointment Duration (mins),Terminkalender (min.)
+apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +23,Appointment Duration (mins),Termindauer (min.)
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Eine Buchung für jede Lagerbewegung erstellen
 DocType: Leave Allocation,Total Leaves Allocated,Insgesamt zugewiesene Urlaubstage
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Angabe des Lagers ist in Zeile {0} erforderlich
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Bitte geben Sie für das Geschäftsjahr einen gültigen Start- und Endtermin an.
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Bitte geben Sie für das Geschäftsjahr einen gültigen Start- und Endtermin an.
 DocType: Employee,Date Of Retirement,Zeitpunkt der Pensionierung
 DocType: Upload Attendance,Get Template,Vorlage aufrufen
 DocType: Material Request,Transferred,Übergeben
 DocType: Vehicle,Doors,Türen
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext Setup abgeschlossen!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext Setup abgeschlossen!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Sammeln Sie die Gebühr für die Patientenregistrierung
 DocType: Course Assessment Criteria,Weightage,Gewichtung
 DocType: Purchase Invoice,Tax Breakup,Steuererhebung
@@ -1907,36 +1943,36 @@
 DocType: Employee,AB+,AB+
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Wenn dieser Artikel Varianten hat, dann kann er bei den Kundenaufträgen, etc. nicht ausgewählt werden"
 DocType: Lead,Next Contact By,Nächster Kontakt durch
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Für Artikel {0} in Zeile {1} benötigte Menge
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Für Artikel {0} in Zeile {1} benötigte Menge
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},"Lager {0} kann nicht gelöscht werden, da noch ein Bestand für Artikel {1} existiert"
 DocType: Quotation,Order Type,Bestellart
-DocType: Purchase Invoice,Notification Email Address,Benachrichtigungs-E-Mail-Adresse
 ,Item-wise Sales Register,Artikelbezogene Übersicht der Verkäufe
 DocType: Asset,Gross Purchase Amount,Bruttokaufbetrag
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Eröffnungssalden
 DocType: Asset,Depreciation Method,Abschreibungsmethode
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Offline
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ist diese Steuer im Basispreis enthalten?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Summe Vorgabe
 DocType: Job Applicant,Applicant for a Job,Bewerber für einen Job
 DocType: Production Plan Material Request,Production Plan Material Request,Produktionsplan-Material anfordern
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Keine Fertigungsaufträge erstellt
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Keine Fertigungsaufträge erstellt
 DocType: Stock Reconciliation,Reconciliation JSON,Abgleich JSON (JavaScript Object Notation)
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Zu viele Spalten. Exportieren Sie den Bericht und drucken Sie ihn mit einem Tabellenkalkulationsprogramm aus.
 DocType: Purchase Invoice Item,Batch No,Chargennummer
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Angebotsanfrage: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Zusammenfassen mehrerer Kundenaufträge zu einer Kundenbestellung erlauben
 DocType: Student Group Instructor,Student Group Instructor,Student Group Instructor
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobil Nein
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Haupt
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Haupt
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Präfix für die Seriennummerierung Ihrer Transaktionen festlegen
 DocType: Employee Attendance Tool,Employees HTML,Mitarbeiter HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Standardstückliste ({0}) muss für diesen Artikel oder dessen Vorlage aktiv sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Standardstückliste ({0}) muss für diesen Artikel oder dessen Vorlage aktiv sein
 DocType: Employee,Leave Encashed?,Urlaub eingelöst?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"Feld ""Chance von"" ist zwingend erforderlich"
 DocType: Email Digest,Annual Expenses,Jährliche Kosten
 DocType: Item,Variants,Varianten
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Lieferantenauftrag anlegen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Lieferantenauftrag anlegen
 DocType: SMS Center,Send To,Senden an
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Es gibt nicht genügend verfügbaren Urlaub für Urlaubstyp {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Zugewiesene Menge
@@ -1952,39 +1988,40 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Schülergruppenstärke
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,"""Zu Buchungssatz"" {0} hat nur abgeglichene {1} Buchungen"
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Beurteilungen
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Schulungsveranstaltungen
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Doppelte Seriennummer für Posten {0} eingegeben
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Bedingung für eine Versandregel
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Bitte eingeben
-apps/erpnext/erpnext/controllers/accounts_controller.py +423,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Kann nicht für Artikel overbill {0} in Zeile {1} mehr als {2}. Damit über Abrechnung, setzen Sie sich bitte Einstellungen in Kauf"
+apps/erpnext/erpnext/controllers/accounts_controller.py +423,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Kann den Artikel {0} in Zeile {1} nicht mit mehr als {2} überbuchen. Um eine Überbuchung zu erlauben, verändern Sie bitte die Einkaufseinstellungen."
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +212,Please set filter based on Item or Warehouse,Bitte setzen Sie Filter basierend auf Artikel oder Lager
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Das Nettogewicht dieses Pakets. (Automatisch als Summe der einzelnen Nettogewichte berechnet)
 DocType: Sales Order,To Deliver and Bill,Auszuliefern und Abzurechnen
-DocType: Student Group,Instructors,Instructors
+DocType: Student Group,Instructors,Lehrer
 DocType: GL Entry,Credit Amount in Account Currency,(Gut)Haben-Betrag in Kontowährung
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,Stückliste {0} muss übertragen werden
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,Stückliste {0} muss übertragen werden
 DocType: Authorization Control,Authorization Control,Berechtigungskontrolle
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Abgelehnt Warehouse ist obligatorisch gegen zurückgewiesen Artikel {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Bezahlung
-apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Warehouse {0} ist nicht mit einem Konto verknüpft, bitte erwähnen Sie das Konto im Lagerbestand oder legen Sie das Inventarkonto in der Firma {1} fest."
+apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.",Lager {0} ist nicht mit einem Konto verknüpft. Bitte wählen Sie ein Konto in den Einstellungen für das Lager oder legen Sie das Standard Lagerkonto in den Einstellungen für  {1} fest.
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Verwalten Sie Ihre Aufträge
 DocType: Production Order Operation,Actual Time and Cost,Tatsächliche Laufzeit und Kosten
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materialanfrage von maximal {0} kann für Artikel {1} zum Kundenauftrag {2} gemacht werden
 DocType: Course,Course Abbreviation,Kurs Abkürzung
 DocType: Student Leave Application,Student Leave Application,Student Urlaubsantrag
 DocType: Item,Will also apply for variants,Gilt auch für Varianten
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Vermögens kann nicht rückgängig gemacht werden, da es ohnehin schon ist {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Mitarbeiter {0} auf halber Tag auf {1}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Vermögen kann nicht rückgängig gemacht werden, da es ohnehin schon {0} ist"
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Mitarbeiter {0} am {1} nur halbtags anwesend
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Insgesamt Arbeitszeit sollte nicht größer sein als die maximale Arbeitszeit {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Am
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Artikel zum Zeitpunkt des Verkaufs bündeln
 DocType: Quotation Item,Actual Qty,Tatsächliche Anzahl
 DocType: Sales Invoice Item,References,Referenzen
 DocType: Quality Inspection Reading,Reading 10,Ablesewert 10
-DocType: Hub Settings,Hub Node,Hub-Knoten
+DocType: Hub Category,Hub Node,Hub-Knoten
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Sie haben ein Duplikat eines Artikels eingetragen. Bitte korrigieren und erneut versuchen.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Mitarbeiter/-in
 DocType: Asset Movement,Asset Movement,Asset-Bewegung
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,neue Produkte Warenkorb
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,neue Produkte Warenkorb
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Artikel {0} ist kein Fortsetzungsartikel
 DocType: SMS Center,Create Receiver List,Empfängerliste erstellen
 DocType: Vehicle,Wheels,Räder
@@ -1998,18 +2035,18 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekommunikation
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Zeigt an, dass das Paket ein Teil dieser Lieferung ist (nur Entwurf)"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Zahlungsbuchung erstellen
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Menge für Artikel {0} muss kleiner sein als {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Menge für Artikel {0} muss kleiner sein als {1}
 ,Sales Invoice Trends,Ausgangsrechnung-Trendanalyse
 DocType: Leave Application,Apply / Approve Leaves,Urlaub eintragen/genehmigen
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Für
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Für
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Kann sich nur auf eine Zeile beziehen, wenn die Berechnungsart der Kosten entweder ""auf vorherige Zeilensumme"" oder ""auf vorherigen Zeilenbetrag"" ist"
 DocType: Sales Order Item,Delivery Warehouse,Auslieferungslager
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Baum der finanziellen Kostenstellen.
 DocType: Serial No,Delivery Document No,Lieferdokumentennummer
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Bitte setzen Sie &quot;Gewinn / Verlustrechnung auf die Veräußerung von Vermögenswerten&quot; in Gesellschaft {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Bitte setzen Sie &quot;Gewinn / Verlustrechnung auf die Veräußerung von Vermögenswerten&quot; in Gesellschaft {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Artikel vom Kaufbeleg übernehmen
 DocType: Serial No,Creation Date,Erstelldatum
-apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Artikel {0} erscheint mehrfach in Preisliste {1}
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Artikel {0}ist mehrfach in Preisliste {1} aufgeführt
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +40,"Selling must be checked, if Applicable For is selected as {0}","Vertrieb muss aktiviert werden, wenn ""Anwenden auf"" ausgewählt ist bei {0}"
 DocType: Production Plan Material Request,Material Request Date,Material Auftragsdatum
 DocType: Purchase Order Item,Supplier Quotation Item,Lieferantenangebotsposition
@@ -2017,11 +2054,12 @@
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Hat Varianten
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Update-Antwort
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Sie haben bereits Elemente aus {0} {1} gewählt
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Sie haben bereits Elemente aus {0} {1} gewählt
 DocType: Monthly Distribution,Name of the Monthly Distribution,Bezeichnung der monatsweisen Verteilung
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch-ID ist obligatorisch
 DocType: Sales Person,Parent Sales Person,Übergeordneter Vertriebsmitarbeiter
-DocType: Purchase Invoice,Recurring Invoice,Wiederkehrende Rechnung
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Absteigend
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Wählen Sie zuerst das Programm aus
 DocType: Patient Appointment,Patient Age,Patient Alter
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Projekte verwalten
 DocType: Supplier,Supplier of Goods or Services.,Lieferant von Waren oder Dienstleistungen.
@@ -2029,27 +2067,28 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Default-Forderungskonten, die verwendet werden sollen, wenn sie nicht in Patient eingestellt sind, um Konsultationsgebühren zu buchen."
 DocType: Vehicle Log,Fuel Price,Kraftstoff-Preis
 DocType: Budget,Budget,Budget
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Set offen
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Posten des Anlagevermögens muss ein Nichtlagerposition sein.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Set offen
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Posten des Anlagevermögens muss ein Nichtlagerposition sein.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget kann {0} nicht zugewiesen werden, da es kein Ertrags- oder Aufwandskonto ist"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Erreicht
 DocType: Student Admission,Application Form Route,Antragsformular Strecke
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Region / Kunde
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,"Lassen Typ {0} kann nicht zugeordnet werden, da sie ohne Bezahlung verlassen wird"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,"Urlaubstyp {0} kann nicht zugeordnet werden, da unbezahlter Urlaub."
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Zeile {0}: Zugeteilte Menge {1} muss kleiner als oder gleich dem ausstehenden Betrag in Rechnung {2} sein
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"""In Worten"" wird sichtbar, sobald Sie die Ausgangsrechnung speichern."
 DocType: Lead,Follow Up,Nachverfolgen
 DocType: Item,Is Sales Item,Ist Verkaufsartikel
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Artikelgruppenstruktur
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Artikelgruppenbaumstruktur
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Artikel {0} ist nicht für Seriennummern eingerichtet. Artikelstamm prüfen
 DocType: Maintenance Visit,Maintenance Time,Wartungszeit
 ,Amount to Deliver,Liefermenge
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Gleiches Element wurde mehrfach eingegeben. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Der Begriff Startdatum kann nicht früher als das Jahr Anfang des Akademischen Jahres an dem der Begriff verknüpft ist (Akademisches Jahr {}). Bitte korrigieren Sie die Daten und versuchen Sie es erneut.
 DocType: Guardian,Guardian Interests,Wächter Interessen
 DocType: Naming Series,Current Value,Aktueller Wert
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Mehrere Geschäftsjahre existieren für das Datum {0}. Bitte setzen Unternehmen im Geschäftsjahr
 DocType: School Settings,Instructor Records to be created by,Instructor Records werden erstellt von
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} erstellt
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} erstellt
 DocType: Delivery Note Item,Against Sales Order,Zu Kundenauftrag
 ,Serial No Status,Seriennummern-Status
 DocType: Payment Entry Reference,Outstanding,Hervorragend
@@ -2059,10 +2098,10 @@
 						must be greater than or equal to {2}","Zeile {0}: Um Periodizität {1} zu setzen, muss die Differenz aus Von-Datum und Bis-Datum größer oder gleich {2} sein"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Dies ist auf Lager Bewegung basiert. Siehe {0} für Details
 DocType: Pricing Rule,Selling,Vertrieb
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Menge {0} {1} abgezogen gegen {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Menge {0} {1} abgezogen gegen {2}
 DocType: Employee,Salary Information,Gehaltsinformationen
 DocType: Sales Person,Name and Employee ID,Name und Mitarbeiter-ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Fälligkeitsdatum kann nicht vor dem Buchungsdatum liegen
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Fälligkeitsdatum kann nicht vor dem Buchungsdatum liegen
 DocType: Website Item Group,Website Item Group,Webseiten-Artikelgruppe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Zölle und Steuern
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Bitte den Stichtag eingeben
@@ -2082,13 +2121,13 @@
 DocType: Installation Note,Installation Time,Installationszeit
 DocType: Sales Invoice,Accounting Details,Buchhaltungs-Details
 apps/erpnext/erpnext/setup/doctype/company/company.js +84,Delete all the Transactions for this Company,Löschen aller Transaktionen dieser Firma
-DocType: Patient,O Positive,O positiv
+DocType: Patient,O Positive,0 +
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Zeile #{0}: Arbeitsgang {1} ist für {2} die Menge an Fertigerzeugnissen im Produktionsauftrag # {3} abgeschlossen. Bitte den Status des Arbeitsgangs über die Zeitprotokolle aktualisieren
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Investitionen
 DocType: Issue,Resolution Details,Details zur Entscheidung
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Zuteilungen
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Akzeptanzkriterien
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Bitte geben Sie Materialwünsche in der obigen Tabelle
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Bitte geben Sie Materialwünsche in der obigen Tabelle
 DocType: Item Attribute,Attribute Name,Attributname
 DocType: BOM,Show In Website,Auf der Webseite anzeigen
 DocType: Shopping Cart Settings,Show Quantity in Website,Zeigen Menge in Webseite
@@ -2097,9 +2136,9 @@
 DocType: Item Reorder,Check in (group),Check-in (Gruppe)
 ,Qty to Order,Zu bestellende Menge
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Der Kontenkopf unter Eigen- oder Fremdkapital, in dem Gewinn / Verlust verbucht wird"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Gantt-Diagramm aller Aufgaben
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Gantt-Diagramm aller Aufgaben
 DocType: Opportunity,Mins to First Response,Minuten zum First Response
-DocType: Pricing Rule,Margin Type,Margin-Art
+DocType: Pricing Rule,Margin Type,Margenart
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} Stunden
 DocType: Course,Default Grading Scale,Standard-Bewertungsskala
 DocType: Appraisal,For Employee Name,Für Mitarbeiter-Name
@@ -2118,35 +2157,35 @@
 DocType: Patient,Surgical History,Chirurgische Geschichte
 DocType: Employee,Resignation Letter Date,Datum des Kündigungsschreibens
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Preisregeln werden zudem nach Menge angewandt.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Bitte setzen Sie das Datum des Beitritts für Mitarbeiter {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Bitte setzen Sie das Datum des Beitritts für Mitarbeiter {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Gesamtrechnungsbetrag (über Arbeitszeitblatt)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Umsatz Bestandskunden
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) muss die Rolle ""Ausgabengenehmiger"" haben"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Paar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Wählen Sie Stückliste und Menge für Produktion
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Wählen Sie Stückliste und Menge für Produktion
 DocType: Asset,Depreciation Schedule,Abschreibungsplan
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Vertriebspartner Adressen und Kontakte
 DocType: Bank Reconciliation Detail,Against Account,Gegenkonto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Halbtages Datum sollte zwischen Von-Datum und eine aktuelle
 DocType: Maintenance Schedule Detail,Actual Date,Tatsächliches Datum
 DocType: Item,Has Batch No,Hat Chargennummer
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Jährliche Abrechnung: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Jährliche Abrechnung: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Waren- und Dienstleistungssteuer (GST Indien)
 DocType: Delivery Note,Excise Page Number,Seitenzahl entfernen
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Company, ab Datum und bis Datum ist obligatorisch"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory",Firma: ab Datum und bis Datum ist obligatorisch
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Holen Sie sich von der Beratung
 DocType: Asset,Purchase Date,Kaufdatum
 DocType: Employee,Personal Details,Persönliche Daten
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Bitte setzen &#39;Asset-Abschreibungen Kostenstelle&#39; in Gesellschaft {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Bitte setzen &#39;Asset-Abschreibungen Kostenstelle&#39; in Gesellschaft {0}
 ,Maintenance Schedules,Wartungspläne
 DocType: Task,Actual End Date (via Time Sheet),Das tatsächliche Enddatum (durch Zeiterfassung)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Menge {0} {1} gegen {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Menge {0} {1} gegen {2} {3}
 ,Quotation Trends,Trendanalyse Angebote
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Artikelgruppe ist im Artikelstamm für Artikel {0} nicht erwähnt
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Sollkonto muss ein Forderungskonto sein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Sollkonto muss ein Forderungskonto sein
 DocType: Shipping Rule Condition,Shipping Amount,Versandbetrag
 DocType: Supplier Scorecard Period,Period Score,Periodenspieler
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Kunden hinzufügen
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Kunden hinzufügen
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Ausstehender Betrag
 DocType: Lab Test Template,Special,Besondere
 DocType: Purchase Invoice Item,Conversion Factor,Umrechnungsfaktor
@@ -2154,13 +2193,14 @@
 ,Vehicle Expenses,Fahrzeugkosten
 DocType: Serial No,Invoice Details,Rechnungs-Details
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Erwartungswert nach Nutzungsdauer muss größer sein als oder gleich {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Beginnen am
+DocType: Hub Category,Hub Category,Hub-Kategorie
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Fahrzeugnummer
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Das Datum, an dem wiederkehrende Rechnungen angehalten werden"
 DocType: Employee Loan,Loan Amount,Darlehensbetrag
 DocType: Program Enrollment,Self-Driving Vehicle,Selbstfahrendes Fahrzeug
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Supplier Scorecard Standing
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Zeile {0}: Bill of Materials nicht für den Artikel gefunden {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Zeile {0}: Bill of Materials nicht für den Artikel gefunden {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Die Gesamtmenge des beantragten Urlaubs {0} kann nicht kleiner sein als die bereits genehmigten Urlaube {1} für den Zeitraum
 DocType: Journal Entry,Accounts Receivable,Forderungen
 ,Supplier-Wise Sales Analytics,Lieferantenbezogene Analyse der Verkäufe
@@ -2168,21 +2208,21 @@
 DocType: Sales Invoice,Company Address Name,Firmenanschrift Name
 DocType: Production Order,Use Multi-Level BOM,Mehrstufige Stückliste verwenden
 DocType: Bank Reconciliation,Include Reconciled Entries,Abgeglichene Buchungen einbeziehen
-DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Parent Course (Leer lassen, wenn dies nicht Teil des Elternkurses ist)"
+DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Elternkurs (Leer lassen, wenn dies nicht Teil des Elternkurses ist)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Freilassen, wenn für alle Mitarbeitertypen gültig"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Kosten auf folgender Grundlage verteilen
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Zeiterfassungen
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Zeiterfassungen
 DocType: HR Settings,HR Settings,Einstellungen zum Modul Personalwesen
 DocType: Salary Slip,net pay info,Netto-Zahlung Info
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Dieser Wert wird in der Default Sales Price List aktualisiert.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,Expense Claim is pending approval. Only the Expense Approver can update status.,Aufwandsabrechnung wartet auf Bewilligung. Nur der Ausgabenbewilliger kann den Status aktualisieren.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,Expense Claim is pending approval. Only the Expense Approver can update status.,Aufwandsabrechnung wartet auf Bewilligung. Nur der Verantwortliche kann den Status aktualisieren.
 DocType: Email Digest,New Expenses,Neue Ausgaben
 DocType: Purchase Invoice,Additional Discount Amount,Zusätzlicher Rabatt
 DocType: Consultation,Patient Details,Patientendetails
 DocType: Patient,B Positive,B Positiv
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Menge muss 1 sein, als Element eine Anlage ist. Bitte verwenden Sie separate Zeile für mehrere Menge."
 DocType: Leave Block List Allow,Leave Block List Allow,Urlaubssperrenliste zulassen
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,"""Abbr"" kann nicht leer oder Space sein"
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,"""Abbr"" kann nicht leer oder Space sein"
 DocType: Patient Medical Record,Patient Medical Record,Patient Medizinische Aufzeichnung
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Gruppe an konzernfremde
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
@@ -2198,9 +2238,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Der Wechselkurs für {0} bis {1} für das Stichtag {2} kann nicht gefunden werden. Bitte erstellen Sie einen Exchange Exchange-Eintrag manuell
 DocType: POS Profile,Price List,Preisliste
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} ist jetzt das Standardgeschäftsjahr. Bitte aktualisieren Sie Ihren Browser, damit die Änderungen wirksam werden."
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Aufwandsabrechnungen
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Aufwandsabrechnungen
 DocType: Issue,Support,Support
 ,BOM Search,Stücklisten-Suche
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Veröffentlichen Sie &quot;In Stock&quot; oder &quot;Nicht verfügbar&quot; auf Hub basierend auf dem in diesem Lager verfügbaren Bestand.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Schlußstand (Anfangsstand + Summen)
 DocType: Vehicle,Fuel Type,Treibstoffart
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Bitte die Firmenwährung angeben
@@ -2212,40 +2253,41 @@
 DocType: Healthcare Settings,Remind Before,Vorher erinnern
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Maßeinheit-Umrechnungsfaktor ist erforderlich in der Zeile {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Referenzdokumenttyp muss eine der Kundenauftrag, Verkaufsrechnung oder einen Journaleintrag sein"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Referenzdokumenttyp muss eine der Kundenauftrag, Verkaufsrechnung oder einen Journaleintrag sein"
 DocType: Salary Component,Deduction,Abzug
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Row {0}: Von Zeit und zu Zeit ist obligatorisch.
 DocType: Stock Reconciliation Item,Amount Difference,Mengendifferenz
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Artikel Preis hinzugefügt für {0} in Preisliste {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Artikel Preis hinzugefügt für {0} in Preisliste {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Bitte die Mitarbeiter-ID dieses Vertriebsmitarbeiters angeben
 DocType: Territory,Classification of Customers by region,Einteilung der Kunden nach Region
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Differenzbetrag muss Null sein
 DocType: Project,Gross Margin,Handelsspanne
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Bitte zuerst Herstellungsartikel eingeben
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Berechneter stand des Bankauszugs
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Bitte zuerst Herstellungsartikel eingeben
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Berechneter Stand des Bankauszugs
 DocType: Normal Test Template,Normal Test Template,Normale Testvorlage
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,deaktivierter Benutzer
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +764,Quotation,Angebot
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +957,Cannot set a received RFQ to No Quote,Kann nicht einen empfangenen RFQ zu keinem Zitat setzen
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +957,Cannot set a received RFQ to No Quote,"Kann einen empfangenen RFQ nicht auf ""kein Zitat"" setzen."
 DocType: Quotation,QTN-,ANG-
 DocType: Salary Slip,Total Deduction,Gesamtabzug
 ,Production Analytics,Die Produktion Analytics
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Dies beruht auf Transaktionen gegen diesen Patienten. Siehe Zeitleiste unten für Details
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Kosten aktualisiert
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Kosten aktualisiert
 DocType: Employee,Date of Birth,Geburtsdatum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Artikel {0} wurde bereits zurück gegeben
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,"""Geschäftsjahr"" steht für ein Finazgeschäftsjahr. Alle Buchungen und anderen größeren Transaktionen werden mit dem ""Geschäftsjahr"" verglichen."
 DocType: Opportunity,Customer / Lead Address,Kunden- / Lead-Adresse
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Supplier Scorecard Setup
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Warnung: Ungültiges SSL-Zertifikat für Anlage {0}
-DocType: Student Admission,Eligibility,Wählbarkeit
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Name des Bewertungsplans
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Warnung: Ungültiges SSL-Zertifikat für Anlage {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Leads helfen bei der Kundengewinnung, fügen Sie alle Ihre Kontakte und mehr als Ihre Leads hinzu"
 DocType: Production Order Operation,Actual Operation Time,Tatsächliche Betriebszeit
 DocType: Authorization Rule,Applicable To (User),Anwenden auf (Benutzer)
 DocType: Purchase Taxes and Charges,Deduct,Abziehen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Tätigkeitsbeschreibung
 DocType: Student Applicant,Applied,angewandt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Wiedereröffnen
 DocType: Sales Invoice Item,Qty as per Stock UOM,Menge in Lagermaßeinheit
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 Namen
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Sonderzeichen außer ""-"", ""#"", ""."" und ""/"" sind in der Serienbezeichnung nicht erlaubt"
@@ -2257,10 +2299,10 @@
 DocType: Request for Quotation,Manufacturing Manager,Fertigungsleiter
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Seriennummer {0} ist innerhalb der Garantie bis {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Lieferschein in Pakete aufteilen
-apps/erpnext/erpnext/hooks.py +98,Shipments,Lieferungen
+apps/erpnext/erpnext/hooks.py +107,Shipments,Lieferungen
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Aufteilbaren Gesamtbetrag (Gesellschaft Währung)
 DocType: Purchase Order Item,To be delivered to customer,Zur Auslieferung an den Kunden
-DocType: BOM,Scrap Material Cost,Schrottmaterialkosten
+DocType: BOM,Scrap Material Cost,Ausschusssmaterialkosten
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +227,Serial No {0} does not belong to any Warehouse,Seriennummer {0} gehört zu keinem Lager
 DocType: Purchase Invoice,In Words (Company Currency),In Worten (Firmenwährung)
 DocType: Asset,Supplier,Lieferant
@@ -2272,20 +2314,20 @@
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Name der Bank
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +29,-Above,-Über
-DocType: Employee Loan,Employee Loan Account,Mitarbeiter Darlehenskonto
+DocType: Employee Loan,Employee Loan Account,Mitarbeiterdarlehenskonto
 DocType: Leave Application,Total Leave Days,Urlaubstage insgesamt
 DocType: Email Digest,Note: Email will not be sent to disabled users,Hinweis: E-Mail wird nicht an gesperrte Nutzer gesendet
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Anzahl der Interaktion
-apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Gegenstandsvarianteneinstellungen
+apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Einstellungen zur Artikelvariante
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Firma auswählen...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Freilassen, wenn für alle Abteilungen gültig"
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Art der Beschäftigung (Unbefristeter Vertrag, befristeter Vertrag, Praktikum etc.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} Artikel ist zwingend erfoderlich für {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Art der Beschäftigung (Unbefristeter Vertrag, befristeter Vertrag, Praktikum etc.)"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} Artikel ist zwingend erfoderlich für {1}
 DocType: Process Payroll,Fortnightly,vierzehntägig
 DocType: Currency Exchange,From Currency,Von Währung
 DocType: Vital Signs,Weight (In Kilogram),Gewicht (in Kilogramm)
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Bitte zugewiesenen Betrag, Rechnungsart und Rechnungsnummer in mindestens einer Zeile auswählen"
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Kosten neuer Kauf
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Kosten eines neuen Kaufs
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +97,Sales Order required for Item {0},Kundenauftrag für den Artikel {0} erforderlich
 DocType: Purchase Invoice Item,Rate (Company Currency),Preis (Firmenwährung)
 DocType: Student Guardian,Others,Andere
@@ -2302,11 +2344,11 @@
 DocType: Vehicle Service,Service Item,Serviceposition
 DocType: Bank Guarantee,Bank Guarantee,Bankgarantie
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Bitte auf ""Zeitplan generieren"" klicken, um den Zeitplan zu erhalten"
-apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Es gab Fehler beim folgenden Zeitpläne zu löschen:
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Beim Löschen der folgenden Zeitpläne ist ein Fehler aufgetreten:
 DocType: Bin,Ordered Quantity,Bestellte Menge
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","z. B. ""Fertigungs-Werkzeuge für Hersteller"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","z. B. ""Fertigungs-Werkzeuge für Hersteller"""
 DocType: Grading Scale,Grading Scale Intervals,Notenskala Intervalle
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Accounting Eintrag für {2} kann nur in folgender Währung vorgenommen werden: {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Konteneintrag für {2} kann nur in folgender Währung vorgenommen werden: {3}
 DocType: Production Order,In Process,Während des Fertigungsprozesses
 DocType: Authorization Rule,Itemwise Discount,Artikelbezogener Rabatt
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Baum der Finanzbuchhaltung.
@@ -2327,11 +2369,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Mit Zahlung der Steuer
 DocType: Expense Claim Detail,Expense Claim Detail,Aufwandsabrechnungsdetail
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICATE FÜR LIEFERANTEN
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Bitte richtiges Konto auswählen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Bitte richtiges Konto auswählen
 DocType: Item,Weight UOM,Gewichts-Maßeinheit
 DocType: Salary Structure Employee,Salary Structure Employee,Gehaltsstruktur Mitarbeiter
 DocType: Patient,Blood Group,Blutgruppe
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Ausstehend
 DocType: Course,Course Name,Kursname
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Benutzer, die die Urlaubsanträge eines bestimmten Mitarbeiters genehmigen können"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Büroausstattung
@@ -2350,7 +2391,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Die Preise werden nicht angezeigt, wenn Preisliste nicht gesetzt"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Bitte ein Land für diese Versandregel angeben oder ""Weltweiter Versand"" aktivieren"
 DocType: Stock Entry,Total Incoming Value,Summe der Einnahmen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Debit Um erforderlich
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Debit Um erforderlich
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Zeiterfassungen helfen den Überblick über Zeit, Kosten und Abrechnung für Aktivitäten von Ihrem Team getan"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Einkaufspreisliste
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Vorlagen der Lieferanten-Scorecard-Variablen.
@@ -2360,8 +2401,9 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Zahlungsabgleich
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Bitte den Namen der verantwortlichen Person auswählen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technologie
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Noch nicht bezahlt: {0}
-DocType: BOM Website Operation,BOM Website Operation,BOM Webseite Tätigkeits
+DocType: Hub Settings,Unregister from Hub,Heben Sie die Registrierung von Hub auf
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Noch nicht bezahlt: {0}
+DocType: BOM Website Operation,BOM Website Operation,BOM Webseite Vorgang
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Angebotsschreiben
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Materialanfragen (MAF) und Fertigungsaufträge generieren
 DocType: Supplier Scorecard,Supplier Score,Lieferantenbewertung
@@ -2372,7 +2414,9 @@
 DocType: Physician Schedule Time Slot,To Time,Bis-Zeit
 DocType: Authorization Rule,Approving Role (above authorized value),Genehmigende Rolle (über dem autorisierten Wert)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Habenkonto muss ein Verbindlichkeitenkonto sein
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},Stücklisten-Rekursion: {0} kann nicht übergeordnetes Element oder Unterpunkt von {2} sein
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Bitte wählen Sie den Studenteneintritt aus, der für den bezahlten Studenten obligatorisch ist"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},Stücklisten-Rekursion: {0} kann nicht übergeordnetes Element oder Unterpunkt von {2} sein
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,"Bitte wählen Sie eine Preisliste aus, um Preise zu veröffentlichen"
 DocType: Production Order Operation,Completed Qty,Gefertigte Menge
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",Für {0} können nur Sollkonten mit einer weiteren Habenbuchung verknüpft werden
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Preisliste {0} ist deaktiviert
@@ -2380,42 +2424,43 @@
 DocType: Manufacturing Settings,Allow Overtime,Überstunden zulassen
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",Serialized Item {0} kann nicht mit der Bestandsabstimmung aktualisiert werden. Bitte verwenden Sie den Stock Entry
 DocType: Training Event Employee,Training Event Employee,Schulungsveranstaltung Mitarbeiter
-apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +6,Add Time Slots,Zeitschlitze hinzufügen
+apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +6,Add Time Slots,Zeitfenster hinzufügen
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Seriennummern für Artikel {1} erforderlich. Sie haben {2} zur Verfügung gestellt.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktueller Wertansatz
 DocType: Item,Customer Item Codes,Kundenartikelnummern
+DocType: Training Event,Advance,Vorschuss
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,um wiederkehrend zu sein.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange-Gewinn / Verlust
 DocType: Opportunity,Lost Reason,Verlustgrund
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Neue Adresse
 DocType: Quality Inspection,Sample Size,Stichprobenumfang
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Bitte geben Sie Eingangsbeleg
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Alle Artikel sind bereits abgerechnet
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Bitte eine eine gültige ""Von Fall Nr."" angeben"
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',"Bitte eine eine gültige ""Von Fall Nr."" angeben"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Weitere Kostenstellen können unter Gruppen angelegt werden, aber Buchungen können zu nicht-Gruppen erstellt werden"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Benutzer und Berechtigungen
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Fertigungsaufträge Erstellt: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Fertigungsaufträge Erstellt: {0}
 DocType: Branch,Branch,Filiale
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Druck und Branding
 DocType: Company,Total Monthly Sales,Gesamtmonatsumsatz
 DocType: Bin,Actual Quantity,Tatsächlicher Bestand
 DocType: Shipping Rule,example: Next Day Shipping,Beispiel: Versand am nächsten Tag
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Seriennummer {0} wurde nicht gefunden
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Abonnement wurde {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Abonnement wurde {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Fee Zeitplan Programm
 DocType: Fee Schedule Program,Student Batch,Student Batch
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,select * from `tabVital Signs` wo Patient = &#39;{0}&#39; bestellen von signs_date desc limit 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Schüler anlegen
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Min
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Sie wurden zur Zusammenarbeit für das Projekt {0} eingeladen.
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Arzt nicht verfügbar auf {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Sie wurden zur Zusammenarbeit für das Projekt {0} eingeladen.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Arzt nicht verfügbar auf {0}
 DocType: Leave Block List Date,Block Date,Datum sperren
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Benutzerdefiniertes Feld hinzufügen Abonnement-ID im Doctype {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Lieferumfang
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Jetzt bewerben
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Jetzt bewerben
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Tatsächliche Menge {0} / Wartezeit {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-Commerce GSTIN
 DocType: Sales Order,Not Delivered,Nicht geliefert
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Das erwartete Datum darf nicht vor dem Transaktionsdatum liegen
 ,Bank Clearance Summary,Zusammenfassung Bankabwicklungen
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Tägliche, wöchentliche und monatliche E-Mail-Berichte erstellen und verwalten"
 DocType: Appraisal Goal,Appraisal Goal,Bewertungsziel
@@ -2423,12 +2468,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Gebäude
 DocType: Fee Schedule,Fee Structure,Gebührenstruktur
 DocType: Timesheet Detail,Costing Amount,Kalkulationsbetrag
-DocType: Student Admission,Application Fee,Anmeldegebühr
+DocType: Student Admission Program,Application Fee,Anmeldegebühr
 DocType: Process Payroll,Submit Salary Slip,Gehaltsabrechnung übertragen
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maximaler Rabatt für Artikel {0} beträgt {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Maximaler Rabatt für Artikel {0} beträgt {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Mengenimport
 DocType: Sales Partner,Address & Contacts,Adresse & Kontaktinformationen
 DocType: SMS Log,Sender Name,Absendername
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Nach Kriterien sortieren
 DocType: POS Profile,[Select],[Select]
 DocType: Vital Signs,Blood Pressure (diastolic),Blutdruck (diastolisch)
 DocType: SMS Log,Sent To,Gesendet An
@@ -2437,10 +2483,10 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Nächste Kontakt Datum kann nicht in der Vergangenheit liegen
 DocType: Company,For Reference Only.,Nur zu Referenzzwecken.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Arzt {0} nicht verfügbar auf {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Wählen Sie Batch No
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Wählen Sie Batch No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ungültige(r/s) {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-Ret
-DocType: Fee Validity,Reference Inv,Referenz Inv
+DocType: Fee Validity,Reference Inv,Referenz ERE
 DocType: Sales Invoice Advance,Advance Amount,Anzahlungsbetrag
 DocType: Manufacturing Settings,Capacity Planning,Kapazitätsplanung
 DocType: Supplier Quotation,Rounding Adjustment (Company Currency,Abrundung (Firmenwährung
@@ -2453,15 +2499,15 @@
 DocType: Normal Test Items,Require Result Value,Erforderlichen Ergebniswert
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Fall-Nr. kann nicht 0 sein
 DocType: Item,Show a slideshow at the top of the page,Diaschau oben auf der Seite anzeigen
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Lagerräume
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Stücklisten
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Lagerräume
 DocType: Project Type,Projects Manager,Projektleiter
 DocType: Serial No,Delivery Time,Zeitpunkt der Lieferung
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Alter basierend auf
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Termin storniert
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Termin abgesagt
 DocType: Item,End of Life,Ende der Lebensdauer
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Reise
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Keine aktive oder Standard-Gehaltsstruktur für Mitarbeiter gefunden {0} für die angegebenen Daten
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Reise
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Keine aktive oder Standard-Gehaltsstruktur für Mitarbeiter gefunden {0} für die angegebenen Daten
 DocType: Leave Block List,Allow Users,Benutzer zulassen
 DocType: Purchase Order,Customer Mobile No,Mobilnummer des Kunden
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Wiederkehrend
@@ -2470,12 +2516,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Kosten aktualisieren
 DocType: Item Reorder,Item Reorder,Artikelnachbestellung
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Anzeigen Gehaltsabrechnung
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Material übergeben
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Material übergeben
 DocType: Fees,Send Payment Request,Zahlungsauftrag senden
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",Arbeitsgänge und Betriebskosten angeben und eine eindeutige Arbeitsgang-Nr. für diesen Arbeitsgang angeben.
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dieses Dokument ist über dem Limit von {0} {1} für item {4}. Machen Sie eine andere {3} gegen die gleiche {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Bitte setzen Sie wiederkehrende nach dem Speichern
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Wählen Sie Änderungsbetrag Konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Wählen Sie Änderungsbetrag Konto
 DocType: Purchase Invoice,Price List Currency,Preislistenwährung
 DocType: Naming Series,User must always select,Benutzer muss immer auswählen
 DocType: Stock Settings,Allow Negative Stock,Negativen Lagerbestand zulassen
@@ -2495,24 +2541,26 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Mitarbeiter
 DocType: Sample Collection,Collected Time,Gesammelte Zeit
 DocType: Company,Sales Monthly History,Verkäufe Monatliche Geschichte
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Wählen Sie Batch
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Wählen Sie Batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} wird voll in Rechnung gestellt
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Vitalfunktionen
 DocType: Training Event,End Time,Endzeit
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +63,Active Salary Structure {0} found for employee {1} for the given dates,Aktive Gehaltsstruktur {0} für Mitarbeiter gefunden {1} für die angegebenen Daten
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +63,Active Salary Structure {0} found for employee {1} for the given dates,Aktive Gehaltsstruktur {0} für diesen Mitarbeiter gefunden {1} mit den folgenden Daten
 DocType: Payment Entry,Payment Deductions or Loss,Zahlung Abzüge oder Verlust
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Allgemeine Vertragsbedingungen für den Verkauf und Einkauf
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Gruppieren nach Beleg
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,"Sind Sie sicher, dass Sie diesen Termin stornieren möchten?"
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Vertriebspipeline
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Bitte setzen Sie Standardkonto in Gehaltskomponente {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Benötigt am
 DocType: Rename Tool,File to Rename,"Datei, die umbenannt werden soll"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Bitte wählen Sie Stückliste für Artikel in Zeile {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Bitte wählen Sie Stückliste für Artikel in Zeile {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Konto {0} stimmt nicht mit der Firma {1} im Rechnungsmodus überein: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Angegebene Stückliste {0} gibt es nicht für Artikel {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Wartungsplan {0} muss vor Stornierung dieses Kundenauftrages aufgehoben werden
+DocType: POS Profile,Applicable for Users,Anwendbar für Benutzer
 DocType: Notification Control,Expense Claim Approved,Aufwandsabrechnung genehmigt
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Gehaltsabrechnung der Mitarbeiter {0} für diesen Zeitraum bereits erstellt
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Gehaltsabrechnung der Mitarbeiter {0} für diesen Zeitraum bereits erstellt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Arzneimittel
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Aufwendungen für bezogene Artikel
 DocType: Selling Settings,Sales Order Required,Kundenauftrag erforderlich
@@ -2528,14 +2576,15 @@
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Stücklisten-Nr. für einen fertigen Artikel
 DocType: Upload Attendance,Attendance To Date,Anwesenheit bis Datum
 DocType: Request for Quotation Supplier,No Quote,Kein Zitat
-DocType: Warranty Claim,Raised By,Gemeldet von
+DocType: Warranty Claim,Raised By,Gemeldet durch
 DocType: Payment Gateway Account,Payment Account,Zahlungskonto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +880,Please specify Company to proceed,Bitte Firma angeben um fortzufahren
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Nettoveränderung der Forderungen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Compensatory Off,Ausgleich für
 DocType: Offer Letter,Accepted,Genehmigt
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Organisation
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Firma
 DocType: BOM Update Tool,BOM Update Tool,BOM Update Tool
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Party-Konto nicht angegeben, bitte Standardkonto in Firma einrichten"
 DocType: SG Creation Tool Course,Student Group Name,Schülergruppenname
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Gebühren anlegen
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Bitte sicher stellen, dass wirklich alle Transaktionen für diese Firma gelöscht werden sollen. Die Stammdaten bleiben bestehen. Diese Aktion kann nicht rückgängig gemacht werden."
@@ -2543,30 +2592,31 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Ungültige Referenz {0} {1}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kann nicht größer sein als die geplante Menge ({2}) im Fertigungsauftrag {3}
 DocType: Shipping Rule,Shipping Rule Label,Bezeichnung der Versandregel
-apps/erpnext/erpnext/public/js/conf.js +28,User Forum,User Forum
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Rohmaterial kann nicht leer sein
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Lager konnte nicht aktualisiert werden, Rechnung enthält Direktversand-Artikel."
+apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Benutzer-Forum
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Rohmaterial kann nicht leer sein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Lager konnte nicht aktualisiert werden, Rechnung enthält Direktversand-Artikel."
 DocType: Lab Test Sample,Lab Test Sample,Labortestprobe
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Schnellbuchung
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Sie können den Preis nicht ändern, wenn eine Stückliste für einen Artikel aufgeführt ist"
+DocType: Restaurant,Invoice Series Prefix,Rechnungsserie Präfix
 DocType: Employee,Previous Work Experience,Vorherige Berufserfahrung
 DocType: Stock Entry,For Quantity,Für Menge
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Bitte die geplante Menge für Artikel {0} in Zeile {1} eingeben
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Bitte die geplante Menge für Artikel {0} in Zeile {1} eingeben
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} wurde nicht übertragen
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Artikelanfragen
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Für jeden zu fertigenden Artikel wird ein separater Fertigungsauftrag erstellt.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} muss im Retourenschein negativ sein
 ,Minutes to First Response for Issues,Minutes to First Response für Probleme
 DocType: Purchase Invoice,Terms and Conditions1,Allgemeine Geschäftsbedingungen1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,"Der Name des Instituts, für die Sie setzen dieses System."
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,"Der Name des Instituts, für die Sie setzen dieses System."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",Buchung wurde bis zu folgendem Zeitpunkt gesperrt. Bearbeiten oder ändern kann nur die Person in unten stehender Rolle.
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Bitte das Dokument vor dem Erstellen eines Wartungsplans abspeichern
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Aktueller Preis in allen Stücklisten aktualisiert
 DocType: Fee Schedule,Successful,Erfolgreich
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projektstatus
 DocType: UOM,Check this to disallow fractions. (for Nos),"Hier aktivieren, um keine Bruchteile zuzulassen (für Nr.)"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Die folgenden Fertigungsaufträge wurden erstellt:
-DocType: Student Admission,Naming Series (for Student Applicant),Namens Series (für Studienbewerber)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Die folgenden Fertigungsaufträge wurden erstellt:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Namens Series (für Studienbewerber)
 DocType: Delivery Note,Transporter Name,Name des Transportunternehmers
 DocType: Authorization Rule,Authorized Value,Autorisierter Wert
 DocType: BOM,Show Operations,zeigen Operationen
@@ -2590,7 +2640,7 @@
 ,Employees working on a holiday,Die Mitarbeiter an einem Feiertag arbeiten
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Anwesend setzen
 DocType: Project,% Complete Method,% abgeschlossene Methode
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Droge
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Droge
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Startdatum der Wartung kann nicht vor dem Liefertermin für Seriennummer {0} liegen
 DocType: Production Order,Actual End Date,Tatsächliches Enddatum
 DocType: BOM,Operating Cost (Company Currency),Betriebskosten (Gesellschaft Währung)
@@ -2603,24 +2653,25 @@
 DocType: Item,Will also apply for variants unless overrridden,"Gilt auch für Varianten, sofern nicht außer Kraft gesetzt"
 DocType: Purchase Invoice,Advances,Anzahlungen
 DocType: Production Order,Manufacture against Material Request,"Herstellen, gegen Material anfordern"
-apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +10,Assessment Group: ,Assessment Group:
+apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +10,Assessment Group: ,Beurteilungsgruppe:
 DocType: Item Reorder,Request for,Anfrage für
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,"Genehmigender Benutzer kann nicht derselbe Benutzer sein wie derjenige, auf den die Regel anzuwenden ist"
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Grundbetrag (nach Lagermaßeinheit)
 DocType: SMS Log,No of Requested SMS,Anzahl angeforderter SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Lassen Sie ohne Bezahlung nicht mit genehmigten Urlaubsantrag Aufzeichnungen überein
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Unbezahlter Urlaub passt nicht zu den bestätigten Urlaubsanträgen.
 DocType: Campaign,Campaign-.####,Kampagne-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Nächste Schritte
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Bitte geben Sie die angegebenen Elemente zu den bestmöglichen Preisen
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Rechnung erstellen
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto schließen Gelegenheit nach 15 Tagen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Kaufaufträge sind für {0} wegen einer Scorecard von {1} nicht erlaubt.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Kaufaufträge sind für {0} wegen einer Scorecard von {1} nicht erlaubt.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Ende Jahr
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Vertragsende muss weiter in der Zukunft liegen als Eintrittsdatum sein
 DocType: Vital Signs,Nutrition Values,Ernährungswerte
 DocType: Lab Test Template,Is billable,Ist abrechenbar
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Sowohl &quot;Physician Schedule&quot; als auch &quot;Time Per Appointment&quot; müssen für Dr {0} festgelegt werden
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Ein Drittanbieter/Händler/Kommissionär/verbundenes Unternehmen/Wiederverkäufer, der die Produkte auf Provisionsbasis verkauft."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} zu Lieferantenauftrag {1}
 DocType: Patient,Patient Demographics,Patienten-Demographie
@@ -2670,9 +2721,8 @@
 10. Hinzufügen oder abziehen: Gibt an, ob die Steuer/Abgabe hinzugefügt oder abgezogen wird."
 DocType: Homepage,Homepage,Webseite
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Arzt auswählen ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',update tabConsultation set invoice = &#39;{0}&#39; wobei name = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Erhaltene Menge
-apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Fee Aufzeichnungen Erstellt - {0}
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Gebühren-Aufzeichnungen erstellt - {0}
 DocType: Asset Category Account,Asset Category Account,Anlagekategorie Konto
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +117,Cannot produce more Item {0} than Sales Order quantity {1},"Es können nicht mehr Artikel {0} produziert werden, als die über Kundenaufträge bestellte Stückzahl {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Lagerbuchung {0} wurde nicht übertragen
@@ -2682,7 +2732,7 @@
 DocType: Asset,Manual,Handbuch
 DocType: Salary Component Account,Salary Component Account,Gehaltskomponente Account
 DocType: Global Defaults,Hide Currency Symbol,Währungssymbol ausblenden
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","z. B. Bank, Bargeld, Kreditkarte"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","z. B. Bank, Bargeld, Kreditkarte"
 DocType: Lead Source,Source Name,Quellenname
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Normaler Ruhe-Blutdruck bei einem Erwachsenen ist etwa 120 mmHg systolisch und 80 mmHg diastolisch, abgekürzt &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Gutschrift
@@ -2696,21 +2746,21 @@
 DocType: Salary Detail,Amount based on formula,"Menge, bezogen auf Formel"
 DocType: Purchase Invoice,Currency and Price List,Währung und Preisliste
 DocType: Opportunity,Customer / Lead Name,Kunden- / Lead-Name
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Abwicklungsdatum nicht benannt
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Abrechnungsdatum nicht erwähnt
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Produktion
 DocType: Patient,Occupation,Beruf
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Zeile {0}: Startdatum muss vor dem Enddatum liegen
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Summe (Anzahl)
-DocType: Sales Invoice,This Document,Dieses Dokument
 DocType: Installation Note Item,Installed Qty,Installierte Anzahl
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Dies könnte wegen einiger ungültiger E-Mail-Adressen in der
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Du hast hinzugefügt
 DocType: Purchase Taxes and Charges,Parenttype,Typ des übergeordneten Elements
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Trainingsergebnis
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Trainingsergebnis
 DocType: Purchase Invoice,Is Paid,Ist bezahlt
 DocType: Salary Structure,Total Earning,Gesamteinnahmen
 DocType: Purchase Receipt,Time at which materials were received,"Zeitpunkt, zu dem Materialien empfangen wurden"
 DocType: Stock Ledger Entry,Outgoing Rate,Verkaufspreis
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Stammdaten zu Unternehmensfilialen
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Stammdaten zu Unternehmensfilialen
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,oder
 DocType: Sales Order,Billing Status,Abrechnungsstatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Einen Fall melden
@@ -2725,7 +2775,8 @@
 DocType: Notification Control,Sales Order Message,Benachrichtigung über Kundenauftrag
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Standardwerte wie Firma, Währung, aktuelles Geschäftsjahr usw. festlegen"
 DocType: Payment Entry,Payment Type,Zahlungsart
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Bitte wählen Sie einen Batch für Item {0}. Es ist nicht möglich, eine einzelne Charge zu finden, die diese Anforderung erfüllt"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Bitte wählen Sie einen Batch für Item {0}. Es ist nicht möglich, eine einzelne Charge zu finden, die diese Anforderung erfüllt"
+DocType: Hub Category,Parent Category,Eltern-Kategorie
 DocType: Process Payroll,Select Employees,Mitarbeiter auswählen
 DocType: Opportunity,Potential Sales Deal,Möglicher Verkaufsabschluss
 DocType: Complaint,Complaints,Beschwerden
@@ -2762,7 +2813,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),Kennzeichnung des Paketes für die Lieferung (für den Druck)
 DocType: Bin,Reserved Quantity,Reservierte Menge
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Bitte geben Sie eine gültige Email Adresse an
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Bitte wählen Sie einen Artikel im Warenkorb
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Bitte wählen Sie einen Artikel im Warenkorb
 DocType: Landed Cost Voucher,Purchase Receipt Items,Kaufbeleg-Artikel
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formulare anpassen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,Rückstand
@@ -2772,15 +2823,15 @@
 DocType: Payment Request,Amount in customer's currency,Betrag in Kundenwährung
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Auslieferung
 DocType: Stock Reconciliation Item,Current Qty,Aktuelle Anzahl
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Lieferanten hinzufügen
+DocType: Restaurant Menu,Restaurant Menu,Speisekarte
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Vorherige
 DocType: Appraisal Goal,Key Responsibility Area,Entscheidender Verantwortungsbereich
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Studenten Batches helfen Ihnen die Teilnahme, Einschätzungen und Gebühren für Studenten verfolgen"
 DocType: Payment Entry,Total Allocated Amount,Insgesamt geschätzter Betrag
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Setzen Sie das Inventurkonto für das Inventar
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Inventurkonto für permanente Inventur auswählen
 DocType: Item Reorder,Material Request Type,Materialanfragetyp
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural Journaleintrag für die Gehälter von {0} {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","Localstorage voll ist, nicht speichern"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural Journaleintrag für die Gehälter von {0} bis {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","Localstorage voll ist, nicht speichern"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Zeile {0}: Umrechnungsfaktor für Maßeinheit ist zwingend erforderlich
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Raumkapazität
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref.
@@ -2819,21 +2870,23 @@
 DocType: Project,Task Completion,Aufgabenerledigung
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Nicht lagernd
 DocType: Appraisal,HR User,Nutzer Personalabteilung
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Steuern und Gebühren abgezogen
-apps/erpnext/erpnext/hooks.py +129,Issues,Fälle
+apps/erpnext/erpnext/hooks.py +138,Issues,Probleme
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status muss einer aus {0} sein
 DocType: Sales Invoice,Debit To,Belasten auf
+DocType: Restaurant Menu Item,Restaurant Menu Item,Restaurant-Menüpunkt
 DocType: Delivery Note,Required only for sample item.,Nur erforderlich für Probeartikel.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Tatsächliche Anzahl nach Transaktionen
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Kein Gehaltszettel gefunden zwischen {0} und {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Kein Gehaltszettel gefunden zwischen {0} und {1}
 ,Pending SO Items For Purchase Request,Ausstehende Artikel aus Kundenaufträgen für Lieferantenanfrage
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Student Admissions
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} ist deaktiviert
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Student Admissions
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} ist deaktiviert
 DocType: Supplier,Billing Currency,Abrechnungswährung
 DocType: Sales Invoice,SINV-RET-,SINV-Ret
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Besonders groß
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,insgesamt Blätter
-DocType: Consultation,In print,Im Druck
+DocType: Consultation,In print,in Druckbuchstaben
 ,Profit and Loss Statement,Gewinn- und Verlustrechnung
 DocType: Bank Reconciliation Detail,Cheque Number,Schecknummer
 ,Sales Browser,Vertriebs-Browser
@@ -2851,6 +2904,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Bitte bei ""Besuche erforderlich"" NEIN angeben"
 DocType: Stock Settings,Default Valuation Method,Standard-Bewertungsmethode
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,Gebühr
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Aktualisierung läuft. Es kann eine Weile dauern.
 DocType: Vehicle Log,Fuel Qty,Kraftstoff-Menge
 DocType: Production Order Operation,Planned Start Time,Geplante Startzeit
 DocType: Course,Assessment,Beurteilung
@@ -2866,11 +2920,11 @@
 DocType: Price List,Price List Master,Preislisten-Vorlagen
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alle Verkaufstransaktionen können für mehrere verschiedene ""Vertriebsmitarbeiter"" markiert werden, so dass Ziele festgelegt und überwacht werden können."
 ,S.O. No.,Nummer der Lieferantenbestellung
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Bitte Kunden aus Lead {0} erstellen
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Bitte Kunden aus Lead {0} erstellen
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Wählen Sie Patient aus
 DocType: Price List,Applicable for Countries,Anwenden für Länder
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Parametername
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Lassen Sie nur Anwendungen mit dem Status &quot;Approved&quot; und &quot;Abgelehnt&quot; eingereicht werden können
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"Nur Urlaubsanträge mit dem Status ""Gewährt"" und ""Abgelehnt"" können übermittelt werden."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Studentengruppenname ist obligatorisch in Zeile {0}
 DocType: Homepage,Products to be shown on website homepage,"Produkte, die auf der Webseite angezeigt werden"
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Dies ist eine Root-Kundengruppe und kann nicht bearbeitet werden.
@@ -2909,27 +2963,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,Lieferant Rechnungsdetails
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Aufwands-/Differenz-Konto ({0}) muss ein ""Gewinn oder Verlust""-Konto sein"
 DocType: Project,Copied From,Kopiert von
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Name Fehler: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Mangel
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Name Fehler: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,Mangel
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} kann nicht mit {2} {3} in Zusammenhang gebracht werden
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,"""Anwesenheit von Mitarbeiter"" {0} ist bereits markiert"
 DocType: Packing Slip,If more than one package of the same type (for print),Wenn es mehr als ein Paket von der gleichen Art (für den Druck) gibt
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Bitte setzen Sie den Standardkunden in den Restauranteinstellungen
 ,Salary Register,Gehalt Register
 DocType: Warehouse,Parent Warehouse,Eltern Lager
 DocType: C-Form Invoice Detail,Net Total,Nettosumme
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Standard-Stückliste nicht gefunden für Position {0} und Projekt {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Standard-Stückliste nicht gefunden für Position {0} und Projekt {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Definieren Sie verschiedene Darlehensarten
 DocType: Bin,FCFS Rate,"""Wer-zuerst-kommt-mahlt-zuerst""-Anteil (Windhundverfahren)"
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Ausstehender Betrag
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Zeit (in Min)
 DocType: Project Task,Working,In Bearbeitung
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Lagerverfahren (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Geschäftsjahr
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Geschäftsjahr
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} gehört nicht zu Firma {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,"Konnte die Kriterien-Score-Funktion für {0} nicht lösen. Stellen Sie sicher, dass die Formel gültig ist."
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,"Kosten, da auf"
-DocType: Healthcare Settings,Out Patient Settings,Out Patient Einstellungen
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,"Kosten, wie auf"
+DocType: Healthcare Settings,Out Patient Settings,Einstellungen für ambulante Patienten
 DocType: Account,Round Off,Abschliessen
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Menge muss positiv sein
 ,Requested Qty,Angeforderte Menge
 DocType: Tax Rule,Use for Shopping Cart,Für den Einkaufswagen verwenden
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Wert {0} für Attribut {1} existiert nicht in der Liste der gültigen Artikelattributwerte für den Posten {2}
@@ -2938,7 +2994,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",Die Kosten werden gemäß Ihrer Wahl anteilig verteilt basierend auf Artikelmenge oder -preis
 DocType: Maintenance Visit,Purposes,Zwecke
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Mindestens ein Artikel sollte mit negativer Menge in das Rückgabedokument eingegeben werden
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Kurse hinzufügen
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",Arbeitsgang {0} ist länger als alle verfügbaren Arbeitszeiten am Arbeitsplatz {1}. Bitte den Vorgang in mehrere Teilarbeitsgänge aufteilen.
 ,Requested,Angefordert
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Keine Anmerkungen
@@ -2950,9 +3005,11 @@
 DocType: Employee Loan,Repaid/Closed,Vergolten / Geschlossen
 DocType: Item,Total Projected Qty,Prognostizierte Gesamtmenge
 DocType: Monthly Distribution,Distribution Name,Bezeichnung der Verteilung
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Lieferant&gt; Lieferantentyp
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Bewertungsrate, die für die Position {0} nicht gefunden wurde, die für die Buchungseinträge für {1} {2} erforderlich ist. Wenn die Position als Nullbewertungssatz in der {1} abgewickelt wird, erwähnen Sie bitte in der Tabelle {1}. Andernfalls erstellen Sie bitte eine eingehende Bestandsabwicklung für die Position oder erwähnen Sie den Bewertungssatz im Positionsdatensatz und versuchen Sie dann, diesen Eintrag einzureichen"
 DocType: Course,Course Code,Kursnummer
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Qualitätsprüfung für den Posten erforderlich {0}
-DocType: POS Settings,Use POS in Offline Mode,Verwenden Sie POS im Offline-Modus
+DocType: POS Settings,Use POS in Offline Mode,POS im Offline-Modus verwenden
 DocType: Supplier Scorecard,Supplier Variables,Lieferantenvariablen
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Kurs, zu dem die Währung des Kunden in die Basiswährung des Unternehmens umgerechnet wird"
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Nettopreis (Firmenwährung)
@@ -2960,14 +3017,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Baumstruktur der Regionen verwalten
 DocType: Journal Entry Account,Sales Invoice,Ausgangsrechnung
 DocType: Journal Entry Account,Party Balance,Gruppen-Saldo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,"Bitte ""Rabatt anwenden auf"" auswählen"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,"Bitte ""Rabatt anwenden auf"" auswählen"
 DocType: Company,Default Receivable Account,Standard-Forderungskonto
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,"Bankbuchung für die Gesamtvergütung, die gemäß der oben ausgewählten Kriterien bezahlt wurde, erstellen"
 DocType: Physician,Physician Schedule,Arzt Zeitplan
 DocType: Purchase Invoice,Deemed Export,Ausgenommener Export
 DocType: Stock Entry,Material Transfer for Manufacture,Materialübertrag für Herstellung
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Der Rabatt-Prozentsatz kann entweder auf eine Preisliste oder auf alle Preislisten angewandt werden.
-DocType: Purchase Invoice,Half-yearly,Halbjährlich
+DocType: Subscription,Half-yearly,Halbjährlich
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Lagerbuchung
 DocType: Lab Test,LabTest Approver,LabTest Genehmiger
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Sie haben bereits für die Bewertungskriterien beurteilt.
@@ -2996,13 +3053,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Besonders klein
 DocType: Company,Standard Template,Standard Template
 DocType: Training Event,Theory,Theorie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Achtung : Materialanfragemenge ist geringer als die Mindestbestellmenge
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Achtung : Materialanfragemenge ist geringer als die Mindestbestellmenge
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Konto {0} ist gesperrt
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Juristische Person/Niederlassung mit einem separaten Kontenplan, die zum Unternehmen gehört."
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Lebensmittel, Getränke und Tabak"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Zahlung kann nur zu einer noch nicht abgerechneten {0} erstellt werden
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Provisionssatz kann nicht größer als 100 sein
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Zahlung kann nur zu einer noch nicht abgerechneten {0} erstellt werden
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Provisionssatz kann nicht größer als 100 sein
 DocType: Stock Entry,Subcontract,Zulieferer
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Bitte geben Sie zuerst {0} ein
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Keine Antworten
@@ -3020,10 +3077,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Farbe
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Kriterien des Beurteilungsplans
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Vermeidung von Bestellungen
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Anfällig
 DocType: Patient Appointment,Scheduled,Geplant
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Angebotsanfrage.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Bitte richten Sie Mitarbeiter-Naming-System in Human Resource&gt; HR-Einstellungen ein
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Bitte einen Artikel auswählen, bei dem ""Ist Lagerartikel"" mit ""Nein"" und ""Ist Verkaufsartikel"" mit ""Ja"" bezeichnet ist, und es kein anderes Produkt-Bundle gibt"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Kunden auswählen
 DocType: Student Log,Academic,akademisch
 DocType: Patient,Personal and Social History,Persönliche und gesellschaftliche Geschichte
 DocType: Fee Schedule,Fee Breakup for each student,Fee Breakup für jeden Schüler
@@ -3033,7 +3091,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Wertansatz
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Preislistenwährung nicht ausgewählt
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Preislistenwährung nicht ausgewählt
 apps/erpnext/erpnext/config/healthcare.py +46,Results,Ergebnisse
 ,Student Monthly Attendance Sheet,Schülermonatsanwesenheits
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Mitarbeiter {0} hat sich bereits für {1} zwischen {2} und {3} beworben
@@ -3043,14 +3101,14 @@
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Student Group oder Kursplan ist Pflicht
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Pflegen Abrechnungszeiten und Arbeitszeiten Same auf Stundenzettel
 DocType: Maintenance Visit Purpose,Against Document No,Zu Dokument Nr.
-DocType: BOM,Scrap,Schrott
+DocType: BOM,Scrap,Abfall / Ausschuss
 apps/erpnext/erpnext/utilities/user_progress.py +196,Go to Instructors,Gehen Sie zu Instruktoren
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Vertriebspartner verwalten
 DocType: Quality Inspection,Inspection Type,Art der Prüfung
 DocType: Fee Validity,Visited yet,Besucht noch
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Lagerhäuser mit bestehenden Transaktion nicht zu einer Gruppe umgewandelt werden.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Lagerhäuser mit bestehenden Transaktion nicht zu einer Gruppe umgewandelt werden.
 DocType: Assessment Result Tool,Result HTML,Ergebnis HTML
-apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Läuft aus am
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Verfällt am
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Schüler hinzufügen
 DocType: C-Form,C-Form No,Kontakt-Formular-Nr.
 DocType: BOM,Exploded_items,Aufgelöste Artikel
@@ -3075,7 +3133,7 @@
 DocType: Healthcare Settings,Result Printed,Ergebnis Gedruckt
 DocType: Asset Category Account,Depreciation Expense Account,Aufwandskonto Abschreibungen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Probezeit
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Ansicht {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Ansicht {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,In dieser Transaktion sind nur Unterknoten erlaubt
 DocType: Expense Claim,Expense Approver,Ausgabenbewilliger
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Row {0}: Voraus gegen Kunde muss Kredit
@@ -3086,7 +3144,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Bis Datum und Uhrzeit
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Kurstermine gestrichen:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Protokolle über den SMS-Versand
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Verkaufsziel setzen
 DocType: Accounts Settings,Make Payment via Journal Entry,Zahlung über Journaleintrag
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Gedruckt auf
 DocType: Item,Inspection Required before Delivery,Inspektion Notwendige vor der Auslieferung
@@ -3094,7 +3151,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Ausstehende Aktivitäten
 DocType: Patient Appointment,Reminded,Erinnert
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Ihre Organisation
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Ihre Organisation
 DocType: Fee Component,Fees Category,Gebühren Kategorie
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Bitte Freistellungsdatum eingeben.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Menge
@@ -3106,7 +3163,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Meldebestand
 DocType: Company,Chart Of Accounts Template,Kontenvorlage
 DocType: Attendance,Attendance Date,Anwesenheitsdatum
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Artikel Preis aktualisiert für {0} in der Preisliste {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Artikel Preis aktualisiert für {0} in der Preisliste {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Gehaltsaufteilung nach Einkommen und Abzügen.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Ein Konto mit Unterknoten kann nicht in ein Kontoblatt umgewandelt werden
 DocType: Purchase Invoice Item,Accepted Warehouse,Annahmelager
@@ -3122,9 +3179,10 @@
 ,Employee Birthday,Mitarbeiter-Geburtstag
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Studenten Batch Teilnahme Werkzeug
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,Grenze überschritten
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Geplante bis
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Risikokapital
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Ein akademischer Begriff mit diesem &quot;Academic Year &#39;{0} und&quot; Bezeichnen Namen&#39; {1} ist bereits vorhanden. Bitte ändern Sie diese Einträge und versuchen Sie es erneut.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Da bestehende Transaktionen gegen Artikel sind {0}, können Sie nicht den Wert ändern {1}"
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Ein Semester mit diesem ""Semesterjahr""'{0} und ""Semesternamen' {1} ist bereits vorhanden. Bitte ändern Sie diese entsprechend und versuchen Sie es erneut."
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Da bestehende Transaktionen gegen Artikel sind {0}, können Sie nicht den Wert ändern {1}"
 DocType: UOM,Must be Whole Number,Muss eine ganze Zahl sein
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Neue Urlaubszuordnung (in Tagen)
 DocType: Purchase Invoice,Invoice Copy,Rechnungskopie
@@ -3134,7 +3192,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Rechnungsnummer
 DocType: Shopping Cart Settings,Orders,Bestellungen
 DocType: Employee Leave Approver,Leave Approver,Urlaubsgenehmiger
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Bitte wählen Sie eine Charge
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Bitte wählen Sie eine Charge
 DocType: Assessment Group,Assessment Group Name,Name der Beurteilungsgruppe
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material zur Herstellung übertragen
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Ein Benutzer mit der Rolle ""Ausgabengenehmiger"""
@@ -3149,10 +3207,10 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Periodenabschlussbuchung
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Wählen Sie Abteilung ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Kostenstelle mit bestehenden Transaktionen kann nicht in eine Gruppe umgewandelt werden
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Menge {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Menge {0} {1} {2} {3}
 DocType: Account,Depreciation,Abschreibung
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Lieferant(en)
-DocType: Employee Attendance Tool,Employee Attendance Tool,Angestellt-Anwesenheits-Tool
+DocType: Employee Attendance Tool,Employee Attendance Tool,MItarbeiter-Anwesenheits-Werkzeug
 DocType: Guardian Student,Guardian Student,Wächter Studenten
 DocType: Supplier,Credit Limit,Kreditlimit
 DocType: Production Plan Sales Order,Salse Order Date,Bestelldatum
@@ -3160,10 +3218,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,Zahlungs Einträge {0} sind un-linked
 DocType: GL Entry,Voucher No,Belegnr.
 ,Lead Owner Efficiency,Lead Besitzer Effizienz
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Am beliebtesten
 DocType: Leave Allocation,Leave Allocation,Urlaubszuordnung
 DocType: Payment Request,Recipient Message And Payment Details,Empfänger der Nachricht und Zahlungsdetails
 DocType: Training Event,Trainer Email,Trainer E-Mail
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Materialanfrage {0} erstellt
+DocType: Restaurant Reservation,No of People,Nein von Menschen
 DocType: Production Planning Tool,Include sub-contracted raw materials,Fügen Sie Unteraufträge Rohstoffe
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Vorlage für Geschäftsbedingungen oder Vertrag
 DocType: Purchase Invoice,Address and Contact,Adresse und Kontakt
@@ -3172,10 +3232,11 @@
 DocType: Supplier,Last Day of the Next Month,Letzter Tag des nächsten Monats
 DocType: Support Settings,Auto close Issue after 7 days,Auto schließen Ausgabe nach 7 Tagen
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Da der Resturlaub bereits in den zukünftigen Datensatz für Urlaube {1} übertragen wurde, kann der Urlaub nicht vor {0} zugeteilt werden."
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Hinweis: Stichtag übersteigt das vereinbarte Zahlungsziel um {0} Tag(e)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Hinweis: Stichtag übersteigt das vereinbarte Zahlungsziel um {0} Tag(e)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Studienbewerber
-DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL FÜR RECIPIENT
+DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL FÜR EMPFÄNGER
 DocType: Asset Category Account,Accumulated Depreciation Account,Abschreibungskonto
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Diese E-Mail wird autogenisiert
 DocType: Stock Settings,Freeze Stock Entries,Lagerbuchungen sperren
 DocType: Program Enrollment,Boarding Student,Boarding Student
 DocType: Asset,Expected Value After Useful Life,Erwartungswert nach der Ausmusterung
@@ -3183,7 +3244,7 @@
 DocType: Activity Cost,Billing Rate,Abrechnungsbetrag
 ,Qty to Deliver,Zu liefernde Menge
 ,Stock Analytics,Bestandsanalyse
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Der Betrieb kann nicht leer sein
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Der Betrieb kann nicht leer sein
 DocType: Maintenance Visit Purpose,Against Document Detail No,Zu Dokumentendetail Nr.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Party-Typ ist Pflicht
 DocType: Quality Inspection,Outgoing,Ausgang
@@ -3193,7 +3254,7 @@
 DocType: Delivery Note,Track this Delivery Note against any Project,Diesen Lieferschein in jedem Projekt nachverfolgen
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Nettocashflow aus Investitionen
 DocType: Production Order,Work-in-Progress Warehouse,Fertigungslager
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +111,Asset {0} must be submitted,Vermögens {0} muss eingereicht werden
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +111,Asset {0} must be submitted,Vermögen {0} muss eingereicht werden
 DocType: Fee Schedule Program,Total Students,Insgesamt Studenten
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Besucherrekord {0} existiert gegen Studenten {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Referenz #{0} vom {1}
@@ -3205,7 +3266,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Wählen Sie die Schüler manuell für die aktivitätsbasierte Gruppe aus
 DocType: Journal Entry,User Remark,Benutzerbemerkung
 DocType: Lead,Market Segment,Marktsegment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Gezahlten Betrag kann nicht größer sein als die Gesamt negativ ausstehenden Betrag {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Gezahlten Betrag kann nicht größer sein als die Gesamt negativ ausstehenden Betrag {0}
 DocType: Supplier Scorecard Period,Variables,Variablen
 DocType: Employee Internal Work History,Employee Internal Work History,Interne Berufserfahrung des Mitarbeiters
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Schlußstand (Soll)
@@ -3217,7 +3278,7 @@
 DocType: School Settings,Current Academic Year,Laufendes akademisches Jahr
 DocType: Stock Settings,Default Stock UOM,Standardlagermaßeinheit
 DocType: Asset,Number of Depreciations Booked,Anzahl der Abschreibungen gebucht
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Gegen Mitarbeiter der Ausleihe: {0}
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Gegen Mitarbeiterdarlehen: {0}
 DocType: Landed Cost Item,Receipt Document,Eingangsbeleg
 DocType: Production Planning Tool,Create Material Requests,Materialanfragen erstellen
 DocType: Employee Education,School/University,Schule/Universität
@@ -3226,29 +3287,30 @@
 DocType: Sales Invoice Item,Available Qty at Warehouse,Verfügbarer Lagerbestand
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Rechnungsbetrag
 DocType: Asset,Double Declining Balance,Doppelte degressive
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +179,Closed order cannot be cancelled. Unclose to cancel.,Geschlossen Auftrag nicht abgebrochen werden kann. Unclose abzubrechen.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +179,Closed order cannot be cancelled. Unclose to cancel.,Geschlosser Auftrag kann nicht abgebrochen werden. Bitte  wiedereröffnen um abzubrechen.
 DocType: Patient Relation,Father,Vater
 apps/erpnext/erpnext/controllers/accounts_controller.py +562,'Update Stock' cannot be checked for fixed asset sale,Beim Verkauf von Anlagevermögen darf 'Lagerbestand aktualisieren' nicht ausgewählt sein.
 DocType: Bank Reconciliation,Bank Reconciliation,Kontenabgleich
-DocType: Attendance,On Leave,Auf Urlaub
+DocType: Attendance,On Leave,Im Urlaub
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Updates abholen
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Konto {2} gehört nicht zur Firma {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Materialanfrage {0} wird storniert oder gestoppt
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Urlaube verwalten
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Urlaube verwalten
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Gruppieren nach Konto
 DocType: Sales Order,Fully Delivered,Komplett geliefert
 DocType: Lead,Lower Income,Niedrigeres Einkommen
+DocType: Restaurant Order Entry,Current Order,Aktueller Auftrag
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Ausgangs- und Eingangslager können nicht gleich sein für die Zeile {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differenzkonto muss ein Vermögens-/Verbindlichkeiten-Konto sein, da dieser Lagerabgleich eine Eröffnungsbuchung ist"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Zahlter Betrag kann nicht größer sein als Darlehensbetrag {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Gehen Sie zu Programme
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Lieferantenauftragsnummer ist für den Artikel {0} erforderlich
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Fertigungsauftrag nicht erstellt
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Fertigungsauftrag nicht erstellt
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Von-Datum"" muss nach ""Bis-Datum"" liegen"
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Kann nicht den Status als Student ändern {0} ist mit Studenten Anwendung verknüpft {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Kann nicht den Status als Student ändern {0} ist mit Studenten Anwendung verknüpft {1}
 DocType: Asset,Fully Depreciated,vollständig abgeschriebene
 ,Stock Projected Qty,Projizierter Lagerbestand
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Customer {0} gehört nicht zum Projekt {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Customer {0} gehört nicht zum Projekt {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Marked Teilnahme HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",Angebote sind Offerten an einen Kunden zur Lieferung von Materialien bzw. zur Erbringung von Leistungen.
 DocType: Sales Order,Customer's Purchase Order,Kundenauftrag
@@ -3259,8 +3321,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Bitte setzen Sie Anzahl der Abschreibungen gebucht
 DocType: Supplier Scorecard Period,Calculations,Berechnungen
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Wert oder Menge
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Productions Bestellungen können nicht angehoben werden:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Productions Bestellungen können nicht angehoben werden:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Minute
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Bitte benennen Sie die Namensreihe für {0} über Setup&gt; Einstellungen&gt; Namensserien
 DocType: Purchase Invoice,Purchase Taxes and Charges,Einkaufsteuern und -abgaben
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Gehen Sie zu Lieferanten
 ,Qty to Receive,Anzunehmende Menge
@@ -3273,7 +3336,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Habenkonto muss ein Bilanzkonto sein
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Alle Lieferantentypen
 DocType: Global Defaults,Disable In Words,"""Betrag in Worten"" abschalten"
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Artikelnummer ist zwingend erforderlich, da der Artikel nicht automatisch nummeriert wird"
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,"Artikelnummer ist zwingend erforderlich, da der Artikel nicht automatisch nummeriert wird"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Angebot {0} nicht vom Typ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Wartungsplanposten
 DocType: Sales Order,%  Delivered,%  geliefert
@@ -3288,30 +3351,33 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +81,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Zeile # {0}: Zugeordneter Betrag darf nicht größer als ausstehender Betrag sein.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Stückliste durchsuchen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Gedeckte Kredite
-DocType: Purchase Invoice,Edit Posting Date and Time,Bearbeiten von Datum und Uhrzeit erlauben
+DocType: Purchase Invoice,Edit Posting Date and Time,Bearbeiten von Buchungsdatum und -uhrzeit erlauben
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Bitte setzen Abschreibungen im Zusammenhang mit Konten in der Anlagekategorie {0} oder Gesellschaft {1}
 DocType: Lab Test Groups,Normal Range,Normalbereich
 DocType: Academic Term,Academic Year,Schuljahr
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Anfangsstand Eigenkapital
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Versöhnung
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Verbleibend
 DocType: Appraisal,Appraisal,Bewertung
 DocType: Purchase Invoice,GST Details,GST Details
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},E-Mail an den Lieferanten gesendet {0}
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},E-Mail an Lieferanten versandt {0}
+DocType: Item,Default Sales Unit of Measure,Default Sales Maßeinheit
 DocType: Opportunity,OPTY-,CHNC-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Ereignis wiederholen
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Zeichnungsberechtigte/-r
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Urlaube und Abwesenheiten müssen von jemandem aus {0} genehmigt werden.
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Gebühren anlegen
-DocType: Hub Settings,Seller Email,E-Mail-Adresse des Verkäufers
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Summe Einkaufskosten (über Einkaufsrechnung)
 DocType: Training Event,Start Time,Startzeit
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Menge wählen
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Menge wählen
 DocType: Customs Tariff Number,Customs Tariff Number,Zolltarifnummer
 DocType: Patient Appointment,Patient Appointment,Patiententermin
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"Genehmigende Rolle kann nicht dieselbe Rolle sein wie diejenige, auf die die Regel anzuwenden ist"
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Abmelden von diesem E-Mail-Bericht
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Abmelden von diesem E-Mail-Bericht
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Holen Sie sich Lieferanten durch
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} für Artikel {1} nicht gefunden
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Gehen Sie zu den Kursen
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mitteilung gesendet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Konto mit untergeordneten Knoten kann nicht als Hauptbuch festgelegt werden
@@ -3324,11 +3390,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Material zur Herstellung übertragen
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Konto {0} existiert nicht
 DocType: Project,Project Type,Projekttyp
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Untergeordnete Aufgabe existiert für diese Aufgabe. Sie können diese Aufgabe nicht löschen.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Entweder Zielstückzahl oder Zielmenge ist zwingend erforderlich.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Aufwendungen für verschiedene Tätigkeiten
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Keine Ergebnisse mehr
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Aufwendungen für verschiedene Tätigkeiten
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Einstellen Events auf {0}, da die Mitarbeiter auf die beigefügten unter Verkaufs Personen keine Benutzer-ID {1}"
 DocType: Timesheet,Billing Details,Rechnungsdetails
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Quell- und Ziel-Warehouse müssen unterschiedlich sein
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Quell- und Ziel-Warehouse müssen unterschiedlich sein
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Aktualisierung von Transaktionen älter als {0} nicht erlaubt
 DocType: Purchase Invoice Item,PR Detail,PR-Detail
 DocType: Sales Order,Fully Billed,Voll berechnet
@@ -3344,7 +3412,7 @@
 DocType: Healthcare Settings,Laboratory SMS Alerts,Labor-SMS-Benachrichtigungen
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Service-Item, Art, Häufigkeit und Kosten Betrag erforderlich"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Wenn es mehrere Preisregeln mit der höchsten Priorität gibt, werden folgende interne Prioritäten angewandt:"
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +128,Do you really want to Submit all Salary Slip from {0} to {1},Haben Sie von allen Gehaltsabrechnung wollen Senden wirklich {0} {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +128,Do you really want to Submit all Salary Slip from {0} to {1},Wollen Sie wirklich alle Gehaltsabrechnung von {0} an {1} senden?
 DocType: Cheque Print Template,Cheque Height,Scheck Höhe
 DocType: Supplier,Supplier Details,Lieferantendetails
 DocType: Setup Progress,Setup Progress,Setup Fortschritt
@@ -3354,7 +3422,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Überweisung
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Alle prüfen
 DocType: Vehicle Log,Invoice Ref,Rechnung Ref
-DocType: Purchase Order,Recurring Order,Wiederkehrende Bestellung
 DocType: Company,Default Income Account,Standard-Ertragskonto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Kundengruppe / Kunde
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed Geschäftsjahre Gewinn / Verlust (Credit)
@@ -3368,9 +3435,9 @@
 DocType: Patient,A Negative,Ein Negativ
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Nichts mehr zu zeigen.
 DocType: Lead,From Customer,Von Kunden
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Anrufe
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Anrufe
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Ein Produkt
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,Chargen
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,Chargen
 DocType: Project,Total Costing Amount (via Time Logs),Gesamtkostenbetrag (über Zeitprotokolle)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Machen Sie Fee Schedule
 DocType: Purchase Order Item Supplied,Stock UOM,Lagermaßeinheit
@@ -3382,7 +3449,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +222,Serial No {0} does not belong to Warehouse {1},Seriennummer {0} gehört nicht zu Lager {1}
 apps/erpnext/erpnext/controllers/status_updater.py +174,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Hinweis: Das System überprüft Überlieferungen und Überbuchungen zu Artikel {0} nicht da Stückzahl oder Menge 0 sind
 DocType: Notification Control,Quotation Message,Angebotsmitteilung
-DocType: Employee Loan,Employee Loan Application,Mitarbeiter Darlehensanträge
+DocType: Employee Loan,Employee Loan Application,MItarbeiterdarlehensantrag
 DocType: Issue,Opening Date,Eröffnungsdatum
 apps/erpnext/erpnext/schools/api.py +80,Attendance has been marked successfully.,Die Teilnahme wurde erfolgreich markiert.
 DocType: Program Enrollment,Public Transport,Öffentlicher Verkehr
@@ -3391,10 +3458,10 @@
 DocType: Purchase Receipt Item,Rate and Amount,Preis und Menge
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +165,Account Type for {0} must be {1},Accounttyp für {0} muss {1} sein
 DocType: Healthcare Settings,Default income accounts to be used if not set in Physician to book Consultation charges.,"Default-Einkommen Konten verwendet werden, wenn nicht in Arzt eingestellt zu buchen Beratung Gebühren."
-apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Blätter und Ferien
+apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Urlaube und Feiertage
 DocType: School Settings,Current Academic Term,Laufendes akademische Semester
 DocType: Sales Order,Not Billed,Nicht abgerechnet
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Beide Lager müssen zur gleichen Firma gehören
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Beide Lager müssen zur gleichen Firma gehören
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Noch keine Kontakte hinzugefügt.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Einstandskosten
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Rechnungen von Lieferanten
@@ -3403,25 +3470,25 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Rabattbetrag
 DocType: Purchase Invoice,Return Against Purchase Invoice,Zurück zur Einkaufsrechnung
 DocType: Item,Warranty Period (in days),Garantiefrist (in Tagen)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',update `tabPatient Appointment` set sales_invoice = &#39;{0}&#39; wobei name = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Beziehung mit Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Nettocashflow aus laufender Geschäftstätigkeit
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Position 4
-DocType: Student Admission,Admission End Date,Der Eintritt End Date
+DocType: Student Admission,Admission End Date,Stichtag für Zulassungsende
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +30,Sub-contracting,Zulieferung
 DocType: Journal Entry Account,Journal Entry Account,Journalbuchungskonto
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student Group
 DocType: Shopping Cart Settings,Quotation Series,Nummernkreis für Angebote
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",Ein Artikel mit dem gleichen Namen existiert bereits ({0}). Bitte den Namen der Artikelgruppe ändern oder den Artikel umbenennen
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Bitte wählen Sie Kunde
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item",Ein Artikel mit dem gleichen Namen existiert bereits ({0}). Bitte den Namen der Artikelgruppe ändern oder den Artikel umbenennen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Bitte wählen Sie Kunde
 DocType: C-Form,I,ich
-DocType: Company,Asset Depreciation Cost Center,Asset-Abschreibungen Kostenstellen
+DocType: Company,Asset Depreciation Cost Center,Anlagenabschreibung Kostenstelle
 DocType: Sales Order Item,Sales Order Date,Kundenauftrags-Datum
 DocType: Sales Invoice Item,Delivered Qty,Gelieferte Stückzahl
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Wenn diese Option aktiviert, werden alle Kinder der einzelnen Produktionsartikel wird im Materialanforderungen einbezogen werden."
 DocType: Assessment Plan,Assessment Plan,Beurteilungsplan
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Kunde {0} wird erstellt.
 DocType: Stock Settings,Limit Percent,Limit-Prozent
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Derzeit ist kein Bestand in einem Lager verfügbar
 ,Payment Period Based On Invoice Date,Zahlungszeitraum basierend auf Rechnungsdatum
 DocType: Sample Collection,No. of print,Anzahl Druck
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Fehlende Wechselkurse für {0}
@@ -3430,7 +3497,7 @@
 DocType: Journal Entry,Stock Entry,Lagerbuchung
 DocType: Payment Entry,Payment References,Bezahlung Referenzen
 DocType: C-Form,C-FORM-,C-FORM-
-DocType: Vehicle,Insurance Details,Versicherungsdaten
+DocType: Vehicle,Insurance Details,Versicherungsdetails
 DocType: Account,Payable,Zahlbar
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Bitte geben Sie Laufzeiten
 apps/erpnext/erpnext/shopping_cart/cart.py +365,Debtors ({0}),Schuldnern ({0})
@@ -3438,7 +3505,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Neue Kunden
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Rohgewinn %
 DocType: Appraisal Goal,Weightage (%),Gewichtung (%)
-DocType: Bank Reconciliation Detail,Clearance Date,Abwicklungsdatum
+DocType: Bank Reconciliation Detail,Clearance Date,Abrechnungsdatum
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Beurteilung
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruttokaufbetrag ist erforderlich
 DocType: Lead,Address Desc,Adresszusatz
@@ -3477,13 +3544,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruttolohn - Gesamtabzug - Darlehensrückzahlung
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,Aktuelle Stückliste und neue Stückliste können nicht identisch sein
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Gehaltsabrechnung ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Gehaltsabrechnung ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Zeitpunkt der Pensionierung muss nach dem Eintrittsdatum liegen
-apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Es gab Fehler beim Planen Kurs auf:
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Beim Planen des Kurses ist ein Fehler aufgetreten:
 DocType: Sales Invoice,Against Income Account,Zu Ertragskonto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% geliefert
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Artikel {0}: Bestellmenge {1} kann nicht weniger als Mindestbestellmenge {2} (im Artikel definiert) sein.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Artikel {0}: Bestellmenge {1} kann nicht weniger als Mindestbestellmenge {2} (im Artikel definiert) sein.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Prozentuale Aufteilung der monatsweisen Verteilung
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Bitte melden Sie sich als anderer Benutzer an.
 DocType: Territory,Territory Targets,Ziele für die Region
 DocType: Delivery Note,Transporter Info,Informationen zum Transportunternehmer
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Bitte setzen Sie default {0} in Gesellschaft {1}
@@ -3491,16 +3559,17 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Same Anbieter wurde mehrmals eingegeben
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Bruttogewinn / Verlust
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Lieferantenauftrags-Artikel geliefert
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Firmenname kann keine Firma sein
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Firmenname kann keine Firma sein
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Briefköpfe für Druckvorlagen
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Bezeichnungen für Druckvorlagen, z. B. Proforma-Rechnung"
 DocType: Program Enrollment,Walking,Gehen
 DocType: Student Guardian,Student Guardian,Studenten Wächter
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,"Bewertungsart Gebühren kann nicht als ""inklusive"" markiert werden"
 DocType: POS Profile,Update Stock,Lagerbestand aktualisieren
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,im Abonnement
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Unterschiedliche Maßeinheiten für Artikel führen zu falschen Werten für das (Gesamt-)Nettogewicht. Es muss sicher gestellt sein, dass das Nettogewicht jedes einzelnen Artikels in der gleichen Maßeinheit angegeben ist."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Stückpreis
-DocType: Asset,Journal Entry for Scrap,Journaleintrag für Schrott
+DocType: Asset,Journal Entry for Scrap,Journaleintrag für Ausschuss
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Bitte Artikel vom Lieferschein nehmen
 apps/erpnext/erpnext/accounts/utils.py +467,Journal Entries {0} are un-linked,Buchungssätze {0} sind nicht verknüpft
 apps/erpnext/erpnext/config/crm.py +92,"Record of all communications of type email, phone, chat, visit, etc.","Aufzeichnung jeglicher Kommunikation vom Typ Email, Telefon, Chat, Besuch usw."
@@ -3545,15 +3614,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Systembenutzer-ID (Anmeldung). Wenn gesetzt, wird sie standardmäßig für alle HR-Formulare verwendet."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Von {1}
 DocType: Task,depends_on,hängt ab von
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Warteschlange für die Aktualisierung der neuesten Preis in allen Stückliste. Es kann einige Minuten dauern.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Warteschlange für die Aktualisierung der neuesten Preis in allen Stückliste. Es kann einige Minuten dauern.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Name des neuen Kontos. Hinweis: Bitte keine Konten für Kunden und Lieferanten erstellen
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Landesspezifische Standard-Adressvorlagen
 DocType: Sales Order Item,Supplier delivers to Customer,Lieferant liefert an Kunden
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) ist ausverkauft
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Fälligkeits-/Stichdatum kann nicht nach {0} liegen
+,Sales Payment Summary,Zusammenfassung der Verkaufszahlung
+DocType: Restaurant,Restaurant,Restaurant
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Fälligkeits-/Stichdatum kann nicht nach {0} liegen
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Daten-Import und -Export
 DocType: Patient,Account Details,Kontendaten
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Keine Studenten gefunden
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Keine Studenten gefunden
 DocType: Medical Department,Medical Department,Medizinische Abteilung
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Kriterien
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Rechnungsbuchungsdatum
@@ -3564,7 +3635,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Bitte wählen Sie Buchungsdatum vor dem Party-Auswahl
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Außerhalb des jährlichen Wartungsvertrags
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Bitte wählen Sie Zitate
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Bitte wählen Sie Zitate
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Anzahl der Abschreibungen gebucht kann nicht größer sein als Gesamtzahl der abschreibungen
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Wartungsbesuch erstellen
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,"Bitte den Benutzer kontaktieren, der die Vertriebsleiter {0}-Rolle inne hat"
@@ -3572,7 +3643,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Unternehmensstammdaten (nicht Kunde oder Lieferant)
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Dies basiert auf der Anwesenheit dieses Student
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Keine Studenten in
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Weitere Elemente hinzufügen oder vollständiges Formular öffnen
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Weitere Elemente hinzufügen oder vollständiges Formular öffnen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Lieferscheine {0} müssen vor Löschung dieser Kundenaufträge storniert werden
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Gehen Sie zu den Benutzern
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Summe aus gezahltem Betrag + ausgebuchter Betrag kann nicht größer als Gesamtsumme sein
@@ -3588,41 +3659,44 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Falsche Anzahl von Buchungen im Hauptbuch gefunden. Möglicherweise wurde für die Transaktion ein falsches Konto gewählt.
 DocType: Employee,Prefered Contact Email,Bevorzugte Kontakt E-Mail
 DocType: Cheque Print Template,Cheque Width,Scheck Breite
-DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Bestätigen Verkaufspreis für den Posten gegen Purchase Rate oder Bewertungskurs
+DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Bestätigen Sie den  Verkaufspreis für den Posten gegen  den Einkaufspreis oder Bewertungskurs
 DocType: Fee Schedule,Fee Schedule,Gebührenordnung
 DocType: Hub Settings,Publish Availability,Verfügbarkeit veröffentlichen
 DocType: Company,Create Chart Of Accounts Based On,Erstellen Sie Konten basierend auf
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Kann es nicht in Nicht-Gruppe konvertieren. Untergeordnete Aufgaben sind vorhanden.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Geburtsdatum kann nicht später liegen als heute.
 ,Stock Ageing,Lager-Abschreibungen
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Student {0} existiert gegen Studienbewerber {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Rundungsanpassung (Firmenwährung)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Zeiterfassung
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Zeiterfassung
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' ist deaktiviert
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,"Als ""geöffnet"" markieren"
 DocType: Cheque Print Template,Scanned Cheque,Gescannte Scheck
-DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Beim Übertragen von Transaktionen automatisch E-Mails an Kontakte senden.
+DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Beim Ausführen von Transaktionen automatisch E-Mails an Kontakte senden.
 DocType: Timesheet,Total Billable Amount,Insgesamt abrechenbare Betrag
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Position 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Auftragserfassung
 DocType: Purchase Order,Customer Contact Email,Kontakt-E-Mail des Kunden
 DocType: Warranty Claim,Item and Warranty Details,Einzelheiten Artikel und Garantie
 DocType: Sales Team,Contribution (%),Beitrag (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Hinweis: Zahlungsbuchung wird nicht erstellt, da kein ""Kassen- oder Bankkonto"" angegeben wurde"
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Projekt {0} existiert bereits
 DocType: Medical Department,Nursing User,Krankenpfleger
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Verantwortung
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Gültigkeitszeitraum dieses Angebots ist beendet.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Gültigkeitszeitraum dieses Angebots ist beendet.
 DocType: Expense Claim Account,Expense Claim Account,Kostenabrechnung Konto
-DocType: Accounts Settings,Allow Stale Exchange Rates,Erlauben Stale Wechselkurse
+DocType: Accounts Settings,Allow Stale Exchange Rates,feste Wechselkurse erlauben
 DocType: Sales Person,Sales Person Name,Name des Vertriebsmitarbeiters
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Bitte mindestens eine Rechnung in die Tabelle eingeben
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Benutzer hinzufügen
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Benutzer hinzufügen
 DocType: POS Item Group,Item Group,Artikelgruppe
 DocType: Item,Safety Stock,Sicherheitsbestand
 DocType: Healthcare Settings,Healthcare Settings,Gesundheitswesen
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Fortschritt-% eines Vorgangs darf nicht größer 100 sein.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Fortschritt-% eines Vorgangs darf nicht größer 100 sein.
 DocType: Stock Reconciliation Item,Before reconciliation,Vor Ausgleich
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},An {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Steuern und Gebühren hinzugerechnet (Firmenwährung)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Artikelsteuer Zeile {0} muss ein Konto vom Typ ""Steuer"" oder ""Erträge"" oder ""Aufwendungen"" oder ""Besteuerbar"" haben"
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Artikelsteuer Zeile {0} muss ein Konto vom Typ ""Steuer"" oder ""Erträge"" oder ""Aufwendungen"" oder ""Besteuerbar"" haben"
 DocType: Sales Order,Partly Billed,Teilweise abgerechnet
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Artikel {0} muss ein Posten des Anlagevermögens sein
 DocType: Item,Default BOM,Standardstückliste
@@ -3630,7 +3704,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Please re-type company name to confirm,Bitte zum Bestätigen Firmenname erneut eingeben
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +79,Total Outstanding Amt,Offener Gesamtbetrag
 DocType: Journal Entry,Printing Settings,Druckeinstellungen
-DocType: Sales Invoice,Include Payment (POS),Fügen Sie Zahlung (POS)
+DocType: Sales Invoice,Include Payment (POS),(POS) Zahlung einschließen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,Total Debit must be equal to Total Credit. The difference is {0},Gesamt-Soll muss gleich Gesamt-Haben sein. Die Differenz ist {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Fahrzeugbau
 DocType: Vehicle,Insurance Company,Versicherungsunternehmen
@@ -3638,6 +3712,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,Variable
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Von Lieferschein
 DocType: Student,Student Email Address,Studenten E-Mail-Adresse
+DocType: Item,Hub Warehouse,Hublager
 DocType: Physician Schedule Time Slot,From Time,Von-Zeit
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Auf Lager:
 DocType: Notification Control,Custom Message,Benutzerdefinierte Mitteilung
@@ -3645,9 +3720,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,Kassen- oder Bankkonto ist zwingend notwendig  um eine Zahlungsbuchung zu erstellen
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Schüleradresse
 DocType: Purchase Invoice,Price List Exchange Rate,Preislisten-Wechselkurs
+DocType: POS Profile,POS Profile Name,POS-Profilname
 DocType: Purchase Invoice Item,Rate,Preis
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Praktikant
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Adress Name
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Adress-Name
 DocType: Stock Entry,From BOM,Von Stückliste
 DocType: Assessment Code,Assessment Code,Beurteilungs-Code
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Grundeinkommen
@@ -3661,31 +3737,33 @@
 DocType: Salary Slip,Salary Structure,Gehaltsstruktur
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Fluggesellschaft
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Material ausgeben
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Material ausgeben
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Beim Erstellen von Wiederholungen ist ein Fehler aufgetreten
 DocType: Material Request Item,For Warehouse,Für Lager
 DocType: Employee,Offer Date,Angebotsdatum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Angebote
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,"Sie befinden sich im Offline-Modus. Aktualisieren ist nicht möglich, bis Sie wieder online sind."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,"Sie befinden sich im Offline-Modus. Aktualisieren ist nicht möglich, bis Sie wieder online sind."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Keine Studentengruppen erstellt.
 DocType: Purchase Invoice Item,Serial No,Seriennummer
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Monatlicher Rückzahlungsbetrag kann nicht größer sein als Darlehensbetrag
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Bitte zuerst die Einzelheiten zur Wartung eingeben
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Row # {0}: Voraussichtlicher Liefertermin kann nicht vor Bestelldatum sein
-DocType: Purchase Invoice,Print Language,drucken Sprache
+DocType: Purchase Invoice,Print Language,Drucksprache
 DocType: Salary Slip,Total Working Hours,Gesamtarbeitszeit
 DocType: Subscription,Next Schedule Date,Nächste Termine Datum
 DocType: Stock Entry,Including items for sub assemblies,Einschließlich der Artikel für Unterbaugruppen
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Geben Sie Wert muss positiv sein
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Alle Regionen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Geben Sie Wert muss positiv sein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Alle Regionen
 DocType: Purchase Invoice,Items,Artikel
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student ist bereits eingetragen sind.
 DocType: Fiscal Year,Year Name,Name des Jahrs
 DocType: Process Payroll,Process Payroll,Gehaltsabrechnung bearbeiten
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Es gibt mehr Feiertage als Arbeitstage in diesem Monat.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Es gibt mehr Feiertage als Arbeitstage in diesem Monat.
 DocType: Product Bundle Item,Product Bundle Item,Produkt-Bundle-Artikel
 DocType: Sales Partner,Sales Partner Name,Name des Vertriebspartners
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Angebostanfrage
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Angebostanfrage
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maximaler Rechnungsbetrag
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hämatologie
 DocType: Normal Test Items,Normal Test Items,Normale Testartikel
 DocType: Student Language,Student Language,Student Sprache
 apps/erpnext/erpnext/config/selling.py +23,Customers,Kundschaft
@@ -3696,10 +3774,11 @@
 DocType: Issue,Opening Time,Öffnungszeit
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Von- und Bis-Daten erforderlich
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Wertpapier- & Rohstoffbörsen
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard-Maßeinheit für Variante '{0}' muss dieselbe wie in der Vorlage '{1}' sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard-Maßeinheit für Variante '{0}' muss dieselbe wie in der Vorlage '{1}' sein
 DocType: Shipping Rule,Calculate Based On,Berechnen auf Grundlage von
 DocType: Delivery Note Item,From Warehouse,Ab Lager
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Keine Elemente mit Bill of Materials zu Herstellung
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Keine Elemente mit Bill of Materials zu Herstellung
+DocType: Restaurant,Default Customer,Standardkunde
 DocType: Assessment Plan,Supervisor Name,Name des Vorgesetzten
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Bestätigen Sie nicht, ob der Termin für denselben Tag erstellt wurde"
 DocType: Program Enrollment Course,Program Enrollment Course,Programm Einschreibung Kurs
@@ -3726,14 +3805,14 @@
 DocType: Payment Entry,Internal Transfer,Interner Transfer
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Für dieses Konto existiert ein Unterkonto. Sie können dieses Konto nicht löschen.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Entweder Zielstückzahl oder Zielmenge ist zwingend erforderlich
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},für Artikel {0} existiert keine Standardstückliste
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},für Artikel {0} existiert keine Standardstückliste
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Bitte zuerst ein Buchungsdatum auswählen
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Eröffnungsdatum sollte vor dem Abschlussdatum liegen
 DocType: Leave Control Panel,Carry Forward,Übertragen
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kostenstelle mit bestehenden Transaktionen kann nicht in Sachkonto umgewandelt werden
 DocType: Department,Days for which Holidays are blocked for this department.,"Tage, an denen eine Urlaubssperre für diese Abteilung gilt."
 ,Produced,Produziert
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +118,Created Salary Slips,Erstellt Gehaltsabrechnungen
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +118,Created Salary Slips,Gehaltsabrechnungen erstellt
 DocType: Item,Item Code for Suppliers,Artikelnummer für Lieferanten
 DocType: Issue,Raised By (Email),Gemeldet von (E-Mail)
 DocType: Training Event,Trainer Name,Trainer-Name
@@ -3747,7 +3826,7 @@
 ,Profitability Analysis,Wirtschaftlichkeitsanalyse
 DocType: Fees,Student Email,Schüler E-Mail
 DocType: Supplier,Prevent POs,Vermeiden Sie POs
-DocType: Patient,"Allergies, Medical and Surgical History","Allergien, medizinische und chirurgische Geschichte"
+DocType: Patient,"Allergies, Medical and Surgical History","Allergien, medizinische- und chirurgische Vergangenheit"
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,In den Warenkorb legen
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Gruppieren nach
 DocType: Guardian,Interests,Interessen
@@ -3761,6 +3840,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Summe Anwesend
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,Buchhaltungsauszüge
 DocType: Drug Prescription,Hour,Stunde
+DocType: Restaurant Order Entry,Last Sales Invoice,Letzte Verkaufsrechnung
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"""Neue Seriennummer"" kann keine Lagerangabe enthalten. Lagerangaben müssen durch eine Lagerbuchung oder einen Kaufbeleg erstellt werden"
 DocType: Lead,Lead Type,Lead-Typ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,"Sie sind nicht berechtigt, Urlaube für geblockte Termine zu genehmigen"
@@ -3782,10 +3862,10 @@
 DocType: Account,Tax,Steuer
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,nicht markiert
 DocType: Production Planning Tool,Production Planning Tool,Werkzeug zur Fertigungsplanung
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched Item {0} kann nicht mit Stock Reconciliation aktualisiert werden, stattdessen verwenden Stock Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",Chargenartikel {0} kann nicht durch Lagerabgleich aktualisiert werden. Bitte stattdessen einen Lagereintrag verwenden.
 DocType: Quality Inspection,Report Date,Berichtsdatum
 DocType: Student,Middle Name,Zweiter Vorname
-DocType: C-Form,Invoices,Rechnungen
+DocType: C-Form,Invoices,Eingangsrechnungen
 DocType: Batch,Source Document Name,Quelldokumentname
 DocType: Job Opening,Job Title,Stellenbezeichnung
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py +84,"{0} indicates that {1} will not provide a quotation, but all items \
@@ -3795,96 +3875,100 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Benutzer erstellen
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,Gramm
 DocType: Supplier Scorecard,Per Month,Pro Monat
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Menge Herstellung muss größer als 0 sein.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Menge Herstellung muss größer als 0 sein.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Besuchsbericht für Wartungsauftrag
 DocType: Stock Entry,Update Rate and Availability,Preis und Verfügbarkeit aktualisieren
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Zur bestellten Menge zusätzlich zulässiger Prozentsatz, der angenommen oder geliefert werden kann. Beispiel: Wenn 100 Einheiten bestellt wurden, und die erlaubte Spanne 10 % beträgt, dann können 110 Einheiten angenommen werden."
 DocType: POS Customer Group,Customer Group,Kundengruppe
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Neue Batch-ID (optional)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Neue Batch-ID (optional)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Aufwandskonto ist zwingend für Artikel {0}
 DocType: BOM,Website Description,Webseiten-Beschreibung
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Nettoveränderung des Eigenkapitals
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Neueste
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Bitte stornieren Einkaufsrechnung {0} zuerst
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-Mail-Adresse muss eindeutig sein, bereits vorhanden ist für {0}"
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-Mail-Adresse muss eindeutig sein, diese wird bereits für {0} verwendet"
 DocType: Serial No,AMC Expiry Date,Verfalldatum des jährlichen Wartungsvertrags
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,Kaufbeleg
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,Kaufbeleg
 ,Sales Register,Übersicht über den Umsatz
-DocType: Daily Work Summary Settings Company,Send Emails At,Senden Sie E-Mails
+DocType: Daily Work Summary Settings Company,Send Emails At,Die E-Mails senden um
 DocType: Quotation,Quotation Lost Reason,Grund für verlorenes Angebotes
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Wählen Sie Ihre Domain
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',select * von tabPatient wo name = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Transaktion Referenznummer {0} vom {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Transaktion Referenznummer {0} vom {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Es gibt nichts zu bearbeiten.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Formularansicht
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Zusammenfassung für diesen Monat und anstehende Aktivitäten
-apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Fügen Sie Benutzer zu Ihrer Organisation hinzu, außer Sie selbst."
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Formularansicht
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Zusammenfassung für diesen Monat und anstehende Aktivitäten
+apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Fügen Sie, neben Ihnen selbst, weitere Benutzer zu Ihrer Organisation hinzu."
 DocType: Customer Group,Customer Group Name,Kundengruppenname
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Noch keine Kunden!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Noch keine Kunden!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Geldflussrechnung
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Darlehensbetrag darf nicht höher als der Maximalbetrag {0} sein
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Lizenz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Bitte diese Rechnung {0} vom Kontaktformular {1} entfernen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Bitte diese Rechnung {0} vom Kontaktformular {1} entfernen
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Bitte auf ""Übertragen"" klicken, wenn auch die Abwesenheitskonten des vorangegangenen Geschäftsjahrs in dieses Geschäftsjahr einbezogen werden sollen"
 DocType: GL Entry,Against Voucher Type,Gegenbeleg-Art
 DocType: Physician,Phone (R),Telefon (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Zeitschlitze hinzugefügt
 DocType: Item,Attributes,Attribute
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Schablone aktivieren
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Bitte nennen Sie die Naming Series für {0} über Setup&gt; Einstellungen&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Bitte Abschreibungskonto eingeben
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Letztes Bestelldatum
 DocType: Patient,B Negative,B Negativ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konto {0} gehört nicht zu Firma {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Seriennummern in Zeile {0} stimmt nicht mit der Lieferschein überein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Seriennummern in Zeile {0} stimmt nicht mit der Lieferschein überein
 DocType: Student,Guardian Details,Wächter-Details
 DocType: C-Form,C-Form,Kontakt-Formular
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Anwesenheit für mehrere Mitarbeiter markieren
 DocType: Vehicle,Chassis No,Fahrwerksnummer
 DocType: Payment Request,Initiated,Initiiert
 DocType: Production Order,Planned Start Date,Geplanter Starttermin
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Bitte wählen Sie eine Stückliste
 DocType: Serial No,Creation Document Type,Belegerstellungs-Typ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Enddatum muss größer sein als Startdatum
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Enddatum muss größer sein als Startdatum
 DocType: Leave Type,Is Encash,Ist Inkasso
 DocType: Leave Allocation,New Leaves Allocated,Neue Urlaubszuordnung
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projektbezogene Daten sind für das Angebot nicht verfügbar
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Endet am
 DocType: Project,Expected End Date,Voraussichtliches Enddatum
 DocType: Budget Account,Budget Amount,Budgetbetrag
 DocType: Appraisal Template,Appraisal Template Title,Bezeichnung der Bewertungsvorlage
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},"Mitarbeiter Von Datum {0} für {1} kann nicht sein, bevor Mitarbeiter-Beitritt Datum {2}"
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Werbung
-DocType: Patient,Alcohol Current Use,Alkoholstrom Gebrauch
+DocType: Patient,Alcohol Current Use,aktueller Alkoholkonsum
+DocType: Student Admission Program,Student Admission Program,Studentenzulassungsprogramm
 DocType: Payment Entry,Account Paid To,Eingangskonto
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Übergeordneter Artikel {0} darf kein Lagerartikel sein
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Alle Produkte oder Dienstleistungen
 DocType: Expense Claim,More Details,Weitere Details
 DocType: Supplier Quotation,Supplier Address,Lieferantenadresse
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Budget für Konto {1} gegen {2} {3} ist {4}. Es wird mehr als durch {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Budget für Konto {1} gegen {2} {3} ist {4}. Es wird durch {5} überschritten.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',"Konto in Zeile {0} muss vom Typ ""Anlagevermögen"" sein"
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Ausgabe-Menge
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Regeln zum Berechnen des Versandbetrags für einen Verkauf
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,und unchcked Deaktiviert in der
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Serie ist zwingend erforderlich
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finanzdienstleistungen
 DocType: Student Sibling,Student ID,Studenten ID
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Arten von Aktivitäten für Time Logs
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Lieferanten-Email
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Arten von Aktivitäten für Time Logs
 DocType: Tax Rule,Sales,Vertrieb
 DocType: Stock Entry Detail,Basic Amount,Grundbetrag
 DocType: Training Event,Exam,Prüfung
 DocType: Complaint,Complaint,Beschwerde
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Angabe des Lagers ist für den Lagerartikel {0} erforderlich
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Angabe des Lagers ist für den Lagerartikel {0} erforderlich
 DocType: Leave Allocation,Unused leaves,Ungenutzter Urlaub
-DocType: Patient,Alcohol Past Use,Alkohol Vergangenheit verwenden
+DocType: Patient,Alcohol Past Use,vergangener Alkoholkonsum
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Haben
 DocType: Tax Rule,Billing State,Verwaltungsbezirk laut Rechnungsadresse
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Übertragung
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Abruf der aufgelösten Stückliste (einschließlich der Unterbaugruppen)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Übertragung
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Abruf der aufgelösten Stückliste (einschließlich der Unterbaugruppen)
 DocType: Authorization Rule,Applicable To (Employee),Anwenden auf (Mitarbeiter)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Fälligkeitsdatum wird zwingend vorausgesetzt
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Fälligkeitsdatum wird zwingend vorausgesetzt
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Schrittweite für Attribut {0} kann nicht 0 sein
 DocType: Journal Entry,Pay To / Recd From,Zahlen an/Erhalten von
 DocType: Naming Series,Setup Series,Serie bearbeiten
 DocType: Payment Reconciliation,To Invoice Date,Um Datum Rechnung
 DocType: Supplier,Contact HTML,Kontakt-HTML
 ,Inactive Customers,Inaktive Kunden
+DocType: Student Admission Program,Maximum Age,Maximales Alter
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Kaufbelege
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Wie wird die Preisregel angewandt?
@@ -3903,27 +3987,28 @@
 DocType: GL Entry,Remarks,Bemerkungen
 DocType: Payment Entry,Account Paid From,Ausgangskonto
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Rohmaterial-Artikelnummer
+DocType: Task,Parent Task,Übergeordnete Aufgabe
 DocType: Journal Entry,Write Off Based On,Abschreibung basierend auf
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,neue Verkaufsanfrage
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Drucken und Papierwaren
 DocType: Stock Settings,Show Barcode Field,Anzeigen Barcode-Feld
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,Send Supplier Emails,Senden Lieferant von E-Mails
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,Send Supplier Emails,Lieferantenemails senden
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Gehalt bereits verarbeitet für den Zeitraum zwischen {0} und {1}, freiBewerbungsFrist kann nicht zwischen diesem Datum liegen."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Installationsdatensatz für eine Seriennummer
 DocType: Guardian Interest,Guardian Interest,Wächter Interesse
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Standardwerte für POS-Rechnungen einrichten
 apps/erpnext/erpnext/config/hr.py +177,Training,Ausbildung
 DocType: Timesheet,Employee Detail,Mitarbeiterdetails
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 E-Mail-ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,Nächster Termin des Tages und wiederholen Sie auf Tag des Monats müssen gleich sein
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Nächster Termin des Tages und wiederholen Sie auf Tag des Monats müssen gleich sein
 DocType: Lab Prescription,Test Code,Testcode
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Einstellungen für die Internet-Homepage
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQs sind nicht zulässig für {0} aufgrund einer Scorecard von {1}
 DocType: Offer Letter,Awaiting Response,Warte auf Antwort
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Über
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Gesamtbetrag {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Ungültige Attribut {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Gesamtbetrag {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Ungültiges Attribut {0} {1}
 DocType: Supplier,Mention if non-standard payable account,"Erwähnen Sie, wenn nicht standardmäßig zahlbares Konto"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Gleiches Element wurde mehrfach eingegeben. {Liste}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Bitte wählen Sie die Bewertungsgruppe außer &quot;All Assessment Groups&quot;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Zeile {0}: Kostenstelle ist für einen Eintrag {1} erforderlich
 DocType: Training Event Employee,Optional,Optional
@@ -3942,23 +4027,24 @@
 ,Monthly Attendance Sheet,Monatliche Anwesenheitsliste
 DocType: Production Order Item,Production Order Item,Produktion Artikel bestellen
 apps/erpnext/erpnext/healthcare/report/lab_test_report/lab_test_report.py +15,No record found,Kein Datensatz gefunden
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Kosten der Verschrottet Vermögens
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Kosten für Ausschuss-Entsorgung
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostenstelle ist zwingend erfoderlich für Artikel {2}
 DocType: Vehicle,Policy No,Politik keine
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Artikel aus dem Produkt-Bundle übernehmen
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Da Bestand für ein Exemplar {0} vorhanden ist, können Sie die Eigenschaft &quot;Varianten&quot; nicht aktivieren."
 DocType: Asset,Straight Line,Gerade Linie
 DocType: Project User,Project User,Projektarbeit Benutzer
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Teilt
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Teilt
 DocType: GL Entry,Is Advance,Ist Vorkasse
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,"""Anwesenheit ab Datum"" und ""Anwesenheit bis Datum"" sind zwingend"
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,"Bitte bei ""Untervergeben"" JA oder NEIN eingeben"
+DocType: Item,Default Purchase Unit of Measure,Default Purchase Maßeinheit
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Letztes Kommunikationstag
 DocType: Sales Team,Contact No.,Kontakt-Nr.
 DocType: Bank Reconciliation,Payment Entries,Zahlungs Einträge
-DocType: Production Order,Scrap Warehouse,Schrottlager
+DocType: Production Order,Scrap Warehouse,Ausschusslager
 DocType: Production Order,Check if material transfer entry is not required,"Prüfen Sie, ob keine Materialübertragung erforderlich ist"
 DocType: Program Enrollment Tool,Get Students From,Holen Studenten aus
-DocType: Hub Settings,Seller Country,Land des Verkäufers
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Veröffentlichen Sie Artikel auf der Website
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Gruppieren Sie Ihre Schüler in den Reihen
 DocType: Authorization Rule,Authorization Rule,Autorisierungsregel
@@ -3968,7 +4054,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Vorlage für Verkaufssteuern und -abgaben
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Insgesamt (Credit)
 DocType: Repayment Schedule,Payment Date,Zahlungsdatum
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Neue Batch-Menge
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Neue Batch-Menge
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Kleidung & Zubehör
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,"Die gewichtete Notenfunktion konnte nicht gelöst werden. Stellen Sie sicher, dass die Formel gültig ist."
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Nummer der Bestellung
@@ -3986,6 +4072,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Vermögens {1} kann nicht vorgelegt werden, es ist bereits {2}"
 DocType: Tax Rule,Billing Country,Land laut Rechnungsadresse
 DocType: Purchase Order Item,Expected Delivery Date,Geplanter Liefertermin
+DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurantbestellung
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Soll und Haben nicht gleich für {0} #{1}. Unterschied ist {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Bewirtungskosten
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Materialanforderung anlegen
@@ -3998,9 +4085,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Ein Konto mit bestehenden Transaktionen kann nicht gelöscht werden
 DocType: Vehicle,Last Carbon Check,Last Kohlenstoff prüfen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Rechtskosten
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Bitte wählen Sie die Menge aus
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Bitte wählen Sie die Menge aus
 DocType: Purchase Invoice,Posting Time,Buchungszeit
 DocType: Timesheet,% Amount Billed,% des Betrages berechnet
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.","""Zeit pro Termin"" wurde für Dr. {0} nicht festgelegt. Fügen Sie ihn dem Arzt-Master hinzu."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefonkosten
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Hier aktivieren, wenn der Benutzer gezwungen sein soll, vor dem Speichern eine Serie auszuwählen. Bei Aktivierung gibt es keine Standardvorgabe."
@@ -4011,6 +4099,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Neuer Kundenumsatz
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Reisekosten
 DocType: Maintenance Visit,Breakdown,Ausfall
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Benutzerdefiniertes Feld Abonnement im Doctype {0} hinzufügen
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Konto: {0} mit Währung: {1} kann nicht ausgewählt werden
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Aktualisieren Sie die Stücklistenkosten automatisch über den Scheduler, basierend auf dem aktuellen Bewertungspreis / Preisliste / letzter Kaufpreis der Rohstoffe."
 DocType: Bank Reconciliation Detail,Cheque Date,Scheckdatum
@@ -4020,7 +4109,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Zum
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,Enrollment Datum
-DocType: Healthcare Settings,Out Patient SMS Alerts,Out Patient SMS Alerts
+DocType: Healthcare Settings,Out Patient SMS Alerts,SMS-Benachrichtungen für ambulante Patienten
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Probation,Probezeit
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Gehaltskomponenten
 DocType: Program Enrollment Tool,New Academic Year,Neues Studienjahr
@@ -4035,9 +4124,9 @@
 DocType: Project,Total Billing Amount (via Time Logs),Gesamtumsatz (über Zeitprotokolle)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Lieferanten-ID
 DocType: Payment Request,Payment Gateway Details,Payment Gateway-Details
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Menge sollte größer 0 sein
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Menge sollte größer 0 sein
 DocType: Journal Entry,Cash Entry,Kassenbuchung
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Child-Knoten kann nur unter &quot;Gruppe&quot; Art Knoten erstellt werden
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Kindknoten können nur unter Gruppenknoten erstellt werden.
 DocType: Leave Application,Half Day Date,Halbtagesdatum
 DocType: Academic Year,Academic Year Name,Schuljahr-Bezeichnung
 DocType: Sales Partner,Contact Desc,Kontakt-Beschr.
@@ -4053,12 +4142,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Hinweis: Artikel {0} mehrfach eingegeben
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Alle Kontakte
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Firmenkürzel
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Benutzer {0} existiert nicht
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Benutzer {0} existiert nicht
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Abkürzung
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Zahlung existiert bereits
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Keine Berechtigung da {0} die Höchstgrenzen überschreitet
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Stammdaten zur Gehaltsvorlage
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Pathologie
+DocType: Restaurant Order Entry,Restaurant Table,Restaurant-Tisch
 DocType: Leave Type,Max Days Leave Allowed,Maximal zulässige Urlaubstage
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Steuerregel für Einkaufswagen einstellen
 DocType: Purchase Invoice,Taxes and Charges Added,Steuern und Gebühren hinzugefügt
@@ -4070,10 +4161,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Angebote an Leads oder Kunden
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle darf gesperrten Bestand bearbeiten
 ,Territory Target Variance Item Group-Wise,Artikelgruppenbezogene regionale Zielabweichung
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Alle Kundengruppen
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Kumulierte Monate
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Alle Kundengruppen
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,monatlich akkumuliert
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ist zwingend erforderlich. Möglicherweise wurde der Datensatz für die Währungsumrechung für {1} bis {2} nicht erstellt.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Steuer-Vorlage ist erforderlich.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Steuer-Vorlage ist erforderlich.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Konto {0}: Hauptkonto {1} existiert nicht
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Preisliste (Firmenwährung)
 DocType: Products Settings,Products Settings,Produkte Einstellungen
@@ -4089,7 +4180,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1213,Please set Company,Bitte setzen Unternehmen
 DocType: Pricing Rule,Buying,Einkauf
 DocType: HR Settings,Employee Records to be created by,Mitarbeiter-Datensätze werden erstellt nach
-DocType: Patient,AB Negative,AB Negativ
+DocType: Patient,AB Negative,AB -
 DocType: Sample Collection,SMPL-,SMPL-
 DocType: POS Profile,Apply Discount On,Rabatt anwenden auf
 ,Reqd By Date,Benötigt nach Datum
@@ -4097,21 +4188,21 @@
 DocType: Assessment Plan,Assessment Name,Name der Beurteilung
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No is mandatory,Zeile # {0}: Seriennummer ist zwingend erforderlich
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Artikelbezogene Steuer-Details
-apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Institut Abkürzung
+apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Abkürzung des Institutes
 ,Item-wise Price List Rate,Artikelbezogene Preisliste
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Lieferantenangebot
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Lieferantenangebot
 DocType: Quotation,In Words will be visible once you save the Quotation.,"""In Worten"" wird sichtbar, sobald Sie das Angebot speichern."
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Menge ({0}) kann kein Bruch in Zeile {1} sein
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Barcode {0} wird bereits für Artikel {1} verwendet
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Barcode {0} wird bereits für Artikel {1} verwendet
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Regeln für das Hinzufügen von Versandkosten.
 DocType: Item,Opening Stock,Anfangsbestand
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kunde ist verpflichtet
 DocType: Lab Test,Result Date,Ergebnis Datum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,"{0} ist zwingend für ""Zurück"""
 DocType: Purchase Order,To Receive,Um zu empfangen
-apps/erpnext/erpnext/utilities/user_progress.py +231,user@example.com,user@example.com
+apps/erpnext/erpnext/utilities/user_progress.py +231,user@example.com,nutzer@kundendomain.tld
 DocType: Employee,Personal Email,Persönliche E-Mail
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Gesamtabweichung
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Wenn aktiviert, bucht das System Bestandsbuchungen automatisch."
@@ -4122,10 +4213,9 @@
 DocType: Customer,From Lead,Von Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Für die Produktion freigegebene Bestellungen
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Geschäftsjahr auswählen ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,"Verkaufsstellen-Profil benötigt, um Verkaufsstellen-Buchung zu erstellen"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,"Verkaufsstellen-Profil benötigt, um Verkaufsstellen-Buchung zu erstellen"
 DocType: Program Enrollment Tool,Enroll Students,einschreiben Studenten
-DocType: Hub Settings,Name Token,Kürzel benennen
-DocType: Lab Test,Approved Date,Genehmigtes Datum
+DocType: Lab Test,Approved Date,Genehmigter Termin
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard-Vertrieb
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Mindestens ein Lager ist zwingend erforderlich
 DocType: Serial No,Out of Warranty,Außerhalb der Garantie
@@ -4142,7 +4232,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Personal
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Zahlung zum Zahlungsabgleich
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Steuerguthaben
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Fertigungsauftrag wurde {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Fertigungsauftrag wurde {0}
 DocType: BOM Item,BOM No,Stücklisten-Nr.
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Buchungssatz {0} gehört nicht zu Konto {1} oder ist bereits mit einem anderen Beleg abgeglichen
@@ -4162,13 +4252,13 @@
 DocType: Currency Exchange,To Currency,In Währung
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,"Zulassen, dass die folgenden Benutzer Urlaubsanträge für Blöcke von Tagen genehmigen können."
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Arten der Aufwandsabrechnung
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Der Verkaufspreis für Artikel {0} ist niedriger als der {1}. Selling Rate sollte atleast {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Der Verkaufspreis für Artikel {0} ist niedriger als {1}. Der Verkaufspreis sollte wenigstens {2} sein.
 DocType: Item,Taxes,Steuern
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Bezahlt und nicht geliefert
 DocType: Project,Default Cost Center,Standardkostenstelle
 DocType: Bank Guarantee,End Date,Enddatum
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Lagervorgänge
-DocType: Budget,Budget Accounts,Budget Accounts
+DocType: Budget,Budget Accounts,Budget Konten
 DocType: Employee,Internal Work History,Interne Arbeits-Historie
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Aufgelaufener Abschreibungsbetrag
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Kapitalbeteiligungsgesellschaft
@@ -4176,15 +4266,15 @@
 DocType: Employee Loan,Fully Disbursed,in voller Höhe ausgezahlt
 DocType: Maintenance Visit,Customer Feedback,Kundenrückmeldung
 DocType: Account,Expense,Kosten
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Score kann nicht größer sein als maximale Punktzahl
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Score kann nicht größer sein als maximale Punktzahl
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Kunden und Lieferanten
 DocType: Item Attribute,From Range,Von-Bereich
 DocType: BOM,Set rate of sub-assembly item based on BOM,Setzen Sie die Menge der Unterbaugruppe auf der Grundlage der Stückliste
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Syntaxfehler in der Formel oder Bedingung: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Syntaxfehler in Formel oder Bedingung: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,tägliche Arbeitszusammenfassung-Einstellungen Ihrer Firma
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,"Artikel {0} ignoriert, da es sich nicht um einen Lagerartikel handelt"
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Diesen Fertigungsauftrag zur Weiterverarbeitung buchen.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Diesen Fertigungsauftrag zur Weiterverarbeitung buchen.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Um Preisregeln in einer bestimmten Transaktion nicht zu verwenden, sollten alle geltenden Preisregeln deaktiviert sein."
 DocType: Assessment Group,Parent Assessment Group,Eltern Assessment Group
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Arbeitsplätze
@@ -4196,18 +4286,19 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Wenn nach Beleg gruppiert wurde, kann nicht auf Grundlage von Belegen gefiltert werden."
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +891,Make Supplier Quotation,Lieferantenangebot erstellen
 DocType: Quality Inspection,Incoming,Eingehend
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.py +47,Assessment Result record {0} already exists.,Assessment Ergebnis Datensatz {0} existiert bereits.
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.py +47,Assessment Result record {0} already exists.,Beurteilungsergebnis {0} existiert bereits.
 DocType: BOM,Materials Required (Exploded),Benötigte Materialien (erweitert)
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Bitte setzen Sie den Firmenfilter leer, wenn Group By &quot;Company&quot;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Buchungsdatum kann nicht Datum in der Zukunft sein
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Zeile # {0}: Seriennummer {1} stimmt nicht mit {2} {3} überein
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,zur Erzeugung der wiederkehrenden
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Erholungsurlaub
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Labortest UOM.
 DocType: Batch,Batch ID,Chargen-ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Hinweis: {0}
 ,Delivery Note Trends,Entwicklung Lieferscheine
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Zusammenfassung dieser Woche
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Vorrätig Anzahl
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Zusammenfassung dieser Woche
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Anzahl auf Lager
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Konto: {0} kann nur über Lagertransaktionen aktualisiert werden
 DocType: Student Group Creation Tool,Get Courses,Erhalten Sie Kurse
 DocType: GL Entry,Party,Gruppe
@@ -4220,7 +4311,6 @@
 DocType: Purchase Order,To Bill,Abrechnen
 DocType: Material Request,% Ordered,% bestellt
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Für die Kursbasierte Studentengruppe wird der Kurs für jeden Schüler aus den eingeschriebenen Kursen in der Programmregistrierung validiert.
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Geben Sie E-Mail-Adresse durch ein Komma getrennt werden Rechnung automatisch auf bestimmte Datum abgeschickt werden,"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Akkordarbeit
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Durchschnittlicher Einkaufspreis
 DocType: Task,Actual Time (in Hours),Tatsächliche Zeit (in Stunden)
@@ -4234,7 +4324,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Artikel {0} ist nicht für Seriennummern eingerichtet. Spalte muss leer sein
 DocType: Accounts Settings,Accounts Settings,Konteneinstellungen
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,Genehmigen
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Kein Ergebnis zur Einreichung
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Kein Ergebnis zur Einreichung
 DocType: Customer,Sales Partner and Commission,Vertriebspartner und Verprovisionierung
 DocType: Employee Loan,Rate of Interest (%) / Year,Zinssatz (%) / Jahr
 ,Project Quantity,Projekt Menge
@@ -4246,55 +4336,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Schwarz
 DocType: BOM Explosion Item,BOM Explosion Item,Position der aufgelösten Stückliste
 DocType: Account,Auditor,Prüfer
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} Elemente hergestellt
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} Elemente hergestellt
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Erfahren Sie mehr
 DocType: Cheque Print Template,Distance from top edge,Die Entfernung von der Oberkante
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Preisliste {0} ist deaktiviert oder nicht vorhanden ist
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Preisliste {0} ist deaktiviert oder nicht vorhanden ist
 DocType: Purchase Invoice,Return,Zurück
 DocType: Production Order Operation,Production Order Operation,Arbeitsgang im Fertigungsauftrag
 DocType: Pricing Rule,Disable,Deaktivieren
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,"Modus der Zahlung ist erforderlich, um eine Zahlung zu leisten"
 DocType: Project Task,Pending Review,Wartet auf Überprüfung
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Termine und Konsultationen
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ist nicht im Batch {2}
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",Anlagewert-{0} ist bereits verschrottet{1}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ist nicht im Batch {2}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",Anlagewert-{0} ist bereits entsorgt {1}
 DocType: Task,Total Expense Claim (via Expense Claim),Gesamtbetrag der Aufwandsabrechnung (über Aufwandsabrechnung)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Abwesend setzen
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Währung der BOM # {1} sollte auf die gewählte Währung gleich {2}
 DocType: Journal Entry Account,Exchange Rate,Wechselkurs
 DocType: Patient,Additional information regarding the patient,Zusätzliche Informationen zum Patienten
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Kundenauftrag {0} wurde nicht übertragen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Kundenauftrag {0} wurde nicht übertragen
 DocType: Homepage,Tag Line,Tag-Linie
 DocType: Fee Component,Fee Component,Fee-Komponente
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Flottenmanagement
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Elemente hinzufügen aus
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Flottenmanagement
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Elemente hinzufügen aus
 DocType: Cheque Print Template,Regular,Regulär
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Insgesamt weightage aller Bewertungskriterien muss 100% betragen
-DocType: BOM,Last Purchase Rate,Letzter Anschaffungspreis
+DocType: Purchase Order Item,Last Purchase Rate,Letzter Anschaffungspreis
 DocType: Account,Asset,Vermögenswert
 DocType: Project Task,Task ID,Aufgaben-ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Für Artikel {0} kann es kein Lager geben, da es Varianten gibt"
 DocType: Lab Test,Mobile,Mobile
 ,Sales Person-wise Transaction Summary,Vertriebsmitarbeiterbezogene Zusammenfassung der Transaktionen
 DocType: Training Event,Contact Number,Kontaktnummer
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Lager {0} existiert nicht
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Für ERPNext Hub anmelden
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Lager {0} existiert nicht
 DocType: Monthly Distribution,Monthly Distribution Percentages,Prozentuale Aufteilungen der monatsweisen Verteilung
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Der ausgewählte Artikel kann keine Charge haben
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Bewertungsrate für den Artikel {0} die für die Buchungen erforderlich ist {1} {2}, wurde nicht gefunden. Wenn das Element als ein Beispielartikel in der Abwicklung von {1} fungiert, bitte dieses in der Tabelle {1} berücksichtigen. Andernfalls erstellen Sie bitte eine eingehende Bestandsbuchung für das Element oder bearbeiten die Bewertungsrate in dem Elementdatensatz. Versuchen Sie dann, diesen Eintrag einzureichen oder zu stornieren."
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% dieser Lieferscheinmenge geliefert
+DocType: Training Event,Has Certificate,Hat Zertifikat
 DocType: Project,Customer Details,Kundendaten
 DocType: Employee,Reports to,Berichte an
 ,Unpaid Expense Claim,Unbezahlte Kostenabrechnung
 DocType: Payment Entry,Paid Amount,Gezahlter Betrag
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Entdecken Sie den Verkaufszyklus
 DocType: Assessment Plan,Supervisor,Supervisor
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,Online
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,Online
 ,Available Stock for Packing Items,Verfügbarer Bestand für Verpackungsartikel
 DocType: Item Variant,Item Variant,Artikelvariante
 DocType: Assessment Result Tool,Assessment Result Tool,Beurteilungsergebniswerkzeug
-DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Artikel
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Übermittelt Aufträge können nicht gelöscht werden
+DocType: BOM Scrap Item,BOM Scrap Item,BOM Ausschussartikel
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Übermittelt Aufträge können nicht gelöscht werden
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konto bereits im Soll, es ist nicht mehr möglich das Konto als Habenkonto festzulegen"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Qualitätsmanagement
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Artikel {0} wurde deaktiviert
@@ -4306,15 +4395,15 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Bilanzmenge
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,Ziele können nicht leer sein
 DocType: Item Group,Parent Item Group,Übergeordnete Artikelgruppe
-DocType: Appointment Type,Appointment Type,Terminart
+DocType: Appointment Type,Appointment Type,Termintyp
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} für {1}
 DocType: Healthcare Settings,Valid number of days,Gültige Anzahl von Tagen
 apps/erpnext/erpnext/setup/doctype/company/company.js +35,Cost Centers,Kostenstellen
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Kurs, zu dem die Währung des Lieferanten in die Basiswährung des Unternehmens umgerechnet wird"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Zeile #{0}: Timing-Konflikte mit Zeile {1}
-DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Berechnungsrate zulassen
+DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Nullbewertung zulassen
 DocType: Training Event Employee,Invited,Eingeladen
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Mehrere aktive Gehaltsstrukturen für Mitarbeiter gefunden {0} für die angegebenen Daten
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Mehrere aktive Gehaltsstrukturen für Mitarbeiter gefunden {0} für die angegebenen Daten
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Setup-Gateway-Konten.
 DocType: Employee,Employment Type,Art der Beschäftigung
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Anlagevermögen
@@ -4326,7 +4415,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Studenten E-Mail-ID
 DocType: Employee,Notice (days),Meldung(s)(-Tage)
 DocType: Tax Rule,Sales Tax Template,Umsatzsteuer-Vorlage
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,"Wählen Sie Elemente, um die Rechnung zu speichern"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,"Wählen Sie Elemente, um die Rechnung zu speichern"
 DocType: Employee,Encashment Date,Inkassodatum
 DocType: Training Event,Internet,Internet
 DocType: Special Test Template,Special Test Template,Spezielle Testvorlage
@@ -4334,8 +4423,8 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Es gibt Standard-Aktivitätskosten für Aktivitätsart - {0}
 DocType: Production Order,Planned Operating Cost,Geplante Betriebskosten
 DocType: Academic Term,Term Start Date,Laufzeit Startdatum
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Bitte Anhang beachten {0} #{1}
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Anzahl der Chancen
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Bitte Anhang beachten {0} #{1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Kontoauszug Bilanz nach Hauptbuch
 DocType: Job Applicant,Applicant Name,Bewerbername
 DocType: Authorization Rule,Customer / Item Name,Kunde / Artikelname
@@ -4355,7 +4444,7 @@
 DocType: Guardian,Guardian Of ,Wächter von
 DocType: Grading Scale Interval,Threshold,Schwelle
 DocType: BOM Update Tool,Current BOM,Aktuelle Stückliste
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Seriennummer hinzufügen
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Seriennummer hinzufügen
 DocType: Production Order Item,Available Qty at Source Warehouse,Verfügbare Menge bei Source Warehouse
 apps/erpnext/erpnext/config/support.py +22,Warranty,Garantie
 DocType: Purchase Invoice,Debit Note Issued,Lastschrift ausgestellt am
@@ -4378,10 +4467,9 @@
 DocType: Account,Receivable,Forderung
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Zeile #{0}: Es ist nicht erlaubt den Lieferanten zu wechseln, da bereits ein Lieferantenauftrag vorhanden ist"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, welche Transaktionen, die das gesetzte Kreditlimit überschreiten, übertragen darf."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Wählen Sie die Elemente Herstellung
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Stammdaten-Synchronisierung, kann es einige Zeit dauern,"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Wählen Sie die Elemente Herstellung
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Stammdaten-Synchronisierung, kann es einige Zeit dauern,"
 DocType: Item,Material Issue,Materialentnahme
-DocType: Hub Settings,Seller Description,Beschreibung des Verkäufers
 DocType: Employee Education,Qualification,Qualifikation
 DocType: Item Price,Item Price,Artikelpreis
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Reinigungsmittel
@@ -4389,7 +4477,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,"Von Zeit sein kann, nicht größer ist als auf die Zeit."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Film & Fernsehen
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestellt
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Fortsetzen
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Fortsetzen
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Wenn diese Option aktiviert ist, aktualisiert das System die Felder der Varianten nicht aus der Vorlage, sondern kopiert die Daten der unten genannten Felder, während eine neue Variante erstellt wird."
 DocType: Salary Detail,Component,Komponente
 DocType: Assessment Criteria,Assessment Criteria Group,Beurteilungskriterien Gruppe
 DocType: Healthcare Settings,Patient Name By,Patientenname Von
@@ -4399,7 +4488,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Bitte genehmigende Rolle oder genehmigenden Nutzer eingeben
 DocType: Journal Entry,Write Off Entry,Abschreibungsbuchung
 DocType: BOM,Rate Of Materials Based On,Anteil der zu Grunde liegenden Materialien
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Lieferant&gt; Lieferanten Typ
+DocType: Item Variant Settings,Do not Update Variants,Varianten nicht aktualisieren
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Support-Analyse
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Alle abwählen
 DocType: POS Profile,Terms and Conditions,Allgemeine Geschäftsbedingungen
@@ -4408,7 +4497,7 @@
 DocType: Leave Block List,Applies to Company,Gilt für Firma
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,"Stornierung nicht möglich, weil übertragene Lagerbuchung {0} existiert"
 DocType: Employee Loan,Disbursement Date,Valuta-
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,"Keine ""Empfänger"" angegeben"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,"Keine ""Empfänger"" angegeben"
 DocType: BOM Update Tool,Update latest price in all BOMs,Aktualisieren Sie den aktuellen Preis in allen Stücklisten
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Krankenakte
 DocType: Vehicle,Vehicle,Fahrzeug
@@ -4420,30 +4509,30 @@
 DocType: Sales Order Item,For Production,Für die Produktion
 DocType: Payment Request,payment_url,payment_url
 DocType: Project Task,View Task,Aufgabe anzeigen
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Blei%
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Chance/ Lead%
 DocType: Material Request,MREQ-,MREQ-
-,Asset Depreciations and Balances,Asset-Abschreibungen und Balances
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Menge {0} {1} übertragen von {2} auf {3}
+,Asset Depreciations and Balances,Anlagenbschreibungen und Balances
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Menge {0} {1} übertragen von {2} auf {3}
 DocType: Sales Invoice,Get Advances Received,Erhaltene Anzahlungen aufrufen
 DocType: Email Digest,Add/Remove Recipients,Empfänger hinzufügen/entfernen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Transaktion für angehaltenen Fertigungsauftrag {0} nicht erlaubt
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Um dieses Geschäftsjahr als Standard festzulegen, auf ""Als Standard festlegen"" anklicken"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Beitreten
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Beitreten
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Engpassmenge
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
 DocType: Employee Loan,Repay from Salary,Repay von Gehalts
 DocType: Leave Application,LAP/,RUNDE/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Anfordern Zahlung gegen {0} {1} für Menge {2}
 DocType: Salary Slip,Salary Slip,Gehaltsabrechnung
 DocType: Lead,Lost Quotation,Verlorene Angebote
 apps/erpnext/erpnext/utilities/user_progress.py +200,Student Batches,Studentenchargen
-DocType: Pricing Rule,Margin Rate or Amount,Margin Rate oder Menge
+DocType: Pricing Rule,Margin Rate or Amount,Marge oder Betrag
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,"""Bis-Datum"" ist erforderlich,"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Packzettel für zu liefernde Pakete generieren. Wird verwendet, um Paketnummer, Packungsinhalt und das Gewicht zu dokumentieren."
 DocType: Sales Invoice Item,Sales Order Item,Kundenauftrags-Artikel
 DocType: Salary Slip,Payment Days,Zahlungsziel
 DocType: Patient,Dormant,ruhend
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Lagerhäuser mit untergeordneten Knoten kann nicht umgewandelt werden Ledger
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Lagerhäuser mit untergeordneten Knoten kann nicht umgewandelt werden Ledger
 DocType: BOM,Manage cost of operations,Arbeitsgangkosten verwalten
 DocType: Accounts Settings,Stale Days,Stale Tage
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Wenn eine der ausgewählten Transaktionen den Status ""übertragen"" erreicht hat, geht automatisch ein E-Mail-Fenster auf. Damit kann eine E-Mail mit dieser Transaktion als Anhang an die verknüpften Kontaktdaten gesendet werden. Der Benutzer kann auswählen, ob er diese E-Mail absenden will."
@@ -4457,20 +4546,19 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Seriennummer {0} bereits erhalten
 ,Requested Items To Be Transferred,"Angeforderte Artikel, die übertragen werden sollen"
 DocType: Expense Claim,Vehicle Log,Fahrzeug Log
-DocType: Purchase Invoice,Recurring Id,Wiederkehrende ID
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Vorhandensein eines Fiebers (Temp .: 38,5 ° C / 101,3 ° F oder anhaltende Temperatur&gt; 38 ° C / 100,4 ° F)"
 DocType: Customer,Sales Team Details,Verkaufsteamdetails
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Dauerhaft löschen?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Dauerhaft löschen?
 DocType: Expense Claim,Total Claimed Amount,Gesamtforderung
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Mögliche Opportunität für den Vertrieb
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Ungültige(r) {0}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Sick Leave,Krankheitsbedingte Abwesenheit
-DocType: Email Digest,Email Digest,Täglicher E-Mail-Bericht
+DocType: Email Digest,Email Digest,E-Mail-Bericht
 DocType: Delivery Note,Billing Address Name,Name der Rechnungsadresse
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Kaufhäuser
 ,Item Delivery Date,Artikel Liefertermin
 DocType: Warehouse,PIN,STIFT
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Richten Sie Ihre Schule in ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Richten Sie Ihre Schule in ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base-Änderungsbetrag (Gesellschaft Währung)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Keine Buchungen für die folgenden Lager
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Speichern Sie das Dokument zuerst.
@@ -4479,16 +4567,15 @@
 DocType: Expense Claim Detail,Expense Date,Datum der Aufwendung
 DocType: Item,Max Discount (%),Maximaler Rabatt (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Letzter Bestellbetrag
-DocType: Task,Is Milestone,Ist Milestone
-DocType: Daily Work Summary,Email Sent To,Email an gesendet
+DocType: Task,Is Milestone,Ist Meilenstein
+DocType: Daily Work Summary,Email Sent To,E-Mail versandt an
 DocType: Budget,Warn,Warnen
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Möchten Sie die Registrierung wirklich aufheben?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Sonstige wichtige Anmerkungen, die in die Datensätze aufgenommen werden sollten."
 DocType: BOM,Manufacturing User,Nutzer Fertigung
 DocType: Purchase Invoice,Raw Materials Supplied,Gelieferte Rohmaterialien
-DocType: Purchase Invoice,Recurring Print Format,Wiederkehrendes Druckformat
 DocType: C-Form,Series,Nummernkreise
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Die Währung der Preisliste {0} muss {1} oder {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Produkte hinzufügen
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Die Währung der Preisliste {0} muss {1} oder {2}
 DocType: Appraisal,Appraisal Template,Bewertungsvorlage
 DocType: Item Group,Item Classification,Artikeleinteilung
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Leiter der kaufmännischen Abteilung
@@ -4496,13 +4583,13 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Rechnungsempfänger
 DocType: Drug Prescription,Period,Periode
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Hauptbuch
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Mitarbeiter {0} auf Leave auf {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Mitarbeiter {0} am {1} im Urlaub
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Leads anzeigen
 DocType: Program Enrollment Tool,New Program,Neues Programm
 DocType: Item Attribute Value,Attribute Value,Attributwert
 ,Itemwise Recommended Reorder Level,Empfohlener artikelbezogener Meldebestand
 DocType: Salary Detail,Salary Detail,Gehalt Details
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Bitte zuerst {0} auswählen
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Bitte zuerst {0} auswählen
 DocType: Appointment Type,Physician,Arzt
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Charge {0} von Artikel {1} ist abgelaufen.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Konsultationen
@@ -4513,7 +4600,7 @@
 DocType: Salary Detail,Default Amount,Standard-Betrag
 DocType: Lab Test Template,Descriptive,Beschreibend
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Lager im System nicht gefunden
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Zusammenfassung dieses Monats
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Zusammenfassung dieses Monats
 DocType: Quality Inspection Reading,Quality Inspection Reading,Ablesung zur Qualitätsprüfung
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,"""Lagerbestände sperren, wenn älter als"" sollte kleiner sein als %d Tage."
 DocType: Tax Rule,Purchase Tax Template,Umsatzsteuer-Vorlage
@@ -4536,12 +4623,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Ausbildungsveranstaltungen / Ergebnisse
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Kumulierte Abschreibungen auf
 DocType: Sales Invoice,C-Form Applicable,Anwenden auf Kontakt-Formular
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Betriebszeit muss für die Operation {0} größer als 0 sein
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Betriebszeit muss für die Operation {0} größer als 0 sein
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Lager ist erforderlich
 DocType: Supplier,Address and Contacts,Adresse und Kontaktinformationen
 DocType: UOM Conversion Detail,UOM Conversion Detail,Maßeinheit-Umrechnungs-Detail
 DocType: Program,Program Abbreviation,Programm Abkürzung
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Ein Fertigungsauftrag kann nicht zu einer Artikel-Vorlage gemacht werden
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Ein Fertigungsauftrag kann nicht zu einer Artikel-Vorlage gemacht werden
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Kosten werden im Kaufbeleg für jede Position aktualisiert
 DocType: Warranty Claim,Resolved By,Entschieden von
 DocType: Bank Guarantee,Start Date,Startdatum
@@ -4567,26 +4654,27 @@
 DocType: Employee,Educational Qualification,Schulische Qualifikation
 DocType: Workstation,Operating Costs,Betriebskosten
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Erwünschte Aktion bei überschrittenem kumuliertem Monatsbudget
-DocType: Purchase Invoice,Submit on creation,Buchen beim Erstellen
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Währung für {0} muss {1} sein
+DocType: Subscription,Submit on creation,Buchen beim Erstellen
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Währung für {0} muss {1} sein
 DocType: Asset,Disposal Date,Verkauf Datum
-DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-Mails werden an alle aktiven Mitarbeiter des Unternehmens an der angegebenen Stunde gesendet werden, wenn sie nicht Urlaub. Zusammenfassung der Antworten wird um Mitternacht gesendet werden."
+DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-Mails werden an alle aktiven Mitarbeiter des Unternehmens an der angegebenen Stunde gesendet werden, sofern sie nicht im Urlaub sind. Die Zusammenfassung der Antworten wird um Mitternacht versandt werden."
 DocType: Employee Leave Approver,Employee Leave Approver,Urlaubsgenehmiger des Mitarbeiters
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Zeile {0}: Es gibt bereits eine Nachbestellungsbuchung für dieses Lager {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Kann nicht als verloren deklariert werden, da bereits ein Angebot erstellt wurde."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Training Feedback
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Zeile {0}: Es gibt bereits eine Nachbestellungsbuchung für dieses Lager {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Kann nicht als verloren deklariert werden, da bereits ein Angebot erstellt wurde."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Training Feedback
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Fertigungsauftrag {0} muss übertragen werden
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Lieferanten-Scorecard-Kriterien
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Bitte Start -und Enddatum für den Artikel {0} auswählen
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Kurs ist obligatorisch in Zeile {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Bis-Datum kann nicht vor Von-Datum liegen
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Preise hinzufügen / bearbeiten
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Preise hinzufügen / bearbeiten
 DocType: Batch,Parent Batch,Übergeordnete Charge
 DocType: Cheque Print Template,Cheque Print Template,Scheck Druckvorlage
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Kostenstellenplan
 DocType: Lab Test Template,Sample Collection,Beispielsammlung
 ,Requested Items To Be Ordered,"Angefragte Artikel, die bestellt werden sollen"
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Meine Bestellungen
 DocType: Price List,Price List Name,Preislistenname
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},tägliche Arbeitszusammenfassung für {0}
 DocType: Employee Loan,Totals,Summen
@@ -4602,15 +4690,15 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Fertigstellungstermin
 DocType: Purchase Invoice Item,Amount (Company Currency),Betrag (Firmenwährung)
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Valid till date cannot be before transaction date,Gültig bis Datum kann nicht vor Transaktionsdatum sein
-apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} Einheiten von {1} benötigt in {2} auf {3} {4} für {5} zum Abschluss dieser Transaktion.
+apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,"Es werden {0} Einheiten von {1} in {2} auf {3} {4} für {5} benötigt, um diesen Vorgang abzuschließen."
 DocType: Fee Schedule,Student Category,Studenten-Kategorie
 DocType: Announcement,Student,Schüler
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Stammdaten der Organisationseinheit (Abteilung)
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Stammdaten der Organisationseinheit (Abteilung)
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Geh zu den Zimmern
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Bitte eine Nachricht vor dem Versenden eingeben
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,DUPLIKAT FÜR LIEFERANTEN
 DocType: Email Digest,Pending Quotations,Ausstehende Angebote
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Verkaufsstellen-Profil
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Verkaufsstellen-Profil
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Labortestkonfigurationen.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Ungesicherte Kredite
 DocType: Cost Center,Cost Center Name,Kostenstellenbezeichnung
@@ -4620,19 +4708,21 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Summe gezahlte Beträge
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Mitteilungen mit mehr als 160 Zeichen werden in mehrere Nachrichten aufgeteilt
 DocType: Purchase Receipt Item,Received and Accepted,Erhalten und bestätigt
+DocType: Hub Settings,Company and Seller Profile,Firmen- und Verkäuferprofil
 ,GST Itemised Sales Register,GST Einzelverkaufsregister
 ,Serial No Service Contract Expiry,Ablaufdatum des Wartungsvertrags zu Seriennummer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Sie können ein Konto nicht gleichzeitig be- und entlasten
-DocType: Vital Signs,Adults' pulse rate is anywhere between 50 and 80 beats per minute.,Die Pulsrate der Erwachsenen liegt zwischen 50 und 80 Schlägen pro Minute.
+DocType: Vital Signs,Adults' pulse rate is anywhere between 50 and 80 beats per minute.,Der durchschnittliche Puls eines Erwachsenen liegt zwischen 60 und 80 Schlägen pro Minute.
 DocType: Naming Series,Help HTML,HTML-Hilfe
 DocType: Student Group Creation Tool,Student Group Creation Tool,Student Group Creation Tool
 DocType: Item,Variant Based On,Variante basierend auf
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Summe der zugeordneten Gewichtungen sollte 100% sein. Sie ist {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Ihre Lieferanten
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Bitte korrigieren Sie die
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,"Kann nicht als verloren gekennzeichnet werden, da ein Kundenauftrag dazu existiert."
 DocType: Request for Quotation Item,Supplier Part No,Lieferant Teile-Nr
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Kann nicht abziehen, wenn der Kategorie für &quot;Bewertung&quot; oder &quot;Vaulation und Total &#39;ist"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Erhalten von
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Kann nicht abschreiben, wenn die Kategorie ""Bewertung"" oder ""Bewertung und Total 'ist"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Erhalten von
 DocType: Lead,Converted,umgewandelt
 DocType: Item,Has Serial No,Hat Seriennummer
 DocType: Employee,Date of Issue,Ausstellungsdatum
@@ -4640,7 +4730,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Nach den Kaufeinstellungen, wenn Kaufbedarf erforderlich == &#39;JA&#39;, dann für die Erstellung der Kauf-Rechnung, muss der Benutzer die Kaufbeleg zuerst für den Eintrag {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Zeile #{0}: Lieferanten für Artikel {1} einstellen
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Row {0}: Stunden-Wert muss größer als Null sein.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,"Das Webseiten-Bild {0}, das an Artikel {1} angehängt wurde, kann nicht gefunden werden"
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,"Das Webseiten-Bild {0}, das an Artikel {1} angehängt wurde, kann nicht gefunden werden"
 DocType: Issue,Content Type,Inhaltstyp
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Rechner
 DocType: Item,List this Item in multiple groups on the website.,Diesen Artikel in mehreren Gruppen auf der Webseite auflisten.
@@ -4651,14 +4741,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Nicht zugeordnete Buchungen aufrufen
 DocType: Payment Reconciliation,From Invoice Date,Ab Rechnungsdatum
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Sie haben keine Erlaubnis zur Einreichung
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,Abrechnungswährung muss entweder auf Standard comapany Währung oder Partei Kontowährung gleich
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Abrechnungswährung muss entweder der Standardfirmenwährun oder der Währung der  Gegenseiten entsprechen.
 DocType: Healthcare Settings,Laboratory Settings,Laboreinstellungen
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Lassen Sie Encashment
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Unternehmenszweck
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,An Lager
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Alle Studenten Admissions
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Einlösung gewähren
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Unternehmenszweck
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,An Lager
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Alle Studenten Admissions
 ,Average Commission Rate,Durchschnittlicher Provisionssatz
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,"""Hat Seriennummer"" kann bei Nicht-Lagerartikeln nicht ""Ja"" sein"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,"""Hat Seriennummer"" kann bei Nicht-Lagerartikeln nicht ""Ja"" sein"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Wählen Sie Status
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Die Anwesenheit kann nicht für zukünftige Termine markiert werden
 DocType: Pricing Rule,Pricing Rule Help,Hilfe zur Preisregel
@@ -4667,7 +4757,7 @@
 DocType: Purchase Taxes and Charges,Account Head,Kontobezeichnung
 apps/erpnext/erpnext/config/stock.py +173,Update additional costs to calculate landed cost of items,Zusatzkosten aktualisieren um die Einstandskosten des Artikels zu kalkulieren
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Electrical,Elektro
-apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Fügen Sie den Rest Ihrer Organisation als Nutzer hinzu. Sie können auch Kunden zu Ihrem Portal einladen indem Sie sie aus den Kontakten hinzufügen
+apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Fügen Sie den Rest Ihrer Organisation als Nutzer hinzu. Sie können auch Kunden zu Ihrem Portal einladen indem Sie sie aus den Kontakten die Einladung senden
 DocType: Stock Entry,Total Value Difference (Out - In),Gesamt-Wertdifferenz (Aus - Ein)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Zeile {0}: Wechselkurs ist erforderlich
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Benutzer-ID ist für Mitarbeiter {0} nicht eingegeben
@@ -4676,40 +4766,40 @@
 DocType: Item,Customer Code,Kunden-Nr.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Geburtstagserinnerung für {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Tage seit dem letzten Auftrag
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Sollkonto muss ein Bilanzkonto sein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Sollkonto muss ein Bilanzkonto sein
 DocType: Buying Settings,Naming Series,Nummernkreis
 DocType: Leave Block List,Leave Block List Name,Name der Urlaubssperrenliste
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Versicherung Startdatum sollte weniger als Versicherung Enddatum
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Bitte richten Sie das Instructor Naming System unter Schule&gt; Schule ein
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Wertpapiere
 DocType: Timesheet,Production Detail,Produktionsdetail
+DocType: Restaurant,Active Menu,Aktives Menü
 DocType: Target Detail,Target Qty,Zielmenge
 DocType: Shopping Cart Settings,Checkout Settings,Kasse Einstellungen
 DocType: Attendance,Present,Anwesend
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Lieferschein {0} darf nicht gebucht werden
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Lieferschein {0} darf nicht gebucht werden
 DocType: Notification Control,Sales Invoice Message,Mitteilung zur Ausgangsrechnung
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Abschlußkonto {0} muss vom Typ Verbindlichkeiten/Eigenkapital sein
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Gehaltsabrechnung der Mitarbeiter {0} bereits für Zeitblatt erstellt {1}
-DocType: Vehicle Log,Odometer,Kilometerzähler
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Gehaltsabrechnung der Mitarbeiter {0} bereits für Zeitblatt erstellt {1}
+DocType: Vehicle Log,Odometer,Tacho
 DocType: Sales Order Item,Ordered Qty,Bestellte Menge
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Artikel {0} ist deaktiviert
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Artikel {0} ist deaktiviert
 DocType: Stock Settings,Stock Frozen Upto,Bestand gesperrt bis
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,Stückliste enthält keine Lagerware
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Projektaktivität/-vorgang.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,Stückliste enthält keine Lagerware
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Projektaktivität/-vorgang.
 DocType: Vehicle Log,Refuelling Details,Betankungs Einzelheiten
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Gehaltsabrechnungen generieren
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Einkauf muss ausgewählt sein, wenn ""Anwenden auf"" auf {0} gesetzt wurde"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Discount muss kleiner als 100 sein
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Zuletzt Kaufrate nicht gefunden
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Abschreibungs-Betrag (Firmenwährung)
-DocType: Sales Invoice Timesheet,Billing Hours,Billing Stunden
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,Standardstückliste für {0} nicht gefunden
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Zeile #{0}: Bitte Nachbestellmenge angeben
+DocType: Sales Invoice Timesheet,Billing Hours,Abgerechnete Stunden
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Standardstückliste für {0} nicht gefunden
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Zeile #{0}: Bitte Nachbestellmenge angeben
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,"Tippen Sie auf Elemente, um sie hier hinzuzufügen"
 DocType: Fees,Program Enrollment,Programm Einschreibung
 DocType: Landed Cost Voucher,Landed Cost Voucher,Beleg über Einstandskosten
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Bitte {0} setzen
-DocType: Purchase Invoice,Repeat on Day of Month,Wiederholen an Tag des Monats
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} ist ein inaktiver Schüler
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} ist ein inaktiver Schüler
 DocType: Employee,Health Details,Gesundheitsdaten
 DocType: Offer Letter,Offer Letter Terms,Gültigkeit des Angebotsschreibens
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Zur Erstellung eines Zahlungsauftrags ist ein Referenzdokument erforderlich
@@ -4717,13 +4807,12 @@
 DocType: Employee External Work History,Salary,Gehalt
 DocType: Serial No,Delivery Document Type,Lieferdokumententyp
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Alle Gehaltsabrechnungen für die oben gewählten Kriterien übertragen
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Artikel synchronisiert
 DocType: Sales Order,Partly Delivered,Teilweise geliefert
 DocType: Email Digest,Receivables,Forderungen
 DocType: Lead Source,Lead Source,Lead Ursprung
 DocType: Customer,Additional information regarding the customer.,Zusätzliche Informationen bezüglich des Kunden.
 DocType: Quality Inspection Reading,Reading 5,Ablesewert 5
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +225,"{0} {1} is associated with {2}, but Party Account is {3}","{0} {1} ist mit {2} verbunden, aber Party Account ist {3}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +225,"{0} {1} is associated with {2}, but Party Account is {3}","{0} {1} ist mit {2} verbunden, aber das Gegenkonto ist {3}"
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Lab-Tests anzeigen
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Wartungsdatum
@@ -4739,19 +4828,19 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Alter Bereich 2
 DocType: SG Creation Tool Course,Max Strength,Max Kraft
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,Stückliste ersetzt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Wählen Sie die Positionen nach dem Lieferdatum aus
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Wählen Sie die Positionen nach dem Lieferdatum aus
 ,Sales Analytics,Vertriebsanalyse
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Verfügbar {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Verfügbar {0}
 ,Prospects Engaged But Not Converted,"Perspektiven engagiert, aber nicht umgewandelt"
 DocType: Manufacturing Settings,Manufacturing Settings,Fertigungseinstellungen
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,E-Mail einrichten
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Mobil Nein
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Bitte die Standardwährung in die Firmenstammdaten eingeben
 DocType: Stock Entry Detail,Stock Entry Detail,Lagerbuchungsdetail
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Tägliche Erinnerungen
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Tägliche Erinnerungen
 DocType: Products Settings,Home Page is Products,"Startseite ist ""Products"""
-,Asset Depreciation Ledger,Asset-Abschreibungen Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Steuer-Regel steht in Konflikt mit {0}
+,Asset Depreciation Ledger,Anlagenabschreibungensbuch
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Steuer-Regel steht in Konflikt mit {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Neuer Kontoname
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Kosten gelieferter Rohmaterialien
 DocType: Selling Settings,Settings for Selling Module,Einstellungen Verkauf
@@ -4765,15 +4854,16 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Artikel {0} muss ein Lagerartikel sein
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard-Fertigungslager
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Standardeinstellungen für Buchhaltungstransaktionen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Bitte richten Sie das Mitarbeiter-Benennungssystem in Personal&gt; HR-Einstellungen ein
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Voraussichtliches Datum kann nicht vor dem Datum der Materialanfrage liegen
+DocType: Restaurant,Default Tax Template,Standardsteuervorlage
 DocType: Fees,Student Details,Studenten Details
 DocType: Purchase Invoice Item,Stock Qty,Lager Menge
 DocType: Employee Loan,Repayment Period in Months,Rückzahlungsfrist in Monaten
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Fehler: Keine gültige ID?
 DocType: Naming Series,Update Series Number,Nummernkreis-Wert aktualisieren
 DocType: Account,Equity,Eigenkapital
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +78,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,"{0} {1}: ""Gewinn und Verlust"" Konto-Art {2} nicht in Eröffnungs-Buchung erlaubt"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +78,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,"{0} {1}: ""Gewinn und Verlust"" Konto-Art {2} ist nicht in Eröffnungs-Buchung erlaubt"
 DocType: Sales Order,Printing Details,Druckdetails
 DocType: Task,Closing Date,Abschlussdatum
 DocType: Sales Order Item,Produced Quantity,Produzierte Menge
@@ -4784,8 +4874,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Gehen Sie zu Artikeln
 DocType: Sales Partner,Partner Type,Partnertyp
 DocType: Purchase Taxes and Charges,Actual,Tatsächlich
+DocType: Restaurant Menu,Restaurant Manager,Restaurantmanager
 DocType: Authorization Rule,Customerwise Discount,Kundenspezifischer Rabatt
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Zeitraport für Vorgänge.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Zeitraport für Vorgänge.
 DocType: Purchase Invoice,Against Expense Account,Zu Aufwandskonto
 DocType: Production Order,Production Order,Fertigungsauftrag
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Installationshinweis {0} wurde bereits übertragen
@@ -4793,7 +4884,6 @@
 DocType: Quotation Item,Against Docname,Zu Dokumentenname
 DocType: SMS Center,All Employee (Active),Alle Mitarbeiter (Aktiv)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Jetzt ansehen
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Bitte Zeitraum auswählen, zu dem die Rechnung automatisch erstellt werden soll."
 DocType: BOM,Raw Material Cost,Rohmaterialkosten
 DocType: Item Reorder,Re-Order Level,Meldebestand
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Geben Sie die Posten und die geplante Menge ein, für die Sie Fertigungsaufträge erstellen möchten, oder laden Sie die Rohmaterialien für die Analyse herunter."
@@ -4806,23 +4896,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Berichtstyp ist zwingend erforderlich
 DocType: Item,Serial Number Series,Serie der Seriennummer
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Angabe des Lagers ist für Lagerartikel {0} in Zeile {1} zwingend erfoderlich
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Programme hinzufügen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Einzel- & Großhandel
 DocType: Issue,First Responded On,Zuerst geantwortet auf
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kreuzweise Auflistung des Artikels in mehreren Gruppen
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Start- und Enddatum des Geschäftsjahres sind für das Geschäftsjahr {0} bereits gesetzt
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Räumungs Datum aktualisiert
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Abrechnungsdatum aktualisiert
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split Batch
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Erfolgreich abgestimmt
 DocType: Request for Quotation Supplier,Download PDF,PDF Herunterladen
 DocType: Production Order,Planned End Date,Geplantes Enddatum
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Bitte geben Sie das geplante Datum ein
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,"Ort, an dem Artikel gelagert werden."
 DocType: Request for Quotation,Supplier Detail,Lieferant Details
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Fehler in der Formel oder Bedingung: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Fehler in Formel oder Bedingung: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Rechnungsbetrag
-apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kriteriengewichte müssen bis zu 100%
+apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kriteriengewichte müssen zusammen 100% ergeben.
 DocType: Attendance,Attendance,Anwesenheit
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,stock Items
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,stock Items
 DocType: BOM,Materials,Materialien
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Wenn deaktiviert, muss die Liste zu jeder Abteilung, für die sie gelten soll, hinzugefügt werden."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Quelle und Ziel-Warehouse kann nicht gleich sein
@@ -4840,6 +4930,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,Auf Nettosumme
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Wert für das Attribut {0} muss im Bereich von {1} bis {2} in den Schritten von {3} für Artikel {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Eingangslager in Zeile {0} muss dem Fertigungsauftrag entsprechen
+DocType: Restaurant Reservation,Waitlisted,Warteliste
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,"Die Währung kann nicht geändert werden, wenn Buchungen in einer anderen Währung getätigt wurden"
 DocType: Vehicle Service,Clutch Plate,Kupplungsscheibe
 DocType: Company,Round Off Account,Abschlusskonto
@@ -4848,17 +4939,17 @@
 DocType: Customer Group,Parent Customer Group,Übergeordnete Kundengruppe
 DocType: Journal Entry,Subscription,Abonnement
 DocType: Purchase Invoice,Contact Email,Kontakt-E-Mail
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Fee Creation ausstehend
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Gebührenermittlung ausstehend
 DocType: Appraisal Goal,Score Earned,Erreichte Punktzahl
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +229,Notice Period,Mitteilungsfrist
-DocType: Asset Category,Asset Category Name,Asset-Kategorie Name
+DocType: Asset Category,Asset Category Name,Anlagekategorie Name
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Dies ist ein Root-Gebiet und kann nicht bearbeitet werden.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Neuer Verkaufspersonenname
 DocType: Packing Slip,Gross Weight UOM,Bruttogewicht-Maßeinheit
 DocType: Delivery Note Item,Against Sales Invoice,Zu Ausgangsrechnung
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Bitte geben Sie Seriennummern für serialisierte Artikel ein
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Bitte geben Sie Seriennummern für serialisierte Artikel ein
 DocType: Bin,Reserved Qty for Production,Reserviert Menge für Produktion
-DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Lassen Sie unkontrolliert, wenn Sie nicht wollen, Batch während der Kurs-basierte Gruppen zu betrachten."
+DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Nicht anhaken, wenn Sie keine Stapelverarbeitung beim Anlegen von Kurs basierten Gruppen wünschen."
 DocType: Asset,Frequency of Depreciation (Months),Die Häufigkeit der Abschreibungen (Monate)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +493,Credit Account,Guthabenkonto
 DocType: Landed Cost Item,Landed Cost Item,Einstandspreis-Artikel
@@ -4867,7 +4958,7 @@
 DocType: Lab Test,Test Group,Testgruppe
 DocType: Payment Reconciliation,Receivable / Payable Account,Forderungen-/Verbindlichkeiten-Konto
 DocType: Delivery Note Item,Against Sales Order Item,Zu Kundenauftrags-Position
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Bitte Attributwert für Attribut {0} angeben
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Bitte Attributwert für Attribut {0} angeben
 DocType: Item,Default Warehouse,Standardlager
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budget kann nicht einem Gruppenkonto {0} zugeordnet werden
 DocType: Healthcare Settings,Patient Registration,Patientenregistrierung
@@ -4875,7 +4966,7 @@
 DocType: Delivery Note,Print Without Amount,Drucken ohne Betrag
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Abschreibungen Datum
 DocType: Issue,Support Team,Support-Team
-apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),Gültig (in Tagen)
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),Verfällt (in Tagen)
 DocType: Appraisal,Total Score (Out of 5),Gesamtwertung (max 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Student Attendance Tool,Batch,Charge
@@ -4896,6 +4987,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Vertriebsmitarbeiter
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Budget und Kostenstellen
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Mehrere Standard-Zahlungsarten sind nicht erlaubt
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,für die
 ,Appointment Analytics,Terminanalytik
 DocType: Vehicle Service,Half Yearly,Halbjährlich
 DocType: Lead,Blog Subscriber,Blog-Abonnent
@@ -4904,8 +4996,8 @@
 DocType: Assessment Plan Criteria,Maximum Score,Maximale Punktzahl
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Regeln erstellen um Transaktionen auf Basis von Werten zu beschränken
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +49, Group Roll No,Gruppenrolle Nr
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +9,Fee Creation Failed,Fee Creation fehlgeschlagen
-DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Lassen Sie leer, wenn Sie Studenten Gruppen pro Jahr machen"
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +9,Fee Creation Failed,Gebührenermittlung fehlgeschlagen
+DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Lassen Sie dies leer, wenn Sie Studentengruppen pro Jahr anlegen."
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Wenn aktiviert, beinhaltet die Gesamtanzahl der Arbeitstage auch Urlaubstage und dies reduziert den Wert des Gehalts pro Tag."
 DocType: Purchase Invoice,Total Advance,Summe der Anzahlungen
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Vorlagencode ändern
@@ -4913,7 +5005,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Quot Count
 ,BOM Stock Report,BOM Stock Report
 DocType: Stock Reconciliation Item,Quantity Difference,Mengendifferenz
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Gehaltsabrechnung verarbeiten
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Gehaltsabrechnung verarbeiten
 DocType: Opportunity Item,Basic Rate,Grundpreis
 DocType: GL Entry,Credit Amount,Guthaben-Summe
 DocType: Cheque Print Template,Signatory Position,Unterzeichner Position
@@ -4927,19 +5019,20 @@
 DocType: Tax Rule,Tax Rule,Steuer-Regel
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Gleiche Preise während des gesamten Verkaufszyklus beibehalten
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Zeiten außerhalb der normalen Arbeitszeiten am Arbeitsplatz zulassen.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Kunden in der Warteschlange
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} hat keinen Arzt-Zeitplan. Fügen Sie es dem Arzt-Master hinzu
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Kunden in der Warteschlange
 DocType: Student,Nationality,Staatsangehörigkeit
 ,Items To Be Requested,Anzufragende Artikel
-DocType: Purchase Order,Get Last Purchase Rate,Letzten Einkaufspreis aufrufen
 DocType: Company,Company Info,Informationen über das Unternehmen
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Wählen oder neue Kunden hinzufügen
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,"Kostenstelle ist erforderlich, einen Aufwand Anspruch buchen"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Wählen oder neue Kunden hinzufügen
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,"Eine Kostenstelle ist erforderlich, um einen Aufwandsanspruch zu buchen."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Mittelverwendung (Aktiva)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Dies basiert auf der Anwesenheit dieser Arbeitnehmer
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Markieren Sie die Anwesenheit
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Sollkonto
 DocType: Fiscal Year,Year Start Date,Startdatum des Geschäftsjahres
 DocType: Attendance,Employee Name,Mitarbeitername
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restaurantbestellzugangsposten
 DocType: Sales Invoice,Rounded Total (Company Currency),Gerundete Gesamtsumme (Firmenwährung)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Kann nicht in keine Gruppe umgewandelt werden, weil Kontentyp ausgewählt ist."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} wurde geändert. Bitte aktualisieren.
@@ -4950,6 +5043,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Vergünstigungen an Mitarbeiter
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Verpackte Menge muss gleich der Menge des Artikel {0} in Zeile {1} sein
 DocType: Production Order,Manufactured Qty,Produzierte Menge
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Rechnung erstellt
 DocType: Purchase Receipt Item,Accepted Quantity,Angenommene Menge
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Bitte stellen Sie eine Standard-Feiertagsliste für Mitarbeiter {0} oder Gesellschaft {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} existiert nicht
@@ -4959,18 +5053,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Zeile Nr. {0}: Betrag kann nicht größer als der ausstehende Betrag zur Aufwandsabrechnung {1} sein. Ausstehender Betrag ist {2}
 DocType: Maintenance Schedule,Schedule,Zeitplan
 DocType: Account,Parent Account,Übergeordnetes Konto
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Verfügbar
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Verfügbar
 DocType: Quality Inspection Reading,Reading 3,Ablesewert 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Belegtyp
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Preisliste nicht gefunden oder deaktiviert
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Preisliste nicht gefunden oder deaktiviert
 DocType: Lab Test,Approved,Genehmigt
 DocType: Pricing Rule,Price,Preis
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',"Freigestellter Angestellter {0} muss als ""entlassen"" gekennzeichnet werden"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',"Freigestellter Angestellter {0} muss als ""entlassen"" gekennzeichnet werden"
+DocType: Hub Settings,Last Sync On,Letzte Synchronisierung an
 DocType: Guardian,Guardian,Wächter
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Bewertung {0} für Mitarbeiter {1} im angegebenen Datumsbereich erstellt
 DocType: Employee,Education,Bildung
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Entf
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,Entf
 DocType: Selling Settings,Campaign Naming By,Benennung der Kampagnen nach
 DocType: Employee,Current Address Is,Aktuelle Adresse ist
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Monatliches Verkaufsziel (
@@ -4984,8 +5079,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Zeile {0}: Gruppe / Konto stimmt nicht mit {1} / {2} in {3} {4} überein
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Kurscode:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Bitte das Aufwandskonto angeben
-DocType: Account,Stock,Lagerbestand
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Referenzdokumenttyp muss eine der Bestellung, Rechnung oder Kaufjournaleintrag sein"
+DocType: Account,Stock,Lager
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Referenzdokumenttyp muss eine der Bestellung, Rechnung oder Kaufjournaleintrag sein"
 DocType: Employee,Current Address,Aktuelle Adresse
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Wenn der Artikel eine Variante eines anderen Artikels ist, dann werden Beschreibung, Bild, Preise, Steuern usw. aus der Vorlage übernommen, sofern nicht ausdrücklich etwas angegeben ist."
 DocType: Serial No,Purchase / Manufacture Details,Einzelheiten zu Kauf / Herstellung
@@ -5008,7 +5103,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,Das Jahr Enddatum kann nicht früher als das Jahr Startdatum. Bitte korrigieren Sie die Daten und versuchen Sie es erneut.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Zeile {0}: Gruppen-Typ und Gruppe sind nur auf Forderungen-/Verbindlichkeiten-Konto anzuwenden
 DocType: Notification Control,Purchase Receipt Message,Kaufbeleg-Nachricht
-DocType: BOM,Scrap Items,scrap Artikel
+DocType: BOM,Scrap Items,Ausschussartikel
 DocType: Production Order,Actual Start Date,Tatsächliches Startdatum
 DocType: Sales Order,% of materials delivered against this Sales Order,% der für diesen Kundenauftrag gelieferten Materialien
 apps/erpnext/erpnext/config/stock.py +12,Record item movement.,Lagerbewegung aufzeichnen
@@ -5016,7 +5111,7 @@
 DocType: Hub Settings,Hub Settings,Hub-Einstellungen
 DocType: Project,Gross Margin %,Handelsspanne %
 DocType: BOM,With Operations,Mit Arbeitsgängen
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Es wurden bereits Buchungen in der Währung {0} für Firma {1} vorgenommen. Bitte ein Forderungs- oder Verbindlichkeiten-Konto mit Währung {0} wählen.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Es wurden bereits Buchungen in der Währung {0} für Firma {1} vorgenommen. Bitte ein Forderungs- oder Verbindlichkeiten-Konto mit Währung {0} wählen.
 DocType: Asset,Is Existing Asset,Ist bereits bestehenden Asset
 DocType: Salary Detail,Statistical Component,Statistische Komponente
 DocType: Warranty Claim,If different than customer address,Wenn anders als Kundenadresse
@@ -5024,13 +5119,14 @@
 DocType: BOM Operation,BOM Operation,Stücklisten-Vorgang
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Auf vorherigen Zeilenbetrag
 DocType: Student,Home Address,Privatadresse
-apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Gegenstandsvarianteneinstellungen.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Asset übertragen
+DocType: Item,Has Expiry Date,Hat Ablaufdatum
+apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Einstellungen zur Artikelvariante.
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,Asset übertragen
 DocType: POS Profile,POS Profile,Verkaufsstellen-Profil
 DocType: Training Event,Event Name,Veranstaltungsname
 DocType: Physician,Phone (Office),Telefon (Büro)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,Eintritt
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Admissions für {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,Eintritt
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Zulassung für {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Saisonbedingte Besonderheiten zu Budgets, Zielen usw."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Variablennamen
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Artikel {0} ist eine Vorlage, bitte eine seiner Varianten wählen"
@@ -5039,43 +5135,41 @@
 DocType: Assessment Plan,Room,Zimmer
 DocType: Purchase Order,Advance Paid,Angezahlt
 DocType: Item,Item Tax,Artikelsteuer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Material an den Lieferanten
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Material an den Lieferanten
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Verbrauch Rechnung
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0} erscheint% mehr als einmal
 DocType: Expense Claim,Employees Email Id,E-Mail-ID des Mitarbeiters
 DocType: Employee Attendance Tool,Marked Attendance,Marked Teilnahme
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Laufende Verbindlichkeiten
 apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Massen-SMS an Kontakte versenden
-DocType: Patient,A Positive,Positiv
+DocType: Patient,A Positive,A +
 DocType: Program,Program Name,Programmname
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Steuern oder Gebühren berücksichtigen für
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Die tatsächliche Menge ist zwingend erforderlich
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} hat derzeit eine {1} Supplier Scorecard stehen, und Bestellungen an diesen Lieferanten sollten mit Vorsicht erteilt werden."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} hat derzeit eine {1} Supplier Scorecard stehen, und Bestellungen an diesen Lieferanten sollten mit Vorsicht erteilt werden."
 DocType: Employee Loan,Loan Type,Art des Darlehens
 DocType: Scheduling Tool,Scheduling Tool,Scheduling-Werkzeug
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Kreditkarte
 DocType: BOM,Item to be manufactured or repacked,Zu fertigender oder umzupackender Artikel
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Standardeinstellungen für Lagertransaktionen
-DocType: Purchase Invoice,Next Date,Nächster Termin
 DocType: Employee Education,Major/Optional Subjects,Wichtiger/wahlweiser Betreff
 DocType: Sales Invoice Item,Drop Ship,Streckengeschäft
+DocType: Hub Settings,Suspended,Suspendiert
 DocType: Training Event,Attendees,Teilnehmer
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Hier können Sie Familiendetails wie Namen und Beruf der Eltern, Ehepartner und Kinder pflegen"
 DocType: Academic Term,Term End Date,Zeit Enddatum
-DocType: Hub Settings,Seller Name,Name des Verkäufers
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Steuern und Gebühren abgezogen (Firmenwährung)
 DocType: Item Group,General Settings,Grundeinstellungen
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Von-Währung und Bis-Währung können nicht gleich sein
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Instruktoren hinzufügen
 DocType: Stock Entry,Repack,Umpacken
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Sie müssen das Formular speichern um fortzufahren
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Bitte wählen Sie zuerst die Firma aus
 DocType: Item Attribute,Numeric Values,Numerische Werte
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Logo anhängen
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Lagerbestände
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Lagerbestände
 DocType: Customer,Commission Rate,Provisionssatz
-apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Erstellt {0} Scorecards für {1} zwischen:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Variante anlegen
+apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Erstellte {0} Scorecards für {1} zwischen:
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Variante anlegen
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Urlaubsanträge pro Abteilung sperren
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Zahlungsart muss eine der Receive sein, Pay und interne Übertragung"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analysetools
@@ -5090,11 +5184,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Grundkapital
 DocType: Shopping Cart Settings,Show Public Attachments,Öffentliche Anhänge anzeigen
 DocType: Packing Slip,Package Weight Details,Details zum Verpackungsgewicht
+DocType: Restaurant Reservation,Reservation Time,Reservierungszeit
 DocType: Payment Gateway Account,Payment Gateway Account,Payment Gateway Konto
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,"Nach Abschluss der Zahlung, Benutzer auf ausgewählte Seite weiterleiten."
 DocType: Company,Existing Company,Bestehende Firma
 DocType: Healthcare Settings,Result Emailed,Ergebnis Emailed
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","Steuer-Kategorie wurde in &quot;Total&quot; geändert, da alle Artikel nicht auf Lager sind"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Artikelgruppe&gt; Marke
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Bitte eine CSV-Datei auswählen.
 DocType: Student Leave Application,Mark as Present,Als anwesend markieren
 DocType: Supplier Scorecard,Indicator Color,Indikatorfarbe
@@ -5119,11 +5215,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Machen Schüler Batch
 DocType: Fee Schedule,FRQ.,FRQ
 DocType: Leave Type,Is Carry Forward,Ist Übertrag
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Artikel aus der Stückliste holen
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Artikel aus der Stückliste holen
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lieferzeittage
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Datum der Veröffentlichung muss als Kaufdatum gleich sein {1} des Asset {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Überprüfen Sie dies, wenn der Student im Gasthaus des Instituts wohnt."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Bitte geben Sie Kundenaufträge in der obigen Tabelle
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Bitte geben Sie Kundenaufträge in der obigen Tabelle
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Nicht der gesuchte Gehaltsabrechnungen
 ,Stock Summary,Auf Zusammenfassung
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Übertragen Sie einen Vermögenswert von einem Lager zum anderen
@@ -5139,5 +5235,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Zeile {0}: Sollbuchung kann nicht mit ein(em) {1} verknüpft werden
 DocType: Journal Entry,Subscription Section,Abonnementbereich
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Konto {0} existiert nicht
+DocType: Training Event,Training Program,Trainingsprogramm
 DocType: Account,Cash,Bargeld
 DocType: Employee,Short biography for website and other publications.,Kurzbiographie für die Webseite und andere Publikationen.
diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv
index bc1f580..f8b59cc 100644
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Λειτουργία Μισθός
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Κανω ΕΓΓΡΑΦΗ
 DocType: Patient,Divorced,Διαζευγμένος
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,είδη που έχουν ήδη συγχρονιστεί
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Επιτρέψτε στοιχείου να προστεθούν πολλές φορές σε μια συναλλαγή
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Ακύρωση επίσκεψης {0} πριν από την ακύρωση αυτής της αίτησης εγγύησης
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Καταναλωτικά προϊόντα
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Υπεύθυνοι έγκρισης άδειας
 DocType: Sales Partner,Dealer,Έμπορος
 DocType: Consultation,Investigations,Διερευνήσεις
+DocType: Restaurant Order Entry,Click Enter To Add,Κάντε κλικ στο Enter to Add
 DocType: Employee,Rented,Νοικιασμένο
 DocType: Purchase Order,PO-,ΤΑΧΥΔΡΟΜΕΊΟ-
 DocType: POS Profile,Applicable for User,Ισχύει για χρήστη
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Σταμάτησε Παραγγελία παραγωγή δεν μπορεί να ακυρωθεί, θα ξεβουλώνω πρώτα να ακυρώσετε"
 DocType: Vehicle Service,Mileage,Απόσταση σε μίλια
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Θέλετε πραγματικά να καταργήσει αυτό το περιουσιακό στοιχείο;
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Θέλετε πραγματικά να καταργήσει αυτό το περιουσιακό στοιχείο;
 DocType: Drug Prescription,Update Schedule,Ενημέρωση Προγραμματισμού
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Επιλέξτε Προεπιλογή Προμηθευτής
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Το νόμισμα είναι απαραίτητο για τον τιμοκατάλογο {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Ελέγξτε διαθεσιμότητα
 DocType: Job Applicant,Job Applicant,Αιτών εργασία
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Αυτό βασίζεται σε πράξεις εναντίον αυτής της επιχείρησης. Δείτε χρονοδιάγραμμα παρακάτω για λεπτομέρειες
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Δεν υπάρχουν άλλα αποτελέσματα.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Νομικός
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Πραγματική φορολογική του τύπου δεν μπορεί να περιλαμβάνεται στην τιμή Θέση στη γραμμή {0}
 DocType: Bank Guarantee,Customer,Πελάτης
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Ισοτιμία πρέπει να είναι ίδιο με το {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Όνομα πελάτη
 DocType: Vehicle,Natural Gas,Φυσικό αέριο
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Ο τραπεζικός λογαριασμός δεν μπορεί να ονομαστεί ως {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Ο τραπεζικός λογαριασμός δεν μπορεί να ονομαστεί ως {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Κύριες εγγραφές (ή ομάδες) κατά τις οποίες δημιουργούνται λογιστικές εγγραφές διατηρούνται υπόλοιπα.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Η εκκρεμότητα για {0} δεν μπορεί να είναι μικρότερη από το μηδέν ( {1} )
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Δεν υπάρχουν υποβληθέντα δελτία μισθοδοσίας για επεξεργασία.
 DocType: Manufacturing Settings,Default 10 mins,Προεπιλογή 10 λεπτά
 DocType: Leave Type,Leave Type Name,Όνομα τύπου άδειας
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Εμφάνιση ανοιχτή
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Είναι απαραίτητο να αναλάβουμε αυτήν την ενέργεια σήμερα για την προαναφερθείσα επανάληψη
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Η σειρά ενημερώθηκε με επιτυχία
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Αποχώρηση
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural Εφημερίδα Έναρξη Υποβλήθηκε
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Είδη παραγγελίας αγοράς για παραλαβή
 DocType: SMS Center,All Supplier Contact,Όλες οι επαφές προμηθευτή
 DocType: Support Settings,Support Settings,Ρυθμίσεις υποστήριξη
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Αναμενόμενη ημερομηνία λήξης δεν μπορεί να είναι μικρότερη από την αναμενόμενη ημερομηνία έναρξης
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Αναμενόμενη ημερομηνία λήξης δεν μπορεί να είναι μικρότερη από την αναμενόμενη ημερομηνία έναρξης
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Σειρά # {0}: Βαθμολογία πρέπει να είναι ίδιο με το {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Νέα αίτηση άδειας
 ,Batch Item Expiry Status,Παρτίδα Θέση λήξης Κατάσταση
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Τραπεζική επιταγή
 DocType: Mode of Payment Account,Mode of Payment Account,Λογαριασμός τρόπου πληρωμής
 DocType: Consultation,Consultation,Διαβούλευση
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Πωλήσεις και επιστροφές
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Προβολή παραλλαγών
 DocType: Academic Term,Academic Term,Ακαδημαϊκός Όρος
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Υλικό
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Υγειονομική περίθαλψη
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Καθυστέρηση στην πληρωμή (Ημέρες)
 DocType: Lab Prescription,Lab Prescription,Lab Συνταγή
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Ταξινόμηση κατά Τιμή
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Δαπάνη παροχής υπηρεσιών
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Σειριακός αριθμός: {0} αναφέρεται ήδη στο Τιμολόγιο Πωλήσεων: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Τιμολόγιο
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Σειριακός αριθμός: {0} αναφέρεται ήδη στο Τιμολόγιο Πωλήσεων: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Τιμολόγιο
 DocType: Maintenance Schedule Item,Periodicity,Περιοδικότητα
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Χρήσεως {0} απαιτείται
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Άμυνα
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Γραμμή # {0}:
 DocType: Timesheet,Total Costing Amount,Σύνολο Κοστολόγηση Ποσό
 DocType: Delivery Note,Vehicle No,Αρ. οχήματος
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Παρακαλώ επιλέξτε τιμοκατάλογο
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Παρακαλώ επιλέξτε τιμοκατάλογο
 DocType: Accounts Settings,Currency Exchange Settings,Ρυθμίσεις ανταλλαγής νομισμάτων
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Σειρά # {0}: έγγραφο πληρωμή απαιτείται για την ολοκλήρωση της trasaction
 DocType: Production Order Operation,Work In Progress,Εργασία σε εξέλιξη
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Παρακαλώ επιλέξτε ημερομηνία
 DocType: Employee,Holiday List,Λίστα αργιών
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εκπαιδευτών στο σχολείο&gt; Ρυθμίσεις σχολείου
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Λογιστής
+DocType: Hub Settings,Selling Price List,Τιμοκατάλογος πώλησης
 DocType: Patient,Tobacco Current Use,Καπνός τρέχουσα χρήση
 DocType: Cost Center,Stock User,Χρηματιστήριο χρήστη
 DocType: Company,Phone No,Αρ. Τηλεφώνου
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Δρομολόγια φυσικά δημιουργήθηκε:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Νέο {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Νέο {0}: # {1}
 ,Sales Partners Commission,Προμήθεια συνεργάτη πωλήσεων
 DocType: Purchase Invoice,Rounding Adjustment,Προσαρμογή στρογγυλοποίησης
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Μια συντομογραφία δεν μπορεί να έχει περισσότερους από 5 χαρακτήρες
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Όνομα αρχείου γονικής λεπτομέρεια
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Αναφορά: {0}, Κωδικός είδους: {1} και Πελάτης: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kg
-DocType: Student Log,Log,Κούτσουρο
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Άνοιγμα θέσης εργασίας.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Αποτέλεσμα υποβολής
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Αποτέλεσμα υποβολής
 DocType: Item Attribute,Increment,Προσαύξηση
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Χρονικό διάστημα
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Επιλέξτε Αποθήκη ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Παντρεμένος
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Δεν επιτρέπεται η {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Πάρτε τα στοιχεία από
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Το απόθεμα δεν μπορεί να ανανεωθεί σύμφωνα με το δελτίο αποστολής {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Το απόθεμα δεν μπορεί να ανανεωθεί σύμφωνα με το δελτίο αποστολής {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Προϊόν {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Δεν αναγράφονται στοιχεία
 DocType: Payment Reconciliation,Reconcile,Συμφωνήστε
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Ιδιωτικά ταμεία συντάξεων
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Επόμενο Αποσβέσεις ημερομηνία αυτή δεν μπορεί να είναι πριν από την Ημερομηνία Αγοράς
 DocType: Consultation,Consultation Date,Ημερομηνία διαβούλευσης
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Κατάλογος προϊόντων και ανακάλυψη για χρήστες ERPNext
 DocType: SMS Center,All Sales Person,Όλοι οι πωλητές
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Μηνιαία Κατανομή ** σας βοηθά να διανείμετε το Οικονομικό / Target σε όλη μήνες, αν έχετε την εποχικότητα στην επιχείρησή σας."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Δεν βρέθηκαν στοιχεία
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Δομή του μισθού που λείπουν
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Δεν βρέθηκαν στοιχεία
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Δομή του μισθού που λείπουν
 DocType: Lead,Person Name,Όνομα Πρόσωπο
 DocType: Sales Invoice Item,Sales Invoice Item,Είδος τιμολογίου πώλησης
 DocType: Account,Credit,Πίστωση
 DocType: POS Profile,Write Off Cost Center,Κέντρου κόστους διαγραφής
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",π.χ. «Δημοτικό Σχολείο» ή «Πανεπιστήμιο»
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",π.χ. «Δημοτικό Σχολείο» ή «Πανεπιστήμιο»
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Αναφορές απόθεμα
 DocType: Warehouse,Warehouse Detail,Λεπτομέρειες αποθήκης
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Το πιστωτικό όριο έχει ξεπεραστεί για τον πελάτη {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Το τέλος Όρος ημερομηνία δεν μπορεί να είναι μεταγενέστερη της χρονιάς Ημερομηνία Λήξης του Ακαδημαϊκού Έτους στην οποία ο όρος συνδέεται (Ακαδημαϊκό Έτος {}). Διορθώστε τις ημερομηνίες και προσπαθήστε ξανά.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Είναι Παγίων&quot; δεν μπορεί να είναι ανεξέλεγκτη, καθώς υπάρχει Asset ρεκόρ έναντι του στοιχείου"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Είναι Παγίων&quot; δεν μπορεί να είναι ανεξέλεγκτη, καθώς υπάρχει Asset ρεκόρ έναντι του στοιχείου"
 DocType: Vehicle Service,Brake Oil,Brake Oil
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα πελατών&gt; Επικράτεια
 DocType: Tax Rule,Tax Type,Φορολογική Τύπος
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Υποχρεωτικό ποσό
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Δεν επιτρέπεται να προσθέσετε ή να ενημερώσετε τις καταχωρήσεις πριν από {0}
 DocType: BOM,Item Image (if not slideshow),Φωτογραφία είδους (αν όχι slideshow)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Υπάρχει πελάτης με το ίδιο όνομα
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Ώρα Βαθμολογήστε / 60) * Πραγματικός χρόνος λειτουργίας
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Γραμμή # {0}: Ο τύπος εγγράφου αναφοράς πρέπει να είναι ένας από τους λογαριασμούς διεκδίκησης εξόδων ή καταχώρησης ημερολογίου
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Επιλέξτε BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Γραμμή # {0}: Ο τύπος εγγράφου αναφοράς πρέπει να είναι ένας από τους λογαριασμούς διεκδίκησης εξόδων ή καταχώρησης ημερολογίου
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Επιλέξτε BOM
 DocType: SMS Log,SMS Log,Αρχείο καταγραφής SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Κόστος των προϊόντων που έχουν παραδοθεί
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Οι διακοπές σε {0} δεν είναι μεταξύ Από Ημερομηνία και μέχρι σήμερα
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,Υπάλληλος Δανείου
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Αρχείο καταγραφής δραστηριότητας:
 DocType: Fee Schedule,Send Payment Request Email,Αποστολή ηλεκτρονικού ταχυδρομείου αίτησης πληρωμής
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Το είδος {0} δεν υπάρχει στο σύστημα ή έχει λήξει
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Το είδος {0} δεν υπάρχει στο σύστημα ή έχει λήξει
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Ακίνητα
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Κατάσταση λογαριασμού
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Φαρμακευτική
@@ -210,17 +213,22 @@
 DocType: Employee,B-,ΣΙ-
 DocType: Upload Attendance,Import Log,Αρχείο καταγραφής εισαγωγής
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Τραβήξτε Υλικό Αίτηση του τύπου Κατασκευή με βάση τα παραπάνω κριτήρια
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Ανέβηκε με επιτυχία.
 DocType: Training Result Employee,Grade,Βαθμός
+DocType: Restaurant Table,No of Seats,Αριθμός καθισμάτων
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Για να προσθέσετε δυναμικό θέμα, χρησιμοποιήστε τις ετικέτες jinja όπως <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Παραδίδονται από τον προμηθευτή
 DocType: SMS Center,All Contact,Όλες οι επαφές
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Παραγγελία Παραγωγή ήδη δημιουργήσει για όλα τα στοιχεία με BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Παραγγελία Παραγωγή ήδη δημιουργήσει για όλα τα στοιχεία με BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Ετήσιος Μισθός
 DocType: Daily Work Summary,Daily Work Summary,Καθημερινή Σύνοψη εργασίας
 DocType: Period Closing Voucher,Closing Fiscal Year,Κλείσιμο χρήσης
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,"{0} {1} είναι ""Παγωμένο"""
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Επιλέξτε υφιστάμενης εταιρείας για τη δημιουργία Λογιστικού
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,"{0} {1} είναι ""Παγωμένο"""
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Επιλέξτε υφιστάμενης εταιρείας για τη δημιουργία Λογιστικού
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Έξοδα αποθέματος
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Επιλέξτε Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Επιλέξτε Target Warehouse
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Παρακαλούμε, εισάγετε Ώρες Επικοινωνίας Email"
 DocType: Program Enrollment,School Bus,Σχολικό λεωφορείο
 DocType: Journal Entry,Contra Entry,Λογιστική εγγραφή ακύρωσης
@@ -237,9 +245,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Κατεβάστε το πρότυπο, συμπληρώστε τα κατάλληλα δεδομένα και επισυνάψτε το τροποποιημένο αρχείο. Όλες οι ημερομηνίες και ο συνδυασμός των υπαλλήλων στην επιλεγμένη περίοδο θα εμφανιστεί στο πρότυπο, με τους υπάρχοντες καταλόγους παρουσίας"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Το είδος {0} δεν είναι ενεργό ή το τέλος της ζωής έχει περάσει
+DocType: Student Admission Program,Minimum Age,Ελάχιστη ηλικία
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Παράδειγμα: Βασικά Μαθηματικά
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Για να περιληφθούν οι φόροι στη γραμμή {0} της τιμής είδους, οι φόροι στις γραμμές {1} πρέπει επίσης να συμπεριληφθούν"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Ρυθμίσεις για τη λειτουργική μονάδα HR
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Ρυθμίσεις για τη λειτουργική μονάδα HR
 DocType: SMS Center,SMS Center,Κέντρο SMS
 DocType: Sales Invoice,Change Amount,αλλαγή Ποσό
 DocType: BOM Update Tool,New BOM,Νέα Λ.Υ.
@@ -249,7 +258,7 @@
 DocType: Lead,Request Type,Τύπος αίτησης
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Κάντε Υπάλληλος
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Εκπομπή
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Προσθήκη δωματίων
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Λειτουργία ρύθμισης POS (Online / Offline)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Εκτέλεση
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Λεπτομέρειες σχετικά με τις λειτουργίες που πραγματοποιούνται.
 DocType: Serial No,Maintenance Status,Κατάσταση συντήρησης
@@ -272,6 +281,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Ο τιμοκατάλογος πρέπει να ισχύει για την αγορά ή πώληση
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Η ημερομηνία εγκατάστασης δεν μπορεί να είναι προγενέστερη της ημερομηνίας παράδοσης για το είδος {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Έκπτωση στις Τιμοκατάλογος Ποσοστό (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Βιοχημεία
 DocType: Offer Letter,Select Terms and Conditions,Επιλέξτε Όροι και Προϋποθέσεις
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,από Αξία
 DocType: Production Planning Tool,Sales Orders,Παραγγελίες πωλήσεων
@@ -306,15 +316,15 @@
 DocType: Sales Partner,Reseller,Μεταπωλητής
 DocType: Codification Table,Medical Code,Ιατρικό κώδικα
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Αν επιλεγεί, θα περιλαμβάνουν μη-απόθεμα τεμάχια στο υλικό αιτήματα."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Παρακαλώ εισάγετε εταιρεία
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Παρακαλώ εισάγετε εταιρεία
 DocType: Delivery Note Item,Against Sales Invoice Item,Κατά το είδος στο τιμολόγιο πώλησης
 ,Production Orders in Progress,Εντολές παραγωγής σε εξέλιξη
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Καθαρές ροές από επενδυτικές
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage είναι πλήρης, δεν έσωσε"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage είναι πλήρης, δεν έσωσε"
 DocType: Lead,Address & Contact,Διεύθυνση & Επαφή
 DocType: Leave Allocation,Add unused leaves from previous allocations,Προσθήκη αχρησιμοποίητα φύλλα από προηγούμενες κατανομές
 DocType: Sales Partner,Partner website,Συνεργαζόμενη διαδικτυακή
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Πρόσθεσε είδος
+DocType: Restaurant Order Entry,Add Item,Πρόσθεσε είδος
 DocType: Lab Test,Custom Result,Προσαρμοσμένο αποτέλεσμα
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Όνομα επαφής
 DocType: Course Assessment Criteria,Course Assessment Criteria,Κριτήρια Αξιολόγησης Μαθήματος
@@ -327,7 +337,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Αίτηση αγοράς.
 DocType: Lab Test,Submitted Date,Ημερομηνία υποβολής
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Αυτό βασίζεται στα δελτία χρόνου εργασίας που δημιουργήθηκαν κατά του σχεδίου αυτού
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Καθαρές αποδοχές δεν μπορεί να είναι μικρότερη από 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Καθαρές αποδοχές δεν μπορεί να είναι μικρότερη από 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Για να σταματήσετε να στέλνετε ειδοποιήσεις επαναλαμβανόμενων σφαλμάτων από το σύστημα, έχουμε επιλέξει το πεδίο Απενεργοποιημένο στη συνδρομή"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Μόνο ο επιλεγμένος υπεύθυνος έγκρισης άδειας μπορεί να υποβάλλει αυτήν την αίτηση άδειας
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Η ημερομηνία απαλλαγής πρέπει να είναι μεταγενέστερη από την ημερομηνία ένταξης
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Αφήνει ανά έτος
@@ -336,9 +347,10 @@
 DocType: Email Digest,Profit & Loss,Απώλειες κερδών
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Λίτρο
 DocType: Task,Total Costing Amount (via Time Sheet),Σύνολο Κοστολόγηση Ποσό (μέσω Ώρα Φύλλο)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Ρυθμίστε τους φοιτητές κάτω από ομάδες φοιτητών
 DocType: Item Website Specification,Item Website Specification,Προδιαγραφή ιστότοπου για το είδος
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Η άδεια εμποδίστηκε
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Το είδος {0} έχει φτάσει στο τέλος της διάρκειας ζωής του στο {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Το είδος {0} έχει φτάσει στο τέλος της διάρκειας ζωής του στο {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Τράπεζα Καταχωρήσεις
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Ετήσιος
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Είδος συμφωνίας αποθέματος
@@ -347,7 +359,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Μάθημα Ομάδα μαθητή Εργαλείο Δημιουργίας
 DocType: Lead,Do Not Contact,Μην επικοινωνείτε
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,Οι άνθρωποι που διδάσκουν σε οργανισμό σας
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Το μοναδικό αναγνωριστικό για την παρακολούθηση όλων των επαναλαμβανόμενων τιμολογίων. Παράγεται με την υποβολή.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Προγραμματιστής
 DocType: Item,Minimum Order Qty,Ελάχιστη ποσότητα παραγγελίας
 DocType: Pricing Rule,Supplier Type,Τύπος προμηθευτή
@@ -357,17 +368,19 @@
 DocType: Item,Publish in Hub,Δημοσίευση στο hub
 DocType: Student Admission,Student Admission,Η είσοδος φοιτητής
 ,Terretory,Περιοχή
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Αίτηση υλικού
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Αίτηση υλικού
 DocType: Bank Reconciliation,Update Clearance Date,Ενημέρωση ημερομηνίας εκκαθάρισης
 DocType: Item,Purchase Details,Λεπτομέρειες αγοράς
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Θέση {0} δεν βρέθηκε στο «πρώτες ύλες που προμηθεύεται« πίνακα Εντολή Αγοράς {1}
 DocType: Patient Relation,Relation,Σχέση
 DocType: Shipping Rule,Worldwide Shipping,Παγκόσμια ναυτιλία
 DocType: Patient Relation,Mother,Μητέρα
+DocType: Restaurant Reservation,Reservation End Time,Ώρα λήξης κράτησης
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Επιβεβαιωμένες παραγγελίες από πελάτες.
 DocType: Purchase Receipt Item,Rejected Quantity,Ποσότητα που απορρίφθηκε
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Αίτημα πληρωμής {0} δημιουργήθηκε
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Αίτημα πληρωμής {0} δημιουργήθηκε
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Χαμηλή ευαισθησία
 DocType: Notification Control,Notification Control,Έλεγχος ενημερώσεων
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Παρακαλώ επιβεβαιώστε αφού ολοκληρώσετε την εκπαίδευσή σας
 DocType: Lead,Suggestions,Προτάσεις
@@ -387,7 +400,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Emails εκκαθαριστικό σημείωμα αποδοχών σε εργαζόμενο με βάση την προτιμώμενη email επιλέγονται Εργαζομένων
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Ο πρώτος υπεύθυνος αδειών στον κατάλογο θα οριστεί ως ο προεπιλεγμένος υπεύθυνος αδειών
 DocType: Tax Rule,Shipping County,County ναυτιλία
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Μαθαίνω
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Μαθαίνω
 DocType: Asset,Next Depreciation Date,Επόμενο Ημερομηνία Αποσβέσεις
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Δραστηριότητα κόστος ανά εργαζόμενο
 DocType: Accounts Settings,Settings for Accounts,Ρυθμίσεις για τους λογαριασμούς
@@ -398,13 +411,13 @@
 DocType: Item,Synced With Hub,Συγχρονίστηκαν με το Hub
 DocType: Vehicle,Fleet Manager,στόλου Διευθυντής
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} δεν μπορεί να είναι αρνητικό για το στοιχείο {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Λάθος Κωδικός
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Λάθος Κωδικός
 DocType: Item,Variant Of,Παραλλαγή του
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Η ολοκληρωμένη ποσότητα δεν μπορεί να είναι μεγαλύτερη από την «ποσότητα για κατασκευή»
 DocType: Period Closing Voucher,Closing Account Head,Κλείσιμο κύριας εγγραφής λογαριασμού
 DocType: Employee,External Work History,Ιστορικό εξωτερικής εργασίας
 DocType: Physician,Time per Appointment,Ώρα ανά ραντεβού
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Κυκλικού λάθους Αναφορά
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Κυκλικού λάθους Αναφορά
 DocType: Appointment Type,Is Inpatient,Είναι νοσηλευόμενος
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Όνομα Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Με λόγια (εξαγωγή) θα είναι ορατά αφού αποθηκεύσετε το δελτίο αποστολής.
@@ -413,19 +426,18 @@
 DocType: Lead,Industry,Βιομηχανία
 DocType: Employee,Job Profile,Προφίλ εργασίας
 DocType: BOM Item,Rate & Amount,Τιμή &amp; Ποσό
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Παρακαλούμε ρυθμίστε τη σειρά αρίθμησης για τη συμμετοχή μέσω του Setup&gt; Series Numbering
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,"Αυτό βασίζεται σε συναλλαγές έναντι αυτής της Εταιρείας. Για λεπτομέρειες, δείτε την παρακάτω χρονολογική σειρά"
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Ειδοποίηση μέσω email σχετικά με την αυτόματη δημιουργία αιτήσης υλικού
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Ανθεκτικός
 DocType: Journal Entry,Multi Currency,Πολλαπλό Νόμισμα
 DocType: Payment Reconciliation Invoice,Invoice Type,Τύπος τιμολογίου
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα πελατών&gt; Επικράτεια
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Δελτίο αποστολής
 DocType: Consultation,Encounter Impression,Αντιμετώπιση εντυπώσεων
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Ρύθμιση Φόροι
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Κόστος πωληθέντων περιουσιακών στοιχείων
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,Η καταχώηρση πληρωμής έχει τροποποιηθεί μετά την λήψη της. Παρακαλώ επαναλάβετε τη λήψη.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,Το {0} εισήχθηκε δύο φορές στο φόρο είδους
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Περίληψη για αυτή την εβδομάδα και εν αναμονή δραστηριότητες
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,Το {0} εισήχθηκε δύο φορές στο φόρο είδους
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Περίληψη για αυτή την εβδομάδα και εν αναμονή δραστηριότητες
 DocType: Student Applicant,Admitted,Παράδεκτος
 DocType: Workstation,Rent Cost,Κόστος ενοικίασης
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Ποσό μετά την απόσβεση
@@ -439,36 +451,35 @@
 DocType: Shipping Rule,Valid for Countries,Ισχύει για χώρες
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Αυτό το στοιχείο είναι ένα πρότυπο και δεν μπορεί να χρησιμοποιηθεί στις συναλλαγές. Τα χαρακτηριστικά του θα αντιγραφούν πάνω σε αυτά των παραλλαγών εκτός αν έχει οριστεί το «όχι αντιγραφή '
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Σύνολο παραγγελιών που μελετήθηκε
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Τίτλος υπαλλήλου ( π.Χ. Διευθύνων σύμβουλος, διευθυντής κ.λ.π. )."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Τίτλος υπαλλήλου ( π.Χ. Διευθύνων σύμβουλος, διευθυντής κ.λ.π. )."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Ισοτιμία με την οποία το νόμισμα του πελάτη μετατρέπεται στο βασικό νόμισμα του πελάτη
 DocType: Course Scheduling Tool,Course Scheduling Tool,Φυσικά εργαλείο προγραμματισμού
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Σειρά # {0}: Αγορά Τιμολόγιο δεν μπορεί να γίνει κατά ένα υπάρχον στοιχείο {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Urgent] Σφάλμα κατά τη δημιουργία επαναλαμβανόμενων% s για% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Urgent] Σφάλμα κατά τη δημιουργία επαναλαμβανόμενων% s για% s
 DocType: Item Tax,Tax Rate,Φορολογικός συντελεστής
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} έχει ήδη διατεθεί υπάλληλου {1} για χρονικό διάστημα {2} σε {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Επιλέξτε Προϊόν
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Επιλέξτε Προϊόν
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Το τιμολογίου αγοράς {0} έχει ήδη υποβληθεί
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Σειρά # {0}: Παρτίδα Δεν πρέπει να είναι ίδιο με το {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Μετατροπή σε μη-Group
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Παρτίδας (lot) ενός είδους.
 DocType: C-Form Invoice Detail,Invoice Date,Ημερομηνία τιμολογίου
 DocType: GL Entry,Debit Amount,Χρεωστικό ποσό
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Μπορεί να υπάρχει μόνο 1 λογαριασμός ανά εταιρεία σε {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Παρακαλώ δείτε συνημμένο
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Μπορεί να υπάρχει μόνο 1 λογαριασμός ανά εταιρεία σε {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Παρακαλώ δείτε συνημμένο
 DocType: Purchase Order,% Received,% Παραλήφθηκε
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Δημιουργία Ομάδων Φοιτητών
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Η εγκατάσταση έχει ήδη ολοκληρωθεί!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Η εγκατάσταση έχει ήδη ολοκληρωθεί!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Ποσό πιστωτικής σημείωσης
 DocType: Setup Progress Action,Action Document,Έγγραφο δράσης
 ,Finished Goods,Έτοιμα προϊόντα
 DocType: Delivery Note,Instructions,Οδηγίες
 DocType: Quality Inspection,Inspected By,Επιθεωρήθηκε από
 DocType: Maintenance Visit,Maintenance Type,Τύπος συντήρησης
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} δεν είναι εγγεγραμμένος στο μάθημα {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Κωδικός στοιχείου&gt; Ομάδα στοιχείων&gt; Μάρκα
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} δεν είναι εγγεγραμμένος στο μάθημα {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Ο σειριακός αριθμός {0} δεν ανήκει στο δελτίο αποστολής {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Προσθήκη Ειδών
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Προσθήκη Ειδών
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Παράμετρος ελέγχου ποιότητας είδους
 DocType: Leave Application,Leave Approver Name,Όνομα υπευθύνου έγκρισης άδειας
 DocType: Depreciation Schedule,Schedule Date,Ημερομηνία χρονοδιαγράμματος
@@ -488,7 +499,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Ώρες εργασίας
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Αλλάξτε τον αρχικό/τρέχων αύξοντα αριθμός μιας υπάρχουσας σειράς.
 DocType: Dosage Strength,Strength,Δύναμη
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Δημιουργήστε ένα νέο πελάτη
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Δημιουργήστε ένα νέο πελάτη
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Αν υπάρχουν πολλοί κανόνες τιμολόγησης που συνεχίζουν να επικρατούν, οι χρήστες καλούνται να ορίσουν προτεραιότητα χειρονακτικά για την επίλυση των διενέξεων."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Δημιουργία Εντολών Αγοράς
 ,Purchase Register,Ταμείο αγορών
@@ -507,7 +518,7 @@
 DocType: Lab Test Template,Single,Μονό
 DocType: Salary Slip,Total Loan Repayment,Σύνολο Αποπληρωμή δανείων
 DocType: Account,Cost of Goods Sold,Κόστος πωληθέντων
-DocType: Purchase Invoice,Yearly,Ετήσια
+DocType: Subscription,Yearly,Ετήσια
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Παρακαλώ εισάγετε κέντρο κόστους
 DocType: Drug Prescription,Dosage,Δοσολογία
 DocType: Journal Entry Account,Sales Order,Παραγγελία πώλησης
@@ -537,7 +548,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Παγκόσμια ρυθμίσεις για όλες τις διαδικασίες κατασκευής.
 DocType: Accounts Settings,Accounts Frozen Upto,Παγωμένοι λογαριασμοί μέχρι
 DocType: SMS Log,Sent On,Εστάλη στις
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Χαρακτηριστικό {0} πολλές φορές σε πίνακα Χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Χαρακτηριστικό {0} πολλές φορές σε πίνακα Χαρακτηριστικά
 DocType: HR Settings,Employee record is created using selected field. ,Η Εγγραφή υπαλλήλου δημιουργείται χρησιμοποιώντας το επιλεγμένο πεδίο.
 DocType: Sales Order,Not Applicable,Μη εφαρμόσιμο
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Κύρια εγγραφή αργιών.
@@ -562,13 +573,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Σύνολο φύλλα που διατίθενται είναι υποχρεωτική
 DocType: Patient,AB Positive,AB θετικό
 DocType: Job Opening,Description of a Job Opening,Περιγραφή μιας ανοιχτής θέσης εργασίας
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Εν αναμονή δραστηριότητες για σήμερα
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Εν αναμονή δραστηριότητες για σήμερα
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Καταχωρήσεις προσέλευσης.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Συστατικό μισθός για το φύλλο κατανομής χρόνου με βάση μισθοδοσίας.
 DocType: Sales Order Item,Used for Production Plan,Χρησιμοποιείται για το σχέδιο παραγωγής
 DocType: Employee Loan,Total Payment,Σύνολο πληρωμών
 DocType: Manufacturing Settings,Time Between Operations (in mins),Χρόνου μεταξύ των λειτουργιών (σε λεπτά)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,"Η {0} {1} ακυρώνεται, επομένως η ενέργεια δεν μπορεί να ολοκληρωθεί"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,"Η {0} {1} ακυρώνεται, επομένως η ενέργεια δεν μπορεί να ολοκληρωθεί"
 DocType: Customer,Buyer of Goods and Services.,Αγοραστής αγαθών και υπηρεσιών.
 DocType: Journal Entry,Accounts Payable,Πληρωτέοι λογαριασμοί
 DocType: Patient,Allergies,Αλλεργίες
@@ -580,22 +591,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Προειδοποίηση παραγγελιών αγοράς
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Απαριθμήστε μερικούς από τους πελάτες σας. Θα μπορούσαν να είναι φορείς ή ιδιώτες.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Αρκετά τμήματα για να χτίσει
+DocType: POS Profile User,POS Profile User,Χρήστης προφίλ POS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Άμεσα έσοδα
 DocType: Patient Appointment,Date TIme,Ημερομηνία ώρα
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Δεν μπορείτε να φιλτράρετε με βάση λογαριασμό, εάν είναι ομαδοποιημένες ανά λογαριασμό"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Διοικητικός λειτουργός
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Επιλέξτε Course
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Επιλέξτε Course
 DocType: Codification Table,Codification Table,Πίνακας κωδικοποίησης
 DocType: Timesheet Detail,Hrs,ώρες
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Επιλέξτε Εταιρεία
 DocType: Stock Entry Detail,Difference Account,Λογαριασμός διαφορών
 DocType: Purchase Invoice,Supplier GSTIN,Προμηθευτής GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Δεν μπορεί να κλείσει το έργο ως εξαρτώμενη εργασία του {0} δεν έχει κλείσει.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,Παρακαλώ εισάγετε αποθήκη για την οποία θα δημιουργηθεί η αίτηση υλικού
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Δεν μπορεί να κλείσει το έργο ως εξαρτώμενη εργασία του {0} δεν έχει κλείσει.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Παρακαλώ εισάγετε αποθήκη για την οποία θα δημιουργηθεί η αίτηση υλικού
 DocType: Production Order,Additional Operating Cost,Πρόσθετο λειτουργικό κόστος
 DocType: Lab Test Template,Lab Routine,Εργαστήριο Ρουτίνας
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Καλλυντικά
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Για τη συγχώνευση, οι ακόλουθες ιδιότητες πρέπει να είναι ίδιες για τα δύο είδη"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Για τη συγχώνευση, οι ακόλουθες ιδιότητες πρέπει να είναι ίδιες για τα δύο είδη"
 DocType: Shipping Rule,Net Weight,Καθαρό βάρος
 DocType: Employee,Emergency Phone,Τηλέφωνο έκτακτης ανάγκης
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Αγορά
@@ -605,7 +617,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Ορίστε βαθμό για το όριο 0%
 DocType: Sales Order,To Deliver,Να Παραδώσει
 DocType: Purchase Invoice Item,Item,Είδος
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Serial κανένα στοιχείο δεν μπορεί να είναι ένα κλάσμα
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Υψηλή ευαισθησία
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Serial κανένα στοιχείο δεν μπορεί να είναι ένα κλάσμα
 DocType: Journal Entry,Difference (Dr - Cr),Διαφορά ( dr - cr )
 DocType: Account,Profit and Loss,Κέρδη και ζημιές
 DocType: Patient,Risk Factors,Παράγοντες κινδύνου
@@ -614,7 +627,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Διαχείριση της υπεργολαβίας
 DocType: Vital Signs,Body Temperature,Θερμοκρασία σώματος
 DocType: Project,Project will be accessible on the website to these users,Του έργου θα είναι προσβάσιμη στην ιστοσελίδα του σε αυτούς τους χρήστες
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Ορίστε τον τύπο έργου.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Ορίστε τον τύπο έργου.
 DocType: Supplier Scorecard,Weighting Function,Λειτουργία ζύγισης
 DocType: Physician,OP Consulting Charge,OP Charge Consulting
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Ρυθμίστε το
@@ -628,7 +641,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Προσαύξηση δεν μπορεί να είναι 0
 DocType: Production Planning Tool,Material Requirement,Απαίτηση υλικού
 DocType: Company,Delete Company Transactions,Διαγραφή Συναλλαγές Εταιρείας
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Αριθμός αναφοράς και ημερομηνία αναφοράς είναι υποχρεωτική για την Τράπεζα συναλλαγών
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Αριθμός αναφοράς και ημερομηνία αναφοράς είναι υποχρεωτική για την Τράπεζα συναλλαγών
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Προσθήκη / επεξεργασία φόρων και επιβαρύνσεων
 DocType: Payment Entry Reference,Supplier Invoice No,Αρ. τιμολογίου του προμηθευτή
 DocType: Territory,For reference,Για αναφορά
@@ -636,12 +649,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Δεν μπορείτε να διαγράψετε Αύξων αριθμός {0}, όπως χρησιμοποιείται στις συναλλαγές μετοχών"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Κλείσιμο (cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Χαίρετε
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Μετακίνηση στοιχείου
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Μετακίνηση στοιχείου
 DocType: Serial No,Warranty Period (Days),Περίοδος εγγύησης (ημέρες)
 DocType: Installation Note Item,Installation Note Item,Είδος σημείωσης εγκατάστασης
 DocType: Production Plan Item,Pending Qty,Εν αναμονή Ποσότητα
 DocType: Budget,Ignore,Αγνοήστε
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} δεν είναι ενεργή
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} δεν είναι ενεργή
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,διαστάσεις Ελέγξτε τις ρυθμίσεις για εκτύπωση
 DocType: Salary Slip,Salary Slip Timesheet,Μισθός Slip Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Η αποθήκη προμηθευτή είναι απαραίτητη για το δελτίο παραλαβής από υπερεργολάβο
@@ -650,7 +663,7 @@
 DocType: Pricing Rule,Sales Partner,Συνεργάτης πωλήσεων
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Όλες οι scorecards του προμηθευτή.
 DocType: Buying Settings,Purchase Receipt Required,Απαιτείται αποδεικτικό παραλαβής αγοράς
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Αποτίμηση Rate είναι υποχρεωτική εάν εισέλθει Άνοιγμα Χρηματιστήριο
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,Αποτίμηση Rate είναι υποχρεωτική εάν εισέλθει Άνοιγμα Χρηματιστήριο
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Δεν βρέθηκαν εγγραφές στον πίνακα τιμολογίων
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Παρακαλώ επιλέξτε πρώτα εταιρεία και τύπο συμβαλλόμενου
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Οικονομικό / λογιστικό έτος.
@@ -687,7 +700,7 @@
 DocType: Quotation,Quotation To,Προσφορά προς
 DocType: Lead,Middle Income,Μέσα έσοδα
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Άνοιγμα ( cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Προεπιλεγμένη μονάδα μέτρησης για τη θέση {0} δεν μπορεί να αλλάξει άμεσα, επειδή έχετε ήδη κάνει κάποια συναλλαγή (ες) με μια άλλη UOM. Θα χρειαστεί να δημιουργήσετε ένα νέο σημείο για να χρησιμοποιήσετε ένα διαφορετικό Προεπιλογή UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Προεπιλεγμένη μονάδα μέτρησης για τη θέση {0} δεν μπορεί να αλλάξει άμεσα, επειδή έχετε ήδη κάνει κάποια συναλλαγή (ες) με μια άλλη UOM. Θα χρειαστεί να δημιουργήσετε ένα νέο σημείο για να χρησιμοποιήσετε ένα διαφορετικό Προεπιλογή UOM."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Το χορηγούμενο ποσό δεν μπορεί να είναι αρνητικό
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Ρυθμίστε την εταιρεία
 DocType: Purchase Order Item,Billed Amt,Χρεωμένο ποσό
@@ -701,6 +714,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Επιλέξτε Λογαριασμός Πληρωμή να κάνουν Τράπεζα Έναρξη
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Δημιουργήστε τα αρχεία των εργαζομένων για τη διαχείριση των φύλλων, οι δηλώσεις εξόδων και μισθοδοσίας"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Περίοδος συνταγογράφησης
+DocType: Restaurant Reservation,Restaurant Reservation,Εστιατόριο Κράτηση
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Συγγραφή πρότασης
 DocType: Payment Entry Deduction,Payment Entry Deduction,Έκπτωση Έναρξη Πληρωμής
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Ένα άλλο πρόσωπο Πωλήσεις {0} υπάρχει με την ίδια ταυτότητα υπαλλήλου
@@ -708,7 +722,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Κύριες εγγραφές
 DocType: Assessment Plan,Maximum Assessment Score,Μέγιστη βαθμολογία αξιολόγησης
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Ημερομηνίες των συναλλαγών Ενημέρωση Τράπεζα
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Παρακολούθηση του χρόνου
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Παρακολούθηση του χρόνου
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,ΑΝΑΛΥΣΗ ΓΙΑ ΜΕΤΑΦΟΡΕΣ
 DocType: Fiscal Year Company,Fiscal Year Company,Εταιρεία χρήσης
 DocType: Packing Slip Item,DN Detail,Λεπτομέρεια dn
@@ -716,8 +730,9 @@
 DocType: Timesheet,Billed,Χρεώνεται
 DocType: Batch,Batch Description,Περιγραφή παρτίδας
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Δημιουργία ομάδων σπουδαστών
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Πληρωμή Gateway Ο λογαριασμός δεν δημιουργήθηκε, παρακαλούμε δημιουργήστε ένα χέρι."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Πληρωμή Gateway Ο λογαριασμός δεν δημιουργήθηκε, παρακαλούμε δημιουργήστε ένα χέρι."
 DocType: Supplier Scorecard,Per Year,Ανά έτος
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Δεν είναι επιλέξιμες για εισαγωγή σε αυτό το πρόγραμμα σύμφωνα με το DOB
 DocType: Sales Invoice,Sales Taxes and Charges,Φόροι και επιβαρύνσεις πωλήσεων
 DocType: Employee,Organization Profile,Προφίλ οργανισμού
 DocType: Vital Signs,Height (In Meter),Ύψος (σε μετρητή)
@@ -753,7 +768,7 @@
 DocType: Student Batch Name,Batch Name,παρτίδα Όνομα
 DocType: Fee Validity,Max number of visit,Μέγιστος αριθμός επισκέψεων
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Φύλλο κατανομής χρόνου δημιουργήθηκε:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Παρακαλώ ορίστε τον προεπιλεγμένο λογιαριασμό μετρητών ή τραπέζης στον τρόπο πληρωμής {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Παρακαλώ ορίστε τον προεπιλεγμένο λογιαριασμό μετρητών ή τραπέζης στον τρόπο πληρωμής {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,Εγγράφω
 DocType: GST Settings,GST Settings,Ρυθμίσεις GST
 DocType: Selling Settings,Customer Naming By,Ονομασία πελάτη από
@@ -785,15 +800,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Φόροι και εβπιβαρύνσεις κόστους αποστολής εμπορευμάτων
 DocType: Production Order Operation,Actual Start Time,Πραγματική ώρα έναρξης
 DocType: BOM Operation,Operation Time,Χρόνος λειτουργίας
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Φινίρισμα
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Φινίρισμα
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Βάση
 DocType: Timesheet,Total Billed Hours,Σύνολο Τιμολογημένος Ώρες
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Διαγραφή ποσού
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Διαγραφή ποσού
 DocType: Leave Block List Allow,Allow User,Επίτρεψε χρήστη
 DocType: Journal Entry,Bill No,Αρ. Χρέωσης
 DocType: Company,Gain/Loss Account on Asset Disposal,Ο λογαριασμός Κέρδος / Ζημιά από διάθεση περιουσιακών στοιχείων
 DocType: Vehicle Log,Service Details,Λεπτομέρειες υπηρεσιών
-DocType: Purchase Invoice,Quarterly,Τριμηνιαίος
+DocType: Subscription,Quarterly,Τριμηνιαίος
 DocType: Lab Test Template,Grouped,Ομαδοποιημένο
 DocType: Selling Settings,Delivery Note Required,Η σημείωση δελτίου αποστολής είναι απαραίτητη
 DocType: Bank Guarantee,Bank Guarantee Number,Αριθμός τραπεζικής εγγύησης
@@ -802,12 +817,12 @@
 DocType: Student Attendance,Student Attendance,Η φοίτηση μαθητή
 DocType: Sales Invoice Timesheet,Time Sheet,Πρόγραμμα
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush πρώτων υλών Βάσει των
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Παρακαλώ εισάγετε τα στοιχεία του είδους
 DocType: Interest,Interest,Ενδιαφέρον
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Προπωλήσεις
 DocType: Purchase Receipt,Other Details,Άλλες λεπτομέρειες
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Lab Test,Test Template,Πρότυπο δοκιμής
+DocType: Restaurant Order Entry Item,Served,Σερβίρεται
 DocType: Account,Accounts,Λογαριασμοί
 DocType: Vehicle,Odometer Value (Last),Οδόμετρο Αξία (Τελευταία)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Πρότυπα κριτηρίων βαθμολογίας προμηθευτή.
@@ -819,25 +834,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Preview Μισθός Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Ο λογαριασμός {0} έχει τεθεί πολλές φορές
 DocType: Account,Expenses Included In Valuation,Δαπάνες που περιλαμβάνονται στην αποτίμηση
-DocType: Hub Settings,Seller City,Πόλη πωλητή
 ,Absent Student Report,Απών Έκθεση Φοιτητών
 DocType: Email Digest,Next email will be sent on:,Το επόμενο μήνυμα email θα αποσταλεί στις:
 DocType: Offer Letter Term,Offer Letter Term,Προσφορά Επιστολή Όρος
 DocType: Supplier Scorecard,Per Week,Ανά εβδομάδα
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Στοιχείο έχει παραλλαγές.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Στοιχείο έχει παραλλαγές.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Σύνολο φοιτητών
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Το είδος {0} δεν βρέθηκε
 DocType: Bin,Stock Value,Αξία των αποθεμάτων
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,"Τα αρχεία πληρωμής θα δημιουργηθούν στο παρασκήνιο. Σε περίπτωση σφάλματος, το μήνυμα σφάλματος θα ενημερωθεί στο Πρόγραμμα."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Η εταιρεία {0} δεν υπάρχει
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} έχει ισχύ μέχρι τις {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} έχει ισχύ μέχρι τις {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Τύπος δέντρου
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Ποσότητα που καταναλώνεται ανά μονάδα
 DocType: Serial No,Warranty Expiry Date,Ημερομηνία λήξης εγγύησης
 DocType: Material Request Item,Quantity and Warehouse,Ποσότητα και αποθήκη
+DocType: Hub Settings,Unregister,Καταργήστε την εγγραφή
 DocType: Sales Invoice,Commission Rate (%),Ποσοστό (%) προμήθειας
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Επιλέξτε Προγράμματα
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Επιλέξτε Προγράμματα
 DocType: Project,Estimated Cost,Εκτιμώμενο κόστος
 DocType: Purchase Order,Link to material requests,Σύνδεσμος για το υλικό των αιτήσεων
+DocType: Hub Settings,Publish,Δημοσιεύω
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Αεροδιάστημα
 DocType: Journal Entry,Credit Card Entry,Καταχώηρση πιστωτικής κάρτας
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Η εταιρεία και οι Λογαριασμοί
@@ -848,13 +865,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Κλείστε Ευκαιρία μετά από μέρες
 ,Reserved,Δεσμευμένη
 DocType: Purchase Order,Supply Raw Materials,Παροχή Πρώτων Υλών
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Η ημερομηνία κατά την οποία θα δημιουργηθεί το επόμενο τιμολόγιο. Δημιουργείται με την υποβολή.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Τρέχον ενεργητικό
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,Το {0} δεν είναι ένα αποθηκεύσιμο είδος
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',Παρακαλώ μοιραστείτε τα σχόλιά σας με την εκπαίδευση κάνοντας κλικ στο &#39;Feedback Training&#39; και στη συνέχεια &#39;New&#39;
 DocType: Mode of Payment Account,Default Account,Προεπιλεγμένος λογαριασμός
 DocType: Payment Entry,Received Amount (Company Currency),Ελήφθη Ποσό (Εταιρεία νομίσματος)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,Η Σύσταση πρέπει να οριστεί αν η Ευκαιρία προέρχεται από Σύσταση
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,Η Σύσταση πρέπει να οριστεί αν η Ευκαιρία προέρχεται από Σύσταση
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Παρακαλώ επιλέξτε εβδομαδιαίο ρεπό
 DocType: Patient,O Negative,O Αρνητικό
 DocType: Production Order Operation,Planned End Time,Προγραμματισμένη ώρα λήξης
@@ -870,10 +886,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Ενέργεια
 DocType: Opportunity,Opportunity From,Ευκαιρία από
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Μηνιαία κατάσταση μισθοδοσίας.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Προσθήκη εταιρείας
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Σειρά {0}: {1} Σειριακοί αριθμοί που απαιτούνται για το στοιχείο {2}. Παρέχετε {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Σειρά {0}: {1} Σειριακοί αριθμοί που απαιτούνται για το στοιχείο {2}. Παρέχετε {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Επιλέξτε έναν πίνακα
 DocType: BOM,Website Specifications,Προδιαγραφές δικτυακού τόπου
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} είναι μια μη έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου στους &quot;Παραλήπτες&quot;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} είναι μια μη έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου στους &quot;Παραλήπτες&quot;
 DocType: Special Test Items,Particulars,Λεπτομέρειες
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Αντιβιοτικό.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Από {0} του τύπου {1}
@@ -881,11 +897,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Γραμμή {0}: ο συντελεστής μετατροπής είναι υποχρεωτικός
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Πολλαπλές Κανόνες Τιμή υπάρχει με τα ίδια κριτήρια, παρακαλούμε επίλυση των συγκρούσεων με την ανάθεση προτεραιότητα. Κανόνες Τιμή: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,Δεν είναι δυνατή η απενεργοποίηση ή ακύρωση της Λ.Υ. γιατί συνδέεται με άλλες Λ.Υ.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,Δεν είναι δυνατή η απενεργοποίηση ή ακύρωση της Λ.Υ. γιατί συνδέεται με άλλες Λ.Υ.
 DocType: Opportunity,Maintenance,Συντήρηση
 DocType: Item Attribute Value,Item Attribute Value,Τιμή χαρακτηριστικού είδους
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Εκστρατείες πωλήσεων.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Κάντε Timesheet
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Κάντε Timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -942,12 +958,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Παρακαλώ εισάγετε πρώτα το είδος
 DocType: Account,Liability,Υποχρέωση
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Κυρώσεις Το ποσό δεν μπορεί να είναι μεγαλύτερη από την αξίωση Ποσό στη σειρά {0}.
+DocType: Salary Detail,Do not include in total,Μην συμπεριλάβετε συνολικά
 DocType: Company,Default Cost of Goods Sold Account,Προεπιλογή Κόστος Πωληθέντων Λογαριασμού
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Ο τιμοκατάλογος δεν έχει επιλεγεί
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Ο τιμοκατάλογος δεν έχει επιλεγεί
 DocType: Employee,Family Background,Ιστορικό οικογένειας
 DocType: Request for Quotation Supplier,Send Email,Αποστολή email
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Προειδοποίηση: Μη έγκυρη Συνημμένο {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Δεν έχετε άδεια
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Προειδοποίηση: Μη έγκυρη Συνημμένο {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Δεν έχετε άδεια
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Quote Ζητήθηκε
 DocType: Vital Signs,Heart Rate / Pulse,Καρδιακός ρυθμός / παλμός
 DocType: Company,Default Bank Account,Προεπιλεγμένος τραπεζικός λογαριασμός
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Για να φιλτράρετε με βάση Κόμμα, επιλέξτε Τύπος Πάρτυ πρώτα"
@@ -974,12 +992,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Στοιχείο Σειρά {idx}: {doctype} {docname} δεν υπάρχει στην παραπάνω »{doctype} &#39;τραπέζι
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Φύλλο κατανομής χρόνου {0} έχει ήδη ολοκληρωθεί ή ακυρωθεί
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Δεν καθήκοντα
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Η ημέρα του μήνα κατά την οποίο θα δημιουργηθεί το αυτοματοποιημένο τιμολόγιο, π.Χ. 05, 28 Κλπ"
 DocType: Item Variant Settings,Copy Fields to Variant,Αντιγραφή πεδίων στην παραλλαγή
 DocType: Asset,Opening Accumulated Depreciation,Άνοιγμα Συσσωρευμένες Αποσβέσεις
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Το αποτέλεσμα πρέπει να είναι μικρότερο από ή ίσο με 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Πρόγραμμα Εργαλείο Εγγραφή
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C-form εγγραφές
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C-form εγγραφές
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Πελάτες και Προμηθευτές
 DocType: Email Digest,Email Digest Settings,Ρυθμίσεις ενημερωτικών άρθρων μέσω email
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Ευχαριστούμε για την επιχείρησή σας!
@@ -997,13 +1014,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Κατάσταση παραπόνων
 DocType: Maintenance Visit,Completion Status,Κατάσταση ολοκλήρωσης
 DocType: HR Settings,Enter retirement age in years,Εισάγετε την ηλικία συνταξιοδότησης στα χρόνια
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Αποθήκη προορισμού
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Επιλέξτε μια αποθήκη
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Αποθήκη προορισμού
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Επιλέξτε μια αποθήκη
 DocType: Cheque Print Template,Starting location from left edge,Ξεκινώντας τοποθεσία από το αριστερό άκρο
 DocType: Item,Allow over delivery or receipt upto this percent,Επιτρέψτε πάνω από την παράδοση ή την παραλαβή μέχρι αυτή τη τοις εκατό
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Εισαγωγή συμμετοχών
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Όλες οι ομάδες ειδών
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Όλες οι ομάδες ειδών
 DocType: Process Payroll,Activity Log,Αρχείο καταγραφής δραστηριότητας
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Καθαρά κέρδη / ζημίες
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Αυτόματη σύνθεση μηνύματος για την υποβολή συναλλαγών .
@@ -1015,7 +1032,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Προβλεπόμενη ποσότητα
 DocType: Sales Invoice,Payment Due Date,Ημερομηνία λήξης προθεσμίας πληρωμής
 DocType: Drug Prescription,Interval UOM,Διαστήματα UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Θέση Παραλλαγή {0} υπάρχει ήδη με ίδια χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Θέση Παραλλαγή {0} υπάρχει ήδη με ίδια χαρακτηριστικά
+DocType: Item,Hub Publishing Details,Στοιχεία δημοσίευσης Hub
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',«Άνοιγμα»
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Ανοικτή To Do
 DocType: Notification Control,Delivery Note Message,Μήνυμα δελτίου αποστολής
@@ -1035,10 +1053,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: Η πρώτη ύλη δεν μπορεί να είναι ίδια με το κύριο στοιχείο
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Σύνολο χρεώσεων που επιβάλλονται στην Αγορά Παραλαβή Είδη πίνακα πρέπει να είναι ίδιο με το συνολικό φόροι και επιβαρύνσεις
 DocType: Sales Team,Incentives,Κίνητρα
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Εγγραφείτε στο Hub
 DocType: SMS Log,Requested Numbers,Αιτήματα Αριθμοί
 DocType: Production Planning Tool,Only Obtain Raw Materials,Μόνο Αποκτήστε Πρώτες Ύλες
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Αξιολόγηση της απόδοσης.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Ενεργοποίηση »Χρησιμοποιήστε για το καλάθι αγορών», όπως είναι ενεργοποιημένο το καλάθι αγορών και θα πρέπει να υπάρχει τουλάχιστον μία φορολογική Κανόνας για το καλάθι αγορών"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Ενεργοποίηση »Χρησιμοποιήστε για το καλάθι αγορών», όπως είναι ενεργοποιημένο το καλάθι αγορών και θα πρέπει να υπάρχει τουλάχιστον μία φορολογική Κανόνας για το καλάθι αγορών"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Έναρξη πληρωμής {0} συνδέεται κατά Παραγγελία {1}, ελέγξτε αν θα πρέπει να τραβηχτεί, όπως εκ των προτέρων σε αυτό το τιμολόγιο."
 DocType: Sales Invoice Item,Stock Details,Χρηματιστήριο Λεπτομέρειες
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Αξία έργου
@@ -1057,12 +1076,14 @@
 DocType: Salary Slip,Working Days,Εργάσιμες ημέρες
 DocType: Serial No,Incoming Rate,Ρυθμός εισερχομένων
 DocType: Packing Slip,Gross Weight,Μικτό βάρος
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,Το όνομα της εταιρείας σας για την οποία εγκαθιστάτε αυτό το σύστημα.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Ενεργοποίηση διανομέα
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,Το όνομα της εταιρείας σας για την οποία εγκαθιστάτε αυτό το σύστημα.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Συμπεριέλαβε αργίες στον συνολικό αριθμό των εργάσιμων ημερών
 DocType: Job Applicant,Hold,Αναμονή
 DocType: Employee,Date of Joining,Ημερομηνία πρόσληψης
 DocType: Naming Series,Update Series,Ενημέρωση σειράς
 DocType: Supplier Quotation,Is Subcontracted,Έχει ανατεθεί ως υπεργολαβία
+DocType: Restaurant Table,Minimum Seating,Ελάχιστη χωρητικότητα
 DocType: Item Attribute,Item Attribute Values,Τιμές χαρακτηριστικού είδους
 DocType: Examination Result,Examination Result,Αποτέλεσμα εξέτασης
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Αποδεικτικό παραλαβής αγοράς
@@ -1073,13 +1094,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Ανίκανος να βρει χρονοθυρίδα στα επόμενα {0} ημέρες για τη λειτουργία {1}
 DocType: Production Order,Plan material for sub-assemblies,Υλικό σχεδίου για τα υποσυστήματα
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Συνεργάτες πωλήσεων και Επικράτεια
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,Η Λ.Υ. {0} πρέπει να είναι ενεργή
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,Η Λ.Υ. {0} πρέπει να είναι ενεργή
 DocType: Journal Entry,Depreciation Entry,αποσβέσεις Έναρξη
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Παρακαλώ επιλέξτε τον τύπο του εγγράφου πρώτα
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Ακύρωση επισκέψεων {0} πριν από την ακύρωση αυτής της επίσκεψης για συντήρηση
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Ο σειριακός αριθμός {0} δεν ανήκει στο είδος {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Απαιτούμενη ποσότητα
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Αποθήκες με τα υπάρχοντα συναλλαγής δεν μπορεί να μετατραπεί σε καθολικό.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Αποθήκες με τα υπάρχοντα συναλλαγής δεν μπορεί να μετατραπεί σε καθολικό.
 DocType: Bank Reconciliation,Total Amount,Συνολικό ποσό
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Δημοσίευση στο διαδίκτυο
 DocType: Prescription Duration,Number,Αριθμός
@@ -1090,7 +1111,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Τιμοκατάλογος πωλήσεων
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Εάν επιλεγεί, θα δημιουργηθεί ένας πελάτης, χαρτογραφημένος στον Ασθενή. Τα τιμολόγια ασθενών θα δημιουργηθούν έναντι αυτού του Πελάτη. Μπορείτε επίσης να επιλέξετε τον υπάρχοντα Πελάτη ενώ δημιουργείτε τον Ασθενή."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Δημοσιεύστε για να συγχρονίσετε τα είδη
 DocType: Bank Reconciliation,Account Currency,Ο λογαριασμός Νόμισμα
 DocType: Lab Test,Sample ID,Αναγνωριστικό δείγματος
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Παρακαλείστε να αναφέρετε στρογγυλεύουν Λογαριασμό Εταιρεία
@@ -1099,11 +1119,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Ο υπάλληλος {0} δεν είναι ενεργός ή δεν υπάρχει
 DocType: Fee Structure,Components,εξαρτήματα
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},"Παρακαλούμε, εισάγετε Asset Κατηγορία στη θέση {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Οι παραλλαγές είδους {0} ενημερώθηκαν
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Οι παραλλαγές είδους {0} ενημερώθηκαν
 DocType: Quality Inspection Reading,Reading 6,Μέτρηση 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,"Δεν είναι δυνατή η {0} {1} {2}, χωρίς οποιαδήποτε αρνητική εκκρεμών τιμολογίων"
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","να δημιουργηθεί. Εάν καθυστερήσετε, θα πρέπει να αλλάξετε με μη αυτόματο τρόπο το πεδίο &quot;Επαναλάβετε την ημέρα του μήνα&quot;"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,"Δεν είναι δυνατή η {0} {1} {2}, χωρίς οποιαδήποτε αρνητική εκκρεμών τιμολογίων"
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Προκαταβολή τιμολογίου αγοράς
-DocType: Hub Settings,Sync Now,Συγχρονισμός τώρα
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Γραμμή {0} : μια πιστωτική καταχώρηση δεν μπορεί να συνδεθεί με ένα {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Καθορισμός του προϋπολογισμού για ένα οικονομικό έτος.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Ο προεπιλεγμένος λογαριασμός τραπέζης / μετρητών θα ενημερώνεται αυτόματα στην έκδοση τιμολογίου POS, όταν επιλέγεται αυτός ο τρόπος."
@@ -1115,13 +1136,13 @@
 DocType: Item,Is Purchase Item,Είναι είδος αγοράς
 DocType: Asset,Purchase Invoice,Τιμολόγιο αγοράς
 DocType: Stock Ledger Entry,Voucher Detail No,Αρ. λεπτομερειών αποδεικτικού
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Νέο Τιμολόγιο πωλήσεων
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Νέο Τιμολόγιο πωλήσεων
 DocType: Stock Entry,Total Outgoing Value,Συνολική εξερχόμενη αξία
 DocType: Physician,Appointments,Εφόδια
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Ημερομηνία ανοίγματος και καταληκτική ημερομηνία θα πρέπει να είναι εντός της ίδιας Χρήσεως
 DocType: Lead,Request for Information,Αίτηση για πληροφορίες
 ,LeaderBoard,LeaderBoard
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Συγχρονισμός Τιμολόγια Αποσυνδεδεμένος
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Συγχρονισμός Τιμολόγια Αποσυνδεδεμένος
 DocType: Payment Request,Paid,Πληρωμένο
 DocType: Program Fee,Program Fee,Χρέωση πρόγραμμα
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1140,11 +1161,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Είδος παραγγελίας αγοράς
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Έμμεσα έσοδα
 DocType: Student Attendance Tool,Student Attendance Tool,Εργαλείο φοίτηση μαθητή
+DocType: Restaurant Menu,Price List (Auto created),Τιμοκατάλογος (Δημιουργήθηκε αυτόματα)
 DocType: Cheque Print Template,Date Settings,Ρυθμίσεις ημερομηνίας
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Διακύμανση
 ,Company Name,Όνομα εταιρείας
 DocType: SMS Center,Total Message(s),Σύνολο μηνυμάτων
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Επιλογή στοιχείου για μεταφορά
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Επιλογή στοιχείου για μεταφορά
 DocType: Purchase Invoice,Additional Discount Percentage,Πρόσθετες ποσοστό έκπτωσης
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Δείτε μια λίστα με όλα τα βίντεο βοήθειας
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Επιλέξτε την κύρια εγγραφή λογαριασμού της τράπεζας όπου κατατέθηκε η επιταγή.
@@ -1161,6 +1183,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Μέτρο
 DocType: Workstation,Electricity Cost,Κόστος ηλεκτρικής ενέργειας
 DocType: HR Settings,Don't send Employee Birthday Reminders,Μην στέλνετε υπενθυμίσεις γενεθλίων υπαλλήλου
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Αποθήκευση ρυθμίσεων
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Ζητούμενα προϊόντα
 DocType: Item,Inspection Criteria,Κριτήρια ελέγχου
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Μεταφέρονται
 DocType: BOM Website Item,BOM Website Item,BOM Ιστοσελίδα του Είδους
@@ -1177,11 +1201,11 @@
 DocType: Journal Entry,Total Amount in Words,Συνολικό ποσό ολογράφως
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Υπήρξε ένα σφάλμα. Ένας πιθανός λόγος θα μπορούσε να είναι ότι δεν έχετε αποθηκεύσει τη φόρμα. Παρακαλώ επικοινωνήστε με το support@erpnext.Com εάν το πρόβλημα παραμένει.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Το Καλάθι μου
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Ο τύπος παραγγελίας πρέπει να είναι ένα από τα {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Ο τύπος παραγγελίας πρέπει να είναι ένα από τα {0}
 DocType: Lead,Next Contact Date,Ημερομηνία επόμενης επικοινωνίας
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Αρχική ποσότητα
 DocType: Healthcare Settings,Appointment Reminder,Υπενθύμιση συναντήσεων
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,"Παρακαλούμε, εισάγετε Λογαριασμού για την Αλλαγή Ποσό"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,"Παρακαλούμε, εισάγετε Λογαριασμού για την Αλλαγή Ποσό"
 DocType: Student Batch Name,Student Batch Name,Φοιτητής παρτίδας Όνομα
 DocType: Consultation,Doctor,Γιατρός
 DocType: Holiday List,Holiday List Name,Όνομα λίστας αργιών
@@ -1189,12 +1213,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Μάθημα πρόγραμμα
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Δικαιώματα Προαίρεσης
 DocType: Journal Entry Account,Expense Claim,Αξίωση δαπανών
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Θέλετε πραγματικά να επαναφέρετε αυτή τη διάλυση των περιουσιακών στοιχείων;
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Ποσότητα για {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Θέλετε πραγματικά να επαναφέρετε αυτή τη διάλυση των περιουσιακών στοιχείων;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Ποσότητα για {0}
 DocType: Leave Application,Leave Application,Αίτηση άδειας
 DocType: Patient,Patient Relation,Σχέση ασθενών
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Εργαλείο κατανομής αδειών
+DocType: Item,Hub Category to Publish,Κατηγορία Hub για δημοσίευση
 DocType: Leave Block List,Leave Block List Dates,Ημερομηνίες λίστας αποκλεισμού ημερών άδειας
+DocType: Sales Invoice,Billing Address GSTIN,Διεύθυνση χρέωσης GSTIN
 DocType: Workstation,Net Hour Rate,Καθαρή τιμή ώρας
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Αποδεικτικό αγοράς κόστους αποστολής εμπορευμάτων
 DocType: Company,Default Terms,Προεπιλογή Όροι
@@ -1204,18 +1230,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Παρακαλείστε να προσδιορίσετε ένα {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Που αφαιρούνται χωρίς καμία αλλαγή στην ποσότητα ή την αξία.
 DocType: Delivery Note,Delivery To,Παράδοση προς
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Τραπέζι χαρακτηριστικό γνώρισμα είναι υποχρεωτικό
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Τραπέζι χαρακτηριστικό γνώρισμα είναι υποχρεωτικό
 DocType: Production Planning Tool,Get Sales Orders,Βρες παραγγελίες πώλησης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,Η {0} δεν μπορεί να είναι αρνητική
 DocType: Training Event,Self-Study,Αυτοδιδασκαλίας
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Έκπτωση
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Έκπτωση
 DocType: Asset,Total Number of Depreciations,Συνολικός αριθμός των Αποσβέσεων
 DocType: Sales Invoice Item,Rate With Margin,Τιμή με περιθώριο
 DocType: Workstation,Wages,Μισθοί
 DocType: Task,Urgent,Επείγον
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Παρακαλείστε να προσδιορίσετε μια έγκυρη ταυτότητα Σειρά για τη σειρά {0} στο τραπέζι {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Δεν είναι δυνατή η εύρεση μεταβλητής:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Επιλέξτε ένα πεδίο για επεξεργασία από numpad
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Επιλέξτε ένα πεδίο για επεξεργασία από numpad
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Μετάβαση στην επιφάνεια εργασίας και να αρχίσετε να χρησιμοποιείτε ERPNext
 DocType: Item,Manufacturer,Κατασκευαστής
 DocType: Landed Cost Item,Purchase Receipt Item,Είδος αποδεικτικού παραλαβής αγοράς
@@ -1246,8 +1272,8 @@
 DocType: GL Entry,Against,Κατά
 DocType: Item,Default Selling Cost Center,Προεπιλεγμένο κέντρο κόστους πωλήσεων
 DocType: Sales Partner,Implementation Partner,Συνεργάτης υλοποίησης
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Ταχυδρομικός κώδικας
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Πωλήσεις Τάξης {0} είναι {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Ταχυδρομικός κώδικας
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Πωλήσεις Τάξης {0} είναι {1}
 DocType: Opportunity,Contact Info,Πληροφορίες επαφής
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Κάνοντας Χρηματιστήριο Καταχωρήσεις
 DocType: Packing Slip,Net Weight UOM,Μ.Μ. Καθαρού βάρους
@@ -1258,6 +1284,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Βρες ημερομηνίες εβδομαδιαίων αργιών
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Η ημερομηνία λήξης δεν μπορεί να είναι προγενέστερη της ημερομηνίας έναρξης
 DocType: Sales Person,Select company name first.,Επιλέξτε το όνομα της εταιρείας πρώτα.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Χαμηλή έως υψηλή
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Προσφορές που λήφθηκαν από προμηθευτές.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Αντικαταστήστε το BOM και ενημερώστε την τελευταία τιμή σε όλα τα BOM
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Έως {0} | {1} {2}
@@ -1276,7 +1303,7 @@
 DocType: Program Enrollment,Transportation,Μεταφορά
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Μη έγκυρη Χαρακτηριστικό
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} Πρέπει να υποβληθεί
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Ποσότητα πρέπει να είναι μικρότερη ή ίση με {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Ποσότητα πρέπει να είναι μικρότερη ή ίση με {0}
 DocType: SMS Center,Total Characters,Σύνολο χαρακτήρων
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Παρακαλώ επιλέξτε Λ.Υ. στο πεδίο της Λ.Υ. για το είδος {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Λεπτομέρειες τιμολογίου C-form
@@ -1291,7 +1318,7 @@
 ,Ordered Items To Be Billed,Παραγγελθέντα είδη για τιμολόγηση
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,"Από το φάσμα πρέπει να είναι μικρότερη από ό, τι στην γκάμα"
 DocType: Global Defaults,Global Defaults,Καθολικές προεπιλογές
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Συνεργασία Πρόσκληση έργου
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Συνεργασία Πρόσκληση έργου
 DocType: Salary Slip,Deductions,Κρατήσεις
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Όνομα δράσης
@@ -1309,13 +1336,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Προκαταβολή τιμολογίου πώλησης
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Τίποτα να ζητηθεί
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Άλλο ένα ρεκόρ Προϋπολογισμός &#39;{0}&#39; υπάρχει ήδη κατά {1} &#39;{2}&#39; για το οικονομικό έτος {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',Η πραγματική ημερομηνία έναρξης δεν μπορεί να είναι μεταγενέστερη της πραγματικής ημερομηνίας λήξης
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',Η πραγματική ημερομηνία έναρξης δεν μπορεί να είναι μεταγενέστερη της πραγματικής ημερομηνίας λήξης
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Διαχείριση
 DocType: Cheque Print Template,Payer Settings,Ρυθμίσεις πληρωτή
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Αυτό θα πρέπει να επισυνάπτεται στο κφδικό είδους της παραλλαγής. Για παράδειγμα, εάν η συντομογραφία σας είναι «sm» και ο κωδικός του είδους είναι ""t-shirt"", ο κωδικός του της παραλλαγής του είδους θα είναι ""t-shirt-sm"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Οι καθαρές αποδοχές (ολογράφως) θα είναι ορατές τη στιγμή που θα αποθηκεύσετε τη βεβαίωση αποδοχών
 DocType: Purchase Invoice,Is Return,Είναι η επιστροφή
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Προσοχή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Προσοχή
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Επιστροφή / χρεωστικό σημείωμα
 DocType: Price List Country,Price List Country,Τιμοκατάλογος Χώρα
 DocType: Item,UOMs,Μ.Μ.
@@ -1330,17 +1357,18 @@
 DocType: Account,Balance Sheet,Ισολογισμός
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Κέντρο κόστους για το είδος με το κωδικό είδους '
 DocType: Fee Validity,Valid Till,Εγκυρο μέχρι
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Τρόπος πληρωμής δεν έχει ρυθμιστεί. Παρακαλώ ελέγξτε, εάν ο λογαριασμός έχει τεθεί σε λειτουργία πληρωμών ή σε POS προφίλ."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Τρόπος πληρωμής δεν έχει ρυθμιστεί. Παρακαλώ ελέγξτε, εάν ο λογαριασμός έχει τεθεί σε λειτουργία πληρωμών ή σε POS προφίλ."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Ίδιο αντικείμενο δεν μπορεί να εισαχθεί πολλές φορές.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Περαιτέρω λογαριασμών μπορούν να γίνουν στις ομάδες, αλλά εγγραφές μπορούν να γίνουν με την μη Ομάδες"
 DocType: Lead,Lead,Σύσταση
 DocType: Email Digest,Payables,Υποχρεώσεις
 DocType: Course,Course Intro,φυσικά Intro
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Χρηματιστήριο Έναρξη {0} δημιουργήθηκε
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Παρακαλούμε ρυθμίστε τη σειρά αρίθμησης για τη συμμετοχή μέσω του Setup&gt; Series Numbering
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Χρηματιστήριο Έναρξη {0} δημιουργήθηκε
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Σειρά # {0}: Απορρίφθηκε Ποσότητα δεν μπορούν να εισαχθούν στην Αγορά Επιστροφή
 ,Purchase Order Items To Be Billed,Είδη παραγγελίας αγοράς προς χρέωση
 DocType: Purchase Invoice Item,Net Rate,Καθαρή Τιμή
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Επιλέξτε έναν πελάτη
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Επιλέξτε έναν πελάτη
 DocType: Purchase Invoice Item,Purchase Invoice Item,Είδος τιμολογίου αγοράς
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Οι καταχωρήσεις του καθολικού αποθέματος και οι καταχωρήσεις GL θα επαναδημοσιευτούν για τα επιλεγμένα αποδεικτικά παραλαβής αγορών
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Στοιχείο 1
@@ -1359,7 +1387,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Διπλότυπη γραμμή {0} με το ίδιο {1}
 ,Trial Balance,Ισοζύγιο
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Φορολογικό Έτος {0} δεν βρέθηκε
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Ρύθμιση εργαζόμενοι
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Ρύθμιση εργαζόμενοι
 DocType: Sales Order,SO-,ΈΤΣΙ-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Παρακαλώ επιλέξτε πρόθεμα πρώτα
 DocType: Employee,O-,Ο-
@@ -1371,12 +1399,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Προβολή καθολικού
 DocType: Grading Scale,Intervals,διαστήματα
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Η πιο παλιά
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Μια ομάδα ειδών υπάρχει με το ίδιο όνομα, μπορείτε να αλλάξετε το όνομα του είδους ή να μετονομάσετε την ομάδα ειδών"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Μια ομάδα ειδών υπάρχει με το ίδιο όνομα, μπορείτε να αλλάξετε το όνομα του είδους ή να μετονομάσετε την ομάδα ειδών"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Φοιτητής Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Τρίτες χώρες
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Τρίτες χώρες
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Το είδος {0} δεν μπορεί να έχει παρτίδα
 ,Budget Variance Report,Έκθεση διακύμανσης του προϋπολογισμού
 DocType: Salary Slip,Gross Pay,Ακαθάριστες αποδοχές
+DocType: Item,Is Item from Hub,Είναι στοιχείο από τον κεντρικό υπολογιστή
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Σειρά {0}: Τύπος δραστηριότητας είναι υποχρεωτική.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Μερίσματα που καταβάλλονται
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Λογιστική Λογιστική
@@ -1386,8 +1415,9 @@
 DocType: Vehicle Log,Service Detail,Λεπτομέρεια υπηρεσία
 DocType: BOM,Item Description,Περιγραφή είδους
 DocType: Student Sibling,Student Sibling,φοιτητής Αδέλφια
-DocType: Purchase Invoice,Is Recurring,Είναι επαναλαμβανόμενo
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Τρόπος πληρωμής
 DocType: Purchase Invoice,Supplied Items,Προμηθευόμενα είδη
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Ρυθμίστε ένα ενεργό μενού για το εστιατόριο {0}
 DocType: Student,STUD.,ΚΟΥΜΠΊ ΚΟΛΆΡΟΥ.
 DocType: Production Order,Qty To Manufacture,Ποσότητα για κατασκευή
 DocType: Email Digest,New Income,νέα εισοδήματος
@@ -1397,6 +1427,7 @@
 ,Student and Guardian Contact Details,Φοιτητής και Guardian Λεπτομέρειες Επικοινωνία
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Σειρά {0}: Για τον προμηθευτή {0} η διεύθυνση ηλεκτρονικού ταχυδρομείου που απαιτείται για να στείλετε e-mail
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Προσωρινό άνοιγμα
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Προβολή Hub
 ,Employee Leave Balance,Υπόλοιπο αδείας υπαλλήλου
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Το υπόλοιπο λογαριασμού {0} πρέπει να είναι πάντα {1}
 DocType: Patient Appointment,More Info,Περισσότερες πληροφορίες
@@ -1416,13 +1447,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Η παραγγελία πώλησης {0} δεν είναι έγκυρη
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Προειδοποίηση για νέα Αιτήματα για Προσφορές
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,εντολές αγοράς σας βοηθήσει να σχεδιάσετε και να παρακολουθούν τις αγορές σας
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Δυστυχώς, οι εταιρείες δεν μπορούν να συγχωνευθούν"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Δυστυχώς, οι εταιρείες δεν μπορούν να συγχωνευθούν"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Προδιαγραφές εργαστηριακών δοκιμών
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}","Η συνολική ποσότητα Issue / Μεταφορά {0} στο Αίτημα Υλικό {1} \ δεν μπορεί να είναι μεγαλύτερη από ό, τι ζητήσατε ποσότητα {2} για τη θέση {3}"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Μικρό
 DocType: Employee,Employee Number,Αριθμός υπαλλήλων
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Ο αρ. υπόθεσης χρησιμοποιείται ήδη. Δοκιμάστε από τον αρ. υπόθεσης {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Ο αρ. υπόθεσης χρησιμοποιείται ήδη. Δοκιμάστε από τον αρ. υπόθεσης {0}
 DocType: Project,% Completed,% Ολοκληρώθηκε
 ,Invoiced Amount (Exculsive Tax),Ποσό τιμολόγησης (χωρίς φπα)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Στοιχείο 2
@@ -1437,11 +1468,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Έμμεσες δαπάνες
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Γραμμή {0}: η ποσότητα είναι απαραίτητη
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Γεωργία
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Συγχρονισμός Δεδομένα Βασικού Αρχείου
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Συγχρονισμός Δεδομένα Βασικού Αρχείου
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Τα προϊόντα ή οι υπηρεσίες σας
 DocType: Special Test Items,Special Test Items,Ειδικά στοιχεία δοκιμής
 DocType: Mode of Payment,Mode of Payment,Τρόπος πληρωμής
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Ιστοσελίδα εικόνας θα πρέπει να είναι ένα δημόσιο αρχείο ή URL της ιστοσελίδας
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Ιστοσελίδα εικόνας θα πρέπει να είναι ένα δημόσιο αρχείο ή URL της ιστοσελίδας
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Αυτή είναι μια κύρια ομάδα ειδών και δεν μπορεί να επεξεργαστεί.
@@ -1449,24 +1480,23 @@
 DocType: Vehicle,Fuel UOM,UOM καυσίμων
 DocType: Warehouse,Warehouse Contact Info,Πληροφορίες επικοινωνίας για την αποθήκη
 DocType: Payment Entry,Write Off Difference Amount,Γράψτε Off Διαφορά Ποσό
-DocType: Purchase Invoice,Recurring Type,Τύπος επαναλαμβανόμενου
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: Η δ/ση email του υπάλλήλου δεν βρέθηκε,  το μυνημα δεν εστάλη"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: Η δ/ση email του υπάλλήλου δεν βρέθηκε,  το μυνημα δεν εστάλη"
 DocType: Item,Foreign Trade Details,Εξωτερικού Εμπορίου Λεπτομέρειες
+,Assessment Plan Status,Κατάσταση προγράμματος αξιολόγησης
 DocType: Email Digest,Annual Income,ΕΤΗΣΙΟ εισοδημα
 DocType: Serial No,Serial No Details,Λεπτομέρειες σειριακού αρ.
 DocType: Purchase Invoice Item,Item Tax Rate,Φορολογικός συντελεστής είδους
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,Επιλέξτε ιατρό και ημερομηνία
 DocType: Student Group Student,Group Roll Number,Αριθμός Αριθμός Roll
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Για {0}, μόνο πιστωτικοί λογαριασμοί μπορούν να συνδέονται με άλλες καταχωρήσεις χρέωσης"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Σύνολο όλων των βαρών στόχος θα πρέπει να είναι: 1. Παρακαλώ ρυθμίστε τα βάρη όλων των εργασιών του έργου ανάλογα
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Το δελτίο αποστολής {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Σύνολο όλων των βαρών στόχος θα πρέπει να είναι: 1. Παρακαλώ ρυθμίστε τα βάρη όλων των εργασιών του έργου ανάλογα
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Το δελτίο αποστολής {0} δεν έχει υποβληθεί
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Το είδος {0} πρέπει να είναι είδος υπεργολαβίας
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Κεφάλαιο εξοπλισμών
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ο κανόνας τιμολόγησης πρώτα επιλέγεται με βάση το πεδίο 'εφαρμογή στο', το οποίο μπορεί να είναι είδος, ομάδα ειδών ή εμπορικό σήμα"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Ορίστε πρώτα τον Κωδικό στοιχείου
-DocType: Hub Settings,Seller Website,Ιστοσελίδα πωλητή
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Ορίστε πρώτα τον Κωδικό στοιχείου
 DocType: Item,ITEM-,ΕΊΔΟΣ-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Το σύνολο των κατανεμημέωνων ποσοστών για την ομάδα πωλήσεων πρέπει να είναι 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Το σύνολο των κατανεμημέωνων ποσοστών για την ομάδα πωλήσεων πρέπει να είναι 100
 DocType: Sales Invoice Item,Edit Description,Επεξεργασία Περιγραφή
 DocType: Antibiotic,Antibiotic,Αντιβιοτικό
 ,Team Updates,Ενημερώσεις ομάδα
@@ -1487,12 +1517,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Σύνολο (Εταιρεία νομίσματος)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Ο σειριακός αριθμός {0} εισήχθηκε περισσότερο από μία φορά
 DocType: Depreciation Schedule,Journal Entry,Λογιστική εγγραφή
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} αντικείμενα σε εξέλιξη
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} αντικείμενα σε εξέλιξη
 DocType: Workstation,Workstation Name,Όνομα σταθμού εργασίας
 DocType: Grading Scale Interval,Grade Code,Βαθμολογία Κωδικός
 DocType: POS Item Group,POS Item Group,POS Θέση του Ομίλου
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Στείλτε ενημερωτικό άρθρο email:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},Η Λ.Υ. {0} δεν ανήκει στο είδος {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},Η Λ.Υ. {0} δεν ανήκει στο είδος {1}
 DocType: Sales Partner,Target Distribution,Στόχος διανομής
 DocType: Salary Slip,Bank Account No.,Αριθμός τραπεζικού λογαριασμού
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Αυτός είναι ο αριθμός της τελευταίας συναλλαγής που δημιουργήθηκε με αυτό το πρόθεμα
@@ -1508,10 +1538,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Αίτηση για Προσφορά Προμηθευτής
 DocType: Healthcare Settings,Registration Message,Μήνυμα εγγραφής
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Hardware
-DocType: Sales Order,Recurring Upto,επαναλαμβανόμενες Μέχρι
 DocType: Prescription Dosage,Prescription Dosage,Δοσολογία Δοσολογίας
 DocType: Attendance,HR Manager,Υπεύθυνος ανθρωπίνου δυναμικού
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Παρακαλώ επιλέξτε ένα Εταιρείας
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Παρακαλώ επιλέξτε ένα Εταιρείας
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Άδεια μετ' αποδοχών
 DocType: Purchase Invoice,Supplier Invoice Date,Ημερομηνία τιμολογίου του προμηθευτή
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,ανά
@@ -1527,10 +1556,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Βρέθηκαν συνθήκες που επικαλύπτονται μεταξύ:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Κατά την ημερολογιακή εγγραφή {0} έχει ήδη ρυθμιστεί από κάποιο άλλο αποδεικτικό
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Συνολική αξία της παραγγελίας
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Τροφή
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Τροφή
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Eύρος γήρανσης 3
 DocType: Maintenance Schedule Item,No of Visits,Αρ. επισκέψεων
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Το πρόγραμμα συντήρησης {0} υπάρχει έναντι του {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Θέλετε να δημοσιεύσετε τα στοιχεία σας στο Hub;
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,Η εγγραφή των φοιτητών
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Νόμισμα του Λογαριασμού κλεισίματος πρέπει να είναι {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Άθροισμα των βαθμών για όλους τους στόχους πρέπει να είναι 100. Πρόκειται για {0}
@@ -1541,9 +1571,9 @@
 DocType: Authorization Rule,Average Discount,Μέση έκπτωση
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Επιχειρήσεις κοινής ωφέλειας
-DocType: Purchase Invoice Item,Accounting,Λογιστική
+DocType: POS Profile,Accounting,Λογιστική
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Παρακαλώ επιλέξτε παρτίδες για το παραδοθέν αντικείμενο
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Παρακαλώ επιλέξτε παρτίδες για το παραδοθέν αντικείμενο
 DocType: Asset,Depreciation Schedules,Δρομολόγια αποσβέσεων
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Περίοδος υποβολής των αιτήσεων δεν μπορεί να είναι περίοδος κατανομής έξω άδειας
 DocType: Activity Cost,Projects,Έργα
@@ -1559,7 +1589,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',Η κατάσταση έγκρισης πρέπει να είναι εγκρίθηκε ή απορρίφθηκε
 DocType: Physician,Contacts and Address,Επαφές και διεύθυνση
 DocType: Purchase Invoice,Contact Person,Κύρια εγγραφή επικοινωνίας
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',Η αναμενόμενη ημερομηνία έναρξης δεν μπορεί να είναι μεταγενέστερη από την αναμενόμενη ημερομηνία λήξης
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',Η αναμενόμενη ημερομηνία έναρξης δεν μπορεί να είναι μεταγενέστερη από την αναμενόμενη ημερομηνία λήξης
 DocType: Course Scheduling Tool,Course End Date,Φυσικά Ημερομηνία Λήξης
 DocType: Holiday List,Holidays,Διακοπές
 DocType: Sales Order Item,Planned Quantity,Προγραμματισμένη ποσότητα
@@ -1567,10 +1597,11 @@
 DocType: Item,Maintain Stock,Διατηρήστε Χρηματιστήριο
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Έχουν ήδη δημιουργηθεί καταχωρήσεις αποθέματος για την εντολή παραγωγής
 DocType: Employee,Prefered Email,προτιμώμενη Email
+DocType: Student Admission,Eligibility and Details,Επιλεξιμότητα και Λεπτομέρειες
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Καθαρή Αλλαγή στο Παγίων
 DocType: Leave Control Panel,Leave blank if considered for all designations,Άφησε το κενό αν ισχύει για όλες τις ονομασίες
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Η επιβάρυνση του τύπου 'πραγματική' στη γραμμή {0} δεν μπορεί να συμπεριληφθεί στην τιμή είδους
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Μέγιστο: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Μέγιστο: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Από ημερομηνία και ώρα
 DocType: Email Digest,For Company,Για την εταιρεία
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Αρχείο καταγραφής επικοινωνίας
@@ -1578,19 +1609,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Μεταβλητή βαθμολόγησης του Προμηθευτή Scorecard
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Ποσό αγοράς
 DocType: Sales Invoice,Shipping Address Name,Όνομα διεύθυνσης αποστολής
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Λογιστικό σχέδιο
 DocType: Material Request,Terms and Conditions Content,Περιεχόμενο όρων και προϋποθέσεων
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,Δεν μπορεί να είναι μεγαλύτερη από 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
 DocType: Maintenance Visit,Unscheduled,Έκτακτες
 DocType: Employee,Owned,Ανήκουν
 DocType: Salary Detail,Depends on Leave Without Pay,Εξαρτάται από άδειας άνευ αποδοχών
 DocType: Pricing Rule,"Higher the number, higher the priority","Όσο μεγαλύτερος είναι ο αριθμός, τόσο μεγαλύτερη είναι η προτεραιότητα"
 ,Purchase Invoice Trends,Τάσεις τιμολογίου αγοράς
 DocType: Employee,Better Prospects,Καλύτερες προοπτικές
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Σειρά # {0}: Η παρτίδα {1} έχει μόνο {2} qty. Επιλέξτε άλλη παρτίδα που έχει {3} qty διαθέσιμη ή διαχωρίστε τη σειρά σε πολλαπλές σειρές, για παράδοση / έκδοση από πολλαπλές παρτίδες"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Σειρά # {0}: Η παρτίδα {1} έχει μόνο {2} qty. Επιλέξτε άλλη παρτίδα που έχει {3} qty διαθέσιμη ή διαχωρίστε τη σειρά σε πολλαπλές σειρές, για παράδοση / έκδοση από πολλαπλές παρτίδες"
 DocType: Vehicle,License Plate,Πινακίδα κυκλοφορίας
 DocType: Appraisal,Goals,Στόχοι
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Επιλέξτε POS Profile
 DocType: Warranty Claim,Warranty / AMC Status,Κατάσταση εγγύησης / Ε.Σ.Υ.
 ,Accounts Browser,Περιηγητής λογαριασμων
 DocType: Payment Entry Reference,Payment Entry Reference,Έναρξη Πληρωμής Αναφορά
@@ -1608,7 +1639,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Ο υπάλληλος δεν μπορεί να αναφέρει στον ευατό του.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Εάν ο λογαριασμός έχει παγώσει, οι καταχωρήσεις επιτρέπονται σε ορισμένους χρήστες."
 DocType: Email Digest,Bank Balance,Τράπεζα Υπόλοιπο
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Λογιστική καταχώριση για {0}: {1} μπορεί να γίνει μόνο στο νόμισμα: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Λογιστική καταχώριση για {0}: {1} μπορεί να γίνει μόνο στο νόμισμα: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Επαγγελματικό προφίλ, τα προσόντα που απαιτούνται κ.λ.π."
 DocType: Journal Entry Account,Account Balance,Υπόλοιπο λογαριασμού
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Φορολογικές Κανόνας για τις συναλλαγές.
@@ -1617,8 +1648,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Σύνολο φόρων και επιβαρύνσεων (στο νόμισμα της εταιρείας)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Εμφάνιση P &amp; L υπόλοιπα unclosed χρήσεως
 DocType: Lab Test Template,Collection Details,Λεπτομέρειες συλλογής
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","επιλέξτε cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date από tabConsultation ct, `tabLab συνταγή` cp όπου ct.patient = &#39;{0}&#39; και cp.parent = ct. όνομα και cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Λογαριασμός αποστολών
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Ο λογαριασμός {2} είναι ανενεργό
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Κάντε Παραγγελίες για να σας βοηθήσει να σχεδιάσετε την εργασία σας και να παραδώσει στο χρόνο
@@ -1635,7 +1664,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Δελτίο συσκευασίας
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Ενοίκιο γραφείου
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Ρύθμιση στοιχείων SMS gateway
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Η εισαγωγή απέτυχε!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Η εισαγωγή απέτυχε!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Δεν δημιουργήθηκαν διευθύνσεις
 DocType: Workstation Working Hour,Workstation Working Hour,Ώρες εργαασίας σταθμού εργασίας
 DocType: Vital Signs,Blood Pressure,Πίεση αίματος
@@ -1660,7 +1689,7 @@
 DocType: Sales Invoice,Source,Πηγή
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Εμφάνιση κλειστά
 DocType: Leave Type,Is Leave Without Pay,Είναι άδειας άνευ αποδοχών
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Περιουσιακών στοιχείων της κατηγορίας είναι υποχρεωτική για παγίου στοιχείου
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Περιουσιακών στοιχείων της κατηγορίας είναι υποχρεωτική για παγίου στοιχείου
 DocType: Fee Validity,Fee Validity,Ισχύς του τέλους
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Δεν βρέθηκαν εγγραφές στον πίνακα πληρωμών
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Αυτό {0} συγκρούσεις με {1} για {2} {3}
@@ -1681,8 +1710,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Αναζήτησης εκτελεστικού στελέχους
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Δημιουργήστε Συστάσεις
 DocType: Maintenance Schedule,Schedules,Χρονοδιαγράμματα
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,Το POS Profile απαιτείται για να χρησιμοποιηθεί το σημείο πώλησης
 DocType: Purchase Invoice Item,Net Amount,Καθαρό Ποσό
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} δεν έχει υποβληθεί, οπότε η ενέργεια δεν μπορεί να ολοκληρωθεί"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} δεν έχει υποβληθεί, οπότε η ενέργεια δεν μπορεί να ολοκληρωθεί"
 DocType: Purchase Order Item Supplied,BOM Detail No,Αρ. Λεπτομερειών Λ.Υ.
 DocType: Landed Cost Voucher,Additional Charges,Επιπλέον χρεώσεις
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Πρόσθετες ποσό έκπτωσης (Εταιρεία νομίσματος)
@@ -1691,7 +1721,7 @@
 ,Support Hour Distribution,Διανομή ώρας υποστήριξης
 DocType: Maintenance Visit,Maintenance Visit,Επίσκεψη συντήρησης
 DocType: Student,Leaving Certificate Number,Αφήνοντας Αριθμός Πιστοποιητικού
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Το ραντεβού ακυρώθηκε, ελέγξτε και ακυρώστε το τιμολόγιο {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Το ραντεβού ακυρώθηκε, ελέγξτε και ακυρώστε το τιμολόγιο {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Διαθέσιμο παρτίδας Ποσότητα σε αποθήκη
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Ενημέρωση Μορφή εκτύπωσης
 DocType: Landed Cost Voucher,Landed Cost Help,Βοήθεια κόστους αποστολής εμπορευμάτων
@@ -1714,8 +1744,8 @@
 DocType: Patient,Tobacco Past Use,Καπνός
 DocType: Sales Invoice Item,Brand Name,Εμπορική επωνυμία
 DocType: Purchase Receipt,Transporter Details,Λεπτομέρειες Transporter
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Ο χρήστης {0} έχει ήδη αντιστοιχιστεί στο Physician {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Προεπιλογή αποθήκη απαιτείται για επιλεγμένες στοιχείο
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Ο χρήστης {0} έχει ήδη αντιστοιχιστεί στο Physician {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Προεπιλογή αποθήκη απαιτείται για επιλεγμένες στοιχείο
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Κουτί
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,πιθανές Προμηθευτής
 DocType: Budget,Monthly Distribution,Μηνιαία διανομή
@@ -1725,7 +1755,7 @@
 DocType: Sales Partner,Sales Partner Target,Στόχος συνεργάτη πωλήσεων
 DocType: Loan Type,Maximum Loan Amount,Ανώτατο ποσό του δανείου
 DocType: Pricing Rule,Pricing Rule,Κανόνας τιμολόγησης
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Διπλότυπος αριθμός κυλίνδρου για φοιτητή {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Διπλότυπος αριθμός κυλίνδρου για φοιτητή {0}
 DocType: Budget,Action if Annual Budget Exceeded,Δράση αν ετήσιος προϋπολογισμός του ξεπερνούσε
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Υλικό αίτηση για αγορά Παραγγελία
 DocType: Shopping Cart Settings,Payment Success URL,Πληρωμή επιτυχία URL
@@ -1742,7 +1772,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} Πρέπει να εμφανίζεται μόνο μία φορά
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Δεν επιτρέπεται να μεταφέρουμε περισσότερο {0} από {1} εναντίον παραγγελίας {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Οι άδειες κατανεμήθηκαν επιτυχώς για {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Δεν βρέθηκαν είδη για συσκευασία
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Δεν βρέθηκαν είδη για συσκευασία
 DocType: Shipping Rule Condition,From Value,Από τιμή
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Η παραγόμενη ποσότητα είναι απαραίτητη
 DocType: Employee Loan,Repayment Method,Τρόπος αποπληρωμής
@@ -1756,6 +1786,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Υποχρεώσεις αποθέματος
 DocType: Purchase Invoice,Supplier Warehouse,Αποθήκη προμηθευτή
 DocType: Opportunity,Contact Mobile No,Αριθμός κινητού επαφής
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Επιλέξτε Εταιρεία
 ,Material Requests for which Supplier Quotations are not created,Αιτήσεις υλικού για τις οποίες δεν έχουν δημιουργηθεί προσφορές προμηθευτή
 DocType: Student Group,Set 0 for no limit,Ορίστε 0 για χωρίς όριο
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Η ημέρα (ες) για την οποία υποβάλλετε αίτηση για άδεια είναι αργίες. Δεν χρειάζεται να ζητήσει άδεια.
@@ -1765,24 +1796,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Κάντε Προσφορά
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,άλλες εκθέσεις
 DocType: Dependent Task,Dependent Task,Εξαρτημένη Εργασία
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Ο συντελεστής μετατροπής για την προεπιλεγμένη μονάδα μέτρησης πρέπει να είναι 1 στη γραμμή {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Ο συντελεστής μετατροπής για την προεπιλεγμένη μονάδα μέτρησης πρέπει να είναι 1 στη γραμμή {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Η άδεια του τύπου {0} δεν μπορεί να είναι μεγαλύτερη από {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Δοκιμάστε τον προγραμματισμό εργασιών για το X ημέρες νωρίτερα.
 DocType: HR Settings,Stop Birthday Reminders,Διακοπή υπενθυμίσεων γενεθλίων
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Παρακαλούμε να ορίσετε Προεπιλογή Μισθοδοσίας Πληρωτέο Λογαριασμού Εταιρείας {0}
 DocType: SMS Center,Receiver List,Λίστα παραλήπτη
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Αναζήτηση Είδους
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Αναζήτηση Είδους
 DocType: Patient Appointment,Referring Physician,Αναφορικός γιατρός
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Ποσό που καταναλώθηκε
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Καθαρή Αλλαγή σε μετρητά
 DocType: Assessment Plan,Grading Scale,Κλίμακα βαθμολόγησης
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Η μονάδα μέτρησης {0} έχει εισαχθεί περισσότερες από μία φορές στον πίνακας παραγόντων μετατροπής
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,έχουν ήδη ολοκληρωθεί
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Η μονάδα μέτρησης {0} έχει εισαχθεί περισσότερες από μία φορές στον πίνακας παραγόντων μετατροπής
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,έχουν ήδη ολοκληρωθεί
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Χρηματιστήριο στο χέρι
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Αίτηση Πληρωμής υπάρχει ήδη {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Κόστος ειδών που εκδόθηκαν
 DocType: Physician,Hospital,Νοσοκομείο
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Η ποσότητα δεν πρέπει να είναι μεγαλύτερη από {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Η ποσότητα δεν πρέπει να είναι μεγαλύτερη από {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Προηγούμενο οικονομικό έτος δεν έχει κλείσει
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Ηλικία (ημέρες)
 DocType: Quotation Item,Quotation Item,Είδος προσφοράς
@@ -1793,8 +1824,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Κύρια εγγραφή τύπου προμηθευτή.
 DocType: Purchase Order Item,Supplier Part Number,Αριθμός εξαρτήματος του προμηθευτή
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Το ποσοστό μετατροπής δεν μπορεί να είναι 0 ή 1
-DocType: Sales Invoice,Reference Document,έγγραφο αναφοράς
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} έχει ακυρωθεί ή σταματήσει
+DocType: Subscription,Reference Document,έγγραφο αναφοράς
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} έχει ακυρωθεί ή σταματήσει
 DocType: Accounts Settings,Credit Controller,Ελεγκτής πίστωσης
 DocType: Delivery Note,Vehicle Dispatch Date,Ημερομηνία κίνησης οχήματος
 DocType: Healthcare Settings,Default Medical Code Standard,Προεπιλεγμένο πρότυπο ιατρικού κώδικα
@@ -1803,6 +1834,7 @@
 DocType: Company,Default Payable Account,Προεπιλεγμένος λογαριασμός πληρωτέων
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Ρυθμίσεις για το online καλάθι αγορών, όπως οι κανόνες αποστολής, ο τιμοκατάλογος κλπ"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Χρεώθηκαν
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Ταξινόμηση κατά Τιμή ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Δεσμευμένη ποσότητα
 DocType: Party Account,Party Account,Λογαριασμός συμβαλλόμενου
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Ανθρώπινοι πόροι
@@ -1814,13 +1846,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Κάντε εκταμίευση Έναρξη
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Σειρά {0}: Προκαταβολή έναντι Προμηθευτής οφείλει να χρεώσει
 DocType: Company,Default Values,Προεπιλεγμένες Τιμές
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Συχνότητα} Ψηφίστε
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Συχνότητα} Ψηφίστε
 DocType: Expense Claim,Total Amount Reimbursed,Συνολικού ποσού που αποδόθηκε
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Αυτό βασίζεται στα ημερολόγια του κατά αυτό το όχημα. Δείτε χρονοδιάγραμμα παρακάτω για λεπτομέρειες
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Κατά το τιμολόγιο προμηθευτή {0} της {1}
 DocType: Customer,Default Price List,Προεπιλεγμένος τιμοκατάλογος
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,ρεκόρ Κίνηση περιουσιακό στοιχείο {0} δημιουργήθηκε
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Δεν μπορείτε να διαγράψετε Χρήσεως {0}. Φορολογικό Έτος {0} έχει οριστεί ως προεπιλογή στο Καθολικές ρυθμίσεις
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Ένας πελάτης με το ίδιο όνομα υπάρχει ήδη
 DocType: Journal Entry,Entry Type,Τύπος εισόδου
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Δεν υπάρχει σχέδιο αξιολόγησης που να συνδέεται με αυτήν την ομάδα αξιολόγησης
 ,Customer Credit Balance,Υπόλοιπο πίστωσης πελάτη
@@ -1830,7 +1863,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,τιμολόγηση
 DocType: Quotation,Term Details,Λεπτομέρειες όρων
 DocType: Project,Total Sales Cost (via Sales Order),Συνολικό κόστος πωλήσεων (μέσω εντολής πώλησης)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Δεν μπορούν να εγγραφούν περισσότερες από {0} μαθητές για αυτή την ομάδα των σπουδαστών.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Δεν μπορούν να εγγραφούν περισσότερες από {0} μαθητές για αυτή την ομάδα των σπουδαστών.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Αρχικός αριθμός
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} πρέπει να είναι μεγαλύτερη από μηδέν
 DocType: Manufacturing Settings,Capacity Planning For (Days),Ο προγραμματισμός της δυναμικότητας Για (Ημέρες)
@@ -1846,9 +1879,11 @@
 DocType: Lab Test,Technician Name,Όνομα τεχνικού
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Αποσύνδεση Πληρωμή κατά την ακύρωσης της Τιμολόγιο
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Τρέχουσα ανάγνωση οδομέτρων τέθηκε πρέπει να είναι μεγαλύτερη από την αρχική του χιλιομετρητή του οχήματος {0}
+DocType: Restaurant Reservation,No Show,Δεν δείχνουν
 DocType: Shipping Rule Country,Shipping Rule Country,Αποστολές κανόνα της χώρας
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Αφήστε και φοίτηση
 DocType: Maintenance Visit,Partially Completed,Ημιτελής
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Μέτρια ευαισθησία
 DocType: Leave Type,Include holidays within leaves as leaves,"Περιλαμβάνουν διακοπές σε φύλλα, όπως τα φύλλα"
 DocType: Sales Invoice,Packed Items,Συσκευασμένα είδη
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Αξίωση εγγύησης για τον σειριακό αρ.
@@ -1865,13 +1900,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Ποσού που καταβλήθηκε (Εταιρεία νομίσματος)
 DocType: Purchase Invoice,Additional Discount,Επιπλέον έκπτωση
 DocType: Selling Settings,Selling Settings,Ρυθμίσεις πώλησης
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Επιβεβαιώστε τη δράση
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online δημοπρασίες
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Παρακαλώ ορίστε είτε ποσότητα ή τιμή αποτίμησης ή και τα δύο
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Εκπλήρωση
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Προβολή Καλάθι
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Δαπάνες marketing
 ,Item Shortage Report,Αναφορά έλλειψης είδους
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Το βάρος αναφέρεται, \nπαρακαλώ, αναφέρετε επίσης και τη μονάδα μέτρησης βάρους'"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Το βάρος αναφέρεται, \nπαρακαλώ, αναφέρετε επίσης και τη μονάδα μέτρησης βάρους'"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Αίτηση υλικού που χρησιμοποιείται για να γίνει αυτήν η καταχώρnση αποθέματος
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Επόμενο Αποσβέσεις ημερομηνία είναι υποχρεωτική για νέο περιουσιακό στοιχείο
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Ξεχωριστή ομάδα μαθημάτων που βασίζεται σε μαθήματα για κάθε παρτίδα
@@ -1883,12 +1919,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Δημιούργησε λογιστική καταχώρηση για κάθε κίνηση αποθέματος
 DocType: Leave Allocation,Total Leaves Allocated,Σύνολο αδειών που διατέθηκε
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Αποθήκη απαιτείται κατά Row Όχι {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Παρακαλώ εισάγετε ένα έγκυρο οικονομικό έτος ημερομηνίες έναρξης και λήξης
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Παρακαλώ εισάγετε ένα έγκυρο οικονομικό έτος ημερομηνίες έναρξης και λήξης
 DocType: Employee,Date Of Retirement,Ημερομηνία συνταξιοδότησης
 DocType: Upload Attendance,Get Template,Βρες πρότυπο
 DocType: Material Request,Transferred,Μεταφέρθηκε
 DocType: Vehicle,Doors,πόρτες
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,Ρύθμιση ERPNext Πλήρης!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,Ρύθμιση ERPNext Πλήρης!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Συλλογή αμοιβής για εγγραφή ασθενούς
 DocType: Course Assessment Criteria,Weightage,Ζύγισμα
 DocType: Purchase Invoice,Tax Breakup,Φορολογική διακοπή
@@ -1907,36 +1943,36 @@
 DocType: Employee,AB+,ΑΒ +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Εάν αυτό το στοιχείο έχει παραλλαγές, τότε δεν μπορεί να επιλεγεί σε εντολές πώλησης κ.λπ."
 DocType: Lead,Next Contact By,Επόμενη επικοινωνία από
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Η ποσότητα για το είδος {0} στη γραμμή {1} είναι απαραίτητη.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Η ποσότητα για το είδος {0} στη γραμμή {1} είναι απαραίτητη.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},"Η αποθήκη {0} δεν μπορεί να διαγραφεί, γιατί υπάρχει ποσότητα για το είδος {1}"
 DocType: Quotation,Order Type,Τύπος παραγγελίας
-DocType: Purchase Invoice,Notification Email Address,Διεύθυνση email ενημερώσεων
 ,Item-wise Sales Register,Ταμείο πωλήσεων ανά είδος
 DocType: Asset,Gross Purchase Amount,Ακαθάριστο Ποσό Αγορά
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Άνοιγμα υπολοίπων
 DocType: Asset,Depreciation Method,Μέθοδος απόσβεσης
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,offline
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ο φόρος αυτός περιλαμβάνεται στη βασική τιμή;
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Σύνολο στόχου
 DocType: Job Applicant,Applicant for a Job,Αιτών εργασία
 DocType: Production Plan Material Request,Production Plan Material Request,Παραγωγή Αίτημα Σχέδιο Υλικό
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Δεν δημιουργήθηκαν εντολές παραγωγής
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Δεν δημιουργήθηκαν εντολές παραγωγής
 DocType: Stock Reconciliation,Reconciliation JSON,Συμφωνία json
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Πάρα πολλές στήλες. Εξάγετε την έκθεση για να την εκτυπώσετε χρησιμοποιώντας μια εφαρμογή λογιστικών φύλλων.
 DocType: Purchase Invoice Item,Batch No,Αρ. Παρτίδας
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Αίτηση για προσφορά: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Επιτρέψτε πολλαπλές Παραγγελίες εναντίον παραγγελίας του Πελάτη
 DocType: Student Group Instructor,Student Group Instructor,Φοιτητής ομάδας εκπαιδευτών
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Όχι
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Κύριο
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Κύριο
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Παραλλαγή
 DocType: Naming Series,Set prefix for numbering series on your transactions,Ορίστε πρόθεμα για τη σειρά αρίθμησης για τις συναλλαγές σας
 DocType: Employee Attendance Tool,Employees HTML,Οι εργαζόμενοι HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Προεπιλογή BOM ({0}) πρέπει να είναι ενεργή για αυτό το στοιχείο ή το πρότυπο της
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Προεπιλογή BOM ({0}) πρέπει να είναι ενεργή για αυτό το στοιχείο ή το πρότυπο της
 DocType: Employee,Leave Encashed?,Η άδεια εισπράχθηκε;
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Το πεδίο 'ευκαιρία από' είναι υποχρεωτικό
 DocType: Email Digest,Annual Expenses,ετήσια Έξοδα
 DocType: Item,Variants,Παραλλαγές
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Δημιούργησε παραγγελία αγοράς
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Δημιούργησε παραγγελία αγοράς
 DocType: SMS Center,Send To,Αποστολή προς
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Δεν υπάρχει αρκετό υπόλοιπο άδειας για άδειες τύπου {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Ποσό που διατέθηκε
@@ -1952,6 +1988,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Δύναμη ομάδας σπουδαστών
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Κατά την ημερολογιακή εγγραφή {0} δεν έχει καμία αταίριαστη {1} καταχώρηση
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,εκτιμήσεις
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Εκδηλώσεις Εκπαίδευσης
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Διπλότυπος σειριακός αριθμός για το είδος {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Μια συνθήκη για έναν κανόνα αποστολής
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Παρακαλώ περάστε
@@ -1961,7 +1998,7 @@
 DocType: Sales Order,To Deliver and Bill,Για να παρέχουν και να τιμολογούν
 DocType: Student Group,Instructors,εκπαιδευτές
 DocType: GL Entry,Credit Amount in Account Currency,Πιστωτικές Ποσό σε Νόμισμα Λογαριασμού
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,Η Λ.Υ. {0} πρέπει να υποβληθεί
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,Η Λ.Υ. {0} πρέπει να υποβληθεί
 DocType: Authorization Control,Authorization Control,Έλεγχος εξουσιοδότησης
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Σειρά # {0}: Απορρίφθηκε Αποθήκη είναι υποχρεωτική κατά στοιχείο που έχει απορριφθεί {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Πληρωμή
@@ -1980,11 +2017,11 @@
 DocType: Quotation Item,Actual Qty,Πραγματική ποσότητα
 DocType: Sales Invoice Item,References,Παραπομπές
 DocType: Quality Inspection Reading,Reading 10,Μέτρηση 10
-DocType: Hub Settings,Hub Node,Κόμβος Hub
+DocType: Hub Category,Hub Node,Κόμβος Hub
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Έχετε εισάγει διπλότυπα στοιχεία. Παρακαλώ διορθώστε και δοκιμάστε ξανά.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Συνεργάτης
 DocType: Asset Movement,Asset Movement,Asset Κίνημα
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,νέα καλαθιού
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,νέα καλαθιού
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Το είδος {0} δεν είναι είδος μίας σειράς
 DocType: SMS Center,Create Receiver List,Δημιουργία λίστας παραλήπτη
 DocType: Vehicle,Wheels,τροχοί
@@ -1998,15 +2035,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Τηλεπικοινωνίες
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Δηλώνει ότι το συσκευασία είναι ένα μέρος αυτής της παράδοσης (μόνο πρόχειρο)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Δημιούργησε καταχώηρση πληρωμής
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Η ποσότητα για το είδος {0} πρέπει να είναι λιγότερη από {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Η ποσότητα για το είδος {0} πρέπει να είναι λιγότερη από {1}
 ,Sales Invoice Trends,Τάσεις τιμολογίου πώλησης
 DocType: Leave Application,Apply / Approve Leaves,Εφαρμογή / έγκριση αδειών
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Για
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Για
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Μπορεί να παραπέμψει σε γραμμή μόνο εφόσον ο τύπος χρέωσης είναι ποσό προηγούμενης γραμμής ή σύνολο προηγούμενης γραμμής
 DocType: Sales Order Item,Delivery Warehouse,Αποθήκη Παράδοση
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Δέντρο των Κέντρων οικονομικό κόστος.
 DocType: Serial No,Delivery Document No,Αρ. εγγράφου παράδοσης
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Παρακαλούμε να ορίσετε &#39;Ο λογαριασμός / Ζημιά Κέρδος Asset διάθεσης »στην εταιρεία {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Παρακαλούμε να ορίσετε &#39;Ο λογαριασμός / Ζημιά Κέρδος Asset διάθεσης »στην εταιρεία {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Πάρετε τα στοιχεία από τις πωλήσεις παραγγελίες
 DocType: Serial No,Creation Date,Ημερομηνία δημιουργίας
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Το είδος {0} εμφανίζεται πολλές φορές στον τιμοκατάλογο {1}
@@ -2017,11 +2054,12 @@
 DocType: Student,Student Mobile Number,Φοιτητής Αριθμός Κινητού
 DocType: Item,Has Variants,Έχει παραλλαγές
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Ενημέρωση απόκρισης
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Έχετε ήδη επιλεγμένα αντικείμενα από {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Έχετε ήδη επιλεγμένα αντικείμενα από {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Όνομα της μηνιαίας διανομής
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Το αναγνωριστικό παρτίδας είναι υποχρεωτικό
 DocType: Sales Person,Parent Sales Person,Γονικός πωλητής
-DocType: Purchase Invoice,Recurring Invoice,Επαναλαμβανόμενο τιμολόγιο
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Υψηλή προς Χαμηλή
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Επιλέξτε πρώτα το πρόγραμμα
 DocType: Patient Appointment,Patient Age,Ηλικία ασθενούς
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Διαχείριση έργων
 DocType: Supplier,Supplier of Goods or Services.,Προμηθευτής αγαθών ή υπηρεσιών.
@@ -2029,8 +2067,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Προκαθορισμένοι εισπρακτέοι λογαριασμοί που πρέπει να χρησιμοποιηθούν εάν δεν έχουν οριστεί στον Ασθενή για την κράτηση των τελών διαβούλευσης.
 DocType: Vehicle Log,Fuel Price,των τιμών των καυσίμων
 DocType: Budget,Budget,Προϋπολογισμός
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Ορίστε Άνοιγμα
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Πάγιο περιουσιακό στοιχείο πρέπει να είναι ένα στοιχείο μη διαθέσιμο.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Ορίστε Άνοιγμα
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Πάγιο περιουσιακό στοιχείο πρέπει να είναι ένα στοιχείο μη διαθέσιμο.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Ο προϋπολογισμός δεν μπορεί να αποδοθεί κατά {0}, δεδομένου ότι δεν είναι ένας λογαριασμός έσοδα ή έξοδα"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Επιτεύχθηκε
 DocType: Student Admission,Application Form Route,Αίτηση Διαδρομή
@@ -2044,12 +2082,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Το είδος {0} δεν είναι στημένο για σειριακούς αριθμούς. Ελέγξτε την κύρια εγγραφή είδους
 DocType: Maintenance Visit,Maintenance Time,Ώρα συντήρησης
 ,Amount to Deliver,Ποσό Παράδοση
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Το ίδιο στοιχείο εισήχθη πολλές φορές. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Η Ημερομηνία Τίτλος έναρξης δεν μπορεί να είναι νωρίτερα από το έτος έναρξης Ημερομηνία του Ακαδημαϊκού Έτους στην οποία ο όρος συνδέεται (Ακαδημαϊκό Έτος {}). Διορθώστε τις ημερομηνίες και προσπαθήστε ξανά.
 DocType: Guardian,Guardian Interests,Guardian Ενδιαφέροντα
 DocType: Naming Series,Current Value,Τρέχουσα αξία
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Υπάρχουν πολλαπλές χρήσεις για την ημερομηνία {0}. Παρακαλούμε να ορίσετε την εταιρεία κατά το οικονομικό έτος
 DocType: School Settings,Instructor Records to be created by,Εγγραφές εκπαιδευτών που θα δημιουργηθούν από το
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} Δημιουργήθηκε
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} Δημιουργήθηκε
 DocType: Delivery Note Item,Against Sales Order,Κατά την παραγγελία πώλησης
 ,Serial No Status,Κατάσταση σειριακού αριθμού
 DocType: Payment Entry Reference,Outstanding,Εκκρεμής
@@ -2059,10 +2098,10 @@
 						must be greater than or equal to {2}","Γραμμή {0}: για να ρυθμίσετε {1} περιοδικότητα, η διαφορά μεταξύ της ημερομηνίας από και έως \ πρέπει να είναι μεγαλύτερη ή ίση με {2}"""
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Αυτό βασίζεται στην κίνηση των αποθεμάτων. Δείτε {0} για λεπτομέρειες
 DocType: Pricing Rule,Selling,Πώληση
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Ποσό {0} {1} αφαιρούνται από {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Ποσό {0} {1} αφαιρούνται από {2}
 DocType: Employee,Salary Information,Πληροφορίες μισθού
 DocType: Sales Person,Name and Employee ID,Όνομα και ID υπαλλήλου
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Η ημερομηνία λήξης προθεσμίας δεν μπορεί να είναι πριν από την ημερομηνία αποστολής
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Η ημερομηνία λήξης προθεσμίας δεν μπορεί να είναι πριν από την ημερομηνία αποστολής
 DocType: Website Item Group,Website Item Group,Ομάδα ειδών δικτυακού τόπου
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Δασμοί και φόροι
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Παρακαλώ εισάγετε την ημερομηνία αναφοράς
@@ -2088,7 +2127,7 @@
 DocType: Issue,Resolution Details,Λεπτομέρειες επίλυσης
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,χορηγήσεις
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Κριτήρια αποδοχής
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Παρακαλούμε, εισάγετε αιτήσεις Υλικό στον παραπάνω πίνακα"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,"Παρακαλούμε, εισάγετε αιτήσεις Υλικό στον παραπάνω πίνακα"
 DocType: Item Attribute,Attribute Name,Χαρακτηριστικό όνομα
 DocType: BOM,Show In Website,Εμφάνιση στην ιστοσελίδα
 DocType: Shopping Cart Settings,Show Quantity in Website,Εμφάνιση Ποσότητα στην ιστοσελίδα
@@ -2097,7 +2136,7 @@
 DocType: Item Reorder,Check in (group),Άφιξη (ομάδα)
 ,Qty to Order,Ποσότητα για παραγγελία
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Η κεφαλή του λογαριασμού κάτω από υποχρέωση ή ίδια κεφάλαια, στην οποία θα κρατηθεί Κέρδη / Ζημιές"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Διάγραμμα gantt όλων των εργασιών.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Διάγραμμα gantt όλων των εργασιών.
 DocType: Opportunity,Mins to First Response,Λεπτά για να First Response
 DocType: Pricing Rule,Margin Type,περιθώριο Τύπος
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} ώρες
@@ -2118,35 +2157,35 @@
 DocType: Patient,Surgical History,Χειρουργική Ιστορία
 DocType: Employee,Resignation Letter Date,Ημερομηνία επιστολής παραίτησης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Οι κανόνες τιμολόγησης φιλτράρονται περαιτέρω με βάση την ποσότητα.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Ρυθμίστε την Ημερομηνία Σύνδεσης για το {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Ρυθμίστε την Ημερομηνία Σύνδεσης για το {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Συνολικό Ποσό χρέωσης (μέσω Ώρα Φύλλο)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Έσοδα επαναλαμβανόμενων πελατών
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) Πρέπει να έχει ρόλο «υπεύθυνος έγκρισης δαπανών»
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Ζεύγος
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Επιλέξτε BOM και Ποσότητα Παραγωγής
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Επιλέξτε BOM και Ποσότητα Παραγωγής
 DocType: Asset,Depreciation Schedule,Πρόγραμμα αποσβέσεις
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Διευθύνσεις συνεργατών πωλήσεων και επαφές
 DocType: Bank Reconciliation Detail,Against Account,Κατά τον λογαριασμό
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Μισό Ημερομηνία Ημέρα θα πρέπει να είναι μεταξύ Από Ημερομηνία και μέχρι σήμερα
 DocType: Maintenance Schedule Detail,Actual Date,Πραγματική ημερομηνία
 DocType: Item,Has Batch No,Έχει αρ. Παρτίδας
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Ετήσια Χρέωση: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Ετήσια Χρέωση: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Φόρος αγαθών και υπηρεσιών (GST Ινδία)
 DocType: Delivery Note,Excise Page Number,Αριθμός σελίδας έμμεσης εσωτερικής φορολογίας
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Η εταιρεία, Από Ημερομηνία και μέχρι σήμερα είναι υποχρεωτική"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Πάρτε από τη διαβούλευση
 DocType: Asset,Purchase Date,Ημερομηνία αγοράς
 DocType: Employee,Personal Details,Προσωπικά στοιχεία
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Παρακαλούμε να ορίσετε «Asset Κέντρο Αποσβέσεις Κόστους» στην εταιρεία {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Παρακαλούμε να ορίσετε «Asset Κέντρο Αποσβέσεις Κόστους» στην εταιρεία {0}
 ,Maintenance Schedules,Χρονοδιαγράμματα συντήρησης
 DocType: Task,Actual End Date (via Time Sheet),Πραγματική Ημερομηνία λήξης (μέσω Ώρα Φύλλο)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Ποσό {0} {1} από {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Ποσό {0} {1} από {2} {3}
 ,Quotation Trends,Τάσεις προσφορών
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Η ομάδα είδους δεν αναφέρεται στην κύρια εγγραφή είδους για το είδος {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Ο 'λογαριασμός χρέωσης προς' Χρέωση του λογαριασμού πρέπει να είναι λογαριασμός απαιτήσεων
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Ο 'λογαριασμός χρέωσης προς' Χρέωση του λογαριασμού πρέπει να είναι λογαριασμός απαιτήσεων
 DocType: Shipping Rule Condition,Shipping Amount,Κόστος αποστολής
 DocType: Supplier Scorecard Period,Period Score,Αποτέλεσμα περιόδου
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Προσθέστε πελάτες
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Προσθέστε πελάτες
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Ποσό που εκκρεμεί
 DocType: Lab Test Template,Special,Ειδικός
 DocType: Purchase Invoice Item,Conversion Factor,Συντελεστής μετατροπής
@@ -2154,13 +2193,14 @@
 ,Vehicle Expenses,Έξοδα όχημα
 DocType: Serial No,Invoice Details,Λεπτομέρειες τιμολογίου
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Αναμενόμενη τιμή μετά την ωφέλιμη ζωή πρέπει να είναι μεγαλύτερη ή ίση με {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Ξεκινήστε
+DocType: Hub Category,Hub Category,Κατηγορία Hub
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Αριθμός Οχημάτων
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,Η ημερομηνία κατά την οποία το επαναλαμβανόμενο τιμολόγιο θα σταματήσει
 DocType: Employee Loan,Loan Amount,Ποσο δανειου
 DocType: Program Enrollment,Self-Driving Vehicle,Αυτοκίνητο όχημα
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Βαθμολογία προμηθευτή Scorecard
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Row {0}: Κατάλογος Υλικών δεν βρέθηκε για την Θέση {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Row {0}: Κατάλογος Υλικών δεν βρέθηκε για την Θέση {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,"Σύνολο των κατανεμημένων φύλλα {0} δεν μπορεί να είναι μικρότερη από ό, τι έχει ήδη εγκριθεί φύλλα {1} για την περίοδο"
 DocType: Journal Entry,Accounts Receivable,Εισπρακτέοι λογαριασμοί
 ,Supplier-Wise Sales Analytics,Αναφορές πωλήσεων ανά προμηθευτή
@@ -2171,7 +2211,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Μάθημα γονέων (Αφήστε κενό, αν αυτό δεν είναι μέρος του μαθήματος γονέων)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Άφησε το κενό αν ισχύει για όλους τους τύπους των υπαλλήλων
 DocType: Landed Cost Voucher,Distribute Charges Based On,Επιμέρησε τα κόστη μεταφοράς σε όλα τα είδη.
-apps/erpnext/erpnext/hooks.py +131,Timesheets,φύλλων
+apps/erpnext/erpnext/hooks.py +140,Timesheets,φύλλων
 DocType: HR Settings,HR Settings,Ρυθμίσεις ανθρωπίνου δυναμικού
 DocType: Salary Slip,net pay info,καθαρών αποδοχών πληροφορίες
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Αυτή η τιμή ενημερώνεται στον κατάλογο προεπιλεγμένων τιμών πωλήσεων.
@@ -2182,7 +2222,7 @@
 DocType: Patient,B Positive,Β Θετικό
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Σειρά # {0}: Ποσότητα πρέπει να είναι 1, ως στοιχείο αποτελεί πάγιο περιουσιακό στοιχείο. Παρακαλούμε χρησιμοποιήστε ξεχωριστή σειρά για πολλαπλές ποσότητα."
 DocType: Leave Block List Allow,Leave Block List Allow,Επίτρεψε λίστα αποκλεισμού ημερών άδειας
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Συντ δεν μπορεί να είναι κενό ή χώρος
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Συντ δεν μπορεί να είναι κενό ή χώρος
 DocType: Patient Medical Record,Patient Medical Record,Ιατρικό αρχείο ασθενούς
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Ομάδα για να μη Ομάδα
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Αθλητισμός
@@ -2198,9 +2238,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Δεν βρέθηκε συναλλαγματική ισοτιμία {0} έως {1} για ημερομηνία κλειδιού {2}. Δημιουργήστε μια εγγραφή συναλλάγματος με μη αυτόματο τρόπο
 DocType: POS Profile,Price List,Τιμοκατάλογος
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} Είναι τώρα η προεπιλεγμένη χρήση. Παρακαλώ ανανεώστε το πρόγραμμα περιήγησής σας για να τεθεί σε ισχύ η αλλαγή.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Απαιτήσεις Εξόδων
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Απαιτήσεις Εξόδων
 DocType: Issue,Support,Υποστήριξη
 ,BOM Search,BOM Αναζήτηση
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Δημοσιεύστε &quot;Διαθέσιμο&quot; ή &quot;Δεν είναι διαθέσιμο&quot; στο Hub βάσει του διαθέσιμου αποθέματος σε αυτήν την αποθήκη.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Κλείσιμο (Άνοιγμα + Σύνολα)
 DocType: Vehicle,Fuel Type,Τύπος καυσίμου
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Παρακαλώ ορίστε το νόμισμα στην εταιρεία
@@ -2212,16 +2253,16 @@
 DocType: Healthcare Settings,Remind Before,Υπενθύμιση Πριν
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Ο συντελεστής μετατροπής Μ.Μ. είναι απαραίτητος στη γραμμή {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Σειρά # {0}: Έγγραφο Αναφοράς Τύπος πρέπει να είναι ένα από τα Πωλήσεις Τάξης, Τιμολόγιο Πωλήσεων ή Εφημερίδα Έναρξη"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Σειρά # {0}: Έγγραφο Αναφοράς Τύπος πρέπει να είναι ένα από τα Πωλήσεις Τάξης, Τιμολόγιο Πωλήσεων ή Εφημερίδα Έναρξη"
 DocType: Salary Component,Deduction,Κρατήση
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Σειρά {0}: από το χρόνο και τον χρόνο είναι υποχρεωτική.
 DocType: Stock Reconciliation Item,Amount Difference,ποσό Διαφορά
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Είδους Τιμή προστεθεί {0} στην Τιμοκατάλογος {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Είδους Τιμή προστεθεί {0} στην Τιμοκατάλογος {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Παρακαλώ εισάγετε το αναγνωριστικό Υπάλληλος αυτό το άτομο πωλήσεων
 DocType: Territory,Classification of Customers by region,Ταξινόμηση των πελατών ανά περιοχή
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Διαφορά Ποσό πρέπει να είναι μηδέν
 DocType: Project,Gross Margin,Μικτό Περιθώριο Κέρδους
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Παρακαλώ εισάγετε πρώτα το είδος παραγωγής
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Παρακαλώ εισάγετε πρώτα το είδος παραγωγής
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Υπολογιζόμενο Τράπεζα ισορροπία Δήλωση
 DocType: Normal Test Template,Normal Test Template,Πρότυπο πρότυπο δοκιμής
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Απενεργοποιημένος χρήστης
@@ -2231,21 +2272,22 @@
 DocType: Salary Slip,Total Deduction,Συνολική έκπτωση
 ,Production Analytics,παραγωγή Analytics
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,"Αυτό βασίζεται σε συναλλαγές κατά αυτού του Ασθενούς. Για λεπτομέρειες, δείτε την παρακάτω γραμμή χρόνου"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Κόστος Ενημερώθηκε
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Κόστος Ενημερώθηκε
 DocType: Employee,Date of Birth,Ημερομηνία γέννησης
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Το είδος {0} έχει ήδη επιστραφεί
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Η χρήση ** αντιπροσωπεύει ένα οικονομικό έτος. Όλες οι λογιστικές εγγραφές και άλλες σημαντικές συναλλαγές παρακολουθούνται ανά ** χρήση **.
 DocType: Opportunity,Customer / Lead Address,Πελάτης / διεύθυνση Σύστασης
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Ρύθμιση πίνακα καρτών προμηθευτή
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Προειδοποίηση: Μη έγκυρο πιστοποιητικό SSL στο συνημμένο {0}
-DocType: Student Admission,Eligibility,Αιρετότητα
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Όνομα σχεδίου αξιολόγησης
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Προειδοποίηση: Μη έγκυρο πιστοποιητικό SSL στο συνημμένο {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Οδηγεί σας βοηθήσει να πάρετε την επιχείρησή, προσθέστε όλες τις επαφές σας και περισσότερο, όπως σας οδηγεί"
 DocType: Production Order Operation,Actual Operation Time,Πραγματικός χρόνος λειτουργίας
 DocType: Authorization Rule,Applicable To (User),Εφαρμοστέα σε (user)
 DocType: Purchase Taxes and Charges,Deduct,Αφαίρεσε
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Περιγραφή Δουλειάς
 DocType: Student Applicant,Applied,Εφαρμοσμένος
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Άνοιγμα ξανά
 DocType: Sales Invoice Item,Qty as per Stock UOM,Ποσότητα σύμφωνα με τη Μ.Μ. Αποθέματος
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Όνομα Guardian2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Ειδικοί χαρακτήρες εκτός από ""-"", ""#"", ""."" and ""/"" δεν επιτρέπονται στην σειρά ονομασίας"
@@ -2257,7 +2299,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Υπεύθυνος παραγωγής
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Ο σειριακός αριθμός {0} έχει εγγύηση μέχρι {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Χώρισε το δελτίο αποστολής σημείωση σε πακέτα.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Αποστολές
+apps/erpnext/erpnext/hooks.py +107,Shipments,Αποστολές
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Συνολικό ποσό που χορηγήθηκε (Εταιρεία νομίσματος)
 DocType: Purchase Order Item,To be delivered to customer,Να παραδοθεί στον πελάτη
 DocType: BOM,Scrap Material Cost,Άχρηστα Υλικών Κατασκευής Νέων Κτιρίων
@@ -2279,8 +2321,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Ρυθμίσεις παραλλαγής αντικειμένου
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Επιλέξτε εταιρία...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Άφησε το κενό αν ισχύει για όλα τα τμήματα
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Μορφές απασχόλησης ( μόνιμη, σύμβαση, πρακτική άσκηση κ.λ.π. )."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},Η {0} είναι απαραίτητη για το είδος {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Μορφές απασχόλησης ( μόνιμη, σύμβαση, πρακτική άσκηση κ.λ.π. )."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},Η {0} είναι απαραίτητη για το είδος {1}
 DocType: Process Payroll,Fortnightly,Κατά δεκατετραήμερο
 DocType: Currency Exchange,From Currency,Από το νόμισμα
 DocType: Vital Signs,Weight (In Kilogram),Βάρος (σε χιλιόγραμμα)
@@ -2304,7 +2346,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος' για να δείτε το πρόγραμμα
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Υπήρξαν σφάλματα κατά τη διαγραφή ακόλουθα δρομολόγια:
 DocType: Bin,Ordered Quantity,Παραγγελθείσα ποσότητα
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",Π.Χ. Χτίστε εργαλεία για τους κατασκευαστές '
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",Π.Χ. Χτίστε εργαλεία για τους κατασκευαστές '
 DocType: Grading Scale,Grading Scale Intervals,Διαστήματα Κλίμακα βαθμολόγησης
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: λογιστική καταχώριση για {2} μπορεί να γίνει μόνο στο νόμισμα: {3}
 DocType: Production Order,In Process,Σε επεξεργασία
@@ -2327,11 +2369,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Με την πληρωμή του φόρου
 DocType: Expense Claim Detail,Expense Claim Detail,Λεπτομέρειες αξίωσης δαπανών
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,ΤΡΙΛΙΚΑ ΓΙΑ ΠΡΟΜΗΘΕΥΤΗ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Παρακαλώ επιλέξτε σωστό λογαριασμό
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Παρακαλώ επιλέξτε σωστό λογαριασμό
 DocType: Item,Weight UOM,Μονάδα μέτρησης βάρους
 DocType: Salary Structure Employee,Salary Structure Employee,Δομή μισθό του υπαλλήλου
 DocType: Patient,Blood Group,Ομάδα αίματος
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Εκκρεμής
 DocType: Course,Course Name,Όνομα Μαθήματος
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Χρήστες που μπορούν να εγκρίνουν αιτήσεις για έναν συγκεκριμένο εργαζόμενο
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Εξοπλισμός γραφείου
@@ -2350,7 +2391,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Οι τιμές δεν θα εμφανίζεται αν Τιμοκατάλογος δεν έχει οριστεί
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Προσδιορίστε μια χώρα για αυτή την αποστολή κανόνα ή ελέγξτε Παγκόσμια ναυτιλία
 DocType: Stock Entry,Total Incoming Value,Συνολική εισερχόμενη αξία
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Χρεωστικό να απαιτείται
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Χρεωστικό να απαιτείται
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Φύλλων βοηθήσει να παρακολουθείτε την ώρα, το κόστος και τη χρέωση για δραστηριότητες γίνεται από την ομάδα σας"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Τιμοκατάλογος αγορών
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Πρότυπα των μεταβλητών βαθμολογίας του προμηθευτή.
@@ -2360,7 +2401,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Συμφωνία πληρωμής
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Παρακαλώ επιλέξτε το όνομα υπευθύνου
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Τεχνολογία
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Το σύνολο των απλήρωτων: {0}
+DocType: Hub Settings,Unregister from Hub,Καταργήστε την εγγραφή από το Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Το σύνολο των απλήρωτων: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM λειτουργίας της ιστοσελίδας
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Επιστολή Προσφοράς
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Δημιουργία αιτήσεων υλικών (mrp) και εντολών παραγωγής.
@@ -2372,7 +2414,9 @@
 DocType: Physician Schedule Time Slot,To Time,Έως ώρα
 DocType: Authorization Rule,Approving Role (above authorized value),Έγκριση Ρόλος (πάνω από εξουσιοδοτημένο αξία)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Ο λογαριασμός πίστωσης πρέπει να είναι πληρωτέος λογαριασμός
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},Αναδρομή Λ.Υ.: {0} δεν μπορεί να είναι γονέας ή τέκνο της {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Επιλέξτε φοιτητική εισαγωγή, η οποία είναι υποχρεωτική για τον αιτούντα πληρωμένο φοιτητή"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},Αναδρομή Λ.Υ.: {0} δεν μπορεί να είναι γονέας ή τέκνο της {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Επιλέξτε τιμοκατάλογο για να δημοσιεύσετε τιμολόγηση
 DocType: Production Order Operation,Completed Qty,Ολοκληρωμένη ποσότητα
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Για {0}, μόνο χρεωστικοί λογαριασμοί μπορούν να συνδέονται με άλλες καταχωρήσεις πίστωσης"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Ο τιμοκατάλογος {0} είναι απενεργοποιημένος
@@ -2384,38 +2428,39 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} αύξοντες αριθμούς που απαιτούνται για τη θέση {1}. Έχετε προβλέπεται {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Τρέχουσα Αποτίμηση Τιμή
 DocType: Item,Customer Item Codes,Θέση Πελάτη Κώδικες
+DocType: Training Event,Advance,Προκαταβολή
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,για την επανάληψη της επανάληψης.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Ανταλλαγή Κέρδος / Ζημιά
 DocType: Opportunity,Lost Reason,Αιτιολογία απώλειας
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Νέα Διεύθυνση
 DocType: Quality Inspection,Sample Size,Μέγεθος δείγματος
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,"Παρακαλούμε, εισάγετε παραστατικό παραλαβής"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Όλα τα είδη έχουν ήδη τιμολογηθεί
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Καθορίστε μια έγκυρη τιμή στο πεδίο 'από τον αρ. Υπόθεσης'
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',Καθορίστε μια έγκυρη τιμή στο πεδίο 'από τον αρ. Υπόθεσης'
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Περαιτέρω κέντρα κόστους μπορεί να γίνει κάτω από ομάδες, αλλά εγγραφές μπορούν να γίνουν με την μη Ομάδες"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Χρήστες και δικαιώματα
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Εντολές Παραγωγής Δημιουργήθηκε: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Εντολές Παραγωγής Δημιουργήθηκε: {0}
 DocType: Branch,Branch,Υποκατάστημα
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Εκτύπωσης και Branding
 DocType: Company,Total Monthly Sales,Συνολικές μηνιαίες πωλήσεις
 DocType: Bin,Actual Quantity,Πραγματική ποσότητα
 DocType: Shipping Rule,example: Next Day Shipping,Παράδειγμα: αποστολή την επόμενη μέρα
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Ο σειριακός αριθμός {0} δεν βρέθηκε
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Η συνδρομή ήταν {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Η συνδρομή ήταν {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Πρόγραμμα προγράμματος χρεώσεων
 DocType: Fee Schedule Program,Student Batch,Batch φοιτητής
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,επιλέξτε * από τα &#39;tabVital Signs&#39; όπου patient = &#39;{0}&#39; παραγγείλετε με signs_date desc limit 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Κάντε Φοιτητής
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Ελάχιστη Βαθμολογία
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Έχετε προσκληθεί να συνεργαστούν για το έργο: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Ο γιατρός δεν είναι διαθέσιμος στις {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Έχετε προσκληθεί να συνεργαστούν για το έργο: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Ο γιατρός δεν είναι διαθέσιμος στις {0}
 DocType: Leave Block List Date,Block Date,Αποκλεισμός ημερομηνίας
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Προσθέστε προσαρμοσμένο αναγνωριστικό εγγραφής πεδίου στο doctype {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Σημείωση για την παράδοση του προμηθευτή
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Κάνε αίτηση τώρα
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Κάνε αίτηση τώρα
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Ποσότητα πραγματικού {0} / Ποσό αναμονής {1}
 DocType: Purchase Invoice,E-commerce GSTIN,Ηλεκτρονικό εμπόριο GSTIN
 DocType: Sales Order,Not Delivered,Δεν έχει παραδοθεί
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Η αναμενόμενη ημερομηνία δεν μπορεί να είναι πριν από την Ημερομηνία συναλλαγής
 ,Bank Clearance Summary,Περίληψη εκκαθάρισης τράπεζας
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Δημιουργία και διαχείριση ημερησίων, εβδομαδιαίων και μηνιαίων ενημερώσεν email."
 DocType: Appraisal Goal,Appraisal Goal,Στόχος αξιολόγησης
@@ -2423,12 +2468,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,κτίρια
 DocType: Fee Schedule,Fee Structure,Δομή χρέωση
 DocType: Timesheet Detail,Costing Amount,Κοστολόγηση Ποσό
-DocType: Student Admission,Application Fee,Τέλη της αίτησης
+DocType: Student Admission Program,Application Fee,Τέλη της αίτησης
 DocType: Process Payroll,Submit Salary Slip,Υποβολή βεβαίωσης αποδοχών
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Η μέγιστη έκπτωση για το είδος {0} είναι {1} %
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Η μέγιστη έκπτωση για το είδος {0} είναι {1} %
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Εισαγωγή χύδην
 DocType: Sales Partner,Address & Contacts,Διεύθυνση & Επαφές
 DocType: SMS Log,Sender Name,Όνομα αποστολέα
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Ταξινόμηση βάσει κριτηρίων
 DocType: POS Profile,[Select],[ Επιλέξτε ]
 DocType: Vital Signs,Blood Pressure (diastolic),Πίεση αίματος (διαστολική)
 DocType: SMS Log,Sent To,Αποστέλλονται
@@ -2437,7 +2483,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Επόμενο Ημερομηνία Επικοινωνήστε δεν μπορεί να είναι στο παρελθόν
 DocType: Company,For Reference Only.,Για αναφορά μόνο.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Ο γιατρός {0} δεν είναι διαθέσιμος στις {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Επιλέξτε Αριθμός παρτίδας
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Επιλέξτε Αριθμός παρτίδας
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Άκυρη {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-αναδρομική έναρξη
 DocType: Fee Validity,Reference Inv,Αναφορά Inv
@@ -2453,15 +2499,15 @@
 DocType: Normal Test Items,Require Result Value,Απαιτείται τιμή αποτελέσματος
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Ο αρ. Υπόθεσης δεν μπορεί να είναι 0
 DocType: Item,Show a slideshow at the top of the page,Δείτε μια παρουσίαση στην κορυφή της σελίδας
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,BOMs
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Καταστήματα
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,BOMs
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Καταστήματα
 DocType: Project Type,Projects Manager,Υπεύθυνος έργων
 DocType: Serial No,Delivery Time,Χρόνος παράδοσης
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Γήρανση με βάση την
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Το ραντεβού ακυρώθηκε
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Το ραντεβού ακυρώθηκε
 DocType: Item,End of Life,Τέλος της ζωής
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Ταξίδι
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Δεν ενεργή ή προεπιλογή Μισθός Δομή βρέθηκαν για εργαζόμενο {0} για τις δεδομένες ημερομηνίες
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Ταξίδι
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Δεν ενεργή ή προεπιλογή Μισθός Δομή βρέθηκαν για εργαζόμενο {0} για τις δεδομένες ημερομηνίες
 DocType: Leave Block List,Allow Users,Επίστρεψε χρήστες
 DocType: Purchase Order,Customer Mobile No,Κινητό αριθ Πελατών
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Επαναλαμβανόμενες
@@ -2470,12 +2516,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Ενημέρωση κόστους
 DocType: Item Reorder,Item Reorder,Αναδιάταξη είδους
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Εμφάνιση Μισθός Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Μεταφορά υλικού
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Μεταφορά υλικού
 DocType: Fees,Send Payment Request,Αίτηση πληρωμής
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Καθορίστε τις λειτουργίες, το κόστος λειτουργίας και να δώστε ένα μοναδικό αριθμό λειτουργίας στις λειτουργίες σας."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Το έγγραφο αυτό είναι πάνω από το όριο του {0} {1} για το στοιχείο {4}. Κάνετε μια άλλη {3} κατά την ίδια {2};
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Παρακαλούμε να ορίσετε επαναλαμβανόμενες μετά την αποθήκευση
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,υπόψη το ποσό Επιλέξτε αλλαγή
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,υπόψη το ποσό Επιλέξτε αλλαγή
 DocType: Purchase Invoice,Price List Currency,Νόμισμα τιμοκαταλόγου
 DocType: Naming Series,User must always select,Ο χρήστης πρέπει πάντα να επιλέγει
 DocType: Stock Settings,Allow Negative Stock,Επίτρεψε αρνητικό απόθεμα
@@ -2495,7 +2541,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Υπάλληλος
 DocType: Sample Collection,Collected Time,Συλλεγμένος χρόνος
 DocType: Company,Sales Monthly History,Μηνιαίο ιστορικό πωλήσεων
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Επιλέξτε Παρτίδα
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Επιλέξτε Παρτίδα
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} είναι πλήρως τιμολογημένο
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Ζωτικά σημάδια
 DocType: Training Event,End Time,Ώρα λήξης
@@ -2503,16 +2549,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Μειώσεις πληρωμής ή απώλειας
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Πρότυποι όροι σύμβασης για πωλήσεις ή αγορές.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Ομαδοποίηση κατά αποδεικτικό
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Είστε βέβαιοι ότι θέλετε να ακυρώσετε αυτό το ραντεβού;
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Pipeline πωλήσεις
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Παρακαλούμε να ορίσετε προεπιλεγμένο λογαριασμό στο Μισθός Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Απαιτείται στις
 DocType: Rename Tool,File to Rename,Αρχείο μετονομασίας
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Επιλέξτε BOM για τη θέση στη σειρά {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Επιλέξτε BOM για τη θέση στη σειρά {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Ο λογαριασμός {0} δεν αντιστοιχεί στην εταιρεία {1} στη λειτουργία λογαριασμού: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Η συγκεκριμμένη Λ.Υ. {0} δεν υπάρχει για το είδος {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Το χρονοδιάγραμμα συντήρησης {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
+DocType: POS Profile,Applicable for Users,Ισχύει για χρήστες
 DocType: Notification Control,Expense Claim Approved,Εγκρίθηκε η αξίωση δαπανών
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Μισθός Slip των εργαζομένων {0} έχει ήδη δημιουργηθεί για την περίοδο αυτή
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Μισθός Slip των εργαζομένων {0} έχει ήδη δημιουργηθεί για την περίοδο αυτή
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Φαρμακευτικός
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Το κόστος των αγορασθέντων ειδών
 DocType: Selling Settings,Sales Order Required,Η παραγγελία πώλησης είναι απαραίτητη
@@ -2536,6 +2584,7 @@
 DocType: Offer Letter,Accepted,Αποδεκτό
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Οργάνωση
 DocType: BOM Update Tool,BOM Update Tool,Εργαλείο ενημέρωσης BOM
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Δεν έχει προσδιοριστεί ο λογαριασμός σε συμβαλλόμενο μέρος, παρακαλούμε να ορίσετε προεπιλεγμένο λογαριασμό συμβολαίου στην εταιρεία"
 DocType: SG Creation Tool Course,Student Group Name,Όνομα ομάδας φοιτητής
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Δημιουργία τελών
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Παρακαλώ βεβαιωθείτε ότι έχετε πραγματικά θέλετε να διαγράψετε όλες τις συναλλαγές για την εν λόγω εταιρεία. Τα δεδομένα της κύριας σας θα παραμείνει ως έχει. Αυτή η ενέργεια δεν μπορεί να αναιρεθεί.
@@ -2544,29 +2593,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) Δεν μπορεί να είναι μεγαλύτερη από τη προβλεπόμενη ποσότητα ({2}) της Εντολής Παραγωγής  {3}
 DocType: Shipping Rule,Shipping Rule Label,Ετικέτα κανόνα αποστολής
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Φόρουμ Χρηστών
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Το πεδίο πρώτων ύλών δεν μπορεί να είναι κενό.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Δεν ήταν δυνατή η ενημέρωση των αποθεμάτων, τιμολόγιο περιέχει πτώση στέλνοντας στοιχείο."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Το πεδίο πρώτων ύλών δεν μπορεί να είναι κενό.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Δεν ήταν δυνατή η ενημέρωση των αποθεμάτων, τιμολόγιο περιέχει πτώση στέλνοντας στοιχείο."
 DocType: Lab Test Sample,Lab Test Sample,Δοκιμαστικό δείγμα εργαστηρίου
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Γρήγορη Εφημερίδα Είσοδος
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Δεν μπορείτε να αλλάξετε τιμοκατάλογο, αν η λίστα υλικών αναφέρεται σε οποιουδήποτε είδος"
+DocType: Restaurant,Invoice Series Prefix,Πρόθεμα σειράς τιμολογίων
 DocType: Employee,Previous Work Experience,Προηγούμενη εργασιακή εμπειρία
 DocType: Stock Entry,For Quantity,Για Ποσότητα
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Παρακαλώ εισάγετε προγραμματισμένη ποσότητα για το είδος {0} στη γραμμή {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Παρακαλώ εισάγετε προγραμματισμένη ποσότητα για το είδος {0} στη γραμμή {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} Δεν έχει υποβληθεί
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Αιτήσεις για είδη
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Μια ξεχωριστή εντολή παραγωγής θα δημιουργηθεί για κάθε τελικό καλό είδος.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} πρέπει να είναι αρνητική στο έγγραφο επιστροφή
 ,Minutes to First Response for Issues,Λεπτά για να First Response για θέματα
 DocType: Purchase Invoice,Terms and Conditions1,Όροι και προϋποθέσεις 1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,Το όνομα του ιδρύματος για το οποίο είστε δημιουργία αυτού του συστήματος.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,Το όνομα του ιδρύματος για το οποίο είστε δημιουργία αυτού του συστήματος.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Η λογιστική εγγραφή έχει παγώσει μέχρι την ημερομηνία αυτή, κανείς δεν μπορεί να κάνει / τροποποιήσει καταχωρήσεις, εκτός από τον ρόλο που καθορίζεται παρακάτω."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Παρακαλώ αποθηκεύστε το έγγραφο πριν από τη δημιουργία του χρονοδιαγράμματος συντήρησης
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Η τελευταία τιμή ενημερώθηκε σε όλα τα BOM
 DocType: Fee Schedule,Successful,Επιτυχής
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Κατάσταση έργου
 DocType: UOM,Check this to disallow fractions. (for Nos),Επιλέξτε αυτό για να απαγορεύσετε κλάσματα. (Όσον αφορά τους αριθμούς)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Οι ακόλουθες Εντολές Παραγωγής δημιουργήθηκαν:
-DocType: Student Admission,Naming Series (for Student Applicant),Ονοματοδοσία Series (για Student αιτούντα)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Οι ακόλουθες Εντολές Παραγωγής δημιουργήθηκαν:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Ονοματοδοσία Series (για Student αιτούντα)
 DocType: Delivery Note,Transporter Name,Όνομα μεταφορέα
 DocType: Authorization Rule,Authorized Value,Εξουσιοδοτημένος Αξία
 DocType: BOM,Show Operations,Εμφάνιση Operations
@@ -2590,7 +2640,7 @@
 ,Employees working on a holiday,Οι εργαζόμενοι που εργάζονται σε διακοπές
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Παρόν
 DocType: Project,% Complete Method,% Πλήρης μέθοδος
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Φάρμακο
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Φάρμακο
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Η ημερομηνία έναρξης συντήρησης δεν μπορεί να είναι πριν από την ημερομηνία παράδοσης για τον σειριακό αριθμό {0}
 DocType: Production Order,Actual End Date,Πραγματική ημερομηνία λήξης
 DocType: BOM,Operating Cost (Company Currency),Λειτουργικό κόστος (Εταιρεία νομίσματος)
@@ -2608,19 +2658,20 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Ο εγκρίνων χρήστης δεν μπορεί να είναι ίδιος με το χρήστη για τον οποίο ο κανόνας είναι εφαρμοστέος.
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Βασική Τιμή (σύμφωνα Χρηματιστήριο UOM)
 DocType: SMS Log,No of Requested SMS,Αρ. SMS που ζητήθηκαν
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Άδειας άνευ αποδοχών δεν ταιριάζει με τα εγκεκριμένα αρχεία Αφήστε Εφαρμογή
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Άδειας άνευ αποδοχών δεν ταιριάζει με τα εγκεκριμένα αρχεία Αφήστε Εφαρμογή
 DocType: Campaign,Campaign-.####,Εκστρατεία-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Επόμενα βήματα
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Παρακαλείστε να παρέχουν τις συγκεκριμένες θέσεις στις καλύτερες δυνατές τιμές
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Δημιούργησε τιμολόγιο
 DocType: Selling Settings,Auto close Opportunity after 15 days,Αυτόματη κοντά Ευκαιρία μετά από 15 ημέρες
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Οι εντολές αγοράς δεν επιτρέπονται για {0} λόγω μόνιμης θέσης {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Οι εντολές αγοράς δεν επιτρέπονται για {0} λόγω μόνιμης θέσης {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,στο τέλος του έτους
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Ποσοστό / Μόλυβδος%
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,"Η ημερομηνία λήξης της σύμβασης πρέπει να είναι μεγαλύτερη από ό, τι ημερομηνία ενώνουμε"
 DocType: Vital Signs,Nutrition Values,Τιμές Διατροφής
 DocType: Lab Test Template,Is billable,Είναι χρεώσιμο
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Τόσο το &quot;Χρονοδιάγραμμα γιατρού&quot; όσο και το Χρόνο Ανά Συνάντηση &quot;πρέπει να ρυθμιστεί για το Δρ {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Ένα τρίτο μέρος διανομέας / αντιπρόσωπος / πράκτορας με προμήθεια / affiliate / μεταπωλητής, ο οποίος πωλεί τα προϊόντα της εταιρείας για μια προμήθεια."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} κατά την παραγγελία αγορών {1}
 DocType: Patient,Patient Demographics,Δημογραφικά στοιχεία ασθενών
@@ -2670,7 +2721,6 @@
 10. Πρόσθεση ή Έκπτωση: Αν θέλετε να προσθέσετε ή να αφαιρέσετε τον φόρο."
 DocType: Homepage,Homepage,Αρχική σελίδα
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Επιλέξτε ιατρό ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',επικαιροποίηση καρτέλαςΟρισμός συμβολαίου set = &#39;{0}&#39; όπου όνομα = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Ποσότητα που παραλήφθηκε
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Εγγραφές τέλους Δημιουργήθηκε - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Κατηγορία Λογαριασμού
@@ -2682,7 +2732,7 @@
 DocType: Asset,Manual,Εγχειρίδιο
 DocType: Salary Component Account,Salary Component Account,Ο λογαριασμός μισθός Component
 DocType: Global Defaults,Hide Currency Symbol,Απόκρυψη συμβόλου νομίσματος
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","Π.Χ. Τράπεζα, μετρητά, πιστωτική κάρτα"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","Π.Χ. Τράπεζα, μετρητά, πιστωτική κάρτα"
 DocType: Lead Source,Source Name,Όνομα πηγή
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Η φυσιολογική πίεση αίματος σε έναν ενήλικα είναι περίπου 120 mmHg συστολική και 80 mmHg διαστολική, συντομογραφία &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Πιστωτικό σημείωμα
@@ -2701,16 +2751,16 @@
 DocType: Patient,Occupation,Κατοχή
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Γραμμή {0} : η ημερομηνία έναρξης πρέπει να είναι προγενέστερη της ημερομηνίας λήξης
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Σύνολο (ποσότητα)
-DocType: Sales Invoice,This Document,Αυτό το έγγραφο
 DocType: Installation Note Item,Installed Qty,Εγκατεστημένη ποσότητα
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Αυτό θα μπορούσε να οφείλεται σε ορισμένες μη έγκυρες διευθύνσεις ηλεκτρονικού ταχυδρομείου στο
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Προσθέσατε
 DocType: Purchase Taxes and Charges,Parenttype,Γονικός τύπος
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,εκπαίδευση Αποτέλεσμα
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,εκπαίδευση Αποτέλεσμα
 DocType: Purchase Invoice,Is Paid,καταβάλλεται
 DocType: Salary Structure,Total Earning,Σύνολο κέρδους
 DocType: Purchase Receipt,Time at which materials were received,Η χρονική στιγμή κατά την οποία παρελήφθησαν τα υλικά
 DocType: Stock Ledger Entry,Outgoing Rate,Ο απερχόμενος Τιμή
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Κύρια εγγραφή κλάδου οργανισμού.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Κύρια εγγραφή κλάδου οργανισμού.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,ή
 DocType: Sales Order,Billing Status,Κατάσταση χρέωσης
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Αναφορά προβλήματος
@@ -2725,7 +2775,8 @@
 DocType: Notification Control,Sales Order Message,Μήνυμα παραγγελίας πώλησης
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Ορίστε προεπιλεγμένες τιμές όπως εταιρεία, νόμισμα, τρέχων οικονομικό έτος, κλπ."
 DocType: Payment Entry,Payment Type,Τύπος πληρωμής
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Επιλέξτε μια παρτίδα για το στοιχείο {0}. Δεν είναι δυνατή η εύρεση μιας ενιαίας παρτίδας που να πληροί αυτή την απαίτηση
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Επιλέξτε μια παρτίδα για το στοιχείο {0}. Δεν είναι δυνατή η εύρεση μιας ενιαίας παρτίδας που να πληροί αυτή την απαίτηση
+DocType: Hub Category,Parent Category,Γονική κατηγορία
 DocType: Process Payroll,Select Employees,Επιλέξτε εργαζόμενοι
 DocType: Opportunity,Potential Sales Deal,Πιθανή συμφωνία πώλησης
 DocType: Complaint,Complaints,Καταγγελίες
@@ -2762,7 +2813,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),Αναγνωριστικό του συσκευασίας για την παράδοση (για εκτύπωση)
 DocType: Bin,Reserved Quantity,Δεσμευμένη ποσότητα
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Εισαγάγετε έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Επιλέξτε ένα στοιχείο στο καλάθι
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Επιλέξτε ένα στοιχείο στο καλάθι
 DocType: Landed Cost Voucher,Purchase Receipt Items,Είδη αποδεικτικού παραλαβής αγοράς
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Έντυπα Προσαρμογή
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,Καθυστερούμενη πληρωμή
@@ -2772,15 +2823,15 @@
 DocType: Payment Request,Amount in customer's currency,Ποσό σε νόμισμα του πελάτη
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Παράδοση
 DocType: Stock Reconciliation Item,Current Qty,Τρέχουσα Ποσότητα
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Προσθήκη προμηθευτών
+DocType: Restaurant Menu,Restaurant Menu,Εστιατόριο μενού
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Προηγ
 DocType: Appraisal Goal,Key Responsibility Area,Βασικός τομέας ευθύνης
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Παρτίδες φοιτητής να σας βοηθήσει να παρακολουθείτε φοίτηση, οι εκτιμήσεις και τα τέλη για τους φοιτητές"
 DocType: Payment Entry,Total Allocated Amount,Συνολικό ποσό που χορηγήθηκε
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Ορίστε τον προεπιλεγμένο λογαριασμό αποθέματος για διαρκή απογραφή
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Ορίστε τον προεπιλεγμένο λογαριασμό αποθέματος για διαρκή απογραφή
 DocType: Item Reorder,Material Request Type,Τύπος αίτησης υλικού
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural Εφημερίδα εισόδου για τους μισθούς από {0} έως {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage είναι πλήρης, δεν έσωσε"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage είναι πλήρης, δεν έσωσε"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Σειρά {0}: UOM Συντελεστής μετατροπής είναι υποχρεωτική
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Χωρητικότητα δωματίου
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Αναφορά
@@ -2819,16 +2870,18 @@
 DocType: Project,Task Completion,Task Ολοκλήρωση
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Όχι στο Χρηματιστήριο
 DocType: Appraisal,HR User,Χρήστης ανθρωπίνου δυναμικού
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS;
 DocType: Purchase Invoice,Taxes and Charges Deducted,Φόροι και επιβαρύνσεις που παρακρατήθηκαν
-apps/erpnext/erpnext/hooks.py +129,Issues,Θέματα
+apps/erpnext/erpnext/hooks.py +138,Issues,Θέματα
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Η κατάσταση πρέπει να είναι ένα από τα {0}
 DocType: Sales Invoice,Debit To,Χρέωση προς
+DocType: Restaurant Menu Item,Restaurant Menu Item,Εστιατόριο Στοιχείο μενού
 DocType: Delivery Note,Required only for sample item.,Απαιτείται μόνο για δείγμα
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Πραγματική ποσότητα μετά την συναλλαγή
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Δεν εκκαθαριστικό σημείωμα αποδοχών που διαπιστώθηκαν μεταξύ {0} και {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Δεν εκκαθαριστικό σημείωμα αποδοχών που διαπιστώθηκαν μεταξύ {0} και {1}
 ,Pending SO Items For Purchase Request,Εκκρεμή είδη παραγγελίας πωλήσεων για αίτημα αγοράς
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Εισαγωγή φοιτητής
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} είναι απενεργοποιημένη
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Εισαγωγή φοιτητής
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} είναι απενεργοποιημένη
 DocType: Supplier,Billing Currency,Νόμισμα Τιμολόγησης
 DocType: Sales Invoice,SINV-RET-,SINV-αναδρομική έναρξη
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Πολύ Μεγάλο
@@ -2851,6 +2904,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Παρακαλώ να αναφέρετε τον αριθμό των επισκέψεων που απαιτούνται
 DocType: Stock Settings,Default Valuation Method,Προεπιλεγμένη μέθοδος αποτίμησης
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,Τέλη
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Ενημέρωση σε εξέλιξη. Μπορεί να πάρει λίγο χρόνο.
 DocType: Vehicle Log,Fuel Qty,Ποσότητα καυσίμου
 DocType: Production Order Operation,Planned Start Time,Προγραμματισμένη ώρα έναρξης
 DocType: Course,Assessment,Εκτίμηση
@@ -2866,7 +2920,7 @@
 DocType: Price List,Price List Master,Κύρια εγγραφή τιμοκαταλόγου.
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Όλες οι συναλλαγές πωλήσεων μπορούν να σημανθούν κατά πολλαπλούς ** πωλητές ** έτσι ώστε να μπορείτε να ρυθμίσετε και να παρακολουθήσετε στόχους.
 ,S.O. No.,Αρ. Παρ. Πώλησης
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Παρακαλώ δημιουργήστε πελάτη από επαφή {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Παρακαλώ δημιουργήστε πελάτη από επαφή {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Επιλέξτε Ασθενή
 DocType: Price List,Applicable for Countries,Ισχύει για χώρες
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Όνομα παραμέτρου
@@ -2909,27 +2963,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,Προμηθευτής Λεπτομέρειες Τιμολογίου
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Η δαπάνη / διαφορά λογαριασμού ({0}) πρέπει να είναι λογαριασμός τύπου 'κέρδη ή ζημίες'
 DocType: Project,Copied From,Αντιγραφή από
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},error Όνομα: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Έλλειψη
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},error Όνομα: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,Έλλειψη
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} δεν σχετίζεται με {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Η συμμετοχή για εργαζομένο {0} έχει ήδη σημειώθει
 DocType: Packing Slip,If more than one package of the same type (for print),Εάν περισσότερες από μία συσκευασίες του ίδιου τύπου (για εκτύπωση)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Ορίστε τον προεπιλεγμένο πελάτη στις Ρυθμίσεις εστιατορίου
 ,Salary Register,μισθός Εγγραφή
 DocType: Warehouse,Parent Warehouse,μητρική Αποθήκη
 DocType: C-Form Invoice Detail,Net Total,Καθαρό σύνολο
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Το προεπιλεγμένο BOM δεν βρέθηκε για τα στοιχεία {0} και Project {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Το προεπιλεγμένο BOM δεν βρέθηκε για τα στοιχεία {0} και Project {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Ορίστε διάφορους τύπους δανείων
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Οφειλόμενο ποσό
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Χρόνος (σε λεπτά)
 DocType: Project Task,Working,Εργασία
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Ουρά αποθέματος (fifo)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Οικονομικό έτος
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Οικονομικό έτος
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},Το {0} δεν ανήκει στη εταιρεία {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,Δεν ήταν δυνατή η επίλυση της λειτουργίας βαθμολόγησης των κριτηρίων για το {0}. Βεβαιωθείτε ότι ο τύπος είναι έγκυρος.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Κοστίσει τόσο σε
 DocType: Healthcare Settings,Out Patient Settings,Out Ρυθμίσεις ασθενούς
 DocType: Account,Round Off,Στρογγυλεύουν
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Η ποσότητα πρέπει να είναι θετική
 ,Requested Qty,Ζητούμενη ποσότητα
 DocType: Tax Rule,Use for Shopping Cart,Χρησιμοποιήστε για το Καλάθι Αγορών
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Αξία {0} για Χαρακτηριστικό {1} δεν υπάρχει στη λίστα των έγκυρων Στοιχείο Χαρακτηριστικό τιμές για τη θέση {2}
@@ -2938,7 +2994,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Οι επιβαρύνσεις θα κατανεμηθούν αναλογικά, σύμφωνα με την ποσότητα ή το ποσό του είδους, σύμφωνα με την επιλογή σας"
 DocType: Maintenance Visit,Purposes,Σκοποί
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Atleast ένα στοιχείο πρέπει να αναγράφεται με αρνητική ποσότητα στο έγγραφο επιστροφής
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Προσθέστε μαθήματα
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Λειτουργία {0} περισσότερο από οποιαδήποτε διαθέσιμη ώρα εργασίας σε θέση εργασίας {1}, αναλύονται η λειτουργία σε πολλαπλές λειτουργίες"
 ,Requested,Ζητήθηκαν
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Δεν βρέθηκαν παρατηρήσεις
@@ -2950,6 +3005,8 @@
 DocType: Employee Loan,Repaid/Closed,Αποπληρωθεί / Έκλεισε
 DocType: Item,Total Projected Qty,Συνολικές προβλεπόμενες Ποσότητα
 DocType: Monthly Distribution,Distribution Name,Όνομα διανομής
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Ο συντελεστής αποτίμησης δεν βρέθηκε για το Στοιχείο {0}, το οποίο απαιτείται για τη διενέργεια λογιστικών εγγραφών για {1} {2}. Αν το στοιχείο πραγματοποιεί συναλλαγές ως στοιχείο μηδενικού επιτοκίου αποτίμησης στην {1}, παρακαλούμε αναφέρατε ότι στον πίνακα {1} Στοιχείο. Διαφορετικά, δημιουργήστε μια εισερχόμενη συναλλαγή μετοχών για το στοιχείο ή αναφερθείτε στην τιμή αποτίμησης στο αρχείο στοιχείων και, στη συνέχεια, δοκιμάστε να υποβάλετε / ακυρώσετε αυτήν την καταχώριση"
 DocType: Course,Course Code,Κωδικός Μαθήματος
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Ο έλεγχος ποιότητας για το είδος {0} είναι απαραίτητος
 DocType: POS Settings,Use POS in Offline Mode,Χρησιμοποιήστε το POS στη λειτουργία χωρίς σύνδεση
@@ -2960,14 +3017,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Διαχειριστείτε το δέντρο περιοχών.
 DocType: Journal Entry Account,Sales Invoice,Τιμολόγιο πώλησης
 DocType: Journal Entry Account,Party Balance,Υπόλοιπο συμβαλλόμενου
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,Παρακαλώ επιλέξτε Εφαρμογή έκπτωση σε
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Παρακαλώ επιλέξτε Εφαρμογή έκπτωση σε
 DocType: Company,Default Receivable Account,Προεπιλεγμένος λογαριασμός εισπρακτέων
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Δημιουργία τραπεζικής καταχώηρσης για το σύνολο του μισθού που καταβάλλεται για τα παραπάνω επιλεγμένα κριτήρια
 DocType: Physician,Physician Schedule,Πρόγραμμα γιατρού
 DocType: Purchase Invoice,Deemed Export,Θεωρείται Εξαγωγή
 DocType: Stock Entry,Material Transfer for Manufacture,Μεταφορά υλικού για την κατασκευή
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Το ποσοστό έκπτωσης μπορεί να εφαρμοστεί είτε ανά τιμοκατάλογο ή για όλους τους τιμοκαταλόγους
-DocType: Purchase Invoice,Half-yearly,Εξαμηνιαία
+DocType: Subscription,Half-yearly,Εξαμηνιαία
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Λογιστική εγγραφή για απόθεμα
 DocType: Lab Test,LabTest Approver,Έλεγχος LabTest
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Έχετε ήδη αξιολογήσει τα κριτήρια αξιολόγησης {}.
@@ -2996,13 +3053,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Extra Small
 DocType: Company,Standard Template,πρότυπο πρότυπο
 DocType: Training Event,Theory,Θεωρία
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Προειδοποίηση : ζητήθηκε ποσότητα υλικού που είναι μικρότερη από την ελάχιστη ποσότητα παραγγελίας
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Προειδοποίηση : ζητήθηκε ποσότητα υλικού που είναι μικρότερη από την ελάχιστη ποσότητα παραγγελίας
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Ο λογαριασμός {0} έχει παγώσει
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Νομικό πρόσωπο / θυγατρικές εταιρείες με ξεχωριστό λογιστικό σχέδιο που ανήκουν στον οργανισμό.
 DocType: Payment Request,Mute Email,Σίγαση Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Τρόφιμα, ποτά και καπνός"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Μπορούν να πληρώνουν κατά unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Το ποσοστό προμήθειας δεν μπορεί να υπερβαίνει το 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Μπορούν να πληρώνουν κατά unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Το ποσοστό προμήθειας δεν μπορεί να υπερβαίνει το 100
 DocType: Stock Entry,Subcontract,Υπεργολαβία
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,"Παρακαλούμε, εισάγετε {0} πρώτη"
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Δεν υπάρχουν απαντήσεις από
@@ -3020,10 +3077,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Χρώμα
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Κριτήρια Σχεδίου Αξιολόγησης
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Αποτροπή παραγγελιών αγοράς
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Ευαίσθητος
 DocType: Patient Appointment,Scheduled,Προγραμματισμένη
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Αίτηση για προσφορά.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εργαζομένων σε Ανθρώπινο Δυναμικό&gt; Ρυθμίσεις HR
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Παρακαλώ επιλέξτε το στοιχείο στο οποίο «Είναι αναντικατάστατο&quot; είναι &quot;Όχι&quot; και &quot;είναι οι πωλήσεις Θέση&quot; είναι &quot;ναι&quot; και δεν υπάρχει άλλος Bundle Προϊόν
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Επιλέξτε Πελάτη
 DocType: Student Log,Academic,Ακαδημαϊκός
 DocType: Patient,Personal and Social History,Προσωπική και κοινωνική ιστορία
 DocType: Fee Schedule,Fee Breakup for each student,Διάρθρωση τέλους για κάθε φοιτητή
@@ -3033,7 +3091,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Ποσοστό αποτίμησης
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Ντίζελ
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Το νόμισμα του τιμοκαταλόγου δεν έχει επιλεγεί
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Το νόμισμα του τιμοκαταλόγου δεν έχει επιλεγεί
 apps/erpnext/erpnext/config/healthcare.py +46,Results,αποτελέσματα
 ,Student Monthly Attendance Sheet,Φοιτητής Φύλλο Μηνιαία Συμμετοχή
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Ο υπάλληλος {0} έχει ήδη υποβάλει αίτηση για {1} μεταξύ {2} και {3}
@@ -3048,7 +3106,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Διαχειριστείτε συνεργάτες πωλήσεων.
 DocType: Quality Inspection,Inspection Type,Τύπος ελέγχου
 DocType: Fee Validity,Visited yet,Επισκέφτηκε ακόμα
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Αποθήκες με τα υπάρχοντα συναλλαγή δεν μπορεί να μετατραπεί σε ομάδα.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Αποθήκες με τα υπάρχοντα συναλλαγή δεν μπορεί να μετατραπεί σε ομάδα.
 DocType: Assessment Result Tool,Result HTML,αποτέλεσμα HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Λήγει στις
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Προσθέστε Φοιτητές
@@ -3075,7 +3133,7 @@
 DocType: Healthcare Settings,Result Printed,Αποτέλεσμα εκτυπωμένο
 DocType: Asset Category Account,Depreciation Expense Account,Ο λογαριασμός Αποσβέσεις
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Δοκιμαστική περίοδος
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Προβολή {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Προβολή {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Μόνο οι κόμβοι-φύλλα επιτρέπονται σε μία συναλλαγή
 DocType: Expense Claim,Expense Approver,Υπεύθυνος έγκρισης δαπανών
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Σειρά {0}: Προκαταβολή έναντι των πελατών πρέπει να είναι πιστωτικά
@@ -3086,7 +3144,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Έως ημερομηνία και ώρα
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,διαγράφεται Δρομολόγια μαθήματος:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Logs για τη διατήρηση της κατάστασης παράδοσης sms
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Ορισμός στόχου πωλήσεων
 DocType: Accounts Settings,Make Payment via Journal Entry,Κάντε Πληρωμή μέσω Εφημερίδα Έναρξη
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Τυπώθηκε σε
 DocType: Item,Inspection Required before Delivery,Επιθεώρησης Απαιτούμενη πριν από την παράδοση
@@ -3094,7 +3151,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Εν αναμονή Δραστηριότητες
 DocType: Patient Appointment,Reminded,Υπενθύμισε
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Ο οργανισμός σας
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Ο οργανισμός σας
 DocType: Fee Component,Fees Category,τέλη Κατηγορία
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Παρακαλώ εισάγετε την ημερομηνία απαλλαγής
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Ποσό
@@ -3106,7 +3163,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Αναδιάταξη επιπέδου
 DocType: Company,Chart Of Accounts Template,Διάγραμμα του προτύπου Λογαριασμών
 DocType: Attendance,Attendance Date,Ημερομηνία συμμετοχής
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Είδους Τιμή ενημερωθεί για {0} στον κατάλογο τιμή {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Είδους Τιμή ενημερωθεί για {0} στον κατάλογο τιμή {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Ανάλυση μισθού με βάση τις αποδοχές και τις παρακρατήσεις.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Ένας λογαριασμός με κόμβους παιδί δεν μπορεί να μετατραπεί σε καθολικό
 DocType: Purchase Invoice Item,Accepted Warehouse,Έγκυρη Αποθήκη
@@ -3122,9 +3179,10 @@
 ,Employee Birthday,Γενέθλια υπαλλήλων
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Φοιτητής Εργαλείο Μαζική Συμμετοχή
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,όριο Crossed
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Προγραμματισμένη μέχρι
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Αρχικό κεφάλαιο
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Μια ακαδημαϊκή περίοδο με αυτό το «Ακαδημαϊκό Έτος &#39;{0} και« Term Όνομα »{1} υπάρχει ήδη. Παρακαλείστε να τροποποιήσετε αυτές τις καταχωρήσεις και δοκιμάστε ξανά.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Δεδομένου ότι υπάρχουν συναλλαγές κατά το στοιχείο {0}, δεν μπορείτε να αλλάξετε την τιμή του {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Δεδομένου ότι υπάρχουν συναλλαγές κατά το στοιχείο {0}, δεν μπορείτε να αλλάξετε την τιμή του {1}"
 DocType: UOM,Must be Whole Number,Πρέπει να είναι ακέραιος αριθμός
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Νέες άδειες που κατανεμήθηκαν (σε ημέρες)
 DocType: Purchase Invoice,Invoice Copy,Αντιγραφή τιμολογίου
@@ -3134,7 +3192,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Αριθμός τιμολογίου
 DocType: Shopping Cart Settings,Orders,Παραγγελίες
 DocType: Employee Leave Approver,Leave Approver,Υπεύθυνος έγκρισης άδειας
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Επιλέξτε μια παρτίδα
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Επιλέξτε μια παρτίδα
 DocType: Assessment Group,Assessment Group Name,Όνομα ομάδας αξιολόγησης
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Υλικό το οποίο μεταφέρεται για την Κατασκευή
 DocType: Expense Claim,"A user with ""Expense Approver"" role",Ένας χρήστης με ρόλο «υπεύθυνος έγκρισης δαπανών»
@@ -3149,7 +3207,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Καταχώρηση κλεισίματος περιόδου
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Επιλέξτε Τμήμα ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Ένα κέντρο κόστους με υπάρχουσες συναλλαγές δεν μπορεί να μετατραπεί σε ομάδα
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Ποσό {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Ποσό {0} {1} {2} {3}
 DocType: Account,Depreciation,Απόσβεση
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Προμηθευτής(-ές)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Εργαλείο συμμετοχή των εργαζομένων
@@ -3160,10 +3218,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,Ενδείξεις πληρωμής {0} είναι μη-συνδεδεμένα
 DocType: GL Entry,Voucher No,Αρ. αποδεικτικού
 ,Lead Owner Efficiency,Ηγετική απόδοση του ιδιοκτήτη
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Δημοφιλέστερος
 DocType: Leave Allocation,Leave Allocation,Κατανομή άδειας
 DocType: Payment Request,Recipient Message And Payment Details,Μήνυμα παραλήπτη και τις λεπτομέρειες πληρωμής
 DocType: Training Event,Trainer Email,εκπαιδευτής Email
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Οι αίτησης υλικού {0} δημιουργήθηκαν
+DocType: Restaurant Reservation,No of People,Όχι των ανθρώπων
 DocType: Production Planning Tool,Include sub-contracted raw materials,Περιλαμβάνουν υπεργολαβίας πρώτων υλών
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Πρότυπο των όρων ή της σύμβασης.
 DocType: Purchase Invoice,Address and Contact,Διεύθυνση και Επικοινωνία
@@ -3172,10 +3232,11 @@
 DocType: Supplier,Last Day of the Next Month,Τελευταία μέρα του επόμενου μήνα
 DocType: Support Settings,Auto close Issue after 7 days,Αυτόματη κοντά Τεύχος μετά από 7 ημέρες
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Η άδεια δεν μπορεί να χορηγείται πριν {0}, η ισορροπία άδεια έχει ήδη μεταφοράς διαβιβάζεται στο μέλλον ρεκόρ χορήγηση άδειας {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Σημείωση : η ημερομηνία λήξης προθεσμίας υπερβαίνει τις επιτρεπόμενες ημέρες πίστωσης κατά {0} ημέρα ( ες )
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Σημείωση : η ημερομηνία λήξης προθεσμίας υπερβαίνει τις επιτρεπόμενες ημέρες πίστωσης κατά {0} ημέρα ( ες )
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,φοιτητής Αιτών
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ΠΡΩΤΟΤΥΠΟ ΓΙΑ ΔΙΚΑΙΟΥΧΟ
 DocType: Asset Category Account,Accumulated Depreciation Account,Συσσωρευμένες Αποσβέσεις Λογαριασμού
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Αυτό το μήνυμα ηλεκτρονικού ταχυδρομείου δημιουργείται αυτόματα
 DocType: Stock Settings,Freeze Stock Entries,Πάγωμα καταχωρήσεων αποθέματος
 DocType: Program Enrollment,Boarding Student,Επιβιβαζόμενος φοιτητής
 DocType: Asset,Expected Value After Useful Life,Αναμενόμενη τιμή μετά Ωφέλιμη Ζωή
@@ -3183,7 +3244,7 @@
 DocType: Activity Cost,Billing Rate,Χρέωση Τιμή
 ,Qty to Deliver,Ποσότητα για παράδοση
 ,Stock Analytics,Ανάλυση αποθέματος
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Εργασίες δεν μπορεί να μείνει κενό
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Εργασίες δεν μπορεί να μείνει κενό
 DocType: Maintenance Visit Purpose,Against Document Detail No,Κατά λεπτομέρειες εγγράφου αρ.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Κόμμα Τύπος είναι υποχρεωτική
 DocType: Quality Inspection,Outgoing,Εξερχόμενος
@@ -3205,7 +3266,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Επιλέξτε τους σπουδαστές με μη αυτόματο τρόπο για την ομάδα που βασίζεται στην δραστηριότητα
 DocType: Journal Entry,User Remark,Παρατήρηση χρήστη
 DocType: Lead,Market Segment,Τομέας της αγοράς
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Καταβληθέν ποσό δεν μπορεί να είναι μεγαλύτερη από το συνολικό αρνητικό οφειλόμενο ποσό {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Καταβληθέν ποσό δεν μπορεί να είναι μεγαλύτερη από το συνολικό αρνητικό οφειλόμενο ποσό {0}
 DocType: Supplier Scorecard Period,Variables,Μεταβλητές
 DocType: Employee Internal Work History,Employee Internal Work History,Ιστορικό εσωτερικών εργασιών υπαλλήλου
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Κλείσιμο (dr)
@@ -3234,21 +3295,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Λήψη ενημερώσεων
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Ο λογαριασμός {2} δεν ανήκει στην εταιρεία {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,H αίτηση υλικού {0} έχει ακυρωθεί ή διακοπεί
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Αφήστε Διαχείρισης
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Αφήστε Διαχείρισης
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Ομαδοποίηση κατά λογαριασμό
 DocType: Sales Order,Fully Delivered,Έχει παραδοθεί πλήρως
 DocType: Lead,Lower Income,Χαμηλότερο εισόδημα
+DocType: Restaurant Order Entry,Current Order,Τρέχουσα διαταγή
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Η αποθήκη προέλευση και αποθήκη προορισμός δεν μπορεί να είναι η ίδια για τη σειρά {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Ο λογαριασμός διαφορά πρέπει να είναι λογαριασμός τύπου Περιουσιακών Στοιχείων / Υποχρεώσεων, δεδομένου ότι το εν λόγω απόθεμα συμφιλίωση είναι μια Έναρξη Έναρξη"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Εκταμιευόμενο ποσό δεν μπορεί να είναι μεγαλύτερη από Ποσό δανείου {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Μεταβείτε στα Προγράμματα
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Ο αριθμός παραγγελίας για το είδος {0} είναι απαραίτητος
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Παραγγελία παραγωγή δεν δημιουργήθηκε
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Παραγγελία παραγωγή δεν δημιουργήθηκε
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Το πεδίο ""Από Ημερομηνία"" πρέπει να είναι μεταγενέστερο από το πεδίο ""Έως Ημερομηνία"""
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},δεν μπορεί να αλλάξει την κατάσταση ως φοιτητής {0} συνδέεται με την εφαρμογή των φοιτητών {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},δεν μπορεί να αλλάξει την κατάσταση ως φοιτητής {0} συνδέεται με την εφαρμογή των φοιτητών {1}
 DocType: Asset,Fully Depreciated,αποσβεσθεί πλήρως
 ,Stock Projected Qty,Προβλεπόμενη ποσότητα αποθέματος
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Ο πελάτης {0} δεν ανήκει στο έργο {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Ο πελάτης {0} δεν ανήκει στο έργο {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Αξιοσημείωτη Συμμετοχή HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Οι αναφορές είναι οι προτάσεις, οι προσφορές που έχουν στείλει στους πελάτες σας"
 DocType: Sales Order,Customer's Purchase Order,Εντολή Αγοράς του Πελάτη
@@ -3259,8 +3321,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Παρακαλούμε να ορίσετε Αριθμός Αποσβέσεις κράτηση
 DocType: Supplier Scorecard Period,Calculations,Υπολογισμοί
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Αξία ή ποσ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Παραγωγές Παραγγελίες δεν μπορούν να αυξηθούν για:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Παραγωγές Παραγγελίες δεν μπορούν να αυξηθούν για:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Λεπτό
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ορίστε την Ονοματοδοσία για {0} μέσω του Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Invoice,Purchase Taxes and Charges,Φόροι και επιβαρύνσεις αγοράς
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Πηγαίνετε στους προμηθευτές
 ,Qty to Receive,Ποσότητα για παραλαβή
@@ -3273,7 +3336,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Πίστωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Όλοι οι τύποι προμηθευτή
 DocType: Global Defaults,Disable In Words,Απενεργοποίηση στα λόγια
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,Ο κωδικός είδους είναι απαραίτητος γιατί το είδος δεν αριθμείται αυτόματα
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,Ο κωδικός είδους είναι απαραίτητος γιατί το είδος δεν αριθμείται αυτόματα
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Η προσφορά {0} δεν είναι του τύπου {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Είδος χρονοδιαγράμματος συντήρησης
 DocType: Sales Order,%  Delivered,Παραδόθηκε%
@@ -3295,23 +3358,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Άνοιγμα Υπόλοιπο Ιδίων Κεφαλαίων
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,Ν
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Συμφιλίωση
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Παραμένων
 DocType: Appraisal,Appraisal,Εκτίμηση
 DocType: Purchase Invoice,GST Details,Λεπτομέρειες GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},Email αποσταλεί στον προμηθευτή {0}
+DocType: Item,Default Sales Unit of Measure,Μονάδα προεπιλεγμένων πωλήσεων του μέτρου
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Η ημερομηνία επαναλαμβάνεται
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Εξουσιοδοτημένο υπογράφοντα
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Ο υπεύθυνος έγκρισης άδειας πρέπει να είναι ένας από {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Δημιουργία τελών
-DocType: Hub Settings,Seller Email,Email πωλητή
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Συνολικό Κόστος Αγοράς (μέσω του τιμολογίου αγοράς)
 DocType: Training Event,Start Time,Ώρα έναρξης
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Επιλέξτε ποσότητα
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Επιλέξτε ποσότητα
 DocType: Customs Tariff Number,Customs Tariff Number,Τελωνεία Αριθμός δασμολογίου
 DocType: Patient Appointment,Patient Appointment,Αναμονή ασθενούς
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Ο εγκρίνων ρόλος δεν μπορεί να είναι ίδιος με το ρόλο στον οποίο κανόνας πρέπει να εφαρμόζεται
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Κατάργηση εγγραφής από αυτό το email Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Κατάργηση εγγραφής από αυτό το email Digest
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Αποκτήστε προμηθευτές από
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},Δεν βρέθηκε {0} για το στοιχείο {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Μεταβείτε στα Μαθήματα
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Το μήνυμα εστάλη
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Ο λογαριασμός με κόμβους παιδί δεν μπορεί να οριστεί ως καθολικό
@@ -3324,11 +3390,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Υλικό το οποίο μεταφέρεται για Βιομηχανία
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Ο λογαριασμός {0} δεν υπάρχει
 DocType: Project,Project Type,Τύπος έργου
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Υπάρχει εργασία παιδιού για αυτή την εργασία. Δεν μπορείτε να διαγράψετε αυτήν την εργασία.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Είτε ποσότητα-στόχος ή ποσό-στόχος είναι απαραίτητα.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Το κόστος των διαφόρων δραστηριοτήτων
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Δεν υπάρχουν άλλα αποτελέσματα
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Το κόστος των διαφόρων δραστηριοτήτων
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Ρύθμιση Εκδηλώσεις σε {0}, καθόσον ο εργαζόμενος συνδέεται με την παρακάτω Πωλήσεις Άτομα που δεν έχει ένα όνομα χρήστη {1}"
 DocType: Timesheet,Billing Details,λεπτομέρειες χρέωσης
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Πηγή και αποθήκη στόχος πρέπει να είναι διαφορετική
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Πηγή και αποθήκη στόχος πρέπει να είναι διαφορετική
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Δεν επιτρέπεται να ενημερώσετε συναλλαγές αποθέματος παλαιότερες από {0}
 DocType: Purchase Invoice Item,PR Detail,Λεπτομέρειες PR
 DocType: Sales Order,Fully Billed,Πλήρως χρεωμένο
@@ -3354,7 +3422,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Τραπεζικό έμβασμα
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Ελεγξε τα ολα
 DocType: Vehicle Log,Invoice Ref,τιμολόγιο Ref
-DocType: Purchase Order,Recurring Order,Επαναλαμβανόμενη παραγγελία
 DocType: Company,Default Income Account,Προεπιλεγμένος λογαριασμός εσόδων
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Ομάδα πελατών / πελάτης
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Ανοικτή Χρήσεων Κέρδη / Ζημίες (Credit)
@@ -3368,9 +3435,9 @@
 DocType: Patient,A Negative,Μια αρνητική
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Τίποτα περισσότερο για προβολή.
 DocType: Lead,From Customer,Από πελάτη
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Κλήσεις
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Κλήσεις
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Ενα προϊόν
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,Παρτίδες
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,Παρτίδες
 DocType: Project,Total Costing Amount (via Time Logs),Σύνολο Κοστολόγηση Ποσό (μέσω χρόνος Καταγράφει)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Κάντε το χρονοδιάγραμμα των τελών
 DocType: Purchase Order Item Supplied,Stock UOM,Μ.Μ. Αποθέματος
@@ -3394,7 +3461,7 @@
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Φύλλα και διακοπές
 DocType: School Settings,Current Academic Term,Ο τρέχων ακαδημαϊκός όρος
 DocType: Sales Order,Not Billed,Μη τιμολογημένο
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Και οι δύο αποθήκες πρέπει να ανήκουν στην ίδια εταιρεία
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Και οι δύο αποθήκες πρέπει να ανήκουν στην ίδια εταιρεία
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Δεν δημιουργήθηκαν επαφές
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Ποσό αποδεικτικοού κόστους αποστολής εμπορευμάτων
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Λογαριασμοί από τους προμηθευτές.
@@ -3403,7 +3470,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Ποσό έκπτωσης
 DocType: Purchase Invoice,Return Against Purchase Invoice,Επιστροφή Ενάντια Αγορά Τιμολόγιο
 DocType: Item,Warranty Period (in days),Περίοδος εγγύησης (σε ημέρες)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',ενημέρωση `tabPatient ραντεβού &#39;set sales_invoice =&#39; {0} &#39;where name =&#39; {1} &#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Σχέση με Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Καθαρές ροές από λειτουργικές δραστηριότητες
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Στοιχείο 4
@@ -3412,8 +3478,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Λογαριασμός λογιστικής εγγραφής
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Ομάδα Φοιτητών
 DocType: Shopping Cart Settings,Quotation Series,Σειρά προσφορών
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Ένα είδος υπάρχει με το ίδιο όνομα ( {0} ), παρακαλώ να αλλάξετε το όνομα της ομάδας ειδών ή να μετονομάσετε το είδος"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Επιλέξτε πελατών
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Ένα είδος υπάρχει με το ίδιο όνομα ( {0} ), παρακαλώ να αλλάξετε το όνομα της ομάδας ειδών ή να μετονομάσετε το είδος"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Επιλέξτε πελατών
 DocType: C-Form,I,εγώ
 DocType: Company,Asset Depreciation Cost Center,Asset Κέντρο Αποσβέσεις Κόστους
 DocType: Sales Order Item,Sales Order Date,Ημερομηνία παραγγελίας πώλησης
@@ -3422,6 +3488,7 @@
 DocType: Assessment Plan,Assessment Plan,σχέδιο αξιολόγησης
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Ο πελάτης {0} δημιουργείται.
 DocType: Stock Settings,Limit Percent,όριο Ποσοστό
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Επί του παρόντος δεν υπάρχει διαθέσιμο απόθεμα σε οποιαδήποτε αποθήκη
 ,Payment Period Based On Invoice Date,Περίοδος πληρωμής με βάση την ημερομηνία τιμολογίου
 DocType: Sample Collection,No. of print,Αριθ. Εκτύπωσης
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Λείπει η ισοτιμία συναλλάγματος για {0}
@@ -3477,13 +3544,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Μεικτές Αποδοχές - Σύνολο Έκπτωση - Αποπληρωμή δανείου
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,Η τρέχουσα Λ.Υ. και η νέα Λ.Υ. δεν μπορεί να είναι ίδιες
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Μισθός ID Slip
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Μισθός ID Slip
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Η ημερομηνία συνταξιοδότησης πρέπει να είναι μεταγενέστερη από την ημερομηνία πρόσληψης
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Υπήρξαν σφάλματα κατά τον προγραμματισμό μάθημα για:
 DocType: Sales Invoice,Against Income Account,Κατά τον λογαριασμό εσόδων
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Παραδόθηκαν
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Θέση {0}: Διέταξε ποσότητα {1} δεν μπορεί να είναι μικρότερη από την ελάχιστη ποσότητα προκειμένου {2} (ορίζεται στο σημείο).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Θέση {0}: Διέταξε ποσότητα {1} δεν μπορεί να είναι μικρότερη από την ελάχιστη ποσότητα προκειμένου {2} (ορίζεται στο σημείο).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Ποσοστό μηνιαίας διανομής
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Συνδεθείτε ως άλλος χρήστης.
 DocType: Territory,Territory Targets,Στόχοι περιοχών
 DocType: Delivery Note,Transporter Info,Πληροφορίες μεταφορέα
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Παρακαλούμε να ορίσετε προεπιλεγμένες {0} στην εταιρεία {1}
@@ -3491,13 +3559,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Ίδιο προμηθευτή έχει εισαχθεί πολλές φορές
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Μικτά Κέρδη / Ζημίες
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Προμηθεύτηκε είδος παραγγελίας αγοράς
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Όνομα Εταιρίας δεν μπορεί να είναι Εταιρεία
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Όνομα Εταιρίας δεν μπορεί να είναι Εταιρεία
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Επικεφαλίδες επιστολόχαρτου για πρότυπα εκτύπωσης.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Τίτλοι για πρότυπα εκτύπωσης, π.Χ. Προτιμολόγιο."
 DocType: Program Enrollment,Walking,Το περπάτημα
 DocType: Student Guardian,Student Guardian,Guardian φοιτητής
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Χρεώσεις τύπου αποτίμηση δεν μπορεί να χαρακτηρίζεται ως Inclusive
 DocType: POS Profile,Update Stock,Ενημέρωση αποθέματος
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,στη συνδρομή
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Διαφορετικές Μ.Μ.για τα είδη θα οδηγήσουν σε λανθασμένη τιμή ( σύνολο ) καθαρού βάρους. Βεβαιωθείτε ότι το καθαρό βάρος κάθε είδοςυ είναι στην ίδια Μ.Μ.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Τιμή Λ.Υ.
 DocType: Asset,Journal Entry for Scrap,Εφημερίδα Έναρξη για παλιοσίδερα
@@ -3545,15 +3614,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","(Login) ID για το χρήστη συστήματος. Αν οριστεί, θα γίνει προεπιλογή για όλες τις φόρμες Α.Δ."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Από {1}
 DocType: Task,depends_on,εξαρτάται από
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Ρυθμιζόμενη για ενημέρωση της τελευταίας τιμής σε όλους τους λογαριασμούς. Μπορεί να χρειαστούν μερικά λεπτά.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Ρυθμιζόμενη για ενημέρωση της τελευταίας τιμής σε όλους τους λογαριασμούς. Μπορεί να χρειαστούν μερικά λεπτά.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Όνομα του νέου λογαριασμού. Σημείωση: Παρακαλώ μην δημιουργείτε λογαριασμούς για τους πελάτες και προμηθευτές
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Προκαθορισμένα πρότυπα διεύθυνσης ανά χώρα
 DocType: Sales Order Item,Supplier delivers to Customer,Προμηθευτής παραδίδει στον πελάτη
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# έντυπο / Θέση / {0}) έχει εξαντληθεί
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Η ημερομηνία λήξης προθεσμίας / αναφοράς δεν μπορεί να είναι μετά από {0}
+,Sales Payment Summary,Περίληψη πληρωμών πωλήσεων
+DocType: Restaurant,Restaurant,Εστιατόριο
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Η ημερομηνία λήξης προθεσμίας / αναφοράς δεν μπορεί να είναι μετά από {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Δεδομένα εισαγωγής και εξαγωγής
 DocType: Patient,Account Details,Στοιχεία λογαριασμού
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Δεν μαθητές Βρέθηκαν
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Δεν μαθητές Βρέθηκαν
 DocType: Medical Department,Medical Department,Ιατρικό Τμήμα
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Κριτήρια βαθμολόγησης προμηθευτή Scorecard
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Τιμολόγιο Ημερομηνία Δημοσίευσης
@@ -3564,7 +3635,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Επιλέξτε Απόσπαση Ημερομηνία πριν από την επιλογή Κόμματος
 DocType: Program Enrollment,School House,Σχολείο
 DocType: Serial No,Out of AMC,Εκτός Ε.Σ.Υ.
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Παρακαλώ επιλέξτε Τιμές
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Παρακαλώ επιλέξτε Τιμές
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Αριθμός Αποσβέσεις κράτηση δεν μπορεί να είναι μεγαλύτερη από Συνολικός αριθμός Αποσβέσεις
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Δημιούργησε επίσκεψη συντήρησης
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,Παρακαλώ επικοινωνήστε με τον χρήστη που έχει ρόλο διαχειριστής κύριων εγγραφών πωλήσεων {0}
@@ -3572,7 +3643,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Κύρια εγγραφή εταιρείας (δεν είναι πελάτης ή προμηθευτής).
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Αυτό βασίζεται στην συμμετοχή του φοιτητή
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Δεν υπάρχουν φοιτητές στο
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Προσθέστε περισσότερα στοιχεία ή ανοιχτή πλήρη μορφή
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Προσθέστε περισσότερα στοιχεία ή ανοιχτή πλήρη μορφή
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Τα δελτία παράδοσης {0} πρέπει να ακυρώνονται πριν από την ακύρωση της παραγγελίας πώλησης
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Μεταβείτε στους χρήστες
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Το άθροισμα από το καταβληθέν ποσό και το ποσό που διαγράφηκε δεν μπορεί να είναι μεγαλύτερο από το γενικό σύνολο
@@ -3592,37 +3663,40 @@
 DocType: Fee Schedule,Fee Schedule,Πρόγραμμα Fee
 DocType: Hub Settings,Publish Availability,Διαθεσιμότητα δημοσίευσης
 DocType: Company,Create Chart Of Accounts Based On,Δημιουργία Λογιστικού Σχεδίου Based On
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Δεν είναι δυνατή η μετατροπή του σε μη ομάδα. Παιδικά καθήκοντα υπάρχουν.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,"Ημερομηνία γέννησης δεν μπορεί να είναι μεγαλύτερη από ό, τι σήμερα."
 ,Stock Ageing,Γήρανση αποθέματος
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Φοιτητής {0} υπάρχει εναντίον των φοιτητών αιτών {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Προσαρμογή στρογγυλοποίησης (νόμισμα εταιρείας)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Πρόγραμμα
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Πρόγραμμα
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' Είναι απενεργοποιημένος
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ορισμός ως Ανοικτό
 DocType: Cheque Print Template,Scanned Cheque,σαρωμένα Επιταγή
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Αυτόματη αποστολή email στις επαφές για την υποβολή των συναλλαγών.
 DocType: Timesheet,Total Billable Amount,Σύνολο Χρεώσιμη Ποσό
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Στοιχείο 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Εντολή παραγγελίας
 DocType: Purchase Order,Customer Contact Email,Πελατών Επικοινωνία Email
 DocType: Warranty Claim,Item and Warranty Details,Στοιχείο και εγγύηση Λεπτομέρειες
 DocType: Sales Team,Contribution (%),Συμβολή (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Σημείωση : η καταχώρηση πληρωμής δεν θα δημιουργηθεί γιατί δεν ορίστηκε λογαριασμός μετρητών ή τραπέζης
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Το έργο {0} υπάρχει ήδη
 DocType: Medical Department,Nursing User,Χρήστης νοσηλευτικής
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Αρμοδιότητες
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Η περίοδος ισχύος αυτής της προσφοράς έχει λήξει.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Η περίοδος ισχύος αυτής της προσφοράς έχει λήξει.
 DocType: Expense Claim Account,Expense Claim Account,Λογαριασμός Εξόδων αξίωσης
 DocType: Accounts Settings,Allow Stale Exchange Rates,Να επιτρέπεται η μετατροπή σε Stale Exchange Rate
 DocType: Sales Person,Sales Person Name,Όνομα πωλητή
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Παρακαλώ εισάγετε τουλάχιστον 1 τιμολόγιο στον πίνακα
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Προσθήκη χρηστών
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Προσθήκη χρηστών
 DocType: POS Item Group,Item Group,Ομάδα ειδών
 DocType: Item,Safety Stock,Απόθεμα ασφαλείας
 DocType: Healthcare Settings,Healthcare Settings,Ρυθμίσεις περίθαλψης
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Πρόοδος% για ένα έργο δεν μπορεί να είναι πάνω από 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Πρόοδος% για ένα έργο δεν μπορεί να είναι πάνω από 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Πριν συμφιλίωση
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Έως {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Φόροι και επιβαρύνσεις που προστέθηκαν (νόμισμα της εταιρείας)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Η γραμμή φόρου είδους {0} πρέπει να έχει λογαριασμό τύπου φόρος ή έσοδα ή δαπάνη ή χρέωση
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Η γραμμή φόρου είδους {0} πρέπει να έχει λογαριασμό τύπου φόρος ή έσοδα ή δαπάνη ή χρέωση
 DocType: Sales Order,Partly Billed,Μερικώς τιμολογημένος
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Θέση {0} πρέπει να είναι ένα πάγιο περιουσιακό στοιχείο του Είδους
 DocType: Item,Default BOM,Προεπιλεγμένη Λ.Υ.
@@ -3638,6 +3712,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,Μεταβλητή
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Από το δελτίο αποστολής
 DocType: Student,Student Email Address,Φοιτητής διεύθυνση ηλεκτρονικού ταχυδρομείου
+DocType: Item,Hub Warehouse,Hub αποθήκη
 DocType: Physician Schedule Time Slot,From Time,Από ώρα
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Σε απόθεμα:
 DocType: Notification Control,Custom Message,Προσαρμοσμένο μήνυμα
@@ -3645,9 +3720,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,Ο λογαριασμός μετρητών/τραπέζης είναι απαραίτητος για την κατασκευή καταχωρήσεων πληρωμής
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Διεύθυνση σπουδαστών
 DocType: Purchase Invoice,Price List Exchange Rate,Ισοτιμία τιμοκαταλόγου
+DocType: POS Profile,POS Profile Name,Όνομα προφίλ POS
 DocType: Purchase Invoice Item,Rate,Τιμή
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Εκπαιδευόμενος
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Διεύθυνση
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Διεύθυνση
 DocType: Stock Entry,From BOM,Από BOM
 DocType: Assessment Code,Assessment Code,Κωδικός αξιολόγηση
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Βασικός
@@ -3661,11 +3737,12 @@
 DocType: Salary Slip,Salary Structure,Μισθολόγιο
 DocType: Account,Bank,Τράπεζα
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Αερογραμμή
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Υλικό έκδοσης
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Υλικό έκδοσης
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Παρουσιάστηκε σφάλμα κατά τη δημιουργία επαναλαμβανόμενων
 DocType: Material Request Item,For Warehouse,Για αποθήκη
 DocType: Employee,Offer Date,Ημερομηνία προσφοράς
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Προσφορές
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Βρίσκεστε σε λειτουργία χωρίς σύνδεση. Δεν θα είστε σε θέση να φορτώσετε εκ νέου έως ότου έχετε δίκτυο.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Βρίσκεστε σε λειτουργία χωρίς σύνδεση. Δεν θα είστε σε θέση να φορτώσετε εκ νέου έως ότου έχετε δίκτυο.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Δεν Ομάδες Φοιτητών δημιουργήθηκε.
 DocType: Purchase Invoice Item,Serial No,Σειριακός αριθμός
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Μηνιαία επιστροφή ποσό δεν μπορεί να είναι μεγαλύτερη από Ποσό δανείου
@@ -3675,17 +3752,18 @@
 DocType: Salary Slip,Total Working Hours,Σύνολο ωρών εργασίας
 DocType: Subscription,Next Schedule Date,Επόμενη ημερομηνία προγραμματισμού
 DocType: Stock Entry,Including items for sub assemblies,Συμπεριλαμβανομένων των στοιχείων για τις επιμέρους συνελεύσεις
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Εισάγετε τιμή πρέπει να είναι θετικός
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Όλα τα εδάφη
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Εισάγετε τιμή πρέπει να είναι θετικός
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Όλα τα εδάφη
 DocType: Purchase Invoice,Items,Είδη
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Φοιτητής ήδη εγγραφεί.
 DocType: Fiscal Year,Year Name,Όνομα έτους
 DocType: Process Payroll,Process Payroll,Επεξεργασία μισθοδοσίας
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Υπάρχουν περισσότερες ημέρες αργιών από ότι εργάσιμες ημέρες αυτό το μήνα.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Υπάρχουν περισσότερες ημέρες αργιών από ότι εργάσιμες ημέρες αυτό το μήνα.
 DocType: Product Bundle Item,Product Bundle Item,Προϊόν Bundle Προϊόν
 DocType: Sales Partner,Sales Partner Name,Όνομα συνεργάτη πωλήσεων
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Αίτηση για προσφορά
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Αίτηση για προσφορά
 DocType: Payment Reconciliation,Maximum Invoice Amount,Μέγιστο ποσό του τιμολογίου
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Αιματολογία
 DocType: Normal Test Items,Normal Test Items,Κανονικά στοιχεία δοκιμής
 DocType: Student Language,Student Language,φοιτητής Γλώσσα
 apps/erpnext/erpnext/config/selling.py +23,Customers,Πελάτες
@@ -3696,10 +3774,11 @@
 DocType: Issue,Opening Time,Ώρα ανοίγματος
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Τα πεδία από και έως ημερομηνία είναι απαραίτητα
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Κινητές αξίες & χρηματιστήρια εμπορευμάτων
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Προεπιλεγμένη μονάδα μέτρησης για την παραλλαγή &#39;{0}&#39; πρέπει να είναι ίδιο με το πρότυπο &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Προεπιλεγμένη μονάδα μέτρησης για την παραλλαγή &#39;{0}&#39; πρέπει να είναι ίδιο με το πρότυπο &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Υπολογισμός με βάση:
 DocType: Delivery Note Item,From Warehouse,Από Αποθήκης
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Δεν Αντικείμενα με τον Bill Υλικών για Κατασκευή
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Δεν Αντικείμενα με τον Bill Υλικών για Κατασκευή
+DocType: Restaurant,Default Customer,Προεπιλεγμένος πελάτης
 DocType: Assessment Plan,Supervisor Name,Όνομα Επόπτη
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Μην επιβεβαιώνετε εάν το ραντεβού δημιουργείται για την ίδια ημέρα
 DocType: Program Enrollment Course,Program Enrollment Course,Πρόγραμμα εγγραφής στο πρόγραμμα
@@ -3726,7 +3805,7 @@
 DocType: Payment Entry,Internal Transfer,εσωτερική Μεταφορά
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Υπάρχει θυγατρικός λογαριασμός για αυτόν το λογαριασμό. Δεν μπορείτε να διαγράψετε αυτόν το λογαριασμό.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Είτε ποσότητα-στόχος ή ποσό-στόχος είναι απαραίτητα.
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Δεν υπάρχει προεπιλεγμένη Λ.Υ. Για το είδος {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Δεν υπάρχει προεπιλεγμένη Λ.Υ. Για το είδος {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Παρακαλώ επιλέξτε Ημερομηνία Δημοσίευσης πρώτη
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Ημερομηνία ανοίγματος πρέπει να είναι πριν από την Ημερομηνία Κλεισίματος
 DocType: Leave Control Panel,Carry Forward,Μεταφορά προς τα εμπρός
@@ -3761,6 +3840,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Σύνολο παρόντων
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,λογιστικές Καταστάσεις
 DocType: Drug Prescription,Hour,Ώρα
+DocType: Restaurant Order Entry,Last Sales Invoice,Τελευταίο τιμολόγιο πωλήσεων
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Ένας νέος σειριακός αριθμός δεν μπορεί να έχει αποθήκη. Η αποθήκη πρέπει να ορίζεται από καταχωρήσεις αποθέματος ή από παραλαβές αγορών
 DocType: Lead,Lead Type,Τύπος επαφής
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Δεν επιτρέπεται να εγκρίνει φύλλα στο Block Ημερομηνίες
@@ -3795,64 +3875,66 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Δημιουργία χρηστών
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,Γραμμάριο
 DocType: Supplier Scorecard,Per Month,Κάθε μήνα
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Ποσότητα Παρασκευή πρέπει να είναι μεγαλύτερη από 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Ποσότητα Παρασκευή πρέπει να είναι μεγαλύτερη από 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Επισκεφθείτε την έκθεση για την έκτακτη συντήρηση.
 DocType: Stock Entry,Update Rate and Availability,Ενημέρωση τιμή και τη διαθεσιμότητα
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Ποσοστό που επιτρέπεται να παραληφθεί ή να παραδοθεί περισσότερο από την ποσότητα παραγγελίας. Για παράδειγμα: εάν έχετε παραγγείλει 100 μονάδες. Και το επίδομα σας είναι 10%, τότε θα μπορούν να παραληφθούν 110 μονάδες."
 DocType: POS Customer Group,Customer Group,Ομάδα πελατών
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Νέο αναγνωριστικό παρτίδας (προαιρετικό)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Νέο αναγνωριστικό παρτίδας (προαιρετικό)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Ο λογαριασμός δαπανών είναι υποχρεωτικός για το είδος {0}
 DocType: BOM,Website Description,Περιγραφή δικτυακού τόπου
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Καθαρή Μεταβολή Ιδίων Κεφαλαίων
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Νεότερο
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Παρακαλείστε να ακυρώσετε την αγορά Τιμολόγιο {0} πρώτο
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Διεύθυνση e-mail πρέπει να είναι μοναδικό, υπάρχει ήδη για {0}"
 DocType: Serial No,AMC Expiry Date,Ε.Σ.Υ. Ημερομηνία λήξης
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,ΑΠΟΔΕΙΞΗ ΠΛΗΡΩΜΗΣ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,ΑΠΟΔΕΙΞΗ ΠΛΗΡΩΜΗΣ
 ,Sales Register,Ταμείο πωλήσεων
 DocType: Daily Work Summary Settings Company,Send Emails At,Αποστολή email τους στο
 DocType: Quotation,Quotation Lost Reason,Λόγος απώλειας προσφοράς
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Επιλέξτε το Domain σας
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',επιλέξτε * από το tabPatient όπου όνομα = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},αναφοράς συναλλαγής δεν {0} με ημερομηνία {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},αναφοράς συναλλαγής δεν {0} με ημερομηνία {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Δεν υπάρχει τίποτα να επεξεργαστείτε.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Προβολή μορφής
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Περίληψη για το μήνα αυτό και εν αναμονή δραστηριότητες
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Προβολή μορφής
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Περίληψη για το μήνα αυτό και εν αναμονή δραστηριότητες
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Προσθέστε χρήστες στον οργανισμό σας, εκτός από τον εαυτό σας."
 DocType: Customer Group,Customer Group Name,Όνομα ομάδας πελατών
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Κανένας πελάτης ακόμα!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Κανένας πελάτης ακόμα!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Κατάσταση ταμειακών ροών
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Ποσό δανείου δεν μπορεί να υπερβαίνει το μέγιστο ύψος των δανείων Ποσό {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Άδεια
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Παρακαλώ αφαιρέστε αυτό το τιμολόγιο {0} από τη c-form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Παρακαλώ αφαιρέστε αυτό το τιμολόγιο {0} από τη c-form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Παρακαλώ επιλέξτε μεταφορά εάν θέλετε επίσης να περιλαμβάνεται το ισοζύγιο από το προηγούμενο οικονομικό έτος σε αυτό η χρήση
 DocType: GL Entry,Against Voucher Type,Κατά τον τύπο αποδεικτικού
 DocType: Physician,Phone (R),Τηλέφωνο (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Προστέθηκαν χρονικά διαθέσιμα
 DocType: Item,Attributes,Γνωρίσματα
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Ενεργοποιήστε το πρότυπο
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ορίστε την Ονοματοδοσία για {0} μέσω του Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Παρακαλώ εισάγετε λογαριασμό διαγραφών
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Τελευταία ημερομηνία παραγγελίας
 DocType: Patient,B Negative,Β Αρνητικό
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Ο Λογαριασμός {0} δεν ανήκει στην εταιρεία {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Οι σειριακοί αριθμοί στη σειρά {0} δεν ταιριάζουν με τη Σημείωση Παραλαβής
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Οι σειριακοί αριθμοί στη σειρά {0} δεν ταιριάζουν με τη Σημείωση Παραλαβής
 DocType: Student,Guardian Details,Guardian Λεπτομέρειες
 DocType: C-Form,C-Form,C-form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark φοίτηση για πολλούς εργαζόμενους
 DocType: Vehicle,Chassis No,σασί Όχι
 DocType: Payment Request,Initiated,Ξεκίνησε
 DocType: Production Order,Planned Start Date,Προγραμματισμένη ημερομηνία έναρξης
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Επιλέξτε ένα BOM
 DocType: Serial No,Creation Document Type,Τύπος εγγράφου δημιουργίας
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Η ημερομηνία λήξης πρέπει να είναι μεγαλύτερη από την ημερομηνία έναρξης
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Η ημερομηνία λήξης πρέπει να είναι μεγαλύτερη από την ημερομηνία έναρξης
 DocType: Leave Type,Is Encash,Είναι είσπραξη
 DocType: Leave Allocation,New Leaves Allocated,Νέες άδειες που κατανεμήθηκαν
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Τα στοιχεία με βάση το έργο δεν είναι διαθέσιμα στοιχεία για προσφορά
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Τερματισμός
 DocType: Project,Expected End Date,Αναμενόμενη ημερομηνία λήξης
 DocType: Budget Account,Budget Amount,προϋπολογισμός Ποσό
 DocType: Appraisal Template,Appraisal Template Title,Τίτλος προτύπου αξιολόγησης
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Από Ημερομηνία {0} υπάλληλου {1} δεν μπορεί να είναι πριν από την ένταξή Ημερομηνία εργαζομένου {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Εμπορικός
 DocType: Patient,Alcohol Current Use,Αλκοόλ τρέχουσα χρήση
+DocType: Student Admission Program,Student Admission Program,Πρόγραμμα Εισαγωγής Φοιτητών
 DocType: Payment Entry,Account Paid To,Καταβάλλεται στα
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Μητρική Θέση {0} δεν πρέπει να είναι ένα αναντικατάστατο
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Όλα τα προϊόντα ή τις υπηρεσίες.
@@ -3861,30 +3943,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} προϋπολογισμού για το λογαριασμό {1} από {2} {3} είναι {4}. Θα υπερβαίνει {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Σειρά {0} # Ο λογαριασμός πρέπει να είναι τύπου «Παγίων»
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Ποσότητα εκτός
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Κανόνες για τον υπολογισμό του ποσού αποστολής για την πώληση
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,και απενεργοποιημένος Απενεργοποιημένος στο
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Η σειρά είναι απαραίτητη
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Χρηματοοικονομικές υπηρεσίες
 DocType: Student Sibling,Student ID,φοιτητής ID
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Τύποι δραστηριοτήτων για την Ώρα των αρχείων καταγραφής
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Email προμηθευτή
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Τύποι δραστηριοτήτων για την Ώρα των αρχείων καταγραφής
 DocType: Tax Rule,Sales,Πωλήσεις
 DocType: Stock Entry Detail,Basic Amount,Βασικό Ποσό
 DocType: Training Event,Exam,Εξέταση
 DocType: Complaint,Complaint,Καταγγελία
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Απαιτείται αποθήκη για το είδος αποθέματος {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Απαιτείται αποθήκη για το είδος αποθέματος {0}
 DocType: Leave Allocation,Unused leaves,Αχρησιμοποίητα φύλλα
 DocType: Patient,Alcohol Past Use,Χρήση αλκοόλ στο παρελθόν
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Μέλος χρέωσης
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Μεταφορά
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Φέρε αναλυτική Λ.Υ. ( Συμπεριλαμβανομένων των υποσυνόλων )
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Μεταφορά
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Φέρε αναλυτική Λ.Υ. ( Συμπεριλαμβανομένων των υποσυνόλων )
 DocType: Authorization Rule,Applicable To (Employee),Εφαρμοστέα σε (υπάλληλος)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Due Date είναι υποχρεωτική
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Due Date είναι υποχρεωτική
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Προσαύξηση για Χαρακτηριστικό {0} δεν μπορεί να είναι 0
 DocType: Journal Entry,Pay To / Recd From,Πληρωτέο προς / λήψη από
 DocType: Naming Series,Setup Series,Εγκατάσταση σειρών
 DocType: Payment Reconciliation,To Invoice Date,Για την ημερομηνία του τιμολογίου
 DocType: Supplier,Contact HTML,Επαφή ΗΤΜΛ
 ,Inactive Customers,ανενεργοί Πελάτες
+DocType: Student Admission Program,Maximum Age,Μέγιστη ηλικία
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Αποδεικτικά παραλαβής αγορών
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Πώς εφαρμόζεται ο κανόνας τιμολόγησης;
@@ -3903,6 +3987,7 @@
 DocType: GL Entry,Remarks,Παρατηρήσεις
 DocType: Payment Entry,Account Paid From,Ο λογαριασμός που αμείβονται από
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Κωδικός είδους πρώτης ύλης
+DocType: Task,Parent Task,Γονική εργασία
 DocType: Journal Entry,Write Off Based On,Διαγραφή βάσει του
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Δημιουργία Σύστασης
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Εκτύπωση και Χαρτικά
@@ -3911,19 +3996,19 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Μισθός ήδη υποβάλλονται σε επεξεργασία για χρονικό διάστημα από {0} και {1}, Αφήστε περίοδος εφαρμογής δεν μπορεί να είναι μεταξύ αυτού του εύρους ημερομηνιών."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Αρχείο εγκατάστασης για ένα σειριακό αριθμό
 DocType: Guardian Interest,Guardian Interest,Guardian Ενδιαφέροντος
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Ρυθμίστε τις προεπιλεγμένες τιμές για τα τιμολόγια POS
 apps/erpnext/erpnext/config/hr.py +177,Training,Εκπαίδευση
 DocType: Timesheet,Employee Detail,Λεπτομέρεια των εργαζομένων
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Όνομα ταυτότητας ηλεκτρονικού ταχυδρομείου Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,επόμενη ημέρα Ημερομηνία και Επαναλάβετε την Ημέρα του μήνα πρέπει να είναι ίση
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,επόμενη ημέρα Ημερομηνία και Επαναλάβετε την Ημέρα του μήνα πρέπει να είναι ίση
 DocType: Lab Prescription,Test Code,Κωδικός δοκιμής
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Ρυθμίσεις για την ιστοσελίδα αρχική σελίδα
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},Οι RFQ δεν επιτρέπονται για {0} λόγω μίας κάρτας αποτελεσμάτων {1}
 DocType: Offer Letter,Awaiting Response,Αναμονή Απάντησης
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Παραπάνω
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Συνολικό ποσό {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Μη έγκυρο χαρακτηριστικό {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Συνολικό ποσό {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Μη έγκυρο χαρακτηριστικό {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Αναφέρετε εάν ο μη τυποποιημένος πληρωτέος λογαριασμός
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Το ίδιο στοιχείο εισήχθη πολλές φορές. {λίστα}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',"Παρακαλώ επιλέξτε την ομάδα αξιολόγησης, εκτός από τις &quot;Όλες οι ομάδες αξιολόγησης&quot;"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Σειρά {0}: Απαιτείται κέντρο κόστους για ένα στοιχείο {1}
 DocType: Training Event Employee,Optional,Προαιρετικός
@@ -3946,19 +4031,20 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Tο κέντρο κόστους είναι υποχρεωτικό για το είδος {2}
 DocType: Vehicle,Policy No,Πολιτική Όχι
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Πάρετε τα στοιχεία από Bundle Προϊόν
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Δεδομένου ότι το απόθεμα υπάρχει έναντι στοιχείου {0}, δεν μπορείτε να ενεργοποιήσετε την ιδιότητα παραλλαγών"
 DocType: Asset,Straight Line,Ευθεία
 DocType: Project User,Project User,Ο χρήστης του έργου
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Σπλιτ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Σπλιτ
 DocType: GL Entry,Is Advance,Είναι προκαταβολή
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Η συμμετοχή από και μέχρι είναι απαραίτητη
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,Παρακαλώ εισάγετε τιμή στο πεδίο 'υπεργολαβία' ναι ή όχι
+DocType: Item,Default Purchase Unit of Measure,Προεπιλεγμένη μονάδα αγοράς μέτρου
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Τελευταία ημερομηνία επικοινωνίας
 DocType: Sales Team,Contact No.,Αριθμός επαφής
 DocType: Bank Reconciliation,Payment Entries,Ενδείξεις πληρωμής
 DocType: Production Order,Scrap Warehouse,Άχρηστα Αποθήκη
 DocType: Production Order,Check if material transfer entry is not required,Ελέγξτε αν δεν απαιτείται εγγραφή μεταφοράς υλικού
 DocType: Program Enrollment Tool,Get Students From,Πάρτε φοιτητές από
-DocType: Hub Settings,Seller Country,Χώρα πωλητή
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Δημοσιεύστε Αντικείμενα στην ιστοσελίδα
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Ομάδα μαθητές σας σε παρτίδες
 DocType: Authorization Rule,Authorization Rule,Κανόνας εξουσιοδότησης
@@ -3968,7 +4054,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Φόρους επί των πωλήσεων και Χρεώσεις Πρότυπο
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Συνολική (πίστωση)
 DocType: Repayment Schedule,Payment Date,Ημερομηνία πληρωμής
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Νέα ποσότητα παρτίδας
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Νέα ποσότητα παρτίδας
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Ένδυση & αξεσουάρ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,Δεν ήταν δυνατή η επίλυση της σταθμισμένης λειτουργίας βαθμολογίας. Βεβαιωθείτε ότι ο τύπος είναι έγκυρος.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Αριθμός παραγγελίας
@@ -3986,6 +4072,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Σειρά # {0}: Asset {1} δεν μπορεί να υποβληθεί, είναι ήδη {2}"
 DocType: Tax Rule,Billing Country,Χρέωση Χώρα
 DocType: Purchase Order Item,Expected Delivery Date,Αναμενόμενη ημερομηνία παράδοσης
+DocType: Restaurant Order Entry,Restaurant Order Entry,Είσοδος Παραγγελίας Εστιατορίου
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Χρεωστικών και Πιστωτικών δεν είναι ίση για {0} # {1}. Η διαφορά είναι {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Δαπάνες ψυχαγωγίας
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Κάντε την ζήτηση Υλικό
@@ -3998,9 +4085,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Ο λογαριασμός με υπάρχουσα συναλλαγή δεν μπορεί να διαγραφεί
 DocType: Vehicle,Last Carbon Check,Τελευταία Carbon Έλεγχος
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Νομικές δαπάνες
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Παρακαλούμε επιλέξτε ποσότητα σε σειρά
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Παρακαλούμε επιλέξτε ποσότητα σε σειρά
 DocType: Purchase Invoice,Posting Time,Ώρα αποστολής
 DocType: Timesheet,% Amount Billed,Ποσό που χρεώνεται%
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",Δεν έχει οριστεί &quot;Χρόνος Ανά Ραντεβού&quot; για τον Δρ {0}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Δαπάνες τηλεφώνου
 DocType: Sales Partner,Logo,Λογότυπο
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Ελέγξτε αυτό, αν θέλετε να αναγκάσει τον χρήστη να επιλέξει μια σειρά πριν από την αποθήκευση. Δεν θα υπάρξει καμία προεπιλογή αν επιλέξετε αυτό."
@@ -4011,6 +4099,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Νέα έσοδα πελατών
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Έξοδα μετακίνησης
 DocType: Maintenance Visit,Breakdown,Ανάλυση
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Προσθήκη προσαρμοσμένου πεδίου συνδρομής στο doctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Ο λογαριασμός: {0} με το νόμισμα: {1} δεν μπορεί να επιλεγεί
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Ενημέρωση κόστους BOM αυτόματα μέσω Scheduler, με βάση το τελευταίο ποσοστό αποτίμησης / τιμοκαταλόγου / τελευταίο ποσοστό αγοράς πρώτων υλών."
 DocType: Bank Reconciliation Detail,Cheque Date,Ημερομηνία επιταγής
@@ -4035,7 +4124,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Συνολικό Ποσό Χρέωσης (μέσω χρόνος Καταγράφει)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,ID προμηθευτή
 DocType: Payment Request,Payment Gateway Details,Πληρωμή Gateway Λεπτομέρειες
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Ποσότητα θα πρέπει να είναι μεγαλύτερη από 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Ποσότητα θα πρέπει να είναι μεγαλύτερη από 0
 DocType: Journal Entry,Cash Entry,Καταχώρηση μετρητών
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,κόμβοι παιδί μπορεί να δημιουργηθεί μόνο με κόμβους τύπου «Όμιλος»
 DocType: Leave Application,Half Day Date,Μισή Μέρα Ημερομηνία
@@ -4053,12 +4142,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Σημείωση : το σημείο {0} εισήχθηκε πολλαπλές φορές
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Όλες οι επαφές.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Συντομογραφία εταιρείας
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Ο χρήστης {0} δεν υπάρχει
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Ο χρήστης {0} δεν υπάρχει
 DocType: Subscription,SUB-,ΥΠΟ-
 DocType: Item Attribute Value,Abbreviation,Συντομογραφία
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Έναρξη πληρωμής υπάρχει ήδη
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Δεν επιτρέπεται δεδομένου ότι το {0} υπερβαίνει τα όρια
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Κύρια εγγραφή προτύπου μισθολογίου.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Παθολογία
+DocType: Restaurant Order Entry,Restaurant Table,Πίνακας εστιατορίων
 DocType: Leave Type,Max Days Leave Allowed,Μέγιστο πλήθος ημερών άδειας που επιτρέπεται
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Ορισμός φορολογική Κανόνας για το καλάθι αγορών
 DocType: Purchase Invoice,Taxes and Charges Added,Φόροι και επιβαρύνσεις που προστέθηκαν
@@ -4070,10 +4161,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Προσφορές σε Συστάσεις ή Πελάτες.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Ο ρόλος έχει τη δυνατότητα επεξεργασίας παγωμένου απόθεματος
 ,Territory Target Variance Item Group-Wise,Εύρος στόχων περιοχής ανά ομάδα ειδών
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Όλες οι ομάδες πελατών
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Όλες οι ομάδες πελατών
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,συσσωρευμένες Μηνιαία
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,Η {0} είναι απαραίτητη. Ίσως δεν έχει δημιουργηθεί εγγραφή ισοτιμίας συναλλάγματος από {1} έως {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Φόρος προτύπου είναι υποχρεωτική.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Φόρος προτύπου είναι υποχρεωτική.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Ο λογαριασμός {0}: γονικός λογαριασμός {1} δεν υπάρχει
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Τιμή τιμοκαταλόγου (νόμισμα της εταιρείας)
 DocType: Products Settings,Products Settings,Ρυθμίσεις προϊόντα
@@ -4099,12 +4190,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Φορολογικές λεπτομέρειες για είδη
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Ινστιτούτο Σύντμηση
 ,Item-wise Price List Rate,Τιμή τιμοκαταλόγου ανά είδος
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Προσφορά προμηθευτή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Προσφορά προμηθευτή
 DocType: Quotation,In Words will be visible once you save the Quotation.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε το πρόσημο.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Η ποσότητα ({0}) δεν μπορεί να είναι κλάσμα στη σειρά {1}
 DocType: Consultation,C-,ΝΤΟ-
 DocType: Attendance,ATT-,ΑΤΤ
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Το barcode {0} έχει ήδη χρησιμοποιηθεί στο είδος {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Το barcode {0} έχει ήδη χρησιμοποιηθεί στο είδος {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Κανόνες για την προσθήκη εξόδων αποστολής.
 DocType: Item,Opening Stock,άνοιγμα Χρηματιστήριο
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Ο πελάτης είναι απαραίτητος
@@ -4123,9 +4214,8 @@
 DocType: Customer,From Lead,Από Σύσταση
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Παραγγελίες ανοιχτές για παραγωγή.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Επιλέξτε οικονομικό έτος...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS Προφίλ απαιτούνται για να κάνουν POS Έναρξη
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS Προφίλ απαιτούνται για να κάνουν POS Έναρξη
 DocType: Program Enrollment Tool,Enroll Students,εγγραφούν μαθητές
-DocType: Hub Settings,Name Token,Name Token
 DocType: Lab Test,Approved Date,Εγκεκριμένη ημερομηνία
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Πρότυπες πωλήσεις
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Τουλάχιστον μια αποθήκη είναι απαραίτητη
@@ -4143,7 +4233,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Ανθρώπινο Δυναμικό
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Πληρωμή συμφωνίας
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Φορολογικές απαιτήσεις
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Η Παραγγελία Παραγωγής ήταν {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Η Παραγγελία Παραγωγής ήταν {0}
 DocType: BOM Item,BOM No,Αρ. Λ.Υ.
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Η λογιστική εγγραφή {0} δεν έχει λογαριασμό {1} ή έχει ήδη αντιπαραβληθεί με άλλο αποδεικτικό
@@ -4163,7 +4253,7 @@
 DocType: Currency Exchange,To Currency,Σε νόμισμα
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Επίτρεψε στους παρακάτω χρήστες να εγκρίνουν αιτήσεις αδειών για αποκλεισμένες ημέρες.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Τύποι των αιτημάτων εξόδων.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Το ποσοστό πωλήσεων για το στοιχείο {0} είναι μικρότερο από το {1} του. Το ποσοστό πώλησης πρέπει να είναι τουλάχιστον {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Το ποσοστό πωλήσεων για το στοιχείο {0} είναι μικρότερο από το {1} του. Το ποσοστό πώλησης πρέπει να είναι τουλάχιστον {2}
 DocType: Item,Taxes,Φόροι
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Καταβληθεί και δεν παραδόθηκαν
 DocType: Project,Default Cost Center,Προεπιλεγμένο κέντρο κόστους
@@ -4177,15 +4267,15 @@
 DocType: Employee Loan,Fully Disbursed,εκταμιευθεί στο σύνολό τους
 DocType: Maintenance Visit,Customer Feedback,Σχόλια πελατών
 DocType: Account,Expense,Δαπάνη
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Σκορ δεν μπορεί να είναι μεγαλύτερο από το μέγιστο σκορ
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Σκορ δεν μπορεί να είναι μεγαλύτερο από το μέγιστο σκορ
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Πελάτες και Προμηθευτές
 DocType: Item Attribute,From Range,Από τη σειρά
 DocType: BOM,Set rate of sub-assembly item based on BOM,Ρυθμίστε το ρυθμό του στοιχείου υποσυνόρθωσης με βάση το BOM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},συντακτικό λάθος στον τύπο ή την κατάσταση: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},συντακτικό λάθος στον τύπο ή την κατάσταση: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Καθημερινή εργασία Εταιρεία Περίληψη Ρυθμίσεις
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,"Το είδος {0} αγνοήθηκε, δεδομένου ότι δεν είναι ένα αποθηκεύσιμο είδος"
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Υποβολή αυτής της εντολής παραγωγής για περαιτέρω επεξεργασία.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Υποβολή αυτής της εντολής παραγωγής για περαιτέρω επεξεργασία.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Για να μην εφαρμοστεί ο κανόνας τιμολόγησης σε μια συγκεκριμένη συναλλαγή, θα πρέπει να απενεργοποιηθούν όλοι οι εφαρμόσιμοι κανόνες τιμολόγησης."
 DocType: Assessment Group,Parent Assessment Group,Ομάδα Αξιολόγησης γονέα
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Θέσεις εργασίας
@@ -4202,12 +4292,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Ρυθμίστε το φίλτρο Εταιρεία κενό, εάν η ομάδα είναι &quot;Εταιρεία&quot;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Απόσπαση ημερομηνία αυτή δεν μπορεί να είναι μελλοντική ημερομηνία
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Σειρά # {0}: Αύξων αριθμός {1} δεν ταιριάζει με το {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,για τη δημιουργία της επαναλαμβανόμενης
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Περιστασιακή άδεια
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Εργαστήριο δοκιμής UOM.
 DocType: Batch,Batch ID,ID παρτίδας
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Σημείωση : {0}
 ,Delivery Note Trends,Τάσεις δελτίου αποστολής
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Περίληψη της Εβδομάδας
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Περίληψη της Εβδομάδας
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Σε Απόθεμα Ποσότητα
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Ο λογαριασμός: {0} μπορεί να ενημερώνεται μόνο μέσω συναλλαγών αποθέματος
 DocType: Student Group Creation Tool,Get Courses,Πάρτε μαθήματα
@@ -4221,7 +4312,6 @@
 DocType: Purchase Order,To Bill,Για τιμολόγηση
 DocType: Material Request,% Ordered,% Παραγγέλθηκαν
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Για το Student Group, το μάθημα θα επικυρωθεί για κάθε φοιτητή από τα εγγεγραμμένα μαθήματα στην εγγραφή του προγράμματος."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Εισάγετε τη διεύθυνση ηλεκτρονικού ταχυδρομείου διαχωρισμένες με κόμμα, το τιμολόγιο θα αποσταλεί αυτόματα σε συγκεκριμένη ημερομηνία"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Εργασία με το κομμάτι
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Μέση τιμή αγοράς
 DocType: Task,Actual Time (in Hours),Πραγματικός χρόνος (σε ώρες)
@@ -4235,7 +4325,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Το είδος {0} δεν είναι στημένο για σειριακούς αριθμούς. Η στήλη πρέπει να είναι κενή
 DocType: Accounts Settings,Accounts Settings,Ρυθμίσεις λογαριασμών
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,Εγκρίνω
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Δεν υπάρχει αποτέλεσμα για υποβολή
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Δεν υπάρχει αποτέλεσμα για υποβολή
 DocType: Customer,Sales Partner and Commission,Συνεργάτης Πωλήσεων και της Επιτροπής
 DocType: Employee Loan,Rate of Interest (%) / Year,Επιτόκιο (%) / Έτος
 ,Project Quantity,έργο Ποσότητα
@@ -4247,55 +4337,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Μαύρος
 DocType: BOM Explosion Item,BOM Explosion Item,Είδος ανάπτυξης Λ.Υ.
 DocType: Account,Auditor,Ελεγκτής
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} αντικείμενα που παράγονται
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} αντικείμενα που παράγονται
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Μάθε περισσότερα
 DocType: Cheque Print Template,Distance from top edge,Απόσταση από το άνω άκρο
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Τιμοκατάλογος {0} είναι απενεργοποιημένη ή δεν υπάρχει
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Τιμοκατάλογος {0} είναι απενεργοποιημένη ή δεν υπάρχει
 DocType: Purchase Invoice,Return,Απόδοση
 DocType: Production Order Operation,Production Order Operation,Λειτουργία παραγγελίας παραγωγής
 DocType: Pricing Rule,Disable,Απενεργοποίηση
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Τρόπος πληρωμής υποχρεούται να προβεί σε πληρωμή
 DocType: Project Task,Pending Review,Εκκρεμής αναθεώρηση
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Διορισμοί και διαβουλεύσεις
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} δεν είναι εγγεγραμμένος στην παρτίδα {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} δεν είναι εγγεγραμμένος στην παρτίδα {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Περιουσιακό στοιχείο {0} δεν μπορεί να καταργηθεί, δεδομένου ότι είναι ήδη {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Σύνολο αξίωση Εξόδων (μέσω αιτημάτων εξόδων)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Απών
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Σειρά {0}: Νόμισμα της BOM # {1} θα πρέπει να είναι ίσο με το επιλεγμένο νόμισμα {2}
 DocType: Journal Entry Account,Exchange Rate,Ισοτιμία
 DocType: Patient,Additional information regarding the patient,Πρόσθετες πληροφορίες σχετικά με τον ασθενή
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Η παραγγελία πώλησης {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Η παραγγελία πώλησης {0} δεν έχει υποβληθεί
 DocType: Homepage,Tag Line,Γραμμή ετικέτας
 DocType: Fee Component,Fee Component,χρέωση Component
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Διαχείριση στόλου
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Προσθήκη στοιχείων από
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Διαχείριση στόλου
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Προσθήκη στοιχείων από
 DocType: Cheque Print Template,Regular,Τακτικός
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Σύνολο weightage όλων των κριτηρίων αξιολόγησης πρέπει να είναι 100%
-DocType: BOM,Last Purchase Rate,Τελευταία τιμή αγοράς
+DocType: Purchase Order Item,Last Purchase Rate,Τελευταία τιμή αγοράς
 DocType: Account,Asset,Περιουσιακό στοιχείο
 DocType: Project Task,Task ID,Task ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Δεν μπορεί να υπάρχει απόθεμα για το είδος {0} γιατί έχει παραλλαγές
 DocType: Lab Test,Mobile,Κινητό
 ,Sales Person-wise Transaction Summary,Περίληψη συναλλαγών ανά πωλητή
 DocType: Training Event,Contact Number,Αριθμός επαφής
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Η αποθήκη {0} δεν υπάρχει
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Εγγραφή για erpnext hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Η αποθήκη {0} δεν υπάρχει
 DocType: Monthly Distribution,Monthly Distribution Percentages,Ποσοστά μηνιαίας διανομής
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Το επιλεγμένο είδος δεν μπορεί να έχει παρτίδα
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","ποσοστό αποτίμηση δεν βρέθηκε για το στοιχείο {0}, η οποία απαιτείται για να κάνει λογιστικές εγγραφές για {1} {2}. Εάν το στοιχείο συναλλάσσεται ως ένα στοιχείο του δείγματος στο {1}, παρακαλούμε να αναφέρω ότι στο {1} πίνακα Στοιχείο. Διαφορετικά, παρακαλούμε να δημιουργήσετε μια εισερχόμενη συναλλαγή μετοχών για το ρυθμό αποτίμηση στοιχείο ή αναφορά στο αρχείο του Είδους, και στη συνέχεια προσπαθήστε να αποστείλουν βιογραφικά / ακύρωση αυτήν την καταχώρηση"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Των υλικών που παραδίδονται σε αυτό το δελτίο αποστολής
+DocType: Training Event,Has Certificate,Έχει Πιστοποιητικό
 DocType: Project,Customer Details,Στοιχεία πελάτη
 DocType: Employee,Reports to,Εκθέσεις προς
 ,Unpaid Expense Claim,Απλήρωτα αξίωση Εξόδων
 DocType: Payment Entry,Paid Amount,Καταβληθέν ποσό
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Εξερευνήστε τον κύκλο πωλήσεων
 DocType: Assessment Plan,Supervisor,Επόπτης
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,σε απευθείας σύνδεση
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,σε απευθείας σύνδεση
 ,Available Stock for Packing Items,Διαθέσιμο απόθεμα για είδη συσκευασίας
 DocType: Item Variant,Item Variant,Παραλλαγή είδους
 DocType: Assessment Result Tool,Assessment Result Tool,Εργαλείο Αποτέλεσμα Αξιολόγησης
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Άχρηστα Στοιχείο
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Υποβλήθηκε εντολές δεν μπορούν να διαγραφούν
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Υποβλήθηκε εντολές δεν μπορούν να διαγραφούν
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Το υπόλοιπο του λογαριασμού είναι ήδη χρεωστικό, δεν μπορείτε να ορίσετε την επιλογή το υπόλοιπο πρέπει να είναι 'πιστωτικό'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Διαχείριση ποιότητας
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Στοιχείο {0} έχει απενεργοποιηθεί
@@ -4315,7 +4404,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Γραμμή #{0}: υπάρχει χρονική διένεξη με τη γραμμή {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Να επιτρέπεται η μηδενική τιμή αποτίμησης
 DocType: Training Event Employee,Invited,Καλεσμένος
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Πολλαπλές ενεργό Δομές Μισθός βρέθηκαν για εργαζόμενο {0} για τις δεδομένες ημερομηνίες
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Πολλαπλές ενεργό Δομές Μισθός βρέθηκαν για εργαζόμενο {0} για τις δεδομένες ημερομηνίες
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Ρύθμιση λογαριασμών πύλη.
 DocType: Employee,Employment Type,Τύπος απασχόλησης
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Πάγια
@@ -4327,7 +4416,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Φοιτητής Email ID
 DocType: Employee,Notice (days),Ειδοποίηση (ημέρες)
 DocType: Tax Rule,Sales Tax Template,Φόρος επί των πωλήσεων Πρότυπο
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Επιλέξτε αντικείμενα για να σώσει το τιμολόγιο
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Επιλέξτε αντικείμενα για να σώσει το τιμολόγιο
 DocType: Employee,Encashment Date,Ημερομηνία εξαργύρωσης
 DocType: Training Event,Internet,Internet
 DocType: Special Test Template,Special Test Template,Ειδικό πρότυπο δοκιμής
@@ -4336,7 +4425,7 @@
 DocType: Production Order,Planned Operating Cost,Προγραμματισμένο λειτουργικό κόστος
 DocType: Academic Term,Term Start Date,Term Ημερομηνία Έναρξης
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Αρίθμηση Opp
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Επισυνάπτεται #{0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Επισυνάπτεται #{0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Δήλωση ισορροπία τραπεζών σύμφωνα με τη Γενική Λογιστική
 DocType: Job Applicant,Applicant Name,Όνομα αιτούντος
 DocType: Authorization Rule,Customer / Item Name,Πελάτης / όνομα είδους
@@ -4356,7 +4445,7 @@
 DocType: Guardian,Guardian Of ,Guardian Από
 DocType: Grading Scale Interval,Threshold,Κατώφλι
 DocType: BOM Update Tool,Current BOM,Τρέχουσα Λ.Υ.
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Προσθήκη σειριακού αριθμού
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Προσθήκη σειριακού αριθμού
 DocType: Production Order Item,Available Qty at Source Warehouse,Διαθέσιμος όγκος στην αποθήκη προέλευσης
 apps/erpnext/erpnext/config/support.py +22,Warranty,Εγγύηση
 DocType: Purchase Invoice,Debit Note Issued,Χρεωστικό σημείωμα που εκδόθηκε
@@ -4379,10 +4468,9 @@
 DocType: Account,Receivable,Εισπρακτέος
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Σειρά # {0}: Δεν επιτρέπεται να αλλάξουν προμηθευτή, όπως υπάρχει ήδη παραγγελίας"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Ρόλος που έχει τη δυνατότητα να υποβάλει τις συναλλαγές που υπερβαίνουν τα όρια πίστωσης.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Επιλέξτε Στοιχεία για Κατασκευή
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Δάσκαλος συγχρονισμό δεδομένων, μπορεί να πάρει κάποιο χρόνο"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Επιλέξτε Στοιχεία για Κατασκευή
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Δάσκαλος συγχρονισμό δεδομένων, μπορεί να πάρει κάποιο χρόνο"
 DocType: Item,Material Issue,Έκδοση υλικού
-DocType: Hub Settings,Seller Description,Περιγραφή πωλητή
 DocType: Employee Education,Qualification,Προσόν
 DocType: Item Price,Item Price,Τιμή είδους
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Σαπούνι & απορρυπαντικά
@@ -4390,7 +4478,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,"Από χρόνος δεν μπορεί να είναι μεγαλύτερη από ό, τι σε καιρό."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion picture & βίντεο
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Έχουν παραγγελθεί
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,ΒΙΟΓΡΑΦΙΚΟ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,ΒΙΟΓΡΑΦΙΚΟ
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Εάν είναι ενεργοποιημένο, τότε το σύστημα δεν θα ενημερώσει τα πεδία των παραλλαγών από το πρότυπο, αλλά θα αντιγράψει τα δεδομένα των παρακάτω πεδίων κατά την παραγωγή νέας παραλλαγής"
 DocType: Salary Detail,Component,Συστατικό
 DocType: Assessment Criteria,Assessment Criteria Group,Κριτήρια Αξιολόγησης Ομάδα
 DocType: Healthcare Settings,Patient Name By,Όνομα ασθενούς από
@@ -4400,7 +4489,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Παρακαλώ εισάγετε ρόλο έγκρισης ή χρήστη έγκρισης
 DocType: Journal Entry,Write Off Entry,Καταχώρηση διαγραφής
 DocType: BOM,Rate Of Materials Based On,Τιμή υλικών με βάση
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
+DocType: Item Variant Settings,Do not Update Variants,Μην ενημερώσετε τις παραλλαγές
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Στατιστικά στοιχεία υποστήριξης
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Καταργήστε την επιλογή όλων
 DocType: POS Profile,Terms and Conditions,Όροι και προϋποθέσεις
@@ -4409,7 +4498,7 @@
 DocType: Leave Block List,Applies to Company,Ισχύει για την εταιρεία
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,"Δεν μπορεί να γίνει ακύρωση, διότι υπάρχει καταχώρηση αποθέματος {0}"
 DocType: Employee Loan,Disbursement Date,Ημερομηνία εκταμίευσης
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,Οι &quot;παραλήπτες&quot; δεν προσδιορίζονται
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,Οι &quot;παραλήπτες&quot; δεν προσδιορίζονται
 DocType: BOM Update Tool,Update latest price in all BOMs,Ενημερώστε την τελευταία τιμή σε όλα τα BOM
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Ιατρικό αρχείο
 DocType: Vehicle,Vehicle,Όχημα
@@ -4424,14 +4513,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Ενεργητικού Αποσβέσεις και Υπόλοιπα
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Ποσό {0} {1} μεταφέρεται από {2} σε {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Ποσό {0} {1} μεταφέρεται από {2} σε {3}
 DocType: Sales Invoice,Get Advances Received,Βρες προκαταβολές που εισπράχθηκαν
 DocType: Email Digest,Add/Remove Recipients,Προσθήκη / αφαίρεση παραληπτών
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Η συναλλαγή δεν επιτρέπεται σε σταματημένες εντολές παραγωγής {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Για να ορίσετε την τρέχουσα χρήση ως προεπιλογή, κάντε κλικ στο 'ορισμός ως προεπιλογή'"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Συμμετοχή
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Συμμετοχή
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Έλλειψη ποσότητας
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Παραλλαγή Θέση {0} υπάρχει με ίδια χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Παραλλαγή Θέση {0} υπάρχει με ίδια χαρακτηριστικά
 DocType: Employee Loan,Repay from Salary,Επιστρέψει από το μισθό
 DocType: Leave Application,LAP/,ΑΓΚΑΛΙΆ/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Ζητώντας την καταβολή εναντίον {0} {1} για ποσό {2}
@@ -4444,7 +4533,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Είδος παραγγελίας πώλησης
 DocType: Salary Slip,Payment Days,Ημέρες πληρωμής
 DocType: Patient,Dormant,Αδρανές
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Αποθήκες με κόμβους παιδί δεν μπορεί να μετατραπεί σε γενικό καθολικό
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Αποθήκες με κόμβους παιδί δεν μπορεί να μετατραπεί σε γενικό καθολικό
 DocType: BOM,Manage cost of operations,Διαχειριστείτε το κόστος των εργασιών
 DocType: Accounts Settings,Stale Days,Στατικές μέρες
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Όταν υποβληθεί οποιαδήποτε από τις επιλεγμένες συναλλαγές, θα ανοίξει αυτόματα ένα pop-up παράθυρο email ώστε αν θέλετε να στείλετε ένα μήνυμα email στη συσχετισμένη επαφή για την εν λόγω συναλλαγή, με τη συναλλαγή ως συνημμένη."
@@ -4458,10 +4547,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Ο σειριακός αριθμός {0} έχει ήδη ληφθεί
 ,Requested Items To Be Transferred,Είδη που ζητήθηκε να μεταφερθούν
 DocType: Expense Claim,Vehicle Log,όχημα Σύνδεση
-DocType: Purchase Invoice,Recurring Id,Id επαναλαμβανόμενου
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Παρουσία πυρετού (θερμοκρασία&gt; 38,5 ° C / 101,3 ° F ή διατηρούμενη θερμοκρασία&gt; 38 ° C / 100,4 ° F)"
 DocType: Customer,Sales Team Details,Λεπτομέρειες ομάδας πωλήσεων
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Διαγραφή μόνιμα;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Διαγραφή μόνιμα;
 DocType: Expense Claim,Total Claimed Amount,Συνολικό αιτούμενο ποσό αποζημίωσης
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Πιθανές ευκαιρίες για πώληση.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Άκυρη {0}
@@ -4471,7 +4559,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Πολυκαταστήματα
 ,Item Delivery Date,Ημερομηνία παράδοσης στοιχείου
 DocType: Warehouse,PIN,ΚΑΡΦΊΤΣΑ
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Ρύθμιση σχολείο σας ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Ρύθμιση σχολείο σας ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Βάση Αλλαγή Ποσό (Εταιρεία νομίσματος)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Δεν βρέθηκαν λογιστικές καταχωρήσεις για τις ακόλουθες αποθήκες
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Αποθηκεύστε πρώτα το έγγραφο.
@@ -4483,13 +4571,12 @@
 DocType: Task,Is Milestone,Είναι ορόσημο
 DocType: Daily Work Summary,Email Sent To,Email Sent να
 DocType: Budget,Warn,Προειδοποιώ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Είστε βέβαιοι ότι θέλετε να καταργήσετε την εγγραφή σας;
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Οποιεσδήποτε άλλες παρατηρήσεις, αξιοσημείωτη προσπάθεια που πρέπει να πάει στα αρχεία."
 DocType: BOM,Manufacturing User,Χρήστης παραγωγής
 DocType: Purchase Invoice,Raw Materials Supplied,Πρώτες ύλες που προμηθεύτηκαν
-DocType: Purchase Invoice,Recurring Print Format,Επαναλαμβανόμενες έντυπη μορφή
 DocType: C-Form,Series,Σειρά
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Το νόμισμα του τιμοκαταλόγου {0} πρέπει να είναι {1} ή {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Προσθήκη προϊόντων
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Το νόμισμα του τιμοκαταλόγου {0} πρέπει να είναι {1} ή {2}
 DocType: Appraisal,Appraisal Template,Πρότυπο αξιολόγησης
 DocType: Item Group,Item Classification,Ταξινόμηση είδους
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Διαχειριστής ανάπτυξης επιχείρησης
@@ -4503,7 +4590,7 @@
 DocType: Item Attribute Value,Attribute Value,Χαρακτηριστικό αξία
 ,Itemwise Recommended Reorder Level,Προτεινόμενο επίπεδο επαναπαραγγελίας ανά είδος
 DocType: Salary Detail,Salary Detail,μισθός Λεπτομέρειες
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Παρακαλώ επιλέξτε {0} πρώτα
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Παρακαλώ επιλέξτε {0} πρώτα
 DocType: Appointment Type,Physician,Γιατρός
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Παρτίδα {0} του σημείου {1} έχει λήξει.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Διαβουλεύσεις
@@ -4514,7 +4601,7 @@
 DocType: Salary Detail,Default Amount,Προεπιλεγμένο ποσό
 DocType: Lab Test Template,Descriptive,Περιγραφικός
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Δεν βρέθηκε η αποθήκη στο σύστημα
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Περίληψη Αυτό το Μήνα
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Περίληψη Αυτό το Μήνα
 DocType: Quality Inspection Reading,Quality Inspection Reading,Μέτρηση επιθεώρησης ποιότητας
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,Το `πάγωμα αποθεμάτων παλαιότερα από ` θα πρέπει να είναι μικρότερο από % d ημέρες.
 DocType: Tax Rule,Purchase Tax Template,Αγοράστε Φορολογικά Πρότυπο
@@ -4537,12 +4624,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Εκδηλώσεις / Αποτελέσματα Κατάρτισης
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Συσσωρευμένες Αποσβέσεις και για
 DocType: Sales Invoice,C-Form Applicable,Εφαρμόσιμο σε C-Form
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Χρόνος λειτουργίας πρέπει να είναι μεγαλύτερη από 0 για τη λειτουργία {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Χρόνος λειτουργίας πρέπει να είναι μεγαλύτερη από 0 για τη λειτουργία {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Αποθήκη είναι υποχρεωτική
 DocType: Supplier,Address and Contacts,Διεύθυνση και Επικοινωνία
 DocType: UOM Conversion Detail,UOM Conversion Detail,Λεπτομέρειες μετατροπής Μ.Μ.
 DocType: Program,Program Abbreviation,Σύντμηση πρόγραμμα
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Παραγγελία παραγωγής δεν μπορούν να προβληθούν κατά προτύπου στοιχείου
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Παραγγελία παραγωγής δεν μπορούν να προβληθούν κατά προτύπου στοιχείου
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Οι επιβαρύνσεις ενημερώνονται στην απόδειξη αγοράς για κάθε είδος
 DocType: Warranty Claim,Resolved By,Επιλύθηκε από
 DocType: Bank Guarantee,Start Date,Ημερομηνία έναρξης
@@ -4568,26 +4655,27 @@
 DocType: Employee,Educational Qualification,Εκπαιδευτικά προσόντα
 DocType: Workstation,Operating Costs,Λειτουργικά έξοδα
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Δράση αν συσσωρευμένη μηνιαία Προϋπολογισμός Υπέρβαση
-DocType: Purchase Invoice,Submit on creation,Υποβολή στη δημιουργία
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Νόμισμα για {0} πρέπει να είναι {1}
+DocType: Subscription,Submit on creation,Υποβολή στη δημιουργία
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Νόμισμα για {0} πρέπει να είναι {1}
 DocType: Asset,Disposal Date,Ημερομηνία διάθεσης
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Μηνύματα ηλεκτρονικού ταχυδρομείου θα αποσταλεί σε όλους τους ενεργούς υπαλλήλους της εταιρείας στη δεδομένη ώρα, αν δεν έχουν διακοπές. Σύνοψη των απαντήσεων θα αποσταλούν τα μεσάνυχτα."
 DocType: Employee Leave Approver,Employee Leave Approver,Υπεύθυνος έγκρισης αδειών υπαλλήλου
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Γραμμή {0}: μια καταχώρηση αναδιάταξης υπάρχει ήδη για αυτή την αποθήκη {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Δεν μπορεί να δηλώθει ως απολεσθέν, επειδή έχει γίνει προσφορά."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,εκπαίδευση Σχόλια
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Γραμμή {0}: μια καταχώρηση αναδιάταξης υπάρχει ήδη για αυτή την αποθήκη {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Δεν μπορεί να δηλώθει ως απολεσθέν, επειδή έχει γίνει προσφορά."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,εκπαίδευση Σχόλια
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Η εντολή παραγωγής {0} πρέπει να υποβληθεί
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Κριτήρια καρτών βαθμολογίας προμηθευτών
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Παρακαλώ επιλέξτε ημερομηνία έναρξης και ημερομηνία λήξης για το είδος {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Φυσικά είναι υποχρεωτική στη σειρά {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Το πεδίο έως ημερομηνία δεν μπορεί να είναι προγενέστερο από το πεδίο από ημερομηνία
 DocType: Supplier Quotation Item,Prevdoc DocType,Τύπος εγγράφου του προηγούμενου εγγράφου
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Προσθήκη / επεξεργασία τιμών
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Προσθήκη / επεξεργασία τιμών
 DocType: Batch,Parent Batch,Γονική Παρτίδα
 DocType: Cheque Print Template,Cheque Print Template,Επιταγή Πρότυπο Εκτύπωση
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Διάγραμμα των κέντρων κόστους
 DocType: Lab Test Template,Sample Collection,Συλλογή δειγμάτων
 ,Requested Items To Be Ordered,Είδη που ζητήθηκε να παραγγελθούν
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Οι παραγγελίες μου
 DocType: Price List,Price List Name,Όνομα τιμοκαταλόγου
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Καθημερινή Σύνοψη εργασίας για {0}
 DocType: Employee Loan,Totals,Σύνολα
@@ -4606,12 +4694,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} μονάδες {1} απαιτούνται {2} στο {3} {4} για {5} για να ολοκληρώσετε τη συναλλαγή αυτή.
 DocType: Fee Schedule,Student Category,φοιτητής Κατηγορία
 DocType: Announcement,Student,Φοιτητής
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Κύρια εγγραφή μονάδας (τμήματος) οργάνωσης.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Κύρια εγγραφή μονάδας (τμήματος) οργάνωσης.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Πηγαίνετε στα Δωμάτια
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Παρακαλώ εισάγετε το μήνυμα πριν από την αποστολή
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,ΑΝΑΠΛΗΡΩΣΗ ΓΙΑ ΠΡΟΜΗΘΕΥΤΗ
 DocType: Email Digest,Pending Quotations,Εν αναμονή Προσφορές
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Point-of-Sale Προφίλ
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Point-of-Sale Προφίλ
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Δοκιμές εργαστηρίου.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Ακάλυπτά δάνεια
 DocType: Cost Center,Cost Center Name,Όνομα κέντρου κόστους
@@ -4621,6 +4709,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Συνολικό καταβεβλημένο ποσό
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Τα μηνύματα που είναι μεγαλύτερα από 160 χαρακτήρες θα χωρίζονται σε πολλαπλά μηνύματα
 DocType: Purchase Receipt Item,Received and Accepted,Που έχουν παραληφθεί και έγιναν αποδεκτά
+DocType: Hub Settings,Company and Seller Profile,Προφίλ εταιρείας και πωλητή
 ,GST Itemised Sales Register,GST Αναλυτικό Μητρώο Πωλήσεων
 ,Serial No Service Contract Expiry,Λήξη σύμβασης παροχής υπηρεσιών για τον σειριακό αριθμό
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Δεν μπορείτε να πιστώσετε και να χρεώσετε ταυτόχρονα τον ίδιο λογαριασμό
@@ -4630,10 +4719,11 @@
 DocType: Item,Variant Based On,Παραλλαγή Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Το σύνολο βάρους πού έχει ανατεθεί έπρεπε να είναι 100 %. Είναι {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Οι προμηθευτές σας
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Παρακαλούμε διορθώστε το
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,"Δεν μπορεί να οριστεί ως απολεσθέν, καθώς έχει γίνει παραγγελία πώλησης."
 DocType: Request for Quotation Item,Supplier Part No,Προμηθευτής Μέρος Όχι
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',δεν μπορεί να εκπέσει όταν η κατηγορία είναι για την «Αποτίμηση» ή «Vaulation και Total»
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Ελήφθη Από
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Ελήφθη Από
 DocType: Lead,Converted,Έχει μετατραπεί
 DocType: Item,Has Serial No,Έχει σειριακό αριθμό
 DocType: Employee,Date of Issue,Ημερομηνία έκδοσης
@@ -4641,7 +4731,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Σύμφωνα με τις Ρυθμίσεις Αγορών, εάν απαιτείται Απαιτούμενη Αγορά == &#39;ΝΑΙ&#39;, τότε για τη δημιουργία Τιμολογίου Αγοράς, ο χρήστης πρέπει να δημιουργήσει πρώτα την Παραλαβή Αγοράς για το στοιχείο {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Σειρά # {0}: Ορισμός Προμηθευτή για το στοιχείο {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Σειρά {0}: Ώρες τιμή πρέπει να είναι μεγαλύτερη από το μηδέν.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Ιστοσελίδα Εικόνα {0} επισυνάπτεται στη θέση {1} δεν μπορεί να βρεθεί
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Ιστοσελίδα Εικόνα {0} επισυνάπτεται στη θέση {1} δεν μπορεί να βρεθεί
 DocType: Issue,Content Type,Τύπος περιεχομένου
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Ηλεκτρονικός υπολογιστής
 DocType: Item,List this Item in multiple groups on the website.,Εμφάνισε το είδος σε πολλαπλές ομάδες στην ιστοσελίδα.
@@ -4652,14 +4742,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Βρες καταχωρήσεις χωρίς συμφωνία
 DocType: Payment Reconciliation,From Invoice Date,Από Ημερομηνία Τιμολογίου
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Δεν έχετε δικαίωμα να υποβάλετε
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,νόμισμα χρέωσης πρέπει να είναι ίσο με το νόμισμα ή το λογαριασμό κόμμα νόμισμα είτε προεπιλογή comapany του
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,νόμισμα χρέωσης πρέπει να είναι ίσο με το νόμισμα ή το λογαριασμό κόμμα νόμισμα είτε προεπιλογή comapany του
 DocType: Healthcare Settings,Laboratory Settings,Ρυθμίσεις εργαστηρίου
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Αφήστε Εξαργύρωση
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Τι κάνει;
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Προς αποθήκη
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Όλα Εισαγωγή Φοιτητών
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Τι κάνει;
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Προς αποθήκη
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Όλα Εισαγωγή Φοιτητών
 ,Average Commission Rate,Μέσος συντελεστής προμήθειας
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,"Το πεδίο ""Έχει Σειριακό Αριθμό"" δεν μπορεί να είναι ""Ναι"" για μη αποθηκεύσιμα είδη."
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,"Το πεδίο ""Έχει Σειριακό Αριθμό"" δεν μπορεί να είναι ""Ναι"" για μη αποθηκεύσιμα είδη."
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Επιλέξτε Κατάσταση
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Η συμμετοχή δεν μπορεί να σημειωθεί για μελλοντικές ημερομηνίες
 DocType: Pricing Rule,Pricing Rule Help,Βοήθεια για τον κανόνα τιμολόγησης
@@ -4677,40 +4767,40 @@
 DocType: Item,Customer Code,Κωδικός πελάτη
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Υπενθύμιση γενεθλίων για {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Ημέρες από την τελευταία παραγγελία
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Χρέωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Χρέωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
 DocType: Buying Settings,Naming Series,Σειρά ονομασίας
 DocType: Leave Block List,Leave Block List Name,Όνομα λίστας αποκλεισμού ημερών άδειας
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ημερομηνία Ασφαλιστική Αρχή θα πρέπει να είναι μικρότερη από την ημερομηνία λήξης Ασφαλιστική
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εκπαιδευτών στο σχολείο&gt; Ρυθμίσεις σχολείου
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Ενεργητικό αποθέματος
 DocType: Timesheet,Production Detail,Λεπτομέρεια παραγωγής
+DocType: Restaurant,Active Menu,Ενεργό μενού
 DocType: Target Detail,Target Qty,Ποσ.-στόχος
 DocType: Shopping Cart Settings,Checkout Settings,Ταμείο Ρυθμίσεις
 DocType: Attendance,Present,Παρόν
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Το δελτίο αποστολής {0} δεν πρέπει να υποβάλλεται
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Το δελτίο αποστολής {0} δεν πρέπει να υποβάλλεται
 DocType: Notification Control,Sales Invoice Message,Μήνυμα τιμολογίου πώλησης
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Κλείσιμο του λογαριασμού {0} πρέπει να είναι τύπου Ευθύνης / Ίδια Κεφάλαια
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Μισθός Slip των εργαζομένων {0} ήδη δημιουργήσει για φύλλο χρόνο {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Μισθός Slip των εργαζομένων {0} ήδη δημιουργήσει για φύλλο χρόνο {1}
 DocType: Vehicle Log,Odometer,Οδόμετρο
 DocType: Sales Order Item,Ordered Qty,Παραγγελθείσα ποσότητα
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Θέση {0} είναι απενεργοποιημένη
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Θέση {0} είναι απενεργοποιημένη
 DocType: Stock Settings,Stock Frozen Upto,Παγωμένο απόθεμα μέχρι
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM δεν περιέχει κανένα στοιχείο απόθεμα
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Δραστηριότητες / εργασίες έργου
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM δεν περιέχει κανένα στοιχείο απόθεμα
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Δραστηριότητες / εργασίες έργου
 DocType: Vehicle Log,Refuelling Details,Λεπτομέρειες ανεφοδιασμού
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Δημιουργία βεβαιώσεων αποδοχών
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}",Η επιλογή αγορά πρέπει να οριστεί αν είναι επιλεγμένο το πεδίο 'εφαρμοστέο σε' ως {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Η έκπτωση πρέπει να είναι μικρότερη από 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Τελευταία ποσοστό αγορά δεν βρέθηκε
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Γράψτε εφάπαξ ποσό (Εταιρεία νομίσματος)
 DocType: Sales Invoice Timesheet,Billing Hours,Ώρες χρέωσης
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,Προεπιλογή BOM για {0} δεν βρέθηκε
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Σειρά # {0}: Παρακαλούμε ρυθμίστε την ποσότητα αναπαραγγελίας
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Προεπιλογή BOM για {0} δεν βρέθηκε
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Σειρά # {0}: Παρακαλούμε ρυθμίστε την ποσότητα αναπαραγγελίας
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Πατήστε στοιχεία για να τα προσθέσετε εδώ
 DocType: Fees,Program Enrollment,πρόγραμμα Εγγραφή
 DocType: Landed Cost Voucher,Landed Cost Voucher,Αποδεικτικό κόστους αποστολής εμπορευμάτων
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Παρακαλώ να ορίσετε {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Επανάληψη την ημέρα του μήνα
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} είναι ανενεργός φοιτητής
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} είναι ανενεργός φοιτητής
 DocType: Employee,Health Details,Λεπτομέρειες υγείας
 DocType: Offer Letter,Offer Letter Terms,Προσφορά Επιστολή Όροι
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Για να δημιουργήσετε ένα έγγραφο αναφοράς αιτήματος πληρωμής απαιτείται
@@ -4718,7 +4808,6 @@
 DocType: Employee External Work History,Salary,Μισθός
 DocType: Serial No,Delivery Document Type,Τύπος εγγράφου παράδοσης
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Υποβολή όλων των βεβαιώσεων αποδοχών για τα παραπάνω επιλεγμένα κριτήρια
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} είδη συγχρονίστηκαν
 DocType: Sales Order,Partly Delivered,Έχει παραδοθεί μερικώς
 DocType: Email Digest,Receivables,Απαιτήσεις
 DocType: Lead Source,Lead Source,Πηγή Σύστασης
@@ -4739,19 +4828,19 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Eύρος γήρανσης 2
 DocType: SG Creation Tool Course,Max Strength,Μέγιστη Αντοχή
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,Η Λ.Υ. αντικαταστάθηκε
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Επιλέξτε στοιχεία βάσει της ημερομηνίας παράδοσης
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Επιλέξτε στοιχεία βάσει της ημερομηνίας παράδοσης
 ,Sales Analytics,Ανάλυση πωλήσεων
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Διαθέσιμο {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Διαθέσιμο {0}
 ,Prospects Engaged But Not Converted,Προοπτικές που ασχολούνται αλλά δεν μετατρέπονται
 DocType: Manufacturing Settings,Manufacturing Settings,Ρυθμίσεις παραγωγής
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Ρύθμιση ηλεκτρονικού ταχυδρομείου
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Mobile Όχι
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Παρακαλώ εισάγετε προεπιλεγμένο νόμισμα στην κύρια εγγραφή της εταιρείας
 DocType: Stock Entry Detail,Stock Entry Detail,Λεπτομέρειες καταχώρησης αποθέματος
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Καθημερινές υπενθυμίσεις
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Καθημερινές υπενθυμίσεις
 DocType: Products Settings,Home Page is Products,Η αρχική σελίδα είναι προϊόντα
 ,Asset Depreciation Ledger,Ενεργητικού Αποσβέσεις Λέτζερ
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Φορολογικές Κανόνας Συγκρούσεις με {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Φορολογικές Κανόνας Συγκρούσεις με {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Νέο όνομα λογαριασμού
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Κόστος πρώτων υλών που προμηθεύτηκαν
 DocType: Selling Settings,Settings for Selling Module,Ρυθμίσεις για τη λειτουργική μονάδα πωλήσεων
@@ -4765,8 +4854,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Το είδος {0} πρέπει να είναι ένα αποθηκεύσιμο είδος
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Προεπιλογή Work In Progress Αποθήκη
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Οι προεπιλεγμένες ρυθμίσεις για λογιστικές πράξεις.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εργαζομένων σε Ανθρώπινο Δυναμικό&gt; Ρυθμίσεις HR
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Η αναμενόμενη ημερομηνία δεν μπορεί να είναι προγενέστερη της ημερομηνία αίτησης υλικού
+DocType: Restaurant,Default Tax Template,Προκαθορισμένο πρότυπο φόρου
 DocType: Fees,Student Details,Στοιχεία σπουδαστών
 DocType: Purchase Invoice Item,Stock Qty,Ποσότητα αποθέματος
 DocType: Employee Loan,Repayment Period in Months,Αποπληρωμή Περίοδος σε μήνες
@@ -4784,8 +4874,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Μεταβείτε στα στοιχεία
 DocType: Sales Partner,Partner Type,Τύπος συνεργάτη
 DocType: Purchase Taxes and Charges,Actual,Πραγματικός
+DocType: Restaurant Menu,Restaurant Manager,Διαχειριστής Εστιατορίου
 DocType: Authorization Rule,Customerwise Discount,Έκπτωση με βάση πελάτη
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Φύλλο κατανομής χρόνου για εργασίες.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Φύλλο κατανομής χρόνου για εργασίες.
 DocType: Purchase Invoice,Against Expense Account,Κατά τον λογαριασμό δαπανών
 DocType: Production Order,Production Order,Εντολή παραγωγής
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Η σημείωση εγκατάστασης {0} έχει ήδη υποβληθεί
@@ -4793,7 +4884,6 @@
 DocType: Quotation Item,Against Docname,Κατά όνομα εγγράφου
 DocType: SMS Center,All Employee (Active),Όλοι οι υπάλληλοι (ενεργοί)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Δείτε τώρα
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Επιλογή της χρονικής περιόδου που το τιμολόγιο θα δημιουργηθεί αυτόματα
 DocType: BOM,Raw Material Cost,Κόστος πρώτων υλών
 DocType: Item Reorder,Re-Order Level,Επίπεδο επαναπαραγγελίας
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Εισάγετε τα είδη και την προγραμματισμένη ποσότητα για την οποία θέλετε να δημιουργηθούν οι εντολές παραγωγής ή να κατεβάσετε τις πρώτες ύλες για την ανάλυση.
@@ -4806,23 +4896,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Ο τύπος έκθεσης είναι υποχρεωτικός
 DocType: Item,Serial Number Series,Σειρά σειριακών αριθμών
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Η αποθήκη είναι απαραίτητη για το απόθεμα του είδους {0} στη γραμμή {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Προσθήκη προγραμμάτων
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Λιανική & χονδρική πώληση
 DocType: Issue,First Responded On,Πρώτη απάντηση στις
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Εμφάνιση του είδους σε πολλαπλές ομάδες
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Η ημερομηνία έναρξης και η ημερομηνία λήξης της χρήσης έχουν ήδη τεθεί για τη χρήση {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Εκκαθάριση Ημερομηνία ενημερώθηκε
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Διαχωρίστε παρτίδα
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Διαχωρίστε παρτίδα
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Επιτυχής συμφωνία
 DocType: Request for Quotation Supplier,Download PDF,Κατεβάστε το αρχείο PDF
 DocType: Production Order,Planned End Date,Προγραμματισμένη ημερομηνία λήξης
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Εισαγάγετε την ημερομηνία προγραμματισμού
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Πού αποθηκεύονται τα είδη
 DocType: Request for Quotation,Supplier Detail,Προμηθευτής Λεπτομέρειες
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Σφάλμα στον τύπο ή την κατάσταση: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Σφάλμα στον τύπο ή την κατάσταση: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Ποσό τιμολόγησης
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Τα βάρη των κριτηρίων πρέπει να ανέλθουν στο 100%
 DocType: Attendance,Attendance,Συμμετοχή
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,Χρηματιστήριο Είδη
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,Χρηματιστήριο Είδη
 DocType: BOM,Materials,Υλικά
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Αν δεν είναι επιλεγμένο, η λίστα θα πρέπει να προστίθεται σε κάθε τμήμα όπου πρέπει να εφαρμοστεί."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Προέλευσης και προορισμού αποθήκη δεν μπορεί να είναι ίδια
@@ -4840,6 +4930,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,Στο καθαρό σύνολο
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Σχέση Χαρακτηριστικό {0} πρέπει να είναι εντός του εύρους των {1} έως {2} στα βήματα των {3} για τη θέση {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Η αποθήκη προορισμού στη γραμμή {0} πρέπει να είναι η ίδια όπως στη εντολή παραγωγής
+DocType: Restaurant Reservation,Waitlisted,Περίεργο
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Νόμισμα δεν μπορεί να αλλάξει μετά την πραγματοποίηση εγγραφών χρησιμοποιώντας κάποιο άλλο νόμισμα
 DocType: Vehicle Service,Clutch Plate,Πιάτο συμπλεκτών
 DocType: Company,Round Off Account,Στρογγυλεύουν Λογαριασμού
@@ -4856,7 +4947,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Όνομα νέο πρόσωπο πωλήσεων
 DocType: Packing Slip,Gross Weight UOM,Μ.Μ. Μικτού βάρους
 DocType: Delivery Note Item,Against Sales Invoice,Κατά το τιμολόγιο πώλησης
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Καταχωρίστε σειριακούς αριθμούς για το σειριακό στοιχείο
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Καταχωρίστε σειριακούς αριθμούς για το σειριακό στοιχείο
 DocType: Bin,Reserved Qty for Production,Διατηρούνται Ποσότητα Παραγωγής
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Αφήστε ανεξέλεγκτη αν δεν θέλετε να εξετάσετε παρτίδα ενώ κάνετε ομάδες μαθημάτων.
 DocType: Asset,Frequency of Depreciation (Months),Συχνότητα αποσβέσεων (μήνες)
@@ -4867,7 +4958,7 @@
 DocType: Lab Test,Test Group,Ομάδα δοκιμών
 DocType: Payment Reconciliation,Receivable / Payable Account,Εισπρακτέοι / πληρωτέοι λογαριασμού
 DocType: Delivery Note Item,Against Sales Order Item,Κατά το είδος στην παραγγελία πώλησης
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Παρακαλείστε να αναφέρετε Χαρακτηριστικό γνώρισμα Σχέση {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Παρακαλείστε να αναφέρετε Χαρακτηριστικό γνώρισμα Σχέση {0}
 DocType: Item,Default Warehouse,Προεπιλεγμένη αποθήκη
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Ο προϋπολογισμός δεν μπορεί να αποδοθεί κατά του λογαριασμού του Ομίλου {0}
 DocType: Healthcare Settings,Patient Registration,Εγγραφή ασθενούς
@@ -4896,6 +4987,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Πωλητής
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Προϋπολογισμός και Κέντρο Κόστους
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Δεν επιτρέπεται πολλαπλή μέθοδος προεπιλογής πληρωμής
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,για το
 ,Appointment Analytics,Αντιστοίχιση Analytics
 DocType: Vehicle Service,Half Yearly,Εξαμηνιαία
 DocType: Lead,Blog Subscriber,Συνδρομητής blog
@@ -4913,7 +5005,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Ποσοστό καταμέτρησης
 ,BOM Stock Report,Χρηματιστήριο Έκθεση BOM
 DocType: Stock Reconciliation Item,Quantity Difference,ποσότητα Διαφορά
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Επεξεργασία Μισθοδοσίας
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Επεξεργασία Μισθοδοσίας
 DocType: Opportunity Item,Basic Rate,Βασική τιμή
 DocType: GL Entry,Credit Amount,Πιστωτικές Ποσό
 DocType: Cheque Print Template,Signatory Position,υπογράφοντα Θέση
@@ -4927,12 +5019,12 @@
 DocType: Tax Rule,Tax Rule,Φορολογικές Κανόνας
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Διατηρήστε ίδια τιμολόγηση καθ'όλο τον κύκλο πωλήσεων
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Προγραμματίστε κούτσουρα χρόνο εκτός των ωρών εργασίας του σταθμού εργασίας.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Οι πελάτες στην ουρά
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Ο Δρ {0} δεν έχει Πρόγραμμα γιατρού. Προσθέστε το σε κύριο γιατρού
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Οι πελάτες στην ουρά
 DocType: Student,Nationality,Ιθαγένεια
 ,Items To Be Requested,Είδη που θα ζητηθούν
-DocType: Purchase Order,Get Last Purchase Rate,Βρες τελευταία τιμή αγοράς
 DocType: Company,Company Info,Πληροφορίες εταιρείας
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Επιλέξτε ή προσθέστε νέο πελάτη
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Επιλέξτε ή προσθέστε νέο πελάτη
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,κέντρο κόστους που απαιτείται για να κλείσετε ένα αίτημα δαπάνη
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Εφαρμογή πόρων (ενεργητικό)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Αυτό βασίζεται στην προσέλευση του υπαλλήλου αυτού
@@ -4940,6 +5032,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Ο λογαριασμός Χρεωστικές
 DocType: Fiscal Year,Year Start Date,Ημερομηνία έναρξης έτους
 DocType: Attendance,Employee Name,Όνομα υπαλλήλου
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Στοιχείο εισόδου παραγγελίας εστιατορίου
 DocType: Sales Invoice,Rounded Total (Company Currency),Στρογγυλοποιημένο σύνολο (νόμισμα της εταιρείας)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Δεν μπορείτε να μετατρέψετε σε ομάδα, επειδή έχει επιλεγεί τύπος λογαριασμού"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} Έχει τροποποιηθεί. Παρακαλώ ανανεώστε.
@@ -4950,6 +5043,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Παροχές σε εργαζομένους
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Η συσκευασμένη ποσότητα πρέπει να ισούται με την ποσότητα για το είδος {0} στη γραμμή {1}
 DocType: Production Order,Manufactured Qty,Παραγόμενη ποσότητα
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Δημιουργήθηκε τιμολόγιο
 DocType: Purchase Receipt Item,Accepted Quantity,Αποδεκτή ποσότητα
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Παρακαλούμε να ορίσετε μια προεπιλεγμένη διακοπές Λίστα υπάλληλου {0} ή της Εταιρείας {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} δεν υπάρχει
@@ -4959,18 +5053,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Σειρά Όχι {0}: Ποσό δεν μπορεί να είναι μεγαλύτερη από ό, τι εκκρεμές ποσό έναντι αιτημάτων εξόδων {1}. Εν αναμονή ποσό {2}"
 DocType: Maintenance Schedule,Schedule,Χρονοδιάγραμμα
 DocType: Account,Parent Account,Γονικός λογαριασμός
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Διαθέσιμος
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Διαθέσιμος
 DocType: Quality Inspection Reading,Reading 3,Μέτρηση 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Τύπος αποδεικτικού
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Τιμοκατάλογος δεν βρέθηκε ή άτομα με ειδικές ανάγκες
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Τιμοκατάλογος δεν βρέθηκε ή άτομα με ειδικές ανάγκες
 DocType: Lab Test,Approved,Εγκρίθηκε
 DocType: Pricing Rule,Price,Τιμή
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',Υπάλληλος ελεύθερος για {0} πρέπει να οριστεί ως έχει φύγει
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Υπάλληλος ελεύθερος για {0} πρέπει να οριστεί ως έχει φύγει
+DocType: Hub Settings,Last Sync On,Ο τελευταίος συγχρονισμός είναι ενεργοποιημένος
 DocType: Guardian,Guardian,Κηδεμόνας
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Αξιολόγηση {0} δημιουργήθηκε για τον υπάλληλο {1} στο συγκεκριμένο εύρος ημερομηνιών
 DocType: Employee,Education,Εκπαίδευση
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,Del
 DocType: Selling Settings,Campaign Naming By,Ονοματοδοσία εκστρατείας με βάση
 DocType: Employee,Current Address Is,Η τρέχουσα διεύθυνση είναι
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Μηνιαίο Στόχο Πωλήσεων (
@@ -4985,7 +5080,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Κωδικός Μαθήματος:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Παρακαλώ εισάγετε λογαριασμό δαπανών
 DocType: Account,Stock,Απόθεμα
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Σειρά # {0}: Έγγραφο Αναφοράς Τύπος πρέπει να είναι ένα από τα παραγγελίας, τιμολογίου αγοράς ή Εφημερίδα Έναρξη"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Σειρά # {0}: Έγγραφο Αναφοράς Τύπος πρέπει να είναι ένα από τα παραγγελίας, τιμολογίου αγοράς ή Εφημερίδα Έναρξη"
 DocType: Employee,Current Address,Τρέχουσα διεύθυνση
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Εάν το είδος είναι μια παραλλαγή ενός άλλου είδους, τότε η περιγραφή, η εικόνα, η τιμολόγηση, οι φόροι κλπ θα οριστούν από το πρότυπο εκτός αν οριστούν ειδικά"
 DocType: Serial No,Purchase / Manufacture Details,Αγορά / λεπτομέρειες παραγωγής
@@ -5016,7 +5111,7 @@
 DocType: Hub Settings,Hub Settings,Ρυθμίσεις hub
 DocType: Project,Gross Margin %,Μικτό κέρδος (περιθώριο) %
 DocType: BOM,With Operations,Με λειτουργίες
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Οι λογιστικές εγγραφές έχουν ήδη γίνει στο νόμισμα {0} για την εταιρεία {1}. Παρακαλώ επιλέξτε ένα εισπρακτέο ή πληρωτέο λογαριασμό με το νόμισμα {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Οι λογιστικές εγγραφές έχουν ήδη γίνει στο νόμισμα {0} για την εταιρεία {1}. Παρακαλώ επιλέξτε ένα εισπρακτέο ή πληρωτέο λογαριασμό με το νόμισμα {0}.
 DocType: Asset,Is Existing Asset,Είναι Υφιστάμενες Ενεργητικού
 DocType: Salary Detail,Statistical Component,Στατιστικό στοιχείο
 DocType: Warranty Claim,If different than customer address,Αν είναι διαφορετική από τη διεύθυνση του πελάτη
@@ -5024,13 +5119,14 @@
 DocType: BOM Operation,BOM Operation,Λειτουργία Λ.Υ.
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Στο ποσό της προηγούμενης γραμμής
 DocType: Student,Home Address,Διεύθυνση σπιτιού
+DocType: Item,Has Expiry Date,Έχει ημερομηνία λήξης
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Ρυθμίσεις παραλλαγής αντικειμένου.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,μεταβίβαση περιουσιακών στοιχείων
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,μεταβίβαση περιουσιακών στοιχείων
 DocType: POS Profile,POS Profile,POS Προφίλ
 DocType: Training Event,Event Name,Όνομα συμβάντος
 DocType: Physician,Phone (Office),Τηλέφωνο (Γραφείο)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,Άδεια
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Admissions για {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,Άδεια
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Admissions για {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Εποχικότητα για τον καθορισμό των προϋπολογισμών, στόχων κλπ"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Όνομα μεταβλητής
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Θέση {0} είναι ένα πρότυπο, επιλέξτε μία από τις παραλλαγές του"
@@ -5039,7 +5135,7 @@
 DocType: Assessment Plan,Room,Δωμάτιο
 DocType: Purchase Order,Advance Paid,Προκαταβολή που καταβλήθηκε
 DocType: Item,Item Tax,Φόρος είδους
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Υλικό Προμηθευτή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Υλικό Προμηθευτή
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Των ειδικών φόρων κατανάλωσης Τιμολόγιο
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Κατώφλι {0}% εμφανίζεται περισσότερες από μία φορά
 DocType: Expense Claim,Employees Email Id,Email ID υπαλλήλων
@@ -5050,32 +5146,30 @@
 DocType: Program,Program Name,Όνομα του προγράμματος
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Σκεφτείτε φόρο ή επιβάρυνση για
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Η πραγματική ποσότητα είναι υποχρεωτική
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} έχει σήμερα μια {1} καρτέλα βαθμολογίας προμηθευτή και οι εντολές αγοράς σε αυτόν τον προμηθευτή πρέπει να εκδίδονται με προσοχή.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} έχει σήμερα μια {1} καρτέλα βαθμολογίας προμηθευτή και οι εντολές αγοράς σε αυτόν τον προμηθευτή πρέπει να εκδίδονται με προσοχή.
 DocType: Employee Loan,Loan Type,Τύπος Δανείου
 DocType: Scheduling Tool,Scheduling Tool,εργαλείο προγραμματισμού
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Πιστωτική κάρτα
 DocType: BOM,Item to be manufactured or repacked,Είδος που θα κατασκευαστεί ή θα ανασυσκευαστεί
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Προεπιλεγμένες ρυθμίσεις για συναλλαγές αποθέματος.
-DocType: Purchase Invoice,Next Date,Επόμενη ημερομηνία
 DocType: Employee Education,Major/Optional Subjects,Σημαντικές / προαιρετικά θέματα
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
+DocType: Hub Settings,Suspended,Ανασταλεί
 DocType: Training Event,Attendees,Οι παρευρισκόμενοι
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Εδώ μπορείτε να διατηρήσετε τα στοιχεία της οικογένειας όπως το όνομα και η ιδιότητα του γονέα, σύζυγος και παιδιά"
 DocType: Academic Term,Term End Date,Term Ημερομηνία Λήξης
-DocType: Hub Settings,Seller Name,Ονομα πωλητή
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Φόροι και επιβαρύνσεις που παρακρατήθηκαν (νόμισμα της εταιρείας)
 DocType: Item Group,General Settings,Γενικές ρυθμίσεις
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Από το νόμισμα και σε νόμισμα δεν μπορεί να είναι ίδια
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Προσθέστε εκπαιδευτές
 DocType: Stock Entry,Repack,Επανασυσκευασία
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Πρέπει να αποθηκεύσετε τη φόρμα πριν προχωρήσετε
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Επιλέξτε πρώτα την εταιρεία
 DocType: Item Attribute,Numeric Values,Αριθμητικές τιμές
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Επισύναψη logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Τα επίπεδα των αποθεμάτων
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Τα επίπεδα των αποθεμάτων
 DocType: Customer,Commission Rate,Ποσό προμήθειας
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Δημιουργήθηκαν {0} scorecards για {1} μεταξύ:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Κάντε Παραλλαγή
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Κάντε Παραλλαγή
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Αποκλεισμός αιτήσεων άδειας από το τμήμα
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Τύπος πληρωμής πρέπει να είναι ένα από Λάβετε, Pay και εσωτερική μεταφορά"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -5090,11 +5184,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Μετοχικού Κεφαλαίου
 DocType: Shopping Cart Settings,Show Public Attachments,Εμφάνιση δημόσιων συνημμένων
 DocType: Packing Slip,Package Weight Details,Λεπτομέρειες βάρος συσκευασίας
+DocType: Restaurant Reservation,Reservation Time,Χρόνος κράτησης
 DocType: Payment Gateway Account,Payment Gateway Account,Πληρωμή Λογαριασμού Πύλη
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Μετά την ολοκλήρωση πληρωμής ανακατεύθυνση του χρήστη σε επιλεγμένη σελίδα.
 DocType: Company,Existing Company,Υφιστάμενες Εταιρείας
 DocType: Healthcare Settings,Result Emailed,Αποτέλεσμα με ηλεκτρονικό ταχυδρομείο
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",Η φορολογική κατηγορία έχει αλλάξει σε &quot;Σύνολο&quot; επειδή όλα τα στοιχεία δεν είναι στοιχεία απόθεμα
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Κωδικός στοιχείου&gt; Ομάδα στοιχείων&gt; Μάρκα
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Επιλέξτε ένα αρχείο csv
 DocType: Student Leave Application,Mark as Present,Επισήμανση ως Παρόν
 DocType: Supplier Scorecard,Indicator Color,Χρώμα δείκτη
@@ -5119,11 +5215,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Κάντε παρτίδας Φοιτητής
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Είναι μεταφορά σε άλλη χρήση
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Λήψη ειδών από Λ.Υ.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Λήψη ειδών από Λ.Υ.
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Ημέρες ανοχής
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Σειρά # {0}: Απόσπαση Ημερομηνία πρέπει να είναι ίδια με την ημερομηνία αγοράς {1} του περιουσιακού στοιχείου {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Ελέγξτε αν ο φοιτητής διαμένει στο Hostel του Ινστιτούτου.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Παρακαλούμε, εισάγετε Παραγγελίες στον παραπάνω πίνακα"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Παρακαλούμε, εισάγετε Παραγγελίες στον παραπάνω πίνακα"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,"Δεν Υποβλήθηκε εκκαθαριστικά σημειώματα αποδοχών,"
 ,Stock Summary,Χρηματιστήριο Περίληψη
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Μεταφορά ενός στοιχείου από μια αποθήκη σε άλλη
@@ -5139,5 +5235,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Γραμμή {0} : μια χρεωστική καταχώρηση δεν μπορεί να συνδεθεί με ένα {1}
 DocType: Journal Entry,Subscription Section,Τμήμα συνδρομής
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Ο λογαριασμός {0} δεν υπάρχει
+DocType: Training Event,Training Program,Εκπαιδευτικό Πρόγραμμα
 DocType: Account,Cash,Μετρητά
 DocType: Employee,Short biography for website and other publications.,Σύντομη βιογραφία για την ιστοσελίδα και άλλες δημοσιεύσεις.
diff --git a/erpnext/translations/en-US.csv b/erpnext/translations/en-US.csv
index e69de29..34ec298 100644
--- a/erpnext/translations/en-US.csv
+++ b/erpnext/translations/en-US.csv
@@ -0,0 +1 @@
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Billing currency must be equal to either default company's currency or party account currency
diff --git a/erpnext/translations/es-CL.csv b/erpnext/translations/es-CL.csv
index 330a930..64fdb02 100644
--- a/erpnext/translations/es-CL.csv
+++ b/erpnext/translations/es-CL.csv
@@ -6,13 +6,13 @@
 DocType: Student,Guardians,Guardianes
 DocType: Fee Schedule,Fee Schedule,Programa de Tarifas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Obtener Ítems de Paquete de Productos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM no contiene ningún ítem de stock
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM no contiene ningún ítem de stock
 DocType: Homepage,Company Tagline for website homepage,Lema de la empresa para la página de inicio del sitio web
 DocType: Delivery Note,% Installed,% Instalado
 DocType: Student,Guardian Details,Detalles del Guardián
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Nombre de Guardián 1
 DocType: Grading Scale Interval,Grade Code,Grado de Código
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,La moneda de facturación debe ser igual a la moneda por defecto de la compañía o la moneda de la cuenta de la parte
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,La moneda de facturación debe ser igual a la moneda por defecto de la compañía o la moneda de la cuenta de la parte
 DocType: Fee Schedule,Fee Structure,Estructura de Tarifas
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Calendario de Cursos creado:
 DocType: Purchase Order,Get Items from Open Material Requests,Obtener Ítems de Solicitudes Abiertas de Materiales
diff --git a/erpnext/translations/es-GT.csv b/erpnext/translations/es-GT.csv
index 175774b..917a6da 100644
--- a/erpnext/translations/es-GT.csv
+++ b/erpnext/translations/es-GT.csv
@@ -4,4 +4,4 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Saldo Pendiente
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Saldo Pendiente
 DocType: Payment Entry Reference,Outstanding,Pendiente
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la Oportunidad está hecha desde una Iniciativa
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la Oportunidad está hecha desde una Iniciativa
diff --git a/erpnext/translations/es-MX.csv b/erpnext/translations/es-MX.csv
index 308c70a..f86c755 100644
--- a/erpnext/translations/es-MX.csv
+++ b/erpnext/translations/es-MX.csv
@@ -2,16 +2,16 @@
 DocType: Student Group Student,Student Group Student,Alumno de Grupo de Estudiantes
 DocType: Delivery Note,% Installed,% Instalado
 DocType: Company,Gain/Loss Account on Asset Disposal,Cuenta de ganancia/pérdida en la disposición de activos
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,"Por favor, introduzca la Vuenta para el Cambio Monto"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,"Por favor, introduzca la Vuenta para el Cambio Monto"
 DocType: Sales Order,SO-,OV-
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,"Por favor, primero define el Código del Artículo"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,"Por favor, primero define el Código del Artículo"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Mostrar saldos de Ganancias y Perdidas de año fiscal sin cerrar
 ,Support Hour Distribution,Distribución de Hora de Soporte
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Fortaleza de Grupo Estudiante
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Por favor defina la 'Cuenta de Ganacia/Pérdida  por Ventas de Activos' en la empresa {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Por favor defina la 'Cuenta de Ganacia/Pérdida  por Ventas de Activos' en la empresa {0}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,Tipo de Permiso {0} no puede ser asignado ya que es un Permiso sin paga
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Mostrar Recibo de Nómina
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Permiso sin sueldo no coincide con los registros de Solicitud de Permiso aprobadas
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Permiso sin sueldo no coincide con los registros de Solicitud de Permiso aprobadas
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -58,16 +58,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Ganancia/Pérdida por la venta de activos
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar el Tipo de Cambio para convertir de una divisa a otra
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"Sólo Solicitudes de Permiso con estado ""Aprobado"" y ""Rechazado"" puede ser presentado"
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,El almacén de origen y el de destino deben ser diferentes
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,El almacén de origen y el de destino deben ser diferentes
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","El Artículo de Servico, el Tipo, la Frecuencia y la Cantidad de Gasto son requeridos"
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,El Importe Bruto de Compra es obligatorio
 DocType: Stock Entry,Customer or Supplier Details,Detalle de cliente o proveedor
 DocType: Lab Test Template,Standard Selling Rate,Tarifa de Venta Estándar
 DocType: Program Enrollment,School House,Casa Escuela
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +254,Please set default account in Expense Claim Type {0},"Por favor, establezca la Cuenta predeterminada en el Tipo de Reembolso de Gastos {0}"
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Los resultados no puede ser mayor que la Puntuación Máxima
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Los resultados no puede ser mayor que la Puntuación Máxima
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Por favor, establezca el filtro de Compañía en blanco si Agrupar Por es 'Compañía'"
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Para Grupo de Estudiantes por Curso, el Curso será validado para cada Estudiante de los Cursos inscritos en la Inscripción del Programa."
 DocType: School Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Para grupo de estudiantes por lotes, el lote de estudiantes se validará para cada estudiante de la inscripción del programa."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Cobro de Permiso
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Seleccionar Artículos según la fecha de entrega
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Seleccionar Artículos según la fecha de entrega
diff --git a/erpnext/translations/es-NI.csv b/erpnext/translations/es-NI.csv
index a9b17de..69fae99 100644
--- a/erpnext/translations/es-NI.csv
+++ b/erpnext/translations/es-NI.csv
@@ -7,11 +7,11 @@
 DocType: Timesheet Detail,Bill,Factura
 DocType: Activity Cost,Billing Rate,Monto de Facturación
 apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Apertura de Saldos Contables
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Regla Fiscal en conflicto con {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Regla Fiscal en conflicto con {0}
 DocType: Tax Rule,Billing County,Municipio de Facturación
 DocType: Sales Invoice Timesheet,Billing Hours,Horas de Facturación
 DocType: Timesheet,Billing Details,Detalles de Facturación
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,Moneda de facturación debe ser igual a la moneda de la empresa o moneda de cuenta de contraparte
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Moneda de facturación debe ser igual a la moneda de la empresa o moneda de cuenta de contraparte
 DocType: Tax Rule,Billing State,Región de Facturación
 DocType: Purchase Order Item,Billed Amt,Monto Facturado
 DocType: Item Tax,Tax Rate,Tasa de Impuesto
diff --git a/erpnext/translations/es-PE.csv b/erpnext/translations/es-PE.csv
index ddd2084..0d0997a 100644
--- a/erpnext/translations/es-PE.csv
+++ b/erpnext/translations/es-PE.csv
@@ -28,7 +28,7 @@
 DocType: BOM,Costing,Costeo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Venta al por menor y al por mayor
 DocType: Company,Default Holiday List,Listado de vacaciones / feriados predeterminados
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Unidad de Organización ( departamento) maestro.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Unidad de Organización ( departamento) maestro.
 DocType: Depreciation Schedule,Journal Entry,Asientos Contables
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',La cantidad completada no puede ser mayor que la cantidad a producir
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Deje que los usuarios realicen Solicitudes de Vacaciones en los siguientes días .
@@ -42,10 +42,9 @@
 DocType: Project,Expected End Date,Fecha de finalización prevista
 DocType: HR Settings,HR Settings,Configuración de Recursos Humanos
 apps/erpnext/erpnext/setup/doctype/company/company.js +84,Delete all the Transactions for this Company,Eliminar todas las transacciones para esta empresa
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Nuevo {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Nuevo {0}: # {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +48,Abbreviation is mandatory,La Abreviación es mandatoria
 DocType: Item,End of Life,Final de la Vida
-DocType: Hub Settings,Seller Website,Sitio Web Vendedor
 ,Reqd By Date,Solicitado Por Fecha
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Calculo de Salario basado en los Ingresos y la Deducción.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Usted no está autorizado para fijar el valor congelado
@@ -68,7 +67,7 @@
 DocType: Production Order,Actual Start Date,Fecha de inicio actual
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,La Fecha de Finalización de Contrato debe ser mayor que la Fecha de la Firma
 DocType: Sales Invoice Item,Delivery Note Item,Articulo de la Nota de Entrega
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Lo sentimos , las empresas no se pueden combinar"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Lo sentimos , las empresas no se pueden combinar"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Cliente requiere para ' Customerwise descuento '
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Oportunidades de venta
 DocType: Delivery Note Item,Against Sales Order Item,Contra la Orden de Venta de Artículos
@@ -86,7 +85,7 @@
 DocType: Naming Series,Help HTML,Ayuda HTML
 DocType: Production Order Operation,Actual Operation Time,Tiempo de operación actual
 DocType: Sales Order,To Deliver and Bill,Para Entregar y Bill
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Almacén requerido para la acción del artículo {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Almacén requerido para la acción del artículo {0}
 DocType: Territory,Territory Targets,Territorios Objetivos
 DocType: Warranty Claim,Warranty / AMC Status,Garantía / AMC Estado
 DocType: Attendance,Employee Name,Nombre del Empleado
@@ -95,9 +94,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Dinero Ganado
 DocType: Quotation,Term Details,Detalles de los Terminos
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Inventario Objetivo
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Inventario Objetivo
 DocType: Packing Slip,Net Weight UOM,Unidad de Medida Peso Neto
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,No existen órdenes de producción
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,No existen órdenes de producción
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Fila # {0}: conflictos con fila {1}
 DocType: BOM Operation,Operation Time,Tiempo de funcionamiento
 DocType: Leave Application,Leave Balance Before Application,Vacaciones disponibles antes de la solicitud
@@ -107,7 +106,7 @@
 DocType: Item,Warranty Period (in days),Período de garantía ( en días)
 ,Completed Production Orders,Órdenes de producción completadas
 DocType: Email Digest,Next email will be sent on:,Siguiente correo electrónico será enviado el:
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Nº de caso ya en uso. Intente Nº de caso {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Nº de caso ya en uso. Intente Nº de caso {0}
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Objetivo On
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Para no aplicar la Regla de Precios en una transacción en particular, todas las Reglas de Precios aplicables deben ser desactivadas."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Lo sentimos , Nos de serie no se puede fusionar"
@@ -132,7 +131,6 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Vista en árbol para la administración de los territorios
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Número de serie {0} entraron más de una vez
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Lista de receptores está vacía. Por favor, cree Lista de receptores"
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,El identificador único para el seguimiento de todas las facturas recurrentes. Se genera al enviar .
 DocType: Target Detail,Target Detail,Objetivo Detalle
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Plantillas de Cargos e Impuestos
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Pasivo Corriente
@@ -154,25 +152,24 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},La fecha de inicio debe ser menor que la fecha de finalización para el punto {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Precio (Moneda Local)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Convertir al Grupo
-DocType: Hub Settings,Seller Name,Nombre del Vendedor
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} registros de pago no se pueden filtrar por {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +232,Serial No {0} not in stock,Número de orden {0} no está en stock
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Fecha Ref
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Balanza de Estado de Cuenta Bancario según Libro Mayor
 DocType: Naming Series,Setup Series,Serie de configuración
 DocType: Production Order Operation,Actual Start Time,Hora de inicio actual
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Cuidado de la Salud
 DocType: Item,Manufacturer Part Number,Número de Pieza del Fabricante
 DocType: Item Reorder,Re-Order Level,Reordenar Nivel
 DocType: Customer,Sales Team Details,Detalles del equipo de ventas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Órden de Venta {0} no esta presentada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Órden de Venta {0} no esta presentada
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Tasa debe ser el mismo que {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Pedidos en firme de los clientes.
 DocType: Warranty Claim,Service Address,Dirección del Servicio
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicación de Fondos (Activos )
 DocType: Pricing Rule,Discount on Price List Rate (%),Descuento sobre la tarifa del listado de precios (%)
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,El nombre de su empresa para la que va a configurar el sistema.
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,El nombre de su empresa para la que va a configurar el sistema.
 DocType: Account,Frozen,Congelado
 DocType: Attendance,HR Manager,Gerente de Recursos Humanos
 apps/erpnext/erpnext/controllers/accounts_controller.py +407,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia : El sistema no comprobará sobrefacturación desde monto para el punto {0} en {1} es cero
@@ -207,7 +204,7 @@
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Plantilla para las evaluaciones de desempeño .
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +158,Quotation {0} is cancelled,Cotización {0} se cancela
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Inspección de la calidad requerida para el articulo {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,¿Qué hace?
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,¿Qué hace?
 DocType: Task,Actual Time (in Hours),Tiempo actual (En horas)
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Hacer Orden de Venta
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o individuos.
@@ -221,13 +218,12 @@
 DocType: Item Reorder,Re-Order Qty,Reordenar Cantidad
 DocType: Department,Days for which Holidays are blocked for this department.,Días para los que Días Feriados se bloquean para este departamento .
 DocType: Project,Customer Details,Datos del Cliente
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Descuento máximo para el elemento {0} es {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Descuento máximo para el elemento {0} es {1}%
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Año Fiscal** representa un 'Ejercicio Financiero'. Los asientos contables y otras transacciones importantes se registran contra **Año Fiscal**
 DocType: Production Planning Tool,Material Request For Warehouse,Solicitud de material para el almacén
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Cantidad actual es obligatoria
 DocType: Process Payroll,Create Salary Slip,Crear Nómina
 DocType: Stock Reconciliation,Stock Reconciliation,Reconciliación de Inventario
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La Fecha en que se la próxima factura sera generada. Se genera al enviar.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Puntuación debe ser menor o igual a 5
 DocType: Purchase Taxes and Charges,On Previous Row Total,En la Anterior Fila Total
 DocType: Stock Entry Detail,Serial No / Batch,N º de serie / lote
@@ -240,7 +236,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Desarrollador de Software
 DocType: Item,Website Item Groups,Grupos de Artículos del Sitio Web
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Gastos de Comercialización
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdido , porque la cotización ha sido hecha."
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdido , porque la cotización ha sido hecha."
 DocType: Leave Allocation,New Leaves Allocated,Nuevas Vacaciones Asignadas
 apps/erpnext/erpnext/utilities/user_progress.py +231,user@example.com,user@example.com
 DocType: Asset Movement,Source Warehouse,fuente de depósito
@@ -265,18 +261,18 @@
 DocType: Stock Entry,Sales Invoice No,Factura de Venta No
 DocType: HR Settings,Don't send Employee Birthday Reminders,En enviar recordatorio de cumpleaños del empleado
 ,Ordered Items To Be Delivered,Artículos pedidos para ser entregados
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Perfiles del Punto de Venta POS
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Perfiles del Punto de Venta POS
 DocType: Project,Total Costing Amount (via Time Logs),Monto total del cálculo del coste (a través de los registros de tiempo)
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,la lista de precios debe ser aplicable para comprar o vender
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Almacén requerido en la fila n {0}
 DocType: Purchase Invoice Item,Serial No,Números de Serie
 ,Bank Reconciliation Statement,Extractos Bancarios
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} es obligatorio para el producto {1}
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Cargo del empleado ( por ejemplo, director general, director , etc.)"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} es obligatorio para el producto {1}
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Cargo del empleado ( por ejemplo, director general, director , etc.)"
 DocType: Item,Copy From Item Group,Copiar de Grupo de Elementos
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},No existe una Solicitud de Materiales por defecto para el elemento {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},No existe una Solicitud de Materiales por defecto para el elemento {0}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) no puede ser mayor que cantidad planificada ({2}) en la Orden de Producción {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Seleccionar elemento de Transferencia
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Seleccionar elemento de Transferencia
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Fecha de acceso debe ser mayor que Fecha de Nacimiento
 DocType: Buying Settings,Settings for Buying Module,Ajustes para la compra de módulo
 DocType: Sales Person,Sales Person Targets,Metas de Vendedor
@@ -297,7 +293,7 @@
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Las transacciones sólo pueden ser borrados por el creador de la Compañía
 DocType: Cost Center,Parent Cost Center,Centro de Costo Principal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Préstamos y anticipos (Activos)
-apps/erpnext/erpnext/hooks.py +98,Shipments,Los envíos
+apps/erpnext/erpnext/hooks.py +107,Shipments,Los envíos
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,"Por favor, introduzca si 'Es Subcontratado' o no"
 apps/erpnext/erpnext/setup/doctype/company/company.py +51,Abbreviation already used for another company,La Abreviación ya está siendo utilizada para otra compañía
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Orden de Compra del Artículo Suministrado
@@ -313,7 +309,7 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Crear reglas para restringir las transacciones basadas en valores .
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea nómina para los criterios antes mencionados.
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Materia Prima Código del Artículo
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Cotizaciónes a Proveedores
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Cotizaciónes a Proveedores
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Existe un costo de actividad para el empleado {0} contra el tipo de actividad - {1}
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Establecer objetivos artículo grupo que tienen para este vendedor.
 DocType: Stock Entry,Total Value Difference (Out - In),Diferencia  (Salidas - Entradas)
@@ -354,11 +350,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Registrar pago
 DocType: Maintenance Schedule Detail,Scheduled Date,Fecha prevista
 DocType: Material Request,% Ordered,% Pedido
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',La 'Fecha de inicio estimada' no puede ser mayor que la 'Fecha de finalización estimada'
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',La 'Fecha de inicio estimada' no puede ser mayor que la 'Fecha de finalización estimada'
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detalle de Conversión de Unidad de Medida
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Para filtrar en base a la fiesta, seleccione Partido Escriba primero"
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Nombre del Contacto
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Configuración completa !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Configuración completa !
 DocType: Quotation,Quotation Lost Reason,Cotización Pérdida Razón
 DocType: Monthly Distribution,Monthly Distribution Percentages,Los porcentajes de distribución mensuales
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan para las visitas de mantenimiento.
@@ -383,7 +379,6 @@
 DocType: Employee,Salary Mode,Modo de Salario
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Por favor, ingrese el centro de costos maestro"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Supervisor de Vacaciones debe ser uno de {0}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Lanzamiento no puede ser anterior material Fecha de Solicitud
 DocType: Quotation Item,Against Doctype,Contra Doctype
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: 'Centro de Costos' es obligatorio para el producto {2}
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),El peso neto de este paquete . ( calculados automáticamente como la suma del peso neto del material)
@@ -392,7 +387,7 @@
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Para la producción por separado se crea para cada buen artículo terminado.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Cuenta {0}: Cuenta Padre {1} no existe
 DocType: Purchase Invoice,Net Total (Company Currency),Total neto (Moneda Local)
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Nota de Entrega {0} no debe estar presentada
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Nota de Entrega {0} no debe estar presentada
 ,Lead Details,Iniciativas
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
 DocType: Delivery Note,Vehicle No,Vehículo No
@@ -402,18 +397,18 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Nueva Empresa
 DocType: Employee,Permanent Address Is,Dirección permanente es
 ,Issued Items Against Production Order,Productos emitidos con una orden de producción
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} ha sido modificado. Por favor actualizar.
 DocType: Item,Item Tax,Impuesto del artículo
 ,Item Prices,Precios de los Artículos
 DocType: Account,Balance must be,Balance debe ser
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Terceros / proveedor / comisionista / afiliado / distribuidor que vende productos de empresas a cambio de una comisión.
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Trate de operaciones para la planificación de X días de antelación.
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,La fecha prevista de finalización no puede ser inferior a la fecha de inicio
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,La fecha prevista de finalización no puede ser inferior a la fecha de inicio
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,"Por favor, indique la cuenta que utilizará para el redondeo--"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Número de orden {0} no pertenece a la nota de entrega {1}
 DocType: Target Detail,Target Qty,Cantidad Objetivo
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Se menciona Peso, \n ¡Por favor indique ""Peso Unidad de Medida"" también"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Se menciona Peso, \n ¡Por favor indique ""Peso Unidad de Medida"" también"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,No se puede cambiar la tasa si hay una Solicitud de Materiales contra cualquier artículo
 DocType: Account,Accounts,Contabilidad
 DocType: Workstation,per hour,por horas
@@ -441,23 +436,22 @@
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Propósito de la Visita de Mantenimiento
 DocType: SMS Log,No of Sent SMS,No. de SMS enviados
 DocType: Account,Stock Received But Not Billed,Inventario Recibido pero no facturados
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Tiendas
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Tiendas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Fila {0}: Cantidad es obligatorio
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Tipo de informe es obligatorio
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Usuario del Sistema (login )ID. Si se establece , será por defecto para todas las formas de Recursos Humanos."
-DocType: Purchase Order,Get Last Purchase Rate,Obtenga último precio de compra
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},"El factor de conversión de la (UdM) Unidad de medida, es requerida en la linea {0}"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Nueva Aplicación de Permiso
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Electrónica
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Cuentas (o grupos) contra el que las entradas contables se hacen y los saldos se mantienen.
 DocType: Journal Entry Account,If Income or Expense,Si es un ingreso o egreso
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada para reordenar ya existe para este almacén {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada para reordenar ya existe para este almacén {1}
 DocType: Lead,Lead,Iniciativas
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},No hay suficiente saldo para Tipo de Vacaciones {0}
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquee solicitud de ausencias por departamento.
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repita los Clientes
 DocType: Account,Depreciation,Depreciación
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},"Por favor, cree Cliente de la Oportunidad {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},"Por favor, cree Cliente de la Oportunidad {0}"
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Periódico
 DocType: Payment Request,Make Sales Invoice,Hacer Factura de Venta
 DocType: Payment Entry Reference,Supplier Invoice No,Factura del Proveedor No
@@ -478,7 +472,7 @@
 DocType: Purchase Invoice,Supplied Items,Artículos suministrados
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Los usuarios con esta función pueden establecer cuentas congeladas y crear / modificar los asientos contables contra las cuentas congeladas
 DocType: Account,Debit,Débito
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","por ejemplo Banco, Efectivo , Tarjeta de crédito"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","por ejemplo Banco, Efectivo , Tarjeta de crédito"
 DocType: Production Order,Material Transferred for Manufacturing,Material transferido para fabricación
 DocType: Item Reorder,Item Reorder,Reordenar productos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Crédito a la cuenta debe ser una cuenta por pagar
@@ -488,9 +482,9 @@
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Cotizaciones recibidas de los proveedores.
 DocType: Sales Partner,Sales Partner Target,Socio de Ventas Objetivo
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Hacer Visita de Mantenimiento
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra Nota de Envio {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra Nota de Envio {0}
 DocType: Workstation,Rent Cost,Renta Costo
-apps/erpnext/erpnext/hooks.py +129,Issues,Problemas
+apps/erpnext/erpnext/hooks.py +138,Issues,Problemas
 DocType: BOM Update Tool,Current BOM,Lista de materiales actual
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Fila # {0}:
 DocType: Timesheet,% Amount Billed,% Monto Facturado
@@ -511,7 +505,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} no es un número de lote válido para el producto {1}
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Plantilla Maestra para Salario .
 apps/erpnext/erpnext/setup/doctype/company/company.py +70,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","No se puede cambiar la moneda por defecto de la compañía, porque existen transacciones, estas deben ser canceladas para cambiar la moneda por defecto."
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,La lista de materiales por defecto ({0}) debe estar activa para este producto o plantilla
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,La lista de materiales por defecto ({0}) debe estar activa para este producto o plantilla
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: Este centro de costos es un grupo. No se pueden crear asientos contables en los grupos.
 DocType: Email Digest,How frequently?,¿Con qué frecuencia ?
 DocType: C-Form Invoice Detail,Invoice No,Factura No
@@ -539,7 +533,7 @@
 DocType: Customer,From Lead,De la iniciativa
 DocType: GL Entry,Party,Socio
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Actualización de Costos
-DocType: BOM,Last Purchase Rate,Tasa de Cambio de la Última Compra
+DocType: Purchase Order Item,Last Purchase Rate,Tasa de Cambio de la Última Compra
 DocType: Bin,Actual Quantity,Cantidad actual
 DocType: Asset Movement,Stock Manager,Gerente
 DocType: Shipping Rule Condition,Shipping Rule Condition,Regla Condición inicial
@@ -589,13 +583,13 @@
 DocType: Leave Control Panel,Leave Control Panel,Salir del Panel de Control
 DocType: Monthly Distribution Percentage,Percentage Allocation,Porcentaje de asignación de
 DocType: Shipping Rule Condition,Shipping Amount,Importe del envío
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,El código del artículo es obligatorio porque el producto no se enumera automáticamente
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,El código del artículo es obligatorio porque el producto no se enumera automáticamente
 DocType: Sales Invoice Item,Sales Order Item,Articulo de la Solicitud de Venta
 apps/erpnext/erpnext/config/stock.py +168,Incoming quality inspection.,Inspección de calidad entrante
 DocType: Sales Person,Parent Sales Person,Contacto Principal de Ventas
 DocType: Warehouse,Warehouse Contact Info,Información de Contacto del Almacén
 DocType: Supplier,Statutory info and other general information about your Supplier,Información legal y otra información general acerca de su proveedor
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida {0} se ha introducido más de una vez en la Tabla de Factores de Conversión
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida {0} se ha introducido más de una vez en la Tabla de Factores de Conversión
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,'Desde Moneda' y 'A Moneda' no puede ser la misma
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Ajustes por defecto para Compras
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Centro de Costos de las transacciones existentes no se puede convertir al grupo
@@ -623,11 +617,10 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total de Impuestos Después Cantidad de Descuento
 DocType: Item,Has Serial No,Tiene No de Serie
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +97,Sales Order required for Item {0},Orden de Venta requerida para el punto {0}
-DocType: Hub Settings,Sync Now,Sincronizar ahora
 DocType: Serial No,Out of AMC,Fuera de AMC
 DocType: Leave Application,Apply / Approve Leaves,Aplicar / Aprobar Vacaciones
 DocType: Offer Letter,Select Terms and Conditions,Selecciona Términos y Condiciones
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Fila {0}: Para establecer {1} periodicidad, diferencia entre desde y hasta la fecha \
  debe ser mayor que o igual a {2}"
@@ -647,14 +640,13 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',"Estado de aprobación debe ser "" Aprobado "" o "" Rechazado """
 DocType: Employee,Holiday List,Lista de Feriados
 DocType: Selling Settings,Settings for Selling Module,Ajustes para vender Módulo
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","por ejemplo "" Herramientas para los Constructores """
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","por ejemplo "" Herramientas para los Constructores """
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Presentar todas las nóminas para los criterios seleccionados anteriormente
 DocType: Purchase Invoice,Taxes and Charges Deducted,Impuestos y Gastos Deducidos
 DocType: Production Order Operation,Actual Time and Cost,Tiempo y costo actual
 DocType: Appraisal,HR User,Usuario Recursos Humanos
 DocType: Purchase Invoice,Unpaid,No pagado
 DocType: Production Planning Tool,Create Material Requests,Crear Solicitudes de Material
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Seleccione el período en que la factura se generará de forma automática
 DocType: SMS Center,All Sales Person,Todos Ventas de Ventas
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Requisición de materiales hacia la órden de compra
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Administrar Puntos de venta.
@@ -684,6 +676,7 @@
 DocType: Leave Application,Total Leave Days,Total Vacaciones
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Plantilla de Impuestos para las transacciones de venta.
 DocType: Appraisal Goal,Score Earned,Puntuación Obtenida
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Re Abrir
 DocType: Item Reorder,Material Request Type,Tipo de Solicitud de Material
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} no encontrado
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Grado en el que la lista de precios en moneda se convierte en la moneda base de la compañía
@@ -698,7 +691,7 @@
 DocType: Stock Entry,Delivery Note No,No. de Nota de Entrega
 DocType: Journal Entry Account,Purchase Order,Órdenes de Compra
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Empleado {0} no está activo o no existe
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,Se requiere un perfil POS para crear entradas en el Punto-de-Venta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,Se requiere un perfil POS para crear entradas en el Punto-de-Venta
 ,Requested Items To Be Ordered,Solicitud de Productos Aprobados
 DocType: Salary Slip,Leave Without Pay,Licencia sin Sueldo
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Root no se puede editar .
@@ -710,7 +703,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Depósito sólo se puede cambiar a través de la Entrada de Almacén / Nota de Entrega / Recibo de Compra
 DocType: Quotation,Quotation To,Cotización Para
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Seleccione el año fiscal
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,"'Tiene Número de Serie' no puede ser ""Sí"" para elementos que son de inventario"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,"'Tiene Número de Serie' no puede ser ""Sí"" para elementos que son de inventario"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Efectivo Disponible
 DocType: Salary Component,Earning,Ganancia
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Por favor, especifique la moneda en la compañía"
@@ -721,11 +714,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Valores y Bolsas de Productos
 DocType: Subscription,Stopped,Detenido
 DocType: Item,Items with higher weightage will be shown higher,Los productos con mayor peso se mostraran arriba
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Ambos almacenes deben pertenecer a una misma empresa
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Ambos almacenes deben pertenecer a una misma empresa
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +132,Row # {0}: Cannot return more than {1} for Item {2},Fila # {0}: No se puede devolver más de {1} para el artículo {2}
 DocType: Supplier,Supplier of Goods or Services.,Proveedor de Productos o Servicios.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +124,Secretary,Secretario
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde Iniciativas
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde Iniciativas
 DocType: Production Order Operation,Operation completed for how many finished goods?,La operación se realizó para la cantidad de productos terminados?
 DocType: Rename Tool,Type of document to rename.,Tipo de documento para cambiar el nombre.
 DocType: Leave Type,Include holidays within leaves as leaves,"Incluir las vacaciones con ausencias, únicamente como ausencias"
@@ -744,8 +737,7 @@
 DocType: Upload Attendance,Get Template,Verificar Plantilla
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto de la linea {0} los impuestos de las lineas {1} también deben ser incluidos
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura Anticipadas
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Cantidad de elemento {0} debe ser menor de {1}
-DocType: Hub Settings,Seller City,Ciudad del vendedor
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Cantidad de elemento {0} debe ser menor de {1}
 DocType: Stock Ledger Entry,Stock Value Difference,Diferencia de Valor de Inventario
 DocType: Material Request Item,Min Order Qty,Cantidad mínima de Pedido (MOQ)
 DocType: Item,Website Warehouse,Almacén del Sitio Web
@@ -756,7 +748,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Imagenes de entradas ya creadas por Orden de Producción
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Especificar condiciones de calcular el importe de envío
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Este es una categoría de cliente raíz y no se puede editar.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Enviar esta Orden de Producción para su posterior procesamiento .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Enviar esta Orden de Producción para su posterior procesamiento .
 DocType: Item,Customer Items,Artículos de clientes
 DocType: Selling Settings,Customer Naming By,Naming Cliente Por
 DocType: Account,Fixed Asset,Activos Fijos
@@ -778,17 +770,15 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Clientes Nuevos
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Impuestos y Cargos (Moneda Local)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Pieza de trabajo
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,El elemento {0}: Con la cantidad ordenada {1} no puede ser menor que el pedido mínimo {2} (definido en el producto).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,El elemento {0}: Con la cantidad ordenada {1} no puede ser menor que el pedido mínimo {2} (definido en el producto).
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un almacén lógico por el cual se hacen las entradas de existencia.
 DocType: Item,Has Batch No,Tiene lote No
 DocType: Serial No,Creation Document Type,Tipo de creación de documentos
 DocType: Supplier Quotation Item,Prevdoc DocType,DocType Prevdoc
 DocType: Student Attendance Tool,Batch,Lotes de Producto
 DocType: BOM Update Tool,The BOM which will be replaced,La Solicitud de Materiales que será sustituida
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","El día del mes en el que se generará factura automática por ejemplo 05, 28, etc."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,La Cuenta con subcuentas no puede convertirse en libro de diario.
 ,Stock Projected Qty,Cantidad de Inventario Proyectada
-DocType: Hub Settings,Seller Country,País del Vendedor
 DocType: Production Order Operation,Updated via 'Time Log',Actualizado a través de 'Hora de Registro'
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} contra Factura {1} de fecha {2}
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Sus productos o servicios
@@ -820,7 +810,7 @@
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Consultas de soporte de clientes .
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Cotizaciones a Oportunidades o Clientes
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Cantidad Consumida
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
 DocType: Purchase Order Item,Supplier Part Number,Número de pieza del proveedor
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Desde fecha' debe ser después de 'Hasta Fecha'
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Cuenta con nodos hijos no se puede convertir a cuentas del libro mayor
@@ -838,7 +828,7 @@
 DocType: Leave Control Panel,Carry Forward,Cargar
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Cuenta {0} está congelada
 DocType: Maintenance Schedule Item,Periodicity,Periodicidad
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Materias primas no pueden estar en blanco.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Materias primas no pueden estar en blanco.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Fecha de la jubilación debe ser mayor que Fecha de acceso
 ,Employee Leave Balance,Balance de Vacaciones del Empleado
 DocType: Sales Person,Sales Person Name,Nombre del Vendedor
@@ -849,12 +839,12 @@
 DocType: BOM,Materials Required (Exploded),Materiales necesarios ( despiece )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Fuente de los fondos ( Pasivo )
 DocType: BOM,Exploded_items,Vista detallada
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Ajustes para el Módulo de Recursos Humanos
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Ajustes para el Módulo de Recursos Humanos
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Factura {0} debe ser cancelado antes de cancelar esta Orden Ventas
 DocType: GL Entry,Is Opening,Es apertura
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Almacén {0} no existe
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Almacén {0} no existe
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} no es un producto de stock
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,La fecha de vencimiento es obligatorio
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,La fecha de vencimiento es obligatorio
 ,Sales Person-wise Transaction Summary,Resumen de Transacción por Vendedor
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +65,Reorder Qty,Reordenar Cantidad
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Cuenta secundaria existe para esta cuenta. No es posible eliminar esta cuenta.
@@ -873,7 +863,7 @@
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Se trata de un grupo de elementos raíz y no se puede editar .
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Solicitud de Materiales especificado {0} no existe la partida {1}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma de puntos para todas las metas debe ser 100. Es {0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Hay más vacaciones que días de trabajo este mes.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Hay más vacaciones que días de trabajo este mes.
 DocType: Packing Slip,Gross Weight UOM,Peso Bruto de la Unidad de Medida
 ,Territory Target Variance Item Group-Wise,Variación de Grupo por Territorio Objetivo
 DocType: BOM,Item to be manufactured or repacked,Artículo a fabricar o embalados de nuevo
@@ -896,8 +886,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},No de serie es obligatoria para el elemento {0}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Establecer como abierto
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Requerido Por
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Diagrama de Gantt de todas las tareas .
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,La fecha en que se detiene la factura recurrente
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Diagrama de Gantt de todas las tareas .
 DocType: Purchase Order Item,Material Request Item,Elemento de la Solicitud de Material
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Solicitud de Materiales de máxima {0} se puede hacer para el punto {1} en contra de órdenes de venta {2}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Cuenta de Banco / Efectivo por Defecto defecto se actualizará automáticamente en el punto de venta de facturas cuando se selecciona este modo .
@@ -918,7 +907,7 @@
 DocType: Process Payroll,Process Payroll,Nómina de Procesos
 apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Cuenta {0}: Cuenta Padre {1} no pertenece a la compañía: {2}
 DocType: Serial No,Purchase / Manufacture Details,Detalles de Compra / Fábricas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,La cuenta para Débito debe ser una cuenta por cobrar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,La cuenta para Débito debe ser una cuenta por cobrar
 DocType: Warehouse,Warehouse Detail,Detalle de almacenes
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Enviar solicitud de materiales cuando se alcance un nivel bajo el stock
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Detalle de Calendario de Mantenimiento
@@ -929,7 +918,6 @@
 DocType: Item,Supplier Items,Artículos del Proveedor
 DocType: Opportunity,Contact Mobile No,No Móvil del Contacto
 DocType: C-Form Invoice Detail,Invoice Date,Fecha de la factura
-DocType: Purchase Invoice,Repeat on Day of Month,Repita el Día del mes
 DocType: Employee,Date Of Retirement,Fecha de la jubilación
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,"Por favor, establece campo ID de usuario en un registro de empleado para establecer Función del Empleado"
 DocType: Products Settings,Home Page is Products,Pagína de Inicio es Productos
@@ -937,7 +925,7 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Establecer como Perdidos
 ,Sales Partners Commission,Comisiones de Ventas
 ,Sales Person Target Variance Item Group-Wise,Variación por Vendedor de Meta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser enviada
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser enviada
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},"Por favor, seleccione la Solicitud de Materiales en el campo de Solicitud de Materiales para el punto {0}"
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Grado a la que la moneda de proveedor se convierte en la moneda base de la compañía
 DocType: Lead,Person Name,Nombre de la persona
@@ -952,12 +940,12 @@
 DocType: Job Opening,Description of a Job Opening,Descripción de una oferta de trabajo
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,El seguimiento preciso del proyecto no está disponible para la cotización--
 DocType: Company,Stock Settings,Ajustes de Inventarios
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,División principal de la organización.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,División principal de la organización.
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +29,Global POS Profile {0} already created for company {1},El perfil de POS global {0} ya fue creado para la compañía {1}
 DocType: Quotation Item,Quotation Item,Cotización del artículo
 DocType: Employee,Date of Issue,Fecha de emisión
 DocType: Sales Invoice Item,Sales Invoice Item,Articulo de la Factura de Venta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Cliente {0} no pertenece a proyectar {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Cliente {0} no pertenece a proyectar {1}
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra la Factura de Venta de Artículos
 DocType: Sales Invoice,Accounting Details,detalles de la contabilidad
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Entradas en el diario de contabilidad.
@@ -967,25 +955,24 @@
 DocType: Account,Expense Account,Cuenta de gastos
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programa de mantenimiento {0} debe ser cancelado antes de cancelar esta orden de venta
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Cantidad actual después de la transacción
-DocType: Hub Settings,Seller Email,Correo Electrónico del Vendedor
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Cualquiera Cantidad Meta o Monto Meta es obligatoria
 DocType: Authorization Rule,Applicable To (Role),Aplicable a (Rol )
 DocType: Purchase Invoice Item,Amount (Company Currency),Importe (Moneda Local)
 apps/erpnext/erpnext/projects/doctype/project/project.js +64,Gantt Chart,Diagrama de Gantt
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: Cantidad de Material Solicitado es menor que Cantidad Mínima Establecida
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: Cantidad de Material Solicitado es menor que Cantidad Mínima Establecida
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planear bitácora de trabajo para las horas fuera de la estación.
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aquí usted puede mantener la altura , el peso, alergias , problemas médicos , etc"
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Contra la Entrada de Diario {0} no tiene ninguna {1} entrada que vincular
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: Rechazado Cantidad no se puede introducir en la Compra de Retorno
 apps/erpnext/erpnext/config/accounts.py +306,Enable / disable currencies.,Habilitar / Deshabilitar el tipo de monedas
 DocType: Stock Entry,Material Transfer for Manufacture,Trasferencia de Material para Manufactura
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Para combinar, la siguientes propiedades deben ser las mismas para ambos artículos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Para combinar, la siguientes propiedades deben ser las mismas para ambos artículos"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Número de orden {0} tiene un contrato de mantenimiento hasta {1}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Por favor, extraiga los productos desde la nota de entrega--"
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Asignar las vacaciones para un período .
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Mezclar Solicitud de Materiales (incluyendo subconjuntos )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Mezclar Solicitud de Materiales (incluyendo subconjuntos )
 DocType: Stock Settings,Auto Material Request,Solicitud de Materiales Automatica
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Obtener elementos de la Solicitud de Materiales
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Obtener elementos de la Solicitud de Materiales
 apps/erpnext/erpnext/config/selling.py +229,Customer Addresses And Contacts,Las direcciones de clientes y contactos
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: You can not assign itself as parent account,Cuenta {0}: no puede asignar la misma cuenta como su cuenta Padre.
 DocType: Item Price,Item Price,Precios de Productos
@@ -1054,16 +1041,15 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Monto Sobrepasado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Fila {0}: Crédito no puede vincularse con {1}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Tarjeta de Crédito
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Partidas contables ya han sido realizadas en {0} para la empresa {1}. Por favor seleccione una cuenta por cobrar o pagar con moneda {0}
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Partidas contables ya han sido realizadas en {0} para la empresa {1}. Por favor seleccione una cuenta por cobrar o pagar con moneda {0}
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Duplicar fila {0} con el mismo {1}
 DocType: Leave Application,Leave Application,Solicitud de Vacaciones
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +885,For Supplier,Por proveedor
-DocType: Hub Settings,Seller Description,Descripción del Vendedor
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Informe de visita por llamada de mantenimiento .
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Vista en árbol para la administración de las categoría de vendedores
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,El numero de serie no tiene almacén. el almacén debe establecerse por entradas de stock o recibos de compra
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Condiciones coincidentes encontradas entre :
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique 'Desde el caso No.' válido"
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',"Por favor, especifique 'Desde el caso No.' válido"
 DocType: Process Payroll,Make Bank Entry,Hacer Entrada del Banco
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +794,Item or Warehouse for row {0} does not match Material Request,Artículo o Bodega para la fila {0} no coincide Solicitud de material
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,'Total','Total'
@@ -1076,7 +1062,7 @@
 DocType: Item,Default BOM,Solicitud de Materiales por Defecto
 ,Delivery Note Trends,Tendencia de Notas de Entrega
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Número de orden {0} ya se ha recibido
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Proyecto maestro
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +47,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Sólo puede haber una Condición de Regla de Envió  con valor 0 o valor en blanco para ""To Value"""
 DocType: Item Group,Item Group Name,Nombre del grupo de artículos
@@ -1089,7 +1075,6 @@
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Obtener Ordenes de venta (pendientes de entrega) basados en los criterios anteriores
 ,Serial No Status,Número de orden Estado
 DocType: Bin,Ordered Quantity,Cantidad Pedida
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} productos sincronizados
 DocType: Item,UOMs,Unidades de Medida
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifa de la lista de precios (Moneda Local)
 DocType: Monthly Distribution,Distribution Name,Nombre del Distribución
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index 5a718db..231f91b 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -1,10 +1,10 @@
 DocType: Employee,Salary Mode,Modo de pago
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Registro
 DocType: Patient,Divorced,Divorciado
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Productos ya sincronizados
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permitir añadir el artículo varias veces en una transacción
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancelar visita {0} antes de cancelar este reclamo de garantía
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Productos de consumo
-DocType: Purchase Receipt,Subscription Detail,Detalle de suscripción
+DocType: Purchase Receipt,Subscription Detail,Detalle de Suscripción
 DocType: Supplier Scorecard,Notify Supplier,Notificar al Proveedor
 DocType: Item,Customer Items,Partidas de deudores
 DocType: Project,Costing and Billing,Cálculo de Costos y Facturación
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Supervisores de ausencias
 DocType: Sales Partner,Dealer,Distribuidor
 DocType: Consultation,Investigations,Investigaciones
+DocType: Restaurant Order Entry,Click Enter To Add,Haga clic en Entrar para agregar
 DocType: Employee,Rented,Arrendado
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Aplicable para el Usuario
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","La orden de producción detenida no puede ser cancelada, inicie de nuevo para cancelarla"
 DocType: Vehicle Service,Mileage,Kilometraje
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,¿Realmente desea desechar este activo?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,¿Realmente desea desechar este activo?
 DocType: Drug Prescription,Update Schedule,Actualizar Programa
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Elija un proveedor predeterminado
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},La divisa/moneda es requerida para lista de precios {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Consultar disponibilidad
 DocType: Job Applicant,Job Applicant,Solicitante de empleo
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Esto se basa en transacciones con este proveedor. Ver cronología abajo para más detalles
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,No hay más resultados.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Legal
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},El tipo de impuesto real no puede incluirse en la tarifa del artículo en la fila {0}
 DocType: Bank Guarantee,Customer,Cliente
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),El tipo de cambio debe ser el mismo que {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nombre del cliente
 DocType: Vehicle,Natural Gas,Gas natural
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},La cuenta bancaria no puede nombrarse como {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},La cuenta bancaria no puede nombrarse como {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Cuentas (o grupos) para el cual los asientos contables se crean y se mantienen los saldos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),El pago pendiente para {0} no puede ser menor que cero ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,No hay boletas de salario enviadas para procesar.
 DocType: Manufacturing Settings,Default 10 mins,Por defecto 10 minutos
 DocType: Leave Type,Leave Type Name,Nombre del tipo de ausencia
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Mostrar abiertos
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Es necesario tomar esta acción hoy mismo para la recurrente mencionada
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Secuencia actualizada correctamente
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Pedido
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Entrada de Diario por Devengo Enviada
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Productos por recibir desde orden de compra
 DocType: SMS Center,All Supplier Contact,Todos Contactos de Proveedores
 DocType: Support Settings,Support Settings,Configuración de respaldo
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,La fecha prevista de finalización no puede ser inferior a la fecha prevista de inicio
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,La fecha prevista de finalización no puede ser inferior a la fecha prevista de inicio
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila #{0}: El valor debe ser el mismo que {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Nueva solicitud de ausencia
 ,Batch Item Expiry Status,Estado de Caducidad de Lote de Productos
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Giro bancario
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pago a cuenta
 DocType: Consultation,Consultation,Consulta
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Ventas y devoluciones
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Mostrar variantes
 DocType: Academic Term,Academic Term,Término Académico
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Material
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Asistencia médica
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Retraso en el pago (días)
 DocType: Lab Prescription,Lab Prescription,Prescripción de Laboratorio
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Ordenar por precio
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Gasto de Servicio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de serie: {0} ya se hace referencia en Factura de venta: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Factura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de serie: {0} ya se hace referencia en Factura de venta: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodo
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Año Fiscal {0} es necesario
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensa
@@ -91,21 +94,21 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Fila #{0}:
 DocType: Timesheet,Total Costing Amount,Importe total del cálculo del coste
 DocType: Delivery Note,Vehicle No,Nro de Vehículo.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,"Por favor, seleccione la lista de precios"
-DocType: Accounts Settings,Currency Exchange Settings,Configuración de cambio de moneda
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,"Por favor, seleccione la lista de precios"
+DocType: Accounts Settings,Currency Exchange Settings,Configuración de Cambio de Moneda
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Fila #{0}: Documento de Pago es requerido para completar la transacción
 DocType: Production Order Operation,Work In Progress,Trabajo en proceso
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Por favor seleccione la fecha
 DocType: Employee,Holiday List,Lista de festividades
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Configurar el sistema de nombres de instructores en la escuela&gt; Configuración de la escuela
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Contador
+DocType: Hub Settings,Selling Price List,Lista de precios de venta
 DocType: Patient,Tobacco Current Use,Consumo Actual de Tabaco
 DocType: Cost Center,Stock User,Usuario de almacén
 DocType: Company,Phone No,Teléfono No.
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Calendario de cursos creados:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Nuevo/a {0}: #{1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Nuevo/a {0}: #{1}
 ,Sales Partners Commission,Comisiones de socios de ventas
-DocType: Purchase Invoice,Rounding Adjustment,Ajuste de redondeo
+DocType: Purchase Invoice,Rounding Adjustment,Ajuste de Redondeo
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Abreviatura no puede tener más de 5 caracteres
 DocType: Physician Schedule Time Slot,Physician Schedule Time Slot,Ranura de tiempo del Horario del Médico
 DocType: Payment Request,Payment Request,Solicitud de Pago
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Detalle principal docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referencia: {0}, Código del Artículo: {1} y Cliente: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kilogramo
-DocType: Student Log,Log,Log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Apertura de un puesto
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Resultado enviado
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Resultado enviado
 DocType: Item Attribute,Increment,Incremento
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Espacio de tiempo
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Seleccione Almacén ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Casado
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},No está permitido para {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Obtener artículos de
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra la nota de envío {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra la nota de envío {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Producto {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,No hay elementos en la lista
 DocType: Payment Reconciliation,Reconcile,Conciliar
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondo de pensiones
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Siguiente Fecha de Depreciación no puede ser anterior a la Fecha de Compra
 DocType: Consultation,Consultation Date,Fecha de Consulta
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Listado de productos y descubrimiento para usuarios de ERPNext
 DocType: SMS Center,All Sales Person,Todos los vendedores
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ** Distribución mensual ayuda a distribuir el presupuesto / Target a través de meses si tiene la estacionalidad de su negocio.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,No se encontraron artículos
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Falta Estructura Salarial
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,No se encontraron artículos
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Falta Estructura Salarial
 DocType: Lead,Person Name,Nombre de persona
 DocType: Sales Invoice Item,Sales Invoice Item,Producto de factura de venta
 DocType: Account,Credit,Haber
 DocType: POS Profile,Write Off Cost Center,Desajuste de centro de costos
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""","por ejemplo, &quot;escuela primaria&quot; o &quot;Universidad&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""","por ejemplo, &quot;escuela primaria&quot; o &quot;Universidad&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Reportes de Stock
 DocType: Warehouse,Warehouse Detail,Detalles del Almacén
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Límite de crédito ha sido sobrepasado para el cliente {0} {1}/{2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"La fecha final de duración no puede ser posterior a la fecha de fin de año del año académico al que está vinculado el término (año académico {}). Por favor, corrija las fechas y vuelve a intentarlo."
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Es el activo fijo&quot; no puede estar sin marcar, ya que existe registro de activos contra el elemento"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Es activo fijo"" no puede estar sin marcar, ya que existe registro de activos contra el elemento"
 DocType: Vehicle Service,Brake Oil,Aceite de Frenos
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de clientes&gt; Territorio
 DocType: Tax Rule,Tax Type,Tipo de impuestos
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Base Imponible
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},No tiene permisos para agregar o actualizar las entradas antes de {0}
 DocType: BOM,Item Image (if not slideshow),Imagen del producto (si no son diapositivas)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Existe un cliente con el mismo nombre
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarifa por hora / 60) * Tiempo real de la operación
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Fila #{0}: El tipo de documento de referencia debe ser uno de Reembolso de Gastos o Asiento Contable
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Seleccione la lista de materiales
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Fila #{0}: El tipo de documento de referencia debe ser uno de Reembolso de Gastos o Asiento Contable
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Seleccione la lista de materiales
 DocType: SMS Log,SMS Log,Registros SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Costo de productos entregados
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,El día de fiesta en {0} no es entre De la fecha y Hasta la fecha
@@ -194,8 +197,8 @@
 DocType: BOM,Total Cost,Coste total
 DocType: Journal Entry Account,Employee Loan,Préstamo de Empleado
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Registro de Actividad:
-DocType: Fee Schedule,Send Payment Request Email,Enviar solicitud de pago Email
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,El elemento {0} no existe en el sistema o ha expirado
+DocType: Fee Schedule,Send Payment Request Email,Enviar Solicitud de Pago por Email
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,El elemento {0} no existe en el sistema o ha expirado
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Bienes raíces
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Estado de cuenta
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Productos farmacéuticos
@@ -210,17 +213,22 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Importar registro
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Traer Solicitud de materiales de tipo Fabricación en base a los criterios anteriores
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Baja satisfactoria.
 DocType: Training Result Employee,Grade,Grado
+DocType: Restaurant Table,No of Seats,No de asientos
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Para añadir temas dinámicos, utilice etiquetas jinja como <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Entregado por proveedor
 DocType: SMS Center,All Contact,Todos los Contactos
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Orden de producción ya se ha creado para todos los elementos con la lista de materiales
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Orden de producción ya se ha creado para todos los elementos con la lista de materiales
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Salario Anual
 DocType: Daily Work Summary,Daily Work Summary,Resumen diario de Trabajo
 DocType: Period Closing Voucher,Closing Fiscal Year,Cerrando el año fiscal
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} está congelado
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,"Por favor, seleccione empresa ya existente para la creación del plan de cuentas"
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} está congelado
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,"Por favor, seleccione empresa ya existente para la creación del plan de cuentas"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Gastos sobre existencias
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Seleccionar Almacén Objetivo
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Seleccionar Almacén Objetivo
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Por favor, introduzca el contacto de correo electrónico preferido"
 DocType: Program Enrollment,School Bus,Autobús Escolar
 DocType: Journal Entry,Contra Entry,Entrada contra
@@ -238,9 +246,10 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Descargue la plantilla, para rellenar los datos apropiados y adjuntar el archivo modificado.
  Todas las fechas y los empleados en el período seleccionado se adjuntara a la planilla, con los registros de asistencia existentes."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,El producto {0} no está activo o ha llegado al final de la vida útil
+DocType: Student Admission Program,Minimum Age,Edad mínima
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Ejemplo: Matemáticas Básicas
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto en la línea {0} los impuestos de las lineas {1} tambien deben ser incluidos
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Configuracion para módulo de recursos humanos (RRHH)
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Configuracion para módulo de recursos humanos (RRHH)
 DocType: SMS Center,SMS Center,Centro SMS
 DocType: Sales Invoice,Change Amount,Importe de Cambio
 DocType: BOM Update Tool,New BOM,Nueva Solicitud de Materiales
@@ -250,7 +259,7 @@
 DocType: Lead,Request Type,Tipo de solicitud
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Crear Empleado
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Difusión
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Añadir Habitaciones
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Modo de configuración de POS (en línea / fuera de línea)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Ejecución
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detalles de las operaciones realizadas.
 DocType: Serial No,Maintenance Status,Estado del Mantenimiento
@@ -273,6 +282,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,La lista de precios debe ser aplicable para las compras o ventas
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},La fecha de instalación no puede ser antes de la fecha de entrega para el elemento {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Dto (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Bioquímica
 DocType: Offer Letter,Select Terms and Conditions,Seleccione términos y condiciones
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,Fuera de Valor
 DocType: Production Planning Tool,Sales Orders,Ordenes de venta
@@ -307,15 +317,15 @@
 DocType: Sales Partner,Reseller,Re-vendedor
 DocType: Codification Table,Medical Code,Código Médico
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Si se selecciona, se incluirán productos no están en stock en las solicitudes de materiales."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,"Por favor, introduzca compañia"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,"Por favor, introduzca compañia"
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra la factura de venta del producto
 ,Production Orders in Progress,Órdenes de producción en progreso
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Efectivo neto de financiación
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","Almacenamiento Local esta lleno, no se guardó"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","Almacenamiento Local esta lleno, no se guardó"
 DocType: Lead,Address & Contact,Dirección y Contacto
 DocType: Leave Allocation,Add unused leaves from previous allocations,Añadir permisos no usados de asignaciones anteriores
 DocType: Sales Partner,Partner website,Sitio web de colaboradores
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Añadir artículo
+DocType: Restaurant Order Entry,Add Item,Añadir artículo
 DocType: Lab Test,Custom Result,Resultado Personalizado
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Nombre de contacto
 DocType: Course Assessment Criteria,Course Assessment Criteria,Criterios de Evaluación del Curso
@@ -328,7 +338,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Solicitudes de compra.
 DocType: Lab Test,Submitted Date,Fecha de Envío
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Esto se basa en la tabla de tiempos creada en contra de este proyecto
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Pago Neto no puede ser menor que 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Pago Neto no puede ser menor que 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Para dejar de enviar notificaciones de errores repetitivos desde el sistema, hemos marcado el campo Deshabilitado en la suscripción"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Sólo el supervisor de ausencias responsable puede validar esta solicitud de permiso
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,La fecha de relevo debe ser mayor que la fecha de inicio
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Ausencias por año
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,Perdidas & Ganancias
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Litro
 DocType: Task,Total Costing Amount (via Time Sheet),Importe total del cálculo del coste (mediante el cuadro de horario de trabajo)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,"Por favor, configure los estudiantes en grupos de estudiantes"
 DocType: Item Website Specification,Item Website Specification,Especificación del producto en la WEB
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Vacaciones Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Asientos Bancarios
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Elemento de reconciliación de inventarios
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Curso herramienta de creación de grupo de alumnos
 DocType: Lead,Do Not Contact,No contactar
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,Personas que enseñan en su organización
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,El ID único para el seguimiento de todas las facturas recurrentes. Este es generado al validar.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Desarrollador de Software.
 DocType: Item,Minimum Order Qty,Cantidad mínima de la orden
 DocType: Pricing Rule,Supplier Type,Tipo de proveedor
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,Publicar en el Hub
 DocType: Student Admission,Student Admission,Admisión de Estudiantes
 ,Terretory,Territorio
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,El producto {0} esta cancelado
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Solicitud de Materiales
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,El producto {0} esta cancelado
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Solicitud de Materiales
 DocType: Bank Reconciliation,Update Clearance Date,Actualizar fecha de liquidación
 DocType: Item,Purchase Details,Detalles de Compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},El elemento {0} no se encuentra en 'Materias Primas Suministradas' en la tabla de la órden de compra {1}
 DocType: Patient Relation,Relation,Relación
 DocType: Shipping Rule,Worldwide Shipping,Envío al mundo entero
 DocType: Patient Relation,Mother,Madre
+DocType: Restaurant Reservation,Reservation End Time,Hora de finalización de la reserva
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Ordenes de clientes confirmadas.
 DocType: Purchase Receipt Item,Rejected Quantity,Cantidad rechazada
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Pedido de pago {0} creado
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Pedido de pago {0} creado
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Baja sensibilidad
 DocType: Notification Control,Notification Control,Control de notificaciónes
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Por favor confirme una vez que haya completado su formación
 DocType: Lead,Suggestions,Sugerencias.
@@ -388,7 +401,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Envíe por correo electrónico el recibo de salario al empleado basándose en el correo electrónico preferido seleccionado en Empleado
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,El primer supervisor de ausencias en la lista sera definido como el administrador de ausencias/vacaciones predeterminado.
 DocType: Tax Rule,Shipping County,País de envío
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Aprender
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Aprender
 DocType: Asset,Next Depreciation Date,Siguiente Fecha de Depreciación
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Coste de actividad por empleado
 DocType: Accounts Settings,Settings for Accounts,Ajustes de contabilidad
@@ -399,13 +412,13 @@
 DocType: Item,Synced With Hub,Sincronizado con Hub.
 DocType: Vehicle,Fleet Manager,Gerente de Fota
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Fila #{0}: {1} no puede ser negativo para el elemento {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Contraseña Incorrecta
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Contraseña Incorrecta
 DocType: Item,Variant Of,Variante de
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',La cantidad completada no puede ser mayor que la cantidad a manufacturar.
 DocType: Period Closing Voucher,Closing Account Head,Cuenta principal de cierre
 DocType: Employee,External Work History,Historial de trabajos externos
 DocType: Physician,Time per Appointment,Tiempo por Cita
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Error de referencia circular
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Error de referencia circular
 DocType: Appointment Type,Is Inpatient,Es paciente hospitalizado
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Nombre del Tutor1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,En palabras (Exportar) serán visibles una vez que guarde la nota de entrega.
@@ -414,19 +427,18 @@
 DocType: Lead,Industry,Industria
 DocType: Employee,Job Profile,Perfil del puesto
 DocType: BOM Item,Rate & Amount,Tasa y Cantidad
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure las series de numeración para Asistencia mediante Configuración&gt; Serie de numeración
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Esto se basa en transacciones contra esta Compañía. Vea la cronología a continuación para más detalles
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificarme por Email cuando se genere una nueva requisición de materiales
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Resistente
 DocType: Journal Entry,Multi Currency,Multi Moneda
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de factura
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de clientes&gt; Territorio
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Nota de entrega
 DocType: Consultation,Encounter Impression,Encuentro de la Impresión
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Configuración de Impuestos
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Costo del activo vendido
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,"El registro del pago ha sido modificado antes de su modificación. Por favor, inténtelo de nuevo."
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} se ingresó dos veces en impuesto del artículo
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Resumen para esta semana y actividades pendientes
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} se ingresó dos veces en impuesto del artículo
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Resumen para esta semana y actividades pendientes
 DocType: Student Applicant,Admitted,Aceptado
 DocType: Workstation,Rent Cost,Costo de arrendamiento
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Cantidad Después de Depreciación
@@ -440,36 +452,35 @@
 DocType: Shipping Rule,Valid for Countries,Válido para Países
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Este producto es una plantilla y no se puede utilizar en las transacciones. Los atributos del producto se copiarán sobre las variantes, a menos que la opción 'No copiar' este seleccionada"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total del Pedido Considerado
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Puesto del empleado (por ejemplo, director general, director, etc.)"
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Puesto del empleado (por ejemplo, director general, director, etc.)"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tasa por la cual la divisa es convertida como moneda base del cliente
 DocType: Course Scheduling Tool,Course Scheduling Tool,Herramienta de Programación de Cursos
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Fila #{0}: Factura de compra no se puede hacer frente a un activo existente {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Urgente] Error al crear% s recurrente para% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Urgente] Error al crear recurrente %s para %s
 DocType: Item Tax,Tax Rate,Procentaje del impuesto
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ya ha sido asignado para el empleado {1} para el periodo {2} hasta {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Seleccione producto
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Seleccione producto
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,La factura de compra {0} ya existe o se encuentra validada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Fila #{0}: El lote no puede ser igual a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convertir a 'Sin-Grupo'
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Listados de los lotes de los productos
 DocType: C-Form Invoice Detail,Invoice Date,Fecha de factura
 DocType: GL Entry,Debit Amount,Importe débitado
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Sólo puede existir una (1) cuenta por compañía en {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,"Por favor, revise el documento adjunto"
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Sólo puede existir una (1) cuenta por compañía en {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,"Por favor, revise el documento adjunto"
 DocType: Purchase Order,% Received,% Recibido
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Crear grupos de estudiantes
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,La configuración ya se ha completado!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,La configuración ya se ha completado!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Monto de Nota de Credito
 DocType: Setup Progress Action,Action Document,Documento de Acción
 ,Finished Goods,Productos terminados
 DocType: Delivery Note,Instructions,Instrucciones
 DocType: Quality Inspection,Inspected By,Inspección realizada por
 DocType: Maintenance Visit,Maintenance Type,Tipo de Mantenimiento
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} no está inscrito en el Curso {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Código del artículo&gt; Grupo de artículos&gt; Marca
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} no está inscrito en el Curso {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},El número de serie {0} no pertenece a la nota de entrega {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,Demostración ERPNext
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Añadir los artículos
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Añadir los artículos
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parámetro de Inspección de Calidad del producto
 DocType: Leave Application,Leave Approver Name,Nombre del supervisor de ausencias
 DocType: Depreciation Schedule,Schedule Date,Fecha de programa
@@ -489,7 +500,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Horas de Trabajo
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Defina el nuevo número de secuencia para esta transacción.
 DocType: Dosage Strength,Strength,Fuerza
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Crear un nuevo cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Crear un nuevo cliente
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Si existen varias reglas de precios, se les pide a los usuarios que establezcan la prioridad manualmente para resolver el conflicto."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Crear órdenes de compra
 ,Purchase Register,Registro de compras
@@ -508,7 +519,7 @@
 DocType: Lab Test Template,Single,Soltero
 DocType: Salary Slip,Total Loan Repayment,Amortización total del préstamo
 DocType: Account,Cost of Goods Sold,Costo sobre ventas
-DocType: Purchase Invoice,Yearly,Anual
+DocType: Subscription,Yearly,Anual
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,"Por favor, introduzca el centro de costos"
 DocType: Drug Prescription,Dosage,Dosificación
 DocType: Journal Entry Account,Sales Order,Orden de venta (OV)
@@ -538,7 +549,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Configuración global para todos los procesos de producción
 DocType: Accounts Settings,Accounts Frozen Upto,Cuentas congeladas hasta
 DocType: SMS Log,Sent On,Enviado por
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Atributo {0} seleccionado varias veces en la tabla Atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Atributo {0} seleccionado varias veces en la tabla Atributos
 DocType: HR Settings,Employee record is created using selected field. ,El registro del empleado se crea utilizando el campo seleccionado.
 DocType: Sales Order,Not Applicable,No aplicable
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Master de vacaciones .
@@ -563,13 +574,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Las hojas totales asignadas son obligatorias
 DocType: Patient,AB Positive,AB Positivo
 DocType: Job Opening,Description of a Job Opening,Descripción de la oferta de trabajo
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Actividades pendientes para hoy
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Actividades pendientes para hoy
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Registros de asistencias.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Componente de salario para la nómina basada en hoja de salario.
 DocType: Sales Order Item,Used for Production Plan,Se utiliza para el plan de producción
 DocType: Employee Loan,Total Payment,Pago total
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tiempo entre operaciones (en minutos)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} esta cancelado por lo tanto la acción no puede estar completa
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} está cancelado por lo tanto la acción no puede ser completada
 DocType: Customer,Buyer of Goods and Services.,Consumidor de productos y servicios.
 DocType: Journal Entry,Accounts Payable,Cuentas por pagar
 DocType: Patient,Allergies,Alergias
@@ -581,22 +592,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Avisar en Órdenes de Compra
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o personas.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Piezas suficiente para construir
+DocType: POS Profile User,POS Profile User,Usuario de perfil POS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Ingreso directo
 DocType: Patient Appointment,Date TIme,Fecha y Hora
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","No se puede filtrar en función de la cuenta , si se agrupan por cuenta"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Funcionario administrativo
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Por favor seleccione Curso
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Por favor seleccione Curso
 DocType: Codification Table,Codification Table,Tabla de Codificación
 DocType: Timesheet Detail,Hrs,Horas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,"Por favor, seleccione la empresa"
 DocType: Stock Entry Detail,Difference Account,Cuenta para la Diferencia
 DocType: Purchase Invoice,Supplier GSTIN,GSTIN de Proveedor
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,No se puede cerrar la tarea que depende de {0} ya que no está cerrada.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,"Por favor, ingrese el almacén en el cual la requisición de materiales sera despachada"
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,No se puede cerrar la tarea que depende de {0} ya que no está cerrada.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Por favor, ingrese el almacén en el cual la requisición de materiales sera despachada"
 DocType: Production Order,Additional Operating Cost,Costos adicionales de operación
 DocType: Lab Test Template,Lab Routine,Rutina de Laboratorio
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosméticos
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Para fusionar, la siguientes propiedades deben ser las mismas en ambos productos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Para fusionar, la siguientes propiedades deben ser las mismas en ambos productos"
 DocType: Shipping Rule,Net Weight,Peso neto
 DocType: Employee,Emergency Phone,Teléfono de Emergencia
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Comprar
@@ -606,7 +618,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Por favor defina el grado para el Umbral 0%
 DocType: Sales Order,To Deliver,Para entregar
 DocType: Purchase Invoice Item,Item,Productos
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Nº de serie artículo no puede ser una fracción
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Alta sensibilidad
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Nº de serie artículo no puede ser una fracción
 DocType: Journal Entry,Difference (Dr - Cr),Diferencia (Deb - Cred)
 DocType: Account,Profit and Loss,Pérdidas y ganancias
 DocType: Patient,Risk Factors,Factores de Riesgo
@@ -615,7 +628,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Gestión de sub-contrataciones
 DocType: Vital Signs,Body Temperature,Temperatura Corporal
 DocType: Project,Project will be accessible on the website to these users,Proyecto será accesible en la página web de estos usuarios
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Defina el Tipo de Proyecto.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Defina el Tipo de Proyecto.
 DocType: Supplier Scorecard,Weighting Function,Función de ponderación
 DocType: Physician,OP Consulting Charge,Cargo de Consultoría OP
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Configure su
@@ -629,7 +642,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Incremento no puede ser 0
 DocType: Production Planning Tool,Material Requirement,Solicitud de Material
 DocType: Company,Delete Company Transactions,Eliminar las transacciones de la compañía
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Nro de referencia y fecha de referencia es obligatoria para las transacciones bancarias
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Nro de referencia y fecha de referencia es obligatoria para las transacciones bancarias
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Añadir / Editar Impuestos y Cargos
 DocType: Payment Entry Reference,Supplier Invoice No,Factura de proveedor No.
 DocType: Territory,For reference,Para referencia
@@ -637,12 +650,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","No se puede eliminar el No. de serie {0}, ya que esta siendo utilizado en transacciones de stock"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Cierre (Cred)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Hola
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Mover Elemento
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Mover Elemento
 DocType: Serial No,Warranty Period (Days),Período de garantía (Días)
 DocType: Installation Note Item,Installation Note Item,Nota de instalación de elementos
 DocType: Production Plan Item,Pending Qty,Cantidad pendiente
 DocType: Budget,Ignore,Pasar por alto
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} no está activo
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} no está activo
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Configurar dimensiones de cheque para la impresión
 DocType: Salary Slip,Salary Slip Timesheet,Registro de Horas de Nómina
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,El almacén del proveedor es necesario para compras sub-contratadas
@@ -651,7 +664,7 @@
 DocType: Pricing Rule,Sales Partner,Socio de ventas
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Todas las Evaluaciones del Proveedor
 DocType: Buying Settings,Purchase Receipt Required,Recibo de compra requerido
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Rango de Valoración es obligatorio si se ha ingresado una Apertura de Almacén
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,Rango de Valoración es obligatorio si se ha ingresado una Apertura de Almacén
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,No se encontraron registros en la tabla de facturas
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Por favor, seleccione la compañía y el tipo de entidad"
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Finanzas / Ejercicio contable.
@@ -686,9 +699,9 @@
 DocType: Authorization Rule,Customer or Item,Cliente o artículo
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,Base de datos de Clientes.
 DocType: Quotation,Quotation To,Presupuesto para
-DocType: Lead,Middle Income,Ingreso medio
+DocType: Lead,Middle Income,Ingreso Medio
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Apertura (Cred)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unidad de medida predeterminada para el artículo {0} no se puede cambiar directamente porque ya ha realizado alguna transacción (s) con otra UOM. Usted tendrá que crear un nuevo elemento a utilizar un UOM predeterminado diferente.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unidad de medida predeterminada para el artículo {0} no se puede cambiar directamente porque ya ha realizado alguna transacción (s) con otra UOM. Usted tendrá que crear un nuevo elemento a utilizar un UOM predeterminado diferente.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Monto asignado no puede ser negativo
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Por favor establezca la empresa
 DocType: Purchase Order Item,Billed Amt,Monto facturado
@@ -696,12 +709,13 @@
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Almacén lógico contra el que se crean las entradas de inventario
 DocType: Repayment Schedule,Principal Amount,Cantidad Principal
 DocType: Employee Loan Application,Total Payable Interest,Interés Total a Pagar
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +59,Total Outstanding: {0},Total pendiente: {0}
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +59,Total Outstanding: {0},Total Pendiente: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Registro de Horas de Factura de Venta
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Se requiere de No. de referencia y fecha para {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Seleccionar la cuenta de pago para hacer la entrada del Banco
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Crear registros de los empleados para gestionar los permisos, las reclamaciones de gastos y nómina"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Período de Prescripción
+DocType: Restaurant Reservation,Restaurant Reservation,Reserva de restaurante
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Redacción de propuestas
 DocType: Payment Entry Deduction,Payment Entry Deduction,Deducción de Entrada de Pago
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Existe otro vendedor {0} con el mismo ID de empleado
@@ -709,7 +723,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Maestros
 DocType: Assessment Plan,Maximum Assessment Score,Puntuación máxima de Evaluación
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Actualizar Fechas de Transacciones Bancarias
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Seguimiento de Tiempo
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Seguimiento de Tiempo
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,DUPLICADO PARA TRANSPORTE
 DocType: Fiscal Year Company,Fiscal Year Company,Año fiscal de la compañía
 DocType: Packing Slip Item,DN Detail,Detalle DN
@@ -717,14 +731,15 @@
 DocType: Timesheet,Billed,Facturado
 DocType: Batch,Batch Description,Descripción de Lotes
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Crear grupos de estudiantes
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Cuenta de Pasarela de Pago no creada, por favor crear una manualmente."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Cuenta de Pasarela de Pago no creada, por favor crear una manualmente."
 DocType: Supplier Scorecard,Per Year,Por Año
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,No es elegible para la admisión en este programa según la fecha de nacimiento
 DocType: Sales Invoice,Sales Taxes and Charges,Impuestos y cargos sobre ventas
 DocType: Employee,Organization Profile,Perfil de la organización
 DocType: Vital Signs,Height (In Meter),Altura (en Metros)
 DocType: Student,Sibling Details,Detalles de hermanos
 DocType: Vehicle Service,Vehicle Service,Servicio del Vehículo
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,desencadena automáticamente la solicitud de realimentación sobre la base de condiciones.
+apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Desencadena automáticamente la solicitud de realimentación sobre la base de condiciones.
 DocType: Employee,Reason for Resignation,Motivo de la renuncia
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Plantilla para evaluaciones de desempeño.
 DocType: Sales Invoice,Credit Note Issued,Nota de Crédito Emitida
@@ -754,7 +769,7 @@
 DocType: Student Batch Name,Batch Name,Nombre del lote
 DocType: Fee Validity,Max number of visit,Número máximo de visitas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Tabla de Tiempo creada:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},"Por favor, defina la cuenta de bancos o caja predeterminados en el método de pago {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},"Por favor, defina la cuenta de bancos o caja predeterminados en el método de pago {0}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,Inscribirse
 DocType: GST Settings,GST Settings,Configuración de GST
 DocType: Selling Settings,Customer Naming By,Ordenar cliente por
@@ -786,15 +801,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,"Impuestos, cargos y costos de destino estimados"
 DocType: Production Order Operation,Actual Start Time,Hora de inicio real
 DocType: BOM Operation,Operation Time,Tiempo de Operación
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Terminar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Terminar
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Base
 DocType: Timesheet,Total Billed Hours,Total de Horas Facturadas
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Importe de Desajuste
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Importe de Desajuste
 DocType: Leave Block List Allow,Allow User,Permitir al usuario
 DocType: Journal Entry,Bill No,Factura No.
 DocType: Company,Gain/Loss Account on Asset Disposal,Cuenta de ganancias/pérdidas por enajenación de activos fijos
 DocType: Vehicle Log,Service Details,Detalles del servicio
-DocType: Purchase Invoice,Quarterly,Trimestral
+DocType: Subscription,Quarterly,Trimestral
 DocType: Lab Test Template,Grouped,Agrupado
 DocType: Selling Settings,Delivery Note Required,Nota de entrega requerida
 DocType: Bank Guarantee,Bank Guarantee Number,Número de Garantía Bancaria
@@ -803,12 +818,12 @@
 DocType: Student Attendance,Student Attendance,Asistencia del estudiante
 DocType: Sales Invoice Timesheet,Time Sheet,Hoja de horario
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Adquisición retroactiva de materia prima basada en
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,"Por favor, ingrese los detalles del producto"
 DocType: Interest,Interest,Interesar
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre ventas
 DocType: Purchase Receipt,Other Details,Otros detalles
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Proveedor
 DocType: Lab Test,Test Template,Plantilla de Prueba
+DocType: Restaurant Order Entry Item,Served,Servido
 DocType: Account,Accounts,Cuentas
 DocType: Vehicle,Odometer Value (Last),Valor del cuentakilómetros (Última)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Plantillas de criterios de Calificación de Proveedores.
@@ -820,25 +835,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Previsualización de Nómina
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Cuenta {0} se ha introducido varias veces
 DocType: Account,Expenses Included In Valuation,GASTOS DE VALORACIÓN
-DocType: Hub Settings,Seller City,Ciudad de vendedor
 ,Absent Student Report,Informe del alumno ausente
 DocType: Email Digest,Next email will be sent on:,El siguiente correo electrónico será enviado el:
 DocType: Offer Letter Term,Offer Letter Term,Términos de carta de oferta
 DocType: Supplier Scorecard,Per Week,Por Semana
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,El producto tiene variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,El producto tiene variantes.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Total de estudiantes
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Producto {0} no encontrado
 DocType: Bin,Stock Value,Valor de Inventarios
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,"Los registros de cuotas se crearán en segundo plano. En caso de cualquier error, el mensaje de error se actualizará en el Schedule."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Compañía {0} no existe
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} tiene validez de honorarios hasta {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} tiene validez de honorarios hasta {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Tipo de árbol
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Cantidad consumida por unidad
 DocType: Serial No,Warranty Expiry Date,Fecha de caducidad de la garantía
 DocType: Material Request Item,Quantity and Warehouse,Cantidad y Almacén
+DocType: Hub Settings,Unregister,Anular el registro
 DocType: Sales Invoice,Commission Rate (%),Porcentaje de comisión (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Seleccione el programa
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Seleccione el programa
 DocType: Project,Estimated Cost,Costo Estimado
 DocType: Purchase Order,Link to material requests,Enlace a las solicitudes de materiales
+DocType: Hub Settings,Publish,Publicar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aeroespacial
 DocType: Journal Entry,Credit Card Entry,Ingreso de tarjeta de crédito
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Empresa y Contabilidad
@@ -849,13 +866,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Cerrar Oportunidad Después Días
 ,Reserved,Reservado
 DocType: Purchase Order,Supply Raw Materials,Suministro de materia prima
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La fecha en que la próxima factura será generada. Es generada al validar.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Activo circulante
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} no es un artículo en existencia
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',"Por favor, comparta sus comentarios con la formación haciendo clic en ""Feedback de Entrenamiento"" y luego en ""Nuevo"""
 DocType: Mode of Payment Account,Default Account,Cuenta predeterminada
 DocType: Payment Entry,Received Amount (Company Currency),Cantidad recibida (Divisa de Compañia)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde las Iniciativas
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde las Iniciativas
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Por favor seleccione el día libre de la semana
 DocType: Patient,O Negative,O Negativo
 DocType: Production Order Operation,Planned End Time,Tiempo de finalización planeado
@@ -864,17 +880,17 @@
 DocType: Delivery Note,Customer's Purchase Order No,Pedido de compra No.
 DocType: Budget,Budget Against,Contra Presupuesto
 DocType: Employee,Cell Number,Número de movil
-apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Solicitudes de material automáticamente generadas
+apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Solicitudes de Material Automáticamente Generadas
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdido
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Usted no puede ingresar Comprobante Actual en la comumna 'Contra Contrada de Diario'
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Reservado para la fabricación
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energía
 DocType: Opportunity,Opportunity From,Oportunidad desde
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Nómina mensual.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Agregar Empresa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Fila {0}: {1} Números de serie necesarios para el elemento {2}. Ha proporcionado {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Fila {0}: {1} Números de serie necesarios para el elemento {2}. Ha proporcionado {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Por favor seleccione una mesa
 DocType: BOM,Website Specifications,Especificaciones del sitio web
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} es una dirección de correo electrónico no válida en &quot;Destinatarios&quot;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} es una dirección de correo electrónico no válida en &quot;Destinatarios&quot;
 DocType: Special Test Items,Particulars,Datos Particulares
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiótico.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Desde {0} del tipo {1}
@@ -882,11 +898,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Línea {0}: El factor de conversión es obligatorio
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Reglas Precio múltiples existe con el mismo criterio, por favor, resolver los conflictos mediante la asignación de prioridad. Reglas de precios: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,No se puede desactivar o cancelar la 'Lista de Materiales (LdM)' si esta vinculada con otras
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,No se puede desactivar o cancelar la 'Lista de Materiales (LdM)' si esta vinculada con otras
 DocType: Opportunity,Maintenance,Mantenimiento
 DocType: Item Attribute Value,Item Attribute Value,Atributos del producto
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Campañas de venta.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,hacer parte de horas
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,hacer parte de horas
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -924,12 +940,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,"Por favor, introduzca primero un producto"
 DocType: Account,Liability,Obligaciones
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Importe sancionado no puede ser mayor que el importe del reclamo en la línea {0}.
+DocType: Salary Detail,Do not include in total,No incluir en total
 DocType: Company,Default Cost of Goods Sold Account,Cuenta de costos (venta) por defecto
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,No ha seleccionado una lista de precios
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,No ha seleccionado una lista de precios
 DocType: Employee,Family Background,Antecedentes familiares
 DocType: Request for Quotation Supplier,Send Email,Enviar correo electronico
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Advertencia! archivo adjunto no valido: {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Sin permiso
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Advertencia! archivo adjunto no valido: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Sin permiso
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Presupuesto solicitado
 DocType: Vital Signs,Heart Rate / Pulse,Frecuencia Cardíaca / Pulso
 DocType: Company,Default Bank Account,Cuenta bancaria por defecto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Para filtrar en base a terceros, seleccione el tipo de entidad"
@@ -952,16 +970,15 @@
 DocType: Item,Website Warehouse,Almacén para el sitio web
 DocType: Payment Reconciliation,Minimum Invoice Amount,Monto Mínimo de Factura
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: El centro de costos {2} no pertenece a la empresa {3}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Cuenta {2} no puede ser un Grupo
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Cuenta {2} no puede ser un grupo
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Elemento Fila {idx}: {doctype} {docname} no existe en la anterior tabla '{doctype}'
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Table de Tiempo {0} ya se haya completado o cancelado
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,No hay tareas
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Día del mes en el que se generará la factura automática por ejemplo 05, 28, etc."
-DocType: Item Variant Settings,Copy Fields to Variant,Copiar campos a variante
+DocType: Item Variant Settings,Copy Fields to Variant,Copiar Campos a Variante
 DocType: Asset,Opening Accumulated Depreciation,Apertura de la depreciación acumulada
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,La puntuación debe ser menor o igual a 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Herramienta de Inscripción a Programa
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,Registros C -Form
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,Registros C -Form
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Clientes y proveedores
 DocType: Email Digest,Email Digest Settings,Configuración del boletín de correo electrónico
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,¡Gracias por hacer negocios!
@@ -979,13 +996,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Estado de la Cotización
 DocType: Maintenance Visit,Completion Status,Estado de finalización
 DocType: HR Settings,Enter retirement age in years,Introduzca la edad de jubilación en años
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Inventario estimado
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Por favor seleccione un almacén
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Inventario estimado
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Por favor seleccione un almacén
 DocType: Cheque Print Template,Starting location from left edge,Posición inicial desde el borde izquierdo
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir hasta este porcentaje en la entrega y/o recepción
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Asistente de importación
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Todos los Grupos de Artículos
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Todos los Grupos de Artículos
 DocType: Process Payroll,Activity Log,Registro de Actividad
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Utilidad / Pérdida neta
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Componer automáticamente el mensaje en la presentación de las transacciones.
@@ -997,7 +1014,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Cantidad proyectada
 DocType: Sales Invoice,Payment Due Date,Fecha de pago
 DocType: Drug Prescription,Interval UOM,Intervalo UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Artículo Variant {0} ya existe con los mismos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Artículo Variant {0} ya existe con los mismos atributos
+DocType: Item,Hub Publishing Details,Hub Publishing Details
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;Apertura&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Lista de tareas abiertas
 DocType: Notification Control,Delivery Note Message,Mensaje en nota de entrega
@@ -1017,10 +1035,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM #{0}: La Materia Prima no puede ser igual que el elemento principal
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total de comisiones aplicables en la compra Tabla de recibos Los artículos deben ser iguales que las tasas totales y cargos
 DocType: Sales Team,Incentives,Incentivos
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Registrarse en Hub
 DocType: SMS Log,Requested Numbers,Números solicitados
 DocType: Production Planning Tool,Only Obtain Raw Materials,Sólo obtención de materias primas
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Evaluación de desempeño.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Habilitar' Uso para el carro de la compra', ya que el carro de la compra está habilitado y debería haber al menos una regla de impuestos para el carro de la compra."
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Habilitar' Uso para el carro de la compra', ya que el carro de la compra está habilitado y debería haber al menos una regla de impuestos para el carro de la compra."
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Entrada de pago {0} está enlazada con la Orden {1}, comprobar si se debe ser retirado como avance en esta factura."
 DocType: Sales Invoice Item,Stock Details,Detalles de almacén
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor del proyecto
@@ -1039,12 +1058,14 @@
 DocType: Salary Slip,Working Days,Días de Trabajo
 DocType: Serial No,Incoming Rate,Tasa Entrante
 DocType: Packing Slip,Gross Weight,Peso bruto
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,Ingrese el nombre de la compañía para configurar el sistema.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Habilitar Hub
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,Ingrese el nombre de la compañía para configurar el sistema.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Incluir vacaciones con el numero total de días laborables
 DocType: Job Applicant,Hold,Mantener
 DocType: Employee,Date of Joining,Fecha de Ingreso
 DocType: Naming Series,Update Series,Definir Secuencia
 DocType: Supplier Quotation,Is Subcontracted,Es sub-contratado
+DocType: Restaurant Table,Minimum Seating,Asientos mínimos
 DocType: Item Attribute,Item Attribute Values,Valor de los atributos del producto
 DocType: Examination Result,Examination Result,Resultado del examen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Recibo de compra
@@ -1055,13 +1076,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar la ranura de tiempo en los próximos {0} días para la operación {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan de materiales para los subconjuntos
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Socios Comerciales y Territorio
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,La lista de materiales (LdM) {0} debe estar activa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,La lista de materiales (LdM) {0} debe estar activa
 DocType: Journal Entry,Depreciation Entry,Entrada de Depreciación
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Por favor, seleccione primero el tipo de documento"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancelar visitas {0} antes de cancelar la visita de mantenimiento
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Número de serie {0} no pertenece al producto {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Cant. Solicitada
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Complejos de depósito de transacciones existentes no se pueden convertir en el libro mayor.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Complejos de depósito de transacciones existentes no se pueden convertir en el libro mayor.
 DocType: Bank Reconciliation,Total Amount,Importe total
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publicación por internet
 DocType: Prescription Duration,Number,Número
@@ -1072,7 +1093,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista de precios para la venta
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Si se selecciona, se creará un cliente, asignado a Paciente. Se crearán facturas de pacientes contra este cliente. También puede seleccionar al cliente existente mientras crea el paciente."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicar sincronización de artículos
 DocType: Bank Reconciliation,Account Currency,Divisa de cuenta
 DocType: Lab Test,Sample ID,Ejemplo de Identificacion
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,"Por favor, indique la cuenta que utilizará para el redondeo"
@@ -1081,11 +1101,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,El empleado {0} no está activo o no existe
 DocType: Fee Structure,Components,componentes
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},"Por favor, introduzca categoría de activos en el  artículo {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,{0} variantes actualizadas del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,{0} variantes actualizadas del producto
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,No se puede {0} {1} {2} sin ninguna factura pendiente negativa
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","A ser generaro. Si se demora, tendrá que cambiar manualmente el campo ""Repetir el día del mes"" de este documento"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,No se puede {0} {1} {2} sin ninguna factura pendiente negativa
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de compra anticipada
-DocType: Hub Settings,Sync Now,Sincronizar Ahora.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Línea {0}: La entrada de crédito no puede vincularse con {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Definir presupuesto para un año contable.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,La cuenta de Banco / Efectivo por defecto se actualizará automáticamente en la factura del POS cuando seleccione este 'modelo'
@@ -1097,13 +1118,13 @@
 DocType: Item,Is Purchase Item,Es un producto para compra
 DocType: Asset,Purchase Invoice,Factura de Compra
 DocType: Stock Ledger Entry,Voucher Detail No,Detalle de Comprobante No
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Nueva factura de venta
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Nueva factura de venta
 DocType: Stock Entry,Total Outgoing Value,Valor total de salidas
 DocType: Physician,Appointments,Citas
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Fecha de Apertura y Fecha de Cierre deben ser dentro del mismo año fiscal
 DocType: Lead,Request for Information,Solicitud de información
 ,LeaderBoard,Tabla de Líderes
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Sincronizar Facturas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Sincronizar Facturas
 DocType: Payment Request,Paid,Pagado
 DocType: Program Fee,Program Fee,Cuota del Programa
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1122,11 +1143,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Producto de la orden de compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Ingresos indirectos
 DocType: Student Attendance Tool,Student Attendance Tool,Herramienta de asistencia de los estudiantes
+DocType: Restaurant Menu,Price List (Auto created),Lista de precios (creado automáticamente)
 DocType: Cheque Print Template,Date Settings,Ajustes de Fecha
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variación
 ,Company Name,Nombre de compañía
 DocType: SMS Center,Total Message(s),Total Mensage(s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Seleccione el producto a transferir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Seleccione el producto a transferir
 DocType: Purchase Invoice,Additional Discount Percentage,Porcentaje de descuento adicional
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Ver una lista de todos los vídeos de ayuda
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Seleccione la cuenta principal de banco donde los cheques fueron depositados.
@@ -1143,6 +1165,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Metro
 DocType: Workstation,Electricity Cost,Costos de Energía Eléctrica
 DocType: HR Settings,Don't send Employee Birthday Reminders,No enviar recordatorio de cumpleaños del empleado
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Guardar ajustes
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Productos solicitados
 DocType: Item,Inspection Criteria,Criterios de inspección
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Transferido
 DocType: BOM Website Item,BOM Website Item,BOM de artículo del sitio web
@@ -1153,17 +1177,17 @@
 DocType: SMS Center,All Lead (Open),Todas las Oportunidades (Abiertas)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Fila {0}: Cantidad no está disponible para {4} en el almacén {1} en el momento de publicación de la entrada ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Obtener anticipos pagados
-DocType: Item,Automatically Create New Batch,Crear automáticamente nuevo lote
+DocType: Item,Automatically Create New Batch,Crear Automáticamente Nuevo Lote
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Make ,Crear
 DocType: Student Admission,Admission Start Date,Fecha de inicio de la admisión
 DocType: Journal Entry,Total Amount in Words,Importe total en letras
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Ha ocurrido un error. Una razón probable es que usted no ha guardado el formulario. Por favor, póngase en contacto con support@erpnext.com si el problema persiste."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Mi Carrito
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Tipo de orden debe ser uno de {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Tipo de orden debe ser uno de {0}
 DocType: Lead,Next Contact Date,Siguiente fecha de contacto
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Cant. de Apertura
 DocType: Healthcare Settings,Appointment Reminder,Recordatorio de Cita
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,"Por favor, introduzca la cuenta para el importe de cambio"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,"Por favor, introduzca la cuenta para el importe de cambio"
 DocType: Student Batch Name,Student Batch Name,Nombre de Lote del Estudiante
 DocType: Consultation,Doctor,Doctor
 DocType: Holiday List,Holiday List Name,Nombre de festividad
@@ -1171,12 +1195,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Calendario de Cursos
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Opciones de stock
 DocType: Journal Entry Account,Expense Claim,Reembolso de gastos
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,¿Realmente desea restaurar este activo desechado?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Cantidad de {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,¿Realmente desea restaurar este activo desechado?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Cantidad de {0}
 DocType: Leave Application,Leave Application,Solicitud de Licencia
 DocType: Patient,Patient Relation,Relación del Paciente
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Herramienta de asignación de vacaciones
+DocType: Item,Hub Category to Publish,Categoría de hub para publicar
 DocType: Leave Block List,Leave Block List Dates,Fechas de Lista de Bloqueo de Vacaciones
+DocType: Sales Invoice,Billing Address GSTIN,Dirección de facturación GSTIN
 DocType: Workstation,Net Hour Rate,Tasa neta por hora
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Recibo sobre costos de destino estimados
 DocType: Company,Default Terms,Términos / Condiciones predeterminados
@@ -1186,18 +1212,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Por favor especificar un {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Elementos eliminados que no han sido afectados en cantidad y valor
 DocType: Delivery Note,Delivery To,Entregar a
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Tabla de atributos es obligatoria
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Tabla de atributos es obligatoria
 DocType: Production Planning Tool,Get Sales Orders,Obtener ordenes de venta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} no puede ser negativo
 DocType: Training Event,Self-Study,Autoestudio
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Descuento
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Descuento
 DocType: Asset,Total Number of Depreciations,Número total de amortizaciones
 DocType: Sales Invoice Item,Rate With Margin,Tarifa con margen
 DocType: Workstation,Wages,Salarios
 DocType: Task,Urgent,Urgente
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},"Por favor, especifique un ID de fila válida para la línea {0} en la tabla {1}"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,No se puede encontrar la variable:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,"Por favor, seleccione un campo para editar desde numpad"
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,"Por favor, seleccione un campo para editar desde numpad"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Ir al escritorio y comenzar a usar ERPNext
 DocType: Item,Manufacturer,Fabricante
 DocType: Landed Cost Item,Purchase Receipt Item,Recibo de compra del producto
@@ -1228,8 +1254,8 @@
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Centro de costos por defecto
 DocType: Sales Partner,Implementation Partner,Socio de Implementación
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Código Postal
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Orden de Venta {0} es {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Código Postal
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Orden de Venta {0} es {1}
 DocType: Opportunity,Contact Info,Información de contacto
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Crear Asientos de Stock
 DocType: Packing Slip,Net Weight UOM,Unidad de medida para el peso neto
@@ -1240,6 +1266,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Obtener cierre de semana
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,la fecha final no puede ser inferior a fecha de Inicio
 DocType: Sales Person,Select company name first.,Seleccione primero el nombre de la empresa.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Bajo a alto
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Presupuestos recibidos de proveedores.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Sustituya la Lista de Materiales (BOM)  y actualice el último precio en todas las listas de materiales
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Para {0} | {1} {2}
@@ -1258,7 +1285,7 @@
 DocType: Program Enrollment,Transportation,Transporte
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Atributo no válido
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} debe ser presentado
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},La cantidad debe ser menor que o igual a {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},La cantidad debe ser menor que o igual a {0}
 DocType: SMS Center,Total Characters,Total Caracteres
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},"Por favor, seleccione la lista de materiales (LdM) para el producto {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Detalle C -Form Factura
@@ -1273,7 +1300,7 @@
 ,Ordered Items To Be Billed,Ordenes por facturar
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Rango Desde tiene que ser menor que Rango Hasta
 DocType: Global Defaults,Global Defaults,Predeterminados globales
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Invitación a Colaboración  de Proyecto
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Invitación a Colaboración  de Proyecto
 DocType: Salary Slip,Deductions,Deducciones
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Nombre de la Acción
@@ -1291,13 +1318,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura de ventas anticipada
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Nada que solicitar
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Otro registro de Presupuesto '{0}' ya existe en contra {1} '{2}' para el año fiscal {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','Fecha de Inicio' no puede ser mayor que 'Fecha Final'
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','Fecha de Inicio' no puede ser mayor que 'Fecha Final'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Gerencia
 DocType: Cheque Print Template,Payer Settings,Configuración del pagador
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Esto se añade al código del producto y la variante. Por ejemplo, si su abreviatura es ""SM"", y el código del artículo es ""CAMISETA"", entonces el código de artículo de la variante será ""CAMISETA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pago neto (en palabras) será visible una vez que guarde la nómina salarial.
 DocType: Purchase Invoice,Is Return,Es un retorno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Precaución
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Precaución
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Retorno / Nota de Débito
 DocType: Price List Country,Price List Country,Lista de precios del país
 DocType: Item,UOMs,UdM
@@ -1312,17 +1339,18 @@
 DocType: Account,Balance Sheet,Hoja de balance
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Centro de costos para el producto con código '
 DocType: Fee Validity,Valid Till,Válida Hasta
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modo de pago no está configurado. Por favor, compruebe, si la cuenta se ha establecido en el modo de pago o en el perfil del punto de venta."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modo de pago no está configurado. Por favor, compruebe, si la cuenta se ha establecido en el modo de pago o en el perfil del punto de venta."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,El mismo artículo no se puede introducir varias veces.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Las futuras cuentas se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
 DocType: Lead,Lead,Iniciativa
 DocType: Email Digest,Payables,Cuentas por pagar
 DocType: Course,Course Intro,Introducción del Curso
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Entrada de Stock {0} creada
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure las series de numeración para Asistencia a través de Configuración&gt; Serie de numeración
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Entrada de Stock {0} creada
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila #{0}: La cantidad rechazada no se puede introducir en el campo 'retorno de compras'
 ,Purchase Order Items To Be Billed,Ordenes de compra por pagar
 DocType: Purchase Invoice Item,Net Rate,Precio neto
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Seleccione un Cliente
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Seleccione un Cliente
 DocType: Purchase Invoice Item,Purchase Invoice Item,Factura de compra del producto
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Entradas del Libro Mayor de Inventarios y GL están insertados en los recibos de compra seleccionados
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Elemento 1
@@ -1341,7 +1369,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Línea {0} duplicada con igual {1}
 ,Trial Balance,Balanza de Comprobación
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Año fiscal {0} no encontrado
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Configuración de empleados
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Configuración de empleados
 DocType: Sales Order,SO-,SO-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,"Por favor, seleccione primero el prefijo"
 DocType: Employee,O-,O-
@@ -1353,12 +1381,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Mostrar Libro Mayor
 DocType: Grading Scale,Intervals,intervalos
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Primeras
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Existe un grupo de elementos con el mismo nombre , por favor, cambie el nombre del artículo , o cambiar el nombre del grupo de artículos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Existe un grupo de elementos con el mismo nombre , por favor, cambie el nombre del artículo , o cambiar el nombre del grupo de artículos"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Número de Móvil del Estudiante.
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Resto del mundo
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Resto del mundo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,El producto {0} no puede contener lotes
 ,Budget Variance Report,Variación de Presupuesto
 DocType: Salary Slip,Gross Pay,Pago Bruto
+DocType: Item,Is Item from Hub,Es artículo del centro
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Fila {0}: Tipo de actividad es obligatoria.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,DIVIDENDOS PAGADOS
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Libro de contabilidad
@@ -1368,8 +1397,9 @@
 DocType: Vehicle Log,Service Detail,Detalle del servicio
 DocType: BOM,Item Description,Descripción del producto
 DocType: Student Sibling,Student Sibling,Hermano del Estudiante
-DocType: Purchase Invoice,Is Recurring,Es recurrente
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Método de pago
 DocType: Purchase Invoice,Supplied Items,Productos suministrados
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Configura un menú activo para Restaurant {0}
 DocType: Student,STUD.,ESTUDIANTE.
 DocType: Production Order,Qty To Manufacture,Cantidad para producción
 DocType: Email Digest,New Income,Nuevo Ingreso
@@ -1379,6 +1409,7 @@
 ,Student and Guardian Contact Details,Detalles de Contacto de Alumno y Tutor
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Fila {0}: Para el proveedor {0} se requiere la Dirección de correo electrónico para enviar correo electrónico
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Apertura temporal
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Ver Hub
 ,Employee Leave Balance,Balance de ausencias de empleado
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},El balance para la cuenta {0} siempre debe ser {1}
 DocType: Patient Appointment,More Info,Más información
@@ -1398,13 +1429,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Orden de venta {0} no es válida
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Avisar de nuevas Solicitudes de Presupuesto
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Las órdenes de compra le ayudará a planificar y dar seguimiento a sus compras
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Lamentablemente, las compañías no se pueden combinar"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Lamentablemente, las compañías no se pueden combinar"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Prescripciones para pruebas de laboratorio
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",La cantidad total de emisión / Transferencia {0} en la Solicitud de material {1} \ no puede ser mayor que la cantidad solicitada {2} para el artículo {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Pequeño
 DocType: Employee,Employee Number,Número de empleado
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},El numero de caso ya se encuentra en uso. Intente {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},El numero de caso ya se encuentra en uso. Intente {0}
 DocType: Project,% Completed,% Completado
 ,Invoiced Amount (Exculsive Tax),Cantidad facturada (Impuesto excluido)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Elemento 2
@@ -1419,11 +1450,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Egresos indirectos
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Línea {0}: La cantidad es obligatoria
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sincronización de datos maestros
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sincronización de datos maestros
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Sus Productos o Servicios
 DocType: Special Test Items,Special Test Items,Artículos de Especiales de Prueba
 DocType: Mode of Payment,Mode of Payment,Método de pago
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Sitio web imagen debe ser un archivo público o URL del sitio web
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Sitio web imagen debe ser un archivo público o URL del sitio web
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Este es un grupo principal y no se puede editar.
@@ -1431,24 +1462,23 @@
 DocType: Vehicle,Fuel UOM,UOM de Combustible
 DocType: Warehouse,Warehouse Contact Info,Información del Contacto en el Almacén
 DocType: Payment Entry,Write Off Difference Amount,Amortizar importe de la diferencia
-DocType: Purchase Invoice,Recurring Type,Tipo de recurrencia
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: No se encontró el correo electrónico de los empleados, por lo tanto, no correo electrónico enviado"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: No se encontró el correo electrónico de los empleados, por lo tanto, no correo electrónico enviado"
 DocType: Item,Foreign Trade Details,Detalles de Comercio Extranjero
+,Assessment Plan Status,Estado del plan de evaluación
 DocType: Email Digest,Annual Income,Ingresos anuales
 DocType: Serial No,Serial No Details,Detalles del numero de serie
 DocType: Purchase Invoice Item,Item Tax Rate,Tasa de impuesto del producto
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,Por favor seleccione Médico y Fecha
 DocType: Student Group Student,Group Roll Number,Grupo Número de rodillos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Para {0}, sólo las cuentas de crédito se pueden vincular con un asiento de débito"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total de todos los pesos de tareas debe ser 1. Por favor ajusta los pesos de todas las tareas del proyecto en consecuencia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,La nota de entrega {0} no está validada
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total de todos los pesos de tareas debe ser 1. Por favor ajusta los pesos de todas las tareas del proyecto en consecuencia
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,La nota de entrega {0} no está validada
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,El elemento: {0} debe ser un producto sub-contratado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,BIENES DE CAPITAL
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","La 'regla precios' es seleccionada primero basada en el campo 'Aplicar En' que puede ser un artículo, grupo de artículos o marca."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Configure primero el Código del Artículo
-DocType: Hub Settings,Seller Website,Sitio web del vendedor
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Configure primero el Código del Artículo
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Porcentaje del total asignado para el equipo de ventas debe ser de 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Porcentaje del total asignado para el equipo de ventas debe ser de 100
 DocType: Sales Invoice Item,Edit Description,Editar descripción
 DocType: Antibiotic,Antibiotic,Antibiótico
 ,Team Updates,Actualizaciones equipo
@@ -1456,7 +1486,7 @@
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Al configurar el tipo de cuenta facilitará la seleccion de la misma en las transacciones
 DocType: Purchase Invoice,Grand Total (Company Currency),Suma total (Divisa por defecto)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Crear Formato de impresión
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +5,Fee Created,Tarifa creada
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +5,Fee Created,Tarifa Creada
 apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},No ha encontrado ningún elemento llamado {0}
 DocType: Supplier Scorecard Criteria,Criteria Formula,Fórmula de Criterios
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total Saliente
@@ -1469,12 +1499,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Total (Divisa por defecto)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Número de serie {0} ha sido ingresado mas de una vez
 DocType: Depreciation Schedule,Journal Entry,Asiento contable
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} artículos en curso
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} artículos en curso
 DocType: Workstation,Workstation Name,Nombre de la estación de trabajo
 DocType: Grading Scale Interval,Grade Code,Código de Grado
 DocType: POS Item Group,POS Item Group,POS Grupo de artículos
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Enviar boletín:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},La lista de materiales (LdM) {0} no pertenece al producto {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},La lista de materiales (LdM) {0} no pertenece al producto {1}
 DocType: Sales Partner,Target Distribution,Distribución del objetivo
 DocType: Salary Slip,Bank Account No.,Cta. bancaria núm.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Este es el número de la última transacción creada con este prefijo
@@ -1490,10 +1520,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Proveedor de Solicitud de Presupuesto
 DocType: Healthcare Settings,Registration Message,Mensaje de Registro
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Hardware
-DocType: Sales Order,Recurring Upto,Recurrir hasta
 DocType: Prescription Dosage,Prescription Dosage,Dosis de prescripción
 DocType: Attendance,HR Manager,Gerente de recursos humanos (RRHH)
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,"Por favor, seleccione la compañía"
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,"Por favor, seleccione la compañía"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Vacaciones
 DocType: Purchase Invoice,Supplier Invoice Date,Fecha de factura de proveedor
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,por
@@ -1509,10 +1538,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Condiciones traslapadas entre:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,El asiento contable {0} ya se encuentra ajustado contra el importe de otro comprobante
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Valor Total del Pedido
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Comida
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Comida
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Rango de antigüedad 3
 DocType: Maintenance Schedule Item,No of Visits,Número de visitas
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},El programa de mantenimiento {0} existe en contra de {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,¿Quieres publicar tus artículos en Hub?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,Inscribiendo estudiante
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},La divisa / moneda de la cuenta de cierre debe ser {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},La suma de puntos para los objetivos debe ser 100. y es {0}
@@ -1523,9 +1553,9 @@
 DocType: Authorization Rule,Average Discount,Descuento Promedio
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Utilidades
-DocType: Purchase Invoice Item,Accounting,Contabilidad
+DocType: POS Profile,Accounting,Contabilidad
 DocType: Employee,EMP/,EMP/
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,"Por favor, seleccione lotes para el artículo en lote"
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,"Por favor, seleccione lotes para el artículo en lote"
 DocType: Asset,Depreciation Schedules,programas de depreciación
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Período de aplicación no puede ser período de asignación licencia fuera
 DocType: Activity Cost,Projects,Proyectos
@@ -1541,7 +1571,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',"El estado de esta solicitud debe ser ""Aprobado"" o ""Rechazado"""
 DocType: Physician,Contacts and Address,Contactos y Dirección
 DocType: Purchase Invoice,Contact Person,Persona de contacto
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Fecha esperada de inicio' no puede ser mayor que 'Fecha esperada de finalización'
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','Fecha esperada de inicio' no puede ser mayor que 'Fecha esperada de finalización'
 DocType: Course Scheduling Tool,Course End Date,Fecha de finalización del curso
 DocType: Holiday List,Holidays,Vacaciones
 DocType: Sales Order Item,Planned Quantity,Cantidad planificada
@@ -1549,10 +1579,11 @@
 DocType: Item,Maintain Stock,Mantener Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Las entradas de stock ya fueron creadas para el numero de producción
 DocType: Employee,Prefered Email,Correo electrónico  preferido
+DocType: Student Admission,Eligibility and Details,Elegibilidad y detalles
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Cambio neto en activos fijos
 DocType: Leave Control Panel,Leave blank if considered for all designations,Dejar en blanco si es considerado para todos los puestos
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cambiar a tipo 'Actual' en la línea {0} no puede ser incluido en el precio
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Máximo: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Máximo: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Desde Fecha y Hora
 DocType: Email Digest,For Company,Para la empresa
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Registro de comunicaciones
@@ -1560,19 +1591,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Variable de puntuación de tarjeta de calificación del proveedor
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Importe de compra
 DocType: Sales Invoice,Shipping Address Name,Nombre de dirección de envío
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Plan de cuentas
 DocType: Material Request,Terms and Conditions Content,Contenido de los términos y condiciones
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,No puede ser mayor de 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,El producto {0} no es un producto de stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,El producto {0} no es un producto de stock
 DocType: Maintenance Visit,Unscheduled,Sin programación
 DocType: Employee,Owned,Propiedad
 DocType: Salary Detail,Depends on Leave Without Pay,Depende de licencia sin goce de salario
 DocType: Pricing Rule,"Higher the number, higher the priority","Cuanto mayor sea el número, mayor es la prioridad"
 ,Purchase Invoice Trends,Tendencias de compras
 DocType: Employee,Better Prospects,Mejores Prospectos
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Fila #{0}: El lote {1} tiene sólo {2} de cantidad. Por favor, seleccione otro lote que tenga {3} de cantidad disponible o dividido la fila en varias filas, para entregar / emitir desde varios lotes"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Fila #{0}: El lote {1} tiene sólo {2} de cantidad. Por favor, seleccione otro lote que tenga {3} de cantidad disponible o dividido la fila en varias filas, para entregar / emitir desde varios lotes"
 DocType: Vehicle,License Plate,Matrículas
 DocType: Appraisal,Goals,Objetivos
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Seleccione el perfil POS
 DocType: Warranty Claim,Warranty / AMC Status,Garantía / Estado de CMA
 ,Accounts Browser,Navegador de Cuentas
 DocType: Payment Entry Reference,Payment Entry Reference,Referencia de Entrada de Pago
@@ -1590,7 +1621,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,El empleado no puede informar a sí mismo.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si la cuenta está congelado, las entradas estarán permitidas a los usuarios restringidos."
 DocType: Email Digest,Bank Balance,Saldo Bancario
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Asiento contable para {0}: {1} sólo puede realizarse con la divisa: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Asiento contable para {0}: {1} sólo puede realizarse con la divisa: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil laboral, las cualificaciones necesarias, etc"
 DocType: Journal Entry Account,Account Balance,Balance de la cuenta
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Regla de impuestos para las transacciones.
@@ -1599,8 +1630,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total impuestos y cargos (Divisa por defecto)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Mostrar saldos de pérdidas y ganancias del ejercicio no cerrado
 DocType: Lab Test Template,Collection Details,Detalles del Cobro
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","seleccione cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date de tabConsultation ct, `tabLab Prescription` cp donde ct.patient = &#39;{0}&#39; y cp.parent = ct. nombre y cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Cuenta de Envíos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: La cuenta {2} está inactiva
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Hacer Ordenes de Ventas para ayudar a planificar tu trabajo y entregar en tiempo
@@ -1617,7 +1646,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Lista de embalaje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Alquiler de Oficina
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Configuración de pasarela SMS
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,¡Importación fallida!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,¡Importación fallida!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,No se ha añadido ninguna dirección
 DocType: Workstation Working Hour,Workstation Working Hour,Horario de la estación de trabajo
 DocType: Vital Signs,Blood Pressure,Presión Sanguínea
@@ -1642,7 +1671,7 @@
 DocType: Sales Invoice,Source,Referencia
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mostrar cerrada
 DocType: Leave Type,Is Leave Without Pay,Es una ausencia sin goce de salario
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Categoría activo es obligatorio para la partida del activo fijo
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Categoría activo es obligatorio para la partida del activo fijo
 DocType: Fee Validity,Fee Validity,Validez de la Cuota
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,No se encontraron registros en la tabla de pagos
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Este {0} conflictos con {1} de {2} {3}
@@ -1663,8 +1692,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Búsqueda de ejecutivos
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Crear Leads
 DocType: Maintenance Schedule,Schedules,Programas
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,Se requiere el perfil POS para usar el Punto de venta
 DocType: Purchase Invoice Item,Net Amount,Importe Neto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} no fue enviado por lo tanto la acción no   puede estar completa
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} no fue enviado por lo tanto la acción no   puede estar completa
 DocType: Purchase Order Item Supplied,BOM Detail No,Detalles de Lista de materiales (LdM) No.
 DocType: Landed Cost Voucher,Additional Charges,Cargos adicionales
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Monto adicional de descuento (Divisa por defecto)
@@ -1673,7 +1703,7 @@
 ,Support Hour Distribution,Soporte de distribución de horas
 DocType: Maintenance Visit,Maintenance Visit,Visita de Mantenimiento
 DocType: Student,Leaving Certificate Number,Número de certificado de salida
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Cita cancelada, por favor revise y cancele la factura {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Cita cancelada, por favor revise y cancele la factura {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Cantidad de lotes disponibles en almacén
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Formato de impresión de actualización
 DocType: Landed Cost Voucher,Landed Cost Help,Ayuda para costos de destino estimados
@@ -1696,8 +1726,8 @@
 DocType: Patient,Tobacco Past Use,Consumo Pasado de Tabaco
 DocType: Sales Invoice Item,Brand Name,Marca
 DocType: Purchase Receipt,Transporter Details,Detalles de Transporte
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},El Usuario {0} ya está asignado al Médico {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Se requiere depósito por omisión para el elemento seleccionado
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},El Usuario {0} ya está asignado al Médico {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Se requiere depósito por omisión para el elemento seleccionado
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Caja
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,Posible Proveedor
 DocType: Budget,Monthly Distribution,Distribución mensual
@@ -1707,7 +1737,7 @@
 DocType: Sales Partner,Sales Partner Target,Metas de socio de ventas
 DocType: Loan Type,Maximum Loan Amount,Cantidad máxima del préstamo
 DocType: Pricing Rule,Pricing Rule,Regla de precios
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Número de rol duplicado para el estudiante {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Número de rol duplicado para el estudiante {0}
 DocType: Budget,Action if Annual Budget Exceeded,Acción Si el presupuesto anual superó
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Requisición de materiales hacia órden de compra
 DocType: Shopping Cart Settings,Payment Success URL,URL de Pago Exitoso
@@ -1724,7 +1754,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} debe aparecer sólo una vez
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},No se permite transferir más {0} de {1} para la órden de compra {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Vacaciones Distribuidas Satisfactoriamente para {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,No hay productos para empacar
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,No hay productos para empacar
 DocType: Shipping Rule Condition,From Value,Desde Valor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,La cantidad a producir es obligatoria
 DocType: Employee Loan,Repayment Method,Método de Reembolso
@@ -1738,6 +1768,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Inventarios por pagar
 DocType: Purchase Invoice,Supplier Warehouse,Almacén del proveedor
 DocType: Opportunity,Contact Mobile No,No. móvil de contacto
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Seleccionar empresa
 ,Material Requests for which Supplier Quotations are not created,Solicitudes de Material para los que no hay Presupuestos de Proveedor creados
 DocType: Student Group,Set 0 for no limit,Ajuste 0 indica sin límite
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,El día (s) en el que está solicitando la licencia son los días festivos. Usted no necesita solicitar la excedencia.
@@ -1747,24 +1778,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Crear una Cotización
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Otros Reportes
 DocType: Dependent Task,Dependent Task,Tarea dependiente
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},El factor de conversión de la unidad de medida (UdM) en la línea {0} debe ser 1
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},El factor de conversión de la unidad de medida (UdM) en la línea {0} debe ser 1
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Ausencia del tipo {0} no puede tener más de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Procure planear las operaciones con XX días de antelación.
 DocType: HR Settings,Stop Birthday Reminders,Detener recordatorios de cumpleaños.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},"Por favor, defina la cuenta de pago de nómina predeterminada en la empresa {0}."
 DocType: SMS Center,Receiver List,Lista de receptores
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Busca artículo
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Busca artículo
 DocType: Patient Appointment,Referring Physician,Médico de Referencia
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Monto consumido
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Cambio Neto en efectivo
 DocType: Assessment Plan,Grading Scale,Escala de calificación
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida (UdM) {0} se ha introducido más de una vez en la tabla de factores de conversión
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,Ya completado
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida (UdM) {0} se ha introducido más de una vez en la tabla de factores de conversión
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,Ya completado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock en Mano
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Solicitud de pago ya existe {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo de productos entregados
 DocType: Physician,Hospital,Hospital
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},La cantidad no debe ser más de {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},La cantidad no debe ser más de {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Ejercicio anterior no está cerrado
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Edad (días)
 DocType: Quotation Item,Quotation Item,Ítem de Presupuesto
@@ -1775,8 +1806,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Categorías principales de proveedores.
 DocType: Purchase Order Item,Supplier Part Number,Número de pieza del proveedor.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,La tasa de conversión no puede ser 0 o 1
-DocType: Sales Invoice,Reference Document,Documento de referencia
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} está cancelado o detenido
+DocType: Subscription,Reference Document,Documento de referencia
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} está cancelado o detenido
 DocType: Accounts Settings,Credit Controller,Controlador de créditos
 DocType: Delivery Note,Vehicle Dispatch Date,Fecha de despacho de vehículo
 DocType: Healthcare Settings,Default Medical Code Standard,Código Médico Estándar por Defecto
@@ -1785,6 +1816,7 @@
 DocType: Company,Default Payable Account,Cuenta por pagar por defecto
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Ajustes para las compras online, normas de envío, lista de precios, etc."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Facturado
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Ordenar por precio ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Cant. Reservada
 DocType: Party Account,Party Account,Cuenta asignada
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Recursos humanos
@@ -1796,13 +1828,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Hacer la entrada de desembolso
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Fila {0}: Avance contra el Proveedor debe ser debito
 DocType: Company,Default Values,Valores predeterminados
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequency} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Frequency} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Monto total reembolsado
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Esta basado en registros contra este Vehículo. Ver el cronograma debajo para más detalles
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Contra factura de proveedor {0} con fecha{1}
 DocType: Customer,Default Price List,Lista de precios por defecto
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Movimiento de activo {0} creado
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,No se puede eliminar el año fiscal {0}. Año fiscal {0} se establece por defecto en la configuración global
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Un cliente con el mismo nombre ya existe
 DocType: Journal Entry,Entry Type,Tipo de entrada
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Ningún plan de evaluación esta vinculado a este grupo de evaluación
 ,Customer Credit Balance,Saldo de Clientes
@@ -1812,7 +1845,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Precios
 DocType: Quotation,Term Details,Detalles de términos y condiciones
 DocType: Project,Total Sales Cost (via Sales Order),Costo total de ventas (a través de la orden de venta)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,No se puede inscribir más de {0} estudiantes para este grupo de estudiantes.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,No se puede inscribir más de {0} estudiantes para este grupo de estudiantes.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Cuenta de Iniciativa
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} debe ser mayor que 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planificación de capacidad para (Días)
@@ -1828,9 +1861,11 @@
 DocType: Lab Test,Technician Name,Nombre del Técnico
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Desvinculación de Pago en la cancelación de la factura
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Lectura actual del odómetro ingresada debe ser mayor que el cuentakilómetros inicial {0}
+DocType: Restaurant Reservation,No Show,No Show
 DocType: Shipping Rule Country,Shipping Rule Country,Regla de envio del país
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Ausencia y Asistencia
 DocType: Maintenance Visit,Partially Completed,Parcialmente completado
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Sensibilidad Moderada
 DocType: Leave Type,Include holidays within leaves as leaves,Incluir las vacaciones y ausencias únicamente como ausencias
 DocType: Sales Invoice,Packed Items,Productos Empacados
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Reclamación de garantía por numero de serie
@@ -1847,13 +1882,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Monto pagado (Divisa por defecto)
 DocType: Purchase Invoice,Additional Discount,Descuento adicional
 DocType: Selling Settings,Selling Settings,Configuración de ventas
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Confirmar acción
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Subastas en línea
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Por favor indique la Cantidad o el Tipo de Valoración, o ambos"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Cumplimiento
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Ver en Carrito
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,GASTOS DE PUBLICIDAD
 ,Item Shortage Report,Reporte de productos con stock bajo
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","El peso está definido,\nPor favor indique ""UDM Peso"" también"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","El peso está definido,\nPor favor indique ""UDM Peso"" también"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Solicitud de materiales usados para crear esta entrada del inventario
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,La depreciación próxima fecha es obligatorio para los nuevos activos
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Grupo separado basado en el curso para cada lote
@@ -1865,12 +1901,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Crear un asiento contable para cada movimiento de stock
 DocType: Leave Allocation,Total Leaves Allocated,Total de ausencias asigandas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},El almacén es requerido en la línea # {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,"Por favor, introduzca fecha de Inicio y Fin válidas para el Año Fiscal"
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,"Por favor, introduzca fecha de Inicio y Fin válidas para el Año Fiscal"
 DocType: Employee,Date Of Retirement,Fecha de jubilación
 DocType: Upload Attendance,Get Template,Obtener Plantilla
 DocType: Material Request,Transferred,Transferido
 DocType: Vehicle,Doors,puertas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,Configuración de ERPNext Completa!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,Configuración de ERPNext Completa!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Cobrar la cuota de registro del paciente
 DocType: Course Assessment Criteria,Weightage,Asignación
 DocType: Purchase Invoice,Tax Breakup,Disolución de Impuestos
@@ -1889,36 +1925,36 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si este producto tiene variantes, entonces no podrá ser seleccionado en los pedidos de venta, etc."
 DocType: Lead,Next Contact By,Siguiente contacto por
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Cantidad requerida para el producto {0} en la línea {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Cantidad requerida para el producto {0} en la línea {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},El almacén {0} no se puede eliminar ya que existen elementos para el Producto {1}
 DocType: Quotation,Order Type,Tipo de orden
-DocType: Purchase Invoice,Notification Email Address,Email para las notificaciones.
 ,Item-wise Sales Register,Detalle de Ventas
 DocType: Asset,Gross Purchase Amount,Importe Bruto de Compra
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Balances de Apertura
 DocType: Asset,Depreciation Method,Método de depreciación
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Desconectado
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Desconectado
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,¿Está incluido este impuesto en el precio base?
-apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Total meta / objetivo
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Total Meta / Objetivo
 DocType: Job Applicant,Applicant for a Job,Solicitante de Empleo
 DocType: Production Plan Material Request,Production Plan Material Request,Solicitud de Material del Plan de Producción
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,No se crearon Ordenes de Producción
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,No se crearon Ordenes de Producción
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliación JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Hay demasiadas columnas. Exportar el informe e imprimirlo mediante una aplicación de hoja de cálculo.
 DocType: Purchase Invoice Item,Batch No,Lote Nro.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Solicitud de cotización: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,"Permitir varias órdenes de venta, para las ordenes de compra de los clientes"
 DocType: Student Group Instructor,Student Group Instructor,Instructor de Grupo Estudiantil
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Móvil del Tutor2
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Principal
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establezca los prefijos de las numeraciones en sus transacciones
 DocType: Employee Attendance Tool,Employees HTML,Empleados HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,La lista de materiales (LdM) por defecto ({0}) debe estar activa para este producto o plantilla
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,La lista de materiales (LdM) por defecto ({0}) debe estar activa para este producto o plantilla
 DocType: Employee,Leave Encashed?,Vacaciones pagadas?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,El campo 'oportunidad desde' es obligatorio
 DocType: Email Digest,Annual Expenses,Gastos Anuales
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Crear Orden de Compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Crear Orden de Compra
 DocType: SMS Center,Send To,Enviar a
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},No hay suficiente días para las ausencias del tipo: {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Monto asignado
@@ -1934,6 +1970,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Fortaleza del grupo de estudiantes
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,El asiento contable {0} no tiene ninguna entrada {1} que vincular
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Evaluaciones
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Eventos de entrenamiento
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Duplicar No. de serie para el producto {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Una condición para una regla de envío
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Por favor ingrese
@@ -1943,7 +1980,7 @@
 DocType: Sales Order,To Deliver and Bill,Para entregar y facturar
 DocType: Student Group,Instructors,Instructores
 DocType: GL Entry,Credit Amount in Account Currency,Importe acreditado con la divisa
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser validada
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser validada
 DocType: Authorization Control,Authorization Control,Control de Autorización
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Fila #{0}: Almacén Rechazado es obligatorio en la partida rechazada {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Pago
@@ -1962,11 +1999,11 @@
 DocType: Quotation Item,Actual Qty,Cantidad Real
 DocType: Sales Invoice Item,References,Referencias
 DocType: Quality Inspection Reading,Reading 10,Lectura 10
-DocType: Hub Settings,Hub Node,Nodo del centro de actividades
+DocType: Hub Category,Hub Node,Nodo del centro de actividades
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Ha introducido elementos duplicados . Por favor rectifique y vuelva a intentarlo .
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Asociado
 DocType: Asset Movement,Asset Movement,Movimiento de Activo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,Nuevo Carrito
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,Nuevo Carrito
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,El producto {0} no es un producto serializado
 DocType: SMS Center,Create Receiver List,Crear lista de receptores
 DocType: Vehicle,Wheels,Ruedas
@@ -1980,30 +2017,31 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicaciones
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que el paquete es una parte de esta entrega (Sólo borradores)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Crear Pago
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},La cantidad del producto {0} debe ser menor que {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},La cantidad del producto {0} debe ser menor que {1}
 ,Sales Invoice Trends,Tendencias de ventas
 DocType: Leave Application,Apply / Approve Leaves,Aplicar/Aprobar Licencias
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Por
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Por
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Puede referirse a la línea, sólo si el tipo de importe es 'previo al importe' o 'previo al total'"
 DocType: Sales Order Item,Delivery Warehouse,Almacén de entrega
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Árbol de Centros de costes financieros.
 DocType: Serial No,Delivery Document No,Documento de entrega No.
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},"Por favor, fije ""Ganancia/Pérdida en la venta de activos"" en la empresa {0}."
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},"Por favor, fije ""Ganancia/Pérdida en la venta de activos"" en la empresa {0}."
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Obtener productos desde recibo de compra
 DocType: Serial No,Creation Date,Fecha de creación
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},El producto {0} aparece varias veces en el Listado de Precios {1}
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +40,"Selling must be checked, if Applicable For is selected as {0}","'Ventas' debe ser seleccionada, si la opción: 'Aplicable para' esta seleccionado como {0}"
-DocType: Production Plan Material Request,Material Request Date,Fecha de solicitud de materiales
+DocType: Production Plan Material Request,Material Request Date,Fecha de Solicitud de materiales
 DocType: Purchase Order Item,Supplier Quotation Item,Ítem de Presupuesto de Proveedor
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Desactiva la creación de registros de tiempo en contra de las órdenes de fabricación. Las operaciones no serán objeto de seguimiento contra la Orden de Producción
 DocType: Student,Student Mobile Number,Número móvil del Estudiante
 DocType: Item,Has Variants,Posee variantes
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Actualizar Respuesta
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Ya ha seleccionado artículos de {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Ya ha seleccionado artículos de {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Defina el nombre de la distribución mensual
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,El ID de lote es obligatorio
 DocType: Sales Person,Parent Sales Person,Persona encargada de ventas
-DocType: Purchase Invoice,Recurring Invoice,Factura recurrente
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,De alto a bajo
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Seleccione el programa primero
 DocType: Patient Appointment,Patient Age,Edad del Paciente
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Gestión de Proyectos
 DocType: Supplier,Supplier of Goods or Services.,Proveedor de servicios y/o productos.
@@ -2011,8 +2049,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Cuentas por cobrar por defecto que se usarán si no están establecidas en el Paciente para registrar cargos de Consulta.
 DocType: Vehicle Log,Fuel Price,Precio del Combustible
 DocType: Budget,Budget,Presupuesto
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Establecer Abierto
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Artículo de Activos Fijos no debe ser un artículo de stock.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Establecer Abierto
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Artículo de Activos Fijos no debe ser un artículo de stock.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","El presupuesto no se puede asignar contra {0}, ya que no es una cuenta de ingresos o gastos"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Alcanzado
 DocType: Student Admission,Application Form Route,Ruta de Formulario de Solicitud
@@ -2026,12 +2064,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"El producto {0} no está configurado para utilizar Números de Serie, por favor revise el artículo maestro"
 DocType: Maintenance Visit,Maintenance Time,Tiempo del Mantenimiento
 ,Amount to Deliver,Cantidad para envío
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Se ha introducido el mismo elemento varias veces. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"El Plazo Fecha de inicio no puede ser anterior a la fecha de inicio de año del año académico al que está vinculado el término (año académico {}). Por favor, corrija las fechas y vuelve a intentarlo."
 DocType: Guardian,Guardian Interests,Intereses del Tutor
 DocType: Naming Series,Current Value,Valor actual
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Existen varios ejercicios para la fecha {0}. Por favor, establece la compañía en el año fiscal"
 DocType: School Settings,Instructor Records to be created by,Registros del Instructor que serán creados por
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} creado
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} creado
 DocType: Delivery Note Item,Against Sales Order,Contra la orden de venta
 ,Serial No Status,Estado del número serie
 DocType: Payment Entry Reference,Outstanding,Excepcional
@@ -2041,17 +2080,17 @@
 						must be greater than or equal to {2}","Fila {0}: Para establecer periodo {1}, la diferencia de tiempo debe ser mayor o igual a {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Esto se basa en el movimiento de stock. Ver {0} para obtener más detalles
 DocType: Pricing Rule,Selling,Ventas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Monto {0} {1} deducido contra {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Monto {0} {1} deducido contra {2}
 DocType: Employee,Salary Information,Información salarial.
 DocType: Sales Person,Name and Employee ID,Nombre y ID de empleado
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,La fecha de vencimiento no puede ser anterior a la fecha de contabilización
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,La fecha de vencimiento no puede ser anterior a la fecha de contabilización
 DocType: Website Item Group,Website Item Group,Grupo de productos en el sitio web
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,IMPUESTOS Y ARANCELES
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Por favor, introduzca la fecha de referencia"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entradas de pago no pueden ser filtradas por {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,la tabla del producto que se mosatrara en el sitio Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Cant. Suministrada
-DocType: Purchase Order Item,Material Request Item,Requisición de materiales del producto
+DocType: Purchase Order Item,Material Request Item,Requisición de Materiales del Producto
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Árbol de las categorías de producto
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +160,Cannot refer row number greater than or equal to current row number for this Charge type,No se puede referenciar a una línea mayor o igual al numero de línea actual.
 DocType: Asset,Sold,Vendido
@@ -2062,7 +2101,7 @@
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Importe Base (Divisa de la Empresa)
 DocType: Payment Reconciliation Payment,Reference Row,Fila de Referencia
 DocType: Installation Note,Installation Time,Tiempo de Instalación
-DocType: Sales Invoice,Accounting Details,Detalles de contabilidad
+DocType: Sales Invoice,Accounting Details,Detalles de Contabilidad
 apps/erpnext/erpnext/setup/doctype/company/company.js +84,Delete all the Transactions for this Company,Eliminar todas las transacciones para esta compañía
 DocType: Patient,O Positive,O Positivo
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Fila #{0}: La operación {1} no se ha completado para la cantidad: {2} de productos terminados en orden de producción # {3}. Por favor, actualice el estado de la operación a través de la gestión de tiempos"
@@ -2070,7 +2109,7 @@
 DocType: Issue,Resolution Details,Detalles de la resolución
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Asignaciones
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Criterios de Aceptación
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Por favor, introduzca Las solicitudes de material en la tabla anterior"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,"Por favor, introduzca Las solicitudes de material en la tabla anterior"
 DocType: Item Attribute,Attribute Name,Nombre del Atributo
 DocType: BOM,Show In Website,Mostrar en el sitio web
 DocType: Shopping Cart Settings,Show Quantity in Website,Mostrar la Cantidad en la Página Web
@@ -2079,7 +2118,7 @@
 DocType: Item Reorder,Check in (group),Registro (grupo)
 ,Qty to Order,Cantidad a Solicitar
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Cabecera de cuenta en Pasivo o Patrimonio Neto, en la que se contabilizarán los Resultados."
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Diagrama Gantt de todas las tareas.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Diagrama Gantt de todas las tareas.
 DocType: Opportunity,Mins to First Response,Minutos hasta la primera respuesta
 DocType: Pricing Rule,Margin Type,Tipo de Margen
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} horas
@@ -2100,35 +2139,35 @@
 DocType: Patient,Surgical History,Historia Quirúrgica
 DocType: Employee,Resignation Letter Date,Fecha de carta de renuncia
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Las 'reglas de precios' se pueden filtrar en base a la cantidad.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},"Por favor, establezca la fecha de ingreso para el empleado {0}"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},"Por favor, establezca la fecha de ingreso para el empleado {0}"
 DocType: Task,Total Billing Amount (via Time Sheet),Monto Total Facturable (a través de tabla de tiempo)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ingresos de clientes recurrentes
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) debe tener el rol de 'Supervisor de gastos'
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Par
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Seleccione la lista de materiales y Cantidad para Producción
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Seleccione la lista de materiales y Cantidad para Producción
 DocType: Asset,Depreciation Schedule,Programación de la depreciación
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Direcciones y Contactos de Partner de Ventas
 DocType: Bank Reconciliation Detail,Against Account,Contra la cuenta
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Fecha de medio día debe estar entre la fecha desde y fecha hasta
 DocType: Maintenance Schedule Detail,Actual Date,Fecha Real
 DocType: Item,Has Batch No,Posee número de lote
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Facturación anual: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Facturación anual: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Impuesto de Bienes y Servicios (GST India)
 DocType: Delivery Note,Excise Page Number,Número Impuestos Especiales Página
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Empresa, Desde la fecha y hasta la fecha es obligatorio"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Obtener desde la Consulta
 DocType: Asset,Purchase Date,Fecha de compra
 DocType: Employee,Personal Details,Datos personales
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Ajuste &#39;Centro de la amortización del coste del activo&#39; en la empresa {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Ajuste &#39;Centro de la amortización del coste del activo&#39; en la empresa {0}
 ,Maintenance Schedules,Programas de Mantenimiento
 DocType: Task,Actual End Date (via Time Sheet),Fecha de finalización real (a través de hoja de horas)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Monto {0} {1} {2} contra {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Monto {0} {1} {2} contra {3}
 ,Quotation Trends,Tendencias de Presupuestos
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},El grupo del artículo no se menciona en producto maestro para el elemento {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,La cuenta 'Debitar a' debe ser una cuenta por cobrar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,La cuenta 'Debitar a' debe ser una cuenta por cobrar
 DocType: Shipping Rule Condition,Shipping Amount,Monto de envío
 DocType: Supplier Scorecard Period,Period Score,Puntuación del Período
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Agregar Clientes
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Agregar Clientes
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Monto pendiente
 DocType: Lab Test Template,Special,Especial
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversión
@@ -2136,13 +2175,14 @@
 ,Vehicle Expenses,Los gastos del vehículo
 DocType: Serial No,Invoice Details,Detalles de la factura
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Valor esperado después de la vida útil debe ser mayor o igual a {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Comienza en
+DocType: Hub Category,Hub Category,Categoría de Hub
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Número de Vehículo
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,Fecha en que la factura recurrente es detenida
 DocType: Employee Loan,Loan Amount,Monto del préstamo
 DocType: Program Enrollment,Self-Driving Vehicle,Vehículo auto-manejado
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Tarjeta de puntuación de proveedores
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Fila {0}: Lista de materiales no se encuentra para el elemento {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Fila {0}: Lista de materiales no se encuentra para el elemento {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Total de hojas asignadas {0} no puede ser inferior a las hojas ya aprobados {1} para el período
 DocType: Journal Entry,Accounts Receivable,Cuentas por cobrar
 ,Supplier-Wise Sales Analytics,Análisis de ventas (Proveedores)
@@ -2153,7 +2193,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Curso para padres (Deje en blanco, si esto no es parte del curso para padres)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Dejar en blanco si es considerada para todos los tipos de empleados
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir los cargos basados en
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Tabla de Tiempos
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Tabla de Tiempos
 DocType: HR Settings,HR Settings,Configuración de recursos humanos (RRHH)
 DocType: Salary Slip,net pay info,información de pago neto
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Este valor se actualiza en la Lista de Precios de venta predeterminada.
@@ -2164,7 +2204,7 @@
 DocType: Patient,B Positive,B Positivo
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Fila #{0}: Cantidad debe ser 1, como elemento es un activo fijo. Por favor, use fila separada para cantidad múltiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Permitir Lista de Bloqueo de Vacaciones
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
 DocType: Patient Medical Record,Patient Medical Record,Registro Médico del Paciente
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Grupo a No-Grupo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Deportes
@@ -2180,9 +2220,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,No se puede encontrar el tipo de cambio para {0} a {1} para la fecha clave {2}. Crea un registro de cambio de divisas manualmente
 DocType: POS Profile,Price List,Lista de Precios
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} es ahora el año fiscal predeterminado. Por favor, actualice su navegador para que el cambio surta efecto."
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Reembolsos de gastos
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Reembolsos de gastos
 DocType: Issue,Support,Soporte
 ,BOM Search,Buscar listas de materiales (LdM)
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Publique &quot;En existencia&quot; o &quot;No disponible&quot; en el concentrador según las existencias disponibles en este almacén.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Cierre (Apertura + Totales)
 DocType: Vehicle,Fuel Type,Tipo de Combustible
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Por favor, especifique la divisa en la compañía"
@@ -2194,16 +2235,16 @@
 DocType: Healthcare Settings,Remind Before,Recuerde Antes
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},El factor de conversión de la (UdM) es requerido en la línea {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Fila #{0}: Tipo de documento de referencia debe ser una de órdenes de venta, factura de venta o entrada de diario"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Fila #{0}: Tipo de documento de referencia debe ser una de órdenes de venta, factura de venta o entrada de diario"
 DocType: Salary Component,Deduction,Deducción
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Fila {0}: Tiempo Desde y Tiempo Hasta es obligatorio.
 DocType: Stock Reconciliation Item,Amount Difference,Diferencia de monto
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Precio del producto añadido para {0} en Lista de Precios {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Precio del producto añadido para {0} en Lista de Precios {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Por favor, Introduzca ID de empleado para este vendedor"
 DocType: Territory,Classification of Customers by region,Clasificación de clientes por región
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,La diferencia de montos debe ser cero
 DocType: Project,Gross Margin,Margen bruto
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,"Por favor, ingrese primero el producto a fabricar"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,"Por favor, ingrese primero el producto a fabricar"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Balance calculado del estado de cuenta bancario
 DocType: Normal Test Template,Normal Test Template,Plantilla de Prueba Normal
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,usuario deshabilitado
@@ -2213,21 +2254,22 @@
 DocType: Salary Slip,Total Deduction,Deducción Total
 ,Production Analytics,Análisis de Producción
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Esto se basa en transacciones contra este Paciente. Vea la cronología a continuación para más detalles
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Costo actualizado
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Costo actualizado
 DocType: Employee,Date of Birth,Fecha de Nacimiento
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,El producto {0} ya ha sido devuelto
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Año fiscal** representa un ejercicio financiero. Todos los asientos contables y demás transacciones importantes son registradas contra el **año fiscal**.
 DocType: Opportunity,Customer / Lead Address,Dirección de cliente / Oportunidad
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Configuración de la Calificación del Proveedor
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Advertencia: certificado SSL no válido en el apego {0}
-DocType: Student Admission,Eligibility,Elegibilidad
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Nombre del plan de evaluación
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Advertencia: certificado SSL no válido en el apego {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Las Iniciativas ayudan a obtener negocios, agrega todos tus contactos y más como clientes potenciales"
 DocType: Production Order Operation,Actual Operation Time,Hora de operación real
 DocType: Authorization Rule,Applicable To (User),Aplicable a (Usuario)
 DocType: Purchase Taxes and Charges,Deduct,Deducir
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Descripción del trabajo
 DocType: Student Applicant,Applied,Aplicado
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Re-Abrir
 DocType: Sales Invoice Item,Qty as per Stock UOM,Cantidad de acuerdo a la unidad de medida (UdM) de stock
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Nombre del Tutor2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",Caracteres especiales excepto '-'  '.' '#' y '/' no permitido en las secuencias e identificadores
@@ -2239,7 +2281,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Gerente de Producción
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Número de serie {0} está en garantía hasta {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Dividir nota de entrega entre paquetes.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Envíos
+apps/erpnext/erpnext/hooks.py +107,Shipments,Envíos
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Monto Total asignado (Divisa de la Compañia)
 DocType: Purchase Order Item,To be delivered to customer,Para ser entregado al cliente
 DocType: BOM,Scrap Material Cost,Costo de Material de Desecho
@@ -2258,11 +2300,11 @@
 DocType: Leave Application,Total Leave Days,Días totales de ausencia
 DocType: Email Digest,Note: Email will not be sent to disabled users,Nota: El correo electrónico no se enviará a los usuarios deshabilitados
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Número de Interacciones
-apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Opciones de Variante de artículo
+apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Configuraciones de Variante de Artículo
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Seleccione la compañía...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Deje en blanco si se utilizará para todos los departamentos
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tipos de empleo (permanente , contratos, pasante,  etc) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} es obligatorio para el artículo {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Tipos de empleo (permanente , contratos, pasante,  etc) ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} es obligatorio para el artículo {1}
 DocType: Process Payroll,Fortnightly,Quincenal
 DocType: Currency Exchange,From Currency,Desde Moneda
 DocType: Vital Signs,Weight (In Kilogram),Peso (en kilogramo)
@@ -2286,7 +2328,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Por favor, haga clic en 'Generar planificación' para obtener las tareas"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Se han producido errores mientras borra siguientes horarios:
 DocType: Bin,Ordered Quantity,Cantidad ordenada
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",por ejemplo 'Herramientas para los constructores'
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",por ejemplo 'Herramientas para los constructores'
 DocType: Grading Scale,Grading Scale Intervals,Intervalos de Escala de Calificación
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: La entrada contable para {2} sólo puede hacerse en la moneda: {3}
 DocType: Production Order,In Process,En Proceso
@@ -2297,7 +2339,7 @@
 apps/erpnext/erpnext/config/stock.py +320,Serialized Inventory,Inventario Serializado
 DocType: Employee Loan,Account Info,Informacion de cuenta
 DocType: Activity Type,Default Billing Rate,Monto de facturación predeterminada
-DocType: Fees,Include Payment,Incluir pago
+DocType: Fees,Include Payment,Incluir Pago
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Grupos de alumnos creados.
 DocType: Sales Invoice,Total Billing Amount,Importe total de facturación
 apps/erpnext/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py +17,There must be a default incoming Email Account enabled for this to work. Please setup a default incoming Email Account (POP/IMAP) and try again.,Tiene que haber una cuenta de correo electrónico habilitada por defecto para que esto funcione. Por favor configure una cuenta entrante de correo electrónico por defecto (POP / IMAP) y vuelve a intentarlo.
@@ -2309,11 +2351,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Con el Pago de Impuesto
 DocType: Expense Claim Detail,Expense Claim Detail,Detalle de reembolso de gastos
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICADO PARA PROVEEDOR
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,"Por favor, seleccione la cuenta correcta"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,"Por favor, seleccione la cuenta correcta"
 DocType: Item,Weight UOM,Unidad de Medida (UdM)
 DocType: Salary Structure Employee,Salary Structure Employee,Estructura Salarial de Empleado
 DocType: Patient,Blood Group,Grupo sanguíneo
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Pendiente
 DocType: Course,Course Name,Nombre del curso
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Usuarios que pueden aprobar las solicitudes de ausencia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Equipos de Oficina
@@ -2332,7 +2373,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Los precios no se muestran si la lista de precios no se ha establecido
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Por favor, especifique un país para esta regla de envió o verifique los precios para envíos mundiales"
 DocType: Stock Entry,Total Incoming Value,Valor total de entradas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Débito Para es requerido
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Débito Para es requerido
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Las Tablas de Tiempos ayudan a mantener la noción del tiempo, el coste y la facturación de actividades realizadas por su equipo"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Lista de precios para las compras
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Plantillas de variables de Calificación de Proveedores.
@@ -2342,7 +2383,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Conciliación de pagos
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Por favor, seleccione el nombre de la persona a cargo"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tecnología
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Total no pagado: {0}
+DocType: Hub Settings,Unregister from Hub,Eliminar el registro del Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Total no pagado: {0}
 DocType: BOM Website Operation,BOM Website Operation,Operación de Página Web de lista de materiales
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Carta de oferta
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generar requisición de materiales (MRP) y órdenes de producción.
@@ -2354,7 +2396,9 @@
 DocType: Physician Schedule Time Slot,To Time,Hasta hora
 DocType: Authorization Rule,Approving Role (above authorized value),Aprobar Rol (por encima del valor autorizado)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,La cuenta de crédito debe pertenecer al grupo de cuentas por pagar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},Recursividad de lista de materiales (LdM): {0} no puede ser padre o hijo de {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Seleccione la Admisión de Estudiante que es obligatoria para el solicitante de estudiante pago
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},Recursividad de lista de materiales (LdM): {0} no puede ser padre o hijo de {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Seleccione una lista de precios para publicar precios
 DocType: Production Order Operation,Completed Qty,Cantidad completada
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Para {0}, sólo las cuentas de débito pueden vincular con un asiento de crédito"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,La lista de precios {0} está deshabilitada
@@ -2366,38 +2410,39 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} números de serie son requeridos para el artículo {1}. Usted ha proporcionado {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Tasa de valoración actual
 DocType: Item,Customer Item Codes,Código del producto asignado por el cliente
+DocType: Training Event,Advance,Avanzar
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,para hacer recurrente de nuevo.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Ganancia/Pérdida en Cambio
 DocType: Opportunity,Lost Reason,Razón de la pérdida
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nueva Dirección
 DocType: Quality Inspection,Sample Size,Tamaño de muestra
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,"Por favor, introduzca recepción de documentos"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Todos los artículos que ya se han facturado
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique un numero de caso válido"
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',"Por favor, especifique un numero de caso válido"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Los centros de costos se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Usuarios y Permisos
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Órdenes de fabricación creadas: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Órdenes de fabricación creadas: {0}
 DocType: Branch,Branch,Sucursal
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Impresión y marcas
 DocType: Company,Total Monthly Sales,Total de Ventas Mensuales
 DocType: Bin,Actual Quantity,Cantidad real
 DocType: Shipping Rule,example: Next Day Shipping,ejemplo : Envío express
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Numero de serie {0} no encontrado
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},La suscripción ha sido {0}
-DocType: Fee Schedule Program,Fee Schedule Program,Programa de Horarios
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},La suscripción ha sido {0}
+DocType: Fee Schedule Program,Fee Schedule Program,Programa de Horarios de Cuotas
 DocType: Fee Schedule Program,Student Batch,Lote de Estudiante
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,seleccione * de &#39;tabVital Signs` donde patient =&#39; {0} &#39;ordenar por signs_date desc limit 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Crear Estudiante
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Grado mínimo
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Se le ha invitado a colaborar en el proyecto: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},El Médico no está disponible en {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Se le ha invitado a colaborar en el proyecto: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},El Médico no está disponible en {0}
 DocType: Leave Block List Date,Block Date,Bloquear fecha
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Agregar campo personalizado Id. de suscripción en el tipo de documento {0}.
 DocType: Purchase Receipt,Supplier Delivery Note,Nota de Entrega del Proveedor
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Aplicar Ahora
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Aplicar Ahora
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Cantidad real {0} / Cantidad esperada {1}
 DocType: Purchase Invoice,E-commerce GSTIN,Comercio electrónico GSTIN
 DocType: Sales Order,Not Delivered,No entregado
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,La fecha esperada no puede ser anterior a la fecha de la transacción
 ,Bank Clearance Summary,Resumen de Cambios Bancarios
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Crear y gestionar resúmenes de correos; diarios, semanales y mensuales."
 DocType: Appraisal Goal,Appraisal Goal,Meta de evaluación
@@ -2405,12 +2450,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Edificios
 DocType: Fee Schedule,Fee Structure,Estructura de cuotas
 DocType: Timesheet Detail,Costing Amount,Costo acumulado
-DocType: Student Admission,Application Fee,Cuota de solicitud
+DocType: Student Admission Program,Application Fee,Cuota de solicitud
 DocType: Process Payroll,Submit Salary Slip,Validar nómina salarial
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Descuento máximo para el producto {0} es {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Descuento máximo para el producto {0} es {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importación en masa
 DocType: Sales Partner,Address & Contacts,Dirección y Contactos
 DocType: SMS Log,Sender Name,Nombre del remitente
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Ordenar por criterios
 DocType: POS Profile,[Select],[Seleccionar]
 DocType: Vital Signs,Blood Pressure (diastolic),Presión Arterial (diastólica)
 DocType: SMS Log,Sent To,Enviado a
@@ -2419,13 +2465,13 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Siguiente Fecha de Contacto no puede ser en el pasado
 DocType: Company,For Reference Only.,Sólo para referencia.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},El Médico {0} no está disponible en {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Seleccione Lote No
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Seleccione Lote No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},No válido {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,Factura de Referencia
 DocType: Sales Invoice Advance,Advance Amount,Importe Anticipado
 DocType: Manufacturing Settings,Capacity Planning,Planificación de capacidad
-DocType: Supplier Quotation,Rounding Adjustment (Company Currency,Ajuste de redondeo (Moneda de la empresa
+DocType: Supplier Quotation,Rounding Adjustment (Company Currency,Ajuste de Redondeo (Moneda de la Empresa
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,'Desde la fecha' es requerido
 DocType: Journal Entry,Reference Number,Número de referencia
 DocType: Employee,Employment Details,Detalles del empleo
@@ -2435,15 +2481,15 @@
 DocType: Normal Test Items,Require Result Value,Requerir Valor de Resultado
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Nº de caso no puede ser 0
 DocType: Item,Show a slideshow at the top of the page,Mostrar una presentación de diapositivas en la parte superior de la página
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Sucursales
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Sucursales
 DocType: Project Type,Projects Manager,Gerente de Proyectos
 DocType: Serial No,Delivery Time,Tiempo de entrega
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Antigüedad basada en
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Cita cancelada
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Cita cancelada
 DocType: Item,End of Life,Final de vida útil
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Viajes
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Sin estructura de salario activa o por defecto encontrada de empleado {0} para las fechas indicadas
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Viajes
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Sin estructura de salario activa o por defecto encontrada de empleado {0} para las fechas indicadas
 DocType: Leave Block List,Allow Users,Permitir que los usuarios
 DocType: Purchase Order,Customer Mobile No,Numero de móvil de cliente
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Recurrente
@@ -2452,12 +2498,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Actualizar costos
 DocType: Item Reorder,Item Reorder,Reabastecer producto
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Mostrar Nomina Salarial
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Transferencia de Material
-DocType: Fees,Send Payment Request,Enviar solicitud de pago
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Transferencia de Material
+DocType: Fees,Send Payment Request,Enviar Ssolicitud de Pago
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especificar las operaciones, el costo de operativo y definir un numero único de operación"
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Este documento está por encima del límite de {0} {1} para el elemento {4}. ¿Estás haciendo otra {3} contra el mismo {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Por favor configura recurrente después de guardar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Seleccione la cuenta de cambio
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Seleccione la cuenta de cambio
 DocType: Purchase Invoice,Price List Currency,Divisa de la lista de precios
 DocType: Naming Series,User must always select,El usuario deberá elegir siempre
 DocType: Stock Settings,Allow Negative Stock,Permitir Inventario Negativo
@@ -2477,7 +2523,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Empleado
 DocType: Sample Collection,Collected Time,Hora de Cobro
 DocType: Company,Sales Monthly History,Historial Mensual de Ventas
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Seleccione Lote
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Seleccione Lote
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} está totalmente facturado
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Signos Vitales
 DocType: Training Event,End Time,Hora de finalización
@@ -2485,16 +2531,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Deducciones de Pago o Pérdida
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Contrato estándar de términos y condiciones para ventas y compras.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Agrupar por recibo
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,¿Seguro que quieres cancelar esta cita?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Flujo de ventas
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Por favor ajuste la cuenta por defecto en Componente Salarial {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Solicitado el
 DocType: Rename Tool,File to Rename,Archivo a renombrar
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Por favor, seleccione la lista de materiales para el artículo en la fila {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Por favor, seleccione la lista de materiales para el artículo en la fila {0}"
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Cuenta {0} no coincide con la Compañía {1}en Modo de Cuenta: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},La solicitud de la lista de materiales (LdM) especificada: {0} no existe para el producto {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,El programa de mantenimiento {0} debe ser cancelado antes de cancelar esta orden de venta
+DocType: POS Profile,Applicable for Users,Aplicable para usuarios
 DocType: Notification Control,Expense Claim Approved,Reembolso de gastos aprobado
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Nómina del empleado {0} ya creado para este periodo
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Nómina del empleado {0} ya creado para este periodo
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Farmacéutico
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Costo de productos comprados
 DocType: Selling Settings,Sales Order Required,Orden de venta requerida
@@ -2508,7 +2556,7 @@
 apps/erpnext/erpnext/stock/utils.py +217,Group node warehouse is not allowed to select for transactions,No se permite seleccionar el almacén de nodos de grupo para operaciones
 DocType: Buying Settings,Buying Settings,Configuración de compras
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Lista de materiales (LdM) para el producto terminado
-DocType: Upload Attendance,Attendance To Date,Asistencia a la fecha
+DocType: Upload Attendance,Attendance To Date,Asistencia a la Fecha
 DocType: Request for Quotation Supplier,No Quote,Sin Cotización
 DocType: Warranty Claim,Raised By,Propuesto por
 DocType: Payment Gateway Account,Payment Account,Cuenta de pagos
@@ -2518,37 +2566,39 @@
 DocType: Offer Letter,Accepted,Aceptado
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Organización
 DocType: BOM Update Tool,BOM Update Tool,Herramienta de actualización de Lista de Materiales (BOM)
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Cuenta de grupo no especificada, configure la cuenta de grupo predeterminada en la empresa"
 DocType: SG Creation Tool Course,Student Group Name,Nombre del grupo de estudiante
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Creación de tarifas
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Creación de Tarifas
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Por favor, asegurate de que realmente desea borrar todas las transacciones de esta compañía. Sus datos maestros permanecerán intactos. Esta acción no se puede deshacer."
 DocType: Room,Room Number,Número de habitación
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Referencia Inválida {0} {1}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) no puede ser mayor que la cantidad planificada ({2}) en la orden de producción {3}
 DocType: Shipping Rule,Shipping Rule Label,Etiqueta de regla de envío
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Foro de Usuarios
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,'Materias primas' no puede estar en blanco.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","No se pudo actualizar valores, factura contiene los artículos con envío triangulado."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,'Materias primas' no puede estar en blanco.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","No se pudo actualizar valores, factura contiene los artículos con envío triangulado."
 DocType: Lab Test Sample,Lab Test Sample,Muestra de Prueba de Laboratorio
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Asiento Contable Rápido
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,No se puede cambiar el precio si existe una Lista de materiales (LdM) en el producto
+DocType: Restaurant,Invoice Series Prefix,Prefijo de la serie de facturas
 DocType: Employee,Previous Work Experience,Experiencia laboral previa
 DocType: Stock Entry,For Quantity,Por cantidad
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Por favor, ingrese la cantidad planeada para el producto {0} en la fila {1}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},"Por favor, ingrese la cantidad planeada para el producto {0} en la fila {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} no se ha enviado
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Listado de solicitudes de productos.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Se crearan ordenes de producción separadas para cada producto terminado.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} debe ser negativo en el documento de devolución
 ,Minutes to First Response for Issues,Minutos hasta la primera respuesta para Problemas
 DocType: Purchase Invoice,Terms and Conditions1,Términos y Condiciones
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,El nombre del instituto para el que está configurando este sistema.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,El nombre del instituto para el que está configurando este sistema.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Asiento contable actualmente congelado. Nadie puede generar / modificar el asiento, excepto el rol especificado a continuación."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Por favor, guarde el documento antes de generar el programa de mantenimiento"
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Último precio actualizado en todas las Listas de Materiales
 DocType: Fee Schedule,Successful,Exitoso
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Estado del proyecto
 DocType: UOM,Check this to disallow fractions. (for Nos),Marque esta opción para deshabilitar las fracciones.
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Se crearon las siguientes órdenes de fabricación:
-DocType: Student Admission,Naming Series (for Student Applicant),Serie de nomenclatura (por Estudiante Solicitante)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Se crearon las siguientes órdenes de fabricación:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Serie de nomenclatura (por Estudiante Solicitante)
 DocType: Delivery Note,Transporter Name,Nombre del Transportista
 DocType: Authorization Rule,Authorized Value,Valor Autorizado
 DocType: BOM,Show Operations,Mostrar Operaciones
@@ -2565,14 +2615,14 @@
 DocType: Payment Entry,Deductions or Loss,Deducciones o Pérdida
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +247,{0} {1} is closed,{0} {1} está cerrado
 DocType: Email Digest,How frequently?,¿Con qué frecuencia?
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +57,Total Collected: {0},Total cobrado: {0}
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +57,Total Collected: {0},Total Cobrado: {0}
 DocType: Purchase Receipt,Get Current Stock,Verificar inventario actual
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Árbol de lista de materiales
 DocType: Student,Joining Date,Dia de ingreso
 ,Employees working on a holiday,Empleados que trabajan en un día festivo
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Marcar Presente
 DocType: Project,% Complete Method,% Método completado
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Droga
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Droga
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},La fecha de inicio del mantenimiento no puede ser anterior de la fecha de entrega para {0}
 DocType: Production Order,Actual End Date,Fecha Real de Finalización
 DocType: BOM,Operating Cost (Company Currency),Costo de funcionamiento (Divisa de la Compañia)
@@ -2590,19 +2640,20 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,El usuario que aprueba no puede ser igual que el usuario para el que la regla es aplicable
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Precio base (según la UdM)
 DocType: SMS Log,No of Requested SMS,Número de SMS solicitados
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Permiso sin paga no coincide con los registros aprobados de la solicitud de permiso de ausencia
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Permiso sin paga no coincide con los registros aprobados de la solicitud de permiso de ausencia
 DocType: Campaign,Campaign-.####,Campaña-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Próximos pasos
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Por favor suministrar los elementos especificados en las mejores tasas posibles
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Hacer Factura
 DocType: Selling Settings,Auto close Opportunity after 15 days,Cerrar Oportunidad automáticamente luego de 15 días
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Las órdenes de compra no están permitidas para {0} debido a una tarjeta de puntuación de {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Las órdenes de compra no están permitidas para {0} debido a una tarjeta de puntuación de {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Año final
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Cotización / Iniciativa %
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,La fecha de finalización de contrato debe ser mayor que la fecha de ingreso
 DocType: Vital Signs,Nutrition Values,Valores Nutricionales
 DocType: Lab Test Template,Is billable,Es facturable
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Tanto el &quot;Programa del médico&quot; como el tiempo por cita &quot;deben configurarse para el Dr. {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un distribuidor / proveedor / comisionista / afiliado / revendedor que vende productos de empresas a cambio de una comisión.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} contra la orden de compra {1}
 DocType: Patient,Patient Demographics,Datos Demográficos del Paciente
@@ -2632,7 +2683,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","Modelo de impuestos estándar que se puede aplicar a todas las operaciones de compras. Esta plantilla puede contener una lista de los encabezados de impuestos y también otros encabezados de gastos como ""Envío"",""Seguro"",""Manejo"" etc. Nota El tipo impositivo que defina aquí será el tipo impositivo estándar para todos los **Artículos**. Si hay **Productos** que tienen diferentes tipos, deben añadirse en la tabla **Impuesto sobre artículos** en el **Punto** maestro. Descripción de las columnas 1. Tipo de cálculo: - Esto puede ser en **Total neto** (es decir, la suma del importe base). Importe** (para impuestos o gastos acumulados). Si selecciona esta opción, el impuesto se aplicará como un porcentaje del importe o total de la fila anterior (en la tabla de impuestos). **Actual** (como se menciona). 2. Cabecera de cuenta: El libro de cuentas en el que se registrará este impuesto. Centro de coste: Si el impuesto/cargo es un ingreso (como gastos de envío) o gasto, es necesario que se contrate con un Centro de coste. 4. Descripción: Descripción del impuesto (que se imprimirá en las facturas / presupuestos). 5. Tasa: Tipo impositivo. 6. Importe: Importe del impuesto. 7. Total: Total acumulado hasta este punto. 8. Ingresar línea: Si se basa en ""Total de líneas anteriores"", puede seleccionar el número de línea que se tomará como base para este cálculo (el valor predeterminado es la línea anterior). 9. Considere Impuesto o Cargo para: En esta sección puede especificar si el impuesto / cargo es sólo para la valoración (no una parte del total) o sólo para el total (no agrega valor al artículo) o para ambos. 10. Agregar o deducir: Si desea agregar o deducir el impuesto."
 DocType: Homepage,Homepage,Página Principal
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Seleccione Médico ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',update tabConsultation set invoice = &#39;{0}&#39; donde nombre = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Cantidad recibida
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Registros de cuotas creados - {0}
 DocType: Asset Category Account,Asset Category Account,Cuenta de categoría de activos
@@ -2644,7 +2694,7 @@
 DocType: Asset,Manual,Manual
 DocType: Salary Component Account,Salary Component Account,Cuenta Nómina Componente
 DocType: Global Defaults,Hide Currency Symbol,Ocultar el símbolo de moneda
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","Los métodos de pago normalmente utilizados por ejemplo: banco, efectivo, tarjeta de crédito, etc."
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","Los métodos de pago normalmente utilizados por ejemplo: banco, efectivo, tarjeta de crédito, etc."
 DocType: Lead Source,Source Name,Nombre de la Fuente
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","La presión sanguínea normal en reposo en un adulto es aproximadamente 120 mmHg sistólica y 80 mmHg diastólica, abreviada &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Nota de Crédito
@@ -2663,16 +2713,16 @@
 DocType: Patient,Occupation,Ocupación
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Línea {0}: La fecha de inicio debe ser anterior fecha de finalización
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Cantidad)
-DocType: Sales Invoice,This Document,Este documento
 DocType: Installation Note Item,Installed Qty,Cantidad Instalada
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Esto podría deberse a algunas direcciones de correo electrónico no válidas
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Agregaste
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Resultado del Entrenamiento
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Resultado del Entrenamiento
 DocType: Purchase Invoice,Is Paid,Está pagado
 DocType: Salary Structure,Total Earning,Ganancia Total
 DocType: Purchase Receipt,Time at which materials were received,Hora en que se recibieron los materiales
 DocType: Stock Ledger Entry,Outgoing Rate,Tasa saliente
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Sucursal principal de la organización.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Sucursal principal de la organización.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,ó
 DocType: Sales Order,Billing Status,Estado de facturación
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Informar una Incidencia
@@ -2687,12 +2737,13 @@
 DocType: Notification Control,Sales Order Message,Mensaje de la orden de venta
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Establecer los valores predeterminados como: empresa, moneda / divisa, año fiscal, etc."
 DocType: Payment Entry,Payment Type,Tipo de pago
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Seleccione un lote para el artículo {0}. No se puede encontrar un solo lote que cumpla este requisito
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Seleccione un lote para el artículo {0}. No se puede encontrar un solo lote que cumpla este requisito
+DocType: Hub Category,Parent Category,Categoría principal
 DocType: Process Payroll,Select Employees,Seleccione los empleados
 DocType: Opportunity,Potential Sales Deal,Potenciales acuerdos de venta
 DocType: Complaint,Complaints,Quejas
 DocType: Payment Entry,Cheque/Reference Date,Cheque / Fecha de referencia
-DocType: Purchase Invoice,Total Taxes and Charges,Total impuestos y cargos
+DocType: Purchase Invoice,Total Taxes and Charges,Total Impuestos y Cargos
 DocType: Employee,Emergency Contact,Contacto de emergencia
 DocType: Bank Reconciliation Detail,Payment Entry,Entrada de pago
 DocType: Item,Quality Parameters,Parámetros de Calidad
@@ -2724,7 +2775,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),La identificación del paquete para la entrega (para impresión)
 DocType: Bin,Reserved Quantity,Cantidad Reservada
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Por favor ingrese una dirección de correo electrónico válida
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Por favor seleccione un artículo en el carrito
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Por favor seleccione un artículo en el carrito
 DocType: Landed Cost Voucher,Purchase Receipt Items,Productos del recibo de compra
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formularios Personalizados
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,Arrear
@@ -2734,15 +2785,15 @@
 DocType: Payment Request,Amount in customer's currency,Monto en divisa del cliente
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Entregar
 DocType: Stock Reconciliation Item,Current Qty,Cant. Actual
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Añadir Proveedores
+DocType: Restaurant Menu,Restaurant Menu,Menú del restaurante
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Anterior
 DocType: Appraisal Goal,Key Responsibility Area,Área de Responsabilidad Clave
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Los Lotes de Estudiantes ayudan a realizar un seguimiento de asistencia, evaluaciones y cuotas para los estudiantes"
 DocType: Payment Entry,Total Allocated Amount,Monto Total Asignado
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Seleccionar la cuenta de inventario por defecto para el inventario perpetuo
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Seleccionar la cuenta de inventario por defecto para el inventario perpetuo
 DocType: Item Reorder,Material Request Type,Tipo de Requisición
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Entrada en el diario acumulativo para los sueldos de {0} a {1}.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","Almacenamiento Local esta lleno, no se guardó"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","Almacenamiento Local esta lleno, no se guardó"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Línea {0}: El factor de conversión de (UdM) es obligatorio
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Capacidad de Habitaciones
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Referencia
@@ -2781,16 +2832,18 @@
 DocType: Project,Task Completion,Completitud de Tarea
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,No disponible en stock
 DocType: Appraisal,HR User,Usuario de recursos humanos
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Impuestos y cargos deducidos
-apps/erpnext/erpnext/hooks.py +129,Issues,Incidencias
+apps/erpnext/erpnext/hooks.py +138,Issues,Incidencias
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},El estado debe ser uno de {0}
 DocType: Sales Invoice,Debit To,Debitar a
+DocType: Restaurant Menu Item,Restaurant Menu Item,Elemento del menú del restaurante
 DocType: Delivery Note,Required only for sample item.,Solicitado únicamente para muestra.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Cantidad real después de transacción
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},No se encontró nómina entre {0} y {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},No se encontró nómina entre {0} y {1}
 ,Pending SO Items For Purchase Request,A la espera de la orden de compra (OC) para crear solicitud de compra (SC)
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Admisión de Estudiantes
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} está desactivado
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Admisión de Estudiantes
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} está desactivado
 DocType: Supplier,Billing Currency,Moneda de facturación
 DocType: Sales Invoice,SINV-RET-,FACT-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Extra grande
@@ -2813,12 +2866,13 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Por favor, indique el numero de visitas requeridas"
 DocType: Stock Settings,Default Valuation Method,Método predeterminado de valoración
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,Cuota
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Actualización en progreso. Podría tomar un tiempo.
 DocType: Vehicle Log,Fuel Qty,Cantidad de Combustible
 DocType: Production Order Operation,Planned Start Time,Hora prevista de inicio
 DocType: Course,Assessment,Evaluación
 DocType: Payment Entry Reference,Allocated,Numerado
 apps/erpnext/erpnext/config/accounts.py +275,Close Balance Sheet and book Profit or Loss.,Cerrar balance general y el libro de pérdidas y ganancias.
-DocType: Student Applicant,Application Status,Estado de la aplicación
+DocType: Student Applicant,Application Status,Estado de la Aplicación
 DocType: Sensitivity Test Items,Sensitivity Test Items,Artículos de Prueba de Sensibilidad
 DocType: Fees,Fees,Matrícula
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar el tipo de cambio para convertir una moneda a otra
@@ -2828,7 +2882,7 @@
 DocType: Price List,Price List Master,Lista de precios principal
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Todas las transacciones de venta se pueden etiquetar para múltiples **vendedores** de esta manera usted podrá definir y monitorear objetivos.
 ,S.O. No.,OV No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},"Por favor, crear el cliente desde iniciativa {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},"Por favor, crear el cliente desde iniciativa {0}"
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Seleccionar Paciente
 DocType: Price List,Applicable for Countries,Aplicable para los Países
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Nombre del Parámetro
@@ -2871,27 +2925,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,Detalles de la factura del proveedor
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"La cuenta de Gastos/Diferencia ({0}) debe ser una cuenta de 'utilidad o pérdida """
 DocType: Project,Copied From,Copiado de
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Nombre de error: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Escasez
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Nombre de error: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,Escasez
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} no asociada a {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Asistencia para el empleado {0} ya está marcado
 DocType: Packing Slip,If more than one package of the same type (for print),Si es más de un paquete del mismo tipo (para impresión)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,"Por favor, configure el cliente predeterminado en la configuración del restaurante"
 ,Salary Register,Registro de Salario
 DocType: Warehouse,Parent Warehouse,Almacén Padre
 DocType: C-Form Invoice Detail,Net Total,Total Neto
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},La lista de materiales predeterminada no se encontró para el Elemento {0} y el Proyecto {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},La lista de materiales predeterminada no se encontró para el Elemento {0} y el Proyecto {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Definir varios tipos de préstamos
 DocType: Bin,FCFS Rate,Cambio FCFS
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Monto pendiente
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Tiempo (en minutos)
 DocType: Project Task,Working,Trabajando
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Cola de inventario (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Año Financiero
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Año Financiero
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} no pertenece a la Compañía {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,No se pudo resolver la función de puntuación de criterios para {0}. Asegúrese de que la fórmula es válida.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Computar como
 DocType: Healthcare Settings,Out Patient Settings,Fuera de la Configuración del Paciente
 DocType: Account,Round Off,REDONDEOS
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,La cantidad debe ser positiva
 ,Requested Qty,Cant. Solicitada
 DocType: Tax Rule,Use for Shopping Cart,Utilizar para carrito de compras
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},El valor {0} para el atributo {1} no existe en la lista de valores de atributos de artículo válido para el punto {2}
@@ -2900,7 +2956,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Los cargos se distribuirán proporcionalmente basados en la cantidad o importe, según selección"
 DocType: Maintenance Visit,Purposes,Propósitos
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Al menos un elemento debe introducirse con cantidad negativa en el documento de devolución
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Agregar Cursos
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","La operación {0} tomará mas tiempo que la capacidad de producción de la estación {1}, por favor divida la tarea en varias operaciones"
 ,Requested,Solicitado
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,No hay observaciones
@@ -2912,6 +2967,8 @@
 DocType: Employee Loan,Repaid/Closed,Reembolsado / Cerrado
 DocType: Item,Total Projected Qty,Cantidad total proyectada
 DocType: Monthly Distribution,Distribution Name,Nombre de la distribución
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Tasa de valoración no encontrada para el elemento {0}, que se requiere para realizar las entradas de contabilidad para {1} {2}. Si el ítem está realizando transacciones como un ítem de valoración cero en {1}, por favor mencione eso en la {1} tabla de ítem. De lo contrario, cree una transacción de stock entrante para el elemento o mencione la tasa de valoración en el registro de artículo y, a continuación, intente enviar / cancelar esta entrada"
 DocType: Course,Course Code,Código del curso
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Inspección de la calidad requerida para el producto {0}
 DocType: POS Settings,Use POS in Offline Mode,Usar POS en Modo sin Conexión
@@ -2922,14 +2979,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Administración de Territorios
 DocType: Journal Entry Account,Sales Invoice,Factura de venta
 DocType: Journal Entry Account,Party Balance,Saldo de tercero/s
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,Por favor seleccione 'Aplicar descuento en'
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Por favor seleccione 'Aplicar descuento en'
 DocType: Company,Default Receivable Account,Cuenta por cobrar por defecto
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Crear asiento de banco para el salario total pagado según los siguientes criterios
 DocType: Physician,Physician Schedule,Horario del Médico
 DocType: Purchase Invoice,Deemed Export,Exportación Considerada
-DocType: Stock Entry,Material Transfer for Manufacture,Trasferencia de material para producción
+DocType: Stock Entry,Material Transfer for Manufacture,Trasferencia de Material para Producción
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,El porcentaje de descuento puede ser aplicado ya sea en una lista de precios o para todas las listas de precios.
-DocType: Purchase Invoice,Half-yearly,Semestral
+DocType: Subscription,Half-yearly,Semestral
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Asiento contable para inventario
 DocType: Lab Test,LabTest Approver,Aprobador de Prueba de Laboratorio
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Ya ha evaluado los criterios de evaluación {}.
@@ -2958,13 +3015,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Extra Pequeño
 DocType: Company,Standard Template,Plantilla estándar
 DocType: Training Event,Theory,Teoría
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: La requisición de materiales es menor que la orden mínima establecida
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: La requisición de materiales es menor que la orden mínima establecida
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,La cuenta {0} está congelada
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidad Legal / Subsidiario con un Catalogo de Cuentas separado que pertenece a la Organización.
 DocType: Payment Request,Mute Email,Email Silenciado
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, bebidas y tabaco"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Sólo se puede crear el pago contra {0} impagado
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,El porcentaje de comisión no puede ser superior a 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Sólo se puede crear el pago contra {0} impagado
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,El porcentaje de comisión no puede ser superior a 100
 DocType: Stock Entry,Subcontract,Sub-contrato
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,"Por favor, introduzca {0} primero"
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,No hay respuestas de
@@ -2982,20 +3039,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Color
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Criterios de evaluación del plan
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Evitar Órdenes de Compra
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Susceptible
 DocType: Patient Appointment,Scheduled,Programado.
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Solicitud de cotización.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configuración del sistema de nombres de empleados en recursos humanos&gt; Configuración de recursos humanos
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Por favor, seleccione el ítem donde ""Es Elemento de Stock"" es ""No"" y ""¿Es de artículos de venta"" es ""Sí"", y no hay otro paquete de producto"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Seleccione Cliente
 DocType: Student Log,Academic,Académico
 DocType: Patient,Personal and Social History,Historia Personal y Social
-DocType: Fee Schedule,Fee Breakup for each student,Disminución de la cuota para cada estudiante
+DocType: Fee Schedule,Fee Breakup for each student,Disminución de la Cuota para cada Estudiante
 apps/erpnext/erpnext/controllers/accounts_controller.py +476,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avance total ({0}) contra la Orden {1} no puede ser mayor que el Total ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,"Seleccione la distribución mensual, para asignarla desigualmente en varios meses"
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Cambiar Código
 DocType: Purchase Invoice Item,Valuation Rate,Tasa de Valoración
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,El tipo de divisa para la lista de precios no ha sido seleccionado
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,El tipo de divisa para la lista de precios no ha sido seleccionado
 apps/erpnext/erpnext/config/healthcare.py +46,Results,Resultados
 ,Student Monthly Attendance Sheet,Hoja de Asistencia Mensual de Estudiante
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},El empleado {0} ya se ha aplicado para {1} entre {2} y {3}
@@ -3010,7 +3068,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Administrar socios de ventas.
 DocType: Quality Inspection,Inspection Type,Tipo de inspección
 DocType: Fee Validity,Visited yet,Visitado Todavía
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Complejos de transacción existentes no pueden ser convertidos en grupo.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Complejos de transacción existentes no pueden ser convertidos en grupo.
 DocType: Assessment Result Tool,Result HTML,Resultado HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Expira el
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Añadir estudiantes
@@ -3037,7 +3095,7 @@
 DocType: Healthcare Settings,Result Printed,Resultado Impreso
 DocType: Asset Category Account,Depreciation Expense Account,Cuenta de gastos de depreciación
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Período de prueba
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Ver {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Ver {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Sólo las sub-cuentas son permitidas en una transacción
 DocType: Expense Claim,Expense Approver,Supervisor de gastos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Fila {0}: Avance contra el Cliente debe ser de crédito
@@ -3048,7 +3106,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Para fecha y hora
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Calendario de cursos eliminados:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Estatus de mensajes SMS entregados
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Establecer Objetivo de Ventas
 DocType: Accounts Settings,Make Payment via Journal Entry,Hace el pago vía entrada de diario
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Impreso en
 DocType: Item,Inspection Required before Delivery,Inspección requerida antes de la entrega
@@ -3056,7 +3113,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Actividades Pendientes
 DocType: Patient Appointment,Reminded,Recordado
 DocType: Patient,PID-,PID -
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Tu Organización
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Tu Organización
 DocType: Fee Component,Fees Category,Categoría de cuotas
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,"Por favor, introduzca la fecha de relevo"
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Monto
@@ -3068,7 +3125,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Nivel de reabastecimiento
 DocType: Company,Chart Of Accounts Template,Plantilla del catálogo de cuentas
 DocType: Attendance,Attendance Date,Fecha de Asistencia
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Precio del producto actualizado para {0} en Lista de Precios {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Precio del producto actualizado para {0} en Lista de Precios {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Calculo de salario basado en los ingresos y deducciones
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Una cuenta con nodos hijos no puede convertirse en libro mayor
 DocType: Purchase Invoice Item,Accepted Warehouse,Almacén Aceptado
@@ -3084,9 +3141,10 @@
 ,Employee Birthday,Cumpleaños del empleado
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Herramienta de Asistencia de Estudiantes por Lote
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,Límite Cruzado
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Programado hasta
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital de Riesgo
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Un término académico con este 'Año Académico' {0} y 'Nombre de término' {1} ya existe. Por favor, modificar estas entradas y vuelva a intentarlo."
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Como hay transacciones existentes contra el elemento {0}, no se puede cambiar el valor de {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Como hay transacciones existentes contra el elemento {0}, no se puede cambiar el valor de {1}"
 DocType: UOM,Must be Whole Number,Debe ser un número entero
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nuevas ausencias asignadas (en días)
 DocType: Purchase Invoice,Invoice Copy,Copia de la Factura
@@ -3096,9 +3154,9 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Número de factura
 DocType: Shopping Cart Settings,Orders,Órdenes
 DocType: Employee Leave Approver,Leave Approver,Supervisor de ausencias
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Por favor seleccione un lote
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Por favor seleccione un lote
 DocType: Assessment Group,Assessment Group Name,Nombre del grupo de evaluación
-DocType: Manufacturing Settings,Material Transferred for Manufacture,Material transferido para manufacturar
+DocType: Manufacturing Settings,Material Transferred for Manufacture,Material Transferido para Manufacturar
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Un usuario con rol de ""Supervisor de gastos"""
 DocType: Landed Cost Item,Receipt Document Type,Tipo de Recibo de Documento
 DocType: Daily Work Summary Settings,Select Companies,Seleccione empresas
@@ -3111,7 +3169,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Asiento de cierre de período
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Seleccione Departamento ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,El centro de costos con transacciones existentes no se puede convertir a 'grupo'
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Monto {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Monto {0} {1} {2} {3}
 DocType: Account,Depreciation,DEPRECIACIONES
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveedor(es)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Herramienta de asistencia de los empleados
@@ -3122,10 +3180,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,Las entradas de pago {0} estan no-relacionadas
 DocType: GL Entry,Voucher No,Comprobante No.
 ,Lead Owner Efficiency,Eficiencia del Propietario de la Iniciativa
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Más popular
 DocType: Leave Allocation,Leave Allocation,Asignación de vacaciones
 DocType: Payment Request,Recipient Message And Payment Details,Mensaje receptor y formas de pago
 DocType: Training Event,Trainer Email,Correo electrónico del entrenador
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Requisición de materiales {0} creada
+DocType: Restaurant Reservation,No of People,No de personas
 DocType: Production Planning Tool,Include sub-contracted raw materials,Incluya materias primas subcontratados
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Configuración de las plantillas de términos y condiciones.
 DocType: Purchase Invoice,Address and Contact,Dirección y contacto
@@ -3134,10 +3194,11 @@
 DocType: Supplier,Last Day of the Next Month,Último día del siguiente mes
 DocType: Support Settings,Auto close Issue after 7 days,Cierre automático de incidencia después de 7 días
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","La licencia no puede asignarse antes de {0}, ya que el saldo de vacaciones ya se ha arrastrado en el futuro registro de asignación de vacaciones {1}."
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),"Nota: El Debido/Fecha de referencia, excede los días de créditos concedidos para el cliente por {0} día(s)"
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),"Nota: El Debido/Fecha de referencia, excede los días de créditos concedidos para el cliente por {0} día(s)"
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Estudiante Solicitante
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL PARA EL RECEPTOR
 DocType: Asset Category Account,Accumulated Depreciation Account,Cuenta de depreciación acumulada
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Este correo electrónico se genera automáticamente
 DocType: Stock Settings,Freeze Stock Entries,Congelar entradas de stock
 DocType: Program Enrollment,Boarding Student,Estudiante de Embarque
 DocType: Asset,Expected Value After Useful Life,Valor esperado después de la Vida Útil
@@ -3145,7 +3206,7 @@
 DocType: Activity Cost,Billing Rate,Monto de facturación
 ,Qty to Deliver,Cantidad a entregar
 ,Stock Analytics,Análisis de existencias.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Las operaciones no pueden dejarse en blanco
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Las operaciones no pueden dejarse en blanco
 DocType: Maintenance Visit Purpose,Against Document Detail No,Contra documento No.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Tipo de parte es obligatorio
 DocType: Quality Inspection,Outgoing,Saliente
@@ -3156,7 +3217,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Efectivo neto de inversión
 DocType: Production Order,Work-in-Progress Warehouse,Almacén de trabajos en proceso
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +111,Asset {0} must be submitted,Activo {0} debe ser enviado
-DocType: Fee Schedule Program,Total Students,Total de estudiantes
+DocType: Fee Schedule Program,Total Students,Total de Estudiantes
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Registro de asistencia {0} existe en contra de estudiantes {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Referencia # {0} de fecha {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Depreciación Eliminada debido a la venta de activos
@@ -3167,7 +3228,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Seleccionar a los estudiantes manualmente para el grupo basado en actividad
 DocType: Journal Entry,User Remark,Observaciones
 DocType: Lead,Market Segment,Sector de Mercado
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},La cantidad pagada no puede ser superior a cantidad pendiente negativa total de {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},La cantidad pagada no puede ser superior a cantidad pendiente negativa total de {0}
 DocType: Supplier Scorecard Period,Variables,Variables
 DocType: Employee Internal Work History,Employee Internal Work History,Historial de trabajo del empleado
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Cierre (Deb)
@@ -3194,23 +3255,24 @@
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliación bancaria
 DocType: Attendance,On Leave,De licencia
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obtener Actualizaciones
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: La cuenta {2} no pertenece a la Compañía {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Cuenta {2} no pertenece a la compañía {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Requisición de materiales {0} cancelada o detenida
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Gestión de ausencias
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Gestión de ausencias
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Agrupar por cuenta
 DocType: Sales Order,Fully Delivered,Entregado completamente
 DocType: Lead,Lower Income,Ingreso menor
+DocType: Restaurant Order Entry,Current Order,Orden actual
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},"Almacenes de origen y destino no pueden ser los mismos, línea {0}"
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Una cuenta distinta debe ser del tipo Activo / Pasivo, ya que la reconciliación del stock es una entrada de apertura"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Monto desembolsado no puede ser mayor que Monto del préstamo {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Ir a Programas
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Se requiere el numero de orden de compra para el producto {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Orden de producción no se ha creado
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Orden de producción no se ha creado
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Desde la fecha' debe ser después de 'Hasta Fecha'
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},No se puede cambiar el estado de estudiante {0} está vinculada con la aplicación del estudiante {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},No se puede cambiar el estado de estudiante {0} está vinculada con la aplicación del estudiante {1}
 DocType: Asset,Fully Depreciated,Totalmente depreciado
 ,Stock Projected Qty,Cantidad de inventario proyectado
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Cliente {0} no pertenece al proyecto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Cliente {0} no pertenece al proyecto {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Asistencia Marcada HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Las citas son propuestas, las ofertas que ha enviado a sus clientes"
 DocType: Sales Order,Customer's Purchase Order,Ordenes de compra de clientes
@@ -3221,8 +3283,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Por favor, ajuste el número de amortizaciones Reservados"
 DocType: Supplier Scorecard Period,Calculations,Cálculos
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Valor o Cantidad
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Pedidos de producción no pueden ser elevados para:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Pedidos de producción no pueden ser elevados para:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Minuto
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Establezca Naming Series para {0} a través de Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Invoice,Purchase Taxes and Charges,Impuestos y cargos sobre compras
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Ir a Proveedores
 ,Qty to Receive,Cantidad a Recibir
@@ -3235,7 +3298,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,La cuenta de crédito debe pertenecer a las cuentas de balance
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Todos los proveedores
 DocType: Global Defaults,Disable In Words,Desactivar en palabras
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,El código del producto es obligatorio porque no es enumerado automáticamente
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,El código del producto es obligatorio porque no es enumerado automáticamente
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},El presupuesto {0} no es del tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programa de mantenimiento de artículos
 DocType: Sales Order,%  Delivered,% Entregado
@@ -3253,27 +3316,30 @@
 DocType: Purchase Invoice,Edit Posting Date and Time,Editar fecha y hora de envío
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Por favor establezca Cuentas relacionadas con la depreciación en la Categoría de Activo {0} o Compañía {1}.
 DocType: Lab Test Groups,Normal Range,Rango Normal
-DocType: Academic Term,Academic Year,Año académico
+DocType: Academic Term,Academic Year,Año Académico
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Apertura de Capital
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Reconciliación
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Restante
 DocType: Appraisal,Appraisal,Evaluación
 DocType: Purchase Invoice,GST Details,Detalles de GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},Correo electrónico enviado al proveedor {0}
+DocType: Item,Default Sales Unit of Measure,Unidad de Medida de Ventas Predeterminada
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,La fecha está repetida
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Firmante Autorizado
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},El supervisor de ausencias debe ser uno de {0}
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Crear tarifas
-DocType: Hub Settings,Seller Email,Correo electrónico de vendedor
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Crear Tarifas
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Costo total de compra (vía facturas de compra)
 DocType: Training Event,Start Time,Hora de inicio
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Seleccione cantidad
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Seleccione cantidad
 DocType: Customs Tariff Number,Customs Tariff Number,Número de arancel aduanero
 DocType: Patient Appointment,Patient Appointment,Cita del Paciente
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,El rol que aprueba no puede ser igual que el rol al que se aplica la regla
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Darse de baja de este boletín por correo electrónico
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Darse de baja de este boletín por correo electrónico
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Obtener Proveedores por
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} no encontrado para el artículo {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Ir a Cursos
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mensaje Enviado
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Una cuenta con nodos hijos no puede ser establecida como libro mayor
@@ -3283,14 +3349,16 @@
 DocType: Salary Slip,Hour Rate,Salario por hora
 DocType: Stock Settings,Item Naming By,Ordenar productos por
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Otra entrada de Cierre de Período {0} se ha hecho después de {1}
-DocType: Production Order,Material Transferred for Manufacturing,Material transferido para la producción
+DocType: Production Order,Material Transferred for Manufacturing,Material Transferido para la Producción
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,La cuenta {0} no existe
 DocType: Project,Project Type,Tipo de proyecto
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,La tarea hija existe para esta tarea. No puedes eliminar esta Tarea.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Es obligatoria la meta fe facturación.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Costo de diversas actividades
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,No más resultados
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Costo de diversas actividades
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Ajustar Eventos a {0}, ya que el Empleado adjunto a las Personas de Venta siguientes no tiene un ID de Usuario{1}."
 DocType: Timesheet,Billing Details,Detalles de facturación
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Almacén de Origen y Destino deben ser diferentes
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Almacén de Origen y Destino deben ser diferentes
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},No tiene permisos para actualizar las transacciones de stock mayores al  {0}
 DocType: Purchase Invoice Item,PR Detail,Detalle PR
 DocType: Sales Order,Fully Billed,Totalmente Facturado
@@ -3316,7 +3384,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Transferencia Bancaria
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Marcar todas
 DocType: Vehicle Log,Invoice Ref,Referencia de Factura
-DocType: Purchase Order,Recurring Order,Orden recurrente
 DocType: Company,Default Income Account,Cuenta de ingresos por defecto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Categoría de Cliente / Cliente
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Sin cerrar los años fiscales ganancias / pérdidas (de crédito)
@@ -3330,11 +3397,11 @@
 DocType: Patient,A Negative,A Negativo
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Nada más para mostrar.
 DocType: Lead,From Customer,Desde cliente
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Llamadas
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Llamadas
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Un Producto
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,Lotes
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,Lotes
 DocType: Project,Total Costing Amount (via Time Logs),Importe total calculado (a través de la gestión de tiempos)
-apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Hacer la tarifa
+apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Hacer Calendario de Cuotas
 DocType: Purchase Order Item Supplied,Stock UOM,Unidad de media utilizada en el almacen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +230,Purchase Order {0} is not submitted,La orden de compra {0} no se encuentra validada
 DocType: Vital Signs,Normal reference range for an adult is 16–20 breaths/minute (RCP 2012),El rango de referencia normal para un adulto es de 16-20 respiraciones / minuto (RCP 2012)
@@ -3356,7 +3423,7 @@
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Ausencias y Feriados
 DocType: School Settings,Current Academic Term,Término académico actual
 DocType: Sales Order,Not Billed,No facturado
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Ambos almacenes deben pertenecer a la misma compañía
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Ambos almacenes deben pertenecer a la misma compañía
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,No se han añadido contactos
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Monto de costos de destino estimados
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Listado de facturas emitidas por los proveedores.
@@ -3365,7 +3432,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Descuento
 DocType: Purchase Invoice,Return Against Purchase Invoice,Devolución contra factura de compra
 DocType: Item,Warranty Period (in days),Período de garantía (en días)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',update `tabPatient Appointment` set sales_invoice = &#39;{0}&#39; donde nombre = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Relación con Tutor1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Efectivo neto de las operaciones
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Elemento 4
@@ -3374,8 +3440,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Cuenta de asiento contable
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupo de Estudiantes
 DocType: Shopping Cart Settings,Quotation Series,Series de Presupuestos
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Existe un elemento con el mismo nombre ({0} ) , cambie el nombre del grupo de artículos o cambiar el nombre del elemento"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,"Por favor, seleccione al cliente"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Existe un elemento con el mismo nombre ({0} ) , cambie el nombre del grupo de artículos o cambiar el nombre del elemento"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,"Por favor, seleccione al cliente"
 DocType: C-Form,I,yo
 DocType: Company,Asset Depreciation Cost Center,Centro de la amortización del coste de los activos
 DocType: Sales Order Item,Sales Order Date,Fecha de las órdenes de venta
@@ -3384,6 +3450,7 @@
 DocType: Assessment Plan,Assessment Plan,Plan de Evaluación
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Se crea el Cliente {0}.
 DocType: Stock Settings,Limit Percent,límite de porcentaje
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Actualmente no hay stock disponible en ningún almacén
 ,Payment Period Based On Invoice Date,Periodos de pago según facturas
 DocType: Sample Collection,No. of print,Nro de impresión
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Se requiere la tasa de cambio para {0}
@@ -3434,18 +3501,19 @@
 DocType: Lead,Lead Owner,Propietario de la iniciativa
 DocType: Bin,Requested Quantity,Cantidad requerida
 DocType: Patient,Marital Status,Estado Civil
-DocType: Stock Settings,Auto Material Request,Requisición de materiales automática
+DocType: Stock Settings,Auto Material Request,Requisición de Materiales Automática
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Cantidad de lotes disponibles desde Almacén
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pago Bruto - Deducción total - Pago de Préstamos
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,La lista de materiales (LdM) actual y la nueva no pueden ser las mismas
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,ID de Nómina
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,ID de Nómina
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,La fecha de jubilación debe ser mayor que la fecha de ingreso
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Hubo errores al programar el curso:
 DocType: Sales Invoice,Against Income Account,Contra cuenta de ingresos
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Entregado
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,El producto {0}: Con la cantidad ordenada {1} no puede ser menor que el pedido mínimo {2} (definido en el producto).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,El producto {0}: Con la cantidad ordenada {1} no puede ser menor que el pedido mínimo {2} (definido en el producto).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Distribución mensual porcentual
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Por favor inicie sesión como otro usuario.
 DocType: Territory,Territory Targets,Metas de territorios
 DocType: Delivery Note,Transporter Info,Información de Transportista
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Por favor seleccione el valor por defecto {0} en la empresa {1}
@@ -3453,13 +3521,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Mismo proveedor se ha introducido varias veces
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Utilidad / Pérdida Bruta
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Producto suministrado desde orden de compra
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Nombre de la empresa no puede ser Company
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Nombre de la empresa no puede ser Company
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Membretes para las plantillas de impresión.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títulos para las plantillas de impresión, por ejemplo, Factura proforma."
 DocType: Program Enrollment,Walking,Caminando
 DocType: Student Guardian,Student Guardian,Tutor del estudiante
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Cargos de tipo de valoración no pueden marcado como Incluido
 DocType: POS Profile,Update Stock,Actualizar el Inventario
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,en la suscripción
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Unidad de Medida diferente para elementos dará lugar a Peso Neto (Total) incorrecto. Asegúrese de que el peso neto de cada artículo esté en la misma Unidad de Medida.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Coeficiente de la lista de materiales (LdM)
 DocType: Asset,Journal Entry for Scrap,Entrada de diario para desguace
@@ -3507,15 +3576,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Si se define el ID de usuario 'Login', este sera el predeterminado para todos los documentos de recursos humanos (RRHH)"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Desde {1}
 DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,En cola para actualizar el último precio en todas las listas de materiales. Puede tomar algunos minutos.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,En cola para actualizar el último precio en todas las listas de materiales. Puede tomar algunos minutos.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nombre de la nueva cuenta. Nota: Por favor no crear cuentas de clientes y proveedores
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Plantillas predeterminadas para un país en especial
 DocType: Sales Order Item,Supplier delivers to Customer,Proveedor entrega al Cliente
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/Item/{0}) está agotado
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Vencimiento / Fecha de referencia no puede ser posterior a {0}
+,Sales Payment Summary,Resumen de pago de ventas
+DocType: Restaurant,Restaurant,Restaurante
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Vencimiento / Fecha de referencia no puede ser posterior a {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importación y exportación de datos
 DocType: Patient,Account Details,Detalles de la Cuenta
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,No se han encontrado estudiantes
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,No se han encontrado estudiantes
 DocType: Medical Department,Medical Department,Departamento Médico
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Criterios de calificación de la tarjeta de puntaje del proveedor
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Fecha de la factura de envío
@@ -3526,7 +3597,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,"Por favor, seleccione fecha de publicación antes de seleccionar la Parte"
 DocType: Program Enrollment,School House,Casa Escolar
 DocType: Serial No,Out of AMC,Fuera de CMA (Contrato de mantenimiento anual)
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Por Favor seleccione Cotizaciones
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Por Favor seleccione Cotizaciones
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Número de Depreciaciones Reservadas no puede ser mayor que el número total de Depreciaciones
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Crear visita de mantenimiento
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario gerente de ventas {0}"
@@ -3534,7 +3605,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Configuración general del sistema.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Basado en la asistencia de este estudiante
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,No hay estudiantes en
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Añadir más elementos o abrir formulario completo
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Añadir más elementos o abrir formulario completo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,La nota de entrega {0} debe ser cancelada antes de cancelar esta orden ventas
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Ir a Usuarios
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,"El total de la cantidad pagada + desajuste, no puede ser mayor que el gran total"
@@ -3554,37 +3625,40 @@
 DocType: Fee Schedule,Fee Schedule,Programa de Cuotas
 DocType: Hub Settings,Publish Availability,Publicar disponibilidad
 DocType: Company,Create Chart Of Accounts Based On,Crear plan de cuentas basado en
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,No se puede convertir a no grupo. Las tareas para niños existen.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,La fecha de nacimiento no puede ser mayor a la fecha de hoy.
 ,Stock Ageing,Antigüedad de existencias
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Estudiante {0} existe contra la solicitud de estudiante {1}
-DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Ajuste de redondeo (Moneda de la empresa)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Registro de Horas
+DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Ajuste de Redondeo (Moneda de la Empresa)
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Registro de Horas
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' está deshabilitado
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Establecer como abierto/a
 DocType: Cheque Print Template,Scanned Cheque,Cheque Scaneado
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar correos electrónicos automáticos a contactos al momento de registrase una transacción
 DocType: Timesheet,Total Billable Amount,Monto Total Facturable
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Elemento 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Orden de entrada
 DocType: Purchase Order,Customer Contact Email,Correo electrónico de contacto de cliente
 DocType: Warranty Claim,Item and Warranty Details,Producto y detalles de garantía
 DocType: Sales Team,Contribution (%),Margen (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : El registro del pago no se creará hasta que la cuenta del tipo 'Banco o Cajas' sea definida
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,El Proyecto {0} ya existe
 DocType: Medical Department,Nursing User,Usuario de Enfermería
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Responsabilidades
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,El período de validez de esta cotización ha finalizado.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,El período de validez de esta cotización ha finalizado.
 DocType: Expense Claim Account,Expense Claim Account,Cuenta de Gastos
-DocType: Accounts Settings,Allow Stale Exchange Rates,Permitir tipos de cambio obsoletos
+DocType: Accounts Settings,Allow Stale Exchange Rates,Permitir Tipos de Cambio Obsoletos
 DocType: Sales Person,Sales Person Name,Nombre de vendedor
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Por favor, introduzca al menos 1 factura en la tabla"
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Agregar usuarios
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Agregar usuarios
 DocType: POS Item Group,Item Group,Grupo de productos
-DocType: Item,Safety Stock,Stock de seguridad
+DocType: Item,Safety Stock,Stock de Seguridad
 DocType: Healthcare Settings,Healthcare Settings,Configuración de Atención Médica
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,El % de avance para una tarea no puede ser más de 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,El % de avance para una tarea no puede ser más de 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Antes de Reconciliación
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impuestos y cargos adicionales (Divisa por defecto)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"El campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"El campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
 DocType: Sales Order,Partly Billed,Parcialmente facturado
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Elemento {0} debe ser un elemento de activo fijo
 DocType: Item,Default BOM,Lista de Materiales (LdM) por defecto
@@ -3600,6 +3674,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,Variable
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Desde nota de entrega
 DocType: Student,Student Email Address,Dirección de correo electrónico del Estudiante
+DocType: Item,Hub Warehouse,Hub Warehouse
 DocType: Physician Schedule Time Slot,From Time,Desde hora
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,En Stock:
 DocType: Notification Control,Custom Message,Mensaje personalizado
@@ -3607,9 +3682,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,'Cuenta de Efectivo' o 'Cuenta Bancaria' es obligatoria para hacer una entrada de pago
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Dirección del estudiante
 DocType: Purchase Invoice,Price List Exchange Rate,Tipo de cambio para la lista de precios
+DocType: POS Profile,POS Profile Name,Nombre del perfil POS
 DocType: Purchase Invoice Item,Rate,Precio
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Interno
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Nombre de la dirección
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Nombre de la dirección
 DocType: Stock Entry,From BOM,Desde lista de materiales (LdM)
 DocType: Assessment Code,Assessment Code,Código Evaluación
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Base
@@ -3623,11 +3699,12 @@
 DocType: Salary Slip,Salary Structure,Estructura salarial
 DocType: Account,Bank,Banco
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Línea aérea
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Distribuir materiales
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Distribuir materiales
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Se ha producido un error al crear recurrente
 DocType: Material Request Item,For Warehouse,Para el almacén
 DocType: Employee,Offer Date,Fecha de oferta
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Presupuestos
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Usted está en modo fuera de línea. Usted no será capaz de recargar hasta que tenga conexión a red.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Usted está en modo fuera de línea. Usted no será capaz de recargar hasta que tenga conexión a red.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,No se crearon grupos de estudiantes.
 DocType: Purchase Invoice Item,Serial No,Número de serie
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Cantidad mensual La devolución no puede ser mayor que monto del préstamo
@@ -3637,17 +3714,18 @@
 DocType: Salary Slip,Total Working Hours,Horas de trabajo total
 DocType: Subscription,Next Schedule Date,Siguiente Fecha Programada
 DocType: Stock Entry,Including items for sub assemblies,Incluir productos para subconjuntos
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,El valor introducido debe ser positivo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Todos los Territorios
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,El valor introducido debe ser positivo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Todos los Territorios
 DocType: Purchase Invoice,Items,Productos
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Estudiante ya está inscrito.
 DocType: Fiscal Year,Year Name,Nombre del Año
 DocType: Process Payroll,Process Payroll,Procesar nómina
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Existen más vacaciones que días de trabajo en este mes.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Existen más vacaciones que días de trabajo en este mes.
 DocType: Product Bundle Item,Product Bundle Item,Artículo del conjunto de productos
 DocType: Sales Partner,Sales Partner Name,Nombre de socio de ventas
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Solicitud de Presupuestos
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Solicitud de Presupuestos
 DocType: Payment Reconciliation,Maximum Invoice Amount,Importe Máximo de Factura
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hematología
 DocType: Normal Test Items,Normal Test Items,Elementos de Prueba Normales
 DocType: Student Language,Student Language,Idioma del Estudiante
 apps/erpnext/erpnext/config/selling.py +23,Customers,Clientes
@@ -3658,10 +3736,11 @@
 DocType: Issue,Opening Time,Hora de Apertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Desde y Hasta la fecha solicitada
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Cambios de valores y bienes
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidad de medida predeterminada para variante '{0}' debe ser la mismo que en la plantilla '{1}'
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidad de medida predeterminada para variante '{0}' debe ser la mismo que en la plantilla '{1}'
 DocType: Shipping Rule,Calculate Based On,Calculo basado en
 DocType: Delivery Note Item,From Warehouse,De Almacén
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,No hay artículos con la lista de materiales para la fabricación de
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,No hay artículos con la lista de materiales para la fabricación de
+DocType: Restaurant,Default Customer,Cliente predeterminado
 DocType: Assessment Plan,Supervisor Name,Nombre del supervisor
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,No confirme si la cita se crea para el mismo día
 DocType: Program Enrollment Course,Program Enrollment Course,Inscripción al Programa Curso
@@ -3688,7 +3767,7 @@
 DocType: Payment Entry,Internal Transfer,Transferencia interna
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,"No es posible eliminar esta cuenta, ya que existe una sub-cuenta"
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Es obligatoria la meta de facturacion
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},No existe una lista de materiales por defecto para el elemento {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},No existe una lista de materiales por defecto para el elemento {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,"Por favor, seleccione fecha de publicación primero"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Fecha de apertura debe ser antes de la Fecha de Cierre
 DocType: Leave Control Panel,Carry Forward,Trasladar
@@ -3707,7 +3786,7 @@
 DocType: Journal Entry,Bank Entry,Registro de Banco
 DocType: Authorization Rule,Applicable To (Designation),Aplicables a (Puesto)
 ,Profitability Analysis,Cuenta de Resultados
-DocType: Fees,Student Email,Correo electrónico del estudiante
+DocType: Fees,Student Email,Correo electrónico del Estudiante
 DocType: Supplier,Prevent POs,Prevenga las OCs
 DocType: Patient,"Allergies, Medical and Surgical History","Alergias, Historia Médica y Quirúrgica"
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Añadir a la Cesta
@@ -3723,6 +3802,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Total Presente
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,Declaraciones de contabilidad
 DocType: Drug Prescription,Hour,Hora
+DocType: Restaurant Order Entry,Last Sales Invoice,Última factura de ventas
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,El número de serie no tiene almacén asignado. El almacén debe establecerse por entradas de inventario o recibos de compra
 DocType: Lead,Lead Type,Tipo de iniciativa
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Usted no está autorizado para aprobar ausencias en fechas bloqueadas
@@ -3757,64 +3837,66 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Crear usuarios
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,Gramo
 DocType: Supplier Scorecard,Per Month,Por Mes
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,La cantidad a producir debe ser mayor que 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,La cantidad a producir debe ser mayor que 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Reporte de visitas para mantenimiento
 DocType: Stock Entry,Update Rate and Availability,Actualización de tarifas y disponibilidad
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"El porcentaje que ud. tiene permitido para recibir o enviar mas de la cantidad ordenada. Por ejemplo: Si ha pedido 100 unidades, y su asignación es del 10%, entonces tiene permitido recibir hasta 110 unidades."
 DocType: POS Customer Group,Customer Group,Categoría de Cliente
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Nuevo ID de lote (opcional)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Nuevo ID de lote (opcional)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},La cuenta de gastos es obligatoria para el elemento {0}
 DocType: BOM,Website Description,Descripción del Sitio Web
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Cambio en el Patrimonio Neto
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,El más nuevo
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Por favor primero cancele la Factura de Compra {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Dirección de correo electrónico debe ser única, ya existe para {0}"
 DocType: Serial No,AMC Expiry Date,Fecha de caducidad de CMA (Contrato de Mantenimiento Anual)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,Recibo
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,Recibo
 ,Sales Register,Registro de ventas
 DocType: Daily Work Summary Settings Company,Send Emails At,Enviar Correos Electrónicos a
 DocType: Quotation,Quotation Lost Reason,Razón de la Pérdida
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Seleccione su dominio
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',seleccione * de tabPatient donde name = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Referencia de la transacción nro {0} fechada {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Referencia de la transacción nro {0} fechada {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,No hay nada que modificar.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Vista de Formulario
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Resumen para este mes y actividades pendientes
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Vista de Formulario
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Resumen para este mes y actividades pendientes
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Agregue usuarios a su organización, que no sean usted mismo."
 DocType: Customer Group,Customer Group Name,Nombre de la categoría de cliente
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,¡Aún no hay clientes!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,¡Aún no hay clientes!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Estado de Flujos de Efectivo
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Monto del préstamo no puede exceder cantidad máxima del préstamo de {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licencia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},"Por favor, elimine esta factura {0} de C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},"Por favor, elimine esta factura {0} de C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Por favor seleccione 'trasladar' si usted desea incluir los saldos del año fiscal anterior a este año
 DocType: GL Entry,Against Voucher Type,Tipo de comprobante
 DocType: Physician,Phone (R),Teléfono (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Horarios Añadidos
 DocType: Item,Attributes,Atributos
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Habilitar Plantilla
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Establezca Naming Series para {0} a través de Configuración&gt; Configuración&gt; Nombrar Series
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,"Por favor, ingrese la cuenta de desajuste"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Fecha del último pedido
 DocType: Patient,B Negative,B Negativo
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},La cuenta {0} no pertenece a la compañía {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Los números de serie en la fila {0} no coinciden con Nota de entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Los números de serie en la fila {0} no coinciden con Nota de entrega
 DocType: Student,Guardian Details,Detalles del Tutor
 DocType: C-Form,C-Form,C - Forma
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Marcar Asistencia para múltiples empleados
 DocType: Vehicle,Chassis No,N° de Chasis
 DocType: Payment Request,Initiated,Iniciado
 DocType: Production Order,Planned Start Date,Fecha prevista de inicio
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Seleccione una lista de materiales
 DocType: Serial No,Creation Document Type,Creación de documento
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,La fecha de finalización debe ser mayor que la fecha de inicio
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,La fecha de finalización debe ser mayor que la fecha de inicio
 DocType: Leave Type,Is Encash,Se convertirá en efectivo
 DocType: Leave Allocation,New Leaves Allocated,Nuevas Ausencias Asignadas
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Los datos del proyecto no están disponibles para el presupuesto
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Finalizará el
 DocType: Project,Expected End Date,Fecha prevista de finalización
 DocType: Budget Account,Budget Amount,Monto de Presupuesto
 DocType: Appraisal Template,Appraisal Template Title,Titulo de la plantilla de evaluación
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Fecha Desde {0} para el Empleado {1} no puede ser antes de la fecha de unión del empleado {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Comercial
 DocType: Patient,Alcohol Current Use,Uso Corriente de Alcohol
+DocType: Student Admission Program,Student Admission Program,Programa de admisión de estudiantes
 DocType: Payment Entry,Account Paid To,Cuenta pagado hasta
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,El producto principal {0} no debe ser un artículo de stock
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Todos los productos o servicios.
@@ -3823,30 +3905,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},El presupuesto {0} de la cuenta {1} para {2} {3} es {4} superior por {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Fila {0} # La cuenta debe ser de tipo &quot;Activo Fijo&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Cant. enviada
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Reglas para calcular el importe de envío en una venta
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,y deshabilitado Desactivado en el
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,La secuencia es obligatoria
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Servicios financieros
 DocType: Student Sibling,Student ID,Identificación del Estudiante
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Tipos de actividades para los registros de tiempo
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Correo electrónico del proveedor
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Tipos de actividades para los registros de tiempo
 DocType: Tax Rule,Sales,Ventas
 DocType: Stock Entry Detail,Basic Amount,Importe Base
 DocType: Training Event,Exam,Examen
 DocType: Complaint,Complaint,Queja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},El almacén es requerido para el stock del producto {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},El almacén es requerido para el stock del producto {0}
 DocType: Leave Allocation,Unused leaves,Ausencias no utilizadas
 DocType: Patient,Alcohol Past Use,Uso Pasado de Alcohol
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cred
 DocType: Tax Rule,Billing State,Región de facturación
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transferencia
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Buscar lista de materiales (LdM) incluyendo subconjuntos
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Transferencia
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Buscar lista de materiales (LdM) incluyendo subconjuntos
 DocType: Authorization Rule,Applicable To (Employee),Aplicable a ( Empleado )
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,La fecha de vencimiento es obligatoria
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,La fecha de vencimiento es obligatoria
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Incremento de Atributo {0} no puede ser 0
 DocType: Journal Entry,Pay To / Recd From,Pagar a / Recibido de
 DocType: Naming Series,Setup Series,Configurar secuencias
 DocType: Payment Reconciliation,To Invoice Date,Fecha para Factura
 DocType: Supplier,Contact HTML,HTML de Contacto
 ,Inactive Customers,Clientes Inactivos
+DocType: Student Admission Program,Maximum Age,Edad máxima
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Recibos de compra
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,¿Cómo se aplica la regla precios?
@@ -3865,6 +3949,7 @@
 DocType: GL Entry,Remarks,Observaciones
 DocType: Payment Entry,Account Paid From,De cuenta de pago
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Código de materia prima
+DocType: Task,Parent Task,Tarea principal
 DocType: Journal Entry,Write Off Based On,Desajuste basado en
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Hacer una Iniciativa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Impresión y Papelería
@@ -3873,19 +3958,19 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salario ya procesado para el período entre {0} y {1}, Deja período de aplicación no puede estar entre este intervalo de fechas."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,El registro de la instalación para un número de serie
 DocType: Guardian Interest,Guardian Interest,Interés del Tutor
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Configurar los valores predeterminados para facturas de TPV
 apps/erpnext/erpnext/config/hr.py +177,Training,Formación
 DocType: Timesheet,Employee Detail,Detalle de los Empleados
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ID de correo electrónico del Tutor1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,"El día ""siguiente fecha"" y ""repetir un día del mes"" deben ser iguales"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,"El día ""siguiente fecha"" y ""repetir un día del mes"" deben ser iguales"
 DocType: Lab Prescription,Test Code,Código de Prueba
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Ajustes para la página de inicio de la página web
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},Las solicitudes de Presupuesto (RFQs) no están permitidas para {0} debido a un puntaje de {1}
 DocType: Offer Letter,Awaiting Response,Esperando Respuesta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Arriba
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Monto total {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},atributo no válido {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Monto total {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},atributo no válido {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Mencionar si la cuenta no  es cuenta estándar a pagar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},El mismo Producto fue ingresado multiple veces {list}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Seleccione el grupo de evaluación que no sea &#39;Todos los grupos de evaluación&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Fila {0}: Centro de Costos es necesario para un elemento {1}
 DocType: Training Event Employee,Optional,Opcional
@@ -3908,19 +3993,20 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centro de Costes es obligatorio para el artículo {2}
 DocType: Vehicle,Policy No,N° de Política
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Obtener Productos del Paquete de Productos
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Como el stock existe contra un artículo {0}, no puede habilitar la propiedad de variantes"
 DocType: Asset,Straight Line,Línea Recta
 DocType: Project User,Project User,usuario proyecto
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,División
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,División
 DocType: GL Entry,Is Advance,Es un anticipo
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Asistencia 'Desde fecha' y 'Hasta fecha' son obligatorias
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,"Por favor, introduzca si 'Es sub-contratado' o no"
+DocType: Item,Default Purchase Unit of Measure,Unidad de Medida de Compra Predeterminada
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Fecha de la Última Comunicación
 DocType: Sales Team,Contact No.,Contacto No.
 DocType: Bank Reconciliation,Payment Entries,Entradas de Pago
 DocType: Production Order,Scrap Warehouse,Almacén de chatarra
 DocType: Production Order,Check if material transfer entry is not required,Compruebe si la entrada de transferencia de material no es necesaria
 DocType: Program Enrollment Tool,Get Students From,Obtener Estudiantes Desde
-DocType: Hub Settings,Seller Country,País de vendedor
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publicar artículos en la página web
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Agrupar sus estudiantes en lotes
 DocType: Authorization Rule,Authorization Rule,Regla de Autorización
@@ -3930,7 +4016,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Plantilla de impuestos (ventas)
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Total (Crédito)
 DocType: Repayment Schedule,Payment Date,Fecha de Pago
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nueva cantidad de lote
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Nueva cantidad de lote
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Ropa y Accesorios
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,No se pudo resolver la función de puntuación ponderada. Asegúrese de que la fórmula es válida.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Número de Orden
@@ -3948,6 +4034,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Fila  #{0}: el elemento {1} no puede ser presentado, ya es {2}"
 DocType: Tax Rule,Billing Country,País de facturación
 DocType: Purchase Order Item,Expected Delivery Date,Fecha prevista de entrega
+DocType: Restaurant Order Entry,Restaurant Order Entry,Entrada de orden de restaurante
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,El Débito y Crédito no es igual para {0} # {1}. La diferencia es {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,GASTOS DE ENTRETENIMIENTO
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Hacer Solicitud de materiales
@@ -3960,9 +4047,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Cuenta con transacción existente no se puede eliminar
 DocType: Vehicle,Last Carbon Check,Último control de Carbono
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,GASTOS LEGALES
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,"Por favor, seleccione la cantidad en la fila"
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,"Por favor, seleccione la cantidad en la fila"
 DocType: Purchase Invoice,Posting Time,Hora de Contabilización
 DocType: Timesheet,% Amount Billed,% importe facturado
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",El &quot;Tiempo por cita&quot; no se ha establecido para el Dr. {0}. Agréguelo en Physician master.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Cuenta telefonica
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Seleccione esta opción si desea obligar al usuario a seleccionar una serie antes de guardar. No habrá ninguna por defecto si marca ésta casilla.
@@ -3973,6 +4061,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ingresos del nuevo cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Gastos de Viaje
 DocType: Maintenance Visit,Breakdown,Desglose
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Añadir una suscripción de campo personalizada en el doctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Cuenta: {0} con divisa: {1} no puede ser seleccionada
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Actualizar el costo de la lista de materiales automáticamente a través de las tareas programadas, basado en la última tasa de valoración / tarifa de lista de precios / última tasa de compra de materias primas."
 DocType: Bank Reconciliation Detail,Cheque Date,Fecha del cheque
@@ -3997,7 +4086,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Importe total de facturación (a través de la gestión de tiempos)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,ID de Proveedor
 DocType: Payment Request,Payment Gateway Details,Detalles de Pasarela de Pago
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Cantidad debe ser mayor que 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Cantidad debe ser mayor que 0
 DocType: Journal Entry,Cash Entry,Entrada de caja
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Los nodos hijos sólo pueden ser creados bajo los nodos de tipo &quot;grupo&quot;
 DocType: Leave Application,Half Day Date,Fecha de Medio Día
@@ -4015,12 +4104,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Nota : El producto {0} ha sido ingresado varias veces
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Todos los Contactos.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Abreviatura de la compañia
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,El usuario {0} no existe
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,El usuario {0} no existe
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Abreviación
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Entrada de pago ya existe
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,No autorizado desde {0} excede los límites
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Plantilla maestra de nómina salarial
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Patología
+DocType: Restaurant Order Entry,Restaurant Table,Mesa de restaurante
 DocType: Leave Type,Max Days Leave Allowed,Máximo de días de ausencia permitidos
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Establezca la regla fiscal (Impuestos) del carrito de compras
 DocType: Purchase Invoice,Taxes and Charges Added,Impuestos y cargos adicionales
@@ -4032,10 +4123,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Cotizaciones enviadas a los clientes u oportunidades de venta.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rol que permite editar inventario congelado
 ,Territory Target Variance Item Group-Wise,Territory Target Variance Item Group-Wise
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Todas las categorías de clientes
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Todas las categorías de clientes
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,acumulado Mensual
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Posiblemente el registro de cambio de moneda no ha sido creado para {1} hasta {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Plantilla de impuestos es obligatorio.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Plantilla de impuestos es obligatorio.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Cuenta {0}: la cuenta padre {1} no existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifa de la lista de precios (Divisa por defecto)
 DocType: Products Settings,Products Settings,Ajustes de Productos
@@ -4061,12 +4152,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detalle de Impuestos
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Abreviatura del Instituto
 ,Item-wise Price List Rate,Detalle del listado de precios
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Presupuesto de Proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Presupuesto de Proveedor
 DocType: Quotation,In Words will be visible once you save the Quotation.,'En palabras' será visible una vez guarde el Presupuesto
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Cantidad ({0}) no puede ser una fracción en la fila {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el artículo {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el artículo {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Reglas para añadir los gastos de envío.
 DocType: Item,Opening Stock,Stock de Apertura
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Se requiere Cliente
@@ -4084,9 +4175,8 @@
 DocType: Customer,From Lead,Desde Iniciativa
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Las órdenes publicadas para la producción.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Seleccione el año fiscal...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,Se requiere un perfil de TPV para crear entradas en el punto de venta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,Se requiere un perfil de TPV para crear entradas en el punto de venta
 DocType: Program Enrollment Tool,Enroll Students,Inscribir Estudiantes
-DocType: Hub Settings,Name Token,Nombre de Token
 DocType: Lab Test,Approved Date,Fecha Aprobada
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Venta estándar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Al menos un almacén es obligatorio
@@ -4104,7 +4194,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Recursos Humanos
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pago para reconciliación de saldo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Impuestos pagados
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},La Orden de Producción ha sido {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},La Orden de Producción ha sido {0}
 DocType: BOM Item,BOM No,Lista de materiales (LdM) No.
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,El asiento {0} no tiene cuenta de {1} o ya esta enlazado con otro comprobante
@@ -4124,7 +4214,7 @@
 DocType: Currency Exchange,To Currency,A moneda
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Permitir a los usuarios siguientes aprobar solicitudes de ausencia en días bloqueados.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Tipos de reembolsos
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},La tasa de venta del elemento {0} es menor que su {1}. La tarifa de venta debe ser al menos {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},La tasa de venta del elemento {0} es menor que su {1}. La tarifa de venta debe ser al menos {2}
 DocType: Item,Taxes,Impuestos
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Pagados y no entregados
 DocType: Project,Default Cost Center,Centro de costos por defecto
@@ -4138,15 +4228,15 @@
 DocType: Employee Loan,Fully Disbursed,Completamente Desembolsado
 DocType: Maintenance Visit,Customer Feedback,Comentarios de cliente
 DocType: Account,Expense,Gastos
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,El puntaje no puede ser mayor que puntaje máximo
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,El puntaje no puede ser mayor que puntaje máximo
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Clientes y Proveedores
 DocType: Item Attribute,From Range,Desde Rango
 DocType: BOM,Set rate of sub-assembly item based on BOM,Fijar tipo de posición de submontaje basado en la lista de materiales
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Error de sintaxis en la fórmula o condición: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Error de sintaxis en la fórmula o condición: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Configuración del resumen de Trabajo Diario de la empresa
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,El producto {0} ha sido ignorado ya que no es un elemento de stock
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Enviar esta orden de producción para su posterior procesamiento.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Enviar esta orden de producción para su posterior procesamiento.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Para no utilizar la regla de precios en una única transacción, todas las reglas de precios aplicables deben ser desactivadas."
 DocType: Assessment Group,Parent Assessment Group,Grupo de Evaluación de Padres
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Trabajos
@@ -4158,23 +4248,24 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","No se puede filtrar en función al 'No. de comprobante', si esta agrupado por el nombre"
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +891,Make Supplier Quotation,Crear oferta de venta de un proveedor
 DocType: Quality Inspection,Incoming,Entrante
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.py +47,Assessment Result record {0} already exists.,Evaluación El registro de resultados {0} ya existe.
-DocType: BOM,Materials Required (Exploded),Materiales necesarios (despiece)
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.py +47,Assessment Result record {0} already exists.,El registro de Resultados de la Evaluación {0} ya existe.
+DocType: BOM,Materials Required (Exploded),Materiales Necesarios (Despiece)
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Por favor, ponga el filtro de la Compañía en blanco si el Grupo Por es ' Empresa'."
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Fecha de entrada no puede ser fecha futura
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Fila #{0}: Número de serie {1} no coincide con {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,para generar recurrente
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Permiso ocacional
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,UOM de Prueba de Laboratorio.
 DocType: Batch,Batch ID,ID de Lote
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Nota: {0}
 ,Delivery Note Trends,Evolución de las notas de entrega
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Resumen de la semana.
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Resumen de la semana.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,En Cantidad de Stock
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Cuenta: {0} sólo puede ser actualizada mediante transacciones de inventario
 DocType: Student Group Creation Tool,Get Courses,Obtener Cursos
 DocType: GL Entry,Party,Tercero
 DocType: Healthcare Settings,Patient Name,Nombre del Paciente
-DocType: Variant Field,Variant Field,Campo Variante
+DocType: Variant Field,Variant Field,Campo de Variante
 DocType: Sales Order,Delivery Date,Fecha de entrega
 DocType: Opportunity,Opportunity Date,Fecha de oportunidad
 DocType: Purchase Receipt,Return Against Purchase Receipt,Devolución contra recibo compra
@@ -4182,7 +4273,6 @@
 DocType: Purchase Order,To Bill,Por facturar
 DocType: Material Request,% Ordered,% Ordenado
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Para los grupos de estudiantes basados en cursos, el curso será validado para cada estudiante de los cursos inscritos en la inscripción al programa."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Introducir dirección de correo electrónico separadas por comas, la factura será enviada automáticamente en fecha determinada"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Trabajo por obra
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Precio de compra promedio
 DocType: Task,Actual Time (in Hours),Tiempo real (en horas)
@@ -4196,7 +4286,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,"El producto {0} no está configurado para utilizar Números de Serie, la columna debe permanecer en blanco"
 DocType: Accounts Settings,Accounts Settings,Configuración de cuentas
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,Aprobar
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,No hay resultados para enviar
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,No hay resultados para enviar
 DocType: Customer,Sales Partner and Commission,Comisiones y socios de ventas
 DocType: Employee Loan,Rate of Interest (%) / Year,Tasa de interés (%) / Año
 ,Project Quantity,Cantidad de Proyecto
@@ -4208,55 +4298,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Negro
 DocType: BOM Explosion Item,BOM Explosion Item,Desplegar lista de materiales (LdM) del producto
 DocType: Account,Auditor,Auditor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} artículos producidos
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} artículos producidos
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Aprende Más
 DocType: Cheque Print Template,Distance from top edge,Distancia desde el borde superior
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Lista de precios {0} está desactivada o no existe
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Lista de precios {0} está desactivada o no existe
 DocType: Purchase Invoice,Return,Retornar
 DocType: Production Order Operation,Production Order Operation,Operación en la orden de producción
 DocType: Pricing Rule,Disable,Desactivar
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Forma de pago se requiere para hacer un pago
 DocType: Project Task,Pending Review,Pendiente de revisar
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Citas y Consultas
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} no está inscrito en el Lote {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} no está inscrito en el lote {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Activo {0} no puede ser desechado, debido a que ya es {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Total reembolso (Vía reembolso de gastos)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Marcar Ausente
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Fila {0}: Divisa de la lista de materiales # {1} debe ser igual a la moneda seleccionada {2}
 DocType: Journal Entry Account,Exchange Rate,Tipo de cambio
 DocType: Patient,Additional information regarding the patient,Información adicional sobre el paciente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,La órden de venta {0} no esta validada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,La órden de venta {0} no esta validada
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Componente de Couta
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Gestión de Flota
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Agregar elementos de
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Gestión de Flota
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Agregar elementos de
 DocType: Cheque Print Template,Regular,Regular
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Coeficiente de ponderación total de todos los criterios de evaluación debe ser del 100%
-DocType: BOM,Last Purchase Rate,Tasa de cambio de última compra
+DocType: Purchase Order Item,Last Purchase Rate,Tasa de cambio de última compra
 DocType: Account,Asset,Activo
 DocType: Project Task,Task ID,Tarea ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,El inventario no puede existir para el pproducto {0} ya que tiene variantes
 DocType: Lab Test,Mobile,Móvil
 ,Sales Person-wise Transaction Summary,Resumen de transacciones por vendedor
 DocType: Training Event,Contact Number,Número de contacto
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,El almacén {0} no existe
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrarse en el Hub de ERPNext
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,El almacén {0} no existe
 DocType: Monthly Distribution,Monthly Distribution Percentages,Porcentajes de distribución mensuales
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,El producto seleccionado no puede contener lotes
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","tasa de valorización no encontrado para el elemento {0}, que se requiere para hacer asientos contables para {1} {2}. Si el artículo está tramitando como un elemento de la muestra en el {1}, por favor mencionar que en la tabla {1} artículo. De lo contrario, por favor crea una transacción de acciones de entrada para la tasa de valorización artículo o mención en el registro de artículos y, a continuación, tratar de enviar / cancelación de esta entrada"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% de materiales entregados contra esta nota de entrega
+DocType: Training Event,Has Certificate,Tiene certificado
 DocType: Project,Customer Details,Datos de Cliente
 DocType: Employee,Reports to,Enviar Informes a
 ,Unpaid Expense Claim,Reclamación de gastos no pagados
 DocType: Payment Entry,Paid Amount,Cantidad Pagada
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Explorar el Ciclo de Ventas
 DocType: Assessment Plan,Supervisor,Supervisor
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,En línea
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,En línea
 ,Available Stock for Packing Items,Inventario Disponible de Artículos de Embalaje
 DocType: Item Variant,Item Variant,Variante del Producto
 DocType: Assessment Result Tool,Assessment Result Tool,Herramienta Resultado de la Evaluación
 DocType: BOM Scrap Item,BOM Scrap Item,BOM de Artículo  de Desguace
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Ordenes presentada no se pueden eliminar
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Ordenes presentada no se pueden eliminar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Balance de la cuenta ya en Débito, no le está permitido establecer ""Balance Debe Ser"" como ""Crédito"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Gestión de Calidad
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Elemento {0} ha sido desactivado
@@ -4276,7 +4365,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Línea #{0}: tiene conflictos de tiempo con la linea {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Permitir tasa de valoración cero
 DocType: Training Event Employee,Invited,Invitado
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Múltiples estructuras salariales activas encontradas para el empleado {0} para las fechas indicadas
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Múltiples estructuras salariales activas encontradas para el empleado {0} para las fechas indicadas
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Configuración de cuentas de puerta de enlace.
 DocType: Employee,Employment Type,Tipo de empleo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,ACTIVOS FIJOS
@@ -4288,7 +4377,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,ID de Correo Electrónico de Estudiante
 DocType: Employee,Notice (days),Aviso (días)
 DocType: Tax Rule,Sales Tax Template,Plantilla de impuesto sobre ventas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Seleccione artículos para guardar la factura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Seleccione artículos para guardar la factura
 DocType: Employee,Encashment Date,Fecha de cobro
 DocType: Training Event,Internet,Internet
 DocType: Special Test Template,Special Test Template,Plantilla de Prueba Especial
@@ -4297,7 +4386,7 @@
 DocType: Production Order,Planned Operating Cost,Costos operativos planeados
 DocType: Academic Term,Term Start Date,Plazo Fecha de Inicio
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Cant Oportunidad
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},"Por favor, buscar el adjunto {0} #{1}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},"Por favor, buscar el adjunto {0} #{1}"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Equilibrio extracto bancario según Contabilidad General
 DocType: Job Applicant,Applicant Name,Nombre del Solicitante
 DocType: Authorization Rule,Customer / Item Name,Cliente / Nombre de Artículo
@@ -4317,7 +4406,7 @@
 DocType: Guardian,Guardian Of ,Tutor de
 DocType: Grading Scale Interval,Threshold,Límite
 DocType: BOM Update Tool,Current BOM,Lista de materiales (LdM) actual
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Agregar No. de serie
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Agregar No. de serie
 DocType: Production Order Item,Available Qty at Source Warehouse,Cantidad Disponible en Almacén Fuente
 apps/erpnext/erpnext/config/support.py +22,Warranty,Garantía
 DocType: Purchase Invoice,Debit Note Issued,Nota de Débito Emitida
@@ -4340,10 +4429,9 @@
 DocType: Account,Receivable,A cobrar
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila #{0}: No se permite cambiar de proveedores debido a que la Orden de Compra ya existe
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol autorizado para validar las transacciones que excedan los límites de crédito establecidos.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Seleccionar artículos para Fabricación
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Sincronización de datos Maestros,  puede tomar algún tiempo"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Seleccionar artículos para Fabricación
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Sincronización de datos Maestros,  puede tomar algún tiempo"
 DocType: Item,Material Issue,Expedición de Material
-DocType: Hub Settings,Seller Description,Descripción del vendedor
 DocType: Employee Education,Qualification,Calificación
 DocType: Item Price,Item Price,Precio de productos
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Jabón y detergente
@@ -4351,7 +4439,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Tiempo Desde no puede ser mayor Tiempo Hasta
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Imagén en movimiento y vídeo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenado/a
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Currículum
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Reanudar
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Si está habilitado, el sistema no actualizará los campos de las variantes de la plantilla, sino que copiará los datos de los campos mencionados a continuación al hacer una nueva variante."
 DocType: Salary Detail,Component,Componente
 DocType: Assessment Criteria,Assessment Criteria Group,Criterios de evaluación del Grupo
 DocType: Healthcare Settings,Patient Name By,Nombre del Paciente Por
@@ -4361,7 +4450,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Por favor, introduzca 'Función para aprobar' o 'Usuario de aprobación'---"
 DocType: Journal Entry,Write Off Entry,Diferencia de desajuste
 DocType: BOM,Rate Of Materials Based On,Valor de materiales basado en
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
+DocType: Item Variant Settings,Do not Update Variants,No actualizar las variantes
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Soporte Analítico
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Desmarcar todos
 DocType: POS Profile,Terms and Conditions,Términos y condiciones
@@ -4370,7 +4459,7 @@
 DocType: Leave Block List,Applies to Company,Se aplica a la empresa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,No se puede cancelar debido a que existe una entrada en el almacén {0}
 DocType: Employee Loan,Disbursement Date,Fecha de desembolso
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;Destinatarios&#39; no especificado
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Destinatarios&#39; no especificado
 DocType: BOM Update Tool,Update latest price in all BOMs,Actualizar el último precio en todas las listas de materiales
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Registro Médico
 DocType: Vehicle,Vehicle,Vehículo
@@ -4385,14 +4474,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Inviciativa %
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Depreciaciones de Activos y Saldos
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Monto {0} {1} transferido desde {2} a {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Monto {0} {1} transferido desde {2} a {3}
 DocType: Sales Invoice,Get Advances Received,Obtener anticipos recibidos
 DocType: Email Digest,Add/Remove Recipients,Agregar / Eliminar destinatarios
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Transacción no permitida contra Orden Producción Detenida {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Para establecer este año fiscal por defecto, haga clic en 'Establecer como predeterminado'"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,unirse
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Unirse
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Cantidad faltante
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Existe la variante de artículo {0} con mismos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Existe la variante de artículo {0} con mismos atributos
 DocType: Employee Loan,Repay from Salary,Reembolso del Salario
 DocType: Leave Application,LAP/,LAP/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Solicitando el pago contra {0} {1} para la cantidad {2}
@@ -4405,9 +4494,9 @@
 DocType: Sales Invoice Item,Sales Order Item,Producto de la orden de venta
 DocType: Salary Slip,Payment Days,Días de pago
 DocType: Patient,Dormant,Latente
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Almacenes con nodos secundarios no pueden ser convertidos en libro mayor
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Almacenes con nodos secundarios no pueden ser convertidos en libro mayor
 DocType: BOM,Manage cost of operations,Administrar costo de las operaciones
-DocType: Accounts Settings,Stale Days,Días estancos
+DocType: Accounts Settings,Stale Days,Días Pasados
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Cuando alguna de las operaciones comprobadas está en "" Enviado "" , una ventana emergente automáticamente se abre para enviar un correo electrónico al ""Contacto"" asociado en esa transacción , con la transacción como un archivo adjunto. El usuario puede o no puede enviar el correo electrónico."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Configuración global
 DocType: Assessment Result Detail,Assessment Result Detail,Detalle del Resultado de la Evaluación
@@ -4419,10 +4508,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,El número de serie {0} ya ha sido recibido
 ,Requested Items To Be Transferred,Artículos solicitados para ser transferidos
 DocType: Expense Claim,Vehicle Log,Bitácora del Vehiculo
-DocType: Purchase Invoice,Recurring Id,ID recurrente
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Presencia de fiebre (temperatura &gt; 38,5 °C o temperatura sostenida &gt; 38 °C / 100,4 °F)"
 DocType: Customer,Sales Team Details,Detalles del equipo de ventas.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Eliminar de forma permanente?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Eliminar de forma permanente?
 DocType: Expense Claim,Total Claimed Amount,Total reembolso
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Oportunidades de venta.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},No válida {0}
@@ -4432,7 +4520,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Tiendas por departamento
 ,Item Delivery Date,Fecha de Entrega del Artículo
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Configura tu Escuela en ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Configura tu Escuela en ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Importe de Cambio Base (Divisa de la Empresa)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,No hay asientos contables para los siguientes almacenes
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Guarde el documento primero.
@@ -4444,13 +4532,12 @@
 DocType: Task,Is Milestone,Es un Hito
 DocType: Daily Work Summary,Email Sent To,Correo electrónico enviado a
 DocType: Budget,Warn,Advertir
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,¿Estás seguro de que deseas cancelar el registro?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Otras observaciones, que deben ir en los registros."
 DocType: BOM,Manufacturing User,Usuario de Producción
 DocType: Purchase Invoice,Raw Materials Supplied,Materias primas suministradas
-DocType: Purchase Invoice,Recurring Print Format,Formato de impresión recurrente
 DocType: C-Form,Series,Secuencia
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},La moneda de la lista de precios {0} debe ser {1} o {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Añadir Productos
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},La moneda de la lista de precios {0} debe ser {1} o {2}
 DocType: Appraisal,Appraisal Template,Plantilla de evaluación
 DocType: Item Group,Item Classification,Clasificación de producto
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Gerente de desarrollo de negocios
@@ -4464,7 +4551,7 @@
 DocType: Item Attribute Value,Attribute Value,Valor del Atributo
 ,Itemwise Recommended Reorder Level,Nivel recomendado de reabastecimiento de producto
 DocType: Salary Detail,Salary Detail,Detalle de Sueldos
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,"Por favor, seleccione primero {0}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,"Por favor, seleccione primero {0}"
 DocType: Appointment Type,Physician,Médico
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,El lote {0} del producto {1} ha expirado.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Consultas
@@ -4475,7 +4562,7 @@
 DocType: Salary Detail,Default Amount,Importe por defecto
 DocType: Lab Test Template,Descriptive,Descriptivo
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,El almacén no se encuentra en el sistema
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Resumen de este mes
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Resumen de este mes
 DocType: Quality Inspection Reading,Quality Inspection Reading,Lecturas de inspección de calidad
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,'Congelar stock mayor a' debe ser menor a %d días.
 DocType: Tax Rule,Purchase Tax Template,Plantilla de Impuestos sobre compras
@@ -4498,12 +4585,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Eventos/Resultados de Entrenamiento
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,La depreciación acumulada como en
 DocType: Sales Invoice,C-Form Applicable,C -Forma Aplicable
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},El tiempo de operación debe ser mayor que 0 para {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},El tiempo de operación debe ser mayor que 0 para {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Almacén es obligatorio
 DocType: Supplier,Address and Contacts,Dirección y contactos
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detalles de conversión de unidad de medida (UdM)
 DocType: Program,Program Abbreviation,Abreviatura del Programa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,La orden de producción no se puede asignar a una plantilla de producto
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,La orden de producción no se puede asignar a una plantilla de producto
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Los cargos se actualizan en el recibo de compra  por cada producto
 DocType: Warranty Claim,Resolved By,Resuelto por
 DocType: Bank Guarantee,Start Date,Fecha de inicio
@@ -4529,26 +4616,27 @@
 DocType: Employee,Educational Qualification,Formación académica
 DocType: Workstation,Operating Costs,Costos operativos
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Acción si se acumula presupuesto mensual excedido
-DocType: Purchase Invoice,Submit on creation,Validar al Crear
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Moneda para {0} debe ser {1}
+DocType: Subscription,Submit on creation,Validar al Crear
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Moneda para {0} debe ser {1}
 DocType: Asset,Disposal Date,Fecha de eliminación
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Los correos electrónicos serán enviados a todos los empleados activos de la empresa a la hora determinada, si no tienen vacaciones. Resumen de las respuestas será enviado a la medianoche."
 DocType: Employee Leave Approver,Employee Leave Approver,Supervisor de ausencias de empleados
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Línea {0}: Una entrada de abastecimiento ya existe para el almacén {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdida, porque se ha hecho el Presupuesto"
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Comentarios del entrenamiento
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Línea {0}: Una entrada de abastecimiento ya existe para el almacén {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdida, porque se ha hecho el Presupuesto"
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Comentarios del entrenamiento
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,La orden de producción {0} debe ser validada
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Criterios de Calificación del Proveedor
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},"Por favor, seleccione Fecha de inicio y Fecha de finalización para el elemento {0}"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Curso es obligatorio en la fila {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,La fecha no puede ser anterior a la fecha actual
 DocType: Supplier Quotation Item,Prevdoc DocType,DocType Previo
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Añadir / Editar Precios
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Añadir / Editar Precios
 DocType: Batch,Parent Batch,Lote padre
 DocType: Cheque Print Template,Cheque Print Template,Plantilla de impresión de cheques
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Centros de costos
 DocType: Lab Test Template,Sample Collection,Coleccion de Muestra
 ,Requested Items To Be Ordered,Requisiciones pendientes para ser ordenadas
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Mis pedidos
 DocType: Price List,Price List Name,Nombre de la lista de precios
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Resumen diario de trabajo para {0}
 DocType: Employee Loan,Totals,Totales
@@ -4567,12 +4655,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} unidades de {1} necesaria en {2} sobre {3} {4} {5} para completar esta transacción.
 DocType: Fee Schedule,Student Category,Categoría estudiante
 DocType: Announcement,Student,Estudiante
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Unidades de la organización (listado de departamentos.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Unidades de la organización (listado de departamentos.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Ir a Habitaciones
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Por favor, ingrese el mensaje antes de enviarlo"
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,DUPLICADO PARA PROVEEDOR
 DocType: Email Digest,Pending Quotations,Presupuestos pendientes
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Perfiles de punto de venta (POS)
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Perfiles de punto de venta (POS)
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Configuraciones de prueba de laboratorio.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Prestamos sin garantía
 DocType: Cost Center,Cost Center Name,Nombre del centro de costos
@@ -4582,6 +4670,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Monto total pagado
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Los mensajes con más de 160 caracteres se dividirá en varios envios
 DocType: Purchase Receipt Item,Received and Accepted,Recibidos y aceptados
+DocType: Hub Settings,Company and Seller Profile,Perfil de la empresa y del vendedor
 ,GST Itemised Sales Register,Registro detallado de ventas de GST
 ,Serial No Service Contract Expiry,Número de serie de expiracion del contrato de servicios
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,No se pueden registrar Debitos y Creditos a la misma Cuenta al mismo tiempo
@@ -4591,10 +4680,11 @@
 DocType: Item,Variant Based On,Variante basada en
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Peso total asignado debe ser de 100 %. Es {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Sus Proveedores
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Por Favor Corrija la
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,"No se puede definir como pérdida, cuando la orden de venta esta hecha."
 DocType: Request for Quotation Item,Supplier Part No,Parte de Proveedor Nro
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"No se puede deducir cuando la categoría es 'de Valoración ""o"" Vaulation y Total'"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Recibido de
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Recibido de
 DocType: Lead,Converted,Convertido
 DocType: Item,Has Serial No,Posee numero de serie
 DocType: Employee,Date of Issue,Fecha de Emisión.
@@ -4602,7 +4692,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Según las Configuraciones de Compras si el Recibo de Compra es Obligatorio == 'Si', para crear la Factura de Compra el usuario necesita crear el Recibo de Compra primero para el item {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Fila #{0}: Asignar Proveedor para el elemento {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Fila {0}: valor Horas debe ser mayor que cero.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Sitio web Imagen {0} unido al artículo {1} no se puede encontrar
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Sitio web Imagen {0} unido al artículo {1} no se puede encontrar
 DocType: Issue,Content Type,Tipo de contenido
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computadora
 DocType: Item,List this Item in multiple groups on the website.,Listar este producto en múltiples grupos del sitio web.
@@ -4613,19 +4703,19 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Verificar entradas no conciliadas
 DocType: Payment Reconciliation,From Invoice Date,Desde Fecha de la Factura
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,No tienes permiso para enviar
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,Moneda de facturación debe ser igual a la divisa por defecto de la compañía o la divisa de la cuenta de la parte
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Moneda de facturación debe ser igual a la divisa por defecto de la compañía o la divisa de la cuenta de la parte
 DocType: Healthcare Settings,Laboratory Settings,Configuración del Laboratorio
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Dejar el Encargo
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,¿A qué se dedica?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Para Almacén
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Todas las admisiones de estudiantes
-,Average Commission Rate,Tasa de comisión promedio
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,"'Posee numero de serie' no puede ser ""Sí"" para los productos que NO son de stock"
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,¿A qué se dedica?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Para Almacén
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Todas las admisiones de estudiantes
+,Average Commission Rate,Tasa de Comisión Promedio
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,"'Posee numero de serie' no puede ser ""Sí"" para los productos que NO son de stock"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Seleccione Estado
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,La asistencia no se puede marcar para fechas futuras
 DocType: Pricing Rule,Pricing Rule Help,Ayuda de regla de precios
 DocType: School House,House Name,Nombre de la casa
-DocType: Fee Schedule,Total Amount per Student,Cantidad total por estudiante
+DocType: Fee Schedule,Total Amount per Student,Cantidad total por Estudiante
 DocType: Purchase Taxes and Charges,Account Head,Encabezado de cuenta
 apps/erpnext/erpnext/config/stock.py +173,Update additional costs to calculate landed cost of items,Actualización de los costes adicionales para el cálculo del precio al desembarque de artículos
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Electrical,Eléctrico
@@ -4638,40 +4728,40 @@
 DocType: Item,Customer Code,Código de Cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Recordatorio de cumpleaños para {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Días desde la última orden
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,La cuenta de débito debe pertenecer a las cuentas de balance
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,La cuenta de débito debe pertenecer a las cuentas de balance
 DocType: Buying Settings,Naming Series,Secuencias e identificadores
 DocType: Leave Block List,Leave Block List Name,Nombre de la Lista de Bloqueo de Vacaciones
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,La fecha de comienzo del seguro debe ser menos que la fecha de fin del seguro
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Configure el Sistema de nombres de instructor en la escuela&gt; Configuración de la escuela
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Inventarios
 DocType: Timesheet,Production Detail,Detalle de Producción
+DocType: Restaurant,Active Menu,Menú activo
 DocType: Target Detail,Target Qty,Cantidad estimada
 DocType: Shopping Cart Settings,Checkout Settings,Ajustes del Pedido
 DocType: Attendance,Present,Presente
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,La nota de entrega {0} no debe estar validada
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,La nota de entrega {0} no debe estar validada
 DocType: Notification Control,Sales Invoice Message,Mensaje de factura
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Cuenta de Clausura {0} tiene que ser de Responsabilidad / Patrimonio
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Nómina de sueldo del empleado {0} ya creado para la hoja de tiempo {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Nómina de sueldo del empleado {0} ya creado para la hoja de tiempo {1}
 DocType: Vehicle Log,Odometer,Cuentakilómetros
 DocType: Sales Order Item,Ordered Qty,Cantidad ordenada
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Artículo {0} está deshabilitado
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Artículo {0} está deshabilitado
 DocType: Stock Settings,Stock Frozen Upto,Inventario congelado hasta
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM no contiene ningún artículo de stock
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Actividad del proyecto / tarea.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM no contiene ningún artículo de stock
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Actividad del proyecto / tarea.
 DocType: Vehicle Log,Refuelling Details,Detalles de repostaje
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generar nóminas salariales
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","'Compras' debe ser seleccionada, si la opción: 'Aplicable para' esta seleccionado como {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,El descuento debe ser inferior a 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Última tasa de compra no encontrada
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Saldo de perdidas y ganancias (Divisa por defecto)
 DocType: Sales Invoice Timesheet,Billing Hours,Horas de facturación
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,BOM por defecto para {0} no encontrado
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Fila  #{0}: Configure la cantidad de pedido
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM por defecto para {0} no encontrado
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Fila  #{0}: Configure la cantidad de pedido
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Toca los elementos para agregarlos aquí
 DocType: Fees,Program Enrollment,Programa de Inscripción
 DocType: Landed Cost Voucher,Landed Cost Voucher,Comprobante de costos de destino estimados
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Por favor, configure {0}"
-DocType: Purchase Invoice,Repeat on Day of Month,Repetir un día al mes
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} es estudiante inactivo
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} es un estudiante inactivo
 DocType: Employee,Health Details,Detalles de salud
 DocType: Offer Letter,Offer Letter Terms,Términos y condiciones de carta de oferta
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Para crear una Solicitud de Pago se requiere el documento de referencia
@@ -4679,7 +4769,6 @@
 DocType: Employee External Work History,Salary,Salario.
 DocType: Serial No,Delivery Document Type,Tipo de documento de entrega
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Presentar todas las nóminas salariales según los criterios seleccionados anteriormente
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} artículos sincronizados
 DocType: Sales Order,Partly Delivered,Parcialmente entregado
 DocType: Email Digest,Receivables,Cuentas por cobrar
 DocType: Lead Source,Lead Source,Fuente de de la Iniciativa
@@ -4699,21 +4788,21 @@
 DocType: Upload Attendance,Upload Attendance,Subir Asistencia
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +319,BOM and Manufacturing Quantity are required,Se requiere la lista de materiales (LdM) y cantidad a manufacturar.
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Rango de antigüedad 2
-DocType: SG Creation Tool Course,Max Strength,Fuerza máx
+DocType: SG Creation Tool Course,Max Strength,Fuerza Máx
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,Lista de materiales (LdM) reemplazada
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Seleccionar Elementos según la Fecha de Entrega
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Seleccionar Elementos según la Fecha de Entrega
 ,Sales Analytics,Análisis de ventas
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Disponible {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Disponible {0}
 ,Prospects Engaged But Not Converted,Perspectivas comprometidas pero no convertidas
 DocType: Manufacturing Settings,Manufacturing Settings,Ajustes de Producción
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configuración de correo
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Móvil del Tutor1
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,"Por favor, ingrese la divisa por defecto en la compañía principal"
 DocType: Stock Entry Detail,Stock Entry Detail,Detalles de entrada de inventario
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Recordatorios Diarios
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Recordatorios Diarios
 DocType: Products Settings,Home Page is Products,La página de inicio son los productos
 ,Asset Depreciation Ledger,Libro Mayor Depreciacion de Activos
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Conflicto de impuestos con {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Conflicto de impuestos con {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nombre de la nueva cuenta
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Costo materias primas suministradas
 DocType: Selling Settings,Settings for Selling Module,Ajustes para módulo de ventas
@@ -4727,9 +4816,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,El producto {0} debe ser un producto en stock
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Almacén predeterminado de trabajos en proceso
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Los ajustes por defecto para las transacciones contables.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configure el Sistema de nombres de empleados en Recursos humanos&gt; Configuración de recursos humanos
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,La fecha prevista no puede ser menor que la fecha de requisición de materiales
-DocType: Fees,Student Details,Detalles del estudiante
+DocType: Restaurant,Default Tax Template,Plantilla de impuesto predeterminado
+DocType: Fees,Student Details,Detalles del Estudiante
 DocType: Purchase Invoice Item,Stock Qty,Cantidad de existencias
 DocType: Employee Loan,Repayment Period in Months,Plazo de devolución en Meses
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Error: No es un ID válido?
@@ -4746,8 +4836,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Ir a los Elementos
 DocType: Sales Partner,Partner Type,Tipo de socio
 DocType: Purchase Taxes and Charges,Actual,Actual
+DocType: Restaurant Menu,Restaurant Manager,Gerente del restaurante
 DocType: Authorization Rule,Customerwise Discount,Descuento de Cliente
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Tabla de Tiempo para las tareas.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Tabla de Tiempo para las tareas.
 DocType: Purchase Invoice,Against Expense Account,Contra la Cuenta de Gastos
 DocType: Production Order,Production Order,Orden de Producción
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha validado
@@ -4755,7 +4846,6 @@
 DocType: Quotation Item,Against Docname,Contra Docname
 DocType: SMS Center,All Employee (Active),Todos los Empleados (Activos)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Ver Ahora
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Seleccione el período en el cual la factura se creará automáticamente
 DocType: BOM,Raw Material Cost,Costo de materia prima
 DocType: Item Reorder,Re-Order Level,Nivel mínimo de stock.
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Escriba artículos y Cantidad planificada para los que desea elevar las órdenes de producción o descargar la materia prima para su análisis.
@@ -4768,23 +4858,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,El tipo de reporte es obligatorio
 DocType: Item,Serial Number Series,Secuencia del número de serie
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},El almacén es obligatorio para el producto {0} en la línea {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Añadir Programas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Ventas al por menor y por mayor
 DocType: Issue,First Responded On,Primera respuesta el
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cruz Ficha de artículo en varios grupos
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},La fecha de inicio y la fecha final ya están establecidos en el año fiscal {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Fecha de Liquidación actualizada
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Lote dividido
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Lote dividido
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Reconciliado exitosamente
 DocType: Request for Quotation Supplier,Download PDF,Descargar PDF
 DocType: Production Order,Planned End Date,Fecha de finalización planeada
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Por favor ingrese la fecha de programación
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Dónde se almacenarán los productos
 DocType: Request for Quotation,Supplier Detail,Detalle del proveedor
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Error Fórmula o Condición: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Error Fórmula o Condición: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Cantidad facturada
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Los pesos de los criterios deben sumar hasta el 100%
 DocType: Attendance,Attendance,Asistencia
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,Artículos en stock
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,Artículos en stock
 DocType: BOM,Materials,Materiales
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Si no está marcada, la lista tendrá que ser añadida a cada departamento donde será aplicada."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Origen y destino de depósito no puede ser el mismo
@@ -4802,6 +4892,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,Sobre el total neto
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Valor del atributo {0} debe estar dentro del rango de {1} a {2} en los incrementos de {3} para el artículo {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Almacenes de destino de la línea {0} deben ser los mismos para la orden de producción
+DocType: Restaurant Reservation,Waitlisted,En la lista de espera
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,El tipo de moneda/divisa no se puede cambiar después de crear la entrada contable
 DocType: Vehicle Service,Clutch Plate,Placa de embrague
 DocType: Company,Round Off Account,Cuenta de redondeo por defecto
@@ -4810,7 +4901,7 @@
 DocType: Customer Group,Parent Customer Group,Categoría principal de cliente
 DocType: Journal Entry,Subscription,Suscripción
 DocType: Purchase Invoice,Contact Email,Correo electrónico de contacto
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Creación de tarifas pendientes
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Creación de Cuotas Pendientes
 DocType: Appraisal Goal,Score Earned,Puntuación Obtenida.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +229,Notice Period,Período de Notificación
 DocType: Asset Category,Asset Category Name,Nombre de la Categoría de Activos
@@ -4818,7 +4909,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nombre nuevo encargado de ventas
 DocType: Packing Slip,Gross Weight UOM,Peso bruto de la unidad de medida (UdM)
 DocType: Delivery Note Item,Against Sales Invoice,Contra la factura de venta
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Introduzca los números de serie para el artículo serializado
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Introduzca los números de serie para el artículo serializado
 DocType: Bin,Reserved Qty for Production,Cantidad reservada para la Producción
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Deje sin marcar si no desea considerar el lote mientras hace grupos basados en curso.
 DocType: Asset,Frequency of Depreciation (Months),Frecuencia de Depreciación (Meses)
@@ -4829,7 +4920,7 @@
 DocType: Lab Test,Test Group,Grupo de Pruebas
 DocType: Payment Reconciliation,Receivable / Payable Account,Cuenta por Cobrar / Pagar
 DocType: Delivery Note Item,Against Sales Order Item,Contra la orden de venta del producto
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},"Por favor, especifique el valor del atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},"Por favor, especifique el valor del atributo {0}"
 DocType: Item,Default Warehouse,Almacén por defecto
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},El presupuesto no se puede asignar contra el grupo de cuentas {0}
 DocType: Healthcare Settings,Patient Registration,Registro del Paciente
@@ -4838,7 +4929,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Fecha de Depreciación
 DocType: Issue,Support Team,Equipo de soporte
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),Caducidad (en días)
-DocType: Appraisal,Total Score (Out of 5),Puntaje total (de 5 )
+DocType: Appraisal,Total Score (Out of 5),Puntaje Total (de 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Student Attendance Tool,Batch,Lote
 apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Balance
@@ -4847,7 +4938,7 @@
 DocType: Lab Test Groups,Lab Test Groups,Grupos de Pruebas de Laboratorio
 DocType: Project,Total Expense Claim (via Expense Claims),Total reembolso (Vía reembolsos de gastos)
 DocType: GST Settings,GST Summary,Resumen de GST
-DocType: Assessment Result,Total Score,Puntaje total
+DocType: Assessment Result,Total Score,Puntaje Total
 DocType: Journal Entry,Debit Note,Nota de débito
 DocType: Stock Entry,As per Stock UOM,Unidad de Medida Según Inventario
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,No ha expirado
@@ -4858,15 +4949,16 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Vendedores
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Presupuesto y Centro de Costo
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,No se permiten múltiple métodos de pago predeterminados
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,para el/la
 ,Appointment Analytics,Análisis de Citas
 DocType: Vehicle Service,Half Yearly,Semestral
 DocType: Lead,Blog Subscriber,Suscriptor del Blog
 DocType: Guardian,Alternate Number,Número Alternativo
 DocType: Healthcare Settings,Consultations in valid days,Consultas en días válidos
-DocType: Assessment Plan Criteria,Maximum Score,Puntuación máxima
+DocType: Assessment Plan Criteria,Maximum Score,Puntuación Máxima
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Crear reglas para restringir las transacciones basadas en valores.
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +49, Group Roll No,No. de rol de grupo
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +9,Fee Creation Failed,Error en la creación de cuotas
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +9,Fee Creation Failed,Error en la Creación de Cuotas
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Deje en blanco si hace grupos de estudiantes por año
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si se marca, el número total de días trabajados incluirá las vacaciones, y este reducirá el salario por día."
 DocType: Purchase Invoice,Total Advance,Total anticipo
@@ -4875,7 +4967,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Cuenta Cotización
 ,BOM Stock Report,Reporte de Stock de BOM
 DocType: Stock Reconciliation Item,Quantity Difference,Diferencia de Cantidad
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Procesando nómina
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Procesando nómina
 DocType: Opportunity Item,Basic Rate,Precio Base
 DocType: GL Entry,Credit Amount,Importe acreditado
 DocType: Cheque Print Template,Signatory Position,Posición Signatario
@@ -4889,12 +4981,12 @@
 DocType: Tax Rule,Tax Rule,Regla fiscal
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Mantener mismo precio durante todo el ciclo de ventas
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planear las horas adicionales en la estación de trabajo.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Clientes en Cola
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,El Dr. {0} no tiene un Horario del médico. Agregarlo en Physician master
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Clientes en Cola
 DocType: Student,Nationality,Nacionalidad
 ,Items To Be Requested,Solicitud de Productos
-DocType: Purchase Order,Get Last Purchase Rate,Obtener último precio de compra
 DocType: Company,Company Info,Información de la compañía
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Seleccionar o añadir nuevo cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Seleccionar o añadir nuevo cliente
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Centro de coste es requerido para reservar una reclamación de gastos
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),UTILIZACIÓN DE FONDOS (ACTIVOS)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Esto se basa en la presencia de este empleado
@@ -4902,6 +4994,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Cuenta de debito
 DocType: Fiscal Year,Year Start Date,Fecha de Inicio de Año
 DocType: Attendance,Employee Name,Nombre de empleado
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Elemento de entrada de pedido de restaurante
 DocType: Sales Invoice,Rounded Total (Company Currency),Total redondeado (Divisa por defecto)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,No se puede convertir a 'Grupo' porque se seleccionó 'Tipo de Cuenta'.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} ha sido modificado. Por favor actualice.
@@ -4912,6 +5005,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Beneficios de empleados
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elemento {0} en la línea {1}
 DocType: Production Order,Manufactured Qty,Cantidad Producida
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Factura creada
 DocType: Purchase Receipt Item,Accepted Quantity,Cantidad Aceptada
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},"Por favor, establece una lista predeterminada de feriados para Empleado {0} o de su empresa {1}"
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} no existe
@@ -4921,18 +5015,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Línea #{0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
 DocType: Maintenance Schedule,Schedule,Programa
 DocType: Account,Parent Account,Cuenta principal
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Disponible
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Disponible
 DocType: Quality Inspection Reading,Reading 3,Lectura 3
 ,Hub,Centro de actividades
 DocType: GL Entry,Voucher Type,Tipo de Comprobante
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
 DocType: Lab Test,Approved,Aprobado
 DocType: Pricing Rule,Price,Precio
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',"Empleado relevado en {0} debe definirse como ""izquierda"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',"Empleado relevado en {0} debe definirse como ""izquierda"""
+DocType: Hub Settings,Last Sync On,Última sincronización activada
 DocType: Guardian,Guardian,Tutor
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,La evaluación {0} creado para el empleado {1} en el rango de fechas determinado
 DocType: Employee,Education,Educación
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Elim
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,Elim
 DocType: Selling Settings,Campaign Naming By,Nombrar campañas por
 DocType: Employee,Current Address Is,La Dirección Actual es
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Objetivo mensual de ventas (
@@ -4947,7 +5042,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Código del curso:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,"Por favor, ingrese la Cuenta de Gastos"
 DocType: Account,Stock,Almacén
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Fila #{0}: Tipo de documento de referencia debe ser uno de la orden de compra, factura de compra o de entrada de diario"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Fila #{0}: Tipo de documento de referencia debe ser uno de la orden de compra, factura de compra o de entrada de diario"
 DocType: Employee,Current Address,Dirección Actual
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Si el artículo es una variante de otro artículo entonces la descripción, imágenes, precios, impuestos, etc. se establecerán a partir de la plantilla a menos que se especifique explícitamente"
 DocType: Serial No,Purchase / Manufacture Details,Detalles de compra / producción
@@ -4978,7 +5073,7 @@
 DocType: Hub Settings,Hub Settings,Ajustes del Centro de actividades
 DocType: Project,Gross Margin %,Margen bruto %
 DocType: BOM,With Operations,Con Operaciones
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Ya se han registrado asientos contables en la divisa {0} para la empresa {1}. Por favor seleccione una cuenta por cobrar o por pagar con divisa {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Ya se han registrado asientos contables en la divisa {0} para la empresa {1}. Por favor seleccione una cuenta por cobrar o por pagar con divisa {0}.
 DocType: Asset,Is Existing Asset,Es Activo Existente
 DocType: Salary Detail,Statistical Component,Componente estadístico
 DocType: Warranty Claim,If different than customer address,Si es diferente a la dirección del cliente
@@ -4986,13 +5081,14 @@
 DocType: BOM Operation,BOM Operation,Operación de la lista de materiales (LdM)
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Sobre la línea anterior
 DocType: Student,Home Address,Direccion de casa
-apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Opciones de Variante del artículo.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transferir Activo
+DocType: Item,Has Expiry Date,Tiene fecha de caducidad
+apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Configuraciones de Variante del Artículo.
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,Transferir Activo
 DocType: POS Profile,POS Profile,Perfil de POS
 DocType: Training Event,Event Name,Nombre del Evento
 DocType: Physician,Phone (Office),Teléfono (Oficina)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,Admisión
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Admisiones para {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,Admisión
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Admisiones para {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Configuración general para establecer presupuestos, objetivos, etc."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Nombre de la Variable
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","El producto {0} es una plantilla, por favor seleccione una de sus variantes"
@@ -5001,7 +5097,7 @@
 DocType: Assessment Plan,Room,Habitación
 DocType: Purchase Order,Advance Paid,Pago Anticipado
 DocType: Item,Item Tax,Impuestos del producto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Materiales de Proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Materiales de Proveedor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Factura con impuestos especiales
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Umbral {0}% aparece más de una vez
 DocType: Expense Claim,Employees Email Id,ID de Email de empleados
@@ -5012,32 +5108,30 @@
 DocType: Program,Program Name,Nombre del programa
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considerar impuestos o cargos por
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,La cantidad real es obligatoria
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} tiene actualmente una {1} Tarjeta de Puntuación de Proveedores y las Órdenes de Compra a este Proveedor deben ser emitidas con precaución.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} tiene actualmente una {1} Tarjeta de Puntuación de Proveedores y las Órdenes de Compra a este Proveedor deben ser emitidas con precaución.
 DocType: Employee Loan,Loan Type,Tipo de préstamo
 DocType: Scheduling Tool,Scheduling Tool,Herramienta de programación
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Tarjetas de credito
 DocType: BOM,Item to be manufactured or repacked,Producto a manufacturar o re-empacar
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Los ajustes por defecto para las transacciones de inventario.
-DocType: Purchase Invoice,Next Date,Siguiente fecha
 DocType: Employee Education,Major/Optional Subjects,Principales / Asignaturas Optativas
 DocType: Sales Invoice Item,Drop Ship,Envío Triangulado
+DocType: Hub Settings,Suspended,Suspendido
 DocType: Training Event,Attendees,Asistentes
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aquí usted puede ingresar los detalles de la familia como el nombre y ocupación de los padres, cónyuge e hijos"
 DocType: Academic Term,Term End Date,Plazo Fecha de finalización
-DocType: Hub Settings,Seller Name,Nombre de vendedor
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impuestos y gastos deducibles (Divisa por defecto)
 DocType: Item Group,General Settings,Configuración General
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,'Desde moneda - a moneda' no pueden ser las mismas
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Añadir Instructores
 DocType: Stock Entry,Repack,Re-empacar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Debe guardar el formulario antes de proceder
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Seleccione primero la Empresa
 DocType: Item Attribute,Numeric Values,Valores Numéricos
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Adjuntar Logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Niveles de Stock
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Niveles de Stock
 DocType: Customer,Commission Rate,Comisión de ventas
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Creó {0} tarjetas de puntuación para {1} entre:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Crear Variante
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Crear Variante
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquear solicitudes de ausencias por departamento.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Tipo de pago debe ser uno de Recibir, Pagar y Transferencia Interna"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analítica
@@ -5052,13 +5146,15 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Capital de inventario
 DocType: Shopping Cart Settings,Show Public Attachments,Mostrar adjuntos públicos
 DocType: Packing Slip,Package Weight Details,Detalles del peso del paquete
+DocType: Restaurant Reservation,Reservation Time,Tiempo de reserva
 DocType: Payment Gateway Account,Payment Gateway Account,Cuenta de Pasarela de Pago
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Después de la realización del pago redirigir el usuario a la página seleccionada.
 DocType: Company,Existing Company,Compañía existente
 DocType: Healthcare Settings,Result Emailed,Resultado enviado por Correo Electrónico
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","Categoría de Impuesto fue cambiada a ""Total"" debido a que todos los Productos son items de no stock"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Código de artículo&gt; Grupo de artículos&gt; Marca
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,"Por favor, seleccione un archivo csv"
-DocType: Student Leave Application,Mark as Present,Marcar como presente
+DocType: Student Leave Application,Mark as Present,Marcar como Presente
 DocType: Supplier Scorecard,Indicator Color,Color del Indicador
 DocType: Purchase Order,To Receive and Bill,Para recibir y pagar
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Productos Destacados
@@ -5076,16 +5172,16 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Listado de todos los proyectos.
 apps/erpnext/erpnext/controllers/status_updater.py +209,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Para permitir exceso de facturación o exceso de pedidos, actualizar ""Asignación"" en el archivo Configuración o en el artículo."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,No volver a mostrar cualquier símbolo como $ u otro junto a las monedas.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Medio día)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Medio Día)
 DocType: Supplier,Credit Days,Días de Crédito
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Hacer Lote de Estudiantes
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Es un traslado
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Obtener productos desde lista de materiales (LdM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Obtener productos desde lista de materiales (LdM)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Días de iniciativa
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Fila #{0}: Fecha de ingreso debe ser la misma que la fecha de compra {1} de activos {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Marque esto si el estudiante está residiendo en el albergue del Instituto.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Por favor, introduzca las Ordenes de Venta en la tabla anterior"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Por favor, introduzca las Ordenes de Venta en la tabla anterior"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,No Envió Salarios
 ,Stock Summary,Resumen de Existencia
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Transferir un activo de un almacén a otro
@@ -5101,5 +5197,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Línea {0}: La entrada de débito no puede vincularse con {1}
 DocType: Journal Entry,Subscription Section,Sección de Suscripción
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Cuenta {0} no existe
+DocType: Training Event,Training Program,Programa de entrenamiento
 DocType: Account,Cash,Efectivo
 DocType: Employee,Short biography for website and other publications.,Breve biografía para la página web y otras publicaciones.
diff --git a/erpnext/translations/et.csv b/erpnext/translations/et.csv
index 553c186..46f5b84 100644
--- a/erpnext/translations/et.csv
+++ b/erpnext/translations/et.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Palk režiim
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Registreeru
 DocType: Patient,Divorced,Lahutatud
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,"Esemed, mis on juba sünkroniseeritud"
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Luba toode, mis lisatakse mitu korda tehingu"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Tühista Külastage {0} enne tühistades selle Garantiinõudest
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Jäta approvers
 DocType: Sales Partner,Dealer,Dealer
 DocType: Consultation,Investigations,Uuringud
+DocType: Restaurant Order Entry,Click Enter To Add,"Klõpsake nuppu Lisa, et lisada"
 DocType: Employee,Rented,Üürikorter
 DocType: Purchase Order,PO-,po-
 DocType: POS Profile,Applicable for User,Rakendatav Kasutaja
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Tootmise lõpetanud tellimust ei ole võimalik tühistada, ummistust kõigepealt tühistama"
 DocType: Vehicle Service,Mileage,kilometraaž
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Kas tõesti jäägid see vara?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Kas tõesti jäägid see vara?
 DocType: Drug Prescription,Update Schedule,Värskendage ajakava
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Vali Vaikimisi Tarnija
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Valuuta on vajalik Hinnakiri {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Kontrollige saadavust
 DocType: Job Applicant,Job Applicant,Tööotsija
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,See põhineb tehingute vastu tarnija. Vaata ajakava allpool lähemalt
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Enam ei tulemusi.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Juriidiline
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Tegelik tüüpimaks ei kanta Punkt määr rida {0}
 DocType: Bank Guarantee,Customer,Klienditeenindus
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),"Vahetuskurss peab olema sama, {0} {1} ({2})"
 DocType: Sales Invoice,Customer Name,Kliendi nimi
 DocType: Vehicle,Natural Gas,Maagaas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Pangakonto ei saa nimeks {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Pangakonto ei saa nimeks {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (või rühmad), mille vastu raamatupidamiskanded tehakse ja tasakaalu säilimine."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Maksmata {0} ei saa olla väiksem kui null ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Töötlemiseks ei ole esitatud palgajälgi.
 DocType: Manufacturing Settings,Default 10 mins,Vaikimisi 10 minutit
 DocType: Leave Type,Leave Type Name,Jäta Tüüp Nimi
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Näita avatud
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Tähtis on võtta see meede juba eespool nimetatud korduvaks
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Seeria edukalt uuendatud
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Minu tellimused
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural Journal fotole
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,"Ostutellimuse Esemed, mis saadakse"
 DocType: SMS Center,All Supplier Contact,Kõik Tarnija Kontakt
 DocType: Support Settings,Support Settings,Toetus seaded
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Oodatud End Date saa olla oodatust väiksem Start Date
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Oodatud End Date saa olla oodatust väiksem Start Date
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Row # {0}: Rate peab olema sama, {1} {2} ({3} / {4})"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,New Jäta ostusoov
 ,Batch Item Expiry Status,Partii Punkt lõppemine staatus
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Pangaveksel
 DocType: Mode of Payment Account,Mode of Payment Account,Makseviis konto
 DocType: Consultation,Consultation,Konsulteerimine
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Müük ja tootlus
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Näita variandid
 DocType: Academic Term,Academic Term,Academic Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,materjal
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Tervishoid
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Makseviivitus (päevad)
 DocType: Lab Prescription,Lab Prescription,Lab Prescription
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Sorteeri hinnaga
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Teenuse kulu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Seerianumber: {0} on juba viidatud müügiarve: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Arve
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Seerianumber: {0} on juba viidatud müügiarve: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Arve
 DocType: Maintenance Schedule Item,Periodicity,Perioodilisus
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiscal Year {0} on vajalik
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defense
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Kokku kuluarvestus summa
 DocType: Delivery Note,Vehicle No,Sõiduk ei
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Palun valige hinnakiri
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Palun valige hinnakiri
 DocType: Accounts Settings,Currency Exchange Settings,Valuuta vahetus seaded
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Rida # {0}: Maksedokumendi on kohustatud täitma trasaction
 DocType: Production Order Operation,Work In Progress,Töö käib
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Palun valige kuupäev
 DocType: Employee,Holiday List,Holiday nimekiri
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Palun seadke õpetaja nime süsteem koolis&gt; Kooli seaded
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Raamatupidaja
+DocType: Hub Settings,Selling Price List,Müügi hinnakiri
 DocType: Patient,Tobacco Current Use,Tubaka praegune kasutamine
 DocType: Cost Center,Stock User,Stock Kasutaja
 DocType: Company,Phone No,Telefon ei
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Muidugi Graafikud loodud:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},New {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},New {0}: # {1}
 ,Sales Partners Commission,Müük Partnerid Komisjon
 DocType: Purchase Invoice,Rounding Adjustment,Ümardamise korrigeerimine
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Lühend ei saa olla rohkem kui 5 tähemärki
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Viide: {0}, Kood: {1} ja kliendi: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kg
-DocType: Student Log,Log,Logi
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Avamine tööd.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Tulemus esitatakse
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Tulemus esitatakse
 DocType: Item Attribute,Increment,Juurdekasv
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Ajavahemik
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Vali Warehouse ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Abielus
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Ei ole lubatud {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Võta esemed
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Stock ei saa uuendada vastu saateleht {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Stock ei saa uuendada vastu saateleht {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Toote {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nr loetletud
 DocType: Payment Reconciliation,Reconcile,Sobita
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionifondid
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Järgmine kulum kuupäev ei saa olla enne Ostukuupäevale
 DocType: Consultation,Consultation Date,Konsulteerimise kuupäev
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNexti kasutajate toodete loetelu ja avastus
 DocType: SMS Center,All Sales Person,Kõik Sales Person
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Kuu Distribution ** aitab levitada Eelarve / Target üle kuu, kui teil on sesoonsus firma."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Ei leitud esemed
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Palgastruktuur Kadunud
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Ei leitud esemed
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Palgastruktuur Kadunud
 DocType: Lead,Person Name,Person Nimi
 DocType: Sales Invoice Item,Sales Invoice Item,Müügiarve toode
 DocType: Account,Credit,Krediit
 DocType: POS Profile,Write Off Cost Center,Kirjutage Off Cost Center
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",nt &quot;algkool&quot; või &quot;Ülikool&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",nt &quot;algkool&quot; või &quot;Ülikool&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Stock aruanded
 DocType: Warehouse,Warehouse Detail,Ladu Detail
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Krediidilimiit on ületanud kliendi {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term lõppkuupäev ei saa olla hilisem kui aasta lõpu kuupäev õppeaasta, mille mõiste on seotud (Academic Year {}). Palun paranda kuupäev ja proovi uuesti."
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Kas Põhivarade&quot; ei saa märkimata, kui Asset Olemas vastu kirje"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Kas Põhivarade&quot; ei saa märkimata, kui Asset Olemas vastu kirje"
 DocType: Vehicle Service,Brake Oil,Piduri õli
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klient&gt; Kliendi Grupp&gt; Territoorium
 DocType: Tax Rule,Tax Type,Maksu- Type
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,maksustatav summa
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Sa ei ole volitatud lisada või uuendada oma andmeid enne {0}
 DocType: BOM,Item Image (if not slideshow),Punkt Image (kui mitte slideshow)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Kliendi olemas sama nimega
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hour Hinda / 60) * Tegelik tööaeg
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Rida # {0}: võrdlusdokumendi tüüp peab olema kulukuse või ajakirja sisestamise üks
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Vali Bom
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Rida # {0}: võrdlusdokumendi tüüp peab olema kulukuse või ajakirja sisestamise üks
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Vali Bom
 DocType: SMS Log,SMS Log,SMS Logi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kulud Tarnitakse Esemed
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Puhkus on {0} ei ole vahel From kuupäev ja To Date
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,töötaja Loan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Activity Log:
 DocType: Fee Schedule,Send Payment Request Email,Saada maksetellingu e-posti aadress
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Punkt {0} ei ole olemas süsteemi või on aegunud
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Punkt {0} ei ole olemas süsteemi või on aegunud
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Kinnisvara
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Kontoteatis
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaatsia
@@ -210,17 +213,22 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Import Logi
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Tõmba Materjal taotlus tüüpi tootmine põhineb eespool nimetatud kriteeriumidele
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Edukalt registreerimata.
 DocType: Training Result Employee,Grade,hinne
+DocType: Restaurant Table,No of Seats,Istekohtade arv
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Dünaamilise teema lisamiseks kasutage jinja silte, näiteks <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Toimetab tarnija
 DocType: SMS Center,All Contact,Kõik Contact
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Tootmise Telli juba loodud kõik esemed Bom
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Tootmise Telli juba loodud kõik esemed Bom
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Aastapalka
 DocType: Daily Work Summary,Daily Work Summary,Igapäevase töö kokkuvõte
 DocType: Period Closing Voucher,Closing Fiscal Year,Sulgemine Fiscal Year
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} on külmutatud
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Palun valige olemasoleva äriühingu loomise kontoplaani
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} on külmutatud
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Palun valige olemasoleva äriühingu loomise kontoplaani
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Stock kulud
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Vali Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Vali Target Warehouse
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Palun sisesta Eelistatud Kontakt E-post
 DocType: Program Enrollment,School Bus,Koolibuss
 DocType: Journal Entry,Contra Entry,Contra Entry
@@ -237,9 +245,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Lae mall, täitke asjakohaste andmete ja kinnitage muudetud faili. Kõik kuupäevad ning töötaja kombinatsioon valitud perioodil tulevad malli, olemasolevate töölkäimise"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Punkt {0} ei ole aktiivne või elu lõpuni jõutud
+DocType: Student Admission Program,Minimum Age,Minimaalne vanus
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Näide: Basic Mathematics
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Et sisaldada makse järjest {0} Punkti kiirus, maksud ridadesse {1} peab olema ka"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Seaded HR Module
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Seaded HR Module
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Muuda summa
 DocType: BOM Update Tool,New BOM,New Bom
@@ -249,7 +258,7 @@
 DocType: Lead,Request Type,Hankelepingu liik
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Tee Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Rahvusringhääling
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Lisage tubasid
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),POS-i seadistamise režiim (veebi- / võrguühenduseta)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Hukkamine
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Andmed teostatud.
 DocType: Serial No,Maintenance Status,Hooldus staatus
@@ -272,6 +281,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Hinnakiri peab olema rakendatav ostmine või müümine
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Paigaldamise kuupäev ei saa olla enne tarnekuupäev Punkt {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Soodustused Hinnakiri Rate (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Biokeemia
 DocType: Offer Letter,Select Terms and Conditions,Vali Tingimused
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,välja väärtus
 DocType: Production Planning Tool,Sales Orders,Müügitellimuste
@@ -306,15 +316,15 @@
 DocType: Sales Partner,Reseller,Reseller
 DocType: Codification Table,Medical Code,Meditsiinikood
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Kui see on lubatud, sisaldab mitte-laos toodet materjali taotlused."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Palun sisestage Company
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Palun sisestage Company
 DocType: Delivery Note Item,Against Sales Invoice Item,Vastu müügiarve toode
 ,Production Orders in Progress,Tootmine Tellimused in Progress
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Rahavood finantseerimistegevusest
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage on täis, ei päästa"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage on täis, ei päästa"
 DocType: Lead,Address & Contact,Aadress ja Kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Lisa kasutamata lehed eelmisest eraldised
 DocType: Sales Partner,Partner website,Partner kodulehel
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Lisa toode
+DocType: Restaurant Order Entry,Add Item,Lisa toode
 DocType: Lab Test,Custom Result,Kohandatud tulemus
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,kontaktisiku nimi
 DocType: Course Assessment Criteria,Course Assessment Criteria,Muidugi Hindamiskriteeriumid
@@ -327,7 +337,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Küsi osta.
 DocType: Lab Test,Submitted Date,Esitatud kuupäev
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,See põhineb Ajatabelid loodud vastu selle projekti
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Netopalk ei tohi olla väiksem kui 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Netopalk ei tohi olla väiksem kui 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Kui soovite lõpetada korduva veateate märguannete saatmise süsteemist, oleme tellimuse väljal Puudutatud"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Ainult valitud Jäta Approver võib esitada selle Jäta ostusoov
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Leevendab kuupäev peab olema suurem kui Liitumis
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Lehed aastas
@@ -336,9 +347,10 @@
 DocType: Email Digest,Profit & Loss,Kasumiaruanne
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Liiter
 DocType: Task,Total Costing Amount (via Time Sheet),Kokku kuluarvestus summa (via Time Sheet)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Palun seadke õpilased üliõpilastele
 DocType: Item Website Specification,Item Website Specification,Punkt Koduleht spetsifikatsioon
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Jäta blokeeritud
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Punkt {0} on jõudnud oma elu lõppu kohta {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Punkt {0} on jõudnud oma elu lõppu kohta {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Bank Sissekanded
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Aastane
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock leppimise toode
@@ -347,7 +359,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Loomistööriist kursus
 DocType: Lead,Do Not Contact,Ära võta ühendust
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,"Inimesed, kes õpetavad oma organisatsiooni"
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Unikaalne id jälgimise kõik korduvad arved. See on genereeritud esitada.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Tarkvara arendaja
 DocType: Item,Minimum Order Qty,Tellimuse Miinimum Kogus
 DocType: Pricing Rule,Supplier Type,Tarnija Type
@@ -357,17 +368,19 @@
 DocType: Item,Publish in Hub,Avaldab Hub
 DocType: Student Admission,Student Admission,üliõpilane
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Punkt {0} on tühistatud
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Materjal taotlus
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Punkt {0} on tühistatud
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Materjal taotlus
 DocType: Bank Reconciliation,Update Clearance Date,Värskenda Kliirens kuupäev
 DocType: Item,Purchase Details,Ostu üksikasjad
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Punkt {0} ei leitud &quot;tarnitud tooraine&quot; tabelis Ostutellimuse {1}
 DocType: Patient Relation,Relation,Seos
 DocType: Shipping Rule,Worldwide Shipping,Worldwide Shipping
 DocType: Patient Relation,Mother,ema
+DocType: Restaurant Reservation,Reservation End Time,Reserveerimise lõpuaeg
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Kinnitatud klientidelt tellimusi.
 DocType: Purchase Receipt Item,Rejected Quantity,Tagasilükatud Kogus
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Makse taotlus {0} loodud
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Makse taotlus {0} loodud
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Madal tundlikkus
 DocType: Notification Control,Notification Control,Märguannete juhtimiskeskuse
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,"Kinnitage, kui olete oma koolituse lõpetanud"
 DocType: Lead,Suggestions,Ettepanekud
@@ -387,7 +400,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,"Kirjad palgatõend, et töötaja põhineb eelistatud e valitud Employee"
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Esimene Jäta Approver nimekirjas on vaikimisi Jäta Approver
 DocType: Tax Rule,Shipping County,kohaletoimetamine County
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Õpi
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Õpi
 DocType: Asset,Next Depreciation Date,Järgmine kulum kuupäev
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktiivsus töötaja kohta
 DocType: Accounts Settings,Settings for Accounts,Seaded konto
@@ -398,13 +411,13 @@
 DocType: Item,Synced With Hub,Sünkroniseerida Hub
 DocType: Vehicle,Fleet Manager,Fleet Manager
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} ei saa olla negatiivne artiklijärgse {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Vale parool
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Vale parool
 DocType: Item,Variant Of,Variant Of
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Valminud Kogus ei saa olla suurem kui &quot;Kogus et Tootmine&quot;
 DocType: Period Closing Voucher,Closing Account Head,Konto sulgemise Head
 DocType: Employee,External Work History,Väline tööandjad
 DocType: Physician,Time per Appointment,Kohtumise kellaaeg
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Ringviide viga
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Ringviide viga
 DocType: Appointment Type,Is Inpatient,On statsionaarne
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 Nimi
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Sõnades (Export) ilmuvad nähtavale kui salvestate saateleht.
@@ -413,19 +426,18 @@
 DocType: Lead,Industry,Tööstus
 DocType: Employee,Job Profile,Ametijuhendite
 DocType: BOM Item,Rate & Amount,Hinda ja summa
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Palun seadistage külastuse numbrite seeria seaded&gt; nummering seeria abil
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,See põhineb tehingutel selle äriühingu vastu. Üksikasjalikuma teabe saamiseks lugege allpool toodud ajakava
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,"Soovin e-postiga loomiseks, automaatne Material taotlus"
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Vastupidav
 DocType: Journal Entry,Multi Currency,Multi Valuuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Arve Type
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klient&gt; Kliendi Grupp&gt; Territoorium
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Toimetaja märkus
 DocType: Consultation,Encounter Impression,Encounter impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Seadistamine maksud
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Müüdava vara
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,"Makse Entry on muudetud pärast seda, kui tõmbasin. Palun tõmmake uuesti."
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} sisestatud kaks korda Punkt Maksu-
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Kokkuvõte sel nädalal ja kuni tegevusi
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} sisestatud kaks korda Punkt Maksu-
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Kokkuvõte sel nädalal ja kuni tegevusi
 DocType: Student Applicant,Admitted,Tunnistas
 DocType: Workstation,Rent Cost,Üürile Cost
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Summa pärast amortisatsiooni
@@ -439,36 +451,35 @@
 DocType: Shipping Rule,Valid for Countries,Kehtib Riigid
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"See toode on Mall ja seda ei saa kasutada tehingutes. Punkt atribuute kopeerida üle võetud variante, kui &quot;No Copy&quot; on seatud"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Kokku Tellimus Peetakse
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",Töötaja nimetus (nt tegevjuht direktor jne).
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).",Töötaja nimetus (nt tegevjuht direktor jne).
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Hinda kus Klient Valuuta teisendatakse kliendi baasvaluuta
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kursuse planeerimine Tool
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rida # {0}: ostuarve ei saa vastu olemasoleva vara {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Kiireloomuline] Viga% s% s% s jaoks
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Kiireloomuline] Viga% s% s% s jaoks
 DocType: Item Tax,Tax Rate,Maksumäär
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} on juba eraldatud Töötaja {1} ajaks {2} et {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Vali toode
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Vali toode
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Ostuarve {0} on juba esitatud
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Partii nr peaks olema sama mis {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Teisenda mitte-Group
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Partii (palju) objekti.
 DocType: C-Form Invoice Detail,Invoice Date,Arve kuupäev
 DocType: GL Entry,Debit Amount,Deebetsummat
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Seal saab olla ainult 1 konto kohta Company {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Palun vt lisa
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Seal saab olla ainult 1 konto kohta Company {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Palun vt lisa
 DocType: Purchase Order,% Received,% Vastatud
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Loo Üliõpilasgrupid
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Setup juba valmis !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Setup juba valmis !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Kreeditarve summa
 DocType: Setup Progress Action,Action Document,Tegevusdokument
 ,Finished Goods,Valmistoodang
 DocType: Delivery Note,Instructions,Juhised
 DocType: Quality Inspection,Inspected By,Kontrollima
 DocType: Maintenance Visit,Maintenance Type,Hooldus Type
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} ei kaasati Course {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Tootekood&gt; Elemendi grupp&gt; Bränd
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} ei kaasati Course {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial No {0} ei kuulu saatelehele {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Lisa tooteid
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Lisa tooteid
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Punkt kvaliteedi kontroll Parameeter
 DocType: Leave Application,Leave Approver Name,Jäta Approver nimi
 DocType: Depreciation Schedule,Schedule Date,Ajakava kuupäev
@@ -488,7 +499,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Töötunnid
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Muuda algus / praegune järjenumber olemasoleva seeria.
 DocType: Dosage Strength,Strength,Tugevus
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Loo uus klient
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Loo uus klient
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Kui mitu Hinnakujundusreeglid jätkuvalt ülekaalus, kasutajate palutakse määrata prioriteedi käsitsi lahendada konflikte."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Loo Ostutellimuste
 ,Purchase Register,Ostu Registreeri
@@ -507,7 +518,7 @@
 DocType: Lab Test Template,Single,Single
 DocType: Salary Slip,Total Loan Repayment,Kokku Laenu tagasimaksmine
 DocType: Account,Cost of Goods Sold,Müüdud kaupade maksumus
-DocType: Purchase Invoice,Yearly,Iga-aastane
+DocType: Subscription,Yearly,Iga-aastane
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Palun sisestage Cost Center
 DocType: Drug Prescription,Dosage,Annus
 DocType: Journal Entry Account,Sales Order,Müügitellimuse
@@ -537,7 +548,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Global seaded kõik tootmisprotsessid.
 DocType: Accounts Settings,Accounts Frozen Upto,Kontod Külmutatud Upto
 DocType: SMS Log,Sent On,Saadetud
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Oskus {0} valitakse mitu korda atribuudid Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Oskus {0} valitakse mitu korda atribuudid Table
 DocType: HR Settings,Employee record is created using selected field. ,"Töötaja rekord on loodud, kasutades valitud valdkonnas."
 DocType: Sales Order,Not Applicable,Ei kasuta
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday kapten.
@@ -562,13 +573,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Kokku lehed eraldatud on kohustuslik
 DocType: Patient,AB Positive,AB positiivne
 DocType: Job Opening,Description of a Job Opening,Kirjeldus töökoht
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Kuni tegevusi täna
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Kuni tegevusi täna
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Osavõtjate rekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Palk Component töögraafik põhineb palgal.
 DocType: Sales Order Item,Used for Production Plan,Kasutatakse tootmise kava
 DocType: Employee Loan,Total Payment,Kokku tasumine
 DocType: Manufacturing Settings,Time Between Operations (in mins),Aeg toimingute vahel (in minutit)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} katkeb nii toimingut ei saa lõpule
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} katkeb nii toimingut ei saa lõpule
 DocType: Customer,Buyer of Goods and Services.,Ostja kaupade ja teenuste.
 DocType: Journal Entry,Accounts Payable,Tasumata arved
 DocType: Patient,Allergies,Allergia
@@ -580,22 +591,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Hoiata ostutellimusi
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Nimekiri paar oma klientidele. Nad võivad olla organisatsioonid ja üksikisikud.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Aitab Parts ehitada
+DocType: POS Profile User,POS Profile User,POS profiili kasutaja
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Otsene tulu
 DocType: Patient Appointment,Date TIme,Kuupäev Kellaaeg
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Ei filtreerimiseks konto, kui rühmitatud konto"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Haldusspetsialist
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Palun valige Course
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Palun valige Course
 DocType: Codification Table,Codification Table,Kooditabel
 DocType: Timesheet Detail,Hrs,tundi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Palun valige Company
 DocType: Stock Entry Detail,Difference Account,Erinevus konto
 DocType: Purchase Invoice,Supplier GSTIN,Pakkuja GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Ei saa sulgeda ülesanne oma sõltuvad ülesande {0} ei ole suletud.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,"Palun sisestage Warehouse, mille materjal taotlus tõstetakse"
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Ei saa sulgeda ülesanne oma sõltuvad ülesande {0} ei ole suletud.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Palun sisestage Warehouse, mille materjal taotlus tõstetakse"
 DocType: Production Order,Additional Operating Cost,Täiendav töökulud
 DocType: Lab Test Template,Lab Routine,Lab Routine
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmeetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Ühendamine, järgmised omadused peavad olema ühesugused teemad"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Ühendamine, järgmised omadused peavad olema ühesugused teemad"
 DocType: Shipping Rule,Net Weight,Netokaal
 DocType: Employee,Emergency Phone,Emergency Phone
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,ostma
@@ -605,7 +617,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Palun määratleda hinne Threshold 0%
 DocType: Sales Order,To Deliver,Andma
 DocType: Purchase Invoice Item,Item,Kirje
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Seerianumber objekt ei saa olla osa
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Kõrge tundlikkus
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Seerianumber objekt ei saa olla osa
 DocType: Journal Entry,Difference (Dr - Cr),Erinevus (Dr - Cr)
 DocType: Account,Profit and Loss,Kasum ja kahjum
 DocType: Patient,Risk Factors,Riskifaktorid
@@ -614,7 +627,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Tegevjuht Alltöövõtt
 DocType: Vital Signs,Body Temperature,Keha temperatuur
 DocType: Project,Project will be accessible on the website to these users,Projekt on kättesaadav veebilehel nendele kasutajatele
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Määrake projekti tüüp.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Määrake projekti tüüp.
 DocType: Supplier Scorecard,Weighting Function,Kaalufunktsioon
 DocType: Physician,OP Consulting Charge,OP konsultatsioonitasu
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Seadista oma
@@ -628,7 +641,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Kasvamine ei saa olla 0
 DocType: Production Planning Tool,Material Requirement,Materjal nõue
 DocType: Company,Delete Company Transactions,Kustuta tehingutes
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Viitenumber ja viited kuupäev on kohustuslik Bank tehingu
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Viitenumber ja viited kuupäev on kohustuslik Bank tehingu
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Klienditeenindus Lisa / uuenda maksud ja tasud
 DocType: Payment Entry Reference,Supplier Invoice No,Tarnija Arve nr
 DocType: Territory,For reference,Sest viide
@@ -636,12 +649,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Ei saa kustutada Serial No {0}, sest seda kasutatakse laos tehingute"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Sulgemine (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Tere
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Liiguta punkti
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Liiguta punkti
 DocType: Serial No,Warranty Period (Days),Garantii (päevades)
 DocType: Installation Note Item,Installation Note Item,Paigaldamine Märkus Punkt
 DocType: Production Plan Item,Pending Qty,Kuni Kogus
 DocType: Budget,Ignore,Ignoreerima
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} ei ole aktiivne
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} ei ole aktiivne
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Setup check mõõtmed trükkimiseks
 DocType: Salary Slip,Salary Slip Timesheet,Palgatõend Töögraafik
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Tarnija Warehouse kohustuslik allhanked ostutšekk
@@ -650,7 +663,7 @@
 DocType: Pricing Rule,Sales Partner,Müük Partner
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Kõik tarnija skoorikaardid.
 DocType: Buying Settings,Purchase Receipt Required,Ostutšekk Vajalikud
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Hindamine Rate on kohustuslik, kui algvaru sisestatud"
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,"Hindamine Rate on kohustuslik, kui algvaru sisestatud"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Salvestusi ei leitud Arvel tabelis
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Palun valige Company Pidu ja Type esimene
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Financial / eelarveaastal.
@@ -687,7 +700,7 @@
 DocType: Quotation,Quotation To,Tsitaat
 DocType: Lead,Middle Income,Keskmise sissetulekuga
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Avamine (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Vaikimisi mõõtühik Punkt {0} ei saa muuta otse, sest teil on juba mõned tehingu (te) teise UOM. Te peate looma uue Punkt kasutada erinevaid vaikimisi UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Vaikimisi mõõtühik Punkt {0} ei saa muuta otse, sest teil on juba mõned tehingu (te) teise UOM. Te peate looma uue Punkt kasutada erinevaid vaikimisi UOM."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Eraldatud summa ei saa olla negatiivne
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Määrake Company
 DocType: Purchase Order Item,Billed Amt,Arve Amt
@@ -701,6 +714,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Vali Maksekonto teha Bank Entry
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Loo töötaja kirjete haldamiseks lehed, kulu nõuete ja palgaarvestuse"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Retseptiperiood
+DocType: Restaurant Reservation,Restaurant Reservation,Restorani broneering
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Ettepanek kirjutamine
 DocType: Payment Entry Deduction,Payment Entry Deduction,Makse Entry mahaarvamine
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Teine Sales Person {0} on olemas sama Töötaja id
@@ -708,7 +722,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Masters
 DocType: Assessment Plan,Maximum Assessment Score,Maksimaalne hindamine Score
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Uuenda pangaarveldustel kuupäevad
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Time Tracking
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Time Tracking
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,Duplikaadi TRANSPORTER
 DocType: Fiscal Year Company,Fiscal Year Company,Fiscal Year Company
 DocType: Packing Slip Item,DN Detail,DN Detail
@@ -716,8 +730,9 @@
 DocType: Timesheet,Billed,Maksustatakse
 DocType: Batch,Batch Description,Partii kirjeldus
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Loomine õpperühm
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Payment Gateway konto ei ole loodud, siis looge see käsitsi."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Payment Gateway konto ei ole loodud, siis looge see käsitsi."
 DocType: Supplier Scorecard,Per Year,Aastas
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Selles programmis osalemise lubamine vastavalt DOB-ile puudub
 DocType: Sales Invoice,Sales Taxes and Charges,Müük maksud ja tasud
 DocType: Employee,Organization Profile,Organisatsiooni andmed
 DocType: Vital Signs,Height (In Meter),Kõrgus (mõõdikus)
@@ -753,7 +768,7 @@
 DocType: Student Batch Name,Batch Name,partii Nimi
 DocType: Fee Validity,Max number of visit,Maksimaalne külastuse arv
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Töögraafik on loodud:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Palun määra vaikimisi Raha või pangakonto makseviis {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Palun määra vaikimisi Raha või pangakonto makseviis {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,registreerima
 DocType: GST Settings,GST Settings,GST Seaded
 DocType: Selling Settings,Customer Naming By,Kliendi nimetamine By
@@ -785,15 +800,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Maandus Cost maksud ja tasud
 DocType: Production Order Operation,Actual Start Time,Tegelik Start Time
 DocType: BOM Operation,Operation Time,Operation aeg
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,lõpp
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,lõpp
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,alus
 DocType: Timesheet,Total Billed Hours,Kokku Maksustatakse Tundi
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Kirjutage Off summa
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Kirjutage Off summa
 DocType: Leave Block List Allow,Allow User,Laske Kasutaja
 DocType: Journal Entry,Bill No,Bill pole
 DocType: Company,Gain/Loss Account on Asset Disposal,Gain / kulude aruandes varade realiseerimine
 DocType: Vehicle Log,Service Details,Service detailid
-DocType: Purchase Invoice,Quarterly,Kord kvartalis
+DocType: Subscription,Quarterly,Kord kvartalis
 DocType: Lab Test Template,Grouped,Rühmitatud
 DocType: Selling Settings,Delivery Note Required,Toimetaja märkus Vajalikud
 DocType: Bank Guarantee,Bank Guarantee Number,Bank garantii arv
@@ -802,12 +817,12 @@
 DocType: Student Attendance,Student Attendance,Student osavõtt
 DocType: Sales Invoice Timesheet,Time Sheet,ajaandmik
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush tooraine põhineb
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Palun sisestage kirje üksikasjad
 DocType: Interest,Interest,huvi
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Müügieelne
 DocType: Purchase Receipt,Other Details,Muud andmed
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Lab Test,Test Template,Testi mall
+DocType: Restaurant Order Entry Item,Served,Serveeritud
 DocType: Account,Accounts,Kontod
 DocType: Vehicle,Odometer Value (Last),Odomeetri näit (Viimane)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Pakkujate tulemuskaardi kriteeriumide mallid.
@@ -819,25 +834,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Eelvaade palgatõend
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Konto {0} on sisestatud mitu korda
 DocType: Account,Expenses Included In Valuation,Kulud sisalduvad Hindamine
-DocType: Hub Settings,Seller City,Müüja City
 ,Absent Student Report,Puudub Student Report
 DocType: Email Digest,Next email will be sent on:,Järgmine email saadetakse edasi:
 DocType: Offer Letter Term,Offer Letter Term,Paku kiri Term
 DocType: Supplier Scorecard,Per Week,Nädalas
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Punkt on variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Punkt on variante.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Kokku üliõpilane
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Punkt {0} ei leitud
 DocType: Bin,Stock Value,Stock Value
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,Tasulised kirjed luuakse taustal. Vea korral uuendatakse tõrketeadet ajakavas.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Ettevõte {0} ei ole olemas
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} tasu kehtib kuni {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} tasu kehtib kuni {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Tree Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Kogus Tarbitud Per Unit
 DocType: Serial No,Warranty Expiry Date,Garantii Aegumisaja
 DocType: Material Request Item,Quantity and Warehouse,Kogus ja Warehouse
+DocType: Hub Settings,Unregister,Loobu registreerimisest
 DocType: Sales Invoice,Commission Rate (%),Komisjoni Rate (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Palun valige Program
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Palun valige Program
 DocType: Project,Estimated Cost,Hinnanguline maksumus
 DocType: Purchase Order,Link to material requests,Link materjali taotlusi
+DocType: Hub Settings,Publish,Avalda
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
 DocType: Journal Entry,Credit Card Entry,Krediitkaart Entry
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Ettevõte ja kontod
@@ -848,13 +865,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Sule Opportunity Pärast päevi
 ,Reserved,Reserveeritud
 DocType: Purchase Order,Supply Raw Materials,Supply tooraine
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Kuupäev, mil järgmise arve genereeritakse. See on genereeritud esitada."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Käibevara
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} ei ole laos toode
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',"Jagage oma koolituse kohta tagasisidet, klõpsates &quot;Treening Tagasiside&quot; ja seejärel &quot;Uus&quot;"
 DocType: Mode of Payment Account,Default Account,Vaikimisi konto
 DocType: Payment Entry,Received Amount (Company Currency),Saadud summa (firma Valuuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,"Plii tuleb määrata, kui võimalus on valmistatud Lead"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,"Plii tuleb määrata, kui võimalus on valmistatud Lead"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Palun valige iganädalane off päev
 DocType: Patient,O Negative,O Negatiivne
 DocType: Production Order Operation,Planned End Time,Planeeritud End Time
@@ -870,10 +886,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Opportunity From
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Kuupalga avalduse.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Lisa ettevõte
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rida {0}: {1} punkti {2} jaoks nõutavad seerianumbrid. Te olete esitanud {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rida {0}: {1} punkti {2} jaoks nõutavad seerianumbrid. Te olete esitanud {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Valige tabel
 DocType: BOM,Website Specifications,Koduleht erisused
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} on kehtetu e-posti aadress &quot;Saajad&quot;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} on kehtetu e-posti aadress &quot;Saajad&quot;
 DocType: Special Test Items,Particulars,Üksikasjad
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiootikum.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: From {0} tüüpi {1}
@@ -881,11 +897,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Row {0}: Conversion Factor on kohustuslik
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Mitu Hind reeglid olemas samad kriteeriumid, palun lahendada konflikte, määrates prioriteet. Hind Reeglid: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Ei saa deaktiveerida või tühistada Bom, sest see on seotud teiste BOMs"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Ei saa deaktiveerida või tühistada Bom, sest see on seotud teiste BOMs"
 DocType: Opportunity,Maintenance,Hooldus
 DocType: Item Attribute Value,Item Attribute Value,Punkt omadus Value
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Müügikampaaniad.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Tee Töögraafik
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Tee Töögraafik
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -923,12 +939,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Palun sisestage Punkt esimene
 DocType: Account,Liability,Vastutus
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktsioneeritud summa ei või olla suurem kui nõude summast reas {0}.
+DocType: Salary Detail,Do not include in total,Ärge lisage kokku
 DocType: Company,Default Cost of Goods Sold Account,Vaikimisi müüdud toodangu kulu konto
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Hinnakiri ole valitud
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Hinnakiri ole valitud
 DocType: Employee,Family Background,Perekondlik taust
 DocType: Request for Quotation Supplier,Send Email,Saada E-
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Hoiatus: Vigane Attachment {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Ei Luba
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Hoiatus: Vigane Attachment {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Ei Luba
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Tsiteerimine soovitud
 DocType: Vital Signs,Heart Rate / Pulse,Südame löögisageduse / impulsi
 DocType: Company,Default Bank Account,Vaikimisi Bank Account
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Filtreerida põhineb Party, Party Tüüp esimene"
@@ -955,12 +973,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Punkt Row {idx}: {doctype} {DOCNAME} ei eksisteeri eespool {doctype} &quot;tabelis
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Töögraafik {0} on juba lõpetatud või tühistatud
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ei ülesanded
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Päeval kuule auto arve genereeritakse nt 05, 28 jne"
 DocType: Item Variant Settings,Copy Fields to Variant,Kopeerige väliid variandile
 DocType: Asset,Opening Accumulated Depreciation,Avamine akumuleeritud kulum
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score peab olema väiksem või võrdne 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Programm Registreerimine Tool
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C-Form arvestust
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C-Form arvestust
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Kliendi ja tarnija
 DocType: Email Digest,Email Digest Settings,Email Digest Seaded
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,"Täname, et oma äri!"
@@ -978,13 +995,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Tsiteerin staatus
 DocType: Maintenance Visit,Completion Status,Lõpetamine staatus
 DocType: HR Settings,Enter retirement age in years,Sisesta pensioniiga aastat
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Warehouse
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Palun valige laost
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Target Warehouse
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Palun valige laost
 DocType: Cheque Print Template,Starting location from left edge,Alustades asukoha vasakust servast
 DocType: Item,Allow over delivery or receipt upto this percent,Laske üle väljasaatmisel või vastuvõtmisel upto see protsenti
 DocType: Stock Entry,STE-,STE
 DocType: Upload Attendance,Import Attendance,Import Osavõtt
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Kõik Punkt Groups
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Kõik Punkt Groups
 DocType: Process Payroll,Activity Log,Activity Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Neto kasum / kahjum
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automaatselt kirjutada sõnumi esitamise tehingud.
@@ -996,7 +1013,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Kavandatav Kogus
 DocType: Sales Invoice,Payment Due Date,Maksetähtpäevast
 DocType: Drug Prescription,Interval UOM,Intervall UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Punkt Variant {0} on juba olemas sama atribuute
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Punkt Variant {0} on juba olemas sama atribuute
+DocType: Item,Hub Publishing Details,Hubi avaldamise üksikasjad
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&quot;Avamine&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Avatud teha
 DocType: Notification Control,Delivery Note Message,Toimetaja märkus Message
@@ -1016,10 +1034,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: tooraine ei saa olla sama kui põhipunkt
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Kokku kohaldatavate tasude kohta ostutšekk Esemed tabel peab olema sama Kokku maksud ja tasud
 DocType: Sales Team,Incentives,Soodustused
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Registreeruge keskuse jaoks
 DocType: SMS Log,Requested Numbers,Taotletud numbrid
 DocType: Production Planning Tool,Only Obtain Raw Materials,Saada ainult tooraine
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Tulemuslikkuse hindamise.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Lubamine &quot;kasutamine Ostukorv&quot;, kui Ostukorv on lubatud ja seal peaks olema vähemalt üks maksueeskiri ostukorv"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Lubamine &quot;kasutamine Ostukorv&quot;, kui Ostukorv on lubatud ja seal peaks olema vähemalt üks maksueeskiri ostukorv"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Makse Entry {0} on seotud vastu Tellimus {1}, kontrollida, kas see tuleb tõmmata nagu eelnevalt antud arve."
 DocType: Sales Invoice Item,Stock Details,Stock Üksikasjad
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekti väärtus
@@ -1038,12 +1057,14 @@
 DocType: Salary Slip,Working Days,Tööpäeva jooksul
 DocType: Serial No,Incoming Rate,Saabuva Rate
 DocType: Packing Slip,Gross Weight,Brutokaal
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,"Nimi oma firma jaoks, millele te Selle süsteemi rajamisel."
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Hubi lubamine
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,"Nimi oma firma jaoks, millele te Selle süsteemi rajamisel."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Kaasa pühad Kokku ole. tööpäevade
 DocType: Job Applicant,Hold,Hoia
 DocType: Employee,Date of Joining,Liitumis
 DocType: Naming Series,Update Series,Värskenda Series
 DocType: Supplier Quotation,Is Subcontracted,Alltöödena
+DocType: Restaurant Table,Minimum Seating,Minimaalne istekoht
 DocType: Item Attribute,Item Attribute Values,Punkt atribuudi väärtusi
 DocType: Examination Result,Examination Result,uurimistulemus
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Ostutšekk
@@ -1054,13 +1075,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Ei leia Time Slot järgmisel {0} päeva Operation {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materjali sõlmed
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Müük Partnerid ja territoorium
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,Bom {0} peab olema aktiivne
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,Bom {0} peab olema aktiivne
 DocType: Journal Entry,Depreciation Entry,Põhivara Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Palun valige dokumendi tüüp esimene
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Tühista Material Külastusi {0} enne tühistades selle Hooldus Külasta
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial No {0} ei kuulu Punkt {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Nõutav Kogus
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Laod olemasolevate tehing ei ole ümber pearaamatu.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Laod olemasolevate tehing ei ole ümber pearaamatu.
 DocType: Bank Reconciliation,Total Amount,Kogu summa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet kirjastamine
 DocType: Prescription Duration,Number,Number
@@ -1071,7 +1092,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Müük Hinnakiri
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Kui see on märgitud, luuakse klient, kaardistatud patsiendile. Selle kliendi vastu luuakse patsiendiraamatud. Saate ka patsiendi loomiseks valida olemasoleva kliendi."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Avalda sünkroonida esemed
 DocType: Bank Reconciliation,Account Currency,Konto Valuuta
 DocType: Lab Test,Sample ID,Proovi ID
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Palume mainida ümardada konto Company
@@ -1080,11 +1100,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Töötaja {0} ei ole aktiivne või ei ole olemas
 DocType: Fee Structure,Components,komponendid
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Palun sisesta Põhivarakategoori punktis {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Punkt variandid {0} uuendatud
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Punkt variandid {0} uuendatud
 DocType: Quality Inspection Reading,Reading 6,Lugemine 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Ei saa {0} {1} {2} ilma negatiivse tasumata arve
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","genereeritakse. Kui see on hilinenud, peate käsitsi muutma selle välja väljal &quot;Korda kuupäeval&quot;"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Ei saa {0} {1} {2} ilma negatiivse tasumata arve
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Ostuarve Advance
-DocType: Hub Settings,Sync Now,Sync Now
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit kirjet ei saa siduda koos {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Määrake eelarve eelarveaastaks.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Vaikimisi Bank / Cash konto automaatselt ajakohastada POS Arve, kui see režiim on valitud."
@@ -1096,13 +1117,13 @@
 DocType: Item,Is Purchase Item,Kas Ostu toode
 DocType: Asset,Purchase Invoice,Ostuarve
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail Ei
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Uus müügiarve
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Uus müügiarve
 DocType: Stock Entry,Total Outgoing Value,Kokku Väljuv Value
 DocType: Physician,Appointments,Ametisse nimetamine
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Avamine ja lõpu kuupäev peaks jääma sama Fiscal Year
 DocType: Lead,Request for Information,Teabenõue
 ,LeaderBoard,LEADERBOARD
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Sync Offline arved
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Sync Offline arved
 DocType: Payment Request,Paid,Makstud
 DocType: Program Fee,Program Fee,program Fee
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1121,11 +1142,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Ostu Telli toode
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Kaudne tulu
 DocType: Student Attendance Tool,Student Attendance Tool,Student osavõtt Tool
+DocType: Restaurant Menu,Price List (Auto created),Hinnakiri (loodud automaatselt)
 DocType: Cheque Print Template,Date Settings,kuupäeva seaded
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Dispersioon
 ,Company Name,firma nimi
 DocType: SMS Center,Total Message(s),Kokku Sõnum (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Vali toode for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Vali toode for Transfer
 DocType: Purchase Invoice,Additional Discount Percentage,Täiendav allahindlusprotsendi
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Vaata nimekirja kõigi abiga videod
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Select konto juht pank, kus check anti hoiule."
@@ -1142,6 +1164,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,meeter
 DocType: Workstation,Electricity Cost,Elektri hind
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ärge saatke Töötaja Sünnipäev meeldetuletused
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Salvesta sätted
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Taotletud tooted
 DocType: Item,Inspection Criteria,Inspekteerimiskriteeriumitele
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Siirdus
 DocType: BOM Website Item,BOM Website Item,Bom Koduleht toode
@@ -1158,11 +1182,11 @@
 DocType: Journal Entry,Total Amount in Words,Kokku summa sõnadega
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Seal oli viga. Üks tõenäoline põhjus võib olla, et sa ei ole salvestatud kujul. Palun võtke ühendust support@erpnext.com kui probleem ei lahene."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Minu ostukorv
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Tellimus tüüp peab olema üks {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Tellimus tüüp peab olema üks {0}
 DocType: Lead,Next Contact Date,Järgmine Kontakt kuupäev
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Avamine Kogus
 DocType: Healthcare Settings,Appointment Reminder,Kohtumise meeldetuletus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Palun sisesta konto muutuste summa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Palun sisesta konto muutuste summa
 DocType: Student Batch Name,Student Batch Name,Student Partii Nimi
 DocType: Consultation,Doctor,Arst
 DocType: Holiday List,Holiday List Name,Holiday nimekiri nimi
@@ -1170,12 +1194,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Ajakava kursus
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Stock Options
 DocType: Journal Entry Account,Expense Claim,Kuluhüvitussüsteeme
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Kas te tõesti soovite taastada seda lammutatakse vara?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Kogus eest {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Kas te tõesti soovite taastada seda lammutatakse vara?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Kogus eest {0}
 DocType: Leave Application,Leave Application,Jäta ostusoov
 DocType: Patient,Patient Relation,Patsiendi suhe
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Jäta jaotamine Tool
+DocType: Item,Hub Category to Publish,Keskuse kategooria avaldamiseks
 DocType: Leave Block List,Leave Block List Dates,Jäta Block loetelu kuupäevad
+DocType: Sales Invoice,Billing Address GSTIN,Arveldusaadress GSTIN
 DocType: Workstation,Net Hour Rate,Net Hour Rate
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Maandus Cost ostutšekk
 DocType: Company,Default Terms,Vaikimisi Tingimused
@@ -1185,18 +1211,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Palun täpsusta {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Eemaldatud esemed ei muutu kogus või väärtus.
 DocType: Delivery Note,Delivery To,Toimetaja
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Oskus tabelis on kohustuslik
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Oskus tabelis on kohustuslik
 DocType: Production Planning Tool,Get Sales Orders,Võta müügitellimuste
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ei tohi olla negatiivne
 DocType: Training Event,Self-Study,Iseseisev õppimine
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Soodus
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Soodus
 DocType: Asset,Total Number of Depreciations,Kokku arv Amortisatsiooniaruanne
 DocType: Sales Invoice Item,Rate With Margin,Määra Margin
 DocType: Workstation,Wages,Palgad
 DocType: Task,Urgent,Urgent
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Palun täpsustage kehtiv Row ID reas {0} tabelis {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Muutuja ei leitud
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Palun vali väljad numpadist muutmiseks
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Palun vali väljad numpadist muutmiseks
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Mine Desktop ja hakata kasutama ERPNext
 DocType: Item,Manufacturer,Tootja
 DocType: Landed Cost Item,Purchase Receipt Item,Ostutšekk toode
@@ -1227,8 +1253,8 @@
 DocType: GL Entry,Against,Vastu
 DocType: Item,Default Selling Cost Center,Vaikimisi müügikulude Center
 DocType: Sales Partner,Implementation Partner,Rakendamine Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Postiindeks
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Sales Order {0} on {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Postiindeks
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Sales Order {0} on {1}
 DocType: Opportunity,Contact Info,Kontaktinfo
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Making Stock kanded
 DocType: Packing Slip,Net Weight UOM,Net Weight UOM
@@ -1239,6 +1265,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Võta Weekly Off kuupäevad
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,End Date saa olla väiksem kui alguskuupäev
 DocType: Sales Person,Select company name first.,Vali firma nimi esimesena.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Madalast kõrgemale
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Tsitaadid Hankijatelt.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Vahetage BOM ja värskendage viimast hinda kõikides BOM-i
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},{0} | {1} {2}
@@ -1257,7 +1284,7 @@
 DocType: Program Enrollment,Transportation,Vedu
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Vale Oskus
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} tuleb esitada
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Kogus peab olema väiksem või võrdne {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Kogus peab olema väiksem või võrdne {0}
 DocType: SMS Center,Total Characters,Kokku Lõbu
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Palun valige Bom Bom valdkonnas Punkt {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Arve Detail
@@ -1272,7 +1299,7 @@
 ,Ordered Items To Be Billed,Tellitud esemed arve
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Siit Range peab olema väiksem kui levikuala
 DocType: Global Defaults,Global Defaults,Global Vaikeväärtused
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Projektikoostööd Kutse
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Projektikoostööd Kutse
 DocType: Salary Slip,Deductions,Mahaarvamised
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Tegevus nimega
@@ -1290,13 +1317,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Müügiarve Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Midagi nõuda
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Teine Eelarve rekord &quot;{0} &#39;on juba olemas vastu {1} {2}&quot; eelarveaastal {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"""Tegelik alguskuupäev"" ei saa olla suurem kui ""Tegelik lõpukuupäev"""
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"""Tegelik alguskuupäev"" ei saa olla suurem kui ""Tegelik lõpukuupäev"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Juhtimine
 DocType: Cheque Print Template,Payer Settings,maksja seaded
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","See on lisatud Kood variandi. Näiteks, kui teie lühend on &quot;SM&quot;, ning objekti kood on &quot;T-särk&quot;, kirje kood variant on &quot;T-särk SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Netopalk (sõnadega) ilmuvad nähtavale kui salvestate palgatõend.
 DocType: Purchase Invoice,Is Return,Kas Tagasi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Ettevaatust
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Ettevaatust
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Tagasi / võlateate
 DocType: Price List Country,Price List Country,Hinnakiri Riik
 DocType: Item,UOMs,UOMs
@@ -1311,17 +1338,18 @@
 DocType: Account,Balance Sheet,Eelarve
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Kulude Keskus eseme Kood &quot;
 DocType: Fee Validity,Valid Till,Kehtiv kuni
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Makserežiimi ei ole seadistatud. Palun kontrollige, kas konto on seadistatud režiim maksed või POS profiili."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Makserežiimi ei ole seadistatud. Palun kontrollige, kas konto on seadistatud režiim maksed või POS profiili."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Sama objekt ei saa sisestada mitu korda.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Lisaks kontod saab rühma all, kuid kanded saab teha peale mitte-Groups"
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Võlad
 DocType: Course,Course Intro,Kursuse tutvustus
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Stock Entry {0} loodud
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Palun seadistage külastuse numbrite seeria seaded&gt; nummering seeria abil
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Stock Entry {0} loodud
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: lükata Kogus ei kanta Ostutagastus
 ,Purchase Order Items To Be Billed,Ostutellimuse punkte arve
 DocType: Purchase Invoice Item,Net Rate,Efektiivne intressimäär
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Valige klient
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Valige klient
 DocType: Purchase Invoice Item,Purchase Invoice Item,Ostuarve toode
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Ledger kanded ja GL kanded on edasi saata valitud Ostutšekid
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Punkt 1
@@ -1340,7 +1368,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Duplicate rida {0} on sama {1}
 ,Trial Balance,Proovibilanss
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Eelarveaastal {0} ei leitud
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Seadistamine Töötajad
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Seadistamine Töötajad
 DocType: Sales Order,SO-,SO-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Palun valige eesliide esimene
 DocType: Employee,O-,O-
@@ -1352,12 +1380,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Vaata Ledger
 DocType: Grading Scale,Intervals,intervallid
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Esimesed
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Elemendi Group olemas sama nimega, siis muuda objekti nimi või ümber nimetada elemendi grupp"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Elemendi Group olemas sama nimega, siis muuda objekti nimi või ümber nimetada elemendi grupp"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobiilne No.
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Ülejäänud maailm
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Ülejäänud maailm
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Artiklite {0} ei ole partii
 ,Budget Variance Report,Eelarve Dispersioon aruanne
 DocType: Salary Slip,Gross Pay,Gross Pay
+DocType: Item,Is Item from Hub,Kas üksus on hubist
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Rida {0}: Activity Type on kohustuslik.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,"Dividende,"
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Raamatupidamine Ledger
@@ -1367,8 +1396,9 @@
 DocType: Vehicle Log,Service Detail,Teenuse Detail
 DocType: BOM,Item Description,Toote kirjeldus
 DocType: Student Sibling,Student Sibling,Student Kaas
-DocType: Purchase Invoice,Is Recurring,Kas Korduvad
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Makserežiim
 DocType: Purchase Invoice,Supplied Items,Komplektis Esemed
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Määrake restoranis {0} aktiivne menüü
 DocType: Student,STUD.,Stud.
 DocType: Production Order,Qty To Manufacture,Kogus toota
 DocType: Email Digest,New Income,uus tulu
@@ -1378,6 +1408,7 @@
 ,Student and Guardian Contact Details,Student ja Guardian Kontakt
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Rida {0}: tarnija {0} e-posti aadress on vajalik saata e-posti
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Ajutine avamine
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Kuva keskus
 ,Employee Leave Balance,Töötaja Jäta Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Balance Konto {0} peab alati olema {1}
 DocType: Patient Appointment,More Info,Rohkem infot
@@ -1397,13 +1428,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Sales Order {0} ei ole kehtiv
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Hoiata uue tsitaadi taotlemise eest
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Ostutellimuste aidata teil planeerida ja jälgida oma ostud
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Vabandame, ettevõtted ei saa liita"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Vabandame, ettevõtted ei saa liita"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab katsestavad retseptid
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Kogu Issue / Transfer koguse {0} Material taotlus {1} \ saa olla suurem kui nõutud koguse {2} jaoks Punkt {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Väike
 DocType: Employee,Employee Number,Töötaja number
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Case (te) juba kasutusel. Proovige kohtuasjas No {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Case (te) juba kasutusel. Proovige kohtuasjas No {0}
 DocType: Project,% Completed,% Valminud
 ,Invoiced Amount (Exculsive Tax),Arve kogusumma (Exculsive Maksu-)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Punkt 2
@@ -1418,11 +1449,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Kaudsed kulud
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Row {0}: Kogus on kohustuslikuks
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Põllumajandus
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sync Master andmed
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sync Master andmed
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Oma tooteid või teenuseid
 DocType: Special Test Items,Special Test Items,Spetsiaalsed katseüksused
 DocType: Mode of Payment,Mode of Payment,Makseviis
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Koduleht Pilt peaks olema avalik faili või veebilehe URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Koduleht Pilt peaks olema avalik faili või veebilehe URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,Bom
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,See on ülemelemendile rühma ja seda ei saa muuta.
@@ -1430,24 +1461,23 @@
 DocType: Vehicle,Fuel UOM,Kütus UOM
 DocType: Warehouse,Warehouse Contact Info,Ladu Kontakt
 DocType: Payment Entry,Write Off Difference Amount,Kirjutage Off erinevuse koguse
-DocType: Purchase Invoice,Recurring Type,Korduvad Type
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: Töötaja e-posti ei leitud, seega e-posti ei saadeta"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: Töötaja e-posti ei leitud, seega e-posti ei saadeta"
 DocType: Item,Foreign Trade Details,Väliskaubanduse detailid
+,Assessment Plan Status,Hindamiskava staatus
 DocType: Email Digest,Annual Income,Aastane sissetulek
 DocType: Serial No,Serial No Details,Serial No Üksikasjad
 DocType: Purchase Invoice Item,Item Tax Rate,Punkt Maksumäär
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,Valige arst ja kuupäev
 DocType: Student Group Student,Group Roll Number,Group Roll arv
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Sest {0}, ainult krediitkaardi kontod võivad olla seotud teise vastu deebetkanne"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Kokku kõigi ülesanne kaalu peaks 1. Palun reguleerida kaalu kõikide Project ülesandeid vastavalt
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Toimetaja märkus {0} ei ole esitatud
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Kokku kõigi ülesanne kaalu peaks 1. Palun reguleerida kaalu kõikide Project ülesandeid vastavalt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Toimetaja märkus {0} ei ole esitatud
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Punkt {0} peab olema allhanked toode
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Capital seadmed
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Hinnakujundus Reegel on esimene valitud põhineb &quot;Rakenda On väljale, mis võib olla Punkt punkt Group või kaubamärgile."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Palun määra kõigepealt tootekood
-DocType: Hub Settings,Seller Website,Müüja Koduleht
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Palun määra kõigepealt tootekood
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Kokku eraldatakse protsent müügimeeskond peaks olema 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Kokku eraldatakse protsent müügimeeskond peaks olema 100
 DocType: Sales Invoice Item,Edit Description,Edit kirjeldus
 DocType: Antibiotic,Antibiotic,Antibiootikum
 ,Team Updates,Team uuendused
@@ -1468,12 +1498,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Kokku (firma Valuuta)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Serial number {0} sisestatud rohkem kui üks kord
 DocType: Depreciation Schedule,Journal Entry,Päevikusissekanne
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} objekte pooleli
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} objekte pooleli
 DocType: Workstation,Workstation Name,Workstation nimi
 DocType: Grading Scale Interval,Grade Code,Hinne kood
 DocType: POS Item Group,POS Item Group,POS Artikliklasside
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Saatke Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},Bom {0} ei kuulu Punkt {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},Bom {0} ei kuulu Punkt {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Salary Slip,Bank Account No.,Bank Account No.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,See on mitmeid viimase loodud tehingu seda prefiksit
@@ -1489,10 +1519,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Hinnapäring Tarnija
 DocType: Healthcare Settings,Registration Message,Registreerimissõnum
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Riistvara
-DocType: Sales Order,Recurring Upto,korduvad Upto
 DocType: Prescription Dosage,Prescription Dosage,Retseptiravim
 DocType: Attendance,HR Manager,personalijuht
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Palun valige Company
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Palun valige Company
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Tarnija Arve kuupäev
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,kohta
@@ -1508,10 +1537,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Kattumine olude vahel:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Vastu päevikusissekanne {0} on juba korrigeeritakse mõningaid teisi voucher
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Kokku tellimuse maksumus
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Toit
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Toit
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Vananemine Range 3
 DocType: Maintenance Schedule Item,No of Visits,No visiit
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Hoolduskava {0} on olemas vastu {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Kas soovite avaldada oma üksused hubisse?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,registreerimisega üliõpilane
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuuta sulgemise tuleb arvesse {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Summa võrra kõik eesmärgid peaksid olema 100. On {0}
@@ -1522,9 +1552,9 @@
 DocType: Authorization Rule,Average Discount,Keskmine Soodus
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Kommunaalteenused
-DocType: Purchase Invoice Item,Accounting,Raamatupidamine
+DocType: POS Profile,Accounting,Raamatupidamine
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Palun valige partiide Jaotatud kirje
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Palun valige partiide Jaotatud kirje
 DocType: Asset,Depreciation Schedules,Kulumi
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Taotlemise tähtaeg ei tohi olla väljaspool puhkuse eraldamise ajavahemikul
 DocType: Activity Cost,Projects,Projektid
@@ -1540,7 +1570,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',Nõustumisstaatus tuleb &quot;Kinnitatud&quot; või &quot;Tõrjutud&quot;
 DocType: Physician,Contacts and Address,Kontaktid ja aadress
 DocType: Purchase Invoice,Contact Person,Kontaktisik
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&quot;Oodatud Start Date&quot; ei saa olla suurem kui &quot;Oodatud End Date&quot;
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&quot;Oodatud Start Date&quot; ei saa olla suurem kui &quot;Oodatud End Date&quot;
 DocType: Course Scheduling Tool,Course End Date,Muidugi End Date
 DocType: Holiday List,Holidays,Holidays
 DocType: Sales Order Item,Planned Quantity,Planeeritud Kogus
@@ -1548,10 +1578,11 @@
 DocType: Item,Maintain Stock,Säilitada Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Stock kanded juba loodud Production Telli
 DocType: Employee,Prefered Email,eelistatud Post
+DocType: Student Admission,Eligibility and Details,Abikõlblikkus ja üksikasjad
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Net Change põhivarade
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Jäta tühjaks, kui arvestada kõiki nimetusi"
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Laadige tüüp &quot;Tegelik&quot; in real {0} ei saa lisada Punkt Rate
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Siit Date
 DocType: Email Digest,For Company,Sest Company
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Side log.
@@ -1559,19 +1590,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Tarnijate skoorikaardi skooride muutuja
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Ostmine summa
 DocType: Sales Invoice,Shipping Address Name,Kohaletoimetamine Aadress Nimi
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Kontoplaan
 DocType: Material Request,Terms and Conditions Content,Tingimused sisu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,ei saa olla üle 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Punkt {0} ei ole laos toode
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Punkt {0} ei ole laos toode
 DocType: Maintenance Visit,Unscheduled,Plaaniväline
 DocType: Employee,Owned,Omanik
 DocType: Salary Detail,Depends on Leave Without Pay,Oleneb palgata puhkust
 DocType: Pricing Rule,"Higher the number, higher the priority","Suurem arv, seda suurem on prioriteet"
 ,Purchase Invoice Trends,Ostuarve Trends
 DocType: Employee,Better Prospects,Paremad väljavaated
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Row # {0}: Portsjoni {1} omab ainult {2} tk. Palun valige mõni teine partii, mis on {3} Kogus kättesaadav või jagada järjest mitmeks rida, et pakkuda / küsimust mitmed partiid"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Row # {0}: Portsjoni {1} omab ainult {2} tk. Palun valige mõni teine partii, mis on {3} Kogus kättesaadav või jagada järjest mitmeks rida, et pakkuda / küsimust mitmed partiid"
 DocType: Vehicle,License Plate,Numbrimärk
 DocType: Appraisal,Goals,Eesmärgid
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Vali POS profiil
 DocType: Warranty Claim,Warranty / AMC Status,Garantii / AMC staatus
 ,Accounts Browser,Kontod Browser
 DocType: Payment Entry Reference,Payment Entry Reference,Makse Entry Reference
@@ -1589,7 +1620,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Töötaja ei saa aru ise.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Kui konto on külmutatud, kanded on lubatud piiratud kasutajatele."
 DocType: Email Digest,Bank Balance,Bank Balance
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Raamatupidamine kirjet {0} {1} saab teha ainult valuuta: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Raamatupidamine kirjet {0} {1} saab teha ainult valuuta: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Ametijuhendite, nõutav kvalifikatsioon jms"
 DocType: Journal Entry Account,Account Balance,Kontojääk
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Maksu- reegli tehingud.
@@ -1598,8 +1629,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Kokku maksud ja tasud (firma Valuuta)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Näita sulgemata eelarve aasta P &amp; L saldod
 DocType: Lab Test Template,Collection Details,Kollektsiooni üksikasjad
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","valige cp.nimi, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date tabelistConsultation ct, `tabLab Prescription` cp, kus ct.patient = &#39;{0}&#39; ja cp.parent = ct. nimi ja cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Laevandus
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Konto {2} ei ole aktiivne
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Tee müügitellimuste aitavad teil planeerida oma tööd ja täitma-time
@@ -1616,7 +1645,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Pakkesedel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Office rent
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS gateway seaded
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import ebaõnnestus!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import ebaõnnestus!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,No aadress lisatakse veel.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation töötunni
 DocType: Vital Signs,Blood Pressure,Vererõhk
@@ -1641,7 +1670,7 @@
 DocType: Sales Invoice,Source,Allikas
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Näita suletud
 DocType: Leave Type,Is Leave Without Pay,Kas palgata puhkust
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Põhivarakategoori on kohustuslik põhivara objektile
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Põhivarakategoori on kohustuslik põhivara objektile
 DocType: Fee Validity,Fee Validity,Tasu kehtivus
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Salvestusi ei leitud Makseinfo tabelis
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},See {0} konflikte {1} jaoks {2} {3}
@@ -1662,8 +1691,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Loo Leads
 DocType: Maintenance Schedule,Schedules,Sõiduplaanid
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,POS-profiil on vajalik müügipunktide kasutamiseks
 DocType: Purchase Invoice Item,Net Amount,Netokogus
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} ei ole esitatud nii toimingut ei saa lõpule
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} ei ole esitatud nii toimingut ei saa lõpule
 DocType: Purchase Order Item Supplied,BOM Detail No,Bom Detail Ei
 DocType: Landed Cost Voucher,Additional Charges,lisatasudeta
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Täiendav Allahindluse summa (firma Valuuta)
@@ -1672,7 +1702,7 @@
 ,Support Hour Distribution,Tugi jagamise aeg
 DocType: Maintenance Visit,Maintenance Visit,Hooldus Külasta
 DocType: Student,Leaving Certificate Number,Lõputunnistus arv
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}",Ametikoht tühistatud. Palun vaadake ja tühjendage arve {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}",Ametikoht tühistatud. Palun vaadake ja tühjendage arve {0}
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Saadaval Partii Kogus lattu
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Uuenda Print Format
 DocType: Landed Cost Voucher,Landed Cost Help,Maandus Cost Abi
@@ -1695,8 +1725,8 @@
 DocType: Patient,Tobacco Past Use,Tubakas minevikus kasutamiseks
 DocType: Sales Invoice Item,Brand Name,Brändi nimi
 DocType: Purchase Receipt,Transporter Details,Transporter Üksikasjad
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Kasutaja {0} on juba määratud arstile {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Vaikimisi ladu valimiseks on vaja kirje
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Kasutaja {0} on juba määratud arstile {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Vaikimisi ladu valimiseks on vaja kirje
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Box
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,võimalik Tarnija
 DocType: Budget,Monthly Distribution,Kuu Distribution
@@ -1706,7 +1736,7 @@
 DocType: Sales Partner,Sales Partner Target,Müük Partner Target
 DocType: Loan Type,Maximum Loan Amount,Maksimaalne laenusumma
 DocType: Pricing Rule,Pricing Rule,Hinnakujundus reegel
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Duplicate valtsi arvu üliõpilaste {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Duplicate valtsi arvu üliõpilaste {0}
 DocType: Budget,Action if Annual Budget Exceeded,"Action, kui aastane eelarve ületatud"
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Materjal Ostusoov Telli
 DocType: Shopping Cart Settings,Payment Success URL,Makse Edu URL
@@ -1723,7 +1753,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} peab olema ainult üks kord
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ei tohi tranfer rohkem {0} kui {1} vastu Ostutellimuse {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Lehed Eraldatud edukalt {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,"Ole tooteid, mida pakkida"
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,"Ole tooteid, mida pakkida"
 DocType: Shipping Rule Condition,From Value,Väärtuse
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Tootmine Kogus on kohustuslikuks
 DocType: Employee Loan,Repayment Method,tagasimaksmine meetod
@@ -1737,6 +1767,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Stock Kohustused
 DocType: Purchase Invoice,Supplier Warehouse,Tarnija Warehouse
 DocType: Opportunity,Contact Mobile No,Võta Mobiilne pole
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Vali ettevõte
 ,Material Requests for which Supplier Quotations are not created,"Materjal taotlused, mis Tarnija tsitaadid ei ole loodud"
 DocType: Student Group,Set 0 for no limit,Määra 0 piiranguid pole
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Päev (ad), millal te taotlete puhkuse puhkepäevadel. Sa ei pea taotlema puhkust."
@@ -1746,24 +1777,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Tee Tsitaat
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Teised aruanded
 DocType: Dependent Task,Dependent Task,Sõltub Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Muundustegurit Vaikemõõtühik peab olema 1 rida {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Muundustegurit Vaikemõõtühik peab olema 1 rida {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Jäta tüüpi {0} ei saa olla pikem kui {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Proovige plaanis operatsioonide X päeva ette.
 DocType: HR Settings,Stop Birthday Reminders,Stopp Sünnipäev meeldetuletused
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Palun määra Vaikimisi palgaarvestuse tasulised konto Company {0}
 DocType: SMS Center,Receiver List,Vastuvõtja loetelu
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Otsi toode
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Otsi toode
 DocType: Patient Appointment,Referring Physician,Viidates arstile
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Tarbitud
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Net muutus Cash
 DocType: Assessment Plan,Grading Scale,hindamisskaala
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mõõtühik {0} on kantud rohkem kui üks kord Conversion Factor tabel
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,juba lõpetatud
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mõõtühik {0} on kantud rohkem kui üks kord Conversion Factor tabel
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,juba lõpetatud
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock In Hand
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Maksenõudekäsule juba olemas {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kulud Väljastatud Esemed
 DocType: Physician,Hospital,Haigla
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Kogus ei tohi olla rohkem kui {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Kogus ei tohi olla rohkem kui {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Eelmisel majandusaastal ei ole suletud
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Vanus (päevad)
 DocType: Quotation Item,Quotation Item,Tsitaat toode
@@ -1774,8 +1805,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Tarnija Type kapten.
 DocType: Purchase Order Item,Supplier Part Number,Tarnija osa number
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Ümberarvestuskursi ei saa olla 0 või 1
-DocType: Sales Invoice,Reference Document,ViitedokumenDI
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} on tühistatud või peatatud
+DocType: Subscription,Reference Document,ViitedokumenDI
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} on tühistatud või peatatud
 DocType: Accounts Settings,Credit Controller,Krediidi Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Sõidukite Dispatch Date
 DocType: Healthcare Settings,Default Medical Code Standard,Vaikimisi meditsiinikood standard
@@ -1784,6 +1815,7 @@
 DocType: Company,Default Payable Account,Vaikimisi on tasulised konto
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Seaded online ostukorv nagu laevandus reeglid, hinnakirja jm"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Maksustatakse
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Sorteeri hinna järgi ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserved Kogus
 DocType: Party Account,Party Account,Partei konto
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Inimressursid
@@ -1795,13 +1827,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Tee väljamakse Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Advance vastu Tarnija tuleb debiteerida
 DocType: Company,Default Values,Vaikeväärtused
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Sageduse} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Sageduse} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Hüvitatud kogusummast
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,See põhineb palke vastu Vehicle. Vaata ajakava allpool lähemalt
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Vastu Tarnija Arve {0} dateeritud {1}
 DocType: Customer,Default Price List,Vaikimisi hinnakiri
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Asset Liikumine rekord {0} loodud
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Sa ei saa kustutada eelarveaastal {0}. Eelarveaastal {0} on määratud vaikimisi Global Settings
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Sama nimega klient on juba olemas
 DocType: Journal Entry,Entry Type,Entry Type
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Nr hindamise kava seotud käesoleva hindamise rühm
 ,Customer Credit Balance,Kliendi kreeditjääk
@@ -1811,7 +1844,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,hinnapoliitika
 DocType: Quotation,Term Details,Term Details
 DocType: Project,Total Sales Cost (via Sales Order),Kokku müügikulud (via Sales Order)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Ei saa registreeruda rohkem kui {0} õpilasi tudeng rühm.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Ei saa registreeruda rohkem kui {0} õpilasi tudeng rühm.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead Krahv
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} peab olema suurem kui 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Maht planeerimist (päevad)
@@ -1827,9 +1860,11 @@
 DocType: Lab Test,Technician Name,Tehniku nimi
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Lingi eemaldada Makse tühistamine Arve
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Praegune Läbisõit sisestatud peaks olema suurem kui algne Sõiduki odomeetri {0}
+DocType: Restaurant Reservation,No Show,Ei näita
 DocType: Shipping Rule Country,Shipping Rule Country,Kohaletoimetamine Reegel Riik
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Jätke ja osavõtt
 DocType: Maintenance Visit,Partially Completed,Osaliselt täidetud
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Mõõdukas tundlikkus
 DocType: Leave Type,Include holidays within leaves as leaves,Kaasa pühade jooksul lehed nagu lehed
 DocType: Sales Invoice,Packed Items,Pakitud Esemed
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garantiinõudest vastu Serial No.
@@ -1846,13 +1881,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Paide summa (firma Valuuta)
 DocType: Purchase Invoice,Additional Discount,Täiendav Soodus
 DocType: Selling Settings,Selling Settings,Müük Seaded
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Kinnita toimingut
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Oksjonid
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Palun täpsustage kas Kogus või Hindamine Rate või nii
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,täitmine
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Vaata Ostukorv
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Turundus kulud
 ,Item Shortage Report,Punkt Puuduse aruanne
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Kaal on mainitud, \ nKui mainida &quot;Kaal UOM&quot; liiga"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Kaal on mainitud, \ nKui mainida &quot;Kaal UOM&quot; liiga"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materjal taotlus kasutatakse selle Stock Entry
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Järgmine kulum kuupäev on kohustuslik uus vara
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Eraldi muidugi põhineb Group iga partii
@@ -1864,12 +1900,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Tee Raamatupidamine kirje Iga varude liikumist
 DocType: Leave Allocation,Total Leaves Allocated,Kokku Lehed Eraldatud
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Ladu nõutav Row No {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Palun sisesta kehtivad majandusaasta algus- ja lõppkuupäev
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Palun sisesta kehtivad majandusaasta algus- ja lõppkuupäev
 DocType: Employee,Date Of Retirement,Kuupäev pensionile
 DocType: Upload Attendance,Get Template,Võta Mall
 DocType: Material Request,Transferred,üle
 DocType: Vehicle,Doors,Uksed
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext Setup Complete!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Koguge tasu patsiendi registreerimiseks
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,Maksu- väljasõit
@@ -1888,36 +1924,36 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Kui see toode on variandid, siis ei saa valida müügi korraldusi jms"
 DocType: Lead,Next Contact By,Järgmine kontakteeruda
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Kogus vaja Punkt {0} järjest {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Kogus vaja Punkt {0} järjest {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},"Ladu {0} ei saa kustutada, kui kvantiteet on olemas Punkt {1}"
 DocType: Quotation,Order Type,Tellimus Type
-DocType: Purchase Invoice,Notification Email Address,Teavitamine e-posti aadress
 ,Item-wise Sales Register,Punkt tark Sales Registreeri
 DocType: Asset,Gross Purchase Amount,Gross ostusumma
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Avamissaldod
 DocType: Asset,Depreciation Method,Amortisatsioonimeetod
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,offline
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,See sisaldab käibemaksu Basic Rate?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Kokku Target
 DocType: Job Applicant,Applicant for a Job,Taotleja Töö
 DocType: Production Plan Material Request,Production Plan Material Request,Tootmise kava Materjal taotlus
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,No Tootmistellimused loodud
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,No Tootmistellimused loodud
 DocType: Stock Reconciliation,Reconciliation JSON,Leppimine JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Liiga palju veerge. Eksport aruande ja printida tabelarvutuse rakenduse.
 DocType: Purchase Invoice Item,Batch No,Partii ei
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Hinnapakkumise taotlus: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Laske mitu müügitellimuste vastu Kliendi ostutellimuse
 DocType: Student Group Instructor,Student Group Instructor,Student Group juhendaja
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile nr
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Main
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Main
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Määra eesliide numeratsiooni seeria oma tehingute
 DocType: Employee Attendance Tool,Employees HTML,Töötajad HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Vaikimisi Bom ({0}) peab olema aktiivne selle objekt või selle malli
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Vaikimisi Bom ({0}) peab olema aktiivne selle objekt või selle malli
 DocType: Employee,Leave Encashed?,Jäta realiseeritakse?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity From väli on kohustuslik
 DocType: Email Digest,Annual Expenses,Aastane kulu
 DocType: Item,Variants,Variante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Tee Ostutellimuse
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Tee Ostutellimuse
 DocType: SMS Center,Send To,Saada
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Ei ole piisavalt puhkust tasakaalu Jäta tüüp {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Eraldatud summa
@@ -1933,6 +1969,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Student Group Tugevus
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Vastu päevikusissekanne {0} ei ole mingit tasakaalustamata {1} kirje
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,hindamisest
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Koolitusüritused
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Duplicate Serial No sisestatud Punkt {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Tingimuseks laevandus reegel
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Palun sisesta
@@ -1942,7 +1979,7 @@
 DocType: Sales Order,To Deliver and Bill,Pakkuda ja Bill
 DocType: Student Group,Instructors,Instruktorid
 DocType: GL Entry,Credit Amount in Account Currency,Krediidi Summa konto Valuuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,Bom {0} tuleb esitada
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,Bom {0} tuleb esitada
 DocType: Authorization Control,Authorization Control,Autoriseerimiskontroll
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: lükata Warehouse on kohustuslik vastu rahuldamata Punkt {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Makse
@@ -1961,11 +1998,11 @@
 DocType: Quotation Item,Actual Qty,Tegelik Kogus
 DocType: Sales Invoice Item,References,Viited
 DocType: Quality Inspection Reading,Reading 10,Lugemine 10
-DocType: Hub Settings,Hub Node,Hub Node
+DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Te olete sisenenud eksemplaris teemad. Palun paranda ja proovige uuesti.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Associate
 DocType: Asset Movement,Asset Movement,Asset liikumine
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,uus ostukorvi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,uus ostukorvi
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Punkt {0} ei ole seeriasertide toode
 DocType: SMS Center,Create Receiver List,Loo vastuvõtja loetelu
 DocType: Vehicle,Wheels,rattad
@@ -1979,15 +2016,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekommunikatsiooni
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Näitab, et pakend on osa sellest sünnitust (Ainult eelnõu)"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Tee makse Entry
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Kogus Punkt {0} peab olema väiksem kui {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Kogus Punkt {0} peab olema väiksem kui {1}
 ,Sales Invoice Trends,Müügiarve Trends
 DocType: Leave Application,Apply / Approve Leaves,Rakenda / Kiita Leaves
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Eest
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Eest
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Võib viidata rida ainult siis, kui tasu tüüp on &quot;On eelmise rea summa&quot; või &quot;Eelmine Row kokku&quot;"
 DocType: Sales Order Item,Delivery Warehouse,Toimetaja Warehouse
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Puu rahalist kuluallikad.
 DocType: Serial No,Delivery Document No,Toimetaja dokument nr
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Palun määra &quot;kasum / kahjum konto kohta varade realiseerimine&quot; Company {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Palun määra &quot;kasum / kahjum konto kohta varade realiseerimine&quot; Company {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Võta esemed Ostutšekid
 DocType: Serial No,Creation Date,Loomise kuupäev
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Punkt {0} esineb mitu korda Hinnakiri {1}
@@ -1998,11 +2035,12 @@
 DocType: Student,Student Mobile Number,Student Mobile arv
 DocType: Item,Has Variants,Omab variandid
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Uuenda vastust
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Olete juba valitud objektide {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Olete juba valitud objektide {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nimi Kuu Distribution
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Partii nr on kohustuslik
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
-DocType: Purchase Invoice,Recurring Invoice,Korduvad Arve
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Kõrge madala
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Valige kõigepealt programm
 DocType: Patient Appointment,Patient Age,Patsiendi vanus
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Projektide juhtimisel
 DocType: Supplier,Supplier of Goods or Services.,Pakkuja kaupu või teenuseid.
@@ -2010,8 +2048,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Vaikimisi saadaolevad kontod, mida kasutatakse juhul, kui patsient ei soovi broneerida konsultatsioonitasusid."
 DocType: Vehicle Log,Fuel Price,kütuse hind
 DocType: Budget,Budget,Eelarve
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Määrake Ava
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Põhivara objektile peab olema mitte-laoartikkel.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Määrake Ava
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Põhivara objektile peab olema mitte-laoartikkel.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Eelarve ei saa liigitada vastu {0}, sest see ei ole tulu või kuluna konto"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Saavutatud
 DocType: Student Admission,Application Form Route,Taotlusvormi Route
@@ -2025,12 +2063,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Punkt {0} ei ole setup Serial nr. Saate Punkt master
 DocType: Maintenance Visit,Maintenance Time,Hooldus aeg
 ,Amount to Deliver,Summa pakkuda
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Sama asi on sisestatud mitu korda. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term Start Date ei saa olla varasem kui alguskuupäev õppeaasta, mille mõiste on seotud (Academic Year {}). Palun paranda kuupäev ja proovi uuesti."
 DocType: Guardian,Guardian Interests,Guardian huvid
 DocType: Naming Series,Current Value,Praegune väärtus
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Mitu eelarve aastatel on olemas kuupäev {0}. Palun määra firma eelarveaastal
 DocType: School Settings,Instructor Records to be created by,"Juhendaja salvestised, mida peab looma"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} loodud
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} loodud
 DocType: Delivery Note Item,Against Sales Order,Vastu Sales Order
 ,Serial No Status,Serial No staatus
 DocType: Payment Entry Reference,Outstanding,silmapaistev
@@ -2040,10 +2079,10 @@
 						must be greater than or equal to {2}",Row {0}: seadmiseks {1} perioodilisuse vahe alates ja siiani \ peab olema suurem või võrdne {2}
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,See põhineb varude liikumist. Vaata {0} üksikasjad
 DocType: Pricing Rule,Selling,Müük
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Summa {0} {1} maha vastu {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Summa {0} {1} maha vastu {2}
 DocType: Employee,Salary Information,Palk Information
 DocType: Sales Person,Name and Employee ID,Nimi ja Töötaja ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Tähtaeg ei tohi olla enne postitamist kuupäev
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Tähtaeg ei tohi olla enne postitamist kuupäev
 DocType: Website Item Group,Website Item Group,Koduleht Punkt Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Lõivud ja maksud
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Palun sisestage Viitekuupäev
@@ -2069,7 +2108,7 @@
 DocType: Issue,Resolution Details,Resolutsioon Üksikasjad
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,eraldised
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Vastuvõetavuse kriteeriumid
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Palun sisesta Materjal taotlused ülaltoodud tabelis
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Palun sisesta Materjal taotlused ülaltoodud tabelis
 DocType: Item Attribute,Attribute Name,Atribuudi nimi
 DocType: BOM,Show In Website,Show Website
 DocType: Shopping Cart Settings,Show Quantity in Website,Näita Kogus Website
@@ -2078,7 +2117,7 @@
 DocType: Item Reorder,Check in (group),Check in (rühm)
 ,Qty to Order,Kogus tellida
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Konto pea all või omakapitaliks, mille kasum / kahjum on broneeritud"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Gantti diagramm kõik ülesanded.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Gantti diagramm kõik ülesanded.
 DocType: Opportunity,Mins to First Response,Min First Response
 DocType: Pricing Rule,Margin Type,Margin Type
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} tundi
@@ -2099,35 +2138,35 @@
 DocType: Patient,Surgical History,Kirurgiajalugu
 DocType: Employee,Resignation Letter Date,Ametist kiri kuupäev
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Hinnakujundus on reeglid veelgi filtreeritud põhineb kogusest.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Määrake Liitumis töötajate {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Määrake Liitumis töötajate {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Arve summa (via Time Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Korrake Kliendi tulu
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) peab olema roll kulul Approver &quot;
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Paar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Vali Bom ja Kogus Production
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Vali Bom ja Kogus Production
 DocType: Asset,Depreciation Schedule,amortiseerumise kava
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Müük Partner aadressid ja kontaktandmed
 DocType: Bank Reconciliation Detail,Against Account,Vastu konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Pool päeva kuupäev peab olema vahemikus From kuupäev ja To Date
 DocType: Maintenance Schedule Detail,Actual Date,Tegelik kuupäev
 DocType: Item,Has Batch No,Kas Partii ei
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Iga-aastane Arved: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Iga-aastane Arved: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Kaupade ja teenuste maksu (GST India)
 DocType: Delivery Note,Excise Page Number,Aktsiisi Page Number
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory",Firma From kuupäev ning praegu on kohustuslik
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Hankige konsultatsioonist
 DocType: Asset,Purchase Date,Ostu kuupäev
 DocType: Employee,Personal Details,Isiklikud detailid
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Palun määra &quot;Vara amortisatsioonikulu Center&quot; Company {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Palun määra &quot;Vara amortisatsioonikulu Center&quot; Company {0}
 ,Maintenance Schedules,Hooldusgraafikud
 DocType: Task,Actual End Date (via Time Sheet),Tegelik End Date (via Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Summa {0} {1} vastu {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Summa {0} {1} vastu {2} {3}
 ,Quotation Trends,Tsitaat Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Punkt Group mainimata punktis kapteni kirje {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Kanne konto peab olema võlgnevus konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Kanne konto peab olema võlgnevus konto
 DocType: Shipping Rule Condition,Shipping Amount,Kohaletoimetamine summa
 DocType: Supplier Scorecard Period,Period Score,Perioodi skoor
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Lisa Kliendid
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Lisa Kliendid
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Kuni Summa
 DocType: Lab Test Template,Special,Eriline
 DocType: Purchase Invoice Item,Conversion Factor,Tulemus Factor
@@ -2135,13 +2174,14 @@
 ,Vehicle Expenses,Sõidukite kulud
 DocType: Serial No,Invoice Details,arve andmed
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Oodatud väärtus pärast kasuliku eluea peab olema suurem või võrdne {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Alusta uuesti
+DocType: Hub Category,Hub Category,Rummu kategooria
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Sõidukite arv
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Kuupäev, mil korduv arve lõpetada"
 DocType: Employee Loan,Loan Amount,Laenusumma
 DocType: Program Enrollment,Self-Driving Vehicle,Isesõitva Sõiduki
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Tarnija tulemuskaardi alaline
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Row {0}: Materjaliandmik ei leitud Eseme {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Row {0}: Materjaliandmik ei leitud Eseme {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Kokku eraldatakse lehed {0} ei saa olla väiksem kui juba heaks lehed {1} perioodiks
 DocType: Journal Entry,Accounts Receivable,Arved
 ,Supplier-Wise Sales Analytics,Tarnija tark Sales Analytics
@@ -2152,7 +2192,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Vanem Course (Jäta tühi, kui see ei ole osa Parent Course)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Jäta tühjaks, kui arvestada kõikide töötajate tüübid"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Jaota põhinevatest tasudest
-apps/erpnext/erpnext/hooks.py +131,Timesheets,timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,timesheets
 DocType: HR Settings,HR Settings,HR Seaded
 DocType: Salary Slip,net pay info,netopalk info
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Seda väärtust uuendatakse Vaikimüügi hinnakirjas.
@@ -2163,7 +2203,7 @@
 DocType: Patient,B Positive,B Positiivne
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rida # {0}: Kogus peab olema 1, kui objekt on põhivarana. Palun kasutage eraldi rida mitu tk."
 DocType: Leave Block List Allow,Leave Block List Allow,Jäta Block loetelu Laske
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Lühend ei saa olla tühi või ruumi
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Lühend ei saa olla tühi või ruumi
 DocType: Patient Medical Record,Patient Medical Record,Patsiendi meditsiiniline aruanne
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Grupi Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Spordi-
@@ -2179,9 +2219,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Ei leia Vahetuskurss {0} kuni {1} peamiste kuupäeva {2}. Looge Valuutavahetus rekord käsitsi
 DocType: POS Profile,Price List,Hinnakiri
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} on nüüd vaikimisi eelarveaastal. Palun värskendage brauserit muudatuse jõustumist.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Kuluaruanded
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Kuluaruanded
 DocType: Issue,Support,Support
 ,BOM Search,Bom Otsing
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.","Kirjastage laos &quot;Laos&quot; või &quot;Laos&quot;, mis asub jaotuses, tuginedes laos saadaval olevale laos."
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Sulgemine (Opening + Summad)
 DocType: Vehicle,Fuel Type,kütuse tüüp
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Palun täpsustage valuuta Company
@@ -2193,16 +2234,16 @@
 DocType: Healthcare Settings,Remind Before,Tuleta meelde enne
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM Ümberarvutustegur on vaja järjest {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rida # {0}: Reference Document Type peab olema üks Sales Order, müügiarve või päevikusissekanne"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rida # {0}: Reference Document Type peab olema üks Sales Order, müügiarve või päevikusissekanne"
 DocType: Salary Component,Deduction,Kinnipeetav
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Rida {0}: From ajal ja aeg on kohustuslik.
 DocType: Stock Reconciliation Item,Amount Difference,summa vahe
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Toode Hind lisatud {0} Hinnakirjas {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Toode Hind lisatud {0} Hinnakirjas {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Palun sisestage Töötaja Id selle müügi isik
 DocType: Territory,Classification of Customers by region,Klientide liigitamine piirkonniti
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Erinevus summa peab olema null
 DocType: Project,Gross Margin,Gross Margin
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Palun sisestage Production Punkt esimene
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Palun sisestage Production Punkt esimene
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Arvutatud Bank avaldus tasakaalu
 DocType: Normal Test Template,Normal Test Template,Tavaline testmall
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,puudega kasutaja
@@ -2212,21 +2253,22 @@
 DocType: Salary Slip,Total Deduction,Kokku mahaarvamine
 ,Production Analytics,tootmise Analytics
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,See põhineb tehingutel selle patsiendi vastu. Täpsema teabe saamiseks vt allpool toodud ajakava
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Kulude Uuendatud
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Kulude Uuendatud
 DocType: Employee,Date of Birth,Sünniaeg
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Punkt {0} on juba tagasi
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiscal Year ** esindab majandusaastal. Kõik raamatupidamiskanded ja teiste suuremate tehingute jälgitakse vastu ** Fiscal Year **.
 DocType: Opportunity,Customer / Lead Address,Klienditeenindus / Plii Aadress
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Tarnija tulemuskaardi seadistamine
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Hoiatus: Vigane SSL sertifikaat kinnitus {0}
-DocType: Student Admission,Eligibility,kõlblikkus
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Hindamiskava nimetus
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Hoiatus: Vigane SSL sertifikaat kinnitus {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Testrijuhtmed aitavad teil äri, lisada kõik oma kontaktid ja rohkem kui oma viib"
 DocType: Production Order Operation,Actual Operation Time,Tegelik tööaeg
 DocType: Authorization Rule,Applicable To (User),Suhtes kohaldatava (Kasutaja)
 DocType: Purchase Taxes and Charges,Deduct,Maha arvama
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Töö kirjeldus
 DocType: Student Applicant,Applied,rakendatud
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Re avatud
 DocType: Sales Invoice Item,Qty as per Stock UOM,Kogus ühe Stock UOM
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 Nimi
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Erimärkide välja &quot;-&quot;, &quot;#&quot;, &quot;.&quot; ja &quot;/&quot; ei tohi nimetades seeria"
@@ -2238,7 +2280,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Tootmine Manager
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} on garantii upto {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Split saateleht pakendites.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Saadetised
+apps/erpnext/erpnext/hooks.py +107,Shipments,Saadetised
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Eraldati kokku (firma Valuuta)
 DocType: Purchase Order Item,To be delivered to customer,Et toimetatakse kliendile
 DocType: BOM,Scrap Material Cost,Vanametalli materjali kulu
@@ -2260,8 +2302,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Üksuse Variant Seaded
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Valige ettevõtte ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Jäta tühjaks, kui arvestada kõik osakonnad"
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tüübid tööhõive (püsiv, leping, intern jne)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} on kohustuslik Punkt {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Tüübid tööhõive (püsiv, leping, intern jne)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} on kohustuslik Punkt {1}
 DocType: Process Payroll,Fortnightly,iga kahe nädala tagant
 DocType: Currency Exchange,From Currency,Siit Valuuta
 DocType: Vital Signs,Weight (In Kilogram),Kaal (kilogrammides)
@@ -2285,7 +2327,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Palun kliki &quot;Loo Ajakava&quot; saada ajakava
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Vigu kustutamise ajal järgmise skeemi:
 DocType: Bin,Ordered Quantity,Tellitud Kogus
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",nt &quot;Ehita vahendid ehitajad&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",nt &quot;Ehita vahendid ehitajad&quot;
 DocType: Grading Scale,Grading Scale Intervals,Hindamisskaala Intervallid
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Raamatupidamine kirjet {2} saab teha ainult valuuta: {3}
 DocType: Production Order,In Process,Teoksil olev
@@ -2308,11 +2350,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Maksu tasumisega
 DocType: Expense Claim Detail,Expense Claim Detail,Kuluhüvitussüsteeme Detail
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Kolmekordselt TARNIJA
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Palun valige õige konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Palun valige õige konto
 DocType: Item,Weight UOM,Kaal UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Palgastruktuur Employee
 DocType: Patient,Blood Group,Veregrupp
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Pooleliolev
 DocType: Course,Course Name,Kursuse nimi
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Kasutajad, kes saab kinnitada konkreetse töötaja puhkuse rakendused"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Büroo seadmed
@@ -2331,7 +2372,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Hinnad ei näidata, kui hinnakiri ei ole valitud"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Palun täpsustage riik seda kohaletoimetamine eeskirja või vaadake Worldwide Shipping
 DocType: Stock Entry,Total Incoming Value,Kokku Saabuva Value
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Kanne on vajalik
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Kanne on vajalik
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets aitab jälgida aega, kulusid ja arveldamise aja veetmiseks teha oma meeskonda"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Ostu hinnakiri
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Pakkujate tulemuskaardi muutujate mallid.
@@ -2341,7 +2382,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Makse leppimise
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Palun valige incharge isiku nimi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tehnoloogia
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Kokku Palgata: {0}
+DocType: Hub Settings,Unregister from Hub,Registreerumine Hubist
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Kokku Palgata: {0}
 DocType: BOM Website Operation,BOM Website Operation,Bom Koduleht operatsiooni
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Paku kiri
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Loo Material taotlused (MRP) ja Tootmistellimused.
@@ -2353,7 +2395,9 @@
 DocType: Physician Schedule Time Slot,To Time,Et aeg
 DocType: Authorization Rule,Approving Role (above authorized value),Kinnitamine roll (üle lubatud väärtuse)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Krediidi konto peab olema tasulised konto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},Bom recursion: {0} ei saa olla vanem või laps {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Palun valige Student Admission, mis on tasuline üliõpilaspidaja kohustuslik"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},Bom recursion: {0} ei saa olla vanem või laps {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Hinnakirja avaldamiseks valige hinnakiri
 DocType: Production Order Operation,Completed Qty,Valminud Kogus
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Sest {0}, ainult deebetkontode võib olla seotud teise vastu kreeditlausend"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Hinnakiri {0} on keelatud
@@ -2365,38 +2409,39 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} seerianumbrid vajalik Eseme {1}. Sa andsid {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Praegune Hindamine Rate
 DocType: Item,Customer Item Codes,Kliendi Punkt Koodid
+DocType: Training Event,Advance,Ettemaks
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,uuesti kordamiseks.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange kasum / kahjum
 DocType: Opportunity,Lost Reason,Kaotatud Reason
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,New Address
 DocType: Quality Inspection,Sample Size,Valimi suurus
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Palun sisesta laekumine Dokumendi
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Kõik esemed on juba arve
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Palun täpsustage kehtiv &quot;From Juhtum nr&quot;
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',Palun täpsustage kehtiv &quot;From Juhtum nr&quot;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Lisaks kuluallikad on võimalik teha rühma all, kuid kanded saab teha peale mitte-Groups"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Kasutajad ja reeglid
 DocType: Vehicle Log,VLOG.,Videoblogi.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Tootmistellimused Loodud: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Tootmistellimused Loodud: {0}
 DocType: Branch,Branch,Oks
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Trükkimine ja Branding
 DocType: Company,Total Monthly Sales,Kuu kogu müük
 DocType: Bin,Actual Quantity,Tegelik Kogus
 DocType: Shipping Rule,example: Next Day Shipping,Näiteks: Järgmine päev kohaletoimetamine
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} ei leitud
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Tellimus on olnud {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Tellimus on olnud {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Tasu ajakava programm
 DocType: Fee Schedule Program,Student Batch,Student Partii
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,"vali * tab &quot;Vital Signs&quot;, kus patsient = &#39;{0}&#39; tellimuse tähiste kuupäevast desc limit 1"
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Tee Student
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Minimaalne hinne
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Sind on kutsutud koostööd projekti: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Arst ei ole saadaval {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Sind on kutsutud koostööd projekti: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Arst ei ole saadaval {0}
 DocType: Leave Block List Date,Block Date,Block kuupäev
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Lisage kohandatud väljal liitumisnumbri doctypes {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Tarnija kättetoimetamise märkus
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Rakendatakse kohe
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Rakendatakse kohe
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Tegelik Kogus {0} / Ooteaeg Kogus {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-kaubandus GSTIN
 DocType: Sales Order,Not Delivered,Ei ole esitanud
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Oodatud kuupäev ei saa olla enne Tehingu kuupäeva
 ,Bank Clearance Summary,Bank Kliirens kokkuvõte
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Luua ja hallata päeva, nädala ja kuu email digests."
 DocType: Appraisal Goal,Appraisal Goal,Hinnang Goal
@@ -2404,12 +2449,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,ehitised
 DocType: Fee Schedule,Fee Structure,Fee struktuur
 DocType: Timesheet Detail,Costing Amount,Mis maksavad summa
-DocType: Student Admission,Application Fee,Application Fee
+DocType: Student Admission Program,Application Fee,Application Fee
 DocType: Process Payroll,Submit Salary Slip,Esita palgatõend
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maxiumm allahindlust Punkt {0} on {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Maxiumm allahindlust Punkt {0} on {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import in Bulk
 DocType: Sales Partner,Address & Contacts,Aadress ja Kontakt
 DocType: SMS Log,Sender Name,Saatja nimi
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Sorteeri kriteeriumide järgi
 DocType: POS Profile,[Select],[Vali]
 DocType: Vital Signs,Blood Pressure (diastolic),Vererõhk (diastoolne)
 DocType: SMS Log,Sent To,Saadetud
@@ -2418,7 +2464,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Järgmine Kontakt kuupäev ei saa olla minevikus
 DocType: Company,For Reference Only.,Üksnes võrdluseks.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Arst {0} pole saadaval {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Valige Partii nr
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Valige Partii nr
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Vale {0} {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,Viide inv
@@ -2434,15 +2480,15 @@
 DocType: Normal Test Items,Require Result Value,Nõuda tulemuse väärtust
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Juhtum nr saa olla 0
 DocType: Item,Show a slideshow at the top of the page,Näita slaidiseansi ülaosas lehele
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Kauplused
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Kauplused
 DocType: Project Type,Projects Manager,Projektijuhina
 DocType: Serial No,Delivery Time,Tarne aeg
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Vananemine Põhineb
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Kohtumine tühistati
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Kohtumine tühistati
 DocType: Item,End of Life,End of Life
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Reisimine
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Ei aktiivne või vaikimisi Palgastruktuur leitud töötaja {0} jaoks antud kuupäeva
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Reisimine
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Ei aktiivne või vaikimisi Palgastruktuur leitud töötaja {0} jaoks antud kuupäeva
 DocType: Leave Block List,Allow Users,Luba kasutajatel
 DocType: Purchase Order,Customer Mobile No,Kliendi Mobiilne pole
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Korduvad
@@ -2451,12 +2497,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Värskenda Cost
 DocType: Item Reorder,Item Reorder,Punkt Reorder
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Näita palgatõend
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Transfer Materjal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Transfer Materjal
 DocType: Fees,Send Payment Request,Saada makse taotlus
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",Määrake tegevuse töökulud ja annab ainulaadse operatsiooni ei oma tegevuse.
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,See dokument on üle piiri {0} {1} artiklijärgse {4}. Kas tegemist teise {3} samade {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Palun määra korduvate pärast salvestamist
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Vali muutus summa kontole
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Vali muutus summa kontole
 DocType: Purchase Invoice,Price List Currency,Hinnakiri Valuuta
 DocType: Naming Series,User must always select,Kasutaja peab alati valida
 DocType: Stock Settings,Allow Negative Stock,Laske Negatiivne Stock
@@ -2476,7 +2522,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Töötaja
 DocType: Sample Collection,Collected Time,Kogutud aeg
 DocType: Company,Sales Monthly History,Müügi kuu ajalugu
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Valige Partii
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Valige Partii
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} on täielikult arve
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Elutähtsad märgid
 DocType: Training Event,End Time,End Time
@@ -2484,16 +2530,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Tasu vähendamisega või kaotus
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Lepingu tüüptingimused Müük või ost.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Grupi poolt Voucher
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,"Kas olete kindel, et soovite selle koosoleku tühistada?"
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,müügivõimaluste
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Palun määra vaikimisi konto palk Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nõutav
 DocType: Rename Tool,File to Rename,Fail Nimeta ümber
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Palun valige Bom Punkt reas {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Palun valige Bom Punkt reas {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Kontole {0} ei ühti Firma {1} režiimis Ülekanderublade: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Määratletud Bom {0} ei eksisteeri Punkt {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Hoolduskava {0} tuleb tühistada enne tühistades selle Sales Order
+DocType: POS Profile,Applicable for Users,Kasutajatele kehtivad
 DocType: Notification Control,Expense Claim Approved,Kuluhüvitussüsteeme Kinnitatud
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Palgatõend töötaja {0} on juba loodud selleks perioodiks
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Palgatõend töötaja {0} on juba loodud selleks perioodiks
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Pharmaceutical
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kulud ostetud esemed
 DocType: Selling Settings,Sales Order Required,Sales Order Nõutav
@@ -2517,6 +2565,7 @@
 DocType: Offer Letter,Accepted,Lubatud
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,organisatsioon
 DocType: BOM Update Tool,BOM Update Tool,BOM-i värskendamise tööriist
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Perekonto pole määratud, palun seadke vaikimisi pearaamatu konto ettevõttes"
 DocType: SG Creation Tool Course,Student Group Name,Student Grupi nimi
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Tasude loomine
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Palun veendu, et sa tõesti tahad kustutada kõik tehingud selle firma. Teie kapten andmed jäävad, nagu see on. Seda toimingut ei saa tagasi võtta."
@@ -2525,29 +2574,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ei saa olla suurem kui planeeritud quanitity ({2}) in Production Tellimus {3}
 DocType: Shipping Rule,Shipping Rule Label,Kohaletoimetamine Reegel Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Kasutaja Foorum
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Tooraine ei saa olla tühi.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Ei uuendada laos, arve sisaldab tilk laevandus objekt."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Tooraine ei saa olla tühi.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Ei uuendada laos, arve sisaldab tilk laevandus objekt."
 DocType: Lab Test Sample,Lab Test Sample,Lab prooviproov
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Quick päevikusissekanne
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Sa ei saa muuta kiirust kui Bom mainitud agianst tahes kirje
+DocType: Restaurant,Invoice Series Prefix,Arve seeria prefiks
 DocType: Employee,Previous Work Experience,Eelnev töökogemus
 DocType: Stock Entry,For Quantity,Sest Kogus
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Palun sisestage Planeeritud Kogus jaoks Punkt {0} real {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Palun sisestage Planeeritud Kogus jaoks Punkt {0} real {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} ei ole esitatud
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Taotlused esemeid.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Eraldi tootmise Selleks luuakse iga valmistoote hea objekt.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} peab olema negatiivne vastutasuks dokumendi
 ,Minutes to First Response for Issues,Protokoll First Response küsimustes
 DocType: Purchase Invoice,Terms and Conditions1,Tingimused ja tingimuste kohta1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,"Nimi instituut, mida te Selle süsteemi rajamisel."
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,"Nimi instituut, mida te Selle süsteemi rajamisel."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Raamatupidamise kirje külmutatud kuni see kuupäev, keegi ei saa / muuda kande arvatud rolli allpool."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Palun dokumendi salvestada enne teeniva hooldusgraafiku
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Värskeim hind uuenes kõigis kaitsemeetmetes
 DocType: Fee Schedule,Successful,Edukas
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekti staatus
 DocType: UOM,Check this to disallow fractions. (for Nos),Vaata seda keelata fraktsioonid. (NOS)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Järgmised Tootmistellimused loodi:
-DocType: Student Admission,Naming Series (for Student Applicant),Nimetamine seeria (Student taotleja)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Järgmised Tootmistellimused loodi:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Nimetamine seeria (Student taotleja)
 DocType: Delivery Note,Transporter Name,Vedaja Nimi
 DocType: Authorization Rule,Authorized Value,Lubatud Value
 DocType: BOM,Show Operations,Näita Operations
@@ -2571,7 +2621,7 @@
 ,Employees working on a holiday,Töötajat puhkusele
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark olevik
 DocType: Project,% Complete Method,% Complete meetod
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Ravim
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Ravim
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Hooldus alguskuupäev ei saa olla enne tarnekuupäev Serial No {0}
 DocType: Production Order,Actual End Date,Tegelik End Date
 DocType: BOM,Operating Cost (Company Currency),Ekspluatatsioonikulud (firma Valuuta)
@@ -2589,19 +2639,20 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Kinnitamine Kasutaja ei saa olla sama kasutaja reegel on rakendatav
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (ühe Stock UOM)
 DocType: SMS Log,No of Requested SMS,Ei taotletud SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Palgata puhkust ei ühti heaks Jäta ostusoov arvestust
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Palgata puhkust ei ühti heaks Jäta ostusoov arvestust
 DocType: Campaign,Campaign-.####,Kampaania -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Järgmised sammud
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Esitada määratud objekte parima võimaliku määr
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Tee arve
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto sule võimalus pärast 15 päeva
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Ostukorraldused ei ole {0} jaoks lubatud {1} tulemuskaardi kohta.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Ostukorraldused ei ole {0} jaoks lubatud {1} tulemuskaardi kohta.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,End Aasta
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Plii%
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Leping End Date peab olema suurem kui Liitumis
 DocType: Vital Signs,Nutrition Values,Toitumisväärtused
 DocType: Lab Test Template,Is billable,On tasuline
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Dr {0} jaoks tuleb määrata nii &quot;Arsti ajakava&quot; kui ka kellaaeg &quot;
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Kolmas isik levitaja / edasimüüja / vahendaja / partner / edasimüüja, kes müüb ettevõtted tooted vahendustasu."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} vastu Ostutellimuse {1}
 DocType: Patient,Patient Demographics,Patsiendi demograafiline teave
@@ -2631,7 +2682,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","Standard maksu mall, mida saab rakendada kõigi ostutehingute. See mall võib sisaldada nimekirja maksu juhid ja ka teiste kulul juhid nagu &quot;Shipping&quot;, &quot;Kindlustus&quot;, &quot;Handling&quot; jt #### Märkus maksumäär Siin määratud olla hariliku maksumäära kõigile ** Kirjed * *. Kui on ** Kirjed **, mis on erineva kiirusega, tuleb need lisada ka ** Oksjoni Maksu- ** tabeli ** Oksjoni ** kapten. #### Kirjeldus veerud arvutamine 1. tüüpi: - See võib olla ** Net Kokku ** (mis on summa põhisummast). - ** On eelmise rea kokku / Summa ** (kumulatiivse maksud või maksed). Kui valite selle funktsiooni, maksu rakendatakse protsentides eelmise rea (maksu tabel) summa või kokku. - ** Tegelik ** (nagu mainitud). 2. Konto Head: Konto pearaamatu, mille alusel see maks broneeritud 3. Kulude Center: Kui maks / lõiv on sissetulek (nagu laevandus) või kulutustega tuleb kirjendada Cost Center. 4. Kirjeldus: Kirjeldus maksu (mis trükitakse arved / jutumärkideta). 5. Hinda: Maksumäär. 6. Summa: Maksu- summa. 7. Kokku: Kumulatiivne kokku selles küsimuses. 8. Sisestage Row: Kui põhineb &quot;Eelmine Row Kokku&quot; saate valida rea number, mida võtta aluseks selle arvutamine (default on eelmise rea). 9. Mõtle maksu, et: Selles sektsioonis saab määrata, kui maks / lõiv on ainult hindamise (ei kuulu kokku) või ainult kokku (ei lisa väärtust kirje) või nii. 10. Lisa või Lahutada: Kas soovite lisada või maksu maha arvata."
 DocType: Homepage,Homepage,Kodulehekülg
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Valige arst ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',vahekaart uuendatudConsultation set invoice = &#39;{0}&#39; where name = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,KONTOLE Kogus
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Fee Records Loodud - {0}
 DocType: Asset Category Account,Asset Category Account,Põhivarakategoori konto
@@ -2643,7 +2693,7 @@
 DocType: Asset,Manual,käsiraamat
 DocType: Salary Component Account,Salary Component Account,Palk Component konto
 DocType: Global Defaults,Hide Currency Symbol,Peida Valuuta Sümbol
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","nt Bank, Raha, Krediitkaart"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","nt Bank, Raha, Krediitkaart"
 DocType: Lead Source,Source Name,Allikas Nimi
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Täiskasvanu normaalne puhkevererõhk on umbes 120 mmHg süstoolne ja 80 mmHg diastoolne, lühend &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Kreeditaviis
@@ -2662,16 +2712,16 @@
 DocType: Patient,Occupation,okupatsioon
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: Start Date tuleb enne End Date
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Kokku (tk)
-DocType: Sales Invoice,This Document,See dokument
 DocType: Installation Note Item,Installed Qty,Paigaldatud Kogus
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Selle põhjuseks võib olla mõni kehtetu e-posti aadress
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Sa lisasid
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,koolitus Tulemus
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,koolitus Tulemus
 DocType: Purchase Invoice,Is Paid,makstakse
 DocType: Salary Structure,Total Earning,Kokku teenimine
 DocType: Purchase Receipt,Time at which materials were received,"Aeg, mil materjale ei laekunud"
 DocType: Stock Ledger Entry,Outgoing Rate,Väljuv Rate
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Organisatsiooni haru meister.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Organisatsiooni haru meister.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,või
 DocType: Sales Order,Billing Status,Arved staatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Teata probleemist
@@ -2686,7 +2736,8 @@
 DocType: Notification Control,Sales Order Message,Sales Order Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Vaikeväärtuste nagu firma, valuuta, jooksval majandusaastal jms"
 DocType: Payment Entry,Payment Type,Makse tüüp
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Palun valige partii Oksjoni {0}. Ei leia ühe partii, mis vastab sellele nõudele"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Palun valige partii Oksjoni {0}. Ei leia ühe partii, mis vastab sellele nõudele"
+DocType: Hub Category,Parent Category,Vanem kategooria
 DocType: Process Payroll,Select Employees,Vali Töötajad
 DocType: Opportunity,Potential Sales Deal,Potentsiaalne Sales Deal
 DocType: Complaint,Complaints,Kaebused
@@ -2723,7 +2774,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifitseerimine pakett sünnitust (trüki)
 DocType: Bin,Reserved Quantity,Reserveeritud Kogus
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Sisestage kehtiv e-posti aadress
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Palun valige üksus ostukorvi
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Palun valige üksus ostukorvi
 DocType: Landed Cost Voucher,Purchase Receipt Items,Ostutšekk Esemed
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Kohandamine vormid
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,arrear
@@ -2733,15 +2784,15 @@
 DocType: Payment Request,Amount in customer's currency,Summa kliendi valuuta
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Tarne
 DocType: Stock Reconciliation Item,Current Qty,Praegune Kogus
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Lisa tarnijaid
+DocType: Restaurant Menu,Restaurant Menu,Restoranimenüü
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Eelmine
 DocType: Appraisal Goal,Key Responsibility Area,Key Vastutus Area
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Student Partiidele aitab teil jälgida käimist, hinnanguid ja tasude õpilased"
 DocType: Payment Entry,Total Allocated Amount,Eraldati kokku
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Määra vaikimisi laoseisu konto jooksva inventuuri
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Määra vaikimisi laoseisu konto jooksva inventuuri
 DocType: Item Reorder,Material Request Type,Materjal Hankelepingu liik
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural päevikusissekanne palgad alates {0} kuni {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage on täis, ei päästa"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage on täis, ei päästa"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Conversion Factor on kohustuslik
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Toa maht
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref
@@ -2780,16 +2831,18 @@
 DocType: Project,Task Completion,ülesande täitmiseks
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Ei ole laos
 DocType: Appraisal,HR User,HR Kasutaja
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Maksude ja tasude maha
-apps/erpnext/erpnext/hooks.py +129,Issues,Issues
+apps/erpnext/erpnext/hooks.py +138,Issues,Issues
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status peab olema üks {0}
 DocType: Sales Invoice,Debit To,Kanne
+DocType: Restaurant Menu Item,Restaurant Menu Item,Restorani menüüpunkt
 DocType: Delivery Note,Required only for sample item.,Vajalik ainult proovi objekt.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Tegelik Kogus Pärast Tehing
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Ei palgatõend vahel leiti {0} ja {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Ei palgatõend vahel leiti {0} ja {1}
 ,Pending SO Items For Purchase Request,Kuni SO Kirjed osta taotlusel
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Student Sisseastujale
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} on keelatud
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Student Sisseastujale
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} on keelatud
 DocType: Supplier,Billing Currency,Arved Valuuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Väga suur
@@ -2812,6 +2865,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Palume mainida ei külastuste vaja
 DocType: Stock Settings,Default Valuation Method,Vaikimisi hindamismeetod
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,tasu
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Värskendamine toimub See võib võtta veidi aega.
 DocType: Vehicle Log,Fuel Qty,Kütus Kogus
 DocType: Production Order Operation,Planned Start Time,Planeeritud Start Time
 DocType: Course,Assessment,Hindamine
@@ -2827,7 +2881,7 @@
 DocType: Price List,Price List Master,Hinnakiri Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Kõik müügitehingud saab kodeeritud vastu mitu ** Sales Isikud ** nii et saate määrata ja jälgida eesmärgid.
 ,S.O. No.,SO No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Palun luua Klienti Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Palun luua Klienti Lead {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Valige patsient
 DocType: Price List,Applicable for Countries,Rakendatav Riigid
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Parameetri nimi
@@ -2858,27 +2912,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,Pakkuja Arve andmed
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Kulu / Difference konto ({0}) peab olema &quot;kasum või kahjum&quot; kontole
 DocType: Project,Copied From,kopeeritud
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Nimi viga: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Puudus
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Nimi viga: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,Puudus
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} ei seostatud {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Osalemine töötajate {0} on juba märgitud
 DocType: Packing Slip,If more than one package of the same type (for print),Kui rohkem kui üks pakett on sama tüüpi (trüki)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Tehke vaikeseaded restoranis seaded
 ,Salary Register,palk Registreeri
 DocType: Warehouse,Parent Warehouse,Parent Warehouse
 DocType: C-Form Invoice Detail,Net Total,Net kokku
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Vaikimisi Bom ei leitud Oksjoni {0} ja Project {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Vaikimisi Bom ei leitud Oksjoni {0} ja Project {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Määrake erinevate Laenuliigid
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Tasumata summa
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Aeg (min)
 DocType: Project Task,Working,Töö
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock Queue (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Finantsaasta
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Finantsaasta
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} ei kuulu Company {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,"Kriteeriumide skoori funktsiooni ei õnnestunud lahendada {0} jaoks. Veenduge, et valem on kehtiv."
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Maksta nii edasi
 DocType: Healthcare Settings,Out Patient Settings,Patsiendi seaded välja
 DocType: Account,Round Off,Ümardama
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Kogus peab olema positiivne
 ,Requested Qty,Taotletud Kogus
 DocType: Tax Rule,Use for Shopping Cart,Kasutage Ostukorv
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Väärtus {0} jaoks Oskus {1} ei eksisteeri nimekirja kehtib atribuut väärtused Punkt {2}
@@ -2887,7 +2943,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Maksud jagatakse proportsionaalselt aluseks on elemendi Kogus või summa, ühe oma valikut"
 DocType: Maintenance Visit,Purposes,Eesmärgid
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Atleast üks element peab olema kantud negatiivse koguse vastutasuks dokument
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Lisage kursusi
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} kauem kui ükski saadaval töötundide tööjaama {1}, murda operatsiooni mitmeks toimingud"
 ,Requested,Taotletud
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,No Märkused
@@ -2899,6 +2954,8 @@
 DocType: Employee Loan,Repaid/Closed,Tagastatud / Suletud
 DocType: Item,Total Projected Qty,Kokku prognoositakse Kogus
 DocType: Monthly Distribution,Distribution Name,Distribution nimi
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Tarnija&gt; Tarnija tüüp
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Kirje {0} jaoks ei leitud hindamismäär, mis on vajalik {1} {2} arvestuskande tegemiseks. Kui üksus tegeleb väärtusega {1} nullväärtusega, siis märkige see {1} üksuse tabelisse. Muul juhul looge objektiga saabuv varude tehing või märkige väärtuse määr kirje kirjele ja proovige seejärel selle kirje esitamist / tühistamist"
 DocType: Course,Course Code,Kursuse kood
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Kvaliteedi kontroll on vajalikud Punkt {0}
 DocType: POS Settings,Use POS in Offline Mode,Kasutage POS-i võrguühendusrežiimis
@@ -2909,14 +2966,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Manage Territory Tree.
 DocType: Journal Entry Account,Sales Invoice,Müügiarve
 DocType: Journal Entry Account,Party Balance,Partei Balance
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,Palun valige Rakenda soodustust
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Palun valige Rakenda soodustust
 DocType: Company,Default Receivable Account,Vaikimisi võlgnevus konto
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Loo Bank kirjet kogu palka eespool valitud kriteeriumid
 DocType: Physician,Physician Schedule,Arsti ajakava
 DocType: Purchase Invoice,Deemed Export,Kaalutud eksport
 DocType: Stock Entry,Material Transfer for Manufacture,Material Transfer tootmine
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Soodus protsent võib rakendada kas vastu Hinnakiri või kõigi hinnakiri.
-DocType: Purchase Invoice,Half-yearly,Poolaasta-
+DocType: Subscription,Half-yearly,Poolaasta-
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Raamatupidamine kirjet Stock
 DocType: Lab Test,LabTest Approver,LabTest heakskiitja
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Olete juba hinnanud hindamise kriteeriumid {}.
@@ -2945,13 +3002,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Mikroskoopilises
 DocType: Company,Standard Template,standard Template
 DocType: Training Event,Theory,teooria
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Hoiatus: Materjal Taotletud Kogus alla Tellimuse Miinimum Kogus
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Hoiatus: Materjal Taotletud Kogus alla Tellimuse Miinimum Kogus
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Konto {0} on külmutatud
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juriidilise isiku / tütarettevõtte eraldi kontoplaani kuuluv organisatsioon.
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Toit, jook ja tubakas"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Kas ainult tasuda vastu unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Komisjoni määr ei või olla suurem kui 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Kas ainult tasuda vastu unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Komisjoni määr ei või olla suurem kui 100
 DocType: Stock Entry,Subcontract,Alltöövõtuleping
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Palun sisestage {0} Esimene
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Ei vastuseid
@@ -2969,10 +3026,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Värv
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Hindamise kava kriteeriumid
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Vältida ostutellimusi
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Tundlik
 DocType: Patient Appointment,Scheduled,Plaanitud
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Hinnapäring.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Palun seadke töötaja nimesüsteem inimressurss&gt; HR-seaded
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Palun valige Punkt, kus &quot;Kas Stock Punkt&quot; on &quot;Ei&quot; ja &quot;Kas Sales Punkt&quot; on &quot;jah&quot; ja ei ole muud Toote Bundle"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Valige klient
 DocType: Student Log,Academic,Akadeemiline
 DocType: Patient,Personal and Social History,Isiklik ja sotsiaalne ajalugu
 DocType: Fee Schedule,Fee Breakup for each student,Tasu lõhe iga õpilase kohta
@@ -2982,7 +3040,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Hindamine Rate
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,diisel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Hinnakiri Valuuta ole valitud
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Hinnakiri Valuuta ole valitud
 apps/erpnext/erpnext/config/healthcare.py +46,Results,tulemused
 ,Student Monthly Attendance Sheet,Student Kuu osavõtt Sheet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Töötaja {0} on juba taotlenud {1} vahel {2} ja {3}
@@ -2997,7 +3055,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Manage Sales Partners.
 DocType: Quality Inspection,Inspection Type,Ülevaatus Type
 DocType: Fee Validity,Visited yet,Külastatud veel
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Laod olemasolevate tehing ei ole ümber rühmitada.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Laod olemasolevate tehing ei ole ümber rühmitada.
 DocType: Assessment Result Tool,Result HTML,tulemus HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Aegub
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Lisa Õpilased
@@ -3024,7 +3082,7 @@
 DocType: Healthcare Settings,Result Printed,Tulemus trükitud
 DocType: Asset Category Account,Depreciation Expense Account,Amortisatsioonikulu konto
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Katseaeg
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Kuva {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Kuva {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Ainult tipud on lubatud tehingut
 DocType: Expense Claim,Expense Approver,Kulu Approver
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Row {0}: Advance vastu Klient peab olema krediidi
@@ -3035,7 +3093,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Et Date
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Muidugi Graafikud välja:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Logid säilitamiseks sms tarneseisust
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Määra müügi sihtmärk
 DocType: Accounts Settings,Make Payment via Journal Entry,Tee makse kaudu päevikusissekanne
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,trükitud
 DocType: Item,Inspection Required before Delivery,Ülevaatus Vajalik enne sünnitust
@@ -3043,7 +3100,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Kuni Tegevused
 DocType: Patient Appointment,Reminded,Meenutas
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,teie organisatsiooni
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,teie organisatsiooni
 DocType: Fee Component,Fees Category,Tasud Kategooria
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Palun sisestage leevendab kuupäeva.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
@@ -3055,7 +3112,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reorder Level
 DocType: Company,Chart Of Accounts Template,Kontoplaani Mall
 DocType: Attendance,Attendance Date,Osavõtt kuupäev
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Toode Hind uuendatud {0} Hinnakirjas {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Toode Hind uuendatud {0} Hinnakirjas {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Palk väljasõit põhineb teenimine ja mahaarvamine.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Konto tütartippu ei saa ümber arvestusraamatust
 DocType: Purchase Invoice Item,Accepted Warehouse,Aktsepteeritud Warehouse
@@ -3071,9 +3128,10 @@
 ,Employee Birthday,Töötaja Sünnipäev
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Partii osavõtt Tool
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,Limit Crossed
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Planeeritud kuni
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Akadeemilise perspektiivis selle &quot;Academic Year &#39;{0} ja&quot; Term nimi &quot;{1} on juba olemas. Palun muuda neid sissekandeid ja proovi uuesti.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Nagu on olemasolevate tehingute vastu objekti {0}, sa ei saa muuta väärtust {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Nagu on olemasolevate tehingute vastu objekti {0}, sa ei saa muuta väärtust {1}"
 DocType: UOM,Must be Whole Number,Peab olema täisarv
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Uus Lehed Eraldatud (päevades)
 DocType: Purchase Invoice,Invoice Copy,arve koopia
@@ -3083,7 +3141,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Arve number
 DocType: Shopping Cart Settings,Orders,Tellimused
 DocType: Employee Leave Approver,Leave Approver,Jäta Approver
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Palun valige partii
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Palun valige partii
 DocType: Assessment Group,Assessment Group Name,Hinnang Grupi nimi
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materjal üleantud tootmine
 DocType: Expense Claim,"A user with ""Expense Approver"" role",Kasutaja on &quot;Expense Approver&quot; rolli
@@ -3098,7 +3156,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Periood sulgemine Entry
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Vali osakond ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Cost Center olemasolevate tehingut ei saa ümber rühm
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Summa {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Summa {0} {1} {2} {3}
 DocType: Account,Depreciation,Amortisatsioon
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Pakkuja (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Töötaja osalemise Tool
@@ -3109,10 +3167,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,Makse Sissekanded {0} on un-seotud
 DocType: GL Entry,Voucher No,Voucher ei
 ,Lead Owner Efficiency,Lead Omanik Efficiency
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Kõige populaarsem
 DocType: Leave Allocation,Leave Allocation,Jäta jaotamine
 DocType: Payment Request,Recipient Message And Payment Details,Saaja sõnum ja makse detailid
 DocType: Training Event,Trainer Email,treener Post
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Materjal Taotlused {0} loodud
+DocType: Restaurant Reservation,No of People,Inimeste arv
 DocType: Production Planning Tool,Include sub-contracted raw materials,Kaasa allhanked tooraine
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Mall terminite või leping.
 DocType: Purchase Invoice,Address and Contact,Aadress ja Kontakt
@@ -3121,10 +3181,11 @@
 DocType: Supplier,Last Day of the Next Month,Viimane päev järgmise kuu
 DocType: Support Settings,Auto close Issue after 7 days,Auto lähedale Issue 7 päeva pärast
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Jäta ei saa eraldada enne {0}, sest puhkuse tasakaal on juba carry-edastas tulevikus puhkuse jaotamise rekord {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Märkus: Tänu / Viitekuupäev ületab lubatud klientide krediidiriski päeva {0} päeva (s)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Märkus: Tänu / Viitekuupäev ületab lubatud klientide krediidiriski päeva {0} päeva (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student esitaja
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL vastuvõtvate
 DocType: Asset Category Account,Accumulated Depreciation Account,Akumuleeritud kulum konto
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,See meil on automaatselt genereeritud
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock kanded
 DocType: Program Enrollment,Boarding Student,boarding Student
 DocType: Asset,Expected Value After Useful Life,Oodatud väärtus pärast Kasulik Elu
@@ -3132,7 +3193,7 @@
 DocType: Activity Cost,Billing Rate,Arved Rate
 ,Qty to Deliver,Kogus pakkuda
 ,Stock Analytics,Stock Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Toiminguid ei saa tühjaks jätta
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Toiminguid ei saa tühjaks jätta
 DocType: Maintenance Visit Purpose,Against Document Detail No,Vastu Dokumendi Detail Ei
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Partei Type on kohustuslik
 DocType: Quality Inspection,Outgoing,Väljuv
@@ -3154,7 +3215,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Valige õpilast käsitsi tegevuspõhise Group
 DocType: Journal Entry,User Remark,Kasutaja Märkus
 DocType: Lead,Market Segment,Turusegment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Paide summa ei saa olla suurem kui kogu negatiivne tasumata summa {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Paide summa ei saa olla suurem kui kogu negatiivne tasumata summa {0}
 DocType: Supplier Scorecard Period,Variables,Muutujad
 DocType: Employee Internal Work History,Employee Internal Work History,Töötaja Internal tööandjad
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Sulgemine (Dr)
@@ -3183,21 +3244,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Saada värskendusi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Konto {2} ei kuulu Company {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Materjal taotlus {0} on tühistatud või peatatud
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Jäta juhtimine
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Jäta juhtimine
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Grupi poolt konto
 DocType: Sales Order,Fully Delivered,Täielikult Tarnitakse
 DocType: Lead,Lower Income,Madalama sissetulekuga
+DocType: Restaurant Order Entry,Current Order,Praegune tellimus
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Allika ja eesmärgi lattu ei saa olla sama rida {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Erinevus konto peab olema vara / kohustuse tüübist võtta, sest see Stock leppimine on mõra Entry"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Väljastatud summa ei saa olla suurem kui Laenusumma {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Avage programmid
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Ostutellimuse numbri vaja Punkt {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Tootmise et mitte loodud
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Tootmise et mitte loodud
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;From Date&quot; tuleb pärast &quot;To Date&quot;
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Selleks ei saa muuta üliõpilaste {0} on seotud õpilase taotluse {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Selleks ei saa muuta üliõpilaste {0} on seotud õpilase taotluse {1}
 DocType: Asset,Fully Depreciated,täielikult amortiseerunud
 ,Stock Projected Qty,Stock Kavandatav Kogus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Kliendi {0} ei kuulu projekti {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Kliendi {0} ei kuulu projekti {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Märkimisväärne osavõtt HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Hinnapakkumised on ettepanekuid, pakkumiste saadetud oma klientidele"
 DocType: Sales Order,Customer's Purchase Order,Kliendi ostutellimuse
@@ -3208,8 +3270,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Palun määra arv Amortisatsiooniaruanne Broneeritud
 DocType: Supplier Scorecard Period,Calculations,Arvutused
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Väärtus või Kogus
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Lavastused Tellimused ei saa tõsta jaoks:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Lavastused Tellimused ei saa tõsta jaoks:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Minut
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Palun määrake seerianumbrite nime seeria {0} abil häälestus&gt; Seaded&gt; nime seeria
 DocType: Purchase Invoice,Purchase Taxes and Charges,Ostu maksud ja tasud
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Mine pakkujatele
 ,Qty to Receive,Kogus Receive
@@ -3222,7 +3285,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Krediidi konto peab olema bilansis
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Kõik Tarnija liigid
 DocType: Global Defaults,Disable In Words,Keela sõnades
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Kood on kohustuslik, sest toode ei ole automaatselt nummerdatud"
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,"Kood on kohustuslik, sest toode ei ole automaatselt nummerdatud"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Tsitaat {0} ei tüübiga {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Hoolduskava toode
 DocType: Sales Order,%  Delivered,% Tarnitakse
@@ -3244,23 +3307,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Algsaldo Equity
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Sobitamine
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,ülejäänud
 DocType: Appraisal,Appraisal,Hinnang
 DocType: Purchase Invoice,GST Details,GST üksikasjad
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},E saadetakse tarnija {0}
+DocType: Item,Default Sales Unit of Measure,Vaikimüügi mõõtühik
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Kuupäev korratakse
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Allkirjaõiguslik
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Jäta heakskiitja peab olema üks {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Loo lõivu
-DocType: Hub Settings,Seller Email,Müüja Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Kokku ostukulud (via ostuarve)
 DocType: Training Event,Start Time,Algusaeg
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Vali Kogus
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Vali Kogus
 DocType: Customs Tariff Number,Customs Tariff Number,Tollitariifistiku number
 DocType: Patient Appointment,Patient Appointment,Patsiendi määramine
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Kinnitamine roll ei saa olla sama rolli õigusriigi kohaldatakse
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Lahku sellest Email Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Lahku sellest Email Digest
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Hankige tarnijaid
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} ei leitud üksusele {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Mine kursustele
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Sõnum saadetud
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Konto tütartippu ei saa seada pearaamatu
@@ -3273,11 +3339,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Materjal üleantud tootmine
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Konto {0} ei ole olemas
 DocType: Project,Project Type,Projekti tüüp
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Selle ülesande jaoks on olemas lapse ülesanne. Seda ülesannet ei saa kustutada.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Kas eesmärk Kogus või Sihtsummaks on kohustuslik.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Kulude erinevate tegevuste
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Rohkem tulemusi pole
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Kulude erinevate tegevuste
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Seadistamine Sündmused {0}, kuna töötaja juurde allpool müügiisikuid ei ole Kasutaja ID {1}"
 DocType: Timesheet,Billing Details,Arved detailid
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Allika ja eesmärgi ladu peavad olema erinevad
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Allika ja eesmärgi ladu peavad olema erinevad
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Ei ole lubatud uuendada laos tehingute vanem kui {0}
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Täielikult Maksustatakse
@@ -3303,7 +3371,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Raha telegraafiülekanne
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Vaata kõiki
 DocType: Vehicle Log,Invoice Ref,arve Ref
-DocType: Purchase Order,Recurring Order,Korduvad Telli
 DocType: Company,Default Income Account,Vaikimisi tulukonto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Kliendi Group / Klienditeenindus
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Sulgemata majandusaastale kasum / kahjum (Credit)
@@ -3317,9 +3384,9 @@
 DocType: Patient,A Negative,Negatiivne
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Midagi rohkem näidata.
 DocType: Lead,From Customer,Siit Klienditeenindus
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Kutsub
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Kutsub
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Toode
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,Partiid
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,Partiid
 DocType: Project,Total Costing Amount (via Time Logs),Kokku kuluarvestus summa (via aeg kajakad)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Tee tasu ajakava
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
@@ -3343,7 +3410,7 @@
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Lehed ja vaba
 DocType: School Settings,Current Academic Term,Praegune õppeaasta jooksul
 DocType: Sales Order,Not Billed,Ei maksustata
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Mõlemad Warehouse peavad kuuluma samasse Company
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Mõlemad Warehouse peavad kuuluma samasse Company
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,No kontakte lisada veel.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Maandus Cost Voucher summa
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Arveid tõstatatud Tarnijatele.
@@ -3352,7 +3419,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Soodus summa
 DocType: Purchase Invoice,Return Against Purchase Invoice,Tagasi Against ostuarve
 DocType: Item,Warranty Period (in days),Garantii Periood (päeva)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',update `tabPatient appointment &#39;set sale_invoice =&#39; {0} &#39;where name =&#39; {1} &#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Seos Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Rahavood äritegevusest
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punkt 4
@@ -3361,8 +3427,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Päevikusissekanne konto
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student Group
 DocType: Shopping Cart Settings,Quotation Series,Tsitaat Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Elementi on olemas sama nimega ({0}), siis muutke kirje grupi nimi või ümbernimetamiseks kirje"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Palun valige kliendile
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Elementi on olemas sama nimega ({0}), siis muutke kirje grupi nimi või ümbernimetamiseks kirje"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Palun valige kliendile
 DocType: C-Form,I,mina
 DocType: Company,Asset Depreciation Cost Center,Vara amortisatsioonikulu Center
 DocType: Sales Order Item,Sales Order Date,Sales Order Date
@@ -3371,6 +3437,7 @@
 DocType: Assessment Plan,Assessment Plan,hindamise kava
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Klient {0} on loodud.
 DocType: Stock Settings,Limit Percent,Limit protsent
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Praegu pole ühtegi ladu saadaval
 ,Payment Period Based On Invoice Date,Makse kindlaksmääramisel tuginetakse Arve kuupäev
 DocType: Sample Collection,No. of print,Prindi arv
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Kadunud Valuutavahetus ALLAHINDLUSED {0}
@@ -3426,13 +3493,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - kokku mahaarvamine - laenu tagasimakse
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,Praegune BOM ja Uus BOM saa olla samad
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Palgatõend ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Palgatõend ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Erru minemise peab olema suurem kui Liitumis
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Tekkisid vead sõiduplaani muidugi:
 DocType: Sales Invoice,Against Income Account,Sissetuleku konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Tarnitakse
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Punkt {0}: Tellitud tk {1} ei saa olla väiksem kui minimaalne tellimuse tk {2} (vastab punktis).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Punkt {0}: Tellitud tk {1} ei saa olla väiksem kui minimaalne tellimuse tk {2} (vastab punktis).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Kuu Distribution osakaal
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Palun logige sisse teise kasutajana.
 DocType: Territory,Territory Targets,Territoorium Eesmärgid
 DocType: Delivery Note,Transporter Info,Transporter Info
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Palun määra vaikimisi {0} Company {1}
@@ -3440,13 +3508,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Sama tarnija on sisestatud mitu korda
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Gross kasum / kahjum
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Ostutellimuse tooteühiku
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Firma nimi ei saa olla ettevõte
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Firma nimi ei saa olla ettevõte
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Kiri Heads print malle.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Tiitel mallide nt Esialgse arve.
 DocType: Program Enrollment,Walking,kõndimine
 DocType: Student Guardian,Student Guardian,Student Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Hindamine tüübist tasu ei märgitud Inclusive
 DocType: POS Profile,Update Stock,Värskenda Stock
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,tellimusel
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Erinevad UOM objekte viib vale (kokku) Net Weight väärtus. Veenduge, et Net Weight iga objekt on sama UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Bom Rate
 DocType: Asset,Journal Entry for Scrap,Päevikusissekanne Vanametalli
@@ -3494,15 +3563,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Süsteemi kasutaja (login) ID. Kui määratud, siis saab vaikimisi kõigi HR vormid."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: From {1}
 DocType: Task,depends_on,oleneb
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Kõigi materjalide nimekirja värskendamise järjekorras. See võib võtta paar minutit.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Kõigi materjalide nimekirja värskendamise järjekorras. See võib võtta paar minutit.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nimi uue konto. Märkus: Palun ärge kontosid luua klientide ja hankijate
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Riik tark default Aadress Templates
 DocType: Sales Order Item,Supplier delivers to Customer,Tarnija tarnib Tellija
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# vorm / Punkt / {0}) on otsas
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Tänu / Viitekuupäev ei saa pärast {0}
+,Sales Payment Summary,Müügimaksete kokkuvõte
+DocType: Restaurant,Restaurant,Restoran
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Tänu / Viitekuupäev ei saa pärast {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Andmete impordi ja ekspordi
 DocType: Patient,Account Details,Konto üksikasjad
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,No õpilased Leitud
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,No õpilased Leitud
 DocType: Medical Department,Medical Department,Meditsiini osakond
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Tarnijate tulemuskaardi hindamise kriteeriumid
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Arve Postitamise kuupäev
@@ -3513,7 +3584,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Palun valige Postitamise kuupäev enne valides Party
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Palun valige tsitaadid
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Palun valige tsitaadid
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Arv Amortisatsiooniaruanne Broneeritud ei saa olla suurem kui koguarv Amortisatsiooniaruanne
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Tee hooldus Külasta
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,"Palun pöörduge kasutaja, kes on Sales Master Manager {0} rolli"
@@ -3521,7 +3592,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Company (mitte kliendi või hankija) kapten.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,See põhineb käimist Selle Student
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Nr Õpilased
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Lisa rohkem punkte või avatud täiskujul
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Lisa rohkem punkte või avatud täiskujul
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Saatekirjad {0} tuleb tühistada enne tühistades selle Sales Order
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Mine kasutajatele
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Paide summa + maha summa ei saa olla suurem kui Grand Total
@@ -3541,37 +3612,40 @@
 DocType: Fee Schedule,Fee Schedule,Fee Ajakava
 DocType: Hub Settings,Publish Availability,Avalda saadavust
 DocType: Company,Create Chart Of Accounts Based On,Loo kontoplaani põhineb
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Ei saa teisendada selle mitterühma. Lasteülesanded on olemas.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Sünniaeg ei saa olla suurem kui täna.
 ,Stock Ageing,Stock Ageing
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Student {0} on olemas peale õpilase taotleja {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Ümardamise korrigeerimine (ettevõtte valuuta)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Töögraafik
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Töögraafik
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} &quot;{1}&quot; on keelatud
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Määra Open
 DocType: Cheque Print Template,Scanned Cheque,skaneeritud Tšekk
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Saada automaatne kirju Kontaktid esitamine tehinguid.
 DocType: Timesheet,Total Billable Amount,Kokku Arve summa
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punkt 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Telli sissekanne
 DocType: Purchase Order,Customer Contact Email,Klienditeenindus Kontakt E-
 DocType: Warranty Claim,Item and Warranty Details,Punkt ja garantii detailid
 DocType: Sales Team,Contribution (%),Panus (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Märkus: Tasumine Entry ei loonud kuna &quot;Raha või pangakonto pole määratud
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Projekt {0} on juba olemas
 DocType: Medical Department,Nursing User,Õendusabi kasutaja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Vastutus
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Selle pakkumise kehtivusaeg on lõppenud.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Selle pakkumise kehtivusaeg on lõppenud.
 DocType: Expense Claim Account,Expense Claim Account,Kuluhüvitussüsteeme konto
 DocType: Accounts Settings,Allow Stale Exchange Rates,Lubage vahetuskursi halvenemine
 DocType: Sales Person,Sales Person Name,Sales Person Nimi
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Palun sisestage atleast 1 arve tabelis
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Lisa Kasutajad
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Lisa Kasutajad
 DocType: POS Item Group,Item Group,Punkt Group
 DocType: Item,Safety Stock,kindlustusvaru
 DocType: Healthcare Settings,Healthcare Settings,Tervishoiuteenuse sätted
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Progress% ülesandega ei saa olla rohkem kui 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Progress% ülesandega ei saa olla rohkem kui 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Enne leppimist
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Maksude ja tasude lisatud (firma Valuuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Punkt Maksu- Row {0} peab olema konto tüüpi Tax või tulu või kuluna või tasuline
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Punkt Maksu- Row {0} peab olema konto tüüpi Tax või tulu või kuluna või tasuline
 DocType: Sales Order,Partly Billed,Osaliselt Maksustatakse
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Punkt {0} peab olema põhivara objektile
 DocType: Item,Default BOM,Vaikimisi Bom
@@ -3587,6 +3661,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,muutuja
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Siit Saateleht
 DocType: Student,Student Email Address,Student e-posti aadress
+DocType: Item,Hub Warehouse,Rummu laos
 DocType: Physician Schedule Time Slot,From Time,Time
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Laos:
 DocType: Notification Control,Custom Message,Custom Message
@@ -3594,9 +3669,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,Raha või pangakonto on kohustuslik makstes kirje
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Student Aadress
 DocType: Purchase Invoice,Price List Exchange Rate,Hinnakiri Vahetuskurss
+DocType: POS Profile,POS Profile Name,Posti profiili nimi
 DocType: Purchase Invoice Item,Rate,Määr
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,aadress Nimi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,aadress Nimi
 DocType: Stock Entry,From BOM,Siit Bom
 DocType: Assessment Code,Assessment Code,Hinnang kood
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Põhiline
@@ -3610,11 +3686,12 @@
 DocType: Salary Slip,Salary Structure,Palgastruktuur
 DocType: Account,Bank,Pank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Lennukompanii
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Väljaanne Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Väljaanne Material
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Korrapärase loomise ajal tekkis viga
 DocType: Material Request Item,For Warehouse,Sest Warehouse
 DocType: Employee,Offer Date,Pakkuda kuupäev
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Tsitaadid
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,"Olete võrguta režiimis. Sa ei saa uuesti enne, kui olete võrgus."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,"Olete võrguta režiimis. Sa ei saa uuesti enne, kui olete võrgus."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Ei Üliõpilasgrupid loodud.
 DocType: Purchase Invoice Item,Serial No,Seerianumber
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Igakuine tagasimakse ei saa olla suurem kui Laenusumma
@@ -3624,17 +3701,18 @@
 DocType: Salary Slip,Total Working Hours,Töötundide
 DocType: Subscription,Next Schedule Date,Järgmise ajakava kuupäev
 DocType: Stock Entry,Including items for sub assemblies,Sealhulgas esemed sub komplektid
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Sisesta väärtus peab olema positiivne
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Kõik aladel
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Sisesta väärtus peab olema positiivne
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Kõik aladel
 DocType: Purchase Invoice,Items,Esemed
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student juba registreerunud.
 DocType: Fiscal Year,Year Name,Aasta nimi
 DocType: Process Payroll,Process Payroll,Protsessi palgaarvestuse
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Seal on rohkem puhkuse kui tööpäeva sel kuul.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Seal on rohkem puhkuse kui tööpäeva sel kuul.
 DocType: Product Bundle Item,Product Bundle Item,Toote Bundle toode
 DocType: Sales Partner,Sales Partner Name,Müük Partner nimi
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Taotlus tsitaadid
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Taotlus tsitaadid
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimaalne Arve summa
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hematoloogia
 DocType: Normal Test Items,Normal Test Items,Tavalised testüksused
 DocType: Student Language,Student Language,Student keel
 apps/erpnext/erpnext/config/selling.py +23,Customers,kliendid
@@ -3645,10 +3723,11 @@
 DocType: Issue,Opening Time,Avamine aeg
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Ja sealt soovitud vaja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Väärtpaberite ja kaubabörsil
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Vaikimisi mõõtühik Variant &quot;{0}&quot; peab olema sama, Mall &quot;{1}&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Vaikimisi mõõtühik Variant &quot;{0}&quot; peab olema sama, Mall &quot;{1}&quot;"
 DocType: Shipping Rule,Calculate Based On,Arvuta põhineb
 DocType: Delivery Note Item,From Warehouse,Siit Warehouse
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Ei objektid Materjaliandmik et Tootmine
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Ei objektid Materjaliandmik et Tootmine
+DocType: Restaurant,Default Customer,Vaikimisi klient
 DocType: Assessment Plan,Supervisor Name,Juhendaja nimi
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Ärge kinnitage, kas kohtumine on loodud samal päeval"
 DocType: Program Enrollment Course,Program Enrollment Course,Programm Registreerimine Course
@@ -3675,7 +3754,7 @@
 DocType: Payment Entry,Internal Transfer,Siseülekandevormi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Lapse konto olemas selle konto. Sa ei saa selle konto kustutada.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Kas eesmärk Kogus või Sihtsummaks on kohustuslik
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},No default Bom olemas Punkt {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},No default Bom olemas Punkt {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Palun valige Postitamise kuupäev esimest
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Avamise kuupäev peaks olema enne sulgemist kuupäev
 DocType: Leave Control Panel,Carry Forward,Kanda
@@ -3710,6 +3789,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Kokku olevik
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,raamatupidamise aastaaruanne
 DocType: Drug Prescription,Hour,Tund
+DocType: Restaurant Order Entry,Last Sales Invoice,Viimane müügiarve
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,New Serial No ei ole Warehouse. Ladu peab ette Stock Entry või ostutšekk
 DocType: Lead,Lead Type,Plii Type
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Teil ei ole kiita lehed Block kuupäevad
@@ -3744,64 +3824,66 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Kasutajate loomine
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,gramm
 DocType: Supplier Scorecard,Per Month,Kuus
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Kogus et Tootmine peab olema suurem kui 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Kogus et Tootmine peab olema suurem kui 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Külasta aruande hooldus kõne.
 DocType: Stock Entry,Update Rate and Availability,Värskenduskiirus ja saadavust
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Osakaal teil on lubatud vastu võtta või pakkuda rohkem vastu tellitav kogus. Näiteks: Kui olete tellinud 100 ühikut. ja teie toetus on 10%, siis on lubatud saada 110 ühikut."
 DocType: POS Customer Group,Customer Group,Kliendi Group
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Uus Partii nr (valikuline)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Uus Partii nr (valikuline)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Kulu konto on kohustuslik element {0}
 DocType: BOM,Website Description,Koduleht kirjeldus
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Net omakapitali
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Uusim
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Palun tühistada ostuarve {0} esimene
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-posti aadress peab olema unikaalne, juba olemas {0}"
 DocType: Serial No,AMC Expiry Date,AMC Aegumisaja
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,kviitung
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,kviitung
 ,Sales Register,Müügiregister
 DocType: Daily Work Summary Settings Company,Send Emails At,Saada e-kirju
 DocType: Quotation,Quotation Lost Reason,Tsitaat Lost Reason
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Vali oma Domeeni
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',"vali * sakkPatient, kus nimi = &#39;{0}&#39;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Tehingu viitenumber {0} kuupäevast {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Tehingu viitenumber {0} kuupäevast {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ei ole midagi muuta.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Vormi vaade
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Kokkuvõte Selle kuu ja kuni tegevusi
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Vormi vaade
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Kokkuvõte Selle kuu ja kuni tegevusi
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Lisage oma organisatsiooni kasutajaid, välja arvatud teie ise."
 DocType: Customer Group,Customer Group Name,Kliendi Group Nimi
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Nr Kliendid veel!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Nr Kliendid veel!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Rahavoogude aruanne
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Laenusumma ei tohi ületada Maksimaalne laenusumma {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,litsents
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Palun eemalda see Arve {0} on C-vorm {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Palun eemalda see Arve {0} on C-vorm {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Palun valige kanda, kui soovite ka lisada eelnenud eelarveaasta saldo jätab see eelarveaastal"
 DocType: GL Entry,Against Voucher Type,Vastu Voucher Type
 DocType: Physician,Phone (R),Telefon (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Ajakohad on lisatud
 DocType: Item,Attributes,Näitajad
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Malli lubamine
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Palun määrake seerianumbrite nime seeria {0} abil häälestus&gt; Seaded&gt; nime seeria
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Palun sisestage maha konto
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Viimati Order Date
 DocType: Patient,B Negative,B on negatiivne
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konto {0} ei kuuluv ettevõte {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Seerianumbrid järjest {0} ei ühti saateleht
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Seerianumbrid järjest {0} ei ühti saateleht
 DocType: Student,Guardian Details,Guardian detailid
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark õpib mitu töötajat
 DocType: Vehicle,Chassis No,Tehasetähis
 DocType: Payment Request,Initiated,Algatatud
 DocType: Production Order,Planned Start Date,Kavandatav alguskuupäev
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Valige BOM
 DocType: Serial No,Creation Document Type,Loomise Dokumendi liik
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Lõppkuupäev peab olema suurem kui alguskuupäev
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Lõppkuupäev peab olema suurem kui alguskuupäev
 DocType: Leave Type,Is Encash,Kas kasseerima
 DocType: Leave Allocation,New Leaves Allocated,Uus Lehed Eraldatud
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projekti tark andmed ei ole kättesaadavad Tsitaat
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Lõpeta
 DocType: Project,Expected End Date,Oodatud End Date
 DocType: Budget Account,Budget Amount,Eelarve summa
 DocType: Appraisal Template,Appraisal Template Title,Hinnang Mall Pealkiri
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Siit kuupäev {0} Töötajaportaali {1} ei saa enne töötaja liitumise kuupäev {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Kaubanduslik
 DocType: Patient,Alcohol Current Use,Alkoholi praegune kasutamine
+DocType: Student Admission Program,Student Admission Program,Tudengite vastuvõtu programm
 DocType: Payment Entry,Account Paid To,Konto Paide
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent Punkt {0} ei tohi olla laoartikkel
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Kõik tooted või teenused.
@@ -3810,30 +3892,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} eelarve konto {1} vastu {2} {3} on {4}. See ületa {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Rida {0} # Konto tüüp peab olema &quot;Põhivarade&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Out Kogus
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Reeglid arvutada laevandus summa müük
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,ja unchcked keelatud
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Seeria on kohustuslik
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finantsteenused
 DocType: Student Sibling,Student ID,Õpilase ID
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Tüübid tegevused aeg kajakad
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Tarnija e-post
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Tüübid tegevused aeg kajakad
 DocType: Tax Rule,Sales,Läbimüük
 DocType: Stock Entry Detail,Basic Amount,Põhisummat
 DocType: Training Event,Exam,eksam
 DocType: Complaint,Complaint,Kaebus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Ladu vajalik varude Punkt {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Ladu vajalik varude Punkt {0}
 DocType: Leave Allocation,Unused leaves,Kasutamata lehed
 DocType: Patient,Alcohol Past Use,Alkoholi varasem kasutamine
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Kr
 DocType: Tax Rule,Billing State,Arved riik
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Tõmba plahvatas Bom (sh sõlmed)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Tõmba plahvatas Bom (sh sõlmed)
 DocType: Authorization Rule,Applicable To (Employee),Suhtes kohaldatava (töötaja)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Tähtaeg on kohustuslik
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Tähtaeg on kohustuslik
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Juurdekasv Oskus {0} ei saa olla 0
 DocType: Journal Entry,Pay To / Recd From,Pay / KONTOLE From
 DocType: Naming Series,Setup Series,Setup Series
 DocType: Payment Reconciliation,To Invoice Date,Et arve kuupäevast
 DocType: Supplier,Contact HTML,Kontakt HTML
 ,Inactive Customers,Passiivne Kliendid
+DocType: Student Admission Program,Maximum Age,Maksimaalne vanus
 DocType: Landed Cost Voucher,LCV,VTS
 DocType: Landed Cost Voucher,Purchase Receipts,Ostutšekid
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Kuidas Hinnakujundus kehtib reegel?
@@ -3852,6 +3936,7 @@
 DocType: GL Entry,Remarks,Märkused
 DocType: Payment Entry,Account Paid From,Konto makstud
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Kood
+DocType: Task,Parent Task,Vanemate ülesanne
 DocType: Journal Entry,Write Off Based On,Kirjutage Off põhineb
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Tee Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Prindi ja Stationery
@@ -3860,18 +3945,18 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",Palk juba töödeldud ajavahemikus {0} ja {1} Jäta taotlemise tähtaeg ei või olla vahel selles ajavahemikus.
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Paigaldamine rekord Serial No.
 DocType: Guardian Interest,Guardian Interest,Guardian Intress
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,POS-arvete vaikeväärtuste seadistamine
 apps/erpnext/erpnext/config/hr.py +177,Training,koolitus
 DocType: Timesheet,Employee Detail,töötaja Detail
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Saatke ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,Järgmine kuupäev päev ja Korda päev kuus peab olema võrdne
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Järgmine kuupäev päev ja Korda päev kuus peab olema võrdne
 DocType: Lab Prescription,Test Code,Testi kood
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Seaded veebisaidi avalehel
 DocType: Offer Letter,Awaiting Response,Vastuse ootamine
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Ülal
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Kogusumma {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Vale atribuut {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Kogusumma {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Vale atribuut {0} {1}
 DocType: Supplier,Mention if non-standard payable account,"Mainida, kui mittestandardsete makstakse konto"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Sama toode on kantud mitu korda. {Nimekirja}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Palun valige hindamise rühm kui &quot;Kõik Hindamine Grupid&quot;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Rida {0}: üksuse {1} jaoks on vaja kulude keskmist
 DocType: Training Event Employee,Optional,Valikuline
@@ -3894,19 +3979,20 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Cost Center on kohustuslik Punkt {2}
 DocType: Vehicle,Policy No,poliitika pole
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Võta Kirjed Toote Bundle
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Kuna vara on olemas objekti {0} vastu, siis ei saa lubada variante vara"
 DocType: Asset,Straight Line,Sirgjoon
 DocType: Project User,Project User,projekti Kasutaja
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,lõhe
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,lõhe
 DocType: GL Entry,Is Advance,Kas Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Osavõtt From kuupäev ja kohalolijate kuupäev on kohustuslik
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,Palun sisestage &quot;on sisse ostetud&quot; kui jah või ei
+DocType: Item,Default Purchase Unit of Measure,Vaikimisi ostuühik
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Viimase Side kuupäev
 DocType: Sales Team,Contact No.,Võta No.
 DocType: Bank Reconciliation,Payment Entries,makse Sissekanded
 DocType: Production Order,Scrap Warehouse,Vanametalli Warehouse
 DocType: Production Order,Check if material transfer entry is not required,"Kontrollige, kas materjali üleandmise kande ei nõuta"
 DocType: Program Enrollment Tool,Get Students From,Saada üliõpilast
-DocType: Hub Settings,Seller Country,Müüja Riik
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Avalda Kirjed Koduleht
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Group õpilased partiidena
 DocType: Authorization Rule,Authorization Rule,Luba reegel
@@ -3916,7 +4002,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Müük maksud ja tasud Mall
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Kokku (Credit)
 DocType: Repayment Schedule,Payment Date,maksekuupäev
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Uus Partii Kogus
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Uus Partii Kogus
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Rõivad ja aksessuaarid
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,"Kaalutud skoori funktsiooni ei õnnestunud lahendada. Veenduge, et valem on kehtiv."
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Järjekorranumber
@@ -3934,6 +4020,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rida # {0}: Asset {1} ei saa esitada, siis on juba {2}"
 DocType: Tax Rule,Billing Country,Arved Riik
 DocType: Purchase Order Item,Expected Delivery Date,Oodatud Toimetaja kuupäev
+DocType: Restaurant Order Entry,Restaurant Order Entry,Restorani korralduse sissekanne
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Deebeti ja kreediti ole võrdsed {0} # {1}. Erinevus on {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Esinduskulud
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Tee Materjal taotlus
@@ -3946,9 +4033,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Konto olemasolevate tehingu ei saa kustutada
 DocType: Vehicle,Last Carbon Check,Viimati Carbon Check
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Kohtukulude
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Palun valige kogus real
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Palun valige kogus real
 DocType: Purchase Invoice,Posting Time,Foorumi aeg
 DocType: Timesheet,% Amount Billed,% Arve summa
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Kellaaja määramine&quot; pole määratud Dr {0} -ni. Lisage see arsti kaptenisse.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefoni kulud
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Märgi see, kui soovid sundida kasutajal valida rida enne salvestamist. Ei toimu vaikimisi, kui te vaadata seda."
@@ -3959,6 +4047,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Uus klient tulud
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Sõidukulud
 DocType: Maintenance Visit,Breakdown,Lagunema
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Lisage kohandatud väljal liitumine doctypes {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Konto: {0} valuuta: {1} ei saa valida
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Värskendage BOM-i automaatselt Scheduleri kaudu, tuginedes kõige värskemale hindamismäärale / hinnakirja hinnale / toorainete viimasele ostuhinnale."
 DocType: Bank Reconciliation Detail,Cheque Date,Tšekk kuupäev
@@ -3983,7 +4072,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Arve summa (via aeg kajakad)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Tarnija Id
 DocType: Payment Request,Payment Gateway Details,Payment Gateway Detailid
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Kogus peaks olema suurem kui 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Kogus peaks olema suurem kui 0
 DocType: Journal Entry,Cash Entry,Raha Entry
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Tütartippu saab ainult alusel loodud töörühm tüüpi sõlmed
 DocType: Leave Application,Half Day Date,Pool päeva kuupäev
@@ -4001,12 +4090,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Märkus: Punkt {0} sisestatud mitu korda
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Kõik kontaktid.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Ettevõte lühend
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Kasutaja {0} ei ole olemas
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Kasutaja {0} ei ole olemas
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Lühend
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Makse Entry juba olemas
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ei authroized kuna {0} ületab piirid
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Palk malli kapten.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Patoloogia
+DocType: Restaurant Order Entry,Restaurant Table,Restoran Tabel
 DocType: Leave Type,Max Days Leave Allowed,Max päeval minnakse lubatud
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Määra maksueeskiri ostukorv
 DocType: Purchase Invoice,Taxes and Charges Added,Maksude ja tasude lisatud
@@ -4018,10 +4109,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Hinnapakkumisi Leads või klientidele.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Role Lubatud muuta külmutatud laos
 ,Territory Target Variance Item Group-Wise,Territoorium Target Dispersioon Punkt Group-Wise
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Kõik kliendigruppide
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Kõik kliendigruppide
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,kogunenud Kuu
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} on kohustuslik. Ehk Valuutavahetus rekord ei ole loodud {1} on {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Maksu- vorm on kohustuslik.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Maksu- vorm on kohustuslik.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Konto {0}: Parent konto {1} ei ole olemas
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Hinnakiri Rate (firma Valuuta)
 DocType: Products Settings,Products Settings,tooted seaded
@@ -4047,12 +4138,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Punkt Wise Maksu- Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Instituut lühend
 ,Item-wise Price List Rate,Punkt tark Hinnakiri Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Tarnija Tsitaat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Tarnija Tsitaat
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Sõnades on nähtav, kui salvestate pakkumise."
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Kogus ({0}) ei saa olla vaid murdosa reas {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Lugu {0} on juba kasutatud Punkt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Lugu {0} on juba kasutatud Punkt {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Reeglid lisamiseks postikulud.
 DocType: Item,Opening Stock,algvaru
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Klient on kohustatud
@@ -4070,9 +4161,8 @@
 DocType: Customer,From Lead,Plii
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Tellimused lastud tootmist.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Vali Fiscal Year ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS Profile vaja teha POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS Profile vaja teha POS Entry
 DocType: Program Enrollment Tool,Enroll Students,õppima üliõpilasi
-DocType: Hub Settings,Name Token,Nimi Token
 DocType: Lab Test,Approved Date,Heakskiidetud kuupäev
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Atleast üks ladu on kohustuslik
@@ -4090,7 +4180,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Inimressurss
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Makse leppimise maksmine
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,TULUMAKSUVARA
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Tootmise Tellimuse olnud {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Tootmise Tellimuse olnud {0}
 DocType: BOM Item,BOM No,Bom pole
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Päevikusissekanne {0} ei ole kontot {1} või juba sobivust teiste voucher
@@ -4110,7 +4200,7 @@
 DocType: Currency Exchange,To Currency,Et Valuuta
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Laske järgmised kasutajad kinnitada Jäta taotlused blokeerida päeva.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Tüübid kulude langus.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Müük määr eset {0} on madalam tema {1}. Müük kiirus olema atleast {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Müük määr eset {0} on madalam tema {1}. Müük kiirus olema atleast {2}
 DocType: Item,Taxes,Maksud
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Paide ja ei ole esitanud
 DocType: Project,Default Cost Center,Vaikimisi Cost Center
@@ -4124,15 +4214,15 @@
 DocType: Employee Loan,Fully Disbursed,täielikult välja
 DocType: Maintenance Visit,Customer Feedback,Kliendi tagasiside
 DocType: Account,Expense,Kulu
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Skoor ei saa olla suurem kui maksimaalne tulemus
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Skoor ei saa olla suurem kui maksimaalne tulemus
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Kliendid ja tarnijad
 DocType: Item Attribute,From Range,Siit Range
 DocType: BOM,Set rate of sub-assembly item based on BOM,Määrake alamkogu objekti määr vastavalt BOM-ile
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Süntaksi viga valemis või seisund: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Süntaksi viga valemis või seisund: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Igapäevase töö kokkuvõte Seaded Company
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,"Punkt {0} ignoreerida, sest see ei ole laoartikkel"
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Saada see Production Tellimus edasiseks töötlemiseks.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Saada see Production Tellimus edasiseks töötlemiseks.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Et ei kohaldata Hinnakujundus reegel konkreetne tehing, kõik kohaldatavad Hinnakujundusreeglid tuleks keelata."
 DocType: Assessment Group,Parent Assessment Group,Parent hindamine Group
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Tööturg
@@ -4149,12 +4239,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Määrake Company filtreerida tühjaks, kui rühm Autor on &quot;Firma&quot;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Postitamise kuupäev ei saa olla tulevikus
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} ei ühti {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,korduvate andmete genereerimiseks
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Casual Leave
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Lab Test UOM.
 DocType: Batch,Batch ID,Partii nr
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Märkus: {0}
 ,Delivery Note Trends,Toimetaja märkus Trends
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Nädala kokkuvõte
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Nädala kokkuvõte
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Laos Kogus
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Konto: {0} saab uuendada ainult läbi Stock Tehingud
 DocType: Student Group Creation Tool,Get Courses,saada Kursused
@@ -4168,7 +4259,6 @@
 DocType: Purchase Order,To Bill,Et Bill
 DocType: Material Request,% Ordered,% Tellitud
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Kursuse aluseks Student Group, muidugi on kinnitatud iga tudeng õpib Kursused programmi Registreerimine."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Sisesta e-posti aadress komadega eraldatult, arve saadetakse automaatselt teatud kuupäeva"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Tükitöö
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Keskm. Ostmine Rate
 DocType: Task,Actual Time (in Hours),Tegelik aeg (tundides)
@@ -4182,7 +4272,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Punkt {0} ei ole setup Serial nr. Kolonn peab olema tühi
 DocType: Accounts Settings,Accounts Settings,Kontod Seaded
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,kinnitama
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Ei esitata tulemust
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Ei esitata tulemust
 DocType: Customer,Sales Partner and Commission,Müük Partner ja komisjoni
 DocType: Employee Loan,Rate of Interest (%) / Year,Intressimäär (%) / Aasta
 ,Project Quantity,projekti Kogus
@@ -4194,55 +4284,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Black
 DocType: BOM Explosion Item,BOM Explosion Item,Bom Explosion toode
 DocType: Account,Auditor,Audiitor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} tooted on valmistatud
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} tooted on valmistatud
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Lisateave
 DocType: Cheque Print Template,Distance from top edge,Kaugus ülemine serv
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Hinnakiri {0} on keelatud või ei ole olemas
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Hinnakiri {0} on keelatud või ei ole olemas
 DocType: Purchase Invoice,Return,Tagasipöördumine
 DocType: Production Order Operation,Production Order Operation,Tootmine Tellimus operatsiooni
 DocType: Pricing Rule,Disable,Keela
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Maksmise viis on kohustatud makse
 DocType: Project Task,Pending Review,Kuni Review
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Ametikohad ja konsultatsioonid
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ei kaasati Partii {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ei kaasati Partii {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} ei saa lammutada, sest see on juba {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Kogukulude nõue (via kuluhüvitussüsteeme)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark leidu
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rida {0}: valuuta Bom # {1} peaks olema võrdne valitud valuuta {2}
 DocType: Journal Entry Account,Exchange Rate,Vahetuskurss
 DocType: Patient,Additional information regarding the patient,Täiendav teave patsiendi kohta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Sales Order {0} ei ole esitatud
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Sales Order {0} ei ole esitatud
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Fee Component
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Fleet Management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Lisa esemed
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Fleet Management
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Lisa esemed
 DocType: Cheque Print Template,Regular,regulaarne
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Kokku weightage kõik Hindamiskriteeriumid peavad olema 100%
-DocType: BOM,Last Purchase Rate,Viimati ostmise korral
+DocType: Purchase Order Item,Last Purchase Rate,Viimati ostmise korral
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Ülesanne nr
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Stock saa esineda Punkt {0}, kuna on variandid"
 DocType: Lab Test,Mobile,Mobiilne
 ,Sales Person-wise Transaction Summary,Müük isikuviisilist Tehing kokkuvõte
 DocType: Training Event,Contact Number,Kontakt arv
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Ladu {0} ei ole olemas
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registreeru For ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Ladu {0} ei ole olemas
 DocType: Monthly Distribution,Monthly Distribution Percentages,Kuu jaotusprotsentide
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Valitud parameetrit ei ole partii
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Hindamine määr ei leitud Punkt {0}, mis on vaja teha, raamatupidamise kandeid {1} {2}. Kui objekt on tehinguid prooviks elemendi {1}, palume mainida, et {1} Punkt tabelis. Vastasel juhul palun luua sissetuleva börsitehingu objekt või mainimist hindamise määr Punkt rekord, ja proovige seejärel saata ühe / tühistades sõnadest"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materjalidest tarnitud vastu Saateleht
+DocType: Training Event,Has Certificate,On tunnistus
 DocType: Project,Customer Details,Kliendi andmed
 DocType: Employee,Reports to,Ettekanded
 ,Unpaid Expense Claim,Palgata kuluhüvitussüsteeme
 DocType: Payment Entry,Paid Amount,Paide summa
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Tutvuge müügitsükliga
 DocType: Assessment Plan,Supervisor,juhendaja
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,Hetkel
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,Hetkel
 ,Available Stock for Packing Items,Saadaval Stock jaoks asjade pakkimist
 DocType: Item Variant,Item Variant,Punkt Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Hinnang Tulemus Tool
 DocType: BOM Scrap Item,BOM Scrap Item,Bom Vanametalli toode
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Esitatud tellimusi ei saa kustutada
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Esitatud tellimusi ei saa kustutada
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konto jääk juba Deebetkaart, sa ei tohi seada &quot;Balance tuleb&quot; nagu &quot;Credit&quot;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Kvaliteedijuhtimine
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Punkt {0} on keelatud
@@ -4262,7 +4351,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: ajastus on vastuolus rea {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Luba Zero Hindamine Rate
 DocType: Training Event Employee,Invited,Kutsutud
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Mitu aktiivset palk Struktuurid leiti töötaja {0} jaoks antud kuupäeva
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Mitu aktiivset palk Struktuurid leiti töötaja {0} jaoks antud kuupäeva
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Setup Gateway kontosid.
 DocType: Employee,Employment Type,Tööhõive tüüp
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Põhivara
@@ -4274,7 +4363,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Student E-ID
 DocType: Employee,Notice (days),Teade (päeva)
 DocType: Tax Rule,Sales Tax Template,Sales Tax Mall
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,"Valige objekt, et salvestada arve"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,"Valige objekt, et salvestada arve"
 DocType: Employee,Encashment Date,Inkassatsioon kuupäev
 DocType: Training Event,Internet,Internet
 DocType: Special Test Template,Special Test Template,Erimudeli mall
@@ -4283,7 +4372,7 @@
 DocType: Production Order,Planned Operating Cost,Planeeritud töökulud
 DocType: Academic Term,Term Start Date,Term Start Date
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Krahv
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Saadame teile {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Saadame teile {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bank avaldus tasakaalu kohta pearaamat
 DocType: Job Applicant,Applicant Name,Taotleja nimi
 DocType: Authorization Rule,Customer / Item Name,Klienditeenindus / Nimetus
@@ -4303,7 +4392,7 @@
 DocType: Guardian,Guardian Of ,eestkostja
 DocType: Grading Scale Interval,Threshold,künnis
 DocType: BOM Update Tool,Current BOM,Praegune Bom
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Lisa Järjekorranumber
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Lisa Järjekorranumber
 DocType: Production Order Item,Available Qty at Source Warehouse,Saadaval Kogus tekkekohas Warehouse
 apps/erpnext/erpnext/config/support.py +22,Warranty,Garantii
 DocType: Purchase Invoice,Debit Note Issued,Deebetarvega
@@ -4326,10 +4415,9 @@
 DocType: Account,Receivable,Nõuete
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Ei ole lubatud muuta tarnija Ostutellimuse juba olemas
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Roll, mis on lubatud esitada tehinguid, mis ületavad laenu piirmäärade."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Vali Pane Tootmine
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Master andmete sünkroonimine, see võib võtta aega"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Vali Pane Tootmine
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Master andmete sünkroonimine, see võib võtta aega"
 DocType: Item,Material Issue,Materjal Issue
-DocType: Hub Settings,Seller Description,Müüja kirjeldus
 DocType: Employee Education,Qualification,Kvalifikatsioonikeskus
 DocType: Item Price,Item Price,Toode Hind
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Seep ja Detergent
@@ -4337,7 +4425,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Time ei saa olla suurem kui ajalt.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Tellitud
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Jätka
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Jätka
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Kui see on lubatud, siis süsteem ei värskenda mallide variante välja, vaid kopeerib allpool nimetatud väljade andmeid uue variandi tegemisel"
 DocType: Salary Detail,Component,komponent
 DocType: Assessment Criteria,Assessment Criteria Group,Hindamiskriteeriumid Group
 DocType: Healthcare Settings,Patient Name By,Patsiendi nimi
@@ -4347,7 +4436,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Palun sisestage kinnitamine Role või heaks Kasutaja
 DocType: Journal Entry,Write Off Entry,Kirjutage Off Entry
 DocType: BOM,Rate Of Materials Based On,Hinda põhinevatest materjalidest
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Tarnija&gt; Tarnija tüüp
+DocType: Item Variant Settings,Do not Update Variants,Ärge värskendage variatsioone
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Toetus Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Puhasta kõik
 DocType: POS Profile,Terms and Conditions,Tingimused
@@ -4356,7 +4445,7 @@
 DocType: Leave Block List,Applies to Company,Kehtib Company
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,"Ei saa tühistada, sest esitatud Stock Entry {0} on olemas"
 DocType: Employee Loan,Disbursement Date,Väljamakse kuupäev
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&quot;Saajaid&quot; pole täpsustatud
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&quot;Saajaid&quot; pole täpsustatud
 DocType: BOM Update Tool,Update latest price in all BOMs,Värskendage viimaseid hindu kõigis kaitsemeetmetes
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Meditsiiniline kirje
 DocType: Vehicle,Vehicle,sõiduk
@@ -4371,14 +4460,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Plii%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Amortisatsiooniaruanne ja Kaalud
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Summa {0} {1} ülekantud {2} kuni {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Summa {0} {1} ülekantud {2} kuni {3}
 DocType: Sales Invoice,Get Advances Received,Saa ettemaksed
 DocType: Email Digest,Add/Remove Recipients,Add / Remove saajad
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Tehing ei ole lubatud vastu lõpetas tootmise Tellimus {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Et määrata selle Fiscal Year as Default, kliki &quot;Set as Default&quot;"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,liituma
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,liituma
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Puuduse Kogus
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Punkt variant {0} on olemas sama atribuute
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Punkt variant {0} on olemas sama atribuute
 DocType: Employee Loan,Repay from Salary,Tagastama alates Palk
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},TELLIN tasumises {0} {1} jaoks kogus {2}
@@ -4391,7 +4480,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Sales Order toode
 DocType: Salary Slip,Payment Days,Makse päeva
 DocType: Patient,Dormant,magav
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Ladude tütartippu ei saa ümber arvestusraamatust
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Ladude tütartippu ei saa ümber arvestusraamatust
 DocType: BOM,Manage cost of operations,Manage tegevuste kuludest
 DocType: Accounts Settings,Stale Days,Stale päevad
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Kui mõni kontrollida tehinguid &quot;Esitatud&quot;, talle pop-up automaatselt avada saata e-kiri seotud &quot;kontakt&quot;, et tehing, mille tehing manusena. Kasutaja ei pruugi saata e."
@@ -4405,10 +4494,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serial No {0} on juba saanud
 ,Requested Items To Be Transferred,Taotletud üleantavate
 DocType: Expense Claim,Vehicle Log,Sõidukite Logi
-DocType: Purchase Invoice,Recurring Id,Korduvad Id
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Palaviku olemasolu (temp&gt; 38,5 ° C / 101,3 ° F või püsiv temp&gt; 38 ° C / 100,4 ° F)"
 DocType: Customer,Sales Team Details,Sales Team Üksikasjad
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Kustuta jäädavalt?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Kustuta jäädavalt?
 DocType: Expense Claim,Total Claimed Amount,Kokku nõutav summa
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potentsiaalne võimalusi müüa.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Vale {0}
@@ -4418,7 +4506,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Kaubamajad
 ,Item Delivery Date,Kauba kohaletoimetamise kuupäev
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Setup oma kooli ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Setup oma kooli ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Põhimuutus summa (firma Valuuta)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,No raamatupidamise kanded järgmiste laod
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Säästa dokumendi esimene.
@@ -4430,13 +4518,12 @@
 DocType: Task,Is Milestone,Kas Milestone
 DocType: Daily Work Summary,Email Sent To,Saadetud e-
 DocType: Budget,Warn,Hoiatama
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,"Kas olete kindel, et soovite registrist kustutada?"
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Muid märkusi, tähelepanuväärne jõupingutusi, et peaks minema arvestust."
 DocType: BOM,Manufacturing User,Tootmine Kasutaja
 DocType: Purchase Invoice,Raw Materials Supplied,Tarnitud tooraine
-DocType: Purchase Invoice,Recurring Print Format,Korduvad Prindi Formaat
 DocType: C-Form,Series,Sari
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Hinnakirja {0} vääring peab olema {1} või {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Lisage tooteid
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Hinnakirja {0} vääring peab olema {1} või {2}
 DocType: Appraisal,Appraisal Template,Hinnang Mall
 DocType: Item Group,Item Classification,Punkt klassifitseerimine
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Business Development Manager
@@ -4450,7 +4537,7 @@
 DocType: Item Attribute Value,Attribute Value,Omadus Value
 ,Itemwise Recommended Reorder Level,Itemwise Soovitatav Reorder Level
 DocType: Salary Detail,Salary Detail,palk Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Palun valige {0} Esimene
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Palun valige {0} Esimene
 DocType: Appointment Type,Physician,Arst
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Partii {0} Punkt {1} on aegunud.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Konsultatsioonid
@@ -4461,7 +4548,7 @@
 DocType: Salary Detail,Default Amount,Vaikimisi summa
 DocType: Lab Test Template,Descriptive,Kirjeldav
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Ladu ei leitud süsteemis
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Selle kuu kokkuvõte
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Selle kuu kokkuvõte
 DocType: Quality Inspection Reading,Quality Inspection Reading,Quality Inspection Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Varud Vanemad Than` peab olema väiksem kui% d päeva.
 DocType: Tax Rule,Purchase Tax Template,Ostumaks Mall
@@ -4484,12 +4571,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Koolitusi / Results
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Akumuleeritud kulum kohta
 DocType: Sales Invoice,C-Form Applicable,C-kehtival kujul
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Tööaeg peab olema suurem kui 0 operatsiooni {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Tööaeg peab olema suurem kui 0 operatsiooni {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Ladu on kohustuslik
 DocType: Supplier,Address and Contacts,Aadress ja Kontakt
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Conversion Detail
 DocType: Program,Program Abbreviation,programm lühend
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Tootmine tellimust ei ole võimalik vastu tekitatud Punkt Mall
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Tootmine tellimust ei ole võimalik vastu tekitatud Punkt Mall
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Maksud uuendatakse ostutšekk iga punkti
 DocType: Warranty Claim,Resolved By,Lahendatud
 DocType: Bank Guarantee,Start Date,Alguskuupäev
@@ -4515,26 +4602,27 @@
 DocType: Employee,Educational Qualification,Haridustsensus
 DocType: Workstation,Operating Costs,Tegevuskulud
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Action, kui kogunenud Kuu eelarve ületatud"
-DocType: Purchase Invoice,Submit on creation,Esitada kohta loomine
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Valuuta eest {0} peab olema {1}
+DocType: Subscription,Submit on creation,Esitada kohta loomine
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Valuuta eest {0} peab olema {1}
 DocType: Asset,Disposal Date,müügikuupäevaga
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Kirjad saadetakse kõigile aktiivsetele Ettevõtte töötajad on teatud tunnil, kui neil ei ole puhkus. Vastuste kokkuvõte saadetakse keskööl."
 DocType: Employee Leave Approver,Employee Leave Approver,Töötaja Jäta Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: an Reorder kirje on juba olemas selle lao {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Ei saa kuulutada kadunud, sest Tsitaat on tehtud."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,koolitus tagasiside
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: an Reorder kirje on juba olemas selle lao {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Ei saa kuulutada kadunud, sest Tsitaat on tehtud."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,koolitus tagasiside
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Tootmine Tellimus {0} tuleb esitada
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Tarnija tulemuskaardi kriteeriumid
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Palun valige Start ja lõppkuupäeva eest Punkt {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Muidugi on kohustuslik järjest {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Praeguseks ei saa enne kuupäevast alates
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Klienditeenindus Lisa / uuenda Hinnad
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Klienditeenindus Lisa / uuenda Hinnad
 DocType: Batch,Parent Batch,Vanem Partii
 DocType: Cheque Print Template,Cheque Print Template,Tšekk Prindi Mall
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Graafik kulukeskuste
 DocType: Lab Test Template,Sample Collection,Proovide kogu
 ,Requested Items To Be Ordered,Taotlenud objekte tuleb tellida
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Minu Tellimused
 DocType: Price List,Price List Name,Hinnakiri nimi
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Igapäevase töö kokkuvõte {0}
 DocType: Employee Loan,Totals,Summad
@@ -4553,12 +4641,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} ühikut {1} vaja {2} kohta {3} {4} ja {5} tehingu lõpuleviimiseks.
 DocType: Fee Schedule,Student Category,Student Kategooria
 DocType: Announcement,Student,õpilane
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Organization (osakonna) kapten.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Organization (osakonna) kapten.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Mine tuba
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Palun sisesta enne saatmist
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,Duplikaadi TARNIJA
 DocType: Email Digest,Pending Quotations,Kuni tsitaadid
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Point-of-Sale profiili
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Point-of-Sale profiili
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Lab Test Configurations.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Tagatiseta laenud
 DocType: Cost Center,Cost Center Name,Kuluüksus nimi
@@ -4568,6 +4656,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Kokku Paide Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Teated enam kui 160 tähemärki jagatakse mitu sõnumit
 DocType: Purchase Receipt Item,Received and Accepted,Saanud ja heaks kiitnud
+DocType: Hub Settings,Company and Seller Profile,Ettevõtte ja müüja profiil
 ,GST Itemised Sales Register,GST Üksikasjalikud Sales Registreeri
 ,Serial No Service Contract Expiry,Serial No Service Lepingu lõppemise
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Sa ei saa deebet- ja sama konto korraga
@@ -4577,10 +4666,11 @@
 DocType: Item,Variant Based On,Põhinev variant
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Kokku weightage määratud peaks olema 100%. On {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Sinu Tarnijad
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Palun parandage
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,"Ei saa määrata, kui on kaotatud Sales Order on tehtud."
 DocType: Request for Quotation Item,Supplier Part No,Tarnija osa pole
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Ei saa maha arvata, kui kategooria on &quot;Hindamine&quot; või &quot;Vaulation ja kokku&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Saadud
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Saadud
 DocType: Lead,Converted,Converted
 DocType: Item,Has Serial No,Kas Serial No
 DocType: Employee,Date of Issue,Väljastamise kuupäev
@@ -4588,7 +4678,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Nagu iga ostmine Seaded kui ost Olles kätte sobiv == &quot;JAH&quot;, siis luua ostuarve, kasutaja vaja luua ostutšekk esmalt toode {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Row # {0}: Vali Tarnija kirje {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Rida {0}: Tundi väärtus peab olema suurem kui null.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Koduleht Pilt {0} juurde Punkt {1} ei leitud
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Koduleht Pilt {0} juurde Punkt {1} ei leitud
 DocType: Issue,Content Type,Sisu tüüp
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Arvuti
 DocType: Item,List this Item in multiple groups on the website.,Nimekiri see toode mitmes rühmade kodulehel.
@@ -4599,14 +4689,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Võta unreconciled kanded
 DocType: Payment Reconciliation,From Invoice Date,Siit Arve kuupäev
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Teil pole luba esitada
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,Arveldusvaluuta peab olema võrdne kas vaikimisi comapany valuuta või partei konto valuuta
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Arveldusvaluuta peab olema võrdne kas vaikimisi comapany valuuta või partei konto valuuta
 DocType: Healthcare Settings,Laboratory Settings,Laboratoorsed sätted
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Jäta Inkassatsioon
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Mida ta teeb?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Et Warehouse
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Kõik Student Sisseastujale
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Mida ta teeb?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Et Warehouse
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Kõik Student Sisseastujale
 ,Average Commission Rate,Keskmine Komisjoni Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Kas Serial No&quot; ei saa olla &quot;Jah&quot; mitte-laoartikkel
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Kas Serial No&quot; ei saa olla &quot;Jah&quot; mitte-laoartikkel
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Valige olek
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Osavõtt märkida ei saa tulevikus kuupäev
 DocType: Pricing Rule,Pricing Rule Help,Hinnakujundus Reegel Abi
@@ -4624,40 +4714,40 @@
 DocType: Item,Customer Code,Kliendi kood
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Sünnipäev Meeldetuletus {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Päeva eelmisest Telli
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Kanne konto peab olema bilansis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Kanne konto peab olema bilansis
 DocType: Buying Settings,Naming Series,Nimetades Series
 DocType: Leave Block List,Leave Block List Name,Jäta Block nimekiri nimi
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Kindlustus Alguse kuupäev peaks olema väiksem kui Kindlustus Lõppkuupäev
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Palun seadke õpetaja nime süsteem koolis&gt; Kooli seaded
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Assets
 DocType: Timesheet,Production Detail,tootmise Detail
+DocType: Restaurant,Active Menu,Aktiivne menüü
 DocType: Target Detail,Target Qty,Target Kogus
 DocType: Shopping Cart Settings,Checkout Settings,Minu tellimused seaded
 DocType: Attendance,Present,Oleviku
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Toimetaja märkus {0} ei tohi esitada
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Toimetaja märkus {0} ei tohi esitada
 DocType: Notification Control,Sales Invoice Message,Müügiarve Message
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Konto sulgemise {0} tüüp peab olema vastutus / Equity
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Palgatõend töötaja {0} on juba loodud ajaandmik {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Palgatõend töötaja {0} on juba loodud ajaandmik {1}
 DocType: Vehicle Log,Odometer,odomeetri
 DocType: Sales Order Item,Ordered Qty,Tellitud Kogus
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Punkt {0} on keelatud
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Punkt {0} on keelatud
 DocType: Stock Settings,Stock Frozen Upto,Stock Külmutatud Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,Bom ei sisalda laoartikkel
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Projekti tegevus / ülesanne.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,Bom ei sisalda laoartikkel
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Projekti tegevus / ülesanne.
 DocType: Vehicle Log,Refuelling Details,tankimine detailid
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Loo palgalehed
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Ostmine tuleb kontrollida, kui need on kohaldatavad valitakse {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Soodustus peab olema väiksem kui 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Viimati ostu määr ei leitud
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Kirjutage Off summa (firma Valuuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Arved Tundi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,Vaikimisi Bom {0} ei leitud
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Row # {0}: määrake reorganiseerima kogusest
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Vaikimisi Bom {0} ei leitud
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Row # {0}: määrake reorganiseerima kogusest
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Puuduta Toodete lisamiseks neid siin
 DocType: Fees,Program Enrollment,programm Registreerimine
 DocType: Landed Cost Voucher,Landed Cost Voucher,Maandus Cost Voucher
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Palun määra {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Korda päev kuus
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} ei ole aktiivne üliõpilane
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} ei ole aktiivne üliõpilane
 DocType: Employee,Health Details,Tervis Üksikasjad
 DocType: Offer Letter,Offer Letter Terms,Paku kiri Tingimused
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Et luua maksenõude viide dokument on nõutav
@@ -4665,7 +4755,6 @@
 DocType: Employee External Work History,Salary,Palk
 DocType: Serial No,Delivery Document Type,Toimetaja Dokumendi liik
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Esita kõik palgalehed eespool valitud kriteeriumid
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Kirjed sünkroniseerida
 DocType: Sales Order,Partly Delivered,Osaliselt Tarnitakse
 DocType: Email Digest,Receivables,Nõuded
 DocType: Lead Source,Lead Source,plii Allikas
@@ -4686,19 +4775,19 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Vananemine Range 2
 DocType: SG Creation Tool Course,Max Strength,max Strength
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,Bom asendatakse
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,"Valige üksused, mis põhinevad kohaletoimetamise kuupäeval"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,"Valige üksused, mis põhinevad kohaletoimetamise kuupäeval"
 ,Sales Analytics,Müük Analytics
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Saadaval {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Saadaval {0}
 ,Prospects Engaged But Not Converted,Väljavaated Kihlatud Aga mis ei ole ümber
 DocType: Manufacturing Settings,Manufacturing Settings,Tootmine Seaded
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Seadistamine E-
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Mobile nr
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Palun sisesta vaikimisi valuuta Company Master
 DocType: Stock Entry Detail,Stock Entry Detail,Stock Entry Detail
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Daily meeldetuletused
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Daily meeldetuletused
 DocType: Products Settings,Home Page is Products,Esileht on tooted
 ,Asset Depreciation Ledger,Varade amortisatsioon Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Maksueeskiri Konfliktid {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Maksueeskiri Konfliktid {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,New Account Name
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Tarnitud tooraine kulu
 DocType: Selling Settings,Settings for Selling Module,Seaded Müük Module
@@ -4712,8 +4801,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Punkt {0} peab olema laoartikkel
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Vaikimisi Work In Progress Warehouse
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Vaikimisi seadete raamatupidamistehingute.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Palun seadke töötaja nimesüsteem inimressurss&gt; HR-seaded
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Oodatud kuupäev ei saa olla enne Material taotlus kuupäev
+DocType: Restaurant,Default Tax Template,Default tax template
 DocType: Fees,Student Details,Õpilase üksikasjad
 DocType: Purchase Invoice Item,Stock Qty,stock Kogus
 DocType: Employee Loan,Repayment Period in Months,Tagastamise tähtaeg kuudes
@@ -4731,8 +4821,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Avage üksused
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Tegelik
+DocType: Restaurant Menu,Restaurant Manager,Restoranijuht
 DocType: Authorization Rule,Customerwise Discount,Customerwise Soodus
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Töögraafik ülesannete.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Töögraafik ülesannete.
 DocType: Purchase Invoice,Against Expense Account,Vastu ärikohtumisteks
 DocType: Production Order,Production Order,Tootmine Telli
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Paigaldamine Märkus {0} on juba esitatud
@@ -4740,7 +4831,6 @@
 DocType: Quotation Item,Against Docname,Vastu Docname
 DocType: SMS Center,All Employee (Active),Kõik Töötaja (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Vaata nüüd
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Vali mil arve genereeritakse automaatselt
 DocType: BOM,Raw Material Cost,Tooraine hind
 DocType: Item Reorder,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Sisesta esemed ja planeeritud Kogus, mille soovite tõsta tootmise tellimuste või laadida tooraine analüüsi."
@@ -4753,23 +4843,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Aruande tüüp on kohustuslik
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Ladu on kohustuslik laos Punkt {0} järjest {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Lisage programme
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Jae- ja hulgimüük
 DocType: Issue,First Responded On,Esiteks vastas
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Risti noteerimine Punkt mitu rühmad
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiscal Year Alguse kuupäev ja Fiscal Year End Date on juba eelarveaastal {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Kliirens Date updated
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Partii
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split Partii
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Edukalt Lepitatud
 DocType: Request for Quotation Supplier,Download PDF,Lae pDF
 DocType: Production Order,Planned End Date,Planeeritud End Date
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Palun sisestage ajakava kuupäev
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Kus esemed hoitakse.
 DocType: Request for Quotation,Supplier Detail,tarnija Detail
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Viga valemis või seisund: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Viga valemis või seisund: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Arve kogusumma
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kriteeriumide kaalud peavad sisaldama kuni 100%
 DocType: Attendance,Attendance,Osavõtt
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,stock Kirjed
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,stock Kirjed
 DocType: BOM,Materials,Materjalid
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Kui ei kontrollita, nimekirja tuleb lisada iga osakond, kus tuleb rakendada."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Allikas ja Target Warehouse ei saa olla sama
@@ -4787,6 +4877,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,On Net kokku
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Väärtus Oskus {0} peab olema vahemikus {1} kuni {2} on juurdekasvuga {3} jaoks Punkt {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Target ladu rida {0} peab olema sama Production Telli
+DocType: Restaurant Reservation,Waitlisted,Ootati
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Valuuta ei saa muuta pärast kande tegemiseks kasutada mõne muu valuuta
 DocType: Vehicle Service,Clutch Plate,Siduriketas
 DocType: Company,Round Off Account,Ümardada konto
@@ -4803,7 +4894,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Uus Sales Person Nimi
 DocType: Packing Slip,Gross Weight UOM,Gross Weight UOM
 DocType: Delivery Note Item,Against Sales Invoice,Vastu müügiarve
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Sisestage seerianumbrid seeriatootmiseks kirje
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Sisestage seerianumbrid seeriatootmiseks kirje
 DocType: Bin,Reserved Qty for Production,Reserveeritud Kogus Production
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Jäta märkimata, kui sa ei taha kaaluda partii tehes muidugi rühmi."
 DocType: Asset,Frequency of Depreciation (Months),Sagedus kulum (kuud)
@@ -4814,7 +4905,7 @@
 DocType: Lab Test,Test Group,Katserühm
 DocType: Payment Reconciliation,Receivable / Payable Account,Laekumata / maksmata konto
 DocType: Delivery Note Item,Against Sales Order Item,Vastu Sales Order toode
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Palun täpsustage omadus Väärtus atribuut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Palun täpsustage omadus Väärtus atribuut {0}
 DocType: Item,Default Warehouse,Vaikimisi Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Eelarve ei saa liigitada vastu Group Konto {0}
 DocType: Healthcare Settings,Patient Registration,Patsiendi registreerimine
@@ -4843,6 +4934,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Sales Person
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Eelarve ja Kulukeskus
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Mitu vaiketüüpi ei ole lubatud
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,Selle eest
 ,Appointment Analytics,Kohtumise analüüs
 DocType: Vehicle Service,Half Yearly,Pooleaastane
 DocType: Lead,Blog Subscriber,Blogi Subscriber
@@ -4860,7 +4952,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,quot Krahv
 ,BOM Stock Report,Bom Stock aruanne
 DocType: Stock Reconciliation Item,Quantity Difference,Kogus Difference
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Töötlemine palgaarvestuse
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Töötlemine palgaarvestuse
 DocType: Opportunity Item,Basic Rate,Põhimäär
 DocType: GL Entry,Credit Amount,Krediidi summa
 DocType: Cheque Print Template,Signatory Position,allakirjutanu seisukoht
@@ -4874,12 +4966,12 @@
 DocType: Tax Rule,Tax Rule,Maksueeskiri
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Säilitada sama kiirusega Kogu müügitsüklit
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Plaani aeg kajakad väljaspool Workstation tööaega.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Kliendid järjekorda
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} ei ole arsti ajakava. Lisage see arsti kaptenisse
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Kliendid järjekorda
 DocType: Student,Nationality,kodakondsus
 ,Items To Be Requested,"Esemed, mida tuleb taotleda"
-DocType: Purchase Order,Get Last Purchase Rate,Võta Viimati ostmise korral
 DocType: Company,Company Info,Firma Info
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Valige või lisage uus klient
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Valige või lisage uus klient
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Kuluüksus on vaja broneerida kulu nõude
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Application of Funds (vara)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,See põhineb käimist selle töötaja
@@ -4887,6 +4979,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Deebetsaldoga konto
 DocType: Fiscal Year,Year Start Date,Aasta alguskuupäev
 DocType: Attendance,Employee Name,Töötaja nimi
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restorani tellimisseade
 DocType: Sales Invoice,Rounded Total (Company Currency),Ümardatud kokku (firma Valuuta)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Ei varjatud rühma, sest Konto tüüp on valitud."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} on muudetud. Palun värskenda.
@@ -4897,6 +4990,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Töövõtjate hüvitised
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Pakitud kogus peab olema võrdne koguse Punkt {0} järjest {1}
 DocType: Production Order,Manufactured Qty,Toodetud Kogus
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Arve loodud
 DocType: Purchase Receipt Item,Accepted Quantity,Aktsepteeritud Kogus
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Palun Algsete Holiday nimekiri Töötajaportaali {0} või ettevõtte {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} pole olemas
@@ -4906,18 +5000,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rea nr {0}: summa ei saa olla suurem kui Kuni summa eest kuluhüvitussüsteeme {1}. Kuni Summa on {2}
 DocType: Maintenance Schedule,Schedule,Graafik
 DocType: Account,Parent Account,Parent konto
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,saadaval
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,saadaval
 DocType: Quality Inspection Reading,Reading 3,Lugemine 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Hinnakiri ei leitud või puudega
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Hinnakiri ei leitud või puudega
 DocType: Lab Test,Approved,Kinnitatud
 DocType: Pricing Rule,Price,Hind
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',Töötaja vabastati kohta {0} tuleb valida &#39;Vasak&#39;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Töötaja vabastati kohta {0} tuleb valida &#39;Vasak&#39;
+DocType: Hub Settings,Last Sync On,Viimane sünkroonimine on sisse lülitatud
 DocType: Guardian,Guardian,hooldaja
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Hinnang {0} loodud Töötaja {1} antud ajavahemikus
 DocType: Employee,Education,Haridus
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,del
 DocType: Selling Settings,Campaign Naming By,Kampaania nimetamine By
 DocType: Employee,Current Address Is,Praegune aadress
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Kuu müügi siht (
@@ -4932,7 +5027,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Kursuse kood:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Palun sisestage ärikohtumisteks
 DocType: Account,Stock,Varu
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",Rida # {0}: Reference Document Type peab olema üks ostutellimustest ostuarve või päevikusissekanne
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",Rida # {0}: Reference Document Type peab olema üks ostutellimustest ostuarve või päevikusissekanne
 DocType: Employee,Current Address,Praegune aadress
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Kui objekt on variant teise elemendi siis kirjeldus, pilt, hind, maksud jne seatakse malli, kui ei ole märgitud"
 DocType: Serial No,Purchase / Manufacture Details,Ostu / Tootmine Detailid
@@ -4963,7 +5058,7 @@
 DocType: Hub Settings,Hub Settings,Hub Seaded
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,Mis Operations
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Raamatupidamise kanded on tehtud juba valuuta {0} ja ettevõtete {1}. Palun valige saadaoleva või maksmisele konto valuuta {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Raamatupidamise kanded on tehtud juba valuuta {0} ja ettevõtete {1}. Palun valige saadaoleva või maksmisele konto valuuta {0}.
 DocType: Asset,Is Existing Asset,Kas Olemasolevad Asset
 DocType: Salary Detail,Statistical Component,Statistilised Component
 DocType: Warranty Claim,If different than customer address,Kui teistsugune kui klient aadress
@@ -4971,13 +5066,14 @@
 DocType: BOM Operation,BOM Operation,Bom operatsiooni
 DocType: Purchase Taxes and Charges,On Previous Row Amount,On eelmise rea summa
 DocType: Student,Home Address,Kodu aadress
+DocType: Item,Has Expiry Date,On aegumiskuupäev
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Üksuse Variant Seaded.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transfer Asset
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,Transfer Asset
 DocType: POS Profile,POS Profile,POS profiili
 DocType: Training Event,Event Name,sündmus Nimi
 DocType: Physician,Phone (Office),Telefon (kontor)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,sissepääs
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Kordadega {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,sissepääs
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Kordadega {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Hooajalisus jaoks eelarveid, eesmärgid jms"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Muutuja Nimi
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Punkt {0} on mall, valige palun üks selle variandid"
@@ -4986,7 +5082,7 @@
 DocType: Assessment Plan,Room,ruum
 DocType: Purchase Order,Advance Paid,Advance Paide
 DocType: Item,Item Tax,Punkt Maksu-
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Materjal Tarnija
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Materjal Tarnija
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Aktsiisi Arve
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Lävepakk {0}% esineb enam kui ühel
 DocType: Expense Claim,Employees Email Id,Töötajad Post Id
@@ -4997,32 +5093,30 @@
 DocType: Program,Program Name,programmi nimi
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,"Mõtle maksu, sest"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Tegelik Kogus on kohustuslikuks
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} praegu on tarnija tulemuskaart {1} ja selle tarnija ostutellimused peaksid olema ettevaatlikud.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} praegu on tarnija tulemuskaart {1} ja selle tarnija ostutellimused peaksid olema ettevaatlikud.
 DocType: Employee Loan,Loan Type,laenu liik
 DocType: Scheduling Tool,Scheduling Tool,Ajastus Tool
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Krediitkaart
 DocType: BOM,Item to be manufactured or repacked,Punkt tuleb toota või ümber
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Vaikimisi seadete laos tehinguid.
-DocType: Purchase Invoice,Next Date,Järgmine kuupäev
 DocType: Employee Education,Major/Optional Subjects,Major / Valik
 DocType: Sales Invoice Item,Drop Ship,Drop Laev
+DocType: Hub Settings,Suspended,Peatatud
 DocType: Training Event,Attendees,Osavõtjad
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Siin saate säilitada pere detailid nagu nimi ja amet vanem, abikaasa ja lapsed"
 DocType: Academic Term,Term End Date,Term End Date
-DocType: Hub Settings,Seller Name,Müüja Nimi
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Maksude ja tasude maha (firma Valuuta)
 DocType: Item Group,General Settings,General Settings
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Siit Valuuta ja valuuta ei saa olla sama
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Lisa instruktorid
 DocType: Stock Entry,Repack,Pakkige
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Sa pead Säästa kujul enne jätkamist
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Palun vali kõigepealt firma
 DocType: Item Attribute,Numeric Values,Arvväärtuste
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Kinnita Logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,varude
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,varude
 DocType: Customer,Commission Rate,Komisjonitasu määr
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Loodud {0} tulemuskaardid {1} vahel:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Tee Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Tee Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Block puhkuse taotluste osakonda.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Makse tüüp peab olema üks vastuvõtmine, palk ja Internal Transfer"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -5037,11 +5131,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Aktsiakapitali
 DocType: Shopping Cart Settings,Show Public Attachments,Näita avalikud failid
 DocType: Packing Slip,Package Weight Details,Pakendi kaal Üksikasjad
+DocType: Restaurant Reservation,Reservation Time,Reserveerimise aeg
 DocType: Payment Gateway Account,Payment Gateway Account,Payment Gateway konto
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Pärast makse lõpetamist suunata kasutaja valitud leheküljele.
 DocType: Company,Existing Company,olemasolevad Company
 DocType: Healthcare Settings,Result Emailed,Tulemus saadetakse e-postiga
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","Maksu- Kategooria on muudetud &quot;Kokku&quot;, sest kõik valikud on mitte-stock asjade"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Tootekood&gt; Elemendi grupp&gt; Bränd
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Palun valige csv faili
 DocType: Student Leave Application,Mark as Present,Märgi olevik
 DocType: Supplier Scorecard,Indicator Color,Indikaatori värv
@@ -5066,11 +5162,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Tee Student Partii
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Kas kanda
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Võta Kirjed Bom
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Võta Kirjed Bom
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Ooteaeg päeva
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rida # {0}: Postitamise kuupäev peab olema sama ostu kuupäevast {1} vara {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Märgi see, kui õpilane on elukoht instituudi Hostel."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Palun sisesta müügitellimuste ülaltoodud tabelis
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Palun sisesta müügitellimuste ülaltoodud tabelis
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Ei esitata palgalehed
 ,Stock Summary,Stock kokkuvõte
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Transfer vara ühest laost teise
@@ -5086,5 +5182,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: deebetkanne ei saa siduda koos {1}
 DocType: Journal Entry,Subscription Section,Tellimishind
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Konto {0} ei ole olemas
+DocType: Training Event,Training Program,Koolitusprogramm
 DocType: Account,Cash,Raha
 DocType: Employee,Short biography for website and other publications.,Lühike elulugu kodulehel ja teistes väljaannetes.
diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv
index 40f11a8..71b069e 100644
--- a/erpnext/translations/fa.csv
+++ b/erpnext/translations/fa.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,حالت حقوق و دستمزد
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,ثبت نام
 DocType: Patient,Divorced,طلاق
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,آیتم ها در حال حاضر همگام سازی
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,اجازه می دهد مورد به چند بار در یک معامله اضافه شود
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,لغو مواد مشاهده {0} قبل از لغو این ادعا گارانتی
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,محصولات مصرفی
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,ترک Approvers
 DocType: Sales Partner,Dealer,دلال
 DocType: Consultation,Investigations,تحقیقات
+DocType: Restaurant Order Entry,Click Enter To Add,برای افزودن کلیک کنید
 DocType: Employee,Rented,اجاره
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,قابل استفاده برای کاربر
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",متوقف سفارش تولید نمی تواند لغو شود، آن را اولین Unstop برای لغو
 DocType: Vehicle Service,Mileage,مسافت پیموده شده
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,آیا شما واقعا می خواهید به قراضه این دارایی؟
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,آیا شما واقعا می خواهید به قراضه این دارایی؟
 DocType: Drug Prescription,Update Schedule,به روز رسانی برنامه
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,کننده پیش فرض انتخاب کنید
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},برای اطلاع از قیمت ارز مورد نیاز است {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,بررسی در دسترس بودن
 DocType: Job Applicant,Job Applicant,درخواستگر کار
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,این است که در معاملات در برابر این کننده است. مشاهده جدول زمانی زیر برای جزئیات
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,نتایج بیشتری.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,حقوقی
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},مالیات واقعی نوع می تواند در میزان مورد در ردیف شامل نمی شود {0}
 DocType: Bank Guarantee,Customer,مشتری
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),نرخ ارز باید به همان صورت {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,نام مشتری
 DocType: Vehicle,Natural Gas,گاز طبیعی
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},حساب بانکی می تواند به عنوان نمی شود به نام {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},حساب بانکی می تواند به عنوان نمی شود به نام {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,سر (یا گروه) که در برابر مطالب حسابداری ساخته شده است و توازن حفظ می شوند.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),برجسته برای {0} نمی تواند کمتر از صفر ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,هیچ پردازش حقوق و دستمزد ارائه نشده است.
 DocType: Manufacturing Settings,Default 10 mins,پیش فرض 10 دقیقه
 DocType: Leave Type,Leave Type Name,ترک نام نوع
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,نشان می دهد باز
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,ضروری است که امروز این اقدام را برای تکرار در بالا ذکر کنیم
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,سری به روز رسانی با موفقیت
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,وارسی
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural ورود مجله ارسال شده
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,سفارش خرید اقلام به دریافت
 DocType: SMS Center,All Supplier Contact,همه با منبع تماس با
 DocType: Support Settings,Support Settings,تنظیمات پشتیبانی
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,انتظار می رود تاریخ پایان نمی تواند کمتر از حد انتظار تاریخ شروع
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,انتظار می رود تاریخ پایان نمی تواند کمتر از حد انتظار تاریخ شروع
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ردیف # {0}: نرخ باید به همان صورت {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,جدید مرخصی استفاده
 ,Batch Item Expiry Status,دسته ای مورد وضعیت انقضاء
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,حواله بانکی
 DocType: Mode of Payment Account,Mode of Payment Account,نحوه حساب پرداخت
 DocType: Consultation,Consultation,مشاوره
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,فروش و بازده
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,نمایش انواع
 DocType: Academic Term,Academic Term,ترم تحصیلی
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,ماده
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,بهداشت و درمان
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),تاخیر در پرداخت (روز)
 DocType: Lab Prescription,Lab Prescription,نسخه آزمایشگاهی
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,مرتب سازی بر اساس قیمت
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,هزینه خدمات
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},شماره سریال: {0} در حال حاضر در فاکتور فروش اشاره: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,فاکتور
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},شماره سریال: {0} در حال حاضر در فاکتور فروش اشاره: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,فاکتور
 DocType: Maintenance Schedule Item,Periodicity,تناوب
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,سال مالی {0} مورد نیاز است
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,دفاع
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,ردیف # {0}:
 DocType: Timesheet,Total Costing Amount,مبلغ کل هزینه یابی
 DocType: Delivery Note,Vehicle No,خودرو بدون
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,لطفا لیست قیمت را انتخاب کنید
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,لطفا لیست قیمت را انتخاب کنید
 DocType: Accounts Settings,Currency Exchange Settings,تنظیمات ارز Exchange
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,ردیف # {0}: سند پرداخت مورد نیاز است برای تکمیل trasaction
 DocType: Production Order Operation,Work In Progress,کار در حال انجام
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,لطفا تاریخ را انتخاب کنید
 DocType: Employee,Holiday List,فهرست تعطیلات
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,لطفا سیستم نامگذاری مربیان را در مدرسه تنظیم کنید&gt; تنظیمات مدرسه
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,حسابدار
+DocType: Hub Settings,Selling Price List,لیست قیمت فروش
 DocType: Patient,Tobacco Current Use,مصرف فعلی توتون و تنباکو
 DocType: Cost Center,Stock User,سهام کاربر
 DocType: Company,Phone No,تلفن
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,برنامه دوره ایجاد:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},جدید {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},جدید {0}: # {1}
 ,Sales Partners Commission,کمیسیون همکاران فروش
 DocType: Purchase Invoice,Rounding Adjustment,تنظیم گرد کردن
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,مخفف نمی تواند بیش از 5 کاراکتر باشد
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,جزئیات docname پدر و مادر
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",مرجع: {0}، کد مورد: {1} و ضوابط: {2}
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,کیلوگرم
-DocType: Student Log,Log,ورود
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,باز کردن برای یک کار.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} نتایج ارسال شده
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} نتایج ارسال شده
 DocType: Item Attribute,Increment,افزایش
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,مدت زمان
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,انتخاب کنید ... انبار
@@ -135,7 +137,7 @@
 DocType: Patient,Married,متاهل
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},برای مجاز نیست {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,گرفتن اقلام از
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},سهام می تواند در برابر تحویل توجه نمی شود به روز شده {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},سهام می تواند در برابر تحویل توجه نمی شود به روز شده {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},محصولات {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,بدون موارد ذکر شده
 DocType: Payment Reconciliation,Reconcile,وفق دادن
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,صندوق های بازنشستگی
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,بعدی تاریخ استهلاک نمی تواند قبل از تاریخ خرید می باشد
 DocType: Consultation,Consultation Date,تاریخ مشاوره
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,لیست محصولات و کشف کاربران ERPNext
 DocType: SMS Center,All Sales Person,تمام ماموران فروش
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ماهانه ** شما کمک می کند توزیع بودجه / هدف در سراسر ماه اگر شما فصلی در کسب و کار خود را.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,نمی وسایل یافت شده
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,گمشده ساختار حقوق و دستمزد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,نمی وسایل یافت شده
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,گمشده ساختار حقوق و دستمزد
 DocType: Lead,Person Name,نام شخص
 DocType: Sales Invoice Item,Sales Invoice Item,مورد فاکتور فروش
 DocType: Account,Credit,اعتبار
 DocType: POS Profile,Write Off Cost Center,ارسال فعال مرکز هزینه
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",به عنوان مثال &quot;مدرسه ابتدایی&quot; یا &quot;دانشگاه&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",به عنوان مثال &quot;مدرسه ابتدایی&quot; یا &quot;دانشگاه&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,گزارش سهام
 DocType: Warehouse,Warehouse Detail,جزئیات انبار
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},حد اعتبار شده است برای مشتری عبور {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,تاریخ پایان ترم نمی تواند بعد از تاریخ سال پایان سال تحصیلی که مدت مرتبط است باشد (سال تحصیلی {}). لطفا تاریخ های صحیح و دوباره امتحان کنید.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",&quot;آیا دارایی ثابت&quot; نمی تواند بدون کنترل، به عنوان رکورد دارایی در برابر مورد موجود است
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",&quot;آیا دارایی ثابت&quot; نمی تواند بدون کنترل، به عنوان رکورد دارایی در برابر مورد موجود است
 DocType: Vehicle Service,Brake Oil,روغن ترمز
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,مشتری&gt; گروه مشتری&gt; قلمرو
 DocType: Tax Rule,Tax Type,نوع مالیات
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,مبلغ مشمول مالیات
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},شما مجاز به اضافه و یا به روز رسانی مطالب قبل از {0} نیستید
 DocType: BOM,Item Image (if not slideshow),مورد تصویر (در صورت اسلاید نمی شود)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,مشتری با همین نام وجود دارد
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(یک ساعت یک نرخ / 60) * * * * واقعی زمان عمل
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,ردیف # {0}: نوع سند مرجع باید یکی از ادعای هزینه یا ورود مجله باشد
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,انتخاب BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,ردیف # {0}: نوع سند مرجع باید یکی از ادعای هزینه یا ورود مجله باشد
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,انتخاب BOM
 DocType: SMS Log,SMS Log,SMS ورود
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,هزینه اقلام تحویل شده
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,تعطیلات در {0} است بین از تاریخ و تا به امروز نیست
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,کارمند وام
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,گزارش فعالیت:
 DocType: Fee Schedule,Send Payment Request Email,ارسال درخواست پرداخت درخواست
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,مورد {0} در سیستم وجود ندارد و یا تمام شده است
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,مورد {0} در سیستم وجود ندارد و یا تمام شده است
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,عقار
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,بیانیه ای از حساب
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,داروسازی
@@ -210,17 +213,22 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,واردات ورود
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,نگه دار، درخواست پاسخ به مواد از نوع تولید بر اساس معیارهای فوق
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,موفق به ثبت نام نشده است
 DocType: Training Result Employee,Grade,مقطع تحصیلی
+DocType: Restaurant Table,No of Seats,بدون صندلی
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","برای اضافه کردن موضوع پویا، از برچسب جینجا مانند <div style=""""><pre style=""""> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,تحویل داده شده توسط کننده
 DocType: SMS Center,All Contact,همه تماس
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,تولید سفارش در حال حاضر برای همه موارد با BOM ایجاد
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,تولید سفارش در حال حاضر برای همه موارد با BOM ایجاد
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,حقوق سالانه
 DocType: Daily Work Summary,Daily Work Summary,خلاصه کار روزانه
 DocType: Period Closing Voucher,Closing Fiscal Year,بستن سال مالی
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} فریز شده است
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,لطفا موجود شرکت برای ایجاد نمودار از حساب را انتخاب کنید
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} فریز شده است
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,لطفا موجود شرکت برای ایجاد نمودار از حساب را انتخاب کنید
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,هزینه سهام
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,انتخاب هدف انبار
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,انتخاب هدف انبار
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,لطفا وارد ترجیحی ایمیل تماس
 DocType: Program Enrollment,School Bus,اتوبوس مدرسه
 DocType: Journal Entry,Contra Entry,کنترا ورود
@@ -237,9 +245,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",دانلود الگو، داده مناسب پر کنید و ضمیمه فایل تغییر یافتهاست. همه تاریخ و کارمند ترکیبی در دوره زمانی انتخاب شده در قالب آمده، با سوابق حضور و غیاب موجود
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,مورد {0} غیر فعال است و یا پایان زندگی رسیده است
+DocType: Student Admission Program,Minimum Age,کمترین سن
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,به عنوان مثال: ریاضیات پایه
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",شامل مالیات در ردیف {0} در مورد نرخ، مالیات در ردیف {1} باید گنجانده شود
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,تنظیمات برای ماژول HR
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,تنظیمات برای ماژول HR
 DocType: SMS Center,SMS Center,مرکز SMS
 DocType: Sales Invoice,Change Amount,تغییر مقدار
 DocType: BOM Update Tool,New BOM,BOM جدید
@@ -249,7 +258,7 @@
 DocType: Lead,Request Type,درخواست نوع
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,کارمند
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,رادیو و تلویزیون
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,اضافه کردن اتاق ها
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),حالت راه اندازی POS (آنلاین / آفلاین)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,اعدام
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,جزئیات عملیات انجام شده است.
 DocType: Serial No,Maintenance Status,وضعیت نگهداری
@@ -259,7 +268,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},از تاریخ باید در سال مالی باشد. با فرض از تاریخ = {0}
 DocType: Drug Prescription,Interval,فاصله
 DocType: Customer,Individual,فردی
-DocType: Interest,Academics User,دانشگاهیان کاربر
+DocType: Interest,Academics User,کاربر آکادمیک
 DocType: Cheque Print Template,Amount In Figure,مقدار در شکل
 DocType: Employee Loan Application,Loan Info,وام اطلاعات
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,برنامه ریزی برای بازدیدکننده داشته است نگهداری.
@@ -272,6 +281,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,لیست قیمت ها باید قابل استفاده برای خرید و یا فروش است
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},تاریخ نصب و راه اندازی نمی تواند قبل از تاریخ تحویل برای مورد است {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),تخفیف در لیست قیمت نرخ (٪)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,بیوشیمی
 DocType: Offer Letter,Select Terms and Conditions,انتخاب شرایط و ضوابط
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,ارزش از
 DocType: Production Planning Tool,Sales Orders,سفارشات فروش
@@ -306,15 +316,15 @@
 DocType: Sales Partner,Reseller,نمایندگی فروش
 DocType: Codification Table,Medical Code,کد پزشکی
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.",اگر علامت زده شود، شامل اقلام غیر سهام در درخواست مواد.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,لطفا شرکت وارد
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,لطفا شرکت وارد
 DocType: Delivery Note Item,Against Sales Invoice Item,در برابر آیتم فاکتور فروش
 ,Production Orders in Progress,سفارشات تولید در پیشرفت
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,نقدی خالص از تامین مالی
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save",LocalStorage را کامل است، نجات نداد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save",LocalStorage را کامل است، نجات نداد
 DocType: Lead,Address & Contact,آدرس و تلفن تماس
 DocType: Leave Allocation,Add unused leaves from previous allocations,اضافه کردن برگ های استفاده نشده از تخصیص قبلی
 DocType: Sales Partner,Partner website,وب سایت شریک
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,این مورد را اضافه کنید
+DocType: Restaurant Order Entry,Add Item,این مورد را اضافه کنید
 DocType: Lab Test,Custom Result,نتیجه سفارشی
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,تماس با نام
 DocType: Course Assessment Criteria,Course Assessment Criteria,معیارهای ارزیابی دوره
@@ -327,7 +337,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,درخواست برای خرید.
 DocType: Lab Test,Submitted Date,تاریخ ارسال شده
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,این است که در ورق زمان ایجاد در برابر این پروژه بر اساس
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,پرداخت خالص نمی تواند کمتر از 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,پرداخت خالص نمی تواند کمتر از 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",برای جلوگیری از ارسال اعلان های خطای تکراری از سیستم، فیلد Disabled را در اشتراک ثبت نام کرده ایم
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,فقط تصویب مرخصی انتخاب می توانید از این مرخصی استفاده کنید
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,تسکین تاریخ باید بیشتر از تاریخ پیوستن شود
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,برگ در سال
@@ -336,9 +347,10 @@
 DocType: Email Digest,Profit & Loss,سود و زیان
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,لیتری
 DocType: Task,Total Costing Amount (via Time Sheet),مجموع هزینه یابی مقدار (از طریق زمان ورق)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,لطفا دانشجویان را در گروه های دانشجویی قرار دهید
 DocType: Item Website Specification,Item Website Specification,مشخصات مورد وب سایت
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ترک مسدود
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},مورد {0} به پایان زندگی بر روی رسید {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},مورد {0} به پایان زندگی بر روی رسید {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,مطالب بانک
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,سالیانه
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,مورد سهام آشتی
@@ -347,7 +359,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,دوره دانشجویی گروه ابزار ایجاد
 DocType: Lead,Do Not Contact,آیا تماس با نه
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,افرادی که در سازمان شما آموزش
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,شناسه منحصر به فرد برای ردیابی تمام فاکتورها در محدوده زمانی معین. این است که در ارائه تولید می شود.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,نرم افزار توسعه
 DocType: Item,Minimum Order Qty,حداقل تعداد سفارش تعداد
 DocType: Pricing Rule,Supplier Type,نوع منبع
@@ -357,17 +368,19 @@
 DocType: Item,Publish in Hub,انتشار در توپی
 DocType: Student Admission,Student Admission,پذیرش دانشجو
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,مورد {0} لغو شود
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,درخواست مواد
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,مورد {0} لغو شود
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,درخواست مواد
 DocType: Bank Reconciliation,Update Clearance Date,به روز رسانی ترخیص کالا از تاریخ
 DocType: Item,Purchase Details,جزئیات خرید
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},مورد {0} در &#39;مواد اولیه عرضه شده جدول در سفارش خرید یافت نشد {1}
 DocType: Patient Relation,Relation,ارتباط
 DocType: Shipping Rule,Worldwide Shipping,حمل و نقل در سراسر جهان
 DocType: Patient Relation,Mother,مادر
+DocType: Restaurant Reservation,Reservation End Time,زمان پایان رزرو
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,تایید سفارشات از مشتریان.
 DocType: Purchase Receipt Item,Rejected Quantity,تعداد رد
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,درخواست پرداخت {0} ایجاد شد
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,درخواست پرداخت {0} ایجاد شد
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,حساسیت کم
 DocType: Notification Control,Notification Control,کنترل هشدار از طریق
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,لطفا پس از اتمام آموزش خود را تأیید کنید
 DocType: Lead,Suggestions,پیشنهادات
@@ -387,7 +400,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,لغزش ایمیل حقوق و دستمزد به کارکنان را بر اساس ایمیل مورد نظر در انتخاب کارمند
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,اولین تصویب مرخصی در لیست خواهد شد به عنوان پیش فرض مرخصی تصویب مجموعه
 DocType: Tax Rule,Shipping County,حمل و نقل شهرستان
-apps/erpnext/erpnext/config/desktop.py +158,Learn,فرا گرفتن
+apps/erpnext/erpnext/config/desktop.py +159,Learn,فرا گرفتن
 DocType: Asset,Next Depreciation Date,بعدی تاریخ استهلاک
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,هزینه فعالیت به ازای هر کارمند
 DocType: Accounts Settings,Settings for Accounts,تنظیمات برای حساب
@@ -398,13 +411,13 @@
 DocType: Item,Synced With Hub,همگام سازی شده با توپی
 DocType: Vehicle,Fleet Manager,ناوگان مدیر
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},ردیف # {0}: {1} نمی تواند برای قلم منفی {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,رمز اشتباه
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,رمز اشتباه
 DocType: Item,Variant Of,نوع از
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',تکمیل تعداد نمی تواند بیشتر از &#39;تعداد برای تولید&#39;
 DocType: Period Closing Voucher,Closing Account Head,بستن سر حساب
 DocType: Employee,External Work History,سابقه کار خارجی
 DocType: Physician,Time per Appointment,زمان در هر مأموریت
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,خطا مرجع مدور
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,خطا مرجع مدور
 DocType: Appointment Type,Is Inpatient,بستری است
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,نام Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,به عبارت (صادرات) قابل مشاهده خواهد بود یک بار شما را تحویل توجه را نجات دهد.
@@ -413,19 +426,18 @@
 DocType: Lead,Industry,صنعت
 DocType: Employee,Job Profile,نمایش شغلی
 DocType: BOM Item,Rate & Amount,نرخ و مبلغ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفا شماره سریال را برای شرکت کنندگان از طریق Setup&gt; Numbering Series نصب کنید
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,این بر مبنای معاملات علیه این شرکت است. برای جزئیات بیشتر به جدول زمانی زیر مراجعه کنید
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,با رایانامه آگاه کن در ایجاد درخواست مواد اتوماتیک
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,مقاوم
 DocType: Journal Entry,Multi Currency,چند ارز
 DocType: Payment Reconciliation Invoice,Invoice Type,فاکتور نوع
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,مشتری&gt; گروه مشتری&gt; قلمرو
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,رسید
 DocType: Consultation,Encounter Impression,معمای مواجهه
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,راه اندازی مالیات
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,هزینه دارایی فروخته شده
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,ورود پرداخت اصلاح شده است پس از آن کشیده شده است. لطفا آن را دوباره بکشید.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} دو بار در مالیات وارد شده است
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,خلاصه برای این هفته و فعالیت های انتظار
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} دو بار در مالیات وارد شده است
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,خلاصه برای این هفته و فعالیت های انتظار
 DocType: Student Applicant,Admitted,پذیرفته
 DocType: Workstation,Rent Cost,اجاره هزینه
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,مقدار پس از استهلاک
@@ -439,36 +451,35 @@
 DocType: Shipping Rule,Valid for Countries,معتبر برای کشورهای
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,این مورد از یک الگو است و می تواند در معاملات مورد استفاده قرار گیرد. ویژگی های مورد خواهد بود بیش از به انواع کپی مگر اینکه &#39;هیچ نسخه&#39; تنظیم شده است
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ترتیب مجموع در نظر گرفته شده
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",طراحی کارمند (به عنوان مثال مدیر عامل و غیره).
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).",طراحی کارمند (به عنوان مثال مدیر عامل و غیره).
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,سرعت که در آن مشتریان ارز به ارز پایه مشتری تبدیل
 DocType: Course Scheduling Tool,Course Scheduling Tool,البته برنامه ریزی ابزار
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ردیف # {0}: خرید فاکتور می تواند در برابر یک دارایی موجود ساخته نمی شود {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[فوری] خطا هنگام ایجاد٪ s برای٪ s تکرار می شود
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[فوری] خطا هنگام ایجاد٪ s برای٪ s تکرار می شود
 DocType: Item Tax,Tax Rate,نرخ مالیات
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} در حال حاضر برای کارکنان اختصاص داده {1} برای مدت {2} به {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,انتخاب مورد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,انتخاب مورد
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,فاکتور خرید {0} در حال حاضر ارائه
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},ردیف # {0}: دسته ای بدون باید همان باشد {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,تبدیل به غیر گروه
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,دسته ای (زیادی) از آیتم استفاده کنید.
 DocType: C-Form Invoice Detail,Invoice Date,تاریخ فاکتور
 DocType: GL Entry,Debit Amount,مقدار بدهی
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},فقط می تواند وجود 1 حساب در هر شرکت می شود {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,لطفا پیوست را ببینید
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},فقط می تواند وجود 1 حساب در هر شرکت می شود {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,لطفا پیوست را ببینید
 DocType: Purchase Order,% Received,٪ دریافتی
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ایجاد گروه دانشجویی
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,راه اندازی در حال حاضر کامل!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,راه اندازی در حال حاضر کامل!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,اعتباری میزان
 DocType: Setup Progress Action,Action Document,سند عملی
 ,Finished Goods,محصولات تمام شده
 DocType: Delivery Note,Instructions,دستورالعمل
 DocType: Quality Inspection,Inspected By,بازرسی توسط
 DocType: Maintenance Visit,Maintenance Type,نوع نگهداری
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} در دوره ثبت نام نشده {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,کد مورد&gt; گروه مورد&gt; نام تجاری
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} در دوره ثبت نام نشده {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},سریال بدون {0} به تحویل توجه تعلق ندارد {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext نسخه ی نمایشی
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,اضافه کردن محصولات
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,اضافه کردن محصولات
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,پارامتر بازرسی کیفیت مورد
 DocType: Leave Application,Leave Approver Name,ترک نام تصویب
 DocType: Depreciation Schedule,Schedule Date,برنامه زمانبندی عضویت
@@ -488,7 +499,7 @@
 DocType: Salary Slip Timesheet,Working Hours,ساعات کاری
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,تغییر شروع / شماره توالی فعلی از یک سری موجود است.
 DocType: Dosage Strength,Strength,استحکام
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,ایجاد یک مشتری جدید
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,ایجاد یک مشتری جدید
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",اگر چند در قوانین قیمت گذاری ادامه غالب است، از کاربران خواسته به تنظیم اولویت دستی برای حل و فصل درگیری.
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,ایجاد سفارشات خرید
 ,Purchase Register,خرید ثبت نام
@@ -507,7 +518,7 @@
 DocType: Lab Test Template,Single,تک
 DocType: Salary Slip,Total Loan Repayment,مجموع بازپرداخت وام
 DocType: Account,Cost of Goods Sold,هزینه کالاهای فروخته شده
-DocType: Purchase Invoice,Yearly,سالیانه
+DocType: Subscription,Yearly,سالیانه
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,لطفا وارد مرکز هزینه
 DocType: Drug Prescription,Dosage,مصرف
 DocType: Journal Entry Account,Sales Order,سفارش فروش
@@ -537,7 +548,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,تنظیمات جهانی برای تمام فرآیندهای تولید.
 DocType: Accounts Settings,Accounts Frozen Upto,حساب منجمد تا حد
 DocType: SMS Log,Sent On,فرستاده شده در
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,ویژگی {0} چند بار در صفات جدول انتخاب
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,ویژگی {0} چند بار در صفات جدول انتخاب
 DocType: HR Settings,Employee record is created using selected field. ,رکورد کارمند با استفاده از درست انتخاب شده ایجاد می شود.
 DocType: Sales Order,Not Applicable,قابل اجرا نیست
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,کارشناسی ارشد تعطیلات.
@@ -562,13 +573,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,مجموع برگ اختصاص داده الزامی است
 DocType: Patient,AB Positive,مثبت AB
 DocType: Job Opening,Description of a Job Opening,شرح یک شغل
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,فعالیت های در انتظار برای امروز
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,فعالیت های در انتظار برای امروز
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,ثبت حضور و غیاب.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,کامپوننت حقوق و دستمزد حقوق و دستمزد بر اساس برنامه زمانی برای.
 DocType: Sales Order Item,Used for Production Plan,مورد استفاده برای طرح تولید
 DocType: Employee Loan,Total Payment,مبلغ کل قابل پرداخت
 DocType: Manufacturing Settings,Time Between Operations (in mins),زمان بین عملیات (در دقیقه)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} لغو می شود پس از عمل نمی تواند تکمیل شود
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} لغو می شود پس از عمل نمی تواند تکمیل شود
 DocType: Customer,Buyer of Goods and Services.,خریدار کالا و خدمات.
 DocType: Journal Entry,Accounts Payable,حساب های پرداختنی
 DocType: Patient,Allergies,آلرژی
@@ -580,22 +591,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,هشدار سفارشات خرید
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,لیست تعداد کمی از مشتریان خود را. آنها می تواند سازمان ها یا افراد.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,قطعات اندازه کافی برای ساخت
+DocType: POS Profile User,POS Profile User,کاربر پروفایل POS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,درآمد مستقیم
 DocType: Patient Appointment,Date TIme,زمان قرار
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",می توانید بر روی حساب نمی فیلتر بر اساس، در صورتی که توسط حساب گروه بندی
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,افسر اداری
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,لطفا دوره را انتخاب کنید
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,لطفا دوره را انتخاب کنید
 DocType: Codification Table,Codification Table,جدول کدگذاری
 DocType: Timesheet Detail,Hrs,ساعت
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,لطفا انتخاب کنید شرکت
 DocType: Stock Entry Detail,Difference Account,حساب تفاوت
 DocType: Purchase Invoice,Supplier GSTIN,کننده GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,می توانید کار نزدیک به عنوان وظیفه وابسته به آن {0} بسته نشده است نیست.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,لطفا انبار که درخواست مواد مطرح خواهد شد را وارد کنید
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,می توانید کار نزدیک به عنوان وظیفه وابسته به آن {0} بسته نشده است نیست.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,لطفا انبار که درخواست مواد مطرح خواهد شد را وارد کنید
 DocType: Production Order,Additional Operating Cost,هزینه های عملیاتی اضافی
 DocType: Lab Test Template,Lab Routine,روال آزمایشگاهی
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,آرایشی و بهداشتی
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items",به ادغام، خواص زیر باید همین کار را برای هر دو مورد می شود
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items",به ادغام، خواص زیر باید همین کار را برای هر دو مورد می شود
 DocType: Shipping Rule,Net Weight,وزن خالص
 DocType: Employee,Emergency Phone,تلفن اضطراری
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,خرید
@@ -605,7 +617,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,لطفا درجه برای آستانه 0٪ تعریف
 DocType: Sales Order,To Deliver,رساندن
 DocType: Purchase Invoice Item,Item,بخش
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,سریال هیچ مورد نمی تواند کسری
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,حساسیت بالا
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,سریال هیچ مورد نمی تواند کسری
 DocType: Journal Entry,Difference (Dr - Cr),تفاوت (دکتر - کروم)
 DocType: Account,Profit and Loss,حساب سود و زیان
 DocType: Patient,Risk Factors,عوامل خطر
@@ -614,7 +627,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,مدیریت مقاطعه کاری فرعی
 DocType: Vital Signs,Body Temperature,دمای بدن
 DocType: Project,Project will be accessible on the website to these users,پروژه در وب سایت به این کاربران در دسترس خواهد بود
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,تعریف نوع پروژه
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,تعریف نوع پروژه
 DocType: Supplier Scorecard,Weighting Function,تابع وزن
 DocType: Physician,OP Consulting Charge,مسئولیت محدود OP
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,راه اندازی خود را
@@ -628,7 +641,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,افزایش نمی تواند 0
 DocType: Production Planning Tool,Material Requirement,مورد نیاز مواد
 DocType: Company,Delete Company Transactions,حذف معاملات شرکت
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,مرجع و تاریخ در مرجع برای معامله بانک الزامی است
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,مرجع و تاریخ در مرجع برای معامله بانک الزامی است
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,افزودن / ویرایش مالیات ها و هزینه ها
 DocType: Payment Entry Reference,Supplier Invoice No,تامین کننده فاکتور بدون
 DocType: Territory,For reference,برای مرجع
@@ -636,12 +649,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions",نمی توانید حذف سریال نه {0}، آن را به عنوان در معاملات سهام مورد استفاده
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),بسته شدن (کروم)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,سلام
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,انتقال مورد
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,انتقال مورد
 DocType: Serial No,Warranty Period (Days),دوره گارانتی (روز)
 DocType: Installation Note Item,Installation Note Item,نصب و راه اندازی توجه داشته باشید مورد
 DocType: Production Plan Item,Pending Qty,انتظار تعداد
 DocType: Budget,Ignore,نادیده گرفتن
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} غیر فعال است
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} غیر فعال است
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,ابعاد چک راه اندازی برای چاپ
 DocType: Salary Slip,Salary Slip Timesheet,برنامه زمانی حقوق و دستمزد لغزش
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,انبار تامین کننده برای رسید خرید زیر قرارداد اجباری
@@ -650,7 +663,7 @@
 DocType: Pricing Rule,Sales Partner,شریک فروش
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,همه کارت امتیازی ارائه شده.
 DocType: Buying Settings,Purchase Receipt Required,رسید خرید مورد نیاز
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,نرخ ارزش گذاری الزامی است باز کردن سهام وارد
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,نرخ ارزش گذاری الزامی است باز کردن سهام وارد
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,هیچ ثبتی یافت نشد در جدول فاکتور
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,لطفا ابتدا شرکت و حزب نوع را انتخاب کنید
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,مالی سال / حسابداری.
@@ -687,7 +700,7 @@
 DocType: Quotation,Quotation To,نقل قول برای
 DocType: Lead,Middle Income,با درآمد متوسط
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),افتتاح (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,واحد اندازه گیری پیش فرض برای مورد {0} می توانید به طور مستقیم نمی توان تغییر چون در حال حاضر ساخته شده برخی از معامله (ها) با UOM است. شما نیاز به ایجاد یک آیتم جدید به استفاده از پیش فرض UOM متفاوت است.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,واحد اندازه گیری پیش فرض برای مورد {0} می توانید به طور مستقیم نمی توان تغییر چون در حال حاضر ساخته شده برخی از معامله (ها) با UOM است. شما نیاز به ایجاد یک آیتم جدید به استفاده از پیش فرض UOM متفاوت است.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,مقدار اختصاص داده شده نمی تونه منفی
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,لطفا مجموعه ای از شرکت
 DocType: Purchase Order Item,Billed Amt,صورتحساب AMT
@@ -701,6 +714,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,انتخاب حساب پرداخت به ورود بانک
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll",درست سوابق کارمند به مدیریت برگ، ادعاهای هزینه و حقوق و دستمزد
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,دوره تجویز
+DocType: Restaurant Reservation,Restaurant Reservation,رزرو رستوران
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,نوشتن طرح های پیشنهادی
 DocType: Payment Entry Deduction,Payment Entry Deduction,پرداخت کسر ورود
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,یک نفر دیگر فروش {0} با شناسه کارمند همان وجود دارد
@@ -708,7 +722,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,کارشناسی ارشد
 DocType: Assessment Plan,Maximum Assessment Score,حداکثر نمره ارزیابی
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,تاریخ به روز رسانی بانک معامله
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,پیگیری زمان
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,پیگیری زمان
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,تکراری برای TRANSPORTER
 DocType: Fiscal Year Company,Fiscal Year Company,شرکت سال مالی
 DocType: Packing Slip Item,DN Detail,جزئیات DN
@@ -716,8 +730,9 @@
 DocType: Timesheet,Billed,فاکتور شده
 DocType: Batch,Batch Description,دسته توضیحات
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,ایجاد گروه های دانشجویی
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.",پرداخت حساب دروازه ایجاد نمی کند، لطفا یک دستی ایجاد کنید.
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.",پرداخت حساب دروازه ایجاد نمی کند، لطفا یک دستی ایجاد کنید.
 DocType: Supplier Scorecard,Per Year,در سال
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,برای پذیرش در این برنامه به عنوان DOB واجد شرایط نیست
 DocType: Sales Invoice,Sales Taxes and Charges,مالیات فروش و هزینه ها
 DocType: Employee,Organization Profile,نمایش سازمان
 DocType: Vital Signs,Height (In Meter),ارتفاع (در متر)
@@ -753,7 +768,7 @@
 DocType: Student Batch Name,Batch Name,نام دسته ای
 DocType: Fee Validity,Max number of visit,حداکثر تعداد بازدید
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,برنامه زمانی ایجاد شده:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},لطفا نقدی پیش فرض و یا حساب بانکی در نحوه پرداخت را تعیین {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},لطفا نقدی پیش فرض و یا حساب بانکی در نحوه پرداخت را تعیین {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,ثبت نام کردن
 DocType: GST Settings,GST Settings,تنظیمات GST
 DocType: Selling Settings,Customer Naming By,نامگذاری مشتری توسط
@@ -785,15 +800,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,مالیات هزینه فرود آمد و اتهامات
 DocType: Production Order Operation,Actual Start Time,واقعی زمان شروع
 DocType: BOM Operation,Operation Time,زمان عمل
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,پایان
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,پایان
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,پایه
 DocType: Timesheet,Total Billed Hours,جمع ساعت در صورتحساب یا لیست
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,ارسال فعال مقدار
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,ارسال فعال مقدار
 DocType: Leave Block List Allow,Allow User,اجازه می دهد کاربر
 DocType: Journal Entry,Bill No,شماره صورتحساب
 DocType: Company,Gain/Loss Account on Asset Disposal,حساب کاهش / افزایش در دفع دارایی
 DocType: Vehicle Log,Service Details,جزئیات خدمات
-DocType: Purchase Invoice,Quarterly,فصلنامه
+DocType: Subscription,Quarterly,فصلنامه
 DocType: Lab Test Template,Grouped,گروه بندی شده
 DocType: Selling Settings,Delivery Note Required,تحویل توجه لازم
 DocType: Bank Guarantee,Bank Guarantee Number,بانک شماره گارانتی
@@ -802,12 +817,12 @@
 DocType: Student Attendance,Student Attendance,حضور دانش آموز
 DocType: Sales Invoice Timesheet,Time Sheet,ورقه ثبت ساعات کار
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush مواد اولیه بر اساس
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,لطفا جزئیات آیتم را وارد کنید
 DocType: Interest,Interest,علاقه
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,پیش فروش
 DocType: Purchase Receipt,Other Details,سایر مشخصات
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,قالب تست
+DocType: Restaurant Order Entry Item,Served,خدمت کرده است
 DocType: Account,Accounts,حساب ها
 DocType: Vehicle,Odometer Value (Last),ارزش کیلومترشمار (آخرین)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,قالب بندی معیارهای کارت امتیازی تامین کننده.
@@ -819,25 +834,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,پیش نمایش لغزش حقوق
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,حساب {0} وارد شده است چندین بار
 DocType: Account,Expenses Included In Valuation,هزینه های موجود در ارزش گذاری
-DocType: Hub Settings,Seller City,فروشنده شهر
 ,Absent Student Report,وجود ندارد گزارش دانشجو
 DocType: Email Digest,Next email will be sent on:,ایمیل بعدی خواهد شد در ارسال:
 DocType: Offer Letter Term,Offer Letter Term,ارائه نامه مدت
 DocType: Supplier Scorecard,Per Week,در هفته
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,فقره انواع.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,فقره انواع.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,دانش آموز مجموعا
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,مورد {0} یافت نشد
 DocType: Bin,Stock Value,سهام ارزش
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,سوابق هزینه در پسزمینه ایجاد خواهد شد. در صورت هر گونه خطا، پیام خطا در برنامه به روز می شود.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,شرکت {0} وجود ندارد
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} تا تاریخ {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} تا تاریخ {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,نوع درخت
 DocType: BOM Explosion Item,Qty Consumed Per Unit,تعداد مصرف شده در هر واحد
 DocType: Serial No,Warranty Expiry Date,گارانتی تاریخ انقضاء
 DocType: Material Request Item,Quantity and Warehouse,مقدار و انبار
+DocType: Hub Settings,Unregister,ثبت نام کنید
 DocType: Sales Invoice,Commission Rate (%),نرخ کمیسیون (٪)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,لطفا انتخاب برنامه
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,لطفا انتخاب برنامه
 DocType: Project,Estimated Cost,هزینه تخمین زده شده
 DocType: Purchase Order,Link to material requests,لینک به درخواست مواد
+DocType: Hub Settings,Publish,انتشار
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,جو زمین
 DocType: Journal Entry,Credit Card Entry,ورود کارت اعتباری
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,شرکت و حساب
@@ -848,13 +865,12 @@
 DocType: Selling Settings,Close Opportunity After Days,نزدیک فرصت پس از چند روز
 ,Reserved,رزرو شده
 DocType: Purchase Order,Supply Raw Materials,تامین مواد اولیه
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,از تاریخ فاکتور بعدی تولید خواهد شد. این است که در ارائه تولید می شود.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,دارایی های نقد
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0}  یک آیتم انباری نیست
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',لطفا نظرات خود را به آموزش با کلیک بر روی &#39;آموزش بازخورد&#39; و سپس &#39;جدید&#39;
 DocType: Mode of Payment Account,Default Account,به طور پیش فرض حساب
 DocType: Payment Entry,Received Amount (Company Currency),دریافت مبلغ (شرکت ارز)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,سرب باید مجموعه اگر فرصت است از سرب ساخته شده
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,سرب باید مجموعه اگر فرصت است از سرب ساخته شده
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,لطفا روز مرخصی در هفته را انتخاب کنید
 DocType: Patient,O Negative,منفی نیستم
 DocType: Production Order Operation,Planned End Time,برنامه ریزی زمان پایان
@@ -870,10 +886,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,انرژی
 DocType: Opportunity,Opportunity From,فرصت از
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,بیانیه حقوق ماهانه.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,افزودن شرکت
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ردیف {0}: {1} شماره سریال مورد برای {2} مورد نیاز است. شما {3} را ارائه کرده اید.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ردیف {0}: {1} شماره سریال مورد برای {2} مورد نیاز است. شما {3} را ارائه کرده اید.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,لطفا یک جدول را انتخاب کنید
 DocType: BOM,Website Specifications,مشخصات وب سایت
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} یک آدرس ایمیل معتبر در «گیرندگان» است
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} یک آدرس ایمیل معتبر در «گیرندگان» است
 DocType: Special Test Items,Particulars,جزئيات
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,آنتی بیوتیک
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: از {0} از نوع {1}
@@ -881,11 +897,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,ردیف {0}: عامل تبدیل الزامی است
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",قوانین هزینه های متعدد را با معیارهای همان وجود دارد، لطفا حل و فصل درگیری با اختصاص اولویت است. قوانین قیمت: {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,نمی توانید غیر فعال کردن یا لغو BOM به عنوان آن را با دیگر BOMs مرتبط
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,نمی توانید غیر فعال کردن یا لغو BOM به عنوان آن را با دیگر BOMs مرتبط
 DocType: Opportunity,Maintenance,نگهداری
 DocType: Item Attribute Value,Item Attribute Value,مورد موجودیت مقدار
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,کمپین فروش.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,را برنامه زمانی
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,را برنامه زمانی
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -923,12 +939,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,لطفا ابتدا آیتم را وارد کنید
 DocType: Account,Liability,مسئوليت
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,مقدار تحریم نیست می تواند بیشتر از مقدار ادعای در ردیف {0}.
+DocType: Salary Detail,Do not include in total,در مجموع شامل نمی شود
 DocType: Company,Default Cost of Goods Sold Account,به طور پیش فرض هزینه از حساب کالاهای فروخته شده
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,لیست قیمت انتخاب نشده
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,لیست قیمت انتخاب نشده
 DocType: Employee,Family Background,سابقه خانواده
 DocType: Request for Quotation Supplier,Send Email,ارسال ایمیل
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},هشدار: پیوست معتبر {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,بدون اجازه
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},هشدار: پیوست معتبر {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,بدون اجازه
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,درخواست نقل قول
 DocType: Vital Signs,Heart Rate / Pulse,ضربان قلب / پالس
 DocType: Company,Default Bank Account,به طور پیش فرض حساب بانکی
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",برای فیلتر کردن بر اساس حزب، حزب انتخاب نوع اول
@@ -955,12 +973,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,مورد ردیف {IDX}: {} {DOCTYPE DOCNAME} در بالا وجود ندارد &#39;{} DOCTYPE جدول
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,برنامه زمانی {0} است در حال حاضر تکمیل و یا لغو
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,وظایف
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",روز از ماه که در آن خودکار صورتحساب خواهد شد به عنوان مثال 05، 28 و غیره تولید
 DocType: Item Variant Settings,Copy Fields to Variant,کپی زمینه به گزینه
 DocType: Asset,Opening Accumulated Depreciation,باز کردن استهلاک انباشته
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,امتیاز باید کمتر از یا برابر با 5 است
 DocType: Program Enrollment Tool,Program Enrollment Tool,برنامه ثبت نام ابزار
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,سوابق C-فرم
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,سوابق C-فرم
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,مشتری و تامین کننده
 DocType: Email Digest,Email Digest Settings,ایمیل تنظیمات خلاصه
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,از کار شما متشکرم!
@@ -978,13 +995,13 @@
 DocType: Request for Quotation Supplier,Quote Status,نقل قول وضعیت
 DocType: Maintenance Visit,Completion Status,وضعیت تکمیل
 DocType: HR Settings,Enter retirement age in years,سن بازنشستگی را وارد کنید در سال های
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,هدف انبار
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,لطفا یک انبار را انتخاب کنید
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,هدف انبار
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,لطفا یک انبار را انتخاب کنید
 DocType: Cheque Print Template,Starting location from left edge,محل شروع از لبه سمت چپ
 DocType: Item,Allow over delivery or receipt upto this percent,اجازه می دهد بیش از تحویل یا دریافت تا این درصد
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,واردات حضور و غیاب
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,همه گروه مورد
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,همه گروه مورد
 DocType: Process Payroll,Activity Log,گزارش فعالیت
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,سود خالص / از دست دادن
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,به طور خودکار نگارش پیام در ارائه معاملات.
@@ -996,7 +1013,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,پیش بینی تعداد
 DocType: Sales Invoice,Payment Due Date,پرداخت با توجه تاریخ
 DocType: Drug Prescription,Interval UOM,فاصله UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,مورد متغیر {0} در حال حاضر با ویژگی های همان وجود دارد
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,مورد متغیر {0} در حال حاضر با ویژگی های همان وجود دارد
+DocType: Item,Hub Publishing Details,جزئیات انتشار هاب
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;افتتاح&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,گسترش برای این کار
 DocType: Notification Control,Delivery Note Message,تحویل توجه داشته باشید پیام
@@ -1016,10 +1034,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: مواد اولیه نمی توانند همانند قسمت اصلی باشند
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,مجموع اتهامات قابل اجرا در خرید اقلام دریافت جدول باید همان مجموع مالیات و هزینه شود
 DocType: Sales Team,Incentives,انگیزه
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,برای هاب ثبت نام کنید
 DocType: SMS Log,Requested Numbers,شماره درخواست شده
 DocType: Production Planning Tool,Only Obtain Raw Materials,فقط دست آوردن مواد خام
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,ارزیابی عملکرد.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",فعال کردن «استفاده برای سبد خرید، به عنوان سبد خرید فعال باشد و باید حداقل یک قانون مالیاتی برای سبد خرید وجود داشته باشد
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",فعال کردن «استفاده برای سبد خرید، به عنوان سبد خرید فعال باشد و باید حداقل یک قانون مالیاتی برای سبد خرید وجود داشته باشد
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",ورود پرداخت {0} است که در برابر سفارش {1}، بررسی کنید که آن را باید به عنوان پیش در این فاکتور کشیده مرتبط است.
 DocType: Sales Invoice Item,Stock Details,جزئیات سهام
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,ارزش پروژه
@@ -1038,12 +1057,14 @@
 DocType: Salary Slip,Working Days,روزهای کاری
 DocType: Serial No,Incoming Rate,نرخ ورودی
 DocType: Packing Slip,Gross Weight,وزن ناخالص
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,نام شرکت خود را که برای آن شما راه اندازی این سیستم.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,فعال کردن مرکز
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,نام شرکت خود را که برای آن شما راه اندازی این سیستم.
 DocType: HR Settings,Include holidays in Total no. of Working Days,شامل تعطیلات در مجموع هیچ. از روز کاری
 DocType: Job Applicant,Hold,نگه داشتن
 DocType: Employee,Date of Joining,تاریخ پیوستن
 DocType: Naming Series,Update Series,به روز رسانی سری
 DocType: Supplier Quotation,Is Subcontracted,آیا واگذار شده
+DocType: Restaurant Table,Minimum Seating,حداقل صندلی
 DocType: Item Attribute,Item Attribute Values,مقادیر ویژگی مورد
 DocType: Examination Result,Examination Result,نتیجه آزمون
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,رسید خرید
@@ -1054,13 +1075,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},قادر به پیدا کردن شکاف زمان در آینده {0} روز برای عملیات {1}
 DocType: Production Order,Plan material for sub-assemblies,مواد را برای طرح زیر مجموعه
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,شرکای فروش و منطقه
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} باید فعال باشد
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} باید فعال باشد
 DocType: Journal Entry,Depreciation Entry,ورود استهلاک
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,لطفا ابتدا نوع سند را انتخاب کنید
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,لغو مواد بازدید {0} قبل از لغو این نگهداری سایت
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},سریال بدون {0} به مورد تعلق ندارد {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,مورد نیاز تعداد
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,انبارها با معامله موجود می توانید به دفتر تبدیل نمی کند.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,انبارها با معامله موجود می توانید به دفتر تبدیل نمی کند.
 DocType: Bank Reconciliation,Total Amount,مقدار کل
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,انتشارات اینترنت
 DocType: Prescription Duration,Number,عدد
@@ -1071,7 +1092,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,فهرست قیمت فروش
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.",در صورت چک، یک مشتری ایجاد خواهد شد، به بیمار نقشه گذاری می شود. صورتحساب بیمار علیه این مشتری ایجاد خواهد شد. شما همچنین می توانید مشتریان موجود را هنگام ایجاد بیمار انتخاب کنید.
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,انتشار همگام موارد
 DocType: Bank Reconciliation,Account Currency,حساب ارزی
 DocType: Lab Test,Sample ID,شناسه نمونه
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,لطفا در شرکت گرد حساب فعال ذکر
@@ -1080,11 +1100,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,کارمند {0} غیر فعال است و یا وجود ندارد
 DocType: Fee Structure,Components,اجزاء
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},لطفا دارایی رده در آیتم را وارد کنید {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,مورد انواع {0} به روز شده
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,مورد انواع {0} به روز شده
 DocType: Quality Inspection Reading,Reading 6,خواندن 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,آیا می توانم {0} {1} {2} بدون هیچ فاکتور برجسته منفی
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this",تولید می شود اگر به تأخیر افتاده است، شما باید به صورت دستی قسمت &quot;تکرار در روز ماه&quot; را تغییر دهید
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,آیا می توانم {0} {1} {2} بدون هیچ فاکتور برجسته منفی
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,فاکتور خرید پیشرفته
-DocType: Hub Settings,Sync Now,همگام سازی در حال حاضر
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},ردیف {0}: ورود اعتباری را نمی توان با مرتبط {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,تعریف بودجه برای یک سال مالی است.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,به طور پیش فرض حساب بانک / نقدی به طور خودکار در POS فاکتور به روز شده در زمانی که این حالت انتخاب شده است.
@@ -1096,13 +1117,13 @@
 DocType: Item,Is Purchase Item,آیا مورد خرید
 DocType: Asset,Purchase Invoice,فاکتورخرید
 DocType: Stock Ledger Entry,Voucher Detail No,جزئیات کوپن بدون
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,جدید فاکتور فروش
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,جدید فاکتور فروش
 DocType: Stock Entry,Total Outgoing Value,مجموع ارزش خروجی
 DocType: Physician,Appointments,قرار ملاقات ها
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,باز کردن تاریخ و بسته شدن تاریخ باید در همان سال مالی می شود
 DocType: Lead,Request for Information,درخواست اطلاعات
 ,LeaderBoard,رهبران
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,همگام سازی آفلاین فاکتورها
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,همگام سازی آفلاین فاکتورها
 DocType: Payment Request,Paid,پرداخت
 DocType: Program Fee,Program Fee,هزینه برنامه
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1121,11 +1142,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,خرید سفارش مورد
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,درآمد غیر مستقیم
 DocType: Student Attendance Tool,Student Attendance Tool,ابزار حضور دانش آموز
+DocType: Restaurant Menu,Price List (Auto created),لیست قیمت (خودکار ایجاد شده)
 DocType: Cheque Print Template,Date Settings,تنظیمات تاریخ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,واریانس
 ,Company Name,نام شرکت
 DocType: SMS Center,Total Message(s),پیام ها (بازدید کنندگان)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,انتخاب مورد انتقال
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,انتخاب مورد انتقال
 DocType: Purchase Invoice,Additional Discount Percentage,تخفیف اضافی درصد
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,نمایش یک لیست از تمام فیلم ها کمک
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,انتخاب سر حساب بانکی است که چک نهشته شده است.
@@ -1142,6 +1164,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,متر
 DocType: Workstation,Electricity Cost,هزینه برق
 DocType: HR Settings,Don't send Employee Birthday Reminders,آیا کارمند تولد یادآوری ارسال کنید
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,تنظیمات را ذخیره کن
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,محصولات مورد نیاز
 DocType: Item,Inspection Criteria,معیار بازرسی
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,انتقال
 DocType: BOM Website Item,BOM Website Item,BOM مورد وب سایت
@@ -1158,11 +1182,11 @@
 DocType: Journal Entry,Total Amount in Words,مقدار کل به عبارت
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,یک خطای وجود دارد. یکی از دلایل احتمالی میتواند این باشد که شما به صورت ذخیره نیست. لطفا support@erpnext.com تماس بگیرید اگر مشکل همچنان ادامه دارد.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,سبد من
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},نوع سفارش باید یکی از است {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},نوع سفارش باید یکی از است {0}
 DocType: Lead,Next Contact Date,تماس با آمار بعدی
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,باز کردن تعداد
 DocType: Healthcare Settings,Appointment Reminder,یادآوری انتصاب
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,لطفا حساب برای تغییر مقدار را وارد کنید
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,لطفا حساب برای تغییر مقدار را وارد کنید
 DocType: Student Batch Name,Student Batch Name,دانشجو نام دسته ای
 DocType: Consultation,Doctor,دکتر
 DocType: Holiday List,Holiday List Name,نام فهرست تعطیلات
@@ -1170,12 +1194,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,دوره برنامه
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,گزینه های سهام
 DocType: Journal Entry Account,Expense Claim,ادعای هزینه
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,آیا شما واقعا می خواهید برای بازگرداندن این دارایی اوراق؟
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},تعداد برای {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,آیا شما واقعا می خواهید برای بازگرداندن این دارایی اوراق؟
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},تعداد برای {0}
 DocType: Leave Application,Leave Application,مرخصی استفاده
 DocType: Patient,Patient Relation,رابطه بیمار
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,ترک ابزار تخصیص
+DocType: Item,Hub Category to Publish,رده توزیع برای انتشار
 DocType: Leave Block List,Leave Block List Dates,ترک فهرست بلوک خرما
+DocType: Sales Invoice,Billing Address GSTIN,آدرس پرداخت GSTIN
 DocType: Workstation,Net Hour Rate,خالص نرخ ساعت
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,هزینه فرود رسید خرید
 DocType: Company,Default Terms,به طور پیش فرض شرایط
@@ -1185,18 +1211,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},لطفا مشخص {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,موارد حذف شده بدون تغییر در مقدار یا ارزش.
 DocType: Delivery Note,Delivery To,تحویل به
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,جدول ویژگی الزامی است
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,جدول ویژگی الزامی است
 DocType: Production Planning Tool,Get Sales Orders,دریافت سفارشات فروش
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} نمی تواند منفی باشد
 DocType: Training Event,Self-Study,خودخوان
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,تخفیف
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,تخفیف
 DocType: Asset,Total Number of Depreciations,تعداد کل Depreciations
 DocType: Sales Invoice Item,Rate With Margin,نرخ با حاشیه
 DocType: Workstation,Wages,مزد
 DocType: Task,Urgent,فوری
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},لطفا یک ID ردیف معتبر برای ردیف {0} در جدول مشخص {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,قادر به پیدا کردن متغیر نیست
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,لطفا یک فیلد برای ویرایش از numpad انتخاب کنید
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,لطفا یک فیلد برای ویرایش از numpad انتخاب کنید
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,برو به دسکتاپ و شروع به استفاده ERPNext
 DocType: Item,Manufacturer,سازنده
 DocType: Landed Cost Item,Purchase Receipt Item,خرید آیتم رسید
@@ -1227,8 +1253,8 @@
 DocType: GL Entry,Against,در برابر
 DocType: Item,Default Selling Cost Center,مرکز هزینه پیش فرض فروش
 DocType: Sales Partner,Implementation Partner,شریک اجرای
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,کد پستی
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},سفارش فروش {0} است {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,کد پستی
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},سفارش فروش {0} است {1}
 DocType: Opportunity,Contact Info,اطلاعات تماس
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,ساخت نوشته های سهام
 DocType: Packing Slip,Net Weight UOM,وزن خالص UOM
@@ -1239,6 +1265,7 @@
 DocType: Holiday List,Get Weekly Off Dates,دریافت هفتگی فعال تاریخ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,تاریخ پایان نمی تواند کمتر از تاریخ شروع
 DocType: Sales Person,Select company name first.,انتخاب نام شرکت برای اولین بار.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,کم به زیاد
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,نقل قول از تولید کنندگان دریافت کرد.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,جایگزین BOM و به روز رسانی آخرین قیمت در تمام BOMs
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},به {0} | {1} {2}
@@ -1257,7 +1284,7 @@
 DocType: Program Enrollment,Transportation,حمل و نقل
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,ویژگی معتبر نیست
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} باید قطعی شود
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},تعداد باید کمتر یا مساوی به {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},تعداد باید کمتر یا مساوی به {0}
 DocType: SMS Center,Total Characters,مجموع شخصیت
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},لطفا BOM BOM در زمینه برای مورد را انتخاب کنید {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,جزئیات C-فرم فاکتور
@@ -1272,7 +1299,7 @@
 ,Ordered Items To Be Billed,آیتم ها دستور داد تا صورتحساب
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,از محدوده است که به کمتر از به محدوده
 DocType: Global Defaults,Global Defaults,به طور پیش فرض جهانی
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,پروژه دعوت همکاری
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,پروژه دعوت همکاری
 DocType: Salary Slip,Deductions,کسر
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,نام عمل
@@ -1290,13 +1317,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,فاکتور فروش پیشرفته
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,هیچ چیز برای درخواست
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},دیگری را ضبط بودجه &#39;{0}&#39; در حال حاضر در برابر وجود دارد {1} &#39;{2} برای سال مالی {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','تاریخ شروع واقعی' نمی تواند دیرتر از 'تاریخ پایان واقعی' باشد
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','تاریخ شروع واقعی' نمی تواند دیرتر از 'تاریخ پایان واقعی' باشد
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,اداره
 DocType: Cheque Print Template,Payer Settings,تنظیمات پرداخت کننده
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",این خواهد شد به کد مورد از نوع اضافه خواهد شد. برای مثال، اگر شما مخفف &quot;SM&quot; است، و کد مورد است &quot;تی شرت&quot;، کد مورد از نوع خواهد بود &quot;تی شرت-SM&quot;
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,پرداخت خالص (به عبارت) قابل مشاهده خواهد بود یک بار شما را لغزش حقوق و دستمزد را نجات دهد.
 DocType: Purchase Invoice,Is Return,آیا بازگشت
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,احتیاط
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,احتیاط
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,بازگشت / دبیت توجه
 DocType: Price List Country,Price List Country,لیست قیمت کشور
 DocType: Item,UOMs,UOMs
@@ -1311,17 +1338,18 @@
 DocType: Account,Balance Sheet,ترازنامه
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',مرکز مورد با کد آیتم های هزینه
 DocType: Fee Validity,Valid Till,تاخیر معتبر
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",حالت پرداخت پیکربندی نشده است. لطفا بررسی کنید، آیا حساب شده است در حالت پرداخت و یا در POS مشخصات تعیین شده است.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",حالت پرداخت پیکربندی نشده است. لطفا بررسی کنید، آیا حساب شده است در حالت پرداخت و یا در POS مشخصات تعیین شده است.
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,آیتم همان نمی تواند وارد شود چند بار.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",حساب های بیشتر می تواند در زیر گروه ساخته شده، اما مطالب را می توان در برابر غیر گروه ساخته شده
 DocType: Lead,Lead,راهبر
 DocType: Email Digest,Payables,حساب های پرداختنی
 DocType: Course,Course Intro,معرفی دوره
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,سهام ورودی {0} ایجاد
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفا شماره سریال را برای شرکت کنندگان از طریق Setup&gt; Numbering Series نصب کنید
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,سهام ورودی {0} ایجاد
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,ردیف # {0}: رد تعداد می توانید در خرید بازگشت نمی شود وارد
 ,Purchase Order Items To Be Billed,سفارش خرید گزینه هایی که صورتحساب
 DocType: Purchase Invoice Item,Net Rate,نرخ خالص
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,لطفا یک مشتری را انتخاب کنید
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,لطفا یک مشتری را انتخاب کنید
 DocType: Purchase Invoice Item,Purchase Invoice Item,خرید آیتم فاکتور
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,سهام لجر مطالب و GL مطالب برای دریافت خرید انتخاب reposted
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,مورد 1
@@ -1340,7 +1368,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},تکراری ردیف {0} را با همان {1}
 ,Trial Balance,آزمایش تعادل
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,سال مالی {0} یافت نشد
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,راه اندازی کارکنان
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,راه اندازی کارکنان
 DocType: Sales Order,SO-,بنابراین-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,لطفا ابتدا پیشوند انتخاب کنید
 DocType: Employee,O-,O-
@@ -1352,12 +1380,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,مشخصات لجر
 DocType: Grading Scale,Intervals,فواصل
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,قدیمیترین
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group",گروه مورد با همین نام وجود دارد، لطفا نام مورد تغییر یا تغییر نام گروه مورد
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group",گروه مورد با همین نام وجود دارد، لطفا نام مورد تغییر یا تغییر نام گروه مورد
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,شماره دانشجویی موبایل
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,بقیه دنیا
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,بقیه دنیا
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,مورد {0} می تواند دسته ای ندارد
 ,Budget Variance Report,گزارش انحراف از بودجه
 DocType: Salary Slip,Gross Pay,پرداخت ناخالص
+DocType: Item,Is Item from Hub,مورد از مرکز است
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,ردیف {0}: نوع فعالیت الزامی است.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,سود سهام پرداخت
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,حسابداری لجر
@@ -1367,8 +1396,9 @@
 DocType: Vehicle Log,Service Detail,جزئیات خدمات
 DocType: BOM,Item Description,مورد توضیحات
 DocType: Student Sibling,Student Sibling,دانشجو خواهر و برادر
-DocType: Purchase Invoice,Is Recurring,تکرارشونده است
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,حالت پرداخت
 DocType: Purchase Invoice,Supplied Items,اقلام عرضه
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},لطفا یک منوی فعال برای رستوران {0} تنظیم کنید
 DocType: Student,STUD.,گل میخ.
 DocType: Production Order,Qty To Manufacture,تعداد برای تولید
 DocType: Email Digest,New Income,درآمد جدید
@@ -1378,6 +1408,7 @@
 ,Student and Guardian Contact Details,دانشجویی و نگهبان اطلاعات تماس
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,ردیف {0}: عرضه کننده {0} آدرس ایمیل مورد نیاز برای ارسال ایمیل
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,افتتاح موقت
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,مراکز نمایش
 ,Employee Leave Balance,کارمند مرخصی تعادل
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},موجودی برای حساب {0} همیشه باید {1}
 DocType: Patient Appointment,More Info,اطلاعات بیشتر
@@ -1397,13 +1428,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,سفارش فروش {0} معتبر نیست
 DocType: Supplier Scorecard,Warn for new Request for Quotations,اخطار برای درخواست جدید برای نقل قول
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,سفارشات خرید به شما کمک کند برنامه ریزی و پیگیری خرید خود را
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged",با عرض پوزش، شرکت ها نمی توانند با هم ادغام شدند
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged",با عرض پوزش، شرکت ها نمی توانند با هم ادغام شدند
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,آزمایشات آزمایشی
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",کل مقدار شماره / انتقال {0} در درخواست پاسخ به مواد {1} \ نمی تواند بیشتر از مقدار درخواست {2} برای مورد {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,کوچک
 DocType: Employee,Employee Number,شماره کارمند
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},مورد هیچ (بازدید کنندگان) در حال حاضر در حال استفاده است. سعی کنید از مورد هیچ {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},مورد هیچ (بازدید کنندگان) در حال حاضر در حال استفاده است. سعی کنید از مورد هیچ {0}
 DocType: Project,% Completed,٪ تکمیل شده
 ,Invoiced Amount (Exculsive Tax),مقدار صورتحساب (Exculsive مالیات)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,آیتم 2
@@ -1418,11 +1449,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,هزینه های غیر مستقیم
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,ردیف {0}: تعداد الزامی است
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,کشاورزی
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,همگام سازی داده های کارشناسی ارشد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,همگام سازی داده های کارشناسی ارشد
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,محصولات  یا خدمات شما
 DocType: Special Test Items,Special Test Items,آیتم های تست ویژه
 DocType: Mode of Payment,Mode of Payment,نحوه پرداخت
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,وب سایت تصویر باید یک فایل عمومی و یا آدرس وب سایت می باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,وب سایت تصویر باید یک فایل عمومی و یا آدرس وب سایت می باشد
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,این یک گروه مورد ریشه است و نمی تواند ویرایش شود.
@@ -1430,24 +1461,23 @@
 DocType: Vehicle,Fuel UOM,UOM سوخت
 DocType: Warehouse,Warehouse Contact Info,انبار اطلاعات تماس
 DocType: Payment Entry,Write Off Difference Amount,نوشتن کردن مقدار تفاوت
-DocType: Purchase Invoice,Recurring Type,تکرار نوع
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent",{0}: ایمیل کارمند یافت نشد، از این رو ایمیل ارسال نمی
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent",{0}: ایمیل کارمند یافت نشد، از این رو ایمیل ارسال نمی
 DocType: Item,Foreign Trade Details,جزییات تجارت خارجی
+,Assessment Plan Status,وضعیت برنامه ارزیابی
 DocType: Email Digest,Annual Income,درآمد سالانه
 DocType: Serial No,Serial No Details,سریال جزئیات
 DocType: Purchase Invoice Item,Item Tax Rate,مورد نرخ مالیات
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,لطفا پزشک و تاریخ را انتخاب کنید
 DocType: Student Group Student,Group Roll Number,گروه شماره رول
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",برای {0}، تنها حساب های اعتباری می تواند در مقابل ورود بدهی دیگر مرتبط
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,در کل از همه وزن وظیفه باید باشد 1. لطفا وزن همه وظایف پروژه تنظیم بر این اساس
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,تحویل توجه داشته باشید {0} است ارسال نشده
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,در کل از همه وزن وظیفه باید باشد 1. لطفا وزن همه وظایف پروژه تنظیم بر این اساس
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,تحویل توجه داشته باشید {0} است ارسال نشده
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,مورد {0} باید مورد-فرعی قرارداد است
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,تجهیزات سرمایه
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",قانون قیمت گذاری شده است برای اولین بار بر اساس انتخاب &#39;درخواست در&#39; درست است که می تواند مورد، مورد گروه و یا تجاری.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,لطفا ابتدا کد مورد را تنظیم کنید
-DocType: Hub Settings,Seller Website,فروشنده وب سایت
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,لطفا ابتدا کد مورد را تنظیم کنید
 DocType: Item,ITEM-,آیتم
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,درصد اختصاص داده ها را برای تیم فروش باید 100 باشد
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,درصد اختصاص داده ها را برای تیم فروش باید 100 باشد
 DocType: Sales Invoice Item,Edit Description,ویرایش توضیحات
 DocType: Antibiotic,Antibiotic,آنتی بیوتیک
 ,Team Updates,به روز رسانی تیم
@@ -1468,12 +1498,12 @@
 DocType: Purchase Invoice,Total (Company Currency),مجموع (شرکت ارز)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,شماره سریال {0} وارد بیش از یک بار
 DocType: Depreciation Schedule,Journal Entry,ورودی دفتر
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} اقلام در پیشرفت
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} اقلام در پیشرفت
 DocType: Workstation,Workstation Name,نام ایستگاه های کاری
 DocType: Grading Scale Interval,Grade Code,کد کلاس
 DocType: POS Item Group,POS Item Group,POS مورد گروه
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ایمیل خلاصه:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} به مورد تعلق ندارد {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} به مورد تعلق ندارد {1}
 DocType: Sales Partner,Target Distribution,توزیع هدف
 DocType: Salary Slip,Bank Account No.,شماره حساب بانکی
 DocType: Naming Series,This is the number of the last created transaction with this prefix,این تعداد از آخرین معامله ایجاد شده با این پیشوند است
@@ -1489,10 +1519,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,درخواست برای عرضه دیگر
 DocType: Healthcare Settings,Registration Message,پیام ثبت نام
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,سخت افزار
-DocType: Sales Order,Recurring Upto,در محدوده زمانی معین تا حد
 DocType: Prescription Dosage,Prescription Dosage,نسخه تجویزی
 DocType: Attendance,HR Manager,مدیریت منابع انسانی
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,لطفا یک شرکت را انتخاب کنید
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,لطفا یک شرکت را انتخاب کنید
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,امتیاز مرخصی
 DocType: Purchase Invoice,Supplier Invoice Date,تامین کننده فاکتور عضویت
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,در هر
@@ -1508,10 +1537,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,شرایط با هم تداخل دارند بین:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,علیه مجله ورودی {0} در حال حاضر در برابر برخی از کوپن های دیگر تنظیم
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,مجموع ارزش ترتیب
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,غذا
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,غذا
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,محدوده سالمندی 3
 DocType: Maintenance Schedule Item,No of Visits,تعداد بازدید ها
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},برنامه تعمیر و نگهداری {0} در برابر وجود دارد {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,آیا می خواهید آیتم های خود را به هاب منتشر کنید؟
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,دانش آموز ثبت نام
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},نرخ ارز از بستن حساب باید {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},مجموع امتیاز ها برای تمام اهداف باید 100. شود این است که {0}
@@ -1522,9 +1552,9 @@
 DocType: Authorization Rule,Average Discount,میانگین تخفیف
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,نرم افزار
-DocType: Purchase Invoice Item,Accounting,حسابداری
+DocType: POS Profile,Accounting,حسابداری
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,لطفا دسته مورد برای بسته بندی های کوچک را انتخاب کنید
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,لطفا دسته مورد برای بسته بندی های کوچک را انتخاب کنید
 DocType: Asset,Depreciation Schedules,برنامه استهلاک
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,دوره نرم افزار می تواند دوره تخصیص مرخصی در خارج نیست
 DocType: Activity Cost,Projects,پروژه
@@ -1540,7 +1570,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',وضعیت تایید باید &quot;تایید&quot; یا &quot;رد&quot;
 DocType: Physician,Contacts and Address,مخاطبین و آدرس
 DocType: Purchase Invoice,Contact Person,شخص تماس
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"'تاریخ شروع پیش بینی شده' نمی تواند بیشتر از 'تاریخ پایان پیش بینی شده"" باشد"
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"'تاریخ شروع پیش بینی شده' نمی تواند بیشتر از 'تاریخ پایان پیش بینی شده"" باشد"
 DocType: Course Scheduling Tool,Course End Date,البته پایان تاریخ
 DocType: Holiday List,Holidays,تعطیلات
 DocType: Sales Order Item,Planned Quantity,تعداد برنامه ریزی شده
@@ -1548,10 +1578,11 @@
 DocType: Item,Maintain Stock,حفظ سهام
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,مطالب سهام در حال حاضر برای سفارش تولید ایجاد
 DocType: Employee,Prefered Email,ترجیح ایمیل
+DocType: Student Admission,Eligibility and Details,واجد شرایط بودن و جزئیات
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,تغییر خالص دارائی های ثابت در
 DocType: Leave Control Panel,Leave blank if considered for all designations,خالی بگذارید اگر برای همه در نظر گرفته نامگذاریهای
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,شارژ از نوع &#39;واقعی&#39; در ردیف {0} نمی تواند در مورد نرخ شامل
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},حداکثر: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},حداکثر: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,از تاریخ ساعت
 DocType: Email Digest,For Company,برای شرکت
 apps/erpnext/erpnext/config/support.py +17,Communication log.,ورود به سیستم ارتباطات.
@@ -1559,19 +1590,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,متغیر رتبه بندی کارت امتیازی تامین کننده
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,مقدار خرید
 DocType: Sales Invoice,Shipping Address Name,حمل و نقل آدرس
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,ساختار حسابها
 DocType: Material Request,Terms and Conditions Content,شرایط و ضوابط محتوا
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,نمی تواند بیشتر از ۱۰۰ باشد
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,مورد {0} است مورد سهام نمی
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,مورد {0} است مورد سهام نمی
 DocType: Maintenance Visit,Unscheduled,برنامه ریزی
 DocType: Employee,Owned,متعلق به
 DocType: Salary Detail,Depends on Leave Without Pay,بستگی به مرخصی بدون حقوق
 DocType: Pricing Rule,"Higher the number, higher the priority",شماره بالاتر، بالاتر اولویت
 ,Purchase Invoice Trends,خرید روند فاکتور
 DocType: Employee,Better Prospects,چشم انداز بهتر
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",ردیف # {0}: دسته {1} تنها {2} تعداد. لطفا دسته ای دیگر است که {3} تعداد موجود را انتخاب کنید و یا تقسیم ردیف به ردیف های متعدد، برای ارائه / موضوع از دسته های متعدد
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",ردیف # {0}: دسته {1} تنها {2} تعداد. لطفا دسته ای دیگر است که {3} تعداد موجود را انتخاب کنید و یا تقسیم ردیف به ردیف های متعدد، برای ارائه / موضوع از دسته های متعدد
 DocType: Vehicle,License Plate,پلاک وسیله نقلیه
 DocType: Appraisal,Goals,اهداف
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,مشخصات POS را انتخاب کنید
 DocType: Warranty Claim,Warranty / AMC Status,گارانتی / AMC وضعیت
 ,Accounts Browser,مرورگر حساب ها
 DocType: Payment Entry Reference,Payment Entry Reference,مرجع پرداخت ورودی
@@ -1589,7 +1620,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,کارمند نمی تواند به خود گزارش دهید.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",اگر حساب منجمد است، ورودی ها را به کاربران محدود شده مجاز می باشد.
 DocType: Email Digest,Bank Balance,بانک تعادل
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},ثبت حسابداری برای {0}: {1} تنها می تواند در ارز ساخته شده است: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},ثبت حسابداری برای {0}: {1} تنها می تواند در ارز ساخته شده است: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.",مشخصات شغلی، شرایط مورد نیاز و غیره
 DocType: Journal Entry Account,Account Balance,موجودی حساب
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,قانون مالیاتی برای معاملات.
@@ -1598,8 +1629,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),مجموع مالیات و هزینه (شرکت ارز)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,نمایش P &amp; L مانده سال مالی بستهنشده است
 DocType: Lab Test Template,Collection Details,جزئیات مجموعه
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0",cp.name را انتخاب کنید، cp.test_code، cp.parent، cp.invoice، ct.physician، ct.consultation_date را از tabConsultation ct، `tabLab Prescription` cp که ct.patient = &#39;{0}&#39; و cp.parent = ct را انتخاب کنید. نام و cp.test_created = 0
 DocType: Shipping Rule,Shipping Account,حساب های حمل و نقل
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: حساب {2} غیر فعال است
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,سفارشات فروش به شما کمک کند برنامه کار خود را و تحویل در زمان
@@ -1614,9 +1643,9 @@
 DocType: Asset Movement,Stock Manager,سهام مدیر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},انبار منبع برای ردیف الزامی است {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,بسته بندی لغزش
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,دفتر اجاره
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,اجاره دفتر
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,تنظیمات دروازه راه اندازی SMS
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,واردات نشد!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,واردات نشد!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,بدون آدرس اضافه نشده است.
 DocType: Workstation Working Hour,Workstation Working Hour,ایستگاه های کاری کار یک ساعت
 DocType: Vital Signs,Blood Pressure,فشار خون
@@ -1641,7 +1670,7 @@
 DocType: Sales Invoice,Source,منبع
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,نمایش بسته
 DocType: Leave Type,Is Leave Without Pay,آیا ترک کنی بدون اینکه پرداخت
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,دارایی رده برای آیتم دارائی های ثابت الزامی است
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,دارایی رده برای آیتم دارائی های ثابت الزامی است
 DocType: Fee Validity,Fee Validity,هزینه معتبر
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,هیچ ثبتی یافت نشد در جدول پرداخت
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},این {0} درگیری با {1} برای {2} {3}
@@ -1662,8 +1691,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,اجرایی جستجو
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,ایجاد منجر می شود
 DocType: Maintenance Schedule,Schedules,برنامه
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,مشخصات POS برای استفاده از Point-of-Sale مورد نیاز است
 DocType: Purchase Invoice Item,Net Amount,مقدار خالص
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} ارائه نشده است پس از عمل نمی تواند تکمیل شود
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} ارائه نشده است پس از عمل نمی تواند تکمیل شود
 DocType: Purchase Order Item Supplied,BOM Detail No,جزئیات BOM بدون
 DocType: Landed Cost Voucher,Additional Charges,هزینه های اضافی
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),تخفیف اضافی مبلغ (ارز شرکت)
@@ -1672,7 +1702,7 @@
 ,Support Hour Distribution,توزیع ساعت پشتیبانی
 DocType: Maintenance Visit,Maintenance Visit,نگهداری و تعمیرات مشاهده
 DocType: Student,Leaving Certificate Number,ترک شماره گواهینامه
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}",انتصاب لغو شد، لطفا فاکتور را بررسی کنید و لغو کنید {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}",انتصاب لغو شد، لطفا فاکتور را بررسی کنید و لغو کنید {0}
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,دسته موجود در انبار تعداد
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,به روز رسانی فرمت چاپ
 DocType: Landed Cost Voucher,Landed Cost Help,فرود هزینه راهنما
@@ -1695,8 +1725,8 @@
 DocType: Patient,Tobacco Past Use,استفاده از تنباکو گذشته
 DocType: Sales Invoice Item,Brand Name,نام تجاری
 DocType: Purchase Receipt,Transporter Details,اطلاعات حمل و نقل
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},{0} کاربر قبلا به پزشک متصل است {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,به طور پیش فرض ذخیره سازی برای آیتم انتخاب شده مورد نیاز است
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},{0} کاربر قبلا به پزشک متصل است {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,به طور پیش فرض ذخیره سازی برای آیتم انتخاب شده مورد نیاز است
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,جعبه
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,کننده ممکن
 DocType: Budget,Monthly Distribution,توزیع ماهانه
@@ -1706,7 +1736,7 @@
 DocType: Sales Partner,Sales Partner Target,فروش شریک هدف
 DocType: Loan Type,Maximum Loan Amount,حداکثر مبلغ وام
 DocType: Pricing Rule,Pricing Rule,قانون قیمت گذاری
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},تعداد رول تکراری برای دانشجویان {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},تعداد رول تکراری برای دانشجویان {0}
 DocType: Budget,Action if Annual Budget Exceeded,اکشن اگر بودجه سالانه بیش از حد
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,درخواست مواد به خرید سفارش
 DocType: Shopping Cart Settings,Payment Success URL,پرداخت موفقیت URL
@@ -1723,7 +1753,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} باید تنها یک بار ظاهر شود
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},مجاز به tranfer تر {0} از {1} در برابر سفارش خرید {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},برگ با موفقیت برای اختصاص {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,هیچ آیتمی برای بسته
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,هیچ آیتمی برای بسته
 DocType: Shipping Rule Condition,From Value,از ارزش
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,ساخت تعداد الزامی است
 DocType: Employee Loan,Repayment Method,روش بازپرداخت
@@ -1737,6 +1767,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,بدهی سهام
 DocType: Purchase Invoice,Supplier Warehouse,انبار عرضه کننده کالا
 DocType: Opportunity,Contact Mobile No,تماس با موبایل بدون
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,انتخاب شرکت
 ,Material Requests for which Supplier Quotations are not created,درخواست مواد که نقل قول تامین کننده ایجاد نمی
 DocType: Student Group,Set 0 for no limit,تنظیم 0 برای هیچ محدودیتی
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,روز (بازدید کنندگان) که در آن شما برای مرخصی استفاده از تعطیلات. شما نیاز به درخواست برای ترک نمی کند.
@@ -1746,24 +1777,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,را نقل قول
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,سایر گزارش
 DocType: Dependent Task,Dependent Task,وظیفه وابسته
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},عامل تبدیل واحد اندازه گیری پیش فرض از 1 باید در ردیف شود {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},عامل تبدیل واحد اندازه گیری پیش فرض از 1 باید در ردیف شود {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},مرخصی از نوع {0} نمی تواند بیش از {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,سعی کنید برنامه ریزی عملیات به مدت چند روز X در پیش است.
 DocType: HR Settings,Stop Birthday Reminders,توقف تولد یادآوری
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},لطفا پیش فرض حقوق و دستمزد پرداختنی حساب تعیین شده در شرکت {0}
 DocType: SMS Center,Receiver List,فهرست گیرنده
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,جستجو مورد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,جستجو مورد
 DocType: Patient Appointment,Referring Physician,پزشک ارجاع شده
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,مقدار مصرف
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,تغییر خالص در نقدی
 DocType: Assessment Plan,Grading Scale,مقیاس درجه بندی
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,واحد اندازه گیری {0} است بیش از یک بار در تبدیل فاکتور جدول وارد شده است
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,قبلا کامل شده
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,واحد اندازه گیری {0} است بیش از یک بار در تبدیل فاکتور جدول وارد شده است
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,قبلا کامل شده
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,سهام در دست
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},درخواست پرداخت از قبل وجود دارد {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,هزینه اقلام صادر شده
 DocType: Physician,Hospital,بیمارستان
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},تعداد نباید بیشتر از {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},تعداد نباید بیشتر از {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,قبلی سال مالی بسته نشده است
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),سن (روز)
 DocType: Quotation Item,Quotation Item,مورد نقل قول
@@ -1774,8 +1805,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,نوع منبع کارشناسی ارشد.
 DocType: Purchase Order Item,Supplier Part Number,تامین کننده شماره قسمت
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,نرخ تبدیل نمی تواند 0 یا 1
-DocType: Sales Invoice,Reference Document,سند مرجع
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} لغو و یا متوقف شده است
+DocType: Subscription,Reference Document,سند مرجع
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} لغو و یا متوقف شده است
 DocType: Accounts Settings,Credit Controller,کنترل اعتبار
 DocType: Delivery Note,Vehicle Dispatch Date,اعزام خودرو تاریخ
 DocType: Healthcare Settings,Default Medical Code Standard,استاندارد استاندارد پزشکی
@@ -1784,6 +1815,7 @@
 DocType: Company,Default Payable Account,به طور پیش فرض پرداختنی حساب
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",تنظیمات برای سبد خرید آنلاین مانند قوانین حمل و نقل، لیست قیمت و غیره
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}٪ صورتحساب شد
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,مرتب سازی بر اساس قیمت ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,این سایت متعلق به تعداد
 DocType: Party Account,Party Account,حساب حزب
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,منابع انسانی
@@ -1795,13 +1827,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,را پرداخت ورودی
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,ردیف {0}: پیشرفت در برابر کننده باید بدهی شود
 DocType: Company,Default Values,مقادیر پیش فرض
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{فرکانس} خلاصه
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{فرکانس} خلاصه
 DocType: Expense Claim,Total Amount Reimbursed,مقدار کل بازپرداخت
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,این است که در سیاهههای مربوط در برابر این خودرو است. مشاهده جدول زمانی زیر برای جزئیات
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},در برابر تامین کننده فاکتور {0} تاریخ {1}
 DocType: Customer,Default Price List,به طور پیش فرض لیست قیمت
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,ضبط حرکت دارایی {0} ایجاد
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,شما نمی توانید حذف سال مالی {0}. سال مالی {0} به عنوان پیش فرض در تنظیمات جهانی تنظیم
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,یک مشتری با همین نام قبلا وجود دارد
 DocType: Journal Entry,Entry Type,نوع ورودی
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,هیچ برنامه ارزیابی مرتبط با این گروه ارزیابی
 ,Customer Credit Balance,تعادل اعتباری مشتری
@@ -1811,7 +1844,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,قیمت گذاری
 DocType: Quotation,Term Details,جزییات مدت
 DocType: Project,Total Sales Cost (via Sales Order),کل هزینه فروش (از طریق سفارش فروش)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,نمی توانید بیش از {0} دانش آموزان برای این گروه از دانشجویان ثبت نام.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,نمی توانید بیش از {0} دانش آموزان برای این گروه از دانشجویان ثبت نام.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,تعداد سرب
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} باید بزرگتر از 0 باشد
 DocType: Manufacturing Settings,Capacity Planning For (Days),برنامه ریزی ظرفیت برای (روز)
@@ -1827,9 +1860,11 @@
 DocType: Lab Test,Technician Name,نام تکنسین
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,قطع ارتباط پرداخت در لغو فاکتور
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},خواندن کیلومترشمار فعلی وارد باید بیشتر از اولیه خودرو کیلومترشمار شود {0}
+DocType: Restaurant Reservation,No Show,بدون نمایش
 DocType: Shipping Rule Country,Shipping Rule Country,قانون حمل و نقل کشور
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,حضور و غیاب
 DocType: Maintenance Visit,Partially Completed,نیمه تکمیل شده
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,حساسیت متوسط
 DocType: Leave Type,Include holidays within leaves as leaves,شامل تعطیلات در برگ برگ
 DocType: Sales Invoice,Packed Items,آیتم ها بسته بندی شده
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,ادعای ضمانت نامه در مقابل شماره سریال
@@ -1846,13 +1881,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),مبلغ پرداخت شده (شرکت ارز)
 DocType: Purchase Invoice,Additional Discount,تخفیف اضافی
 DocType: Selling Settings,Selling Settings,فروش تنظیمات
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,تأیید اقدام
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,مزایده آنلاین
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,لطفا یا مقدار و یا نرخ گذاری و یا هر دو مشخص
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,انجام
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,نمایش سبد خرید
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,هزینه های بازاریابی
 ,Item Shortage Report,مورد گزارش کمبود
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",وزن ذکر شده است، \ n لطفا ذکر &quot;وزن UOM&quot; بیش از حد
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",وزن ذکر شده است، \ n لطفا ذکر &quot;وزن UOM&quot; بیش از حد
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,درخواست مواد مورد استفاده در ساخت این سهام ورود
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,بعدی تاریخ استهلاک برای دارایی جدید الزامی است
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,جدا البته گروه بر اساس برای هر دسته ای
@@ -1864,12 +1900,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,را حسابداری برای ورود به جنبش هر سهام
 DocType: Leave Allocation,Total Leaves Allocated,مجموع برگ اختصاص داده شده
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},انبار مورد نیاز در ردیف بدون {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,لطفا معتبر مالی سال تاریخ شروع و پایان را وارد کنید
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,لطفا معتبر مالی سال تاریخ شروع و پایان را وارد کنید
 DocType: Employee,Date Of Retirement,تاریخ بازنشستگی
 DocType: Upload Attendance,Get Template,دریافت قالب
 DocType: Material Request,Transferred,منتقل شده
 DocType: Vehicle,Doors,درب
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext راه اندازی کامل!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext راه اندازی کامل!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,جمع آوری هزینه ثبت نام بیمار
 DocType: Course Assessment Criteria,Weightage,بین وزنها
 DocType: Purchase Invoice,Tax Breakup,فروپاشی مالیات
@@ -1888,36 +1924,36 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",اگر این فقره انواع، سپس آن را نمی تواند در سفارشات فروش و غیره انتخاب شود
 DocType: Lead,Next Contact By,بعد تماس با
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},تعداد در ردیف مورد نیاز برای مورد {0} {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},تعداد در ردیف مورد نیاز برای مورد {0} {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},انبار {0} نمی تواند حذف شود مقدار برای مورد وجود دارد {1}
 DocType: Quotation,Order Type,نوع سفارش
-DocType: Purchase Invoice,Notification Email Address,هشدار از طریق ایمیل
 ,Item-wise Sales Register,مورد عاقلانه فروش ثبت نام
 DocType: Asset,Gross Purchase Amount,مبلغ خرید خالص
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,تعادل افتتاحیه
 DocType: Asset,Depreciation Method,روش استهلاک
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,آفلاین
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,آفلاین
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,آیا این مالیات شامل در نرخ پایه؟
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,مجموع هدف
 DocType: Job Applicant,Applicant for a Job,متقاضی برای شغل
 DocType: Production Plan Material Request,Production Plan Material Request,تولید درخواست پاسخ به طرح مواد
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,بدون سفارشات تولید ایجاد
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,بدون سفارشات تولید ایجاد
 DocType: Stock Reconciliation,Reconciliation JSON,آشتی JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ستون های بسیاری. صادرات این گزارش و با استفاده از یک برنامه صفحه گسترده آن را چاپ.
 DocType: Purchase Invoice Item,Batch No,دسته بدون
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},درخواست نقل قول: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,اجازه چندین سفارشات فروش در برابر خرید سفارش مشتری
 DocType: Student Group Instructor,Student Group Instructor,مربی دانشجویی گروه
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 موبایل بدون
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,اصلی
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,اصلی
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,نوع دیگر
 DocType: Naming Series,Set prefix for numbering series on your transactions,تنظیم پیشوند برای شماره سری در معاملات خود را
 DocType: Employee Attendance Tool,Employees HTML,کارمندان HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,به طور پیش فرض BOM ({0}) باید برای این آیتم به و یا قالب آن فعال باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,به طور پیش فرض BOM ({0}) باید برای این آیتم به و یا قالب آن فعال باشد
 DocType: Employee,Leave Encashed?,ترک نقد شدنی؟
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,فرصت از فیلد اجباری است
 DocType: Email Digest,Annual Expenses,هزینه سالانه
 DocType: Item,Variants,انواع
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,را سفارش خرید
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,را سفارش خرید
 DocType: SMS Center,Send To,فرستادن به
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},است تعادل مرخصی به اندازه کافی برای مرخصی نوع وجود ندارد {0}
 DocType: Payment Reconciliation Payment,Allocated amount,مقدار اختصاص داده شده
@@ -1933,6 +1969,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,قدرت دانشجویی گروه
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,علیه مجله ورودی {0} هیچ بی بدیل {1} ورود ندارد
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,ارزیابی
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,رویدادهای آموزشی
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},تکراری سریال بدون برای مورد وارد {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,یک شرط برای یک قانون ارسال کالا
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,لطفا وارد
@@ -1942,7 +1979,7 @@
 DocType: Sales Order,To Deliver and Bill,برای ارائه و بیل
 DocType: Student Group,Instructors,آموزش
 DocType: GL Entry,Credit Amount in Account Currency,مقدار اعتبار در حساب ارز
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} باید ارائه شود
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} باید ارائه شود
 DocType: Authorization Control,Authorization Control,کنترل مجوز
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ردیف # {0}: رد انبار در برابر رد مورد الزامی است {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,پرداخت
@@ -1961,11 +1998,11 @@
 DocType: Quotation Item,Actual Qty,تعداد واقعی
 DocType: Sales Invoice Item,References,مراجع
 DocType: Quality Inspection Reading,Reading 10,خواندن 10
-DocType: Hub Settings,Hub Node,مرکز گره
+DocType: Hub Category,Hub Node,مرکز گره
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,شما وارد آیتم های تکراری شده اید   لطفا تصحیح و دوباره سعی کنید.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,وابسته
 DocType: Asset Movement,Asset Movement,جنبش دارایی
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,سبد خرید
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,سبد خرید
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,مورد {0} است مورد سریال نه
 DocType: SMS Center,Create Receiver List,ایجاد فهرست گیرنده
 DocType: Vehicle,Wheels,چرخ ها
@@ -1979,15 +2016,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,ارتباطات
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),نشان می دهد که بسته به بخشی از این تحویل (فقط پیش نویس) است
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,ورود را پرداخت
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},تعداد برای مورد {0} باید کمتر از است {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},تعداد برای مورد {0} باید کمتر از است {1}
 ,Sales Invoice Trends,فروش روند فاکتور
 DocType: Leave Application,Apply / Approve Leaves,درخواست / برگ تصویب
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,برای
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,برای
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',می توانید ردیف مراجعه تنها در صورتی که نوع اتهام است &#39;در مقدار قبلی ردیف &quot;یا&quot; قبل ردیف ها&#39;
 DocType: Sales Order Item,Delivery Warehouse,انبار تحویل
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,درخت مراکز هزینه مالی.
 DocType: Serial No,Delivery Document No,تحویل اسناد بدون
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},لطفا &quot;به دست آوردن حساب / از دست دادن در دفع دارایی، مجموعه ای در شرکت {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},لطفا &quot;به دست آوردن حساب / از دست دادن در دفع دارایی، مجموعه ای در شرکت {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,گرفتن اقلام از دریافت خرید
 DocType: Serial No,Creation Date,تاریخ ایجاد
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},مورد {0} چند بار به نظر می رسد در لیست قیمت {1}
@@ -1998,11 +2035,12 @@
 DocType: Student,Student Mobile Number,دانشجو شماره موبایل
 DocType: Item,Has Variants,دارای انواع
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,به روز رسانی پاسخ
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},شما در حال حاضر اقلام از انتخاب {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},شما در حال حاضر اقلام از انتخاب {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,نام توزیع ماهانه
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,دسته ID الزامی است
 DocType: Sales Person,Parent Sales Person,شخص پدر و مادر فروش
-DocType: Purchase Invoice,Recurring Invoice,فاکتور در محدوده زمانی معین
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,بالا به پایین
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,ابتدا برنامه را انتخاب کنید
 DocType: Patient Appointment,Patient Age,سن بیمار
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,مدیریت پروژه
 DocType: Supplier,Supplier of Goods or Services.,تامین کننده کالا یا خدمات.
@@ -2010,8 +2048,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,حساب های دریافتی قابل پیش بینی که باید در بیمار برای هزینه های مشاوره در نظر گرفته شوند استفاده می شود.
 DocType: Vehicle Log,Fuel Price,قیمت سوخت
 DocType: Budget,Budget,بودجه
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,تنظیم باز کنید
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,مورد دارائی های ثابت باید یک آیتم غیر سهام باشد.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,تنظیم باز کنید
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,مورد دارائی های ثابت باید یک آیتم غیر سهام باشد.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",بودجه می توانید در برابر {0} اختصاص داده نمی شود، آن را به عنوان یک حساب کاربری درآمد یا هزینه نیست
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,به دست آورد
 DocType: Student Admission,Application Form Route,فرم درخواست مسیر
@@ -2025,12 +2063,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,مورد {0} است راه اندازی برای سریال شماره ندارید. استاد مورد
 DocType: Maintenance Visit,Maintenance Time,زمان نگهداری
 ,Amount to Deliver,مقدار برای ارائه
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},یک مورد چند بار وارد شده است {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,تاریخ شروع ترم نمی تواند زودتر از تاریخ سال شروع سال تحصیلی که مدت مرتبط است باشد (سال تحصیلی {}). لطفا تاریخ های صحیح و دوباره امتحان کنید.
 DocType: Guardian,Guardian Interests,نگهبان علاقه مندی ها
 DocType: Naming Series,Current Value,ارزش فعلی
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,سال مالی متعدد برای تاریخ {0} وجود داشته باشد. لطفا شرکت راه در سال مالی
 DocType: School Settings,Instructor Records to be created by,اسناد مدرس توسط توسط
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} ایجاد شد
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} ایجاد شد
 DocType: Delivery Note Item,Against Sales Order,در برابر سفارش فروش
 ,Serial No Status,سریال نیست
 DocType: Payment Entry Reference,Outstanding,برجسته
@@ -2040,10 +2079,10 @@
 						must be greater than or equal to {2}",ردیف {0}: برای تنظیم دوره تناوب {1}، تفاوت بین از و تا به امروز \ باید بزرگتر یا مساوی به صورت {2}
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,این است که در جنبش سهام است. مشاهده {0} برای جزئیات
 DocType: Pricing Rule,Selling,فروش
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},مقدار {0} {1} کسر شود {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},مقدار {0} {1} کسر شود {2}
 DocType: Employee,Salary Information,اطلاعات حقوق و دستمزد
 DocType: Sales Person,Name and Employee ID,نام و کارمند ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,تاریخ را نمی توان قبل از ارسال تاریخ
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,تاریخ را نمی توان قبل از ارسال تاریخ
 DocType: Website Item Group,Website Item Group,وب سایت مورد گروه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,وظایف و مالیات
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,لطفا تاریخ مرجع وارد
@@ -2069,7 +2108,7 @@
 DocType: Issue,Resolution Details,جزییات قطعنامه
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,تخصیص
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,ملاک پذیرش
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,لطفا درخواست مواد در جدول فوق را وارد کنید
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,لطفا درخواست مواد در جدول فوق را وارد کنید
 DocType: Item Attribute,Attribute Name,نام مشخصه
 DocType: BOM,Show In Website,نمایش در وب سایت
 DocType: Shopping Cart Settings,Show Quantity in Website,نمایش تعداد در وب سایت
@@ -2078,7 +2117,7 @@
 DocType: Item Reorder,Check in (group),بررسی در (گروه)
 ,Qty to Order,تعداد سفارش
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked",سر حساب تحت مسئولیت و یا حقوق صاحبان سهام، که در آن سود / زیان رزرو خواهد شد
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,گانت چارت از همه وظایف.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,گانت چارت از همه وظایف.
 DocType: Opportunity,Mins to First Response,دقیقه به پاسخ اول
 DocType: Pricing Rule,Margin Type,نوع حاشیه
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} ساعت
@@ -2099,35 +2138,35 @@
 DocType: Patient,Surgical History,تاریخ جراحی
 DocType: Employee,Resignation Letter Date,استعفای نامه تاریخ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,مشاهده قوانین قیمت گذاری بیشتر بر اساس مقدار فیلتر شده است.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},لطفا مجموعه ای از تاریخ پیوستن برای کارمند {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},لطفا مجموعه ای از تاریخ پیوستن برای کارمند {0}
 DocType: Task,Total Billing Amount (via Time Sheet),مبلغ کل حسابداری (از طریق زمان ورق)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,تکرار درآمد و ضوابط
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) باید اجازه 'تاییدو امضا کننده هزینه' را داشته باشید
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,جفت
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,انتخاب کنید BOM و تعداد برای تولید
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,انتخاب کنید BOM و تعداد برای تولید
 DocType: Asset,Depreciation Schedule,برنامه استهلاک
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,آدرس فروش شریک و اطلاعات تماس
 DocType: Bank Reconciliation Detail,Against Account,به حساب
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,نیم تاریخ روز باید بین از تاریخ و به روز می شود
 DocType: Maintenance Schedule Detail,Actual Date,تاریخ واقعی
 DocType: Item,Has Batch No,دارای دسته ای بدون
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},صدور صورت حساب سالانه: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},صدور صورت حساب سالانه: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),محصولات و خدمات مالیاتی (GST هند)
 DocType: Delivery Note,Excise Page Number,مالیات کالاهای داخلی صفحه شماره
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory",شرکت، از تاریخ و تا به امروز الزامی است
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,از مشاوره بگیرید
 DocType: Asset,Purchase Date,تاریخ خرید
 DocType: Employee,Personal Details,اطلاعات شخصی
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},لطفا دارایی مرکز استهلاک هزینه در شرکت راه {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},لطفا دارایی مرکز استهلاک هزینه در شرکت راه {0}
 ,Maintenance Schedules,برنامه های  نگهداری و تعمیرات
 DocType: Task,Actual End Date (via Time Sheet),واقعی پایان تاریخ (از طریق زمان ورق)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},مقدار {0} {1} در برابر {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},مقدار {0} {1} در برابر {2} {3}
 ,Quotation Trends,روند نقل قول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},مورد گروه در مورد استاد برای آیتم ذکر نشده {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,بدهی به حساب باید یک حساب کاربری دریافتنی است
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,بدهی به حساب باید یک حساب کاربری دریافتنی است
 DocType: Shipping Rule Condition,Shipping Amount,مقدار حمل و نقل
 DocType: Supplier Scorecard Period,Period Score,امتیاز دوره
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,اضافه کردن مشتریان
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,اضافه کردن مشتریان
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,در انتظار مقدار
 DocType: Lab Test Template,Special,ویژه
 DocType: Purchase Invoice Item,Conversion Factor,عامل تبدیل
@@ -2135,13 +2174,14 @@
 ,Vehicle Expenses,هزینه های خودرو
 DocType: Serial No,Invoice Details,جزئیات فاکتور
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},مقدار مورد انتظار پس از عمر مفید باید بزرگتر یا مساوی به {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,شروع کن
+DocType: Hub Category,Hub Category,رده هاب
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,تعداد خودرو
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,از تاریخ تکرار می شود فاکتور را متوقف خواهد کرد
 DocType: Employee Loan,Loan Amount,مبلغ وام
 DocType: Program Enrollment,Self-Driving Vehicle,خودرو بدون راننده
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,کارت امتیازی کارت اعتباری
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},ردیف {0}: بیل از مواد برای موردی یافت نشد {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},ردیف {0}: بیل از مواد برای موردی یافت نشد {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,مجموع برگ اختصاص داده {0} نمی تواند کمتر از برگ حال حاضر مورد تایید {1} برای دوره
 DocType: Journal Entry,Accounts Receivable,حسابهای دریافتنی
 ,Supplier-Wise Sales Analytics,تامین کننده حکیم فروش تجزیه و تحلیل ترافیک
@@ -2152,7 +2192,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)",دوره پدر و مادر (خالی بگذارید، در صورتی که این بخشی از پدر و مادر البته)
 DocType: Leave Control Panel,Leave blank if considered for all employee types,خالی بگذارید اگر برای همه نوع کارمند در نظر گرفته
 DocType: Landed Cost Voucher,Distribute Charges Based On,توزیع اتهامات بر اساس
-apps/erpnext/erpnext/hooks.py +131,Timesheets,برنامه های زمانی
+apps/erpnext/erpnext/hooks.py +140,Timesheets,برنامه های زمانی
 DocType: HR Settings,HR Settings,تنظیمات HR
 DocType: Salary Slip,net pay info,اطلاعات خالص دستمزد
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,این مقدار در لیست قیمت پیش فروش فروش به روز می شود.
@@ -2163,7 +2203,7 @@
 DocType: Patient,B Positive,B مثبت
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",ردیف # {0}: تعداد باید 1 باشد، به عنوان مورد دارایی ثابت است. لطفا ردیف جداگانه برای تعداد متعدد استفاده کنید.
 DocType: Leave Block List Allow,Leave Block List Allow,ترک فهرست بلوک اجازه
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,مخفف نمیتواند خالی یا space باشد
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,مخفف نمیتواند خالی یا space باشد
 DocType: Patient Medical Record,Patient Medical Record,پرونده پزشکی بیمار
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,گروه به غیر گروه
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ورزشی
@@ -2179,9 +2219,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,قادر به پیدا کردن نرخ ارز برای {0} به {1} برای تاریخ های کلیدی {2}. لطفا یک رکورد ارز دستی ایجاد کنید
 DocType: POS Profile,Price List,لیست قیمت
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} در حال حاضر به طور پیش فرض سال مالی. لطفا مرورگر خود را برای تغییر تاثیر گذار تازه کردن.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,ادعاهای هزینه
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,ادعاهای هزینه
 DocType: Issue,Support,پشتیبانی
 ,BOM Search,BOM جستجو
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",&quot;انبار&quot; یا &quot;موجود در انبار&quot; را در هاب منتشر کنید براساس موجودی موجود در این انبار.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),بسته شدن (باز مجموع +)
 DocType: Vehicle,Fuel Type,نوع سوخت
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,لطفا ارز در شرکت مشخص
@@ -2193,16 +2234,16 @@
 DocType: Healthcare Settings,Remind Before,قبل از یادآوری
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},عامل UOM تبدیل در ردیف مورد نیاز است {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",ردیف # {0}: مرجع نوع سند باید یکی از سفارش فروش، فاکتور فروش و یا ورود به مجله می شود
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",ردیف # {0}: مرجع نوع سند باید یکی از سفارش فروش، فاکتور فروش و یا ورود به مجله می شود
 DocType: Salary Component,Deduction,کسر
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,ردیف {0}: از زمان و به زمان الزامی است.
 DocType: Stock Reconciliation Item,Amount Difference,تفاوت در مقدار
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},مورد قیمت های اضافه شده برای {0} در لیست قیمت {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},مورد قیمت های اضافه شده برای {0} در لیست قیمت {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,لطفا کارمند شناسه را وارد این فرد از فروش
 DocType: Territory,Classification of Customers by region,طبقه بندی مشتریان بر اساس منطقه
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,مقدار تفاوت باید صفر باشد
 DocType: Project,Gross Margin,حاشیه ناخالص
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,لطفا ابتدا وارد مورد تولید
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,لطفا ابتدا وارد مورد تولید
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,محاسبه تعادل بیانیه بانک
 DocType: Normal Test Template,Normal Test Template,الگو آزمون عادی
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,کاربر غیر فعال
@@ -2212,21 +2253,22 @@
 DocType: Salary Slip,Total Deduction,کسر مجموع
 ,Production Analytics,تجزیه و تحلیل ترافیک تولید
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,این بر مبنای معاملات در برابر این بیمار است. برای جزئیات بیشتر به جدول زمانی زیر مراجعه کنید
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,هزینه به روز رسانی
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,هزینه به روز رسانی
 DocType: Employee,Date of Birth,تاریخ تولد
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,مورد {0} در حال حاضر بازگشت شده است
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ** سال مالی نشان دهنده یک سال مالی. تمام پست های حسابداری و دیگر معاملات عمده در برابر سال مالی ** ** ردیابی.
 DocType: Opportunity,Customer / Lead Address,مشتری / سرب آدرس
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,تنظیم کارت امتیازی تامین کننده
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},هشدار: گواهینامه SSL نامعتبر در پیوست {0}
-DocType: Student Admission,Eligibility,شایستگی
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,نام طرح ارزیابی
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},هشدار: گواهینامه SSL نامعتبر در پیوست {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads",آگهی های کمک به شما کسب و کار، اضافه کردن اطلاعات تماس خود را و بیشتر به عنوان منجر خود را
 DocType: Production Order Operation,Actual Operation Time,عملیات واقعی زمان
 DocType: Authorization Rule,Applicable To (User),به قابل اجرا (کاربر)
 DocType: Purchase Taxes and Charges,Deduct,کسر کردن
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,شرح شغل
 DocType: Student Applicant,Applied,کاربردی
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,باز کردن مجدد
 DocType: Sales Invoice Item,Qty as per Stock UOM,تعداد در هر بورس UOM
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,نام Guardian2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",کاراکترهای خاص به جز &quot;-&quot; &quot;.&quot;، &quot;#&quot;، و &quot;/&quot; در نامگذاری سری مجاز نیست
@@ -2238,7 +2280,7 @@
 DocType: Request for Quotation,Manufacturing Manager,ساخت مدیر
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},سریال بدون {0} است تحت گارانتی تا {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,تقسیم توجه داشته باشید تحویل بسته بندی شده.
-apps/erpnext/erpnext/hooks.py +98,Shipments,محموله
+apps/erpnext/erpnext/hooks.py +107,Shipments,محموله
 DocType: Payment Entry,Total Allocated Amount (Company Currency),مجموع مقدار اختصاص داده شده (شرکت ارز)
 DocType: Purchase Order Item,To be delivered to customer,به مشتری تحویل
 DocType: BOM,Scrap Material Cost,هزینه ضایعات مواد
@@ -2260,8 +2302,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,مورد تنظیمات Variant
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,انتخاب شرکت ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,خالی بگذارید اگر برای همه گروه ها در نظر گرفته
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",انواع اشتغال (دائمی، قرارداد، و غیره کارآموز).
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} برای آیتم الزامی است {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).",انواع اشتغال (دائمی، قرارداد، و غیره کارآموز).
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} برای آیتم الزامی است {1}
 DocType: Process Payroll,Fortnightly,دوهفتگی
 DocType: Currency Exchange,From Currency,از ارز
 DocType: Vital Signs,Weight (In Kilogram),وزن (در کیلوگرم)
@@ -2285,7 +2327,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,لطفا بر روی &#39;ایجاد برنامه&#39; کلیک کنید برای دریافت برنامه
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,خطاهای حین حذف برنامه زیر وجود دارد:
 DocType: Bin,Ordered Quantity,تعداد دستور داد
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",به عنوان مثال &quot;ابزار برای سازندگان ساخت&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",به عنوان مثال &quot;ابزار برای سازندگان ساخت&quot;
 DocType: Grading Scale,Grading Scale Intervals,بازه مقیاس درجه بندی
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: ثبت حسابداری برای {2} تنها می تواند در ارز ساخته شده است: {3}
 DocType: Production Order,In Process,در حال انجام
@@ -2308,11 +2350,10 @@
 DocType: Purchase Invoice,With Payment of Tax,با پرداخت مالیات
 DocType: Expense Claim Detail,Expense Claim Detail,هزینه جزئیات درخواست
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,سه نسخه عرضه کننده
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,لطفا به حساب صحیح را انتخاب کنید
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,لطفا به حساب صحیح را انتخاب کنید
 DocType: Item,Weight UOM,وزن UOM
 DocType: Salary Structure Employee,Salary Structure Employee,کارمند ساختار حقوق و دستمزد
 DocType: Patient,Blood Group,گروه خونی
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,در انتظار
 DocType: Course,Course Name,نام دوره
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,کاربرانی که می توانند برنامه های مرخصی یک کارمند خاص را تایید
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,تجهیزات اداری
@@ -2331,7 +2372,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,قیمت نشان داده نخواهد شد اگر لیست قیمت تنظیم نشده است
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,لطفا یک کشور برای این قانون حمل و نقل مشخص و یا بررسی حمل و نقل در سراسر جهان
 DocType: Stock Entry,Total Incoming Value,مجموع ارزش ورودی
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,بدهکاری به مورد نیاز است
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,بدهکاری به مورد نیاز است
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",برنامه های زمانی کمک به پیگیری از زمان، هزینه و صدور صورت حساب برای فعالیت های انجام شده توسط تیم خود را
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,خرید لیست قیمت
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,الگوهای متغیرهای کارت امتیازی تامین کننده.
@@ -2341,7 +2382,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,آشتی پرداخت
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,لطفا نام Incharge فرد را انتخاب کنید
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,تکنولوژی
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},مجموع پرداخت نشده: {0}
+DocType: Hub Settings,Unregister from Hub,ثبت نام از مرکز
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},مجموع پرداخت نشده: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM وب سایت عملیات
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,ارائه نامه
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,تولید مواد درخواست (MRP) و سفارشات تولید.
@@ -2353,7 +2395,9 @@
 DocType: Physician Schedule Time Slot,To Time,به زمان
 DocType: Authorization Rule,Approving Role (above authorized value),تصویب نقش (بالاتر از ارزش مجاز)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,اعتبار به حساب باید یک حساب کاربری پرداختنی شود
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},بازگشت BOM: {0} می تواند پدر و مادر یا فرزند نمی {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,لطفا پذیرش دانشجویی را انتخاب کنید که برای متقاضی دانشجویی پرداخت شده است
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},بازگشت BOM: {0} می تواند پدر و مادر یا فرزند نمی {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,لطفا لیست قیمت را برای انتشار قیمت گذاری انتخاب کنید
 DocType: Production Order Operation,Completed Qty,تکمیل تعداد
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",برای {0}، تنها حساب های بانکی را می توان در برابر ورود اعتباری دیگر مرتبط
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,لیست قیمت {0} غیر فعال است
@@ -2365,38 +2409,39 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} شماره سریال مورد نیاز برای مورد {1}. شما فراهم کرده اید {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,نرخ گذاری کنونی
 DocType: Item,Customer Item Codes,کدهای مورد مشتری
+DocType: Training Event,Advance,پیشرفت
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,برای تکرار دوباره
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,تبادل کاهش / افزایش
 DocType: Opportunity,Lost Reason,از دست داده دلیل
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,آدرس جدید
 DocType: Quality Inspection,Sample Size,اندازهی نمونه
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,لطفا سند دریافت وارد کنید
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,همه موارد در حال حاضر صورتحساب شده است
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',لطفا یک معتبر را مشخص &#39;از مورد شماره&#39;
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',لطفا یک معتبر را مشخص &#39;از مورد شماره&#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,مراکز هزینه به علاوه می تواند در زیر گروه ساخته شده اما مطالب را می توان در برابر غیر گروه ساخته شده
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,کاربران و ویرایش
 DocType: Vehicle Log,VLOG.,را ثبت کنید.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},سفارشات تولید ایجاد شده: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},سفارشات تولید ایجاد شده: {0}
 DocType: Branch,Branch,شاخه
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,چاپ و علامت گذاری
 DocType: Company,Total Monthly Sales,کل فروش ماهانه
 DocType: Bin,Actual Quantity,تعداد واقعی
 DocType: Shipping Rule,example: Next Day Shipping,به عنوان مثال: حمل و نقل روز بعد
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,سریال بدون {0} یافت نشد
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},اشتراک {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},اشتراک {0}
 DocType: Fee Schedule Program,Fee Schedule Program,برنامه برنامه ریزی هزینه
 DocType: Fee Schedule Program,Student Batch,دسته ای دانشجویی
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,را انتخاب کنید * از نشانه های tabVital &quot;که در آن patient = &#39;{0}&#39; سفارش با محدودیت های تشخیص نشانه ها 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,دانشجویی
 DocType: Supplier Scorecard Scoring Standing,Min Grade,درجه درجه
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},از شما دعوت شده برای همکاری در این پروژه: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},پزشک در {0} موجود نیست
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},از شما دعوت شده برای همکاری در این پروژه: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},پزشک در {0} موجود نیست
 DocType: Leave Block List Date,Block Date,بلوک عضویت
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},فیلد Subscription Id را در قسمت doctype اضافه کنید {0}
 DocType: Purchase Receipt,Supplier Delivery Note,توجه داشته باشید تحویل فروشنده
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,درخواست کن
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,درخواست کن
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},واقعی تعداد {0} / انتظار تعداد {1}
 DocType: Purchase Invoice,E-commerce GSTIN,تجارت الکترونیک GSTIN
 DocType: Sales Order,Not Delivered,تحویل داده است
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,تاریخ انتظار نمی تواند قبل از تاریخ تراکنش باشد
 ,Bank Clearance Summary,بانک ترخیص کالا از خلاصه
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",ایجاد و مدیریت روزانه، هفتگی و ماهانه هضم ایمیل.
 DocType: Appraisal Goal,Appraisal Goal,ارزیابی هدف
@@ -2404,12 +2449,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,ساختمان
 DocType: Fee Schedule,Fee Structure,ساختار هزینه
 DocType: Timesheet Detail,Costing Amount,هزینه مبلغ
-DocType: Student Admission,Application Fee,هزینه درخواست
+DocType: Student Admission Program,Application Fee,هزینه درخواست
 DocType: Process Payroll,Submit Salary Slip,ثبت کردن لغزش حقوق
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,تخفیف Maxiumm برای مورد {0} است {1}٪
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,تخفیف Maxiumm برای مورد {0} است {1}٪
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,واردات به صورت فله
 DocType: Sales Partner,Address & Contacts,آدرس و اطلاعات تماس
 DocType: SMS Log,Sender Name,نام فرستنده
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,مرتب سازی بر اساس معیارها
 DocType: POS Profile,[Select],[انتخاب]
 DocType: Vital Signs,Blood Pressure (diastolic),فشار خون (دیاستولیک)
 DocType: SMS Log,Sent To,فرستادن به
@@ -2418,7 +2464,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,بعد تماس با آمار نمی تواند در گذشته باشد
 DocType: Company,For Reference Only.,برای مرجع تنها.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},پزشک {0} در {1} در دسترس نیست
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,انتخاب دسته ای بدون
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,انتخاب دسته ای بدون
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},نامعتبر {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,مجله مرجع
@@ -2434,15 +2480,15 @@
 DocType: Normal Test Items,Require Result Value,نیاز به ارزش نتیجه
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,شماره مورد نمی تواند 0
 DocType: Item,Show a slideshow at the top of the page,نمایش تصاویر به صورت خودکار در بالای صفحه
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,BOM ها
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,فروشگاه
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,BOM ها
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,فروشگاه
 DocType: Project Type,Projects Manager,مدیر پروژه های
 DocType: Serial No,Delivery Time,زمان تحویل
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,سالمندی بر اساس
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,انتصاب لغو شد
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,انتصاب لغو شد
 DocType: Item,End of Life,پایان زندگی
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,سفر
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,فعال یا حقوق و دستمزد به طور پیش فرض ساختار پیدا شده برای کارکنان {0} برای تاریخ داده شده
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,سفر
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,فعال یا حقوق و دستمزد به طور پیش فرض ساختار پیدا شده برای کارکنان {0} برای تاریخ داده شده
 DocType: Leave Block List,Allow Users,کاربران اجازه می دهد
 DocType: Purchase Order,Customer Mobile No,مشتری تلفن همراه بدون
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,در محدوده زمانی معین
@@ -2451,12 +2497,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,به روز رسانی هزینه
 DocType: Item Reorder,Item Reorder,مورد ترتیب مجدد
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,لغزش نمایش حقوق
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,مواد انتقال
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,مواد انتقال
 DocType: Fees,Send Payment Request,ارسال درخواست پرداخت
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",مشخص عملیات، هزینه های عملیاتی و به یک عملیات منحصر به فرد بدون به عملیات خود را.
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,این سند بیش از حد مجاز است {0} {1} برای آیتم {4}. آیا شما ساخت یکی دیگر از {3} در برابر همان {2}.
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,لطفا پس از ذخیره در محدوده زمانی معین
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,انتخاب تغییر حساب مقدار
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,انتخاب تغییر حساب مقدار
 DocType: Purchase Invoice,Price List Currency,لیست قیمت ارز
 DocType: Naming Series,User must always select,کاربر همیشه باید انتخاب کنید
 DocType: Stock Settings,Allow Negative Stock,اجازه می دهد بورس منفی
@@ -2476,7 +2522,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,کارمند
 DocType: Sample Collection,Collected Time,زمان جمع آوری شده
 DocType: Company,Sales Monthly History,تاریخچه فروش ماهانه
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,انتخاب دسته ای
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,انتخاب دسته ای
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} به طور کامل صورتحساب شده است
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,علائم حیاتی
 DocType: Training Event,End Time,پایان زمان
@@ -2484,16 +2530,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,کسر پرداخت یا از دست دادن
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,شرایط قرارداد استاندارد برای فروش و یا خرید.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,گروه های کوپن
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,آیا مطمئن هستید که می خواهید این انتصاب را لغو کنید؟
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,خط لوله فروش
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},لطفا به حساب پیش فرض تنظیم شده در حقوق و دستمزد و اجزای {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,مورد نیاز در
 DocType: Rename Tool,File to Rename,فایل برای تغییر نام
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},لطفا BOM در ردیف را انتخاب کنید برای مورد {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},لطفا BOM در ردیف را انتخاب کنید برای مورد {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},حساب {0} با شرکت {1} در حالت حساب مطابقت ندارد: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},BOM تعیین {0} برای مورد وجود ندارد {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,نگهداری و تعمیرات برنامه {0} باید قبل از لغو این سفارش فروش لغو
+DocType: POS Profile,Applicable for Users,مناسب برای کاربران
 DocType: Notification Control,Expense Claim Approved,ادعای هزینه تایید
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,لغزش حقوق و دستمزد کارکنان {0} در حال حاضر برای این دوره بوجود
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,لغزش حقوق و دستمزد کارکنان {0} در حال حاضر برای این دوره بوجود
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,دارویی
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,هزینه اقلام خریداری شده
 DocType: Selling Settings,Sales Order Required,سفارش فروش مورد نیاز
@@ -2517,6 +2565,7 @@
 DocType: Offer Letter,Accepted,پذیرفته
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,سازمان
 DocType: BOM Update Tool,BOM Update Tool,ابزار به روز رسانی BOM
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company",حساب حزبی مشخص نشده است، لطفا حساب حزب به طور پیش فرض در شرکت تنظیم کنید
 DocType: SG Creation Tool Course,Student Group Name,نام دانشجو گروه
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,ایجاد هزینه ها
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,لطفا مطمئن شوید که شما واقعا می خواهید به حذف تمام معاملات این شرکت. اطلاعات کارشناسی ارشد خود را باقی خواهد ماند آن را به عنوان است. این عمل قابل بازگشت نیست.
@@ -2525,29 +2574,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) نمی تواند بیشتر از quanitity برنامه ریزی شده ({2}) در سفارش تولید {3}
 DocType: Shipping Rule,Shipping Rule Label,قانون حمل و نقل برچسب
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,انجمن کاربران
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,مواد اولیه نمی تواند خالی باشد.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.",می تواند سهام به روز رسانی نیست، فاکتور شامل آیتم افت حمل و نقل.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,مواد اولیه نمی تواند خالی باشد.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.",می تواند سهام به روز رسانی نیست، فاکتور شامل آیتم افت حمل و نقل.
 DocType: Lab Test Sample,Lab Test Sample,آزمایش آزمایشی نمونه
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,سریع دانشگاه علوم پزشکی ورودی
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,اگر ذکر بی ا م در مقابل هر ایتمی باشد شما نمیتوانید نرخ را تغییر دهید
+DocType: Restaurant,Invoice Series Prefix,پیشوند سری فاکتور
 DocType: Employee,Previous Work Experience,قبلی سابقه کار
 DocType: Stock Entry,For Quantity,برای کمیت
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},لطفا برنامه ریزی شده برای مورد تعداد {0} در ردیف وارد {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},لطفا برنامه ریزی شده برای مورد تعداد {0} در ردیف وارد {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} ثبت نشده است
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,درخواست ها برای اقلام است.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,سفارش تولید جداگانه خواهد شد برای هر مورد خوب به پایان رسید ساخته شده است.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} باید در سند بازگشت منفی باشد
 ,Minutes to First Response for Issues,دقیقه به اولین پاسخ برای مسائل
 DocType: Purchase Invoice,Terms and Conditions1,شرایط و Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,نام این موسسه که شما در حال راه اندازی این سیستم.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,نام این موسسه که شما در حال راه اندازی این سیستم.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",ثبت حسابداری تا این تاریخ منجمد، هیچ کس نمی تواند انجام / اصلاح ورود به جز نقش های مشخص شده زیر.
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,لطفا قبل از ایجاد برنامه های تعمیر و نگهداری سند را ذخیره کنید
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,آخرین قیمت در تمام BOMs به روز شد
 DocType: Fee Schedule,Successful,موفق شدن
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,وضعیت پروژه
 DocType: UOM,Check this to disallow fractions. (for Nos),بررسی این به ندهید فراکسیون. (برای NOS)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,سفارشات تولید زیر ایجاد شد:
-DocType: Student Admission,Naming Series (for Student Applicant),نامگذاری سری (دانشجویی برای متقاضی)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,سفارشات تولید زیر ایجاد شد:
+DocType: Student Admission Program,Naming Series (for Student Applicant),نامگذاری سری (دانشجویی برای متقاضی)
 DocType: Delivery Note,Transporter Name,نام حمل و نقل
 DocType: Authorization Rule,Authorized Value,ارزش مجاز
 DocType: BOM,Show Operations,نمایش عملیات
@@ -2571,7 +2621,7 @@
 ,Employees working on a holiday,کارمندان کار در یک روز تعطیل
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,علامت گذاری به عنوان در حال حاضر
 DocType: Project,% Complete Method,٪ روش کامل
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,دارو
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,دارو
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},تاریخ شروع نگهداری نمی تواند قبل از تاریخ تحویل برای سریال بدون شود {0}
 DocType: Production Order,Actual End Date,تاریخ واقعی پایان
 DocType: BOM,Operating Cost (Company Currency),هزینه های عملیاتی (شرکت ارز)
@@ -2589,19 +2639,20 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,تصویب کاربر نمی تواند همان کاربر حکومت قابل اجرا است به
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),نرخ پایه (به عنوان در سهام UOM)
 DocType: SMS Log,No of Requested SMS,تعداد SMS درخواست شده
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,مرخصی بدون حقوق با تایید سوابق مرخصی کاربرد مطابقت ندارد
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,مرخصی بدون حقوق با تایید سوابق مرخصی کاربرد مطابقت ندارد
 DocType: Campaign,Campaign-.####,کمپین - ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,گام های بعدی
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,لطفا تأمین اقلام مشخص شده در بهترین نرخ ممکن
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,را فاکتور
 DocType: Selling Settings,Auto close Opportunity after 15 days,خودرو فرصت نزدیک پس از 15 روز
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,سفارشات خرید ممنوع است برای {0} به دلیل ایستادن کارت امتیازی از {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,سفارشات خرید ممنوع است برای {0} به دلیل ایستادن کارت امتیازی از {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,پایان سال
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot و / سرب٪
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,قرارداد تاریخ پایان باید از تاریخ پیوستن بیشتر
 DocType: Vital Signs,Nutrition Values,ارزش تغذیه ای
 DocType: Lab Test Template,Is billable,قابل پرداخت است
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",هر دو &quot;برنامه زمانبندی پزشک&quot; و &quot;زمان تعیین وقت&quot; باید برای دکتر {0} تنظیم شود
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,توزیع کننده شخص ثالث / فروشنده / نماینده کمیسیون / وابسته به / نمایندگی فروش که به فروش می رساند محصولات شرکت برای کمیسیون.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} در برابر سفارش خرید {1}
 DocType: Patient,Patient Demographics,دموگرافیک بیمار
@@ -2631,7 +2682,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.",قالب مالیاتی استاندارد است که می تواند به تمام معاملات خرید استفاده شود. این الگو می تواند شامل لیستی از سر مالیات و همچنین دیگر سر هزینه مانند &quot;حمل و نقل&quot;، &quot;بیمه&quot;، &quot;سیستم های انتقال مواد&quot; و غیره #### توجه داشته باشید نرخ مالیات در اینجا تعریف می کنید خواهد بود که نرخ مالیات استاندارد برای همه آیتم ها ** * * * * * * * *. اگر تعداد آیتم ها ** ** که نرخ های مختلف وجود دارد، آنها باید در مورد مالیات ** ** جدول اضافه می شود در مورد ** ** استاد. #### شرح ستون 1. نوع محاسبه: - این می تواند بر روی ** ** خالص مجموع باشد (که مجموع مبلغ پایه است). - ** در انتظار قبلی مجموع / مقدار ** (برای مالیات تجمعی و یا اتهامات عنوان شده علیه). اگر شما این گزینه را انتخاب کنید، مالیات به عنوان یک درصد از سطر قبلی (در جدول مالیاتی) و یا مقدار کل اعمال می شود. - ** ** واقعی (به عنوان ذکر شده). 2. حساب سر: دفتر حساب که تحت آن این مالیات خواهد شد رزرو 3. مرکز هزینه: اگر مالیات / هزینه درآمد (مانند حمل و نقل) است و یا هزینه آن نیاز دارد تا در برابر یک مرکز هزینه رزرو شود. 4. توضیحات: توضیحات از مالیات (که در فاکتورها / به نقل از چاپ). 5. نرخ: نرخ مالیات. 6. مقدار: مبلغ مالیات. 7. مجموع: مجموع تجمعی به این نقطه است. 8. ردیف را وارد کنید: اگر بر اساس &quot;سطر قبلی مجموع&quot; شما می توانید تعداد ردیف خواهد شد که به عنوان پایه ای برای این محاسبه (به طور پیش فرض سطر قبلی است) گرفته شده را انتخاب کنید. 9. در نظر بگیرید مالیات و یا هزینه برای: در این بخش شما می توانید مشخص کنید اگر مالیات / بار فقط برای ارزیابی (و نه بخشی از کل ارسال ها) و یا تنها برای کل (ارزش به آیتم اضافه کنید) و یا برای هر دو. 10. اضافه کردن و یا کسر: آیا شما می خواهید برای اضافه کردن یا کسر مالیات.
 DocType: Homepage,Homepage,صفحه نخست
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,پزشک را انتخاب کنید ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',update tabConsultation set invoice = &#39;{0}&#39; where name = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd تعداد
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},سوابق هزینه ایجاد شده - {0}
 DocType: Asset Category Account,Asset Category Account,حساب دارایی رده
@@ -2643,7 +2693,7 @@
 DocType: Asset,Manual,کتابچه راهنمای
 DocType: Salary Component Account,Salary Component Account,حساب حقوق و دستمزد و اجزای
 DocType: Global Defaults,Hide Currency Symbol,مخفی ارز نماد
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card",به عنوان مثال بانکی، پول نقد، کارت اعتباری
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card",به عنوان مثال بانکی، پول نقد، کارت اعتباری
 DocType: Lead Source,Source Name,نام منبع
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""",فشار خون در حالت طبیعی در بزرگسالان تقریبا 120 میلیمتر جیوه سینوس است و دیاستولیک mmHg 80 میلی متر و &quot;120/80 میلیمتر جیوه&quot;
 DocType: Journal Entry,Credit Note,اعتبار توجه داشته باشید
@@ -2662,16 +2712,16 @@
 DocType: Patient,Occupation,اشتغال
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,ردیف {0}: تاریخ شروع باید قبل از پایان تاریخ است
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),مجموع (تعداد)
-DocType: Sales Invoice,This Document,این سند
 DocType: Installation Note Item,Installed Qty,نصب تعداد
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,این ممکن است به دلیل برخی از نامعتبر آدرس ایمیل در
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,شما اضافه کردید
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,نتیجه آموزش
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,نتیجه آموزش
 DocType: Purchase Invoice,Is Paid,پرداخت شده
 DocType: Salary Structure,Total Earning,سود مجموع
 DocType: Purchase Receipt,Time at which materials were received,زمانی که در آن مواد دریافت شده
 DocType: Stock Ledger Entry,Outgoing Rate,نرخ خروجی
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,شاخه سازمان کارشناسی ارشد.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,شاخه سازمان کارشناسی ارشد.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,یا
 DocType: Sales Order,Billing Status,حسابداری وضعیت
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,گزارش یک مشکل
@@ -2686,7 +2736,8 @@
 DocType: Notification Control,Sales Order Message,سفارش فروش پیام
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",تنظیم مقادیر پیش فرض مثل شرکت، ارز، سال مالی جاری، و غیره
 DocType: Payment Entry,Payment Type,نوع پرداخت
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,لطفا یک دسته ای برای آیتم را انتخاب کنید {0}. قادر به پیدا کردن یک دسته واحد است که این شرط را برآورده
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,لطفا یک دسته ای برای آیتم را انتخاب کنید {0}. قادر به پیدا کردن یک دسته واحد است که این شرط را برآورده
+DocType: Hub Category,Parent Category,رده والدین
 DocType: Process Payroll,Select Employees,انتخاب کارمندان
 DocType: Opportunity,Potential Sales Deal,معامله فروش بالقوه
 DocType: Complaint,Complaints,شکایت
@@ -2723,7 +2774,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),شناسایی بسته برای تحویل (برای چاپ)
 DocType: Bin,Reserved Quantity,تعداد محفوظ است
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,لطفا آدرس ایمیل معتبر وارد کنید
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,لطفا یک آیتم را در سبد خرید انتخاب کنید
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,لطفا یک آیتم را در سبد خرید انتخاب کنید
 DocType: Landed Cost Voucher,Purchase Receipt Items,آیتم ها رسید خرید
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,فرم سفارشی
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,بدهی پس افتاده
@@ -2733,15 +2784,15 @@
 DocType: Payment Request,Amount in customer's currency,مبلغ پول مشتری
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,تحویل
 DocType: Stock Reconciliation Item,Current Qty,تعداد کنونی
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,افزودن تهیه کنندگان
+DocType: Restaurant Menu,Restaurant Menu,منوی رستوران
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,قبلی
 DocType: Appraisal Goal,Key Responsibility Area,منطقه مسئولیت های کلیدی
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",دسته های دانشجویی شما کمک کند پیگیری حضور و غیاب، ارزیابی ها و هزینه های برای دانش آموزان
 DocType: Payment Entry,Total Allocated Amount,مجموع مقدار اختصاص داده شده
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,تنظیم حساب موجودی به طور پیش فرض برای موجودی دائمی
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,تنظیم حساب موجودی به طور پیش فرض برای موجودی دائمی
 DocType: Item Reorder,Material Request Type,مواد نوع درخواست
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},ورود مجله Accural برای حقوق از {0} به {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save",LocalStorage را کامل است، نجات نداد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save",LocalStorage را کامل است، نجات نداد
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,ردیف {0}: UOM عامل تبدیل الزامی است
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,ظرفیت اتاق
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,کد عکس
@@ -2780,16 +2831,18 @@
 DocType: Project,Task Completion,وظیفه تکمیل
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,در انبار
 DocType: Appraisal,HR User,HR کاربر
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS؟
 DocType: Purchase Invoice,Taxes and Charges Deducted,مالیات و هزینه کسر
-apps/erpnext/erpnext/hooks.py +129,Issues,مسائل مربوط به
+apps/erpnext/erpnext/hooks.py +138,Issues,مسائل مربوط به
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},وضعیت باید یکی از است {0}
 DocType: Sales Invoice,Debit To,بدهی به
+DocType: Restaurant Menu Item,Restaurant Menu Item,بخش منو رستوران
 DocType: Delivery Note,Required only for sample item.,فقط برای نمونه مورد نیاز است.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,تعداد واقعی بعد از تراکنش
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},بدون لغزش حقوق و دستمزد پیدا شده بین {0} و {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},بدون لغزش حقوق و دستمزد پیدا شده بین {0} و {1}
 ,Pending SO Items For Purchase Request,در انتظار SO آیتم ها برای درخواست خرید
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,پذیرش دانشجو
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} غیر فعال است
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,پذیرش دانشجو
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} غیر فعال است
 DocType: Supplier,Billing Currency,صدور صورت حساب نرخ ارز
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,خیلی بزرگ
@@ -2812,6 +2865,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,لطفا از هیچ بازدیدکننده داشته است مورد نیاز ذکر
 DocType: Stock Settings,Default Valuation Method,روش های ارزش گذاری پیش فرض
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,پرداخت
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,در حال بروزرسانی. ممکن است کمی طول بکشد.
 DocType: Vehicle Log,Fuel Qty,تعداد سوخت
 DocType: Production Order Operation,Planned Start Time,برنامه ریزی زمان شروع
 DocType: Course,Assessment,ارزیابی
@@ -2827,7 +2881,7 @@
 DocType: Price List,Price List Master,لیست قیمت مستر
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,تمام معاملات فروش را می توان در برابر چند ** ** افراد فروش برچسب به طوری که شما می توانید تعیین و نظارت بر اهداف.
 ,S.O. No.,SO شماره
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},لطفا مشتری از سرب ایجاد {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},لطفا مشتری از سرب ایجاد {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,بیمار را انتخاب کنید
 DocType: Price List,Applicable for Countries,قابل استفاده برای کشورهای
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,نام پارامتر
@@ -2835,7 +2889,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},دانشجو نام گروه را در ردیف الزامی است {0}
 DocType: Homepage,Products to be shown on website homepage,محصولات به صفحه اصلی وب سایت نشان داده می شود
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,این یک گروه مشتری ریشه است و نمی تواند ویرایش شود.
-DocType: Employee,AB-,جدایی
+DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,نادیده گرفتن قانون قیمت گذاری
 DocType: Employee Education,Graduate,فارغ التحصیل
 DocType: Leave Block List,Block Days,بلوک روز
@@ -2858,27 +2912,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,عرضه کننده اطلاعات فاکتور
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,حساب هزینه / تفاوت ({0}) باید یک حساب کاربری &#39;، سود و ضرر باشد
 DocType: Project,Copied From,کپی شده از
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},error نام: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,کمبود
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},error نام: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,کمبود
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} با همراه نیست {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,حضور و غیاب کارکنان برای {0} در حال حاضر مشخص شده
 DocType: Packing Slip,If more than one package of the same type (for print),اگر بیش از یک بسته از همان نوع (برای چاپ)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,لطفا تنظیمات پیشفرض را در تنظیمات رستوران تنظیم کنید
 ,Salary Register,حقوق و دستمزد ثبت نام
 DocType: Warehouse,Parent Warehouse,انبار پدر و مادر
 DocType: C-Form Invoice Detail,Net Total,مجموع خالص
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},به طور پیش فرض BOM برای موردی یافت نشد {0} و پروژه {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},به طور پیش فرض BOM برای موردی یافت نشد {0} و پروژه {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,تعریف انواع مختلف وام
 DocType: Bin,FCFS Rate,FCFS نرخ
 DocType: Payment Reconciliation Invoice,Outstanding Amount,مقدار برجسته
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),زمان (در دقیقه)
 DocType: Project Task,Working,کار
 DocType: Stock Ledger Entry,Stock Queue (FIFO),سهام صف (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,سال مالی
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,سال مالی
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} به شرکت تعلق ندارد {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,نمیتوان عملکرد نمره معیار را برای {0} حل کرد. اطمینان حاصل کنید که فرمول معتبر است
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,هزینه به عنوان در
 DocType: Healthcare Settings,Out Patient Settings,از تنظیمات بیمار
 DocType: Account,Round Off,گرد کردن
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,مقدار باید مثبت باشد
 ,Requested Qty,تعداد درخواست
 DocType: Tax Rule,Use for Shopping Cart,استفاده برای سبد خرید
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},ارزش {0} برای صفت {1} در لیست مورد معتبر وجود ندارد مقادیر مشخصه برای مورد {2}
@@ -2887,7 +2943,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",اتهامات خواهد شد توزیع متناسب در تعداد آیتم یا مقدار بر اساس، به عنوان در هر انتخاب شما
 DocType: Maintenance Visit,Purposes,اهداف
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,حداقل یک مورد باید با مقدار منفی در سند وارد بازگشت
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,اضافه کردن دوره ها
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",عملیات {0} طولانی تر از هر ساعت کار موجود در ایستگاه های کاری {1}، شکستن عملیات به عملیات های متعدد
 ,Requested,خواسته
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,بدون شرح
@@ -2899,6 +2954,8 @@
 DocType: Employee Loan,Repaid/Closed,بازپرداخت / بسته
 DocType: Item,Total Projected Qty,کل پیش بینی تعداد
 DocType: Monthly Distribution,Distribution Name,نام توزیع
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,تامین کننده&gt; نوع تامین کننده
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",نرخ ارزیابی برای Item {0} یافت نشد، که لازم است برای انجام امور حسابداری برای {1} {2} باشد. اگر آیتم به عنوان یک مقدار ارزش گذاری صفر در {1} انجام می شود، لطفا ذکر کنید که در جدول {1} Item. در غیر این صورت، لطفا یک معامله مبادلهی ورودی برای این مورد ایجاد کنید یا میزان ارزیابی را در رکورد موردی ذکر کنید، سپس سعی کنید این ورودی را لغو / لغو کنید
 DocType: Course,Course Code,کد درس
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},بازرسی کیفیت مورد نیاز برای مورد {0}
 DocType: POS Settings,Use POS in Offline Mode,از POS در حالت آفلاین استفاده کنید
@@ -2909,14 +2966,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,مدیریت درختواره منطقه
 DocType: Journal Entry Account,Sales Invoice,فاکتور فروش
 DocType: Journal Entry Account,Party Balance,تعادل حزب
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,لطفا درخواست تخفیف را انتخاب کنید
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,لطفا درخواست تخفیف را انتخاب کنید
 DocType: Company,Default Receivable Account,به طور پیش فرض دریافتنی حساب
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ایجاد بانک برای ورود به حقوق و دستمزد کل پرداخت شده برای معیارهای فوق انتخاب شده
 DocType: Physician,Physician Schedule,برنامه پزشک
 DocType: Purchase Invoice,Deemed Export,صادرات معقول
 DocType: Stock Entry,Material Transfer for Manufacture,انتقال مواد برای تولید
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,درصد تخفیف می تواند یا علیه یک لیست قیمت و یا برای همه لیست قیمت اعمال می شود.
-DocType: Purchase Invoice,Half-yearly,نیمه سال
+DocType: Subscription,Half-yearly,نیمه سال
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,ثبت حسابداری برای انبار
 DocType: Lab Test,LabTest Approver,تأییدکننده LabTest
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,شما در حال حاضر برای معیارهای ارزیابی ارزیابی {}.
@@ -2945,13 +3002,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,بسیار کوچک
 DocType: Company,Standard Template,قالب استاندارد
 DocType: Training Event,Theory,تئوری
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,هشدار: مواد درخواست شده تعداد کمتر از حداقل تعداد سفارش تعداد است
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,هشدار: مواد درخواست شده تعداد کمتر از حداقل تعداد سفارش تعداد است
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,حساب {0} فریز شده است
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,حقوقی نهاد / جانبی با نمودار جداگانه حساب متعلق به سازمان.
 DocType: Payment Request,Mute Email,بیصدا کردن ایمیل
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",مواد غذایی، آشامیدنی و دخانیات
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},می توانید تنها پرداخت به را unbilled را {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,نرخ کمیسیون نمی تواند بیشتر از 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},می توانید تنها پرداخت به را unbilled را {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,نرخ کمیسیون نمی تواند بیشتر از 100
 DocType: Stock Entry,Subcontract,مقاطعه کاری فرعی
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,لطفا ابتدا وارد {0}
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,بدون پاسخ از
@@ -2969,10 +3026,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,رنگ
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,معیارهای ارزیابی طرح
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,جلوگیری از سفارشات خرید
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,حساس
 DocType: Patient Appointment,Scheduled,برنامه ریزی
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,برای نقل قول درخواست.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا سیستم نامگذاری کارمندان را در منابع انسانی تنظیم کنید&gt; تنظیمات HR
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",لطفا آیتم را انتخاب کنید که در آن &quot;آیا مورد سهام&quot; است &quot;نه&quot; و &quot;آیا مورد فروش&quot; است &quot;بله&quot; است و هیچ بسته نرم افزاری محصولات دیگر وجود دارد
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,مشتری را انتخاب کنید
 DocType: Student Log,Academic,علمی
 DocType: Patient,Personal and Social History,تاریخچه شخصی و اجتماعی
 DocType: Fee Schedule,Fee Breakup for each student,هزینه فوروارد برای هر دانش آموز
@@ -2982,7 +3040,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,نرخ گذاری
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,دیزل
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,لیست قیمت ارز انتخاب نشده
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,لیست قیمت ارز انتخاب نشده
 apps/erpnext/erpnext/config/healthcare.py +46,Results,نتایج
 ,Student Monthly Attendance Sheet,دانشجو جدول حضور ماهانه
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},کارمند {0} در حال حاضر برای اعمال {1} {2} بین و {3}
@@ -2997,7 +3055,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,فروش همکاران مدیریت.
 DocType: Quality Inspection,Inspection Type,نوع بازرسی
 DocType: Fee Validity,Visited yet,هنوز بازدید کرده اید
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,انبارها با معامله موجود می توانید به گروه تبدیل نمی کند.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,انبارها با معامله موجود می توانید به گروه تبدیل نمی کند.
 DocType: Assessment Result Tool,Result HTML,نتیجه HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,منقضی در
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,اضافه کردن دانش آموزان
@@ -3024,7 +3082,7 @@
 DocType: Healthcare Settings,Result Printed,نتیجه چاپ شده
 DocType: Asset Category Account,Depreciation Expense Account,حساب استهلاک هزینه
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,دوره وابسته به التزام
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},نمایش {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},نمایش {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,تنها برگ در معامله اجازه
 DocType: Expense Claim,Expense Approver,تصویب هزینه
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,ردیف {0}: پیشرفت در برابر مشتری باید اعتبار
@@ -3035,7 +3093,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,به تاریخ ساعت
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,برنامه دوره حذف:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,سیاهههای مربوط به حفظ وضعیت تحویل اس ام اس
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,تعیین هدف فروش
 DocType: Accounts Settings,Make Payment via Journal Entry,پرداخت از طریق ورود مجله
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,چاپ شده در
 DocType: Item,Inspection Required before Delivery,بازرسی مورد نیاز قبل از تحویل
@@ -3043,7 +3100,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,فعالیت در انتظار
 DocType: Patient Appointment,Reminded,یادآوری شد
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,سازمان شما
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,سازمان شما
 DocType: Fee Component,Fees Category,هزینه های رده
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,لطفا تاریخ تسکین وارد کنید.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
@@ -3055,7 +3112,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,ترتیب مجدد سطح
 DocType: Company,Chart Of Accounts Template,نمودار حساب الگو
 DocType: Attendance,Attendance Date,حضور و غیاب عضویت
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},مورد قیمت به روز شده برای {0} در لیست قیمت {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},مورد قیمت به روز شده برای {0} در لیست قیمت {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,فروپاشی حقوق و دستمزد بر اساس سود و کسر.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,حساب با گره فرزند را نمی توان تبدیل به لجر
 DocType: Purchase Invoice Item,Accepted Warehouse,انبار پذیرفته شده
@@ -3071,9 +3128,10 @@
 ,Employee Birthday,کارمند تولد
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,دانشجو ابزار گروهی حضور و غیاب
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,محدودیت عبور
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,برنامه ریزی شده تا
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,سرمایه گذاری سرمایه
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,مدت علمی با این سال تحصیلی &#39;{0} و نام مدت:&#39; {1} قبل وجود دارد. لطفا این نوشته را تغییر دهید و دوباره امتحان کنید.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}",به عنوان تراکنش های موجود در برابر آیتم {0} وجود دارد، شما می توانید مقدار را تغییر دهید {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}",به عنوان تراکنش های موجود در برابر آیتم {0} وجود دارد، شما می توانید مقدار را تغییر دهید {1}
 DocType: UOM,Must be Whole Number,باید عدد
 DocType: Leave Control Panel,New Leaves Allocated (In Days),برگ جدید اختصاص داده شده (در روز)
 DocType: Purchase Invoice,Invoice Copy,فاکتور کپی
@@ -3083,7 +3141,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,شماره فاکتور
 DocType: Shopping Cart Settings,Orders,سفارشات
 DocType: Employee Leave Approver,Leave Approver,ترک تصویب
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,لطفا یک دسته را انتخاب کنید
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,لطفا یک دسته را انتخاب کنید
 DocType: Assessment Group,Assessment Group Name,نام گروه ارزیابی
 DocType: Manufacturing Settings,Material Transferred for Manufacture,مواد منتقل شده برای ساخت
 DocType: Expense Claim,"A user with ""Expense Approver"" role","یک کاربر با نقشه ""تایید کننده هزینه ها"""
@@ -3098,7 +3156,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,ورود اختتامیه دوره
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,بخش ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,مرکز هزینه با معاملات موجود می تواند به گروه تبدیل می شود
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},مقدار {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},مقدار {0} {1} {2} {3}
 DocType: Account,Depreciation,استهلاک
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),تامین کننده (بازدید کنندگان)
 DocType: Employee Attendance Tool,Employee Attendance Tool,کارمند ابزار حضور و غیاب
@@ -3109,10 +3167,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,مطالب پرداخت {0} سازمان ملل متحد در ارتباط هستند
 DocType: GL Entry,Voucher No,کوپن بدون
 ,Lead Owner Efficiency,بهره وری مالک سرب
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,محبوبترین
 DocType: Leave Allocation,Leave Allocation,ترک تخصیص
 DocType: Payment Request,Recipient Message And Payment Details,گیرنده پیام و جزئیات پرداخت
 DocType: Training Event,Trainer Email,ترینر ایمیل
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,درخواست مواد {0} ایجاد
+DocType: Restaurant Reservation,No of People,بدون مردم
 DocType: Production Planning Tool,Include sub-contracted raw materials,شامل مواد خام زیر قرارداد
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,الگو از نظر و یا قرارداد.
 DocType: Purchase Invoice,Address and Contact,آدرس و تماس با
@@ -3121,10 +3181,11 @@
 DocType: Supplier,Last Day of the Next Month,آخرین روز از ماه آینده
 DocType: Support Settings,Auto close Issue after 7 days,خودرو موضوع نزدیک پس از 7 روز
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",می توانید قبل از ترک نمی اختصاص داده شود {0}، به عنوان تعادل مرخصی در حال حاضر شده حمل فرستاده در آینده رکورد تخصیص مرخصی {1}
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نکته: با توجه / بیش از مرجع تاریخ اجازه روز اعتباری مشتری توسط {0} روز (بازدید کنندگان)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نکته: با توجه / بیش از مرجع تاریخ اجازه روز اعتباری مشتری توسط {0} روز (بازدید کنندگان)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,دانشجو متقاضی
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,نسخه اصل گیرنده
 DocType: Asset Category Account,Accumulated Depreciation Account,حساب استهلاک انباشته
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,این ایمیل بصورت خودکار ساخته شده است
 DocType: Stock Settings,Freeze Stock Entries,یخ مطالب سهام
 DocType: Program Enrollment,Boarding Student,دانشجویی شبانه روزی
 DocType: Asset,Expected Value After Useful Life,مقدار مورد انتظار پس از زندگی مفید
@@ -3132,7 +3193,7 @@
 DocType: Activity Cost,Billing Rate,نرخ صدور صورت حساب
 ,Qty to Deliver,تعداد برای ارائه
 ,Stock Analytics,تجزیه و تحلیل ترافیک سهام
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,عملیات نمی تواند خالی باشد
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,عملیات نمی تواند خالی باشد
 DocType: Maintenance Visit Purpose,Against Document Detail No,جزئیات سند علیه هیچ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,نوع حزب الزامی است
 DocType: Quality Inspection,Outgoing,خروجی
@@ -3154,7 +3215,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,دانش آموزان به صورت دستی برای فعالیت بر اساس گروه انتخاب
 DocType: Journal Entry,User Remark,نکته کاربری
 DocType: Lead,Market Segment,بخش بازار
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},مبلغ پرداخت نمی تواند بیشتر از کل مقدار برجسته منفی {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},مبلغ پرداخت نمی تواند بیشتر از کل مقدار برجسته منفی {0}
 DocType: Supplier Scorecard Period,Variables,متغیرها
 DocType: Employee Internal Work History,Employee Internal Work History,کارمند داخلی سابقه کار
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),بسته شدن (دکتر)
@@ -3183,21 +3244,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,دریافت به روز رسانی
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: حساب {2} به شرکت تعلق ندارد {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,درخواست مواد {0} است لغو و یا متوقف
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,ترک مدیریت
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,ترک مدیریت
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,گروه های حساب
 DocType: Sales Order,Fully Delivered,به طور کامل تحویل
 DocType: Lead,Lower Income,درآمد پایین
+DocType: Restaurant Order Entry,Current Order,سفارش فعلی
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},منبع و انبار هدف نمی تواند همین کار را برای ردیف {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",حساب تفاوت باید یک حساب کاربری نوع دارایی / مسئولیت باشد، زیرا این سهام آشتی ورود افتتاح است
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},میزان مبالغ هزینه نمی تواند بیشتر از وام مبلغ {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,به برنامه ها بروید
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},خرید شماره سفارش مورد نیاز برای مورد {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,تولید سفارش ایجاد نمی
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,تولید سفارش ایجاد نمی
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""از تاریخ"" باید پس از ""تا تاریخ"" باشد"
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},می توانید تغییر وضعیت به عنوان دانش آموز نمی {0} است با استفاده از دانش آموزان مرتبط {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},می توانید تغییر وضعیت به عنوان دانش آموز نمی {0} است با استفاده از دانش آموزان مرتبط {1}
 DocType: Asset,Fully Depreciated,به طور کامل مستهلک
 ,Stock Projected Qty,سهام بینی تعداد
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},مشتری {0} تعلق ندارد به پروژه {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},مشتری {0} تعلق ندارد به پروژه {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,حضور و غیاب مشخص HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",نقل قول پیشنهادات، مناقصه شما را به مشتریان خود ارسال
 DocType: Sales Order,Customer's Purchase Order,سفارش خرید مشتری
@@ -3208,8 +3270,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,لطفا تعداد مجموعه ای از Depreciations رزرو
 DocType: Supplier Scorecard Period,Calculations,محاسبات
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,ارزش و یا تعداد
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,سفارشات محصولات می توانید برای نه مطرح شود:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,سفارشات محصولات می توانید برای نه مطرح شود:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,دقیقه
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,لطفا مجموعه نامگذاری را برای {0} از طریق تنظیمات&gt; تنظیمات&gt; نامگذاری سری
 DocType: Purchase Invoice,Purchase Taxes and Charges,خرید مالیات و هزینه
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,به تامین کنندگان بروید
 ,Qty to Receive,تعداد دریافت
@@ -3222,7 +3285,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,اعتباری به حساب باید یک حساب ترازنامه شود
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,انواع تامین کننده
 DocType: Global Defaults,Disable In Words,غیر فعال کردن در کلمات
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,کد مورد الزامی است زیرا مورد به طور خودکار شماره نه
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,کد مورد الزامی است زیرا مورد به طور خودکار شماره نه
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},نقل قول {0} نمی از نوع {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,نگهداری و تعمیرات برنامه مورد
 DocType: Sales Order,%  Delivered,٪ تحویل شده
@@ -3244,23 +3307,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,افتتاح حقوق صاحبان سهام تعادل
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,تطبیق
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,باقی مانده
 DocType: Appraisal,Appraisal,ارزیابی
 DocType: Purchase Invoice,GST Details,اطلاعات GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},ایمیل ارسال شده به منبع {0}
+DocType: Item,Default Sales Unit of Measure,واحد پیش فروش واحد اندازه گیری
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,تاریخ تکرار شده است
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,امضای مجاز
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},ترک تصویب شود باید یکی از {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,ایجاد هزینه ها
-DocType: Hub Settings,Seller Email,فروشنده ایمیل
 DocType: Project,Total Purchase Cost (via Purchase Invoice),هزینه خرید مجموع (از طریق فاکتورخرید )
 DocType: Training Event,Start Time,زمان شروع
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,انتخاب تعداد
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,انتخاب تعداد
 DocType: Customs Tariff Number,Customs Tariff Number,آداب و رسوم شماره تعرفه
 DocType: Patient Appointment,Patient Appointment,قرار ملاقات بیمار
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,تصویب نقش نمی تواند همان نقش حکومت قابل اجرا است به
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,لغو اشتراک از این ایمیل خلاصه
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,لغو اشتراک از این ایمیل خلاصه
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,دریافت کنندگان توسط
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} برای مورد {1} یافت نشد
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,به دوره ها بروید
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,پیام های ارسال شده
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,حساب کاربری با گره فرزند می تواند به عنوان دفتر تنظیم شود
@@ -3273,11 +3339,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,مواد منتقل ساخت
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,حساب {0} وجود ندارد
 DocType: Project,Project Type,نوع پروژه
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,وظیفه کودک برای این وظیفه وجود دارد. شما نمی توانید این کار را حذف کنید.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,در هر دو صورت تعداد هدف یا هدف مقدار الزامی است.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,هزینه فعالیت های مختلف
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,هیچ نتیجه ای ندارد
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,هزینه فعالیت های مختلف
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",تنظیم رویدادها به {0}، از کارمند متصل به زیر Persons فروش یک ID کاربر ندارد {1}
 DocType: Timesheet,Billing Details,جزئیات صورتحساب
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,منبع و انبار هدف باید متفاوت باشد
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,منبع و انبار هدف باید متفاوت باشد
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},اجازه به روز رسانی معاملات سهام مسن تر از {0}
 DocType: Purchase Invoice Item,PR Detail,PR جزئیات
 DocType: Sales Order,Fully Billed,به طور کامل صورتحساب
@@ -3303,7 +3371,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,انتقال سیم
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,بررسی همه
 DocType: Vehicle Log,Invoice Ref,فاکتور کد عکس
-DocType: Purchase Order,Recurring Order,ترتیب در محدوده زمانی معین
 DocType: Company,Default Income Account,حساب پیش فرض درآمد
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,گروه مشتری / مشتری
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),بسته نشده سال مالی سود / زیان (اعتباری)
@@ -3317,9 +3384,9 @@
 DocType: Patient,A Negative,منفی است
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,هیچ چیز بیشتر نشان می دهد.
 DocType: Lead,From Customer,از مشتری
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,تماس
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,تماس
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,یک محصول
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,دسته
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,دسته
 DocType: Project,Total Costing Amount (via Time Logs),کل مقدار هزینه یابی (از طریق زمان سیاههها)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,برنامه ریزی هزینه
 DocType: Purchase Order Item Supplied,Stock UOM,سهام UOM
@@ -3343,7 +3410,7 @@
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,برگ و تعطیلات
 DocType: School Settings,Current Academic Term,ترم جاری
 DocType: Sales Order,Not Billed,صورتحساب نه
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,هر دو انبار باید به همان شرکت تعلق
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,هر دو انبار باید به همان شرکت تعلق
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,بدون اطلاعات تماس اضافه نشده است.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,هزینه فرود مقدار کوپن
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,لوایح مطرح شده توسط تولید کنندگان.
@@ -3352,7 +3419,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,مقدار تخفیف
 DocType: Purchase Invoice,Return Against Purchase Invoice,بازگشت از فاکتورخرید
 DocType: Item,Warranty Period (in days),دوره گارانتی (در روز)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',به روز رسانی `tabPatient Appointment` set sales_invoice = &#39;{0}&#39; where name = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,ارتباط با Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,نقدی خالص عملیات
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,(4 مورد)
@@ -3361,8 +3427,8 @@
 DocType: Journal Entry Account,Journal Entry Account,حساب ورودی دفتر روزنامه
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,گروه دانشجویی
 DocType: Shopping Cart Settings,Quotation Series,نقل قول سری
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",یک مورد را با همین نام وجود دارد ({0})، لطفا نام گروه مورد تغییر یا تغییر نام آیتم
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,لطفا به مشتریان را انتخاب کنید
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item",یک مورد را با همین نام وجود دارد ({0})، لطفا نام گروه مورد تغییر یا تغییر نام آیتم
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,لطفا به مشتریان را انتخاب کنید
 DocType: C-Form,I,من
 DocType: Company,Asset Depreciation Cost Center,دارایی مرکز استهلاک هزینه
 DocType: Sales Order Item,Sales Order Date,تاریخ سفارش فروش
@@ -3371,6 +3437,7 @@
 DocType: Assessment Plan,Assessment Plan,طرح ارزیابی
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,مشتری {0} ایجاد شده است
 DocType: Stock Settings,Limit Percent,درصد محدود
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,در حال حاضر هیچ سهامی در انبار وجود ندارد
 ,Payment Period Based On Invoice Date,دوره پرداخت بر اساس فاکتور عضویت
 DocType: Sample Collection,No. of print,تعداد چاپ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},از دست رفته ارز نرخ ارز برای {0}
@@ -3426,13 +3493,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,دستمزد ناخالص - کسر مجموع - بازپرداخت وام
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,BOM BOM کنونی و جدید را نمی توان همان
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,حقوق و دستمزد ID لغزش
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,حقوق و دستمزد ID لغزش
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,تاریخ بازنشستگی باید از تاریخ پیوستن بیشتر
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,بودند اشتباهات در حالی که برنامه ریزی دوره وجود دارد:
 DocType: Sales Invoice,Against Income Account,به حساب درآمد
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}٪ تحویل داده شد
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,مورد {0}: تعداد مرتب {1} نمی تواند کمتر از حداقل تعداد سفارش {2} (تعریف شده در مورد).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,مورد {0}: تعداد مرتب {1} نمی تواند کمتر از حداقل تعداد سفارش {2} (تعریف شده در مورد).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,درصد ماهانه توزیع
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,لطفا به عنوان کاربر دیگری وارد شوید
 DocType: Territory,Territory Targets,اهداف منطقه
 DocType: Delivery Note,Transporter Info,حمل و نقل اطلاعات
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},لطفا پیش فرض {0} در {1} شرکت
@@ -3440,13 +3508,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,منبع همان وارد شده است چندین بار
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,سود ناخالص / از دست دادن
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,خرید سفارش مورد عرضه
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,نام شرکت می تواند شرکت نیست
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,نام شرکت می تواند شرکت نیست
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,سران نامه برای قالب چاپ.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,عناوین برای قالب چاپ به عنوان مثال پروفرم فاکتور.
 DocType: Program Enrollment,Walking,پیاده روی
 DocType: Student Guardian,Student Guardian,دانشجو نگهبان
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,نوع گذاری اتهامات نمی تواند به عنوان فراگیر مشخص شده
 DocType: POS Profile,Update Stock,به روز رسانی سهام
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,در اشتراک
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM مختلف برای اقلام خواهد به نادرست (مجموع) خالص ارزش وزن منجر شود. مطمئن شوید که وزن خالص هر یک از آیتم است در UOM همان.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM نرخ
 DocType: Asset,Journal Entry for Scrap,ورودی مجله برای ضایعات
@@ -3494,15 +3563,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",سیستم کاربر (ورود به سایت) ID. اگر تعیین شود، آن را تبدیل به طور پیش فرض برای همه اشکال HR.
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: از {1}
 DocType: Task,depends_on,بستگی دارد به
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,برای به روز رسانی آخرین قیمت در تمام بیل مواد. ممکن است چند دقیقه طول بکشد.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,برای به روز رسانی آخرین قیمت در تمام بیل مواد. ممکن است چند دقیقه طول بکشد.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,نام حساب کاربری جدید. توجه: لطفا حساب برای مشتریان و تامین کنندگان ایجاد نمی
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,کشور به طور پیش فرض عاقلانه آدرس قالب
 DocType: Sales Order Item,Supplier delivers to Customer,ارائه کننده به مشتری
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (فرم # / کالا / {0}) خارج از بورس
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},با توجه / مرجع تاریخ نمی تواند بعد {0}
+,Sales Payment Summary,خلاصه پرداخت پرداخت
+DocType: Restaurant,Restaurant,رستوران
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},با توجه / مرجع تاریخ نمی تواند بعد {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,اطلاعات واردات و صادرات
 DocType: Patient,Account Details,جزئیات حساب
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,هیچ دانش آموزان یافت
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,هیچ دانش آموزان یافت
 DocType: Medical Department,Medical Department,گروه پزشکی
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,معیارهای ارزیابی کارت امتیازی تامین کننده
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,فاکتور های ارسال و ویرایش تاریخ
@@ -3513,7 +3584,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,لطفا ارسال تاریخ قبل از انتخاب حزب را انتخاب کنید
 DocType: Program Enrollment,School House,مدرسه خانه
 DocType: Serial No,Out of AMC,از AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,لطفا نقل قول انتخاب
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,لطفا نقل قول انتخاب
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,تعداد Depreciations رزرو نمی تواند بیشتر از تعداد کل Depreciations
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,را نگهداری سایت
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,لطفا برای کاربری که فروش کارشناسی ارشد مدیریت {0} نقش دارند تماس
@@ -3521,7 +3592,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,شرکت (و نه مشتری و یا تامین کننده) استاد.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,این است که در حضور این دانش آموز بر اساس
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,هیچ دانشآموزی در
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,اضافه کردن آیتم های بیشتر و یا به صورت کامل باز
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,اضافه کردن آیتم های بیشتر و یا به صورت کامل باز
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,یادداشت تحویل {0} باید قبل از لغو این سفارش فروش لغو
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,برو به کاربران
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,مبلغ پرداخت شده + نوشتن کردن مقدار نمی تواند بیشتر از جمع کل
@@ -3541,37 +3612,40 @@
 DocType: Fee Schedule,Fee Schedule,هزینه های برنامه
 DocType: Hub Settings,Publish Availability,در دسترس انتشار
 DocType: Company,Create Chart Of Accounts Based On,درست نمودار حساب بر اساس
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,نمی توان آن را به غیر گروه تبدیل کرد. وظایف کودک وجود دارد.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,تاریخ تولد نمی تواند بیشتر از امروز.
 ,Stock Ageing,سهام سالمندی
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},دانشجو {0} در برابر دانشجوی متقاضی وجود داشته باشد {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),تنظیم گرد کردن (ارزش شرکت)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,برنامه زمانی
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,برنامه زمانی
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}'  غیر فعال است
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,تنظیم به عنوان گسترش
 DocType: Cheque Print Template,Scanned Cheque,اسکن چک
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ارسال ایمیل خودکار به تماس در معاملات ارائه.
 DocType: Timesheet,Total Billable Amount,مجموع مبلغ قابل پرداخت
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,3 مورد
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,ورودی سفارش
 DocType: Purchase Order,Customer Contact Email,مشتریان تماس با ایمیل
 DocType: Warranty Claim,Item and Warranty Details,آیتم و گارانتی اطلاعات
 DocType: Sales Team,Contribution (%),سهم (٪)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,توجه: ورودی پرداخت خواهد از ایجاد شوند &quot;نقدی یا حساب بانکی &#39;مشخص نشده بود
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,پروژه {0} در حال حاضر وجود دارد
 DocType: Medical Department,Nursing User,پرستار کاربر
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,مسئولیت
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,دوره اعتبار این نقلقول به پایان رسیده است.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,دوره اعتبار این نقلقول به پایان رسیده است.
 DocType: Expense Claim Account,Expense Claim Account,حساب ادعای هزینه
 DocType: Accounts Settings,Allow Stale Exchange Rates,نرخ ارز ثابت
 DocType: Sales Person,Sales Person Name,نام فروشنده
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,لطفا حداقل 1 فاکتور در جدول وارد کنید
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,اضافه کردن کاربران
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,اضافه کردن کاربران
 DocType: POS Item Group,Item Group,مورد گروه
 DocType: Item,Safety Stock,سهام ایمنی
 DocType: Healthcare Settings,Healthcare Settings,تنظیمات سلامت
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,پیشرفت٪ برای یک کار نمی تواند بیش از 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,پیشرفت٪ برای یک کار نمی تواند بیش از 100.
 DocType: Stock Reconciliation Item,Before reconciliation,قبل از آشتی
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},به {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),مالیات و هزینه اضافه شده (شرکت ارز)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ردیف مالیاتی مورد {0} باید حساب از نوع مالیات یا درآمد یا هزینه یا شارژ داشته
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ردیف مالیاتی مورد {0} باید حساب از نوع مالیات یا درآمد یا هزینه یا شارژ داشته
 DocType: Sales Order,Partly Billed,تا حدودی صورتحساب
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,مورد {0} باید مورد دارائی های ثابت شود
 DocType: Item,Default BOM,به طور پیش فرض BOM
@@ -3587,6 +3661,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,متغیر
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,از تحویل توجه داشته باشید
 DocType: Student,Student Email Address,دانشجو آدرس ایمیل
+DocType: Item,Hub Warehouse,انبار هاب
 DocType: Physician Schedule Time Slot,From Time,از زمان
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,در انبار:
 DocType: Notification Control,Custom Message,سفارشی پیام
@@ -3594,9 +3669,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,نقدی یا حساب بانکی برای ساخت پرداخت ورود الزامی است
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,نشانی دانشجویی
 DocType: Purchase Invoice,Price List Exchange Rate,لیست قیمت نرخ ارز
+DocType: POS Profile,POS Profile Name,نام پروفیل POS
 DocType: Purchase Invoice Item,Rate,نرخ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,انترن
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,نام آدرس
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,نام آدرس
 DocType: Stock Entry,From BOM,از BOM
 DocType: Assessment Code,Assessment Code,کد ارزیابی
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,پایه
@@ -3610,11 +3686,12 @@
 DocType: Salary Slip,Salary Structure,ساختار حقوق و دستمزد
 DocType: Account,Bank,بانک
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,شرکت هواپیمایی
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,مواد شماره
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,مواد شماره
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,هنگام ایجاد دوره تکراری خطایی رخ داد
 DocType: Material Request Item,For Warehouse,ذخیره سازی
 DocType: Employee,Offer Date,پیشنهاد عضویت
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,نقل قول
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,شما در حالت آفلاین می باشد. شما نمی قادر خواهد بود به بارگذاری مجدد تا زمانی که شما به شبکه وصل شوید.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,شما در حالت آفلاین می باشد. شما نمی قادر خواهد بود به بارگذاری مجدد تا زمانی که شما به شبکه وصل شوید.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,بدون تشکل های دانشجویی ایجاد شده است.
 DocType: Purchase Invoice Item,Serial No,شماره سریال
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,میزان بازپرداخت ماهانه نمی تواند بیشتر از وام مبلغ
@@ -3624,17 +3701,18 @@
 DocType: Salary Slip,Total Working Hours,کل ساعات کار
 DocType: Subscription,Next Schedule Date,تاریخ برنامه بعدی
 DocType: Stock Entry,Including items for sub assemblies,از جمله موارد زیر را برای مجامع
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,را وارد کنید مقدار باید مثبت باشد
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,همه مناطق
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,را وارد کنید مقدار باید مثبت باشد
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,همه مناطق
 DocType: Purchase Invoice,Items,اقلام
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,دانشجو در حال حاضر ثبت نام.
 DocType: Fiscal Year,Year Name,نام سال
 DocType: Process Payroll,Process Payroll,حقوق و دستمزد فرآیند
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,می تعطیلات بیشتر از روز کاری در این ماه وجود دارد.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,می تعطیلات بیشتر از روز کاری در این ماه وجود دارد.
 DocType: Product Bundle Item,Product Bundle Item,محصولات بسته نرم افزاری مورد
 DocType: Sales Partner,Sales Partner Name,نام شریک فروش
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,درخواست نرخ
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,درخواست نرخ
 DocType: Payment Reconciliation,Maximum Invoice Amount,حداکثر مبلغ فاکتور
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,هماتولوژی
 DocType: Normal Test Items,Normal Test Items,آیتم های معمول عادی
 DocType: Student Language,Student Language,زبان دانشجو
 apps/erpnext/erpnext/config/selling.py +23,Customers,مشتریان
@@ -3645,10 +3723,11 @@
 DocType: Issue,Opening Time,زمان باز شدن
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,از و به تاریخ های الزامی
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,اوراق بهادار و بورس کالا
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',واحد اندازه گیری پیش فرض برای متغیر &#39;{0}&#39; باید همان است که در الگو: &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',واحد اندازه گیری پیش فرض برای متغیر &#39;{0}&#39; باید همان است که در الگو: &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,محاسبه بر اساس
 DocType: Delivery Note Item,From Warehouse,از انبار
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,هیچ موردی با بیل از مواد برای تولید
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,هیچ موردی با بیل از مواد برای تولید
+DocType: Restaurant,Default Customer,مشتری پیش فرض
 DocType: Assessment Plan,Supervisor Name,نام استاد راهنما
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,تأیید نکرده اید که قرار ملاقات برای همان روز ایجاد شده باشد
 DocType: Program Enrollment Course,Program Enrollment Course,برنامه ثبت نام دوره
@@ -3675,7 +3754,7 @@
 DocType: Payment Entry,Internal Transfer,انتقال داخلی
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,حساب کودک برای این حساب وجود دارد. شما می توانید این حساب را حذف کنید.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,در هر دو صورت تعداد مورد نظر و یا مقدار هدف الزامی است
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},بدون پیش فرض BOM برای مورد وجود دارد {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},بدون پیش فرض BOM برای مورد وجود دارد {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,لطفا در ارسال تاریخ را انتخاب کنید اول
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,باز کردن تاریخ باید قبل از بسته شدن تاریخ
 DocType: Leave Control Panel,Carry Forward,حمل به جلو
@@ -3710,6 +3789,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,در حال حاضر مجموع
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,بیانیه های حسابداری
 DocType: Drug Prescription,Hour,ساعت
+DocType: Restaurant Order Entry,Last Sales Invoice,آخرین اسکناس فروش
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,جدید بدون سریال را می انبار ندارد. انبار باید توسط بورس ورود یا رسید خرید مجموعه
 DocType: Lead,Lead Type,سرب نوع
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,شما مجاز به تایید برگ در تاریخ های مسدود شده نیستید
@@ -3744,64 +3824,66 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,ایجاد کاربران
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,گرم
 DocType: Supplier Scorecard,Per Month,هر ماه
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,تعداد برای تولید باید بیشتر از 0 باشد.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,تعداد برای تولید باید بیشتر از 0 باشد.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,گزارش تماس نگهداری مراجعه کنید.
 DocType: Stock Entry,Update Rate and Availability,نرخ به روز رسانی و در دسترس بودن
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,درصد شما مجاز به دریافت و یا ارائه بیش برابر مقدار سفارش داد. به عنوان مثال: اگر شما 100 واحد دستور داده اند. و کمک هزینه خود را 10٪ و سپس شما مجاز به دریافت 110 واحد است.
 DocType: POS Customer Group,Customer Group,گروه مشتری
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),دسته ID جدید (اختیاری)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),دسته ID جدید (اختیاری)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},حساب هزینه برای آیتم الزامی است {0}
 DocType: BOM,Website Description,وب سایت توضیحات
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,تغییر خالص در حقوق صاحبان سهام
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,جدیدترین
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,لطفا لغو خرید فاکتور {0} برای اولین بار
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",آدرس ایمیل باید منحصر به فرد باشد، در حال حاضر برای {0} وجود دارد
 DocType: Serial No,AMC Expiry Date,AMC تاریخ انقضاء
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,اعلام وصول
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,اعلام وصول
 ,Sales Register,ثبت فروش
 DocType: Daily Work Summary Settings Company,Send Emails At,ارسال ایمیل در
 DocType: Quotation,Quotation Lost Reason,نقل قول را فراموش کرده اید دلیل
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,انتخاب دامنه خود
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',را انتخاب کنید * از tabPatient که در آن name = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},معامله مرجع {0} تاریخ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},معامله مرجع {0} تاریخ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,چیزی برای ویرایش وجود دارد.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,فرم مشاهده
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,خلاصه برای این ماه و فعالیت های انتظار
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,فرم مشاهده
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,خلاصه برای این ماه و فعالیت های انتظار
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.",کاربران را به سازمان خود اضافه کنید، به غیر از خودتان.
 DocType: Customer Group,Customer Group Name,نام گروه مشتری
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,بدون مشتریان هنوز!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,بدون مشتریان هنوز!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,صورت جریان وجوه نقد
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},وام مبلغ می توانید حداکثر مبلغ وام از تجاوز نمی {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,مجوز
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},لطفا این فاکتور {0} از C-فرم حذف {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},لطفا این فاکتور {0} از C-فرم حذف {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,لطفا انتخاب کنید حمل به جلو اگر شما نیز می خواهید که شامل تعادل سال گذشته مالی برگ به سال مالی جاری
 DocType: GL Entry,Against Voucher Type,در برابر نوع کوپن
 DocType: Physician,Phone (R),تلفن (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,اسلات زمان اضافه شده است
 DocType: Item,Attributes,ویژگی های
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,فعال کردن الگو
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,لطفا مجموعه نامگذاری را برای {0} از طریق تنظیمات&gt; تنظیمات&gt; نامگذاری سری
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,لطفا وارد حساب فعال
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,تاریخ و زمان آخرین چینش تاریخ
 DocType: Patient,B Negative,B منفی است
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},حساب {0} به شرکت {1} تعلق ندارد
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,شماره سریال در ردیف {0} با تحویل توجه مطابقت ندارد
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,شماره سریال در ردیف {0} با تحویل توجه مطابقت ندارد
 DocType: Student,Guardian Details,نگهبان جزییات
 DocType: C-Form,C-Form,C-فرم
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,حضور و غیاب علامت برای کارکنان متعدد
 DocType: Vehicle,Chassis No,شاسی
 DocType: Payment Request,Initiated,آغاز
 DocType: Production Order,Planned Start Date,برنامه ریزی تاریخ شروع
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,لطفا یک BOM را انتخاب کنید
 DocType: Serial No,Creation Document Type,ایجاد نوع سند
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,تاریخ پایان باید از تاریخ شروع باشد
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,تاریخ پایان باید از تاریخ شروع باشد
 DocType: Leave Type,Is Encash,آیا Encash
 DocType: Leave Allocation,New Leaves Allocated,برگ جدید اختصاص داده شده
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,اطلاعات پروژه و زرنگ در دسترس برای عین نمی
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,پایان دادن به
 DocType: Project,Expected End Date,انتظار می رود تاریخ پایان
 DocType: Budget Account,Budget Amount,بودجه مقدار
 DocType: Appraisal Template,Appraisal Template Title,ارزیابی الگو عنوان
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},از تاریخ {0} برای کارمند {1} نمی تواند قبل از تاریخ پیوستن کارکنان می شود {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,تجاری
 DocType: Patient,Alcohol Current Use,مصرف الکل فعلی
+DocType: Student Admission Program,Student Admission Program,برنامه پذیرش دانشجویی
 DocType: Payment Entry,Account Paid To,حساب پرداخت به
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,مورد پدر و مادر {0} نباید آیتم سهام
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,همه محصولات یا خدمات.
@@ -3810,30 +3892,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} بودجه برای حساب {1} در برابر {2} {3} است {4}. آن خواهد شد توسط بیش از {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',ردیف {0} # حساب باید از این نوع باشد، دارایی ثابت &#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,از تعداد
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,مشاهده قوانین برای محاسبه مقدار حمل و نقل برای فروش
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,و غیرفعال شده غیر فعال در
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,سری الزامی است
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,خدمات مالی
 DocType: Student Sibling,Student ID,ID دانش آموز
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,نوع فعالیت برای سیاهههای مربوط زمان
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,ایمیل ارسال کننده
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,نوع فعالیت برای سیاهههای مربوط زمان
 DocType: Tax Rule,Sales,فروش
 DocType: Stock Entry Detail,Basic Amount,مقدار اولیه
 DocType: Training Event,Exam,امتحان
 DocType: Complaint,Complaint,شکایت
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},انبار مورد نیاز برای سهام مورد {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},انبار مورد نیاز برای سهام مورد {0}
 DocType: Leave Allocation,Unused leaves,برگ استفاده نشده
 DocType: Patient,Alcohol Past Use,مصرف الکل گذشته
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,کروم
 DocType: Tax Rule,Billing State,دولت صدور صورت حساب
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,انتقال
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),واکشی BOM منفجر شد (از جمله زیر مجموعه)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,انتقال
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),واکشی BOM منفجر شد (از جمله زیر مجموعه)
 DocType: Authorization Rule,Applicable To (Employee),به قابل اجرا (کارمند)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,تاریخ الزامی است
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,تاریخ الزامی است
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,افزایش برای صفت {0} نمی تواند 0
 DocType: Journal Entry,Pay To / Recd From,پرداخت به / از Recd
 DocType: Naming Series,Setup Series,راه اندازی سری
 DocType: Payment Reconciliation,To Invoice Date,به فاکتور تاریخ
 DocType: Supplier,Contact HTML,تماس با HTML
 ,Inactive Customers,مشتریان غیر فعال
+DocType: Student Admission Program,Maximum Age,حداکثر سن
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,رسید خرید
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,چگونه قیمت گذاری قانون اعمال می شود؟
@@ -3852,6 +3936,7 @@
 DocType: GL Entry,Remarks,سخنان
 DocType: Payment Entry,Account Paid From,حساب پرداخت از
 DocType: Purchase Order Item Supplied,Raw Material Item Code,مواد اولیه کد مورد
+DocType: Task,Parent Task,وظیفه والدین
 DocType: Journal Entry,Write Off Based On,ارسال فعال بر اساس
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,را سرب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,چاپ و لوازم التحریر
@@ -3860,19 +3945,19 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",حقوق و دستمزد در حال حاضر برای دوره بین {0} و {1}، ترک دوره نرم افزار نمی تواند بین این محدوده تاریخ پردازش شده است.
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,رکورد نصب و راه اندازی برای یک شماره سریال
 DocType: Guardian Interest,Guardian Interest,نگهبان علاقه
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,تنظیمات پیش فرض برای حسابهای POS
 apps/erpnext/erpnext/config/hr.py +177,Training,آموزش
 DocType: Timesheet,Employee Detail,جزئیات کارمند
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ID ایمیل
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,روز تاریخ بعدی و تکرار در روز ماه باید برابر باشد
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,روز تاریخ بعدی و تکرار در روز ماه باید برابر باشد
 DocType: Lab Prescription,Test Code,کد تست
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,تنظیمات برای صفحه اصلی وب سایت
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ ها برای {0} مجاز نیستند چرا که یک کارت امتیازی از {1}
 DocType: Offer Letter,Awaiting Response,در انتظار پاسخ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,در بالا
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},مجموع مقدار {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},ویژگی نامعتبر {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},مجموع مقدار {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},ویژگی نامعتبر {0} {1}
 DocType: Supplier,Mention if non-standard payable account,ذکر است اگر غیر استاندارد حساب های قابل پرداخت
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},آیتم همان وارد شده است چند بار. {} لیست
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',لطفا گروه ارزیابی غیر از &#39;همه گروه ارزیابی &quot;را انتخاب کنید
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},ردیف {0}: مرکز هزینه برای یک مورد مورد نیاز است {1}
 DocType: Training Event Employee,Optional,اختیاری
@@ -3895,19 +3980,20 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: مرکز هزینه برای مورد الزامی است {2}
 DocType: Vehicle,Policy No,سیاست هیچ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,گرفتن اقلام از بسته نرم افزاری محصولات
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property",همانطور که سهام در برابر آیتم {0} موجود است، شما نمی توانید فعال کنید دارای ویژگی های مختلف است
 DocType: Asset,Straight Line,خط مستقیم
 DocType: Project User,Project User,پروژه کاربر
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,شکاف
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,شکاف
 DocType: GL Entry,Is Advance,آیا پیشرفته
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,حضور و غیاب حضور و غیاب از تاریخ و به روز الزامی است
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,لطفا وارد است واگذار شده به عنوان بله یا نه
+DocType: Item,Default Purchase Unit of Measure,واحد خرید پیش فرض اندازه گیری
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,آخرین تاریخ ارتباطات
 DocType: Sales Team,Contact No.,تماس با شماره
 DocType: Bank Reconciliation,Payment Entries,مطالب پرداخت
 DocType: Production Order,Scrap Warehouse,انبار ضایعات
 DocType: Production Order,Check if material transfer entry is not required,بررسی کنید که آیا ورود انتقال مواد مورد نیاز نمی باشد
 DocType: Program Enrollment Tool,Get Students From,مطلع دانش آموزان از
-DocType: Hub Settings,Seller Country,فروشنده کشور
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,انتشار موارد در وب سایت
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,گروه دانش آموزان خود را در دسته
 DocType: Authorization Rule,Authorization Rule,قانون مجوز
@@ -3917,7 +4003,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,مالیات فروش و اتهامات الگو
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),مجموع (اعتباری)
 DocType: Repayment Schedule,Payment Date,تاریخ پرداخت
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,دسته ای جدید تعداد
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,دسته ای جدید تعداد
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,پوشاک و لوازم جانبی
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,تابع نمره وزنی حل نشد. اطمینان حاصل کنید که فرمول معتبر است
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,تعداد سفارش
@@ -3935,6 +4021,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",ردیف # {0}: دارایی {1} نمی تواند ارائه شود، آن است که در حال حاضر {2}
 DocType: Tax Rule,Billing Country,کشور صدور صورت حساب
 DocType: Purchase Order Item,Expected Delivery Date,انتظار می رود تاریخ تحویل
+DocType: Restaurant Order Entry,Restaurant Order Entry,ورود به رستوران
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,بدهی و اعتباری برای {0} # برابر نیست {1}. تفاوت در این است {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,هزینه سرگرمی
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,را درخواست پاسخ به مواد
@@ -3947,9 +4034,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,حساب با معامله های موجود نمی تواند حذف شود
 DocType: Vehicle,Last Carbon Check,آخرین چک کربن
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,هزینه های قانونی
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,لطفا مقدار را در ردیف را انتخاب کنید
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,لطفا مقدار را در ردیف را انتخاب کنید
 DocType: Purchase Invoice,Posting Time,مجوز های ارسال و زمان
 DocType: Timesheet,% Amount Billed,٪ مبلغ صورتحساب
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Time for appointment&quot; برای Dr {0} تنظیم نشده است. این را به کارشناسی ارشد Physician اضافه کنید.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,هزینه تلفن
 DocType: Sales Partner,Logo,آرم
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,بررسی این اگر شما می خواهید به زور کاربر برای انتخاب یک سری قبل از ذخیره. خواهد شد وجود ندارد به طور پیش فرض اگر شما این تیک بزنید.
@@ -3960,6 +4048,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,جدید درآمد و ضوابط
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,هزینه های سفر
 DocType: Maintenance Visit,Breakdown,تفکیک
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},اشتراک فیلد سفارشی را در doctype {0} اضافه کنید
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,حساب: {0} با ارز: {1} نمی تواند انتخاب شود
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",به روز رسانی BOM هزینه به طور خودکار از طریق زمانبند، بر اساس آخرین ارزش نرخ نرخ / نرخ قیمت / آخرین نرخ خرید مواد خام.
 DocType: Bank Reconciliation Detail,Cheque Date,چک تاریخ
@@ -3984,7 +4073,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),کل مقدار حسابداری (از طریق زمان سیاههها)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,تامین کننده کد
 DocType: Payment Request,Payment Gateway Details,پرداخت جزئیات دروازه
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,تعداد باید بیشتر از 0 باشد
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,تعداد باید بیشتر از 0 باشد
 DocType: Journal Entry,Cash Entry,نقدی ورودی
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,گره فرزند می تواند تنها تحت &#39;گروه&#39; نوع گره ایجاد
 DocType: Leave Application,Half Day Date,تاریخ نیم روز
@@ -4002,12 +4091,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,توجه: مورد {0} وارد چندین بار
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,همه اطلاعات تماس.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,مخفف شرکت
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,کاربر {0} وجود ندارد
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,کاربر {0} وجود ندارد
 DocType: Subscription,SUB-,زیر-
 DocType: Item Attribute Value,Abbreviation,مخفف
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,ورود پرداخت در حال حاضر وجود دارد
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,authroized نه از {0} بیش از محدودیت
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,کارشناسی ارشد قالب حقوق و دستمزد.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,آسيب شناسي
+DocType: Restaurant Order Entry,Restaurant Table,جدول رستوران
 DocType: Leave Type,Max Days Leave Allowed,حداکثر روز مرخصی مجاز
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,مجموعه قوانین مالیاتی برای سبد خرید
 DocType: Purchase Invoice,Taxes and Charges Added,مالیات و هزینه اضافه شده
@@ -4019,10 +4110,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,پیشنهاد قیمت برای مشتریان یا مشتریان بالقوه
 DocType: Stock Settings,Role Allowed to edit frozen stock,نقش مجاز به ویرایش سهام منجمد
 ,Territory Target Variance Item Group-Wise,منطقه مورد هدف واریانس گروه حکیم
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,همه گروه های مشتری
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,همه گروه های مشتری
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,انباشته ماهانه
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} الزامی است. شاید رکورد ارز برای {1} به {2} ایجاد نمی شود.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,قالب مالیات اجباری است.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,قالب مالیات اجباری است.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,حساب {0}: حساب مرجع {1} وجود ندارد
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),لیست قیمت نرخ (شرکت ارز)
 DocType: Products Settings,Products Settings,محصولات تنظیمات
@@ -4038,7 +4129,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1213,Please set Company,لطفا مجموعه شرکت
 DocType: Pricing Rule,Buying,خرید
 DocType: HR Settings,Employee Records to be created by,سوابق کارمند به ایجاد شود
-DocType: Patient,AB Negative,AB منفی است
+DocType: Patient,AB Negative,AB منفی
 DocType: Sample Collection,SMPL-,SMPL-
 DocType: POS Profile,Apply Discount On,درخواست تخفیف
 ,Reqd By Date,Reqd بر اساس تاریخ
@@ -4048,12 +4139,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,مورد جزئیات حکیم مالیات
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,مخفف موسسه
 ,Item-wise Price List Rate,مورد عاقلانه لیست قیمت نرخ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,نقل قول تامین کننده
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,نقل قول تامین کننده
 DocType: Quotation,In Words will be visible once you save the Quotation.,به عبارت قابل مشاهده خواهد بود هنگامی که شما نقل قول را نجات دهد.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},تعداد ({0}) نمی تواند یک کسر در ردیف {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},بارکد {0} در حال حاضر در مورد استفاده {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},بارکد {0} در حال حاضر در مورد استفاده {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,مشاهده قوانین برای اضافه کردن هزینه های حمل و نقل.
 DocType: Item,Opening Stock,سهام باز کردن
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,مشتری مورد نیاز است
@@ -4071,9 +4162,8 @@
 DocType: Customer,From Lead,از سرب
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,سفارشات برای تولید منتشر شد.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,انتخاب سال مالی ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,نمایش POS مورد نیاز برای ایجاد POS ورود
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,نمایش POS مورد نیاز برای ایجاد POS ورود
 DocType: Program Enrollment Tool,Enroll Students,ثبت نام دانش آموزان
-DocType: Hub Settings,Name Token,نام رمز
 DocType: Lab Test,Approved Date,تاریخ تأیید
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,فروش استاندارد
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,حداقل یک انبار الزامی است
@@ -4091,7 +4181,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,منابع انسانی
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,آشتی پرداخت
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,دارایی های مالیاتی
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},تولید سفارش شده است {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},تولید سفارش شده است {0}
 DocType: BOM Item,BOM No,BOM بدون
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,مجله ورودی {0} می کند حساب کاربری ندارید {1} یا در حال حاضر همسان در برابر دیگر کوپن
@@ -4111,7 +4201,7 @@
 DocType: Currency Exchange,To Currency,به ارز
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,اجازه می دهد کاربران زیر به تصویب برنامه های کاربردی را برای روز مسدود کند.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,انواع ادعای هزینه.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},نرخ برای آیتم فروش {0} کمتر از است {1} آن است. نرخ فروش باید حداقل {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},نرخ برای آیتم فروش {0} کمتر از است {1} آن است. نرخ فروش باید حداقل {2}
 DocType: Item,Taxes,عوارض
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,پرداخت و تحویل داده نشده است
 DocType: Project,Default Cost Center,مرکز هزینه به طور پیش فرض
@@ -4125,15 +4215,15 @@
 DocType: Employee Loan,Fully Disbursed,به طور کامل پرداخت شده
 DocType: Maintenance Visit,Customer Feedback,نظرسنجی
 DocType: Account,Expense,هزینه
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,امتیاز نمی تواند بیشتر از حداکثر نمره
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,امتیاز نمی تواند بیشتر از حداکثر نمره
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,مشتریان و تامین کنندگان
 DocType: Item Attribute,From Range,از محدوده
 DocType: BOM,Set rate of sub-assembly item based on BOM,تنظیم مقدار مورد مونتاژ بر اساس BOM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},خطای نحوی در فرمول یا شرایط: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},خطای نحوی در فرمول یا شرایط: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,روزانه کار تنظیمات خلاصه شرکت
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,مورد {0} از آن نادیده گرفته است یک آیتم سهام نمی
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,ارسال این سفارش تولید برای پردازش بیشتر است.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,ارسال این سفارش تولید برای پردازش بیشتر است.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",برای رد درخواست قیمت گذاری در یک معامله خاص نیست، همه قوانین قیمت گذاری قابل اجرا باید غیر فعال باشد.
 DocType: Assessment Group,Parent Assessment Group,پدر و مادر گروه ارزیابی
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,شغل ها
@@ -4150,12 +4240,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',لطفا مجموعه شرکت فیلتر خالی اگر گروه توسط است شرکت &#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,مجوز های ارسال و تاریخ نمی تواند تاریخ آینده
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},ردیف # {0}: سریال نه {1} با مطابقت ندارد {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,برای تولید دوره تکراری
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,مرخصی گاه به گاه
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,آزمایش آزمایشگاه UOM.
 DocType: Batch,Batch ID,دسته ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},توجه: {0}
 ,Delivery Note Trends,روند تحویل توجه داشته باشید
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,خلاصه این هفته
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,خلاصه این هفته
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,در انبار تعداد
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,حساب: {0} تنها می تواند از طریق معاملات سهام به روز شده
 DocType: Student Group Creation Tool,Get Courses,دوره های
@@ -4169,7 +4260,6 @@
 DocType: Purchase Order,To Bill,به بیل
 DocType: Material Request,% Ordered,مرتب٪
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",برای دوره بر اساس گروه دانشجویی، دوره خواهد شد برای هر دانشجو از دوره های ثبت نام شده در برنامه ثبت نام تایید شده است.
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date",را وارد کنید آدرس ایمیل با کاما جدا شده، فاکتور به طور خودکار در تاریخ خاص از طریق پست
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,کار از روی مقاطعه
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,اوسط نرخ خرید
 DocType: Task,Actual Time (in Hours),زمان واقعی (در ساعت)
@@ -4183,7 +4273,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,مورد {0} است راه اندازی برای سریال شماره نیست. ستون باید خالی باشد
 DocType: Accounts Settings,Accounts Settings,تنظیمات حسابها
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,تایید
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,هیچ نتیجهای برای ارسال وجود ندارد
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,هیچ نتیجهای برای ارسال وجود ندارد
 DocType: Customer,Sales Partner and Commission,شریک فروش و کمیسیون
 DocType: Employee Loan,Rate of Interest (%) / Year,نرخ بهره (٪) / سال
 ,Project Quantity,تعداد پروژه
@@ -4195,55 +4285,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,سیاه
 DocType: BOM Explosion Item,BOM Explosion Item,BOM مورد انفجار
 DocType: Account,Auditor,ممیز
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} کالاهای تولید شده
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} کالاهای تولید شده
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,بیشتر بدانید
 DocType: Cheque Print Template,Distance from top edge,فاصله از لبه بالا
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,لیست قیمت {0} غیر فعال است و یا وجود ندارد
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,لیست قیمت {0} غیر فعال است و یا وجود ندارد
 DocType: Purchase Invoice,Return,برگشت
 DocType: Production Order Operation,Production Order Operation,ترتیب عملیات تولید
 DocType: Pricing Rule,Disable,از کار انداختن
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,نحوه پرداخت مورد نیاز است را به پرداخت
 DocType: Project Task,Pending Review,در انتظار نقد و بررسی
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,انتصاب و مشاوره
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} در دسته ای ثبت نام نشده {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} در دسته ای ثبت نام نشده {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",دارایی {0} نمی تواند اوراق شود، آن است که در حال حاضر {1}
 DocType: Task,Total Expense Claim (via Expense Claim),ادعای هزینه کل (از طریق ادعای هزینه)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,علامت گذاری به عنوان غایب
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ردیف {0}: ارز BOM # در {1} باید به ارز انتخاب شده برابر باشد {2}
 DocType: Journal Entry Account,Exchange Rate,مظنهء ارز
 DocType: Patient,Additional information regarding the patient,اطلاعات اضافی مربوط به بیمار
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,سفارش فروش {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,سفارش فروش {0} است ارسال نشده
 DocType: Homepage,Tag Line,نقطه حساس
 DocType: Fee Component,Fee Component,هزینه یدکی
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,مدیریت ناوگان
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,اضافه کردن آیتم از
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,مدیریت ناوگان
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,اضافه کردن آیتم از
 DocType: Cheque Print Template,Regular,منظم
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,وزنها در کل از همه معیارهای ارزیابی باید 100٪
-DocType: BOM,Last Purchase Rate,تاریخ و زمان آخرین نرخ خرید
+DocType: Purchase Order Item,Last Purchase Rate,تاریخ و زمان آخرین نرخ خرید
 DocType: Account,Asset,دارایی
 DocType: Project Task,Task ID,وظیفه ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,سهام نمی تواند برای مورد وجود داشته باشد {0} از انواع است
 DocType: Lab Test,Mobile,سیار
 ,Sales Person-wise Transaction Summary,فروش شخص عاقل خلاصه معامله
 DocType: Training Event,Contact Number,شماره تماس
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,انبار {0} وجود ندارد
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ثبت نام برای ERPNext توپی
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,انبار {0} وجود ندارد
 DocType: Monthly Distribution,Monthly Distribution Percentages,درصد ماهانه توزیع
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,آیتم انتخاب شده می تواند دسته ای ندارد
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",نرخ ارزش گذاری برای آیتم {0}، که لازم است برای انجام ورودی حسابداری برای یافت نشد {1} {2}. در صورتی که آیتم به عنوان یک آیتم نمونه در طرف قرارداد {1}، لطفا ذکر است که در {1} جدول مورد. در غیر این صورت، لطفا ایجاد یک معامله سهام های دریافتی را برای آیتم و یا ذکر میزان ارزش در پرونده مورد، و سپس سعی کنید از ارسال / لغو این مطلب
 DocType: Delivery Note,% of materials delivered against this Delivery Note,درصد از مواد در برابر این تحویل توجه تحویل
+DocType: Training Event,Has Certificate,گواهی دارد
 DocType: Project,Customer Details,اطلاعات مشتری
 DocType: Employee,Reports to,گزارش به
 ,Unpaid Expense Claim,ادعای هزینه های پرداخت نشده
 DocType: Payment Entry,Paid Amount,مبلغ پرداخت
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,کاوش چرخه فروش
 DocType: Assessment Plan,Supervisor,سرپرست
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,آنلاین
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,آنلاین
 ,Available Stock for Packing Items,انبار موجود آیتم ها بسته بندی
 DocType: Item Variant,Item Variant,مورد نوع
 DocType: Assessment Result Tool,Assessment Result Tool,ابزار ارزیابی نتیجه
 DocType: BOM Scrap Item,BOM Scrap Item,BOM مورد ضایعات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,سفارشات ارسال شده را نمی توان حذف
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,سفارشات ارسال شده را نمی توان حذف
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",مانده حساب در حال حاضر در بدهی، شما امکان پذیر نیست را به مجموعه &quot;تعادل باید به عنوان&quot; اعتبار &quot;
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,مدیریت کیفیت
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,مورد {0} غیرفعال شده است
@@ -4263,7 +4352,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},ردیف # {0}: درگیری های تنظیم وقت با ردیف {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,اجازه رای دادن به ارزش گذاری صفر
 DocType: Training Event Employee,Invited,دعوت کرد
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,چند ساختار حقوق و دستمزد فعال برای کارکنان {0} برای تاریخ داده شده پیدا شده
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,چند ساختار حقوق و دستمزد فعال برای کارکنان {0} برای تاریخ داده شده پیدا شده
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,راه اندازی حساب های دروازه.
 DocType: Employee,Employment Type,نوع استخدام
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,دارایی های ثابت
@@ -4275,7 +4364,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,دانشجو ID ایمیل
 DocType: Employee,Notice (days),مقررات (روز)
 DocType: Tax Rule,Sales Tax Template,قالب مالیات بر فروش
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,انتخاب آیتم ها برای صرفه جویی در فاکتور
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,انتخاب آیتم ها برای صرفه جویی در فاکتور
 DocType: Employee,Encashment Date,Encashment عضویت
 DocType: Training Event,Internet,اینترنت
 DocType: Special Test Template,Special Test Template,قالب تست ویژه
@@ -4284,7 +4373,7 @@
 DocType: Production Order,Planned Operating Cost,هزینه های عملیاتی برنامه ریزی شده
 DocType: Academic Term,Term Start Date,مدت تاریخ شروع
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,تعداد روبروی
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},لطفا پیدا متصل {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},لطفا پیدا متصل {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,تعادل بیانیه بانک به عنوان در هر لجر عمومی
 DocType: Job Applicant,Applicant Name,نام متقاضی
 DocType: Authorization Rule,Customer / Item Name,مشتری / نام آیتم
@@ -4304,7 +4393,7 @@
 DocType: Guardian,Guardian Of ,نگهبان
 DocType: Grading Scale Interval,Threshold,آستانه
 DocType: BOM Update Tool,Current BOM,BOM کنونی
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,اضافه کردن سریال بدون
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,اضافه کردن سریال بدون
 DocType: Production Order Item,Available Qty at Source Warehouse,موجود تعداد در منبع انبار
 apps/erpnext/erpnext/config/support.py +22,Warranty,گارانتی
 DocType: Purchase Invoice,Debit Note Issued,بدهی توجه صادر
@@ -4327,10 +4416,9 @@
 DocType: Account,Receivable,دریافتنی
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ردیف # {0}: مجاز به تغییر به عنوان کننده سفارش خرید در حال حاضر وجود
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,نقش است که مجاز به ارائه معاملات است که بیش از محدودیت های اعتباری تعیین شده است.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,انتخاب موارد برای ساخت
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time",استاد همگام سازی داده های، ممکن است برخی از زمان
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,انتخاب موارد برای ساخت
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time",استاد همگام سازی داده های، ممکن است برخی از زمان
 DocType: Item,Material Issue,شماره مواد
-DocType: Hub Settings,Seller Description,فروشنده توضیحات
 DocType: Employee Education,Qualification,صلاحیت
 DocType: Item Price,Item Price,آیتم قیمت
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,صابون و مواد شوینده
@@ -4338,7 +4426,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,از زمان نمی تواند بیشتر از به زمان.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,فیلم و ویدیو
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,مرتب
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,ادامه
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,ادامه
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,اگر سیستم فعال باشد، سیستم فیلد های مختلف از قالب را به روز نمی کند، اما داده های زمینه های زیر را در هنگام ایجاد یک نسخه جدید کپی می کند
 DocType: Salary Detail,Component,مولفه
 DocType: Assessment Criteria,Assessment Criteria Group,معیارهای ارزیابی گروه
 DocType: Healthcare Settings,Patient Name By,نام بیمار توسط
@@ -4348,7 +4437,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,لطفا تصویب نقش و یا تصویب کاربر وارد
 DocType: Journal Entry,Write Off Entry,ارسال فعال ورود
 DocType: BOM,Rate Of Materials Based On,نرخ مواد بر اساس
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,تامین کننده&gt; نوع تامین کننده
+DocType: Item Variant Settings,Do not Update Variants,گزینه های به روزرسانی نکنید
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics پشتیبانی
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,همه موارد را از حالت انتخاب خارج کنید
 DocType: POS Profile,Terms and Conditions,شرایط و ضوابط
@@ -4357,7 +4446,7 @@
 DocType: Leave Block List,Applies to Company,امر به شرکت
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,نمی تواند به دلیل لغو ارائه سهام ورود {0} وجود دارد
 DocType: Employee Loan,Disbursement Date,تاریخ پرداخت
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&quot;گیرندگان&quot; مشخص نشده اند
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&quot;گیرندگان&quot; مشخص نشده اند
 DocType: BOM Update Tool,Update latest price in all BOMs,به روز رسانی آخرین قیمت در تمام BOMs
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,پرونده پزشکی
 DocType: Vehicle,Vehicle,وسیله نقلیه
@@ -4372,14 +4461,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,OPP /٪ سرب
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Depreciations دارایی و تعادل
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},مقدار {0} {1} منتقل شده از {2} به {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},مقدار {0} {1} منتقل شده از {2} به {3}
 DocType: Sales Invoice,Get Advances Received,دریافت پیشرفت های دریافتی
 DocType: Email Digest,Add/Remove Recipients,اضافه کردن / حذف دریافت کنندگان
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},معامله در برابر تولید متوقف مجاز ترتیب {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",برای تنظیم این سال مالی به عنوان پیش فرض، بر روی &quot;تنظیم به عنوان پیش فرض &#39;
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,پیوستن
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,پیوستن
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,کمبود تعداد
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,نوع مورد {0} با ویژگی های مشابه وجود دارد
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,نوع مورد {0} با ویژگی های مشابه وجود دارد
 DocType: Employee Loan,Repay from Salary,بازپرداخت از حقوق و دستمزد
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},درخواست پرداخت در مقابل {0} {1} برای مقدار {2}
@@ -4392,7 +4481,7 @@
 DocType: Sales Invoice Item,Sales Order Item,مورد سفارش فروش
 DocType: Salary Slip,Payment Days,روز پرداخت
 DocType: Patient,Dormant,خوابیده
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,انبارها با گره فرزند را نمی توان تبدیل به لجر
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,انبارها با گره فرزند را نمی توان تبدیل به لجر
 DocType: BOM,Manage cost of operations,مدیریت هزینه های عملیات
 DocType: Accounts Settings,Stale Days,روزهای سخت
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",هنگامی که هر یک از معاملات چک می &quot;فرستاده&quot;، یک ایمیل پاپ آپ به طور خودکار باز برای ارسال یک ایمیل به همراه &quot;تماس&quot; در آن معامله، با معامله به عنوان یک پیوست. کاربر ممکن است یا ممکن است ایمیل ارسال کنید.
@@ -4406,10 +4495,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,سریال بدون {0} در حال حاضر دریافت شده است
 ,Requested Items To Be Transferred,آیتم ها درخواست می شود منتقل
 DocType: Expense Claim,Vehicle Log,ورود خودرو
-DocType: Purchase Invoice,Recurring Id,تکرار کد
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),وجود تب (دماي 38.5 درجه سانتی گراد / 101.3 درجه فارنهایت یا دمای پایدار&gt; 38 درجه سانتی گراد / 100.4 درجه فارنهایت)
 DocType: Customer,Sales Team Details,جزییات تیم فروش
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,به طور دائم حذف کنید؟
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,به طور دائم حذف کنید؟
 DocType: Expense Claim,Total Claimed Amount,مجموع مقدار ادعا
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,فرصت های بالقوه برای فروش.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},نامعتبر {0}
@@ -4419,7 +4507,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,فروشگاه های گروه
 ,Item Delivery Date,مورد تاریخ تحویل
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,راه اندازی مدرسه خود را در ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,راه اندازی مدرسه خود را در ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),پایه تغییر مقدار (شرکت ارز)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,هیچ نوشته حسابداری برای انبار زیر
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,ذخیره سند اول است.
@@ -4431,13 +4519,12 @@
 DocType: Task,Is Milestone,است نقطه عطف
 DocType: Daily Work Summary,Email Sent To,ایمیل ارسال شده به
 DocType: Budget,Warn,هشدار دادن
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,آیا مطمئن هستید که می خواهید ثبت نام کنید؟
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",هر گونه اظهارات دیگر، تلاش قابل توجه است که باید در پرونده بروید.
 DocType: BOM,Manufacturing User,ساخت کاربری
 DocType: Purchase Invoice,Raw Materials Supplied,مواد اولیه عرضه شده
-DocType: Purchase Invoice,Recurring Print Format,تکرار چاپ فرمت
 DocType: C-Form,Series,سلسله
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},ارزش لیست قیمت {0} باید {1} یا {2} باشد
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,اضافه کردن محصولات
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},ارزش لیست قیمت {0} باید {1} یا {2} باشد
 DocType: Appraisal,Appraisal Template,ارزیابی الگو
 DocType: Item Group,Item Classification,طبقه بندی مورد
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,مدیر توسعه تجاری
@@ -4451,7 +4538,7 @@
 DocType: Item Attribute Value,Attribute Value,موجودیت مقدار
 ,Itemwise Recommended Reorder Level,Itemwise توصیه ترتیب مجدد سطح
 DocType: Salary Detail,Salary Detail,جزئیات حقوق و دستمزد
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,لطفا انتخاب کنید {0} برای اولین بار
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,لطفا انتخاب کنید {0} برای اولین بار
 DocType: Appointment Type,Physician,پزشک
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,دسته {0} از {1} مورد تمام شده است.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,مشاوره
@@ -4462,7 +4549,7 @@
 DocType: Salary Detail,Default Amount,مقدار پیش فرض
 DocType: Lab Test Template,Descriptive,توصیفی
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,انبار در سیستم یافت نشد
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,خلاصه این ماه
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,خلاصه این ماه
 DocType: Quality Inspection Reading,Quality Inspection Reading,خواندن بازرسی کیفیت
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`سهام منجمد قدیمی تر از` باید کوچکتر از %d روز باشد.
 DocType: Tax Rule,Purchase Tax Template,خرید قالب مالیات
@@ -4485,12 +4572,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,آموزش و رویدادها / نتایج
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,انباشته استهلاک به عنوان در
 DocType: Sales Invoice,C-Form Applicable,C-فرم قابل استفاده
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},عملیات زمان باید بیشتر از 0 برای عملیات می شود {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},عملیات زمان باید بیشتر از 0 برای عملیات می شود {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,انبار الزامی است
 DocType: Supplier,Address and Contacts,آدرس و اطلاعات تماس
 DocType: UOM Conversion Detail,UOM Conversion Detail,جزئیات UOM تبدیل
 DocType: Program,Program Abbreviation,مخفف برنامه
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,سفارش تولید می تواند در برابر یک الگو مورد نمی توان مطرح
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,سفارش تولید می تواند در برابر یک الگو مورد نمی توان مطرح
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,اتهامات در رسید خرید بر علیه هر یک از آیتم به روز شده
 DocType: Warranty Claim,Resolved By,حل
 DocType: Bank Guarantee,Start Date,تاریخ شروع
@@ -4516,26 +4603,27 @@
 DocType: Employee,Educational Qualification,صلاحیت تحصیلی
 DocType: Workstation,Operating Costs,هزینه های عملیاتی
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,اکشن اگر انباشته بودجه ماهانه بیش از حد
-DocType: Purchase Invoice,Submit on creation,ارسال در ایجاد
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},ارز برای {0} باید {1}
+DocType: Subscription,Submit on creation,ارسال در ایجاد
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},ارز برای {0} باید {1}
 DocType: Asset,Disposal Date,تاریخ دفع
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",ایمیل خواهد شد به تمام کارمندان فعال این شرکت در ساعت داده ارسال می شود، اگر آنها تعطیلات ندارد. خلاصه ای از پاسخ های خواهد شد در نیمه شب فرستاده شده است.
 DocType: Employee Leave Approver,Employee Leave Approver,کارمند مرخصی تصویب
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},ردیف {0}: ورود ترتیب مجدد در حال حاضر برای این انبار وجود دارد {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.",نمی تواند به عنوان از دست رفته اعلام، به دلیل عبارت ساخته شده است.
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,آموزش فیدبک
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},ردیف {0}: ورود ترتیب مجدد در حال حاضر برای این انبار وجود دارد {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.",نمی تواند به عنوان از دست رفته اعلام، به دلیل عبارت ساخته شده است.
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,آموزش فیدبک
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,سفارش تولید {0} باید ارائه شود
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,معیارهای کارت امتیازی تامین کننده
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},لطفا تاریخ شروع و پایان تاریخ برای مورد را انتخاب کنید {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},البته در ردیف الزامی است {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,تا به امروز نمی تواند قبل از از تاریخ
 DocType: Supplier Quotation Item,Prevdoc DocType,DOCTYPE Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,افزودن / ویرایش قیمت ها
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,افزودن / ویرایش قیمت ها
 DocType: Batch,Parent Batch,دسته ای پدر و مادر
 DocType: Cheque Print Template,Cheque Print Template,چک الگو چاپ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,نمودار مراکز هزینه
 DocType: Lab Test Template,Sample Collection,مجموعه نمونه
 ,Requested Items To Be Ordered,آیتم ها درخواست می شود با شماره
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,سفارشهای من
 DocType: Price List,Price List Name,لیست قیمت نام
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},خلاصه کار روزانه برای {0}
 DocType: Employee Loan,Totals,مجموع
@@ -4554,12 +4642,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} واحد از {1} مورد نیاز در {2} در {3} {4} {5} برای برای تکمیل این معامله.
 DocType: Fee Schedule,Student Category,دانشجو رده
 DocType: Announcement,Student,دانشجو
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,واحد سازمانی (گروه آموزشی) استاد.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,واحد سازمانی (گروه آموزشی) استاد.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,به اتاق ها بروید
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,لطفا قبل از ارسال پیام را وارد کنید
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,تکراری برای کننده
 DocType: Email Digest,Pending Quotations,در انتظار نقل قول
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,نقطه از فروش مشخصات
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,نقطه از فروش مشخصات
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,تنظیمات آزمایشی آزمایشگاه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,نا امن وام
 DocType: Cost Center,Cost Center Name,هزینه نام مرکز
@@ -4569,6 +4657,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,مجموع پرداخت AMT
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,پیام های بزرگتر از 160 کاراکتر خواهد شد را به چندین پیام را تقسیم
 DocType: Purchase Receipt Item,Received and Accepted,دریافت و پذیرفته
+DocType: Hub Settings,Company and Seller Profile,مشخصات شرکت و فروشنده
 ,GST Itemised Sales Register,GST جزء به جزء فروش ثبت نام
 ,Serial No Service Contract Expiry,سریال بدون خدمات قرارداد انقضاء
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,شما نمی توانید اعتباری و بدهی همان حساب در همان زمان
@@ -4578,10 +4667,11 @@
 DocType: Item,Variant Based On,بر اساس نوع
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},بین وزنها مجموع اختصاص داده باید 100٪ باشد. این {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,تامین کنندگان شما
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,لطفا اصلاح کنید
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,می توانید مجموعه ای نه به عنوان از دست داده تا سفارش فروش ساخته شده است.
 DocType: Request for Quotation Item,Supplier Part No,کننده قسمت بدون
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',نمی توانید کسر وقتی دسته است برای ارزش گذاری &quot;یا&quot; Vaulation و مجموع:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,دریافت شده از
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,دریافت شده از
 DocType: Lead,Converted,مبدل
 DocType: Item,Has Serial No,دارای سریال بدون
 DocType: Employee,Date of Issue,تاریخ صدور
@@ -4589,7 +4679,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",همانطور که در تنظیمات از خرید اگر خرید Reciept مورد نیاز == &quot;YES&quot;، پس از آن برای ایجاد خرید فاکتور، کاربر نیاز به ایجاد رسید خرید برای اولین بار در مورد {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},ردیف # {0}: تنظیم کننده برای آیتم {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,ردیف {0}: ارزش ساعت باید بزرگتر از صفر باشد.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,وب سایت تصویر {0} متصل به مورد {1} را نمی توان یافت
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,وب سایت تصویر {0} متصل به مورد {1} را نمی توان یافت
 DocType: Issue,Content Type,نوع محتوا
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,کامپیوتر
 DocType: Item,List this Item in multiple groups on the website.,فهرست این مورد در گروه های متعدد بر روی وب سایت.
@@ -4600,14 +4690,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,دریافت Unreconciled مطالب
 DocType: Payment Reconciliation,From Invoice Date,از تاریخ فاکتور
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,شما مجوز ارسال ندارید
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,ارز صورتحساب باید به ارز یا به حساب حزب ارز هم به طور پیش فرض comapany برابر شود
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,ارز صورتحساب باید به ارز یا به حساب حزب ارز هم به طور پیش فرض comapany برابر شود
 DocType: Healthcare Settings,Laboratory Settings,تنظیمات آزمایشگاهی
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,ترک مجموعه
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,چه کاری انجام میدهد؟
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,به انبار
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,همه پذیرش دانشجو
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,چه کاری انجام میدهد؟
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,به انبار
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,همه پذیرش دانشجو
 ,Average Commission Rate,اوسط نرخ کمیشن
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,"""دارای شماره سریال""  برای موارد غیر انباری نمی تواند ""بله"" باشد"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,"""دارای شماره سریال""  برای موارد غیر انباری نمی تواند ""بله"" باشد"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,وضعیت را انتخاب کنید
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,حضور و غیاب می تواند برای تاریخ های آینده باشد مشخص شده
 DocType: Pricing Rule,Pricing Rule Help,قانون قیمت گذاری راهنما
@@ -4625,40 +4715,40 @@
 DocType: Item,Customer Code,کد مشتری
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},یادآوری تاریخ تولد برای {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,روز پس از آخرین سفارش
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,بدهکاری به حساب کاربری باید یک حساب ترازنامه شود
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,بدهکاری به حساب کاربری باید یک حساب ترازنامه شود
 DocType: Buying Settings,Naming Series,نامگذاری سری
 DocType: Leave Block List,Leave Block List Name,ترک نام فهرست بلوک
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,تاریخ بیمه شروع باید کمتر از تاریخ پایان باشد بیمه
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,لطفا سیستم نامگذاری مربیان را در مدرسه تنظیم کنید&gt; تنظیمات مدرسه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,دارایی های سهام
 DocType: Timesheet,Production Detail,جزئیات تولید
+DocType: Restaurant,Active Menu,منوی فعال
 DocType: Target Detail,Target Qty,هدف تعداد
 DocType: Shopping Cart Settings,Checkout Settings,تنظیمات پرداخت
 DocType: Attendance,Present,حاضر
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,تحویل توجه داشته باشید {0} باید ارائه شود
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,تحویل توجه داشته باشید {0} باید ارائه شود
 DocType: Notification Control,Sales Invoice Message,فاکتور فروش پیام
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,با بستن حساب {0} باید از نوع مسئولیت / حقوق صاحبان سهام می باشد
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},لغزش حقوق و دستمزد کارکنان {0} در حال حاضر برای ورق زمان ایجاد {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},لغزش حقوق و دستمزد کارکنان {0} در حال حاضر برای ورق زمان ایجاد {1}
 DocType: Vehicle Log,Odometer,کیلومتر شمار
 DocType: Sales Order Item,Ordered Qty,دستور داد تعداد
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,مورد {0} غیر فعال است
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,مورد {0} غیر فعال است
 DocType: Stock Settings,Stock Frozen Upto,سهام منجمد تا حد
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM هیچ گونه سهام مورد را نمی
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,فعالیت پروژه / وظیفه.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM هیچ گونه سهام مورد را نمی
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,فعالیت پروژه / وظیفه.
 DocType: Vehicle Log,Refuelling Details,اطلاعات سوختگیری
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,تولید حقوق و دستمزد ورقه
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}",خرید باید بررسی شود، اگر قابل استفاده برای عنوان انتخاب شده {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,تخفیف باید کمتر از 100 باشد
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,آخرین نرخ خرید یافت نشد
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ارسال کردن مقدار (شرکت ارز)
 DocType: Sales Invoice Timesheet,Billing Hours,ساعت صدور صورت حساب
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,BOM به طور پیش فرض برای {0} یافت نشد
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,ردیف # {0}: لطفا مقدار سفارش مجدد مجموعه
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM به طور پیش فرض برای {0} یافت نشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,ردیف # {0}: لطفا مقدار سفارش مجدد مجموعه
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,ضربه بزنید اقلام به آنها اضافه کردن اینجا
 DocType: Fees,Program Enrollment,برنامه ثبت نام
 DocType: Landed Cost Voucher,Landed Cost Voucher,فرود کوپن هزینه
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},لطفا {0}
-DocType: Purchase Invoice,Repeat on Day of Month,تکرار در روز از ماه
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} دانشجوی غیر فعال است
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} دانشجوی غیر فعال است
 DocType: Employee,Health Details,جزییات بهداشت
 DocType: Offer Letter,Offer Letter Terms,ارائه شرایط نامه
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,برای ایجاد یک درخواست پاسخ به پرداخت سند مرجع مورد نیاز است
@@ -4666,7 +4756,6 @@
 DocType: Employee External Work History,Salary,حقوق
 DocType: Serial No,Delivery Document Type,تحویل نوع سند
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,ثبت کردن تمام برگه حقوق و دستمزد برای معیارهای فوق انتخاب شده
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} آیتم ها همگام شدند
 DocType: Sales Order,Partly Delivered,تا حدودی تحویل
 DocType: Email Digest,Receivables,مطالبات
 DocType: Lead Source,Lead Source,منبع سرب
@@ -4687,19 +4776,19 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,محدوده سالمندی 2
 DocType: SG Creation Tool Course,Max Strength,حداکثر قدرت
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM جایگزین
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,اقلام را براساس تاریخ تحویل انتخاب کنید
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,اقلام را براساس تاریخ تحویل انتخاب کنید
 ,Sales Analytics,تجزیه و تحلیل ترافیک فروش
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},در دسترس {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},در دسترس {0}
 ,Prospects Engaged But Not Converted,چشم انداز مشغول اما تبدیل نمی
 DocType: Manufacturing Settings,Manufacturing Settings,تنظیمات ساخت
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,راه اندازی ایمیل
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 موبایل بدون
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,لطفا ارز به طور پیش فرض در شرکت استاد وارد
 DocType: Stock Entry Detail,Stock Entry Detail,جزئیات سهام ورود
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,یادآوری روزانه
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,یادآوری روزانه
 DocType: Products Settings,Home Page is Products,صفحه اصلی وب سایت است محصولات
 ,Asset Depreciation Ledger,دارایی لجر استهلاک
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},درگیری قانون مالیاتی با {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},درگیری قانون مالیاتی با {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,نام حساب
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,هزینه مواد اولیه عرضه شده
 DocType: Selling Settings,Settings for Selling Module,تنظیمات برای فروش ماژول
@@ -4713,8 +4802,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,مورد {0} باید مورد سهام است
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,پیش فرض کار در انبار پیشرفت
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,تنظیمات پیش فرض برای انجام معاملات حسابداری.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا سیستم نامگذاری کارمندان را در منابع انسانی تنظیم کنید&gt; تنظیمات HR
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,تاریخ انتظار نمی رود می تواند قبل از درخواست عضویت مواد است
+DocType: Restaurant,Default Tax Template,قالب پیش فرض مالیات
 DocType: Fees,Student Details,جزئیات دانشجو
 DocType: Purchase Invoice Item,Stock Qty,موجودی تعداد
 DocType: Employee Loan,Repayment Period in Months,دوره بازپرداخت در ماه
@@ -4732,8 +4822,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,برو به موارد
 DocType: Sales Partner,Partner Type,نوع شریک
 DocType: Purchase Taxes and Charges,Actual,واقعی
+DocType: Restaurant Menu,Restaurant Manager,مدیر رستوران
 DocType: Authorization Rule,Customerwise Discount,Customerwise تخفیف
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,برنامه زمانی برای انجام وظایف.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,برنامه زمانی برای انجام وظایف.
 DocType: Purchase Invoice,Against Expense Account,علیه صورتحساب
 DocType: Production Order,Production Order,سفارش تولید
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,نصب و راه اندازی {0} توجه داشته باشید در حال حاضر ارائه شده است
@@ -4741,7 +4832,6 @@
 DocType: Quotation Item,Against Docname,علیه Docname
 DocType: SMS Center,All Employee (Active),همه کارکنان (فعال)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,مشاهده در حال حاضر
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,دوره انتخاب کنید که فاکتور خواهد شد به صورت خودکار تولید
 DocType: BOM,Raw Material Cost,هزینه مواد خام
 DocType: Item Reorder,Re-Order Level,ترتیب سطح
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,اقلام و تعداد برنامه ریزی شده که برای آن شما می خواهید به افزایش سفارشات تولید و یا دانلود کنید مواد خام برای تجزیه و تحلیل را وارد کنید.
@@ -4754,23 +4844,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,نوع گزارش الزامی است
 DocType: Item,Serial Number Series,شماره سریال سری
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},انبار سهام مورد {0} در ردیف الزامی است {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,اضافه کردن برنامه ها
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,خرده فروشی و عمده فروشی
 DocType: Issue,First Responded On,اول پاسخ در
 DocType: Website Item Group,Cross Listing of Item in multiple groups,صلیب فهرست مورد در گروه های متعدد
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},سال مالی تاریخ شروع و تاریخ پایان سال مالی در حال حاضر در سال مالی مجموعه {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,تاریخ ترخیص کالا از به روز رسانی
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,دسته تقسیم
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,دسته تقسیم
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,موفقیت آشتی
 DocType: Request for Quotation Supplier,Download PDF,دانلود PDF
 DocType: Production Order,Planned End Date,برنامه ریزی پایان تاریخ
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,لطفا تاریخ برنامه را وارد کنید
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,که در آن موارد ذخیره می شود.
 DocType: Request for Quotation,Supplier Detail,جزئیات کننده
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},اشکال در فرمول یا شرایط: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},اشکال در فرمول یا شرایط: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,مقدار صورتحساب
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,وزنهای معیار باید تا 100٪
 DocType: Attendance,Attendance,حضور
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,انبار قلم
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,انبار قلم
 DocType: BOM,Materials,مصالح
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",اگر بررسی نیست، لیست خواهد باید به هر بخش که در آن به کار گرفته شوند اضافه شده است.
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,مبدا و مقصد انبار نمی تواند همان
@@ -4788,6 +4878,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,در مجموع خالص
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},ارزش صفت {0} باید در طیف وسیعی از {1} به {2} در بازه {3} برای مورد {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,انبار هدف در ردیف {0} باید به همان ترتیب تولید می شود
+DocType: Restaurant Reservation,Waitlisted,منتظر
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,نرخ ارز می تواند پس از ساخت ورودی با استفاده از یک ارز دیگر، نمی توان تغییر داد
 DocType: Vehicle Service,Clutch Plate,صفحه کلاچ
 DocType: Company,Round Off Account,دور کردن حساب
@@ -4804,7 +4895,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,نام شخص جدید فروش
 DocType: Packing Slip,Gross Weight UOM,وزن UOM
 DocType: Delivery Note Item,Against Sales Invoice,در برابر فاکتور فروش
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,لطفا شماره سریال برای آیتم سریال وارد کنید
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,لطفا شماره سریال برای آیتم سریال وارد کنید
 DocType: Bin,Reserved Qty for Production,تعداد مادی و معنوی برای تولید
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,باقی بماند اگر شما نمی خواهید به در نظر گرفتن دسته ای در حالی که ساخت گروه های دوره بر اساس.
 DocType: Asset,Frequency of Depreciation (Months),فرکانس استهلاک (ماه)
@@ -4815,7 +4906,7 @@
 DocType: Lab Test,Test Group,تست گروه
 DocType: Payment Reconciliation,Receivable / Payable Account,حساب دریافتنی / پرداختنی
 DocType: Delivery Note Item,Against Sales Order Item,علیه سفارش فروش مورد
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},لطفا موجودیت مقدار برای صفت مشخص {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},لطفا موجودیت مقدار برای صفت مشخص {0}
 DocType: Item,Default Warehouse,به طور پیش فرض انبار
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},بودجه می تواند در برابر حساب گروه اختصاص {0}
 DocType: Healthcare Settings,Patient Registration,ثبت نام بیمار
@@ -4844,6 +4935,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,فروشنده
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,بودجه و هزینه مرکز
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,حالت پیش پرداخت چندگانه مجاز نیست
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,برای
 ,Appointment Analytics,انتصاب انتصاب
 DocType: Vehicle Service,Half Yearly,نیمی سالانه
 DocType: Lead,Blog Subscriber,وبلاگ مشترک
@@ -4861,7 +4953,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,تعداد Quot و
 ,BOM Stock Report,BOM گزارش سهام
 DocType: Stock Reconciliation Item,Quantity Difference,تفاوت تعداد
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,پردازش حقوق و دستمزد
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,پردازش حقوق و دستمزد
 DocType: Opportunity Item,Basic Rate,نرخ پایه
 DocType: GL Entry,Credit Amount,مقدار وام
 DocType: Cheque Print Template,Signatory Position,مکان امضاء
@@ -4875,12 +4967,12 @@
 DocType: Tax Rule,Tax Rule,قانون مالیات
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,حفظ همان نرخ در طول چرخه فروش
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,برنامه ریزی سیاهههای مربوط به زمان در خارج از ساعات کاری ایستگاه کاری.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,مشتریان در صف
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,دکتر {0} یک برنامه پزشک ندارد اضافه کردن آن را به استاد پزشک
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,مشتریان در صف
 DocType: Student,Nationality,ملیت
 ,Items To Be Requested,گزینه هایی که درخواست شده
-DocType: Purchase Order,Get Last Purchase Rate,دریافت آخرین خرید نرخ
 DocType: Company,Company Info,اطلاعات شرکت
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,انتخاب کنید و یا اضافه کردن مشتری جدید
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,انتخاب کنید و یا اضافه کردن مشتری جدید
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,مرکز هزینه مورد نیاز است به کتاب ادعای هزینه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),استفاده از وجوه (دارایی)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,این است که در حضور این کارمند بر اساس
@@ -4888,6 +4980,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,حساب بانکی
 DocType: Fiscal Year,Year Start Date,سال تاریخ شروع
 DocType: Attendance,Employee Name,نام کارمند
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,سفارش اقامت در رستوران
 DocType: Sales Invoice,Rounded Total (Company Currency),گرد مجموع (شرکت ارز)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,نمی توانید به گروه پنهانی به دلیل نوع کاربری انتخاب شده است.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} اصلاح شده است. لطفا بازخوانی کنید.
@@ -4898,6 +4991,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,مزایای کارکنان
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},مقدار بسته بندی شده، باید مقدار برای مورد {0} در ردیف برابر {1}
 DocType: Production Order,Manufactured Qty,تولید تعداد
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,فاکتور ایجاد شده
 DocType: Purchase Receipt Item,Accepted Quantity,تعداد پذیرفته شده
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},لطفا تنظیم پیش فرض لیست تعطیلات برای کارمند {0} یا شرکت {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} وجود ندارد
@@ -4907,18 +5001,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ردیف بدون {0}: مبلغ نمی تواند بیشتر از انتظار مقدار برابر هزینه ادعای {1}. در انتظار مقدار است {2}
 DocType: Maintenance Schedule,Schedule,برنامه
 DocType: Account,Parent Account,پدر و مادر حساب
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,در دسترس
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,در دسترس
 DocType: Quality Inspection Reading,Reading 3,خواندن 3
 ,Hub,قطب
 DocType: GL Entry,Voucher Type,کوپن نوع
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,لیست قیمت یافت نشد یا از کار افتاده
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,لیست قیمت یافت نشد یا از کار افتاده
 DocType: Lab Test,Approved,تایید
 DocType: Pricing Rule,Price,قیمت
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',کارمند رها در {0} باید تنظیم شود به عنوان چپ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',کارمند رها در {0} باید تنظیم شود به عنوان چپ
+DocType: Hub Settings,Last Sync On,آخرین همگام سازی در
 DocType: Guardian,Guardian,نگهبان
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ارزیابی {0} برای کارمند {1} در محدوده تاریخ ایجاد شود
 DocType: Employee,Education,آموزش و پرورش
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,دل
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,دل
 DocType: Selling Settings,Campaign Naming By,نامگذاری کمپین توسط
 DocType: Employee,Current Address Is,آدرس فعلی است
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,هدف فروش ماهانه (
@@ -4933,7 +5028,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,کد درس:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,لطفا هزینه حساب وارد کنید
 DocType: Account,Stock,موجودی
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",ردیف # {0}: مرجع نوع سند باید یکی از سفارش خرید، خرید فاکتور و یا ورود به مجله می شود
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",ردیف # {0}: مرجع نوع سند باید یکی از سفارش خرید، خرید فاکتور و یا ورود به مجله می شود
 DocType: Employee,Current Address,آدرس فعلی
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",اگر مورد یک نوع از آیتم دیگری پس از آن توضیحات، تصویر، قیمت گذاری، مالیات و غیره را از قالب مجموعه ای است مگر اینکه صریحا مشخص
 DocType: Serial No,Purchase / Manufacture Details,خرید / جزئیات ساخت
@@ -4964,7 +5059,7 @@
 DocType: Hub Settings,Hub Settings,تنظیمات توپی
 DocType: Project,Gross Margin %,حاشیه ناخالص٪
 DocType: BOM,With Operations,با عملیات
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,نوشته حسابداری در حال حاضر در ارز ساخته شده {0} برای شرکت {1}. لطفا یک حساب دریافتنی و یا قابل پرداخت با ارز را انتخاب کنید {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,نوشته حسابداری در حال حاضر در ارز ساخته شده {0} برای شرکت {1}. لطفا یک حساب دریافتنی و یا قابل پرداخت با ارز را انتخاب کنید {0}.
 DocType: Asset,Is Existing Asset,موجود است دارایی
 DocType: Salary Detail,Statistical Component,کامپوننت آماری
 DocType: Warranty Claim,If different than customer address,اگر متفاوت از آدرس مشتری
@@ -4972,13 +5067,14 @@
 DocType: BOM Operation,BOM Operation,عملیات BOM
 DocType: Purchase Taxes and Charges,On Previous Row Amount,در قبلی مقدار ردیف
 DocType: Student,Home Address,آدرس خانه
+DocType: Item,Has Expiry Date,تاریخ انقضا دارد
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,مورد تنظیمات Variant
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,دارایی انتقال
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,دارایی انتقال
 DocType: POS Profile,POS Profile,نمایش POS
 DocType: Training Event,Event Name,نام رخداد
 DocType: Physician,Phone (Office),تلفن (دفتر)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,پذیرش
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},پذیرش برای {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,پذیرش
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},پذیرش برای {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.",فصلی برای تنظیم بودجه، اهداف و غیره
 DocType: Supplier Scorecard Scoring Variable,Variable Name,نام متغیر
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",مورد {0} یک قالب است، لطفا یکی از انواع آن را انتخاب کنید
@@ -4987,7 +5083,7 @@
 DocType: Assessment Plan,Room,اتاق
 DocType: Purchase Order,Advance Paid,پیش پرداخت
 DocType: Item,Item Tax,مالیات مورد
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,مواد به کننده
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,مواد به کننده
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,فاکتور مالیات کالاهای داخلی
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}٪ بیش از یک بار به نظر می رسد
 DocType: Expense Claim,Employees Email Id,کارکنان پست الکترونیکی شناسه
@@ -4998,32 +5094,30 @@
 DocType: Program,Program Name,نام برنامه
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,مالیات و یا هزینه در نظر بگیرید برای
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,تعداد واقعی الزامی است
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} در حال حاضر یک کارت امتیازی ارائه کننده {1} دارد و سفارشات خرید به این فروشنده باید با احتیاط صادر شود.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} در حال حاضر یک کارت امتیازی ارائه کننده {1} دارد و سفارشات خرید به این فروشنده باید با احتیاط صادر شود.
 DocType: Employee Loan,Loan Type,نوع وام
 DocType: Scheduling Tool,Scheduling Tool,ابزار برنامه ریزی
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,کارت اعتباری
 DocType: BOM,Item to be manufactured or repacked,آیتم به تولید و یا repacked
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,تنظیمات پیش فرض برای انجام معاملات سهام.
-DocType: Purchase Invoice,Next Date,تاریخ بعدی
 DocType: Employee Education,Major/Optional Subjects,عمده / موضوع اختیاری
 DocType: Sales Invoice Item,Drop Ship,قطره کشتی
+DocType: Hub Settings,Suspended,تعطیل
 DocType: Training Event,Attendees,شرکت کنندگان
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",در اینجا شما می توانید جزئیات خانواده مانند نام و شغل پدر و مادر، همسر و فرزندان حفظ
 DocType: Academic Term,Term End Date,مدت پایان تاریخ
-DocType: Hub Settings,Seller Name,نام فروشنده
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),مالیات و هزینه کسر (شرکت ارز)
 DocType: Item Group,General Settings,تنظیمات عمومی
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,از پول و ارز را نمی توان همان
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,اضافه کردن مربیان
 DocType: Stock Entry,Repack,REPACK
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,شما باید فرم را قبل از ادامه  دادن ذخیره کنید
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,لطفا اول شرکت را انتخاب کنید
 DocType: Item Attribute,Numeric Values,مقادیر عددی
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,ضمیمه لوگو
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,سطح سهام
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,سطح سهام
 DocType: Customer,Commission Rate,کمیسیون نرخ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,{0} کارت امتیازی برای {1} ایجاد شده بین:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,متغیر را
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,متغیر را
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,برنامه بلوک مرخصی توسط بخش.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer",نوع پرداخت باید یکی از دریافت شود، پرداخت و انتقال داخلی
 apps/erpnext/erpnext/config/selling.py +179,Analytics,تجزیه و تحلیل ترافیک
@@ -5038,11 +5132,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,سرمایه سهام
 DocType: Shopping Cart Settings,Show Public Attachments,نمایش فایل های پیوست عمومی
 DocType: Packing Slip,Package Weight Details,بسته بندی جزییات وزن
+DocType: Restaurant Reservation,Reservation Time,زمان رزرو
 DocType: Payment Gateway Account,Payment Gateway Account,پرداخت حساب دروازه
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,پس از اتمام پرداخت هدایت کاربر به صفحه انتخاب شده است.
 DocType: Company,Existing Company,موجود شرکت
 DocType: Healthcare Settings,Result Emailed,نتیجه ایمیل
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",مالیات رده به &quot;مجموع&quot; تغییر یافته است چرا که تمام موارد اقلام غیر سهام هستند
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,کد مورد&gt; گروه مورد&gt; نام تجاری
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,لطفا یک فایل CSV را انتخاب کنید
 DocType: Student Leave Application,Mark as Present,علامت گذاری به عنوان در حال حاضر
 DocType: Supplier Scorecard,Indicator Color,رنگ نشانگر
@@ -5067,11 +5163,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,را دسته ای دانشجویی
 DocType: Fee Schedule,FRQ.,FRQ
 DocType: Leave Type,Is Carry Forward,آیا حمل به جلو
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,گرفتن اقلام از BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,گرفتن اقلام از BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,سرب زمان روز
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ردیف # {0}: ارسال تاریخ باید همان تاریخ خرید می باشد {1} دارایی {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,این بررسی در صورتی که دانشجو است ساکن در خوابگاه مؤسسه است.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,لطفا سفارشات فروش در جدول فوق را وارد کنید
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,لطفا سفارشات فروش در جدول فوق را وارد کنید
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,ارسال نمی حقوق ورقه
 ,Stock Summary,خلاصه سهام
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,انتقال یک دارایی از یک انبار به دیگری
@@ -5087,5 +5183,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ردیف {0}: بدهی ورود می تواند با پیوند داده نمی شود {1}
 DocType: Journal Entry,Subscription Section,بخش اشتراک
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,حساب {0} وجود ندارد
+DocType: Training Event,Training Program,برنامه آموزشی
 DocType: Account,Cash,نقد
 DocType: Employee,Short biography for website and other publications.,بیوگرافی کوتاه برای وب سایت ها و نشریات دیگر.
diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv
index 601a34f..9121152 100644
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Palkan tila
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Rekisteröidy
 DocType: Patient,Divorced,eronnut
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,tuotteet on jo synkronoitu
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Salli Kohta lisätään useita kertoja liiketoimi
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Peru materiaalikäynti {0} ennen takuuanomuksen perumista
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Kuluttajatuotteet
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Poissaolojen hyväksyjät
 DocType: Sales Partner,Dealer,jakaja
 DocType: Consultation,Investigations,tutkimukset
+DocType: Restaurant Order Entry,Click Enter To Add,Napsauta Enter to Add (Lisää)
 DocType: Employee,Rented,Vuokrattu
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Sovelletaan Käyttäjä
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Pysäytetty Tuotantotilaus ei voi peruuttaa, Unstop se ensin peruuttaa"
 DocType: Vehicle Service,Mileage,mittarilukema
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Haluatko todella romuttaa tämän omaisuuden?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Haluatko todella romuttaa tämän omaisuuden?
 DocType: Drug Prescription,Update Schedule,Päivitä aikataulu
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Valitse Oletus toimittaja
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},valuuttahinnasto vaaditaan {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Tarkista saatavuus
 DocType: Job Applicant,Job Applicant,Työnhakija
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Toimittajaan liittyvät tapahtumat.
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,ei enempää tuloksia
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Oikeudellinen
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},todellista veroa ei voi sisällyttää tuotteen tasoon rivillä {0}
 DocType: Bank Guarantee,Customer,Asiakas
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Valuuttakurssi on oltava sama kuin {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Asiakkaan nimi
 DocType: Vehicle,Natural Gas,Maakaasu
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Pankkitilin ei voida nimetty {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Pankkitilin ei voida nimetty {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Pään, (tai ryhmän), kohdistetut kirjanpidon kirjaukset tehdään ja tase säilytetään"
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),odottavat {0} ei voi olla alle nolla ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Yhtään vahvistettua palkkatositetta ei ole.
 DocType: Manufacturing Settings,Default 10 mins,oletus 10 min
 DocType: Leave Type,Leave Type Name,Vapaatyypin nimi
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Näytä auki
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,On välttämätöntä toteuttaa tämä toiminta itsestään edellä mainittujen toistuvasti
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Sarja päivitetty onnistuneesti
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Tarkista
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural Päiväkirjakirjaus Lähettäjä
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Toimittajilta saapumattomat ostotilaukset
 DocType: SMS Center,All Supplier Contact,kaikki toimittajan yhteystiedot
 DocType: Support Settings,Support Settings,Tukiasetukset
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,odotettu päättymispäivä ei voi olla pienempi kuin odotettu aloituspäivä
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,odotettu päättymispäivä ei voi olla pienempi kuin odotettu aloituspäivä
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,rivi # {0}: taso tulee olla sama kuin {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,uusi poistumissovellus
 ,Batch Item Expiry Status,Erä Item Käyt tila
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,pankki sekki
 DocType: Mode of Payment Account,Mode of Payment Account,maksutilin tila
 DocType: Consultation,Consultation,kuuleminen
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Myynti ja tuotot
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Näytä mallivaihtoehdot
 DocType: Academic Term,Academic Term,Academic Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiaali
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,terveydenhuolto
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Viivästyminen (päivää)
 DocType: Lab Prescription,Lab Prescription,Lab Prescription
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Lajittele Hinta
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,palvelu Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Sarjanumero: {0} on jo viitattu myyntilasku: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,lasku
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Sarjanumero: {0} on jo viitattu myyntilasku: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,lasku
 DocType: Maintenance Schedule Item,Periodicity,Jaksotus
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Verovuoden {0} vaaditaan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,puolustus
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Rivi # {0}:
 DocType: Timesheet,Total Costing Amount,Yhteensä Kustannuslaskenta Määrä
 DocType: Delivery Note,Vehicle No,Ajoneuvon nro
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Ole hyvä ja valitse hinnasto
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Ole hyvä ja valitse hinnasto
 DocType: Accounts Settings,Currency Exchange Settings,Valuutanvaihtoasetukset
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Rivi # {0}: Maksu asiakirja täytettävä trasaction
 DocType: Production Order Operation,Work In Progress,Työnalla
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Valitse päivämäärä
 DocType: Employee,Holiday List,lomaluettelo
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Aseta Instructor Naming System kouluun&gt; Koulun asetukset
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Kirjanpitäjä
+DocType: Hub Settings,Selling Price List,Myynnin hinnasto
 DocType: Patient,Tobacco Current Use,Tupakan nykyinen käyttö
 DocType: Cost Center,Stock User,Varaston peruskäyttäjä
 DocType: Company,Phone No,Puhelinnumero
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Kurssin aikataulut luotu:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Uusi {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Uusi {0}: # {1}
 ,Sales Partners Commission,myyntikumppanit provisio
 DocType: Purchase Invoice,Rounding Adjustment,Pyöristyksen säätö
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Lyhenne voi olla enintään 5 merkkiä
@@ -119,14 +122,13 @@
 DocType: Sales Invoice,Company Address,yritys osoite
 DocType: BOM,Operations,Toiminnot
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},oikeutusta ei voi asettaa alennuksen perusteella {0}
-DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Liitä .csv-tiedoston, jossa on kaksi saraketta, toinen vanha nimi ja yksi uusi nimi"
+DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Liitä .csv-tiedosto, jossa on vain kaksi saraketta: vanha ja uusi nimi"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ei missään aktiivista verovuonna.
 DocType: Packed Item,Parent Detail docname,Pääselostuksen docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Viite: {0}, kohta Koodi: {1} ja Asiakas: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kg
-DocType: Student Log,Log,Loki
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Avaaminen ja työn.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Tulos toimitettu
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Tulos toimitettu
 DocType: Item Attribute,Increment,Lisäys
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Aikajänne
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Valitse Varasto ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Naimisissa
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Ei saa {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Hae nimikkeet
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},varastoa ei voi päivittää lähetettä vastaan {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},varastoa ei voi päivittää lähetettä vastaan {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Tuotteen {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Ei luetellut
 DocType: Payment Reconciliation,Reconcile,Yhteensovitus
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Eläkerahastot
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Seuraava Poistot Date ei voi olla ennen Ostopäivä
 DocType: Consultation,Consultation Date,Kuulemispäivämäärä
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Tuoteluettelon ja löytämisen ERP: n käyttäjille
 DocType: SMS Center,All Sales Person,kaikki myyjät
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Kuukausijako ** auttaa kausiluonteisen liiketoiminnan budjetoinnissa ja tavoiteasetannassa.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Ei kohdetta löydetty
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Palkka rakenne Puuttuvat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Ei kohdetta löydetty
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Palkka rakenne Puuttuvat
 DocType: Lead,Person Name,Henkilö
 DocType: Sales Invoice Item,Sales Invoice Item,"Myyntilasku, tuote"
 DocType: Account,Credit,kredit
 DocType: POS Profile,Write Off Cost Center,Poiston kustannuspaikka
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",esimerkiksi &quot;Primary School&quot; tai &quot;University&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",esimerkiksi &quot;Primary School&quot; tai &quot;University&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Perusraportit
 DocType: Warehouse,Warehouse Detail,Varaston lisätiedot
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},asiakkaan  {0} luottoraja on ylittynyt: {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Term Päättymispäivä ei voi olla myöhemmin kuin vuosi Päättymispäivä Lukuvuoden johon termiä liittyy (Lukuvuosi {}). Korjaa päivämäärät ja yritä uudelleen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Is Fixed Asset&quot; ei voi olla valitsematta, koska Asset kirjaa olemassa vasten kohde"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Is Fixed Asset&quot; ei voi olla valitsematta, koska Asset kirjaa olemassa vasten kohde"
 DocType: Vehicle Service,Brake Oil,Brake Oil
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakasryhmä&gt; Alue
 DocType: Tax Rule,Tax Type,Verotyyppi
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,veron perusteena
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},sinulla ei ole lupaa lisätä tai päivittää kirjauksia ennen {0}
 DocType: BOM,Item Image (if not slideshow),tuotekuva (jos diaesitys ei käytössä)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Asiakkaan olemassa samalla nimellä
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tuntihinta / 60) * todellinen käytetty aika
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Rivi # {0}: Viiteasiakirjatyypin on oltava yksi kulukorvauksesta tai päiväkirjakirjauksesta
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Valitse BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Rivi # {0}: Viiteasiakirjatyypin on oltava yksi kulukorvauksesta tai päiväkirjakirjauksesta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Valitse BOM
 DocType: SMS Log,SMS Log,Tekstiviesti loki
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,toimitettujen tuotteiden kustannukset
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Loma {0} ei ajoitu aloitus- ja lopetuspäivän välille
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,työntekijän Loan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,aktiivisuus loki:
 DocType: Fee Schedule,Send Payment Request Email,Lähetä maksuehdotus sähköpostitse
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Nimikettä {0} ei löydy tai se on vanhentunut
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Nimikettä {0} ei löydy tai se on vanhentunut
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Kiinteistöt
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,tiliote
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Lääketeollisuuden tuotteet
@@ -210,17 +213,22 @@
 DocType: Employee,B-,B -
 DocType: Upload Attendance,Import Log,tuo loki
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Vedä materiaali Pyyntö tyypin Valmistus perustuu edellä mainitut kriteerit
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Kirjaamaton rekisteröinti.
 DocType: Training Result Employee,Grade,Arvosana
+DocType: Restaurant Table,No of Seats,Istumapaikkoja
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>",Voit lisätä dynaamisen aiheen käyttämällä jinja-tunnisteita <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>
 DocType: Sales Invoice Item,Delivered By Supplier,Toimitetaan Toimittaja
 DocType: SMS Center,All Contact,kaikki yhteystiedot
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Tuotantotilaus jo luotu kaikille kohteita BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Tuotantotilaus jo luotu kaikille kohteita BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,vuosipalkka
 DocType: Daily Work Summary,Daily Work Summary,Päivittäinen työ Yhteenveto
 DocType: Period Closing Voucher,Closing Fiscal Year,tilikauden sulkeminen
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} on jäädytetty
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Valitse Olemassa Company luoda tilikartan
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} on jäädytetty
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Valitse Olemassa Company luoda tilikartan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,varaston kulut
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Valitse Target Varasto
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Valitse Target Varasto
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Anna Preferred Sähköpostiosoite
 DocType: Program Enrollment,School Bus,Koulubussi
 DocType: Journal Entry,Contra Entry,vastakirjaus
@@ -235,11 +243,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +149,At least one mode of payment is required for POS invoice.,Ainakin yksi maksutavan vaaditaan POS laskun.
 DocType: Products Settings,Show Products as a List,Näytä tuotteet listana
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
-All dates and employee combination in the selected period will come in the template, with existing attendance records","lataa mallipohja, täytä tarvittavat tiedot ja liitä muokattu tiedosto, kaikki päivämäärä- ja työntekijäyhdistelmät tulee malliin valitun kauden ja olemassaolevien osallistumistietueiden mukaan"
+All dates and employee combination in the selected period will come in the template, with existing attendance records","Lataa mallipohja ja täytä tarvittavat tiedot, sekä liitä muokattu tiedosto. Kaikki päivämäärä- ja työntekijäyhdistelmät tulee malliin valitun kauden ja olemassaolevien osallistumistietueiden mukaan"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Nimike {0} ei ole aktiivinen tai sen elinkaari päättynyt
+DocType: Student Admission Program,Minimum Age,Minimi ikä
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Esimerkki: Basic Mathematics
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Sisällytä verorivi {0} tuotteen tasoon, verot riveillä {1} tulee myös sisällyttää"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Henkilöstömoduulin asetukset
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Henkilöstömoduulin asetukset
 DocType: SMS Center,SMS Center,Tekstiviesti keskus
 DocType: Sales Invoice,Change Amount,muutos Määrä
 DocType: BOM Update Tool,New BOM,Uusi osaluettelo
@@ -249,7 +258,7 @@
 DocType: Lead,Request Type,pyydä tyyppi
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Tee työntekijä
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,julkaisu
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Lisää huoneita
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),POS (online / offline) asetustila
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,suoritus
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,toteutetuneiden toimien lisätiedot
 DocType: Serial No,Maintenance Status,"huolto, tila"
@@ -272,6 +281,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Hinnastoa tulee soveltaa ostamiseen tai myymiseen
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},asennuspäivä ei voi olla ennen tuotteen toimitusaikaa {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),hinnaston alennus taso (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Biokemia
 DocType: Offer Letter,Select Terms and Conditions,Valitse ehdot ja säännöt
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,out Arvo
 DocType: Production Planning Tool,Sales Orders,Myyntitilaukset
@@ -291,7 +301,7 @@
 DocType: Selling Settings,Default Territory,oletus alue
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televisio
 DocType: Production Order Operation,Updated via 'Time Log',Päivitetty 'aikaloki' kautta
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +427,Advance amount cannot be greater than {0} {1},Advance määrä ei voi olla suurempi kuin {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +427,Advance amount cannot be greater than {0} {1},Ennakon määrä ei voi olla suurempi kuin {0} {1}
 DocType: Naming Series,Series List for this Transaction,Sarjalistaus tähän tapahtumaan
 DocType: Company,Enable Perpetual Inventory,Ota investointikertymämenetelmän
 DocType: Company,Default Payroll Payable Account,Oletus Payroll Maksettava Account
@@ -306,15 +316,15 @@
 DocType: Sales Partner,Reseller,Jälleenmyyjä
 DocType: Codification Table,Medical Code,Medical Code
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Jos tämä on valittu, Will sisältävät ei-varastossa tuotetta Material pyynnöt."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Anna Company
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Anna Company
 DocType: Delivery Note Item,Against Sales Invoice Item,Myyntilaskun kohdistus / nimike
 ,Production Orders in Progress,Tuotannon tilaukset on käsittelyssä
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Rahoituksen nettokassavirta
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStoragen on täynnä, ei tallentanut"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStoragen on täynnä, ei tallentanut"
 DocType: Lead,Address & Contact,osoitteet ja yhteystiedot
 DocType: Leave Allocation,Add unused leaves from previous allocations,Lisää käyttämättömät lähtee edellisestä määrärahoista
 DocType: Sales Partner,Partner website,Kumppanin verkkosivusto
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Lisää tavara
+DocType: Restaurant Order Entry,Add Item,Lisää tavara
 DocType: Lab Test,Custom Result,Mukautettu tulos
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,"yhteystiedot, nimi"
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kurssin arviointiperusteet
@@ -327,7 +337,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Pyydä ostaa.
 DocType: Lab Test,Submitted Date,Lähetetty päivämäärä
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Tämä perustuu projektin tuntilistoihin
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Nettopalkka ei voi olla pienempi kuin 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Nettopalkka ei voi olla pienempi kuin 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Jos haluat lopettaa toistuvien virheilmoitusten lähettämisen järjestelmästä, olemme valinneet tilauksen Ei käytössä -kentän"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Vain valtuutettu hyväksyjä voi vahvistaa tämän poissaolon.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Työsuhteen päättymisäpäivän on oltava aloituspäivän jälkeen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Vapaat vuodessa
@@ -336,9 +347,10 @@
 DocType: Email Digest,Profit & Loss,Voitonmenetys
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,litra
 DocType: Task,Total Costing Amount (via Time Sheet),Yhteensä Costing Määrä (via Time Sheet)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Aseta opiskelijat opiskelijaryhmissä
 DocType: Item Website Specification,Item Website Specification,Kohteen verkkosivustoasetukset
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,vapaa kielletty
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Nimikeen {0} elinkaari on päättynyt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Nimikeen {0} elinkaari on päättynyt {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Bank merkinnät
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Vuotuinen
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Varaston täsmäytys nimike
@@ -347,7 +359,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Creation Tool Course
 DocType: Lead,Do Not Contact,älä ota yhteyttä
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,"Ihmiset, jotka opettavat organisaatiossa"
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Toistuvien laskujen yksilöivä tunnus muodostetaan vahvistuksen yhteydessä.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Ohjelmistokehittäjä
 DocType: Item,Minimum Order Qty,minimi tilaus yksikkömäärä
 DocType: Pricing Rule,Supplier Type,Toimittajan tyyppi
@@ -357,17 +368,19 @@
 DocType: Item,Publish in Hub,Julkaista Hub
 DocType: Student Admission,Student Admission,Opiskelijavalinta
 ,Terretory,Alue
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Nimike {0} on peruutettu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Hankintapyyntö
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Nimike {0} on peruutettu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Hankintapyyntö
 DocType: Bank Reconciliation,Update Clearance Date,Päivitä tilityspäivä
 DocType: Item,Purchase Details,Oston lisätiedot
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Nimikettä {0} ei löydy ostotilauksen {1} toimitettujen raaka-aineiden taulusta
 DocType: Patient Relation,Relation,Suhde
 DocType: Shipping Rule,Worldwide Shipping,Maailmanlaajuinen
 DocType: Patient Relation,Mother,Äiti
+DocType: Restaurant Reservation,Reservation End Time,Varauksen loppumisaika
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,asiakkailta vahvistetut tilaukset
 DocType: Purchase Receipt Item,Rejected Quantity,Hylätty Määrä
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Maksupyyntö {0} luotiin
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Maksupyyntö {0} luotiin
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Herkkä herkkyys
 DocType: Notification Control,Notification Control,Ilmoittaminen Ohjaus
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,"Vahvista, kun olet suorittanut harjoittelusi"
 DocType: Lead,Suggestions,ehdotuksia
@@ -387,7 +400,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Sähköpostit palkkakuitin työntekijöiden perustuu ensisijainen sähköposti valittu Työntekijän
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Luettelon ensimmäinen hyväksyjä asetetaan oletukseksi.
 DocType: Tax Rule,Shipping County,Toimitus lääni
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Käyttö-opastus
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Käyttö-opastus
 DocType: Asset,Next Depreciation Date,Seuraava poistopäivämäärä
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktiviteetti kustannukset työntekijää kohti
 DocType: Accounts Settings,Settings for Accounts,Tilien asetukset
@@ -398,13 +411,13 @@
 DocType: Item,Synced With Hub,synkronoi Hub:lla
 DocType: Vehicle,Fleet Manager,Välineiden ylläpitäjä
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Rivi # {0}: {1} ei voi olla negatiivinen erä {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Väärä salasana
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Väärä salasana
 DocType: Item,Variant Of,Muunnelma kohteesta
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"valmiit yksikkömäärä ei voi olla suurempi kuin ""tuotannon määrä"""
 DocType: Period Closing Voucher,Closing Account Head,tilin otsikon sulkeminen
 DocType: Employee,External Work History,ulkoinen työhistoria
 DocType: Physician,Time per Appointment,Ajanotto nimityksestä
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,kiertoviite vihke
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,kiertoviite vihke
 DocType: Appointment Type,Is Inpatient,On sairaala
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 Name
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"sanat näkyvät, (vienti) kun tallennat lähetteen"
@@ -413,19 +426,18 @@
 DocType: Lead,Industry,teollisuus
 DocType: Employee,Job Profile,Job Profile
 DocType: BOM Item,Rate & Amount,Hinta &amp; määrä
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Aseta numerointi sarja osallistumiselle Setup&gt; Numerosarjan kautta
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Tämä perustuu liiketoimiin tätä yhtiötä vastaan. Katso yksityiskohtaisia tietoja aikajanasta
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Ilmoita automaattisen hankintapyynnön luomisesta sähköpostitse
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,kestävä
 DocType: Journal Entry,Multi Currency,Multi Valuutta
 DocType: Payment Reconciliation Invoice,Invoice Type,lasku tyyppi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakasryhmä&gt; Alue
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,lähete
 DocType: Consultation,Encounter Impression,Encounter Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Verojen perusmääritykset
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Kustannukset Myyty Asset
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,"Maksukirjausta on muutettu siirron jälkeen, siirrä se uudelleen"
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} vero on kirjattu kahdesti
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Yhteenveto tällä viikolla ja keskeneräisten toimien
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} vero on kirjattu kahdesti
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Yhteenveto tällä viikolla ja keskeneräisten toimien
 DocType: Student Applicant,Admitted,Hyväksytty
 DocType: Workstation,Rent Cost,vuokrakustannukset
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Määrä jälkeen Poistot
@@ -439,36 +451,35 @@
 DocType: Shipping Rule,Valid for Countries,Voimassa maissa
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Tämä tuote on mallipohja, eikä sitä voi käyttää tapahtumissa, tuotteen tuntomerkit kopioidaan ellei 'älä kopioi' ole aktivoitu"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,pidetään kokonaistilauksena
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","työntekijän nimitys (myyjä, varastomies jne)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","työntekijän nimitys (myyjä, varastomies jne)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"taso, jolla asiakkaan valuutta muunnetaan asiakkaan käyttämäksi perusvaluutaksi"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Tietenkin ajoitustyökalun
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rivi # {0}: Ostolaskujen ei voi tehdä vastaan olemassaolevan hyödykkeen {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Kiireellinen] Virhe luodessasi toistuvaa% s: ta% s: lle
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Kiireellinen] Virhe luodessasi toistuvaa% s: ta% s: lle
 DocType: Item Tax,Tax Rate,Veroaste
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} on jo myönnetty Työsuhde {1} kauden {2} ja {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Valitse tuote
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Valitse tuote
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Ostolasku {0} on jo vahvistettu
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Rivi # {0}: Erä on oltava sama kuin {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,muunna pois ryhmästä
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Nimikkeen eräkoodi
 DocType: C-Form Invoice Detail,Invoice Date,Laskun päiväys
 DocType: GL Entry,Debit Amount,Debit Määrä
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Kohdassa {0} {1} voi olla vain yksi tili per yritys
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Katso liitetiedosto
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Kohdassa {0} {1} voi olla vain yksi tili per yritys
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Katso liitetiedosto
 DocType: Purchase Order,% Received,% Saapunut
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Luo Student Groups
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Määritys on valmis
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Määritys on valmis
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Hyvityslaskun summa
 DocType: Setup Progress Action,Action Document,Toiminta-asiakirja
 ,Finished Goods,Valmiit tavarat
 DocType: Delivery Note,Instructions,ohjeet
 DocType: Quality Inspection,Inspected By,tarkastanut
 DocType: Maintenance Visit,Maintenance Type,"huolto, tyyppi"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} ei ilmoittautunut Course {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Group&gt; Tuotemerkki
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} ei ilmoittautunut Course {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Sarjanumero {0} ei kuulu lähetteeseen {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Lisää nimikkeitä
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Lisää nimikkeitä
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,tuotteen laatutarkistus parametrit
 DocType: Leave Application,Leave Approver Name,Poissaolon hyväksyjän nimi
 DocType: Depreciation Schedule,Schedule Date,"Aikataulu, päivä"
@@ -488,7 +499,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Työaika
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,muuta aloitusta / nykyselle järjestysnumerolle tai olemassa oleville sarjoille
 DocType: Dosage Strength,Strength,Vahvuus
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Luo uusi asiakas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Luo uusi asiakas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",mikäli useampi hinnoittelu sääntö jatkaa vaikuttamista käyttäjäjiä pyydetään asettamaan prioriteetti manuaalisesti ristiriidan ratkaisemiseksi
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Luo ostotilaukset
 ,Purchase Register,Osto Rekisteröidy
@@ -507,7 +518,7 @@
 DocType: Lab Test Template,Single,Yksittäinen
 DocType: Salary Slip,Total Loan Repayment,Yhteensä Lainan takaisinmaksu
 DocType: Account,Cost of Goods Sold,myydyn tavaran kustannuskset
-DocType: Purchase Invoice,Yearly,Vuosi
+DocType: Subscription,Yearly,Vuosi
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Syötä kustannuspaikka
 DocType: Drug Prescription,Dosage,annostus
 DocType: Journal Entry Account,Sales Order,Myyntitilaus
@@ -537,7 +548,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,yleiset asetukset valmistusprosesseille
 DocType: Accounts Settings,Accounts Frozen Upto,tilit jäädytetty toistaiseksi / asti
 DocType: SMS Log,Sent On,lähetetty
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Taito {0} valittu useita kertoja määritteet taulukossa
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Taito {0} valittu useita kertoja määritteet taulukossa
 DocType: HR Settings,Employee record is created using selected field. ,työntekijä tietue luodaan käyttämällä valittua kenttää
 DocType: Sales Order,Not Applicable,ei sovellettu
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,lomien valvonta
@@ -562,13 +573,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Hyväksyttävien vapaiden kokonaismäärä on pakollinen
 DocType: Patient,AB Positive,AB Positiivinen
 DocType: Job Opening,Description of a Job Opening,Työpaikan kuvaus
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Vireillä toimintaa tänään
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Vireillä toimintaa tänään
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,osallistumis tietue
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Palkanosasta tuntilomakkeen perustuu palkkalistoilla.
 DocType: Sales Order Item,Used for Production Plan,Käytetään tuotannon suunnittelussa
 DocType: Employee Loan,Total Payment,Koko maksu
 DocType: Manufacturing Settings,Time Between Operations (in mins),Toimintojen välinen aika (minuuteissa)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,"{0} {1} on peruutettu, joten toimintoa ei voida suorittaa"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,"{0} {1} on peruutettu, joten toimintoa ei voida suorittaa"
 DocType: Customer,Buyer of Goods and Services.,Tavaroiden ja palvelujen ostaja
 DocType: Journal Entry,Accounts Payable,maksettava tilit
 DocType: Patient,Allergies,allergiat
@@ -580,22 +591,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Varoittaa ostotilauksia
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Luettele muutamia asiakkaitasi. Asiakkaat voivat olla organisaatioita tai yksilöitä.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Tarpeeksi osat rakentaa
+DocType: POS Profile User,POS Profile User,POS-profiilin käyttäjä
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,suorat tulot
 DocType: Patient Appointment,Date TIme,Treffiaika
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",ei voi suodattaa tileittäin mkäli ryhmitelty tileittäin
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,hallintovirkailija
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Valitse kurssi
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Valitse kurssi
 DocType: Codification Table,Codification Table,Kodifiointitaulukko
 DocType: Timesheet Detail,Hrs,hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Ole hyvä ja valitse Company
 DocType: Stock Entry Detail,Difference Account,Erotuksen tili
 DocType: Purchase Invoice,Supplier GSTIN,Toimittaja GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"ei voi sulkea sillä se on toisesta riippuvainen tehtävä {0}, tehtävää ei ole suljettu"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,Syötä varasto jonne hankintapyyntö ohjataan
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"ei voi sulkea sillä se on toisesta riippuvainen tehtävä {0}, tehtävää ei ole suljettu"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Syötä varasto jonne hankintapyyntö ohjataan
 DocType: Production Order,Additional Operating Cost,lisätoimintokustannukset
 DocType: Lab Test Template,Lab Routine,Lab Routine
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,kosmetiikka
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items",Seuraavat ominaisuudet tulee olla samat molemmilla tuotteilla jotta ne voi sulauttaa
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items",Seuraavat ominaisuudet tulee olla samat molemmilla tuotteilla jotta ne voi sulauttaa
 DocType: Shipping Rule,Net Weight,Nettopaino
 DocType: Employee,Emergency Phone,hätänumero
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Ostaa
@@ -605,7 +617,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Tarkentakaa arvosana Threshold 0%
 DocType: Sales Order,To Deliver,Toimitukseen
 DocType: Purchase Invoice Item,Item,Nimike
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Sarjanumero tuote ei voi olla jae
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Suuri herkkyys
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Sarjanumero tuote ei voi olla jae
 DocType: Journal Entry,Difference (Dr - Cr),erotus (€ - TV)
 DocType: Account,Profit and Loss,Tuloslaskelma
 DocType: Patient,Risk Factors,Riskitekijät
@@ -614,7 +627,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Alihankintojen hallinta
 DocType: Vital Signs,Body Temperature,Ruumiinlämpö
 DocType: Project,Project will be accessible on the website to these users,Projekti on näiden käyttäjien nähtävissä www-sivustolla
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Määritä Hankkeen tyyppi.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Määritä Hankkeen tyyppi.
 DocType: Supplier Scorecard,Weighting Function,Painoarvon funktio
 DocType: Physician,OP Consulting Charge,OP-konsultointipalkkio
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Aseta oma
@@ -628,7 +641,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Lisäys voi olla 0
 DocType: Production Planning Tool,Material Requirement,Materiaalitarve
 DocType: Company,Delete Company Transactions,poista yrityksen tapahtumia
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Viitenumero ja viitepäivämäärä on pakollinen Pankin myynnin
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Viitenumero ja viitepäivämäärä on pakollinen Pankin myynnin
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Lisää / muokkaa veroja ja maksuja
 DocType: Payment Entry Reference,Supplier Invoice No,toimittajan laskun nro
 DocType: Territory,For reference,viitteeseen
@@ -636,12 +649,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Sarjanumeroa {0} ei voida poistaa, koska sitä on käytetty varastotapahtumissa"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),sulku (cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Hei
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Move Kohde
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Move Kohde
 DocType: Serial No,Warranty Period (Days),Takuuaika (päivää)
 DocType: Installation Note Item,Installation Note Item,asennus huomautus tuote
 DocType: Production Plan Item,Pending Qty,Odottaa Kpl
 DocType: Budget,Ignore,ohita
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} ei ole aktiivinen
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} ei ole aktiivinen
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Setup tarkistaa mitat tulostettavaksi
 DocType: Salary Slip,Salary Slip Timesheet,Tuntilomake
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Toimittajan varasto on pakollinen alihankintasaapumisessa
@@ -650,7 +663,7 @@
 DocType: Pricing Rule,Sales Partner,Myyntikumppani
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Kaikki toimittajan tuloskortit.
 DocType: Buying Settings,Purchase Receipt Required,Saapumistosite vaaditaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Arvostustaso on pakollinen, jos avausvarasto on merkitty"
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,"Arvostustaso on pakollinen, jos avausvarasto on merkitty"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Tietueita ei löytynyt laskutaulukosta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Valitse ensin yritys ja osapuoli tyyppi
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Tili- / Kirjanpitokausi
@@ -672,7 +685,7 @@
 DocType: Expense Claim,Payable Account,Maksettava tili
 DocType: Payment Entry,Type of Payment,Tyyppi Payment
 DocType: Sales Order,Billing and Delivery Status,Laskutus ja Toiminnan tila
-DocType: Job Applicant,Resume Attachment,Resume'n liite
+DocType: Job Applicant,Resume Attachment,Palauta liite
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Toistuvat asiakkaat
 DocType: Leave Control Panel,Allocate,Jakaa
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +804,Sales Return,Myynti Return
@@ -687,7 +700,7 @@
 DocType: Quotation,Quotation To,Tarjouksen kohde
 DocType: Lead,Middle Income,keskitason tulo
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Nimikkeen {0} oletusyksikköä ei voida muuttaa koska nykyisellä yksiköllä on tehty tapahtumia. Luo uusi nimike käyttääksesi uutta oletusyksikköä.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Nimikkeen {0} oletusyksikköä ei voida muuttaa koska nykyisellä yksiköllä on tehty tapahtumia. Luo uusi nimike käyttääksesi uutta oletusyksikköä.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,kohdennettu määrä ei voi olla negatiivinen
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Aseta Yhtiö
 DocType: Purchase Order Item,Billed Amt,"Laskutettu, pankkipääte"
@@ -701,6 +714,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Valitse Maksutili tehdä Bank Entry
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Luo Työntekijä kirjaa hallita lehtiä, korvaushakemukset ja palkkahallinnon"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Määräaika
+DocType: Restaurant Reservation,Restaurant Reservation,Ravintolavaraus
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Ehdotus Kirjoittaminen
 DocType: Payment Entry Deduction,Payment Entry Deduction,Payment Entry Vähennys
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Toinen myyjä {0} on jo olemassa samalla tunnuksella
@@ -708,7 +722,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Masters
 DocType: Assessment Plan,Maximum Assessment Score,Suurin Assessment Score
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Päivitä tilitapahtumien päivämäärät
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Ajanseuranta
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Ajanseuranta
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,DUPLICATE Eläinkuljettajan
 DocType: Fiscal Year Company,Fiscal Year Company,Yrityksen tilikausi
 DocType: Packing Slip Item,DN Detail,DN lisätiedot
@@ -716,8 +730,9 @@
 DocType: Timesheet,Billed,Laskutetaan
 DocType: Batch,Batch Description,Erän kuvaus
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Luominen opiskelijaryhmät
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Payment Gateway Tili ei ole luotu, luo yksi käsin."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Payment Gateway Tili ei ole luotu, luo yksi käsin."
 DocType: Supplier Scorecard,Per Year,Vuodessa
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Ei saa osallistua tähän ohjelmaan kuin DOB
 DocType: Sales Invoice,Sales Taxes and Charges,Myynnin verot ja maksut
 DocType: Employee,Organization Profile,Organisaatio Profile
 DocType: Vital Signs,Height (In Meter),Korkeus (mittarissa)
@@ -753,7 +768,7 @@
 DocType: Student Batch Name,Batch Name,erä Name
 DocType: Fee Validity,Max number of visit,Vierailun enimmäismäärä
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Tuntilomake luotu:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Valitse oletusmaksutapa kassa- tai pankkitili maksulle {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Valitse oletusmaksutapa kassa- tai pankkitili maksulle {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,kirjoittautua
 DocType: GST Settings,GST Settings,GST Asetukset
 DocType: Selling Settings,Customer Naming By,asiakkaan nimennyt
@@ -785,15 +800,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Kohdistuneet kustannukset verot ja maksut
 DocType: Production Order Operation,Actual Start Time,todellinen aloitusaika
 DocType: BOM Operation,Operation Time,Operation Time
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Suorittaa loppuun
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Suorittaa loppuun
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,pohja
 DocType: Timesheet,Total Billed Hours,Yhteensä laskutusasteesta
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Poiston arvo
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Poiston arvo
 DocType: Leave Block List Allow,Allow User,Salli Käyttäjä
 DocType: Journal Entry,Bill No,Bill No
 DocType: Company,Gain/Loss Account on Asset Disposal,Omaisuuden hävittämisen voitto/tappiotili
 DocType: Vehicle Log,Service Details,palvelu Lisätiedot
-DocType: Purchase Invoice,Quarterly,3 kk
+DocType: Subscription,Quarterly,3 kk
 DocType: Lab Test Template,Grouped,ryhmitelty
 DocType: Selling Settings,Delivery Note Required,lähete vaaditaan
 DocType: Bank Guarantee,Bank Guarantee Number,Pankkitakauksen Numero
@@ -802,12 +817,12 @@
 DocType: Student Attendance,Student Attendance,Student Läsnäolo
 DocType: Sales Invoice Timesheet,Time Sheet,Tuntilista
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Raaka-aineet Perustuvat
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Syötä tuotten lisätiedot
 DocType: Interest,Interest,Kiinnostaa
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,pre Sales
 DocType: Purchase Receipt,Other Details,muut lisätiedot
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Lab Test,Test Template,Testimalli
+DocType: Restaurant Order Entry Item,Served,palveli
 DocType: Account,Accounts,Talous
 DocType: Vehicle,Odometer Value (Last),Matkamittarin lukema (Last)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Toimittajan tuloskortin kriteereiden mallit.
@@ -819,25 +834,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Preview Palkka Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Tili {0} on syötetty useita kertoja
 DocType: Account,Expenses Included In Valuation,Arvoon sisältyvät kustannukset
-DocType: Hub Settings,Seller City,Myyjä kaupunki
 ,Absent Student Report,Absent Student Report
 DocType: Email Digest,Next email will be sent on:,Seuraava sähköpostiviesti lähetetään:
 DocType: Offer Letter Term,Offer Letter Term,Työtarjouksen ehto
 DocType: Supplier Scorecard,Per Week,Viikossa
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,tuotteella on useampia malleja
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,tuotteella on useampia malleja
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Yhteensä opiskelija
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Nimikettä {0} ei löydy
 DocType: Bin,Stock Value,varastoarvo
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,Taustalla luodaan palkkiotiedot. Virheessä virheilmoitus päivitetään aikataulussa.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Yritys {0} ei ole olemassa
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},"{0} on maksullinen voimassa, kunnes {1}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},"{0} on maksullinen voimassa, kunnes {1}"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,tyyppipuu
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Käytetty yksikkömäärä / yksikkö
 DocType: Serial No,Warranty Expiry Date,Takuun umpeutumispäivä
 DocType: Material Request Item,Quantity and Warehouse,Määrä ja Warehouse
+DocType: Hub Settings,Unregister,Poista rekisteröinti
 DocType: Sales Invoice,Commission Rate (%),provisio (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Valitse ohjelma
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Valitse ohjelma
 DocType: Project,Estimated Cost,Kustannusarvio
 DocType: Purchase Order,Link to material requests,Kohdista hankintapyyntöön
+DocType: Hub Settings,Publish,Julkaista
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,ilmakehä
 DocType: Journal Entry,Credit Card Entry,luottokorttikirjaus
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Yritys ja tilit
@@ -848,13 +865,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Close tilaisuuden päivää
 ,Reserved,Varattu
 DocType: Purchase Order,Supply Raw Materials,toimita raaka-aineita
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Laskun luontipäivä muodostuu vahvistuksen yhteydessä.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,lyhytaikaiset vastaavat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} ei ole varastonimike
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',Jaa palautetta koulutukseen klikkaamalla &quot;Harjoittelupalaute&quot; ja sitten &quot;Uusi&quot;
 DocType: Mode of Payment Account,Default Account,oletustili
 DocType: Payment Entry,Received Amount (Company Currency),Vastaanotetut Summa (Company valuutta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,"Liidi on pakollinen tieto, jos myyntimahdollisuus on muodostettu liidistä"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,"Liidi on pakollinen tieto, jos myyntimahdollisuus on muodostettu liidistä"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Ole hyvä ja valitse viikoittain off päivä
 DocType: Patient,O Negative,O Negatiivinen
 DocType: Production Order Operation,Planned End Time,Suunniteltu päättymisaika
@@ -870,10 +886,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,energia
 DocType: Opportunity,Opportunity From,tilaisuuteen
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,kuukausipalkka tosite
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Lisää yritys
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rivi {0}: {1} Sarjanumerot kohdasta {2}. Olet antanut {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rivi {0}: {1} Sarjanumerot kohdasta {2}. Olet antanut {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Valitse taulukko
 DocType: BOM,Website Specifications,Verkkosivuston tiedot
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} on virheellinen sähköpostiosoite &#39;Vastaanottajat&#39;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} on virheellinen sähköpostiosoite &#39;Vastaanottajat&#39;
 DocType: Special Test Items,Particulars,tarkemmat tiedot
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiootti.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: valitse {0} tyypistä {1}
@@ -881,11 +897,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Rivi {0}: Conversion Factor on pakollista
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Useita Hinta Säännöt ovat olemassa samoja kriteereitä, ota ratkaista konflikti antamalla prioriteetti. Hinta Säännöt: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,BOM:ia ei voi poistaa tai peruuttaa sillä muita BOM:ja on linkitettynä siihen
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,BOM:ia ei voi poistaa tai peruuttaa sillä muita BOM:ja on linkitettynä siihen
 DocType: Opportunity,Maintenance,huolto
 DocType: Item Attribute Value,Item Attribute Value,"tuotetuntomerkki, arvo"
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Myynnin kampanjat
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Luo tuntilomake
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Luo tuntilomake
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -923,12 +939,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Anna Kohta ensin
 DocType: Account,Liability,vastattavat
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Hyväksyttävän määrä ei voi olla suurempi kuin korvauksen määrä rivillä {0}.
+DocType: Salary Detail,Do not include in total,Älä sisällytä kokonaan
 DocType: Company,Default Cost of Goods Sold Account,oletus myytyjen tuotteiden arvo tili
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Hinnasto ei valittu
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Hinnasto ei valittu
 DocType: Employee,Family Background,Perhetausta
 DocType: Request for Quotation Supplier,Send Email,Lähetä sähköposti
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Varoitus: Virheellinen liite {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Ei oikeuksia
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Varoitus: Virheellinen liite {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Ei oikeuksia
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Pyydetty pyyntö
 DocType: Vital Signs,Heart Rate / Pulse,Syke / pulssi
 DocType: Company,Default Bank Account,oletus pankkitili
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",Valitse osapuoli tyyppi saadaksesi osapuolen mukaisen suodatuksen
@@ -955,12 +973,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Kohta Rivi {idx}: {DOCTYPE} {DOCNAME} ei ole olemassa edellä {DOCTYPE} table
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Tuntilomake {0} on jo täytetty tai peruttu
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ei tehtäviä
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Kuukauden päivä jolloin automaattinen lasku muodostetaan, esim 05, 28 jne"
 DocType: Item Variant Settings,Copy Fields to Variant,Kopioi kentät versioksi
 DocType: Asset,Opening Accumulated Depreciation,Avaaminen Kertyneet poistot
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Pisteet on oltava pienempi tai yhtä suuri kuin 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Ohjelma Ilmoittautuminen Tool
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C-muoto tietue
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C-muoto tietue
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Asiakas ja toimittaja
 DocType: Email Digest,Email Digest Settings,sähköpostitiedotteen asetukset
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Kiitos liiketoimintaa!
@@ -978,13 +995,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Lainaus Status
 DocType: Maintenance Visit,Completion Status,katselmus tila
 DocType: HR Settings,Enter retirement age in years,Anna eläkeikä vuosina
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Varastoon
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Valitse varasto
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Varastoon
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Valitse varasto
 DocType: Cheque Print Template,Starting location from left edge,Alkaen sijainti vasemmasta reunasta
 DocType: Item,Allow over delivery or receipt upto this percent,Salli yli toimitus- tai kuitti lähetettävään tähän prosenttia
 DocType: Stock Entry,STE-,Stefan
 DocType: Upload Attendance,Import Attendance,tuo osallistuminen
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Kaikki nimikeryhmät
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Kaikki nimikeryhmät
 DocType: Process Payroll,Activity Log,aktiivisuus loki
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,netto voitto/tappio
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,muodosta automaattinen viesti toiminnon lähetyksessä
@@ -996,7 +1013,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Ennustettu yksikkömäärä
 DocType: Sales Invoice,Payment Due Date,Maksun eräpäivä
 DocType: Drug Prescription,Interval UOM,Interval UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Tuote Variant {0} on jo olemassa samoja ominaisuuksia
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Tuote Variant {0} on jo olemassa samoja ominaisuuksia
+DocType: Item,Hub Publishing Details,Hub-julkaisutiedot
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening','Avattu'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Avaa tehtävä
 DocType: Notification Control,Delivery Note Message,lähetteen vieti
@@ -1007,19 +1025,20 @@
 DocType: Process Payroll,Bimonthly,Kahdesti kuussa
 DocType: Vehicle Service,Brake Pad,Jarrupala
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Research & Development,Tutkimus ja kehitys
-apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,laskutettava
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Laskutettava
 DocType: Company,Registration Details,rekisteröinnin lisätiedot
-DocType: Timesheet,Total Billed Amount,Yhteensä Laskutetut Määrä
+DocType: Timesheet,Total Billed Amount,Laskutettu yhteensä
 DocType: Item Reorder,Re-Order Qty,Täydennystilauksen yksikkömäärä
 DocType: Leave Block List Date,Leave Block List Date,päivä
 DocType: Pricing Rule,Price or Discount,Hinta tai Alennus
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: Raaka-aine ei voi olla sama kuin pääosa
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Saapumistositteen riveillä olevat maksut pitää olla sama kuin verot ja maksut osiossa
 DocType: Sales Team,Incentives,kannustimet/bonukset
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Rekisteröidy Hubille
 DocType: SMS Log,Requested Numbers,vaaditut numerot
 DocType: Production Planning Tool,Only Obtain Raw Materials,Hanki vain raaka-aineet
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Arviointikertomusta.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","""Käytä ostoskorille"" otettu käyttöön: Ostoskoritoiminto on käytössä ja ostoskorille tulisi olla ainakin yksi määritelty veroasetus."
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","""Käytä ostoskorille"" otettu käyttöön: Ostoskoritoiminto on käytössä ja ostoskorille tulisi olla ainakin yksi määritelty veroasetus."
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Maksu Entry {0} on liitetty vastaan Order {1}, tarkistaa, jos se tulee vetää kuin etukäteen tässä laskussa."
 DocType: Sales Invoice Item,Stock Details,Varastossa Tiedot
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekti Arvo
@@ -1038,12 +1057,14 @@
 DocType: Salary Slip,Working Days,Työpäivät
 DocType: Serial No,Incoming Rate,saapuva taso
 DocType: Packing Slip,Gross Weight,bruttopaino
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,"Yrityksen nimi, jolle olet luomassa tätä järjestelmää"
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Ota Hub käyttöön
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,"Yrityksen nimi, jolle olet luomassa tätä järjestelmää"
 DocType: HR Settings,Include holidays in Total no. of Working Days,"sisältää vapaapäiviä, työpäiviä yhteensä"
 DocType: Job Applicant,Hold,pidä
 DocType: Employee,Date of Joining,liittymispäivä
 DocType: Naming Series,Update Series,Päivitä sarjat
 DocType: Supplier Quotation,Is Subcontracted,on alihankittu
+DocType: Restaurant Table,Minimum Seating,Minimi istuma
 DocType: Item Attribute,Item Attribute Values,"tuotetuntomerkki, arvot"
 DocType: Examination Result,Examination Result,tutkimustuloksen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Saapuminen
@@ -1054,13 +1075,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Aika-aukkoa ei löydy seuraavaan {0} päivän toiminnolle {1}
 DocType: Production Order,Plan material for sub-assemblies,Suunnittele materiaalit alituotantoon
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Myynnin Partners ja Territory
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} tulee olla aktiivinen
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} tulee olla aktiivinen
 DocType: Journal Entry,Depreciation Entry,Poistot Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Valitse ensin asiakirjan tyyppi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Peru materiaalikäynti {0} ennen huoltokäynnin perumista
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Sarjanumero {0} ei kuulu tuotteelle {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,vaadittu yksikkömäärä
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Varastoissa nykyisten tapahtumaa ei voida muuntaa kirjanpitoon.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Varastoissa nykyisten tapahtumaa ei voida muuntaa kirjanpitoon.
 DocType: Bank Reconciliation,Total Amount,Yhteensä
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,internet julkaisu
 DocType: Prescription Duration,Number,Määrä
@@ -1071,7 +1092,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Myyntihinnasto
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Jos valitaan, luodaan asiakas, joka on kartoitettu Potilashenkilöön. Potilaslaskut luodaan tätä asiakasta vastaan. Voit myös valita olemassa olevan asiakkaan potilaan luomisen aikana."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Julkaise synkronoida kohteita
 DocType: Bank Reconciliation,Account Currency,Tilin valuutta
 DocType: Lab Test,Sample ID,Sample ID
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Merkitse yrityksen pyöristys tili
@@ -1080,11 +1100,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Työntekijä {0} ei ole aktiivinen tai sitä ei ole olemassa
 DocType: Fee Structure,Components,komponentit
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Syötä Asset Luokka momentille {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Tuotemallit {0} päivitetty
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Tuotemallit {0} päivitetty
 DocType: Quality Inspection Reading,Reading 6,Lukema 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Ei voi {0} {1} {2} ilman negatiivista maksamatta laskun
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","luodaan. Jos viivästyy, sinun on muutettava manuaalisesti tämän kentän &quot;Toista kuukausi-päivä&quot; -kenttään"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Ei voi {0} {1} {2} ilman negatiivista maksamatta laskun
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,"Ostolasku, edistynyt"
-DocType: Hub Settings,Sync Now,synkronoi nyt
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},rivi {0}: kredit kirjausta ei voi kohdistaa {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Määritä budjetti varainhoitovuoden.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"oletuspankki / rahatililleen päivittyy automaattisesti POS laskussa, kun tila on valittuna"
@@ -1096,13 +1117,13 @@
 DocType: Item,Is Purchase Item,on ostotuote
 DocType: Asset,Purchase Invoice,Ostolasku
 DocType: Stock Ledger Entry,Voucher Detail No,Tosite lisätiedot nro
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Uusi myyntilasku
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Uusi myyntilasku
 DocType: Stock Entry,Total Outgoing Value,"kokonaisarvo, lähtevä"
 DocType: Physician,Appointments,nimitykset
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Aukiolopäivä ja Päättymisaika olisi oltava sama Tilikausi
 DocType: Lead,Request for Information,tietopyyntö
 ,LeaderBoard,leaderboard
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Synkronointi Offline Laskut
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Synkronointi Offline Laskut
 DocType: Payment Request,Paid,Maksettu
 DocType: Program Fee,Program Fee,Program Fee
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1121,11 +1142,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Ostotilaus Kohde
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,välilliset tulot
 DocType: Student Attendance Tool,Student Attendance Tool,Student Läsnäolo Tool
+DocType: Restaurant Menu,Price List (Auto created),Hinnasto (luotu automaattisesti)
 DocType: Cheque Print Template,Date Settings,date Settings
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Vaihtelu
 ,Company Name,Yrityksen nimi
 DocType: SMS Center,Total Message(s),viestit yhteensä
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Valitse siirrettävä tuote
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Valitse siirrettävä tuote
 DocType: Purchase Invoice,Additional Discount Percentage,Lisäalennusprosentti
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Katso luettelo kaikista ohjevideot
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Valitse pankin tilin otsikko, minne shekki/takaus talletetaan"
@@ -1142,6 +1164,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,metri
 DocType: Workstation,Electricity Cost,sähkön kustannukset
 DocType: HR Settings,Don't send Employee Birthday Reminders,älä lähetä työntekijälle syntymäpäivämuistutuksia
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Tallenna asetukset
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Pyydetyt tuotteet
 DocType: Item,Inspection Criteria,tarkastuskriteerit
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,siirretty
 DocType: BOM Website Item,BOM Website Item,BOM-sivuston Kohta
@@ -1158,11 +1182,11 @@
 DocType: Journal Entry,Total Amount in Words,Yhteensä sanoina
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Tapahtui virhe: todennäköinen syy on ettet ole tallentanut lomaketta. Mikäli ongelma toistuu, ota yhteyttä järjestelmän ylläpitäjiin."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Ostoskori
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Tilaustyypin pitää olla jokin seuraavista '{0}'
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Tilaustyypin pitää olla jokin seuraavista '{0}'
 DocType: Lead,Next Contact Date,seuraava yhteydenottopvä
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Avaus yksikkömäärä
 DocType: Healthcare Settings,Appointment Reminder,Nimitysohje
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Anna Account for Change Summa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Anna Account for Change Summa
 DocType: Student Batch Name,Student Batch Name,Opiskelijan Erä Name
 DocType: Consultation,Doctor,Lääkäri
 DocType: Holiday List,Holiday List Name,lomaluettelo nimi
@@ -1170,12 +1194,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Aikataulu kurssi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,"varasto, vaihtoehdot"
 DocType: Journal Entry Account,Expense Claim,Kulukorvaus
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Haluatko todella palauttaa tämän romuttaa etu?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Yksikkömäärään {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Haluatko todella palauttaa tämän romuttaa etu?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Yksikkömäärään {0}
 DocType: Leave Application,Leave Application,Vapaa-hakemus
 DocType: Patient,Patient Relation,Potilaan suhde
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Vapaiden kohdistustyökalu
+DocType: Item,Hub Category to Publish,Hub Luokka julkaista
 DocType: Leave Block List,Leave Block List Dates,"poistu estoluettelo, päivät"
+DocType: Sales Invoice,Billing Address GSTIN,Laskutusosoite GSTIN
 DocType: Workstation,Net Hour Rate,tuntihinta (netto)
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,"Kohdistetut kustannukset, ostokuitti"
 DocType: Company,Default Terms,oletus ehdot
@@ -1185,18 +1211,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Määritä {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Poistettu kohteita ei muutu määrän tai arvon.
 DocType: Delivery Note,Delivery To,Toimitus vastaanottajalle
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Taito pöytä on pakollinen
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Taito pöytä on pakollinen
 DocType: Production Planning Tool,Get Sales Orders,hae myyntitilaukset
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ei voi olla negatiivinen
 DocType: Training Event,Self-Study,Itsenäinen opiskelu
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,alennus
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,alennus
 DocType: Asset,Total Number of Depreciations,Poistojen kokonaismäärä
 DocType: Sales Invoice Item,Rate With Margin,Hinta kanssa marginaali
 DocType: Workstation,Wages,Palkat
 DocType: Task,Urgent,Kiireellinen
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Määritä kelvollinen Rivi tunnus rivin {0} taulukossa {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Muuttujaa ei voitu löytää:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Valitse kentästä muokkaus numerosta
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Valitse kentästä muokkaus numerosta
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Siirry työpöydälle ja alkaa käyttää ERPNext
 DocType: Item,Manufacturer,Valmistaja
 DocType: Landed Cost Item,Purchase Receipt Item,Saapumistositteen nimike
@@ -1227,8 +1253,8 @@
 DocType: GL Entry,Against,kohdistus
 DocType: Item,Default Selling Cost Center,Myynnin oletuskustannuspaikka
 DocType: Sales Partner,Implementation Partner,sovelluskumppani
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Postinumero
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Myyntitilaus {0} on {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Postinumero
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Myyntitilaus {0} on {1}
 DocType: Opportunity,Contact Info,"yhteystiedot, info"
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Varastotapahtumien tekeminen
 DocType: Packing Slip,Net Weight UOM,Nettopainon yksikkö
@@ -1239,6 +1265,7 @@
 DocType: Holiday List,Get Weekly Off Dates,hae viikottaiset poissa päivät
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,päättymispäivä ei voi olla ennen aloituspäivää
 DocType: Sales Person,Select company name first.,Valitse yrityksen nimi ensin.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Alhaisesta korkeaan
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Toimittajilta saadut tarjoukset.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Korvaa BOM ja päivitä viimeisin hinta kaikkiin BOM-paketteihin
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Vastaanottajalle {0} | {1} {2}
@@ -1257,7 +1284,7 @@
 DocType: Program Enrollment,Transportation,kuljetus
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Virheellinen Taito
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} pitää olla vahvistettu
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Määrä on oltava pienempi tai yhtä suuri kuin {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Määrä on oltava pienempi tai yhtä suuri kuin {0}
 DocType: SMS Center,Total Characters,Henkilöt yhteensä
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Valitse BOM tuotteelle BOM kentästä {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-muoto laskutus lisätiedot
@@ -1272,7 +1299,7 @@
 ,Ordered Items To Be Billed,tilatut laskutettavat tuotteet
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Vuodesta Range on oltava vähemmän kuin laitumelle
 DocType: Global Defaults,Global Defaults,Yleiset oletusasetukset
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Project Collaboration Kutsu
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Project Collaboration Kutsu
 DocType: Salary Slip,Deductions,vähennykset
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Toiminnon nimi
@@ -1290,13 +1317,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,"Myyntilasku, ennakko"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Ei mitään pyydettävää
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Toinen Budget record &#39;{0}&#39; on jo olemassa vastaan {1} {2} &#39;verovuodelta {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',Aloituspäivän tulee olla päättymispäivää aiempi
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',Aloituspäivän tulee olla päättymispäivää aiempi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,hallinto
 DocType: Cheque Print Template,Payer Settings,Maksajan Asetukset
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Tämä liitetään mallin tuotenumeroon esim, jos lyhenne on ""SM"" ja tuotekoodi on ""T-PAITA"", mallin tuotekoodi on ""T-PAITA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettomaksu (sanoina) näkyy kun tallennat palkkalaskelman.
 DocType: Purchase Invoice,Is Return,on palautus
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,varovaisuus
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,varovaisuus
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Tuotto / veloitusilmoituksen
 DocType: Price List Country,Price List Country,Hinnasto Maa
 DocType: Item,UOMs,Mittayksiköt
@@ -1311,17 +1338,18 @@
 DocType: Account,Balance Sheet,tasekirja
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Nimikkeen kustannuspaikka nimikekoodilla
 DocType: Fee Validity,Valid Till,Voimassa
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Maksutila ei ole määritetty. Tarkista, onko tili on asetettu tila maksut tai POS Profile."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Maksutila ei ole määritetty. Tarkista, onko tili on asetettu tila maksut tai POS Profile."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Samaa kohdetta ei voi syöttää useita kertoja.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","lisätilejä voidaan tehdä kohdassa ryhmät, mutta kirjaukset toi suoraan tilille"
 DocType: Lead,Lead,Liidi
 DocType: Email Digest,Payables,Maksettavat
 DocType: Course,Course Intro,tietenkin Intro
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Varastotapahtuma {0} luotu
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Aseta numeerinen sarja osallistumiselle Setup&gt; Numerosarjan kautta
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Varastotapahtuma {0} luotu
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,rivi # {0}: hylättyä yksikkömäärää ei voi merkitä oston palautukseksi
 ,Purchase Order Items To Be Billed,Ostotilaus Items laskuttamat
 DocType: Purchase Invoice Item,Net Rate,nettohinta
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Valitse asiakas
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Valitse asiakas
 DocType: Purchase Invoice Item,Purchase Invoice Item,"Ostolasku, tuote"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,varastotilikirjan- ja päätilikirjan kirjaukset siirretty ostotositteisiin
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Nimike 1
@@ -1340,7 +1368,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},monista rivi {0} sama kuin {1}
 ,Trial Balance,Alustava tase
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Verovuoden {0} ei löytynyt
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Työntekijätietojen perustaminen
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Työntekijätietojen perustaminen
 DocType: Sales Order,SO-,NIIN-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Ole hyvä ja valitse etuliite ensin
 DocType: Employee,O-,O -
@@ -1352,12 +1380,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Näytä tilikirja
 DocType: Grading Scale,Intervals,väliajoin
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,aikaisintaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Samanniminen nimikeryhmä on jo olemassa, vaihda nimikkeen nimeä tai nimeä nimikeryhmä uudelleen"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Samanniminen nimikeryhmä on jo olemassa, vaihda nimikkeen nimeä tai nimeä nimikeryhmä uudelleen"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Muu maailma
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Muu maailma
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Tuote {0} ei voi olla erä
 ,Budget Variance Report,budjettivaihtelu raportti
 DocType: Salary Slip,Gross Pay,bruttomaksu
+DocType: Item,Is Item from Hub,Onko kohta Hubista
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Rivi {0}: Toimintalaji on pakollista.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,maksetut osingot
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Kirjanpito Ledger
@@ -1367,8 +1396,9 @@
 DocType: Vehicle Log,Service Detail,palvelu Detail
 DocType: BOM,Item Description,tuotteen kuvaus
 DocType: Student Sibling,Student Sibling,Student Sisarukset
-DocType: Purchase Invoice,Is Recurring,on toistuva
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,maksutila
 DocType: Purchase Invoice,Supplied Items,Toimitetut nimikkeet
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Aseta aktiivinen valikko ravintolalle {0}
 DocType: Student,STUD.,NASTA.
 DocType: Production Order,Qty To Manufacture,Valmistettava yksikkömäärä
 DocType: Email Digest,New Income,uusi Tulot
@@ -1378,6 +1408,7 @@
 ,Student and Guardian Contact Details,Opiskelija ja Guardian Yhteystiedot
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Rivi {0}: For toimittaja {0} Sähköpostiosoite on lähetettävä sähköpostitse
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Tilapäinen avaus
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,View Hub
 ,Employee Leave Balance,Työntekijän käytettävissä olevat vapaat
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Tilin tase {0} on oltava {1}
 DocType: Patient Appointment,More Info,Lisätietoja
@@ -1388,7 +1419,7 @@
 DocType: GL Entry,Against Voucher,kuitin kohdistus
 DocType: Item,Default Buying Cost Center,Oston oletuskustannuspaikka
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Saadaksesi kaiken irti ERPNextistä, Suosittelemme katsomaan nämä ohjevideot."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +74, to ,lle
+apps/erpnext/erpnext/accounts/page/pos/pos.js +74, to ,henkilölle
 DocType: Supplier Quotation Item,Lead Time in days,"virtausaika, päivinä"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,maksettava tilien yhteenveto
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +337,Payment of salary from {0} to {1},Palkanmaksu välillä {0} ja {1}
@@ -1397,13 +1428,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Myyntitilaus {0} ei ole kelvollinen
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Varo uutta tarjouspyyntöä
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Ostotilaukset auttaa suunnittelemaan ja seurata ostoksistasi
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged",Yhtiöitä ei voi yhdistää
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged",Yhtiöitä ei voi yhdistää
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Prescriptions
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Nimikkeen {3} kokonaismäärä {0} ei voi ylittää hankintapyynnön {1} tarvemäärää {2}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Pieni
 DocType: Employee,Employee Number,työntekijän numero
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},"asianumero/numerot on jo käytössä, aloita asianumerosta {0}"
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},"asianumero/numerot on jo käytössä, aloita asianumerosta {0}"
 DocType: Project,% Completed,% Valmis
 ,Invoiced Amount (Exculsive Tax),laskutettu arvomäärä (sisältäen verot)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Nimike 2
@@ -1418,11 +1449,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Välilliset kustannukset
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Rivillä {0}: Yksikkömäärä vaaditaan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Maatalous
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Tarjotut tuotteet ja/tai palvelut
 DocType: Special Test Items,Special Test Items,Erityiset testit
 DocType: Mode of Payment,Mode of Payment,maksutapa
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Sivuston kuvan tulee olla kuvatiedosto tai kuvan URL-osoite
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Sivuston kuvan tulee olla kuvatiedosto tai kuvan URL-osoite
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Tämä on kantatuoteryhmä eikä sitä voi muokata
@@ -1430,24 +1461,23 @@
 DocType: Vehicle,Fuel UOM,Polttoaine UOM
 DocType: Warehouse,Warehouse Contact Info,Varaston yhteystiedot
 DocType: Payment Entry,Write Off Difference Amount,Kirjoita Off Ero Määrä
-DocType: Purchase Invoice,Recurring Type,Toistuva tyyppi
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: Työntekijän sähköpostiosoitetta ei löytynyt, joten sähköpostia ei lähetetty"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: Työntekijän sähköpostiosoitetta ei löytynyt, joten sähköpostia ei lähetetty"
 DocType: Item,Foreign Trade Details,Ulkomaankauppa Yksityiskohdat
+,Assessment Plan Status,Arviointisuunnitelman tila
 DocType: Email Digest,Annual Income,Vuositulot
 DocType: Serial No,Serial No Details,Sarjanumeron lisätiedot
 DocType: Purchase Invoice Item,Item Tax Rate,tuotteen veroaste
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,Valitse lääkäri ja päivämäärä
 DocType: Student Group Student,Group Roll Number,Ryhmä rullanumero
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, vain kredit tili voidaan kohdistaa debet kirjaukseen"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Yhteensä Kaikkien tehtävän painojen tulisi olla 1. Säädä painoja Project tehtävien mukaisesti
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Lähete {0} ei ole vahvistettu
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Yhteensä Kaikkien tehtävän painojen tulisi olla 1. Säädä painoja Project tehtävien mukaisesti
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Lähete {0} ei ole vahvistettu
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Nimikkeen {0} pitää olla alihankittava nimike
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,käyttöomaisuuspääoma
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Hinnoittelusääntö tulee ensin valita  'käytä tässä' kentästä, joka voi olla tuote, tuoteryhmä tai brändi"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Aseta alkiotunnus ensin
-DocType: Hub Settings,Seller Website,Myyjä verkkosivut
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Aseta alkiotunnus ensin
 DocType: Item,ITEM-,kuvallisissa osaluetteloissa
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Myyntitiimin yhteensä lasketun prosenttiosuuden pitää olla 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Myyntitiimin yhteensä lasketun prosenttiosuuden pitää olla 100
 DocType: Sales Invoice Item,Edit Description,Muokkaa Kuvaus
 DocType: Antibiotic,Antibiotic,Antibiootti
 ,Team Updates,Team päivitykset
@@ -1468,12 +1498,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Yhteensä (yrityksen valuutta)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Sarjanumero {0} kirjattu useammin kuin kerran
 DocType: Depreciation Schedule,Journal Entry,päiväkirjakirjaus
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} kohdetta käynnissä
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} kohdetta käynnissä
 DocType: Workstation,Workstation Name,Työaseman nimi
 DocType: Grading Scale Interval,Grade Code,Grade koodi
 DocType: POS Item Group,POS Item Group,POS Kohta Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,tiedote:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} ei kuulu tuotteelle {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} ei kuulu tuotteelle {1}
 DocType: Sales Partner,Target Distribution,Toimitus tavoitteet
 DocType: Salary Slip,Bank Account No.,Pankkitilin nro
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Viimeinen tapahtuma on tehty tällä numerolla ja tällä etuliitteellä
@@ -1489,10 +1519,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,tarjouspyynnön toimittaja
 DocType: Healthcare Settings,Registration Message,Ilmoitusviesti
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,kova tavara
-DocType: Sales Order,Recurring Upto,Toistuvat Jopa
 DocType: Prescription Dosage,Prescription Dosage,Reseptilääkitys
 DocType: Attendance,HR Manager,HR ylläpitäjä
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Valitse Yritys
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Valitse Yritys
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Poistumisoikeus
 DocType: Purchase Invoice,Supplier Invoice Date,Toimittajan laskun päiväys
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,kohti
@@ -1508,10 +1537,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Päällekkäiset olosuhteisiin välillä:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,päiväkirjan kohdistettu kirjaus {0} on jo säädetty muuhun tositteeseen
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,tilausten arvo yhteensä
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Ruoka
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Ruoka
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,vanhentumisen skaala 3
 DocType: Maintenance Schedule Item,No of Visits,Vierailujen lukumäärä
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Huolto aikataulu {0} on olemassa vastaan {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Haluatko julkaista kohteita verkkoon?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,ilmoittautumalla opiskelija
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuutta sulkeminen on otettava {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},"kaikista tavoitteiden pisteiden summa  tulee olla 100, nyt se on {0}"
@@ -1522,9 +1552,9 @@
 DocType: Authorization Rule,Average Discount,Keskimääräinen alennus
 DocType: Purchase Invoice Item,UOM,Yksikkö
 DocType: Rename Tool,Utilities,Hyödykkeet
-DocType: Purchase Invoice Item,Accounting,Kirjanpito
+DocType: POS Profile,Accounting,Kirjanpito
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Valitse erissä satseittain erä
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Valitse erissä satseittain erä
 DocType: Asset,Depreciation Schedules,Poistot aikataulut
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Hakuaika ei voi ulkona loman jakokauteen
 DocType: Activity Cost,Projects,Projektit
@@ -1540,7 +1570,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',hyväksynnän tila on 'hyväksytty' tai 'hylätty'
 DocType: Physician,Contacts and Address,Yhteystiedot ja osoite
 DocType: Purchase Invoice,Contact Person,Yhteyshenkilö
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Toivottu aloituspäivä' ei voi olla suurempi kuin 'toivottu päättymispäivä'
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','Toivottu aloituspäivä' ei voi olla suurempi kuin 'toivottu päättymispäivä'
 DocType: Course Scheduling Tool,Course End Date,Tietenkin Päättymispäivä
 DocType: Holiday List,Holidays,lomat
 DocType: Sales Order Item,Planned Quantity,Suunnitellut määrä
@@ -1548,10 +1578,11 @@
 DocType: Item,Maintain Stock,huolla varastoa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,varaston kirjaukset on muodostettu tuotannon tilauksesta
 DocType: Employee,Prefered Email,prefered Sähköposti
+DocType: Student Admission,Eligibility and Details,Kelpoisuus ja tiedot
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Nettomuutos kiinteä omaisuus
 DocType: Leave Control Panel,Leave blank if considered for all designations,tyhjä mikäli se pidetään vihtoehtona kaikille nimityksille
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,maksun tyyppiä 'todellinen' rivillä {0} ei voi sisällyttää tuotearvoon
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Alkaen aikajana
 DocType: Email Digest,For Company,Yritykselle
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Viestintäloki
@@ -1559,19 +1590,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Toimittajan tuloskortin pisteytysmuuttuja
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Oston määrä
 DocType: Sales Invoice,Shipping Address Name,Toimitusosoitteen nimi
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,tilikartta
 DocType: Material Request,Terms and Conditions Content,Ehdot ja säännöt sisältö
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,ei voi olla suurempi kuin 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Nimike {0} ei ole varastonimike
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Nimike {0} ei ole varastonimike
 DocType: Maintenance Visit,Unscheduled,Aikatauluttamaton
 DocType: Employee,Owned,Omistuksessa
 DocType: Salary Detail,Depends on Leave Without Pay,riippuu poistumisesta ilman palkkaa
 DocType: Pricing Rule,"Higher the number, higher the priority","mitä korkeampi numero, sitä korkeampi prioriteetti"
 ,Purchase Invoice Trends,Ostolaskujen kehitys
 DocType: Employee,Better Prospects,Parempi Näkymät
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Rivi # {0}: Erä {1} on vain {2} kpl. Valitse toinen erä, joka on {3} kpl saatavilla tai jakaa rivin tulee useita rivejä, antaa / kysymys useista eristä"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Rivi # {0}: Erä {1} on vain {2} kpl. Valitse toinen erä, joka on {3} kpl saatavilla tai jakaa rivin tulee useita rivejä, antaa / kysymys useista eristä"
 DocType: Vehicle,License Plate,Rekisterikilpi
 DocType: Appraisal,Goals,tavoitteet
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Valitse POS-profiili
 DocType: Warranty Claim,Warranty / AMC Status,Takuun / ylläpidon tila
 ,Accounts Browser,tilien selain
 DocType: Payment Entry Reference,Payment Entry Reference,Payment Entry Viite
@@ -1589,7 +1620,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,työntekijä ei voi raportoida itselleen
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","mikäli tili on jäädytetty, kirjaukset on rajattu tietyille käyttäjille"
 DocType: Email Digest,Bank Balance,Pankkitilin tase
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Kirjaus {0}: {1} voidaan tehdä vain valuutassa: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Kirjaus {0}: {1} voidaan tehdä vain valuutassa: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","työprofiili, vaaditut pätevydet jne"
 DocType: Journal Entry Account,Account Balance,Tilin tase
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Verosääntöön liiketoimia.
@@ -1598,8 +1629,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),verot ja maksut yhteensä (yrityksen valuutta)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Näytä unclosed tilikaudesta P &amp; L saldot
 DocType: Lab Test Template,Collection Details,Keräilytiedot
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","valitse cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date tabConsultation ct, `tabLab Prescription` cp jossa ct.patient = &#39;{0}&#39; ja cp.parent = ct. nimi ja cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Toimituskulutili
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Tili {2} ei ole aktiivinen
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Tee Myyntitilaukset auttaa suunnittelemaan työtä ja toimittaa oikea-aikaisesti
@@ -1616,7 +1645,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Pakkauslappu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Toimisto Vuokra
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Tekstiviestin reititinmääritykset
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,tuonti epäonnistui!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,tuonti epäonnistui!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,osoitetta ei ole vielä lisätty
 DocType: Workstation Working Hour,Workstation Working Hour,Työaseman työaika
 DocType: Vital Signs,Blood Pressure,Verenpaine
@@ -1641,7 +1670,7 @@
 DocType: Sales Invoice,Source,Lähde
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Näytäsuljetut
 DocType: Leave Type,Is Leave Without Pay,on poistunut ilman palkkaa
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Asset Luokka on pakollinen Käyttöomaisuuden erä
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Asset Luokka on pakollinen Käyttöomaisuuden erä
 DocType: Fee Validity,Fee Validity,Maksun voimassaoloaika
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Tietueita ei löytynyt maksutaulukosta
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Tämä {0} on ristiriidassa {1} ja {2} {3}
@@ -1662,17 +1691,18 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,edistynyt haku
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Luo liidejä
 DocType: Maintenance Schedule,Schedules,Aikataulut
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,POS-profiilia tarvitaan myyntipisteen käyttämiseen
 DocType: Purchase Invoice Item,Net Amount,netto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} ei ole vahvistettu, joten toimintoa ei voida suorittaa loppuun"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} ei ole vahvistettu, joten toimintoa ei voida suorittaa loppuun"
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM yksittäisnumero
 DocType: Landed Cost Voucher,Additional Charges,Lisämaksut
-DocType: Purchase Invoice,Additional Discount Amount (Company Currency),lisäalennus (yrityksen valuutassa)
+DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Lisäalennus (yrityksen valuutassa)
 DocType: Supplier Scorecard,Supplier Scorecard,Toimittajan arviointi
 apps/erpnext/erpnext/accounts/doctype/account/account.js +21,Please create new account from Chart of Accounts.,Ole hyvä ja lisää uusi tili tilikartasta
 ,Support Hour Distribution,Tukiaseman jakelu
 DocType: Maintenance Visit,Maintenance Visit,"huolto, käynti"
 DocType: Student,Leaving Certificate Number,Leaving Certificate Number
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Nimitys peruutettu, tarkista laskutus {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Nimitys peruutettu, tarkista laskutus {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,saatavilla olevan erän yksikkömäärä varastossa
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Päivitä tulostusmuoto
 DocType: Landed Cost Voucher,Landed Cost Help,"Kohdistetut kustannukset, ohje"
@@ -1695,8 +1725,8 @@
 DocType: Patient,Tobacco Past Use,Tupakan aiempi käyttö
 DocType: Sales Invoice Item,Brand Name,brändin nimi
 DocType: Purchase Receipt,Transporter Details,Transporter Lisätiedot
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Käyttäjä {0} on jo osoitettu lääkärille {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Oletus varasto tarvitaan valittu kohde
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Käyttäjä {0} on jo osoitettu lääkärille {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Oletus varasto tarvitaan valittu kohde
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,pl
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,mahdollinen toimittaja
 DocType: Budget,Monthly Distribution,toimitus kuukaudessa
@@ -1706,7 +1736,7 @@
 DocType: Sales Partner,Sales Partner Target,Myyntikumppani tavoite
 DocType: Loan Type,Maximum Loan Amount,Suurin lainamäärä
 DocType: Pricing Rule,Pricing Rule,Hinnoittelusääntö
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Päällekkäisiä rullan numero opiskelijan {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Päällekkäisiä rullan numero opiskelijan {0}
 DocType: Budget,Action if Annual Budget Exceeded,Toiminta jos vuosibudjetin ylitetty
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Ostotilaus hankintapyynnöstä
 DocType: Shopping Cart Settings,Payment Success URL,Maksu onnistui URL
@@ -1723,7 +1753,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} saa esiintyä vain kerran
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ei saa tranfer enemmän {0} kuin {1} vastaan Ostotilaus {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Vapaat kohdennettu {0}:lle
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,ei pakattavia tuotteita
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,ei pakattavia tuotteita
 DocType: Shipping Rule Condition,From Value,arvosta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Valmistus Määrä on pakollista
 DocType: Employee Loan,Repayment Method,lyhennystapa
@@ -1737,6 +1767,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,varasto vastattavat
 DocType: Purchase Invoice,Supplier Warehouse,toimittajan varasto
 DocType: Opportunity,Contact Mobile No,"yhteystiedot, puhelin"
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Valitse Yritys
 ,Material Requests for which Supplier Quotations are not created,Materiaalipyynnöt ilman toimituskykytiedustelua
 DocType: Student Group,Set 0 for no limit,Aseta 0 ei rajaa
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Päivä (t), johon haet lupaa ovat vapaapäiviä. Sinun ei tarvitse hakea lupaa."
@@ -1746,24 +1777,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,tee tarjous
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Muut raportit
 DocType: Dependent Task,Dependent Task,riippuvainen tehtävä
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Oletusyksikön muuntokerroin pitää olla 1 rivillä {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Oletusyksikön muuntokerroin pitää olla 1 rivillä {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},{0} -tyyppinen vapaa ei voi olla pidempi kuin {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,kokeile suunnitella toimia X päivää etukäteen
 DocType: HR Settings,Stop Birthday Reminders,lopeta syntymäpäivämuistutukset
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Aseta Default Payroll maksullisia tilin Yrityksen {0}
 DocType: SMS Center,Receiver List,Vastaanotin List
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,haku Tuote
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,haku Tuote
 DocType: Patient Appointment,Referring Physician,Viittaava lääkäri
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,käytetty arvomäärä
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Rahavarojen muutos
 DocType: Assessment Plan,Grading Scale,Arvosteluasteikko
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,yksikköä {0} on kirjattu useammin kuin kerran muuntokerroin taulukossa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,jo valmiiksi
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,yksikköä {0} on kirjattu useammin kuin kerran muuntokerroin taulukossa
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,jo valmiiksi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock kädessä
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Maksupyyntö on jo olemassa {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,aiheen tuotteiden kustannukset
 DocType: Physician,Hospital,Sairaala
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Määrä saa olla enintään {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Määrä saa olla enintään {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Edellisen tilikauden ei ole suljettu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Ikä (päivää)
 DocType: Quotation Item,Quotation Item,Tarjouksen tuote
@@ -1774,8 +1805,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,toimittajatyypin valvonta
 DocType: Purchase Order Item,Supplier Part Number,Toimittajan nimikekoodi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,muuntokerroin ei voi olla 0 tai 1
-DocType: Sales Invoice,Reference Document,vertailuasiakirja
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} on peruutettu tai pysäytetty
+DocType: Subscription,Reference Document,vertailuasiakirja
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} on peruutettu tai pysäytetty
 DocType: Accounts Settings,Credit Controller,kredit valvoja
 DocType: Delivery Note,Vehicle Dispatch Date,Ajoneuvon toimituspäivä
 DocType: Healthcare Settings,Default Medical Code Standard,Oletus Medical Code Standard
@@ -1784,6 +1815,7 @@
 DocType: Company,Default Payable Account,oletus maksettava tili
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Ostoskorin asetukset, kuten toimitustapa, hinnastot, jne"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% laskutettu
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Lajittele Hinta ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,varattu yksikkömäärä
 DocType: Party Account,Party Account,Osapuolitili
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Henkilöstöresurssit
@@ -1795,13 +1827,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Tee maksaminen Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Rivi {0}: Advance vastaan Toimittaja on veloittaa
 DocType: Company,Default Values,oletus arvot
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Taajuus} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Taajuus} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Hyvitys yhteensä
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Tämä perustuu tukkien vastaan Vehicle. Katso aikajana lisätietoja alla
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},toimittajan ostolaskun kohdistus {0} päiväys {1}
 DocType: Customer,Default Price List,oletus hinnasto
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Asset Movement record {0} luotu
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Et voi poistaa tilikautta {0}. Tilikausi {0} on asetettu oletustilikaudeksi järjestelmäasetuksissa.
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Saman nimen omaava asiakas on jo olemassa
 DocType: Journal Entry,Entry Type,Entry Tyyppi
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Ei arviointisuunnitelma liittyy tähän arvioon ryhmään
 ,Customer Credit Balance,Asiakkaan kredit tase
@@ -1811,7 +1844,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Hinnoittelu
 DocType: Quotation,Term Details,Ehdon lisätiedot
 DocType: Project,Total Sales Cost (via Sales Order),Kokonaismyynti Kustannukset (via myyntitilaus)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Ei voi ilmoittautua enintään {0} opiskelijat tälle opiskelijaryhmälle.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Ei voi ilmoittautua enintään {0} opiskelijat tälle opiskelijaryhmälle.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,lyijy Count
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} on oltava suurempi kuin 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),kapasiteetin suunnittelu (päiville)
@@ -1827,9 +1860,11 @@
 DocType: Lab Test,Technician Name,Tekniikan nimi
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Linkityksen Maksu mitätöinti Lasku
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Matkamittarin lukema merkitään pitäisi olla suurempi kuin alkuperäisen ajoneuvon matkamittarin {0}
+DocType: Restaurant Reservation,No Show,Ei näytä
 DocType: Shipping Rule Country,Shipping Rule Country,Toimitustavan maa
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Vapaat ja läsnäolot
 DocType: Maintenance Visit,Partially Completed,Osittain Valmis
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Kohtuullinen herkkyys
 DocType: Leave Type,Include holidays within leaves as leaves,sisältää vapaapäiviän poistumiset poistumisina
 DocType: Sales Invoice,Packed Items,Pakatut tuotteet
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Takuuanomus sarjanumerolle
@@ -1846,13 +1881,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Maksettu määrä (Yrityksen valuutta)
 DocType: Purchase Invoice,Additional Discount,Lisäalennus
 DocType: Selling Settings,Selling Settings,Myynnin asetukset
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Vahvista toimi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Auctions
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Aseta määrä, arvostustaso tai molemmat"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,täyttymys
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,View Cart
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Markkinointikustannukset
 ,Item Shortage Report,Tuotevajausraportti
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Paino on mainittu, \ ssa mainitse myös ""Painoyksikkö"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Paino on mainittu, \ ssa mainitse myös ""Painoyksikkö"""
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Varaston kirjaus hankintapyynnöstä
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Seuraava Poistot Date on pakollinen uutta sisältöä
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Erillinen perustuu luonnollisesti ryhmän kutakin Erä
@@ -1864,12 +1900,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,tee kirjanpidon kirjaus kaikille varastotapahtumille
 DocType: Leave Allocation,Total Leaves Allocated,"Poistumisten yhteismäärä, kohdennettu"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Varasto vaaditaan rivillä {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Anna kelvollinen tilivuoden alkamis- ja päättymispäivä
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Anna kelvollinen tilivuoden alkamis- ja päättymispäivä
 DocType: Employee,Date Of Retirement,Eläkkeellesiirtymispäivä
 DocType: Upload Attendance,Get Template,hae mallipohja
 DocType: Material Request,Transferred,siirretty
 DocType: Vehicle,Doors,ovet
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext Asennus valmis!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext Asennus valmis!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Kerää maksut potilaan rekisteröinnille
 DocType: Course Assessment Criteria,Weightage,Painoarvo
 DocType: Purchase Invoice,Tax Breakup,vero Breakup
@@ -1888,36 +1924,36 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","mikäli tällä tuotteella on useita malleja, sitä ei voi valita esim. myyntitilaukseen"
 DocType: Lead,Next Contact By,seuraava yhteydenottohlö
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Vaadittu tuotemäärä {0} rivillä {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Vaadittu tuotemäärä {0} rivillä {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Varastoa {0} ei voi poistaa koska se sisältää tuotetta {1}
 DocType: Quotation,Order Type,Tilaustyyppi
-DocType: Purchase Invoice,Notification Email Address,sähköpostiosoite ilmoituksille
 ,Item-wise Sales Register,"tuote työkalu, myyntirekisteri"
 DocType: Asset,Gross Purchase Amount,Gross Osto Määrä
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Avauspalkkiot
 DocType: Asset,Depreciation Method,Poistot Menetelmä
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Poissa
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Poissa
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,kuuluuko tämä vero perustasoon?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,tavoite yhteensä
 DocType: Job Applicant,Applicant for a Job,työn hakija
 DocType: Production Plan Material Request,Production Plan Material Request,Tuotanto Plan Materiaali Request
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,tuotannon tilauksia ei ole tehty
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,tuotannon tilauksia ei ole tehty
 DocType: Stock Reconciliation,Reconciliation JSON,JSON täsmäytys
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,"Liian monta saraketta, vie raportti taulukkolaskentaohjelman ja tulosta se siellä"
 DocType: Purchase Invoice Item,Batch No,Eränumero
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Tarjouspyyntö: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Salli useat Myyntitilaukset vastaan Asiakkaan Ostotilauksen
 DocType: Student Group Instructor,Student Group Instructor,Opiskelijaryhmän Ohjaaja
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Ei
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Tärkein
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Tärkein
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Malli
 DocType: Naming Series,Set prefix for numbering series on your transactions,Aseta sarjojen numeroinnin etuliite tapahtumiin
 DocType: Employee Attendance Tool,Employees HTML,Työntekijät HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,oletus BOM ({0}) tulee olla aktiivinen tälle tuotteelle tai sen mallipohjalle
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,oletus BOM ({0}) tulee olla aktiivinen tälle tuotteelle tai sen mallipohjalle
 DocType: Employee,Leave Encashed?,vapaa kuitattu rahana?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,tilaisuuteen kenttä vaaditaan
 DocType: Email Digest,Annual Expenses,Vuosittaiset kustannukset
 DocType: Item,Variants,Mallit
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Tee Ostotilaus
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Tee Ostotilaus
 DocType: SMS Center,Send To,Lähetä kenelle
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Vapaatyypille {0} ei ole tarpeeksi vapaata jäljellä
 DocType: Payment Reconciliation Payment,Allocated amount,kohdennettu arvomäärä
@@ -1933,6 +1969,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Opiskelijaryhmän Vahvuus
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,päiväkirjaan kohdistus {0} ei täsmäämättömiä {1} kirjauksia
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Kehityskeskustelut
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Koulutustilaisuudet
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},monista tuotteelle kirjattu sarjanumero {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Toimitustavan ehdot
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Käy sisään
@@ -1942,7 +1979,7 @@
 DocType: Sales Order,To Deliver and Bill,Lähetä ja laskuta
 DocType: Student Group,Instructors,Ohjaajina
 DocType: GL Entry,Credit Amount in Account Currency,Luoton määrä Account Valuutta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,Osaluettelo {0} pitää olla vahvistettu
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,Osaluettelo {0} pitää olla vahvistettu
 DocType: Authorization Control,Authorization Control,Valtuutus Ohjaus
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Rivi # {0}: Hylätyt Warehouse on pakollinen vastaan hylätään Tuote {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Maksu
@@ -1961,11 +1998,11 @@
 DocType: Quotation Item,Actual Qty,kiinteä yksikkömäärä
 DocType: Sales Invoice Item,References,Viitteet
 DocType: Quality Inspection Reading,Reading 10,Lukema 10
-DocType: Hub Settings,Hub Node,hubi sidos
+DocType: Hub Category,Hub Node,hubi sidos
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Olet syöttänyt kohteen joka on jo olemassa. Korjaa ja yritä uudelleen.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,kolleega
 DocType: Asset Movement,Asset Movement,Asset Movement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,uusi koriin
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,uusi koriin
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Nimike {0} ei ole sarjoitettu tuote
 DocType: SMS Center,Create Receiver List,tee vastaanottajalista
 DocType: Vehicle,Wheels,Pyörät
@@ -1979,15 +2016,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Tietoliikenne
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"osoittaa, pakkaus on vain osa tätä toimitusta (luonnos)"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,tee maksukirjaus
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Määrä alamomentille {0} on oltava pienempi kuin {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Määrä alamomentille {0} on oltava pienempi kuin {1}
 ,Sales Invoice Trends,Myyntilaskujen kehitys
 DocType: Leave Application,Apply / Approve Leaves,käytä / hyväksy poistumiset
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Varten
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Varten
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',rivi voi viitata edelliseen riviin vain jos maksu tyyppi on 'edellisen rivin arvomäärä' tai 'edellinen rivi yhteensä'
 DocType: Sales Order Item,Delivery Warehouse,toimitus varasto
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Tree taloudellisen kustannuspaikat.
 DocType: Serial No,Delivery Document No,Toimitus Document No
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Aseta &#39;Gain / tuloslaskelma Omaisuudenhoitoalan hävittämisestä &quot;in Company {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Aseta &#39;Gain / tuloslaskelma Omaisuudenhoitoalan hävittämisestä &quot;in Company {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,hae tuotteet ostokuiteista
 DocType: Serial No,Creation Date,tekopäivä
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Nimike {0} on useampaan kertaan hinnastossa hinnastossa {1}
@@ -1998,11 +2035,12 @@
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,useita tuotemalleja
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Päivitä vastaus
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Olet jo valitut kohteet {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Olet jo valitut kohteet {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,"toimitus kuukaudessa, nimi"
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Erätunnuksesi on pakollinen
 DocType: Sales Person,Parent Sales Person,Päämyyjä
-DocType: Purchase Invoice,Recurring Invoice,Toistuva Lasku
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Korkeasta alhaiseen
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Valitse ensin ohjelma
 DocType: Patient Appointment,Patient Age,Potilaan ikä
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Toimitusjohtaja Projektit
 DocType: Supplier,Supplier of Goods or Services.,Tavara- tai palvelutoimittaja
@@ -2010,8 +2048,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Vahinkovakuutustilejä käytetään, jos niitä ei ole asetettu potilaan kirjanpitoon."
 DocType: Vehicle Log,Fuel Price,polttoaineen hinta
 DocType: Budget,Budget,budjetti
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Aseta Avaa
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Käyttö- omaisuuserän oltava ei-varastotuote.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Aseta Avaa
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Käyttö- omaisuuserän oltava ei-varastotuote.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Talousarvio ei voi luovuttaa vastaan {0}, koska se ei ole tuottoa tai kulua tili"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,saavutettu
 DocType: Student Admission,Application Form Route,Hakulomake Route
@@ -2025,12 +2063,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Nimikkeelle {0} ei määritetty sarjanumeroita, täppää tuote työkalu"
 DocType: Maintenance Visit,Maintenance Time,"huolto, aika"
 ,Amount to Deliver,toimitettava arvomäärä
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Sama kohde on syötetty useita kertoja. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Term alkamispäivä ei voi olla aikaisempi kuin vuosi alkamispäivä Lukuvuoden johon termiä liittyy (Lukuvuosi {}). Korjaa päivämäärät ja yritä uudelleen.
 DocType: Guardian,Guardian Interests,Guardian Harrastukset
 DocType: Naming Series,Current Value,Nykyinen arvo
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Useita verovuoden olemassa päivämäärän {0}. Määritä yritys verovuonna
 DocType: School Settings,Instructor Records to be created by,Ohjaajan rekisterit luodaan
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,tehnyt {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,tehnyt {0}
 DocType: Delivery Note Item,Against Sales Order,myyntitilauksen kohdistus
 ,Serial No Status,Sarjanumero tila
 DocType: Payment Entry Reference,Outstanding,maksamatta
@@ -2040,10 +2079,10 @@
 						must be greater than or equal to {2}",rivi {0}: asettaaksesi {1} kausituksen aloitus ja päättymispäivän ero \ tulee olla suurempi tai yhtä suuri kuin {2}
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Varastotapahtumat. {0} sisältää tiedot tapahtumista.
 DocType: Pricing Rule,Selling,Myynti
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Määrä {0} {1} vähennetään vastaan {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Määrä {0} {1} vähennetään vastaan {2}
 DocType: Employee,Salary Information,Palkkatietoja
 DocType: Sales Person,Name and Employee ID,Nimi ja Työntekijän ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Eräpäivä voi olla ennen tositepäivää
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Eräpäivä voi olla ennen tositepäivää
 DocType: Website Item Group,Website Item Group,Tuoteryhmän verkkosivu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,tullit ja verot
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Anna Viiteajankohta
@@ -2069,7 +2108,7 @@
 DocType: Issue,Resolution Details,Ratkaisun lisätiedot
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,määrärahat
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,hyväksymiskriteerit
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Syötä hankintapyynnöt yllä olevaan taulukkoon
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Syötä hankintapyynnöt yllä olevaan taulukkoon
 DocType: Item Attribute,Attribute Name,"tuntomerkki, nimi"
 DocType: BOM,Show In Website,näytä verkkosivustossa
 DocType: Shopping Cart Settings,Show Quantity in Website,Näytä Määrä Website
@@ -2078,7 +2117,7 @@
 DocType: Item Reorder,Check in (group),Check in (ryhmä)
 ,Qty to Order,Tilattava yksikkömäärä
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Tilin päänsä velan tai oman pääoman, jossa voitto / tappio kirjataan"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,gantt kaavio kaikista tehtävistä
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,gantt kaavio kaikista tehtävistä
 DocType: Opportunity,Mins to First Response,Vastausaika (min)
 DocType: Pricing Rule,Margin Type,marginaali Tyyppi
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} tuntia
@@ -2099,35 +2138,35 @@
 DocType: Patient,Surgical History,Kirurginen historia
 DocType: Employee,Resignation Letter Date,Eropyynnön päivämäärä
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Hinnoittelusäännöt on suodatettu määrän mukaan
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Aseta jolloin se liittyy työntekijöiden {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Aseta jolloin se liittyy työntekijöiden {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Total Billing Määrä (via Time Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Toistuvien asiakkuuksien liikevaihto
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) tulee olla rooli 'kustannusten hyväksyjä'
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Pari
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Valitse BOM ja Määrä Tuotannon
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Valitse BOM ja Määrä Tuotannon
 DocType: Asset,Depreciation Schedule,Poistot aikataulu
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,-myyjään osoitteista ja yhteystiedoista
 DocType: Bank Reconciliation Detail,Against Account,tili kohdistus
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Half Day Date pitäisi olla välillä Päivästä ja Päivään
 DocType: Maintenance Schedule Detail,Actual Date,todellinen päivä
 DocType: Item,Has Batch No,on erä nro
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Vuotuinen laskutus: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Vuotuinen laskutus: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Tavarat ja palvelut Tax (GST Intia)
 DocType: Delivery Note,Excise Page Number,poisto sivunumero
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Company, Päivästä ja Päivään on pakollinen"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Hae neuvotteluista
 DocType: Asset,Purchase Date,Ostopäivä
 DocType: Employee,Personal Details,Henkilökohtaiset lisätiedot
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Ole hyvä ja aseta yrityksen {0} poistojen kustannuspaikka.
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Ole hyvä ja aseta yrityksen {0} poistojen kustannuspaikka.
 ,Maintenance Schedules,huoltoaikataulut
 DocType: Task,Actual End Date (via Time Sheet),Todellinen Lopetuspäivä (via kellokortti)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Määrä {0} {1} vastaan {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Määrä {0} {1} vastaan {2} {3}
 ,Quotation Trends,Tarjousten kehitys
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},tuotteen {0} tuoteryhmää ei ole mainittu kohdassa tuote työkalu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,tilin debet tulee olla saatava tili
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,tilin debet tulee olla saatava tili
 DocType: Shipping Rule Condition,Shipping Amount,Toimituskustannus arvomäärä
 DocType: Supplier Scorecard Period,Period Score,Ajanjakso
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Lisää Asiakkaat
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Lisää Asiakkaat
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Odottaa arvomäärä
 DocType: Lab Test Template,Special,erityinen
 DocType: Purchase Invoice Item,Conversion Factor,muuntokerroin
@@ -2135,13 +2174,14 @@
 ,Vehicle Expenses,ajoneuvojen kulut
 DocType: Serial No,Invoice Details,laskun tiedot
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},"Odotettu arvo sen jälkeen, kun käyttöiän on oltava suurempi tai yhtä suuri kuin {0}"
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Aloita
+DocType: Hub Category,Hub Category,Hub-luokka
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Ajoneuvon rekisterinumero
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,Päivä jolloin toistuva lasku lakkaa
 DocType: Employee Loan,Loan Amount,Lainan määrä
 DocType: Program Enrollment,Self-Driving Vehicle,Itsestään kulkevaa ajoneuvoa
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Toimittajan sijoitus
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Rivi {0}: osaluettelosi ei löytynyt Tuote {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Rivi {0}: osaluettelosi ei löytynyt Tuote {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Yhteensä myönnetty lehdet {0} ei voi olla pienempi kuin jo hyväksytty lehdet {1} kaudeksi
 DocType: Journal Entry,Accounts Receivable,saatava tilit
 ,Supplier-Wise Sales Analytics,Toimittajakohtainen myyntianalytiikka
@@ -2152,18 +2192,18 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Vanhemman Course (Jätä tyhjäksi, jos tämä ei ole osa emoyhtiön Course)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,tyhjä mikäli se pidetään vaihtoehtona  kaikissa työntekijä tyypeissä
 DocType: Landed Cost Voucher,Distribute Charges Based On,toimitusmaksut perustuen
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Tuntilomakkeet
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Tuntilomakkeet
 DocType: HR Settings,HR Settings,Henkilöstöhallinnan määritykset
 DocType: Salary Slip,net pay info,nettopalkka info
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Tämä arvo päivitetään oletusmyyntihinnassa.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,Expense Claim is pending approval. Only the Expense Approver can update status.,Kulukorvaus odottaa hyväksyntää. Vain kulujen hyväksyjä voi päivittää tilan.
 DocType: Email Digest,New Expenses,Uudet kustannukset
-DocType: Purchase Invoice,Additional Discount Amount,lisäalennus
+DocType: Purchase Invoice,Additional Discount Amount,Lisäalennus
 DocType: Consultation,Patient Details,Potilastiedot
 DocType: Patient,B Positive,B Positiivinen
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rivi # {0}: Määrä on 1, kun kohde on kiinteän omaisuuden. Käytä erillistä rivi useita kpl."
 DocType: Leave Block List Allow,Leave Block List Allow,Salli
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,lyhenne ei voi olla tyhjä tai välilyönti
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,lyhenne ei voi olla tyhjä tai välilyönti
 DocType: Patient Medical Record,Patient Medical Record,Potilaan lääketieteellinen tietue
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Ryhmä Non-ryhmän
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,urheilu
@@ -2179,9 +2219,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Pysty löytämään vaihtokurssi {0} ja {1} avaimen päivämäärä {2}. Luo Valuutanvaihto ennätys manuaalisesti
 DocType: POS Profile,Price List,Hinnasto
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} on nyt oletustilikausi. Lataa selaimesi uudelleen, jotta muutokset tulevat voimaan."
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Kulukorvaukset
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Kulukorvaukset
 DocType: Issue,Support,Tuki
 ,BOM Search,BOM-haku
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Julkaise &quot;Varastossa&quot; tai &quot;Ei varastossa&quot; Hubissa tämän varaston varastosta.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),sulku (avaus + summat)
 DocType: Vehicle,Fuel Type,Polttoaine
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Määritä yrityksen valuutta
@@ -2193,16 +2234,16 @@
 DocType: Healthcare Settings,Remind Before,Muistuta ennen
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Mittayksikön muuntokerroin vaaditaan rivillä {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rivi # {0}: Reference Document Type on yksi myyntitilaus, myyntilasku tai Päiväkirjakirjaus"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rivi # {0}: Reference Document Type on yksi myyntitilaus, myyntilasku tai Päiväkirjakirjaus"
 DocType: Salary Component,Deduction,vähennys
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Rivi {0}: From Time ja Kellonaikatilaan on pakollista.
 DocType: Stock Reconciliation Item,Amount Difference,määrä ero
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Nimikkeen '{0}' hinta lisätty hinnastolle '{1}'
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Nimikkeen '{0}' hinta lisätty hinnastolle '{1}'
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Syötä työntekijätunnu tälle myyjälle
 DocType: Territory,Classification of Customers by region,asiakkaiden luokittelu alueittain
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Ero määrä on nolla
 DocType: Project,Gross Margin,bruttokate
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Syötä ensin tuotantotuote
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Syötä ensin tuotantotuote
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Laskettu tilin saldo
 DocType: Normal Test Template,Normal Test Template,Normaali testausmalli
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,käyttäjä poistettu käytöstä
@@ -2212,21 +2253,22 @@
 DocType: Salary Slip,Total Deduction,Vähennys yhteensä
 ,Production Analytics,Tuotanto-analytiikka
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Tämä perustuu potilaaseen kohdistuviin liiketoimiin. Katso lisätietoja alla olevasta aikataulusta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,kustannukset päivitetty
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,kustannukset päivitetty
 DocType: Employee,Date of Birth,Syntymäpäivä
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Nimike {0} on palautettu
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**tilikausi** sisältää kaikki sen kuluessa kirjatut kirjanpito- ym. taloudenhallinnan tapahtumat
 DocType: Opportunity,Customer / Lead Address,Asiakkaan / Liidin osoite
 DocType: Patient,DOB,syntymäaika
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Toimittajan tuloskortin asetukset
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Varoitus: Liitteen {0} SSL-varmenne ei kelpaa
-DocType: Student Admission,Eligibility,kelpoisuus
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Arviointisuunnitelman nimi
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Varoitus: Liitteen {0} SSL-varmenne ei kelpaa
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads",Liidien avulla liiketoimintaasi ja kontaktiesi määrä kasvaa ja niistä syntyy uusia mahdollisuuksia
 DocType: Production Order Operation,Actual Operation Time,todellinen toiminta-aika
 DocType: Authorization Rule,Applicable To (User),sovellettavissa (käyttäjä)
 DocType: Purchase Taxes and Charges,Deduct,vähentää
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,työn kuvaus
 DocType: Student Applicant,Applied,soveltava
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Avaa uudelleen
 DocType: Sales Invoice Item,Qty as per Stock UOM,Yksikkömäärä / varastoyksikkö
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 Name
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","erikoismerkit ""-"", ""#"", ""."" ja ""/"" ei ole sallittuja sarjojen nimeämisessä"
@@ -2238,7 +2280,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Valmistus ylläpitäjä
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Sarjanumerolla {0} on takuu {1} asti
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,jaa lähete pakkauksien kesken
-apps/erpnext/erpnext/hooks.py +98,Shipments,Toimitukset
+apps/erpnext/erpnext/hooks.py +107,Shipments,Toimitukset
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Yhteensä jaettava määrä (Company valuutta)
 DocType: Purchase Order Item,To be delivered to customer,Toimitetaan asiakkaalle
 DocType: BOM,Scrap Material Cost,Romu ainekustannukset
@@ -2260,8 +2302,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Kohta Variant-asetukset
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Valitse yritys...
 DocType: Leave Control Panel,Leave blank if considered for all departments,tyhjä mikäli se pidetään vaihtoehtona kaikilla osastoilla
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","työsopimuksen tyypit (jatkuva, sopimus, sisäinen jne)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} on pakollinen tuotteelle {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","työsopimuksen tyypit (jatkuva, sopimus, sisäinen jne)"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} on pakollinen tuotteelle {1}
 DocType: Process Payroll,Fortnightly,joka toinen viikko
 DocType: Currency Exchange,From Currency,valuutasta
 DocType: Vital Signs,Weight (In Kilogram),Paino (kilogrammoina)
@@ -2285,7 +2327,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"klikkaa ""muodosta aikataulu"" saadaksesi aikataulun"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Seuraavia aikatauluja poistaessa tapahtui virheitä:
 DocType: Bin,Ordered Quantity,tilattu määrä
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","esim, ""rakenna työkaluja rakentajille"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","esim, ""rakenna työkaluja rakentajille"""
 DocType: Grading Scale,Grading Scale Intervals,Arvosteluasteikko intervallit
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Accounting Entry {2} voidaan tehdä valuutta: {3}
 DocType: Production Order,In Process,prosessissa
@@ -2308,11 +2350,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Veronmaksu
 DocType: Expense Claim Detail,Expense Claim Detail,Kulukorvauksen lisätiedot
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Kolminkertaisesti TOIMITTAJA
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Valitse oikea tili
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Valitse oikea tili
 DocType: Item,Weight UOM,Painoyksikkö
 DocType: Salary Structure Employee,Salary Structure Employee,Palkka rakenne Työntekijän
 DocType: Patient,Blood Group,Veriryhmä
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Odottaa
 DocType: Course,Course Name,Kurssin nimi
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Seuraavat käyttäjät voivat hyväksyä organisaation loma-anomukset
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Toimisto välineistö
@@ -2331,7 +2372,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Hinnat ei näytetä, jos hinnasto ei ole asetettu"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Tarkista toimitustavan maa tai valitse ""Maailmanlaajuinen""."
 DocType: Stock Entry,Total Incoming Value,"Kokonaisarvo, saapuva"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Veloituksen tarvitaan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Veloituksen tarvitaan
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Kellokortit auttaa seurata aikaa, kustannuksia ja laskutusta aktiviteetti tehdä tiimisi"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Ostohinta List
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Toimittajan tuloskortin muuttujien mallipohjat.
@@ -2341,7 +2382,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Maksun täsmäytys
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Valitse vastuuhenkilön nimi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologia
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Maksamattomat yhteensä: {0}
+DocType: Hub Settings,Unregister from Hub,Poista tilisi Hubista
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Maksamattomat yhteensä: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM-sivuston Käyttö
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Työtarjous
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Muodosta hankintapyyntö (MRP) ja tuotantotilaus.
@@ -2353,7 +2395,9 @@
 DocType: Physician Schedule Time Slot,To Time,Aikaan
 DocType: Authorization Rule,Approving Role (above authorized value),Hyväksymisestä Rooli (edellä valtuutettu arvo)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,kredit tilin tulee olla maksutili
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM-rekursio: {0} ei voi olla {2}:n osa tai päinvastoin
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Valitse opiskelijavaihto, joka on pakollinen opiskelijalle"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM-rekursio: {0} ei voi olla {2}:n osa tai päinvastoin
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Valitse hinnasto julkaistaksesi hinnoittelun
 DocType: Production Order Operation,Completed Qty,valmiit yksikkömäärä
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","{0}, vain debet tili voidaan kohdistaa kredit kirjaukseen"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Hinnasto {0} on poistettu käytöstä
@@ -2365,38 +2409,39 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} sarjanumerot tarvitaan Tuotteelle {1}. Olet antanut {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Nykyinen arvostus
 DocType: Item,Customer Item Codes,Asiakkaan nimikekoodit
+DocType: Training Event,Advance,edetä
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,toistuvan uudelleen.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange voitto / tappio
 DocType: Opportunity,Lost Reason,Häviämissyy
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Uusi osoite
 DocType: Quality Inspection,Sample Size,Näytteen koko
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Anna kuitti asiakirja
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Kaikki nimikkeet on jo laskutettu
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Määritä kelvollinen &quot;Case No.&quot;
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',Määritä kelvollinen &quot;Case No.&quot;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"lisää kustannuspaikkoja voidaan tehdä kohdassa ryhmät, mutta pelkät merkinnät voi kohdistaa ilman ryhmiä"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Käyttäjät ja käyttöoikeudet
 DocType: Vehicle Log,VLOG.,Vlogi.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Tuotanto Tilaukset Luotu: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Tuotanto Tilaukset Luotu: {0}
 DocType: Branch,Branch,Sivutoimiala
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tulostus ja brändäys
 DocType: Company,Total Monthly Sales,Kuukausittainen myynti yhteensä
 DocType: Bin,Actual Quantity,kiinteä yksikkömäärä
 DocType: Shipping Rule,example: Next Day Shipping,esimerkiksi: seuraavan päivän toimitus
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Sarjanumeroa {0} ei löydy
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Tilaus on {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Tilaus on {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Maksun aikatauluohjelma
 DocType: Fee Schedule Program,Student Batch,Student Erä
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,"valitse * tabVital Signs&#39;iltä, jos potilas = &#39;{0}&#39; tilaa merkkien_nopeuden alarajan 1 mukaan"
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Tee Student
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Min Grade
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Sinut on kutsuttu yhteistyöhön projektissa {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Lääkäri ei ole käytettävissä {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Sinut on kutsuttu yhteistyöhön projektissa {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Lääkäri ei ole käytettävissä {0}
 DocType: Leave Block List Date,Block Date,estopäivä
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Lisää mukautetun kenttän tilausnimi dokumentointityyppiin {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Toimituksen toimitushuomautus
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Hae nyt
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Hae nyt
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Todellinen määrä {0} / Waiting määrä {1}
 DocType: Purchase Invoice,E-commerce GSTIN,Sähköinen kaupankäynti GSTIN
 DocType: Sales Order,Not Delivered,toimittamatta
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Odotettu päivämäärä ei voi olla ennen tapahtumapäivää
 ,Bank Clearance Summary,pankin tilitysyhteenveto
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","tee ja hallitse (päivä-, viikko- ja kuukausi) sähköpostitiedotteita"
 DocType: Appraisal Goal,Appraisal Goal,arvioinnin tavoite
@@ -2404,12 +2449,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Rakennukset
 DocType: Fee Schedule,Fee Structure,Palkkiojärjestelmä
 DocType: Timesheet Detail,Costing Amount,"kustannuslaskenta, arvomäärä"
-DocType: Student Admission,Application Fee,Hakemusmaksu
+DocType: Student Admission Program,Application Fee,Hakemusmaksu
 DocType: Process Payroll,Submit Salary Slip,Vahvista palkkatosite
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maxiumm alennus Tuote {0} on {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Maxiumm alennus Tuote {0} on {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,tuo massana
 DocType: Sales Partner,Address & Contacts,osoitteet ja yhteystiedot
 DocType: SMS Log,Sender Name,Lähettäjän nimi
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Lajittele kriteerien mukaan
 DocType: POS Profile,[Select],[valitse]
 DocType: Vital Signs,Blood Pressure (diastolic),Verenpaine (diastolinen)
 DocType: SMS Log,Sent To,Lähetetty kenelle
@@ -2418,11 +2464,11 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Seuraava Ota Date ei voi olla menneisyydessä
 DocType: Company,For Reference Only.,vain viitteeksi
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Lääkäri {0} ei ole käytettävissä {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Valitse Erä
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Valitse Erä
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},virheellinen {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-jälkikä-
 DocType: Fee Validity,Reference Inv,Viite Inv
-DocType: Sales Invoice Advance,Advance Amount,ennakko
+DocType: Sales Invoice Advance,Advance Amount,Ennakko
 DocType: Manufacturing Settings,Capacity Planning,kapasiteetin suunnittelu
 DocType: Supplier Quotation,Rounding Adjustment (Company Currency,Pyöristyskorjaus (Company Currency
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,'Aloituspäivä' on pakollinen
@@ -2434,15 +2480,15 @@
 DocType: Normal Test Items,Require Result Value,Vaaditaan tulosarvoa
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,asianumero ei voi olla 0
 DocType: Item,Show a slideshow at the top of the page,Näytä diaesitys sivun yläreunassa
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,BOMs
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,varastoi
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,BOMs
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,varastoi
 DocType: Project Type,Projects Manager,Projektien ylläpitäjä
 DocType: Serial No,Delivery Time,toimitusaika
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,vanhentuminen perustuu
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Nimitys peruutettiin
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Nimitys peruutettiin
 DocType: Item,End of Life,elinkaaren loppu
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,matka
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Ei aktiivisia tai oletus Palkkarakenne löytynyt työntekijä {0} varten kyseisenä päivänä
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,matka
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Ei aktiivisia tai oletus Palkkarakenne löytynyt työntekijä {0} varten kyseisenä päivänä
 DocType: Leave Block List,Allow Users,Salli Käyttäjät
 DocType: Purchase Order,Customer Mobile No,Matkapuhelin
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Toistuva
@@ -2451,12 +2497,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Päivitä kustannukset
 DocType: Item Reorder,Item Reorder,Tuotteen täydennystilaus
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Näytä Palkka Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Varastosiirto
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Varastosiirto
 DocType: Fees,Send Payment Request,Lähetä maksupyyntö
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","määritä toiminnot, käyttökustannukset ja anna toiminnoille oma uniikki numero"
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Tämä asiakirja on yli rajan {0} {1} alkion {4}. Teetkö toisen {3} vasten samalla {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Ole hyvä ja aseta toistuvuustieto vasta lomakkeen tallentamisen jälkeen.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Valitse muutoksen suuruuden tili
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Valitse muutoksen suuruuden tili
 DocType: Purchase Invoice,Price List Currency,"Hinnasto, valuutta"
 DocType: Naming Series,User must always select,Käyttäjän tulee aina valita
 DocType: Stock Settings,Allow Negative Stock,salli negatiivinen varastoarvo
@@ -2476,7 +2522,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Työntekijä
 DocType: Sample Collection,Collected Time,Kerätty aika
 DocType: Company,Sales Monthly History,Myynti Kuukausittainen historia
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Valitse Batch
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Valitse Batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} on kokonaan laskutettu
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Elonmerkit
 DocType: Training Event,End Time,ajan loppu
@@ -2484,16 +2530,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Maksu vähennykset tai tappio
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,"perussopimusehdot, myynti tai osto"
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,tositteen ryhmä
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Haluatko varmasti peruuttaa nimityksen?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Sales Pipeline
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Aseta oletus tilin palkanosa {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,pyydetylle
 DocType: Rename Tool,File to Rename,Uudelleen nimettävä tiedosto
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Valitse BOM varten Tuote rivillä {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Valitse BOM varten Tuote rivillä {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Tilin {0} ei vastaa yhtiön {1} -tilassa Account: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Määriteltyä BOM:ia {0} ei löydy tuotteelle {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,huoltoaikataulu {0} on peruttava ennen myyntitilauksen perumista
+DocType: POS Profile,Applicable for Users,Soveltuu käyttäjille
 DocType: Notification Control,Expense Claim Approved,Kulukorvaus hyväksytty
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Palkka Slip työntekijöiden {0} on jo luotu tällä kaudella
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Palkka Slip työntekijöiden {0} on jo luotu tällä kaudella
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Lääkealan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ostettujen tuotteiden kustannukset
 DocType: Selling Settings,Sales Order Required,Myyntitilaus vaaditaan
@@ -2517,6 +2565,7 @@
 DocType: Offer Letter,Accepted,hyväksytyt
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,organisaatio
 DocType: BOM Update Tool,BOM Update Tool,BOM-päivitystyökalu
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Party-tiliä ei ole määritetty, aseta oletusryhmätili yrityksessä"
 DocType: SG Creation Tool Course,Student Group Name,Opiskelijan Group Name
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Maksujen luominen
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Haluatko varmasti poistaa kaikki tämän yrityksen tapahtumat, päätyedostosi säilyy silti entisellään, tätä toimintoa ei voi peruuttaa"
@@ -2525,29 +2574,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ei voi olla suurempi arvo kuin suunniteltu tuotantomäärä ({2}) tuotannon tilauksessa {3}
 DocType: Shipping Rule,Shipping Rule Label,Toimitustapa otsikko
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Keskustelupalsta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Raaka-aineet ei voi olla tyhjiä
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Ei voinut päivittää hyllyssä, lasku sisältää pudota merenkulku erä."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Raaka-aineet ei voi olla tyhjiä
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Ei voinut päivittää hyllyssä, lasku sisältää pudota merenkulku erä."
 DocType: Lab Test Sample,Lab Test Sample,Lab Test -näyte
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Nopea Päiväkirjakirjaus
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"hintaa ei voi muuttaa, jos BOM liitetty johonkin tuotteeseen"
+DocType: Restaurant,Invoice Series Prefix,Laskujen sarjan etuliite
 DocType: Employee,Previous Work Experience,Edellinen Työkokemus
 DocType: Stock Entry,For Quantity,yksikkömäärään
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Syötä suunniteltu yksikkömäärä tuotteelle {0} rivillä {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Syötä suunniteltu yksikkömäärä tuotteelle {0} rivillä {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} ei ole vahvistettu
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Pyynnöt kohteita.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Erillinen tuotannon tilaus luodaan jokaiselle valmistuneelle tuotteelle
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} on oltava negatiivinen saatavat dokumentissa
 ,Minutes to First Response for Issues,Vastausaikaraportti (ongelmat)
 DocType: Purchase Invoice,Terms and Conditions1,Ehdot ja säännöt 1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,Nimi Instituutin jolle olet luomassa tätä järjestelmää.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,Nimi Instituutin jolle olet luomassa tätä järjestelmää.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","kirjanpidon kirjaus on toistaiseksi jäädytetty, vain alla mainitussa roolissa voi tällä hetkellä kirjata / muokata tiliä"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Tallenna asiakirja ennen huoltoaikataulun muodostusta
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Viimeisin hinta päivitetty kaikissa BOM-paketeissa
 DocType: Fee Schedule,Successful,onnistunut
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projektin tila
 DocType: UOM,Check this to disallow fractions. (for Nos),täppää ellet halua murtolukuja (Nos:iin)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Seuraavat tuotantotilaukset luotiin:
-DocType: Student Admission,Naming Series (for Student Applicant),Nimeäminen Series (opiskelija Hakija)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Seuraavat tuotantotilaukset luotiin:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Nimeäminen Series (opiskelija Hakija)
 DocType: Delivery Note,Transporter Name,kuljetusyritys nimi
 DocType: Authorization Rule,Authorized Value,Valtuutettu Arvo
 DocType: BOM,Show Operations,Näytä Operations
@@ -2571,7 +2621,7 @@
 ,Employees working on a holiday,Virallisena lomapäivänä työskentelevät työntekijät
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Nykyinen
 DocType: Project,% Complete Method,% Täydellinen Menetelmä
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,lääke
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,lääke
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},huollon aloituspäivä ei voi olla ennen sarjanumeron {0} toimitusaikaa
 DocType: Production Order,Actual End Date,todellinen päättymispäivä
 DocType: BOM,Operating Cost (Company Currency),Käyttökustannukset (Company valuutta)
@@ -2589,19 +2639,20 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,hyväksyvä käyttäjä ei voi olla sama kuin käytetyssä säännössä oleva
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Perushinta (varastoyksikössä)
 DocType: SMS Log,No of Requested SMS,Pyydetyn SMS-viestin numero
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Jätä Ilman Pay ei vastaa hyväksyttyä Leave Application kirjaa
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Jätä Ilman Pay ei vastaa hyväksyttyä Leave Application kirjaa
 DocType: Campaign,Campaign-.####,kampanja -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Seuraavat vaiheet
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Ole hyvä ja toimittaa erityisiin kohtiin on paras mahdollinen hinnat
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,tee Lasku
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto lähellä Mahdollisuus 15 päivän jälkeen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,"Ostosopimukset eivät ole sallittuja {0}, koska tulosvastine on {1}."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,"Ostosopimukset eivät ole sallittuja {0}, koska tulosvastine on {1}."
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,end Year
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lyijy%
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,sopimuksen päättymispäivä tulee olla liittymispäivän jälkeen
 DocType: Vital Signs,Nutrition Values,Ravitsemusarvot
 DocType: Lab Test Template,Is billable,On laskutettava
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Sekä &quot;Lääkärien aikataulu&quot; että aika per nimittäminen &quot;on asetettava Dr {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Ulkopuolinen välittäjä / edustaja / agentti / jälleenmyyjä, joka myy yrityksen tavaraa provisiolla."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} ostotilausta vastaan {1}
 DocType: Patient,Patient Demographics,Potilaiden väestötiedot
@@ -2631,7 +2682,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","perusveromallipohja, jota voidaan käyttää kaikkiin ostotapahtumiin. tämä mallipohja voi sisältää listan perusveroista ja myös muita veroja, kuten ""toimitus"", ""vakuutus"", ""käsittely"" jne #### huomaa että tänne määritelty veroprosentti tulee olemaan oletus kaikille **tuotteille**, mikäli **tuotteella** on eri veroprosentti tulee se määritellä **tuotteen vero** taulukossa **tuote** työkalussa. #### sarakkeiden kuvaus 1. laskennan tyyppi: - tämä voi olla **netto yhteensä** (eli summa perusarvosta). - **edellisen rivin summa / määrä ** (kumulatiivisille veroille tai maksuille, mikäli tämän on valittu edellisen rivin vero lasketaan prosentuaalisesti (verotaulukon) mukaan arvomäärästä tai summasta 2. tilin otsikko: tilin tilikirja, johon verot varataan 3. kustannuspaikka: mikäli vero / maksu on tuloa (kuten toimitus) tai kulua tulee se varata kustannuspaikkaa vastaan 4. kuvaus: veron kuvaus (joka tulostetaan laskulla / tositteella) 5. taso: veroprosentti. 6. määrä: veron arvomäärä 7. yhteensä: kumulatiivinen yhteissumma tähän asti. 8. syötä rivi: mikäli käytetään riviä ""edellinen rivi yhteensä"", voit valita rivin numeron, jota käytetään laskelman pohjana 9. pidä vero tai kustannus: tässä osiossa voit määrittää, jos vero / kustannus on pelkkä arvo (ei kuulu summaan) tai pelkästään summaan (ei lisää tuotteen arvoa) tai kumpaakin 10. lisää tai vähennä: voit lisätä tai vähentää veroa"
 DocType: Homepage,Homepage,Kotisivu
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Valitse lääkäri ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',"päivitä tabConsultation set invoice = &#39;{0}&#39;, jos nimi = &#39;{1}&#39;"
 DocType: Purchase Receipt Item,Recd Quantity,RECD Määrä
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Fee Records Luotu - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Luokka Account
@@ -2643,7 +2693,7 @@
 DocType: Asset,Manual,manuaalinen
 DocType: Salary Component Account,Salary Component Account,Palkanosasta Account
 DocType: Global Defaults,Hide Currency Symbol,piilota valuuttasymbooli
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","esim, pankki, kassa, luottokortti"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","esim, pankki, kassa, luottokortti"
 DocType: Lead Source,Source Name,Source Name
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Normaali lepovaihe aikuispotilailla on noin 120 mmHg systolista ja 80 mmHg diastolista, lyhennettynä &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,hyvityslasku
@@ -2662,16 +2712,16 @@
 DocType: Patient,Occupation,Ammatti
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Rivi {0}: Aloitus on ennen Päättymispäivä
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),yhteensä (yksikkömäärä)
-DocType: Sales Invoice,This Document,Tämä asiakirja
 DocType: Installation Note Item,Installed Qty,asennettu yksikkömäärä
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,"Tämä voi johtua siitä, että joitain virheellisiä sähköpostiosoitteita on"
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Lisäsit
 DocType: Purchase Taxes and Charges,Parenttype,Päätyyppi
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Harjoitustulos
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Harjoitustulos
 DocType: Purchase Invoice,Is Paid,On maksettu
 DocType: Salary Structure,Total Earning,Ansiot yhteensä
 DocType: Purchase Receipt,Time at which materials were received,Saapumisaika
 DocType: Stock Ledger Entry,Outgoing Rate,lähtevä taso
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Organisaation sivutoimialamalline
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Organisaation sivutoimialamalline
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,tai
 DocType: Sales Order,Billing Status,Laskutus tila
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Ilmoita ongelma
@@ -2686,7 +2736,8 @@
 DocType: Notification Control,Sales Order Message,"Myyntitilaus, viesti"
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Aseta oletusarvot kuten yritys, valuutta, kuluvan tilikausi jne"
 DocType: Payment Entry,Payment Type,Maksun tyyppi
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Valitse Erä momentille {0}. Pysty löytämään yhden erän, joka täyttää tämän vaatimuksen"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Valitse Erä momentille {0}. Pysty löytämään yhden erän, joka täyttää tämän vaatimuksen"
+DocType: Hub Category,Parent Category,Vanhemman luokka
 DocType: Process Payroll,Select Employees,Valitse työntekijät
 DocType: Opportunity,Potential Sales Deal,Potentiaaliset Myynti Deal
 DocType: Complaint,Complaints,valitukset
@@ -2723,7 +2774,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),pakkauksen tunnistus toimitukseen (tulostus)
 DocType: Bin,Reserved Quantity,Varattu Määrä
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Anna voimassa oleva sähköpostiosoite
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Valitse kohde ostoskoriin
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Valitse kohde ostoskoriin
 DocType: Landed Cost Voucher,Purchase Receipt Items,Saapumistositteen nimikkeet
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,muotojen muokkaus
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,arrear
@@ -2733,15 +2784,15 @@
 DocType: Payment Request,Amount in customer's currency,Summa asiakkaan valuutassa
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Toimitus
 DocType: Stock Reconciliation Item,Current Qty,nykyinen yksikkömäärä
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Lisää toimittajat
+DocType: Restaurant Menu,Restaurant Menu,Ravintola Valikko
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Taaksepäin
 DocType: Appraisal Goal,Key Responsibility Area,Key Vastuu Area
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Student Erät avulla voit seurata läsnäoloa, arvioinnit ja palkkiot opiskelijoille"
 DocType: Payment Entry,Total Allocated Amount,Yhteensä osuutensa
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Aseta oletus varaston osuus investointikertymämenetelmän
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Aseta oletus varaston osuus investointikertymämenetelmän
 DocType: Item Reorder,Material Request Type,Hankintapyynnön tyyppi
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural Päiväkirjakirjaus palkkojen välillä {0} ja {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStoragen on täynnä, ei tallentanut"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStoragen on täynnä, ei tallentanut"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Rivi {0}: UOM Muuntokerroin on pakollinen
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Huoneen kapasiteetti
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Viite
@@ -2772,7 +2823,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Voitto / tappio Omaisuudenhoitoalan Hävittäminen
 DocType: Task,Depends on Tasks,Riippuu Tehtävät
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,hallitse asiakasryhmäpuuta
-DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Liitteet voidaan osoittaa toiminnon ottamatta ostoskorin
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,"Liitteet voidaan näyttää ilman, että ostoskoria otetaan käyttöön."
 DocType: Normal Test Items,Result Value,Tulosarvo
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,uuden kustannuspaikan nimi
@@ -2780,16 +2831,18 @@
 DocType: Project,Task Completion,Task Täydennys
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Not in Stock
 DocType: Appraisal,HR User,HR käyttäjä
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Netto ilman veroja ja kuluja
-apps/erpnext/erpnext/hooks.py +129,Issues,Tukipyynnöt
+apps/erpnext/erpnext/hooks.py +138,Issues,Tukipyynnöt
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Tilan tulee olla yksi {0}:sta
 DocType: Sales Invoice,Debit To,debet kirjaus kohteeseen
+DocType: Restaurant Menu Item,Restaurant Menu Item,Ravintola-valikkokohta
 DocType: Delivery Note,Required only for sample item.,vain demoerä on pyydetty
 DocType: Stock Ledger Entry,Actual Qty After Transaction,todellinen yksikkömäärä tapahtuman jälkeen
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Ei palkkakuitin välillä havaittu {0} ja {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Ei palkkakuitin välillä havaittu {0} ja {1}
 ,Pending SO Items For Purchase Request,"Ostettavat pyyntö, odottavat myyntitilaukset"
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Opiskelijavalinta
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} on poistettu käytöstä
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Opiskelijavalinta
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} on poistettu käytöstä
 DocType: Supplier,Billing Currency,Laskutus Valuutta
 DocType: Sales Invoice,SINV-RET-,SINV-jälkikä-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,erittäin suuri
@@ -2812,6 +2865,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Vierailujen määrä vaaditaan
 DocType: Stock Settings,Default Valuation Method,oletus arvomenetelmä
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,Maksu
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Päivitys käynnissä. Voi kestää hetken.
 DocType: Vehicle Log,Fuel Qty,polttoaineen määrä
 DocType: Production Order Operation,Planned Start Time,Suunniteltu aloitusaika
 DocType: Course,Assessment,Arviointi
@@ -2827,7 +2881,7 @@
 DocType: Price List,Price List Master,Hinnasto valvonta
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,kaikki myyntitapahtumat voidaan kohdistaa useammalle ** myyjälle ** tavoitteiden asettamiseen ja seurantaan
 ,S.O. No.,Myyntitilaus nro
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Luo asiakkuus vihjeestä {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Luo asiakkuus vihjeestä {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Valitse potilas
 DocType: Price List,Applicable for Countries,Sovelletaan Maat
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Parametrin nimi
@@ -2858,27 +2912,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,Toimittaja Laskun tiedot
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Kustannus- / erotuksen tili ({0}) tulee olla 'tuloslaskelma' tili
 DocType: Project,Copied From,kopioitu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Nimivirhe: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Puute
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Nimivirhe: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,Puute
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} ei liittynyt {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,työntekijän {0} osallistuminen on jo merkitty
 DocType: Packing Slip,If more than one package of the same type (for print),mikäli useampi saman tyypin pakkaus (tulostus)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Aseta oletusasiakas ravintolaasetuksissa
 ,Salary Register,Palkka Register
 DocType: Warehouse,Parent Warehouse,Päävarasto
 DocType: C-Form Invoice Detail,Net Total,netto yhteensä
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Oletuksena BOM ei löytynyt Tuote {0} ja Project {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Oletuksena BOM ei löytynyt Tuote {0} ja Project {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Määritä eri laina tyypit
 DocType: Bin,FCFS Rate,FCFS taso
 DocType: Payment Reconciliation Invoice,Outstanding Amount,odottava arvomäärä
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Aika (min)
 DocType: Project Task,Working,Työskennellä
 DocType: Stock Ledger Entry,Stock Queue (FIFO),varastojono (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Talousvuosi
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Talousvuosi
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} ei kuulu yritykseen {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,"Ei voitu ratkaista kriteerien pisteet-funktiota {0}. Varmista, että kaava on kelvollinen."
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Cost kuin
 DocType: Healthcare Settings,Out Patient Settings,Out potilasasetukset
 DocType: Account,Round Off,pyöristys
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Määrä on positiivinen
 ,Requested Qty,pyydetty yksikkömäärä
 DocType: Tax Rule,Use for Shopping Cart,Käytä ostoskoriin
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Arvo {0} attribuutille {1} ei ole voimassa olevien kohdeattribuuttien luettelossa tuotteelle {2}
@@ -2887,7 +2943,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","maksut jaetaan suhteellisesti tuotteiden yksikkömäärän tai arvomäärän mukaan, määrityksen perusteella"
 DocType: Maintenance Visit,Purposes,Tarkoituksiin
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,vähintään yhdellä tuottella tulee olla negatiivinen määrä palautus asiakirjassa
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Lisää kursseja
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","tuote {0} kauemmin kuin mikään saatavillaoleva työaika työasemalla {1}, hajoavat toiminta useiksi toiminnoiksi"
 ,Requested,Pyydetty
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Ei huomautuksia
@@ -2899,6 +2954,8 @@
 DocType: Employee Loan,Repaid/Closed,Palautettava / Suljettu
 DocType: Item,Total Projected Qty,Arvioitu kokonaismäärä
 DocType: Monthly Distribution,Distribution Name,"toimitus, nimi"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Toimittaja&gt; Toimittajan tyyppi
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Arviointikurssia ei ole löytynyt {0}, joka on velvollinen tekemään kirjanpitoarvot {1} {2}. Jos kohde käsitellään {1}: n nollaarvostuskorkoineen, mainitse {1} kohtaan taulukossa. Muussa tapauksessa luo saapuva osakekauppa kohteen kohtaan tai mainitse arvonmäärityskorvaus Item-tietueessa ja yritä sitten lähettää tai peruuttaa tämä merkintä"
 DocType: Course,Course Code,Course koodi
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Tuotteelle {0} laatutarkistus
 DocType: POS Settings,Use POS in Offline Mode,Käytä POS Offline-tilassa
@@ -2909,14 +2966,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,hallitse aluepuuta
 DocType: Journal Entry Account,Sales Invoice,Myyntilasku
 DocType: Journal Entry Account,Party Balance,Osatase
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,Valitse käytä alennusta
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Valitse käytä alennusta
 DocType: Company,Default Receivable Account,oletus saatava tili
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,tee pankkikirjaus maksetusta kokonaispalkasta edellä valituin kriteerein
 DocType: Physician,Physician Schedule,Lääkäri Aikataulu
 DocType: Purchase Invoice,Deemed Export,Katsottu vienti
 DocType: Stock Entry,Material Transfer for Manufacture,Varastosiirto tuotantoon
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,"alennusprosenttia voi soveltaa yhteen, tai useampaan hinnastoon"
-DocType: Purchase Invoice,Half-yearly,6 kk
+DocType: Subscription,Half-yearly,6 kk
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Kirjanpidon varastotapahtuma
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Olet jo arvioitu arviointikriteerit {}.
@@ -2945,13 +3002,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,erittäin pieni
 DocType: Company,Standard Template,Standard Template
 DocType: Training Event,Theory,Teoria
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Varoitus: Pyydetty materiaalin määrä alittaa minimi hankintaerän
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Varoitus: Pyydetty materiaalin määrä alittaa minimi hankintaerän
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,tili {0} on jäädytetty
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"juridinen hlö / tytäryhtiö, jolla on erillinen tilikartta kuuluu organisaatioon"
 DocType: Payment Request,Mute Email,Mute Sähköposti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Ruoka, Juoma ja Tupakka"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Voi vain maksun vastaan laskuttamattomia {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,provisio taso ei voi olla suurempi kuin 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Voi vain maksun vastaan laskuttamattomia {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,provisio taso ei voi olla suurempi kuin 100
 DocType: Stock Entry,Subcontract,alihankinta
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Kirjoita {0} ensimmäisen
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Ei vastauksia
@@ -2969,10 +3026,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,väritä
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Assessment Plan Criteria
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Estää ostotilaukset
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,herkkä
 DocType: Patient Appointment,Scheduled,Aikataulutettu
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Tarjouspyyntö.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Aseta henkilöstön nimeämisjärjestelmä henkilöresursseihin&gt; HR-asetukset
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Valitse nimike joka ei ole varastonimike mutta on myyntinimike. Toista samaa tuotepakettia ei saa olla.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Valitse asiakas
 DocType: Student Log,Academic,akateeminen
 DocType: Patient,Personal and Social History,Henkilökohtainen ja sosiaalinen historia
 DocType: Fee Schedule,Fee Breakup for each student,Palkkioerot kunkin opiskelijan osalta
@@ -2982,7 +3040,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Arvostustaso
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,diesel-
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,"Hinnasto, valuutta ole valittu"
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,"Hinnasto, valuutta ole valittu"
 apps/erpnext/erpnext/config/healthcare.py +46,Results,tulokset
 ,Student Monthly Attendance Sheet,Student Kuukauden Läsnäolo Sheet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Työntekijällä {0} on jo {1} hakemus {2} ja {3} välilltä
@@ -2997,7 +3055,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,hallitse myyntikumppaneita
 DocType: Quality Inspection,Inspection Type,tarkistus tyyppi
 DocType: Fee Validity,Visited yet,Käyn vielä
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Varastoissa nykyisten tapahtumaa ei voida muuntaa ryhmään.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Varastoissa nykyisten tapahtumaa ei voida muuntaa ryhmään.
 DocType: Assessment Result Tool,Result HTML,tulos HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Vanhemee
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Lisää Opiskelijat
@@ -3024,7 +3082,7 @@
 DocType: Healthcare Settings,Result Printed,Tulos tulostettu
 DocType: Asset Category Account,Depreciation Expense Account,Poistokustannusten tili
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Koeaika
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Näytä {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Näytä {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Vain jatkosidokset ovat sallittuja tapahtumassa
 DocType: Expense Claim,Expense Approver,Kulukorvausten hyväksyjä
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Rivi {0}: Advance vastaan asiakkaan on luotto
@@ -3035,7 +3093,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Aikajana
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Kurssin aikataulut poistettu:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Lokit ylläpitämiseksi sms toimituksen tila
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Aseta myyntikohteesi
 DocType: Accounts Settings,Make Payment via Journal Entry,Tee Maksu Päiväkirjakirjaus
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,painettu
 DocType: Item,Inspection Required before Delivery,Tarkastus Pakollinen ennen Delivery
@@ -3043,7 +3100,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Odottaa Aktiviteetit
 DocType: Patient Appointment,Reminded,muistutti
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Organisaation
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Organisaation
 DocType: Fee Component,Fees Category,Maksut Luokka
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Syötä lievittää päivämäärä.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,pankkipääte
@@ -3055,7 +3112,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Täydennystilaustaso
 DocType: Company,Chart Of Accounts Template,Tilikartta Template
 DocType: Attendance,Attendance Date,"osallistuminen, päivä"
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Hinta päivitetty {0} in hinnasto {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Hinta päivitetty {0} in hinnasto {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Palkkaerittelyn kohdistetut ansiot ja vähennykset
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,tilin alasidoksia ei voi muuttaa tilikirjaksi
 DocType: Purchase Invoice Item,Accepted Warehouse,hyväksytyt varasto
@@ -3071,9 +3128,10 @@
 ,Employee Birthday,Työntekijän syntymäpäivä
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Erä Läsnäolo Tool
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,Raja ylitetty
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Suunniteltu ylöspäin
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Pääomasijoitus
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Lukukaudessa tällä &quot;Lukuvuosi {0} ja&quot; Term Name &#39;{1} on jo olemassa. Ole hyvä ja muokata näitä merkintöjä ja yritä uudelleen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Koska on olemassa nykyisiä tapahtumia vastaan kohde {0}, et voi muuttaa arvoa {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Koska on olemassa nykyisiä tapahtumia vastaan kohde {0}, et voi muuttaa arvoa {1}"
 DocType: UOM,Must be Whole Number,täytyy olla kokonaisluku
 DocType: Leave Control Panel,New Leaves Allocated (In Days),uusi poistumisten kohdennus (päiviä)
 DocType: Purchase Invoice,Invoice Copy,laskukopion
@@ -3083,7 +3141,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,laskun numero
 DocType: Shopping Cart Settings,Orders,Tilaukset
 DocType: Employee Leave Approver,Leave Approver,Poissaolojen hyväksyjä
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Valitse erä
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Valitse erä
 DocType: Assessment Group,Assessment Group Name,Assessment Group Name
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Tuotantoon siirretyt materiaalit
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Käyttäjä, jolla on ""kustannusten hyväksyjä"" rooli"
@@ -3098,7 +3156,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Kauden sulkukirjaus
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Valitse osasto ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,olemassaolevien tapahtumien kustannuspaikkaa ei voi muuttaa ryhmäksi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Määrä {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Määrä {0} {1} {2} {3}
 DocType: Account,Depreciation,arvonalennus
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),toimittaja/toimittajat
 DocType: Employee Attendance Tool,Employee Attendance Tool,Työntekijän läsnäolo Tool
@@ -3109,10 +3167,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,Maksu merkinnät {0} ovat un sidottu
 DocType: GL Entry,Voucher No,Tosite nro
 ,Lead Owner Efficiency,Lyijy Omistaja Tehokkuus
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Suosituin
 DocType: Leave Allocation,Leave Allocation,Vapaan kohdistus
 DocType: Payment Request,Recipient Message And Payment Details,Vastaanottaja Message ja maksutiedot
 DocType: Training Event,Trainer Email,Trainer Sähköposti
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Hankintapyyntöjä luotu {0}
+DocType: Restaurant Reservation,No of People,Ihmisten määrä
 DocType: Production Planning Tool,Include sub-contracted raw materials,Sisällytä alihankintaa raaka
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Sopimusehtojen mallipohja
 DocType: Purchase Invoice,Address and Contact,Osoite ja yhteystiedot
@@ -3121,10 +3181,11 @@
 DocType: Supplier,Last Day of the Next Month,seuraavan kuukauden viimeinen päivä
 DocType: Support Settings,Auto close Issue after 7 days,Auto lähellä Issue 7 päivän jälkeen
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Vapaita ei voida käyttää ennen {0}, koska käytettävissä olevat vapaat on jo siirretty eteenpäin jaksolle {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),huom: viitepäivä huomioiden asiakkaan luottoraja ylittyy {0} päivää
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),huom: viitepäivä huomioiden asiakkaan luottoraja ylittyy {0} päivää
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Hakija
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL RECIPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,Kertyneiden poistojen tili
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Tämä sähköposti on automaattinen
 DocType: Stock Settings,Freeze Stock Entries,jäädytä varaston kirjaukset
 DocType: Program Enrollment,Boarding Student,lennolle Student
 DocType: Asset,Expected Value After Useful Life,Odotusarvo jälkeen käyttöiän
@@ -3132,7 +3193,7 @@
 DocType: Activity Cost,Billing Rate,Laskutus taso
 ,Qty to Deliver,Toimitettava yksikkömäärä
 ,Stock Analytics,Varastoanalytiikka
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Toimintaa ei voi jättää tyhjäksi
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Toimintaa ei voi jättää tyhjäksi
 DocType: Maintenance Visit Purpose,Against Document Detail No,Dokumentin yksityiskohta nro kohdistus
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Osapuoli tyyppi on pakollinen
 DocType: Quality Inspection,Outgoing,Lähtevä
@@ -3154,7 +3215,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Valitse opiskelijat manuaalisesti Toiminto perustuu ryhmän
 DocType: Journal Entry,User Remark,Käyttäjä huomautus
 DocType: Lead,Market Segment,Market Segment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Maksettu summa ei voi olla suurempi kuin koko negatiivinen jäljellä {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Maksettu summa ei voi olla suurempi kuin koko negatiivinen jäljellä {0}
 DocType: Supplier Scorecard Period,Variables,muuttujat
 DocType: Employee Internal Work History,Employee Internal Work History,työntekijän sisäinen työhistoria
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),sulku (dr)
@@ -3183,21 +3244,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Liity sähköpostilistalle
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Tili {2} ei kuulu yhtiön {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Hankintapyyntö {0} on peruttu tai keskeytetty
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Vapaiden hallinta
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Vapaiden hallinta
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,tilin ryhmä
 DocType: Sales Order,Fully Delivered,täysin toimitettu
 DocType: Lead,Lower Income,matala tulo
+DocType: Restaurant Order Entry,Current Order,Nykyinen tilaus
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Lähde- ja kohdevarasto eivät voi olla samat rivillä {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Erotuksen tili tulee olla vastaavat/vastattavat tili huomioiden, että varaston täsmäytys vaatii aloituskirjauksen"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Maksettu summa ei voi olla suurempi kuin lainan määrä {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Siirry kohtaan Ohjelmat
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Ostotilauksen numero vaaditaan tuotteelle {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Tuotantotilaus ei luonut
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Tuotantotilaus ei luonut
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',Aloituspäivän tulee olla ennen päättymispäivää
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Ei voida muuttaa asemaa opiskelija {0} liittyy opiskelijavalinta {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Ei voida muuttaa asemaa opiskelija {0} liittyy opiskelijavalinta {1}
 DocType: Asset,Fully Depreciated,täydet poistot
 ,Stock Projected Qty,ennustettu varaston yksikkömäärä
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},asiakas {0} ei kuulu projektiin {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},asiakas {0} ei kuulu projektiin {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Merkitty Läsnäolo HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Lainaukset ovat ehdotuksia, tarjouksia olet lähettänyt asiakkaille"
 DocType: Sales Order,Customer's Purchase Order,Asiakkaan Ostotilaus
@@ -3208,8 +3270,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Aseta määrä Poistot varatut
 DocType: Supplier Scorecard Period,Calculations,Laskelmat
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Arvo tai yksikkömäärä
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Productions Tilaukset ei voida nostaa varten:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Productions Tilaukset ei voida nostaa varten:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Minuutti
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Aseta Naming-sarja {0} asetukseksi Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Invoice,Purchase Taxes and Charges,Oston verot ja maksut
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Siirry toimittajiin
 ,Qty to Receive,Vastaanotettava yksikkömäärä
@@ -3222,7 +3285,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Kredit tilin on oltava tase tili
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,kaikki toimittajatyypit
 DocType: Global Defaults,Disable In Words,Poista In Sanat
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"tuotekoodi vaaditaan, sillä tuotetta ei numeroida automaattisesti"
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,"tuotekoodi vaaditaan, sillä tuotetta ei numeroida automaattisesti"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Tarjous {0} ei ole tyyppiä {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,"huoltoaikataulu, tuote"
 DocType: Sales Order,%  Delivered,% toimitettu
@@ -3244,23 +3307,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Avaa oman pääoman tase
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,sovinto
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,jäljellä oleva
 DocType: Appraisal,Appraisal,Arvioinnit
 DocType: Purchase Invoice,GST Details,GST-tiedot
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},Sähköposti lähetetään toimittaja {0}
+DocType: Item,Default Sales Unit of Measure,Oletusmyyntiyksikkö
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Päivä toistetaan
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Valtuutettu allekirjoitus
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Vapaan hyväksyjä tulee olla yksi {0}:sta
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Luo palkkioita
-DocType: Hub Settings,Seller Email,Myyjä sähköposti
 DocType: Project,Total Purchase Cost (via Purchase Invoice),hankintakustannusten kokonaismäärä (ostolaskuista)
 DocType: Training Event,Start Time,aloitusaika
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Valitse yksikkömäärä
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Valitse yksikkömäärä
 DocType: Customs Tariff Number,Customs Tariff Number,Tullitariffinumero
 DocType: Patient Appointment,Patient Appointment,Potilaan nimittäminen
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,hyväksyvä rooli ei voi olla sama kuin käytetyssä säännössä oleva
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Peru tämän sähköpostilistan tilaus
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Peru tämän sähköpostilistan tilaus
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Hanki Toimittajat
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} ei löydy kohdasta {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Siirry kursseihin
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Viesti lähetetty
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Huomioon lapsen solmuja ei voida asettaa Ledger
@@ -3273,11 +3339,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Tuotantoon siirretyt materiaalit
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Tiliä {0} ei löydy
 DocType: Project,Project Type,projektin tyyppi
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Tätä tehtävää varten on tehtävä lapsesi tehtävä. Et voi poistaa tätä tehtävää.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,tavoite yksikkömäärä tai tavoite arvomäärä vaaditaan
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,vaihtelevien aktiviteettien kustannukset
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Asetus Tapahtumat {0}, koska työntekijä kiinnitetty alla Sales Henkilöt ei ole User ID {1}"
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Ei enää tuloksia
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,vaihtelevien aktiviteettien kustannukset
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Tapahtuma asetettu arvoon {0}, koska myyntihenkilöön liitetty työntekijä ei omista käyttäjätunnusta {1}"
 DocType: Timesheet,Billing Details,Laskutustiedot
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Lähde ja kohde varasto on oltava eri
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Lähde ja kohde varasto on oltava eri
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},ei ole sallittua päivittää yli {0} vanhoja varastotapahtumia
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,täysin laskutettu
@@ -3303,7 +3371,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Sähköinen tilisiirto
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Tarkista kaikki
 DocType: Vehicle Log,Invoice Ref,lasku Ref
-DocType: Purchase Order,Recurring Order,Toistuvat Order
 DocType: Company,Default Income Account,oletus tulotili
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Asiakasryhmä / asiakas
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed tilikausiin voitto / tappio (luotto)
@@ -3317,9 +3384,9 @@
 DocType: Patient,A Negative,Negatiivinen
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Ei voi muuta osoittaa.
 DocType: Lead,From Customer,asiakkaasta
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Pyynnöt
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Pyynnöt
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Tuote
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,erissä
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,erissä
 DocType: Project,Total Costing Amount (via Time Logs),Kustannuslaskenta arvomäärä yhteensä (aikaloki)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Tee maksujen aikataulu
 DocType: Purchase Order Item Supplied,Stock UOM,Varastoyksikkö
@@ -3343,7 +3410,7 @@
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Vapaat ja lomat
 DocType: School Settings,Current Academic Term,Nykyinen lukukaudessa
 DocType: Sales Order,Not Billed,Ei laskuteta
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Molempien varastojen tulee kuulua samalle organisaatiolle
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Molempien varastojen tulee kuulua samalle organisaatiolle
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,yhteystietoja ei ole lisätty
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,"Kohdistetut kustannukset, arvomäärä"
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Laskut esille Toimittajat.
@@ -3352,7 +3419,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,alennus arvomäärä
 DocType: Purchase Invoice,Return Against Purchase Invoice,"ostolasku, palautuksen kohdistus"
 DocType: Item,Warranty Period (in days),Takuuaika (päivinä)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',päivitä `tabPatient Appointment` set sales_invoice = &#39;{0}&#39; missä nimi = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Suhde Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Liiketoiminnan nettorahavirta
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Nimike 4
@@ -3361,8 +3427,8 @@
 DocType: Journal Entry Account,Journal Entry Account,päiväkirjakirjaus tili
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student Group
 DocType: Shopping Cart Settings,Quotation Series,"Tarjous, sarjat"
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Samanniminen nimike on jo olemassa ({0}), vaihda nimikeryhmän nimeä tai nimeä nimike uudelleen"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Valitse asiakas
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Samanniminen nimike on jo olemassa ({0}), vaihda nimikeryhmän nimeä tai nimeä nimike uudelleen"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Valitse asiakas
 DocType: C-Form,I,minä
 DocType: Company,Asset Depreciation Cost Center,Poistojen kustannuspaikka
 DocType: Sales Order Item,Sales Order Date,"Myyntitilaus, päivä"
@@ -3371,6 +3437,7 @@
 DocType: Assessment Plan,Assessment Plan,arviointi Plan
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Asiakas {0} luodaan.
 DocType: Stock Settings,Limit Percent,raja Prosenttia
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,"Tällä hetkellä ei varastossa,"
 ,Payment Period Based On Invoice Date,Maksuaikaa perustuu laskun päiväykseen
 DocType: Sample Collection,No. of print,Tulosteiden määrä
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},valuuttakurssi puuttuu {0}
@@ -3426,13 +3493,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Yhteensä vähentäminen - Lainan takaisinmaksu
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,nykyinen BOM ja uusi BOM ei voi olla samoja
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Palkka Slip ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Palkka Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Eläkkeellesiirtymispäivän on oltava työsuhteen aloituspäivää myöhemmin
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Oli virheitä aikataulutus kurssin:
 DocType: Sales Invoice,Against Income Account,tulotilin kodistus
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% toimitettu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Nimikkeen {0}: tilattu yksikkömäärä {1} ei voi olla pienempi kuin pienin tilaus yksikkömäärä {2} (määritetty nimikkeelle)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Nimikkeen {0}: tilattu yksikkömäärä {1} ei voi olla pienempi kuin pienin tilaus yksikkömäärä {2} (määritetty nimikkeelle)
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,"toimitus kuukaudessa, prosenttiosuus"
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Ole hyvä ja kirjaudu sisään toisena käyttäjänä.
 DocType: Territory,Territory Targets,Aluetavoite
 DocType: Delivery Note,Transporter Info,kuljetuksen info
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Aseta oletus {0} in Company {1}
@@ -3440,13 +3508,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Sama toimittaja on syötetty useita kertoja
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Bruttotuottoprosentin / tappio
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Tuote ostotilaus toimitettu
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Yrityksen nimeä ei voi Company
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Yrityksen nimeä ei voi Company
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Tulosteotsakkeet mallineille
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Tulostus, mallipohjan otsikot esim, proformalaskuun"
 DocType: Program Enrollment,Walking,Kävely
 DocType: Student Guardian,Student Guardian,Student Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Arvotyypin maksuja ei voi merkata sisältyviksi
 DocType: POS Profile,Update Stock,Päivitä varasto
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,liittymässä
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Erilaiset mittayksiköt voivat johtaa virheellisiin (kokonais) painoarvoihin. Varmista, että joka kohdassa käytetään samaa mittayksikköä."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM taso
 DocType: Asset,Journal Entry for Scrap,Journal Entry for Romu
@@ -3494,15 +3563,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","järjestelmäkäyttäjä (kirjautuminen) tunnus, mikäli annetaan siitä tulee oletus kaikkiin HR muotoihin"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1}:stä
 DocType: Task,depends_on,riippuu
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Joudut päivittämään viimeisimmän hinnan kaikkiin Bill of Materials -asiakirjoihin. Voi kestää muutaman minuutin.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Joudut päivittämään viimeisimmän hinnan kaikkiin Bill of Materials -asiakirjoihin. Voi kestää muutaman minuutin.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nimi uusi tili. Huomautus: Älä luo asiakastilejä ja Toimittajat
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,"maa työkalu, oletus osoite, mallipohja"
 DocType: Sales Order Item,Supplier delivers to Customer,Toimittaja toimittaa Asiakkaalle
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) on loppunut
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},erä- / viitepäivä ei voi olla {0} jälkeen
+,Sales Payment Summary,Myyntimaksun yhteenveto
+DocType: Restaurant,Restaurant,Ravintola
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},erä- / viitepäivä ei voi olla {0} jälkeen
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,tietojen tuonti ja vienti
 DocType: Patient,Account Details,tilin tiedot
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Ei opiskelijat Todettu
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Ei opiskelijat Todettu
 DocType: Medical Department,Medical Department,Lääketieteen osasto
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Toimittajan tuloskortin pisteytyskriteerit
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Laskun tositepäivä
@@ -3513,7 +3584,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Valitse tositepäivä ennen osapuolta
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Ylläpitosopimus ei ole voimassa
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Valitse Lainaukset
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Valitse Lainaukset
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Määrä Poistot varatut ei voi olla suurempi kuin kokonaismäärä Poistot
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,tee huoltokäynti
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,"Ota yhteyttä käyttäjään, jolla on myynninhallinnan valvojan rooli {0}"
@@ -3521,7 +3592,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,yrityksen valvonta (ei asiakas tai toimittaja)
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Tämä perustuu läsnäolo tämän Student
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Ei opiskelijat
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Lisätä kohteita tai avata koko lomakkeen
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Lisätä kohteita tai avata koko lomakkeen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,lähete {0} tulee perua ennen myyntilauksen perumista
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Siirry Käyttäjiin
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Maksettu arvomäärä + poistotilin summa ei voi olla suurempi kuin kokonaissumma
@@ -3541,37 +3612,40 @@
 DocType: Fee Schedule,Fee Schedule,Fee aikataulu
 DocType: Hub Settings,Publish Availability,Julkaise Saatavuus
 DocType: Company,Create Chart Of Accounts Based On,Luo tilikartta perustuu
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Muuntaminen ei ole mahdollista ryhmälle. Lapsi tehtävät ovat olemassa.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Syntymäpäivä ei voi olla tämän päivän jälkeen
 ,Stock Ageing,Varaston vanheneminen
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Opiskelija {0} on olemassa vastaan opiskelijahakijaksi {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Pyöristyskorjaus (yrityksen valuutta)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Tuntilomake
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Tuntilomake
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' on poistettu käytöstä
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Aseta avoimeksi
 DocType: Cheque Print Template,Scanned Cheque,Skannattu Shekki
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Lähetä sähköposti yhteyshenkilöille kun tapahtuma vahvistetaan.
-DocType: Timesheet,Total Billable Amount,Yhteensä Billable Määrä
+DocType: Timesheet,Total Billable Amount,Laskutettava summa yhteensä
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Nimike 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Tilauksen merkintä
 DocType: Purchase Order,Customer Contact Email,Asiakas Sähköpostiosoite
 DocType: Warranty Claim,Item and Warranty Details,Kohta ja takuu Tietoja
 DocType: Sales Team,Contribution (%),panostus (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,huom: maksukirjausta ei synny sillä 'kassa- tai pankkitiliä' ei ole määritetty
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Hanke {0} on jo olemassa
 DocType: Medical Department,Nursing User,Hoitotyöntekijä
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Vastuut
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Tämän noteerauksen voimassaoloaika on päättynyt.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Tämän noteerauksen voimassaoloaika on päättynyt.
 DocType: Expense Claim Account,Expense Claim Account,Matkakorvauslomakkeet Account
 DocType: Accounts Settings,Allow Stale Exchange Rates,Salli vanhentuneet kurssit
 DocType: Sales Person,Sales Person Name,Myyjän nimi
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Syötä taulukkoon vähintään yksi lasku
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Lisää käyttäjiä
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Lisää käyttäjiä
 DocType: POS Item Group,Item Group,Tuoteryhmä
 DocType: Item,Safety Stock,Varmuusvarasto
 DocType: Healthcare Settings,Healthcare Settings,Terveydenhuollon asetukset
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Progress% tehtävään ei voi olla enemmän kuin 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Progress% tehtävään ei voi olla enemmän kuin 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Ennen täsmäytystä
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}:lle
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Lisätyt verot ja maksut (yrityksen valuutassa)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"tuotteen vero, rivi {0} veron tyyppi tulee määritellä (tulo, kulu, veloitettava)"
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"tuotteen vero, rivi {0} veron tyyppi tulee määritellä (tulo, kulu, veloitettava)"
 DocType: Sales Order,Partly Billed,Osittain Laskutetaan
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Kohta {0} on oltava käyttö- omaisuuserän
 DocType: Item,Default BOM,oletus BOM
@@ -3587,6 +3661,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,Muuttuja
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,lähetteestä
 DocType: Student,Student Email Address,Student Sähköpostiosoite
+DocType: Item,Hub Warehouse,Hub-varasto
 DocType: Physician Schedule Time Slot,From Time,ajasta
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Varastossa:
 DocType: Notification Control,Custom Message,Mukautettu viesti
@@ -3594,9 +3669,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,kassa tai pankkitili vaaditaan maksujen kirjaukseen
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Student Osoite
 DocType: Purchase Invoice,Price List Exchange Rate,valuuttakurssi
+DocType: POS Profile,POS Profile Name,POS-profiilin nimi
 DocType: Purchase Invoice Item,Rate,Hinta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,harjoitella
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Osoite Nimi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Osoite Nimi
 DocType: Stock Entry,From BOM,Osaluettelolta
 DocType: Assessment Code,Assessment Code,arviointi koodi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,perustiedot
@@ -3610,11 +3686,12 @@
 DocType: Salary Slip,Salary Structure,Palkkarakenne
 DocType: Account,Bank,pankki
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,lentoyhtiö
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Varasto-otto
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Varasto-otto
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Virhe aiheutui toistuvan luomisen aikana
 DocType: Material Request Item,For Warehouse,Varastoon
 DocType: Employee,Offer Date,Työsopimusehdotuksen päivämäärä
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Lainaukset
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Olet offline-tilassa. Et voi ladata kunnes olet verkon.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Olet offline-tilassa. Et voi ladata kunnes olet verkon.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Ei opiskelijaryhmille luotu.
 DocType: Purchase Invoice Item,Serial No,Sarjanumero
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Kuukauden lyhennyksen määrä ei voi olla suurempi kuin Lainamäärä
@@ -3624,17 +3701,18 @@
 DocType: Salary Slip,Total Working Hours,Kokonaistyöaika
 DocType: Subscription,Next Schedule Date,Seuraava aikataulu
 DocType: Stock Entry,Including items for sub assemblies,mukaanlukien alikokoonpanon tuotteet
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Anna-arvon on oltava positiivinen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Kaikki alueet
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Anna-arvon on oltava positiivinen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Kaikki alueet
 DocType: Purchase Invoice,Items,Nimikkeet
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Opiskelijan on jo ilmoittautunut.
 DocType: Fiscal Year,Year Name,Vuoden nimi
 DocType: Process Payroll,Process Payroll,Suorita palkanlaskenta
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Tässä kuussa ei ole lomapäiviä työpäivinä
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Tässä kuussa ei ole lomapäiviä työpäivinä
 DocType: Product Bundle Item,Product Bundle Item,Tuotepaketin nimike
 DocType: Sales Partner,Sales Partner Name,Myyntikumppani nimi
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Pyyntö Lainaukset
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Pyyntö Lainaukset
 DocType: Payment Reconciliation,Maximum Invoice Amount,Suurin Laskun summa
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,hematologian
 DocType: Normal Test Items,Normal Test Items,Normaalit koekappaleet
 DocType: Student Language,Student Language,Student Kieli
 apps/erpnext/erpnext/config/selling.py +23,Customers,asiakkaat
@@ -3645,10 +3723,11 @@
 DocType: Issue,Opening Time,Aukeamisaika
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,alkaen- ja päätyen päivä vaaditaan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Arvopaperit & hyödykkeet vaihto
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variaation '{0}' oletusyksikkö pitää olla sama kuin mallilla '{1}'
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variaation '{0}' oletusyksikkö pitää olla sama kuin mallilla '{1}'
 DocType: Shipping Rule,Calculate Based On,Laskenta perustuen
 DocType: Delivery Note Item,From Warehouse,Varastosta
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Kohteita ei Bill materiaalien valmistus
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Kohteita ei Bill materiaalien valmistus
+DocType: Restaurant,Default Customer,Oletusasiakas
 DocType: Assessment Plan,Supervisor Name,ohjaaja Name
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Älä vahvista, onko tapaaminen luotu samalle päivälle"
 DocType: Program Enrollment Course,Program Enrollment Course,Ohjelma Ilmoittautuminen kurssi
@@ -3675,7 +3754,7 @@
 DocType: Payment Entry,Internal Transfer,sisäinen siirto
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,"tällä tilillä on alatili, et voi poistaa tätä tiliä"
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,tavoite yksikkömäärä tai tavoite arvomäärä vaaditaan
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},tuotteelle {0} ei ole olemassa oletus BOM:ia
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},tuotteelle {0} ei ole olemassa oletus BOM:ia
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Valitse ensin tositepäivä
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Aukiolopäivä pitäisi olla ennen Tarjouksentekijä
 DocType: Leave Control Panel,Carry Forward,siirrä
@@ -3710,6 +3789,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Nykyarvo yhteensä
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,tilinpäätöksen
 DocType: Drug Prescription,Hour,tunti
+DocType: Restaurant Order Entry,Last Sales Invoice,Viimeinen ostolasku
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"uusi sarjanumero voi olla varastossa, sarjanumero muodoruu varaston kirjauksella tai ostokuitilla"
 DocType: Lead,Lead Type,vihjeen tyyppi
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Sinulla ei ole lupa hyväksyä lehdet Block Päivämäärät
@@ -3744,64 +3824,66 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Luo Käyttäjät
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,Gramma
 DocType: Supplier Scorecard,Per Month,Kuukaudessa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Määrä Valmistus on oltava suurempi kuin 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Määrä Valmistus on oltava suurempi kuin 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Käyntiraportti huoltopyynnöille
 DocType: Stock Entry,Update Rate and Availability,Päivitä määrä ja saatavuus
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Vastaanoton tai toimituksen prosenttiosuus on liian suuri suhteessa tilausmäärään, esim: mikäli 100 yksikköä on tilattu sallittu ylitys on 10% niin sallittu määrä on 110 yksikköä"
 DocType: POS Customer Group,Customer Group,Asiakasryhmä
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Uusi Erätunnuksesi (valinnainen)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Uusi Erätunnuksesi (valinnainen)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Kustannustili on vaaditaan tuotteelle {0}
 DocType: BOM,Website Description,Verkkosivuston kuvaus
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Nettomuutos Equity
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Uusin
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Peru ostolasku {0} ensin
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Sähköpostiosoite täytyy olla yksilöllinen, on jo olemassa {0}"
 DocType: Serial No,AMC Expiry Date,Ylläpidon umpeutumispäivä
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,kuitti
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,kuitti
 ,Sales Register,Myyntirekisteri
 DocType: Daily Work Summary Settings Company,Send Emails At,Lähetä sähköposteja
 DocType: Quotation,Quotation Lost Reason,"Tarjous hävitty, syy"
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Valitse toimiala
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',valitse * alkaen tabPatient jossa name = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Transaction viitenumero {0} päivätyn {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Transaction viitenumero {0} päivätyn {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ei muokattavaa.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Lomakenäkymä
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Yhteenveto tässä kuussa ja keskeneräisten toimien
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Lomakenäkymä
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Yhteenveto tässä kuussa ja keskeneräisten toimien
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.",Lisää käyttäjiä muuhun organisaatioon kuin itse.
 DocType: Customer Group,Customer Group Name,Asiakasryhmän nimi
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Ei Asiakkaat vielä!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Ei Asiakkaat vielä!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Rahavirtalaskelma
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lainamäärä voi ylittää suurin lainamäärä on {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,lisenssi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Poista lasku {0} C-kaaviosta {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Poista lasku {0} C-kaaviosta {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Valitse jatka eteenpäin mikäli haluat sisällyttää edellisen tilikauden taseen tälle tilikaudelle
 DocType: GL Entry,Against Voucher Type,tositteen tyyppi kohdistus
 DocType: Physician,Phone (R),Puhelin (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Aikavälit lisätään
 DocType: Item,Attributes,tuntomerkkejä
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Ota mallipohja käyttöön
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Aseta Naming-sarja {0} asetukseksi Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Syötä poistotili
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Viimeinen tilaus päivämäärä
 DocType: Patient,B Negative,B Negatiivinen
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Tili {0} ei kuulu yritykselle {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Sarjanumeroita peräkkäin {0} ei vastaa lähetysluettelon
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Sarjanumeroita peräkkäin {0} ei vastaa lähetysluettelon
 DocType: Student,Guardian Details,Guardian Tietoja
 DocType: C-Form,C-Form,C-muoto
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Läsnäolo useita työntekijöitä
 DocType: Vehicle,Chassis No,Alusta ei
 DocType: Payment Request,Initiated,Aloitettu
 DocType: Production Order,Planned Start Date,Suunniteltu aloituspäivä
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Valitse BOM
 DocType: Serial No,Creation Document Type,Dokumenttityypin luonti
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Loppupäivän on oltava alkamispäivä
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Loppupäivän on oltava alkamispäivä
 DocType: Leave Type,Is Encash,on perintä
 DocType: Leave Allocation,New Leaves Allocated,uusi poistumisten kohdennus
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,"projekti työkalu, tietoja ei ole saatavilla tarjousvaiheessa"
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Lopeta
 DocType: Project,Expected End Date,odotettu päättymispäivä
 DocType: Budget Account,Budget Amount,talousarvio Määrä
 DocType: Appraisal Template,Appraisal Template Title,arvioinnin otsikko
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Vuodesta Date {0} for Employee {1} ei voi olla ennen työntekijän liittymistä Date {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,kaupallinen
 DocType: Patient,Alcohol Current Use,Alkoholi nykyinen käyttö
+DocType: Student Admission Program,Student Admission Program,Opiskelijavalintaohjelma
 DocType: Payment Entry,Account Paid To,Tilin Palkallinen
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Pääkohde {0} ei saa olla varasto tuote
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Kaikki tuotteet tai palvelut
@@ -3810,30 +3892,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} talousarvion tili {1} vastaan {2} {3} on {4}. Se ylitä {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Rivi {0} # Account täytyy olla tyyppiä &quot;Käyttöomaisuuden&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,ulkona yksikkömäärä
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,sääntö laskee toimituskustannuksen arvomäärän myyntiin
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,ja unchcked Poissa käytöstä
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Sarjat ovat pakollisia
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Talouspalvelu
 DocType: Student Sibling,Student ID,opiskelijanumero
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Toimintamuodot Aika Lokit
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Toimittajan sähköposti
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Toimintamuodot Aika Lokit
 DocType: Tax Rule,Sales,Myynti
 DocType: Stock Entry Detail,Basic Amount,Perusmäärät
 DocType: Training Event,Exam,Koe
 DocType: Complaint,Complaint,Valitus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Varasto vaaditaan varastotuotteelle {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Varasto vaaditaan varastotuotteelle {0}
 DocType: Leave Allocation,Unused leaves,Käyttämättömät lehdet
 DocType: Patient,Alcohol Past Use,Alkoholin aiempi käyttö
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Laskutus valtion
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,siirto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Nouda BOM räjäytys (mukaan lukien alikokoonpanot)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,siirto
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Nouda BOM räjäytys (mukaan lukien alikokoonpanot)
 DocType: Authorization Rule,Applicable To (Employee),sovellettavissa (työntekijä)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,eräpäivä vaaditaan
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,eräpäivä vaaditaan
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Puuston Taito {0} ei voi olla 0
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD Mistä
 DocType: Naming Series,Setup Series,Sarjojen määritys
 DocType: Payment Reconciliation,To Invoice Date,Laskun päivämäärä
 DocType: Supplier,Contact HTML,"yhteystiedot, HTML"
 ,Inactive Customers,Ei-aktiiviset asiakkaat
+DocType: Student Admission Program,Maximum Age,Enimmäisikä
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Osto Kuitit
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,miten hinnoittelu sääntöä käytetään
@@ -3849,10 +3933,11 @@
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Ostoverot ja maksupohjat
 DocType: Upload Attendance,Download Template,lataa mallipohja
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Joko luotto- tai määrä tarvitaan {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Joko debit- tai credit- summa tarvitaan {2}
 DocType: GL Entry,Remarks,Huomautukset
 DocType: Payment Entry,Account Paid From,Tilin maksettu
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raaka-aineen tuotekoodi
+DocType: Task,Parent Task,Vanhempien tehtävä
 DocType: Journal Entry,Write Off Based On,Poisto perustuu
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Luo liidi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Tulosta ja Paperi
@@ -3861,19 +3946,19 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Palkka jo käsitellä välisenä aikana {0} ja {1}, Jätä hakuaika voi olla välillä tällä aikavälillä."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,sarjanumeron asennustietue
 DocType: Guardian Interest,Guardian Interest,Guardian Interest
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,POS laskujen oletusarvot
 apps/erpnext/erpnext/config/hr.py +177,Training,koulutus
 DocType: Timesheet,Employee Detail,työntekijän Detail
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 -sähköpostitunnus
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,Seuraava Päivämäärä päivä ja Toista kuukauden päivä on oltava sama
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Seuraava Päivämäärä päivä ja Toista kuukauden päivä on oltava sama
 DocType: Lab Prescription,Test Code,Testikoodi
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Verkkosivun kotisivun asetukset
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},"Tarjouspyynnöt eivät ole sallittuja {0}, koska tuloskortin arvo on {1}"
 DocType: Offer Letter,Awaiting Response,Odottaa vastausta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Yläpuolella
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Kokonaismäärä {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Virheellinen määrite {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Kokonaismäärä {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Virheellinen määrite {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Mainitse jos standardista maksetaan tilille
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Sama viesti on tullut useita kertoja. {lista}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Valitse arvioinnin muu ryhmä kuin &quot;Kaikki arviointi Ryhmien
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Rivi {0}: Kustannuspaikka tarvitaan kohteen {1}
 DocType: Training Event Employee,Optional,Valinnainen
@@ -3896,19 +3981,20 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kustannuspaikka on pakollinen nimikkeellä {2}
 DocType: Vehicle,Policy No,Policy Ei
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Hae nimikkeet tuotepaketista
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Koska varastossa on esine {0}, et voi ottaa käyttöön vaihtoehtoja omaisuutta"
 DocType: Asset,Straight Line,Suora viiva
 DocType: Project User,Project User,Projektikäyttäjä
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Jakaa
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Jakaa
 DocType: GL Entry,Is Advance,on ennakko
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,"osallistuminen päivästä, osallistuminen päivään To vaaditaan"
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,"Syötä ""on alihankittu"" (kyllä tai ei)"
+DocType: Item,Default Purchase Unit of Measure,Oletusarvonostoyksikkö
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Viime yhteyspäivä
 DocType: Sales Team,Contact No.,yhteystiedot nro
 DocType: Bank Reconciliation,Payment Entries,Maksu merkinnät
 DocType: Production Order,Scrap Warehouse,romu Varasto
 DocType: Production Order,Check if material transfer entry is not required,"Tarkista, onko materiaali siirto merkintää ei tarvita"
 DocType: Program Enrollment Tool,Get Students From,Get opiskelijaa
-DocType: Hub Settings,Seller Country,Myyjä maa
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Julkaise kohteet Website
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Group opiskelijat erissä
 DocType: Authorization Rule,Authorization Rule,Valtuutus Rule
@@ -3918,7 +4004,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Myyntiverot ja maksupohjat
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Yhteensä (luotto)
 DocType: Repayment Schedule,Payment Date,Maksupäivä
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Uusi Erä Määrä
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Uusi Erä Määrä
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,asut ja tarvikkeet
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,"Ei voitu ratkaista painotettua pisteet -toimintoa. Varmista, että kaava on kelvollinen."
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,tilausten lukumäärä
@@ -3936,6 +4022,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rivi # {0}: Asset {1} ei voida antaa, se on jo {2}"
 DocType: Tax Rule,Billing Country,Laskutusmaa
 DocType: Purchase Order Item,Expected Delivery Date,odotettu toimituspäivä
+DocType: Restaurant Order Entry,Restaurant Order Entry,Ravintola Tilaus Entry
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,debet ja kredit eivät täsmää {0} # {1}. ero on {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Edustuskustannukset
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Luo hankintapyyntö
@@ -3948,9 +4035,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,tilin tapahtumaa ei voi poistaa
 DocType: Vehicle,Last Carbon Check,Viimeksi Carbon Tarkista
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Juridiset kustannukset
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Valitse määrä rivillä
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Valitse määrä rivillä
 DocType: Purchase Invoice,Posting Time,Tositeaika
 DocType: Timesheet,% Amount Billed,% laskutettu arvomäärä
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Time per Appointment&quot; ei ole asetettu Dr {0}: lle. Lisää se Physician master -ohjelmaan.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Puhelinkulut
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"täppää mikäli haluat pakottaa käyttäjän valitsemaan sarjan ennen tallennusta, täpästä ei synny oletusta"
@@ -3961,6 +4049,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Uusi asiakas Liikevaihto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,matkakulut
 DocType: Maintenance Visit,Breakdown,hajoitus
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Lisää mukautettu kenttä-tilaus dokktityyppiin {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Tili: {0} kanssa valuutta: {1} ei voi valita
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Päivitys BOM maksaa automaattisesti Scheduler-ohjelman avulla, joka perustuu viimeisimpään arvostusnopeuteen / hinnastonopeuteen / raaka-aineiden viimeiseen ostohintaan."
 DocType: Bank Reconciliation Detail,Cheque Date,takaus/shekki päivä
@@ -3985,7 +4074,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Laskutuksen kokomaisarvomäärä (aikaloki)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,toimittaja tunnus
 DocType: Payment Request,Payment Gateway Details,Payment Gateway Tietoja
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Määrä olisi oltava suurempi kuin 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Määrä olisi oltava suurempi kuin 0
 DocType: Journal Entry,Cash Entry,kassakirjaus
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Child solmut voidaan ainoastaan perustettu &quot;ryhmä&quot; tyyppi solmuja
 DocType: Leave Application,Half Day Date,Half Day Date
@@ -4003,12 +4092,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,huom: tuote {0} kirjattu useampia kertoja
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,kaikki yhteystiedot
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,yrityksen lyhenne
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Käyttäjä {0} ei ole olemassa
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Käyttäjä {0} ei ole olemassa
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Lyhenne
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Maksu Entry jo olemassa
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ei authroized koska {0} ylittää rajat
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,palkka mallipohja valvonta
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Patologia
+DocType: Restaurant Order Entry,Restaurant Table,Ravintola-taulukko
 DocType: Leave Type,Max Days Leave Allowed,maksimi poistumispäivät sallittu
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Aseta Tax Rule ostoskoriin
 DocType: Purchase Invoice,Taxes and Charges Added,Lisätyt verot ja maksut
@@ -4020,10 +4111,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Noteerauksesta vihjeeksi tai asiakkaaksi
 DocType: Stock Settings,Role Allowed to edit frozen stock,rooli saa muokata jäädytettyä varastoa
 ,Territory Target Variance Item Group-Wise,"Aluetavoite vaihtelu, tuoteryhmä työkalu"
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,kaikki asiakasryhmät
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,kaikki asiakasryhmät
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,kertyneet Kuukauden
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} on pakollinen, voi olla ettei valuutanvaihto tietuetta ei tehty {1}:stä {2}:n."
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Vero malli on pakollinen.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Vero malli on pakollinen.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,tili {0}: emotili {1} ei ole olemassa
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Hinta (yrityksen valuutassa)
 DocType: Products Settings,Products Settings,Tuotteet Asetukset
@@ -4049,12 +4140,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,"tuote työkalu, verotiedot"
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Institute lyhenne
 ,Item-wise Price List Rate,Tuotekohtainen hinta hinnastossa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Toimituskykytiedustelu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Toimituskykytiedustelu
 DocType: Quotation,In Words will be visible once you save the Quotation.,"sanat näkyvät, kun tallennat tarjouksen"
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Määrä ({0}) ei voi olla osa rivillä {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},viivakoodi {0} on jo käytössä tuotteella {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},viivakoodi {0} on jo käytössä tuotteella {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,toimituskustannusten lisäys säännöt
 DocType: Item,Opening Stock,Aloitusvarasto
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Asiakas on pakollinen
@@ -4072,9 +4163,8 @@
 DocType: Customer,From Lead,Liidistä
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,tuotantoon luovutetut tilaukset
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Valitse tilikausi ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS profiili vaatii POS kirjauksen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS profiili vaatii POS kirjauksen
 DocType: Program Enrollment Tool,Enroll Students,Ilmoittaudu Opiskelijat
-DocType: Hub Settings,Name Token,Name Token
 DocType: Lab Test,Approved Date,Hyväksytty päivämäärä
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,perusmyynti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Ainakin yksi varasto on pakollinen
@@ -4092,7 +4182,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,henkilöstöresurssi
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Maksun täsmäytys toiseen maksuun
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,"Vero, vastaavat"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Tuotanto tilaa on {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Tuotanto tilaa on {0}
 DocType: BOM Item,BOM No,BOM nro
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,päiväkirjakirjauksella {0} ei ole tiliä {1} tai on täsmätty toiseen tositteeseen
@@ -4112,7 +4202,7 @@
 DocType: Currency Exchange,To Currency,Valuuttakursseihin
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,salli seuraavien käyttäjien hyväksyä poistumissovelluksen estopäivät
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Kulukorvauksen tyypit
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Myynnin hinnan kohteen {0} on pienempi kuin sen {1}. Myynnin määrä tulisi olla vähintään {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Myynnin hinnan kohteen {0} on pienempi kuin sen {1}. Myynnin määrä tulisi olla vähintään {2}
 DocType: Item,Taxes,Verot
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Maksettu ja ei toimitettu
 DocType: Project,Default Cost Center,Oletus kustannuspaikka
@@ -4120,21 +4210,21 @@
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Varastotapahtumat
 DocType: Budget,Budget Accounts,talousarviokirjanpito
 DocType: Employee,Internal Work History,sisäinen työhistoria
-DocType: Depreciation Schedule,Accumulated Depreciation Amount,Kertyneet poistot Määrä
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Kertyneiden poistojen summa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Toimittajan tuloskortin muuttuja
 DocType: Employee Loan,Fully Disbursed,maksettu täysin
 DocType: Maintenance Visit,Customer Feedback,asiakaspalaute
 DocType: Account,Expense,Kustannus
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Pisteet ei voi olla suurempi kuin maksimipisteet
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Pisteet ei voi olla suurempi kuin maksimipisteet
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Asiakkaat ja toimittajat
 DocType: Item Attribute,From Range,Alkaen Range
 DocType: BOM,Set rate of sub-assembly item based on BOM,Määritä alikokoonpanon määrä osumakohtaisesti
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Syntaksivirhe kaavassa tai tila: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Syntaksivirhe kaavassa tai tila: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Päivittäinen työ Yhteenveto Asetukset Company
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,Nimike {0} ohitetaan sillä se ei ole varastotuote
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Vahvista tuotannon tilaus jatkokäsittelyä varten.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Vahvista tuotannon tilaus jatkokäsittelyä varten.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",Kaikki sovellettavat hinnoittelusäännöt tulee poistaa käytöstä ettei hinnoittelusääntöjä käytetä tähän tapahtumaan
 DocType: Assessment Group,Parent Assessment Group,Parent Assessment Group
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Työpaikat
@@ -4151,12 +4241,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Aseta Yritysfiltteri tyhjäksi jos Ryhmittelyperuste on &#39;yritys&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Kirjoittamisen päivämäärä ei voi olla tulevaisuudessa
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Rivi # {0}: Sarjanumero {1} ei vastaa {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,toistuvan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,tavallinen poistuminen
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Lab Test UOM.
 DocType: Batch,Batch ID,Erän tunnus
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Huomautus: {0}
 ,Delivery Note Trends,Lähetysten kehitys
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Viikon yhteenveto
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Viikon yhteenveto
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Varastossa Määrä
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Tiliä {0} voi päivittää vain varastotapahtumien kautta
 DocType: Student Group Creation Tool,Get Courses,Get Kurssit
@@ -4170,7 +4261,6 @@
 DocType: Purchase Order,To Bill,Laskuta
 DocType: Material Request,% Ordered,% järjestetty
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Kurssille pohjainen opiskelija Groupin Kurssi validoitu jokaiselle oppilaalle päässä kirjoilla Kurssit Program Ilmoittautuminen.
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Kirjoita sähköpostiosoite pilkulla erotettuna, lasku lähetetään automaattisesti tiettynä päivänä"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Urakkatyö
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Oston keskihinta
 DocType: Task,Actual Time (in Hours),todellinen aika (tunneissa)
@@ -4184,7 +4274,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,"tuotteella {0} ei ole määritettyä sarjanumeroa, sarake on tyhjä"
 DocType: Accounts Settings,Accounts Settings,tilien asetukset
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,Hyväksyä
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Ei tulosta
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Ei tulosta
 DocType: Customer,Sales Partner and Commission,Myynti Partner ja komission
 DocType: Employee Loan,Rate of Interest (%) / Year,Korkokanta (%) / vuosi
 ,Project Quantity,Project Määrä
@@ -4196,55 +4286,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,musta
 DocType: BOM Explosion Item,BOM Explosion Item,BOM-tuotesisältö
 DocType: Account,Auditor,Tilintarkastaja
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} nimikettä valmistettu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} nimikettä valmistettu
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Lisätietoja
 DocType: Cheque Print Template,Distance from top edge,Etäisyys yläreunasta
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Hinnasto {0} on poistettu käytöstä tai sitä ei ole
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Hinnasto {0} on poistettu käytöstä tai sitä ei ole
 DocType: Purchase Invoice,Return,paluu
 DocType: Production Order Operation,Production Order Operation,Tuotannon tilauksen toimenpiteet
 DocType: Pricing Rule,Disable,poista käytöstä
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Tila maksu on suoritettava maksu
 DocType: Project Task,Pending Review,Odottaa näkymä
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Nimitykset ja neuvottelut
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ei ilmoittautunut Erä {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ei ilmoittautunut Erä {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} ei voida romuttaa, koska se on jo {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Kulukorvaus yhteensä (kulukorvauksesta)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rivi {0}: valuutta BOM # {1} pitäisi olla yhtä suuri kuin valittu valuutta {2}
 DocType: Journal Entry Account,Exchange Rate,Valuuttakurssi
 DocType: Patient,Additional information regarding the patient,Lisätietoja potilaasta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Myyntitilaus {0} ei ole vahvistettu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Myyntitilaus {0} ei ole vahvistettu
 DocType: Homepage,Tag Line,Tagirivi
 DocType: Fee Component,Fee Component,Fee Component
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Kaluston hallinta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Lisää kohteita
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Kaluston hallinta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Lisää kohteita
 DocType: Cheque Print Template,Regular,säännöllinen
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Yhteensä weightage Kaikkien Arviointikriteerit on oltava 100%
-DocType: BOM,Last Purchase Rate,Viimeisin ostohinta
+DocType: Purchase Order Item,Last Purchase Rate,Viimeisin ostohinta
 DocType: Account,Asset,vastaavat
 DocType: Project Task,Task ID,Tehtävätunnus
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,tälle tuotteelle ei ole varastopaikkaa {0} koska siitä on useita malleja
 DocType: Lab Test,Mobile,mobile
 ,Sales Person-wise Transaction Summary,"Myyjän työkalu,  tapahtuma yhteenveto"
 DocType: Training Event,Contact Number,Yhteysnumero
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Varastoa {0} ei ole olemassa
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Ilmoittaudu ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Varastoa {0} ei ole olemassa
 DocType: Monthly Distribution,Monthly Distribution Percentages,"toimitus kuukaudessa, prosenttiosuudet"
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Valittu tuote ei voi olla erä
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Arvostus korko ei löytynyt Item {0}, jota vaaditaan tekemään kirjauksia varten {1} {2}. Jos kohde on kaupankäyntiosapuolten näytteenä eränä {1}, mainitse, että {1} Item taulukossa. Muussa tapauksessa luo saapuvan osakekauppaohjelman alkion tai maininta arvostus korko on Item kirjaa, ja yritä submiting / peruuttamalla tämän merkinnän"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% lähetteen materiaaleista toimitettu
+DocType: Training Event,Has Certificate,Onko sertifikaatti
 DocType: Project,Customer Details,"asiakas, lisätiedot"
 DocType: Employee,Reports to,raportoi
 ,Unpaid Expense Claim,Palkaton Matkakorvauslomakkeet
 DocType: Payment Entry,Paid Amount,Maksettu arvomäärä
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Tutustu myyntitykliin
 DocType: Assessment Plan,Supervisor,Valvoja
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,Online
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,Online
 ,Available Stock for Packing Items,Pakattavien nimikkeiden saatavuus
 DocType: Item Variant,Item Variant,tuotemalli
 DocType: Assessment Result Tool,Assessment Result Tool,Assessment Tulos Tool
 DocType: BOM Scrap Item,BOM Scrap Item,BOM romu Kohta
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Vahvistettuja tilauksia ei voi poistaa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Vahvistettuja tilauksia ei voi poistaa
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Tilin tase on jo dedet, syötetyn arvon tulee olla 'tasapainossa' eli 'krebit'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Määrähallinta
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Kohta {0} on poistettu käytöstä
@@ -4264,7 +4353,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Rivi # {0}: ajoitukset ristiriidassa rivin {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Salli nollahinta
 DocType: Training Event Employee,Invited,Kutsuttu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Useita aktiivisia Palkka Structures löytynyt työntekijä {0} varten kyseisenä päivänä
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Useita aktiivisia Palkka Structures löytynyt työntekijä {0} varten kyseisenä päivänä
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Setup Gateway tilejä.
 DocType: Employee,Employment Type,Työsopimustyypit
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Kiinteät varat
@@ -4276,7 +4365,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Opiskelijan Sähköposti ID
 DocType: Employee,Notice (days),Ilmoitus (päivää)
 DocType: Tax Rule,Sales Tax Template,Sales Tax Malline
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Valitse kohteita tallentaa laskun
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Valitse kohteita tallentaa laskun
 DocType: Employee,Encashment Date,perintä päivä
 DocType: Training Event,Internet,Internet
 DocType: Special Test Template,Special Test Template,Erityinen testausmalli
@@ -4285,7 +4374,7 @@
 DocType: Production Order,Planned Operating Cost,Suunnitellut käyttökustannukset
 DocType: Academic Term,Term Start Date,Term aloituspäivä
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,OPP Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Ohessa {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Ohessa {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Tiliote tasapaino kohti Pääkirja
 DocType: Job Applicant,Applicant Name,hakijan nimi
 DocType: Authorization Rule,Customer / Item Name,Asiakas / Nimikkeen nimi
@@ -4311,7 +4400,7 @@
 DocType: Guardian,Guardian Of ,Guardian Of
 DocType: Grading Scale Interval,Threshold,kynnys
 DocType: BOM Update Tool,Current BOM,nykyinen BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Lisää sarjanumero
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Lisää sarjanumero
 DocType: Production Order Item,Available Qty at Source Warehouse,Available Kpl lähdeverolakia Warehouse
 apps/erpnext/erpnext/config/support.py +22,Warranty,Takuu
 DocType: Purchase Invoice,Debit Note Issued,Debit Note Annettu
@@ -4334,10 +4423,9 @@
 DocType: Account,Receivable,Saatava
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Rivi # {0}: Ei saa muuttaa Toimittaja kuten ostotilaus on jo olemassa
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,roolilla jolla voi lähettää tapamtumia pääsee luottoraja asetuksiin
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Valitse tuotteet Valmistus
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Master data synkronointia, se saattaa kestää jonkin aikaa"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Valitse tuotteet Valmistus
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Master data synkronointia, se saattaa kestää jonkin aikaa"
 DocType: Item,Material Issue,materiaali aihe
-DocType: Hub Settings,Seller Description,Myyjän kuvaus
 DocType: Employee Education,Qualification,Pätevyys
 DocType: Item Price,Item Price,Nimikkeen hinta
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Saippua & pesuaine
@@ -4345,7 +4433,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,From Time ei voi olla suurempi kuin ajoin.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,tilattu
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Jatkaa
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Jatkaa
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Jos tämä asetus on käytössä, järjestelmä ei päivitä mallien kenttiä kentistä, mutta kopioi alla mainittujen kenttien tiedot samalla uuden version"
 DocType: Salary Detail,Component,komponentti
 DocType: Assessment Criteria,Assessment Criteria Group,Arviointikriteerit Group
 DocType: Healthcare Settings,Patient Name By,Potilaan nimi
@@ -4355,7 +4444,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Anna hyväksyminen rooli tai hyväksyminen Käyttäjä
 DocType: Journal Entry,Write Off Entry,Poiston kirjaus
 DocType: BOM,Rate Of Materials Based On,Materiaalilaskenta perustuen
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Toimittaja&gt; Toimittajan tyyppi
+DocType: Item Variant Settings,Do not Update Variants,Älä päivitä vaihtoehtoja
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Tuki analyysi
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Poista kaikki
 DocType: POS Profile,Terms and Conditions,Ehdot ja säännöt
@@ -4364,7 +4453,7 @@
 DocType: Leave Block List,Applies to Company,koskee yritystä
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,Ei voi perua. Vahvistettu varastotapahtuma {0} on olemassa.
 DocType: Employee Loan,Disbursement Date,maksupäivä
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;Vastaanottajat&#39; ei ole määritelty
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Vastaanottajat&#39; ei ole määritelty
 DocType: BOM Update Tool,Update latest price in all BOMs,Päivitä viimeisin hinta kaikkiin ostomakeihin
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Sairauskertomus
 DocType: Vehicle,Vehicle,ajoneuvo
@@ -4379,14 +4468,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,OPP / Lyijy%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Poistot ja taseet
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Määrä {0} {1} siirretty {2} ja {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Määrä {0} {1} siirretty {2} ja {3}
 DocType: Sales Invoice,Get Advances Received,hae saadut ennakot
 DocType: Email Digest,Add/Remove Recipients,lisää / poista vastaanottajia
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},tapahtumat tuotannon tilaukseen {0} on estetty
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Asettaaksesi tämän tilikaudenoletukseksi, klikkaa ""aseta oletukseksi"""
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Liittyä seuraan
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Liittyä seuraan
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Vajaa määrä
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
 DocType: Employee Loan,Repay from Salary,Maksaa maasta Palkka
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Maksupyynnön vastaan {0} {1} määräksi {2}
@@ -4399,7 +4488,7 @@
 DocType: Sales Invoice Item,Sales Order Item,"Myyntitilaus, tuote"
 DocType: Salary Slip,Payment Days,Maksupäivää
 DocType: Patient,Dormant,uinuva
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Varasto lapsen solmuja ei voida muuntaa Ledger
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Varasto lapsen solmuja ei voida muuntaa Ledger
 DocType: BOM,Manage cost of operations,hallitse toimien kustannuksia
 DocType: Accounts Settings,Stale Days,Stale Days
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Kun valitut tapahtumat vahvistetaan, järjestelmä avaa ponnahdusikkunaan sähköpostiviestin jolla tapahtumat voi lähettää tapahtumien yhteyshenkilöille sähköpostiliitteinä."
@@ -4413,10 +4502,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Sarjanumero {0} on jo saapunut
 ,Requested Items To Be Transferred,siirrettävät pyydetyt tuotteet
 DocType: Expense Claim,Vehicle Log,ajoneuvo Log
-DocType: Purchase Invoice,Recurring Id,Toistuva Id
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Kuumeen esiintyminen (lämpötila&gt; 38,5 ° C / 101,3 ° F tai jatkuva lämpötila&gt; 38 ° C / 100,4 ° F)"
 DocType: Customer,Sales Team Details,Myyntitiimin lisätiedot
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,poista pysyvästi?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,poista pysyvästi?
 DocType: Expense Claim,Total Claimed Amount,Vaatimukset arvomäärä yhteensä
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Myynnin potentiaalisia tilaisuuksia
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Virheellinen {0}
@@ -4426,7 +4514,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,osasto kaupat
 ,Item Delivery Date,Tuote Toimituspäivä
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Setup School ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Setup School ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Muuta Summa (Company valuutta)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,ei kirjanpidon kirjauksia seuraaviin varastoihin
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Tallenna asiakirja ensin
@@ -4438,13 +4526,12 @@
 DocType: Task,Is Milestone,on Milestone
 DocType: Daily Work Summary,Email Sent To,Sähköposti lähetetään
 DocType: Budget,Warn,Varoita
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Haluatko varmasti poistaa tilisi?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","muut huomiot, huomioitavat asiat tulee laittaa tähän tietueeseen"
 DocType: BOM,Manufacturing User,Valmistus peruskäyttäjä
 DocType: Purchase Invoice,Raw Materials Supplied,Raaka-aineet toimitettu
-DocType: Purchase Invoice,Recurring Print Format,Toistuvat tulostusmuodot
 DocType: C-Form,Series,Numerosarja
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Hinnaston valuutan {0} on oltava {1} tai {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Lisää tuotteita
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Hinnaston valuutan {0} on oltava {1} tai {2}
 DocType: Appraisal,Appraisal Template,Arvioinnin mallipohjat
 DocType: Item Group,Item Classification,tuote luokittelu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Liiketoiminnan kehityspäällikkö
@@ -4458,7 +4545,7 @@
 DocType: Item Attribute Value,Attribute Value,"tuntomerkki, arvo"
 ,Itemwise Recommended Reorder Level,Tuotekohtainen suositeltu täydennystilaustaso
 DocType: Salary Detail,Salary Detail,Palkka Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Ole hyvä ja valitse {0} Ensimmäinen
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Ole hyvä ja valitse {0} Ensimmäinen
 DocType: Appointment Type,Physician,Lääkäri
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Erä {0} tuotteesta {1} on vanhentunut.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,kuulemiset
@@ -4469,7 +4556,7 @@
 DocType: Salary Detail,Default Amount,oletus arvomäärä
 DocType: Lab Test Template,Descriptive,kuvaileva
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Varastoa ei löydy järjestelmästä
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Tämän kuun yhteenveto
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Tämän kuun yhteenveto
 DocType: Quality Inspection Reading,Quality Inspection Reading,Laarutarkistuksen luku
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,Kylmävarasto pitäisi olla vähemmän kuin % päivää
 DocType: Tax Rule,Purchase Tax Template,Myyntiverovelkojen malli
@@ -4492,12 +4579,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Koulutustapahtumat / Tulokset
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Kertyneet poistot kuin
 DocType: Sales Invoice,C-Form Applicable,C-muotoa sovelletaan
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Toiminta-aika on oltava suurempi kuin 0 Toiminta {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Toiminta-aika on oltava suurempi kuin 0 Toiminta {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Varasto on pakollinen
 DocType: Supplier,Address and Contacts,Osoite ja yhteystiedot
 DocType: UOM Conversion Detail,UOM Conversion Detail,Mittayksikön muunnon lisätiedot
 DocType: Program,Program Abbreviation,Ohjelma lyhenne
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Tuotannon tilausta ei voi kohdistaa tuotteen mallipohjaan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Tuotannon tilausta ei voi kohdistaa tuotteen mallipohjaan
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,maksut on päivitetty ostokuitilla kondistettuna jokaiseen tuotteeseen
 DocType: Warranty Claim,Resolved By,Ratkaisija
 DocType: Bank Guarantee,Start Date,aloituspäivä
@@ -4523,26 +4610,27 @@
 DocType: Employee,Educational Qualification,koulutusksen arviointi
 DocType: Workstation,Operating Costs,Käyttökustannukset
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Toiminta jos kuukausikulutus budjetti ylitetty
-DocType: Purchase Invoice,Submit on creation,Vahvista luonnin yhteydessä
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Valuutta {0} on {1}
+DocType: Subscription,Submit on creation,Vahvista luonnin yhteydessä
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Valuutta {0} on {1}
 DocType: Asset,Disposal Date,hävittäminen Date
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Sähköpostit lähetetään kaikille aktiivinen Yrityksen työntekijät on tietyn tunnin, jos heillä ei ole loma. Yhteenveto vastauksista lähetetään keskiyöllä."
 DocType: Employee Leave Approver,Employee Leave Approver,Poissaolon hyväksyjä
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Rivi {0}: täydennystilaus on jo kirjattu tälle varastolle {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","ei voida vahvistaa hävityksi, sillä tarjous on tehty"
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Training Palaute
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Rivi {0}: täydennystilaus on jo kirjattu tälle varastolle {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","ei voida vahvistaa hävityksi, sillä tarjous on tehty"
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Training Palaute
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Tuotannon tilaus {0} on vahvistettava
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Toimittajan tuloskortin kriteerit
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Ole hyvä ja valitse alkamispäivä ja päättymispäivä Kohta {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Kurssi on pakollinen rivi {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Päivään ei voi olla ennen aloituspäivää
 DocType: Supplier Quotation Item,Prevdoc DocType,Edellinen tietuetyyppi
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Lisää / muokkaa hintoja
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Lisää / muokkaa hintoja
 DocType: Batch,Parent Batch,Parent Erä
 DocType: Cheque Print Template,Cheque Print Template,Shekki Print Template
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Kustannuspaikkakaavio
 DocType: Lab Test Template,Sample Collection,Näytteenottokokoelma
 ,Requested Items To Be Ordered,Tilauksessa olevat nimiketarpeet
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Omat tilaukset
 DocType: Price List,Price List Name,Hinnaston nimi
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Päivittäinen työ Yhteenveto {0}
 DocType: Employee Loan,Totals,summat
@@ -4561,12 +4649,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} yksikköä {1} tarvitaan {2} on {3} {4} varten {5} tapahtuman suorittamiseen.
 DocType: Fee Schedule,Student Category,Student Luokka
 DocType: Announcement,Student,Opiskelija
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,"organisaatioyksikkö, osasto valvonta"
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,"organisaatioyksikkö, osasto valvonta"
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Siirry huoneisiin
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Anna viestin ennen lähettämistä
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,DUPLICATE TOIMITTAJILLE
 DocType: Email Digest,Pending Quotations,Odottaa Lainaukset
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Point-of-Sale Profile
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Point-of-Sale Profile
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Lab Test Configurations.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Vakuudettomat lainat
 DocType: Cost Center,Cost Center Name,kustannuspaikan nimi
@@ -4576,6 +4664,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,maksettu yhteensä
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Viestit yli 160 merkkiä jaetaan useita viestejä
 DocType: Purchase Receipt Item,Received and Accepted,Saanut ja hyväksynyt
+DocType: Hub Settings,Company and Seller Profile,Yritys- ja Myyjäprofiili
 ,GST Itemised Sales Register,GST Eritelty Sales Register
 ,Serial No Service Contract Expiry,Palvelusopimuksen päättyminen sarjanumerolle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,sekä kredit- että debet-kirjausta ei voi tehdä samalle tilille yhtaikaa
@@ -4585,10 +4674,11 @@
 DocType: Item,Variant Based On,Variant perustuvat
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Nimetyn painoarvon tulee yhteensä olla 100%. Nyt se on {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,omat toimittajat
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Korjaa
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,ei voi asettaa hävityksi sillä myyntitilaus on tehty
 DocType: Request for Quotation Item,Supplier Part No,Toimittaja osanumero
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Ei voi vähentää, kun kategoria on &quot;arvostus&quot; tai &quot;Vaulation ja Total&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Saadut
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Saadut
 DocType: Lead,Converted,muunnettu
 DocType: Item,Has Serial No,on sarjanumero
 DocType: Employee,Date of Issue,Kirjauksen päiväys
@@ -4596,7 +4686,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Kuten kohti ostaminen Asetukset, jos hankinta Reciept Pakollinen == KYLLÄ, sitten luoda Ostolasku, käyttäjän täytyy luoda Ostokuitti ensin kohteen {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Rivi # {0}: Aseta toimittaja kohteen {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Rivi {0}: Tuntia arvon on oltava suurempi kuin nolla.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Sivsuton kuvaa {0} kohteelle {1} ei löydy
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Sivuston kuvaa {0} kohteelle {1} ei löydy
 DocType: Issue,Content Type,sisällön tyyppi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,tietokone
 DocType: Item,List this Item in multiple groups on the website.,Listaa tästä Kohta useisiin ryhmiin verkkosivuilla.
@@ -4607,14 +4697,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,hae täsmäämättömät kirjaukset
 DocType: Payment Reconciliation,From Invoice Date,Alkaen Laskun päiväys
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Sinulla ei ole lupaa lähettää
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,Laskutusvaluutta on oltava yhtä suuri kuin joko oletus comapany valuuttaa tai osapuoli tilivaluutta
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Laskutusvaluutta on oltava yhtä suuri kuin joko oletus comapany valuuttaa tai osapuoli tilivaluutta
 DocType: Healthcare Settings,Laboratory Settings,Laboratorioasetukset
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,jätä perintä
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Mitä tämä tekee?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Varastoon
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Kaikki Opiskelijavalinta
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Mitä tämä tekee?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Varastoon
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Kaikki Opiskelijavalinta
 ,Average Commission Rate,keskimääräinen provisio
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,Varastoimattoman nimikkeen 'Sarjanumeroitu' -arvo ei voi olla 'kyllä'
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,Varastoimattoman nimikkeen 'Sarjanumeroitu' -arvo ei voi olla 'kyllä'
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Valitse Tila
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,osallistumisia ei voi merkitä tuleville päiville
 DocType: Pricing Rule,Pricing Rule Help,"Hinnoittelusääntö, ohjeet"
@@ -4632,48 +4722,47 @@
 DocType: Item,Customer Code,Asiakkaan yrityskoodi
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Syntymäpäivämuistutus {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,päivää edellisestä tilauksesta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Debit tilin on oltava tase tili
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Debit tilin on oltava tase tili
 DocType: Buying Settings,Naming Series,Nimeä sarjat
 DocType: Leave Block List,Leave Block List Name,nimi
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Vakuutus Aloituspäivä pitäisi olla alle Insurance Päättymispäivä
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Aseta Instructor Naming System kouluun&gt; Koulun asetukset
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,"Varasto, vastaavat"
 DocType: Timesheet,Production Detail,Tuotannon yksityiskohdat
+DocType: Restaurant,Active Menu,Aktiivinen valikko
 DocType: Target Detail,Target Qty,Tavoite yksikkömäärä
 DocType: Shopping Cart Settings,Checkout Settings,Kassalle Asetukset
 DocType: Attendance,Present,Nykyinen
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Lähete {0} ei saa olla vahvistettu
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Lähete {0} ei saa olla vahvistettu
 DocType: Notification Control,Sales Invoice Message,"Myyntilasku, viesti"
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Tilin sulkemisen {0} on oltava tyyppiä Vastuu / Oma pääoma
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Palkka Slip työntekijöiden {0} on jo luotu kellokortti {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Palkka Slip työntekijöiden {0} on jo luotu kellokortti {1}
 DocType: Vehicle Log,Odometer,Matkamittari
 DocType: Sales Order Item,Ordered Qty,tilattu yksikkömäärä
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Nimike {0} on poistettu käytöstä
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Nimike {0} on poistettu käytöstä
 DocType: Stock Settings,Stock Frozen Upto,varasto jäädytetty asti
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,Osaluettelo ei sisällä yhtäkään varastonimikettä
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Tehtävä
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,Osaluettelo ei sisällä yhtäkään varastonimikettä
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Tehtävä
 DocType: Vehicle Log,Refuelling Details,Tankkaaminen tiedot
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Tuota palkkalaskelmat
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}",osto tulee täpätä mikälisovellus on valittu {0}:na
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,alennus on oltava alle 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Viimeisin osto korko ei löytynyt
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Kirjoita Off Määrä (Yrityksen valuutta)
 DocType: Sales Invoice Timesheet,Billing Hours,Laskutus tuntia
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,Oletus BOM varten {0} ei löytynyt
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Rivi # {0}: Aseta täydennystilauksen yksikkömäärä
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Oletus BOM varten {0} ei löytynyt
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Rivi # {0}: Aseta täydennystilauksen yksikkömäärä
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Kosketa kohteita lisätä ne tästä
 DocType: Fees,Program Enrollment,Ohjelma Ilmoittautuminen
 DocType: Landed Cost Voucher,Landed Cost Voucher,Kohdistetut kustannukset
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Aseta {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Toista kuukauden päivänä
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} ei ole aktiivinen opiskelija
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} ei ole aktiivinen opiskelija
 DocType: Employee,Health Details,"terveys, lisätiedot"
 DocType: Offer Letter,Offer Letter Terms,Työtarjouksen ehdot
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Luoda maksatuspyyntö viiteasiakirja tarvitaan
-DocType: Payment Entry,Allocate Payment Amount,Allocate Maksusumma
+DocType: Payment Entry,Allocate Payment Amount,Varaa maksusumma
 DocType: Employee External Work History,Salary,Palkka
 DocType: Serial No,Delivery Document Type,Toimitus Dokumenttityyppi
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Vahvista kaikki palkkalaskelmat yllä valituin kriteerein
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} nimikettä synkronoitu
 DocType: Sales Order,Partly Delivered,Osittain toimitettu
 DocType: Email Digest,Receivables,Saatavat
 DocType: Lead Source,Lead Source,Liidin alkuperä
@@ -4694,19 +4783,19 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,vanhentumisen skaala 2
 DocType: SG Creation Tool Course,Max Strength,max Strength
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM korvattu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Valitse kohteet toimituspäivän perusteella
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Valitse kohteet toimituspäivän perusteella
 ,Sales Analytics,Myyntianalytiikka
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Käytettävissä {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Käytettävissä {0}
 ,Prospects Engaged But Not Converted,Näkymät Kihloissa Mutta ei muunneta
 DocType: Manufacturing Settings,Manufacturing Settings,valmistuksen asetukset
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Sähköpostin perusmääritykset
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Mobile Ei
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Syötä oletusvaluutta yritys valvonnassa
 DocType: Stock Entry Detail,Stock Entry Detail,Varastotapahtuman yksityiskohdat
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Päivittäinen Muistutukset
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Päivittäinen Muistutukset
 DocType: Products Settings,Home Page is Products,tuotteiden kotisivu
 ,Asset Depreciation Ledger,Asset Poistot Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Verosääntö on ristiriidassa kohdan {0} kanssa
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Verosääntö on ristiriidassa kohdan {0} kanssa
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,nimeä uusi tili
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Raaka-aine toimitettu kustannus
 DocType: Selling Settings,Settings for Selling Module,Myyntimoduulin asetukset
@@ -4720,8 +4809,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Nimike {0} pitää olla varastonimike
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Oletus KET-varasto
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,kirjanpidon tapahtumien oletusasetukset
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Aseta henkilöstön nimeämisjärjestelmä henkilöresursseihin&gt; HR-asetukset
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Odotettu päivä ei voi olla ennen hankintapyynnön tarvepäivää
+DocType: Restaurant,Default Tax Template,Oletusmaksutaulukko
 DocType: Fees,Student Details,Opiskelijan tiedot
 DocType: Purchase Invoice Item,Stock Qty,Stock kpl
 DocType: Employee Loan,Repayment Period in Months,Takaisinmaksuaika kuukausina
@@ -4739,8 +4829,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Siirry kohteisiin
 DocType: Sales Partner,Partner Type,Kumppani tyyppi
 DocType: Purchase Taxes and Charges,Actual,kiinteä määrä
+DocType: Restaurant Menu,Restaurant Manager,Ravintolapäällikkö
 DocType: Authorization Rule,Customerwise Discount,asiakaskohtainen alennus
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Tehtävien tuntilomake.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Tehtävien tuntilomake.
 DocType: Purchase Invoice,Against Expense Account,Kustannustilin kohdistus
 DocType: Production Order,Production Order,Tuotannon tilaus
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Asennustosite {0} on jo vahvistettu
@@ -4748,7 +4839,6 @@
 DocType: Quotation Item,Against Docname,Dokumentin nimi kohdistus
 DocType: SMS Center,All Employee (Active),kaikki työntekijät (aktiiviset)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Näytä nyt
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Valitse ajanjakso, jolloin lasku muodostetaan automaattisesti"
 DocType: BOM,Raw Material Cost,Raaka-ainekustannukset
 DocType: Item Reorder,Re-Order Level,Täydennystilaustaso
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Syötä nimikkeet ja suunniteltu yksikkömäärä, joille haluat lisätä tuotantotilauksia tai joista haluat ladata raaka-aine analyysin"
@@ -4761,23 +4851,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,raportin tyyppi vaaditaan
 DocType: Item,Serial Number Series,Sarjanumero sarjat
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Varasto vaaditaan varastotuotteelle {0} rivillä {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Lisää ohjelmat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Vähittäismyynti &amp; Tukkukauppa
 DocType: Issue,First Responded On,Ensimmäiset vastaavat
 DocType: Website Item Group,Cross Listing of Item in multiple groups,ristiluettelo tuotteille jotka on useammissa ryhmissä
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Tilikauden alkamispäivä ja tilikauden päättymispäivä on asetettu tilikaudelle {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Tilityspäivä päivitetty
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Erä
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split Erä
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,onnistuneesti täsmäytetty
 DocType: Request for Quotation Supplier,Download PDF,Lataa PDF
 DocType: Production Order,Planned End Date,Suunniteltu päättymispäivä
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Anna Aikataulun päivämäärä
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Missä nimikkeet varastoidaan.
 DocType: Request for Quotation,Supplier Detail,Toimittaja Detail
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Virhe kaavassa tai tila: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Virhe kaavassa tai tila: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,laskutettu
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kriteerien painojen on oltava jopa 100%
 DocType: Attendance,Attendance,osallistuminen
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,varastosta löytyvät
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,varastosta löytyvät
 DocType: BOM,Materials,Materiaalit
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","ellei ole täpättynä luettelo on lisättävä jokaiseen osastoon, jossa sitä sovelletaan"
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Source ja Target Varasto voi olla sama
@@ -4795,6 +4885,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,nettosummasta
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Attribuutin arvo {0} on oltava alueella {1} ja {2} ja lisäyksin {3} kohteelle {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Rivin {0} kohdevarasto pitää olla sama kuin tuotannon tilauksella
+DocType: Restaurant Reservation,Waitlisted,Jonossa
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Valuuttaa ei voi muuttaa sen jälkeen kun kirjauksia on jo tehty jossain toisessa valuutassa.
 DocType: Vehicle Service,Clutch Plate,kytkin Plate
 DocType: Company,Round Off Account,pyöristys tili
@@ -4811,7 +4902,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,New Sales Person Name
 DocType: Packing Slip,Gross Weight UOM,bruttopaino UOM
 DocType: Delivery Note Item,Against Sales Invoice,myyntilaskun kohdistus
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Anna sarjanumeroita serialized erä
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Anna sarjanumeroita serialized erä
 DocType: Bin,Reserved Qty for Production,Varattu Määrä for Production
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Jätä valitsematta jos et halua pohtia erän samalla tietenkin toimiviin ryhmiin.
 DocType: Asset,Frequency of Depreciation (Months),Taajuus Poistot (kuukautta)
@@ -4822,7 +4913,7 @@
 DocType: Lab Test,Test Group,Testiryhmä
 DocType: Payment Reconciliation,Receivable / Payable Account,Saatava / maksettava tili
 DocType: Delivery Note Item,Against Sales Order Item,Myyntitilauksen kohdistus / nimike
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Ilmoitathan Taito Vastinetta määrite {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Ilmoitathan Taito Vastinetta määrite {0}
 DocType: Item,Default Warehouse,oletus varasto
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},budjettia ei voi nimetä ryhmätiliin {0}
 DocType: Healthcare Settings,Patient Registration,Potilaan rekisteröinti
@@ -4851,6 +4942,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Myyjä
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Talousarvio ja kustannuspaikka
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Useita oletusmaksutapoja ei sallita
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,varten
 ,Appointment Analytics,Nimitys Analytics
 DocType: Vehicle Service,Half Yearly,6 kk
 DocType: Lead,Blog Subscriber,Blogin tilaaja
@@ -4868,7 +4960,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,quot Count
 ,BOM Stock Report,BOM Stock Report
 DocType: Stock Reconciliation Item,Quantity Difference,Määrä ero
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Palkanlaskenta
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Palkanlaskenta
 DocType: Opportunity Item,Basic Rate,perushinta
 DocType: GL Entry,Credit Amount,Luoton määrä
 DocType: Cheque Print Template,Signatory Position,Allekirjoittaja Position
@@ -4882,12 +4974,12 @@
 DocType: Tax Rule,Tax Rule,Verosääntöön
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,ylläpidä samaa tasoa läpi myyntisyklin
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Suunnittele aikaa lokit ulkopuolella Workstation työaikalain.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Asiakkaat jonossa
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0}: lla ei ole lääkärin ajoitusta. Lisää se Physician masteriin
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Asiakkaat jonossa
 DocType: Student,Nationality,kansalaisuus
 ,Items To Be Requested,Nimiketarpeet
-DocType: Purchase Order,Get Last Purchase Rate,käytä viimeisimmän edellisen oston hintoja
 DocType: Company,Company Info,yrityksen tiedot
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Valitse tai lisätä uuden asiakkaan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Valitse tai lisätä uuden asiakkaan
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Kustannuspaikkaa vaaditaan varata kulukorvauslasku
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),sovellus varat (vastaavat)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Tämä perustuu työntekijän läsnäoloihin
@@ -4895,6 +4987,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Luottotililtä
 DocType: Fiscal Year,Year Start Date,Vuoden aloituspäivä
 DocType: Attendance,Employee Name,työntekijän nimi
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Ravintola Tilaus Entry Item
 DocType: Sales Invoice,Rounded Total (Company Currency),pyöristys yhteensä (yrityksen  valuutta)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,ei voi kääntää ryhmiin sillä tilin tyyppi on valittu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} on muuttunut. Lataa uudelleen.
@@ -4905,6 +4998,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,työntekijä etuudet
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Pakattujen määrä tulee olla kuin tuotteen {0} määrä rivillä {1}
 DocType: Production Order,Manufactured Qty,valmistettu yksikkömäärä
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Lasku luotu
 DocType: Purchase Receipt Item,Accepted Quantity,hyväksytyt määrä
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Aseta oletus Holiday List Työntekijä {0} tai Company {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} ei löydy
@@ -4914,18 +5008,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Kulukorvauksen {1} rivillä {0}: määrä ei voi olla suurempi kuin jäljellä oleva määrä ({2}).
 DocType: Maintenance Schedule,Schedule,Aikataulu
 DocType: Account,Parent Account,Päätili
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,saatavissa
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,saatavissa
 DocType: Quality Inspection Reading,Reading 3,Lukema 3
 ,Hub,hubi
 DocType: GL Entry,Voucher Type,Tositetyyppi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Hinnastoa ei löydy tai se on poistettu käytöstä
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Hinnastoa ei löydy tai se on poistettu käytöstä
 DocType: Lab Test,Approved,hyväksytty
 DocType: Pricing Rule,Price,Hinta
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',"työntekijä vapautettu {0} tulee asettaa ""vasemmalla"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',"työntekijä vapautettu {0} tulee asettaa ""vasemmalla"""
+DocType: Hub Settings,Last Sync On,Viimeisin synkronointi päällä
 DocType: Guardian,Guardian,holhooja
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,työntekijälle {1} on tehty arviointi {0} ilmoitettuna päivänä
 DocType: Employee,Education,koulutus
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,del
 DocType: Selling Settings,Campaign Naming By,kampanja nimennyt
 DocType: Employee,Current Address Is,nykyinen osoite on
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Kuukausittainen myyntiketju (
@@ -4935,12 +5030,12 @@
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,"kirjanpito, päiväkirjakirjaukset"
 DocType: Delivery Note Item,Available Qty at From Warehouse,Available Kpl at varastosta
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Valitse työntekijä tietue ensin
-DocType: POS Profile,Account for Change Amount,Tili Change Summa
+DocType: POS Profile,Account for Change Amount,Vaihtotilin summa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rivi {0}: Party / Tili ei vastaa {1} / {2} ja {3} {4}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Kurssikoodi:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Syötä kustannustili
 DocType: Account,Stock,Varasto
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rivi # {0}: Reference Document Type on yksi Ostotilaus, Ostolasku tai Päiväkirjakirjaus"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rivi # {0}: Reference Document Type on yksi Ostotilaus, Ostolasku tai Päiväkirjakirjaus"
 DocType: Employee,Current Address,nykyinen osoite
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","mikäli tuote on toisen tuotteen malli tulee tuotteen kuvaus, kuva, hinnoittelu, verot ja muut tiedot oletuksena mallipohjasta ellei oletusta ole erikseen poistettu"
 DocType: Serial No,Purchase / Manufacture Details,Oston/valmistuksen lisätiedot
@@ -4971,7 +5066,7 @@
 DocType: Hub Settings,Hub Settings,hubi asetukset
 DocType: Project,Gross Margin %,bruttokate %
 DocType: BOM,With Operations,Toiminnoilla
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Kirjaukset on jo tehty valuutassa {0} yhtiön {1}. Valitse saamisen tai maksettava tilille valuutta {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Kirjaukset on jo tehty valuutassa {0} yhtiön {1}. Valitse saamisen tai maksettava tilille valuutta {0}.
 DocType: Asset,Is Existing Asset,Onko Olemassa Asset
 DocType: Salary Detail,Statistical Component,tilastollinen Komponentti
 DocType: Warranty Claim,If different than customer address,mikäli eri kuin asiakkan osoite
@@ -4979,13 +5074,14 @@
 DocType: BOM Operation,BOM Operation,BOM käyttö
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Edellisen rivin arvomäärä
 DocType: Student,Home Address,Kotiosoite
+DocType: Item,Has Expiry Date,On vanhentunut
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Kohta Variant-asetukset.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,siirto Asset
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,siirto Asset
 DocType: POS Profile,POS Profile,POS Profile
 DocType: Training Event,Event Name,Tapahtuman nimi
 DocType: Physician,Phone (Office),Puhelin (toimisto)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,sisäänpääsy
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Teatterikatsojamääriin {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,sisäänpääsy
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Teatterikatsojamääriin {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","kausivaihtelu asetukset esim, budjettiin, tavoitteisiin jne"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Muuttujan nimi
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Nimike {0} on mallipohja, valitse yksi sen variaatioista"
@@ -4994,7 +5090,7 @@
 DocType: Assessment Plan,Room,Huone
 DocType: Purchase Order,Advance Paid,Ennakkoon maksettu
 DocType: Item,Item Tax,Tuotteen vero
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Materiaali toimittajalle
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Materiaali toimittajalle
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Valmistevero Lasku
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Kynnys {0}% esiintyy useammin kuin kerran
 DocType: Expense Claim,Employees Email Id,työntekijän sähköpostiosoite
@@ -5005,32 +5101,30 @@
 DocType: Program,Program Name,Ohjelman nimi
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,pidetään veroille tai maksuille
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,todellinen yksikkömäärä on pakollinen arvo
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} on tällä hetkellä {1} toimittajan tuloskortin seisominen, ja tämän toimittajan antamat ostotilaukset tulisi antaa varoen."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} on tällä hetkellä {1} toimittajan tuloskortin seisominen, ja tämän toimittajan antamat ostotilaukset tulisi antaa varoen."
 DocType: Employee Loan,Loan Type,laina Tyyppi
 DocType: Scheduling Tool,Scheduling Tool,Ajoitustyökalun
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,luottokortti
 DocType: BOM,Item to be manufactured or repacked,tuote joka valmistetaan- tai pakataan uudelleen
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Varaston oletusasetukset.
-DocType: Purchase Invoice,Next Date,Seuraava päivä
 DocType: Employee Education,Major/Optional Subjects,Major / Vapaaehtoinen Aiheet
 DocType: Sales Invoice Item,Drop Ship,Suoratoimitus
+DocType: Hub Settings,Suspended,Keskeytetty
 DocType: Training Event,Attendees,Osallistujat
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","talleta tähän esim. perheen lisätiedot, kuten vanhempien nimi ja ammatti, puoliso ja lapset"
 DocType: Academic Term,Term End Date,Ehtojen päättymispäivä
-DocType: Hub Settings,Seller Name,Myyjä nimi
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Netto ilman veroja ja kuluja (yrityksen valuutassa)
 DocType: Item Group,General Settings,pääasetukset
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Lähde- ja kohdevaluutta eivät voi olla samoja
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Lisää opettajia
 DocType: Stock Entry,Repack,Pakkaa uudelleen
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Sinun tulee tallentaa lomake ennen kuin jatkat
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Valitse ensin yritys
 DocType: Item Attribute,Numeric Values,Numeroarvot
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Kiinnitä Logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Stock Levels
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Stock Levels
 DocType: Customer,Commission Rate,provisio
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Luotu {0} tuloskartan {1} välillä:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Tee Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Tee Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,estä poistumissovellukset osastoittain
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Maksu tyyppi on yksi vastaanottaminen, Pay ja sisäinen siirto"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytiikka
@@ -5043,13 +5137,15 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,salli tuotanto lomapäivinä
 DocType: Sales Order,Customer's Purchase Order Date,asiakkaan ostotilaus päivä
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,osakepääoma
-DocType: Shopping Cart Settings,Show Public Attachments,Näytä Julkinen Liitteet
+DocType: Shopping Cart Settings,Show Public Attachments,Näytä Julkiset Liitteet
 DocType: Packing Slip,Package Weight Details,"Pakkauspaino, lisätiedot"
+DocType: Restaurant Reservation,Reservation Time,Varausaika
 DocType: Payment Gateway Account,Payment Gateway Account,Maksu Gateway tili
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Maksun jälkeen valmistumisen ohjata käyttäjän valitulle sivulle.
 DocType: Company,Existing Company,Olemassa Company
 DocType: Healthcare Settings,Result Emailed,Tulos lähetettiin sähköpostitse
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","Veroluokka on muutettu &quot;Total&quot;, koska kaikki tuotteet ovat ei-varastosta löytyvät"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Group&gt; Tuotemerkki
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Valitse csv tiedosto
 DocType: Student Leave Application,Mark as Present,Merkitse Present
 DocType: Supplier Scorecard,Indicator Color,Indikaattorin väri
@@ -5074,11 +5170,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Tee Student Erä
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,siirretääkö
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Hae nimikkeet osaluettelolta
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Hae nimikkeet osaluettelolta
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,"virtausaika, päivää"
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rivi # {0}: julkaisupäivä on oltava sama kuin ostopäivästä {1} asset {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Valitse tämä jos opiskelija oleskelee instituutin Hostel.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Syötä Myyntitilaukset edellä olevasta taulukosta
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Syötä Myyntitilaukset edellä olevasta taulukosta
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Vahvistamattomat palkkatositteet
 ,Stock Summary,Stock Yhteenveto
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Luovuttaa omaisuuttaan yhdestä varastosta another
@@ -5094,5 +5190,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},rivi {0}: debet kirjausta ei voi kohdistaa {1}
 DocType: Journal Entry,Subscription Section,Tilausjakso
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,tiliä {0} ei löydy
+DocType: Training Event,Training Program,Koulutusohjelma
 DocType: Account,Cash,Käteinen
 DocType: Employee,Short biography for website and other publications.,Lyhyt historiikki verkkosivuille ja muihin julkaisuihin
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index 7285868..eaf01fb 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -1,10 +1,10 @@
 DocType: Employee,Salary Mode,Mode de Rémunération
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,registre
 DocType: Patient,Divorced,Divorcé
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Articles déjà synchronisés
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Autoriser un article à être ajouté plusieurs fois dans une transaction
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Annuler la Visite Matérielle {0} avant d'annuler cette Réclamation de Garantie
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produits de Consommation
-DocType: Purchase Receipt,Subscription Detail,Détail de l&#39;abonnement
+DocType: Purchase Receipt,Subscription Detail,Détail de l'Abonnement
 DocType: Supplier Scorecard,Notify Supplier,Notifier Fournisseur
 DocType: Item,Customer Items,Articles du clients
 DocType: Project,Costing and Billing,Coûts et Facturation
@@ -17,21 +17,21 @@
 DocType: Employee,Leave Approvers,Approbateurs de Congés
 DocType: Sales Partner,Dealer,Revendeur
 DocType: Consultation,Investigations,Enquêtes
+DocType: Restaurant Order Entry,Click Enter To Add,Cliquez sur Entrée pour ajouter
 DocType: Employee,Rented,Loué
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Applicable pour l'Utilisateur
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Un Ordre de Fabrication Arrêté ne peut pas être annulé, remettez le d'abord en marche pour l'annuler"
 DocType: Vehicle Service,Mileage,Kilométrage
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Voulez-vous vraiment mettre cet actif au rebut ?
-DocType: Drug Prescription,Update Schedule,Calendrier de mise à jour
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Voulez-vous vraiment mettre cet actif au rebut ?
+DocType: Drug Prescription,Update Schedule,Mettre à Jour le Calendrier
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Sélectionner le Fournisseur par Défaut
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Devise est nécessaire pour la liste de prix {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Sera calculé lors de la transaction.
 DocType: Purchase Order,Customer Contact,Contact Client
-DocType: Patient Appointment,Check availability,Voir les disponibilités
+DocType: Patient Appointment,Check availability,Voir les Disponibilités
 DocType: Job Applicant,Job Applicant,Demandeur d'Emploi
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Basé sur les transactions avec ce fournisseur. Voir la chronologie ci-dessous pour plus de détails
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Aucun résultat additionnel.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Juridique
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Le type de taxe réel ne peut pas être inclus dans le prix de l'Article à la ligne {0}
 DocType: Bank Guarantee,Customer,Client
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Taux de Change doit être le même que {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nom du Client
 DocType: Vehicle,Natural Gas,Gaz Naturel
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Compte Bancaire ne peut pas être nommé {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Compte Bancaire ne peut pas être nommé {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Titres (ou groupes) sur lequel les entrées comptables sont faites et les soldes sont maintenus.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Solde pour {0} ne peut pas être inférieur à zéro ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Il n'y a aucune Fiche de Paie à traiter.
 DocType: Manufacturing Settings,Default 10 mins,10 minutes Par Défaut
 DocType: Leave Type,Leave Type Name,Nom du Type de Congé
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Afficher ouverte
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Il est nécessaire de prendre cette action aujourd&#39;hui même pour les récurrents mentionnés ci-dessus
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Mise à jour des Séries Réussie
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Règlement
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accumulation des Journaux d'Écritures Soumis
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Articles à Recevoir du Bon de Commande
 DocType: SMS Center,All Supplier Contact,Tous les Contacts Fournisseurs
 DocType: Support Settings,Support Settings,Réglages du Support
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Date de Fin Attendue ne peut pas être antérieure à Date de Début Attendue
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Date de Fin Attendue ne peut pas être antérieure à Date de Début Attendue
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ligne #{0} : Le Prix doit être le même que {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Nouvelle Demande de Congés
 ,Batch Item Expiry Status,Statut d'Expiration d'Article du Lot
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Traite Bancaire
 DocType: Mode of Payment Account,Mode of Payment Account,Compte du Mode de Paiement
 DocType: Consultation,Consultation,Consultation
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Ventes et retours
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Afficher les Variantes
 DocType: Academic Term,Academic Term,Terme Académique
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Matériel
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Soins de Santé
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Retard de paiement (jours)
 DocType: Lab Prescription,Lab Prescription,Prescription de laboratoire
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Trier par prix
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Frais de Service
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Numéro de Série: {0} est déjà référencé dans la Facture de Vente: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Facture
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Numéro de Série: {0} est déjà référencé dans la Facture de Vente: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Facture
 DocType: Maintenance Schedule Item,Periodicity,Périodicité
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Exercice Fiscal {0} est nécessaire
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Défense
@@ -91,23 +94,23 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Ligne # {0} :
 DocType: Timesheet,Total Costing Amount,Montant Total des Coûts
 DocType: Delivery Note,Vehicle No,N° du Véhicule
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Veuillez sélectionner une Liste de Prix
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Veuillez sélectionner une Liste de Prix
 DocType: Accounts Settings,Currency Exchange Settings,Paramètres d&#39;échange de devises
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Ligne #{0} : Document de paiement nécessaire pour compléter la transaction
 DocType: Production Order Operation,Work In Progress,Travaux En Cours
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Veuillez sélectionner une date
 DocType: Employee,Holiday List,Liste de Vacances
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Veuillez configurer le système de nomination de l&#39;instructeur à l&#39;école&gt; Paramètres scolaires
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Comptable
-DocType: Patient,Tobacco Current Use,Utilisation actuelle du tabac
+DocType: Hub Settings,Selling Price List,Liste de prix de vente
+DocType: Patient,Tobacco Current Use,Consommation actuelle de tabac
 DocType: Cost Center,Stock User,Chargé des Stocks
 DocType: Company,Phone No,N° de Téléphone
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Horaires des Cours créés:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Nouveau(elle) {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Nouveau(elle) {0}: # {1}
 ,Sales Partners Commission,Commission des Partenaires de Vente
-DocType: Purchase Invoice,Rounding Adjustment,Réglage de l&#39;arrondissement
+DocType: Purchase Invoice,Rounding Adjustment,Réglage de l'arrondi
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,L'abbréviation ne peut pas avoir plus de 5 caractères
-DocType: Physician Schedule Time Slot,Physician Schedule Time Slot,Horaire Horaire du médecin
+DocType: Physician Schedule Time Slot,Physician Schedule Time Slot,Créneaux Horaires du Médecin
 DocType: Payment Request,Payment Request,Requête de Paiement
 DocType: Asset,Value After Depreciation,Valeur Après Amortissement
 DocType: Employee,O+,O+
@@ -124,18 +127,17 @@
 DocType: Packed Item,Parent Detail docname,Nom de Document du Détail Parent
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Référence: {0}, Code de l&#39;article: {1} et Client: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kg
-DocType: Student Log,Log,Journal
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Ouverture d'un Emploi.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Résultat soumis
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,Résultat {0} soumis
 DocType: Item Attribute,Increment,Incrément
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Timespan
+apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Période
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Sélectionner l'Entrepôt ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicité
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,La même Société a été entrée plus d'une fois
 DocType: Patient,Married,Marié
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Non autorisé pour {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Obtenir les articles de
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Stock ne peut pas être mis à jour pour le Bon de Livraison {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Stock ne peut pas être mis à jour pour le Bon de Livraison {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produit {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Aucun article référencé
 DocType: Payment Reconciliation,Reconcile,Réconcilier
@@ -144,30 +146,31 @@
 DocType: Process Payroll,Make Bank Entry,Créer une Écriture Bancaire
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fonds de Pension
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,La Date de l’Amortissement Suivant ne peut pas être avant la Date d’Achat
-DocType: Consultation,Consultation Date,Date de consultation
+DocType: Consultation,Consultation Date,Date de Consultation
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Liste de produits et découverte pour les utilisateurs ERPNext
 DocType: SMS Center,All Sales Person,Tous les Commerciaux
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**Répartition Mensuelle** vous aide à diviser le Budget / la Cible sur plusieurs mois si vous avez de la saisonnalité dans votre entreprise.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Pas d'objets trouvés
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Grille des Salaires Manquante
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Pas d'objets trouvés
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Grille des Salaires Manquante
 DocType: Lead,Person Name,Nom de la Personne
 DocType: Sales Invoice Item,Sales Invoice Item,Article de la Facture de Vente
 DocType: Account,Credit,Crédit
 DocType: POS Profile,Write Off Cost Center,Centre de Coûts des Reprises
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""","e.g. ""École Primaire"" ou ""Université"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""","e.g. ""École Primaire"" ou ""Université"""
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Rapports de Stock
 DocType: Warehouse,Warehouse Detail,Détail de l'Entrepôt
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},La limite de crédit a été franchie pour le client {0} {1}/{2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,La Date de Fin de Terme ne peut pas être postérieure à la Date de Fin de l'Année Académique à laquelle le terme est lié (Année Académique {}). Veuillez corriger les dates et essayer à nouveau.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",'Est un Actif Immobilisé’ doit être coché car il existe une entrée d’Actif pour cet article
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",'Est un Actif Immobilisé’ doit être coché car il existe une entrée d’Actif pour cet article
 DocType: Vehicle Service,Brake Oil,Liquide de Frein
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe de clients&gt; Territoire
 DocType: Tax Rule,Tax Type,Type de Taxe
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Montant Taxable
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Vous n'êtes pas autorisé à ajouter ou faire une mise à jour des écritures avant le {0}
 DocType: BOM,Item Image (if not slideshow),Image de l'Article (si ce n'est diaporama)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Un Client existe avec le même nom
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarif Horaire / 60) * Temps Réel d’Opération
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Ligne {0}: Le Type de Document de Référence doit être soit une Demande de Remboursement soit une Entrée de Journal
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Sélectionner LDM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Ligne {0}: Le Type de Document de Référence doit être soit une Demande de Remboursement soit une Entrée de Journal
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Sélectionner LDM
 DocType: SMS Log,SMS Log,Journal des SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Coût des Articles Livrés
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Le jour de vacances {0} n’est pas compris entre la Date Initiale et la Date Finale
@@ -194,8 +197,8 @@
 DocType: BOM,Total Cost,Coût Total
 DocType: Journal Entry Account,Employee Loan,Prêt Employé
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Journal d'Activité :
-DocType: Fee Schedule,Send Payment Request Email,Envoyer un courriel de demande de paiement
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,L'article {0} n'existe pas dans le système ou a expiré
+DocType: Fee Schedule,Send Payment Request Email,Envoyer un Email de Demande de Paiement
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,L'article {0} n'existe pas dans le système ou a expiré
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Immobilier
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Relevé de Compte
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Médicaments
@@ -210,22 +213,27 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Journal d'Importation
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Récupérer les Demandes de Matériel de Type Production sur la base des critères ci-dessus
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Désinscription réussie.
 DocType: Training Result Employee,Grade,Note
+DocType: Restaurant Table,No of Seats,Nombre de sièges
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Pour ajouter un sujet dynamique, utilisez des tags jinja comme <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Livré par le Fournisseur
 DocType: SMS Center,All Contact,Tout Contact
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Ordre de Production déjà créé pour tous les articles avec LDM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Ordre de Production déjà créé pour tous les articles avec LDM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Salaire Annuel
 DocType: Daily Work Summary,Daily Work Summary,Récapitulatif Quotidien de Travail
 DocType: Period Closing Voucher,Closing Fiscal Year,Clôture de l'Exercice
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} est gelée
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Veuillez sélectionner une Société Existante pour créer un Plan de Compte
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} est gelée
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Veuillez sélectionner une Société Existante pour créer un Plan de Compte
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Charges de Stock
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Sélectionner l'Entrepôt Cible
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Sélectionner l'Entrepôt Cible
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Veuillez entrer l’Email de Contact Préférré
 DocType: Program Enrollment,School Bus,Bus Scolaire
 DocType: Journal Entry,Contra Entry,Contre-passation
 DocType: Journal Entry Account,Credit in Company Currency,Crédit dans la Devise de la Société
-DocType: Lab Test UOM,Lab Test UOM,Test de laboratoire UOM
+DocType: Lab Test UOM,Lab Test UOM,UDM de test de laboratoire
 DocType: Delivery Note,Installation Status,Etat de l'Installation
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +135,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Voulez-vous mettre à jour la fréquentation? <br> Présents: {0} \ <br> Absent: {1}
@@ -238,9 +246,10 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Téléchargez le modèle, remplissez les données appropriées et joignez le fichier modifié.
 Toutes les dates et combinaisons d’employés pour la période choisie seront inclus dans le modèle, avec les registres des présences existants"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,L'article {0} n’est pas actif ou sa fin de vie a été atteinte
+DocType: Student Admission Program,Minimum Age,Âge minimum
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Exemple : Mathématiques de Base
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Pour inclure la taxe de la ligne {0} dans le prix de l'Article, les taxes des lignes {1} doivent également être incluses"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Réglages pour le Module RH
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Réglages pour le Module RH
 DocType: SMS Center,SMS Center,Centre des SMS
 DocType: Sales Invoice,Change Amount,Changer le Montant
 DocType: BOM Update Tool,New BOM,Nouvelle LDM
@@ -250,7 +259,7 @@
 DocType: Lead,Request Type,Type de Demande
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Créer un Employé
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Radio/Télévision
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Ajouter des Salles
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Mode de configuration de POS (en ligne / hors ligne)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Exécution
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Détails des opérations effectuées.
 DocType: Serial No,Maintenance Status,Statut d'Entretien
@@ -269,10 +278,11 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,États Financiers
 DocType: Guardian,Students,Étudiants
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Règles pour l’application des tarifs et des remises.
-DocType: Physician Schedule,Time Slots,Tranches de temps
+DocType: Physician Schedule,Time Slots,Créneaux Horaires
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,La Liste de Prix doit être applicable pour les Achats et les Ventes
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Date d'installation ne peut pas être avant la date de livraison pour l'Article {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Remise sur la Liste des Prix (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Biochimie
 DocType: Offer Letter,Select Terms and Conditions,Sélectionner les Termes et Conditions
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,Valeur Sortante
 DocType: Production Planning Tool,Sales Orders,Commandes Clients
@@ -298,25 +308,25 @@
 DocType: Company,Default Payroll Payable Account,Compte de Paie par Défaut
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +51,Update Email Group,Metter à jour le Groupe d'Email
 DocType: Sales Invoice,Is Opening Entry,Est Écriture Ouverte
-DocType: Lab Test Template,"If unchecked, the item wont be appear in Sales Invoice, but can be used in group test creation. ","Si elle n&#39;est pas cochée, l&#39;élément n&#39;apparaîtra pas dans la facture de vente, mais peut être utilisé dans la création de test de groupe."
+DocType: Lab Test Template,"If unchecked, the item wont be appear in Sales Invoice, but can be used in group test creation. ","Si non cochée, l'article n'apparaîtra pas dans la facture de vente, mais peut être utilisé dans la création de test de groupe."
 DocType: Customer Group,Mention if non-standard receivable account applicable,Mentionner si le compte débiteur applicable n'est pas standard
 DocType: Course Schedule,Instructor Name,Nom de l'Instructeur
 DocType: Supplier Scorecard,Criteria Setup,Configuration du Critère
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,For Warehouse is required before Submit,Pour l’Entrepôt est requis avant de Soumettre
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Reçu Le
 DocType: Sales Partner,Reseller,Revendeur
-DocType: Codification Table,Medical Code,Code médical
+DocType: Codification Table,Medical Code,Code Médical
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Si cochée, comprendra des articles hors stock dans les Demandes de Matériel."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Veuillez entrer une Société
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Veuillez entrer une Société
 DocType: Delivery Note Item,Against Sales Invoice Item,Pour l'Article de la Facture de Vente
 ,Production Orders in Progress,Ordres de Production en Cours
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Trésorerie Nette des Financements
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","Le Stockage Local est plein, l’enregistrement n’a pas fonctionné"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","Le Stockage Local est plein, l’enregistrement n’a pas fonctionné"
 DocType: Lead,Address & Contact,Adresse &amp; Contact
 DocType: Leave Allocation,Add unused leaves from previous allocations,Ajouter les congés inutilisés des précédentes allocations
 DocType: Sales Partner,Partner website,Site Partenaire
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Ajouter un Article
-DocType: Lab Test,Custom Result,Résultat personnalisé
+DocType: Restaurant Order Entry,Add Item,Ajouter un Article
+DocType: Lab Test,Custom Result,Résultat Personnalisé
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Nom du Contact
 DocType: Course Assessment Criteria,Course Assessment Criteria,Critères d'Évaluation du Cours
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crée la fiche de paie pour les critères mentionnés ci-dessus.
@@ -326,9 +336,10 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Assessment Plan: ,Plan d'Évaluation:
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Aucune Description
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Demande d'Achat.
-DocType: Lab Test,Submitted Date,Date proposée
+DocType: Lab Test,Submitted Date,Date Soumise
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Basé sur les Feuilles de Temps créées pour ce projet
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Salaire Net ne peut pas être inférieur à 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Salaire Net ne peut pas être inférieur à 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Pour arrêter d&#39;envoyer des notifications d&#39;erreurs répétitives du système, nous avons coché la case Disabled dans l&#39;abonnement"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Seul l'Approbateur de Congé sélectionné peut soumettre cette Demande de Congé
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,La Date de Relève doit être postérieure à la Date d’Embauche
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Congés par Année
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,Profits & Pertes
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Litre
 DocType: Task,Total Costing Amount (via Time Sheet),Montant Total des Coûts (via Feuille de Temps)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Veuillez configurer les étudiants sous les groupes d&#39;étudiants
 DocType: Item Website Specification,Item Website Specification,Spécification de l'Article sur le Site Web
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Laisser Verrouillé
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},L'article {0} a atteint sa fin de vie le {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},L'article {0} a atteint sa fin de vie le {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Écritures Bancaires
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Annuel
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Article de Réconciliation du Stock
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Cours sur l'Outil de Création de Groupe d'Étudiants
 DocType: Lead,Do Not Contact,Ne Pas Contacter
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,Personnes qui enseignent dans votre organisation
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,L'identifiant unique pour le suivi de toutes les factures récurrentes. Il est généré lors de la soumission.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Developeur Logiciel
 DocType: Item,Minimum Order Qty,Qté de Commande Minimum
 DocType: Pricing Rule,Supplier Type,Type de Fournisseur
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,Publier dans le Hub
 DocType: Student Admission,Student Admission,Admission des Étudiants
 ,Terretory,Territoire
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Article {0} est annulé
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Demande de Matériel
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Article {0} est annulé
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Demande de Matériel
 DocType: Bank Reconciliation,Update Clearance Date,Mettre à Jour la Date de Compensation
 DocType: Item,Purchase Details,Détails de l'Achat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Article {0} introuvable dans la table 'Matières Premières Fournies' dans la Commande d'Achat {1}
 DocType: Patient Relation,Relation,Relation
 DocType: Shipping Rule,Worldwide Shipping,Livraison Internationale
 DocType: Patient Relation,Mother,Mère
+DocType: Restaurant Reservation,Reservation End Time,Heure de fin de la réservation
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Commandes confirmées des clients.
 DocType: Purchase Receipt Item,Rejected Quantity,Quantité Rejetée
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Demande de paiement {0} créée
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Demande de paiement {0} créée
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Faible sensibilité
 DocType: Notification Control,Notification Control,Contrôle de Notification
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Veuillez confirmer une fois que vous avez terminé votre formation
 DocType: Lead,Suggestions,Suggestions
@@ -388,7 +401,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Envoi des fiches de paie à l'employé par Email en fonction de l'email sélectionné dans la fiche Employé
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Le premier Approbateur de Congé dans la liste sera défini comme Approbateur par défaut
 DocType: Tax Rule,Shipping County,Comté de Livraison
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Apprendre
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Apprendre
 DocType: Asset,Next Depreciation Date,Date de l’Amortissement Suivant
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Coût de l'Activité par Employé
 DocType: Accounts Settings,Settings for Accounts,Réglages pour les Comptes
@@ -399,13 +412,13 @@
 DocType: Item,Synced With Hub,Synchronisé avec le Hub
 DocType: Vehicle,Fleet Manager,Gestionnaire de Flotte
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Ligne #{0} : {1} ne peut pas être négatif pour l’article {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Mauvais Mot De Passe
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Mauvais Mot De Passe
 DocType: Item,Variant Of,Variante De
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"Qté Terminée ne peut pas être supérieure à ""Quantité de Fabrication"""
 DocType: Period Closing Voucher,Closing Account Head,Responsable du Compte Clôturé
 DocType: Employee,External Work History,Historique de Travail Externe
-DocType: Physician,Time per Appointment,Heure par rendez-vous
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Erreur de Référence Circulaire
+DocType: Physician,Time per Appointment,Temps par Rendez-Vous
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Erreur de Référence Circulaire
 DocType: Appointment Type,Is Inpatient,Est hospitalisé
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Nom du Tuteur 1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,En Toutes Lettres (Exportation) Sera visible une fois que vous enregistrerez le Bon de Livraison.
@@ -414,19 +427,18 @@
 DocType: Lead,Industry,Industrie
 DocType: Employee,Job Profile,Profil de l'Emploi
 DocType: BOM Item,Rate & Amount,Taux et Montant
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Veuillez configurer la série de numérotation pour la présence via Configuration&gt; Série de numérotation
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Ceci est basé sur les transactions contre cette Société. Voir le calendrier ci-dessous pour plus de détails
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notifier par Email lors de la création automatique de la Demande de Matériel
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Résistant
 DocType: Journal Entry,Multi Currency,Multi-Devise
 DocType: Payment Reconciliation Invoice,Invoice Type,Type de Facture
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Client&gt; Client Group&gt; Territoire
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Bon de Livraison
-DocType: Consultation,Encounter Impression,Encounter Impression
+DocType: Consultation,Encounter Impression,Impression de la Visite
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Configuration des Impôts
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Coût des Immobilisations Vendus
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,L’Écriture de Paiement a été modifié après que vous l’ayez récupérée. Veuillez la récupérer à nouveau.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} est entré deux fois dans la Taxe de l'Article
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Résumé de la semaine et des activités en suspens
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} est entré deux fois dans la Taxe de l'Article
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Résumé de la semaine et des activités en suspens
 DocType: Student Applicant,Admitted,Admis
 DocType: Workstation,Rent Cost,Coût de la Location
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Montant Après Amortissement
@@ -440,36 +452,35 @@
 DocType: Shipping Rule,Valid for Countries,Valable pour les Pays
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Cet Article est un Modèle et ne peut être utilisé dans les transactions. Les Attributs d’Articles seront copiés dans les variantes sauf si ‘Pas de Copie’ est coché
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total de la Commande Considéré
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Intitulé de poste (e.g.  Directeur Général, Directeur...)"
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Intitulé de poste (e.g.  Directeur Général, Directeur...)"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Taux auquel la Devise Client est convertie en devise client de base
 DocType: Course Scheduling Tool,Course Scheduling Tool,Outil de Planification des Cours
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ligne #{0} : La Facture d'Achat ne peut être faite pour un actif existant {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,Erreur [Urgent] lors de la création de% s récurrents pour% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Urgent] Erreur lors de la création de %s récurrents pour %s
 DocType: Item Tax,Tax Rate,Taux d'Imposition
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} déjà alloué pour l’Employé {1} pour la période {2} à {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Sélectionner l'Article
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Sélectionner l'Article
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,La Facture d’Achat {0} est déjà soumise
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Ligne # {0} : Le N° de Lot doit être le même que {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convertir en non-groupe
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Lot d'un Article.
 DocType: C-Form Invoice Detail,Invoice Date,Date de la Facture
 DocType: GL Entry,Debit Amount,Montant du Débit
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Il ne peut y avoir qu’un Compte par Société dans {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Veuillez voir la pièce jointe
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Il ne peut y avoir qu’un Compte par Société dans {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Veuillez voir la pièce jointe
 DocType: Purchase Order,% Received,% Reçu
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Créer des Groupes d'Étudiants
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Configuration déjà terminée !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Configuration déjà terminée !
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Montant de la Note de Crédit
-DocType: Setup Progress Action,Action Document,Document d&#39;action
+DocType: Setup Progress Action,Action Document,Document d'Action
 ,Finished Goods,Produits Finis
 DocType: Delivery Note,Instructions,Instructions
 DocType: Quality Inspection,Inspected By,Inspecté Par
 DocType: Maintenance Visit,Maintenance Type,Type d'Entretien
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} n'est pas inscrit dans le Cours {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Code de l&#39;article&gt; Groupe d&#39;articles&gt; Marque
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} n'est pas inscrit dans le Cours {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},N° de Série {0} ne fait pas partie du Bon de Livraison {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,Demo ERPNext
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Ajouter des Articles
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Ajouter des Articles
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Paramètre d'Inspection de Qualité de l'Article
 DocType: Leave Application,Leave Approver Name,Nom de l'Approbateur de Congés
 DocType: Depreciation Schedule,Schedule Date,Date du Calendrier
@@ -485,11 +496,11 @@
 DocType: Email Digest,Credit Balance,Solde du Crédit
 DocType: Employee,Widowed,Veuf
 DocType: Request for Quotation,Request for Quotation,Appel d'Offre
-DocType: Healthcare Settings,Require Lab Test Approval,Exiger l&#39;approbation du test de laboratoire
+DocType: Healthcare Settings,Require Lab Test Approval,Nécessite l'Approbation du Test de Laboratoire
 DocType: Salary Slip Timesheet,Working Hours,Heures de Travail
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Changer le numéro initial/actuel d'une série existante.
 DocType: Dosage Strength,Strength,Force
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Créer un nouveau Client
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Créer un nouveau Client
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Si plusieurs Règles de Prix continuent de prévaloir, les utilisateurs sont invités à définir manuellement la priorité pour résoudre les conflits."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Créer des Commandes d'Achat
 ,Purchase Register,Registre des Achats
@@ -508,7 +519,7 @@
 DocType: Lab Test Template,Single,Unique
 DocType: Salary Slip,Total Loan Repayment,Total de Remboursement du Prêt
 DocType: Account,Cost of Goods Sold,Coût des marchandises vendues
-DocType: Purchase Invoice,Yearly,Annuel
+DocType: Subscription,Yearly,Annuel
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Veuillez entrer un Centre de Coûts
 DocType: Drug Prescription,Dosage,Dosage
 DocType: Journal Entry Account,Sales Order,Commande Client
@@ -538,7 +549,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Paramètres globaux pour tous les processus de fabrication.
 DocType: Accounts Settings,Accounts Frozen Upto,Comptes Gelés Jusqu'au
 DocType: SMS Log,Sent On,Envoyé le
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Attribut {0} sélectionné à plusieurs reprises dans le Tableau des Attributs
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Attribut {0} sélectionné à plusieurs reprises dans le Tableau des Attributs
 DocType: HR Settings,Employee record is created using selected field. ,Le dossier de l'employé est créé en utilisant le champ sélectionné.
 DocType: Sales Order,Not Applicable,Non Applicable
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Données de Base des Vacances
@@ -559,44 +570,45 @@
 DocType: Item Attribute,To Range,Au Rang
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Titres et Dépôts
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Impossible de modifier la méthode de valorisation, car il existe des transactions sur certains articles ne possèdant pas leur propre méthode de valorisation"
-apps/erpnext/erpnext/config/healthcare.py +133,Test Sample Master.,Test Sample Master.
+apps/erpnext/erpnext/config/healthcare.py +133,Test Sample Master.,Données de Base d'Échantillon de Test.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Total des Congés attribués est obligatoire
 DocType: Patient,AB Positive,AB Positif
 DocType: Job Opening,Description of a Job Opening,Description d'une Nouvelle Offre d’Emploi
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Activités en Attente pour aujourd'hui
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Activités en Attente pour aujourd'hui
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Registre des présences.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Composante Salariale pour la rémunération basée sur la feuille de temps
 DocType: Sales Order Item,Used for Production Plan,Utilisé pour Plan de Production
 DocType: Employee Loan,Total Payment,Paiement Total
 DocType: Manufacturing Settings,Time Between Operations (in mins),Temps entre les opérations (en min)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,"{0} {1} est annulé, donc l'action ne peut pas être complétée"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,"{0} {1} est annulé, donc l'action ne peut pas être complétée"
 DocType: Customer,Buyer of Goods and Services.,Acheteur des Biens et Services.
 DocType: Journal Entry,Accounts Payable,Comptes Créditeurs
 DocType: Patient,Allergies,Allergies
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +30,The selected BOMs are not for the same item,Les LDMs sélectionnées ne sont pas pour le même article
 DocType: Supplier Scorecard Standing,Notify Other,Notifier Autre
-DocType: Vital Signs,Blood Pressure (systolic),Pression artérielle (systolique)
+DocType: Vital Signs,Blood Pressure (systolic),Pression Artérielle (Systolique)
 DocType: Pricing Rule,Valid Upto,Valide Jusqu'au
 DocType: Training Event,Workshop,Atelier
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Avertir lors de Bons de Commande
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Listez quelques-uns de vos clients. Ils peuvent être des entreprise ou des individus.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Pièces Suffisantes pour Construire
+DocType: POS Profile User,POS Profile User,Utilisateur du profil POS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Revenu Direct
-DocType: Patient Appointment,Date TIme,Date heure
+DocType: Patient Appointment,Date TIme,Date Heure
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Impossible de filtrer sur le Compte , si les lignes sont regroupées par Compte"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Agent Administratif
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Veuillez sélectionner un Cours
-DocType: Codification Table,Codification Table,Tableau de codification
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Veuillez sélectionner un Cours
+DocType: Codification Table,Codification Table,Tableau de Codifications
 DocType: Timesheet Detail,Hrs,Hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Veuillez sélectionner une Société
 DocType: Stock Entry Detail,Difference Account,Compte d’Écart
 DocType: Purchase Invoice,Supplier GSTIN,GSTIN du Fournisseur
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Impossible de fermer une tâche si tâche dépendante {0} n'est pas fermée.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,Veuillez entrer l’Entrepôt pour lequel une Demande de Matériel sera faite
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Impossible de fermer une tâche si tâche dépendante {0} n'est pas fermée.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Veuillez entrer l’Entrepôt pour lequel une Demande de Matériel sera faite
 DocType: Production Order,Additional Operating Cost,Coût d'Exploitation Supplémentaires
 DocType: Lab Test Template,Lab Routine,Routine de laboratoire
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Produits de Beauté
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Pour fusionner, les propriétés suivantes doivent être les mêmes pour les deux articles"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Pour fusionner, les propriétés suivantes doivent être les mêmes pour les deux articles"
 DocType: Shipping Rule,Net Weight,Poids Net
 DocType: Employee,Emergency Phone,Téléphone d'Urgence
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Acheter
@@ -606,18 +618,19 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Veuillez définir une note pour le Seuil 0%
 DocType: Sales Order,To Deliver,À Livrer
 DocType: Purchase Invoice Item,Item,Article
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,N° de série de l'article ne peut pas être une fraction
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Haute sensibilité
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,N° de série de l'article ne peut pas être une fraction
 DocType: Journal Entry,Difference (Dr - Cr),Écart (Dr - Cr )
 DocType: Account,Profit and Loss,Pertes et Profits
-DocType: Patient,Risk Factors,Facteurs de risque
-DocType: Patient,Occupational Hazards and Environmental Factors,Dangers professionnels et facteurs environnementaux
-DocType: Vital Signs,Respiratory rate,Fréquence respiratoire
+DocType: Patient,Risk Factors,Facteurs de Risque
+DocType: Patient,Occupational Hazards and Environmental Factors,Dangers Professionnels et Facteurs Environnementaux
+DocType: Vital Signs,Respiratory rate,Fréquence Respiratoire
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Gestion de la Sous-traitance
-DocType: Vital Signs,Body Temperature,Température corporelle
+DocType: Vital Signs,Body Temperature,Température Corporelle
 DocType: Project,Project will be accessible on the website to these users,Le Projet sera accessible sur le site web à ces utilisateurs
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Définir le Type de Projet.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Définir le Type de Projet.
 DocType: Supplier Scorecard,Weighting Function,Fonction de Pondération
-DocType: Physician,OP Consulting Charge,OP Consulting Charge
+DocType: Physician,OP Consulting Charge,Honoraires de Consulations Externe
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Configurez votre
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Taux auquel la devise de la Liste de prix est convertie en devise société de base
 apps/erpnext/erpnext/setup/doctype/company/company.py +62,Account {0} does not belong to company: {1},Le compte {0} n'appartient pas à la société : {1}
@@ -629,20 +642,20 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Incrément ne peut pas être 0
 DocType: Production Planning Tool,Material Requirement,Exigence Matériel
 DocType: Company,Delete Company Transactions,Supprimer les Transactions de la Société
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Le N° de Référence et la Date de Référence sont nécessaires pour une Transaction Bancaire
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Le N° de Référence et la Date de Référence sont nécessaires pour une Transaction Bancaire
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Ajouter / Modifier Taxes et Charges
 DocType: Payment Entry Reference,Supplier Invoice No,N° de Facture du Fournisseur
 DocType: Territory,For reference,Pour référence
-DocType: Healthcare Settings,Appointment Confirmation,Confirmation de rendez-vous
+DocType: Healthcare Settings,Appointment Confirmation,Confirmation de Rendez-Vous
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Impossible de supprimer les N° de série {0}, s'ils sont dans les mouvements de stock"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Fermeture (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Bonjour
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Déplacer l'Article
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Déplacer l'Article
 DocType: Serial No,Warranty Period (Days),Période de Garantie (Jours)
 DocType: Installation Note Item,Installation Note Item,Article Remarque d'Installation
 DocType: Production Plan Item,Pending Qty,Qté en Attente
 DocType: Budget,Ignore,Ignorer
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} n'est pas actif
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} n'est pas actif
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Configurez les dimensions du chèque pour l'impression
 DocType: Salary Slip,Salary Slip Timesheet,Feuille de Temps de la Fiche de Paie
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Entrepôt Fournisseur obligatoire pour les Reçus d'Achat sous-traités
@@ -651,7 +664,7 @@
 DocType: Pricing Rule,Sales Partner,Partenaire Commercial
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Toutes les Fiches d'Évaluation Fournisseurs.
 DocType: Buying Settings,Purchase Receipt Required,Reçu d’Achat Requis
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Le Taux de Valorisation est obligatoire si un Stock Initial est entré
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,Le Taux de Valorisation est obligatoire si un Stock Initial est entré
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Aucun enregistrement trouvé dans la table Facture
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Veuillez d’abord sélectionner une Société et le Type de la Partie
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Exercice comptable / financier
@@ -681,14 +694,14 @@
 ,Total Stock Summary,Récapitulatif de l'Inventaire Total
 DocType: Announcement,Posted By,Posté par
 DocType: Item,Delivered by Supplier (Drop Ship),Livré par le Fournisseur (Expédition Directe)
-DocType: Healthcare Settings,Confirmation Message,Message de confirmation
+DocType: Healthcare Settings,Confirmation Message,Message de Confirmation
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Base de données de clients potentiels.
 DocType: Authorization Rule,Customer or Item,Client ou Article
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,Base de données Clients.
 DocType: Quotation,Quotation To,Devis Pour
 DocType: Lead,Middle Income,Revenu Intermédiaire
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Ouverture (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,L’Unité de Mesure par Défaut pour l’Article {0} ne peut pas être modifiée directement parce que vous avez déjà fait une (des) transaction (s) avec une autre unité de mesure. Vous devez créer un nouvel article pour utiliser une UDM par défaut différente.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,L’Unité de Mesure par Défaut pour l’Article {0} ne peut pas être modifiée directement parce que vous avez déjà fait une (des) transaction (s) avec une autre unité de mesure. Vous devez créer un nouvel article pour utiliser une UDM par défaut différente.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Le montant alloué ne peut être négatif
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Veuillez définir la Société
 DocType: Purchase Order Item,Billed Amt,Mnt Facturé
@@ -696,12 +709,13 @@
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Entrepôt logique dans lequel les entrées en stock sont faites.
 DocType: Repayment Schedule,Principal Amount,Montant Principal
 DocType: Employee Loan Application,Total Payable Interest,Total des Intérêts Créditeurs
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +59,Total Outstanding: {0},Total en suspens: {0}
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +59,Total Outstanding: {0},Total en Attente: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Feuille de Temps de la Facture de Vente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},N° et Date de Référence sont nécessaires pour {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Sélectionner Compte de Crédit pour faire l'Écriture Bancaire
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Créer des dossiers Employés pour gérer les congés, les notes de frais et la paie"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Période de prescription
+DocType: Restaurant Reservation,Restaurant Reservation,Réservation de restaurant
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Rédaction de Propositions
 DocType: Payment Entry Deduction,Payment Entry Deduction,Déduction d’Écriture de Paiement
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Un autre Commercial {0} existe avec le même ID d'Employé
@@ -709,7 +723,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Données de Base
 DocType: Assessment Plan,Maximum Assessment Score,Score d&#39;évaluation maximale
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Mettre à jour les Dates de Transation Bancaire
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Suivi du Temps
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Suivi du Temps
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,DUPLICATA POUR LE TRANSPORTEUR
 DocType: Fiscal Year Company,Fiscal Year Company,Société de l’Exercice Fiscal
 DocType: Packing Slip Item,DN Detail,Détail du Bon de Livraison
@@ -717,11 +731,12 @@
 DocType: Timesheet,Billed,Facturé
 DocType: Batch,Batch Description,Description du Lot
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Créer des groupes d&#39;étudiants
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Le Compte Passerelle de Paiement n’existe pas, veuillez en créer un manuellement."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Le Compte Passerelle de Paiement n’existe pas, veuillez en créer un manuellement."
 DocType: Supplier Scorecard,Per Year,Par An
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Non admissible à l&#39;admission dans ce programme selon la date de naissance
 DocType: Sales Invoice,Sales Taxes and Charges,Taxes et Frais de Vente
 DocType: Employee,Organization Profile,Profil de l'Organisation
-DocType: Vital Signs,Height (In Meter),Hauteur (en mètre)
+DocType: Vital Signs,Height (In Meter),Hauteur (en Mètres)
 DocType: Student,Sibling Details,Détails Frères et Sœurs
 DocType: Vehicle Service,Vehicle Service,Entretien du Véhicule
 apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Déclencher automatiquement la demande de retour d'expérience en fonction des conditions.
@@ -754,7 +769,7 @@
 DocType: Student Batch Name,Batch Name,Nom du Lot
 DocType: Fee Validity,Max number of visit,Nombre maximum de visites
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Feuille de Temps créée :
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Veuillez définir un compte de Caisse ou de Banque par défaut pour le Mode de Paiement {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Veuillez définir un compte de Caisse ou de Banque par défaut pour le Mode de Paiement {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,Inscrire
 DocType: GST Settings,GST Settings,Paramètres GST
 DocType: Selling Settings,Customer Naming By,Client Nommé par
@@ -786,15 +801,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Taxes et Frais du Coût au Débarquement
 DocType: Production Order Operation,Actual Start Time,Heure de Début Réelle
 DocType: BOM Operation,Operation Time,Heure de l'Opération
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Terminer
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Terminer
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Base
 DocType: Timesheet,Total Billed Hours,Total des Heures Facturées
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Montant de la Reprise
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Montant de la Reprise
 DocType: Leave Block List Allow,Allow User,Autoriser l'Utilisateur
 DocType: Journal Entry,Bill No,Numéro de Facture
 DocType: Company,Gain/Loss Account on Asset Disposal,Compte de Cessions des Immobilisations
 DocType: Vehicle Log,Service Details,Détails du Service
-DocType: Purchase Invoice,Quarterly,Trimestriel
+DocType: Subscription,Quarterly,Trimestriel
 DocType: Lab Test Template,Grouped,Groupé
 DocType: Selling Settings,Delivery Note Required,Bon de Livraison Requis
 DocType: Bank Guarantee,Bank Guarantee Number,Numéro de Garantie Bancaire
@@ -803,12 +818,12 @@
 DocType: Student Attendance,Student Attendance,Présence des Étudiants
 DocType: Sales Invoice Timesheet,Time Sheet,Feuille de Temps
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Enregistrer les Matières Premières sur la Base de
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Veuillez entrer les détails de l’article
 DocType: Interest,Interest,Intérêt
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Prévente
 DocType: Purchase Receipt,Other Details,Autres Détails
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Fournisseur
-DocType: Lab Test,Test Template,Modèle de test
+DocType: Lab Test,Test Template,Modèle de Test
+DocType: Restaurant Order Entry Item,Served,Servi
 DocType: Account,Accounts,Comptes
 DocType: Vehicle,Odometer Value (Last),Valeur Compteur Kilométrique (Dernier)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Modèles de Critères de  Fiche d'Évaluation Fournisseur.
@@ -820,44 +835,45 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Aperçu Fiche de Salaire
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Le compte {0} a été entré plusieurs fois
 DocType: Account,Expenses Included In Valuation,Frais Inclus dans la Valorisation
-DocType: Hub Settings,Seller City,Ville du Vendeur
 ,Absent Student Report,Rapport des Absences
 DocType: Email Digest,Next email will be sent on:,Le prochain Email sera envoyé le :
 DocType: Offer Letter Term,Offer Letter Term,Terme de la Lettre de Proposition
 DocType: Supplier Scorecard,Per Week,Par Semaine
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,L'article a des variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,L'article a des variantes.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Total étudiant
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Article {0} introuvable
 DocType: Bin,Stock Value,Valeur du Stock
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,"Les enregistrements de frais seront créés en arrière-plan. En cas d&#39;erreur, le message d&#39;erreur sera mis à jour dans l&#39;annexe."
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,"Les enregistrements d'honoraires seront créés en arrière-plan. En cas d'erreur, le message d'erreur sera mis à jour dans l'annexe."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Société {0} n'existe pas
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} a une validité de frais jusqu&#39;à {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} a des frais valides jusqu'à {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Type d'Arbre
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Qté Consommée Par Unité
 DocType: Serial No,Warranty Expiry Date,Date d'Expiration de la Garantie
 DocType: Material Request Item,Quantity and Warehouse,Quantité et Entrepôt
+DocType: Hub Settings,Unregister,Annuler l&#39;inscription
 DocType: Sales Invoice,Commission Rate (%),Taux de Commission (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Veuillez sélectionner un Programme
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Veuillez sélectionner un Programme
 DocType: Project,Estimated Cost,Coût Estimé
 DocType: Purchase Order,Link to material requests,Lien vers les demandes de matériaux
+DocType: Hub Settings,Publish,Publier
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aérospatial
 DocType: Journal Entry,Credit Card Entry,Écriture de Carte de Crédit
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Société et Comptes
-apps/erpnext/erpnext/config/healthcare.py +108,Appointment Type Master,Type de rendez-vous Master
+apps/erpnext/erpnext/config/healthcare.py +108,Appointment Type Master,Données de Base des Types de Rendez-Vous
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,Marchandises reçues des Fournisseurs.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +58,In Value,En Valeur
 DocType: Lead,Campaign Name,Nom de la Campagne
 DocType: Selling Settings,Close Opportunity After Days,Fermer Opportunité Après Jours
 ,Reserved,Réservé
 DocType: Purchase Order,Supply Raw Materials,Fournir les Matières Premières
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La date à laquelle la prochaine facture sera générée. Elle est générée à la soumission.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Actifs Actuels
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} n'est pas un Article de stock
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',"Partagez vos commentaires sur la formation en cliquant sur 'Retour d'Expérience de la formation', puis 'Nouveau'"
 DocType: Mode of Payment Account,Default Account,Compte par Défaut
 DocType: Payment Entry,Received Amount (Company Currency),Montant Reçu (Devise Société)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,Un prospect doit être sélectionné si l'Opportunité est créée à partir d’un Prospect
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,Un prospect doit être sélectionné si l'Opportunité est créée à partir d’un Prospect
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Veuillez sélectionnez les jours de congé hebdomadaires
-DocType: Patient,O Negative,O négatif
+DocType: Patient,O Negative,O Négatif
 DocType: Production Order Operation,Planned End Time,Heure de Fin Prévue
 ,Sales Person Target Variance Item Group-Wise,Variance d'Objectifs des Commerciaux par Groupe d'Articles
 apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Un compte contenant une transaction ne peut pas être converti en grand livre
@@ -871,10 +887,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Énergie
 DocType: Opportunity,Opportunity From,Opportunité De
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Fiche de paie mensuelle.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Ajouter une Société
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ligne {0}: {1} Numéros de série requis pour l'article {2}. Vous en avez fourni {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ligne {0}: {1} Numéros de série requis pour l'article {2}. Vous en avez fourni {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Veuillez sélectionner une table
 DocType: BOM,Website Specifications,Spécifications du Site Web
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} est une adresse e-mail invalide dans 'Destinataires'
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} est une adresse e-mail invalide dans 'Destinataires'
 DocType: Special Test Items,Particulars,Particularités
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiotique.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0} : Du {0} de type {1}
@@ -882,11 +898,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Ligne {0} : Le Facteur de Conversion est obligatoire
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Plusieurs Règles de Prix existent avec les mêmes critères, veuillez résoudre les conflits en attribuant des priorités. Règles de Prix : {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,Désactivation ou annulation de la LDM impossible car elle est liée avec d'autres LDMs
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,Désactivation ou annulation de la LDM impossible car elle est liée avec d'autres LDMs
 DocType: Opportunity,Maintenance,Entretien
 DocType: Item Attribute Value,Item Attribute Value,Valeur de l'Attribut de l'Article
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Campagnes de vente.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Créer une Feuille de Temps
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Créer une Feuille de Temps
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -934,7 +950,7 @@
 DocType: Lab Test,Lab Test,Test de laboratoire
 DocType: Expense Claim Detail,Expense Claim Type,Type de Frais
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Paramètres par défaut pour le Panier d'Achat
-apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +26,Add Timeslots,Ajouter Timeslots
+apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +26,Add Timeslots,Ajouter des Créneaux
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Actif mis au rebut via Écriture de Journal {0}
 DocType: Employee Loan,Interest Income Account,Compte d'Intérêts Créditeurs
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotechnologie
@@ -944,13 +960,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Veuillez d’abord entrer l'Article
 DocType: Account,Liability,Responsabilité
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Le Montant Approuvé ne peut pas être supérieur au Montant Réclamé à la ligne {0}.
+DocType: Salary Detail,Do not include in total,Ne pas inclure au total
 DocType: Company,Default Cost of Goods Sold Account,Compte de Coûts des Marchandises Vendues par Défaut
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Liste des Prix non sélectionnée
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Liste des Prix non sélectionnée
 DocType: Employee,Family Background,Antécédents Familiaux
 DocType: Request for Quotation Supplier,Send Email,Envoyer un Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Attention : Pièce jointe non valide {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Aucune Autorisation
-DocType: Vital Signs,Heart Rate / Pulse,Fréquence cardiaque / pouls
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Attention : Pièce jointe non valide {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Aucune Autorisation
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Citation demandée
+DocType: Vital Signs,Heart Rate / Pulse,Fréquence Cardiaque / Pouls
 DocType: Company,Default Bank Account,Compte Bancaire par Défaut
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Pour filtrer en fonction du Parti, sélectionnez d’abord le Type de Parti"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Mettre à Jour le Stock' ne peut pas être coché car les articles ne sont pas livrés par {0}
@@ -976,19 +994,18 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Ligne d'Article {idx}: {doctype} {docname} n'existe pas dans la table '{doctype}' ci-dessus
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,La Feuille de Temps {0} est déjà terminée ou annulée
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Aucune tâche
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Le jour du mois où la facture automatique sera générée. e.g. 05, 28, etc."
-DocType: Item Variant Settings,Copy Fields to Variant,Copier les champs à la variante
+DocType: Item Variant Settings,Copy Fields to Variant,Copier les Champs dans une Variante
 DocType: Asset,Opening Accumulated Depreciation,Amortissement Cumulé d'Ouverture
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score doit être inférieur ou égal à 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Outil d’Inscription au Programme
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,Enregistrements Formulaire-C
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,Enregistrements Formulaire-C
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Clients et Fournisseurs
 DocType: Email Digest,Email Digest Settings,Paramètres pour le Compte Rendu par Email
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Merci pour votre entreprise !
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Demande de support des clients
 DocType: Setup Progress Action,Action Doctype,Doctype Action
 ,Production Order Stock Report,Rapport de Stock de l’Ordre de Production
-apps/erpnext/erpnext/config/healthcare.py +148,Sensitivity Naming.,Nom de sensibilité.
+apps/erpnext/erpnext/config/healthcare.py +148,Sensitivity Naming.,Nommage de la sensibilité.
 DocType: HR Settings,Retirement Age,Âge de la Retraite
 DocType: Bin,Moving Average Rate,Taux Mobile Moyen
 DocType: Production Planning Tool,Select Items,Sélectionner les Articles
@@ -999,13 +1016,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Statut du Devis
 DocType: Maintenance Visit,Completion Status,État d'Achèvement
 DocType: HR Settings,Enter retirement age in years,Entrez l'âge de la retraite en années
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Entrepôt Cible
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Veuillez sélectionner un entrepôt
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Entrepôt Cible
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Veuillez sélectionner un entrepôt
 DocType: Cheque Print Template,Starting location from left edge,Position initiale depuis bord gauche
 DocType: Item,Allow over delivery or receipt upto this percent,Autoriser le dépassement des capacités livraison ou de réception jusqu'à ce pourcentage
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Importer Participation
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Tous les Groupes d'Articles
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Tous les Groupes d'Articles
 DocType: Process Payroll,Activity Log,Journal d'Activité
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Bénéfice Net / Perte Nette
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Composer automatiquement un message sur la soumission de transactions .
@@ -1016,12 +1033,13 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Du Bon de Commande au Paiement
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Qté Projetée
 DocType: Sales Invoice,Payment Due Date,Date d'Échéance de Paiement
-DocType: Drug Prescription,Interval UOM,Interval UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,La Variante de l'Article {0} existe déjà avec les mêmes caractéristiques
+DocType: Drug Prescription,Interval UOM,UDM d'Intervalle
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,La Variante de l'Article {0} existe déjà avec les mêmes caractéristiques
+DocType: Item,Hub Publishing Details,Détails de la publication Hub
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening','Ouverture'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Ouvrir To Do
 DocType: Notification Control,Delivery Note Message,Message du Bon de Livraison
-DocType: Lab Test Template,Result Format,Format de résultat
+DocType: Lab Test Template,Result Format,Format du Résultat
 DocType: Expense Claim,Expenses,Charges
 DocType: Item Variant Attribute,Item Variant Attribute,Attribut de Variante de l'Article
 ,Purchase Receipt Trends,Tendances des Reçus d'Achats
@@ -1037,15 +1055,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,LDM # {0}: La matière première ne peut pas être identique à l'article principal
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total des Frais Applicables dans la Table des Articles de Reçus d’Achat doit être égal au Total des Taxes et Frais
 DocType: Sales Team,Incentives,Incitations
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Inscrivez-vous au Hub
 DocType: SMS Log,Requested Numbers,Numéros Demandés
 DocType: Production Planning Tool,Only Obtain Raw Materials,Obtenir seulement des Matières Premières
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Évaluation des Performances.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Activation de 'Utiliser pour Panier', comme le Panier est activé et qu'il devrait y avoir au moins une Règle de Taxes pour le Panier"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Activation de 'Utiliser pour Panier', comme le Panier est activé et qu'il devrait y avoir au moins une Règle de Taxes pour le Panier"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","L’Écriture de Paiement {0} est liée à la Commande {1}, vérifiez si elle doit être récupérée comme une avance dans cette facture."
 DocType: Sales Invoice Item,Stock Details,Détails du Stock
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valeur du Projet
 apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Point-de-Vente
-DocType: Fee Schedule,Fee Creation Status,Statut de création de frais
+DocType: Fee Schedule,Fee Creation Status,Statut de création des honoraires
 DocType: Vehicle Log,Odometer Reading,Relevé du Compteur Kilométrique
 apps/erpnext/erpnext/accounts/doctype/account/account.py +119,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Le solde du compte est déjà Créditeur, vous n'êtes pas autorisé à mettre en 'Solde Doit Être' comme 'Débiteur'"
 DocType: Account,Balance must be,Solde doit être
@@ -1054,17 +1073,19 @@
 ,Available Qty,Qté Disponible
 DocType: Purchase Taxes and Charges,On Previous Row Total,Le Total de la Rangée Précédente
 DocType: Purchase Invoice Item,Rejected Qty,Qté Rejetée
-DocType: Setup Progress Action,Action Field,Champ d&#39;action
-DocType: Healthcare Settings,Manage Customer,Gérer le client
+DocType: Setup Progress Action,Action Field,Champ d'Action
+DocType: Healthcare Settings,Manage Customer,Gestion Client
 DocType: Salary Slip,Working Days,Jours Ouvrables
 DocType: Serial No,Incoming Rate,Taux d'Entrée
 DocType: Packing Slip,Gross Weight,Poids Brut
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,Le nom de l'entreprise pour laquelle vous configurez ce système.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Activer Hub
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,Le nom de l'entreprise pour laquelle vous configurez ce système.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Inclure les vacances dans le nombre total de Jours Ouvrés
 DocType: Job Applicant,Hold,Tenir
 DocType: Employee,Date of Joining,Date d'Embauche
 DocType: Naming Series,Update Series,Mettre à Jour les Séries
 DocType: Supplier Quotation,Is Subcontracted,Est sous-traité
+DocType: Restaurant Table,Minimum Seating,Sièges minimum
 DocType: Item Attribute,Item Attribute Values,Valeurs de l'Attribut de l'Article
 DocType: Examination Result,Examination Result,Résultat d'Examen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Reçu d’Achat
@@ -1075,37 +1096,37 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Impossible de trouver le Créneau Horaires dans les {0} prochains jours pour l'Opération {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan de matériaux pour les sous-ensembles
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Partenaires Commerciaux et Régions
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,LDM {0} doit être active
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,LDM {0} doit être active
 DocType: Journal Entry,Depreciation Entry,Ecriture d’Amortissement
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Veuillez d’abord sélectionner le type de document
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Annuler les Visites Matérielles {0} avant d'annuler cette Visite de Maintenance
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},N° de Série {0} n'appartient pas à l'Article {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Qté Requise
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Les entrepôts avec des transactions existantes ne peuvent pas être convertis en livre.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Les entrepôts avec des transactions existantes ne peuvent pas être convertis en livre.
 DocType: Bank Reconciliation,Total Amount,Montant Total
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publication Internet
 DocType: Prescription Duration,Number,Nombre
-DocType: Medical Code,Medical Code Standard,Norme du code médical
+DocType: Medical Code,Medical Code Standard,Standard du code médical
 DocType: Production Planning Tool,Production Orders,Ordres de Production
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +62,Balance Value,Valeur du Solde
-DocType: Lab Test,Lab Technician,Un technicien de laboratoire
+DocType: Lab Test,Lab Technician,Technicien de laboratoire
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Liste de Prix de Vente
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
-Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Si elle est cochée, un client sera créé, mappé au patient. Des factures de patients seront créées contre ce client. Vous pouvez également sélectionner un Client existant tout en créant un Patient."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publier pour synchroniser les éléments
+Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Si cochée, un client sera créé et lié au patient. Les factures de patients seront créées sur ce client. Vous pouvez également sélectionner un Client existant tout en créant un Patient."
 DocType: Bank Reconciliation,Account Currency,Compte Devise
-DocType: Lab Test,Sample ID,ID de l&#39;échantillon
+DocType: Lab Test,Sample ID,ID de l'Échantillon
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Veuillez indiquer le Compte d’Arrondi de la Société
 DocType: Purchase Receipt,Range,Plage
 DocType: Supplier,Default Payable Accounts,Comptes Créditeur par Défaut
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,"L'employé {0} n'est pas actif, ou n'existe pas"
 DocType: Fee Structure,Components,Composants
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Veuillez entrer une Catégorie d'Actif dans la rubrique {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Variantes de l'Article {0} mises à jour
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Variantes de l'Article {0} mises à jour
 DocType: Quality Inspection Reading,Reading 6,Lecture 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Can not {0} {1} {2} sans aucune facture impayée négative
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","à générer. Si vous êtes retardé, vous devrez modifier manuellement le champ &quot;Répéter le jour du mois&quot; de ceci"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Can not {0} {1} {2} sans aucune facture impayée négative
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Avance sur Facture d’Achat
-DocType: Hub Settings,Sync Now,Synchroniser Maintenant
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Ligne {0} : L’Écriture de crédit ne peut pas être liée à un {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Définir le budget pour un exercice.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Le compte par défaut de Banque / Caisse sera automatiquement mis à jour dans la Facture PDV lorsque ce mode est sélectionné.
@@ -1117,13 +1138,13 @@
 DocType: Item,Is Purchase Item,Est Article d'Achat
 DocType: Asset,Purchase Invoice,Facture d’Achat
 DocType: Stock Ledger Entry,Voucher Detail No,Détail de la Référence N°
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Nouvelle Facture de Vente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Nouvelle Facture de Vente
 DocType: Stock Entry,Total Outgoing Value,Valeur Sortante Totale
-DocType: Physician,Appointments,Rendez-vous
+DocType: Physician,Appointments,Rendez-Vous
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Date d'Ouverture et Date de Clôture devraient être dans le même Exercice
 DocType: Lead,Request for Information,Demande de Renseignements
 ,LeaderBoard,Classement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Synchroniser les Factures hors-ligne
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Synchroniser les Factures hors-ligne
 DocType: Payment Request,Paid,Payé
 DocType: Program Fee,Program Fee,Frais du Programme
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1142,11 +1163,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Article du Bon de Commande
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Revenu Indirect
 DocType: Student Attendance Tool,Student Attendance Tool,Outil de Présence des Étudiants
+DocType: Restaurant Menu,Price List (Auto created),Liste de prix (créé automatiquement)
 DocType: Cheque Print Template,Date Settings,Paramètres de Date
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variance
 ,Company Name,Nom de la Société
 DocType: SMS Center,Total Message(s),Total des Messages
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Sélectionner l'Article à Transferer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Sélectionner l'Article à Transferer
 DocType: Purchase Invoice,Additional Discount Percentage,Pourcentage de réduction supplémentaire
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Afficher la liste de toutes les vidéos d'aide
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Sélectionner le compte principal de la banque où le chèque a été déposé.
@@ -1163,6 +1185,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Mètre
 DocType: Workstation,Electricity Cost,Coût de l'Électricité
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne pas envoyer de rappel pour le Jour d'Anniversaire des Employés
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Enregistrer les paramètres
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Produits demandés
 DocType: Item,Inspection Criteria,Critères d'Inspection
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Transféré
 DocType: BOM Website Item,BOM Website Item,Article de LDM du Site Internet
@@ -1179,11 +1203,11 @@
 DocType: Journal Entry,Total Amount in Words,Montant Total En Toutes Lettres
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Il y a eu une erreur. Une raison probable pourrait être que vous n'avez pas enregistré le formulaire. Veuillez contacter support@erpnext.com si le problème persiste.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Mon Panier
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Type de Commande doit être l'un des {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Type de Commande doit être l'un des {0}
 DocType: Lead,Next Contact Date,Date du Prochain Contact
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Quantité d'Ouverture
-DocType: Healthcare Settings,Appointment Reminder,Rappel de rendez-vous
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Veuillez entrez un Compte pour le Montant de Change
+DocType: Healthcare Settings,Appointment Reminder,Rappel de Rendez-Vous
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Veuillez entrez un Compte pour le Montant de Change
 DocType: Student Batch Name,Student Batch Name,Nom du Lot d'Étudiants
 DocType: Consultation,Doctor,Docteur
 DocType: Holiday List,Holiday List Name,Nom de la Liste de Vacances
@@ -1191,12 +1215,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Cours Calendrier
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Options du Stock
 DocType: Journal Entry Account,Expense Claim,Note de Frais
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Voulez-vous vraiment restaurer cet actif mis au rebut ?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Qté pour {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Voulez-vous vraiment restaurer cet actif mis au rebut ?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Qté pour {0}
 DocType: Leave Application,Leave Application,Demande de Congés
 DocType: Patient,Patient Relation,Relation patient
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Outil de Répartition des Congés
+DocType: Item,Hub Category to Publish,Catégorie de hub à publier
 DocType: Leave Block List,Leave Block List Dates,Dates de la Liste de Blocage des Congés
+DocType: Sales Invoice,Billing Address GSTIN,Adresse de facturation GSTIN
 DocType: Workstation,Net Hour Rate,Taux Horaire Net
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Reçu d'Achat du Coût au Débarquement
 DocType: Company,Default Terms,Termes et Conditions par Défaut
@@ -1206,18 +1232,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Veuillez spécifier un {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Les articles avec aucune modification de quantité ou de valeur ont étés retirés.
 DocType: Delivery Note,Delivery To,Livraison à
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Table d'Attribut est obligatoire
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Table d'Attribut est obligatoire
 DocType: Production Planning Tool,Get Sales Orders,Obtenir les Commandes Client
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ne peut pas être négatif
 DocType: Training Event,Self-Study,Autoformation
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Remise
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Remise
 DocType: Asset,Total Number of Depreciations,Nombre Total d’Amortissements
 DocType: Sales Invoice Item,Rate With Margin,Tarif Avec Marge
 DocType: Workstation,Wages,Salaires
 DocType: Task,Urgent,Urgent
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Veuillez spécifier un N° de Ligne valide pour la ligne {0} de la table {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Impossible de trouver une variable:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Veuillez sélectionner un champ à modifier sur le pavé numérique
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Veuillez sélectionner un champ à modifier sur le pavé numérique
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Accédez au bureau et commencez à utiliser ERPNext
 DocType: Item,Manufacturer,Fabricant
 DocType: Landed Cost Item,Purchase Receipt Item,Article du Reçu d’Achat
@@ -1229,7 +1255,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +109,You are the Expense Approver for this record. Please Update the 'Status' and Save,Vous êtes l'Approbateur de Dépenses pour cet enregistrement. Veuillez Mettre à Jour le 'Status' et Enregistrer
 DocType: Serial No,Creation Document No,N° du Document de Création
 DocType: Issue,Issue,Question
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation_dashboard.py +11,Records,Enregistrements
+apps/erpnext/erpnext/healthcare/doctype/consultation/consultation_dashboard.py +11,Records,Dossiers
 DocType: Asset,Scrapped,Mis au Rebut
 apps/erpnext/erpnext/config/stock.py +200,"Attributes for Item Variants. e.g Size, Color etc.","Attributs pour les Variantes de l'Article. e.g. Taille, Couleur, etc."
 DocType: Purchase Invoice,Returns,Retours
@@ -1243,13 +1269,13 @@
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Inclure des articles hors stock
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Charges de Vente
-DocType: Consultation,Diagnosis,Diagnostic
+DocType: Consultation,Diagnosis,Diagnostique
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Achat Standard
 DocType: GL Entry,Against,Contre
 DocType: Item,Default Selling Cost Center,Centre de Coût Vendeur par Défaut
 DocType: Sales Partner,Implementation Partner,Partenaire d'Implémentation
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Code Postal
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Commande Client {0} est {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Code Postal
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Commande Client {0} est {1}
 DocType: Opportunity,Contact Info,Information du Contact
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Faire des Écritures de Stock
 DocType: Packing Slip,Net Weight UOM,UDM Poids Net
@@ -1260,6 +1286,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Obtenir les Dates de Congés
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,La date de Fin ne peut pas être antérieure à la Date de Début
 DocType: Sales Person,Select company name first.,Sélectionner d'abord le nom de la société.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,De bas en haut
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Devis reçus des Fournisseurs.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Remplacer la LDM et actualiser les prix les plus récents dans toutes les LDMs
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},À {0} | {1} {2}
@@ -1278,7 +1305,7 @@
 DocType: Program Enrollment,Transportation,Transport
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Attribut Invalide
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} doit être soumis
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},La quantité doit être inférieure ou égale à {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},La quantité doit être inférieure ou égale à {0}
 DocType: SMS Center,Total Characters,Nombre de Caractères
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Veuillez sélectionner une LDM dans le champ LDM pour l’Article {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Formulaire-C Détail de la Facture
@@ -1293,7 +1320,7 @@
 ,Ordered Items To Be Billed,Articles Commandés À Facturer
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,La Plage Initiale doit être inférieure à la Plage Finale
 DocType: Global Defaults,Global Defaults,Valeurs par Défaut Globales
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Invitation de Collaboration à un Projet
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Invitation de Collaboration à un Projet
 DocType: Salary Slip,Deductions,Déductions
 DocType: Leave Allocation,LAL/,LAL/
 DocType: Setup Progress Action,Action Name,Nom de l'Action
@@ -1311,13 +1338,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Avance sur Facture de Vente
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Aucune requête à effectuer
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Un autre enregistrement de Budget '{0}' existe déjà pour {1} '{2}' pour l'exercice {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"""Date de Début Réelle"" ne peut être postérieure à ""Date de Fin Réelle"""
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"""Date de Début Réelle"" ne peut être postérieure à ""Date de Fin Réelle"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Gestion
 DocType: Cheque Print Template,Payer Settings,Paramètres du Payeur
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ce sera ajoutée au Code de la Variante de l'Article. Par exemple, si votre abréviation est «SM», et le code de l'article est ""T-SHIRT"", le code de l'article de la variante sera ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Salaire Net (en lettres) sera visible une fois que vous aurez enregistré la Fiche de Paie.
 DocType: Purchase Invoice,Is Return,Est un Retour
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Mise en Garde
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Mise en Garde
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Retour / Note de Débit
 DocType: Price List Country,Price List Country,Pays de la Liste des Prix
 DocType: Item,UOMs,UDMs
@@ -1332,17 +1359,18 @@
 DocType: Account,Balance Sheet,Bilan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Centre de Coûts Pour Article ayant un Code Article '
 DocType: Fee Validity,Valid Till,Valable Jusqu'au
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Le Mode de Paiement n’est pas configuré. Veuillez vérifier si le compte a été réglé sur Mode de Paiement ou sur Profil de Point de Vente.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Le Mode de Paiement n’est pas configuré. Veuillez vérifier si le compte a été réglé sur Mode de Paiement ou sur Profil de Point de Vente.
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Le même article ne peut pas être entré plusieurs fois.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","D'autres comptes individuels peuvent être créés dans les groupes, mais les écritures ne peuvent être faites que sur les comptes individuels"
 DocType: Lead,Lead,Prospect
 DocType: Email Digest,Payables,Dettes
 DocType: Course,Course Intro,Intro du Cours
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Écriture de Stock {0} créée
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Veuillez configurer la série de numéros pour la présence via Setup&gt; Série de numéros
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Écriture de Stock {0} créée
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ligne #{0} : Qté Rejetée ne peut pas être entrée dans le Retour d’Achat
 ,Purchase Order Items To Be Billed,Articles à Facturer du Bon de Commande
 DocType: Purchase Invoice Item,Net Rate,Taux Net
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Veuillez sélectionner un Client
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Veuillez sélectionner un Client
 DocType: Purchase Invoice Item,Purchase Invoice Item,Article de la Facture d'Achat
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Écritures du Journal du Stock et Écritures du Grand Livre sont republiées pour les Reçus d'Achat sélectionnés
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Article 1
@@ -1361,7 +1389,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Ligne {0} en double avec le même {1}
 ,Trial Balance,Balance Générale
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Exercice Fiscal {0} introuvable
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Configuration des Employés
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Configuration des Employés
 DocType: Sales Order,SO-,SO-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Veuillez d’abord sélectionner un préfixe
 DocType: Employee,O-,O-
@@ -1373,12 +1401,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Voir Grand Livre
 DocType: Grading Scale,Intervals,Intervalles
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Au plus tôt
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Un Groupe d'Article existe avec le même nom, veuillez changer le nom de l'article ou renommer le groupe d'article"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Un Groupe d'Article existe avec le même nom, veuillez changer le nom de l'article ou renommer le groupe d'article"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,N° de Mobile de l'Étudiant
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Reste du Monde
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Reste du Monde
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,L'Article {0} ne peut être en Lot
 ,Budget Variance Report,Rapport d’Écarts de Budget
 DocType: Salary Slip,Gross Pay,Salaire Brut
+DocType: Item,Is Item from Hub,Est-ce que l&#39;objet du Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Ligne {0} : Le Type d'Activité est obligatoire.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividendes Payés
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Livre des Comptes
@@ -1388,8 +1417,9 @@
 DocType: Vehicle Log,Service Detail,Détails du Service
 DocType: BOM,Item Description,Description de l'Article
 DocType: Student Sibling,Student Sibling,Frère et Sœur de l'Étudiant
-DocType: Purchase Invoice,Is Recurring,Est Récurrent
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Mode de paiement
 DocType: Purchase Invoice,Supplied Items,Articles Fournis
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Veuillez définir un menu actif pour le restaurant {0}
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Quantité À Fabriquer
 DocType: Email Digest,New Income,Nouveaux Revenus
@@ -1399,6 +1429,7 @@
 ,Student and Guardian Contact Details,Détails des Contacts Étudiant et Tuteur
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Ligne {0} : Pour le fournisseur {0} une Adresse Email est nécessaire pour envoyer des email
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Ouverture Temporaire
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Afficher le Hub
 ,Employee Leave Balance,Solde des Congés de l'Employé
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Solde pour le compte {0} doit toujours être {1}
 DocType: Patient Appointment,More Info,Plus d&#39;infos
@@ -1418,13 +1449,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Commande Client {0} invalide
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Avertir lors d'une nouvelle Demande de Devis
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Les Bons de Commande vous aider à planifier et à assurer le suivi de vos achats
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Désolé, les sociétés ne peuvent pas être fusionnées"
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Prescriptions de laboratoire
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Désolé, les sociétés ne peuvent pas être fusionnées"
+apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Prescriptions de test de laboratoire
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",La quantité totale d’Émission / Transfert {0} dans la Demande de Matériel {1} \ ne peut pas être supérieure à la quantité demandée {2} pour l’Article {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Petit
 DocType: Employee,Employee Number,Numéro d'Employé
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},N° de dossier déjà utilisé. Essayez depuis N° de dossier {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},N° de dossier déjà utilisé. Essayez depuis N° de dossier {0}
 DocType: Project,% Completed,% Complété
 ,Invoiced Amount (Exculsive Tax),Montant Facturé (Hors Taxes)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Article 2
@@ -1439,11 +1470,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Dépenses Indirectes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Ligne {0} : Qté obligatoire
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agriculture
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sync Données de Base
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sync Données de Base
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Vos Produits ou Services
-DocType: Special Test Items,Special Test Items,Articles de test spéciaux
+DocType: Special Test Items,Special Test Items,Articles de Test Spécial
 DocType: Mode of Payment,Mode of Payment,Mode de Paiement
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,L'Image du Site Web doit être un fichier public ou l'URL d'un site web
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,L'Image du Site Web doit être un fichier public ou l'URL d'un site web
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,LDM (Liste de Matériaux)
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Il s’agit d’un groupe d'élément racine qui ne peut être modifié.
@@ -1451,24 +1482,23 @@
 DocType: Vehicle,Fuel UOM,UDM Carburant
 DocType: Warehouse,Warehouse Contact Info,Info de Contact de l'Entrepôt
 DocType: Payment Entry,Write Off Difference Amount,Montant de la Différence de la Reprise
-DocType: Purchase Invoice,Recurring Type,Type Récurrent
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent",{0} : Adresse email de l'employé introuvable : l’email n'a pas été envoyé
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent",{0} : Adresse email de l'employé introuvable : l’email n'a pas été envoyé
 DocType: Item,Foreign Trade Details,Détails du Commerce Extérieur
+,Assessment Plan Status,Statut du plan d&#39;évaluation
 DocType: Email Digest,Annual Income,Revenu Annuel
 DocType: Serial No,Serial No Details,Détails du N° de Série
 DocType: Purchase Invoice Item,Item Tax Rate,Taux de la Taxe sur l'Article
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,Veuillez sélectionner Médecin et Date
 DocType: Student Group Student,Group Roll Number,Numéro de Groupe
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Pour {0}, seuls les comptes de crédit peuvent être liés avec une autre écriture de débit"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Le total des poids des tâches doit être égal à 1. Veuillez ajuster les poids de toutes les tâches du Projet en conséquence
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Bon de Livraison {0} n'est pas soumis
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Le total des poids des tâches doit être égal à 1. Veuillez ajuster les poids de toutes les tâches du Projet en conséquence
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Bon de Livraison {0} n'est pas soumis
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,L'article {0} doit être un Article Sous-traité
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Capitaux Immobilisés
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","La Règle de Tarification est d'abord sélectionnée sur la base du champ ‘Appliquer Sur’, qui peut être un Article, un Groupe d'Articles ou une Marque."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Veuillez définir le Code d'Article en premier
-DocType: Hub Settings,Seller Website,Site du Vendeur
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Veuillez définir le Code d'Article en premier
 DocType: Item,ITEM-,ARTICLE-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Pourcentage total attribué à l'équipe commerciale devrait être de 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Pourcentage total attribué à l'équipe commerciale devrait être de 100
 DocType: Sales Invoice Item,Edit Description,Modifier la description
 DocType: Antibiotic,Antibiotic,Antibiotique
 ,Team Updates,Mises à Jour de l’Équipe
@@ -1476,7 +1506,7 @@
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Définir le Type de Compte aide à sélectionner ce Compte dans les transactions.
 DocType: Purchase Invoice,Grand Total (Company Currency),Total TTC (Devise de la Société)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Créer Format d'Impression
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +5,Fee Created,Fee Created
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +5,Fee Created,Honoraires Créés
 apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},N'a pas trouvé d'élément appelé {0}
 DocType: Supplier Scorecard Criteria,Criteria Formula,Formule du Critère
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total Sortant
@@ -1489,12 +1519,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Total (Devise Société)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Numéro de série {0} est entré plus d'une fois
 DocType: Depreciation Schedule,Journal Entry,Écriture de Journal
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} articles en cours
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} articles en cours
 DocType: Workstation,Workstation Name,Nom du Bureau
 DocType: Grading Scale Interval,Grade Code,Code de la Note
 DocType: POS Item Group,POS Item Group,Groupe d'Articles PDV
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Compte Rendu par Email :
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},LDM {0} n’appartient pas à l'article {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},LDM {0} n’appartient pas à l'article {1}
 DocType: Sales Partner,Target Distribution,Distribution Cible
 DocType: Salary Slip,Bank Account No.,N° de Compte Bancaire
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Numéro de la dernière transaction créée avec ce préfixe
@@ -1508,12 +1538,11 @@
 DocType: Accounts Settings,Book Asset Depreciation Entry Automatically,Comptabiliser les Entrées de Dépréciation d'Actifs Automatiquement
 DocType: BOM Operation,Workstation,Bureau
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Fournisseur de l'Appel d'Offre
-DocType: Healthcare Settings,Registration Message,Message d&#39;inscription
+DocType: Healthcare Settings,Registration Message,Message d'Inscription
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Matériel
-DocType: Sales Order,Recurring Upto,Récurrent Jusqu'au
-DocType: Prescription Dosage,Prescription Dosage,Dosage de prescription
+DocType: Prescription Dosage,Prescription Dosage,Dosage de la prescription
 DocType: Attendance,HR Manager,Responsable RH
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Veuillez sélectionner une Société
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Veuillez sélectionner une Société
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Congé de Privilège
 DocType: Purchase Invoice,Supplier Invoice Date,Date de la Facture du Fournisseur
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,par
@@ -1529,10 +1558,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Conditions qui coincident touvées entre :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,L'Écriture de Journal {0} est déjà ajustée par un autre bon
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Total de la Valeur de la Commande
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Alimentation
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Alimentation
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Balance Agée 3
 DocType: Maintenance Schedule Item,No of Visits,Nb de Visites
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Un Calendrier de Maintenance {0} existe pour {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Voulez-vous publier vos éléments sur Hub?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,Inscrire un étudiant
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},La devise du Compte Cloturé doit être {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Somme des points pour tous les objectifs devraient être 100. Il est {0}
@@ -1543,9 +1573,9 @@
 DocType: Authorization Rule,Average Discount,Remise Moyenne
 DocType: Purchase Invoice Item,UOM,UDM
 DocType: Rename Tool,Utilities,Utilitaires
-DocType: Purchase Invoice Item,Accounting,Comptabilité
+DocType: POS Profile,Accounting,Comptabilité
 DocType: Employee,EMP/,EMP/
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Veuillez sélectionner les lots pour les articles en lots
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Veuillez sélectionner les lots pour les articles en lots
 DocType: Asset,Depreciation Schedules,Calendriers d'Amortissement
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,La période de la demande ne peut pas être hors de la période d'allocation de congé
 DocType: Activity Cost,Projects,Projets
@@ -1559,9 +1589,9 @@
 DocType: POS Profile,Campaign,Campagne
 DocType: Supplier,Name and Type,Nom et Type
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',Le Statut d'Approbation doit être 'Approuvé' ou 'Rejeté'
-DocType: Physician,Contacts and Address,Contacts et adresse
+DocType: Physician,Contacts and Address,Contacts et Adresse
 DocType: Purchase Invoice,Contact Person,Personne à Contacter
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Date de Début Prévue' ne peut pas être postérieure à 'Date de Fin Prévue'
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','Date de Début Prévue' ne peut pas être postérieure à 'Date de Fin Prévue'
 DocType: Course Scheduling Tool,Course End Date,Date de Fin du Cours
 DocType: Holiday List,Holidays,Jours Fériés
 DocType: Sales Order Item,Planned Quantity,Quantité Planifiée
@@ -1569,10 +1599,11 @@
 DocType: Item,Maintain Stock,Maintenir Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Écritures de Stock déjà créées pour l'Ordre de Fabrication
 DocType: Employee,Prefered Email,Email Préféré
+DocType: Student Admission,Eligibility and Details,Admissibilité et détails
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Variation Nette des Actifs Immobilisés
 DocType: Leave Control Panel,Leave blank if considered for all designations,Laisser vide pour toutes les désignations
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge de type ' réel ' à la ligne {0} ne peut pas être inclus dans le prix de l'article
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max : {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max : {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,A partir du (Date et Heure)
 DocType: Email Digest,For Company,Pour la Société
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Journal des communications.
@@ -1580,19 +1611,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Variable de la Fiche d'Évaluation Fournisseur
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Montant d'Achat
 DocType: Sales Invoice,Shipping Address Name,Nom de l'Adresse de Livraison
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Plan Comptable
 DocType: Material Request,Terms and Conditions Content,Contenu des Termes et Conditions
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,ne peut pas être supérieure à 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Article {0} n'est pas un article stocké
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Article {0} n'est pas un article stocké
 DocType: Maintenance Visit,Unscheduled,Non programmé
 DocType: Employee,Owned,Détenu
 DocType: Salary Detail,Depends on Leave Without Pay,Dépend de Congé Non Payé
 DocType: Pricing Rule,"Higher the number, higher the priority","Plus le nombre est grand, plus la priorité est haute"
 ,Purchase Invoice Trends,Tendances des Factures d'Achat
 DocType: Employee,Better Prospects,Meilleures Perspectives
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Ligne # {0}: Le lot {1} n'a que {2} qté(s). Veuillez sélectionner un autre lot contenant {3} qtés disponible ou diviser la rangée en plusieurs lignes, pour livrer / émettre à partir de plusieurs lots"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Ligne # {0}: Le lot {1} n'a que {2} qté(s). Veuillez sélectionner un autre lot contenant {3} qtés disponible ou diviser la rangée en plusieurs lignes, pour livrer / émettre à partir de plusieurs lots"
 DocType: Vehicle,License Plate,Plaque d'Immatriculation
 DocType: Appraisal,Goals,Objectifs
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Sélectionnez le profil POS
 DocType: Warranty Claim,Warranty / AMC Status,Garantie / Statut AMC
 ,Accounts Browser,Navigateur des Comptes
 DocType: Payment Entry Reference,Payment Entry Reference,Référence d’Écriture de Paiement
@@ -1610,7 +1641,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,L'employé ne peut pas rendre de compte à lui-même.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si le compte est gelé, les écritures ne sont autorisés que pour un nombre restreint d'utilisateurs."
 DocType: Email Digest,Bank Balance,Solde Bancaire
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Écriture Comptable pour {0}: {1} ne peut être effectuée qu'en devise: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Écriture Comptable pour {0}: {1} ne peut être effectuée qu'en devise: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.",Profil de l’Emploi. qualifications requises ect...
 DocType: Journal Entry Account,Account Balance,Solde du Compte
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Règle de Taxation pour les transactions.
@@ -1618,9 +1649,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1} : Un Client est requis pour le Compte Débiteur {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total des Taxes et Frais (Devise Société)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Afficher le solde du compte de résulat des exercices non cloturés
-DocType: Lab Test Template,Collection Details,Détails de la collection
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","Sélectionnez cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date depuis tabConsultation ct, `tabLab Prescription` cp où ct.patient = &#39;{0}&#39; et cp.parent = ct. nom et cp.test_created = 0"
+DocType: Lab Test Template,Collection Details,Détails de la Collection
 DocType: Shipping Rule,Shipping Account,Compte de Livraison
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1} : Compte {2} inactif
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Créer des Commandes Clients pour vous aider à planifier votre travail et livrer à temps
@@ -1637,10 +1666,10 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Bordereau de Colis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Loyer du Bureau
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Configuration de la passerelle SMS
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Échec de l'Importation !
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Échec de l'Importation !
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Aucune adresse ajoutée.
 DocType: Workstation Working Hour,Workstation Working Hour,Heures de Travail au Bureau
-DocType: Vital Signs,Blood Pressure,Tension artérielle
+DocType: Vital Signs,Blood Pressure,Pression Artérielle
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +121,Analyst,Analyste
 DocType: Item,Inventory,Inventaire
 DocType: Item,Sales Details,Détails Ventes
@@ -1662,8 +1691,8 @@
 DocType: Sales Invoice,Source,Source
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Afficher fermé
 DocType: Leave Type,Is Leave Without Pay,Est un Congé Sans Solde
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Catégorie d'Actif est obligatoire pour l'article Immobilisé
-DocType: Fee Validity,Fee Validity,Validité des frais
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Catégorie d'Actif est obligatoire pour l'article Immobilisé
+DocType: Fee Validity,Fee Validity,Validité des Honoraires
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Aucun enregistrement trouvé dans la table Paiement
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ce {0} est en conflit avec {1} pour {2} {3}
 DocType: Student Attendance Tool,Students HTML,HTML Étudiants
@@ -1683,8 +1712,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Recrutement de Cadres
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Créer des Prospects
 DocType: Maintenance Schedule,Schedules,Horaires
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,Le profil POS est requis pour utiliser le point de vente
 DocType: Purchase Invoice Item,Net Amount,Montant Net
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} n'a pas été soumis, donc l'action ne peut pas être complétée"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} n'a pas été soumis, donc l'action ne peut pas être complétée"
 DocType: Purchase Order Item Supplied,BOM Detail No,N° de Détail LDM
 DocType: Landed Cost Voucher,Additional Charges,Frais Supplémentaires
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Montant de la Remise Supplémentaire (Devise de la Société)
@@ -1693,7 +1723,7 @@
 ,Support Hour Distribution,Répartition des Heures de Support
 DocType: Maintenance Visit,Maintenance Visit,Visite d'Entretien
 DocType: Student,Leaving Certificate Number,Numéro de Certificat
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Nomination annulée, révisez et annulez la facture {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Rendez-vous annulé, veuillez vérifier et annuler la facture {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Qté de lot disponible à l'Entrepôt
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Mettre à Jour le Format d'Impression
 DocType: Landed Cost Voucher,Landed Cost Help,Aide Coûts Logistiques
@@ -1711,13 +1741,13 @@
 DocType: Expense Claim,EXP,EXP
 apps/erpnext/erpnext/config/stock.py +205,Brand master.,Marque Principale
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Étudiant {0} - {1} apparaît Plusieurs fois dans la ligne {2} & {3}
-DocType: Healthcare Settings,Manage Sample Collection,Gérer la collection d&#39;échantillons
+DocType: Healthcare Settings,Manage Sample Collection,Gestion des collections d'échantillons
 DocType: Program Enrollment Tool,Program Enrollments,Inscriptions au Programme
-DocType: Patient,Tobacco Past Use,Utilisation passée du tabac
+DocType: Patient,Tobacco Past Use,Consommation passée de tabac
 DocType: Sales Invoice Item,Brand Name,Nom de la Marque
 DocType: Purchase Receipt,Transporter Details,Détails du Transporteur
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},L&#39;utilisateur {0} est déjà affecté au médecin {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Un Entrepôt par défaut est nécessaire pour l’Article sélectionné
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},L'Utilisateur {0} est déjà affecté au Médecin {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Un Entrepôt par défaut est nécessaire pour l’Article sélectionné
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Boîte
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,Fournisseur Potentiel
 DocType: Budget,Monthly Distribution,Répartition Mensuelle
@@ -1727,7 +1757,7 @@
 DocType: Sales Partner,Sales Partner Target,Objectif du Partenaire Commercial
 DocType: Loan Type,Maximum Loan Amount,Montant Max du Prêt
 DocType: Pricing Rule,Pricing Rule,Règle de Tarification
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Numéro de liste en double pour l'élève {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Numéro de liste en double pour l'élève {0}
 DocType: Budget,Action if Annual Budget Exceeded,Action si le Budget Annuel est Dépassé
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Demande de Matériel au Bon de Commande
 DocType: Shopping Cart Settings,Payment Success URL,URL pour Paiement Effectué avec Succès
@@ -1735,8 +1765,8 @@
 DocType: Purchase Receipt,PREC-,PREC-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Comptes Bancaires
 ,Bank Reconciliation Statement,Relevé de Réconciliation Bancaire
-DocType: Consultation,Medical Coding,Codage médical
-DocType: Healthcare Settings,Reminder Message,Message de rappel
+DocType: Consultation,Medical Coding,Codification médicale
+DocType: Healthcare Settings,Reminder Message,Message de Rappel
 ,Lead Name,Nom du Prospect
 ,POS,PDV
 DocType: C-Form,III,III
@@ -1744,7 +1774,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} ne doit apparaître qu'une seule fois
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Non autorisé à tranférer plus de {0} que de {1} pour Bon de Commande {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Congés Attribués avec Succès pour {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Pas d’Articles à emballer
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Pas d’Articles à emballer
 DocType: Shipping Rule Condition,From Value,De la Valeur
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Quantité de Fabrication est obligatoire
 DocType: Employee Loan,Repayment Method,Méthode de Remboursement
@@ -1758,33 +1788,34 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Passif du Stock
 DocType: Purchase Invoice,Supplier Warehouse,Entrepôt Fournisseur
 DocType: Opportunity,Contact Mobile No,N° de Portable du Contact
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Sélectionnez une entreprise
 ,Material Requests for which Supplier Quotations are not created,Demandes de Matériel dont les Devis Fournisseur ne sont pas créés
 DocType: Student Group,Set 0 for no limit,Définir à 0 pour aucune limite
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Le(s) jour(s) pour le(s)quel(s) vous demandez un congé sont des jour(s) férié(s). Vous n’avez pas besoin d’effectuer de demande.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Renvoyer Email de Paiement
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nouvelle tâche
-DocType: Consultation,Appointment,Rendez-vous
+DocType: Consultation,Appointment,Rendez-Vous
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Faire un Devis
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Autres Rapports
 DocType: Dependent Task,Dependent Task,Tâche Dépendante
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Facteur de conversion de l'Unité de Mesure par défaut doit être 1 dans la ligne {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Facteur de conversion de l'Unité de Mesure par défaut doit être 1 dans la ligne {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Les Congés de type {0} ne peuvent pas être plus long que {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Essayez de planifer des opérations X jours à l'avance.
 DocType: HR Settings,Stop Birthday Reminders,Arrêter les Rappels d'Anniversaire
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Veuillez définir le Compte Créditeur de Paie par Défaut pour la Société {0}
 DocType: SMS Center,Receiver List,Liste de Destinataires
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Rechercher Article
-DocType: Patient Appointment,Referring Physician,Médecin référent
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Rechercher Article
+DocType: Patient Appointment,Referring Physician,Médecin Référent
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Montant Consommé
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Variation Nette de Trésorerie
 DocType: Assessment Plan,Grading Scale,Échelle de Notation
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unité de Mesure {0} a été saisie plus d'une fois dans la Table de Facteur de Conversion
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,Déjà terminé
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unité de Mesure {0} a été saisie plus d'une fois dans la Table de Facteur de Conversion
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,Déjà terminé
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock Existant
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Demande de Paiement existe déjà {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Coût des Marchandises Vendues
 DocType: Physician,Hospital,Hôpital
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Quantité ne doit pas être plus de {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Quantité ne doit pas être plus de {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,L’Exercice Financier Précédent n’est pas fermé
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Âge (Jours)
 DocType: Quotation Item,Quotation Item,Article du Devis
@@ -1795,16 +1826,17 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Type de Fournisseur principal
 DocType: Purchase Order Item,Supplier Part Number,Numéro de Pièce du Fournisseur
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Le taux de conversion ne peut pas être égal à 0 ou 1
-DocType: Sales Invoice,Reference Document,Document de Référence
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} est annulé ou arrêté
+DocType: Subscription,Reference Document,Document de Référence
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} est annulé ou arrêté
 DocType: Accounts Settings,Credit Controller,Controlleur du Crédit
 DocType: Delivery Note,Vehicle Dispatch Date,Date d'Envoi du Véhicule
-DocType: Healthcare Settings,Default Medical Code Standard,Norme de code médical par défaut
+DocType: Healthcare Settings,Default Medical Code Standard,Code Médical Standard par Défaut
 DocType: Purchase Invoice Item,HSN/SAC,HSN / SAC
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +234,Purchase Receipt {0} is not submitted,Le Reçu d’Achat {0} n'est pas soumis
 DocType: Company,Default Payable Account,Compte Créditeur par Défaut
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Réglages pour panier telles que les règles de livraison, liste de prix, etc."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Facturé
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Trier par Prix ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Qté Réservées
 DocType: Party Account,Party Account,Compte de la Partie
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Ressources Humaines
@@ -1816,13 +1848,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Faire une Écriture de Décaissement
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Ligne {0} : L’Avance du Fournisseur doit être un débit
 DocType: Company,Default Values,Valeurs Par Défaut
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,Rapport {Frequency}
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,Rapport {Frequency}
 DocType: Expense Claim,Total Amount Reimbursed,Montant Total Remboursé
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Basé sur les journaux de ce Véhicule. Voir la chronologie ci-dessous pour plus de détails
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Pour la Facture Fournisseur {0} datée {1}
 DocType: Customer,Default Price List,Liste des Prix par Défaut
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Registre de Mouvement de l'Actif {0} créé
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Vous ne pouvez pas supprimer l'Exercice {0}. L'exercice {0} est défini par défaut dans les Réglages Globaux
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Un client avec le même nom existe déjà
 DocType: Journal Entry,Entry Type,Type d'Écriture
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Aucun plan d&#39;évaluation lié à ce groupe d&#39;évaluation
 ,Customer Credit Balance,Solde de Crédit des Clients
@@ -1832,25 +1865,27 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Tarification
 DocType: Quotation,Term Details,Détails du Terme
 DocType: Project,Total Sales Cost (via Sales Order),Coût Total des Ventes (par Commande Client)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Inscription de plus de {0} étudiants impossible pour ce groupe d'étudiants.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Inscription de plus de {0} étudiants impossible pour ce groupe d'étudiants.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Nombre de Prospects
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} doit être supérieur à 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planification de Capacité Pendant (Jours)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Approvisionnement
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Aucun des Articles n’a de changement en quantité ou en valeur.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Champ Obligatoire - Programme
-DocType: Special Test Template,Result Component,Composante de résultat
+DocType: Special Test Template,Result Component,Composante de Résultat
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Réclamation de Garantie
 ,Lead Details,Détails du Prospect
 DocType: Salary Slip,Loan repayment,Remboursement de Prêt
 DocType: Purchase Invoice,End date of current invoice's period,Date de fin de la période de facturation en cours
 DocType: Pricing Rule,Applicable For,Applicable Pour
-DocType: Lab Test,Technician Name,Nom du technicien
+DocType: Lab Test,Technician Name,Nom du Technicien
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Délier Paiement à l'Annulation de la Facture
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Le Compteur(kms) Actuel entré devrait être plus grand que le Compteur(kms) initial du Véhicule {0}
+DocType: Restaurant Reservation,No Show,Pas de spectacle
 DocType: Shipping Rule Country,Shipping Rule Country,Pays de la Règle de Livraison
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Congés et Présences
 DocType: Maintenance Visit,Partially Completed,Partiellement Complété
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Sensibilité modérée
 DocType: Leave Type,Include holidays within leaves as leaves,Inclure les vacances dans les congés en tant que congés
 DocType: Sales Invoice,Packed Items,Articles Emballés
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Réclamation de Garantie pour le N° de Série.
@@ -1859,7 +1894,7 @@
 DocType: Employee,Permanent Address,Adresse Permanente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",L'avance versée pour {0} {1} ne peut être supérieure \ au Total Général {2}
-DocType: Patient,Medication,Des médicaments
+DocType: Patient,Medication,Médicaments
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Veuillez sélectionner un code d'article
 DocType: Student Sibling,Studying in Same Institute,Étudier au même Institut
 DocType: Territory,Territory Manager,Responsable Régional
@@ -1867,13 +1902,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Montant Payé (Devise Société)
 DocType: Purchase Invoice,Additional Discount,Remise Supplémentaire
 DocType: Selling Settings,Selling Settings,Réglages de Vente
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Confirmer l&#39;action
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Enchères en Ligne
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Veuillez spécifier la Quantité, le Taux de Valorisation ou les deux"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Accomplissement
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Voir Panier
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Dépenses de Marketing
 ,Item Shortage Report,Rapport de Rupture de Stock d'Article
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Poids est mentionné,\nVeuillez aussi mentionner ""UDM de Poids"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Poids est mentionné,\nVeuillez aussi mentionner ""UDM de Poids"""
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Demande de Matériel utilisée pour réaliser cette Écriture de Stock
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Date de l’Amortissement Suivant est obligatoire pour un nouvel actif
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Groupes basés sur les cours différents pour chaque Lot
@@ -1881,17 +1917,17 @@
 DocType: Fee Category,Fee Category,Catégorie d'Honoraires
 DocType: Drug Prescription,Dosage by time interval,Dosage par intervalle de temps
 ,Student Fee Collection,Frais de Scolarité
-apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +23,Appointment Duration (mins),Date de rendez-vous (min.)
+apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +23,Appointment Duration (mins),Durée du Rendez-Vous (min.)
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Faites une Écriture Comptable Pour Chaque Mouvement du Stock
 DocType: Leave Allocation,Total Leaves Allocated,Total des Congés Attribués
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Entrepôt requis à la Ligne N° {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Veuillez entrer des Dates de Début et de Fin d’Exercice Comptable valides
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Veuillez entrer des Dates de Début et de Fin d’Exercice Comptable valides
 DocType: Employee,Date Of Retirement,Date de Départ à la Retraite
 DocType: Upload Attendance,Get Template,Obtenir Modèle
 DocType: Material Request,Transferred,Transféré
 DocType: Vehicle,Doors,Portes
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,Installation d'ERPNext Terminée!
-DocType: Healthcare Settings,Collect Fee for Patient Registration,Frais de collecte pour l&#39;inscription des patients
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,Installation d'ERPNext Terminée!
+DocType: Healthcare Settings,Collect Fee for Patient Registration,Collecter les honoraires pour l'inscription des patients
 DocType: Course Assessment Criteria,Weightage,Poids
 DocType: Purchase Invoice,Tax Breakup,Répartition des Taxes
 DocType: Packing Slip,PS-,PS-
@@ -1904,41 +1940,41 @@
 DocType: Stock Entry,Material Receipt,Réception Matériel
 DocType: Homepage,Products,Produits
 DocType: Announcement,Instructor,Instructeur
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +61,Select Item (optional),Sélectionnez l&#39;élément (facultatif)
-DocType: Fee Schedule Student Group,Fee Schedule Student Group,Calendrier des frais Groupe étudiant
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +61,Select Item (optional),Sélectionnez l'Article (facultatif)
+DocType: Fee Schedule Student Group,Fee Schedule Student Group,Groupe Étudiant Calendrier des Honoraires
 DocType: Employee,AB+,AB+
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si cet article a des variantes, alors il ne peut pas être sélectionné dans les commandes clients, etc."
 DocType: Lead,Next Contact By,Contact Suivant Par
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Quantité requise pour l'Article {0} à la ligne {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Quantité requise pour l'Article {0} à la ligne {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},L'entrepôt {0} ne peut pas être supprimé car il existe une quantité pour l'Article {1}
 DocType: Quotation,Order Type,Type de Commande
-DocType: Purchase Invoice,Notification Email Address,Adresse Email de Notification
 ,Item-wise Sales Register,Registre des Ventes par Article
 DocType: Asset,Gross Purchase Amount,Montant d'Achat Brut
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Balances d'Ouverture
 DocType: Asset,Depreciation Method,Méthode d'Amortissement
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Hors Ligne
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Hors Ligne
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Cette Taxe est-elle incluse dans le Taux de Base ?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Cible Totale
 DocType: Job Applicant,Applicant for a Job,Candidat à un Emploi
 DocType: Production Plan Material Request,Production Plan Material Request,Demande de Matériel du Plan de Production
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Pas d'Ordre de Production créé
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Pas d'Ordre de Production créé
 DocType: Stock Reconciliation,Reconciliation JSON,Réconciliation JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Trop de colonnes. Exportez le rapport et imprimez-le à l'aide d'un tableur.
 DocType: Purchase Invoice Item,Batch No,N° du Lot
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Demande de devis: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Autoriser plusieurs Commandes Clients pour un Bon de Commande d'un Client
 DocType: Student Group Instructor,Student Group Instructor,Instructeur de Groupe d'Étudiant
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,N° du Mobile du Tuteur 1
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Principal
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Définir le préfixe des séries numérotées pour vos transactions
 DocType: Employee Attendance Tool,Employees HTML,Employés HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,LDM par défaut ({0}) doit être actif pour ce produit ou son modèle
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,LDM par défaut ({0}) doit être actif pour ce produit ou son modèle
 DocType: Employee,Leave Encashed?,Laisser Encaissé ?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Le champ Opportunité De est obligatoire
 DocType: Email Digest,Annual Expenses,Dépenses Annuelles
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Faire un Bon de Commande
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Faire un Bon de Commande
 DocType: SMS Center,Send To,Envoyer À
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Il n'y a pas assez de solde de congés pour les Congés de Type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Montant alloué
@@ -1954,6 +1990,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Force du Groupe d'Étudiant
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,L'Écriture de Journal {0} n'a pas d'entrée non associée {1}
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Évaluation
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Événements de formation
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Dupliquer N° de Série pour l'Article {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Une condition pour une Règle de Livraison
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Veuillez entrer
@@ -1963,7 +2000,7 @@
 DocType: Sales Order,To Deliver and Bill,À Livrer et Facturer
 DocType: Student Group,Instructors,Instructeurs
 DocType: GL Entry,Credit Amount in Account Currency,Montant du Crédit dans la Devise du Compte
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,LDM {0} doit être soumise
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,LDM {0} doit être soumise
 DocType: Authorization Control,Authorization Control,Contrôle d'Autorisation
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ligne #{0} : Entrepôt de Rejet est obligatoire pour l’Article rejeté {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Paiement
@@ -1982,11 +2019,11 @@
 DocType: Quotation Item,Actual Qty,Quantité Réelle
 DocType: Sales Invoice Item,References,Références
 DocType: Quality Inspection Reading,Reading 10,Lecture 10
-DocType: Hub Settings,Hub Node,Noeud du Hub
+DocType: Hub Category,Hub Node,Noeud du Hub
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Vous avez entré un doublon. Veuillez rectifier et essayer à nouveau.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Associé
 DocType: Asset Movement,Asset Movement,Mouvement d'Actif
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,Nouveau Panier
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,Nouveau Panier
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,L'article {0} n'est pas un Article avec un numéro de serie
 DocType: SMS Center,Create Receiver List,Créer une Liste de Réception
 DocType: Vehicle,Wheels,Roues
@@ -2000,15 +2037,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Télécommunications
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indique que le paquet est une partie de cette livraison (Brouillons Seulement)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Faire une Écriture de Paiement
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Quantité de l'article {0} doit être inférieure à {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Quantité de l'article {0} doit être inférieure à {1}
 ,Sales Invoice Trends,Tendances des Factures de Vente
 DocType: Leave Application,Apply / Approve Leaves,Appliquer / Approuver les Congés
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Pour
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Pour
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Peut se référer à ligne seulement si le type de charge est 'Montant de la ligne précedente' ou 'Total des lignes précedente'
 DocType: Sales Order Item,Delivery Warehouse,Entrepôt de Livraison
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Arbre des Centres de Coûts financiers.
 DocType: Serial No,Delivery Document No,Numéro de Document de Livraison
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Veuillez définir ‘Compte de Gain/Perte sur les Cessions d’Immobilisations’ de la Société {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Veuillez définir ‘Compte de Gain/Perte sur les Cessions d’Immobilisations’ de la Société {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Obtenir des Articles à partir des Reçus d'Achat
 DocType: Serial No,Creation Date,Date de Création
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},L'article {0} apparaît plusieurs fois dans la Liste de Prix {1}
@@ -2019,20 +2056,21 @@
 DocType: Student,Student Mobile Number,Numéro de Mobile de l'Étudiant
 DocType: Item,Has Variants,A Variantes
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Mettre à jour la Réponse
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Vous avez déjà choisi des articles de {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Vous avez déjà choisi des articles de {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nom de la Répartition Mensuelle
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Le N° du lot est obligatoire
 DocType: Sales Person,Parent Sales Person,Commercial Parent
-DocType: Purchase Invoice,Recurring Invoice,Facture Récurrente
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Haut en bas
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Sélectionnez d&#39;abord le programme
 DocType: Patient Appointment,Patient Age,Âge du patient
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Gestion de Projets
 DocType: Supplier,Supplier of Goods or Services.,Fournisseur de Biens ou Services.
 DocType: Budget,Fiscal Year,Exercice Fiscal
-DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Les comptes à recevoir par défaut à utiliser si non définis dans Patient pour réserver des frais de consultation.
+DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Comptes débiteurs par défaut à utiliser si non définis dans la fiche Patient pour enregistrer les honoraires de consultation.
 DocType: Vehicle Log,Fuel Price,Prix du Carburant
 DocType: Budget,Budget,Budget
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Set Open
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Un Article Immobilisé doit être un élément non stocké.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Définir comme ouvert
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Un Article Immobilisé doit être un élément non stocké.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget ne peut pas être affecté pour {0}, car ce n’est pas un compte de produits ou de charges"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Atteint
 DocType: Student Admission,Application Form Route,Chemin du Formulaire de Candidature
@@ -2046,12 +2084,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,L'article {0} n'est pas configuré pour les Numéros de Série. Vérifiez la fiche de l'Article
 DocType: Maintenance Visit,Maintenance Time,Temps d'Entretien
 ,Amount to Deliver,Nombre à Livrer
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Le même objet a été saisi à plusieurs reprises. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,La Date de Début de Terme ne peut pas être antérieure à la Date de Début de l'Année Académique à laquelle le terme est lié (Année Académique {}). Veuillez corriger les dates et essayer à nouveau.
 DocType: Guardian,Guardian Interests,Part du Tuteur
 DocType: Naming Series,Current Value,Valeur actuelle
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Plusieurs Exercices existent pour la date {0}. Veuillez définir la société dans l'Exercice
 DocType: School Settings,Instructor Records to be created by,Les Enregistrements de l'Instructeur seront créés par
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} créé
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} créé
 DocType: Delivery Note Item,Against Sales Order,Pour la Commande Client
 ,Serial No Status,Statut du N° de Série
 DocType: Payment Entry Reference,Outstanding,Solde
@@ -2062,10 +2101,10 @@
 doit être supérieure ou égale à {2}"""
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Basé sur les mouvements de stock. Voir {0} pour plus de détails
 DocType: Pricing Rule,Selling,Vente
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Montant {0} {1} déduit de {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Montant {0} {1} déduit de {2}
 DocType: Employee,Salary Information,Information sur le Salaire
 DocType: Sales Person,Name and Employee ID,Nom et ID de l’Employé
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,La Date d'Échéance ne peut être antérieure à la Date de Comptabilisation
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,La Date d'Échéance ne peut être antérieure à la Date de Comptabilisation
 DocType: Website Item Group,Website Item Group,Groupe d'Articles du Site Web
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Droits de Douane et Taxes
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Veuillez entrer la date de Référence
@@ -2091,7 +2130,7 @@
 DocType: Issue,Resolution Details,Détails de la Résolution
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Allocations
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Critères d'Acceptation
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Veuillez entrer les Demandes de Matériel dans le tableau ci-dessus
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Veuillez entrer les Demandes de Matériel dans le tableau ci-dessus
 DocType: Item Attribute,Attribute Name,Nom de l'Attribut
 DocType: BOM,Show In Website,Afficher dans le Site Web
 DocType: Shopping Cart Settings,Show Quantity in Website,Afficher la Quantité sur le Site
@@ -2100,14 +2139,14 @@
 DocType: Item Reorder,Check in (group),Enregistrement (groupe)
 ,Qty to Order,Quantité à Commander
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Le titre du compte de Passif ou de Capitaux Propres, dans lequel les Bénéfices/Pertes seront comptabilisés"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Diagramme de Gantt de toutes les tâches.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Diagramme de Gantt de toutes les tâches.
 DocType: Opportunity,Mins to First Response,Minutes avant la Première Réponse
 DocType: Pricing Rule,Margin Type,Type de Marge
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} heures
 DocType: Course,Default Grading Scale,Échelle de Notation par Défault
 DocType: Appraisal,For Employee Name,Nom de l'Employé
 DocType: Holiday List,Clear Table,Effacer le tableau
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +98,Available slots,Slots disponibles
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +98,Available slots,Créneaux Disponibles
 DocType: C-Form Invoice Detail,Invoice No,No de Facture
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +350,Make Payment,Faire un Paiement
 DocType: Room,Room Name,Nom de la Chambre
@@ -2118,38 +2157,38 @@
 ,Campaign Efficiency,Efficacité des Campagnes
 DocType: Discussion,Discussion,Discussion
 DocType: Payment Entry,Transaction ID,Identifiant de Transaction
-DocType: Patient,Surgical History,Histoire chirurgicale
+DocType: Patient,Surgical History,Antécédents Chirurgicaux
 DocType: Employee,Resignation Letter Date,Date de la Lettre de Démission
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Les Règles de Tarification sont d'avantage filtrés en fonction de la quantité.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Veuillez définir la Date d'Embauche pour l'employé {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Veuillez définir la Date d'Embauche pour l'employé {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Montant Total de Facturation (via Feuille de Temps)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Répéter Revenu Clientèle
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) doit avoir le rôle ""Approbateur de Frais"""
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Paire
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Sélectionner la LDM et la Qté pour la Production
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Sélectionner la LDM et la Qté pour la Production
 DocType: Asset,Depreciation Schedule,Calendrier d'Amortissement
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Adresses et Contacts des Partenaires de Vente
 DocType: Bank Reconciliation Detail,Against Account,Pour le Compte
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,La Date de Demi-Journée doit être entre la Date de Début et la Date de Fin
 DocType: Maintenance Schedule Detail,Actual Date,Date Réelle
 DocType: Item,Has Batch No,A un Numéro de Lot
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Facturation Annuelle : {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Facturation Annuelle : {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Taxe sur les Biens et Services (GST India)
 DocType: Delivery Note,Excise Page Number,Numéro de Page d'Accise
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Société, Date Début et Date Fin sont obligatoires"
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Obtenir de la consultation
+apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Obtenir depuis la Consultation
 DocType: Asset,Purchase Date,Date d'Achat
 DocType: Employee,Personal Details,Données Personnelles
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Veuillez définir 'Centre de Coûts des Amortissements d’Actifs’ de la Société {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Veuillez définir 'Centre de Coûts des Amortissements d’Actifs’ de la Société {0}
 ,Maintenance Schedules,Échéanciers d'Entretien
 DocType: Task,Actual End Date (via Time Sheet),Date de Fin Réelle (via la Feuille de Temps)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Montant {0} {1} pour {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Montant {0} {1} pour {2} {3}
 ,Quotation Trends,Tendances des Devis
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Le Groupe d'Articles n'est pas mentionné dans la fiche de l'article pour l'article {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Le compte de débit doit être un compte Débiteur
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Le compte de débit doit être un compte Débiteur
 DocType: Shipping Rule Condition,Shipping Amount,Montant de la Livraison
 DocType: Supplier Scorecard Period,Period Score,Score de la Période
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Ajouter des Clients
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Ajouter des Clients
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Montant en Attente
 DocType: Lab Test Template,Special,Spécial
 DocType: Purchase Invoice Item,Conversion Factor,Facteur de Conversion
@@ -2157,13 +2196,14 @@
 ,Vehicle Expenses,Frais de Véhicule
 DocType: Serial No,Invoice Details,Détails de la Facture
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Valeur attendue après utilisation complète doit être supérieure ou égale à {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Démarrer
+DocType: Hub Category,Hub Category,Catégorie de hub
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Numéro de Véhicule
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,La date à laquelle la facture récurrente sera arrêtée
 DocType: Employee Loan,Loan Amount,Montant du Prêt
 DocType: Program Enrollment,Self-Driving Vehicle,Véhicule Autonome
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Classement de la Fiche d'Évaluation Fournisseur
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Ligne {0} : Liste de Matériaux non trouvée pour l’Article {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Ligne {0} : Liste de Matériaux non trouvée pour l’Article {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Le Total des feuilles attribuées {0} ne peut pas être inférieur aux feuilles déjà approuvées {1} pour la période
 DocType: Journal Entry,Accounts Receivable,Comptes Débiteurs
 ,Supplier-Wise Sales Analytics,Analyse des Ventes par Fournisseur
@@ -2174,7 +2214,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Cours Parent (Laisser vide, si cela ne fait pas partie du Cours Parent)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Laisser vide pour tous les types d'employés
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuer les Charges sur la Base de
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Feuilles de Temps
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Feuilles de Temps
 DocType: HR Settings,HR Settings,Paramètres RH
 DocType: Salary Slip,net pay info,Info de salaire net
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Cette valeur est mise à jour dans la liste de prix de vente par défaut.
@@ -2185,13 +2225,13 @@
 DocType: Patient,B Positive,B Positif
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ligne #{0} : Qté doit égale à 1, car l’Article est un actif immobilisé. Veuillez utiliser une ligne distincte pour une qté multiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Autoriser la Liste de Blocage des Congés
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abré. ne peut être vide ou contenir un espace
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abré. ne peut être vide ou contenir un espace
 DocType: Patient Medical Record,Patient Medical Record,Registre médical du patient
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Groupe vers Non-Groupe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportif
 DocType: Loan Type,Loan Name,Nom du Prêt
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Total Réel
-DocType: Lab Test UOM,Test UOM,Test UOM
+DocType: Lab Test UOM,Test UOM,UDM de Test
 DocType: Student Siblings,Student Siblings,Frères et Sœurs de l'Étudiants
 apps/erpnext/erpnext/utilities/user_progress.py +125,Unit,Unité
 apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Veuillez spécifier la Société
@@ -2201,9 +2241,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Impossible de trouver le taux de change pour {0} à {1} pour la date clé {2}. Veuillez créer une entrée de taux de change manuellement
 DocType: POS Profile,Price List,Liste de Prix
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} est désormais l’Exercice par défaut. Veuillez actualiser la page pour que les modifications soient prises en compte.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Notes de Frais
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Notes de Frais
 DocType: Issue,Support,Support
 ,BOM Search,Recherche LDM
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Publier &quot;En Stock&quot; ou &quot;Pas en Stock&quot; sur le Hub basé sur le stock disponible dans cet entrepôt.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Clôture (Ouverture + Totaux)
 DocType: Vehicle,Fuel Type,Type de Carburant
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Veuillez spécifier la devise de la Société
@@ -2212,43 +2253,44 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Les Demandes de Matériel suivantes ont été créées automatiquement sur la base du niveau de réapprovisionnement de l’Article
 DocType: Email Digest,Pending Sales Orders,Commandes Client en Attente
 apps/erpnext/erpnext/controllers/accounts_controller.py +279,Account {0} is invalid. Account Currency must be {1},Le compte {0} est invalide. La Devise du Compte doit être {1}
-DocType: Healthcare Settings,Remind Before,Rappelez-vous avant
+DocType: Healthcare Settings,Remind Before,Rappeler Avant
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Facteur de conversion de l'UDM est obligatoire dans la ligne {0}
 DocType: Production Plan Item,material_request_item,article_demande_de_materiel
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Ligne #{0} : Le Type de Document de Référence doit être une Commande Client, une Facture de Vente ou une Écriture de Journal"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Ligne #{0} : Le Type de Document de Référence doit être une Commande Client, une Facture de Vente ou une Écriture de Journal"
 DocType: Salary Component,Deduction,Déduction
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Ligne {0} : Heure de Début et Heure de Fin obligatoires.
 DocType: Stock Reconciliation Item,Amount Difference,Différence de Montant
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Prix de l'Article ajouté pour {0} dans la Liste de Prix {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Prix de l'Article ajouté pour {0} dans la Liste de Prix {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Veuillez entrer l’ID Employé de ce commercial
 DocType: Territory,Classification of Customers by region,Classification des Clients par région
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,L’Écart de Montant doit être égal à zéro
 DocType: Project,Gross Margin,Marge Brute
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Veuillez d’abord entrer l'Article en Production
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Veuillez d’abord entrer l'Article en Production
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Solde Calculé du Relevé Bancaire
-DocType: Normal Test Template,Normal Test Template,Modèle de test normal
+DocType: Normal Test Template,Normal Test Template,Modèle de Test Normal
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Utilisateur Désactivé
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +764,Quotation,Devis
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +957,Cannot set a received RFQ to No Quote,Impossible de lier une Réponse à Appel d'Offres reçue à Aucun Devis
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Déduction Totale
 ,Production Analytics,Analyse de la Production
-apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Ceci est basé sur des transactions contre ce patient. Voir le calendrier ci-dessous pour plus de détails
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Coût Mise à Jour
+apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Ceci est basé sur les transactions de ce patient. Voir la chronologie ci-dessous pour plus de détails
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Coût Mise à Jour
 DocType: Employee,Date of Birth,Date de Naissance
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,L'article {0} a déjà été retourné
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Exercice** représente un Exercice Financier. Toutes les écritures comptables et autres transactions majeures sont suivis en **Exercice**.
 DocType: Opportunity,Customer / Lead Address,Adresse du Client / Prospect
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Configuration de la Fiche d'Évaluation Fournisseur
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Attention : certificat SSL non valide sur la pièce jointe {0}
-DocType: Student Admission,Eligibility,Admissibilité
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Nom du plan d&#39;évaluation
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Attention : certificat SSL non valide sur la pièce jointe {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Les prospects vous aident à obtenir des contrats, ajoutez tous vos contacts et plus dans votre liste de prospects"
 DocType: Production Order Operation,Actual Operation Time,Temps d'Exploitation Réel
 DocType: Authorization Rule,Applicable To (User),Applicable À (Utilisateur)
 DocType: Purchase Taxes and Charges,Deduct,Déduire
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Description de l'Emploi
 DocType: Student Applicant,Applied,Appliqué
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Ré-ouvrir
 DocType: Sales Invoice Item,Qty as per Stock UOM,Qté par UDM du Stock
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Nom du Tuteur 2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Les caractères spéciaux sauf ""-"", ""#"", ""."" et ""/"" ne sont pas autorisés dans le nommage des séries"
@@ -2260,14 +2302,14 @@
 DocType: Request for Quotation,Manufacturing Manager,Responsable Fabrication
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},N° de Série {0} est sous garantie jusqu'au {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Séparer le Bon de Livraison dans des paquets.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Livraisons
+apps/erpnext/erpnext/hooks.py +107,Shipments,Livraisons
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Montant Total Alloué (Devise Société)
 DocType: Purchase Order Item,To be delivered to customer,À livrer à la clientèle
 DocType: BOM,Scrap Material Cost,Coût de Mise au Rebut des Matériaux
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +227,Serial No {0} does not belong to any Warehouse,N° de Série {0} ne fait partie de aucun Entrepôt
 DocType: Purchase Invoice,In Words (Company Currency),En Toutes Lettres (Devise Société)
 DocType: Asset,Supplier,Fournisseur
-DocType: Consultation,Consultation Time,Temps de consultation
+DocType: Consultation,Consultation Time,Durée de Consultation
 DocType: C-Form,Quarter,Trimestre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Dépenses Diverses
 DocType: Global Defaults,Default Company,Société par Défaut
@@ -2279,14 +2321,14 @@
 DocType: Leave Application,Total Leave Days,Total des Jours de Congé
 DocType: Email Digest,Note: Email will not be sent to disabled users,Remarque : Email ne sera pas envoyé aux utilisateurs désactivés
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Nombre d'Interactions
-apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Paramètres de la variante d&#39;élément
+apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Paramètres de Variante d'Article
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Sélectionner la Société ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Laisser vide pour tous les départements
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Type d’emploi (CDI, CDD, Stagiaire, etc.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} est obligatoire pour l’Article {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Type d’emploi (CDI, CDD, Stagiaire, etc.)"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} est obligatoire pour l’Article {1}
 DocType: Process Payroll,Fortnightly,Bimensuel
 DocType: Currency Exchange,From Currency,De la Devise
-DocType: Vital Signs,Weight (In Kilogram),Poids (en kilogramme)
+DocType: Vital Signs,Weight (In Kilogram),Poids (En Kilogramme)
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Veuillez sélectionner le Montant Alloué, le Type de Facture et le Numéro de Facture dans au moins une ligne"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Coût du Nouvel Achat
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +97,Sales Order required for Item {0},Commande Client requise pour l'Article {0}
@@ -2307,7 +2349,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Veuillez cliquer sur ‘Générer Calendrier’ pour obtenir le calendrier
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Il y a eu des erreurs lors de la suppression des horaires suivants :
 DocType: Bin,Ordered Quantity,Quantité Commandée
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","e.g. ""Construire des outils pour les constructeurs"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","e.g. ""Construire des outils pour les constructeurs"""
 DocType: Grading Scale,Grading Scale Intervals,Intervalles de l'Échelle de Notation
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1} : L’Écriture Comptable pour {2} peut seulement être faite en devise: {3}
 DocType: Production Order,In Process,En Cours
@@ -2318,7 +2360,7 @@
 apps/erpnext/erpnext/config/stock.py +320,Serialized Inventory,Inventaire Sérialisé
 DocType: Employee Loan,Account Info,Information du Compte
 DocType: Activity Type,Default Billing Rate,Prix de Facturation par Défaut
-DocType: Fees,Include Payment,Inclure le paiement
+DocType: Fees,Include Payment,Inclure le Paiement
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Groupes d'Étudiants créés.
 DocType: Sales Invoice,Total Billing Amount,Montant Total de Facturation
 apps/erpnext/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py +17,There must be a default incoming Email Account enabled for this to work. Please setup a default incoming Email Account (POP/IMAP) and try again.,Il doit y avoir un compte Email entrant par défaut activé pour que cela fonctionne. Veuillez configurer un compte Email entrant par défaut (POP / IMAP) et essayer à nouveau.
@@ -2330,11 +2372,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Avec Paiement de Taxe
 DocType: Expense Claim Detail,Expense Claim Detail,Détail Note de Frais
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICAT POUR LE FOURNISSEUR
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Veuillez sélectionner un compte correct
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Veuillez sélectionner un compte correct
 DocType: Item,Weight UOM,UDM de Poids
 DocType: Salary Structure Employee,Salary Structure Employee,Grille des Salaires des Employés
 DocType: Patient,Blood Group,Groupe Sanguin
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,En Attente
 DocType: Course,Course Name,Nom du Cours
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Les utilisateurs qui peuvent approuver les demandes de congé d'un employé en particulier
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Équipements de Bureau
@@ -2353,7 +2394,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Les Prix ne seront pas affichés si la Liste de Prix n'est pas définie
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Veuillez spécifier un pays pour cette Règle de Livraison ou cocher Livraison Internationale
 DocType: Stock Entry,Total Incoming Value,Valeur Entrante Totale
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Compte de Débit Requis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Compte de Débit Requis
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Les Feuilles de Temps aident au suivi du temps, coût et facturation des activités effectuées par votre équipe"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Liste des Prix d'Achat
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Modèles des Variables de  Fiche d'Évaluation Fournisseur.
@@ -2363,7 +2404,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Réconciliation des Paiements
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Veuillez sélectionner le nom du/de la Responsable
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technologie
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Total des Impayés : {0}
+DocType: Hub Settings,Unregister from Hub,Annuler l&#39;inscription de Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Total des Impayés : {0}
 DocType: BOM Website Operation,BOM Website Operation,Opération de LDM du Site Internet
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Lettre de Proposition
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Générer des Demandes de Matériel (MRP) et des Ordres de Fabrication.
@@ -2375,7 +2417,9 @@
 DocType: Physician Schedule Time Slot,To Time,Horaire de Fin
 DocType: Authorization Rule,Approving Role (above authorized value),Rôle Approbateur (valeurs autorisées ci-dessus)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Le compte À Créditer doit être un compte Créditeur
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},Répétition LDM : {0} ne peut pas être parent ou enfant de {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Veuillez sélectionner l&#39;admission d&#39;étudiant qui est obligatoire pour le candidat étudiant payé
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},Répétition LDM : {0} ne peut pas être parent ou enfant de {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Veuillez sélectionner une liste de prix pour publier les prix
 DocType: Production Order Operation,Completed Qty,Quantité Terminée
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Pour {0}, seuls les comptes de débit peuvent être liés avec une autre écriture de crédit"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,La Liste de Prix {0} est désactivée
@@ -2383,42 +2427,43 @@
 DocType: Manufacturing Settings,Allow Overtime,Autoriser les Heures Supplémentaires
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","L'Article Sérialisé {0} ne peut pas être mis à jour en utilisant la réconciliation des stocks, veuillez utiliser l'entrée de stock"
 DocType: Training Event Employee,Training Event Employee,Évènement de Formation – Employé
-apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +6,Add Time Slots,Ajouter des machines à sous
+apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +6,Add Time Slots,Ajouter des Créneaux
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numéros de Série requis pour objet {1}. Vous en avez fourni {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Taux de Valorisation Actuel
 DocType: Item,Customer Item Codes,Codes Articles du Client
+DocType: Training Event,Advance,Avance
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,pour répéter à nouveau.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Profits / Pertes sur Change
 DocType: Opportunity,Lost Reason,Raison de la Perte
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nouvelle Adresse
 DocType: Quality Inspection,Sample Size,Taille de l'Échantillon
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Veuillez entrer le Document de Réception
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Tous les articles ont déjà été facturés
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Veuillez spécifier un ‘Depuis le Cas N°.’ valide
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',Veuillez spécifier un ‘Depuis le Cas N°.’ valide
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"D'autres centres de coûts peuvent être créés dans des Groupes, mais des écritures ne peuvent être faites que sur des centres de coûts individuels."
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Utilisateurs et Autorisations
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Ordres de Production Créés: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Ordres de Production Créés: {0}
 DocType: Branch,Branch,Branche
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Impression et Marque
 DocType: Company,Total Monthly Sales,Total des Ventes Mensuelles
 DocType: Bin,Actual Quantity,Quantité Réelle
 DocType: Shipping Rule,example: Next Day Shipping,Exemple : Livraison le Jour Suivant
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,N° de Série {0} introuvable
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},L&#39;abonnement a été {0}
-DocType: Fee Schedule Program,Fee Schedule Program,Programme de planification des frais
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},L&#39;abonnement a été {0}
+DocType: Fee Schedule Program,Fee Schedule Program,Programme de planification des honoraires
 DocType: Fee Schedule Program,Student Batch,Lot d'Étudiants
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,sélectionnez * à partir de `tabVital Signs &#39;où patient =&#39; {0} &#39;commande par signs_date desc limit 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Créer un Étudiant
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Note Minimale
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Vous avez été invité à collaborer sur le projet : {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Le médecin n&#39;est pas disponible sur {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Vous avez été invité à collaborer sur le projet : {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Le médecin n'est pas disponible le {0}
 DocType: Leave Block List Date,Block Date,Bloquer la Date
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Ajouter le champ personnalisé N° d'Abonnement dans le doctype {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Bon de Livraison du Fournisseur
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Choisir
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Choisir
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Qté Réelle {0} / Quantité en Attente {1}
 DocType: Purchase Invoice,E-commerce GSTIN,GSTIN E-commerce
 DocType: Sales Order,Not Delivered,Non Livré
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,La date prévue ne peut pas être antérieure à la date de la transaction
 ,Bank Clearance Summary,Bilan des Compensations Bancaires
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Créer et gérer des résumés  d'E-mail quotidiens, hebdomadaires et mensuels ."
 DocType: Appraisal Goal,Appraisal Goal,Objectif d'Estimation
@@ -2426,45 +2471,46 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Bâtiments
 DocType: Fee Schedule,Fee Structure,Structure d'Honoraires
 DocType: Timesheet Detail,Costing Amount,Montant des Coûts
-DocType: Student Admission,Application Fee,Frais de Dossier
+DocType: Student Admission Program,Application Fee,Frais de Dossier
 DocType: Process Payroll,Submit Salary Slip,Soumettre la Fiche de Paie
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Remise maximum pour l'article {0} est de {1} %
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Remise maximum pour l'article {0} est de {1} %
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importer en Masse
 DocType: Sales Partner,Address & Contacts,Adresse &amp; Contacts
 DocType: SMS Log,Sender Name,Nom de l'Expéditeur
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Trier par critères
 DocType: POS Profile,[Select],[Choisir]
-DocType: Vital Signs,Blood Pressure (diastolic),Pression artérielle (diastolique)
+DocType: Vital Signs,Blood Pressure (diastolic),Pression Artérielle (Diastolique)
 DocType: SMS Log,Sent To,Envoyé À
 DocType: Payment Request,Make Sales Invoice,Faire des Factures de Vente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,Softwares
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,La Date de Prochain Contact ne peut pas être dans le passé
 DocType: Company,For Reference Only.,Pour Référence Seulement.
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Le médecin {0} n&#39;est pas disponible sur {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Sélectionnez le N° de Lot
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Le médecin {0} n'est pas disponible le {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Sélectionnez le N° de Lot
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Invalide {0} : {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
-DocType: Fee Validity,Reference Inv,Reference Inv
+DocType: Fee Validity,Reference Inv,Facture de Référence
 DocType: Sales Invoice Advance,Advance Amount,Montant de l'Avance
 DocType: Manufacturing Settings,Capacity Planning,Planification de Capacité
-DocType: Supplier Quotation,Rounding Adjustment (Company Currency,Ajustement d&#39;arrondissement (Monnaie de l&#39;entreprise
+DocType: Supplier Quotation,Rounding Adjustment (Company Currency,Ajustement de l'arrondi (Devise Société
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,'Date début' est requise
 DocType: Journal Entry,Reference Number,Numéro de Référence
 DocType: Employee,Employment Details,Détails de l'Emploi
 DocType: Employee,New Workplace,Nouveau Lieu de Travail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Définir comme Fermé
 apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Barcode {0},Aucun Article avec le Code Barre {0}
-DocType: Normal Test Items,Require Result Value,Exiger la valeur du résultat
+DocType: Normal Test Items,Require Result Value,Nécessite la Valeur du Résultat
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Cas N° ne peut pas être 0
 DocType: Item,Show a slideshow at the top of the page,Afficher un diaporama en haut de la page
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Listes de Matériaux
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Magasins
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Listes de Matériaux
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Magasins
 DocType: Project Type,Projects Manager,Chef de Projet
 DocType: Serial No,Delivery Time,Heure de la Livraison
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Basé Sur le Vieillissement
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Rendez-vous annulé
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Rendez-Vous Annulé
 DocType: Item,End of Life,Fin de Vie
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Déplacement
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Aucune Structure de Salaire active ou par défaut trouvée pour employé {0} pour les dates données
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Déplacement
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Aucune Structure de Salaire active ou par défaut trouvée pour employé {0} pour les dates données
 DocType: Leave Block List,Allow Users,Autoriser les Utilisateurs
 DocType: Purchase Order,Customer Mobile No,N° de Portable du Client
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Récurrent
@@ -2473,12 +2519,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Mettre à jour le Coût
 DocType: Item Reorder,Item Reorder,Réorganiser les Articles
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Afficher la Fiche de Salaire
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Transfert de Matériel
-DocType: Fees,Send Payment Request,Envoyer une demande de paiement
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Transfert de Matériel
+DocType: Fees,Send Payment Request,Envoyer une Demande de Paiement
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Spécifier les opérations, le coût d'exploitation et donner un N° d'Opération unique à vos opérations."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ce document excède la limite de {0} {1} pour l’article {4}. Faites-vous un autre {3} contre le même {2} ?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Veuillez définir la récurrence après avoir sauvegardé
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Sélectionner le compte de change
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Sélectionner le compte de change
 DocType: Purchase Invoice,Price List Currency,Devise de la Liste de Prix
 DocType: Naming Series,User must always select,L'utilisateur doit toujours sélectionner
 DocType: Stock Settings,Allow Negative Stock,Autoriser un Stock Négatif
@@ -2496,26 +2542,28 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Source des Fonds (Passif)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +381,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantité à la ligne {0} ({1}) doit être égale a la quantité fabriquée {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Employé
-DocType: Sample Collection,Collected Time,Heure collectée
+DocType: Sample Collection,Collected Time,Heure de Collecte
 DocType: Company,Sales Monthly History,Historique des Ventes Mensuel
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Sélectionnez le Lot
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Sélectionnez le Lot
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} est entièrement facturé
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Signes vitaux
+apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Signes Vitaux
 DocType: Training Event,End Time,Heure de Fin
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +63,Active Salary Structure {0} found for employee {1} for the given dates,Grille de Salaire active {0} trouvée pour l'employé {1} pour les dates données
 DocType: Payment Entry,Payment Deductions or Loss,Déductions sur le Paiement ou Perte
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Termes contractuels standards pour Ventes ou Achats
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Groupe par Bon
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Êtes-vous sûr de vouloir annuler ce rendez-vous?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Pipeline de Ventes
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Veuillez définir le compte par défaut dans la Composante Salariale {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Requis Pour
 DocType: Rename Tool,File to Rename,Fichier à Renommer
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Veuillez sélectionnez une LDM pour l’Article à la Ligne {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Veuillez sélectionnez une LDM pour l’Article à la Ligne {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Le Compte {0} ne correspond pas à la Société {1} dans le Mode de Compte : {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},La LDM {0} spécifiée n'existe pas pour l'Article {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,L'Échéancier d'Entretien {0} doit être annulé avant d'annuler cette Commande Client
+DocType: POS Profile,Applicable for Users,Applicable aux utilisateurs
 DocType: Notification Control,Expense Claim Approved,Note de Frais Approuvée
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Fiche de Paie de l'employé {0} déjà créée pour cette période
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Fiche de Paie de l'employé {0} déjà créée pour cette période
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Pharmaceutique
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Coût des Articles Achetés
 DocType: Selling Settings,Sales Order Required,Commande Client Requise
@@ -2539,37 +2587,39 @@
 DocType: Offer Letter,Accepted,Accepté
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Organisation
 DocType: BOM Update Tool,BOM Update Tool,Outil de mise à jour de LDM
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Compte de partie non spécifié, veuillez configurer le compte de la partie par défaut dans la société"
 DocType: SG Creation Tool Course,Student Group Name,Nom du Groupe d'Étudiants
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Création de frais
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Création d'Honoraires
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Veuillez vous assurer que vous voulez vraiment supprimer tous les transactions de cette société. Vos données de base resteront intactes. Cette action ne peut être annulée.
 DocType: Room,Room Number,Numéro de la Chambre
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Référence invalide {0} {1}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne peut pas être supérieur à la quantité prévue ({2}) dans l’Ordre de Production {3}
 DocType: Shipping Rule,Shipping Rule Label,Étiquette de la Règle de Livraison
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum de l'Utilisateur
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Matières Premières ne peuvent pas être vides.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Impossible de mettre à jour de stock, facture contient un élément en livraison directe."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Matières Premières ne peuvent pas être vides.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Impossible de mettre à jour de stock, facture contient un élément en livraison directe."
 DocType: Lab Test Sample,Lab Test Sample,Échantillon de test de laboratoire
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Écriture Rapide dans le Journal
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Vous ne pouvez pas modifier le taux si la LDM est mentionnée pour un article
+DocType: Restaurant,Invoice Series Prefix,Préfixe de la série de factures
 DocType: Employee,Previous Work Experience,Expérience de Travail Antérieure
 DocType: Stock Entry,For Quantity,Pour la Quantité
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Veuillez entrer la Qté Planifiée pour l'Article {0} à la ligne {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Veuillez entrer la Qté Planifiée pour l'Article {0} à la ligne {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} n'a pas été soumis
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Demandes d’Articles.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Des ordres de fabrication séparés seront créés pour chaque article produit fini.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} doit être négatif dans le document de retour
 ,Minutes to First Response for Issues,Minutes avant la Première Réponse aux Questions
 DocType: Purchase Invoice,Terms and Conditions1,Termes et Conditions
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,Le nom de l'institut pour lequel vous configurez ce système.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,Le nom de l'institut pour lequel vous configurez ce système.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Les écritures comptables sont gelées jusqu'à cette date, personne ne peut ajouter / modifier les entrées sauf les rôles spécifiés ci-dessous."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Veuillez enregistrer le document avant de générer le calendrier d'entretien
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Prix les plus récents mis à jour dans toutes les LDMs
 DocType: Fee Schedule,Successful,Réussi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Statut du Projet
 DocType: UOM,Check this to disallow fractions. (for Nos),Cochez cette case pour interdire les fractions. (Pour les numéros)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Les Ordres de Production suivants ont été créés:
-DocType: Student Admission,Naming Series (for Student Applicant),Nom de la Série (pour le Candidat Étudiant)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Les Ordres de Production suivants ont été créés:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Nom de la Série (pour le Candidat Étudiant)
 DocType: Delivery Note,Transporter Name,Nom du Transporteur
 DocType: Authorization Rule,Authorized Value,Valeur Autorisée
 DocType: BOM,Show Operations,Afficher Opérations
@@ -2586,14 +2636,14 @@
 DocType: Payment Entry,Deductions or Loss,Déductions ou Perte
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +247,{0} {1} is closed,{0} {1} est fermé
 DocType: Email Digest,How frequently?,A quelle fréquence ?
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +57,Total Collected: {0},Total collecté: {0}
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +57,Total Collected: {0},Total Collecté: {0}
 DocType: Purchase Receipt,Get Current Stock,Obtenir le Stock Actuel
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Arbre des Listes de Matériaux
 DocType: Student,Joining Date,Date d'Inscription
 ,Employees working on a holiday,Employés qui travaillent un jour férié
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Marquer Présent
 DocType: Project,% Complete Method,% Méthode Complète
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Drogue
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Médicament
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},La date de début d'entretien ne peut pas être antérieure à la date de livraison pour le N° de Série {0}
 DocType: Production Order,Actual End Date,Date de Fin Réelle
 DocType: BOM,Operating Cost (Company Currency),Coût d'Exploitation (Devise Société)
@@ -2611,22 +2661,23 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,L'Utilisateur Approbateur ne peut pas être identique à l'utilisateur dont la règle est Applicable
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Taux de base (comme l’UDM du Stock)
 DocType: SMS Log,No of Requested SMS,Nb de SMS Demandés
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Congé sans solde ne correspond pas aux Feuilles de Demandes de Congé Approuvées
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Congé sans solde ne correspond pas aux Feuilles de Demandes de Congé Approuvées
 DocType: Campaign,Campaign-.####,Campagne-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Prochaines Étapes
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Veuillez fournir les articles spécifiés aux meilleurs tarifs possibles
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Assurez- facture
+apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Faire une Facture
 DocType: Selling Settings,Auto close Opportunity after 15 days,Fermer automatiquement les Opportunités après 15 jours
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Les Bons de Commande ne sont pas autorisés pour {0} en raison d'une note sur la fiche d'évaluation de {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Les Bons de Commande ne sont pas autorisés pour {0} en raison d'une note sur la fiche d'évaluation de {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Année de Fin
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Devis / Prospects %
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,La Date de Fin de Contrat doit être supérieure à la Date d'Embauche
-DocType: Vital Signs,Nutrition Values,Valeurs nutritionnelles
+DocType: Vital Signs,Nutrition Values,Valeurs Nutritionnelles
 DocType: Lab Test Template,Is billable,Est facturable
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Les deux &quot;Planification du médecin&quot; et Temps par rendez-vous &quot;doivent être définis pour Dr {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un tiers distributeur / commerçant / commissionnaire / affilié / revendeur qui vend les produits de l'entreprise en échange d'une commission.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} pour le Bon de Commande d'Achat {1}
-DocType: Patient,Patient Demographics,Démographie démographique
+DocType: Patient,Patient Demographics,Démographie du Patient
 DocType: Task,Actual Start Date (via Time Sheet),Date de Début Réelle (via la feuille de temps)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Ceci est un exemple de site généré automatiquement à partir d’ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Balance Agée 1
@@ -2672,8 +2723,7 @@
 9. Considérez Taxe ou Charge pour : Dans cette section, vous pouvez spécifier si la taxe / redevance est seulement pour la valorisation (pas une partie du total) ou seulement pour le total (n'ajoute pas de la valeur à l'article) ou pour les deux.
 10. Ajouter ou Déduire : Ce que vous voulez ajouter ou déduire de la taxe."
 DocType: Homepage,Homepage,Page d'Accueil
-apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Médecin de sélection ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',Onglet de mise à jourConsultation définit la facture = &#39;{0}&#39; où nom = &#39;{1}&#39;
+apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Sélectionnez le Médecin...
 DocType: Purchase Receipt Item,Recd Quantity,Quantité Reçue
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Archive d'Honoraires Créée - {0}
 DocType: Asset Category Account,Asset Category Account,Compte de Catégorie d'Actif
@@ -2685,7 +2735,7 @@
 DocType: Asset,Manual,Manuel
 DocType: Salary Component Account,Salary Component Account,Compte Composante Salariale
 DocType: Global Defaults,Hide Currency Symbol,Masquer le Symbole Monétaire
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","e.g. Cash, Banque, Carte de crédit"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","e.g. Cash, Banque, Carte de crédit"
 DocType: Lead Source,Source Name,Nom de la Source
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","La tension artérielle normale chez un adulte est d&#39;environ 120 mmHg systolique et 80 mmHg diastolique, abrégé &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Note de Crédit
@@ -2704,16 +2754,16 @@
 DocType: Patient,Occupation,Occupation
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Ligne {0} : La Date de Début doit être avant la Date de Fin
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qté)
-DocType: Sales Invoice,This Document,Ce Document
 DocType: Installation Note Item,Installed Qty,Qté Installée
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Cela pourrait être dû à certaines adresses de messagerie invalides dans le
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Vous avez ajouté
 DocType: Purchase Taxes and Charges,Parenttype,Type Parent
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Résultat de la Formation
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Résultat de la Formation
 DocType: Purchase Invoice,Is Paid,Est Payé
 DocType: Salary Structure,Total Earning,Total Revenus
 DocType: Purchase Receipt,Time at which materials were received,Heure à laquelle les matériaux ont été reçus
 DocType: Stock Ledger Entry,Outgoing Rate,Taux Sortant
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Organisation principale des branches.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Organisation principale des branches.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,ou
 DocType: Sales Order,Billing Status,Statut de la Facturation
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Signaler un Problème
@@ -2728,7 +2778,8 @@
 DocType: Notification Control,Sales Order Message,Message de la Commande Client
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Définir les Valeurs par Défaut comme : Societé, Devise, Exercice Actuel, etc..."
 DocType: Payment Entry,Payment Type,Type de Paiement
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Veuillez sélectionner un Lot pour l'Article {0}. Impossible de trouver un seul lot satisfaisant à cette exigence
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Veuillez sélectionner un Lot pour l'Article {0}. Impossible de trouver un seul lot satisfaisant à cette exigence
+DocType: Hub Category,Parent Category,Catégorie Parentale
 DocType: Process Payroll,Select Employees,Sélectionner les Employés
 DocType: Opportunity,Potential Sales Deal,Ventes Potentielles
 DocType: Complaint,Complaints,Plaintes
@@ -2740,7 +2791,7 @@
 ,sales-browser,navigateur-ventes
 apps/erpnext/erpnext/accounts/doctype/account/account.js +73,Ledger,Grand Livre
 DocType: Patient Medical Record,PMR-,PMR-
-DocType: Drug Prescription,Drug Code,Code de drogue
+DocType: Drug Prescription,Drug Code,Code du Médicament
 DocType: Target Detail,Target  Amount,Montant Cible
 DocType: POS Profile,Print Format for Online,Format d'Impression en Ligne
 DocType: Shopping Cart Settings,Shopping Cart Settings,Paramètres du Panier
@@ -2765,7 +2816,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identification de l'emballage pour la livraison (pour l'impression)
 DocType: Bin,Reserved Quantity,Quantité Réservée
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Entrez une adresse email valide
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Veuillez sélectionner un article dans le panier
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Veuillez sélectionner un article dans le panier
 DocType: Landed Cost Voucher,Purchase Receipt Items,Articles du Reçu d’Achat
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Personnalisation des Formulaires
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,Arriéré
@@ -2775,20 +2826,20 @@
 DocType: Payment Request,Amount in customer's currency,Montant dans la devise du client
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Livraison
 DocType: Stock Reconciliation Item,Current Qty,Qté Actuelle
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Ajouter des Fournisseurs
+DocType: Restaurant Menu,Restaurant Menu,Le menu du restaurant
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Précédent
 DocType: Appraisal Goal,Key Responsibility Area,Domaine de Responsabilités Principal
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Les Lots d'Étudiants vous aide à suivre la présence, les évaluations et les frais pour les étudiants"
 DocType: Payment Entry,Total Allocated Amount,Montant Total Alloué
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Configurer le compte d'inventaire par défaut pour l'inventaire perpétuel
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Configurer le compte d'inventaire par défaut pour l'inventaire perpétuel
 DocType: Item Reorder,Material Request Type,Type de Demande de Matériel
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accumulation des Journaux d'Écritures pour les salaires de {0} à {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","Le Stockage Local est plein, sauvegarde impossible"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","Le Stockage Local est plein, sauvegarde impossible"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Ligne {0} : Facteur de Conversion LDM est obligatoire
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Capacité de la Salle
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Réf
 DocType: Lab Test,LP-,LP-
-DocType: Healthcare Settings,Registration Fee,Inscription gratuite
+DocType: Healthcare Settings,Registration Fee,Frais d'Inscription
 DocType: Budget,Cost Center,Centre de Coûts
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Référence #
 DocType: Notification Control,Purchase Order Message,Message du Bon de Commande
@@ -2815,28 +2866,30 @@
 DocType: Task,Depends on Tasks,Dépend des Tâches
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Gérer l'Arborescence des Groupes de Clients.
 DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Les pièces jointes peuvent être affichées sans autoriser le panier
-DocType: Normal Test Items,Result Value,Valeur de résultat
+DocType: Normal Test Items,Result Value,Valeur de Résultat
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Nom du Nouveau Centre de Coûts
 DocType: Leave Control Panel,Leave Control Panel,Quitter le Panneau de Configuration
 DocType: Project,Task Completion,Achèvement de la Tâche
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,En Rupture de Stock
 DocType: Appraisal,HR User,Chargé RH
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Taxes et Frais Déductibles
-apps/erpnext/erpnext/hooks.py +129,Issues,Questions
+apps/erpnext/erpnext/hooks.py +138,Issues,Questions
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Le statut doit être l'un des {0}
 DocType: Sales Invoice,Debit To,Débit Pour
+DocType: Restaurant Menu Item,Restaurant Menu Item,Élément de menu du restaurant
 DocType: Delivery Note,Required only for sample item.,Requis uniquement pour les échantillons.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qté Réelle Après Transaction
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Aucune fiche de paie trouvée entre {0} et {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Aucune fiche de paie trouvée entre {0} et {1}
 ,Pending SO Items For Purchase Request,Articles de Commande Client en Attente Pour la Demande d'Achat
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Admissions des Étudiants
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} est désactivé
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Admissions des Étudiants
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} est désactivé
 DocType: Supplier,Billing Currency,Devise de Facturation
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Extra Large
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Total des Congés
-DocType: Consultation,In print,Sur papier
+DocType: Consultation,In print,Sur impression
 ,Profit and Loss Statement,Compte de Résultat
 DocType: Bank Reconciliation Detail,Cheque Number,Numéro de Chèque
 ,Sales Browser,Navigateur des Ventes
@@ -2854,6 +2907,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Veuillez indiquer le nb de visites requises
 DocType: Stock Settings,Default Valuation Method,Méthode de Valorisation par Défaut
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,Frais
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Mise à jour en cours. Ça peut prendre un moment.
 DocType: Vehicle Log,Fuel Qty,Qté Carburant
 DocType: Production Order Operation,Planned Start Time,Heure de Début Prévue
 DocType: Course,Assessment,Évaluation
@@ -2869,8 +2923,8 @@
 DocType: Price List,Price List Master,Données de Base des Listes de Prix
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Toutes les Transactions de Vente peuvent être assignées à plusieurs **Commerciaux** pour configurer et surveiller les objectifs.
 ,S.O. No.,S.O. N°.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Veuillez créer un Client à partir du Prospect {0}
-apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Sélectionnez Patient
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Veuillez créer un Client à partir du Prospect {0}
+apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Sélectionnez le Patient
 DocType: Price List,Applicable for Countries,Applicable pour les Pays
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Nom du Paramètre
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Seules les Demandes de Congés avec le statut 'Appouvée' ou 'Rejetée' peuvent être soumises
@@ -2912,27 +2966,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,Détails de la Facture du Fournisseur
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Compte de Charge / d'Écart ({0}) doit être un Compte «de Résultat»
 DocType: Project,Copied From,Copié Depuis
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Erreur de Nom: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Pénurie
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Erreur de Nom: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,Pénurie
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} n'est pas associé(e) à {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,La présence de l'employé {0} est déjà marquée
 DocType: Packing Slip,If more than one package of the same type (for print),Si plus d'un paquet du même type (pour l'impression)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Veuillez définir le client par défaut dans les paramètres du restaurant
 ,Salary Register,Registre du Salaire
 DocType: Warehouse,Parent Warehouse,Entrepôt Parent
 DocType: C-Form Invoice Detail,Net Total,Total Net
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},La LDM par défaut n'a pas été trouvée pour l'Article {0} et le Projet {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},La LDM par défaut n'a pas été trouvée pour l'Article {0} et le Projet {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Définir différents types de prêts
 DocType: Bin,FCFS Rate,Montant PAPS
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Montant dû
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Temps (en min)
 DocType: Project Task,Working,Travail en cours
 DocType: Stock Ledger Entry,Stock Queue (FIFO),File d'Attente du Stock (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Exercice Financier
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Exercice Financier
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} n'appartient pas à la Société {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,Impossible de résoudre la fonction de score de critères pour {0}. Assurez-vous que la formule est valide.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Coût à partir de
-DocType: Healthcare Settings,Out Patient Settings,Out Patient Settings
+DocType: Healthcare Settings,Out Patient Settings,Paramètres de Patients Externes
 DocType: Account,Round Off,Arrondi
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,La quantité doit être positive
 ,Requested Qty,Qté Demandée
 DocType: Tax Rule,Use for Shopping Cart,Utiliser pour le Panier
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},La Valeur {0} pour l'Attribut {1} n'existe pas dans la liste des Valeurs d'Attribut d’Article valides pour l’Article {2}
@@ -2941,21 +2997,22 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Les frais seront distribués proportionnellement à la qté ou au montant de l'article, selon votre sélection"
 DocType: Maintenance Visit,Purposes,Objets
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Au moins un article doit être saisi avec quantité négative dans le document de retour
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Ajouter des Cours
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Opération {0} plus longue que toute heure de travail disponible dans le poste {1}, séparer l'opération en plusieurs opérations"
 ,Requested,Demandé
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Aucune Remarque
 DocType: Purchase Invoice,Overdue,En Retard
 DocType: Account,Stock Received But Not Billed,Stock Reçus Mais Non Facturés
 apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Le Compte Racine doit être un groupe
-DocType: Consultation,Drug Prescription,Prescription médicale
+DocType: Consultation,Drug Prescription,Prescription Médicale
 DocType: Fees,FEE.,HONORAIRES.
 DocType: Employee Loan,Repaid/Closed,Remboursé / Fermé
 DocType: Item,Total Projected Qty,Qté Totale Prévue
 DocType: Monthly Distribution,Distribution Name,Nom de Distribution
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Fournisseur&gt; Type de fournisseur
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Le taux de valorisation n&#39;a pas été trouvé pour l&#39;élément {0}, qui est requis pour faire des écritures comptables pour {1} {2}. Si l&#39;article traite comme un élément de taux de valorisation nulle dans le {1}, mentionnez-le dans la {1} table d&#39;éléments. Sinon, créez une transaction de stock entrant pour l&#39;élément ou mentionnez le taux d&#39;évaluation dans l&#39;enregistrement de l&#39;élément, puis essayez de soumettre / annuler cette entrée"
 DocType: Course,Course Code,Code de Cours
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Inspection de la Qualité requise pour l'Article {0}
-DocType: POS Settings,Use POS in Offline Mode,Utiliser POS en mode hors-ligne
+DocType: POS Settings,Use POS in Offline Mode,Utiliser PDV en Mode Hors-Ligne
 DocType: Supplier Scorecard,Supplier Variables,Variables Fournisseur
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Taux auquel la devise client est convertie en devise client de base
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Taux Net (Devise Société)
@@ -2963,16 +3020,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Gérer l’Arborescence des Régions.
 DocType: Journal Entry Account,Sales Invoice,Facture de Vente
 DocType: Journal Entry Account,Party Balance,Solde de la Partie
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,Veuillez sélectionnez Appliquer Remise Sur
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Veuillez sélectionnez Appliquer Remise Sur
 DocType: Company,Default Receivable Account,Compte Client par Défaut
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Créer une Écriture Bancaire pour le salaire total payé avec les critères sélectionnés ci-dessus
-DocType: Physician,Physician Schedule,Calendrier des médecins
+DocType: Physician,Physician Schedule,Calendrier du Médecin
 DocType: Purchase Invoice,Deemed Export,Export Estimé
 DocType: Stock Entry,Material Transfer for Manufacture,Transfert de Matériel pour la Fabrication
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Pourcentage de Réduction peut être appliqué pour une liste de prix en particulier ou pour toutes les listes de prix.
-DocType: Purchase Invoice,Half-yearly,Semestriel
+DocType: Subscription,Half-yearly,Semestriel
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Écriture Comptable pour Stock
-DocType: Lab Test,LabTest Approver,LabTest Approver
+DocType: Lab Test,LabTest Approver,Approbateur de test de laboratoire
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Vous avez déjà évalué les critères d&#39;évaluation {}.
 DocType: Vehicle Service,Engine Oil,Huile Moteur
 DocType: Sales Invoice,Sales Team1,Équipe des Ventes 1
@@ -2981,9 +3038,9 @@
 DocType: Employee Loan,Loan Details,Détails du Prêt
 DocType: Company,Default Inventory Account,Compte d'Inventaire par Défaut
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Ligne {0} : Qté Complétée doit être supérieure à zéro.
-DocType: Antibiotic,Antibiotic Name,Nom de l&#39;antibiotique
+DocType: Antibiotic,Antibiotic Name,Nom de l'Antibiotique
 DocType: Purchase Invoice,Apply Additional Discount On,Appliquer une Remise Supplémentaire Sur
-apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Sélectionner le genre...
+apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Sélectionner le Type...
 DocType: Account,Root Type,Type de Racine
 DocType: Item,FIFO,"FIFO (Premier entré, Premier sorti)"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +132,Row # {0}: Cannot return more than {1} for Item {2},Ligne # {0} : Vous ne pouvez pas retourner plus de {1} pour l’Article {2}
@@ -2999,13 +3056,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Très Petit
 DocType: Company,Standard Template,Modèle Standard
 DocType: Training Event,Theory,Théorie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Attention : La Quantité de Matériel Commandé est inférieure à la Qté Minimum de Commande
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Attention : La Quantité de Matériel Commandé est inférieure à la Qté Minimum de Commande
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Le compte {0} est gelé
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entité Juridique / Filiale avec un Plan de Comptes différent appartenant à l'Organisation.
 DocType: Payment Request,Mute Email,Email Silencieux
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentation, Boissons et Tabac"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Le paiement n'est possible qu'avec les {0} non facturés
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Taux de commission ne peut pas être supérieure à 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Le paiement n'est possible qu'avec les {0} non facturés
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Taux de commission ne peut pas être supérieure à 100
 DocType: Stock Entry,Subcontract,Sous-traiter
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Veuillez d’abord entrer {0}
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Pas de réponse de
@@ -3015,28 +3072,29 @@
 DocType: Production Order Operation,Estimated Time and Cost,Durée et Coût Estimés
 DocType: Bin,Bin,Boîte
 DocType: SMS Log,No of Sent SMS,Nb de SMS Envoyés
-DocType: Antibiotic,Healthcare Administrator,Administrateur de soins de santé
-apps/erpnext/erpnext/utilities/user_progress.py +44,Set a Target,Définir une cible
-DocType: Dosage Strength,Dosage Strength,Dosage Force
+DocType: Antibiotic,Healthcare Administrator,Administrateur de Santé
+apps/erpnext/erpnext/utilities/user_progress.py +44,Set a Target,Définissez une cible
+DocType: Dosage Strength,Dosage Strength,Force du Dosage
 DocType: Account,Expense Account,Compte de Charge
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Logiciel
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Couleur
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Critères du Plan d'Évaluation
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Interdire les Bons de Commande d'Achat
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Sensible
 DocType: Patient Appointment,Scheduled,Prévu
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Appel d'Offre
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Veuillez configurer le système de nommage d&#39;employé dans Ressources humaines&gt; Paramètres RH
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Veuillez sélectionner un Article où ""Est un Article Stocké"" est ""Non"" et ""Est un Article à Vendre"" est ""Oui"" et il n'y a pas d'autre Groupe de Produits"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Sélectionnez un client
 DocType: Student Log,Academic,Académique
-DocType: Patient,Personal and Social History,Histoire personnelle et sociale
-DocType: Fee Schedule,Fee Breakup for each student,Fee Breakup pour chaque élève
+DocType: Patient,Personal and Social History,Antécédents Personnels et Sociaux
+DocType: Fee Schedule,Fee Breakup for each student,Répartition des Honoraires pour chaque élève
 apps/erpnext/erpnext/controllers/accounts_controller.py +476,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avance totale ({0}) pour la Commande {1} ne peut pas être supérieure au Total Général ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Sélectionner une Répartition Mensuelle afin de repartir uniformément les objectifs sur le mois.
-apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Code de changement
+apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Modifier le Code
 DocType: Purchase Invoice Item,Valuation Rate,Taux de Valorisation
 DocType: Stock Reconciliation,SR/,SR/
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Devise de la Liste de Prix non sélectionnée
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Devise de la Liste de Prix non sélectionnée
 apps/erpnext/erpnext/config/healthcare.py +46,Results,Résultats
 ,Student Monthly Attendance Sheet,Feuille de Présence Mensuelle des Étudiants
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},L'employé {0} a déjà demandé {1} entre {2} et {3}
@@ -3050,8 +3108,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +196,Go to Instructors,Aller aux Instructeurs
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Gérer les Partenaires Commerciaux.
 DocType: Quality Inspection,Inspection Type,Type d'Inspection
-DocType: Fee Validity,Visited yet,Visité encore
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Les entrepôts avec des transactions existantes ne peuvent pas être convertis en groupe.
+DocType: Fee Validity,Visited yet,Déjà Visité
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Les entrepôts avec des transactions existantes ne peuvent pas être convertis en groupe.
 DocType: Assessment Result Tool,Result HTML,Résultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Expire Le
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Ajouter des Étudiants
@@ -3072,13 +3130,13 @@
 DocType: Homepage,Company Description for website homepage,Description de la Société pour la page d'accueil du site web
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pour la commodité des clients, ces codes peuvent être utilisés dans des formats d'impression comme les Factures et les Bons de Livraison"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Nom du Fournisseur
-apps/erpnext/erpnext/accounts/report/financial_statements.py +152,Could not retrieve information for {0}.,Impossible de récupérer des informations pour {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +152,Could not retrieve information for {0}.,Impossible de récupérer les informations pour {0}.
 DocType: Sales Invoice,Time Sheet List,Liste de Feuille de Temps
 DocType: Employee,You can enter any date manually,Vous pouvez entrer une date manuellement
-DocType: Healthcare Settings,Result Printed,Résultat imprimé
+DocType: Healthcare Settings,Result Printed,Résultat Imprimé
 DocType: Asset Category Account,Depreciation Expense Account,Compte de Dotations aux Amortissement
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Période d’Essai
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Voir {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Voir {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Seuls les noeuds feuilles sont autorisés dans une transaction
 DocType: Expense Claim,Expense Approver,Approbateur des Frais
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Ligne {0} : L’Avance du Client doit être un crédit
@@ -3089,7 +3147,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,À la Date
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Horaires des Cours supprimés :
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Journaux pour maintenir le statut de livraison des sms
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Définir la cible des ventes
 DocType: Accounts Settings,Make Payment via Journal Entry,Effectuer un Paiement par une Écriture de Journal
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Imprimé sur
 DocType: Item,Inspection Required before Delivery,Inspection Requise avant Livraison
@@ -3097,7 +3154,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Activités en Attente
 DocType: Patient Appointment,Reminded,Rappelé
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Votre Organisation
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Votre Organisation
 DocType: Fee Component,Fees Category,Catégorie d'Honoraires
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Veuillez entrer la date de relève.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Nb
@@ -3109,7 +3166,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Niveau de Réapprovisionnement
 DocType: Company,Chart Of Accounts Template,Modèle de Plan Comptable
 DocType: Attendance,Attendance Date,Date de Présence
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Prix de l'Article mis à jour pour {0} dans la Liste des Prix {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Prix de l'Article mis à jour pour {0} dans la Liste des Prix {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Détails du Salaire basés sur les Revenus et les Prélèvements.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Un compte avec des enfants ne peut pas être converti en grand livre
 DocType: Purchase Invoice Item,Accepted Warehouse,Entrepôt Accepté
@@ -3125,9 +3182,10 @@
 ,Employee Birthday,Anniversaire de l'Employé
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Outil de Présence de Lot d'Étudiants
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,Limite Dépassée
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Programmé jusqu&#39;à
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital Risque
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Une période universitaire avec cette 'Année Universitaire' {0} et 'Nom de la Période' {1} existe déjà. Veuillez modifier ces entrées et essayer à nouveau.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Comme il existe des transactions avec l'article {0}, vous ne pouvez pas changer la valeur de {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Comme il existe des transactions avec l'article {0}, vous ne pouvez pas changer la valeur de {1}"
 DocType: UOM,Must be Whole Number,Doit être un Nombre Entier
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nouvelle Allocation de Congés (en jours)
 DocType: Purchase Invoice,Invoice Copy,Copie de Facture
@@ -3137,22 +3195,22 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Numéro de Facture
 DocType: Shopping Cart Settings,Orders,Commandes
 DocType: Employee Leave Approver,Leave Approver,Approbateur de Congés
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Veuillez sélectionner un lot
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Veuillez sélectionner un lot
 DocType: Assessment Group,Assessment Group Name,Nom du Groupe d'Évaluation
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Matériel Transféré pour la Fabrication
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Un utilisateur avec le rôle ""Approbateur des Frais"""
 DocType: Landed Cost Item,Receipt Document Type,Type de Reçu
 DocType: Daily Work Summary Settings,Select Companies,Sélectionner les Sociétés
 ,Issued Items Against Production Order,Articles Produits pour un Ordre de Fabrication
-DocType: Antibiotic,Healthcare,Soins de santé
+DocType: Antibiotic,Healthcare,Santé
 DocType: Target Detail,Target Detail,Détail Cible
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,Tous les Emplois
 DocType: Sales Order,% of materials billed against this Sales Order,% de matériaux facturés pour cette Commande Client
 DocType: Program Enrollment,Mode of Transportation,Mode de Transport
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Écriture de Clôture de la Période
-apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Sélectionnez le département ...
+apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Sélectionnez le Département ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Un Centre de Coûts avec des transactions existantes ne peut pas être converti en groupe
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Montant {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Montant {0} {1} {2} {3}
 DocType: Account,Depreciation,Amortissement
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fournisseur(s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Outil de Gestion des Présences des Employés
@@ -3163,10 +3221,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,Écritures de Paiement {0} ne sont pas liées
 DocType: GL Entry,Voucher No,N° de Référence
 ,Lead Owner Efficiency,Efficacité des Responsables des Prospects
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Le plus populaire
 DocType: Leave Allocation,Leave Allocation,Allocation de Congés
 DocType: Payment Request,Recipient Message And Payment Details,Message du Destinataire et Détails de Paiement
 DocType: Training Event,Trainer Email,Email du Formateur
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Les Demandes de Matérielles {0} créées
+DocType: Restaurant Reservation,No of People,Nombre de personnes
 DocType: Production Planning Tool,Include sub-contracted raw materials,Inclure les matières premières sous-traitées
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Modèle de termes ou de contrat.
 DocType: Purchase Invoice,Address and Contact,Adresse et Contact
@@ -3175,10 +3235,11 @@
 DocType: Supplier,Last Day of the Next Month,Dernier Jour du Mois Suivant
 DocType: Support Settings,Auto close Issue after 7 days,Fermer automatique les Questions après 7 jours
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Congé ne peut être alloué avant le {0}, car le solde de congés a déjà été reporté dans la feuille d'allocation de congés futurs {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Remarque : Date de Référence / d’Échéance dépasse le nombre de jours de crédit client autorisé de {0} jour(s)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Remarque : Date de Référence / d’Échéance dépasse le nombre de jours de crédit client autorisé de {0} jour(s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Candidature Étudiante
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL POUR LE DESTINATAIRE
 DocType: Asset Category Account,Accumulated Depreciation Account,Compte d'Amortissement Cumulé
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Ce courrier électronique est autogénéré
 DocType: Stock Settings,Freeze Stock Entries,Geler les Entrées de Stocks
 DocType: Program Enrollment,Boarding Student,Enregistrement Étudiant
 DocType: Asset,Expected Value After Useful Life,Valeur Attendue Après Utilisation Complète
@@ -3186,7 +3247,7 @@
 DocType: Activity Cost,Billing Rate,Taux de Facturation
 ,Qty to Deliver,Quantité à Livrer
 ,Stock Analytics,Analyse du Stock
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Les opérations ne peuvent pas être laissées vides
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Les opérations ne peuvent pas être laissées vides
 DocType: Maintenance Visit Purpose,Against Document Detail No,Pour le Détail du Document N°
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Type de Partie est Obligatoire
 DocType: Quality Inspection,Outgoing,Sortant
@@ -3197,7 +3258,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Trésorerie Nette des Investissements
 DocType: Production Order,Work-in-Progress Warehouse,Entrepôt des Travaux en Cours
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +111,Asset {0} must be submitted,L'actif {0} doit être soumis
-DocType: Fee Schedule Program,Total Students,Total des étudiants
+DocType: Fee Schedule Program,Total Students,Total Étudiants
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Registre des présences {0} existe pour l'Étudiant {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Référence #{0} datée du {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Amortissement Eliminé en raison de cessions d'actifs
@@ -3208,7 +3269,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Sélectionner les élèves manuellement pour un Groupe basé sur l'Activité
 DocType: Journal Entry,User Remark,Remarque de l'Utilisateur
 DocType: Lead,Market Segment,Part de Marché
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Le Montant Payé ne peut pas être supérieur au montant impayé restant {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Le Montant Payé ne peut pas être supérieur au montant impayé restant {0}
 DocType: Supplier Scorecard Period,Variables,Variables
 DocType: Employee Internal Work History,Employee Internal Work History,Antécédents Professionnels Interne de l'Employé
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Fermeture (Dr)
@@ -3237,21 +3298,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obtenir les Mises à jour
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1} : Compte {2} ne fait pas partie de la Société {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Demande de Matériel {0} est annulé ou arrêté
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Gestion des Congés
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Gestion des Congés
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Grouper par Compte
 DocType: Sales Order,Fully Delivered,Entièrement Livré
 DocType: Lead,Lower Income,Revenu bas
+DocType: Restaurant Order Entry,Current Order,Ordre actuel
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},L'entrepôt source et destination ne peuvent être similaire dans la ligne {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Le Compte d’Écart doit être un compte de type Actif / Passif, puisque cette Réconciliation de Stock est une écriture d'à-nouveau"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Le Montant Remboursé ne peut pas être supérieur au Montant du Prêt {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Aller aux Programmes
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Numéro de Bon de Commande requis pour l'Article {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Ordre de Production non créé
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Ordre de Production non créé
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',La ‘Date de Début’ doit être antérieure à la ‘Date de Fin’
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Impossible de changer le statut car l'étudiant {0} est lié à la candidature de l'étudiant {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Impossible de changer le statut car l'étudiant {0} est lié à la candidature de l'étudiant {1}
 DocType: Asset,Fully Depreciated,Complètement Déprécié
 ,Stock Projected Qty,Qté de Stock Projeté
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Le Client {0} ne fait pas parti du projet {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Le Client {0} ne fait pas parti du projet {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,HTML des Présences Validées
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Les devis sont des propositions, offres que vous avez envoyées à vos clients"
 DocType: Sales Order,Customer's Purchase Order,N° de Bon de Commande du Client
@@ -3262,8 +3324,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Veuillez définir le Nombre d’Amortissements Comptabilisés
 DocType: Supplier Scorecard Period,Calculations,Calculs
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Valeur ou Qté
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Les Ordres de Production ne peuvent pas être créés pour:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Les Ordres de Production ne peuvent pas être créés pour:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Minute
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Veuillez définir la série de dénomination pour {0} via Configuration&gt; Paramètres&gt; Naming Series
 DocType: Purchase Invoice,Purchase Taxes and Charges,Taxes et Frais d’Achats
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Aller aux Fournisseurs
 ,Qty to Receive,Quantité à Recevoir
@@ -3276,16 +3339,16 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Le compte À Créditer doit être un compte de Bilan
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Tous les Types de Fournisseurs
 DocType: Global Defaults,Disable In Words,"Désactiver ""En Lettres"""
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,Le code de l'Article est obligatoire car l'Article n'est pas numéroté automatiquement
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,Le code de l'Article est obligatoire car l'Article n'est pas numéroté automatiquement
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Le devis {0} n'est pas du type {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Article de Calendrier d'Entretien
 DocType: Sales Order,%  Delivered,% Livré
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Configurez l&#39;ID de courrier électronique pour que l&#39;élève envoie la demande de paiement
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Configurez l'ID de courrier électronique pour que l'Élève envoie la Demande de Paiement
 DocType: Production Order,PRO-,PRO-
 DocType: Patient,Medical History,Antécédents médicaux
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Compte de Découvert Bancaire
 DocType: Patient,Patient ID,Identification du patient
-DocType: Physician Schedule,Schedule Name,Nom de l&#39;horaire
+DocType: Physician Schedule,Schedule Name,Nom du calendrier
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Créer une Fiche de Paie
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +813,Add All Suppliers,Ajouter tous les Fournisseurs
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +81,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Ligne # {0}: montant attribué ne peut pas être supérieur au montant en souffrance.
@@ -3298,23 +3361,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Ouverture de la Balance des Capitaux Propres
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Réconciliation
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Restant
 DocType: Appraisal,Appraisal,Estimation
 DocType: Purchase Invoice,GST Details,Détails de la GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},Email envoyé au fournisseur {0}
+DocType: Item,Default Sales Unit of Measure,Unité de mesure de vente par défaut
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,La Date est répétée
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Signataire Autorisé
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Approbateur de congés doit être un de {0}
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Créer des frais
-DocType: Hub Settings,Seller Email,Email du Vendeur
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Créer des Honoraires
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Coût d'Achat Total (via Facture d'Achat)
 DocType: Training Event,Start Time,Heure de Début
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Sélectionner Quantité
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Sélectionner Quantité
 DocType: Customs Tariff Number,Customs Tariff Number,Tarifs Personnalisés
 DocType: Patient Appointment,Patient Appointment,Rendez-vous patient
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Le Rôle Approbateur ne peut pas être identique au rôle dont la règle est Applicable
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Se Désinscire de ce Compte Rendu par Email
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Se Désinscire de ce Compte Rendu par Email
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Obtenir des Fournisseurs
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} introuvable pour l&#39;élément {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Aller aux Cours
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Message Envoyé
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Les comptes avec des nœuds enfants ne peuvent pas être défini comme grand livre
@@ -3327,11 +3393,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Matériel Transféré pour la Fabrication
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Le compte {0} n'existe pas
 DocType: Project,Project Type,Type de Projet
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Une tâche enfant existe pour cette tâche. Vous ne pouvez pas supprimer cette tâche.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Soit la qté cible soit le montant cible est obligatoire.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Coût des différents types d'activités.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Plus de résultats
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Coût des différents types d'activités.
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Définir les Événements à {0}, puisque l'employé attaché au Commercial ci-dessous n'a pas d'ID Utilisateur {1}"
 DocType: Timesheet,Billing Details,Détails de la Facturation
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Entrepôt source et destination doivent être différents
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Entrepôt source et destination doivent être différents
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Non autorisé à mettre à jour les transactions du stock antérieures à {0}
 DocType: Purchase Invoice Item,PR Detail,Détail PR
 DocType: Sales Order,Fully Billed,Entièrement Facturé
@@ -3357,28 +3425,27 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Virement
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Cochez tout
 DocType: Vehicle Log,Invoice Ref,Facture Ref
-DocType: Purchase Order,Recurring Order,Commande Récurrente
 DocType: Company,Default Income Account,Compte de Produits par Défaut
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Groupe de Clients / Client
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Bénéfice / Perte (Crédit) des Exercices Non Clos
 DocType: Sales Invoice,Time Sheets,Feuilles de Temps
-DocType: Lab Test Template,Change In Item,Changer d&#39;article
+DocType: Lab Test Template,Change In Item,Modification dans l'Article
 DocType: Payment Gateway Account,Default Payment Request Message,Message de Demande de Paiement par Défaut
 DocType: Item Group,Check this if you want to show in website,Cochez cette case si vous souhaitez afficher sur le site
 apps/erpnext/erpnext/config/accounts.py +142,Banking and Payments,Banque et Paiements
 ,Welcome to ERPNext,Bienvenue sur ERPNext
 apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Du Prospect au Devis
-DocType: Patient,A Negative,Un négatif
+DocType: Patient,A Negative,A Négatif
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Rien de plus à montrer.
 DocType: Lead,From Customer,Du Client
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Appels
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Appels
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Un Produit
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,Lots
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,Lots
 DocType: Project,Total Costing Amount (via Time Logs),Montant Total des Coûts (via Journaux de Temps)
-apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Faire un tarif
+apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Faire un Echéancier d'Honoraires
 DocType: Purchase Order Item Supplied,Stock UOM,UDM du Stock
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +230,Purchase Order {0} is not submitted,Le Bon de Commande {0} n’est pas soumis
-DocType: Vital Signs,Normal reference range for an adult is 16–20 breaths/minute (RCP 2012),La gamme de référence normale pour un adulte est de 16-20 respirations / minute (RCP 2012)
+DocType: Vital Signs,Normal reference range for an adult is 16–20 breaths/minute (RCP 2012),La plage de référence normale pour un adulte est de 16-20 respirations / minute (RCP 2012)
 DocType: Customs Tariff Number,Tariff Number,Tarif
 DocType: Production Order Item,Available Qty at WIP Warehouse,Qté disponible à l'Entrepôt de Travaux en Cours
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Projeté
@@ -3390,14 +3457,14 @@
 apps/erpnext/erpnext/schools/api.py +80,Attendance has been marked successfully.,La présence a été marquée avec succès.
 DocType: Program Enrollment,Public Transport,Transports Publics
 DocType: Journal Entry,Remark,Remarque
-DocType: Healthcare Settings,Avoid Confirmation,Évitez la confirmation
+DocType: Healthcare Settings,Avoid Confirmation,Éviter la Confirmation
 DocType: Purchase Receipt Item,Rate and Amount,Prix et Montant
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +165,Account Type for {0} must be {1},Le Type de Compte pour {0} doit être {1}
-DocType: Healthcare Settings,Default income accounts to be used if not set in Physician to book Consultation charges.,Comptes de revenus par défaut à utiliser si non définis dans le médecin pour réserver les frais de consultation.
+DocType: Healthcare Settings,Default income accounts to be used if not set in Physician to book Consultation charges.,Comptes de Revenu par défaut à utiliser si non définis dans la fiche du Médecin pour enregistrer les honoraires liés à la consultation.
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Congés et Vacances
 DocType: School Settings,Current Academic Term,Terme Académique Actuel
 DocType: Sales Order,Not Billed,Non Facturé
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Les deux Entrepôt doivent appartenir à la même Société
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Les deux Entrepôt doivent appartenir à la même Société
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Aucun contact ajouté.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Montant de la Référence de Coût au Débarquement
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Factures émises par des Fournisseurs.
@@ -3406,7 +3473,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Remise
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retour contre Facture d’Achat
 DocType: Item,Warranty Period (in days),Période de Garantie (en jours)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',mettre à jour `tabPatient Appointment &#39;set sales_invoice =&#39; {0} &#39;où name =&#39; {1} &#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Relation avec Tuteur1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Trésorerie Nette des Opérations
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Article 4
@@ -3415,8 +3481,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Compte d’Écriture de Journal
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Groupe Étudiant
 DocType: Shopping Cart Settings,Quotation Series,Séries de Devis
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Un article existe avec le même nom ({0}), veuillez changer le nom du groupe d'article ou renommer l'article"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Veuillez sélectionner un client
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Un article existe avec le même nom ({0}), veuillez changer le nom du groupe d'article ou renommer l'article"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Veuillez sélectionner un client
 DocType: C-Form,I,I
 DocType: Company,Asset Depreciation Cost Center,Centre de Coûts de l'Amortissement d'Actifs
 DocType: Sales Order Item,Sales Order Date,Date de la Commande Client
@@ -3425,8 +3491,9 @@
 DocType: Assessment Plan,Assessment Plan,Plan d'Évaluation
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Le client {0} est créé.
 DocType: Stock Settings,Limit Percent,Pourcentage Limite
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,"Actuellement, aucun stock disponible dans aucun entrepôt"
 ,Payment Period Based On Invoice Date,Période de Paiement basée sur la Date de la Facture
-DocType: Sample Collection,No. of print,Nombre d&#39;impressions
+DocType: Sample Collection,No. of print,Nbre d'impressions
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Taux de Change Manquant pour {0}
 DocType: Assessment Plan,Examiner,Examinateur
 DocType: Patient Relation,Siblings,Frères et Sœurs
@@ -3464,7 +3531,7 @@
 DocType: Asset Movement,Source Warehouse,Entrepôt Source
 DocType: Installation Note,Installation Date,Date d'Installation
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not belong to company {2},Ligne #{0} : L’Actif {1} n’appartient pas à la société {2}
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Facture de vente {0} créée
+apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Facture de Vente {0} créée
 DocType: Employee,Confirmation Date,Date de Confirmation
 DocType: C-Form,Total Invoiced Amount,Montant Total Facturé
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +49,Min Qty can not be greater than Max Qty,Qté Min ne peut pas être supérieure à Qté Max
@@ -3480,13 +3547,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Salaire Brut - Déductions Totales - Remboursement de Prêt
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,La LDM actuelle et la nouvelle LDM ne peuvent être pareilles
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,ID Fiche de Paie
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,ID Fiche de Paie
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,La Date de Départ à la Retraite doit être supérieure à Date d'Embauche
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Il y a eu des erreurs lors de la planification de cours sur :
 DocType: Sales Invoice,Against Income Account,Pour le Compte de Produits
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Livré
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,L'article {0} : Qté commandée {1} ne peut pas être inférieure à la qté de commande minimum {2} (défini dans l'Article).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,L'article {0} : Qté commandée {1} ne peut pas être inférieure à la qté de commande minimum {2} (défini dans l'Article).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Pourcentage de Répartition Mensuelle
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Veuillez vous connecter en tant qu&#39;un autre utilisateur.
 DocType: Territory,Territory Targets,Objectifs Régionaux
 DocType: Delivery Note,Transporter Info,Infos Transporteur
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Veuillez définir {0} par défaut dans la Société {1}
@@ -3494,13 +3562,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Le même fournisseur a été saisi plusieurs fois
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Bénéfice/Perte Brut
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Article Fourni du Bon de Commande
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Nom de la Société ne peut pas être Company
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Nom de la Société ne peut pas être Company
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,En-Têtes pour les modèles d'impression.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titres pour les modèles d'impression e.g. Facture Proforma.
 DocType: Program Enrollment,Walking,En Marchant
 DocType: Student Guardian,Student Guardian,Tuteur d'Étudiant
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Frais de type valorisation ne peuvent pas être marqués comme inclus
 DocType: POS Profile,Update Stock,Mettre à Jour le Stock
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,dans l&#39;abonnement
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Différentes UDM pour les articles conduira à un Poids Net (Total) incorrect . Assurez-vous que le Poids Net de chaque article a la même unité de mesure .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Taux LDM
 DocType: Asset,Journal Entry for Scrap,Écriture de Journal pour la Mise au Rebut
@@ -3548,15 +3617,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","L'ID (de connexion) de l'Utilisateur Système. S'il est défini, il deviendra la valeur par défaut pour tous les formulaires des RH."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: De {1}
 DocType: Task,depends_on,Dépend de
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Mise à jour des prix les plus récents dans toutes les Listes de Matériaux en file d'attente. Cela peut prendre quelques minutes.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Mise à jour des prix les plus récents dans toutes les Listes de Matériaux en file d'attente. Cela peut prendre quelques minutes.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nom du Nouveau Compte. Note: Veuillez ne pas créer de comptes Clients et Fournisseurs
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Modèles d'Adresse par défaut en fonction du pays
 DocType: Sales Order Item,Supplier delivers to Customer,Fournisseur livre au Client
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (#Formulaire/Article/{0}) est en rupture de stock
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Date d’échéance / de référence ne peut pas être après le {0}
+,Sales Payment Summary,Résumé du paiement des ventes
+DocType: Restaurant,Restaurant,Restaurant
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Date d’échéance / de référence ne peut pas être après le {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importer et Exporter des Données
 DocType: Patient,Account Details,Détails du compte
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Aucun étudiant Trouvé
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Aucun étudiant Trouvé
 DocType: Medical Department,Medical Department,Département médical
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Critères de Notation de la Fiche d'Évaluation Fournisseur
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Date d’Envois de la Facture
@@ -3567,7 +3638,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Veuillez sélectionner la Date de Comptabilisation avant de sélectionner la Partie
 DocType: Program Enrollment,School House,Maison de l'École
 DocType: Serial No,Out of AMC,Sur AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Veuillez sélectionner des Devis
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Veuillez sélectionner des Devis
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Nombre d’Amortissements Comptabilisés ne peut pas être supérieur à Nombre Total d'Amortissements
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Effectuer une Visite d'Entretien
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,Veuillez contactez l'utilisateur qui a le rôle de Directeur des Ventes {0}
@@ -3575,7 +3646,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Données de base de la Société (ni les Clients ni les Fournisseurs)
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Basé sur la présence de cet Étudiant
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Aucun étudiant dans
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Ajouter plus d'articles ou ouvrir le formulaire complet
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Ajouter plus d'articles ou ouvrir le formulaire complet
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Bons de Livraison {0} doivent être annulés avant d’annuler cette Commande Client
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Aller aux Utilisateurs
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Le Montant Payé + Montant Repris ne peut pas être supérieur au Total Général
@@ -3595,37 +3666,40 @@
 DocType: Fee Schedule,Fee Schedule,Barème d'Honoraires
 DocType: Hub Settings,Publish Availability,Publier la Disponibilité
 DocType: Company,Create Chart Of Accounts Based On,Créer un Plan Comptable Basé Sur
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Impossible de le convertir en non-groupe. Les tâches enfants existent.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Date de Naissance ne peut être après la Date du Jour.
 ,Stock Ageing,Viellissement du Stock
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Étudiant {0} existe pour la candidature d'un étudiant {1}
-DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Ajustement d&#39;arrondissement (devise de l&#39;entreprise)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Feuille de Temps
+DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Ajustement de l'arrondi (Devise Société)
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Feuille de Temps
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' est désactivé(e)
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Définir comme Ouvert
 DocType: Cheque Print Template,Scanned Cheque,Chèque Numérisé
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Envoyer des emails automatiques aux Contacts sur les Transactions soumises.
 DocType: Timesheet,Total Billable Amount,Montant Total Facturable
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Article 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,La saisie des commandes
 DocType: Purchase Order,Customer Contact Email,Email Contact Client
 DocType: Warranty Claim,Item and Warranty Details,Détails de l'Article et de la Garantie
 DocType: Sales Team,Contribution (%),Contribution (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Remarque : Écriture de Paiement ne sera pas créée car le compte 'Compte Bancaire ou de Caisse' n'a pas été spécifié
-DocType: Medical Department,Nursing User,Utilisateur infirmier
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Le projet {0} existe déjà
+DocType: Medical Department,Nursing User,Utilisateur Infirmier
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Responsabilités
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,La période de validité de ce devis a pris fin.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,La période de validité de ce devis a pris fin.
 DocType: Expense Claim Account,Expense Claim Account,Compte de Note de Frais
-DocType: Accounts Settings,Allow Stale Exchange Rates,Autoriser les taux de change existants
+DocType: Accounts Settings,Allow Stale Exchange Rates,Autoriser les Taux de Change Existants
 DocType: Sales Person,Sales Person Name,Nom du Vendeur
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Veuillez entrer au moins 1 facture dans le tableau
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Ajouter des Utilisateurs
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Ajouter des Utilisateurs
 DocType: POS Item Group,Item Group,Groupe d'Article
 DocType: Item,Safety Stock,Stock de Sécurité
-DocType: Healthcare Settings,Healthcare Settings,Paramètres de santé
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,% de Progression pour une tâche ne peut pas être supérieur à 100.
+DocType: Healthcare Settings,Healthcare Settings,Paramètres de Santé
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,% de Progression pour une tâche ne peut pas être supérieur à 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Avant la réconciliation
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},À {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Taxes et Frais Additionnels (Devise Société)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,La Ligne de Taxe d'Article {0} doit indiquer un compte de type Taxes ou Produit ou Charge ou Facturable
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,La Ligne de Taxe d'Article {0} doit indiquer un compte de type Taxes ou Produit ou Charge ou Facturable
 DocType: Sales Order,Partly Billed,Partiellement Facturé
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,L'article {0} doit être une Immobilisation
 DocType: Item,Default BOM,LDM par Défaut
@@ -3641,6 +3715,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,Variable
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Du Bon de Livraison
 DocType: Student,Student Email Address,Adresse Email de l'Étudiant
+DocType: Item,Hub Warehouse,Hub Warehouse
 DocType: Physician Schedule Time Slot,From Time,Horaire de Début
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,En Stock :
 DocType: Notification Control,Custom Message,Message Personnalisé
@@ -3648,9 +3723,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,Espèces ou Compte Bancaire est obligatoire pour réaliser une écriture de paiement
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Adresse de l'Élève
 DocType: Purchase Invoice,Price List Exchange Rate,Taux de Change de la Liste de Prix
+DocType: POS Profile,POS Profile Name,Nom du profil POS
 DocType: Purchase Invoice Item,Rate,Taux
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Interne
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Nom de l'Adresse
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Nom de l'Adresse
 DocType: Stock Entry,From BOM,De LDM
 DocType: Assessment Code,Assessment Code,Code de l'Évaluation
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,de Base
@@ -3664,11 +3740,12 @@
 DocType: Salary Slip,Salary Structure,Grille des Salaires
 DocType: Account,Bank,Banque
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Compagnie Aérienne
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Problème Matériel
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Problème Matériel
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Une erreur s&#39;est produite lors de la création récurrente
 DocType: Material Request Item,For Warehouse,Pour l’Entrepôt
 DocType: Employee,Offer Date,Date de la Proposition
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Devis
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Vous êtes en mode hors connexion. Vous ne serez pas en mesure de recharger jusqu'à ce que vous ayez du réseau.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Vous êtes en mode hors connexion. Vous ne serez pas en mesure de recharger jusqu'à ce que vous ayez du réseau.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Aucun Groupe d'Étudiants créé.
 DocType: Purchase Invoice Item,Serial No,N° de Série
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Montant du Remboursement Mensuel ne peut pas être supérieur au Montant du Prêt
@@ -3678,33 +3755,35 @@
 DocType: Salary Slip,Total Working Hours,Total des Heures Travaillées
 DocType: Subscription,Next Schedule Date,Prochaine Date Programmée
 DocType: Stock Entry,Including items for sub assemblies,Incluant les articles pour des sous-ensembles
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,La valeur entrée doit être positive
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Tous les Territoires
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,La valeur entrée doit être positive
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Tous les Territoires
 DocType: Purchase Invoice,Items,Articles
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,L'étudiant est déjà inscrit.
 DocType: Fiscal Year,Year Name,Nom de l'Année
 DocType: Process Payroll,Process Payroll,Processus de Paie
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Il y a plus de vacances que de jours travaillés ce mois-ci.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Il y a plus de vacances que de jours travaillés ce mois-ci.
 DocType: Product Bundle Item,Product Bundle Item,Article d'un Ensemble de Produits
 DocType: Sales Partner,Sales Partner Name,Nom du Partenaire de Vente
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Appel d’Offres
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Appel d’Offres
 DocType: Payment Reconciliation,Maximum Invoice Amount,Montant Maximal de la Facture
-DocType: Normal Test Items,Normal Test Items,Éléments de test normaux
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hématologie
+DocType: Normal Test Items,Normal Test Items,Articles de Test Normal
 DocType: Student Language,Student Language,Langue des Étudiants
 apps/erpnext/erpnext/config/selling.py +23,Customers,Clients
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +24,Order/Quot %,Commande / Devis %
-apps/erpnext/erpnext/config/healthcare.py +25,Record Patient Vitals,Indicateur Patients Vitals
+apps/erpnext/erpnext/config/healthcare.py +25,Record Patient Vitals,Enregistrer les Signes Vitaux du Patient
 DocType: Fee Schedule,Institution,Institution
 DocType: Asset,Partially Depreciated,Partiellement Déprécié
 DocType: Issue,Opening Time,Horaire d'Ouverture
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Les date Du et Au sont requises
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Bourses de Valeurs Mobilières et de Marchandises
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',L’Unité de mesure par défaut pour la variante '{0}' doit être la même que dans le Modèle '{1}'
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',L’Unité de mesure par défaut pour la variante '{0}' doit être la même que dans le Modèle '{1}'
 DocType: Shipping Rule,Calculate Based On,Calculer en fonction de
 DocType: Delivery Note Item,From Warehouse,De l'Entrepôt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Aucun Article avec une Liste de Matériel à Fabriquer
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Aucun Article avec une Liste de Matériel à Fabriquer
+DocType: Restaurant,Default Customer,Client par défaut
 DocType: Assessment Plan,Supervisor Name,Nom du Superviseur
-DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Ne confirmez pas si un rendez-vous est créé pour le même jour
+DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Ne confirmez pas si le rendez-vous est créé pour le même jour
 DocType: Program Enrollment Course,Program Enrollment Course,Cours d'Inscription au Programme
 DocType: Purchase Taxes and Charges,Valuation and Total,Valorisation et Total
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +11,Scorecards,Fiches d'Évaluation
@@ -3713,7 +3792,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Flux de Trésorerie provenant des Opérations
 DocType: Sales Invoice,Shipping Rule,Règle de Livraison
 DocType: Patient Relation,Spouse,Époux
-DocType: Lab Test Groups,Add Test,Ajouter un test
+DocType: Lab Test Groups,Add Test,Ajouter un Test
 DocType: Manufacturer,Limited to 12 characters,Limité à 12 caractères
 DocType: Journal Entry,Print Heading,Imprimer Titre
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Total ne peut pas être zéro
@@ -3729,7 +3808,7 @@
 DocType: Payment Entry,Internal Transfer,Transfert Interne
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Un compte enfant existe pour ce compte. Vous ne pouvez pas supprimer ce compte.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Soit la qté cible soit le montant cible est obligatoire
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Aucune LDM par défaut n’existe pour l'article {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Aucune LDM par défaut n’existe pour l'article {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Veuillez d’abord sélectionner la Date de Comptabilisation
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Date d'Ouverture devrait être antérieure à la Date de Clôture
 DocType: Leave Control Panel,Carry Forward,Reporter
@@ -3748,9 +3827,9 @@
 DocType: Journal Entry,Bank Entry,Écriture Bancaire
 DocType: Authorization Rule,Applicable To (Designation),Applicable À (Désignation)
 ,Profitability Analysis,Analyse de Profitabilité
-DocType: Fees,Student Email,Email de l&#39;élève
+DocType: Fees,Student Email,Email de l'Étudiant
 DocType: Supplier,Prevent POs,Interdire les Bons de Commande d'Achat
-DocType: Patient,"Allergies, Medical and Surgical History","Allergies, histoire médicale et chirurgicale"
+DocType: Patient,"Allergies, Medical and Surgical History","Allergies, antécédents médicaux et chirurgicaux"
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Ajouter au Panier
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grouper Par
 DocType: Guardian,Interests,Intérêts
@@ -3764,6 +3843,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Total des Présents
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,États Financiers
 DocType: Drug Prescription,Hour,Heure
+DocType: Restaurant Order Entry,Last Sales Invoice,Dernière facture de vente
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Les Nouveaux N° de Série ne peuvent avoir d'entrepot. L'Entrepôt doit être établi par Écriture de Stock ou Reçus d'Achat
 DocType: Lead,Lead Type,Type de Prospect
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Vous n'êtes pas autorisé à approuver les congés sur les Dates Bloquées
@@ -3794,68 +3874,70 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py +84,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.","{0} indique que {1} ne fournira pas de devis, mais tous les articles \ ont été évalués. Mise à jour du statut de devis RFQ."
 DocType: Manufacturing Settings,Update BOM Cost Automatically,Mettre à jour automatiquement le coût de la LDM
-DocType: Lab Test,Test Name,Nom du test
+DocType: Lab Test,Test Name,Nom du Test
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Créer des Utilisateurs
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,Gramme
 DocType: Supplier Scorecard,Per Month,Par Mois
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Quantité à Fabriquer doit être supérieur à 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Quantité à Fabriquer doit être supérieur à 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Rapport de visite pour appel de maintenance
 DocType: Stock Entry,Update Rate and Availability,Mettre à Jour le Prix et la Disponibilité
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Pourcentage que vous êtes autorisé à recevoir ou à livrer en plus de la quantité commandée. Par exemple : Si vous avez commandé 100 unités et que votre allocation est de 10% alors que vous êtes autorisé à recevoir 110 unités.
 DocType: POS Customer Group,Customer Group,Groupe de Clients
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Nouveau Numéro de Lot (Optionnel)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Nouveau Numéro de Lot (Optionnel)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Compte de charge est obligatoire pour l'article {0}
 DocType: BOM,Website Description,Description du Site Web
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Variation Nette de Capitaux Propres
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Date
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Veuillez d’abord annuler la Facture d'Achat {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adresse Email doit être unique, existe déjà pour {0}"
 DocType: Serial No,AMC Expiry Date,Date d'Expiration CMA
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,Reçu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,Reçu
 ,Sales Register,Registre des Ventes
 DocType: Daily Work Summary Settings Company,Send Emails At,Envoyer Emails À
 DocType: Quotation,Quotation Lost Reason,Raison de la Perte du Devis
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Sélectionner votre Nom de Domaine
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',sélectionnez * depuis tabPatient où name = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Référence de la transaction n° {0} datée du {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Référence de la transaction n° {0} datée du {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Il n'y a rien à modifier.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Vue de Formulaire
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Résumé du mois et des activités en suspens
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Vue de Formulaire
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Résumé du mois et des activités en suspens
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Ajoutez des utilisateurs, autres que vous-même, à votre organisation."
 DocType: Customer Group,Customer Group Name,Nom du Groupe Client
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Pas encore de Clients!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Pas encore de Clients!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,États des Flux de Trésorerie
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Le Montant du prêt ne peut pas dépasser le Montant Maximal du Prêt de {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licence
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Veuillez retirez cette Facture {0} du C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Veuillez retirez cette Facture {0} du C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Veuillez sélectionnez Report si vous souhaitez également inclure le solde des congés de l'exercice précédent à cet exercice
 DocType: GL Entry,Against Voucher Type,Pour le Type de Bon
 DocType: Physician,Phone (R),Téléphone (R)
-apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,On a ajouté des créneaux horaires
+apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Créneaux Horaires Ajoutés
 DocType: Item,Attributes,Attributs
-apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Activer le modèle
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Veuillez définir Naming Series pour {0} via Setup&gt; Paramètres&gt; Naming Series
+apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Activer le Modèle
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Veuillez entrer un Compte de Reprise
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Date de la Dernière Commande
-DocType: Patient,B Negative,B négatif
+DocType: Patient,B Negative,B Négatif
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Le compte {0} n'appartient pas à la société {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Les Numéros de Série dans la ligne {0} ne correspondent pas au Bon de Livraison
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Les Numéros de Série dans la ligne {0} ne correspondent pas au Bon de Livraison
 DocType: Student,Guardian Details,Détails du Tuteur
 DocType: C-Form,C-Form,Formulaire-C
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Valider la Présence de plusieurs employés
 DocType: Vehicle,Chassis No,N ° de Châssis
 DocType: Payment Request,Initiated,Initié
 DocType: Production Order,Planned Start Date,Date de Début Prévue
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Veuillez sélectionner une nomenclature
 DocType: Serial No,Creation Document Type,Type de Document de Création
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,La date de fin doit être supérieure à la date de début
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,La date de fin doit être supérieure à la date de début
 DocType: Leave Type,Is Encash,Est Encaissement
 DocType: Leave Allocation,New Leaves Allocated,Nouvelle Allocation de Congés
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Les données par projet ne sont pas disponibles pour un devis
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Fin sur
 DocType: Project,Expected End Date,Date de Fin Prévue
 DocType: Budget Account,Budget Amount,Montant Budgétaire
 DocType: Appraisal Template,Appraisal Template Title,Titre du modèle d'évaluation
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},La Date {0} pour l’Employé {1} ne peut pas être avant la Date d’embauche {2} de l’employé
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Commercial
-DocType: Patient,Alcohol Current Use,Utilisation actuelle de l&#39;alcool
+DocType: Patient,Alcohol Current Use,Consommation Actuelle d'Alcool
+DocType: Student Admission Program,Student Admission Program,Programme d&#39;admission des étudiants
 DocType: Payment Entry,Account Paid To,Compte Payé Au
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,L'Article Parent {0} ne doit pas être un Élément de Stock
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Tous les Produits ou Services.
@@ -3864,30 +3946,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} le Budget du Compte {1} pour {2} {3} est de {4}. Il dépassera de {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Ligne {0} # Le compte doit être de type ‘Actif Immobilisé'
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Qté Sortante
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Règles de calcul du montant des frais de port pour une vente
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,et désactivé dans le
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Série est obligatoire
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Services Financiers
 DocType: Student Sibling,Student ID,Carte d'Étudiant
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Types d'activités pour Journaux de Temps
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Email du fournisseur
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Types d'activités pour Journaux de Temps
 DocType: Tax Rule,Sales,Ventes
 DocType: Stock Entry Detail,Basic Amount,Montant de Base
 DocType: Training Event,Exam,Examen
 DocType: Complaint,Complaint,Plainte
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},L’entrepôt est obligatoire pour l'article du stock {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},L’entrepôt est obligatoire pour l'article du stock {0}
 DocType: Leave Allocation,Unused leaves,Congés non utilisés
-DocType: Patient,Alcohol Past Use,Alcool Utilisation passée
+DocType: Patient,Alcohol Past Use,Consommation Passée d'Alcool
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,État de la Facturation
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transférer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Récupérer la LDM éclatée (y compris les sous-ensembles)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Transférer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Récupérer la LDM éclatée (y compris les sous-ensembles)
 DocType: Authorization Rule,Applicable To (Employee),Applicable À (Employé)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,La Date d’Échéance est obligatoire
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,La Date d’Échéance est obligatoire
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Incrément pour l'Attribut {0} ne peut pas être 0
 DocType: Journal Entry,Pay To / Recd From,Payé À / Reçu De
 DocType: Naming Series,Setup Series,Configuration des Séries
 DocType: Payment Reconciliation,To Invoice Date,Date de Facture Finale
 DocType: Supplier,Contact HTML,HTML du Contact
 ,Inactive Customers,Clients Inactifs
+DocType: Student Admission Program,Maximum Age,Âge maximum
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Reçus d'Achats
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Comment la Règle de Prix doit-elle être appliquée ?
@@ -3906,6 +3990,7 @@
 DocType: GL Entry,Remarks,Remarques
 DocType: Payment Entry,Account Paid From,Compte Payé Du
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Code d’Article de Matière Première
+DocType: Task,Parent Task,Tâche parent
 DocType: Journal Entry,Write Off Based On,Reprise Basée Sur
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Faire un Prospect
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Impression et Papeterie
@@ -3914,19 +3999,19 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salaire déjà traité pour la période entre {0} et {1}, La période de demande de congé ne peut pas être entre cette plage de dates."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,N° de Série pour un dossier d'installation
 DocType: Guardian Interest,Guardian Interest,Part du Tuteur
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Configurer les valeurs par défaut pour les factures de point de vente
 apps/erpnext/erpnext/config/hr.py +177,Training,Formation
 DocType: Timesheet,Employee Detail,Détail Employé
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ID Email du Tuteur1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,Le jour de la Date Suivante et le Jour de Répétition du Mois doivent être égal
-DocType: Lab Prescription,Test Code,Code de test
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Le jour de la Date Suivante et le Jour de Répétition du Mois doivent être égal
+DocType: Lab Prescription,Test Code,Code de Test
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Réglages pour la page d'accueil du site
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},Les Appels d'Offres ne sont pas autorisés pour {0} en raison d'une note de {1} sur la fiche d'évaluation
 DocType: Offer Letter,Awaiting Response,Attente de Réponse
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Au-dessus
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Montant Total {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Attribut invalide {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Montant Total {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Attribut invalide {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Veuillez mentionner s'il s'agit d'un compte créditeur non standard
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Le même article a été entré plusieurs fois. {list}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Sélectionnez un groupe d'évaluation autre que «Tous les Groupes d'Évaluation»
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Ligne {0}: le Centre de Coûts est requis pour un article {1}
 DocType: Training Event Employee,Optional,Optionnel
@@ -3949,19 +4034,20 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centre de Coûts est obligatoire pour l’Article {2}
 DocType: Vehicle,Policy No,Politique N°
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Obtenir les Articles du Produit Groupé
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Comme le stock existe sur un élément {0}, vous ne pouvez pas activer la propriété variants."
 DocType: Asset,Straight Line,Ligne Droite
 DocType: Project User,Project User,Utilisateur du Projet
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Fractionner
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Fractionner
 DocType: GL Entry,Is Advance,Est Accompte
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,La Date de Présence Depuis et la Date de Présence Jusqu'à sont obligatoires
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,Veuillez entrer Oui ou Non pour 'Est sous-traitée'
+DocType: Item,Default Purchase Unit of Measure,Unité de mesure d&#39;achat par défaut
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Date de la Dernière Communication
 DocType: Sales Team,Contact No.,N° du Contact
 DocType: Bank Reconciliation,Payment Entries,Écritures de Paiement
 DocType: Production Order,Scrap Warehouse,Entrepôt de Rebut
 DocType: Production Order,Check if material transfer entry is not required,Vérifiez si une un transfert de matériel n'est pas requis
 DocType: Program Enrollment Tool,Get Students From,Obtenir les Étudiants De
-DocType: Hub Settings,Seller Country,Pays du Vendeur
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publier les Articles sur le Site Web
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Regrouper vos étudiants en lots
 DocType: Authorization Rule,Authorization Rule,Règle d'Autorisation
@@ -3971,7 +4057,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Modèle de Taxes et Frais de Vente
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Total (Crédit)
 DocType: Repayment Schedule,Payment Date,Date de Paiement
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nouvelle Qté de Lot
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Nouvelle Qté de Lot
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Vêtements & Accessoires
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,Impossible de résoudre la fonction de score pondéré. Assurez-vous que la formule est valide.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Nombre de Commandes
@@ -3989,6 +4075,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ligne #{0} : L’Actif {1} ne peut pas être soumis, il est déjà {2}"
 DocType: Tax Rule,Billing Country,Pays de Facturation
 DocType: Purchase Order Item,Expected Delivery Date,Date de Livraison Prévue
+DocType: Restaurant Order Entry,Restaurant Order Entry,Entrée de commande de restaurant
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Débit et Crédit non égaux pour {0} # {1}. La différence est de {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Frais de Représentation
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Faire une Demande de Matériel
@@ -4001,9 +4088,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Un compte contenant une transaction ne peut pas être supprimé
 DocType: Vehicle,Last Carbon Check,Dernière Vérification Carbone
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Frais Juridiques
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Veuillez sélectionner la quantité sur la ligne
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Veuillez sélectionner la quantité sur la ligne
 DocType: Purchase Invoice,Posting Time,Heure de Publication
 DocType: Timesheet,% Amount Billed,% Montant Facturé
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Le temps par rendez-vous&quot; n&#39;a pas été défini pour le Dr {0}. Ajoutez-le dans le maître du médecin.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Frais Téléphoniques
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Cochez cette case si vous voulez forcer l'utilisateur à sélectionner une série avant de l'enregistrer. Il n'y aura pas de série par défaut si vous cochez cette case.
@@ -4014,6 +4102,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nouveaux Revenus de Clientèle
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Frais de Déplacement
 DocType: Maintenance Visit,Breakdown,Panne
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Ajouter un abonnement au champ personnalisé dans le doctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Compte : {0} avec la devise : {1} ne peut pas être sélectionné
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Mettre à jour le coût de la LDM automatiquement via le Planificateur, en fonction du dernier taux de valorisation / tarif de la liste de prix / dernier prix d'achat des matières premières."
 DocType: Bank Reconciliation Detail,Cheque Date,Date du Chèque
@@ -4023,7 +4112,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Comme à la date
 DocType: Appraisal,HR,RH
 DocType: Program Enrollment,Enrollment Date,Date de l'Inscription
-DocType: Healthcare Settings,Out Patient SMS Alerts,Alertes SMS pour patients
+DocType: Healthcare Settings,Out Patient SMS Alerts,Alertes SMS pour Patients
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Probation,Essai
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Composantes Salariales
 DocType: Program Enrollment Tool,New Academic Year,Nouvelle Année Académique
@@ -4038,7 +4127,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Montant Total de Facturation (via Journaux de Temps)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,ID du Fournisseur
 DocType: Payment Request,Payment Gateway Details,Détails de la Passerelle de Paiement
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Quantité doit être supérieure à 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Quantité doit être supérieure à 0
 DocType: Journal Entry,Cash Entry,Écriture de Caisse
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Les noeuds enfants peuvent être créés uniquement dans les nœuds de type &#39;Groupe&#39;
 DocType: Leave Application,Half Day Date,Date de Demi-Journée
@@ -4056,12 +4145,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Remarque : Article {0} saisi plusieurs fois
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Tous les Contacts.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Abréviation de la Société
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Utilisateur {0} n'existe pas
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Utilisateur {0} n'existe pas
 DocType: Subscription,SUB-,SOUS-
 DocType: Item Attribute Value,Abbreviation,Abréviation
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,L’Écriture de Paiement existe déjà
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Non autorisé car {0} dépasse les limites
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Base du modèle de salaire.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Pathologie
+DocType: Restaurant Order Entry,Restaurant Table,Table de restaurant
 DocType: Leave Type,Max Days Leave Allowed,Nombre Max de Jours de Congé Autorisé
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Définir la Règle d'Impôt pour le panier
 DocType: Purchase Invoice,Taxes and Charges Added,Taxes et Frais Additionnels
@@ -4073,14 +4164,14 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Devis de Prospects ou Clients.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rôle Autorisé à modifier un stock gelé
 ,Territory Target Variance Item Group-Wise,Variance de l’Objectif par Région et par Groupe d’Article
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Tous les Groupes Client
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Tous les Groupes Client
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Cumul Mensuel
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} est obligatoire. Peut-être qu’un enregistrement de Taux de Change n'est pas créé pour {1} et {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Un Modèle de Taxe est obligatoire.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Un Modèle de Taxe est obligatoire.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Compte {0}: Le Compte parent {1} n'existe pas
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Taux de la Liste de Prix (Devise Société)
 DocType: Products Settings,Products Settings,Réglages des Produits
-DocType: Lab Prescription,Test Created,Test créé
+DocType: Lab Prescription,Test Created,Test Créé
 DocType: Healthcare Settings,Custom Signature in Print,Signature personnalisée dans l&#39;impression
 DocType: Account,Temporary,Temporaire
 DocType: Program,Courses,Cours
@@ -4092,7 +4183,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1213,Please set Company,Veuillez sélectionner une Société
 DocType: Pricing Rule,Buying,Achat
 DocType: HR Settings,Employee Records to be created by,Dossiers de l'Employés ont été créées par
-DocType: Patient,AB Negative,AB négatif
+DocType: Patient,AB Negative,AB Négatif
 DocType: Sample Collection,SMPL-,SMPL-
 DocType: POS Profile,Apply Discount On,Appliquer Réduction Sur
 ,Reqd By Date,Requis par Date
@@ -4102,16 +4193,16 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Détail des Taxes par Article
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Abréviation de l'Institut
 ,Item-wise Price List Rate,Taux de la Liste des Prix par Article
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Devis Fournisseur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Devis Fournisseur
 DocType: Quotation,In Words will be visible once you save the Quotation.,En Toutes Lettres. Sera visible une fois que vous enregistrerez le Devis.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},La quantité ({0}) ne peut pas être une fraction dans la ligne {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Le Code Barre {0} est déjà utilisé dans l'article {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Le Code Barre {0} est déjà utilisé dans l'article {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Règles pour l'ajout de frais de port.
 DocType: Item,Opening Stock,Stock d'Ouverture
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Client est requis
-DocType: Lab Test,Result Date,Date de résultat
+DocType: Lab Test,Result Date,Date de Résultat
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} est obligatoire pour un Retour
 DocType: Purchase Order,To Receive,À Recevoir
 apps/erpnext/erpnext/utilities/user_progress.py +231,user@example.com,utilisateur@exemple.com
@@ -4125,10 +4216,9 @@
 DocType: Customer,From Lead,Du Prospect
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Commandes validées pour la production.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Sélectionner Exercice ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,Profil PDV nécessaire pour faire une écriture de PDV
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,Profil PDV nécessaire pour faire une écriture de PDV
 DocType: Program Enrollment Tool,Enroll Students,Inscrire des Étudiants
-DocType: Hub Settings,Name Token,Nom du Jeton
-DocType: Lab Test,Approved Date,Date approuvée
+DocType: Lab Test,Approved Date,Date Approuvée
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Vente Standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Au moins un entrepôt est obligatoire
 DocType: Serial No,Out of Warranty,Hors Garantie
@@ -4145,7 +4235,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Ressource Humaine
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Paiement de Réconciliation des Paiements
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Actifs d'Impôts
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},L'Ordre de Production a été {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},L'Ordre de Production a été {0}
 DocType: BOM Item,BOM No,N° LDM
 DocType: Instructor,INS/,INS/
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,L’Écriture de Journal {0} n'a pas le compte {1} ou est déjà réconciliée avec une autre pièce justificative
@@ -4165,7 +4255,7 @@
 DocType: Currency Exchange,To Currency,Devise Finale
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Autoriser les utilisateurs suivant à approuver les demandes de congés durant les jours bloqués.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Types de Notes de Frais.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Le prix de vente pour l'élément {0} est inférieur à son {1}. Le prix de vente devrait être au moins {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Le prix de vente pour l'élément {0} est inférieur à son {1}. Le prix de vente devrait être au moins {2}
 DocType: Item,Taxes,Taxes
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Payé et Non Livré
 DocType: Project,Default Cost Center,Centre de Coûts par Défaut
@@ -4179,15 +4269,15 @@
 DocType: Employee Loan,Fully Disbursed,Entièrement Remboursé
 DocType: Maintenance Visit,Customer Feedback,Retour d'Expérience Client
 DocType: Account,Expense,Frais
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Score ne peut pas être supérieure à Score maximum
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Score ne peut pas être supérieure à Score maximum
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Clients et Fournisseurs
 DocType: Item Attribute,From Range,Plage Initiale
 DocType: BOM,Set rate of sub-assembly item based on BOM,Définir le prix des articles de sous-assemblage en fonction de la LDM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Erreur de syntaxe dans la formule ou condition : {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Erreur de syntaxe dans la formule ou condition : {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Paramètres du Récapitulatif Quotidien de la Société
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,L'article {0} est ignoré puisqu'il n'est pas en stock
 DocType: Appraisal,APRSL,EVAL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Soumettre cet Ordre de Fabrication pour un traitement ultérieur.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Soumettre cet Ordre de Fabrication pour un traitement ultérieur.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Pour ne pas appliquer la Règle de Tarification dans une transaction particulière, toutes les Règles de Tarification applicables doivent être désactivées."
 DocType: Assessment Group,Parent Assessment Group,Groupe d’Évaluation Parent
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Emplois
@@ -4199,23 +4289,24 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Impossible de filtrer sur la base du N° de Coupon, si les lignes sont regroupées par Coupon"
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +891,Make Supplier Quotation,Créer un Devis Fournisseur
 DocType: Quality Inspection,Incoming,Entrant
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.py +47,Assessment Result record {0} already exists.,L&#39;évaluation du résultat {0} existe déjà.
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.py +47,Assessment Result record {0} already exists.,Le Résultat d'Évaluation {0} existe déjà.
 DocType: BOM,Materials Required (Exploded),Matériel Requis (Éclaté)
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Veuillez laisser le filtre de la Société vide si Group By est 'Société'
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,La Date de Publication ne peut pas être une date future
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Ligne # {0} : N° de série {1} ne correspond pas à {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,pour générer le récurrent
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Congé Occasionnel
-apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Test de laboratoire UOM.
+apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,UDM de test de laboratoire.
 DocType: Batch,Batch ID,ID du Lot
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Note : {0}
 ,Delivery Note Trends,Tendance des Bordereaux de Livraisons
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Résumé Hebdomadaire
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Résumé Hebdomadaire
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Qté En Stock
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Compte : {0} peut uniquement être mis à jour via les Mouvements de Stock
 DocType: Student Group Creation Tool,Get Courses,Obtenir les Cours
 DocType: GL Entry,Party,Partie
 DocType: Healthcare Settings,Patient Name,Nom du patient
-DocType: Variant Field,Variant Field,Champ de variante
+DocType: Variant Field,Variant Field,Champ de Variante
 DocType: Sales Order,Delivery Date,Date de Livraison
 DocType: Opportunity,Opportunity Date,Date d'Opportunité
 DocType: Purchase Receipt,Return Against Purchase Receipt,Retour contre Reçu d'Achat
@@ -4223,7 +4314,6 @@
 DocType: Purchase Order,To Bill,À Facturer
 DocType: Material Request,% Ordered,% Commandé
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Pour un groupe étudiant basé sur un cours, le cours sera validé pour chaque élève inscrit aux cours du programme."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Entrer les Adresses Email séparées par des virgules, la facture sera envoyée automatiquement à une date précise"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Travail à la Pièce
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Moy. Taux d'achat
 DocType: Task,Actual Time (in Hours),Temps Réel (en Heures)
@@ -4237,7 +4327,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,L'article {0} n'est pas configuré pour un Numéros de Série. La colonne doit être vide
 DocType: Accounts Settings,Accounts Settings,Paramètres des Comptes
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,Approuver
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Aucun résultat à soumettre
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Aucun résultat à soumettre
 DocType: Customer,Sales Partner and Commission,Partenaire Commercial et Commission
 DocType: Employee Loan,Rate of Interest (%) / Year,Taux d'Intérêt (%) / Année
 ,Project Quantity,Quantité de Projet
@@ -4249,55 +4339,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Noir
 DocType: BOM Explosion Item,BOM Explosion Item,Article Eclaté LDM
 DocType: Account,Auditor,Auditeur
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} articles produits
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} articles produits
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Apprendre Plus
 DocType: Cheque Print Template,Distance from top edge,Distance du bord supérieur
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Liste des Prix {0} est désactivée ou n'existe pas
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Liste des Prix {0} est désactivée ou n'existe pas
 DocType: Purchase Invoice,Return,Retour
 DocType: Production Order Operation,Production Order Operation,Opération d’Ordre de Production
 DocType: Pricing Rule,Disable,Désactiver
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Mode de paiement est requis pour effectuer un paiement
 DocType: Project Task,Pending Review,Revue en Attente
-apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Nominations et consultations
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} n'est pas inscrit dans le Lot {2}
+apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Rendez-Vous et Consultations
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} n'est pas inscrit dans le Lot {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","L'actif {0} ne peut pas être mis au rebut, car il est déjà {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Total des Notes de Frais (via Note de Frais)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Marquer Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Ligne {0} : La devise de la LDM #{1} doit être égale à la devise sélectionnée {2}
 DocType: Journal Entry Account,Exchange Rate,Taux de Change
 DocType: Patient,Additional information regarding the patient,Informations complémentaires concernant le patient
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Commande Client {0} n'a pas été transmise
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Commande Client {0} n'a pas été transmise
 DocType: Homepage,Tag Line,Ligne de Tag
 DocType: Fee Component,Fee Component,Composant d'Honoraires
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Gestion de Flotte
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Ajouter des articles de
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Gestion de Flotte
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Ajouter des articles de
 DocType: Cheque Print Template,Regular,Ordinaire
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Le total des pondérations de tous les Critères d'Évaluation doit être égal à 100%
-DocType: BOM,Last Purchase Rate,Dernier Prix d'Achat
+DocType: Purchase Order Item,Last Purchase Rate,Dernier Prix d'Achat
 DocType: Account,Asset,Actif
 DocType: Project Task,Task ID,Tâche ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock ne peut pas exister pour l'Article {0} puisqu'il a des variantes
 DocType: Lab Test,Mobile,Mobile
 ,Sales Person-wise Transaction Summary,Résumé des Transactions par Commerciaux
 DocType: Training Event,Contact Number,Numéro de Contact
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,L'entrepôt {0} n'existe pas
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,S'inscrire au Hub ERPNext
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,L'entrepôt {0} n'existe pas
 DocType: Monthly Distribution,Monthly Distribution Percentages,Pourcentages de Répartition Mensuelle
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,L’article sélectionné ne peut pas avoir de Lot
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Taux de valorisation non trouvé pour l’Article {0}, qui est nécessaire pour faire les écritures comptables pour {1} {2}. Si l’article est un l'échantillon dans {1}, veuillez le mentionner dans la table d’article de {1}. Dans le cas contraire, veuillez créer une écriture de stock pour l’article ou définir un taux de valorisation dans les données de base de l’article et essayez de soumettre / annuler cette écriture"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% de matériaux livrés pour ce Bon de Livraison
+DocType: Training Event,Has Certificate,A un certificat
 DocType: Project,Customer Details,Détails du client
 DocType: Employee,Reports to,Rapports À
 ,Unpaid Expense Claim,Note de Frais Impayée
 DocType: Payment Entry,Paid Amount,Montant Payé
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Explorez le Cycle de Vente
 DocType: Assessment Plan,Supervisor,Superviseur
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,En Ligne
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,En Ligne
 ,Available Stock for Packing Items,Stock Disponible pour les Articles d'Emballage
 DocType: Item Variant,Item Variant,Variante de l'Article
 DocType: Assessment Result Tool,Assessment Result Tool,Outil de Résultat d'Évaluation
 DocType: BOM Scrap Item,BOM Scrap Item,Article Mis au Rebut LDM
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Commandes Soumises ne peuvent pas être supprimés
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Commandes Soumises ne peuvent pas être supprimés
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Le solde du compte est déjà débiteur, vous n'êtes pas autorisé à définir 'Solde Doit Être' comme 'Créditeur'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Gestion de la Qualité
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,L'article {0} a été désactivé
@@ -4309,15 +4398,15 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Solde de la Qté
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,Les objectifs ne peuvent pas être vides
 DocType: Item Group,Parent Item Group,Groupe d’Articles Parent
-DocType: Appointment Type,Appointment Type,Type de rendez-vous
+DocType: Appointment Type,Appointment Type,Type de Rendez-Vous
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} pour {1}
-DocType: Healthcare Settings,Valid number of days,Nombre de jours valable
+DocType: Healthcare Settings,Valid number of days,Nombre de Jours Ouvrés
 apps/erpnext/erpnext/setup/doctype/company/company.js +35,Cost Centers,Centres de Coûts
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Taux auquel la devise du fournisseur est convertie en devise société de base
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Ligne #{0}: Minutage en conflit avec la ligne {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Autoriser un Taux de Valorisation Égal à Zéro
 DocType: Training Event Employee,Invited,Invité
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Plusieurs Grilles de Salaires Actives trouvées pour l'employé {0} pour les dates données
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Plusieurs Grilles de Salaires Actives trouvées pour l'employé {0} pour les dates données
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Configuration des Comptes passerelle.
 DocType: Employee,Employment Type,Type d'Emploi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Actifs Immobilisés
@@ -4329,16 +4418,16 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,ID Email de l'Étudiant
 DocType: Employee,Notice (days),Préavis (jours)
 DocType: Tax Rule,Sales Tax Template,Modèle de la Taxe de Vente
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Sélectionner les articles pour sauvegarder la facture
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Sélectionner les articles pour sauvegarder la facture
 DocType: Employee,Encashment Date,Date de l'Encaissement
 DocType: Training Event,Internet,Internet
-DocType: Special Test Template,Special Test Template,Modèle d&#39;essai spécial
+DocType: Special Test Template,Special Test Template,Modèle de Test Spécial
 DocType: Account,Stock Adjustment,Ajustement du Stock
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Un Coût d’Activité par défault existe pour le Type d’Activité {0}
 DocType: Production Order,Planned Operating Cost,Coûts de Fonctionnement Prévus
 DocType: Academic Term,Term Start Date,Date de Début du Terme
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Compte d'Opportunités
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Veuillez trouver ci-joint {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Veuillez trouver ci-joint {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Solde du Relevé Bancaire d’après le Grand Livre
 DocType: Job Applicant,Applicant Name,Nom du Candidat
 DocType: Authorization Rule,Customer / Item Name,Nom du Client / de l'Article
@@ -4359,7 +4448,7 @@
 DocType: Guardian,Guardian Of ,Tuteur De
 DocType: Grading Scale Interval,Threshold,Seuil
 DocType: BOM Update Tool,Current BOM,LDM Actuelle
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Ajouter un Numéro de série
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Ajouter un Numéro de série
 DocType: Production Order Item,Available Qty at Source Warehouse,Qté Disponible à l'Entrepôt Source
 apps/erpnext/erpnext/config/support.py +22,Warranty,Garantie
 DocType: Purchase Invoice,Debit Note Issued,Notes de Débit Émises
@@ -4372,7 +4461,7 @@
 DocType: School Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Pour un groupe étudiant basé sur un lot, le lot étudiant sera validé pour chaque élève inscrit au programme."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +51,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,L'entrepôt ne peut pas être supprimé car une écriture existe dans le Livre d'Inventaire pour cet entrepôt.
 DocType: Company,Distribution,Distribution
-DocType: Lab Test,Report Preference,Préférence de rapport
+DocType: Lab Test,Report Preference,Préférence de Rapport
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +129,Project Manager,Chef de Projet
 ,Quoted Item Comparison,Comparaison d'Article Soumis
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Chevauchement dans la notation entre {0} et {1}
@@ -4382,10 +4471,9 @@
 DocType: Account,Receivable,Créance
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ligne #{0} : Changement de Fournisseur non autorisé car un Bon de Commande existe déjà
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rôle qui est autorisé à soumettre des transactions qui dépassent les limites de crédit fixées.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Sélectionner les Articles à Fabriquer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Données de base en cours de synchronisation, cela peut prendre un certain temps"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Sélectionner les Articles à Fabriquer
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Données de base en cours de synchronisation, cela peut prendre un certain temps"
 DocType: Item,Material Issue,Sortie de Matériel
-DocType: Hub Settings,Seller Description,Description du Vendeur
 DocType: Employee Education,Qualification,Qualification
 DocType: Item Price,Item Price,Prix de l'Article
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Savons & Détergents
@@ -4393,7 +4481,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,L’Horaire Initial ne peut pas être postérieur à l’Horaire Final
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Cinéma & Vidéo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Commandé
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,CV
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,CV
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Si activé, le système ne mettra pas à jour les champs de variantes du modèle mais copiera les données des champs mentionnés ci-dessous tout en créant une nouvelle variante"
 DocType: Salary Detail,Component,Composant
 DocType: Assessment Criteria,Assessment Criteria Group,Groupe de Critère d'Évaluation
 DocType: Healthcare Settings,Patient Name By,Nom du patient par
@@ -4403,7 +4492,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Veuillez entrer un Rôle Approbateur ou un Rôle Utilisateur
 DocType: Journal Entry,Write Off Entry,Écriture de Reprise
 DocType: BOM,Rate Of Materials Based On,Prix des Matériaux Basé sur
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Fournisseur&gt; Type de fournisseur
+DocType: Item Variant Settings,Do not Update Variants,Ne pas mettre à jour les variantes
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analyse du Support
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Décocher tout
 DocType: POS Profile,Terms and Conditions,Termes et Conditions
@@ -4412,7 +4501,7 @@
 DocType: Leave Block List,Applies to Company,S'applique à la Société
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,Impossible d'annuler car l'Écriture de Stock soumise {0} existe
 DocType: Employee Loan,Disbursement Date,Date de Décaissement
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,«Destinataires» non spécifiés
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,«Destinataires» non spécifiés
 DocType: BOM Update Tool,Update latest price in all BOMs,Mettre à jour le prix le plus récent dans toutes les LDMs
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Dossier médical
 DocType: Vehicle,Vehicle,Véhicule
@@ -4427,14 +4516,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Prospect %
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Amortissements et Soldes d'Actif
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Montant {0} {1} transféré de {2} à {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Montant {0} {1} transféré de {2} à {3}
 DocType: Sales Invoice,Get Advances Received,Obtenir Acomptes Reçus
 DocType: Email Digest,Add/Remove Recipients,Ajouter/Supprimer des Destinataires
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Transaction non autorisée pour l'Ordre de Production arrêté {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Pour définir cet Exercice Fiscal par défaut, cliquez sur ""Définir par défaut"""
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Joindre
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Joindre
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Qté de Pénurie
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,La variante de l'article {0} existe avec les mêmes caractéristiques
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,La variante de l'article {0} existe avec les mêmes caractéristiques
 DocType: Employee Loan,Repay from Salary,Rembourser avec le Salaire
 DocType: Leave Application,LAP/,LAP/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Demande de Paiement pour {0} {1} pour le montant {2}
@@ -4447,9 +4536,9 @@
 DocType: Sales Invoice Item,Sales Order Item,Article de la Commande Client
 DocType: Salary Slip,Payment Days,Jours de Paiement
 DocType: Patient,Dormant,Dormant
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Les entrepôts avec nœuds enfants ne peuvent pas être convertis en livre
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Les entrepôts avec nœuds enfants ne peuvent pas être convertis en livre
 DocType: BOM,Manage cost of operations,Gérer les coûts d'exploitation
-DocType: Accounts Settings,Stale Days,Stale Days
+DocType: Accounts Settings,Stale Days,Journées Passées
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Lorsque certaines des transactions contrôlées sont ""Soumises"", une pop-up email s'ouvre automatiquement pour envoyer un email au ""Contact"" associé dans cette transaction, avec la transaction en pièce jointe. L'utilisateur peut ou peut ne pas envoyer l'email."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Paramètres Globaux
 DocType: Assessment Result Detail,Assessment Result Detail,Détails des Résultats d'Évaluation
@@ -4461,10 +4550,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,N° de Série {0} a déjà été reçu
 ,Requested Items To Be Transferred,Articles Demandés à Transférer
 DocType: Expense Claim,Vehicle Log,Journal du Véhicule
-DocType: Purchase Invoice,Recurring Id,Id Récurrent
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),Présence de fièvre (temp&gt; 38.5 ° C / 101.3 ° F ou température soutenue&gt; 38 ° C / 100.4 ° F)
 DocType: Customer,Sales Team Details,Détails de l'Équipe des Ventes
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Supprimer définitivement ?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Supprimer définitivement ?
 DocType: Expense Claim,Total Claimed Amount,Montant Total Réclamé
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Opportunités potentielles de vente.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Invalide {0}
@@ -4474,7 +4562,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Grands Magasins
 ,Item Delivery Date,Date de Livraison de l'Article
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Configurez votre École dans ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Configurez votre École dans ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Montant de Base à Rendre (Devise de la Société)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Pas d’écritures comptables pour les entrepôts suivants
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Enregistrez le document d'abord.
@@ -4486,18 +4574,17 @@
 DocType: Task,Is Milestone,Est un Jalon
 DocType: Daily Work Summary,Email Sent To,Email Envoyé À
 DocType: Budget,Warn,Avertir
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Êtes-vous sûr de vouloir vous désinscrire?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Toute autre remarque, effort remarquable qui devrait aller dans les dossiers."
 DocType: BOM,Manufacturing User,Chargé de Fabrication
 DocType: Purchase Invoice,Raw Materials Supplied,Matières Premières Fournies
-DocType: Purchase Invoice,Recurring Print Format,Format d'Impression Récurrent
 DocType: C-Form,Series,Séries
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},La devise de la liste de prix {0} doit être {1} ou {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Ajouter des Produits
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},La devise de la liste de prix {0} doit être {1} ou {2}
 DocType: Appraisal,Appraisal Template,Modèle d&#39;évaluation
 DocType: Item Group,Item Classification,Classification de l'Article
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Directeur Commercial
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Objectif de la Visite d'Entretien
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Facture Enregistrement du patient
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Enregistrement de la Facture du Patient
 DocType: Drug Prescription,Period,Période
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Grand Livre Général
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Employé {0} en Congé le {1}
@@ -4506,22 +4593,22 @@
 DocType: Item Attribute Value,Attribute Value,Valeur de l'Attribut
 ,Itemwise Recommended Reorder Level,Renouvellement Recommandé par Article
 DocType: Salary Detail,Salary Detail,Détails du Salaire
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Veuillez d’abord sélectionner {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Veuillez d’abord sélectionner {0}
 DocType: Appointment Type,Physician,Médecin
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Lot {0} de l'Article {1} a expiré.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Consultations
 DocType: Sales Invoice,Commission,Commission
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Feuille de Temps pour la Fabrication.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Sous-Total
-DocType: Physician,Charges,Des charges
+DocType: Physician,Charges,Charges
 DocType: Salary Detail,Default Amount,Montant par Défaut
 DocType: Lab Test Template,Descriptive,Descriptif
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,L'entrepôt n'a pas été trouvé dans le système
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Résumé Mensuel
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Résumé Mensuel
 DocType: Quality Inspection Reading,Quality Inspection Reading,Libellé du Contrôle de Qualité
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Geler les stocks datant de plus` doit être inférieur à %d jours.
 DocType: Tax Rule,Purchase Tax Template,Modèle de Taxes pour les Achats
-apps/erpnext/erpnext/utilities/user_progress.py +45,Set a sales goal you'd like to achieve for your company.,Définissez un objectif de vente que vous souhaitez atteindre pour votre entreprise.
+apps/erpnext/erpnext/utilities/user_progress.py +45,Set a sales goal you'd like to achieve for your company.,Définissez l'objectif de ventes que vous souhaitez atteindre pour votre entreprise.
 ,Project wise Stock Tracking,Suivi des Stocks par Projet
 DocType: GST HSN Code,Regional,Régional
 apps/erpnext/erpnext/config/healthcare.py +40,Laboratory,Laboratoire
@@ -4540,12 +4627,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Événements de Formation/Résultats
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Amortissement Cumulé depuis
 DocType: Sales Invoice,C-Form Applicable,Formulaire-C Applicable
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Temps de l'Opération doit être supérieur à 0 pour l'Opération {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Temps de l'Opération doit être supérieur à 0 pour l'Opération {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,L'entrepôt est obligatoire
 DocType: Supplier,Address and Contacts,Adresse et Contacts
 DocType: UOM Conversion Detail,UOM Conversion Detail,Détails de Conversion de l'UDM
 DocType: Program,Program Abbreviation,Abréviation du Programme
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Ordre de Production ne peut être créé avec un Modèle d’Article
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Ordre de Production ne peut être créé avec un Modèle d’Article
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Les frais sont mis à jour dans le Reçu d'Achat pour chaque article
 DocType: Warranty Claim,Resolved By,Résolu Par
 DocType: Bank Guarantee,Start Date,Date de Début
@@ -4571,26 +4658,27 @@
 DocType: Employee,Educational Qualification,Qualification pour l'Éducation
 DocType: Workstation,Operating Costs,Coûts d'Exploitation
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Action si le Budget Mensuel Cumulé est Dépassé
-DocType: Purchase Invoice,Submit on creation,Soumettre à la Création
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Devise pour {0} doit être {1}
+DocType: Subscription,Submit on creation,Soumettre à la Création
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Devise pour {0} doit être {1}
 DocType: Asset,Disposal Date,Date d’Élimination
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Les Emails seront envoyés à tous les Employés Actifs de la société à l'heure donnée, s'ils ne sont pas en vacances. Le résumé des réponses sera envoyé à minuit."
 DocType: Employee Leave Approver,Employee Leave Approver,Approbateur des Congés de l'Employé
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Ligne {0} : Une écriture de Réapprovisionnement existe déjà pour cet entrepôt {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Impossible de déclarer comme perdu, parce que le Devis a été fait."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Retour d'Expérience sur la Formation
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Ligne {0} : Une écriture de Réapprovisionnement existe déjà pour cet entrepôt {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Impossible de déclarer comme perdu, parce que le Devis a été fait."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Retour d'Expérience sur la Formation
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,L'Ordre de Production {0} doit être soumis
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Critères de Fiche d'Évaluation Fournisseur
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Veuillez sélectionner la Date de Début et Date de Fin pour l'Article {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Cours est obligatoire à la ligne {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,La date de fin ne peut être antérieure à la date de début
 DocType: Supplier Quotation Item,Prevdoc DocType,DocPréc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Ajouter / Modifier Prix
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Ajouter / Modifier Prix
 DocType: Batch,Parent Batch,Lot Parent
 DocType: Cheque Print Template,Cheque Print Template,Modèles d'Impression de Chèques
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Tableau des Centres de Coûts
-DocType: Lab Test Template,Sample Collection,Collecte d&#39;échantillons
+DocType: Lab Test Template,Sample Collection,Collecte d'Échantillons
 ,Requested Items To Be Ordered,Articles Demandés à Commander
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Mes Commandes
 DocType: Price List,Price List Name,Nom de la Liste de Prix
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Récapitulatif Quotidien de Travail pour {0}
 DocType: Employee Loan,Totals,Totaux
@@ -4609,12 +4697,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} unités de {1} nécessaires dans {2} sur {3} {4} pour {5} pour compléter cette transaction.
 DocType: Fee Schedule,Student Category,Catégorie Étudiant
 DocType: Announcement,Student,Étudiant
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Base d'unité d'organisation (département).
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Base d'unité d'organisation (département).
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Aller aux Salles
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Veuillez entrer le message avant d'envoyer
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,DUPLICATA POUR LE FOURNISSEUR
 DocType: Email Digest,Pending Quotations,Devis en Attente
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Profil de Point-De-Vente
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Profil de Point-De-Vente
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Configurations de test de laboratoire.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Prêts Non Garantis
 DocType: Cost Center,Cost Center Name,Nom du centre de coûts
@@ -4624,19 +4712,21 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Mnt Total Payé
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Message de plus de 160 caractères sera découpé en plusieurs messages
 DocType: Purchase Receipt Item,Received and Accepted,Reçus et Acceptés
+DocType: Hub Settings,Company and Seller Profile,Profil de l&#39;entreprise et du vendeur
 ,GST Itemised Sales Register,Registre de Vente Détaillé GST
 ,Serial No Service Contract Expiry,Expiration du Contrat de Service du N° de Série
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Vous ne pouvez pas créditer et débiter le même compte simultanément
-DocType: Vital Signs,Adults' pulse rate is anywhere between 50 and 80 beats per minute.,Le pouls des adultes est compris entre 50 et 80 battements par minute.
+DocType: Vital Signs,Adults' pulse rate is anywhere between 50 and 80 beats per minute.,Le pouls d'un adulte est compris entre 50 et 80 battements par minute.
 DocType: Naming Series,Help HTML,Aide HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Outil de Création de Groupe d'Étudiants
 DocType: Item,Variant Based On,Variante Basée Sur
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Le total des pondérations attribuées devrait être de 100 %. Il est {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Vos Fournisseurs
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Veuillez corriger le
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Impossible de définir comme perdu alors qu'un Bon de Commande a été créé.
 DocType: Request for Quotation Item,Supplier Part No,N° de Pièce du Fournisseur
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Vous ne pouvez pas déduire lorsqu'une catégorie est pour 'Évaluation' ou 'Évaluation et Total'
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Reçu De
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Reçu De
 DocType: Lead,Converted,Converti
 DocType: Item,Has Serial No,A un N° de Série
 DocType: Employee,Date of Issue,Date d'Émission
@@ -4644,7 +4734,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","D'après les Paramètres d'Achat, si Reçu d'Achat Requis == 'OUI', alors l'utilisateur doit d'abord créer un Reçu d'Achat pour l'article {0} pour pouvoir créer une Facture d'Achat"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Ligne #{0} : Définir Fournisseur pour l’article {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Ligne {0} : La valeur des heures doit être supérieure à zéro.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Image pour le Site Web {0} attachée à l'Article {1} ne peut pas être trouvée
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Image pour le Site Web {0} attachée à l'Article {1} ne peut pas être trouvée
 DocType: Issue,Content Type,Type de Contenu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Ordinateur
 DocType: Item,List this Item in multiple groups on the website.,Liste cet article dans plusieurs groupes sur le site.
@@ -4655,19 +4745,19 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Obtenir les Écritures non Réconcilliées
 DocType: Payment Reconciliation,From Invoice Date,De la Date de la Facture
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Vous n&#39;avez pas la permission de soumettre
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,La devise de facturation doit être égale à la devise par défaut de la société ou du compte de la partie
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,La devise de facturation doit être égale à la devise par défaut de la société ou du compte de la partie
 DocType: Healthcare Settings,Laboratory Settings,Paramètres de laboratoire
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Congés Accumulés à Encaisser
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Qu'est-ce que ça fait ?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,À l'Entrepôt
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Toutes les Admissions des Étudiants
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Qu'est-ce que ça fait ?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,À l'Entrepôt
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Toutes les Admissions des Étudiants
 ,Average Commission Rate,Taux Moyen de la Commission
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,'A un Numéro de Série' ne peut pas être 'Oui' pour un article hors-stock
-apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Sélectionnez l&#39;état
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,'A un Numéro de Série' ne peut pas être 'Oui' pour un article hors-stock
+apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Sélectionnez le Statut
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,La présence ne peut pas être marquée pour les dates à venir
 DocType: Pricing Rule,Pricing Rule Help,Aide pour les Règles de Tarification
 DocType: School House,House Name,Nom de la Maison
-DocType: Fee Schedule,Total Amount per Student,Montant total par élève
+DocType: Fee Schedule,Total Amount per Student,Montant total par étudiant
 DocType: Purchase Taxes and Charges,Account Head,Compte Principal
 apps/erpnext/erpnext/config/stock.py +173,Update additional costs to calculate landed cost of items,Mettre à jour les frais additionnels pour calculer le coût au débarquement des articles
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Electrical,Électrique
@@ -4680,40 +4770,40 @@
 DocType: Item,Customer Code,Code Client
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Rappel d'Anniversaire pour {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Jours Depuis la Dernière Commande
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Le compte de débit doit être un compte de Bilan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Le compte de débit doit être un compte de Bilan
 DocType: Buying Settings,Naming Series,Nom de la Série
 DocType: Leave Block List,Leave Block List Name,Nom de la Liste de Blocage des Congés
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Date de Début d'Assurance devrait être antérieure à la Date de Fin d'Assurance
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Veuillez configurer le système de nommage de l&#39;instructeur dans l&#39;école&gt; Paramètres de l&#39;école
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Actifs du Stock
 DocType: Timesheet,Production Detail,Détails de la Production
+DocType: Restaurant,Active Menu,Menu actif
 DocType: Target Detail,Target Qty,Qté Cible
 DocType: Shopping Cart Settings,Checkout Settings,Réglages Règlement
 DocType: Attendance,Present,Présent
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Bon de Livraison {0} ne doit pas être soumis
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Bon de Livraison {0} ne doit pas être soumis
 DocType: Notification Control,Sales Invoice Message,Message de la Facture de Vente
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Le Compte Clôturé {0} doit être de type Passif / Capitaux Propres
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Fiche de Paie de l'employé {0} déjà créée pour la feuille de temps {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Fiche de Paie de l'employé {0} déjà créée pour la feuille de temps {1}
 DocType: Vehicle Log,Odometer,Odomètre
 DocType: Sales Order Item,Ordered Qty,Qté Commandée
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Article {0} est désactivé
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Article {0} est désactivé
 DocType: Stock Settings,Stock Frozen Upto,Stock Gelé Jusqu'au
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,LDM ne contient aucun article en stock
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Activité du projet / tâche.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,LDM ne contient aucun article en stock
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Activité du projet / tâche.
 DocType: Vehicle Log,Refuelling Details,Détails de Ravitaillement
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Générer les Fiches de Paie
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Achat doit être vérifié, si Applicable Pour {0} est sélectionné"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,La remise doit être inférieure à 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Dernier montant d'achat introuvable
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Montant de la Reprise (Devise Société)
 DocType: Sales Invoice Timesheet,Billing Hours,Heures Facturées
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,LDM par défaut {0} introuvable
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Ligne #{0} : Veuillez définir la quantité de réapprovisionnement
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,LDM par défaut {0} introuvable
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Ligne #{0} : Veuillez définir la quantité de réapprovisionnement
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Choisissez des articles pour les ajouter ici
 DocType: Fees,Program Enrollment,Inscription au Programme
 DocType: Landed Cost Voucher,Landed Cost Voucher,Référence de Coût au Débarquement
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Veuillez définir {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Répéter le Jour du Mois
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} est un étudiant inactif
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} est un étudiant inactif
 DocType: Employee,Health Details,Détails de Santé
 DocType: Offer Letter,Offer Letter Terms,Termes de la Lettre de Proposition
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,"Pour créer une Demande de Paiement, un document de référence est requis"
@@ -4721,7 +4811,6 @@
 DocType: Employee External Work History,Salary,Salaire
 DocType: Serial No,Delivery Document Type,Type de Document de Livraison
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Soumettre toutes les fiches de paie pour les critères sélectionnés ci-dessus
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Articles synchronisés
 DocType: Sales Order,Partly Delivered,Livré en Partie
 DocType: Email Digest,Receivables,Créances
 DocType: Lead Source,Lead Source,Source du Prospect
@@ -4742,19 +4831,19 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Balance Agée 2
 DocType: SG Creation Tool Course,Max Strength,Force Max
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,LDM Remplacée
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Sélectionnez les articles en fonction de la Date de Livraison
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Sélectionnez les articles en fonction de la Date de Livraison
 ,Sales Analytics,Analyse des Ventes
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Disponible {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Disponible {0}
 ,Prospects Engaged But Not Converted,Prospects Contactés mais non Convertis
 DocType: Manufacturing Settings,Manufacturing Settings,Paramètres de Fabrication
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configurer l'Email
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,N° du Mobile du Tuteur 1
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Veuillez entrer la devise par défaut dans les Données de Base de la Société
 DocType: Stock Entry Detail,Stock Entry Detail,Détails de l'Écriture de Stock
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Rappels Quotidiens
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Rappels Quotidiens
 DocType: Products Settings,Home Page is Products,La Page d'Accueil est Produits
 ,Asset Depreciation Ledger,Livre d'Amortissements d'Actifs
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Règle de Taxation est en Conflit avec {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Règle de Taxation est en Conflit avec {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nouveau Nom de Compte
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Coût des Matières Premières Fournies
 DocType: Selling Settings,Settings for Selling Module,Réglages pour le Module Vente
@@ -4768,9 +4857,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,L'article {0} doit être un article en stock
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Entrepôt de Travail en Cours par Défaut
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Paramètres par défaut pour les opérations comptables .
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Veuillez configurer le système de dénomination des employés dans Ressources humaines&gt; Paramètres RH
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Date Prévue ne peut pas être avant la Date de Demande de Matériel
-DocType: Fees,Student Details,Détails de l&#39;élève
+DocType: Restaurant,Default Tax Template,Modèle d&#39;impôt par défaut
+DocType: Fees,Student Details,Détails de l'Étudiant
 DocType: Purchase Invoice Item,Stock Qty,Qté en Stock
 DocType: Employee Loan,Repayment Period in Months,Période de Remboursement en Mois
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Erreur : Pas un identifiant valide ?
@@ -4787,8 +4877,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Aller aux Articles
 DocType: Sales Partner,Partner Type,Type de Partenaire
 DocType: Purchase Taxes and Charges,Actual,Réel
+DocType: Restaurant Menu,Restaurant Manager,Gérant de restaurant
 DocType: Authorization Rule,Customerwise Discount,Remise en fonction du Client
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Feuille de Temps pour les tâches.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Feuille de Temps pour les tâches.
 DocType: Purchase Invoice,Against Expense Account,Pour le Compte de Charges
 DocType: Production Order,Production Order,Ordre de Production
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Note d'Installation {0} à déjà été sousmise
@@ -4796,7 +4887,6 @@
 DocType: Quotation Item,Against Docname,Pour le docName
 DocType: SMS Center,All Employee (Active),Tous les Employés (Actifs)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Voir Maintenant
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Sélectionner la période pendant laquelle la facture sera générée automatiquement
 DocType: BOM,Raw Material Cost,Coût de Matière Première
 DocType: Item Reorder,Re-Order Level,Niveau de Réapprovisionnement
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Entrez les articles et qté planifiée pour lesquels vous voulez augmenter les ordres de fabrication ou télécharger des donées brutes pour les analyser.
@@ -4809,23 +4899,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Le Type de Rapport est nécessaire
 DocType: Item,Serial Number Series,Séries de Numéros de Série
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},L’entrepôt est obligatoire pour l'Article du stock {0} dans la ligne {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Ajouter des Programmes
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Vente de Détail & en Gros
 DocType: Issue,First Responded On,Première Réponse Le
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Liste Croisée d'Articles dans plusieurs groupes
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},La Date de Début et la Date de Fin de l'Exercice Fiscal sont déjà définies dans l'Année Fiscale {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Date de Compensation mise à jour
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Lot Fractionné
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Lot Fractionné
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Réconcilié avec Succès
 DocType: Request for Quotation Supplier,Download PDF,Télécharger au Format PDF
 DocType: Production Order,Planned End Date,Date de Fin Prévue
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Veuillez entrer la date du calendrier
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Là où les articles sont stockés.
 DocType: Request for Quotation,Supplier Detail,Détails du Fournisseur
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Erreur dans la formule ou dans la condition : {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Erreur dans la formule ou dans la condition : {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Montant Facturé
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Le total des pondérations des critères doit être égal à 100%
 DocType: Attendance,Attendance,Présence
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,Articles de Stock
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,Articles de Stock
 DocType: BOM,Materials,Matériels
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Si décochée, la liste devra être ajoutée à chaque département où elle doit être appliquée."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Entrepôt Source et Destination ne peuvent pas être le même
@@ -4834,7 +4924,7 @@
 ,Item Prices,Prix des Articles
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,En Toutes Lettres. Sera visible une fois que vous enregistrerez le Bon de Commande.
 DocType: Period Closing Voucher,Period Closing Voucher,Bon de Clôture de la Période
-DocType: Consultation,Review Details,Détails de l&#39;examen
+DocType: Consultation,Review Details,Détails de l'Examen
 DocType: Dosage Form,Dosage Form,Formulaire de dosage
 apps/erpnext/erpnext/config/selling.py +67,Price List master.,Données de Base des Listes de Prix
 DocType: Task,Review Date,Date de Revue
@@ -4843,6 +4933,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,Sur le Total Net
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Valeur pour l'attribut {0} doit être dans la gamme de {1} à {2} dans les incréments de {3} pour le poste {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,L’Entrepôt cible à la ligne {0} doit être le même que dans l'Ordre de Production
+DocType: Restaurant Reservation,Waitlisted,Waitlisted
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Devise ne peut être modifiée après avoir fait des entrées en utilisant une autre devise
 DocType: Vehicle Service,Clutch Plate,Plaque d'Embrayage
 DocType: Company,Round Off Account,Compte d’Arrondi
@@ -4851,7 +4942,7 @@
 DocType: Customer Group,Parent Customer Group,Groupe Client Parent
 DocType: Journal Entry,Subscription,Abonnement
 DocType: Purchase Invoice,Contact Email,Email du Contact
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Création de frais en attente
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Création d'honoraires en attente
 DocType: Appraisal Goal,Score Earned,Score Gagné
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +229,Notice Period,Période de Préavis
 DocType: Asset Category,Asset Category Name,Nom de Catégorie d'Actif
@@ -4859,7 +4950,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nouveau Nom de Commercial
 DocType: Packing Slip,Gross Weight UOM,UDM du Poids Brut
 DocType: Delivery Note Item,Against Sales Invoice,Pour la Facture de Vente
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Veuillez entrer les numéros de série pour l'élément sérialisé
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Veuillez entrer les numéros de série pour l'élément sérialisé
 DocType: Bin,Reserved Qty for Production,Qté Réservée pour la Production
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Laisser désactivé si vous ne souhaitez pas considérer les lots en faisant des groupes basés sur les cours.
 DocType: Asset,Frequency of Depreciation (Months),Fréquence des Amortissements (Mois)
@@ -4867,13 +4958,13 @@
 DocType: Landed Cost Item,Landed Cost Item,Coût de l'Article au Débarquement
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Afficher les valeurs nulles
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantité de produit obtenue après fabrication / reconditionnement des quantités données de matières premières
-DocType: Lab Test,Test Group,Groupe de test
+DocType: Lab Test,Test Group,Groupe de Test
 DocType: Payment Reconciliation,Receivable / Payable Account,Compte Débiteur / Créditeur
 DocType: Delivery Note Item,Against Sales Order Item,Pour l'Article de la Commande Client
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Veuillez spécifier une Valeur d’Attribut pour l'attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Veuillez spécifier une Valeur d’Attribut pour l'attribut {0}
 DocType: Item,Default Warehouse,Entrepôt par Défaut
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budget ne peut pas être attribué pour le Compte de Groupe {0}
-DocType: Healthcare Settings,Patient Registration,Inscription au patient
+DocType: Healthcare Settings,Patient Registration,Inscription du patient
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Veuillez entrer le centre de coût parent
 DocType: Delivery Note,Print Without Amount,Imprimer Sans Montant
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Date d’Amortissement
@@ -4899,24 +4990,25 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Vendeur
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Centre de Budget et Coûts
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,De multiples modes de paiement par défaut ne sont pas autorisés
-,Appointment Analytics,Analyse de rendez-vous
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,pour le
+,Appointment Analytics,Analyse des Rendez-Vous
 DocType: Vehicle Service,Half Yearly,Semestriel
 DocType: Lead,Blog Subscriber,Abonné au Blog
 DocType: Guardian,Alternate Number,Autre Numéro
-DocType: Healthcare Settings,Consultations in valid days,Consultations en jours valides
+DocType: Healthcare Settings,Consultations in valid days,Consultations en Jours Ouvrés
 DocType: Assessment Plan Criteria,Maximum Score,Score Maximum
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Créer des règles pour restreindre les transactions basées sur les valeurs .
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +49, Group Roll No,N° de Rôle du Groupe
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +9,Fee Creation Failed,Failed Création Failed
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +9,Fee Creation Failed,La création des honoraires a échoué
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Laisser vide si vous faites des groupes d'étudiants par année
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si cochée, Le nombre total de Jours Ouvrés comprendra les vacances, ce qui réduira la valeur du Salaire Par Jour"
 DocType: Purchase Invoice,Total Advance,Total Avance
-apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Modifier le modèle de code
+apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Modifier le Code du Modèle
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,La Date de Fin de Terme ne peut pas être antérieure à la Date de Début de Terme. Veuillez corriger les dates et essayer à nouveau.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Compte de Devis
 ,BOM Stock Report,Rapport de Stock de LDM
 DocType: Stock Reconciliation Item,Quantity Difference,Différence de Quantité
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Traitement de la Paie
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Traitement de la Paie
 DocType: Opportunity Item,Basic Rate,Taux de Base
 DocType: GL Entry,Credit Amount,Montant du Crédit
 DocType: Cheque Print Template,Signatory Position,Position Signataire
@@ -4930,12 +5022,12 @@
 DocType: Tax Rule,Tax Rule,Règle de Taxation
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Maintenir le Même Taux Durant le Cycle de Vente
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planifier les journaux de temps en dehors des Heures de Travail du Bureau.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Clients dans la File d'Attente
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Le Dr {0} n&#39;a pas de programme de médecin. Ajoutez-le dans le maître du médecin
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Clients dans la File d'Attente
 DocType: Student,Nationality,Nationalité
 ,Items To Be Requested,Articles À Demander
-DocType: Purchase Order,Get Last Purchase Rate,Obtenir le Dernier Tarif d'Achat
 DocType: Company,Company Info,Informations sur la Société
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Sélectionner ou ajoutez nouveau client
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Sélectionner ou ajoutez nouveau client
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Un centre de coût est requis pour comptabiliser une note de frais
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Emplois des Ressources (Actifs)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Basé sur la présence de cet Employé
@@ -4943,6 +5035,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Compte de Débit
 DocType: Fiscal Year,Year Start Date,Date de Début de l'Exercice
 DocType: Attendance,Employee Name,Nom de l'Employé
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Poste de commande de restaurant
 DocType: Sales Invoice,Rounded Total (Company Currency),Total Arrondi (Devise Société)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Conversion impossible en Groupe car le Type de Compte est sélectionné.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} a été modifié. Veuillez actualiser.
@@ -4953,6 +5046,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Avantages de l'Employé
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},La quantité emballée doit être égale à la quantité pour l'Article {0} à la ligne {1}
 DocType: Production Order,Manufactured Qty,Qté Fabriquée
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Facture créée
 DocType: Purchase Receipt Item,Accepted Quantity,Quantité Acceptée
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Veuillez définir une Liste de Vacances par défaut pour l'Employé {0} ou la Société {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0} : {1} n’existe pas
@@ -4962,18 +5056,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ligne N° {0}: Le montant ne peut être supérieur au Montant en Attente pour le Remboursement de Frais {1}. Le Montant en Attente est de {2}
 DocType: Maintenance Schedule,Schedule,Calendrier
 DocType: Account,Parent Account,Compte Parent
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,disponible
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,disponible
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Type de Référence
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Liste de Prix introuvable ou desactivée
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Liste de Prix introuvable ou desactivée
 DocType: Lab Test,Approved,Approuvé
 DocType: Pricing Rule,Price,Prix
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',Employé dégagé de {0} doit être défini comme 'Gauche'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Employé dégagé de {0} doit être défini comme 'Gauche'
+DocType: Hub Settings,Last Sync On,Dernière synchronisation sur
 DocType: Guardian,Guardian,Tuteur
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Évaluation {0} créée pour l'Employé {1} dans l'intervalle de dates donné
 DocType: Employee,Education,Education
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Supp
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,Supp
 DocType: Selling Settings,Campaign Naming By,Campagne Nommée Par
 DocType: Employee,Current Address Is,L'Adresse Actuelle est
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Objectif de vente mensuel (
@@ -4988,7 +5083,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Code du Cours:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Veuillez entrer un Compte de Charges
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ligne #{0} : Type de Document de Référence doit être un Bon de Commande, une Facture d'Achat ou une Écriture de Journal"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ligne #{0} : Type de Document de Référence doit être un Bon de Commande, une Facture d'Achat ou une Écriture de Journal"
 DocType: Employee,Current Address,Adresse Actuelle
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Si l'article est une variante d'un autre article, alors la description, l'image, le prix, les taxes etc seront fixés à partir du modèle sauf si spécifiés explicitement"
 DocType: Serial No,Purchase / Manufacture Details,Achat / Fabrication Détails
@@ -5001,7 +5096,7 @@
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Récupérer les commandes client (en attente de livraison) sur la base des critères ci-dessus
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +90,Not Available,Indisponible
 DocType: Pricing Rule,Min Qty,Qté Min
-apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +36,Disable Template,Disable Template
+apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +36,Disable Template,Désactiver le Modèle
 DocType: Asset Movement,Transaction Date,Date de la Transaction
 DocType: Production Plan Item,Planned Qty,Qté Planifiée
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +121,Total Tax,Total des Taxes
@@ -5019,7 +5114,7 @@
 DocType: Hub Settings,Hub Settings,Paramètres du Hub
 DocType: Project,Gross Margin %,Marge Brute %
 DocType: BOM,With Operations,Avec des Opérations
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Des écritures comptables ont déjà été réalisées en devise {0} pour la société {1}. Veuillez sélectionner un compte de crédit ou de débit  en devise {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Des écritures comptables ont déjà été réalisées en devise {0} pour la société {1}. Veuillez sélectionner un compte de crédit ou de débit  en devise {0}.
 DocType: Asset,Is Existing Asset,Est Actif Existant
 DocType: Salary Detail,Statistical Component,Composante Statistique
 DocType: Warranty Claim,If different than customer address,Si différente de l'adresse du client
@@ -5027,13 +5122,14 @@
 DocType: BOM Operation,BOM Operation,Opération LDM
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Le Montant de la Rangée Précédente
 DocType: Student,Home Address,Adresse du Domicile
-apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Paramètres de variantes d&#39;élément.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transfert d'Actifs
+DocType: Item,Has Expiry Date,A la date d&#39;expiration
+apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Paramètres de Variante d'Article.
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,Transfert d'Actifs
 DocType: POS Profile,POS Profile,Profil PDV
 DocType: Training Event,Event Name,Nom de l'Événement
-DocType: Physician,Phone (Office),Téléphone (bureau)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,Admission
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Admissions pour {0}
+DocType: Physician,Phone (Office),Téléphone (Bureau)
+apps/erpnext/erpnext/hooks.py +147,Admission,Admission
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Admissions pour {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Saisonnalité de l'établissement des budgets, des objectifs, etc."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Nom de la Variable
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","L'article {0} est un modèle, veuillez sélectionner l'une de ses variantes"
@@ -5042,43 +5138,41 @@
 DocType: Assessment Plan,Room,Chambre
 DocType: Purchase Order,Advance Paid,Avance Payée
 DocType: Item,Item Tax,Taxe sur l'Article
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Du Matériel au Fournisseur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Du Matériel au Fournisseur
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Facture d'Accise
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Le seuil {0}% apparaît plus d'une fois
 DocType: Expense Claim,Employees Email Id,Identifiants Email des employés
 DocType: Employee Attendance Tool,Marked Attendance,Présence Validée
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Dettes Actuelles
 apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Envoyer un SMS en masse à vos contacts
-DocType: Patient,A Positive,Un positif
+DocType: Patient,A Positive,A Positif
 DocType: Program,Program Name,Nom du Programme
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Tenir Compte de la Taxe et des Frais pour
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Qté Réelle est obligatoire
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} est actuellement associé avec une fiche d'évaluation fournisseur {1}. Les bons de commande pour ce fournisseur doivent être édités avec précaution.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} est actuellement associé avec une fiche d'évaluation fournisseur {1}. Les bons de commande pour ce fournisseur doivent être édités avec précaution.
 DocType: Employee Loan,Loan Type,Type de Prêt
 DocType: Scheduling Tool,Scheduling Tool,Outil de Planification
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Carte de Crédit
 DocType: BOM,Item to be manufactured or repacked,Article à manufacturer ou à réemballer
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Paramètres par défaut pour les mouvements de stock.
-DocType: Purchase Invoice,Next Date,Date Suivante
 DocType: Employee Education,Major/Optional Subjects,Sujets Principaux / En Option
 DocType: Sales Invoice Item,Drop Ship,Expédition Directe
+DocType: Hub Settings,Suspended,Suspendu
 DocType: Training Event,Attendees,Participants
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Ici vous pouvez conserver les détails familiaux comme le nom et la profession des parents, le conjoint et les enfants"
 DocType: Academic Term,Term End Date,Date de Fin du Terme
-DocType: Hub Settings,Seller Name,Nom du Vendeur
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Taxes et Frais Déductibles (Devise Société)
 DocType: Item Group,General Settings,Paramètres Généraux
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,La Devise de Base et la Devise de Cotation ne peuvent pas identiques
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Ajouter des Instructeurs
 DocType: Stock Entry,Repack,Ré-emballer
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Vous devez sauvegarder le formulaire avant de continuer
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Veuillez sélectionner la Société en premier
 DocType: Item Attribute,Numeric Values,Valeurs Numériques
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Joindre le Logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Niveaux du Stocks
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Niveaux du Stocks
 DocType: Customer,Commission Rate,Taux de Commission
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,{0} fiches d'évaluations créées pour {1} entre:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Faire une Variante
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Faire une Variante
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquer les demandes de congé par département
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Type de Paiement doit être Recevoir, Payer ou Transfert Interne"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytique
@@ -5093,11 +5187,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Capital Social
 DocType: Shopping Cart Settings,Show Public Attachments,Afficher les Pièces Jointes Publiques
 DocType: Packing Slip,Package Weight Details,Détails du Poids du Paquet
+DocType: Restaurant Reservation,Reservation Time,Heure de réservation
 DocType: Payment Gateway Account,Payment Gateway Account,Compte Passerelle de Paiement
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,"Le paiement terminé, rediriger l'utilisateur vers la page sélectionnée."
 DocType: Company,Existing Company,Société Existante
-DocType: Healthcare Settings,Result Emailed,Résultat émis
+DocType: Healthcare Settings,Result Emailed,Résultat envoyé par Email
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","La Catégorie de Taxe a été changée à ""Total"" car tous les articles sont des articles hors stock"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Code de l&#39;article&gt; Groupe de produits&gt; Marque
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Veuillez sélectionner un fichier csv
 DocType: Student Leave Application,Mark as Present,Marquer comme Présent
 DocType: Supplier Scorecard,Indicator Color,Couleur de l'Indicateur
@@ -5111,7 +5207,7 @@
 DocType: Terms and Conditions,Terms and Conditions Help,Aide des Termes et Conditions
 ,Item-wise Purchase Register,Registre des Achats par Article
 DocType: Batch,Expiry Date,Date d'expiration
-DocType: Healthcare Settings,Employee name and designation in print,Nom et désignation de l&#39;employé imprimé
+DocType: Healthcare Settings,Employee name and designation in print,Nom et désignation de l'employé sur l'imprimé
 ,accounts-browser,navigateur-de-comptes
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +351,Please select Category first,Veuillez d’abord sélectionner une Catégorie
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Données de Base du Projet.
@@ -5122,11 +5218,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Créer un Lot d'Étudiant
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Est un Report
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Obtenir les Articles depuis LDM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Obtenir les Articles depuis LDM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Jours de Délai
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Ligne #{0} : La Date de Comptabilisation doit être la même que la date d'achat {1} de l’actif {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Vérifiez si l'Étudiant réside à la Résidence de l'Institut.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Veuillez entrer des Commandes Clients dans le tableau ci-dessus
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Veuillez entrer des Commandes Clients dans le tableau ci-dessus
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Fiches de Paie Non Soumises
 ,Stock Summary,Résumé du Stock
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Transfert d'un actif d'un entrepôt à un autre
@@ -5142,5 +5238,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Ligne {0} : L’Écriture de Débit ne peut pas être lié à un {1}
 DocType: Journal Entry,Subscription Section,Section Abonnement
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Compte {0} n'existe pas
+DocType: Training Event,Training Program,Programme de formation
 DocType: Account,Cash,Espèces
 DocType: Employee,Short biography for website and other publications.,Courte biographie pour le site web et d'autres publications.
diff --git a/erpnext/translations/gu.csv b/erpnext/translations/gu.csv
index b1bfa8a..d6968d5 100644
--- a/erpnext/translations/gu.csv
+++ b/erpnext/translations/gu.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,પગાર સ્થિતિ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,નોંધણી કરો
 DocType: Patient,Divorced,છુટાછેડા લીધેલ
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,વસ્તુઓ પહેલેથી જ સમન્વયિત
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,વસ્તુ વ્યવહાર ઘણી વખત ઉમેરી શકાય માટે પરવાનગી આપે છે
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,સામગ્રી મુલાકાત લો {0} આ વોરંટી દાવો રદ રદ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,કન્ઝ્યુમર પ્રોડક્ટ્સ
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,સાક્ષી છોડો
 DocType: Sales Partner,Dealer,વિક્રેતા
 DocType: Consultation,Investigations,તપાસ
+DocType: Restaurant Order Entry,Click Enter To Add,ઍડ કરવા માટે દાખલ કરો ક્લિક કરો
 DocType: Employee,Rented,ભાડાનાં
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,વપરાશકર્તા માટે લાગુ પડે છે
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","અટકાવાયેલ ઉત્પાદન ઓર્ડર રદ કરી શકાતી નથી, રદ કરવા તે પ્રથમ Unstop"
 DocType: Vehicle Service,Mileage,માઇલેજ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,શું તમે ખરેખર આ એસેટ સ્ક્રેપ કરવા માંગો છો?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,શું તમે ખરેખર આ એસેટ સ્ક્રેપ કરવા માંગો છો?
 DocType: Drug Prescription,Update Schedule,શેડ્યૂલ અપડેટ કરો
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,પસંદ કરો મૂળભૂત પુરવઠોકર્તા
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},કરન્સી ભાવ યાદી માટે જરૂરી છે {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,ઉપલબ્ધતા તપાસો
 DocType: Job Applicant,Job Applicant,જોબ અરજદાર
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,આ પુરવઠોકર્તા સામે વ્યવહારો પર આધારિત છે. વિગતો માટે નીચે જુઓ ટાઇમલાઇન
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,કોઈ વધુ પરિણામો.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,કાનૂની
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},વાસ્તવિક પ્રકાર કર પંક્તિ માં આઇટમ રેટ સમાવેશ કરવામાં નથી કરી શકો છો {0}
 DocType: Bank Guarantee,Customer,ગ્રાહક
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),વિનિમય દર તરીકે જ હોવી જોઈએ {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ગ્રાહક નું નામ
 DocType: Vehicle,Natural Gas,કુદરતી વાયુ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},બેન્ક એકાઉન્ટ તરીકે નામ આપવામાં આવ્યું ન કરી શકાય {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},બેન્ક એકાઉન્ટ તરીકે નામ આપવામાં આવ્યું ન કરી શકાય {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ચેતવણી (અથવા જૂથો) જે સામે હિસાબી પ્રવેશ કરવામાં આવે છે અને બેલેન્સ જાળવવામાં આવે છે.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),ઉત્કૃષ્ટ {0} કરી શકાય નહીં શૂન્ય કરતાં ઓછી ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,પ્રક્રિયામાં કોઈ સબમિટ કરેલ પગાર સ્લિપ નથી.
 DocType: Manufacturing Settings,Default 10 mins,10 મિનિટ મૂળભૂત
 DocType: Leave Type,Leave Type Name,પ્રકાર છોડો નામ
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,ઓપન બતાવો
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,ઉપરોક્ત રિકરિંગ માટે આજે આ ક્રિયા કરવી જરૂરી છે
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,સિરીઝ સફળતાપૂર્વક અપડેટ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,ચેકઆઉટ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural જર્નલ પ્રવેશ સબમિટ
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,ખરીદી ક્રમમાં વસ્તુઓ પ્રાપ્ત કરવા
 DocType: SMS Center,All Supplier Contact,બધા પુરવઠોકર્તા સંપર્ક
 DocType: Support Settings,Support Settings,આધાર સેટિંગ્સ
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,અપેક્ષિત ઓવરને તારીખ અપેક્ષિત પ્રારંભ તારીખ કરતાં ઓછા ન હોઈ શકે
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,અપેક્ષિત ઓવરને તારીખ અપેક્ષિત પ્રારંભ તારીખ કરતાં ઓછા ન હોઈ શકે
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ROW # {0}: દર જ હોવી જોઈએ {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,ન્યૂ છોડો અરજી
 ,Batch Item Expiry Status,બેચ વસ્તુ સમાપ્તિ સ્થિતિ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,બેંક ડ્રાફ્ટ
 DocType: Mode of Payment Account,Mode of Payment Account,ચુકવણી એકાઉન્ટ પ્રકાર
 DocType: Consultation,Consultation,પરામર્શ
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,સેલ્સ અને રિટર્ન્સ
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,બતાવો ચલો
 DocType: Academic Term,Academic Term,શૈક્ષણિક ટર્મ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,સામગ્રી
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,સ્વાસ્થ્ય કાળજી
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ચુકવણી વિલંબ (દિવસ)
 DocType: Lab Prescription,Lab Prescription,લેબ પ્રિસ્ક્રિપ્શન
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,ભાવ દ્વારા સૉર્ટ કરો
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,સેવા ખર્ચ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},શૃંખલા ક્રમાંક: {0} પહેલાથી સેલ્સ ઇન્વોઇસ સંદર્ભ થયેલ છે: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,ભરતિયું
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},શૃંખલા ક્રમાંક: {0} પહેલાથી સેલ્સ ઇન્વોઇસ સંદર્ભ થયેલ છે: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,ભરતિયું
 DocType: Maintenance Schedule Item,Periodicity,સમયગાળાના
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ફિસ્કલ વર્ષ {0} જરૂરી છે
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,સંરક્ષણ
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,ROW # {0}:
 DocType: Timesheet,Total Costing Amount,કુલ પડતર રકમ
 DocType: Delivery Note,Vehicle No,વાહન કોઈ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,ભાવ યાદી પસંદ કરો
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,ભાવ યાદી પસંદ કરો
 DocType: Accounts Settings,Currency Exchange Settings,ચલણ વિનિમય સેટિંગ્સ
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,રો # {0}: ચુકવણી દસ્તાવેજ trasaction પૂર્ણ કરવા માટે જરૂરી છે
 DocType: Production Order Operation,Work In Progress,પ્રગતિમાં કામ
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,કૃપા કરીને તારીખ પસંદ
 DocType: Employee,Holiday List,રજા યાદી
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,કૃપા કરીને શાળામાં પ્રશિક્ષક નામકરણ પદ્ધતિ સેટ કરો&gt; શાળા સેટિંગ્સ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,એકાઉન્ટન્ટ
+DocType: Hub Settings,Selling Price List,વેચાણ કિંમત યાદી
 DocType: Patient,Tobacco Current Use,તમાકુ વર્તમાન ઉપયોગ
 DocType: Cost Center,Stock User,સ્ટોક વપરાશકર્તા
 DocType: Company,Phone No,ફોન કોઈ
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,કોર્સ શેડ્યુલ બનાવવામાં:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},ન્યૂ {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},ન્યૂ {0}: # {1}
 ,Sales Partners Commission,સેલ્સ પાર્ટનર્સ કમિશન
 DocType: Purchase Invoice,Rounding Adjustment,રાઉન્ડિંગ એડજસ્ટમેન્ટ
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,કરતાં વધુ 5 અક્ષરો છે નથી કરી શકો છો સંક્ષેપનો
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,પિતૃ વિગતવાર docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","સંદર્ભ: {0}, આઇટમ કોડ: {1} અને ગ્રાહક: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,કિલો ગ્રામ
-DocType: Student Log,Log,પ્રવેશ કરો
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,નોકરી માટે ખોલીને.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} પરિણામ મળ્યું
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} પરિણામ મળ્યું
 DocType: Item Attribute,Increment,વૃદ્ધિ
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,સમય ગાળો
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,વેરહાઉસ પસંદ કરો ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,પરણિત
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},માટે પરવાનગી નથી {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,વસ્તુઓ મેળવો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},સ્ટોક બોલ પર કોઈ નોંધ સામે અપડેટ કરી શકાતું નથી {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},સ્ટોક બોલ પર કોઈ નોંધ સામે અપડેટ કરી શકાતું નથી {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ઉત્પાદન {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,કોઈ આઇટમ સૂચિબદ્ધ નથી
 DocType: Payment Reconciliation,Reconcile,સમાધાન
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,પેન્શન ફંડ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,આગળ અવમૂલ્યન તારીખ પહેલાં ખરીદી તારીખ ન હોઈ શકે
 DocType: Consultation,Consultation Date,કન્સલ્ટેશન તારીખ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERP નેક્સ્ટ વપરાશકર્તાઓ માટે ઉત્પાદન સૂચિ અને શોધ
 DocType: SMS Center,All Sales Person,બધા વેચાણ વ્યક્તિ
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** માસિક વિતરણ ** જો તમે તમારા બિઝનેસ મોસમ હોય તો તમે મહિના સમગ્ર બજેટ / લક્ષ્યાંક વિતરિત કરે છે.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,વસ્તુઓ મળી
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,પગાર માળખું ખૂટે
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,વસ્તુઓ મળી
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,પગાર માળખું ખૂટે
 DocType: Lead,Person Name,વ્યક્તિ નામ
 DocType: Sales Invoice Item,Sales Invoice Item,સેલ્સ ભરતિયું વસ્તુ
 DocType: Account,Credit,ક્રેડિટ
 DocType: POS Profile,Write Off Cost Center,ખર્ચ કેન્દ્રને માંડવાળ
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",દા.ત. &quot;પ્રાથમિક શાળા&quot; અથવા &quot;યુનિવર્સિટી&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",દા.ત. &quot;પ્રાથમિક શાળા&quot; અથવા &quot;યુનિવર્સિટી&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,સ્ટોક અહેવાલ
 DocType: Warehouse,Warehouse Detail,વેરહાઉસ વિગતવાર
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},ક્રેડિટ મર્યાદા ગ્રાહક માટે ઓળંગી કરવામાં આવી છે {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ટર્મ સમાપ્તિ તારીખ કરતાં પાછળથી શૈક્ષણિક વર્ષ સમાપ્તિ તારીખ જે શબ્દ સાથે કડી થયેલ છે હોઈ શકે નહિં (શૈક્ષણિક વર્ષ {}). તારીખો સુધારવા અને ફરીથી પ્રયાસ કરો.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",", અનચેક કરી શકાતી નથી કારણ કે એસેટ રેકોર્ડ વસ્તુ સામે અસ્તિત્વમાં &quot;સ્થિર એસેટ છે&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""સ્થિર સંપત્તિ"" અનચેક કરી શકાતી નથી કારણ કે આ વસ્તુ સામે સંપત્તિ વ્યવહાર અસ્તિત્વમાં છે"""
 DocType: Vehicle Service,Brake Oil,બ્રેક ઓઈલ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; પ્રદેશ
 DocType: Tax Rule,Tax Type,ટેક્સ પ્રકાર
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,કરપાત્ર રકમ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},જો તમે પહેલાં પ્રવેશો ઉમેરવા અથવા અપડેટ કરવા માટે અધિકૃત નથી {0}
 DocType: BOM,Item Image (if not slideshow),આઇટમ છબી (જોક્સ ન હોય તો)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ગ્રાહક જ નામ સાથે હાજર
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(કલાક દર / 60) * વાસ્તવિક કામગીરી સમય
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,પંક્તિ # {0}: સંદર્ભ દસ્તાવેજ પ્રકારનો ખર્ચ દાવો અથવા જર્નલ એન્ટ્રી હોવો આવશ્યક છે
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,BOM પસંદ કરો
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,પંક્તિ # {0}: સંદર્ભ દસ્તાવેજ પ્રકારનો ખર્ચ દાવો અથવા જર્નલ એન્ટ્રી હોવો આવશ્યક છે
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,BOM પસંદ કરો
 DocType: SMS Log,SMS Log,એસએમએસ લોગ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,વિતરિત વસ્તુઓ કિંમત
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,પર {0} રજા વચ્ચે તારીખ થી અને તારીખ નથી
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,કર્મચારીનું લોન
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,પ્રવૃત્તિ લોગ
 DocType: Fee Schedule,Send Payment Request Email,ચુકવણી વિનંતી ઇમેઇલ મોકલો
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,{0} વસ્તુ સિસ્ટમમાં અસ્તિત્વમાં નથી અથવા નિવૃત્ત થઈ ગયેલ છે
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,{0} વસ્તુ સિસ્ટમમાં અસ્તિત્વમાં નથી અથવા નિવૃત્ત થઈ ગયેલ છે
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,રિયલ એસ્ટેટ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,એકાઉન્ટ સ્ટેટમેન્ટ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ફાર્માસ્યુટિકલ્સ
@@ -210,17 +213,22 @@
 DocType: Employee,B-,બી
 DocType: Upload Attendance,Import Log,આયાત લોગ
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,પુલ ઉપર માપદંડ પર આધારિત પ્રકાર ઉત્પાદન સામગ્રી વિનંતી
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,સફળતાપૂર્વક નોંધણી વગર.
 DocType: Training Result Employee,Grade,ગ્રેડ
+DocType: Restaurant Table,No of Seats,બેઠકોની સંખ્યા
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","ગતિશીલ વિષય ઉમેરવા માટે, જિનજા ટૅગ્સનો ઉપયોગ કરો <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,સપ્લાયર દ્વારા વિતરિત
 DocType: SMS Center,All Contact,તમામ સંપર્ક
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,ઉત્પાદન ઓર્ડર પહેલેથી BOM સાથે તમામ વસ્તુઓ બનાવવામાં
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,ઉત્પાદન ઓર્ડર પહેલેથી BOM સાથે તમામ વસ્તુઓ બનાવવામાં
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,વાર્ષિક પગાર
 DocType: Daily Work Summary,Daily Work Summary,દૈનિક કામ સારાંશ
 DocType: Period Closing Voucher,Closing Fiscal Year,ફિસ્કલ વર્ષ બંધ
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} સ્થિર છે
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,કૃપા કરીને એકાઉન્ટ્સ ઓફ ચાર્ટ બનાવવા માટે હાલના કંપની પસંદ
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} સ્થિર છે
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,કૃપા કરીને એકાઉન્ટ્સ ઓફ ચાર્ટ બનાવવા માટે હાલના કંપની પસંદ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,સ્ટોક ખર્ચ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,પસંદ લક્ષ્યાંક વેરહાઉસ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,પસંદ લક્ષ્યાંક વેરહાઉસ
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,કૃપા કરીને દાખલ મનપસંદ સંપર્ક ઇમેઇલ
 DocType: Program Enrollment,School Bus,શાળા બસ
 DocType: Journal Entry,Contra Entry,ઊલટું એન્ટ્રી
@@ -237,9 +245,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", નમૂનો ડાઉનલોડ યોગ્ય માહિતી ભરો અને ફેરફાર ફાઇલ સાથે જોડે છે. પસંદ કરેલ સમયગાળામાં તમામ તારીખો અને કર્મચારી સંયોજન હાલની એટેન્ડન્સ રેકર્ડઝ સાથે, નમૂનો આવશે"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,{0} વસ્તુ સક્રિય નથી અથવા જીવનનો અંત સુધી પહોંચી ગઇ હશે
+DocType: Student Admission Program,Minimum Age,ન્યૂનતમ ઉંમર
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,ઉદાહરણ: મૂળભૂત ગણિત
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","આઇટમ રેટ પંક્તિ {0} કર સમાવેશ કરવા માટે, પંક્તિઓ કર {1} પણ સમાવેશ કરવો જ જોઈએ"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,એચઆર મોડ્યુલ માટે સેટિંગ્સ
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,એચઆર મોડ્યુલ માટે સેટિંગ્સ
 DocType: SMS Center,SMS Center,એસએમએસ કેન્દ્ર
 DocType: Sales Invoice,Change Amount,જથ્થો બદલી
 DocType: BOM Update Tool,New BOM,ન્યૂ BOM
@@ -249,7 +258,7 @@
 DocType: Lead,Request Type,વિનંતી પ્રકાર
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,કર્મચારીનું બનાવો
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,પ્રસારણ
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,રૂમ ઉમેરો
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),POS ની સેટઅપ મોડ (ઑનલાઇન / ઑફલાઇન)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,એક્ઝેક્યુશન
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,કામગીરી વિગતો બહાર કરવામાં આવે છે.
 DocType: Serial No,Maintenance Status,જાળવણી સ્થિતિ
@@ -272,6 +281,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,ભાવ યાદી ખરીદી અથવા વેચાણ માટે લાગુ હોવા જ જોઈએ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},સ્થાપન તારીખ વસ્તુ માટે બોલ તારીખ પહેલાં ન હોઈ શકે {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),ભાવ યાદી દર પર ડિસ્કાઉન્ટ (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,બાયોકેમિસ્ટ્રી
 DocType: Offer Letter,Select Terms and Conditions,પસંદ કરો નિયમો અને શરતો
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,મૂલ્ય
 DocType: Production Planning Tool,Sales Orders,વેચાણ ઓર્ડર
@@ -306,15 +316,15 @@
 DocType: Sales Partner,Reseller,પુનર્વિક્રેતા
 DocType: Codification Table,Medical Code,તબીબી કોડ
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","જો ચકાસાયેલ હોય, સામગ્રી વિનંતીઓ નોન-સ્ટોક વસ્તુઓ સમાવેશ થાય છે."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,કંપની દાખલ કરો
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,કંપની દાખલ કરો
 DocType: Delivery Note Item,Against Sales Invoice Item,સેલ્સ ભરતિયું વસ્તુ સામે
 ,Production Orders in Progress,પ્રગતિ ઉત્પાદન ઓર્ડર્સ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,નાણાકીય થી ચોખ્ખી રોકડ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage સંપૂર્ણ છે, સાચવી ન હતી"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage સંપૂર્ણ છે, સાચવી ન હતી"
 DocType: Lead,Address & Contact,સરનામું અને સંપર્ક
 DocType: Leave Allocation,Add unused leaves from previous allocations,અગાઉના ફાળવણી માંથી નહિં વપરાયેલ પાંદડા ઉમેરો
 DocType: Sales Partner,Partner website,જીવનસાથી વેબસાઇટ
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,આઇટમ ઉમેરો
+DocType: Restaurant Order Entry,Add Item,આઇટમ ઉમેરો
 DocType: Lab Test,Custom Result,કસ્ટમ પરિણામ
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,સંપર્ક નામ
 DocType: Course Assessment Criteria,Course Assessment Criteria,કોર્સ આકારણી માપદંડ
@@ -327,7 +337,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ખરીદી માટે વિનંતી.
 DocType: Lab Test,Submitted Date,સબમિટ કરેલી તારીખ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,આ સમય શીટ્સ આ પ્રોજેક્ટ સામે બનાવવામાં પર આધારિત છે
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,નેટ પે 0 કરતાં ઓછી ન હોઈ શકે
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,નેટ પે 0 કરતાં ઓછી ન હોઈ શકે
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","સિસ્ટમમાંથી પુનરાવર્તિત ભૂલ સૂચનાઓ મોકલવાનું બંધ કરવા માટે, અમે સબ્સ્ક્રિપ્શનમાં નિષ્ક્રિય કરેલ ફીલ્ડને ચકાસાયેલ છે"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,ફક્ત પસંદ કરેલ છોડો તાજનો આ છોડી અરજી સબમિટ કરી શકો છો
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,તારીખ રાહત જોડાયા તારીખ કરતાં મોટી હોવી જ જોઈએ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,દર વર્ષે પાંદડાં
@@ -336,9 +347,10 @@
 DocType: Email Digest,Profit & Loss,નફો અને નુકસાન
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Litre
 DocType: Task,Total Costing Amount (via Time Sheet),કુલ પડતર રકમ (સમયનો શીટ મારફતે)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,વિદ્યાર્થી જૂથો હેઠળ વિદ્યાર્થી સુયોજિત કરો
 DocType: Item Website Specification,Item Website Specification,વસ્તુ વેબસાઇટ સ્પષ્ટીકરણ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,છોડો અવરોધિત
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},વસ્તુ {0} પર તેના જીવનના અંતે પહોંચી ગયું છે {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},વસ્તુ {0} પર તેના જીવનના અંતે પહોંચી ગયું છે {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,બેન્ક પ્રવેશો
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,વાર્ષિક
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,સ્ટોક રિકંસીલેશન વસ્તુ
@@ -347,7 +359,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,વિદ્યાર્થી જૂથ બનાવવાનું સાધન
 DocType: Lead,Do Not Contact,સંપર્ક કરો
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,જે લોકો તમારી સંસ્થા ખાતે શીખવે
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,બધા રિકરિંગ ઇન્વૉઇસેસ ટ્રેકિંગ માટે અનન્ય આઈડી. તેને સબમિટ પર પેદા થયેલ છે.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,સોફ્ટવેર ડેવલોપર
 DocType: Item,Minimum Order Qty,ન્યુનત્તમ ઓર્ડર Qty
 DocType: Pricing Rule,Supplier Type,પુરવઠોકર્તા પ્રકાર
@@ -357,17 +368,19 @@
 DocType: Item,Publish in Hub,હબ પ્રકાશિત
 DocType: Student Admission,Student Admission,વિદ્યાર્થી પ્રવેશ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,{0} વસ્તુ રદ કરવામાં આવે છે
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,સામગ્રી વિનંતી
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,{0} વસ્તુ રદ કરવામાં આવે છે
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,સામગ્રી વિનંતી
 DocType: Bank Reconciliation,Update Clearance Date,સુધારા ક્લિયરન્સ તારીખ
 DocType: Item,Purchase Details,ખરીદી વિગતો
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ખરીદી માટે &#39;કાચો માલ પાડેલ&#39; ટેબલ મળી નથી વસ્તુ {0} {1}
 DocType: Patient Relation,Relation,સંબંધ
 DocType: Shipping Rule,Worldwide Shipping,વિશ્વભરમાં શીપીંગ
 DocType: Patient Relation,Mother,મધર
+DocType: Restaurant Reservation,Reservation End Time,આરક્ષણ અંત સમય
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,ગ્રાહકો પાસેથી પુષ્ટિ ઓર્ડર.
 DocType: Purchase Receipt Item,Rejected Quantity,નકારેલું જથ્થો
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,ચુકવણી વિનંતી {0} બનાવી
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,ચુકવણી વિનંતી {0} બનાવી
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,ઓછી સંવેદનશીલતા
 DocType: Notification Control,Notification Control,સૂચના નિયંત્રણ
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,એકવાર તમે તમારી તાલીમ પૂર્ણ કરી લો તે પછી કૃપા કરીને ખાતરી કરો
 DocType: Lead,Suggestions,સૂચનો
@@ -387,7 +400,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,કર્મચારી માટે ઇમેઇલ્સ પગાર સ્લિપ કર્મચારી પસંદગી મનપસંદ ઇમેઇલ પર આધારિત
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,યાદીમાં પ્રથમ છોડો તાજનો મૂળભૂત છોડો તાજનો તરીકે સેટ કરવામાં આવશે
 DocType: Tax Rule,Shipping County,શીપીંગ કાઉન્ટી
-apps/erpnext/erpnext/config/desktop.py +158,Learn,જાણો
+apps/erpnext/erpnext/config/desktop.py +159,Learn,જાણો
 DocType: Asset,Next Depreciation Date,આગળ અવમૂલ્યન તારીખ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,કર્મચારી દીઠ પ્રવૃત્તિ કિંમત
 DocType: Accounts Settings,Settings for Accounts,એકાઉન્ટ્સ માટે સુયોજનો
@@ -398,13 +411,13 @@
 DocType: Item,Synced With Hub,હબ સાથે સમન્વયિત
 DocType: Vehicle,Fleet Manager,ફ્લીટ વ્યવસ્થાપક
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},રો # {0}: {1} આઇટમ માટે નકારાત્મક ન હોઈ શકે {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,ખોટો પાસવર્ડ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,ખોટો પાસવર્ડ
 DocType: Item,Variant Of,ચલ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',કરતાં &#39;Qty ઉત્પાદન&#39; પૂર્ણ Qty વધારે ન હોઈ શકે
 DocType: Period Closing Voucher,Closing Account Head,એકાઉન્ટ વડા બંધ
 DocType: Employee,External Work History,બાહ્ય કામ ઇતિહાસ
 DocType: Physician,Time per Appointment,નિમણૂંક માટે સમય
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,ગોળ સંદર્ભ ભૂલ
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,ગોળ સંદર્ભ ભૂલ
 DocType: Appointment Type,Is Inpatient,ઇનપેશન્ટ છે
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 નામ
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,તમે બોલ પર કોઈ નોંધ સેવ વાર શબ્દો (નિકાસ) દૃશ્યમાન થશે.
@@ -413,19 +426,18 @@
 DocType: Lead,Industry,ઉદ્યોગ
 DocType: Employee,Job Profile,જોબ પ્રોફાઇલ
 DocType: BOM Item,Rate & Amount,દર અને રકમ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,કૃપા કરીને સેટઅપ&gt; ક્રમાંકન શ્રેણી દ્વારા હાજરી માટે શ્રેણી ક્રમાંક સેટ કરો
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,આ કંપની સામેના વ્યવહારો પર આધારિત છે. વિગતો માટે નીચેની ટાઇમલાઇન જુઓ
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,આપોઆપ સામગ્રી વિનંતી બનાવટ પર ઇમેઇલ દ્વારા સૂચિત
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,રેઝિસ્ટન્ટ
 DocType: Journal Entry,Multi Currency,મલ્ટી કરન્સી
 DocType: Payment Reconciliation Invoice,Invoice Type,ભરતિયું પ્રકાર
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; પ્રદેશ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,ડિલીવરી નોંધ
 DocType: Consultation,Encounter Impression,એન્કાઉન્ટર ઇમ્પ્રેશન
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,કર સુયોજિત કરી રહ્યા છે
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,વેચાઈ એસેટ કિંમત
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,તમે તેને ખેંચી ચુકવણી પછી એન્ટ્રી સુધારાઈ ગયેલ છે. તેને ફરીથી ખેંચી કરો.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} વસ્તુ ટેક્સ બે વખત દાખલ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,આ અઠવાડિયે અને બાકી પ્રવૃત્તિઓ માટે સારાંશ
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} વસ્તુ ટેક્સ બે વખત દાખલ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,આ અઠવાડિયે અને બાકી પ્રવૃત્તિઓ માટે સારાંશ
 DocType: Student Applicant,Admitted,પ્રવેશ
 DocType: Workstation,Rent Cost,ભાડું ખર્ચ
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,રકમ અવમૂલ્યન પછી
@@ -439,36 +451,35 @@
 DocType: Shipping Rule,Valid for Countries,દેશો માટે માન્ય
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"આ આઇટમ એક નમૂનો છે અને વ્યવહારો ઉપયોગ કરી શકતા નથી. &#39;ના નકલ&#39; સુયોજિત થયેલ છે, જ્યાં સુધી વસ્તુ લક્ષણો ચલો માં ઉપર નકલ થશે"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ગણવામાં કુલ ઓર્ડર
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",કર્મચારીનું હોદ્દો (દા.ત. સીઇઓ ડિરેક્ટર વગેરે).
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).",કર્મચારીનું હોદ્દો (દા.ત. સીઇઓ ડિરેક્ટર વગેરે).
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"ગ્રાહક કરન્સી ગ્રાહક આધાર ચલણ ફેરવાય છે, જે અંતે દર"
 DocType: Course Scheduling Tool,Course Scheduling Tool,કોર્સ સુનિશ્ચિત સાધન
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},રો # {0} ખરીદી ભરતિયું હાલની એસેટ સામે નથી કરી શકાય છે {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Urgent]% s માટે રિકરિંગ% s બનાવતી વખતે ભૂલ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[જરૂરી] આવર્તક %s બનાવતી વખતે  %s માટે ત્રુટિ
 DocType: Item Tax,Tax Rate,ટેક્સ રેટ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} પહેલાથી જ કર્મચારી માટે ફાળવવામાં {1} માટે સમય {2} માટે {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,પસંદ કરો વસ્તુ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,પસંદ કરો વસ્તુ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,ભરતિયું {0} પહેલાથી જ રજૂ કરવામાં આવે છે ખરીદી
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},ROW # {0}: બેચ કોઈ તરીકે જ હોવી જોઈએ {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,બિન-ગ્રુપ માટે કન્વર્ટ
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,આઇટમ બેચ (ઘણો).
 DocType: C-Form Invoice Detail,Invoice Date,ભરતિયું તારીખ
 DocType: GL Entry,Debit Amount,ડેબિટ રકમ
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},માત્ર કંપની દીઠ 1 એકાઉન્ટ હોઈ શકે છે {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,જોડાણ જુઓ
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},માત્ર કંપની દીઠ 1 એકાઉન્ટ હોઈ શકે છે {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,જોડાણ જુઓ
 DocType: Purchase Order,% Received,% પ્રાપ્ત
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,વિદ્યાર્થી જૂથો બનાવો
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,સેટઅપ પહેલેથી પૂર્ણ !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,સેટઅપ પહેલેથી પૂર્ણ !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,ક્રેડિટ નોટ રકમ
 DocType: Setup Progress Action,Action Document,ક્રિયા દસ્તાવેજ
 ,Finished Goods,ફિનિશ્ડ ગૂડ્સ
 DocType: Delivery Note,Instructions,સૂચનાઓ
 DocType: Quality Inspection,Inspected By,દ્વારા પરીક્ષણ
 DocType: Maintenance Visit,Maintenance Type,જાળવણી પ્રકાર
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} કોર્સ પ્રવેશ નથી {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,આઇટમ કોડ&gt; આઇટમ ગ્રુપ&gt; બ્રાન્ડ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} કોર્સ પ્રવેશ નથી {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},સીરીયલ કોઈ {0} બોલ પર કોઈ નોંધ સંબંધ નથી {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext ડેમો
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,વસ્તુઓ ઉમેરો
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,વસ્તુઓ ઉમેરો
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,વસ્તુ ગુણવત્તા નિરીક્ષણ પરિમાણ
 DocType: Leave Application,Leave Approver Name,તાજનો છોડો નામ
 DocType: Depreciation Schedule,Schedule Date,સૂચિ તારીખ
@@ -488,7 +499,7 @@
 DocType: Salary Slip Timesheet,Working Hours,કામ નાં કલાકો
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,હાલની શ્રેણી શરૂ / વર્તમાન ક્રમ નંબર બદલો.
 DocType: Dosage Strength,Strength,સ્ટ્રેન્થ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,નવી ગ્રાહક બનાવવા
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,નવી ગ્રાહક બનાવવા
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","બહુવિધ કિંમતના નિયમોમાં જીતવું ચાલુ હોય, વપરાશકર્તાઓ તકરાર ઉકેલવા માટે જાતે અગ્રતા સુયોજિત કરવા માટે કહેવામાં આવે છે."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,ખરીદી ઓર્ડર બનાવો
 ,Purchase Register,ખરીદી રજીસ્ટર
@@ -507,7 +518,7 @@
 DocType: Lab Test Template,Single,એક
 DocType: Salary Slip,Total Loan Repayment,કુલ લોન ચુકવણી
 DocType: Account,Cost of Goods Sold,માલની કિંમત વેચાઈ
-DocType: Purchase Invoice,Yearly,વાર્ષિક
+DocType: Subscription,Yearly,વાર્ષિક
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,ખર્ચ કેન્દ્રને દાખલ કરો
 DocType: Drug Prescription,Dosage,ડોઝ
 DocType: Journal Entry Account,Sales Order,વેચાણ ઓર્ડર
@@ -537,7 +548,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,બધા ઉત્પાદન પ્રક્રિયા માટે વૈશ્વિક સુયોજનો.
 DocType: Accounts Settings,Accounts Frozen Upto,ફ્રોઝન સુધી એકાઉન્ટ્સ
 DocType: SMS Log,Sent On,પર મોકલવામાં
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,એટ્રીબ્યુટ {0} લક્ષણો ટેબલ ઘણી વખત પસંદ
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,એટ્રીબ્યુટ {0} લક્ષણો ટેબલ ઘણી વખત પસંદ
 DocType: HR Settings,Employee record is created using selected field. ,કર્મચારીનું રેકોર્ડ પસંદ ક્ષેત્ર ઉપયોગ કરીને બનાવવામાં આવે છે.
 DocType: Sales Order,Not Applicable,લાગુ નથી
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,હોલિડે માસ્ટર.
@@ -562,13 +573,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ફાળવવામાં કુલ પાંદડા ફરજિયાત છે
 DocType: Patient,AB Positive,એબી હકારાત્મક
 DocType: Job Opening,Description of a Job Opening,એક જોબ ખુલી વર્ણન
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,આજે બાકી પ્રવૃત્તિઓ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,આજે બાકી પ્રવૃત્તિઓ
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,હાજરીનો વિક્રમ છે.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Timesheet આધારિત પેરોલ માટે પગાર પુન.
 DocType: Sales Order Item,Used for Production Plan,ઉત્પાદન યોજના માટે વપરાય છે
 DocType: Employee Loan,Total Payment,કુલ ચુકવણી
 DocType: Manufacturing Settings,Time Between Operations (in mins),(મિનિટ) ઓપરેશન્સ વચ્ચે સમય
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} રદ થઇ ગઇ છે કે જેથી ક્રિયા પૂર્ણ કરી શકાતી નથી
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} રદ થઇ ગઇ છે કે જેથી ક્રિયા પૂર્ણ કરી શકાતી નથી
 DocType: Customer,Buyer of Goods and Services.,સામાન અને સેવાઓ ખરીદનાર.
 DocType: Journal Entry,Accounts Payable,ચુકવવાપાત્ર ખાતાઓ
 DocType: Patient,Allergies,એલર્જી
@@ -580,22 +591,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,ખરીદ ઓર્ડર ચેતવો
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,તમારા ગ્રાહકો થોડા યાદી આપે છે. તેઓ સંસ્થાઓ અથવા વ્યક્તિઓ હોઈ શકે છે.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,પૂરતી ભાગો બિલ્ડ કરવા માટે
+DocType: POS Profile User,POS Profile User,POS પ્રોફાઇલ વપરાશકર્તા
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,સીધી આવક
 DocType: Patient Appointment,Date TIme,તારીખ સમય
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","એકાઉન્ટ દ્વારા જૂથ, તો એકાઉન્ટ પર આધારિત ફિલ્ટર કરી શકો છો"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,વહીવટી અધિકારીશ્રી
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,કૃપા કરીને અભ્યાસક્રમનો પસંદ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,કૃપા કરીને અભ્યાસક્રમનો પસંદ
 DocType: Codification Table,Codification Table,કોડીકરણ કોષ્ટક
 DocType: Timesheet Detail,Hrs,કલાકે
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,કંપની પસંદ કરો
 DocType: Stock Entry Detail,Difference Account,તફાવત એકાઉન્ટ
 DocType: Purchase Invoice,Supplier GSTIN,પુરવઠોકર્તા GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,તેના આશ્રિત કાર્ય {0} બંધ નથી નજીક કાર્ય નથી કરી શકો છો.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,"સામગ્રી વિનંતી ઊભા કરવામાં આવશે, જેના માટે વેરહાઉસ દાખલ કરો"
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,તેના આશ્રિત કાર્ય {0} બંધ નથી નજીક કાર્ય નથી કરી શકો છો.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"સામગ્રી વિનંતી ઊભા કરવામાં આવશે, જેના માટે વેરહાઉસ દાખલ કરો"
 DocType: Production Order,Additional Operating Cost,વધારાની ઓપરેટીંગ ખર્ચ
 DocType: Lab Test Template,Lab Routine,લેબ રાબેતા મુજબનું
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,કોસ્મેટિક્સ
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","મર્જ, નીચેના ગુણધર્મો બંને આઇટમ્સ માટે જ હોવી જોઈએ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","મર્જ, નીચેના ગુણધર્મો બંને આઇટમ્સ માટે જ હોવી જોઈએ"
 DocType: Shipping Rule,Net Weight,કુલ વજન
 DocType: Employee,Emergency Phone,સંકટકાલીન ફોન
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,ખરીદો
@@ -605,7 +617,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,કૃપા કરીને માટે થ્રેશોલ્ડ 0% ગ્રેડ વ્યાખ્યાયિત
 DocType: Sales Order,To Deliver,વિતરિત કરવા માટે
 DocType: Purchase Invoice Item,Item,વસ્તુ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,સીરીયલ કોઈ આઇટમ એક અપૂર્ણાંક ન હોઈ શકે
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,ઉચ્ચ સંવેદનશીલતા
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,સીરીયલ કોઈ આઇટમ એક અપૂર્ણાંક ન હોઈ શકે
 DocType: Journal Entry,Difference (Dr - Cr),તફાવત (ડૉ - સીઆર)
 DocType: Account,Profit and Loss,નફો અને નુકસાનનું
 DocType: Patient,Risk Factors,જોખમ પરિબળો
@@ -614,7 +627,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,મેનેજિંગ Subcontracting
 DocType: Vital Signs,Body Temperature,શારીરિક તાપમાન
 DocType: Project,Project will be accessible on the website to these users,પ્રોજેક્ટ આ વપરાશકર્તાઓ માટે વેબસાઇટ પર સુલભ હશે
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,પ્રોજેક્ટ પ્રકાર વ્યાખ્યાયિત કરે છે.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,પ્રોજેક્ટ પ્રકાર વ્યાખ્યાયિત કરે છે.
 DocType: Supplier Scorecard,Weighting Function,વજન કાર્ય
 DocType: Physician,OP Consulting Charge,ઓ.પી. કન્સલ્ટિંગ ચાર્જ
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,તમારી સેટઅપ કરો
@@ -628,7 +641,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,વૃદ્ધિ 0 ન હોઈ શકે
 DocType: Production Planning Tool,Material Requirement,સામગ્રી જરૂરિયાત
 DocType: Company,Delete Company Transactions,કંપની વ્યવહારો કાઢી નાખો
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,સંદર્ભ કોઈ અને સંદર્ભ તારીખ બેન્ક ટ્રાન્ઝેક્શન માટે ફરજિયાત છે
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,સંદર્ભ કોઈ અને સંદર્ભ તારીખ બેન્ક ટ્રાન્ઝેક્શન માટે ફરજિયાત છે
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ સંપાદિત કરો કર અને ખર્ચ ઉમેરો
 DocType: Payment Entry Reference,Supplier Invoice No,પુરવઠોકર્તા ભરતિયું કોઈ
 DocType: Territory,For reference,સંદર્ભ માટે
@@ -636,12 +649,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","કાઢી શકતા નથી સીરીયલ કોઈ {0}, તે સ્ટોક વ્યવહારો તરીકે ઉપયોગ થાય છે"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),બંધ (સીઆર)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,હેલો
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,ખસેડો વસ્તુ
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,ખસેડો વસ્તુ
 DocType: Serial No,Warranty Period (Days),વોરંટી સમયગાળા (દિવસ)
 DocType: Installation Note Item,Installation Note Item,સ્થાપન નોંધ વસ્તુ
 DocType: Production Plan Item,Pending Qty,બાકી Qty
 DocType: Budget,Ignore,અવગણો
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} સક્રિય નથી
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} સક્રિય નથી
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,સેટઅપ ચેક પ્રિન્ટીંગ માટે પરિમાણો
 DocType: Salary Slip,Salary Slip Timesheet,પગાર કાપલી Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,પેટા કોન્ટ્રાક્ટ ખરીદી રસીદ માટે ફરજિયાત પુરવઠોકર્તા વેરહાઉસ
@@ -650,7 +663,7 @@
 DocType: Pricing Rule,Sales Partner,વેચાણ ભાગીદાર
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,બધા પુરવઠોકર્તા સ્કોરકાર્ડ્સ.
 DocType: Buying Settings,Purchase Receipt Required,ખરીદી રસીદ જરૂરી
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,જો ખુલે સ્ટોક દાખલ મૂલ્યાંકન દર ફરજિયાત છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,જો ખુલે સ્ટોક દાખલ મૂલ્યાંકન દર ફરજિયાત છે
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,ભરતિયું ટેબલ માં શોધી કોઈ રેકોર્ડ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,પ્રથમ કંપની અને પાર્ટી પ્રકાર પસંદ કરો
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,નાણાકીય / હિસાબી વર્ષ.
@@ -687,7 +700,7 @@
 DocType: Quotation,Quotation To,માટે અવતરણ
 DocType: Lead,Middle Income,મધ્યમ આવક
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),ખુલી (સીઆર)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,જો તમે પહેલાથી જ અન્ય UOM સાથે કેટલાક વ્યવહાર (ઓ) કર્યા છે કારણ કે વસ્તુ માટે માપવા એકમ મૂળભૂત {0} સીધા બદલી શકાતું નથી. તમે વિવિધ મૂળભૂત UOM વાપરવા માટે એક નવી આઇટમ બનાવવા માટે જરૂર પડશે.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,જો તમે પહેલાથી જ અન્ય UOM સાથે કેટલાક વ્યવહાર (ઓ) કર્યા છે કારણ કે વસ્તુ માટે માપવા એકમ મૂળભૂત {0} સીધા બદલી શકાતું નથી. તમે વિવિધ મૂળભૂત UOM વાપરવા માટે એક નવી આઇટમ બનાવવા માટે જરૂર પડશે.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,ફાળવેલ રકમ નકારાત્મક ન હોઈ શકે
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,કંપની સેટ કરો
 DocType: Purchase Order Item,Billed Amt,ચાંચ એએમટી
@@ -701,6 +714,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,પસંદ ચુકવણી એકાઉન્ટ બેન્ક એન્ટ્રી બનાવવા માટે
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","પાંદડા, ખર્ચ દાવાઓ અને પેરોલ વ્યવસ્થા કર્મચારી રેકોર્ડ બનાવવા"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,પ્રિસ્ક્રિપ્શન પીરિયડ
+DocType: Restaurant Reservation,Restaurant Reservation,રેસ્ટોરન્ટ રિઝર્વેશન
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,દરખાસ્ત લેખન
 DocType: Payment Entry Deduction,Payment Entry Deduction,ચુકવણી એન્ટ્રી કપાત
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,અન્ય વેચાણ વ્યક્તિ {0} એ જ કર્મચારીનું ID સાથે અસ્તિત્વમાં
@@ -708,7 +722,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,સ્નાતકોત્તર
 DocType: Assessment Plan,Maximum Assessment Score,મહત્તમ આકારણી સ્કોર
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,સુધારા બેન્ક ટ્રાન્ઝેક્શન તારીખો
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,સમયનો ટ્રેકિંગ
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,સમયનો ટ્રેકિંગ
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,પરિવાહક માટે ડુપ્લિકેટ
 DocType: Fiscal Year Company,Fiscal Year Company,ફિસ્કલ યર કંપની
 DocType: Packing Slip Item,DN Detail,DN વિગતવાર
@@ -716,8 +730,9 @@
 DocType: Timesheet,Billed,ગણાવી
 DocType: Batch,Batch Description,બેચ વર્ણન
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,વિદ્યાર્થી જૂથો બનાવી
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","પેમેન્ટ ગેટવે ખાતું નથી, એક જાતે બનાવવા કૃપા કરીને."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","પેમેન્ટ ગેટવે ખાતું નથી, એક જાતે બનાવવા કૃપા કરીને."
 DocType: Supplier Scorecard,Per Year,પ્રતિ વર્ષ
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,DOB મુજબ આ પ્રોગ્રામમાં પ્રવેશ માટે પાત્ર નથી
 DocType: Sales Invoice,Sales Taxes and Charges,વેચાણ કર અને ખર્ચ
 DocType: Employee,Organization Profile,સંસ્થા પ્રોફાઇલ
 DocType: Vital Signs,Height (In Meter),ઊંચાઈ (મીટરમાં)
@@ -744,7 +759,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +120,Manager,વ્યવસ્થાપક
 DocType: Payment Entry,Payment From / To,ચુકવણી / to
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +127,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},નવું ક્રેડિટ મર્યાદા ગ્રાહક માટે વર્તમાન બાકી રકમ કરતાં ઓછી છે. ક્રેડિટ મર્યાદા ઓછામાં ઓછા હોઈ શકે છે {0}
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,અને &#39;ગ્રુપ દ્વારા&#39; &#39;પર આધારિત&#39; જ ન હોઈ શકે
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'પર આધારિત' અને 'જૂથ દ્વારા' સમાન ન હોઈ શકે
 DocType: Sales Person,Sales Person Targets,વેચાણ વ્યક્તિ લક્ષ્યાંક
 DocType: Installation Note,IN-,છે-
 DocType: Production Order Operation,In minutes,મિનિટ
@@ -753,7 +768,7 @@
 DocType: Student Batch Name,Batch Name,બેચ નામ
 DocType: Fee Validity,Max number of visit,મુલાકાતની મહત્તમ સંખ્યા
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet બનાવવામાં:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},ચૂકવણીની પદ્ધતિ મૂળભૂત કેશ અથવા બેન્ક એકાઉન્ટ સેટ કરો {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},ચૂકવણીની પદ્ધતિ મૂળભૂત કેશ અથવા બેન્ક એકાઉન્ટ સેટ કરો {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,નોંધણી
 DocType: GST Settings,GST Settings,જીએસટી સેટિંગ્સ
 DocType: Selling Settings,Customer Naming By,કરીને ગ્રાહક નામકરણ
@@ -785,15 +800,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ઉતારેલ માલની કિંમત કર અને ખર્ચ
 DocType: Production Order Operation,Actual Start Time,વાસ્તવિક પ્રારંભ સમય
 DocType: BOM Operation,Operation Time,ઓપરેશન સમય
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,સમાપ્ત
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,સમાપ્ત
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,પાયો
 DocType: Timesheet,Total Billed Hours,કુલ ગણાવી કલાક
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,રકમ માંડવાળ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,રકમ માંડવાળ
 DocType: Leave Block List Allow,Allow User,વપરાશકર્તા માટે પરવાનગી આપે છે
 DocType: Journal Entry,Bill No,બિલ કોઈ
 DocType: Company,Gain/Loss Account on Asset Disposal,એસેટ નિકાલ પર ગેઇન / નુકશાન એકાઉન્ટ
 DocType: Vehicle Log,Service Details,સેવા વિગતો
-DocType: Purchase Invoice,Quarterly,ત્રિમાસિક
+DocType: Subscription,Quarterly,ત્રિમાસિક
 DocType: Lab Test Template,Grouped,ગ્રુપ કરેલું
 DocType: Selling Settings,Delivery Note Required,ડ લવર નોંધ જરૂરી
 DocType: Bank Guarantee,Bank Guarantee Number,બેંક ગેરંટી સંખ્યા
@@ -802,12 +817,12 @@
 DocType: Student Attendance,Student Attendance,વિદ્યાર્થી એટેન્ડન્સ
 DocType: Sales Invoice Timesheet,Time Sheet,સમય પત્રક
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush કાચો માલ પર આધારિત
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,આઇટમ વિગતો દાખલ કરો
 DocType: Interest,Interest,વ્યાજ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,પૂર્વ વેચાણ
 DocType: Purchase Receipt,Other Details,અન્ય વિગતો
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,ટેસ્ટ ઢાંચો
+DocType: Restaurant Order Entry Item,Served,સેવા આપી
 DocType: Account,Accounts,એકાઉન્ટ્સ
 DocType: Vehicle,Odometer Value (Last),ઑડોમીટર ભાવ (છેલ્લું)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,સપ્લાયર સ્કોરકાર્ડ માપદંડના નમૂનાઓ.
@@ -819,25 +834,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,પૂર્વદર્શન પગાર કાપલી
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,એકાઉન્ટ {0} ઘણી વખત દાખલ કરવામાં આવી છે
 DocType: Account,Expenses Included In Valuation,ખર્ચ વેલ્યુએશનમાં સમાવાયેલ
-DocType: Hub Settings,Seller City,વિક્રેતા સિટી
 ,Absent Student Report,ગેરહાજર વિદ્યાર્થી રિપોર્ટ
 DocType: Email Digest,Next email will be sent on:,આગામી ઇમેઇલ પર મોકલવામાં આવશે:
 DocType: Offer Letter Term,Offer Letter Term,પત્ર ગાળાના ઓફર
 DocType: Supplier Scorecard,Per Week,સપ્તાહ દીઠ
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,વસ્તુ ચલો છે.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,વસ્તુ ચલો છે.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,કુલ વિદ્યાર્થી
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,વસ્તુ {0} મળી નથી
 DocType: Bin,Stock Value,સ્ટોક ભાવ
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,ફી રેકોર્ડ્સ પૃષ્ઠભૂમિમાં બનાવવામાં આવશે. કોઈપણ ભૂલના કિસ્સામાં ભૂલ સંદેશો શેડ્યૂલમાં અપડેટ કરવામાં આવશે.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,કંપની {0} અસ્તિત્વમાં નથી
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} ની ફી માન્યતા {1} સુધી છે
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} ની ફી માન્યતા {1} સુધી છે
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,વૃક્ષ પ્રકાર
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Qty યુનિટ દીઠ કમ્પોનન્ટ
 DocType: Serial No,Warranty Expiry Date,વોરંટી સમાપ્તિ તારીખ
 DocType: Material Request Item,Quantity and Warehouse,જથ્થો અને વેરહાઉસ
+DocType: Hub Settings,Unregister,નોંધણી રદ કરો
 DocType: Sales Invoice,Commission Rate (%),કમિશન દર (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,પસંદ કરો કાર્યક્રમ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,પસંદ કરો કાર્યક્રમ
 DocType: Project,Estimated Cost,અંદાજીત કિંમત
 DocType: Purchase Order,Link to material requests,સામગ્રી વિનંતીઓ લિંક
+DocType: Hub Settings,Publish,પ્રકાશિત કરો
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,એરોસ્પેસ
 DocType: Journal Entry,Credit Card Entry,ક્રેડિટ કાર્ડ એન્ટ્રી
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,કંપની અને એકાઉન્ટ્સ
@@ -848,13 +865,12 @@
 DocType: Selling Settings,Close Opportunity After Days,બંધ તકો દિવસો પછી
 ,Reserved,અનામત
 DocType: Purchase Order,Supply Raw Materials,પુરવઠા કાચો માલ
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,આગળ ભરતિયું પેદા થશે કે જેના પર તારીખ. તેને સબમિટ પર પેદા થયેલ છે.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,વર્તમાન અસ્કયામતો
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} સ્ટોક વસ્તુ નથી
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',&#39;તાલીમ અભિપ્રાય&#39; પર ક્લિક કરીને અને પછી &#39;નવું&#39; પર ક્લિક કરીને તાલીમ માટે તમારી પ્રતિક્રિયા શેર કરો.
 DocType: Mode of Payment Account,Default Account,મૂળભૂત એકાઉન્ટ
 DocType: Payment Entry,Received Amount (Company Currency),મળેલી રકમ (કંપની ચલણ)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,"તક લીડ બનાવવામાં આવે છે, તો લીડ સુયોજિત થવુ જ જોઇએ"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,"તક લીડ બનાવવામાં આવે છે, તો લીડ સુયોજિત થવુ જ જોઇએ"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,સાપ્તાહિક બોલ દિવસ પસંદ કરો
 DocType: Patient,O Negative,ઓ નકારાત્મક
 DocType: Production Order Operation,Planned End Time,આયોજિત સમાપ્તિ સમય
@@ -870,10 +886,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,એનર્જી
 DocType: Opportunity,Opportunity From,પ્રતિ તક
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,માસિક પગાર નિવેદન.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,કંપની ઉમેરો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,પંક્તિ {0}: {1} વસ્તુ {2} માટે આવશ્યક ક્રમાંક ક્રમાંક. તમે {3} પ્રદાન કરેલ છે
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,પંક્તિ {0}: {1} વસ્તુ {2} માટે આવશ્યક ક્રમાંક ક્રમાંક. તમે {3} પ્રદાન કરેલ છે
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,કોષ્ટક પસંદ કરો
 DocType: BOM,Website Specifications,વેબસાઇટ તરફથી
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} &#39;પ્રાપ્તકર્તાઓ&#39; માં અયોગ્ય ઇમેઇલ સરનામું છે
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} &#39;પ્રાપ્તકર્તાઓ&#39; માં અયોગ્ય ઇમેઇલ સરનામું છે
 DocType: Special Test Items,Particulars,વિગત
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,એન્ટીબાયોટિક
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: પ્રતિ {0} પ્રકારની {1}
@@ -881,11 +897,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,રો {0}: રૂપાંતર ફેક્ટર ફરજિયાત છે
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","મલ્ટીપલ ભાવ નિયમો જ માપદંડ સાથે અસ્તિત્વ ધરાવે છે, અગ્રતા સોંપણી દ્વારા તકરાર ઉકેલવા કરો. ભાવ નિયમો: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,"નિષ્ક્રિય અથવા તે અન્ય BOMs સાથે કડી થયેલ છે, કારણ કે BOM રદ કરી શકાતી નથી"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,"નિષ્ક્રિય અથવા તે અન્ય BOMs સાથે કડી થયેલ છે, કારણ કે BOM રદ કરી શકાતી નથી"
 DocType: Opportunity,Maintenance,જાળવણી
 DocType: Item Attribute Value,Item Attribute Value,વસ્તુ કિંમત એટ્રીબ્યુટ
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,વેચાણ ઝુંબેશ.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Timesheet બનાવો
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Timesheet બનાવો
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -923,16 +939,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,પ્રથમ વસ્તુ દાખલ કરો
 DocType: Account,Liability,જવાબદારી
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,મંજુર રકમ રો દાવો રકમ કરતાં વધારે ન હોઈ શકે {0}.
+DocType: Salary Detail,Do not include in total,કુલમાં શામેલ કરશો નહીં
 DocType: Company,Default Cost of Goods Sold Account,ચીજવસ્તુઓનું વેચાણ એકાઉન્ટ મૂળભૂત કિંમત
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,ભાવ યાદી પસંદ નહી
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,ભાવ યાદી પસંદ નહી
 DocType: Employee,Family Background,કૌટુંબિક પૃષ્ઠભૂમિ
 DocType: Request for Quotation Supplier,Send Email,ઇમેઇલ મોકલો
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},ચેતવણી: અમાન્ય જોડાણ {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,પરવાનગી નથી
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},ચેતવણી: અમાન્ય જોડાણ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,પરવાનગી નથી
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,ભાવની વિનંતી કરી
 DocType: Vital Signs,Heart Rate / Pulse,હાર્ટ રેટ / પલ્સ
 DocType: Company,Default Bank Account,મૂળભૂત બેન્ક એકાઉન્ટ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","પાર્ટી પર આધારિત ફિલ્ટર કરવા માટે, પસંદ પાર્ટી પ્રથમ પ્રકાર"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},વસ્તુઓ મારફતે પહોંચાડાય નથી કારણ કે &#39;સુધારા સ્ટોક&#39; તપાસી શકાતું નથી {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'અદ્યતન સ્ટોક' ચેક ના કરી શકાય કારણ કે વસ્તુઓ {0}મારફતે વિતરિત કરેલ નથી
 DocType: Vehicle,Acquisition Date,સંપાદન તારીખ
 apps/erpnext/erpnext/utilities/user_progress.py +125,Nos,અમે
 DocType: Item,Items with higher weightage will be shown higher,ઉચ્ચ ભારાંક સાથે વસ્તુઓ વધારે બતાવવામાં આવશે
@@ -955,12 +973,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,વસ્તુ રો {IDX}: {Doctype} {DOCNAME} ઉપર અસ્તિત્વમાં નથી &#39;{Doctype}&#39; ટેબલ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} પહેલેથી જ પૂર્ણ અથવા રદ થયેલ છે
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,કોઈ કાર્યો
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ઓટો ભરતિયું 05, 28 વગેરે દા.ત. પેદા થશે કે જેના પર મહિનાનો દિવસ"
 DocType: Item Variant Settings,Copy Fields to Variant,ફીલ્ડ્સ ટુ વેરિએન્ટને કૉપિ કરો
 DocType: Asset,Opening Accumulated Depreciation,ખુલવાનો સંચિત અવમૂલ્યન
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,કુલ સ્કોર 5 કરતાં ઓછી અથવા સમાન હોવા જ જોઈએ
 DocType: Program Enrollment Tool,Program Enrollment Tool,કાર્યક્રમ પ્રવેશ સાધન
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,સી-ફોર્મ રેકોર્ડ
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,સી-ફોર્મ રેકોર્ડ
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,ગ્રાહક અને સપ્લાયર
 DocType: Email Digest,Email Digest Settings,ઇમેઇલ ડાયજેસ્ટ સેટિંગ્સ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,તમારા વ્યવસાય માટે આભાર!
@@ -978,13 +995,13 @@
 DocType: Request for Quotation Supplier,Quote Status,ભાવ સ્થિતિ
 DocType: Maintenance Visit,Completion Status,પૂર્ણ સ્થિતિ
 DocType: HR Settings,Enter retirement age in years,વર્ષમાં નિવૃત્તિ વય દાખલ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,લક્ષ્યાંક વેરહાઉસ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,કૃપા કરીને એક વેરહાઉસ પસંદ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,લક્ષ્યાંક વેરહાઉસ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,કૃપા કરીને એક વેરહાઉસ પસંદ
 DocType: Cheque Print Template,Starting location from left edge,ડાબી ધાર થી સ્થાન શરૂ કરી રહ્યા છીએ
 DocType: Item,Allow over delivery or receipt upto this percent,આ ટકા સુધી ડિલિવરી અથવા રસીદ પર પરવાનગી આપે છે
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,આયાત એટેન્ડન્સ
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,બધા આઇટમ જૂથો
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,બધા આઇટમ જૂથો
 DocType: Process Payroll,Activity Log,પ્રવૃત્તિ લોગ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,ચોખ્ખો નફો / નુકશાન
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,આપમેળે વ્યવહારો સબમિશન પર સંદેશ કંપોઝ.
@@ -996,8 +1013,9 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,અંદાજિત Qty
 DocType: Sales Invoice,Payment Due Date,ચુકવણી કારણે તારીખ
 DocType: Drug Prescription,Interval UOM,અંતરાલ UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,વસ્તુ વેરિએન્ટ {0} પહેલાથી જ લક્ષણો સાથે હાજર
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;ખુલી&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,વસ્તુ વેરિએન્ટ {0} પહેલાથી જ લક્ષણો સાથે હાજર
+DocType: Item,Hub Publishing Details,હબ પબ્લિશિંગ વિગતો
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening','શરૂઆત'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,આવું કરવા માટે ઓપન
 DocType: Notification Control,Delivery Note Message,ડ લવર નોંધ સંદેશ
 DocType: Lab Test Template,Result Format,પરિણામ ફોર્મેટ
@@ -1016,10 +1034,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: કાચો માલ મુખ્ય વસ્તુ જેટલું જ હોઈ શકતું નથી
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ખરીદી રસીદ વસ્તુઓ ટેબલ કુલ લાગુ ખર્ચ કુલ કર અને ખર્ચ તરીકે જ હોવી જોઈએ
 DocType: Sales Team,Incentives,ઇનસેન્ટીવ્સ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,હબ માટે નોંધણી કરો
 DocType: SMS Log,Requested Numbers,વિનંતી નંબર્સ
 DocType: Production Planning Tool,Only Obtain Raw Materials,માત્ર મેળવો કાચો માલ
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,કામગીરી મૂલ્યાંકન.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","સક્રિય, &#39;શોપિંગ કાર્ટ માટે ઉપયોગ&#39; શોપિંગ કાર્ટ તરીકે સક્રિય છે અને શોપિંગ કાર્ટ માટે ઓછામાં ઓછી એક કર નિયમ ત્યાં પ્રયત્ન કરીશું"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","સક્રિય, &#39;શોપિંગ કાર્ટ માટે ઉપયોગ&#39; શોપિંગ કાર્ટ તરીકે સક્રિય છે અને શોપિંગ કાર્ટ માટે ઓછામાં ઓછી એક કર નિયમ ત્યાં પ્રયત્ન કરીશું"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ચુકવણી એન્ટ્રી {0} ઓર્ડર {1}, ચેક, તો તે આ બિલ અગાઉથી તરીકે ખેંચાય જોઇએ સામે કડી થયેલ છે."
 DocType: Sales Invoice Item,Stock Details,સ્ટોક વિગતો
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,પ્રોજેક્ટ ભાવ
@@ -1038,12 +1057,14 @@
 DocType: Salary Slip,Working Days,કાર્યદિવસ
 DocType: Serial No,Incoming Rate,ઇનકમિંગ દર
 DocType: Packing Slip,Gross Weight,સરેરાશ વજન
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,તમારી કંપનીના નામ કે જેના માટે તમે આ સિસ્ટમ સુયોજિત કરી રહ્યા હોય.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,હબ સક્ષમ કરો
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,તમારી કંપનીના નામ કે જેના માટે તમે આ સિસ્ટમ સુયોજિત કરી રહ્યા હોય.
 DocType: HR Settings,Include holidays in Total no. of Working Days,કોઈ કુલ રજાઓ સમાવેશ થાય છે. દિવસની
 DocType: Job Applicant,Hold,હોલ્ડ
 DocType: Employee,Date of Joining,જોડાયા તારીખ
 DocType: Naming Series,Update Series,સુધારા સિરીઝ
 DocType: Supplier Quotation,Is Subcontracted,Subcontracted છે
+DocType: Restaurant Table,Minimum Seating,ન્યુનત્તમ બેઠક
 DocType: Item Attribute,Item Attribute Values,વસ્તુ એટ્રીબ્યુટ મૂલ્યો
 DocType: Examination Result,Examination Result,પરીક્ષા પરિણામ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,ખરીદી રસીદ
@@ -1054,13 +1075,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},ઓપરેશન માટે આગામી {0} દિવસોમાં સમય સ્લોટ શોધવામાં અસમર્થ {1}
 DocType: Production Order,Plan material for sub-assemblies,પેટા-સ્થળોના માટે યોજના સામગ્રી
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,સેલ્સ પાર્ટનર્સ અને પ્રદેશ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} સક્રિય હોવા જ જોઈએ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} સક્રિય હોવા જ જોઈએ
 DocType: Journal Entry,Depreciation Entry,અવમૂલ્યન એન્ટ્રી
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,પ્રથમ દસ્તાવેજ પ્રકાર પસંદ કરો
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,આ જાળવણી મુલાકાત લો રદ રદ સામગ્રી મુલાકાત {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},સીરીયલ કોઈ {0} વસ્તુ ને અનુલક્ષતું નથી {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,જરૂરી Qty
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,હાલની વ્યવહાર સાથે વખારો ખાતાવહી રૂપાંતરિત કરી શકાય છે.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,હાલની વ્યવહાર સાથે વખારો ખાતાવહી રૂપાંતરિત કરી શકાય છે.
 DocType: Bank Reconciliation,Total Amount,કુલ રકમ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,ઈન્ટરનેટ પબ્લિશિંગ
 DocType: Prescription Duration,Number,સંખ્યા
@@ -1071,7 +1092,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,સેલ્સ ભાવ યાદી
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","જો ચકાસાયેલું હોય, તો ગ્રાહક બનાવશે, દર્દીને મેપ કરેલું. આ ગ્રાહક સામે પેશન્ટ ઇનવૉઇસેસ બનાવવામાં આવશે પેશન્ટ બનાવતી વખતે તમે હાલના ગ્રાહકોને પણ પસંદ કરી શકો છો"
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,વસ્તુઓ સુમેળ કરવા પ્રકાશિત
 DocType: Bank Reconciliation,Account Currency,એકાઉન્ટ કરન્સી
 DocType: Lab Test,Sample ID,નમૂના ID
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,કંપની રાઉન્ડ બંધ એકાઉન્ટ ઉલ્લેખ કરો
@@ -1080,11 +1100,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,{0} કર્મચારીનું સક્રિય નથી અથવા અસ્તિત્વમાં નથી
 DocType: Fee Structure,Components,ઘટકો
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},વસ્તુ દાખલ કરો એસેટ વર્ગ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,વસ્તુ ચલો {0} સુધારાશે
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,વસ્તુ ચલો {0} સુધારાશે
 DocType: Quality Inspection Reading,Reading 6,6 વાંચન
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,નથી {0} {1} {2} વગર કોઈપણ નકારાત્મક બાકી ભરતિયું કરી શકો છો
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","પેદા કરવા માટે જો વિલંબિત હોય, તો તમારે જાતે &quot;મહિનોના પુનરાવર્તન&quot; ની આ ફીલ્ડને બદલવા પડશે"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,નથી {0} {1} {2} વગર કોઈપણ નકારાત્મક બાકી ભરતિયું કરી શકો છો
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ભરતિયું એડવાન્સ ખરીદી
-DocType: Hub Settings,Sync Now,હવે સમન્વય
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},રો {0}: ક્રેડિટ પ્રવેશ સાથે લિંક કરી શકતા નથી {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,એક નાણાકીય વર્ષ માટે બજેટ વ્યાખ્યાયિત કરે છે.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,આ સ્થિતિમાં પસંદ થયેલ હોય ત્યારે ડિફૉલ્ટ બેન્ક / રોકડ એકાઉન્ટ આપોઆપ POS ભરતિયું અપડેટ કરવામાં આવશે.
@@ -1096,13 +1117,13 @@
 DocType: Item,Is Purchase Item,ખરીદી વસ્તુ છે
 DocType: Asset,Purchase Invoice,ખરીદી ભરતિયું
 DocType: Stock Ledger Entry,Voucher Detail No,વાઉચર વિગતવાર કોઈ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,ન્યૂ વેચાણ ભરતિયું
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,ન્યૂ વેચાણ ભરતિયું
 DocType: Stock Entry,Total Outgoing Value,કુલ આઉટગોઇંગ ભાવ
 DocType: Physician,Appointments,નિમણૂંક
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,તારીખ અને છેલ્લી તારીખ ખોલીને એકસરખું જ રાજવૃત્તીય વર્ષ અંદર હોવો જોઈએ
 DocType: Lead,Request for Information,માહિતી માટે વિનંતી
 ,LeaderBoard,લીડરબોર્ડ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,સમન્વય ઑફલાઇન ઇનવૉઇસેસ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,સમન્વય ઑફલાઇન ઇનવૉઇસેસ
 DocType: Payment Request,Paid,ચૂકવેલ
 DocType: Program Fee,Program Fee,કાર્યક્રમ ફી
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1121,11 +1142,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,ઓર્ડર વસ્તુ ખરીદી
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,પરોક્ષ આવક
 DocType: Student Attendance Tool,Student Attendance Tool,વિદ્યાર્થી એટેન્ડન્સ સાધન
+DocType: Restaurant Menu,Price List (Auto created),ભાવ સૂચિ (સ્વતઃ બનાવેલ)
 DocType: Cheque Print Template,Date Settings,તારીખ સેટિંગ્સ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,ફેરફાર
 ,Company Name,કંપની નું નામ
 DocType: SMS Center,Total Message(s),કુલ સંદેશ (ઓ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,ટ્રાન્સફર માટે પસંદ વસ્તુ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,ટ્રાન્સફર માટે પસંદ વસ્તુ
 DocType: Purchase Invoice,Additional Discount Percentage,વધારાના ડિસ્કાઉન્ટ ટકાવારી
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,તમામ મદદ વિડિઓઝ યાદી જુઓ
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ચેક જમા કરવામાં આવી હતી જ્યાં બેન્ક ઓફ પસંદ એકાઉન્ટ વડા.
@@ -1142,6 +1164,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,મીટર
 DocType: Workstation,Electricity Cost,વીજળી ખર્ચ
 DocType: HR Settings,Don't send Employee Birthday Reminders,કર્મચારીનું જન્મદિવસ રિમાઇન્ડર્સ મોકલશો નહીં
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,સેટિંગ્સ સાચવો
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,વિનંતી કરેલી પ્રોડક્ટ્સ
 DocType: Item,Inspection Criteria,નિરીક્ષણ માપદંડ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,ટ્રાન્સફર
 DocType: BOM Website Item,BOM Website Item,BOM વેબસાઇટ વસ્તુ
@@ -1158,11 +1182,11 @@
 DocType: Journal Entry,Total Amount in Words,શબ્દો કુલ રકમ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,એક ભૂલ આવી હતી. એક સંભવિત કારણ શું તમે ફોર્મ સાચવવામાં ન હોય કે હોઈ શકે છે. જો સમસ્યા યથાવત રહે તો support@erpnext.com સંપર્ક કરો.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,મારા કાર્ટ
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},ઓર્ડર પ્રકાર એક હોવા જ જોઈએ {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},ઓર્ડર પ્રકાર એક હોવા જ જોઈએ {0}
 DocType: Lead,Next Contact Date,આગામી સંપર્ક તારીખ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Qty ખુલવાનો
 DocType: Healthcare Settings,Appointment Reminder,નિમણૂંક રીમાઇન્ડર
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,જથ્થો બદલી માટે એકાઉન્ટ દાખલ કરો
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,જથ્થો બદલી માટે એકાઉન્ટ દાખલ કરો
 DocType: Student Batch Name,Student Batch Name,વિદ્યાર્થી બેચ નામ
 DocType: Consultation,Doctor,ડોક્ટર
 DocType: Holiday List,Holiday List Name,રજા યાદી નામ
@@ -1170,12 +1194,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,સૂચિ કોર્સ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,સ્ટોક ઓપ્શન્સ
 DocType: Journal Entry Account,Expense Claim,ખર્ચ દાવો
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,શું તમે ખરેખર આ પડયો એસેટ પુનઃસ્થાપિત કરવા માંગો છો?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},માટે Qty {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,શું તમે ખરેખર આ પડયો એસેટ પુનઃસ્થાપિત કરવા માંગો છો?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},માટે Qty {0}
 DocType: Leave Application,Leave Application,રજા અરજી
 DocType: Patient,Patient Relation,પેશન્ટ રિલેશન
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,ફાળવણી સાધન મૂકો
+DocType: Item,Hub Category to Publish,પ્રકાશિત હબ શ્રેણી
 DocType: Leave Block List,Leave Block List Dates,બ્લોક યાદી તારીખો છોડો
+DocType: Sales Invoice,Billing Address GSTIN,બિલિંગ સરનામું GSTIN
 DocType: Workstation,Net Hour Rate,નેટ કલાક દર
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,ઉતારેલ માલની કિંમત ખરીદી રસીદ
 DocType: Company,Default Terms,મૂળભૂત શરતો
@@ -1185,18 +1211,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},ઉલ્લેખ કરો એક {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,જથ્થો અથવા કિંમત કોઈ ફેરફાર સાથે દૂર વસ્તુઓ.
 DocType: Delivery Note,Delivery To,ડ લવર
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,એટ્રીબ્યુટ ટેબલ ફરજિયાત છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,એટ્રીબ્યુટ ટેબલ ફરજિયાત છે
 DocType: Production Planning Tool,Get Sales Orders,વેચાણ ઓર્ડર મેળવો
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} નકારાત્મક ન હોઈ શકે
 DocType: Training Event,Self-Study,સ્વ-અભ્યાસ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,ડિસ્કાઉન્ટ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,ડિસ્કાઉન્ટ
 DocType: Asset,Total Number of Depreciations,કુલ Depreciations સંખ્યા
 DocType: Sales Invoice Item,Rate With Margin,માર્જિનથી દર
 DocType: Workstation,Wages,વેતન
 DocType: Task,Urgent,અર્જન્ટ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},ટેબલ પંક્તિ {0} માટે માન્ય રો ને સ્પષ્ટ કરો {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,ચલ શોધવામાં અસમર્થ:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,નમપૅડમાંથી સંપાદિત કરવા માટે કૃપા કરીને ફીલ્ડ પસંદ કરો
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,નમપૅડમાંથી સંપાદિત કરવા માટે કૃપા કરીને ફીલ્ડ પસંદ કરો
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,ડેસ્કટોપ પર જાઓ અને ERPNext ઉપયોગ શરૂ
 DocType: Item,Manufacturer,ઉત્પાદક
 DocType: Landed Cost Item,Purchase Receipt Item,ખરીદી રસીદ વસ્તુ
@@ -1227,8 +1253,8 @@
 DocType: GL Entry,Against,સામે
 DocType: Item,Default Selling Cost Center,મૂળભૂત વેચાણ ખર્ચ કેન્દ્ર
 DocType: Sales Partner,Implementation Partner,અમલીકરણ જીવનસાથી
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,પિન કોડ
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},વેચાણ ઓર્ડર {0} છે {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,પિન કોડ
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},વેચાણ ઓર્ડર {0} છે {1}
 DocType: Opportunity,Contact Info,સંપર્ક માહિતી
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,સ્ટોક પ્રવેશો બનાવે
 DocType: Packing Slip,Net Weight UOM,નેટ વજન UOM
@@ -1239,6 +1265,7 @@
 DocType: Holiday List,Get Weekly Off Dates,અઠવાડિક બંધ તારીખો મેળવો
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,સમાપ્તિ તારીખ પ્રારંભ તારીખ કરતાં ઓછા ન હોઈ શકે
 DocType: Sales Person,Select company name first.,પ્રથમ પસંદ કંપની નામ.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,નિમ્ન થી હાઇ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,સુવાકયો સપ્લાયરો પાસેથી પ્રાપ્ત થઈ છે.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOM ને બદલો અને તમામ BOM માં નવીનતમ ભાવ અપડેટ કરો
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},માટે {0} | {1} {2}
@@ -1257,7 +1284,7 @@
 DocType: Program Enrollment,Transportation,ટ્રાન્સપોર્ટેશન
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,અમાન્ય એટ્રીબ્યુટ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} સબમિટ હોવું જ જોઈએ
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},જથ્થો કરતાં ઓછી અથવા સમાન હોવા જ જોઈએ {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},જથ્થો કરતાં ઓછી અથવા સમાન હોવા જ જોઈએ {0}
 DocType: SMS Center,Total Characters,કુલ અક્ષરો
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},વસ્તુ માટે BOM ક્ષેત્રમાં BOM પસંદ કરો {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,સી-ફોર્મ ભરતિયું વિગતવાર
@@ -1272,7 +1299,7 @@
 ,Ordered Items To Be Billed,આદેશ આપ્યો વસ્તુઓ બિલ કરવા
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,રેન્જ ઓછી હોઈ શકે છે કરતાં શ્રેણી
 DocType: Global Defaults,Global Defaults,વૈશ્વિક ડિફૉલ્ટ્સ
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,પ્રોજેક્ટ સહયોગ આમંત્રણ
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,પ્રોજેક્ટ સહયોગ આમંત્રણ
 DocType: Salary Slip,Deductions,કપાત
 DocType: Leave Allocation,LAL/,લાલ /
 DocType: Setup Progress Action,Action Name,ક્રિયા નામ
@@ -1290,13 +1317,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,સેલ્સ ભરતિયું એડવાન્સ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,કંઈ વિનંતી કરવા
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},અન્ય બજેટ રેકોર્ડ &#39;{0}&#39; પહેલાથી જ સામે અસ્તિત્વમાં {1} &#39;{2}&#39; નાણાકીય વર્ષ માટે {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&#39;વાસ્તવિક પ્રારંભ તારીખ&#39; &#39;વાસ્તવિક ઓવરને તારીખ&#39; કરતાં વધારે ન હોઈ શકે
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','વાસ્તવિક શરૂઆત તારીખ' ’વાસ્તવિક અંતિમ તારીખ’ કરતાં વધારે ન હોઈ શકે
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,મેનેજમેન્ટ
 DocType: Cheque Print Template,Payer Settings,ચુકવણીકાર સેટિંગ્સ
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","આ ચલ વસ્તુ કોડ ઉમેરાવું કરવામાં આવશે. તમારા સંક્ષેપ &quot;શૌન&quot; છે, અને ઉદાહરણ તરીકે, જો આઇટમ કોડ &quot;ટી શર્ટ&quot;, &quot;ટી-શર્ટ શૌન&quot; હશે ચલ આઇટમ કોડ છે"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,તમે પગાર કાપલી સેવ વાર (શબ્દોમાં) નેટ પે દૃશ્યમાન થશે.
 DocType: Purchase Invoice,Is Return,વળતર છે
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,સાવધાન
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,સાવધાન
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,રીટર્ન / ડેબિટ નોટ
 DocType: Price List Country,Price List Country,ભાવ યાદી દેશ
 DocType: Item,UOMs,UOMs
@@ -1311,17 +1338,18 @@
 DocType: Account,Balance Sheet,સરવૈયા
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',&#39;આઇટમ કોડ સાથે આઇટમ માટે કેન્દ્ર ખર્ચ
 DocType: Fee Validity,Valid Till,સુધી માન્ય
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ચુકવણી સ્થિતિ રૂપરેખાંકિત થયેલ નથી. કૃપા કરીને તપાસો, કે શું એકાઉન્ટ ચૂકવણી સ્થિતિ પર અથવા POS પ્રોફાઇલ પર સેટ કરવામાં આવ્યો છે."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ચુકવણી સ્થિતિ રૂપરેખાંકિત થયેલ નથી. કૃપા કરીને તપાસો, કે શું એકાઉન્ટ ચૂકવણી સ્થિતિ પર અથવા POS પ્રોફાઇલ પર સેટ કરવામાં આવ્યો છે."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,એ જ વસ્તુ ઘણી વખત દાખલ કરી શકાતી નથી.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","વધુ એકાઉન્ટ્સ જૂથો હેઠળ કરી શકાય છે, પરંતુ પ્રવેશો બિન-જૂથો સામે કરી શકાય છે"
 DocType: Lead,Lead,લીડ
 DocType: Email Digest,Payables,ચૂકવણીના
 DocType: Course,Course Intro,કોર્સ પ્રસ્તાવના
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,સ્ટોક એન્ટ્રી {0} બનાવવામાં
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,કૃપા કરીને સેટઅપ&gt; ક્રમાંકન શ્રેણી દ્વારા હાજરી માટે શ્રેણી ક્રમાંક સેટ કરો
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,સ્ટોક એન્ટ્રી {0} બનાવવામાં
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,ROW # {0}: Qty ખરીદી રીટર્ન દાખલ કરી શકાતા નથી નકારેલું
 ,Purchase Order Items To Be Billed,ખરીદી ક્રમમાં વસ્તુઓ બિલ કરવા
 DocType: Purchase Invoice Item,Net Rate,નેટ દર
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,ગ્રાહકને પસંદ કરો
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,ગ્રાહકને પસંદ કરો
 DocType: Purchase Invoice Item,Purchase Invoice Item,ભરતિયું આઇટમ ખરીદી
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,સ્ટોક ખાતાવહી પ્રવેશો અને ઓપનજીએલ પ્રવેશો પસંદ કરેલ ખરીદી રસીદો માટે પોસ્ટ કર્યું છે
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,વસ્તુ 1
@@ -1340,7 +1368,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},સાથે નકલી પંક્તિ {0} જ {1}
 ,Trial Balance,ટ્રાયલ બેલેન્સ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,ફિસ્કલ વર્ષ {0} મળી નથી
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,કર્મચારીઓ સુયોજિત કરી રહ્યા છે
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,કર્મચારીઓ સુયોજિત કરી રહ્યા છે
 DocType: Sales Order,SO-,SO-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,પ્રથમ ઉપસર્ગ પસંદ કરો
 DocType: Employee,O-,ઓ-
@@ -1352,12 +1380,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,જુઓ ખાતાવહી
 DocType: Grading Scale,Intervals,અંતરાલો
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,જુનું
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","એક વસ્તુ ગ્રુપ જ નામ સાથે હાજર, આઇટમ નામ બદલવા અથવા વસ્તુ જૂથ નામ બદલી કૃપા કરીને"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","એક વસ્તુ ગ્રુપ જ નામ સાથે હાજર, આઇટમ નામ બદલવા અથવા વસ્તુ જૂથ નામ બદલી કૃપા કરીને"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,વિદ્યાર્થી મોબાઇલ નંબર
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,બાકીનું વિશ્વ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,બાકીનું વિશ્વ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,આ આઇટમ {0} બેચ હોઈ શકે નહિં
 ,Budget Variance Report,બજેટ ફેરફાર રિપોર્ટ
 DocType: Salary Slip,Gross Pay,કુલ પે
+DocType: Item,Is Item from Hub,હબથી આઇટમ છે
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,રો {0}: પ્રવૃત્તિ પ્રકાર ફરજિયાત છે.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,ડિવિડન્ડ ચૂકવેલ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,હિસાબી ખાતાવહી
@@ -1367,8 +1396,9 @@
 DocType: Vehicle Log,Service Detail,સેવા વિગતવાર
 DocType: BOM,Item Description,વસ્તુ વર્ણન
 DocType: Student Sibling,Student Sibling,વિદ્યાર્થી બહેન
-DocType: Purchase Invoice,Is Recurring,રીકરીંગ છે
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,ચુકવણી સ્થિતિ
 DocType: Purchase Invoice,Supplied Items,પૂરી પાડવામાં વસ્તુઓ
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},મહેરબાની કરીને રેસ્ટોરન્ટ માટે સક્રિય મેનુ સેટ કરો {0}
 DocType: Student,STUD.,સંવર્ધન.
 DocType: Production Order,Qty To Manufacture,ઉત્પાદન Qty
 DocType: Email Digest,New Income,નવી આવક
@@ -1378,6 +1408,7 @@
 ,Student and Guardian Contact Details,વિદ્યાર્થી અને વાલી સંપર્ક વિગતો
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,"રો {0}: સપ્લાયર માટે {0} ઇમેઇલ સરનામું, ઇમેઇલ મોકલવા માટે જરૂરી છે"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,કામચલાઉ ખુલી
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,હબ જુઓ
 ,Employee Leave Balance,કર્મચારી રજા બેલેન્સ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},એકાઉન્ટ માટે બેલેન્સ {0} હંમેશા હોવી જ જોઈએ {1}
 DocType: Patient Appointment,More Info,વધુ માહિતી
@@ -1397,13 +1428,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,વેચાણ ઓર્ડર {0} માન્ય નથી
 DocType: Supplier Scorecard,Warn for new Request for Quotations,સુવાકયો માટે નવી વિનંતી માટે ચેતવો
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,ખરીદી ઓર્ડર કરવાની યોજના ઘડી મદદ અને તમારી ખરીદી પર અનુસરો
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","માફ કરશો, કંપનીઓ મર્જ કરી શકાતા નથી"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","માફ કરશો, કંપનીઓ મર્જ કરી શકાતા નથી"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,લેબ ટેસ્ટ પ્રિસ્ક્રિપ્શન્સ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",કુલ અંક / ટ્રાન્સફર જથ્થો {0} સામગ્રી વિનંતી {1} \ વસ્તુ માટે વિનંતી જથ્થો {2} કરતાં વધારે ન હોઈ શકે {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,નાના
 DocType: Employee,Employee Number,કર્મચારીનું સંખ્યા
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},કેસ ના (ઓ) પહેલેથી જ વપરાશમાં છે. કેસ કોઈ થી પ્રયાસ {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},કેસ ના (ઓ) પહેલેથી જ વપરાશમાં છે. કેસ કોઈ થી પ્રયાસ {0}
 DocType: Project,% Completed,% પૂર્ણ
 ,Invoiced Amount (Exculsive Tax),ભરતિયું રકમ (Exculsive ટેક્સ)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,આઇટમ 2
@@ -1418,11 +1449,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,પરોક્ષ ખર્ચ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,રો {0}: Qty ફરજિયાત છે
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,કૃષિ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,સમન્વય માસ્ટર ડેટા
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,સમન્વય માસ્ટર ડેટા
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,તમારી ઉત્પાદનો અથવા સેવાઓ
 DocType: Special Test Items,Special Test Items,ખાસ ટેસ્ટ આઈટમ્સ
 DocType: Mode of Payment,Mode of Payment,ચૂકવણીની પદ્ધતિ
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,વેબસાઇટ છબી જાહેર ફાઈલ અથવા વેબસાઇટ URL હોવો જોઈએ
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,વેબસાઇટ છબી જાહેર ફાઈલ અથવા વેબસાઇટ URL હોવો જોઈએ
 DocType: Student Applicant,AP,એપી
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,આ રુટ વસ્તુ જૂથ છે અને સંપાદિત કરી શકાતી નથી.
@@ -1430,24 +1461,23 @@
 DocType: Vehicle,Fuel UOM,ફ્યુઅલ UOM
 DocType: Warehouse,Warehouse Contact Info,વેરહાઉસ સંપર્ક માહિતી
 DocType: Payment Entry,Write Off Difference Amount,માંડવાળ તફાવત રકમ
-DocType: Purchase Invoice,Recurring Type,રીકરીંગ પ્રકાર
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: કર્મચારીનું ઇમેઇલ મળી નથી, તેથી નથી મોકલવામાં ઇમેઇલ"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: કર્મચારીનું ઇમેઇલ મળી નથી, તેથી નથી મોકલવામાં ઇમેઇલ"
 DocType: Item,Foreign Trade Details,ફોરેન ટ્રેડ વિગતો
+,Assessment Plan Status,આકારણી યોજના સ્થિતિ
 DocType: Email Digest,Annual Income,વાર્ષિક આવક
 DocType: Serial No,Serial No Details,સીરીયલ કોઈ વિગતો
 DocType: Purchase Invoice Item,Item Tax Rate,વસ્તુ ટેક્સ રેટ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,કૃપા કરીને ફિઝિશિયન અને તારીખ પસંદ કરો
 DocType: Student Group Student,Group Roll Number,ગ્રુપ રોલ નંબર
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, માત્ર ક્રેડિટ ખાતાઓ અન્ય ડેબિટ પ્રવેશ સામે લિંક કરી શકો છો"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,બધા કાર્ય વજન કુલ પ્રયત્ન કરીશું 1. મુજબ બધા પ્રોજેક્ટ કાર્યો વજન સંતુલિત કૃપા કરીને
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,ડ લવર નોંધ {0} અપર્ણ ન કરાય
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,બધા કાર્ય વજન કુલ પ્રયત્ન કરીશું 1. મુજબ બધા પ્રોજેક્ટ કાર્યો વજન સંતુલિત કૃપા કરીને
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,ડ લવર નોંધ {0} અપર્ણ ન કરાય
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,વસ્તુ {0} એ પેટા કોન્ટ્રાક્ટ વસ્તુ જ હોવી જોઈએ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,કેપિટલ સાધનો
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","પ્રાઇસીંગ નિયમ પ્રથમ પર આધારિત પસંદ થયેલ વસ્તુ, આઇટમ ગ્રુપ અથવા બ્રાન્ડ બની શકે છે, જે ક્ષેત્ર &#39;પર લાગુ પડે છે."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,આઇટમ કોડને પહેલા સેટ કરો
-DocType: Hub Settings,Seller Website,વિક્રેતા વેબસાઇટ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,આઇટમ કોડને પહેલા સેટ કરો
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,વેચાણ ટીમ માટે કુલ ફાળવેલ ટકાવારી 100 પ્રયત્ન કરીશું
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,વેચાણ ટીમ માટે કુલ ફાળવેલ ટકાવારી 100 પ્રયત્ન કરીશું
 DocType: Sales Invoice Item,Edit Description,સંપાદિત કરો વર્ણન
 DocType: Antibiotic,Antibiotic,એન્ટીબાયોટિક
 ,Team Updates,ટીમ સુધારાઓ
@@ -1468,12 +1498,12 @@
 DocType: Purchase Invoice,Total (Company Currency),કુલ (કંપની ચલણ)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,{0} સીરીયલ નંબર એક કરતા વધુ વખત દાખલ
 DocType: Depreciation Schedule,Journal Entry,જર્નલ પ્રવેશ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} પ્રગતિ વસ્તુઓ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} પ્રગતિ વસ્તુઓ
 DocType: Workstation,Workstation Name,વર્કસ્ટેશન નામ
 DocType: Grading Scale Interval,Grade Code,ગ્રેડ કોડ
 DocType: POS Item Group,POS Item Group,POS વસ્તુ ગ્રુપ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ડાયજેસ્ટ ઇમેઇલ:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} વસ્તુ ને અનુલક્ષતું નથી {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} વસ્તુ ને અનુલક્ષતું નથી {1}
 DocType: Sales Partner,Target Distribution,લક્ષ્ય વિતરણની
 DocType: Salary Slip,Bank Account No.,બેન્ક એકાઉન્ટ નંબર
 DocType: Naming Series,This is the number of the last created transaction with this prefix,આ ઉપસર્ગ સાથે છેલ્લા બનાવવામાં વ્યવહાર સંખ્યા છે
@@ -1489,10 +1519,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,અવતરણ પુરવઠોકર્તા માટે વિનંતી
 DocType: Healthcare Settings,Registration Message,નોંધણી સંદેશ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,હાર્ડવેર
-DocType: Sales Order,Recurring Upto,રીકરીંગ સુધી
 DocType: Prescription Dosage,Prescription Dosage,પ્રિસ્ક્રિપ્શન ડોઝ
 DocType: Attendance,HR Manager,એચઆર મેનેજર
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,કંપની પસંદ કરો
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,કંપની પસંદ કરો
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,પ્રિવિલેજ છોડો
 DocType: Purchase Invoice,Supplier Invoice Date,પુરવઠોકર્તા ભરતિયું તારીખ
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,પ્રતિ
@@ -1508,10 +1537,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,વચ્ચે ઑવરલેપ શરતો:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,જર્નલ સામે એન્ટ્રી {0} પહેલેથી જ કેટલાક અન્ય વાઉચર સામે ગોઠવ્યો છે
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,કુલ ઓર્ડર ભાવ
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,ફૂડ
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,ફૂડ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,એઇજીંગનો રેન્જ 3
 DocType: Maintenance Schedule Item,No of Visits,મુલાકાત કોઈ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},જાળવણી સુનિશ્ચિત {0} સામે અસ્તિત્વમાં {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,શું તમે હબ પર તમારી આઇટમ્સ પ્રકાશિત કરવા માંગો છો?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,નોંધણી વિદ્યાર્થી
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},બંધ એકાઉન્ટ કરન્સી હોવા જ જોઈએ {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},બધા ગોલ માટે પોઈન્ટ રકમ તે 100 હોવું જોઈએ {0}
@@ -1522,9 +1552,9 @@
 DocType: Authorization Rule,Average Discount,સરેરાશ ડિસ્કાઉન્ટ
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,ઉપયોગીતાઓ
-DocType: Purchase Invoice Item,Accounting,હિસાબી
+DocType: POS Profile,Accounting,હિસાબી
 DocType: Employee,EMP/,પયાર્વરણીય /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,બેચ આઇટમ માટે બૅચેસ પસંદ કરો
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,બેચ આઇટમ માટે બૅચેસ પસંદ કરો
 DocType: Asset,Depreciation Schedules,અવમૂલ્યન શેડ્યુલ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,એપ્લિકેશન સમયગાળાની બહાર રજા ફાળવણી સમય ન હોઈ શકે
 DocType: Activity Cost,Projects,પ્રોજેક્ટ્સ
@@ -1540,7 +1570,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',મંજૂરી પરિસ્થિતિ &#39;માન્ય&#39; અથવા &#39;નકારેલું&#39; હોવું જ જોઈએ
 DocType: Physician,Contacts and Address,સંપર્કો અને સરનામું
 DocType: Purchase Invoice,Contact Person,સંપર્ક વ્યક્તિ
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&#39;અપેક્ષા પ્રારંભ તારીખ&#39; કરતાં વધારે &#39;અપેક્ષિત ઓવરને તારીખ&#39; ન હોઈ શકે
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','અપેક્ષિત શરૂઆત તારીખ' કરતાં 'અપેક્ષિત અંતિમ તારીખ' વધારે ન હોઈ શકે
 DocType: Course Scheduling Tool,Course End Date,કોર્સ સમાપ્તિ તારીખ
 DocType: Holiday List,Holidays,રજાઓ
 DocType: Sales Order Item,Planned Quantity,આયોજિત જથ્થો
@@ -1548,10 +1578,11 @@
 DocType: Item,Maintain Stock,સ્ટોક જાળવો
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,પહેલેથી જ ઉત્પાદન ઓર્ડર માટે બનાવવામાં સ્ટોક પ્રવેશો
 DocType: Employee,Prefered Email,prefered ઇમેઇલ
+DocType: Student Admission,Eligibility and Details,લાયકાત અને વિગતો
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,સ્થિર એસેટ કુલ ફેરફાર
 DocType: Leave Control Panel,Leave blank if considered for all designations,બધા ડેઝીગ્નેશન્સ માટે વિચારણા તો ખાલી છોડી દો
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,પ્રકાર &#39;વાસ્તવિક&#39; પંક્તિ માં ચાર્જ {0} આઇટમ રેટ સમાવેશ કરવામાં નથી કરી શકો છો
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},મહત્તમ: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},મહત્તમ: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,તારીખ સમય પ્રતિ
 DocType: Email Digest,For Company,કંપની માટે
 apps/erpnext/erpnext/config/support.py +17,Communication log.,કોમ્યુનિકેશન લોગ.
@@ -1559,19 +1590,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,સપ્લાયર સ્કોરકાર્ડ સ્કોરિંગ વેરિયેબલ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,ખરીદી રકમ
 DocType: Sales Invoice,Shipping Address Name,શિપિંગ સરનામું નામ
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,એકાઉન્ટ્સ ઓફ ચાર્ટ
 DocType: Material Request,Terms and Conditions Content,નિયમો અને શરતો સામગ્રી
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,100 કરતા વધારે ન હોઈ શકે
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,{0} વસ્તુ સ્ટોક વસ્તુ નથી
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,{0} વસ્તુ સ્ટોક વસ્તુ નથી
 DocType: Maintenance Visit,Unscheduled,અનિશ્ચિત
 DocType: Employee,Owned,માલિકીની
 DocType: Salary Detail,Depends on Leave Without Pay,પગાર વિના રજા પર આધાર રાખે છે
 DocType: Pricing Rule,"Higher the number, higher the priority","ઉચ્ચ સંખ્યા, ઉચ્ચ અગ્રતા"
 ,Purchase Invoice Trends,ભરતિયું પ્રવાહો ખરીદી
 DocType: Employee,Better Prospects,સારી સંભાવના
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","રો # {0}: બેચ {1} માત્ર {2} Qty છે. કૃપા કરીને બીજી બેચ જે {3} Qty ઉપલબ્ધ છે પસંદ કરો અથવા બહુવિધ પંક્તિઓ માં પંક્તિ પડ્યા, બહુવિધ બૅચેસ થી પહોંચાડવા / મુદ્દાને"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","રો # {0}: બેચ {1} માત્ર {2} Qty છે. કૃપા કરીને બીજી બેચ જે {3} Qty ઉપલબ્ધ છે પસંદ કરો અથવા બહુવિધ પંક્તિઓ માં પંક્તિ પડ્યા, બહુવિધ બૅચેસ થી પહોંચાડવા / મુદ્દાને"
 DocType: Vehicle,License Plate,લાઇસન્સ પ્લેટ
 DocType: Appraisal,Goals,લક્ષ્યાંક
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,POS પ્રોફાઇલ પસંદ કરો
 DocType: Warranty Claim,Warranty / AMC Status,વોરંટી / એએમસી સ્થિતિ
 ,Accounts Browser,એકાઉન્ટ્સ બ્રાઉઝર
 DocType: Payment Entry Reference,Payment Entry Reference,ચુકવણી એન્ટ્રી સંદર્ભ
@@ -1589,7 +1620,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,કર્મચારીનું પોતાની જાતને જાણ કરી શકો છો.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","એકાઉન્ટ સ્થિર છે, તો પ્રવેશો પ્રતિબંધિત વપરાશકર્તાઓ માટે માન્ય છે."
 DocType: Email Digest,Bank Balance,બેંક બેલેન્સ
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} માત્ર ચલણ કરી શકાય છે: {0} માટે એકાઉન્ટિંગ એન્ટ્રી {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} માત્ર ચલણ કરી શકાય છે: {0} માટે એકાઉન્ટિંગ એન્ટ્રી {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","જોબ પ્રોફાઇલ, યોગ્યતાઓ જરૂરી વગેરે"
 DocType: Journal Entry Account,Account Balance,એકાઉન્ટ બેલેન્સ
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,વ્યવહારો માટે કરવેરા નિયમ.
@@ -1598,8 +1629,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),કુલ કર અને ખર્ચ (કંપની ચલણ)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,unclosed નાણાકીય વર્ષના પી એન્ડ એલ બેલેન્સ બતાવો
 DocType: Lab Test Template,Collection Details,સંગ્રહ વિગતો
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","પસંદ કરો cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date માંથી ટેબ કોન્સેપ્શન ct, `ટેબલાબ પ્રિસ્ક્રિપ્શન` cp જ્યાં ct.patient = &#39;{0}&#39; અને cp.parent = ct. નામ અને cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,શીપીંગ એકાઉન્ટ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: એકાઉન્ટ {2} નિષ્ક્રિય છે
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,વેચાણ ઓર્ડર તમે તમારા કામ કરવાની યોજના કરવામાં મદદ અને સમય પહોંચાડવા બનાવે
@@ -1616,7 +1645,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,પેકિંગ કાપલી
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,ઓફિસ ભાડે
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,સેટઅપ એસએમએસ ગેટવે સેટિંગ્સ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,આયાત નિષ્ફળ!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,આયાત નિષ્ફળ!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,કોઈ સરનામું હજુ સુધી ઉમેર્યું.
 DocType: Workstation Working Hour,Workstation Working Hour,વર્કસ્ટેશન કામ કલાક
 DocType: Vital Signs,Blood Pressure,લોહિનુ દબાણ
@@ -1641,7 +1670,7 @@
 DocType: Sales Invoice,Source,સોર્સ
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,બતાવો બંધ
 DocType: Leave Type,Is Leave Without Pay,પગાર વિના છોડી દો
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,એસેટ વર્ગ સ્થિર એસેટ આઇટમ માટે ફરજિયાત છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,એસેટ વર્ગ સ્થિર એસેટ આઇટમ માટે ફરજિયાત છે
 DocType: Fee Validity,Fee Validity,ફી માન્યતા
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,આ ચુકવણી ટેબલ માં શોધી કોઈ રેકોર્ડ
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},આ {0} સાથે તકરાર {1} માટે {2} {3}
@@ -1662,8 +1691,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,એક્ઝિક્યુટિવ સર્ચ
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,લીડ્સ બનાવો
 DocType: Maintenance Schedule,Schedules,ફ્લાઈટ શેડ્યુલ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,પીઓસ પ્રોફાઇલને પોઈન્ટ ઓફ સેલનો ઉપયોગ કરવો જરૂરી છે
 DocType: Purchase Invoice Item,Net Amount,ચોખ્ખી રકમ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} સબમિટ કરવામાં આવી નથી જેથી ક્રિયા પૂર્ણ કરી શકાતી નથી
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} સબમિટ કરવામાં આવી નથી જેથી ક્રિયા પૂર્ણ કરી શકાતી નથી
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM વિગતવાર કોઈ
 DocType: Landed Cost Voucher,Additional Charges,વધારાના ખર્ચ
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),વધારાના ડિસ્કાઉન્ટ રકમ (કંપની ચલણ)
@@ -1672,7 +1702,7 @@
 ,Support Hour Distribution,આધાર કલાક વિતરણ
 DocType: Maintenance Visit,Maintenance Visit,જાળવણી મુલાકાત લો
 DocType: Student,Leaving Certificate Number,છોડ્યાનું પ્રમાણપત્ર નંબર
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","નિમણૂંક રદ કરવામાં આવી, કૃપા કરીને ઇન્વૉઇસની સમીક્ષા અને રદ કરો {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","નિમણૂંક રદ કરવામાં આવી, કૃપા કરીને ઇન્વૉઇસની સમીક્ષા અને રદ કરો {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,વેરહાઉસ ખાતે ઉપલબ્ધ બેચ Qty
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,સુધારા પ્રિન્ટ ફોર્મેટ
 DocType: Landed Cost Voucher,Landed Cost Help,ઉતારેલ માલની કિંમત મદદ
@@ -1695,8 +1725,8 @@
 DocType: Patient,Tobacco Past Use,તમાકુ ભૂતકાળનો ઉપયોગ
 DocType: Sales Invoice Item,Brand Name,બ્રાન્ડ નામ
 DocType: Purchase Receipt,Transporter Details,ટ્રાન્સપોર્ટર વિગતો
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},વપરાશકર્તા {0} પહેલેથી ફિઝિશિયનને સોંપેલ છે {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,મૂળભૂત વેરહાઉસ પસંદ આઇટમ માટે જરૂરી છે
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},વપરાશકર્તા {0} પહેલેથી ફિઝિશિયનને સોંપેલ છે {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,મૂળભૂત વેરહાઉસ પસંદ આઇટમ માટે જરૂરી છે
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,બોક્સ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,શક્ય પુરવઠોકર્તા
 DocType: Budget,Monthly Distribution,માસિક વિતરણ
@@ -1706,7 +1736,7 @@
 DocType: Sales Partner,Sales Partner Target,વેચાણ ભાગીદાર લક્ષ્યાંક
 DocType: Loan Type,Maximum Loan Amount,મહત્તમ લોન રકમ
 DocType: Pricing Rule,Pricing Rule,પ્રાઇસીંગ નિયમ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},વિદ્યાર્થી માટે ડુપ્લિકેટ રોલ નંબર {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},વિદ્યાર્થી માટે ડુપ્લિકેટ રોલ નંબર {0}
 DocType: Budget,Action if Annual Budget Exceeded,જો વાર્ષિક બજેટ વટાવી ક્રિયા
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,ઓર્ડર ખરીદી સામગ્રી વિનંતી
 DocType: Shopping Cart Settings,Payment Success URL,ચુકવણી સફળતા URL
@@ -1723,7 +1753,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} માત્ર એક જ વાર દેખાય જ જોઈએ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},વધુ tranfer માટે મંજૂરી નથી {0} કરતાં {1} ખરીદી ઓર્ડર સામે {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},માટે સફળતાપૂર્વક સોંપાયેલ પાંદડાઓ {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,કોઈ વસ્તુઓ પૅક કરવા માટે
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,કોઈ વસ્તુઓ પૅક કરવા માટે
 DocType: Shipping Rule Condition,From Value,ભાવ પ્રતિ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,ઉત્પાદન જથ્થો ફરજિયાત છે
 DocType: Employee Loan,Repayment Method,ચુકવણી પદ્ધતિ
@@ -1737,6 +1767,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,સ્ટોક જવાબદારીઓ
 DocType: Purchase Invoice,Supplier Warehouse,પુરવઠોકર્તા વેરહાઉસ
 DocType: Opportunity,Contact Mobile No,સંપર્ક મોબાઈલ નં
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,કંપની પસંદ કરો
 ,Material Requests for which Supplier Quotations are not created,"પુરવઠોકર્તા સુવાકયો બનાવવામાં આવે છે, જેના માટે સામગ્રી અરજીઓ"
 DocType: Student Group,Set 0 for no limit,કોઈ મર્યાદા માટે 0 સેટ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,તમે રજા માટે અરજી છે કે જેના પર દિવસ (ઓ) રજાઓ છે. તમે રજા માટે અરજી જરૂર નથી.
@@ -1746,24 +1777,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,અવતરણ બનાવો
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,અન્ય અહેવાલો
 DocType: Dependent Task,Dependent Task,આશ્રિત ટાસ્ક
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},માપવા એકમ મૂળભૂત માટે રૂપાંતર પરિબળ પંક્તિ માં 1 હોવા જ જોઈએ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},માપવા એકમ મૂળભૂત માટે રૂપાંતર પરિબળ પંક્તિ માં 1 હોવા જ જોઈએ {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},પ્રકાર રજા {0} કરતાં લાંબા સમય સુધી ન હોઈ શકે {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,અગાઉથી X દિવસ માટે કામગીરી આયોજન કરવાનો પ્રયાસ કરો.
 DocType: HR Settings,Stop Birthday Reminders,સ્ટોપ જન્મદિવસ રિમાઇન્ડર્સ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},કંપની મૂળભૂત પગારપત્રક ચૂકવવાપાત્ર એકાઉન્ટ સેટ કૃપા કરીને {0}
 DocType: SMS Center,Receiver List,રીસીવર યાદી
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,શોધ વસ્તુ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,શોધ વસ્તુ
 DocType: Patient Appointment,Referring Physician,ઉલ્લેખ ફિઝિશિયન
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,કમ્પોનન્ટ રકમ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,કેશ કુલ ફેરફાર
 DocType: Assessment Plan,Grading Scale,ગ્રેડીંગ સ્કેલ
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,મેઝર {0} એકમ રૂપાંતર ફેક્ટર ટેબલ એક કરતા વધુ વખત દાખલ કરવામાં આવી છે
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,પહેલેથી જ પૂર્ણ
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,મેઝર {0} એકમ રૂપાંતર ફેક્ટર ટેબલ એક કરતા વધુ વખત દાખલ કરવામાં આવી છે
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,પહેલેથી જ પૂર્ણ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,સ્ટોક હેન્ડ માં
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},ચુકવણી વિનંતી પહેલેથી હાજર જ છે {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,બહાર પાડેલી વસ્તુઓ કિંમત
 DocType: Physician,Hospital,હોસ્પિટલ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},જથ્થો કરતાં વધુ ન હોવું જોઈએ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},જથ્થો કરતાં વધુ ન હોવું જોઈએ {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,અગાઉના નાણાકીય વર્ષમાં બંધ છે
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),ઉંમર (દિવસ)
 DocType: Quotation Item,Quotation Item,અવતરણ વસ્તુ
@@ -1774,8 +1805,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,પુરવઠોકર્તા પ્રકાર માસ્ટર.
 DocType: Purchase Order Item,Supplier Part Number,પુરવઠોકર્તા ભાગ સંખ્યા
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,રૂપાંતરણ દર 0 અથવા 1 હોઇ શકે છે નથી કરી શકો છો
-DocType: Sales Invoice,Reference Document,સંદર્ભ દસ્તાવેજ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} રદ અથવા બંધ છે
+DocType: Subscription,Reference Document,સંદર્ભ દસ્તાવેજ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} રદ અથવા બંધ છે
 DocType: Accounts Settings,Credit Controller,ક્રેડિટ કંટ્રોલર
 DocType: Delivery Note,Vehicle Dispatch Date,વાહન રવાનગી તારીખ
 DocType: Healthcare Settings,Default Medical Code Standard,ડિફોલ્ટ મેડિકલ કોડ સ્ટાન્ડર્ડ
@@ -1784,6 +1815,7 @@
 DocType: Company,Default Payable Account,મૂળભૂત ચૂકવવાપાત્ર એકાઉન્ટ
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","આવા શીપીંગ નિયમો, ભાવ યાદી વગેરે શોપિંગ કાર્ટ માટે સુયોજનો"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% ગણાવી
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,ભાવ દ્વારા સૉર્ટ કરો ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,સુરક્ષિત Qty
 DocType: Party Account,Party Account,પક્ષ એકાઉન્ટ
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,માનવ સંસાધન
@@ -1795,13 +1827,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,વહેંચણી એન્ટ્રી બનાવો
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,રો {0}: પુરવઠોકર્તા સામે એડવાન્સ ડેબિટ હોવું જ જોઈએ
 DocType: Company,Default Values,મૂળભૂત મૂલ્યો
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{આવર્તન} ડાયજેસ્ટ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{આવર્તન} ડાયજેસ્ટ
 DocType: Expense Claim,Total Amount Reimbursed,કુલ રકમ reimbursed
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,આ વાહન સામે લોગ પર આધારિત છે. વિગતો માટે નીચે જુઓ ટાઇમલાઇન
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},પુરવઠોકર્તા સામે ભરતિયું {0} ના રોજ {1}
 DocType: Customer,Default Price List,ડિફૉલ્ટ ભાવ યાદી
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,એસેટ ચળવળ રેકોર્ડ {0} બનાવવામાં
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,તમે કાઢી શકતા નથી ફિસ્કલ વર્ષ {0}. ફિસ્કલ વર્ષ {0} વૈશ્વિક સેટિંગ્સ મૂળભૂત તરીકે સુયોજિત છે
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,સમાન નામની ગ્રાહક પહેલેથી હાજર છે
 DocType: Journal Entry,Entry Type,એન્ટ્રી પ્રકાર
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,કોઈ આકારણી યોજના આ આકારણી જૂથ સાથે જોડાયેલા
 ,Customer Credit Balance,ગ્રાહક ક્રેડિટ બેલેન્સ
@@ -1811,7 +1844,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,પ્રાઇસીંગ
 DocType: Quotation,Term Details,શબ્દ વિગતો
 DocType: Project,Total Sales Cost (via Sales Order),કુલ વેચાણ કિંમત (સેલ્સ ઓર્ડર મારફતે)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,{0} આ વિદ્યાર્થી જૂથ માટે વિદ્યાર્થીઓ કરતાં વધુ નોંધણી કરી શકતા નથી.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,{0} આ વિદ્યાર્થી જૂથ માટે વિદ્યાર્થીઓ કરતાં વધુ નોંધણી કરી શકતા નથી.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,લીડ કાઉન્ટ
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 કરતાં મોટી હોવી જ જોઈએ
 DocType: Manufacturing Settings,Capacity Planning For (Days),(દિવસ) માટે ક્ષમતા આયોજન
@@ -1827,9 +1860,11 @@
 DocType: Lab Test,Technician Name,ટેક્નિશિયન નામ
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ભરતિયું રદ પર ચુકવણી નાપસંદ
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},વર્તમાન ઑડોમીટર વાંચન દાખલ પ્રારંભિક વાહન ઑડોમીટર કરતાં મોટી હોવી જોઈએ {0}
+DocType: Restaurant Reservation,No Show,બતાવો નહીં
 DocType: Shipping Rule Country,Shipping Rule Country,શીપીંગ નિયમ દેશ
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,છોડો અને હાજરી
 DocType: Maintenance Visit,Partially Completed,આંશિક રીતે પૂર્ણ
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,મધ્યસ્થ સંવેદનશીલતા
 DocType: Leave Type,Include holidays within leaves as leaves,પાંદડા તરીકે નહીં અંદર રજાઓ સમાવેશ થાય છે
 DocType: Sales Invoice,Packed Items,પેક વસ્તુઓ
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,સીરીયલ નંબર સામે વોરંટી દાવાની
@@ -1846,13 +1881,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),ચૂકવેલ રકમ (કંપની ચલણ)
 DocType: Purchase Invoice,Additional Discount,વધારાના ડિસ્કાઉન્ટ
 DocType: Selling Settings,Selling Settings,સેટિંગ્સ વેચાણ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,ક્રિયાની પુષ્ટિ કરો
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ઓનલાઇન હરાજી
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,થો અથવા મૂલ્યાંકન દર અથવા બંને ક્યાં સ્પષ્ટ કરો
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,પરિપૂર્ણતા
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,કાર્ટ માં જુઓ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,માર્કેટિંગ ખર્ચ
 ,Item Shortage Report,વસ્તુ અછત રિપોર્ટ
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","વજન \ n કૃપા કરીને પણ &quot;વજન UOM&quot; ઉલ્લેખ, ઉલ્લેખ કર્યો છે"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","વજન \ n કૃપા કરીને પણ &quot;વજન UOM&quot; ઉલ્લેખ, ઉલ્લેખ કર્યો છે"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,સામગ્રી વિનંતી આ સ્ટોક એન્ટ્રી બનાવવા માટે વપરાય
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,આગળ અવમૂલ્યન તારીખ નવા એસેટ માટે ફરજિયાત છે
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,દરેક બેચ માટે અલગ અભ્યાસક્રમ આધારિત ગ્રુપ
@@ -1864,12 +1900,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,દરેક સ્ટોક ચળવળ માટે એકાઉન્ટિંગ પ્રવેશ કરો
 DocType: Leave Allocation,Total Leaves Allocated,કુલ પાંદડા સોંપાયેલ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},રો કોઈ જરૂરી વેરહાઉસ {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,માન્ય નાણાકીય વર્ષ શરૂઆત અને અંતિમ તારીખ દાખલ કરો
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,માન્ય નાણાકીય વર્ષ શરૂઆત અને અંતિમ તારીખ દાખલ કરો
 DocType: Employee,Date Of Retirement,નિવૃત્તિ તારીખ
 DocType: Upload Attendance,Get Template,નમૂના મેળવવા
 DocType: Material Request,Transferred,પર સ્થાનાંતરિત કરવામાં આવી
 DocType: Vehicle,Doors,દરવાજા
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext સેટઅપ પૂર્ણ કરો!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext સેટઅપ પૂર્ણ કરો!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,પેશન્ટ નોંધણી માટે ફી એકત્રિત કરો
 DocType: Course Assessment Criteria,Weightage,ભારાંકન
 DocType: Purchase Invoice,Tax Breakup,ટેક્સ બ્રેકઅપ
@@ -1888,36 +1924,36 @@
 DocType: Employee,AB+,એબી +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","આ આઇટમ ચલો છે, તો પછી તે વેચાણ ઓર્ડર વગેરે પસંદ કરી શકાતી નથી"
 DocType: Lead,Next Contact By,આગામી સંપર્ક
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},પંક્તિ માં વસ્તુ {0} માટે જરૂરી જથ્થો {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},પંક્તિ માં વસ્તુ {0} માટે જરૂરી જથ્થો {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},જથ્થો વસ્તુ માટે અસ્તિત્વમાં તરીકે વેરહાઉસ {0} કાઢી શકાતી નથી {1}
 DocType: Quotation,Order Type,ઓર્ડર પ્રકાર
-DocType: Purchase Invoice,Notification Email Address,સૂચના ઇમેઇલ સરનામું
 ,Item-wise Sales Register,વસ્તુ મુજબના સેલ્સ રજિસ્ટર
 DocType: Asset,Gross Purchase Amount,કુલ ખરીદી જથ્થો
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,ખુલવાનો બેલેન્સ
 DocType: Asset,Depreciation Method,અવમૂલ્યન પદ્ધતિ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,ઑફલાઇન
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,ઑફલાઇન
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,મૂળભૂત દર માં સમાવેલ આ કર છે?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,કુલ લક્ષ્યાંકના
 DocType: Job Applicant,Applicant for a Job,નોકરી માટે અરજી
 DocType: Production Plan Material Request,Production Plan Material Request,ઉત્પાદન યોજના સામગ્રી વિનંતી
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,બનાવવામાં કોઈ ઉત્પાદન ઓર્ડર્સ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,બનાવવામાં કોઈ ઉત્પાદન ઓર્ડર્સ
 DocType: Stock Reconciliation,Reconciliation JSON,રિકંસીલેશન JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ઘણા બધા કૉલમ. અહેવાલમાં નિકાસ અને એક સ્પ્રેડશીટ એપ્લિકેશન ઉપયોગ છાપો.
 DocType: Purchase Invoice Item,Batch No,બેચ કોઈ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},અવતરણ માટેની વિનંતી: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,એક ગ્રાહક ખરીદી ઓર્ડર સામે બહુવિધ વેચાણ ઓર્ડર માટે પરવાનગી આપે છે
 DocType: Student Group Instructor,Student Group Instructor,વિદ્યાર્થીઓની જૂથ પ્રશિક્ષક
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 મોબાઇલ કોઈ
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,મુખ્ય
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,મુખ્ય
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,વેરિએન્ટ
 DocType: Naming Series,Set prefix for numbering series on your transactions,તમારા વ્યવહારો પર શ્રેણી નંબર માટે સેટ ઉપસર્ગ
 DocType: Employee Attendance Tool,Employees HTML,કર્મચારીઓ HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,મૂળભૂત BOM ({0}) આ આઇટમ અથવા તેના નમૂના માટે સક્રિય હોવા જ જોઈએ
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,મૂળભૂત BOM ({0}) આ આઇટમ અથવા તેના નમૂના માટે સક્રિય હોવા જ જોઈએ
 DocType: Employee,Leave Encashed?,વટાવી છોડી?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ક્ષેત્રમાં પ્રતિ તક ફરજિયાત છે
 DocType: Email Digest,Annual Expenses,વાર્ષિક ખર્ચ
 DocType: Item,Variants,ચલો
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,ખરીદી ઓર્ડર બનાવો
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,ખરીદી ઓર્ડર બનાવો
 DocType: SMS Center,Send To,ને મોકલવું
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},છોડો પ્રકાર માટે પૂરતી રજા બેલેન્સ નથી {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ફાળવેલ રકમ
@@ -1933,6 +1969,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,વિદ્યાર્થીઓની જૂથ સ્ટ્રેન્થ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,જર્નલ સામે એન્ટ્રી {0} કોઈપણ મેળ ન ખાતી {1} પ્રવેશ નથી
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,appraisals
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,તાલીમ કાર્યક્રમો
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},સીરીયલ કોઈ વસ્તુ માટે દાખલ ડુપ્લિકેટ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,એક શિપિંગ નિયમ માટે એક શરત
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,દાખલ કરો
@@ -1942,7 +1979,7 @@
 DocType: Sales Order,To Deliver and Bill,વિતરિત અને બિલ
 DocType: Student Group,Instructors,પ્રશિક્ષકો
 DocType: GL Entry,Credit Amount in Account Currency,એકાઉન્ટ કરન્સી ક્રેડિટ રકમ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} સબમિટ હોવું જ જોઈએ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} સબમિટ હોવું જ જોઈએ
 DocType: Authorization Control,Authorization Control,અધિકૃતિ નિયંત્રણ
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ROW # {0}: વેરહાઉસ નકારેલું ફગાવી વસ્તુ સામે ફરજિયાત છે {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,ચુકવણી
@@ -1961,11 +1998,11 @@
 DocType: Quotation Item,Actual Qty,વાસ્તવિક Qty
 DocType: Sales Invoice Item,References,સંદર્ભો
 DocType: Quality Inspection Reading,Reading 10,10 વાંચન
-DocType: Hub Settings,Hub Node,હબ નોડ
+DocType: Hub Category,Hub Node,હબ નોડ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,તમે નકલી વસ્તુઓ દાખલ કર્યો છે. સુધારવું અને ફરીથી પ્રયાસ કરો.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,એસોસિયેટ
 DocType: Asset Movement,Asset Movement,એસેટ ચળવળ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,ન્યૂ કાર્ટ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,ન્યૂ કાર્ટ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} વસ્તુ એક શ્રેણીબદ્ધ વસ્તુ નથી
 DocType: SMS Center,Create Receiver List,રીસીવર યાદી બનાવો
 DocType: Vehicle,Wheels,વ્હિલ્સ
@@ -1979,15 +2016,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,દૂરસંચાર
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),પેકેજ આ બોલ (ફક્ત ડ્રાફ્ટ) ના એક ભાગ છે કે જે સૂચવે
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,ચુકવણી પ્રવેશ કરો
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},વસ્તુ માટે જથ્થો {0} કરતાં ઓછી હોવી જોઈએ {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},વસ્તુ માટે જથ્થો {0} કરતાં ઓછી હોવી જોઈએ {1}
 ,Sales Invoice Trends,સેલ્સ ભરતિયું પ્રવાહો
 DocType: Leave Application,Apply / Approve Leaves,પાંદડા મંજૂર / લાગુ
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,માટે
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,માટે
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',અથવા &#39;અગાઉના પંક્તિ કુલ&#39; &#39;અગાઉના પંક્તિ રકમ પર&#39; ચાર્જ પ્રકાર છે તો જ પંક્તિ નો સંદર્ભ લો કરી શકો છો
 DocType: Sales Order Item,Delivery Warehouse,ડ લવર વેરહાઉસ
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,નાણાકીય ખર્ચ કેન્દ્રો વૃક્ષ.
 DocType: Serial No,Delivery Document No,ડ લવર દસ્તાવેજ કોઈ
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},કંપની એસેટ નિકાલ પર ગેઇન / નુકશાન એકાઉન્ટ &#39;સુયોજિત કરો {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},કંપની એસેટ નિકાલ પર ગેઇન / નુકશાન એકાઉન્ટ &#39;સુયોજિત કરો {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,ખરીદી રસીદો વસ્તુઓ મેળવો
 DocType: Serial No,Creation Date,સર્જન તારીખ
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},{0} વસ્તુ ભાવ યાદી ઘણી વખત દેખાય {1}
@@ -1998,11 +2035,12 @@
 DocType: Student,Student Mobile Number,વિદ્યાર્થી મોબાઇલ નંબર
 DocType: Item,Has Variants,ચલો છે
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,પ્રતિભાવ અપડેટ કરો
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},જો તમે પહેલાથી જ વસ્તુઓ પસંદ કરેલ {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},જો તમે પહેલાથી જ વસ્તુઓ પસંદ કરેલ {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,માસિક વિતરણ નામ
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,બૅચ ID ફરજિયાત છે
 DocType: Sales Person,Parent Sales Person,પિતૃ વેચાણ વ્યક્તિ
-DocType: Purchase Invoice,Recurring Invoice,રીકરીંગ ભરતિયું
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,નિમ્ન થી ઉચ્ચ
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,પ્રથમ પ્રોગ્રામ પસંદ કરો
 DocType: Patient Appointment,Patient Age,પેશન્ટ એજ
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,પ્રોજેક્ટ વ્યવસ્થા
 DocType: Supplier,Supplier of Goods or Services.,સામાન કે સેવાઓ સપ્લાયર.
@@ -2010,8 +2048,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,પેશન્ટમાં કન્સલ્ટેશન ચાર્જીસ બુક કરવા માટે જો સેટ ન હોય તો તેનો ઉપયોગ કરવા માટેની ડિફોલ્ટ પ્રાપ્ય હિસાબ
 DocType: Vehicle Log,Fuel Price,ફ્યુઅલ પ્રાઈસ
 DocType: Budget,Budget,બજેટ
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,ઓપન સેટ કરો
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,સ્થિર એસેટ વસ્તુ નોન-સ્ટોક વસ્તુ હોવી જ જોઈએ.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,ઓપન સેટ કરો
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,સ્થિર એસેટ વસ્તુ નોન-સ્ટોક વસ્તુ હોવી જ જોઈએ.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",તે આવક અથવા ખર્ચ એકાઉન્ટ નથી તરીકે બજેટ સામે {0} અસાઇન કરી શકાતી નથી
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,પ્રાપ્ત
 DocType: Student Admission,Application Form Route,અરજી ફોર્મ રૂટ
@@ -2025,12 +2063,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,{0} વસ્તુ સીરીયલ અમે માટે સુયોજિત નથી. વસ્તુ માસ્ટર તપાસો
 DocType: Maintenance Visit,Maintenance Time,જાળવણી સમય
 ,Amount to Deliver,જથ્થો પહોંચાડવા માટે
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},એક જ વસ્તુ ઘણી વખત દાખલ કરવામાં આવી છે. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ટર્મ પ્રારંભ તારીખ કરતાં શૈક્ષણિક વર્ષ શરૂ તારીખ શબ્દ સાથે કડી થયેલ છે અગાઉ ન હોઈ શકે (શૈક્ષણિક વર્ષ {}). તારીખો સુધારવા અને ફરીથી પ્રયાસ કરો.
 DocType: Guardian,Guardian Interests,ગાર્ડિયન રૂચિ
 DocType: Naming Series,Current Value,વર્તમાન કિંમત
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,મલ્ટીપલ નાણાકીય વર્ષ તારીખ {0} માટે અસ્તિત્વ ધરાવે છે. નાણાકીય વર્ષ કંપની સુયોજિત કરો
 DocType: School Settings,Instructor Records to be created by,દ્વારા બનાવવામાં આવશે પ્રશિક્ષક રેકોર્ડ્સ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} બનાવવામાં
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} બનાવવામાં
 DocType: Delivery Note Item,Against Sales Order,સેલ્સ આદેશ સામે
 ,Serial No Status,સીરીયલ કોઈ સ્થિતિ
 DocType: Payment Entry Reference,Outstanding,ઉત્કૃષ્ટ
@@ -2040,10 +2079,10 @@
 						must be greater than or equal to {2}","રો {0}: સુયોજિત કરવા માટે {1} સમયગાળાના, અને તારીખ \ વચ્ચે તફાવત કરતાં વધારે અથવા સમાન હોવો જોઈએ {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,આ સ્ટોક ચળવળ પર આધારિત છે. જુઓ {0} વિગતો માટે
 DocType: Pricing Rule,Selling,વેચાણ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},રકમ {0} {1} સામે બાદ {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},રકમ {0} {1} સામે બાદ {2}
 DocType: Employee,Salary Information,પગાર માહિતી
 DocType: Sales Person,Name and Employee ID,નામ અને કર્મચારી ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,કારણે તારીખ તારીખ પોસ્ટ કરતા પહેલા ન હોઈ શકે
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,કારણે તારીખ તારીખ પોસ્ટ કરતા પહેલા ન હોઈ શકે
 DocType: Website Item Group,Website Item Group,વેબસાઇટ વસ્તુ ગ્રુપ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,કર અને વેરામાંથી
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,સંદર્ભ તારીખ દાખલ કરો
@@ -2069,7 +2108,7 @@
 DocType: Issue,Resolution Details,ઠરાવ વિગતો
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ફાળવણી
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,સ્વીકૃતિ માપદંડ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,ઉપરના કોષ્ટકમાં સામગ્રી અરજીઓ દાખલ કરો
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,ઉપરના કોષ્ટકમાં સામગ્રી અરજીઓ દાખલ કરો
 DocType: Item Attribute,Attribute Name,નામ લક્ષણ
 DocType: BOM,Show In Website,વેબસાઇટ બતાવો
 DocType: Shopping Cart Settings,Show Quantity in Website,વેબસાઇટ જથ્થો બતાવો
@@ -2078,7 +2117,7 @@
 DocType: Item Reorder,Check in (group),માં તપાસો (જૂથ)
 ,Qty to Order,ઓર્ડર Qty
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","જવાબદારી અથવા ઈક્વિટી હેઠળ એકાઉન્ટ વડા છે, જે નફો / નુકશાન નક્કી કરવામાં આવશે"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,બધા કાર્યો ગેન્ટ ચાર્ટ.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,બધા કાર્યો ગેન્ટ ચાર્ટ.
 DocType: Opportunity,Mins to First Response,પ્રથમ પ્રતિભાવ મિનિટ
 DocType: Pricing Rule,Margin Type,માર્જિન પ્રકાર
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} કલાક
@@ -2099,35 +2138,35 @@
 DocType: Patient,Surgical History,સર્જિકલ હિસ્ટ્રી
 DocType: Employee,Resignation Letter Date,રાજીનામું પત્ર તારીખ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,પ્રાઇસીંગ નિયમો વધુ જથ્થો પર આધારિત ફિલ્ટર કરવામાં આવે છે.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},કર્મચારી માટે જોડાયા તારીખ સેટ કરો {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},કર્મચારી માટે જોડાયા તારીખ સેટ કરો {0}
 DocType: Task,Total Billing Amount (via Time Sheet),કુલ બિલિંગ રકમ (સમયનો શીટ મારફતે)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,પુનરાવર્તન ગ્રાહક આવક
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ભૂમિકા &#39;ખર્ચ તાજનો&#39; હોવી જ જોઈએ
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,જોડી
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,ઉત્પાદન માટે BOM અને ક્વાલિટી પસંદ કરો
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,ઉત્પાદન માટે BOM અને ક્વાલિટી પસંદ કરો
 DocType: Asset,Depreciation Schedule,અવમૂલ્યન સૂચિ
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,વેચાણ ભાગીદાર સરનામાં અને સંપર્કો
 DocType: Bank Reconciliation Detail,Against Account,એકાઉન્ટ સામે
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,અડધા દિવસ તારીખ તારીખ થી અને તારીખ વચ્ચે પ્રયત્ન કરીશું
 DocType: Maintenance Schedule Detail,Actual Date,વાસ્તવિક તારીખ
 DocType: Item,Has Batch No,બેચ કોઈ છે
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},વાર્ષિક બિલિંગ: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},વાર્ષિક બિલિંગ: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),ગુડ્ઝ એન્ડ સર્વિસ ટેક્સ (જીએસટી ઈન્ડિયા)
 DocType: Delivery Note,Excise Page Number,એક્સાઇઝ પાનાં ક્રમાંક
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","કંપની, તારીખ થી અને તારીખ ફરજિયાત છે"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,પરામર્શમાંથી મેળવો
 DocType: Asset,Purchase Date,ખરીદ તારીખ
 DocType: Employee,Personal Details,અંગત વિગતો
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},કંપની એસેટ અવમૂલ્યન કિંમત કેન્દ્ર &#39;સુયોજિત કરો {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},કંપની એસેટ અવમૂલ્યન કિંમત કેન્દ્ર &#39;સુયોજિત કરો {0}
 ,Maintenance Schedules,જાળવણી શેડ્યુલ
 DocType: Task,Actual End Date (via Time Sheet),વાસ્તવિક ઓવરને તારીખ (સમયનો શીટ મારફતે)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},રકમ {0} {1} સામે {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},રકમ {0} {1} સામે {2} {3}
 ,Quotation Trends,અવતરણ પ્રવાહો
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},વસ્તુ ગ્રુપ આઇટમ માટે વસ્તુ માસ્ટર ઉલ્લેખ નથી {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,એકાઉન્ટ ડેબિટ એક પ્રાપ્ત એકાઉન્ટ હોવું જ જોઈએ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,એકાઉન્ટ ડેબિટ એક પ્રાપ્ત એકાઉન્ટ હોવું જ જોઈએ
 DocType: Shipping Rule Condition,Shipping Amount,શીપીંગ રકમ
 DocType: Supplier Scorecard Period,Period Score,પીરિયડ સ્કોર
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,ગ્રાહકો ઉમેરો
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,ગ્રાહકો ઉમેરો
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,બાકી રકમ
 DocType: Lab Test Template,Special,વિશેષ
 DocType: Purchase Invoice Item,Conversion Factor,રૂપાંતર ફેક્ટર
@@ -2135,13 +2174,14 @@
 ,Vehicle Expenses,વાહન ખર્ચ
 DocType: Serial No,Invoice Details,ઇન્વૉઇસ વિગતો
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},ઉપયોગી જીવન પછી અપેક્ષિત કિંમત કરતાં વધારે અથવા બરાબર હોવું જોઈએ {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,પ્રારંભ કરો
+DocType: Hub Category,Hub Category,હબ કેટેગરી
 DocType: Purchase Invoice,SEZ,સેઝ
 DocType: Purchase Receipt,Vehicle Number,વાહન સંખ્યા
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,રિકરિંગ ભરતિયું સ્ટોપ હશે કે જેના પર તારીખ
 DocType: Employee Loan,Loan Amount,લોન રકમ
 DocType: Program Enrollment,Self-Driving Vehicle,સેલ્ફ ડ્રાઈવીંગ વાહન
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,પુરવઠોકર્તા સ્કોરકાર્ડ સ્ટેન્ડિંગ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},રો {0}: મટીરીયલ્સ બિલ આઇટમ માટે મળી નથી {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},રો {0}: મટીરીયલ્સ બિલ આઇટમ માટે મળી નથી {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,કુલ ફાળવેલ પાંદડા {0} ઓછી ન હોઈ શકે સમયગાળા માટે પહેલાથી મંજૂર પાંદડા {1} કરતાં
 DocType: Journal Entry,Accounts Receivable,મળવાપાત્ર હિસાબ
 ,Supplier-Wise Sales Analytics,પુરવઠોકર્તા-વાઈસ વેચાણ ઍનલિટિક્સ
@@ -2152,7 +2192,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","પિતૃ કોર્સ (ખાલી છોડો, જો આ પિતૃ કોર્સ ભાગ નથી)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,બધા કર્મચારી પ્રકારો માટે ગણવામાં તો ખાલી છોડી દો
 DocType: Landed Cost Voucher,Distribute Charges Based On,વિતરિત ખર્ચ પર આધારિત
-apps/erpnext/erpnext/hooks.py +131,Timesheets,timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,timesheets
 DocType: HR Settings,HR Settings,એચઆર સેટિંગ્સ
 DocType: Salary Slip,net pay info,નેટ પગાર માહિતી
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,આ કિંમત ડિફૉલ્ટ સેલ્સ પ્રાઈસ લિસ્ટમાં અપડેટ થાય છે.
@@ -2163,7 +2203,7 @@
 DocType: Patient,B Positive,બી હકારાત્મક
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","રો # {0}: Qty, 1 હોવું જ જોઈએ, કારણ કે આઇટમ એક સ્થિર એસેટ છે. બહુવિધ Qty માટે અલગ પંક્તિ ઉપયોગ કરો."
 DocType: Leave Block List Allow,Leave Block List Allow,બ્લોક પરવાનગી સૂચિ છોડો
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,સંક્ષિપ્ત ખાલી અથવા જગ્યા ન હોઈ શકે
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,સંક્ષિપ્ત ખાલી અથવા જગ્યા ન હોઈ શકે
 DocType: Patient Medical Record,Patient Medical Record,પેશન્ટ મેડિકલ રેકોર્ડ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,બિન-ગ્રુપ ગ્રુપ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,રમતો
@@ -2179,9 +2219,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,માટે વિનિમય દર શોધવામાં અસમર્થ {0} પર {1} કી તારીખ માટે {2}. ચલણ વિનિમય રેકોર્ડ મેન્યુઅલી બનાવવા કૃપા કરીને
 DocType: POS Profile,Price List,ભાવ યાદી
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} મૂળભૂત ફિસ્કલ વર્ષ હવે છે. ફેરફાર અસર લેવા માટે કે તમારા બ્રાઉઝરને તાજું કરો.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,ખર્ચ દાવાઓ
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,ખર્ચ દાવાઓ
 DocType: Issue,Support,આધાર
 ,BOM Search,બોમ શોધ
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",આ વેરહાઉસમાં ઉપલબ્ધ સ્ટોક પર આધારિત &quot;સ્ટોકમાં&quot; અથવા &quot;સ્ટોકમાં નથી&quot; પ્રકાશિત કરો.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),બંધ (+ કૂલ ઉદઘાટન)
 DocType: Vehicle,Fuel Type,ફ્યુઅલ પ્રકાર
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,કંપની ચલણ સ્પષ્ટ કરો
@@ -2193,16 +2234,16 @@
 DocType: Healthcare Settings,Remind Before,પહેલાં યાદ કરાવો
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM રૂપાંતર પરિબળ પંક્તિ જરૂરી છે {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","રો # {0}: સંદર્ભ દસ્તાવેજ પ્રકાર વેચાણ ઓર્ડર એક, સેલ્સ ભરતિયું અથવા જર્નલ પ્રવેશ હોવું જ જોઈએ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","રો # {0}: સંદર્ભ દસ્તાવેજ પ્રકાર વેચાણ ઓર્ડર એક, સેલ્સ ભરતિયું અથવા જર્નલ પ્રવેશ હોવું જ જોઈએ"
 DocType: Salary Component,Deduction,કપાત
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,રો {0}: સમય અને સમય ફરજિયાત છે.
 DocType: Stock Reconciliation Item,Amount Difference,રકમ તફાવત
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},વસ્તુ ભાવ માટે ઉમેરવામાં {0} ભાવ યાદીમાં {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},વસ્તુ ભાવ માટે ઉમેરવામાં {0} ભાવ યાદીમાં {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,આ વેચાણ વ્યક્તિ કર્મચારી ID દાખલ કરો
 DocType: Territory,Classification of Customers by region,પ્રદેશ દ્વારા ગ્રાહકો વર્ગીકરણ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,તફાવત રકમ શૂન્ય હોવી જોઈએ
 DocType: Project,Gross Margin,એકંદર માર્જીન
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,પ્રથમ પ્રોડક્શન વસ્તુ દાખલ કરો
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,પ્રથમ પ્રોડક્શન વસ્તુ દાખલ કરો
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,ગણતરી બેન્ક નિવેદન બેલેન્સ
 DocType: Normal Test Template,Normal Test Template,સામાન્ય ટેસ્ટ ઢાંચો
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,અપંગ વપરાશકર્તા
@@ -2212,21 +2253,22 @@
 DocType: Salary Slip,Total Deduction,કુલ કપાત
 ,Production Analytics,ઉત્પાદન ઍનલિટિક્સ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,આ પેશન્ટ સામેના વ્યવહારો પર આધારિત છે. વિગતો માટે નીચેની ટાઇમલાઇન જુઓ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,કિંમત સુધારાશે
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,કિંમત સુધારાશે
 DocType: Employee,Date of Birth,જ્ન્મતારીખ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,વસ્તુ {0} પહેલાથી જ પરત કરવામાં આવી છે
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ફિસ્કલ વર્ષ ** એક નાણાકીય વર્ષ રજૂ કરે છે. બધા હિસાબી પ્રવેશો અને અન્ય મોટા પાયાના વ્યવહારો ** ** ફિસ્કલ યર સામે ટ્રેક છે.
 DocType: Opportunity,Customer / Lead Address,ગ્રાહક / લીડ સરનામું
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,સપ્લાયર સ્કોરકાર્ડ સેટઅપ
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},ચેતવણી: જોડાણ પર અમાન્ય SSL પ્રમાણપત્ર {0}
-DocType: Student Admission,Eligibility,લાયકાત
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,આકારણી યોજના નામ
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},ચેતવણી: જોડાણ પર અમાન્ય SSL પ્રમાણપત્ર {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","તરફ દોરી જાય છે, તમે વ્યવસાય, તમારા પગલે તરીકે તમારા બધા સંપર્કો અને વધુ ઉમેરો વિચાર મદદ"
 DocType: Production Order Operation,Actual Operation Time,વાસ્તવિક કામગીરી સમય
 DocType: Authorization Rule,Applicable To (User),લાગુ કરો (વપરાશકર્તા)
 DocType: Purchase Taxes and Charges,Deduct,કપાત
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,જોબ વર્ણન
 DocType: Student Applicant,Applied,એપ્લાઇડ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,ફરીથી ખોલો
 DocType: Sales Invoice Item,Qty as per Stock UOM,સ્ટોક Qty UOM મુજબ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 નામ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","સિવાય ખાસ અક્ષરો &quot;-&quot; &quot;.&quot; &quot;#&quot;, અને &quot;/&quot; શ્રેણી નામકરણ મંજૂરી નથી"
@@ -2238,7 +2280,7 @@
 DocType: Request for Quotation,Manufacturing Manager,ઉત્પાદન વ્યવસ્થાપક
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},સીરીયલ કોઈ {0} સુધી વોરંટી હેઠળ છે {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,પેકેજોમાં વિભાજિત બોલ પર કોઈ નોંધ.
-apps/erpnext/erpnext/hooks.py +98,Shipments,આવેલા શિપમેન્ટની
+apps/erpnext/erpnext/hooks.py +107,Shipments,આવેલા શિપમેન્ટની
 DocType: Payment Entry,Total Allocated Amount (Company Currency),કુલ ફાળવેલ રકમ (કંપની ચલણ)
 DocType: Purchase Order Item,To be delivered to customer,ગ્રાહક પર વિતરિત કરવામાં
 DocType: BOM,Scrap Material Cost,સ્ક્રેપ સામગ્રી ખર્ચ
@@ -2252,7 +2294,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"ખર્ચ કે તફાવત એકાઉન્ટ વસ્તુ {0}, કે અસર સમગ્ર મૂલ્ય માટે ફરજિયાત છે"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,બેન્ક નામ
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +29,-Above,-Above
+apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +29,-Above,-ઉપર
 DocType: Employee Loan,Employee Loan Account,કર્મચારીનું લોન એકાઉન્ટ
 DocType: Leave Application,Total Leave Days,કુલ છોડો દિવસો
 DocType: Email Digest,Note: Email will not be sent to disabled users,નોંધ: આ ઇમેઇલ નિષ્ક્રિય વપરાશકર્તાઓ માટે મોકલવામાં આવશે નહીં
@@ -2260,8 +2302,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,આઇટમ વેરિએન્ટ સેટિંગ્સ
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,કંપની પસંદ કરો ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,તમામ વિભાગો માટે ગણવામાં તો ખાલી છોડી દો
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","રોજગાર પ્રકાર (કાયમી, કરાર, ઇન્ટર્ન વગેરે)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} વસ્તુ માટે ફરજિયાત છે {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","રોજગાર પ્રકાર (કાયમી, કરાર, ઇન્ટર્ન વગેરે)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} વસ્તુ માટે ફરજિયાત છે {1}
 DocType: Process Payroll,Fortnightly,પાક્ષિક
 DocType: Currency Exchange,From Currency,ચલણ
 DocType: Vital Signs,Weight (In Kilogram),વજન (કિલોગ્રામમાં)
@@ -2285,7 +2327,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,શેડ્યૂલ મેળવવા માટે &#39;બનાવો સૂચિ&#39; પર ક્લિક કરો
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,ત્યાં ભૂલો નીચેનાનો શેડ્યુલ કાઢતી વખતે હતા:
 DocType: Bin,Ordered Quantity,આદેશ આપ્યો જથ્થો
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",દા.ત. &quot;બિલ્ડરો માટે સાધનો બનાવો&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",દા.ત. &quot;બિલ્ડરો માટે સાધનો બનાવો&quot;
 DocType: Grading Scale,Grading Scale Intervals,ગ્રેડીંગ સ્કેલ અંતરાલો
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {2} માટે એકાઉન્ટિંગ એન્ટ્રી માત્ર ચલણ કરી શકાય છે: {3}
 DocType: Production Order,In Process,પ્રક્રિયામાં
@@ -2308,11 +2350,10 @@
 DocType: Purchase Invoice,With Payment of Tax,ટેક્સ પેમેન્ટ સાથે
 DocType: Expense Claim Detail,Expense Claim Detail,ખર્ચ દાવાની વિગત
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,સપ્લાયર માટે ત્રણ નકલમાં
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,યોગ્ય એકાઉન્ટ પસંદ કરો
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,યોગ્ય એકાઉન્ટ પસંદ કરો
 DocType: Item,Weight UOM,વજન UOM
 DocType: Salary Structure Employee,Salary Structure Employee,પગાર માળખું કર્મચારીનું
 DocType: Patient,Blood Group,બ્લડ ગ્રુપ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,બાકી
 DocType: Course,Course Name,અભ્યાસક્રમનું નામ
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ચોક્કસ કર્મચારી રજા કાર્યક્રમો મંજૂર કરી શકો છો વપરાશકર્તાઓ કે જેઓ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,ઓફિસ સાધનો
@@ -2331,7 +2372,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,કિંમતો બતાવવામાં આવશે નહીં તો ભાવ સૂચિ સેટ નથી
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,આ શીપીંગ નિયમ માટે એક દેશ ઉલ્લેખ કરો અથવા વિશ્વભરમાં શીપીંગ તપાસો
 DocType: Stock Entry,Total Incoming Value,કુલ ઇનકમિંગ ભાવ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,ડેબિટ કરવા માટે જરૂરી છે
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,ડેબિટ કરવા માટે જરૂરી છે
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets મદદ તમારી ટીમ દ્વારા કરવામાં activites માટે સમય, ખર્ચ અને બિલિંગ ટ્રેક રાખવા"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ખરીદી ભાવ યાદી
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,સપ્લાયર સ્કોરકાર્ડ ચલોના નમૂનાઓ.
@@ -2341,7 +2382,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,ચુકવણી રિકંસીલેશન
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,ઇનચાર્જ વ્યક્તિ નામ પસંદ કરો
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,ટેકનોલોજી
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},કુલ અવેતન: {0}
+DocType: Hub Settings,Unregister from Hub,હબમાંથી નોંધણી રદ કરો
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},કુલ અવેતન: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM વેબસાઇટ કામગીરીમાં
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,પત્ર ઓફર
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,સામગ્રી અરજીઓ (MRP) અને ઉત્પાદન ઓર્ડર્સ બનાવો.
@@ -2353,7 +2395,9 @@
 DocType: Physician Schedule Time Slot,To Time,સમય
 DocType: Authorization Rule,Approving Role (above authorized value),(અધિકૃત કિંમત ઉપર) ભૂમિકા એપ્રૂવિંગ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,એકાઉન્ટ ક્રેડિટ ચૂકવવાપાત્ર એકાઉન્ટ હોવું જ જોઈએ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM રિકર્ઝન: {0} ના માતાપિતા અથવા બાળકને ન હોઈ શકે {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,કૃપા કરીને વિદ્યાર્થી પ્રવેશ પસંદ કરો જે પેઇડ વિદ્યાર્થી અરજદાર માટે ફરજિયાત છે
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM રિકર્ઝન: {0} ના માતાપિતા અથવા બાળકને ન હોઈ શકે {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,કિંમત પ્રકાશન પ્રકાશિત કરવા માટે એક ભાવ સૂચિ પસંદ કરો
 DocType: Production Order Operation,Completed Qty,પૂર્ણ Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","{0}, માત્ર ડેબિટ એકાઉન્ટ્સ બીજા ક્રેડિટ પ્રવેશ સામે લિંક કરી શકો છો"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,ભાવ યાદી {0} અક્ષમ છે
@@ -2365,38 +2409,39 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} વસ્તુ માટે જરૂરી સીરીયલ નંબર {1}. તમે પ્રદાન કરે છે {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,વર્તમાન મૂલ્યાંકન દર
 DocType: Item,Customer Item Codes,ગ્રાહક વસ્તુ કોડ્સ
+DocType: Training Event,Advance,એડવાન્સ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,ફરીથી રિકરિંગ કરવા માટે
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,એક્સચેન્જ મેળવી / નુકશાન
 DocType: Opportunity,Lost Reason,લોસ્ટ કારણ
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,નવું સરનામું
 DocType: Quality Inspection,Sample Size,સેમ્પલ કદ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,રસીદ દસ્તાવેજ દાખલ કરો
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,બધી વસ્તુઓ પહેલેથી જ તેનું ભરતિયું કરાય છે
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;કેસ નંબર પ્રતિ&#39; માન્ય સ્પષ્ટ કરો
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',&#39;કેસ નંબર પ્રતિ&#39; માન્ય સ્પષ્ટ કરો
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,વધુ ખર્ચ કેન્દ્રો જૂથો હેઠળ કરી શકાય છે પરંતુ પ્રવેશો બિન-જૂથો સામે કરી શકાય છે
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,વપરાશકર્તાઓ અને પરવાનગીઓ
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},ઉત્પાદન ઓર્ડર્સ બનાવ્યું: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},ઉત્પાદન ઓર્ડર્સ બનાવ્યું: {0}
 DocType: Branch,Branch,શાખા
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,પ્રિન્ટર અને બ્રાંડિંગ
 DocType: Company,Total Monthly Sales,કુલ માસિક વેચાણ
 DocType: Bin,Actual Quantity,ખરેખર જ થો
 DocType: Shipping Rule,example: Next Day Shipping,ઉદાહરણ: આગામી દિવસે શિપિંગ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,મળી નથી સીરીયલ કોઈ {0}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},ઉમેદવારી {0} રહી છે
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},ઉમેદવારી {0} રહી છે
 DocType: Fee Schedule Program,Fee Schedule Program,ફી શેડ્યૂલ પ્રોગ્રામ
 DocType: Fee Schedule Program,Student Batch,વિદ્યાર્થી બેચ
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,`ટેબવિસ્તૃત ચિહ્નો&#39;થી * પસંદ કરો જ્યાં દર્દી = &#39;{0}&#39; ક્રમાંકો sign_date desc મર્યાદા 1 દ્વારા
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,વિદ્યાર્થી બનાવો
 DocType: Supplier Scorecard Scoring Standing,Min Grade,મીન ગ્રેડ
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},તમે આ પ્રોજેક્ટ પર સહયોગ કરવા માટે આમંત્રિત કરવામાં આવ્યા છે: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},ફિઝિશિયન {0} પર ઉપલબ્ધ નથી
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},તમે આ પ્રોજેક્ટ પર સહયોગ કરવા માટે આમંત્રિત કરવામાં આવ્યા છે: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},ફિઝિશિયન {0} પર ઉપલબ્ધ નથી
 DocType: Leave Block List Date,Block Date,બ્લોક તારીખ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Doctype {0} માં વૈવિધ્યપૂર્ણ ક્ષેત્ર ઉમેદવારી આઈડી ઉમેરો
 DocType: Purchase Receipt,Supplier Delivery Note,સપ્લાયર ડ લવર નોટ
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,હવે લાગુ
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,હવે લાગુ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},વાસ્તવિક Qty {0} / રાહ જોઈ Qty {1}
 DocType: Purchase Invoice,E-commerce GSTIN,ઇ-વાણિજ્ય જીએસટીઆઈએન
 DocType: Sales Order,Not Delivered,બચાવી શક્યા
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,અપેક્ષિત તારીખ ટ્રાન્ઝેક્શન તારીખ પહેલાં ન હોઈ શકે
 ,Bank Clearance Summary,બેન્ક ક્લિયરન્સ સારાંશ
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","બનાવો અને દૈનિક, સાપ્તાહિક અને માસિક ઇમેઇલ પચાવી મેનેજ કરો."
 DocType: Appraisal Goal,Appraisal Goal,મૂલ્યાંકન ગોલ
@@ -2404,12 +2449,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,મકાન
 DocType: Fee Schedule,Fee Structure,ફી માળખું
 DocType: Timesheet Detail,Costing Amount,પડતર રકમ
-DocType: Student Admission,Application Fee,અરજી ફી
+DocType: Student Admission Program,Application Fee,અરજી ફી
 DocType: Process Payroll,Submit Salary Slip,પગાર સ્લિપ રજુ
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,વસ્તુ {0} છે {1}% માટે Maxiumm ડિસ્કાઉન્ટ
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,વસ્તુ {0} છે {1}% માટે Maxiumm ડિસ્કાઉન્ટ
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,બલ્ક આયાત
 DocType: Sales Partner,Address & Contacts,સરના સંપર્કો
 DocType: SMS Log,Sender Name,પ્રેષકનું નામ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,માપદંડ દ્વારા સૉર્ટ કરો
 DocType: POS Profile,[Select],[પસંદ કરો]
 DocType: Vital Signs,Blood Pressure (diastolic),બ્લડ પ્રેશર (ડાયાસ્ટોલિક)
 DocType: SMS Log,Sent To,મોકલવામાં
@@ -2418,14 +2464,14 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,આગામી સંપર્ક તારીખ ભૂતકાળમાં ન હોઈ શકે
 DocType: Company,For Reference Only.,સંદર્ભ માટે માત્ર.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},ફિઝિશિયન {0} {1} પર ઉપલબ્ધ નથી
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,બેચ પસંદ કોઈ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,બેચ પસંદ કોઈ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},અમાન્ય {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,સંદર્ભ INV
 DocType: Sales Invoice Advance,Advance Amount,એડવાન્સ રકમ
 DocType: Manufacturing Settings,Capacity Planning,ક્ષમતા આયોજન
 DocType: Supplier Quotation,Rounding Adjustment (Company Currency,રાઉન્ડિંગ એડજસ્ટમેન્ટ (કંપની કરન્સી
-apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,જરૂરી છે &#39;તારીખ પ્રતિ&#39;
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,'તારીખ થી' જરૂરી છે
 DocType: Journal Entry,Reference Number,સંદર્ભ નંબર
 DocType: Employee,Employment Details,રોજગાર વિગતો
 DocType: Employee,New Workplace,ન્યૂ નોકરીના સ્થળે
@@ -2434,15 +2480,15 @@
 DocType: Normal Test Items,Require Result Value,પરિણામ મૂલ્યની જરૂર છે
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,કેસ નંબર 0 ન હોઈ શકે
 DocType: Item,Show a slideshow at the top of the page,પાનાંની ટોચ પર એક સ્લાઇડ શો બતાવવા
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,સ્ટોર્સ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,સ્ટોર્સ
 DocType: Project Type,Projects Manager,પ્રોજેક્ટ્સ વ્યવસ્થાપક
 DocType: Serial No,Delivery Time,ડ લવર સમય
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,પર આધારિત એઇજીંગનો
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,નિમણૂંક રદ કરી
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,નિમણૂંક રદ કરી
 DocType: Item,End of Life,જીવનનો અંત
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,યાત્રા
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,આપવામાં તારીખો માટે કર્મચારી {0} મળી કોઈ સક્રિય અથવા મૂળભૂત પગાર માળખું
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,યાત્રા
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,આપવામાં તારીખો માટે કર્મચારી {0} મળી કોઈ સક્રિય અથવા મૂળભૂત પગાર માળખું
 DocType: Leave Block List,Allow Users,વપરાશકર્તાઓ માટે પરવાનગી આપે છે
 DocType: Purchase Order,Customer Mobile No,ગ્રાહક મોબાઇલ કોઈ
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,રીકરીંગ
@@ -2451,12 +2497,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,સુધારો કિંમત
 DocType: Item Reorder,Item Reorder,વસ્તુ પુનઃક્રમાંકિત કરો
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,પગાર બતાવો કાપલી
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,ટ્રાન્સફર સામગ્રી
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,ટ્રાન્સફર સામગ્રી
 DocType: Fees,Send Payment Request,ચુકવણી વિનંતી મોકલો
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","કામગીરી, સંચાલન ખર્ચ સ્પષ્ટ અને તમારી કામગીરી કરવા માટે કોઈ એક અનન્ય ઓપરેશન આપે છે."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,આ દસ્તાવેજ દ્વારા મર્યાદા વધારે છે {0} {1} આઇટમ માટે {4}. તમે બનાવે છે અન્ય {3} જ સામે {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,બચત પછી રિકરિંગ સુયોજિત કરો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,પસંદ કરો ફેરફાર રકમ એકાઉન્ટ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,પસંદ કરો ફેરફાર રકમ એકાઉન્ટ
 DocType: Purchase Invoice,Price List Currency,ભાવ યાદી કરન્સી
 DocType: Naming Series,User must always select,વપરાશકર્તા હંમેશા પસંદ કરવી જ પડશે
 DocType: Stock Settings,Allow Negative Stock,નકારાત્મક સ્ટોક પરવાનગી આપે છે
@@ -2476,7 +2522,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,કર્મચારીનું
 DocType: Sample Collection,Collected Time,એકત્રિત સમય
 DocType: Company,Sales Monthly History,સેલ્સ માસિક ઇતિહાસ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,બેચ પસંદ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,બેચ પસંદ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} સંપૂર્ણપણે ગણાવી છે
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,મહત્વપૂર્ણ ચિહ્નો
 DocType: Training Event,End Time,અંત સમય
@@ -2484,16 +2530,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,ચુકવણી કપાત અથવા નુકસાન
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,સેલ્સ અથવા ખરીદી માટે નિયમ કરાર શરતો.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,વાઉચર દ્વારા ગ્રુપ
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,શું તમે ખરેખર આ નિમણૂક રદ કરવા માગો છો?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,સેલ્સ પાઇપલાઇન
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},પગાર પુન મૂળભૂત એકાઉન્ટ સુયોજિત કરો {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,જરૂરી પર
 DocType: Rename Tool,File to Rename,નામ ફાઇલ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},રો વસ્તુ BOM પસંદ કરો {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},રો વસ્તુ BOM પસંદ કરો {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},એકાઉન્ટ {0} {1} એકાઉન્ટ મોડ માં કંપનીની મેચ થતો નથી: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},વસ્તુ માટે અસ્તિત્વમાં નથી સ્પષ્ટ BOM {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,જાળવણી સુનિશ્ચિત {0} આ વેચાણ ઓર્ડર રદ પહેલાં રદ થયેલ હોવું જ જોઈએ
+DocType: POS Profile,Applicable for Users,વપરાશકર્તાઓ માટે લાગુ
 DocType: Notification Control,Expense Claim Approved,ખર્ચ દાવો મંજૂર
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,કર્મચારી પગાર કાપલી {0} પહેલાથી જ આ સમયગાળા માટે બનાવવામાં
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,કર્મચારી પગાર કાપલી {0} પહેલાથી જ આ સમયગાળા માટે બનાવવામાં
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,ફાર્માસ્યુટિકલ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ખરીદી વસ્તુઓ કિંમત
 DocType: Selling Settings,Sales Order Required,વેચાણ ઓર્ડર જરૂરી
@@ -2517,6 +2565,7 @@
 DocType: Offer Letter,Accepted,સ્વીકારાયું
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,સંસ્થા
 DocType: BOM Update Tool,BOM Update Tool,BOM અપડેટ ટૂલ
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","પાર્ટી એકાઉન્ટ સ્પષ્ટ નથી, કૃપા કરીને કંપનીમાં ડિફૉલ્ટ પક્ષ એકાઉન્ટ સેટ કરો"
 DocType: SG Creation Tool Course,Student Group Name,વિદ્યાર્થી જૂથ નામ
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,ફી બનાવવી
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,શું તમે ખરેખર આ કંપની માટે તમામ વ્યવહારો કાઢી નાખવા માંગો છો તેની ખાતરી કરો. તે છે તમારા માસ્ટર ડેટા રહેશે. આ ક્રિયા પૂર્વવત્ કરી શકાતી નથી.
@@ -2525,29 +2574,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) આયોજિત quanitity કરતાં વધારે ન હોઈ શકે છે ({2}) ઉત્પાદન ઓર્ડર {3}
 DocType: Shipping Rule,Shipping Rule Label,શીપીંગ નિયમ લેબલ
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,વપરાશકર્તા ફોરમ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,કાચો માલ ખાલી ન હોઈ શકે.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","સ્ટોક અપડેટ કરી શકાયું નથી, ભરતિયું ડ્રોપ શીપીંગ વસ્તુ છે."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,કાચો માલ ખાલી ન હોઈ શકે.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","સ્ટોક અપડેટ કરી શકાયું નથી, ભરતિયું ડ્રોપ શીપીંગ વસ્તુ છે."
 DocType: Lab Test Sample,Lab Test Sample,લેબ ટેસ્ટ નમૂના
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,ઝડપી જર્નલ પ્રવેશ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM કોઈપણ વસ્તુ agianst ઉલ્લેખ તો તમે દર બદલી શકતા નથી
+DocType: Restaurant,Invoice Series Prefix,ઇન્વોઇસ સિરીઝ ઉપસર્ગ
 DocType: Employee,Previous Work Experience,પહેલાંના કામ અનુભવ
 DocType: Stock Entry,For Quantity,જથ્થો માટે
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},પંક્તિ પર વસ્તુ {0} માટે આયોજન Qty દાખલ કરો {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},પંક્તિ પર વસ્તુ {0} માટે આયોજન Qty દાખલ કરો {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} અપર્ણ ન કરાય
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,આઇટમ્સ માટે વિનંતી કરે છે.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,અલગ ઉત્પાદન ક્રમમાં દરેક સમાપ્ત સારી વસ્તુ માટે બનાવવામાં આવશે.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} વળતર દસ્તાવેજમાં નકારાત્મક હોવા જ જોઈએ
 ,Minutes to First Response for Issues,મુદ્દાઓ માટે પ્રથમ પ્રતિભાવ મિનિટ
 DocType: Purchase Invoice,Terms and Conditions1,નિયમો અને Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,સંસ્થા નામ કે જેના માટે તમે આ સિસ્ટમ સુયોજિત કરી રહ્યા હોય.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,સંસ્થા નામ કે જેના માટે તમે આ સિસ્ટમ સુયોજિત કરી રહ્યા હોય.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","આ તારીખ સુધી સ્થિર હિસાબી પ્રવેશ, કોઈએ / કરવા નીચે સ્પષ્ટ ભૂમિકા સિવાય પ્રવેશ સુધારી શકો છો."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,જાળવણી સૂચિ પેદા પહેલાં દસ્તાવેજ સેવ કરો
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,તમામ બીઓએમમાં અદ્યતન નવીનતમ ભાવ
 DocType: Fee Schedule,Successful,સફળ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,પ્રોજેક્ટ સ્થિતિ
 DocType: UOM,Check this to disallow fractions. (for Nos),અપૂર્ણાંક નામંજૂર કરવા માટે આ તપાસો. (સંખ્યા માટે)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,નીચેના ઉત્પાદન ઓર્ડર્સ બનાવવામાં આવી હતી:
-DocType: Student Admission,Naming Series (for Student Applicant),સિરીઝ નામકરણ (વિદ્યાર્થી અરજદાર માટે)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,નીચેના ઉત્પાદન ઓર્ડર્સ બનાવવામાં આવી હતી:
+DocType: Student Admission Program,Naming Series (for Student Applicant),સિરીઝ નામકરણ (વિદ્યાર્થી અરજદાર માટે)
 DocType: Delivery Note,Transporter Name,ટ્રાન્સપોર્ટર નામ
 DocType: Authorization Rule,Authorized Value,અધિકૃત ભાવ
 DocType: BOM,Show Operations,બતાવો ઓપરેશન્સ
@@ -2571,7 +2621,7 @@
 ,Employees working on a holiday,રજા પર કામ કરતા કર્મચારીઓ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,માર્ક હાજર
 DocType: Project,% Complete Method,% પૂર્ણ પદ્ધતિ
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,ડ્રગ
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,ડ્રગ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},જાળવણી શરૂઆત તારીખ સીરીયલ કોઈ ડ લવર તારીખ પહેલાં ન હોઈ શકે {0}
 DocType: Production Order,Actual End Date,વાસ્તવિક ઓવરને તારીખ
 DocType: BOM,Operating Cost (Company Currency),સંચાલન ખર્ચ (કંપની ચલણ)
@@ -2589,13 +2639,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,વપરાશકર્તા એપ્રૂવિંગ નિયમ લાગુ પડે છે વપરાશકર્તા તરીકે જ ન હોઈ શકે
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),મૂળભૂત દર (સ્ટોક UOM મુજબ)
 DocType: SMS Log,No of Requested SMS,વિનંતી એસએમએસ કોઈ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,પગાર વિના છોડો મંજૂર છોડો અરજી રેકોર્ડ સાથે મેળ ખાતું નથી
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,પગાર વિના છોડો મંજૂર છોડો અરજી રેકોર્ડ સાથે મેળ ખાતું નથી
 DocType: Campaign,Campaign-.####,અભિયાન -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,આગળ કરવાનાં પગલાંઓ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,શ્રેષ્ઠ શક્ય દરે સ્પષ્ટ વસ્તુઓ સપ્લાય કૃપા કરીને
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,ઇન્વોઇસ બનાવો
 DocType: Selling Settings,Auto close Opportunity after 15 days,15 દિવસ પછી ઓટો બંધ તકો
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} ના સ્કોરકાર્ડ સ્ટેન્ડને કારણે {0} ખરીદીના ઓર્ડર્સની મંજૂરી નથી.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} ના સ્કોરકાર્ડ સ્ટેન્ડને કારણે {0} ખરીદીના ઓર્ડર્સની મંજૂરી નથી.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,સમાપ્તિ વર્ષ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / લીડ%
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,કરારનો અંત તારીખ જોડાયા તારીખ કરતાં મોટી હોવી જ જોઈએ
@@ -2631,7 +2681,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","બધા ખરીદી વ્યવહારો પર લાગુ કરી શકાય છે કે જે પ્રમાણભૂત કર નમૂનો. આ નમૂનો વગેરે #### તમે બધા ** આઇટમ્સ માટે પ્રમાણભૂત કર દર હશે અહીં વ્યાખ્યાયિત કર દર નોંધ &quot;હેન્ડલીંગ&quot;, કર માથા અને &quot;શીપીંગ&quot;, &quot;વીમો&quot; જેવા પણ અન્ય ખર્ચ હેડ યાદી સમાવી શકે છે * *. વિવિધ દર હોય ** ** કે વસ્તુઓ છે, તો તેઓ ** વસ્તુ કર ઉમેરાવી જ જોઈએ ** આ ** ** વસ્તુ માસ્ટર કોષ્ટક. #### સ્તંભોને વર્ણન 1. ગણતરી પ્રકાર: - આ (કે જે મૂળભૂત રકમ ની રકમ છે) ** નેટ કુલ ** પર હોઇ શકે છે. - ** અગાઉના પંક્તિ કુલ / રકમ ** પર (સંચિત કર અથવા ખર્ચ માટે). તમે આ વિકલ્પ પસંદ કરો, તો કર રકમ અથવા કુલ (કર કોષ્ટકમાં) અગાઉના પંક્તિ ટકાવારી તરીકે લાગુ કરવામાં આવશે. - ** ** વાસ્તવમાં (ઉલ્લેખ કર્યો છે). 2. એકાઉન્ટ હેડ: આ કર 3. ખર્ચ કેન્દ્રને નક્કી કરવામાં આવશે, જે હેઠળ એકાઉન્ટ ખાતાવહી: કર / ચાર્જ (શીપીંગ જેમ) એક આવક છે અથવા ખર્ચ તો તે ખર્ચ કેન્દ્રને સામે નક્કી કરવાની જરૂર છે. 4. વર્ણન: કર વર્ણન (કે ઇન્વૉઇસેસ / અવતરણ છાપવામાં આવશે). 5. દર: કર દર. 6. રકમ: ટેક્સની રકમ. 7. કુલ: આ બોલ પર સંચિત કુલ. 8. રો દાખલ કરો: પર આધારિત &quot;જો અગાઉના પંક્તિ કુલ&quot; તમે આ ગણતરી માટે આધાર (મૂળભૂત અગાઉના પંક્તિ છે) તરીકે લેવામાં આવશે જે પંક્તિ નંબર પસંદ કરી શકો છો. 9. કર અથવા ચાર્જ વિચાર કરો: કરવેરા / ચાર્જ મૂલ્યાંકન માટે જ છે (કુલ ભાગ ન હોય) અથવા માત્ર (આઇટમ કિંમત ઉમેરી શકતા નથી) કુલ માટે અથવા બંને માટે જો આ વિભાગમાં તમે સ્પષ્ટ કરી શકો છો. 10. ઉમેરો અથવા કપાત: જો તમે ઉમેરવા અથવા કર કપાત માંગો છો."
 DocType: Homepage,Homepage,મુખપૃષ્ઠ
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,ચિકિત્સક પસંદ કરો ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',સુધારો ટૅબસંપાદન સેટ ઇન્વૉઇસ = &#39;{0}&#39; જ્યાં નામ = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd જથ્થો
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},ફી રેકોર્ડ્સ બનાવનાર - {0}
 DocType: Asset Category Account,Asset Category Account,એસેટ વર્ગ એકાઉન્ટ
@@ -2643,7 +2692,7 @@
 DocType: Asset,Manual,મેન્યુઅલ
 DocType: Salary Component Account,Salary Component Account,પગાર પુન એકાઉન્ટ
 DocType: Global Defaults,Hide Currency Symbol,કરન્સી નિશાનીનો છુપાવો
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","દા.ત. બેન્ક, રોકડ, ક્રેડિટ કાર્ડ"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","દા.ત. બેન્ક, રોકડ, ક્રેડિટ કાર્ડ"
 DocType: Lead Source,Source Name,સોર્સ નામ
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","પુખ્તમાં સામાન્ય રીતે લોહીનુ દબાણ રહેલું આશરે 120 mmHg સિસ્ટેલોકલ, અને 80 એમએમએચજી ડાયાસ્ટોલિક, સંક્ષિપ્ત &quot;120/80 એમએમ એચ જી&quot;"
 DocType: Journal Entry,Credit Note,ઉધાર નોધ
@@ -2662,16 +2711,16 @@
 DocType: Patient,Occupation,વ્યવસાય
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,રો {0}: પ્રારંભ તારીખ સમાપ્તિ તારીખ પહેલાં જ હોવી જોઈએ
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),કુલ (Qty)
-DocType: Sales Invoice,This Document,આ દસ્તાવેજ
 DocType: Installation Note Item,Installed Qty,ઇન્સ્ટોલ Qty
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,આમાં કેટલાક અમાન્ય ઇમેઇલ સરનામાંઓ હોઈ શકે છે
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,તમે ઉમેર્યું
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,તાલીમ પરિણામ
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,તાલીમ પરિણામ
 DocType: Purchase Invoice,Is Paid,ચૂકવવામાં આવે છે
 DocType: Salary Structure,Total Earning,કુલ અર્નિંગ
 DocType: Purchase Receipt,Time at which materials were received,"સામગ્રી પ્રાપ્ત કરવામાં આવી હતી, જે અંતે સમય"
 DocType: Stock Ledger Entry,Outgoing Rate,આઉટગોઇંગ દર
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,સંસ્થા શાખા માસ્ટર.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,સંસ્થા શાખા માસ્ટર.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,અથવા
 DocType: Sales Order,Billing Status,બિલિંગ સ્થિતિ
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,સમસ્યાની જાણ કરો
@@ -2686,7 +2735,8 @@
 DocType: Notification Control,Sales Order Message,વેચાણ ઓર્ડર સંદેશ
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","વગેરે કંપની, કરન્સી, ચાલુ નાણાકીય વર્ષના, જેવા સેટ મૂળભૂત મૂલ્યો"
 DocType: Payment Entry,Payment Type,ચુકવણી પ્રકાર
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,કૃપા કરીને આઇટમ માટે બેચ પસંદ {0}. એક બેચ કે આ જરૂરિયાત પૂર્ણ શોધવામાં અસમર્થ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,કૃપા કરીને આઇટમ માટે બેચ પસંદ {0}. એક બેચ કે આ જરૂરિયાત પૂર્ણ શોધવામાં અસમર્થ
+DocType: Hub Category,Parent Category,પિતૃ કેટેગરી
 DocType: Process Payroll,Select Employees,પસંદગીના કર્મચારીઓને
 DocType: Opportunity,Potential Sales Deal,સંભવિત વેચાણની ડીલ
 DocType: Complaint,Complaints,ફરિયાદો
@@ -2723,7 +2773,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),વિતરણ માટે પેકેજ ઓળખ (પ્રિન્ટ માટે)
 DocType: Bin,Reserved Quantity,અનામત જથ્થો
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,કૃપા કરીને માન્ય ઇમેઇલ સરનામું દાખલ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,કાર્ટમાં આઇટમ પસંદ કરો
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,કાર્ટમાં આઇટમ પસંદ કરો
 DocType: Landed Cost Voucher,Purchase Receipt Items,ખરીદી રસીદ વસ્તુઓ
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,જોઈએ એ પ્રમાણે લેખનું ફોર્મ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,બાકીનો
@@ -2733,15 +2783,15 @@
 DocType: Payment Request,Amount in customer's currency,ગ્રાહકોના ચલણ માં જથ્થો
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,ડ લવર
 DocType: Stock Reconciliation Item,Current Qty,વર્તમાન Qty
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,સપ્લાયર્સ ઉમેરો
+DocType: Restaurant Menu,Restaurant Menu,રેસ્ટોરન્ટ મેનૂ
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,પાછલું
 DocType: Appraisal Goal,Key Responsibility Area,કી જવાબદારી વિસ્તાર
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","વિદ્યાર્થી બૅચેસ તમે હાજરી, આકારણીઓ અને વિદ્યાર્થીઓ માટે ફી ટ્રૅક મદદ"
 DocType: Payment Entry,Total Allocated Amount,કુલ ફાળવેલ રકમ
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,શાશ્વત યાદી માટે ડિફોલ્ટ યાદી એકાઉન્ટ સેટ
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,શાશ્વત યાદી માટે ડિફોલ્ટ યાદી એકાઉન્ટ સેટ
 DocType: Item Reorder,Material Request Type,સામગ્રી વિનંતી પ્રકાર
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},થી {0} પગાર માટે Accural જર્નલ પ્રવેશ {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage સંપૂર્ણ છે, સાચવી નહોતી"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage સંપૂર્ણ છે, સાચવી નહોતી"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,રો {0}: UOM રૂપાંતર ફેક્ટર ફરજિયાત છે
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,રૂમ ક્ષમતા
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,સંદર્ભ
@@ -2780,16 +2830,18 @@
 DocType: Project,Task Completion,ટાસ્ક સમાપ્તિ
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,સ્ટોક નથી
 DocType: Appraisal,HR User,એચઆર વપરાશકર્તા
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,કર અને ખર્ચ બાદ
-apps/erpnext/erpnext/hooks.py +129,Issues,મુદ્દાઓ
+apps/erpnext/erpnext/hooks.py +138,Issues,મુદ્દાઓ
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},સ્થિતિ એક હોવો જ જોઈએ {0}
 DocType: Sales Invoice,Debit To,ડેબિટ
+DocType: Restaurant Menu Item,Restaurant Menu Item,રેસ્ટોરન્ટ મેનુ આઇટમ
 DocType: Delivery Note,Required only for sample item.,માત્ર નમૂના આઇટમ માટે જરૂરી છે.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,સોદા બાદ વાસ્તવિક Qty
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},કોઈ પગાર સ્લિપ વચ્ચે મળી {0} અને {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},કોઈ પગાર સ્લિપ વચ્ચે મળી {0} અને {1}
 ,Pending SO Items For Purchase Request,ખરીદી વિનંતી તેથી વસ્તુઓ બાકી
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,વિદ્યાર્થી પ્રવેશ
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} અક્ષમ છે
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,વિદ્યાર્થી પ્રવેશ
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} અક્ષમ છે
 DocType: Supplier,Billing Currency,બિલિંગ કરન્સી
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,બહુ્ મોટુ
@@ -2812,6 +2864,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,જરૂરી મુલાકાત કોઈ ઉલ્લેખ કરો
 DocType: Stock Settings,Default Valuation Method,મૂળભૂત મૂલ્યાંકન પદ્ધતિ
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,ફી
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,અપડેટ પ્રગતિમાં છે તેમાં થોડો સમય લાગી શકે છે
 DocType: Vehicle Log,Fuel Qty,ફ્યુઅલ Qty
 DocType: Production Order Operation,Planned Start Time,આયોજિત પ્રારંભ સમય
 DocType: Course,Assessment,આકારણી
@@ -2827,7 +2880,7 @@
 DocType: Price List,Price List Master,ભાવ યાદી માસ્ટર
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,તમે સુયોજિત અને લક્ષ્યો મોનીટર કરી શકે છે કે જેથી બધા સેલ્સ વ્યવહારો બહુવિધ ** વેચાણ વ્યક્તિઓ ** સામે ટૅગ કરી શકો છો.
 ,S.O. No.,તેથી નંબર
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},લીડ પ્રતિ ગ્રાહક બનાવવા કૃપા કરીને {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},લીડ પ્રતિ ગ્રાહક બનાવવા કૃપા કરીને {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,પેશન્ટ પસંદ કરો
 DocType: Price List,Applicable for Countries,દેશો માટે લાગુ પડે છે
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,પેરામીટર નામ
@@ -2858,27 +2911,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,પુરવઠોકર્તા ઇન્વૉઇસ વિગતો
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ખર્ચ / તફાવત એકાઉન્ટ ({0}) એક &#39;નફો અથવા નુકસાન ખાતામાં હોવા જ જોઈએ
 DocType: Project,Copied From,નકલ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},નામ ભૂલ: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,શોર્ટેજ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},નામ ભૂલ: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,શોર્ટેજ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} સાથે સંકળાયેલ નથી {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,કર્મચારી {0} માટે હાજરી પહેલેથી ચિહ્નિત થયેલ છે
 DocType: Packing Slip,If more than one package of the same type (for print),જો એક જ પ્રકારના એક કરતાં વધુ પેકેજ (પ્રિન્ટ માટે)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,કૃપા કરીને રેસ્ટોરેન્ટ સેટિંગ્સમાં ડિફોલ્ટ ગ્રાહક સેટ કરો
 ,Salary Register,પગાર રજિસ્ટર
 DocType: Warehouse,Parent Warehouse,પિતૃ વેરહાઉસ
 DocType: C-Form Invoice Detail,Net Total,નેટ કુલ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},ડિફૉલ્ટ BOM આઇટમ માટે મળી નથી {0} અને પ્રોજેક્ટ {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},ડિફૉલ્ટ BOM આઇટમ માટે મળી નથી {0} અને પ્રોજેક્ટ {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,વિવિધ લોન પ્રકારના વ્યાખ્યાયિત કરે છે
 DocType: Bin,FCFS Rate,FCFS દર
 DocType: Payment Reconciliation Invoice,Outstanding Amount,બાકી રકમ
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),સમય (મિનિટ)
 DocType: Project Task,Working,કામ
 DocType: Stock Ledger Entry,Stock Queue (FIFO),સ્ટોક કતારમાં (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,નાણાકીય વર્ષ
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,નાણાકીય વર્ષ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} કંપની ને અનુલક્ષતું નથી {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,{0} માટે માપદંડ સ્કોર કાર્યને હલ કરી શક્યું નથી. ખાતરી કરો કે સૂત્ર માન્ય છે.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,કારણ કે ખર્ચ
 DocType: Healthcare Settings,Out Patient Settings,આઉટ પેશન્ટ સેટિંગ્સ
 DocType: Account,Round Off,બોલ ધરપકડ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,જથ્થો હકારાત્મક હોવા જોઈએ
 ,Requested Qty,વિનંતી Qty
 DocType: Tax Rule,Use for Shopping Cart,શોપિંગ કાર્ટ માટે વાપરો
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},ભાવ {0} લક્ષણ માટે {1} માન્ય વસ્તુ યાદી અસ્તિત્વમાં નથી વસ્તુ માટે કિંમતો એટ્રીબ્યુટ {2}
@@ -2887,7 +2942,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","સમાયોજિત પ્રમાણમાં તમારી પસંદગી મુજબ, વસ્તુ Qty અથવા રકમ પર આધારિત વિતરણ કરવામાં આવશે"
 DocType: Maintenance Visit,Purposes,હેતુઓ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,ઓછામાં ઓછા એક વસ્તુ પાછી દસ્તાવેજ નકારાત્મક જથ્થો દાખલ કરવું જોઈએ
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,અભ્યાસક્રમો ઉમેરો
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ઓપરેશન {0} વર્કસ્ટેશન કોઇપણ ઉપલ્બધ કામના કલાકો કરતાં લાંબા સમય સુધી {1}, બહુવિધ કામગીરી માં ઓપરેશન તોડી"
 ,Requested,વિનંતી
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,કોઈ ટિપ્પણી
@@ -2899,6 +2953,8 @@
 DocType: Employee Loan,Repaid/Closed,પાછી / બંધ
 DocType: Item,Total Projected Qty,કુલ અંદાજ Qty
 DocType: Monthly Distribution,Distribution Name,વિતરણ નામ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,પુરવઠોકર્તા&gt; પુરવઠોકર્તા પ્રકાર
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","આઇટમ {0} માટે મૂલ્યાંકનનો દર, જે {1} {2} માટે એકાઉન્ટિંગ એન્ટ્રીઓ કરવા માટે જરૂરી છે જો આઇટમ {1} માં શૂન્ય વેલ્યુએશન રેટ આઇટમ તરીકે ટ્રાન્ઝેક્શન કરી રહી છે, તો કૃપા કરીને {1} આઇટમ ટેબલમાં ઉલ્લેખ કરો. નહિંતર, આઇટમ માટે ઇનકમિંગ સ્ટોક ટ્રાન્ઝેક્શન બનાવો અથવા આઇટમ રેકોર્ડમાં વેલ્યુએશન રેટનો ઉલ્લેખ કરો, અને પછી આ એન્ટ્રી સબમિટ / રદ કરવાનો પ્રયાસ કરો"
 DocType: Course,Course Code,કોર્સ કોડ
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},વસ્તુ માટે જરૂરી ગુણવત્તા નિરીક્ષણ {0}
 DocType: POS Settings,Use POS in Offline Mode,ઑફલાઇન મોડમાં POS નો ઉપયોગ કરો
@@ -2909,14 +2965,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,પ્રદેશ વૃક્ષ મેનેજ કરો.
 DocType: Journal Entry Account,Sales Invoice,સેલ્સ ભરતિયું
 DocType: Journal Entry Account,Party Balance,પાર્ટી બેલેન્સ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,ડિસ્કાઉન્ટ પર લાગુ પડે છે પસંદ કરો
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,ડિસ્કાઉન્ટ પર લાગુ પડે છે પસંદ કરો
 DocType: Company,Default Receivable Account,મૂળભૂત પ્રાપ્ત એકાઉન્ટ
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ઉપર પસંદ માપદંડ માટે ચૂકવણી કુલ પગાર માટે બેન્ક એન્ટ્રી બનાવો
 DocType: Physician,Physician Schedule,ફિઝિશિયન સૂચિ
 DocType: Purchase Invoice,Deemed Export,ડીમ્ડ એક્સપોર્ટ
 DocType: Stock Entry,Material Transfer for Manufacture,ઉત્પાદન માટે માલ પરિવહન
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,ડિસ્કાઉન્ટ ટકાવારી ભાવ યાદી સામે અથવા બધું ભાવ યાદી માટે ક્યાં લાગુ પાડી શકાય છે.
-DocType: Purchase Invoice,Half-yearly,અર્ધ-વાર્ષિક
+DocType: Subscription,Half-yearly,અર્ધ-વાર્ષિક
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,સ્ટોક માટે એકાઉન્ટિંગ એન્ટ્રી
 DocType: Lab Test,LabTest Approver,લેબસ્ટસ્ટ એપોવરવર
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,જો તમે પહેલાથી જ આકારણી માપદંડ માટે આકારણી છે {}.
@@ -2945,13 +3001,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,વિશેષ નાના
 DocType: Company,Standard Template,સ્ટાન્ડર્ડ ટેમ્પલેટ
 DocType: Training Event,Theory,થિયરી
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,ચેતવણી: Qty વિનંતી સામગ્રી ન્યુનત્તમ ઓર્ડર Qty કરતાં ઓછી છે
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,ચેતવણી: Qty વિનંતી સામગ્રી ન્યુનત્તમ ઓર્ડર Qty કરતાં ઓછી છે
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,એકાઉન્ટ {0} સ્થિર છે
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,સંસ્થા સાથે જોડાયેલા એકાઉન્ટ્સ એક અલગ ચાર્ટ સાથે કાનૂની એન્ટિટી / સબસિડીયરી.
 DocType: Payment Request,Mute Email,મ્યૂટ કરો ઇમેઇલ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","ફૂડ, પીણું અને તમાકુ"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},માત્ર સામે ચુકવણી કરી શકો છો unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,કમિશન દર કરતા વધારે 100 ન હોઈ શકે
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},માત્ર સામે ચુકવણી કરી શકો છો unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,કમિશન દર કરતા વધારે 100 ન હોઈ શકે
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,પ્રથમ {0} દાખલ કરો
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,માંથી કોઈ જવાબો
@@ -2969,10 +3025,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,કલર
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,આકારણી યોજના માપદંડ
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,ખરીદી ઓર્ડર્સ અટકાવો
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,સંવેદનશીલ
 DocType: Patient Appointment,Scheduled,અનુસૂચિત
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,અવતરણ માટે વિનંતી.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,હ્યુમન રિસોર્સ&gt; એચઆર સેટિંગ્સમાં કર્મચારીનું નામકરણ પદ્ધતિ સેટ કરો
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","&quot;ના&quot; અને &quot;વેચાણ વસ્તુ છે&quot; &quot;સ્ટોક વસ્તુ છે&quot; છે, જ્યાં &quot;હા&quot; છે વસ્તુ પસંદ કરો અને કોઈ અન્ય ઉત્પાદન બંડલ છે, કૃપા કરીને"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,ગ્રાહક પસંદ કરો
 DocType: Student Log,Academic,શૈક્ષણિક
 DocType: Patient,Personal and Social History,વ્યક્તિગત અને સામાજિક ઇતિહાસ
 DocType: Fee Schedule,Fee Breakup for each student,દરેક વિદ્યાર્થી માટે ફી બ્રેકઅપ
@@ -2982,7 +3039,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,મૂલ્યાંકન દર
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,ડીઝલ
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,ભાવ યાદી કરન્સી પસંદ નહી
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,ભાવ યાદી કરન્સી પસંદ નહી
 apps/erpnext/erpnext/config/healthcare.py +46,Results,પરિણામો
 ,Student Monthly Attendance Sheet,વિદ્યાર્થી માસિક હાજરી શીટ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},કર્મચારીનું {0} પહેલાથી માટે અરજી કરી છે {1} વચ્ચે {2} અને {3}
@@ -2997,7 +3054,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,સેલ્સ પાર્ટનર્સ મેનેજ કરો.
 DocType: Quality Inspection,Inspection Type,નિરીક્ષણ પ્રકાર
 DocType: Fee Validity,Visited yet,હજુ સુધી મુલાકાત લીધી
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,હાલની વ્યવહાર સાથે વખારો જૂથ રૂપાંતરિત કરી શકાય છે.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,હાલની વ્યવહાર સાથે વખારો જૂથ રૂપાંતરિત કરી શકાય છે.
 DocType: Assessment Result Tool,Result HTML,પરિણામ HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ના રોજ સમાપ્ત થાય
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,વિદ્યાર્થીઓ ઉમેરી
@@ -3023,7 +3080,7 @@
 DocType: Healthcare Settings,Result Printed,મુદ્રિત પરિણામ
 DocType: Asset Category Account,Depreciation Expense Account,અવમૂલ્યન ખર્ચ એકાઉન્ટ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,અજમાયશી સમય
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},{0} જુઓ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},{0} જુઓ
 DocType: Customer Group,Only leaf nodes are allowed in transaction,માત્ર પર્ણ ગાંઠો વ્યવહાર માન્ય છે
 DocType: Expense Claim,Expense Approver,ખર્ચ તાજનો
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,રો {0}: ગ્રાહક સામે એડવાન્સ ક્રેડિટ હોવા જ જોઈએ
@@ -3034,7 +3091,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,તારીખ સમય માટે
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,કોર્સ શેડ્યુલ કાઢી:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,SMS વિતરણ સ્થિતિ જાળવવા માટે લોગ
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,સેલ્સ લક્ષ્યાંક સેટ કરો
 DocType: Accounts Settings,Make Payment via Journal Entry,જર્નલ પ્રવેશ મારફતે ચુકવણી બનાવો
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,મુદ્રિત પર
 DocType: Item,Inspection Required before Delivery,નિરીક્ષણ ડ લવર પહેલાં જરૂરી
@@ -3042,7 +3098,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,બાકી પ્રવૃત્તિઓ
 DocType: Patient Appointment,Reminded,યાદ કરાવ્યું
 DocType: Patient,PID-,પીઆઈડી-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,તમારી સંસ્થા
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,તમારી સંસ્થા
 DocType: Fee Component,Fees Category,ફી વર્ગ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,તારીખ રાહત દાખલ કરો.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,એએમટી
@@ -3054,7 +3110,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,પુનઃક્રમાંકિત કરો સ્તર
 DocType: Company,Chart Of Accounts Template,એકાઉન્ટ્સ ઢાંચો ચાર્ટ
 DocType: Attendance,Attendance Date,એટેન્ડન્સ તારીખ
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},વસ્તુ ભાવ {0} માં ભાવ યાદી માટે સુધારાશે {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},વસ્તુ ભાવ {0} માં ભાવ યાદી માટે સુધારાશે {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,આવક અને કપાત પર આધારિત પગાર ભાંગ્યા.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,બાળક ગાંઠો સાથે એકાઉન્ટ ખાતાવહી રૂપાંતરિત કરી શકતા નથી
 DocType: Purchase Invoice Item,Accepted Warehouse,સ્વીકારાયું વેરહાઉસ
@@ -3070,9 +3126,10 @@
 ,Employee Birthday,કર્મચારીનું જન્મદિવસ
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,વિદ્યાર્થી બેચ એટેન્ડન્સ સાધન
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,મર્યાદા ઓળંગી
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,અનુસૂચિત તારીખ સુધી
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,વેન્ચર કેપિટલ
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,આ શૈક્ષણિક વર્ષ &#39;સાથે એક શૈક્ષણિક શબ્દ {0} અને&#39; શબ્દ નામ &#39;{1} પહેલેથી હાજર છે. આ પ્રવેશો સુધારવા માટે અને ફરીથી પ્રયાસ કરો.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","વસ્તુ {0} વિરુદ્ધનાં પ્રવર્તમાન વ્યવહારો છે કે, તમે કિંમત બદલી શકતા નથી {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","વસ્તુ {0} વિરુદ્ધનાં પ્રવર્તમાન વ્યવહારો છે કે, તમે કિંમત બદલી શકતા નથી {1}"
 DocType: UOM,Must be Whole Number,સમગ્ર નંબર હોવો જોઈએ
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(દિવસોમાં) સોંપાયેલ નવા પાંદડા
 DocType: Purchase Invoice,Invoice Copy,ભરતિયું કૉપિ
@@ -3082,7 +3139,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,બીલ નંબર
 DocType: Shopping Cart Settings,Orders,ઓર્ડર્સ
 DocType: Employee Leave Approver,Leave Approver,તાજનો છોડો
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,કૃપા કરીને એક બેચ પસંદ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,કૃપા કરીને એક બેચ પસંદ
 DocType: Assessment Group,Assessment Group Name,આકારણી ગ્રુપ નામ
 DocType: Manufacturing Settings,Material Transferred for Manufacture,સામગ્રી ઉત્પાદન માટે તબદીલ
 DocType: Expense Claim,"A user with ""Expense Approver"" role",&quot;ખર્ચ તાજનો&quot; ભૂમિકા સાથે વપરાશકર્તા
@@ -3097,7 +3154,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,પીરિયડ બંધ એન્ટ્રી
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,વિભાગ પસંદ કરો ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,હાલની વ્યવહારો સાથે ખર્ચ કેન્દ્રને જૂથ રૂપાંતરિત કરી શકતા નથી
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},રકમ {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},રકમ {0} {1} {2} {3}
 DocType: Account,Depreciation,અવમૂલ્યન
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),પુરવઠોકર્તા (ઓ)
 DocType: Employee Attendance Tool,Employee Attendance Tool,કર્મચારીનું એટેન્ડન્સ સાધન
@@ -3108,10 +3165,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,ચુકવણી પ્રવેશો {0} યુએન સાથે જોડાયેલી છે
 DocType: GL Entry,Voucher No,વાઉચર કોઈ
 ,Lead Owner Efficiency,અગ્ર માલિક કાર્યક્ષમતા
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,સૌથી વધુ લોકપ્રિય
 DocType: Leave Allocation,Leave Allocation,ફાળવણી છોડો
 DocType: Payment Request,Recipient Message And Payment Details,પ્રાપ્તિકર્તા સંદેશ અને ચુકવણી વિગતો
 DocType: Training Event,Trainer Email,ટ્રેનર ઇમેઇલ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,બનાવવામાં સામગ્રી અરજીઓ {0}
+DocType: Restaurant Reservation,No of People,લોકોની સંખ્યા
 DocType: Production Planning Tool,Include sub-contracted raw materials,પેટા કોન્ટ્રાક્ટ કાચી સામગ્રી સમાવેશ થાય છે
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,શરતો અથવા કરારની ઢાંચો.
 DocType: Purchase Invoice,Address and Contact,એડ્રેસ અને સંપર્ક
@@ -3120,10 +3179,11 @@
 DocType: Supplier,Last Day of the Next Month,આગામી મહિને છેલ્લો દિવસ
 DocType: Support Settings,Auto close Issue after 7 days,7 દિવસ પછી ઓટો બંધ અંક
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","પહેલાં ફાળવવામાં કરી શકાતી નથી મૂકો {0}, રજા બેલેન્સ પહેલેથી કેરી આગળ ભવિષ્યમાં રજા ફાળવણી રેકોર્ડ કરવામાં આવી છે {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),નોંધ: કારણે / સંદર્ભ તારીખ {0} દિવસ દ્વારા મંજૂરી ગ્રાહક ક્રેડિટ દિવસ કરતાં વધી જાય (ઓ)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),નોંધ: કારણે / સંદર્ભ તારીખ {0} દિવસ દ્વારા મંજૂરી ગ્રાહક ક્રેડિટ દિવસ કરતાં વધી જાય (ઓ)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,વિદ્યાર્થી અરજદાર
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,RECIPIENT માટે મૂળ
 DocType: Asset Category Account,Accumulated Depreciation Account,સંચિત અવમૂલ્યન એકાઉન્ટ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,આ ઇમેઇલ સ્વતઃ નિર્માણ થયેલ છે
 DocType: Stock Settings,Freeze Stock Entries,ફ્રીઝ સ્ટોક પ્રવેશો
 DocType: Program Enrollment,Boarding Student,બોર્ડિંગ વિદ્યાર્થી
 DocType: Asset,Expected Value After Useful Life,ઈચ્છિત કિંમત ઉપયોગી જીવન પછી
@@ -3131,7 +3191,7 @@
 DocType: Activity Cost,Billing Rate,બિલિંગ રેટ
 ,Qty to Deliver,વિતરિત કરવા માટે Qty
 ,Stock Analytics,સ્ટોક ઍનલિટિક્સ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,ઓપરેશન્સ ખાલી છોડી શકાશે નહીં
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,ઓપરેશન્સ ખાલી છોડી શકાશે નહીં
 DocType: Maintenance Visit Purpose,Against Document Detail No,દસ્તાવેજ વિગતવાર સામે કોઈ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,પાર્ટી પ્રકાર ફરજિયાત છે
 DocType: Quality Inspection,Outgoing,આઉટગોઇંગ
@@ -3153,7 +3213,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,પ્રવૃત્તિ આધારિત ગ્રુપ માટે જાતે વિદ્યાર્થીઓની પસંદગી
 DocType: Journal Entry,User Remark,વપરાશકર્તા ટીકા
 DocType: Lead,Market Segment,માર્કેટ સેગમેન્ટ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},ચૂકવેલ રકમ કુલ નકારાત્મક બાકી રકમ કરતાં વધારે ન હોઈ શકે {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},ચૂકવેલ રકમ કુલ નકારાત્મક બાકી રકમ કરતાં વધારે ન હોઈ શકે {0}
 DocType: Supplier Scorecard Period,Variables,ચલો
 DocType: Employee Internal Work History,Employee Internal Work History,કર્મચારીનું આંતરિક કામ ઇતિહાસ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),બંધ (DR)
@@ -3176,27 +3236,28 @@
 DocType: Asset,Double Declining Balance,ડબલ કથળતું જતું બેલેન્સ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +179,Closed order cannot be cancelled. Unclose to cancel.,બંધ કરવા માટે રદ ન કરી શકાય છે. રદ કરવા Unclose.
 DocType: Patient Relation,Father,પિતા
-apps/erpnext/erpnext/controllers/accounts_controller.py +562,'Update Stock' cannot be checked for fixed asset sale,&#39;સુધારા સ્ટોક&#39; સ્થિર એસેટ વેચાણ માટે તપાસી શકાતું નથી
+apps/erpnext/erpnext/controllers/accounts_controller.py +562,'Update Stock' cannot be checked for fixed asset sale,'અદ્યતન સ્ટોક' સ્થિર સંપત્તિ વેચાણ માટે ચેક કરી શકાતું નથી
 DocType: Bank Reconciliation,Bank Reconciliation,બેન્ક રિકંસીલેશન
 DocType: Attendance,On Leave,રજા પર
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,સુધારાઓ મેળવો
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: એકાઉન્ટ {2} કંપની ને અનુલક્ષતું નથી {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,સામગ્રી વિનંતી {0} રદ અથવા બંધ છે
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,મેનેજમેન્ટ છોડો
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,મેનેજમેન્ટ છોડો
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,એકાઉન્ટ દ્વારા ગ્રુપ
 DocType: Sales Order,Fully Delivered,સંપૂર્ણપણે વિતરિત
 DocType: Lead,Lower Income,ઓછી આવક
+DocType: Restaurant Order Entry,Current Order,વર્તમાન ઓર્ડર
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},સોર્સ અને ટાર્ગેટ વેરહાઉસ પંક્તિ માટે જ ન હોઈ શકે {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","આ સ્ટોક રિકંસીલેશન એક ખુલી પ્રવેશ છે, કારણ કે તફાવત એકાઉન્ટ, એક એસેટ / જવાબદારી પ્રકાર એકાઉન્ટ હોવું જ જોઈએ"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},વિતરિત રકમ લોન રકમ કરતાં વધારે ન હોઈ શકે {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,પ્રોગ્રામ્સ પર જાઓ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},વસ્તુ માટે જરૂરી ઓર્ડર નંબર ખરીદી {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,ઉત્પાદન ઓર્ડર બનાવવામાં આવી ન
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;તારીખ પ્રતિ&#39; પછી &#39;તારીખ&#39; હોવા જ જોઈએ
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},વિદ્યાર્થી તરીકે સ્થિતિ બદલી શકાતું નથી {0} વિદ્યાર્થી અરજી સાથે કડી થયેલ છે {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,ઉત્પાદન ઓર્ડર બનાવવામાં આવી ન
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','તારીખ થી' પછી જ ’તારીખ સુધી’ હોવી જોઈએ
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},વિદ્યાર્થી તરીકે સ્થિતિ બદલી શકાતું નથી {0} વિદ્યાર્થી અરજી સાથે કડી થયેલ છે {1}
 DocType: Asset,Fully Depreciated,સંપૂર્ણપણે અવમૂલ્યન
 ,Stock Projected Qty,સ્ટોક Qty અંદાજિત
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},સંબંધ નથી {0} ગ્રાહક પ્રોજેક્ટ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},સંબંધ નથી {0} ગ્રાહક પ્રોજેક્ટ {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,નોંધપાત્ર હાજરી HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",સુવાકયો દરખાસ્તો બિડ તમે તમારા ગ્રાહકો માટે મોકલી છે
 DocType: Sales Order,Customer's Purchase Order,ગ્રાહક ખરીદી ઓર્ડર
@@ -3207,8 +3268,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Depreciations સંખ્યા નક્કી સુયોજિત કરો
 DocType: Supplier Scorecard Period,Calculations,ગણતરીઓ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,ભાવ અથવા Qty
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,પ્રોડક્શન્સ ઓર્ડર્સ માટે ઊભા ન કરી શકો છો:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,પ્રોડક્શન્સ ઓર્ડર્સ માટે ઊભા ન કરી શકો છો:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,મિનિટ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} સેટઅપ&gt; સેટિંગ્સ&gt; નામકરણની શ્રેણી માટે નામકરણ શ્રેણી સેટ કરો
 DocType: Purchase Invoice,Purchase Taxes and Charges,કર અને ખર્ચ ખરીદી
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,સપ્લાયર્સ પર જાઓ
 ,Qty to Receive,પ્રાપ્ત Qty
@@ -3221,7 +3283,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,એકાઉન્ટ ક્રેડિટ બેલેન્સ શીટ એકાઉન્ટ હોવું જ જોઈએ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,બધા પુરવઠોકર્તા પ્રકાર
 DocType: Global Defaults,Disable In Words,શબ્દો માં અક્ષમ
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,વસ્તુ આપોઆપ નંબર નથી કારણ કે વસ્તુ કોડ ફરજિયાત છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,વસ્તુ આપોઆપ નંબર નથી કારણ કે વસ્તુ કોડ ફરજિયાત છે
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},અવતરણ {0} નથી પ્રકાર {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,જાળવણી સુનિશ્ચિત વસ્તુ
 DocType: Sales Order,%  Delivered,% વિતરિત
@@ -3243,23 +3305,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,પ્રારંભિક સિલક ઈક્વિટી
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,એન
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,રિકંસીલેશન
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,બાકી
 DocType: Appraisal,Appraisal,મૂલ્યાંકન
 DocType: Purchase Invoice,GST Details,જીએસટી વિગતો
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},સપ્લાયર મોકલવામાં ઇમેઇલ {0}
+DocType: Item,Default Sales Unit of Measure,મેઝરનું ડિફોલ્ટ સેલ્સ યુનિટ
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,તારીખ પુનરાવર્તન કરવામાં આવે છે
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,અધિકૃત હસ્તાક્ષર
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},એક હોવો જ જોઈએ સાક્ષી છોડો {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,ફી બનાવો
-DocType: Hub Settings,Seller Email,વિક્રેતા ઇમેઇલ
 DocType: Project,Total Purchase Cost (via Purchase Invoice),કુલ ખરીદ કિંમત (ખરીદી ભરતિયું મારફતે)
 DocType: Training Event,Start Time,પ્રારંભ સમય
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,પસંદ કરો જથ્થો
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,પસંદ કરો જથ્થો
 DocType: Customs Tariff Number,Customs Tariff Number,કસ્ટમ્સ જકાત સંખ્યા
 DocType: Patient Appointment,Patient Appointment,પેશન્ટ નિમણૂંક
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,ભૂમિકા એપ્રૂવિંગ નિયમ લાગુ પડે છે ભૂમિકા તરીકે જ ન હોઈ શકે
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,આ ઇમેઇલ ડાયજેસ્ટ માંથી અનસબ્સ્ક્રાઇબ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,આ ઇમેઇલ ડાયજેસ્ટ માંથી અનસબ્સ્ક્રાઇબ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,દ્વારા સપ્લાયરો મેળવો
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{1} આઇટમ {1} માટે મળ્યું નથી
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,અભ્યાસક્રમો પર જાઓ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,સંદેશ મોકલ્યો
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,બાળક ગાંઠો સાથે એકાઉન્ટ ખાતાવહી તરીકે સેટ કરી શકાય છે
@@ -3272,11 +3337,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,સામગ્રી ઉત્પાદન માટે તબદીલ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,એકાઉન્ટ {0} નથી અસ્તિત્વમાં
 DocType: Project,Project Type,પ્રોજેક્ટ પ્રકાર
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,આ કાર્ય માટે બાળ કાર્ય અસ્તિત્વમાં છે. તમે આ ટાસ્કને કાઢી શકતા નથી.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ક્યાં લક્ષ્ય Qty અથવા લક્ષ્ય રકમ ફરજિયાત છે.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,વિવિધ પ્રવૃત્તિઓ કિંમત
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,કોઈ વધુ પરિણામો નથી
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,વિવિધ પ્રવૃત્તિઓ કિંમત
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","માટે ઘટનાઓ સેટિંગ {0}, કારણ કે કર્મચારી વેચાણ વ્યક્તિઓ નીચે જોડાયેલ એક વપરાશકર્તા id નથી {1}"
 DocType: Timesheet,Billing Details,બિલિંગ વિગતો
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,સ્ત્રોત અને લક્ષ્ય વેરહાઉસ અલગ જ હોવી જોઈએ
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,સ્ત્રોત અને લક્ષ્ય વેરહાઉસ અલગ જ હોવી જોઈએ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},ન કરતાં જૂની સ્ટોક વ્યવહારો સુધારવા માટે મંજૂરી {0}
 DocType: Purchase Invoice Item,PR Detail,PR વિગતવાર
 DocType: Sales Order,Fully Billed,સંપૂર્ણપણે ગણાવી
@@ -3302,7 +3369,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,વાયર ટ્રાન્સફર
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,બધા તપાસો
 DocType: Vehicle Log,Invoice Ref,ભરતિયું સંદર્ભ
-DocType: Purchase Order,Recurring Order,રીકરીંગ ઓર્ડર
 DocType: Company,Default Income Account,ડિફૉલ્ટ આવક એકાઉન્ટ
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,ગ્રાહક જૂથ / ગ્રાહક
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),બંધ ન થયેલી ફિસ્કલ યર નફો / નુકશાન (ક્રેડિટ)
@@ -3316,9 +3382,9 @@
 DocType: Patient,A Negative,નકારાત્મક
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,વધુ કંઇ બતાવવા માટે.
 DocType: Lead,From Customer,ગ્રાહક પાસેથી
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,કોલ્સ
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,કોલ્સ
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,એક પ્રોડક્ટ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,બૅચેસ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,બૅચેસ
 DocType: Project,Total Costing Amount (via Time Logs),કુલ પડતર રકમ (સમય લોગ મારફતે)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,ફી સૂચિ બનાવો
 DocType: Purchase Order Item Supplied,Stock UOM,સ્ટોક UOM
@@ -3342,7 +3408,7 @@
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,પાંદડા અને હોલિડે
 DocType: School Settings,Current Academic Term,વર્તમાન શૈક્ષણિક ટર્મ
 DocType: Sales Order,Not Billed,રજુ કરવામાં આવ્યું ન
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,બંને વેરહાઉસ જ કંપની સંબંધ માટે જ જોઈએ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,બંને વેરહાઉસ જ કંપની સંબંધ માટે જ જોઈએ
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,કોઈ સંપર્કો હજુ સુધી ઉમેર્યું.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,ઉતારેલ માલની કિંમત વાઉચર જથ્થો
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,સપ્લાયર્સ દ્વારા ઉઠાવવામાં બીલો.
@@ -3351,7 +3417,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,ડિસ્કાઉન્ટ રકમ
 DocType: Purchase Invoice,Return Against Purchase Invoice,સામે ખરીદી ભરતિયું પાછા ફરો
 DocType: Item,Warranty Period (in days),(દિવસોમાં) વોરંટી સમયગાળા
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',અપડેટ &#39;ટૅબ પેટિક નિમણૂંક` સેટ વેચાણ_ઇન્વોઇસ =&#39; {0} &#39;જ્યાં નામ =&#39; {1} &#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Guardian1 સાથે સંબંધ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,ઓપરેશન્સ થી ચોખ્ખી રોકડ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,આઇટમ 4
@@ -3360,8 +3425,8 @@
 DocType: Journal Entry Account,Journal Entry Account,જર્નલ પ્રવેશ એકાઉન્ટ
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,વિદ્યાર્થી જૂથ
 DocType: Shopping Cart Settings,Quotation Series,અવતરણ સિરીઝ
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","એક વસ્તુ જ નામ સાથે હાજર ({0}), આઇટમ જૂથ નામ બદલવા અથવા વસ્તુ નામ બદલી કૃપા કરીને"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,કૃપા કરીને ગ્રાહક પસંદ
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","એક વસ્તુ જ નામ સાથે હાજર ({0}), આઇટમ જૂથ નામ બદલવા અથવા વસ્તુ નામ બદલી કૃપા કરીને"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,કૃપા કરીને ગ્રાહક પસંદ
 DocType: C-Form,I,હું
 DocType: Company,Asset Depreciation Cost Center,એસેટ અવમૂલ્યન કિંમત કેન્દ્ર
 DocType: Sales Order Item,Sales Order Date,સેલ્સ ઓર્ડર તારીખ
@@ -3370,6 +3435,7 @@
 DocType: Assessment Plan,Assessment Plan,આકારણી યોજના
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,ગ્રાહક {0} બનાવવામાં આવેલ છે
 DocType: Stock Settings,Limit Percent,મર્યાદા ટકા
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,હાલમાં કોઈ વેરહાઉસમાં કોઈ સ્ટોક ઉપલબ્ધ નથી
 ,Payment Period Based On Invoice Date,ભરતિયું તારીખ પર આધારિત ચુકવણી સમય
 DocType: Sample Collection,No. of print,પ્રિન્ટની સંખ્યા
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},માટે ખૂટે કરન્સી વિનિમય દરો {0}
@@ -3425,13 +3491,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,કુલ પે - કુલ કપાત - લોન પરત ચૂકવણી
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,વર્તમાન BOM અને નવા BOM જ ન હોઈ શકે
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,પગાર કાપલી ID ને
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,પગાર કાપલી ID ને
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,નિવૃત્તિ તારીખ જોડાયા તારીખ કરતાં મોટી હોવી જ જોઈએ
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,ભૂલો પર કોર્સ સુનિશ્ચિત જ્યારે હતા:
 DocType: Sales Invoice,Against Income Account,આવક એકાઉન્ટ સામે
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% વિતરિત
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,વસ્તુ {0}: આદેશ આપ્યો Qty {1} ન્યૂનતમ ક્રમ Qty {2} (વસ્તુ માં વ્યાખ્યાયિત) કરતા ઓછી ન હોઈ શકે.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,વસ્તુ {0}: આદેશ આપ્યો Qty {1} ન્યૂનતમ ક્રમ Qty {2} (વસ્તુ માં વ્યાખ્યાયિત) કરતા ઓછી ન હોઈ શકે.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,માસિક વિતરણ ટકાવારી
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,કૃપા કરીને અન્ય વપરાશકર્તા તરીકે લૉગિન કરો.
 DocType: Territory,Territory Targets,પ્રદેશ લક્ષ્યાંક
 DocType: Delivery Note,Transporter Info,ટ્રાન્સપોર્ટર માહિતી
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},મૂળભૂત {0} કંપની સુયોજિત કરો {1}
@@ -3439,13 +3506,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,જ સપ્લાયર ઘણી વખત દાખલ કરવામાં આવી છે
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,ગ્રોસ પ્રોફિટ / નુકશાન
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,ઓર્ડર વસ્તુ પાડેલ ખરીદી
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,કંપની નામ કંપની ન હોઈ શકે
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,કંપની નામ કંપની ન હોઈ શકે
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,પ્રિન્ટ નમૂનાઓ માટે પત્ર ચેતવણી.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,પ્રિન્ટ ટેમ્પલેટો માટે શિર્ષકો કાચું ભરતિયું દા.ત..
 DocType: Program Enrollment,Walking,વોકીંગ
 DocType: Student Guardian,Student Guardian,વિદ્યાર્થી ગાર્ડિયન
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,મૂલ્યાંકન પ્રકાર ખર્ચ વ્યાપક તરીકે ચિહ્નિત નથી કરી શકો છો
 DocType: POS Profile,Update Stock,સુધારા સ્ટોક
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,સબ્સ્ક્રિપ્શનમાં
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,વસ્તુઓ માટે વિવિધ UOM ખોટી (કુલ) નેટ વજન કિંમત તરફ દોરી જશે. દરેક વસ્તુ ચોખ્ખી વજન જ UOM છે કે તેની ખાતરી કરો.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM દર
 DocType: Asset,Journal Entry for Scrap,સ્ક્રેપ માટે જર્નલ પ્રવેશ
@@ -3493,15 +3561,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","સિસ્ટમ વપરાશકર્તા (લોગઇન) એજન્સી આઈડી. સુયોજિત કરો, તો તે બધા એચઆર ફોર્મ માટે મૂળભૂત બની જાય છે."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: પ્રતિ {1}
 DocType: Task,depends_on,પર આધાર રાખે છે
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,સામગ્રીના તમામ બિલમાં નવીનતમ ભાવને અપડેટ કરવા માટે કતારબદ્ધ. તેમાં થોડો સમય લાગી શકે છે.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,સામગ્રીના તમામ બિલમાં નવીનતમ ભાવને અપડેટ કરવા માટે કતારબદ્ધ. તેમાં થોડો સમય લાગી શકે છે.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,નવા એકાઉન્ટ ના નામ. નોંધ: ગ્રાહકો અને સપ્લાયર્સ માટે એકાઉન્ટ્સ બનાવી નથી કરો
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,દેશ મુજબની મૂળભૂત સરનામું નમૂનાઓ
 DocType: Sales Order Item,Supplier delivers to Customer,પુરવઠોકર્તા ગ્રાહક માટે પહોંચાડે છે
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ફોર્મ / વસ્તુ / {0}) સ્ટોક બહાર છે
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},કારણે / સંદર્ભ તારીખ પછી ન હોઈ શકે {0}
+,Sales Payment Summary,સેલ્સ પેમેન્ટ સારાંશ
+DocType: Restaurant,Restaurant,નાસ્તાગૃહ
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},કારણે / સંદર્ભ તારીખ પછી ન હોઈ શકે {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,માહિતી આયાત અને નિકાસ
 DocType: Patient,Account Details,ખાતાની માહિતી
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,કોઈ વિદ્યાર્થીઓ મળ્યો
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,કોઈ વિદ્યાર્થીઓ મળ્યો
 DocType: Medical Department,Medical Department,તબીબી વિભાગ
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,સપ્લાયર સ્કોરકાર્ડ સ્કોરિંગ માપદંડ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,ભરતિયું પોસ્ટ તારીખ
@@ -3512,7 +3582,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,કૃપા કરીને પાર્ટી પસંદ કર્યા પહેલાં પોસ્ટ તારીખ સિલેક્ટ કરો
 DocType: Program Enrollment,School House,શાળા હાઉસ
 DocType: Serial No,Out of AMC,એએમસીના આઉટ
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,સુવાકયો પસંદ કરો
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,સુવાકયો પસંદ કરો
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,નક્કી Depreciations સંખ્યા કુલ Depreciations સંખ્યા કરતાં વધારે ન હોઈ શકે
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,જાળવણી મુલાકાત કરી
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,સેલ્સ માસ્ટર વ્યવસ્થાપક {0} ભૂમિકા છે જે વપરાશકર્તા માટે સંપર્ક કરો
@@ -3520,7 +3590,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,કંપની (નથી ગ્રાહક અથવા સપ્લાયર) માસ્ટર.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,આ વિદ્યાર્થી હાજરી પર આધારિત છે
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,કોઈ વિદ્યાર્થી
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,વધુ વસ્તુઓ અથવા ઓપન સંપૂર્ણ ફોર્મ ઉમેરો
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,વધુ વસ્તુઓ અથવા ઓપન સંપૂર્ણ ફોર્મ ઉમેરો
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ડ લવર નોંધો {0} આ વેચાણ ઓર્ડર રદ પહેલાં રદ થયેલ હોવું જ જોઈએ
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,વપરાશકર્તાઓ પર જાઓ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,ચૂકવેલ રકમ રકમ ગ્રાન્ડ કુલ કરતાં વધારે ન હોઈ શકે માંડવાળ +
@@ -3540,37 +3610,40 @@
 DocType: Fee Schedule,Fee Schedule,ફી સૂચિ
 DocType: Hub Settings,Publish Availability,ઉપલબ્ધતા પ્રકાશિત
 DocType: Company,Create Chart Of Accounts Based On,ખાતાઓ પર આધારિત ચાર્ટ બનાવો
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,તેને બિન-જૂથમાં રૂપાંતરિત કરી શકાતું નથી. બાળ કાર્યો અસ્તિત્વ ધરાવે છે
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,જન્મ તારીખ આજે કરતાં વધારે ન હોઈ શકે.
 ,Stock Ageing,સ્ટોક એઇજીંગનો
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},વિદ્યાર્થી {0} વિદ્યાર્થી અરજદાર સામે અસ્તિત્વમાં {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),રાઉન્ડિંગ એડજસ્ટમેન્ટ (કંપની કરન્સી)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,સમય પત્રક
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,સમય પત્રક
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} &#39;{1}&#39; અક્ષમ છે
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ઓપન તરીકે સેટ કરો
 DocType: Cheque Print Template,Scanned Cheque,સ્કેન ચેક
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,સબમિટ વ્યવહારો પર સંપર્કો આપોઆપ ઇમેઇલ્સ મોકલો.
 DocType: Timesheet,Total Billable Amount,કુલ બિલેબલ રકમ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,આઇટમ 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,ઓર્ડર એન્ટ્રી
 DocType: Purchase Order,Customer Contact Email,ગ્રાહક સંપર્ક ઇમેઇલ
 DocType: Warranty Claim,Item and Warranty Details,વસ્તુ અને વોરંટી વિગતો
 DocType: Sales Team,Contribution (%),યોગદાન (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,નોંધ: ચુકવણી એન્ટ્રી થી બનાવી શકાય નહીં &#39;કેશ અથવા બેન્ક એકાઉન્ટ&#39; સ્પષ્ટ કરેલ ન હતી
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,પ્રોજેક્ટ {0} પહેલાંથી અસ્તિત્વમાં છે
 DocType: Medical Department,Nursing User,નર્સિંગ વપરાશકર્તા
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,જવાબદારીઓ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,આ અવતરણની માન્યતા અવધિ સમાપ્ત થઈ ગઈ છે.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,આ અવતરણની માન્યતા અવધિ સમાપ્ત થઈ ગઈ છે.
 DocType: Expense Claim Account,Expense Claim Account,ખર્ચ દાવો એકાઉન્ટ
 DocType: Accounts Settings,Allow Stale Exchange Rates,સ્ટેલ એક્સચેન્જ દરોને મંજૂરી આપો
 DocType: Sales Person,Sales Person Name,વેચાણ વ્યક્તિ નામ
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,કોષ્ટકમાં ઓછામાં ઓછા 1 ભરતિયું દાખલ કરો
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,વપરાશકર્તાઓ ઉમેરો
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,વપરાશકર્તાઓ ઉમેરો
 DocType: POS Item Group,Item Group,વસ્તુ ગ્રુપ
 DocType: Item,Safety Stock,સુરક્ષા સ્ટોક
 DocType: Healthcare Settings,Healthcare Settings,હેલ્થકેર સેટિંગ્સ
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,એક કાર્ય માટે પ્રગતિ% 100 કરતાં વધુ ન હોઈ શકે.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,એક કાર્ય માટે પ્રગતિ% 100 કરતાં વધુ ન હોઈ શકે.
 DocType: Stock Reconciliation Item,Before reconciliation,સમાધાન પહેલાં
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},માટે {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),કર અને ખર્ચ ઉમેરાયેલ (કંપની ચલણ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,વસ્તુ ટેક્સ રો {0} પ્રકાર વેરો કે આવક અથવા ખર્ચ અથવા લેવાપાત્ર કારણે હોવી જ જોઈએ
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,વસ્તુ ટેક્સ રો {0} પ્રકાર વેરો કે આવક અથવા ખર્ચ અથવા લેવાપાત્ર કારણે હોવી જ જોઈએ
 DocType: Sales Order,Partly Billed,આંશિક ગણાવી
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,વસ્તુ {0} એક નિશ્ચિત એસેટ વસ્તુ જ હોવી જોઈએ
 DocType: Item,Default BOM,મૂળભૂત BOM
@@ -3586,6 +3659,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,વેરિયેબલ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,ડ લવર નોંધ
 DocType: Student,Student Email Address,વિદ્યાર્થી ઇમેઇલ સરનામું
+DocType: Item,Hub Warehouse,હબ વેરહાઉસ
 DocType: Physician Schedule Time Slot,From Time,સમય
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,ઉપલબ્ધ છે:
 DocType: Notification Control,Custom Message,કસ્ટમ સંદેશ
@@ -3593,9 +3667,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,કેશ અથવા બેન્ક એકાઉન્ટ ચુકવણી પ્રવેશ બનાવવા માટે ફરજિયાત છે
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,વિદ્યાર્થી સરનામું
 DocType: Purchase Invoice,Price List Exchange Rate,ભાવ યાદી એક્સચેન્જ રેટ
+DocType: POS Profile,POS Profile Name,POS પ્રોફાઇલ નામ
 DocType: Purchase Invoice Item,Rate,દર
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,ઇન્ટર્ન
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,એડ્રેસ નામ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,એડ્રેસ નામ
 DocType: Stock Entry,From BOM,BOM થી
 DocType: Assessment Code,Assessment Code,આકારણી કોડ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,મૂળભૂત
@@ -3609,11 +3684,12 @@
 DocType: Salary Slip,Salary Structure,પગાર માળખું
 DocType: Account,Bank,બેન્ક
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,એરલાઇન
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,ઇશ્યૂ સામગ્રી
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,ઇશ્યૂ સામગ્રી
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,રિકરિંગ બનાવતી વખતે એક ભૂલ આવી
 DocType: Material Request Item,For Warehouse,વેરહાઉસ માટે
 DocType: Employee,Offer Date,ઓફર તારીખ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,સુવાકયો
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,તમે ઑફલાઇન મોડ છે. તમે જ્યાં સુધી તમે નેટવર્ક ફરીથી લોડ કરવા માટે સમર્થ હશે નહિં.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,તમે ઑફલાઇન મોડ છે. તમે જ્યાં સુધી તમે નેટવર્ક ફરીથી લોડ કરવા માટે સમર્થ હશે નહિં.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,કોઈ વિદ્યાર્થી જૂથો બનાવી છે.
 DocType: Purchase Invoice Item,Serial No,સીરીયલ કોઈ
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,માસિક ચુકવણી રકમ લોન રકમ કરતાં વધારે ન હોઈ શકે
@@ -3623,17 +3699,18 @@
 DocType: Salary Slip,Total Working Hours,કુલ કામ કલાક
 DocType: Subscription,Next Schedule Date,આગામી સૂચિ તારીખ
 DocType: Stock Entry,Including items for sub assemblies,પેટા વિધાનસભાઓ માટે વસ્તુઓ સહિત
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,દાખલ કિંમત હકારાત્મક હોવો જ જોઈએ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,બધા પ્રદેશો
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,દાખલ કિંમત હકારાત્મક હોવો જ જોઈએ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,બધા પ્રદેશો
 DocType: Purchase Invoice,Items,વસ્તુઓ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,વિદ્યાર્થી પહેલેથી પ્રવેશ છે.
 DocType: Fiscal Year,Year Name,વર્ષ નામ
 DocType: Process Payroll,Process Payroll,પ્રક્રિયા પેરોલ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,કામ દિવસો કરતાં વધુ રજાઓ આ મહિને છે.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,કામ દિવસો કરતાં વધુ રજાઓ આ મહિને છે.
 DocType: Product Bundle Item,Product Bundle Item,ઉત્પાદન બંડલ વસ્તુ
 DocType: Sales Partner,Sales Partner Name,વેચાણ ભાગીદાર નામ
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,સુવાકયો માટે વિનંતી
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,સુવાકયો માટે વિનંતી
 DocType: Payment Reconciliation,Maximum Invoice Amount,મહત્તમ ભરતિયું જથ્થા
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,હેમેટોલોજી
 DocType: Normal Test Items,Normal Test Items,સામાન્ય ટેસ્ટ આઈટમ્સ
 DocType: Student Language,Student Language,વિદ્યાર્થી ભાષા
 apps/erpnext/erpnext/config/selling.py +23,Customers,ગ્રાહકો
@@ -3644,10 +3721,11 @@
 DocType: Issue,Opening Time,ઉદઘાટન સમય
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,પ્રતિ અને જરૂરી તારીખો
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,સિક્યોરિટીઝ એન્ડ કોમોડિટી એક્સચેન્જો
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',વેરિએન્ટ માટે માપવા એકમ મૂળભૂત &#39;{0}&#39; નમૂનો તરીકે જ હોવી જોઈએ &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',વેરિએન્ટ માટે માપવા એકમ મૂળભૂત &#39;{0}&#39; નમૂનો તરીકે જ હોવી જોઈએ &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,પર આધારિત ગણતરી
 DocType: Delivery Note Item,From Warehouse,વેરહાઉસ માંથી
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,માલ બિલ સાથે કોઈ વસ્તુઓ ઉત્પાદન
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,માલ બિલ સાથે કોઈ વસ્તુઓ ઉત્પાદન
+DocType: Restaurant,Default Customer,ડિફૉલ્ટ ગ્રાહક
 DocType: Assessment Plan,Supervisor Name,સુપરવાઇઝર નામ
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,ખાતરી કરો કે એ જ દિવસે નિમણૂક બનાવવામાં આવી નથી
 DocType: Program Enrollment Course,Program Enrollment Course,કાર્યક્રમ નોંધણી કોર્સ
@@ -3662,7 +3740,7 @@
 DocType: Manufacturer,Limited to 12 characters,12 અક્ષરો સુધી મર્યાદિત
 DocType: Journal Entry,Print Heading,પ્રિંટ મથાળું
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,કુલ શૂન્ય ન હોઈ શકે
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&#39;છેલ્લું ઓર્ડર સુધીનાં દિવસો&#39; શૂન્ય કરતાં વધારે અથવા સમાન હોવો જોઈએ
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'છેલ્લા ઓર્ડર થી દિવસો' શૂન્ય કરતાં વધારે અથવા સમાન હોવા જોઈએ
 DocType: Process Payroll,Payroll Frequency,પગારપત્રક આવર્તન
 DocType: Lab Test Template,Sensitivity,સંવેદનશીલતા
 DocType: Asset,Amended From,સુધારો
@@ -3674,7 +3752,7 @@
 DocType: Payment Entry,Internal Transfer,આંતરિક ટ્રાન્સફર
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,બાળ એકાઉન્ટ આ એકાઉન્ટ માટે અસ્તિત્વમાં છે. તમે આ એકાઉન્ટ કાઢી શકતા નથી.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ક્યાં લક્ષ્ય Qty અથવા લક્ષ્ય રકમ ફરજિયાત છે
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},મૂળભૂત BOM વસ્તુ માટે અસ્તિત્વમાં {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},મૂળભૂત BOM વસ્તુ માટે અસ્તિત્વમાં {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,પ્રથમ પોસ્ટ તારીખ પસંદ કરો
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,તારીખ ઓપનિંગ તારીખ બંધ કરતા પહેલા પ્રયત્ન કરીશું
 DocType: Leave Control Panel,Carry Forward,આગળ લઈ
@@ -3709,6 +3787,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,કુલ પ્રેઝન્ટ
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,હિસાબી નિવેદનો
 DocType: Drug Prescription,Hour,કલાક
+DocType: Restaurant Order Entry,Last Sales Invoice,છેલ્લું વેચાણ ભરતિયું
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,ન્યૂ સીરીયલ કોઈ વેરહાઉસ કરી શકે છે. વેરહાઉસ સ્ટોક એન્ટ્રી અથવા ખરીદી રસીદ દ્વારા સુયોજિત થયેલ હોવું જ જોઈએ
 DocType: Lead,Lead Type,લીડ પ્રકાર
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,તમે બ્લોક તારીખો પર પાંદડા મંજૂર કરવા માટે અધિકૃત નથી
@@ -3743,64 +3822,66 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,બનાવવા વપરાશકર્તાઓ
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,ગ્રામ
 DocType: Supplier Scorecard,Per Month,દર મહિને
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,ઉત્પાદન જથ્થો 0 કરતાં મોટી હોવી જ જોઈએ.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,ઉત્પાદન જથ્થો 0 કરતાં મોટી હોવી જ જોઈએ.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,જાળવણી કોલ માટે અહેવાલ મુલાકાત લો.
 DocType: Stock Entry,Update Rate and Availability,સુધારા દર અને ઉપલબ્ધતા
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,ટકાવારી તમે પ્રાપ્ત અથવા આદેશ આપ્યો જથ્થો સામે વધુ પહોંચાડવા માટે માન્ય છે. ઉદાહરણ તરીકે: તમે 100 એકમો આદેશ આપ્યો હોય તો. અને તમારા ભથ્થું પછી તમે 110 એકમો મેળવવા માટે માન્ય છે 10% છે.
 DocType: POS Customer Group,Customer Group,ગ્રાહક જૂથ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),ન્યૂ બેચ આઈડી (વૈકલ્પિક)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),ન્યૂ બેચ આઈડી (વૈકલ્પિક)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},ખર્ચ હિસાબ આઇટમ માટે ફરજિયાત છે {0}
 DocType: BOM,Website Description,વેબસાઇટ વર્ણન
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ઈક્વિટી કુલ ફેરફાર
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,સૌથી નવું
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,ખરીદી ભરતિયું {0} રદ કૃપા કરીને પ્રથમ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ઇમેઇલ સરનામું અનન્ય હોવો જોઈએ, પહેલેથી જ અસ્તિત્વમાં છે {0}"
 DocType: Serial No,AMC Expiry Date,એએમસી સમાપ્તિ તારીખ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,રસીદ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,રસીદ
 ,Sales Register,સેલ્સ રજિસ્ટર
 DocType: Daily Work Summary Settings Company,Send Emails At,ઇમેઇલ્સ મોકલો ખાતે
 DocType: Quotation,Quotation Lost Reason,અવતરણ લોસ્ટ કારણ
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,તમારા ડોમેન પસંદ કરો
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',ટેબ પેટીઅન્ટમાંથી * પસંદ કરો જ્યાં નામ = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},ટ્રાન્ઝેક્શન સંદર્ભ કોઈ {0} ના રોજ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},ટ્રાન્ઝેક્શન સંદર્ભ કોઈ {0} ના રોજ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ફેરફાર કરવા માટે કંઈ નથી.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,ફોર્મ જુઓ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,આ મહિને અને બાકી પ્રવૃત્તિઓ માટે સારાંશ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,ફોર્મ જુઓ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,આ મહિને અને બાકી પ્રવૃત્તિઓ માટે સારાંશ
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","તમારા સંગઠન માટે, તમારી જાતે કરતાં અન્ય વપરાશકર્તાઓને ઉમેરો"
 DocType: Customer Group,Customer Group Name,ગ્રાહક જૂથ નામ
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,હજુ સુધી કોઈ ગ્રાહકો!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,હજુ સુધી કોઈ ગ્રાહકો!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,કેશ ફ્લો સ્ટેટમેન્ટ
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},લોન રકમ મહત્તમ લોન રકમ કરતાં વધી શકે છે {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,લાઈસન્સ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},સી-ફોર્મ આ બિલ {0} દૂર કરો {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},સી-ફોર્મ આ બિલ {0} દૂર કરો {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"તમે પણ અગાઉના નાણાકીય વર્ષમાં બેલેન્સ ચાલુ નાણાકીય વર્ષના નહીં સામેલ કરવા માંગો છો, તો આગળ લઈ પસંદ કરો"
 DocType: GL Entry,Against Voucher Type,વાઉચર પ્રકાર સામે
 DocType: Physician,Phone (R),ફોન (આર)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,ટાઇમ સ્લોટ્સ ઉમેરવામાં
 DocType: Item,Attributes,લક્ષણો
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,નમૂનાને સક્ષમ કરો
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} સેટઅપ&gt; સેટિંગ્સ&gt; નામકરણની શ્રેણી માટે નામકરણ શ્રેણી સેટ કરો
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,એકાઉન્ટ માંડવાળ દાખલ કરો
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,છેલ્લે ઓર્ડર તારીખ
 DocType: Patient,B Negative,બી નકારાત્મક
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},એકાઉન્ટ {0} કરે કંપની માટે અનુસરે છે નથી {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,{0} પંક્તિમાં ક્રમાંકોમાં સાથે ડિલીવરી નોંધ મેચ થતો નથી
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,{0} પંક્તિમાં ક્રમાંકોમાં સાથે ડિલીવરી નોંધ મેચ થતો નથી
 DocType: Student,Guardian Details,ગાર્ડિયન વિગતો
 DocType: C-Form,C-Form,સી-ફોર્મ
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,બહુવિધ કર્મચારીઓ માટે માર્ક એટેન્ડન્સ
 DocType: Vehicle,Chassis No,ચેસીસ કોઈ
 DocType: Payment Request,Initiated,શરૂ
 DocType: Production Order,Planned Start Date,આયોજિત પ્રારંભ તારીખ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,કૃપા કરીને એક BOM પસંદ કરો
 DocType: Serial No,Creation Document Type,બનાવટ દસ્તાવેજ પ્રકારની
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,અંતિમ તારીખ પ્રારંભ તારીખથી વધુ હોવી જોઈએ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,અંતિમ તારીખ પ્રારંભ તારીખથી વધુ હોવી જોઈએ
 DocType: Leave Type,Is Encash,વેચીને રોકડાં નાણાં કરવાં છે
 DocType: Leave Allocation,New Leaves Allocated,નવા પાંદડા સોંપાયેલ
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,પ્રોજેક્ટ મુજબના માહિતી અવતરણ માટે ઉપલબ્ધ નથી
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,પર અંત
 DocType: Project,Expected End Date,અપેક્ષિત ઓવરને તારીખ
 DocType: Budget Account,Budget Amount,બજેટ રકમ
 DocType: Appraisal Template,Appraisal Template Title,મૂલ્યાંકન ઢાંચો શીર્ષક
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},તારીખ થી {0} માટે કર્મચારી {1} પહેલાં કર્મચારી જોડાયા તારીખ ન હોઈ શકે {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,કોમર્શિયલ
 DocType: Patient,Alcohol Current Use,દારૂ વર્તમાન ઉપયોગ
+DocType: Student Admission Program,Student Admission Program,વિદ્યાર્થી પ્રવેશ કાર્યક્રમ
 DocType: Payment Entry,Account Paid To,એકાઉન્ટ ચૂકવેલ
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,પિતૃ વસ્તુ {0} સ્ટોક વસ્તુ ન હોવું જોઈએ
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,બધા ઉત્પાદનો અથવા સેવાઓ.
@@ -3809,30 +3890,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} એકાઉન્ટ માટે બજેટ {1} સામે {2} {3} છે {4}. તે દ્વારા કરતાં વધી જશે {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',રો {0} # એકાઉન્ટ પ્રકાર હોવા જ જોઈએ &#39;સ્થિર એસેટ&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Qty આઉટ
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,નિયમો વેચાણ માટે શીપીંગ જથ્થો ગણતરી માટે
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,અને અનચેક
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,સિરીઝ ફરજિયાત છે
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,ફાઈનાન્સિયલ સર્વિસીસ
 DocType: Student Sibling,Student ID,વિદ્યાર્થી ID
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,સમય લોગ માટે પ્રવૃત્તિઓ પ્રકાર
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,સપ્લાયર ઇમેઇલ
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,સમય લોગ માટે પ્રવૃત્તિઓ પ્રકાર
 DocType: Tax Rule,Sales,સેલ્સ
 DocType: Stock Entry Detail,Basic Amount,મૂળભૂત રકમ
 DocType: Training Event,Exam,પરીક્ષા
 DocType: Complaint,Complaint,ફરિયાદ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},વેરહાઉસ સ્ટોક વસ્તુ માટે જરૂરી {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},વેરહાઉસ સ્ટોક વસ્તુ માટે જરૂરી {0}
 DocType: Leave Allocation,Unused leaves,નહિં વપરાયેલ પાંદડા
 DocType: Patient,Alcohol Past Use,મદ્યાર્ક ભૂતકાળનો ઉપયોગ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,લાખોમાં
 DocType: Tax Rule,Billing State,બિલિંગ રાજ્ય
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,ટ્રાન્સફર
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),(પેટા-સ્થળોના સહિત) ફેલાય છે BOM મેળવો
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,ટ્રાન્સફર
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),(પેટા-સ્થળોના સહિત) ફેલાય છે BOM મેળવો
 DocType: Authorization Rule,Applicable To (Employee),લાગુ કરો (કર્મચારી)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,કારણે તારીખ ફરજિયાત છે
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,કારણે તારીખ ફરજિયાત છે
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,લક્ષણ માટે વૃદ્ધિ {0} 0 ન હોઈ શકે
 DocType: Journal Entry,Pay To / Recd From,ના / Recd પગાર
 DocType: Naming Series,Setup Series,સેટઅપ સિરીઝ
 DocType: Payment Reconciliation,To Invoice Date,તારીખ ભરતિયું
 DocType: Supplier,Contact HTML,સંપર્ક HTML
 ,Inactive Customers,નિષ્ક્રિય ગ્રાહકો
+DocType: Student Admission Program,Maximum Age,મહત્તમ ઉંમર
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,ખરીદી રસીદો
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,કેવી રીતે પ્રાઇસીંગ નિયમ લાગુ પડે છે?
@@ -3851,6 +3934,7 @@
 DocType: GL Entry,Remarks,રીમાર્કસ
 DocType: Payment Entry,Account Paid From,એકાઉન્ટ ચૂકવણી
 DocType: Purchase Order Item Supplied,Raw Material Item Code,કાચો સામગ્રી વસ્તુ કોડ
+DocType: Task,Parent Task,માતાપિતા કાર્ય
 DocType: Journal Entry,Write Off Based On,પર આધારિત માંડવાળ
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,લીડ બનાવો
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,પ્રિન્ટ અને સ્ટેશનરી
@@ -3859,19 +3943,19 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","પગાર પહેલેથી જ વચ્ચે {0} અને {1}, એપ્લિકેશન સમયગાળા છોડો આ તારીખ શ્રેણી વચ્ચે ન હોઈ શકે સમયગાળા માટે પ્રક્રિયા."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,સીરીયલ નંબર માટે સ્થાપન રેકોર્ડ
 DocType: Guardian Interest,Guardian Interest,ગાર્ડિયન વ્યાજ
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,POS ઇનવૉઇસેસ માટે ડિફોલ્ટ મૂલ્યો સેટ કરો
 apps/erpnext/erpnext/config/hr.py +177,Training,તાલીમ
 DocType: Timesheet,Employee Detail,કર્મચારીનું વિગતવાર
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ઇમેઇલ આઈડી
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,આગામી તારીખ ડે અને મહિનાનો દિવસ પર પુનરાવર્તન સમાન હોવા જ જોઈએ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,આગામી તારીખ ડે અને મહિનાનો દિવસ પર પુનરાવર્તન સમાન હોવા જ જોઈએ
 DocType: Lab Prescription,Test Code,ટેસ્ટ કોડ
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,વેબસાઇટ હોમપેજ માટે સેટિંગ્સ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},{1} ના સ્કોરકાર્ડ સ્ટેન્ડને કારણે {0} માટે RFQs ને મંજૂરી નથી
 DocType: Offer Letter,Awaiting Response,પ્રતિભાવ પ્રતીક્ષામાં
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,ઉપર
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},કુલ રકમ {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},અમાન્ય લક્ષણ {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},કુલ રકમ {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},અમાન્ય લક્ષણ {0} {1}
 DocType: Supplier,Mention if non-standard payable account,ઉલ્લેખ જો નોન-સ્ટાન્ડર્ડ ચૂકવવાપાત્ર એકાઉન્ટ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},એક જ આઇટમ્સનો અનેકવાર દાખલ કરવામાં આવી છે. {યાદી}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',કૃપા કરીને આકારણી &#39;તમામ એસેસમેન્ટ જૂથો&#39; કરતાં અન્ય જૂથ પસંદ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},રો {0}: આઇટમ {1} માટે કોસ્ટ સેન્ટર જરૂરી છે
 DocType: Training Event Employee,Optional,વૈકલ્પિક
@@ -3894,19 +3978,20 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ખર્ચ કેન્દ્રને વસ્તુ માટે ફરજિયાત છે {2}
 DocType: Vehicle,Policy No,નીતિ કોઈ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,ઉત્પાદન બંડલ થી વસ્તુઓ વિચાર
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","જેમ સ્ટોક {0} આઇટમ સામે અસ્તિત્વ ધરાવે છે, તમે વેરિઅન્ટ્સની મિલકતને સક્ષમ કરી શકતા નથી"
 DocType: Asset,Straight Line,સીધી રેખા
 DocType: Project User,Project User,પ્રોજેક્ટ વપરાશકર્તા
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,સ્પ્લિટ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,સ્પ્લિટ
 DocType: GL Entry,Is Advance,અગાઉથી છે
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,તારીખ તારીખ અને હાજરી થી એટેન્ડન્સ ફરજિયાત છે
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,હા અથવા ના હોય તરીકે &#39;subcontracted છે&#39; દાખલ કરો
+DocType: Item,Default Purchase Unit of Measure,મેઝરની ડિફોલ્ટ ખરીદ એકમ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,છેલ્લે કોમ્યુનિકેશન તારીખ
 DocType: Sales Team,Contact No.,સંપર્ક નંબર
 DocType: Bank Reconciliation,Payment Entries,ચુકવણી પ્રવેશો
 DocType: Production Order,Scrap Warehouse,સ્ક્રેપ વેરહાઉસ
 DocType: Production Order,Check if material transfer entry is not required,જો સામગ્રી ટ્રાન્સફર પ્રવેશ જરૂરી નથી તપાસો
 DocType: Program Enrollment Tool,Get Students From,વિદ્યાર્થીઓ મેળવો
-DocType: Hub Settings,Seller Country,વિક્રેતા દેશ
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,વેબસાઇટ પર આઇટમ્સ પ્રકાશિત
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,બૅચેસ માં ગ્રુપ તમારા વિદ્યાર્થીઓ
 DocType: Authorization Rule,Authorization Rule,અધિકૃતિ નિયમ
@@ -3916,7 +4001,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,વેચાણ કર અને ખર્ચ ઢાંચો
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),કુલ (ક્રેડિટ)
 DocType: Repayment Schedule,Payment Date,ચુકવણીની તારીખ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,ન્યૂ બેચ Qty
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,ન્યૂ બેચ Qty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,એપેરલ અને એસેસરીઝ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,ભારિત સ્કોર વિધેયને હલ કરી શક્યા નથી. ખાતરી કરો કે સૂત્ર માન્ય છે.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,ઓર્ડર સંખ્યા
@@ -3934,6 +4019,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","રો # {0}: એસેટ {1} સુપ્રત કરી શકાય નહીં, તે પહેલેથી જ છે {2}"
 DocType: Tax Rule,Billing Country,બિલિંગ દેશ
 DocType: Purchase Order Item,Expected Delivery Date,અપેક્ષિત બોલ તારીખ
+DocType: Restaurant Order Entry,Restaurant Order Entry,રેસ્ટોરન્ટ ઓર્ડર એન્ટ્રી
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ડેબિટ અને ક્રેડિટ {0} # માટે સમાન નથી {1}. તફાવત છે {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,મનોરંજન ખર્ચ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,સામગ્રી વિનંતી કરવા
@@ -3946,9 +4032,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,હાલની વ્યવહાર સાથે એકાઉન્ટ કાઢી શકાતી નથી
 DocType: Vehicle,Last Carbon Check,છેલ્લા કાર્બન ચેક
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,કાનૂની ખર્ચ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,કૃપા કરીને પંક્તિ પર જથ્થો પસંદ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,કૃપા કરીને પંક્તિ પર જથ્થો પસંદ
 DocType: Purchase Invoice,Posting Time,પોસ્ટિંગ સમય
 DocType: Timesheet,% Amount Billed,% રકમ ગણાવી
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;નિમણૂંકનો સમય&quot; ડૉ માટે {0} સેટ કરવામાં આવ્યો નથી. તે ફિઝિશિયન માસ્ટરમાં ઉમેરો.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,ટેલિફોન ખર્ચ
 DocType: Sales Partner,Logo,લોગો
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"તમે બચત પહેલાં શ્રેણી પસંદ કરો વપરાશકર્તા પર દબાણ કરવા માંગો છો, તો આ તપાસો. તમે આ તપાસો જો કોઈ મૂળભૂત હશે."
@@ -3959,6 +4046,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,નવા ગ્રાહક આવક
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,પ્રવાસ ખર્ચ
 DocType: Maintenance Visit,Breakdown,વિરામ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Doctype {0} માં વૈવિધ્યપૂર્ણ ક્ષેત્ર ઉમેદવારી ઉમેરો
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,ખાતું: {0} ચલણ સાથે: {1} પસંદ કરી શકાતી નથી
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","તાજેતરની મૂલ્યાંકન દર / ભાવ યાદી દર / કાચા માલની છેલ્લી ખરીદી દરના આધારે, શેડ્યૂલર દ્વારા આપમેળે બીઓએમની કિંમતને અપડેટ કરો."
 DocType: Bank Reconciliation Detail,Cheque Date,ચેક તારીખ
@@ -3983,7 +4071,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),કુલ બિલિંગ રકમ (સમય લોગ મારફતે)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,પુરવઠોકર્તા આઈડી
 DocType: Payment Request,Payment Gateway Details,પેમેન્ટ ગેટવે વિગતો
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,જથ્થો 0 કરતાં મોટી હોવી જોઈએ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,જથ્થો 0 કરતાં મોટી હોવી જોઈએ
 DocType: Journal Entry,Cash Entry,કેશ એન્ટ્રી
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,બાળક ગાંઠો માત્ર &#39;ગ્રુપ&#39; પ્રકાર ગાંઠો હેઠળ બનાવી શકાય છે
 DocType: Leave Application,Half Day Date,અડધા દિવસ તારીખ
@@ -4001,12 +4089,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,નોંધ: વસ્તુ {0} ઘણી વખત દાખલ
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,બધા સંપર્કો.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,કંપની સંક્ષેપનો
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,વપરાશકર્તા {0} અસ્તિત્વમાં નથી
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,વપરાશકર્તા {0} અસ્તિત્વમાં નથી
 DocType: Subscription,SUB-,સબ-
 DocType: Item Attribute Value,Abbreviation,સંક્ષેપનો
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,ચુકવણી એન્ટ્રી પહેલેથી હાજર જ છે
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,"{0} મર્યાદા કરતાં વધી જાય છે, કારણ કે authroized નથી"
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,પગાર નમૂનો માસ્ટર.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,પેથોલોજી
+DocType: Restaurant Order Entry,Restaurant Table,રેસ્ટોરન્ટ ટેબલ
 DocType: Leave Type,Max Days Leave Allowed,મેક્સ દિવસો રજા આપવામાં
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,શોપિંગ કાર્ટ માટે સેટ ટેક્સ નિયમ
 DocType: Purchase Invoice,Taxes and Charges Added,કર અને ખર્ચ ઉમેર્યું
@@ -4018,10 +4108,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,દોરી જાય છે અથવા ગ્રાહકો માટે ખર્ચ.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ભૂમિકા સ્થિર સ્ટોક ફેરફાર કરવા માટે પરવાનગી
 ,Territory Target Variance Item Group-Wise,પ્રદેશ લક્ષ્યાંક ફેરફાર વસ્તુ ગ્રુપ મુજબની
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,બધા ગ્રાહક જૂથો
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,બધા ગ્રાહક જૂથો
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,સંચિત માસિક
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ફરજિયાત છે. કદાચ ચલણ એક્સચેન્જ રેકોર્ડ {1} {2} માટે બનાવેલ નથી.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,ટેક્સ ઢાંચો ફરજિયાત છે.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,ટેક્સ ઢાંચો ફરજિયાત છે.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,એકાઉન્ટ {0}: પિતૃ એકાઉન્ટ {1} અસ્તિત્વમાં નથી
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),ભાવ યાદી દર (કંપની ચલણ)
 DocType: Products Settings,Products Settings,પ્રોડક્ટ્સ સેટિંગ્સ
@@ -4047,12 +4137,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,વસ્તુ વાઈસ ટેક્સ વિગતવાર
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,સંસ્થા સંક્ષેપનો
 ,Item-wise Price List Rate,વસ્તુ મુજબના ભાવ યાદી દર
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,પુરવઠોકર્તા અવતરણ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,પુરવઠોકર્તા અવતરણ
 DocType: Quotation,In Words will be visible once you save the Quotation.,તમે આ અવતરણ સેવ વાર શબ્દો દૃશ્યમાન થશે.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},જથ્થા ({0}) પંક્તિમાં અપૂર્ણાંક ન હોઈ શકે {1}
 DocType: Consultation,C-,સી-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},બારકોડ {0} પહેલાથી જ વસ્તુ ઉપયોગ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},બારકોડ {0} પહેલાથી જ વસ્તુ ઉપયોગ {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,શિપિંગ ખર્ચ ઉમેરવા માટે નિયમો.
 DocType: Item,Opening Stock,ખુલવાનો સ્ટોક
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ગ્રાહક જરૂરી છે
@@ -4070,9 +4160,8 @@
 DocType: Customer,From Lead,લીડ પ્રતિ
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ઓર્ડર્સ ઉત્પાદન માટે પ્રકાશિત થાય છે.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,ફિસ્કલ વર્ષ પસંદ કરો ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS પ્રોફાઇલ POS એન્ટ્રી બનાવવા માટે જરૂરી
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS પ્રોફાઇલ POS એન્ટ્રી બનાવવા માટે જરૂરી
 DocType: Program Enrollment Tool,Enroll Students,વિદ્યાર્થી નોંધણી
-DocType: Hub Settings,Name Token,નામ ટોકન
 DocType: Lab Test,Approved Date,મંજૂર તારીખ
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ધોરણ વેચાણ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,ઓછામાં ઓછા એક વખાર ફરજિયાત છે
@@ -4090,7 +4179,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,માનવ સંસાધન
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,ચુકવણી રિકંસીલેશન ચુકવણી
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,ટેક્સ અસ્કયામતો
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},ઉત્પાદન ઓર્ડર કરવામાં આવ્યો છે {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},ઉત્પાદન ઓર્ડર કરવામાં આવ્યો છે {0}
 DocType: BOM Item,BOM No,BOM કોઈ
 DocType: Instructor,INS/,આઈએનએસ /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,જર્નલ પ્રવેશ {0} {1} અથવા પહેલેથી જ અન્ય વાઉચર સામે મેળ ખાતી એકાઉન્ટ નથી
@@ -4110,7 +4199,7 @@
 DocType: Currency Exchange,To Currency,ચલણ
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,નીચેના ઉપયોગકર્તાઓને બ્લૉક દિવસો માટે છોડી દો કાર્યક્રમો મંજૂર કરવા માટે પરવાનગી આપે છે.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,ખર્ચ દાવા પ્રકાર.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},તેના {1} આઇટમ માટે દર વેચાણ {0} કરતાં ઓછું છે. વેચાણ દર હોવા જોઈએ ઓછામાં ઓછા {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},તેના {1} આઇટમ માટે દર વેચાણ {0} કરતાં ઓછું છે. વેચાણ દર હોવા જોઈએ ઓછામાં ઓછા {2}
 DocType: Item,Taxes,કર
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,ચૂકવેલ અને વિતરિત નથી
 DocType: Project,Default Cost Center,મૂળભૂત ખર્ચ કેન્દ્રને
@@ -4124,15 +4213,15 @@
 DocType: Employee Loan,Fully Disbursed,સંપૂર્ણપણે તેમાં વિતરિત
 DocType: Maintenance Visit,Customer Feedback,ગ્રાહક પ્રતિસાદ
 DocType: Account,Expense,ખર્ચ
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,કુલ સ્કોર મહત્તમ ગુણ કરતાં વધારે ન હોઈ શકે
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,કુલ સ્કોર મહત્તમ ગુણ કરતાં વધારે ન હોઈ શકે
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,ગ્રાહકો અને સપ્લાયર્સ
 DocType: Item Attribute,From Range,શ્રેણી
 DocType: BOM,Set rate of sub-assembly item based on BOM,બીઓએમ પર આધારિત સબ-એસેમ્બલી આઇટમની રેટ નક્કી કરો
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},સૂત્ર અથવા શરત સિન્ટેક્ષ ભૂલ: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},સૂત્ર અથવા શરત સિન્ટેક્ષ ભૂલ: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,દૈનિક કામ સારાંશ સેટિંગ્સ કંપની
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,ત્યારથી તે અવગણવામાં વસ્તુ {0} સ્ટોક વસ્તુ નથી
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,વધુ પ્રક્રિયા માટે આ ઉત્પાદન ઓર્ડર સબમિટ કરો.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,વધુ પ્રક્રિયા માટે આ ઉત્પાદન ઓર્ડર સબમિટ કરો.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","ચોક્કસ વ્યવહાર માં પ્રાઇસીંગ નિયમ લાગુ નથી, બધા લાગુ કિંમતના નિયમોમાં નિષ્ક્રિય થવી જોઈએ."
 DocType: Assessment Group,Parent Assessment Group,પિતૃ આકારણી ગ્રુપ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,નોકરીઓ
@@ -4149,12 +4238,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',કૃપા કરીને કંપની ખાલી ફિલ્ટર સેટ જો ગ્રુપ દ્વારા &#39;કંપની&#39; છે
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,પોસ્ટ તારીખ ભવિષ્યના તારીખ ન હોઈ શકે
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},ROW # {0}: સીરીયલ કોઈ {1} સાથે મેળ ખાતું નથી {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,રિકરિંગ બનાવવા માટે
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,પરચુરણ રજા
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,લેબ ટેસ્ટ UOM
 DocType: Batch,Batch ID,બેચ ID ને
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},નોંધ: {0}
 ,Delivery Note Trends,ડ લવર નોંધ પ્રવાહો
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,આ અઠવાડિયાના સારાંશ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,આ અઠવાડિયાના સારાંશ
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,સ્ટોક Qty માં
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,ખાતું: {0} માત્ર સ્ટોક વ્યવહારો દ્વારા સુધારી શકાય છે
 DocType: Student Group Creation Tool,Get Courses,અભ્યાસક્રમો મેળવો
@@ -4168,7 +4258,6 @@
 DocType: Purchase Order,To Bill,બિલ
 DocType: Material Request,% Ordered,% આદેશ આપ્યો
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","કોર્સ આધારિત વિદ્યાર્થી જૂથ માટે, કોર્સ કાર્યક્રમ નોંધણી પ્રવેશ અભ્યાસક્રમો થી દરેક વિદ્યાર્થી માટે માન્ય કરવામાં આવશે."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","દાખલ ઇમેઇલ સરનામું અલ્પવિરામ દ્વારા અલગ, ભરતિયું ચોક્કસ તારીખે આપમેળે મોકલવામાં આવશે"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,છૂટક કામ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,સરેરાશ. ખરીદી દર
 DocType: Task,Actual Time (in Hours),(કલાકોમાં) વાસ્તવિક સમય
@@ -4182,7 +4271,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,{0} વસ્તુ સીરીયલ અમે માટે સુયોજિત નથી. કોલમ ખાલી હોવા જ જોઈએ
 DocType: Accounts Settings,Accounts Settings,સેટિંગ્સ એકાઉન્ટ્સ
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,મંજૂર
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,સબમિટ કરવાના કોઈ પરિણામો નથી
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,સબમિટ કરવાના કોઈ પરિણામો નથી
 DocType: Customer,Sales Partner and Commission,વેચાણ ભાગીદાર અને કમિશન
 DocType: Employee Loan,Rate of Interest (%) / Year,વ્યાજ (%) / વર્ષ દર
 ,Project Quantity,પ્રોજેક્ટ જથ્થો
@@ -4194,55 +4283,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,બ્લેક
 DocType: BOM Explosion Item,BOM Explosion Item,BOM વિસ્ફોટ વસ્તુ
 DocType: Account,Auditor,ઓડિટર
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} બનતી વસ્તુઓ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} બનતી વસ્તુઓ
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,વધુ શીખો
 DocType: Cheque Print Template,Distance from top edge,ટોચ ધાર અંતર
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,ભાવ યાદી {0} અક્ષમ કરેલી છે અથવા અસ્તિત્વમાં નથી
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,ભાવ યાદી {0} અક્ષમ કરેલી છે અથવા અસ્તિત્વમાં નથી
 DocType: Purchase Invoice,Return,રીટર્ન
 DocType: Production Order Operation,Production Order Operation,ઉત્પાદન ઓર્ડર ઓપરેશન
 DocType: Pricing Rule,Disable,અક્ષમ કરો
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,ચુકવણી સ્થિતિ ચૂકવણી કરવા માટે જરૂરી છે
 DocType: Project Task,Pending Review,બાકી સમીક્ષા
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,નિમણૂંકો અને સલાહ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} બેચ પ્રવેશ નથી {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} બેચ પ્રવેશ નથી {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","એસેટ {0}, રદ કરી શકાતી નથી કારણ કે તે પહેલેથી જ છે {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),(ખર્ચ દાવો મારફતે) કુલ ખર્ચ દાવો
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,માર્ક ગેરહાજર
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},રો {0}: બોમ # ચલણ {1} પસંદ ચલણ સમાન હોવું જોઈએ {2}
 DocType: Journal Entry Account,Exchange Rate,વિનિમય દર
 DocType: Patient,Additional information regarding the patient,દર્દીને લગતી વધારાની માહિતી
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,વેચાણ ઓર્ડર {0} અપર્ણ ન કરાય
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,વેચાણ ઓર્ડર {0} અપર્ણ ન કરાય
 DocType: Homepage,Tag Line,ટેગ લાઇન
 DocType: Fee Component,Fee Component,ફી પુન
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,ફ્લીટ મેનેજમેન્ટ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,વસ્તુઓ ઉમેરો
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,ફ્લીટ મેનેજમેન્ટ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,વસ્તુઓ ઉમેરો
 DocType: Cheque Print Template,Regular,નિયમિત
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,બધા આકારણી માપદંડ કુલ ભારાંકન 100% હોવા જ જોઈએ
-DocType: BOM,Last Purchase Rate,છેલ્લા ખરીદી દર
+DocType: Purchase Order Item,Last Purchase Rate,છેલ્લા ખરીદી દર
 DocType: Account,Asset,એસેટ
 DocType: Project Task,Task ID,ટાસ્ક ID ને
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,વસ્તુ માટે અસ્તિત્વમાં નથી કરી શકો છો સ્ટોક {0} થી ચલો છે
 DocType: Lab Test,Mobile,મોબાઇલ
 ,Sales Person-wise Transaction Summary,વેચાણ વ્યક્તિ મુજબના ટ્રાન્ઝેક્શન સારાંશ
 DocType: Training Event,Contact Number,સંપર્ક નંબર
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,વેરહાઉસ {0} અસ્તિત્વમાં નથી
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext હબ માટે નોંધણી
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,વેરહાઉસ {0} અસ્તિત્વમાં નથી
 DocType: Monthly Distribution,Monthly Distribution Percentages,માસિક વિતરણ ટકાવારી
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,પસંદ કરેલ વસ્તુ બેચ હોઈ શકે નહિં
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","મૂલ્યાંકન દર વસ્તુ {0}, જેના માટે એકાઉન્ટિંગ પ્રવેશો કરવા માટે જરૂરી છે માટે નથી મળી {1} {2}. આઇટમ એક નમૂના વસ્તુ તરીકે ટ્રાન્ઝેક્શન્સ છે, તો {1}, કે {1} વસ્તુ ટેબલ ઉલ્લેખ કરો. નહિંતર, આઇટમ રેકોર્ડ વસ્તુ અથવા ઉલ્લેખ મૂલ્યાંકન દર માટે ઇનકમિંગ સ્ટોક ટ્રાન્ઝેક્શન બનાવો, અને પછી / submiting પ્રયાસ આ પ્રવેશ રદ"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,સામગ્રી% આ બોલ પર કોઈ નોંધ સામે વિતરિત
+DocType: Training Event,Has Certificate,પ્રમાણપત્ર છે
 DocType: Project,Customer Details,ગ્રાહક વિગતો
 DocType: Employee,Reports to,અહેવાલો
 ,Unpaid Expense Claim,અવેતન ખર્ચ દાવો
 DocType: Payment Entry,Paid Amount,ચૂકવેલ રકમ
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,સેલ્સ સાયકલ અન્વેષણ કરો
 DocType: Assessment Plan,Supervisor,સુપરવાઇઝર
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,ઓનલાઇન
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,ઓનલાઇન
 ,Available Stock for Packing Items,પેકિંગ આઇટમ્સ માટે ઉપલબ્ધ સ્ટોક
 DocType: Item Variant,Item Variant,વસ્તુ વેરિએન્ટ
 DocType: Assessment Result Tool,Assessment Result Tool,આકારણી પરિણામ સાધન
 DocType: BOM Scrap Item,BOM Scrap Item,BOM સ્ક્રેપ વસ્તુ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,સબમિટ ઓર્ડર કાઢી શકાતી નથી
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,સબમિટ ઓર્ડર કાઢી શકાતી નથી
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","પહેલેથી જ ડેબિટ એકાઉન્ટ બેલેન્સ, તમે ક્રેડિટ &#39;તરીકે&#39; બેલેન્સ હોવું જોઈએ &#39;સુયોજિત કરવા માટે માન્ય નથી"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,ક્વોલિટી મેનેજમેન્ટ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,વસ્તુ {0} અક્ષમ કરવામાં આવ્યું છે
@@ -4262,7 +4350,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},ROW # {0}: પંક્તિ સાથે સમય તકરાર {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,ઝીરો મૂલ્યાંકન દર મંજૂરી આપો
 DocType: Training Event Employee,Invited,આમંત્રિત
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,મલ્ટીપલ સક્રિય પગાર માળખાં આપવામાં તારીખો માટે કર્મચારી {0} મળી
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,મલ્ટીપલ સક્રિય પગાર માળખાં આપવામાં તારીખો માટે કર્મચારી {0} મળી
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,સેટઅપ ગેટવે હિસ્સો ધરાવે છે.
 DocType: Employee,Employment Type,રોજગાર પ્રકાર
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,"ચોક્કસ સંપતી, નક્કી કરેલી સંપતી"
@@ -4274,7 +4362,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,વિદ્યાર્થી ઇમેઇલ ને
 DocType: Employee,Notice (days),સૂચના (દિવસ)
 DocType: Tax Rule,Sales Tax Template,સેલ્સ ટેક્સ ઢાંચો
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,ભરતિયું સેવ આઇટમ્સ પસંદ કરો
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,ભરતિયું સેવ આઇટમ્સ પસંદ કરો
 DocType: Employee,Encashment Date,એન્કેશમેન્ટ તારીખ
 DocType: Training Event,Internet,ઈન્ટરનેટ
 DocType: Special Test Template,Special Test Template,ખાસ ટેસ્ટ ઢાંચો
@@ -4283,7 +4371,7 @@
 DocType: Production Order,Planned Operating Cost,આયોજિત ઓપરેટિંગ ખર્ચ
 DocType: Academic Term,Term Start Date,ટર્મ પ્રારંભ તારીખ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,સામે કાઉન્ટ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},શોધવા કૃપા કરીને જોડાયેલ {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},શોધવા કૃપા કરીને જોડાયેલ {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,સામાન્ય ખાતાવહી મુજબ બેન્ક નિવેદન બેલેન્સ
 DocType: Job Applicant,Applicant Name,અરજદારનું નામ
 DocType: Authorization Rule,Customer / Item Name,ગ્રાહક / વસ્તુ નામ
@@ -4303,7 +4391,7 @@
 DocType: Guardian,Guardian Of ,ધ ગાર્ડિયન
 DocType: Grading Scale Interval,Threshold,થ્રેશોલ્ડ
 DocType: BOM Update Tool,Current BOM,વર્તમાન BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,સીરીયલ કોઈ ઉમેરો
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,સીરીયલ કોઈ ઉમેરો
 DocType: Production Order Item,Available Qty at Source Warehouse,સોર્સ વેરહાઉસ પર ઉપલબ્ધ Qty
 apps/erpnext/erpnext/config/support.py +22,Warranty,વોરંટી
 DocType: Purchase Invoice,Debit Note Issued,ડેબિટ નોટ જારી
@@ -4326,10 +4414,9 @@
 DocType: Account,Receivable,પ્રાપ્ત
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ROW # {0}: ખરીદી ઓર્ડર પહેલેથી જ અસ્તિત્વમાં છે સપ્લાયર બદલવાની મંજૂરી નથી
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,સેટ ક્રેડિટ મર્યાદા કરતાં વધી કે વ્યવહારો સબમિટ કરવા માટે માન્ય છે તે ભૂમિકા.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,ઉત્પાદન વસ્તુઓ પસંદ કરો
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","મુખ્ય માહિતી સમન્વય, તે થોડો સમય લાગી શકે છે"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,ઉત્પાદન વસ્તુઓ પસંદ કરો
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","મુખ્ય માહિતી સમન્વય, તે થોડો સમય લાગી શકે છે"
 DocType: Item,Material Issue,મહત્વનો મુદ્દો
-DocType: Hub Settings,Seller Description,વિક્રેતા વર્ણન
 DocType: Employee Education,Qualification,લાયકાત
 DocType: Item Price,Item Price,વસ્તુ ભાવ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,સાબુ સફાઈકારક
@@ -4337,7 +4424,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,સમય સમય કરતાં વધારે ન હોઈ શકે.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,મોશન પિક્ચર અને વિડિઓ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,આદેશ આપ્યો
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,ફરી શરુ કરવું
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,ફરી શરુ કરવું
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,જો સક્ષમ કરેલું હોય તો સિસ્ટમ ટેમ્પ્લેટમાંથી ચલોના ક્ષેત્રોને અપડેટ કરશે નહીં પરંતુ નવા વેરિઅન્ટ કરતી વખતે નીચેના ક્ષેત્રોના ડેટાને કૉપિ કરશે
 DocType: Salary Detail,Component,પુન
 DocType: Assessment Criteria,Assessment Criteria Group,આકારણી માપદંડ ગ્રુપ
 DocType: Healthcare Settings,Patient Name By,પેશન્ટ નામ દ્વારા
@@ -4347,7 +4435,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,ભૂમિકા એપ્રૂવિંગ અથવા વપરાશકર્તા એપ્રૂવિંગ દાખલ કરો
 DocType: Journal Entry,Write Off Entry,એન્ટ્રી માંડવાળ
 DocType: BOM,Rate Of Materials Based On,દર સામગ્રી પર આધારિત
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,પુરવઠોકર્તા&gt; પુરવઠોકર્તા પ્રકાર
+DocType: Item Variant Settings,Do not Update Variants,વેરિઅન્ટ્સ અપડેટ કરશો નહીં
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,આધાર Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,અનચેક બધા
 DocType: POS Profile,Terms and Conditions,નિયમો અને શરત
@@ -4356,7 +4444,7 @@
 DocType: Leave Block List,Applies to Company,કંપની માટે લાગુ પડે છે
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,સબમિટ સ્ટોક એન્ટ્રી {0} અસ્તિત્વમાં છે કારણ કે રદ કરી શકાતી નથી
 DocType: Employee Loan,Disbursement Date,વહેંચણી તારીખ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;પ્રાપ્તકર્તાઓ&#39; ઉલ્લેખિત નથી
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;પ્રાપ્તકર્તાઓ&#39; ઉલ્લેખિત નથી
 DocType: BOM Update Tool,Update latest price in all BOMs,તમામ BOM માં નવીનતમ કિંમત અપડેટ કરો
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,તબીબી રેકોર્ડ
 DocType: Vehicle,Vehicle,વાહન
@@ -4371,14 +4459,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,એસ.ટી. / લીડ%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,એસેટ Depreciations અને બેલેન્સ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},રકમ {0} {1} માંથી તબદીલ {2} માટે {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},રકમ {0} {1} માંથી તબદીલ {2} માટે {3}
 DocType: Sales Invoice,Get Advances Received,એડવાન્સિસ પ્રાપ્ત કરો
 DocType: Email Digest,Add/Remove Recipients,મેળવનારા ઉમેરો / દૂર કરો
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},ટ્રાન્ઝેક્શન બંધ કરી દીધું ઉત્પાદન સામે મંજૂરી નથી ક્રમમાં {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",મૂળભૂત તરીકે ચાલુ નાણાકીય વર્ષના સુયોજિત કરવા માટે &#39;મૂળભૂત તરીકે સેટ કરો&#39; પર ક્લિક કરો
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,જોડાઓ
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,જોડાઓ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,અછત Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,વસ્તુ ચલ {0} જ લક્ષણો સાથે હાજર
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,વસ્તુ ચલ {0} જ લક્ષણો સાથે હાજર
 DocType: Employee Loan,Repay from Salary,પગારની ચુકવણી
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},સામે ચુકવણી વિનંતી {0} {1} રકમ માટે {2}
@@ -4386,12 +4474,12 @@
 DocType: Lead,Lost Quotation,લોસ્ટ અવતરણ
 apps/erpnext/erpnext/utilities/user_progress.py +200,Student Batches,વિદ્યાર્થી પક્ષો
 DocType: Pricing Rule,Margin Rate or Amount,માર્જિન દર અથવા જથ્થો
-apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,&#39;તારીખ કરવા માટે&#39; જરૂરી છે
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,'તારીખ સુધી' જરૂરી છે
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","પેકેજો પહોંચાડી શકાય માટે સ્લિપ પેકિંગ બનાવો. પેકેજ નંબર, પેકેજ સમાવિષ્ટો અને તેનું વજન સૂચિત કરવા માટે વપરાય છે."
 DocType: Sales Invoice Item,Sales Order Item,વેચાણ ઓર્ડર વસ્તુ
 DocType: Salary Slip,Payment Days,ચુકવણી દિવસ
 DocType: Patient,Dormant,નિષ્ક્રિય
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,બાળક ગાંઠો સાથે વખારો ખાતાવહી રૂપાંતરિત કરી શકાય છે
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,બાળક ગાંઠો સાથે વખારો ખાતાવહી રૂપાંતરિત કરી શકાય છે
 DocType: BOM,Manage cost of operations,કામગીરી ખર્ચ મેનેજ કરો
 DocType: Accounts Settings,Stale Days,સ્ટેલ ડેઝ
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","આ ચકાસાયેલ વ્યવહારો કોઈપણ &quot;સબમિટ&quot; કરવામાં આવે છે, એક ઇમેઇલ પોપ અપ આપોઆપ જોડાણ તરીકે સોદા સાથે, કે વ્યવહાર માં સંકળાયેલ &quot;સંપર્ક&quot; માટે એક ઇમેઇલ મોકલવા માટે ખોલવામાં આવી હતી. વપરાશકર્તા શકે છે અથવા ઇમેઇલ મોકલી શકે છે."
@@ -4405,10 +4493,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,સીરીયલ કોઈ {0} પહેલાથી જ પ્રાપ્ત કરવામાં આવ્યો છે
 ,Requested Items To Be Transferred,વિનંતી વસ્તુઓ ટ્રાન્સફર કરી
 DocType: Expense Claim,Vehicle Log,વાહન પ્રવેશ
-DocType: Purchase Invoice,Recurring Id,રીકરીંગ આઈડી
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),તાવની હાજરી (temp&gt; 38.5 ° સે / 101.3 ° ફે અથવા સતત તૈનાત&gt; 38 ° સે / 100.4 ° ફૅ)
 DocType: Customer,Sales Team Details,સેલ્સ ટીમ વિગતો
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,કાયમી કાઢી નાખો?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,કાયમી કાઢી નાખો?
 DocType: Expense Claim,Total Claimed Amount,કુલ દાવો રકમ
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,વેચાણ માટે સંભવિત તકો.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},અમાન્ય {0}
@@ -4418,7 +4505,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ડિપાર્ટમેન્ટ સ્ટોર્સ
 ,Item Delivery Date,આઇટમ ડિલિવરી તારીખ
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,સેટઅપ ERPNext તમારા શાળા
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,સેટઅપ ERPNext તમારા શાળા
 DocType: Sales Invoice,Base Change Amount (Company Currency),આધાર બદલી રકમ (કંપની ચલણ)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,નીચેના વખારો માટે કોઈ હિસાબ પ્રવેશો
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,પ્રથમ દસ્તાવેજ સાચવો.
@@ -4430,13 +4517,12 @@
 DocType: Task,Is Milestone,સિમાચિહ્ન છે
 DocType: Daily Work Summary,Email Sent To,ઇમેઇલ મોકલવામાં
 DocType: Budget,Warn,ચેતવો
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,શું તમે ખરેખર નોંધણી રદ કરવા માંગો છો?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","કોઈપણ અન્ય ટીકા, રેકોર્ડ જવા જોઈએ કે નોંધપાત્ર પ્રયાસ."
 DocType: BOM,Manufacturing User,ઉત્પાદન વપરાશકર્તા
 DocType: Purchase Invoice,Raw Materials Supplied,કાચો માલ પાડેલ
-DocType: Purchase Invoice,Recurring Print Format,રીકરીંગ પ્રિન્ટ ફોર્મેટ
 DocType: C-Form,Series,સિરીઝ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},કિંમત સૂચિ {0} ની કરન્સી {1} અથવા {2} હોવી જોઈએ
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,પ્રોડક્ટ્સ ઉમેરો
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},કિંમત સૂચિ {0} ની કરન્સી {1} અથવા {2} હોવી જોઈએ
 DocType: Appraisal,Appraisal Template,મૂલ્યાંકન ઢાંચો
 DocType: Item Group,Item Classification,વસ્તુ વર્ગીકરણ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,બિઝનેસ ડેવલપમેન્ટ મેનેજર
@@ -4450,7 +4536,7 @@
 DocType: Item Attribute Value,Attribute Value,લક્ષણની કિંમત
 ,Itemwise Recommended Reorder Level,મુદ્દાવાર પુનઃક્રમાંકિત કરો સ્તર ભલામણ
 DocType: Salary Detail,Salary Detail,પગાર વિગતવાર
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,પ્રથમ {0} પસંદ કરો
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,પ્રથમ {0} પસંદ કરો
 DocType: Appointment Type,Physician,ફિઝિશિયન
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,વસ્તુ બેચ {0} {1} સમયસીમા સમાપ્ત થઈ ગઈ છે.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,પરામર્શ
@@ -4461,9 +4547,9 @@
 DocType: Salary Detail,Default Amount,મૂળભૂત રકમ
 DocType: Lab Test Template,Descriptive,વર્ણનાત્મક
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,વેરહાઉસ સિસ્ટમમાં મળ્યા નથી
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,આ મહિનો સારાંશ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,આ મહિનો સારાંશ
 DocType: Quality Inspection Reading,Quality Inspection Reading,ગુણવત્તા નિરીક્ષણ વાંચન
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`ફ્રીઝ સ્ટોક્સ જૂની Than`% d દિવસ કરતાં ઓછું હોવું જોઈએ.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`કરતા જૂનો સ્થિર સ્ટોક'  %d દિવસ કરતાં ઓછો હોવો જોઈએ
 DocType: Tax Rule,Purchase Tax Template,ટેક્સ ઢાંચો ખરીદી
 apps/erpnext/erpnext/utilities/user_progress.py +45,Set a sales goal you'd like to achieve for your company.,તમે તમારી કંપની માટે સેલ્સ ધ્યેય સેટ કરવા માંગો છો
 ,Project wise Stock Tracking,પ્રોજેક્ટ મુજબની સ્ટોક ટ્રેકિંગ
@@ -4484,12 +4570,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,તાલીમ ઘટનાઓ / પરિણામો
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,તરીકે અવમૂલ્યન સંચિત
 DocType: Sales Invoice,C-Form Applicable,સી-ફોર્મ લાગુ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},ઓપરેશન સમય ઓપરેશન કરતાં વધારે 0 હોવા જ જોઈએ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},ઓપરેશન સમય ઓપરેશન કરતાં વધારે 0 હોવા જ જોઈએ {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,વેરહાઉસ ફરજિયાત છે
 DocType: Supplier,Address and Contacts,એડ્રેસ અને સંપર્કો
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM રૂપાંતર વિગતવાર
 DocType: Program,Program Abbreviation,કાર્યક્રમ સંક્ષેપનો
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,ઉત્પાદન ઓર્ડર એક વસ્તુ ઢાંચો સામે ઊભા કરી શકાતી નથી
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,ઉત્પાદન ઓર્ડર એક વસ્તુ ઢાંચો સામે ઊભા કરી શકાતી નથી
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,સમાયોજિત દરેક વસ્તુ સામે ખરીદી રસીદ અપડેટ કરવામાં આવે છે
 DocType: Warranty Claim,Resolved By,દ્વારા ઉકેલાઈ
 DocType: Bank Guarantee,Start Date,પ્રારંભ તારીખ
@@ -4515,26 +4601,27 @@
 DocType: Employee,Educational Qualification,શૈક્ષણિક લાયકાત
 DocType: Workstation,Operating Costs,ઓપરેટિંગ ખર્ચ
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,ક્રિયા જો સંચિત માસિક બજેટ વટાવી
-DocType: Purchase Invoice,Submit on creation,સબમિટ બનાવટ પર
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},કરન્સી {0} હોવા જ જોઈએ {1}
+DocType: Subscription,Submit on creation,સબમિટ બનાવટ પર
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},કરન્સી {0} હોવા જ જોઈએ {1}
 DocType: Asset,Disposal Date,નિકાલ તારીખ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ઇમેઇલ્સ આપવામાં કલાક કંપની બધી સક્રિય કર્મચારીઓની મોકલવામાં આવશે, જો તેઓ રજા નથી. પ્રતિસાદ સારાંશ મધ્યરાત્રિએ મોકલવામાં આવશે."
 DocType: Employee Leave Approver,Employee Leave Approver,કર્મચારી રજા તાજનો
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},રો {0}: એક પુનઃક્રમાંકિત કરો પ્રવેશ પહેલેથી જ આ વેરહાઉસ માટે અસ્તિત્વમાં {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","અવતરણ કરવામાં આવી છે, કારણ કે લોસ્ટ જાહેર કરી શકતા નથી."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,તાલીમ પ્રતિસાદ
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},રો {0}: એક પુનઃક્રમાંકિત કરો પ્રવેશ પહેલેથી જ આ વેરહાઉસ માટે અસ્તિત્વમાં {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","અવતરણ કરવામાં આવી છે, કારણ કે લોસ્ટ જાહેર કરી શકતા નથી."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,તાલીમ પ્રતિસાદ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,ઓર્ડર {0} સબમિટ હોવું જ જોઈએ ઉત્પાદન
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,સપ્લાયર સ્કોરકાર્ડ માપદંડ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},વસ્તુ માટે શરૂઆત તારીખ અને સમાપ્તિ તારીખ પસંદ કરો {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},કોર્સ પંક્તિ માં ફરજિયાત છે {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,તારીખ કરવા માટે તારીખથી પહેલાં ન હોઈ શકે
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc Doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,/ સંપાદિત કરો ભાવમાં ઉમેરો
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,/ સંપાદિત કરો ભાવમાં ઉમેરો
 DocType: Batch,Parent Batch,પિતૃ બેચ
 DocType: Cheque Print Template,Cheque Print Template,ચેક પ્રિન્ટ ઢાંચો
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,કિંમત કેન્દ્રો ચાર્ટ
 DocType: Lab Test Template,Sample Collection,નમૂનાનો સંગ્રહ
 ,Requested Items To Be Ordered,વિનંતી વસ્તુઓ ઓર્ડર કરી
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,મારા ઓર્ડર
 DocType: Price List,Price List Name,ભાવ યાદી નામ
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},માટે દૈનિક કામ સારાંશ {0}
 DocType: Employee Loan,Totals,કૂલ
@@ -4553,12 +4640,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1} જરૂરી {2} પર {3} {4} {5} આ સોદો પૂર્ણ કરવા માટે એકમો.
 DocType: Fee Schedule,Student Category,વિદ્યાર્થી વર્ગ
 DocType: Announcement,Student,વિદ્યાર્થી
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,સંસ્થા યુનિટ (વિભાગ) માસ્ટર.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,સંસ્થા યુનિટ (વિભાગ) માસ્ટર.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,રૂમ પર જાઓ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,મોકલતા પહેલા સંદેશ દાખલ કરો
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,સપ્લાયર માટે DUPLICATE
 DocType: Email Digest,Pending Quotations,સુવાકયો બાકી
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,પોઇન્ટ ઓફ સેલ પ્રોફાઇલ
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,પોઇન્ટ ઓફ સેલ પ્રોફાઇલ
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,લેબ ટેસ્ટ રૂપરેખાંકનો
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,અસુરક્ષીત લોન્સ
 DocType: Cost Center,Cost Center Name,ખર્ચ કેન્દ્રને નામ
@@ -4568,6 +4655,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,કુલ ભરપાઈ એએમટી
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 અક્ષરો કરતાં વધારે સંદેશાઓ બહુવિધ સંદેશાઓ વિભાજિત કરવામાં આવશે
 DocType: Purchase Receipt Item,Received and Accepted,પ્રાપ્ત થઈ છે અને સ્વીકારાયું
+DocType: Hub Settings,Company and Seller Profile,કંપની અને વિક્રેતા પ્રોફાઇલ
 ,GST Itemised Sales Register,જીએસટી આઇટમાઇઝ્ડ સેલ્સ રજિસ્ટર
 ,Serial No Service Contract Expiry,સીરીયલ કોઈ સેવા કોન્ટ્રેક્ટ સમાપ્તિ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,તમે ક્રેડિટ અને તે જ સમયે એક જ ખાતામાં ડેબિટ શકતા નથી
@@ -4577,10 +4665,11 @@
 DocType: Item,Variant Based On,વેરિએન્ટ પર આધારિત
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},100% પ્રયત્ન કરીશું સોંપાયેલ કુલ વેઇટેજ. તે {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,તમારા સપ્લાયર્સ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,કૃપા કરીને સુધારો
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,વેચાણ ઓર્ડર કરવામાં આવે છે ગુમાવી સેટ કરી શકાતો નથી.
 DocType: Request for Quotation Item,Supplier Part No,પુરવઠોકર્તા ભાગ કોઈ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',કપાત કરી શકો છો જ્યારે શ્રેણી &#39;વેલ્યુએશન&#39; અથવા &#39;Vaulation અને કુલ&#39; માટે છે
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,પ્રતિ પ્રાપ્ત
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,પ્રતિ પ્રાપ્ત
 DocType: Lead,Converted,રૂપાંતરિત
 DocType: Item,Has Serial No,સીરીયલ કોઈ છે
 DocType: Employee,Date of Issue,ઇશ્યૂ તારીખ
@@ -4588,7 +4677,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","ખરીદી સેટિંગ્સ મુજબ ખરીદી Reciept જરૂરી == &#39;હા&#39; હોય, તો પછી ખરીદી ઇન્વોઇસ બનાવવા માટે, વપરાશકર્તા આઇટમ માટે પ્રથમ ખરીદી રસીદ બનાવવા માટે જરૂર હોય તો {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},ROW # {0}: આઇટમ માટે સેટ પુરવઠોકર્તા {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,રો {0}: કલાક કિંમત શૂન્ય કરતાં મોટી હોવી જ જોઈએ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,વસ્તુ {1} સાથે જોડાયેલ વેબસાઇટ છબી {0} શોધી શકાતી નથી
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,વસ્તુ {1} સાથે જોડાયેલ વેબસાઇટ છબી {0} શોધી શકાતી નથી
 DocType: Issue,Content Type,સામગ્રી પ્રકાર
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,કમ્પ્યુટર
 DocType: Item,List this Item in multiple groups on the website.,આ વેબસાઇટ પર બહુવિધ જૂથો આ આઇટમ યાદી.
@@ -4599,14 +4688,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled પ્રવેશો મળી
 DocType: Payment Reconciliation,From Invoice Date,ભરતિયું તારીખથી
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,તમારે સબમિટ કરવાની પરવાનગી નથી
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,બિલિંગ ચલણ ક્યાંતો મૂળભૂત comapany ચલણ અથવા પક્ષ એકાઉન્ટ ચલણ માટે સમાન હોવો જોઈએ
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,બિલિંગ ચલણ ક્યાંતો મૂળભૂત comapany ચલણ અથવા પક્ષ એકાઉન્ટ ચલણ માટે સમાન હોવો જોઈએ
 DocType: Healthcare Settings,Laboratory Settings,લેબોરેટરી સેટિંગ્સ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,એન્કેશમેન્ટ છોડો
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,તે શું કરે છે?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,વેરહાઉસ
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,બધા વિદ્યાર્થી પ્રવેશ
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,તે શું કરે છે?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,વેરહાઉસ
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,બધા વિદ્યાર્થી પ્રવેશ
 ,Average Commission Rate,સરેરાશ કમિશન દર
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,નોન-સ્ટોક વસ્તુ માટે સીરીયલ નંબર 'હા' કરી શકશો નહિ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,નોન-સ્ટોક વસ્તુ માટે ’સિરિયલ નંબર’ 'હા' કરી ન શકાય
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,સ્થિતિ પસંદ કરો
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,એટેન્ડન્સ ભવિષ્યમાં તારીખો માટે ચિહ્નિત કરી શકાતી નથી
 DocType: Pricing Rule,Pricing Rule Help,પ્રાઇસીંગ નિયમ મદદ
@@ -4624,40 +4713,40 @@
 DocType: Item,Customer Code,ગ્રાહક કોડ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},માટે જન્મદિવસ રીમાઇન્ડર {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,છેલ્લે ઓર્ડર સુધીનાં દિવસો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,એકાઉન્ટ ડેબિટ એક બેલેન્સ શીટ એકાઉન્ટ હોવું જ જોઈએ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,એકાઉન્ટ ડેબિટ એક બેલેન્સ શીટ એકાઉન્ટ હોવું જ જોઈએ
 DocType: Buying Settings,Naming Series,નામકરણ સિરીઝ
 DocType: Leave Block List,Leave Block List Name,બ્લોક યાદી મૂકો નામ
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,વીમા પ્રારંભ તારીખ કરતાં વીમા અંતિમ તારીખ ઓછી હોવી જોઈએ
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,કૃપા કરીને શાળામાં પ્રશિક્ષક નામકરણ પદ્ધતિ સેટ કરો&gt; શાળા સેટિંગ્સ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,સ્ટોક અસ્કયામતો
 DocType: Timesheet,Production Detail,ઉત્પાદન વિગતવાર
+DocType: Restaurant,Active Menu,સક્રિય મેનુ
 DocType: Target Detail,Target Qty,લક્ષ્યાંક Qty
 DocType: Shopping Cart Settings,Checkout Settings,ચેકઆઉટ સેટિંગ્સ
 DocType: Attendance,Present,હાજર
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,ડ લવર નોંધ {0} રજૂ ન હોવા જોઈએ
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,ડ લવર નોંધ {0} રજૂ ન હોવા જોઈએ
 DocType: Notification Control,Sales Invoice Message,સેલ્સ ભરતિયું સંદેશ
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,એકાઉન્ટ {0} બંધ પ્રકાર જવાબદારી / ઈક્વિટી હોવું જ જોઈએ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},કર્મચારી પગાર કાપલી {0} પહેલાથી જ સમય શીટ માટે બનાવવામાં {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},કર્મચારી પગાર કાપલી {0} પહેલાથી જ સમય શીટ માટે બનાવવામાં {1}
 DocType: Vehicle Log,Odometer,ઑડોમીટર
 DocType: Sales Order Item,Ordered Qty,આદેશ આપ્યો Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,વસ્તુ {0} અક્ષમ છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,વસ્તુ {0} અક્ષમ છે
 DocType: Stock Settings,Stock Frozen Upto,સ્ટોક ફ્રોઝન સુધી
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM કોઈપણ સ્ટોક વસ્તુ સમાવી નથી
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,પ્રોજેક્ટ પ્રવૃત્તિ / કાર્ય.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM કોઈપણ સ્ટોક વસ્તુ સમાવી નથી
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,પ્રોજેક્ટ પ્રવૃત્તિ / કાર્ય.
 DocType: Vehicle Log,Refuelling Details,Refuelling વિગતો
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,પગાર સ્લિપ બનાવો
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","માટે લાગુ તરીકે પસંદ કરેલ છે તે ખરીદી, ચકાસાયેલ જ હોવું જોઈએ {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ડિસ્કાઉન્ટ કરતાં ઓછી 100 હોવી જ જોઈએ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,છેલ્લા ખરીદી દર મળી નથી
 DocType: Purchase Invoice,Write Off Amount (Company Currency),રકમ માંડવાળ (કંપની ચલણ)
 DocType: Sales Invoice Timesheet,Billing Hours,બિલિંગ કલાક
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,માટે {0} મળી નથી ડિફૉલ્ટ BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,ROW # {0}: પુનઃક્રમાંકિત કરો જથ્થો સુયોજિત કરો
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,માટે {0} મળી નથી ડિફૉલ્ટ BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,ROW # {0}: પુનઃક્રમાંકિત કરો જથ્થો સુયોજિત કરો
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,તેમને અહીં ઉમેરવા માટે વસ્તુઓ ટેપ
 DocType: Fees,Program Enrollment,કાર્યક્રમ પ્રવેશ
 DocType: Landed Cost Voucher,Landed Cost Voucher,ઉતારેલ માલની કિંમત વાઉચર
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},સેટ કરો {0}
-DocType: Purchase Invoice,Repeat on Day of Month,મહિનાનો દિવસ પર પુનરાવર્તન
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} નિષ્ક્રિય વિદ્યાર્થી છે
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} નિષ્ક્રિય વિદ્યાર્થી છે
 DocType: Employee,Health Details,આરોગ્ય વિગતો
 DocType: Offer Letter,Offer Letter Terms,પત્ર શરતો ઓફર
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,ચુકવણી વિનંતી સંદર્ભ દસ્તાવેજ જરૂરી છે બનાવવા માટે
@@ -4665,7 +4754,6 @@
 DocType: Employee External Work History,Salary,પગાર
 DocType: Serial No,Delivery Document Type,ડ લવર દસ્તાવેજ પ્રકારની
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,ઉપર પસંદ માપદંડ માટે બધા પગાર સ્લિપ સબમિટ
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} વસ્તુઓ સમન્વયિત
 DocType: Sales Order,Partly Delivered,આંશિક વિતરિત
 DocType: Email Digest,Receivables,Receivables
 DocType: Lead Source,Lead Source,લીડ સોર્સ
@@ -4686,19 +4774,19 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,એઇજીંગનો રેન્જ 2
 DocType: SG Creation Tool Course,Max Strength,મેક્સ શક્તિ
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM બદલાઈ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,ડિલિવરી તારીખના આધારે આઇટમ્સ પસંદ કરો
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,ડિલિવરી તારીખના આધારે આઇટમ્સ પસંદ કરો
 ,Sales Analytics,વેચાણ ઍનલિટિક્સ
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},ઉપલબ્ધ {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},ઉપલબ્ધ {0}
 ,Prospects Engaged But Not Converted,પ્રોસ્પેક્ટ્સ રોકાયેલા પરંતુ રૂપાંતરિત
 DocType: Manufacturing Settings,Manufacturing Settings,ઉત્પાદન સેટિંગ્સ
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,ઇમેઇલ સુયોજિત કરી રહ્યા છે
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 મોબાઇલ કોઈ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,કંપની માસ્ટર મૂળભૂત ચલણ દાખલ કરો
 DocType: Stock Entry Detail,Stock Entry Detail,સ્ટોક એન્ટ્રી વિગતવાર
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,દૈનિક રીમાઇન્ડર્સ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,દૈનિક રીમાઇન્ડર્સ
 DocType: Products Settings,Home Page is Products,મુખ્ય પૃષ્ઠ પેજમાં પ્રોડક્ટ્સ
 ,Asset Depreciation Ledger,એસેટ અવમૂલ્યન ખાતાવહી
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},સાથે કરવેરા નિયમ સંઘર્ષો {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},સાથે કરવેરા નિયમ સંઘર્ષો {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,નવા એકાઉન્ટ નામ
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,કાચો માલ પાડેલ કિંમત
 DocType: Selling Settings,Settings for Selling Module,મોડ્યુલ વેચાણ માટે સેટિંગ્સ
@@ -4712,8 +4800,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,વસ્તુ {0} સ્ટોક વસ્તુ જ હોવી જોઈએ
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,પ્રગતિ વેરહાઉસ માં મૂળભૂત કામ
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,હિસાબી વ્યવહારો માટે મૂળભૂત સુયોજનો.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,હ્યુમન રિસોર્સ&gt; એચઆર સેટિંગ્સમાં કર્મચારીનું નામકરણ પદ્ધતિ સેટ કરો
 DocType: Maintenance Visit,MV,એમવી
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,અપેક્ષિત તારીખ સામગ્રી વિનંતી તારીખ પહેલાં ન હોઈ શકે
+DocType: Restaurant,Default Tax Template,ડિફૉલ્ટ ટેક્સ ટેમ્પલેટ
 DocType: Fees,Student Details,વિદ્યાર્થીની વિગતો
 DocType: Purchase Invoice Item,Stock Qty,સ્ટોક Qty
 DocType: Employee Loan,Repayment Period in Months,મહિના ચુકવણી સમય
@@ -4731,8 +4820,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,આઇટમ્સ પર જાઓ
 DocType: Sales Partner,Partner Type,જીવનસાથી પ્રકાર
 DocType: Purchase Taxes and Charges,Actual,વાસ્તવિક
+DocType: Restaurant Menu,Restaurant Manager,રેસ્ટોરન્ટ વ્યવસ્થાપક
 DocType: Authorization Rule,Customerwise Discount,Customerwise ડિસ્કાઉન્ટ
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,કાર્યો માટે Timesheet.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,કાર્યો માટે Timesheet.
 DocType: Purchase Invoice,Against Expense Account,ખર્ચ એકાઉન્ટ સામે
 DocType: Production Order,Production Order,ઉત્પાદન ઓર્ડર
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,સ્થાપન નોંધ {0} પહેલાથી જ સબમિટ કરવામાં આવી છે
@@ -4740,7 +4830,6 @@
 DocType: Quotation Item,Against Docname,Docname સામે
 DocType: SMS Center,All Employee (Active),બધા કર્મચારીનું (સક્રિય)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,હવે જુઓ
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"ભરતિયું આપોઆપ પેદા કરવામાં આવશે, જ્યારે આ સમયગાળા પસંદ કરો"
 DocType: BOM,Raw Material Cost,કાચો સામગ્રી ખર્ચ
 DocType: Item Reorder,Re-Order Level,ફરીથી ઓર્ડર સ્તર
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,તમે ઉત્પાદન ઓર્ડર વધારવા અથવા વિશ્લેષણ માટે કાચી સામગ્રી ડાઉનલોડ કરવા માંગો છો કે જેના માટે વસ્તુઓ અને આયોજન Qty દાખલ કરો.
@@ -4753,23 +4842,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,રિપોર્ટ પ્રકાર ફરજિયાત છે
 DocType: Item,Serial Number Series,સીરિયલ નંબર સિરીઝ
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},વેરહાઉસ પંક્તિ સ્ટોક વસ્તુ {0} માટે ફરજિયાત છે {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,પ્રોગ્રામ્સ ઉમેરો
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,રિટેલ અને હોલસેલ
 DocType: Issue,First Responded On,પ્રથમ જવાબ
 DocType: Website Item Group,Cross Listing of Item in multiple groups,બહુવિધ જૂથો માં આઇટમ ક્રોસ લિસ્ટિંગ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ફિસ્કલ વર્ષ શરૂઆત તારીખ અને ફિસ્કલ વર્ષ અંતે તારીખ પહેલેથી નાણાકીય વર્ષમાં સુયોજિત છે {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,ક્લિયરન્સ તારીખ સુધારાશે
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,સ્પ્લિટ બેચ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,સ્પ્લિટ બેચ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,સફળતાપૂર્વક અનુરૂપ
 DocType: Request for Quotation Supplier,Download PDF,પીડીએફ ડાઉનલોડ કરો
 DocType: Production Order,Planned End Date,આયોજિત સમાપ્તિ તારીખ
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,સૂચિ તારીખ દાખલ કરો
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,વસ્તુઓ જ્યાં સંગ્રહાય છે.
 DocType: Request for Quotation,Supplier Detail,પુરવઠોકર્તા વિગતવાર
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},સૂત્ર અથવા શરત ભૂલ: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},સૂત્ર અથવા શરત ભૂલ: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,ભરતિયું રકમ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,માપદંડ વજન 100% જેટલું ઉમેરવું જોઈએ
 DocType: Attendance,Attendance,એટેન્ડન્સ
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,સ્ટોક વસ્તુઓ
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,સ્ટોક વસ્તુઓ
 DocType: BOM,Materials,સામગ્રી
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","ચકાસાયેલ જો નહિં, તો આ યાદીમાં તે લાગુ પાડી શકાય છે, જ્યાં દરેક વિભાગ ઉમેરવામાં આવશે હશે."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,સ્ત્રોત અને લક્ષ્ય વેરહાઉસ જ ન હોઈ શકે
@@ -4787,6 +4876,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,નેટ કુલ પર
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},{0} લક્ષણ માટે કિંમત શ્રેણી અંદર હોવા જ જોઈએ {1} માટે {2} ઇન્ક્રીમેન્ટ {3} વસ્તુ {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,{0} પંક્તિ માં લક્ષ્યાંક વેરહાઉસ ઉત્પાદન ઓર્ડર તરીકે જ હોવી જોઈએ
+DocType: Restaurant Reservation,Waitlisted,રાહ જોવાયેલી
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,કરન્સી કેટલાક અન્ય ચલણ ઉપયોગ પ્રવેશો કર્યા પછી બદલી શકાતું નથી
 DocType: Vehicle Service,Clutch Plate,ક્લચ પ્લેટ
 DocType: Company,Round Off Account,એકાઉન્ટ બંધ રાઉન્ડ
@@ -4803,7 +4893,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,ન્યૂ વેચાણ વ્યક્તિ નામ
 DocType: Packing Slip,Gross Weight UOM,એકંદર વજન UOM
 DocType: Delivery Note Item,Against Sales Invoice,સેલ્સ ભરતિયું સામે
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,શ્રેણીબદ્ધ આઇટમ માટે ક્રમાંકોમાં દાખલ કરો
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,શ્રેણીબદ્ધ આઇટમ માટે ક્રમાંકોમાં દાખલ કરો
 DocType: Bin,Reserved Qty for Production,ઉત્પાદન માટે Qty અનામત
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"અનચેક છોડી દો, તો તમે બેચ ધ્યાનમાં જ્યારે અભ્યાસક્રમ આધારિત જૂથો બનાવવા નથી માંગતા."
 DocType: Asset,Frequency of Depreciation (Months),અવમૂલ્યન આવર્તન (મહિના)
@@ -4814,7 +4904,7 @@
 DocType: Lab Test,Test Group,ટેસ્ટ ગ્રુપ
 DocType: Payment Reconciliation,Receivable / Payable Account,પ્રાપ્ત / ચૂકવવાપાત્ર એકાઉન્ટ
 DocType: Delivery Note Item,Against Sales Order Item,વેચાણ ઓર્ડર વસ્તુ સામે
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},લક્ષણ માટે લક્ષણની કિંમત સ્પષ્ટ કરો {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},લક્ષણ માટે લક્ષણની કિંમત સ્પષ્ટ કરો {0}
 DocType: Item,Default Warehouse,મૂળભૂત વેરહાઉસ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},બજેટ ગ્રુપ એકાઉન્ટ સામે અસાઇન કરી શકાતી નથી {0}
 DocType: Healthcare Settings,Patient Registration,પેશન્ટ નોંધણી
@@ -4843,6 +4933,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,વેચાણ વ્યક્તિ
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,બજેટ અને ખર્ચ કેન્દ્ર
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,ચુકવણીના બહુવિધ ડિફોલ્ટ મોડને મંજૂરી નથી
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,માટે
 ,Appointment Analytics,નિમણૂંક ઍનલિટિક્સ
 DocType: Vehicle Service,Half Yearly,અર્ધ વાર્ષિક
 DocType: Lead,Blog Subscriber,બ્લોગ ઉપભોક્તા
@@ -4850,7 +4941,7 @@
 DocType: Healthcare Settings,Consultations in valid days,માન્ય દિવસોમાં પરામર્શ
 DocType: Assessment Plan Criteria,Maximum Score,મહત્તમ ગુણ
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,મૂલ્યો પર આધારિત વ્યવહારો પ્રતિબંધિત કરવા માટે નિયમો બનાવો.
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +49, Group Roll No,ગ્રુપ રોલ કોઈ
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +49, Group Roll No,ગ્રુપ રોલ ક્રમાંક
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +9,Fee Creation Failed,ફી બનાવટ નિષ્ફળ થયું
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"ખાલી છોડો છો, તો તમે દર વર્ષે વિદ્યાર્થીઓ ગ્રુપ બનાવી"
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","ચકાસાયેલ હોય, તો કુલ નં. દિવસની રજાઓ સમાવેશ થાય છે, અને આ પગાર પ્રતિ દિવસ ની કિંમત ઘટાડશે"
@@ -4860,7 +4951,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,quot કાઉન્ટ
 ,BOM Stock Report,BOM સ્ટોક રિપોર્ટ
 DocType: Stock Reconciliation Item,Quantity Difference,જથ્થો તફાવત
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,પ્રોસેસીંગ પગારપત્રક
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,પ્રોસેસીંગ પગારપત્રક
 DocType: Opportunity Item,Basic Rate,મૂળ દર
 DocType: GL Entry,Credit Amount,ક્રેડિટ રકમ
 DocType: Cheque Print Template,Signatory Position,સહી પોઝિશન
@@ -4874,12 +4965,12 @@
 DocType: Tax Rule,Tax Rule,ટેક્સ નિયમ
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,સેલ્સ ચક્ર દરમ્યાન જ દર જાળવો
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,વર્કસ્ટેશન કામ કલાકો બહાર સમય લોગ યોજના બનાવો.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,કતારમાં ગ્રાહકો
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,ડૉ {0} પાસે ફિઝિશિયનની સૂચિ નથી તે ફિઝિશિયન માસ્ટર માં ઉમેરો
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,કતારમાં ગ્રાહકો
 DocType: Student,Nationality,રાષ્ટ્રીયતા
 ,Items To Be Requested,વસ્તુઓ વિનંતી કરવામાં
-DocType: Purchase Order,Get Last Purchase Rate,છેલ્લા ખરીદી દર વિચાર
 DocType: Company,Company Info,કંપની માહિતી
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,પસંદ કરો અથવા નવા ગ્રાહક ઉમેરો
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,પસંદ કરો અથવા નવા ગ્રાહક ઉમેરો
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,ખર્ચ કેન્દ્રને ખર્ચ દાવો બુક કરવા માટે જરૂરી છે
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ફંડ (અસ્ક્યામત) અરજી
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,આ કર્મચારીનું હાજરી પર આધારિત છે
@@ -4887,6 +4978,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,ઉધાર ખાતું
 DocType: Fiscal Year,Year Start Date,વર્ષે શરૂ તારીખ
 DocType: Attendance,Employee Name,કર્મચારીનું નામ
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,રેસ્ટોરન્ટ ઓર્ડર એન્ટ્રી આઇટમ
 DocType: Sales Invoice,Rounded Total (Company Currency),ગોળાકાર કુલ (કંપની ચલણ)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"એકાઉન્ટ પ્રકાર પસંદ છે, કારણ કે ગ્રુપ અપ્રગટ કરી શકતા નથી."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} સુધારાઈ ગયેલ છે. તાજું કરો.
@@ -4897,6 +4989,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,એમ્પ્લોયી બેનિફિટ્સ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},ભરેલા જથ્થો પંક્તિ માં વસ્તુ {0} માટે જથ્થો બરાબર હોવું જોઈએ {1}
 DocType: Production Order,Manufactured Qty,ઉત્પાદન Qty
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,ઇન્વોઇસ બનાવ્યું
 DocType: Purchase Receipt Item,Accepted Quantity,સ્વીકારાયું જથ્થો
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},મૂળભૂત કર્મચારી માટે રજા યાદી સુયોજિત કરો {0} અથવા કંપની {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} નથી અસ્તિત્વમાં
@@ -4906,18 +4999,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},રો કોઈ {0}: રકમ ખર્ચ દાવો {1} સામે રકમ બાકી કરતાં વધારે ન હોઈ શકે. બાકી રકમ છે {2}
 DocType: Maintenance Schedule,Schedule,સૂચિ
 DocType: Account,Parent Account,પિતૃ એકાઉન્ટ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,ઉપલબ્ધ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,ઉપલબ્ધ
 DocType: Quality Inspection Reading,Reading 3,3 વાંચન
 ,Hub,હબ
 DocType: GL Entry,Voucher Type,વાઉચર પ્રકાર
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,ભાવ યાદી મળી અથવા અક્ષમ નથી
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,ભાવ યાદી મળી અથવા અક્ષમ નથી
 DocType: Lab Test,Approved,મંજૂર
 DocType: Pricing Rule,Price,ભાવ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',{0} સુયોજિત થયેલ હોવું જ જોઈએ પર રાહત કર્મચારી &#39;ડાબી&#39; તરીકે
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',{0} સુયોજિત થયેલ હોવું જ જોઈએ પર રાહત કર્મચારી &#39;ડાબી&#39; તરીકે
+DocType: Hub Settings,Last Sync On,છેલ્લું સમન્વયન ચાલુ કરો
 DocType: Guardian,Guardian,ગાર્ડિયન
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,મૂલ્યાંકન {0} {1} આપેલ તારીખ શ્રેણી માં કર્મચારી માટે બનાવવામાં
 DocType: Employee,Education,શિક્ષણ
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,ડેલ
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,ડેલ
 DocType: Selling Settings,Campaign Naming By,દ્વારા ઝુંબેશ નામકરણ
 DocType: Employee,Current Address Is,વર્તમાન સરનામું
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,માસિક વેચાણ લક્ષ્યાંક (
@@ -4932,7 +5026,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,કોર્સ કોડ:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,ખર્ચ એકાઉન્ટ દાખલ કરો
 DocType: Account,Stock,સ્ટોક
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","રો # {0}: સંદર્ભ દસ્તાવેજ પ્રકારની ખરીદી ઓર્ડર એક, ખરીદી ભરતિયું અથવા જર્નલ પ્રવેશ હોવું જ જોઈએ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","રો # {0}: સંદર્ભ દસ્તાવેજ પ્રકારની ખરીદી ઓર્ડર એક, ખરીદી ભરતિયું અથવા જર્નલ પ્રવેશ હોવું જ જોઈએ"
 DocType: Employee,Current Address,અત્યારનું સરનામુ
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","સ્પષ્ટ સિવાય વસ્તુ પછી વર્ણન, છબી, ભાવો, કર નમૂનો સુયોજિત કરવામાં આવશે, વગેરે અન્ય વસ્તુ જ એક પ્રકાર છે, તો"
 DocType: Serial No,Purchase / Manufacture Details,ખરીદી / ઉત્પાદન વિગતો
@@ -4963,7 +5057,7 @@
 DocType: Hub Settings,Hub Settings,હબ સેટિંગ્સ
 DocType: Project,Gross Margin %,એકંદર માર્જીન%
 DocType: BOM,With Operations,કામગીરી સાથે
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,હિસાબી પ્રવેશો પહેલાથી જ ચલણ માં કરવામાં આવેલ છે {0} કંપની માટે {1}. ચલણ સાથે મળવાપાત્ર અથવા ચૂકવવાપાત્ર એકાઉન્ટ પસંદ કરો {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,હિસાબી પ્રવેશો પહેલાથી જ ચલણ માં કરવામાં આવેલ છે {0} કંપની માટે {1}. ચલણ સાથે મળવાપાત્ર અથવા ચૂકવવાપાત્ર એકાઉન્ટ પસંદ કરો {0}.
 DocType: Asset,Is Existing Asset,હાલની એસેટ છે
 DocType: Salary Detail,Statistical Component,સ્ટેટિસ્ટિકલ કમ્પોનન્ટ
 DocType: Warranty Claim,If different than customer address,ગ્રાહક સરનામું કરતાં અલગ તો
@@ -4971,13 +5065,14 @@
 DocType: BOM Operation,BOM Operation,BOM ઓપરેશન
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Next અગાઉના આગળ રો રકમ પર
 DocType: Student,Home Address,ઘરનું સરનામું
+DocType: Item,Has Expiry Date,સમાપ્તિ તારીખ છે
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,આઇટમ વેરિએન્ટ સેટિંગ્સ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,ટ્રાન્સફર એસેટ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,ટ્રાન્સફર એસેટ
 DocType: POS Profile,POS Profile,POS પ્રોફાઇલ
 DocType: Training Event,Event Name,ઇવેન્ટનું નામ
 DocType: Physician,Phone (Office),ફોન (ઓફિસ)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,પ્રવેશ
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},માટે પ્રવેશ {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,પ્રવેશ
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},માટે પ્રવેશ {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","સુયોજિત બજેટ, લક્ષ્યાંકો વગેરે માટે મોસમ"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,વેરિયેબલ નામ
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","{0} વસ્તુ એક નમૂનો છે, તેના ચલો એક પસંદ કરો"
@@ -4986,7 +5081,7 @@
 DocType: Assessment Plan,Room,રૂમ
 DocType: Purchase Order,Advance Paid,આગોતરી ચુકવણી
 DocType: Item,Item Tax,વસ્તુ ટેક્સ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,સપ્લાયર સામગ્રી
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,સપ્લાયર સામગ્રી
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,એક્સાઇઝ ભરતિયું
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,થ્રેશોલ્ડ {0}% કરતાં વધુ એક વખત દેખાય છે
 DocType: Expense Claim,Employees Email Id,કર્મચારીઓ ઇમેઇલ આઈડી
@@ -5002,26 +5097,24 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,ક્રેડીટ કાર્ડ
 DocType: BOM,Item to be manufactured or repacked,વસ્તુ ઉત્પાદન અથવા repacked શકાય
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,સ્ટોક વ્યવહારો માટે મૂળભૂત સુયોજનો.
-DocType: Purchase Invoice,Next Date,આગામી તારીખ
 DocType: Employee Education,Major/Optional Subjects,મુખ્ય / વૈકલ્પિક વિષયો
 DocType: Sales Invoice Item,Drop Ship,ડ્રોપ શિપ
+DocType: Hub Settings,Suspended,નિલંબિત
 DocType: Training Event,Attendees,પ્રતિભાગીઓ
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","અહીં તમે નામ અને પિતૃ, પત્ની અને બાળકો વ્યવસાય જેવા કૌટુંબિક વિગત જાળવી શકે છે"
 DocType: Academic Term,Term End Date,ટર્મ સમાપ્તિ તારીખ
-DocType: Hub Settings,Seller Name,વિક્રેતા નામ
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),કર અને ખર્ચ બાદ (કંપની ચલણ)
 DocType: Item Group,General Settings,સામાન્ય સુયોજનો
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,ચલણ અને ચલણ જ ન હોઈ શકે
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,પ્રશિક્ષકો ઉમેરો
 DocType: Stock Entry,Repack,RePack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,તમને પ્રક્રિયા કરવા પહેલાં ફોર્મ સેવ જ જોઈએ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,કૃપા કરીને પ્રથમ કંપની પસંદ કરો
 DocType: Item Attribute,Numeric Values,આંકડાકીય મૂલ્યો
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,લોગો જોડો
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,સ્ટોક સ્તર
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,સ્ટોક સ્તર
 DocType: Customer,Commission Rate,કમિશન દર
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,{1} માટે {0} સ્કોરકાર્ડ્સ વચ્ચે બનાવ્યાં:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,વેરિએન્ટ બનાવો
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,વેરિએન્ટ બનાવો
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,વિભાગ દ્વારા બ્લોક છોડી કાર્યક્રમો.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","ચુકવણી પ્રકાર, પ્રાપ્ત એક હોવું જોઈએ પે અને આંતરિક ટ્રાન્સફર"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,ઍનલિટિક્સ
@@ -5036,11 +5129,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,કેપિટલ સ્ટોક
 DocType: Shopping Cart Settings,Show Public Attachments,જાહેર જોડાણો બતાવો
 DocType: Packing Slip,Package Weight Details,પેકેજ વજન વિગતો
+DocType: Restaurant Reservation,Reservation Time,આરક્ષણ સમય
 DocType: Payment Gateway Account,Payment Gateway Account,પેમેન્ટ ગેટવે એકાઉન્ટ
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,"ચુકવણી પૂર્ણ કર્યા પછી, પસંદ કરેલ પાનું વપરાશકર્તા પુનઃદિશામાન."
 DocType: Company,Existing Company,હાલના કંપની
 DocType: Healthcare Settings,Result Emailed,પરિણામ ઇમેઇલ
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","ટેક્સ કેટેગરી &quot;કુલ&quot; પર બદલવામાં આવ્યું છે, કારણ કે તમામ વસ્તુઓ નોન-સ્ટોક વસ્તુઓ"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,આઇટમ કોડ&gt; આઇટમ ગ્રુપ&gt; બ્રાન્ડ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,CSV ફાઈલ પસંદ કરો
 DocType: Student Leave Application,Mark as Present,પ્રેઝન્ટ તરીકે માર્ક
 DocType: Supplier Scorecard,Indicator Color,સૂચક રંગ
@@ -5065,11 +5160,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,વિદ્યાર્થી બેચ બનાવવા
 DocType: Fee Schedule,FRQ.,FRQ
 DocType: Leave Type,Is Carry Forward,આગળ લઈ છે
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,BOM થી વસ્તુઓ વિચાર
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,BOM થી વસ્તુઓ વિચાર
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,સમય દિવસમાં લીડ
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},રો # {0}: પોસ્ટ તારીખ ખરીદી તારીખ તરીકે જ હોવી જોઈએ {1} એસેટ {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,આ તપાસો જો વિદ્યાર્થી સંસ્થાના છાત્રાલય ખાતે રહેતા છે.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,ઉપરના કોષ્ટકમાં વેચાણ ઓર્ડર દાખલ કરો
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,ઉપરના કોષ્ટકમાં વેચાણ ઓર્ડર દાખલ કરો
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,રજૂ ન પગાર સ્લિપ
 ,Stock Summary,સ્ટોક સારાંશ
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,બીજા એક વખાર માંથી એસેટ ટ્રાન્સફર
@@ -5085,5 +5180,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},રો {0}: ડેબિટ પ્રવેશ સાથે લિંક કરી શકતા નથી {1}
 DocType: Journal Entry,Subscription Section,સબ્સ્ક્રિપ્શન વિભાગ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,એકાઉન્ટ {0} અસ્તિત્વમાં નથી
+DocType: Training Event,Training Program,તાલીમ કાર્યક્રમ
 DocType: Account,Cash,કેશ
 DocType: Employee,Short biography for website and other publications.,વેબસાઇટ અને અન્ય પ્રકાશનો માટે લઘુ જીવનચરિત્ર.
diff --git a/erpnext/translations/he.csv b/erpnext/translations/he.csv
index 3a33db1..f9a1fa6 100644
--- a/erpnext/translations/he.csv
+++ b/erpnext/translations/he.csv
@@ -1,6 +1,5 @@
 DocType: Employee,Salary Mode,שכר Mode
 DocType: Patient,Divorced,גרוש
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,פריטים כבר סונכרנו
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,הרשה פריט שיתווסף מספר פעמים בעסקה
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,לבטל חומר בקר {0} לפני ביטול תביעת אחריות זו
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,מוצרים צריכה
@@ -18,13 +17,12 @@
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,ישים עבור משתמש
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","הזמנת ייצור הפסיק אינה ניתנת לביטול, מגופתו הראשונה לביטול"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,האם אתה באמת רוצה לבטל הנכס הזה?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,האם אתה באמת רוצה לבטל הנכס הזה?
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},מטבע נדרש למחיר המחירון {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* יחושב בעסקה.
 DocType: Purchase Order,Customer Contact,צור קשר עם לקוחות
 DocType: Job Applicant,Job Applicant,עבודת מבקש
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,זה מבוסס על עסקאות מול הספק הזה. ראה את ציר הזמן מתחת לפרטים
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,אין יותר תוצאות.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,משפטי
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},מס סוג בפועל לא ניתן כלול במחיר הפריט בשורת {0}
 DocType: Bank Guarantee,Customer,לקוחות
@@ -33,7 +31,7 @@
 DocType: Purchase Order,% Billed,% שחויבו
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),שער החליפין חייב להיות זהה {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,שם לקוח
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},חשבון בנק לא יכול להיות שם בתור {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},חשבון בנק לא יכול להיות שם בתור {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ראשים (או קבוצות) נגד שרישומים חשבונאיים נעשים ומתוחזקים יתרות.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),יוצא מן הכלל עבור {0} אינם יכולים להיות פחות מאפס ({1})
 DocType: Manufacturing Settings,Default 10 mins,ברירת מחדל 10 דקות
@@ -45,7 +43,7 @@
 DocType: Item Price,Multiple Item prices.,מחירי פריט מרובים.
 ,Purchase Order Items To Be Received,פריטים הזמנת רכש שיתקבלו
 DocType: SMS Center,All Supplier Contact,כל לתקשר עם הספק
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,תאריך הסיום צפוי לא יכול להיות פחות מתאריך ההתחלה צפויה
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,תאריך הסיום צפוי לא יכול להיות פחות מתאריך ההתחלה צפויה
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,# השורה {0}: שיעור חייב להיות זהה {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,החדש Leave Application
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,המחאה בנקאית
@@ -62,7 +60,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},משתמש {0} כבר הוקצה לעובדי {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,בריאות
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),עיכוב בתשלום (ימים)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,חשבונית
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,חשבונית
 DocType: Maintenance Schedule Item,Periodicity,תְקוּפָתִיוּת
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,שנת כספים {0} נדרש
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ביטחון
@@ -71,14 +69,14 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},שורת {0}: {1} {2} אינה תואמת עם {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,# השורה {0}:
 DocType: Delivery Note,Vehicle No,רכב לא
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,אנא בחר מחירון
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,אנא בחר מחירון
 DocType: Production Order Operation,Work In Progress,עבודה בתהליך
 DocType: Employee,Holiday List,רשימת החג
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,חשב
 DocType: Cost Center,Stock User,משתמש המניה
 DocType: Company,Phone No,מס 'טלפון
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,קורס לוחות זמנים נוצרו:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},חדש {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},חדש {0}: # {1}
 ,Sales Partners Commission,ועדת שותפי מכירות
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,קיצור לא יכול להיות יותר מ 5 תווים
 DocType: Payment Request,Payment Request,בקשת תשלום
@@ -99,7 +97,7 @@
 DocType: Patient,Married,נשוי
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},חל איסור על {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,קבל פריטים מ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},המניה לא ניתן לעדכן נגד תעודת משלוח {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},המניה לא ניתן לעדכן נגד תעודת משלוח {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},מוצרים {0}
 DocType: Payment Reconciliation,Reconcile,ליישב
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,מכולת
@@ -108,20 +106,19 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,קרנות פנסיה
 DocType: SMS Center,All Sales Person,כל איש המכירות
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** בחתך חודשי ** עוזר לך להפיץ את התקציב / היעד ברחבי חודשים אם יש לך עונתיות בעסק שלך.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,חסר מבנה השכר
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,חסר מבנה השכר
 DocType: Lead,Person Name,שם אדם
 DocType: Sales Invoice Item,Sales Invoice Item,פריט חשבונית מכירות
 DocType: Account,Credit,אשראי
 DocType: POS Profile,Write Off Cost Center,לכתוב את מרכז עלות
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",למשל &quot;בית הספר היסודי&quot; או &quot;האוניברסיטה&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",למשל &quot;בית הספר היסודי&quot; או &quot;האוניברסיטה&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,דוחות במלאי
 DocType: Warehouse,Warehouse Detail,פרט מחסן
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},מסגרת אשראי נחצתה ללקוחות {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;האם רכוש קבוע&quot; לא יכול להיות מסומן, כמו שיא נכסים קיים כנגד הפריט"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;האם רכוש קבוע&quot; לא יכול להיות מסומן, כמו שיא נכסים קיים כנגד הפריט"
 DocType: Tax Rule,Tax Type,סוג המס
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},אין לך ההרשאה להוסיף או עדכון ערכים לפני {0}
 DocType: BOM,Item Image (if not slideshow),תמונת פריט (אם לא מצגת)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,לקוחות קיימים עם אותו שם
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(שעת דרג / 60) * בפועל מבצע זמן
 DocType: SMS Log,SMS Log,SMS התחבר
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,עלות פריטים נמסר
@@ -143,7 +140,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,יעד ב
 DocType: BOM,Total Cost,עלות כוללת
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,יומן פעילות:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,פריט {0} אינו קיים במערכת או שפג תוקף
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,פריט {0} אינו קיים במערכת או שפג תוקף
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,"נדל""ן"
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,הצהרה של חשבון
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,תרופות
@@ -160,7 +157,7 @@
 DocType: SMS Center,All Contact,כל הקשר
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,משכורת שנתית
 DocType: Period Closing Voucher,Closing Fiscal Year,סגירת שנת כספים
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} הוא קפוא
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} הוא קפוא
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,הוצאות המניה
 DocType: Journal Entry,Contra Entry,קונטרה כניסה
 DocType: Journal Entry Account,Credit in Company Currency,אשראי במטבע החברה
@@ -174,7 +171,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,פריט {0} אינו פעיל או שהגיע הסוף של חיים
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,דוגמה: מתמטיקה בסיסית
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","כדי לכלול מס בשורת {0} בשיעור פריט, מסים בשורות {1} חייבים להיות כלולים גם"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,הגדרות עבור מודול HR
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,הגדרות עבור מודול HR
 DocType: SMS Center,SMS Center,SMS מרכז
 DocType: Sales Invoice,Change Amount,שנת הסכום
 DocType: BOM Update Tool,New BOM,BOM החדש
@@ -221,15 +218,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,For Warehouse is required before Submit,למחסן נדרש לפני הגשה
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,התקבל ב
 DocType: Sales Partner,Reseller,משווק
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,נא להזין חברה
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,נא להזין חברה
 DocType: Delivery Note Item,Against Sales Invoice Item,נגד פריט מכירות חשבונית
 ,Production Orders in Progress,הזמנות ייצור בהתקדמות
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,מזומנים נטו ממימון
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage מלא, לא הציל"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage מלא, לא הציל"
 DocType: Lead,Address & Contact,כתובת ולתקשר
 DocType: Leave Allocation,Add unused leaves from previous allocations,להוסיף עלים שאינם בשימוש מהקצאות קודמות
 DocType: Sales Partner,Partner website,אתר שותף
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,הוסף פריט
+DocType: Restaurant Order Entry,Add Item,הוסף פריט
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,שם איש קשר
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,יוצר תלוש משכורת לקריטריונים שהוזכרו לעיל.
 DocType: Cheque Print Template,Line spacing for amount in words,מרווח בין שורות עבור הסכום במילים
@@ -245,7 +242,7 @@
 DocType: Task,Total Costing Amount (via Time Sheet),סה&quot;כ תמחיר הסכום (באמצעות גיליון זמן)
 DocType: Item Website Specification,Item Website Specification,מפרט אתר פריט
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,השאר חסימה
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},פריט {0} הגיע לסיומו של חיים על {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},פריט {0} הגיע לסיומו של חיים על {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,פוסט בנק
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,שנתי
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,פריט במלאי פיוס
@@ -253,15 +250,14 @@
 DocType: Material Request Item,Min Order Qty,להזמין כמות מינימום
 DocType: Lead,Do Not Contact,אל תצור קשר
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,אנשים המלמדים בארגון שלך
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Id הייחודי למעקב אחר כל החשבוניות חוזרות. הוא נוצר על שליחה.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,מפתח תוכנה
 DocType: Item,Minimum Order Qty,להזמין כמות מינימום
 DocType: Pricing Rule,Supplier Type,סוג ספק
 DocType: Course Scheduling Tool,Course Start Date,תאריך פתיחת הקורס
 DocType: Item,Publish in Hub,פרסם בHub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,פריט {0} יבוטל
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,בקשת חומר
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,פריט {0} יבוטל
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,בקשת חומר
 DocType: Bank Reconciliation,Update Clearance Date,תאריך שחרור עדכון
 DocType: Item,Purchase Details,פרטי רכישה
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},פריט {0} לא נמצא בטבלה &quot;חומרי גלם מסופקת &#39;בהזמנת רכש {1}
@@ -283,7 +279,7 @@
 DocType: Email Digest,New Quotations,ציטוטים חדשים
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,המאשר החופשה הראשונה ברשימה תהיה לקבוע כברירת מחדל Leave המאשרת
 DocType: Tax Rule,Shipping County,מחוז משלוח
-apps/erpnext/erpnext/config/desktop.py +158,Learn,לִלמוֹד
+apps/erpnext/erpnext/config/desktop.py +159,Learn,לִלמוֹד
 DocType: Asset,Next Depreciation Date,תאריך הפחת הבא
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,עלות פעילות לעובדים
 DocType: Accounts Settings,Settings for Accounts,הגדרות עבור חשבונות
@@ -292,12 +288,12 @@
 DocType: Job Applicant,Cover Letter,מכתב כיסוי
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,המחאות ופיקדונות כדי לנקות מצטיינים
 DocType: Item,Synced With Hub,סונכרן עם רכזת
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,סיסמא שגויה
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,סיסמא שגויה
 DocType: Item,Variant Of,גרסה של
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"כמות שהושלמה לא יכולה להיות גדולה מ 'כמות לייצור """
 DocType: Period Closing Voucher,Closing Account Head,סגירת חשבון ראש
 DocType: Employee,External Work History,חיצוני היסטוריה עבודה
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,שגיאת הפניה מעגלית
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,שגיאת הפניה מעגלית
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,במילים (יצוא) יהיה גלוי לאחר שתשמרו את תעודת המשלוח.
 DocType: Cheque Print Template,Distance from left edge,מרחק הקצה השמאלי
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} יחידות של [{1}] (טופס # / כתבה / {1}) נמצא [{2}] (טופס # / מחסן / {2})
@@ -310,8 +306,8 @@
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,הגדרת מסים
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,עלות נמכר נכס
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,כניסת תשלום השתנתה לאחר שמשכת אותו. אנא למשוך אותו שוב.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} נכנס פעמיים במס פריט
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,סיכום השבוע הזה ופעילויות תלויות ועומדות
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} נכנס פעמיים במס פריט
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,סיכום השבוע הזה ופעילויות תלויות ועומדות
 DocType: Student Applicant,Admitted,רישיון
 DocType: Workstation,Rent Cost,עלות השכרה
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,הסכום לאחר פחת
@@ -322,29 +318,29 @@
 DocType: Shipping Rule,Valid for Countries,תקף למדינות
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"פריט זה הוא תבנית ולא ניתן להשתמש בם בעסקות. תכונות פריט תועתק על לגרסות אלא אם כן ""לא העתק 'מוגדרת"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,"להזמין סה""כ נחשב"
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","ייעוד עובד (למשל מנכ""ל, מנהל וכו ')."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","ייעוד עובד (למשל מנכ""ל, מנהל וכו ')."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,קצב שבו מטבע לקוחות מומר למטבע הבסיס של הלקוח
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},שורה # {0}: חשבונית הרכש אינו יכול להתבצע נגד נכס קיים {1}
 DocType: Item Tax,Tax Rate,שיעור מס
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} כבר הוקצה לעובדי {1} לתקופה {2} {3} ל
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,פריט בחר
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,פריט בחר
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,לרכוש חשבונית {0} כבר הוגשה
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},# השורה {0}: אצווה לא חייב להיות זהה {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,המרת שאינה קבוצה
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,אצווה (הרבה) של פריט.
 DocType: C-Form Invoice Detail,Invoice Date,תאריך חשבונית
 DocType: GL Entry,Debit Amount,סכום חיוב
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},לא יכול להיות רק 1 חשבון לכל חברת {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,אנא ראה קובץ מצורף
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},לא יכול להיות רק 1 חשבון לכל חברת {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,אנא ראה קובץ מצורף
 DocType: Purchase Order,% Received,% התקבל
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,יצירת קבוצות סטודנטים
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,התקנה כבר מלא !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,התקנה כבר מלא !!
 ,Finished Goods,מוצרים מוגמרים
 DocType: Delivery Note,Instructions,הוראות
 DocType: Quality Inspection,Inspected By,נבדק על ידי
 DocType: Maintenance Visit,Maintenance Type,סוג התחזוקה
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},מספר סידורי {0} אינו שייך לתעודת משלוח {1}
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,הוסף פריטים
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,הוסף פריטים
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,פריט איכות פיקוח פרמטר
 DocType: Leave Application,Leave Approver Name,השאר שם מאשר
 DocType: Depreciation Schedule,Schedule Date,תאריך לוח זמנים
@@ -375,7 +371,7 @@
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,הזדמנויות
 DocType: Lab Test Template,Single,אחת
 DocType: Account,Cost of Goods Sold,עלות מכר
-DocType: Purchase Invoice,Yearly,שנתי
+DocType: Subscription,Yearly,שנתי
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,נא להזין מרכז עלות
 DocType: Journal Entry Account,Sales Order,להזמין מכירות
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,ממוצע. שיעור מכירה
@@ -398,7 +394,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,הגדרות גלובליות עבור כל תהליכי הייצור.
 DocType: Accounts Settings,Accounts Frozen Upto,חשבונות קפואים Upto
 DocType: SMS Log,Sent On,נשלח ב
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,תכונה {0} נבחר מספר פעמים בטבלה תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,תכונה {0} נבחר מספר פעמים בטבלה תכונות
 DocType: HR Settings,Employee record is created using selected field. ,שיא עובד שנוצר באמצעות שדה שנבחר.
 DocType: Sales Order,Not Applicable,לא ישים
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,אב חג.
@@ -417,7 +413,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,ניירות ערך ופיקדונות
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,סה&quot;כ עלים שהוקצו הוא חובה
 DocType: Job Opening,Description of a Job Opening,תיאור של פתיחת איוב
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,פעילויות ממתינים להיום
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,פעילויות ממתינים להיום
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,נוכחות שיא.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,רכיב שכר שכר מבוסס גיליון.
 DocType: Sales Order Item,Used for Production Plan,המשמש לתכנית ייצור
@@ -432,11 +428,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,קצין מנהלי
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,אנא בחר חברה
 DocType: Stock Entry Detail,Difference Account,חשבון הבדל
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,לא יכולה לסגור משימה כמשימה התלויה {0} אינה סגורה.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,נא להזין את המחסן שלבקשת חומר יועלה
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,לא יכולה לסגור משימה כמשימה התלויה {0} אינה סגורה.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,נא להזין את המחסן שלבקשת חומר יועלה
 DocType: Production Order,Additional Operating Cost,עלות הפעלה נוספות
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,קוסמטיקה
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","למזג, המאפיינים הבאים חייבים להיות זהים בשני הפריטים"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","למזג, המאפיינים הבאים חייבים להיות זהים בשני הפריטים"
 DocType: Shipping Rule,Net Weight,משקל נטו
 DocType: Employee,Emergency Phone,טל 'חירום
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,לִקְנוֹת
@@ -444,7 +440,7 @@
 DocType: Sales Invoice,Offline POS Name,שם קופה מנותקת
 DocType: Sales Order,To Deliver,כדי לספק
 DocType: Purchase Invoice Item,Item,פריט
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,אין פריט סידורי לא יכול להיות חלק
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,אין פריט סידורי לא יכול להיות חלק
 DocType: Journal Entry,Difference (Dr - Cr),"הבדל (ד""ר - Cr)"
 DocType: Account,Profit and Loss,רווח והפסד
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,קבלנות משנה ניהול
@@ -459,13 +455,13 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,תוספת לא יכולה להיות 0
 DocType: Production Planning Tool,Material Requirement,דרישת חומר
 DocType: Company,Delete Company Transactions,מחק עסקות חברה
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,אסמכתא ותאריך ההפניה הוא חובה עבור עסקת הבנק
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,אסמכתא ותאריך ההפניה הוא חובה עבור עסקת הבנק
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,להוסיף מסים / עריכה וחיובים
 DocType: Payment Entry Reference,Supplier Invoice No,ספק חשבונית לא
 DocType: Territory,For reference,לעיון
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","לא יכול למחוק את מספר סידורי {0}, כפי שהוא משמש בעסקות מניות"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),סגירה (Cr)
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,פריט העבר
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,פריט העבר
 DocType: Serial No,Warranty Period (Days),תקופת אחריות (ימים)
 DocType: Installation Note Item,Installation Note Item,פריט הערה התקנה
 DocType: Production Plan Item,Pending Qty,בהמתנה כמות
@@ -477,7 +473,7 @@
 DocType: Sales Invoice,Total Commission,"הוועדה סה""כ"
 DocType: Pricing Rule,Sales Partner,פרטנר מכירות
 DocType: Buying Settings,Purchase Receipt Required,קבלת רכישת חובה
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,דרג ההערכה היא חובה אם Stock פתיחה נכנס
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,דרג ההערכה היא חובה אם Stock פתיחה נכנס
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,לא נמצא רשומות בטבלת החשבונית
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,אנא בחר סוג החברה והמפלגה ראשון
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,כספי לשנה / חשבונאות.
@@ -508,7 +504,7 @@
 DocType: Quotation,Quotation To,הצעת מחיר ל
 DocType: Lead,Middle Income,הכנסה התיכונה
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),פתיחה (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"ברירת מחדל של יחידת מדידה לפריט {0} לא ניתן לשנות באופן ישיר, כי כבר עשו כמה עסקה (ים) עם יחידת מידה אחרת. יהיה עליך ליצור פריט חדש לשימוש יחידת מידת ברירת מחדל שונה."
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"ברירת מחדל של יחידת מדידה לפריט {0} לא ניתן לשנות באופן ישיר, כי כבר עשו כמה עסקה (ים) עם יחידת מידה אחרת. יהיה עליך ליצור פריט חדש לשימוש יחידת מידת ברירת מחדל שונה."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,סכום שהוקצה אינו יכול להיות שלילי
 DocType: Purchase Order Item,Billed Amt,Amt שחויב
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,מחסן לוגי שנגדו מרשמו רשומות מלאי
@@ -519,7 +515,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,אדם אחר מכירות {0} קיים עם אותו זיהוי העובד
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,תואר שני
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,תאריכי עסקת בנק Update
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,מעקב זמן
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,מעקב זמן
 DocType: Fiscal Year Company,Fiscal Year Company,שנת כספי חברה
 DocType: Packing Slip Item,DN Detail,פרט DN
 DocType: Timesheet,Billed,מחויב
@@ -546,7 +542,7 @@
 DocType: Production Order Operation,In minutes,בדקות
 DocType: Issue,Resolution Date,תאריך החלטה
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,גיליון נוצר:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},אנא הגדר מזומנים ברירת מחדל או חשבון בנק במצב של תשלום {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},אנא הגדר מזומנים ברירת מחדל או חשבון בנק במצב של תשלום {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,לְהִרָשֵׁם
 DocType: Selling Settings,Customer Naming By,Naming הלקוח על ידי
 DocType: Depreciation Schedule,Depreciation Amount,סכום הפחת
@@ -570,18 +566,17 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,מסים עלות נחתו וחיובים
 DocType: Production Order Operation,Actual Start Time,בפועל זמן התחלה
 DocType: BOM Operation,Operation Time,מבצע זמן
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,סִיוּם
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,לכתוב את הסכום
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,סִיוּם
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,לכתוב את הסכום
 DocType: Leave Block List Allow,Allow User,לאפשר למשתמש
 DocType: Journal Entry,Bill No,ביל לא
 DocType: Company,Gain/Loss Account on Asset Disposal,חשבון רווח / הפסד בעת מימוש נכסים
-DocType: Purchase Invoice,Quarterly,הרבעונים
+DocType: Subscription,Quarterly,הרבעונים
 DocType: Selling Settings,Delivery Note Required,תעודת משלוח חובה
 DocType: BOM Item,Basic Rate (Company Currency),שיעור בסיסי (חברת מטבע)
 DocType: Student Attendance,Student Attendance,נוכחות תלמידים
 DocType: Sales Invoice Timesheet,Time Sheet,לוח זמנים
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush חומרי גלם המבוסס על
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,נא להזין את פרטי פריט
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,קדם מכירות
 DocType: Purchase Receipt,Other Details,פרטים נוספים
 DocType: Account,Accounts,חשבונות
@@ -591,10 +586,9 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} does not linked to Item {2},# שורה {0}: Asset {1} אינו קשור פריט {2}
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,חשבון {0} הוזן מספר פעמים
 DocType: Account,Expenses Included In Valuation,הוצאות שנכללו בהערכת שווי
-DocType: Hub Settings,Seller City,מוכר עיר
 DocType: Email Digest,Next email will be sent on:,"הדוא""ל הבא יישלח על:"
 DocType: Offer Letter Term,Offer Letter Term,להציע מכתב לטווח
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,יש פריט גרסאות.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,יש פריט גרסאות.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,פריט {0} לא נמצא
 DocType: Bin,Stock Value,מניית ערך
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,החברה {0} לא קיים
@@ -612,12 +606,11 @@
 DocType: Lead,Campaign Name,שם מסע פרסום
 ,Reserved,שמורות
 DocType: Purchase Order,Supply Raw Materials,חומרי גלם אספקה
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,התאריך שבו החשבונית הבאה תופק. הוא נוצר על שליחה.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,נכסים שוטפים
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} הוא לא פריט מלאי
 DocType: Mode of Payment Account,Default Account,חשבון ברירת מחדל
 DocType: Payment Entry,Received Amount (Company Currency),הסכום שהתקבל (חברת מטבע)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,עופרת יש להגדיר אם הזדמנות עשויה מעופרת
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,עופרת יש להגדיר אם הזדמנות עשויה מעופרת
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,אנא בחר יום מנוחה שבועי
 DocType: Production Order Operation,Planned End Time,שעת סיום מתוכננת
 ,Sales Person Target Variance Item Group-Wise,פריט יעד שונות איש מכירות קבוצה-Wise
@@ -637,11 +630,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,שורת {0}: המרת פקטור הוא חובה
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","חוקי מחיר מרובים קיימים עם אותם הקריטריונים, בבקשה לפתור את סכסוך על ידי הקצאת עדיפות. חוקי מחיר: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,לא יכול לבטל או לבטל BOM כפי שהוא מקושר עם עצי מוצר אחרים
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,לא יכול לבטל או לבטל BOM כפי שהוא מקושר עם עצי מוצר אחרים
 DocType: Opportunity,Maintenance,תחזוקה
 DocType: Item Attribute Value,Item Attribute Value,פריט תכונה ערך
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,מבצעי מכירות.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,הפוך גיליון
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,הפוך גיליון
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -674,11 +667,11 @@
 DocType: Account,Liability,אחריות
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,סכום גושפנקא לא יכול להיות גדול מסכום תביעה בשורה {0}.
 DocType: Company,Default Cost of Goods Sold Account,עלות ברירת מחדל של חשבון מכר
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,מחיר המחירון לא נבחר
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,מחיר המחירון לא נבחר
 DocType: Employee,Family Background,רקע משפחתי
 DocType: Request for Quotation Supplier,Send Email,שלח אי-מייל
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},אזהרה: קובץ מצורף לא חוקי {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,אין אישור
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},אזהרה: קובץ מצורף לא חוקי {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,אין אישור
 DocType: Company,Default Bank Account,חשבון בנק ברירת מחדל
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","כדי לסנן מבוסס על המפלגה, מפלגה בחר את הסוג ראשון"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"לא ניתן לבדוק את &quot;מלאי עדכון &#39;, כי פריטים אינם מועברים באמצעות {0}"
@@ -697,11 +690,10 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,סכום חשבונית מינימום
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,פריט שורה {idx}: {DOCTYPE} {DOCNAME} אינה קיימת מעל &#39;{DOCTYPE} שולחן
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,גיליון {0} כבר הושלם או בוטל
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","היום בחודש שבו חשבונית אוטומטית תיווצר למשל 05, 28 וכו '"
 DocType: Asset,Opening Accumulated Depreciation,פתיחת פחת שנצבר
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ציון חייב להיות קטן או שווה ל 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,כלי הרשמה לתכנית
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,רשומות C-טופס
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,רשומות C-טופס
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,לקוחות וספקים
 DocType: Email Digest,Email Digest Settings,"הגדרות Digest דוא""ל"
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,שאילתות התמיכה של לקוחות.
@@ -712,12 +704,12 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,לוח זמנים מסלול
 DocType: Maintenance Visit,Completion Status,סטטוס השלמה
 DocType: HR Settings,Enter retirement age in years,זן גיל פרישה בשנים
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,יעד מחסן
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,יעד מחסן
 DocType: Cheque Print Template,Starting location from left edge,החל מיקום הקצה שמאלי
 DocType: Item,Allow over delivery or receipt upto this percent,לאפשר על משלוח או קבלת upto אחוזים זה
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,נוכחות יבוא
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,בכל קבוצות הפריט
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,בכל קבוצות הפריט
 DocType: Process Payroll,Activity Log,יומן פעילות
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,רווח נקי / הפסד
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,באופן אוטומטי לחבר את ההודעה על הגשת עסקות.
@@ -727,7 +719,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,הזמנת רכש לתשלום
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,כמות חזויה
 DocType: Sales Invoice,Payment Due Date,מועד תשלום
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,פריט Variant {0} כבר קיים עימן תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,פריט Variant {0} כבר קיים עימן תכונות
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&quot;פתיחה&quot;
 DocType: Notification Control,Delivery Note Message,מסר תעודת משלוח
 DocType: Expense Claim,Expenses,הוצאות
@@ -742,7 +734,7 @@
 DocType: Sales Team,Incentives,תמריצים
 DocType: SMS Log,Requested Numbers,מספרים מבוקשים
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,הערכת ביצועים.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","&#39;השתמש עבור סל קניות&#39; האפשור, כמו סל הקניות מופעל ולא צריך להיות לפחות כלל מס אחד עבור סל קניות"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","&#39;השתמש עבור סל קניות&#39; האפשור, כמו סל הקניות מופעל ולא צריך להיות לפחות כלל מס אחד עבור סל קניות"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","קליטת הוצאות {0} מקושרת נגד להזמין {1}, לבדוק אם הוא צריך להיות משך כפי מראש בחשבונית זו."
 DocType: Sales Invoice Item,Stock Details,פרטי מלאי
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,פרויקט ערך
@@ -757,7 +749,7 @@
 DocType: Salary Slip,Working Days,ימי עבודה
 DocType: Serial No,Incoming Rate,שערי נכנסים
 DocType: Packing Slip,Gross Weight,משקל ברוטו
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,שמה של החברה שלך שאתה מגדיר את המערכת הזאת.
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,שמה של החברה שלך שאתה מגדיר את המערכת הזאת.
 DocType: HR Settings,Include holidays in Total no. of Working Days,כולל חגים בסך הכל לא. ימי עבודה
 DocType: Job Applicant,Hold,החזק
 DocType: Employee,Date of Joining,תאריך ההצטרפות
@@ -772,30 +764,28 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},לא ניתן למצוא משבצת הזמן בעולם הבא {0} ימים למבצע {1}
 DocType: Production Order,Plan material for sub-assemblies,חומר תכנית לתת מכלולים
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,שותפי מכירות טריטוריה
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} חייב להיות פעיל
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} חייב להיות פעיל
 DocType: Journal Entry,Depreciation Entry,כניסת פחת
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,אנא בחר את סוג המסמך ראשון
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ביקורי חומר לבטל {0} לפני ביטול תחזוקת הביקור הזה
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},מספר סידורי {0} אינו שייך לפריט {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,חובה כמות
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,מחסן עם עסקה קיימת לא ניתן להמיר לדג&#39;ר.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,מחסן עם עסקה קיימת לא ניתן להמיר לדג&#39;ר.
 DocType: Bank Reconciliation,Total Amount,"סה""כ לתשלום"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,הוצאה לאור באינטרנט
 DocType: Production Planning Tool,Production Orders,הזמנות ייצור
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +62,Balance Value,ערך איזון
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,מחיר מחירון מכירות
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,לפרסם לסנכרן פריטים
 DocType: Bank Reconciliation,Account Currency,מטבע חשבון
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,נא לציין לעגל חשבון בחברה
 DocType: Purchase Receipt,Range,טווח
 DocType: Supplier,Default Payable Accounts,חשבונות לתשלום ברירת מחדל
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,עובד {0} אינו פעיל או שאינו קיים
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},נא להזין קטגורית Asset בסעיף {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,פריט גרסאות {0} מעודכן
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,פריט גרסאות {0} מעודכן
 DocType: Quality Inspection Reading,Reading 6,קריאת 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,אין אפשרות {0} {1} {2} ללא כל חשבונית מצטיינים שלילית
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,אין אפשרות {0} {1} {2} ללא כל חשבונית מצטיינים שלילית
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,לרכוש חשבונית מראש
-DocType: Hub Settings,Sync Now,Sync עכשיו
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},שורת {0}: כניסת אשראי לא יכולה להיות מקושרת עם {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,גדר תקציב עבור שנת כספים.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,חשבון בנק / מזומנים ברירת מחדל יהיה מעודכן באופן אוטומטי בקופת חשבונית כאשר מצב זה נבחר.
@@ -807,7 +797,7 @@
 DocType: Item,Is Purchase Item,האם פריט הרכישה
 DocType: Asset,Purchase Invoice,רכישת חשבוניות
 DocType: Stock Ledger Entry,Voucher Detail No,פרט שובר לא
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,חשבונית מכירת בתים חדשה
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,חשבונית מכירת בתים חדשה
 DocType: Stock Entry,Total Outgoing Value,"ערך יוצא סה""כ"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,פתיחת תאריך ותאריך סגירה צריכה להיות באותה שנת כספים
 DocType: Lead,Request for Information,בקשה לקבלת מידע
@@ -828,7 +818,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,שונות
 ,Company Name,שם חברה
 DocType: SMS Center,Total Message(s),מסר כולל (ים)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,פריט בחר להעברה
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,פריט בחר להעברה
 DocType: Purchase Invoice,Additional Discount Percentage,אחוז הנחה נוסף
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,הצגת רשימה של כל סרטי וידאו העזרה
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ראש בחר חשבון של הבנק שבו הופקד שיק.
@@ -853,7 +843,7 @@
 DocType: Journal Entry,Total Amount in Words,סכתי-הכל סכום מילים
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,הייתה שגיאה. סיבה סבירה אחת יכולה להיות שלא שמרת את הטופס. אנא צור קשר עם support@erpnext.com אם הבעיה נמשכת.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,סל הקניות שלי
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},סוג ההזמנה חייבת להיות אחד {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},סוג ההזמנה חייבת להיות אחד {0}
 DocType: Lead,Next Contact Date,התאריך לתקשר הבא
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,פתיחת כמות
 DocType: Student Batch Name,Student Batch Name,שם תצווה סטודנטים
@@ -861,8 +851,8 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,קורס לו&quot;ז
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,אופציות
 DocType: Journal Entry Account,Expense Claim,תביעת הוצאות
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,האם אתה באמת רוצה לשחזר נכס לגרוטאות זה?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},כמות עבור {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,האם אתה באמת רוצה לשחזר נכס לגרוטאות זה?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},כמות עבור {0}
 DocType: Leave Application,Leave Application,החופשה Application
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,השאר הקצאת כלי
 DocType: Leave Block List,Leave Block List Dates,השאר תאריכי בלוק רשימה
@@ -873,10 +863,10 @@
 DocType: Purchase Invoice,Cash/Bank Account,מזומנים / חשבון בנק
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,פריטים הוסרו ללא שינוי בכמות או ערך.
 DocType: Delivery Note,Delivery To,משלוח ל
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,שולחן תכונה הוא חובה
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,שולחן תכונה הוא חובה
 DocType: Production Planning Tool,Get Sales Orders,קבל הזמנות ומכירות
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} אינו יכול להיות שלילי
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,דיסקונט
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,דיסקונט
 DocType: Asset,Total Number of Depreciations,מספר כולל של פחת
 DocType: Workstation,Wages,שכר
 DocType: Task,Urgent,דחוף
@@ -906,7 +896,7 @@
 DocType: GL Entry,Against,נגד
 DocType: Item,Default Selling Cost Center,מרכז עלות מכירת ברירת מחדל
 DocType: Sales Partner,Implementation Partner,שותף יישום
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},להזמין מכירות {0} הוא {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},להזמין מכירות {0} הוא {1}
 DocType: Opportunity,Contact Info,יצירת קשר
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,מה שהופך את ערכי המלאי
 DocType: Packing Slip,Net Weight UOM,Net משקל של אוני 'מישגן
@@ -930,7 +920,7 @@
 DocType: Program Enrollment,Transportation,תחבורה
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,תכונה לא חוקית
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} יש להגיש
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},כמות חייבת להיות קטנה או שווה ל {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},כמות חייבת להיות קטנה או שווה ל {0}
 DocType: SMS Center,Total Characters,"סה""כ תווים"
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},אנא בחר BOM בתחום BOM לפריט {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,פרט C-טופס חשבונית
@@ -944,7 +934,7 @@
 ,Ordered Items To Be Billed,פריטים שהוזמנו להיות מחויב
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,מהטווח צריך להיות פחות מטווח
 DocType: Global Defaults,Global Defaults,ברירות מחדל גלובליות
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,הזמנה לשיתוף פעולה בניהול פרויקטים
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,הזמנה לשיתוף פעולה בניהול פרויקטים
 DocType: Salary Slip,Deductions,ניכויים
 DocType: Purchase Invoice,Start date of current invoice's period,תאריך התחלה של תקופה של החשבונית הנוכחית
 DocType: Salary Slip,Leave Without Pay,חופשה ללא תשלום
@@ -956,7 +946,7 @@
 apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,מאזן חשבונאי פתיחה
 DocType: Sales Invoice Advance,Sales Invoice Advance,מכירות חשבונית מראש
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,שום דבר לא לבקש
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','תאריך התחלה בפועל' לא יכול להיות גדול מ 'תאריך סיום בפועל'
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','תאריך התחלה בפועל' לא יכול להיות גדול מ 'תאריך סיום בפועל'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,ניהול
 DocType: Cheque Print Template,Payer Settings,גדרות משלמות
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","זה יצורף לקוד הפריט של הגרסה. לדוגמא, אם הקיצור שלך הוא ""SM"", ואת קוד הפריט הוא ""T-shirt"", קוד הפריט של הגרסה יהיה ""T-shirt-SM"""
@@ -972,12 +962,12 @@
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,מסד נתוני ספק.
 DocType: Account,Balance Sheet,מאזן
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',עלות מרכז לפריט עם קוד פריט '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","מצב תשלום אינו מוגדר. אנא קרא, אם חשבון הוגדר על מצב תשלומים או על פרופיל קופה."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","מצב תשלום אינו מוגדר. אנא קרא, אם חשבון הוגדר על מצב תשלומים או על פרופיל קופה."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","חשבונות נוספים יכולים להתבצע תחת קבוצות, אבל ערכים יכולים להתבצע נגד לא-קבוצות"
 DocType: Lead,Lead,לידים
 DocType: Email Digest,Payables,זכאי
 DocType: Course,Course Intro,קורס מבוא
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,מאגר כניסת {0} נוצרה
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,מאגר כניסת {0} נוצרה
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,# השורה {0}: נדחו לא ניתן להזין כמות ברכישת חזרה
 ,Purchase Order Items To Be Billed,פריטים הזמנת רכש לחיוב
 DocType: Purchase Invoice Item,Net Rate,שיעור נטו
@@ -994,7 +984,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},שורה כפולה {0} עם אותו {1}
 ,Trial Balance,מאזן בוחן
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,שנת כספים {0} לא נמצאה
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,הגדרת עובדים
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,הגדרת עובדים
 DocType: Sales Order,SO-,כך-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,אנא בחר תחילה קידומת
 DocType: Employee,O-,O-
@@ -1005,8 +995,8 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,פריט {0} חייב להיות לפריט שאינו מוחזק במלאי
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,צפה לדג'ר
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,המוקדם
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","קבוצת פריט קיימת עם אותו שם, בבקשה לשנות את שם הפריט או לשנות את שם קבוצת הפריט"
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,שאר העולם
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","קבוצת פריט קיימת עם אותו שם, בבקשה לשנות את שם הפריט או לשנות את שם קבוצת הפריט"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,שאר העולם
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,פריט {0} לא יכול להיות אצווה
 ,Budget Variance Report,תקציב שונות דווח
 DocType: Salary Slip,Gross Pay,חבילת גרוס
@@ -1016,7 +1006,7 @@
 DocType: Stock Reconciliation,Difference Amount,סכום הבדל
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,עודפים
 DocType: BOM,Item Description,תיאור פריט
-DocType: Purchase Invoice,Is Recurring,האם חוזר
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,שיטת תשלום
 DocType: Purchase Invoice,Supplied Items,פריטים שסופקו
 DocType: Student,STUD.,סוּס הַרבָּעָה.
 DocType: Production Order,Qty To Manufacture,כמות לייצור
@@ -1038,12 +1028,12 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},אינך רשאי לערוך חשבון קפוא {0}
 DocType: Journal Entry,Get Outstanding Invoices,קבל חשבוניות מצטיינים
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,להזמין מכירות {0} אינו חוקי
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","מצטער, לא ניתן למזג חברות"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","מצטער, לא ניתן למזג חברות"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",כמות הנפקה / ההעברה הכולל {0} ב בקשת חומר {1} \ לא יכולה להיות גדולה מ כמות מבוקשת {2} עבור פריט {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,קטן
 DocType: Employee,Employee Number,מספר עובדים
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},מקרה לא (ים) כבר בשימוש. נסה מקייס לא {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},מקרה לא (ים) כבר בשימוש. נסה מקייס לא {0}
 DocType: Project,% Completed,% הושלם
 ,Invoiced Amount (Exculsive Tax),סכום חשבונית (מס Exculsive)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,פריט 2
@@ -1057,28 +1047,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,הוצאות עקיפות
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,שורת {0}: הכמות היא חובה
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,חקלאות
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,המוצרים או השירותים שלך
 DocType: Mode of Payment,Mode of Payment,מצב של תשלום
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,תמונה: אתר אינטרנט צריכה להיות קובץ ציבורי או כתובת אתר אינטרנט
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,תמונה: אתר אינטרנט צריכה להיות קובץ ציבורי או כתובת אתר אינטרנט
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,מדובר בקבוצת פריט שורש ולא ניתן לערוך.
 DocType: Journal Entry Account,Purchase Order,הזמנת רכש
 DocType: Warehouse,Warehouse Contact Info,מחסן פרטים ליצירת קשר
 DocType: Payment Entry,Write Off Difference Amount,מחיקת חוב סכום הפרש
-DocType: Purchase Invoice,Recurring Type,סוג חוזר
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: דוא&quot;ל שכיר לא נמצא, ומכאן דוא&quot;ל לא נשלח"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: דוא&quot;ל שכיר לא נמצא, ומכאן דוא&quot;ל לא נשלח"
 DocType: Email Digest,Annual Income,הכנסה שנתית
 DocType: Serial No,Serial No Details,Serial No פרטים
 DocType: Purchase Invoice Item,Item Tax Rate,שיעור מס פריט
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","עבור {0}, רק חשבונות האשראי יכולים להיות מקושרים נגד כניסת חיוב נוספת"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,משלוח הערה {0} לא תוגש
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,משלוח הערה {0} לא תוגש
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,פריט {0} חייב להיות פריט-נדבק Sub
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,ציוד הון
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","כלל תמחור נבחר ראשון המבוססת על 'החל ב'שדה, אשר יכול להיות פריט, קבוצת פריט או מותג."
-DocType: Hub Settings,Seller Website,אתר מוכר
 DocType: Item,ITEM-,פריט-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,"אחוז הוקצה סה""כ לצוות מכירות צריך להיות 100"
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,"אחוז הוקצה סה""כ לצוות מכירות צריך להיות 100"
 DocType: Sales Invoice Item,Edit Description,עריכת תיאור
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +885,For Supplier,לספקים
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,הגדרת סוג החשבון מסייעת בבחירת חשבון זה בעסקות.
@@ -1094,10 +1082,10 @@
 DocType: Purchase Invoice,Total (Company Currency),סה&quot;כ (חברת מטבע)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,מספר סידורי {0} נכנס יותר מפעם אחת
 DocType: Depreciation Schedule,Journal Entry,יומן
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} פריטי התקדמות
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} פריטי התקדמות
 DocType: Workstation,Workstation Name,שם תחנת עבודה
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,"תקציר דוא""ל:"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} אינו שייך לפריט {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} אינו שייך לפריט {1}
 DocType: Sales Partner,Target Distribution,הפצת יעד
 DocType: Salary Slip,Bank Account No.,מס 'חשבון הבנק
 DocType: Naming Series,This is the number of the last created transaction with this prefix,זהו המספר של העסקה יצרה האחרונה עם קידומת זו
@@ -1107,9 +1095,8 @@
 DocType: BOM Operation,Workstation,Workstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,בקשה להצעת מחיר הספק
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,חומרה
-DocType: Sales Order,Recurring Upto,Upto חוזר
 DocType: Attendance,HR Manager,מנהל משאבי אנוש
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,אנא בחר חברה
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,אנא בחר חברה
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,זכות Leave
 DocType: Purchase Invoice,Supplier Invoice Date,תאריך חשבונית ספק
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,אתה צריך לאפשר סל קניות
@@ -1122,7 +1109,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,חפיפה בין תנאים מצאו:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,נגד תנועת היומן {0} כבר תואם כמה שובר אחר
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,"ערך להזמין סה""כ"
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,מזון
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,מזון
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,טווח הזדקנות 3
 DocType: Maintenance Schedule Item,No of Visits,אין ביקורים
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},מטבע של חשבון הסגירה חייב להיות {0}
@@ -1133,7 +1120,7 @@
 DocType: Authorization Rule,Average Discount,דיסקונט הממוצע
 DocType: Purchase Invoice Item,UOM,יחידת מידה
 DocType: Rename Tool,Utilities,Utilities
-DocType: Purchase Invoice Item,Accounting,חשבונאות
+DocType: POS Profile,Accounting,חשבונאות
 DocType: Employee,EMP/,EMP /
 DocType: Asset,Depreciation Schedules,לוחות זמנים פחת
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,תקופת יישום לא יכולה להיות תקופה הקצאת חופשה מחוץ
@@ -1149,7 +1136,7 @@
 DocType: Supplier,Name and Type,שם וסוג
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',"סטטוס אישור חייב להיות ""מאושר"" או ""נדחה"""
 DocType: Purchase Invoice,Contact Person,איש קשר
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"'תאריך ההתחלה צפויה ""לא יכול להיות יותר מאשר' תאריך סיום צפוי  'גדול יותר"
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"'תאריך ההתחלה צפויה ""לא יכול להיות יותר מאשר' תאריך סיום צפוי  'גדול יותר"
 DocType: Course Scheduling Tool,Course End Date,תאריך סיום קורס
 DocType: Holiday List,Holidays,חגים
 DocType: Sales Order Item,Planned Quantity,כמות מתוכננת
@@ -1159,17 +1146,16 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,שינוי נטו בנכסים קבועים
 DocType: Leave Control Panel,Leave blank if considered for all designations,שאר ריק אם תיחשב לכל הכינויים
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,תשלום מסוג 'בפועל' בשורת {0} אינו יכול להיות כלולים במחיר הפריט
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},מקס: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},מקס: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,מDatetime
 DocType: Email Digest,For Company,לחברה
 apps/erpnext/erpnext/config/support.py +17,Communication log.,יומן תקשורת.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","בקשה להצעת מחיר מושבת לגשת מתוך הפורטל, עבור הגדרות פורטל הצ&#39;ק יותר."
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,סכום קנייה
 DocType: Sales Invoice,Shipping Address Name,שם כתובת למשלוח
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,תרשים של חשבונות
 DocType: Material Request,Terms and Conditions Content,תוכן תנאים והגבלות
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,לא יכול להיות גדול מ 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,פריט {0} הוא לא פריט מניות
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,פריט {0} הוא לא פריט מניות
 DocType: Maintenance Visit,Unscheduled,לא מתוכנן
 DocType: Employee,Owned,בבעלות
 DocType: Salary Detail,Depends on Leave Without Pay,תלוי בחופשה ללא תשלום
@@ -1191,7 +1177,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,עובד לא יכול לדווח לעצמו.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","אם החשבון הוא קפוא, ערכים מותרים למשתמשים מוגבלים."
 DocType: Email Digest,Bank Balance,עובר ושב
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},חשבונאות כניסה עבור {0}: {1} יכול להתבצע רק במטבע: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},חשבונאות כניסה עבור {0}: {1} יכול להתבצע רק במטבע: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","פרופיל תפקיד, כישורים נדרשים וכו '"
 DocType: Journal Entry Account,Account Balance,יתרת חשבון
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,כלל מס לעסקות.
@@ -1208,7 +1194,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Slip אריזה
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,השכרת משרד
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,הגדרות שער SMS ההתקנה
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,יבוא נכשל!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,יבוא נכשל!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,אין כתובת הוסיפה עדיין.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation עבודה שעה
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +121,Analyst,אנליסט
@@ -1228,7 +1214,7 @@
 DocType: Sales Invoice,Source,מקור
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,הצג סגור
 DocType: Leave Type,Is Leave Without Pay,האם חופשה ללא תשלום
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,קטגורית נכסים היא חובה עבור פריט רכוש קבוע
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,קטגורית נכסים היא חובה עבור פריט רכוש קבוע
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,לא נמצא רשומות בטבלת התשלום
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},{0} זו מתנגשת עם {1} עבור {2} {3}
 DocType: Student Attendance Tool,Students HTML,HTML סטודנטים
@@ -1287,7 +1273,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} חייבים להופיע רק פעם אחת
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},אסור לי תשלומי העברה יותר {0} מ {1} נגד הזמנת רכש {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},עלים שהוקצו בהצלחה עבור {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,אין פריטים לארוז
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,אין פריטים לארוז
 DocType: Shipping Rule Condition,From Value,מערך
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,כמות ייצור היא תנאי הכרחית
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","אם אפשרות זו מסומנת, בדף הבית יהיה בקבוצת פריט ברירת מחדל עבור האתר"
@@ -1305,18 +1291,18 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,הפוך הצעת מחיר
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,דוחות נוספים
 DocType: Dependent Task,Dependent Task,משימה תלויה
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},גורם המרה ליחידת ברירת מחדל של מדד חייב להיות 1 בשורה {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},גורם המרה ליחידת ברירת מחדל של מדד חייב להיות 1 בשורה {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Leave מסוג {0} אינו יכול להיות ארוך מ- {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,נסה לתכנן פעולות לימי X מראש.
 DocType: HR Settings,Stop Birthday Reminders,Stop יום הולדת תזכורות
 DocType: SMS Center,Receiver List,מקלט רשימה
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,כמות הנצרכת
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,שינוי נטו במזומנים
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,יחידת מידת {0} כבר נכנסה יותר מפעם אחת בהמרת פקטור טבלה
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,הושלם כבר
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,יחידת מידת {0} כבר נכנסה יותר מפעם אחת בהמרת פקטור טבלה
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,הושלם כבר
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},בקשת תשלום כבר קיימת {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,עלות פריטים הונפק
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},כמות לא חייבת להיות יותר מ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},כמות לא חייבת להיות יותר מ {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,קודם שנת הכספים אינה סגורה
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),גיל (ימים)
 DocType: Quotation Item,Quotation Item,פריט ציטוט
@@ -1326,8 +1312,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,סוג ספק אמן.
 DocType: Purchase Order Item,Supplier Part Number,"ספק מק""ט"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,שער המרה לא יכול להיות 0 או 1
-DocType: Sales Invoice,Reference Document,מסמך ההפניה
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} יבוטל או הפסיק
+DocType: Subscription,Reference Document,מסמך ההפניה
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} יבוטל או הפסיק
 DocType: Accounts Settings,Credit Controller,בקר אשראי
 DocType: Delivery Note,Vehicle Dispatch Date,תאריך שיגור רכב
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +234,Purchase Receipt {0} is not submitted,קבלת רכישת {0} לא תוגש
@@ -1356,7 +1342,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Update bank payment dates with journals.,עדכון מועדי תשלום בנק עם כתבי עת.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,תמחור
 DocType: Quotation,Term Details,פרטי טווח
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,לא יכול לרשום יותר מ {0} סטודנטים עבור קבוצת סטודנטים זה.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,לא יכול לרשום יותר מ {0} סטודנטים עבור קבוצת סטודנטים זה.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} חייב להיות גדול מ 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),תכנון קיבולת ל( ימים)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,רֶכֶשׁ
@@ -1387,7 +1373,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,הַגשָׁמָה
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,הוצאות שיווק
 ,Item Shortage Report,דווח מחסור פריט
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","המשקל מוזכר, \ n להזכיר ""משקל של אוני 'מישגן"" מדי"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","המשקל מוזכר, \ n להזכיר ""משקל של אוני 'מישגן"" מדי"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,בקשת חומר המשמשת לייצור Stock רשומת זו
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,תאריך הפחת הבא הוא חובה של נכסים חדשים
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,יחידה אחת של פריט.
@@ -1396,10 +1382,10 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,הפוך חשבונאות כניסה לכל מנית תנועה
 DocType: Leave Allocation,Total Leaves Allocated,"סה""כ עלים מוקצבות"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},מחסן נדרש בשורה לא {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,נא להזין פיננסית בתוקף השנה תאריכי ההתחלה וסיום
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,נא להזין פיננסית בתוקף השנה תאריכי ההתחלה וסיום
 DocType: Employee,Date Of Retirement,מועד הפרישה
 DocType: Upload Attendance,Get Template,קבל תבנית
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext ההתקנה הושלמה!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext ההתקנה הושלמה!
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +118,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"קבוצת לקוחות קיימת עם אותו שם, בבקשה לשנות את שם הלקוח או לשנות את שם קבוצת הלקוחות"
@@ -1412,10 +1398,9 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","אם פריט זה יש גרסאות, אז זה לא יכול להיות שנבחר בהזמנות וכו &#39;"
 DocType: Lead,Next Contact By,לתקשר בא על ידי
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},הכמות הנדרשת לפריט {0} בשורת {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},הכמות הנדרשת לפריט {0} בשורת {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},מחסן {0} לא ניתן למחוק ככמות קיימת עבור פריט {1}
 DocType: Quotation,Order Type,סוג להזמין
-DocType: Purchase Invoice,Notification Email Address,"כתובת דוא""ל להודעות"
 ,Item-wise Sales Register,פריט חכם מכירות הרשמה
 DocType: Asset,Gross Purchase Amount,סכום רכישה גרוס
 DocType: Asset,Depreciation Method,שיטת הפחת
@@ -1423,20 +1408,20 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,"יעד סה""כ"
 DocType: Job Applicant,Applicant for a Job,מועמד לעבודה
 DocType: Production Plan Material Request,Production Plan Material Request,בקשת חומר תכנית ייצור
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,אין הזמנות ייצור שנוצרו
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,אין הזמנות ייצור שנוצרו
 DocType: Stock Reconciliation,Reconciliation JSON,הפיוס JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,יותר מדי עמודות. לייצא את הדוח ולהדפיס אותו באמצעות יישום גיליון אלקטרוני.
 DocType: Purchase Invoice Item,Batch No,אצווה לא
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,לאפשר הזמנות ומכירות מרובות נגד הלקוח הזמנת הרכש
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,ראשי
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,ראשי
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,קידומת להגדיר למספור סדרה על העסקות שלך
 DocType: Employee Attendance Tool,Employees HTML,עובד HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,BOM ברירת המחדל ({0}) חייב להיות פעיל לפריט זה או התבנית שלה
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,BOM ברירת המחדל ({0}) חייב להיות פעיל לפריט זה או התבנית שלה
 DocType: Employee,Leave Encashed?,השאר Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,הזדמנות מ השדה היא חובה
 DocType: Item,Variants,גרסאות
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,הפוך הזמנת רכש
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,הפוך הזמנת רכש
 DocType: SMS Center,Send To,שלח אל
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},אין איזון חופשה מספיק לחופשת סוג {0}
 DocType: Payment Reconciliation Payment,Allocated amount,סכום שהוקצה
@@ -1456,7 +1441,7 @@
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),משקל נטו של חבילה זו. (מחושב באופן אוטומטי כסכום של משקל נטו של פריטים)
 DocType: Sales Order,To Deliver and Bill,לספק וביל
 DocType: GL Entry,Credit Amount in Account Currency,סכום אשראי במטבע חשבון
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} יש להגיש
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} יש להגיש
 DocType: Authorization Control,Authorization Control,אישור בקרה
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},# השורה {0}: נדחה מחסן הוא חובה נגד פריט דחה {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,תשלום
@@ -1470,7 +1455,7 @@
 DocType: Quotation Item,Actual Qty,כמות בפועל
 DocType: Sales Invoice Item,References,אזכור
 DocType: Quality Inspection Reading,Reading 10,קריאת 10
-DocType: Hub Settings,Hub Node,רכזת צומת
+DocType: Hub Category,Hub Node,רכזת צומת
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,אתה נכנס פריטים כפולים. אנא לתקן ונסה שוב.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,חבר
 DocType: Asset Movement,Asset Movement,תנועת נכסים
@@ -1485,15 +1470,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,תקשורת
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),מציין כי החבילה היא חלק ממשלוח (רק טיוטה) זה
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,הפוך כניסת תשלום
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},כמות לפריט {0} חייבת להיות פחות מ {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},כמות לפריט {0} חייבת להיות פחות מ {1}
 ,Sales Invoice Trends,מגמות חשבונית מכירות
 DocType: Leave Application,Apply / Approve Leaves,החל / אישור עלים
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,בשביל ש
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,בשביל ש
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"יכול להתייחס שורה רק אם סוג תשלום הוא 'בסכום הקודם שורה' או 'שורה סה""כ קודמת """
 DocType: Sales Order Item,Delivery Warehouse,מחסן אספקה
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,עץ מרכזי עלות הכספיים.
 DocType: Serial No,Delivery Document No,משלוח מסמך לא
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},אנא הגדירו &#39;החשבון רווח / הפסד בעת מימוש הנכסים בחברה {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},אנא הגדירו &#39;החשבון רווח / הפסד בעת מימוש הנכסים בחברה {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,לקבל פריטים מתקבולי הרכישה
 DocType: Serial No,Creation Date,תאריך יצירה
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},פריט {0} מופיע מספר פעמים במחירון {1}
@@ -1504,12 +1489,11 @@
 DocType: Item,Has Variants,יש גרסאות
 DocType: Monthly Distribution,Name of the Monthly Distribution,שמו של החתך החודשי
 DocType: Sales Person,Parent Sales Person,איש מכירות הורה
-DocType: Purchase Invoice,Recurring Invoice,חשבונית חוזרת
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,ניהול פרויקטים
 DocType: Supplier,Supplier of Goods or Services.,ספק של מוצרים או שירותים.
 DocType: Budget,Fiscal Year,שנת כספים
 DocType: Budget,Budget,תקציב
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,פריט רכוש קבוע חייב להיות לפריט שאינו מוחזק במלאי.
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,פריט רכוש קבוע חייב להיות לפריט שאינו מוחזק במלאי.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","תקציב לא ניתן להקצות כנגד {0}, כמו שזה לא חשבון הכנסה או הוצאה"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,הושג
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,שטח / לקוחות
@@ -1522,7 +1506,7 @@
 ,Amount to Deliver,הסכום לאספקת
 DocType: Naming Series,Current Value,ערך נוכחי
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,שנתי כספים מרובות קיימות במועד {0}. אנא להגדיר חברה בשנת הכספים
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} נוצר
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} נוצר
 DocType: Delivery Note Item,Against Sales Order,נגד להזמין מכירות
 ,Serial No Status,סטטוס מספר סידורי
 DocType: Payment Entry Reference,Outstanding,יוצא מן הכלל
@@ -1531,10 +1515,10 @@
 						must be greater than or equal to {2}","שורת {0}: כדי להגדיר {1} מחזורי, הבדל בין מ ו תאריך \ חייב להיות גדול או שווה ל {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,זה מבוסס על תנועת המניה. ראה {0} לפרטים
 DocType: Pricing Rule,Selling,מכירה
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},סכום {0} {1} לנכות כנגד {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},סכום {0} {1} לנכות כנגד {2}
 DocType: Employee,Salary Information,מידע משכורת
 DocType: Sales Person,Name and Employee ID,שם והעובדים ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,תאריך יעד לא יכול להיות לפני פרסום תאריך
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,תאריך יעד לא יכול להיות לפני פרסום תאריך
 DocType: Website Item Group,Website Item Group,קבוצת פריט באתר
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,חובות ומסים
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,נא להזין את תאריך הפניה
@@ -1559,13 +1543,13 @@
 DocType: Issue,Resolution Details,רזולוציה פרטים
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,הקצבות
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,קריטריונים לקבלה
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,נא להזין את בקשות חומר בטבלה לעיל
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,נא להזין את בקשות חומר בטבלה לעיל
 DocType: Item Attribute,Attribute Name,שם תכונה
 DocType: BOM,Show In Website,הצג באתר
 DocType: Task,Expected Time (in hours),זמן צפוי (בשעות)
 DocType: Item Reorder,Check in (group),הגעה (קבוצה)
 ,Qty to Order,כמות להזמנה
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,תרשים גנט של כל המשימות.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,תרשים גנט של כל המשימות.
 DocType: Opportunity,Mins to First Response,דקות כדי התגובה הראשונה
 DocType: Pricing Rule,Margin Type,סוג שוליים
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} שעות
@@ -1591,20 +1575,19 @@
 DocType: Delivery Note,Excise Page Number,בלו מספר העמוד
 DocType: Asset,Purchase Date,תאריך רכישה
 DocType: Employee,Personal Details,פרטים אישיים
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},אנא הגדר &#39;מרכז עלות נכסי פחת&#39; ב חברת {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},אנא הגדר &#39;מרכז עלות נכסי פחת&#39; ב חברת {0}
 ,Maintenance Schedules,לוחות זמנים תחזוקה
 DocType: Task,Actual End Date (via Time Sheet),תאריך סיום בפועל (באמצעות גיליון זמן)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},סכום {0} {1} נגד {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},סכום {0} {1} נגד {2} {3}
 ,Quotation Trends,מגמות ציטוט
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},קבוצת פריט שלא צוינה באב פריט לפריט {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,חיוב החשבון חייב להיות חשבון חייבים
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,חיוב החשבון חייב להיות חשבון חייבים
 DocType: Shipping Rule Condition,Shipping Amount,סכום משלוח
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,סכום תלוי ועומד
 DocType: Purchase Invoice Item,Conversion Factor,המרת פקטור
 DocType: Purchase Order,Delivered,נמסר
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},הערך צפוי לאחר חיים שימושיים חייב להיות גדול או שווה ל {0}
 DocType: Purchase Receipt,Vehicle Number,מספר רכב
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,התאריך שבו חשבונית חוזרת תהיה לעצור
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,עלים כולל שהוקצו {0} לא יכולים להיות פחות מעלים שכבר אושרו {1} לתקופה
 DocType: Journal Entry,Accounts Receivable,חשבונות חייבים
 ,Supplier-Wise Sales Analytics,ספק-Wise Analytics המכירות
@@ -1612,13 +1595,13 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,כוללים ערכים מפוייס
 DocType: Leave Control Panel,Leave blank if considered for all employee types,שאר ריק אם נחשב לכל סוגי העובדים
 DocType: Landed Cost Voucher,Distribute Charges Based On,חיובים להפיץ מבוסס על
-apps/erpnext/erpnext/hooks.py +131,Timesheets,גליונות
+apps/erpnext/erpnext/hooks.py +140,Timesheets,גליונות
 DocType: HR Settings,HR Settings,הגדרות HR
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,Expense Claim is pending approval. Only the Expense Approver can update status.,תביעת חשבון ממתינה לאישור. רק המאשר ההוצאות יכול לעדכן את הסטטוס.
 DocType: Purchase Invoice,Additional Discount Amount,סכום הנחה נוסף
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","# השורה {0}: כמות חייבת להיות 1, כפריט הוא נכס קבוע. השתמש בשורה נפרדת עבור כמות מרובה."
 DocType: Leave Block List Allow,Leave Block List Allow,השאר בלוק רשימה אפשר
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr לא יכול להיות ריק או חלל
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr לא יכול להיות ריק או חלל
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,קבוצה לקבוצה ללא
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ספורט
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,"סה""כ בפועל"
@@ -1628,7 +1611,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,מחסן שבו אתה שומר מלאי של פריטים דחו
 DocType: POS Profile,Price List,מחיר מחירון
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} הוא כעת ברירת מחדל שנת כספים. רענן את הדפדפן שלך כדי שהשינוי ייכנס לתוקף.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,תביעות חשבון
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,תביעות חשבון
 DocType: Issue,Support,תמיכה
 ,BOM Search,חיפוש BOM
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),סגירה (פתיחת סיכומים +)
@@ -1639,31 +1622,32 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +279,Account {0} is invalid. Account Currency must be {1},חשבון {0} אינו חוקי. מטבע חשבון חייב להיות {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},גורם של אוני 'מישגן ההמרה נדרש בשורת {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","# השורה {0}: Reference סוג המסמך חייב להיות אחד להזמין מכירות, חשבוניות מכירות או תנועת יומן"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","# השורה {0}: Reference סוג המסמך חייב להיות אחד להזמין מכירות, חשבוניות מכירות או תנועת יומן"
 DocType: Salary Component,Deduction,ניכוי
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,שורת {0}: מעת לעת ו היא חובה.
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},מחיר הפריט נוסף עבור {0} ב מחירון {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},מחיר הפריט נוסף עבור {0} ב מחירון {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,נא להזין את עובדי זיהוי של איש מכירות זה
 DocType: Territory,Classification of Customers by region,סיווג של לקוחות מאזור לאזור
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,סכום ההבדל חייב להיות אפס
 DocType: Project,Gross Margin,שיעור רווח גולמי
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,אנא ראשון להיכנס פריט הפקה
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,אנא ראשון להיכנס פריט הפקה
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,מאזן חשבון בנק מחושב
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,משתמשים נכים
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +764,Quotation,הצעת מחיר
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,סך ניכוי
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,עלות עדכון
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,עלות עדכון
 DocType: Employee,Date of Birth,תאריך לידה
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,פריט {0} הוחזר כבר
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** שנת כספים ** מייצגת שנת כספים. כל הרישומים החשבונאיים ועסקות גדולות אחרות מתבצעים מעקב נגד שנת כספים ** **.
 DocType: Opportunity,Customer / Lead Address,לקוחות / כתובת לידים
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},אזהרה: תעודת SSL לא חוקית בקובץ מצורף {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},אזהרה: תעודת SSL לא חוקית בקובץ מצורף {0}
 DocType: Production Order Operation,Actual Operation Time,בפועל מבצע זמן
 DocType: Authorization Rule,Applicable To (User),כדי ישים (משתמש)
 DocType: Purchase Taxes and Charges,Deduct,לנכות
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,תיאור התפקיד
 DocType: Student Applicant,Applied,אפלייד
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Re-פתוח
 DocType: Sales Invoice Item,Qty as per Stock UOM,כמות כמו לכל בורסה של אוני 'מישגן
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","תווים מיוחדים מלבד ""-"" ""."", ""#"", ו"" / ""אסור בשמות סדרה"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","עקוב אחר מסעות פרסום מכירות. עקוב אחר הובלות, הצעות מחיר, להזמין מכירות וכו 'ממסעות הפרסום כדי לאמוד את ההחזר על השקעה."
@@ -1673,7 +1657,7 @@
 DocType: Request for Quotation,Manufacturing Manager,ייצור מנהל
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},מספר סידורי {0} הוא תחת אחריות upto {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,תעודת משלוח פצל לחבילות.
-apps/erpnext/erpnext/hooks.py +98,Shipments,משלוחים
+apps/erpnext/erpnext/hooks.py +107,Shipments,משלוחים
 DocType: Payment Entry,Total Allocated Amount (Company Currency),הסכום כולל שהוקצה (חברת מטבע)
 DocType: Purchase Order Item,To be delivered to customer,שיימסר ללקוח
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +227,Serial No {0} does not belong to any Warehouse,מספר סידורי {0} אינו שייך לכל מחסן
@@ -1689,8 +1673,8 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,הערה: דואר אלקטרוני לא יישלח למשתמשים בעלי מוגבלויות
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,בחר חברה ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,שאר ריק אם תיחשב לכל המחלקות
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","סוגי התעסוקה (קבוע, חוזה, וכו 'מתמחה)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} הוא חובה עבור פריט {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","סוגי התעסוקה (קבוע, חוזה, וכו 'מתמחה)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} הוא חובה עבור פריט {1}
 DocType: Currency Exchange,From Currency,ממטבע
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","אנא בחר סכום שהוקצה, סוג החשבונית וחשבונית מספר בatleast שורה אחת"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,עלות רכישה חדשה
@@ -1707,7 +1691,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,אנא לחץ על 'צור לוח זמנים' כדי לקבל לוח זמנים
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,היו שגיאות בעת מחיקת לוחות הזמנים הבאים:
 DocType: Bin,Ordered Quantity,כמות מוזמנת
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","לדוגמא: ""לבנות כלים לבונים"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","לדוגמא: ""לבנות כלים לבונים"""
 DocType: Production Order,In Process,בתהליך
 DocType: Authorization Rule,Itemwise Discount,Itemwise דיסקונט
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,עץ חשבונות כספיים.
@@ -1722,10 +1706,9 @@
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,להזמין מכירות לתשלום
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +119,CEO,מנכ&quot;ל
 DocType: Expense Claim Detail,Expense Claim Detail,פרטי תביעת חשבון
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,אנא בחר חשבון נכון
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,אנא בחר חשבון נכון
 DocType: Item,Weight UOM,המשקל של אוני 'מישגן
 DocType: Patient,Blood Group,קבוצת דם
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,ממתין ל
 DocType: Course,Course Name,שם קורס
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,משתמשים שיכולים לאשר בקשות החופשה של עובד ספציפי
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,ציוד משרדי
@@ -1739,7 +1722,7 @@
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","אם יצרת תבנית סטנדרטית בתבנית מסים מכירות וחיובים, בחר אחד ולחץ על הכפתור למטה."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,נא לציין מדינה לכלל משלוח זה או לבדוק משלוח ברחבי העולם
 DocType: Stock Entry,Total Incoming Value,"ערך הנכנס סה""כ"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,חיוב נדרש
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,חיוב נדרש
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,מחיר מחירון רכישה
 DocType: Offer Letter Term,Offer Term,טווח הצעה
 DocType: Quality Inspection,Quality Manager,מנהל איכות
@@ -1753,7 +1736,7 @@
 DocType: Physician Schedule Time Slot,To Time,לעת
 DocType: Authorization Rule,Approving Role (above authorized value),אישור תפקיד (מעל הערך מורשה)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,אשראי לחשבון חייב להיות חשבון לתשלום
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},רקורסיה BOM: {0} אינה יכולה להיות הורה או ילד של {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},רקורסיה BOM: {0} אינה יכולה להיות הורה או ילד של {2}
 DocType: Production Order Operation,Completed Qty,כמות שהושלמה
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","עבור {0}, רק חשבונות החיוב יכולים להיות מקושרים נגד כניסת אשראי אחרת"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,מחיר המחירון {0} אינו זמין
@@ -1767,7 +1750,7 @@
 DocType: Quality Inspection,Sample Size,גודל מדגם
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,נא להזין את מסמך הקבלה
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,כל הפריטים כבר בחשבונית
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',נא לציין חוקי 'מתיק מס' '
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',נא לציין חוקי 'מתיק מס' '
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,מרכזי עלות נוספים יכולים להתבצע תחת קבוצות אבל ערכים יכולים להתבצע נגד לא-קבוצות
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,משתמשים והרשאות
 DocType: Branch,Branch,סניף
@@ -1776,9 +1759,9 @@
 DocType: Shipping Rule,example: Next Day Shipping,דוגמא: משלוח היום הבא
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,מספר סידורי {0} לא נמצאו
 DocType: Fee Schedule Program,Student Batch,יצווה סטודנטים
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},הוזמנת לשתף פעולה על הפרויקט: {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},הוזמנת לשתף פעולה על הפרויקט: {0}
 DocType: Leave Block List Date,Block Date,תאריך בלוק
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,החל עכשיו
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,החל עכשיו
 DocType: Sales Order,Not Delivered,לא נמסר
 ,Bank Clearance Summary,סיכום עמילות בנק
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","יצירה וניהול של מעכל דוא""ל יומי, שבועית וחודשית."
@@ -1787,7 +1770,7 @@
 DocType: Fee Schedule,Fee Structure,מבנה עמלות
 DocType: Timesheet Detail,Costing Amount,סכום תמחיר
 DocType: Process Payroll,Submit Salary Slip,שלח שכר Slip
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,ההנחה Maxiumm לפריט {0} {1}% הוא
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,ההנחה Maxiumm לפריט {0} {1}% הוא
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,יבוא בתפזורת
 DocType: Sales Partner,Address & Contacts,כתובת ומגעים
 DocType: SMS Log,Sender Name,שם שולח
@@ -1808,13 +1791,13 @@
 apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Barcode {0},אין פריט ברקוד {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,מקרה מס 'לא יכול להיות 0
 DocType: Item,Show a slideshow at the top of the page,הצג מצגת בחלק העליון של הדף
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,חנויות
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,חנויות
 DocType: Project Type,Projects Manager,מנהל פרויקטים
 DocType: Serial No,Delivery Time,זמן אספקה
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,הזדקנות המבוסס על
 DocType: Item,End of Life,סוף החיים
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,נסיעות
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,אין מבנה פעיל או שכר מחדל נמצא עבור עובד {0} לתאריכים הנתונים
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,נסיעות
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,אין מבנה פעיל או שכר מחדל נמצא עבור עובד {0} לתאריכים הנתונים
 DocType: Leave Block List,Allow Users,אפשר למשתמשים
 DocType: Purchase Order,Customer Mobile No,לקוחות ניידים לא
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,חוזר
@@ -1822,7 +1805,7 @@
 DocType: Rename Tool,Rename Tool,שינוי שם כלי
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,עלות עדכון
 DocType: Item Reorder,Item Reorder,פריט סידור מחדש
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,העברת חומר
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,העברת חומר
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ציין את הפעולות, עלויות הפעלה ולתת מבצע ייחודי לא לפעולות שלך."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,מסמך זה חורג מהמגבלה על ידי {0} {1} עבור פריט {4}. האם אתה גורם אחר {3} נגד אותו {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,אנא קבע חוזר לאחר השמירה
@@ -1850,11 +1833,11 @@
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,צינור מכירות
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,הנדרש על
 DocType: Rename Tool,File to Rename,קובץ לשינוי השם
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},אנא בחר BOM עבור פריט בטור {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},אנא בחר BOM עבור פריט בטור {0}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},BOM צוין {0} אינו קיימת עבור פריט {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,לוח זמנים תחזוקת {0} יש לבטל לפני ביטול הזמנת מכירות זה
 DocType: Notification Control,Expense Claim Approved,תביעת הוצאות שאושרה
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,תלוש משכורת של עובד {0} נוצר כבר בתקופה זו
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,תלוש משכורת של עובד {0} נוצר כבר בתקופה זו
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,תרופות
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,עלות של פריטים שנרכשו
 DocType: Selling Settings,Sales Order Required,סדר הנדרש מכירות
@@ -1880,24 +1863,24 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},התייחסות לא חוקית {0} {1}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) לא יכול להיות גדול יותר מquanitity המתוכנן ({2}) בהפקה להזמין {3}
 DocType: Shipping Rule,Shipping Rule Label,תווית כלל משלוח
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,חומרי גלם לא יכולים להיות ריקים.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","לא ניתן לעדכן מניות, חשבונית מכילה פריט ירידת משלוח."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,חומרי גלם לא יכולים להיות ריקים.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","לא ניתן לעדכן מניות, חשבונית מכילה פריט ירידת משלוח."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,מהיר יומן
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,אתה לא יכול לשנות את השיעור אם BOM ציינו agianst כל פריט
 DocType: Employee,Previous Work Experience,ניסיון בעבודה קודם
 DocType: Stock Entry,For Quantity,לכמות
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},נא להזין מתוכננת כמות לפריט {0} בשורת {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},נא להזין מתוכננת כמות לפריט {0} בשורת {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} לא יוגש
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,בקשות לפריטים.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,הזמנת ייצור נפרדת תיווצר לכל פריט טוב מוגמר.
 ,Minutes to First Response for Issues,דקות התגובה ראשונה לעניינים
 DocType: Purchase Invoice,Terms and Conditions1,תנאים וConditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,שמו של המכון אשר אתה מגדיר מערכת זו.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,שמו של המכון אשר אתה מגדיר מערכת זו.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","כניסת חשבונאות קפואה עד למועד זה, אף אחד לא יכול לעשות / לשנות כניסה מלבד התפקיד שיפורט להלן."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,אנא שמור את המסמך לפני יצירת לוח זמנים תחזוקה
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,סטטוס פרויקט
 DocType: UOM,Check this to disallow fractions. (for Nos),לבדוק את זה כדי לאסור שברים. (למס)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,הזמנות הייצור הבאות נוצרו:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,הזמנות הייצור הבאות נוצרו:
 DocType: Delivery Note,Transporter Name,שם Transporter
 DocType: Authorization Rule,Authorized Value,ערך מורשה
 ,Minutes to First Response for Opportunity,דקות תגובה ראשונה הזדמנות
@@ -1972,7 +1955,7 @@
 DocType: Payment Reconciliation,Bank / Cash Account,חשבון בנק / מזומנים
 DocType: Tax Rule,Billing City,עיר חיוב
 DocType: Global Defaults,Hide Currency Symbol,הסתר סמל מטבע
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","למשל בנק, מזומן, כרטיס אשראי"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","למשל בנק, מזומן, כרטיס אשראי"
 DocType: Journal Entry,Credit Note,כְּתַב זְכוּיוֹת
 DocType: Warranty Claim,Service Address,כתובת שירות
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,ריהוט ואבזרים
@@ -1985,14 +1968,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,הפקה
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,{0} שורה: תאריך ההתחלה חייב להיות לפני תאריך הסיום
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),"סה""כ (כמות)"
-DocType: Sales Invoice,This Document,מסמך זה
 DocType: Installation Note Item,Installed Qty,כמות מותקנת
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Purchase Invoice,Is Paid,שולם
 DocType: Salary Structure,Total Earning,"צבירה סה""כ"
 DocType: Purchase Receipt,Time at which materials were received,זמן שבו חומרים שהתקבלו
 DocType: Stock Ledger Entry,Outgoing Rate,דרג יוצא
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,אדון סניף ארגון.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,אדון סניף ארגון.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,או
 DocType: Sales Order,Billing Status,סטטוס חיוב
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,דווח על בעיה
@@ -2074,13 +2056,13 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,לא במלאי
 DocType: Appraisal,HR User,משתמש HR
 DocType: Purchase Invoice,Taxes and Charges Deducted,מסים והיטלים שנוכה
-apps/erpnext/erpnext/hooks.py +129,Issues,נושאים
+apps/erpnext/erpnext/hooks.py +138,Issues,נושאים
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},מצב חייב להיות אחד {0}
 DocType: Sales Invoice,Debit To,חיוב ל
 DocType: Delivery Note,Required only for sample item.,נדרש רק עבור פריט מדגם.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,כמות בפועל לאחר עסקה
 ,Pending SO Items For Purchase Request,ממתין לSO פריטים לבקשת רכישה
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} מושבתת
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} מושבתת
 DocType: Supplier,Billing Currency,מטבע חיוב
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,גדול במיוחד
@@ -2111,7 +2093,7 @@
 DocType: Price List,Price List Master,מחיר מחירון Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"יכולות להיות מתויגות כל עסקות המכירה מול אנשי מכירות ** ** מרובים, כך שאתה יכול להגדיר ולעקוב אחר מטרות."
 ,S.O. No.,SO מס '
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},אנא ליצור לקוחות מהעופרת {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},אנא ליצור לקוחות מהעופרת {0}
 DocType: Price List,Applicable for Countries,ישים עבור מדינות
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},סטודנט הקבוצה שם הוא חובה בשורת {0}
 DocType: Homepage,Products to be shown on website homepage,מוצרים שיוצגו על בית של אתר
@@ -2137,7 +2119,7 @@
 1. Address and Contact of your Company.","תנאים והגבלות רגילים שניתן להוסיף למכירות ורכישות. דוגמאות: 1. זכאותה של ההצעה. 1. תנאי תשלום (מראש, באשראי, מראש חלק וכו '). 1. מהו נוסף (או שישולם על ידי הלקוח). אזהרה / שימוש 1. בטיחות. 1. אחריות אם בכלל. 1. החזרות מדיניות. 1. תנאי משלוח, אם קיימים. 1. דרכים להתמודדות עם סכסוכים, שיפוי, אחריות, וכו 'כתובת 1. ולתקשר של החברה שלך."
 DocType: Attendance,Leave Type,סוג החופשה
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"חשבון הוצאות / הבדל ({0}) חייב להיות חשבון ""רווח והפסד"""
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,מחסור
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,מחסור
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} אינו קשור {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,נוכחות לעובדי {0} כבר מסומנת
 DocType: Packing Slip,If more than one package of the same type (for print),אם חבילה אחד או יותר מאותו הסוג (להדפסה)
@@ -2173,12 +2155,12 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,ניהול עץ טריטוריה.
 DocType: Journal Entry Account,Sales Invoice,חשבונית מכירות
 DocType: Journal Entry Account,Party Balance,מאזן המפלגה
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,אנא בחר החל דיסקונט ב
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,אנא בחר החל דיסקונט ב
 DocType: Company,Default Receivable Account,חשבון חייבים ברירת מחדל
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,צור בנק כניסה לשכר הכולל ששולם לקריטריונים לעיל נבחרים
 DocType: Stock Entry,Material Transfer for Manufacture,העברת חומר לייצור
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,אחוז הנחה יכול להיות מיושם גם נגד מחיר מחירון או לכל רשימת המחיר.
-DocType: Purchase Invoice,Half-yearly,חצי שנתי
+DocType: Subscription,Half-yearly,חצי שנתי
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,כניסה לחשבונאות במלאי
 DocType: Sales Invoice,Sales Team1,Team1 מכירות
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,פריט {0} אינו קיים
@@ -2197,13 +2179,13 @@
 DocType: Purchase Invoice,Select Supplier Address,כתובת ספק בחר
 DocType: Purchase Invoice Item,Quality Inspection,איכות פיקוח
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,קטן במיוחד
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,אזהרה: חומר המבוקש כמות הוא פחות מלהזמין כמות מינימאלית
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,אזהרה: חומר המבוקש כמות הוא פחות מלהזמין כמות מינימאלית
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,חשבון {0} הוא קפוא
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ישות / בת משפטית עם תרשים נפרד של חשבונות השייכים לארגון.
 DocType: Payment Request,Mute Email,דוא&quot;ל השתקה
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","מזון, משקאות וטבק"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},יכול רק לבצע את התשלום כנגד סרק {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,שיעור עמלה לא יכול להיות גדול מ -100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},יכול רק לבצע את התשלום כנגד סרק {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,שיעור עמלה לא יכול להיות גדול מ -100
 DocType: Stock Entry,Subcontract,בקבלנות משנה
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,נא להזין את {0} הראשון
 DocType: Production Order Operation,Actual End Time,בפועל שעת סיום
@@ -2221,7 +2203,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +476,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),מראש סה&quot;כ ({0}) נגד להזמין {1} לא יכול להיות גדול יותר מהסך כולל ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,בחר בחתך חודשי להפיץ בצורה לא אחידה על פני מטרות חודשים.
 DocType: Purchase Invoice Item,Valuation Rate,שערי הערכת שווי
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,מטבע מחירון לא נבחר
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,מטבע מחירון לא נבחר
 apps/erpnext/erpnext/config/healthcare.py +46,Results,תוצאות
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},עובד {0} כבר הגיש בקשה {1} בין {2} ו {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,תאריך התחלת פרויקט
@@ -2230,7 +2212,7 @@
 DocType: Maintenance Visit Purpose,Against Document No,נגד מסמך לא
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,ניהול שותפי מכירות.
 DocType: Quality Inspection,Inspection Type,סוג הפיקוח
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,מחסן עם עסקה קיימת לא ניתן להמיר לקבוצה.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,מחסן עם עסקה קיימת לא ניתן להמיר לקבוצה.
 DocType: C-Form,C-Form No,C-טופס לא
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,נוכחות לא מסומנת
@@ -2266,7 +2248,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,בחר שנת כספים
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,הזמנה חוזרת רמה
 DocType: Attendance,Attendance Date,תאריך נוכחות
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},מחיר הפריט עודכן עבור {0} ב מחירון {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},מחיר הפריט עודכן עבור {0} ב מחירון {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,פרידה שכר על בסיס צבירה וניכוי.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,חשבון עם בלוטות ילד לא יכול להיות מומר לדג'ר
 DocType: Purchase Invoice Item,Accepted Warehouse,מחסן מקובל
@@ -2299,7 +2281,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% מחומרים מחויבים נגד הזמנת מכירה זה
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,כניסת סגירת תקופה
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,מרכז עלות בעסקות קיימות לא ניתן להמיר לקבוצה
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},סכום {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},סכום {0} {1} {2} {3}
 DocType: Account,Depreciation,פחת
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ספק (ים)
 DocType: Employee Attendance Tool,Employee Attendance Tool,כלי נוכחות עובדים
@@ -2317,7 +2299,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Stock cannot be updated against Purchase Receipt {0},מניות יכולות להיות לא מעודכנות נגד קבלת רכישת {0}
 DocType: Supplier,Last Day of the Next Month,היום האחרון של החודש הבא
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","לעזוב לא יכול להיות מוקצה לפני {0}, כאיזון חופשה כבר היה בשיא הקצאת חופשת העתיד יועבר לשאת {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),הערה: תאריך יעד / הפניה עולה ימי אשראי ללקוחות מותר על ידי {0} יום (ים)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),הערה: תאריך יעד / הפניה עולה ימי אשראי ללקוחות מותר על ידי {0} יום (ים)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,סטודנט המבקש
 DocType: Asset Category Account,Accumulated Depreciation Account,חשבון פחת נצבר
 DocType: Stock Settings,Freeze Stock Entries,ערכי מלאי הקפאה
@@ -2326,7 +2308,7 @@
 DocType: Activity Cost,Billing Rate,דרג חיוב
 ,Qty to Deliver,כמות לאספקה
 ,Stock Analytics,ניתוח מלאי
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,תפעול לא ניתן להשאיר ריק
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,תפעול לא ניתן להשאיר ריק
 DocType: Maintenance Visit Purpose,Against Document Detail No,נגד פרט מסמך לא
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,סוג המפלגה הוא חובה
 DocType: Quality Inspection,Outgoing,יוצא
@@ -2345,7 +2327,7 @@
 DocType: Serial No,Warranty / AMC Details,אחריות / AMC פרטים
 DocType: Journal Entry,User Remark,הערה משתמש
 DocType: Lead,Market Segment,פלח שוק
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},הסכום ששולם לא יכול להיות גדול מ מלוא יתרת חוב שלילי {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},הסכום ששולם לא יכול להיות גדול מ מלוא יתרת חוב שלילי {0}
 DocType: Employee Internal Work History,Employee Internal Work History,העובד פנימי היסטוריה עבודה
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),"סגירה (ד""ר)"
 DocType: Cheque Print Template,Cheque Size,גודל מחאה
@@ -2367,7 +2349,7 @@
 DocType: Bank Reconciliation,Bank Reconciliation,בנק פיוס
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,קבל עדכונים
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,בקשת חומר {0} בוטלה או נעצרה
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,השאר ניהול
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,השאר ניהול
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,קבוצה על ידי חשבון
 DocType: Sales Order,Fully Delivered,נמסר באופן מלא
 DocType: Lead,Lower Income,הכנסה נמוכה
@@ -2375,17 +2357,17 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","חשבון הבדל חייב להיות חשבון סוג הנכס / התחייבות, מאז מניית הפיוס הזה הוא כניסת פתיחה"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},לרכוש מספר ההזמנה נדרש לפריט {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""מתאריך"" חייב להיות לאחר 'עד תאריך'"
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},לא ניתן לשנות את מצב כמו סטודנט {0} הוא מקושר עם יישום סטודנט {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},לא ניתן לשנות את מצב כמו סטודנט {0} הוא מקושר עם יישום סטודנט {1}
 DocType: Asset,Fully Depreciated,לגמרי מופחת
 ,Stock Projected Qty,המניה צפויה כמות
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},לקוח {0} אינו שייכים לפרויקט {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},לקוח {0} אינו שייכים לפרויקט {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,HTML נוכחות ניכרת
 DocType: Sales Order,Customer's Purchase Order,הלקוח הזמנת הרכש
 apps/erpnext/erpnext/config/stock.py +117,Serial No and Batch,אין ו אצווה סידורי
 DocType: Warranty Claim,From Company,מחברה
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,אנא להגדיר מספר הפחת הוזמן
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,ערך או כמות
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,הזמנות הפקות לא ניתן להעלות על:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,הזמנות הפקות לא ניתן להעלות על:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,דקות
 DocType: Purchase Invoice,Purchase Taxes and Charges,לרכוש מסים והיטלים
 ,Qty to Receive,כמות לקבלת
@@ -2395,7 +2377,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,אשראי לחשבון חייב להיות חשבון מאזן
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,כל סוגי הספק
 DocType: Global Defaults,Disable In Words,שבת במילות
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"קוד פריט חובה, כי הפריט לא ממוספר באופן אוטומטי"
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,"קוד פריט חובה, כי הפריט לא ממוספר באופן אוטומטי"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},ציטוט {0} לא מסוג {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,פריט לוח זמנים תחזוקה
 DocType: Sales Order,%  Delivered,% נמסר
@@ -2408,18 +2390,18 @@
 DocType: Academic Term,Academic Year,שנה אקדמית
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,הון עצמי יתרה פתיחה
 DocType: Lead,CRM,CRM
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,נוֹתָר
 DocType: Appraisal,Appraisal,הערכה
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},דוא&quot;ל נשלח אל ספק {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,התאריך חוזר על עצמו
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,מורשה חתימה
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},השאר מאשר חייב להיות האחד {0}
-DocType: Hub Settings,Seller Email,"דוא""ל מוכר"
 DocType: Project,Total Purchase Cost (via Purchase Invoice),עלות רכישה כוללת (באמצעות רכישת חשבונית)
 DocType: Training Event,Start Time,זמן התחלה
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,כמות בחר
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,כמות בחר
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,אישור התפקיד לא יכול להיות זהה לתפקיד השלטון הוא ישים
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,לבטל את המנוי לדוא&quot;ל זה תקציר
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,לבטל את המנוי לדוא&quot;ל זה תקציר
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,הודעה נשלחה
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,חשבון עם בלוטות ילד לא ניתן להגדיר כחשבונות
 DocType: C-Form,II,שני
@@ -2432,9 +2414,9 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,חשבון {0} אינו קיים
 DocType: Project,Project Type,סוג פרויקט
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,כך או סכום כמות היעד או המטרה הוא חובה.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,עלות של פעילויות שונות
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,עלות של פעילויות שונות
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","הגדרת אירועים ל {0}, מאז עובד מצורף להלן אנשים מכירים אין זיהוי משתמש {1}"
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,המקור ומחסן היעד חייב להיות שונים
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,המקור ומחסן היעד חייב להיות שונים
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},אינך רשאים לעדכן את עסקות מניות יותר מאשר {0}
 DocType: Purchase Invoice Item,PR Detail,פרט יחסי הציבור
 DocType: Sales Order,Fully Billed,שחויב במלואו
@@ -2453,7 +2435,6 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +43,From value must be less than to value in row {0},מהערך חייב להיות פחות משווי בשורת {0}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,העברה בנקאית
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,סמן הכל
-DocType: Purchase Order,Recurring Order,להזמין חוזר
 DocType: Company,Default Income Account,חשבון הכנסות ברירת מחדל
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,קבוצת לקוחות / לקוחות
 DocType: Sales Invoice,Time Sheets,פחי זמנים
@@ -2464,7 +2445,7 @@
 apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,להוביל להצעת המחיר
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,שום דבר לא יותר להראות.
 DocType: Lead,From Customer,מלקוחות
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,שיחות
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,שיחות
 DocType: Project,Total Costing Amount (via Time Logs),הסכום כולל תמחיר (דרך זמן יומנים)
 DocType: Purchase Order Item Supplied,Stock UOM,המניה של אוני 'מישגן
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +230,Purchase Order {0} is not submitted,הזמנת רכש {0} לא תוגש
@@ -2479,7 +2460,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +165,Account Type for {0} must be {1},סוג חשבון עבור {0} חייב להיות {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,עלים וחג
 DocType: Sales Order,Not Billed,לא חויב
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,שניהם המחסן חייב להיות שייך לאותה חברה
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,שניהם המחסן חייב להיות שייך לאותה חברה
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,אין אנשי קשר הוסיפו עדיין.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,הסכום שובר עלות נחתה
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,הצעות חוק שהועלה על ידי ספקים.
@@ -2493,8 +2474,8 @@
 DocType: Journal Entry Account,Journal Entry Account,חשבון כניסת Journal
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,סטודנט קבוצה
 DocType: Shopping Cart Settings,Quotation Series,סדרת ציטוט
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","פריט קיים באותו שם ({0}), בבקשה לשנות את שם קבוצת פריט או לשנות את שם הפריט"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,אנא בחר לקוח
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","פריט קיים באותו שם ({0}), בבקשה לשנות את שם קבוצת פריט או לשנות את שם הפריט"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,אנא בחר לקוח
 DocType: C-Form,I,אני
 DocType: Company,Asset Depreciation Cost Center,מרכז עלות פחת נכסים
 DocType: Sales Order Item,Sales Order Date,תאריך הזמנת מכירות
@@ -2539,7 +2520,7 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,היו שגיאות בעת תזמון כמובן על:
 DocType: Sales Invoice,Against Income Account,נגד חשבון הכנסות
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% נמסר
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,פריט {0}: כמות מסודרת {1} לא יכול להיות פחות מכמות הזמנה מינימאלית {2} (מוגדר בסעיף).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,פריט {0}: כמות מסודרת {1} לא יכול להיות פחות מכמות הזמנה מינימאלית {2} (מוגדר בסעיף).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,אחוז בחתך חודשי
 DocType: Territory,Territory Targets,מטרות שטח
 DocType: Delivery Note,Transporter Info,Transporter מידע
@@ -2547,7 +2528,7 @@
 DocType: Cheque Print Template,Starting position from top edge,התחלה מן הקצה העליון
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,ספק זהה הוזן מספר פעמים
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,לרכוש פריט להזמין מסופק
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,שם חברה לא יכול להיות חברה
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,שם חברה לא יכול להיות חברה
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ראשי מכתב לתבניות הדפסה.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,כותרות לתבניות הדפסה למשל פרופורמה חשבונית.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,חיובי סוג הערכת שווי לא יכולים סומן ככלול
@@ -2598,10 +2579,10 @@
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,תבניות כתובת ברירת מחדל חכם ארץ
 DocType: Sales Order Item,Supplier delivers to Customer,ספק מספק ללקוח
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (טופס # / כתבה / {0}) אזל מהמלאי
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},תאריך יעד / הפניה לא יכול להיות אחרי {0}
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},תאריך יעד / הפניה לא יכול להיות אחרי {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,נתוני יבוא ויצוא
 DocType: Patient,Account Details,פרטי חשבון
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,אין תלמידים נמצאו
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,אין תלמידים נמצאו
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,תאריך פרסום חשבונית
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,מכירה
 DocType: Sales Invoice,Rounded Total,"סה""כ מעוגל"
@@ -2614,7 +2595,7 @@
 DocType: Company,Default Cash Account,חשבון מזומנים ברירת מחדל
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,אדון חברה (לא לקוח או ספק).
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,זה מבוסס על הנוכחות של תלמיד זה
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,תוכלו להוסיף עוד פריטים או מלא טופס פתוח
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,תוכלו להוסיף עוד פריטים או מלא טופס פתוח
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,תעודות משלוח {0} יש לבטל לפני ביטול הזמנת מכירות זה
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,הסכום ששולם + לכתוב את הסכום לא יכול להיות גדול יותר מסך כולל
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} הוא לא מספר אצווה תקף לפריט {1}
@@ -2630,7 +2611,7 @@
 DocType: Hub Settings,Publish Availability,פרסם זמינים
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,תאריך לידה לא יכול להיות גדול יותר מהיום.
 ,Stock Ageing,התיישנות מלאי
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,לוח זמנים
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,לוח זמנים
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' אינו זמין
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,קבע כלהרחיב
 DocType: Cheque Print Template,Scanned Cheque,המחאה סרוקה
@@ -2644,13 +2625,13 @@
 DocType: Expense Claim Account,Expense Claim Account,חשבון תביעת הוצאות
 DocType: Sales Person,Sales Person Name,שם איש מכירות
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,נא להזין atleast חשבונית 1 בטבלה
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,הוסף משתמשים
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,הוסף משתמשים
 DocType: POS Item Group,Item Group,קבוצת פריט
 DocType: Item,Safety Stock,מלאי ביטחון
 DocType: Stock Reconciliation Item,Before reconciliation,לפני הפיוס
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},כדי {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),מסים והיטלים נוסף (חברת מטבע)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,שורת מס פריט {0} חייבת להיות חשבון של מס סוג או הכנסה או הוצאה או לחיוב
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,שורת מס פריט {0} חייבת להיות חשבון של מס סוג או הכנסה או הוצאה או לחיוב
 DocType: Sales Order,Partly Billed,בחלק שחויב
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,פריט {0} חייב להיות פריט רכוש קבוע
 DocType: Item,Default BOM,BOM ברירת המחדל
@@ -2679,34 +2660,34 @@
 DocType: Salary Slip,Salary Structure,שכר מבנה
 DocType: Account,Bank,בנק
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,חברת תעופה
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,חומר נושא
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,חומר נושא
 DocType: Material Request Item,For Warehouse,למחסן
 DocType: Employee,Offer Date,תאריך הצעה
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ציטוטים
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,אתה נמצא במצב לא מקוון. אתה לא תוכל לטעון עד שיש לך רשת.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,אתה נמצא במצב לא מקוון. אתה לא תוכל לטעון עד שיש לך רשת.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,אין קבוצות סטודנטים נוצרו.
 DocType: Purchase Invoice Item,Serial No,מספר סידורי
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,נא להזין maintaince פרטים ראשון
 DocType: Purchase Invoice,Print Language,שפת דפס
 DocType: Salary Slip,Total Working Hours,שעות עבודה הכוללות
 DocType: Stock Entry,Including items for sub assemblies,כולל פריטים למכלולים תת
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,זן הערך חייב להיות חיובי
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,כל השטחים
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,זן הערך חייב להיות חיובי
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,כל השטחים
 DocType: Purchase Invoice,Items,פריטים
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,סטודנטים כבר נרשמו.
 DocType: Fiscal Year,Year Name,שם שנה
 DocType: Process Payroll,Process Payroll,שכר תהליך
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,ישנם יותר מ חגי ימי עבודה בחודש זה.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,ישנם יותר מ חגי ימי עבודה בחודש זה.
 DocType: Product Bundle Item,Product Bundle Item,פריט Bundle מוצר
 DocType: Sales Partner,Sales Partner Name,שם שותף מכירות
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,בקשת ציטטות
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,בקשת ציטטות
 DocType: Payment Reconciliation,Maximum Invoice Amount,סכום חשבונית מרבי
 apps/erpnext/erpnext/config/selling.py +23,Customers,לקוחות
 DocType: Asset,Partially Depreciated,חלקי מופחת
 DocType: Issue,Opening Time,מועד פתיחה
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,ומכדי התאריכים מבוקשים ל
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,ניירות ערך ובורסות סחורות
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ברירת מחדל של יחידת מדידה ולריאנט &#39;{0}&#39; חייבת להיות זהה בתבנית &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ברירת מחדל של יחידת מדידה ולריאנט &#39;{0}&#39; חייבת להיות זהה בתבנית &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,חישוב המבוסס על
 DocType: Delivery Note Item,From Warehouse,ממחסן
 DocType: Assessment Plan,Supervisor Name,המפקח שם
@@ -2727,7 +2708,7 @@
 DocType: Payment Entry,Internal Transfer,העברה פנימית
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,חשבון ילד קיים עבור חשבון זה. אתה לא יכול למחוק את החשבון הזה.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,כך או כמות היעד או סכום היעד היא חובה
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},אין ברירת מחדל BOM קיימת עבור פריט {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},אין ברירת מחדל BOM קיימת עבור פריט {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,אנא בחר תחילה תאריך פרסום
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,פתיחת תאריך צריכה להיות לפני סגירת תאריך
 DocType: Leave Control Panel,Carry Forward,לְהַעֲבִיר הָלְאָה
@@ -2771,7 +2752,7 @@
 DocType: C-Form,Invoices,חשבוניות
 DocType: Job Opening,Job Title,כותרת עבודה
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,גְרַם
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,כמות לייצור חייבת להיות גדולה מ 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,כמות לייצור חייבת להיות גדולה מ 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,"בקר בדו""ח לשיחת תחזוקה."
 DocType: Stock Entry,Update Rate and Availability,עדכון תעריף וזמינות
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,אחוז מותר לך לקבל או למסור יותר נגד כל הכמות המוזמנת. לדוגמא: אם יש לך הורה 100 יחידות. והפרשה שלך הוא 10% אז אתה רשאי לקבל 110 יחידות.
@@ -2784,12 +2765,12 @@
 ,Sales Register,מכירות הרשמה
 DocType: Quotation,Quotation Lost Reason,סיבה אבודה ציטוט
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,נבחר את הדומיין שלך
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},התייחסות עסקה לא {0} מתאריך {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},התייחסות עסקה לא {0} מתאריך {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,אין שום דבר כדי לערוך.
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,סיכום לחודש זה ופעילויות תלויות ועומדות
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,סיכום לחודש זה ופעילויות תלויות ועומדות
 DocType: Customer Group,Customer Group Name,שם קבוצת הלקוחות
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,דוח על תזרימי המזומנים
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},אנא הסר חשבונית זו {0} מC-טופס {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},אנא הסר חשבונית זו {0} מC-טופס {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,אנא בחר לשאת קדימה אם אתה גם רוצה לכלול האיזון של שנת כספים הקודמת משאיר לשנה הפיסקלית
 DocType: GL Entry,Against Voucher Type,נגד סוג השובר
 DocType: Item,Attributes,תכונות
@@ -2815,20 +2796,19 @@
 DocType: Supplier Quotation,Supplier Address,כתובת ספק
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',שורה {0} החשבון # צריך להיות מסוג &#39;קבוע נכסים&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,מתוך כמות
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,כללים לחישוב סכום משלוח למכירה
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,סדרה היא חובה
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,שירותים פיננסיים
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,סוגי פעילויות יומני זמן
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,סוגי פעילויות יומני זמן
 DocType: Tax Rule,Sales,מכירות
 DocType: Stock Entry Detail,Basic Amount,סכום בסיסי
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},מחסן נדרש לפריט המניה {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},מחסן נדרש לפריט המניה {0}
 DocType: Leave Allocation,Unused leaves,עלים שאינם בשימוש
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,מדינת חיוב
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,העברה
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),תביא BOM התפוצץ (כולל תת מכלולים)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,העברה
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),תביא BOM התפוצץ (כולל תת מכלולים)
 DocType: Authorization Rule,Applicable To (Employee),כדי ישים (עובד)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,תאריך היעד הוא חובה
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,תאריך היעד הוא חובה
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,תוספת לתכונה {0} לא יכולה להיות 0
 DocType: Journal Entry,Pay To / Recd From,לשלם ל/ Recd מ
 DocType: Naming Series,Setup Series,סדרת התקנה
@@ -2854,11 +2834,11 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,Send Supplier Emails,שלח הודעות דוא&quot;ל ספק
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,שיא התקנה למס 'סידורי
 DocType: Timesheet,Employee Detail,פרט לעובדים
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,היום של התאריך הבא חזרו על יום בחודש חייב להיות שווה
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,היום של התאריך הבא חזרו על יום בחודש חייב להיות שווה
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,הגדרות עבור הבית של האתר
 DocType: Offer Letter,Awaiting Response,ממתין לתגובה
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,מעל
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},מאפיין לא חוקי {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},מאפיין לא חוקי {0} {1}
 DocType: Salary Slip,Earning & Deduction,השתכרות וניכוי
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,אופציונאלי. הגדרה זו תשמש לסינון בעסקות שונות.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,שערי הערכה שליליים אינו מותר
@@ -2884,7 +2864,6 @@
 DocType: Sales Team,Contact No.,מס 'לתקשר
 DocType: Bank Reconciliation,Payment Entries,פוסט תשלום
 DocType: Program Enrollment Tool,Get Students From,קבל מבית הספר
-DocType: Hub Settings,Seller Country,מדינה המוכרת
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,לפרסם פריטים באתר
 DocType: Authorization Rule,Authorization Rule,כלל אישור
 DocType: Sales Invoice,Terms and Conditions Details,פרטי תנאים והגבלות
@@ -2944,7 +2923,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),סכום חיוב כולל (דרך זמן יומנים)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,ספק זיהוי
 DocType: Payment Request,Payment Gateway Details,פרטי תשלום Gateway
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,כמות צריכה להיות גדולה מ 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,כמות צריכה להיות גדולה מ 0
 DocType: Journal Entry,Cash Entry,כניסה במזומן
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,בלוטות הילד יכול להיווצר רק תחת צמתים סוג &#39;קבוצה&#39;
 DocType: Academic Year,Academic Year Name,שם שנה אקדמית
@@ -2960,7 +2939,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,הערה: פריט {0} נכנסה מספר פעמים
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,כל אנשי הקשר.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,קיצור חברה
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,משתמש {0} אינו קיים
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,משתמש {0} אינו קיים
 DocType: Item Attribute Value,Abbreviation,קיצור
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,לא authroized מאז {0} עולה על גבולות
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,אדון תבנית שכר.
@@ -2974,10 +2953,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ציטוטים להובלות או לקוחות.
 DocType: Stock Settings,Role Allowed to edit frozen stock,תפקיד מחמד לערוך המניה קפוא
 ,Territory Target Variance Item Group-Wise,פריט יעד שונות טריטורית קבוצה-Wise
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,בכל קבוצות הלקוחות
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,בכל קבוצות הלקוחות
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,מצטבר חודשי
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} הוא חובה. אולי שיא המרה לא נוצר עבור {1} ל {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,תבנית מס היא חובה.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,תבנית מס היא חובה.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,חשבון {0}: הורה חשבון {1} לא קיימת
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),מחיר מחירון שיעור (חברת מטבע)
 DocType: Products Settings,Products Settings,הגדרות מוצרים
@@ -2996,10 +2975,10 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,פריט Detail המס וייז
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,קיצור המכון
 ,Item-wise Price List Rate,שערי רשימת פריט המחיר חכם
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,הצעת מחיר של ספק
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,הצעת מחיר של ספק
 DocType: Quotation,In Words will be visible once you save the Quotation.,במילים יהיו גלוי לאחר שתשמרו את הצעת המחיר.
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},ברקוד {0} כבר השתמש בפריט {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},ברקוד {0} כבר השתמש בפריט {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,כללים להוספת עלויות משלוח.
 DocType: Item,Opening Stock,מאגר פתיחה
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,הלקוח נדרש
@@ -3015,9 +2994,8 @@
 DocType: Customer,From Lead,מליד
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,הזמנות שוחררו לייצור.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,בחר שנת כספים ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,פרופיל קופה הנדרש כדי להפוך את קופה הכניסה
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,פרופיל קופה הנדרש כדי להפוך את קופה הכניסה
 DocType: Program Enrollment Tool,Enroll Students,רשם תלמידים
-DocType: Hub Settings,Name Token,שם אסימון
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,מכירה סטנדרטית
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Atleast מחסן אחד הוא חובה
 DocType: Serial No,Out of Warranty,מתוך אחריות
@@ -3064,7 +3042,7 @@
 DocType: Account,Expense,חשבון
 DocType: Item Attribute,From Range,מטווח
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,פריט {0} התעלם כן הוא לא פריט מניות
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,שלח הזמנת ייצור זה לעיבוד נוסף.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,שלח הזמנת ייצור זה לעיבוד נוסף.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","שלא להחיל כלל תמחור בעסקה מסוימת, צריכים להיות נכה כל כללי התמחור הישימים."
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,מקומות תעסוקה
 ,Sales Order Trends,מגמות להזמין מכירות
@@ -3081,7 +3059,7 @@
 DocType: Batch,Batch ID,זיהוי אצווה
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},הערה: {0}
 ,Delivery Note Trends,מגמות תעודת משלוח
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,סיכום זה של השבוע
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,סיכום זה של השבוע
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,חשבון: {0} ניתן לעדכן רק דרך עסקות במלאי
 DocType: Student Group Creation Tool,Get Courses,קבל קורסים
 DocType: GL Entry,Party,מפלגה
@@ -3109,7 +3087,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,שחור
 DocType: BOM Explosion Item,BOM Explosion Item,פריט פיצוץ BOM
 DocType: Account,Auditor,מבקר
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} פריטים המיוצרים
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} פריטים המיוצרים
 DocType: Cheque Print Template,Distance from top edge,מרחק הקצה העליון
 DocType: Purchase Invoice,Return,חזור
 DocType: Production Order Operation,Production Order Operation,להזמין מבצע ייצור
@@ -3119,17 +3097,16 @@
 DocType: Task,Total Expense Claim (via Expense Claim),תביעה סה&quot;כ הוצאות (באמצעות תביעת הוצאות)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,מארק בהעדר
 DocType: Journal Entry Account,Exchange Rate,שער חליפין
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,להזמין מכירות {0} לא יוגש
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,להזמין מכירות {0} לא יוגש
 DocType: Homepage,Tag Line,קו תג
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,הוספת פריטים מ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,הוספת פריטים מ
 DocType: Cheque Print Template,Regular,רגיל
-DocType: BOM,Last Purchase Rate,שער רכישה אחרונה
+DocType: Purchase Order Item,Last Purchase Rate,שער רכישה אחרונה
 DocType: Account,Asset,נכס
 DocType: Project Task,Task ID,משימת זיהוי
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,המניה לא יכול להתקיים לפריט {0} שכן יש גרסאות
 ,Sales Person-wise Transaction Summary,סיכום עסקת איש מכירות-חכם
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,מחסן {0} אינו קיים
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,הירשם לHub ERPNext
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,מחסן {0} אינו קיים
 DocType: Monthly Distribution,Monthly Distribution Percentages,אחוזים בחתך חודשיים
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,הפריט שנבחר לא יכול להיות אצווה
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% מחומרים מועברים נגד תעודת משלוח זו
@@ -3161,12 +3138,12 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,מזהה אימייל סטודנטים
 DocType: Employee,Notice (days),הודעה (ימים)
 DocType: Tax Rule,Sales Tax Template,תבנית מס מכירות
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,בחר פריטים כדי לשמור את החשבונית
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,בחר פריטים כדי לשמור את החשבונית
 DocType: Employee,Encashment Date,תאריך encashment
 DocType: Account,Stock Adjustment,התאמת מלאי
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},עלות פעילות ברירת המחדל קיימת לסוג פעילות - {0}
 DocType: Production Order,Planned Operating Cost,עלות הפעלה מתוכננת
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},בבקשה למצוא מצורף {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},בבקשה למצוא מצורף {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,מאזן חשבון בנק בהתאם לכללי לדג&#39;ר
 DocType: Job Applicant,Applicant Name,שם מבקש
 DocType: Authorization Rule,Customer / Item Name,לקוחות / שם פריט
@@ -3184,7 +3161,7 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,שיעור הערכת שווי פריט מחושב מחדש שוקל סכום שובר עלות נחת
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,הגדרות ברירת מחדל עבור עסקות מכירה.
 DocType: BOM Update Tool,Current BOM,BOM הנוכחי
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,להוסיף מספר סידורי
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,להוסיף מספר סידורי
 apps/erpnext/erpnext/config/support.py +22,Warranty,אַחֲרָיוּת
 DocType: Production Order,Warehouses,מחסנים
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} נכס אינו ניתן להעברה
@@ -3201,9 +3178,8 @@
 DocType: Account,Receivable,חייבים
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,# השורה {0}: לא הורשו לשנות ספק כהזמנת רכש כבר קיימת
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,תפקיד שמותר להגיש עסקות חריגות ממסגרות אשראי שנקבע.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","סינכרון נתוני אב, זה עלול לקחת קצת זמן"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","סינכרון נתוני אב, זה עלול לקחת קצת זמן"
 DocType: Item,Material Issue,נושא מהותי
-DocType: Hub Settings,Seller Description,תיאור מוכר
 DocType: Employee Education,Qualification,הסמכה
 DocType: Item Price,Item Price,פריט מחיר
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,סבון וחומרי ניקוי
@@ -3230,14 +3206,14 @@
 DocType: Project Task,View Task,צפה במשימה
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,פחת נכסים יתרה
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},סכום {0} {1} הועברה מבית {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},סכום {0} {1} הועברה מבית {2} {3}
 DocType: Sales Invoice,Get Advances Received,קבלו התקבלו מקדמות
 DocType: Email Digest,Add/Remove Recipients,הוספה / הסרה של מקבלי
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},עסקה לא אפשרה נגד הפקה הפסיקה להזמין {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","כדי להגדיר שנת כספים זו כברירת מחדל, לחץ על 'קבע כברירת מחדל'"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,לְהִצְטַרֵף
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,לְהִצְטַרֵף
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,מחסור כמות
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,גרסת פריט {0} קיימת עימן תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,גרסת פריט {0} קיימת עימן תכונות
 DocType: Salary Slip,Salary Slip,שכר Slip
 DocType: Pricing Rule,Margin Rate or Amount,שיעור או סכום שולי
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,'עד תאריך' נדרש
@@ -3245,7 +3221,7 @@
 DocType: Sales Invoice Item,Sales Order Item,פריט להזמין מכירות
 DocType: Salary Slip,Payment Days,ימי תשלום
 DocType: Patient,Dormant,רָדוּם
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,מחסן עם בלוטות ילד לא ניתן להמיר לדג&#39;ר
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,מחסן עם בלוטות ילד לא ניתן להמיר לדג&#39;ר
 DocType: BOM,Manage cost of operations,ניהול עלות של פעולות
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","כאשר כל אחת מהעסקאות בדקו ""הוגש"", מוקפץ הדוא""ל נפתח באופן אוטומטי לשלוח דואר אלקטרוני לקשורים ""צור קשר"" בעסקה ש, עם העסקה כקובץ מצורף. המשתמשים יכולים או לא יכולים לשלוח הדואר האלקטרוני."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,הגדרות גלובליות
@@ -3255,9 +3231,8 @@
 DocType: Account,Account,חשבון
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,מספר סידורי {0} כבר קיבל
 ,Requested Items To Be Transferred,פריטים מבוקשים שיועברו
-DocType: Purchase Invoice,Recurring Id,זיהוי חוזר
 DocType: Customer,Sales Team Details,פרטי צוות מכירות
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,למחוק לצמיתות?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,למחוק לצמיתות?
 DocType: Expense Claim,Total Claimed Amount,"סכום הנתבע סה""כ"
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,הזדמנויות פוטנציאליות למכירה.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},לא חוקי {0}
@@ -3278,7 +3253,6 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","כל דברים אחרים, מאמץ ראוי לציון שצריכה ללכת ברשומות."
 DocType: BOM,Manufacturing User,משתמש ייצור
 DocType: Purchase Invoice,Raw Materials Supplied,חומרי גלם הסופק
-DocType: Purchase Invoice,Recurring Print Format,פורמט הדפסה חוזר
 DocType: C-Form,Series,סדרה
 DocType: Appraisal,Appraisal Template,הערכת תבנית
 DocType: Item Group,Item Classification,סיווג פריט
@@ -3291,14 +3265,14 @@
 DocType: Item Attribute Value,Attribute Value,תכונה ערך
 ,Itemwise Recommended Reorder Level,Itemwise מומלץ להזמנה חוזרת רמה
 DocType: Salary Detail,Salary Detail,פרטי שכר
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,אנא בחר {0} ראשון
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,אנא בחר {0} ראשון
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,אצווה {0} של פריט {1} פג.
 DocType: Sales Invoice,Commission,הוועדה
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,זמן גיליון לייצור.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,סיכום ביניים
 DocType: Salary Detail,Default Amount,סכום ברירת מחדל
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,מחסן לא נמצא במערכת
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,סיכום של החודש
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,סיכום של החודש
 DocType: Quality Inspection Reading,Quality Inspection Reading,איכות פיקוח קריאה
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`מניות הקפאה ישן יותר Than` צריך להיות קטן יותר מאשר% d ימים.
 DocType: Tax Rule,Purchase Tax Template,מס רכישת תבנית
@@ -3315,12 +3289,12 @@
 apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,מותג בחר ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,פחת שנצבר כמו על
 DocType: Sales Invoice,C-Form Applicable,C-טופס ישים
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},מבצע זמן חייב להיות גדול מ 0 למבצע {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},מבצע זמן חייב להיות גדול מ 0 למבצע {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,המחסן הוא חובה
 DocType: Supplier,Address and Contacts,כתובת ומגעים
 DocType: UOM Conversion Detail,UOM Conversion Detail,פרט של אוני 'מישגן ההמרה
 DocType: Program,Program Abbreviation,קיצור התוכנית
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,להזמין ייצור לא יכול להיות שהועלה נגד תבנית פריט
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,להזמין ייצור לא יכול להיות שהועלה נגד תבנית פריט
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,חיובים מתעדכנות בקבלת רכישה כנגד כל פריט
 DocType: Warranty Claim,Resolved By,נפתר על ידי
 DocType: Bank Guarantee,Start Date,תאריך ההתחלה
@@ -3341,21 +3315,22 @@
 DocType: Employee,Educational Qualification,הכשרה חינוכית
 DocType: Workstation,Operating Costs,עלויות תפעול
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,פעולה אם שנצבר חודשי תקציב חריג
-DocType: Purchase Invoice,Submit on creation,שלח על יצירה
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},מטבע עבור {0} חייב להיות {1}
+DocType: Subscription,Submit on creation,שלח על יצירה
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},מטבע עבור {0} חייב להיות {1}
 DocType: Asset,Disposal Date,תאריך סילוק
 DocType: Employee Leave Approver,Employee Leave Approver,עובד חופשה מאשר
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},שורת {0}: כניסת סידור מחדש כבר קיימת למחסן זה {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","לא יכול להכריז על שאבד כ, כי הצעת מחיר כבר עשתה."
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},שורת {0}: כניסת סידור מחדש כבר קיימת למחסן זה {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","לא יכול להכריז על שאבד כ, כי הצעת מחיר כבר עשתה."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,ייצור להזמין {0} יש להגיש
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},אנא בחר תאריך התחלה ותאריך סיום לפריט {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},הקורס הוא חובה בשורת {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,עד כה לא יכול להיות לפני מהמועד
 DocType: Supplier Quotation Item,Prevdoc DocType,DOCTYPE Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,להוסיף מחירים / עריכה
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,להוסיף מחירים / עריכה
 DocType: Cheque Print Template,Cheque Print Template,תבנית הדפסת המחאה
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,תרשים של מרכזי עלות
 ,Requested Items To Be Ordered,פריטים מבוקשים כדי להיות הורה
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,ההזמנות שלי
 DocType: Price List,Price List Name,שם מחיר המחירון
 DocType: Employee Loan,Totals,סיכומים
 DocType: BOM,Manufacturing,ייצור
@@ -3370,9 +3345,9 @@
 DocType: Purchase Invoice Item,Amount (Company Currency),הסכום (חברת מטבע)
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} יחידות של {1} צורך {2} על {3} {4} עבור {5} כדי להשלים את העסקה הזו.
 DocType: Announcement,Student,תלמיד
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,יחידת ארגון הורים (מחלקה).
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,יחידת ארגון הורים (מחלקה).
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,נא להזין את ההודעה לפני השליחה
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,נקודה-של-מכירת פרופיל
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,נקודה-של-מכירת פרופיל
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,"הלוואות בחו""ל"
 DocType: Cost Center,Cost Center Name,שם מרכז עלות
 DocType: Employee,B+,B +
@@ -3388,14 +3363,14 @@
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,הספקים שלך
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,לא ניתן להגדיר כאבודים כלהזמין מכירות נעשה.
 DocType: Request for Quotation Item,Supplier Part No,אין ספק חלק
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,התקבל מ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,התקבל מ
 DocType: Lead,Converted,המרה
 DocType: Item,Has Serial No,יש מספר סידורי
 DocType: Employee,Date of Issue,מועד ההנפקה
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +24,{0}: From {0} for {1},{0}: החל מ- {0} עבור {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},# השורה {0}: ספק הוגדר לפריט {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,שורה {0}: שעות הערך חייב להיות גדול מאפס.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,לא ניתן למצוא תמונה באתר האינטרנט {0} המצורף לפריט {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,לא ניתן למצוא תמונה באתר האינטרנט {0} המצורף לפריט {1}
 DocType: Issue,Content Type,סוג תוכן
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,מחשב
 DocType: Item,List this Item in multiple groups on the website.,רשימת פריט זה במספר קבוצות באתר.
@@ -3404,11 +3379,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,אתה לא רשאי לקבוע ערך קפוא
 DocType: Payment Reconciliation,Get Unreconciled Entries,קבל ערכים לא מותאמים
 DocType: Payment Reconciliation,From Invoice Date,מתאריך החשבונית
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,מטבע חיוב חייב להיות שווה מטבע של או מטבע או צד חשבון comapany מחדל
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,מה זה עושה?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,למחסן
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,מטבע חיוב חייב להיות שווה מטבע של או מטבע או צד חשבון comapany מחדל
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,מה זה עושה?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,למחסן
 ,Average Commission Rate,שערי העמלה הממוצעת
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,"""יש מספר סידורי 'לא יכול להיות' כן 'ללא מוחזק במלאי פריט"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,"""יש מספר סידורי 'לא יכול להיות' כן 'ללא מוחזק במלאי פריט"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,נוכחות לא יכולה להיות מסומנת עבור תאריכים עתידיים
 DocType: Pricing Rule,Pricing Rule Help,עזרה כלל תמחור
 DocType: Purchase Taxes and Charges,Account Head,חשבון ראש
@@ -3421,7 +3396,7 @@
 DocType: Item,Customer Code,קוד לקוח
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},תזכורת יום הולדת עבור {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ימים מאז הזמנה אחרונה
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,חיוב החשבון חייב להיות חשבון מאזן
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,חיוב החשבון חייב להיות חשבון מאזן
 DocType: Buying Settings,Naming Series,סדרת שמות
 DocType: Leave Block List,Leave Block List Name,השאר שם בלוק רשימה
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,נכסים במלאי
@@ -3429,31 +3404,28 @@
 DocType: Target Detail,Target Qty,יעד כמות
 DocType: Shopping Cart Settings,Checkout Settings,הגדרות Checkout
 DocType: Attendance,Present,הווה
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,תעודת משלוח {0} אסור תוגש
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,תעודת משלוח {0} אסור תוגש
 DocType: Notification Control,Sales Invoice Message,מסר חשבונית מכירות
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,סגירת חשבון {0} חייבת להיות אחריות / הון עצמי סוג
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},תלוש משכורת של עובד {0} כבר נוצר עבור גיליון זמן {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},תלוש משכורת של עובד {0} כבר נוצר עבור גיליון זמן {1}
 DocType: Sales Order Item,Ordered Qty,כמות הורה
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,פריט {0} הוא נכים
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,פריט {0} הוא נכים
 DocType: Stock Settings,Stock Frozen Upto,המניה קפואה Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM אינו מכיל כל פריט במלאי
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,פעילות פרויקט / משימה.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM אינו מכיל כל פריט במלאי
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,פעילות פרויקט / משימה.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,צור תלושי שכר
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","קנייה יש לבדוק, אם לישים שנבחרה הוא {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,דיסקונט חייב להיות פחות מ -100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,שער הרכישה האחרונה לא נמצא
 DocType: Purchase Invoice,Write Off Amount (Company Currency),לכתוב את הסכום (חברת מטבע)
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,# השורה {0}: אנא הגדר כמות הזמנה חוזרת
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,# השורה {0}: אנא הגדר כמות הזמנה חוזרת
 DocType: Fees,Program Enrollment,הרשמה לתכנית
 DocType: Landed Cost Voucher,Landed Cost Voucher,שובר עלות נחת
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},אנא הגדר {0}
-DocType: Purchase Invoice,Repeat on Day of Month,חזור על פעולה ביום בחודש
 DocType: Employee,Health Details,בריאות פרטים
 DocType: Offer Letter,Offer Letter Terms,מציע תנאי מכתב
 DocType: Employee External Work History,Salary,שכר
 DocType: Serial No,Delivery Document Type,סוג מסמך משלוח
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,להגיש את כל תלושי השכר לקריטריונים לעיל נבחרים
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} פריטים יסונכרנו
 DocType: Sales Order,Partly Delivered,בחלקו נמסר
 DocType: Email Digest,Receivables,חייבים
 DocType: Lead Source,Lead Source,מקור עופרת
@@ -3471,15 +3443,15 @@
 DocType: SG Creation Tool Course,Max Strength,מקס חוזק
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM הוחלף
 ,Sales Analytics,Analytics מכירות
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},זמין {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},זמין {0}
 DocType: Manufacturing Settings,Manufacturing Settings,הגדרות ייצור
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,הגדרת דוא&quot;ל
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,נא להזין את ברירת מחדל של המטבע בחברה Master
 DocType: Stock Entry Detail,Stock Entry Detail,פרט מניית הכניסה
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,תזכורות יומיות
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,תזכורות יומיות
 DocType: Products Settings,Home Page is Products,דף הבית הוא מוצרים
 ,Asset Depreciation Ledger,לדג&#39;ר פחת נכסים
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},ניגודים כלל מס עם {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},ניגודים כלל מס עם {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,שם חשבון חדש
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,עלות חומרי גלם הסופק
 DocType: Selling Settings,Settings for Selling Module,הגדרות עבור מכירת מודול
@@ -3493,7 +3465,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,פריט {0} חייב להיות פריט מניות
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,עבודה המוגדרת כברירת מחדל במחסן ההתקדמות
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,הגדרות ברירת מחדל עבור עסקות חשבונאיות.
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,תאריך צפוי לא יכול להיות לפני תאריך בקשת חומר
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,שגיאה: לא מזהה בתוקף?
 DocType: Naming Series,Update Series Number,עדכון סדרת מספר
 DocType: Account,Equity,הון עצמי
@@ -3506,7 +3477,7 @@
 DocType: Sales Partner,Partner Type,שם שותף
 DocType: Purchase Taxes and Charges,Actual,בפועל
 DocType: Authorization Rule,Customerwise Discount,Customerwise דיסקונט
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,גליון למשימות.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,גליון למשימות.
 DocType: Purchase Invoice,Against Expense Account,נגד חשבון הוצאות
 DocType: Production Order,Production Order,הזמנת ייצור
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,הערה התקנת {0} כבר הוגשה
@@ -3514,7 +3485,6 @@
 DocType: Quotation Item,Against Docname,נגד Docname
 DocType: SMS Center,All Employee (Active),כל העובד (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,צפה עכשיו
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,בחר את התקופה שבה החשבונית תופק באופן אוטומטי
 DocType: BOM,Raw Material Cost,עלות חומרי גלם
 DocType: Item Reorder,Re-Order Level,סדר מחדש רמה
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,הזן פריטים וכמות מתוכננת עבורו ברצון להעלות הזמנות ייצור או להוריד חומרי גלם לניתוח.
@@ -3573,7 +3543,7 @@
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,כמות של פריט המתקבלת לאחר ייצור / אריזה מחדש מכמויות מסוימות של חומרי גלם
 DocType: Payment Reconciliation,Receivable / Payable Account,חשבון לקבל / לשלם
 DocType: Delivery Note Item,Against Sales Order Item,נגד פריט להזמין מכירות
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},ציין מאפיין ערך עבור תכונת {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},ציין מאפיין ערך עבור תכונת {0}
 DocType: Item,Default Warehouse,מחסן ברירת מחדל
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},תקציב לא ניתן להקצות נגד קבוצת חשבון {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,נא להזין מרכז עלות הורה
@@ -3599,7 +3569,7 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,יצירת כללים להגבלת עסקות המבוססות על ערכים.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","אם מסומן, אין סך הכל. של ימי עבודה יכלול חגים, וזה יקטין את הערך של יום בממוצע שכר"
 DocType: Purchase Invoice,Total Advance,"Advance סה""כ"
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,עיבוד שכר
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,עיבוד שכר
 DocType: Opportunity Item,Basic Rate,שיעור בסיסי
 DocType: GL Entry,Credit Amount,סכום אשראי
 DocType: Cheque Print Template,Signatory Position,תפקיד החותם
@@ -3613,9 +3583,8 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,מתכנן יומני זמן מחוץ לשעתי עבודה תחנת עבודה.
 DocType: Student,Nationality,לאום
 ,Items To Be Requested,פריטים להידרש
-DocType: Purchase Order,Get Last Purchase Rate,קבל אחרון תעריף רכישה
 DocType: Company,Company Info,מידע על חברה
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,בחר או הוסף לקוח חדש
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,בחר או הוסף לקוח חדש
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),יישום של קרנות (נכסים)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,זה מבוסס על הנוכחות של העובד
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,חשבון חיוב
@@ -3638,14 +3607,14 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},שורה לא {0}: הסכום אינו יכול להיות גדול מהסכום ממתין נגד תביעת {1} הוצאות. הסכום בהמתנת {2}
 DocType: Maintenance Schedule,Schedule,לוח זמנים
 DocType: Account,Parent Account,חשבון הורה
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,זמין
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,זמין
 DocType: Quality Inspection Reading,Reading 3,רידינג 3
 ,Hub,רכזת
 DocType: GL Entry,Voucher Type,סוג שובר
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,מחיר המחירון לא נמצא או נכים
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,מחיר המחירון לא נמצא או נכים
 DocType: Lab Test,Approved,אושר
 DocType: Pricing Rule,Price,מחיר
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',עובד הקלה על {0} חייב להיות מוגדרים כ'שמאל '
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',עובד הקלה על {0} חייב להיות מוגדרים כ'שמאל '
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,הערכת {0} נוצרה עבור עובדי {1} בטווח התאריכים נתון
 DocType: Employee,Education,חינוך
 DocType: Selling Settings,Campaign Naming By,Naming קמפיין ב
@@ -3657,7 +3626,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},שורה {0}: מסיבה / חשבון אינו תואם עם {1} / {2} {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,נא להזין את חשבון הוצאות
 DocType: Account,Stock,מלאי
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","# השורה {0}: Reference סוג המסמך חייב להיות אחד הזמנת רכש, חשבונית רכישה או תנועת יומן"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","# השורה {0}: Reference סוג המסמך חייב להיות אחד הזמנת רכש, חשבונית רכישה או תנועת יומן"
 DocType: Employee,Current Address,כתובת נוכחית
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","אם פריט הנו נגזר של פריט נוסף לאחר מכן תיאור, תמונה, תמחור, וכו 'ייקבעו מסים מהתבנית אלא אם צוין במפורש"
 DocType: Serial No,Purchase / Manufacture Details,רכישה / פרטי ייצור
@@ -3682,14 +3651,14 @@
 DocType: Hub Settings,Hub Settings,הגדרות Hub
 DocType: Project,Gross Margin %,% שיעור רווח גולמי
 DocType: BOM,With Operations,עם מבצעים
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,רישומים חשבונאיים כבר נעשו במטבע {0} לחברת {1}. אנא בחר חשבון לקבל או לשלם במטבע {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,רישומים חשבונאיים כבר נעשו במטבע {0} לחברת {1}. אנא בחר חשבון לקבל או לשלם במטבע {0}.
 DocType: Asset,Is Existing Asset,האם קיימים נכסים
 DocType: Warranty Claim,If different than customer address,אם שונה מכתובת הלקוח
 DocType: BOM Operation,BOM Operation,BOM מבצע
 DocType: Purchase Taxes and Charges,On Previous Row Amount,על סכום שורה הקודם
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Asset Transfer
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,Asset Transfer
 DocType: POS Profile,POS Profile,פרופיל קופה
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,הוֹדָאָה
+apps/erpnext/erpnext/hooks.py +147,Admission,הוֹדָאָה
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","עונתיות להגדרת תקציבים, יעדים וכו '"
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","פריט {0} הוא תבנית, אנא בחר באחת מגרסותיה"
 DocType: Asset,Asset Category,קטגורית נכסים
@@ -3697,7 +3666,7 @@
 DocType: Assessment Plan,Room,חֶדֶר
 DocType: Purchase Order,Advance Paid,מראש בתשלום
 DocType: Item,Item Tax,מס פריט
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,חומר לספקים
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,חומר לספקים
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,בלו חשבונית
 DocType: Expense Claim,Employees Email Id,"דוא""ל עובדי זיהוי"
 DocType: Employee Attendance Tool,Marked Attendance,נוכחות בולטת
@@ -3710,11 +3679,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,כרטיס אשראי
 DocType: BOM,Item to be manufactured or repacked,פריט שמיוצר או ארזה
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,הגדרות ברירת מחדל עבור עסקות מניות.
-DocType: Purchase Invoice,Next Date,התאריך הבא
 DocType: Employee Education,Major/Optional Subjects,נושאים עיקריים / אופציונליים
 DocType: Sales Invoice Item,Drop Ship,זרוק משלוח
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","כאן אתה יכול לשמור על פרטים כמו שם וכיבוש של הורה, בן זוג וילדי משפחה"
-DocType: Hub Settings,Seller Name,שם מוכר
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),מסים והיטלים שנוכה (חברת מטבע)
 DocType: Item Group,General Settings,הגדרות כלליות
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,ממטבע למטבע ואינו יכול להיות זהה
@@ -3723,7 +3690,7 @@
 DocType: Item Attribute,Numeric Values,ערכים מספריים
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,צרף לוגו
 DocType: Customer,Commission Rate,הוועדה שערי
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,הפוך Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,הפוך Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,יישומי חופשת בלוק על ידי מחלקה.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer",סוג התשלום חייב להיות אחד וקבל שכר וטובות העברה פנימית
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -3755,10 +3722,10 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(חצי יום)
 DocType: Supplier,Credit Days,ימי אשראי
 DocType: Leave Type,Is Carry Forward,האם להמשיך קדימה
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,קבל פריטים מBOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,קבל פריטים מBOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,להוביל ימי זמן
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},# שורה {0}: פרסום תאריך חייב להיות זהה לתאריך הרכישה {1} של נכס {2}
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,נא להזין הזמנות ומכירות בטבלה לעיל
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,נא להזין הזמנות ומכירות בטבלה לעיל
 ,Stock Summary,סיכום במלאי
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,להעביר נכס ממחסן אחד למשנהו
 apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,הצעת חוק של חומרים
diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv
index 5ac518e..b27df65 100644
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,वेतन साधन
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,रजिस्टर
 DocType: Patient,Divorced,तलाकशुदा
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,आइटम पहले से ही synced
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,आइटम एक सौदे में कई बार जोड़े जाने की अनुमति दें
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,सामग्री भेंट {0} इस वारंटी का दावा रद्द करने से पहले रद्द
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,उपभोक्ता उत्पाद
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,अनुमोदकों छोड़ दो
 DocType: Sales Partner,Dealer,व्यापारी
 DocType: Consultation,Investigations,जांच
+DocType: Restaurant Order Entry,Click Enter To Add,जोड़ने के लिए दर्ज करें पर क्लिक करें
 DocType: Employee,Rented,किराये पर
 DocType: Purchase Order,PO-,पुलिस
 DocType: POS Profile,Applicable for User,उपयोगकर्ता के लिए लागू
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","रूका उत्पादन आदेश रद्द नहीं किया जा सकता, रद्द करने के लिए पहली बार इसे आगे बढ़ाना"
 DocType: Vehicle Service,Mileage,लाभ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,आप वास्तव में इस संपत्ति स्क्रैप करना चाहते हैं?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,आप वास्तव में इस संपत्ति स्क्रैप करना चाहते हैं?
 DocType: Drug Prescription,Update Schedule,अनुसूची अपडेट करें
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,चयन डिफ़ॉल्ट प्रदायक
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},मुद्रा मूल्य सूची के लिए आवश्यक है {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,उपलब्धता जाँचें
 DocType: Job Applicant,Job Applicant,नौकरी आवेदक
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,यह इस प्रदायक के खिलाफ लेन-देन पर आधारित है। जानकारी के लिए नीचे समय देखें
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,कोई और अधिक परिणाम है।
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,कानूनी
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},वास्तविक प्रकार टैक्स पंक्ति में आइटम की दर में शामिल नहीं किया जा सकता {0}
 DocType: Bank Guarantee,Customer,ग्राहक
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),विनिमय दर के रूप में ही किया जाना चाहिए {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ग्राहक का नाम
 DocType: Vehicle,Natural Gas,प्राकृतिक गैस
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},बैंक खाते के रूप में नामित नहीं किया जा सकता {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},बैंक खाते के रूप में नामित नहीं किया जा सकता {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,प्रमुखों (या समूह) के खिलाफ जो लेखांकन प्रविष्टियों बना रहे हैं और संतुलन बनाए रखा है।
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),बकाया {0} शून्य से भी कम नहीं किया जा सकता है के लिए ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,प्रक्रिया के लिए कोई जमा वेतन नहीं है
 DocType: Manufacturing Settings,Default 10 mins,10 मिनट चूक
 DocType: Leave Type,Leave Type Name,प्रकार का नाम छोड़ दो
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,खुले शो
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,उपरोक्त आवर्ती आवर्ती के लिए आज ही इस कार्रवाई को करना आवश्यक है
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,सीरीज सफलतापूर्वक अपडेट
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,चेक आउट
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural जर्नल प्रविष्टि के लिए प्रस्तुत
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,खरीद आदेश प्राप्त किए जाने आइटम
 DocType: SMS Center,All Supplier Contact,सभी आपूर्तिकर्ता संपर्क
 DocType: Support Settings,Support Settings,समर्थन सेटिंग
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,उम्मीद अंत तिथि अपेक्षित प्रारंभ तिथि से कम नहीं हो सकता है
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,उम्मीद अंत तिथि अपेक्षित प्रारंभ तिथि से कम नहीं हो सकता है
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,पंक्ति # {0}: दर के रूप में ही किया जाना चाहिए {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,नई छुट्टी के लिए अर्जी
 ,Batch Item Expiry Status,बैच मद समाप्ति की स्थिति
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,बैंक ड्राफ्ट
 DocType: Mode of Payment Account,Mode of Payment Account,भुगतान खाता का तरीका
 DocType: Consultation,Consultation,परामर्श
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,बिक्री और रिटर्न
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,दिखाएँ वेरिएंट
 DocType: Academic Term,Academic Term,शैक्षणिक अवधि
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,सामग्री
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,स्वास्थ्य देखभाल
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),भुगतान में देरी (दिन)
 DocType: Lab Prescription,Lab Prescription,लैब प्रिस्क्रिप्शन
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,मूल्य द्वारा क्रमबद्ध करें
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,सेवा व्यय
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},सीरियल नंबर: {0} पहले से ही बिक्री चालान में संदर्भित है: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,बीजक
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},सीरियल नंबर: {0} पहले से ही बिक्री चालान में संदर्भित है: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,बीजक
 DocType: Maintenance Schedule Item,Periodicity,आवधिकता
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,वित्त वर्ष {0} की आवश्यकता है
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,रक्षा
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,पंक्ति # {0}:
 DocType: Timesheet,Total Costing Amount,कुल लागत राशि
 DocType: Delivery Note,Vehicle No,वाहन नहीं
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,मूल्य सूची का चयन करें
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,मूल्य सूची का चयन करें
 DocType: Accounts Settings,Currency Exchange Settings,मुद्रा विनिमय सेटिंग्स
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,पंक्ति # {0}: भुगतान दस्तावेज़ trasaction पूरा करने के लिए आवश्यक है
 DocType: Production Order Operation,Work In Progress,अर्धनिर्मित उत्पादन
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,कृपया तिथि का चयन
 DocType: Employee,Holiday List,अवकाश सूची
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,कृपया स्कूल में शिक्षक नामकरण प्रणाली सेटअप करें&gt; स्कूल सेटिंग्स
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,मुनीम
+DocType: Hub Settings,Selling Price List,मूल्य सूची बेचना
 DocType: Patient,Tobacco Current Use,तंबाकू वर्तमान उपयोग
 DocType: Cost Center,Stock User,शेयर उपयोगकर्ता
 DocType: Company,Phone No,कोई फोन
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,पाठ्यक्रम कार्यक्रम बनाया:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},नई {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},नई {0}: # {1}
 ,Sales Partners Commission,बिक्री पार्टनर्स आयोग
 DocType: Purchase Invoice,Rounding Adjustment,गोलाई समायोजन
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,संक्षिप्त 5 से अधिक वर्ण की नहीं हो सकती
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,माता - पिता विस्तार docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","संदर्भ: {0}, मद कोड: {1} और ग्राहक: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,किलो
-DocType: Student Log,Log,लॉग
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,एक नौकरी के लिए खोलना.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} परिणाम प्रस्तुत किया गया
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} परिणाम प्रस्तुत किया गया
 DocType: Item Attribute,Increment,वेतन वृद्धि
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,समय अवधि
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,गोदाम का चयन करें ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,विवाहित
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},अनुमति नहीं {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,से आइटम प्राप्त
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},शेयर वितरण नोट के खिलाफ अद्यतन नहीं किया जा सकता {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},शेयर वितरण नोट के खिलाफ अद्यतन नहीं किया जा सकता {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},उत्पाद {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,कोई आइटम सूचीबद्ध नहीं
 DocType: Payment Reconciliation,Reconcile,समाधान करना
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,पेंशन फंड
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,अगली मूल्यह्रास की तारीख से पहले खरीद की तिथि नहीं किया जा सकता
 DocType: Consultation,Consultation Date,परामर्श दिनांक
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNext उपयोगकर्ताओं के लिए उत्पाद प्रविष्टि और खोज
 DocType: SMS Center,All Sales Person,सभी बिक्री व्यक्ति
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** मासिक वितरण ** अगर आप अपने व्यवसाय में मौसमी है आप महीने भर का बजट / लक्ष्य वितरित मदद करता है।
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,नहीं आइटम नहीं मिला
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,वेतन ढांचे गुम
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,नहीं आइटम नहीं मिला
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,वेतन ढांचे गुम
 DocType: Lead,Person Name,व्यक्ति का नाम
 DocType: Sales Invoice Item,Sales Invoice Item,बिक्री चालान आइटम
 DocType: Account,Credit,श्रेय
 DocType: POS Profile,Write Off Cost Center,ऑफ लागत केंद्र लिखें
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",उदाहरण के लिए &quot;प्राइमरी स्कूल&quot; या &quot;विश्वविद्यालय&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",उदाहरण के लिए &quot;प्राइमरी स्कूल&quot; या &quot;विश्वविद्यालय&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,स्टॉक रिपोर्ट
 DocType: Warehouse,Warehouse Detail,वेअरहाउस विस्तार
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},क्रेडिट सीमा ग्राहक के लिए पार किया गया है {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,सत्रांत तिथि से बाद में शैक्षणिक वर्ष की वर्ष समाप्ति तिथि है जो करने के लिए शब्द जुड़ा हुआ है नहीं हो सकता है (शैक्षिक वर्ष {})। तारीखों को ठीक करें और फिर कोशिश करें।
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",अनियंत्रित नहीं हो सकता है के रूप में एसेट रिकॉर्ड मद के सामने मौजूद है &quot;निश्चित परिसंपत्ति है&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",अनियंत्रित नहीं हो सकता है के रूप में एसेट रिकॉर्ड मद के सामने मौजूद है &quot;निश्चित परिसंपत्ति है&quot;
 DocType: Vehicle Service,Brake Oil,ब्रेक तेल
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; क्षेत्र
 DocType: Tax Rule,Tax Type,टैक्स प्रकार
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,कर योग्य राशि
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},इससे पहले कि आप प्रविष्टियों को जोड़ने या अद्यतन करने के लिए अधिकृत नहीं हैं {0}
 DocType: BOM,Item Image (if not slideshow),छवि (यदि नहीं स्लाइड शो)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,एक ग्राहक एक ही नाम के साथ मौजूद है
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(घंटा दर / 60) * वास्तविक ऑपरेशन टाइम
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,पंक्ति # {0}: संदर्भ दस्तावेज़ प्रकार खर्च दावे या जर्नल प्रविष्टि में से एक होना चाहिए
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,बीओएम का चयन
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,पंक्ति # {0}: संदर्भ दस्तावेज़ प्रकार खर्च दावे या जर्नल प्रविष्टि में से एक होना चाहिए
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,बीओएम का चयन
 DocType: SMS Log,SMS Log,एसएमएस प्रवेश
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,वितरित मदों की लागत
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,पर {0} छुट्टी के बीच की तिथि से और आज तक नहीं है
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,कर्मचारी ऋण
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,गतिविधि प्रवेश करें :
 DocType: Fee Schedule,Send Payment Request Email,भुगतान अनुरोध ईमेल भेजें
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,आइटम {0} सिस्टम में मौजूद नहीं है या समाप्त हो गई है
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,आइटम {0} सिस्टम में मौजूद नहीं है या समाप्त हो गई है
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,रियल एस्टेट
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,लेखा - विवरण
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,औषधीय
@@ -210,17 +213,22 @@
 DocType: Employee,B-,बी
 DocType: Upload Attendance,Import Log,प्रवेश करें आयात
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,खींचो उपरोक्त मानदंडों के आधार पर प्रकार के निर्माण की सामग्री का अनुरोध
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,सफलतापूर्वक अपंजीकृत किया गया।
 DocType: Training Result Employee,Grade,ग्रेड
+DocType: Restaurant Table,No of Seats,सीटों की संख्या
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","गतिशील विषय जोड़ने के लिए, जैसे जीनजा टैग का उपयोग करें <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,प्रदायक द्वारा वितरित
 DocType: SMS Center,All Contact,सभी संपर्क
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,उत्पादन आदेश पहले से ही बीओएम के साथ सभी मदों के लिए बनाया
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,उत्पादन आदेश पहले से ही बीओएम के साथ सभी मदों के लिए बनाया
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,वार्षिक वेतन
 DocType: Daily Work Summary,Daily Work Summary,दैनिक काम सारांश
 DocType: Period Closing Voucher,Closing Fiscal Year,वित्तीय वर्ष और समापन
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} स्थायी है
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,कृपया खातों का चार्ट बनाने के लिए मौजूदा कंपनी का चयन
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} स्थगित कर दिया है
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,कृपया खातों का चार्ट बनाने के लिए मौजूदा कंपनी का चयन
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,शेयर व्यय
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,लक्ष्य वेअरहाउस चुनें
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,लक्ष्य वेअरहाउस चुनें
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,कृपया पसंदीदा संपर्क ईमेल
 DocType: Program Enrollment,School Bus,स्कूल बस
 DocType: Journal Entry,Contra Entry,कॉन्ट्रा एंट्री
@@ -238,9 +246,10 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", टेम्पलेट डाउनलोड उपयुक्त डेटा को भरने और संशोधित फ़ाइल देते हैं।
  चयनित अवधि में सभी तिथियों और कर्मचारी संयोजन मौजूदा उपस्थिति रिकॉर्ड के साथ, टेम्पलेट में आ जाएगा"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,आइटम {0} सक्रिय नहीं है या जीवन के अंत तक पहुँच गया है
+DocType: Student Admission Program,Minimum Age,न्यूनतम आयु
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,उदाहरण: बुनियादी गणित
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","पंक्ति में कर शामिल करने के लिए {0} आइटम रेट में , पंक्तियों में करों {1} भी शामिल किया जाना चाहिए"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,मानव संसाधन मॉड्यूल के लिए सेटिंग्स
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,मानव संसाधन मॉड्यूल के लिए सेटिंग्स
 DocType: SMS Center,SMS Center,एसएमएस केंद्र
 DocType: Sales Invoice,Change Amount,राशि परिवर्तन
 DocType: BOM Update Tool,New BOM,नई बीओएम
@@ -250,7 +259,7 @@
 DocType: Lead,Request Type,अनुरोध प्रकार
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,कर्मचारी
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,प्रसारण
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,कमरे जोड़ें
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),पीओएस (ऑनलाइन / ऑफ़लाइन) का सेटअप मोड
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,निष्पादन
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,आपरेशन के विवरण से बाहर किया।
 DocType: Serial No,Maintenance Status,रखरखाव स्थिति
@@ -273,6 +282,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,मूल्य सूची खरीदने या बेचने के लिए लागू किया जाना चाहिए
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},स्थापना दिनांक मद के लिए डिलीवरी की तारीख से पहले नहीं किया जा सकता {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),मूल्य सूची दर पर डिस्काउंट (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,जीव रसायन
 DocType: Offer Letter,Select Terms and Conditions,का चयन नियम और शर्तें
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,आउट मान
 DocType: Production Planning Tool,Sales Orders,बिक्री के आदेश
@@ -307,15 +317,15 @@
 DocType: Sales Partner,Reseller,पुनर्विक्रेता
 DocType: Codification Table,Medical Code,मेडिकल कोड
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","अगर जाँच की, सामग्री अनुरोध में गैर-शेयर आइटम शामिल होंगे।"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,कंपनी दाखिल करें
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,कंपनी दाखिल करें
 DocType: Delivery Note Item,Against Sales Invoice Item,बिक्री चालान आइटम के खिलाफ
 ,Production Orders in Progress,प्रगति में उत्पादन के आदेश
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,फाइनेंसिंग से नेट नकद
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage भरा हुआ है, नहीं सहेज सकते हैं।"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage भरा हुआ है, नहीं सहेज सकते हैं।"
 DocType: Lead,Address & Contact,पता और संपर्क
 DocType: Leave Allocation,Add unused leaves from previous allocations,पिछले आवंटन से अप्रयुक्त पत्ते जोड़ें
 DocType: Sales Partner,Partner website,पार्टनर वेबसाइट
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,सामान जोडें
+DocType: Restaurant Order Entry,Add Item,सामान जोडें
 DocType: Lab Test,Custom Result,कस्टम परिणाम
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,संपर्क का नाम
 DocType: Course Assessment Criteria,Course Assessment Criteria,पाठ्यक्रम मूल्यांकन मानदंड
@@ -328,7 +338,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,खरीद के लिए अनुरोध.
 DocType: Lab Test,Submitted Date,सबमिट करने की तिथि
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,इस समय पत्रक इस परियोजना के खिलाफ बनाया पर आधारित है
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,नेट पे 0 से कम नहीं हो सकता है
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,नेट पे 0 से कम नहीं हो सकता है
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","सिस्टम से दोहराव त्रुटि सूचनाएं भेजने को रोकने के लिए, हमने सदस्यता में निष्क्रिय फ़ील्ड की जांच की है"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,केवल चयनित लीव अनुमोदक इस छुट्टी के लिए अर्जी प्रस्तुत कर सकते हैं
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,तिथि राहत शामिल होने की तिथि से अधिक होना चाहिए
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,प्रति वर्ष पत्तियां
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,लाभ हानि
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,लीटर
 DocType: Task,Total Costing Amount (via Time Sheet),कुल लागत राशि (समय पत्रक के माध्यम से)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,छात्रों के समूह के तहत छात्र सेट करें
 DocType: Item Website Specification,Item Website Specification,आइटम वेबसाइट विशिष्टता
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,अवरुद्ध छोड़ दो
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},आइटम {0} पर जीवन के अपने अंत तक पहुँच गया है {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},आइटम {0} पर जीवन के अपने अंत तक पहुँच गया है {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,बैंक प्रविष्टियां
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,वार्षिक
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,शेयर सुलह आइटम
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,छात्र समूह निर्माण उपकरण कोर्स
 DocType: Lead,Do Not Contact,संपर्क नहीं है
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,जो लोग अपने संगठन में पढ़ाने
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,सभी आवर्ती चालान पर नज़र रखने के लिए अद्वितीय पहचान. इसे प्रस्तुत करने पर उत्पन्न होता है.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,सॉफ्टवेयर डेवलपर
 DocType: Item,Minimum Order Qty,न्यूनतम आदेश मात्रा
 DocType: Pricing Rule,Supplier Type,प्रदायक प्रकार
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,हब में प्रकाशित
 DocType: Student Admission,Student Admission,छात्र प्रवेश
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,आइटम {0} को रद्द कर दिया गया है
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,सामग्री अनुरोध
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,आइटम {0} को रद्द कर दिया गया है
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,सामग्री अनुरोध
 DocType: Bank Reconciliation,Update Clearance Date,अद्यतन क्लीयरेंस तिथि
 DocType: Item,Purchase Details,खरीद विवरण
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},खरीद आदेश में &#39;कच्चे माल की आपूर्ति&#39; तालिका में नहीं मिला मद {0} {1}
 DocType: Patient Relation,Relation,संबंध
 DocType: Shipping Rule,Worldwide Shipping,दुनिया भर में शिपिंग
 DocType: Patient Relation,Mother,मां
+DocType: Restaurant Reservation,Reservation End Time,आरक्षण समाप्ति समय
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,ग्राहकों से आदेश की पुष्टि की है.
 DocType: Purchase Receipt Item,Rejected Quantity,अस्वीकृत मात्रा
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,भुगतान अनुरोध {0} बनाया गया
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,भुगतान अनुरोध {0} बनाया गया
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,कम संवेदनशीलता
 DocType: Notification Control,Notification Control,अधिसूचना नियंत्रण
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,एक बार जब आप अपना प्रशिक्षण पूरा कर लेंगे तो पुष्टि करें
 DocType: Lead,Suggestions,सुझाव
@@ -388,7 +401,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,कर्मचारी को ईमेल वेतन पर्ची कर्मचारी में से चयनित पसंदीदा ईमेल के आधार पर
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,सूची में पहले छोड़ अनुमोदक डिफ़ॉल्ट छोड़ दो अनुमोदक के रूप में स्थापित किया जाएगा
 DocType: Tax Rule,Shipping County,शिपिंग काउंटी
-apps/erpnext/erpnext/config/desktop.py +158,Learn,सीखना
+apps/erpnext/erpnext/config/desktop.py +159,Learn,सीखना
 DocType: Asset,Next Depreciation Date,अगली तिथि मूल्यह्रास
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,कर्मचारी प्रति गतिविधि लागत
 DocType: Accounts Settings,Settings for Accounts,खातों के लिए सेटिंग्स
@@ -399,13 +412,13 @@
 DocType: Item,Synced With Hub,हब के साथ सिंक किया गया
 DocType: Vehicle,Fleet Manager,नौसेना प्रबंधक
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},पंक्ति # {0}: {1} आइटम के लिए नकारात्मक नहीं हो सकता {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,गलत पासवर्ड
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,गलत पासवर्ड
 DocType: Item,Variant Of,के variant
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',की तुलना में 'मात्रा निर्माण करने के लिए' पूरी की गई मात्रा अधिक नहीं हो सकता
 DocType: Period Closing Voucher,Closing Account Head,बंद लेखाशीर्ष
 DocType: Employee,External Work History,बाहरी काम इतिहास
 DocType: Physician,Time per Appointment,प्रति नियुक्ति के लिए समय
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,परिपत्र संदर्भ त्रुटि
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,परिपत्र संदर्भ त्रुटि
 DocType: Appointment Type,Is Inpatient,आंत्र रोगी है
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 नाम
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,शब्दों में (निर्यात) दिखाई हो सकता है एक बार आप डिलिवरी नोट बचाने के लिए होगा.
@@ -414,19 +427,18 @@
 DocType: Lead,Industry,उद्योग
 DocType: Employee,Job Profile,नौकरी प्रोफाइल
 DocType: BOM Item,Rate & Amount,दर और राशि
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; नंबरिंग सीरिज के माध्यम से उपस्थिति के लिए श्रृंखलाबद्ध संख्या सेट करना
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,यह इस कंपनी के विरुद्ध लेनदेन पर आधारित है। विवरण के लिए नीचे समयरेखा देखें
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,स्वचालित सामग्री अनुरोध के निर्माण पर ईमेल द्वारा सूचित करें
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,प्रतिरोधी
 DocType: Journal Entry,Multi Currency,बहु मुद्रा
 DocType: Payment Reconciliation Invoice,Invoice Type,चालान का प्रकार
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; क्षेत्र
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,बिलटी
 DocType: Consultation,Encounter Impression,मुठभेड़ इंप्रेशन
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,करों की स्थापना
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,बिक संपत्ति की लागत
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,आप इसे खींचा बाद भुगतान एंट्री संशोधित किया गया है। इसे फिर से खींच कर दीजिये।
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} मद टैक्स में दो बार दर्ज
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,इस सप्ताह और लंबित गतिविधियों के लिए सारांश
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} मद टैक्स में दो बार दर्ज
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,इस सप्ताह और लंबित गतिविधियों के लिए सारांश
 DocType: Student Applicant,Admitted,भर्ती किया
 DocType: Workstation,Rent Cost,बाइक किराए मूल्य
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,राशि मूल्यह्रास के बाद
@@ -440,36 +452,35 @@
 DocType: Shipping Rule,Valid for Countries,देशों के लिए मान्य
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"इस मद के लिए एक खाका है और लेनदेन में इस्तेमाल नहीं किया जा सकता है। 'कोई प्रतिलिपि' सेट कर दिया जाता है, जब तक आइटम विशेषताओं वेरिएंट में खत्म नकल की जाएगी"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,माना कुल ऑर्डर
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","कर्मचारी पदनाम (जैसे सीईओ , निदेशक आदि ) ."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","कर्मचारी पदनाम (जैसे सीईओ , निदेशक आदि ) ."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,जिस पर दर ग्राहक की मुद्रा ग्राहक आधार मुद्रा में परिवर्तित किया जाता है
 DocType: Course Scheduling Tool,Course Scheduling Tool,पाठ्यक्रम निर्धारण उपकरण
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},पंक्ति # {0}: चालान की खरीद करने के लिए एक मौजूदा परिसंपत्ति के खिलाफ नहीं बनाया जा सकता है {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[त्वरित]% s को% s के लिए आवर्ती% बनाते समय त्रुटि हुई
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[त्वरित]% s को% s के लिए आवर्ती% बनाते समय त्रुटि हुई
 DocType: Item Tax,Tax Rate,कर की दर
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} पहले से ही कर्मचारी के लिए आवंटित {1} तक की अवधि के {2} के लिए {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,वस्तु चुनें
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,वस्तु चुनें
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,खरीद चालान {0} पहले से ही प्रस्तुत किया जाता है
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},पंक्ति # {0}: बैच नहीं के रूप में ही किया जाना चाहिए {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,गैर-समूह कन्वर्ट करने के लिए
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,एक आइटम के बैच (बहुत).
 DocType: C-Form Invoice Detail,Invoice Date,चालान तिथि
 DocType: GL Entry,Debit Amount,निकाली गई राशि
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},केवल में कंपनी के प्रति एक खाते से हो सकता है {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,लगाव को देखने के लिए धन्यवाद
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},केवल में कंपनी के प्रति एक खाते से हो सकता है {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,लगाव को देखने के लिए धन्यवाद
 DocType: Purchase Order,% Received,% प्राप्त
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,छात्र गुटों बनाएं
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,सेटअप पहले से ही पूरा !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,सेटअप पहले से ही पूरा !
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,क्रेडिट नोट राशि
 DocType: Setup Progress Action,Action Document,कार्यवाही दस्तावेज़
 ,Finished Goods,निर्मित माल
 DocType: Delivery Note,Instructions,निर्देश
 DocType: Quality Inspection,Inspected By,द्वारा निरीक्षण किया
 DocType: Maintenance Visit,Maintenance Type,रखरखाव के प्रकार
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} कोर्स {2} में नामांकित नहीं है
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,आइटम कोड&gt; आइटम समूह&gt; ब्रांड
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} कोर्स {2} में नामांकित नहीं है
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},धारावाहिक नहीं {0} डिलिवरी नोट से संबंधित नहीं है {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext डेमो
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,सामगंरियां जोड़ें
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,सामगंरियां जोड़ें
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,आइटम गुणवत्ता निरीक्षण पैरामीटर
 DocType: Leave Application,Leave Approver Name,अनुमोदनकर्ता छोड़ दो नाम
 DocType: Depreciation Schedule,Schedule Date,नियत तिथि
@@ -489,14 +500,14 @@
 DocType: Salary Slip Timesheet,Working Hours,कार्य के घंटे
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,एक मौजूदा श्रृंखला के शुरू / वर्तमान अनुक्रम संख्या बदलें.
 DocType: Dosage Strength,Strength,शक्ति
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,एक नए ग्राहक बनाने
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,एक नए ग्राहक बनाने
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","कई डालती प्रबल करने के लिए जारी रखते हैं, उपयोगकर्ताओं संघर्ष को हल करने के लिए मैन्युअल रूप से प्राथमिकता सेट करने के लिए कहा जाता है."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,खरीद आदेश बनाएं
 ,Purchase Register,इन पंजीकृत खरीद
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,लागू शुल्कों
 DocType: Workstation,Consumable Cost,उपभोज्य लागत
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) भूमिका होनी चाहिए 'लीव अनुमोदनकर्ता'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) की भूमिका  'अवकाश  अनुमोदक ' होनी चाहिए
 DocType: Purchase Receipt,Vehicle Date,वाहन की तारीख
 DocType: Student Log,Medical,चिकित्सा
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,खोने के लिए कारण
@@ -508,7 +519,7 @@
 DocType: Lab Test Template,Single,एक
 DocType: Salary Slip,Total Loan Repayment,कुल ऋण चुकौती
 DocType: Account,Cost of Goods Sold,बेच माल की लागत
-DocType: Purchase Invoice,Yearly,वार्षिक
+DocType: Subscription,Yearly,वार्षिक
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,लागत केंद्र दर्ज करें
 DocType: Drug Prescription,Dosage,मात्रा बनाने की विधि
 DocType: Journal Entry Account,Sales Order,बिक्री आदेश
@@ -538,7 +549,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,सभी विनिर्माण प्रक्रियाओं के लिए वैश्विक सेटिंग्स।
 DocType: Accounts Settings,Accounts Frozen Upto,लेखा तक जमे हुए
 DocType: SMS Log,Sent On,पर भेजा
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,गुण {0} गुण तालिका में कई बार चुना
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,गुण {0} गुण तालिका में कई बार चुना
 DocType: HR Settings,Employee record is created using selected field. ,कर्मचारी रिकॉर्ड चयनित क्षेत्र का उपयोग कर बनाया जाता है.
 DocType: Sales Order,Not Applicable,लागू नहीं
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,अवकाश मास्टर .
@@ -563,13 +574,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,आवंटित कुल पत्तियों अनिवार्य है
 DocType: Patient,AB Positive,एबी सकारात्मक
 DocType: Job Opening,Description of a Job Opening,एक नौकरी खोलने का विवरण
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,आज के लिए लंबित गतिविधियों
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,आज के लिए लंबित गतिविधियों
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,उपस्थिति रिकॉर्ड.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet आधारित पेरोल के लिए वेतन घटक।
 DocType: Sales Order Item,Used for Production Plan,उत्पादन योजना के लिए प्रयुक्त
 DocType: Employee Loan,Total Payment,कुल भुगतान
 DocType: Manufacturing Settings,Time Between Operations (in mins),(मिनट में) संचालन के बीच का समय
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,"{0} {1} रद्द कर दिया जाता है, इसलिए कार्रवाई पूरी नहीं की जा सकती"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,"{0} {1} रद्द कर दिया गया है, इसलिए कार्रवाई पूरी नहीं की जा सकती"
 DocType: Customer,Buyer of Goods and Services.,सामान और सेवाओं के खरीदार।
 DocType: Journal Entry,Accounts Payable,लेखा देय
 DocType: Patient,Allergies,एलर्जी
@@ -581,22 +592,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,खरीद आदेश को चेतावनी दें
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,अपने ग्राहकों के कुछ सूची . वे संगठनों या व्यक्तियों हो सकता है.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,बहुत हो गया भागों का निर्माण करने के लिए
+DocType: POS Profile User,POS Profile User,पीओएस प्रोफ़ाइल उपयोगकर्ता
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,प्रत्यक्ष आय
 DocType: Patient Appointment,Date TIme,दिनांक समय
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","खाता से वर्गीकृत किया है , तो खाते के आधार पर फ़िल्टर नहीं कर सकते"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,प्रशासनिक अधिकारी
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,कृपया कोर्स चुनें
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,कृपया कोर्स चुनें
 DocType: Codification Table,Codification Table,संहिताकरण तालिका
 DocType: Timesheet Detail,Hrs,बजे
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,कंपनी का चयन करें
 DocType: Stock Entry Detail,Difference Account,अंतर खाता
 DocType: Purchase Invoice,Supplier GSTIN,आपूर्तिकर्ता जीएसटीआईएन
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,उसकी निर्भर कार्य {0} बंद नहीं है के रूप में बंद काम नहीं कर सकते हैं।
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,"सामग्री अनुरोध उठाया जाएगा , जिसके लिए वेयरहाउस दर्ज करें"
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,उसकी निर्भर कार्य {0} बंद नहीं है के रूप में बंद काम नहीं कर सकते हैं।
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"सामग्री अनुरोध उठाया जाएगा , जिसके लिए वेयरहाउस दर्ज करें"
 DocType: Production Order,Additional Operating Cost,अतिरिक्त ऑपरेटिंग कॉस्ट
 DocType: Lab Test Template,Lab Routine,लैब नियमित
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,प्रसाधन सामग्री
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","मर्ज करने के लिए , निम्नलिखित गुण दोनों मदों के लिए ही होना चाहिए"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","मर्ज करने के लिए , निम्नलिखित गुण दोनों मदों के लिए ही होना चाहिए"
 DocType: Shipping Rule,Net Weight,निवल भार
 DocType: Employee,Emergency Phone,आपातकालीन फोन
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,खरीदें
@@ -606,7 +618,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,थ्रेशोल्ड 0% के लिए ग्रेड को परिभाषित करें
 DocType: Sales Order,To Deliver,पहुँचाना
 DocType: Purchase Invoice Item,Item,मद
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,सीरियल नहीं आइटम एक अंश नहीं किया जा सकता
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,उच्च संवेदनशील
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,सीरियल नहीं आइटम एक अंश नहीं किया जा सकता
 DocType: Journal Entry,Difference (Dr - Cr),अंतर ( डॉ. - सीआर )
 DocType: Account,Profit and Loss,लाभ और हानि
 DocType: Patient,Risk Factors,जोखिम के कारण
@@ -615,7 +628,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,प्रबंध उप
 DocType: Vital Signs,Body Temperature,शरीर का तापमान
 DocType: Project,Project will be accessible on the website to these users,परियोजना इन उपयोगकर्ताओं के लिए वेबसाइट पर सुलभ हो जाएगा
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,परियोजना प्रकार को परिभाषित करें
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,परियोजना प्रकार को परिभाषित करें
 DocType: Supplier Scorecard,Weighting Function,वजन फ़ंक्शन
 DocType: Physician,OP Consulting Charge,ओपी परामर्श शुल्क
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,अपने सेटअप करें
@@ -629,7 +642,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,वेतन वृद्धि 0 नहीं किया जा सकता
 DocType: Production Planning Tool,Material Requirement,सामग्री की आवश्यकताएँ
 DocType: Company,Delete Company Transactions,कंपनी लेन-देन को हटाएं
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,संदर्भ कोई और संदर्भ तिथि बैंक लेन-देन के लिए अनिवार्य है
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,संदर्भ कोई और संदर्भ तिथि बैंक लेन-देन के लिए अनिवार्य है
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,कर और प्रभार जोड़ें / संपादित करें
 DocType: Payment Entry Reference,Supplier Invoice No,प्रदायक चालान नहीं
 DocType: Territory,For reference,संदर्भ के लिए
@@ -637,12 +650,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","नहीं हटा सकते सीरियल नहीं {0}, यह शेयर लेनदेन में इस्तेमाल किया जाता है के रूप में"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),समापन (सीआर)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,नमस्ते
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,हटो मद
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,हटो मद
 DocType: Serial No,Warranty Period (Days),वारंटी अवधि (दिन)
 DocType: Installation Note Item,Installation Note Item,अधिष्ठापन नोट आइटम
 DocType: Production Plan Item,Pending Qty,विचाराधीन मात्रा
 DocType: Budget,Ignore,उपेक्षा
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} सक्रिय नहीं है
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} सक्रिय नहीं है
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,सेटअप जांच मुद्रण के लिए आयाम
 DocType: Salary Slip,Salary Slip Timesheet,वेतन पर्ची Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,उप अनुबंधित खरीद रसीद के लिए अनिवार्य प्रदायक वेयरहाउस
@@ -651,7 +664,7 @@
 DocType: Pricing Rule,Sales Partner,बिक्री साथी
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,सभी प्रदायक स्कोरकार्ड
 DocType: Buying Settings,Purchase Receipt Required,खरीद रसीद आवश्यक
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,अगर खोलने स्टॉक में प्रवेश किया मूल्यांकन दर अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,अगर खोलने स्टॉक में प्रवेश किया मूल्यांकन दर अनिवार्य है
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,चालान तालिका में कोई अभिलेख
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,पहले कंपनी और पार्टी के प्रकार का चयन करें
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,वित्तीय / लेखा वर्ष .
@@ -688,7 +701,7 @@
 DocType: Quotation,Quotation To,करने के लिए कोटेशन
 DocType: Lead,Middle Income,मध्य आय
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),उद्घाटन (सीआर )
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,आप पहले से ही एक और UoM के साथ कुछ लेन-देन (एस) बना दिया है क्योंकि मद के लिए माप की मूलभूत इकाई {0} सीधे नहीं बदला जा सकता। आप एक अलग डिफ़ॉल्ट UoM का उपयोग करने के लिए एक नया आइटम बनाने की आवश्यकता होगी।
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,आप पहले से ही एक और UoM के साथ कुछ लेन-देन (एस) बना दिया है क्योंकि मद के लिए माप की मूलभूत इकाई {0} सीधे नहीं बदला जा सकता। आप एक अलग डिफ़ॉल्ट UoM का उपयोग करने के लिए एक नया आइटम बनाने की आवश्यकता होगी।
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,आवंटित राशि ऋणात्मक नहीं हो सकता
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,कृपया कंपनी सेट करें
 DocType: Purchase Order Item,Billed Amt,बिल भेजा राशि
@@ -702,6 +715,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,चयन भुगतान खाता बैंक एंट्री बनाने के लिए
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","पत्ते, व्यय का दावा है और पेरोल प्रबंधन करने के लिए कर्मचारी रिकॉर्ड बनाएं"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,प्रिस्क्रिप्शन अवधि
+DocType: Restaurant Reservation,Restaurant Reservation,रेस्तरां आरक्षण
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,प्रस्ताव लेखन
 DocType: Payment Entry Deduction,Payment Entry Deduction,भुगतान एंट्री कटौती
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,एक और बिक्री व्यक्ति {0} एक ही कर्मचारी आईडी के साथ मौजूद है
@@ -709,7 +723,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,स्नातकोत्तर
 DocType: Assessment Plan,Maximum Assessment Score,अधिकतम स्कोर आकलन
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,अद्यतन बैंक लेनदेन की तिथियां
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,समय ट्रैकिंग
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,समय ट्रैकिंग
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,परिवहन के लिए डुप्लिकेट
 DocType: Fiscal Year Company,Fiscal Year Company,वित्त वर्ष कंपनी
 DocType: Packing Slip Item,DN Detail,डी.एन. विस्तार
@@ -717,8 +731,9 @@
 DocType: Timesheet,Billed,का बिल
 DocType: Batch,Batch Description,बैच विवरण
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,छात्र समूह बनाना
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","भुगतान गेटवे खाता नहीं बनाया है, एक मैन्युअल का सृजन करें।"
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","भुगतान गेटवे खाता नहीं बनाया है, एक मैन्युअल का सृजन करें।"
 DocType: Supplier Scorecard,Per Year,प्रति वर्ष
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,डीओबी के अनुसार इस कार्यक्रम में प्रवेश के लिए पात्र नहीं हैं
 DocType: Sales Invoice,Sales Taxes and Charges,बिक्री कर और शुल्क
 DocType: Employee,Organization Profile,संगठन प्रोफाइल
 DocType: Vital Signs,Height (In Meter),ऊंचाई (मीटर में)
@@ -754,7 +769,7 @@
 DocType: Student Batch Name,Batch Name,बैच का नाम
 DocType: Fee Validity,Max number of visit,विज़िट की अधिकतम संख्या
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet बनाया:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},भुगतान की विधि में डिफ़ॉल्ट नकद या बैंक खाता सेट करें {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},भुगतान की विधि में डिफ़ॉल्ट नकद या बैंक खाता सेट करें {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,भर्ती
 DocType: GST Settings,GST Settings,जीएसटी सेटिंग्स
 DocType: Selling Settings,Customer Naming By,द्वारा नामकरण ग्राहक
@@ -786,15 +801,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,उतरा लागत करों और शुल्कों
 DocType: Production Order Operation,Actual Start Time,वास्तविक प्रारंभ समय
 DocType: BOM Operation,Operation Time,संचालन समय
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,समाप्त
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,समाप्त
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,आधार
 DocType: Timesheet,Total Billed Hours,कुल बिल घंटे
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,बंद राशि लिखें
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,बंद राशि लिखें
 DocType: Leave Block List Allow,Allow User,उपयोगकर्ता की अनुमति
 DocType: Journal Entry,Bill No,विधेयक नहीं
 DocType: Company,Gain/Loss Account on Asset Disposal,एसेट निपटान पर लाभ / हानि खाता
 DocType: Vehicle Log,Service Details,सेवा विवरण
-DocType: Purchase Invoice,Quarterly,त्रैमासिक
+DocType: Subscription,Quarterly,त्रैमासिक
 DocType: Lab Test Template,Grouped,समूहीकृत
 DocType: Selling Settings,Delivery Note Required,डिलिवरी नोट आवश्यक
 DocType: Bank Guarantee,Bank Guarantee Number,बैंक गारंटी संख्या
@@ -803,12 +818,12 @@
 DocType: Student Attendance,Student Attendance,छात्र उपस्थिति
 DocType: Sales Invoice Timesheet,Time Sheet,समय पत्र
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush आधारित कच्चे माल पर
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,आइटम विवरण दर्ज करें
 DocType: Interest,Interest,ब्याज
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,बेचने से पहले
 DocType: Purchase Receipt,Other Details,अन्य विवरण
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Lab Test,Test Template,टेस्ट टेम्प्लेट
+DocType: Restaurant Order Entry Item,Served,सेवित
 DocType: Account,Accounts,लेखा
 DocType: Vehicle,Odometer Value (Last),ओडोमीटर मूल्य (अंतिम)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,आपूर्तिकर्ता स्कोरकार्ड मानदंड के टेम्पलेट्स
@@ -820,25 +835,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,पूर्वावलोकन वेतन पर्ची
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,खाता {0} कई बार दर्ज किया गया है
 DocType: Account,Expenses Included In Valuation,व्यय मूल्यांकन में शामिल
-DocType: Hub Settings,Seller City,विक्रेता सिटी
 ,Absent Student Report,अनुपस्थित छात्र की रिपोर्ट
 DocType: Email Digest,Next email will be sent on:,अगले ईमेल पर भेजा जाएगा:
 DocType: Offer Letter Term,Offer Letter Term,पत्र टर्म प्रस्ताव
 DocType: Supplier Scorecard,Per Week,प्रति सप्ताह
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,आइटम वेरिएंट है।
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,आइटम वेरिएंट है।
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,कुल छात्र
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,आइटम {0} नहीं मिला
 DocType: Bin,Stock Value,शेयर मूल्य
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,शुल्क रिकॉर्ड पृष्ठभूमि में बनाया जाएगा। किसी भी त्रुटि के मामले में त्रुटि संदेश अनुसूची में अपडेट किया जाएगा।
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,कंपनी {0} मौजूद नहीं है
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} के पास शुल्क वैधता है {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} के पास शुल्क वैधता है {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,पेड़ के प्रकार
 DocType: BOM Explosion Item,Qty Consumed Per Unit,मात्रा रूपये प्रति यूनिट की खपत
 DocType: Serial No,Warranty Expiry Date,वारंटी समाप्ति तिथि
 DocType: Material Request Item,Quantity and Warehouse,मात्रा और वेयरहाउस
+DocType: Hub Settings,Unregister,अपंजीकृत
 DocType: Sales Invoice,Commission Rate (%),आयोग दर (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,कृपया कार्यक्रम चुनें
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,कृपया कार्यक्रम चुनें
 DocType: Project,Estimated Cost,अनुमानित लागत
 DocType: Purchase Order,Link to material requests,सामग्री अनुरोध करने के लिए लिंक
+DocType: Hub Settings,Publish,प्रकाशित करना
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,एयरोस्पेस
 DocType: Journal Entry,Credit Card Entry,क्रेडिट कार्ड एंट्री
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,कंपनी एवं लेखा
@@ -849,13 +866,12 @@
 DocType: Selling Settings,Close Opportunity After Days,बंद के मौके दिनों के बाद
 ,Reserved,आरक्षित
 DocType: Purchase Order,Supply Raw Materials,कच्चे माल की आपूर्ति
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"अगले चालान उत्पन्न हो जाएगा, जिस पर तारीख। इसे प्रस्तुत पर उत्पन्न होता है।"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,वर्तमान संपत्तियाँ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} भंडार वस्तु नहीं है
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',कृपया &#39;प्रशिक्षण फ़ीडबैक&#39; पर क्लिक करके और फिर &#39;नया&#39;
 DocType: Mode of Payment Account,Default Account,डिफ़ॉल्ट खाता
 DocType: Payment Entry,Received Amount (Company Currency),प्राप्त राशि (कंपनी मुद्रा)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,"अवसर नेतृत्व से किया जाता है , तो लीड सेट किया जाना चाहिए"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,"अवसर नेतृत्व से किया जाता है , तो लीड सेट किया जाना चाहिए"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,साप्ताहिक छुट्टी के दिन का चयन करें
 DocType: Patient,O Negative,हे नकारात्मक
 DocType: Production Order Operation,Planned End Time,नियोजित समाप्ति समय
@@ -871,10 +887,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,ऊर्जा
 DocType: Opportunity,Opportunity From,अवसर से
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,मासिक वेतन बयान.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,कंपनी जोड़ें
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,पंक्ति {0}: {1} आइटम {2} के लिए आवश्यक सीरियल नंबर आपने {3} प्रदान किया है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,पंक्ति {0}: {1} आइटम {2} के लिए आवश्यक सीरियल नंबर आपने {3} प्रदान किया है
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,कृपया एक तालिका चुनें
 DocType: BOM,Website Specifications,वेबसाइट निर्दिष्टीकरण
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} &#39;प्राप्तकर्ता&#39; में एक अमान्य ईमेल पता है
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} &#39;प्राप्तकर्ता&#39; में एक अमान्य ईमेल पता है
 DocType: Special Test Items,Particulars,विवरण
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,एंटीबायोटिक।
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: {0} प्रकार की {1}
@@ -882,11 +898,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,पंक्ति {0}: रूपांतरण कारक अनिवार्य है
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","एकाधिक मूल्य नियम एक ही मापदंड के साथ मौजूद है, प्राथमिकता बताए द्वारा संघर्ष का समाधान करें। मूल्य नियम: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,BOM निष्क्रिय या रद्द नहीं कर सकते क्योंकि यह अन्य BOMs के साथ जुड़ा हुवा है
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,BOM निष्क्रिय या रद्द नहीं कर सकते क्योंकि यह अन्य BOMs के साथ जुड़ा हुवा है
 DocType: Opportunity,Maintenance,रखरखाव
 DocType: Item Attribute Value,Item Attribute Value,आइटम विशेषता मान
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,बिक्री अभियान .
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Timesheet बनाओ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Timesheet बनाओ
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -943,12 +959,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,पहले आइटम दर्ज करें
 DocType: Account,Liability,दायित्व
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,स्वीकृत राशि पंक्ति में दावा राशि से अधिक नहीं हो सकता है {0}।
+DocType: Salary Detail,Do not include in total,कुल में शामिल न करें
 DocType: Company,Default Cost of Goods Sold Account,माल बेच खाते की डिफ़ॉल्ट लागत
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,मूल्य सूची चयनित नहीं
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,मूल्य सूची चयनित नहीं
 DocType: Employee,Family Background,पारिवारिक पृष्ठभूमि
 DocType: Request for Quotation Supplier,Send Email,ईमेल भेजें
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},चेतावनी: अमान्य अनुलग्नक {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,अनुमति नहीं है
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},चेतावनी: अमान्य अनुलग्नक {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,अनुमति नहीं है
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,उद्धरण अनुरोध
 DocType: Vital Signs,Heart Rate / Pulse,हार्ट रेट / पल्स
 DocType: Company,Default Bank Account,डिफ़ॉल्ट बैंक खाता
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","पार्टी के आधार पर फिल्टर करने के लिए, का चयन पार्टी पहले प्रकार"
@@ -975,12 +993,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,आइटम पंक्ति {IDX}: {doctype} {} DOCNAME ऊपर में मौजूद नहीं है &#39;{} doctype&#39; तालिका
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} पहले ही पूरा या रद्द कर दिया है
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,कोई कार्य
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ऑटो चालान 05, 28 आदि जैसे उत्पन्न हो जाएगा, जिस पर इस महीने के दिन"
 DocType: Item Variant Settings,Copy Fields to Variant,फ़ील्ड्स को वेरिएंट कॉपी करें
 DocType: Asset,Opening Accumulated Depreciation,खुलने संचित मूल्यह्रास
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,स्कोर से कम या 5 के बराबर होना चाहिए
 DocType: Program Enrollment Tool,Program Enrollment Tool,कार्यक्रम नामांकन उपकरण
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,सी फार्म रिकॉर्ड
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,सी फार्म रिकॉर्ड
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,ग्राहक और आपूर्तिकर्ता
 DocType: Email Digest,Email Digest Settings,ईमेल डाइजेस्ट सेटिंग
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,आपके व्यापार के लिए धन्यवाद!
@@ -998,13 +1015,13 @@
 DocType: Request for Quotation Supplier,Quote Status,उद्धरण स्थिति
 DocType: Maintenance Visit,Completion Status,समापन स्थिति
 DocType: HR Settings,Enter retirement age in years,साल में सेवानिवृत्ति की आयु दर्ज
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,लक्ष्य वेअरहाउस
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,कृपया एक गोदाम का चयन करें
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,लक्ष्य वेअरहाउस
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,कृपया एक गोदाम का चयन करें
 DocType: Cheque Print Template,Starting location from left edge,बाएँ किनारे से शुरू स्थान
 DocType: Item,Allow over delivery or receipt upto this percent,इस प्रतिशत तक प्रसव या रसीद से अधिक की अनुमति दें
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,आयात उपस्थिति
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,सभी आइटम समूहों
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,सभी आइटम समूहों
 DocType: Process Payroll,Activity Log,गतिविधि लॉग
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,शुद्ध लाभ / हानि
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,स्वचालित रूप से लेनदेन के प्रस्तुत करने पर संदेश लिखें .
@@ -1016,7 +1033,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,अनुमानित मात्रा
 DocType: Sales Invoice,Payment Due Date,भुगतान की नियत तिथि
 DocType: Drug Prescription,Interval UOM,अंतराल UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,मद संस्करण {0} पहले से ही एक ही गुण के साथ मौजूद है
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,मद संस्करण {0} पहले से ही एक ही गुण के साथ मौजूद है
+DocType: Item,Hub Publishing Details,हब प्रकाशन विवरण
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;उद्घाटन&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,क्या करने के लिए ओपन
 DocType: Notification Control,Delivery Note Message,डिलिवरी नोट संदेश
@@ -1036,10 +1054,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: कच्चा माल मुख्य आइटम के समान नहीं हो सकता
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,खरीद रसीद आइटम तालिका में कुल लागू शुल्कों के कुल करों और शुल्कों के रूप में ही होना चाहिए
 DocType: Sales Team,Incentives,प्रोत्साहन
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,हब के लिए पंजीकरण करें
 DocType: SMS Log,Requested Numbers,अनुरोधित नंबर
 DocType: Production Planning Tool,Only Obtain Raw Materials,केवल प्राप्त कच्चे माल
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,प्रदर्शन मूल्यांकन.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","सक्षम करने से, &#39;शॉपिंग कार्ट के लिए उपयोग करें&#39; खरीदारी की टोकरी के रूप में सक्षम है और शॉपिंग कार्ट के लिए कम से कम एक कर नियम होना चाहिए"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","सक्षम करने से, &#39;शॉपिंग कार्ट के लिए उपयोग करें&#39; खरीदारी की टोकरी के रूप में सक्षम है और शॉपिंग कार्ट के लिए कम से कम एक कर नियम होना चाहिए"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","भुगतान एंट्री {0} {1} आदेश, जाँच करता है, तो यह इस चालान में अग्रिम के रूप में निकाला जाना चाहिए खिलाफ जुड़ा हुआ है।"
 DocType: Sales Invoice Item,Stock Details,स्टॉक विवरण
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,परियोजना मूल्य
@@ -1058,12 +1077,14 @@
 DocType: Salary Slip,Working Days,कार्यकारी दिनों
 DocType: Serial No,Incoming Rate,आवक दर
 DocType: Packing Slip,Gross Weight,सकल भार
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,"आप इस प्रणाली स्थापित कर रहे हैं , जिसके लिए आपकी कंपनी का नाम ."
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,हब सक्षम करें
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,"आप इस प्रणाली स्थापित कर रहे हैं , जिसके लिए आपकी कंपनी का नाम ."
 DocType: HR Settings,Include holidays in Total no. of Working Days,कुल संख्या में छुट्टियों को शामिल करें. कार्य दिवस की
 DocType: Job Applicant,Hold,पकड़
 DocType: Employee,Date of Joining,शामिल होने की तिथि
 DocType: Naming Series,Update Series,अद्यतन श्रृंखला
 DocType: Supplier Quotation,Is Subcontracted,क्या subcontracted
+DocType: Restaurant Table,Minimum Seating,न्यूनतम बैठने
 DocType: Item Attribute,Item Attribute Values,आइटम विशेषता मान
 DocType: Examination Result,Examination Result,परीक्षा परिणाम
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,रसीद खरीद
@@ -1074,13 +1095,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},ऑपरेशन के लिए अगले {0} दिनों में टाइम स्लॉट पाने में असमर्थ {1}
 DocType: Production Order,Plan material for sub-assemblies,उप असेंबलियों के लिए योजना सामग्री
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,बिक्री भागीदारों और टेरिटरी
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,बीओएम {0} सक्रिय होना चाहिए
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,बीओएम {0} सक्रिय होना चाहिए
 DocType: Journal Entry,Depreciation Entry,मूल्यह्रास एंट्री
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,पहला दस्तावेज़ प्रकार का चयन करें
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,इस रखरखाव भेंट रद्द करने से पहले सामग्री का दौरा {0} रद्द
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},धारावाहिक नहीं {0} मद से संबंधित नहीं है {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,आवश्यक मात्रा
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,मौजूदा लेनदेन के साथ गोदामों खाता बही में परिवर्तित नहीं किया जा सकता है।
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,मौजूदा लेनदेन के साथ गोदामों खाता बही में परिवर्तित नहीं किया जा सकता है।
 DocType: Bank Reconciliation,Total Amount,कुल राशि
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,इंटरनेट प्रकाशन
 DocType: Prescription Duration,Number,संख्या
@@ -1091,7 +1112,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,बिक्री मूल्य सूची
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","यदि चेक किया गया, तो एक ग्राहक बनाया जाएगा, रोगी को मैप किया जाएगा। इस ग्राहक के खिलाफ रोगी चालान बनाया जाएगा। आप पेशेंट बनाते समय मौजूदा ग्राहक का चयन भी कर सकते हैं"
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,आइटम सिंक करने के लिए प्रकाशित करें
 DocType: Bank Reconciliation,Account Currency,खाता मुद्रा
 DocType: Lab Test,Sample ID,नमूना आईडी
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,कंपनी में गोल ऑफ़ खाते का उल्लेख करें
@@ -1100,11 +1120,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,कर्मचारी {0} सक्रिय नहीं है या मौजूद नहीं है
 DocType: Fee Structure,Components,अवयव
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},मद में दर्ज करें परिसंपत्ति वर्ग {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,आइटम वेरिएंट {0} अद्यतन
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,आइटम वेरिएंट {0} अद्यतन
 DocType: Quality Inspection Reading,Reading 6,6 पढ़ना
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,नहीं {0} {1} {2} के बिना किसी भी नकारात्मक बकाया चालान कर सकते हैं
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","उत्पन्न होना। यदि देरी हो गई है, तो आपको मैन्युअल रूप से इस &quot;महीने के दोहराना&quot; फ़ील्ड को मैन्युअल रूप से बदलना होगा"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,नहीं {0} {1} {2} के बिना किसी भी नकारात्मक बकाया चालान कर सकते हैं
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,चालान अग्रिम खरीद
-DocType: Hub Settings,Sync Now,अभी सिंक करें
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},पंक्ति {0}: {1} क्रेडिट प्रविष्टि के साथ नहीं जोड़ा जा सकता है
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,एक वित्तीय वर्ष के लिए बजट को परिभाषित करें।
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,डिफ़ॉल्ट खाता / बैंक कैश स्वतः स्थिति चालान में अद्यतन किया जाएगा जब इस मोड का चयन किया जाता है.
@@ -1116,13 +1137,13 @@
 DocType: Item,Is Purchase Item,खरीद आइटम है
 DocType: Asset,Purchase Invoice,चालान खरीद
 DocType: Stock Ledger Entry,Voucher Detail No,वाउचर विस्तार नहीं
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,नई बिक्री चालान
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,नई बिक्री चालान
 DocType: Stock Entry,Total Outgoing Value,कुल निवर्तमान मूल्य
 DocType: Physician,Appointments,नियुक्ति
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,दिनांक और अंतिम तिथि खुलने एक ही वित्तीय वर्ष के भीतर होना चाहिए
 DocType: Lead,Request for Information,सूचना के लिए अनुरोध
 ,LeaderBoard,लीडरबोर्ड
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,सिंक ऑफलाइन चालान
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,सिंक ऑफलाइन चालान
 DocType: Payment Request,Paid,भुगतान किया
 DocType: Program Fee,Program Fee,कार्यक्रम का शुल्क
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1141,11 +1162,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,खरीद आदेश आइटम
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,अप्रत्यक्ष आय
 DocType: Student Attendance Tool,Student Attendance Tool,छात्र उपस्थिति उपकरण
+DocType: Restaurant Menu,Price List (Auto created),मूल्य सूची (ऑटो बनाया)
 DocType: Cheque Print Template,Date Settings,दिनांक सेटिंग
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,झगड़ा
 ,Company Name,कंपनी का नाम
 DocType: SMS Center,Total Message(s),कुल संदेश (ओं )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,स्थानांतरण के लिए आइटम का चयन करें
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,स्थानांतरण के लिए आइटम का चयन करें
 DocType: Purchase Invoice,Additional Discount Percentage,अतिरिक्त छूट प्रतिशत
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,सभी की मदद वीडियो की एक सूची देखें
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,बैंक के खाते में जहां चेक जमा किया गया था सिर का चयन करें.
@@ -1162,6 +1184,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,मीटर
 DocType: Workstation,Electricity Cost,बिजली की लागत
 DocType: HR Settings,Don't send Employee Birthday Reminders,कर्मचारी जन्मदिन अनुस्मारक न भेजें
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,समायोजन बचाओ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,अनुरोधित उत्पाद
 DocType: Item,Inspection Criteria,निरीक्षण मानदंड
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,तबादला
 DocType: BOM Website Item,BOM Website Item,बीओएम वेबसाइट मद
@@ -1178,11 +1202,11 @@
 DocType: Journal Entry,Total Amount in Words,शब्दों में कुल राशि
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,कोई त्रुटि हुई थी . एक संभावित कारण यह है कि आप प्रपत्र को बचाया नहीं किया है कि हो सकता है. यदि समस्या बनी रहती support@erpnext.com से संपर्क करें.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,मेरी गाड़ी
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},आदेश प्रकार का होना चाहिए {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},आदेश प्रकार का होना चाहिए {0}
 DocType: Lead,Next Contact Date,अगले संपर्क तिथि
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,खुलने मात्रा
 DocType: Healthcare Settings,Appointment Reminder,नियुक्ति अनुस्मारक
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,राशि परिवर्तन के लिए खाता दर्ज करें
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,राशि परिवर्तन के लिए खाता दर्ज करें
 DocType: Student Batch Name,Student Batch Name,छात्र बैच नाम
 DocType: Consultation,Doctor,चिकित्सक
 DocType: Holiday List,Holiday List Name,अवकाश सूची नाम
@@ -1190,12 +1214,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,अनुसूची कोर्स
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,पूँजी विकल्प
 DocType: Journal Entry Account,Expense Claim,व्यय दावा
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,आप वास्तव में इस संपत्ति को खत्म कर दिया बहाल करने के लिए करना चाहते हैं?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},के लिए मात्रा {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,आप वास्तव में इस संपत्ति को खत्म कर दिया बहाल करने के लिए करना चाहते हैं?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},के लिए मात्रा {0}
 DocType: Leave Application,Leave Application,छुट्टी की अर्ज़ी
 DocType: Patient,Patient Relation,रोगी संबंध
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,आबंटन उपकरण छोड़ दो
+DocType: Item,Hub Category to Publish,हब श्रेणी प्रकाशित करने के लिए
 DocType: Leave Block List,Leave Block List Dates,ब्लॉक सूची तिथियां छोड़ो
+DocType: Sales Invoice,Billing Address GSTIN,बिलिंग पता GSTIN
 DocType: Workstation,Net Hour Rate,नेट घंटे की दर
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,आयातित माल की लागत खरीद रसीद
 DocType: Company,Default Terms,डिफ़ॉल्ट शर्तें
@@ -1205,18 +1231,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},कृपया बताएं कि एक {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,मात्रा या मूल्य में कोई परिवर्तन से हटाया आइटम नहीं है।
 DocType: Delivery Note,Delivery To,करने के लिए डिलिवरी
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,गुण तालिका अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,गुण तालिका अनिवार्य है
 DocType: Production Planning Tool,Get Sales Orders,विक्रय आदेश
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ऋणात्मक नहीं हो सकता
 DocType: Training Event,Self-Study,स्वयं अध्ययन
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,छूट
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,छूट
 DocType: Asset,Total Number of Depreciations,कुल depreciations की संख्या
 DocType: Sales Invoice Item,Rate With Margin,मार्जिन के साथ दर
 DocType: Workstation,Wages,वेतन
 DocType: Task,Urgent,अत्यावश्यक
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},तालिका में पंक्ति {0} के लिए एक वैध पंक्ति आईडी निर्दिष्ट करें {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,वेरिएबल खोजने में असमर्थ:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,नमपैड से संपादित करने के लिए कृपया कोई फ़ील्ड चुनें
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,नमपैड से संपादित करने के लिए कृपया कोई फ़ील्ड चुनें
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,डेस्कटॉप के लिए जाना और ERPNext का उपयोग शुरू
 DocType: Item,Manufacturer,निर्माता
 DocType: Landed Cost Item,Purchase Receipt Item,रसीद आइटम खरीद
@@ -1247,8 +1273,8 @@
 DocType: GL Entry,Against,के खिलाफ
 DocType: Item,Default Selling Cost Center,डिफ़ॉल्ट बिक्री लागत केंद्र
 DocType: Sales Partner,Implementation Partner,कार्यान्वयन साथी
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,पिन कोड
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},बिक्री आदेश {0} है {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,पिन कोड
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},बिक्री आदेश {0} है {1}
 DocType: Opportunity,Contact Info,संपर्क जानकारी
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,स्टॉक प्रविष्टियां बनाना
 DocType: Packing Slip,Net Weight UOM,नेट वजन UOM
@@ -1259,6 +1285,7 @@
 DocType: Holiday List,Get Weekly Off Dates,साप्ताहिक ऑफ तिथियां
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,समाप्ति तिथि आरंभ तिथि से कम नहीं हो सकता
 DocType: Sales Person,Select company name first.,कंपनी 1 नाम का चयन करें.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,नीचे से ऊपर तक
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,कोटेशन आपूर्तिकर्ता से प्राप्त किया.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,बीओएम को बदलें और सभी बीओएम में नवीनतम मूल्य अपडेट करें
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},{0} | {1} {2}
@@ -1277,7 +1304,7 @@
 DocType: Program Enrollment,Transportation,परिवहन
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,अमान्य विशेषता
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} प्रस्तुत किया जाना चाहिए
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},मात्रा से कम या बराबर होना चाहिए {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},मात्रा से कम या बराबर होना चाहिए {0}
 DocType: SMS Center,Total Characters,कुल वर्ण
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},आइटम के लिए बीओएम क्षेत्र में बीओएम चयन करें {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,सी - फार्म के चालान विस्तार
@@ -1292,7 +1319,7 @@
 ,Ordered Items To Be Billed,हिसाब से बिलिंग किए आइटम
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,सीमा कम हो गया है से की तुलना में श्रृंखला के लिए
 DocType: Global Defaults,Global Defaults,वैश्विक मूलभूत
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,परियोजना सहयोग निमंत्रण
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,परियोजना सहयोग निमंत्रण
 DocType: Salary Slip,Deductions,कटौती
 DocType: Leave Allocation,LAL/,लाल /
 DocType: Setup Progress Action,Action Name,क्रिया का नाम
@@ -1310,13 +1337,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,बिक्री चालान अग्रिम
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,अनुरोध करने के लिए कुछ भी नहीं
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},एक और बजट रिकार्ड &#39;{0}&#39; पहले से ही मौजूद है के खिलाफ {1} &#39;{2}&#39; वित्त वर्ष के लिए {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',' वास्तविक प्रारंभ दिनांक ' वास्तविक अंत तिथि ' से बड़ा नहीं हो सकता
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',' वास्तविक प्रारंभ दिनांक ' वास्तविक अंत तिथि ' से बड़ा नहीं हो सकता
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,प्रबंधन
 DocType: Cheque Print Template,Payer Settings,भुगतानकर्ता सेटिंग
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","इस प्रकार के आइटम कोड के साथ संलग्न किया जाएगा। अपने संक्षिप्त नाम ""एसएम"", और अगर उदाहरण के लिए, मद कोड ""टी शर्ट"", ""टी-शर्ट एस.एम."" हो जाएगा संस्करण के मद कोड है"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,एक बार जब आप को वेतन पर्ची सहेजे शुद्ध वेतन (शब्दों) में दिखाई जाएगी।
 DocType: Purchase Invoice,Is Return,वापसी है
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,सावधान
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,सावधान
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,वापसी / डेबिट नोट
 DocType: Price List Country,Price List Country,मूल्य सूची देश
 DocType: Item,UOMs,UOMs
@@ -1331,17 +1358,18 @@
 DocType: Account,Balance Sheet,बैलेंस शीट
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ','आइटम कोड के साथ आइटम के लिए केंद्र का खर्च
 DocType: Fee Validity,Valid Till,तक मान्य है
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","भुगतान मोड कॉन्फ़िगर नहीं है। कृपया चेक, चाहे खाता भुगतान के मोड पर या पीओएस प्रोफाइल पर स्थापित किया गया है।"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","भुगतान मोड कॉन्फ़िगर नहीं है। कृपया चेक, चाहे खाता भुगतान के मोड पर या पीओएस प्रोफाइल पर स्थापित किया गया है।"
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,एक ही मद कई बार दर्ज नहीं किया जा सकता है।
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","इसके अलावा खातों समूह के तहत बनाया जा सकता है, लेकिन प्रविष्टियों गैर समूहों के खिलाफ बनाया जा सकता है"
 DocType: Lead,Lead,नेतृत्व
 DocType: Email Digest,Payables,देय
 DocType: Course,Course Intro,कोर्स पहचान
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,स्टॉक एंट्री {0} बनाया
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; नंबरिंग सीरिज के माध्यम से उपस्थिति के लिए श्रृंखलाबद्ध संख्या सेट करना
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,स्टॉक एंट्री {0} बनाया
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,पंक्ति # {0}: मात्रा क्रय वापसी में दर्ज नहीं किया जा सकता अस्वीकृत
 ,Purchase Order Items To Be Billed,बिल के लिए खरीद आदेश आइटम
 DocType: Purchase Invoice Item,Net Rate,असल दर
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,कृपया एक ग्राहक का चयन करें
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,कृपया एक ग्राहक का चयन करें
 DocType: Purchase Invoice Item,Purchase Invoice Item,चालान आइटम खरीद
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,स्टॉक लेजर प्रविष्टियां और जीएल प्रविष्टियां चयनित खरीद प्राप्ति के लिए पोस्ट कर रहे हैं
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,वस्तु 1
@@ -1360,7 +1388,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},डुप्लिकेट पंक्ति {0} के साथ एक ही {1}
 ,Trial Balance,शेष - परीक्षण
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,वित्त वर्ष {0} नहीं मिला
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,कर्मचारी की स्थापना
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,कर्मचारी की स्थापना
 DocType: Sales Order,SO-,इसलिए-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,पहले उपसर्ग का चयन करें
 DocType: Employee,O-,हे
@@ -1372,12 +1400,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,देखें खाता बही
 DocType: Grading Scale,Intervals,अंतराल
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,शीघ्रातिशीघ्र
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","एक आइटम समूह में एक ही नाम के साथ मौजूद है , वस्तु का नाम बदलने के लिए या आइटम समूह का नाम बदलने के लिए कृपया"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","एक आइटम समूह में एक ही नाम के साथ मौजूद है , वस्तु का नाम बदलने के लिए या आइटम समूह का नाम बदलने के लिए कृपया"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,छात्र मोबाइल नंबर
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,शेष विश्व
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,शेष विश्व
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,आइटम {0} बैच नहीं हो सकता
 ,Budget Variance Report,बजट विचरण रिपोर्ट
 DocType: Salary Slip,Gross Pay,सकल वेतन
+DocType: Item,Is Item from Hub,हब से मद है
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,पंक्ति {0}: गतिविधि प्रकार अनिवार्य है।
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,सूद अदा किया
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,लेखा बही
@@ -1387,8 +1416,9 @@
 DocType: Vehicle Log,Service Detail,सेवा विस्तार
 DocType: BOM,Item Description,आइटम विवरण
 DocType: Student Sibling,Student Sibling,छात्र सहोदर
-DocType: Purchase Invoice,Is Recurring,आवर्ती है
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,भुगतान का प्रकार
 DocType: Purchase Invoice,Supplied Items,आपूर्ति आइटम
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},रेस्तरां {0} के लिए एक सक्रिय मेनू सेट करें
 DocType: Student,STUD.,स्टड।
 DocType: Production Order,Qty To Manufacture,विनिर्माण मात्रा
 DocType: Email Digest,New Income,नई आय
@@ -1398,6 +1428,7 @@
 ,Student and Guardian Contact Details,छात्र और गार्जियन संपर्क विवरण
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,पंक्ति {0}: आपूर्तिकर्ता {0} के ईमेल पते को ईमेल भेजने के लिए आवश्यक है
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,अस्थाई उद्घाटन
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,देखें हब
 ,Employee Leave Balance,कर्मचारी लीव बैलेंस
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},{0} हमेशा होना चाहिए खाता के लिए शेष {1}
 DocType: Patient Appointment,More Info,अधिक जानकारी
@@ -1417,13 +1448,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,बिक्री आदेश {0} मान्य नहीं है
 DocType: Supplier Scorecard,Warn for new Request for Quotations,कोटेशन के लिए नए अनुरोध के लिए चेतावनी दें
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,खरीद आदेश आप की योजना में मदद मिलेगी और अपनी खरीद पर का पालन करें
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","क्षमा करें, कंपनियों का विलय कर दिया नहीं किया जा सकता"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","क्षमा करें, कंपनियों का विलय कर दिया नहीं किया जा सकता"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,लैब टेस्ट प्रिस्क्रिप्शन
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",कुल अंक / स्थानांतरण मात्रा {0} सामग्री अनुरोध में {1} \ मद के लिए अनुरोध मात्रा {2} से बड़ा नहीं हो सकता है {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,छोटा
 DocType: Employee,Employee Number,कर्मचारियों की संख्या
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},प्रकरण नहीं ( ओं) पहले से ही उपयोग में . प्रकरण नहीं से try {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},प्रकरण नहीं ( ओं) पहले से ही उपयोग में . प्रकरण नहीं से try {0}
 DocType: Project,% Completed,% पूर्ण
 ,Invoiced Amount (Exculsive Tax),चालान राशि ( Exculsive टैक्स )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,आइटम 2
@@ -1438,11 +1469,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,अप्रत्यक्ष व्यय
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,पंक्ति {0}: मात्रा अनिवार्य है
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,कृषि
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,सिंक मास्टर डाटा
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,सिंक मास्टर डाटा
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,अपने उत्पादों या सेवाओं
 DocType: Special Test Items,Special Test Items,विशेष टेस्ट आइटम
 DocType: Mode of Payment,Mode of Payment,भुगतान की रीति
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,वेबसाइट छवि एक सार्वजनिक फ़ाइल या वेबसाइट URL होना चाहिए
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,वेबसाइट छवि एक सार्वजनिक फ़ाइल या वेबसाइट URL होना चाहिए
 DocType: Student Applicant,AP,एपी
 DocType: Purchase Invoice Item,BOM,बीओएम
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,यह एक रूट आइटम समूह है और संपादित नहीं किया जा सकता है .
@@ -1450,24 +1481,23 @@
 DocType: Vehicle,Fuel UOM,ईंधन यू ओ एम
 DocType: Warehouse,Warehouse Contact Info,वेयरहाउस संपर्क जानकारी
 DocType: Payment Entry,Write Off Difference Amount,बंद लिखें अंतर राशि
-DocType: Purchase Invoice,Recurring Type,आवर्ती प्रकार
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: कर्मचारी ईमेल नहीं मिला है, इसलिए नहीं भेजा गया ईमेल"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: कर्मचारी ईमेल नहीं मिला है, इसलिए नहीं भेजा गया ईमेल"
 DocType: Item,Foreign Trade Details,विदेश व्यापार विवरण
+,Assessment Plan Status,आकलन योजना स्थिति
 DocType: Email Digest,Annual Income,वार्षिक आय
 DocType: Serial No,Serial No Details,धारावाहिक नहीं विवरण
 DocType: Purchase Invoice Item,Item Tax Rate,आइटम कर की दर
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,कृपया चिकित्सक और तिथि का चयन करें
 DocType: Student Group Student,Group Roll Number,समूह रोल संख्या
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, केवल ऋण खातों अन्य डेबिट प्रविष्टि के खिलाफ जोड़ा जा सकता है के लिए"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,सभी कार्य भार की कुल होना चाहिए 1. तदनुसार सभी परियोजना कार्यों के भार को समायोजित करें
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,सभी कार्य भार की कुल होना चाहिए 1. तदनुसार सभी परियोजना कार्यों के भार को समायोजित करें
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया गया है
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,आइटम {0} एक उप अनुबंधित आइटम होना चाहिए
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,राजधानी उपकरणों
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","मूल्य निर्धारण नियम पहला आइटम, आइटम समूह या ब्रांड हो सकता है, जो क्षेत्र 'पर लागू होते हैं' के आधार पर चुना जाता है."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,कृपया आइटम कोड पहले सेट करें
-DocType: Hub Settings,Seller Website,विक्रेता वेबसाइट
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,कृपया आइटम कोड पहले सेट करें
 DocType: Item,ITEM-,"आइटम,"
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,बिक्री टीम के लिए कुल आवंटित 100 प्रतिशत होना चाहिए
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,बिक्री टीम के लिए कुल आवंटित 100 प्रतिशत होना चाहिए
 DocType: Sales Invoice Item,Edit Description,संपादित करें] वर्णन
 DocType: Antibiotic,Antibiotic,एंटीबायोटिक दवाओं
 ,Team Updates,टीम अपडेट
@@ -1488,12 +1518,12 @@
 DocType: Purchase Invoice,Total (Company Currency),कुल (कंपनी मुद्रा)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,सीरियल नंबर {0} एक बार से अधिक दर्ज किया
 DocType: Depreciation Schedule,Journal Entry,जर्नल प्रविष्टि
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} प्रगति में आइटम
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} प्रगति में आइटम
 DocType: Workstation,Workstation Name,वर्कस्टेशन नाम
 DocType: Grading Scale Interval,Grade Code,ग्रेड कोड
 DocType: POS Item Group,POS Item Group,पीओएस मद समूह
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,डाइजेस्ट ईमेल:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},बीओएम {0} मद से संबंधित नहीं है {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},बीओएम {0} मद से संबंधित नहीं है {1}
 DocType: Sales Partner,Target Distribution,लक्ष्य वितरण
 DocType: Salary Slip,Bank Account No.,बैंक खाता नहीं
 DocType: Naming Series,This is the number of the last created transaction with this prefix,यह इस उपसर्ग के साथ पिछले बनाई गई लेन - देन की संख्या
@@ -1509,10 +1539,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,कोटेशन प्रदायक के लिए अनुरोध
 DocType: Healthcare Settings,Registration Message,पंजीकरण संदेश
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,हार्डवेयर
-DocType: Sales Order,Recurring Upto,आवर्ती तक
 DocType: Prescription Dosage,Prescription Dosage,प्रिस्क्रिप्शन डोज़
 DocType: Attendance,HR Manager,मानव संसाधन प्रबंधक
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,एक कंपनी का चयन करें
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,एक कंपनी का चयन करें
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,विशेषाधिकार छुट्टी
 DocType: Purchase Invoice,Supplier Invoice Date,प्रदायक चालान तिथि
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,प्रति
@@ -1528,10 +1557,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,बीच पाया ओवरलैपिंग की स्थिति :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,जर्नल के खिलाफ एंट्री {0} पहले से ही कुछ अन्य वाउचर के खिलाफ निकाला जाता है
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,कुल ऑर्डर मूल्य
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,भोजन
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,भोजन
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,बूढ़े रेंज 3
 DocType: Maintenance Schedule Item,No of Visits,यात्राओं की संख्या
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},रखरखाव अनुसूची {0} के खिलाफ मौजूद है {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,क्या आप अपने आइटम को हब पर प्रकाशित करना चाहते हैं?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,नामांकन छात्र
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},समापन खाते की मुद्रा होना चाहिए {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},सभी लक्ष्यों के लिए अंक का योग यह है 100. होना चाहिए {0}
@@ -1542,9 +1572,9 @@
 DocType: Authorization Rule,Average Discount,औसत छूट
 DocType: Purchase Invoice Item,UOM,यू ओ एम
 DocType: Rename Tool,Utilities,उपयोगिताएँ
-DocType: Purchase Invoice Item,Accounting,लेखांकन
+DocType: POS Profile,Accounting,लेखांकन
 DocType: Employee,EMP/,ईएमपी /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,बैच किए गए आइटम के लिए बैच चुनें
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,बैच किए गए आइटम के लिए बैच चुनें
 DocType: Asset,Depreciation Schedules,मूल्यह्रास कार्यक्रम
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,आवेदन की अवधि के बाहर छुट्टी के आवंटन की अवधि नहीं किया जा सकता
 DocType: Activity Cost,Projects,परियोजनाओं
@@ -1560,7 +1590,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',स्वीकृति स्थिति 'स्वीकृत' या ' अस्वीकृत ' होना चाहिए
 DocType: Physician,Contacts and Address,संपर्क और पता
 DocType: Purchase Invoice,Contact Person,संपर्क व्यक्ति
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',' उम्मीद प्रारंभ दिनांक ' 'की आशा की समाप्ति तिथि' से बड़ा नहीं हो सकता
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',' उम्मीद प्रारंभ दिनांक ' 'की आशा की समाप्ति तिथि' से बड़ा नहीं हो सकता
 DocType: Course Scheduling Tool,Course End Date,कोर्स समाप्ति तिथि
 DocType: Holiday List,Holidays,छुट्टियां
 DocType: Sales Order Item,Planned Quantity,नियोजित मात्रा
@@ -1568,10 +1598,11 @@
 DocType: Item,Maintain Stock,स्टॉक बनाए रखें
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,पहले से ही उत्पादन आदेश के लिए बनाया स्टॉक प्रविष्टियां
 DocType: Employee,Prefered Email,पसंद ईमेल
+DocType: Student Admission,Eligibility and Details,पात्रता और विवरण
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,निश्चित परिसंपत्ति में शुद्ध परिवर्तन
 DocType: Leave Control Panel,Leave blank if considered for all designations,रिक्त छोड़ अगर सभी पदनाम के लिए विचार
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार पंक्ति {0} में 'वास्तविक ' का प्रभार आइटम रेट में शामिल नहीं किया जा सकता
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},मैक्स: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},मैक्स: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Datetime से
 DocType: Email Digest,For Company,कंपनी के लिए
 apps/erpnext/erpnext/config/support.py +17,Communication log.,संचार लॉग इन करें.
@@ -1579,19 +1610,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,आपूर्तिकर्ता स्कोरकार्ड स्कोरिंग चर
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,राशि ख़रीदना
 DocType: Sales Invoice,Shipping Address Name,शिपिंग पता नाम
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,खातों का चार्ट
 DocType: Material Request,Terms and Conditions Content,नियम और शर्तें सामग्री
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,100 से अधिक नहीं हो सकता
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,आइटम {0} भंडार वस्तु नहीं है
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,आइटम {0} भंडार वस्तु नहीं है
 DocType: Maintenance Visit,Unscheduled,अनिर्धारित
 DocType: Employee,Owned,स्वामित्व
 DocType: Salary Detail,Depends on Leave Without Pay,बिना वेतन छुट्टी पर निर्भर करता है
 DocType: Pricing Rule,"Higher the number, higher the priority","उच्च संख्या, उच्च प्राथमिकता"
 ,Purchase Invoice Trends,चालान रुझान खरीद
 DocType: Employee,Better Prospects,बेहतर संभावनाओं
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","पंक्ति # {0}: बैच {1} में केवल {2} मात्रा है कृपया एक और बैच का चयन करें जिसमें {3} मात्रा उपलब्ध है या कई पंक्तियों में पंक्ति को विभाजित करने के लिए, कई बैचों से वितरित / जारी करने के लिए"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","पंक्ति # {0}: बैच {1} में केवल {2} मात्रा है कृपया एक और बैच का चयन करें जिसमें {3} मात्रा उपलब्ध है या कई पंक्तियों में पंक्ति को विभाजित करने के लिए, कई बैचों से वितरित / जारी करने के लिए"
 DocType: Vehicle,License Plate,लाइसेंस प्लेट
 DocType: Appraisal,Goals,लक्ष्य
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,पीओएस प्रोफ़ाइल का चयन करें
 DocType: Warranty Claim,Warranty / AMC Status,वारंटी / एएमसी स्थिति
 ,Accounts Browser,लेखा ब्राउज़र
 DocType: Payment Entry Reference,Payment Entry Reference,भुगतान एंट्री संदर्भ
@@ -1610,7 +1641,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,कर्मचारी खुद को रिपोर्ट नहीं कर सकते हैं।
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","खाता जमे हुए है , तो प्रविष्टियों प्रतिबंधित उपयोगकर्ताओं की अनुमति है."
 DocType: Email Digest,Bank Balance,बैंक में जमा राशि
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} केवल मुद्रा में बनाया जा सकता है: {0} के लिए लेखा प्रविष्टि {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} केवल मुद्रा में बनाया जा सकता है: {0} के लिए लेखा प्रविष्टि {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","आवश्यक काम प्रोफ़ाइल , योग्यता आदि"
 DocType: Journal Entry Account,Account Balance,खाते की शेष राशि
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,लेन-देन के लिए टैक्स नियम।
@@ -1619,8 +1650,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),कुल करों और शुल्कों (कंपनी मुद्रा)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,खुला हुआ वित्त वर्ष के पी एंड एल शेष राशि दिखाएँ
 DocType: Lab Test Template,Collection Details,संग्रह विवरण
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","cc.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date से tabConsultation ct, `tabLab प्रिस्क्रिप्शन` cp का चयन करें जहां ct.patient = &#39;{0}&#39; और cp.parent = ct। नाम और cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,नौवहन खाता
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: खाता {2} निष्क्रिय है
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,विक्रय आदेश आप अपने काम की योजना में मदद और समय पर वितरित करने के लिए सुनिश्चित करें
@@ -1637,7 +1666,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,पर्ची पैकिंग
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,कार्यालय का किराया
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,सेटअप एसएमएस के प्रवेश द्वार सेटिंग्स
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,आयात विफल!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,आयात विफल!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,कोई पता अभी तक जोड़ा।
 DocType: Workstation Working Hour,Workstation Working Hour,कार्य केंद्र घंटे काम
 DocType: Vital Signs,Blood Pressure,रक्त चाप
@@ -1662,7 +1691,7 @@
 DocType: Sales Invoice,Source,स्रोत
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,दिखाएँ बंद
 DocType: Leave Type,Is Leave Without Pay,बिना वेतन छुट्टी है
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,परिसंपत्ति वर्ग फिक्स्ड एसेट आइटम के लिए अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,परिसंपत्ति वर्ग फिक्स्ड एसेट आइटम के लिए अनिवार्य है
 DocType: Fee Validity,Fee Validity,शुल्क वैधता
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,भुगतान तालिका में कोई अभिलेख
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},यह {0} {1} के साथ संघर्ष के लिए {2} {3}
@@ -1683,8 +1712,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,कार्यकारी खोज
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,सुराग बनाने
 DocType: Maintenance Schedule,Schedules,अनुसूचियों
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,पॉस की बिक्री का उपयोग पॉइंट-ऑफ-सेल के लिए आवश्यक है
 DocType: Purchase Invoice Item,Net Amount,शुद्ध राशि
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} सबमिट नहीं किया गया है ताकि कार्रवाई पूरी नहीं की जा सके
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} जमा नहीं किया गया है अतः कार्रवाई पूरी नहीं की जा सकती
 DocType: Purchase Order Item Supplied,BOM Detail No,बीओएम विस्तार नहीं
 DocType: Landed Cost Voucher,Additional Charges,अतिरिक्त प्रभार
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),अतिरिक्त छूट राशि (कंपनी मुद्रा)
@@ -1693,7 +1723,7 @@
 ,Support Hour Distribution,समर्थन घंटा वितरण
 DocType: Maintenance Visit,Maintenance Visit,रखरखाव भेंट
 DocType: Student,Leaving Certificate Number,छोड़ने का प्रमाणपत्र संख्या
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","अपॉइंटमेंट रद्द, कृपया इनवॉइस की समीक्षा करें और रद्द करें {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","अपॉइंटमेंट रद्द, कृपया इनवॉइस की समीक्षा करें और रद्द करें {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,गोदाम में उपलब्ध बैच मात्रा
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,अद्यतन प्रिंट प्रारूप
 DocType: Landed Cost Voucher,Landed Cost Help,उतरा लागत सहायता
@@ -1716,8 +1746,8 @@
 DocType: Patient,Tobacco Past Use,तंबाकू अतीत का प्रयोग करें
 DocType: Sales Invoice Item,Brand Name,ब्रांड नाम
 DocType: Purchase Receipt,Transporter Details,ट्रांसपोर्टर विवरण
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},उपयोगकर्ता {0} पहले से ही चिकित्सक को सौंपा गया है {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,डिफ़ॉल्ट गोदाम चयनित आइटम के लिए आवश्यक है
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},उपयोगकर्ता {0} पहले से ही चिकित्सक को सौंपा गया है {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,डिफ़ॉल्ट गोदाम चयनित आइटम के लिए आवश्यक है
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,डिब्बा
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,संभव प्रदायक
 DocType: Budget,Monthly Distribution,मासिक वितरण
@@ -1727,7 +1757,7 @@
 DocType: Sales Partner,Sales Partner Target,बिक्री साथी लक्ष्य
 DocType: Loan Type,Maximum Loan Amount,अधिकतम ऋण राशि
 DocType: Pricing Rule,Pricing Rule,मूल्य निर्धारण नियम
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},छात्र के लिए डुप्लिकेट रोल नंबर {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},छात्र के लिए डुप्लिकेट रोल नंबर {0}
 DocType: Budget,Action if Annual Budget Exceeded,यदि वार्षिक बजट से अधिक हो कार्रवाई
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,क्रय आदेश के लिए सामग्री का अनुरोध
 DocType: Shopping Cart Settings,Payment Success URL,भुगतान सफलता यूआरएल
@@ -1744,7 +1774,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} केवल एक बार दिखाई देना चाहिए
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},अधिक tranfer करने के लिए अनुमति नहीं है {0} की तुलना में {1} खरीद आदेश के खिलाफ {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},पत्तियों के लिए सफलतापूर्वक आवंटित {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,पैक करने के लिए कोई आइटम नहीं
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,पैक करने के लिए कोई आइटम नहीं
 DocType: Shipping Rule Condition,From Value,मूल्य से
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,विनिर्माण मात्रा अनिवार्य है
 DocType: Employee Loan,Repayment Method,चुकौती विधि
@@ -1758,6 +1788,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,शेयर देयताएं
 DocType: Purchase Invoice,Supplier Warehouse,प्रदायक वेअरहाउस
 DocType: Opportunity,Contact Mobile No,मोबाइल संपर्क नहीं
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,कंपनी का चयन करें
 ,Material Requests for which Supplier Quotations are not created,"प्रदायक कोटेशन नहीं बनाई गई हैं , जिसके लिए सामग्री अनुरोध"
 DocType: Student Group,Set 0 for no limit,कोई सीमा के लिए 0 सेट
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"आप छुट्टी के लिए आवेदन कर रहे हैं, जिस पर दिन (एस) छुट्टियां हैं। आप छुट्टी के लिए लागू नहीं की जरूरत है।"
@@ -1767,24 +1798,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,कोटेशन बनाओ
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,अन्य रिपोर्टें
 DocType: Dependent Task,Dependent Task,आश्रित टास्क
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},उपाय की मूलभूत इकाई के लिए रूपांतरण कारक पंक्ति में 1 होना चाहिए {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},उपाय की मूलभूत इकाई के लिए रूपांतरण कारक पंक्ति में 1 होना चाहिए {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},प्रकार की छुट्टी {0} से बड़ा नहीं हो सकता है {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,अग्रिम में एक्स दिनों के लिए आपरेशन की योजना बना प्रयास करें।
 DocType: HR Settings,Stop Birthday Reminders,बंद करो जन्मदिन अनुस्मारक
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},कंपनी में डिफ़ॉल्ट पेरोल देय खाता सेट करें {0}
 DocType: SMS Center,Receiver List,रिसीवर सूची
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,खोजें मद
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,खोजें मद
 DocType: Patient Appointment,Referring Physician,चर्चा करते हुए चिकित्सक
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,खपत राशि
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,नकद में शुद्ध परिवर्तन
 DocType: Assessment Plan,Grading Scale,ग्रेडिंग पैमाने
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,मापने की इकाई {0} अधिक रूपांतरण कारक तालिका में एक बार से अधिक दर्ज किया गया है
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,पहले से पूरा है
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,मापने की इकाई {0} अधिक रूपांतरण कारक तालिका में एक बार से अधिक दर्ज किया गया है
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,पहले से पूरा है
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,हाथ में स्टॉक
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},भुगतान का अनुरोध पहले से मौजूद है {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,जारी मदों की लागत
 DocType: Physician,Hospital,अस्पताल
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},मात्रा से अधिक नहीं होना चाहिए {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},मात्रा से अधिक नहीं होना चाहिए {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,पिछले वित्त वर्ष बंद नहीं है
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),आयु (दिन)
 DocType: Quotation Item,Quotation Item,कोटेशन आइटम
@@ -1795,8 +1826,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,प्रदायक प्रकार मास्टर .
 DocType: Purchase Order Item,Supplier Part Number,प्रदायक भाग संख्या
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,रूपांतरण दर 0 या 1 नहीं किया जा सकता
-DocType: Sales Invoice,Reference Document,संदर्भ दस्तावेज़
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} रद्द या बंद कर दिया है
+DocType: Subscription,Reference Document,संदर्भ दस्तावेज़
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} रद्द या बंद कर दिया है
 DocType: Accounts Settings,Credit Controller,क्रेडिट नियंत्रक
 DocType: Delivery Note,Vehicle Dispatch Date,वाहन डिस्पैच तिथि
 DocType: Healthcare Settings,Default Medical Code Standard,डिफ़ॉल्ट मेडिकल कोड मानक
@@ -1805,6 +1836,7 @@
 DocType: Company,Default Payable Account,डिफ़ॉल्ट देय खाता
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","ऐसे शिपिंग नियम, मूल्य सूची आदि के रूप में ऑनलाइन शॉपिंग कार्ट के लिए सेटिंग"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% बिल
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,मूल्य के आधार पर क्रमबद्ध करें ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,सुरक्षित मात्रा
 DocType: Party Account,Party Account,पार्टी खाता
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,मानवीय संसाधन
@@ -1816,13 +1848,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,संवितरण एंट्री बनाओ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,पंक्ति {0}: प्रदायक के खिलाफ अग्रिम डेबिट किया जाना चाहिए
 DocType: Company,Default Values,डिफ़ॉल्ट मान
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{आवृत्ति} डाइजेस्ट
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{आवृत्ति} डाइजेस्ट
 DocType: Expense Claim,Total Amount Reimbursed,कुल राशि की प्रतिपूर्ति
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,यह इस वाहन के खिलाफ लॉग पर आधारित है। जानकारी के लिए नीचे समय देखें
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},प्रदायक के खिलाफ चालान {0} दिनांक {1}
 DocType: Customer,Default Price List,डिफ़ॉल्ट मूल्य सूची
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,एसेट आंदोलन रिकॉर्ड {0} बनाया
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,आप नहीं हटा सकते वित्त वर्ष {0}। वित्त वर्ष {0} वैश्विक सेटिंग्स में डिफ़ॉल्ट के रूप में सेट किया गया है
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,एक ही नाम वाला ग्राहक पहले से मौजूद है
 DocType: Journal Entry,Entry Type,प्रविष्टि प्रकार
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,इस आकलन समूह से जुड़े कोई मूल्यांकन योजना नहीं है
 ,Customer Credit Balance,ग्राहक क्रेडिट बैलेंस
@@ -1832,7 +1865,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,मूल्य निर्धारण
 DocType: Quotation,Term Details,अवधि विवरण
 DocType: Project,Total Sales Cost (via Sales Order),कुल बिक्री लागत (बिक्री आदेश के माध्यम से)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,{0} इस छात्र समूह के लिए छात्रों की तुलना में अधिक नामांकन नहीं कर सकता।
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,{0} इस छात्र समूह के लिए छात्रों की तुलना में अधिक नामांकन नहीं कर सकता।
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,लीड गणना
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 से अधिक होना चाहिए
 DocType: Manufacturing Settings,Capacity Planning For (Days),(दिन) के लिए क्षमता योजना
@@ -1848,9 +1881,11 @@
 DocType: Lab Test,Technician Name,तकनीशियन का नाम
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,चालान को रद्द करने पर भुगतान अनलिंक
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},वर्तमान ओडोमीटर रीडिंग दर्ज की गई प्रारंभिक वाहन ओडोमीटर से अधिक होना चाहिए {0}
+DocType: Restaurant Reservation,No Show,कोई शो नहीं
 DocType: Shipping Rule Country,Shipping Rule Country,नौवहन नियम देश
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,छोड़ दो और उपस्थिति
 DocType: Maintenance Visit,Partially Completed,आंशिक रूप से पूरा
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,मध्यम संवेदनशीलता
 DocType: Leave Type,Include holidays within leaves as leaves,पत्तियों के रूप में पत्तियों के भीतर छुट्टियों शामिल करें
 DocType: Sales Invoice,Packed Items,पैक्ड आइटम
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,सीरियल नंबर के खिलाफ वारंटी का दावा
@@ -1867,13 +1902,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),भुगतान की गई राशि (कंपनी मुद्रा)
 DocType: Purchase Invoice,Additional Discount,अतिरिक्त छूट
 DocType: Selling Settings,Selling Settings,सेटिंग्स बेचना
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,कार्रवाई की पुष्टि करें
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ऑनलाइन नीलामी
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,मात्रा या मूल्यांकन दर या दोनों निर्दिष्ट करें
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,पूर्ति
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,कार्ट में देखें
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,विपणन व्यय
 ,Item Shortage Report,आइटम कमी की रिपोर्ट
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","वजन भी ""वजन UOM"" का उल्लेख कृपया \n, उल्लेख किया गया है"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","वजन भी ""वजन UOM"" का उल्लेख कृपया \n, उल्लेख किया गया है"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,इस स्टॉक एंट्री बनाने के लिए इस्तेमाल सामग्री अनुरोध
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,अगली मूल्यह्रास दिनांक नई संपत्ति के लिए अनिवार्य है
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,प्रत्येक बैच के लिए अलग पाठ्यक्रम आधारित समूह
@@ -1885,12 +1921,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,हर शेयर आंदोलन के लिए लेखा प्रविष्टि बनाओ
 DocType: Leave Allocation,Total Leaves Allocated,कुल पत्तियां आवंटित
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},रो नहीं पर आवश्यक गोदाम {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,वैध वित्तीय वर्ष आरंभ और समाप्ति तिथियाँ दर्ज करें
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,वैध वित्तीय वर्ष आरंभ और समाप्ति तिथियाँ दर्ज करें
 DocType: Employee,Date Of Retirement,सेवानिवृत्ति की तारीख
 DocType: Upload Attendance,Get Template,टेम्पलेट जाओ
 DocType: Material Request,Transferred,का तबादला
 DocType: Vehicle,Doors,दरवाजे के
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext सेटअप पूरा हुआ!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext सेटअप पूरा हुआ!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,रोगी पंजीकरण के लिए शुल्क लीजिए
 DocType: Course Assessment Criteria,Weightage,महत्व
 DocType: Purchase Invoice,Tax Breakup,कर टूटना
@@ -1909,36 +1945,36 @@
 DocType: Employee,AB+,एबी +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","इस मद वेरिएंट है, तो यह बिक्री के आदेश आदि में चयन नहीं किया जा सकता है"
 DocType: Lead,Next Contact By,द्वारा अगले संपर्क
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},आइटम के लिए आवश्यक मात्रा {0} पंक्ति में {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},आइटम के लिए आवश्यक मात्रा {0} पंक्ति में {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},मात्रा मद के लिए मौजूद वेयरहाउस {0} मिटाया नहीं जा सकता {1}
 DocType: Quotation,Order Type,आदेश प्रकार
-DocType: Purchase Invoice,Notification Email Address,सूचना ईमेल पता
 ,Item-wise Sales Register,आइटम के लिहाज से बिक्री रजिस्टर
 DocType: Asset,Gross Purchase Amount,सकल खरीद राशि
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,खुलने का संतुलन
 DocType: Asset,Depreciation Method,मूल्यह्रास विधि
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,ऑफलाइन
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,ऑफलाइन
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,इस टैक्स मूल दर में शामिल है?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,कुल लक्ष्य
 DocType: Job Applicant,Applicant for a Job,एक नौकरी के लिए आवेदक
 DocType: Production Plan Material Request,Production Plan Material Request,उत्पादन योजना सामग्री का अनुरोध
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,बनाया नहीं उत्पादन के आदेश
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,बनाया नहीं उत्पादन के आदेश
 DocType: Stock Reconciliation,Reconciliation JSON,सुलह JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,बहुत अधिक कॉलम. रिपोर्ट निर्यात और एक स्प्रेडशीट अनुप्रयोग का उपयोग कर इसे मुद्रित.
 DocType: Purchase Invoice Item,Batch No,कोई बैच
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},कोटेशन के लिए अनुरोध: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,एक ग्राहक की खरीद के आदेश के खिलाफ कई विक्रय आदेश की अनुमति दें
 DocType: Student Group Instructor,Student Group Instructor,छात्र समूह के प्रशिक्षक
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 मोबाइल नं
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,मुख्य
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,मुख्य
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,प्रकार
 DocType: Naming Series,Set prefix for numbering series on your transactions,अपने लेनदेन पर श्रृंखला नंबरिंग के लिए उपसर्ग सेट
 DocType: Employee Attendance Tool,Employees HTML,कर्मचारियों एचटीएमएल
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,डिफ़ॉल्ट बीओएम ({0}) इस मद या अपने टेम्पलेट के लिए सक्रिय होना चाहिए
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,डिफ़ॉल्ट बीओएम ({0}) इस मद या अपने टेम्पलेट के लिए सक्रिय होना चाहिए
 DocType: Employee,Leave Encashed?,भुनाया छोड़ दो?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,क्षेत्र से मौके अनिवार्य है
 DocType: Email Digest,Annual Expenses,सालाना खर्च
 DocType: Item,Variants,वेरिएंट
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,बनाओ खरीद आदेश
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,बनाओ खरीद आदेश
 DocType: SMS Center,Send To,इन्हें भेजें
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},छोड़ दो प्रकार के लिए पर्याप्त छुट्टी संतुलन नहीं है {0}
 DocType: Payment Reconciliation Payment,Allocated amount,आवंटित राशि
@@ -1954,6 +1990,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,छात्र समूह की ताकत
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,जर्नल के खिलाफ एंट्री {0} किसी भी बेजोड़ {1} प्रविष्टि नहीं है
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,मूल्यांकन
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,प्रशिक्षण कार्यक्रम
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},डुप्लीकेट सीरियल मद के लिए दर्ज किया गया {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,एक नौवहन नियम के लिए एक शर्त
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,कृपया दर्ज करें
@@ -1963,7 +2000,7 @@
 DocType: Sales Order,To Deliver and Bill,उद्धार और बिल के लिए
 DocType: Student Group,Instructors,अनुदेशकों
 DocType: GL Entry,Credit Amount in Account Currency,खाते की मुद्रा में ऋण राशि
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,बीओएम {0} प्रस्तुत किया जाना चाहिए
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,बीओएम {0} प्रस्तुत किया जाना चाहिए
 DocType: Authorization Control,Authorization Control,प्राधिकरण नियंत्रण
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},पंक्ति # {0}: मालगोदाम अस्वीकृत खारिज कर दिया मद के खिलाफ अनिवार्य है {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,भुगतान
@@ -1982,11 +2019,11 @@
 DocType: Quotation Item,Actual Qty,वास्तविक मात्रा
 DocType: Sales Invoice Item,References,संदर्भ
 DocType: Quality Inspection Reading,Reading 10,10 पढ़ना
-DocType: Hub Settings,Hub Node,हब नोड
+DocType: Hub Category,Hub Node,हब नोड
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,आप डुप्लिकेट आइटम दर्ज किया है . सुधारने और पुन: प्रयास करें .
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,सहयोगी
 DocType: Asset Movement,Asset Movement,एसेट आंदोलन
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,नई गाड़ी
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,नई गाड़ी
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,आइटम {0} एक धारावाहिक आइटम नहीं है
 DocType: SMS Center,Create Receiver List,रिसीवर सूची बनाएँ
 DocType: Vehicle,Wheels,पहियों
@@ -2000,15 +2037,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,दूरसंचार
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),पैकेज इस वितरण का एक हिस्सा है कि संकेत करता है (केवल मसौदा)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,भुगतान प्रवेश कर
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},मात्रा मद के लिए {0} से कम होना चाहिए {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},मात्रा मद के लिए {0} से कम होना चाहिए {1}
 ,Sales Invoice Trends,बिक्री चालान रुझान
 DocType: Leave Application,Apply / Approve Leaves,पत्तों को स्वीकृत / लागू करें
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,के लिए
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,के लिए
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',प्रभारी प्रकार या ' पिछली पंक्ति कुल ' पिछली पंक्ति राशि पर ' तभी पंक्ति का उल्लेख कर सकते
 DocType: Sales Order Item,Delivery Warehouse,वितरण गोदाम
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,वित्तीय लागत केन्द्रों के पेड़।
 DocType: Serial No,Delivery Document No,डिलिवरी दस्तावेज़
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},कंपनी में &#39;एसेट निपटान पर लाभ / हानि खाता&#39; सेट करें {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},कंपनी में &#39;एसेट निपटान पर लाभ / हानि खाता&#39; सेट करें {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,खरीद प्राप्तियों से आइटम प्राप्त
 DocType: Serial No,Creation Date,निर्माण तिथि
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},आइटम {0} मूल्य सूची में कई बार प्रकट होता है {1}
@@ -2019,11 +2056,12 @@
 DocType: Student,Student Mobile Number,छात्र मोबाइल नंबर
 DocType: Item,Has Variants,वेरिएंट है
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,रिस्पांस अपडेट करें
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},आप पहले से ही से आइटम का चयन किया है {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},आप पहले से ही से आइटम का चयन किया है {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,मासिक वितरण का नाम
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,बैच आईडी अनिवार्य है
 DocType: Sales Person,Parent Sales Person,माता - पिता बिक्री व्यक्ति
-DocType: Purchase Invoice,Recurring Invoice,आवर्ती चालान
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,उच्चे से नीचा
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,पहले प्रोग्राम का चयन करें
 DocType: Patient Appointment,Patient Age,रोगी आयु
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,परियोजनाओं के प्रबंधन
 DocType: Supplier,Supplier of Goods or Services.,वस्तुओं या सेवाओं के आपूर्तिकर्ता है।
@@ -2031,8 +2069,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,परामर्श शुल्क बुक करने के लिए रोगी में सेट न किए जाने पर डिफ़ॉल्ट प्राप्य खाते का उपयोग किया जाना चाहिए।
 DocType: Vehicle Log,Fuel Price,ईंधन मूल्य
 DocType: Budget,Budget,बजट
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,खोलें सेट करें
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,निश्चित परिसंपत्ति मद एक गैर शेयर मद में होना चाहिए।
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,खोलें सेट करें
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,निश्चित परिसंपत्ति मद एक गैर शेयर मद में होना चाहिए।
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",यह एक आय या खर्च खाता नहीं है के रूप में बजट के खिलाफ {0} नहीं सौंपा जा सकता
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,हासिल
 DocType: Student Admission,Application Form Route,आवेदन पत्र रूट
@@ -2046,12 +2084,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,आइटम {0} सीरियल नग चेक आइटम गुरु के लिए सेटअप नहीं है
 DocType: Maintenance Visit,Maintenance Time,अनुरक्षण काल
 ,Amount to Deliver,राशि वितरित करने के लिए
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},एक ही बार कई बार दर्ज किया गया है। {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,टर्म प्रारंभ तिथि से शैक्षणिक वर्ष की वर्ष प्रारंभ तिथि जो करने के लिए शब्द जुड़ा हुआ है पहले नहीं हो सकता है (शैक्षिक वर्ष {})। तारीखों को ठीक करें और फिर कोशिश करें।
 DocType: Guardian,Guardian Interests,गार्जियन रूचियाँ
 DocType: Naming Series,Current Value,वर्तमान मान
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,एकाधिक वित्तीय वर्ष की तारीख {0} के लिए मौजूद हैं। वित्त वर्ष में कंपनी सेट करें
 DocType: School Settings,Instructor Records to be created by,प्रशिक्षक रिकॉर्ड्स द्वारा बनाया जाएगा
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} बनाया
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} बनाया
 DocType: Delivery Note Item,Against Sales Order,बिक्री के आदेश के खिलाफ
 ,Serial No Status,धारावाहिक नहीं स्थिति
 DocType: Payment Entry Reference,Outstanding,बकाया
@@ -2062,10 +2101,10 @@
  करने के बीच अंतर करने के लिए अधिक से अधिक या बराबर होना चाहिए {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,यह शेयर आंदोलन पर आधारित है। देखें {0} जानकारी के लिए
 DocType: Pricing Rule,Selling,विक्रय
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},राशि {0} {1} {2} के खिलाफ की कटौती
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},राशि {0} {1} {2} के खिलाफ की कटौती
 DocType: Employee,Salary Information,वेतन की जानकारी
 DocType: Sales Person,Name and Employee ID,नाम और कर्मचारी ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,नियत तिथि तिथि पोस्टिंग से पहले नहीं किया जा सकता
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,नियत तिथि तिथि पोस्टिंग से पहले नहीं किया जा सकता
 DocType: Website Item Group,Website Item Group,वेबसाइट आइटम समूह
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,शुल्कों और करों
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,संदर्भ तिथि दर्ज करें
@@ -2091,7 +2130,7 @@
 DocType: Issue,Resolution Details,संकल्प विवरण
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,आवंटन
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,स्वीकृति मापदंड
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,उपरोक्त तालिका में सामग्री अनुरोध दर्ज करें
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,उपरोक्त तालिका में सामग्री अनुरोध दर्ज करें
 DocType: Item Attribute,Attribute Name,उत्तरदायी ठहराने के लिए नाम
 DocType: BOM,Show In Website,वेबसाइट में दिखाएँ
 DocType: Shopping Cart Settings,Show Quantity in Website,वेबसाइट में मात्रा दिखाएँ
@@ -2100,7 +2139,7 @@
 DocType: Item Reorder,Check in (group),जांच में (समूह)
 ,Qty to Order,मात्रा आदेश को
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","देयता या इक्विटी के अंतर्गत खाता सिर, जिसमें लाभ / हानि बुक किया जा जाएगा"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,सभी कार्यों के गैंट चार्ट.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,सभी कार्यों के गैंट चार्ट.
 DocType: Opportunity,Mins to First Response,पहली प्रतिक्रिया मिनट
 DocType: Pricing Rule,Margin Type,मार्जिन प्रकार
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} घंटे
@@ -2121,35 +2160,35 @@
 DocType: Patient,Surgical History,सर्जिकल इतिहास
 DocType: Employee,Resignation Letter Date,इस्तीफा पत्र दिनांक
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,मूल्य निर्धारण नियमों आगे मात्रा के आधार पर छान रहे हैं.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},कृपया कर्मचारी {0} के लिए शामिल होने की तिथि निर्धारित करें
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},कृपया कर्मचारी {0} के लिए शामिल होने की तिथि निर्धारित करें
 DocType: Task,Total Billing Amount (via Time Sheet),कुल बिलिंग राशि (समय पत्रक के माध्यम से)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,दोहराने ग्राहक राजस्व
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) भूमिका की कीमत अनुमोदनकर्ता 'होना चाहिए
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) की भूमिका ’ व्यय  अनुमोदक ' होनी चाहिए
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,जोड़ा
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,उत्पादन के लिए बीओएम और मात्रा का चयन करें
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,उत्पादन के लिए बीओएम और मात्रा का चयन करें
 DocType: Asset,Depreciation Schedule,मूल्यह्रास अनुसूची
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,बिक्री साथी पते और संपर्क
 DocType: Bank Reconciliation Detail,Against Account,खाते के खिलाफ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,आधा दिन की तारीख की तिथि से और आज तक के बीच होना चाहिए
 DocType: Maintenance Schedule Detail,Actual Date,वास्तविक तारीख
 DocType: Item,Has Batch No,बैच है नहीं
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},वार्षिक बिलिंग: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},वार्षिक बिलिंग: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),माल और सेवा कर (जीएसटी इंडिया)
 DocType: Delivery Note,Excise Page Number,आबकारी पृष्ठ संख्या
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory",कंपनी की तिथि से और तिथि करने के लिए अनिवार्य है
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,परामर्श से प्राप्त करें
 DocType: Asset,Purchase Date,खरीद की तारीख
 DocType: Employee,Personal Details,व्यक्तिगत विवरण
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},कंपनी में &#39;संपत्ति मूल्यह्रास लागत केंद्र&#39; सेट करें {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},कंपनी में &#39;संपत्ति मूल्यह्रास लागत केंद्र&#39; सेट करें {0}
 ,Maintenance Schedules,रखरखाव अनुसूचियों
 DocType: Task,Actual End Date (via Time Sheet),वास्तविक अंत तिथि (समय पत्रक के माध्यम से)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},राशि {0} {1} के खिलाफ {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},राशि {0} {1} के खिलाफ {2} {3}
 ,Quotation Trends,कोटेशन रुझान
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},आइटम के लिए आइटम मास्टर में उल्लेख नहीं मद समूह {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,खाते में डेबिट एक प्राप्य खाता होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,खाते में डेबिट एक प्राप्य खाता होना चाहिए
 DocType: Shipping Rule Condition,Shipping Amount,नौवहन राशि
 DocType: Supplier Scorecard Period,Period Score,अवधि स्कोर
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,ग्राहक जोड़ें
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,ग्राहक जोड़ें
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,लंबित राशि
 DocType: Lab Test Template,Special,विशेष
 DocType: Purchase Invoice Item,Conversion Factor,परिवर्तनकारक तत्व
@@ -2157,13 +2196,14 @@
 ,Vehicle Expenses,वाहन खर्च
 DocType: Serial No,Invoice Details,चालान विवरण
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},उपयोगी जीवन के बाद उम्मीद मूल्य से अधिक या बराबर होना चाहिए {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,शुरुआत करना
+DocType: Hub Category,Hub Category,हब श्रेणी
 DocType: Purchase Invoice,SEZ,सेज
 DocType: Purchase Receipt,Vehicle Number,वाहन संख्या
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,"तारीख, जिस पर आवर्ती चालान रोकने के लिए किया जाएगा"
 DocType: Employee Loan,Loan Amount,उधार की राशि
 DocType: Program Enrollment,Self-Driving Vehicle,स्व-ड्राइविंग वाहन
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,आपूर्तिकर्ता स्कोरकार्ड स्थायी
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},पंक्ति {0}: सामग्री का बिल मद के लिए नहीं मिला {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},पंक्ति {0}: सामग्री का बिल मद के लिए नहीं मिला {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,कुल आवंटित पत्ते {0} कम नहीं हो सकता अवधि के लिए पहले से ही मंजूरी दे दी पत्ते {1} से
 DocType: Journal Entry,Accounts Receivable,लेखा प्राप्य
 ,Supplier-Wise Sales Analytics,प्रदायक वार बिक्री विश्लेषिकी
@@ -2174,7 +2214,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","अभिभावक पाठ्यक्रम (खाली छोड़ें, यदि यह मूल पाठ्यक्रम का हिस्सा नहीं है)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,रिक्त छोड़ दो अगर सभी कर्मचारी प्रकार के लिए विचार
 DocType: Landed Cost Voucher,Distribute Charges Based On,बांटो आरोपों पर आधारित
-apps/erpnext/erpnext/hooks.py +131,Timesheets,timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,timesheets
 DocType: HR Settings,HR Settings,मानव संसाधन सेटिंग्स
 DocType: Salary Slip,net pay info,शुद्ध भुगतान की जानकारी
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,यह मान डिफ़ॉल्ट बिक्री मूल्य सूची में अपडेट किया गया है।
@@ -2185,7 +2225,7 @@
 DocType: Patient,B Positive,बी सकारात्मक
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","पंक्ति # {0}: मात्रा, 1 होना चाहिए के रूप में आइटम एक निश्चित परिसंपत्ति है। कई मात्रा के लिए अलग पंक्ति का उपयोग करें।"
 DocType: Leave Block List Allow,Leave Block List Allow,छोड़ दो ब्लॉक सूची की अनुमति दें
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr खाली या स्थान नहीं हो सकता
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr खाली या स्थान नहीं हो सकता
 DocType: Patient Medical Record,Patient Medical Record,रोगी चिकित्सा रिकॉर्ड
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,गैर-समूह के लिए समूह
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,खेल
@@ -2201,9 +2241,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,कुंजी दिनांक {2} के लिए {0} से {0} के लिए विनिमय दर खोजने में असमर्थ कृपया मैन्युअल रूप से एक मुद्रा विनिमय रिकॉर्ड बनाएं
 DocType: POS Profile,Price List,कीमत सूची
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} अब मूलभूत वित्त वर्ष है . परिवर्तन को प्रभावी बनाने के लिए अपने ब्राउज़र को ताज़ा करें.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,खर्चों के दावे
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,खर्चों के दावे
 DocType: Issue,Support,समर्थन
 ,BOM Search,सामग्री बीजक खोज
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",इस गोदाम में उपलब्ध स्टॉक के आधार पर &quot;स्टॉक में&quot; या &quot;स्टॉक में नहीं&quot; प्रकाशित करें।
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),समापन (+ योग खोलने)
 DocType: Vehicle,Fuel Type,ईंधन का प्रकार
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,कंपनी में मुद्रा निर्दिष्ट करें
@@ -2215,16 +2256,16 @@
 DocType: Healthcare Settings,Remind Before,इससे पहले याद दिलाना
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM रूपांतरण कारक पंक्ति में आवश्यक है {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","पंक्ति # {0}: संदर्भ दस्तावेज़ प्रकार बिक्री आदेश में से एक, बिक्री चालान या जर्नल प्रविष्टि होना चाहिए"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","पंक्ति # {0}: संदर्भ दस्तावेज़ प्रकार बिक्री आदेश में से एक, बिक्री चालान या जर्नल प्रविष्टि होना चाहिए"
 DocType: Salary Component,Deduction,कटौती
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,पंक्ति {0}: समय और समय के लिए अनिवार्य है।
 DocType: Stock Reconciliation Item,Amount Difference,राशि अंतर
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},मद कीमत के लिए जोड़ा {0} मूल्य सूची में {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},मद कीमत के लिए जोड़ा {0} मूल्य सूची में {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,इस व्यक्ति की बिक्री के कर्मचारी आईडी दर्ज करें
 DocType: Territory,Classification of Customers by region,क्षेत्र द्वारा ग्राहकों का वर्गीकरण
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,अंतर राशि शून्य होना चाहिए
 DocType: Project,Gross Margin,सकल मुनाफा
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,पहली उत्पादन मद दर्ज करें
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,पहली उत्पादन मद दर्ज करें
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,परिकलित बैंक बैलेंस
 DocType: Normal Test Template,Normal Test Template,सामान्य टेस्ट टेम्पलेट
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,विकलांग उपयोगकर्ता
@@ -2234,21 +2275,22 @@
 DocType: Salary Slip,Total Deduction,कुल कटौती
 ,Production Analytics,उत्पादन एनालिटिक्स
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,यह इस रोगी के विरुद्ध लेनदेन पर आधारित है। विवरण के लिए नीचे दी गई समयरेखा देखें
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,मूल्य अपडेट
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,मूल्य अपडेट
 DocType: Employee,Date of Birth,जन्म तिथि
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,आइटम {0} पहले से ही लौटा दिया गया है
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** वित्त वर्ष ** एक वित्तीय वर्ष का प्रतिनिधित्व करता है। सभी लेखा प्रविष्टियों और अन्य प्रमुख लेनदेन ** ** वित्त वर्ष के खिलाफ ट्रैक किए गए हैं।
 DocType: Opportunity,Customer / Lead Address,ग्राहक / लीड पता
 DocType: Patient,DOB,जन्म तिथि
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,आपूर्तिकर्ता स्कोरकार्ड सेटअप
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},चेतावनी: कुर्की पर अवैध एसएसएल प्रमाणपत्र {0}
-DocType: Student Admission,Eligibility,पात्रता
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,आकलन योजना का नाम
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},चेतावनी: कुर्की पर अवैध एसएसएल प्रमाणपत्र {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","सुराग आप व्यापार, अपने नेतृत्व के रूप में अपने सभी संपर्कों को और अधिक जोड़ने पाने में मदद"
 DocType: Production Order Operation,Actual Operation Time,वास्तविक ऑपरेशन टाइम
 DocType: Authorization Rule,Applicable To (User),के लिए लागू (उपयोगकर्ता)
 DocType: Purchase Taxes and Charges,Deduct,घटाना
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,नौकरी का विवरण
 DocType: Student Applicant,Applied,आवेदन किया है
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,पुनः खुला
 DocType: Sales Invoice Item,Qty as per Stock UOM,मात्रा स्टॉक UOM के अनुसार
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 नाम
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","सिवाय विशेष अक्षर ""-"" ""।"" ""#"", और ""/"" श्रृंखला के नामकरण में अनुमति नहीं"
@@ -2260,7 +2302,7 @@
 DocType: Request for Quotation,Manufacturing Manager,विनिर्माण प्रबंधक
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},धारावाहिक नहीं {0} तक वारंटी के अंतर्गत है {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,संकुल में डिलिवरी नोट भाजित.
-apps/erpnext/erpnext/hooks.py +98,Shipments,लदान
+apps/erpnext/erpnext/hooks.py +107,Shipments,लदान
 DocType: Payment Entry,Total Allocated Amount (Company Currency),कुल आवंटित राशि (कंपनी मुद्रा)
 DocType: Purchase Order Item,To be delivered to customer,ग्राहक के लिए दिया जाना
 DocType: BOM,Scrap Material Cost,स्क्रैप सामग्री लागत
@@ -2282,8 +2324,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,आइटम विविध सेटिंग्स
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,कंपनी का चयन करें ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,रिक्त छोड़ अगर सभी विभागों के लिए विचार
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","रोजगार ( स्थायी , अनुबंध , प्रशिक्षु आदि ) के प्रकार."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} मद के लिए अनिवार्य है {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","रोजगार ( स्थायी , अनुबंध , प्रशिक्षु आदि ) के प्रकार."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} मद के लिए अनिवार्य है {1}
 DocType: Process Payroll,Fortnightly,पाक्षिक
 DocType: Currency Exchange,From Currency,मुद्रा से
 DocType: Vital Signs,Weight (In Kilogram),वजन (किलोग्राम में)
@@ -2307,7 +2349,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,अनुसूची पाने के लिए 'उत्पन्न अनुसूची' पर क्लिक करें
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,वहाँ त्रुटियों को निम्नलिखित कार्यक्रम को हटाने के दौरान किए गए:
 DocType: Bin,Ordered Quantity,आदेशित मात्रा
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",उदाहरणार्थ
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",उदाहरणार्थ
 DocType: Grading Scale,Grading Scale Intervals,ग्रेडिंग पैमाने अंतराल
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {2} के लिए लेखा प्रविष्टि केवल मुद्रा में किया जा सकता है: {3}
 DocType: Production Order,In Process,इस प्रक्रिया में
@@ -2330,11 +2372,10 @@
 DocType: Purchase Invoice,With Payment of Tax,कर के भुगतान के साथ
 DocType: Expense Claim Detail,Expense Claim Detail,व्यय दावा विवरण
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,आपूर्तिकर्ता के लिए ट्रिपलकाट
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,सही खाते का चयन करें
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,सही खाते का चयन करें
 DocType: Item,Weight UOM,वजन UOM
 DocType: Salary Structure Employee,Salary Structure Employee,वेतन ढांचे कर्मचारी
 DocType: Patient,Blood Group,रक्त वर्ग
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,अपूर्ण
 DocType: Course,Course Name,कोर्स का नाम
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,एक विशिष्ट कर्मचारी की छुट्टी आवेदनों को स्वीकृत कर सकते हैं जो प्रयोक्ता
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,कार्यालय उपकरण
@@ -2353,7 +2394,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,दाम नहीं दिखाया जाएगा अगर कीमत सूची सेट नहीं है
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,इस नौवहन नियम के लिए एक देश निर्दिष्ट या दुनिया भर में शिपिंग कृपया जांच करें
 DocType: Stock Entry,Total Incoming Value,कुल आवक मूल्य
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,डेबिट करने के लिए आवश्यक है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,डेबिट करने के लिए आवश्यक है
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets मदद से अपनी टीम के द्वारा किया गतिविधियों के लिए समय, लागत और बिलिंग का ट्रैक रखने"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,खरीद मूल्य सूची
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,आपूर्तिकर्ता स्कोरकार्ड चर के टेम्पलेट्स
@@ -2363,7 +2404,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,भुगतान सुलह
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,प्रभारी व्यक्ति के नाम का चयन करें
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,प्रौद्योगिकी
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},कुल अवैतनिक: {0}
+DocType: Hub Settings,Unregister from Hub,हब से अपंजीकृत करें
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},कुल अवैतनिक: {0}
 DocType: BOM Website Operation,BOM Website Operation,बीओएम वेबसाइट ऑपरेशन
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,प्रस्ताव पत्र
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,सामग्री (एमआरपी) के अनुरोध और उत्पादन के आदेश उत्पन्न.
@@ -2375,7 +2417,9 @@
 DocType: Physician Schedule Time Slot,To Time,समय के लिए
 DocType: Authorization Rule,Approving Role (above authorized value),(अधिकृत मूल्य से ऊपर) भूमिका का अनुमोदन
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,खाते में जमा एक देय खाता होना चाहिए
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},बीओएम रिकर्शन : {0} माता पिता या के बच्चे नहीं हो सकता {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"कृपया छात्र प्रवेश का चयन करें, जो सशुल्क छात्र आवेदक के लिए अनिवार्य है"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},बीओएम रिकर्शन : {0} माता पिता या के बच्चे नहीं हो सकता {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,मूल्य प्रकाशित करने के लिए कृपया एक मूल्य सूची चुनें
 DocType: Production Order Operation,Completed Qty,पूरी की मात्रा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","{0}, केवल डेबिट खातों एक और क्रेडिट प्रविष्टि के खिलाफ जोड़ा जा सकता है के लिए"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,मूल्य सूची {0} अक्षम है
@@ -2387,38 +2431,39 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} मद के लिए आवश्यक सीरियल नंबर {1}। आपके द्वारा दी गई {2}।
 DocType: Stock Reconciliation Item,Current Valuation Rate,वर्तमान मूल्यांकन दर
 DocType: Item,Customer Item Codes,ग्राहक आइटम संहिताओं
+DocType: Training Event,Advance,अग्रिम
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,दोबारा आवर्ती बनाने के लिए
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,मुद्रा लाभ / हानि
 DocType: Opportunity,Lost Reason,खोया कारण
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,नया पता
 DocType: Quality Inspection,Sample Size,नमूने का आकार
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,रसीद दस्तावेज़ दर्ज करें
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,सभी आइटम पहले से चालान कर दिया गया है
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;केस नंबर से&#39; एक वैध निर्दिष्ट करें
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',&#39;केस नंबर से&#39; एक वैध निर्दिष्ट करें
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,इसके अलावा लागत केन्द्रों समूह के तहत बनाया जा सकता है लेकिन प्रविष्टियों गैर समूहों के खिलाफ बनाया जा सकता है
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,उपयोगकर्ता और अनुमतियाँ
 DocType: Vehicle Log,VLOG.,Vlog।
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},उत्पादन के आदेश निर्मित: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},उत्पादन के आदेश निर्मित: {0}
 DocType: Branch,Branch,शाखा
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,मुद्रण और ब्रांडिंग
 DocType: Company,Total Monthly Sales,कुल मासिक बिक्री
 DocType: Bin,Actual Quantity,वास्तविक मात्रा
 DocType: Shipping Rule,example: Next Day Shipping,उदाहरण: अगले दिन शिपिंग
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,नहीं मिला सीरियल नहीं {0}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},सदस्यता {0} हो गई है
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},सदस्यता {0} हो गई है
 DocType: Fee Schedule Program,Fee Schedule Program,शुल्क अनुसूची कार्यक्रम
 DocType: Fee Schedule Program,Student Batch,छात्र बैच
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,"`टैब वैटियल साइन्स &#39;से * चुनें, जहां रोगी =&#39; {0} &#39;क्रम संकेत_दखाओं की सीमा 1"
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,छात्र
 DocType: Supplier Scorecard Scoring Standing,Min Grade,न्यूनतम ग्रेड
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},आप इस परियोजना पर सहयोग करने के लिए आमंत्रित किया गया है: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},चिकित्सक {0} पर उपलब्ध नहीं है
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},आप इस परियोजना पर सहयोग करने के लिए आमंत्रित किया गया है: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},चिकित्सक {0} पर उपलब्ध नहीं है
 DocType: Leave Block List Date,Block Date,तिथि ब्लॉक
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},सिद्धांत क्षेत्र में कस्टम फ़ील्ड सदस्यता आईडी जोड़ें {0}
 DocType: Purchase Receipt,Supplier Delivery Note,प्रदायक वितरण नोट
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,अभी अप्लाई करें
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,अभी अप्लाई करें
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},वास्तविक मात्रा {0} / प्रतीक्षा की मात्रा {1}
 DocType: Purchase Invoice,E-commerce GSTIN,ई-कॉमर्स जीएसटीआईएन
 DocType: Sales Order,Not Delivered,नहीं वितरित
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,अपेक्षित तिथि लेनदेन तिथि से पहले नहीं हो सकती
 ,Bank Clearance Summary,बैंक क्लीयरेंस सारांश
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","बनाएँ और दैनिक, साप्ताहिक और मासिक ईमेल हज़म का प्रबंधन ."
 DocType: Appraisal Goal,Appraisal Goal,मूल्यांकन लक्ष्य
@@ -2426,12 +2471,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,बिल्डिंग
 DocType: Fee Schedule,Fee Structure,शुल्क संरचना
 DocType: Timesheet Detail,Costing Amount,लागत राशि
-DocType: Student Admission,Application Fee,आवेदन शुल्क
+DocType: Student Admission Program,Application Fee,आवेदन शुल्क
 DocType: Process Payroll,Submit Salary Slip,वेतनपर्ची सबमिट करें
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,आइटम के लिए Maxiumm छूट {0} {1} % है
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,आइटम के लिए Maxiumm छूट {0} {1} % है
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,थोक में आयात
 DocType: Sales Partner,Address & Contacts,पता और संपर्क
 DocType: SMS Log,Sender Name,प्रेषक का नाम
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,मानदंड के आधार पर क्रमबद्ध करें
 DocType: POS Profile,[Select],[ चुनें ]
 DocType: Vital Signs,Blood Pressure (diastolic),रक्तचाप (डायस्टोलिक)
 DocType: SMS Log,Sent To,भेजा
@@ -2440,7 +2486,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,अगले संपर्क दिनांक अतीत में नहीं किया जा सकता
 DocType: Company,For Reference Only.,केवल संदर्भ के लिए।
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},चिकित्सक {0} {1} पर उपलब्ध नहीं है
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,बैच नंबर का चयन करें
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,बैच नंबर का चयन करें
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},अवैध {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,संदर्भ INV
@@ -2456,15 +2502,15 @@
 DocType: Normal Test Items,Require Result Value,परिणाम मान की आवश्यकता है
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,मुकदमा संख्या 0 नहीं हो सकता
 DocType: Item,Show a slideshow at the top of the page,पृष्ठ के शीर्ष पर एक स्लाइड शो दिखाएँ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,भंडार
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,भंडार
 DocType: Project Type,Projects Manager,परियोजनाओं के प्रबंधक
 DocType: Serial No,Delivery Time,सुपुर्दगी समय
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,के आधार पर बूढ़े
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,अपॉइंटमेंट रद्द
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,अपॉइंटमेंट रद्द
 DocType: Item,End of Life,जीवन का अंत
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,यात्रा
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,दी गई तारीखों के लिए कर्मचारी {0} के लिए कोई सक्रिय या डिफ़ॉल्ट वेतन ढांचे
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,यात्रा
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,दी गई तारीखों के लिए कर्मचारी {0} के लिए कोई सक्रिय या डिफ़ॉल्ट वेतन ढांचे
 DocType: Leave Block List,Allow Users,उपयोगकर्ताओं को अनुमति दें
 DocType: Purchase Order,Customer Mobile No,ग्राहक मोबाइल नं
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,आवर्ती
@@ -2473,12 +2519,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,अद्यतन लागत
 DocType: Item Reorder,Item Reorder,आइटम पुनः क्रमित करें
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,वेतन पर्ची दिखाएँ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,हस्तांतरण सामग्री
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,हस्तांतरण सामग्री
 DocType: Fees,Send Payment Request,भुगतान अनुरोध भेजें
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","संचालन, परिचालन लागत निर्दिष्ट और अपने संचालन के लिए एक अनूठा आपरेशन नहीं दे ."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,इस दस्तावेज़ से सीमा से अधिक है {0} {1} आइटम के लिए {4}। आप कर रहे हैं एक और {3} उसी के खिलाफ {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,सहेजने के बाद आवर्ती सेट करें
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,बदलें चुनें राशि खाते
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,बदलें चुनें राशि खाते
 DocType: Purchase Invoice,Price List Currency,मूल्य सूची मुद्रा
 DocType: Naming Series,User must always select,उपयोगकर्ता हमेशा का चयन करना होगा
 DocType: Stock Settings,Allow Negative Stock,नकारात्मक स्टॉक की अनुमति दें
@@ -2498,24 +2544,26 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,कर्मचारी
 DocType: Sample Collection,Collected Time,एकत्रित समय
 DocType: Company,Sales Monthly History,बिक्री मासिक इतिहास
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,बैच का चयन करें
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} पूरी तरह से बिल भेजा है
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,बैच का चयन करें
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} रसीद सम्पूर्ण  है
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,महत्वपूर्ण संकेत
 DocType: Training Event,End Time,अंतिम समय
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +63,Active Salary Structure {0} found for employee {1} for the given dates,सक्रिय वेतन संरचना {0} दिया दिनांकों कर्मचारी {1} के लिए मिला
 DocType: Payment Entry,Payment Deductions or Loss,भुगतान कटौती या घटाने
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,बिक्री या खरीद के लिए मानक अनुबंध शर्तों .
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,वाउचर द्वारा समूह
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,क्या आप वाकई इस नियुक्ति को रद्द करना चाहते हैं?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,बिक्री पाइपलाइन
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},वेतन घटक में डिफ़ॉल्ट खाता सेट करें {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,आवश्यक पर
 DocType: Rename Tool,File to Rename,नाम बदलने के लिए फ़ाइल
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},पंक्ति में आइटम के लिए बीओएम चयन करें {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},पंक्ति में आइटम के लिए बीओएम चयन करें {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},खाता {0} कंपनी के साथ मेल नहीं खाता है {1}: विधि का {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},आइटम के लिए मौजूद नहीं है निर्दिष्ट बीओएम {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,रखरखाव अनुसूची {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
+DocType: POS Profile,Applicable for Users,उपयोगकर्ताओं के लिए लागू
 DocType: Notification Control,Expense Claim Approved,व्यय दावे को मंजूरी
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,कर्मचारी के वेतन पर्ची {0} पहले से ही इस अवधि के लिए बनाए गए
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,कर्मचारी के वेतन पर्ची {0} पहले से ही इस अवधि के लिए बनाए गए
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,औषधि
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,खरीदी गई वस्तुओं की लागत
 DocType: Selling Settings,Sales Order Required,बिक्री आदेश आवश्यक
@@ -2539,37 +2587,39 @@
 DocType: Offer Letter,Accepted,स्वीकार किया
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,संगठन
 DocType: BOM Update Tool,BOM Update Tool,BOM अद्यतन उपकरण
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","पार्टी खाता निर्दिष्ट नहीं है, कृपया कंपनी में डिफ़ॉल्ट पार्टी खाता सेटअप करें"
 DocType: SG Creation Tool Course,Student Group Name,छात्र समूह का नाम
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,फीस बनाना
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,आप वास्तव में इस कंपनी के लिए सभी लेन-देन को हटाना चाहते हैं सुनिश्चित करें। यह है के रूप में आपका मास्टर डाटा रहेगा। इस क्रिया को पूर्ववत नहीं किया जा सकता।
 DocType: Room,Room Number,कमरा संख्या
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},अमान्य संदर्भ {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) की योजना बनाई quanitity से अधिक नहीं हो सकता है ({2}) उत्पादन में आदेश {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},उत्पादान आदेश {3} मे {0} ({1})  योजना बद्द मात्रा ({2})  से अधिक नहीं हो सकती
 DocType: Shipping Rule,Shipping Rule Label,नौवहन नियम लेबल
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,उपयोगकर्ता मंच
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,कच्चे माल खाली नहीं किया जा सकता।
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","शेयर अद्यतन नहीं कर सका, चालान ड्रॉप शिपिंग आइटम शामिल हैं।"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,कच्चे माल खाली नहीं किया जा सकता।
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","शेयर अद्यतन नहीं कर सका, चालान ड्रॉप शिपिंग आइटम शामिल हैं।"
 DocType: Lab Test Sample,Lab Test Sample,लैब टेस्ट नमूना
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,त्वरित जर्नल प्रविष्टि
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,बीओएम किसी भी आइटम agianst उल्लेख अगर आप दर में परिवर्तन नहीं कर सकते
+DocType: Restaurant,Invoice Series Prefix,चालान श्रृंखला उपसर्ग
 DocType: Employee,Previous Work Experience,पिछले कार्य अनुभव
 DocType: Stock Entry,For Quantity,मात्रा के लिए
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},आइटम के लिए योजना बनाई मात्रा दर्ज करें {0} पंक्ति में {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},आइटम के लिए योजना बनाई मात्रा दर्ज करें {0} पंक्ति में {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} प्रस्तुत नहीं किया गया है
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,आइटम के लिए अनुरोध.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,अलग उत्पादन का आदेश प्रत्येक समाप्त अच्छा आइटम के लिए बनाया जाएगा.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} वापसी दस्तावेज़ में नकारात्मक होना चाहिए
 ,Minutes to First Response for Issues,मुद्दे के लिए पहली प्रतिक्रिया मिनट
 DocType: Purchase Invoice,Terms and Conditions1,नियम और Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,संस्थान का नाम है जिसके लिए आप इस प्रणाली स्थापित कर रहे हैं।
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,संस्थान का नाम है जिसके लिए आप इस प्रणाली स्थापित कर रहे हैं।
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","इस तारीख तक कर जम लेखा प्रविष्टि, कोई नहीं / नीचे निर्दिष्ट भूमिका छोड़कर प्रविष्टि को संशोधित कर सकते हैं."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,कृपया रखरखाव शेड्यूल जनरेट करने से पहले दस्तावेज़ सहेजना
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,सभी बीओएम में नवीनतम मूल्य अद्यतन
 DocType: Fee Schedule,Successful,सफल
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,परियोजना की स्थिति
 DocType: UOM,Check this to disallow fractions. (for Nos),नामंज़ूर भिन्न करने के लिए इसे चेक करें. (ओपन स्कूल के लिए)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,निम्न उत्पादन के आदेश बनाया गया:
-DocType: Student Admission,Naming Series (for Student Applicant),सीरीज का नामकरण (छात्र आवेदक के लिए)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,निम्न उत्पादन के आदेश बनाया गया:
+DocType: Student Admission Program,Naming Series (for Student Applicant),सीरीज का नामकरण (छात्र आवेदक के लिए)
 DocType: Delivery Note,Transporter Name,ट्रांसपोर्टर नाम
 DocType: Authorization Rule,Authorized Value,अधिकृत मूल्य
 DocType: BOM,Show Operations,शो संचालन
@@ -2584,7 +2634,7 @@
 DocType: Operation,Default Workstation,मूलभूत वर्कस्टेशन
 DocType: Notification Control,Expense Claim Approved Message,व्यय दावा संदेश स्वीकृत
 DocType: Payment Entry,Deductions or Loss,कटौती या घटाने
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +247,{0} {1} is closed,{0} {1} बंद कर दिया गया है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +247,{0} {1} is closed,{0} {1} बंद  है
 DocType: Email Digest,How frequently?,कितनी बार?
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +57,Total Collected: {0},कुल एकत्रित: {0}
 DocType: Purchase Receipt,Get Current Stock,मौजूदा स्टॉक
@@ -2593,7 +2643,7 @@
 ,Employees working on a holiday,एक छुट्टी पर काम कर रहे कर्मचारियों को
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,मार्क का तोहफा
 DocType: Project,% Complete Method,% पूर्ण विधि
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,दवा
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,दवा
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},रखरखाव शुरू करने की तारीख धारावाहिक नहीं के लिए डिलीवरी की तारीख से पहले नहीं किया जा सकता {0}
 DocType: Production Order,Actual End Date,वास्तविक समाप्ति तिथि
 DocType: BOM,Operating Cost (Company Currency),परिचालन लागत (कंपनी मुद्रा)
@@ -2611,13 +2661,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,उपयोगकर्ता का अनुमोदन करने के लिए नियम लागू है उपयोगकर्ता के रूप में ही नहीं हो सकता
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),मूल दर (स्टॉक UoM के अनुसार)
 DocType: SMS Log,No of Requested SMS,अनुरोधित एसएमएस की संख्या
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,बिना वेतन छुट्टी को मंजूरी दे दी लीव आवेदन रिकॉर्ड के साथ मेल नहीं खाता
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,बिना वेतन छुट्टी को मंजूरी दे दी लीव आवेदन रिकॉर्ड के साथ मेल नहीं खाता
 DocType: Campaign,Campaign-.####,अभियान . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,अगला कदम
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,सबसे अच्छा संभव दरों पर निर्दिष्ट वस्तुओं की आपूर्ति करें
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,चालान बनाएं
 DocType: Selling Settings,Auto close Opportunity after 15 days,15 दिनों के बाद ऑटो बंद के मौके
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} के स्कोरकार्ड की स्थिति के कारण {0} के लिए खरीद ऑर्डर की अनुमति नहीं है।
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} के स्कोरकार्ड की स्थिति के कारण {0} के लिए खरीद ऑर्डर की अनुमति नहीं है।
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,अंत वर्ष
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,कोट / लीड%
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,अनुबंध समाप्ति तिथि शामिल होने की तिथि से अधिक होना चाहिए
@@ -2673,7 +2723,6 @@
  10। जोड़ें या घटा देते हैं: आप जोड़ सकते हैं या कर कटौती करना चाहते हैं।"
 DocType: Homepage,Homepage,मुखपृष्ठ
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,चिकित्सक का चयन करें ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',अद्यतन टैब कंसल्टेशन सेट चालान = &#39;{0}&#39; जहां नाम = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,रिसी डी मात्रा
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},शुल्क रिकॉर्ड बनाया - {0}
 DocType: Asset Category Account,Asset Category Account,परिसंपत्ति वर्ग अकाउंट
@@ -2685,7 +2734,7 @@
 DocType: Asset,Manual,गाइड
 DocType: Salary Component Account,Salary Component Account,वेतन घटक अकाउंट
 DocType: Global Defaults,Hide Currency Symbol,मुद्रा प्रतीक छुपाएँ
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","जैसे बैंक, नकद, क्रेडिट कार्ड"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","जैसे बैंक, नकद, क्रेडिट कार्ड"
 DocType: Lead Source,Source Name,स्रोत का नाम
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","एक वयस्क में सामान्य रूप से रक्तचाप आराम कर रहा है लगभग 120 एमएमएचजी सिस्टोलिक, और 80 एमएमएचजी डायस्टोलिक, संक्षिप्त &quot;120/80 एमएमएचजी&quot;"
 DocType: Journal Entry,Credit Note,जमापत्र
@@ -2704,16 +2753,16 @@
 DocType: Patient,Occupation,बायो
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,पंक्ति {0} : आरंभ तिथि समाप्ति तिथि से पहले होना चाहिए
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),कुल मात्रा)
-DocType: Sales Invoice,This Document,इस दस्तावेज़
 DocType: Installation Note Item,Installed Qty,स्थापित मात्रा
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,यह में कुछ अमान्य ईमेल पते के कारण हो सकता है
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,आपने जोड़ा
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,प्रशिक्षण के परिणाम
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,प्रशिक्षण के परिणाम
 DocType: Purchase Invoice,Is Paid,भुगतान किया
 DocType: Salary Structure,Total Earning,कुल अर्जन
 DocType: Purchase Receipt,Time at which materials were received,जो समय पर सामग्री प्राप्त हुए थे
 DocType: Stock Ledger Entry,Outgoing Rate,आउटगोइंग दर
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,संगठन शाखा मास्टर .
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,संगठन शाखा मास्टर .
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,या
 DocType: Sales Order,Billing Status,बिलिंग स्थिति
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,किसी समस्या की रिपोर्ट
@@ -2728,7 +2777,8 @@
 DocType: Notification Control,Sales Order Message,बिक्री आदेश संदेश
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","आदि कंपनी , मुद्रा , चालू वित्त वर्ष , की तरह सेट डिफ़ॉल्ट मान"
 DocType: Payment Entry,Payment Type,भुगतान के प्रकार
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,आइटम {0} के लिए बैच का चयन करें। इस आवश्यकता को पूरा करने वाले एकल बैच को खोजने में असमर्थ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,आइटम {0} के लिए बैच का चयन करें। इस आवश्यकता को पूरा करने वाले एकल बैच को खोजने में असमर्थ
+DocType: Hub Category,Parent Category,अभिभावक श्रेणी
 DocType: Process Payroll,Select Employees,चयन करें कर्मचारी
 DocType: Opportunity,Potential Sales Deal,संभावित बिक्री डील
 DocType: Complaint,Complaints,शिकायतें
@@ -2765,7 +2815,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),प्रसव के लिए पैकेज की पहचान (प्रिंट के लिए)
 DocType: Bin,Reserved Quantity,आरक्षित मात्रा
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,कृपया मान्य ईमेल पता दर्ज करें
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,गाड़ी में एक आइटम का चयन करें
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,गाड़ी में एक आइटम का चयन करें
 DocType: Landed Cost Voucher,Purchase Receipt Items,रसीद वस्तुओं की खरीद
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,अनुकूलित प्रपत्र
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,बक़ाया
@@ -2775,15 +2825,15 @@
 DocType: Payment Request,Amount in customer's currency,ग्राहक की मुद्रा में राशि
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,वितरण
 DocType: Stock Reconciliation Item,Current Qty,वर्तमान मात्रा
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,आपूर्तिकर्ता जोड़ें
+DocType: Restaurant Menu,Restaurant Menu,रेस्तरां मेनू
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,पिछला
 DocType: Appraisal Goal,Key Responsibility Area,कुंजी जिम्मेदारी क्षेत्र
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","छात्र बैचों आप उपस्थिति, आकलन और छात्रों के लिए फीस ट्रैक करने में मदद"
 DocType: Payment Entry,Total Allocated Amount,कुल आवंटित राशि
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,सतत सूची के लिए डिफ़ॉल्ट इन्वेंट्री खाता सेट करें
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,सतत सूची के लिए डिफ़ॉल्ट इन्वेंट्री खाता सेट करें
 DocType: Item Reorder,Material Request Type,सामग्री अनुरोध प्रकार
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},से {0} को वेतन के लिए Accural जर्नल प्रविष्टि {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage भरा हुआ है, नहीं सहेजा गया"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage भरा हुआ है, नहीं सहेजा गया"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,पंक्ति {0}: UoM रूपांतरण कारक है अनिवार्य है
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,कमरे की क्षमता
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,संदर्भ .......................
@@ -2822,16 +2872,18 @@
 DocType: Project,Task Completion,काम पूरा होना
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,स्टॉक में नहीं
 DocType: Appraisal,HR User,मानव संसाधन उपयोगकर्ता
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,पीओएस?
 DocType: Purchase Invoice,Taxes and Charges Deducted,कर और शुल्क कटौती
-apps/erpnext/erpnext/hooks.py +129,Issues,मुद्दे
+apps/erpnext/erpnext/hooks.py +138,Issues,मुद्दे
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},स्थिति का एक होना चाहिए {0}
 DocType: Sales Invoice,Debit To,करने के लिए डेबिट
+DocType: Restaurant Menu Item,Restaurant Menu Item,रेस्टोरेंट मेनू आइटम
 DocType: Delivery Note,Required only for sample item.,केवल नमूना आइटम के लिए आवश्यक है.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,लेन - देन के बाद वास्तविक मात्रा
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},कोई वेतन पर्ची के बीच पाया {0} और {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},कोई वेतन पर्ची के बीच पाया {0} और {1}
 ,Pending SO Items For Purchase Request,खरीद के अनुरोध के लिए लंबित है तो आइटम
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,विद्यार्थी प्रवेश
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} अक्षम है
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,विद्यार्थी प्रवेश
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} अयोग्य कर दिया है
 DocType: Supplier,Billing Currency,बिलिंग मुद्रा
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,एक्स्ट्रा लार्ज
@@ -2854,6 +2906,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,कृपया उल्लेख आवश्यक यात्राओं की कोई
 DocType: Stock Settings,Default Valuation Method,डिफ़ॉल्ट मूल्यन विधि
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,शुल्क
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,अपडेट जारी है। इसमें समय लग सकता है।
 DocType: Vehicle Log,Fuel Qty,ईंधन मात्रा
 DocType: Production Order Operation,Planned Start Time,नियोजित प्रारंभ समय
 DocType: Course,Assessment,मूल्यांकन
@@ -2869,7 +2922,7 @@
 DocType: Price List,Price List Master,मूल्य सूची मास्टर
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,आप सेट और लक्ष्यों की निगरानी कर सकते हैं ताकि सभी बिक्री लेनदेन कई ** बिक्री व्यक्तियों ** खिलाफ टैग किया जा सकता है।
 ,S.O. No.,बिक्री आदेश संख्या
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},लीड से ग्राहक बनाने कृपया {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},लीड से ग्राहक बनाने कृपया {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,रोगी का चयन करें
 DocType: Price List,Applicable for Countries,देशों के लिए लागू
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,मापदण्ड नाम
@@ -2912,27 +2965,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,प्रदायक चालान विवरण
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,व्यय / अंतर खाते ({0}) एक 'लाभ या हानि' खाता होना चाहिए
 DocType: Project,Copied From,से प्रतिलिपि बनाई गई
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},नाम में त्रुटि: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,कमी
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},नाम में त्रुटि: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,कमी
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} के साथ जुड़े नहीं है {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,कर्मचारी के लिए उपस्थिति {0} पहले से ही चिह्नित है
 DocType: Packing Slip,If more than one package of the same type (for print),यदि एक ही प्रकार के एक से अधिक पैकेज (प्रिंट के लिए)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,कृपया रेस्तरां सेटिंग में डिफ़ॉल्ट ग्राहक सेट करें
 ,Salary Register,वेतन रजिस्टर
 DocType: Warehouse,Parent Warehouse,जनक गोदाम
 DocType: C-Form Invoice Detail,Net Total,शुद्ध जोड़
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},आइटम {0} और प्रोजेक्ट {1} के लिए डिफ़ॉल्ट BOM नहीं मिला
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},आइटम {0} और प्रोजेक्ट {1} के लिए डिफ़ॉल्ट BOM नहीं मिला
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,विभिन्न प्रकार के ऋण को परिभाषित करें
 DocType: Bin,FCFS Rate,FCFS दर
 DocType: Payment Reconciliation Invoice,Outstanding Amount,बकाया राशि
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),समय (मिनट में)
 DocType: Project Task,Working,कार्य
 DocType: Stock Ledger Entry,Stock Queue (FIFO),स्टॉक कतार (फीफो)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,वित्तीय वर्ष
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,वित्तीय वर्ष
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} कंपनी से संबंधित नहीं है {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,{0} के लिए मापदंड के फ़ंक्शन का हल नहीं किया जा सका। सुनिश्चित करें कि सूत्र मान्य है।
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,के रूप में पर लागत
 DocType: Healthcare Settings,Out Patient Settings,बाहर रोगी सेटिंग्स
 DocType: Account,Round Off,पूर्णांक करना
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,मात्रा सकारात्मक होना चाहिए
 ,Requested Qty,निवेदित मात्रा
 DocType: Tax Rule,Use for Shopping Cart,खरीदारी की टोकरी के लिए प्रयोग करें
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},मूल्य {0} विशेषता के लिए {1} वैध आइटम की सूची में मौजूद नहीं है मद के लिए मान गुण {2}
@@ -2941,7 +2996,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","प्रभार अनुपात में अपने चयन के अनुसार, मद मात्रा या राशि के आधार पर वितरित किया जाएगा"
 DocType: Maintenance Visit,Purposes,उद्देश्यों
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,कम से कम एक आइटम वापसी दस्तावेज़ में नकारात्मक मात्रा के साथ दर्ज किया जाना चाहिए
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,पाठ्यक्रम जोड़ें
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ऑपरेशन {0} कार्य केंद्र में किसी भी उपलब्ध काम के घंटे से अधिक समय तक {1}, कई आपरेशनों में आपरेशन तोड़ने के नीचे"
 ,Requested,निवेदित
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,कोई टिप्पणी
@@ -2953,6 +3007,8 @@
 DocType: Employee Loan,Repaid/Closed,चुकाया / बंद किया गया
 DocType: Item,Total Projected Qty,कुल अनुमानित मात्रा
 DocType: Monthly Distribution,Distribution Name,वितरण नाम
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,आपूर्तिकर्ता&gt; प्रदायक प्रकार
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","आइटम {0} के लिए मूल्यांकन दर नहीं मिली, जिसे {1} {2} के लिए लेखा प्रविष्टियां करने की आवश्यकता है यदि आइटम {1} में शून्य मूल्यांकन दर आइटम के रूप में लेनदेन कर रहे हैं, तो कृपया {1} आइटम तालिका में उल्लेख करें। अन्यथा, कृपया आइटम के लिए आने वाले स्टॉक लेनदेन को बनाएं या मद रिकॉर्ड में मूल्यांकन दर का उल्लेख करें, और फिर इस प्रविष्टि को सबमिट करने / रद्द करने का प्रयास करें"
 DocType: Course,Course Code,पाठ्यक्रम कोड
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},आइटम के लिए आवश्यक गुणवत्ता निरीक्षण {0}
 DocType: POS Settings,Use POS in Offline Mode,ऑफ़लाइन मोड में पीओएस का उपयोग करें
@@ -2963,14 +3019,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,टेरिटरी ट्री प्रबंधन .
 DocType: Journal Entry Account,Sales Invoice,बिक्री चालान
 DocType: Journal Entry Account,Party Balance,पार्टी बैलेंस
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,डिस्काउंट पर लागू होते हैं का चयन करें
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,डिस्काउंट पर लागू होते हैं का चयन करें
 DocType: Company,Default Receivable Account,डिफ़ॉल्ट प्राप्य खाता
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ऊपर चयनित मानदंड के लिए भुगतान की गई कुल वेतन के लिए बैंक प्रविष्टि बनाएँ
 DocType: Physician,Physician Schedule,चिकित्सक अनुसूची
 DocType: Purchase Invoice,Deemed Export,डीम्ड एक्सपोर्ट
 DocType: Stock Entry,Material Transfer for Manufacture,निर्माण के लिए सामग्री हस्तांतरण
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,डिस्काउंट प्रतिशत एक मूल्य सूची के खिलाफ या सभी मूल्य सूची के लिए या तो लागू किया जा सकता है.
-DocType: Purchase Invoice,Half-yearly,आधे साल में एक बार
+DocType: Subscription,Half-yearly,आधे साल में एक बार
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,शेयर के लिए लेखा प्रविष्टि
 DocType: Lab Test,LabTest Approver,लैबैस्ट एपीओवर
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,आप मूल्यांकन मानदंड के लिए पहले से ही मूल्यांकन कर चुके हैं {}
@@ -2999,13 +3055,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,अतिरिक्त छोटा
 DocType: Company,Standard Template,स्टैंडर्ड खाका
 DocType: Training Event,Theory,सिद्धांत
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: मात्रा अनुरोध सामग्री न्यूनतम आदेश मात्रा से कम है
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: मात्रा अनुरोध सामग्री न्यूनतम आदेश मात्रा से कम है
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,खाते {0} जमे हुए है
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,संगठन से संबंधित खातों की एक अलग चार्ट के साथ कानूनी इकाई / सहायक।
 DocType: Payment Request,Mute Email,म्यूट ईमेल
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","खाद्य , पेय और तंबाकू"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},केवल विरुद्ध भुगतान कर सकते हैं unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,आयोग दर 100 से अधिक नहीं हो सकता
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},केवल विरुद्ध भुगतान कर सकते हैं unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,आयोग दर 100 से अधिक नहीं हो सकता
 DocType: Stock Entry,Subcontract,उपपट्टा
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,1 {0} दर्ज करें
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,से कोई जवाब नहीं
@@ -3023,10 +3079,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,रंगीन
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,आकलन योजना मानदंड
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,खरीद ऑर्डर रोकें
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,ग्रहणक्षम
 DocType: Patient Appointment,Scheduled,अनुसूचित
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,उद्धरण के लिए अनुरोध।
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया मानव संसाधन में कर्मचारी नामकरण प्रणाली&gt; एचआर सेटिंग्स सेट करें
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",&quot;नहीं&quot; और &quot;बिक्री मद है&quot; &quot;स्टॉक मद है&quot; कहाँ है &quot;हाँ&quot; है आइटम का चयन करें और कोई अन्य उत्पाद बंडल नहीं है कृपया
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,ग्राहक चुनें
 DocType: Student Log,Academic,एकेडमिक
 DocType: Patient,Personal and Social History,व्यक्तिगत और सामाजिक इतिहास
 DocType: Fee Schedule,Fee Breakup for each student,प्रत्येक छात्र के लिए फी ब्रेकअप
@@ -3036,7 +3093,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,मूल्यांकन दर
 DocType: Stock Reconciliation,SR/,एसआर /
 DocType: Vehicle,Diesel,डीज़ल
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,मूल्य सूची मुद्रा का चयन नहीं
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,मूल्य सूची मुद्रा का चयन नहीं
 apps/erpnext/erpnext/config/healthcare.py +46,Results,परिणाम
 ,Student Monthly Attendance Sheet,छात्र मासिक उपस्थिति पत्रक
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},कर्मचारी {0} पहले से ही दोनों के बीच {1} के लिए आवेदन किया है {2} और {3}
@@ -3051,7 +3108,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,बिक्री भागीदारों की व्यवस्था करें.
 DocType: Quality Inspection,Inspection Type,निरीक्षण के प्रकार
 DocType: Fee Validity,Visited yet,अभी तक देखें
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,मौजूदा लेनदेन के साथ गोदामों समूह में परिवर्तित नहीं किया जा सकता है।
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,मौजूदा लेनदेन के साथ गोदामों समूह में परिवर्तित नहीं किया जा सकता है।
 DocType: Assessment Result Tool,Result HTML,परिणाम HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,पर समय सीमा समाप्त
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,छात्रों को जोड़ें
@@ -3077,7 +3134,7 @@
 DocType: Healthcare Settings,Result Printed,परिणाम मुद्रित
 DocType: Asset Category Account,Depreciation Expense Account,मूल्यह्रास व्यय खाते में
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,परिवीक्षाधीन अवधि
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},{0} देखें
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},{0} देखें
 DocType: Customer Group,Only leaf nodes are allowed in transaction,केवल पत्ता नोड्स के लेनदेन में की अनुमति दी जाती है
 DocType: Expense Claim,Expense Approver,व्यय अनुमोदनकर्ता
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,पंक्ति {0}: ग्राहक के खिलाफ अग्रिम ऋण होना चाहिए
@@ -3088,7 +3145,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Datetime करने के लिए
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,कोर्स अनुसूचियों को हटाया:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,एसएमएस वितरण की स्थिति बनाए रखने के लिए लॉग
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,बिक्री लक्ष्य सेट करें
 DocType: Accounts Settings,Make Payment via Journal Entry,जर्नल प्रविष्टि के माध्यम से भुगतान करने के
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,इस तिथि पर प्रिंट किया गया
 DocType: Item,Inspection Required before Delivery,निरीक्षण प्रसव से पहले आवश्यक
@@ -3096,7 +3152,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,गतिविधियों में लंबित
 DocType: Patient Appointment,Reminded,याद दिलाया
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,आपकी संगठन
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,आपकी संगठन
 DocType: Fee Component,Fees Category,फीस श्रेणी
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,तारीख से राहत दर्ज करें.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,राशि
@@ -3108,7 +3164,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,स्तर पुनः क्रमित करें
 DocType: Company,Chart Of Accounts Template,लेखा खाका का चार्ट
 DocType: Attendance,Attendance Date,उपस्थिति तिथि
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},आइटम की {0} में मूल्य सूची के लिए अद्यतन {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},आइटम की {0} में मूल्य सूची के लिए अद्यतन {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,वेतन गोलमाल अर्जन और कटौती पर आधारित है.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,बच्चे नोड्स के साथ खाता लेजर को परिवर्तित नहीं किया जा सकता है
 DocType: Purchase Invoice Item,Accepted Warehouse,स्वीकार किए जाते हैं गोदाम
@@ -3124,9 +3180,10 @@
 ,Employee Birthday,कर्मचारी जन्मदिन
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,छात्र बैच उपस्थिति उपकरण
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,सीमा पार
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,अनुसूचित अप करने के लिए
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,वेंचर कैपिटल
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,इस &#39;शैक्षिक वर्ष&#39; के साथ एक शैक्षणिक अवधि {0} और &#39;शब्द का नाम&#39; {1} पहले से ही मौजूद है। इन प्रविष्टियों को संशोधित करने और फिर कोशिश करें।
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","आइटम {0} के खिलाफ मौजूदा लेनदेन देखते हैं के रूप में, आप के मूल्य में परिवर्तन नहीं कर सकते {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","आइटम {0} के खिलाफ मौजूदा लेनदेन देखते हैं के रूप में, आप के मूल्य में परिवर्तन नहीं कर सकते {1}"
 DocType: UOM,Must be Whole Number,पूर्ण संख्या होनी चाहिए
 DocType: Leave Control Panel,New Leaves Allocated (In Days),नई पत्तियों आवंटित (दिनों में)
 DocType: Purchase Invoice,Invoice Copy,चालान की प्रति
@@ -3136,7 +3193,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,चालान क्रमांक
 DocType: Shopping Cart Settings,Orders,आदेश
 DocType: Employee Leave Approver,Leave Approver,अनुमोदक छोड़ दो
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,कृपया बैच का चयन करें
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,कृपया बैच का चयन करें
 DocType: Assessment Group,Assessment Group Name,आकलन समूह का नाम
 DocType: Manufacturing Settings,Material Transferred for Manufacture,सामग्री निर्माण के लिए हस्तांतरित
 DocType: Expense Claim,"A user with ""Expense Approver"" role","""व्यय अनुमोदनकर्ता"" भूमिका के साथ एक उपयोगकर्ता"
@@ -3151,7 +3208,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,अवधि समापन एंट्री
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,विभाग का चयन करें ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,मौजूदा लेनदेन के साथ लागत केंद्र समूह परिवर्तित नहीं किया जा सकता है
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},राशि {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},राशि {0} {1} {2} {3}
 DocType: Account,Depreciation,ह्रास
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),प्रदायक (ओं)
 DocType: Employee Attendance Tool,Employee Attendance Tool,कर्मचारी उपस्थिति उपकरण
@@ -3162,10 +3219,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,भुगतान प्रविष्टियां {0} संयुक्त राष्ट्र से जुड़े हैं
 DocType: GL Entry,Voucher No,कोई वाउचर
 ,Lead Owner Efficiency,लीड स्वामी क्षमता
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,सबसे लोकप्रिय
 DocType: Leave Allocation,Leave Allocation,आबंटन छोड़ दो
 DocType: Payment Request,Recipient Message And Payment Details,प्राप्तकर्ता संदेश और भुगतान की जानकारी
 DocType: Training Event,Trainer Email,ट्रेनर ईमेल
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,सामग्री अनुरोध {0} बनाया
+DocType: Restaurant Reservation,No of People,लोगों की संख्या
 DocType: Production Planning Tool,Include sub-contracted raw materials,उप अनुबंधित कच्चे माल को शामिल करें
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,शब्दों या अनुबंध के टेम्पलेट.
 DocType: Purchase Invoice,Address and Contact,पता और संपर्क
@@ -3174,10 +3233,11 @@
 DocType: Supplier,Last Day of the Next Month,अगले महीने के आखिरी दिन
 DocType: Support Settings,Auto close Issue after 7 days,7 दिनों के बाद ऑटो बंद जारी
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","पहले आवंटित नहीं किया जा सकता छोड़ दो {0}, छुट्टी संतुलन पहले से ही ले अग्रेषित भविष्य छुट्टी आवंटन रिकॉर्ड में किया गया है के रूप में {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),नोट: कारण / संदर्भ तिथि {0} दिन द्वारा अनुमति ग्राहक क्रेडिट दिनों से अधिक (ओं)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),नोट: कारण / संदर्भ तिथि {0} दिन द्वारा अनुमति ग्राहक क्रेडिट दिनों से अधिक (ओं)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,छात्र आवेदक
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,RECIPIENT के लिए मूल
 DocType: Asset Category Account,Accumulated Depreciation Account,संचित मूल्यह्रास अकाउंट
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,यह ईमेल स्वतः प्रेरित है
 DocType: Stock Settings,Freeze Stock Entries,स्टॉक प्रविष्टियां रुक
 DocType: Program Enrollment,Boarding Student,बोर्डिंग छात्र
 DocType: Asset,Expected Value After Useful Life,उम्मीद मूल्य उपयोगी जीवन के बाद
@@ -3185,7 +3245,7 @@
 DocType: Activity Cost,Billing Rate,बिलिंग दर
 ,Qty to Deliver,उद्धार करने के लिए मात्रा
 ,Stock Analytics,स्टॉक विश्लेषिकी
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,संचालन खाली नहीं छोड़ा जा सकता है
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,संचालन खाली नहीं छोड़ा जा सकता है
 DocType: Maintenance Visit Purpose,Against Document Detail No,दस्तावेज़ विस्तार नहीं के खिलाफ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,पार्टी प्रकार अनिवार्य है
 DocType: Quality Inspection,Outgoing,बाहर जाने वाला
@@ -3207,7 +3267,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,गतिविधि आधारित समूह के लिए मैन्युअल रूप से छात्रों का चयन करें
 DocType: Journal Entry,User Remark,उपयोगकर्ता के टिप्पणी
 DocType: Lead,Market Segment,बाजार खंड
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},भुगतान की गई राशि कुल नकारात्मक बकाया राशि से अधिक नहीं हो सकता है {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},भुगतान की गई राशि कुल नकारात्मक बकाया राशि से अधिक नहीं हो सकता है {0}
 DocType: Supplier Scorecard Period,Variables,चर
 DocType: Employee Internal Work History,Employee Internal Work History,कर्मचारी आंतरिक कार्य इतिहास
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),समापन (डॉ.)
@@ -3236,21 +3296,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,अपडेट प्राप्त करे
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: खाता {2} कंपनी से संबंधित नहीं है {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,सामग्री अनुरोध {0} को रद्द कर दिया है या बंद कर दिया गया है
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,प्रबंधन छोड़ दो
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,प्रबंधन छोड़ दो
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,खाता द्वारा समूह
 DocType: Sales Order,Fully Delivered,पूरी तरह से वितरित
 DocType: Lead,Lower Income,कम आय
+DocType: Restaurant Order Entry,Current Order,अभी का ऑर्डर
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},स्रोत और लक्ष्य गोदाम पंक्ति के लिए समान नहीं हो सकता {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","यह स्टॉक सुलह एक खोलने एंट्री के बाद से अंतर खाते, एक एसेट / दायित्व प्रकार खाता होना चाहिए"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},वितरित राशि ऋण राशि से अधिक नहीं हो सकता है {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,कार्यक्रम पर जाएं
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},क्रय आदेश संख्या मद के लिए आवश्यक {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,उत्पादन आदेश नहीं बनाया
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,उत्पादन आदेश नहीं बनाया
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','तिथि तक' 'तिथि से'  के बाद होनी चाहिए
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},छात्र के रूप में स्थिति को बदल नहीं सकते {0} छात्र आवेदन के साथ जुड़ा हुआ है {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},छात्र के रूप में स्थिति को बदल नहीं सकते {0} छात्र आवेदन के साथ जुड़ा हुआ है {1}
 DocType: Asset,Fully Depreciated,पूरी तरह से घिस
 ,Stock Projected Qty,शेयर मात्रा अनुमानित
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},ग्राहक {0} परियोजना से संबंधित नहीं है {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},ग्राहक {0} परियोजना से संबंधित नहीं है {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,उल्लेखनीय उपस्थिति एचटीएमएल
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","कोटेशन प्रस्तावों, बोलियों आप अपने ग्राहकों के लिए भेजा है रहे हैं"
 DocType: Sales Order,Customer's Purchase Order,ग्राहक के क्रय आदेश
@@ -3261,8 +3322,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Depreciations की संख्या बुक सेट करें
 DocType: Supplier Scorecard Period,Calculations,गणना
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,मूल्य या मात्रा
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,प्रोडक्शंस आदेश के लिए नहीं उठाया जा सकता है:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,प्रोडक्शंस आदेश के लिए नहीं उठाया जा सकता है:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,मिनट
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,कृपया सेटअप के माध्यम से {0} के लिए नामकरण श्रृंखला सेट करें&gt; सेटिंग&gt; नामकरण श्रृंखला
 DocType: Purchase Invoice,Purchase Taxes and Charges,खरीद कर और शुल्क
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,आपूर्तिकर्ता पर जाएं
 ,Qty to Receive,प्राप्त करने के लिए मात्रा
@@ -3275,7 +3337,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,खाते में जमा एक बैलेंस शीट खाता होना चाहिए
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,सभी आपूर्तिकर्ता के प्रकार
 DocType: Global Defaults,Disable In Words,शब्दों में अक्षम
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,आइटम स्वचालित रूप से गिने नहीं है क्योंकि मद कोड अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,आइटम स्वचालित रूप से गिने नहीं है क्योंकि मद कोड अनिवार्य है
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},कोटेशन {0} नहीं प्रकार की {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,रखरखाव अनुसूची आइटम
 DocType: Sales Order,%  Delivered,% वितरित
@@ -3297,23 +3359,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,प्रारम्भिक शेष इक्विटी
 DocType: Lead,CRM,सीआरएम
 DocType: Purchase Invoice,N,एन
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,सुलह
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,शेष
 DocType: Appraisal,Appraisal,मूल्यांकन
 DocType: Purchase Invoice,GST Details,जीएसटी विवरण
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},आपूर्तिकर्ता के लिए भेजा ईमेल {0}
+DocType: Item,Default Sales Unit of Measure,मापन का डिफ़ॉल्ट बिक्री इकाई
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,तिथि दोहराया है
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,अधिकृत हस्ताक्षरकर्ता
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},छोड़ दो सरकारी गवाह से एक होना चाहिए {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,फीस बनाएं
-DocType: Hub Settings,Seller Email,विक्रेता ईमेल
 DocType: Project,Total Purchase Cost (via Purchase Invoice),कुल खरीद मूल्य (खरीद चालान के माध्यम से)
 DocType: Training Event,Start Time,समय शुरू
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,मात्रा चुनें
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,मात्रा चुनें
 DocType: Customs Tariff Number,Customs Tariff Number,सीमा शुल्क टैरिफ संख्या
 DocType: Patient Appointment,Patient Appointment,रोगी की नियुक्ति
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,रोल का अनुमोदन करने के लिए नियम लागू है भूमिका के रूप में ही नहीं हो सकता
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,इस ईमेल डाइजेस्ट से सदस्यता रद्द
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,इस ईमेल डाइजेस्ट से सदस्यता रद्द
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,द्वारा आपूर्तिकर्ता जाओ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} आइटम के लिए नहीं मिला {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,पाठ्यक्रम पर जाएं
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,भेजे गए संदेश
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,बच्चे नोड्स के साथ खाता बही के रूप में सेट नहीं किया जा सकता
@@ -3326,11 +3391,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,सामग्री विनिर्माण के लिए स्थानांतरित
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,खाता {0} करता नहीं मौजूद है
 DocType: Project,Project Type,परियोजना के प्रकार
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,इस कार्य के लिए बाल कार्य मौजूद है आप इस कार्य को नहीं हटा सकते।
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,लक्ष्य मात्रा या लक्ष्य राशि या तो अनिवार्य है .
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,विभिन्न गतिविधियों की लागत
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,कोई और परिणाम नहीं
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,विभिन्न गतिविधियों की लागत
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","को घटना की सेटिंग {0}, क्योंकि कर्मचारी बिक्री व्यक्तियों के नीचे से जुड़ी एक यूजर आईडी नहीं है {1}"
 DocType: Timesheet,Billing Details,बिलिंग विवरण
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,स्रोत और लक्ष्य गोदाम अलग होना चाहिए
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,स्रोत और लक्ष्य गोदाम अलग होना चाहिए
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},से शेयर लेनदेन पुराने अद्यतन करने की अनुमति नहीं है {0}
 DocType: Purchase Invoice Item,PR Detail,पीआर विस्तार
 DocType: Sales Order,Fully Billed,पूरी तरह से किसी तरह का बिल
@@ -3356,7 +3423,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,वायर ट्रांसफर
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,सभी की जांच करो
 DocType: Vehicle Log,Invoice Ref,चालान रेफरी
-DocType: Purchase Order,Recurring Order,आवर्ती आदेश
 DocType: Company,Default Income Account,डिफ़ॉल्ट आय खाता
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,ग्राहक समूह / ग्राहक
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),खुला हुआ वित्त वर्षों के लाभ / हानि (क्रेडिट)
@@ -3370,9 +3436,9 @@
 DocType: Patient,A Negative,एक नकारात्मक
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,इससे अधिक कुछ नहीं दिखाने के लिए।
 DocType: Lead,From Customer,ग्राहक से
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,कॉल
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,कॉल
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,एक उत्पाद
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,बैचों
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,बैचों
 DocType: Project,Total Costing Amount (via Time Logs),कुल लागत राशि (टाइम लॉग्स के माध्यम से)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,शुल्क अनुसूची करें
 DocType: Purchase Order Item Supplied,Stock UOM,स्टॉक UOM
@@ -3396,7 +3462,7 @@
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,पत्तियां और छुट्टी
 DocType: School Settings,Current Academic Term,वर्तमान शैक्षणिक अवधि
 DocType: Sales Order,Not Billed,नहीं बिल
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,दोनों गोदाम एक ही कंपनी से संबंधित होना चाहिए
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,दोनों गोदाम एक ही कंपनी से संबंधित होना चाहिए
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,कोई संपर्क नहीं अभी तक जोड़ा।
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,उतरा लागत वाउचर राशि
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,विधेयकों आपूर्तिकर्ता द्वारा उठाए गए.
@@ -3405,7 +3471,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,छूट राशि
 DocType: Purchase Invoice,Return Against Purchase Invoice,के खिलाफ खरीद चालान लौटें
 DocType: Item,Warranty Period (in days),वारंटी अवधि (दिनों में)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',`टैबटैंट अपॉइंटमेंट` को सेट करें sales_invoice = &#39;{0}&#39; अपडेट करें जहां नाम = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Guardian1 के साथ संबंध
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,संचालन से नेट नकद
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,आइटम 4
@@ -3414,8 +3479,8 @@
 DocType: Journal Entry Account,Journal Entry Account,जर्नल प्रविष्टि खाता
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,छात्र समूह
 DocType: Shopping Cart Settings,Quotation Series,कोटेशन सीरीज
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","एक आइटम ( {0}) , मद समूह का नाम बदलने के लिए या आइटम का नाम बदलने के लिए कृपया एक ही नाम के साथ मौजूद है"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,कृपया ग्राहक का चयन
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","एक आइटम ( {0}) , मद समूह का नाम बदलने के लिए या आइटम का नाम बदलने के लिए कृपया एक ही नाम के साथ मौजूद है"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,कृपया ग्राहक का चयन
 DocType: C-Form,I,मैं
 DocType: Company,Asset Depreciation Cost Center,संपत्ति मूल्यह्रास लागत केंद्र
 DocType: Sales Order Item,Sales Order Date,बिक्री आदेश दिनांक
@@ -3424,6 +3489,7 @@
 DocType: Assessment Plan,Assessment Plan,आकलन योजना
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,ग्राहक {0} बनाया गया है
 DocType: Stock Settings,Limit Percent,सीमा प्रतिशत
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,वर्तमान में किसी भी गोदाम में कोई स्टॉक उपलब्ध नहीं है
 ,Payment Period Based On Invoice Date,चालान तिथि के आधार पर भुगतान की अवधि
 DocType: Sample Collection,No. of print,प्रिंट की संख्या
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},के लिए गुम मुद्रा विनिमय दरों {0}
@@ -3479,13 +3545,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,सकल वेतन - कुल कटौती - ऋण चुकौती
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,वर्तमान बीओएम और नई बीओएम ही नहीं किया जा सकता है
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,वेतन पर्ची आईडी
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,वेतन पर्ची आईडी
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,सेवानिवृत्ति की तिथि शामिल होने की तिथि से अधिक होना चाहिए
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,"वहाँ त्रुटियों पर पाठ्यक्रम का समय निर्धारण, जबकि थे:"
 DocType: Sales Invoice,Against Income Account,आय खाता के खिलाफ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% वितरित
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,आइटम {0}: आदेश दिया मात्रा {1} न्यूनतम आदेश मात्रा {2} (मद में परिभाषित) की तुलना में कम नहीं हो सकता।
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,आइटम {0}: आदेश दिया मात्रा {1} न्यूनतम आदेश मात्रा {2} (मद में परिभाषित) की तुलना में कम नहीं हो सकता।
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,मासिक वितरण का प्रतिशत
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,कृपया अन्य उपयोगकर्ता के रूप में लॉगिन करें।
 DocType: Territory,Territory Targets,टेरिटरी लक्ष्य
 DocType: Delivery Note,Transporter Info,ट्रांसपोर्टर जानकारी
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},डिफ़ॉल्ट {0} कंपनी में सेट करें {1}
@@ -3493,13 +3560,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,एक ही सप्लायर कई बार दर्ज किया गया है
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,सकल लाभ / हानि
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,खरीद आदेश आइटम की आपूर्ति
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,कंपनी का नाम कंपनी नहीं किया जा सकता
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,कंपनी का नाम कंपनी नहीं किया जा सकता
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,प्रिंट टेम्पलेट्स के लिए पत्र सिर .
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,प्रिंट टेम्पलेट्स के लिए खिताब उदा प्रोफार्मा चालान .
 DocType: Program Enrollment,Walking,चलना
 DocType: Student Guardian,Student Guardian,छात्र गार्जियन
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,मूल्यांकन प्रकार के आरोप समावेशी के रूप में चिह्नित नहीं कर सकता
 DocType: POS Profile,Update Stock,स्टॉक अद्यतन
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,सदस्यता में
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,मदों के लिए अलग UOM गलत ( कुल ) नेट वजन मूल्य को बढ़ावा मिलेगा. प्रत्येक आइटम का शुद्ध वजन ही UOM में है कि सुनिश्चित करें.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,बीओएम दर
 DocType: Asset,Journal Entry for Scrap,स्क्रैप के लिए जर्नल प्रविष्टि
@@ -3547,15 +3615,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","सिस्टम प्रयोक्ता आईडी (प्रवेश). अगर सेट किया जाता है, यह सभी मानव संसाधन रूपों के लिए डिफ़ॉल्ट बन जाएगा."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0} से: {1}
 DocType: Task,depends_on,निर्भर करता है
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,सामग्री के सभी बिल में नवीनतम मूल्य को अद्यतन करने के लिए कतारबद्ध इसमें कुछ मिनट लग सकते हैं
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,सामग्री के सभी बिल में नवीनतम मूल्य को अद्यतन करने के लिए कतारबद्ध इसमें कुछ मिनट लग सकते हैं
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,नए खाते का नाम। नोट: ग्राहकों और आपूर्तिकर्ताओं के लिए खातों मत बनाएँ
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,देश बुद्धिमान डिफ़ॉल्ट पता टेम्पलेट्स
 DocType: Sales Order Item,Supplier delivers to Customer,आपूर्तिकर्ता ग्राहक को बचाता है
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# प्रपत्र / मद / {0}) स्टॉक से बाहर है
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},कारण / संदर्भ तिथि के बाद नहीं किया जा सकता {0}
+,Sales Payment Summary,बिक्री भुगतान सारांश
+DocType: Restaurant,Restaurant,खाने की दुकान
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},कारण / संदर्भ तिथि के बाद नहीं किया जा सकता {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,डाटा आयात और निर्यात
 DocType: Patient,Account Details,खाता विवरण
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,कोई छात्र नहीं मिले
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,कोई छात्र नहीं मिले
 DocType: Medical Department,Medical Department,चिकित्सा विभाग
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,आपूर्तिकर्ता स्कोरकार्ड स्कोरिंग मानदंड
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,चालान पोस्ट दिनांक
@@ -3566,7 +3636,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,कृपया पार्टी के चयन से पहले पोस्ट दिनांक का चयन
 DocType: Program Enrollment,School House,स्कूल हाउस
 DocType: Serial No,Out of AMC,एएमसी के बाहर
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,कृपया उद्धरण का चयन करें
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,कृपया उद्धरण का चयन करें
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,बुक depreciations की संख्या कुल depreciations की संख्या से अधिक नहीं हो सकता
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,रखरखाव भेंट बनाओ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,बिक्री मास्टर प्रबंधक {0} भूमिका है जो उपयोगकर्ता के लिए संपर्क करें
@@ -3574,7 +3644,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,कंपनी ( नहीं ग्राहक या प्रदायक) मास्टर .
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,यह इस छात्र की उपस्थिति पर आधारित है
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,में कोई छात्र नहीं
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,अधिक आइटम या खुले पूर्ण रूप में जोड़ें
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,अधिक आइटम या खुले पूर्ण रूप में जोड़ें
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,डिलिवरी नोट्स {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,उपयोगकर्ता पर जाएं
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,भुगतान की गई राशि + राशि से लिखने के कुल योग से बड़ा नहीं हो सकता
@@ -3594,37 +3664,40 @@
 DocType: Fee Schedule,Fee Schedule,शुल्क अनुसूची
 DocType: Hub Settings,Publish Availability,उपलब्धता प्रकाशित करें
 DocType: Company,Create Chart Of Accounts Based On,खातों पर आधारित का चार्ट बनाएं
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,इसे गैर-समूह में परिवर्तित नहीं किया जा सकता बाल कार्य मौजूद हैं
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,जन्म तिथि आज की तुलना में अधिक से अधिक नहीं हो सकता।
 ,Stock Ageing,स्टॉक बूढ़े
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},छात्र {0} छात्र आवेदक के खिलाफ मौजूद {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),गोलाई समायोजन (कंपनी मुद्रा)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,समय पत्र
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,समय पत्र
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' अक्षम किया गया है
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ओपन के रूप में सेट करें
 DocType: Cheque Print Template,Scanned Cheque,स्कैन किए हुए चैक
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,भेजने से लेन-देन पर संपर्क करने के लिए स्वत: ईमेल भेजें।
 DocType: Timesheet,Total Billable Amount,कुल बिल करने योग्य राशि
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,आइटम 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,आदेश दर्ज
 DocType: Purchase Order,Customer Contact Email,ग्राहक संपर्क ईमेल
 DocType: Warranty Claim,Item and Warranty Details,मद और वारंटी के विवरण
 DocType: Sales Team,Contribution (%),अंशदान (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,नोट : भुगतान एंट्री ' नकद या बैंक खाता' निर्दिष्ट नहीं किया गया था के बाद से नहीं बनाया जाएगा
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,परियोजना {0} पहले से मौजूद है
 DocType: Medical Department,Nursing User,नर्सिंग उपयोगकर्ता
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,जिम्मेदारियों
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,इस उद्धरण की वैधता अवधि समाप्त हो गई है।
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,इस उद्धरण की वैधता अवधि समाप्त हो गई है।
 DocType: Expense Claim Account,Expense Claim Account,व्यय दावा अकाउंट
 DocType: Accounts Settings,Allow Stale Exchange Rates,स्टेले एक्सचेंज दरें अनुमति दें
 DocType: Sales Person,Sales Person Name,बिक्री व्यक्ति का नाम
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,तालिका में कम से कम 1 चालान दाखिल करें
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,उपयोगकर्ता जोड़ें
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,उपयोगकर्ता जोड़ें
 DocType: POS Item Group,Item Group,आइटम समूह
 DocType: Item,Safety Stock,सुरक्षा भंडार
 DocType: Healthcare Settings,Healthcare Settings,हेल्थकेयर सेटिंग्स
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,एक कार्य के लिए प्रगति% 100 से अधिक नहीं हो सकता है।
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,एक कार्य के लिए प्रगति% 100 से अधिक नहीं हो सकता है।
 DocType: Stock Reconciliation Item,Before reconciliation,सुलह से पहले
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),करों और शुल्कों जोड़ा (कंपनी मुद्रा)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,आइटम कर पंक्ति {0} प्रकार टैक्स या आय या खर्च या प्रभार्य का खाता होना चाहिए
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,आइटम कर पंक्ति {0} प्रकार टैक्स या आय या खर्च या प्रभार्य का खाता होना चाहिए
 DocType: Sales Order,Partly Billed,आंशिक रूप से बिल
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,मद {0} एक निश्चित परिसंपत्ति मद में होना चाहिए
 DocType: Item,Default BOM,Default बीओएम
@@ -3640,6 +3713,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,परिवर्तनशील
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,डिलिवरी नोट से
 DocType: Student,Student Email Address,छात्र ईमेल एड्रेस
+DocType: Item,Hub Warehouse,हब वेयरहाउस
 DocType: Physician Schedule Time Slot,From Time,समय से
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,स्टॉक में:
 DocType: Notification Control,Custom Message,कस्टम संदेश
@@ -3647,9 +3721,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,नकद या बैंक खाते को भुगतान के प्रवेश करने के लिए अनिवार्य है
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,छात्र का पता
 DocType: Purchase Invoice,Price List Exchange Rate,मूल्य सूची विनिमय दर
+DocType: POS Profile,POS Profile Name,पीओएस प्रोफाइल नाम
 DocType: Purchase Invoice Item,Rate,दर
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,प्रशिक्षु
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,पता नाम
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,पता नाम
 DocType: Stock Entry,From BOM,बीओएम से
 DocType: Assessment Code,Assessment Code,आकलन संहिता
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,बुनियादी
@@ -3663,11 +3738,12 @@
 DocType: Salary Slip,Salary Structure,वेतन संरचना
 DocType: Account,Bank,बैंक
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,एयरलाइन
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,मुद्दा सामग्री
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,मुद्दा सामग्री
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,पुनरावर्ती बनाने के दौरान एक त्रुटि हुई
 DocType: Material Request Item,For Warehouse,गोदाम के लिए
 DocType: Employee,Offer Date,प्रस्ताव की तिथि
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,कोटेशन
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,आप ऑफ़लाइन मोड में हैं। आप जब तक आप नेटवर्क है फिर से लोड करने में सक्षम नहीं होगा।
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,आप ऑफ़लाइन मोड में हैं। आप जब तक आप नेटवर्क है फिर से लोड करने में सक्षम नहीं होगा।
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,कोई छात्र गुटों बनाया।
 DocType: Purchase Invoice Item,Serial No,नहीं सीरियल
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,मासिक भुगतान राशि ऋण राशि से अधिक नहीं हो सकता
@@ -3677,17 +3753,18 @@
 DocType: Salary Slip,Total Working Hours,कुल काम के घंटे
 DocType: Subscription,Next Schedule Date,अगली अनुसूची तिथि
 DocType: Stock Entry,Including items for sub assemblies,उप असेंबलियों के लिए आइटम सहित
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,दर्ज मूल्य सकारात्मक होना चाहिए
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,सभी प्रदेशों
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,दर्ज मूल्य सकारात्मक होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,सभी प्रदेशों
 DocType: Purchase Invoice,Items,आइटम
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,छात्र पहले से ही दाखिला लिया है।
 DocType: Fiscal Year,Year Name,वर्ष नाम
 DocType: Process Payroll,Process Payroll,प्रक्रिया पेरोल
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,इस महीने के दिन काम की तुलना में अधिक छुट्टियां कर रहे हैं .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,इस महीने के दिन काम की तुलना में अधिक छुट्टियां कर रहे हैं .
 DocType: Product Bundle Item,Product Bundle Item,उत्पाद बंडल आइटम
 DocType: Sales Partner,Sales Partner Name,बिक्री भागीदार नाम
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,कोटेशन के लिए अनुरोध
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,कोटेशन के लिए अनुरोध
 DocType: Payment Reconciliation,Maximum Invoice Amount,अधिकतम चालान राशि
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,रुधिर
 DocType: Normal Test Items,Normal Test Items,सामान्य टेस्ट आइटम
 DocType: Student Language,Student Language,छात्र भाषा
 apps/erpnext/erpnext/config/selling.py +23,Customers,ग्राहकों
@@ -3698,10 +3775,11 @@
 DocType: Issue,Opening Time,समय खुलने की
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,दिनांक से और
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,प्रतिभूति एवं कमोडिटी एक्सचेंजों
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',संस्करण के लिए उपाय की मूलभूत इकाई &#39;{0}&#39; खाका के रूप में ही होना चाहिए &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',संस्करण के लिए उपाय की मूलभूत इकाई &#39;{0}&#39; खाका के रूप में ही होना चाहिए &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,के आधार पर गणना करें
 DocType: Delivery Note Item,From Warehouse,गोदाम से
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,सामग्री के बिल के साथ कोई वस्तुओं का निर्माण करने के लिए
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,सामग्री के बिल के साथ कोई वस्तुओं का निर्माण करने के लिए
+DocType: Restaurant,Default Customer,डिफ़ॉल्ट ग्राहक
 DocType: Assessment Plan,Supervisor Name,पर्यवेक्षक का नाम
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,पुष्टि न करें कि नियुक्ति उसी दिन के लिए बनाई गई है
 DocType: Program Enrollment Course,Program Enrollment Course,कार्यक्रम नामांकन पाठ्यक्रम
@@ -3728,7 +3806,7 @@
 DocType: Payment Entry,Internal Transfer,आंतरिक स्थानांतरण
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,चाइल्ड खाता इस खाते के लिए मौजूद है. आप इस खाते को नष्ट नहीं कर सकते .
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,लक्ष्य मात्रा या लक्ष्य राशि या तो अनिवार्य है
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},कोई डिफ़ॉल्ट बीओएम मौजूद मद के लिए {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},कोई डिफ़ॉल्ट बीओएम मौजूद मद के लिए {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,पहली पोस्टिंग तिथि का चयन करें
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,दिनांक खोलने की तिथि बंद करने से पहले किया जाना चाहिए
 DocType: Leave Control Panel,Carry Forward,आगे ले जाना
@@ -3763,6 +3841,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,कुल वर्तमान
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,लेखांकन बयान
 DocType: Drug Prescription,Hour,घंटा
+DocType: Restaurant Order Entry,Last Sales Invoice,अंतिम बिक्री चालान
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,नया धारावाहिक कोई गोदाम नहीं कर सकते हैं . गोदाम स्टॉक एंट्री या खरीद रसीद द्वारा निर्धारित किया जाना चाहिए
 DocType: Lead,Lead Type,प्रकार लीड
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,आप ब्लॉक तारीखों पर पत्तियों को मंजूरी के लिए अधिकृत नहीं हैं
@@ -3797,64 +3876,66 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,बनाएं उपयोगकर्ता
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,ग्राम
 DocType: Supplier Scorecard,Per Month,प्रति माह
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,निर्माण करने के लिए मात्रा 0 से अधिक होना चाहिए।
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,निर्माण करने के लिए मात्रा 0 से अधिक होना चाहिए।
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,रखरखाव कॉल के लिए रिपोर्ट पर जाएँ.
 DocType: Stock Entry,Update Rate and Availability,अद्यतन दर और उपलब्धता
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,आप मात्रा के खिलाफ और अधिक प्राप्त या वितरित करने के लिए अनुमति दी जाती प्रतिशत का आदेश दिया. उदाहरण के लिए: यदि आप 100 यूनिट का आदेश दिया है. और अपने भत्ता 10% तो आप 110 इकाइयों को प्राप्त करने के लिए अनुमति दी जाती है.
 DocType: POS Customer Group,Customer Group,ग्राहक समूह
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),नया बैच आईडी (वैकल्पिक)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),नया बैच आईडी (वैकल्पिक)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},व्यय खाते आइटम के लिए अनिवार्य है {0}
 DocType: BOM,Website Description,वेबसाइट विवरण
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,इक्विटी में शुद्ध परिवर्तन
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,नवीनतम
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,चालान की खरीद {0} को रद्द कृपया पहले
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ईमेल एड्रेस अद्वितीय होना चाहिए, पहले से ही के लिए मौजूद है {0}"
 DocType: Serial No,AMC Expiry Date,एएमसी समाप्ति तिथि
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,रसीद
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,रसीद
 ,Sales Register,बिक्री रजिस्टर
 DocType: Daily Work Summary Settings Company,Send Emails At,ईमेल भेजें पर
 DocType: Quotation,Quotation Lost Reason,कोटेशन कारण खोया
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,अपने डोमेन का चयन करें
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',टैबपेटिव से * चुनें * जहां नाम = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},लेन-देन संदर्भ कोई {0} दिनांक {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},लेन-देन संदर्भ कोई {0} दिनांक {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,संपादित करने के लिए कुछ भी नहीं है .
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,फॉर्म देखें
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,इस महीने और लंबित गतिविधियों के लिए सारांश
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,फॉर्म देखें
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,इस महीने और लंबित गतिविधियों के लिए सारांश
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","उपयोगकर्ताओं को अपने संगठन के अलावा, स्वयं को छोड़ दें"
 DocType: Customer Group,Customer Group Name,ग्राहक समूह का नाम
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,अभी तक कोई ग्राहक नहीं!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,अभी तक कोई ग्राहक नहीं!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,नकदी प्रवाह विवरण
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ऋण राशि का अधिकतम ऋण राशि से अधिक नहीं हो सकता है {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,लाइसेंस
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},सी-फार्म से इस चालान {0} निकाल दें {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},सी-फार्म से इस चालान {0} निकाल दें {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,का चयन करें कृपया आगे ले जाना है अगर तुम भी शामिल करना चाहते हैं पिछले राजकोषीय वर्ष की शेष राशि इस वित्त वर्ष के लिए छोड़ देता है
 DocType: GL Entry,Against Voucher Type,वाउचर प्रकार के खिलाफ
 DocType: Physician,Phone (R),फ़ोन (आर)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,टाइम स्लॉट्स जोड़ा
 DocType: Item,Attributes,गुण
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,टेम्पलेट सक्षम करें
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,कृपया सेटअप के माध्यम से {0} के लिए नामकरण श्रृंखला सेट करें&gt; सेटिंग&gt; नामकरण श्रृंखला
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,खाता बंद लिखने दर्ज करें
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,पिछले आदेश की तिथि
 DocType: Patient,B Negative,बी नकारात्मक
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},खाता {0} करता है कंपनी के अंतर्गत आता नहीं {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,{0} पंक्ति में सीरियल नंबर डिलिवरी नोट से मेल नहीं खाती
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,{0} पंक्ति में सीरियल नंबर डिलिवरी नोट से मेल नहीं खाती
 DocType: Student,Guardian Details,गार्जियन विवरण
 DocType: C-Form,C-Form,सी - फार्म
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,कई कर्मचारियों के लिए मार्क उपस्थिति
 DocType: Vehicle,Chassis No,चास्सिस संख्या
 DocType: Payment Request,Initiated,शुरू की
 DocType: Production Order,Planned Start Date,नियोजित प्रारंभ दिनांक
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,कृपया एक BOM चुनें
 DocType: Serial No,Creation Document Type,निर्माण दस्तावेज़ प्रकार
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,समाप्ति तिथि प्रारंभ तिथि से अधिक होनी चाहिए
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,समाप्ति तिथि प्रारंभ तिथि से अधिक होनी चाहिए
 DocType: Leave Type,Is Encash,तुड़ाना है
 DocType: Leave Allocation,New Leaves Allocated,नई आवंटित पत्तियां
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,परियोजना के लिहाज से डेटा उद्धरण के लिए उपलब्ध नहीं है
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,पर अंत
 DocType: Project,Expected End Date,उम्मीद समाप्ति तिथि
 DocType: Budget Account,Budget Amount,कुल बज़ट
 DocType: Appraisal Template,Appraisal Template Title,मूल्यांकन टेम्पलेट शीर्षक
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},दिनांक से {0} {1} के लिए कर्मचारी से पहले कर्मचारी के शामिल होने की तारीख नहीं किया जा सकता {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,वाणिज्यिक
 DocType: Patient,Alcohol Current Use,शराब वर्तमान उपयोग
+DocType: Student Admission Program,Student Admission Program,छात्र प्रवेश कार्यक्रम
 DocType: Payment Entry,Account Paid To,खाते में भुगतान
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,मूल आइटम {0} एक शेयर मद नहीं होना चाहिए
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,सभी उत्पादों या सेवाओं.
@@ -3863,30 +3944,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} खाते के लिए बजट {1} के खिलाफ {2} {3} है {4}। यह द्वारा अधिक होगा {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',पंक्ति {0} # खाता प्रकार का होना चाहिए &#39;फिक्स्ड एसेट&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,मात्रा बाहर
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,एक बिक्री के लिए शिपिंग राशि की गणना करने के नियम
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,और अनजाने में अक्षम
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,सीरीज अनिवार्य है
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,वित्तीय सेवाएँ
 DocType: Student Sibling,Student ID,छात्र आईडी
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,समय लॉग के लिए गतिविधियों के प्रकार
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,प्रदायक ईमेल
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,समय लॉग के लिए गतिविधियों के प्रकार
 DocType: Tax Rule,Sales,विक्रय
 DocType: Stock Entry Detail,Basic Amount,मूल राशि
 DocType: Training Event,Exam,परीक्षा
 DocType: Complaint,Complaint,शिकायत
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},शेयर मद के लिए आवश्यक वेयरहाउस {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},शेयर मद के लिए आवश्यक वेयरहाउस {0}
 DocType: Leave Allocation,Unused leaves,अप्रयुक्त पत्ते
 DocType: Patient,Alcohol Past Use,शराब विगत का प्रयोग करें
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,सीआर
 DocType: Tax Rule,Billing State,बिलिंग राज्य
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,हस्तांतरण
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),( उप असेंबलियों सहित) विस्फोट बीओएम लायें
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,हस्तांतरण
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),( उप असेंबलियों सहित) विस्फोट बीओएम लायें
 DocType: Authorization Rule,Applicable To (Employee),के लिए लागू (कर्मचारी)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,नियत तिथि अनिवार्य है
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,नियत तिथि अनिवार्य है
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,गुण के लिए वेतन वृद्धि {0} 0 नहीं किया जा सकता
 DocType: Journal Entry,Pay To / Recd From,/ रिसी डी से भुगतान
 DocType: Naming Series,Setup Series,सेटअप सीरीज
 DocType: Payment Reconciliation,To Invoice Date,दिनांक चालान करने के लिए
 DocType: Supplier,Contact HTML,संपर्क HTML
 ,Inactive Customers,निष्क्रिय ग्राहकों
+DocType: Student Admission Program,Maximum Age,अधिकतम आयु
 DocType: Landed Cost Voucher,LCV,एलसीवी
 DocType: Landed Cost Voucher,Purchase Receipts,खरीद प्राप्तियां
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,कैसे मूल्य निर्धारण नियम लागू किया जाता है?
@@ -3905,6 +3988,7 @@
 DocType: GL Entry,Remarks,टिप्पणियाँ
 DocType: Payment Entry,Account Paid From,खाते से भुगतान
 DocType: Purchase Order Item Supplied,Raw Material Item Code,कच्चे माल के मद कोड
+DocType: Task,Parent Task,अभिभावक कार्य
 DocType: Journal Entry,Write Off Based On,के आधार पर बंद लिखने के लिए
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,लीड बनाओ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,प्रिंट और स्टेशनरी
@@ -3913,19 +3997,19 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","वेतन पहले ही बीच {0} और {1}, आवेदन की अवधि छोड़ दो इस तिथि सीमा के बीच नहीं हो सकता है अवधि के लिए कार्रवाई की।"
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,एक सीरियल नंबर के लिए स्थापना रिकॉर्ड
 DocType: Guardian Interest,Guardian Interest,गार्जियन ब्याज
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,पीओएस इनवॉइस के लिए डिफ़ॉल्ट मान सेट करें
 apps/erpnext/erpnext/config/hr.py +177,Training,प्रशिक्षण
 DocType: Timesheet,Employee Detail,कर्मचारी विस्तार
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,गार्डियन 1 ईमेल आईडी
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,अगली तारीख के दिन और महीने के दिवस पर दोहराएँ बराबर होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,अगली तारीख के दिन और महीने के दिवस पर दोहराएँ बराबर होना चाहिए
 DocType: Lab Prescription,Test Code,टेस्ट कोड
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,वेबसाइट मुखपृष्ठ के लिए सेटिंग
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},{1} के स्कोरकार्ड स्टैंड के कारण आरएफक्यू को {0} के लिए अनुमति नहीं है
 DocType: Offer Letter,Awaiting Response,प्रतिक्रिया की प्रतीक्षा
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,ऊपर
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},कुल राशि {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},अमान्य विशेषता {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},कुल राशि {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},अमान्य विशेषता {0} {1}
 DocType: Supplier,Mention if non-standard payable account,यदि मानक मानक देय खाता है तो उल्लेख करें
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},एक ही बार कई बार दर्ज किया गया है। {सूची}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',कृपया &#39;सभी मूल्यांकन समूह&#39; के अलावा अन्य मूल्यांकन समूह का चयन करें
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},पंक्ति {0}: एक आइटम {1} के लिए लागत केंद्र आवश्यक है
 DocType: Training Event Employee,Optional,ऐच्छिक
@@ -3948,19 +4032,20 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: आइटम के लिए लागत केंद्र अनिवार्य है {2}
 DocType: Vehicle,Policy No,पॉलिसी संख्या
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,उत्पाद बंडल से आइटम प्राप्त
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","जैसा कि किसी आइटम {0} के खिलाफ स्टॉक मौजूद है, आप में वेरिएंट संपत्ति सक्षम नहीं हो सकती"
 DocType: Asset,Straight Line,सीधी रेखा
 DocType: Project User,Project User,परियोजना उपयोगकर्ता
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,विभाजित करें
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,विभाजित करें
 DocType: GL Entry,Is Advance,अग्रिम है
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,तिथि करने के लिए तिथि और उपस्थिति से उपस्थिति अनिवार्य है
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,डालें हाँ या नहीं के रूप में ' subcontracted है '
+DocType: Item,Default Purchase Unit of Measure,माप की डिफ़ॉल्ट खरीद इकाई
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,अंतिम संचार दिनांक
 DocType: Sales Team,Contact No.,सं संपर्क
 DocType: Bank Reconciliation,Payment Entries,भुगतान प्रविष्टियां
 DocType: Production Order,Scrap Warehouse,स्क्रैप गोदाम
 DocType: Production Order,Check if material transfer entry is not required,जांच करें कि भौतिक हस्तांतरण प्रविष्टि की आवश्यकता नहीं है
 DocType: Program Enrollment Tool,Get Students From,से छात्रों जाओ
-DocType: Hub Settings,Seller Country,विक्रेता देश
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,वेबसाइट पर आइटम प्रकाशित करें
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,बैचों में समूह अपने छात्रों
 DocType: Authorization Rule,Authorization Rule,प्राधिकरण नियम
@@ -3970,7 +4055,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,बिक्री करों और शुल्कों खाका
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),कुल (क्रेडिट)
 DocType: Repayment Schedule,Payment Date,भुगतान तिथि
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,नया बैच मात्रा
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,नया बैच मात्रा
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,परिधान और सहायक उपकरण
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,भारित स्कोर फ़ंक्शन को हल नहीं किया जा सका। सुनिश्चित करें कि सूत्र मान्य है।
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,आदेश की संख्या
@@ -3988,6 +4073,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","पंक्ति # {0}: संपत्ति {1} प्रस्तुत नहीं किया जा सकता है, यह पहले से ही है {2}"
 DocType: Tax Rule,Billing Country,बिलिंग देश
 DocType: Purchase Order Item,Expected Delivery Date,उम्मीद डिलीवरी की तारीख
+DocType: Restaurant Order Entry,Restaurant Order Entry,रेस्तरां आदेश प्रविष्टि
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,डेबिट और क्रेडिट {0} # के लिए बराबर नहीं {1}। अंतर यह है {2}।
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,मनोरंजन खर्च
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,सामग्री अनुरोध करें
@@ -4000,9 +4086,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,मौजूदा लेन - देन के साथ खाता हटाया नहीं जा सकता
 DocType: Vehicle,Last Carbon Check,अंतिम कार्बन चेक
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,विधि व्यय
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,कृपया पंक्ति पर मात्रा का चयन करें
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,कृपया पंक्ति पर मात्रा का चयन करें
 DocType: Purchase Invoice,Posting Time,बार पोस्टिंग
 DocType: Timesheet,% Amount Billed,% बिल की राशि
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;समय प्रति अपॉइंटमेंट&quot; डॉ &quot;{0} के लिए सेट नहीं किया गया है। इसे चिकित्सक गुरु में जोड़ें।
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,टेलीफोन व्यय
 DocType: Sales Partner,Logo,लोगो
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,यह जाँच लें कि आप उपयोगकर्ता बचत से पहले एक श्रृंखला का चयन करने के लिए मजबूर करना चाहते हैं. कोई डिफ़ॉल्ट हो सकता है अगर आप इस जाँच करेगा.
@@ -4013,6 +4100,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,नया ग्राहक राजस्व
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,यात्रा व्यय
 DocType: Maintenance Visit,Breakdown,भंग
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},कार्यक्षेत्र में कस्टम फ़ील्ड सदस्यता जोड़ें {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,खाता: {0} मुद्रा के साथ: {1} चयनित नहीं किया जा सकता
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","नवीनतम मूल्यांकन दर / मूल्य सूची दर / कच्ची सामग्रियों की अंतिम खरीदारी दर के आधार पर, स्वचालित रूप से समय-समय पर बीओएम लागत को शेड्यूलर के माध्यम से अपडेट करें।"
 DocType: Bank Reconciliation Detail,Cheque Date,चेक तिथि
@@ -4037,7 +4125,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),कुल बिलिंग राशि (टाइम लॉग्स के माध्यम से)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,आपूर्तिकर्ता आईडी
 DocType: Payment Request,Payment Gateway Details,भुगतान गेटवे विवरण
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,मात्रा 0 से अधिक होना चाहिए
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,मात्रा 0 से अधिक होना चाहिए
 DocType: Journal Entry,Cash Entry,कैश एंट्री
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,बच्चे नोड्स केवल &#39;समूह&#39; प्रकार नोड्स के तहत बनाया जा सकता है
 DocType: Leave Application,Half Day Date,आधा दिन की तारीख
@@ -4055,12 +4143,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,नोट : आइटम {0} कई बार प्रवेश किया
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,सभी संपर्क.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,कंपनी संक्षिप्त
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,प्रयोक्ता {0} मौजूद नहीं है
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,प्रयोक्ता {0} मौजूद नहीं है
 DocType: Subscription,SUB-,उप
 DocType: Item Attribute Value,Abbreviation,संक्षिप्त
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,भुगतान प्रविष्टि पहले से मौजूद
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} सीमा से अधिक के बाद से Authroized नहीं
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,वेतन टेम्पलेट मास्टर .
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,विकृति विज्ञान
+DocType: Restaurant Order Entry,Restaurant Table,रेस्टोरेंट टेबल
 DocType: Leave Type,Max Days Leave Allowed,अधिकतम दिन छोड़ने की अनुमति दी
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,शॉपिंग कार्ट के लिए सेट कर नियम
 DocType: Purchase Invoice,Taxes and Charges Added,कर और शुल्क जोड़ा
@@ -4072,10 +4162,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,सुराग या ग्राहक के लिए उद्धरण.
 DocType: Stock Settings,Role Allowed to edit frozen stock,जमे हुए शेयर संपादित करने के लिए रख सकते है भूमिका
 ,Territory Target Variance Item Group-Wise,क्षेत्र को लक्षित विचरण मद समूहवार
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,सभी ग्राहक समूहों
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,सभी ग्राहक समूहों
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,संचित मासिक
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} अनिवार्य है. हो सकता है कि विनिमय दर रिकॉर्ड {2} को {1} के लिए नहीं बनाई गई है.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,टैक्स खाका अनिवार्य है।
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,टैक्स खाका अनिवार्य है।
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,खाते {0}: माता पिता के खाते {1} मौजूद नहीं है
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),मूल्य सूची दर (कंपनी मुद्रा)
 DocType: Products Settings,Products Settings,उत्पाद सेटिंग
@@ -4101,12 +4191,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,मद वार कर विस्तार से
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,संस्थान संक्षिप्त
 ,Item-wise Price List Rate,मद वार मूल्य सूची दर
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,प्रदायक कोटेशन
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,प्रदायक कोटेशन
 DocType: Quotation,In Words will be visible once you save the Quotation.,शब्दों में दिखाई हो सकता है एक बार आप उद्धरण बचाने के लिए होगा.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},मात्रा ({0}) पंक्ति {1} में अंश नहीं हो सकता
 DocType: Consultation,C-,सी-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},बारकोड {0} पहले से ही मद में इस्तेमाल {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},बारकोड {0} पहले से ही मद में इस्तेमाल {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,शिपिंग लागत को जोड़ने के लिए नियम.
 DocType: Item,Opening Stock,आरंभिक स्टॉक
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ग्राहक की आवश्यकता है
@@ -4125,9 +4215,8 @@
 DocType: Customer,From Lead,लीड से
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,उत्पादन के लिए आदेश जारी किया.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,वित्तीय वर्ष का चयन करें ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,पीओएस प्रोफ़ाइल पीओएस एंट्री बनाने के लिए आवश्यक
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,पीओएस प्रोफ़ाइल पीओएस एंट्री बनाने के लिए आवश्यक
 DocType: Program Enrollment Tool,Enroll Students,छात्रों को भर्ती
-DocType: Hub Settings,Name Token,नाम टोकन
 DocType: Lab Test,Approved Date,स्वीकृत दिनांक
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,मानक बेच
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,कम से कम एक गोदाम अनिवार्य है
@@ -4145,7 +4234,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,मानव संसाधन
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,भुगतान सुलह भुगतान
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,कर संपत्ति
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},उत्पादन आदेश {0} हो गया है
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},उत्पादन आदेश {0} हो गया है
 DocType: BOM Item,BOM No,नहीं बीओएम
 DocType: Instructor,INS/,आईएनएस /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,जर्नल प्रविष्टि {0} {1} या पहले से ही अन्य वाउचर के खिलाफ मिलान खाता नहीं है
@@ -4178,15 +4267,15 @@
 DocType: Employee Loan,Fully Disbursed,पूरी तरह से वितरित
 DocType: Maintenance Visit,Customer Feedback,ग्राहक प्रतिक्रिया
 DocType: Account,Expense,व्यय
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,स्कोर अधिकतम स्कोर से बड़ा नहीं हो सकता है
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,स्कोर अधिकतम स्कोर से बड़ा नहीं हो सकता है
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,ग्राहक और आपूर्तिकर्ता
 DocType: Item Attribute,From Range,सीमा से
 DocType: BOM,Set rate of sub-assembly item based on BOM,बीओएम पर आधारित उप-विधानसभा आइटम की दर निर्धारित करें
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},सूत्र या हालत में सिंटेक्स त्रुटि: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},सूत्र या हालत में सिंटेक्स त्रुटि: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,दैनिक काम सारांश सेटिंग कंपनी
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,यह एक शेयर आइटम नहीं है क्योंकि मद {0} को नजरअंदाज कर दिया
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,आगे की प्रक्रिया के लिए इस उत्पादन का आदेश सबमिट करें .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,आगे की प्रक्रिया के लिए इस उत्पादन का आदेश सबमिट करें .
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","एक विशेष लेन - देन में मूल्य निर्धारण नियम लागू नहीं करने के लिए, सभी लागू नहीं डालती निष्क्रिय किया जाना चाहिए."
 DocType: Assessment Group,Parent Assessment Group,जनक आकलन समूह
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,नौकरियां
@@ -4203,26 +4292,26 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',अगर ग्रुप बाय &#39;कंपनी&#39; है तो कंपनी को फिल्टर रिक्त करें
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,पोस्ट दिनांक भविष्य की तारीख नहीं किया जा सकता
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},पंक्ति # {0}: सीरियल नहीं {1} के साथ मेल नहीं खाता {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,आवर्ती बनाने के लिए
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,आकस्मिक छुट्टी
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,लैब टेस्ट UOM
 DocType: Batch,Batch ID,बैच आईडी
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},नोट : {0}
 ,Delivery Note Trends,डिलिवरी नोट रुझान
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,इस सप्ताह की सारांश
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,इस सप्ताह की सारांश
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,शेयर मात्रा में
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,खाता: {0} केवल शेयर लेनदेन के माध्यम से अद्यतन किया जा सकता है
 DocType: Student Group Creation Tool,Get Courses,पाठ्यक्रम जाओ
 DocType: GL Entry,Party,पार्टी
 DocType: Healthcare Settings,Patient Name,रोगी का नाम
 DocType: Variant Field,Variant Field,विविध फ़ील्ड
-DocType: Sales Order,Delivery Date,प्रसव की तारीख
+DocType: Sales Order,Delivery Date,वितरण की तारीख
 DocType: Opportunity,Opportunity Date,अवसर तिथि
 DocType: Purchase Receipt,Return Against Purchase Receipt,खरीद रसीद के खिलाफ लौटें
 DocType: Request for Quotation Item,Request for Quotation Item,कोटेशन मद के लिए अनुरोध
 DocType: Purchase Order,To Bill,बिल
 DocType: Material Request,% Ordered,% का आदेश दिया
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","कोर्स आधारित छात्र समूह के लिए, पाठ्यक्रम नामांकन कार्यक्रमों में प्रत्येक छात्र के लिए कार्यक्रम नामांकन में मान्य किया जाएगा।"
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","ई-मेल पता दर्ज अल्पविराम के द्वारा अलग, चालान विशेष तिथि पर स्वचालित रूप से भेज दिया जाएगा"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,ठेका
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,औसत। क्रय दर
 DocType: Task,Actual Time (in Hours),(घंटे में) वास्तविक समय
@@ -4236,7 +4325,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,आइटम {0} सीरियल नग स्तंभ के लिए सेटअप रिक्त होना चाहिए नहीं है
 DocType: Accounts Settings,Accounts Settings,लेखा सेटिंग्स
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,मंजूर
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,प्रस्तुत करने के लिए कोई भी परिणाम नहीं है
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,प्रस्तुत करने के लिए कोई भी परिणाम नहीं है
 DocType: Customer,Sales Partner and Commission,बिक्री साथी और आयोग
 DocType: Employee Loan,Rate of Interest (%) / Year,ब्याज (%) / वर्ष की दर
 ,Project Quantity,परियोजना मात्रा
@@ -4248,55 +4337,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,काली
 DocType: BOM Explosion Item,BOM Explosion Item,बीओएम धमाका आइटम
 DocType: Account,Auditor,आडिटर
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} उत्पादित वस्तुओं
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} उत्पादित वस्तुओं
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,और अधिक जानें
 DocType: Cheque Print Template,Distance from top edge,ऊपरी किनारे से दूरी
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,मूल्य सूची {0} अक्षम है या मौजूद नहीं है
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,मूल्य सूची {0} अक्षम है या मौजूद नहीं है
 DocType: Purchase Invoice,Return,वापसी
 DocType: Production Order Operation,Production Order Operation,उत्पादन का आदेश ऑपरेशन
 DocType: Pricing Rule,Disable,असमर्थ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,भुगतान की विधि भुगतान करने के लिए आवश्यक है
 DocType: Project Task,Pending Review,समीक्षा के लिए लंबित
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,नियुक्तियों और परामर्श
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} बैच में नामांकित नहीं है {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} बैच में नामांकित नहीं है {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","एसेट {0}, खत्म कर दिया नहीं जा सकता क्योंकि यह पहले से ही है {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),(व्यय दावा) के माध्यम से कुल खर्च का दावा
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,मार्क अनुपस्थित
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},पंक्ति {0}: बीओएम # की मुद्रा {1} चयनित मुद्रा के बराबर होना चाहिए {2}
 DocType: Journal Entry Account,Exchange Rate,विनिमय दर
 DocType: Patient,Additional information regarding the patient,रोगी के बारे में अतिरिक्त जानकारी
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,बिक्री आदेश {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,बिक्री आदेश {0} प्रस्तुत नहीं किया गया है
 DocType: Homepage,Tag Line,टैग लाइन
 DocType: Fee Component,Fee Component,शुल्क घटक
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,बेड़े प्रबंधन
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,से आइटम जोड़ें
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,बेड़े प्रबंधन
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,से आइटम जोड़ें
 DocType: Cheque Print Template,Regular,नियमित
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,सभी मूल्यांकन मापदंड के कुल वेटेज 100% होना चाहिए
-DocType: BOM,Last Purchase Rate,पिछले खरीद दर
+DocType: Purchase Order Item,Last Purchase Rate,पिछले खरीद दर
 DocType: Account,Asset,संपत्ति
 DocType: Project Task,Task ID,टास्क आईडी
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,आइटम के लिए मौजूद नहीं कर सकते स्टॉक {0} के बाद से वेरिएंट है
 DocType: Lab Test,Mobile,मोबाइल
 ,Sales Person-wise Transaction Summary,बिक्री व्यक्ति के लिहाज गतिविधि सारांश
 DocType: Training Event,Contact Number,संपर्क संख्या
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,वेयरहाउस {0} मौजूद नहीं है
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext हब के लिए रजिस्टर
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,वेयरहाउस {0} मौजूद नहीं है
 DocType: Monthly Distribution,Monthly Distribution Percentages,मासिक वितरण प्रतिशत
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,चयनित आइटम बैच नहीं हो सकता
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","मूल्यांकन दर मद {0}, जिसके लिए लेखांकन प्रविष्टियों करने के लिए आवश्यक है के लिए नहीं मिला {1} {2}। मद में एक नमूना आइटम के रूप में लेनदेन किया जाता है तो {1}, कि {1} मद तालिका में उल्लेख करें। अन्यथा, कृपया मद रिकॉर्ड में आइटम या उल्लेख मूल्यांकन दर के लिए एक इनकमिंग शेयर लेनदेन बनाने के लिए, और फिर / submiting कोशिश इस प्रविष्टि को रद्द"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% सामग्री को इस डिलिवरी नोट के सहारे सुपुर्द किया गया है
+DocType: Training Event,Has Certificate,प्रमाणपत्र है
 DocType: Project,Customer Details,ग्राहक विवरण
 DocType: Employee,Reports to,करने के लिए रिपोर्ट
 ,Unpaid Expense Claim,अवैतनिक व्यय दावा
 DocType: Payment Entry,Paid Amount,राशि भुगतान
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,बिक्री चक्र का पता लगाएं
 DocType: Assessment Plan,Supervisor,पर्यवेक्षक
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,ऑनलाइन
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,ऑनलाइन
 ,Available Stock for Packing Items,आइटम पैकिंग के लिए उपलब्ध स्टॉक
 DocType: Item Variant,Item Variant,आइटम संस्करण
 DocType: Assessment Result Tool,Assessment Result Tool,आकलन के परिणाम उपकरण
 DocType: BOM Scrap Item,BOM Scrap Item,बीओएम स्क्रैप मद
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,प्रस्तुत किए गए आदेशों हटाया नहीं जा सकता
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,प्रस्तुत किए गए आदेशों हटाया नहीं जा सकता
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","खाते की शेष राशि पहले से ही डेबिट में है, कृपया आप शेष राशि को क्रेडिट के रूप में ही रखें"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,गुणवत्ता प्रबंधन
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,मद {0} अक्षम किया गया है
@@ -4316,7 +4404,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},पंक्ति # {0}: पंक्ति के साथ स्थिति संघर्षों {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,शून्य मूल्यांकन दर को अनुमति दें
 DocType: Training Event Employee,Invited,आमंत्रित
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,एकाधिक सक्रिय वेतन का ढांचा दी गई तारीखों के लिए कर्मचारी {0} के लिए मिला
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,एकाधिक सक्रिय वेतन का ढांचा दी गई तारीखों के लिए कर्मचारी {0} के लिए मिला
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,सेटअप गेटवे खातों।
 DocType: Employee,Employment Type,रोजगार के प्रकार
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,स्थायी संपत्तियाँ
@@ -4328,7 +4416,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,छात्र ईमेल आईडी
 DocType: Employee,Notice (days),सूचना (दिन)
 DocType: Tax Rule,Sales Tax Template,सेल्स टैक्स खाका
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,चालान बचाने के लिए आइटम का चयन करें
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,चालान बचाने के लिए आइटम का चयन करें
 DocType: Employee,Encashment Date,नकदीकरण तिथि
 DocType: Training Event,Internet,इंटरनेट
 DocType: Special Test Template,Special Test Template,विशेष टेस्ट टेम्प्लेट
@@ -4337,7 +4425,7 @@
 DocType: Production Order,Planned Operating Cost,नियोजित परिचालन लागत
 DocType: Academic Term,Term Start Date,टर्म प्रारंभ तिथि
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,ऑप गणना
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},मिल कृपया संलग्न {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},मिल कृपया संलग्न {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,जनरल लेजर के अनुसार बैंक बैलेंस
 DocType: Job Applicant,Applicant Name,आवेदक के नाम
 DocType: Authorization Rule,Customer / Item Name,ग्राहक / मद का नाम
@@ -4357,7 +4445,7 @@
 DocType: Guardian,Guardian Of ,के गार्जियन
 DocType: Grading Scale Interval,Threshold,डेवढ़ी
 DocType: BOM Update Tool,Current BOM,वर्तमान बीओएम
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,धारावाहिक नहीं जोड़ें
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,धारावाहिक नहीं जोड़ें
 DocType: Production Order Item,Available Qty at Source Warehouse,स्रोत वेयरहाउस पर उपलब्ध मात्रा
 apps/erpnext/erpnext/config/support.py +22,Warranty,गारंटी
 DocType: Purchase Invoice,Debit Note Issued,डेबिट नोट जारी
@@ -4380,10 +4468,9 @@
 DocType: Account,Receivable,प्राप्य
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,पंक्ति # {0}: खरीद आदेश पहले से मौजूद है के रूप में आपूर्तिकर्ता बदलने की अनुमति नहीं
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,निर्धारित ऋण सीमा से अधिक लेनदेन है कि प्रस्तुत करने की अनुमति दी है कि भूमिका.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,निर्माण करने के लिए आइटम का चयन करें
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","मास्टर डेटा सिंक्रनाइज़, यह कुछ समय लग सकता है"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,निर्माण करने के लिए आइटम का चयन करें
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","मास्टर डेटा सिंक्रनाइज़, यह कुछ समय लग सकता है"
 DocType: Item,Material Issue,महत्त्वपूर्ण विषय
-DocType: Hub Settings,Seller Description,विक्रेता विवरण
 DocType: Employee Education,Qualification,योग्यता
 DocType: Item Price,Item Price,मद मूल्य
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,साबुन और डिटर्जेंट
@@ -4391,7 +4478,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,समय समय पर से बड़ा नहीं हो सकता है।
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,मोशन पिक्चर और वीडियो
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,आदेशित
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,बायोडाटा
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,बायोडाटा
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"यदि सक्षम किया गया तो सिस्टम टेम्प्लेट से वेरिएंट के खेतों को अपडेट नहीं करेगा, लेकिन नए संस्करण बनाते समय नीचे वर्णित फ़ील्ड का डेटा कॉपी करेगा"
 DocType: Salary Detail,Component,अंग
 DocType: Assessment Criteria,Assessment Criteria Group,मूल्यांकन मापदंड समूह
 DocType: Healthcare Settings,Patient Name By,रोगी का नाम
@@ -4401,7 +4489,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,रोल अनुमोदन या उपयोगकर्ता स्वीकृति दर्ज करें
 DocType: Journal Entry,Write Off Entry,एंट्री बंद लिखने
 DocType: BOM,Rate Of Materials Based On,सामग्री के आधार पर दर
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,आपूर्तिकर्ता&gt; प्रदायक प्रकार
+DocType: Item Variant Settings,Do not Update Variants,वेरिएंट अपडेट नहीं करें
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,समर्थन Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,सब को अचयनित करें
 DocType: POS Profile,Terms and Conditions,नियम और शर्तें
@@ -4410,7 +4498,7 @@
 DocType: Leave Block List,Applies to Company,कंपनी के लिए लागू होता है
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,"प्रस्तुत स्टॉक एंट्री {0} मौजूद है , क्योंकि रद्द नहीं कर सकते"
 DocType: Employee Loan,Disbursement Date,संवितरण की तारीख
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;प्राप्तकर्ता&#39; निर्दिष्ट नहीं है
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;प्राप्तकर्ता&#39; निर्दिष्ट नहीं है
 DocType: BOM Update Tool,Update latest price in all BOMs,सभी बीओएम में नवीनतम मूल्य अपडेट करें
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,मेडिकल रिकॉर्ड
 DocType: Vehicle,Vehicle,वाहन
@@ -4425,14 +4513,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / लीड%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,एसेट depreciations और शेष
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},राशि {0} {1} से स्थानांतरित {2} को {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},राशि {0} {1} से स्थानांतरित {2} को {3}
 DocType: Sales Invoice,Get Advances Received,अग्रिम प्राप्त
 DocType: Email Digest,Add/Remove Recipients,प्राप्तकर्ता जोड़ें / निकालें
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},लेन - देन बंद कर दिया प्रोडक्शन आदेश के खिलाफ अनुमति नहीं {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","डिफ़ॉल्ट रूप में इस वित्तीय वर्ष में सेट करने के लिए , 'मूलभूत रूप में सेट करें ' पर क्लिक करें"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,जुडें
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,जुडें
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,कमी मात्रा
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,मद संस्करण {0} एक ही गुण के साथ मौजूद है
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,मद संस्करण {0} एक ही गुण के साथ मौजूद है
 DocType: Employee Loan,Repay from Salary,वेतन से बदला
 DocType: Leave Application,LAP/,गोद /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},के खिलाफ भुगतान का अनुरोध {0} {1} राशि के लिए {2}
@@ -4445,7 +4533,7 @@
 DocType: Sales Invoice Item,Sales Order Item,बिक्री आदेश आइटम
 DocType: Salary Slip,Payment Days,भुगतान दिन
 DocType: Patient,Dormant,निष्क्रिय
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,बच्चे नोड्स के साथ गोदामों खाता बही में परिवर्तित नहीं किया जा सकता
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,बच्चे नोड्स के साथ गोदामों खाता बही में परिवर्तित नहीं किया जा सकता
 DocType: BOM,Manage cost of operations,संचालन की लागत का प्रबंधन
 DocType: Accounts Settings,Stale Days,स्टेल डेज़
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",", एक चेक किए गए लेनदेन के किसी भी &quot;प्रस्तुत कर रहे हैं&quot; पॉप - अप ईमेल स्वचालित रूप से जुड़े है कि सौदे में &quot;संपर्क&quot; के लिए एक ईमेल भेजने के लिए, एक अनुलग्नक के रूप में लेन - देन के साथ खोला. उपयोगकर्ता या ईमेल भेजने के लिए नहीं हो सकता."
@@ -4459,10 +4547,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,धारावाहिक नहीं {0} पहले से ही प्राप्त हो गया है
 ,Requested Items To Be Transferred,हस्तांतरित करने का अनुरोध आइटम
 DocType: Expense Claim,Vehicle Log,वाहन लॉग
-DocType: Purchase Invoice,Recurring Id,आवर्ती आईडी
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),एक बुखार की उपस्थिति (अस्थायी&gt; 38.5 डिग्री सेल्सियस / 101.3 डिग्री या निरंतर तापमान&gt; 38 डिग्री सेल्सियस / 100.4 डिग्री फेरनहाइट)
 DocType: Customer,Sales Team Details,बिक्री टीम विवरण
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,स्थायी रूप से हटाना चाहते हैं?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,स्थायी रूप से हटाना चाहते हैं?
 DocType: Expense Claim,Total Claimed Amount,कुल दावा किया राशि
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,बेचने के लिए संभावित अवसरों.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},अमान्य {0}
@@ -4472,7 +4559,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,विभाग के स्टोर
 ,Item Delivery Date,आइटम वितरण तिथि
 DocType: Warehouse,PIN,पिन
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,सेटअप ERPNext में अपने स्कूल
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,सेटअप ERPNext में अपने स्कूल
 DocType: Sales Invoice,Base Change Amount (Company Currency),बेस परिवर्तन राशि (कंपनी मुद्रा)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,निम्नलिखित गोदामों के लिए कोई लेखा प्रविष्टियों
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,पहले दस्तावेज़ को सहेजें।
@@ -4484,13 +4571,12 @@
 DocType: Task,Is Milestone,क्या मील का पत्थर है
 DocType: Daily Work Summary,Email Sent To,इलेक्ट्रॉनिक पत्राचार भेजा गया
 DocType: Budget,Warn,चेतावनी देना
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,क्या आप वाकई अपंजीकृत करना चाहते हैं?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","किसी भी अन्य टिप्पणी, अभिलेखों में जाना चाहिए कि उल्लेखनीय प्रयास।"
 DocType: BOM,Manufacturing User,विनिर्माण प्रयोक्ता
 DocType: Purchase Invoice,Raw Materials Supplied,कच्चे माल की आपूर्ति
-DocType: Purchase Invoice,Recurring Print Format,आवर्ती प्रिंट प्रारूप
 DocType: C-Form,Series,कई
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},मूल्य सूची {0} की मुद्रा {1} या {2} होनी चाहिए
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,उत्पाद जोड़ें
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},मूल्य सूची {0} की मुद्रा {1} या {2} होनी चाहिए
 DocType: Appraisal,Appraisal Template,मूल्यांकन टेम्पलेट
 DocType: Item Group,Item Classification,आइटम वर्गीकरण
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,व्यापार विकास प्रबंधक
@@ -4504,7 +4590,7 @@
 DocType: Item Attribute Value,Attribute Value,मान बताइए
 ,Itemwise Recommended Reorder Level,Itemwise पुनःक्रमित स्तर की सिफारिश की
 DocType: Salary Detail,Salary Detail,वेतन विस्तार
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,पहला {0} का चयन करें
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,पहला {0} का चयन करें
 DocType: Appointment Type,Physician,चिकित्सक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,आइटम के बैच {0} {1} समाप्त हो गया है।
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,परामर्श
@@ -4515,9 +4601,9 @@
 DocType: Salary Detail,Default Amount,चूक की राशि
 DocType: Lab Test Template,Descriptive,वर्णनात्मक
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,सिस्टम में नहीं मिला वेयरहाउस
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,इस महीने की सारांश
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,इस महीने की सारांश
 DocType: Quality Inspection Reading,Quality Inspection Reading,गुणवत्ता निरीक्षण पढ़ना
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,` से अधिक उम्र रुक स्टॉक `% d दिनों से कम होना चाहिए .
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,` से अधिक पुराने स्टॉक `% d दिनों से कम होना चाहिए .
 DocType: Tax Rule,Purchase Tax Template,टैक्स टेम्पलेट खरीद
 apps/erpnext/erpnext/utilities/user_progress.py +45,Set a sales goal you'd like to achieve for your company.,एक बिक्री लक्ष्य निर्धारित करें जिसे आप अपनी कंपनी के लिए प्राप्त करना चाहते हैं
 ,Project wise Stock Tracking,परियोजना वार शेयर ट्रैकिंग
@@ -4538,12 +4624,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,प्रशिक्षण कार्यक्रम / परिणाम
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,के रूप में संचित पर मूल्यह्रास
 DocType: Sales Invoice,C-Form Applicable,लागू सी फार्म
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},आपरेशन के समय ऑपरेशन के लिए 0 से अधिक होना चाहिए {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},आपरेशन के समय ऑपरेशन के लिए 0 से अधिक होना चाहिए {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,गोदाम अनिवार्य है
 DocType: Supplier,Address and Contacts,पता और संपर्क
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM रूपांतरण विस्तार
 DocType: Program,Program Abbreviation,कार्यक्रम संक्षिप्त
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,उत्पादन का आदेश एक आइटम टेम्पलेट के खिलाफ उठाया नहीं जा सकता
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,उत्पादन का आदेश एक आइटम टेम्पलेट के खिलाफ उठाया नहीं जा सकता
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,प्रभार प्रत्येक आइटम के खिलाफ खरीद रसीद में नवीनीकृत कर रहे हैं
 DocType: Warranty Claim,Resolved By,द्वारा हल किया
 DocType: Bank Guarantee,Start Date,प्रारंभ दिनांक
@@ -4569,26 +4655,27 @@
 DocType: Employee,Educational Qualification,शैक्षिक योग्यता
 DocType: Workstation,Operating Costs,परिचालन लागत
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"कार्रवाई करता है, तो संचित मासिक बजट पार"
-DocType: Purchase Invoice,Submit on creation,जमा करें निर्माण पर
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},मुद्रा {0} के लिए होना चाहिए {1}
+DocType: Subscription,Submit on creation,जमा करें निर्माण पर
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},मुद्रा {0} के लिए होना चाहिए {1}
 DocType: Asset,Disposal Date,निपटान की तिथि
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ईमेल दी घंटे में कंपनी के सभी सक्रिय कर्मचारियों के लिए भेजा जाएगा, अगर वे छुट्टी की जरूरत नहीं है। प्रतिक्रियाओं का सारांश आधी रात को भेजा जाएगा।"
 DocType: Employee Leave Approver,Employee Leave Approver,कर्मचारी छुट्टी अनुमोदक
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},पंक्ति {0}: एक पुनःक्रमित प्रविष्टि पहले से ही इस गोदाम के लिए मौजूद है {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","खो के रूप में उद्धरण बना दिया गया है , क्योंकि घोषणा नहीं कर सकते हैं ."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,प्रशिक्षण प्रतिक्रिया
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},पंक्ति {0}: एक पुनःक्रमित प्रविष्टि पहले से ही इस गोदाम के लिए मौजूद है {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","खो के रूप में उद्धरण बना दिया गया है , क्योंकि घोषणा नहीं कर सकते हैं ."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,प्रशिक्षण प्रतिक्रिया
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,उत्पादन का आदेश {0} प्रस्तुत किया जाना चाहिए
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,आपूर्तिकर्ता स्कोरकार्ड मानदंड
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},प्रारंभ तिथि और आइटम के लिए अंतिम तिथि का चयन करें {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},कोर्स पंक्ति में अनिवार्य है {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,तिथि करने के लिए तिथि से पहले नहीं हो सकता
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,/ संपादित कीमतों में जोड़ें
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,/ संपादित कीमतों में जोड़ें
 DocType: Batch,Parent Batch,अभिभावक बैच
 DocType: Cheque Print Template,Cheque Print Template,चैक प्रिंट खाका
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,लागत केंद्र के चार्ट
 DocType: Lab Test Template,Sample Collection,नमूना संग्रह
 ,Requested Items To Be Ordered,आदेश दिया जा करने के लिए अनुरोध आइटम
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,मेरे आदेश
 DocType: Price List,Price List Name,मूल्य सूची का नाम
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},के लिए दैनिक काम सारांश {0}
 DocType: Employee Loan,Totals,योग
@@ -4607,12 +4694,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1} में जरूरत {2} पर {3} {4} {5} इस सौदे को पूरा करने के लिए की इकाइयों।
 DocType: Fee Schedule,Student Category,छात्र श्रेणी
 DocType: Announcement,Student,छात्र
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,संगठन इकाई ( विभाग ) मास्टर .
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,संगठन इकाई ( विभाग ) मास्टर .
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,कमरे में जाओ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,भेजने से पहले संदेश प्रविष्ट करें
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,आपूर्तिकर्ता के लिए डुप्लिकेट
 DocType: Email Digest,Pending Quotations,कोटेशन लंबित
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,प्वाइंट-ऑफ-सेल प्रोफ़ाइल
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,प्वाइंट-ऑफ-सेल प्रोफ़ाइल
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,लैब टेस्ट कॉन्फ़िगरेशन
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,असुरक्षित ऋण
 DocType: Cost Center,Cost Center Name,लागत केन्द्र का नाम
@@ -4622,6 +4709,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,कुल भुगतान राशि
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 चरित्र से अधिक संदेश कई mesage में split जाएगा
 DocType: Purchase Receipt Item,Received and Accepted,प्राप्त और स्वीकृत
+DocType: Hub Settings,Company and Seller Profile,कंपनी और विक्रेता प्रोफाइल
 ,GST Itemised Sales Register,जीएसटी मदरहित बिक्री रजिस्टर
 ,Serial No Service Contract Expiry,धारावाहिक नहीं सेवा अनुबंध समाप्ति
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,आप क्रेडिट और एक ही समय में एक ही खाते से डेबिट नहीं कर सकते
@@ -4631,10 +4719,11 @@
 DocType: Item,Variant Based On,प्रकार पर आधारित
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},कुल आवंटित वेटेज 100 % होना चाहिए . यह है {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,अपने आपूर्तिकर्ताओं
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,कृपया सही करें
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,बिक्री आदेश किया जाता है के रूप में खो के रूप में सेट नहीं कर सकता .
 DocType: Request for Quotation Item,Supplier Part No,प्रदायक भाग नहीं
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',घटा नहीं सकते जब श्रेणी &#39;मूल्यांकन&#39; या &#39;Vaulation और कुल&#39; के लिए है
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,से प्राप्त
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,से प्राप्त
 DocType: Lead,Converted,परिवर्तित
 DocType: Item,Has Serial No,नहीं सीरियल गया है
 DocType: Employee,Date of Issue,जारी करने की तारीख
@@ -4642,7 +4731,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","ख़रीद सेटिंग के मुताबिक यदि खरीद रिसीप्ट की आवश्यकता है == &#39;हां&#39;, तो खरीद चालान बनाने के लिए, उपयोगकर्ता को आइटम के लिए पहली खरीदी रसीद बनाने की ज़रूरत है {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},पंक्ति # {0}: आइटम के लिए सेट प्रदायक {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,पंक्ति {0}: घंटे मूल्य शून्य से अधिक होना चाहिए।
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,मद {1} से जुड़ी वेबसाइट छवि {0} पाया नहीं जा सकता
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,मद {1} से जुड़ी वेबसाइट छवि {0} पाया नहीं जा सकता
 DocType: Issue,Content Type,सामग्री प्रकार
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,कंप्यूटर
 DocType: Item,List this Item in multiple groups on the website.,कई समूहों में वेबसाइट पर इस मद की सूची.
@@ -4653,14 +4742,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled प्रविष्टियां प्राप्त करें
 DocType: Payment Reconciliation,From Invoice Date,चालान तिथि से
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,आपको प्रस्तुत करने की अनुमति नहीं है
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,बिलिंग मुद्रा या तो डिफ़ॉल्ट comapany की मुद्रा या पार्टी के खाते की मुद्रा के बराबर होना चाहिए
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,बिलिंग मुद्रा या तो डिफ़ॉल्ट comapany की मुद्रा या पार्टी के खाते की मुद्रा के बराबर होना चाहिए
 DocType: Healthcare Settings,Laboratory Settings,प्रयोगशाला सेटिंग
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,नकदीकरण छोड़े
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,यह क्या करता है?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,गोदाम के लिए
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,सभी छात्र प्रवेश
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,यह क्या करता है?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,गोदाम के लिए
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,सभी छात्र प्रवेश
 ,Average Commission Rate,औसत कमीशन दर
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,गैर स्टॉक आइटम के लिए क्रमांक 'हाँ' नहीं हो सकता
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,गैर स्टॉक आइटम के लिए क्रमांक 'हाँ' नहीं हो सकता
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,स्थिति का चयन करें
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,उपस्थिति भविष्य तारीखों के लिए चिह्नित नहीं किया जा सकता
 DocType: Pricing Rule,Pricing Rule Help,मूल्य निर्धारण नियम मदद
@@ -4678,40 +4767,40 @@
 DocType: Item,Customer Code,ग्राहक कोड
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},के लिए जन्मदिन अनुस्मारक {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,दिनों से पिछले आदेश
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,खाते में डेबिट एक बैलेंस शीट खाता होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,खाते में डेबिट एक बैलेंस शीट खाता होना चाहिए
 DocType: Buying Settings,Naming Series,श्रृंखला का नामकरण
 DocType: Leave Block List,Leave Block List Name,ब्लॉक सूची नाम छोड़ दो
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,बीमा प्रारंभ दिनांक से बीमा समाप्ति की तारीख कम होना चाहिए
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,कृपया स्कूल में शिक्षक नामकरण प्रणाली सेटअप करें&gt; स्कूल सेटिंग्स
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,शेयर एसेट्स
 DocType: Timesheet,Production Detail,उत्पादन विस्तार
+DocType: Restaurant,Active Menu,सक्रिय मेनू
 DocType: Target Detail,Target Qty,लक्ष्य मात्रा
 DocType: Shopping Cart Settings,Checkout Settings,चेकआउट सेटिंग
 DocType: Attendance,Present,पेश
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया जाना चाहिए
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया जाना चाहिए
 DocType: Notification Control,Sales Invoice Message,बिक्री चालान संदेश
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,खाते {0} समापन प्रकार दायित्व / इक्विटी का होना चाहिए
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},कर्मचारी के वेतन पर्ची {0} पहले से ही समय पत्रक के लिए बनाई गई {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},कर्मचारी के वेतन पर्ची {0} पहले से ही समय पत्रक के लिए बनाई गई {1}
 DocType: Vehicle Log,Odometer,ओडोमीटर
 DocType: Sales Order Item,Ordered Qty,मात्रा का आदेश दिया
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,मद {0} अक्षम हो जाता है
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,मद {0} अक्षम हो जाता है
 DocType: Stock Settings,Stock Frozen Upto,स्टॉक तक जमे हुए
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,बीओएम किसी भी शेयर आइटम शामिल नहीं है
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,परियोजना / कार्य कार्य.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,बीओएम किसी भी शेयर आइटम शामिल नहीं है
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,परियोजना / कार्य कार्य.
 DocType: Vehicle Log,Refuelling Details,ईंधन भराई विवरण
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,वेतन स्लिप्स उत्पन्न
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","लागू करने के लिए के रूप में चुना जाता है तो खरीदना, जाँच की जानी चाहिए {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,सबसे कम से कम 100 होना चाहिए
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,अंतिम खरीद दर नहीं मिला
 DocType: Purchase Invoice,Write Off Amount (Company Currency),राशि से लिखें (कंपनी मुद्रा)
 DocType: Sales Invoice Timesheet,Billing Hours,बिलिंग घंटे
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,{0} नहीं मिला डिफ़ॉल्ट बीओएम
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,पंक्ति # {0}: पुनःक्रमित मात्रा सेट करें
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,{0} नहीं मिला डिफ़ॉल्ट बीओएम
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,पंक्ति # {0}: पुनःक्रमित मात्रा सेट करें
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,उन्हें यहां जोड़ने के लिए आइटम टैप करें
 DocType: Fees,Program Enrollment,कार्यक्रम नामांकन
 DocType: Landed Cost Voucher,Landed Cost Voucher,उतरा लागत वाउचर
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},सेट करें {0}
-DocType: Purchase Invoice,Repeat on Day of Month,महीने का दिन पर दोहराएँ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} निष्क्रिय छात्र है
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} निष्क्रिय छात्र है
 DocType: Employee,Health Details,स्वास्थ्य विवरण
 DocType: Offer Letter,Offer Letter Terms,पत्र शर्तों की पेशकश
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,भुगतान अनुरोध संदर्भ दस्तावेज़ बनाने के लिए आवश्यक है
@@ -4719,13 +4808,12 @@
 DocType: Employee External Work History,Salary,वेतन
 DocType: Serial No,Delivery Document Type,डिलिवरी दस्तावेज़ प्रकार
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,ऊपर चयनित मानदंड के लिए सभी वेतन निकल जाता है भेजें
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} आइटम synced
 DocType: Sales Order,Partly Delivered,आंशिक रूप से वितरित
 DocType: Email Digest,Receivables,प्राप्य
 DocType: Lead Source,Lead Source,स्रोत लीड
 DocType: Customer,Additional information regarding the customer.,ग्राहक के बारे में अतिरिक्त जानकारी।
 DocType: Quality Inspection Reading,Reading 5,5 पढ़ना
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +225,"{0} {1} is associated with {2}, but Party Account is {3}","{0} {1} {2} के साथ जुड़ा हुआ है, लेकिन पार्टी खाता {3} है"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +225,"{0} {1} is associated with {2}, but Party Account is {3}","{0} {1} {2} के साथ जुड़ा हुआ है, लेकिन पक्ष खाता {3} है"
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,लैब परीक्षण देखें
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,रखरखाव तिथि
@@ -4741,19 +4829,19 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,बूढ़े रेंज 2
 DocType: SG Creation Tool Course,Max Strength,मैक्स शक्ति
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,बीओएम प्रतिस्थापित
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,डिलीवरी तिथि के आधार पर आइटम चुनें
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,डिलीवरी तिथि के आधार पर आइटम चुनें
 ,Sales Analytics,बिक्री विश्लेषिकी
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},उपलब्ध {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},उपलब्ध {0}
 ,Prospects Engaged But Not Converted,संभावनाएं जुड़ी हुई हैं लेकिन परिवर्तित नहीं
 DocType: Manufacturing Settings,Manufacturing Settings,विनिर्माण सेटिंग्स
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,ईमेल स्थापना
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 मोबाइल नं
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,कंपनी मास्टर में डिफ़ॉल्ट मुद्रा दर्ज करें
 DocType: Stock Entry Detail,Stock Entry Detail,शेयर एंट्री विस्तार
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,दैनिक अनुस्मारक
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,दैनिक अनुस्मारक
 DocType: Products Settings,Home Page is Products,होम पेज उत्पाद है
 ,Asset Depreciation Ledger,संपत्ति मूल्यह्रास खाता बही
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},साथ टैक्स नियम संघर्ष {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},साथ टैक्स नियम संघर्ष {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,नया खाता नाम
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,कच्चे माल की लागत की आपूर्ति
 DocType: Selling Settings,Settings for Selling Module,मॉड्यूल बेचना के लिए सेटिंग
@@ -4767,15 +4855,16 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,आइटम {0} भंडार वस्तु होना चाहिए
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,प्रगति गोदाम में डिफ़ॉल्ट वर्क
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,लेखांकन लेनदेन के लिए डिफ़ॉल्ट सेटिंग्स .
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया मानव संसाधन में कर्मचारी नामकरण प्रणाली&gt; एचआर सेटिंग्स सेट करें
 DocType: Maintenance Visit,MV,एमवी
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,उम्मीद की तारीख सामग्री अनुरोध तिथि से पहले नहीं हो सकता
+DocType: Restaurant,Default Tax Template,डिफ़ॉल्ट कर टेम्पलेट
 DocType: Fees,Student Details,छात्र विवरण
 DocType: Purchase Invoice Item,Stock Qty,स्टॉक मात्रा
 DocType: Employee Loan,Repayment Period in Months,महीने में चुकाने की अवधि
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,त्रुटि: नहीं एक वैध पहचान?
 DocType: Naming Series,Update Series Number,अद्यतन सीरीज नंबर
 DocType: Account,Equity,इक्विटी
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +78,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;लाभ और हानि&#39; प्रकार के खाते {2} खुलने एंट्री में अनुमति नहीं
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +78,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: 'लाभ और हानि' प्रकार के खाते {2} खुली प्रविष्टी में अनुमति नहीं
 DocType: Sales Order,Printing Details,मुद्रण विवरण
 DocType: Task,Closing Date,तिथि समापन
 DocType: Sales Order Item,Produced Quantity,उत्पादित मात्रा
@@ -4786,8 +4875,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,आइटम पर जाएं
 DocType: Sales Partner,Partner Type,साथी के प्रकार
 DocType: Purchase Taxes and Charges,Actual,वास्तविक
+DocType: Restaurant Menu,Restaurant Manager,रेस्टोरेंट मैनेजर
 DocType: Authorization Rule,Customerwise Discount,Customerwise डिस्काउंट
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,कार्यों के लिए समय पत्रक।
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,कार्यों के लिए समय पत्रक।
 DocType: Purchase Invoice,Against Expense Account,व्यय खाते के खिलाफ
 DocType: Production Order,Production Order,उत्पादन का आदेश
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,स्थापना नोट {0} पहले से ही प्रस्तुत किया गया है
@@ -4795,7 +4885,6 @@
 DocType: Quotation Item,Against Docname,Docname खिलाफ
 DocType: SMS Center,All Employee (Active),सभी कर्मचारी (सक्रिय)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,अब देखें
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,अवधि का चयन करें जब चालान स्वतः उत्पन्न हो जाएगा
 DocType: BOM,Raw Material Cost,कच्चे माल की लागत
 DocType: Item Reorder,Re-Order Level,स्तर पुनः क्रमित करें
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"वस्तुओं और योजना बनाई मात्रा दर्ज करें, जिसके लिए आप उत्पादन के आदेश को बढ़ाने या विश्लेषण के लिए कच्चे माल के डाउनलोड करना चाहते हैं."
@@ -4808,23 +4897,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,रिपोर्ट प्रकार अनिवार्य है
 DocType: Item,Serial Number Series,सीरियल नंबर सीरीज
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},गोदाम स्टॉक मद के लिए अनिवार्य है {0} पंक्ति में {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,प्रोग्राम जोड़ें
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,खुदरा और थोक
 DocType: Issue,First Responded On,पर पहले जवाब
 DocType: Website Item Group,Cross Listing of Item in multiple groups,कई समूहों में आइटम के क्रॉस लिस्टिंग
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},वित्तीय वर्ष प्रारंभ तिथि और वित्तीय वर्ष के अंत तिथि पहले से ही वित्त वर्ष में स्थापित कर रहे हैं {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,क्लीयरेंस दिनांक अद्यतन
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,स्प्लिट बैच
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,स्प्लिट बैच
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,सफलतापूर्वक राज़ी
 DocType: Request for Quotation Supplier,Download PDF,पीडीएफ़ डाउनलोड करें
 DocType: Production Order,Planned End Date,नियोजित समाप्ति तिथि
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,कृपया शेड्यूल तिथि दर्ज करें
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,आइटम कहाँ संग्रहीत हैं.
 DocType: Request for Quotation,Supplier Detail,प्रदायक विस्तार
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},सूत्र या हालत में त्रुटि: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},सूत्र या हालत में त्रुटि: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,चालान राशि
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,मानदंड का भार 100% तक जोड़ना चाहिए
 DocType: Attendance,Attendance,उपस्थिति
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,स्टॉक आइटम
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,स्टॉक आइटम
 DocType: BOM,Materials,सामग्री
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","अगर जाँच नहीं किया गया है, इस सूची के लिए प्रत्येक विभाग है जहां इसे लागू किया गया है के लिए जोड़ा जा होगा."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,स्रोत और लक्ष्य गोदाम ही नहीं हो सकता
@@ -4842,6 +4931,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,नेट कुल
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},{0} विशेषता के लिए मान की सीमा के भीतर होना चाहिए {1} {2} की वेतन वृद्धि में {3} मद के लिए {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,पंक्ति में लक्ष्य गोदाम {0} के रूप में ही किया जाना चाहिए उत्पादन का आदेश
+DocType: Restaurant Reservation,Waitlisted,प्रतीक्षा सूची
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,मुद्रा कुछ अन्य मुद्रा का उपयोग प्रविष्टियों करने के बाद बदला नहीं जा सकता
 DocType: Vehicle Service,Clutch Plate,क्लच प्लेट
 DocType: Company,Round Off Account,खाता बंद दौर
@@ -4858,7 +4948,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,नई बिक्री व्यक्ति का नाम
 DocType: Packing Slip,Gross Weight UOM,सकल वजन UOM
 DocType: Delivery Note Item,Against Sales Invoice,बिक्री चालान के खिलाफ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,कृपया धारावाहिक आइटम के लिए सीरियल नंबर दर्ज करें
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,कृपया धारावाहिक आइटम के लिए सीरियल नंबर दर्ज करें
 DocType: Bin,Reserved Qty for Production,उत्पादन के लिए मात्रा सुरक्षित
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,अनियंत्रित छोड़ें यदि आप पाठ्यक्रम आधारित समूहों को बनाने के दौरान बैच पर विचार नहीं करना चाहते हैं
 DocType: Asset,Frequency of Depreciation (Months),मूल्यह्रास की आवृत्ति (माह)
@@ -4869,7 +4959,7 @@
 DocType: Lab Test,Test Group,टेस्ट ग्रुप
 DocType: Payment Reconciliation,Receivable / Payable Account,प्राप्य / देय खाता
 DocType: Delivery Note Item,Against Sales Order Item,बिक्री आदेश आइटम के खिलाफ
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},विशेषता के लिए विशेषता मान निर्दिष्ट करें {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},विशेषता के लिए विशेषता मान निर्दिष्ट करें {0}
 DocType: Item,Default Warehouse,डिफ़ॉल्ट गोदाम
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},बजट समूह खाते के खिलाफ नहीं सौंपा जा सकता {0}
 DocType: Healthcare Settings,Patient Registration,रोगी पंजीकरण
@@ -4898,6 +4988,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,बिक्री व्यक्ति
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,बजट और लागत केंद्र
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,भुगतान के कई डिफ़ॉल्ट मोड की अनुमति नहीं है
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,के लिए
 ,Appointment Analytics,नियुक्ति विश्लेषिकी
 DocType: Vehicle Service,Half Yearly,छमाही
 DocType: Lead,Blog Subscriber,ब्लॉग सब्सक्राइबर
@@ -4905,7 +4996,7 @@
 DocType: Healthcare Settings,Consultations in valid days,वैध दिनों में परामर्श
 DocType: Assessment Plan Criteria,Maximum Score,अधिकतम स्कोर
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,मूल्यों पर आधारित लेनदेन को प्रतिबंधित करने के नियम बनाएँ .
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +49, Group Roll No,समूह रोल नंबर
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +49, Group Roll No,समूह क्रमांंक
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +9,Fee Creation Failed,शुल्क निर्माण विफल
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,अगर आप प्रति वर्ष छात्र समूह बनाते हैं तो रिक्त छोड़ दें
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","जाँच की, तो कुल नहीं. कार्य दिवस की छुट्टियों में शामिल होगा, और यह प्रति दिन वेतन का मूल्य कम हो जाएगा"
@@ -4915,7 +5006,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,कोट गणना
 ,BOM Stock Report,बीओएम स्टॉक रिपोर्ट
 DocType: Stock Reconciliation Item,Quantity Difference,मात्रा अंतर
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,प्रसंस्करण पेरोल
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,प्रसंस्करण पेरोल
 DocType: Opportunity Item,Basic Rate,मूल दर
 DocType: GL Entry,Credit Amount,राशि क्रेडिट करें
 DocType: Cheque Print Template,Signatory Position,हस्ताक्षरकर्ता स्थान
@@ -4929,12 +5020,12 @@
 DocType: Tax Rule,Tax Rule,टैक्स नियम
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,बिक्री चक्र के दौरान एक ही दर बनाए रखें
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,कार्य केंद्र के कार्य के घंटे के बाहर समय लॉग्स की योजना बनाएँ।
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,कतार में ग्राहकों
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,डॉ {0} में फिजिशियन अनुसूची नहीं है फिजिशियन मास्टर में इसे जोड़ें
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,कतार में ग्राहकों
 DocType: Student,Nationality,राष्ट्रीयता
 ,Items To Be Requested,अनुरोध किया जा करने के लिए आइटम
-DocType: Purchase Order,Get Last Purchase Rate,पिछले खरीद दर
 DocType: Company,Company Info,कंपनी की जानकारी
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,का चयन करें या नए ग्राहक जोड़ने
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,का चयन करें या नए ग्राहक जोड़ने
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,लागत केंद्र एक व्यय का दावा बुक करने के लिए आवश्यक है
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),फंड के अनुप्रयोग ( संपत्ति)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,यह इस कर्मचारी की उपस्थिति पर आधारित है
@@ -4942,9 +5033,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,डेबिट अकाउंट
 DocType: Fiscal Year,Year Start Date,वर्ष प्रारंभ दिनांक
 DocType: Attendance,Employee Name,कर्मचारी का नाम
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,रेस्तरां आदेश प्रविष्टि आइटम
 DocType: Sales Invoice,Rounded Total (Company Currency),गोल कुल (कंपनी मुद्रा)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"खाते का प्रकार चयन किया जाता है, क्योंकि समूह को गुप्त नहीं कर सकते।"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} संशोधित किया गया है . रीफ्रेश करें.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} संशोधित किया गया है . फ़िर से दूबारा करें.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,निम्नलिखित दिन पर छुट्टी अनुप्रयोग बनाने से उपयोगकर्ताओं को बंद करो.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,खरीद ने का मूलय
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +259,Supplier Quotation {0} created,प्रदायक कोटेशन {0} बनाया
@@ -4952,6 +5044,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,कर्मचारी लाभ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},{0} पंक्ति में {1} पैक्ड मात्रा आइटम के लिए मात्रा के बराबर होना चाहिए
 DocType: Production Order,Manufactured Qty,निर्मित मात्रा
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,चालान बनाया
 DocType: Purchase Receipt Item,Accepted Quantity,स्वीकार किए जाते हैं मात्रा
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},एक डिफ़ॉल्ट कर्मचारी के लिए छुट्टी सूची सेट करें {0} {1} या कंपनी
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} करता नहीं मौजूद है
@@ -4961,18 +5054,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},पंक्ति कोई {0}: राशि व्यय दावा {1} के खिलाफ राशि लंबित से अधिक नहीं हो सकता है। लंबित राशि है {2}
 DocType: Maintenance Schedule,Schedule,अनुसूची
 DocType: Account,Parent Account,खाते के जनक
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,उपलब्ध
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,उपलब्ध
 DocType: Quality Inspection Reading,Reading 3,3 पढ़ना
 ,Hub,हब
 DocType: GL Entry,Voucher Type,वाउचर प्रकार
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,मूल्य सूची पाया या निष्क्रिय नहीं
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,मूल्य सूची पाया या निष्क्रिय नहीं
 DocType: Lab Test,Approved,अनुमोदित
 DocType: Pricing Rule,Price,कीमत
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',{0} को राहत मिली कर्मचारी 'वाम ' के रूप में स्थापित किया जाना चाहिए
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',{0} को राहत मिली कर्मचारी 'वाम ' के रूप में स्थापित किया जाना चाहिए
+DocType: Hub Settings,Last Sync On,अंतिम सिंक ऑन
 DocType: Guardian,Guardian,अभिभावक
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,मूल्यांकन {0} {1} निश्चित तिथि सीमा में कर्मचारी के लिए बनाया
 DocType: Employee,Education,शिक्षा
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,डेल
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,डेल
 DocType: Selling Settings,Campaign Naming By,अभियान नामकरण से
 DocType: Employee,Current Address Is,वर्तमान पता है
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,मासिक बिक्री लक्ष्य (
@@ -4987,7 +5081,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,विषय क्रमांक:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,व्यय खाते में प्रवेश करें
 DocType: Account,Stock,स्टॉक
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","पंक्ति # {0}: संदर्भ दस्तावेज़ प्रकार खरीद आदेश में से एक, चालान की खरीद या जर्नल प्रविष्टि होना चाहिए"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","पंक्ति # {0}: संदर्भ दस्तावेज़ प्रकार खरीद आदेश में से एक, चालान की खरीद या जर्नल प्रविष्टि होना चाहिए"
 DocType: Employee,Current Address,वर्तमान पता
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","स्पष्ट रूप से जब तक निर्दिष्ट मद तो विवरण, छवि, मूल्य निर्धारण, करों टेम्पलेट से निर्धारित किया जाएगा आदि एक और आइटम का एक प्रकार है, तो"
 DocType: Serial No,Purchase / Manufacture Details,खरीद / निर्माण विवरण
@@ -5018,7 +5112,7 @@
 DocType: Hub Settings,Hub Settings,हब सेटिंग्स
 DocType: Project,Gross Margin %,सकल मार्जिन%
 DocType: BOM,With Operations,आपरेशनों के साथ
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,लेखांकन प्रविष्टियों पहले से ही मुद्रा में किया गया है {0} कंपनी के लिए {1}। मुद्रा के साथ एक प्राप्य या देय खाते का चयन करें {0}।
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,लेखांकन प्रविष्टियों पहले से ही मुद्रा में किया गया है {0} कंपनी के लिए {1}। मुद्रा के साथ एक प्राप्य या देय खाते का चयन करें {0}।
 DocType: Asset,Is Existing Asset,मौजूदा परिसंपत्ति है
 DocType: Salary Detail,Statistical Component,सांख्यिकीय घटक
 DocType: Warranty Claim,If different than customer address,यदि ग्राहक पते से अलग
@@ -5026,13 +5120,14 @@
 DocType: BOM Operation,BOM Operation,बीओएम ऑपरेशन
 DocType: Purchase Taxes and Charges,On Previous Row Amount,पिछली पंक्ति राशि पर
 DocType: Student,Home Address,घर का पता
+DocType: Item,Has Expiry Date,समाप्ति तिथि है
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,आइटम विविध सेटिंग्स
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,स्थानांतरण एसेट
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,स्थानांतरण एसेट
 DocType: POS Profile,POS Profile,पीओएस प्रोफ़ाइल
 DocType: Training Event,Event Name,कार्यक्रम नाम
 DocType: Physician,Phone (Office),फ़ोन (कार्यालय)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,दाखिला
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},प्रवेश के लिए {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,दाखिला
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},प्रवेश के लिए {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","सेटिंग बजट, लक्ष्य आदि के लिए मौसम"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,चर का नाम
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","{0} आइटम एक टेम्पलेट है, इसके वेरिएंट में से एक का चयन करें"
@@ -5041,7 +5136,7 @@
 DocType: Assessment Plan,Room,कक्ष
 DocType: Purchase Order,Advance Paid,अग्रिम भुगतान
 DocType: Item,Item Tax,आइटम टैक्स
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,प्रदायक के लिए सामग्री
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,प्रदायक के लिए सामग्री
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,आबकारी चालान
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% से अधिक बार दिखाई देता है
 DocType: Expense Claim,Employees Email Id,ईमेल आईडी कर्मचारी
@@ -5052,32 +5147,30 @@
 DocType: Program,Program Name,कार्यक्रम का नाम
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,टैक्स या प्रभार के लिए पर विचार
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,वास्तविक मात्रा अनिवार्य है
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} वर्तमान में एक {1} सप्लायर स्कोरकार्ड खड़ा है, और इस आपूर्तिकर्ता को खरीद आदेश सावधानी के साथ जारी किए जाने चाहिए।"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} वर्तमान में एक {1} सप्लायर स्कोरकार्ड खड़ा है, और इस आपूर्तिकर्ता को खरीद आदेश सावधानी के साथ जारी किए जाने चाहिए।"
 DocType: Employee Loan,Loan Type,प्रकार के ऋण
 DocType: Scheduling Tool,Scheduling Tool,शेड्यूलिंग उपकरण
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,क्रेडिट कार्ड
 DocType: BOM,Item to be manufactured or repacked,आइटम निर्मित किया जा या repacked
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,शेयर लेनदेन के लिए डिफ़ॉल्ट सेटिंग्स .
-DocType: Purchase Invoice,Next Date,अगली तारीख
 DocType: Employee Education,Major/Optional Subjects,मेजर / वैकल्पिक विषय
 DocType: Sales Invoice Item,Drop Ship,ड्रॉप जहाज
+DocType: Hub Settings,Suspended,बर्खास्त कर दिया
 DocType: Training Event,Attendees,सहभागी
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","यहाँ आप परिवार और माता - पिता, पति या पत्नी और बच्चों के नाम, व्यवसाय की तरह बनाए रख सकते हैं"
 DocType: Academic Term,Term End Date,सत्रांत दिनांक
-DocType: Hub Settings,Seller Name,विक्रेता का नाम
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),कर और शुल्क कटौती (कंपनी मुद्रा)
 DocType: Item Group,General Settings,सामान्य सेटिंग्स
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,मुद्रा से और मुद्रा ही नहीं किया जा सकता है
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,प्रशिक्षक जोड़ें
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,आगे बढ़ने से पहले फार्म सहेजना चाहिए
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,कृपया पहले कंपनी का चयन करें
 DocType: Item Attribute,Numeric Values,संख्यात्मक मान
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,लोगो अटैच
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,भंडारण स्तर
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,भंडारण स्तर
 DocType: Customer,Commission Rate,आयोग दर
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,{1} के लिए {1} स्कोरकार्ड बनाया:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,संस्करण बनाओ
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,संस्करण बनाओ
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,विभाग द्वारा आवेदन छोड़ मै.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","भुगतान प्रकार, प्राप्त की एक होना चाहिए वेतन और आंतरिक स्थानांतरण"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,एनालिटिक्स
@@ -5092,11 +5185,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,शेयर पूंजी
 DocType: Shopping Cart Settings,Show Public Attachments,सार्वजनिक अनुलग्नक दिखाएं
 DocType: Packing Slip,Package Weight Details,पैकेज वजन विवरण
+DocType: Restaurant Reservation,Reservation Time,आरक्षण का समय
 DocType: Payment Gateway Account,Payment Gateway Account,पेमेंट गेटवे खाते
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,भुगतान पूरा होने के बाद चयनित पृष्ठ के लिए उपयोगकर्ता अनुप्रेषित।
 DocType: Company,Existing Company,मौजूदा कंपनी
 DocType: Healthcare Settings,Result Emailed,परिणाम ईमेल ईमेल
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",कर श्रेणी को &quot;कुल&quot; में बदल दिया गया है क्योंकि सभी आइटम गैर-स्टॉक आइटम हैं
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,आइटम कोड&gt; आइटम समूह&gt; ब्रांड
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,एक csv फ़ाइल का चयन करें
 DocType: Student Leave Application,Mark as Present,उपहार के रूप में मार्क
 DocType: Supplier Scorecard,Indicator Color,सूचक रंग
@@ -5121,11 +5216,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,छात्र बैच बनाने
 DocType: Fee Schedule,FRQ.,FRQ।
 DocType: Leave Type,Is Carry Forward,क्या आगे ले जाना
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,बीओएम से आइटम प्राप्त
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,बीओएम से आइटम प्राप्त
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,लीड समय दिन
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},पंक्ति # {0}: पोस्ट दिनांक खरीद की तारीख के रूप में ही होना चाहिए {1} संपत्ति का {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,यह जाँच लें कि छात्र संस्थान के छात्रावास में रह रहा है।
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,उपरोक्त तालिका में विक्रय आदेश दर्ज करें
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,उपरोक्त तालिका में विक्रय आदेश दर्ज करें
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,प्रस्तुत नहीं वेतन निकल जाता है
 ,Stock Summary,स्टॉक सारांश
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,दूसरे के लिए एक गोदाम से एक संपत्ति स्थानांतरण
@@ -5141,5 +5236,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},पंक्ति {0}: {1} डेबिट प्रविष्टि के साथ नहीं जोड़ा जा सकता है
 DocType: Journal Entry,Subscription Section,सदस्यता अनुभाग
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,खाते {0} मौजूद नहीं है
+DocType: Training Event,Training Program,प्रशिक्षण कार्यक्रम
 DocType: Account,Cash,नकद
 DocType: Employee,Short biography for website and other publications.,वेबसाइट और अन्य प्रकाशनों के लिए लघु जीवनी.
diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv
index 7a3e33c..1a16de9 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Plaća način
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Registrirajte se
 DocType: Patient,Divorced,Rastavljen
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Stavke već sinkronizirane
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Dopusti Stavka biti dodan više puta u transakciji
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Odustani Materijal Posjetite {0} prije otkazivanja ovog jamstva se
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Osobe ovlaštene za odobrenje odsustva
 DocType: Sales Partner,Dealer,Trgovac
 DocType: Consultation,Investigations,istraživanja
+DocType: Restaurant Order Entry,Click Enter To Add,Kliknite Unesi za dodavanje
 DocType: Employee,Rented,Iznajmljeno
 DocType: Purchase Order,PO-,po-
 DocType: POS Profile,Applicable for User,Primjenjivo za članove
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zaustavljen Proizvodnja Red ne može biti otkazana, odčepiti najprije otkazati"
 DocType: Vehicle Service,Mileage,Kilometraža
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Da li zaista želite odbaciti ovu imovinu?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Da li zaista želite odbaciti ovu imovinu?
 DocType: Drug Prescription,Update Schedule,Ažuriraj raspored
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Odabir Primarna Dobavljač
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Valuta je potrebna za cjenik {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Provjera dostupnosti
 DocType: Job Applicant,Job Applicant,Posao podnositelj
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,To se temelji na transakcijama protiv tog dobavljača. Pogledajte vremensku crtu ispod za detalje
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nema više rezultata.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Pravni
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Stvarni tipa porez ne može biti uključen u stopu stavka u nizu {0}
 DocType: Bank Guarantee,Customer,Kupac
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Tečaj mora biti ista kao {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Naziv klijenta
 DocType: Vehicle,Natural Gas,Prirodni gas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Bankovni račun ne može biti imenovan kao {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Bankovni račun ne može biti imenovan kao {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Šefovi (ili skupine) od kojih računovodstvenih unosa su i sredstva su održavani.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Izvanredna za {0} ne može biti manji od nule ( {1} )
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Nema obrađenih Plaćanja.
 DocType: Manufacturing Settings,Default 10 mins,Default 10 min
 DocType: Leave Type,Leave Type Name,Naziv vrste odsustva
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Prikaži otvorena
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Potrebno je danas poduzimati tu akciju za gore navedeno ponavljanje
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Serija je uspješno ažurirana
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Provjeri
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural Journal Entry Prijavljen
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Stavke narudžbenice za zaprimanje
 DocType: SMS Center,All Supplier Contact,Svi kontakti dobavljača
 DocType: Support Settings,Support Settings,Postavke za podršku
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Očekivani datum završetka ne može biti manji od očekivanog početka Datum
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Očekivani datum završetka ne može biti manji od očekivanog početka Datum
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Red # {0}: Ocijenite mora biti ista kao {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Novi dopust Primjena
 ,Batch Item Expiry Status,Hrpa Stavka isteka Status
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Bank Nacrt
 DocType: Mode of Payment Account,Mode of Payment Account,Način plaćanja računa
 DocType: Consultation,Consultation,Konzultacija
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Prodaja i povrat
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Pokaži varijante
 DocType: Academic Term,Academic Term,Akademski pojam
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materijal
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Health Care
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Kašnjenje u plaćanju (dani)
 DocType: Lab Prescription,Lab Prescription,Lab Prescription
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Poredaj po cijeni
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,usluga Rashodi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijski broj: {0} već se odnosi na prodajnu fakturu: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Faktura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijski broj: {0} već se odnosi na prodajnu fakturu: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskalna godina {0} je potrebno
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrana
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Red # {0}:
 DocType: Timesheet,Total Costing Amount,Ukupno Obračun troškova Iznos
 DocType: Delivery Note,Vehicle No,Ne vozila
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Molim odaberite cjenik
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Molim odaberite cjenik
 DocType: Accounts Settings,Currency Exchange Settings,Postavke mjenjačke valute
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Red # {0}: dokument Plaćanje je potrebno za dovršenje trasaction
 DocType: Production Order Operation,Work In Progress,Radovi u tijeku
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Odaberite datum
-DocType: Employee,Holiday List,Turistička Popis
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Postavite instruktor sustava za imenovanje u školi&gt; Školske postavke
+DocType: Employee,Holiday List,Popis praznika
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Knjigovođa
+DocType: Hub Settings,Selling Price List,Cjenik prodaje
 DocType: Patient,Tobacco Current Use,Duhanska struja
 DocType: Cost Center,Stock User,Stock Korisnik
 DocType: Company,Phone No,Telefonski broj
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Raspored predmeta izrađen:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Novi {0}: #{1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Novi {0}: #{1}
 ,Sales Partners Commission,Provizija prodajnih partnera
 DocType: Purchase Invoice,Rounding Adjustment,Podešavanje zaokruživanja
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Kratica ne može imati više od 5 znakova
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Nadređeni detalj docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referenca: {0}, šifra stavke: {1} i klijent: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,kg
-DocType: Student Log,Log,Prijava
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Otvaranje za posao.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Rezultat poslan
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Rezultat poslan
 DocType: Item Attribute,Increment,Pomak
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Vremenski raspon
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Odaberite Warehouse ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Oženjen
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Nije dopušteno {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Nabavite stavke iz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Proizvod {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nema navedenih stavki
 DocType: Payment Reconciliation,Reconcile,pomiriti
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Mirovinski fondovi
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Sljedeća Amortizacija Datum ne može biti prije Datum kupnje
 DocType: Consultation,Consultation Date,Datum konzultacije
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Popis proizvoda i otkriće za korisnike ERP-a
 DocType: SMS Center,All Sales Person,Svi prodavači
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Mjesečna distribucija ** pomaže vam rasporediti proračun / Target preko mjeseca, ako imate sezonalnost u Vašem poslovanju."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Nije pronađen stavke
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Struktura plaća Nedostaje
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Nije pronađen stavke
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Struktura plaća Nedostaje
 DocType: Lead,Person Name,Osoba ime
 DocType: Sales Invoice Item,Sales Invoice Item,Prodajni proizvodi
 DocType: Account,Credit,Kredit
 DocType: POS Profile,Write Off Cost Center,Otpis troška
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",npr &quot;Osnovna škola&quot; ili &quot;Sveučilište&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",npr &quot;Osnovna škola&quot; ili &quot;Sveučilište&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,dionica izvješća
 DocType: Warehouse,Warehouse Detail,Detalji o skladištu
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prešao na kupca {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Datum Pojam završetka ne može biti kasnije od godine datum završetka školske godine u kojoj je pojam vezan (Akademska godina {}). Ispravite datume i pokušajte ponovno.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Je nepokretne imovine&quot; ne može biti potvrđen, što postoji imovinom rekord protiv stavku"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""je nepokretna imovina"" se ne može ne označiti, jer postoji zapis o Imovini nad navedenom stavkom"
 DocType: Vehicle Service,Brake Oil,ulje za kočnice
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Grupa kupaca&gt; Teritorij
 DocType: Tax Rule,Tax Type,Porezna Tip
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Iznos oporezivanja
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Niste ovlašteni dodavati ili ažurirati unose prije {0}
 DocType: BOM,Item Image (if not slideshow),Slika proizvoda (ako nije slide prikaz)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Kupac postoji s istim imenom
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Broj sati / 60) * Stvarno trajanje operacije
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Redak # {0}: Referentni tip dokumenta mora biti jedan od zahtjeva za trošak ili unos dnevnika
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Odaberi BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Redak # {0}: Referentni tip dokumenta mora biti jedan od zahtjeva za trošak ili unos dnevnika
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Odaberi BOM
 DocType: SMS Log,SMS Log,SMS Prijava
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Troškovi isporučenih stavki
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Odmor na {0} nije između Od Datum i do sada
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,zaposlenik kredita
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Dnevnik aktivnosti:
 DocType: Fee Schedule,Send Payment Request Email,Pošaljite e-poštu za zahtjev za plaćanjem
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Proizvod {0} ne postoji u sustavu ili je istekao
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Proizvod {0} ne postoji u sustavu ili je istekao
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nekretnine
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Izjava o računu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutske
@@ -210,17 +213,22 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Uvoz Prijavite
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Povucite materijala zahtjev tipa Proizvodnja se temelji na gore navedenim kriterijima
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Uspješno neregistrirano.
 DocType: Training Result Employee,Grade,Razred
+DocType: Restaurant Table,No of Seats,Nema sjedala
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Da biste dodali dinamički predmet, upotrijebite oznake jinja poput <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Isporučio dobavljač
 DocType: SMS Center,All Contact,Svi kontakti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Proizvodnja Red je već stvorio za sve stavke s sastavnice
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Proizvodnja Red je već stvorio za sve stavke s sastavnice
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Godišnja plaća
 DocType: Daily Work Summary,Daily Work Summary,Dnevni rad Sažetak
 DocType: Period Closing Voucher,Closing Fiscal Year,Zatvaranje Fiskalna godina
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} je zamrznuta
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Odaberite postojeće tvrtke za izradu grafikona o računima
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} je zamrznuta
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Odaberite postojeće tvrtke za izradu grafikona o računima
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Stock Troškovi
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Odaberite Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Odaberite Target Warehouse
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Unesite igraca Kontakt email
 DocType: Program Enrollment,School Bus,Školski autobus
 DocType: Journal Entry,Contra Entry,Contra Stupanje
@@ -238,9 +246,10 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Preuzmite predložak, ispunite odgovarajuće podatke i priložiti izmijenjene datoteke.
  Sve datume i zaposlenika kombinacija u odabranom razdoblju doći će u predlošku s postojećim pohađanje evidencije"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Proizvod {0} nije aktivan ili nije došao do kraja roka valjanosti
+DocType: Student Admission Program,Minimum Age,Minimalna dob
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Primjer: Osnovni Matematika
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To uključuje porez u redu {0} u stopu točke , porezi u redovima {1} također moraju biti uključeni"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Postavke za HR modula
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Postavke za HR modula
 DocType: SMS Center,SMS Center,SMS centar
 DocType: Sales Invoice,Change Amount,Promjena Iznos
 DocType: BOM Update Tool,New BOM,Novi BOM
@@ -250,7 +259,7 @@
 DocType: Lead,Request Type,Zahtjev Tip
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Provjerite zaposlenik
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Radiodifuzija
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Dodaj sobe
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Način postavljanja POS (Online / Offline)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,izvršenje
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Pojedinosti o operacijama koje se provode.
 DocType: Serial No,Maintenance Status,Status održavanja
@@ -273,12 +282,13 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cjenik mora biti primjenjiv za kupnju ili prodaju
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Datum Instalacija ne može biti prije datuma isporuke za točke {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Popust na cjenik (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Biokemija
 DocType: Offer Letter,Select Terms and Conditions,Odaberite Uvjeti
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,Iz vrijednost
 DocType: Production Planning Tool,Sales Orders,Narudžbe kupca
 DocType: Purchase Taxes and Charges,Valuation,Procjena
 ,Purchase Order Trends,Trendovi narudžbenica kupnje
-apps/erpnext/erpnext/utilities/user_progress.py +75,Go to Customers,Idite na Kupci
+apps/erpnext/erpnext/utilities/user_progress.py +75,Go to Customers,Idite na Kupce
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Zahtjev za ponudu se može pristupiti klikom na sljedeći link
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Dodjela lišće za godinu dana.
 DocType: SG Creation Tool Course,SG Creation Tool Course,Tečaj SG alat za izradu
@@ -297,7 +307,7 @@
 DocType: Company,Enable Perpetual Inventory,Omogući trajnu zalihu
 DocType: Company,Default Payroll Payable Account,Zadana plaće Plaća račun
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +51,Update Email Group,Update Email Grupa
-DocType: Sales Invoice,Is Opening Entry,Je Otvaranje unos
+DocType: Sales Invoice,Is Opening Entry,je početni unos
 DocType: Lab Test Template,"If unchecked, the item wont be appear in Sales Invoice, but can be used in group test creation. ","Ako se ne označe, stavka neće biti prikazana u prodajnoj dostavnici, ali se može upotrebljavati u grupnom testiranju."
 DocType: Customer Group,Mention if non-standard receivable account applicable,Spomenuti ako nestandardni potraživanja računa primjenjivo
 DocType: Course Schedule,Instructor Name,Instruktor Ime
@@ -307,15 +317,15 @@
 DocType: Sales Partner,Reseller,Prodavač
 DocType: Codification Table,Medical Code,Medicinski kodeks
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Ako je označeno, će uključivati stavke bez zaliha u materijalu zahtjeva."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Unesite tvrtke
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Unesite tvrtke
 DocType: Delivery Note Item,Against Sales Invoice Item,Protiv prodaje dostavnice točke
 ,Production Orders in Progress,Radni nalozi u tijeku
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Neto novčani tijek iz financijskih
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage puna, nije štedjelo"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage puna, nije štedjelo"
 DocType: Lead,Address & Contact,Adresa i kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj neiskorištenih lišće iz prethodnih dodjela
 DocType: Sales Partner,Partner website,website partnera
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Dodaj stavku
+DocType: Restaurant Order Entry,Add Item,Dodaj stavku
 DocType: Lab Test,Custom Result,Prilagođeni rezultat
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Kontakt ime
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kriteriji za procjenu predmeta
@@ -328,7 +338,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Zahtjev za kupnju.
 DocType: Lab Test,Submitted Date,Poslani datum
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,To se temelji na vremenske tablice stvorene na ovom projektu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Neto plaća ne može biti manja od 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Neto plaća ne može biti manja od 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Da bismo zaustavili slanje ponavljajućih obavijesti o pogreškama iz sustava, u pretplati smo označili polje Onemogućeno"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Samo osoba ovlaštena za odobrenje odsustva može potvrditi zahtjev za odsustvom
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Olakšavanja Datum mora biti veći od dana ulaska u
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Ostavlja godišnje
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,Gubitak profita
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Litre
 DocType: Task,Total Costing Amount (via Time Sheet),Ukupno troška Iznos (preko vremenska tablica)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Postavite učenike u Studentske grupe
 DocType: Item Website Specification,Item Website Specification,Specifikacija web stranice proizvoda
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Neodobreno odsustvo
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Proizvod {0} je dosegao svoj rok trajanja na {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Proizvod {0} je dosegao svoj rok trajanja na {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Bankovni tekstova
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,godišnji
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock pomirenje točka
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Tečaj Student Grupa alat za izradu
 DocType: Lead,Do Not Contact,Ne kontaktirati
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,Ljudi koji uče u svojoj organizaciji
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Jedinstveni ID za praćenje svih ponavljajući fakture. To je izrađen podnijeti.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimalna količina narudžbe
 DocType: Pricing Rule,Supplier Type,Dobavljač Tip
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,Objavi na Hub
 DocType: Student Admission,Student Admission,Studentski Ulaz
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Proizvod {0} je otkazan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Zahtjev za robom
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Proizvod {0} je otkazan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Zahtjev za robom
 DocType: Bank Reconciliation,Update Clearance Date,Ažurirajte provjeri datum
 DocType: Item,Purchase Details,Detalji nabave
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Stavka {0} nije pronađena u &quot;sirovina nabavlja se &#39;stol narudžbenice {1}
 DocType: Patient Relation,Relation,Odnos
 DocType: Shipping Rule,Worldwide Shipping,Dostava u svijetu
 DocType: Patient Relation,Mother,Majka
+DocType: Restaurant Reservation,Reservation End Time,Vrijeme završetka rezervacije
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Potvrđene narudžbe kupaca.
 DocType: Purchase Receipt Item,Rejected Quantity,Odbijen Količina
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Izrađen je zahtjev za plaćanje {0}
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Izrađen je zahtjev za plaćanje {0}
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Niska osjetljivost
 DocType: Notification Control,Notification Control,Obavijest kontrole
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Potvrdite nakon završetka obuke
 DocType: Lead,Suggestions,Prijedlozi
@@ -388,7 +401,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,E-mail plaće slip da zaposleniku na temelju preferiranih e-mail koji ste odabrali u zaposlenika
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Prvi dopust Odobritelj na popisu će se postaviti kao zadani Odobritelj dopust
 DocType: Tax Rule,Shipping County,dostava županija
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Naučiti
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Naučiti
 DocType: Asset,Next Depreciation Date,Sljedeći datum Amortizacija
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivnost Cijena po zaposlenom
 DocType: Accounts Settings,Settings for Accounts,Postavke za račune
@@ -399,13 +412,13 @@
 DocType: Item,Synced With Hub,Sinkronizirati s Hub
 DocType: Vehicle,Fleet Manager,Fleet Manager
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Red # {0}: {1} ne može biti negativna za predmet {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Pogrešna Lozinka
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Pogrešna Lozinka
 DocType: Item,Variant Of,Varijanta
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Završen Qty ne može biti veći od 'Kol proizvoditi'
 DocType: Period Closing Voucher,Closing Account Head,Zatvaranje računa šefa
 DocType: Employee,External Work History,Vanjski Povijest Posao
 DocType: Physician,Time per Appointment,Vrijeme po imenovanju
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Kružni Referentna Greška
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Kružni Referentna Greška
 DocType: Appointment Type,Is Inpatient,Je li bolestan
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Ime Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Riječima (izvoz) će biti vidljivo nakon što spremite otpremnicu.
@@ -414,19 +427,18 @@
 DocType: Lead,Industry,Industrija
 DocType: Employee,Job Profile,Profil posla
 DocType: BOM Item,Rate & Amount,Ocijenite i iznosite
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Postavite serijske brojeve za prisustvovanje putem Setup&gt; Serija numeriranja
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,To se temelji na transakcijama protiv ove tvrtke. Pojedinosti potražite u nastavku
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Obavijest putem maila prilikom stvaranja automatskog Zahtjeva za robom
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,otporan
 DocType: Journal Entry,Multi Currency,Više valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Tip fakture
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Grupa kupaca&gt; Teritorij
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Otpremnica
 DocType: Consultation,Encounter Impression,Susret susreta
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Postavljanje Porezi
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Troškovi prodane imovinom
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,Ulazak Plaćanje je izmijenjen nakon što ga je izvukao. Ponovno izvucite ga.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} dva puta ušao u točki poreza
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Sažetak za ovaj tjedan i tijeku aktivnosti
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} dva puta ušao u točki poreza
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Sažetak za ovaj tjedan i tijeku aktivnosti
 DocType: Student Applicant,Admitted,priznao
 DocType: Workstation,Rent Cost,Rent cost
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Iznos nakon amortizacije
@@ -440,36 +452,35 @@
 DocType: Shipping Rule,Valid for Countries,Vrijedi za zemlje
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ova točka je predložak i ne može se koristiti u prometu. Atributi artikl će biti kopirana u varijanti osim 'Ne Copy ""je postavljena"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Ukupno Naručite Smatra
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Oznaka zaposlenika ( npr. CEO , direktor i sl. ) ."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Oznaka zaposlenika ( npr. CEO , direktor i sl. ) ."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Stopa po kojoj Kupac valuta se pretvaraju u kupca osnovne valute
 DocType: Course Scheduling Tool,Course Scheduling Tool,Naravno alat za raspoređivanje
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},"Red # {0}: Kupnja Račun, ne može se protiv postojećeg sredstva {1}"
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Urgent] Pogreška pri stvaranju ponavljajućeg% s za% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Hitno] Pogreška pri stvaranju ponavljajućeg% s za% s
 DocType: Item Tax,Tax Rate,Porezna stopa
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} već dodijeljeno za zaposlenika {1} za vrijeme {2} {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Odaberite stavku
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Odaberite stavku
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Nabavni račun {0} je već podnesen
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Red # {0}: Batch Ne mora biti ista kao {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Pretvori u ne-Group
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Serija (puno) proizvoda.
 DocType: C-Form Invoice Detail,Invoice Date,Datum računa
 DocType: GL Entry,Debit Amount,Duguje iznos
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Tu može biti samo 1 račun po društvo u {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Pogledajte prilog
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Tu može biti samo 1 račun po društvo u {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Pogledajte prilog
 DocType: Purchase Order,% Received,% Zaprimljeno
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Stvaranje grupe učenika
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Postavke su već kompletne!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Postavke su već kompletne!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Iznos uplate kredita
 DocType: Setup Progress Action,Action Document,Akcijski dokument
 ,Finished Goods,Gotovi proizvodi
 DocType: Delivery Note,Instructions,Instrukcije
 DocType: Quality Inspection,Inspected By,Pregledati
 DocType: Maintenance Visit,Maintenance Type,Tip održavanja
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} nije upisana u tečaj {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Šifra stavke&gt; Skupina stavke&gt; Brand
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} nije upisana u tečaj {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serijski Ne {0} ne pripada isporuke Napomena {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Dodaj artikle
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Dodaj artikle
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parametar provjere kvalitete proizvoda
 DocType: Leave Application,Leave Approver Name,Ime osobe ovlaštene za odobrenje odsustva
 DocType: Depreciation Schedule,Schedule Date,Raspored Datum
@@ -489,7 +500,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Radnih sati
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Promjena polaznu / tekući redni broj postojeće serije.
 DocType: Dosage Strength,Strength,snaga
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Stvaranje novog kupca
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Stvaranje novog kupca
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ako više Cijene pravila i dalje prevladavaju, korisnici su zamoljeni da postavite prioritet ručno riješiti sukob."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Izrada narudžbenice
 ,Purchase Register,Popis nabave
@@ -508,7 +519,7 @@
 DocType: Lab Test Template,Single,Singl
 DocType: Salary Slip,Total Loan Repayment,Ukupno otplate kredita
 DocType: Account,Cost of Goods Sold,Troškovi prodane robe
-DocType: Purchase Invoice,Yearly,Godišnji
+DocType: Subscription,Yearly,Godišnji
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Unesite troška
 DocType: Drug Prescription,Dosage,Doziranje
 DocType: Journal Entry Account,Sales Order,Narudžba kupca
@@ -538,7 +549,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globalne postavke za sve proizvodne procese.
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Frozen Upto
 DocType: SMS Log,Sent On,Poslan Na
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Osobina {0} izabrani više puta u Svojstva tablice
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Osobina {0} izabrani više puta u Svojstva tablice
 DocType: HR Settings,Employee record is created using selected field. ,Zaposlenika rekord je stvorio pomoću odabranog polja.
 DocType: Sales Order,Not Applicable,Nije primjenjivo
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Majstor za odmor .
@@ -563,13 +574,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Ukupno lišće izdvojena obvezna
 DocType: Patient,AB Positive,AB Pozitivan
 DocType: Job Opening,Description of a Job Opening,Opis je otvaranju novih radnih mjesta
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Čekanju aktivnosti za danas
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Čekanju aktivnosti za danas
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Rekord gledanosti
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Plaća Komponenta za timesheet temelju plaće.
 DocType: Sales Order Item,Used for Production Plan,Koristi se za plan proizvodnje
 DocType: Employee Loan,Total Payment,ukupno plaćanja
 DocType: Manufacturing Settings,Time Between Operations (in mins),Vrijeme između operacije (u minutama)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} je otkazana pa se radnja ne može dovršiti
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} je otkazana pa se radnja ne može dovršiti
 DocType: Customer,Buyer of Goods and Services.,Kupac robe i usluga.
 DocType: Journal Entry,Accounts Payable,Naplativi računi
 DocType: Patient,Allergies,Alergije
@@ -581,22 +592,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Upozorite narudžbenice
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Navedite nekoliko svojih kupaca. Oni mogu biti tvrtke ili fizičke osobe.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Dosta Dijelovi za izgradnju
+DocType: POS Profile User,POS Profile User,Korisnik POS profila
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Izravni dohodak
 DocType: Patient Appointment,Date TIme,Datum vrijeme
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Ne možete filtrirati na temelju računa, ako je grupirano po računu"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Administrativni službenik
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Odaberite Tečaj
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Odaberite Tečaj
 DocType: Codification Table,Codification Table,Tablica kodifikacije
 DocType: Timesheet Detail,Hrs,hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Odaberite tvrtke
 DocType: Stock Entry Detail,Difference Account,Račun razlike
 DocType: Purchase Invoice,Supplier GSTIN,Dobavljač GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Ne može zatvoriti zadatak kao njegova ovisna zadatak {0} nije zatvoren.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,Unesite skladište za koje Materijal Zahtjev će biti podignuta
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Ne može zatvoriti zadatak kao njegova ovisna zadatak {0} nije zatvoren.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Unesite skladište za koje Materijal Zahtjev će biti podignuta
 DocType: Production Order,Additional Operating Cost,Dodatni trošak
 DocType: Lab Test Template,Lab Routine,Laboratorijska rutina
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,kozmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
 DocType: Shipping Rule,Net Weight,Neto težina
 DocType: Employee,Emergency Phone,Telefon hitne službe
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Kupiti
@@ -606,7 +618,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Definirajte ocjenu za Prag 0%
 DocType: Sales Order,To Deliver,Za isporuku
 DocType: Purchase Invoice Item,Item,Proizvod
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Serijski nema stavke ne može biti dio
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Visoka osjetljivost
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Serijski nema stavke ne može biti dio
 DocType: Journal Entry,Difference (Dr - Cr),Razlika ( dr. - Cr )
 DocType: Account,Profit and Loss,Račun dobiti i gubitka
 DocType: Patient,Risk Factors,Faktori rizika
@@ -615,7 +628,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Upravljanje podugovaranje
 DocType: Vital Signs,Body Temperature,Temperatura tijela
 DocType: Project,Project will be accessible on the website to these users,Projekt će biti dostupan na web-stranici ovih korisnika
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Definiraj vrstu projekta.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Definiraj vrstu projekta.
 DocType: Supplier Scorecard,Weighting Function,Funkcija vaganja
 DocType: Physician,OP Consulting Charge,OP Savjetodavna naknada
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Postavi svoj
@@ -629,7 +642,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Prirast ne može biti 0
 DocType: Production Planning Tool,Material Requirement,Preduvjet za robu
 DocType: Company,Delete Company Transactions,Brisanje transakcije tvrtke
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Referentni broj i reference Datum obvezna je za banke transakcije
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Referentni broj i reference Datum obvezna je za banke transakcije
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Dodaj / uredi porez i pristojbe
 DocType: Payment Entry Reference,Supplier Invoice No,Dobavljač Račun br
 DocType: Territory,For reference,Za referencu
@@ -637,12 +650,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Ne možete izbrisati Serijski broj {0}, kao što se koristi na lageru transakcija"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Zatvaranje (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,zdravo
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Premještanje stavke
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Premještanje stavke
 DocType: Serial No,Warranty Period (Days),Jamstveni period (dani)
 DocType: Installation Note Item,Installation Note Item,Napomena instalacije proizvoda
 DocType: Production Plan Item,Pending Qty,U tijeku Kom
 DocType: Budget,Ignore,Ignorirati
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} nije aktivan
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} nije aktivan
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Provjera postavljanje dimenzije za ispis
 DocType: Salary Slip,Salary Slip Timesheet,Plaća proklizavanja timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dobavljač skladišta obvezan je za sub - ugovoreni kupiti primitka
@@ -651,7 +664,7 @@
 DocType: Pricing Rule,Sales Partner,Prodajni partner
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Sve ocjene bodova dobavljača.
 DocType: Buying Settings,Purchase Receipt Required,Primka je obvezna
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Vrednovanje stopa je obavezno ako Otvaranje Stock ušao
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,Vrednovanje stopa je obavezno ako Otvaranje Stock ušao
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nisu pronađeni zapisi u tablici računa
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Odaberite Društvo i Zabava Tip prvi
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Financijska / obračunska godina.
@@ -688,7 +701,7 @@
 DocType: Quotation,Quotation To,Ponuda za
 DocType: Lead,Middle Income,Srednji Prihodi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Otvaranje ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Zadana mjerna jedinica za točke {0} se ne može mijenjati izravno, jer ste već napravili neke transakcije (e) s drugim UOM. Morat ćete stvoriti novu stavku za korištenje drugačiji Default UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Zadana mjerna jedinica za točke {0} se ne može mijenjati izravno, jer ste već napravili neke transakcije (e) s drugim UOM. Morat ćete stvoriti novu stavku za korištenje drugačiji Default UOM."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Dodijeljeni iznos ne može biti negativan
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Postavite tvrtku
 DocType: Purchase Order Item,Billed Amt,Naplaćeno Amt
@@ -702,6 +715,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Odaberite Račun za plaćanje kako bi Bank Entry
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Stvaranje zaposlenika evidencije za upravljanje lišće, trošak tvrdnje i obračun plaća"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Razdoblje liječenja
+DocType: Restaurant Reservation,Restaurant Reservation,Rezervacija restorana
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Pisanje prijedlog
 DocType: Payment Entry Deduction,Payment Entry Deduction,Plaćanje Ulaz Odbitak
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Još jedna prodaja Osoba {0} postoji s istim ID zaposlenika
@@ -709,7 +723,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Masteri
 DocType: Assessment Plan,Maximum Assessment Score,Maksimalni broj bodova Procjena
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Transakcijski Termini Update banke
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,praćenje vremena
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,praćenje vremena
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,DUPLICATE ZA TRANSPORTER
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskalna godina - tvrtka
 DocType: Packing Slip Item,DN Detail,DN detalj
@@ -717,8 +731,9 @@
 DocType: Timesheet,Billed,Naplaćeno
 DocType: Batch,Batch Description,Batch Opis
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Stvaranje studentskih skupina
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Payment Gateway računa nije stvorio, ručno stvoriti jedan."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Payment Gateway računa nije stvorio, ručno stvoriti jedan."
 DocType: Supplier Scorecard,Per Year,Godišnje
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Ne ispunjavaju uvjete za prijem u ovaj program po DOB-u
 DocType: Sales Invoice,Sales Taxes and Charges,Prodaja Porezi i naknade
 DocType: Employee,Organization Profile,Profil organizacije
 DocType: Vital Signs,Height (In Meter),Visina (u mjeraču)
@@ -754,7 +769,7 @@
 DocType: Student Batch Name,Batch Name,Batch Name
 DocType: Fee Validity,Max number of visit,Maksimalni broj posjeta
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet stvorio:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,Upisati
 DocType: GST Settings,GST Settings,Postavke GST-a
 DocType: Selling Settings,Customer Naming By,Imenovanje kupca prema
@@ -779,22 +794,22 @@
 DocType: Item,Material Transfer,Transfer robe
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Nije moguće pronaći put
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +211,Opening (Dr),Otvaranje (DR)
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Objavljivanje timestamp mora biti poslije {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Vremenska oznaka knjiženja mora biti nakon {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Napraviti ponavljajuće dokumente
 ,GST Itemised Purchase Register,Registar kupnje artikala GST
 DocType: Employee Loan,Total Interest Payable,Ukupna kamata
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Porezi i pristojbe zavisnog troška
 DocType: Production Order Operation,Actual Start Time,Stvarni Vrijeme početka
 DocType: BOM Operation,Operation Time,Operacija vrijeme
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Završi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Završi
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Baza
 DocType: Timesheet,Total Billed Hours,Ukupno Naplaćene sati
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Napišite paušalni iznos
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Napišite paušalni iznos
 DocType: Leave Block List Allow,Allow User,Dopusti korisnika
 DocType: Journal Entry,Bill No,Bill Ne
 DocType: Company,Gain/Loss Account on Asset Disposal,Dobitak / Gubitak računa na sredstva Odlaganje
 DocType: Vehicle Log,Service Details,Pojedinosti usluge
-DocType: Purchase Invoice,Quarterly,Tromjesečni
+DocType: Subscription,Quarterly,Tromjesečni
 DocType: Lab Test Template,Grouped,grupirane
 DocType: Selling Settings,Delivery Note Required,Potrebna je otpremnica
 DocType: Bank Guarantee,Bank Guarantee Number,Broj bankarske garancije
@@ -803,12 +818,12 @@
 DocType: Student Attendance,Student Attendance,Studentski Gledatelja
 DocType: Sales Invoice Timesheet,Time Sheet,Vrijeme list
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Jedinice za pranje sirovine na temelju
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Unesite Detalji
 DocType: Interest,Interest,Interes
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pretprodaja
 DocType: Purchase Receipt,Other Details,Ostali detalji
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,Predložak testa
+DocType: Restaurant Order Entry Item,Served,Posluženo
 DocType: Account,Accounts,Računi
 DocType: Vehicle,Odometer Value (Last),Odometar vrijednost (zadnja)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Predlošci kriterija dobavljača bodova.
@@ -820,25 +835,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Pregled Plaća proklizavanja
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Račun {0} unesen više puta
 DocType: Account,Expenses Included In Valuation,Troškovi uključeni u vrednovanje
-DocType: Hub Settings,Seller City,Prodavač Grad
 ,Absent Student Report,Odsutni Student Report
 DocType: Email Digest,Next email will be sent on:,Sljedeći email će biti poslan na:
 DocType: Offer Letter Term,Offer Letter Term,Ponuda pismo Pojam
 DocType: Supplier Scorecard,Per Week,Tjedno
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Stavka ima varijante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Stavka ima varijante.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Ukupno učenika
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Stavka {0} nije pronađena
 DocType: Bin,Stock Value,Stock vrijednost
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,"U pozadini će se stvoriti zapisi o naknadi. U slučaju bilo kakve pogreške, poruka o pogrešci ažurirat će se u rasporedu."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Tvrtka {0} ne postoji
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} ima valjanost do {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} ima valjanost do {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Tree Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Količina potrošena po jedinici mjere
 DocType: Serial No,Warranty Expiry Date,Datum isteka jamstva
 DocType: Material Request Item,Quantity and Warehouse,Količina i skladišta
+DocType: Hub Settings,Unregister,Odjava
 DocType: Sales Invoice,Commission Rate (%),Komisija stopa (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Odaberite Program
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Odaberite Program
 DocType: Project,Estimated Cost,Procjena cijene
 DocType: Purchase Order,Link to material requests,Link na materijalnim zahtjevima
+DocType: Hub Settings,Publish,Objaviti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Zračno-kosmički prostor
 DocType: Journal Entry,Credit Card Entry,Credit Card Stupanje
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Društvo i računi
@@ -849,13 +866,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Zatvori Prilika Nakon dana
 ,Reserved,Rezervirano
 DocType: Purchase Order,Supply Raw Materials,Supply sirovine
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Datum na koji pored faktura će biti generiran. Ona nastaje na dostavi.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Dugotrajna imovina
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} nije skladišni proizvod
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',"Podijelite svoje povratne informacije s obukom klikom na &quot;Povratne informacije o treningu&quot;, a zatim &quot;Novo&quot;"
 DocType: Mode of Payment Account,Default Account,Zadani račun
 DocType: Payment Entry,Received Amount (Company Currency),Primljeni Iznos (Društvo valuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,Potencijalni kupac mora biti postavljen ako je prilika iz njega izrađena
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,Potencijalni kupac mora biti postavljen ako je prilika iz njega izrađena
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Odaberite tjednik off dan
 DocType: Patient,O Negative,Negativan
 DocType: Production Order Operation,Planned End Time,Planirani End Time
@@ -864,17 +880,17 @@
 DocType: Delivery Note,Customer's Purchase Order No,Kupca Narudžbenica br
 DocType: Budget,Budget Against,proračun protiv
 DocType: Employee,Cell Number,Mobitel Broj
-apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Auto materijala Zahtjevi generiran
+apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Automatski zahtjev za materijalom odobren
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Izgubljen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Ne možete unijeti trenutni nalog u stupac 'u odnosu na temeljnicu'
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Rezervirano za proizvodnju
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,energija
 DocType: Opportunity,Opportunity From,Prilika od
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mjesečna plaća izjava.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Dodaj tvrtku
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Redak {0}: {1} Serijski brojevi potrebni za stavku {2}. Naveli ste {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Redak {0}: {1} Serijski brojevi potrebni za stavku {2}. Naveli ste {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Odaberite tablicu
 DocType: BOM,Website Specifications,Web Specifikacije
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} je nevažeća adresa e-pošte u &quot;Primatelji&quot;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} je nevažeća adresa e-pošte u &quot;Primatelji&quot;
 DocType: Special Test Items,Particulars,Pojedinosti
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiotik.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Od {0} od tipa {1}
@@ -882,11 +898,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Više Pravila Cijena postoji sa istim kriterijima, molimo rješavanje sukoba dodjeljivanjem prioriteta. Pravila Cijena: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne može deaktivirati ili otkazati BOM kao što je povezano s drugim sastavnicama
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne može deaktivirati ili otkazati BOM kao što je povezano s drugim sastavnicama
 DocType: Opportunity,Maintenance,Održavanje
 DocType: Item Attribute Value,Item Attribute Value,Stavka Vrijednost atributa
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Prodajne kampanje.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Provjerite timesheet
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Provjerite timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -943,12 +959,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Unesite predmeta prvi
 DocType: Account,Liability,Odgovornost
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Kažnjeni Iznos ne može biti veći od Zahtjeva Iznos u nizu {0}.
+DocType: Salary Detail,Do not include in total,Ne uključujte ukupno
 DocType: Company,Default Cost of Goods Sold Account,Zadana vrijednost prodane robe računa
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Popis Cijena ne bira
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Popis Cijena ne bira
 DocType: Employee,Family Background,Obitelj Pozadina
 DocType: Request for Quotation Supplier,Send Email,Pošaljite e-poštu
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Nemate dopuštenje
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Nemate dopuštenje
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Zatraženo pitanje
 DocType: Vital Signs,Heart Rate / Pulse,Puls / srčane frekvencije
 DocType: Company,Default Bank Account,Zadani bankovni račun
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Za filtriranje se temelji na stranke, odaberite stranka Upišite prvi"
@@ -975,12 +993,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Stavka retka {idx}: {DOCTYPE} {DOCNAME} ne postoji u gore &#39;{DOCTYPE}&#39; stol
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} već je završen ili otkazan
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Nema zadataka
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dan u mjesecu na koji auto faktura će biti generiran npr 05, 28 itd"
 DocType: Item Variant Settings,Copy Fields to Variant,Kopiranje polja u inačicu
 DocType: Asset,Opening Accumulated Depreciation,Otvaranje Akumulirana amortizacija
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Rezultat mora biti manja od ili jednaka 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program za upis alat
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C-obrazac zapisi
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C-obrazac zapisi
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Kupaca i dobavljača
 DocType: Email Digest,Email Digest Settings,E-pošta postavke
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Hvala vam na poslovanju!
@@ -998,13 +1015,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Status citata
 DocType: Maintenance Visit,Completion Status,Završetak Status
 DocType: HR Settings,Enter retirement age in years,Unesite dob za umirovljenje u godinama
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Ciljana galerija
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Odaberite skladište
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Ciljana galerija
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Odaberite skladište
 DocType: Cheque Print Template,Starting location from left edge,Počevši lokaciju od lijevog ruba
 DocType: Item,Allow over delivery or receipt upto this percent,Dopustite preko isporuka ili primitak upto ovim posto
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Uvoz posjećenost
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Sve skupine proizvoda
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Sve skupine proizvoda
 DocType: Process Payroll,Activity Log,Dnevnik aktivnosti
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Neto dobit / gubitak
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatski napravi poruku pri podnošenju transakcije.
@@ -1016,7 +1033,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Predviđena količina
 DocType: Sales Invoice,Payment Due Date,Plaćanje Due Date
 DocType: Drug Prescription,Interval UOM,Interval UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Stavka Varijanta {0} već postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Stavka Varijanta {0} već postoji s istim atributima
+DocType: Item,Hub Publishing Details,Pojedinosti objavljivanja središta
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&quot;Otvaranje &#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Otvoreni učiniti
 DocType: Notification Control,Delivery Note Message,Otpremnica - poruka
@@ -1036,10 +1054,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: Sirovina ne može biti isti kao i glavna stavka
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Ukupno odgovarajuće naknade u potvrdi o kupnji stavke stolu mora biti ista kao i Total poreza i naknada
 DocType: Sales Team,Incentives,Poticaji
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Registrirajte se za hub
 DocType: SMS Log,Requested Numbers,Traženi brojevi
 DocType: Production Planning Tool,Only Obtain Raw Materials,Dobiti Samo sirovine
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Ocjenjivanje.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Omogućavanje &#39;Koristi za košaricu&#39;, kao što Košarica je omogućena i tamo bi trebao biti barem jedan Porezna pravila za Košarica"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Omogućavanje &#39;Koristi za košaricu&#39;, kao što Košarica je omogućena i tamo bi trebao biti barem jedan Porezna pravila za Košarica"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Ulazak Plaćanje {0} je vezan protiv Reda {1}, provjeriti treba li se izvući kao napredak u tom računu."
 DocType: Sales Invoice Item,Stock Details,Stock Detalji
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Vrijednost projekta
@@ -1058,12 +1077,14 @@
 DocType: Salary Slip,Working Days,Radnih dana
 DocType: Serial No,Incoming Rate,Dolazni Stopa
 DocType: Packing Slip,Gross Weight,Bruto težina
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,Ime vaše tvrtke za koje ste postavljanje ovog sustava .
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Omogući hub
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,Ime vaše tvrtke za koje ste postavljanje ovog sustava .
 DocType: HR Settings,Include holidays in Total no. of Working Days,Uključi odmor u ukupnom. radnih dana
 DocType: Job Applicant,Hold,Zadrži
 DocType: Employee,Date of Joining,Datum pristupa
 DocType: Naming Series,Update Series,Update serija
 DocType: Supplier Quotation,Is Subcontracted,Je podugovarati
+DocType: Restaurant Table,Minimum Seating,Minimalna sjedala
 DocType: Item Attribute,Item Attribute Values,Stavka vrijednosti atributa
 DocType: Examination Result,Examination Result,Rezultat ispita
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Primka
@@ -1074,13 +1095,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Nije moguće pronaći termin u narednih {0} dana za rad {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materijal za pod-sklopova
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Prodaja Partneri i Županija
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} mora biti aktivna
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} mora biti aktivna
 DocType: Journal Entry,Depreciation Entry,Amortizacija Ulaz
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Molimo odaberite vrstu dokumenta prvi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Odustani Posjeta materijala {0} prije otkazivanja ovog održavanja pohod
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serijski Ne {0} ne pripada točki {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Potrebna Kol
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Skladišta s postojećim transakcije ne može pretvoriti u knjigu.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Skladišta s postojećim transakcije ne može pretvoriti u knjigu.
 DocType: Bank Reconciliation,Total Amount,Ukupan iznos
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet izdavaštvo
 DocType: Prescription Duration,Number,Broj
@@ -1091,7 +1112,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Prodajni cjenik
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Ako je označeno, izradit će se kupac, mapiran pacijentu. Pacijentne fakture će biti stvorene protiv ovog klijenta. Također možete odabrati postojeći Korisnik tijekom izrade pacijenta."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Objavi sinkronizirati stavke
 DocType: Bank Reconciliation,Account Currency,Valuta računa
 DocType: Lab Test,Sample ID,ID uzorka
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Molimo spomenuti zaokružiti račun u Društvu
@@ -1100,11 +1120,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Zaposlenik {0} nije aktivan ili ne postoji
 DocType: Fee Structure,Components,Komponente
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Unesite imovinom Kategorija tačke {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Stavka Varijante {0} ažurirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Stavka Varijante {0} ažurirani
 DocType: Quality Inspection Reading,Reading 6,Čitanje 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Ne mogu {0} {1} {2} bez ikakvih negativnih izvanredan fakture
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","da se generira. Ako je odgođeno, morat ćete ručno promijeniti polje &quot;Ponoviti na dan u mjesecu&quot;"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Ne mogu {0} {1} {2} bez ikakvih negativnih izvanredan fakture
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Ulazni račun - predujam
-DocType: Hub Settings,Sync Now,Sync Sada
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Red {0}: Kredit unos ne može biti povezan s {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Odredite proračun za financijsku godinu.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Zadana banka / novčani račun će se automatski ažurirati prema POS računu, kada je ovaj mod odabran."
@@ -1116,13 +1137,13 @@
 DocType: Item,Is Purchase Item,Je dobavljivi proizvod
 DocType: Asset,Purchase Invoice,Ulazni račun
 DocType: Stock Ledger Entry,Voucher Detail No,Bon Detalj Ne
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Novi prodajni Račun
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Novi prodajni Račun
 DocType: Stock Entry,Total Outgoing Value,Ukupna odlazna vrijednost
 DocType: Physician,Appointments,imenovanja
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Otvaranje i zatvaranje Datum datum mora biti unutar iste fiskalne godine
 DocType: Lead,Request for Information,Zahtjev za informacije
 ,LeaderBoard,leaderboard
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Sinkronizacija Offline Računi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Sinkronizacija Offline Računi
 DocType: Payment Request,Paid,Plaćen
 DocType: Program Fee,Program Fee,Naknada program
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1141,11 +1162,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Stavka narudžbenice
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Neizravni dohodak
 DocType: Student Attendance Tool,Student Attendance Tool,Studentski Gledatelja alat
+DocType: Restaurant Menu,Price List (Auto created),Cjenik (automatski izrađen)
 DocType: Cheque Print Template,Date Settings,Datum Postavke
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Varijacija
 ,Company Name,Ime tvrtke
 DocType: SMS Center,Total Message(s),Ukupno poruka ( i)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Odaberite stavke za prijenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Odaberite stavke za prijenos
 DocType: Purchase Invoice,Additional Discount Percentage,Dodatni Postotak Popust
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Pregled popisa svih pomoć videa
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Odaberite račun šefa banke gdje je ček bio pohranjen.
@@ -1162,6 +1184,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Metar
 DocType: Workstation,Electricity Cost,Troškovi struje
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne šaljite podsjetnik za rođendan zaposlenika
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Spremi postavke
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Traženi proizvodi
 DocType: Item,Inspection Criteria,Inspekcijski Kriteriji
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Prenose
 DocType: BOM Website Item,BOM Website Item,BOM web stranica predmeta
@@ -1178,24 +1202,26 @@
 DocType: Journal Entry,Total Amount in Words,Ukupan iznos riječima
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Došlo je do pogreške . Jedan vjerojatan razlog bi mogao biti da niste spremili obrazac. Molimo kontaktirajte support@erpnext.com ako se problem ne riješi .
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Moja košarica
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Tip narudžbe mora biti jedan od {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Tip narudžbe mora biti jedan od {0}
 DocType: Lead,Next Contact Date,Sljedeći datum kontakta
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Otvaranje Kol
 DocType: Healthcare Settings,Appointment Reminder,Podsjetnik za sastanak
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Unesite račun za promjene visine
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Unesite račun za promjene visine
 DocType: Student Batch Name,Student Batch Name,Studentski Batch Name
 DocType: Consultation,Doctor,Liječnik
-DocType: Holiday List,Holiday List Name,Turistička Popis Ime
+DocType: Holiday List,Holiday List Name,Ime popisa praznika
 DocType: Repayment Schedule,Balance Loan Amount,Stanje Iznos kredita
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Raspored nastave
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Burzovnih opcija
 DocType: Journal Entry Account,Expense Claim,Rashodi polaganja
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Da li stvarno želite vratiti ovaj otpisan imovine?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Količina za {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Da li stvarno želite vratiti ovaj otpisan imovine?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Količina za {0}
 DocType: Leave Application,Leave Application,Zahtjev za odsustvom
 DocType: Patient,Patient Relation,Pacijentna veza
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Alat za raspodjelu odsustva
+DocType: Item,Hub Category to Publish,Kategorija hub za objavljivanje
 DocType: Leave Block List,Leave Block List Dates,Datumi popisa neodobrenih odsustava
+DocType: Sales Invoice,Billing Address GSTIN,Adresa za naplatu GSTIN
 DocType: Workstation,Net Hour Rate,Neto sat cijena
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Ulazni račun zavisnog troška
 DocType: Company,Default Terms,Zadani uvjeti
@@ -1205,18 +1231,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Navedite a {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Uklonjene stvari bez promjena u količini ili vrijednosti.
 DocType: Delivery Note,Delivery To,Dostava za
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Osobina stol je obavezno
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Osobina stol je obavezno
 DocType: Production Planning Tool,Get Sales Orders,Kreiraj narudžbe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ne može biti negativna
 DocType: Training Event,Self-Study,Samostalno istraživanje
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Popust
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Popust
 DocType: Asset,Total Number of Depreciations,Ukupan broj deprecijaciju
 DocType: Sales Invoice Item,Rate With Margin,Ocijenite s marginom
 DocType: Workstation,Wages,Plaće
 DocType: Task,Urgent,Hitan
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Navedite valjanu Row ID za redom {0} u tablici {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Nije moguće pronaći varijablu:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Odaberite polje za uređivanje iz numpad
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Odaberite polje za uređivanje iz numpad
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Idi na radnu površinu i početi koristiti ERPNext
 DocType: Item,Manufacturer,Proizvođač
 DocType: Landed Cost Item,Purchase Receipt Item,Stavka primke
@@ -1227,7 +1253,7 @@
 DocType: Repayment Schedule,Interest Amount,Iznos kamata
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +109,You are the Expense Approver for this record. Please Update the 'Status' and Save,Vi ste osoba za odobrenje rashoda za ovaj zapis. Molimo ažurirajte status i spremite
 DocType: Serial No,Creation Document No,Stvaranje dokumenata nema
-DocType: Issue,Issue,Izdanje
+DocType: Issue,Issue,Izazov
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation_dashboard.py +11,Records,ploče
 DocType: Asset,Scrapped,otpisan
 apps/erpnext/erpnext/config/stock.py +200,"Attributes for Item Variants. e.g Size, Color etc.","Atributi za stavku varijanti. npr Veličina, boja i sl"
@@ -1247,8 +1273,8 @@
 DocType: GL Entry,Against,Protiv
 DocType: Item,Default Selling Cost Center,Zadani trošak prodaje
 DocType: Sales Partner,Implementation Partner,Provedba partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Poštanski broj
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Prodaja Naručite {0} {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Poštanski broj
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Prodaja Naručite {0} {1}
 DocType: Opportunity,Contact Info,Kontakt Informacije
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Izrada Stock unose
 DocType: Packing Slip,Net Weight UOM,Težina mjerna jedinica
@@ -1259,6 +1285,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Nabavite Tjedno Off datumi
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Datum završetka ne može biti manja od početnog datuma
 DocType: Sales Person,Select company name first.,Prvo odaberite naziv tvrtke.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Od niske do visoke
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ponude dobivene od dobavljača.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Zamijenite BOM i ažurirajte najnoviju cijenu u svim BOM-ovima
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Za {0} | {1} {2}
@@ -1277,7 +1304,7 @@
 DocType: Program Enrollment,Transportation,promet
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Pogrešna Osobina
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} mora biti podnesen
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Količina mora biti manji ili jednak {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Količina mora biti manji ili jednak {0}
 DocType: SMS Center,Total Characters,Ukupno Likovi
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Odaberite BOM u BOM polje za točku {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-obrazac detalj računa
@@ -1292,7 +1319,7 @@
 ,Ordered Items To Be Billed,Naručeni proizvodi za naplatu
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Od Raspon mora biti manji od u rasponu
 DocType: Global Defaults,Global Defaults,Globalne zadane postavke
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Projekt Suradnja Poziv
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Projekt Suradnja Poziv
 DocType: Salary Slip,Deductions,Odbici
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Naziv akcije
@@ -1310,13 +1337,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Predujam prodajnog računa
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Ništa za zatražiti
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Još jedan proračun rekord &#39;{0}&#39; već postoji od {1} &#39;{2}&#39; za fiskalnu godinu {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',Stvarni datum početka ne može biti veći od stvarnog datuma završetka
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',Stvarni datum početka ne može biti veći od stvarnog datuma završetka
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Uprava
 DocType: Cheque Print Template,Payer Settings,Postavke Payer
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To će biti dodan u šifra varijante. Na primjer, ako je vaš naziv je ""SM"", a točka kod ""T-shirt"", stavka kod varijante će biti ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Neto plaća (riječima) će biti vidljiva nakon što spremite klizne plaće.
 DocType: Purchase Invoice,Is Return,Je li povratak
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Oprez
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Oprez
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Povratak / debitna Napomena
 DocType: Price List Country,Price List Country,Država cjenika
 DocType: Item,UOMs,J. MJ.
@@ -1331,17 +1358,18 @@
 DocType: Account,Balance Sheet,Završni račun
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Troška za stavku s šifra '
 DocType: Fee Validity,Valid Till,Vrijedi do
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Način plaćanja nije konfiguriran. Provjerite, da li je račun postavljen na način rada platnu ili na POS profilu."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Način plaćanja nije konfiguriran. Provjerite, da li je račun postavljen na način rada platnu ili na POS profilu."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Isti predmet ne može se upisati više puta.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Daljnje računi mogu biti u skupinama, ali unose se može podnijeti protiv nesrpskog Groups"
 DocType: Lead,Lead,Potencijalni kupac
 DocType: Email Digest,Payables,Plativ
 DocType: Course,Course Intro,Naravno Uvod
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Stock Ulazak {0} stvorio
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Postavite serijske brojeve za prisustvovanje putem Setup&gt; Serija numeriranja
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Stock Ulazak {0} stvorio
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Red # {0}: Odbijen Kom se ne može upisati u kupnju povratak
 ,Purchase Order Items To Be Billed,Stavke narudžbenice za naplatu
 DocType: Purchase Invoice Item,Net Rate,Neto stopa
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Odaberite klijenta
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Odaberite klijenta
 DocType: Purchase Invoice Item,Purchase Invoice Item,Proizvod ulaznog računa
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Upisi u glavnu knjigu i GL upisi su ponovno postavljeni za odabrane primke.
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Stavka 1
@@ -1360,7 +1388,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Dupli red {0} sa istim {1}
 ,Trial Balance,Pretresno bilanca
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađena
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Postavljanje zaposlenika
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Postavljanje zaposlenika
 DocType: Sales Order,SO-,TAKO-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Odaberite prefiks prvi
 DocType: Employee,O-,O-
@@ -1372,12 +1400,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Pogledaj Ledger
 DocType: Grading Scale,Intervals,intervali
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najstarije
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Studentski Mobile Ne
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Ostatak svijeta
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Ostatak svijeta
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Stavka {0} ne može imati Hrpa
 ,Budget Variance Report,Proračun varijance Prijavi
 DocType: Salary Slip,Gross Pay,Bruto plaća
+DocType: Item,Is Item from Hub,Je li stavka iz huba
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Red {0}: Tip aktivnost je obavezna.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Plaćeni Dividende
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Računovodstvo knjiga
@@ -1387,8 +1416,9 @@
 DocType: Vehicle Log,Service Detail,Detalj usluga
 DocType: BOM,Item Description,Opis proizvoda
 DocType: Student Sibling,Student Sibling,Studentski iste razine
-DocType: Purchase Invoice,Is Recurring,Je Ponavljajući
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Način plaćanja
 DocType: Purchase Invoice,Supplied Items,Isporučeni pribor
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Postavite aktivni izbornik za restoran {0}
 DocType: Student,STUD.,KLINAC.
 DocType: Production Order,Qty To Manufacture,Količina za proizvodnju
 DocType: Email Digest,New Income,Novi Prihod
@@ -1398,6 +1428,7 @@
 ,Student and Guardian Contact Details,Studentski i Guardian Kontaktni podaci
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Red {0}: Za dobavljača {0} email adresa je potrebno za slanje e-pošte
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Privremeni Otvaranje
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,View Hub
 ,Employee Leave Balance,Zaposlenik napuste balans
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Bilanca računa {0} uvijek mora biti {1}
 DocType: Patient Appointment,More Info,Više informacija
@@ -1417,19 +1448,19 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Upozorenje za novi zahtjev za ponudu
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Narudžbenice vam pomoći planirati i pratiti na Vašoj kupnji
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Ispitivanje laboratorijskih ispitivanja
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Ukupna količina Pitanje / Prijenos {0} u materijalnim Zahtjevu {1} \ ne može biti veća od tražene količine {2} za točki {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Mali
 DocType: Employee,Employee Number,Broj zaposlenika
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Slučaj Ne ( i) je već u uporabi . Pokušajte s predmetu broj {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Slučaj Ne ( i) je već u uporabi . Pokušajte s predmetu broj {0}
 DocType: Project,% Completed,% Kompletirano
 ,Invoiced Amount (Exculsive Tax),Dostavljeni iznos ( Exculsive poreza )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Stavka 2
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,Događaj za obuku
-DocType: Item,Auto re-order,Auto re-red
+DocType: Item,Auto re-order,Automatski reorganiziraj
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Ukupno Ostvareno
 DocType: Employee,Place of Issue,Mjesto izdavanja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Contract,ugovor
@@ -1438,11 +1469,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Neizravni troškovi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Red {0}: Količina je obvezno
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Poljoprivreda
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Vaši proizvodi ili usluge
 DocType: Special Test Items,Special Test Items,Posebne ispitne stavke
 DocType: Mode of Payment,Mode of Payment,Način plaćanja
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Web slika bi trebala biti javna datoteke ili URL web stranice
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Web slika bi trebala biti javna datoteke ili URL web stranice
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,To jekorijen stavka grupa i ne može se mijenjati .
@@ -1450,24 +1481,23 @@
 DocType: Vehicle,Fuel UOM,Gorivo UOM
 DocType: Warehouse,Warehouse Contact Info,Kontakt informacije skladišta
 DocType: Payment Entry,Write Off Difference Amount,Otpis razlika visine
-DocType: Purchase Invoice,Recurring Type,Ponavljajući Tip
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: Radnik email nije pronađen, stoga ne e-mail poslan"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: Radnik email nije pronađen, stoga ne e-mail poslan"
 DocType: Item,Foreign Trade Details,Vanjskotrgovinska Detalji
+,Assessment Plan Status,Status plana procjene
 DocType: Email Digest,Annual Income,Godišnji prihod
 DocType: Serial No,Serial No Details,Serijski nema podataka
 DocType: Purchase Invoice Item,Item Tax Rate,Porezna stopa proizvoda
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,Odaberite Liječnik i Datum
 DocType: Student Group Student,Group Roll Number,Broj grupe grupa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, samo kreditne računi se mogu povezati protiv drugog ulaska debitnom"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Ukupan svih radnih težina bi trebala biti 1. Podesite vage svih zadataka projekta u skladu s tim
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Ukupan svih radnih težina bi trebala biti 1. Podesite vage svih zadataka projekta u skladu s tim
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Stavka {0} mora bitisklopljen ugovor artikla
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapitalni oprema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cijene Pravilo prvo se bira na temelju 'Nanesite na' terenu, koji može biti točka, točka Grupa ili Brand."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Najprije postavite šifru stavke
-DocType: Hub Settings,Seller Website,Web Prodavač
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Najprije postavite šifru stavke
 DocType: Item,ITEM-,ARTIKAL-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Ukupno dodijeljeno postotak za prodajni tim bi trebao biti 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Ukupno dodijeljeno postotak za prodajni tim bi trebao biti 100
 DocType: Sales Invoice Item,Edit Description,Uredi Opis
 DocType: Antibiotic,Antibiotic,Antibiotik
 ,Team Updates,tim ažuriranja
@@ -1488,12 +1518,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Ukupno (Društvo valuta)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Serijski broj {0} ušao više puta
 DocType: Depreciation Schedule,Journal Entry,Temeljnica
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} stavke u tijeku
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} stavke u tijeku
 DocType: Workstation,Workstation Name,Ime Workstation
 DocType: Grading Scale Interval,Grade Code,Grade Šifra
 DocType: POS Item Group,POS Item Group,POS Točka Grupa
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-pošta:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} ne pripada Točki {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} ne pripada Točki {1}
 DocType: Sales Partner,Target Distribution,Ciljana Distribucija
 DocType: Salary Slip,Bank Account No.,Žiro račun broj
 DocType: Naming Series,This is the number of the last created transaction with this prefix,To je broj zadnjeg stvorio transakcije s ovim prefiksom
@@ -1509,10 +1539,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Zahtjev za ponudu dobavljača
 DocType: Healthcare Settings,Registration Message,Poruka o registraciji
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Hardver
-DocType: Sales Order,Recurring Upto,ponavljajući Upto
 DocType: Prescription Dosage,Prescription Dosage,Doziranje na recept
 DocType: Attendance,HR Manager,HR menadžer
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Odaberite tvrtku
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Odaberite tvrtku
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Privilege dopust
 DocType: Purchase Invoice,Supplier Invoice Date,Dobavljač Datum fakture
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,po
@@ -1528,10 +1557,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Preklapanje uvjeti nalaze između :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Protiv Temeljnica {0} već usklađuje se neki drugi bon
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Ukupna vrijednost narudžbe
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,hrana
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,hrana
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Starenje Raspon 3
 DocType: Maintenance Schedule Item,No of Visits,Broj pregleda
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Raspored održavanja {0} postoji protiv {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Želite li objaviti svoje stavke u središte?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,upisa studenata
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta zatvaranja računa mora biti {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Zbroj bodova svih ciljeva trebao biti 100. To je {0}
@@ -1542,9 +1572,9 @@
 DocType: Authorization Rule,Average Discount,Prosječni popust
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Komunalne usluge
-DocType: Purchase Invoice Item,Accounting,Knjigovodstvo
+DocType: POS Profile,Accounting,Knjigovodstvo
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Odaberite serije za umetnutu stavku
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Odaberite serije za umetnutu stavku
 DocType: Asset,Depreciation Schedules,amortizacija Raspored
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Razdoblje prijava ne može biti izvan dopusta raspodjele
 DocType: Activity Cost,Projects,Projekti
@@ -1560,7 +1590,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',"Status Odobrenje mora biti ""Odobreno"" ili "" Odbijeno """
 DocType: Physician,Contacts and Address,Kontakti i adresa
 DocType: Purchase Invoice,Contact Person,Kontakt osoba
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',Očekivani datum početka ne može biti veći od očekivanog datuma završetka
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',Očekivani datum početka ne može biti veći od očekivanog datuma završetka
 DocType: Course Scheduling Tool,Course End Date,Naravno Datum završetka
 DocType: Holiday List,Holidays,Praznici
 DocType: Sales Order Item,Planned Quantity,Planirana količina
@@ -1568,10 +1598,11 @@
 DocType: Item,Maintain Stock,Upravljanje zalihama
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Stock Prijave su već stvorene za proizvodnju reda
 DocType: Employee,Prefered Email,Poželjni Email
+DocType: Student Admission,Eligibility and Details,Podobnost i pojedinosti
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Neto promjena u dugotrajne imovine
 DocType: Leave Control Panel,Leave blank if considered for all designations,Ostavite prazno ako se odnosi na sve oznake
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Maksimalno: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Maksimalno: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Od datetime
 DocType: Email Digest,For Company,Za tvrtke
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Dnevnik mailova
@@ -1579,19 +1610,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Dobavljačka tabela ocjena varijable
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Iznos kupnje
 DocType: Sales Invoice,Shipping Address Name,Dostava Adresa Ime
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Kontni plan
 DocType: Material Request,Terms and Conditions Content,Uvjeti sadržaj
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,ne može biti veće od 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Proizvod {0} nije skladišni proizvod
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Proizvod {0} nije skladišni proizvod
 DocType: Maintenance Visit,Unscheduled,Neplanski
 DocType: Employee,Owned,U vlasništvu
 DocType: Salary Detail,Depends on Leave Without Pay,Ovisi o ostaviti bez platiti
 DocType: Pricing Rule,"Higher the number, higher the priority","Veći broj, veći prioritet"
 ,Purchase Invoice Trends,Trendovi nabavnih računa
 DocType: Employee,Better Prospects,Bolji izgledi
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Red # {0}: Šarža {1} ima samo {2} qty. Odaberite drugu seriju koja ima {3} količinu dostupnu ili razdijelite red u više redaka, kako biste ih isporučili / izdali iz više šarži"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Red # {0}: Šarža {1} ima samo {2} qty. Odaberite drugu seriju koja ima {3} količinu dostupnu ili razdijelite red u više redaka, kako biste ih isporučili / izdali iz više šarži"
 DocType: Vehicle,License Plate,registarska tablica
 DocType: Appraisal,Goals,Golovi
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Odaberite POS profil
 DocType: Warranty Claim,Warranty / AMC Status,Jamstveni / AMC Status
 ,Accounts Browser,Preglednik računa
 DocType: Payment Entry Reference,Payment Entry Reference,Plaćanje Ulaz Referenca
@@ -1610,7 +1641,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Zaposlenik se ne može prijaviti na sebe.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ako je račun zamrznut , unosi dopušteno ograničene korisnike ."
 DocType: Email Digest,Bank Balance,Bankovni saldo
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Računovodstvo Ulaz za {0}: {1} može biti samo u valuti: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Računovodstvo Ulaz za {0}: {1} može biti samo u valuti: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil posla, tražene kvalifikacije i sl."
 DocType: Journal Entry Account,Account Balance,Bilanca računa
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Porezni Pravilo za transakcije.
@@ -1619,8 +1650,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Ukupno Porezi i naknade (Društvo valuta)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Prikaži nezatvorena fiskalne godine u P &amp; L stanja
 DocType: Lab Test Template,Collection Details,Detalji zbirke
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","odaberite cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date od tabConsultation ct, `tabLab Prescription` cp gdje ct.patient = &#39;{0}&#39; i cp.parent = ct. naziv i cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Dostava račun
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Račun {2} nije aktivan
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Provjerite Prodaja Narudžbe će vam pomoći planirati svoj rad i isporučiti na vrijeme
@@ -1637,7 +1666,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Odreskom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Najam ureda
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Postavke SMS pristupnika
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Uvoz nije uspio !
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Uvoz nije uspio !
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Adresa još nije dodana.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Radno vrijeme
 DocType: Vital Signs,Blood Pressure,Krvni tlak
@@ -1662,7 +1691,7 @@
 DocType: Sales Invoice,Source,Izvor
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Prikaži zatvorene
 DocType: Leave Type,Is Leave Without Pay,Je Ostavite bez plaće
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Asset Kategorija je obvezna za nepokretnu stavke imovine
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Asset Kategorija je obvezna za nepokretnu stavke imovine
 DocType: Fee Validity,Fee Validity,Valjanost naknade
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nisu pronađeni zapisi u tablici plaćanja
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},To {0} sukobi s {1} od {2} {3}
@@ -1683,8 +1712,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Stvaranje vodi
 DocType: Maintenance Schedule,Schedules,Raspored
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,POS Profil je potreban za korištenje Point-of-Sale
 DocType: Purchase Invoice Item,Net Amount,Neto Iznos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} nije poslano tako da se radnja ne može dovršiti
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} nije poslano tako da se radnja ne može dovršiti
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM detalji - broj
 DocType: Landed Cost Voucher,Additional Charges,Dodatni troškovi
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatni popust Iznos (valuta Društvo)
@@ -1693,7 +1723,7 @@
 ,Support Hour Distribution,Distribucija rasporeda podrške
 DocType: Maintenance Visit,Maintenance Visit,Održavanje Posjetite
 DocType: Student,Leaving Certificate Number,Ostavljajući broj certifikata
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Imenovanje otkazano, pregledajte i otkazite fakturu {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Imenovanje otkazano, pregledajte i otkazite fakturu {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Dostupno Batch Količina na skladištu
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Ažuriranje Format ispisa
 DocType: Landed Cost Voucher,Landed Cost Help,Zavisni troškovi - Pomoć
@@ -1716,8 +1746,8 @@
 DocType: Patient,Tobacco Past Use,Doba korištenja
 DocType: Sales Invoice Item,Brand Name,Naziv brenda
 DocType: Purchase Receipt,Transporter Details,Transporter Detalji
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Korisnik {0} već je dodijeljen liječniku {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Default skladište je potreban za odabranu stavku
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Korisnik {0} već je dodijeljen liječniku {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Default skladište je potreban za odabranu stavku
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,kutija
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,Mogući Dobavljač
 DocType: Budget,Monthly Distribution,Mjesečna distribucija
@@ -1727,7 +1757,7 @@
 DocType: Sales Partner,Sales Partner Target,Prodajni plan prodajnog partnera
 DocType: Loan Type,Maximum Loan Amount,Maksimalni iznos kredita
 DocType: Pricing Rule,Pricing Rule,Pravila cijena
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Duplikat broja valjaka za učenika {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Duplikat broja valjaka za učenika {0}
 DocType: Budget,Action if Annual Budget Exceeded,"Akcija, ako Godišnji proračun Prebačen"
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Materijal Zahtjev za Narudžbenica
 DocType: Shopping Cart Settings,Payment Success URL,Plaćanje Uspjeh URL
@@ -1744,7 +1774,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} mora pojaviti samo jednom
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nije dopušteno Prenesite više {0} od {1} protiv narudžbenice {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Odsustvo uspješno dodijeljeno za {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nema proizvoda za pakiranje
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Nema proizvoda za pakiranje
 DocType: Shipping Rule Condition,From Value,Od Vrijednost
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Proizvedena količina je obvezna
 DocType: Employee Loan,Repayment Method,Način otplate
@@ -1758,6 +1788,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Stock Obveze
 DocType: Purchase Invoice,Supplier Warehouse,Dobavljač galerija
 DocType: Opportunity,Contact Mobile No,Kontak GSM
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Odaberite tvrtku
 ,Material Requests for which Supplier Quotations are not created,Zahtjevi za robom za koje dobavljačeve ponude nisu stvorene
 DocType: Student Group,Set 0 for no limit,Postavite 0 bez granica
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dan (e) na koje se prijavljuje za odmor su praznici. Ne morate se prijaviti za dopust.
@@ -1767,24 +1798,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Napravite citat
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Ostala izvješća
 DocType: Dependent Task,Dependent Task,Ovisno zadatak
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Odsustvo tipa {0} ne može biti duže od {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Pokušajte planirati poslovanje za X dana unaprijed.
 DocType: HR Settings,Stop Birthday Reminders,Zaustavi Rođendan Podsjetnici
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Molimo postavite zadanog Platne naplativo račun u Društvu {0}
 DocType: SMS Center,Receiver List,Prijemnik Popis
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Traži Stavka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Traži Stavka
 DocType: Patient Appointment,Referring Physician,Liječnik koji se poziva
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Konzumira Iznos
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Neto promjena u gotovini
 DocType: Assessment Plan,Grading Scale,ljestvici
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,već završena
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,već završena
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock u ruci
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Zahtjev za plaćanje već postoji {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Trošak izdanih stavki
 DocType: Physician,Hospital,Bolnica
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Količina ne smije biti veća od {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Količina ne smije biti veća od {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Prethodne financijske godine nije zatvoren
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Starost (dani)
 DocType: Quotation Item,Quotation Item,Proizvod iz ponude
@@ -1795,8 +1826,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Dobavljač Vrsta majstor .
 DocType: Purchase Order Item,Supplier Part Number,Dobavljač Broj dijela
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Stopa pretvorbe ne može biti 0 ili 1
-DocType: Sales Invoice,Reference Document,Referentni dokument
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} otkazan ili zaustavljen
+DocType: Subscription,Reference Document,Referentni dokument
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} otkazan ili zaustavljen
 DocType: Accounts Settings,Credit Controller,Kreditne kontroler
 DocType: Delivery Note,Vehicle Dispatch Date,Vozilo Dispatch Datum
 DocType: Healthcare Settings,Default Medical Code Standard,Zadani standard medicinskog koda
@@ -1805,6 +1836,7 @@
 DocType: Company,Default Payable Account,Zadana Plaća račun
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Postavke za online košarici, kao što su utovar pravila, cjenika i sl"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Naplaćeno
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Poredaj po cijeni ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Rezervirano Kol
 DocType: Party Account,Party Account,Račun stranke
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Ljudski resursi
@@ -1816,13 +1848,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Provjerite unos isplati
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Red {0}: Advance protiv Dobavljač mora teretiti
 DocType: Company,Default Values,Zadane vrijednosti
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequency} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Frequency} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Ukupno Iznos nadoknađeni
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,To se temelji na zapisima protiv tog vozila. Pogledajte vremensku crtu ispod za detalje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Protiv dobavljača Račun {0} datira {1}
 DocType: Customer,Default Price List,Zadani cjenik
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Unos imovine Pokret {0} stvorio
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ne možete izbrisati Fiskalna godina {0}. Fiskalna godina {0} je postavljen kao zadani u Globalne postavke
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Kupac s istim imenom već postoji
 DocType: Journal Entry,Entry Type,Ulaz Tip
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Nijedan plan procjene nije povezan s ovom grupom za procjenu
 ,Customer Credit Balance,Kupac saldo
@@ -1832,7 +1865,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Cijena
 DocType: Quotation,Term Details,Oročeni Detalji
 DocType: Project,Total Sales Cost (via Sales Order),Ukupni trošak prodaje (putem prodajnog naloga)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Ne može se prijaviti više od {0} studenata za ovaj grupe studenata.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Ne može se prijaviti više od {0} studenata za ovaj grupe studenata.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Olovni broj
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} mora biti veći od 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planiranje kapaciteta za (dani)
@@ -1848,9 +1881,11 @@
 DocType: Lab Test,Technician Name,Naziv tehničara
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Prekini vezu Plaćanje o otkazu fakture
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Trenutno stanje kilometraže ušao bi trebala biti veća od početne vozila kilometraže {0}
+DocType: Restaurant Reservation,No Show,Nema prikazivanja
 DocType: Shipping Rule Country,Shipping Rule Country,Pravilo dostava Država
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Ostavi i posjećenost
 DocType: Maintenance Visit,Partially Completed,Djelomično završeni
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Umjerena osjetljivost
 DocType: Leave Type,Include holidays within leaves as leaves,Uključi odmor u lišće što lišće
 DocType: Sales Invoice,Packed Items,Pakirani proizvodi
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Jamstvo tužbu protiv Serial No.
@@ -1867,13 +1902,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Plaćeni iznos (Društvo valuta)
 DocType: Purchase Invoice,Additional Discount,Dodatni popust
 DocType: Selling Settings,Selling Settings,Postavke prodaje
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Potvrdite radnju
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online aukcije
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Navedite ili količini ili vrednovanja Ocijenite ili oboje
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Ispunjenje
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Pogledaj u košaricu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Troškovi marketinga
 ,Item Shortage Report,Nedostatak izvješća za proizvod
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spomenuto, \n Molimo spomenuti ""težinu UOM"" previše"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spomenuto, \n Molimo spomenuti ""težinu UOM"" previše"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Zahtjev za robom korišten za izradu ovog ulaza robe
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Sljedeća Amortizacija Datum obvezna je za novu imovinu
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Odvojena grupa za tečajeve za svaku seriju
@@ -1885,12 +1921,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Provjerite knjiženje za svaki burzi pokreta
 DocType: Leave Allocation,Total Leaves Allocated,Ukupno Lišće Dodijeljeni
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Skladište potrebna u nizu br {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Unesite valjani financijske godine datum početka i kraja
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Unesite valjani financijske godine datum početka i kraja
 DocType: Employee,Date Of Retirement,Datum odlaska u mirovinu
 DocType: Upload Attendance,Get Template,Kreiraj predložak
 DocType: Material Request,Transferred,prebačen
 DocType: Vehicle,Doors,vrata
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext dovršeno!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext dovršeno!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Prikupiti naknadu za registraciju pacijenata
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,Porezna prekid
@@ -1909,36 +1945,36 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ako ova stavka ima varijante, onda to ne može biti izabran u prodajnim nalozima itd"
 DocType: Lead,Next Contact By,Sljedeći kontakt od
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Količina potrebna za proizvod {0} u redku {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Količina potrebna za proizvod {0} u redku {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Skladište {0} ne može biti izbrisano ako na njemu ima proizvod {1}
 DocType: Quotation,Order Type,Vrsta narudžbe
-DocType: Purchase Invoice,Notification Email Address,Obavijest E-mail adresa
 ,Item-wise Sales Register,Stavka-mudri prodaja registar
 DocType: Asset,Gross Purchase Amount,Bruto Iznos narudžbe
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Početna salda
 DocType: Asset,Depreciation Method,Metoda amortizacije
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,offline
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je li ovo pristojba uključena u osnovne stope?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Ukupno Target
 DocType: Job Applicant,Applicant for a Job,Podnositelj zahtjeva za posao
 DocType: Production Plan Material Request,Production Plan Material Request,Izrada plana materijala Zahtjev
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Nema napravljenih proizvodnih naloga
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Nema napravljenih proizvodnih naloga
 DocType: Stock Reconciliation,Reconciliation JSON,Pomirenje JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Previše stupovi. Izvesti izvješće i ispisati pomoću aplikacije za proračunske tablice.
 DocType: Purchase Invoice Item,Batch No,Broj serije
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Zahtjev za ponudu: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Dopusti višestruke prodajne naloge protiv kupca narudžbenice
 DocType: Student Group Instructor,Student Group Instructor,Instruktor grupe studenata
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Ne
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Glavni
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Glavni
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Varijanta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Postavite prefiks za numeriranje niza na svoje transakcije
 DocType: Employee Attendance Tool,Employees HTML,Zaposlenici HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Zadana BOM ({0}) mora biti aktivan za tu stavku ili njegov predložak
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Zadana BOM ({0}) mora biti aktivan za tu stavku ili njegov predložak
 DocType: Employee,Leave Encashed?,Odsustvo naplaćeno?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Prilika Od polje je obavezno
 DocType: Email Digest,Annual Expenses,Godišnji troškovi
 DocType: Item,Variants,Varijante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Napravi narudžbu kupnje
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Napravi narudžbu kupnje
 DocType: SMS Center,Send To,Pošalji
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Dodijeljeni iznos
@@ -1954,6 +1990,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Snaga grupe učenika
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Protiv Temeljnica {0} nema premca {1} unos
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,procjene
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Događaji treninga
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Dupli serijski broj unešen za proizvod {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Uvjet za Pravilo isporuke
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Molim uđite
@@ -1963,7 +2000,7 @@
 DocType: Sales Order,To Deliver and Bill,Za isporuku i Bill
 DocType: Student Group,Instructors,Instruktori
 DocType: GL Entry,Credit Amount in Account Currency,Kreditna Iznos u valuti računa
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} mora biti podnesen
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} mora biti podnesen
 DocType: Authorization Control,Authorization Control,Kontrola autorizacije
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Red # {0}: Odbijen Skladište je obvezna protiv odbijena točka {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Uplata
@@ -1982,33 +2019,33 @@
 DocType: Quotation Item,Actual Qty,Stvarna kol
 DocType: Sales Invoice Item,References,Reference
 DocType: Quality Inspection Reading,Reading 10,Čitanje 10
-DocType: Hub Settings,Hub Node,Hub Node
+DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Unijeli ste dupli proizvod. Ispravite i pokušajte ponovno.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,pomoćnik
 DocType: Asset Movement,Asset Movement,imovina pokret
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,Novi Košarica
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,Novi Košarica
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Proizvod {0} nije serijalizirani proizvod
 DocType: SMS Center,Create Receiver List,Stvaranje Receiver popis
 DocType: Vehicle,Wheels,kotači
 DocType: Packing Slip,To Package No.,Za Paket br
 DocType: Patient Relation,Family,Obitelj
 DocType: Production Planning Tool,Material Requests,Materijal Zahtjevi
-DocType: Warranty Claim,Issue Date,Datum izdavanja
+DocType: Warranty Claim,Issue Date,Datum Izazova
 DocType: Activity Cost,Activity Cost,Aktivnost troškova
 DocType: Sales Invoice Timesheet,Timesheet Detail,timesheet Detalj
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Potrošeno Kol
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikacije
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Ukazuje da je paket je dio ove isporuke (samo nacrti)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Napravi ulazno plaćanje
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Količina za proizvod {0} mora biti manja od {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Količina za proizvod {0} mora biti manja od {1}
 ,Sales Invoice Trends,Trendovi prodajnih računa
 DocType: Leave Application,Apply / Approve Leaves,Nanesite / Odobri Lišće
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Za
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Za
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Može se odnositi red samo akotip zadužen je "" Na prethodni red Iznos 'ili' prethodnog retka Total '"
 DocType: Sales Order Item,Delivery Warehouse,Isporuka Skladište
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Drvo centara financijski trošak.
 DocType: Serial No,Delivery Document No,Dokument isporuke br
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Molimo postavite &quot;dobici / gubici računa na sredstva Odlaganje &#39;u Društvu {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Molimo postavite &quot;dobici / gubici računa na sredstva Odlaganje &#39;u Društvu {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Se predmeti od kupnje primitke
 DocType: Serial No,Creation Date,Datum stvaranja
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Proizvod {0} se pojavljuje više puta u cjeniku {1}
@@ -2019,11 +2056,12 @@
 DocType: Student,Student Mobile Number,Studentski broj mobitela
 DocType: Item,Has Variants,Je Varijante
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Ažurirajte odgovor
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Već ste odabrali stavke iz {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Već ste odabrali stavke iz {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naziv mjesečne distribucije
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ID serije obvezan je
 DocType: Sales Person,Parent Sales Person,Nadređeni prodavač
-DocType: Purchase Invoice,Recurring Invoice,Ponavljajući Račun
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Visoka do Niska
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Najprije odaberite program
 DocType: Patient Appointment,Patient Age,Pacijentovo doba
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Upravljanje projektima
 DocType: Supplier,Supplier of Goods or Services.,Dobavljač dobara ili usluga.
@@ -2031,8 +2069,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Primljeni računi s mogućnošću primanja, ako nisu postavljeni u Pacijentu za rezerviranje troškova konzultacija."
 DocType: Vehicle Log,Fuel Price,Cijena goriva
 DocType: Budget,Budget,Budžet
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Postavi Otvori
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Fiksni Asset Stavka mora biti ne-stock točka a.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Postavi Otvori
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Fiksni Asset Stavka mora biti ne-stock točka a.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Proračun se ne može dodijeliti protiv {0}, kao što je nije prihod ili rashod račun"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Ostvareno
 DocType: Student Admission,Application Form Route,Obrazac za prijavu Route
@@ -2046,12 +2084,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Stavka {0} nije dobro postavljen za gospodara , serijski brojevi Provjera"
 DocType: Maintenance Visit,Maintenance Time,Vrijeme održavanja
 ,Amount to Deliver,Iznos za isporuku
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Ista stavka je unesena više puta. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Datum Pojam početka ne može biti ranije od godine Datum početka akademske godine u kojoj je pojam vezan (Akademska godina {}). Ispravite datume i pokušajte ponovno.
 DocType: Guardian,Guardian Interests,Guardian Interesi
 DocType: Naming Series,Current Value,Trenutna vrijednost
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Više fiskalne godine postoji za sada {0}. Molimo postavite tvrtka u fiskalnoj godini
 DocType: School Settings,Instructor Records to be created by,Instruktorski zapisi moraju biti izrađeni od strane
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} stvorio
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} stvorio
 DocType: Delivery Note Item,Against Sales Order,Protiv prodajnog naloga
 ,Serial No Status,Status serijskog broja
 DocType: Payment Entry Reference,Outstanding,izvanredan
@@ -2062,10 +2101,10 @@
  mora biti veći ili jednak {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,To se temelji na dionicama kretanja. Vidi {0} za detalje
 DocType: Pricing Rule,Selling,Prodaja
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Iznos {0} {1} oduzimaju od {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Iznos {0} {1} oduzimaju od {2}
 DocType: Employee,Salary Information,Informacije o plaći
 DocType: Sales Person,Name and Employee ID,Ime i ID zaposlenika
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
 DocType: Website Item Group,Website Item Group,Grupa proizvoda web stranice
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Carine i porezi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Unesite Referentni datum
@@ -2091,7 +2130,7 @@
 DocType: Issue,Resolution Details,Rezolucija o Brodu
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,izdvajanja
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Kriterij prihvaćanja
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Unesite materijala zahtjeva u gornjoj tablici
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Unesite materijala zahtjeva u gornjoj tablici
 DocType: Item Attribute,Attribute Name,Ime atributa
 DocType: BOM,Show In Website,Pokaži na web stranici
 DocType: Shopping Cart Settings,Show Quantity in Website,Prikaži Količina u Web
@@ -2100,7 +2139,7 @@
 DocType: Item Reorder,Check in (group),Check in (grupa)
 ,Qty to Order,Količina za narudžbu
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Glava račun pod odgovornosti ili glavnice, u kojem Dobit / gubitak će biti rezervirano"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Gantogram svih zadataka.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Gantogram svih zadataka.
 DocType: Opportunity,Mins to First Response,Min do prvog odgovora
 DocType: Pricing Rule,Margin Type,Margina Vrsta
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} sata
@@ -2121,35 +2160,35 @@
 DocType: Patient,Surgical History,Kirurška povijest
 DocType: Employee,Resignation Letter Date,Ostavka Pismo Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Pravilnik o određivanju cijena dodatno se filtrira na temelju količine.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Postavite datum pridruživanja za zaposlenika {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Postavite datum pridruživanja za zaposlenika {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Ukupan iznos za naplatu (preko vremenska tablica)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ponovite kupaca prihoda
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) mora imati ulogu ""Odobritelj rashoda '"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Par
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Odaberite BOM i Kol za proizvodnju
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Odaberite BOM i Kol za proizvodnju
 DocType: Asset,Depreciation Schedule,Amortizacija Raspored
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Adresa prodavača i kontakti
 DocType: Bank Reconciliation Detail,Against Account,Protiv računa
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Poludnevni Datum treba biti između od datuma i datuma
 DocType: Maintenance Schedule Detail,Actual Date,Stvarni datum
 DocType: Item,Has Batch No,Je Hrpa Ne
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Godišnji naplatu: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Godišnji naplatu: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Porez na robu i usluge (GST India)
 DocType: Delivery Note,Excise Page Number,Trošarina Broj stranice
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Društvo, Iz Datum i do danas je obavezno"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Dobiti iz konzultacije
 DocType: Asset,Purchase Date,Datum kupnje
 DocType: Employee,Personal Details,Osobni podaci
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Molimo postavite &quot;imovinom Centar Amortizacija troškova &#39;u Društvu {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Molimo postavite &quot;imovinom Centar Amortizacija troškova &#39;u Društvu {0}
 ,Maintenance Schedules,Održavanja rasporeda
 DocType: Task,Actual End Date (via Time Sheet),Stvarni Datum završetka (putem vremenska tablica)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Iznos {0} {1} od {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Iznos {0} {1} od {2} {3}
 ,Quotation Trends,Trend ponuda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Stavka proizvoda se ne spominje u master artiklu za artikal {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Zaduženja računa mora biti Potraživanja račun
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Zaduženja računa mora biti Potraživanja račun
 DocType: Shipping Rule Condition,Shipping Amount,Dostava Iznos
 DocType: Supplier Scorecard Period,Period Score,Ocjena razdoblja
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Dodaj korisnike
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Dodaj korisnike
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Iznos na čekanju
 DocType: Lab Test Template,Special,poseban
 DocType: Purchase Invoice Item,Conversion Factor,Konverzijski faktor
@@ -2157,13 +2196,14 @@
 ,Vehicle Expenses,Troškovi vozila
 DocType: Serial No,Invoice Details,Pojedinosti fakture
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Očekivana vrijednost nakon životnog vijeka mora biti veća od ili jednaka do {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Započnite
+DocType: Hub Category,Hub Category,Kategorija hubova
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Broj vozila
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,Datum na koji se ponavlja faktura će se zaustaviti
 DocType: Employee Loan,Loan Amount,Iznos pozajmice
 DocType: Program Enrollment,Self-Driving Vehicle,Vozila samostojećih
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Stalna ocjena dobavljača
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Redak {0}: broj materijala koji nije pronađen za stavku {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Redak {0}: broj materijala koji nije pronađen za stavku {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Ukupno dodijeljeni lišće {0} ne može biti manja od već odobrenih lišća {1} za razdoblje
 DocType: Journal Entry,Accounts Receivable,Potraživanja
 ,Supplier-Wise Sales Analytics,Supplier -mudar prodaje Analytics
@@ -2174,7 +2214,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)",Roditeljski tečaj (ostavite prazno ako ovo nije dio roditeljskog tečaja)
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Ostavite prazno ako se odnosi na sve tipove zaposlenika
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuirati optužbi na temelju
-apps/erpnext/erpnext/hooks.py +131,Timesheets,timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,timesheets
 DocType: HR Settings,HR Settings,HR postavke
 DocType: Salary Slip,net pay info,Neto info plaća
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Ova je vrijednost ažurirana u zadanom cjeniku prodajnih cijena.
@@ -2185,7 +2225,7 @@
 DocType: Patient,B Positive,B Pozitivan
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Red # {0}: Količina mora biti jedan, jer predmet je fiksni kapital. Molimo koristite poseban red za više kom."
 DocType: Leave Block List Allow,Leave Block List Allow,Odobrenje popisa neodobrenih odsustava
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr ne može biti prazno ili razmak
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr ne može biti prazno ili razmak
 DocType: Patient Medical Record,Patient Medical Record,Patient Medical Record
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Grupa ne-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sportovi
@@ -2201,9 +2241,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Nije moguće pronaći kurs za {0} do {1} za ključni datum {2}. Ručno stvorite zapis za mjenjačnicu
 DocType: POS Profile,Price List,Cjenik
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} je sada zadana fiskalna godina. Osvježi preglednik kako bi se promjene aktualizirale.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Rashodi Potraživanja
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Rashodi Potraživanja
 DocType: Issue,Support,Podrška
 ,BOM Search,BOM Pretraživanje
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Objavite &quot;na zalihi&quot; ili &quot;nije na zalihi&quot; na hubu na temelju dostupnih dionica u ovom skladištu.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Zatvaranje (Otvaranje + iznosi)
 DocType: Vehicle,Fuel Type,Vrsta goriva
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Navedite valutu u Društvu
@@ -2215,16 +2256,16 @@
 DocType: Healthcare Settings,Remind Before,Podsjetite prije
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Faktor UOM pretvorbe je potrebno u redu {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Red # {0}: Referenca Tip dokumenta mora biti jedan od prodajnog naloga, prodaja fakture ili Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Red # {0}: Referenca Tip dokumenta mora biti jedan od prodajnog naloga, prodaja fakture ili Journal Entry"
 DocType: Salary Component,Deduction,Odbitak
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Red {0}: Od vremena i vremena je obavezno.
 DocType: Stock Reconciliation Item,Amount Difference,iznos razlika
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Cijena dodana za {0} u cjeniku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Cijena dodana za {0} u cjeniku {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Unesite ID zaposlenika ove prodaje osobi
 DocType: Territory,Classification of Customers by region,Klasifikacija korisnika po regiji
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Razlika Iznos mora biti jednak nuli
 DocType: Project,Gross Margin,Bruto marža
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Unesite Proizvodnja predmeta prvi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Unesite Proizvodnja predmeta prvi
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Izračunato banka Izjava stanje
 DocType: Normal Test Template,Normal Test Template,Predložak za normalan test
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,onemogućen korisnika
@@ -2234,21 +2275,22 @@
 DocType: Salary Slip,Total Deduction,Ukupno Odbitak
 ,Production Analytics,Proizvodnja Analytics
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,To se temelji na transakcijama protiv ovog pacijenta. Pojedinosti potražite u nastavku
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Trošak Ažurirano
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Trošak Ažurirano
 DocType: Employee,Date of Birth,Datum rođenja
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Proizvod {0} je već vraćen
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Fiskalna godina** predstavlja poslovnu godinu. Svi računovodstvene stavke i druge glavne transakcije su praćene od **Fiskalne godine**.
 DocType: Opportunity,Customer / Lead Address,Kupac / Olovo Adresa
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Postavljanje tablice dobavljača
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL potvrda o vezanosti {0}
-DocType: Student Admission,Eligibility,kvalificiranost
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Naziv plana procjene
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL potvrda o vezanosti {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Potencijalni kupci će vam pomoći u posao, dodati sve svoje kontakte, a više kao svoje potencijalne klijente"
 DocType: Production Order Operation,Actual Operation Time,Stvarni Operacija vrijeme
 DocType: Authorization Rule,Applicable To (User),Odnosi se na (Upute)
 DocType: Purchase Taxes and Charges,Deduct,Odbiti
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Opis Posla
 DocType: Student Applicant,Applied,primijenjen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Ponovno otvorena
 DocType: Sales Invoice Item,Qty as per Stock UOM,Količina po skladišnom UOM-u
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Ime Guardian2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Posebni znakovi osim ""-"" ""."", ""#"", i ""/"" nije dopušten u imenovanju serije"
@@ -2260,7 +2302,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Upravitelj proizvodnje
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serijski Ne {0} je pod jamstvom upto {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Split otpremnici u paketima.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Pošiljke
+apps/erpnext/erpnext/hooks.py +107,Shipments,Pošiljke
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Ukupno Dodijeljeni iznos (Društvo valuta)
 DocType: Purchase Order Item,To be delivered to customer,Da biste se dostaviti kupcu
 DocType: BOM,Scrap Material Cost,Otpaci materijalni troškovi
@@ -2282,8 +2324,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Postavke varijacije stavke
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Odaberite tvrtku ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Ostavite prazno ako se odnosi na sve odjele
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Vrste zapošljavanja ( trajni ugovor , pripravnik i sl. ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} je obavezno za točku {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Vrste zapošljavanja ( trajni ugovor , pripravnik i sl. ) ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} je obavezno za točku {1}
 DocType: Process Payroll,Fortnightly,četrnaestodnevni
 DocType: Currency Exchange,From Currency,Od novca
 DocType: Vital Signs,Weight (In Kilogram),Težina (u kilogramu)
@@ -2307,7 +2349,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Molimo kliknite na ""Generiraj raspored ' kako bi dobili raspored"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Bilo je grešaka za vrijeme brisanja sljedeći Prilozi:
 DocType: Bin,Ordered Quantity,Naručena količina
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","na primjer ""Alati za graditelje"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","na primjer ""Alati za graditelje"""
 DocType: Grading Scale,Grading Scale Intervals,Ljestvici Intervali
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: knjiženje za {2} je moguće izvesti samo u valuti: {3}
 DocType: Production Order,In Process,U procesu
@@ -2330,11 +2372,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Uz plaćanje poreza
 DocType: Expense Claim Detail,Expense Claim Detail,Rashodi Zahtjev Detalj
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICATE ZA DOBAVLJAČ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Molimo odaberite ispravnu račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Molimo odaberite ispravnu račun
 DocType: Item,Weight UOM,Težina UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Struktura plaća zaposlenika
 DocType: Patient,Blood Group,Krvna grupa
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Na čekanju
 DocType: Course,Course Name,Naziv predmeta
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Korisnici koji može odobriti dopust aplikacije neke specifične zaposlenika
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Uredska oprema
@@ -2353,7 +2394,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Cijene neće biti prikazana ako Cjenik nije postavljena
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Navedite zemlju za ovaj Dostava pravilom ili provjeriti Dostava u svijetu
 DocType: Stock Entry,Total Incoming Value,Ukupno Dolazni vrijednost
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Zaduženja je potrebno
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Zaduženja je potrebno
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomoći pratiti vrijeme, troškove i naplatu za aktivnostima obavljaju unutar vašeg tima"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kupovni cjenik
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Predlošci varijabli s rezultatima dobavljača.
@@ -2363,7 +2404,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Pomirenje plaćanja
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Odaberite incharge ime osobe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,tehnologija
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Ukupno Neplaćeni: {0}
+DocType: Hub Settings,Unregister from Hub,Poništite registraciju s usluge Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Ukupno Neplaćeni: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Web Rad
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Ponuda Pismo
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generirajte Materijal Upiti (MRP) i radne naloge.
@@ -2375,7 +2417,9 @@
 DocType: Physician Schedule Time Slot,To Time,Za vrijeme
 DocType: Authorization Rule,Approving Role (above authorized value),Odobravanje ulogu (iznad ovlaštenog vrijednosti)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Kredit računa mora biti naplativo račun
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija : {0} ne može biti roditelj ili dijete od {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Molimo odaberite Studentski ulaz koji je obvezan za plaćenog studenta
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija : {0} ne može biti roditelj ili dijete od {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Molimo odaberite Cjenik za objavljivanje cijena
 DocType: Production Order Operation,Completed Qty,Završen Kol
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Za {0}, samo debitne računi se mogu povezati protiv druge kreditne stupanja"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Cjenik {0} je ugašen
@@ -2387,37 +2431,39 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serijski brojevi potrebni za Artikl {1}. Ti su dali {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Trenutno Vrednovanje Ocijenite
 DocType: Item,Customer Item Codes,Kupac Stavka Kodovi
+DocType: Training Event,Advance,napredovati
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,za ponavljanje ponavljanja.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Razmjena Dobit / gubitak
 DocType: Opportunity,Lost Reason,Razlog gubitka
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nova adresa
 DocType: Quality Inspection,Sample Size,Veličina uzorka
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Unesite primitka dokumenta
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Svi proizvodi su već fakturirani
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Navedite važeću &#39;iz Predmet br&#39;
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',Navedite važeću &#39;iz Predmet br&#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Daljnje troška mogu biti u skupinama, ali unose se može podnijeti protiv nesrpskog Groups"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Korisnici i dozvole
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Radni nalozi Created: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Radni nalozi Created: {0}
 DocType: Branch,Branch,Grana
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tiskanje i brendiranje
 DocType: Company,Total Monthly Sales,Ukupna mjesečna prodaja
 DocType: Bin,Actual Quantity,Stvarna količina
 DocType: Shipping Rule,example: Next Day Shipping,Primjer: Sljedeći dan Dostava
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serijski broj {0} nije pronađen
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Pretplata je {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Pretplata je {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Program rasporeda naknada
 DocType: Fee Schedule Program,Student Batch,Student serije
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,odaberite * od `tabVital Signs` gdje pacijent = &#39;{0}&#39; poredaj po signal_date desc limit 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Provjerite Student
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Min Grade
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Pozvani ste da surađuju na projektu: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Liječnik nije dostupan na {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Pozvani ste da surađuju na projektu: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Liječnik nije dostupan na {0}
 DocType: Leave Block List Date,Block Date,Datum bloka
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Dodaj prilagođeno polje Id pretplate u doktorku {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Isporuka isporuke dobavljača
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Primijeni sada
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Primijeni sada
+apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Stvarna kol {0} / Na čekanju kol {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-trgovina GSTIN
 DocType: Sales Order,Not Delivered,Ne isporučeno
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Očekivani datum ne može biti prije datuma transakcije
 ,Bank Clearance Summary,Razmak banka Sažetak
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Stvaranje i upravljanje automatskih mailova na dnevnoj, tjednoj i mjesečnoj bazi."
 DocType: Appraisal Goal,Appraisal Goal,Procjena gol
@@ -2425,12 +2471,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Građevine
 DocType: Fee Schedule,Fee Structure,Struktura naknade
 DocType: Timesheet Detail,Costing Amount,Obračun troškova Iznos
-DocType: Student Admission,Application Fee,Naknada Primjena
+DocType: Student Admission Program,Application Fee,Naknada Primjena
 DocType: Process Payroll,Submit Salary Slip,Slanje plaće Slip
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Najveći popust za proizvode {0} je {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Najveći popust za proizvode {0} je {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Uvoz u rasutom stanju
 DocType: Sales Partner,Address & Contacts,Adresa i kontakti
 DocType: SMS Log,Sender Name,Pošiljatelj Ime
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Poredaj po kriterijima
 DocType: POS Profile,[Select],[Odaberi]
 DocType: Vital Signs,Blood Pressure (diastolic),Krvni tlak (dijastolički)
 DocType: SMS Log,Sent To,Poslano Da
@@ -2439,7 +2486,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Sljedeća Kontakt Datum ne može biti u prošlosti
 DocType: Company,For Reference Only.,Za samo kao referenca.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Liječnik {0} nije dostupan na {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Odaberite šifra serije
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Odaberite šifra serije
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Pogrešna {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,Referenca Inv
@@ -2455,15 +2502,15 @@
 DocType: Normal Test Items,Require Result Value,Zahtijevati vrijednost rezultata
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Slučaj broj ne može biti 0
 DocType: Item,Show a slideshow at the top of the page,Prikaži slideshow na vrhu stranice
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Sastavnice
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,prodavaonice
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Sastavnice
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,prodavaonice
 DocType: Project Type,Projects Manager,Projekti Manager
 DocType: Serial No,Delivery Time,Vrijeme isporuke
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Starenje temelju On
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Imenovanje je otkazano
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Imenovanje je otkazano
 DocType: Item,End of Life,Kraj života
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,putovanje
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Ne aktivni ili zadani Struktura plaća pronađeno za zaposlenika {0} za navedene datume
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,putovanje
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Ne aktivni ili zadani Struktura plaća pronađeno za zaposlenika {0} za navedene datume
 DocType: Leave Block List,Allow Users,Omogućiti korisnicima
 DocType: Purchase Order,Customer Mobile No,Kupac mobilne Ne
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Koji se vraća
@@ -2472,12 +2519,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Update cost
 DocType: Item Reorder,Item Reorder,Ponovna narudžba proizvoda
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Prikaži Plaća proklizavanja
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Prijenos materijala
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Prijenos materijala
 DocType: Fees,Send Payment Request,Pošalji zahtjev za plaćanje
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Navedite operacija, operativni troškovi i dati jedinstven radom najkasnije do svojih operacija ."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ovaj dokument je preko granice po {0} {1} za stavku {4}. Jeste li što drugo {3} protiv iste {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Molimo postavite ponavljajući nakon spremanja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Iznos računa Odaberi promjene
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Iznos računa Odaberi promjene
 DocType: Purchase Invoice,Price List Currency,Valuta cjenika
 DocType: Naming Series,User must always select,Korisničko uvijek mora odabrati
 DocType: Stock Settings,Allow Negative Stock,Dopustite negativnu zalihu
@@ -2497,7 +2544,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Zaposlenik
 DocType: Sample Collection,Collected Time,Prikupljeno vrijeme
 DocType: Company,Sales Monthly History,Mjesečna povijest prodaje
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Odaberite Batch
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Odaberite Batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} je naplaćen u cijelosti
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Vitalni znakovi
 DocType: Training Event,End Time,Kraj vremena
@@ -2505,16 +2552,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Odbici plaćanja ili gubitak
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardni uvjeti ugovora za prodaju ili kupnju.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Grupa po jamcu
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Jeste li sigurni da želite otkazati ovaj termin?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Prodaja cjevovoda
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Molimo postavite zadani račun plaće komponente {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Potrebna On
 DocType: Rename Tool,File to Rename,Datoteka za Preimenovanje
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Odaberite BOM za točku u nizu {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Odaberite BOM za točku u nizu {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Račun {0} ne odgovara tvrtki {1} u načinu računa: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Određena BOM {0} ne postoji za točku {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Stavka održavanja {0} mora biti otkazana prije poništenja ove narudžbe kupca
+DocType: POS Profile,Applicable for Users,Primjenjivo za korisnike
 DocType: Notification Control,Expense Claim Approved,Rashodi Zahtjev odobren
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Plaća proklizavanja zaposlenika {0} već stvorena za ovo razdoblje
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Plaća proklizavanja zaposlenika {0} već stvorena za ovo razdoblje
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Farmaceutski
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Troškovi kupljene predmete
 DocType: Selling Settings,Sales Order Required,Prodajnog naloga Obvezno
@@ -2538,6 +2587,7 @@
 DocType: Offer Letter,Accepted,Prihvaćeno
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Organizacija
 DocType: BOM Update Tool,BOM Update Tool,Alat za ažuriranje BOM-a
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Račun stranke nije naveden, postavite zadani račun stranke u tvrtki"
 DocType: SG Creation Tool Course,Student Group Name,Naziv grupe studenata
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Stvaranje naknada
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Molimo provjerite da li stvarno želite izbrisati sve transakcije za ovu tvrtku. Vaši matični podaci će ostati kao što je to. Ova radnja se ne može poništiti.
@@ -2546,31 +2596,32 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne može biti veći od planirane količine ({2}) u proizvodnom nalogu {3}
 DocType: Shipping Rule,Shipping Rule Label,Dostava Pravilo Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum za korisnike
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Sirovine ne može biti prazno.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Ne može se ažurirati zaliha, fakture sadrži drop shipping stavke."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Sirovine ne može biti prazno.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Ne može se ažurirati zaliha, fakture sadrži drop shipping stavke."
 DocType: Lab Test Sample,Lab Test Sample,Uzorak laboratorija
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Brzo Temeljnica
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Ne možete promijeniti cijenu ako je sastavnica spomenuta u bilo kojem proizvodu
+DocType: Restaurant,Invoice Series Prefix,Prefiks serije fakture
 DocType: Employee,Previous Work Experience,Radnog iskustva
 DocType: Stock Entry,For Quantity,Za Količina
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Unesite Planirano Qty za točku {0} na redu {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Unesite Planirano Qty za točku {0} na redu {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} nije podnesen
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Zahtjevi za stavke.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Poseban proizvodnja kako će biti izrađen za svakog gotovog dobrom stavke.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} mora biti negativan u povratnom dokumentu
 ,Minutes to First Response for Issues,Minuta do prvog odgovora na pitanja
 DocType: Purchase Invoice,Terms and Conditions1,Odredbe i Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,Ime instituta za koju postavljate ovaj sustav.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,Ime instituta za koju postavljate ovaj sustav.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Knjiženje zamrznuta do tog datuma, nitko ne može učiniti / mijenjati ulazak, osim uloge naveden u nastavku."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Molimo spremite dokument prije stvaranja raspored za održavanje
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Zadnja cijena ažurirana u svim BOM-ovima
 DocType: Fee Schedule,Successful,uspješan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status projekta
 DocType: UOM,Check this to disallow fractions. (for Nos),Provjerite to da ne dopušta frakcija. (Za br)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Sljedeći Radni nalozi stvorili su:
-DocType: Student Admission,Naming Series (for Student Applicant),Imenovanje serije (za studentske zahtjeva)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Sljedeći Radni nalozi stvorili su:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Imenovanje serije (za studentske zahtjeva)
 DocType: Delivery Note,Transporter Name,Transporter Ime
-DocType: Authorization Rule,Authorized Value,Ovlašteni vrijednost
+DocType: Authorization Rule,Authorized Value,Ovlaštena vrijednost
 DocType: BOM,Show Operations,Pokaži operacije
 ,Minutes to First Response for Opportunity,Zapisnik na prvi odgovor za priliku
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Absent,Ukupno Odsutni
@@ -2592,7 +2643,7 @@
 ,Employees working on a holiday,Radnici koji rade na odmor
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Sadašnje
 DocType: Project,% Complete Method,% Kompletan postupak
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Droga
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Droga
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Početni datum održavanja ne može biti stariji od datuma isporuke s rednim brojem {0}
 DocType: Production Order,Actual End Date,Stvarni datum završetka
 DocType: BOM,Operating Cost (Company Currency),Operativni trošak (Društvo valuta)
@@ -2610,19 +2661,20 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Odobravanje korisnik ne može biti isto kao korisnikapravilo odnosi se na
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Osnovna stopa (po burzi UOM)
 DocType: SMS Log,No of Requested SMS,Nema traženih SMS-a
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Ostavite bez plaće ne odgovara odobrenog odsustva primjene zapisa
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Ostavite bez plaće ne odgovara odobrenog odsustva primjene zapisa
 DocType: Campaign,Campaign-.####,Kampanja-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Sljedeći koraci
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Molimo dostaviti navedene stavke po najboljim mogućim cijenama
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Napravi račun
-DocType: Selling Settings,Auto close Opportunity after 15 days,Auto blizu Prilika nakon 15 dana
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Narudžbenice za zabavu nisu dozvoljene za {0} zbog položaja ocjene bodova {1}.
+DocType: Selling Settings,Auto close Opportunity after 15 days,Automatski zatvori Priliku nakon 15 dana
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Narudžbenice za zabavu nisu dozvoljene za {0} zbog položaja ocjene bodova {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Godina završetka
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Kvota / olovo%
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Ugovor Datum završetka mora biti veći od dana ulaska u
 DocType: Vital Signs,Nutrition Values,Nutricionističke vrijednosti
 DocType: Lab Test Template,Is billable,Je naplativo
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",I &quot;Raspored liječnika&quot; i &quot;Vrijeme po imenovanju&quot; moraju biti postavljeni za Dr {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Vanjski distributer / trgovac / trgovački zastupnik / suradnik / prodavač koji prodaje proizvode tvrtke za proviziju.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} u odnosu na narudžbu {1}
 DocType: Patient,Patient Demographics,Demografska pacijentica
@@ -2672,7 +2724,6 @@
  10. Dodavanje ili oduzimamo: Bilo da želite dodati ili oduzeti porez."
 DocType: Homepage,Homepage,Početna
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Odaberite liječnika ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',ažuriranje tabConsultation set invoice = &#39;{0}&#39; gdje name = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,RecD Količina
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Naknada zapisa nastalih - {0}
 DocType: Asset Category Account,Asset Category Account,Imovina Kategorija račun
@@ -2684,7 +2735,7 @@
 DocType: Asset,Manual,Priručnik
 DocType: Salary Component Account,Salary Component Account,Račun plaća Komponenta
 DocType: Global Defaults,Hide Currency Symbol,Sakrij simbol valute
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","npr. banka, gotovina, kreditne kartice"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","npr. banka, gotovina, kreditne kartice"
 DocType: Lead Source,Source Name,source Name
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Uobičajeni krvni tlak odrasle osobe u odrasloj dobi iznosi približno 120 mmHg sistolički i dijastolički od 80 mmHg, skraćeno &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Odobrenje kupcu
@@ -2703,16 +2754,16 @@
 DocType: Patient,Occupation,Okupacija
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Red {0} : Datum početka mora biti prije datuma završetka
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Ukupno (Kol)
-DocType: Sales Invoice,This Document,Ovaj dokument
 DocType: Installation Note Item,Installed Qty,Instalirana kol
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,To može biti zbog nekih nevažećih adresa e - pošte u programu
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Dodali ste
 DocType: Purchase Taxes and Charges,Parenttype,Nadređeni tip
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Rezultat trening
-DocType: Purchase Invoice,Is Paid,se plaća
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Rezultat trening
+DocType: Purchase Invoice,Is Paid,je plaćen
 DocType: Salary Structure,Total Earning,Ukupna zarada
 DocType: Purchase Receipt,Time at which materials were received,Vrijeme u kojem su materijali primili
 DocType: Stock Ledger Entry,Outgoing Rate,Odlazni Ocijenite
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Organizacija grana majstor .
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Organizacija grana majstor .
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,ili
 DocType: Sales Order,Billing Status,Status naplate
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Prijavi problem
@@ -2727,7 +2778,8 @@
 DocType: Notification Control,Sales Order Message,Poruka narudžbe kupca
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Postavi zadane vrijednosti kao što su tvrtka, valuta, tekuća fiskalna godina, itd."
 DocType: Payment Entry,Payment Type,Vrsta plaćanja
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Odaberite Batch for Item {0}. Nije moguće pronaći jednu seriju koja ispunjava taj uvjet
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Odaberite Batch for Item {0}. Nije moguće pronaći jednu seriju koja ispunjava taj uvjet
+DocType: Hub Category,Parent Category,Roditeljska kategorija
 DocType: Process Payroll,Select Employees,Odaberite Zaposlenici
 DocType: Opportunity,Potential Sales Deal,Potencijalni Prodaja Deal
 DocType: Complaint,Complaints,pritužbe
@@ -2764,7 +2816,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikacija paketa za dostavu (za tisak)
 DocType: Bin,Reserved Quantity,Rezervirano Količina
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Unesite valjanu e-adresu
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Odaberite stavku u košarici
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Odaberite stavku u košarici
 DocType: Landed Cost Voucher,Purchase Receipt Items,Primka proizvoda
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Prilagodba Obrasci
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,zaostatak
@@ -2774,15 +2826,15 @@
 DocType: Payment Request,Amount in customer's currency,Iznos u valuti kupca
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Isporuka
 DocType: Stock Reconciliation Item,Current Qty,Trenutno Kom
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Dodajte dobavljače
+DocType: Restaurant Menu,Restaurant Menu,Izbornik restorana
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Prethodna
 DocType: Appraisal Goal,Key Responsibility Area,Zona ključnih odgovornosti
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Studentski Serije vam pomoći pratiti posjećenost, procjene i naknade za učenike"
 DocType: Payment Entry,Total Allocated Amount,Ukupni raspoređeni iznos
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Postavite zadani oglasni prostor za trajni oglasni prostor
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Postavite zadani oglasni prostor za trajni oglasni prostor
 DocType: Item Reorder,Material Request Type,Tip zahtjeva za robom
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural Temeljnica za plaće iz {0} do {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage puna, nije štedjelo"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage puna, nije štedjelo"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Red {0}: UOM pretvorbe faktor je obavezno
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Kapacitet sobe
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref.
@@ -2821,16 +2873,18 @@
 DocType: Project,Task Completion,Zadatak Završetak
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Ne u skladištu
 DocType: Appraisal,HR User,HR Korisnik
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Porezi i naknade oduzeti
-apps/erpnext/erpnext/hooks.py +129,Issues,Pitanja
+apps/erpnext/erpnext/hooks.py +138,Issues,Pitanja
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status mora biti jedan od {0}
 DocType: Sales Invoice,Debit To,Rashodi za
+DocType: Restaurant Menu Item,Restaurant Menu Item,Stavka izbornika restorana
 DocType: Delivery Note,Required only for sample item.,Potrebna je samo za primjer stavke.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Stvarna količina nakon transakcije
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Nema klizanja plaća je između {0} i {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Nema klizanja plaća je između {0} i {1}
 ,Pending SO Items For Purchase Request,Otvorene stavke narudžbe za zahtjev za kupnju
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Studentski Upisi
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} je onemogućen
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Studentski Upisi
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} je onemogućen
 DocType: Supplier,Billing Currency,Naplata valuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Extra large
@@ -2853,6 +2907,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Molimo spomenuti nema posjeta potrebnih
 DocType: Stock Settings,Default Valuation Method,Zadana metoda vrednovanja
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,Pristojba
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Ažuriranje je u tijeku. Može potrajati neko vrijeme.
 DocType: Vehicle Log,Fuel Qty,Gorivo Kol
 DocType: Production Order Operation,Planned Start Time,Planirani početak vremena
 DocType: Course,Assessment,procjena
@@ -2868,7 +2923,7 @@
 DocType: Price List,Price List Master,Cjenik Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Sve prodajnih transakcija može biti označene protiv više osoba ** prodaje **, tako da možete postaviti i pratiti ciljeve."
 ,S.O. No.,N.K.br.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Molimo stvoriti kupac iz Olovo {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Molimo stvoriti kupac iz Olovo {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Odaberite Pacijent
 DocType: Price List,Applicable for Countries,Primjenjivo za zemlje
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Naziv parametra
@@ -2911,27 +2966,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,Dobavljač Detalji Račun
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Rashodi / Razlika računa ({0}) mora biti račun 'dobit ili gubitak'
 DocType: Project,Copied From,Kopiran iz
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},greška Ime: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Nedostatak
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},greška Ime: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,Nedostatak
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} ne povezan s {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Gledatelja za zaposlenika {0} već označen
 DocType: Packing Slip,If more than one package of the same type (for print),Ako je više od jedan paket od iste vrste (za tisak)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Postavite zadani klijent u Postavkama restorana
 ,Salary Register,Plaća Registracija
 DocType: Warehouse,Parent Warehouse,Roditelj Skladište
 DocType: C-Form Invoice Detail,Net Total,Osnovica
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Zadani BOM nije pronađen za stavku {0} i projekt {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Zadani BOM nije pronađen za stavku {0} i projekt {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Definirati različite vrste kredita
 DocType: Bin,FCFS Rate,FCFS Stopa
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Izvanredna Iznos
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Vrijeme (u minutama)
 DocType: Project Task,Working,Radni
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Kataloški red (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Financijska godina
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Financijska godina
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} ne pripada Društvu {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,Nije moguće riješiti funkciju bodova kriterija za {0}. Provjerite je li formula valjana.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Trošak kao i na
 DocType: Healthcare Settings,Out Patient Settings,Izvan pacijentskih postavki
 DocType: Account,Round Off,Zaokružiti
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Količina mora biti pozitivna
 ,Requested Qty,Traženi Kol
 DocType: Tax Rule,Use for Shopping Cart,Koristite za Košarica
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Vrijednost {0} za atribut {1} ne postoji na popisu važeće točke Vrijednosti atributa za točku {2}
@@ -2940,7 +2997,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Troškovi će se distribuirati proporcionalno na temelju točke kom ili iznos, kao i po svom izboru"
 DocType: Maintenance Visit,Purposes,Svrhe
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Atleast jedan predmet treba upisati s negativnim količinama u povratnom dokumentu
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Dodaj tečajeve
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacija {0} više nego bilo raspoloživih radnih sati u radnom {1}, razbiti rad u više operacija"
 ,Requested,Tražena
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Nema primjedbi
@@ -2952,6 +3008,8 @@
 DocType: Employee Loan,Repaid/Closed,Otplaćuje / Zatvoreno
 DocType: Item,Total Projected Qty,Ukupni predviđeni Kol
 DocType: Monthly Distribution,Distribution Name,Naziv distribucije
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dobavljač&gt; Vrsta dobavljača
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Stopa procjene nije pronađena za stavku {0}, koja je potrebna za knjiženje unosa za {1} {2}. Ako se stavka izvršava kao stavka stope nulte vrijednosti u {1}, navedite to u tablici {1} stavke. U suprotnom, izradite transakciju dolazne burze za stavku ili navedite stopu vrednovanja u zapisu Stavka, a zatim pokušajte poslati / poništiti ovaj unos"
 DocType: Course,Course Code,kod predmeta
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Inspekcija kvalitete potrebna za proizvod {0}
 DocType: POS Settings,Use POS in Offline Mode,Koristite POS u izvanmrežnom načinu rada
@@ -2962,14 +3020,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Uredi teritorijalnu raspodjelu.
 DocType: Journal Entry Account,Sales Invoice,Prodajni račun
 DocType: Journal Entry Account,Party Balance,Bilanca stranke
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,Odaberite Primijeni popusta na
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Odaberite Primijeni popusta na
 DocType: Company,Default Receivable Account,Zadana Potraživanja račun
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Stvaranje banke ulaz za ukupne plaće isplaćene za prethodno izabrane kriterije
 DocType: Physician,Physician Schedule,Raspored liječnika
 DocType: Purchase Invoice,Deemed Export,Pretraženo izvoz
 DocType: Stock Entry,Material Transfer for Manufacture,Prijenos materijala za izradu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Postotak popusta se može neovisno primijeniti prema jednom ili za više cjenika.
-DocType: Purchase Invoice,Half-yearly,Polugodišnje
+DocType: Subscription,Half-yearly,Polugodišnje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Knjiženje na skladištu
 DocType: Lab Test,LabTest Approver,LabTest odobrenje
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Već ste ocijenili kriterije procjene {}.
@@ -2998,13 +3056,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Dodatni Mali
 DocType: Company,Standard Template,standardni predložak
 DocType: Training Event,Theory,Teorija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Upozorenje : Materijal Tražena količina manja nego minimalna narudžba kol
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Upozorenje : Materijal Tražena količina manja nego minimalna narudžba kol
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Račun {0} je zamrznut
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pravna cjelina / Podružnica s odvojenim kontnim planom pripada Organizaciji.
 DocType: Payment Request,Mute Email,Mute e
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Hrana , piće i duhan"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Može napraviti samo plaćanje protiv Nenaplaćena {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Proviziju ne može biti veća od 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Može napraviti samo plaćanje protiv Nenaplaćena {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Proviziju ne može biti veća od 100
 DocType: Stock Entry,Subcontract,Podugovor
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Unesite {0} prvi
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Nema odgovora od
@@ -3022,10 +3080,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Boja
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Plan Procjena Kriteriji
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Spriječiti narudžbenice
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Osjetljiv
 DocType: Patient Appointment,Scheduled,Planiran
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Zahtjev za ponudu.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Postavite Sustav imenovanja zaposlenika u ljudskim resursima&gt; HR postavke
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Molimo odaberite stavku u kojoj &quot;Je kataloški Stavka&quot; je &quot;Ne&quot; i &quot;Je Prodaja Stavka&quot; &quot;Da&quot;, a ne postoji drugi bala proizvoda"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Odaberite klijenta
 DocType: Student Log,Academic,Akademski
 DocType: Patient,Personal and Social History,Osobna i društvena povijest
 DocType: Fee Schedule,Fee Breakup for each student,Otkazivanje naknade za svakog studenta
@@ -3035,7 +3094,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Stopa vrednovanja
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Dizel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Valuta cjenika nije odabrana
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Valuta cjenika nije odabrana
 apps/erpnext/erpnext/config/healthcare.py +46,Results,Rezultati
 ,Student Monthly Attendance Sheet,Studentski mjesečna posjećenost list
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Zaposlenik {0} već podnijela zahtjev za {1} od {2} i {3}
@@ -3050,7 +3109,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Uredi prodajne partnere.
 DocType: Quality Inspection,Inspection Type,Inspekcija Tip
 DocType: Fee Validity,Visited yet,Još posjetio
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Skladišta s postojećim transakcije se ne može pretvoriti u skupinu.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Skladišta s postojećim transakcije se ne može pretvoriti u skupinu.
 DocType: Assessment Result Tool,Result HTML,rezultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,istječe
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Dodaj studente
@@ -3077,7 +3136,7 @@
 DocType: Healthcare Settings,Result Printed,Rezultat je tiskan
 DocType: Asset Category Account,Depreciation Expense Account,Amortizacija reprezentaciju
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Probni
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Pogledajte {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Pogledajte {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Samo lisni čvorovi su dozvoljeni u transakciji
 DocType: Expense Claim,Expense Approver,Rashodi Odobritelj
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Red {0}: Advance protiv Kupac mora biti kreditna
@@ -3088,7 +3147,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Za datetime
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Raspored predmeta izbrisan:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Trupci za održavanje statusa isporuke sms
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Postavite ciljanje prodaje
 DocType: Accounts Settings,Make Payment via Journal Entry,Plaćanje putem Temeljnica
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,tiskana na
 DocType: Item,Inspection Required before Delivery,Inspekcija potrebno prije isporuke
@@ -3096,7 +3154,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Aktivnosti na čekanju
 DocType: Patient Appointment,Reminded,podsjetio
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Vaša organizacija
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Vaša organizacija
 DocType: Fee Component,Fees Category,naknade Kategorija
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Unesite olakšavanja datum .
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
@@ -3108,7 +3166,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Poredaj Razina
 DocType: Company,Chart Of Accounts Template,Kontni predložak
 DocType: Attendance,Attendance Date,Gledatelja Datum
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Artikl Cijena ažuriran za {0} u Cjeniku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Artikl Cijena ažuriran za {0} u Cjeniku {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plaća raspada temelju zarađivati i odbitka.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Račun sa podređenim čvorom ne može se pretvoriti u glavnu knjigu
 DocType: Purchase Invoice Item,Accepted Warehouse,Prihvaćeno skladište
@@ -3124,9 +3182,10 @@
 ,Employee Birthday,Rođendan zaposlenika
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Studentski Batch Gledatelja alat
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,Ograničenje Crossed
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Planirano upto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Akademska termina s ovim &#39;akademske godine&#39; {0} i &quot;Pojam Ime &#39;{1} već postoji. Molimo izmijeniti ove stavke i pokušati ponovno.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Kao što postoje neki poslovi protiv točki {0}, ne možete promijeniti vrijednost {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Kao što postoje neki poslovi protiv točki {0}, ne možete promijeniti vrijednost {1}"
 DocType: UOM,Must be Whole Number,Mora biti cijeli broj
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Novi Lišće alociran (u danima)
 DocType: Purchase Invoice,Invoice Copy,Kopija fakture
@@ -3136,7 +3195,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Račun broj
 DocType: Shopping Cart Settings,Orders,Narudžbe
 DocType: Employee Leave Approver,Leave Approver,Osoba ovlaštena za odobrenje odsustva
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Odaberite grupu
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Odaberite grupu
 DocType: Assessment Group,Assessment Group Name,Naziv grupe procjena
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materijal prenose Proizvodnja
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Korisnik koji ima ovlast ""Odobrbravatelja troškova"""
@@ -3151,7 +3210,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Zatvaranje razdoblja Stupanje
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Odaberite odjel ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Troška s postojećim transakcija ne može se prevesti u skupini
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Iznos {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Iznos {0} {1} {2} {3}
 DocType: Account,Depreciation,Amortizacija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dobavljač (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Sudjelovanje zaposlenika alat
@@ -3162,22 +3221,25 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,Prijave plaćanja {0} su UN-linked
 DocType: GL Entry,Voucher No,Bon Ne
 ,Lead Owner Efficiency,Učinkovitost voditelja
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Najpopularniji
 DocType: Leave Allocation,Leave Allocation,Raspodjela odsustva
 DocType: Payment Request,Recipient Message And Payment Details,Primatelj poruke i podatke o plaćanju
 DocType: Training Event,Trainer Email,trener Email
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Zahtjevi za robom {0} kreirani
+DocType: Restaurant Reservation,No of People,Ne od ljudi
 DocType: Production Planning Tool,Include sub-contracted raw materials,Uključi pod-ugovorene sirovine
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Predložak izraza ili ugovora.
 DocType: Purchase Invoice,Address and Contact,Kontakt
 DocType: Cheque Print Template,Is Account Payable,Je li račun naplativo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Stock cannot be updated against Purchase Receipt {0},Stock ne može se ažurirati na potvrdi o kupnji {0}
 DocType: Supplier,Last Day of the Next Month,Posljednji dan sljedećeg mjeseca
-DocType: Support Settings,Auto close Issue after 7 days,Auto blizu Izdavanje nakon 7 dana
+DocType: Support Settings,Auto close Issue after 7 days,Automatski zatvori Pitanje nakon 7 dana
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Ostavite se ne može dodijeliti prije {0}, kao dopust ravnoteža je već ručne proslijeđena u buduće dodjele dopusta rekord {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Napomena: S obzirom / Referentni datum prelazi dopuštene kupca kreditne dana od {0} dana (s)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Napomena: S obzirom / Referentni datum prelazi dopuštene kupca kreditne dana od {0} dana (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Studentski Podnositelj zahtjeva
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,IZVORNI ZA PRIMATELJ
 DocType: Asset Category Account,Accumulated Depreciation Account,Akumulirana amortizacija računa
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Ova je e-pošta autogenerirana
 DocType: Stock Settings,Freeze Stock Entries,Zamrzavanje Stock Unosi
 DocType: Program Enrollment,Boarding Student,Učenica za ukrcaj
 DocType: Asset,Expected Value After Useful Life,Očekivana vrijednost nakon korisnog vijeka trajanja
@@ -3185,7 +3247,7 @@
 DocType: Activity Cost,Billing Rate,Ocijenite naplate
 ,Qty to Deliver,Količina za otpremu
 ,Stock Analytics,Analitika skladišta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Rad se ne može ostati prazno
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Rad se ne može ostati prazno
 DocType: Maintenance Visit Purpose,Against Document Detail No,Protiv dokumenta Detalj No
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Tip stranka je obvezna
 DocType: Quality Inspection,Outgoing,Odlazni
@@ -3207,7 +3269,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Ručno odaberite studente za Grupu temeljenu na aktivnostima
 DocType: Journal Entry,User Remark,Upute Zabilješka
 DocType: Lead,Market Segment,Tržišni segment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Uplaćeni iznos ne može biti veći od ukupnog negativnog preostali iznos {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Uplaćeni iznos ne može biti veći od ukupnog negativnog preostali iznos {0}
 DocType: Supplier Scorecard Period,Variables,Varijable
 DocType: Employee Internal Work History,Employee Internal Work History,Zaposlenikova interna radna povijest
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Zatvaranje (DR)
@@ -3230,27 +3292,28 @@
 DocType: Asset,Double Declining Balance,Dvaput padu Stanje
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +179,Closed order cannot be cancelled. Unclose to cancel.,Zatvorena redoslijed ne može se otkazati. Otvarati otkazati.
 DocType: Patient Relation,Father,Otac
-apps/erpnext/erpnext/controllers/accounts_controller.py +562,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; ne može se provjeriti na prodaju osnovnog sredstva
+apps/erpnext/erpnext/controllers/accounts_controller.py +562,'Update Stock' cannot be checked for fixed asset sale,'Ažuriraj zalihe' ne može se provesti na prodaju osnovnog sredstva
 DocType: Bank Reconciliation,Bank Reconciliation,Banka pomirenje
 DocType: Attendance,On Leave,Na odlasku
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Nabavite ažuriranja
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Račun {2} ne pripada Društvu {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Zahtjev za robom {0} je otkazan ili zaustavljen
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Ostavite upravljanje
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Ostavite upravljanje
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Grupa po računu
 DocType: Sales Order,Fully Delivered,Potpuno Isporučeno
 DocType: Lead,Lower Income,Niža primanja
+DocType: Restaurant Order Entry,Current Order,Trenutačna narudžba
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Izvor i ciljna skladište ne može biti isti za redom {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika računa mora biti tipa imovine / obveza račun, jer to kataloški Pomirenje je otvaranje Stupanje"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Isplaćeni Iznos ne može biti veća od iznos kredita {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Idite na Programs (Programi)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Proizvodnja Narudžba nije stvorio
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Proizvodnja Narudžba nije stvorio
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Od datuma' mora biti poslije 'Do datuma'
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Ne može se promijeniti status studenta {0} je povezan sa studentskom primjene {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Ne može se promijeniti status studenta {0} je povezan sa studentskom primjene {1}
 DocType: Asset,Fully Depreciated,potpuno amortizirana
 ,Stock Projected Qty,Stanje skladišta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Označena Gledatelja HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Citati su prijedlozi, ponude koje ste poslali na svoje klijente"
 DocType: Sales Order,Customer's Purchase Order,Kupca narudžbenice
@@ -3261,8 +3324,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Molimo postavite Broj deprecijaciju Rezervirano
 DocType: Supplier Scorecard Period,Calculations,izračuni
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,"Vrijednost, ili Kol"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Productions narudžbe se ne može podići za:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Productions narudžbe se ne može podići za:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Minuta
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Postavite Serija za imenovanje {0} putem postavke&gt; Postavke&gt; Serija za imenovanje
 DocType: Purchase Invoice,Purchase Taxes and Charges,Nabavni porezi i terećenja
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Idite na Dobavljače
 ,Qty to Receive,Količina za primanje
@@ -3275,7 +3339,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Kredit na računu mora biti bilanca račun
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Sve vrste dobavljača
 DocType: Global Defaults,Disable In Words,Onemogućavanje riječima
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,Kod proizvoda je obvezan jer artikli nisu automatski numerirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,Kod proizvoda je obvezan jer artikli nisu automatski numerirani
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Ponuda {0} nije tip {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Stavka rasporeda održavanja
 DocType: Sales Order,%  Delivered,% Isporučeno
@@ -3297,23 +3361,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Početno stanje kapital
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,izmirenje
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,ostali
 DocType: Appraisal,Appraisal,Procjena
 DocType: Purchase Invoice,GST Details,Detalji GST-a
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},E-pošta dostavljati opskrbljivaču {0}
+DocType: Item,Default Sales Unit of Measure,Zadana prodajna jedinica mjere
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum se ponavlja
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Ovlašteni potpisnik
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Osoba ovlaštena za odobravanje odsustva mora biti jedan od {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Napravite naknade
-DocType: Hub Settings,Seller Email,Prodavač Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Ukupno troškovi nabave (putem kupnje proizvoda)
 DocType: Training Event,Start Time,Vrijeme početka
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Odaberite Količina
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Odaberite Količina
 DocType: Customs Tariff Number,Customs Tariff Number,Broj carinske tarife
 DocType: Patient Appointment,Patient Appointment,Imenovanje pacijenata
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Odobravanje ulogu ne mogu biti isti kao i ulogepravilo odnosi se na
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Odjaviti s ovog Pošalji Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Odjaviti s ovog Pošalji Digest
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Nabavite dobavljače po
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} nije pronađen za stavku {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Idite na Tečajeve
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Poslana poruka
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Račun s djetetom čvorovi se ne može postaviti kao knjiga
@@ -3326,11 +3393,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Materijal Preneseni za Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Račun {0} ne postoji
 DocType: Project,Project Type,Vrsta projekta
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Dijete Zadatak postoji za ovu Zadatak. Ne možete izbrisati ovu Zadatak.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Ili meta Količina ili ciljani iznos je obavezna .
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Troškovi raznih aktivnosti
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Nema više rezultata
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Troškovi raznih aktivnosti
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Postavljanje Događaji na {0}, budući da je zaposlenik u prilogu niže prodaje osoba nema ID korisnika {1}"
 DocType: Timesheet,Billing Details,Detalji o naplati
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Izvorna i odredišna skladište mora biti drugačiji
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Izvorna i odredišna skladište mora biti drugačiji
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Nije dopušteno ažuriranje skladišnih transakcija starijih od {0}
 DocType: Purchase Invoice Item,PR Detail,PR Detalj
 DocType: Sales Order,Fully Billed,Potpuno Naplaćeno
@@ -3356,7 +3425,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Provjeri sve
 DocType: Vehicle Log,Invoice Ref,fakture Ref
-DocType: Purchase Order,Recurring Order,Ponavljajući narudžbe
 DocType: Company,Default Income Account,Zadani račun prihoda
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Grupa kupaca / Kupac
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Nezatvorena Fiskalna godina Dobit / gubitak (Credit)
@@ -3370,9 +3438,9 @@
 DocType: Patient,A Negative,Negativan
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Ništa više za pokazati.
 DocType: Lead,From Customer,Od kupca
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Pozivi
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Pozivi
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Proizvod
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,serije
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,serije
 DocType: Project,Total Costing Amount (via Time Logs),Ukupno Obračun troškova Iznos (preko Vrijeme Trupci)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Napravite raspored naknada
 DocType: Purchase Order Item Supplied,Stock UOM,Kataloški UOM
@@ -3396,7 +3464,7 @@
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Lišće i odmor
 DocType: School Settings,Current Academic Term,Trenutni akademski naziv
 DocType: Sales Order,Not Billed,Nije naplaćeno
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Oba skladišta moraju pripadati istoj tvrtki
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Oba skladišta moraju pripadati istoj tvrtki
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Još uvijek nema dodanih kontakata.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Iznos naloga zavisnog troška
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Mjenice podigao dobavljače.
@@ -3405,7 +3473,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Iznos popusta
 DocType: Purchase Invoice,Return Against Purchase Invoice,Povratak protiv fakturi
 DocType: Item,Warranty Period (in days),Jamstveni period (u danima)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',ažurirati `tabPatient Imenovanje` set sales_invoice = &#39;{0}&#39; gdje name = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Odnos s Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Neto novčani tijek iz operacije
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Stavka 4
@@ -3414,8 +3481,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Temeljnica račun
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Studentski Grupa
 DocType: Shopping Cart Settings,Quotation Series,Ponuda serija
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Stavka postoji s istim imenom ( {0} ) , molimo promijenite ime stavku grupe ili preimenovati stavku"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Molimo izaberite kupca
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Stavka postoji s istim imenom ( {0} ) , molimo promijenite ime stavku grupe ili preimenovati stavku"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Molimo izaberite kupca
 DocType: C-Form,I,ja
 DocType: Company,Asset Depreciation Cost Center,Imovina Centar Amortizacija troškova
 DocType: Sales Order Item,Sales Order Date,Datum narudžbe (kupca)
@@ -3424,6 +3491,7 @@
 DocType: Assessment Plan,Assessment Plan,plan Procjena
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Korisnik {0} je stvoren.
 DocType: Stock Settings,Limit Percent,Ograničenje posto
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Trenutno nema dostupnih dionica u bilo kojem skladištu
 ,Payment Period Based On Invoice Date,Razdoblje za naplatu po Datum fakture
 DocType: Sample Collection,No. of print,Broj ispisa
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Nedostaje Valuta za {0}
@@ -3474,18 +3542,19 @@
 DocType: Lead,Lead Owner,Vlasnik potencijalnog kupca
 DocType: Bin,Requested Quantity,Tražena količina
 DocType: Patient,Marital Status,Bračni status
-DocType: Stock Settings,Auto Material Request,Auto Materijal Zahtjev
+DocType: Stock Settings,Auto Material Request,Automatski zahtjev za materijalom
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Dostupno Batch Količina u iz skladišta
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruto plaća - Ukupni odbitak - otplate kredita
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,Trenutni troškovnik i novi troškovnik ne mogu biti isti
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Plaća proklizavanja ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Plaća proklizavanja ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Datum umirovljenja mora biti veći od datuma pristupa
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,"Bilo je grešaka, dok raspoređivanje tečaj na:"
 DocType: Sales Invoice,Against Income Account,Protiv računu dohotka
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Isporučeno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Stavka {0}: Ž Količina Jedinična {1} ne može biti manja od minimalne narudžbe kom {2} (definiranom u točki).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Stavka {0}: Ž Količina Jedinična {1} ne može biti manja od minimalne narudžbe kom {2} (definiranom u točki).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mjesečni postotak distribucije
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Prijavite se kao drugi korisnik.
 DocType: Territory,Territory Targets,Prodajni plan prema teritoriju
 DocType: Delivery Note,Transporter Info,Transporter Info
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Molimo postavite zadani {0} u Društvu {1}
@@ -3493,13 +3562,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Isti dobavljač je unesen više puta
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Bruto dobit / gubitak
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Stavka narudžbenice broj
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Ime tvrtke ne mogu biti poduzeća
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Ime tvrtke ne mogu biti poduzeća
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Zaglavlja za ispis predložaka.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Naslovi za ispis predložaka, na primjer predračuna."
 DocType: Program Enrollment,Walking,Hodanje
 DocType: Student Guardian,Student Guardian,Studentski Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Troškovi tipa Vrednovanje se ne može označiti kao Inclusive
 DocType: POS Profile,Update Stock,Ažuriraj zalihe
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,u pretplati
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Različite mjerne jedinice proizvoda će dovesti do ukupne pogrešne neto težine. Budite sigurni da je neto težina svakog proizvoda u istoj mjernoj jedinici.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM stopa
 DocType: Asset,Journal Entry for Scrap,Temeljnica za otpad
@@ -3547,15 +3617,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","ID korisnika sustava. Ako je postavljen, postat će zadani za sve HR oblike."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: od {1}
 DocType: Task,depends_on,ovisi o
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,U redu čekanja za ažuriranje najnovije cijene u svim Bill of Materials. Može potrajati nekoliko minuta.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,U redu čekanja za ažuriranje najnovije cijene u svim Bill of Materials. Može potrajati nekoliko minuta.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Naziv novog računa. Napomena: Molimo vas da ne stvaraju račune za kupce i dobavljače
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Država mudar zadana adresa predlošci
 DocType: Sales Order Item,Supplier delivers to Customer,Dobavljač dostavlja Kupcu
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Obrazac / Artikl / {0}) nema na skladištu
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Zbog / Referentni datum ne može biti nakon {0}
+,Sales Payment Summary,Sažetak plaćanja prodaje
+DocType: Restaurant,Restaurant,Restoran
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Zbog / Referentni datum ne može biti nakon {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Uvoz i izvoz podataka
 DocType: Patient,Account Details,Detalji računa
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Nema učenika Pronađeno
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Nema učenika Pronađeno
 DocType: Medical Department,Medical Department,Medicinski odjel
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Kriterij bodovanja ocjenjivača dobavljača
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Račun knjiženja Datum
@@ -3566,7 +3638,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Odaberite datum knjiženja prije odabira stranku
 DocType: Program Enrollment,School House,Škola Kuća
 DocType: Serial No,Out of AMC,Od AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Odaberite Ponude
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Odaberite Ponude
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Broj deprecijaciju rezervirano ne može biti veća od Ukupan broj deprecijaciju
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Provjerite održavanja Posjetite
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,Molimo kontaktirajte korisniku koji imaju Sales Manager Master {0} ulogu
@@ -3574,7 +3646,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Društvo ( ne kupaca i dobavljača ) majstor .
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,To se temelji na prisustvo ovog Student
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Nema studenata u Zagrebu
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Dodaj još stavki ili otvoriti puni oblik
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Dodaj još stavki ili otvoriti puni oblik
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnica {0} mora biti otkazana prije poništenja ove narudžbenice
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Idite na korisnike
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Uplaćeni iznos + otpis iznos ne može biti veći od SVEUKUPNO
@@ -3594,37 +3666,40 @@
 DocType: Fee Schedule,Fee Schedule,Naknada Raspored
 DocType: Hub Settings,Publish Availability,Objavi dostupnost
 DocType: Company,Create Chart Of Accounts Based On,Izrada kontnog plana na temelju
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Nije ga moguće pretvoriti u ne-grupu. Dječji zadaci postoje.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Datum rođenja ne može biti veća nego danas.
 ,Stock Ageing,Starost skladišta
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Student {0} postoje protiv studenta podnositelja prijave {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Prilagođavanje zaokruživanja (valuta tvrtke)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,kontrolna kartica
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,kontrolna kartica
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' je onemogućen
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Postavi kao Opena
 DocType: Cheque Print Template,Scanned Cheque,Scanned Ček
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Pošaljite e-poštu automatski u imenik na podnošenje transakcija.
 DocType: Timesheet,Total Billable Amount,Ukupan iznos za naplatu
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Stavka 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Unos narudžbe
 DocType: Purchase Order,Customer Contact Email,Kupac Kontakt e
 DocType: Warranty Claim,Item and Warranty Details,Stavka i jamstvo Detalji
 DocType: Sales Team,Contribution (%),Doprinos (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Napomena : Stupanje Plaćanje neće biti izrađen od ' Gotovina ili bankovni račun ' nije naveden
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Projekt {0} već postoji
 DocType: Medical Department,Nursing User,Korisnik za njegu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Odgovornosti
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Rok valjanosti ove ponude je završen.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Rok valjanosti ove ponude je završen.
 DocType: Expense Claim Account,Expense Claim Account,Rashodi Zatraži račun
 DocType: Accounts Settings,Allow Stale Exchange Rates,Dopusti stale tečaj
 DocType: Sales Person,Sales Person Name,Ime prodajne osobe
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Unesite atleast jedan račun u tablici
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Dodaj korisnicima
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Dodaj korisnicima
 DocType: POS Item Group,Item Group,Grupa proizvoda
 DocType: Item,Safety Stock,Sigurnost Stock
 DocType: Healthcare Settings,Healthcare Settings,Postavke zdravstvene zaštite
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Napredak% za zadatak ne može biti više od 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Napredak% za zadatak ne može biti više od 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Prije pomirenja
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Za {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Porezi i naknade uvrštenja (Društvo valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Stavka Porezna Row {0} mora imati račun tipa poreza ili prihoda i rashoda ili naplativ
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Stavka Porezna Row {0} mora imati račun tipa poreza ili prihoda i rashoda ili naplativ
 DocType: Sales Order,Partly Billed,Djelomično naplaćeno
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Stavka {0} mora biti Fixed Asset predmeta
 DocType: Item,Default BOM,Zadani BOM
@@ -3640,6 +3715,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,varijabla
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Od otpremnici
 DocType: Student,Student Email Address,Studentski e-mail adresa
+DocType: Item,Hub Warehouse,Skladište hubova
 DocType: Physician Schedule Time Slot,From Time,S vremena
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Na lageru:
 DocType: Notification Control,Custom Message,Prilagođena poruka
@@ -3647,9 +3723,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,Novac ili bankovni račun je obvezna za izradu ulazak plaćanje
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Studentska adresa
 DocType: Purchase Invoice,Price List Exchange Rate,Tečaj cjenika
+DocType: POS Profile,POS Profile Name,Naziv POS profila
 DocType: Purchase Invoice Item,Rate,VPC
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,stažista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,adresa Ime
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,adresa Ime
 DocType: Stock Entry,From BOM,Od sastavnice
 DocType: Assessment Code,Assessment Code,kod procjena
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Osnovni
@@ -3663,11 +3740,12 @@
 DocType: Salary Slip,Salary Structure,Plaća Struktura
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aviokompanija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Izdavanje materijala
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Materijal Izazova
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Došlo je do pogreške prilikom izrade ponavljajućih
 DocType: Material Request Item,For Warehouse,Za galeriju
 DocType: Employee,Offer Date,Datum ponude
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citati
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Vi ste u izvanmrežnom načinu rada. Nećete biti u mogućnosti da ponovno učitati dok imate mrežu.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Vi ste u izvanmrežnom načinu rada. Nećete biti u mogućnosti da ponovno učitati dok imate mrežu.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Nema studentskih grupa stvorena.
 DocType: Purchase Invoice Item,Serial No,Serijski br
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Mjesečni iznos otplate ne može biti veća od iznosa kredita
@@ -3677,17 +3755,18 @@
 DocType: Salary Slip,Total Working Hours,Ukupno Radno vrijeme
 DocType: Subscription,Next Schedule Date,Sljedeći raspored datuma
 DocType: Stock Entry,Including items for sub assemblies,Uključujući predmeta za sub sklopova
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Unesite vrijednost moraju biti pozitivne
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Sve teritorije
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Unesite vrijednost moraju biti pozitivne
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Sve teritorije
 DocType: Purchase Invoice,Items,Proizvodi
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student je već upisan.
 DocType: Fiscal Year,Year Name,Naziv godine
 DocType: Process Payroll,Process Payroll,Proces plaće
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Postoji više odmor nego radnih dana ovog mjeseca .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Postoji više odmor nego radnih dana ovog mjeseca .
 DocType: Product Bundle Item,Product Bundle Item,Proizvod bala predmeta
 DocType: Sales Partner,Sales Partner Name,Naziv prodajnog partnera
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Zahtjev za dostavljanje ponuda
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Zahtjev za dostavljanje ponuda
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimalna Iznos dostavnice
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hematologija
 DocType: Normal Test Items,Normal Test Items,Normalno ispitne stavke
 DocType: Student Language,Student Language,Student jezika
 apps/erpnext/erpnext/config/selling.py +23,Customers,Kupci
@@ -3698,10 +3777,11 @@
 DocType: Issue,Opening Time,Radno vrijeme
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Od i Do datuma zahtijevanih
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vrijednosni papiri i robne razmjene
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Zadana mjerna jedinica za Variant &#39;{0}&#39; mora biti isti kao u predložak &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Zadana mjerna jedinica za Variant &#39;{0}&#39; mora biti isti kao u predložak &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Izračun temeljen na
 DocType: Delivery Note Item,From Warehouse,Iz skladišta
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Nema Stavke sa Bill materijala za proizvodnju
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Nema Stavke sa Bill materijala za proizvodnju
+DocType: Restaurant,Default Customer,Zadani kupac
 DocType: Assessment Plan,Supervisor Name,Naziv Supervisor
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Nemojte potvrditi je li sastanak izrađen za isti dan
 DocType: Program Enrollment Course,Program Enrollment Course,Tečaj za upis na program
@@ -3728,7 +3808,7 @@
 DocType: Payment Entry,Internal Transfer,Interni premještaj
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Dijete računa postoji za taj račun . Ne možete izbrisati ovaj račun .
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Ili meta Količina ili ciljani iznos je obvezna
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Zadani BOM ne postoji za proizvod {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Zadani BOM ne postoji za proizvod {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Molimo odaberite datum knjiženja prvo
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Otvaranje Datum bi trebao biti prije datuma zatvaranja
 DocType: Leave Control Panel,Carry Forward,Prenijeti
@@ -3763,6 +3843,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Ukupno Present
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,Računovodstveni izvještaji
 DocType: Drug Prescription,Hour,Sat
+DocType: Restaurant Order Entry,Last Sales Invoice,Posljednja prodajna faktura
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Novi serijski broj ne može biti na skladištu. Skladište mora biti postavljen od strane međuskladišnice ili primke
 DocType: Lead,Lead Type,Tip potencijalnog kupca
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Niste ovlašteni za odobravanje lišće o skupnom Datumi
@@ -3797,64 +3878,66 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Stvaranje korisnika
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,Gram
 DocType: Supplier Scorecard,Per Month,Na mjesec
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Pogledajte izvješće razgovora vezanih uz održavanje.
 DocType: Stock Entry,Update Rate and Availability,Brzina ažuriranja i dostupnost
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Postotak koju smiju primiti ili isporučiti više od naručene količine. Na primjer: Ako ste naručili 100 jedinica. i tvoj ispravak je 10% onda se smiju primati 110 jedinica.
 DocType: POS Customer Group,Customer Group,Grupa kupaca
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Novo ID serije (izborno)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Novo ID serije (izborno)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Rashodi račun je obvezna za predmet {0}
 DocType: BOM,Website Description,Opis web stranice
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Neto promjena u kapitalu
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Najnoviji
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Otkažite fakturi {0} prvi
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail adresa mora biti jedinstvena, već postoji za {0}"
 DocType: Serial No,AMC Expiry Date,AMC Datum isteka
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,Priznanica
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,Priznanica
 ,Sales Register,Prodaja Registracija
 DocType: Daily Work Summary Settings Company,Send Emails At,Slanje e-pošte na
 DocType: Quotation,Quotation Lost Reason,Razlog nerealizirane ponude
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Odaberite svoju domenu
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',odaberite * s karticePatient gdje name = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Transakcija referenca ne {0} datumom {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Transakcija referenca ne {0} datumom {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ne postoji ništa za uređivanje .
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Prikaz obrasca
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Sažetak za ovaj mjesec i tijeku aktivnosti
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Prikaz obrasca
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Sažetak za ovaj mjesec i tijeku aktivnosti
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Dodajte korisnike u svoju organizaciju, osim sebe."
 DocType: Customer Group,Customer Group Name,Naziv grupe kupaca
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Još nema kupaca!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Još nema kupaca!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Izvještaj o novčanom tijeku
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Iznos kredita ne može biti veći od maksimalnog iznosa zajma {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,licenca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Molimo uklonite ovu fakturu {0} od C-obrasca {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Molimo uklonite ovu fakturu {0} od C-obrasca {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Molimo odaberite prenositi ako želite uključiti prethodnoj fiskalnoj godini je ravnoteža ostavlja na ovoj fiskalnoj godini
 DocType: GL Entry,Against Voucher Type,Protiv voucher vrsti
 DocType: Physician,Phone (R),Telefon (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Dodano je vrijeme
 DocType: Item,Attributes,Značajke
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Omogući predložak
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Postavite Serija za imenovanje {0} putem postavke&gt; Postavke&gt; Serija za imenovanje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Unesite otpis račun
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Zadnje narudžbe Datum
 DocType: Patient,B Negative,Negativan
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Račun {0} ne pripada društvu {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Serijski brojevi u retku {0} ne podudaraju se s dostavom
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Serijski brojevi u retku {0} ne podudaraju se s dostavom
 DocType: Student,Guardian Details,Guardian Detalji
 DocType: C-Form,C-Form,C-obrazac
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Gledatelja za više radnika
 DocType: Vehicle,Chassis No,šasija Ne
 DocType: Payment Request,Initiated,Pokrenut
 DocType: Production Order,Planned Start Date,Planirani datum početka
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Odaberite BOM
 DocType: Serial No,Creation Document Type,Tip stvaranje dokumenata
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Datum završetka mora biti veći od datuma početka
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Datum završetka mora biti veći od datuma početka
 DocType: Leave Type,Is Encash,Je li unovčiti
 DocType: Leave Allocation,New Leaves Allocated,Novi Leaves Dodijeljeni
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projekt - mudar podaci nisu dostupni za ponudu
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Završi
 DocType: Project,Expected End Date,Očekivani Datum završetka
 DocType: Budget Account,Budget Amount,Iznos proračuna
 DocType: Appraisal Template,Appraisal Template Title,Procjena Predložak Naslov
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Od datuma {0} za Radnik {1} ne može biti prije zaposlenika pridružio Datum {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,trgovački
 DocType: Patient,Alcohol Current Use,Tekuća upotreba alkohola
+DocType: Student Admission Program,Student Admission Program,Program upisa studenata
 DocType: Payment Entry,Account Paid To,Račun plaćeni za
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Roditelj Stavka {0} ne smije biti kataloški predmeta
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Svi proizvodi i usluge.
@@ -3863,30 +3946,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Proračun za račun {1} od {2} {3} je {4}. To će biti veći od {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Red {0} # računa mora biti tipa &#39;Dugotrajne imovine&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Od kol
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Pravila za izračun shipping iznos za prodaju
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,i unchcked Onemogućeno u
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Serija je obvezno
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financijske usluge
 DocType: Student Sibling,Student ID,studentska iskaznica
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Vrste aktivnosti za vrijeme Evidencije
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,E-pošta dobavljača
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Vrste aktivnosti za vrijeme Evidencije
 DocType: Tax Rule,Sales,Prodaja
 DocType: Stock Entry Detail,Basic Amount,Osnovni iznos
 DocType: Training Event,Exam,Ispit
 DocType: Complaint,Complaint,prigovor
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
 DocType: Leave Allocation,Unused leaves,Neiskorišteni lišće
 DocType: Patient,Alcohol Past Use,Prethodna upotreba alkohola
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Državna naplate
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Prijenos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Prijenos
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
 DocType: Authorization Rule,Applicable To (Employee),Odnosi se na (Radnik)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Datum dospijeća je obavezno
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Datum dospijeća je obavezno
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Pomak za Osobina {0} ne može biti 0
 DocType: Journal Entry,Pay To / Recd From,Platiti do / primiti od
 DocType: Naming Series,Setup Series,Postavljanje Serija
 DocType: Payment Reconciliation,To Invoice Date,Za Račun Datum
 DocType: Supplier,Contact HTML,Kontakt HTML
 ,Inactive Customers,Neaktivni korisnici
+DocType: Student Admission Program,Maximum Age,Maksimalna dob
 DocType: Landed Cost Voucher,LCV,lakih gospodarskih
 DocType: Landed Cost Voucher,Purchase Receipts,Primke
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Kako se primjenjuje pravilo cijena?
@@ -3905,6 +3990,7 @@
 DocType: GL Entry,Remarks,Primjedbe
 DocType: Payment Entry,Account Paid From,Račun se plaća iz
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Sirovine Stavka Šifra
+DocType: Task,Parent Task,Roditeljska zadaća
 DocType: Journal Entry,Write Off Based On,Otpis na temelju
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Napravite Olovo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Ispis i konfekcija
@@ -3913,19 +3999,19 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Plaća se već obrađuju za razdoblje od {0} i {1}, dopusta zahtjev ne može biti između ovom razdoblju."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Instalacijski zapis za serijski broj
 DocType: Guardian Interest,Guardian Interest,Guardian kamata
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Postavljanje zadanih vrijednosti za POS fakture
 apps/erpnext/erpnext/config/hr.py +177,Training,Trening
 DocType: Timesheet,Employee Detail,Detalj zaposlenika
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ID e-pošte
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,Sljedeći datum dan i ponavljanja na dan u mjesecu mora biti jednaka
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Sljedeći datum dan i ponavljanja na dan u mjesecu mora biti jednaka
 DocType: Lab Prescription,Test Code,Ispitni kod
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Postavke za web stranice početnu stranicu
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},Zahtjevi za odobrenje nisu dopušteni za {0} zbog položaja {1}
 DocType: Offer Letter,Awaiting Response,Očekujem odgovor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Iznad
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Ukupni iznos {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Neispravan atribut {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Ukupni iznos {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Neispravan atribut {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Navedite ako je nestandardni račun koji se plaća
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Isti artikl je unesen više puta. {popis}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Odaberite grupu za procjenu osim &quot;Sve grupe za procjenu&quot;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Redak {0}: centar za trošak je potreban za stavku {1}
 DocType: Training Event Employee,Optional,neobavezan
@@ -3948,19 +4034,20 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Mjesto troška je ovezno za stavku {2}
 DocType: Vehicle,Policy No,politika Nema
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Se predmeti s Bundle proizvoda
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Budući da zaliha postoji protiv stavke {0}, ne možete omogućiti varijante imovine"
 DocType: Asset,Straight Line,Ravna crta
 DocType: Project User,Project User,Korisnik projekta
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Split
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Split
 DocType: GL Entry,Is Advance,Je Predujam
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Gledanost od datuma do datuma je obvezna
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,Unesite ' Je podugovoren ' kao da ili ne
+DocType: Item,Default Purchase Unit of Measure,Zadana jedinicna mjera kupnje
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Posljednji datum komunikacije
 DocType: Sales Team,Contact No.,Kontakt broj
 DocType: Bank Reconciliation,Payment Entries,Prijave plaćanja
 DocType: Production Order,Scrap Warehouse,otpaci Skladište
 DocType: Production Order,Check if material transfer entry is not required,Provjerite nije li unos prijenosa materijala potreban
 DocType: Program Enrollment Tool,Get Students From,Dobiti studenti iz
-DocType: Hub Settings,Seller Country,Prodavač Država
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Objavi stavke na web stranici
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Grupa vaši učenici u serijama
 DocType: Authorization Rule,Authorization Rule,Pravilo autorizacije
@@ -3970,7 +4057,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Prodaja Porezi i pristojbe Predložak
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Ukupno (Credit)
 DocType: Repayment Schedule,Payment Date,Datum plačanja
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nova količina serije
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Nova količina serije
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Odjeća i modni dodaci
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,Nije moguće riješiti funkciju ponderirane ocjene. Provjerite je li formula valjana.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Broj narudžbe
@@ -3988,6 +4075,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Red # {0}: Imovina {1} ne može se podnijeti, to je već {2}"
 DocType: Tax Rule,Billing Country,Naplata Država
 DocType: Purchase Order Item,Expected Delivery Date,Očekivani rok isporuke
+DocType: Restaurant Order Entry,Restaurant Order Entry,Unos narudžbe restorana
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debitne i kreditne nije jednaka za {0} # {1}. Razlika je {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Zabava Troškovi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Provjerite materijala zahtjev
@@ -4000,9 +4088,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Račun s postojećom transakcijom ne može se izbrisati
 DocType: Vehicle,Last Carbon Check,Posljednja Carbon Check
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Pravni troškovi
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Molimo odaberite količinu na red
-DocType: Purchase Invoice,Posting Time,Objavljivanje Vrijeme
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Molimo odaberite količinu na red
+DocType: Purchase Invoice,Posting Time,Vrijeme knjiženja
 DocType: Timesheet,% Amount Billed,% Naplaćeni iznos
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Vrijeme po imenovanju&quot; nije postavljeno za dr. {0}. Dodajte ga u liječniku.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefonski troškovi
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Označite ovo ako želite prisiliti korisniku odabir seriju prije spremanja. Tu će biti zadana ako to provjerili.
@@ -4013,6 +4102,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Novi prihod kupca
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,putni troškovi
 DocType: Maintenance Visit,Breakdown,Slom
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Dodajte pretplatu prilagođenog polja u doktorskom tipu {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Račun: {0} s valutom: {1} ne može se odabrati
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Ažuriranje BOM-a automatski se naplaćuje putem Planera, temeljeno na najnovijoj stopi vrednovanja / stopi cjenika / zadnje stope kupnje sirovina."
 DocType: Bank Reconciliation Detail,Cheque Date,Ček Datum
@@ -4037,7 +4127,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Ukupno naplate Iznos (preko Vrijeme Trupci)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Id Dobavljač
 DocType: Payment Request,Payment Gateway Details,Payment Gateway Detalji
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Količina bi trebala biti veća od 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Količina bi trebala biti veća od 0
 DocType: Journal Entry,Cash Entry,Novac Stupanje
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Dijete čvorovi mogu biti samo stvorio pod tipa čvorišta &#39;Grupa&#39;
 DocType: Leave Application,Half Day Date,Poludnevni Datum
@@ -4055,12 +4145,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Napomena : Proizvod {0} je upisan više puta
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Svi kontakti.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Kratica Društvo
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Korisnik {0} ne postoji
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Korisnik {0} ne postoji
 DocType: Subscription,SUB-,POD-
 DocType: Item Attribute Value,Abbreviation,Skraćenica
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Ulaz za plaćanje već postoji
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Niste ovlašteni od {0} prijeđenog limita
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Plaća predložak majstor .
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Patologija
+DocType: Restaurant Order Entry,Restaurant Table,Tablica restorana
 DocType: Leave Type,Max Days Leave Allowed,Max Dani Ostavite dopuštenih
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Postavite Porezni Pravilo za košaricu
 DocType: Purchase Invoice,Taxes and Charges Added,Porezi i naknade Dodano
@@ -4072,10 +4164,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Ponude za kupce ili potencijalne kupce.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Uloga dopuštenih urediti smrznute zalihe
 ,Territory Target Variance Item Group-Wise,Pregled prometa po teritoriji i grupi proizvoda
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Sve grupe kupaca
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Sve grupe kupaca
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,ukupna mjesečna
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda Mjenjačnica zapis nije stvoren za {1} na {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Porez Predložak je obavezno.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Porez Predložak je obavezno.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Račun {0}: nadređeni račun {1} ne postoji
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Stopa cjenika (valuta tvrtke)
 DocType: Products Settings,Products Settings,proizvodi Postavke
@@ -4101,12 +4193,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Stavka Wise Porezna Detalj
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Institut naziv
 ,Item-wise Price List Rate,Item-wise cjenik
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Dobavljač Ponuda
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Dobavljač Ponuda
 DocType: Quotation,In Words will be visible once you save the Quotation.,U riječi će biti vidljiv nakon što spremite ponudu.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Količina ({0}) ne može biti frakcija u retku {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Barkod {0} se već koristi u proizvodu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Barkod {0} se već koristi u proizvodu {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Pravila za dodavanje troškova prijevoza.
 DocType: Item,Opening Stock,Otvaranje Stock
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kupac je dužan
@@ -4125,9 +4217,8 @@
 DocType: Customer,From Lead,Od Olovo
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Narudžbe objavljen za proizvodnju.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Odaberite fiskalnu godinu ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS Profil potrebna da bi POS unos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS Profil potrebna da bi POS unos
 DocType: Program Enrollment Tool,Enroll Students,upisati studenti
-DocType: Hub Settings,Name Token,Naziv tokena
 DocType: Lab Test,Approved Date,Odobreni datum
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardna prodaja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Atleast jednom skladištu je obavezno
@@ -4145,7 +4236,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Ljudski Resursi
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pomirenje Plaćanje Plaćanje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,porezna imovina
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Proizvodni nalog je bio {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Proizvodni nalog je bio {0}
 DocType: BOM Item,BOM No,BOM br.
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Temeljnica {0} nema račun {1} ili već usklađeni protiv drugog bona
@@ -4165,7 +4256,7 @@
 DocType: Currency Exchange,To Currency,Valutno
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Dopusti sljedeći korisnici odobriti ostavite aplikacije za blok dana.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Vrste Rashodi zahtjevu.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Stopa prodaje za stavku {0} niža je od njegove {1}. Stopa prodaje trebao bi biti najmanje {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Stopa prodaje za stavku {0} niža je od njegove {1}. Stopa prodaje trebao bi biti najmanje {2}
 DocType: Item,Taxes,Porezi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Plaćeni i nije isporučena
 DocType: Project,Default Cost Center,Zadana troškovnih centara
@@ -4179,15 +4270,15 @@
 DocType: Employee Loan,Fully Disbursed,potpuno Isplaćeno
 DocType: Maintenance Visit,Customer Feedback,Kupac Ocjena
 DocType: Account,Expense,rashod
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Rezultat ne može biti veća od najvišu ocjenu
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Rezultat ne može biti veća od najvišu ocjenu
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Kupci i dobavljači
 DocType: Item Attribute,From Range,Iz raspona
 DocType: BOM,Set rate of sub-assembly item based on BOM,Postavite stavku podsklopa na temelju BOM-a
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},sintaktička pogreška u formuli ili stanja: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},sintaktička pogreška u formuli ili stanja: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Svakodnevnom radu poduzeća Sažetak Postavke
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,Proizvod {0} se ignorira budući da nije skladišni artikal
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Pošaljite ovaj radnog naloga za daljnju obradu .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Pošaljite ovaj radnog naloga za daljnju obradu .
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Da se ne primjenjuje pravilo Cijene u određenoj transakciji, svim primjenjivim pravilima cijena bi trebala biti onemogućen."
 DocType: Assessment Group,Parent Assessment Group,Roditelj Grupa procjena
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Posao
@@ -4204,12 +4295,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Postavite prazan filtar Tvrtke ako je Skupna pošta &quot;Tvrtka&quot;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Knjiženja Datum ne može biti datum u budućnosti
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Red # {0}: Serijski br {1} ne odgovara {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,za stvaranje ponavljajućih
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Casual dopust
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Lab test UOM.
 DocType: Batch,Batch ID,ID serije
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Napomena: {0}
 ,Delivery Note Trends,Trend otpremnica
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Ovaj tjedan Sažetak
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Ovaj tjedan Sažetak
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Na skladištu Kol
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Račun: {0} može se ažurirati samo preko Stock promet
 DocType: Student Group Creation Tool,Get Courses,dobiti Tečajevi
@@ -4223,7 +4315,6 @@
 DocType: Purchase Order,To Bill,Za Billa
 DocType: Material Request,% Ordered,% Naručeno
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Za Studentsku grupu na tečaju, tečaj će biti validiran za svakog studenta iz upisanih kolegija u upisu na program."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Unesite E-mail adresa odvojenih zarezima, račun će biti automatski poslan na određeni datum"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Rad po komadu
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Prosječna nabavna cijena
 DocType: Task,Actual Time (in Hours),Stvarno vrijeme (u satima)
@@ -4237,7 +4328,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Stavka {0} nije setup za serijski brojevi Stupac mora biti prazan
 DocType: Accounts Settings,Accounts Settings,Postavke računa
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,Odobriti
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Nema rezultata za slanje
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Nema rezultata za slanje
 DocType: Customer,Sales Partner and Commission,Prodaja partner i komisija
 DocType: Employee Loan,Rate of Interest (%) / Year,Kamatna stopa (%) / godina
 ,Project Quantity,Projekt Količina
@@ -4249,55 +4340,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Crna
 DocType: BOM Explosion Item,BOM Explosion Item,BOM eksplozije artikla
 DocType: Account,Auditor,Revizor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} predmeti koji
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} predmeti koji
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Uči više
 DocType: Cheque Print Template,Distance from top edge,Udaljenost od gornjeg ruba
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Cjenik {0} je onemogućen ili ne postoji
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Cjenik {0} je onemogućen ili ne postoji
 DocType: Purchase Invoice,Return,Povratak
 DocType: Production Order Operation,Production Order Operation,Proizvodni nalog Rad
 DocType: Pricing Rule,Disable,Ugasiti
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Način plaćanja potrebno je izvršiti uplatu
 DocType: Project Task,Pending Review,U tijeku pregled
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Imenovanja i konzultacije
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nije upisana u skupinu {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nije upisana u skupinu {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Imovina {0} ne može biti otpisan, kao što je već {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Ukupni rashodi Zatraži (preko Rashodi Zahtjeva)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Odsutni
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Red {0}: Valuta sastavnice # {1} bi trebao biti jednak odabranoj valuti {2}
 DocType: Journal Entry Account,Exchange Rate,Tečaj
 DocType: Patient,Additional information regarding the patient,Dodatne informacije o pacijentu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
 DocType: Homepage,Tag Line,Tag linija
 DocType: Fee Component,Fee Component,Naknada Komponenta
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Mornarički menađer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Dodavanje stavki iz
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Mornarički menađer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Dodavanje stavki iz
 DocType: Cheque Print Template,Regular,redovan
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Ukupno weightage svih kriterija za ocjenjivanje mora biti 100%
-DocType: BOM,Last Purchase Rate,Zadnja kupovna cijena
-DocType: Account,Asset,Asset
+DocType: Purchase Order Item,Last Purchase Rate,Zadnja kupovna cijena
+DocType: Account,Asset,Imovina (Aktiva)
 DocType: Project Task,Task ID,Zadatak ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock ne može postojati točkom {0} jer ima varijante
 DocType: Lab Test,Mobile,Mobilni
 ,Sales Person-wise Transaction Summary,Pregled prometa po prodavaču
 DocType: Training Event,Contact Number,Kontakt broj
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Skladište {0} ne postoji
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrirajte se za ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Skladište {0} ne postoji
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mjesečni postotci distribucije
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Izabrani predmet ne može imati Hrpa
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Stopa Vrednovanje nije pronađen u točki {0}, koji je potreban za napraviti računovodstvene stavke za {1} {2}. Ako je stavka prijenosom kao stavka uzorka u {1}, molimo napomenuti da u {1} tačka stola. Inače, stvoriti dolazni transakciju dionica za brzinu vrednovanja stavki ili spomenuti u stavku zapis, a zatim pokušajte priloženog / otkazivanja ovaj unos"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% robe od ove otpremnice je isporučeno
+DocType: Training Event,Has Certificate,Ima certifikat
 DocType: Project,Customer Details,Korisnički podaci
 DocType: Employee,Reports to,Izvješća
 ,Unpaid Expense Claim,Neplaćeni Rashodi Zatraži
 DocType: Payment Entry,Paid Amount,Plaćeni iznos
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Istražite prodajni ciklus
 DocType: Assessment Plan,Supervisor,Nadzornik
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,Na liniji
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,Na liniji
 ,Available Stock for Packing Items,Raspoloživo stanje za pakirane proizvode
 DocType: Item Variant,Item Variant,Stavka Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Procjena Alat Rezultat
 DocType: BOM Scrap Item,BOM Scrap Item,BOM otpaci predmeta
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Dostavljeni nalozi se ne može izbrisati
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Dostavljeni nalozi se ne može izbrisati
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje računa već u zaduženje, ne smiju postaviti 'ravnoteža se mora' kao 'kreditne'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Upravljanje kvalitetom
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Stavka {0} je onemogućen
@@ -4317,7 +4407,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Red # {0}: vremenu sukobi s redom {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Dopusti stopu nulte procjene
 DocType: Training Event Employee,Invited,pozvan
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Više aktivnih struktura prihoda nađeni za zaposlenika {0} za navedene datume
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Više aktivnih struktura prihoda nađeni za zaposlenika {0} za navedene datume
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Postava Gateway račune.
 DocType: Employee,Employment Type,Zapošljavanje Tip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Dugotrajne imovine
@@ -4329,7 +4419,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Student ID e-pošte
 DocType: Employee,Notice (days),Obavijest (dani)
 DocType: Tax Rule,Sales Tax Template,Porez Predložak
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Odaberite stavke za spremanje račun
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Odaberite stavke za spremanje račun
 DocType: Employee,Encashment Date,Encashment Datum
 DocType: Training Event,Internet,Internet
 DocType: Special Test Template,Special Test Template,Posebni predložak testa
@@ -4338,7 +4428,7 @@
 DocType: Production Order,Planned Operating Cost,Planirani operativni trošak
 DocType: Academic Term,Term Start Date,Pojam Datum početka
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Count Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},U prilogu {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},U prilogu {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Banka Izjava stanje po glavnom knjigom
 DocType: Job Applicant,Applicant Name,Podnositelj zahtjeva Ime
 DocType: Authorization Rule,Customer / Item Name,Kupac / Stavka Ime
@@ -4358,7 +4448,7 @@
 DocType: Guardian,Guardian Of ,staratelj
 DocType: Grading Scale Interval,Threshold,Prag
 DocType: BOM Update Tool,Current BOM,Trenutni BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Dodaj serijski broj
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Dodaj serijski broj
 DocType: Production Order Item,Available Qty at Source Warehouse,Dostupni broj u Izvornoj skladištu
 apps/erpnext/erpnext/config/support.py +22,Warranty,garancija
 DocType: Purchase Invoice,Debit Note Issued,Terećenju Izdano
@@ -4381,10 +4471,9 @@
 DocType: Account,Receivable,potraživanja
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Red # {0}: Nije dopušteno mijenjati dobavljača kao narudžbenice već postoji
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Uloga koja je dopušteno podnijeti transakcije koje premašuju kreditnih ograničenja postavljena.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Odaberite stavke za proizvodnju
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Master Data sinkronizacije, to bi moglo potrajati neko vrijeme"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Odaberite stavke za proizvodnju
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Master Data sinkronizacije, to bi moglo potrajati neko vrijeme"
 DocType: Item,Material Issue,Materijal Issue
-DocType: Hub Settings,Seller Description,Prodavač Opis
 DocType: Employee Education,Qualification,Kvalifikacija
 DocType: Item Price,Item Price,Cijena proizvoda
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sapun i deterdžent
@@ -4392,7 +4481,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,S vremena ne može biti veća od na vrijeme.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Pokretna slika & video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Naručeno
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,rezime
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,rezime
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Ako je omogućeno, sustav neće ažurirati polja varijanti iz predloška, već će kopirati podatke ispod navedenih polja tijekom izrade nove inačice"
 DocType: Salary Detail,Component,sastavni dio
 DocType: Assessment Criteria,Assessment Criteria Group,Kriteriji za ocjenu Grupa
 DocType: Healthcare Settings,Patient Name By,Ime pacijenta po
@@ -4402,7 +4492,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Unesite Odobravanje ulogu ili Odobravanje korisnike
 DocType: Journal Entry,Write Off Entry,Otpis unos
 DocType: BOM,Rate Of Materials Based On,Stopa materijali na temelju
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dobavljač&gt; Vrsta dobavljača
+DocType: Item Variant Settings,Do not Update Variants,Nemoj ažurirati inačice
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analitike podrške
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Poništite sve
 DocType: POS Profile,Terms and Conditions,Odredbe i uvjeti
@@ -4411,7 +4501,7 @@
 DocType: Leave Block List,Applies to Company,Odnosi se na Društvo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,"Ne može se otkazati, jer skladišni ulaz {0} postoji"
 DocType: Employee Loan,Disbursement Date,datum isplate
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,Primatelji nisu navedeni
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,Primatelji nisu navedeni
 DocType: BOM Update Tool,Update latest price in all BOMs,Ažuriranje najnovije cijene u svim BOM-ovima
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Medicinski zapis
 DocType: Vehicle,Vehicle,Vozilo
@@ -4426,14 +4516,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Imovine deprecijacije i sredstva
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Iznos {0} {1} prenesen iz {2} u {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Iznos {0} {1} prenesen iz {2} u {3}
 DocType: Sales Invoice,Get Advances Received,Kreiraj avansno primanje
 DocType: Email Digest,Add/Remove Recipients,Dodaj / ukloni primatelja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Transakcija nije dopuštena protiv zaustavljena proizvodnja Reda {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Za postavljanje ove fiskalne godine kao zadano , kliknite na "" Set as Default '"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Pridružiti
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Pridružiti
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Nedostatak Kom
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Inačica Stavka {0} postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Inačica Stavka {0} postoji s istim atributima
 DocType: Employee Loan,Repay from Salary,Vrati iz plaće
 DocType: Leave Application,LAP/,KRUG/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Zahtjev za isplatu od {0} {1} za iznos {2}
@@ -4446,7 +4536,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Naručeni proizvod - prodaja
 DocType: Salary Slip,Payment Days,Plaćanja Dana
 DocType: Patient,Dormant,latentan
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Skladišta s djetetom čvorovi se ne može pretvoriti u glavnoj knjizi
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Skladišta s djetetom čvorovi se ne može pretvoriti u glavnoj knjizi
 DocType: BOM,Manage cost of operations,Uredi troškove poslovanja
 DocType: Accounts Settings,Stale Days,Dani tišine
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Kada bilo koji od provjerenih transakcija &quot;Postavio&quot;, e-mail pop-up automatski otvorio poslati e-mail na povezane &quot;Kontakt&quot; u toj transakciji, s transakcijom u privitku. Korisnik može ili ne može poslati e-mail."
@@ -4460,10 +4550,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serijski Ne {0} već je primila
 ,Requested Items To Be Transferred,Traženi proizvodi spremni za transfer
 DocType: Expense Claim,Vehicle Log,vozila Prijava
-DocType: Purchase Invoice,Recurring Id,Ponavljajući Id
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),Prisutnost povišene temperature (temperatura&gt; 38.5 ° C / 101.3 ° F ili trajanje temperature&gt; 38 ° C / 100.4 ° F)
 DocType: Customer,Sales Team Details,Detalji prodnog tima
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Brisanje trajno?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Brisanje trajno?
 DocType: Expense Claim,Total Claimed Amount,Ukupno Zatražio Iznos
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potencijalne prilike za prodaju.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Pogrešna {0}
@@ -4473,7 +4562,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Robne kuće
 ,Item Delivery Date,Datum isporuke stavke
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Postavite svoj škola u ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Postavite svoj škola u ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Baza Promjena Iznos (Društvo valuta)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Nema računovodstvenih unosa za ova skladišta
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Spremite dokument prvi.
@@ -4485,13 +4574,12 @@
 DocType: Task,Is Milestone,Je li Milestone
 DocType: Daily Work Summary,Email Sent To,Mail poslan
 DocType: Budget,Warn,Upozoriti
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Jeste li sigurni da želite poništiti registraciju?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Sve ostale primjedbe, značajan napor da bi trebao ići u evidenciji."
 DocType: BOM,Manufacturing User,Proizvodni korisnik
 DocType: Purchase Invoice,Raw Materials Supplied,Sirovine nabavlja
-DocType: Purchase Invoice,Recurring Print Format,Ponavljajući Ispis formata
 DocType: C-Form,Series,Serija
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Valuta cjenika {0} mora biti {1} ili {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Dodaj proizvode
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Valuta cjenika {0} mora biti {1} ili {2}
 DocType: Appraisal,Appraisal Template,Procjena Predložak
 DocType: Item Group,Item Classification,Klasifikacija predmeta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Voditelj razvoja poslovanja
@@ -4505,7 +4593,7 @@
 DocType: Item Attribute Value,Attribute Value,Vrijednost atributa
 ,Itemwise Recommended Reorder Level,Itemwise - preporučena razina ponovne narudžbe
 DocType: Salary Detail,Salary Detail,Plaća Detalj
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Odaberite {0} Prvi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Odaberite {0} Prvi
 DocType: Appointment Type,Physician,Liječnik
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Hrpa {0} od {1} Stavka je istekla.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,konzultacije
@@ -4516,9 +4604,9 @@
 DocType: Salary Detail,Default Amount,Zadani iznos
 DocType: Lab Test Template,Descriptive,Opisni
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Skladište nije pronađeno u sustavu
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Ovomjesečnom Sažetak
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Ovomjesečnom Sažetak
 DocType: Quality Inspection Reading,Quality Inspection Reading,Inspekcija kvalitete - čitanje
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,` Freeze Dionice starije od ` bi trebao biti manji od % d dana .
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,` Zamrzni Zalihe starije od ` bi trebao biti manji od % d dana .
 DocType: Tax Rule,Purchase Tax Template,Predložak poreza pri nabavi
 apps/erpnext/erpnext/utilities/user_progress.py +45,Set a sales goal you'd like to achieve for your company.,Postavite cilj prodaje koji biste željeli postići svojoj tvrtki.
 ,Project wise Stock Tracking,Projekt mudar Stock Praćenje
@@ -4539,12 +4627,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Trening događanja / rezultati
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Akumulirana amortizacija na
 DocType: Sales Invoice,C-Form Applicable,Primjenjivi C-obrazac
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Operacija vrijeme mora biti veći od 0 za rad {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Operacija vrijeme mora biti veći od 0 za rad {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Skladište je obavezno
 DocType: Supplier,Address and Contacts,Adresa i kontakti
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM pretvorbe Detalj
 DocType: Program,Program Abbreviation,naziv programa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Proizvodnja Red ne može biti podignuta protiv predložak točka
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Proizvodnja Red ne može biti podignuta protiv predložak točka
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Optužbe su ažurirani u KUPNJE protiv svake stavke
 DocType: Warranty Claim,Resolved By,Riješen Do
 DocType: Bank Guarantee,Start Date,Datum početka
@@ -4570,26 +4658,27 @@
 DocType: Employee,Educational Qualification,Obrazovne kvalifikacije
 DocType: Workstation,Operating Costs,Operativni troškovi
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Akcija, ako ukupna mjesečna Proračun Prebačen"
-DocType: Purchase Invoice,Submit on creation,Pošalji na stvaranje
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Valuta za {0} mora biti {1}
+DocType: Subscription,Submit on creation,Pošalji na stvaranje
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Valuta za {0} mora biti {1}
 DocType: Asset,Disposal Date,Datum Odlaganje
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-mail će biti poslan svim aktivnim zaposlenicima Društva u određeni sat, ako oni nemaju odmora. Sažetak odgovora će biti poslan u ponoć."
 DocType: Employee Leave Approver,Employee Leave Approver,Zaposlenik dopust Odobritelj
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Red {0}: Ulazak redoslijeda već postoji za to skladište {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Ne može se proglasiti izgubljenim, jer je ponuda napravljena."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Povratne informacije trening
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Red {0}: Ulazak redoslijeda već postoji za to skladište {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Ne može se proglasiti izgubljenim, jer je ponuda napravljena."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Povratne informacije trening
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Proizvodnja Red {0} mora biti podnesen
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Kriteriji ocjenjivanja dobavljača
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Molimo odaberite datum početka i datum završetka za točke {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Tečaj je obavezan u redu {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Do danas ne može biti prije od datuma
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Dodaj / Uredi cijene
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Dodaj / Uredi cijene
 DocType: Batch,Parent Batch,Roditeljska šarža
 DocType: Cheque Print Template,Cheque Print Template,Ček Predložak Ispis
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Grafikon troškovnih centara
 DocType: Lab Test Template,Sample Collection,Prikupljanje uzoraka
 ,Requested Items To Be Ordered,Traženi Proizvodi se mogu naručiti
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Moje narudžbe
 DocType: Price List,Price List Name,Naziv cjenika
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Dnevni rad Sažetak za {0}
 DocType: Employee Loan,Totals,Ukupan rezultat
@@ -4608,12 +4697,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} jedinica {1} potrebna u {2} na {3} {4} od {5} za dovršetak ovu transakciju.
 DocType: Fee Schedule,Student Category,Studentski Kategorija
 DocType: Announcement,Student,Student
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Organizacija jedinica ( odjela ) majstor .
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Organizacija jedinica ( odjela ) majstor .
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Idite na sobe
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Unesite poruku prije slanja
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,DUPLICATE ZA DOBAVLJAČ
 DocType: Email Digest,Pending Quotations,U tijeku Citati
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Point-of-prodaju Profil
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Point-of-prodaju Profil
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Konfiguracije laboratorijskih ispitivanja.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,unsecured krediti
 DocType: Cost Center,Cost Center Name,Troška Name
@@ -4623,6 +4712,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Cjelokupni iznos Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Poruka veća od 160 karaktera bit će izdjeljena u više poruka
 DocType: Purchase Receipt Item,Received and Accepted,Primljeni i prihvaćeni
+DocType: Hub Settings,Company and Seller Profile,Profil tvrtke i prodavatelja
 ,GST Itemised Sales Register,GST označeni prodajni registar
 ,Serial No Service Contract Expiry,Istek ugovora za serijski broj usluge
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Ne možete istovremeno kreditirati i debitirati isti račun
@@ -4632,10 +4722,11 @@
 DocType: Item,Variant Based On,Varijanta na temelju
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Ukupno bi trebalo biti dodijeljena weightage 100 % . To je {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Vaši dobavljači
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Ispravite
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Ne mogu se postaviti kao izgubljen kao prodajnog naloga je napravio .
 DocType: Request for Quotation Item,Supplier Part No,Dobavljač Dio Ne
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Ne mogu odbiti kada je kategorija za &quot;vrednovanje&quot; ili &quot;Vaulation i ukupni &#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Primljeno od
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Primljeno od
 DocType: Lead,Converted,Pretvoreno
 DocType: Item,Has Serial No,Ima serijski br
 DocType: Employee,Date of Issue,Datum izdavanja
@@ -4643,7 +4734,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Kao i po postavkama kupnje ako je zahtjev za kupnju potreban == &#39;YES&#39;, a zatim za izradu fakture za kupnju, korisnik mora najprije stvoriti potvrdu o kupnji za stavku {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Red # {0}: Postavite dobavljač za stavke {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Red {0}: Sati vrijednost mora biti veća od nule.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Web stranica slike {0} prilogu točki {1} Ne mogu naći
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Web stranica slike {0} prilogu točki {1} Ne mogu naći
 DocType: Issue,Content Type,Vrsta sadržaja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,računalo
 DocType: Item,List this Item in multiple groups on the website.,Prikaži ovu stavku u više grupa na web stranici.
@@ -4654,14 +4745,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Kreiraj neusklađene ulaze
 DocType: Payment Reconciliation,From Invoice Date,Iz dostavnice Datum
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Nemate dopuštenje za slanje
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,Valuta naplate mora biti jednaka Zadano comapany je valuta ili stranke valutu
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Valuta naplate mora biti jednaka Zadano comapany je valuta ili stranke valutu
 DocType: Healthcare Settings,Laboratory Settings,Laboratorijske postavke
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Ostavi naplate
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Što učiniti ?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Za skladište
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Svi Studentski Upisi
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Što učiniti ?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Za skladište
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Svi Studentski Upisi
 ,Average Commission Rate,Prosječna provizija
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,'Ima serijski broj' ne može biti 'Da' za neskladišne proizvode
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,'Ima serijski broj' ne može biti 'Da' za neskladišne proizvode
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Odaberite Status
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Gledatelji ne može biti označena za budući datum
 DocType: Pricing Rule,Pricing Rule Help,Pravila cijena - pomoć
@@ -4679,40 +4770,40 @@
 DocType: Item,Customer Code,Kupac Šifra
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Rođendan Podsjetnik za {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dana od posljednje narudžbe
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Zaduženja računa mora biti bilanca račun
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Zaduženja računa mora biti bilanca račun
 DocType: Buying Settings,Naming Series,Imenovanje serije
 DocType: Leave Block List,Leave Block List Name,Naziv popisa neodobrenih odsustava
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Osiguranje Datum početka mora biti manja od osiguranja datum završetka
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Postavite instruktor sustava za imenovanje u školi&gt; Školske postavke
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,dionicama u vrijednosti
 DocType: Timesheet,Production Detail,Proizvodnja Detalj
+DocType: Restaurant,Active Menu,Aktivni izbornik
 DocType: Target Detail,Target Qty,Ciljana Kol
 DocType: Shopping Cart Settings,Checkout Settings,Blagajna Postavke
 DocType: Attendance,Present,Sadašnje
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Otpremnica {0} ne smije biti potvrđena
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Otpremnica {0} ne smije biti potvrđena
 DocType: Notification Control,Sales Invoice Message,Poruka prodajnog  računa
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Zatvaranje računa {0} mora biti tipa odgovornosti / Equity
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Plaća proklizavanja zaposlenika {0} već stvoren za vremensko listu {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Plaća proklizavanja zaposlenika {0} već stvoren za vremensko listu {1}
 DocType: Vehicle Log,Odometer,mjerač za pređeni put
 DocType: Sales Order Item,Ordered Qty,Naručena kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Stavka {0} je onemogućen
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Stavka {0} je onemogućen
 DocType: Stock Settings,Stock Frozen Upto,Kataloški Frozen Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM ne sadrži bilo koji zaliha stavku
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Projekt aktivnost / zadatak.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM ne sadrži bilo koji zaliha stavku
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Projekt aktivnost / zadatak.
 DocType: Vehicle Log,Refuelling Details,Punjenje Detalji
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generiranje plaće gaćice
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Nabava mora biti provjerena, ako je primjenjivo za odabrano kao {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Popust mora biti manji od 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Posljednja stopa kupnju nije pronađen
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Otpis iznos (Društvo valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Radno vrijeme naplate
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,Zadana BOM za {0} nije pronađena
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Red # {0}: Molimo postavite naručivanja količinu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Zadana BOM za {0} nije pronađena
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Red # {0}: Molimo postavite naručivanja količinu
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Dodirnite stavke da biste ih dodali ovdje
 DocType: Fees,Program Enrollment,Program za upis
 DocType: Landed Cost Voucher,Landed Cost Voucher,Nalog zavisnog troška
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Molimo postavite {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Ponovite na dan u mjesecu
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} je neaktivan učenik
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} je neaktivan učenik
 DocType: Employee,Health Details,Zdravlje Detalji
 DocType: Offer Letter,Offer Letter Terms,Ponuda Pismo Uvjeti
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Za izradu referentnog dokumenta zahtjeva za plaćanje potrebno je
@@ -4720,7 +4811,6 @@
 DocType: Employee External Work History,Salary,Plaća
 DocType: Serial No,Delivery Document Type,Dokument isporuke - tip
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Slanje sve plaće gaćice za gore odabranih kriterija
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Stavke sinkronizirane
 DocType: Sales Order,Partly Delivered,Djelomično isporučeno
 DocType: Email Digest,Receivables,Potraživanja
 DocType: Lead Source,Lead Source,Izvor potencijalnog kupca
@@ -4742,19 +4832,19 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Starenje Raspon 2
 DocType: SG Creation Tool Course,Max Strength,Max snaga
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM zamijenjeno
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Odaberite stavke na temelju datuma isporuke
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Odaberite stavke na temelju datuma isporuke
 ,Sales Analytics,Prodajna analitika
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Dostupno {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Dostupno {0}
 ,Prospects Engaged But Not Converted,"Izgledi angažirani, ali nisu konvertirani"
 DocType: Manufacturing Settings,Manufacturing Settings,Postavke proizvodnje
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Postavljanje e-poštu
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Mobile Ne
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Unesite zadanu valutu u tvrtki Master
 DocType: Stock Entry Detail,Stock Entry Detail,Detalji međuskladišnice
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Dnevne Podsjetnici
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Dnevne Podsjetnici
 DocType: Products Settings,Home Page is Products,Početna stranica su proizvodi
 ,Asset Depreciation Ledger,Imovine Amortizacija knjiga
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Porezni Pravilo Sukobi s {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Porezni Pravilo Sukobi s {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Naziv novog računa
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Sirovine Isporuka Troškovi
 DocType: Selling Settings,Settings for Selling Module,Postavke za prodaju modula
@@ -4768,8 +4858,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Proizvod {0} mora biti skladišni
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Zadana rad u tijeku Skladište
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Zadane postavke za računovodstvene poslove.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Postavite Sustav imenovanja zaposlenika u ljudskim resursima&gt; HR postavke
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Očekivani datum ne može biti prije Materijal Zahtjev Datum
+DocType: Restaurant,Default Tax Template,Zadani predložak poreza
 DocType: Fees,Student Details,Pojedinosti studenata
 DocType: Purchase Invoice Item,Stock Qty,Kataloški broj
 DocType: Employee Loan,Repayment Period in Months,Rok otplate u mjesecima
@@ -4787,8 +4878,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Idite na stavke
 DocType: Sales Partner,Partner Type,Tip partnera
 DocType: Purchase Taxes and Charges,Actual,Stvaran
+DocType: Restaurant Menu,Restaurant Manager,Voditelj restorana
 DocType: Authorization Rule,Customerwise Discount,Customerwise Popust
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Timesheet za zadatke.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Timesheet za zadatke.
 DocType: Purchase Invoice,Against Expense Account,Protiv Rashodi račun
 DocType: Production Order,Production Order,Proizvodni nalog
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Napomena instalacije {0} je već potvrđena
@@ -4796,7 +4888,6 @@
 DocType: Quotation Item,Against Docname,Protiv Docname
 DocType: SMS Center,All Employee (Active),Svi zaposlenici (aktivni)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Pogledaj sada
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Odaberite razdoblje kada faktura će biti generiran automatski
 DocType: BOM,Raw Material Cost,Troškova sirovine
 DocType: Item Reorder,Re-Order Level,Ponovno bi razini
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Unesite stavke i planirani Količina za koje želite povećati proizvodne naloge ili preuzimanje sirovine za analizu.
@@ -4809,23 +4900,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Vrsta izvješća je obvezno
 DocType: Item,Serial Number Series,Serijski broj serije
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Skladište je obvezno za skladišne proizvode {0} u redu {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Dodaj programe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Trgovina na veliko i
 DocType: Issue,First Responded On,Prvo Odgovorili Na
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Križ Oglas pošiljke u više grupa
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiskalna godina Datum početka i datum završetka fiskalne godine već su postavljeni u fiskalnoj godini {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Razmak Datum ažurirana
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split Batch
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Uspješno Pomirio
 DocType: Request for Quotation Supplier,Download PDF,Preuzmite PDF
 DocType: Production Order,Planned End Date,Planirani datum završetka
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Unesite datum rasporeda
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Gdje predmeti su pohranjeni.
 DocType: Request for Quotation,Supplier Detail,Dobavljač Detalj
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Greška u formuli ili stanja: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Greška u formuli ili stanja: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Dostavljeni iznos
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Ponderi kriterija moraju se dodati do 100%
 DocType: Attendance,Attendance,Pohađanje
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,zalihi
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,zalihi
 DocType: BOM,Materials,Materijali
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ako nije označeno, popis će biti dodan u svakom odjela gdje se mora primjenjivati."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Izvorni i ciljni skladišta ne mogu biti isti
@@ -4843,6 +4934,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,VPC
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Vrijednost za atribut {0} mora biti unutar raspona od {1} {2} u koracima od {3} za točku {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Target skladište u redu {0} mora biti ista kao Production Order
+DocType: Restaurant Reservation,Waitlisted,na listi čekanja
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Valuta se ne može mijenjati nakon što unose pomoću neke druge valute
 DocType: Vehicle Service,Clutch Plate,držač za tanjur
 DocType: Company,Round Off Account,Zaokružiti račun
@@ -4859,7 +4951,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Novo ime prodajnog agenta
 DocType: Packing Slip,Gross Weight UOM,Bruto težina UOM
 DocType: Delivery Note Item,Against Sales Invoice,Protiv prodaje fakture
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Unesite serijske brojeve za serijsku stavku
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Unesite serijske brojeve za serijsku stavku
 DocType: Bin,Reserved Qty for Production,Rezervirano Kol za proizvodnju
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Ostavite neoznačeno ako ne želite razmotriti grupu dok stvarate grupe temeljene na tečajima.
 DocType: Asset,Frequency of Depreciation (Months),Učestalost Amortizacija (mjeseci)
@@ -4870,7 +4962,7 @@
 DocType: Lab Test,Test Group,Test grupa
 DocType: Payment Reconciliation,Receivable / Payable Account,Potraživanja / Plaća račun
 DocType: Delivery Note Item,Against Sales Order Item,Protiv prodaje reda točkom
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Navedite značajke vrijednost za atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Navedite značajke vrijednost za atribut {0}
 DocType: Item,Default Warehouse,Glavno skladište
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Proračun se ne može dodijeliti protiv grupe nalog {0}
 DocType: Healthcare Settings,Patient Registration,Registracija pacijenata
@@ -4899,6 +4991,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Prodajna osoba
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Proračun i Centar Cijena
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Višestruki zadani način plaćanja nije dopušten
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,za
 ,Appointment Analytics,Imenovanje Google Analytics
 DocType: Vehicle Service,Half Yearly,Pola godišnji
 DocType: Lead,Blog Subscriber,Blog pretplatnik
@@ -4916,7 +5009,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Broj kvote
 ,BOM Stock Report,BOM Stock Report
 DocType: Stock Reconciliation Item,Quantity Difference,Količina razlika
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Obračun plaća
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Obračun plaća
 DocType: Opportunity Item,Basic Rate,Osnovna stopa
 DocType: GL Entry,Credit Amount,Kreditni iznos
 DocType: Cheque Print Template,Signatory Position,potpisnik pozicija
@@ -4930,12 +5023,12 @@
 DocType: Tax Rule,Tax Rule,Porezni Pravilo
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Održavaj istu stopu tijekom cijelog prodajnog ciklusa
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planirajte vrijeme za rezanje izvan radne stanice radnog vremena.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Kupci u redu
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} nema raspored liječnika. Dodajte je u liječnika
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Kupci u redu
 DocType: Student,Nationality,Nacionalnost
 ,Items To Be Requested,Potraživani proizvodi
-DocType: Purchase Order,Get Last Purchase Rate,Kreiraj zadnju nabavnu cijenu
 DocType: Company,Company Info,Podaci o tvrtki
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Odaberite ili dodajte novi kupac
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Odaberite ili dodajte novi kupac
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Troška potrebno je rezervirati trošak zahtjev
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Primjena sredstava ( aktiva )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,To se temelji na prisustvo tog zaposlenog
@@ -4943,6 +5036,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Duguje račun
 DocType: Fiscal Year,Year Start Date,Početni datum u godini
 DocType: Attendance,Employee Name,Ime zaposlenika
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Stavka unosa narudžbe restorana
 DocType: Sales Invoice,Rounded Total (Company Currency),Zaobljeni Ukupno (Društvo valuta)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Ne može se tajno u grupu jer je izabrana vrsta računa.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} je izmijenjen. Osvježi stranicu.
@@ -4953,6 +5047,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Primanja zaposlenih
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Pakirana količina mora biti jednaka količini za proizvod {0} u redku {1}
 DocType: Production Order,Manufactured Qty,Proizvedena količina
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Izračun je izrađen
 DocType: Purchase Receipt Item,Accepted Quantity,Prihvaćena količina
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Postavite zadani popis za odmor za zaposlenika {0} ili poduzeću {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} Ne radi postoji
@@ -4962,18 +5057,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Redak Ne {0}: Iznos ne može biti veća od visine u tijeku protiv Rashodi Zahtjeva {1}. U tijeku Iznos je {2}
 DocType: Maintenance Schedule,Schedule,Raspored
 DocType: Account,Parent Account,Nadređeni račun
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Dostupno
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Dostupno
 DocType: Quality Inspection Reading,Reading 3,Čitanje 3
 ,Hub,Središte
 DocType: GL Entry,Voucher Type,Bon Tip
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Cjenik nije pronađen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Cjenik nije pronađen
 DocType: Lab Test,Approved,Odobren
 DocType: Pricing Rule,Price,Cijena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo '
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo '
+DocType: Hub Settings,Last Sync On,Posljednja sinkronizacija uključena
 DocType: Guardian,Guardian,Čuvar
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Procjena {0} stvorena za zaposlenika {1} u određenom razdoblju
 DocType: Employee,Education,Obrazovanje
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,del
 DocType: Selling Settings,Campaign Naming By,Imenovanje kampanja po
 DocType: Employee,Current Address Is,Trenutni Adresa je
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Mjesečni cilj prodaje (
@@ -4988,7 +5084,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Šifra predmeta:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Unesite trošak računa
 DocType: Account,Stock,Lager
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Red # {0}: Referenca Tip dokumenta mora biti jedan od narudžbenice, fakture kupovine ili Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Red # {0}: Referenca Tip dokumenta mora biti jedan od narudžbenice, fakture kupovine ili Journal Entry"
 DocType: Employee,Current Address,Trenutna adresa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ako predmet je varijanta drugom stavku zatim opis, slika, cijena, porezi itd će biti postavljena od predloška, osim ako je izričito navedeno"
 DocType: Serial No,Purchase / Manufacture Details,Detalji nabave/proizvodnje
@@ -5019,7 +5115,7 @@
 DocType: Hub Settings,Hub Settings,Hub Postavke
 DocType: Project,Gross Margin %,Bruto marža %
 DocType: BOM,With Operations,Uz operacije
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Računovodstvenih unosa već su napravljene u valuti {0} za poduzeće {1}. Odaberite potraživanja ili dugovanja račun s valutom {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Računovodstvenih unosa već su napravljene u valuti {0} za poduzeće {1}. Odaberite potraživanja ili dugovanja račun s valutom {0}.
 DocType: Asset,Is Existing Asset,Je Postojeći Imovina
 DocType: Salary Detail,Statistical Component,Statistička komponenta
 DocType: Warranty Claim,If different than customer address,Ako se razlikuje od kupaca adresu
@@ -5027,22 +5123,23 @@
 DocType: BOM Operation,BOM Operation,BOM operacija
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Na prethodnu Row visini
 DocType: Student,Home Address,Kućna adresa
+DocType: Item,Has Expiry Date,Ima datum isteka
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Postavke varijacije stavke.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Prijenos imovine
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,Prijenos imovine
 DocType: POS Profile,POS Profile,POS profil
 DocType: Training Event,Event Name,Naziv događaja
 DocType: Physician,Phone (Office),Telefon (ured)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,ulaz
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Upisi za {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,ulaz
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Upisi za {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Sezonska za postavljanje proračuna, ciljevi itd"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Variable Name
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Stavka {0} je predložak, odaberite jednu od njegovih varijanti"
-DocType: Asset,Asset Category,imovina Kategorija
+DocType: Asset,Asset Category,Kategorija Imovine
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Neto plaća ne može biti negativna
 DocType: Assessment Plan,Room,Soba
 DocType: Purchase Order,Advance Paid,Unaprijed plaćeni
 DocType: Item,Item Tax,Porez proizvoda
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Materijal za dobavljača
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Materijal za dobavljača
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Trošarine Račun
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Prag {0}% se pojavljuje više od jednom
 DocType: Expense Claim,Employees Email Id,Zaposlenici Email ID
@@ -5053,32 +5150,30 @@
 DocType: Program,Program Name,Naziv programa
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Razmislite poreza ili pristojbi za
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Stvarni Količina je obavezno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} trenutačno ima stajalište dobavljača rezultata {1}, a narudžbenice za ovaj dobavljač trebaju biti izdane s oprezom."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} trenutačno ima stajalište dobavljača rezultata {1}, a narudžbenice za ovaj dobavljač trebaju biti izdane s oprezom."
 DocType: Employee Loan,Loan Type,Vrsta kredita
 DocType: Scheduling Tool,Scheduling Tool,alat za raspoređivanje
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,kreditna kartica
 DocType: BOM,Item to be manufactured or repacked,Proizvod će biti proizveden ili prepakiran
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Zadane postavke za skladišne transakcije.
-DocType: Purchase Invoice,Next Date,Sljedeći datum
 DocType: Employee Education,Major/Optional Subjects,Glavni / Izborni predmeti
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
+DocType: Hub Settings,Suspended,suspendirana
 DocType: Training Event,Attendees,Sudionici
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Ovdje možete održavati obiteljske pojedinosti kao što su ime i okupacije roditelja, supružnika i djecu"
 DocType: Academic Term,Term End Date,Pojam Datum završetka
-DocType: Hub Settings,Seller Name,Naziv prodavatelja
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Porezi i naknade Umanjenja (Društvo valuta)
 DocType: Item Group,General Settings,Opće postavke
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Od valute i valuta ne mogu biti isti
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Dodaj instruktore
 DocType: Stock Entry,Repack,Prepakiraj
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Morate spremiti obrazac prije nastavka
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Najprije odaberite tvrtku
 DocType: Item Attribute,Numeric Values,Brojčane vrijednosti
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Pričvrstite Logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Stock Razine
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Stock Razine
 DocType: Customer,Commission Rate,Komisija Stopa
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Izrađeno {0} bodovne kartice za {1} između:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Napravite varijanta
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Napravite varijanta
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blok ostaviti aplikacija odjelu.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Vrsta plaćanja mora biti jedan od primati, platiti i unutarnje prijenos"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analitika
@@ -5093,11 +5188,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Kapital
 DocType: Shopping Cart Settings,Show Public Attachments,Prikaži javne privitke
 DocType: Packing Slip,Package Weight Details,Težina paketa - detalji
+DocType: Restaurant Reservation,Reservation Time,Vrijeme rezervacije
 DocType: Payment Gateway Account,Payment Gateway Account,Payment Gateway račun
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Nakon završetka plaćanja preusmjeriti korisnika na odabranu stranicu.
 DocType: Company,Existing Company,postojeće tvrtke
 DocType: Healthcare Settings,Result Emailed,Rezultat je poslana e-poštom
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",Kategorija poreza promijenjena je u &quot;Ukupno&quot; jer su sve stavke nedopuštene stavke
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Šifra stavke&gt; Skupina stavke&gt; Brand
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Odaberite CSV datoteku
 DocType: Student Leave Application,Mark as Present,Označi kao sadašnja
 DocType: Supplier Scorecard,Indicator Color,Boja indikatora
@@ -5122,11 +5219,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Provjerite Student Hrpa
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Je Carry Naprijed
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Potencijalni kupac - ukupno dana
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Red # {0}: datum knjiženja moraju biti isti kao i datum kupnje {1} od {2} imovine
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Provjerite je li student boravio u Hostelu Instituta.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Unesite prodajni nalozi u gornjoj tablici
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Unesite prodajni nalozi u gornjoj tablici
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Ne Poslao plaća gaćice
 ,Stock Summary,Stock Sažetak
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Prijenos imovine s jednog skladišta na drugo
@@ -5142,5 +5239,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Red {0}: debitne unos ne može biti povezan s {1}
 DocType: Journal Entry,Subscription Section,Odjeljak za pretplatu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Račun {0} ne postoji
+DocType: Training Event,Training Program,Program treninga
 DocType: Account,Cash,Gotovina
 DocType: Employee,Short biography for website and other publications.,Kratka biografija za web stranice i drugih publikacija.
diff --git a/erpnext/translations/hu.csv b/erpnext/translations/hu.csv
index c5728c5..d629668 100644
--- a/erpnext/translations/hu.csv
+++ b/erpnext/translations/hu.csv
@@ -1,10 +1,10 @@
 DocType: Employee,Salary Mode,Bér mód
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Regisztráció
 DocType: Patient,Divorced,Elvált
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Tételek már szinkronizálva
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Egy tranzakción belül a tétel többszöri hozzáadásának engedélyedzése
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Törölje az anyag szemlét: {0}mielőtt törölné ezt a jótállási igényt
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Vásárlói termékek
-DocType: Purchase Receipt,Subscription Detail,Előfizetési részlet
+DocType: Purchase Receipt,Subscription Detail,Előfizetés részletei
 DocType: Supplier Scorecard,Notify Supplier,Értesítse a szállítót
 DocType: Item,Customer Items,Vevői tételek
 DocType: Project,Costing and Billing,Költség- és számlázás
@@ -17,13 +17,14 @@
 DocType: Employee,Leave Approvers,Távollét jóváhagyók
 DocType: Sales Partner,Dealer,Forgalmazó
 DocType: Consultation,Investigations,Laboratóriumi vizsgálatok eredményei
+DocType: Restaurant Order Entry,Click Enter To Add,Kattintson a Hozzáadás gombra
 DocType: Employee,Rented,Bérelt
 DocType: Purchase Order,PO-,BESZMEGR-
 DocType: POS Profile,Applicable for User,Alkalmazandó ehhez a Felhasználóhoz
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Leállított gyártás rendelés nem törölhető, először tegye folyamatba a törléshez"
 DocType: Vehicle Service,Mileage,Távolság
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Tényleg szeretné kiselejtezni ezt az eszközt?
-DocType: Drug Prescription,Update Schedule,Frissítési ütemterv
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Tényleg szeretné kiselejtezni ezt az eszközt?
+DocType: Drug Prescription,Update Schedule,Frissítse az ütemtervet
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Alapértelmezett beszállító kiválasztása
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Árfolyam szükséges ehhez az  árlistához: {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* A tranzakcióban lesz kiszámolva.
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Ellenőrizd az elérhetőséget
 DocType: Job Applicant,Job Applicant,Állásra pályázó
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Ennek alapja a beszállító ügyleteki. Lásd alábbi idővonalat a részletekért
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nincs több eredményt.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Jogi
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Tényleges adó típust nem lehet hozzárendelni a Tétel árához a {0} sorban
 DocType: Bank Guarantee,Customer,Vevő
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Az Átváltási aránynak ugyanannak kell lennie mint {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Vevő neve
 DocType: Vehicle,Natural Gas,Földgáz
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},A bankszámlát nem nevezhetjük mint {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},A bankszámlát nem nevezhetjük mint {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Vezetők (vagy csoportok), amely ellen könyvelési tételek készültek és egyenelegeit tartják karban."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),"Fennálló, kintlévő összeg erre: {0} nem lehet kevesebb, mint nulla ({1})"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Nincsenek benyújtott bérpapírok feldolgozásra.
 DocType: Manufacturing Settings,Default 10 mins,Alapértelmezett 10 perc
 DocType: Leave Type,Leave Type Name,Távollét típus neve
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Mutassa nyitva
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Az említett ismétlődő magatartásnak ma is meg kell történnie
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Sorozat sikeresen frissítve
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Kijelentkezés
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural Naplókönyvelés Beküldte
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Beszerzési megrendelés tételek beérkezett
 DocType: SMS Center,All Supplier Contact,Összes beszállítói Kapcsolat
 DocType: Support Settings,Support Settings,Támogatás beállítások
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,"Várható befejezés dátuma nem lehet előbb, mint várható kezdési időpontja"
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,"Várható befejezés dátuma nem lehet előbb, mint várható kezdési időpontja"
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Sor # {0}: Árnak eggyeznie kell {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Új távollét igény
 ,Batch Item Expiry Status,Kötegelt tétel Lejárat állapota
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Bank tervezet
 DocType: Mode of Payment Account,Mode of Payment Account,Fizetési számla módja
 DocType: Consultation,Consultation,Konzultáció
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Értékesítés és beváltás
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Mutassa a változatokat
 DocType: Academic Term,Academic Term,Akadémia szemeszter
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Anyag
@@ -78,10 +80,11 @@
 DocType: Lab Test Groups,Add new line,Új sor hozzáadása
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Egészségügyi ellátás
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Fizetési késedelem (napok)
-DocType: Lab Prescription,Lab Prescription,Lab Prescription
+DocType: Lab Prescription,Lab Prescription,Labor rendelvények
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Rendezés ár szerint
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Szolgáltatás költsége
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Sorozat szám: {0} már hivatkozott ezen az Értékesítési számlán: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Számla
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Sorozat szám: {0} már hivatkozott ezen az Értékesítési számlán: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Számla
 DocType: Maintenance Schedule Item,Periodicity,Időszakosság
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Pénzügyi év {0} szükséges
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Védelem
@@ -91,23 +94,23 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Összes Költség összege
 DocType: Delivery Note,Vehicle No,Jármű sz.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,"Kérjük, válasszon árjegyzéket"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,"Kérjük, válasszon árjegyzéket"
 DocType: Accounts Settings,Currency Exchange Settings,Valutaváltási beállítások
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Sor # {0}: Fizetési dokumentum szükséges a teljes trasaction
 DocType: Production Order Operation,Work In Progress,Dolgozunk rajta
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,"Kérjük, válasszon dátumot"
 DocType: Employee,Holiday List,Szabadnapok listája
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,"Kérjük, állítsd be az oktatónevezési rendszert az iskolai iskolai beállításokba"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Könyvelő
-DocType: Patient,Tobacco Current Use,Dohányáru jelenlegi felhasználása
+DocType: Hub Settings,Selling Price List,Értékesítési árlista
+DocType: Patient,Tobacco Current Use,Dohányzás jelenlegi felhasználása
 DocType: Cost Center,Stock User,Készlet Felhasználó
 DocType: Company,Phone No,Telefonszám
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Tanfolyam Menetrendek létrehozva:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Új {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Új {0}: # {1}
 ,Sales Partners Commission,Vevő partner jutaléka
 DocType: Purchase Invoice,Rounding Adjustment,Kerekítés beállítása
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,"Rövidítés nem lehet több, mint 5 karakter"
-DocType: Physician Schedule Time Slot,Physician Schedule Time Slot,Orvos idõzített idõnyílása
+DocType: Physician Schedule Time Slot,Physician Schedule Time Slot,Orvos idõzített időszakasza
 DocType: Payment Request,Payment Request,Fizetési kérelem
 DocType: Asset,Value After Depreciation,Eszközök értékcsökkenés utáni
 DocType: Employee,O+,ALK+
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Szülő Részlet docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referencia: {0}, pont kód: {1} és az ügyfél: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kg
-DocType: Student Log,Log,Napló
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Nyitott állások.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Eredmény benyújtva
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Eredmény benyújtva
 DocType: Item Attribute,Increment,Növekmény
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Időtartam
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Válasszon Raktárat...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Házas
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Nem engedélyezett erre {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Tételeket kér le innen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Készlet nem frissíthető ezzel a szállítólevéllel {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Készlet nem frissíthető ezzel a szállítólevéllel {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Gyártmány {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nincsenek listázott elemek
 DocType: Payment Reconciliation,Reconcile,Összeegyeztetni
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Nyugdíjpénztárak
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Következő értékcsökkenés dátuma nem lehet korábbi a vásárlás dátumánál
 DocType: Consultation,Consultation Date,Konzultációs dátum
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Termékinformáció és felfedezés az ERP-követő felhasználók számára
 DocType: SMS Center,All Sales Person,Összes értékesítő
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"* Havi Felbontás** segít felbontani a Költségvetést / Célt a hónapok között, ha vállalkozásod szezonális."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Nem talált tételeket
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Bérrendszer Hiányzó
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Nem talált tételeket
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Bérrendszer Hiányzó
 DocType: Lead,Person Name,Személy neve
 DocType: Sales Invoice Item,Sales Invoice Item,Kimenő értékesítési számla tételei
 DocType: Account,Credit,Tőlünk követelés
 DocType: POS Profile,Write Off Cost Center,Leíró Költséghely
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""","pl. ""általános iskola"" vagy ""egyetem"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""","pl. ""általános iskola"" vagy ""egyetem"""
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Készlet jelentések
 DocType: Warehouse,Warehouse Detail,Raktár részletek
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Hitelkeretet már átlépte az ügyfél {0} {1}/{2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"A feltétel végső dátuma nem lehet későbbi, mint a tanév év végi időpontja, amelyhez a kifejezés kapcsolódik (Tanév {}). Kérjük javítsa ki a dátumot, és próbálja újra."
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Ez tárgyi eszköz"" nem lehet kijelöletlen, mert Tárgyi eszköz rekord bejegyzés létezik ellen tételként"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Ez tárgyi eszköz"" nem lehet kijelöletlen, mert Tárgyi eszköz rekord bejegyzés létezik ellen tételként"
 DocType: Vehicle Service,Brake Oil,Fékolaj
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Ügyfél&gt; Ügyfélcsoport&gt; Terület
 DocType: Tax Rule,Tax Type,Adónem
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Adóalap
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Nincs engedélye bejegyzés hozzáadására és frissítésére előbb mint: {0}
 DocType: BOM,Item Image (if not slideshow),Tétel Kép (ha nem slideshow)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Az Ügyfél már létezik ezen a néven
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Óra érték / 60) * aktuális üzemidő
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,#{0} sor: A referencia dokumentum típusának a Költség igény vagy Jóváírás bejegyzések egyikének kell lennie
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Válasszon Anyagj
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,#{0} sor: A referencia dokumentum típusának a Költség igény vagy Jóváírás bejegyzések egyikének kell lennie
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Válasszon Anyagj
 DocType: SMS Log,SMS Log,SMS napló
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Költségét a szállított tételeken
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Ez az ünnep: {0} nincs az induló és a végső dátum közt
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,Alkalmazotti hitel
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Tevékenység napló:
 DocType: Fee Schedule,Send Payment Request Email,Fizetési kérelem küldése e-mailben
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,"Tétel: {0} ,nem létezik a rendszerben, vagy lejárt"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,"Tétel: {0} ,nem létezik a rendszerben, vagy lejárt"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Ingatlan
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Főkönyvi számla kivonata
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Gyógyszeriparok
@@ -210,22 +213,27 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Importálás naplója
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Gyártási típusú anyag igénylés kivétele a fenti kritériumok alapján
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Sikeresen regisztrálva.
 DocType: Training Result Employee,Grade,Osztály
+DocType: Restaurant Table,No of Seats,Ülőhelyek száma
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>",Dinamikus téma hozzáadásához használja a jinja-címkéket <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>
 DocType: Sales Invoice Item,Delivered By Supplier,Beszállító által szállított
 DocType: SMS Center,All Contact,Összes Kapcsolattartó
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Gyártási rendelés már létrehozott valamennyi tételre egy Anyagjegyzékkel
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Gyártási rendelés már létrehozott valamennyi tételre egy Anyagjegyzékkel
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Éves Munkabér
 DocType: Daily Work Summary,Daily Work Summary,Napi munka összefoglalása
 DocType: Period Closing Voucher,Closing Fiscal Year,Pénzügyi év záró
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} fagyasztott
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,"Kérjük, válassza ki, meglévő vállakozást a számlatükör létrehozásához"
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} fagyasztott
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,"Kérjük, válassza ki, meglévő vállakozást a számlatükör létrehozásához"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Készlet költségek
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Cél Raktár kiválasztása
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Cél Raktár kiválasztása
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Kérjük, adja meg a preferált kapcsolati Email-t"
 DocType: Program Enrollment,School Bus,Iskolabusz
 DocType: Journal Entry,Contra Entry,Ellen jegyzés
 DocType: Journal Entry Account,Credit in Company Currency,Követelés a vállalkozás pénznemében
-DocType: Lab Test UOM,Lab Test UOM,Lab Test UOM
+DocType: Lab Test UOM,Lab Test UOM,Labor Teszt ME
 DocType: Delivery Note,Installation Status,Telepítés állapota
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +135,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Szeretné frissíteni részvétel? <br> Jelen: {0} \ <br> Hiányzik: {1}
@@ -237,9 +245,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Töltse le a sablont, töltse ki a megfelelő adatokat és csatolja a módosított fájlt. Minden időpont és alkalmazott kombináció a kiválasztott időszakban bekerül a sablonba, a meglévő jelenléti ívekkel együtt"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,"Tétel: {0}, nem aktív, vagy elhasználódott"
+DocType: Student Admission Program,Minimum Age,Minimális életkor
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Példa: Matematika alapjai
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","A tétel adójának beillesztéséhez ebbe a sorba: {0}, az ebben a sorban {1} lévő adókat is muszály hozzávenni"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Beállítások a HR munkaügy modulhoz
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Beállítások a HR munkaügy modulhoz
 DocType: SMS Center,SMS Center,SMS Központ
 DocType: Sales Invoice,Change Amount,Váltópénz összeg
 DocType: BOM Update Tool,New BOM,Új Anyagjegyzék
@@ -249,7 +258,7 @@
 DocType: Lead,Request Type,Kérés típusa
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Alkalmazot létrehozás
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Műsorszolgáltatás
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Szobák hozzáadása
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),POS (online / offline) beállítási módja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Végrehajtás
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Részletek az elvégzett műveletekethez.
 DocType: Serial No,Maintenance Status,Karbantartás állapota
@@ -268,10 +277,11 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Pénzügyi  kimutatások
 DocType: Guardian,Students,Tanulók
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Alkalmazási szabályainak árképzés és kedvezmény.
-DocType: Physician Schedule,Time Slots,Időnyílások
+DocType: Physician Schedule,Time Slots,Idő szakaszok
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Árlistát alkalmazni kell vagy beszerzésre vagy eladásra
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},"A telepítés időpontja nem lehet korábbi, mint a szállítási határidő erre a Tételre: {0}"
 DocType: Pricing Rule,Discount on Price List Rate (%),Kedvezmény az Árlista ár értékén (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Biokémia
 DocType: Offer Letter,Select Terms and Conditions,Válasszon Feltételeket
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,Értéken kívül
 DocType: Production Planning Tool,Sales Orders,Vevői rendelés
@@ -306,16 +316,16 @@
 DocType: Sales Partner,Reseller,Viszonteladó
 DocType: Codification Table,Medical Code,Orvosi kódex
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Ha be van jelölve, tartalmazni fogja a készleten nem lévő tételeket az anyag kérésekben."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,"Kérjük, adja meg a Vállalkozást"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,"Kérjük, adja meg a Vállalkozást"
 DocType: Delivery Note Item,Against Sales Invoice Item,Ellen Értékesítési tétel számlák
 ,Production Orders in Progress,Folyamatban lévő gyártási rendelések
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Nettó pénzeszközök a pénzügyről
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","Helyi-tároló megtelt, nem menti"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","Helyi-tároló megtelt, nem menti"
 DocType: Lead,Address & Contact,Cím & Kapcsolattartó
 DocType: Leave Allocation,Add unused leaves from previous allocations,Adja hozzá a fel nem használt távoléteket a korábbi elhelyezkedésből
 DocType: Sales Partner,Partner website,Partner weboldal
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Tétel hozzáadása
-DocType: Lab Test,Custom Result,Egyéni eredmény
+DocType: Restaurant Order Entry,Add Item,Tétel hozzáadása
+DocType: Lab Test,Custom Result,Egyén eredménye
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Kapcsolattartó neve
 DocType: Course Assessment Criteria,Course Assessment Criteria,Tanfolyam Értékelési kritériumok
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Bérpapír létrehozása a fenti kritériumok alapján.
@@ -327,7 +337,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Vásárolható rendelés.
 DocType: Lab Test,Submitted Date,Benyújtott dátum
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Ennek alapja a project témához létrehozott idő nyilvántartók
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,"Nettó fizetés nem lehet kevesebb, mint 0"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,"Nettó fizetés nem lehet kevesebb, mint 0"
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",Az ismétlődő hibaüzenetek rendszerből való megszakításának megakadályozása érdekében az Ellenőrzött mezőt ellenőrizzük
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Csak a kijelölt Távollét Jóváhagyó nyújthatja be ezt a távollét igénylést
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,"Tehermentesítő dátuma nagyobbnak kell lennie, mint Csatlakozás dátuma"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Távollétek évente
@@ -336,9 +347,10 @@
 DocType: Email Digest,Profit & Loss,Profit & veszteség
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Liter
 DocType: Task,Total Costing Amount (via Time Sheet),Összes költség összeg ((Idő nyilvántartó szerint)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,"Kérjük, állíts be a diákokat hallgatói csoportok alatt"
 DocType: Item Website Specification,Item Website Specification,Tétel weboldal adatai
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Távollét blokkolt
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},"Tétel: {0}, elérte az élettartama végét {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},"Tétel: {0}, elérte az élettartama végét {1}"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Bank bejegyzések
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Éves
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Készlet egyeztetés tétele
@@ -347,7 +359,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Diák csoport létrehozása Szerszám pálya
 DocType: Lead,Do Not Contact,Ne lépj kapcsolatba
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,"Emberek, akik tanítanak a válllakozásánál"
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Az egyedi azonosítóval nyomon követi az összes visszatérő számlákat. Ezt a benyújtáskor hozza létre.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Szoftver fejlesztő
 DocType: Item,Minimum Order Qty,Minimális rendelési menny
 DocType: Pricing Rule,Supplier Type,Beszállító típusa
@@ -357,17 +368,19 @@
 DocType: Item,Publish in Hub,Közzéteszi a Hubon
 DocType: Student Admission,Student Admission,Tanuló Felvételi
 ,Terretory,Terület
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,{0} tétel törölve
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Anyagigénylés
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,{0} tétel törölve
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Anyagigénylés
 DocType: Bank Reconciliation,Update Clearance Date,Végső dátum frissítése
 DocType: Item,Purchase Details,Beszerzés adatai
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Tétel {0} nem található a 'Szállított alapanyagok' táblázatban ebben a Beszerzési  Megrendelésben {1}
 DocType: Patient Relation,Relation,Kapcsolat
 DocType: Shipping Rule,Worldwide Shipping,Egész világra kiterjedő szállítás
 DocType: Patient Relation,Mother,Anya
+DocType: Restaurant Reservation,Reservation End Time,Foglalás vége
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Visszaigazolt Vevői megrendelések.
 DocType: Purchase Receipt Item,Rejected Quantity,Elutasított mennyiség
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Fizetési kérelem {0} létrehozva
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,A(z)  {0} Fizetési kérelem létrehozva
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Alacsony érzékenység
 DocType: Notification Control,Notification Control,Bejelentés vezérlés
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,"Kérjük, erősítse meg, miután elvégezte a képzést"
 DocType: Lead,Suggestions,Javaslatok
@@ -387,7 +400,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,E-mailek bérpapírok az alkalmazottak részére az alkalmazottak preferált e-mail kiválasztása alapján
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Az első távollét jóváhagyó a listán lesz az alapértelmezett távollét Jóváhagyó
 DocType: Tax Rule,Shipping County,Szállítási megye
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Tanulás
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Tanulás
 DocType: Asset,Next Depreciation Date,Következő Értékcsökkenés dátuma
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Alkalmazottankénti Tevékenység költség
 DocType: Accounts Settings,Settings for Accounts,Fiókok beállítása
@@ -398,13 +411,13 @@
 DocType: Item,Synced With Hub,Szinkronizálta Hub-al
 DocType: Vehicle,Fleet Manager,Flotta kezelő
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Sor # {0}: {1} nem lehet negatív a tételre: {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Hibás Jelszó
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Hibás Jelszó
 DocType: Item,Variant Of,Változata
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"Befejezett Menny nem lehet nagyobb, mint 'Gyártandó Menny'"
 DocType: Period Closing Voucher,Closing Account Head,Záró fiók vezetője
 DocType: Employee,External Work History,Külső munka története
-DocType: Physician,Time per Appointment,A kinevezési idő
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Körkörös hivatkozás hiba
+DocType: Physician,Time per Appointment,A vizit látogatások ideje
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Körkörös hivatkozás hiba
 DocType: Appointment Type,Is Inpatient,Fekvőbeteg
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Helyettesítő1 neve
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Szavakkal (Export) lesz látható, miután menttette a szállítólevelet."
@@ -413,19 +426,18 @@
 DocType: Lead,Industry,Ipar
 DocType: Employee,Job Profile,Munkakör
 DocType: BOM Item,Rate & Amount,Ár és összeg
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Kérjük, állítsa be a számozási sorozatot a részvételhez a Beállítás&gt; Számozási sorozatok segítségével"
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Ez a Vállalkozással szembeni tranzakciókra épül. Lásd az alábbi idővonalat a részletekért
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Email értesítő létrehozása automatikus Anyag igény létrehozásához
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Ellenálló
 DocType: Journal Entry,Multi Currency,Több pénznem
 DocType: Payment Reconciliation Invoice,Invoice Type,Számla típusa
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Ügyfél&gt; Ügyfélcsoport&gt; Terület
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Szállítólevél
-DocType: Consultation,Encounter Impression,Encounter Impression
+DocType: Consultation,Encounter Impression,Benyomás a tálálkozóról
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Adók beállítása
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Eladott eszközök költsége
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,"Fizetés megadása módosításra került, miután lehívta. Kérjük, hívja le újra."
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} kétszer bevitt a tétel adójába
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Összefoglaló erre a hétre és a folyamatban lévő tevékenységek
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} kétszer bevitt a tétel adójába
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Összefoglaló erre a hétre és a folyamatban lévő tevékenységek
 DocType: Student Applicant,Admitted,Belépést nyer
 DocType: Workstation,Rent Cost,Bérleti díj
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Összeg az értékcsökkenési leírás után
@@ -439,36 +451,35 @@
 DocType: Shipping Rule,Valid for Countries,Érvényes ezekre az országokra
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ez a tétel egy sablon, és nem lehet használni a tranzakciókhoz. Elem Jellemzők át lesznek másolva a különböző variációkra, kivéve, ha be van állítva a 'Ne másolja'"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Összes Megrendelés ami annak Tekinthető
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Alkalmazott Titulus (pl vezérigazgató, igazgató stb)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Alkalmazott Titulus (pl vezérigazgató, igazgató stb)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Arány, amelyen az Ügyfél pénznemét átalakítja az ügyfél alapértelmezett pénznemére"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Tanfolyam ütemező eszköz
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Sor # {0}: Beszerzési számlát nem lehet létrehozni egy már meglévő eszközre: {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Sürgős] Hiba történt az% s% s ismétlődő létrehozásakor
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Sürgős] Hiba történt az %s ismétlődő %s létrehozásakor
 DocType: Item Tax,Tax Rate,Adókulcs
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} már elkülönített a  {1} Alkalmazotthoz a {2} -től {3} -ig időszakra
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Tétel kiválasztása
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Tétel kiválasztása
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Beszállítói számla: {0} már benyújtott
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Sor # {0}: Köteg számnak egyeznie kell ezzel {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Átalakítás nem-csoporttá
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,A Köteg több Tétel összessége.
 DocType: C-Form Invoice Detail,Invoice Date,Számla dátuma
 DocType: GL Entry,Debit Amount,Tartozás összeg
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Nem lehet csak 1 fiók vállalatonként ebben {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,"Kérjük, nézze meg a mellékletet"
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Nem lehet csak 1 fiók vállalatonként ebben {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,"Kérjük, nézze meg a mellékletet"
 DocType: Purchase Order,% Received,% fogadva
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Készítsen Diákcsoportokat
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Telepítés már komplett !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Telepítés már elvégezve !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Követelés értesítő összege
-DocType: Setup Progress Action,Action Document,Cselekvési dokumentum
+DocType: Setup Progress Action,Action Document,Műveleti dokumentum
 ,Finished Goods,Készáru
 DocType: Delivery Note,Instructions,Utasítások
 DocType: Quality Inspection,Inspected By,Megvizsgálta
 DocType: Maintenance Visit,Maintenance Type,Karbantartás típusa
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} nem vontuk be a tanfolyamba {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Tételkód&gt; Tételcsoport&gt; Márka
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} nem vontuk be a tanfolyamba {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Széria sz. {0} nem tartozik a szállítólevélhez {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Tételek hozzáadása
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Tételek hozzáadása
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Tétel minőségi vizsgálatának részletei
 DocType: Leave Application,Leave Approver Name,Távollét jóváhagyó neve
 DocType: Depreciation Schedule,Schedule Date,Menetrend dátuma
@@ -484,11 +495,11 @@
 DocType: Email Digest,Credit Balance,Követelés egyenleg
 DocType: Employee,Widowed,Özvegy
 DocType: Request for Quotation,Request for Quotation,Ajánlatkérés
-DocType: Healthcare Settings,Require Lab Test Approval,A laboratóriumi teszt jóváhagyása szükséges
+DocType: Healthcare Settings,Require Lab Test Approval,Laboratóriumi teszt jóváhagyása szükséges
 DocType: Salary Slip Timesheet,Working Hours,Munkaidő
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Megváltoztatni a kezdő / aktuális sorszámot egy meglévő sorozatban.
-DocType: Dosage Strength,Strength,Erő
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Hozzon létre egy új Vevőt
+DocType: Dosage Strength,Strength,Dózis
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Hozzon létre egy új Vevőt
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ha több árképzési szabály továbbra is fennáll, a felhasználók fel lesznek kérve, hogy a kézi prioritás beállítással orvosolják a konfliktusokat."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Beszerzési megrendelés létrehozása
 ,Purchase Register,Beszerzési Regisztráció
@@ -507,7 +518,7 @@
 DocType: Lab Test Template,Single,Egyedülálló
 DocType: Salary Slip,Total Loan Repayment,Összesen hitel visszafizetése
 DocType: Account,Cost of Goods Sold,Az eladott áruk beszerzési költsége
-DocType: Purchase Invoice,Yearly,Évi
+DocType: Subscription,Yearly,Évi
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,"Kérjük, adja meg a Költséghelyet"
 DocType: Drug Prescription,Dosage,Adagolás
 DocType: Journal Entry Account,Sales Order,Vevői rendelés
@@ -537,7 +548,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globális beállítások minden egyes gyártási folyamatra.
 DocType: Accounts Settings,Accounts Frozen Upto,A számlák be vannak fagyasztva eddig
 DocType: SMS Log,Sent On,Elküldve ekkor
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,{0} jellemzők többször kiválasztásra kerültek a jellemzők táblázatban
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,{0} jellemzők többször kiválasztásra kerültek a jellemzők táblázatban
 DocType: HR Settings,Employee record is created using selected field. ,Alkalmazott rekord jön létre a kiválasztott mezővel.
 DocType: Sales Order,Not Applicable,Nem értelmezhető
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Távollét törzsadat.
@@ -558,20 +569,20 @@
 DocType: Item Attribute,To Range,Tartományhoz
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Értékpapírok és betétek
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Nem lehet megváltoztatni az értékelési módszert, mivel vannak tranzakciók olyan tételekhez, amelyeknek nincs saját értékelési módszere"
-apps/erpnext/erpnext/config/healthcare.py +133,Test Sample Master.,Teszteld a minta mestert.
+apps/erpnext/erpnext/config/healthcare.py +133,Test Sample Master.,Teszt minta mester.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Összes kötelezően kiosztott távollétek
-DocType: Patient,AB Positive,AB pozitív
+DocType: Patient,AB Positive,AB Pozitív
 DocType: Job Opening,Description of a Job Opening,Leírás egy Állásajánlathoz
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Függő tevékenységek mára
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Függő tevékenységek mára
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Részvételi bejegyzés.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Bér összetevők a munkaidő jelenléti ív alapú bérhez.
 DocType: Sales Order Item,Used for Production Plan,Termelési tervhez használja
 DocType: Employee Loan,Total Payment,Teljes fizetés
 DocType: Manufacturing Settings,Time Between Operations (in mins),Műveletek közti idő (percben)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,"{0} {1} törlődik, így a művelet nem lehet végrehajtható"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,"{0} {1} törlődik, így a művelet nem lehet végrehajtható"
 DocType: Customer,Buyer of Goods and Services.,Vevő az árukra és szolgáltatásokra.
 DocType: Journal Entry,Accounts Payable,Beszállítóknak fizetendő számlák
-DocType: Patient,Allergies,Allergia
+DocType: Patient,Allergies,Allergiák
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +30,The selected BOMs are not for the same item,A kiválasztott darabjegyzékeket nem ugyanarra a tételre
 DocType: Supplier Scorecard Standing,Notify Other,Értesíts mást
 DocType: Vital Signs,Blood Pressure (systolic),Vérnyomás (szisztolés)
@@ -580,22 +591,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Vevői rendelések figyelmeztetése
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Felsorol egy pár vevőt. Ők lehetnek szervezetek vagy magánszemélyek.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Elég alkatrészek a megépítéshez
+DocType: POS Profile User,POS Profile User,POS profil felhasználó
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Közvetlen jövedelem
-DocType: Patient Appointment,Date TIme,Dátum idő
+DocType: Patient Appointment,Date TIme,Dátum Idő
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Nem tudja szűrni számla alapján, ha számlánként csoportosított"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Igazgatási tisztviselő
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,"Kérjük, válasszon pályát"
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,"Kérjük, válasszon pályát"
 DocType: Codification Table,Codification Table,Kodifikációs táblázat
 DocType: Timesheet Detail,Hrs,Óra
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,"Kérjük, válasszon Vállalkozást először"
 DocType: Stock Entry Detail,Difference Account,Különbség főkönyvi számla
 DocType: Purchase Invoice,Supplier GSTIN,Beszállító GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Nem zárható feladat, mivel a hozzá fűződő feladat: {0} nincs lezárva."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,"Kérjük, adja meg a Raktárat, amelyekre anyag igénylés keletkezett"
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Nem zárható feladat, mivel a hozzá fűződő feladat: {0} nincs lezárva."
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Kérjük, adja meg a Raktárat, amelyekre anyag igénylés keletkezett"
 DocType: Production Order,Additional Operating Cost,További üzemeltetési költség
-DocType: Lab Test Template,Lab Routine,Lab rutin
+DocType: Lab Test Template,Lab Routine,Labor rutin
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kozmetikum
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Egyesítéshez, a következő tulajdonságoknak meg kell egyeznie mindkét tételnél"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Egyesítéshez, a következő tulajdonságoknak meg kell egyeznie mindkét tételnél"
 DocType: Shipping Rule,Net Weight,Nettó súly
 DocType: Employee,Emergency Phone,Sürgősségi telefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Vásárol
@@ -605,7 +617,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Kérjük adja meg a küszöb fokozatát 0%
 DocType: Sales Order,To Deliver,Szállít
 DocType: Purchase Invoice Item,Item,Tétel
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Széria sz. tétel nem lehet egy törtrész
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Nagy érzékenység
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Széria sz. tétel nem lehet egy törtrész
 DocType: Journal Entry,Difference (Dr - Cr),Különbség (Dr - Cr)
 DocType: Account,Profit and Loss,Eredménykimutatás
 DocType: Patient,Risk Factors,Kockázati tényezők
@@ -614,7 +627,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Alvállalkozói munkák kezelése
 DocType: Vital Signs,Body Temperature,Testhőmérséklet
 DocType: Project,Project will be accessible on the website to these users,"Project téma elérhető lesz a honlapon, ezeknek a felhasználóknak"
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Határozza meg a Projekt téma típusát.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Határozza meg a Projekt téma típusát.
 DocType: Supplier Scorecard,Weighting Function,Súlyozási funkció
 DocType: Physician,OP Consulting Charge,OP tanácsadói díj
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Állítsa be a saját
@@ -628,20 +641,20 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Lépésköz nem lehet 0
 DocType: Production Planning Tool,Material Requirement,Anyagszükséglet
 DocType: Company,Delete Company Transactions,Vállalati tranzakciók törlése
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Hivatkozási szám és Referencia dátum kötelező a Banki tranzakcióhoz
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Hivatkozási szám és Referencia dátum kötelező a Banki tranzakcióhoz
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adók és költségek hozzáadása / szerkesztése
 DocType: Payment Entry Reference,Supplier Invoice No,Beszállítói számla száma
 DocType: Territory,For reference,Referenciaként
-DocType: Healthcare Settings,Appointment Confirmation,Kinevezés megerősítése
+DocType: Healthcare Settings,Appointment Confirmation,Vizit időpont megerősítése
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Nem lehet törölni a sorozatszámot: {0}, mivel ezt használja a részvény tranzakcióknál"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Zárás (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Helló
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Tétel mozgatása
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Tétel mozgatása
 DocType: Serial No,Warranty Period (Days),Garancia idő (nap)
 DocType: Installation Note Item,Installation Note Item,Telepítési feljegyzés Elem
-DocType: Production Plan Item,Pending Qty,Folyamatban db
+DocType: Production Plan Item,Pending Qty,Függőben lévő db
 DocType: Budget,Ignore,Mellőz
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} nem aktív
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} nem aktív
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Csekk méretek telepítése a nyomtatáshoz
 DocType: Salary Slip,Salary Slip Timesheet,Bérpapirok munkaidő jelenléti ívei
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Beszállító raktár kötelező  az alvállalkozók vásárlási nyugtájához
@@ -650,7 +663,7 @@
 DocType: Pricing Rule,Sales Partner,Vevő partner
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Összes Beszállító eredménymutatói.
 DocType: Buying Settings,Purchase Receipt Required,Beszerzési megrendelés nyugta kötelező
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Készletérték ár kötelező, ha nyitási készletet felvitt"
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,"Készletérték ár kötelező, ha nyitási készletet felvitt"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nem talált bejegyzést a számlatáblázat
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Kérjük, válasszon Vállalkozást és Ügyfél típust először"
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Pénzügyi / számviteli év.
@@ -687,7 +700,7 @@
 DocType: Quotation,Quotation To,Árajánlat az ő részére
 DocType: Lead,Middle Income,Közepes jövedelmű
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Nyitó (Követ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Alapértelmezett mértékegységét a {0} tételnek nem lehet megváltoztatni közvetlenül, mert már végzett néhány tranzakció(t) másik mértékegységgel. Szükséges lesz egy új tétel létrehozására, hogy egy másik alapértelmezett mértékegységet használhasson."
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Alapértelmezett mértékegységét a {0} tételnek nem lehet megváltoztatni közvetlenül, mert már végzett néhány tranzakció(t) másik mértékegységgel. Szükséges lesz egy új tétel létrehozására, hogy egy másik alapértelmezett mértékegységet használhasson."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Elkülönített összeg nem lehet negatív
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,"Kérjük, állítsa be a Vállalkozást"
 DocType: Purchase Order Item,Billed Amt,Számlázott össz.
@@ -695,12 +708,13 @@
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,A logikai Raktárkészlet amelyhez a készlet állomány bejegyzések történnek.
 DocType: Repayment Schedule,Principal Amount,Tőkeösszeg
 DocType: Employee Loan Application,Total Payable Interest,Összesen fizetendő kamat
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +59,Total Outstanding: {0},Összes kiemelkedő: {0}
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +59,Total Outstanding: {0},Összes kinntlevő: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Kimenő értékesítési számlák Munkaidő jelenléti ív nyilvántartója
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Hivatkozási szám és Referencia dátuma szükséges {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,"Válasszon Fizetési számlát, banki tétel bejegyzéshez"
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Készítsen Munkavállaló nyilvántartásokat a távollétek, költségtérítési igények és a bér kezeléséhez"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Vényköteles időszak
+DocType: Restaurant Reservation,Restaurant Reservation,Étterem foglalás
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Pályázatírás
 DocType: Payment Entry Deduction,Payment Entry Deduction,Fizetés megadásának levonása
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Egy másik Értékesítő személy {0} létezik a  azonos alkalmazotti azonosító Id-vel
@@ -708,7 +722,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Törzsadat adatok
 DocType: Assessment Plan,Maximum Assessment Score,Maximális értékelés pontszáma
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Frissítse a Banki Tranzakciók időpontjait
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Időkövetés
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Időkövetés
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,ISMÉTLŐDŐ FUVAROZÓRA
 DocType: Fiscal Year Company,Fiscal Year Company,Vállalkozás Pénzügyi éve
 DocType: Packing Slip Item,DN Detail,SZL részletek
@@ -716,8 +730,9 @@
 DocType: Timesheet,Billed,Számlázott
 DocType: Batch,Batch Description,Köteg leírás
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Diákcsoportok létrehozása
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Fizetési  átjáró számla nem jön létre, akkor hozzon létre egyet manuálisan."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Fizetési  átjáró számla nem jön létre, akkor hozzon létre egyet manuálisan."
 DocType: Supplier Scorecard,Per Year,Évente
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,A programban való részvételre nem jogosult DOB szerint
 DocType: Sales Invoice,Sales Taxes and Charges,Értékesítési adók és költségek
 DocType: Employee,Organization Profile,Szervezet profilja
 DocType: Vital Signs,Height (In Meter),Magasság (méterben)
@@ -751,9 +766,9 @@
 DocType: Issue,Resolution Date,Megoldás dátuma
 DocType: Lab Test Template,Compound,Összetett
 DocType: Student Batch Name,Batch Name,Köteg neve
-DocType: Fee Validity,Max number of visit,Max. Látogatás száma
+DocType: Fee Validity,Max number of visit,Látogatások max.  száma
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Munkaidő jelenléti ív nyilvántartás létrehozva:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},"Kérjük, állítsda be az alapértelmezett Készpénz vagy bankszámlát a  Fizetési módban {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},"Kérjük, állítsda be az alapértelmezett Készpénz vagy bankszámlát a  Fizetési módban {0}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,Beiratkozás
 DocType: GST Settings,GST Settings,GST Beállítások
 DocType: Selling Settings,Customer Naming By,Vevő elnevezés típusa
@@ -765,7 +780,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),Bázis óradíj (Vállalkozás pénznemében)
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Szállított érték
 DocType: Supplier,Fixed Days,Fix napok
-apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests,Lab tesztek
+apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests,Labor tesztek
 DocType: Quotation Item,Item Balance,Tétel egyenleg
 DocType: Sales Invoice,Packing List,Csomagolási lista
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Beszerzési megrendelés átadva a beszállítóknak.
@@ -779,22 +794,22 @@
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Nem találtam útvonalat erre
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +211,Opening (Dr),Nyitó (ÉCS.)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Kiküldetés időbélyegének ezutánina kell lennie {0}
-apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Ismétlődő dokumentumok készítése
+apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Ismétlődő dokumentumok létrehozása
 ,GST Itemised Purchase Register,GST tételes beszerzés regisztráció
 DocType: Employee Loan,Total Interest Payable,Összes fizetendő kamat
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Beszerzési költség adók és illetékek
 DocType: Production Order Operation,Actual Start Time,Tényleges kezdési idő
 DocType: BOM Operation,Operation Time,Működési idő
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Befejez
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Befejez
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Bázis
 DocType: Timesheet,Total Billed Hours,Összes számlázott Órák
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Leírt összeg
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Leírt összeg
 DocType: Leave Block List Allow,Allow User,Felhasználó engedélyezése
 DocType: Journal Entry,Bill No,Számlaszám
 DocType: Company,Gain/Loss Account on Asset Disposal,Nyereség / veszteség számla az Eszköz eltávolításán
 DocType: Vehicle Log,Service Details,Sszolgáltatás adatai
-DocType: Purchase Invoice,Quarterly,Negyedévenként
-DocType: Lab Test Template,Grouped,csoportosított
+DocType: Subscription,Quarterly,Negyedévenként
+DocType: Lab Test Template,Grouped,Csoportosított
 DocType: Selling Settings,Delivery Note Required,Szállítólevél szükséges
 DocType: Bank Guarantee,Bank Guarantee Number,Bankgarancia száma
 DocType: Assessment Criteria,Assessment Criteria,Értékelési kritériumok
@@ -802,12 +817,12 @@
 DocType: Student Attendance,Student Attendance,Tanuló Nézőszám
 DocType: Sales Invoice Timesheet,Time Sheet,Jelenléti ív
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Visszatartandó nyersanyagok ez alapján
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,"Kérjük, adja meg a tétel részleteit"
 DocType: Interest,Interest,Érdek
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Értékesítés előtt
 DocType: Purchase Receipt,Other Details,Egyéb részletek
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Beszállító
 DocType: Lab Test,Test Template,Teszt sablon
+DocType: Restaurant Order Entry Item,Served,szolgált
 DocType: Account,Accounts,Főkönyvi számlák
 DocType: Vehicle,Odometer Value (Last),Kilométer-számláló érték (utolsó)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,A beszállító eredménymutató-kritériumainak sablonjai.
@@ -819,44 +834,45 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Bérpapír előnézet
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,A {0} számlát már többször bevitték
 DocType: Account,Expenses Included In Valuation,Készletértékelésbe belevitt költségek
-DocType: Hub Settings,Seller City,Eladó városa
 ,Absent Student Report,Jelentés a hiányzó tanulókról
 DocType: Email Digest,Next email will be sent on:,A következő emailt ekkor küldjük:
 DocType: Offer Letter Term,Offer Letter Term,Ajánlati levél feltétele
 DocType: Supplier Scorecard,Per Week,Hetente
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Tételnek változatok.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Tételnek változatok.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Teljes hallgató
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Tétel {0} nem található
 DocType: Bin,Stock Value,Készlet értéke
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,A háttérrekordok létrehozása a háttérben történik. Bármely hiba esetén a hibaüzenet az ütemtervben frissül.
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,A díj összeg rekordok létrehozása a háttérben történik. Bármely hiba esetén a hibaüzenet az ütemtervben frissül.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Vállalkozás {0} nem létezik
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},A (z) {0} díjszabás érvényessége {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},A(z) {0} díjszabás érvényessége eddig: {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Fa Típus
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Darabonként felhasznált mennyiség
 DocType: Serial No,Warranty Expiry Date,Garancia lejárati dátuma
 DocType: Material Request Item,Quantity and Warehouse,Mennyiség és raktár
+DocType: Hub Settings,Unregister,unregister
 DocType: Sales Invoice,Commission Rate (%),Jutalék mértéke (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,"Kérjük, válassza ki a Program"
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,"Kérjük, válassza ki a Program"
 DocType: Project,Estimated Cost,Becsült költség
 DocType: Purchase Order,Link to material requests,Hivatkozás az anyagra kérésekre
+DocType: Hub Settings,Publish,közzétesz
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Repülőgép-és űripar
 DocType: Journal Entry,Credit Card Entry,Hitelkártya bejegyzés
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Vállakozás és fiókok
-apps/erpnext/erpnext/config/healthcare.py +108,Appointment Type Master,Kinevezési típus Mester
+apps/erpnext/erpnext/config/healthcare.py +108,Appointment Type Master,Vizit időpont fő típus
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,Beszállítóktól kapott áruk.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +58,In Value,Az Értékben
 DocType: Lead,Campaign Name,Kampány neve
 DocType: Selling Settings,Close Opportunity After Days,Ügyek bezárása ennyi eltelt nap után
 ,Reserved,Fenntartott
 DocType: Purchase Order,Supply Raw Materials,Nyersanyagok beszállítása
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Az időpont, amikor a következő számla előállításra kerül. A benyújáskor kerül létrehozásra."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Jelenlegi eszközök
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} nem Készletezhető tétel
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',"Kérjük, ossza meg visszajelzését a képzéshez az ""Oktatás visszajelzése"", majd az ""Új"" kattintva"
 DocType: Mode of Payment Account,Default Account,Alapértelmezett számla
 DocType: Payment Entry,Received Amount (Company Currency),Beérkezett összeg (Vállalkozás pénzneme)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,"Érdeklődést kell beállítani, ha a Lehetőséget az Érdeklődésből hozta létre"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,"Érdeklődést kell beállítani, ha a Lehetőséget az Érdeklődésből hozta létre"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Kérjük, válassza ki a heti munkaszüneti napot"
-DocType: Patient,O Negative,O negatív
+DocType: Patient,O Negative,O Negatív
 DocType: Production Order Operation,Planned End Time,Tervezett befejezési idő
 ,Sales Person Target Variance Item Group-Wise,Értékesítői Cél Variance tétel Group-Wise
 apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Meglévő tranzakcióval rendelkező számla nem konvertálható főkönyvi számlává.
@@ -870,22 +886,22 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Lehetőség tőle
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Havi kimutatást.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Vállalat hozzáadása
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{0} sor: {1} A {2} tételhez szükséges sorozatszámok. Ön ezt adta meg {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{0} sor: {1} A {2} tételhez szükséges sorozatszámok. Ön ezt adta meg {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Válasszon egy táblát
 DocType: BOM,Website Specifications,Weboldal részletek
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} egy érvénytelen e-mail cím a 'Címzettek' közt
-DocType: Special Test Items,Particulars,adatok
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} egy érvénytelen e-mail cím a 'Címzettek' közt
+DocType: Special Test Items,Particulars,Adatok
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiotikum.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Feladó {0} a {1} típusból
 DocType: Warranty Claim,CI-,GI-
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Row {0}: Conversion Factor kötelező
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Több Ár szabályzat létezik azonos kritériumokkal, kérjük megoldani konfliktust az elsőbbségek kiadásával. Ár Szabályok: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nem lehet kikapcsolni vagy törölni az Anyagjegyzéket mivel kapcsolódik más Darabjegyzékekhez
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nem lehet kikapcsolni vagy törölni az Anyagjegyzéket mivel kapcsolódik más Darabjegyzékekhez
 DocType: Opportunity,Maintenance,Karbantartás
 DocType: Item Attribute Value,Item Attribute Value,Tétel Jellemző értéke
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Értékesítési kampányok.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Munkaidő jelenléti ív létrehozás
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Munkaidő jelenléti ív létrehozás
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -910,10 +926,10 @@
 DocType: Bank Guarantee,Project,Projekt téma
 DocType: Quality Inspection Reading,Reading 7,Olvasás 7
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,részben rendezett
-DocType: Lab Test,Lab Test,Lab Test
+DocType: Lab Test,Lab Test,Labor Teszt
 DocType: Expense Claim Detail,Expense Claim Type,Költség igény típusa
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Alapértelmezett beállítások a Kosárhoz
-apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +26,Add Timeslots,Add hozzá Timeslots
+apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +26,Add Timeslots,Adja hozzá az időszakaszokat
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Vagyonieszköz kiselejtezett a {0} Naplókönyvelés keresztül
 DocType: Employee Loan,Interest Income Account,Kamatbevétel főkönyvi számla
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotechnológia
@@ -923,13 +939,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,"Kérjük, adja meg először a tételt"
 DocType: Account,Liability,Kötelezettség
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Szentesített összeg nem lehet nagyobb, mint az igény összege ebben a sorban {0}."
+DocType: Salary Detail,Do not include in total,Ne szerepeljen összesen
 DocType: Company,Default Cost of Goods Sold Account,Alapértelmezett önköltség fiók
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Árlista nincs kiválasztva
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Árlista nincs kiválasztva
 DocType: Employee,Family Background,Családi háttér
 DocType: Request for Quotation Supplier,Send Email,E-mail küldése
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Figyelmeztetés: Érvénytelen csatolmány {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Nincs jogosultság
-DocType: Vital Signs,Heart Rate / Pulse,Pulzusszám / impulzus
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Figyelmeztetés: Érvénytelen csatolmány {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Nincs jogosultság
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Ajánlatkérés
+DocType: Vital Signs,Heart Rate / Pulse,Pulzusszám / pulzus
 DocType: Company,Default Bank Account,Alapértelmezett bankszámlaszám
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Az Ügyfél alapján kiszűrni, válasszuk ki az Ügyfél típpust először"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Készlet frissítés' nem ellenőrizhető, mert a tételek nem lettek elszállítva ezzel: {0}"
@@ -955,12 +973,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Tétel sor {idx}: {doctype} {docname} nem létezik a fenti '{doctype}' táblában
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Jelenléti ív {0} már befejezett vagy törölt
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Nincsenek feladatok
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","A hónap napja, amelyen a számla automatikusan jön létre pl 05, 28 stb"
-DocType: Item Variant Settings,Copy Fields to Variant,Mezők másolása a változathoz
+DocType: Item Variant Settings,Copy Fields to Variant,Másolási mezők a változathoz
 DocType: Asset,Opening Accumulated Depreciation,Nyitva halmozott ÉCS
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Pontszám legyen kisebb vagy egyenlő mint 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Beiratkozási eszköz
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C-Form bejegyzések
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C-Form bejegyzések
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Vevő és Beszállító
 DocType: Email Digest,Email Digest Settings,Email összefoglaló beállításai
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Köszönjük a közreműködését!
@@ -978,13 +995,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Árajánlat állapota
 DocType: Maintenance Visit,Completion Status,Készültségi állapot
 DocType: HR Settings,Enter retirement age in years,Adja meg a nyugdíjkorhatárt (év)
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Cél raktár
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,"Kérjük, válasszon egy raktárat"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Cél raktár
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,"Kérjük, válasszon egy raktárat"
 DocType: Cheque Print Template,Starting location from left edge,Kiindulási hely a bal éltől
 DocType: Item,Allow over delivery or receipt upto this percent,Szállítás címzettnek vagy átvétel nyugtázás engedélyezése eddig a százalékig
 DocType: Stock Entry,STE-,KÉSZLBEJ-
 DocType: Upload Attendance,Import Attendance,Jelenlét Import
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Összes tétel csoport
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Összes tétel csoport
 DocType: Process Payroll,Activity Log,Tevékenység napló
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Nettó nyereség / veszteség
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatikusan ír üzenetet a benyújtott  tranzakciókra.
@@ -995,8 +1012,9 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Beszerzési Megrendelést Kifizetésre
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Tervezett mennyiség
 DocType: Sales Invoice,Payment Due Date,Fizetési határidő
-DocType: Drug Prescription,Interval UOM,Intervallum UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Tétel variáció {0} már létezik azonos Jellemzővel
+DocType: Drug Prescription,Interval UOM,Intervallum mértékegysége
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Tétel variáció {0} már létezik azonos Jellemzővel
+DocType: Item,Hub Publishing Details,Központok közzétételének részletei
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',"""Nyitás"""
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Nyitott teendő
 DocType: Notification Control,Delivery Note Message,Szállítólevél szövege
@@ -1016,15 +1034,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,"ANYAGJ # {0}: A nyersanyag nem lehet ugyanaz, mint a fő elem"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Összesen alkalmazandó díjak a vásárlási nyugta tételek táblázatban egyeznie kell az Összes adókkal és illetékekkel
 DocType: Sales Team,Incentives,Ösztönzők
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Regisztrálj a Hub-hoz
 DocType: SMS Log,Requested Numbers,Kért számok
 DocType: Production Planning Tool,Only Obtain Raw Materials,Csak nyersanyagokat szerezhet be
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Teljesítményértékelési rendszer.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","A 'Kosár használata' engedélyezése, mint kosár bekapcsolása, mely mellett ott kell lennie legalább egy adó szabálynak a Kosárra vonatkozólag"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","A 'Kosár használata' engedélyezése, mint kosár bekapcsolása, mely mellett ott kell lennie legalább egy adó szabálynak a Kosárra vonatkozólag"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Fizetés megadása {0} kapcsolódik ehhez a Rendeléshez {1}, jelülje be, ha ezen a számlán előlegként kerül lehívásra."
 DocType: Sales Invoice Item,Stock Details,Készlet Részletek
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt téma érték
 apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Értékesítés-hely-kassza
-DocType: Fee Schedule,Fee Creation Status,Díjteremtési állapot
+DocType: Fee Schedule,Fee Creation Status,Díj létrehozási állapot
 DocType: Vehicle Log,Odometer Reading,Kilométer-számláló állását
 apps/erpnext/erpnext/accounts/doctype/account/account.py +119,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Számlaegyenleg már tőlünk követel, akkor nem szabad beállítani ""Ennek egyenlege""-t,  ""Nekünk tartozik""-ra"
 DocType: Account,Balance must be,Mérlegnek kell lenni
@@ -1033,17 +1052,19 @@
 ,Available Qty,Elérhető Menny.
 DocType: Purchase Taxes and Charges,On Previous Row Total,Előző sor összeshez
 DocType: Purchase Invoice Item,Rejected Qty,Elutasított db
-DocType: Setup Progress Action,Action Field,Cselekvési terület
+DocType: Setup Progress Action,Action Field,Műveleti terület
 DocType: Healthcare Settings,Manage Customer,Ügyfél kezelése
 DocType: Salary Slip,Working Days,Munkanap
 DocType: Serial No,Incoming Rate,Bejövő ár
 DocType: Packing Slip,Gross Weight,Bruttó súly
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,"A vállalkozásának a neve, amelyre ezt a rendszert beállítja."
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Hub engedélyezése
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,"A vállalkozásának a neve, amelyre ezt a rendszert beállítja."
 DocType: HR Settings,Include holidays in Total no. of Working Days,A munkanapok számának összege tartalmazza az ünnepnapokat
 DocType: Job Applicant,Hold,Tart
 DocType: Employee,Date of Joining,Csatlakozás dátuma
 DocType: Naming Series,Update Series,Sorszámozás frissítése
 DocType: Supplier Quotation,Is Subcontracted,Alvállalkozó által feldolgozandó?
+DocType: Restaurant Table,Minimum Seating,Minimális ülések
 DocType: Item Attribute,Item Attribute Values,Tétel Jellemző értékekben
 DocType: Examination Result,Examination Result,Vizsgálati eredmény
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Beszerzési megrendelés nyugta
@@ -1054,13 +1075,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Nem található a Időkeret a következő {0} napokra erre a műveletre: {1}
 DocType: Production Order,Plan material for sub-assemblies,Terv anyag a részegységekre
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Vevő partnerek és Területek
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,ANYGJZ: {0} aktívnak kell lennie
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,ANYGJZ: {0} aktívnak kell lennie
 DocType: Journal Entry,Depreciation Entry,ÉCS bejegyzés
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Kérjük, válassza ki a dokumentum típusát először"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Törölje az anyag szemlét: {0}mielőtt törölné ezt a karbantartási látogatást
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Széria sz {0} nem tartozik ehhez a tételhez {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Kötelező Mennyiség
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Raktárak meglévő ügyletekkel nem konvertálható főkönyvi tétellé.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Raktárak meglévő ügyletekkel nem konvertálható főkönyvi tétellé.
 DocType: Bank Reconciliation,Total Amount,Összesen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internetes közzététel
 DocType: Prescription Duration,Number,Szám
@@ -1070,8 +1091,7 @@
 DocType: Lab Test,Lab Technician,Laboratóriumi technikus
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Értékesítési árlista
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
-Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Ha be van jelölve, létrejön egy ügyfél, amely a Betegre van leképezve. Beteg számlákat hoz létre ezzel az Ügyféllel szemben. Kiválaszthatja a meglévő ügyfelet is, amikor létrehozza a betegeket."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Közzéteszi a tételek szinkronizálásához
+Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Ha be van jelölve, létrejön egy ügyfél, amely a Betegre van leképezve. Beteg számlákat hoz létre erre az Ügyfélre. Kiválaszthatja a meglévő ügyfelet is, amikor létrehozza a betegeket."
 DocType: Bank Reconciliation,Account Currency,A fiók pénzneme
 DocType: Lab Test,Sample ID,Mintaazonosító
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Kérjük említse meg a Gyűjtőt számlát a Vállalkozáson bellül
@@ -1080,11 +1100,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,"Alkalmazott {0} nem aktív, vagy nem létezik"
 DocType: Fee Structure,Components,Alkatrészek
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},"Kérjük, adja meg a Vagyontárgy Kategóriát ebben a tételben: {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Tétel változatok {0} frissített
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Tétel változatok {0} frissített
 DocType: Quality Inspection Reading,Reading 6,Olvasás 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Nem lehet a {0} {1} {2} bármely negatív fennmaradó számla nélkül
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","generálni kell. Ha késik, akkor manuálisan meg kell változtatni a &quot;Hónapnap ismétlése&quot; mezőt"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Nem lehet a {0} {1} {2} bármely negatív fennmaradó számla nélkül
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Beszállítói előleg számla
-DocType: Hub Settings,Sync Now,Szinkronizálás most
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},{0} sor: jóváírást bejegyzés nem kapcsolódik ehhez {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Adjuk költségvetést a pénzügyi évhez.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Alapértelmezett Bank / Készpénz fiók automatikusan frissítésra kerül a POS számlában, ha ezt a módot választotta."
@@ -1096,13 +1117,13 @@
 DocType: Item,Is Purchase Item,Ez beszerzendő tétel
 DocType: Asset,Purchase Invoice,Beszállítói számla
 DocType: Stock Ledger Entry,Voucher Detail No,Utalvány Részletei Sz.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Új értékesítési számla
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Új értékesítési számla
 DocType: Stock Entry,Total Outgoing Value,Összes kimenő Érték
-DocType: Physician,Appointments,kinevezések
+DocType: Physician,Appointments,Vizit időpontok
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Nyitás dátumának és zárás dátumának  ugyanazon üzleti évben kell legyenek
 DocType: Lead,Request for Information,Információkérés
 ,LeaderBoard,Ranglista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Offline számlák szinkronizálása
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Offline számlák szinkronizálása
 DocType: Payment Request,Paid,Fizetett
 DocType: Program Fee,Program Fee,Program díja
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1121,11 +1142,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Beszerzési megrendelés tétel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Közvetett jövedelem
 DocType: Student Attendance Tool,Student Attendance Tool,Tanuló nyilvántartó eszköz
+DocType: Restaurant Menu,Price List (Auto created),Árlista (Auto létrehozva)
 DocType: Cheque Print Template,Date Settings,Dátum beállítások
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variancia
 ,Company Name,Válallkozás neve
 DocType: SMS Center,Total Message(s),Összes üzenet(ek)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Válassza ki a tételt az átmozgatáshoz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Válassza ki a tételt az átmozgatáshoz
 DocType: Purchase Invoice,Additional Discount Percentage,További kedvezmény százalék
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Minden súgó video megtekintése
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Válassza ki a a bank fiók vezetőjéet, ahol a csekket letétbe rakta."
@@ -1142,6 +1164,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Méter
 DocType: Workstation,Electricity Cost,Villamosenergia-költség
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne küldjön alkalmazotti születésnap emlékeztetőt
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Beállítások mentése
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Kért termékek
 DocType: Item,Inspection Criteria,Vizsgálati szempontok
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Átvitt
 DocType: BOM Website Item,BOM Website Item,Anyagjegyzék honlap tétel
@@ -1158,11 +1182,11 @@
 DocType: Journal Entry,Total Amount in Words,Teljes összeg kiírva
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Hiba történt. Az egyik valószínű oka az lehet, hogy nem mentette az űrlapot. Kérjük, forduljon support@erpnext.com ha a probléma továbbra is fennáll."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Kosaram
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Megrendelni típusa ezek közül kell legyen: {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Megrendelni típusa ezek közül kell legyen: {0}
 DocType: Lead,Next Contact Date,Következő megbeszélés dátuma
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Nyitó Mennyiség
-DocType: Healthcare Settings,Appointment Reminder,Találkozó emlékeztető
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,"Kérjük, adja meg a Számlát a váltópénz összeghez"
+DocType: Healthcare Settings,Appointment Reminder,Vizit időpont emlékeztető
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,"Kérjük, adja meg a Számlát a váltópénz összeghez"
 DocType: Student Batch Name,Student Batch Name,Tanuló kötegnév
 DocType: Consultation,Doctor,Orvos
 DocType: Holiday List,Holiday List Name,Szabadnapok listájának neve
@@ -1170,12 +1194,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Menetrend pálya
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Készlet lehetőségek
 DocType: Journal Entry Account,Expense Claim,Költség igény
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Tényleg szeretné visszaállítani ezt a kiselejtezett eszközt?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Mennyiség ehhez: {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Tényleg szeretné visszaállítani ezt a kiselejtezett eszközt?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Mennyiség ehhez: {0}
 DocType: Leave Application,Leave Application,Távollét alkalmazás
 DocType: Patient,Patient Relation,Beteg kapcsolat
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Távollét Lefoglaló Eszköz
+DocType: Item,Hub Category to Publish,Közzétételi kategória
 DocType: Leave Block List,Leave Block List Dates,Távollét blokk lista dátumok
+DocType: Sales Invoice,Billing Address GSTIN,Számlázási cím GSTIN
 DocType: Workstation,Net Hour Rate,Nettó óra bér
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Beszerzési költség vásárlási nyugta
 DocType: Company,Default Terms,Alapértelmezett feltételek
@@ -1185,18 +1211,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Kérjük adjon meg egy {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Az eltávolított elemek változása nélkül mennyiséget vagy értéket.
 DocType: Delivery Note,Delivery To,Szállítás címzett
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Jellemzők tábla kötelező
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Jellemzők tábla kötelező
 DocType: Production Planning Tool,Get Sales Orders,Vevő rendelések lekérése
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} nem lehet negatív
 DocType: Training Event,Self-Study,Önálló tanulás
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Kedvezmény
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Kedvezmény
 DocType: Asset,Total Number of Depreciations,Összes amortizációk száma
 DocType: Sales Invoice Item,Rate With Margin,Érték árkülöbözettel
 DocType: Workstation,Wages,Munkabér
 DocType: Task,Urgent,Sürgős
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},"Kérjük adjon meg egy érvényes Sor ID azonosítót ehhez a sorhoz {0}, ebben a  táblázatban {1}"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Nem sikerült megtalálni a változót:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,"Kérjük, válasszon ki egy mezőt a számjegyből történő szerkesztéshez"
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,"Kérjük, válasszon ki egy mezőt a számjegyből történő szerkesztéshez"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Ugrás az asztalra és kezdje el használni az ERPNext rendszert
 DocType: Item,Manufacturer,Gyártó
 DocType: Landed Cost Item,Purchase Receipt Item,Beszerzési megrendelés nyugta tétel
@@ -1208,7 +1234,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +109,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Te vagy a költség Jóváhagyó erre a bejegyzésre. Kérjük ""Állapot"" frissítsen és ""Mentés"""
 DocType: Serial No,Creation Document No,Létrehozott Dokumentum sz.
 DocType: Issue,Issue,Probléma
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation_dashboard.py +11,Records,Records
+apps/erpnext/erpnext/healthcare/doctype/consultation/consultation_dashboard.py +11,Records,Rögzítések
 DocType: Asset,Scrapped,Selejtezve
 apps/erpnext/erpnext/config/stock.py +200,"Attributes for Item Variants. e.g Size, Color etc.","Tétel változatok Jellemzői. pl méret, szín stb"
 DocType: Purchase Invoice,Returns,Visszatér
@@ -1227,8 +1253,8 @@
 DocType: GL Entry,Against,Ellen
 DocType: Item,Default Selling Cost Center,Alapértelmezett Értékesítési költséghely
 DocType: Sales Partner,Implementation Partner,Kivitelező partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Irányítószám
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Vevői rendelés {0} az ez {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Irányítószám
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Vevői rendelés {0} az ez {1}
 DocType: Opportunity,Contact Info,Kapcsolattartó infó
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Készlet bejegyzés létrehozás
 DocType: Packing Slip,Net Weight UOM,Nettó súly mértékegysége
@@ -1239,6 +1265,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Heti távollétek lekérdezése
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,"A befejezés dátuma nem lehet kevesebb, mint az elkezdés dátuma"
 DocType: Sales Person,Select company name first.,Válassza ki a vállakozás nevét először.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Alacsony és magas
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Beszállítóktól kapott árajánlatok.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,"Helyezze vissza a ANYAGJ-et, és frissítse a legújabb árat minden ANYAGJ-ben"
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Címzett {0} | {1} {2}
@@ -1257,7 +1284,7 @@
 DocType: Program Enrollment,Transportation,Szállítás
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Érvénytelen Jellemző
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} be kell nyújtani
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Mennyiségnek kisebb vagy egyenlő legyen mint {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Mennyiségnek kisebb vagy egyenlő legyen mint {0}
 DocType: SMS Center,Total Characters,Összes karakterek
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},"Kérjük, válasszon ANYGJZ az ANYGJZ mezőben erre a tételre {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Számla részlete
@@ -1272,7 +1299,7 @@
 ,Ordered Items To Be Billed,Számlázandó Rendelt mennyiség
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Tartományból távolságnak kisebbnek kell lennie mint a Tartományba
 DocType: Global Defaults,Global Defaults,Általános beállítások
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Project téma Együttműködés Meghívó
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Project téma Együttműködés Meghívó
 DocType: Salary Slip,Deductions,Levonások
 DocType: Leave Allocation,LAL/,TAVKIOSZT/
 DocType: Setup Progress Action,Action Name,Művelet neve
@@ -1290,13 +1317,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Kimenő értékesítési számla előleg
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Nincs mit igényelni
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},"Egy másik költségvetési rekord ""{0}"" már létezik az {1} '{2}' ellen, ebben a pénzügyi évben {3}"
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"'Tényleges kezdési dátum' nem lehet nagyobb, mint a 'Tényleges záró dátum'"
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"'Tényleges kezdési dátum' nem lehet nagyobb, mint a 'Tényleges záró dátum'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Vezetés
 DocType: Cheque Print Template,Payer Settings,Fizetői beállítások
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ez lesz hozzáfűzve a termék egy varióciájához. Például, ha a rövidítés ""SM"", és a tételkód ""T-shirt"", a tétel kód variánsa ez lesz ""SM feliratú póló"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettó fizetés (szavakkal) lesz látható, ha mentette a Bérpapírt."
 DocType: Purchase Invoice,Is Return,Ez visszáru
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Vigyázat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Vigyázat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Vissza / terhelési értesítés
 DocType: Price List Country,Price List Country,Árlista Országa
 DocType: Item,UOMs,Mértékegységek
@@ -1311,17 +1338,18 @@
 DocType: Account,Balance Sheet,Mérleg
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Költséghely tételhez ezzel a tétel kóddal '
 DocType: Fee Validity,Valid Till,Eddig érvényes
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Fizetési mód nincs beállítva. Kérjük, ellenőrizze, hogy a fiók be lett állítva a fizetési módon, vagy POS profilon."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Fizetési mód nincs beállítva. Kérjük, ellenőrizze, hogy a fiók be lett állítva a fizetési módon, vagy POS profilon."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Ugyanazt a tételt nem lehet beírni többször.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","További számlákat a Csoportok alatt hozhat létre, de bejegyzéseket lehet tenni a csoporttal nem rendelkezőkre is"
 DocType: Lead,Lead,Érdeklődés
 DocType: Email Digest,Payables,Kötelezettségek
 DocType: Course,Course Intro,Tanfolyam Intro
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Készlet bejegyzés: {0} létrehozva
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Kérjük, állítsa be a számozási sorozatot a részvételhez a Beállítás&gt; Számozási sorozatok segítségével"
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Készlet bejegyzés: {0} létrehozva
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Sor # {0}: Elutasítva Menny nem lehet beírni Vásárlási Return
 ,Purchase Order Items To Be Billed,Számlázandó Beszerzési rendelés tételei
 DocType: Purchase Invoice Item,Net Rate,Nettó ár
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,"Kérjük, válasszon ki egy vevőt"
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,"Kérjük, válasszon ki egy vevőt"
 DocType: Purchase Invoice Item,Purchase Invoice Item,Beszerzés számla tétel
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Készlet könyvelés bejegyzések és GL bejegyzések újra könyvelésével a kiválasztott Beszerzési bevételezési nyuktákkal
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,1. tétel
@@ -1340,7 +1368,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},{0} ismétlődő sor azonos ezzel: {1}
 ,Trial Balance,Főkönyvi kivonat egyenleg
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Pénzügyi év {0} nem található
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Alkalmazottak beállítása
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Alkalmazottak beállítása
 DocType: Sales Order,SO-,VR-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,"Kérjük, válasszon prefix először"
 DocType: Employee,O-,ALK-
@@ -1352,12 +1380,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Főkönyvi kivonat megtekintése
 DocType: Grading Scale,Intervals,Periódusai
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Legkorábbi
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Egy tétel csoport létezik azonos névvel, kérjük, változtassa meg az tétel nevét, vagy nevezze át a tétel-csoportot"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Egy tétel csoport létezik azonos névvel, kérjük, változtassa meg az tétel nevét, vagy nevezze át a tétel-csoportot"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Tanuló Mobil sz.
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,A világ többi része
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,A világ többi része
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,A tétel {0} nem lehet Köteg
 ,Budget Variance Report,Költségvetés variáció jelentés
 DocType: Salary Slip,Gross Pay,Bruttó bér
+DocType: Item,Is Item from Hub,A csomagra vonatkozó elem
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Sor {0}: tevékenység típusa kötelező.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Fizetett osztalék
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Számviteli Főkönyvi kivonat
@@ -1367,8 +1396,9 @@
 DocType: Vehicle Log,Service Detail,Szolgáltatás részletei
 DocType: BOM,Item Description,Az anyag leírása
 DocType: Student Sibling,Student Sibling,Tanuló Testvér
-DocType: Purchase Invoice,Is Recurring,Ez ismétlődő
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Fizetési mód
 DocType: Purchase Invoice,Supplied Items,Beszáliíott tételek
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Állítson be egy aktív menüt a Restaurant {0}
 DocType: Student,STUD.,Tanuló.
 DocType: Production Order,Qty To Manufacture,Menny. gyártáshoz
 DocType: Email Digest,New Income,Új jövedelem
@@ -1378,6 +1408,7 @@
 ,Student and Guardian Contact Details,Diák- és Helyettesítő Elérhetőségek
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Sor {0}: A beszállító {0} e-mail címe szükséges e-mail küldéshez
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Ideiglenes nyitó
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Hub nézete
 ,Employee Leave Balance,Alkalmazott távollét egyenleg
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Mérlegek a {0} számlákhoz legyenek mindig {1}
 DocType: Patient Appointment,More Info,További információk
@@ -1397,13 +1428,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Vevői rendelés {0} nem érvényes
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Figyelmeztetés az új Ajánlatkéréshez
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Beszerzési megrendelések segítenek megtervezni és követni a beszerzéseket
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Sajnáljuk, a vállalkozásokat nem lehet összevonni,"
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Laboratóriumi tesztek
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Sajnáljuk, a vállalkozásokat nem lehet összevonni,"
+apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Laboratóriumi teszt rendelvények
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}","A teljes Probléma / Átvitt mennyiség {0} ebben az Anyaga igénylésben: {1} \ nem lehet nagyobb, mint az igényelt mennyiség: {2} erre a tételre: {3}"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Kis
 DocType: Employee,Employee Number,Alkalmazott száma
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Eset szám(ok) már használatban vannak. Próbálja ettől az esetszámtól: {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Eset szám(ok) már használatban vannak. Próbálja ettől az esetszámtól: {0}
 DocType: Project,% Completed,% kész
 ,Invoiced Amount (Exculsive Tax),Számlázott összeg (Adó nélkül)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,2. tétel
@@ -1418,11 +1449,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Közvetett költségek
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Sor {0}: Menny. kötelező
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Mezőgazdaság
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Törzsadatok szinkronizálása
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Törzsadatok szinkronizálása
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,A termékei vagy szolgáltatásai
 DocType: Special Test Items,Special Test Items,Különleges vizsgálati tételek
 DocType: Mode of Payment,Mode of Payment,Fizetési mód
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Weboldal kép legyen nyilvános fájl vagy weboldal URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Weboldal kép legyen nyilvános fájl vagy weboldal URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,ANYGJZ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,"Ez egy gyökér tétel-csoport, és nem lehet szerkeszteni."
@@ -1430,24 +1461,23 @@
 DocType: Vehicle,Fuel UOM,Üzemanyag mértékegység
 DocType: Warehouse,Warehouse Contact Info,Raktári kapcsolattartó
 DocType: Payment Entry,Write Off Difference Amount,Leíró Eltérés összeg
-DocType: Purchase Invoice,Recurring Type,Gyakoriság
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: Alkalmazott email nem található, ezért nem küldte email"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: Alkalmazott email nem található, ezért nem küldte email"
 DocType: Item,Foreign Trade Details,Külkereskedelem Részletei
+,Assessment Plan Status,Értékelési terv állapota
 DocType: Email Digest,Annual Income,Éves jövedelem
 DocType: Serial No,Serial No Details,Széria sz. adatai
 DocType: Purchase Invoice Item,Item Tax Rate,A tétel adójának mértéke
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,Kérem válassza ki az orvos és a dátumot
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,Kérem válassza ki az orvost és a dátumot
 DocType: Student Group Student,Group Roll Number,Csoport regisztrációs száma
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0} -hoz, csak jóváírási számlákat lehet kapcsolni a másik ellen terheléshez"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Összesen feladat súlyozása legyen 1. Kérjük, állítsa a súlyozást minden projekt feladataira ennek megfelelően"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,A {0} Szállítólevelet nem nyújtották be
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Összesen feladat súlyozása legyen 1. Kérjük, állítsa a súlyozást minden projekt feladataira ennek megfelelően"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,A {0} Szállítólevelet nem nyújtották be
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Tétel {0} kell egy Alvállalkozásban Elem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Alap Felszereltség
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Árképzési szabályt először 'Alkalmazza ezen' mező alapján kiválasztott, ami lehet tétel, pont-csoport vagy a márka."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,"Kérjük, először állítsa be a tételkódot"
-DocType: Hub Settings,Seller Website,Eladó Website
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,"Kérjük, először állítsa be a tételkódot"
 DocType: Item,ITEM-,TÉTEL-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Az értékesítési csapat teljes lefoglalt százaléka  100 kell legyen
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Az értékesítési csapat teljes lefoglalt százaléka  100 kell legyen
 DocType: Sales Invoice Item,Edit Description,Leírás szerkesztése
 DocType: Antibiotic,Antibiotic,Antibiotikum
 ,Team Updates,Csapat frissítések
@@ -1461,19 +1491,19 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Összes kimenő
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +47,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Csak egy Szállítási szabály feltétel lehet 0 vagy üres értékkel az ""értékeléshez"""
 DocType: Authorization Rule,Transaction,Tranzakció
-DocType: Patient Appointment,Duration,tartam
+DocType: Patient Appointment,Duration,Tartam
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Megjegyzés: Ez a költséghely egy csoport. Nem tud könyvelési tételeket csoportokkal szemben létrehozni.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Al raktár létezik ebben a raktárban. Nem lehet törölni a raktárban.
 DocType: Item,Website Item Groups,Weboldal tétel Csoportok
 DocType: Purchase Invoice,Total (Company Currency),Összesen (a cég pénznemében)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Széria sz. {0} többször bevitt
 DocType: Depreciation Schedule,Journal Entry,Könyvelési tétel
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} tétel(ek) folyamatban
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} tétel(ek) folyamatban
 DocType: Workstation,Workstation Name,Munkaállomás neve
 DocType: Grading Scale Interval,Grade Code,Osztály kód
 DocType: POS Item Group,POS Item Group,POS tétel csoport
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Összefoglaló email:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},ANYGJZ {0} nem tartozik ehhez az elemhez: {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},ANYGJZ {0} nem tartozik ehhez az elemhez: {1}
 DocType: Sales Partner,Target Distribution,Cél felosztás
 DocType: Salary Slip,Bank Account No.,Bankszámla szám
 DocType: Naming Series,This is the number of the last created transaction with this prefix,"Ez az a szám, az ilyen előtaggal utoljára létrehozott tranzakciónak"
@@ -1489,10 +1519,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Beszállítói Árajánlatkérés
 DocType: Healthcare Settings,Registration Message,Regisztrációs üzenet
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Hardver
-DocType: Sales Order,Recurring Upto,ismétlődő Upto
 DocType: Prescription Dosage,Prescription Dosage,Vényköteles adagolás
 DocType: Attendance,HR Manager,HR menedzser
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,"Kérjük, válasszon egy vállalkozást"
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,"Kérjük, válasszon egy vállalkozást"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Kiváltságos távollét
 DocType: Purchase Invoice,Supplier Invoice Date,Beszállítói számla dátuma
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,per
@@ -1508,10 +1537,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Átfedő feltételek találhatók ezek között:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Ellen Naplókönyvelés {0} már hozzáigazított egy pár bizonylat értékével
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Összes megrendelési értéke
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Élelmiszer
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Élelmiszer
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Öregedés tartomány 3
 DocType: Maintenance Schedule Item,No of Visits,Látogatások száma
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Karbantartási ütemterv {0} létezik erre {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Szeretné közzé tenni elemeit a hubhoz?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,Tanuló regisztráló
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},A záró számla Pénznemének ennek kell lennie: {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Az összes cél pontjainak összege 100 kell legyen. Ez most: {0}
@@ -1522,9 +1552,9 @@
 DocType: Authorization Rule,Average Discount,Átlagos kedvezmény
 DocType: Purchase Invoice Item,UOM,ME
 DocType: Rename Tool,Utilities,Segédletek
-DocType: Purchase Invoice Item,Accounting,Könyvelés
+DocType: POS Profile,Accounting,Könyvelés
 DocType: Employee,EMP/,ALK /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,"Kérjük, válasszon köteget a kötegelt tételhez"
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,"Kérjük, válasszon köteget a kötegelt tételhez"
 DocType: Asset,Depreciation Schedules,Értékcsökkentési ütemezések
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Jelentkezési határidő nem eshet a távolléti időn kívülre
 DocType: Activity Cost,Projects,Projekt témák
@@ -1538,9 +1568,9 @@
 DocType: POS Profile,Campaign,Kampány
 DocType: Supplier,Name and Type,Neve és típusa
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',"Elfogadás állapotának ""Jóváhagyott"" vagy ""Elutasított"" kell lennie"
-DocType: Physician,Contacts and Address,Kapcsolatok és cím
+DocType: Physician,Contacts and Address,Kapcsolatok és címek
 DocType: Purchase Invoice,Contact Person,Kapcsolattartó személy
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"""Várható kezdés időpontja"" nem lehet nagyobb, mint a ""Várható befejezés időpontja"""
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""Várható kezdés időpontja"" nem lehet nagyobb, mint a ""Várható befejezés időpontja"""
 DocType: Course Scheduling Tool,Course End Date,Tanfolyam befejező dátum
 DocType: Holiday List,Holidays,Szabadnapok
 DocType: Sales Order Item,Planned Quantity,Tervezett mennyiség
@@ -1548,10 +1578,11 @@
 DocType: Item,Maintain Stock,Készlet karbantartás
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Készlet bejegyzés már létrehozott a gyártási  rendeléshez
 DocType: Employee,Prefered Email,Preferált e-mail
+DocType: Student Admission,Eligibility and Details,Jogosultság és részletek
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Nettó állóeszköz változás
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Hagyja üresen, ha figyelembe veszi valamennyi titulushoz"
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,{0} sorban az 'Aktuális' típusú terhelést nem lehet a Tétel árához hozzáadni
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Dátumtól
 DocType: Email Digest,For Company,A Vállakozásnak
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikációs napló.
@@ -1559,19 +1590,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Beszállító mutatószámok pontozási változója
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Beszerzési mennyiség
 DocType: Sales Invoice,Shipping Address Name,Szállítási cím neve
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Számlatükör
 DocType: Material Request,Terms and Conditions Content,Általános szerződési feltételek tartalma
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,"nem lehet nagyobb, mint 100"
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Tétel: {0} -  Nem készletezhető tétel
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Tétel: {0} -  Nem készletezhető tétel
 DocType: Maintenance Visit,Unscheduled,Nem tervezett
 DocType: Employee,Owned,Tulajdon
 DocType: Salary Detail,Depends on Leave Without Pay,Fizetés nélküli távolléttől függ
 DocType: Pricing Rule,"Higher the number, higher the priority","Minél nagyobb a szám, annál nagyobb a prioritás"
 ,Purchase Invoice Trends,Beszerzési számlák alakulása
 DocType: Employee,Better Prospects,Jobb kilátások
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Sor # {0}: A köteg: {1} csak {2} Menny. Kérjük, válasszon egy másik tétel köteget, amelyben {3} Mennyiség elérhető vagy válassza szée a sort több sorrá, szállít / ügy kötegekből"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Sor # {0}: A köteg: {1} csak {2} Menny. Kérjük, válasszon egy másik tétel köteget, amelyben {3} Mennyiség elérhető vagy válassza szée a sort több sorrá, szállít / ügy kötegekből"
 DocType: Vehicle,License Plate,Rendszámtábla
 DocType: Appraisal,Goals,Célok
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Válassza a POS profil lehetőséget
 DocType: Warranty Claim,Warranty / AMC Status,Garancia és éves karbantartási szerződés állapota
 ,Accounts Browser,Számlák böngészője
 DocType: Payment Entry Reference,Payment Entry Reference,Fizetés megadásának hivatkozása
@@ -1589,7 +1620,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Alkalmazott nem jelent magának.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ha a számla zárolásra került, a bejegyzések engedélyezettek korlátozott felhasználóknak."
 DocType: Email Digest,Bank Balance,Bank mérleg
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},"Könyvelési tétel ehhez {0}: {1}, csak ebben a pénznem végezhető: {2}"
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},"Könyvelési tétel ehhez {0}: {1}, csak ebben a pénznem végezhető: {2}"
 DocType: Job Opening,"Job profile, qualifications required etc.","Munkakör, szükséges képesítések stb"
 DocType: Journal Entry Account,Account Balance,Számla egyenleg
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Adó szabály a tranzakciókra.
@@ -1597,9 +1628,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Az Ügyfél kötelező a Bevételi számlához {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Összesen adók és illetékek (Vállakozás pénznemében)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Mutassa a lezáratlan pénzügyi évben a P&L mérlegeket
-DocType: Lab Test Template,Collection Details,Gyűjtemény részletei
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date a tabConsultation ct-ből, `tabLab Prescription` cp ahol ct.patient = &#39;{0}&#39; és cp.parent = ct. név és cp.test_created = 0"
+DocType: Lab Test Template,Collection Details,Gyűjtés részletei
 DocType: Shipping Rule,Shipping Account,Szállítási számla
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: fiók {2} inaktív
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,"Hozzon létre vevői rendeléseket a munkái megtervezéséhez és a pontos, időbeni kiszállításokhoz"
@@ -1616,7 +1645,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Csomagjegy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Iroda bérlés
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,SMS átjáró telepítése
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importálás nem sikerült!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Importálás nem sikerült!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Nem lett még cím hozzá adva.
 DocType: Workstation Working Hour,Workstation Working Hour,Munkaállomás munkaideje
 DocType: Vital Signs,Blood Pressure,Vérnyomás
@@ -1641,7 +1670,7 @@
 DocType: Sales Invoice,Source,Forrás
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mutassa zárva
 DocType: Leave Type,Is Leave Without Pay,Ez fizetés nélküli szabadság
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Vagyoneszköz Kategória kötelező befektetett eszközök tételeire
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Vagyoneszköz Kategória kötelező befektetett eszközök tételeire
 DocType: Fee Validity,Fee Validity,Díj érvényessége
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nem talált bejegyzést a fizetési táblázatban
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ez {0} ütközik ezzel {1} ehhez {2} {3}
@@ -1662,8 +1691,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Adminisztratív keresés
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Készítsen érdeklődéseket
 DocType: Maintenance Schedule,Schedules,Ütemezések
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,POS-profil szükséges a Point-of-Sale használatához
 DocType: Purchase Invoice Item,Net Amount,Nettó Összege
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} nem nyújtották be, így a művelet nem végrehajtható"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} nem nyújtották be, így a művelet nem végrehajtható"
 DocType: Purchase Order Item Supplied,BOM Detail No,Anyagjegyzék részlet száma
 DocType: Landed Cost Voucher,Additional Charges,további díjak
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),További kedvezmény összege (Vállalat pénznemében)
@@ -1672,7 +1702,7 @@
 ,Support Hour Distribution,Támogatási órák elosztása
 DocType: Maintenance Visit,Maintenance Visit,Karbantartási látogatás
 DocType: Student,Leaving Certificate Number,Leaving Certificate száma
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","A találkozó törölve, kérjük, tekintse át és törölje a számlát {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","A vizit időpont törölve, kérjük, tekintse át és törölje a számlát {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Elérhető Kötegelt Mennyiség a Raktárban
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Nyomtatási formátum frissítése
 DocType: Landed Cost Voucher,Landed Cost Help,Beszerzési költség Súgó
@@ -1690,13 +1720,13 @@
 DocType: Expense Claim,EXP,EXP
 apps/erpnext/erpnext/config/stock.py +205,Brand master.,Márka törzsadat.
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Tanuló {0} - {1} többször is megjelenik ezekben a sorokban {2} & {3}
-DocType: Healthcare Settings,Manage Sample Collection,A mintagyűjtés kezelése
+DocType: Healthcare Settings,Manage Sample Collection,Mintagyűjtés kezelése
 DocType: Program Enrollment Tool,Program Enrollments,Program beiratkozások
-DocType: Patient,Tobacco Past Use,Dohány múltbeli felhasználása
+DocType: Patient,Tobacco Past Use,Dohányzás múltbeli felhasználása
 DocType: Sales Invoice Item,Brand Name,Márkanév
 DocType: Purchase Receipt,Transporter Details,Fuvarozó Részletek
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},A (z) {0} felhasználó {physics {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Alapértelmezett raktár szükséges a kiválasztott elemhez
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},A(z) {0} felhasználó már hozzárendelve a(z) orvoshoz: {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Alapértelmezett raktár szükséges a kiválasztott elemhez
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Doboz
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,Lehetséges Beszállító
 DocType: Budget,Monthly Distribution,Havi Felbontás
@@ -1706,7 +1736,7 @@
 DocType: Sales Partner,Sales Partner Target,Vevő partner cél
 DocType: Loan Type,Maximum Loan Amount,Maximális hitel összeg
 DocType: Pricing Rule,Pricing Rule,Árképzési szabály
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Ismétlődő lajstromszám ehhez a hallgatóhoz: {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Ismétlődő lajstromszám ehhez a hallgatóhoz: {0}
 DocType: Budget,Action if Annual Budget Exceeded,"Művelet, ha az éves költségvetési keret túllépett"
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Anyagigénylés -&gt; Megrendelésre
 DocType: Shopping Cart Settings,Payment Success URL,Fizetési sikeres URL
@@ -1723,7 +1753,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} csak egyszer kell megjelennie
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Nem szabad átvinni többet {0}, mint {1} a Vevői megrendelésen {2}"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Távollét foglalása sikeres erre {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nincsenek tételek csomagoláshoz
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Nincsenek tételek csomagoláshoz
 DocType: Shipping Rule Condition,From Value,Értéktől
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Gyártási mennyiség kötelező
 DocType: Employee Loan,Repayment Method,Törlesztési mód
@@ -1737,33 +1767,34 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Készlet Források
 DocType: Purchase Invoice,Supplier Warehouse,Beszállító raktára
 DocType: Opportunity,Contact Mobile No,Kapcsolattartó mobilszáma
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Válassza a Céget
 ,Material Requests for which Supplier Quotations are not created,"Anyag igénylések, amelyekre Beszállítói árajánlatokat nem hoztak létre"
 DocType: Student Group,Set 0 for no limit,Állítsa 0 = nincs korlátozás
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"A nap (ok), amelyre benyújtotta a távollétét azok ünnepnapok. Nem kell igényelni a távollétet."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Küldje el újra a Fizetési E-mailt
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Új feladat
-DocType: Consultation,Appointment,Időpont egyeztetés
+DocType: Consultation,Appointment,Vizit időpont egyeztetés
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Árajánlat létrehozás
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Más jelentések
 DocType: Dependent Task,Dependent Task,Függő feladat
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Konverziós tényező alapértelmezett mértékegység legyen 1 ebben a sorban: {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Konverziós tényező alapértelmezett mértékegység legyen 1 ebben a sorban: {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},"Távollét típusa {0}, nem lehet hosszabb, mint {1}"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Próbáljon tervezni tevékenységet  X nappal előre.
 DocType: HR Settings,Stop Birthday Reminders,Születésnapi emlékeztetők kikapcsolása
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},"Kérjük, állítsa be alapértelmezett Bérszámfejtés fizetendő számlát a cégben: {0}"
 DocType: SMS Center,Receiver List,Vevő lista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Tétel keresése
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Tétel keresése
 DocType: Patient Appointment,Referring Physician,Hivatkozó orvos
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Elfogyasztott mennyiség
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Nettó készpénz változás
 DocType: Assessment Plan,Grading Scale,Osztályozás időszak
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mértékegység {0} amit egynél többször adott meg a konverziós tényező táblázatban
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,Már elkészült
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mértékegység {0} amit egynél többször adott meg a konverziós tényező táblázatban
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,Már elkészült
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Raktárról
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Kifizetési kérelem már létezik: {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Problémás tételek költsége
 DocType: Physician,Hospital,Kórház
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},"Mennyiség nem lehet több, mint {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},"Mennyiség nem lehet több, mint {0}"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Előző pénzügyi év nem zárt
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Életkor (napok)
 DocType: Quotation Item,Quotation Item,Árajánlat tétele
@@ -1774,16 +1805,17 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Beszállító típus törzsadat.
 DocType: Purchase Order Item,Supplier Part Number,Beszállítói alkatrész szám
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Váltási arány nem lehet 0 vagy 1
-DocType: Sales Invoice,Reference Document,referenciadokumentum
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} törlik vagy megállt
+DocType: Subscription,Reference Document,referenciadokumentum
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} törlik vagy megállt
 DocType: Accounts Settings,Credit Controller,Követelés felügyelője
 DocType: Delivery Note,Vehicle Dispatch Date,A jármű útnak indításának ideje
-DocType: Healthcare Settings,Default Medical Code Standard,Alapértelmezett orvosi kódex standard
+DocType: Healthcare Settings,Default Medical Code Standard,Alapértelmezett orvosi kódex szabvány
 DocType: Purchase Invoice Item,HSN/SAC,HSN/SAC
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +234,Purchase Receipt {0} is not submitted,Beszerzési megrendelés nyugta {0} nem nyújtják be
 DocType: Company,Default Payable Account,Alapértelmezett kifizetendő számla
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Beállítások az Online bevásárlókosárhoz, mint a szállítás szabályai, árlisták stb"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% számlázott
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Rendezés ár szerint ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserved Mennyiség
 DocType: Party Account,Party Account,Ügyfél számlája
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Emberi erőforrások HR
@@ -1795,13 +1827,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Folyósítási bejegyzés létrehozása
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Sor {0}: Beszálító előlegénak terhelésnek kell lennie
 DocType: Company,Default Values,Alapértelmezett értékek
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frekvencia} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Frekvencia} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Visszatérített teljes összeg
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ennek alapja a naplók ehhez a járműhöz. Lásd az alábbi idővonalat a részletehez
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Beszállító Ellenszámla {0} dátuma {1}
 DocType: Customer,Default Price List,Alapértelmezett árlista
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Vagyoneszköz mozgás bejegyzés {0} létrehozva
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,"Nem törölheti ezt a Pénzügyi évet: {0}. Pénzügyi év: {0} az alapértelmezett beállítás, a Globális beállításokban"
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Már létezik egy azonos nevű ügyfél
 DocType: Journal Entry,Entry Type,Bejegyzés típusa
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Nincs kapcsolódó értékelési terv ehhez az értékelő csoporthoz
 ,Customer Credit Balance,Vevőkövetelés egyenleg
@@ -1811,7 +1844,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Árazás
 DocType: Quotation,Term Details,ÁSZF részletek
 DocType: Project,Total Sales Cost (via Sales Order),Értékesítési költség összesítés (via Vevői rendelés)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,"Nem lehet regisztrálni, több mint {0} diákot erre a diákcsoportra."
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,"Nem lehet regisztrálni, több mint {0} diákot erre a diákcsoportra."
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Érdeklődés számláló
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,"{0} nagyobbnak kell lennie, mint 0"
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapacitás tervezés enyi időre (napok)
@@ -1827,9 +1860,11 @@
 DocType: Lab Test,Technician Name,Technikus neve
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Fizetetlen számlához tartozó Fizetés megszüntetése
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},"Jelenlegi leolvasott kilométerállásnak nagyobbnak kell lennie, mint a Jármű kezdeti kilométeróra állása {0}"
+DocType: Restaurant Reservation,No Show,Nincs megjelenítése
 DocType: Shipping Rule Country,Shipping Rule Country,Szállítási szabály Ország
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Távollét és jelenlét
 DocType: Maintenance Visit,Partially Completed,Részben befejezett
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Mérsékelt érzékenység
 DocType: Leave Type,Include holidays within leaves as leaves,Tartalmazzák a távolléteken belül az ünnepnapokat mint távolléteket
 DocType: Sales Invoice,Packed Items,Csomag tételei
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garancia igény ehhez a Széria számhoz
@@ -1846,13 +1881,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Fizetett összeg (Vállalkozás pénzneme)
 DocType: Purchase Invoice,Additional Discount,További kedvezmény
 DocType: Selling Settings,Selling Settings,Értékesítés beállításai
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,A művelet megerősítése
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online aukciók
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Kérjük, adja meg vagy a mennyiséget vagy Értékelési árat, vagy mindkettőt"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Kérjük, adja meg vagy a mennyiséget vagy Készletérték árat, vagy mindkettőt"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Teljesítés
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Megtekintés a kosárban
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Marketing költségek
 ,Item Shortage Report,Tétel Hiány jelentés
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Súlyt említik, \ nKérlek említsd meg a ""Súly mértékegység"" is"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Súlyt említik, \ nKérlek említsd meg a ""Súly mértékegység"" is"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Anyag igénylést használják ennek a Készlet bejegyzésnek a létrehozásához
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Következő értékcsökkenés dátuma kötelező az új tárgyi eszközhöz
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Külön tanfolyam mindegyik köteg csoportja alapján
@@ -1860,17 +1896,17 @@
 DocType: Fee Category,Fee Category,Díj kategória
 DocType: Drug Prescription,Dosage by time interval,Adagolás időintervallum szerint
 ,Student Fee Collection,Tanuló díjbeszedés
-apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +23,Appointment Duration (mins),A kinevezés időtartama (perc)
+apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +23,Appointment Duration (mins),A vizit időpont időtartama (perc)
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Hozzon létre számviteli könyvelést minden Készletmozgásra
 DocType: Leave Allocation,Total Leaves Allocated,Összes lekötött távollétek
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Raktár szükséges a {0} sz. soron
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,"Kérjük, adjon meg egy érvényes költségvetési év kezdeti és befejezési időpontjait"
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,"Kérjük, adjon meg egy érvényes költségvetési év kezdeti és befejezési időpontjait"
 DocType: Employee,Date Of Retirement,Nyugdíjazás dátuma
 DocType: Upload Attendance,Get Template,Sablonok lekérdezése
 DocType: Material Request,Transferred,Átvitt
 DocType: Vehicle,Doors,Ajtók
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext telepítése befejeződött!
-DocType: Healthcare Settings,Collect Fee for Patient Registration,Gyűjtsd össze a beteg regisztrációját
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext telepítése befejeződött!
+DocType: Healthcare Settings,Collect Fee for Patient Registration,Beteg regisztrációjához gyújtött díjak
 DocType: Course Assessment Criteria,Weightage,Súlyozás
 DocType: Purchase Invoice,Tax Breakup,Adó megszakítás
 DocType: Packing Slip,PS-,CSOMJ-
@@ -1884,41 +1920,41 @@
 DocType: Stock Entry,Material Receipt,Anyag bevételezése
 DocType: Homepage,Products,Termékek
 DocType: Announcement,Instructor,Oktató
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +61,Select Item (optional),Elem kiválasztása (opcionális)
-DocType: Fee Schedule Student Group,Fee Schedule Student Group,Fee Schedule Student Group
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +61,Select Item (optional),Tétel elem kiválasztása (opcionális)
+DocType: Fee Schedule Student Group,Fee Schedule Student Group,Díj időzítő tanuló csoport
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ha ennek a tételnek vannak változatai, akkor nem lehet kiválasztani a vevői rendeléseken stb."
 DocType: Lead,Next Contact By,Következő kapcsolat evvel
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},"Szükséges mennyiség ebből a tételből {0}, ebben a sorban {1}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},"Szükséges mennyiség ebből a tételből {0}, ebben a sorban {1}"
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},"{0} Raktárat nem lehet törölni, mint a {1} tételre létezik mennyiség"
 DocType: Quotation,Order Type,Rendelés típusa
-DocType: Purchase Invoice,Notification Email Address,Értesítendő emailcímek
 ,Item-wise Sales Register,Tételenkénti Értékesítés Regisztráció
 DocType: Asset,Gross Purchase Amount,Bruttó Vásárlás összege
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Nyitó egyenlegek
 DocType: Asset,Depreciation Method,Értékcsökkentési módszer
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Offline
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ez az adó az Alap árban benne van?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Összes célpont
 DocType: Job Applicant,Applicant for a Job,Kérelmező erre a munkahelyre
 DocType: Production Plan Material Request,Production Plan Material Request,Termelési terv Anyag igénylés
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Nem hozott létre gyártási megrendelést
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Nem hozott létre gyártási megrendelést
 DocType: Stock Reconciliation,Reconciliation JSON,Összeegyeztetni JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,"Túl sok oszlop. Exportálja a jelentést, és nyomtassa ki táblázatkezelő program segítségével."
 DocType: Purchase Invoice Item,Batch No,Kötegszám
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Ajánlatkérés: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Többszöri Vevő rendelések engedélyezése egy Beszerzési megrendelés ellen
 DocType: Student Group Instructor,Student Group Instructor,Diák csoport oktató
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Helyettesítő2 Mobil szám
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Legfontosabb
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Legfontosabb
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Változat
 DocType: Naming Series,Set prefix for numbering series on your transactions,Sorozat számozás előtag beállítása a  tranzakciókhoz
 DocType: Employee Attendance Tool,Employees HTML,Alkalmazottak HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,"Alapértelmezett anyagjegyzék BOM ({0}) aktívnak kell lennie ehhez a termékhez, vagy a sablonjához"
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,"Alapértelmezett anyagjegyzék BOM ({0}) aktívnak kell lennie ehhez a termékhez, vagy a sablonjához"
 DocType: Employee,Leave Encashed?,Távollét beváltása?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Lehetőség tőle mező kitöltése kötelező
 DocType: Email Digest,Annual Expenses,Éves költségek
 DocType: Item,Variants,Változatok
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Beszerzési rendelés létrehozás
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Beszerzési rendelés létrehozás
 DocType: SMS Center,Send To,Küldés Címzettnek
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Nincs elég távollét egyenlege ehhez a távollét típushoz {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Lekötött összeg
@@ -1931,9 +1967,10 @@
 DocType: Purchase Order Item,Warehouse and Reference,Raktár és Referencia
 DocType: Supplier,Statutory info and other general information about your Supplier,Törvényes info és más általános információk a Beszállítóról
 DocType: Item,Serial Nos and Batches,Sorszámok és kötegek
-apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Diák csoport erősség
+apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Diák csoport állomány
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Ellen Naplókönyvelés {0} nem rendelkezik egyeztetett {1} bejegyzéssel
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Értékeléséből
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Képzési események
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Ismétlődő sorozatszám lett beírva ehhez a tételhez: {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Egy Szállítási szabály feltételei
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Kérlek lépj be
@@ -1943,7 +1980,7 @@
 DocType: Sales Order,To Deliver and Bill,Szállítani és számlázni
 DocType: Student Group,Instructors,Oktatók
 DocType: GL Entry,Credit Amount in Account Currency,Követelés összege a számla pénznemében
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,ANYGJZ {0} be kell nyújtani
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,ANYGJZ {0} be kell nyújtani
 DocType: Authorization Control,Authorization Control,Jóváhagyás vezérlés
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Sor # {0}: Elutasított Raktár kötelező az elutasított elemhez: {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Fizetés
@@ -1962,11 +1999,11 @@
 DocType: Quotation Item,Actual Qty,Aktuális menny.
 DocType: Sales Invoice Item,References,Referenciák
 DocType: Quality Inspection Reading,Reading 10,Olvasás 10
-DocType: Hub Settings,Hub Node,Hub csomópont
+DocType: Hub Category,Hub Node,Hub csomópont
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Ismétlődő tételeket adott meg. Kérjük orvosolja, és próbálja újra."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Társult
 DocType: Asset Movement,Asset Movement,Vagyoneszköz mozgás
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,új Kosár
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,új Kosár
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Tétel: {0} nem sorbarendezett tétel
 DocType: SMS Center,Create Receiver List,Címzettlista létrehozása
 DocType: Vehicle,Wheels,Kerekek
@@ -1980,15 +2017,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Távközlési
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Azt jelzi, hogy a csomag egy része ennek a szállításnak (Csak tervezet)"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Fizetés rögzítés létrehozás
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},"Mennyiségnek erre a tételre {0} kisebbnek kell lennie, mint {1}"
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},"Mennyiségnek erre a tételre {0} kisebbnek kell lennie, mint {1}"
 ,Sales Invoice Trends,Kimenő értékesítési számlák alakulása
 DocType: Leave Application,Apply / Approve Leaves,Távollétekre Jelentkezés / Jóváhagyás
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Ennek
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Ennek
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Csak akkor hivatkozhat sorra, ha a terhelés  típus ""Előző sor összege"" vagy ""Előző sor Összesen"""
 DocType: Sales Order Item,Delivery Warehouse,Szállítási raktár
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Pénzügyi költséghely fája.
 DocType: Serial No,Delivery Document No,Szállítási Dokumentum Sz.
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},"Kérjük, állítsa be a 'Nyereség / veszteség számla az Eszköz eltávolításához', ehhez a Vállalathoz: {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},"Kérjük, állítsa be a 'Nyereség / veszteség számla az Eszköz eltávolításához', ehhez a Vállalathoz: {0}"
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Tételek beszerzése a Beszerzési bevételezésekkel
 DocType: Serial No,Creation Date,Létrehozás dátuma
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Tétel {0} többször is előfordul ebben az árjegyzékben {1}
@@ -1999,20 +2036,21 @@
 DocType: Student,Student Mobile Number,Tanuló mobil szám
 DocType: Item,Has Variants,Vannak változatai
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Frissítse a válaszadást
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Már választott ki elemeket innen {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Már választott ki elemeket innen {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Havi Felbontás neve
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Kötegazonosító kötelező
 DocType: Sales Person,Parent Sales Person,Szülő Értékesítő
-DocType: Purchase Invoice,Recurring Invoice,Ismétlődő számla
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Magas vagy Alacsony
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Először válassza ki a programot
 DocType: Patient Appointment,Patient Age,A beteg kora
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Projektek irányítása
 DocType: Supplier,Supplier of Goods or Services.,Az áruk vagy szolgáltatások beszállítója.
 DocType: Budget,Fiscal Year,Pénzügyi év
-DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"A késedelmes követelést használó számlák akkor használatosak, ha a Patient nem tartalmazza a Konzultációs díjak könyvelését."
+DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Alapértelmezett bevételi számlák akkor használatosak, ha a Páciens nem jogosult a Konzultációs díjak könyvelésére."
 DocType: Vehicle Log,Fuel Price,Üzemanyag ár
 DocType: Budget,Budget,Költségkeret
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Nyissa meg a beállítást
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,"Befektetett Álló eszközöknek, nem készletezhető elemeknek kell lennie."
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Állítsa be a nyitást
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,"Befektetett Álló eszközöknek, nem készletezhető elemeknek kell lennie."
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Költségvetést nem lehet ehhez rendelni: {0}, mivel ez nem egy bevétel vagy kiadás főkönyvi számla"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Elért
 DocType: Student Admission,Application Form Route,Jelentkezési mód
@@ -2026,12 +2064,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Tétel: {0}, nincs telepítve Széria sz.. Ellenőrizze a tétel törzsadatot"
 DocType: Maintenance Visit,Maintenance Time,Karbantartási idő
 ,Amount to Deliver,Szállítandó összeg
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Ugyanaz a tétel többször szerepel. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"A kifejezés kezdő dátuma nem lehet korábbi, mint az előző évben kezdő tanév dátuma, amelyhez a kifejezés kapcsolódik (Tanév {}). Kérjük javítsa ki a dátumot, és próbálja újra."
 DocType: Guardian,Guardian Interests,Helyettesítő kamat
 DocType: Naming Series,Current Value,Jelenlegi érték
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Több pénzügyi éve létezik a dátum: {0}. Kérjük, állítsa be a céget a pénzügyi évben"
 DocType: School Settings,Instructor Records to be created by,Az oktatói rekordokat készítette a
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} létrehozva
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} létrehozva
 DocType: Delivery Note Item,Against Sales Order,Ellen Vevői rendelések
 ,Serial No Status,Széria sz. állapota
 DocType: Payment Entry Reference,Outstanding,Fennálló kinntlévőség
@@ -2041,10 +2080,10 @@
 						must be greater than or equal to {2}","Row {0}: beállítása {1} periodicitás, különbség a, és a mai napig \ nagyobbnak kell lennie, vagy egyenlő, mint {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Ennek alapja az állomány mozgása. Lásd {0} részletekért
 DocType: Pricing Rule,Selling,Értékesítés
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Összeg: {0} {1} levonásra ellenéből {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Összeg: {0} {1} levonásra ellenéből {2}
 DocType: Employee,Salary Information,Bérinformáció
 DocType: Sales Person,Name and Employee ID,Név és Alkalmazotti azonosító ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,A határidő nem lehet a rögzítés dátuma előtti
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,A határidő nem lehet a rögzítés dátuma előtti
 DocType: Website Item Group,Website Item Group,Weboldal tétel Csoport
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Vámok és adók
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Kérjük, adjon meg Hivatkozási dátumot"
@@ -2070,7 +2109,7 @@
 DocType: Issue,Resolution Details,Megoldás részletei
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,A kiosztandó
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Elfogadási kritérium
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Kérjük, adja meg az anyag igényeket a fenti táblázatban"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,"Kérjük, adja meg az anyag igényeket a fenti táblázatban"
 DocType: Item Attribute,Attribute Name,Tulajdonság neve
 DocType: BOM,Show In Website,Jelenjen meg a Weboldalon
 DocType: Shopping Cart Settings,Show Quantity in Website,Mutassa a mennyiséget a honlapon
@@ -2079,14 +2118,14 @@
 DocType: Item Reorder,Check in (group),Bejelentkezés (csoport)
 ,Qty to Order,Mennyiség Rendeléshez
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","A számla fej a kötelezettség vagy saját tőke alatt, ahol a nyereség / veszteség könyvelése folyik"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Minden feladat egy Gantt diagramon.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Minden feladat egy Gantt diagramon.
 DocType: Opportunity,Mins to First Response,Az első reakcióig eltelt percek száma
 DocType: Pricing Rule,Margin Type,Árkülönbözet típus
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} óra(k)
 DocType: Course,Default Grading Scale,Alapértelmezett értékelési skála
 DocType: Appraisal,For Employee Name,Alkalmazott neve
 DocType: Holiday List,Clear Table,Tábla törlése
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +98,Available slots,Elérhető rések
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +98,Available slots,Elérhető időszakok
 DocType: C-Form Invoice Detail,Invoice No,Számlát sz.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +350,Make Payment,Fizetés létrehozás
 DocType: Room,Room Name,szoba neve
@@ -2097,38 +2136,38 @@
 ,Campaign Efficiency,Kampány hatékonyság
 DocType: Discussion,Discussion,Megbeszélés
 DocType: Payment Entry,Transaction ID,Tranzakció azonosítója
-DocType: Patient,Surgical History,Sebészeti történelem
+DocType: Patient,Surgical History,Sebészeti előzmény
 DocType: Employee,Resignation Letter Date,Lemondását levélben dátuma
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Árazási szabályok tovább szűrhetők a mennyiség alapján.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Állítsd be a Csatlakozás dátumát ehhez a munkavállalóhoz {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Állítsd be a Csatlakozás dátumát ehhez a munkavállalóhoz {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Összesen számlázási összeg ((Idő nyilvántartó szerint)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Törzsvásárlói árbevétele
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) 'Kiadás jóváhagyó' beosztással kell rendelkeznie
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Pár
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Válasszon Anyagj és Mennyiséget a Termeléshez
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Válasszon Anyagj és Mennyiséget a Termeléshez
 DocType: Asset,Depreciation Schedule,Értékcsökkentési leírás ütemezése
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Vevő Partner címek és Kapcsolatok
 DocType: Bank Reconciliation Detail,Against Account,Ellen számla
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Félnapos időpontja között kell lennie Dátum és a mai napig
 DocType: Maintenance Schedule Detail,Actual Date,Jelenlegi dátum
 DocType: Item,Has Batch No,Van kötegszáma
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Éves számlázás: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Éves számlázás: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Áru és szolgáltatások adói (GST India)
 DocType: Delivery Note,Excise Page Number,Jövedéki Oldal száma
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Vállalkozás, kezdő dátum és a végső dátum kötelező"
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Lépjen a konzultációból
+apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Konzultációból lekérés
 DocType: Asset,Purchase Date,Beszerzés dátuma
 DocType: Employee,Personal Details,Személyes adatai
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},"Kérjük, állítsa be a 'Eszköz értékcsökkenés Költséghely' ehhez a Vállalkozáshoz: {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},"Kérjük, állítsa be a 'Eszköz értékcsökkenés Költséghely' ehhez a Vállalkozáshoz: {0}"
 ,Maintenance Schedules,Karbantartási ütemezések
 DocType: Task,Actual End Date (via Time Sheet),Tényleges befejezés dátuma (Idő nyilvántartó szerint)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Összeg: {0} {1} ellenéből {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Összeg: {0} {1} ellenéből {2} {3}
 ,Quotation Trends,Árajánlatok alakulása
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Tétel Csoport nem említett a tétel törzsadatban erre a tételre: {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Tartozás megterhelés számlának bevételi számlának kell lennie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Tartozás megterhelés számlának bevételi számlának kell lennie
 DocType: Shipping Rule Condition,Shipping Amount,Szállítandó mennyiség
 DocType: Supplier Scorecard Period,Period Score,Időszak pontszám
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Vevők hozzáadása
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Vevők hozzáadása
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Függőben lévő összeg
 DocType: Lab Test Template,Special,Különleges
 DocType: Purchase Invoice Item,Conversion Factor,Konverziós tényező
@@ -2136,13 +2175,14 @@
 ,Vehicle Expenses,Jármű költségek
 DocType: Serial No,Invoice Details,Számla részletei
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},"Várható érték a hasznos élettartam után nagyobbnak kell lennie, vagy egyenlő, mint {0}"
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Indulás
+DocType: Hub Category,Hub Category,Hub Kategória
 DocType: Purchase Invoice,SEZ,áruszállítás
 DocType: Purchase Receipt,Vehicle Number,Jármű száma
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Az időpont, amikor az ismétlődő számlát meg fogják állítani"
 DocType: Employee Loan,Loan Amount,Hitelösszeg
 DocType: Program Enrollment,Self-Driving Vehicle,Önvezető jármű
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Beszállító mutatószámláló állása
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Sor {0}: Anyagjegyzéket nem találtunk a Tételre {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Sor {0}: Anyagjegyzéket nem találtunk a Tételre {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,"Összes lefoglalt távolét {0} nem lehet kevesebb, mint a már jóváhagyott távollétek {1} az időszakra"
 DocType: Journal Entry,Accounts Receivable,Bevételi számlák
 ,Supplier-Wise Sales Analytics,Beszállító szerinti értékesítési kimutatás
@@ -2153,7 +2193,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Szülő kurzus (Hagyja üresen, ha ez nem része a szülő kurzusnak)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Hagyja üresen, ha figyelembe veszi valamennyi alkalmazotti típushoz"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Forgalmazói díjak ez alapján
-apps/erpnext/erpnext/hooks.py +131,Timesheets,"Munkaidő jelenléti ív, nyilvántartók"
+apps/erpnext/erpnext/hooks.py +140,Timesheets,"Munkaidő jelenléti ív, nyilvántartók"
 DocType: HR Settings,HR Settings,Munkaügyi beállítások
 DocType: Salary Slip,net pay info,nettó fizetés információ
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Ez az érték frissítésre kerül az alapértelmezett értékesítési árlistában.
@@ -2161,16 +2201,16 @@
 DocType: Email Digest,New Expenses,Új költségek
 DocType: Purchase Invoice,Additional Discount Amount,További kedvezmény összege
 DocType: Consultation,Patient Details,A beteg adatai
-DocType: Patient,B Positive,B pozitív
+DocType: Patient,B Positive,B Pozitív
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Sor # {0}: Mennyiség legyen 1, a tétel egy tárgyi eszköz. Használjon külön sort több menny."
 DocType: Leave Block List Allow,Leave Block List Allow,Távollét blokk lista engedélyezése
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Rövidített nem lehet üres vagy szóköz
-DocType: Patient Medical Record,Patient Medical Record,Patient Medical Record
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Rövidített nem lehet üres vagy szóköz
+DocType: Patient Medical Record,Patient Medical Record,Beteg orvosi kartonja
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Csoport Csoporton kívülire
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportok
 DocType: Loan Type,Loan Name,Hitel neve
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Összes Aktuális
-DocType: Lab Test UOM,Test UOM,Teszteljük az UOM-ot
+DocType: Lab Test UOM,Test UOM,Teszt ME
 DocType: Student Siblings,Student Siblings,Tanuló Testvérek
 apps/erpnext/erpnext/utilities/user_progress.py +125,Unit,Egység
 apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Kérjük adja meg a vállalkozás nevét
@@ -2180,9 +2220,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,"Nem található árfolyam erre {0}eddig {1} a kulcs dátum: {2}. Kérjük, hozzon létre egy pénzváltó rekordot manuálisan"
 DocType: POS Profile,Price List,Árlista
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} ez most az alapértelmezett Költségvetési Év. Kérjük, frissítse böngészőjét a változtatások életbeléptetéséhez."
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Költségtérítési igények
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Költségtérítési igények
 DocType: Issue,Support,Támogatás
 ,BOM Search,Anyagjegyzék Keresés
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Közzététel a &quot;készletben&quot; vagy a &quot;nem raktáron&quot; a hubon a raktáron rendelkezésre álló készlet alapján.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Zárás (nyitás + összesítések)
 DocType: Vehicle,Fuel Type,Üzemanyag típusa
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Kérjük, adja meg a vállalkozás pénznemét"
@@ -2194,16 +2235,16 @@
 DocType: Healthcare Settings,Remind Before,Emlékeztessen azelőtt
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},ME átváltási arányra is szükség van ebben a sorban {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Sor # {0}: Dokumentum típus hivatkozásnak Vevői rendelésnek, Értékesítési számlának, vagy Naplókönyvelésnek kell lennie"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Sor # {0}: Dokumentum típus hivatkozásnak Vevői rendelésnek, Értékesítési számlának, vagy Naplókönyvelésnek kell lennie"
 DocType: Salary Component,Deduction,Levonás
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Sor {0}: Időtől és időre kötelező.
 DocType: Stock Reconciliation Item,Amount Difference,Összeg különbség
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Tétel Ár hozzáadott {0} árjegyzékben {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Tétel Ár hozzáadott {0} árjegyzékben {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Kérjük, adja meg Alkalmazotti azonosító ID, ehhez az értékesítőhöz"
 DocType: Territory,Classification of Customers by region,Vevői csoportosítás régiónként
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Eltérés összegének nullának kell lennie
 DocType: Project,Gross Margin,Bruttó árkülönbözet
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,"Kérjük, adjon meg Gyártandő tételt először"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,"Kérjük, adjon meg Gyártandő tételt először"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Számított Bankkivonat egyenleg
 DocType: Normal Test Template,Normal Test Template,Normál teszt sablon
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,letiltott felhasználó
@@ -2213,21 +2254,22 @@
 DocType: Salary Slip,Total Deduction,Összesen levonva
 ,Production Analytics,Termelési  elemzések
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Ez a betegekkel szembeni tranzakciókra épül. Lásd az alábbi idővonalat a részletekért
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Költség Frissítve
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Költség Frissítve
 DocType: Employee,Date of Birth,Születési idő
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,"Tétel: {0}, már visszahozták"
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,"** Pénzügyi év ** jelképezi a Költségvetési évet. Minden könyvelési tétel, és más jelentős tranzakciók rögzítése ebben ** Pénzügyi Év **."
 DocType: Opportunity,Customer / Lead Address,Vevő / Érdeklődő címe
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Beszállító mutatószám beállítása
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Figyelmeztetés: Érvénytelen SSL tanúsítvány a  {0} mellékleteten
-DocType: Student Admission,Eligibility,Jogosultság
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Értékelési terv neve
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Figyelmeztetés: Érvénytelen SSL tanúsítvány a  {0} mellékleteten
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Vezetékek segít abban, hogy az üzleti, add a kapcsolatokat, és több mint a vezet"
 DocType: Production Order Operation,Actual Operation Time,Aktuális üzemidő
 DocType: Authorization Rule,Applicable To (User),Alkalmazandó (Felhasználó)
 DocType: Purchase Taxes and Charges,Deduct,Levonási
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Munkaleírás
 DocType: Student Applicant,Applied,Alkalmazott
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Nyissa meg újra
 DocType: Sales Invoice Item,Qty as per Stock UOM,Mennyiség a Készlet mértékegysége alapján
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Helyettesítő2 neve
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciális karakterek ezek kivételével ""-"", ""#"", ""."" és a ""/"", nem engedélyezettek a Sorszámozási csoportokban"
@@ -2239,7 +2281,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Gyártási menedzser
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Széria sz. {0} még garanciális eddig {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Osza szét a szállítólevelét csomagokra.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Szállítások
+apps/erpnext/erpnext/hooks.py +107,Shipments,Szállítások
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Lefoglalt teljes összeg (Válalakozás pénznemében)
 DocType: Purchase Order Item,To be delivered to customer,Vevőhöz kell szállítani
 DocType: BOM,Scrap Material Cost,Hulladék anyagköltség
@@ -2261,8 +2303,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Elem változat beállításai
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Válasszon Vállalkozást...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Hagyja üresen, ha figyelembe veszi az összes szervezeti egységen"
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Alkalmazott foglalkoztatás típusa (munkaidős, szerződéses, gyakornok stb)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} kötelező a(z) {1} tételnek
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Alkalmazott foglalkoztatás típusa (munkaidős, szerződéses, gyakornok stb)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} kötelező a(z) {1} tételnek
 DocType: Process Payroll,Fortnightly,Kéthetenkénti
 DocType: Currency Exchange,From Currency,Pénznemből
 DocType: Vital Signs,Weight (In Kilogram),Súly (kilogrammban)
@@ -2286,7 +2328,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Kérjük, kattintson a 'Ütemterv létrehozás', hogy ütemezzen"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Hibák voltak a következő menetrendek törlése közben:
 DocType: Bin,Ordered Quantity,Rendelt mennyiség
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","pl. ""Eszközök építőknek"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","pl. ""Eszközök építőknek"""
 DocType: Grading Scale,Grading Scale Intervals,Osztályozás időszak periódusai
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: számviteli könyvelés {2} csak ebben a pénznemben végezhető: {3}
 DocType: Production Order,In Process,A feldolgozásban
@@ -2309,11 +2351,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Adófizetéssel
 DocType: Expense Claim Detail,Expense Claim Detail,Költség igény részlete
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,HÁRMASÁVAL BESZÁLLÍTÓNAK
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,"Kérjük, válassza ki a megfelelő fiókot"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,"Kérjük, válassza ki a megfelelő fiókot"
 DocType: Item,Weight UOM,Súly mértékegysége
 DocType: Salary Structure Employee,Salary Structure Employee,Alkalmazotti Bérrendszer
 DocType: Patient,Blood Group,Vércsoport
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Függő
 DocType: Course,Course Name,Tantárgy neve
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"A felhasználók, akik engedélyezhetik egy bizonyos Alkalmazott távollét kérelmét"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Irodai berendezések
@@ -2332,7 +2373,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Az árak nem jelennek meg, ha Árlista nincs megadva"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Kérjük adjon meg egy országot a házhozszállítás szabályhoz vagy ellenőrizze az Egész világra kiterjedő szállítást
 DocType: Stock Entry,Total Incoming Value,Beérkező össz Érték
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Tartozás megterhelése szükséges
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Tartozás megterhelése szükséges
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Munkaidő jelenléti ív segít nyomon követni az idő, költség és számlázási tevékenységeit a csapatának."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Beszerzési árlista
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,A beszállító eredménymutató-változóinak sablonjai.
@@ -2342,7 +2383,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Fizetés főkönyvi egyeztetése
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Kérjük, válasszon felelős személy nevét"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technológia
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Összesen Kifizetetlen: {0}
+DocType: Hub Settings,Unregister from Hub,Regisztráljon a Hubból
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Összesen Kifizetetlen: {0}
 DocType: BOM Website Operation,BOM Website Operation,Anyagjegyzék honlap művelet
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Ajánlati levél
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Létrehoz anyag igényléseket (MRP) és gyártási megrendeléseket.
@@ -2354,7 +2396,9 @@
 DocType: Physician Schedule Time Slot,To Time,Ideig
 DocType: Authorization Rule,Approving Role (above authorized value),Jóváhagyó beosztása (a fenti engedélyezett érték)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Követelés főkönyvi számlának Fizetendő számlának kell lennie
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},ANYGJZ rekurzív: {0} nem lehet a szülő vagy a gyermeke ennek: {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Kérem, válassza ki a hallgatói felvételt, amely kötelező a fizetett hallgatói jelentkező számára"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},ANYGJZ rekurzív: {0} nem lehet a szülő vagy a gyermeke ennek: {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,"Kérjük, válassza ki az árlistát az árak közzétételéhez"
 DocType: Production Order Operation,Completed Qty,Befejezett Mennyiség
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","{0} -hoz, csak terhelés számlákat lehet kapcsolni a másik ellen jóváíráshoz"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Árlista {0} letiltva
@@ -2362,88 +2406,90 @@
 DocType: Manufacturing Settings,Allow Overtime,Túlóra engedélyezése
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Sorszámozott tétel {0} nem lehet frissíteni a Készlet egyesztetéssel, kérem használja a Készlet bejegyzést"
 DocType: Training Event Employee,Training Event Employee,Képzési munkavállalói esemény
-apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +6,Add Time Slots,Adjon hozzá időbevitelt
+apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +6,Add Time Slots,Adjon hozzá időszakaszt
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} sorozatszám szükséges ehhez a Tételhez: {1}. Ezt adta meg: {2}.
-DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuális Értékelési ár
+DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuális Készletérték ár
 DocType: Item,Customer Item Codes,Vevői tétel kódok
+DocType: Training Event,Advance,Előleg
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,ismételten ismételten.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Árfolyamnyereség / veszteség
 DocType: Opportunity,Lost Reason,Elvesztés oka
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Új cím
 DocType: Quality Inspection,Sample Size,Minta mérete
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,"Kérjük, adjon meg dokumentum átvételt"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Összes tétel már kiszámlázott
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Kérem adjon meg egy érvényes 'Eset számig'
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',Kérem adjon meg egy érvényes 'Eset számig'
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"További költséghelyek hozhatók létre a csoportok alatt, de bejegyzéseket lehet tenni a csoporttal nem rendelkezőkre is"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Felhasználók és engedélyek
 DocType: Vehicle Log,VLOG.,VIDEÓBLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Gyártási rendelések létrehozva: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Gyártási rendelések létrehozva: {0}
 DocType: Branch,Branch,Ágazat
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Nyomtatás és Márkaépítés
 DocType: Company,Total Monthly Sales,Havi eladások összesítése
 DocType: Bin,Actual Quantity,Tényleges Mennyiség
 DocType: Shipping Rule,example: Next Day Shipping,például: Következő napi szállítás
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Széria sz. {0} nem található
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Az előfizetés {0}
-DocType: Fee Schedule Program,Fee Schedule Program,Fee Schedule Program
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Az előfizetés már {0}
+DocType: Fee Schedule Program,Fee Schedule Program,Díj időzítő program
 DocType: Fee Schedule Program,Student Batch,Tanuló köteg
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,"válassza ki a * tabVital jelekből, ahol a patient = &#39;{0}&#39; sorrendje a signs_date desc limit 1 szerint"
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Tanuló létrehozás
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Min osztályzat
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Ön meghívást kapott ennek a projeknek a közreműködéséhez: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Az orvos nem érhető el {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Ön meghívást kapott ennek a projeknek a közreműködéséhez: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Az orvos nem érhető el ezen {0}
 DocType: Leave Block List Date,Block Date,Zárolás dátuma
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Egyéni mező előfizetési azonosító hozzáadása ebbe a doctype-ba {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Beszállító szállítólevele
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Jelentkezzen most
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Jelentkezzen most
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Tényleges Menny {0} / Várakozó Menny {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-kereskedelem GSTIN
 DocType: Sales Order,Not Delivered,Nem szállított
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,A várható dátum nem lehet a tranzakció dátuma előtt
 ,Bank Clearance Summary,Bank Végső összesítő
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Létre hoz és kezel napi, heti és havi e-mail összefoglalót."
 DocType: Appraisal Goal,Appraisal Goal,Teljesítmény értékelés célja
 DocType: Stock Reconciliation Item,Current Amount,Jelenlegi összege
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Készítések
-DocType: Fee Schedule,Fee Structure,díjstruktúra
+DocType: Fee Schedule,Fee Structure,Díjfelépítés
 DocType: Timesheet Detail,Costing Amount,Költségszámítás Összeg
-DocType: Student Admission,Application Fee,Jelentkezési díj
+DocType: Student Admission Program,Application Fee,Jelentkezési díj
 DocType: Process Payroll,Submit Salary Slip,Bérpapír küldés
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maximum kedvezmény erre a tételre: {0} ennyi: {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Maximum kedvezmény erre a tételre: {0} ennyi: {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Csoportos importálás
 DocType: Sales Partner,Address & Contacts,Címek és Kapcsolattartók
 DocType: SMS Log,Sender Name,Küldő neve
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Rendezés kritérium szerint
 DocType: POS Profile,[Select],[Válasszon]
-DocType: Vital Signs,Blood Pressure (diastolic),Vérnyomás (diasztolés)
+DocType: Vital Signs,Blood Pressure (diastolic),Vérnyomás (diasztolik)
 DocType: SMS Log,Sent To,Elküldve
 DocType: Payment Request,Make Sales Invoice,Vevői megrendelésre számla létrehozás
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,Szoftverek
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Következő megbeszélés dátuma nem lehet a múltban
 DocType: Company,For Reference Only.,Csak tájékoztató jellegűek.
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},A {0} orvos nem érhető el {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Válasszon köteg sz.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},A {0} orvos nem érhető el ezen {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Válasszon köteg sz.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Érvénytelen {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,BESZSZ-ELLEN-
-DocType: Fee Validity,Reference Inv,Referencia Inv
+DocType: Fee Validity,Reference Inv,Szla. referencia
 DocType: Sales Invoice Advance,Advance Amount,Előleg
 DocType: Manufacturing Settings,Capacity Planning,Kapacitástervezés
-DocType: Supplier Quotation,Rounding Adjustment (Company Currency,Kerekítési korrekció (Company Currency
+DocType: Supplier Quotation,Rounding Adjustment (Company Currency,Kerekítési korrekció (Vállalkozás pénznemében
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,"""Dátumtól"" szükséges"
 DocType: Journal Entry,Reference Number,Referencia szám
 DocType: Employee,Employment Details,Foglalkoztatás részletei
 DocType: Employee,New Workplace,Új munkahely
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Lezárttá állít
 apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Barcode {0},Nincs tétel ezzel a Vonalkóddal {0}
-DocType: Normal Test Items,Require Result Value,Követelményértékre van szükség
+DocType: Normal Test Items,Require Result Value,Eredmény értékeire van szükség
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Eset sz. nem lehet 0
 DocType: Item,Show a slideshow at the top of the page,Mutass egy diavetítést  a lap tetején
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Anyagjegyzékek
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Üzletek
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Anyagjegyzékek
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Üzletek
 DocType: Project Type,Projects Manager,Projekt menedzser
 DocType: Serial No,Delivery Time,Szállítási idő
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Öregedés ezen alapszik
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,A kinevezés törölve
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,A vizit törölve
 DocType: Item,End of Life,Felhasználhatósági idő
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Utazási
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,"Nem talált aktív vagy alapértelmezett bérrendszert erre az Alkalmazottra: {0}, a megadott dátumra"
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Utazási
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,"Nem talált aktív vagy alapértelmezett bérrendszert erre az Alkalmazottra: {0}, a megadott dátumra"
 DocType: Leave Block List,Allow Users,Felhasználók engedélyezése
 DocType: Purchase Order,Customer Mobile No,Vevő mobil tel. szám
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Ismétlődő
@@ -2452,12 +2498,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Költségek újraszámolása
 DocType: Item Reorder,Item Reorder,Tétel újrarendelés
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Bérkarton megjelenítése
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Anyag Átvitel
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Anyag Átvitel
 DocType: Fees,Send Payment Request,Fizetési kérelem küldése
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Adja meg a műveletet, a működési költségeket, és adjon meg egy egyedi műveletet a műveletekhez."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ez a dokumentum túlcsordult ennyivel {0} {1} erre a tételre {4}. Létrehoz egy másik {3}  ugyanazon {2} helyett?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,"Kérjük, állítsa be az ismétlődést a mentés után"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Válasszon váltópénz összeg számlát
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Válasszon váltópénz összeg számlát
 DocType: Purchase Invoice,Price List Currency,Árlista pénzneme
 DocType: Naming Series,User must always select,Felhasználónak mindig választani kell
 DocType: Stock Settings,Allow Negative Stock,Negatív készlet engedélyezése
@@ -2475,9 +2521,9 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Pénzeszközök forrását (kötelezettségek)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +381,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Mennyiségnek ebben a sorban {0} ({1}) meg kell egyeznie a gyártott mennyiséggel {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Alkalmazott
-DocType: Sample Collection,Collected Time,Gyűjtött idő
+DocType: Sample Collection,Collected Time,Gyűjtési idő
 DocType: Company,Sales Monthly History,Értékesítések havi története
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Válasszon köteget
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Válasszon köteget
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} teljesen számlázott
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Életjelek
 DocType: Training Event,End Time,Befejezés dátuma
@@ -2485,16 +2531,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Fizetési levonások vagy veszteségek
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Az általános szerződési feltételek az értékesítéshez vagy beszerzéshez.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Utalvány által csoportosítva
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Biztosan törölni szeretné ezt a találkozót?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Értékesítési folyamat
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},"Kérjük, állítsa be az alapértelmezett számla foókot a fizetés komponenshez {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Szükség
 DocType: Rename Tool,File to Rename,Átnevezendő fájl
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Kérjük, válassza ki ANYGJZ erre a tételre ebben a sorban {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Kérjük, válassza ki ANYGJZ erre a tételre ebben a sorban {0}"
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Számla {0} nem egyezik ezzel a vállalkozással {1} ebben a módban: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Meghatározott ANYAGJEGYZ {0} nem létezik erre a tételre {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,"Ezt a karbantartási ütemtervet:  {0}, törölni kell mielőtt lemondaná ezt a Vevői rendelést"
+DocType: POS Profile,Applicable for Users,Alkalmazható a felhasználók számára
 DocType: Notification Control,Expense Claim Approved,Költség igény jóváhagyva
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Bérpapír az Alkalmazotthoz: {0} már létezik erre az időszakra
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Bérpapír az Alkalmazotthoz: {0} már létezik erre az időszakra
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Gyógyszeripari
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Bszerzett tételek költsége
 DocType: Selling Settings,Sales Order Required,Vevői rendelés szükséges
@@ -2518,6 +2566,7 @@
 DocType: Offer Letter,Accepted,Elfogadva
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Szervezet
 DocType: BOM Update Tool,BOM Update Tool,ANYAGJ frissítő eszköz
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","A fél fiókja nincs megadva, kérjük, állítsa be a vállalat alapértelmezett fizetési számláját"
 DocType: SG Creation Tool Course,Student Group Name,Diák csoport neve
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Díjak létrehozása
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Kérjük, győződjön meg róla, hogy valóban törölni szeretné az összes tranzakció ennél a vállalatnál. Az Ön törzsadati megmaradnak. Ez a művelet nem vonható vissza."
@@ -2526,29 +2575,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) nem lehet nagyobb, mint a ({2}) tervezett mennyiség a {3} gyártási rendelésben"
 DocType: Shipping Rule,Shipping Rule Label,Szállítási szabály címkéi
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Felhasználói fórum
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Nyersanyagok nem lehet üres.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Nem sikerült frissíteni a készletet, számla tartalmaz közvetlen szállítási elemet."
-DocType: Lab Test Sample,Lab Test Sample,Lab test minta
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Nyersanyagok nem lehet üres.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Nem sikerült frissíteni a készletet, számla tartalmaz közvetlen szállítási elemet."
+DocType: Lab Test Sample,Lab Test Sample,Labor teszt minta
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Gyors Naplókönyvelés
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Nem tudod megváltoztatni az árat, ha az említett ANYGJZ összefügg már egy tétellel"
+DocType: Restaurant,Invoice Series Prefix,Számla sorozat előtag
 DocType: Employee,Previous Work Experience,Korábbi szakmai tapasztalat
 DocType: Stock Entry,For Quantity,Mennyiséghez
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Kérjük, adjon meg Tervezett Mennyiséget erre a tételre: {0} , ebben a sorban {1}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},"Kérjük, adjon meg Tervezett Mennyiséget erre a tételre: {0} , ebben a sorban {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} nem nyújtják be
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Kérelmek tételek.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Külön gyártási megrendelést hoz létre minden kész termékhez.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} negatívnak kell lennie a válasz dokumentumban
 ,Minutes to First Response for Issues,Eltelt percek a Probléma első lereagálásig
 DocType: Purchase Invoice,Terms and Conditions1,Általános szerződési feltételek1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,Az intézmény neve amelyre ezt a rendszert beállítja.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,Az intézmény neve amelyre ezt a rendszert beállítja.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Könyvelési tételt zárolt eddig a dátumig, senkinek nincs joga végrehajtani / módosítani a bejegyzést kivéve az alább meghatározott beosztásokkal rendelkezőket."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Kérjük, mentse a dokumentumot, a  karbantartási ütemterv létrehozása előtt"
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Legutóbbi ár frissítve az összes ANYAGJ-ben
 DocType: Fee Schedule,Successful,Sikeres
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekt téma állapota
 DocType: UOM,Check this to disallow fractions. (for Nos),"Jelölje be ezt, hogy ne engedélyezze a törtrészt. (a darab számokhoz)"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,A következő gyártási megrendelések jöttek létre:
-DocType: Student Admission,Naming Series (for Student Applicant),Sorszámozási csoportok (Tanuló Kérelmezőhöz)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,A következő gyártási megrendelések jöttek létre:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Sorszámozási csoportok (Tanuló Kérelmezőhöz)
 DocType: Delivery Note,Transporter Name,Fuvarozó neve
 DocType: Authorization Rule,Authorized Value,Jóváhagyott érték
 DocType: BOM,Show Operations,Műveletek megjelenítése
@@ -2565,21 +2615,21 @@
 DocType: Payment Entry,Deductions or Loss,Levonások vagy veszteségek
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +247,{0} {1} is closed,{0} {1} zárva
 DocType: Email Digest,How frequently?,Milyen gyakran?
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +57,Total Collected: {0},Összes összegyűjtött: {0}
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +57,Total Collected: {0},Összesen összegyűjtött: {0}
 DocType: Purchase Receipt,Get Current Stock,Aktuális raktárkészlet lekérés
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Fa az Anyagjegyzékekhez
 DocType: Student,Joining Date,Csatlakozási dátum
 ,Employees working on a holiday,Alkalmazott ünnepen is dolgozik
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Jelenlévőnek jelöl
 DocType: Project,% Complete Method,% befejező módszer
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Drog
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Drog
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Karbantartás kezdési időpontja nem lehet korábbi a szállítási határidőnél erre a széria sz: {0}
 DocType: Production Order,Actual End Date,Tényleges befejezési dátum
 DocType: BOM,Operating Cost (Company Currency),Üzemeltetési költség (Vállaklozás pénzneme)
 DocType: Purchase Invoice,PINV-,BESZSZ-
 DocType: Authorization Rule,Applicable To (Role),Alkalmazandó (Beosztás)
 DocType: BOM Update Tool,Replace BOM,Cserélje ki a ANYAGJ-et
-apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +110,Code {0} already exist,A {0} kód már létezik
+apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +110,Code {0} already exist,A(z) {0} kód már létezik
 DocType: Stock Entry,Purpose,Cél
 DocType: Company,Fixed Asset Depreciation Settings,Álló állóeszköz értékcsökkenés beállításai
 DocType: Item,Will also apply for variants unless overrridden,"Változatokra is alkalmazni fogja, hacsak nem kerül fellülírásra"
@@ -2590,24 +2640,25 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,"Jóváhagyó felhasználót nem lehet ugyanaz, mint a felhasználó a szabály alkalmazandó"
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Alapár (a Készlet mértékegysége szerint)
 DocType: SMS Log,No of Requested SMS,Igényelt SMS száma
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Fizetés nélküli távollét nem egyezik meg a jóváhagyott távolléti igény bejegyzésekkel
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Fizetés nélküli távollét nem egyezik meg a jóváhagyott távolléti igény bejegyzésekkel
 DocType: Campaign,Campaign-.####,Kampány -.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Következő lépések
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Kérjük szállítsa be a tételeket a lehető legjobb árakon
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Számla készítése
 DocType: Selling Settings,Auto close Opportunity after 15 days,Automatikus lezárása az ügyeknek 15 nap után
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,"Vásárlási rendelések nem engedélyezettek erre: {0}, mivel az eredménymutatók értéke: {1}."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,"Vásárlási rendelések nem engedélyezettek erre: {0}, mivel az eredménymutatók értéke: {1}."
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Befejező év
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Áraj / Lehet %
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,"Szerződés befejezés dátuma nem lehet nagyobb, mint a Csatlakozás dátuma"
 DocType: Vital Signs,Nutrition Values,Táplálkozási értékek
 DocType: Lab Test Template,Is billable,Számlázható
 DocType: Delivery Note,DN-,SZL-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}","Mind az &quot;Orvosok ütemezése&quot;, mind az idő per találkozó &quot;értéket a Dr {0}"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Egy forgalmazó / kereskedő / bizományos / társulat / viszonteladó harmadik fél, aki jutalákért eladja a vállalatok termékeit."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} a {1} Beszerzési megrendeléshez
-DocType: Patient,Patient Demographics,Patient Demographics
+DocType: Patient,Patient Demographics,Patient Demográfia
 DocType: Task,Actual Start Date (via Time Sheet),Tényleges kezdési dátum (Idő nyilvántartó szerint)
-apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,"Ez egy példa honlap, amit az ERPNext automatikusan generált"
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,"Ez egy példa honlap, amit automatikusan generált az ERPNext"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Öregedés tartomány 1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -2631,8 +2682,7 @@
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
 10. Add or Deduct: Whether you want to add or deduct the tax.","Alapértelmezett adó sablon, amelyet alkalmazni lehet, az összes beszerzési tranzakciókhoz. Ez a sablon tartalmazhat adó fejléc listákat és egyéb kiadás fejléceket, mint a ""Szállítás"", ""Biztosítás"", ""Kezelés"" stb. #### Megjegyzés: Az itt megadott adó mértéke határozná meg az adó normál kulcsát minden **tételnek**. Ha vannak más értékkel rendelkező **tételek**, akkor hozzá kell azokat adni az **Tétel adó** táblázathoz a **Tétel** törzsadatban. #### Oszlopok 1. leírása: Számítási típus: - Ez lehet a **Teljes nettó** (vagyis az alap érték összege). - **Az előző sor Összérték / Érték** (kumulatív adók vagy díjak). Ha ezt a lehetőséget választja, az adót százalékában fogja kezelni az előző sorból (az adótáblában) érték vagy összértékként. - **A tényleges** (mint említettük). 2. Főkönyv fejléc: A főkönyvi számla, amelyen ezt az adót könyvelik 3. Költséghely: Ha az adó / díj  jövedelem (például a szállítás), vagy költség akkor azt a Költség centrumhoz kell könyvelni. 4. Leírás: Adó leírása (amely nyomtat a számlákra / ajánlatokra). 5. Érték: adókulcs. 6. Összeg: Adó összege. 7. Teljes: Összesített összesen ebben a pontban. 8. Sor megadása: Ha ""Előző sor összértéke"" alapul, akkor kiválaszthatja a sor számát, mint ennek a számításnak az alapját (alapértelmezett az előző sor). 9. Vegye figyelembe az Adót vagy számítson fel érte: Ebben a részben beállíthatja , hogy az Adó / felszámítás csak becslés (nem része az összegnek) vagy csak összeg (nem ad további felszámítást a tételhez) vagy mindkettő. 10. Hozzáad vagy levon: Akár le akarja vonni vagy hozzáadni az Adót."
 DocType: Homepage,Homepage,Kezdőlap
-apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Válassza az orvos ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',frissítés tabConsultation set invoice = &#39;{0}&#39; ahol name = &#39;{1}&#39;
+apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Válasszon orvost...
 DocType: Purchase Receipt Item,Recd Quantity,Szüks Mennyiség
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Díj rekordok létrehozva - {0}
 DocType: Asset Category Account,Asset Category Account,Vagyoneszköz kategória főkönyvi számla
@@ -2644,15 +2694,15 @@
 DocType: Asset,Manual,Kézikönyv
 DocType: Salary Component Account,Salary Component Account,Bér összetevők számlája
 DocType: Global Defaults,Hide Currency Symbol,Pénznem szimbólumának elrejtése
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","pl. bank, készpénz, hitelkártya"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","pl. bank, készpénz, hitelkártya"
 DocType: Lead Source,Source Name,Forrás neve
-DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","A normális pihenő vérnyomás egy felnőttnél körülbelül 120 Hgmm szisztolés és 80 Hgmm diasztolés, rövidítve &quot;120/80 Hgmm&quot;"
+DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Normális pihenő vérnyomás egy felnőttnél körülbelül 120 Hgmm szisztolés és 80 Hgmm diasztolés, rövidítve ""120/80 Hgmm"""
 DocType: Journal Entry,Credit Note,Követelés értesítő
 DocType: Warranty Claim,Service Address,Szerviz címe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Bútorok és világítótestek
 DocType: Item,Manufacture,Gyártás
 apps/erpnext/erpnext/utilities/user_progress.py +24,Setup Company,Vállalkozás beállítása
-,Lab Test Report,Lab tesztjelentés
+,Lab Test Report,Labor tesztjelentés
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,"Kérjük, először a szállítólevelet"
 DocType: Student Applicant,Application Date,Jelentkezési dátum
 DocType: Salary Detail,Amount based on formula,Összeg a képlet alapján
@@ -2663,16 +2713,16 @@
 DocType: Patient,Occupation,Foglalkozása
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: kezdő dátumot kell lennie a befejezés dátuma
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Összesen(db)
-DocType: Sales Invoice,This Document,Ez a dokumentum
 DocType: Installation Note Item,Installed Qty,Telepített Mennyiség
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Ez az érvénytelen e-mail címek miatt lehet
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Ön hozzátette
 DocType: Purchase Taxes and Charges,Parenttype,Szülőtípus
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Képzési Eredmény
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Képzési Eredmény
 DocType: Purchase Invoice,Is Paid,Ez ki van fizetve
 DocType: Salary Structure,Total Earning,Összesen jóváírva
 DocType: Purchase Receipt,Time at which materials were received,Anyagok érkezésénak Időpontja
 DocType: Stock Ledger Entry,Outgoing Rate,Kimenő ár
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Vállalkozás ágazat törzsadat.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Vállalkozás ágazat törzsadat.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,vagy
 DocType: Sales Order,Billing Status,Számlázási állapot
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Probléma jelentése
@@ -2687,7 +2737,8 @@
 DocType: Notification Control,Sales Order Message,Vevői rendelés üzenet
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Alapértelmezett értékek, mint a vállalkozás, pénznem, folyó pénzügyi év, stb. beállítása."
 DocType: Payment Entry,Payment Type,Fizetési mód
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Kérjük, válasszon egy Köteget ehhez a tételhez {0}. Nem található egyedülállü köteg, amely megfelel ennek a követelménynek"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Kérjük, válasszon egy Köteget ehhez a tételhez {0}. Nem található egyedülállü köteg, amely megfelel ennek a követelménynek"
+DocType: Hub Category,Parent Category,szülő kategória
 DocType: Process Payroll,Select Employees,Válassza ki az Alkalmazottakat
 DocType: Opportunity,Potential Sales Deal,Potenciális értékesítési üzlet
 DocType: Complaint,Complaints,Panaszok
@@ -2724,7 +2775,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),Csomag azonosítása a szállításhoz (nyomtatáshoz)
 DocType: Bin,Reserved Quantity,Mennyiség fenntartva
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Kérem adjon meg egy érvényes e-mail címet
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,"Kérjük, válasszon ki egy tételt a kosárban"
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,"Kérjük, válasszon ki egy tételt a kosárban"
 DocType: Landed Cost Voucher,Purchase Receipt Items,Beszerzési megrendelés nyugta tételek
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Testreszabása Forms
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,Lemaradás
@@ -2734,15 +2785,15 @@
 DocType: Payment Request,Amount in customer's currency,Összeg ügyfél valutájában
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Szállítás
 DocType: Stock Reconciliation Item,Current Qty,Jelenlegi Mennyiség
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Szállítók hozzáadása
+DocType: Restaurant Menu,Restaurant Menu,Étterem menü
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Előző
 DocType: Appraisal Goal,Key Responsibility Area,Felelősségi terület
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Tanulók kötegei, segítenek nyomon követni a részvételt, értékeléseket és díjakat a hallgatókhoz"
 DocType: Payment Entry,Total Allocated Amount,Lefoglalt teljes összeg
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Alapértelmezett készlet számla beállítása a folyamatos készlethez
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Alapértelmezett készlet számla beállítása a folyamatos készlethez
 DocType: Item Reorder,Material Request Type,Anyagigénylés típusa
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural Naplókönyvelés fizetések származó {0} {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","HelyiRaktár tele van, nem mentettem"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","HelyiRaktár tele van, nem mentettem"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Sor {0}: UOM átváltási arányra is kötelező
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Szoba kapacitás
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Hiv.
@@ -2781,16 +2832,18 @@
 DocType: Project,Task Completion,Feladat befejezése
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Nincs raktáron
 DocType: Appraisal,HR User,HR Felhasználó
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POZÍCIÓ?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Levont adók és költségek
-apps/erpnext/erpnext/hooks.py +129,Issues,Problémák
+apps/erpnext/erpnext/hooks.py +138,Issues,Problémák
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Állapotnak az egyike kell llennie ennek {0}
 DocType: Sales Invoice,Debit To,Tartozás megterhelése
+DocType: Restaurant Menu Item,Restaurant Menu Item,Étterem menüpont
 DocType: Delivery Note,Required only for sample item.,Szükséges csak a minta elemet.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Tényleges Mennyiség a tranzakció után
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Nem található bérpapít {0} és {1} közt
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Nem található bérpapít {0} és {1} közt
 ,Pending SO Items For Purchase Request,Függőben lévő VR tételek erre a vásárolható rendelésre
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Tanuló Felvételi
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} le van tiltva
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Tanuló Felvételi
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} le van tiltva
 DocType: Supplier,Billing Currency,Számlázási Árfolyam
 DocType: Sales Invoice,SINV-RET-,ÉSZLA-ELLEN-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Extra Nagy
@@ -2813,6 +2866,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Kérjük említse meg a szükséges résztvevők számát
 DocType: Stock Settings,Default Valuation Method,Alapértelmezett készletérték számítási mód
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,Részvételi díj
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Frissítés folyamatban. Ez eltarthat egy ideig.
 DocType: Vehicle Log,Fuel Qty,Üzemanyag menny.
 DocType: Production Order Operation,Planned Start Time,Tervezett kezdési idő
 DocType: Course,Assessment,Értékelés
@@ -2828,8 +2882,8 @@
 DocType: Price List,Price List Master,Árlista törzsadat
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Minden értékesítési tranzakció címkézhető több ** Értékesítő személy** felé, így beállíthat és követhet célokat."
 ,S.O. No.,VR sz.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},"Kérjük, hozzon létre Vevőt ebből az Érdeklődésből: {0}"
-apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Válassza a Beteg lehetséget
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},"Kérjük, hozzon létre Vevőt ebből az Érdeklődésből: {0}"
+apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Válasszon Beteget
 DocType: Price List,Applicable for Countries,Alkalmazandó ezekhez az Országokhoz
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Paraméter neve
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"Csak ""Jóváhagyott"" és ""Elutasított"" állapottal rendelkező távollét igényeket lehet benyújtani"
@@ -2859,27 +2913,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,Beszállító Számla részletek
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Költség / Különbség számla ({0}) ,aminek ""Nyereség és Veszteség""  számlának kell lennie"
 DocType: Project,Copied From,Innen másolt
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Név hiba: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Hiány
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Név hiba: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,Hiány
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} nincs összekapcsolva ezekkel {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,A {0} alkalmazott már megjelölt a részvételin
 DocType: Packing Slip,If more than one package of the same type (for print),Ha egynél több csomag azonos típusból (nyomtatáshoz)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Állítsa be az alapértelmezett fogyasztót az éttermi beállítások között
 ,Salary Register,Bér regisztráció
 DocType: Warehouse,Parent Warehouse,Szülő Raktár
 DocType: C-Form Invoice Detail,Net Total,Nettó összesen
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Az alapértelmezett anyagjegyz BOM nem található erre a tételre: {0} és Projektre: {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Az alapértelmezett anyagjegyz BOM nem található erre a tételre: {0} és Projektre: {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Határozza meg a különböző hiteltípusokat
 DocType: Bin,FCFS Rate,Érkezési sorrend szerinti kiszolgálás FCFS ár
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Fennálló kinntlévő negatív összeg
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Idő (percekben)
 DocType: Project Task,Working,Folyamatban
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Készlet  folyamat (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Pénzügyi év
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Pénzügyi év
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} nem tartozik az  {1} vállalathoz
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,"Nem sikerült megoldani az értékelési pontszámot erre:  {0}. Győződjön meg arról, hogy a képlet érvényes."
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Költség ezen
-DocType: Healthcare Settings,Out Patient Settings,Out Patient Beállítások
+DocType: Healthcare Settings,Out Patient Settings,Betegen kívüli beállítások
 DocType: Account,Round Off,Összegyűjt
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,A mennyiségnek pozitívnak kell lennie
 ,Requested Qty,Kért Mennyiség
 DocType: Tax Rule,Use for Shopping Cart,Kosár használja
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Érték : {0} erre a tulajdonságra: {1} nem létezik a listán az érvényes Jellemző érték jogcímre erre a tételre: {2}
@@ -2888,7 +2944,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Díjak arányosan kerülnek kiosztásra a tétel mennyiség vagy összegei alapján, a kiválasztása szerint"
 DocType: Maintenance Visit,Purposes,Célok
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Legalább egy tételt kell beírni a negatív mennyiséggel a visszatérő dokumentumba
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Kurzusok hozzáadása
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Működés {0} hosszabb, mint bármely rendelkezésre álló munkaidő a munkaállomáson {1}, bontsa le a műveletet  több műveletre"
 ,Requested,Kért
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Nincs megjegyzés
@@ -2900,9 +2955,11 @@
 DocType: Employee Loan,Repaid/Closed,Visszafizetett/Lezárt
 DocType: Item,Total Projected Qty,Teljes kivetített db
 DocType: Monthly Distribution,Distribution Name,Felbontás neve
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Szállító&gt; Szállító típusa
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","A {0} tételhez nem található készletérték ár, amely a {1} {2} számviteli bejegyzések elvégzéséhez szükséges. Ha a nulla készletérték árral szerepel a tétel  az {1} -ben, kérjük, említse meg az {1} tétel táblázatában. Ellenkező esetben kérjük, hozzon létre egy bejövő állományi tranzakciót a tételre vagy a készletérték árra a Tétel rekordban, majd próbálja meg elküldeni / törölni ezt a bejegyzést"
 DocType: Course,Course Code,Tantárgy kódja
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Minőség-ellenőrzés szükséges erre a tételre {0}
-DocType: POS Settings,Use POS in Offline Mode,A POS funkció használata Offline módban
+DocType: POS Settings,Use POS in Offline Mode,POS kassza funkció használata Offline módban
 DocType: Supplier Scorecard,Supplier Variables,Beszállítói változók
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Arány, amelyen az Ügyfél pénznemét átalakítja a vállalakozás alapértelmezett pénznemére"
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Nettó ár (Vállalkozás pénznemében)
@@ -2910,16 +2967,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Terület fa kezelése.
 DocType: Journal Entry Account,Sales Invoice,Értékesítési számla
 DocType: Journal Entry Account,Party Balance,Ügyfél egyenlege
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,"Kérjük, válassza az Alkalmazzon kedvezményt ezen"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,"Kérjük, válassza az Alkalmazzon kedvezményt ezen"
 DocType: Company,Default Receivable Account,Alapértelmezett Bevételi számla
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Készítsen Bank bejegyzést a teljes bért fizetésre a fent kiválasztott kritériumoknak megfelelően
 DocType: Physician,Physician Schedule,Az orvos ütemezése
 DocType: Purchase Invoice,Deemed Export,Megfontolt export
 DocType: Stock Entry,Material Transfer for Manufacture,Anyag átvitel gyártásához
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Kedvezmény százalékot lehet alkalmazni vagy árlistában vagy az összes árlistában.
-DocType: Purchase Invoice,Half-yearly,Fél-évente
+DocType: Subscription,Half-yearly,Fél-évente
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Könyvelési tétel a Készlethez
-DocType: Lab Test,LabTest Approver,LabTest jóváhagyó
+DocType: Lab Test,LabTest Approver,LaborTeszt jóváhagyó
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Már értékelte ezekkel az értékelési kritériumokkal: {}.
 DocType: Vehicle Service,Engine Oil,Motorolaj
 DocType: Sales Invoice,Sales Team1,Értékesítő csapat1
@@ -2930,7 +2987,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,"Sor {0}: Befejezve Mennyiség nagyobbnak kell lennie, mint nulla."
 DocType: Antibiotic,Antibiotic Name,Antibiotikum neve
 DocType: Purchase Invoice,Apply Additional Discount On,Alkalmazzon további kedvezmény ezen
-apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Típus kiválasztása ...
+apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Válasszon típust...
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO (EBEK)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +132,Row # {0}: Cannot return more than {1} for Item {2},Sor # {0}: Nem lehet vissza több mint {1} jogcím {2}
@@ -2946,13 +3003,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Extra kicsi
 DocType: Company,Standard Template,Alapértelmezett sablon
 DocType: Training Event,Theory,Elmélet
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,"Figyelmeztetés: Anyag Igénylés mennyisége kevesebb, mint Minimális rendelhető menny"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,"Figyelmeztetés: Anyag Igénylés mennyisége kevesebb, mint Minimális rendelhető menny"
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,A {0} számla zárolt
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Jogi alany / leányvállalat a Szervezethez tartozó külön számlatükörrel
 DocType: Payment Request,Mute Email,E-mail elnémítás
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Élelmiszerek, italok és dohány"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Fizetni a csak még ki nem szálázott ellenében tud: {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,"Jutalék mértéke nem lehet nagyobb, mint a 100"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Fizetni a csak még ki nem szálázott ellenében tud: {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,"Jutalék mértéke nem lehet nagyobb, mint a 100"
 DocType: Stock Entry,Subcontract,Alvállalkozói
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,"Kérjük, adja be: {0} először"
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Nincs innen válasz
@@ -2964,26 +3021,27 @@
 DocType: SMS Log,No of Sent SMS,Elküldött SMS száma
 DocType: Antibiotic,Healthcare Administrator,Egészségügyi adminisztrátor
 apps/erpnext/erpnext/utilities/user_progress.py +44,Set a Target,Állítson be egy célt
-DocType: Dosage Strength,Dosage Strength,Adagolási erő
+DocType: Dosage Strength,Dosage Strength,Adagolási állomány
 DocType: Account,Expense Account,Költség számla
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Szoftver
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Szín
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Értékelési Terv kritériumai
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Vásárlási megrendelések megakadályozása
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Fogékony
 DocType: Patient Appointment,Scheduled,Ütemezett
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Ajánlatkérés.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Kérjük, állítsa be az alkalmazottak elnevezési rendszerét az emberi erőforrás&gt; HR beállításoknál"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Kérjük, válasszon tételt, ahol ""Készleten lévő tétel"" az ""Nem"" és ""Értékesíthető tétel"" az ""Igen"", és nincs más termék csomag"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Válasszon ügyfélt
 DocType: Student Log,Academic,Akadémiai
 DocType: Patient,Personal and Social History,Személyes és társadalmi történelem
-DocType: Fee Schedule,Fee Breakup for each student,Fee Breakup minden hallgató számára
+DocType: Fee Schedule,Fee Breakup for each student,Részvételi díj  szüneteltetés minden hallgató számára
 apps/erpnext/erpnext/controllers/accounts_controller.py +476,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Összesen előleg ({0}) erre a rendelésre {1} nem lehet nagyobb, mint a végösszeg ({2})"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Válassza ki a havi elosztást a célok egyenlőtlen elosztásához a hónapban .
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Kód módosítása
-DocType: Purchase Invoice Item,Valuation Rate,Becsült ár
+DocType: Purchase Invoice Item,Valuation Rate,Készletérték ár
 DocType: Stock Reconciliation,SR/,KÉSZLEGY /
 DocType: Vehicle,Diesel,Dízel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Árlista pénzneme nincs kiválasztva
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Árlista pénzneme nincs kiválasztva
 apps/erpnext/erpnext/config/healthcare.py +46,Results,Eredmények
 ,Student Monthly Attendance Sheet,Tanuló havi jelenléti ív
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Alkalmazott {0} már jelentkezett {1} között {2} és {3}
@@ -2998,7 +3056,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Kezelje a forgalmazókkal.
 DocType: Quality Inspection,Inspection Type,Vizsgálat típusa
 DocType: Fee Validity,Visited yet,Még látogatott
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Raktárak meglévő ügylettekkel nem konvertálhatóak csoporttá.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Raktárak meglévő ügylettekkel nem konvertálhatóak csoporttá.
 DocType: Assessment Result Tool,Result HTML,Eredmény HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Lejárat dátuma
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Add diákok
@@ -3019,13 +3077,13 @@
 DocType: Homepage,Company Description for website homepage,Vállalkozás leírása az internetes honlapon
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","A vevők kényelméért, ezek a kódok használhatók a nyomtatási formátumokhoz, mint számlákon és a szállítóleveleken"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Beszállító neve
-apps/erpnext/erpnext/accounts/report/financial_statements.py +152,Could not retrieve information for {0}.,Nem sikerült lekérni a {0} információkat.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +152,Could not retrieve information for {0}.,Nem sikerült lekérni információkat ehhez: {0} .
 DocType: Sales Invoice,Time Sheet List,Idő nyilvántartó lista
 DocType: Employee,You can enter any date manually,Manuálisan megadhat bármilyen dátumot
 DocType: Healthcare Settings,Result Printed,Eredmény Nyomtatott
 DocType: Asset Category Account,Depreciation Expense Account,Értékcsökkentési ráfordítás számla
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Próbaidő períódus
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Megtekintés {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Megtekintés {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Csak levélcsomópontok engedélyezettek a tranzakcióban
 DocType: Expense Claim,Expense Approver,Költség Jóváhagyó
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Sor {0}: A Vevővel szembeni előlegnek követelésnek kell lennie
@@ -3036,15 +3094,14 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Végső dátum
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Tanfolyam Menetrendek törölve:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Napló az sms küldési állapot figyelésére
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Állítsa be a célértéket
 DocType: Accounts Settings,Make Payment via Journal Entry,Naplókönyvelésen keresztüli befizetés létrehozás
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Nyomtatott ekkor
 DocType: Item,Inspection Required before Delivery,Vizsgálat szükséges a szállítás előtt
 DocType: Item,Inspection Required before Purchase,Vizsgálat szükséges a vásárlás előtt
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Függő Tevékenységek
-DocType: Patient Appointment,Reminded,emlékeztette
+DocType: Patient Appointment,Reminded,Emlékeztette
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,A szervezete
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,A szervezete
 DocType: Fee Component,Fees Category,Díjak Kategóriája
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,"Kérjük, adjon meg a mentesítési dátumot."
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Összeg
@@ -3056,7 +3113,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Újra rendelési szint
 DocType: Company,Chart Of Accounts Template,Számlatükör sablonok
 DocType: Attendance,Attendance Date,Részvétel dátuma
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Tétel ára frissítve: {0} Árlista {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Tétel ára frissítve: {0} Árlista {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Fizetés megszakítás a kereset és levonás alapján.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Al csomópontokkal rendelkező számlát nem lehet átalakítani főkönyvi számlává
 DocType: Purchase Invoice Item,Accepted Warehouse,Elfogadott raktárkészlet
@@ -3072,9 +3129,10 @@
 ,Employee Birthday,Alkalmazott születésnapja
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Tanuló köteg nyilvántartó eszköz
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,Limit Keresztbe
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Tervezett Upto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Kockázati tőke
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Egy tudományos kifejezés ezzel a 'Tanév ' {0} és a 'Félév neve' {1} már létezik. Kérjük, módosítsa ezeket a bejegyzéseket, és próbálja újra."
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Mivel már vannak tranzakciók ehhez az  elemhez: {0}, ezért nem tudja megváltoztatni ennek az értékét {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Mivel már vannak tranzakciók ehhez az  elemhez: {0}, ezért nem tudja megváltoztatni ennek az értékét {1}"
 DocType: UOM,Must be Whole Number,Egész számnak kell lennie
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Új távollét lefoglalása (napokban)
 DocType: Purchase Invoice,Invoice Copy,Számla másolás
@@ -3084,7 +3142,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Számla száma
 DocType: Shopping Cart Settings,Orders,Rendelések
 DocType: Employee Leave Approver,Leave Approver,Távollét jóváhagyó
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,"Kérjük, válasszon egy köteget"
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,"Kérjük, válasszon egy köteget"
 DocType: Assessment Group,Assessment Group Name,Értékelési csoport neve
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Anyag átadott gyártáshoz
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Egy felhasználó a ""Költség Jóváhagyó"" beosztással"
@@ -3099,7 +3157,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Nevezési határidő Időszaka
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Osztály kiválasztása ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Költséghelyet meglévő tranzakciókkal nem lehet átalakítani csoporttá
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Összeg: {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Összeg: {0} {1} {2} {3}
 DocType: Account,Depreciation,Értékcsökkentés
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Beszállító (k)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Alkalmazott nyilvántartó Eszköz
@@ -3110,10 +3168,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,"Fizetési bejegyzések {0}, melyek nem-kedveltek"
 DocType: GL Entry,Voucher No,Bizonylatszám
 ,Lead Owner Efficiency,Érdeklődés Tulajdonos Hatékonysága
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Legnepszerubb
 DocType: Leave Allocation,Leave Allocation,Távollét lefoglalása
 DocType: Payment Request,Recipient Message And Payment Details,Címzett üzenet és fizetési részletek
 DocType: Training Event,Trainer Email,Képző Email
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,{0} anyagigénylés létrejött
+DocType: Restaurant Reservation,No of People,Emberek száma
 DocType: Production Planning Tool,Include sub-contracted raw materials,Tartalmazza az alvállalkozók nyersanyagait
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Sablon a feltételekre vagy szerződésre.
 DocType: Purchase Invoice,Address and Contact,Cím és kapcsolattartó
@@ -3122,10 +3182,11 @@
 DocType: Supplier,Last Day of the Next Month,Utolsó nap a következő hónapban
 DocType: Support Settings,Auto close Issue after 7 days,Automatikus lezárása az ügyeknek 7 nap után
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Távollétet nem lehet kiosztani előbb mint {0}, mivel a távollét egyenleg már továbbított ehhez a jövőbeni távollét kiosztás rekordhoz {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Megjegyzés: Esedékesség / Referencia dátum túllépése engedélyezett az ügyfél hitelezésre {0} nap(ok)al
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Megjegyzés: Esedékesség / Referencia dátum túllépése engedélyezett az ügyfél hitelezésre {0} nap(ok)al
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Tanuló kérelmező
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,EREDETI A KEDVEZMÉNYEZETTNEK
 DocType: Asset Category Account,Accumulated Depreciation Account,Halmozott értékcsökkenés számla
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Ez az e-mail automatikusan generált
 DocType: Stock Settings,Freeze Stock Entries,Készlet zárolás
 DocType: Program Enrollment,Boarding Student,Étkezés tanuló
 DocType: Asset,Expected Value After Useful Life,Várható érték a  hasznos élettartam után
@@ -3133,7 +3194,7 @@
 DocType: Activity Cost,Billing Rate,Számlázási ár
 ,Qty to Deliver,Leszállítandó mannyiség
 ,Stock Analytics,Készlet analítika
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Műveletek nem maradhatnak üresen
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Műveletek nem maradhatnak üresen
 DocType: Maintenance Visit Purpose,Against Document Detail No,Ellen Dokument Részlet sz.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Ügyfél típus kötelező
 DocType: Quality Inspection,Outgoing,Kimenő
@@ -3155,7 +3216,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Válassza a diákokat kézzel az Aktivitás alapú csoporthoz
 DocType: Journal Entry,User Remark,Felhasználói megjegyzés
 DocType: Lead,Market Segment,Piaci rész
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},"Fizetett összeg nem lehet nagyobb, mint a teljes negatív kinntlévő összeg {0}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},"Fizetett összeg nem lehet nagyobb, mint a teljes negatív kinntlévő összeg {0}"
 DocType: Supplier Scorecard Period,Variables,Változók
 DocType: Employee Internal Work History,Employee Internal Work History,Alkalmazott cégen belüli mozgása
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Zárás (Dr)
@@ -3184,21 +3245,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Változások lekérdezése
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: fiók {2} nem tartozik ehhez a vállalkozáshoz {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,"A(z) {0} anyagigénylés törölve, vagy leállítva"
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Távollét kezelő
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Távollét kezelő
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Számla által csoportosítva
 DocType: Sales Order,Fully Delivered,Teljesen leszállítva
 DocType: Lead,Lower Income,Alacsonyabb jövedelmű
+DocType: Restaurant Order Entry,Current Order,Jelenlegi megrendelés
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Forrás és cél raktárban nem lehet azonos sorban {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Különbség számlának Eszköz / Kötelezettség típusú számlának kell lennie, mivel ez a Készlet egyeztetés egy kezdő könyvelési tétel"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},"Folyósított összeg nem lehet nagyobb, a kölcsön összegénél {0}"
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Menjen a Programok menüpontra
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Beszerzési megrendelés száma szükséges ehhez az elemhez {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Gyártási rendelés nincs létrehozva
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Gyártási rendelés nincs létrehozva
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"a ""Dátumtól"" értéknek későbbinek kell lennie a ""Dátumig"" értéknél"
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},"Nem lehet megváltoztatni az állapotát, mivel a hallgató: {0} hozzá van fűzve ehhez az alkalmazáshoz: {1}"
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},"Nem lehet megváltoztatni az állapotát, mivel a hallgató: {0} hozzá van fűzve ehhez az alkalmazáshoz: {1}"
 DocType: Asset,Fully Depreciated,Teljesen amortizálódott
 ,Stock Projected Qty,Készlet kivetített Mennyiség
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Vevő {0} nem tartozik ehhez a projekthez {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Vevő {0} nem tartozik ehhez a projekthez {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Jelzett Nézőszám HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Árajánlatok mind javaslatok, a vásárlói részére kiküldött ajánlatok"
 DocType: Sales Order,Customer's Purchase Order,Vevői  Beszerzési megrendelés
@@ -3209,8 +3271,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Kérjük, állítsa be a könyvelt amortizációk számát"
 DocType: Supplier Scorecard Period,Calculations,Számítások
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Érték vagy menny
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Gyártási rendeléseket nem lehet megemelni erre:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Gyártási rendeléseket nem lehet megemelni erre:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Perc
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Állítsa be a Naming sorozat {0} beállítását a Beállítás&gt; Beállítások&gt; Nevezési sorozatok segítségével
 DocType: Purchase Invoice,Purchase Taxes and Charges,Beszerzési megrendelés Adók és díjak
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Menjen a Beszállítókhoz
 ,Qty to Receive,Mennyiség a fogadáshoz
@@ -3223,11 +3286,11 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Követelés főkönyvi számlának Mérlegszámlának kell lennie
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Összes beszállító típus
 DocType: Global Defaults,Disable In Words,Szavakkal mező elrejtése
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Tétel kód megadása kötelező, mert Tétel nincs automatikusan számozva"
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,"Tétel kód megadása kötelező, mert Tétel nincs automatikusan számozva"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Árajánlat {0} nem ilyen típusú {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Karbantartandó ütemező tétel
 DocType: Sales Order,%  Delivered,% kiszállítva
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,"Kérjük, állítsa be az e-mail azonosítót a hallgatónak a fizetési kérelem elküldéséhez"
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,"Kérjük, állítsa be az e-mail azonosítót a hallgatónak a fizetési igény kérelem elküldéséhez"
 DocType: Production Order,PRO-,GYR-
 DocType: Patient,Medical History,Kórtörténet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Folyószámlahitel főkönyvi számla
@@ -3245,23 +3308,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Saját tőke nyitó egyenlege
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Egyeztetés
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Megmaradó
 DocType: Appraisal,Appraisal,Teljesítmény értékelés
 DocType: Purchase Invoice,GST Details,GST részletei
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},E-mailt elküldve a beszállítóhoz {0}
+DocType: Item,Default Sales Unit of Measure,Alapértelmezett értékesítési egység
 DocType: Opportunity,OPTY-,LEHET-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Dátum megismétlődik
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Jóváhagyott aláírás
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Távollét jóváhagyónak ezek küzül kell lennie egynek {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Díjak létrehozása
-DocType: Hub Settings,Seller Email,Eladó Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Beszerzés teljes költsége (Beszerzési számla alapján)
 DocType: Training Event,Start Time,Kezdés ideje
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Válasszon mennyiséget
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Válasszon mennyiséget
 DocType: Customs Tariff Number,Customs Tariff Number,Vámtarifa szám
-DocType: Patient Appointment,Patient Appointment,A betegek kinevezése
+DocType: Patient Appointment,Patient Appointment,A betegek vizit látogatása
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"Jóváhagyó beosztás nem lehet ugyanaz, mint a beosztás melyre a szabály alkalmazandó"
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Leiratkozni erről az üsszefoglaló e-mail -ről
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Leiratkozni erről az üsszefoglaló e-mail -ről
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Szerezd meg beszállítóit
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} nem található az {1} tételnél
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Menjen a Tanfolyamokra
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Üzenet elküldve
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Al csomópontokkal rendelkező számlát nem lehet beállítani főkönyvi számlává
@@ -3274,11 +3340,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Anyag átrakva gyártáshoz
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,A {0} számla nem létezik
 DocType: Project,Project Type,Projekt téma típusa
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Gyermekfeladat létezik erre a feladatra. Ezt a feladatot nem törölheti.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Vagy előirányzott Menny. vagy előirányzott összeg kötelező
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Különböző tevékenységek költsége
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Nincs több eredmény
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Különböző tevékenységek költsége
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Beállítás Események {0}, mivel az Alkalmazott hozzácsatolt a lenti értékesítőkhöz, akiknek  nincsenek felhasználói azonosítói: {1}"
 DocType: Timesheet,Billing Details,Számlázási adatok
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Forrás és cél raktárnak különböznie kell
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Forrás és cél raktárnak különböznie kell
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},"Nem engedélyezett a készlet tranzakciók frissítése, mely régebbi, mint {0}"
 DocType: Purchase Invoice Item,PR Detail,FIZKER részlete
 DocType: Sales Order,Fully Billed,Teljesen számlázott
@@ -3304,28 +3372,27 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Banki átutalás
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Összes ellenőrzése
 DocType: Vehicle Log,Invoice Ref,Számla hiv.
-DocType: Purchase Order,Recurring Order,Ismétlődő rendelés
 DocType: Company,Default Income Account,Alapértelmezett bejövő számla
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Vevő csoport / Vevő
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Lezáratlan pénzügyi évek nyereség / veszteség (Követelés)
 DocType: Sales Invoice,Time Sheets,Idő nyilvántartások
-DocType: Lab Test Template,Change In Item,Cikk módosítása
+DocType: Lab Test Template,Change In Item,Módosítása a tételben
 DocType: Payment Gateway Account,Default Payment Request Message,Alapértelmezett fizetendő kérelem Üzenet
 DocType: Item Group,Check this if you want to show in website,"Jelölje be, ha azt szeretné, hogy látszódjon a weboldalon"
 apps/erpnext/erpnext/config/accounts.py +142,Banking and Payments,Banki ügyletek és Kifizetések
 ,Welcome to ERPNext,Üdvözöl az ERPNext
 apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Érdeklődést Lehetőséggé
-DocType: Patient,A Negative,Negatív
+DocType: Patient,A Negative,Egy negatív
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Nincs mást mutatnak.
 DocType: Lead,From Customer,Vevőtől
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Hívások
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Hívások
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Egy termék
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,"Sarzsok, kötegek"
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,"Sarzsok, kötegek"
 DocType: Project,Total Costing Amount (via Time Logs),Összes Költség Összeg (Időnyilvántartó szerint)
-apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Make Fee Schedule
+apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Díj ütemezés létrehozása
 DocType: Purchase Order Item Supplied,Stock UOM,Készlet mértékegysége
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +230,Purchase Order {0} is not submitted,Beszerzési megrendelés {0} nem nyújtják be
-DocType: Vital Signs,Normal reference range for an adult is 16–20 breaths/minute (RCP 2012),A normál referencia tartomány egy felnőtt számára 16-20 légvétel / perc (RCP 2012)
+DocType: Vital Signs,Normal reference range for an adult is 16–20 breaths/minute (RCP 2012),A normál referencia tartomány egy felnőtt számára 16-20 légvétel/perc (RCP 2012)
 DocType: Customs Tariff Number,Tariff Number,Vámtarifaszám
 DocType: Production Order Item,Available Qty at WIP Warehouse,Elérhető Mennyiség a WIP raktárban
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Tervezett
@@ -3340,11 +3407,11 @@
 DocType: Healthcare Settings,Avoid Confirmation,Kerülje a megerősítést
 DocType: Purchase Receipt Item,Rate and Amount,Érték és mennyiség
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +165,Account Type for {0} must be {1},Számla típusa ehhez: {0} ennek kell lennie: {1}
-DocType: Healthcare Settings,Default income accounts to be used if not set in Physician to book Consultation charges.,"Alapértelmezett bevételi számlákat kell használni, ha az orvos nem rendelkezik a konzultációs díjak lefoglalásával."
+DocType: Healthcare Settings,Default income accounts to be used if not set in Physician to book Consultation charges.,"Alapértelmezett bevételi számlákat kell használni, ha az orvos nem rendelkezik jogosultsággal a konzultációs díjak lefoglalásához."
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Távollétek és ünnepek
 DocType: School Settings,Current Academic Term,Aktuális Akadémiai szemeszter
 DocType: Sales Order,Not Billed,Nem számlázott
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Mindkét Raktárnak ugyanahhoz a céghez kell tartoznia
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Mindkét Raktárnak ugyanahhoz a céghez kell tartoznia
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Nincs még kapcsolat hozzáadva.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Beszerzési költség utalvány összege
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Beszállítók által benyújtott számlák
@@ -3353,7 +3420,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Kedvezmény összege
 DocType: Purchase Invoice,Return Against Purchase Invoice,Beszerzési számla ellenszámlája
 DocType: Item,Warranty Period (in days),Garancia hossza (napokban)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',frissítse a `tabPatient Appointment` beállítást sales_invoice = &#39;{0}&#39; ahol name = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Összefüggés a Helyettesítő1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Származó nettó a műveletekből
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,4. tétel
@@ -3362,18 +3428,19 @@
 DocType: Journal Entry Account,Journal Entry Account,Könyvelési tétel számlaszáma
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Diákcsoport
 DocType: Shopping Cart Settings,Quotation Series,Árajánlat szériák
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Egy tétel létezik azonos névvel ({0}), kérjük, változtassa meg a tétel csoport nevét, vagy nevezze át a tételt"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,"Kérjük, válasszon vevőt"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Egy tétel létezik azonos névvel ({0}), kérjük, változtassa meg a tétel csoport nevét, vagy nevezze át a tételt"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,"Kérjük, válasszon vevőt"
 DocType: C-Form,I,én
 DocType: Company,Asset Depreciation Cost Center,Vagyoneszköz Értékcsökkenés Költséghely
 DocType: Sales Order Item,Sales Order Date,Vevői rendelés dátuma
 DocType: Sales Invoice Item,Delivered Qty,Kiszállított mennyiség
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Ha be van jelölve, az összes gyártási tétel al tétele bekerül az anyag igénylés kérésekbe."
 DocType: Assessment Plan,Assessment Plan,Értékelés terv
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Az ügyfél {0} jön létre.
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Az ügyfél {0} létrehozva.
 DocType: Stock Settings,Limit Percent,Limit Percent
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Jelenleg nincs raktárkészlet
 ,Payment Period Based On Invoice Date,Fizetési határidő számla dátuma alapján
-DocType: Sample Collection,No. of print,A nyomtatás száma
+DocType: Sample Collection,No. of print,Nyomtatás száma
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Hiányzó pénznem árfolyamok ehhez: {0}
 DocType: Assessment Plan,Examiner,Vizsgáztató
 DocType: Patient Relation,Siblings,Testvérek
@@ -3411,7 +3478,7 @@
 DocType: Asset Movement,Source Warehouse,Forrás raktár
 DocType: Installation Note,Installation Date,Telepítés dátuma
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not belong to company {2},Sor # {0}: {1} Vagyontárgy nem tartozik ehhez a céghez {2}
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,A {0} értékesítési számlázás létrejött
+apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,A {0} kimenő értékesítési számla létrehozva
 DocType: Employee,Confirmation Date,Visszaigazolás dátuma
 DocType: C-Form,Total Invoiced Amount,Teljes kiszámlázott összeg
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +49,Min Qty can not be greater than Max Qty,"Min Menny nem lehet nagyobb, mint Max Mennyiség"
@@ -3427,13 +3494,14 @@
 DocType: Customer,CUST-,VEVO-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruttó bér - Összes levonás - Hitel visszafizetése
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,Jelenlegi anyagjegyzék és az ÚJ anyagjegyzés nem lehet ugyanaz
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Bérpapír ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Bérpapír ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,"Nyugdíjazás dátumának nagyobbnak kell lennie, mint Csatlakozás dátuma"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Hibák voltak az kurzusok ütemezése közben:
 DocType: Sales Invoice,Against Income Account,Elleni jövedelem számla
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% szállítva
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,"Tétel {0}: Rendelet Mennyisége: {1} nem lehet kevesebb, mint a minimális rendelési mennyiség {2} (Tételnél meghatározott)."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,"Tétel {0}: Rendelet Mennyisége: {1} nem lehet kevesebb, mint a minimális rendelési mennyiség {2} (Tételnél meghatározott)."
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Havi Felbontás százaléka
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,"Kérjük, lépjen be másik felhasználóként."
 DocType: Territory,Territory Targets,Területi célok
 DocType: Delivery Note,Transporter Info,Fuvarozó adatai
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},"Kérjük, állítsa be alapértelmezettnek {0} ebben a vállalkozásban {1}"
@@ -3441,13 +3509,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Ugyanaz a szállító már többször megjelenik
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Bruttó nyereség / veszteség
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Beszerzési megrendelés tétele leszállítva
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,A Válallkozás neve nem lehet Válallkozás
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,A Válallkozás neve nem lehet Válallkozás
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Levél fejlécek a nyomtatási sablonokhoz.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Címek nyomtatási sablonokhoz pl. Pro forma számla.
 DocType: Program Enrollment,Walking,Gyalog
 DocType: Student Guardian,Student Guardian,Diák felügyelő
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Készletérték típusú költségeket nem lehet megjelölni értékbe beszámíthatónak
 DocType: POS Profile,Update Stock,Készlet frissítése
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,az előfizetésben
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Különböző mértékegység a tételekhez, helytelen (Összes) Nettó súly értékhez vezet. Győződjön meg arról, hogy az egyes tételek nettó tömege ugyanabban a mértékegységben van."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Anyagjegyzék Díjszabási ár
 DocType: Asset,Journal Entry for Scrap,Naplóbejegyzés selejtezéshez
@@ -3495,15 +3564,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Rendszer felhasználói (belépés) ID. Ha be van állítva, ez lesz az alapértelmezés minden HR űrlaphoz."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Feladó {1}
 DocType: Task,depends_on,attól függ
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Sorbaállítva a legfrissebb ár frissítéséhez minden anyagjegyzékben. Néhány percig eltarthat.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Sorbaállítva a legfrissebb ár frissítéséhez minden anyagjegyzékben. Néhány percig eltarthat.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Új fiók  neve. Megjegyzés: Kérjük, ne hozzon létre Vevő és Beszállítói fiókokat."
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Országonként eltérő címlista sablonok
 DocType: Sales Order Item,Supplier delivers to Customer,Beszállító szállít a Vevőnek
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/Item/{0}) elfogyott
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Határidő / referencia dátum nem lehet {0} utáni
+,Sales Payment Summary,Értékesítési fizetési összefoglaló
+DocType: Restaurant,Restaurant,Étterem
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Határidő / referencia dátum nem lehet {0} utáni
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Adatok importálása és exportálása
 DocType: Patient,Account Details,Számla adatok
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Nem talált diákokat
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Nem talált diákokat
 DocType: Medical Department,Medical Department,Orvosi osztály
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Beszállító mutatószámok jegyzési kritériumai
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Számla Könyvelési dátuma
@@ -3514,7 +3585,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,"Kérjük, válasszon könyvelési dátumot az Ügyfél kiválasztása előtt"
 DocType: Program Enrollment,School House,Iskola épület
 DocType: Serial No,Out of AMC,ÉKSz időn túl
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,"Kérjük, válasszon Árajánlatot"
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,"Kérjük, válasszon Árajánlatot"
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Lekönyvelt amortizációk száma nem lehet nagyobb, mint az összes amortizációk száma"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Karbantartási látogatás készítés
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,"Kérjük, lépjen kapcsolatba a felhasználóval, akinek van Értékesítési törzsadat kezelő {0} beosztása"
@@ -3522,7 +3593,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Vállalkozás (nem vevő vagy beszállító) törzsadat.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Ez a Tanuló jelenlétén alapszik
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Nincs diák ebben
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,További tételek hozzáadása vagy nyisson új űrlapot
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,További tételek hozzáadása vagy nyisson új űrlapot
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,"A {0} Szállítóleveleket törölni kell, mielőtt lemondásra kerül a Vevői rendelés"
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Menjen a felhasználókhoz
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,"Fizetett összeg + Leírható összeg nem lehet nagyobb, mint a Teljes összeg"
@@ -3542,37 +3613,40 @@
 DocType: Fee Schedule,Fee Schedule,Díj időzítése
 DocType: Hub Settings,Publish Availability,Közzététel Elérhetőség
 DocType: Company,Create Chart Of Accounts Based On,Készítsen számlatükröt ez alapján
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Nem lehet konvertálni nem csoportba. Gyermek feladatok léteznek.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Születési idő nem lehet nagyobb a mai napnál.
 ,Stock Ageing,Készlet öregedés
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Tanuló {0} létezik erre a hallgatói kérelmezésre {1}
-DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Kerekítési korrekció (vállalati pénznem)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Jelenléti ív
+DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Kerekítési korrekció (vállalkozás pénzneme)
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Jelenléti ív
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' letiltott
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Megnyitottá állít
 DocType: Cheque Print Template,Scanned Cheque,Beolvasott Csekk
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Küldjön automatikus e-maileket a Kapcsolatoknak a benyújtott tranzakciókkal.
 DocType: Timesheet,Total Billable Amount,Összesen számlázható összeg
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,3. tétel
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Rendelési bejegyzés
 DocType: Purchase Order,Customer Contact Email,Vevői Email
 DocType: Warranty Claim,Item and Warranty Details,Tétel és garancia Részletek
 DocType: Sales Team,Contribution (%),Hozzájárulás (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Megjegyzés: Fizetés bejegyzés nem hozható létre, mivel 'Készpénz vagy bankszámla' nem volt megadva"
-DocType: Medical Department,Nursing User,Ápolási felhasználó
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,A {0} projekt már létezik
+DocType: Medical Department,Nursing User,Ápoló felhasználó
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Felelősségek
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Ennek az árajánlatnak az érvényességi ideje lejárt.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Ennek az árajánlatnak az érvényességi ideje lejárt.
 DocType: Expense Claim Account,Expense Claim Account,Költség követelés számla
 DocType: Accounts Settings,Allow Stale Exchange Rates,Engedélyezze az átmeneti árfolyamokat
 DocType: Sales Person,Sales Person Name,Értékesítő neve
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Kérjük, adjon meg legalább 1 számlát a táblázatban"
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Felhasználók hozzáadása
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Felhasználók hozzáadása
 DocType: POS Item Group,Item Group,Anyagcsoport
 DocType: Item,Safety Stock,Biztonsági készlet
 DocType: Healthcare Settings,Healthcare Settings,Egészségügyi beállítások
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,"Haladás % , egy feladatnak nem lehet nagyobb, mint 100."
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,"Haladás % , egy feladatnak nem lehet nagyobb, mint 100."
 DocType: Stock Reconciliation Item,Before reconciliation,Főkönyvi egyeztetés előtt
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Címzett {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Adók és költségek hozzáadva (a vállalkozás pénznemében)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Tétel adó sor: {0} , melynek vagy adó vagy bevétel vagy kiadás vagy megterhelhető főkönyvi típusú számlának kell lennie."
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Tétel adó sor: {0} , melynek vagy adó vagy bevétel vagy kiadás vagy megterhelhető főkönyvi típusú számlának kell lennie."
 DocType: Sales Order,Partly Billed,Részben számlázott
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,"Tétel: {0}, befektetett eszköz tételnek kell lennie"
 DocType: Item,Default BOM,Alapértelmezett anyagjegyzék BOM
@@ -3587,7 +3661,8 @@
 DocType: Asset Category Account,Fixed Asset Account,Állóeszköz-számlafiók
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,Változó
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Szállítólevélből
-DocType: Student,Student Email Address,Tanuló email cím
+DocType: Student,Student Email Address,Tanuló email címe
+DocType: Item,Hub Warehouse,Hub Raktár
 DocType: Physician Schedule Time Slot,From Time,Időtől
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Raktáron:
 DocType: Notification Control,Custom Message,Egyedi üzenet
@@ -3595,9 +3670,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,Készpénz vagy bankszámla kötelező a fizetés bejegyzéshez
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Tanul címe
 DocType: Purchase Invoice,Price List Exchange Rate,Árlista váltási árfolyama
+DocType: POS Profile,POS Profile Name,POS profil neve
 DocType: Purchase Invoice Item,Rate,Arány
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Belső
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Cím Neve
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Cím Neve
 DocType: Stock Entry,From BOM,Anyagjegyzékből
 DocType: Assessment Code,Assessment Code,Értékelés kód
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Alapvető
@@ -3611,11 +3687,12 @@
 DocType: Salary Slip,Salary Structure,Bérrendszer
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Légitársaság
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Problémás Anyag
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Problémás Anyag
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Hiba történt az  ismétlődő létrehozásakor
 DocType: Material Request Item,For Warehouse,Ebbe a raktárba
 DocType: Employee,Offer Date,Ajánlat dátuma
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Árajánlatok
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,"Ön offline módban van. Ön nem lesz képes, frissíteni amíg nincs hálózata."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,"Ön offline módban van. Ön nem lesz képes, frissíteni amíg nincs hálózata."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Diákcsoportokat nem hozott létre.
 DocType: Purchase Invoice Item,Serial No,Széria sz.
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,"Havi törlesztés összege nem lehet nagyobb, mint a hitel összege"
@@ -3625,33 +3702,35 @@
 DocType: Salary Slip,Total Working Hours,Teljes munkaidő
 DocType: Subscription,Next Schedule Date,Következő ütemterv dátuma
 DocType: Stock Entry,Including items for sub assemblies,Tartalmazza a részegységek tételeit
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Beírt értéknek pozitívnak kell lennie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Összes Terület
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Beírt értéknek pozitívnak kell lennie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Összes Terület
 DocType: Purchase Invoice,Items,Tételek
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Tanuló már részt.
 DocType: Fiscal Year,Year Name,Év Neve
 DocType: Process Payroll,Process Payroll,Bérszámfejtéséhez
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,"Jelenleg több a szabadság, mint a  munkanap ebben a hónapban."
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,"Jelenleg több a szabadság, mint a  munkanap ebben a hónapban."
 DocType: Product Bundle Item,Product Bundle Item,Gyártmány tétel csomag
 DocType: Sales Partner,Sales Partner Name,Vevő partner neve
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Árajánlatkérés
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Árajánlatkérés
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maximális Számla összege
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hematológiai
 DocType: Normal Test Items,Normal Test Items,Normál vizsgálati tételek
 DocType: Student Language,Student Language,Diák anyanyelve
 apps/erpnext/erpnext/config/selling.py +23,Customers,Vevők
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +24,Order/Quot %,Rendelés / menny %
-apps/erpnext/erpnext/config/healthcare.py +25,Record Patient Vitals,Record betegek Vitals
+apps/erpnext/erpnext/config/healthcare.py +25,Record Patient Vitals,Betegek életjeleinek rögzítése
 DocType: Fee Schedule,Institution,Intézmény
 DocType: Asset,Partially Depreciated,Részben leértékelődött
 DocType: Issue,Opening Time,Kezdési idő
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Ettől és eddig időpontok megadása
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Értékpapírok & árutőzsdék
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Alapértelmezett mértékegysége a '{0}' variánsnak meg kell egyeznie a '{1}' sablonban lévővel.
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Alapértelmezett mértékegysége a '{0}' variánsnak meg kell egyeznie a '{1}' sablonban lévővel.
 DocType: Shipping Rule,Calculate Based On,Számítás ezen alapul
 DocType: Delivery Note Item,From Warehouse,Raktárról
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Nincs elem az Anyagjegyzéken a Gyártáshoz
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Nincs elem az Anyagjegyzéken a Gyártáshoz
+DocType: Restaurant,Default Customer,Alapértelmezett ügyfél
 DocType: Assessment Plan,Supervisor Name,Felügyelő neve
-DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Ne erősítse meg, hogy ugyanazon a napon találkozik-e"
+DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Ne erősítse meg, hogy ugyanazon a napra már van találkozója"
 DocType: Program Enrollment Course,Program Enrollment Course,Program Jelentkezés kurzus
 DocType: Purchase Taxes and Charges,Valuation and Total,Készletérték és Teljes érték
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +11,Scorecards,Mutatószámok-
@@ -3676,7 +3755,7 @@
 DocType: Payment Entry,Internal Transfer,belső Transfer
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Al fiók létezik erre a számlára. Nem törölheti ezt a fiókot.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Vagy előirányzott Menny. vagy előirányzott összeg kötelező
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Nincs alapértelmezett Anyagjegyzék erre a tételre {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Nincs alapértelmezett Anyagjegyzék erre a tételre {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,"Kérjük, válasszon Könyvelési dátumot  először"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Nyitás dátumának előbb kel llennie mint a  zárás dátuma
 DocType: Leave Control Panel,Carry Forward,Átvihető a szabadság
@@ -3695,9 +3774,9 @@
 DocType: Journal Entry,Bank Entry,Bank adatbevitel
 DocType: Authorization Rule,Applicable To (Designation),Alkalmazandó (Titulus)
 ,Profitability Analysis,Jövedelmezőség elemzése
-DocType: Fees,Student Email,Diákok e-mailje
+DocType: Fees,Student Email,Diák e-mailje
 DocType: Supplier,Prevent POs,Megakadályozzák a Vásárlói megrendeléseket
-DocType: Patient,"Allergies, Medical and Surgical History","Allergiák, orvosi és sebészeti történelem"
+DocType: Patient,"Allergies, Medical and Surgical History","Allergiák, orvosi és sebészeti előzmény"
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Adja a kosárhoz
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Csoportosítva
 DocType: Guardian,Interests,Érdekek
@@ -3711,6 +3790,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Összesen meglévő
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,Könyvelési kimutatások
 DocType: Drug Prescription,Hour,Óra
+DocType: Restaurant Order Entry,Last Sales Invoice,Utolsó értékesítési számla
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Új széria számnak nem lehet Raktára. Raktárat be kell állítani a Készlet bejegyzéssel vagy Beszerzési nyugtával
 DocType: Lead,Lead Type,Érdeklődés típusa
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Nincs engedélye jóváhagyni az távolléteket a blokkolt dátumokon
@@ -3745,64 +3825,66 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Felhasználók létrehozása
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,Gramm
 DocType: Supplier Scorecard,Per Month,Havonta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,"Gyártáshoz a mennyiségnek nagyobbnak kell lennie, mint 0."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,"Gyártáshoz a mennyiségnek nagyobbnak kell lennie, mint 0."
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Látogassa jelentést karbantartási hívást.
 DocType: Stock Entry,Update Rate and Availability,Frissítse az árat és az elérhetőséget
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Százalék amennyivel többet kaphat és adhat a megrendelt mennyiségnél. Például: Ha Ön által megrendelt 100 egység, és az engedmény 10%, akkor kaphat 110 egységet."
 DocType: POS Customer Group,Customer Group,Vevő csoport
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Új Kötegazonosító (opcionális)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Új Kötegazonosító (opcionális)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Költség számla kötelező elem ehhez {0}
 DocType: BOM,Website Description,Weboldal leírása
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Nettó változás a saját tőkében
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Legújabb
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,"Kérjük, vonja vissza a(z) {0} Beszállítói számlát először"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail címnek egyedinek kell lennie, ez már létezik: {0}"
 DocType: Serial No,AMC Expiry Date,Éves karbantartási szerződés lejárati dátuma
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,Nyugta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,Nyugta
 ,Sales Register,Értékesítési Regisztráció
 DocType: Daily Work Summary Settings Company,Send Emails At,Küldj e-maileket ide
 DocType: Quotation,Quotation Lost Reason,Árajánlat elutasításának oka
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Válassza ki a Domain-ét
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',"válassza ki a * fájlt a lapból, ahol name = &#39;{0}&#39;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Tranzakciós hivatkozási szám {0} dátum: {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Tranzakciós hivatkozási szám {0} dátum: {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nincs semmi szerkesztenivaló.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Űrlap nézet
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,"Összefoglaló erre a hónapra, és folyamatban lévő tevékenységek"
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Űrlap nézet
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,"Összefoglaló erre a hónapra, és folyamatban lévő tevékenységek"
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Felhasználók hozzáadása a szervezetéhez, kivéve saját magát."
 DocType: Customer Group,Customer Group Name,Vevő csoport neve
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Még nem Vevők!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Még nem Vevők!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Pénzforgalmi kimutatás
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Hitel összege nem haladhatja meg a maximális kölcsön összegét {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licensz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Töröld a számlát: {0} a C-űrlapból: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Töröld a számlát: {0} a C-űrlapból: {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Kérjük, válassza ki az átvitelt, ha Ön is szeretné az előző pénzügyi év mérlege ágait erre a költségvetési évre áthozni"
 DocType: GL Entry,Against Voucher Type,Ellen-bizonylat típusa
-DocType: Physician,Phone (R),Telefon (R)
-apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Hozzáadott időrések
+DocType: Physician,Phone (R),Telefon (Otthoni)
+apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Hozzáadott időszakaszok
 DocType: Item,Attributes,Jellemzők
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Sablon engedélyezése
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Állítsa be a Naming sorozat {0} beállítását a Beállítás&gt; Beállítások&gt; Nevezési sorozatok segítségével
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,"Kérjük, adja meg a Leíráshoz használt számlát"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Utolsó rendelési dátum
 DocType: Patient,B Negative,B Negatív
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},A {0}számlához nem tartozik a {1} vállalat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Sorozatszámok ebben a sorban {0} nem egyezik a szállítólevéllel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Sorozatszámok ebben a sorban {0} nem egyezik a szállítólevéllel
 DocType: Student,Guardian Details,Helyettesítő részletei
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Jelölje a Jelenlétet több alkalmazotthoz
 DocType: Vehicle,Chassis No,Alvázszám
 DocType: Payment Request,Initiated,Kezdeményezett
 DocType: Production Order,Planned Start Date,Tervezett kezdési dátum
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,"Kérjük, válasszon ki egy BOM-ot"
 DocType: Serial No,Creation Document Type,Létrehozott Dokumentum típus
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,A befejezési dátumnak nagyobbnak kell lennie a kezdő dátumnál
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,A befejezési dátumnak nagyobbnak kell lennie a kezdő dátumnál
 DocType: Leave Type,Is Encash,Ez behajtható
 DocType: Leave Allocation,New Leaves Allocated,Új távollét lefoglalás
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projekt téma szerinti adatok nem állnak rendelkezésre az árajánlathoz
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Vége
 DocType: Project,Expected End Date,Várható befejezés dátuma
 DocType: Budget Account,Budget Amount,Költségvetés Összeg
 DocType: Appraisal Template,Appraisal Template Title,Teljesítmény értékelő sablon címe
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Dátumtól {0} a {1}Munkavállalónál nem lehet korábban az alkalmazott felvételi  dátumánál {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Kereskedelmi
-DocType: Patient,Alcohol Current Use,Alkoholfogyasztás
+DocType: Patient,Alcohol Current Use,Jelenlegi alkoholfogyasztás
+DocType: Student Admission Program,Student Admission Program,Tanulói felvételi program
 DocType: Payment Entry,Account Paid To,Számla kifizetve ennek:
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Szülő tétel {0} nem lehet Készletezett tétel
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Összes termékek vagy szolgáltatások.
@@ -3811,30 +3893,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},"{0} költségvetés ehhez a főkönyvi számlához {1}, ez ellen {2} {3} ami {4}. Ez meg fogja haladni ennyivel {5}"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Sor {0} # fióknak 'Állóeszköz' típusúnak kell lennie
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Mennyiségen kívül
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Szabályok számítani a szállítási költség egy eladó
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,és letiltva letiltva a
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Sorozat kötelező
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Pénzügyi szolgáltatások
 DocType: Student Sibling,Student ID,Diákigazolvány ID
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Tevékenységek típusa Idő Naplókhoz
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Szállító e-mailje
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Tevékenységek típusa Idő Naplókhoz
 DocType: Tax Rule,Sales,Értékesítés
 DocType: Stock Entry Detail,Basic Amount,Alapösszege
 DocType: Training Event,Exam,Vizsga
 DocType: Complaint,Complaint,Panasz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Raktár szükséges a {0} tételhez
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Raktár szükséges a {0} tételhez
 DocType: Leave Allocation,Unused leaves,A fel nem használt távollétek
-DocType: Patient,Alcohol Past Use,Alkoholfogyasztás
+DocType: Patient,Alcohol Past Use,Korábbi alkoholfogyasztás
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Kr
 DocType: Tax Rule,Billing State,Számlázási Állam
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Átutalás
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Hozzon létre robbant anyagjegyzéket BOM (beleértve a részegységeket)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Átutalás
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Hozzon létre robbant anyagjegyzéket BOM (beleértve a részegységeket)
 DocType: Authorization Rule,Applicable To (Employee),Alkalmazandó (Alkalmazott)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Határidő dátum kötelező
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Határidő dátum kötelező
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Növekmény erre a Jellemzőre {0} nem lehet 0
 DocType: Journal Entry,Pay To / Recd From,Fizetni neki / követelni tőle
 DocType: Naming Series,Setup Series,Sorszámozás telepítése
 DocType: Payment Reconciliation,To Invoice Date,A számla keltétől
 DocType: Supplier,Contact HTML,Kapcsolattartó HTML leírása
 ,Inactive Customers,Inaktív vevők
+DocType: Student Admission Program,Maximum Age,Maximális életkor
 DocType: Landed Cost Voucher,LCV,kishaszonjármű
 DocType: Landed Cost Voucher,Purchase Receipts,Beszerzési bevételezések
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Hogyan alkalmazza az árképzési szabályt?
@@ -3853,6 +3937,7 @@
 DocType: GL Entry,Remarks,Megjegyzések
 DocType: Payment Entry,Account Paid From,Kiegyenlített számla ettől:
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Nyersanyag tételkód
+DocType: Task,Parent Task,Szülői feladat
 DocType: Journal Entry,Write Off Based On,Leírja ez alapján
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Érdeklődés készítés
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Nyomtatás és papíráruk
@@ -3861,25 +3946,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Fizetés már feldolgozott a {0} és {1} közti időszakra, Távollét alkalmazásának időszaka nem eshet ezek közözti időszakok közé."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Telepítés rekordot egy Széria számra
 DocType: Guardian Interest,Guardian Interest,Helyettesítő kamat
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,A POS számlák alapértelmezett értékeinek beállítása
 apps/erpnext/erpnext/config/hr.py +177,Training,Képzés
 DocType: Timesheet,Employee Detail,Alkalmazott részlet
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Helyettesítő1 e-mail azonosító
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,Következő Dátumnak és az ismétlés napjának egyezőnek kell lennie
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Következő Dátumnak és az ismétlés napjának egyezőnek kell lennie
 DocType: Lab Prescription,Test Code,Tesztkód
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Beállítások az internetes honlaphoz
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},"Árajánlat nem engedélyezett erre: {0}, a mutatószám állás amiatt: {1}"
 DocType: Offer Letter,Awaiting Response,Várakozás válaszra
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Fent
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Teljes összeg {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Érvénytelen Jellemző {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Teljes összeg {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Érvénytelen Jellemző {0} {1}
 DocType: Supplier,Mention if non-standard payable account,"Megemlít, ha nem szabványos fizetendő számla"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Ugyanaz a tétel már többször megjelenik. {lista}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',"Kérjük, válasszon értékelés csoprotot ami más mint  'Az összes Értékelési csoportok'"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},{0} sor: Költséghely szükséges egy tételre: {1}
 DocType: Training Event Employee,Optional,Választható
 DocType: Salary Slip,Earning & Deduction,Jövedelem és levonás
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,"Választható. Ezt a beállítást kell használni, a különböző tranzakciók szűréséhez."
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negatív értékelési ár nem megengedett
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negatív készletérték ár nem megengedett
 DocType: Holiday List,Weekly Off,Heti Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Pl.: 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +96,Provisional Profit / Loss (Credit),Ideiglenes nyereség / veszteség (Credit)
@@ -3896,19 +3981,20 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Költséghely kötelező ehhez a tételhez {2}
 DocType: Vehicle,Policy No,Irányelv sz.:
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Hogy elemeket Termék Bundle
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Mivel a készlet létezik egy {0} tétel ellenében, nem engedélyezheted a variánsok tulajdonságait"
 DocType: Asset,Straight Line,Egyenes
 DocType: Project User,Project User,Projekt téma felhasználó
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Osztott
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Osztott
 DocType: GL Entry,Is Advance,Ez előleg
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Részvételi kezdő dátum és részvétel befejező dátuma kötelező
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,"Kérjük, írja be a 'Alvállalkozói',  Igen vagy Nem"
+DocType: Item,Default Purchase Unit of Measure,Alapértelmezett mértékegység beszerzési egység
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Utolsó kommunikáció dátuma
 DocType: Sales Team,Contact No.,Kapcsolattartó szám
 DocType: Bank Reconciliation,Payment Entries,Fizetési bejegyzések
 DocType: Production Order,Scrap Warehouse,Hulladék raktár
 DocType: Production Order,Check if material transfer entry is not required,"Ellenőrizze, hogy az anyag átadás bejegyzés nem szükséges"
 DocType: Program Enrollment Tool,Get Students From,Diák űrlapok lekérése
-DocType: Hub Settings,Seller Country,Eladó Országa
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Közzéteszi a tételt a weboldalon
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Csoportosítsa a tanulókat kötegekbe
 DocType: Authorization Rule,Authorization Rule,Jóváhagyási szabály
@@ -3918,7 +4004,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Értékesítési adók és költségek sablon
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Összesen (Követelés)
 DocType: Repayment Schedule,Payment Date,Fizetés nap
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Új köteg menny.
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Új köteg menny.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Megjelenés és kiegészítők
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,"Nem sikerült megoldani a súlyozott pontszám feladatot. Győződjön meg arról, hogy a képlet érvényes."
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Számú rendelés
@@ -3930,12 +4016,13 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +56,Opening Value,Nyitó érték
 DocType: Salary Detail,Formula,Képlet
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Szériasz #
-DocType: Lab Test Template,Lab Test Template,Lab test sablon
+DocType: Lab Test Template,Lab Test Template,Labor teszt sablon
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Értékesítések jutalékai
 DocType: Offer Letter Term,Value / Description,Érték / Leírás
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Sor # {0}: {1} Vagyontárgyat nem lehet benyújtani, ez már {2}"
 DocType: Tax Rule,Billing Country,Számlázási Ország
 DocType: Purchase Order Item,Expected Delivery Date,Várható szállítás dátuma
+DocType: Restaurant Order Entry,Restaurant Order Entry,Étterem rendelési bejegyzés
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Tartozik és követel nem egyenlő a {0} # {1}. Ennyi a különbség {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Reprezentációs költségek
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Anyag igénylés létrehozás
@@ -3948,9 +4035,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Meglévő tranzakcióval rendelkező számla nem törölhető.
 DocType: Vehicle,Last Carbon Check,Utolsó másolat megtekintés
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Jogi költségek
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,"Kérjük, válasszon mennyiséget a soron"
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,"Kérjük, válasszon mennyiséget a soron"
 DocType: Purchase Invoice,Posting Time,Rögzítés ideje
 DocType: Timesheet,% Amount Billed,% mennyiség számlázva
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.","A &quot;Díjra jutó idő&quot; beállítást nem állította be Dr {0} -ra, add hozzá az orvos mesterhez."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefon költségek
 DocType: Sales Partner,Logo,Logó
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Jelölje be, ha azt akarja, hogy a felhasználó válassza ki a sorozatokat mentés előtt. Nem lesz alapértelmezett, ha bejelöli."
@@ -3961,8 +4049,9 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Új Vevő árbevétel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Utazási költségek
 DocType: Maintenance Visit,Breakdown,Üzemzavar
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Egyéni mező-előfizetés hozzáadása a doctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Számla: {0} ebben a pénznemben: {1} nem választható
-DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Az ANYAGJ frissítése automatikusan az ütemezőn keresztül történik, a legfrissebb értékelési arány, árlisták aránya és a nyersanyagok utolsó beszerzési aránya alapján."
+DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Az ANYAGJ frissítése automatikusan az ütemezőn keresztül történik, a legfrissebb készletérték ár / árlisták ára /  a nyersanyagok utolsó beszerzési ára alapján."
 DocType: Bank Reconciliation Detail,Cheque Date,Csekk dátuma
 apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},A {0} számla: Szülő számla {1} nem tartozik ehhez a céghez: {2}
 DocType: Program Enrollment Tool,Student Applicants,Tanuló pályázóknak
@@ -3970,7 +4059,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Mivel a dátum
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,Felvétel dátuma
-DocType: Healthcare Settings,Out Patient SMS Alerts,Out Patient SMS figyelmeztetések
+DocType: Healthcare Settings,Out Patient SMS Alerts,Betegen kívüli SMS figyelmeztetések
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Probation,Próbaidő
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Bér összetevők
 DocType: Program Enrollment Tool,New Academic Year,Új Tanév
@@ -3985,7 +4074,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Összesen Számlázott összeg (Idő Nyilvántartó szerint)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Beszállító Id
 DocType: Payment Request,Payment Gateway Details,Fizetési átjáró  részletei
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,"Mennyiség nagyobbnak kell lennie, mint 0"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,"Mennyiség nagyobbnak kell lennie, mint 0"
 DocType: Journal Entry,Cash Entry,Készpénz bejegyzés
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Al csomópontok csak 'csoport' típusú csomópontok alatt hozhatók létre
 DocType: Leave Application,Half Day Date,Félnapos dátuma
@@ -4003,12 +4092,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,"Megjegyzés: Tétel {0}, többször vitték be"
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Összes Kapcsolattartó.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Vállakozás rövidítése
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,A(z) {0} felhasználó nem létezik
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,A(z) {0} felhasználó nem létezik
 DocType: Subscription,SUB-,ALATTI-
 DocType: Item Attribute Value,Abbreviation,Rövidítés
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Fizetés megadása már létezik
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Nem engedélyezett hiszen {0} meghaladja határértékek
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Fizetés sablon törzsadat.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Patológia
+DocType: Restaurant Order Entry,Restaurant Table,Étteremasztal
 DocType: Leave Type,Max Days Leave Allowed,Max távolléti nap engedélyezett
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Adózási szabály megadása a bevásárlókosárhoz
 DocType: Purchase Invoice,Taxes and Charges Added,Adók és költségek hozzáadva
@@ -4020,15 +4111,15 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Árajánlatok az Érdeklődőknek vagy Vevőknek.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Beosztás engedélyezi a zárolt készlet szerkesztését
 ,Territory Target Variance Item Group-Wise,"Terület Cél Variáció, tételcsoportonként"
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Összes vevői csoport
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Összes vevői csoport
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Halmozott Havi
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} kötelező. Talán a Pénzváltó rekord nincs létrehozva ettől {1} eddig {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Adó Sablon kötelező.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Adó Sablon kötelező.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,A {0} számla: Szülő számla {1} nem létezik
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Árlista árak (Vállalat pénznemében)
 DocType: Products Settings,Products Settings,Termék beállítások
 DocType: Lab Prescription,Test Created,Teszt létrehozva
-DocType: Healthcare Settings,Custom Signature in Print,Egyéni aláírás a nyomtatásban
+DocType: Healthcare Settings,Custom Signature in Print,Egyén aláírása a nyomtatásban
 DocType: Account,Temporary,Ideiglenes
 DocType: Program,Courses,Tanfolyamok
 DocType: Monthly Distribution Percentage,Percentage Allocation,Százalékos megoszlás
@@ -4039,7 +4130,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1213,Please set Company,"Kérjük, állítsa be a Vállalkozást"
 DocType: Pricing Rule,Buying,Beszerzés
 DocType: HR Settings,Employee Records to be created by,Alkalmazott bejegyzést létrehozó
-DocType: Patient,AB Negative,AB negatív
+DocType: Patient,AB Negative,AB Negatív
 DocType: Sample Collection,SMPL-,SMPL-
 DocType: POS Profile,Apply Discount On,Alkalmazzon kedvezmény ezen
 ,Reqd By Date,Igénylt. Dátum szerint
@@ -4049,12 +4140,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Tételenkénti adó részletek
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Intézet rövidítése
 ,Item-wise Price List Rate,Tételenkénti Árlista árjegyzéke
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Beszállítói ajánlat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Beszállítói ajánlat
 DocType: Quotation,In Words will be visible once you save the Quotation.,"A szavakkal mező lesz látható, miután mentette az Árajánlatot."
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Mennyiség ({0}) nem lehet egy töredék ebben a sorban {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,CSAT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},A vonalkód {0} már használt a {1} Tételnél
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},A vonalkód {0} már használt a {1} Tételnél
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Szabályok hozzátéve szállítási költségeket.
 DocType: Item,Opening Stock,Nyitó állomány
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Vevő szükséges
@@ -4072,10 +4163,9 @@
 DocType: Customer,From Lead,Érdeklődésből
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Megrendelések gyártásra bocsátva.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Válasszon pénzügyi évet ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS profil szükséges a POS bevitelhez
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS profil szükséges a POS bevitelhez
 DocType: Program Enrollment Tool,Enroll Students,Diákok felvétele
-DocType: Hub Settings,Name Token,Név Token
-DocType: Lab Test,Approved Date,Jóváhagyott dátum
+DocType: Lab Test,Approved Date,Jóváhagyás dátuma
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Alapértelmezett értékesítési
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Legalább egy Raktár kötelező
 DocType: Serial No,Out of Warranty,Garanciaidőn túl
@@ -4092,7 +4182,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Emberi Erőforrás HR
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Fizetés főkönyvi egyeztetés Fizetés
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Adó eszközök
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Gyártási rendelés létrehozva {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Gyártási rendelés létrehozva {0}
 DocType: BOM Item,BOM No,Anyagjegyzék száma
 DocType: Instructor,INS/,OKT/
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Naplókönyvelés {0} nincs főkönyvi számlája {1} vagy már párosított másik utalvánnyal
@@ -4112,7 +4202,7 @@
 DocType: Currency Exchange,To Currency,Pénznemhez
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Engedélyezze a következő felhasználók Távollét alkalmazás jóváhagyását a blokkolt napokra.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Garanciális ügyek költség típusa.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},"Eladási ár ehhez a tételhez {0} alacsonyabb, mint a {1}. Eladási árnak legalább ennyienk kell lennie {2}"
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},"Eladási ár ehhez a tételhez {0} alacsonyabb, mint a {1}. Eladási árnak legalább ennyienk kell lennie {2}"
 DocType: Item,Taxes,Adók
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Fizetett és nincs leszállítva
 DocType: Project,Default Cost Center,Alapértelmezett költséghely
@@ -4126,15 +4216,15 @@
 DocType: Employee Loan,Fully Disbursed,Teljes egészében folyosításra került
 DocType: Maintenance Visit,Customer Feedback,Vevői visszajelzés
 DocType: Account,Expense,Költség
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,"Pontszám nem lehet nagyobb, mint a maximális pontszám"
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,"Pontszám nem lehet nagyobb, mint a maximális pontszám"
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Ügyfelek és beszállítók
 DocType: Item Attribute,From Range,Tartpmányból
 DocType: BOM,Set rate of sub-assembly item based on BOM,Állítsa be az összeszerelési elemek arányát a ANYAGJ alapján
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Szintaktikai hiba a képletben vagy állapotban: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Szintaktikai hiba a képletben vagy állapotban: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Napi munka összefoglalása vállkozási beállítások
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,"Tétel: {0} - figyelmen kívül hagyva, mivel ez nem egy készletezhető tétel"
 DocType: Appraisal,APRSL,TELJESITM
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Nyújsa be ezt a Gyártási megrendelést további feldolgozásra.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Nyújsa be ezt a Gyártási megrendelést további feldolgozásra.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Hogy nem használhassa az árképzési szabályt egy adott ügyletben, az összes árképzési szabályt le kell tiltani."
 DocType: Assessment Group,Parent Assessment Group,Szülő értékelési csoport
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Állás
@@ -4146,23 +4236,24 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Nem tudja szűrni utalvány szám alapján, ha utalványonként csoportosított"
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +891,Make Supplier Quotation,Beszállítói ajánlat létrehozás
 DocType: Quality Inspection,Incoming,Bejövő
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.py +47,Assessment Result record {0} already exists.,Értékelés Az eredményhirdetés {0} már létezik.
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.py +47,Assessment Result record {0} already exists.,Értékelés eredménye rekord {0} már létezik.
 DocType: BOM,Materials Required (Exploded),Szükséges anyagok (Robbantott)
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Kérjük, állítsa Vállakozás szűrését üresre, ha a csoportosítás beállítása 'Vállalkozás'"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Könyvelési dátum nem lehet jövőbeni időpontban
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Sor # {0}: Sorszám {1} nem egyezik a {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,az ismétlődő generáláshoz
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Alkalmi távollét
-apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Lab Test UOM.
+apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Labor Teszt ME.
 DocType: Batch,Batch ID,Köteg ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Megjegyzés: {0}
 ,Delivery Note Trends,Szállítólevelek alakulása
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Összefoglaló erről a hétről
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Összefoglaló erről a hétről
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Készleten mennyiség
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Számla: {0} csak Készlet tranzakciókkal frissíthető
 DocType: Student Group Creation Tool,Get Courses,Tanfolyamok lekérése
 DocType: GL Entry,Party,Ügyfél
 DocType: Healthcare Settings,Patient Name,Beteg neve
-DocType: Variant Field,Variant Field,Variáns mező
+DocType: Variant Field,Variant Field,Változat mező
 DocType: Sales Order,Delivery Date,Szállítás dátuma
 DocType: Opportunity,Opportunity Date,Lehetőség dátuma
 DocType: Purchase Receipt,Return Against Purchase Receipt,Vásárlási nyugtával ellenszámlája
@@ -4170,13 +4261,12 @@
 DocType: Purchase Order,To Bill,Számlázni
 DocType: Material Request,% Ordered,% Rendezve
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Tanfolyam alapú Tanuló csoport, a Tanfolyamon érvényesítésre kerül minden hallgató aki beiratkozott a tanfolyamra a Program beiratkozáskor."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Adja meg Email címeket, vesszővel elválasztva, számlát automatikusan küldjük az adott időpontban"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Darabszámra fizetett munka
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Átlagos vásárlási  érték
 DocType: Task,Actual Time (in Hours),Tényleges idő (óra)
 DocType: Employee,History In Company,Előzmények a cégnél
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Hírlevelek
-DocType: Drug Prescription,Description/Strength,Leírás / Erő
+DocType: Drug Prescription,Description/Strength,Leírás / Állomány
 DocType: Stock Ledger Entry,Stock Ledger Entry,Készlet könyvelés tétele
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +82,Same item has been entered multiple times,Ugyanazt a tételt már többször rögzítették
 DocType: Department,Leave Block List,Távollét blokk lista
@@ -4184,7 +4274,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,"Tétel: {0}, nincs telepítve Széria sz. Oszlopot hagyja üressen"
 DocType: Accounts Settings,Accounts Settings,Könyvelés beállításai
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,Jóváhagy
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Nem érkezik eredmény
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Nem érkezik eredmény
 DocType: Customer,Sales Partner and Commission,Vevő Partner és a Jutalék
 DocType: Employee Loan,Rate of Interest (%) / Year,Kamatláb (%) / év
 ,Project Quantity,Project Mennyiség
@@ -4196,55 +4286,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Fekete
 DocType: BOM Explosion Item,BOM Explosion Item,ANYGJZ Robbantott tétel
 DocType: Account,Auditor,Könyvvizsgáló
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} előállított tétel(ek)
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} előállított tétel(ek)
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Tudj meg többet
 DocType: Cheque Print Template,Distance from top edge,Távolság felső széle
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Árlista {0} letiltott vagy nem létezik
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Árlista {0} letiltott vagy nem létezik
 DocType: Purchase Invoice,Return,Visszatérés
 DocType: Production Order Operation,Production Order Operation,Gyártási rendelés végrehajtás
 DocType: Pricing Rule,Disable,Tiltva
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Fizetési módra van szükség a fizetéshez
 DocType: Project Task,Pending Review,Ellenőrzésre vár
-apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Találkozók és konzultációk
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nem vontunk be ebbe a kötegbe {2}
+apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Vizit időpontok és konzultációk
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nem vontunk be ebbe a kötegbe {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Vagyoneszköz {0} nem selejtezhető, mivel már {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Teljes Költség Követelés (költségtérítési igényekkel)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Hiányzónak jelöl
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Sor {0}: Anyagjegyzés BOM pénzneme #{1}  egyeznie kell a kiválasztott pénznemhez {2}
 DocType: Journal Entry Account,Exchange Rate,Átváltási arány
 DocType: Patient,Additional information regarding the patient,További információk a beteggel kapcsolatban
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Vevői rendelés {0} nem nyújtják be
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Vevői rendelés {0} nem nyújtják be
 DocType: Homepage,Tag Line,Jelmondat sor
 DocType: Fee Component,Fee Component,Díj komponens
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Flotta kezelés
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Tételek hozzáadása innen
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Flotta kezelés
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Tételek hozzáadása innen
 DocType: Cheque Print Template,Regular,Szabályos
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Összesen súlyozás minden Értékelési kritériumra legalább 100%
-DocType: BOM,Last Purchase Rate,Utolsó beszerzési ár
+DocType: Purchase Order Item,Last Purchase Rate,Utolsó beszerzési ár
 DocType: Account,Asset,Vagyontárgy
 DocType: Project Task,Task ID,Feladat ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Állomány nem létezik erre a tételre: {0} mivel  változatai vanak
 DocType: Lab Test,Mobile,Mobil
 ,Sales Person-wise Transaction Summary,Értékesítő személy oldali Tranzakciós összefoglaló
 DocType: Training Event,Contact Number,Kapcsolattartó száma
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,{0} raktár nem létezik
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Regisztráció az ERPNext Hub–hoz
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,{0} raktár nem létezik
 DocType: Monthly Distribution,Monthly Distribution Percentages,Havi Felbontás százalékai
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,A kiválasztott elemnek nem lehet Kötege
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Értékelés mértéke nem található erre a tételre {0}, mely kötelező a számviteli bejegyzések megtételére ehhez {1} {2}. Ha a tétel mintaként bonyolítódik ebben {1}, kérem említse meg ezt az {1} Tétel  táblázatban. Ellenkező esetben, kérjük hozzon létre egy bejövő készlet tranzakciót a tételre vagy említése meg az értékelési árat a Tétel rekordjában, majd próbálja benyújtani / törölni ezt a bejegyzést"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% anyag tételek szállítva Beszállítói szállítólevélhez
+DocType: Training Event,Has Certificate,Rendelkezik tanúsítvánnyal
 DocType: Project,Customer Details,Vevő részletek
 DocType: Employee,Reports to,Jelentések
 ,Unpaid Expense Claim,Kifizetetlen költség követelés
 DocType: Payment Entry,Paid Amount,Fizetett összeg
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Export értékasítési ciklust
 DocType: Assessment Plan,Supervisor,Felügyelő
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,Online
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,Online
 ,Available Stock for Packing Items,Elérhető készlet a tételek csomagolásához
 DocType: Item Variant,Item Variant,Tétel variáns
 DocType: Assessment Result Tool,Assessment Result Tool,Assessment Eredmény eszköz
 DocType: BOM Scrap Item,BOM Scrap Item,Anyagjegyzék Fémhulladék tétel
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Benyújtott megbízásokat nem törölheti
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Benyújtott megbízásokat nem törölheti
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Számlaegyenleg már Nekünk tartozik, akkor nem szabad beállítani ""Ennek egyenlege"", mint ""Tőlünk követel"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Minőségbiztosítás
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,"Tétel {0} ,le lett tiltva"
@@ -4256,15 +4345,15 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Mérleg mennyiség
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,Célok nem lehetnek üresek
 DocType: Item Group,Parent Item Group,Szülő tétel csoport
-DocType: Appointment Type,Appointment Type,Kinevezési típus
+DocType: Appointment Type,Appointment Type,Vizit időpont típus
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} a {1} -hez
 DocType: Healthcare Settings,Valid number of days,Érvényes napok száma
 apps/erpnext/erpnext/setup/doctype/company/company.js +35,Cost Centers,Költséghelyek
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Arány, amelyen a Beszállító pénznemét átalakítja a vállalakozás alapértelmezett pénznemére"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: Timings konfliktusok sora {1}
-DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Engedélyezi a null értékű árat
+DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Engedélyezi a nulla készletérték árat
 DocType: Training Event Employee,Invited,Meghívott
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Több aktív fizetési struktúrát talált ehhez az alkalmazotthoz: {0} az adott dátumokra
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Több aktív fizetési struktúrát talált ehhez az alkalmazotthoz: {0} az adott dátumokra
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Fizetési átjáró számlák telepítése.
 DocType: Employee,Employment Type,Alkalmazott típusa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Befektetett Álló eszközök
@@ -4273,10 +4362,10 @@
 ,Cash Flow,Pénzforgalom
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Jelentkezési időszak nem lehet két elhelyezett bejegyzés között
 DocType: Item Group,Default Expense Account,Alapértelmezett Kiadás számla
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Tanuló e-mail azonosító
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Tanuló e-mail azonosítója
 DocType: Employee,Notice (days),Felmondás (nap(ok))
 DocType: Tax Rule,Sales Tax Template,Értékesítési adó sablon
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Válassza ki a tételeket a számla mentéséhez
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Válassza ki a tételeket a számla mentéséhez
 DocType: Employee,Encashment Date,Beváltás dátuma
 DocType: Training Event,Internet,Internet
 DocType: Special Test Template,Special Test Template,Speciális teszt sablon
@@ -4285,7 +4374,7 @@
 DocType: Production Order,Planned Operating Cost,Tervezett üzemeltetési költség
 DocType: Academic Term,Term Start Date,Feltétel kezdési dátum
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Lehet. számláló
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Kérjük tekintse meg mellékelve {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Kérjük tekintse meg mellékelve {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bankkivonat mérleg a főkönyvi kivonat szerint
 DocType: Job Applicant,Applicant Name,Kérelmező neve
 DocType: Authorization Rule,Customer / Item Name,Vevő / Tétel Név
@@ -4300,12 +4389,12 @@
 DocType: Item Variant Attribute,Attribute,Jelemzők
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Kérjük adjon meg tól/ig tartományt
 DocType: Serial No,Under AMC,ÉKSz időn belül
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Tétel értékének mértékét újraszámolják a beszerzési költség utalvány összegével
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Tétel készletértékének mértékét újraszámolják a beszerzési költség utalvány összegével
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Alapértelmezett beállítások a vevői tranzakciókhoz.
 DocType: Guardian,Guardian Of ,Helyettesítője
 DocType: Grading Scale Interval,Threshold,Küszöb
 DocType: BOM Update Tool,Current BOM,Aktuális anyagjegyzék (mit)
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Széria szám hozzáadása
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Széria szám hozzáadása
 DocType: Production Order Item,Available Qty at Source Warehouse,Elérhető Mennyiség a Forrás raktárban
 apps/erpnext/erpnext/config/support.py +22,Warranty,Garancia/szavatosság
 DocType: Purchase Invoice,Debit Note Issued,Terhelési értesítés kiadva
@@ -4328,10 +4417,9 @@
 DocType: Account,Receivable,Bevételek
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Sor # {0}: nem szabad megváltoztatni a beszállítót, mivel már van rá Beszerzési  Megrendelés"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Beosztást, amely lehetővé tette, hogy nyújtson be tranzakciókat, amelyek meghaladják a követelés határértékeket."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Tételek kiválasztása gyártáshoz
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Törzsadatok szinkronizálása, ez eltart egy ideig"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Tételek kiválasztása gyártáshoz
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Törzsadatok szinkronizálása, ez eltart egy ideig"
 DocType: Item,Material Issue,Anyag probléma
-DocType: Hub Settings,Seller Description,Eladó Leírása
 DocType: Employee Education,Qualification,Képesítés
 DocType: Item Price,Item Price,Tétel ár
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Szappan & Mosószer
@@ -4339,7 +4427,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,"Idő-től nem lehet nagyobb, mint idő-ig."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Mozgókép és videó
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Megrendelt
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Folytatás
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Folytatás
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Ha engedélyezve van, akkor a rendszer nem frissíti a sablonok változatainak mezőit, de az alább felsorolt mezők adatait más változat"
 DocType: Salary Detail,Component,Összetevő
 DocType: Assessment Criteria,Assessment Criteria Group,Értékelési kritériumok Group
 DocType: Healthcare Settings,Patient Name By,A beteg neve
@@ -4349,7 +4438,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Kérjük, adja be Beosztás jóváhagyásra vagy Felhasználó jóváhagyásra"
 DocType: Journal Entry,Write Off Entry,Leíró Bejegyzés
 DocType: BOM,Rate Of Materials Based On,Anyagköltség számítás módja
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Szállító&gt; Szállító típusa
+DocType: Item Variant Settings,Do not Update Variants,Ne frissítse a változatokat
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Támogatási analitika
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Összes kijelöletlen
 DocType: POS Profile,Terms and Conditions,Általános Szerződési Feltételek
@@ -4358,7 +4447,7 @@
 DocType: Leave Block List,Applies to Company,Vállaltra vonatkozik
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,"Nem lehet lemondani, mert Készlet bejegyzés: {0} létezik"
 DocType: Employee Loan,Disbursement Date,Folyósítás napja
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,A 'címzettek' nincsenek megadva
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,A 'címzettek' nincsenek megadva
 DocType: BOM Update Tool,Update latest price in all BOMs,Frissítse a legfrissebb árakat az összes ANYAGJ-ben
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Orvosi karton
 DocType: Vehicle,Vehicle,Jármű
@@ -4373,14 +4462,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,LEHET / Érdeklődés %
 DocType: Material Request,MREQ-,ANYIG-
 ,Asset Depreciations and Balances,Vagyoneszköz Értékcsökkenés és egyenlegek
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Összeg: {0} {1} átment ebből: {2} ebbe: {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Összeg: {0} {1} átment ebből: {2} ebbe: {3}
 DocType: Sales Invoice,Get Advances Received,Befogadott előlegek átmásolása
 DocType: Email Digest,Add/Remove Recipients,Címzettek Hozzáadása/Eltávolítása
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},A tranzakció nem megengedett a leállított gyártási rendeléssel szemben: {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Beállítani ezt a költségvetési évet alapértelmezettként, kattintson erre: 'Beállítás alapértelmezettként'"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Csatlakozik
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Csatlakozik
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Hiány Mennyisége
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Tétel változat {0} létezik azonos Jellemzőkkel
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Tétel változat {0} létezik azonos Jellemzőkkel
 DocType: Employee Loan,Repay from Salary,Bérből törleszteni
 DocType: Leave Application,LAP/,TAVOLL/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Fizetési igény ehhez {0} {1} ezzel az összeggel {2}
@@ -4393,9 +4482,9 @@
 DocType: Sales Invoice Item,Sales Order Item,Vevői rendelés tétele
 DocType: Salary Slip,Payment Days,Fizetési Napok
 DocType: Patient,Dormant,Alvó
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Raktárak gyermek csomópontokkal nem lehet átalakítani főkönyvi tétellé
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Raktárak gyermek csomópontokkal nem lehet átalakítani főkönyvi tétellé
 DocType: BOM,Manage cost of operations,Kezelje a működési költségeket
-DocType: Accounts Settings,Stale Days,Stale Days
+DocType: Accounts Settings,Stale Days,Átmeneti napok
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Ha bármelyik ellenőrzött tranzakciók ""Beküldő"", egy e-mailt pop-up automatikusan nyílik, hogy küldjön egy e-mailt a kapcsolódó ""Kapcsolat"" hogy ezen ügyletben az ügylet mellékletként. A felhasználó lehet, hogy nem küld e-mailt."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globális beállítások
 DocType: Assessment Result Detail,Assessment Result Detail,Értékelés eredménye részlet
@@ -4407,10 +4496,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Széria sz. {0} már beérkezett
 ,Requested Items To Be Transferred,Kérte az átvinni kívánt elemeket
 DocType: Expense Claim,Vehicle Log,Jármű napló
-DocType: Purchase Invoice,Recurring Id,Ismétlődő Id
-DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Láz előfordulása (temp&gt; 38,5 ° C / 101,3 ° F vagy fenntartott hőmérséklet&gt; 38 ° C / 100,4 ° F)"
+DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Láz előfordulása (hőm.&gt; 38,5 ° C / 101,3 ° F vagy fenntartott hőmérséklet&gt; 38 ° C / 100,4 ° F)"
 DocType: Customer,Sales Team Details,Értékesítő csapat részletei
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Véglegesen törli?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Véglegesen törli?
 DocType: Expense Claim,Total Claimed Amount,Összes Garanciális összeg
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potenciális értékesítési lehetőségek.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Érvénytelen {0}
@@ -4420,7 +4508,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Áruházak
 ,Item Delivery Date,Tétel szállítási dátuma
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Állítsa be az Iskolát az ERPNext-ben
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Állítsa be az Iskolát az ERPNext-ben
 DocType: Sales Invoice,Base Change Amount (Company Currency),Bázis váltó összeg (Vállalat pénzneme)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Nincs számviteli bejegyzést az alábbi raktárakra
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Először mentse el a dokumentumot.
@@ -4432,18 +4520,17 @@
 DocType: Task,Is Milestone,Ez mérföldkő
 DocType: Daily Work Summary,Email Sent To,E-mail címzetje
 DocType: Budget,Warn,Figyelmeztet
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Biztosan regisztrálsz?
 DocType: Appraisal,"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."
 DocType: BOM,Manufacturing User,Gyártás Felhasználó
 DocType: Purchase Invoice,Raw Materials Supplied,Alapanyagok leszállítottak
-DocType: Purchase Invoice,Recurring Print Format,Ismétlődő Print Format
 DocType: C-Form,Series,Sorozat
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Az árlista pénzneme {0} legyen {1} vagy {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Termékek hozzáadása
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Az árlista pénzneme {0} legyen {1} vagy {2}
 DocType: Appraisal,Appraisal Template,Teljesítmény értékelő sablon
 DocType: Item Group,Item Classification,Tétel osztályozás
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Karbantartási látogatás célja
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Betegbeteg regisztráció
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Betegbeteg számla regisztráció
 DocType: Drug Prescription,Period,Időszak
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Főkönyvi számla
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Alkalmazott {0} távvolléten ekkor {1}
@@ -4452,22 +4539,22 @@
 DocType: Item Attribute Value,Attribute Value,Jellemzők értéke
 ,Itemwise Recommended Reorder Level,Tételenkénti Ajánlott újrarendelési szint
 DocType: Salary Detail,Salary Detail,Bér részletei
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,"Kérjük, válassza ki a {0} először"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,"Kérjük, válassza ki a {0} először"
 DocType: Appointment Type,Physician,Orvos
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Köteg {0} ebből a tételből: {1} lejárt.
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,konzultációk
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Konzultációk
 DocType: Sales Invoice,Commission,Jutalék
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Idő nyilvántartó a gyártáshoz.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Részösszeg
-DocType: Physician,Charges,díjak
+DocType: Physician,Charges,Díjak
 DocType: Salary Detail,Default Amount,Alapértelmezett Összeg
 DocType: Lab Test Template,Descriptive,Leíró
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Raktár nem található a rendszerben
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Összefoglaló erről a hónapról
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Összefoglaló erről a hónapról
 DocType: Quality Inspection Reading,Quality Inspection Reading,Minőség-ellenőrzés olvasás
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,"`Zárolja azon készleteket, amelyek régebbiek, mint` kisebbnek kell lennie,  %d napnál."
 DocType: Tax Rule,Purchase Tax Template,Beszerzési megrendelés Forgalmi adót sablon
-apps/erpnext/erpnext/utilities/user_progress.py +45,Set a sales goal you'd like to achieve for your company.,"Olyan értékesítési célt állít be, amelyet vállalni szeretne."
+apps/erpnext/erpnext/utilities/user_progress.py +45,Set a sales goal you'd like to achieve for your company.,"Olyan értékesítési célt állítson be, amelyet vállalni szeretne."
 ,Project wise Stock Tracking,Projekt téma szerinti raktárkészlet követése
 DocType: GST HSN Code,Regional,Regionális
 apps/erpnext/erpnext/config/healthcare.py +40,Laboratory,Laboratórium
@@ -4486,12 +4573,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Képzési emények/Eredmények
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Halmozott értékcsökkenés ekkor
 DocType: Sales Invoice,C-Form Applicable,C-formában idéztük
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},"Működési időnek nagyobbnak kell lennie, mint 0 erre a műveletre: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},"Működési időnek nagyobbnak kell lennie, mint 0 erre a műveletre: {0}"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Raktár kötelező
 DocType: Supplier,Address and Contacts,Cím és Kapcsolatok
 DocType: UOM Conversion Detail,UOM Conversion Detail,Mértékegység konvertálásának részlete
 DocType: Program,Program Abbreviation,Program rövidítése
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Gyártási rendelést nem lehet emelni a tétel terméksablonnal szemben
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Gyártási rendelést nem lehet emelni a tétel terméksablonnal szemben
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Díjak frissülnek a vásárláskor kapott nyugtán a tételek szerint
 DocType: Warranty Claim,Resolved By,Megoldotta
 DocType: Bank Guarantee,Start Date,Kezdés dátuma
@@ -4503,7 +4590,7 @@
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mutasd a ""Készleten"", vagy ""Nincs készleten"" , az ebben a raktárban álló állomány alapján."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Anyagjegyzék (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Átlagos idő foglalás a beszállító általi szállításhoz
-DocType: Sample Collection,Collected By,Összegyűjtött
+DocType: Sample Collection,Collected By,Összegyűjtötte:
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +22,Assessment Result,Értékelés eredménye
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Órák
 DocType: Project,Expected Start Date,Várható indulás dátuma
@@ -4517,26 +4604,27 @@
 DocType: Employee,Educational Qualification,Iskolai végzettség
 DocType: Workstation,Operating Costs,Üzemeltetési költségek
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Művelet, ha a felhalmozott havi költségkeret túlépett"
-DocType: Purchase Invoice,Submit on creation,Küldje el a létrehozásnál
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Árfolyam ehhez: {0} ennek kell lennie: {1}
+DocType: Subscription,Submit on creation,Küldje el a létrehozásnál
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Árfolyam ehhez: {0} ennek kell lennie: {1}
 DocType: Asset,Disposal Date,Eltávolítás időpontja
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-mailt fog küldeni a vállalkozás összes aktív alkalmazottja részére az adott órában, ha nincsenek szabadságon. A válaszok összefoglalását éjfélkor küldi."
 DocType: Employee Leave Approver,Employee Leave Approver,Alkalmazott Távollét Jóváhagyó
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Sor {0}: Egy Újrarendelés bejegyzés már létezik erre a raktárban {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Nem jelentheti elveszettnek, mert kiment az Árajánlat."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Képzési Visszajelzés
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Sor {0}: Egy Újrarendelés bejegyzés már létezik erre a raktárban {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Nem jelentheti elveszettnek, mert kiment az Árajánlat."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Képzési Visszajelzés
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Gyártási rendelést: {0} be kell benyújtani
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Beszállítói mutatószámok kritériumai
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},"Kérjük, válassza ki a Start és végé dátumát erre a tételre {0}"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Tanfolyam kötelező ebben a sorban {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,"A végső nap nem lehet, a kezdő dátum előtti"
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Árak Hozzáadása / Szerkesztése
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Árak Hozzáadása / Szerkesztése
 DocType: Batch,Parent Batch,Szülő Köteg
 DocType: Cheque Print Template,Cheque Print Template,Csekk nyomtatás Sablon
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Költséghelyek listája
 DocType: Lab Test Template,Sample Collection,Mintagyűjtés
 ,Requested Items To Be Ordered,A kért lapok kell megrendelni
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Saját rendelések
 DocType: Price List,Price List Name,Árlista neve
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Napi munka összefoglalása erre {0}
 DocType: Employee Loan,Totals,Az összesítések
@@ -4555,13 +4643,13 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,"{0} darab ebből: {1} szükséges ebben: {2}, erre: {3} {4} ehhez: {5} ; a tranzakció befejezéséhez."
 DocType: Fee Schedule,Student Category,Tanuló kategória
 DocType: Announcement,Student,Diák
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Vállalkozás egység (osztály) törzsadat.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Vállalkozás egység (osztály) törzsadat.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Menj a szobákba
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Kérjük, elküldés előtt adja meg az üzenetet"
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,ISMÉTLŐDŐ BESZÁLLÍTÓRA
 DocType: Email Digest,Pending Quotations,Függő árajánlatok
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Értékesítési hely profil
-apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Lab Test Konfigurációk.
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Értékesítési hely profil
+apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Labor Teszt Konfigurációk.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Fedezetlen hitelek
 DocType: Cost Center,Cost Center Name,Költséghely neve
 DocType: Employee,B+,B +
@@ -4570,19 +4658,21 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Teljes fizetett össz
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 karakternél nagyobb üzenetek több üzenetre lesznek bontva
 DocType: Purchase Receipt Item,Received and Accepted,Beérkezett és befogadott
+DocType: Hub Settings,Company and Seller Profile,Cég és eladó profilja
 ,GST Itemised Sales Register,GST tételes értékesítés regisztráció
 ,Serial No Service Contract Expiry,Széria sz. karbantartási szerződés lejárati ideje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Egy főkönyvi számlában nem végezhet egyszerre tartozás és követelés bejegyzést.
-DocType: Vital Signs,Adults' pulse rate is anywhere between 50 and 80 beats per minute.,A felnőttek impulzussebessége bárhol 50 és 80 ütés percenként.
+DocType: Vital Signs,Adults' pulse rate is anywhere between 50 and 80 beats per minute.,A felnőttek pulzussebessége bárhol 50 és 80 ütés percenként.
 DocType: Naming Series,Help HTML,Súgó HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Diákcsoport készítő eszköz
 DocType: Item,Variant Based On,Változat ez alapján
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Összesen kijelölés súlyozásának 100% -nak kell lennie. Ez:  {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Ön Beszállítói
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,"Kérjük, javítsa ki"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,"Nem lehet beállítani elveszettnek ezt a Vevői rendelést, mivel végre van hajtva."
 DocType: Request for Quotation Item,Supplier Part No,Beszállítói alkatrész sz
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nem vonható le, ha a kategória a 'Készletérték' vagy 'Készletérték és Teljes érték'"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Feladó
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Feladó
 DocType: Lead,Converted,Átalakított
 DocType: Item,Has Serial No,Van sorozatszáma
 DocType: Employee,Date of Issue,Probléma dátuma
@@ -4590,30 +4680,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","A vevői beállítások szerint ha Vásárlás átvételét igazoló nyugta szükséges == 'IGEN', akkor a vásárlást igazoló számla létrehozására, a felhasználónak először létre kell hoznia vásárlási nyugtát erre a tételre: {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Sor # {0}: Nem beszállító erre a tételre {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,"Sor {0}: Óra értéknek nagyobbnak kell lennie, mint nulla."
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,"Weboldal kép: {0} ami csatolva lett a {1}  tételhez, nem található"
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,"Weboldal kép: {0} ami csatolva lett a {1}  tételhez, nem található"
 DocType: Issue,Content Type,Tartalom típusa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Számítógép
 DocType: Item,List this Item in multiple groups on the website.,Sorolja ezeket a tételeket több csoportba a weboldalon.
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Állítsa be az alapértelmezett ügyfélcsoportot és területet az Értékesítési beállítások pontban
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Állítsa be az alapértelmezett ügyfélcsoportot és területet az Értékesítési beállítások menüpontban
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +323,Please check Multi Currency option to allow accounts with other currency,"Kérjük, ellenőrizze a Több pénznem opciót, a  más pénznemű számlák engedélyezéséhez"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +85,Item: {0} does not exist in the system,Tétel: {0} nem létezik a rendszerben
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Nincs engedélye a zárolt értékek beállítására
 DocType: Payment Reconciliation,Get Unreconciled Entries,Nem egyeztetett bejegyzések lekérdezése
 DocType: Payment Reconciliation,From Invoice Date,Számla dátumától
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Nincs engedélye benyújtani
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,Számlázási pénznemnek ugyanannak vagy a vállalat vagy a Ügyfél vállalatának alapértelmezett pénznemének kell lennie.
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Számlázási pénznemnek ugyanannak vagy a vállalat vagy a Ügyfél vállalatának alapértelmezett pénznemének kell lennie.
 DocType: Healthcare Settings,Laboratory Settings,Laboratóriumi beállítások
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Hagyja beváltása
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Mit csinál?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Raktárba
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Minden Student Felvételi
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Mit csinál?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Raktárba
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Minden Student Felvételi
 ,Average Commission Rate,Átlagos jutalék mértéke
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,"""Van sorozatszáma"" nem lehet ""igen"" a nem-készletezett tételnél"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,"""Van sorozatszáma"" nem lehet ""igen"" a nem-készletezett tételnél"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Válasszon státuszt
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Részvételt nem lehet megjelölni jövőbeni dátumhoz
 DocType: Pricing Rule,Pricing Rule Help,Árképzési szabály Súgó
 DocType: School House,House Name,Ház név
-DocType: Fee Schedule,Total Amount per Student,Teljes összeg hallónként
+DocType: Fee Schedule,Total Amount per Student,Diákonkénti teljes összeg
 DocType: Purchase Taxes and Charges,Account Head,Számla fejléc
 apps/erpnext/erpnext/config/stock.py +173,Update additional costs to calculate landed cost of items,Frissítse a többletköltségeket a tétel beszerzési költségének kiszámítására
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Electrical,Elektromos
@@ -4626,40 +4716,40 @@
 DocType: Item,Customer Code,Vevő kódja
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Születésnapi emlékeztető {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Utolsó rendeléstől eltel napok
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Tartozás főkönyvi számlának Mérlegszámlának kell lennie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Tartozás főkönyvi számlának Mérlegszámlának kell lennie
 DocType: Buying Settings,Naming Series,Sorszámozási csoportok
 DocType: Leave Block List,Leave Block List Name,Távollét blokk lista neve
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,"Biztosítás kezdeti dátumának kisebbnek kell lennie, mint a biztosítás befejezés dátuma"
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,"Kérjük, állítsd be az oktatónevezési rendszert az iskolai iskolai beállításokba"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Készletezett Eszközök
 DocType: Timesheet,Production Detail,Gyártás részletei
+DocType: Restaurant,Active Menu,Aktív menü
 DocType: Target Detail,Target Qty,Cél menny.
 DocType: Shopping Cart Settings,Checkout Settings,Kijelentkezés beállítások
 DocType: Attendance,Present,Jelen
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,A {0} Szállítólevelet nem kell benyújtani
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,A {0} Szállítólevelet nem kell benyújtani
 DocType: Notification Control,Sales Invoice Message,Kimenő értékesítési számlák üzenete
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,"Záró számla {0}, kötelezettség/saját tőke típusú legyen"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},A bérpapír az Alkalmazotthoz: {0} már létrehozott erre a jelenléti ívre: {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},A bérpapír az Alkalmazotthoz: {0} már létrehozott erre a jelenléti ívre: {1}
 DocType: Vehicle Log,Odometer,Kilométer-számláló
 DocType: Sales Order Item,Ordered Qty,Rendelt menny.
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Tétel {0} letiltva
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Tétel {0} letiltva
 DocType: Stock Settings,Stock Frozen Upto,Készlet zárolása eddig
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,ANYGJZ nem tartalmaz semmilyen készlet tételt
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Projekt téma feladatok / tevékenységek.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,ANYGJZ nem tartalmaz semmilyen készlet tételt
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Projekt téma feladatok / tevékenységek.
 DocType: Vehicle Log,Refuelling Details,Tankolás Részletek
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Bérpapír generálása
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Vásárlást ellenőrizni kell, amennyiben alkalmazható erre a kiválasztottra: {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,"Kedvezménynek kisebbnek kell lennie, mint 100"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Utolsó vételi ár nem található
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Írj egy egyszeri összeget (Társaság Currency)
 DocType: Sales Invoice Timesheet,Billing Hours,Számlázási Óra(k)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,Alapértelmezett anyagjegyzék BOM {0} nem található
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,"Sor # {0}: Kérjük, állítsa újrarendezésből mennyiség"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Alapértelmezett anyagjegyzék BOM {0} nem található
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,"Sor # {0}: Kérjük, állítsa újrarendezésből mennyiség"
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,"Érintse a tételeket, ahhoz,  hogy ide tegye"
 DocType: Fees,Program Enrollment,Program Beiratkozási
 DocType: Landed Cost Voucher,Landed Cost Voucher,Beszerzési költség utalvány
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Kérjük, állítsa be {0}"
-DocType: Purchase Invoice,Repeat on Day of Month,Ismételje meg a hónap napja
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} inaktív tanuló
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} inaktív tanuló
 DocType: Employee,Health Details,Egészségügyi adatok
 DocType: Offer Letter,Offer Letter Terms,Ajánlat levél feltételei
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Kifizetés iránti kérelem létrehozásához referencia dokumentum szükséges
@@ -4667,14 +4757,13 @@
 DocType: Employee External Work History,Salary,Bér
 DocType: Serial No,Delivery Document Type,Szállítási Document típusa
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Benyújtja az összes Bérpapírt a fent kiválasztott kritériumoknak megfelelően
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} tétel(ek) szinkronizálva
 DocType: Sales Order,Partly Delivered,Részben szállítva
 DocType: Email Digest,Receivables,Követelések
 DocType: Lead Source,Lead Source,Érdeklődés forrása
 DocType: Customer,Additional information regarding the customer.,További információt az ügyfélről.
 DocType: Quality Inspection Reading,Reading 5,Olvasás 5
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +225,"{0} {1} is associated with {2}, but Party Account is {3}","{0} {1} társítva a (z) {2} -hez, de a felek számlája a {3}"
-apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,A laboratóriumi tesztek megtekintése
+apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Laboratóriumi tesztek megtekintése
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Karbantartás dátuma
 DocType: Purchase Invoice Item,Rejected Serial No,Elutasított sorozatszám
@@ -4688,19 +4777,19 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Öregedés tartomány 2
 DocType: SG Creation Tool Course,Max Strength,Max állomány
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,Anyagjegyzék helyettesítve
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Válasszon elemeket a szállítási dátum alapján
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Válasszon elemeket a szállítási dátum alapján
 ,Sales Analytics,Értékesítési elemzés
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Elérhető {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Elérhető {0}
 ,Prospects Engaged But Not Converted,Kilátások elértek de nem átalakítottak
 DocType: Manufacturing Settings,Manufacturing Settings,Gyártás Beállítások
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,E-mail beállítása
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Helyettesítő1 Mobil szám
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,"Kérjük, adja meg az alapértelmezett pénznemet a Vállalkozás törzsadatban"
 DocType: Stock Entry Detail,Stock Entry Detail,Készlet bejegyzés részletei
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Napi emlékeztetők
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Napi emlékeztetők
 DocType: Products Settings,Home Page is Products,Kezdőlap a Termékek
 ,Asset Depreciation Ledger,Vagyoneszköz Értékcsökkenés Főkönyvi kivonat
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Adó szabály ütközik ezzel {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Adó szabály ütközik ezzel {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,New számla név
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Szállított alapanyagok költsége
 DocType: Selling Settings,Settings for Selling Module,Beállítások az Értékesítés modulhoz
@@ -4714,8 +4803,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Tétel: {0} -  Készlet tételnek kell lennie
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Alapértelmezett Folyamatban lévő munka raktára
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Alapértelmezett beállítások a számviteli tranzakciókhoz.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Kérjük, állítsa be az alkalmazottak elnevezési rendszerét az emberi erőforrás&gt; HR beállításoknál"
 DocType: Maintenance Visit,MV,KARBLATOG
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Várható időpont nem lehet korábbi mint az Anyag igénylés dátuma
+DocType: Restaurant,Default Tax Template,Alapértelmezett adózási sablon
 DocType: Fees,Student Details,Diák részletei
 DocType: Purchase Invoice Item,Stock Qty,Készlet menny.
 DocType: Employee Loan,Repayment Period in Months,Törlesztési időszak hónapokban
@@ -4733,8 +4823,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Menjen a tételekhez
 DocType: Sales Partner,Partner Type,Partner típusa
 DocType: Purchase Taxes and Charges,Actual,Tényleges
+DocType: Restaurant Menu,Restaurant Manager,Étterem vezető
 DocType: Authorization Rule,Customerwise Discount,Vevőszerinti kedvezmény
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Jelenléti ív a feladatokra.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Jelenléti ív a feladatokra.
 DocType: Purchase Invoice,Against Expense Account,Ellen költség számla
 DocType: Production Order,Production Order,Gyártásrendelés
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Telepítési feljegyzés {0} már benyújtott
@@ -4742,7 +4833,6 @@
 DocType: Quotation Item,Against Docname,Ellen Doknév
 DocType: SMS Center,All Employee (Active),Összes alkalmazott (Aktív)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Megtekintés most
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Válassza ki az időszakot, amikor a számlát automatikusan generálja"
 DocType: BOM,Raw Material Cost,Nyersanyagköltsége
 DocType: Item Reorder,Re-Order Level,Újra-rendelési szint
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Adjon tételeket és tervezett Mennyiséget amellyel növelni szeretné a gyártási megrendeléseket, vagy töltse le a nyersanyagokat  elemzésre."
@@ -4755,23 +4845,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Report Type kötelező
 DocType: Item,Serial Number Series,Széria sz. sorozat
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Raktár kötelező az {1} sorban lévő {0} tételhez
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Programok hozzáadása
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Kis- és nagykereskedelem
 DocType: Issue,First Responded On,Első válasz időpontja
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kereszt felsorolása a tételeknek több csoportban
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Pénzügyi év kezdő dátumát és a pénzügyi év befelyező dátumát már meghatározták a Pénzügyi évben: {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Végső Dátum frissítve
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Osztott Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Osztott Batch
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Sikeresen Egyeztetett
 DocType: Request for Quotation Supplier,Download PDF,PDF letöltése
 DocType: Production Order,Planned End Date,Tervezett befejezési dátum
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Adja meg az Ütemezési dátumot
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Ahol az anyagok tárolva vannak.
 DocType: Request for Quotation,Supplier Detail,Beszállító adatai
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Hiba az űrlapban vagy feltételben: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Hiba az űrlapban vagy feltételben: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Számlázott összeg
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,A kritériumok súlyai egészen 100%-ig
 DocType: Attendance,Attendance,Részvétel
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,Raktári tételek
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,Raktári tételek
 DocType: BOM,Materials,Anyagok
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ha nincs bejelölve, akkor a lista meg kell adni, hogy minden egyes részleg, ahol kell alkalmazni."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Forrás és Cél Raktár nem lehet azonos
@@ -4781,7 +4871,7 @@
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"A szavakkal mező lesz látható, miután mentette a Beszerzési megrendelést."
 DocType: Period Closing Voucher,Period Closing Voucher,Utalvány lejárati Időszaka
 DocType: Consultation,Review Details,Részletek megtekintése
-DocType: Dosage Form,Dosage Form,Dózisforma
+DocType: Dosage Form,Dosage Form,Adagolási dózisforma
 apps/erpnext/erpnext/config/selling.py +67,Price List master.,Árlista törzsadat.
 DocType: Task,Review Date,Vélemény dátuma
 DocType: Company,Series for Asset Depreciation Entry (Journal Entry),Értékcsökkenési tételsorozat (Naplóbejegyzés)
@@ -4789,6 +4879,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,Nettó összeshez
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},"Érték erre a Jellemzőre: {0} ezen a tartományon belül kell lennie: {1} - {2} azzel az emelkedéssel: {3} ,erre a tételre:{4}"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Cél raktár a {0} sorban meg kell egyeznie a gyártási rendeléssel
+DocType: Restaurant Reservation,Waitlisted,várólistás
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,"Pénznemen nem lehet változtatni, miután bejegyzéseket tett  más pénznem segítségével"
 DocType: Vehicle Service,Clutch Plate,Tengelykapcsoló lemez
 DocType: Company,Round Off Account,Gyüjtő számla
@@ -4805,7 +4896,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Új értékesítési személy neve
 DocType: Packing Slip,Gross Weight UOM,Bruttó tömeg mértékegysége
 DocType: Delivery Note Item,Against Sales Invoice,Értékesítési ellenszámlák
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,"Kérjük, adjaon sorozatszámokat a sorbarendezett tételekhez"
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,"Kérjük, adjaon sorozatszámokat a sorbarendezett tételekhez"
 DocType: Bin,Reserved Qty for Production,Fenntartott db Termelés
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Hagyja bejelöletlenül, ha nem szeretné, kötegelni miközben kurzus alapú csoportokat hoz létre."
 DocType: Asset,Frequency of Depreciation (Months),Az értékcsökkenés elszámolásának gyakorisága (hónapok)
@@ -4816,10 +4907,10 @@
 DocType: Lab Test,Test Group,Tesztcsoport
 DocType: Payment Reconciliation,Receivable / Payable Account,Bevételek / Fizetendő számla
 DocType: Delivery Note Item,Against Sales Order Item,Ellen Vevői rendelési tétel
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},"Kérjük, adja meg a Jellemző értékét erre a Jellemzőre: {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},"Kérjük, adja meg a Jellemző értékét erre a Jellemzőre: {0}"
 DocType: Item,Default Warehouse,Alapértelmezett raktár
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Költségvetést nem lehet hozzárendelni ehhez a Csoport számlához {0}
-DocType: Healthcare Settings,Patient Registration,Patient Registration
+DocType: Healthcare Settings,Patient Registration,Beteg regisztráció
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Kérjük, adjon meg szülő költséghelyet"
 DocType: Delivery Note,Print Without Amount,Nyomtatás érték nélkül
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Értékcsökkentés dátuma
@@ -4831,7 +4922,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Mérleg
 DocType: Room,Seating Capacity,Ülőhely kapacitás
 DocType: Issue,ISS-,PROBL-
-DocType: Lab Test Groups,Lab Test Groups,Lab Test Groups
+DocType: Lab Test Groups,Lab Test Groups,Labor Teszt csoportok
 DocType: Project,Total Expense Claim (via Expense Claims),Teljes Költség Követelés (költségtérítési igényekkel)
 DocType: GST Settings,GST Summary,GST Összefoglaló
 DocType: Assessment Result,Total Score,Összesített pontszám
@@ -4845,7 +4936,8 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Értékesítő
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Költségvetés és költséghely
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Több alapértelmezett fizetési mód nem engedélyezett
-,Appointment Analytics,Kinevezési Analytics
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,a
+,Appointment Analytics,Vizit időpontok elemzései
 DocType: Vehicle Service,Half Yearly,Félévente
 DocType: Lead,Blog Subscriber,Blog Követők
 DocType: Guardian,Alternate Number,Alternatív száma
@@ -4853,7 +4945,7 @@
 DocType: Assessment Plan Criteria,Maximum Score,Maximális pontszám
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Készítsen szabályokat az ügyletek korlátozására az értékek alapján.
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +49, Group Roll No,Csoport beiratkozási sz.:
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +9,Fee Creation Failed,A díj létrehozása sikertelen
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +9,Fee Creation Failed,Díj létrehozása sikertelen
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Hagyja üresen, ha diák csoportokat évente hozza létre"
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ha be van jelölve, a munkanapok száma tartalmazni fogja az ünnepeket, és ez csökkenti a napi bér összegét"
 DocType: Purchase Invoice,Total Advance,Összes előleg
@@ -4862,7 +4954,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Áraj számláló
 ,BOM Stock Report,Anyagjegyzék készlet jelentés
 DocType: Stock Reconciliation Item,Quantity Difference,Mennyiség különbség
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Feldolgozás bérszámfejtés
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Feldolgozás bérszámfejtés
 DocType: Opportunity Item,Basic Rate,Alapár
 DocType: GL Entry,Credit Amount,Követelés összege
 DocType: Cheque Print Template,Signatory Position,Az aláíró pozíció
@@ -4876,12 +4968,12 @@
 DocType: Tax Rule,Tax Rule,Adójogszabály
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Ugyanazt az árat tartani az egész értékesítési ciklusban
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Tervezési idő naplók a Munkaállomés  munkaidején kívül.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Az ügyfelek a sorban
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,A Dr {0} nem rendelkezik orvosütemezővel. Adja hozzá az orvos mesterhez
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Az ügyfelek a sorban
 DocType: Student,Nationality,Állampolgárság
 ,Items To Be Requested,Tételek kell kérni
-DocType: Purchase Order,Get Last Purchase Rate,Utolsó Beszerzési ár lekérése
 DocType: Company,Company Info,Vállakozás adatai
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Válasszon ki vagy adjon hozzá új vevőt
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Válasszon ki vagy adjon hozzá új vevőt
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Költséghely szükséges költségtérítési igény könyveléséhez
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Vagyon tárgyak alkalmazás (vagyoni eszközök)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ez az Alkalmazott jelenlétén alapszik
@@ -4889,6 +4981,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Tartozás Számla
 DocType: Fiscal Year,Year Start Date,Év kezdő dátuma
 DocType: Attendance,Employee Name,Alkalmazott neve
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Étterem rendelési bejegyzés
 DocType: Sales Invoice,Rounded Total (Company Currency),Kerekített összeg (a cég pénznemében)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Nem lehet csoporttá alakítani, mert a számla típus ki van választva."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,"{0} {1} módosításra került. Kérjük, frissítse."
@@ -4899,6 +4992,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Alkalmazotti juttatások
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Csomagolt mennyiségeknek egyezniük kell a  {1} sorban lévő {0} tétel mennyiségével
 DocType: Production Order,Manufactured Qty,Gyártott menny.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Számla létrehozva
 DocType: Purchase Receipt Item,Accepted Quantity,Elfogadott mennyiség
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},"Kérjük, állítsa be az alapértelmezett Ünnepet erre az Alkalmazottra: {0} vagy Vállalkozásra: {1}"
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} nem létezik
@@ -4908,18 +5002,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Sor {0}: Az összeg nem lehet nagyobb, mint a függőben lévő összege ezzel a költségtérítéssel szemben:  {1}. Függőben lévő összeg: {2}"
 DocType: Maintenance Schedule,Schedule,Ütemezés
 DocType: Account,Parent Account,Szülő számla
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Elérhető
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Elérhető
 DocType: Quality Inspection Reading,Reading 3,Olvasás 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Bizonylat típusa
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,"Árlista nem található, vagy letiltva"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,"Árlista nem található, vagy letiltva"
 DocType: Lab Test,Approved,Jóváhagyott
 DocType: Pricing Rule,Price,Árazás
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',"Elengedett alkalmazott: {0} , be kell állítani mint 'Távol'"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',"Elengedett alkalmazott: {0} , be kell állítani mint 'Távol'"
+DocType: Hub Settings,Last Sync On,Utolsó szinkronizálás be
 DocType: Guardian,Guardian,"Gyám, helyettesítő"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Értékelés: {0} létrehozva a(z)  {1} alkalmazottra a megadott dátum tartományban
 DocType: Employee,Education,Oktatás
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Töröl
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,Töröl
 DocType: Selling Settings,Campaign Naming By,Kampányt elnevezte
 DocType: Employee,Current Address Is,Jelenlegi cím
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Havi eladási cél (
@@ -4934,7 +5029,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Tanfolyam kód:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,"Kérjük, adja meg a Költség számlát"
 DocType: Account,Stock,Készlet
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Sor # {0}: Referencia Dokumentum típus legyen Beszerzési megrendelés, Beszerzési számla vagy Naplókönyvelés"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Sor # {0}: Referencia Dokumentum típus legyen Beszerzési megrendelés, Beszerzési számla vagy Naplókönyvelés"
 DocType: Employee,Current Address,Jelenlegi cím
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ha a tétel egy másik tétel egy változata akkor a leírás, kép, árképzés, adók stb. a sablonból lesz kiállítva, hacsak nincs külön meghatározva"
 DocType: Serial No,Purchase / Manufacture Details,Beszerzés / gyártás Részletek
@@ -4965,7 +5060,7 @@
 DocType: Hub Settings,Hub Settings,Hub Beállítások
 DocType: Project,Gross Margin %,Bruttó árkülönbözet %
 DocType: BOM,With Operations,Műveletek is
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Könyvelési tétel már megtörtént {0} pénznemben a {1} céghez. Kérjük, válasszon bevételi vagy kifizetendő számlát ebben a pénznemben {0}."
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Könyvelési tétel már megtörtént {0} pénznemben a {1} céghez. Kérjük, válasszon bevételi vagy kifizetendő számlát ebben a pénznemben {0}."
 DocType: Asset,Is Existing Asset,Meglévő eszköz
 DocType: Salary Detail,Statistical Component,Statisztikai összetevő
 DocType: Warranty Claim,If different than customer address,"Ha más, mint a vevő címe"
@@ -4973,13 +5068,14 @@
 DocType: BOM Operation,BOM Operation,ANYGJZ művelet
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Előző sor összegén
 DocType: Student,Home Address,Lakcím
+DocType: Item,Has Expiry Date,Érvényességi ideje
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Elem változat beállításai.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Eszköz átvitel
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,Eszköz átvitel
 DocType: POS Profile,POS Profile,POS profil
 DocType: Training Event,Event Name,Esemény neve
 DocType: Physician,Phone (Office),Telefon (iroda)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,Belépés
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Felvételi: {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,Belépés
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Felvételi: {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Szezonalitás a költségvetések tervezéséhez, célok stb"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Változó név
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Tétel:  {0}, egy sablon, kérjük, válasszon variánst"
@@ -4988,43 +5084,41 @@
 DocType: Assessment Plan,Room,Szoba
 DocType: Purchase Order,Advance Paid,A kifizetett előleg
 DocType: Item,Item Tax,Tétel adójának típusa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Anyag beszállítóhoz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Anyag beszállítóhoz
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Jövedéki számla
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Küszöb {0}% egynél többször jelenik meg
 DocType: Expense Claim,Employees Email Id,Alkalmazottak email id azonosító
 DocType: Employee Attendance Tool,Marked Attendance,jelzett Nézőszám
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Rövid lejáratú kötelezettségek
 apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Küldjön tömeges SMS-t a kapcsolatainak
-DocType: Patient,A Positive,Pozitív
+DocType: Patient,A Positive,Egy pozitív
 DocType: Program,Program Name,Program neve
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Fontolja meg az adókat és díjakat erre
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Tényleges Mennyiség ami kötelező
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","A(z) {0} jelenleg {1} Szállítói mutatószámmal rendelkezik, ezért a vevői rendeléseket ennek a szállítónak óvatosan kell kiadni."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","A(z) {0} jelenleg {1} Szállítói mutatószámmal rendelkezik, ezért a vevői rendeléseket ennek a szállítónak óvatosan kell kiadni."
 DocType: Employee Loan,Loan Type,Hitel típus
 DocType: Scheduling Tool,Scheduling Tool,Ütemező eszköz
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Hitelkártya
 DocType: BOM,Item to be manufactured or repacked,A tétel gyártott vagy újracsomagolt
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Alapértelmezett beállításokat részvény tranzakciókhoz.
-DocType: Purchase Invoice,Next Date,Következő dátum
 DocType: Employee Education,Major/Optional Subjects,Fő / választható témák
 DocType: Sales Invoice Item,Drop Ship,Drop Ship /Vevőtől eladóhoz/
+DocType: Hub Settings,Suspended,Felfüggesztett
 DocType: Training Event,Attendees,Résztvevők
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Itt tarthatja karban a család adatokat, mint a név és szülő foglalkozása, házastárs és a gyermekek"
 DocType: Academic Term,Term End Date,Feltétel Végdátum
-DocType: Hub Settings,Seller Name,Értékesítő neve
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Levont adók és költségek (a vállalkozás pénznemében)
 DocType: Item Group,General Settings,Általános beállítások
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Pénznemből és pénznembe nem lehet ugyanaz
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Oktatók hozzáadása
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Menteni kell az űrlapot folytatás előtt
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,"Kérjük, először válassza ki a Vállalkozást"
 DocType: Item Attribute,Numeric Values,Numerikus értékek
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Logo csatolása
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Készletszintek
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Készletszintek
 DocType: Customer,Commission Rate,Jutalék értéke
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Létrehozta a (z) {0} eredménymutatókat {1} között:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Változat létrehozás
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Változat létrehozás
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Zárja osztályonként a távollét igényeket.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Fizetés mód legyen Kapott, Fizetett és Belső Transzfer"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Elemzés
@@ -5039,11 +5133,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Alap készlet
 DocType: Shopping Cart Settings,Show Public Attachments,Itt találhatóak a nyilvános mellékletek
 DocType: Packing Slip,Package Weight Details,Csomag súlyának adatai
+DocType: Restaurant Reservation,Reservation Time,Foglalási idő
 DocType: Payment Gateway Account,Payment Gateway Account,Fizetési átjáró számla fiókja
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,A fizetés befejezése után a felhasználót átirányítja a kiválasztott oldalra.
 DocType: Company,Existing Company,Meglévő vállalkozás
 DocType: Healthcare Settings,Result Emailed,Eredmény elküldve
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","Adó kategóriák erre változott: ""Összes"", mert az összes tételek nem raktáron lévő tételek"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Tételkód&gt; Tételcsoport&gt; Márka
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,"Kérjük, válasszon egy csv fájlt"
 DocType: Student Leave Application,Mark as Present,Jelenlévővé jelölés
 DocType: Supplier Scorecard,Indicator Color,Jelölés színe
@@ -5057,7 +5153,7 @@
 DocType: Terms and Conditions,Terms and Conditions Help,Általános szerződési feltételek  Súgó
 ,Item-wise Purchase Register,Tételenkénti Beszerzés Regisztráció
 DocType: Batch,Expiry Date,Lejárat dátuma
-DocType: Healthcare Settings,Employee name and designation in print,Alkalmazott neve és megnevezése nyomtatott formában
+DocType: Healthcare Settings,Employee name and designation in print,Alkalmazott neve és megnevezése nyomtatásban
 ,accounts-browser,beszámoló-böngésző
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +351,Please select Category first,"Kérjük, válasszon Kategóriát először"
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projek témák törzsadat.
@@ -5068,11 +5164,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Tanuló köteg létrehozás
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Ez átvitt
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Elemek lekérése Anyagjegyzékből
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Elemek lekérése Anyagjegyzékből
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Érdeklődés idő napokban
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Sor # {0}: Beküldés dátuma meg kell egyeznie a vásárlás dátumát {1} eszköz {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Jelölje be ezt, ha a diák lakóhelye az intézet diákszállása."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Kérjük, adja meg a vevői rendeléseket, a fenti táblázatban"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Kérjük, adja meg a vevői rendeléseket, a fenti táblázatban"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Beküldetlen bérpapírok
 ,Stock Summary,Készlet Összefoglaló
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Egy eszköz átvitele az egyik raktárból a másikba
@@ -5086,7 +5182,8 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Szentesített Összeg
 DocType: GL Entry,Is Opening,Ez nyitás
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: terheléssel nem kapcsolódik a {1}
-DocType: Journal Entry,Subscription Section,Előfizetési szekció
+DocType: Journal Entry,Subscription Section,Előfizetési szakasz
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,A {0} számla nem létezik
+DocType: Training Event,Training Program,Tréning program
 DocType: Account,Cash,Készpénz
 DocType: Employee,Short biography for website and other publications.,Rövid életrajz a honlaphoz és egyéb kiadványokhoz.
diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv
index 6e17f3c..dc4deeb 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Mode Gaji
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Daftar
 DocType: Patient,Divorced,Bercerai
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Item sudah disinkronkan
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Izinkan Stok Barang yang sama untuk ditambahkan beberapa kali dalam suatu transaksi
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Batal Bahan Kunjungan {0} sebelum membatalkan Garansi Klaim ini
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produk Pelanggan
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Approval Cuti
 DocType: Sales Partner,Dealer,Dealer (Pelaku)
 DocType: Consultation,Investigations,Investigasi
+DocType: Restaurant Order Entry,Click Enter To Add,Klik Enter To Add
 DocType: Employee,Rented,Sewaan
 DocType: Purchase Order,PO-,po
 DocType: POS Profile,Applicable for User,Berlaku untuk Pengguna
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Berhenti Order Produksi tidak dapat dibatalkan, unstop terlebih dahulu untuk membatalkan"
 DocType: Vehicle Service,Mileage,Jarak tempuh
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Apakah Anda benar-benar ingin membatalkan aset ini?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Apakah Anda benar-benar ingin membatalkan aset ini?
 DocType: Drug Prescription,Update Schedule,Update Jadwal
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Pilih Default Pemasok
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Mata Uang diperlukan untuk Daftar Harga {0}
@@ -31,23 +32,23 @@
 DocType: Patient Appointment,Check availability,Cek ketersediaan
 DocType: Job Applicant,Job Applicant,Pemohon Kerja
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Hal ini didasarkan pada transaksi terhadap Pemasok ini. Lihat timeline di bawah untuk rincian
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Tidak ada lagi hasil.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Hukum
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Jenis pajak aktual tidak dapat dimasukkan dalam tarif Stok Barang di baris {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Jenis pajak aktual tidak dapat dimasukkan dalam tarif di baris {0}
 DocType: Bank Guarantee,Customer,Pelanggan
 DocType: Purchase Receipt Item,Required By,Diperlukan Oleh
-DocType: Delivery Note,Return Against Delivery Note,Kembali Terhadap Pengiriman Catatan
+DocType: Delivery Note,Return Against Delivery Note,Retur Terhadap Nota Pengiriman
 DocType: Purchase Order,% Billed,Ditagih %
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Kurs harus sama dengan {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nama Pelanggan
 DocType: Vehicle,Natural Gas,Gas alam
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Rekening bank tidak dapat namakan sebagai {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Rekening bank tidak dapat namakan sebagai {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Kepala (atau kelompok) terhadap yang Entri Akuntansi dibuat dan saldo dipertahankan.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Posisi untuk {0} tidak bisa kurang dari nol ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Tidak ada slip Saldo yang diajukan untuk diproses.
 DocType: Manufacturing Settings,Default 10 mins,Standar 10 menit
 DocType: Leave Type,Leave Type Name,Nama Tipe Cuti
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Tampilkan terbuka
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Hal ini diperlukan untuk mengambil tindakan ini hari ini sendiri untuk berulang di atas
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Series Berhasil Diupdate
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Periksa
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural Journal Entri Dikirim
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Order Pembelian Stok Barang Akan Diterima
 DocType: SMS Center,All Supplier Contact,Kontak semua Supplier
 DocType: Support Settings,Support Settings,Pengaturan dukungan
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Diharapkan Tanggal Berakhir tidak bisa kurang dari yang diharapkan Tanggal Mulai
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Diharapkan Tanggal Berakhir tidak bisa kurang dari yang diharapkan Tanggal Mulai
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Tingkat harus sama dengan {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Aplikasi Cuti Baru
-,Batch Item Expiry Status,Batch Barang kadaluarsa Status
+,Batch Item Expiry Status,Status Kadaluarsa Persediaan Batch
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Bank Draft
 DocType: Mode of Payment Account,Mode of Payment Account,Mode Akun Pembayaran Rekening
 DocType: Consultation,Consultation,Konsultasi
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Penjualan dan Pengembalian
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Tampilkan Varian
 DocType: Academic Term,Academic Term,Jangka akademik
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Bahan
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Kesehatan
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Keterlambatan pembayaran (Hari)
 DocType: Lab Prescription,Lab Prescription,Resep Lab
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Urutkan berdasarkan harga
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Beban layanan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Nomor Seri: {0} sudah dirujuk dalam Faktur Penjualan: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Faktur
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Nomor Seri: {0} sudah dirujuk dalam Faktur Penjualan: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Faktur
 DocType: Maintenance Schedule Item,Periodicity,Periode
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Tahun fiskal {0} diperlukan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Pertahanan
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Jumlah Total Biaya
 DocType: Delivery Note,Vehicle No,Nomor Kendaraan
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Silakan pilih Daftar Harga
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Silakan pilih Daftar Harga
 DocType: Accounts Settings,Currency Exchange Settings,Pengaturan Pertukaran Mata Uang
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Row # {0}: Dokumen Pembayaran diperlukan untuk menyelesaikan trasaction yang
 DocType: Production Order Operation,Work In Progress,Pekerjaan dalam proses
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Silakan pilih tanggal
 DocType: Employee,Holiday List,Daftar Hari Libur
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Silakan setup Sistem Penamaan Instruktur di Sekolah&gt; Pengaturan Sekolah
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Akuntan
+DocType: Hub Settings,Selling Price List,Daftar Harga Jual
 DocType: Patient,Tobacco Current Use,Penggunaan Saat Ini Tembakau
 DocType: Cost Center,Stock User,Pengguna Persediaan
 DocType: Company,Phone No,No Telepon yang
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Jadwal Kursus dibuat:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Baru {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Baru {0}: # {1}
 ,Sales Partners Commission,Komisi Mitra Penjualan
 DocType: Purchase Invoice,Rounding Adjustment,Penyesuaian Pembulatan
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Singkatan tidak boleh melebihi 5 karakter
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Induk Detil docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referensi: {0}, Kode Item: {1} dan Pelanggan: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kg
-DocType: Student Log,Log,Log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Lowongan untuk Pekerjaan.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Hasil diserahkan
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Hasil terkirim
 DocType: Item Attribute,Increment,Kenaikan
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Rentang waktu
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Pilih Gudang ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Menikah
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Tidak diizinkan untuk {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Mendapatkan Stok Barang-Stok Barang dari
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Persediaan tidak dapat diperbarui terhadap Nota Pengiriman {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Persediaan tidak dapat diperbarui terhadap Nota Pengiriman {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produk {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Tidak ada item yang terdaftar
 DocType: Payment Reconciliation,Reconcile,Rekonsiliasi
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Dana pensiun
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Berikutnya Penyusutan Tanggal tidak boleh sebelum Tanggal Pembelian
 DocType: Consultation,Consultation Date,Tanggal Konsultasi
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Daftar produk dan penemuan untuk pengguna ERPNext
 DocType: SMS Center,All Sales Person,Semua Salesmen
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Distribusi Bulanan ** membantu Anda mendistribusikan Anggaran / Target di antara bulan-bulan jika bisnis Anda memiliki musim.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Tidak item yang ditemukan
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Struktur Gaji Hilang
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Tidak item yang ditemukan
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Struktur Gaji Hilang
 DocType: Lead,Person Name,Nama orang
 DocType: Sales Invoice Item,Sales Invoice Item,Faktur Penjualan Stok Barang
 DocType: Account,Credit,Kredit
 DocType: POS Profile,Write Off Cost Center,Write Off Biaya Pusat
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",misalnya &quot;Sekolah Dasar&quot; atau &quot;Universitas&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",misalnya &quot;Sekolah Dasar&quot; atau &quot;Universitas&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Laporan Persediaan
 DocType: Warehouse,Warehouse Detail,Detail Gudang
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Batas kredit telah terlampaui untuk Pelanggan {0} {1}/{2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Jangka Tanggal Akhir tidak bisa lebih lambat dari Akhir Tahun Tanggal Tahun Akademik yang istilah terkait (Tahun Akademik {}). Perbaiki tanggal dan coba lagi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Aset Tetap"" tidak dapat tidak dicentang, karena ada data Asset terhadap barang"
-DocType: Vehicle Service,Brake Oil,rem Minyak
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Aset Tetap"" tidak dapat tidak dicentang, karena ada data Asset terhadap barang"
+DocType: Vehicle Service,Brake Oil,Minyak Rem
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Grup Pelanggan&gt; Wilayah
 DocType: Tax Rule,Tax Type,Jenis pajak
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Jumlah Kena Pajak
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Anda tidak diizinkan menambah atau memperbarui entri sebelum {0}
 DocType: BOM,Item Image (if not slideshow),Gambar Stok Barang (jika tidak slideshow)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Ada Pelanggan dengan nama yang sama
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarif per Jam / 60) * Masa Beroperasi Sebenarnya
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Baris # {0}: Jenis Dokumen Referensi harus menjadi salah satu Klaim Biaya atau Entri Jurnal
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Pilih BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Baris # {0}: Jenis Dokumen Referensi harus menjadi salah satu Klaim Biaya atau Entri Jurnal
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Pilih BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Biaya Produk Terkirim
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Liburan di {0} bukan antara Dari Tanggal dan To Date
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,Pinjaman karyawan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Log Aktivitas:
 DocType: Fee Schedule,Send Payment Request Email,Kirim Permintaan Pembayaran Email
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Item {0} tidak ada dalam sistem atau telah berakhir
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Item {0} tidak ada dalam sistem atau telah berakhir
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Real Estate
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Laporan Rekening
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmasi
@@ -210,17 +213,22 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Impor Log
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Tarik Bahan Permintaan jenis Industri berdasarkan kriteria di atas
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Berhasil tidak terdaftar
 DocType: Training Result Employee,Grade,Kelas
+DocType: Restaurant Table,No of Seats,Tidak ada tempat duduk
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Untuk menambahkan subjek dinamis, gunakan tag jinja seperti <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Terkirim Oleh Supplier
 DocType: SMS Center,All Contact,Semua Kontak
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Pesanan produksi sudah dibuat untuk semua item dengan BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Pesanan produksi sudah dibuat untuk semua item dengan BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Gaji Tahunan
 DocType: Daily Work Summary,Daily Work Summary,Ringkasan Pekerjaan sehari-hari
 DocType: Period Closing Voucher,Closing Fiscal Year,Penutup Tahun Anggaran
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} dibekukan
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Silakan pilih Perusahaan yang ada untuk menciptakan Chart of Account
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} dibekukan
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Silakan pilih Perusahaan yang ada untuk menciptakan Chart of Account
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Beban Persediaan
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Pilih Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Pilih Target Warehouse
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Silahkan masukkan Kontak Email Utama
 DocType: Program Enrollment,School Bus,Bus sekolah
 DocType: Journal Entry,Contra Entry,Contra Entri
@@ -237,9 +245,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Unduh Template, isi data yang sesuai dan lampirkan file yang sudah dimodifikasi. Semua kombinasi tanggal dan karyawan dalam periode yang dipilih akan masuk dalam template, dengan catatan kehadiran yang ada"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Item {0} tidak aktif atau akhir hidup telah tercapai
+DocType: Student Admission Program,Minimum Age,Usia Minimum
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Contoh: Matematika Dasar
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Untuk mencakup pajak berturut-turut {0} di tingkat Stok Barang, pajak dalam baris {1} juga harus disertakan"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Pengaturan untuk modul HR
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Pengaturan untuk modul HR
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,perubahan Jumlah
 DocType: BOM Update Tool,New BOM,BOM Baru
@@ -249,7 +258,7 @@
 DocType: Lead,Request Type,Permintaan Type
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,membuat Karyawan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Penyiaran
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Tambahkan Kamar
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Modus setup POS (Online / Offline)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Eksekusi
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Rincian operasi yang dilakukan.
 DocType: Serial No,Maintenance Status,Status pemeliharaan
@@ -272,6 +281,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Harga List harus berlaku untuk Membeli atau Jual
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Tanggal instalasi tidak bisa sebelum tanggal pengiriman untuk Item {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Diskon Harga Daftar Rate (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Biokimia
 DocType: Offer Letter,Select Terms and Conditions,Pilih Syarat dan Ketentuan
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,out Nilai
 DocType: Production Planning Tool,Sales Orders,Order Penjualan
@@ -306,15 +316,15 @@
 DocType: Sales Partner,Reseller,Reseller
 DocType: Codification Table,Medical Code,Kode medis
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Jika dicentang, akan mencakup barang non-persediaan di Permintaan Material."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Pilih Perusahaan
-DocType: Delivery Note Item,Against Sales Invoice Item,Terhadap Stok Barang di Faktur Penjualan
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Pilih Perusahaan
+DocType: Delivery Note Item,Against Sales Invoice Item,Terhadap Barang di Faktur Penjualan
 ,Production Orders in Progress,Order produksi dalam Proses
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Kas Bersih dari Pendanaan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage penuh, tidak menyimpan"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage penuh, tidak menyimpan"
 DocType: Lead,Address & Contact,Alamat & Kontak
 DocType: Leave Allocation,Add unused leaves from previous allocations,Tambahkan 'cuti tak terpakai' dari alokasi sebelumnya
 DocType: Sales Partner,Partner website,situs mitra
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Tambahkan Barang
+DocType: Restaurant Order Entry,Add Item,Tambahkan Barang
 DocType: Lab Test,Custom Result,Hasil Kustom
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Nama Kontak
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kriteria Penilaian saja
@@ -327,7 +337,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Form Permintaan pembelian.
 DocType: Lab Test,Submitted Date,Tanggal dikirim
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Hal ini didasarkan pada Lembar Waktu diciptakan terhadap proyek ini
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Pay bersih yang belum bisa kurang dari 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Pay bersih yang belum bisa kurang dari 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Untuk berhenti mengirim pemberitahuan kesalahan berulang dari sistem, kami telah memeriksa kolom Nonaktif dalam langganan"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Hanya dipilih Cuti Approver dapat mengirimkan Aplikasi Cuti ini
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Menghilangkan Tanggal harus lebih besar dari Tanggal Bergabung
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,cuti per Tahun
@@ -336,10 +347,11 @@
 DocType: Email Digest,Profit & Loss,Rugi laba
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Liter
 DocType: Task,Total Costing Amount (via Time Sheet),Total Costing Jumlah (via Waktu Lembar)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Tolong atur Siswa di Kelompok Siswa
 DocType: Item Website Specification,Item Website Specification,Item Situs Spesifikasi
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Cuti Diblokir
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Item {0} telah mencapai akhir hidupnya pada {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Bank Entries
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Item {0} telah mencapai akhir hidupnya pada {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Entri Bank
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Tahunan
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Barang Rekonsiliasi Persediaan
 DocType: Stock Entry,Sales Invoice No,Nomor Faktur Penjualan
@@ -347,7 +359,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Kursus Grup Pelajar Penciptaan Alat
 DocType: Lead,Do Not Contact,Jangan Hubungi
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,Orang-orang yang mengajar di organisasi Anda
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Id yang unik untuk melacak semua tagihan berulang. Hal ini dihasilkan di submit.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimum Order Qty
 DocType: Pricing Rule,Supplier Type,Supplier Type
@@ -357,17 +368,19 @@
 DocType: Item,Publish in Hub,Publikasikan di Hub
 DocType: Student Admission,Student Admission,Mahasiswa Pendaftaran
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Item {0} dibatalkan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Permintaan Material
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Item {0} dibatalkan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Permintaan Material
 DocType: Bank Reconciliation,Update Clearance Date,Perbarui Izin Tanggal
 DocType: Item,Purchase Details,Rincian pembelian
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} tidak ditemukan dalam &#39;Bahan Baku Disediakan&#39; tabel dalam Purchase Order {1}
 DocType: Patient Relation,Relation,Hubungan
 DocType: Shipping Rule,Worldwide Shipping,Pengiriman seluruh dunia
 DocType: Patient Relation,Mother,Ibu
+DocType: Restaurant Reservation,Reservation End Time,Reservasi Akhir Waktu
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Pesanan terkonfirmasi dari Pelanggan.
 DocType: Purchase Receipt Item,Rejected Quantity,Kuantitas Ditolak
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Permintaan pembayaran {0} dibuat
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Permintaan pembayaran {0} dibuat
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Sensitivitas rendah
 DocType: Notification Control,Notification Control,Pemberitahuan Kontrol
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Harap konfirmasi setelah Anda menyelesaikan pelatihan Anda
 DocType: Lead,Suggestions,Saran
@@ -387,7 +400,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Surel slip gaji ke karyawan berdasarkan surel utama yang dipilih dalam Karyawan
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,The Approver Cuti terlebih dahulu dalam daftar akan ditetapkan sebagai default Cuti Approver
 DocType: Tax Rule,Shipping County,Pengiriman County
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Belajar
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Belajar
 DocType: Asset,Next Depreciation Date,Berikutnya Penyusutan Tanggal
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Biaya Aktivitas Per Karyawan
 DocType: Accounts Settings,Settings for Accounts,Pengaturan Akun
@@ -398,13 +411,13 @@
 DocType: Item,Synced With Hub,Disinkronkan Dengan Hub
 DocType: Vehicle,Fleet Manager,armada Manajer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} tidak bisa menjadi negatif untuk item {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Kata Sandi Salah
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Kata Sandi Salah
 DocType: Item,Variant Of,Varian Of
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Selesai Qty tidak dapat lebih besar dari 'Jumlah untuk Produksi'
 DocType: Period Closing Voucher,Closing Account Head,Penutupan Akun Kepala
 DocType: Employee,External Work History,Pengalaman Kerja Diluar
 DocType: Physician,Time per Appointment,Waktu per Penunjukan
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Referensi Kesalahan melingkar
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Referensi Kesalahan melingkar
 DocType: Appointment Type,Is Inpatient,Apakah rawat inap
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Nama Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Dalam Kata-kata (Ekspor) akan terlihat sekali Anda menyimpan Delivery Note.
@@ -413,19 +426,18 @@
 DocType: Lead,Industry,Industri
 DocType: Employee,Job Profile,Profil Pekerjaan
 DocType: BOM Item,Rate & Amount,Tarif &amp; Jumlah
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Silakan setup seri penomoran untuk Kehadiran melalui Setup&gt; Numbering Series
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Hal ini didasarkan pada transaksi terhadap Perusahaan ini. Lihat garis waktu di bawah untuk rinciannya
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Beritahu melalui Surel pada pembuatan Permintaan Material otomatis
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Tahan
 DocType: Journal Entry,Multi Currency,Multi Mata Uang
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipe Faktur
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Grup Pelanggan&gt; Wilayah
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Nota Pengiriman
 DocType: Consultation,Encounter Impression,Tayangan Pertemuan
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Persiapan Pajak
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Biaya Asset Terjual
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,Entri pembayaran telah dimodifikasi setelah Anda menariknya. Silakan menariknya lagi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} dimasukan dua kali dalam Pajak Persediaan Barang
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Ringkasan untuk minggu ini dan kegiatan yang tertunda
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} dimasukan dua kali dalam Pajak Persediaan Barang
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Ringkasan untuk minggu ini dan kegiatan yang tertunda
 DocType: Student Applicant,Admitted,Diterima
 DocType: Workstation,Rent Cost,Biaya Sewa
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Jumlah Setelah Penyusutan
@@ -439,36 +451,35 @@
 DocType: Shipping Rule,Valid for Countries,Berlaku untuk Negara
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Stok Barang ini adalah Template dan tidak dapat digunakan dalam transaksi. Item atribut akan disalin ke dalam varian kecuali 'Tidak ada Copy' diatur
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total Order Diperhitungkan
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Penunjukan Karyawan (misalnya CEO, Direktur dll)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Penunjukan Karyawan (misalnya CEO, Direktur dll)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tingkat di mana Mata Uang Pelanggan dikonversi ke mata uang dasar pelanggan
 DocType: Course Scheduling Tool,Course Scheduling Tool,Tentu saja Penjadwalan Perangkat
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Pembelian Faktur tidak dapat dilakukan terhadap aset yang ada {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Urgent] Kesalahan saat membuat% s yang berulang untuk% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Urgent] Kesalahan saat membuat dokumen berulang % s  untuk% s
 DocType: Item Tax,Tax Rate,Tarif Pajak
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} sudah dialokasikan untuk Karyawan {1} untuk periode {2} ke {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Pilih Stok Barang
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Pilih Stok Barang
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Faktur Pembelian {0} sudah Terkirim
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch ada harus sama {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Dikonversi ke non-Grup
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Batch (banyak) dari Item.
 DocType: C-Form Invoice Detail,Invoice Date,Faktur Tanggal
 DocType: GL Entry,Debit Amount,Jumlah Debit
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Hanya ada 1 Akun per Perusahaan di {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Silakan lihat lampiran
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Hanya ada 1 Akun per Perusahaan di {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Silakan lihat lampiran
 DocType: Purchase Order,% Received,% Diterima
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Buat Grup Mahasiswa
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Pengaturan Sudah Selesai!!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Pengaturan Sudah Selesai!!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Jumlah Catatan Kredit
 DocType: Setup Progress Action,Action Document,Dokumen tindakan
 ,Finished Goods,Stok Barang Jadi
 DocType: Delivery Note,Instructions,Instruksi
 DocType: Quality Inspection,Inspected By,Diperiksa Oleh
 DocType: Maintenance Visit,Maintenance Type,Tipe Pemeliharaan
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} tidak terdaftar di Kursus {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Group&gt; Brand
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} tidak terdaftar di Kursus {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial ada {0} bukan milik Pengiriman Note {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Tambahkan Item
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Tambahkan Item
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Stok Barang Kualitas Parameter Inspeksi
 DocType: Leave Application,Leave Approver Name,Nama Approver Cuti
 DocType: Depreciation Schedule,Schedule Date,Jadwal Tanggal
@@ -488,7 +499,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Jam Kerja
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Mengubah mulai / nomor urut saat ini dari seri yang ada.
 DocType: Dosage Strength,Strength,Kekuatan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Buat Pelanggan baru
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Buat Pelanggan baru
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Jika beberapa Aturan Harga terus menang, pengguna akan diminta untuk mengatur Prioritas manual untuk menyelesaikan konflik."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Buat Purchase Order
 ,Purchase Register,Register Pembelian
@@ -507,14 +518,14 @@
 DocType: Lab Test Template,Single,Tunggal
 DocType: Salary Slip,Total Loan Repayment,Total Pembayaran Pinjaman
 DocType: Account,Cost of Goods Sold,Harga Pokok Penjualan
-DocType: Purchase Invoice,Yearly,Tahunan
+DocType: Subscription,Yearly,Tahunan
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Harap Masukan Jenis Biaya Pusat
 DocType: Drug Prescription,Dosage,Dosis
 DocType: Journal Entry Account,Sales Order,Order Penjualan
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Harga Jual Rata-rata
 DocType: Assessment Plan,Examiner Name,Nama pemeriksa
 DocType: Lab Test Template,No Result,Tidak ada hasil
-DocType: Purchase Invoice Item,Quantity and Rate,Jumlah dan Tingkat Harga
+DocType: Purchase Invoice Item,Quantity and Rate,Kuantitas dan Harga
 DocType: Delivery Note,% Installed,% Terpasang
 apps/erpnext/erpnext/utilities/user_progress.py +209,Classrooms/ Laboratories etc where lectures can be scheduled.,Ruang kelas / Laboratorium dll di mana kuliah dapat dijadwalkan.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Silahkan masukkan nama perusahaan terlebih dahulu
@@ -522,7 +533,7 @@
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Baca Pedoman ERPNEXT
 DocType: Account,Is Group,Apakah Group?
 DocType: Email Digest,Pending Purchase Orders,Pending Pembelian Pesanan
-DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Nomor Serial Otomatis berdasarkan FIFO
+DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Nomor Seri Otomatis berdasarkan FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Periksa keunikan nomor Faktur Supplier
 DocType: Vehicle Service,Oil Change,Ganti oli
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Sampai Kasus No.' tidak bisa kurang dari 'Dari Kasus No.'
@@ -537,14 +548,14 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Pengaturan global untuk semua proses manufaktur.
 DocType: Accounts Settings,Accounts Frozen Upto,Akun dibekukan sampai dengan
 DocType: SMS Log,Sent On,Dikirim Pada
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Atribut {0} karena beberapa kali dalam Atribut Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Atribut {0} karena beberapa kali dalam Atribut Tabel
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,Tidak Berlaku
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,master Hari Libur.
 DocType: Request for Quotation Item,Required Date,Diperlukan Tanggal
 DocType: Delivery Note,Billing Address,Alamat Penagihan
 DocType: BOM,Costing,Biaya
-DocType: Tax Rule,Billing County,penagihan County
+DocType: Tax Rule,Billing County,Daerah Penagihan
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Jika dicentang, jumlah pajak akan dianggap sebagai sudah termasuk dalam Jumlah Tingkat Cetak / Print"
 DocType: Request for Quotation,Message for Supplier,Pesan Supplier
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Jumlah Qty
@@ -562,13 +573,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Jumlah cuti wajib dialokasikan
 DocType: Patient,AB Positive,AB Positif
 DocType: Job Opening,Description of a Job Opening,Deskripsi dari Lowongan Pekerjaan
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Kegiatan tertunda untuk hari ini
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Kegiatan tertunda untuk hari ini
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Laporan Absensi.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Komponen gaji untuk gaji berdasarkan absen.
 DocType: Sales Order Item,Used for Production Plan,Digunakan untuk Rencana Produksi
 DocType: Employee Loan,Total Payment,Total pembayaran
 DocType: Manufacturing Settings,Time Between Operations (in mins),Waktu diantara Operasi (di menit)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} dibatalkan sehingga tindakan tidak dapat diselesaikan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} dibatalkan sehingga tindakan tidak dapat diselesaikan
 DocType: Customer,Buyer of Goods and Services.,Pembeli Stok Barang dan Jasa.
 DocType: Journal Entry,Accounts Payable,Hutang
 DocType: Patient,Allergies,Alergi
@@ -577,25 +588,26 @@
 DocType: Vital Signs,Blood Pressure (systolic),Tekanan Darah (sistolik)
 DocType: Pricing Rule,Valid Upto,Valid Upto
 DocType: Training Event,Workshop,Bengkel
-DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Panggil Pesanan Pembelian
+DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Peringatkan untuk Pesanan Pembelian
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Daftar beberapa pelanggan anda. Bisa organisasi atau individu.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Bagian yang cukup untuk Membangun
+DocType: POS Profile User,POS Profile User,Profil Pengguna POS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Pendapatan Langsung
 DocType: Patient Appointment,Date TIme,Tanggal Waktu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Tidak dapat memfilter berdasarkan Account, jika dikelompokkan berdasarkan Account"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Petugas Administrasi
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Silakan pilih Kursus
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Silakan pilih Kursus
 DocType: Codification Table,Codification Table,Tabel Kodifikasi
 DocType: Timesheet Detail,Hrs,Hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Silakan pilih Perusahaan
 DocType: Stock Entry Detail,Difference Account,Perbedaan Akun
 DocType: Purchase Invoice,Supplier GSTIN,Pemasok GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Tidak bisa tugas sedekat tugas yang tergantung {0} tidak tertutup.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,Entrikan Gudang yang Material Permintaan akan dibangkitkan
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Tidak bisa tugas sedekat tugas yang tergantung {0} tidak tertutup.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Entrikan Gudang yang Material Permintaan akan dibangkitkan
 DocType: Production Order,Additional Operating Cost,Biaya Operasi Tambahan
 DocType: Lab Test Template,Lab Routine,Lab Rutin
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Untuk bergabung, sifat berikut harus sama untuk kedua item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Untuk bergabung, sifat berikut harus sama untuk kedua item"
 DocType: Shipping Rule,Net Weight,Berat Bersih
 DocType: Employee,Emergency Phone,Telepon Darurat
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Membeli
@@ -605,7 +617,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Harap tentukan nilai untuk Threshold 0%
 DocType: Sales Order,To Deliver,Mengirim
 DocType: Purchase Invoice Item,Item,Barang
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Serial Item tidak dapat pecahan
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Sensitivitas tinggi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Serial Item tidak dapat pecahan
 DocType: Journal Entry,Difference (Dr - Cr),Perbedaan (Dr - Cr)
 DocType: Account,Profit and Loss,Laba Rugi
 DocType: Patient,Risk Factors,Faktor risiko
@@ -614,7 +627,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Pengaturan Subkontrak
 DocType: Vital Signs,Body Temperature,Suhu tubuh
 DocType: Project,Project will be accessible on the website to these users,Proyek akan dapat diakses di website pengguna ini
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Tentukan jenis proyek.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Tentukan jenis proyek.
 DocType: Supplier Scorecard,Weighting Function,Fungsi pembobotan
 DocType: Physician,OP Consulting Charge,OP Consulting Charge
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Setup Anda
@@ -628,7 +641,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Kenaikan tidak bisa 0
 DocType: Production Planning Tool,Material Requirement,Permintaan Material / Bahan
 DocType: Company,Delete Company Transactions,Hapus Transaksi Perusahaan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Referensi ada dan Tanggal referensi wajib untuk transaksi Bank
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Referensi ada dan Tanggal referensi wajib untuk transaksi Bank
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tambah / Edit Pajak dan Biaya
 DocType: Payment Entry Reference,Supplier Invoice No,Nomor Faktur Supplier
 DocType: Territory,For reference,Untuk referensi
@@ -636,12 +649,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Tidak dapat menghapus No. Seri {0}, karena digunakan dalam transaksi persediaan"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Penutup (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Halo
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Pindahkan Barang
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Pindahkan Barang
 DocType: Serial No,Warranty Period (Days),Masa Garansi (Hari)
 DocType: Installation Note Item,Installation Note Item,Laporan Instalasi Stok Barang
 DocType: Production Plan Item,Pending Qty,Qty Tertunda
 DocType: Budget,Ignore,Diabaikan
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} tidak aktif
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} tidak aktif
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,dimensi penyiapan cek untuk pencetakan
 DocType: Salary Slip,Salary Slip Timesheet,Daftar Absen Slip Gaji
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Supplier Gudang wajib untuk Pembelian Penerimaan sub-kontrak
@@ -650,12 +663,12 @@
 DocType: Pricing Rule,Sales Partner,Mitra Penjualan
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Semua kartu pemilih Pemasok.
 DocType: Buying Settings,Purchase Receipt Required,Diperlukan Nota Penerimaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Tingkat Valuasi adalah wajib jika menggunakan Persediaan Pembukaan
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,Tingkat Valuasi adalah wajib jika menggunakan Persediaan Pembukaan
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Tidak ada catatan yang ditemukan dalam tabel Faktur
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Silakan pilih Perusahaan dan Partai Jenis terlebih dahulu
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Keuangan / akuntansi Tahun Berjalan
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Nilai akumulasi
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Maaf, Serial Nos tidak dapat digabungkan"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Maaf, Nomor Seri tidak dapat digabungkan"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +63,Territory is Required in POS Profile,Wilayah Diperlukan di Profil POS
 DocType: Supplier,Prevent RFQs,Mencegah RFQs
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Membuat Sales Order
@@ -684,10 +697,10 @@
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database pelanggan potensial.
 DocType: Authorization Rule,Customer or Item,Pelanggan atau Produk
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,Database Pelanggan.
-DocType: Quotation,Quotation To,Quotation Untuk
+DocType: Quotation,Quotation To,Penawaran Kepada
 DocType: Lead,Middle Income,Penghasilan Menengah
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Pembukaan (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standar Satuan Ukur untuk Item {0} tidak dapat diubah secara langsung karena Anda telah membuat beberapa transaksi (s) dengan UOM lain. Anda akan perlu untuk membuat item baru menggunakan default UOM berbeda.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standar Satuan Ukur untuk Item {0} tidak dapat diubah secara langsung karena Anda telah membuat beberapa transaksi (s) dengan UOM lain. Anda akan perlu untuk membuat item baru menggunakan default UOM berbeda.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Jumlah yang dialokasikan tidak dijinkan negatif
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Harap atur Perusahaan
 DocType: Purchase Order Item,Billed Amt,Nilai Tagihan
@@ -701,6 +714,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Pilih Account Pembayaran untuk membuat Bank Masuk
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Buat catatan Karyawan untuk mengelola daun, klaim biaya dan gaji"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Periode Resep
+DocType: Restaurant Reservation,Restaurant Reservation,Reservasi Restoran
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Penulisan Proposal
 DocType: Payment Entry Deduction,Payment Entry Deduction,Pembayaran Masuk Pengurangan
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Sales Person lain {0} ada dengan id Karyawan yang sama
@@ -708,7 +722,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Masters
 DocType: Assessment Plan,Maximum Assessment Score,Skor Penilaian Maksimum
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Tanggal Transaksi pembaruan Bank
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Pelacakan waktu
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Pelacakan waktu
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,DUPLICATE FOR TRANSPORTER
 DocType: Fiscal Year Company,Fiscal Year Company,Tahun Fiskal Perusahaan
 DocType: Packing Slip Item,DN Detail,DN Detil
@@ -716,8 +730,9 @@
 DocType: Timesheet,Billed,Ditagih
 DocType: Batch,Batch Description,Keterangan Batch
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Menciptakan kelompok siswa
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Gateway Akun pembayaran tidak dibuat, silakan membuat satu secara manual."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Gateway Akun pembayaran tidak dibuat, silakan membuat satu secara manual."
 DocType: Supplier Scorecard,Per Year,Per tahun
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Tidak memenuhi syarat untuk masuk dalam program ini sesuai DOB
 DocType: Sales Invoice,Sales Taxes and Charges,Pajak Penjualan dan Biaya
 DocType: Employee,Organization Profile,Profil Organisasi
 DocType: Vital Signs,Height (In Meter),Tinggi (In Meter)
@@ -750,10 +765,10 @@
 DocType: Production Order Operation,In minutes,Dalam menit
 DocType: Issue,Resolution Date,Tanggal Resolusi
 DocType: Lab Test Template,Compound,Senyawa
-DocType: Student Batch Name,Batch Name,Batch Nama
+DocType: Student Batch Name,Batch Name,Nama Batch
 DocType: Fee Validity,Max number of visit,Jumlah kunjungan maksimal
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Absen dibuat:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Silakan set Cash standar atau rekening Bank Mode Pembayaran {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Silakan set Cash standar atau rekening Bank Mode Pembayaran {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,Mendaftar
 DocType: GST Settings,GST Settings,Pengaturan GST
 DocType: Selling Settings,Customer Naming By,Penamaan Pelanggan Dengan
@@ -762,7 +777,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Konversikan ke Grup
 DocType: Activity Cost,Activity Type,Jenis Kegiatan
 DocType: Request for Quotation,For individual supplier,Untuk pemasok individual
-DocType: BOM Operation,Base Hour Rate(Company Currency),Basis Jam Rate (Perusahaan Mata Uang)
+DocType: BOM Operation,Base Hour Rate(Company Currency),Dasar Harga Perjam (Mata Uang Perusahaan)
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Jumlah Telah Terikirim
 DocType: Supplier,Fixed Days,Hari Tetap
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests,Tes Laboratorium
@@ -785,29 +800,29 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Biaya Pajak dan Landing Cost
 DocType: Production Order Operation,Actual Start Time,Waktu Mulai Aktual
 DocType: BOM Operation,Operation Time,Waktu Operasi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Selesai
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Mendasarkan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Selesai
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Dasar
 DocType: Timesheet,Total Billed Hours,Total Jam Ditagih
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Jumlah Nilai Write Off
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Jumlah Nilai Write Off
 DocType: Leave Block List Allow,Allow User,Izinkan Pengguna
 DocType: Journal Entry,Bill No,Nomor Tagihan
 DocType: Company,Gain/Loss Account on Asset Disposal,Gain / Loss Account pada Asset Disposal
 DocType: Vehicle Log,Service Details,Rincian layanan
-DocType: Purchase Invoice,Quarterly,Triwulan
+DocType: Subscription,Quarterly,Triwulan
 DocType: Lab Test Template,Grouped,Dikelompokkan
 DocType: Selling Settings,Delivery Note Required,Nota Pengiriman Diperlukan
 DocType: Bank Guarantee,Bank Guarantee Number,Nomor Bank Garansi
 DocType: Assessment Criteria,Assessment Criteria,Kriteria penilaian
-DocType: BOM Item,Basic Rate (Company Currency),Harga Dasar (Dalam Mata Uang Lokal)
+DocType: BOM Item,Basic Rate (Company Currency),Harga Dasar (Mata Uang Perusahaan)
 DocType: Student Attendance,Student Attendance,Kehadiran mahasiswa
 DocType: Sales Invoice Timesheet,Time Sheet,Lembar waktu
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Bahan Baku Berbasis Pada
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Harap Masukan Item Detail
 DocType: Interest,Interest,Bunga
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pra penjualan
 DocType: Purchase Receipt,Other Details,Detail lainnya
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Lab Test,Test Template,Uji Template
+DocType: Restaurant Order Entry Item,Served,Melayani
 DocType: Account,Accounts,Akun / Rekening
 DocType: Vehicle,Odometer Value (Last),Odometer Nilai (terakhir)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Template dari kriteria scorecard pemasok.
@@ -819,25 +834,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Slip Gaji Preview
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Akun {0} telah dimasukkan beberapa kali
 DocType: Account,Expenses Included In Valuation,Biaya Termasuk di Dalam Penilaian Barang
-DocType: Hub Settings,Seller City,Kota Penjual
 ,Absent Student Report,Laporan Absen Siswa
 DocType: Email Digest,Next email will be sent on:,Email berikutnya akan dikirim pada:
 DocType: Offer Letter Term,Offer Letter Term,Term Surat Penawaran
 DocType: Supplier Scorecard,Per Week,Per minggu
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Item memiliki varian.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Item memiliki varian.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Jumlah Siswa
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Item {0} tidak ditemukan
 DocType: Bin,Stock Value,Nilai Persediaan
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,"Catatan biaya akan dibuat di latar belakang. Jika ada kesalahan, pesan kesalahan akan diperbarui dalam Schedule."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Perusahaan {0} tidak ada
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} memiliki validitas biaya sampai {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} memiliki validitas biaya sampai {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Jenis Tingkat Tree
-DocType: BOM Explosion Item,Qty Consumed Per Unit,Qty Dikonsumsi Per Unit
+DocType: BOM Explosion Item,Qty Consumed Per Unit,Kuantitas Dikonsumsi Per Unit
 DocType: Serial No,Warranty Expiry Date,Tanggal Berakhir Garansi
 DocType: Material Request Item,Quantity and Warehouse,Kuantitas dan Gudang
+DocType: Hub Settings,Unregister,Unregister
 DocType: Sales Invoice,Commission Rate (%),Komisi Rate (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Silahkan pilih Program
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Silahkan pilih Program
 DocType: Project,Estimated Cost,Estimasi biaya
 DocType: Purchase Order,Link to material requests,Link ke permintaan bahan
+DocType: Hub Settings,Publish,Menerbitkan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Dirgantara
 DocType: Journal Entry,Credit Card Entry,Entri Kartu Kredit
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Perusahaan dan Account
@@ -848,13 +865,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Tutup Peluang Setelah Days
 ,Reserved,Ditahan
 DocType: Purchase Order,Supply Raw Materials,Pasokan Bahan Baku
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Tanggal dimana faktur berikutnya akan dihasilkan. Hal ini dihasilkan di submit.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Aset Lancar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} bukan Barang persediaan
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',Silakan bagikan umpan balik Anda ke pelatihan dengan mengklik &#39;Feedback Training&#39; dan kemudian &#39;New&#39;
 DocType: Mode of Payment Account,Default Account,Akun Standar
 DocType: Payment Entry,Received Amount (Company Currency),Menerima Jumlah (Perusahaan Mata Uang)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,Prospek harus diatur apabila Peluang berasal dari Prospek
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,Prospek harus diatur apabila Peluang berasal dari Prospek
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Silakan pilih dari hari mingguan
 DocType: Patient,O Negative,O negatif
 DocType: Production Order Operation,Planned End Time,Rencana Waktu Berakhir
@@ -870,10 +886,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energi
 DocType: Opportunity,Opportunity From,Peluang Dari
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Laporan gaji bulanan.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Tambahkan Perusahaan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Baris {0}: {1} Nomor seri diperlukan untuk Item {2}. Anda telah memberikan {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Baris {0}: {1} Nomor seri diperlukan untuk Item {2}. Anda telah memberikan {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Silahkan pilih sebuah tabel
 DocType: BOM,Website Specifications,Website Spesifikasi
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} adalah alamat email yang tidak valid di &#39;Penerima&#39;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} adalah alamat email yang tidak valid di &#39;Penerima&#39;
 DocType: Special Test Items,Particulars,Particulars
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiotika.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Dari {0} tipe {1}
@@ -881,11 +897,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Row {0}: Faktor Konversi adalah wajib
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Beberapa Aturan Harga ada dengan kriteria yang sama, silahkan menyelesaikan konflik dengan menetapkan prioritas. Harga Aturan: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,Tidak bisa menonaktifkan atau membatalkan BOM seperti yang terkait dengan BOMs lainnya
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,Tidak bisa menonaktifkan atau membatalkan BOM seperti yang terkait dengan BOMs lainnya
 DocType: Opportunity,Maintenance,Pemeliharaan
 DocType: Item Attribute Value,Item Attribute Value,Nilai Item Atribut
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Kampanye penjualan.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,membuat Timesheet
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,membuat Timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -923,12 +939,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Entrikan Stok Barang terlebih dahulu
 DocType: Account,Liability,Kewajiban
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanksi Jumlah tidak dapat lebih besar dari Klaim Jumlah dalam Row {0}.
+DocType: Salary Detail,Do not include in total,Jangan termasuk secara total
 DocType: Company,Default Cost of Goods Sold Account,Standar Harga Pokok Penjualan
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Daftar Harga tidak dipilih
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Daftar Harga tidak dipilih
 DocType: Employee,Family Background,Latar Belakang Keluarga
 DocType: Request for Quotation Supplier,Send Email,Kirim Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Peringatan: Lampiran tidak valid {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Tidak ada Izin
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Peringatan: Lampiran tidak valid {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Tidak ada Izin
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Permintaan Kutipan
 DocType: Vital Signs,Heart Rate / Pulse,Heart Rate / Pulse
 DocType: Company,Default Bank Account,Standar Rekening Bank
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Untuk menyaring berdasarkan Party, pilih Partai Ketik terlebih dahulu"
@@ -940,7 +958,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +549,Row #{0}: Asset {1} must be submitted,Row # {0}: Aset {1} harus diserahkan
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Tidak ada karyawan yang ditemukan
 DocType: Subscription,Stopped,Terhenti
-DocType: Item,If subcontracted to a vendor,Jika subkontrak ke vendor
+DocType: Item,If subcontracted to a vendor,Jika subkontrak ke pemasok
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +111,Student Group is already updated.,Student Group sudah diupdate
 DocType: SMS Center,All Customer Contact,Semua Kontak Pelanggan
 apps/erpnext/erpnext/config/stock.py +158,Upload stock balance via csv.,Unggah saldo persediaan melalui csv.
@@ -955,12 +973,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Item Row {idx}: {doctype} {DOCNAME} tidak ada di atas &#39;{doctype}&#39; table
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Absen {0} sudah selesai atau dibatalkan
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Tidak ada tugas
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Hari bulan yang otomatis faktur akan dihasilkan misalnya 05, 28 dll"
 DocType: Item Variant Settings,Copy Fields to Variant,Copy Fields ke Variant
 DocType: Asset,Opening Accumulated Depreciation,Membuka Penyusutan Akumulasi
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Skor harus kurang dari atau sama dengan 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Pendaftaran Alat
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C-Form catatan
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C-Form catatan
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Pelanggan dan Pemasok
 DocType: Email Digest,Email Digest Settings,Pengaturan Surel Ringkasan
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Terima kasih untuk bisnis Anda!
@@ -975,16 +992,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +24,Setup Institution,Lembaga Penyiapan
 DocType: Program Enrollment,Vehicle/Bus Number,Kendaraan / Nomor Bus
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Jadwal Kuliah
-DocType: Request for Quotation Supplier,Quote Status,Status Kutipan
+DocType: Request for Quotation Supplier,Quote Status,Status Penawaran
 DocType: Maintenance Visit,Completion Status,Status Penyelesaian
 DocType: HR Settings,Enter retirement age in years,Memasuki usia pensiun di tahun
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Gudang
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Silahkan pilih gudang
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Target Gudang
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Silahkan pilih gudang
 DocType: Cheque Print Template,Starting location from left edge,Mulai lokasi dari tepi kiri
 DocType: Item,Allow over delivery or receipt upto this percent,Biarkan selama pengiriman atau penerimaan upto persen ini
 DocType: Stock Entry,STE-,Ste-
 DocType: Upload Attendance,Import Attendance,Impor Absensi
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Semua Grup Stok Barang/Item
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Semua Grup Stok Barang/Item
 DocType: Process Payroll,Activity Log,Log Aktivitas
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Laba / Rugi
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Secara otomatis menulis pesan pada pengajuan transaksi.
@@ -996,7 +1013,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Proyeksi Qty
 DocType: Sales Invoice,Payment Due Date,Tanggal Jatuh Tempo Pembayaran
 DocType: Drug Prescription,Interval UOM,Interval UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Item Varian {0} sudah ada dengan atribut yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Item Varian {0} sudah ada dengan atribut yang sama
+DocType: Item,Hub Publishing Details,Rincian Hub Publishing
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening','Awal'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Terbuka yang Harus Dilakukan
 DocType: Notification Control,Delivery Note Message,Pesan Nota Pengiriman
@@ -1004,8 +1022,8 @@
 DocType: Expense Claim,Expenses,Biaya / Beban
 DocType: Item Variant Attribute,Item Variant Attribute,Item Varian Atribut
 ,Purchase Receipt Trends,Tren Nota Penerimaan
-DocType: Process Payroll,Bimonthly,dua bulan sekali
-DocType: Vehicle Service,Brake Pad,Pedal Rem
+DocType: Process Payroll,Bimonthly,Dua bulan sekali
+DocType: Vehicle Service,Brake Pad,Bantalan Rem
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Research & Development,Penelitian & Pengembangan
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Nilai Tertagih
 DocType: Company,Registration Details,Detail Pendaftaran
@@ -1013,13 +1031,14 @@
 DocType: Item Reorder,Re-Order Qty,Re-order Qty
 DocType: Leave Block List Date,Leave Block List Date,Tanggal Block List Cuti
 DocType: Pricing Rule,Price or Discount,Harga atau Diskon
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: Bahan baku tidak boleh sama dengan Item utama
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: Bahan baku tidak boleh sama dengan Item produk
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total Biaya Berlaku di Purchase meja Jenis Penerimaan harus sama dengan jumlah Pajak dan Biaya
 DocType: Sales Team,Incentives,Insentif
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Mendaftar untuk Hub
 DocType: SMS Log,Requested Numbers,Nomor yang Diminta
 DocType: Production Planning Tool,Only Obtain Raw Materials,Hanya Mendapatkan Bahan Baku
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Penilaian kinerja.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Mengaktifkan &#39;Gunakan untuk Keranjang Belanja&#39;, sebagai Keranjang Belanja diaktifkan dan harus ada setidaknya satu Rule Pajak untuk Belanja"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Mengaktifkan &#39;Gunakan untuk Keranjang Belanja&#39;, sebagai Keranjang Belanja diaktifkan dan harus ada setidaknya satu Rule Pajak untuk Belanja"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Masuk pembayaran {0} terkait terhadap Orde {1}, memeriksa apakah itu harus ditarik sebagai uang muka dalam faktur ini."
 DocType: Sales Invoice Item,Stock Details,Rincian Persediaan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Nilai Proyek
@@ -1038,12 +1057,14 @@
 DocType: Salary Slip,Working Days,Hari Kerja
 DocType: Serial No,Incoming Rate,Harga Penerimaan
 DocType: Packing Slip,Gross Weight,Berat Kotor
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,Nama perusahaan Anda yang Anda sedang mengatur sistem ini.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Aktifkan Hub
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,Nama perusahaan Anda yang Anda sedang mengatur sistem ini.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Sertakan Hari Libur di total no. dari Hari Kerja
 DocType: Job Applicant,Hold,Ditahan
 DocType: Employee,Date of Joining,Tanggal Bergabung
 DocType: Naming Series,Update Series,Pembaruan Series
 DocType: Supplier Quotation,Is Subcontracted,Apakah Subkontrak?
+DocType: Restaurant Table,Minimum Seating,Tempat Duduk Minimal
 DocType: Item Attribute,Item Attribute Values,Item Nilai Atribut
 DocType: Examination Result,Examination Result,Hasil pemeriksaan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Nota Penerimaan
@@ -1054,13 +1075,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Tidak dapat menemukan waktu Slot di {0} hari berikutnya untuk Operasi {1}
 DocType: Production Order,Plan material for sub-assemblies,Planning Material untuk Barang Rakitan
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Mitra Penjualan dan Wilayah
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} harus aktif
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} harus aktif
 DocType: Journal Entry,Depreciation Entry,penyusutan Masuk
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Silakan pilih jenis dokumen terlebih dahulu
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Batal Kunjungan Material {0} sebelum membatalkan ini Maintenance Visit
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial ada {0} bukan milik Stok Barang {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Qty Diperlukan
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Gudang dengan transaksi yang ada tidak dapat dikonversi ke buku besar.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Gudang dengan transaksi yang ada tidak dapat dikonversi ke buku besar.
 DocType: Bank Reconciliation,Total Amount,Nilai Total
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Penerbitan Internet
 DocType: Prescription Duration,Number,Jumlah
@@ -1071,7 +1092,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Daftar Harga Jual
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Jika dicek, pelanggan akan dibuat, dipetakan ke Patient. Faktur pasien akan dibuat terhadap Nasabah ini. Anda juga bisa memilih Customer yang ada saat membuat Patient."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publikasikan untuk sinkronisasi item
 DocType: Bank Reconciliation,Account Currency,Mata Uang Akun
 DocType: Lab Test,Sample ID,Contoh ID
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Sebutkan Round Off Akun/ Akun Pembulatan di Perusahaan
@@ -1080,11 +1100,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Karyawan {0} tidak aktif atau tidak ada
 DocType: Fee Structure,Components,komponen
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Cukup masukkan Aset Kategori dalam angka {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Item Varian {0} diperbarui
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Item Varian {0} diperbarui
 DocType: Quality Inspection Reading,Reading 6,Membaca 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Tidak bisa {0} {1} {2} tanpa faktur yang beredar negatif
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","untuk dihasilkan. Jika tertunda, Anda harus mengubah secara manual bidang &quot;Ulangi pada Hari Bulan&quot; ini"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Tidak bisa {0} {1} {2} tanpa faktur yang beredar negatif
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Uang Muka Faktur Pembelian
-DocType: Hub Settings,Sync Now,Sync Now
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Baris {0}: entry Kredit tidak dapat dihubungkan dengan {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Tentukan anggaran untuk tahun keuangan.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Standar rekening Bank / Cash akan secara otomatis diperbarui di POS Invoice saat mode ini dipilih.
@@ -1096,13 +1117,13 @@
 DocType: Item,Is Purchase Item,Stok Dibeli dari Supplier
 DocType: Asset,Purchase Invoice,Faktur Pembelian
 DocType: Stock Ledger Entry,Voucher Detail No,Nomor Detail Voucher
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Baru Faktur Penjualan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Baru Faktur Penjualan
 DocType: Stock Entry,Total Outgoing Value,Nilai Total Keluaran
 DocType: Physician,Appointments,Janji
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Tanggal dan Closing Date membuka harus berada dalam Tahun Anggaran yang sama
 DocType: Lead,Request for Information,Request for Information
 ,LeaderBoard,LeaderBoard
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Sinkronisasi Offline Faktur
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Sinkronisasi Offline Faktur
 DocType: Payment Request,Paid,Dibayar
 DocType: Program Fee,Program Fee,Biaya Program
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1121,11 +1142,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Stok Barang Order Pembelian
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Pendapatan Tidak Langsung
 DocType: Student Attendance Tool,Student Attendance Tool,Alat Kehadiran Siswa
+DocType: Restaurant Menu,Price List (Auto created),Daftar Harga (Auto dibuat)
 DocType: Cheque Print Template,Date Settings,Pengaturan Tanggal
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variance
 ,Company Name,Nama Perusahaan
 DocType: SMS Center,Total Message(s),Total Pesan (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Pilih item untuk transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Pilih item untuk transfer
 DocType: Purchase Invoice,Additional Discount Percentage,Persentase Diskon Tambahan
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Lihat daftar semua bantuan video
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Pilih kepala rekening bank mana cek diendapkan.
@@ -1142,9 +1164,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Meter
 DocType: Workstation,Electricity Cost,Biaya Listrik
 DocType: HR Settings,Don't send Employee Birthday Reminders,Jangan Kirim Pengingat Ulang Tahun
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Simpan Pengaturan
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Produk yang diminta
 DocType: Item,Inspection Criteria,Kriteria Inspeksi
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Ditransfer
-DocType: BOM Website Item,BOM Website Item,BOM Situs Barang
+DocType: BOM Website Item,BOM Website Item,BOM Situs Persediaan
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,Upload your letter head and logo. (you can edit them later).,Unggah kop surat dan logo. (Anda dapat mengubahnya nanti).
 DocType: Timesheet Detail,Bill,Tagihan
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Berikutnya Penyusutan Tanggal dimasukkan sebagai tanggal terakhir
@@ -1158,11 +1182,11 @@
 DocType: Journal Entry,Total Amount in Words,Jumlah Total dalam Kata
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Ada kesalahan. Salah satu alasan yang mungkin bisa jadi Anda belum menyimpan formulir. Silahkan hubungi support@erpnext.com jika masalah terus berlanjut.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Cart saya
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Order Type harus menjadi salah satu {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Order Type harus menjadi salah satu {0}
 DocType: Lead,Next Contact Date,Tanggal Komunikasi Selanjutnya
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Qty Pembukaan
 DocType: Healthcare Settings,Appointment Reminder,Pengingat Penunjukan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Silahkan masukkan account untuk Perubahan Jumlah
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Silahkan masukkan account untuk Perubahan Jumlah
 DocType: Student Batch Name,Student Batch Name,Mahasiswa Nama Batch
 DocType: Consultation,Doctor,Dokter
 DocType: Holiday List,Holiday List Name,Daftar Nama Hari Libur
@@ -1170,12 +1194,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Jadwal Kursus
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Opsi Persediaan
 DocType: Journal Entry Account,Expense Claim,Biaya Klaim
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Apakah Anda benar-benar ingin mengembalikan aset dibuang ini?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Jumlah untuk {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Apakah Anda benar-benar ingin mengembalikan aset dibuang ini?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Kuantitas untuk {0}
 DocType: Leave Application,Leave Application,Aplikasi Cuti
 DocType: Patient,Patient Relation,Hubungan Pasien
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Alat Alokasi Cuti
+DocType: Item,Hub Category to Publish,Kategori Hub untuk Publikasikan
 DocType: Leave Block List,Leave Block List Dates,Tanggal Blok List Cuti
+DocType: Sales Invoice,Billing Address GSTIN,Alamat Penagihan GSTIN
 DocType: Workstation,Net Hour Rate,Jumlah Jam Bersih
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Biaya Landing Cost Nota Penerimaan
 DocType: Company,Default Terms,Persyaratan Standar
@@ -1185,18 +1211,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Tentukan {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Item dihapus dengan tidak ada perubahan dalam jumlah atau nilai.
 DocType: Delivery Note,Delivery To,Pengiriman Untuk
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Tabel atribut wajib
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Tabel atribut wajib
 DocType: Production Planning Tool,Get Sales Orders,Dapatkan Order Penjualan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} tidak dapat negatif
 DocType: Training Event,Self-Study,Belajar sendiri
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Diskon
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Diskon
 DocType: Asset,Total Number of Depreciations,Total Jumlah Penyusutan
 DocType: Sales Invoice Item,Rate With Margin,Tingkat Dengan Margin
 DocType: Workstation,Wages,Upah
 DocType: Task,Urgent,Mendesak
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Tentukan Row ID berlaku untuk baris {0} dalam tabel {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Tidak dapat menemukan variabel:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Harap pilih bidang yang akan diedit dari numpad
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Harap pilih bidang yang akan diedit dari numpad
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Pergi ke Desktop dan mulai menggunakan ERPNext
 DocType: Item,Manufacturer,Pabrikasi
 DocType: Landed Cost Item,Purchase Receipt Item,Nota Penerimaan Stok Barang
@@ -1211,7 +1237,7 @@
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation_dashboard.py +11,Records,Catatan
 DocType: Asset,Scrapped,membatalkan
 apps/erpnext/erpnext/config/stock.py +200,"Attributes for Item Variants. e.g Size, Color etc.","Atribut untuk Item Varian. misalnya Ukuran, Warna dll"
-DocType: Purchase Invoice,Returns,Pengembalian
+DocType: Purchase Invoice,Returns,Retur
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Gudang
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serial ada {0} berada di bawah kontrak pemeliharaan upto {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Pengerahan
@@ -1227,8 +1253,8 @@
 DocType: GL Entry,Against,Terhadap
 DocType: Item,Default Selling Cost Center,Standar Pusat Biaya Jual
 DocType: Sales Partner,Implementation Partner,Mitra Implementasi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Kode Pos
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Sales Order {0} adalah {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Kode Pos
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Sales Order {0} adalah {1}
 DocType: Opportunity,Contact Info,Informasi Kontak
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Membuat Entri Persediaan
 DocType: Packing Slip,Net Weight UOM,Uom Berat Bersih
@@ -1239,6 +1265,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Dapatkan Tanggal Libur Mingguan
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Tanggal Berakhir tidak boleh lebih awal dari Tanggal Mulai
 DocType: Sales Person,Select company name first.,Pilih nama perusahaan terlebih dahulu.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Rendah ke tinggi
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Penawaran Diterima dari Supplier
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Ganti BOM dan update harga terbaru di semua BOM
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Untuk {0} | {1} {2}
@@ -1257,7 +1284,7 @@
 DocType: Program Enrollment,Transportation,Transportasi
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Atribut yang tidak valid
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} harus di-posting
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Kuantitas harus kurang dari atau sama dengan {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Kuantitas harus kurang dari atau sama dengan {0}
 DocType: SMS Center,Total Characters,Jumlah Karakter
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Silakan pilih BOM BOM di lapangan untuk Item {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Faktur Detil
@@ -1272,7 +1299,7 @@
 ,Ordered Items To Be Billed,Item Pesanan Tertagih
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Dari Rentang harus kurang dari Untuk Rentang
 DocType: Global Defaults,Global Defaults,Standar Global
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Proyek Kolaborasi Undangan
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Proyek Kolaborasi Undangan
 DocType: Salary Slip,Deductions,Pengurangan
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Nama Aksi
@@ -1290,14 +1317,14 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Uang Muka Faktur Penjualan
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Tidak ada Permintaan
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},record Anggaran lain &#39;{0}&#39; sudah ada terhadap {1} &#39;{2}&#39; untuk tahun fiskal {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','Tanggal Mulai Sebenarnya' tidak dapat lebih besar dari 'Tanggal Selesai Sebenarnya'
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','Tanggal Mulai Sebenarnya' tidak dapat lebih besar dari 'Tanggal Selesai Sebenarnya'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Manajemen
 DocType: Cheque Print Template,Payer Settings,Pengaturan Wajib
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ini akan ditambahkan ke Item Code dari varian. Sebagai contoh, jika Anda adalah singkatan ""SM"", dan kode Stok Barang adalah ""T-SHIRT"", kode item varian akan ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pay Bersih (dalam kata-kata) akan terlihat setelah Anda menyimpan Slip Gaji.
 DocType: Purchase Invoice,Is Return,Retur Barang
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Peringatan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Kembali / Debit Note
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Peringatan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Nota Retur / Debit
 DocType: Price List Country,Price List Country,Negara Daftar Harga
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +205,{0} valid serial nos for Item {1},{0} nomor seri berlaku untuk Item {1}
@@ -1311,17 +1338,18 @@
 DocType: Account,Balance Sheet,Neraca
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Biaya Center For Stok Barang dengan Item Code '
 DocType: Fee Validity,Valid Till,Berlaku sampai
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modus pembayaran tidak dikonfigurasi. Silakan periksa, apakah akun telah ditetapkan pada Cara Pembayaran atau POS Profil."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modus pembayaran tidak dikonfigurasi. Silakan periksa, apakah akun telah ditetapkan pada Cara Pembayaran atau POS Profil."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,item yang sama tidak dapat dimasukkan beberapa kali.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Account lebih lanjut dapat dibuat di bawah Grup, tapi entri dapat dilakukan terhadap non-Grup"
 DocType: Lead,Lead,Prospek
 DocType: Email Digest,Payables,Hutang
 DocType: Course,Course Intro,tentu saja Intro
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Entri Persediaan {0} dibuat
-apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Ditolak Qty tidak dapat dimasukkan dalam Pembelian Kembali
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Silakan setup seri penomoran untuk Kehadiran melalui Setup&gt; Numbering Series
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Entri Persediaan {0} dibuat
+apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Baris # {0}: Jumlah yang ditolak tidak dapat dimasukkan dalam Retur Pembelian
 ,Purchase Order Items To Be Billed,Purchase Order Items Akan Ditagih
 DocType: Purchase Invoice Item,Net Rate,Nilai Bersih / Net
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Silahkan pilih pelanggan
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Silahkan pilih pelanggan
 DocType: Purchase Invoice Item,Purchase Invoice Item,Stok Barang Faktur Pembelian
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Entri Buku Persediaan dan Entri GL diposting ulang untuk Nota Pembelian yang dipilih
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Item 1
@@ -1340,7 +1368,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Baris duplikat {0} dengan sama {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Tahun fiskal {0} tidak ditemukan
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Persiapan Karyawan
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Persiapan Karyawan
 DocType: Sales Order,SO-,BEGITU-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Silakan pilih awalan terlebih dahulu
 DocType: Employee,O-,HAI-
@@ -1352,12 +1380,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Lihat Buku Besar
 DocType: Grading Scale,Intervals,interval
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Paling Awal
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Item Grup ada dengan nama yang sama, ubah nama item atau mengubah nama kelompok Stok Barang"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Item Grup ada dengan nama yang sama, ubah nama item atau mengubah nama kelompok Stok Barang"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Mahasiswa Nomor Ponsel
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Rest of The World
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Rest of The World
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} tidak dapat memiliki Batch
 ,Budget Variance Report,Laporan Perbedaan Anggaran
 DocType: Salary Slip,Gross Pay,Nilai Gross Bayar
+DocType: Item,Is Item from Hub,Adalah Item dari Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Row {0}: Jenis Kegiatan adalah wajib.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividen Dibagi
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Buku Besar Akuntansi
@@ -1367,10 +1396,11 @@
 DocType: Vehicle Log,Service Detail,layanan Detil
 DocType: BOM,Item Description,Deskripsi Barang
 DocType: Student Sibling,Student Sibling,Mahasiswa Sibling
-DocType: Purchase Invoice,Is Recurring,Dokumen Berulang/Langganan
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Mode Pembayaran
 DocType: Purchase Invoice,Supplied Items,Produk Disupply
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Harap atur menu aktif untuk Restoran {0}
 DocType: Student,STUD.,STUD.
-DocType: Production Order,Qty To Manufacture,Qty Untuk Produksi
+DocType: Production Order,Qty To Manufacture,Kuantitas untuk diproduksi
 DocType: Email Digest,New Income,Penghasilan baru
 DocType: School Settings,School Settings,Pengaturan Sekolah
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Pertahankan tarif yang sama sepanjang siklus pembelian
@@ -1378,6 +1408,7 @@
 ,Student and Guardian Contact Details,Mahasiswa dan Wali Detail Kontak
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Baris {0}: Untuk pemasok {0} Alamat Email diperlukan untuk mengirim email
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Akun Pembukaan Sementara
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Lihat Hub
 ,Employee Leave Balance,Nilai Cuti Karyawan
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Saldo Rekening {0} harus selalu {1}
 DocType: Patient Appointment,More Info,Info Selengkapnya
@@ -1395,15 +1426,15 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Tidak berwenang untuk mengedit Akun frozen {0}
 DocType: Journal Entry,Get Outstanding Invoices,Dapatkan Faktur Berjalan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Order Penjualan {0} tidak valid
-DocType: Supplier Scorecard,Warn for new Request for Quotations,Peringatkan Permintaan Kuotasi baru
+DocType: Supplier Scorecard,Warn for new Request for Quotations,Peringatkan untuk Permintaan Kuotasi baru
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,pesanan pembelian membantu Anda merencanakan dan menindaklanjuti pembelian Anda
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Maaf, perusahaan tidak dapat digabungkan"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Maaf, perusahaan tidak dapat digabungkan"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Resep Uji Lab
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Total Issue / transfer kuantitas {0} Material Permintaan {1} \ tidak dapat lebih besar dari yang diminta kuantitas {2} untuk Item {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Kecil
 DocType: Employee,Employee Number,Jumlah Karyawan
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Kasus ada (s) sudah digunakan. Coba dari Case ada {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Kasus ada (s) sudah digunakan. Coba dari Case ada {0}
 DocType: Project,% Completed,Selesai %
 ,Invoiced Amount (Exculsive Tax),Faktur Jumlah (Pajak exculsive)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Item 2
@@ -1418,11 +1449,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Biaya tidak langsung
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Row {0}: Qty adalah wajib
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Pertanian
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Produk atau Jasa Anda
 DocType: Special Test Items,Special Test Items,Item Uji Khusus
 DocType: Mode of Payment,Mode of Payment,Mode Pembayaran
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Website Image harus file umum atau URL situs
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Website Image harus file umum atau URL situs
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Ini adalah kelompok Stok Barang akar dan tidak dapat diedit.
@@ -1430,24 +1461,23 @@
 DocType: Vehicle,Fuel UOM,BBM UOM
 DocType: Warehouse,Warehouse Contact Info,Info Kontak Gudang
 DocType: Payment Entry,Write Off Difference Amount,Menulis Off Perbedaan Jumlah
-DocType: Purchase Invoice,Recurring Type,Type Pengulangan/Recurring
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: email Karyawan tidak ditemukan, maka email tidak dikirim"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: email Karyawan tidak ditemukan, maka email tidak dikirim"
 DocType: Item,Foreign Trade Details,Rincian Perdagangan Luar Negeri
+,Assessment Plan Status,Status Rencana Penilaian
 DocType: Email Digest,Annual Income,Pendapatan tahunan
 DocType: Serial No,Serial No Details,Nomor Detail Serial
 DocType: Purchase Invoice Item,Item Tax Rate,Tarif Pajak Stok Barang
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,Silakan pilih Dokter dan Tanggal
 DocType: Student Group Student,Group Roll Number,Nomor roll grup
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Untuk {0}, hanya rekening kredit dapat dihubungkan dengan entri debit lain"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total semua bobot tugas harus 1. Sesuaikan bobot dari semua tugas Proyek sesuai
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Nota pengiriman {0} tidak Terkirim
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total semua bobot tugas harus 1. Sesuaikan bobot dari semua tugas Proyek sesuai
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Nota pengiriman {0} tidak Terkirim
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Item {0} harus Item Sub-kontrak
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Perlengkapan Modal
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Rule harga terlebih dahulu dipilih berdasarkan 'Terapkan On' lapangan, yang dapat Stok Barang, Stok Barang Grup atau Merek."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Harap set Kode Item terlebih dahulu
-DocType: Hub Settings,Seller Website,Situs Penjual
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Harap set Kode Item terlebih dahulu
 DocType: Item,ITEM-,BARANG-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Persentase total yang dialokasikan untuk tim penjualan harus 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Persentase total yang dialokasikan untuk tim penjualan harus 100
 DocType: Sales Invoice Item,Edit Description,Edit Keterangan
 DocType: Antibiotic,Antibiotic,Antibiotika
 ,Team Updates,tim Pembaruan
@@ -1468,12 +1498,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Total (Perusahaan Mata Uang)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Serial number {0} masuk lebih dari sekali
 DocType: Depreciation Schedule,Journal Entry,Jurnal Entri
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} item berlangsung
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} item berlangsung
 DocType: Workstation,Workstation Name,Nama Workstation
 DocType: Grading Scale Interval,Grade Code,Kode kelas
 DocType: POS Item Group,POS Item Group,POS Barang Grup
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Surel Ringkasan:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} bukan milik Stok Barang {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} bukan milik Produk {1}
 DocType: Sales Partner,Target Distribution,Target Distribusi
 DocType: Salary Slip,Bank Account No.,No Rekening Bank
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Ini adalah jumlah transaksi yang diciptakan terakhir dengan awalan ini
@@ -1484,15 +1514,14 @@
 DocType: Quality Inspection Reading,Reading 8,Membaca 8
 DocType: Sales Partner,Agent,Agen
 DocType: Purchase Invoice,Taxes and Charges Calculation,Pajak dan Biaya Dihitung
-DocType: Accounts Settings,Book Asset Depreciation Entry Automatically,Book Depresiasi Aset Entri secara otomatis
+DocType: Accounts Settings,Book Asset Depreciation Entry Automatically,Rekam Depresiasi Asset Entri Otomatis
 DocType: BOM Operation,Workstation,Workstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Permintaan Quotation Pemasok
 DocType: Healthcare Settings,Registration Message,Pesan Pendaftaran
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Perangkat keras
-DocType: Sales Order,Recurring Upto,berulang Upto
 DocType: Prescription Dosage,Prescription Dosage,Dosis Resep
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Silakan pilih sebuah Perusahaan
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Silakan pilih sebuah Perusahaan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Privilege Cuti
 DocType: Purchase Invoice,Supplier Invoice Date,Tanggal Faktur Supplier
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,per
@@ -1506,12 +1535,13 @@
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Harap perbarui status Anda untuk acara pelatihan ini
 DocType: Purchase Taxes and Charges,Add or Deduct,Penambahan atau Pengurangan
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Kondisi Tumpang Tindih ditemukan antara:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Terhadap Entri Jurnal {0} sudah disesuaikan terhadap beberapa voucher lainnya
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Atas Catatan Jurnal {0} sudah dilakukan penyesuaian terhadap beberapa dokumen lain.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Nilai Total Order
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Makanan
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Makanan
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Rentang Ageing 3
 DocType: Maintenance Schedule Item,No of Visits,Tidak ada Kunjungan
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Jadwal Pemeliharaan {0} ada terhadap {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Ingin menerbitkan Item ke Hub?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,mahasiswa Mendaftarkan
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Mata uang dari Rekening Penutupan harus {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Jumlah poin untuk semua tujuan harus 100. Ini adalah {0}
@@ -1522,9 +1552,9 @@
 DocType: Authorization Rule,Average Discount,Rata-rata Diskon
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Utilitas
-DocType: Purchase Invoice Item,Accounting,Akuntansi
+DocType: POS Profile,Accounting,Akuntansi
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Silakan pilih batch untuk item batched
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Silakan pilih batch untuk item batched
 DocType: Asset,Depreciation Schedules,Jadwal penyusutan
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Periode aplikasi tidak bisa periode alokasi cuti di luar
 DocType: Activity Cost,Projects,Proyek
@@ -1540,7 +1570,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',Status Persetujuan harus 'Disetujui' atau 'Ditolak'
 DocType: Physician,Contacts and Address,Kontak dan Alamat
 DocType: Purchase Invoice,Contact Person,Contact Person
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"""Jadwal Tanggal Mulai' tidak dapat lebih besar dari 'Jadwal Tanggal Selesai'"
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""Jadwal Tanggal Mulai' tidak dapat lebih besar dari 'Jadwal Tanggal Selesai'"
 DocType: Course Scheduling Tool,Course End Date,Tentu saja Tanggal Akhir
 DocType: Holiday List,Holidays,Hari Libur
 DocType: Sales Order Item,Planned Quantity,Direncanakan Kuantitas
@@ -1548,10 +1578,11 @@
 DocType: Item,Maintain Stock,Jaga Persediaan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Entri Persediaan sudah dibuat untuk Perintah Produksi
 DocType: Employee,Prefered Email,Email Utama
+DocType: Student Admission,Eligibility and Details,Kelayakan dan Detail
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Perubahan bersih dalam Aset Tetap
 DocType: Leave Control Panel,Leave blank if considered for all designations,Biarkan kosong jika dipertimbangkan untuk semua sebutan
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Mengisi tipe 'sebenarnya' berturut-turut {0} tidak dapat dimasukkan dalam Butir Tingkat
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Dari Datetime
 DocType: Email Digest,For Company,Untuk Perusahaan
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log komunikasi.
@@ -1559,25 +1590,25 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Variabel Scorecard Supplier Variabel
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Jumlah Pembelian
 DocType: Sales Invoice,Shipping Address Name,Alamat Pengiriman
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Chart of Account
 DocType: Material Request,Terms and Conditions Content,Syarat dan Ketentuan Konten
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,tidak dapat lebih besar dari 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Barang {0} bukan merupakan Barang persediaan
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Barang {0} bukan merupakan Barang persediaan
 DocType: Maintenance Visit,Unscheduled,Tidak Terjadwal
 DocType: Employee,Owned,Dimiliki
 DocType: Salary Detail,Depends on Leave Without Pay,Tergantung pada Cuti Tanpa Bayar
 DocType: Pricing Rule,"Higher the number, higher the priority","Semakin tinggi angkanya, semakin tinggi prioritas"
 ,Purchase Invoice Trends,Pembelian Faktur Trends
 DocType: Employee,Better Prospects,Prospek yang Lebih Baik
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Baris # {0}: Kumpulan {1} hanya memiliki {2} qty. Silakan pilih batch lain yang memiliki {3} qty available atau membagi baris menjadi beberapa baris, untuk mengirimkan / mengeluarkan dari beberapa batch"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Baris # {0}: Kumpulan {1} hanya memiliki {2} qty. Silakan pilih batch lain yang memiliki {3} qty available atau membagi baris menjadi beberapa baris, untuk mengirimkan / mengeluarkan dari beberapa batch"
 DocType: Vehicle,License Plate,Pelat
 DocType: Appraisal,Goals,tujuan
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Pilih Profil POS
 DocType: Warranty Claim,Warranty / AMC Status,Garansi / Status AMC
 ,Accounts Browser,Browser Nama Akun
 DocType: Payment Entry Reference,Payment Entry Reference,Pembayaran Referensi Masuk
 DocType: GL Entry,GL Entry,GL Entri
 DocType: HR Settings,Employee Settings,Pengaturan Karyawan
-,Batch-Wise Balance History,Batch-Wise Balance Sejarah
+,Batch-Wise Balance History,Rekap Transaksi Persediaan per Batch
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,pengaturan cetak diperbarui dalam format cetak masing
 DocType: Package Code,Package Code,Kode paket
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Apprentice,Magang
@@ -1590,7 +1621,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Karyawan tidak bisa melaporkan kepada dirinya sendiri.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jika account beku, entri yang diizinkan untuk pengguna terbatas."
 DocType: Email Digest,Bank Balance,Saldo bank
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Entri Akuntansi untuk {0}: {1} hanya dapat dilakukan dalam mata uang: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Entri Akuntansi untuk {0}: {1} hanya dapat dilakukan dalam mata uang: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil pekerjaan, kualifikasi yang dibutuhkan dll"
 DocType: Journal Entry Account,Account Balance,Saldo Akun Rekening
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Aturan pajak untuk transaksi.
@@ -1599,8 +1630,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Jumlah Pajak dan Biaya (Perusahaan Mata Uang)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Tampilkan P &amp; saldo L tahun fiskal tertutup ini
 DocType: Lab Test Template,Collection Details,Detail Koleksi
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","pilih cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date dari tabConsultation ct, `tabLab Prescription` cp where ct.patient = &#39;{0}&#39; dan cp.parent = ct. nama dan cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Account Pengiriman
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Akun {2} tidak aktif
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Membuat Penjualan Pesanan untuk membantu Anda merencanakan pekerjaan Anda dan memberikan tepat waktu
@@ -1617,7 +1646,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Slip Packing
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Sewa Kantor
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Pengaturan gerbang Pengaturan SMS
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Impor Gagal!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Impor Gagal!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Belum ditambahkan alamat
 DocType: Workstation Working Hour,Workstation Working Hour,Jam Kerja Workstation
 DocType: Vital Signs,Blood Pressure,Tekanan darah
@@ -1642,7 +1671,7 @@
 DocType: Sales Invoice,Source,Sumber
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Tampilkan ditutup
 DocType: Leave Type,Is Leave Without Pay,Apakah Cuti Tanpa Bayar
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Aset Kategori adalah wajib untuk item aset tetap
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Aset Kategori adalah wajib untuk item aset tetap
 DocType: Fee Validity,Fee Validity,Validitas biaya
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Tidak ada catatan yang ditemukan dalam tabel Pembayaran
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ini {0} konflik dengan {1} untuk {2} {3}
@@ -1663,8 +1692,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Pencarian eksekutif
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Buat Prospek
 DocType: Maintenance Schedule,Schedules,Jadwal
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,Profil POS diharuskan menggunakan Point of Sale
 DocType: Purchase Invoice Item,Net Amount,Nilai Bersih
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} belum dikirim sehingga tindakan tidak dapat diselesaikan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} belum dikirim sehingga tindakan tidak dapat diselesaikan
 DocType: Purchase Order Item Supplied,BOM Detail No,No. Rincian BOM
 DocType: Landed Cost Voucher,Additional Charges,Pungutan-pungutan tambahan
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Jumlah Diskon Tambahan (dalam Mata Uang Perusahaan)
@@ -1673,7 +1703,7 @@
 ,Support Hour Distribution,Distribusi Jam Dukungan
 DocType: Maintenance Visit,Maintenance Visit,Kunjungan Pemeliharaan
 DocType: Student,Leaving Certificate Number,Meninggalkan Sertifikat Nomor
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Penunjukan dibatalkan, Harap tinjau dan batalkan faktur {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Penunjukan dibatalkan, Harap tinjau dan batalkan faktur {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Tersedia Batch Qty di Gudang
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Update Format Cetak
 DocType: Landed Cost Voucher,Landed Cost Help,Bantuan Biaya Landed
@@ -1694,10 +1724,10 @@
 DocType: Healthcare Settings,Manage Sample Collection,Mengelola Sampel Koleksi
 DocType: Program Enrollment Tool,Program Enrollments,Program Terdaftar
 DocType: Patient,Tobacco Past Use,Tobacco Past Use
-DocType: Sales Invoice Item,Brand Name,Merek Nama
+DocType: Sales Invoice Item,Brand Name,Nama Merek
 DocType: Purchase Receipt,Transporter Details,Detail transporter
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Pengguna {0} sudah ditugaskan ke Dokter {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,gudang standar diperlukan untuk item yang dipilih
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Pengguna {0} sudah ditugaskan ke Dokter {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,gudang standar diperlukan untuk item yang dipilih
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Kotak
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,mungkin Pemasok
 DocType: Budget,Monthly Distribution,Distribusi bulanan
@@ -1707,11 +1737,11 @@
 DocType: Sales Partner,Sales Partner Target,Sasaran Mitra Penjualan
 DocType: Loan Type,Maximum Loan Amount,Maksimum Jumlah Pinjaman
 DocType: Pricing Rule,Pricing Rule,Aturan Harga
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Nomor pengguliran duplikat untuk siswa {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Nomor pengguliran duplikat untuk siswa {0}
 DocType: Budget,Action if Annual Budget Exceeded,Tindakan jika Anggaran Tahunan Melebihi
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Permintaan Material untuk Order Pembelian
 DocType: Shopping Cart Settings,Payment Success URL,Pembayaran Sukses URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Returned Stok Barang {1} tidak ada dalam {2} {3}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Baris # {0}: Barang Retur {1} tidak ada dalam {2} {3}
 DocType: Purchase Receipt,PREC-,PREC-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Rekening Bank
 ,Bank Reconciliation Statement,Laporan Rekonsiliasi Bank
@@ -1724,7 +1754,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} harus muncul hanya sekali
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Tidak diizinkan untuk tranfer lebih {0} dari {1} terhadap Purchase Order {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},cuti Dialokasikan Berhasil untuk {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Tidak ada item untuk dikemas
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Tidak ada item untuk dikemas
 DocType: Shipping Rule Condition,From Value,Dari Nilai
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Qty Manufaktur  wajib diisi
 DocType: Employee Loan,Repayment Method,Metode pembayaran
@@ -1738,6 +1768,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Hutang Persediaan
 DocType: Purchase Invoice,Supplier Warehouse,Gudang Supplier
 DocType: Opportunity,Contact Mobile No,Kontak Mobile No
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Pilih Perusahaan
 ,Material Requests for which Supplier Quotations are not created,Permintaan Material yang Supplier Quotation tidak diciptakan
 DocType: Student Group,Set 0 for no limit,Set 0 untuk tidak ada batas
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Hari (s) yang Anda lamar cuti adalah hari libur. Anda tidak perlu mengajukan cuti.
@@ -1747,27 +1778,27 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Membuat Quotation
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Laporan lainnya
 DocType: Dependent Task,Dependent Task,Tugas Dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor konversi untuk Unit default Ukur harus 1 berturut-turut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor konversi untuk Unit default Ukur harus 1 berturut-turut {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Cuti jenis {0} tidak boleh lebih dari {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Coba operasi untuk hari X perencanaan di muka.
 DocType: HR Settings,Stop Birthday Reminders,Stop Pengingat Ulang Tahun
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Silahkan mengatur default Payroll Hutang Akun di Perusahaan {0}
 DocType: SMS Center,Receiver List,Daftar Penerima
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Cari Barang
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Cari Barang
 DocType: Patient Appointment,Referring Physician,Merujuk Dokter
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Dikonsumsi Jumlah
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Perubahan bersih dalam kas
 DocType: Assessment Plan,Grading Scale,Skala penilaian
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Satuan Ukur {0} telah dimasukkan lebih dari sekali dalam Faktor Konversi Tabel
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,Sudah lengkap
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Satuan Ukur {0} telah dimasukkan lebih dari sekali dalam Faktor Konversi Tabel
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,Sudah lengkap
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Persediaan Di Tangan
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Permintaan pembayaran sudah ada {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Biaya Produk Dikeluarkan
 DocType: Physician,Hospital,RSUD
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Kuantitas tidak boleh lebih dari {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Kuantitas tidak boleh lebih dari {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Sebelumnya Keuangan Tahun tidak tertutup
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Umur (Hari)
-DocType: Quotation Item,Quotation Item,Quotation Stok Barang
+DocType: Quotation Item,Quotation Item,Produk/Barang Penawaran
 DocType: Customer,Customer POS Id,Id POS Pelanggan
 DocType: Account,Account Name,Nama Akun
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Dari Tanggal tidak dapat lebih besar dari To Date
@@ -1775,8 +1806,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Supplier Type induk.
 DocType: Purchase Order Item,Supplier Part Number,Supplier Part Number
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Tingkat konversi tidak bisa 0 atau 1
-DocType: Sales Invoice,Reference Document,Dokumen referensi
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} dibatalkan atau dihentikan
+DocType: Subscription,Reference Document,Dokumen referensi
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} dibatalkan atau dihentikan
 DocType: Accounts Settings,Credit Controller,Kredit Kontroller
 DocType: Delivery Note,Vehicle Dispatch Date,Kendaraan Dikirim Tanggal
 DocType: Healthcare Settings,Default Medical Code Standard,Standar Kode Standar Medis
@@ -1785,6 +1816,7 @@
 DocType: Company,Default Payable Account,Standar Akun Hutang
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Pengaturan untuk keranjang belanja online seperti aturan pengiriman, daftar harga dll"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Ditagih
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Urutkan menurut Harga ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserved Qty
 DocType: Party Account,Party Account,Akun Party
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Sumber Daya Manusia
@@ -1796,13 +1828,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Membuat Pencairan Masuk
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Muka melawan Supplier harus mendebet
 DocType: Company,Default Values,Nilai Default
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frekuensi} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Frekuensi} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Jumlah Total diganti
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Hal ini didasarkan pada log terhadap kendaraan ini. Lihat timeline di bawah untuk rincian
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Terhadap Faktur Supplier {0} di tanggal {1}
 DocType: Customer,Default Price List,Standar List Harga
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Gerakan aset catatan {0} dibuat
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Anda tidak dapat menghapus Tahun Anggaran {0}. Tahun Fiskal {0} diatur sebagai default di Pengaturan Global
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Seorang pelanggan dengan nama yang sama sudah ada
 DocType: Journal Entry,Entry Type,Entri Type
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Tidak ada rencana penilaian yang terkait dengan kelompok penilaian ini
 ,Customer Credit Balance,Saldo Kredit Pelanggan
@@ -1812,7 +1845,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,harga
 DocType: Quotation,Term Details,Rincian Term
 DocType: Project,Total Sales Cost (via Sales Order),Total Biaya Penjualan (via Sales Order)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,tidak bisa mendaftar lebih dari {0} siswa untuk kelompok siswa ini.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,tidak bisa mendaftar lebih dari {0} siswa untuk kelompok siswa ini.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Jumlah Prospek
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} harus lebih besar dari 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Perencanaan Kapasitas Untuk (Hari)
@@ -1828,9 +1861,11 @@
 DocType: Lab Test,Technician Name,Nama teknisi
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Membatalkan tautan Pembayaran pada Pembatalan Faktur
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Odometer membaca saat masuk harus lebih besar dari awal Kendaraan Odometer {0}
+DocType: Restaurant Reservation,No Show,Tidak menunjukkan
 DocType: Shipping Rule Country,Shipping Rule Country,Aturan Pengiriman – Negara
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Tinggalkan dan Kehadiran
 DocType: Maintenance Visit,Partially Completed,Selesai Sebagian
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Sensitivitas sedang
 DocType: Leave Type,Include holidays within leaves as leaves,Sertakan libur dalam cuti cuti
 DocType: Sales Invoice,Packed Items,Produk Kemasan
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garansi Klaim terhadap Serial No.
@@ -1847,13 +1882,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Dibayar Jumlah (Perusahaan Mata Uang)
 DocType: Purchase Invoice,Additional Discount,Potongan Tambahan
 DocType: Selling Settings,Selling Settings,Pengaturan Penjualan
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Konfirmasi Tindakan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Lelang Online
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Silakan tentukan baik Quantity atau Tingkat Penilaian atau keduanya
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Pemenuhan
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Lihat Troli
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Beban Pemasaran
 ,Item Shortage Report,Laporan Kekurangan Barang / Item
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \n Sebutkan ""Berat UOM"" terlalu"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \n Sebutkan ""Berat UOM"" terlalu"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Permintaan Material yang digunakan untuk membuat Entri Persediaan ini
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Berikutnya Penyusutan Tanggal wajib untuk aset baru
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Kelompok terpisah berdasarkan Kelompok untuk setiap Batch
@@ -1864,19 +1900,19 @@
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +23,Appointment Duration (mins),Durasi Penunjukan (menit)
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Membuat Entri Akuntansi Untuk Setiap Perpindahan Persediaan
 DocType: Leave Allocation,Total Leaves Allocated,Jumlah cuti Dialokasikan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Gudang diperlukan pada Row ada {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Entrikan Tahun Mulai berlaku Keuangan dan Tanggal Akhir
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Gudang diperlukan pada Row nomor {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Entrikan Tahun Mulai berlaku Keuangan dan Tanggal Akhir
 DocType: Employee,Date Of Retirement,Tanggal Pensiun
 DocType: Upload Attendance,Get Template,Dapatkan Template
 DocType: Material Request,Transferred,Ditransfer
 DocType: Vehicle,Doors,pintu
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext Pengaturan Selesai!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext Pengaturan Selesai!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Kumpulkan Biaya untuk Registrasi Pasien
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,Perpisahan pajak
 DocType: Packing Slip,PS-,PS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Pusat Biaya diperlukan untuk akun 'Rugi Laba' {2}. Silakan membuat Pusat Biaya default untuk Perusahaan.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +118,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Sebuah Kelompok Pelanggan sudah ada dengan nama yang sama, silakan ganti nama Pelanggan atau ubah nama Kelompok Pelanggan"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +118,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Sudah ada Kelompok Pelanggan dengan nama yang sama, silakan ganti Nama Pelanggan atau ubah nama Kelompok Pelanggan"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +37,New Contact,Kontak baru
 DocType: Territory,Parent Territory,Wilayah Induk
 DocType: Sales Invoice,Place of Supply,Tempat Pasokan
@@ -1889,36 +1925,36 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Jika item ini memiliki varian, maka tidak dapat dipilih dalam order penjualan dll"
 DocType: Lead,Next Contact By,Kontak Selanjutnya Oleh
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Kuantitas yang dibutuhkan untuk Item {0} berturut-turut {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Gudang {0} tidak dapat dihapus sebagai kuantitas ada untuk Item {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Kuantitas yang dibutuhkan untuk Item {0} di baris {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Gudang {0} tidak dapat dihapus karena ada kuantitas untuk Item {1}
 DocType: Quotation,Order Type,Tipe Order
-DocType: Purchase Invoice,Notification Email Address,Alamat Email Pemberitahuan
 ,Item-wise Sales Register,Item-wise Daftar Penjualan
 DocType: Asset,Gross Purchase Amount,Jumlah Pembelian Gross
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Saldo awal
 DocType: Asset,Depreciation Method,Metode penyusutan
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Offline
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Apakah Pajak ini termasuk dalam Basic Rate?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Total Jumlah Target
 DocType: Job Applicant,Applicant for a Job,Pemohon untuk Lowongan Kerja
 DocType: Production Plan Material Request,Production Plan Material Request,Produksi Permintaan Rencana Material
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Tidak ada Order Produksi dibuat
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Tidak ada Order Produksi dibuat
 DocType: Stock Reconciliation,Reconciliation JSON,Rekonsiliasi JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Terlalu banyak kolom. Mengekspor laporan dan mencetaknya menggunakan aplikasi spreadsheet.
 DocType: Purchase Invoice Item,Batch No,No. Batch
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Permintaan Kutipan: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Memungkinkan beberapa Order Penjualan terhadap Order Pembelian dari Pelanggan
 DocType: Student Group Instructor,Student Group Instructor,Instruktur Kelompok Mahasiswa
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Ponsel Tidak
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Utama
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Utama
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Varian
 DocType: Naming Series,Set prefix for numbering series on your transactions,Mengatur awalan untuk penomoran seri pada transaksi Anda
 DocType: Employee Attendance Tool,Employees HTML,Karyawan HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Standar BOM ({0}) harus aktif untuk item ini atau template-nya
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Standar BOM ({0}) harus aktif untuk item ini atau template-nya
 DocType: Employee,Leave Encashed?,Cuti dicairkan?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Peluang Dari Bidang Usaha Wajib Diisi
 DocType: Email Digest,Annual Expenses,Beban tahunan
 DocType: Item,Variants,Varian
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Buat Order Pembelian
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Buat Order Pembelian
 DocType: SMS Center,Send To,Kirim Ke
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Tidak ada saldo cuti cukup bagi Leave Type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Jumlah yang dialokasikan
@@ -1930,10 +1966,11 @@
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Pemohon untuk Lowongan Pekerjaan
 DocType: Purchase Order Item,Warehouse and Reference,Gudang dan Referensi
 DocType: Supplier,Statutory info and other general information about your Supplier,Info Statutory dan informasi umum lainnya tentang Supplier Anda
-DocType: Item,Serial Nos and Batches,Serial Nos dan Batches
+DocType: Item,Serial Nos and Batches,Nomor Seri dan Partai
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Kekuatan Kelompok Mahasiswa
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Terhadap Entri Jurnal {0} sama sekali tidak memiliki ketidakcocokan {1} entri
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Catatan Jurnal {0} tidak memiliki {1} catatan yang belum dicocokan.
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Penilaian
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Acara Pelatihan
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Gandakan Serial ada dimasukkan untuk Item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Sebuah kondisi untuk Aturan Pengiriman
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,masukkan
@@ -1943,11 +1980,11 @@
 DocType: Sales Order,To Deliver and Bill,Untuk Dikirim dan Ditagih
 DocType: Student Group,Instructors,instruktur
 DocType: GL Entry,Credit Amount in Account Currency,Jumlah kredit di Akun Mata Uang
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} harus diserahkan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} harus terposting
 DocType: Authorization Control,Authorization Control,Pengendali Otorisasi
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Ditolak Gudang adalah wajib terhadap ditolak Stok Barang {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Pembayaran
-apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Gudang {0} tidak ditautkan ke akun apa pun, sebutkan akun di catatan gudang atau tetapkan akun inventaris default di perusahaan {1}."
+apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Gudang {0} tidak ditautkan ke akun apa pun, sebutkan akun di catatan gudang atau tetapkan akun persediaan baku di perusahaan {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Mengelola pesanan Anda
 DocType: Production Order Operation,Actual Time and Cost,Waktu dan Biaya Aktual
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Permintaan Bahan maksimal {0} dapat dibuat untuk Item {1} terhadap Sales Order {2}
@@ -1962,11 +1999,11 @@
 DocType: Quotation Item,Actual Qty,Jumlah Aktual
 DocType: Sales Invoice Item,References,Referensi
 DocType: Quality Inspection Reading,Reading 10,Membaca 10
-DocType: Hub Settings,Hub Node,Hub Node
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Anda telah memasukkan hal yang sama. Harap perbaiki dan coba lagi.
+DocType: Hub Category,Hub Node,Hub Node
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Anda telah memasukan item duplikat. Harap perbaiki dan coba lagi.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Rekan
 DocType: Asset Movement,Asset Movement,Gerakan aset
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,Cart baru
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,Cart baru
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Item {0} bukan merupakan Stok Barang serial
 DocType: SMS Center,Create Receiver List,Buat Daftar Penerima
 DocType: Vehicle,Wheels,roda
@@ -1980,15 +2017,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikasi
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Menunjukkan bahwa paket tersebut merupakan bagian dari pengiriman ini (Hanya Draft)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Buat Entri Pembayaran
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Kuantitas untuk Item {0} harus kurang dari {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Kuantitas untuk Item {0} harus kurang dari {1}
 ,Sales Invoice Trends,Trend Faktur Penjualan
 DocType: Leave Application,Apply / Approve Leaves,Mohon / Approve Cuti
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Untuk
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Untuk
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Dapat merujuk baris hanya jika jenis biaya adalah 'On Sebelumnya Row Jumlah' atau 'Sebelumnya Row Jumlah'
 DocType: Sales Order Item,Delivery Warehouse,Gudang Pengiriman
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Pohon Pusat Biaya keuangan.
 DocType: Serial No,Delivery Document No,Nomor Dokumen Pengiriman
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Silahkan mengatur &#39;Gain / Loss Account pada Asset Disposal&#39; di Perusahaan {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Silahkan mengatur &#39;Gain / Loss Account pada Asset Disposal&#39; di Perusahaan {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Dapatkan Produk Dari Pembelian Penerimaan
 DocType: Serial No,Creation Date,Tanggal Pembuatan
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Item {0} muncul beberapa kali dalam Daftar Harga {1}
@@ -1999,11 +2036,12 @@
 DocType: Student,Student Mobile Number,Mahasiswa Nomor Ponsel
 DocType: Item,Has Variants,Memiliki Varian
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Perbarui tanggapan
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Anda sudah memilih item dari {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Anda sudah memilih item dari {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nama Distribusi Bulanan
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID adalah wajib
 DocType: Sales Person,Parent Sales Person,Induk Sales Person
-DocType: Purchase Invoice,Recurring Invoice,Faktur Berulang/Langganan
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Tinggi ke Rendah
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Pilih programnya dulu
 DocType: Patient Appointment,Patient Age,Usia pasien
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Pengelolaan Proyek
 DocType: Supplier,Supplier of Goods or Services.,Supplier Stok Barang atau Jasa.
@@ -2011,8 +2049,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Rekening piutang bawaan yang akan digunakan jika tidak diatur oleh Pasien untuk memesan biaya Konsultasi.
 DocType: Vehicle Log,Fuel Price,Harga BBM
 DocType: Budget,Budget,Anggaran belanja
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Setel Buka
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Fixed Asset Item harus barang non-persediaan.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Setel Buka
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Fixed Asset Item harus barang non-persediaan.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Anggaran tidak dapat ditugaskan terhadap {0}, karena itu bukan Penghasilan atau Beban akun"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Tercapai
 DocType: Student Admission,Application Form Route,Form aplikasi Route
@@ -2023,29 +2061,30 @@
 DocType: Lead,Follow Up,Mengikuti
 DocType: Item,Is Sales Item,Barang Jualan
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Tree Item Grup
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Stok Barang {0} tidak setup untuk Serial Nos Periksa Stok Barang induk
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Stok Barang {0} tidak setup untuk Nomor Seri. Periksa Induk Barang
 DocType: Maintenance Visit,Maintenance Time,Waktu Pemeliharaan
 ,Amount to Deliver,Jumlah untuk Dikirim
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Item yang sama telah beberapa kali dimasukkan. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Jangka Tanggal Mulai tidak dapat lebih awal dari Tahun Tanggal Mulai Tahun Akademik yang istilah terkait (Tahun Akademik {}). Perbaiki tanggal dan coba lagi.
 DocType: Guardian,Guardian Interests,wali Minat
 DocType: Naming Series,Current Value,Nilai saat ini
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Beberapa tahun fiskal ada untuk tanggal {0}. Silakan set perusahaan di Tahun Anggaran
 DocType: School Settings,Instructor Records to be created by,Catatan Instruktur yang akan dibuat oleh
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} dibuat
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} dibuat
 DocType: Delivery Note Item,Against Sales Order,Berdasarkan Order Penjualan
 ,Serial No Status,Status Nomor Serial
 DocType: Payment Entry Reference,Outstanding,terkemuka
-DocType: Supplier,Warn POs,Peringatkan POs
+DocType: Supplier,Warn POs,Peringatkan untuk POs
 ,Daily Timesheet Summary,Timesheet Ringkasan Harian
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Baris {0}: Untuk mengatur {1} periodisitas, perbedaan antara dari dan sampai saat ini \
  harus lebih besar dari atau sama dengan {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Hal ini didasarkan pada pergerakan persediaan. Lihat {0} untuk rincian
 DocType: Pricing Rule,Selling,Penjualan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Jumlah {0} {1} dipotong terhadap {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Jumlah {0} {1} dipotong terhadap {2}
 DocType: Employee,Salary Information,Informasi Gaji
 DocType: Sales Person,Name and Employee ID,Nama dan ID Karyawan
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Tanggal jatuh tempo tidak bisa sebelum Tanggal Posting
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Tanggal jatuh tempo tidak bisa sebelum Tanggal Posting
 DocType: Website Item Group,Website Item Group,Situs Stok Barang Grup
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Tarif dan Pajak
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Harap masukkan tanggal Referensi
@@ -2060,7 +2099,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Silahkan klik 'Menghasilkan Jadwal' untuk mengambil Serial yang ditambahkan untuk Item {0}
 DocType: Account,Frozen,Beku
 ,Open Production Orders,Order Produksi Aktif
-DocType: Sales Invoice Payment,Base Amount (Company Currency),Basis Jumlah (Perusahaan Mata Uang)
+DocType: Sales Invoice Payment,Base Amount (Company Currency),Dasar Penilaian (Mata Uang Perusahaan)
 DocType: Payment Reconciliation Payment,Reference Row,referensi Row
 DocType: Installation Note,Installation Time,Waktu Installasi
 DocType: Sales Invoice,Accounting Details,Rincian Akuntansi
@@ -2071,16 +2110,16 @@
 DocType: Issue,Resolution Details,Detail Resolusi
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Alokasi
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Kriteria Penerimaan
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Cukup masukkan Permintaan Bahan dalam tabel di atas
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Cukup masukkan Permintaan Bahan dalam tabel di atas
 DocType: Item Attribute,Attribute Name,Nama Atribut
 DocType: BOM,Show In Website,Tampilkan Di Website
 DocType: Shopping Cart Settings,Show Quantity in Website,Tampilkan Kuantitas Website
 DocType: Employee Loan Application,Total Payable Amount,Jumlah Total Hutang
 DocType: Task,Expected Time (in hours),Waktu yang diharapkan (dalam jam)
 DocType: Item Reorder,Check in (group),Check in (kelompok)
-,Qty to Order,Qty to Order
+,Qty to Order,Kuantitas untuk diorder
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Account kepala di bawah Kewajiban atau Ekuitas, di mana Laba / Rugi akan dipesan"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Gantt chart dari semua tugas.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Gantt chart dari semua tugas.
 DocType: Opportunity,Mins to First Response,Menit untuk Respon Pertama
 DocType: Pricing Rule,Margin Type,Margin Jenis
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} jam
@@ -2101,35 +2140,35 @@
 DocType: Patient,Surgical History,Sejarah Bedah
 DocType: Employee,Resignation Letter Date,Tanggal Surat Pengunduran Diri
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Aturan harga selanjutnya disaring berdasarkan kuantitas.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Harap atur tanggal bergabung untuk karyawan {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Harap atur tanggal bergabung untuk karyawan {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Jumlah Total Penagihan (via Waktu Lembar)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Pendapatan Pelanggan Rutin
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) harus memiliki akses sebagai 'Pemberi Izin Pengeluaran'
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Pasangan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Pilih BOM dan Qty untuk Produksi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Pilih BOM dan Qty untuk Produksi
 DocType: Asset,Depreciation Schedule,Jadwal penyusutan
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Alamat Mitra Penjualan Dan Kontak
 DocType: Bank Reconciliation Detail,Against Account,Terhadap Akun
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Tanggal Setengah Hari harus di antara Tanggal Mulai dan Tanggal Akhir
 DocType: Maintenance Schedule Detail,Actual Date,Tanggal Aktual
 DocType: Item,Has Batch No,Bernomor Batch
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Penagihan tahunan: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Penagihan tahunan: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Pajak Barang dan Jasa (GST India)
 DocType: Delivery Note,Excise Page Number,Jumlah Halaman Excise
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Perusahaan, Dari Tanggal dan To Date adalah wajib"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Dapatkan Konsultasi
 DocType: Asset,Purchase Date,Tanggal Pembelian
 DocType: Employee,Personal Details,Data Pribadi
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Silahkan mengatur &#39;Biaya Penyusutan Asset Center di Perusahaan {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Silahkan mengatur &#39;Biaya Penyusutan Asset Center di Perusahaan {0}
 ,Maintenance Schedules,Jadwal pemeliharaan
 DocType: Task,Actual End Date (via Time Sheet),Tanggal Akhir Aktual (dari Lembar Waktu)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Jumlah {0} {1} terhadap {2} {3}
-,Quotation Trends,Trend Quotation
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Jumlah {0} {1} terhadap {2} {3}
+,Quotation Trends,Trend Penawaran
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Item Grup tidak disebutkan dalam master Stok Barang untuk item {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Debit Untuk akun harus rekening Piutang
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Debit Untuk akun harus rekening Piutang
 DocType: Shipping Rule Condition,Shipping Amount,Jumlah Pengiriman
 DocType: Supplier Scorecard Period,Period Score,Skor Periode
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Tambahkan Pelanggan
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Tambahkan Pelanggan
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Jumlah Pending
 DocType: Lab Test Template,Special,Khusus
 DocType: Purchase Invoice Item,Conversion Factor,Faktor konversi
@@ -2137,13 +2176,14 @@
 ,Vehicle Expenses,Beban kendaraan
 DocType: Serial No,Invoice Details,Detail faktur
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},nilai yang diharapkan setelah masa manfaat harus lebih besar dari atau sama dengan {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Mulai dari
+DocType: Hub Category,Hub Category,Kategori Hub
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Nomor Kendaraan
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,Tanggal dimana berulang faktur akan berhenti
 DocType: Employee Loan,Loan Amount,Jumlah pinjaman
 DocType: Program Enrollment,Self-Driving Vehicle,Kendaraan Mengemudi Sendiri
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Supplier Scorecard Berdiri
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Row {0}: Bill of Material tidak ditemukan Item {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Row {0}: Bill of Material tidak ditemukan Item {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Jumlah cuti dialokasikan {0} tidak bisa kurang dari cuti yang telah disetujui {1} untuk periode
 DocType: Journal Entry,Accounts Receivable,Piutang
 ,Supplier-Wise Sales Analytics,Sales Analitikal berdasarkan Supplier
@@ -2154,7 +2194,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Kursus Orang Tua (Biarkan kosong, jika ini bukan bagian dari Kursus Orang Tua)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Biarkan kosong jika dipertimbangkan untuk semua jenis karyawan
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribusi Biaya Berdasarkan
-apps/erpnext/erpnext/hooks.py +131,Timesheets,timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,timesheets
 DocType: HR Settings,HR Settings,Pengaturan Sumber Daya Manusia
 DocType: Salary Slip,net pay info,net Info pay
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Nilai ini diperbarui dalam Daftar Harga Penjualan Default.
@@ -2165,7 +2205,7 @@
 DocType: Patient,B Positive,B Positif
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty harus 1, sebagai item aset tetap. Silakan gunakan baris terpisah untuk beberapa qty."
 DocType: Leave Block List Allow,Leave Block List Allow,Cuti Block List Izinkan
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Singkatan tidak boleh kosong atau spasi
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Singkatan tidak boleh kosong atau spasi
 DocType: Patient Medical Record,Patient Medical Record,Catatan Medis Pasien
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Kelompok Non-kelompok
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Olahraga
@@ -2176,14 +2216,15 @@
 apps/erpnext/erpnext/utilities/user_progress.py +125,Unit,Satuan
 apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Silakan tentukan Perusahaan
 ,Customer Acquisition and Loyalty,Akuisisi dan Loyalitas Pelanggan
-DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Gudang di mana Anda menyimpan barang ditolak
+DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Gudang di mana Anda menyimpan barang-barang yang ditolak/reject
 DocType: Production Order,Skip Material Transfer,Lewati Transfer Material
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Tidak dapat menemukan nilai tukar untuk {0} sampai {1} untuk tanggal kunci {2}. Buat catatan Currency Exchange secara manual
 DocType: POS Profile,Price List,Daftar Harga
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} adalah Tahun Anggaran default. Silahkan me-refresh browser Anda agar perubahan dapat terwujud.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Beban Klaim
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} adalah Tahun Anggaran bawaan. Silahkan memuat kembali browser Anda agar perubahan dapat terwujud.
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Beban Klaim
 DocType: Issue,Support,Support
-,BOM Search,BOM Cari
+,BOM Search,Pencarian BOM
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Publish &quot;In Stock&quot; atau &quot;Not in Stock&quot; di Hub berdasarkan stok yang ada di gudang ini.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Penutupan (Membuka Total +)
 DocType: Vehicle,Fuel Type,Jenis bahan bakar
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Silakan tentukan mata uang di Perusahaan
@@ -2195,41 +2236,42 @@
 DocType: Healthcare Settings,Remind Before,Ingatkan sebelumnya
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Faktor UOM Konversi diperlukan berturut-turut {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Dokumen Referensi Type harus menjadi salah satu Sales Order, Faktur Penjualan atau Journal Entri"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Dokumen Referensi Type harus menjadi salah satu Sales Order, Faktur Penjualan atau Journal Entri"
 DocType: Salary Component,Deduction,Deduksi
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Row {0}: Dari Waktu dan To Waktu adalah wajib.
 DocType: Stock Reconciliation Item,Amount Difference,jumlah Perbedaan
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Item Harga ditambahkan untuk {0} di Daftar Harga {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Item Harga ditambahkan untuk {0} di Daftar Harga {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Cukup masukkan Id Karyawan Sales Person ini
 DocType: Territory,Classification of Customers by region,Klasifikasi Pelanggan menurut wilayah
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Perbedaan Jumlah harus nol
 DocType: Project,Gross Margin,Margin kotor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Entrikan Produksi Stok Barang terlebih dahulu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Entrikan Produksi Stok Barang terlebih dahulu
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Dihitung keseimbangan Laporan Bank
 DocType: Normal Test Template,Normal Test Template,Template Uji Normal
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Pengguna Non-aktif
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +764,Quotation,Quotation
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +764,Quotation,Penawaran
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +957,Cannot set a received RFQ to No Quote,Tidak dapat mengatur RFQ yang diterima ke No Quote
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Jumlah Deduksi
 ,Production Analytics,Analytics produksi
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Hal ini didasarkan pada transaksi melawan Pasien ini. Lihat garis waktu di bawah untuk rinciannya
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Perbarui Biaya
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Perbarui Biaya
 DocType: Employee,Date of Birth,Tanggal Lahir
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Item {0} telah dikembalikan
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Tahun Anggaran ** mewakili Tahun Keuangan. Semua entri akuntansi dan transaksi besar lainnya dilacak terhadap Tahun Anggaran ** **.
 DocType: Opportunity,Customer / Lead Address,Alamat Pelanggan / Prospek
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Penyiapan Scorecard Pemasok
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Peringatan: Sertifikat SSL tidak valid pada lampiran {0}
-DocType: Student Admission,Eligibility,kelayakan
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Nama Rencana Penilaian
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Peringatan: Sertifikat SSL tidak valid pada lampiran {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Prospek membantu Anda mendapatkan bisnis, tambahkan semua kontak Anda sebagai prospek Anda"
 DocType: Production Order Operation,Actual Operation Time,Waktu Operasi Aktual
 DocType: Authorization Rule,Applicable To (User),Berlaku Untuk (User)
 DocType: Purchase Taxes and Charges,Deduct,Pengurangan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Deskripsi Bidang Kerja
 DocType: Student Applicant,Applied,Terapan
-DocType: Sales Invoice Item,Qty as per Stock UOM,Jumlah sesuai UOM Persediaan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Re-terbuka
+DocType: Sales Invoice Item,Qty as per Stock UOM,Kuantitas sesuai UOM Persediaan
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Nama Guardian2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Karakter khusus kecuali ""-"" ""."", ""#"", dan ""/"" tidak diperbolehkan dalam penamaan seri"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Pantau Kampanye Penjualan. Pantau Prospek, Penawaran, Perintah Penjualan dll dari Kampanye untuk mengukur Return on Investment."
@@ -2240,7 +2282,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Manajer Manufaktur
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial ada {0} masih dalam garansi upto {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Membagi Pengiriman Catatan ke dalam paket.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Pengiriman
+apps/erpnext/erpnext/hooks.py +107,Shipments,Pengiriman
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Total Dialokasikan Jumlah (Perusahaan Mata Uang)
 DocType: Purchase Order Item,To be delivered to customer,Akan dikirimkan ke pelanggan
 DocType: BOM,Scrap Material Cost,Scrap Material Biaya
@@ -2248,7 +2290,7 @@
 DocType: Purchase Invoice,In Words (Company Currency),Dalam Kata-kata (Perusahaan Mata Uang)
 DocType: Asset,Supplier,Supplier
 DocType: Consultation,Consultation Time,Waktu Konsultasi
-DocType: C-Form,Quarter,Perempat
+DocType: C-Form,Quarter,Seperempat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Beban lain-lain
 DocType: Global Defaults,Default Company,Standar Perusahaan
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Akun Beban atau Selisih adalah wajib untuk Barang {0} karena berdampak pada keseluruhan nilai persediaan
@@ -2262,8 +2304,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Pengaturan Variasi Item
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Pilih Perusahaan ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Biarkan kosong jika dianggap untuk semua departemen
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Jenis pekerjaan (permanen, kontrak, magang dll)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} adalah wajib untuk Item {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Jenis pekerjaan (permanen, kontrak, magang dll)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} adalah wajib untuk Item {1}
 DocType: Process Payroll,Fortnightly,sekali dua minggu
 DocType: Currency Exchange,From Currency,Dari mata uang
 DocType: Vital Signs,Weight (In Kilogram),Berat (dalam Kilogram)
@@ -2283,11 +2325,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Perbankan
 apps/erpnext/erpnext/utilities/activation.py +108,Add Timesheets,menambahkan Timesheets
 DocType: Vehicle Service,Service Item,layanan Barang
-DocType: Bank Guarantee,Bank Guarantee,Garansi Bank
+DocType: Bank Guarantee,Bank Guarantee,Bank Garansi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Silahkan klik 'Menghasilkan Jadwal' untuk mendapatkan jadwal
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Ada kesalahan saat menghapus jadwal berikut:
 DocType: Bin,Ordered Quantity,Qty Terpesan/Terorder
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","misalnya ""Membangun alat untuk pembangun """
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","misalnya ""Membangun alat untuk pembangun """
 DocType: Grading Scale,Grading Scale Intervals,Grading Scale Interval
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Entri Akuntansi untuk {2} hanya dapat dilakukan dalam bentuk mata uang: {3}
 DocType: Production Order,In Process,Dalam Proses
@@ -2310,15 +2352,14 @@
 DocType: Purchase Invoice,With Payment of Tax,Dengan pembayaran pajak
 DocType: Expense Claim Detail,Expense Claim Detail,Detail Klaim Biaya
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICATE UNTUK PEMASOK
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Silakan pilih akun yang benar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Silakan pilih akun yang benar
 DocType: Item,Weight UOM,Berat UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Struktur Gaji Karyawan
 DocType: Patient,Blood Group,Golongan darah
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Menunggu
 DocType: Course,Course Name,Nama kursus
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Pengguna yang dapat menyetujui aplikasi cuti karyawan tertentu yang
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Peralatan Kantor
-DocType: Purchase Invoice Item,Qty,Qty
+DocType: Purchase Invoice Item,Qty,Kuantitas
 DocType: Fiscal Year,Companies,Perusahaan
 DocType: Supplier Scorecard,Scoring Setup,Setup Scoring
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronik
@@ -2328,12 +2369,12 @@
 DocType: Employee,Contact Details,Kontak Detail
 DocType: C-Form,Received Date,Diterima Tanggal
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Jika Anda telah membuat template standar dalam Penjualan Pajak dan Biaya Template, pilih salah satu dan klik pada tombol di bawah ini."
-DocType: BOM Scrap Item,Basic Amount (Company Currency),Dasar Jumlah (Perusahaan Mata Uang)
+DocType: BOM Scrap Item,Basic Amount (Company Currency),Nilai Dasar (Mata Uang Perusahaan)
 DocType: Student,Guardians,Penjaga
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Harga tidak akan ditampilkan jika Harga Daftar tidak diatur
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Silakan tentukan negara untuk Aturan Pengiriman ini atau periksa Seluruh Dunia Pengiriman
 DocType: Stock Entry,Total Incoming Value,Total nilai masuk
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Debit Untuk diperlukan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Debit Untuk diperlukan
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets membantu melacak waktu, biaya dan penagihan untuk kegiatan yang dilakukan oleh tim Anda"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pembelian Daftar Harga
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Template dari variabel scorecard pemasok.
@@ -2343,19 +2384,22 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Rekonsiliasi Pembayaran
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Silahkan Pilih Pihak penanggung jawab
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Total Tunggakan: {0}
-DocType: BOM Website Operation,BOM Website Operation,Operasi Situs BOM
+DocType: Hub Settings,Unregister from Hub,Unregister dari Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Total Tunggakan: {0}
+DocType: BOM Website Operation,BOM Website Operation,BOM Operasi Situs
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Surat Penawaran
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Menghasilkan Permintaan Material (MRP) dan Order Produksi.
 DocType: Supplier Scorecard,Supplier Score,Skor Pemasok
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +76,Total Invoiced Amt,Jumlah Nilai Tagihan
-DocType: Supplier,Warn RFQs,Peringatkan RFQs
+DocType: Supplier,Warn RFQs,Peringatkan untuk RFQs
 DocType: BOM,Conversion Rate,Tingkat konversi
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Cari produk
 DocType: Physician Schedule Time Slot,To Time,Untuk Waktu
 DocType: Authorization Rule,Approving Role (above authorized value),Menyetujui Peran (di atas nilai yang berwenang)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Kredit Untuk akun harus rekening Hutang
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} tidak bisa menjadi induk atau cabang dari {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Silakan pilih Student Admission yang wajib diisi pemohon uang pelajar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} tidak bisa menjadi induk atau cabang dari {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Silakan pilih Daftar Harga untuk menerbitkan harga
 DocType: Production Order Operation,Completed Qty,Qty Selesai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Untuk {0}, hanya rekening debit dapat dihubungkan dengan entri kredit lain"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Daftar Harga {0} dinonaktifkan
@@ -2367,51 +2411,53 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Nomer Seri diperlukan untuk Item {1}. Anda menyediakan {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Nilai Tingkat Penilaian Saat ini
 DocType: Item,Customer Item Codes,Kode Produk Pelanggan
+DocType: Training Event,Advance,Muka
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,untuk membuat berulang lagi.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Efek Gain / Loss
 DocType: Opportunity,Lost Reason,Alasan Kehilangan
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Alamat baru
 DocType: Quality Inspection,Sample Size,Ukuran Sampel
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Masukkan Dokumen Penerimaan
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Semua Stok Barang telah tertagih
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Silakan tentukan valid 'Dari Kasus No'
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',Silakan tentukan valid 'Dari Kasus No'
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Pusat biaya lebih lanjut dapat dibuat di bawah Grup tetapi entri dapat dilakukan terhadap non-Grup
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Pengguna dan Perizinan
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Produksi Pesanan Dibuat: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Produksi Pesanan Dibuat: {0}
 DocType: Branch,Branch,Cabang
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Percetakan dan Branding
 DocType: Company,Total Monthly Sales,Total Penjualan Bulanan
 DocType: Bin,Actual Quantity,Kuantitas Aktual
 DocType: Shipping Rule,example: Next Day Shipping,Contoh: Hari Berikutnya Pengiriman
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} tidak ditemukan
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Langganan telah {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Langganan telah {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Program Jadwal Biaya
 DocType: Fee Schedule Program,Student Batch,Mahasiswa Batch
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,pilih * dari `tabVital Signs` dimana perintah pasien = &#39;{0}&#39; dengan tanda batas desc_date 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,membuat Siswa
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Min Grade
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Anda telah diundang untuk berkolaborasi pada proyek: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Dokter tidak tersedia di {0}
-DocType: Leave Block List Date,Block Date,Blokir Tanggal
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Tambahkan Id Langganan bidang kustom di DOCTYPE {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Anda telah diundang untuk berkolaborasi pada proyek: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Dokter tidak tersedia di {0}
+DocType: Leave Block List Date,Block Date,Blok Tanggal
 DocType: Purchase Receipt,Supplier Delivery Note,Catatan Pengiriman Supplier
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Terapkan Sekarang
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Terapkan Sekarang
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Sebenarnya Qty {0} / Menunggu Qty {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-commerce GSTIN
 DocType: Sales Order,Not Delivered,Tidak Terkirim
-,Bank Clearance Summary,Laporan Ringkasan Kliring Bank
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Tanggal yang Diharapkan tidak dapat dilakukan sebelum Tanggal Transaksi
+,Bank Clearance Summary,Ringkasan Kliring Bank
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Buat dan kelola surel ringkasan harian, mingguan dan bulanan."
 DocType: Appraisal Goal,Appraisal Goal,Penilaian Pencapaian
 DocType: Stock Reconciliation Item,Current Amount,Jumlah saat ini
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,bangunan
 DocType: Fee Schedule,Fee Structure,Struktur biaya
 DocType: Timesheet Detail,Costing Amount,Nilai Jumlah Biaya
-DocType: Student Admission,Application Fee,Biaya aplikasi
+DocType: Student Admission Program,Application Fee,Biaya aplikasi
 DocType: Process Payroll,Submit Salary Slip,Kirim Slip Gaji
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Diskon Maxiumm untuk Item {0} adalah {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Diskon Maxiumm untuk Item {0} adalah {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Impor Secara massal
 DocType: Sales Partner,Address & Contacts,Alamat & Kontak
 DocType: SMS Log,Sender Name,Nama Pengirim
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Urutkan menurut Kriteria
 DocType: POS Profile,[Select],[Pilihan]
 DocType: Vital Signs,Blood Pressure (diastolic),Tekanan Darah (diastolik)
 DocType: SMS Log,Sent To,Dikirim Ke
@@ -2420,7 +2466,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Berikutnya Hubungi Tanggal tidak dapat di masa lalu
 DocType: Company,For Reference Only.,Untuk referensi saja.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Dokter {0} tidak tersedia di {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Pilih Batch No
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Pilih Batch No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Valid {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,Referensi Inv
@@ -2436,15 +2482,15 @@
 DocType: Normal Test Items,Require Result Value,Mengharuskan Nilai Hasil
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Kasus No tidak bisa 0
 DocType: Item,Show a slideshow at the top of the page,Tampilkan slideshow di bagian atas halaman
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,BOMS
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Toko
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,BOMS
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Toko
 DocType: Project Type,Projects Manager,Manajer Proyek
 DocType: Serial No,Delivery Time,Waktu Pengiriman
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Umur Berdasarkan
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Penunjukan dibatalkan
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Penunjukan dibatalkan
 DocType: Item,End of Life,Akhir Riwayat
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Perjalanan
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Tidak ada yang aktif atau gaji standar Struktur ditemukan untuk karyawan {0} untuk tanggal tertentu
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Perjalanan
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Tidak ada yang aktif atau gaji standar Struktur ditemukan untuk karyawan {0} untuk tanggal tertentu
 DocType: Leave Block List,Allow Users,Izinkan Pengguna
 DocType: Purchase Order,Customer Mobile No,Nomor Seluler Pelanggan
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Pengulangan
@@ -2453,12 +2499,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Perbarui Biaya
 DocType: Item Reorder,Item Reorder,Item Reorder
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Slip acara Gaji
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Transfer Material/Stok Barang
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Transfer Material/Stok Barang
 DocType: Fees,Send Payment Request,Kirim Permintaan Pembayaran
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Tentukan operasi, biaya operasi dan memberikan Operation unik ada pada operasi Anda."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dokumen ini adalah lebih dari batas oleh {0} {1} untuk item {4}. Apakah Anda membuat yang lain {3} terhadap yang sama {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Silahkan mengatur berulang setelah menyimpan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Pilih akun berubah jumlah
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Pilih akun berubah jumlah
 DocType: Purchase Invoice,Price List Currency,Daftar Harga Mata uang
 DocType: Naming Series,User must always select,Pengguna harus selalu pilih
 DocType: Stock Settings,Allow Negative Stock,Izinkan persediaan negatif
@@ -2474,11 +2520,11 @@
 DocType: Process Payroll,Create Salary Slip,Buat Slip Gaji
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Lacak
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Sumber Dana (Kewajiban)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +381,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Jumlah berturut-turut {0} ({1}) harus sama dengan jumlah yang diproduksi {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +381,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Kuantitas di baris {0} ({1}) harus sama dengan jumlah yang diproduksi {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Karyawan
 DocType: Sample Collection,Collected Time,Waktu yang Dikumpulkan
 DocType: Company,Sales Monthly History,Riwayat Bulanan Penjualan
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Pilih Batch
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Pilih Batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} telah ditagih sepenuhnya
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Tanda-tanda vital
 DocType: Training Event,End Time,Waktu Akhir
@@ -2486,16 +2532,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Pengurangan pembayaran atau Rugi
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Ketentuan kontrak standar untuk Penjualan atau Pembelian.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Group by Voucher
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Yakin ingin membatalkan janji temu ini?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Pipeline penjualan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Silakan set account default di Komponen Gaji {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Diperlukan pada
 DocType: Rename Tool,File to Rename,Nama File untuk Diganti
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Silakan pilih BOM untuk Item di Row {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Silakan pilih BOM untuk Item di Row {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Akun {0} tidak cocok dengan Perusahaan {1} dalam Mode Akun: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Ditentukan BOM {0} tidak ada untuk Item {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Jadwal pemeliharaan {0} harus dibatalkan sebelum membatalkan Sales Order ini
+DocType: POS Profile,Applicable for Users,Berlaku untuk Pengguna
 DocType: Notification Control,Expense Claim Approved,Klaim Biaya Disetujui
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Slip Gaji karyawan {0} sudah dibuat untuk periode ini
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Slip Gaji karyawan {0} sudah dibuat untuk periode ini
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Farmasi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Biaya Produk Dibeli
 DocType: Selling Settings,Sales Order Required,Nota Penjualan Diperlukan
@@ -2503,7 +2551,7 @@
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Prospek / Pelanggan Aktif
 DocType: Employee Education,Post Graduate,Pasca Sarjana
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Jadwal pemeliharaan Detil
-DocType: Supplier Scorecard,Warn for new Purchase Orders,Peringatkan Pesanan Pembelian baru
+DocType: Supplier Scorecard,Warn for new Purchase Orders,Peringatkan untuk Pesanan Pembelian baru
 DocType: Quality Inspection Reading,Reading 9,Membaca 9
 DocType: Supplier,Is Frozen,Dibekukan
 apps/erpnext/erpnext/stock/utils.py +217,Group node warehouse is not allowed to select for transactions,gudang kelompok simpul tidak diperbolehkan untuk memilih untuk transaksi
@@ -2518,7 +2566,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Compensatory Off,Kompensasi Off
 DocType: Offer Letter,Accepted,Diterima
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Organisasi
-DocType: BOM Update Tool,BOM Update Tool,BOM Update Tool
+DocType: BOM Update Tool,BOM Update Tool,Alat Penggantian BOM
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Rekening pihak tidak ditentukan, silahkan setup akun party default di perusahaan"
 DocType: SG Creation Tool Course,Student Group Name,Nama Kelompok Mahasiswa
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Menciptakan Biaya
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Pastikan Anda benar-benar ingin menghapus semua transaksi untuk perusahaan ini. Data master Anda akan tetap seperti itu. Tindakan ini tidak bisa dibatalkan.
@@ -2527,29 +2576,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) tidak dapat lebih besar dari jumlah yang direncanakan ({2}) di Order Produksi {3}
 DocType: Shipping Rule,Shipping Rule Label,Peraturan Pengiriman Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum pengguna
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Bahan baku tidak boleh kosong.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Tidak bisa perbarui persediaan, faktur berisi barang titipan."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Bahan baku tidak boleh kosong.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Tidak bisa perbarui persediaan, faktur berisi barang titipan."
 DocType: Lab Test Sample,Lab Test Sample,Sampel Uji Lab
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Jurnal Entry Cepat
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Anda tidak dapat mengubah kurs jika BOM disebutkan atas tiap barang
+DocType: Restaurant,Invoice Series Prefix,Awalan Seri Faktur
 DocType: Employee,Previous Work Experience,Pengalaman Kerja Sebelumnya
 DocType: Stock Entry,For Quantity,Untuk Kuantitas
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Entrikan Planned Qty untuk Item {0} pada baris {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Entrikan Planned Qty untuk Item {0} pada baris {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} tidak di-posting
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Permintaan untuk item.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Order produksi yang terpisah akan dibuat untuk setiap item Stok Barang jadi.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} harus negatif dalam dokumen kembali
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} harus negatif dalam dokumen retur
 ,Minutes to First Response for Issues,Menit ke Response Pertama untuk Masalah
 DocType: Purchase Invoice,Terms and Conditions1,Syarat dan Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,Nama lembaga yang Anda menyiapkan sistem ini.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,Nama lembaga yang Anda menyiapkan sistem ini.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Pencatatan Akuntansi telah dibekukan sampai tanggal ini, tidak seorang pun yang bisa melakukan / memodifikasi pencatatan kecuali peran yang telah ditentukan di bawah ini."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Harap menyimpan dokumen sebelum menghasilkan jadwal pemeliharaan
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Harga terbaru diperbarui di semua BOM
 DocType: Fee Schedule,Successful,Sukses
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status proyek
 DocType: UOM,Check this to disallow fractions. (for Nos),Centang untuk melarang fraksi. (Untuk Nos)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Berikut Pesanan Produksi diciptakan:
-DocType: Student Admission,Naming Series (for Student Applicant),Penamaan Series (untuk Mahasiswa Pemohon)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Berikut Pesanan Produksi diciptakan:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Penamaan Series (untuk Mahasiswa Pemohon)
 DocType: Delivery Note,Transporter Name,Transporter Nama
 DocType: Authorization Rule,Authorized Value,Nilai Disetujui
 DocType: BOM,Show Operations,Tampilkan Operasi
@@ -2573,7 +2623,7 @@
 ,Employees working on a holiday,Karyawan yang bekerja pada hari libur
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Hadir
 DocType: Project,% Complete Method,% Metode Lengkap
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Obat
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Obat
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Tanggal mulai pemeliharaan tidak bisa sebelum tanggal pengiriman untuk Serial No {0}
 DocType: Production Order,Actual End Date,Tanggal Akhir Aktual
 DocType: BOM,Operating Cost (Company Currency),Biaya operasi (Perusahaan Mata Uang)
@@ -2583,27 +2633,28 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +110,Code {0} already exist,Kode {0} sudah ada
 DocType: Stock Entry,Purpose,Tujuan
 DocType: Company,Fixed Asset Depreciation Settings,Pengaturan Penyusutan Aset Tetap
-DocType: Item,Will also apply for variants unless overrridden,Juga akan berlaku untuk varian kecuali overrridden
+DocType: Item,Will also apply for variants unless overrridden,Juga akan berlaku untuk varian kecuali tertimpa
 DocType: Purchase Invoice,Advances,Advances
 DocType: Production Order,Manufacture against Material Request,Memproduksi terhadap Permintaan Bahan
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +10,Assessment Group: ,Kelompok Penilaian:
 DocType: Item Reorder,Request for,Meminta
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Menyetujui Pengguna tidak bisa sama dengan pengguna aturan yang Berlaku Untuk
-DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Tarif dasar (sesuai UOM Persediaan)
+DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Harga dasar (sesuai UOM Persediaan)
 DocType: SMS Log,No of Requested SMS,Tidak ada dari Diminta SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Tinggalkan Tanpa Bayar tidak sesuai dengan catatan Cuti Aplikasi disetujui
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Tinggalkan Tanpa Bayar tidak sesuai dengan catatan Cuti Aplikasi disetujui
 DocType: Campaign,Campaign-.####,Promosi-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Langkah selanjutnya
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Silakan memasok barang-barang tertentu dengan tarif terbaik
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Membuat Invoice
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto Peluang dekat setelah 15 hari
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Pesanan Pembelian tidak diizinkan untuk {0} karena kartu skor berdiri {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Pesanan Pembelian tidak diizinkan untuk {0} karena kartu skor berdiri {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,akhir Tahun
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Penawaran/Prospek %
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Kontrak Tanggal Akhir harus lebih besar dari Tanggal Bergabung
 DocType: Vital Signs,Nutrition Values,Nilai gizi
 DocType: Lab Test Template,Is billable,Apakah bisa ditagih
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Baik &quot;Jadwal Dokter&quot; dan Waktu Per Penunjukan &quot;harus ditetapkan untuk Dr {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Seorang distributor pihak ketiga / agen / komisi agen / affiliate / reseller yang menjual produk-produk perusahaan untuk komisi.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} terhadap Purchase Order {1}
 DocType: Patient,Patient Demographics,Demografi pasien
@@ -2653,7 +2704,6 @@
  10. Menambah atau Dikurangi: Apakah Anda ingin menambah atau mengurangi pajak."
 DocType: Homepage,Homepage,Homepage
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Pilih Dokter ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',tab updateConsultation set invoice = &#39;{0}&#39; dimana nama = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Qty Diterima
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Biaya Rekaman Dibuat - {0}
 DocType: Asset Category Account,Asset Category Account,Aset Kategori Akun
@@ -2665,7 +2715,7 @@
 DocType: Asset,Manual,panduan
 DocType: Salary Component Account,Salary Component Account,Akun Komponen Gaji
 DocType: Global Defaults,Hide Currency Symbol,Sembunyikan Mata Uang
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","misalnya Bank, Kas, Kartu Kredit"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","misalnya Bank, Kas, Kartu Kredit"
 DocType: Lead Source,Source Name,sumber Nama
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Tekanan darah istirahat normal pada orang dewasa sekitar 120 mmHg sistolik, dan diastolik 80 mmHg, disingkat &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Nota Kredit
@@ -2684,16 +2734,16 @@
 DocType: Patient,Occupation,Pendudukan
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: Tanggal awal harus sebelum Tanggal Akhir
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qty)
-DocType: Sales Invoice,This Document,Dokumen ini
 DocType: Installation Note Item,Installed Qty,Terpasang Qty
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Ini bisa jadi karena beberapa Alamat Email yang salah di
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Anda menambahkan
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,pelatihan Hasil
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,pelatihan Hasil
 DocType: Purchase Invoice,Is Paid,Telah dibayar
 DocType: Salary Structure,Total Earning,Total Penghasilan
 DocType: Purchase Receipt,Time at which materials were received,Waktu di mana bahan yang diterima
 DocType: Stock Ledger Entry,Outgoing Rate,Tingkat keluar
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Cabang master organisasi.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Cabang master organisasi.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,atau
 DocType: Sales Order,Billing Status,Status Penagihan
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Laporkan Masalah
@@ -2708,7 +2758,8 @@
 DocType: Notification Control,Sales Order Message,Pesan Nota Penjualan
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Set Nilai Default seperti Perusahaan, Mata Uang, Tahun Anggaran Current, dll"
 DocType: Payment Entry,Payment Type,Jenis Pembayaran
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Silakan pilih Batch for Item {0}. Tidak dapat menemukan satu bets yang memenuhi persyaratan ini
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Silakan pilih Batch for Item {0}. Tidak dapat menemukan satu bets yang memenuhi persyaratan ini
+DocType: Hub Category,Parent Category,Kategori Induk
 DocType: Process Payroll,Select Employees,Pilih Karyawan
 DocType: Opportunity,Potential Sales Deal,Kesepakatan potensial Penjualan
 DocType: Complaint,Complaints,Keluhan
@@ -2716,7 +2767,7 @@
 DocType: Purchase Invoice,Total Taxes and Charges,Jumlah Pajak dan Biaya
 DocType: Employee,Emergency Contact,Darurat Kontak
 DocType: Bank Reconciliation Detail,Payment Entry,Masuk pembayaran
-DocType: Item,Quality Parameters,Parameter kualitas
+DocType: Item,Quality Parameters,Parameter Kualitas
 ,sales-browser,penjualan-browser
 apps/erpnext/erpnext/accounts/doctype/account/account.js +73,Ledger,Buku besar
 DocType: Patient Medical Record,PMR-,PMR-
@@ -2745,7 +2796,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikasi paket untuk pengiriman (untuk mencetak)
 DocType: Bin,Reserved Quantity,Reserved Kuantitas
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Harap masukkan alamat email yang benar
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Harap pilih item di keranjang
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Harap pilih item di keranjang
 DocType: Landed Cost Voucher,Purchase Receipt Items,Nota Penerimaan Produk
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Menyesuaikan Bentuk
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,tunggakan
@@ -2755,15 +2806,15 @@
 DocType: Payment Request,Amount in customer's currency,Jumlah dalam mata uang pelanggan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Pengiriman
 DocType: Stock Reconciliation Item,Current Qty,Jumlah saat ini
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Tambahkan Pemasok
+DocType: Restaurant Menu,Restaurant Menu,Menu Restoran
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Sebelumnya
 DocType: Appraisal Goal,Key Responsibility Area,Key Responsibility area
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Batch Student membantu Anda melacak kehadiran, penilaian dan biaya untuk siswa"
 DocType: Payment Entry,Total Allocated Amount,Jumlah Total Dialokasikan
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Tetapkan akun inventaris default untuk persediaan perpetual
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Tetapkan akun inventaris default untuk persediaan perpetual
 DocType: Item Reorder,Material Request Type,Permintaan Jenis Bahan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural Journal masuk untuk gaji dari {0} ke {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage penuh, tidak menyimpan"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage penuh, tidak menyimpan"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Faktor Konversi adalah wajib
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Kapasitas Kamar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref
@@ -2802,16 +2853,18 @@
 DocType: Project,Task Completion,tugas Penyelesaian
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Tidak tersedia
 DocType: Appraisal,HR User,HR Pengguna
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Pajak dan Biaya Dikurangi
-apps/erpnext/erpnext/hooks.py +129,Issues,Isu
+apps/erpnext/erpnext/hooks.py +138,Issues,Isu
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status harus menjadi salah satu {0}
 DocType: Sales Invoice,Debit To,Debit Untuk
+DocType: Restaurant Menu Item,Restaurant Menu Item,Item Menu Restoran
 DocType: Delivery Note,Required only for sample item.,Diperlukan hanya untuk item sampel.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Jumlah Aktual Setelah Transaksi
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Tidak ada slip gaji ditemukan antara {0} dan {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Tidak ada slip gaji ditemukan antara {0} dan {1}
 ,Pending SO Items For Purchase Request,Pending SO Items Untuk Pembelian Permintaan
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Penerimaan Mahasiswa
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} dinonaktifkan
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Penerimaan Mahasiswa
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} dinonaktifkan
 DocType: Supplier,Billing Currency,Mata Uang Penagihan
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Ekstra Besar
@@ -2834,6 +2887,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Harap menyebutkan tidak ada kunjungan yang diperlukan
 DocType: Stock Settings,Default Valuation Method,Metode Perhitungan Standar
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,Biaya
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Update sedang berlangsung. Mungkin butuh beberapa saat.
 DocType: Vehicle Log,Fuel Qty,BBM Qty
 DocType: Production Order Operation,Planned Start Time,Rencana Start Time
 DocType: Course,Assessment,Penilaian
@@ -2849,7 +2903,7 @@
 DocType: Price List,Price List Master,Daftar Harga Guru
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Semua Transaksi Penjualan dapat ditandai terhadap beberapa ** Orang Penjualan ** sehingga Anda dapat mengatur dan memonitor target.
 ,S.O. No.,SO No
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Silakan membuat Pelanggan dari Prospek {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Silakan membuat Pelanggan dari Prospek {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Pilih pasien
 DocType: Price List,Applicable for Countries,Berlaku untuk Negara
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Nama parameter
@@ -2860,7 +2914,7 @@
 DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,Abaikan Aturan Harga
 DocType: Employee Education,Graduate,Lulusan
-DocType: Leave Block List,Block Days,Blokir Hari
+DocType: Leave Block List,Block Days,Blok Hari
 DocType: Journal Entry,Excise Entry,Cukai Entri
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +64,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Peringatan: Order Penjualan {0} sudah ada untuk Order Pembelian Pelanggan {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
@@ -2875,32 +2929,34 @@
 1. Returns Policy.
 1. Terms of shipping, if applicable.
 1. Ways of addressing disputes, indemnity, liability, etc.
-1. Address and Contact of your Company.","Syarat dan Ketentuan Standar yang dapat ditambahkan ke Penjualan dan Pembelian. Contoh : 1. Validitas tawaran. 1. Termin Pembayaran (Pembayaran Dimuka, Secara Kredit, pembayaran dimuka sebagian, dll). 1. Apa yang ekstra (atau dibayar oleh Pelanggan). 1. Peringatan keamanan / penggunaan. 1. Garansi jika ada. 1. Kebijakan Pengembalian. 1. Syarat pengiriman, jika berlaku. 1. Cara menangani sengketa, ganti rugi, kewajiban, dll. 1. Alamat dan Kontak Perusahaan Anda."
+1. Address and Contact of your Company.","Syarat dan Ketentuan Standar yang dapat ditambahkan ke Penjualan dan Pembelian. Contoh : 1. Validitas tawaran. 1. Termin Pembayaran (Pembayaran Dimuka, Secara Kredit, pembayaran dimuka sebagian, dll). 1. Apa yang ekstra (atau dibayar oleh Pelanggan). 1. Peringatan keamanan / penggunaan. 1. Garansi jika ada. 1. Kebijakan Retur. 1. Syarat pengiriman, jika berlaku. 1. Cara menangani sengketa, ganti rugi, kewajiban, dll. 1. Alamat dan Kontak Perusahaan Anda."
 DocType: Attendance,Leave Type,Cuti Type
 DocType: Purchase Invoice,Supplier Invoice Details,Pemasok Rincian Faktur
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Beban akun / Difference ({0}) harus akun 'Laba atau Rugi'
 DocType: Project,Copied From,Disalin dari
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Nama error: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Kekurangan
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Nama error: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,Kekurangan
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} tidak terkait dengan {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Kehadiran bagi karyawan {0} sudah ditandai
 DocType: Packing Slip,If more than one package of the same type (for print),Jika lebih dari satu paket dari jenis yang sama (untuk mencetak)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Harap tetapkan pelanggan default di Pengaturan Restoran
 ,Salary Register,Register Gaji
 DocType: Warehouse,Parent Warehouse,Gudang tua
 DocType: C-Form Invoice Detail,Net Total,Jumlah Bersih
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Default BOM tidak ditemukan untuk Item {0} dan Project {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Default BOM tidak ditemukan untuk Item {0} dan Project {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Mendefinisikan berbagai jenis pinjaman
 DocType: Bin,FCFS Rate,FCFS Tingkat
-DocType: Payment Reconciliation Invoice,Outstanding Amount,Jumlah yang luar biasa
+DocType: Payment Reconciliation Invoice,Outstanding Amount,Jumlah belum terbayar
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Waktu (dalam menit)
 DocType: Project Task,Working,Kerja
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Antrian Persediaan (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Tahun Keuangan
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Tahun Keuangan
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} bukan milik Perusahaan {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,Tidak dapat memecahkan kriteria fungsi skor untuk {0}. Pastikan rumusnya benar.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Biaya seperti pada
 DocType: Healthcare Settings,Out Patient Settings,Keluar Pengaturan Pasien
 DocType: Account,Round Off,Membulatkan
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Kuantitas harus positif
 ,Requested Qty,Diminta Qty
 DocType: Tax Rule,Use for Shopping Cart,Gunakan untuk Keranjang Belanja
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Nilai {0} untuk Atribut {1} tidak ada dalam daftar Barang valid Atribut Nilai untuk Item {2}
@@ -2909,7 +2965,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Biaya akan didistribusikan secara proporsional berdasarkan pada item qty atau jumlah, sesuai pilihan Anda"
 DocType: Maintenance Visit,Purposes,Tujuan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Atleast satu item harus dimasukkan dengan kuantitas negatif dalam dokumen kembali
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Tambahkan kursus
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operasi {0} lebih lama daripada jam kerja yang tersedia di workstation {1}, memecah operasi menjadi beberapa operasi"
 ,Requested,Diminta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Tidak ada Keterangan
@@ -2921,8 +2976,10 @@
 DocType: Employee Loan,Repaid/Closed,Dilunasi / Ditutup
 DocType: Item,Total Projected Qty,Total Proyeksi Jumlah
 DocType: Monthly Distribution,Distribution Name,Nama Distribusi
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Supplier&gt; Supplier Type
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Angka penilaian tidak ditemukan untuk Item {0}, yang diperlukan untuk melakukan entri akuntansi untuk {1} {2}. Jika item tersebut bertransaksi sebagai item angka penilaian nol di {1}, mohon sebutkan di tabel Item {1}. Jika tidak, buat transaksi saham masuk untuk item tersebut atau beri nilai valuasi dalam catatan Item, lalu coba kirimkan / batalkan entri ini."
 DocType: Course,Course Code,Kode Course
-apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Kualitas Inspeksi diperlukan untuk Item {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Inspeksi Mutu diperlukan untuk Item {0}
 DocType: POS Settings,Use POS in Offline Mode,Gunakan POS dalam Mode Offline
 DocType: Supplier Scorecard,Supplier Variables,Variabel pemasok
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tingkat di mana mata uang pelanggan dikonversi ke mata uang dasar perusahaan
@@ -2931,17 +2988,17 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Kelola Wilayah Tree.
 DocType: Journal Entry Account,Sales Invoice,Faktur Penjualan
 DocType: Journal Entry Account,Party Balance,Saldo Partai
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,Silakan pilih Terapkan Diskon Pada
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Silakan pilih Terapkan Diskon Pada
 DocType: Company,Default Receivable Account,Standar Piutang Rekening
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Buat Bank Entri untuk total gaji yang dibayarkan untuk kriteria di atas yang dipilih
 DocType: Physician,Physician Schedule,Jadwal dokter
 DocType: Purchase Invoice,Deemed Export,Dianggap ekspor
 DocType: Stock Entry,Material Transfer for Manufacture,Alih Material untuk Produksi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Persentase Diskon dapat diterapkan baik terhadap Daftar Harga atau untuk semua List Price.
-DocType: Purchase Invoice,Half-yearly,Setengah tahun sekali
+DocType: Subscription,Half-yearly,Setengah tahun sekali
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Entri Akuntansi untuk Persediaan
 DocType: Lab Test,LabTest Approver,Pendekatan LabTest
-apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Anda telah menilai kriteria penilaian {}.
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Anda telah memberikan penilaian terhadap kriteria penilaian {}.
 DocType: Vehicle Service,Engine Oil,Oli mesin
 DocType: Sales Invoice,Sales Team1,Penjualan team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Item {0} tidak ada
@@ -2954,7 +3011,7 @@
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Pilih Jenis ...
 DocType: Account,Root Type,Akar Type
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +132,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Tidak dapat kembali lebih dari {1} untuk Item {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +132,Row # {0}: Cannot return more than {1} for Item {2},Baris # {0}: Tidak dapat mengembalikan lebih dari {1} untuk Barang {2}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +45,Plot,Plot
 DocType: Item Group,Show this slideshow at the top of the page,Tampilkan slide ini di bagian atas halaman
 DocType: BOM,Item UOM,Stok Barang UOM
@@ -2963,17 +3020,17 @@
 DocType: Cheque Print Template,Primary Settings,Pengaturan utama
 DocType: Purchase Invoice,Select Supplier Address,Pilih Pemasok Alamat
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +380,Add Employees,Tambahkan Karyawan
-DocType: Purchase Invoice Item,Quality Inspection,Inspeksi Kualitas
+DocType: Purchase Invoice Item,Quality Inspection,Inspeksi Mutu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Ekstra Kecil
 DocType: Company,Standard Template,Template standar
 DocType: Training Event,Theory,Teori
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Peringatan: Material Diminta Qty kurang dari Minimum Order Qty
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Peringatan: Material Diminta Qty kurang dari Minimum Order Qty
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Akun {0} dibekukan
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Badan Hukum / Anak dengan Bagan terpisah Account milik Organisasi.
 DocType: Payment Request,Mute Email,Diamkan Surel
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Makanan, Minuman dan Tembakau"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Hanya dapat melakukan pembayaran terhadap yang belum ditagihkan {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Tingkat komisi tidak dapat lebih besar dari 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Hanya dapat melakukan pembayaran terhadap yang belum ditagihkan {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Tingkat komisi tidak dapat lebih besar dari 100
 DocType: Stock Entry,Subcontract,Kontrak tambahan
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Entrikan {0} terlebih dahulu
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Tidak ada balasan dari
@@ -2991,10 +3048,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Warna
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Kriteria Rencana Penilaian
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Cegah Pesanan Pembelian
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Rentan
 DocType: Patient Appointment,Scheduled,Dijadwalkan
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Meminta kutipan.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Silakan setup Employee Naming System di Human Resource&gt; HR Settings
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Silahkan pilih barang yang ""Barang Stok"" nya  ""Tidak"" dan ""Barang Jualan"" nya ""Ya"", serta tidak ada Bundel Produk lainnya"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Pilih pelanggan
 DocType: Student Log,Academic,Akademis
 DocType: Patient,Personal and Social History,Sejarah Pribadi dan Sosial
 DocType: Fee Schedule,Fee Breakup for each student,Fee Breakup untuk setiap siswa
@@ -3004,7 +3062,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Tingkat Penilaian
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,disel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Daftar Harga Mata uang tidak dipilih
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Daftar Harga Mata uang tidak dipilih
 apps/erpnext/erpnext/config/healthcare.py +46,Results,hasil
 ,Student Monthly Attendance Sheet,Mahasiswa Lembar Kehadiran Bulanan
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Karyawan {0} telah diterapkan untuk {1} antara {2} dan {3}
@@ -3019,7 +3077,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Kelola Partner Penjualan
 DocType: Quality Inspection,Inspection Type,Tipe Inspeksi
 DocType: Fee Validity,Visited yet,Dikunjungi belum
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Gudang dengan transaksi yang ada tidak dapat dikonversi ke grup.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Gudang dengan transaksi yang ada tidak dapat dikonversi ke grup.
 DocType: Assessment Result Tool,Result HTML,hasil HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Kadaluarsa pada
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Tambahkan Siswa
@@ -3046,7 +3104,7 @@
 DocType: Healthcare Settings,Result Printed,Hasil cetak
 DocType: Asset Category Account,Depreciation Expense Account,Akun Beban Penyusutan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Masa percobaan
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Lihat {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Lihat {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Hanya node cuti yang diperbolehkan dalam transaksi
 DocType: Expense Claim,Expense Approver,Approver Klaim Biaya
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Baris {0}: Uang muka dari Pelanggan harus kredit
@@ -3057,7 +3115,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Untuk Datetime
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Jadwal Kursus dihapus:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Log untuk mempertahankan status pengiriman sms
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Tetapkan Target Penjualan
 DocType: Accounts Settings,Make Payment via Journal Entry,Lakukan Pembayaran via Journal Entri
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Printed On
 DocType: Item,Inspection Required before Delivery,Inspeksi Diperlukan sebelum Pengiriman
@@ -3065,7 +3122,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Kegiatan Tertunda
 DocType: Patient Appointment,Reminded,Mengingatkan
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Organisasi Anda
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Organisasi Anda
 DocType: Fee Component,Fees Category,biaya Kategori
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Silahkan masukkan menghilangkan date.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
@@ -3077,7 +3134,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Tingkat Re-Order
 DocType: Company,Chart Of Accounts Template,Grafik Of Account Template
 DocType: Attendance,Attendance Date,Tanggal Kehadiran
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Item Harga diperbarui untuk {0} di Daftar Harga {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Item Harga diperbarui untuk {0} di Daftar Harga {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Gaji perpisahan berdasarkan Produktif dan Pengurangan.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Akun dengan node anak tidak dapat dikonversi ke buku besar
 DocType: Purchase Invoice Item,Accepted Warehouse,Gudang Barang Diterima
@@ -3093,9 +3150,10 @@
 ,Employee Birthday,Ulang Tahun Karyawan
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Alat Batch Kehadiran mahasiswa
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,batas Dilalui
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Terjadwal Upto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Modal Ventura
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Istilah akademik dengan ini &#39;Tahun Akademik&#39; {0} dan &#39;Nama Term&#39; {1} sudah ada. Harap memodifikasi entri ini dan coba lagi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Karena ada transaksi yang ada terhadap barang {0}, Anda tidak dapat mengubah nilai {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Karena ada transaksi yang ada terhadap barang {0}, Anda tidak dapat mengubah nilai {1}"
 DocType: UOM,Must be Whole Number,Harus Nomor Utuh
 DocType: Leave Control Panel,New Leaves Allocated (In Days),cuti baru Dialokasikan (Dalam Hari)
 DocType: Purchase Invoice,Invoice Copy,Salinan faktur
@@ -3105,7 +3163,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Nomor Faktur
 DocType: Shopping Cart Settings,Orders,Order
 DocType: Employee Leave Approver,Leave Approver,Approver Cuti
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Silakan pilih satu batch
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Silakan pilih satu batch
 DocType: Assessment Group,Assessment Group Name,Nama penilaian Grup
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Bahan Ditransfer untuk Produksi
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Pengguna dengan peran ""Expense Approver"""
@@ -3120,7 +3178,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Periode Penutupan Entri
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Pilih Departemen ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Biaya Center dengan transaksi yang ada tidak dapat dikonversi ke grup
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Jumlah {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Jumlah {0} {1} {2} {3}
 DocType: Account,Depreciation,Penyusutan
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Supplier (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Alat Absensi Karyawan
@@ -3131,10 +3189,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,Entries pembayaran {0} adalah un-linked
 DocType: GL Entry,Voucher No,Voucher Tidak ada
 ,Lead Owner Efficiency,Efisiensi Pemilik Prospek
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Paling populer
 DocType: Leave Allocation,Leave Allocation,Alokasi Cuti
 DocType: Payment Request,Recipient Message And Payment Details,Penerima Pesan Dan Rincian Pembayaran
 DocType: Training Event,Trainer Email,Email Pelatih
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Permintaan Material {0} dibuat
+DocType: Restaurant Reservation,No of People,Tidak ada orang
 DocType: Production Planning Tool,Include sub-contracted raw materials,Termasuk bahan baku sub-kontrak
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Template istilah atau kontrak.
 DocType: Purchase Invoice,Address and Contact,Alamat dan Kontak
@@ -3143,18 +3203,19 @@
 DocType: Supplier,Last Day of the Next Month,Hari terakhir dari Bulan Depan
 DocType: Support Settings,Auto close Issue after 7 days,Auto Issue dekat setelah 7 hari
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Cuti tidak dapat dialokasikan sebelum {0}, saldo cuti sudah pernah membawa-diteruskan dalam catatan alokasi cuti masa depan {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Catatan: Tanggal Jatuh Tempo / Referensi melebihi {0} hari dari yang diperbolehkan untuk kredit pelanggan
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Catatan: Tanggal Jatuh Tempo / Referensi melebihi {0} hari dari yang diperbolehkan untuk kredit pelanggan
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Mahasiswa Pemohon
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL UNTUK RECIPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,Akun Penyusutan Akumulasi
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Email ini otomatis terkirim
 DocType: Stock Settings,Freeze Stock Entries,Bekukan Entri Persediaan
-DocType: Program Enrollment,Boarding Student,Pesantren
+DocType: Program Enrollment,Boarding Student,Murid Asrama
 DocType: Asset,Expected Value After Useful Life,Nilai diharapkan Setelah Hidup Berguna
 DocType: Item,Reorder level based on Warehouse,Tingkat Re-Order berdasarkan Gudang
 DocType: Activity Cost,Billing Rate,Tarip penagihan
-,Qty to Deliver,Qty untuk Dikirim
+,Qty to Deliver,Kuantitas Pengiriman
 ,Stock Analytics,Analisis Persediaan
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Operasi tidak dapat dibiarkan kosong
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Operasi tidak dapat dibiarkan kosong
 DocType: Maintenance Visit Purpose,Against Document Detail No,Terhadap Detail Dokumen No.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Partai Type adalah wajib
 DocType: Quality Inspection,Outgoing,Keluaran
@@ -3176,7 +3237,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Pilih siswa secara manual untuk Activity based Group
 DocType: Journal Entry,User Remark,Keterangan Pengguna
 DocType: Lead,Market Segment,Segmen Pasar
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Dibayar Jumlah tidak dapat lebih besar dari jumlah total outstanding negatif {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Dibayar Jumlah tidak dapat lebih besar dari jumlah total outstanding negatif {0}
 DocType: Supplier Scorecard Period,Variables,Variabel
 DocType: Employee Internal Work History,Employee Internal Work History,Riwayat Kerja Karyawan Internal
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Penutup (Dr)
@@ -3195,7 +3256,7 @@
 DocType: Payment Request,Reference Details,Detail referensi
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Nilai diharapkan Setelah Hidup Berguna harus kurang dari Gross Jumlah Pembelian
 DocType: Sales Invoice Item,Available Qty at Warehouse,Jumlah Tersedia di Gudang
-apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Jumlah Tagihan
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Nilai Tagihan
 DocType: Asset,Double Declining Balance,Ganda Saldo Menurun
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +179,Closed order cannot be cancelled. Unclose to cancel.,Agar tertutup tidak dapat dibatalkan. Unclose untuk membatalkan.
 DocType: Patient Relation,Father,Ayah
@@ -3205,23 +3266,24 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Dapatkan Update
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Akun {2} bukan milik Perusahaan {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Permintaan Material {0} dibatalkan atau dihentikan
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Manajemen Cuti
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Manajemen Cuti
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Group by Akun
 DocType: Sales Order,Fully Delivered,Sepenuhnya Terkirim
 DocType: Lead,Lower Income,Penghasilan rendah
+DocType: Restaurant Order Entry,Current Order,Pesanan saat ini
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Sumber dan target gudang tidak bisa sama untuk baris {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Akun Perbedaan harus jenis rekening Aset / Kewajiban, karena Rekonsiliasi Persediaan adalah Entri Pembukaan"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Dicairkan Jumlah tidak dapat lebih besar dari Jumlah Pinjaman {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Buka Program
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Nomor Purchase Order yang diperlukan untuk Item {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Pesanan produksi tidak diciptakan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Pesanan produksi tidak diciptakan
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Tanggal Mulai' harus sebelum 'Tanggal Akhir'
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},tidak dapat mengubah status sebagai mahasiswa {0} terkait dengan aplikasi mahasiswa {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},tidak dapat mengubah status sebagai mahasiswa {0} terkait dengan aplikasi mahasiswa {1}
 DocType: Asset,Fully Depreciated,sepenuhnya disusutkan
 ,Stock Projected Qty,Proyeksi Jumlah Persediaan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Pelanggan {0} tidak termasuk proyek {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Pelanggan {0} tidak termasuk proyek {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Kehadiran ditandai HTML
-apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Kutipan proposal, tawaran Anda telah dikirim ke pelanggan Anda"
+apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Penawaran adalah proposal, tawaran yang anda kirim kepada pelanggan"
 DocType: Sales Order,Customer's Purchase Order,Order Pembelian Pelanggan
 DocType: Consultation,Patient,Sabar
 apps/erpnext/erpnext/config/stock.py +117,Serial No and Batch,Serial dan Batch
@@ -3230,11 +3292,12 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Silakan mengatur Jumlah Penyusutan Dipesan
 DocType: Supplier Scorecard Period,Calculations,Perhitungan
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Nilai atau Qty
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Produksi Pesanan tidak dapat diangkat untuk:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Produksi Pesanan tidak dapat diangkat untuk:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Menit
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Harap tentukan Seri Penamaan untuk {0} melalui Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Invoice,Purchase Taxes and Charges,Pajak Pembelian dan Biaya
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Pergi ke Pemasok
-,Qty to Receive,Qty untuk Menerima
+,Qty to Receive,Kuantitas untuk diterima
 DocType: Leave Block List,Leave Block List Allowed,Cuti Block List Diizinkan
 DocType: Grading Scale Interval,Grading Scale Interval,Grading Scale Interval
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Beban Klaim untuk Kendaraan Log {0}
@@ -3244,8 +3307,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Kredit Untuk akun harus rekening Neraca
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Semua Jenis Supplier
 DocType: Global Defaults,Disable In Words,Nonaktifkan Dalam Kata-kata
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,Item Code adalah wajib karena Item tidak secara otomatis nomor
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Quotation {0} bukan dari jenis {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,Item Code adalah wajib karena Item tidak secara otomatis nomor
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Penawaran {0} bukan jenis {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Jadwal pemeliharaan Stok Barang
 DocType: Sales Order,%  Delivered,% Terkirim
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Harap atur ID Email untuk Siswa untuk mengirim Permintaan Pembayaran
@@ -3266,23 +3329,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Saldo Pembukaan Ekuitas
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Rekonsiliasi
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,sisa
 DocType: Appraisal,Appraisal,Penilaian
 DocType: Purchase Invoice,GST Details,Rincian GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},Email dikirim ke pemasok {0}
+DocType: Item,Default Sales Unit of Measure,Unit Penjualan Default Ukur
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Tanggal diulang
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Penandatangan yang Sah
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Cuti approver harus menjadi salah satu {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Buat Biaya
-DocType: Hub Settings,Seller Email,Email Penjual
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total Biaya Pembelian (Purchase Invoice via)
 DocType: Training Event,Start Time,Waktu Mulai
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Pilih Kuantitas
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Pilih Kuantitas
 DocType: Customs Tariff Number,Customs Tariff Number,Tarif Bea Nomor
 DocType: Patient Appointment,Patient Appointment,Penunjukan Pasien
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Menyetujui Peran tidak bisa sama dengan peran aturan yang Berlaku Untuk
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Berhenti berlangganan dari Email Ringkasan ini
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Berhenti berlangganan dari Email Ringkasan ini
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Dapatkan Pemasok Dengan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} tidak ditemukan untuk Item {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Pergi ke kursus
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Pesan Terkirim
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Akun dengan sub-akun tidak dapat ditetapkan sebagai buku
@@ -3295,11 +3361,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Bahan Ditransfer untuk Manufaktur
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Akun {0} tidak ada
 DocType: Project,Project Type,Jenis proyek
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Tugas Anak ada untuk Tugas ini. Anda tidak dapat menghapus tugas ini.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Entah Target qty atau jumlah target adalah wajib.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Biaya berbagai kegiatan
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Tidak ada hasil lagi
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Biaya berbagai kegiatan
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Mengatur Acara untuk {0}, karena karyawan yang melekat di bawah Penjualan Orang tidak memiliki User ID {1}"
 DocType: Timesheet,Billing Details,Detail penagihan
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Sumber dan gudang target harus berbeda
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Sumber dan gudang target harus berbeda
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Tidak diizinkan memperbarui transaksi persediaan lebih tua dari {0}
 DocType: Purchase Invoice Item,PR Detail,PR Detil
 DocType: Sales Order,Fully Billed,Sepenuhnya Ditagih
@@ -3325,7 +3393,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Transfer Kliring
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Periksa Semua
 DocType: Vehicle Log,Invoice Ref,faktur Ref
-DocType: Purchase Order,Recurring Order,Order Berulang
 DocType: Company,Default Income Account,Akun Pendapatan standar
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Kelompok Pelanggan / Pelanggan
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Tertutup Fiskal Tahun Laba / Rugi (Kredit)
@@ -3339,9 +3406,9 @@
 DocType: Patient,A Negative,Negatif
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Tidak lebih untuk ditampilkan.
 DocType: Lead,From Customer,Dari Pelanggan
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Panggilan
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Panggilan
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Produk
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,Batches
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,Batches
 DocType: Project,Total Costing Amount (via Time Logs),Jumlah Total Biaya (via Waktu Log)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Jadikan Jadwal Biaya
 DocType: Purchase Order Item Supplied,Stock UOM,UOM Persediaan
@@ -3352,7 +3419,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Proyeksi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +222,Serial No {0} does not belong to Warehouse {1},Serial ada {0} bukan milik Gudang {1}
 apps/erpnext/erpnext/controllers/status_updater.py +174,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Catatan: Sistem tidak akan memeriksa over-pengiriman dan over-booking untuk Item {0} kuantitas atau jumlah 0
-DocType: Notification Control,Quotation Message,Quotation Pesan
+DocType: Notification Control,Quotation Message,Pesan Penawaran
 DocType: Employee Loan,Employee Loan Application,Karyawan Aplikasi Kredit
 DocType: Issue,Opening Date,Tanggal Pembukaan
 apps/erpnext/erpnext/schools/api.py +80,Attendance has been marked successfully.,Kehadiran telah ditandai berhasil.
@@ -3365,16 +3432,15 @@
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Daun dan Liburan
 DocType: School Settings,Current Academic Term,Istilah Akademik Saat Ini
 DocType: Sales Order,Not Billed,Tidak Ditagih
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Kedua Gudang harus merupakan gudang dari Perusahaan yang sama
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Kedua Gudang harus merupakan gudang dari Perusahaan yang sama
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Tidak ada kontak belum ditambahkan.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Jumlah Nilai Voucher Landing Cost
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Tagihan diajukan oleh Pemasok.
 DocType: POS Profile,Write Off Account,Akun Write Off
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +78,Debit Note Amt,Catatan Debet Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Jumlah Diskon
-DocType: Purchase Invoice,Return Against Purchase Invoice,Kembali Terhadap Pembelian Faktur
+DocType: Purchase Invoice,Return Against Purchase Invoice,Retur Terhadap Faktur Pembelian
 DocType: Item,Warranty Period (in days),Masa Garansi (dalam hari)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',update `tabPatient Appointment` set sales_invoice = &#39;{0}&#39; dimana nama = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Hubungan dengan Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Kas Bersih dari Operasi
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Item 4
@@ -3382,9 +3448,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +30,Sub-contracting,Sub-kontraktor
 DocType: Journal Entry Account,Journal Entry Account,Akun Jurnal Entri
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Kelompok mahasiswa
-DocType: Shopping Cart Settings,Quotation Series,Quotation Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Sebuah item yang ada dengan nama yang sama ({0}), silakan mengubah nama kelompok Stok Barang atau mengubah nama item"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Silakan pilih pelanggan
+DocType: Shopping Cart Settings,Quotation Series,Seri Penawaran
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Sebuah item yang ada dengan nama yang sama ({0}), silakan mengubah nama kelompok Stok Barang atau mengubah nama item"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Silakan pilih pelanggan
 DocType: C-Form,I,saya
 DocType: Company,Asset Depreciation Cost Center,Asset Pusat Penyusutan Biaya
 DocType: Sales Order Item,Sales Order Date,Tanggal Nota Penjualan
@@ -3393,6 +3459,7 @@
 DocType: Assessment Plan,Assessment Plan,Rencana penilaian
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Pelanggan {0} dibuat
 DocType: Stock Settings,Limit Percent,batas Persen
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Saat ini tidak ada stok yang tersedia di gudang manapun
 ,Payment Period Based On Invoice Date,Masa Pembayaran Berdasarkan Faktur Tanggal
 DocType: Sample Collection,No. of print,Jumlah cetak
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Hilang Kurs mata uang Tarif untuk {0}
@@ -3448,13 +3515,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pay Gross - Jumlah Pengurangan - Pelunasan Pinjaman
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,BOM Lancar dan New BOM tidak bisa sama
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Slip Gaji ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Slip Gaji ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Tanggal Of Pensiun harus lebih besar dari Tanggal Bergabung
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Ada kesalahan saat penjadwalan kursus pada:
 DocType: Sales Invoice,Against Income Account,Terhadap Akun Pendapatan
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Terkirim
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: qty Memerintahkan {1} tidak bisa kurang dari qty minimum order {2} (didefinisikan dalam Butir).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: qty Memerintahkan {1} tidak bisa kurang dari qty minimum order {2} (didefinisikan dalam Butir).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Bulanan Persentase Distribusi
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Silahkan login sebagai pengguna lain.
 DocType: Territory,Territory Targets,Target Wilayah
 DocType: Delivery Note,Transporter Info,Info Transporter
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Silahkan mengatur default {0} di Perusahaan {1}
@@ -3462,15 +3530,16 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,pemasok yang sama telah dimasukkan beberapa kali
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Laba Kotor / Rugi
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Purchase Order Stok Barang Disediakan
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Nama perusahaan tidak dapat perusahaan
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Nama perusahaan tidak dapat perusahaan
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Surat Kepala untuk mencetak template.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Judul untuk mencetak template misalnya Proforma Invoice.
 DocType: Program Enrollment,Walking,Berjalan
 DocType: Student Guardian,Student Guardian,Wali murid
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Jenis penilaian biaya tidak dapat ditandai sebagai Inklusif
 DocType: POS Profile,Update Stock,Perbarui Persediaan
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,dalam berlangganan
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM berbeda akan menyebabkan kesalahan Berat Bersih (Total). Pastikan Berat Bersih untuk setiap barang memakai UOM yang sama.
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Tingkat
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Tingkat BOM
 DocType: Asset,Journal Entry for Scrap,Jurnal masuk untuk Scrap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Silakan tarik item dari Pengiriman Note
 apps/erpnext/erpnext/accounts/utils.py +467,Journal Entries {0} are un-linked,Entri jurnal {0} un-linked
@@ -3487,7 +3556,7 @@
 DocType: Sales Invoice Item,Delivery Note Item,Pengiriman Stok Barang Note
 DocType: Expense Claim,Task,Tugas
 DocType: Purchase Taxes and Charges,Reference Row #,Referensi Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Nomor batch adalah wajib untuk Item {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Nomor batch adalah wajib untuk Persediaan {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Ini adalah orang penjualan akar dan tidak dapat diedit.
 DocType: Salary Detail,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ","Jika dipilih, nilai yang ditentukan atau dihitung dalam komponen ini tidak akan berkontribusi pada pendapatan atau deduksi. Namun, nilai itu bisa direferensikan oleh komponen lain yang bisa ditambah atau dikurangkan."
 ,Stock Ledger,Buku Persediaan
@@ -3516,15 +3585,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Pengguna Sistem (login) ID. Jika diset, itu akan menjadi default untuk semua bentuk HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Dari {1}
 DocType: Task,depends_on,tergantung pada
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Antri untuk memperbarui harga terbaru di semua Bill of Material. Mungkin perlu beberapa menit.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,"Diantrikan untuk memperbaharui harga terakhir di ""Bill of Material"". Akan memakan waktu beberapa menit."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nama Akun baru. Catatan: Jangan membuat akun untuk Pelanggan dan Pemasok
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Negara bijaksana Alamat bawaan Template
 DocType: Sales Order Item,Supplier delivers to Customer,Pemasok mengirim ke Pelanggan
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (#Form/Item/{0}) tidak tersedia
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Karena / Referensi Tanggal tidak boleh setelah {0}
+,Sales Payment Summary,Ringkasan Pembayaran Penjualan
+DocType: Restaurant,Restaurant,Restoran
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Karena / Referensi Tanggal tidak boleh setelah {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data Impor dan Ekspor
 DocType: Patient,Account Details,Rincian Account
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Tidak ada siswa Ditemukan
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Tidak ada siswa Ditemukan
 DocType: Medical Department,Medical Department,Departemen Kesehatan
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Kriteria penilaian scorecard pemasok
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Faktur Posting Tanggal
@@ -3535,7 +3606,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Silakan pilih Posting Tanggal sebelum memilih Partai
 DocType: Program Enrollment,School House,Asrama Sekolah
 DocType: Serial No,Out of AMC,Dari AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Silakan pilih Kutipan
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Silakan pilih Kutipan
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Jumlah Penyusutan Memesan tidak dapat lebih besar dari total jumlah Penyusutan
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Membuat Maintenance Visit
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,Silahkan hubungi untuk pengguna yang memiliki penjualan Guru Manajer {0} peran
@@ -3543,7 +3614,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Perusahaan (bukan Pelanggan atau Pemasok) Utama.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Hal ini didasarkan pada kehadiran mahasiswa ini
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Tidak ada siswa
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Menambahkan item lebih atau bentuk penuh terbuka
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Menambahkan item atau buka formulir selengkapnya
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Catatan pengiriman {0} harus dibatalkan sebelum membatalkan Sales Order ini
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Buka Pengguna
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Jumlah yang dibayarkan + Write Off Jumlah tidak bisa lebih besar dari Grand Total
@@ -3563,37 +3634,40 @@
 DocType: Fee Schedule,Fee Schedule,Jadwal biaya
 DocType: Hub Settings,Publish Availability,Publikasikan Ketersediaan
 DocType: Company,Create Chart Of Accounts Based On,Buat Bagan Of Account Berbasis Pada
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Tidak dapat mengubahnya menjadi non-grup. Tugas Anak ada.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Tanggal Lahir tidak dapat lebih besar dari saat ini.
 ,Stock Ageing,Usia Persediaan
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Mahasiswa {0} ada terhadap pemohon mahasiswa {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Penyesuaian Pembulatan (Mata Uang Perusahaan)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Timesheet
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Timesheet
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' dinonaktifkan
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ditetapkan sebagai Terbuka
 DocType: Cheque Print Template,Scanned Cheque,Cek Terpindai
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Kirim email otomatis ke Kontak untuk Pengiriman transaksi.
 DocType: Timesheet,Total Billable Amount,Jumlah Total Ditagih
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Butir 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Pesanan masuk
 DocType: Purchase Order,Customer Contact Email,Email Kontak Pelanggan
 DocType: Warranty Claim,Item and Warranty Details,Item dan Garansi Detail
 DocType: Sales Team,Contribution (%),Kontribusi (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Catatan: Entry Pembayaran tidak akan dibuat karena 'Cash atau Rekening Bank tidak ditentukan
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Project {0} sudah ada
 DocType: Medical Department,Nursing User,Pengguna perawatan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Tanggung Jawab
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Masa berlaku dari kutipan ini telah berakhir.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Masa berlaku dari kutipan ini telah berakhir.
 DocType: Expense Claim Account,Expense Claim Account,Akun Beban Klaim
 DocType: Accounts Settings,Allow Stale Exchange Rates,Biarkan nilai tukar basi
 DocType: Sales Person,Sales Person Name,Penjualan Person Nama
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Entrikan minimal 1 faktur dalam tabel
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Tambah Pengguna
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Tambah Pengguna
 DocType: POS Item Group,Item Group,Item Grup
 DocType: Item,Safety Stock,Persediaan Aman
 DocType: Healthcare Settings,Healthcare Settings,Pengaturan Kesehatan
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Kemajuan% untuk tugas tidak bisa lebih dari 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Kemajuan% untuk tugas tidak bisa lebih dari 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Sebelum rekonsiliasi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Untuk {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Pajak dan Biaya Ditambahkan (Perusahaan Mata Uang)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Pajak Row {0} harus memiliki akun Pajak jenis atau Penghasilan atau Beban atau Dibebankan
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Pajak Row {0} harus memiliki akun Pajak jenis atau Penghasilan atau Beban atau Dibebankan
 DocType: Sales Order,Partly Billed,Sebagian Ditagih
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Item {0} harus menjadi Asset barang Tetap
 DocType: Item,Default BOM,BOM Standar
@@ -3609,6 +3683,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,Variabel
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Dari Delivery Note
 DocType: Student,Student Email Address,Alamat Email Siswa
+DocType: Item,Hub Warehouse,Gudang Hub
 DocType: Physician Schedule Time Slot,From Time,Dari Waktu
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Persediaan:
 DocType: Notification Control,Custom Message,Custom Pesan
@@ -3616,9 +3691,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,Kas atau Rekening Bank wajib untuk membuat entri pembayaran
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Alamat siswa
 DocType: Purchase Invoice,Price List Exchange Rate,Daftar Harga Tukar
-DocType: Purchase Invoice Item,Rate,Menilai
+DocType: POS Profile,POS Profile Name,Nama Profil POS
+DocType: Purchase Invoice Item,Rate,Harga
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Menginternir
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Nama alamat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Nama alamat
 DocType: Stock Entry,From BOM,Dari BOM
 DocType: Assessment Code,Assessment Code,Kode penilaian
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Dasar
@@ -3632,11 +3708,12 @@
 DocType: Salary Slip,Salary Structure,Struktur Gaji
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Maskapai Penerbangan
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Isu Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Isu Material
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Terjadi kesalahan saat membuat berulang
 DocType: Material Request Item,For Warehouse,Untuk Gudang
 DocType: Employee,Offer Date,Penawaran Tanggal
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Quotation
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Anda berada dalam mode offline. Anda tidak akan dapat memuat sampai Anda memiliki jaringan.
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Penawaran
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Anda berada dalam mode offline. Anda tidak akan dapat memuat sampai Anda memiliki jaringan.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Tidak Grup Pelajar dibuat.
 DocType: Purchase Invoice Item,Serial No,Serial ada
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Bulanan Pembayaran Jumlah tidak dapat lebih besar dari Jumlah Pinjaman
@@ -3646,17 +3723,18 @@
 DocType: Salary Slip,Total Working Hours,Jumlah Jam Kerja
 DocType: Subscription,Next Schedule Date,Jadwal Jadwal Berikutnya
 DocType: Stock Entry,Including items for sub assemblies,Termasuk item untuk sub rakitan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Masukkan nilai harus positif
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Semua Wilayah
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Masukkan nilai harus positif
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Semua Wilayah
 DocType: Purchase Invoice,Items,Items
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Mahasiswa sudah terdaftar.
 DocType: Fiscal Year,Year Name,Nama Tahun
 DocType: Process Payroll,Process Payroll,Proses Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Ada lebih dari hari kerja libur bulan ini.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Ada lebih dari hari kerja libur bulan ini.
 DocType: Product Bundle Item,Product Bundle Item,Barang Bundel Produk
 DocType: Sales Partner,Sales Partner Name,Penjualan Mitra Nama
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Permintaan Kutipan
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Permintaan Kutipan
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimum Faktur Jumlah
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hematologi
 DocType: Normal Test Items,Normal Test Items,Item Uji Normal
 DocType: Student Language,Student Language,Bahasa siswa
 apps/erpnext/erpnext/config/selling.py +23,Customers,Pelanggan
@@ -3667,10 +3745,11 @@
 DocType: Issue,Opening Time,Membuka Waktu
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Dari dan Untuk tanggal yang Anda inginkan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Efek & Bursa Komoditi
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standar Satuan Ukur untuk Variant &#39;{0}&#39; harus sama seperti di Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standar Satuan Ukur untuk Variant &#39;{0}&#39; harus sama seperti di Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Hitung Berbasis On
 DocType: Delivery Note Item,From Warehouse,Dari Gudang
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Tidak ada Item dengan Bill of Material untuk Industri
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Tidak ada Item dengan Bill of Material untuk Industri
+DocType: Restaurant,Default Customer,Pelanggan default
 DocType: Assessment Plan,Supervisor Name,Nama pengawas
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Jangan mengkonfirmasi jika janji dibuat untuk hari yang sama
 DocType: Program Enrollment Course,Program Enrollment Course,Kursus Pendaftaran Program
@@ -3697,7 +3776,7 @@
 DocType: Payment Entry,Internal Transfer,internal transfer
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Akun anak ada untuk akun ini. Anda tidak dapat menghapus akun ini.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Entah sasaran qty atau jumlah target adalah wajib
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Tidak ada standar BOM ada untuk Item {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Tidak ada standar BOM ada untuk Item {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Silakan pilih Posting Tanggal terlebih dahulu
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Tanggal Pembukaan harus sebelum Tanggal Penutupan
 DocType: Leave Control Panel,Carry Forward,Carry Teruskan
@@ -3711,9 +3790,9 @@
 DocType: Mode of Payment,General,Umum
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Komunikasi terakhir
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +355,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Tidak bisa mengurangi ketika kategori adalah untuk 'Penilaian' atau 'Penilaian dan Total'
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +234,Serial Nos Required for Serialized Item {0},Serial Nos Diperlukan untuk Serial Stok Barang {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +234,Serial Nos Required for Serialized Item {0},Nomor Seri Diperlukan untuk Barang Bernomor Seri {0}
 apps/erpnext/erpnext/config/accounts.py +152,Match Payments with Invoices,Pembayaran pertandingan dengan Faktur
-DocType: Journal Entry,Bank Entry,Bank Entri
+DocType: Journal Entry,Bank Entry,Entri Bank
 DocType: Authorization Rule,Applicable To (Designation),Berlaku Untuk (Penunjukan)
 ,Profitability Analysis,Analisis profitabilitas
 DocType: Fees,Student Email,Email Siswa
@@ -3732,6 +3811,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Total Hadir
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,Laporan akuntansi
 DocType: Drug Prescription,Hour,Jam
+DocType: Restaurant Order Entry,Last Sales Invoice,Faktur penjualan terakhir
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,No. Seri baru tidak dapat memiliki Gudang. Gudang harus diatur oleh Entri Persediaan atau Nota Pembelian
 DocType: Lead,Lead Type,Jenis Prospek
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Anda tidak berwenang untuk menyetujui cuti di Blok Tanggal
@@ -3766,64 +3846,66 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Buat Pengguna
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,Gram
 DocType: Supplier Scorecard,Per Month,Per bulan
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Kuantitas untuk Produksi harus lebih besar dari 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Kuantitas untuk Produksi harus lebih besar dari 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Kunjungi laporan untuk panggilan pemeliharaan.
 DocType: Stock Entry,Update Rate and Availability,Update Rate dan Ketersediaan
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Persentase Anda diijinkan untuk menerima atau memberikan lebih terhadap kuantitas memerintahkan. Misalnya: Jika Anda telah memesan 100 unit. dan Tunjangan Anda adalah 10% maka Anda diperbolehkan untuk menerima 110 unit.
 DocType: POS Customer Group,Customer Group,Kelompok Pelanggan
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),ID Batch Baru (Opsional)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),ID Batch Baru (Opsional)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Rekening pengeluaran adalah wajib untuk item {0}
 DocType: BOM,Website Description,Website Description
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Perubahan Bersih Ekuitas
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Terbaru
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Batalkan Purchase Invoice {0} pertama
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Alamat Email harus unik, sudah ada untuk {0}"
 DocType: Serial No,AMC Expiry Date,Tanggal Kadaluarsa AMC
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,Penerimaan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,Penerimaan
 ,Sales Register,Daftar Penjualan
 DocType: Daily Work Summary Settings Company,Send Emails At,Kirim Email pada
-DocType: Quotation,Quotation Lost Reason,Quotation Kehilangan Alasan
+DocType: Quotation,Quotation Lost Reason,Alasan Kalah Penawaran
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Pilih Domain Anda
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',pilih * dari tabPatient dimana name = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},referensi transaksi tidak ada {0} tertanggal {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},referensi transaksi tidak ada {0} tertanggal {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Tidak ada yang mengedit.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Tampilan formulir
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Ringkasan untuk bulan ini dan kegiatan yang tertunda
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Tampilan formulir
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Ringkasan untuk bulan ini dan kegiatan yang tertunda
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Tambahkan pengguna ke organisasi Anda, selain dirimu sendiri."
 DocType: Customer Group,Customer Group Name,Nama Kelompok Pelanggan
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Belum ada pelanggan
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Belum ada pelanggan
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Laporan arus kas
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Jumlah Pinjaman tidak dapat melebihi Jumlah pinjaman maksimum {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Lisensi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Hapus Invoice ini {0} dari C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Hapus Invoice ini {0} dari C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Silakan pilih Carry Teruskan jika Anda juga ingin menyertakan keseimbangan fiskal tahun sebelumnya cuti tahun fiskal ini
 DocType: GL Entry,Against Voucher Type,Terhadap Tipe Voucher
 DocType: Physician,Phone (R),Telepon (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Slot waktu ditambahkan
 DocType: Item,Attributes,Atribut
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Aktifkan Template
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Harap tentukan Seri Penamaan untuk {0} melalui Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Cukup masukkan Write Off Akun
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Order terakhir Tanggal
-DocType: Patient,B Negative,B negatif
+DocType: Patient,B Negative,B Negatif
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Akun {0} bukan milik perusahaan {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Nomor Seri di baris {0} tidak cocok dengan Catatan Pengiriman
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Nomor Seri di baris {0} tidak cocok dengan Catatan Pengiriman
 DocType: Student,Guardian Details,Detail wali
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Kehadiran untuk beberapa karyawan
 DocType: Vehicle,Chassis No,chassis ada
 DocType: Payment Request,Initiated,Diprakarsai
 DocType: Production Order,Planned Start Date,Direncanakan Tanggal Mulai
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Silahkan pilih BOM
 DocType: Serial No,Creation Document Type,Pembuatan Dokumen Type
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Tanggal akhir harus lebih besar dari tanggal mulai
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Tanggal akhir harus lebih besar dari tanggal mulai
 DocType: Leave Type,Is Encash,Apakah menjual
 DocType: Leave Allocation,New Leaves Allocated,cuti baru Dialokasikan
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Data proyek-bijaksana tidak tersedia untuk Quotation
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Akhiri
 DocType: Project,Expected End Date,Diharapkan Tanggal Akhir
 DocType: Budget Account,Budget Amount,Jumlah anggaran
 DocType: Appraisal Template,Appraisal Template Title,Judul Template Penilaian
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Dari Tanggal {0} Karyawan {1} tidak boleh sebelum Tanggal bergabung karyawan {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Komersial
 DocType: Patient,Alcohol Current Use,Penggunaan Alkohol saat ini
+DocType: Student Admission Program,Student Admission Program,Program Penerimaan Mahasiswa
 DocType: Payment Entry,Account Paid To,Akun Dibayar Untuk
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Induk Barang {0} tidak boleh merupakan Barang Persediaan
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Semua Produk atau Jasa.
@@ -3832,30 +3914,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Anggaran untuk Akun {1} terhadap {2} {3} adalah {4}. Ini akan berlebih sebanyak {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Akun harus bertipe &#39;Fixed Asset&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Out Qty
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Aturan untuk menghitung jumlah pengiriman untuk penjualan
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,dan Unchcked Disabled in
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Series adalah wajib
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Jasa Keuangan
 DocType: Student Sibling,Student ID,Identitas Siswa
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Jenis kegiatan untuk Waktu Log
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Email pemasok
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Jenis kegiatan untuk Waktu Log
 DocType: Tax Rule,Sales,Penjualan
-DocType: Stock Entry Detail,Basic Amount,Jumlah Dasar
+DocType: Stock Entry Detail,Basic Amount,Nilai Dasar
 DocType: Training Event,Exam,Ujian
 DocType: Complaint,Complaint,Keluhan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Gudang diperlukan untuk persediaan Barang {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Gudang diperlukan untuk Barang Persediaan{0}
 DocType: Leave Allocation,Unused leaves,cuti terpakai
 DocType: Patient,Alcohol Past Use,Penggunaan Alkohol yang Telah Lalu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Negara penagihan
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Fetch meledak BOM (termasuk sub-rakitan)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Fetch meledak BOM (termasuk sub-rakitan)
 DocType: Authorization Rule,Applicable To (Employee),Berlaku Untuk (Karyawan)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Due Date adalah wajib
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Due Date adalah wajib
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Kenaikan untuk Atribut {0} tidak dapat 0
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD Dari
 DocType: Naming Series,Setup Series,Pengaturan Series
 DocType: Payment Reconciliation,To Invoice Date,Untuk Faktur Tanggal
 DocType: Supplier,Contact HTML,Hubungi HTML
 ,Inactive Customers,Pelanggan tidak aktif
+DocType: Student Admission Program,Maximum Age,Usia Maksimum
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Nota Penerimaan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Bagaimana Aturan Harga diterapkan?
@@ -3874,6 +3958,7 @@
 DocType: GL Entry,Remarks,Keterangan
 DocType: Payment Entry,Account Paid From,Akun Dibayar Dari
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Bahan Baku Item Code
+DocType: Task,Parent Task,Tugas orang tua
 DocType: Journal Entry,Write Off Based On,Menulis Off Berbasis On
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Membuat Prospek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Cetak dan Alat Tulis
@@ -3882,19 +3967,19 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Gaji sudah diproses untuk periode antara {0} dan {1}, Tinggalkan periode aplikasi tidak dapat antara rentang tanggal ini."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Catatan instalasi untuk No Serial
 DocType: Guardian Interest,Guardian Interest,wali Tujuan
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Tetapkan nilai default untuk Faktur POS
 apps/erpnext/erpnext/config/hr.py +177,Training,Latihan
 DocType: Timesheet,Employee Detail,Detil karyawan
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ID Email Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,Hari berikutnya Tanggal dan Ulangi pada Hari Bulan harus sama
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Hari berikutnya Tanggal dan Ulangi pada Hari Bulan harus sama
 DocType: Lab Prescription,Test Code,Kode uji
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Pengaturan untuk homepage website
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ tidak diizinkan untuk {0} karena kartu skor berdiri dari {1}
 DocType: Offer Letter,Awaiting Response,Menunggu Respon
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Di atas
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Jumlah Total {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},atribut tidak valid {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Jumlah Total {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},atribut tidak valid {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Sebutkan jika akun hutang non-standar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Item yang sama telah beberapa kali dimasukkan. {daftar}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Harap pilih kelompok penilaian selain &#39;Semua Kelompok Penilaian&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Baris {0}: Pusat biaya diperlukan untuk item {1}
 DocType: Training Event Employee,Optional,Pilihan
@@ -3904,7 +3989,7 @@
 DocType: Holiday List,Weekly Off,Weekly Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Untuk misalnya 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +96,Provisional Profit / Loss (Credit),Laba Provisional / Rugi (Kredit)
-DocType: Sales Invoice,Return Against Sales Invoice,Kembali Terhadap Penjualan Faktur
+DocType: Sales Invoice,Return Against Sales Invoice,Retur Terhadap Faktur Penjualan
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Butir 5
 DocType: Serial No,Creation Time,Waktu Pembuatan
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Total Pendapatan
@@ -3917,19 +4002,20 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},"{0} {1}: ""Cost Center"" adalah wajib untuk Item {2}"
 DocType: Vehicle,Policy No,Kebijakan Tidak ada
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Dapatkan Barang-barang dari Bundel Produk
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Karena ada stok terhadap item {0}, Anda tidak dapat mengaktifkan memiliki varian properti"
 DocType: Asset,Straight Line,Garis lurus
 DocType: Project User,Project User,proyek Pengguna
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Membagi
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Membagi
 DocType: GL Entry,Is Advance,Apakah Muka
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Kehadiran Dari Tanggal dan Kehadiran Sampai Tanggal adalah wajib
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,Entrikan 'Apakah subkontrak' sebagai Ya atau Tidak
+DocType: Item,Default Purchase Unit of Measure,Unit Pembelian Default
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Tanggal Komunikasi Terakhir
 DocType: Sales Team,Contact No.,Hubungi Nomor
 DocType: Bank Reconciliation,Payment Entries,Entries pembayaran
 DocType: Production Order,Scrap Warehouse,Gudang memo
 DocType: Production Order,Check if material transfer entry is not required,Periksa apakah entri pemindahan material tidak diperlukan
 DocType: Program Enrollment Tool,Get Students From,Dapatkan Siswa Dari
-DocType: Hub Settings,Seller Country,Penjual Negara
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publikasikan Produk di Website
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Kelompok siswa Anda dalam batch
 DocType: Authorization Rule,Authorization Rule,Regulasi Autorisasi
@@ -3939,7 +4025,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Penjualan Pajak dan Biaya Template
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Total (Kredit)
 DocType: Repayment Schedule,Payment Date,Tanggal pembayaran
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Baru Batch Qty
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Baru Batch Qty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Pakaian & Aksesoris
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,Tidak dapat memecahkan fungsi skor tertimbang. Pastikan rumusnya benar.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Jumlah Order
@@ -3947,7 +4033,7 @@
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Tentukan kondisi untuk menghitung jumlah pengiriman
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Peran Diizinkan Set Beku Account & Edit Frozen Entri
 DocType: Supplier Scorecard Scoring Variable,Path,Jalan
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,Tidak dapat mengkonversi Biaya Center untuk buku karena memiliki node anak
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,Tidak dapat mengkonversi Pusat Biaya untuk buku karena memiliki node anak
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +56,Opening Value,Nilai pembukaan
 DocType: Salary Detail,Formula,Rumus
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
@@ -3957,6 +4043,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Aset {1} tidak dapat disampaikan, itu sudah {2}"
 DocType: Tax Rule,Billing Country,Negara Penagihan
 DocType: Purchase Order Item,Expected Delivery Date,Diharapkan Pengiriman Tanggal
+DocType: Restaurant Order Entry,Restaurant Order Entry,Entri Pemesanan Restoran
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit dan Kredit tidak sama untuk {0} # {1}. Perbedaan adalah {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Beban Hiburan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Membuat Material Permintaan
@@ -3969,9 +4056,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Akun dengan transaksi yang ada tidak dapat dihapus
 DocType: Vehicle,Last Carbon Check,Terakhir Carbon Periksa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Beban Legal
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Silakan pilih kuantitas pada baris
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Silakan pilih kuantitas pada baris
 DocType: Purchase Invoice,Posting Time,Posting Waktu
 DocType: Timesheet,% Amount Billed,% Jumlah Ditagih
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Time Per Appointment&quot; belum ditetapkan untuk Dr {0}. Tambahkan ke master Doctor.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Beban Telepon
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Periksa ini jika Anda ingin untuk memaksa pengguna untuk memilih seri sebelum menyimpan. Tidak akan ada default jika Anda memeriksa ini.
@@ -3982,6 +4070,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Pendapatan Pelanggan Baru
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Biaya Perjalanan
 DocType: Maintenance Visit,Breakdown,Rincian
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Tambahkan bidang kustom Langganan di doctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Account: {0} dengan mata uang: {1} tidak dapat dipilih
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Update biaya BOM secara otomatis melalui Scheduler, berdasarkan tingkat penilaian / harga daftar penilaian terakhir / tingkat pembelian terakhir bahan baku."
 DocType: Bank Reconciliation Detail,Cheque Date,Cek Tanggal
@@ -3995,7 +4084,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Probation,Percobaan
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Komponen gaji
 DocType: Program Enrollment Tool,New Academic Year,Baru Tahun Akademik
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +762,Return / Credit Note,Kembali / Nota Kredit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +762,Return / Credit Note,Nota Retur / Kredit
 DocType: Stock Settings,Auto insert Price List rate if missing,Insert auto tingkat Daftar Harga jika hilang
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +23,Total Paid Amount,Jumlah Total Dibayar
 DocType: Production Order Item,Transferred Qty,Ditransfer Qty
@@ -4006,7 +4095,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Jumlah Total Tagihan (via Waktu Log)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Supplier Id
 DocType: Payment Request,Payment Gateway Details,Pembayaran Detail Gateway
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Kuantitas harus lebih besar dari 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Kuantitas harus lebih besar dari 0
 DocType: Journal Entry,Cash Entry,Entri Kas
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,node anak hanya dapat dibuat di bawah &#39;Grup&#39; Jenis node
 DocType: Leave Application,Half Day Date,Tanggal Setengah Hari
@@ -4024,12 +4113,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Catatan: Stok Barang {0} masuk beberapa kali
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Semua Kontak.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Singkatan Perusahaan
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Pengguna {0} tidak ada
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Pengguna {0} tidak ada
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Singkatan
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Masuk pembayaran sudah ada
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Tidak Authroized sejak {0} melebihi batas
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Template master gaji.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Patologi
+DocType: Restaurant Order Entry,Restaurant Table,Meja restoran
 DocType: Leave Type,Max Days Leave Allowed,Max Hari Cuti Diizinkan
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Set Peraturan Pajak untuk keranjang belanja
 DocType: Purchase Invoice,Taxes and Charges Added,Pajak dan Biaya Ditambahkan
@@ -4037,14 +4128,14 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +48,Abbreviation is mandatory,Singkatan wajib diisi
 DocType: Project,Task Progress,tugas Kemajuan
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Troli
-,Qty to Transfer,Jumlah Transfer
-apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Penawaran untuk Prospek atau Pelanggan.
+,Qty to Transfer,Kuantitas untuk ditransfer
+apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Penawaran terhadap Prospek atau Pelanggan
 DocType: Stock Settings,Role Allowed to edit frozen stock,Peran diizinkan mengedit persediaan dibekukan
 ,Territory Target Variance Item Group-Wise,Wilayah Sasaran Variance Stok Barang Group-Wise
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Semua Kelompok Pelanggan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Semua Kelompok Pelanggan
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,akumulasi Bulanan
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} adalah wajib. Mungkin data Kurs Mata Uang tidak dibuat untuk {1} sampai {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Template pajak adalah wajib.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Template pajak adalah wajib.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Akun {0}: akun Induk {1} tidak ada
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Daftar Harga Rate (Perusahaan Mata Uang)
 DocType: Products Settings,Products Settings,Pengaturan produk
@@ -4070,17 +4161,17 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Stok Barang Wise Detil Pajak
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Singkatan Institute
 ,Item-wise Price List Rate,Stok Barang-bijaksana Daftar Harga Tingkat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Supplier Quotation
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Supplier Quotation
 DocType: Quotation,In Words will be visible once you save the Quotation.,Dalam Kata-kata akan terlihat sekali Anda menyimpan Quotation tersebut.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Kuantitas ({0}) tidak boleh menjadi pecahan dalam baris {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Barcode {0} sudah digunakan dalam Butir {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Barcode {0} sudah digunakan dalam Produk {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Aturan untuk menambahkan biaya pengiriman.
 DocType: Item,Opening Stock,Persediaan pembukaan
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Pelanggan diwajibkan
 DocType: Lab Test,Result Date,Tanggal hasil
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} adalah wajib untuk Pengembalian
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} adalah wajib untuk Retur
 DocType: Purchase Order,To Receive,Menerima
 apps/erpnext/erpnext/utilities/user_progress.py +231,user@example.com,user@example.com
 DocType: Employee,Personal Email,Email Pribadi
@@ -4094,9 +4185,8 @@
 DocType: Customer,From Lead,Dari Prospek
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Order dirilis untuk produksi.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Pilih Tahun Anggaran ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS Profil diperlukan untuk membuat POS Entri
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS Profil diperlukan untuk membuat POS Entri
 DocType: Program Enrollment Tool,Enroll Students,Daftarkan Siswa
-DocType: Hub Settings,Name Token,Nama Token
 DocType: Lab Test,Approved Date,Tanggal yang Disetujui
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Jual
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Setidaknya satu gudang adalah wajib
@@ -4114,7 +4204,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Sumber Daya Manusia
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Rekonsiliasi Pembayaran Pembayaran
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Aset pajak
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Pesanan Produksi telah {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Pesanan Produksi telah {0}
 DocType: BOM Item,BOM No,No. BOM
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Jurnal Entri {0} tidak memiliki akun {1} atau sudah dicocokkan voucher lainnya
@@ -4134,7 +4224,7 @@
 DocType: Currency Exchange,To Currency,Untuk Mata
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Izinkan pengguna ini untuk menyetujui aplikasi izin cuti untuk hari yang terpilih(blocked).
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Jenis Beban Klaim.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Tingkat penjualan untuk item {0} lebih rendah dari {1} nya. Tingkat penjualan harus atleast {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Tingkat penjualan untuk item {0} lebih rendah dari {1} nya. Tingkat penjualan harus atleast {2}
 DocType: Item,Taxes,PPN
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Dibayar dan Tidak Terkirim
 DocType: Project,Default Cost Center,Standar Biaya Pusat
@@ -4148,18 +4238,18 @@
 DocType: Employee Loan,Fully Disbursed,sepenuhnya Dicairkan
 DocType: Maintenance Visit,Customer Feedback,Umpan balik Pelanggan
 DocType: Account,Expense,Biaya
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Skor tidak dapat lebih besar dari skor maksimum
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Skor tidak dapat lebih besar dari skor maksimum
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Pelanggan dan Pemasok
 DocType: Item Attribute,From Range,Dari Rentang
 DocType: BOM,Set rate of sub-assembly item based on BOM,Tetapkan tarif barang sub-rakitan berdasarkan BOM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},kesalahan sintaks dalam formula atau kondisi: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},kesalahan sintaks dalam formula atau kondisi: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Kerja Harian Ringkasan Pengaturan Perusahaan
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,Barang {0} diabaikan karena bukan barang persediaan
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Kirim Produksi ini Order untuk diproses lebih lanjut.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Kirim Produksi ini Order untuk diproses lebih lanjut.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Untuk tidak berlaku Rule Harga dalam transaksi tertentu, semua Aturan Harga yang berlaku harus dinonaktifkan."
 DocType: Assessment Group,Parent Assessment Group,Induk Penilaian Grup
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Pekerjaan
 ,Sales Order Trends,Sales Order Trends
 DocType: Employee,Held On,Diadakan Pada
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Produksi Stok Barang
@@ -4173,12 +4263,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Harap tentukan filter Perusahaan jika Group By &#39;Company&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Posting Tanggal tidak bisa tanggal di masa depan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} tidak sesuai dengan {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,untuk menghasilkan berulang
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Santai Cuti
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Uji Lab UOM.
 DocType: Batch,Batch ID,Batch ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Catatan: {0}
 ,Delivery Note Trends,Tren pengiriman Note
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Ringkasan minggu ini
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Ringkasan minggu ini
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Jumlah tersedia
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Akun: {0} hanya dapat diperbarui melalui Transaksi Persediaan
 DocType: Student Group Creation Tool,Get Courses,Dapatkan Program
@@ -4187,12 +4278,11 @@
 DocType: Variant Field,Variant Field,Bidang Varian
 DocType: Sales Order,Delivery Date,Tanggal Pengiriman
 DocType: Opportunity,Opportunity Date,Peluang Tanggal
-DocType: Purchase Receipt,Return Against Purchase Receipt,Kembali Terhadap Pembelian Penerimaan
+DocType: Purchase Receipt,Return Against Purchase Receipt,Retur Terhadap Nota Pembelian
 DocType: Request for Quotation Item,Request for Quotation Item,Permintaan Quotation Barang
 DocType: Purchase Order,To Bill,Bill
 DocType: Material Request,% Ordered,% Tersusun
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Untuk Kelompok Siswa Berbasis Kursus, Kursus akan divalidasi untuk setiap Siswa dari Program Pendaftaran Pendaftaran Program yang terdaftar."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Masukkan Alamat Email dipisahkan dengan koma, invoice akan dikirimkan secara otomatis pada tanggal tertentu"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Pekerjaan yg dibayar menurut hasil yg dikerjakan
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Harga Beli Rata-rata
 DocType: Task,Actual Time (in Hours),Waktu Aktual (dalam Jam)
@@ -4203,10 +4293,10 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +82,Same item has been entered multiple times,item yang sama telah dimasukkan beberapa kali
 DocType: Department,Leave Block List,Cuti Block List
 DocType: Sales Invoice,Tax ID,Id pajak
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Stok Barang {0} tidak setup untuk Serial Nos Kolom harus kosong
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Stok Barang {0} tidak diatur untuk Nomor Seri. Kolom harus kosong
 DocType: Accounts Settings,Accounts Settings,Pengaturan Akun
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,Menyetujui
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Tidak ada hasil untuk disampaikan
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Tidak ada hasil untuk disampaikan
 DocType: Customer,Sales Partner and Commission,Penjualan Mitra dan Komisi
 DocType: Employee Loan,Rate of Interest (%) / Year,Tingkat bunga (%) / Tahun
 ,Project Quantity,proyek Kuantitas
@@ -4218,57 +4308,56 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Hitam
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Ledakan Stok Barang
 DocType: Account,Auditor,Akuntan
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} item diproduksi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} item diproduksi
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Belajarlah lagi
 DocType: Cheque Print Template,Distance from top edge,Jarak dari tepi atas
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Daftar Harga {0} dinonaktifkan atau tidak ada
-DocType: Purchase Invoice,Return,Kembali
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Daftar Harga {0} dinonaktifkan atau tidak ada
+DocType: Purchase Invoice,Return,Retur
 DocType: Production Order Operation,Production Order Operation,Order Operasi Produksi
 DocType: Pricing Rule,Disable,Nonaktifkan
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Cara pembayaran yang diperlukan untuk melakukan pembayaran
 DocType: Project Task,Pending Review,Pending Ulasan
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Janji dan Konsultasi
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} tidak terdaftar dalam Batch {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} tidak terdaftar dalam Batch {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Aset {0} tidak dapat dihapus, karena sudah {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Jumlah Klaim Beban (via Beban Klaim)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Absen
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Mata dari BOM # {1} harus sama dengan mata uang yang dipilih {2}
 DocType: Journal Entry Account,Exchange Rate,Nilai Tukar
 DocType: Patient,Additional information regarding the patient,Informasi tambahan mengenai pasien
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Order Penjualan {0} tidak Terkirim
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Order Penjualan {0} tidak Terkirim
 DocType: Homepage,Tag Line,klimaks
 DocType: Fee Component,Fee Component,biaya Komponen
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Manajemen armada
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Menambahkan item dari
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Manajemen armada
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Menambahkan item dari
 DocType: Cheque Print Template,Regular,Reguler
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Total weightage semua Kriteria Penilaian harus 100%
-DocType: BOM,Last Purchase Rate,Tingkat Pembelian Terakhir
+DocType: Purchase Order Item,Last Purchase Rate,Tingkat Pembelian Terakhir
 DocType: Account,Asset,Aset
 DocType: Project Task,Task ID,Tugas ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Persediaan tidak bisa muncul untuk Barang {0} karena memiliki varian
 DocType: Lab Test,Mobile,Mobile
 ,Sales Person-wise Transaction Summary,Sales Person-bijaksana Rangkuman Transaksi
 DocType: Training Event,Contact Number,Nomor kontak
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Gudang {0} tidak ada
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Untuk mendaftar ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Gudang {0} tidak ada
 DocType: Monthly Distribution,Monthly Distribution Percentages,Persentase Distribusi bulanan
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Item yang dipilih tidak dapat memiliki Batch
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Tingkat valuasi tidak ditemukan untuk Barang {0}, yang diperlukan untuk entri akuntansi {1} {2}. Jika ditransaksikan sebagai barang sampel dalam {1}, harap disebutkan dalam tabel Barang {1}. Jika tidak, silakan membuat transaksi persediaan masuk untuk barang ini atau sebutkan tingkat valuasi dalam catatan Barang, dan kemudian coba kirim/batalkan entri ini"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Dari materi yang Terkirim terhadap Pengiriman ini Note
+DocType: Training Event,Has Certificate,Memiliki sertifikat
 DocType: Project,Customer Details,Rincian Pelanggan
 DocType: Employee,Reports to,Laporan untuk
 ,Unpaid Expense Claim,Tunggakan Beban Klaim
 DocType: Payment Entry,Paid Amount,Dibayar Jumlah
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Jelajahi Siklus Penjualan
 DocType: Assessment Plan,Supervisor,Pengawas
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,On line
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,On line
 ,Available Stock for Packing Items,Tersedia untuk Barang Paket
 DocType: Item Variant,Item Variant,Item Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Alat Hasil penilaian
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Barang
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,perintah yang disampaikan tidak dapat dihapus
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,perintah yang disampaikan tidak dapat dihapus
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo rekening sudah berada di Debit, Anda tidak diizinkan untuk mengatur 'Balance Harus' sebagai 'Kredit'"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Manajemen Kualitas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Manajemen Mutu
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Item {0} telah dinonaktifkan
 DocType: Employee Loan,Repay Fixed Amount per Period,Membayar Jumlah Tetap per Periode
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Mohon masukkan untuk Item {0}
@@ -4286,7 +4375,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: konflik Timing dengan baris {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Biarkan Zero Valuation Rate
 DocType: Training Event Employee,Invited,diundang
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Beberapa Struktur Gaji aktif yang ditemukan untuk karyawan {0} untuk tanggal tertentu
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Beberapa Struktur Gaji aktif yang ditemukan untuk karyawan {0} untuk tanggal tertentu
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Rekening Gateway setup.
 DocType: Employee,Employment Type,Jenis Pekerjaan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Aktiva Tetap
@@ -4298,7 +4387,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,ID Email Siswa
 DocType: Employee,Notice (days),Notice (hari)
 DocType: Tax Rule,Sales Tax Template,Template Pajak Penjualan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Pilih item untuk menyimpan faktur
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Pilih item untuk menyimpan faktur
 DocType: Employee,Encashment Date,Pencairan Tanggal
 DocType: Training Event,Internet,Internet
 DocType: Special Test Template,Special Test Template,Template Uji Khusus
@@ -4307,7 +4396,7 @@
 DocType: Production Order,Planned Operating Cost,Direncanakan Biaya Operasi
 DocType: Academic Term,Term Start Date,Jangka Mulai Tanggal
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Silakan menemukan terlampir {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Silakan menemukan terlampir {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bank saldo Laporan per General Ledger
 DocType: Job Applicant,Applicant Name,Nama Pemohon
 DocType: Authorization Rule,Customer / Item Name,Nama Pelanggan / Barang
@@ -4327,7 +4416,7 @@
 DocType: Guardian,Guardian Of ,wali Of
 DocType: Grading Scale Interval,Threshold,Ambang
 DocType: BOM Update Tool,Current BOM,BOM saat ini
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Tambahkan Nomor Serial
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Tambahkan Nomor Serial
 DocType: Production Order Item,Available Qty at Source Warehouse,Tersedia Qty di Gudang Sumber
 apps/erpnext/erpnext/config/support.py +22,Warranty,Jaminan
 DocType: Purchase Invoice,Debit Note Issued,Debit Note Ditempatkan
@@ -4342,7 +4431,7 @@
 DocType: Company,Distribution,Distribusi
 DocType: Lab Test,Report Preference,Preferensi Laporan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +129,Project Manager,Manager Project
-,Quoted Item Comparison,Dikutip Barang Perbandingan
+,Quoted Item Comparison,Perbandingan Produk/Barang yang ditawarkan
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Tumpang tindih dalam penilaian antara {0} dan {1}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Dispatch,Pengiriman
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +73,Max discount allowed for item: {0} is {1}%,Diskon Max diperbolehkan untuk item: {0} {1}%
@@ -4350,10 +4439,9 @@
 DocType: Account,Receivable,Piutang
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Tidak diperbolehkan untuk mengubah Supplier sebagai Purchase Order sudah ada
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Peran yang diperbolehkan untuk mengirimkan transaksi yang melebihi batas kredit yang ditetapkan.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Pilih Produk untuk Industri
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Data master sinkronisasi, itu mungkin memakan waktu"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Pilih Produk untuk Industri
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Data master sinkronisasi, itu mungkin memakan waktu"
 DocType: Item,Material Issue,Keluar Barang
-DocType: Hub Settings,Seller Description,Penjual Deskripsi
 DocType: Employee Education,Qualification,Kualifikasi
 DocType: Item Price,Item Price,Item Price
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sabun & Deterjen
@@ -4361,7 +4449,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Dari waktu tidak dapat lebih besar dari Untuk Waktu.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordered
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Lanjut
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Lanjut
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,Jika diaktifkan maka sistem tidak akan memperbarui bidang varian dari template namun akan menyalin data dari kolom yang disebutkan di bawah sambil membuat varian baru
 DocType: Salary Detail,Component,Komponen
 DocType: Assessment Criteria,Assessment Criteria Group,Kriteria penilaian Grup
 DocType: Healthcare Settings,Patient Name By,Nama Pasien Oleh
@@ -4371,7 +4460,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Entrikan Menyetujui Peran atau Menyetujui Pengguna
 DocType: Journal Entry,Write Off Entry,Menulis Off Entri
 DocType: BOM,Rate Of Materials Based On,Laju Bahan Berbasis On
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Supplier&gt; Supplier Type
+DocType: Item Variant Settings,Do not Update Variants,Jangan Perbarui Varian
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Dukungan Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Jangan tandai semua
 DocType: POS Profile,Terms and Conditions,Syarat dan Ketentuan
@@ -4380,7 +4469,7 @@
 DocType: Leave Block List,Applies to Company,Berlaku untuk Perusahaan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,Tidak bisa membatalkan karena ada Entri Persediaan {0} terkirim
 DocType: Employee Loan,Disbursement Date,pencairan Tanggal
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;Penerima&#39; tidak ditentukan
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Penerima&#39; tidak ditentukan
 DocType: BOM Update Tool,Update latest price in all BOMs,Update harga terbaru di semua BOM
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Rekam medis
 DocType: Vehicle,Vehicle,Kendaraan
@@ -4395,14 +4484,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Peluang/Prospek %
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Penyusutan aset dan Saldo
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Jumlah {0} {1} ditransfer dari {2} untuk {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Jumlah {0} {1} ditransfer dari {2} untuk {3}
 DocType: Sales Invoice,Get Advances Received,Dapatkan Uang Muka Diterima
 DocType: Email Digest,Add/Remove Recipients,Tambah / Hapus Penerima
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Transaksi tidak diperbolehkan berhenti melawan Orde Produksi {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Untuk mengatur Tahun Anggaran ini sebagai Default, klik 'Set as Default'"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Ikut
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Bergabung
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Kekurangan Jumlah
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Item varian {0} ada dengan atribut yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Item varian {0} ada dengan atribut yang sama
 DocType: Employee Loan,Repay from Salary,Membayar dari Gaji
 DocType: Leave Application,LAP/,PUTARAN/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Meminta pembayaran terhadap {0} {1} untuk jumlah {2}
@@ -4415,7 +4504,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Stok barang Order Penjualan
 DocType: Salary Slip,Payment Days,Hari Jeda Pembayaran
 DocType: Patient,Dormant,Terbengkalai
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Gudang dengan node anak tidak dapat dikonversi ke buku besar
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Gudang dengan node anak tidak dapat dikonversi ke buku besar
 DocType: BOM,Manage cost of operations,Kelola biaya operasional
 DocType: Accounts Settings,Stale Days,Hari basi
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Ketika salah satu transaksi yang dicentang ""Dikirim"", pop-up email secara otomatis terbuka untuk mengirim email ke ""Kontak"" terkait dalam transaksi itu, dengan transaksi sebagai lampiran. Pengguna bisa mengirim email tersebut atau tidak mengirim."
@@ -4429,10 +4518,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serial ada {0} telah diterima
 ,Requested Items To Be Transferred,Permintaan Produk Akan Ditransfer
 DocType: Expense Claim,Vehicle Log,kendaraan Log
-DocType: Purchase Invoice,Recurring Id,Berulang Id
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Adanya demam (suhu&gt; 38,5 ° C / 101,3 ° F atau suhu bertahan&gt; 38 ° C / 100,4 ° F)"
 DocType: Customer,Sales Team Details,Rincian Tim Penjualan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Hapus secara permanen?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Hapus secara permanen?
 DocType: Expense Claim,Total Claimed Amount,Jumlah Total Diklaim
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potensi peluang untuk menjadi penjualan.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Valid {0}
@@ -4442,8 +4530,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Departmen Store
 ,Item Delivery Date,Tanggal Pengiriman Barang
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Pengaturan Sekolah Anda di ERPNext
-DocType: Sales Invoice,Base Change Amount (Company Currency),Dasar Perubahan Jumlah (Perusahaan Mata Uang)
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Pengaturan Sekolah Anda di ERPNext
+DocType: Sales Invoice,Base Change Amount (Company Currency),Dasar Nilai Tukar (Mata Uang Perusahaan)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Tidak ada entri akuntansi untuk gudang berikut
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Simpan dokumen terlebih dahulu.
 DocType: Account,Chargeable,Dapat Dibebankan
@@ -4454,13 +4542,12 @@
 DocType: Task,Is Milestone,Adalah tonggak
 DocType: Daily Work Summary,Email Sent To,Surel Dikirim Ke
 DocType: Budget,Warn,Peringatan: Cuti aplikasi berisi tanggal blok berikut
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Anda yakin ingin membatalkan pendaftaran?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Setiap komentar lain, upaya penting yang harus pergi dalam catatan."
 DocType: BOM,Manufacturing User,Manufaktur Pengguna
 DocType: Purchase Invoice,Raw Materials Supplied,Bahan Baku Disupply
-DocType: Purchase Invoice,Recurring Print Format,Berulang Print Format
 DocType: C-Form,Series,Seri
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Mata uang dari daftar harga {0} harus {1} atau {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Tambahkan Produk
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Mata uang dari daftar harga {0} harus {1} atau {2}
 DocType: Appraisal,Appraisal Template,Template Penilaian
 DocType: Item Group,Item Classification,Klasifikasi Stok Barang
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Business Development Manager
@@ -4474,7 +4561,7 @@
 DocType: Item Attribute Value,Attribute Value,Nilai Atribut
 ,Itemwise Recommended Reorder Level,Itemwise Rekomendasi Reorder Tingkat
 DocType: Salary Detail,Salary Detail,Detil gaji
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Silahkan pilih {0} terlebih dahulu
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Silahkan pilih {0} terlebih dahulu
 DocType: Appointment Type,Physician,Dokter
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Batch {0} Item {1} telah berakhir.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Konsultasi
@@ -4485,8 +4572,8 @@
 DocType: Salary Detail,Default Amount,Jumlah Standar
 DocType: Lab Test Template,Descriptive,Deskriptif
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Gudang tidak ditemukan dalam sistem
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Ringkasan ini Bulan ini
-DocType: Quality Inspection Reading,Quality Inspection Reading,Inspeksi Kualitas Reading
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Ringkasan ini Bulan ini
+DocType: Quality Inspection Reading,Quality Inspection Reading,Nilai Inspeksi Mutu
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,'Bekukan Persediaan Lebih Lama Dari' harus lebih kecil dari %d hari.
 DocType: Tax Rule,Purchase Tax Template,Pembelian Template Pajak
 apps/erpnext/erpnext/utilities/user_progress.py +45,Set a sales goal you'd like to achieve for your company.,Tetapkan sasaran penjualan yang ingin Anda capai untuk perusahaan Anda.
@@ -4508,12 +4595,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Acara / Hasil Pelatihan
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Akumulasi Penyusutan seperti pada
 DocType: Sales Invoice,C-Form Applicable,C-Form Berlaku
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Operasi Waktu harus lebih besar dari 0 untuk operasi {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Operasi Waktu harus lebih besar dari 0 untuk operasi {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Gudang adalah wajib
 DocType: Supplier,Address and Contacts,Alamat dan Kontak
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detil UOM Konversi
 DocType: Program,Program Abbreviation,Singkatan Program
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Order produksi tidak dapat diajukan terhadap Template Stok Barang
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Order produksi tidak dapat diajukan terhadap Template Stok Barang
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Biaya diperbarui dalam Pembelian Penerimaan terhadap setiap item
 DocType: Warranty Claim,Resolved By,Terselesaikan Dengan
 DocType: Bank Guarantee,Start Date,Tanggal Mulai
@@ -4533,32 +4620,33 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Hapus item jika biaya ini tidak berlaku untuk item
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Transaksi mata uang harus sama dengan Payment Gateway mata uang
 DocType: Payment Entry,Receive,Menerima
-apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,kutipan:
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Penawaran:
 DocType: Maintenance Visit,Fully Completed,Sepenuhnya Selesai
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Lengkap
 DocType: Employee,Educational Qualification,Kualifikasi Pendidikan
 DocType: Workstation,Operating Costs,Biaya Operasional
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Tindakan jika Akumulasi Anggaran Bulanan Melebihi
-DocType: Purchase Invoice,Submit on creation,Kirim pada penciptaan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Mata uang untuk {0} harus {1}
+DocType: Subscription,Submit on creation,Kirim pada penciptaan
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Mata uang untuk {0} harus {1}
 DocType: Asset,Disposal Date,pembuangan Tanggal
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Email akan dikirim ke semua Karyawan Aktif perusahaan pada jam tertentu, jika mereka tidak memiliki liburan. Ringkasan tanggapan akan dikirim pada tengah malam."
 DocType: Employee Leave Approver,Employee Leave Approver,Approver Cuti Karyawan
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Baris {0}: Entri perekam sudah ada untuk gudang ini {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Tidak dapat mendeklarasikan sebagai hilang, karena Quotation telah dibuat."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,pelatihan Masukan
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Baris {0}: Entri perekam sudah ada untuk gudang ini {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Tidak dapat mendeklarasikan sebagai hilang, karena Quotation telah dibuat."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,pelatihan Masukan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Order produksi {0} harus diserahkan
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Kriteria Scorecard Pemasok
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Silakan pilih Tanggal Mulai dan Tanggal Akhir untuk Item {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Tentu saja adalah wajib berturut-turut {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Sampai saat ini tidak dapat sebelumnya dari tanggal
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Tambah / Edit Harga
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Tambah / Edit Harga
 DocType: Batch,Parent Batch,Induk induk
 DocType: Cheque Print Template,Cheque Print Template,Template Print Cek
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Bagan Pusat Biaya
 DocType: Lab Test Template,Sample Collection,Koleksi Sampel
 ,Requested Items To Be Ordered,Produk Diminta Akan Memerintahkan
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Order saya
 DocType: Price List,Price List Name,Daftar Harga Nama
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Ringkasan Pekerjaan sehari-hari untuk {0}
 DocType: Employee Loan,Totals,Total
@@ -4577,12 +4665,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} unit {1} dibutuhkan dalam {2} pada {3} {4} untuk {5} untuk menyelesaikan transaksi ini.
 DocType: Fee Schedule,Student Category,Mahasiswa Kategori
 DocType: Announcement,Student,Mahasiswa
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Unit Organisasi (kawasan) menguasai.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Unit Organisasi (kawasan) menguasai.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Pergi ke kamar
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Entrikan pesan sebelum mengirimnya
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,DUPLICATE UNTUK PEMASOK
 DocType: Email Digest,Pending Quotations,tertunda Kutipan
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Profil Point of Sale
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Profil Point of Sale
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Konfigurasi Uji Lab
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Pinjaman tanpa Jaminan
 DocType: Cost Center,Cost Center Name,Nama Pusat Biaya
@@ -4592,6 +4680,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Total nilai Bayar
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Pesan lebih dari 160 karakter akan dipecah menjadi beberapa pesan
 DocType: Purchase Receipt Item,Received and Accepted,Diterima dan Diterima
+DocType: Hub Settings,Company and Seller Profile,Profil Perusahaan dan Penjual
 ,GST Itemised Sales Register,Daftar Penjualan Item GST
 ,Serial No Service Contract Expiry,Masa Kadaluwarsa Nomor Seri Kontrak Jasa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Anda tidak dapat mengkredit dan mendebit rekening yang sama secara bersamaan
@@ -4601,10 +4690,11 @@
 DocType: Item,Variant Based On,Varian Berbasis Pada
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Jumlah weightage ditugaskan harus 100%. Ini adalah {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Pemasok Anda
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Perbaiki
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Tidak dapat ditetapkan sebagai Hilang sebagai Sales Order dibuat.
 DocType: Request for Quotation Item,Supplier Part No,Pemasok Bagian Tidak
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',tidak bisa memotong ketika kategori adalah untuk &#39;Penilaian&#39; atau &#39;Vaulation dan Total&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Diterima dari
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Diterima dari
 DocType: Lead,Converted,Dikonversi
 DocType: Item,Has Serial No,Bernomor Seri
 DocType: Employee,Date of Issue,Tanggal Issue
@@ -4612,7 +4702,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Sesuai dengan Setelan Pembelian jika Diperlukan Pembelian Diperlukan == &#39;YA&#39;, maka untuk membuat Purchase Invoice, pengguna harus membuat Purchase Receipt terlebih dahulu untuk item {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Row # {0}: Set Supplier untuk item {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Row {0}: nilai Jam harus lebih besar dari nol.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Website Image {0} melekat Butir {1} tidak dapat ditemukan
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Website Image {0} melekat Butir {1} tidak dapat ditemukan
 DocType: Issue,Content Type,Tipe Konten
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Komputer
 DocType: Item,List this Item in multiple groups on the website.,Daftar Stok Barang ini dalam beberapa kelompok di website.
@@ -4623,14 +4713,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Dapatkan Entries Unreconciled
 DocType: Payment Reconciliation,From Invoice Date,Dari Faktur Tanggal
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Anda tidak memiliki izin untuk mengirimkan
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,mata uang penagihan harus sama dengan mata uang mata uang atau rekening pihak baik bawaan comapany ini
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Mata uang penagihan harus sama dengan mata uang default atau mata uang akun pihak
 DocType: Healthcare Settings,Laboratory Settings,Pengaturan Laboratorium
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Tinggalkan Pencairan
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Apa pekerjaannya?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Untuk Gudang
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Semua Penerimaan Mahasiswa
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Apa pekerjaannya?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Untuk Gudang
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Semua Penerimaan Mahasiswa
 ,Average Commission Rate,Rata-rata Komisi Tingkat
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,'Bernomor Urut' tidak dapat ‘Ya’ untuk barang non-persediaan
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,'Bernomor Seri' tidak dapat ‘Ya’ untuk barang non-persediaan
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Pilih Status
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Kehadiran tidak dapat ditandai untuk tanggal masa depan
 DocType: Pricing Rule,Pricing Rule Help,Aturan Harga Bantuan
@@ -4648,40 +4738,40 @@
 DocType: Item,Customer Code,Kode Pelanggan
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Birthday Reminder untuk {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Jumlah Hari Semenjak Order Terakhir
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Debit Untuk akun harus rekening Neraca
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Debit Untuk akun harus rekening Neraca
 DocType: Buying Settings,Naming Series,Series Penamaan
 DocType: Leave Block List,Leave Block List Name,Cuti Nama Block List
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Tanggal asuransi mulai harus kurang dari tanggal asuransi End
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Silakan setup Sistem Penamaan Instruktur di Sekolah&gt; Pengaturan Sekolah
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Asset Persediaan
 DocType: Timesheet,Production Detail,Detil produksi
+DocType: Restaurant,Active Menu,Menu Aktif
 DocType: Target Detail,Target Qty,Qty Target
 DocType: Shopping Cart Settings,Checkout Settings,Pengaturan Checkout
 DocType: Attendance,Present,ada
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Pengiriman Note {0} tidak boleh Terkirim
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Pengiriman Note {0} tidak boleh Terkirim
 DocType: Notification Control,Sales Invoice Message,Pesan Faktur Penjualan
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Penutupan Rekening {0} harus dari jenis Kewajiban / Ekuitas
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Slip Gaji karyawan {0} sudah dibuat untuk daftar absen {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Slip Gaji karyawan {0} sudah dibuat untuk daftar absen {1}
 DocType: Vehicle Log,Odometer,Odometer
 DocType: Sales Order Item,Ordered Qty,Qty Terorder
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Item {0} dinonaktifkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Item {0} dinonaktifkan
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM tidak mengandung barang tersedia
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Kegiatan proyek / tugas.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM tidak mengandung barang persediaan
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Kegiatan proyek / tugas.
 DocType: Vehicle Log,Refuelling Details,Detail Pengisian
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Buat Slip Gaji
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Membeli harus dicentang, jika ""Berlaku Untuk"" dipilih sebagai {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Diskon harus kurang dari 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Tingkat pembelian terakhir tidak ditemukan
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Jumlah Nilai Write Off (mata uang perusahaan)
 DocType: Sales Invoice Timesheet,Billing Hours,Jam penagihan
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,BOM default untuk {0} tidak ditemukan
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Row # {0}: Silakan mengatur kuantitas menyusun ulang
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM default untuk {0} tidak ditemukan
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Row # {0}: Silakan mengatur kuantitas menyusun ulang
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Ketuk item untuk menambahkannya di sini
 DocType: Fees,Program Enrollment,Program Pendaftaran
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher Landing Cost
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Silakan set {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Ulangi pada Hari Bulan
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} adalah siswa tidak aktif
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} adalah siswa tidak aktif
 DocType: Employee,Health Details,Detail Kesehatan
 DocType: Offer Letter,Offer Letter Terms,Term Surat Penawaran
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Untuk membuat dokumen referensi Request Request diperlukan
@@ -4689,7 +4779,6 @@
 DocType: Employee External Work History,Salary,Gaji
 DocType: Serial No,Delivery Document Type,Tipe Nota Pengiriman
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Menyerahkan semua slip gaji kriteria pilihan di atas
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Item telah disinkronkan
 DocType: Sales Order,Partly Delivered,Terkirim Sebagian
 DocType: Email Digest,Receivables,Piutang
 DocType: Lead Source,Lead Source,Sumber Prospek
@@ -4705,25 +4794,25 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Tanggal mulai harus kurang dari tanggal akhir untuk Item {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Contoh:. ABCD ##### 
- Jika seri diatur dan Serial ada tidak disebutkan dalam transaksi, nomor seri maka otomatis akan dibuat berdasarkan seri ini. Jika Anda selalu ingin secara eksplisit menyebutkan Serial Nos untuk item ini. biarkan kosong."
+ Jika seri diatur dan Nomor Seri tidak disebutkan dalam transaksi, maka nomor seri otomatis akan dibuat berdasarkan seri ini. Jika Anda ingin selalu menetapkan Nomor Seri untuk item ini, biarkan kosong."
 DocType: Upload Attendance,Upload Attendance,Unggah Kehadiran
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +319,BOM and Manufacturing Quantity are required,BOM dan Manufaktur Kuantitas diperlukan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +319,BOM and Manufacturing Quantity are required,BOM dan Kuantitas Manufaktur wajib diperlukan
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Rentang Ageing 2
 DocType: SG Creation Tool Course,Max Strength,Max Kekuatan
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM diganti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Pilih Item berdasarkan Tanggal Pengiriman
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Pilih Item berdasarkan Tanggal Pengiriman
 ,Sales Analytics,Analitika Penjualan
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Tersedia {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Tersedia {0}
 ,Prospects Engaged But Not Converted,Prospek Terlibat Tapi Tidak Dikonversi
 DocType: Manufacturing Settings,Manufacturing Settings,Pengaturan manufaktur
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Mengatur Email
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Ponsel Tidak
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Entrikan mata uang default di Perusahaan Guru
 DocType: Stock Entry Detail,Stock Entry Detail,Rincian Entri Persediaan
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Pengingat Harian
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Pengingat Harian
 DocType: Products Settings,Home Page is Products,Home Page adalah Produk
 ,Asset Depreciation Ledger,Aset Penyusutan Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Aturan pajak Konflik dengan {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Aturan pajak Konflik dengan {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,New Account Name
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Biaya Bahan Baku Disediakan
 DocType: Selling Settings,Settings for Selling Module,Pengaturan untuk Jual Modul
@@ -4737,8 +4826,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Barang {0} harus barang persediaan
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standar Gudang Work In Progress
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Pengaturan default untuk transaksi akuntansi.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Silakan setup Employee Naming System di Human Resource&gt; HR Settings
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Diharapkan Tanggal tidak bisa sebelum Material Request Tanggal
+DocType: Restaurant,Default Tax Template,Template Pajak Default
 DocType: Fees,Student Details,Rincian siswa
 DocType: Purchase Invoice Item,Stock Qty,Jumlah Persediaan
 DocType: Employee Loan,Repayment Period in Months,Periode pembayaran di Bulan
@@ -4756,8 +4846,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Pergi ke item
 DocType: Sales Partner,Partner Type,Tipe Mitra/Partner
 DocType: Purchase Taxes and Charges,Actual,Aktual
+DocType: Restaurant Menu,Restaurant Manager,Manajer restoran
 DocType: Authorization Rule,Customerwise Discount,Diskon Pelanggan
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Absen untuk tugas-tugas.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Absen untuk tugas-tugas.
 DocType: Purchase Invoice,Against Expense Account,Terhadap Akun Biaya
 DocType: Production Order,Production Order,Order Produksi
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Instalasi Catatan {0} telah Terkirim
@@ -4765,7 +4856,6 @@
 DocType: Quotation Item,Against Docname,Terhadap Docname
 DocType: SMS Center,All Employee (Active),Semua Karyawan (Aktif)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Lihat Sekarang
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Pilih periode ketika invoice akan dibuat secara otomatis
 DocType: BOM,Raw Material Cost,Biaya Bahan Baku
 DocType: Item Reorder,Re-Order Level,Tingkat Re-order
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Masukkan item dan rencana jumlah yang Anda inginkan untuk meningkatkan pesanan produksi atau unduh bahan baku untuk analisis.
@@ -4778,23 +4868,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Jenis Laporan adalah wajib
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Gudang adalah wajib untuk persediaan Barang {0} pada baris {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Tambahkan Program
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Grosir
 DocType: Issue,First Responded On,Ditangani Pertama kali pada
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Daftar Lintas Item dalam beberapa kelompok
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Tahun Anggaran Tanggal Mulai dan Akhir Tahun Fiskal Tanggal sudah ditetapkan pada Tahun Anggaran {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Cukai Tanggal diperbarui
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split batch
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Berhasil Direkonsiliasi
 DocType: Request for Quotation Supplier,Download PDF,Unduh PDF
 DocType: Production Order,Planned End Date,Tanggal Akhir Planning
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Harap masukkan Jadwal Tanggal
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Dimana Item Disimpan
 DocType: Request for Quotation,Supplier Detail,pemasok Detil
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Kesalahan dalam rumus atau kondisi: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Kesalahan dalam rumus atau kondisi: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Nilai Tertagih Faktur
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kriteria bobot harus menambahkan hingga 100%
 DocType: Attendance,Attendance,Absensi
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,Barang Persediaan
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,Barang Persediaan
 DocType: BOM,Materials,Material/Barang
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Jika tidak diperiksa, daftar harus ditambahkan ke setiap departemen di mana itu harus diterapkan."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Sumber dan Target Gudang tidak bisa sama
@@ -4812,6 +4902,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,Pada Jumlah Net Bersih
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Nilai untuk Atribut {0} harus berada dalam kisaran {1} ke {2} dalam penambahan {3} untuk Item {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Target gudang di baris {0} harus sama dengan Orde Produksi
+DocType: Restaurant Reservation,Waitlisted,Daftar tunggu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Mata uang tidak dapat diubah setelah melakukan entri menggunakan beberapa mata uang lainnya
 DocType: Vehicle Service,Clutch Plate,clutch Plat
 DocType: Company,Round Off Account,Akun Pembulatan
@@ -4828,18 +4919,18 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nama baru Sales Person
 DocType: Packing Slip,Gross Weight UOM,UOM Berat Kotor
 DocType: Delivery Note Item,Against Sales Invoice,Terhadap Faktur Penjualan
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Harap masukkan nomor seri untuk item serial
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Harap masukkan nomor seri untuk item serial
 DocType: Bin,Reserved Qty for Production,Dicadangkan Jumlah Produksi
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Biarkan tidak dicentang jika Anda tidak ingin mempertimbangkan batch sambil membuat kelompok berbasis kursus.
 DocType: Asset,Frequency of Depreciation (Months),Frekuensi Penyusutan (Bulan)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +493,Credit Account,Akun kredit
 DocType: Landed Cost Item,Landed Cost Item,Jenis Barang Biaya Landing
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Tampilkan nilai nol
-DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Jumlah Stok Barang yang diperoleh setelah manufaktur / repacking dari mengingat jumlah bahan baku
+DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Jumlah Kuantitas Produk yang dihasilkan dari proses manufakturing / repacking dari jumlah kuantitas bahan baku yang disediakan
 DocType: Lab Test,Test Group,Grup Uji
 DocType: Payment Reconciliation,Receivable / Payable Account,Piutang / Account Payable
-DocType: Delivery Note Item,Against Sales Order Item,Terhadap Stok Barang di Order Penjualan
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Silakan tentukan Atribut Nilai untuk atribut {0}
+DocType: Delivery Note Item,Against Sales Order Item,Terhadap Barang di Order Penjualan
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Silakan tentukan Atribut Nilai untuk atribut {0}
 DocType: Item,Default Warehouse,Standar Gudang
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Anggaran tidak dapat diberikan terhadap Account Group {0}
 DocType: Healthcare Settings,Patient Registration,Pendaftaran Pasien
@@ -4868,9 +4959,10 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Sales Person
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Anggaran dan Pusat Biaya
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Beberapa modus pembayaran default tidak diperbolehkan
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,Untuk
 ,Appointment Analytics,Penunjukan Analytics
 DocType: Vehicle Service,Half Yearly,Setengah Tahunan
-DocType: Lead,Blog Subscriber,Blog Subscriber
+DocType: Lead,Blog Subscriber,Pelanggan Blog
 DocType: Guardian,Alternate Number,Jumlah alternatif
 DocType: Healthcare Settings,Consultations in valid days,Konsultasi di hari yang benar
 DocType: Assessment Plan Criteria,Maximum Score,Skor maksimum
@@ -4882,10 +4974,10 @@
 DocType: Purchase Invoice,Total Advance,Jumlah Uang Muka
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Ubah Kode Template
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Jangka Tanggal Akhir tidak dapat lebih awal dari tanggal Term Start. Perbaiki tanggal dan coba lagi.
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Jumlah kuota
-,BOM Stock Report,Laporan BOM Persediaan
-DocType: Stock Reconciliation Item,Quantity Difference,kuantitas Perbedaan
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Pengolahan Payroll
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,"Jumlah ""Penawaran"""
+,BOM Stock Report,Laporan Persediaan BOM
+DocType: Stock Reconciliation Item,Quantity Difference,Perbedaan Kuantitas
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Pengolahan Payroll
 DocType: Opportunity Item,Basic Rate,Harga Dasar
 DocType: GL Entry,Credit Amount,Jumlah kredit
 DocType: Cheque Print Template,Signatory Position,Posisi penandatangan
@@ -4899,12 +4991,12 @@
 DocType: Tax Rule,Tax Rule,Aturan pajak
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Pertahankan Tarif Sama Sepanjang Siklus Penjualan
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Rencana waktu log luar Jam Kerja Workstation.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Pelanggan di Antrian
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} tidak memiliki Jadwal Dokter. Tambahkan di master dokter
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Pelanggan di Antrian
 DocType: Student,Nationality,Kebangsaan
 ,Items To Be Requested,Items Akan Diminta
-DocType: Purchase Order,Get Last Purchase Rate,Dapatkan Terakhir Purchase Rate
 DocType: Company,Company Info,Info Perusahaan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Pilih atau menambahkan pelanggan baru
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Pilih atau menambahkan pelanggan baru
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,pusat biaya diperlukan untuk memesan klaim biaya
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Penerapan Dana (Aset)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Hal ini didasarkan pada kehadiran Karyawan ini
@@ -4912,8 +5004,9 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Akun Debit
 DocType: Fiscal Year,Year Start Date,Tanggal Mulai Tahun
 DocType: Attendance,Employee Name,Nama Karyawan
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Item Item Pemesanan Restoran
 DocType: Sales Invoice,Rounded Total (Company Currency),Rounded Jumlah (Perusahaan Mata Uang)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Tidak dapat mengkonversi ke Grup karena Account Type dipilih.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Tidak dapat mengkonversi ke Grup karena Tipe Akun dipilih.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} telah dimodifikasi. Silahkan me-refresh.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Menghentikan pengguna dari membuat Aplikasi Leave pada hari-hari berikutnya.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Jumlah pembelian
@@ -4922,6 +5015,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Manfaat Karyawan
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Dikemas kuantitas harus sama kuantitas untuk Item {0} berturut-turut {1}
 DocType: Production Order,Manufactured Qty,Qty Diproduksi
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Faktur dibuat
 DocType: Purchase Receipt Item,Accepted Quantity,Qty Diterima
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Silahkan mengatur default Liburan Daftar Karyawan {0} atau Perusahaan {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} tidak ada
@@ -4931,18 +5025,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row ada {0}: Jumlah dapat tidak lebih besar dari Pending Jumlah terhadap Beban Klaim {1}. Pending Jumlah adalah {2}
 DocType: Maintenance Schedule,Schedule,Jadwal
 DocType: Account,Parent Account,Rekening Induk
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Tersedia
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Tersedia
 DocType: Quality Inspection Reading,Reading 3,Membaca 3
 ,Hub,Pusat
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Daftar Harga tidak ditemukan atau dinonaktifkan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Daftar Harga tidak ditemukan atau dinonaktifkan
 DocType: Lab Test,Approved,Disetujui
 DocType: Pricing Rule,Price,Harga
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',Karyawan lega pada {0} harus ditetapkan sebagai 'Kiri'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Karyawan lega pada {0} harus ditetapkan sebagai 'Kiri'
+DocType: Hub Settings,Last Sync On,Sinkron Terakhir Aktif
 DocType: Guardian,Guardian,Wali
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Penilaian {0} telah dibuat untuk karyawan {1} dalam rentang tanggal tertentu
 DocType: Employee,Education,Pendidikan
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,Del
 DocType: Selling Settings,Campaign Naming By,Penamaan Kampanye Promosi dengan
 DocType: Employee,Current Address Is,Alamat saat ini adalah
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Target Penjualan Bulanan
@@ -4957,7 +5052,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Kode Kursus:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Masukan Entrikan Beban Akun
 DocType: Account,Stock,Persediaan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Dokumen Referensi Type harus menjadi salah satu Purchase Order, Faktur Pembelian atau Journal Entri"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Dokumen Referensi Type harus menjadi salah satu Purchase Order, Faktur Pembelian atau Journal Entri"
 DocType: Employee,Current Address,Alamat saat ini
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Jika item adalah varian dari item lain maka deskripsi, gambar, harga, pajak dll akan ditetapkan dari template kecuali secara eksplisit ditentukan"
 DocType: Serial No,Purchase / Manufacture Details,Detail Pembelian / Produksi
@@ -4988,7 +5083,7 @@
 DocType: Hub Settings,Hub Settings,Pengaturan Hub
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,Dengan Operasi
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Entri Akuntansi telah dibuat dalam mata uang {0} untuk perusahaan {1}. Silakan pilih akun piutang atau hutang dengan mata uang {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Entri Akuntansi telah dibuat dalam mata uang {0} untuk perusahaan {1}. Silakan pilih akun piutang atau hutang dengan mata uang {0}.
 DocType: Asset,Is Existing Asset,Apakah ada Asset
 DocType: Salary Detail,Statistical Component,Komponen statistik
 DocType: Warranty Claim,If different than customer address,Jika berbeda dari alamat pelanggan
@@ -4996,13 +5091,14 @@
 DocType: BOM Operation,BOM Operation,BOM Operation
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Pada Sebelumnya Row Jumlah
 DocType: Student,Home Address,Alamat rumah
+DocType: Item,Has Expiry Date,Memiliki Tanggal Kedaluwarsa
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Pengaturan Variasi Item.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,pengalihan Aset
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,pengalihan Aset
 DocType: POS Profile,POS Profile,POS Profil
 DocType: Training Event,Event Name,Nama acara
 DocType: Physician,Phone (Office),Telepon (Kantor)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,Penerimaan
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Penerimaan untuk {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,Penerimaan
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Penerimaan untuk {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Musiman untuk menetapkan anggaran, target dll"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Nama variabel
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Item {0} adalah template, silahkan pilih salah satu variannya"
@@ -5011,7 +5107,7 @@
 DocType: Assessment Plan,Room,Kamar
 DocType: Purchase Order,Advance Paid,Pembayaran Dimuka (Advance)
 DocType: Item,Item Tax,Pajak Stok Barang
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Bahan untuk Supplier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Bahan untuk Supplier
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Cukai Faktur
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% muncul lebih dari sekali
 DocType: Expense Claim,Employees Email Id,ID Email Karyawan
@@ -5022,33 +5118,31 @@
 DocType: Program,Program Name,Program Nama
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Pertimbangkan Pajak atau Biaya untuk
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Qty Aktual wajib diisi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} saat ini memiliki {1} posisi Supplier Scorecard, dan Pesanan Pembelian untuk pemasok ini harus dikeluarkan dengan hati-hati."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} saat ini memiliki {1} posisi Supplier Scorecard, dan Pesanan Pembelian untuk pemasok ini harus dikeluarkan dengan hati-hati."
 DocType: Employee Loan,Loan Type,Jenis pinjaman
 DocType: Scheduling Tool,Scheduling Tool,Alat penjadwalan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Kartu Kredit
 DocType: BOM,Item to be manufactured or repacked,Item yang akan diproduksi atau dikemas ulang
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Pengaturan standar untuk transaksi persediaan.
-DocType: Purchase Invoice,Next Date,Tanggal Berikutnya
 DocType: Employee Education,Major/Optional Subjects,Mayor / Opsional Subjek
 DocType: Sales Invoice Item,Drop Ship,Pengiriman Drop Ship
+DocType: Hub Settings,Suspended,Tergantung
 DocType: Training Event,Attendees,peserta
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Di sini Anda dapat mempertahankan rincian keluarga seperti nama dan pekerjaan orang tua, pasangan dan anak-anak"
 DocType: Academic Term,Term End Date,Istilah Tanggal Akhir
-DocType: Hub Settings,Seller Name,Nama Penjual
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Pajak dan Biaya Dikurangi (Perusahaan Mata Uang)
 DocType: Item Group,General Settings,Pengaturan Umum
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Dari Mata dan Mata Uang Untuk tidak bisa sama
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Tambahkan Instruktur
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Anda harus menyimpan formulir sebelum melanjutkan
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Silahkan pilih Perusahaan terlebih dahulu
 DocType: Item Attribute,Numeric Values,Nilai numerik
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Pasang Logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Tingkat Persediaan
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Tingkat Persediaan
 DocType: Customer,Commission Rate,Tingkat Komisi
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Menciptakan {0} scorecard untuk {1} antara:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Buat Varian
-apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Memblokir aplikasi cuti berdasarkan departemen.
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Buat Varian
+apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blok aplikasi cuti per departemen
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Jenis Pembayaran harus menjadi salah satu Menerima, Pay dan Internal Transfer"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Cart adalah Kosong
@@ -5062,11 +5156,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Modal / Saham
 DocType: Shopping Cart Settings,Show Public Attachments,Tampilkan Lampiran Umum
 DocType: Packing Slip,Package Weight Details,Paket Berat Detail
+DocType: Restaurant Reservation,Reservation Time,Waktu Reservasi
 DocType: Payment Gateway Account,Payment Gateway Account,Pembayaran Rekening Gateway
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Setelah selesai pembayaran mengarahkan pengguna ke halaman yang dipilih.
 DocType: Company,Existing Company,Perusahaan yang ada
 DocType: Healthcare Settings,Result Emailed,Hasil Diemailkan
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","Kategori Pajak telah diubah menjadi ""Total"" karena semua barang adalah barang non-persediaan"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Group&gt; Brand
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Silakan pilih file csv
 DocType: Student Leave Application,Mark as Present,Tandai sebagai Hadir
 DocType: Supplier Scorecard,Indicator Color,Indikator Warna
@@ -5091,11 +5187,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Membuat Batch Mahasiswa
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Apakah Carry Teruskan
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Dapatkan item dari BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Dapatkan item dari BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Hari Masa Tenggang
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Posting Tanggal harus sama dengan tanggal pembelian {1} aset {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Periksa ini jika Siswa berada di Institute&#39;s Hostel.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Cukup masukkan Penjualan Pesanan dalam tabel di atas
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Cukup masukkan Penjualan Pesanan dalam tabel di atas
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Tidak Dikirim Gaji Slips
 ,Stock Summary,Ringkasan Persediaan
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Mentransfer aset dari satu gudang ke yang lain
@@ -5111,5 +5207,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Baris {0}: Debit masuk tidak dapat dihubungkan dengan {1}
 DocType: Journal Entry,Subscription Section,Bagian Langganan
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Akun {0} tidak ada
+DocType: Training Event,Training Program,Program pelatihan
 DocType: Account,Cash,Kas
 DocType: Employee,Short biography for website and other publications.,Biografi singkat untuk website dan publikasi lainnya.
diff --git a/erpnext/translations/is.csv b/erpnext/translations/is.csv
index c55dd44..a059166 100644
--- a/erpnext/translations/is.csv
+++ b/erpnext/translations/is.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,laun Mode
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Nýskráning
 DocType: Patient,Divorced,skilin
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Atriði þegar samstillt
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Leyfa Atriði til að bæta við mörgum sinnum í viðskiptum
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Hætta Efni Visit {0} áður hætta þessu ábyrgð kröfu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Skildu Approvers
 DocType: Sales Partner,Dealer,söluaðila
 DocType: Consultation,Investigations,Rannsóknir
+DocType: Restaurant Order Entry,Click Enter To Add,Smelltu á Enter til að bæta við
 DocType: Employee,Rented,leigt
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Gildir fyrir notanda
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Hætt framleiðslu Order er ekki hægt að hætt, Unstop það fyrst til að fá ensku"
 DocType: Vehicle Service,Mileage,mílufjöldi
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Viltu virkilega að skrappa þessa eign?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Viltu virkilega að skrappa þessa eign?
 DocType: Drug Prescription,Update Schedule,Uppfæra áætlun
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Veldu Default Birgir
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Gjaldmiðill er nauðsynlegt til verðlisti {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Athuga framboð
 DocType: Job Applicant,Job Applicant,Atvinna umsækjanda
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Þetta er byggt á viðskiptum móti þessum Birgir. Sjá tímalínu hér fyrir nánari upplýsingar
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Engar fleiri niðurstöður.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Legal
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Raunveruleg gerð skattur getur ekki verið með í Liður hlutfall í röð {0}
 DocType: Bank Guarantee,Customer,viðskiptavinur
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Gengi að vera það sama og {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nafn viðskiptavinar
 DocType: Vehicle,Natural Gas,Náttúru gas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},bankareikningur getur ekki verið nefnt sem {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},bankareikningur getur ekki verið nefnt sem {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Höfuð (eða hópar) gegn sem bókhaldsfærslum eru gerðar og jafnvægi er viðhaldið.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Framúrskarandi fyrir {0} má ekki vera minna en núll ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Það eru engar framlagðar launakröfur til að vinna úr.
 DocType: Manufacturing Settings,Default 10 mins,Default 10 mínútur
 DocType: Leave Type,Leave Type Name,Skildu Tegund Nafn
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,sýna opinn
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Nauðsynlegt er að taka þessa aðgerð í dag sjálft fyrir ofangreindum endurteknum
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Series Uppfært Tókst
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Athuga
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural Journal Entry Lögð
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Purchase Order Items að berast
 DocType: SMS Center,All Supplier Contact,Allt Birgir samband við
 DocType: Support Settings,Support Settings,Stuðningur Stillingar
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Væntanlegur Lokadagur má ekki vera minna en búist Start Date
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Væntanlegur Lokadagur má ekki vera minna en búist Start Date
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Gefa skal vera það sama og {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Ný Leave Umsókn
 ,Batch Item Expiry Status,Hópur Item Fyrning Staða
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Bank Draft
 DocType: Mode of Payment Account,Mode of Payment Account,Mode greiðslureikning
 DocType: Consultation,Consultation,Samráð
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Sala og skilar
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Sýna Afbrigði
 DocType: Academic Term,Academic Term,fræðihugtak
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,efni
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Heilbrigðisþjónusta
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Töf á greiðslu (dagar)
 DocType: Lab Prescription,Lab Prescription,Lab Prescription
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Raða eftir Verð
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,þjónusta Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Raðnúmer: {0} er nú þegar vísað í sölureikning: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,reikningur
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Raðnúmer: {0} er nú þegar vísað í sölureikning: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,reikningur
 DocType: Maintenance Schedule Item,Periodicity,tíðni
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Reikningsár {0} er krafist
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defense
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Alls Kosta Upphæð
 DocType: Delivery Note,Vehicle No,ökutæki Nei
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Vinsamlegast veldu verðskrá
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Vinsamlegast veldu verðskrá
 DocType: Accounts Settings,Currency Exchange Settings,Valmöguleikar
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Row # {0}: Greiðsla skjal er þarf til að ljúka trasaction
 DocType: Production Order Operation,Work In Progress,Verk í vinnslu
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Vinsamlegast veldu dagsetningu
 DocType: Employee,Holiday List,Holiday List
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Vinsamlega settu upp leiðbeinanda Nafnakerfi í skólanum&gt; Skólastillingar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,endurskoðandi
+DocType: Hub Settings,Selling Price List,Selja verðskrá
 DocType: Patient,Tobacco Current Use,Núverandi notkun tóbaks
 DocType: Cost Center,Stock User,Stock User
 DocType: Company,Phone No,Sími nei
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Course Skrár búið:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},New {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},New {0}: # {1}
 ,Sales Partners Commission,Velta Partners Commission
 DocType: Purchase Invoice,Rounding Adjustment,Afrennslisbreyting
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Skammstöfun getur ekki haft fleiri en 5 stafi
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Parent Detail DOCNAME
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Tilvísun: {0}, Liður: {1} og Viðskiptavinur: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,kg
-DocType: Student Log,Log,Log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Opnun fyrir Job.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Niðurstöður sendar inn
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Niðurstöður sendar inn
 DocType: Item Attribute,Increment,vöxtur
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Tímabil
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Veldu Warehouse ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,giftur
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Ekki leyft {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Fá atriði úr
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Stock Ekki er hægt að uppfæra móti afhendingarseðlinum {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Stock Ekki er hægt að uppfæra móti afhendingarseðlinum {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Vara {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Engin atriði skráð
 DocType: Payment Reconciliation,Reconcile,sætta
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,lífeyrissjóðir
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Næsta Afskriftir Dagsetning má ekki vera áður kaupdegi
 DocType: Consultation,Consultation Date,Samráðsdagur
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Vörulisti og uppgötvun fyrir ERPNext notendur
 DocType: SMS Center,All Sales Person,Allt Sales Person
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Mánaðarleg dreifing ** hjálpar þér að dreifa fjárhagsáætlunar / Target yfir mánuði ef þú ert árstíðasveiflu í fyrirtæki þínu.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Ekki atriði fundust
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Laun Uppbygging vantar
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Ekki atriði fundust
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Laun Uppbygging vantar
 DocType: Lead,Person Name,Sá Name
 DocType: Sales Invoice Item,Sales Invoice Item,Velta Invoice Item
 DocType: Account,Credit,Credit
 DocType: POS Profile,Write Off Cost Center,Skrifaðu Off Kostnaður Center
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",td &quot;Primary School&quot; eða &quot;University&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",td &quot;Primary School&quot; eða &quot;University&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,lager Skýrslur
 DocType: Warehouse,Warehouse Detail,Warehouse Detail
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Hámarksupphæð hefur verið yfir fyrir viðskiptavin {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Hugtakið Lokadagur getur ekki verið síðar en árslok Dagsetning skólaárið sem hugtakið er tengt (skólaárið {}). Vinsamlega leiðréttu dagsetningar og reyndu aftur.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Er Fast Asset&quot; getur ekki verið valið, eins Asset met hendi á móti hlut"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Er Fast Asset&quot; getur ekki verið valið, eins Asset met hendi á móti hlut"
 DocType: Vehicle Service,Brake Oil,Brake Oil
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Viðskiptavinur&gt; Viðskiptavinahópur&gt; Territory
 DocType: Tax Rule,Tax Type,Tax Type
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Skattskyld fjárhæð
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Þú hefur ekki heimild til að bæta við eða endurnýja færslum áður {0}
 DocType: BOM,Item Image (if not slideshow),Liður Image (ef ekki myndasýning)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,An Viðskiptavinur til staðar með sama nafni
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hour Rate / 60) * Raunveruleg Rekstur Time
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Tilvísun Document Type verður að vera einn af kostnaðarkröfu eða dagbókarfærslu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Veldu BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Tilvísun Document Type verður að vera einn af kostnaðarkröfu eða dagbókarfærslu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Veldu BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kostnaður við afhent Items
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,The frídagur á {0} er ekki á milli Frá Dagsetning og hingað
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,starfsmaður Lán
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Afþreying Log:
 DocType: Fee Schedule,Send Payment Request Email,Sendu inn beiðni um greiðslubeiðni
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Liður {0} er ekki til í kerfinu eða er útrunnið
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Liður {0} er ekki til í kerfinu eða er útrunnið
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Fasteign
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Reikningsyfirlit
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
@@ -210,17 +213,22 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,innflutningur Log
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Dragðu Material Beiðni um gerð Framleiðsla byggt á ofangreindum forsendum
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Árangurslaust óskráð.
 DocType: Training Result Employee,Grade,bekk
+DocType: Restaurant Table,No of Seats,Nei sæti
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>",Til að bæta við hreyfimyndum skaltu nota jinja tags eins og <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>
 DocType: Sales Invoice Item,Delivered By Supplier,Samþykkt með Birgir
 DocType: SMS Center,All Contact,Allt samband við
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Framleiðslu Order þegar búið fyrir öll atriði með BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Framleiðslu Order þegar búið fyrir öll atriði með BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,árslaunum
 DocType: Daily Work Summary,Daily Work Summary,Daily Work Yfirlit
 DocType: Period Closing Voucher,Closing Fiscal Year,Lokun fjárhagsársins
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} er frosinn
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Vinsamlegast veldu núverandi fyrirtæki til að búa til töflu yfir reikninga
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} er frosinn
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Vinsamlegast veldu núverandi fyrirtæki til að búa til töflu yfir reikninga
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,lager Útgjöld
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Veldu Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Veldu Target Warehouse
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Vinsamlegast sláðu Valinn netfangi
 DocType: Program Enrollment,School Bus,Skólabíll
 DocType: Journal Entry,Contra Entry,contra Entry
@@ -237,9 +245,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Sæktu sniðmát, fylla viðeigandi gögn og hengja við um hana. Allt dagsetningar og starfsmaður samspil völdu tímabili mun koma í sniðmát, með núverandi aðsóknarmet"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Liður {0} er ekki virkur eða enda líf hefur verið náð
+DocType: Student Admission Program,Minimum Age,Lágmarksaldur
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Dæmi: Basic stærðfræði
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Til eru skatt í röð {0} í lið gengi, skatta í raðir {1} skal einnig"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Stillingar fyrir HR Module
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Stillingar fyrir HR Module
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Breyta Upphæð
 DocType: BOM Update Tool,New BOM,ný BOM
@@ -249,7 +258,7 @@
 DocType: Lead,Request Type,Beiðni Type
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,gera starfsmanni
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Broadcasting
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Bæta við herbergjum
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Uppsetningarhamur POS (Online / Offline)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,framkvæmd
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Upplýsingar um starfsemi fram.
 DocType: Serial No,Maintenance Status,viðhald Staða
@@ -272,6 +281,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Verðlisti verður að gilda fyrir að kaupa eða selja
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Uppsetning dagsetning getur ekki verið áður fæðingardag fyrir lið {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Afsláttur á verðlista Rate (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Lífefnafræði
 DocType: Offer Letter,Select Terms and Conditions,Valið Skilmálar og skilyrði
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,út Value
 DocType: Production Planning Tool,Sales Orders,velta Pantanir
@@ -306,15 +316,15 @@
 DocType: Sales Partner,Reseller,sölumaður
 DocType: Codification Table,Medical Code,Læknisbók
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.",Ef hakað Mun fela ekki lager vörur í efni beiðnir.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Vinsamlegast sláðu Company
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Vinsamlegast sláðu Company
 DocType: Delivery Note Item,Against Sales Invoice Item,Gegn sölureikningi Item
 ,Production Orders in Progress,Framleiðslu Pantanir í vinnslu
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Handbært fé frá fjármögnun
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage er fullt, ekki spara"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage er fullt, ekki spara"
 DocType: Lead,Address & Contact,Heimilisfang &amp; Hafa samband
 DocType: Leave Allocation,Add unused leaves from previous allocations,Bæta ónotuðum blöð frá fyrri úthlutanir
 DocType: Sales Partner,Partner website,Vefsíða Partner
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Bæta Hlutir
+DocType: Restaurant Order Entry,Add Item,Bæta Hlutir
 DocType: Lab Test,Custom Result,Sérsniðin árangur
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Nafn tengiliðar
 DocType: Course Assessment Criteria,Course Assessment Criteria,Námsmat Viðmið
@@ -327,7 +337,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Beiðni um kaupin.
 DocType: Lab Test,Submitted Date,Sendingardagur
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Þetta er byggt á tímaskýrslum skapast gagnvart þessu verkefni
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Net Borga má ekki vera minna en 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Net Borga má ekki vera minna en 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",Til að hætta að senda endurteknar villuboð frá kerfinu höfum við valið fatlaða reit í áskriftinni
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Aðeins valdir Leave samþykki getur sent þetta leyfi Umsókn
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Létta Dagsetning verður að vera hærri en Dagsetning Tengja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Leaves á ári
@@ -336,9 +347,10 @@
 DocType: Email Digest,Profit & Loss,Hagnaður &amp; Tap
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Litre
 DocType: Task,Total Costing Amount (via Time Sheet),Total kostnaðarútreikninga Magn (með Time Sheet)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Vinsamlegast settu upp nemendur undir nemendahópum
 DocType: Item Website Specification,Item Website Specification,Liður Website Specification
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Skildu Bannaður
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Liður {0} hefur náð enda sitt líf á {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Liður {0} hefur náð enda sitt líf á {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Bank Entries
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Árleg
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Sættir Item
@@ -347,7 +359,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Creation Tool Course
 DocType: Lead,Do Not Contact,Ekki samband
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,Fólk sem kenna í fyrirtæki þínu
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Einstök id til að rekja allar endurteknar reikninga. Það er myndaður á senda.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Forritari
 DocType: Item,Minimum Order Qty,Lágmark Order Magn
 DocType: Pricing Rule,Supplier Type,birgir Type
@@ -357,17 +368,19 @@
 DocType: Item,Publish in Hub,Birta á Hub
 DocType: Student Admission,Student Admission,Student Aðgangseyrir
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Liður {0} er hætt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,efni Beiðni
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Liður {0} er hætt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,efni Beiðni
 DocType: Bank Reconciliation,Update Clearance Date,Uppfæra Úthreinsun Dagsetning
 DocType: Item,Purchase Details,kaup Upplýsingar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Liður {0} fannst ekki í &#39;hráefnum Meðfylgjandi&#39; borð í Purchase Order {1}
 DocType: Patient Relation,Relation,relation
 DocType: Shipping Rule,Worldwide Shipping,Worldwide Shipping
 DocType: Patient Relation,Mother,móðir
+DocType: Restaurant Reservation,Reservation End Time,Afgreiðslutími
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Staðfest pantanir frá viðskiptavinum.
 DocType: Purchase Receipt Item,Rejected Quantity,hafnað Magn
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Greiðslubeiðni {0} búið til
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Greiðslubeiðni {0} búið til
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Lágt næmi
 DocType: Notification Control,Notification Control,Tilkynning Control
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Vinsamlegast staðfestu þegar þú hefur lokið þjálfun þinni
 DocType: Lead,Suggestions,tillögur
@@ -387,7 +400,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Póst laun miði að starfsmaður byggðar á völdum tölvupósti völdum í Launþegi
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Fyrsti Leyfi samþykkjari á listanum verður sett sem sjálfgefið Leave samþykkjari
 DocType: Tax Rule,Shipping County,Sendingar County
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Frekari
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Frekari
 DocType: Asset,Next Depreciation Date,Næsta Afskriftir Dagsetning
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Virkni Kostnaður á hvern starfsmann
 DocType: Accounts Settings,Settings for Accounts,Stillingar fyrir reikninga
@@ -398,13 +411,13 @@
 DocType: Item,Synced With Hub,Samstillt Með Hub
 DocType: Vehicle,Fleet Manager,Fleet Manager
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} getur ekki verið neikvæð fyrir atriðið {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Rangt lykilorð
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Rangt lykilorð
 DocType: Item,Variant Of,afbrigði af
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Lokið Magn má ekki vera meiri en &#39;Magn í Manufacture&#39;
 DocType: Period Closing Voucher,Closing Account Head,Loka reikningi Head
 DocType: Employee,External Work History,Ytri Vinna Saga
 DocType: Physician,Time per Appointment,Tími fyrir hvert skipun
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Hringlaga Tilvísun Villa
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Hringlaga Tilvísun Villa
 DocType: Appointment Type,Is Inpatient,Er sjúklingur
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 Name
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Í orðum (Export) verður sýnileg þegar þú hefur vistað Afhending Ath.
@@ -413,19 +426,18 @@
 DocType: Lead,Industry,Iðnaður
 DocType: Employee,Job Profile,Atvinna Profile
 DocType: BOM Item,Rate & Amount,Röð og upphæð
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vinsamlegast settu upp flokkunarnúmer fyrir þátttöku í gegnum skipulag&gt; Numbers Series
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Þetta byggist á viðskiptum gegn þessu fyrirtæki. Sjá tímalínu fyrir neðan til að fá nánari upplýsingar
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Tilkynna með tölvupósti á sköpun sjálfvirka Material Beiðni
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Þola
 DocType: Journal Entry,Multi Currency,multi Gjaldmiðill
 DocType: Payment Reconciliation Invoice,Invoice Type,Reikningar Type
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Viðskiptavinur&gt; Viðskiptavinahópur&gt; Territory
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Afhendingarseðilinn
 DocType: Consultation,Encounter Impression,Fundur birtingar
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Setja upp Skattar
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Kostnaðarverð seldrar Eignastýring
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,Greiðsla Entry hefur verið breytt eftir að þú draga það. Vinsamlegast rífa það aftur.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} slá inn tvisvar í lið Tax
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Samantekt fyrir þessa viku og bið starfsemi
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} slá inn tvisvar í lið Tax
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Samantekt fyrir þessa viku og bið starfsemi
 DocType: Student Applicant,Admitted,viðurkenndi
 DocType: Workstation,Rent Cost,Rent Kostnaður
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Upphæð Eftir Afskriftir
@@ -439,36 +451,35 @@
 DocType: Shipping Rule,Valid for Countries,Gildir fyrir löndum
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Þetta atriði er sniðmát og ekki er hægt að nota í viðskiptum. Item eiginleika verður að afrita yfir í afbrigði nema &quot;Enginn Afrita&quot; er sett
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Pöntunin Talin
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Starfsmaður tilnefningu (td forstjóri, framkvæmdastjóri osfrv)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Starfsmaður tilnefningu (td forstjóri, framkvæmdastjóri osfrv)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Gengi sem viðskiptavinir Gjaldmiðill er breytt til grunngj.miðil viðskiptavinarins
 DocType: Course Scheduling Tool,Course Scheduling Tool,Auðvitað Tímasetningar Tool
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Kaup Invoice ekki hægt að gera við núverandi eign {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Urgent] Villa við að búa til endurtekin% s fyrir% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Urgent] Villa við að búa til endurtekin% s fyrir% s
 DocType: Item Tax,Tax Rate,skatthlutfall
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} þegar úthlutað fyrir starfsmann {1} fyrir tímabilið {2} til {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Veldu Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Veldu Item
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Purchase Invoice {0} er þegar lögð
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Hópur Nei verður að vera það sama og {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Umbreyta til non-Group
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Hópur (fullt) af hlut.
 DocType: C-Form Invoice Detail,Invoice Date,Dagsetning reiknings
 DocType: GL Entry,Debit Amount,debet Upphæð
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Það getur aðeins verið 1 Account á félaginu í {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Vinsamlega sjá viðhengi
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Það getur aðeins verið 1 Account á félaginu í {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Vinsamlega sjá viðhengi
 DocType: Purchase Order,% Received,% móttekin
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Búa Student Hópar
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Skipulag þegar lokið !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Skipulag þegar lokið !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Lánshæð upphæð
 DocType: Setup Progress Action,Action Document,Aðgerð skjal
 ,Finished Goods,fullunnum
 DocType: Delivery Note,Instructions,leiðbeiningar
 DocType: Quality Inspection,Inspected By,skoðað með
 DocType: Maintenance Visit,Maintenance Type,viðhald Type
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} er ekki skráður í námskeiðið {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Vörunúmer&gt; Liðurhópur&gt; Vörumerki
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} er ekki skráður í námskeiðið {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial Nei {0} ekki tilheyra afhendingarseðlinum {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Bæta Hlutir
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Bæta Hlutir
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Item Quality Inspection Parameter
 DocType: Leave Application,Leave Approver Name,Skildu samþykkjari Nafn
 DocType: Depreciation Schedule,Schedule Date,Dagskrá Dags
@@ -488,7 +499,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Vinnutími
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Breyta upphafsdegi / núverandi raðnúmer núverandi röð.
 DocType: Dosage Strength,Strength,Styrkur
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Búa til nýja viðskiptavini
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Búa til nýja viðskiptavini
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ef margir Verðlagning Reglur halda áfram að sigra, eru notendur beðnir um að setja Forgangur höndunum til að leysa deiluna."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Búa innkaupapantana
 ,Purchase Register,kaup Register
@@ -507,7 +518,7 @@
 DocType: Lab Test Template,Single,Single
 DocType: Salary Slip,Total Loan Repayment,Alls Loan Endurgreiðsla
 DocType: Account,Cost of Goods Sold,Kostnaður af seldum vörum
-DocType: Purchase Invoice,Yearly,Árlega
+DocType: Subscription,Yearly,Árlega
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Vinsamlegast sláðu Kostnaður Center
 DocType: Drug Prescription,Dosage,Skammtar
 DocType: Journal Entry Account,Sales Order,Sölupöntun
@@ -537,7 +548,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Global stillingar fyrir alla framleiðsluaðferðum.
 DocType: Accounts Settings,Accounts Frozen Upto,Reikninga Frozen uppí
 DocType: SMS Log,Sent On,sendi á
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Eiginleiki {0} valin mörgum sinnum í eigindum töflu
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Eiginleiki {0} valin mörgum sinnum í eigindum töflu
 DocType: HR Settings,Employee record is created using selected field. ,Starfsmaður færsla er búin til með völdu sviði.
 DocType: Sales Order,Not Applicable,Á ekki við
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday skipstjóri.
@@ -562,13 +573,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Samtals lauf úthlutað er nauðsynlegur
 DocType: Patient,AB Positive,AB Jákvæð
 DocType: Job Opening,Description of a Job Opening,Lýsing á starf opnun
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Bið starfsemi fyrir dag
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Bið starfsemi fyrir dag
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Aðsókn met.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Laun Component fyrir timesheet byggt launaskrá.
 DocType: Sales Order Item,Used for Production Plan,Notað fyrir framleiðslu áætlun
 DocType: Employee Loan,Total Payment,Samtals greiðsla
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tími milli rekstrar (í mín)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} er lokað þannig að aðgerðin er ekki hægt að ljúka
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} er lokað þannig að aðgerðin er ekki hægt að ljúka
 DocType: Customer,Buyer of Goods and Services.,Kaupandi vöru og þjónustu.
 DocType: Journal Entry,Accounts Payable,Viðskiptaskuldir
 DocType: Patient,Allergies,Ofnæmi
@@ -580,22 +591,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Varið innkaupapantanir
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Listi nokkrar af viðskiptavinum þínum. Þeir gætu verið stofnanir eða einstaklingar.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Nóg Varahlutir til að byggja
+DocType: POS Profile User,POS Profile User,POS prófíl notandi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,bein Tekjur
 DocType: Patient Appointment,Date TIme,Dagsetning Tími
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Getur ekki síað byggð á reikning, ef flokkaðar eftir reikningi"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Administrative Officer
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Vinsamlegast veldu Námskeið
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Vinsamlegast veldu Námskeið
 DocType: Codification Table,Codification Table,Codification Table
 DocType: Timesheet Detail,Hrs,Hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Vinsamlegast veldu Company
 DocType: Stock Entry Detail,Difference Account,munurinn Reikningur
 DocType: Purchase Invoice,Supplier GSTIN,Birgir GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Get ekki loka verkefni eins háð verkefni hennar {0} er ekki lokað.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,Vinsamlegast sláðu Warehouse sem efni Beiðni verði hækkað
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Get ekki loka verkefni eins háð verkefni hennar {0} er ekki lokað.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Vinsamlegast sláðu Warehouse sem efni Beiðni verði hækkað
 DocType: Production Order,Additional Operating Cost,Viðbótarupplýsingar rekstrarkostnaður
 DocType: Lab Test Template,Lab Routine,Lab Routine
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,snyrtivörur
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Að sameinast, eftirfarandi eiginleika verða að vera það sama fyrir bæði atriði"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Að sameinast, eftirfarandi eiginleika verða að vera það sama fyrir bæði atriði"
 DocType: Shipping Rule,Net Weight,Net Weight
 DocType: Employee,Emergency Phone,Neyðarnúmer Sími
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,kaupa
@@ -605,7 +617,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Vinsamlegast tilgreindu einkunn fyrir Þröskuld 0%
 DocType: Sales Order,To Deliver,til Bera
 DocType: Purchase Invoice Item,Item,Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Serial engin lið getur ekki verið brot
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Hár næmi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Serial engin lið getur ekki verið brot
 DocType: Journal Entry,Difference (Dr - Cr),Munur (Dr - Cr)
 DocType: Account,Profit and Loss,Hagnaður og tap
 DocType: Patient,Risk Factors,Áhættuþættir
@@ -614,7 +627,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Annast undirverktöku
 DocType: Vital Signs,Body Temperature,Líkamshiti
 DocType: Project,Project will be accessible on the website to these users,Verkefnið verður aðgengilegur á vef þessara notenda
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Skilgreindu tegund verkefnisins.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Skilgreindu tegund verkefnisins.
 DocType: Supplier Scorecard,Weighting Function,Vigtunarhlutverk
 DocType: Physician,OP Consulting Charge,OP ráðgjöf gjald
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Setjið upp
@@ -628,7 +641,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Vöxtur getur ekki verið 0
 DocType: Production Planning Tool,Material Requirement,efni Krafa
 DocType: Company,Delete Company Transactions,Eyða Transactions Fyrirtækið
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Tilvísun Nei og Frestdagur er nauðsynlegur fyrir banka viðskiptin
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Tilvísun Nei og Frestdagur er nauðsynlegur fyrir banka viðskiptin
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Bæta við / breyta sköttum og gjöldum
 DocType: Payment Entry Reference,Supplier Invoice No,Birgir Reikningur nr
 DocType: Territory,For reference,til viðmiðunar
@@ -636,12 +649,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Ekki hægt að eyða Serial Nei {0}, eins og það er notað í lager viðskiptum"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Lokun (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Halló
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,færa Item
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,færa Item
 DocType: Serial No,Warranty Period (Days),Ábyrgðartímabilið (dagar)
 DocType: Installation Note Item,Installation Note Item,Uppsetning Note Item
 DocType: Production Plan Item,Pending Qty,Bíður Magn
 DocType: Budget,Ignore,Hunsa
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} er ekki virkur
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} er ekki virkur
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Skipulag athuga mál fyrir prentun
 DocType: Salary Slip,Salary Slip Timesheet,Laun Slip Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Birgir Warehouse nauðsynlegur fyrir undirverktaka Kvittun
@@ -650,7 +663,7 @@
 DocType: Pricing Rule,Sales Partner,velta Partner
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Allir birgir skorar.
 DocType: Buying Settings,Purchase Receipt Required,Kvittun Áskilið
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Verðmat Rate er nauðsynlegur ef Opnun Stock inn
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,Verðmat Rate er nauðsynlegur ef Opnun Stock inn
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Engar færslur finnast í Invoice töflunni
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Vinsamlegast veldu Company og Party Gerð fyrst
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Financial / bókhald ári.
@@ -687,7 +700,7 @@
 DocType: Quotation,Quotation To,Tilvitnun Til
 DocType: Lead,Middle Income,Middle Tekjur
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default Mælieiningin fyrir lið {0} Ekki er hægt að breyta beint vegna þess að þú hefur nú þegar gert nokkrar viðskiptin (s) með öðru UOM. Þú þarft að búa til nýjan hlut til að nota aðra Sjálfgefin UOM.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default Mælieiningin fyrir lið {0} Ekki er hægt að breyta beint vegna þess að þú hefur nú þegar gert nokkrar viðskiptin (s) með öðru UOM. Þú þarft að búa til nýjan hlut til að nota aðra Sjálfgefin UOM.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Úthlutað magn getur ekki verið neikvæð
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Vinsamlegast settu fyrirtækið
 DocType: Purchase Order Item,Billed Amt,billed Amt
@@ -701,6 +714,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Veldu Greiðslureikningur að gera Bank Entry
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Búa Employee skrár til að stjórna lauf, kostnað kröfur og launaskrá"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Ávísunartímabil
+DocType: Restaurant Reservation,Restaurant Reservation,Veitingahús pöntun
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Tillaga Ritun
 DocType: Payment Entry Deduction,Payment Entry Deduction,Greiðsla Entry Frádráttur
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Annar velta manneskja {0} staðar með sama Starfsmannafélag id
@@ -708,7 +722,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Masters
 DocType: Assessment Plan,Maximum Assessment Score,Hámarks Mat Einkunn
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Update viðskipta banka Dagsetningar
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,tími mælingar
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,tími mælingar
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,LYFJAFYRIR FYRIRTÆKJA
 DocType: Fiscal Year Company,Fiscal Year Company,Reikningsár Company
 DocType: Packing Slip Item,DN Detail,DN Detail
@@ -716,8 +730,9 @@
 DocType: Timesheet,Billed,billed
 DocType: Batch,Batch Description,hópur Lýsing
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Búa til nemendahópa
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.",Greiðsla Gateway Reikningur ekki búin skaltu búa til einn höndunum.
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.",Greiðsla Gateway Reikningur ekki búin skaltu búa til einn höndunum.
 DocType: Supplier Scorecard,Per Year,Hvert ár
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Ekki hæfur til að taka þátt í þessu forriti samkvæmt DOB
 DocType: Sales Invoice,Sales Taxes and Charges,Velta Skattar og gjöld
 DocType: Employee,Organization Profile,Organization Profile
 DocType: Vital Signs,Height (In Meter),Hæð (í metra)
@@ -753,7 +768,7 @@
 DocType: Student Batch Name,Batch Name,hópur Name
 DocType: Fee Validity,Max number of visit,Hámarksfjöldi heimsókna
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet búið:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Vinsamlegast settu sjálfgefinn Cash eða bankareikning í háttur á greiðslu {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Vinsamlegast settu sjálfgefinn Cash eða bankareikning í háttur á greiðslu {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,innritast
 DocType: GST Settings,GST Settings,GST Stillingar
 DocType: Selling Settings,Customer Naming By,Viðskiptavinur Nafngift By
@@ -785,15 +800,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landað Kostnaður Skattar og gjöld
 DocType: Production Order Operation,Actual Start Time,Raunveruleg Start Time
 DocType: BOM Operation,Operation Time,Operation Time
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Ljúka
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Ljúka
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Base
 DocType: Timesheet,Total Billed Hours,Samtals Greidd Hours
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Skrifaðu Off Upphæð
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Skrifaðu Off Upphæð
 DocType: Leave Block List Allow,Allow User,að leyfa notanda
 DocType: Journal Entry,Bill No,Bill Nei
 DocType: Company,Gain/Loss Account on Asset Disposal,Hagnaður / tap reikning á Asset förgun
 DocType: Vehicle Log,Service Details,Upplýsingar um þjónustu
-DocType: Purchase Invoice,Quarterly,ársfjórðungslega
+DocType: Subscription,Quarterly,ársfjórðungslega
 DocType: Lab Test Template,Grouped,Flokkað
 DocType: Selling Settings,Delivery Note Required,Afhending Note Áskilið
 DocType: Bank Guarantee,Bank Guarantee Number,Bankareikningsnúmer
@@ -802,12 +817,12 @@
 DocType: Student Attendance,Student Attendance,Student Aðsókn
 DocType: Sales Invoice Timesheet,Time Sheet,Tímatafla
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Raw Materials miðað við
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Vinsamlegast sláðu inn Item upplýsingar
 DocType: Interest,Interest,vextir
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Forsala
 DocType: Purchase Receipt,Other Details,aðrar upplýsingar
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Lab Test,Test Template,Próf sniðmát
+DocType: Restaurant Order Entry Item,Served,Served
 DocType: Account,Accounts,Reikningar
 DocType: Vehicle,Odometer Value (Last),Kílómetramæli Value (Last)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Sniðmát af forsendukortum.
@@ -819,25 +834,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Preview Laun Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Reikningur {0} hefur verið slegið mörgum sinnum
 DocType: Account,Expenses Included In Valuation,Kostnaður í Verðmat
-DocType: Hub Settings,Seller City,Seljandi City
 ,Absent Student Report,Absent Student Report
 DocType: Email Digest,Next email will be sent on:,Næst verður send í tölvupósti á:
 DocType: Offer Letter Term,Offer Letter Term,Tilboð Letter Term
 DocType: Supplier Scorecard,Per Week,Á viku
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Liður hefur afbrigði.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Liður hefur afbrigði.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Samtals nemandi
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Liður {0} fannst ekki
 DocType: Bin,Stock Value,Stock Value
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,Gjaldskrár verða búnar til í bakgrunni. Ef einhver villur verður villa skilaboðin uppfærðar í dagskránni.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Fyrirtæki {0} er ekki til
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} hefur gjaldgildi til {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} hefur gjaldgildi til {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Tree Tegund
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Magn neytt á Unit
 DocType: Serial No,Warranty Expiry Date,Ábyrgð í Fyrningardagsetning
 DocType: Material Request Item,Quantity and Warehouse,Magn og Warehouse
+DocType: Hub Settings,Unregister,Afskrá
 DocType: Sales Invoice,Commission Rate (%),Þóknun Rate (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Vinsamlegast veldu Forrit
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Vinsamlegast veldu Forrit
 DocType: Project,Estimated Cost,áætlaður kostnaður
 DocType: Purchase Order,Link to material requests,Tengill á efni beiðna
+DocType: Hub Settings,Publish,Birta
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
 DocType: Journal Entry,Credit Card Entry,Credit Card Entry
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Fyrirtæki og reikningar
@@ -848,13 +865,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Loka Tækifæri Eftir daga
 ,Reserved,frátekin
 DocType: Purchase Order,Supply Raw Materials,Supply Raw Materials
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Dagsetningin sem næst verður reikningur mynda. Það er myndaður á senda.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Veltufjármunir
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} er ekki birgðir Item
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',Vinsamlegast deildu viðbrögðunum þínum við þjálfunina með því að smella á &#39;Þjálfunarniðurstaða&#39; og síðan &#39;Nýtt&#39;
 DocType: Mode of Payment Account,Default Account,Sjálfgefið Reikningur
 DocType: Payment Entry,Received Amount (Company Currency),Fékk Magn (Company Gjaldmiðill)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,Lead verður að setja ef Tækifæri er gert úr Lead
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,Lead verður að setja ef Tækifæri er gert úr Lead
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Vinsamlegast veldu viku burt daginn
 DocType: Patient,O Negative,O neikvæð
 DocType: Production Order Operation,Planned End Time,Planned Lokatími
@@ -870,10 +886,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Orka
 DocType: Opportunity,Opportunity From,tækifæri Frá
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mánaðarlaun yfirlýsingu.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Bæta við fyrirtæki
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Raðnúmer er nauðsynlegt fyrir lið {2}. Þú hefur veitt {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Raðnúmer er nauðsynlegt fyrir lið {2}. Þú hefur veitt {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Vinsamlegast veldu töflu
 DocType: BOM,Website Specifications,Vefsíða Upplýsingar
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} er ógilt netfang í &#39;viðtakendum&#39;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} er ógilt netfang í &#39;viðtakendum&#39;
 DocType: Special Test Items,Particulars,Upplýsingar
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Sýklalyf.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Frá {0} tegund {1}
@@ -881,11 +897,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Row {0}: viðskipta Factor er nauðsynlegur
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Margar verð Reglur hendi með sömu forsendum, vinsamlegast leysa deiluna með því að úthluta forgang. Verð Reglur: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ekki er hægt að slökkva eða hætta BOM eins og það er tengt við önnur BOMs
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ekki er hægt að slökkva eða hætta BOM eins og það er tengt við önnur BOMs
 DocType: Opportunity,Maintenance,viðhald
 DocType: Item Attribute Value,Item Attribute Value,Liður Attribute gildi
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Velta herferðir.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,gera timesheet
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,gera timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -923,12 +939,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Vinsamlegast sláðu inn Item fyrst
 DocType: Account,Liability,Ábyrgð
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Bundnar Upphæð má ekki vera meiri en bótafjárhæðir í Row {0}.
+DocType: Salary Detail,Do not include in total,Ekki innifalið alls
 DocType: Company,Default Cost of Goods Sold Account,Default Kostnaðarverð seldra vara reikning
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Verðskrá ekki valið
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Verðskrá ekki valið
 DocType: Employee,Family Background,Family Background
 DocType: Request for Quotation Supplier,Send Email,Senda tölvupóst
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Viðvörun: Ógild Attachment {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,engin heimild
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Viðvörun: Ógild Attachment {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,engin heimild
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Tilvitnun
 DocType: Vital Signs,Heart Rate / Pulse,Hjartsláttur / púls
 DocType: Company,Default Bank Account,Sjálfgefið Bank Account
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Að sía byggt á samningsaðila, velja Party Sláðu fyrst"
@@ -955,12 +973,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Liður Row {idx}: {DOCTYPE} {DOCNAME} er ekki til í að ofan &#39;{DOCTYPE}&#39; borð
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} er þegar lokið eða hætt
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Engin verkefni
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dagur mánaðarins sem farartæki reikningur vilja vera mynda td 05, 28 osfrv"
 DocType: Item Variant Settings,Copy Fields to Variant,Afritaðu reiti í afbrigði
 DocType: Asset,Opening Accumulated Depreciation,Opnun uppsöfnuðum afskriftum
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score þarf að vera minna en eða jafnt og 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Innritun Tool
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C-Form færslur
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C-Form færslur
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Viðskiptavinur og Birgir
 DocType: Email Digest,Email Digest Settings,Sendu Digest Stillingar
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Takk fyrir viðskiptin!
@@ -978,13 +995,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Tilvitnun Staða
 DocType: Maintenance Visit,Completion Status,Gengið Staða
 DocType: HR Settings,Enter retirement age in years,Sláðu eftirlaunaaldur í ár
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Warehouse
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Vinsamlegast veldu vöruhús
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Target Warehouse
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Vinsamlegast veldu vöruhús
 DocType: Cheque Print Template,Starting location from left edge,Byrjun stað frá vinstri kanti
 DocType: Item,Allow over delivery or receipt upto this percent,Leyfa yfir afhendingu eða viðtöku allt uppí þennan prósent
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,innflutningur Aðsókn
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Allir Item Hópar
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Allir Item Hópar
 DocType: Process Payroll,Activity Log,virkni Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Hagnaður / Tap
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Sjálfkrafa semja skilaboð á framlagningu viðskiptum.
@@ -996,7 +1013,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Áætlaðar Magn
 DocType: Sales Invoice,Payment Due Date,Greiðsla Due Date
 DocType: Drug Prescription,Interval UOM,Interval UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Liður Variant {0} er þegar til staðar með sömu eiginleika
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Liður Variant {0} er þegar til staðar með sömu eiginleika
+DocType: Item,Hub Publishing Details,Hub Publishing Upplýsingar
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;Opening&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Open Til Gera
 DocType: Notification Control,Delivery Note Message,Afhending Note Message
@@ -1016,10 +1034,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: Hráefni geta ekki verið eins og aðal atriði
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Samtals greiðsla í kvittun atriðum borðið verður að vera það sama og Samtals skatta og gjöld
 DocType: Sales Team,Incentives,Incentives
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Skráðu þig fyrir Hub
 DocType: SMS Log,Requested Numbers,umbeðin Numbers
 DocType: Production Planning Tool,Only Obtain Raw Materials,Aðeins fá hráefni
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Mat á frammistöðu.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Virkjun &#39;Nota fyrir Shopping Cart&#39;, eins og Shopping Cart er virkt og það ætti að vera að minnsta kosti einn Tax Rule fyrir Shopping Cart"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Virkjun &#39;Nota fyrir Shopping Cart&#39;, eins og Shopping Cart er virkt og það ætti að vera að minnsta kosti einn Tax Rule fyrir Shopping Cart"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Greiðsla Entry {0} er tengd við Order {1}, athuga hvort það ætti að vera dreginn sem fyrirfram í þessum reikningi."
 DocType: Sales Invoice Item,Stock Details,Stock Nánar
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Project Value
@@ -1038,12 +1057,14 @@
 DocType: Salary Slip,Working Days,Vinnudagar
 DocType: Serial No,Incoming Rate,Komandi Rate
 DocType: Packing Slip,Gross Weight,Heildarþyngd
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,Nafn fyrirtækis þíns sem þú ert að setja upp þetta kerfi.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Virkja Hub
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,Nafn fyrirtækis þíns sem þú ert að setja upp þetta kerfi.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Fela frí í algjöru nr. vinnudaga
 DocType: Job Applicant,Hold,haldið
 DocType: Employee,Date of Joining,Dagsetning Tengja
 DocType: Naming Series,Update Series,Uppfæra Series
 DocType: Supplier Quotation,Is Subcontracted,er undirverktöku
+DocType: Restaurant Table,Minimum Seating,Lágmarksstofa
 DocType: Item Attribute,Item Attribute Values,Liður eigindi gildi
 DocType: Examination Result,Examination Result,skoðun Niðurstaða
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Kvittun
@@ -1054,13 +1075,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Ekki er hægt að finna tíma rifa á næstu {0} dögum fyrir aðgerð {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan efni fyrir undireiningum
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Velta Partners og Territory
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} verður að vera virkt
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} verður að vera virkt
 DocType: Journal Entry,Depreciation Entry,Afskriftir Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Vinsamlegast veldu tegund skjals fyrst
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Hætta Efni Heimsóknir {0} áður hætta þessu Viðhald Farðu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial Nei {0} ekki tilheyra lið {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Required Magn
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Vöruhús með núverandi viðskipti er ekki hægt að breyta í höfuðbók.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Vöruhús með núverandi viðskipti er ekki hægt að breyta í höfuðbók.
 DocType: Bank Reconciliation,Total Amount,Heildarupphæð
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,internet Publishing
 DocType: Prescription Duration,Number,Númer
@@ -1071,7 +1092,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Velta Verðskrá
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Ef athugað verður viðskiptavinur búinn til, kortlagður við sjúklinginn. Sjúkratryggingar verða búnar til gegn þessum viðskiptavini. Þú getur einnig valið núverandi viðskiptavin þegar þú býrð til sjúklinga."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Birta að samstilla atriði
 DocType: Bank Reconciliation,Account Currency,Reikningur Gjaldmiðill
 DocType: Lab Test,Sample ID,Dæmi um auðkenni
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Vinsamlegast nefna umferð á reikning í félaginu
@@ -1080,11 +1100,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Starfsmaður {0} er ekki virkur eða er ekki til
 DocType: Fee Structure,Components,Hluti
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Vinsamlegast sláðu eignaflokki í lið {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Liður Afbrigði {0} uppfærð
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Liður Afbrigði {0} uppfærð
 DocType: Quality Inspection Reading,Reading 6,lestur 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Get ekki {0} {1} {2} án neikvætt framúrskarandi Reikningar
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this",til að mynda. Ef seinkað verður þú að breyta handvirkt &quot;Repeat on Day of Month&quot; reitinn hér að neðan
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Get ekki {0} {1} {2} án neikvætt framúrskarandi Reikningar
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Kaupa Reikningar Advance
-DocType: Hub Settings,Sync Now,Sync Nú
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit færslu er ekki hægt að tengja með {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Skilgreina fjárhagsáætlun fyrir fjárhagsár.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Default Bank / Cash reikningur verður sjálfkrafa uppfærð í POS Invoice þegar þetta háttur er valinn.
@@ -1096,13 +1117,13 @@
 DocType: Item,Is Purchase Item,Er Purchase Item
 DocType: Asset,Purchase Invoice,kaup Invoice
 DocType: Stock Ledger Entry,Voucher Detail No,Skírteini Detail No
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Nýr reikningur
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Nýr reikningur
 DocType: Stock Entry,Total Outgoing Value,Alls Outgoing Value
 DocType: Physician,Appointments,Ráðnir
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Opnun Dagsetning og lokadagur ætti að vera innan sama reikningsár
 DocType: Lead,Request for Information,Beiðni um upplýsingar
 ,LeaderBoard,LeaderBoard
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Sync Offline Reikningar
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Sync Offline Reikningar
 DocType: Payment Request,Paid,greiddur
 DocType: Program Fee,Program Fee,program Fee
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1121,11 +1142,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Purchase Order Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Óbein Tekjur
 DocType: Student Attendance Tool,Student Attendance Tool,Student Aðsókn Tool
+DocType: Restaurant Menu,Price List (Auto created),Verðskrá (Sjálfvirk stofnaður)
 DocType: Cheque Print Template,Date Settings,Dagsetning Stillingar
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,dreifni
 ,Company Name,nafn fyrirtækis
 DocType: SMS Center,Total Message(s),Total Message (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Veldu Atriði til flutnings
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Veldu Atriði til flutnings
 DocType: Purchase Invoice,Additional Discount Percentage,Viðbótarupplýsingar Afsláttur Hlutfall
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Skoða lista yfir öll hjálparefni myndbönd
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Veldu yfirmaður reikning bankans þar stöðva var afhent.
@@ -1142,6 +1164,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Meter
 DocType: Workstation,Electricity Cost,rafmagn Kostnaður
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ekki senda starfsmaður afmælisáminningar
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Vista stillingar
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Beðið um vörur
 DocType: Item,Inspection Criteria,Skoðun Viðmið
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,framseldir
 DocType: BOM Website Item,BOM Website Item,BOM Website Item
@@ -1158,11 +1182,11 @@
 DocType: Journal Entry,Total Amount in Words,Heildarfjárhæð orðum
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Það var villa. Ein líkleg ástæða gæti verið að þú hefur ekki vistað mynd. Vinsamlegast hafðu samband support@erpnext.com ef vandamálið er viðvarandi.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Karfan mín
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Order Type verður að vera einn af {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Order Type verður að vera einn af {0}
 DocType: Lead,Next Contact Date,Næsta samband við þann
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,opnun Magn
 DocType: Healthcare Settings,Appointment Reminder,Tilnefning tilnefningar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Vinsamlegast sláðu inn reikning fyrir Change Upphæð
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Vinsamlegast sláðu inn reikning fyrir Change Upphæð
 DocType: Student Batch Name,Student Batch Name,Student Hópur Name
 DocType: Consultation,Doctor,Læknir
 DocType: Holiday List,Holiday List Name,Holiday List Nafn
@@ -1170,12 +1194,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Dagskrá Námskeið
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Kaupréttir
 DocType: Journal Entry Account,Expense Claim,Expense Krafa
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Viltu virkilega að endurheimta rifið eign?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Magn {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Viltu virkilega að endurheimta rifið eign?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Magn {0}
 DocType: Leave Application,Leave Application,Leave Umsókn
 DocType: Patient,Patient Relation,Sjúklingar Tengsl
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Skildu Úthlutun Tól
+DocType: Item,Hub Category to Publish,Hub Flokkur til birtingar
 DocType: Leave Block List,Leave Block List Dates,Skildu Block Listi Dagsetningar
+DocType: Sales Invoice,Billing Address GSTIN,Innheimtu Heimilisfang GSTIN
 DocType: Workstation,Net Hour Rate,Net Hour Rate
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landað Kostnaður Kvittun
 DocType: Company,Default Terms,Sjálfgefin Skilmálar
@@ -1185,18 +1211,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Tilgreindu {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Fjarlægðar atriði með engin breyting á magni eða verðmæti.
 DocType: Delivery Note,Delivery To,Afhending Til
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Eiginleiki borð er nauðsynlegur
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Eiginleiki borð er nauðsynlegur
 DocType: Production Planning Tool,Get Sales Orders,Fá sölu skipunum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} er ekki hægt að neikvæð
 DocType: Training Event,Self-Study,Sjálfsnám
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,afsláttur
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,afsláttur
 DocType: Asset,Total Number of Depreciations,Heildarfjöldi Afskriftir
 DocType: Sales Invoice Item,Rate With Margin,Meta með skák
 DocType: Workstation,Wages,laun
 DocType: Task,Urgent,Urgent
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Vinsamlegast tilgreindu gilt Row skírteini fyrir röð {0} í töflunni {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Ekki tókst að finna breytu:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Vinsamlegast veldu reit til að breyta úr numpad
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Vinsamlegast veldu reit til að breyta úr numpad
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Fara á Desktop og byrja að nota ERPNext
 DocType: Item,Manufacturer,framleiðandi
 DocType: Landed Cost Item,Purchase Receipt Item,Kvittun Item
@@ -1227,8 +1253,8 @@
 DocType: GL Entry,Against,gegn
 DocType: Item,Default Selling Cost Center,Sjálfgefið Selja Kostnaður Center
 DocType: Sales Partner,Implementation Partner,framkvæmd Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Póstnúmer
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Velta Order {0} er {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Póstnúmer
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Velta Order {0} er {1}
 DocType: Opportunity,Contact Info,Contact Info
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Gerð lager færslur
 DocType: Packing Slip,Net Weight UOM,Net Weight UOM
@@ -1239,6 +1265,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Fáðu vikulega Off Dagsetningar
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Lokadagur má ekki vera minna en Start Date
 DocType: Sales Person,Select company name first.,Select nafn fyrirtækis fyrst.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Lágt til hátt
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Tilvitnanir berast frá birgja.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Skiptu um BOM og uppfærðu nýjustu verð í öllum BOMs
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Til {0} | {1} {2}
@@ -1257,7 +1284,7 @@
 DocType: Program Enrollment,Transportation,samgöngur
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Ógilt Attribute
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} Leggja skal fram
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Magn verður að vera minna en eða jafnt og {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Magn verður að vera minna en eða jafnt og {0}
 DocType: SMS Center,Total Characters,Samtals Stafir
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Vinsamlegast veldu BOM á BOM sviði í lið {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Reikningur Detail
@@ -1272,7 +1299,7 @@
 ,Ordered Items To Be Billed,Pantaði Items verður innheimt
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Frá Range þarf að vera minna en við úrval
 DocType: Global Defaults,Global Defaults,Global Vanskil
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Project Samvinna Boð
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Project Samvinna Boð
 DocType: Salary Slip,Deductions,frádráttur
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Aðgerð heiti
@@ -1290,13 +1317,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Velta Invoice Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Ekkert til að biðja
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Annar Budget met &#39;{0}&#39; er þegar til á móti {1} &#39;{2}&#39; fyrir reikningsár {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Raunbyrjunardagsetning &#39;má ekki vera meiri en&#39; Raunveruleg lokadagur&quot;
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Raunbyrjunardagsetning &#39;má ekki vera meiri en&#39; Raunveruleg lokadagur&quot;
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Stjórn
 DocType: Cheque Print Template,Payer Settings,greiðandi Stillingar
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Þetta verður bætt við Item Code afbrigði. Til dæmis, ef skammstöfun er &quot;SM&quot;, og hluturinn kóða er &quot;T-bolur&quot;, hluturinn kóðann um afbrigði verður &quot;T-bolur-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net Borga (í orðum) verður sýnileg þegar þú hefur vistað Laun Slip.
 DocType: Purchase Invoice,Is Return,er aftur
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Varúð
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Varúð
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Return / skuldfærslu Note
 DocType: Price List Country,Price List Country,Verðskrá Country
 DocType: Item,UOMs,UOMs
@@ -1311,17 +1338,18 @@
 DocType: Account,Balance Sheet,Efnahagsreikningur
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Kostnaður Center For lið með Item Code &#39;
 DocType: Fee Validity,Valid Till,Gildir til
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Greiðsla Mode er ekki stillt. Vinsamlegast athugaðu hvort reikningur hefur verið sett á Mode Greiðslur eða POS Profile.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Greiðsla Mode er ekki stillt. Vinsamlegast athugaðu hvort reikningur hefur verið sett á Mode Greiðslur eða POS Profile.
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Sama atriði er ekki hægt inn mörgum sinnum.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Frekari reikninga er hægt að gera undir Hópar, en færslur er hægt að gera á móti non-hópa"
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,skammtímaskuldir
 DocType: Course,Course Intro,Auðvitað Um
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Stock Entry {0} búin
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vinsamlegast settu upp flokkunarnúmer fyrir þátttöku í gegnum skipulag&gt; Numbers Series
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Stock Entry {0} búin
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Hafnað Magn er ekki hægt að færa í Purchase aftur
 ,Purchase Order Items To Be Billed,Purchase Order Items verður innheimt
 DocType: Purchase Invoice Item,Net Rate,Net Rate
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Vinsamlegast veldu viðskiptavin
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Vinsamlegast veldu viðskiptavin
 DocType: Purchase Invoice Item,Purchase Invoice Item,Kaupa Reikningar Item
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Lager Ledger Entries og GL Færslur eru endurbirt fyrir valin Purchase Kvittanir
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Atriði 1
@@ -1340,7 +1368,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Afrit róður {0} með sama {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Reikningsár {0} fannst ekki
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Setja upp Starfsmenn
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Setja upp Starfsmenn
 DocType: Sales Order,SO-,SO-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Vinsamlegast veldu forskeyti fyrst
 DocType: Employee,O-,O-
@@ -1352,12 +1380,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Skoða Ledger
 DocType: Grading Scale,Intervals,millibili
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,elstu
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","An Item Group til staðar með sama nafni, vinsamlegast breyta hlutinn nafni eða endurnefna atriði hópinn"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","An Item Group til staðar með sama nafni, vinsamlegast breyta hlutinn nafni eða endurnefna atriði hópinn"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Rest Of The World
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Rest Of The World
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,The Item {0} getur ekki Hópur
 ,Budget Variance Report,Budget Dreifni Report
 DocType: Salary Slip,Gross Pay,Gross Pay
+DocType: Item,Is Item from Hub,Er hlutur frá miðstöð
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Row {0}: Activity Type er nauðsynlegur.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,arður Greiddur
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,bókhald Ledger
@@ -1367,8 +1396,9 @@
 DocType: Vehicle Log,Service Detail,þjónusta Detail
 DocType: BOM,Item Description,Lýsing á hlut
 DocType: Student Sibling,Student Sibling,Student systkini
-DocType: Purchase Invoice,Is Recurring,er Fastir
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Greiðslumáti
 DocType: Purchase Invoice,Supplied Items,Meðfylgjandi Items
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Vinsamlegast stilltu virkan matseðill fyrir Veitingahús {0}
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Magn To Framleiðsla
 DocType: Email Digest,New Income,ný Tekjur
@@ -1378,6 +1408,7 @@
 ,Student and Guardian Contact Details,Student og Guardian Tengiliðir Upplýsingar
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Row {0}: Fyrir birgja {0} Netfang þarf að senda tölvupóst
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,tímabundin Opening
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Skoða miðstöð
 ,Employee Leave Balance,Starfsmaður Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Stöðunni á reikningnum {0} verður alltaf að vera {1}
 DocType: Patient Appointment,More Info,Meiri upplýsingar
@@ -1397,13 +1428,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Velta Order {0} er ekki gilt
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Varið við nýja beiðni um tilboðsyfirlit
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Kaup pantanir hjálpa þér að skipuleggja og fylgja eftir kaupum þínum
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Því miður, fyrirtæki geta ekki vera sameinuð"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Því miður, fyrirtæki geta ekki vera sameinuð"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Prescriptions
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Heildarkostnaður Issue / Transfer magn {0} í efni Beiðni {1} \ má ekki vera meiri en óskað magn {2} fyrir lið {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Lítil
 DocType: Employee,Employee Number,starfsmaður Number
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Case Nei (s) þegar í notkun. Prófaðu frá máli nr {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Case Nei (s) þegar í notkun. Prófaðu frá máli nr {0}
 DocType: Project,% Completed,% Lokið
 ,Invoiced Amount (Exculsive Tax),Upphæð á reikningi (Exculsive Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Liður 2
@@ -1418,11 +1449,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,óbeinum kostnaði
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Row {0}: Magn er nauðsynlegur
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Landbúnaður
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Vörur eða þjónustu
 DocType: Special Test Items,Special Test Items,Sérstakar prófanir
 DocType: Mode of Payment,Mode of Payment,Háttur á greiðslu
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Vefsíða Image ætti að vera opinber skrá eða vefslóð
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Vefsíða Image ætti að vera opinber skrá eða vefslóð
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Þetta er rót atriði hóp og ekki hægt að breyta.
@@ -1430,24 +1461,23 @@
 DocType: Vehicle,Fuel UOM,eldsneyti UOM
 DocType: Warehouse,Warehouse Contact Info,Warehouse Contact Info
 DocType: Payment Entry,Write Off Difference Amount,Skrifaðu Off Mismunur Upphæð
-DocType: Purchase Invoice,Recurring Type,Fastir Type
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: Starfsmaður tölvupósti fannst ekki, þess vegna email ekki sent"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: Starfsmaður tölvupósti fannst ekki, þess vegna email ekki sent"
 DocType: Item,Foreign Trade Details,Foreign Trade Upplýsingar
+,Assessment Plan Status,Mat á stöðu áætlunarinnar
 DocType: Email Digest,Annual Income,Árleg innkoma
 DocType: Serial No,Serial No Details,Serial Nei Nánar
 DocType: Purchase Invoice Item,Item Tax Rate,Liður Skatthlutfall
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,Vinsamlegast veldu lækni og dagsetningu
 DocType: Student Group Student,Group Roll Number,Group Roll Number
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Fyrir {0}, aðeins kredit reikninga er hægt að tengja við aðra gjaldfærslu"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Alls öllum verkefni lóðum skal vera 1. Stilltu vigta allar verkefni verkefni í samræmi við
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Afhending Note {0} er ekki lögð
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Alls öllum verkefni lóðum skal vera 1. Stilltu vigta allar verkefni verkefni í samræmi við
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Afhending Note {0} er ekki lögð
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Liður {0} verður að vera Sub-dregist Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Capital útbúnaður
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Verðlagning Regla er fyrst valið byggist á &#39;Virkja Á&#39; sviði, sem getur verið Item, Item Group eða Brand."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Vinsamlegast settu vörulistann fyrst
-DocType: Hub Settings,Seller Website,Seljandi Website
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Vinsamlegast settu vörulistann fyrst
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Samtals úthlutað hlutfall fyrir Söluteymi ætti að vera 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Samtals úthlutað hlutfall fyrir Söluteymi ætti að vera 100
 DocType: Sales Invoice Item,Edit Description,Breyta Lýsing
 DocType: Antibiotic,Antibiotic,Sýklalyf
 ,Team Updates,Team uppfærslur
@@ -1468,12 +1498,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Total (Company Gjaldmiðill)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Raðnúmer {0} inn oftar en einu sinni
 DocType: Depreciation Schedule,Journal Entry,Dagbókarfærsla
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} atriði í gangi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} atriði í gangi
 DocType: Workstation,Workstation Name,Workstation Name
 DocType: Grading Scale Interval,Grade Code,bekk Code
 DocType: POS Item Group,POS Item Group,POS Item Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Sendu Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} ekki tilheyra lið {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} ekki tilheyra lið {1}
 DocType: Sales Partner,Target Distribution,Target Dreifing
 DocType: Salary Slip,Bank Account No.,Bankareikningur nr
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Þetta er fjöldi síðustu búin færslu með þessu forskeyti
@@ -1489,10 +1519,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Beiðni um Tilvitnun Birgir
 DocType: Healthcare Settings,Registration Message,Skráningarnúmer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Vélbúnaður
-DocType: Sales Order,Recurring Upto,Fastir uppí
 DocType: Prescription Dosage,Prescription Dosage,Ávísun Skammtar
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Vinsamlegast veldu Company
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Vinsamlegast veldu Company
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Birgir Dagsetning reiknings
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,á
@@ -1508,10 +1537,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Skarast skilyrði fundust milli:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Gegn Journal Entry {0} er þegar leiðrétt gagnvart einhverjum öðrum skírteini
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Pöntunin Value
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Matur
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Matur
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing Range 3
 DocType: Maintenance Schedule Item,No of Visits,Engin heimsókna
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Viðhaldsáætlun {0} er til staðar gegn {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Viltu birta hlutina þína í miðstöð?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,innritast nemandi
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Gjaldmiðill lokun reiknings skal vera {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Summa stig fyrir allar markmiðum ætti að vera 100. Það er {0}
@@ -1522,9 +1552,9 @@
 DocType: Authorization Rule,Average Discount,Meðal Afsláttur
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Utilities
-DocType: Purchase Invoice Item,Accounting,bókhald
+DocType: POS Profile,Accounting,bókhald
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Vinsamlegast veldu lotur í lotuðum hlutum
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Vinsamlegast veldu lotur í lotuðum hlutum
 DocType: Asset,Depreciation Schedules,afskriftir Skrár
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Umsókn tímabil getur ekki verið úti leyfi úthlutun tímabil
 DocType: Activity Cost,Projects,verkefni
@@ -1540,7 +1570,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',Samþykki Staða verður &quot;Samþykkt&quot; eða &quot;Hafnað &#39;
 DocType: Physician,Contacts and Address,Tengiliðir og heimilisfang
 DocType: Purchase Invoice,Contact Person,Tengiliður
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&quot;Bjóst Start Date &#39;má ekki vera meiri en&#39; Bjóst Lokadagur &#39;
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&quot;Bjóst Start Date &#39;má ekki vera meiri en&#39; Bjóst Lokadagur &#39;
 DocType: Course Scheduling Tool,Course End Date,Auðvitað Lokadagur
 DocType: Holiday List,Holidays,Holidays
 DocType: Sales Order Item,Planned Quantity,Áætlaðir Magn
@@ -1548,10 +1578,11 @@
 DocType: Item,Maintain Stock,halda lager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Lager Færslur nú þegar búið til framleiðslu Order
 DocType: Employee,Prefered Email,Ákjósanleg Email
+DocType: Student Admission,Eligibility and Details,Hæfi og upplýsingar
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Net Breyting á fast eign
 DocType: Leave Control Panel,Leave blank if considered for all designations,Skildu eftir autt ef það er talið fyrir alla heita
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Gjald af gerðinni &#39;Raunveruleg&#39; í röð {0} er ekki að vera með í Item Rate
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,frá DATETIME
 DocType: Email Digest,For Company,Company
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Samskipti þig.
@@ -1559,19 +1590,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Birgir Scorecard Scoring Variable
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Kaup Upphæð
 DocType: Sales Invoice,Shipping Address Name,Sendingar Address Nafn
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Mynd reikninga
 DocType: Material Request,Terms and Conditions Content,Skilmálar og skilyrði Content
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,getur ekki verið meiri en 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Liður {0} er ekki birgðir Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Liður {0} er ekki birgðir Item
 DocType: Maintenance Visit,Unscheduled,unscheduled
 DocType: Employee,Owned,eigu
 DocType: Salary Detail,Depends on Leave Without Pay,Fer um leyfi án launa
 DocType: Pricing Rule,"Higher the number, higher the priority","Hærri sem talan, hærri forgang"
 ,Purchase Invoice Trends,Kaupa Reikningar Trends
 DocType: Employee,Better Prospects,betri horfur
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",Row # {0}: Batch {1} hefur aðeins {2} magn. Vinsamlegast veldu annað lotu sem hefur {3} magn í boði eða skipt röðina í margar línur til að afhenda / gefa út úr mörgum lotum
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",Row # {0}: Batch {1} hefur aðeins {2} magn. Vinsamlegast veldu annað lotu sem hefur {3} magn í boði eða skipt röðina í margar línur til að afhenda / gefa út úr mörgum lotum
 DocType: Vehicle,License Plate,Númeraplata
 DocType: Appraisal,Goals,mörk
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Veldu POS prófíl
 DocType: Warranty Claim,Warranty / AMC Status,Ábyrgð í / AMC Staða
 ,Accounts Browser,reikningar Browser
 DocType: Payment Entry Reference,Payment Entry Reference,Greiðsla Entry Tilvísun
@@ -1589,7 +1620,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Starfsmaður getur ekki skýrslu við sjálfan sig.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ef reikningur er frosinn, eru færslur leyft að afmörkuðum notendum."
 DocType: Email Digest,Bank Balance,Bank Balance
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Bókhald Entry fyrir {0}: {1} Aðeins er hægt að gera í gjaldmiðli: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Bókhald Entry fyrir {0}: {1} Aðeins er hægt að gera í gjaldmiðli: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Job uppsetningu, hæfi sem krafist o.fl."
 DocType: Journal Entry Account,Account Balance,Staða reiknings
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Tax Regla fyrir viðskiptum.
@@ -1598,8 +1629,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Samtals Skattar og gjöld (Company gjaldmiðli)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Sýna P &amp; unclosed fjárhagsári er L jafnvægi
 DocType: Lab Test Template,Collection Details,Safn Upplýsingar
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","veldu cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date úr tabConsultation ct, &#39;tabLab Prescription` cp þar sem ct.patient =&#39; {0} &#39;og cp.parent = ct. nafn og cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Sendingar Account
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} er óvirkur
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Gera Velta Pantanir til að hjálpa þér að skipuleggja vinnu þína og skila á tíma
@@ -1616,7 +1645,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,pökkun Slip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,skrifstofa leigu
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Skipulag SMS Gateway stillingar
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Innflutningur mistókst!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Innflutningur mistókst!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Ekkert heimilisfang bætt við enn.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation vinnustund
 DocType: Vital Signs,Blood Pressure,Blóðþrýstingur
@@ -1641,7 +1670,7 @@
 DocType: Sales Invoice,Source,Source
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Sýna lokaðar
 DocType: Leave Type,Is Leave Without Pay,Er Leyfi án launa
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Asset Flokkur er nauðsynlegur fyrir Fast eignalið
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Asset Flokkur er nauðsynlegur fyrir Fast eignalið
 DocType: Fee Validity,Fee Validity,Gjaldgildi
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Engar færslur finnast í Greiðsla töflunni
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Þessi {0} átök með {1} fyrir {2} {3}
@@ -1662,8 +1691,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Búa Leiða
 DocType: Maintenance Schedule,Schedules,Skrár
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,POS Profile er nauðsynlegt til að nota Point-of-Sale
 DocType: Purchase Invoice Item,Net Amount,Virði
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} hefur ekki verið send inn þannig að aðgerðin er ekki hægt að ljúka
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} hefur ekki verið send inn þannig að aðgerðin er ekki hægt að ljúka
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail No
 DocType: Landed Cost Voucher,Additional Charges,Önnur Gjöld
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Viðbótarupplýsingar Afsláttur Magn (Company Gjaldmiðill)
@@ -1672,7 +1702,7 @@
 ,Support Hour Distribution,Stuðningstími Dreifing
 DocType: Maintenance Visit,Maintenance Visit,viðhald Visit
 DocType: Student,Leaving Certificate Number,Lokaprófsskírteini Fjöldi
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Skipun hætt, Vinsamlegast skoðaðu og hafðu samband við reikninginn {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Skipun hætt, Vinsamlegast skoðaðu og hafðu samband við reikninginn {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Laus Hópur Magn á Lager
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Uppfæra Prenta Format
 DocType: Landed Cost Voucher,Landed Cost Help,Landað Kostnaður Hjálp
@@ -1695,8 +1725,8 @@
 DocType: Patient,Tobacco Past Use,Notkun tóbaks í fortíðinni
 DocType: Sales Invoice Item,Brand Name,Vörumerki
 DocType: Purchase Receipt,Transporter Details,Transporter Upplýsingar
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Notandi {0} er þegar úthlutað lækni {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Sjálfgefið vöruhús er nauðsynlegt til valið atriði
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Notandi {0} er þegar úthlutað lækni {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Sjálfgefið vöruhús er nauðsynlegt til valið atriði
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Box
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,Möguleg Birgir
 DocType: Budget,Monthly Distribution,Mánaðarleg dreifing
@@ -1706,7 +1736,7 @@
 DocType: Sales Partner,Sales Partner Target,Velta Partner Target
 DocType: Loan Type,Maximum Loan Amount,Hámarkslán
 DocType: Pricing Rule,Pricing Rule,verðlagning Regla
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Afrita rúlla númer fyrir nemanda {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Afrita rúlla númer fyrir nemanda {0}
 DocType: Budget,Action if Annual Budget Exceeded,Aðgerð ef Árleg Budget meiri en
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Efni Beiðni um Innkaupapöntun
 DocType: Shopping Cart Settings,Payment Success URL,Greiðsla Velgengni URL
@@ -1723,7 +1753,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} verður að birtast aðeins einu sinni
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ekki leyft að tranfer meira {0} en {1} gegn Purchase Order {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Leaves Úthlutað Tókst fyrir {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Engir hlutir í pakka
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Engir hlutir í pakka
 DocType: Shipping Rule Condition,From Value,frá Value
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Framleiðsla Magn er nauðsynlegur
 DocType: Employee Loan,Repayment Method,endurgreiðsla Aðferð
@@ -1737,6 +1767,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,lager Skuldir
 DocType: Purchase Invoice,Supplier Warehouse,birgir Warehouse
 DocType: Opportunity,Contact Mobile No,Viltu samband við Mobile Nei
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Veldu fyrirtæki
 ,Material Requests for which Supplier Quotations are not created,Efni Beiðnir sem Birgir tilvitnanir eru ekki stofnað
 DocType: Student Group,Set 0 for no limit,Setja 0. engin takmörk
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Daginn (s) sem þú ert að sækja um leyfi eru frí. Þú þarft ekki að sækja um leyfi.
@@ -1746,24 +1777,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,gera Tilvitnun
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,aðrar skýrslur
 DocType: Dependent Task,Dependent Task,Dependent Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Breytistuðull fyrir sjálfgefið Mælieiningin skal vera 1 í röðinni {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Breytistuðull fyrir sjálfgefið Mælieiningin skal vera 1 í röðinni {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Leyfi af gerð {0} má ekki vera lengri en {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prófaðu að skipuleggja starfsemi fyrir X daga fyrirvara.
 DocType: HR Settings,Stop Birthday Reminders,Stop afmælisáminningar
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Vinsamlegast settu Default Launaskrá Greiðist reikning í félaginu {0}
 DocType: SMS Center,Receiver List,Receiver List
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,leit Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,leit Item
 DocType: Patient Appointment,Referring Physician,Tilvísun læknir
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,neytt Upphæð
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Net Breyting á Cash
 DocType: Assessment Plan,Grading Scale,flokkun Scale
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mælieiningin {0} hefur verið slegið oftar en einu sinni í viðskipta Factor töflu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,þegar lokið
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mælieiningin {0} hefur verið slegið oftar en einu sinni í viðskipta Factor töflu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,þegar lokið
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Lager í hendi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Greiðsla Beiðni þegar til staðar {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kostnaður af úthlutuðum Items
 DocType: Physician,Hospital,Sjúkrahús
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Magn má ekki vera meira en {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Magn má ekki vera meira en {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Næstliðnu reikningsári er ekki lokað
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Aldur (dagar)
 DocType: Quotation Item,Quotation Item,Tilvitnun Item
@@ -1774,8 +1805,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Birgir Type húsbóndi.
 DocType: Purchase Order Item,Supplier Part Number,Birgir Part Number
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Viðskiptahlutfall er ekki hægt að 0 eða 1
-DocType: Sales Invoice,Reference Document,Tilvísun Document
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} er aflýst eða henni hætt
+DocType: Subscription,Reference Document,Tilvísun Document
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} er aflýst eða henni hætt
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Ökutæki Sending Dagsetning
 DocType: Healthcare Settings,Default Medical Code Standard,Sjálfgefin Læknisfræðileg staðal
@@ -1784,6 +1815,7 @@
 DocType: Company,Default Payable Account,Sjálfgefið Greiðist Reikningur
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Stillingar fyrir online innkaupakörfu ss reglur skipum, verðlista o.fl."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Billed
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Raða eftir Verð ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,frátekið Magn
 DocType: Party Account,Party Account,Party Reikningur
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Mannauður
@@ -1795,13 +1827,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Gera útborgun færslu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Advance gegn Birgir skal gjaldfæra
 DocType: Company,Default Values,sjálfgefnar
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Tíðni} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Tíðni} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Heildarfjárhæð Endurgreiða
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Þetta er byggt á logs gegn þessu ökutæki. Sjá tímalínu hér fyrir nánari upplýsingar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Gegn Birgir Invoice {0} dagsett {1}
 DocType: Customer,Default Price List,Sjálfgefið Verðskrá
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Eignastýring Hreyfing met {0} búin
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Þú getur ekki eytt Fiscal Year {0}. Reikningsár {0} er sett sem sjálfgefið í Global Settings
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Viðskiptavinur með sama nafni er þegar til
 DocType: Journal Entry,Entry Type,Entry Type
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Engin matsáætlun tengd þessari matshóp
 ,Customer Credit Balance,Viðskiptavinur Credit Balance
@@ -1811,7 +1844,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,verðlagning
 DocType: Quotation,Term Details,Term Upplýsingar
 DocType: Project,Total Sales Cost (via Sales Order),Heildarkostnaður vegna sölu (með sölupöntun)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Ekki er hægt að innritast meira en {0} nemendum fyrir þessum nemendahópi.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Ekki er hægt að innritast meira en {0} nemendum fyrir þessum nemendahópi.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Leiða Count
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} verður að vera hærri en 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Getu áætlanagerð fyrir (dagar)
@@ -1827,9 +1860,11 @@
 DocType: Lab Test,Technician Name,Nafn tæknimanns
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Aftengja greiðsla á niðurfellingar Invoice
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Núverandi kílómetramæli lestur inn ætti að vera hærri en upphaflega Ökutæki Kílómetrastaða {0}
+DocType: Restaurant Reservation,No Show,Engin sýning
 DocType: Shipping Rule Country,Shipping Rule Country,Sendingar Regla Country
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Leyfi og Mæting
 DocType: Maintenance Visit,Partially Completed,hluta Lokið
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Miðlungs næmi
 DocType: Leave Type,Include holidays within leaves as leaves,Fela frí í laufum sem fer
 DocType: Sales Invoice,Packed Items,pakkað Items
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Ábyrgð kröfu gegn Raðnúmer
@@ -1846,13 +1881,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Greiddur Magn (Company Gjaldmiðill)
 DocType: Purchase Invoice,Additional Discount,Viðbótarupplýsingar Afsláttur
 DocType: Selling Settings,Selling Settings,selja Stillingar
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Staðfestu aðgerð
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Uppboð
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Vinsamlegast tilgreindu annaðhvort magni eða Verðmat Meta eða bæði
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,fylling
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Skoða í körfu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,markaðskostnaður
 ,Item Shortage Report,Liður Skortur Report
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Þyngd er getið, \ nVinsamlega nefna &quot;Þyngd UOM&quot; of"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Þyngd er getið, \ nVinsamlega nefna &quot;Þyngd UOM&quot; of"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Efni Beiðni notað til að gera þetta lager Entry
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Næsta Afskriftir Date er nauðsynlegur fyrir nýrri eign
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Aðskilja námskeið byggt fyrir hverja lotu
@@ -1864,12 +1900,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Gera Bókhald færslu fyrir hvert Stock Hreyfing
 DocType: Leave Allocation,Total Leaves Allocated,Samtals Leaves Úthlutað
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Warehouse þörf á Row nr {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Vinsamlegast sláðu inn fjárhagsári upphafs- og lokadagsetningar
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Vinsamlegast sláðu inn fjárhagsári upphafs- og lokadagsetningar
 DocType: Employee,Date Of Retirement,Dagsetning starfsloka
 DocType: Upload Attendance,Get Template,fá sniðmát
 DocType: Material Request,Transferred,Flutt
 DocType: Vehicle,Doors,hurðir
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext Uppsetningu lokið!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext Uppsetningu lokið!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Safna gjöld fyrir skráningu sjúklinga
 DocType: Course Assessment Criteria,Weightage,weightage
 DocType: Purchase Invoice,Tax Breakup,Tax Breakup
@@ -1888,36 +1924,36 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ef þessi atriði eru afbrigði, þá getur það ekki verið valinn í sölu skipunum o.fl."
 DocType: Lead,Next Contact By,Næsta Samband með
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Magn krafist fyrir lið {0} í röð {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Magn krafist fyrir lið {0} í röð {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Warehouse {0} Ekki er hægt að eyða eins magn er fyrir hendi tl {1}
 DocType: Quotation,Order Type,Order Type
-DocType: Purchase Invoice,Notification Email Address,Tilkynning Netfang
 ,Item-wise Sales Register,Item-vitur Sales Register
 DocType: Asset,Gross Purchase Amount,Gross Kaup Upphæð
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Opna sölur
 DocType: Asset,Depreciation Method,Afskriftir Method
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,offline
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Er þetta Tax innifalinn í grunntaxta?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,alls Target
 DocType: Job Applicant,Applicant for a Job,Umsækjandi um starf
 DocType: Production Plan Material Request,Production Plan Material Request,Framleiðslu Plan Efni Beiðni
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Engin framleiðsla Pantanir búnar
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Engin framleiðsla Pantanir búnar
 DocType: Stock Reconciliation,Reconciliation JSON,sættir JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Of margir dálkar. Flytja skýrslu og prenta það með töflureikni.
 DocType: Purchase Invoice Item,Batch No,hópur Nei
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Beiðni um tilvitnun: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Leyfa mörgum sölu skipunum gegn Purchase Order viðskiptavinar
 DocType: Student Group Instructor,Student Group Instructor,Nemandi hópur kennari
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Main
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Main
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Setja forskeyti fyrir númerakerfi röð á viðskiptum þínum
 DocType: Employee Attendance Tool,Employees HTML,starfsmenn HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Sjálfgefið BOM ({0}) verður að vera virkt fyrir þetta atriði eða sniðmátið sitt
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Sjálfgefið BOM ({0}) verður að vera virkt fyrir þetta atriði eða sniðmátið sitt
 DocType: Employee,Leave Encashed?,Leyfi Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Tækifæri Frá sviði er nauðsynlegur
 DocType: Email Digest,Annual Expenses,Árleg útgjöld
 DocType: Item,Variants,afbrigði
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Gera Purchase Order
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Gera Purchase Order
 DocType: SMS Center,Send To,Senda til
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Það er ekki nóg leyfi jafnvægi um leyfi Tegund {0}
 DocType: Payment Reconciliation Payment,Allocated amount,úthlutað magn
@@ -1933,6 +1969,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Styrkur nemendahóps
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Gegn Journal Entry {0} hjartarskinn ekki hafa allir ósamþykkt {1} færslu
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,úttektir
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Þjálfun viðburðir
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Afrit Serial Nei slegið í lið {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Skilyrði fyrir Shipping reglu
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,vinsamlegast sláðu
@@ -1942,7 +1979,7 @@
 DocType: Sales Order,To Deliver and Bill,Að skila og Bill
 DocType: Student Group,Instructors,leiðbeinendur
 DocType: GL Entry,Credit Amount in Account Currency,Credit Upphæð í Account Gjaldmiðill
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} Leggja skal fram
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} Leggja skal fram
 DocType: Authorization Control,Authorization Control,Heimildin Control
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Hafnað Warehouse er nauðsynlegur móti hafnað Item {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,greiðsla
@@ -1961,11 +1998,11 @@
 DocType: Quotation Item,Actual Qty,Raunveruleg Magn
 DocType: Sales Invoice Item,References,Tilvísanir
 DocType: Quality Inspection Reading,Reading 10,lestur 10
-DocType: Hub Settings,Hub Node,Hub Node
+DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Þú hefur slegið afrit atriði. Vinsamlegast lagfæra og reyndu aftur.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Félagi
 DocType: Asset Movement,Asset Movement,Asset Hreyfing
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,nýtt körfu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,nýtt körfu
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Liður {0} er ekki serialized Item
 DocType: SMS Center,Create Receiver List,Búa Receiver lista
 DocType: Vehicle,Wheels,hjól
@@ -1979,15 +2016,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Fjarskipti
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Gefur til kynna að pakki er hluti af þessari fæðingu (Only Draft)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Greiða færslu
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Magn í lið {0} verður að vera minna en {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Magn í lið {0} verður að vera minna en {1}
 ,Sales Invoice Trends,Sölureikningi Trends
 DocType: Leave Application,Apply / Approve Leaves,Beita / Samþykkja Leaves
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,fyrir
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,fyrir
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Getur átt röð ef gjaldið er af gerðinni &#39;On Fyrri Row Upphæð&#39; eða &#39;Fyrri Row Total&#39;
 DocType: Sales Order Item,Delivery Warehouse,Afhending Warehouse
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Tré fjárhagslegum stoðsviða.
 DocType: Serial No,Delivery Document No,Afhending Skjal nr
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Vinsamlegast settu &quot;hagnaður / tap reikning á Asset förgun&quot; í félaginu {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Vinsamlegast settu &quot;hagnaður / tap reikning á Asset förgun&quot; í félaginu {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Fá atriði úr Purchase Kvittanir
 DocType: Serial No,Creation Date,Creation Date
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Liður {0} birtist mörgum sinnum á verðskrá {1}
@@ -1998,11 +2035,12 @@
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,hefur Afbrigði
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Uppfæra svar
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Þú hefur nú þegar valið hluti úr {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Þú hefur nú þegar valið hluti úr {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Heiti Monthly Distribution
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Hópur auðkenni er nauðsynlegur
 DocType: Sales Person,Parent Sales Person,Móðurfélag Sales Person
-DocType: Purchase Invoice,Recurring Invoice,Fastir Invoice
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Hátt til lágt
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Veldu forritið fyrst
 DocType: Patient Appointment,Patient Age,Sjúklingur Aldur
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Annast verkefni
 DocType: Supplier,Supplier of Goods or Services.,Seljandi vöru eða þjónustu.
@@ -2010,8 +2048,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Sjálfgefnar reikningar sem notaðar eru til notkunar ef ekki er sett í sjúkling til að bóka samráðskostnað.
 DocType: Vehicle Log,Fuel Price,eldsneyti verð
 DocType: Budget,Budget,Budget
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Setja opinn
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Fast Asset Item verður a non-birgðir atriði.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Setja opinn
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Fast Asset Item verður a non-birgðir atriði.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Fjárhagsáætlun er ekki hægt að úthlutað gegn {0}, eins og það er ekki tekjur eða gjöld reikning"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,náð
 DocType: Student Admission,Application Form Route,Umsóknareyðublað Route
@@ -2025,12 +2063,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Liður {0} er ekki skipulag fyrir Serial Nos. Athuga Item meistara
 DocType: Maintenance Visit,Maintenance Time,viðhald Time
 ,Amount to Deliver,Nema Bera
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Sama hlutur hefur verið færður inn mörgum sinnum. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Hugtakið Start Date getur ekki verið fyrr en árið upphafsdagur skólaárið sem hugtakið er tengt (skólaárið {}). Vinsamlega leiðréttu dagsetningar og reyndu aftur.
 DocType: Guardian,Guardian Interests,Guardian Áhugasvið
 DocType: Naming Series,Current Value,Núverandi Value
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Margar reikningsárin til fyrir dagsetningu {0}. Vinsamlegast settu fyrirtæki í Fiscal Year
 DocType: School Settings,Instructor Records to be created by,Kennariaskrár til að búa til af
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} búin
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} búin
 DocType: Delivery Note Item,Against Sales Order,Against Sales Order
 ,Serial No Status,Serial Nei Staða
 DocType: Payment Entry Reference,Outstanding,Framúrskarandi
@@ -2040,10 +2079,10 @@
 						must be greater than or equal to {2}","Row {0}: Til að stilla {1} tíðni, munurinn frá og til dagsetning \ verður að vera meiri en eða jafnt og {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Þetta er byggt á lager hreyfingu. Sjá {0} for details
 DocType: Pricing Rule,Selling,selja
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Upphæð {0} {1} frádráttar {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Upphæð {0} {1} frádráttar {2}
 DocType: Employee,Salary Information,laun Upplýsingar
 DocType: Sales Person,Name and Employee ID,Nafn og Starfsmannafélag ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Skiladagur er ekki hægt áður Staða Dagsetning
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Skiladagur er ekki hægt áður Staða Dagsetning
 DocType: Website Item Group,Website Item Group,Vefsíða Item Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Skyldur og skattar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Vinsamlegast sláðu viðmiðunardagur
@@ -2069,7 +2108,7 @@
 DocType: Issue,Resolution Details,upplausn Upplýsingar
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,úthlutanir
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,samþykktarviðmiðanir
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Vinsamlegast sláðu Efni Beiðnir í töflunni hér að ofan
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Vinsamlegast sláðu Efni Beiðnir í töflunni hér að ofan
 DocType: Item Attribute,Attribute Name,eigindi nafn
 DocType: BOM,Show In Website,Sýna í Vefsíða
 DocType: Shopping Cart Settings,Show Quantity in Website,Sýna Magn í vefsvæðis
@@ -2078,7 +2117,7 @@
 DocType: Item Reorder,Check in (group),Innritun (hópur)
 ,Qty to Order,Magn til að panta
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Reikningurinn höfuð undir ábyrgð eða Equity, sem Hagnaður / Tap verður færður"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Gantt graf af öllum verkefnum.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Gantt graf af öllum verkefnum.
 DocType: Opportunity,Mins to First Response,Mins to First Response
 DocType: Pricing Rule,Margin Type,spássía Type
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} klukkustundir
@@ -2099,35 +2138,35 @@
 DocType: Patient,Surgical History,Skurðaðgerðarsaga
 DocType: Employee,Resignation Letter Date,Störfum Letter Dagsetning
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Verðlagning Reglurnar eru frekar síuð miðað við magn.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Vinsamlegast settu Dagsetning Tengingar fyrir starfsmann {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Vinsamlegast settu Dagsetning Tengingar fyrir starfsmann {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Total Billing Magn (með Time Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Endurtaka Tekjur viðskiptavinar
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) verða að hafa hlutverk &#39;kostnað samþykkjari&#39;
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,pair
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Veldu BOM og Magn fyrir framleiðslu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Veldu BOM og Magn fyrir framleiðslu
 DocType: Asset,Depreciation Schedule,Afskriftir Stundaskrá
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Söluaðilar samstarfsaðilar og tengiliðir
 DocType: Bank Reconciliation Detail,Against Account,Against reikninginn
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Half Day Date ætti að vera á milli Frá Dagsetning og hingað
 DocType: Maintenance Schedule Detail,Actual Date,Raunveruleg Dagsetning
 DocType: Item,Has Batch No,Hefur Batch No
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Árleg Billing: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Árleg Billing: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Vörur og þjónusta Skattur (GST Indland)
 DocType: Delivery Note,Excise Page Number,Vörugjöld Page Number
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Company, Frá Dagsetning og hingað til er nauðsynlegur"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Komdu frá samráði
 DocType: Asset,Purchase Date,kaupdegi
 DocType: Employee,Personal Details,Persónulegar upplýsingar
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Vinsamlegast settu &quot;Asset Afskriftir Kostnaður Center&quot; í félaginu {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Vinsamlegast settu &quot;Asset Afskriftir Kostnaður Center&quot; í félaginu {0}
 ,Maintenance Schedules,viðhald Skrár
 DocType: Task,Actual End Date (via Time Sheet),Raunveruleg End Date (með Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Upphæð {0} {1} gegn {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Upphæð {0} {1} gegn {2} {3}
 ,Quotation Trends,Tilvitnun Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Item Group ekki getið í master lið fyrir lið {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Debit Til reikning verður að vera Krafa reikning
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Debit Til reikning verður að vera Krafa reikning
 DocType: Shipping Rule Condition,Shipping Amount,Sendingar Upphæð
 DocType: Supplier Scorecard Period,Period Score,Tímabilsstig
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Bæta við viðskiptavinum
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Bæta við viðskiptavinum
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Bíður Upphæð
 DocType: Lab Test Template,Special,Sérstakur
 DocType: Purchase Invoice Item,Conversion Factor,ummyndun Factor
@@ -2135,13 +2174,14 @@
 ,Vehicle Expenses,ökutæki Útgjöld
 DocType: Serial No,Invoice Details,Reikningsupplýsingar
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Væntanlegur gildi eftir nýtingartíma skal vera meiri en eða jafnt og {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Byrjaðu á
+DocType: Hub Category,Hub Category,Hub Flokkur
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,ökutæki Number
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,Dagsetningin sem endurteknar reikningur verður að hætta
 DocType: Employee Loan,Loan Amount,lánsfjárhæð
 DocType: Program Enrollment,Self-Driving Vehicle,Sjálfknúin ökutæki
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Birgir Stuðningskort Standandi
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Row {0}: Efnislisti finnst ekki fyrir þar sem efnið {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Row {0}: Efnislisti finnst ekki fyrir þar sem efnið {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Samtals úthlutað leyfi {0} má ekki vera minna en þegar hafa verið samþykktar lauf {1} fyrir tímabilið
 DocType: Journal Entry,Accounts Receivable,Reikningur fáanlegur
 ,Supplier-Wise Sales Analytics,Birgir-Wise Sales Analytics
@@ -2152,7 +2192,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Foreldraforrit (Leyfi blank, ef þetta er ekki hluti af foreldradeild)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Skildu eftir autt ef það er talið fyrir allar gerðir starfsmanna
 DocType: Landed Cost Voucher,Distribute Charges Based On,Dreifa Gjöld Byggt á
-apps/erpnext/erpnext/hooks.py +131,Timesheets,timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,timesheets
 DocType: HR Settings,HR Settings,HR Stillingar
 DocType: Salary Slip,net pay info,nettó borga upplýsingar
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Þetta gildi er uppfært í Sjálfgefin söluverðalista.
@@ -2163,7 +2203,7 @@
 DocType: Patient,B Positive,B Jákvæð
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Magn verður að vera 1, eins atriði er fastur eign. Notaðu sérstaka röð fyrir margar Magn."
 DocType: Leave Block List Allow,Leave Block List Allow,Skildu Block List Leyfa
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Skammstöfun má ekki vera autt eða bil
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Skammstöfun má ekki vera autt eða bil
 DocType: Patient Medical Record,Patient Medical Record,Sjúkratryggingaskrá
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Group Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Íþróttir
@@ -2179,9 +2219,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Ekki er hægt að finna gengi fyrir {0} til {1} fyrir lykilatriði {2}. Vinsamlegast búðu til gjaldeyrisviðskipti handvirkt
 DocType: POS Profile,Price List,Verðskrá
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} er nú sjálfgefið Fiscal Year. Vinsamlegast hressa vafrann til að breytingin taki gildi.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,kostnaðarliðir Kröfur
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,kostnaðarliðir Kröfur
 DocType: Issue,Support,Stuðningur
 ,BOM Search,BOM leit
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Birta &quot;Í lager&quot; eða &quot;Ekki í lager&quot; á Hub byggt á lager sem er í boði á þessu vörugeymslu.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Lokun (Opnun Samtölur +)
 DocType: Vehicle,Fuel Type,eldsneytistegund
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Vinsamlegast tilgreinið gjaldmiðil í félaginu
@@ -2193,16 +2234,16 @@
 DocType: Healthcare Settings,Remind Before,Minna á áður
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM viðskipta þáttur er krafist í röð {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Tilvísun Document Type verður að vera einn af Sales Order, Sales Invoice eða Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Tilvísun Document Type verður að vera einn af Sales Order, Sales Invoice eða Journal Entry"
 DocType: Salary Component,Deduction,frádráttur
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Row {0}: Frá Time og til tími er nauðsynlegur.
 DocType: Stock Reconciliation Item,Amount Difference,upphæð Mismunur
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Atriði Verð bætt fyrir {0} í verðskrá {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Atriði Verð bætt fyrir {0} í verðskrá {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Vinsamlegast sláðu Starfsmaður Id þessarar velta manneskja
 DocType: Territory,Classification of Customers by region,Flokkun viðskiptavina eftir svæðum
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Munurinn Upphæð verður að vera núll
 DocType: Project,Gross Margin,Heildarframlegð
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Vinsamlegast sláðu Production Item fyrst
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Vinsamlegast sláðu Production Item fyrst
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Útreiknuð Bank Yfirlýsing jafnvægi
 DocType: Normal Test Template,Normal Test Template,Venjulegt próf sniðmát
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,fatlaður notandi
@@ -2212,21 +2253,22 @@
 DocType: Salary Slip,Total Deduction,Samtals Frádráttur
 ,Production Analytics,framleiðslu Analytics
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Þetta byggist á viðskiptum gegn þessum sjúklingum. Sjá tímalínu fyrir neðan til að fá nánari upplýsingar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,kostnaður Uppfært
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,kostnaður Uppfært
 DocType: Employee,Date of Birth,Fæðingardagur
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Liður {0} hefur þegar verið skilað
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiscal Year ** táknar fjárhagsári. Öll bókhald færslur og aðrar helstu viðskipti eru raktar gegn ** Fiscal Year **.
 DocType: Opportunity,Customer / Lead Address,Viðskiptavinur / Lead Address
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Birgir Scorecard Skipulag
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Viðvörun: Ógild SSL vottorð á viðhengi {0}
-DocType: Student Admission,Eligibility,hæfi
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Námsmat
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Viðvörun: Ógild SSL vottorð á viðhengi {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Leiðir hjálpa þér að fá fyrirtæki, bæta alla tengiliði þína og fleiri sem leiðir þínar"
 DocType: Production Order Operation,Actual Operation Time,Raunveruleg Operation Time
 DocType: Authorization Rule,Applicable To (User),Gildir til (User)
 DocType: Purchase Taxes and Charges,Deduct,draga
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Starfslýsing
 DocType: Student Applicant,Applied,Applied
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Re-opinn
 DocType: Sales Invoice Item,Qty as per Stock UOM,Magn eins og á lager UOM
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 Name
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Sérstafir nema &quot;-&quot; &quot;.&quot;, &quot;#&quot;, og &quot;/&quot; ekki leyfð í nafngiftir röð"
@@ -2238,7 +2280,7 @@
 DocType: Request for Quotation,Manufacturing Manager,framleiðsla Manager
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial Nei {0} er undir ábyrgð uppí {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Split Afhending Note í pakka.
-apps/erpnext/erpnext/hooks.py +98,Shipments,sendingar
+apps/erpnext/erpnext/hooks.py +107,Shipments,sendingar
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Total úthlutað magn (Company Gjaldmiðill)
 DocType: Purchase Order Item,To be delivered to customer,Til að vera frelsari til viðskiptavina
 DocType: BOM,Scrap Material Cost,Rusl efniskostnaði
@@ -2260,8 +2302,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Variunarstillingar
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Veldu Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Skildu eftir autt ef það er talið að öllum deildum
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tegundir ráðninga (varanleg, samningur, nemi o.fl.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} er nauðsynlegur fyrir lið {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Tegundir ráðninga (varanleg, samningur, nemi o.fl.)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} er nauðsynlegur fyrir lið {1}
 DocType: Process Payroll,Fortnightly,hálfsmánaðarlega
 DocType: Currency Exchange,From Currency,frá Gjaldmiðill
 DocType: Vital Signs,Weight (In Kilogram),Þyngd (í kílógramm)
@@ -2285,7 +2327,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Vinsamlegast smelltu á &#39;Búa Stundaskrá&#39; til að fá áætlun
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Það komu upp villur við eytt eftirfarandi tímaáætlun:
 DocType: Bin,Ordered Quantity,Raðaður Magn
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",td &quot;Byggja verkfæri fyrir smiðirnir&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",td &quot;Byggja verkfæri fyrir smiðirnir&quot;
 DocType: Grading Scale,Grading Scale Intervals,Flokkun deilingargildi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Bókhald Entry fyrir {2} Aðeins er hægt að gera í gjaldmiðli: {3}
 DocType: Production Order,In Process,Í ferli
@@ -2308,11 +2350,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Með greiðslu skatta
 DocType: Expense Claim Detail,Expense Claim Detail,Expense Krafa Detail
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICATE FOR SUPPLIER
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Vinsamlegast veldu réttan reikning
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Vinsamlegast veldu réttan reikning
 DocType: Item,Weight UOM,þyngd UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Laun Uppbygging Starfsmaður
 DocType: Patient,Blood Group,Blóðflokkur
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Bíður
 DocType: Course,Course Name,Auðvitað Name
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Notendur sem getur samþykkt yfirgefa forrit tiltekins starfsmanns
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Skrifstofa útbúnaður
@@ -2331,7 +2372,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Verð verður ekki sýnd ef verðskrá er ekki sett
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Vinsamlegast tilgreindu land fyrir þessa Shipping reglu eða stöðva Worldwide Shipping
 DocType: Stock Entry,Total Incoming Value,Alls Komandi Value
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Skuldfærslu Til er krafist
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Skuldfærslu Til er krafist
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets að halda utan um tíma, kostnað og innheimtu fyrir athafnir gert með lið"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kaupverðið List
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Sniðmát af birgðatölumörkum.
@@ -2341,7 +2382,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,greiðsla Sættir
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Vinsamlegast veldu nafn incharge einstaklingsins
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,tækni
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Samtals Ógreitt: {0}
+DocType: Hub Settings,Unregister from Hub,Afskráðu frá Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Samtals Ógreitt: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Website Operation
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Tilboðsbréf
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Búa Efni Beiðnir (MRP) og framleiðsla pantanir.
@@ -2353,7 +2395,9 @@
 DocType: Physician Schedule Time Slot,To Time,til Time
 DocType: Authorization Rule,Approving Role (above authorized value),Samþykkir hlutverk (að ofan er leyft gildi)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Inneign á reikninginn verður að vera Greiðist reikning
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM endurkvæmni: {0} er ekki hægt að foreldri eða barn {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Vinsamlegast veljið Student Entrance sem er skylt fyrir greiddan nemanda
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM endurkvæmni: {0} er ekki hægt að foreldri eða barn {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Vinsamlegast veldu verðlista til að birta verðlagningu
 DocType: Production Order Operation,Completed Qty,lokið Magn
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Fyrir {0}, aðeins debetkort reikninga er hægt að tengja við aðra tekjufærslu"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Verðlisti {0} er óvirk
@@ -2365,38 +2409,39 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Serial Numbers krafist fyrir lið {1}. Þú hefur veitt {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Núverandi Verðmat Rate
 DocType: Item,Customer Item Codes,Viðskiptavinur Item Codes
+DocType: Training Event,Advance,Advance
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,til að endurreisa aftur.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Gengishagnaður / tap
 DocType: Opportunity,Lost Reason,Lost Ástæða
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,ný Address
 DocType: Quality Inspection,Sample Size,Prufustærð
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Vinsamlegast sláðu inn Kvittun Skjal
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Allir hlutir hafa nú þegar verið færðar á vörureikning
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Vinsamlegast tilgreinið gilt &quot;Frá máli nr &#39;
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',Vinsamlegast tilgreinið gilt &quot;Frá máli nr &#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Frekari stoðsviða er hægt að gera undir Hópar en færslur er hægt að gera á móti non-hópa
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Notendur og heimildir
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Framleiðslu Pantanir Búið til: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Framleiðslu Pantanir Búið til: {0}
 DocType: Branch,Branch,Branch
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Prentun og merkingu
 DocType: Company,Total Monthly Sales,Samtals mánaðarleg sala
 DocType: Bin,Actual Quantity,Raunveruleg Magn
 DocType: Shipping Rule,example: Next Day Shipping,dæmi: Næsti dagur Shipping
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial Nei {0} fannst ekki
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Áskriftin hefur verið {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Áskriftin hefur verið {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Gjaldskrá áætlun
 DocType: Fee Schedule Program,Student Batch,Student Hópur
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,veldu * frá `tabVital Signs` þar sem sjúklingur = &#39;{0}&#39; til þess að skrifa undir merki_date takmörk 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,gera Student
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Min Grade
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Þér hefur verið boðið að vinna að verkefninu: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Læknir ekki í boði á {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Þér hefur verið boðið að vinna að verkefninu: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Læknir ekki í boði á {0}
 DocType: Leave Block List Date,Block Date,Block Dagsetning
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Bæta við sérsniðnu reitinn Áskriftarheiti í doktorsprópnum {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Birgir Afhending Ath
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Sæktu um núna
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Sæktu um núna
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Raunverulegur fjöldi {0} / biðþáttur {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-verslun GSTIN
 DocType: Sales Order,Not Delivered,ekki Skilað
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Væntanlegur dagsetning má ekki vera fyrir viðskiptadag
 ,Bank Clearance Summary,Bank Úthreinsun Yfirlit
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Búa til og stjórna daglega, vikulega og mánaðarlega email meltir."
 DocType: Appraisal Goal,Appraisal Goal,Úttekt Goal
@@ -2404,12 +2449,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Byggingar
 DocType: Fee Schedule,Fee Structure,Gjald Uppbygging
 DocType: Timesheet Detail,Costing Amount,kosta Upphæð
-DocType: Student Admission,Application Fee,Umsókn Fee
+DocType: Student Admission Program,Application Fee,Umsókn Fee
 DocType: Process Payroll,Submit Salary Slip,Senda Laun Slip
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maxiumm afsláttur fyrir Liður {0} er {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Maxiumm afsláttur fyrir Liður {0} er {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Innflutningur á lausu
 DocType: Sales Partner,Address & Contacts,Heimilisfang og Tengiliðir
 DocType: SMS Log,Sender Name,Sendandi Nafn
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Raða eftir viðmiðum
 DocType: POS Profile,[Select],[Veldu]
 DocType: Vital Signs,Blood Pressure (diastolic),Blóðþrýstingur (diastolic)
 DocType: SMS Log,Sent To,send til
@@ -2418,7 +2464,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Næsta Hafa Date getur ekki verið í fortíðinni
 DocType: Company,For Reference Only.,Til viðmiðunar aðeins.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Læknir {0} ekki fáanleg á {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Veldu lotu nr
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Veldu lotu nr
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ógild {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,Tilvísun Inv
@@ -2434,15 +2480,15 @@
 DocType: Normal Test Items,Require Result Value,Krefjast niðurstöður gildi
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case Nei getur ekki verið 0
 DocType: Item,Show a slideshow at the top of the page,Sýnið skyggnusýningu efst á síðunni
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,verslanir
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,verslanir
 DocType: Project Type,Projects Manager,Verkefnisstjóri
 DocType: Serial No,Delivery Time,Afhendingartími
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Öldrun Byggt á
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Skipun hætt
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Skipun hætt
 DocType: Item,End of Life,End of Life
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,ferðalög
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Engin virk eða vanræksla Laun Uppbygging finna fyrir starfsmann {0} fyrir gefnar dagsetningar
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,ferðalög
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Engin virk eða vanræksla Laun Uppbygging finna fyrir starfsmann {0} fyrir gefnar dagsetningar
 DocType: Leave Block List,Allow Users,leyfa notendum
 DocType: Purchase Order,Customer Mobile No,Viðskiptavinur Mobile Nei
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Fastir
@@ -2451,12 +2497,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Uppfæra Kostnaður
 DocType: Item Reorder,Item Reorder,Liður Uppröðun
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Sýna Laun Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Transfer Efni
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Transfer Efni
 DocType: Fees,Send Payment Request,Senda greiðslubók
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Tilgreina rekstur, rekstrarkostnaði og gefa einstakt notkun eigi að rekstri þínum."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Þetta skjal er yfir mörkum með {0} {1} fyrir lið {4}. Ert þú að gera annað {3} gegn sama {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Vinsamlegast settu endurtekin eftir vistun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Veldu breyting upphæð reiknings
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Veldu breyting upphæð reiknings
 DocType: Purchase Invoice,Price List Currency,Verðskrá Gjaldmiðill
 DocType: Naming Series,User must always select,Notandi verður alltaf að velja
 DocType: Stock Settings,Allow Negative Stock,Leyfa Neikvæð lager
@@ -2476,7 +2522,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Starfsmaður
 DocType: Sample Collection,Collected Time,Safnað tíma
 DocType: Company,Sales Monthly History,Sala mánaðarlega sögu
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Veldu hópur
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Veldu hópur
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} er að fullu innheimt
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Lífsmörk
 DocType: Training Event,End Time,End Time
@@ -2484,16 +2530,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Greiðsla Frádráttur eða tap
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Stöðluð samningsskilyrði til sölu eða kaup.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Group eftir Voucher
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Ertu viss um að þú viljir hætta við þessa stefnumót?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,velta Pipeline
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Vinsamlegast settu sjálfgefin reikningur í laun Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Required On
 DocType: Rename Tool,File to Rename,Skrá til Endurnefna
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Vinsamlegast veldu BOM fyrir lið í Row {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Vinsamlegast veldu BOM fyrir lið í Row {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Reikningur {0} passar ekki við fyrirtæki {1} í reikningsaðferð: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Tilgreint BOM {0} er ekki til fyrir lið {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Viðhald Dagskrá {0} verður lokað áður en hætta þessu Velta Order
+DocType: POS Profile,Applicable for Users,Gildir fyrir notendur
 DocType: Notification Control,Expense Claim Approved,Expense Krafa Samþykkt
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Laun Slip starfsmanns {0} þegar búin á þessu tímabili
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Laun Slip starfsmanns {0} þegar búin á þessu tímabili
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Pharmaceutical
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kostnaður vegna aðkeyptrar atriði
 DocType: Selling Settings,Sales Order Required,Velta Order Required
@@ -2517,6 +2565,7 @@
 DocType: Offer Letter,Accepted,Samþykkt
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Skipulag
 DocType: BOM Update Tool,BOM Update Tool,BOM Update Tool
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Party reikningur ekki tilgreind, vinsamlegast settu upp sjálfgefið aðila reikning í félaginu"
 DocType: SG Creation Tool Course,Student Group Name,Student Group Name
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Búa til gjöld
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Vinsamlegast vertu viss um að þú viljir virkilega að eyða öllum viðskiptum fyrir þetta fyrirtæki. stofngÃ¶gn haldast eins og það er. Þessi aðgerð er ekki hægt að afturkalla.
@@ -2525,29 +2574,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) getur ekki verið meiri en áætlað quanitity ({2}) í framleiðslu Order {3}
 DocType: Shipping Rule,Shipping Rule Label,Sendingar Regla Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,User Forum
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Hráefni má ekki vera auður.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Gat ekki uppfært lager, reikningsnúmer inniheldur falla skipum hlut."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Hráefni má ekki vera auður.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Gat ekki uppfært lager, reikningsnúmer inniheldur falla skipum hlut."
 DocType: Lab Test Sample,Lab Test Sample,Lab Test Dæmi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Þú getur ekki breytt hlutfall ef BOM getið agianst hvaða atriði
+DocType: Restaurant,Invoice Series Prefix,Reiknivél Reiknivél
 DocType: Employee,Previous Work Experience,Fyrri Starfsreynsla
 DocType: Stock Entry,For Quantity,fyrir Magn
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Vinsamlegast sláðu Planned Magn fyrir lið {0} á röð {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Vinsamlegast sláðu Planned Magn fyrir lið {0} á röð {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} er ekki lögð
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Beiðnir um atriði.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Aðskilið framleiðsla þess verður búin til fyrir hvern fullunna gott lið.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} verður að vera neikvætt í staðinn skjal
 ,Minutes to First Response for Issues,Mínútur til First Response fyrir málefni
 DocType: Purchase Invoice,Terms and Conditions1,Skilmálar og Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,The nafn af the Institute sem þú ert að setja upp þetta kerfi.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,The nafn af the Institute sem þú ert að setja upp þetta kerfi.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Bókhald færsla fryst upp til þessa dagsetningu, enginn getur gert / breyta færslu, nema hlutverki sem tilgreindur er hér."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Vistaðu skjalið áður kynslóð viðhald áætlun
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Nýjasta verð uppfært í öllum BOMs
 DocType: Fee Schedule,Successful,Árangursrík
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Project Status
 DocType: UOM,Check this to disallow fractions. (for Nos),Hakaðu við þetta til að banna broti. (NOS)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Eftirfarandi Framleiðslu Pantanir voru búnar:
-DocType: Student Admission,Naming Series (for Student Applicant),Nafngiftir Series (fyrir námsmanna umsækjanda)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Eftirfarandi Framleiðslu Pantanir voru búnar:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Nafngiftir Series (fyrir námsmanna umsækjanda)
 DocType: Delivery Note,Transporter Name,Flutningsaðili Nafn
 DocType: Authorization Rule,Authorized Value,Leyft Value
 DocType: BOM,Show Operations,Sýna Aðgerðir
@@ -2571,7 +2621,7 @@
 ,Employees working on a holiday,Starfsmenn sem vinna í frí
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Present
 DocType: Project,% Complete Method,% Complete Aðferð
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Lyf
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Lyf
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Viðhald Upphafsdagur getur ekki verið áður fæðingardag fyrir Raðnúmer {0}
 DocType: Production Order,Actual End Date,Raunveruleg Lokadagur
 DocType: BOM,Operating Cost (Company Currency),Rekstrarkostnaður (Company Gjaldmiðill)
@@ -2589,19 +2639,20 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Samþykkir notandi getur ekki verið sama og notandinn reglan er við að
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (eins og á lager UOM)
 DocType: SMS Log,No of Requested SMS,Ekkert af Beðið um SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Leyfi án launa passar ekki við viðurkenndar Leave Umsókn færslur
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Leyfi án launa passar ekki við viðurkenndar Leave Umsókn færslur
 DocType: Campaign,Campaign-.####,Herferð -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Næstu skref
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Gefðu tilgreind atriði í besta mögulega verð
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Gerðu innheimtu
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto nálægt Tækifæri eftir 15 daga
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Innkaupapantanir eru ekki leyfðar fyrir {0} vegna punkta sem standa upp á {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Innkaupapantanir eru ekki leyfðar fyrir {0} vegna punkta sem standa upp á {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,árslok
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Samningur Lokadagur verður að vera hærri en Dagsetning Tengja
 DocType: Vital Signs,Nutrition Values,Næringargildi
 DocType: Lab Test Template,Is billable,Er gjaldfært
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Bæði &quot;læknaráætlun&quot; og tími fyrir hvert skipun &quot;verður að vera stillt fyrir Dr {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Þriðji aðili dreifingaraðila / söluaðila / umboðsmanns / tengja / sölumaður sem selur fyrirtæki vörur fyrir þóknun.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} gegn Purchase Order {1}
 DocType: Patient,Patient Demographics,Lýðfræðilegar upplýsingar um sjúklinga
@@ -2631,7 +2682,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","Standard skatta sniðmát sem hægt er að beita öllum kaupfærslur. Þessi sniðmát geta innihaldið lista yfir skatta höfuð og einnig öðrum forstöðumönnum kostnaðarliði eins og &quot;Shipping&quot;, &quot;tryggingar&quot;, &quot;Meðhöndlun&quot; osfrv #### Athugið skatthlutfall þú velur hér verður staðallinn skatthlutfallið fyrir alla ** Items * *. Ef það eru ** Items ** sem hafa mismunandi verð, verður að bæta við í ** Item Tax ** borð í ** Liður ** meistara. #### Lýsing dálka 1. Útreikningur Type: - Þetta getur verið á ** Net Total ** (sem er summa grunnfjárhæð). - ** Á fyrri umf öllum / Upphæð ** (fyrir uppsöfnuð skatta eða gjöld). Ef þú velur þennan kost, að skattur verði beitt sem hlutfall af fyrri röðinni (í skatt töflu) fjárhæð eða samtals. - ** Raunveruleg ** (eins og getið). 2. Reikningur Head: The Account höfuðbók þar sem þessi skattur verður að bóka 3. Kostnaður Center: Ef skattur / gjald er tekjur (eins skipum) eða gjaldaliði það þarf að bóka á móti kostnaði sent. 4. Lýsing: Lýsing á skatta (sem verður prentað í reikningum / gæsalappa). 5. Gefa: Skatthlutfall. 6. Upphæð: Skatthlutfall. 7. Samtals: Uppsöfnuð alls að þessum tímapunkti. 8. Sláðu Row: Ef byggir á &quot;Fyrri Row Total&quot; getur þú valið línunúmeri sem verður tekið sem grunn fyrir þessum útreikningi (sjálfgefið er fyrri umf). 9. Íhuga skattur eða gjald fyrir: Í þessum kafla er hægt að tilgreina hvort skatturinn / gjald er aðeins fyrir mat (ekki hluti af öllum) eða aðeins fyrir samtals (ekki bæta gildi til hlutnum) eða bæði. 10. Bæta eða draga: Hvort sem þú vilt bæta við eða draga skatt."
 DocType: Homepage,Homepage,heimasíða
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Veldu lækni ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',uppfæra flipannSamkvæmt settu reikningi = &#39;{0}&#39; þar sem nafn = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd Magn
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Fee Records Búið - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Flokkur Reikningur
@@ -2643,7 +2693,7 @@
 DocType: Asset,Manual,Manual
 DocType: Salary Component Account,Salary Component Account,Laun Component Reikningur
 DocType: Global Defaults,Hide Currency Symbol,Fela gjaldmiðilinn
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","td Bank, Cash, Credit Card"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","td Bank, Cash, Credit Card"
 DocType: Lead Source,Source Name,Source Name
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Venjulegur hvíldarþrýstingur hjá fullorðnum er u.þ.b. 120 mmHg slagbilsþrýstingur og 80 mmHg díastólskur, skammstafað &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Inneignarnótu
@@ -2662,16 +2712,16 @@
 DocType: Patient,Occupation,Atvinna
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: Byrja Bætt verður fyrir lokadagsetningu
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Alls (Magn)
-DocType: Sales Invoice,This Document,Þetta skjal
 DocType: Installation Note Item,Installed Qty,uppsett Magn
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Þetta gæti verið vegna nokkurra ógilda netfanga í
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Þú bætti við
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Þjálfun Niðurstaða
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Þjálfun Niðurstaða
 DocType: Purchase Invoice,Is Paid,er greitt
 DocType: Salary Structure,Total Earning,alls earnings
 DocType: Purchase Receipt,Time at which materials were received,Tími þar sem efni bárust
 DocType: Stock Ledger Entry,Outgoing Rate,Outgoing Rate
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Stofnun útibú húsbóndi.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Stofnun útibú húsbóndi.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,eða
 DocType: Sales Order,Billing Status,Innheimta Staða
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Tilkynna um vandamál
@@ -2686,7 +2736,8 @@
 DocType: Notification Control,Sales Order Message,Velta Order Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Set Default gildi eins Company, Gjaldmiðill, yfirstandandi reikningsári, o.fl."
 DocType: Payment Entry,Payment Type,greiðsla Type
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vinsamlegast veldu lotu fyrir hlut {0}. Ekki er hægt að finna eina lotu sem uppfyllir þessa kröfu
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vinsamlegast veldu lotu fyrir hlut {0}. Ekki er hægt að finna eina lotu sem uppfyllir þessa kröfu
+DocType: Hub Category,Parent Category,Foreldraflokkur
 DocType: Process Payroll,Select Employees,Select Starfsmenn
 DocType: Opportunity,Potential Sales Deal,Hugsanleg sala Deal
 DocType: Complaint,Complaints,Kvartanir
@@ -2723,7 +2774,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),Auðkenning pakka fyrir afhendingu (fyrir prentun)
 DocType: Bin,Reserved Quantity,frátekin Magn
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Vinsamlegast sláðu inn gilt netfang
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Vinsamlegast veldu hlut í körfu
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Vinsamlegast veldu hlut í körfu
 DocType: Landed Cost Voucher,Purchase Receipt Items,Kvittun Items
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,sérsníða Eyðublöð
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,Arrear
@@ -2733,15 +2784,15 @@
 DocType: Payment Request,Amount in customer's currency,Upphæð í mynt viðskiptavinarins
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Afhending
 DocType: Stock Reconciliation Item,Current Qty,Núverandi Magn
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Bæta við birgja
+DocType: Restaurant Menu,Restaurant Menu,Veitingahús Valmynd
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Fyrri
 DocType: Appraisal Goal,Key Responsibility Area,Key Ábyrgð Area
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Námsmaður Lotur hjálpa þér að fylgjast með mætingu, mat og gjalda fyrir nemendur"
 DocType: Payment Entry,Total Allocated Amount,Samtals úthlutað magn
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Stilltu sjálfgefinn birgðareikning fyrir varanlegan birgða
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Stilltu sjálfgefinn birgðareikning fyrir varanlegan birgða
 DocType: Item Reorder,Material Request Type,Efni Beiðni Type
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural Journal Entry fyrir laun frá {0} til {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage er fullt, ekki spara"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage er fullt, ekki spara"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM viðskipta Factor er nauðsynlegur
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Herbergi getu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref
@@ -2780,16 +2831,18 @@
 DocType: Project,Task Completion,verkefni Lokið
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Ekki til á lager
 DocType: Appraisal,HR User,HR User
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Skattar og gjöld FrÃ¡
-apps/erpnext/erpnext/hooks.py +129,Issues,Vandamál
+apps/erpnext/erpnext/hooks.py +138,Issues,Vandamál
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Staða verður að vera einn af {0}
 DocType: Sales Invoice,Debit To,debet Til
+DocType: Restaurant Menu Item,Restaurant Menu Item,Veitingahús Valmynd Item
 DocType: Delivery Note,Required only for sample item.,Aðeins nauðsynlegt fyrir sýnishorn hlut.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Raunveruleg Magn eftir viðskipti
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Engin laun miði fannst á milli {0} og {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Engin laun miði fannst á milli {0} og {1}
 ,Pending SO Items For Purchase Request,Bíður SO Hlutir til kaupa Beiðni
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Student Innlagnir
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} er óvirk
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Student Innlagnir
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} er óvirk
 DocType: Supplier,Billing Currency,Innheimta Gjaldmiðill
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Auka stór
@@ -2812,6 +2865,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Vinsamlegast nefna engin heimsókna krafist
 DocType: Stock Settings,Default Valuation Method,Sjálfgefið Verðmatsaðferð
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,Gjald
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Uppfærsla í gangi. Það gæti tekið smá stund.
 DocType: Vehicle Log,Fuel Qty,eldsneyti Magn
 DocType: Production Order Operation,Planned Start Time,Planned Start Time
 DocType: Course,Assessment,mat
@@ -2827,7 +2881,7 @@
 DocType: Price List,Price List Master,Verðskrá Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Öll sala Viðskipti má tagged móti mörgum ** sölufólk ** þannig að þú getur sett og fylgjast markmið.
 ,S.O. No.,SO nr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Vinsamlegast búa til viðskiptavina frá Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Vinsamlegast búa til viðskiptavina frá Lead {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Veldu sjúkling
 DocType: Price List,Applicable for Countries,Gildir fyrir löndum
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Parameter Name
@@ -2858,27 +2912,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,Birgir Reikningsyfirlit
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Kostnað / Mismunur reikning ({0}) verður að vera &#39;rekstrarreikning &quot;reikning a
 DocType: Project,Copied From,Afritað frá
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Nafn villa: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,skortur
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Nafn villa: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,skortur
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} er ekki tengd við {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Mæting fyrir starfsmann {0} er þegar merkt
 DocType: Packing Slip,If more than one package of the same type (for print),Ef fleiri en einn pakka af sömu gerð (fyrir prentun)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Vinsamlegast stilltu sjálfgefinn viðskiptavin í veitingastaðnum
 ,Salary Register,laun Register
 DocType: Warehouse,Parent Warehouse,Parent Warehouse
 DocType: C-Form Invoice Detail,Net Total,Net Total
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Sjálfgefið BOM fannst ekki fyrir lið {0} og verkefni {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Sjálfgefið BOM fannst ekki fyrir lið {0} og verkefni {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Skilgreina ýmsar tegundir lána
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,útistandandi fjárhæð
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Tími (í mín)
 DocType: Project Task,Working,Vinna
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock Biðröð (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Fjárhagsár
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Fjárhagsár
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} ekki tilheyra félaginu {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,Gat ekki leyst forsendur skora virka fyrir {0}. Gakktu úr skugga um að formúlan sé gild.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Kostnaður og á
 DocType: Healthcare Settings,Out Patient Settings,Úthreinsun sjúklinga
 DocType: Account,Round Off,umferð Off
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Magn verður að vera jákvætt
 ,Requested Qty,Umbeðin Magn
 DocType: Tax Rule,Use for Shopping Cart,Nota fyrir Shopping Cart
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Gildi {0} fyrir eigind {1} er ekki til á lista yfir gild lið eigindar í lið {2}
@@ -2887,7 +2943,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Gjöld verður dreift hlutfallslega miðað hlut Fjöldi eða magn, eins og á val þitt"
 DocType: Maintenance Visit,Purposes,tilgangi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Atleast eitt atriði skal færa með neikvæðum magni í staðinn skjal
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Bæta við námskeiðum
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} lengur en öllum tiltækum vinnutíma í vinnustöð {1}, brjóta niður rekstur í mörgum aðgerðum"
 ,Requested,Umbeðin
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,engar athugasemdir
@@ -2899,6 +2954,8 @@
 DocType: Employee Loan,Repaid/Closed,Launað / Lokað
 DocType: Item,Total Projected Qty,Alls spáð Magn
 DocType: Monthly Distribution,Distribution Name,Dreifing Name
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Birgir&gt; Birgir Tegund
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Verðmatshlutfall fannst ekki fyrir lið {0}, sem þarf til að gera bókhaldslegar færslur fyrir {1} {2}. Ef hluturinn er í viðskiptum sem núllmatshlutfall í {1} skaltu nefna það í {1} hlutatöflunni. Annars skaltu vinsamlegast stofna viðskipti í viðskiptum fyrir vöruna eða nefna verðmat í hlutaskránni og reyndu síðan að senda inn / aftaka þessa færslu"
 DocType: Course,Course Code,Auðvitað Code
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Quality Inspection krafist fyrir lið {0}
 DocType: POS Settings,Use POS in Offline Mode,Notaðu POS í ótengdu ham
@@ -2909,14 +2966,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Stjórna Territory Tree.
 DocType: Journal Entry Account,Sales Invoice,Reikningar
 DocType: Journal Entry Account,Party Balance,Party Balance
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,Vinsamlegast veldu Virkja afsláttur á
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Vinsamlegast veldu Virkja afsláttur á
 DocType: Company,Default Receivable Account,Sjálfgefið Krafa Reikningur
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Búa Bank færslu fyrir heildarlaunum greitt fyrir ofan valin forsendum
 DocType: Physician,Physician Schedule,Læknisáætlun
 DocType: Purchase Invoice,Deemed Export,Álitinn útflutningur
 DocType: Stock Entry,Material Transfer for Manufacture,Efni Transfer fyrir Framleiðsla
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Afsláttur Hlutfall hægt að beita annaðhvort á móti verðskrá eða fyrir alla verðlista.
-DocType: Purchase Invoice,Half-yearly,Hálfsárs
+DocType: Subscription,Half-yearly,Hálfsárs
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Bókhalds Færsla fyrir Lager
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Þú hefur nú þegar metið mat á viðmiðunum {}.
@@ -2945,13 +3002,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Extra Small
 DocType: Company,Standard Template,Standard Template
 DocType: Training Event,Theory,Theory
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Viðvörun: Efni Umbeðin Magn er minna en Minimum Order Magn
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Viðvörun: Efni Umbeðin Magn er minna en Minimum Order Magn
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Reikningur {0} er frosinn
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Lögaðili / Dótturfélag með sérstakri Mynd af reikninga tilheyra stofnuninni.
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Matur, drykkir og Tobacco"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Getur aðeins gera greiðslu gegn ógreitt {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,hlutfall Framkvæmdastjórnin getur ekki verið meiri en 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Getur aðeins gera greiðslu gegn ógreitt {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,hlutfall Framkvæmdastjórnin getur ekki verið meiri en 100
 DocType: Stock Entry,Subcontract,undirverktaka
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Vinsamlegast sláðu inn {0} fyrst
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Engin svör frá
@@ -2969,10 +3026,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Colour
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Mat Plan Viðmið
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Hindra innkaupapantanir
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Viðkvæm
 DocType: Patient Appointment,Scheduled,áætlunarferðir
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Beiðni um tilvitnun.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vinsamlega settu upp starfsmannamiðlunarkerfi í mannauði&gt; HR-stillingar
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Vinsamlegast veldu Hlutir sem &quot;Er Stock Item&quot; er &quot;Nei&quot; og &quot;Er Velta Item&quot; er &quot;já&quot; og það er engin önnur vara Bundle
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Veldu viðskiptavini
 DocType: Student Log,Academic,Academic
 DocType: Patient,Personal and Social History,Persónuleg og félagsleg saga
 DocType: Fee Schedule,Fee Breakup for each student,Gjaldskrá fyrir hverja nemanda
@@ -2982,7 +3040,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,verðmat Rate
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Verðlisti Gjaldmiðill ekki valinn
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Verðlisti Gjaldmiðill ekki valinn
 apps/erpnext/erpnext/config/healthcare.py +46,Results,Niðurstöður
 ,Student Monthly Attendance Sheet,Student Monthly Aðsókn Sheet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Starfsmaður {0} hefur þegar sótt um {1} milli {2} og {3}
@@ -2997,7 +3055,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Stjórna Velta Partners.
 DocType: Quality Inspection,Inspection Type,skoðun Type
 DocType: Fee Validity,Visited yet,Heimsóknir ennþá
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Vöruhús með núverandi viðskipti er ekki hægt að breyta í hópinn.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Vöruhús með núverandi viðskipti er ekki hægt að breyta í hópinn.
 DocType: Assessment Result Tool,Result HTML,niðurstaða HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,rennur út
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Bæta Nemendur
@@ -3024,7 +3082,7 @@
 DocType: Healthcare Settings,Result Printed,Niðurstaða prentuð
 DocType: Asset Category Account,Depreciation Expense Account,Afskriftir kostnað reiknings
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,reynslutíma
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Skoða {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Skoða {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Aðeins blaða hnútar mega í viðskiptum
 DocType: Expense Claim,Expense Approver,Expense samþykkjari
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Row {0}: Advance gegn Viðskiptavinur verður að vera trúnaður
@@ -3035,7 +3093,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,til DATETIME
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Course Skrár eytt:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Logs fyrir að viðhalda SMS-sendingar stöðu
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Setja sölumarkmið
 DocType: Accounts Settings,Make Payment via Journal Entry,Greiða í gegnum dagbókarfærslu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Prentað á
 DocType: Item,Inspection Required before Delivery,Skoðun Áskilið fyrir fæðingu
@@ -3043,7 +3100,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,bið Starfsemi
 DocType: Patient Appointment,Reminded,Minntist á
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Stofnunin þín
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Stofnunin þín
 DocType: Fee Component,Fees Category,Gjald Flokkur
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Vinsamlegast sláðu létta dagsetningu.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
@@ -3055,7 +3112,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Uppröðun Level
 DocType: Company,Chart Of Accounts Template,Mynd af reikningum sniðmáti
 DocType: Attendance,Attendance Date,Aðsókn Dagsetning
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Item Verð uppfærð fyrir {0} í verðskrá {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Item Verð uppfærð fyrir {0} í verðskrá {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Laun Breakup byggt á launin og frádráttur.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Reikningur með hnúta barn er ekki hægt að breyta í höfuðbók
 DocType: Purchase Invoice Item,Accepted Warehouse,Samþykkt vöruhús
@@ -3071,9 +3128,10 @@
 ,Employee Birthday,starfsmaður Afmæli
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Hópur Aðsókn Tool
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,Limit Crossed
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Áætlað Upto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,An fræðihugtak með þessu &quot;skólaárinu &#39;{0} og&#39; Term Name &#39;{1} er þegar til. Vinsamlegast breyttu þessum færslum og reyndu aftur.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}",Eins og það eru núverandi reiðufé gegn færslu {0} er ekki hægt að breyta gildi {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}",Eins og það eru núverandi reiðufé gegn færslu {0} er ekki hægt að breyta gildi {1}
 DocType: UOM,Must be Whole Number,Verður að vera heil tala
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Ný Leaves Úthlutað (í dögum)
 DocType: Purchase Invoice,Invoice Copy,Reikningur Afrita
@@ -3083,7 +3141,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Reikningsnúmer
 DocType: Shopping Cart Settings,Orders,pantanir
 DocType: Employee Leave Approver,Leave Approver,Skildu samþykkjari
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Vinsamlegast veldu lotu
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Vinsamlegast veldu lotu
 DocType: Assessment Group,Assessment Group Name,Mat Group Name
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Efni flutt til Framleiðendur
 DocType: Expense Claim,"A user with ""Expense Approver"" role",A notandi með &quot;Kostnað samþykkjari&quot; hlutverk
@@ -3098,7 +3156,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Tímabil Lokar Entry
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Veldu deild ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Kostnaður Center við núverandi viðskipti er ekki hægt að breyta í hópinn
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Upphæð {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Upphæð {0} {1} {2} {3}
 DocType: Account,Depreciation,gengislækkun
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Birgir (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Starfsmaður Aðsókn Tool
@@ -3109,10 +3167,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,Greiðsla Færslur {0} eru un-tengd
 DocType: GL Entry,Voucher No,skírteini nr
 ,Lead Owner Efficiency,Lead Owner Efficiency
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Vinsælast
 DocType: Leave Allocation,Leave Allocation,Skildu Úthlutun
 DocType: Payment Request,Recipient Message And Payment Details,Viðtakandinn Message og greiðsluskilmálar
 DocType: Training Event,Trainer Email,þjálfari Email
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Efni Beiðnir {0} búnar
+DocType: Restaurant Reservation,No of People,Ekkert fólk
 DocType: Production Planning Tool,Include sub-contracted raw materials,Fela undirverktaka hráefni
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Snið af skilmálum eða samningi.
 DocType: Purchase Invoice,Address and Contact,Heimilisfang og samband við
@@ -3121,10 +3181,11 @@
 DocType: Supplier,Last Day of the Next Month,Last Day næsta mánaðar
 DocType: Support Settings,Auto close Issue after 7 days,Auto nálægt Issue eftir 7 daga
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Leyfi ekki hægt að skipta áður en {0}, sem orlof jafnvægi hefur þegar verið fært sendar í framtíðinni leyfi úthlutun met {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Ath: Vegna / Frestdagur umfram leyfð viðskiptavina kredit dagar eftir {0} dag (s)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Ath: Vegna / Frestdagur umfram leyfð viðskiptavina kredit dagar eftir {0} dag (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Umsækjandi
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,Upprunalega fyrir viðtakanda
 DocType: Asset Category Account,Accumulated Depreciation Account,Uppsöfnuðum afskriftum Reikningur
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Þessi tölvupóstur er autogenerated
 DocType: Stock Settings,Freeze Stock Entries,Frysta lager Entries
 DocType: Program Enrollment,Boarding Student,Stúdentsprófessor
 DocType: Asset,Expected Value After Useful Life,Væntanlegur Value Eftir gagnlegur líf
@@ -3132,7 +3193,7 @@
 DocType: Activity Cost,Billing Rate,Innheimta Rate
 ,Qty to Deliver,Magn í Bera
 ,Stock Analytics,lager Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Aðgerðir geta ekki vera autt
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Aðgerðir geta ekki vera autt
 DocType: Maintenance Visit Purpose,Against Document Detail No,Gegn Document Detail No
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Party Type er nauðsynlegur
 DocType: Quality Inspection,Outgoing,Outgoing
@@ -3154,7 +3215,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Veldu nemendur handvirkt fyrir hópinn sem byggir á starfsemi
 DocType: Journal Entry,User Remark,Notandi Athugasemd
 DocType: Lead,Market Segment,Market Segment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Greiddur Upphæð má ekki vera meiri en heildar neikvæð útistandandi {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Greiddur Upphæð má ekki vera meiri en heildar neikvæð útistandandi {0}
 DocType: Supplier Scorecard Period,Variables,Variables
 DocType: Employee Internal Work History,Employee Internal Work History,Starfsmaður Innri Vinna Saga
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Lokun (Dr)
@@ -3183,21 +3244,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,fá uppfærslur
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} ekki tilheyra félaginu {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Efni Beiðni {0} er aflýst eða henni hætt
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Skildu Stjórnun
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Skildu Stjórnun
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Group eftir reikningi
 DocType: Sales Order,Fully Delivered,Alveg Skilað
 DocType: Lead,Lower Income,neðri Tekjur
+DocType: Restaurant Order Entry,Current Order,Núverandi röð
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Uppspretta og miða vöruhús getur ekki verið það sama fyrir röð {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Munurinn Reikningur verður að vera Eigna- / Ábyrgðartegund reikningur, þar sem þetta Stock Sáttargjörð er Opening Entry"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Andvirði lánsins getur ekki verið hærri en Lánsupphæðir {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Fara í forrit
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Innkaupapöntunarnúmeri þarf fyrir lið {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Framleiðsla Order ekki búin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Framleiðsla Order ekki búin
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Frá Dagsetning &#39;verður að vera eftir&#39; Til Dagsetning &#39;
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Get ekki breytt stöðu sem nemandi {0} er tengd við beitingu nemandi {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Get ekki breytt stöðu sem nemandi {0} er tengd við beitingu nemandi {1}
 DocType: Asset,Fully Depreciated,Alveg afskrifaðar
 ,Stock Projected Qty,Stock Áætlaðar Magn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Viðskiptavinur {0} ekki tilheyra verkefninu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Viðskiptavinur {0} ekki tilheyra verkefninu {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Marked Aðsókn HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",Tilvitnanir eru tillögur tilboðum þú sendir til viðskiptavina þinna
 DocType: Sales Order,Customer's Purchase Order,Viðskiptavinar Purchase Order
@@ -3208,8 +3270,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Vinsamlegast settu Fjöldi Afskriftir Bókað
 DocType: Supplier Scorecard Period,Calculations,Útreikningar
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Gildi eða Magn
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Productions Pantanir geta ekki hækkað um:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Productions Pantanir geta ekki hækkað um:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Minute
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vinsamlegast settu Nöfnunarröð fyrir {0} í gegnum Skipulag&gt; Stillingar&gt; Nöfnunarröð
 DocType: Purchase Invoice,Purchase Taxes and Charges,Purchase skatta og gjöld
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Fara til birgja
 ,Qty to Receive,Magn til Fá
@@ -3222,7 +3285,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Inneign á reikninginn verður að vera Efnahagur reikning
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Allar Birgir ferðalaga
 DocType: Global Defaults,Disable In Words,Slökkva á í orðum
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,Item Code er nauðsynlegur vegna þess að hluturinn er ekki sjálfkrafa taldir
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,Item Code er nauðsynlegur vegna þess að hluturinn er ekki sjálfkrafa taldir
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Tilvitnun {0} ekki af tegund {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Viðhald Dagskrá Item
 DocType: Sales Order,%  Delivered,% Skilað
@@ -3244,23 +3307,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Opnun Balance Equity
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Sáttur
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,eftir
 DocType: Appraisal,Appraisal,Úttekt
 DocType: Purchase Invoice,GST Details,GST upplýsingar
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},Tölvupóstur sendur á birgi {0}
+DocType: Item,Default Sales Unit of Measure,Sjálfgefin sölustuðull
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Dagsetning er endurtekin
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Leyft Undirritaður
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Skildu samþykkjari verður að vera einn af {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Búðu til gjöld
-DocType: Hub Settings,Seller Email,Seljandi Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total Kaup Kostnaður (í gegnum kaupa Reikningar)
 DocType: Training Event,Start Time,Byrjunartími
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Select Magn
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Select Magn
 DocType: Customs Tariff Number,Customs Tariff Number,Tollskrá Number
 DocType: Patient Appointment,Patient Appointment,Sjúklingaráð
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Samþykkir hlutverki getur ekki verið sama og hlutverk reglan er við að
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Segja upp áskrift að þessum tölvupósti Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Segja upp áskrift að þessum tölvupósti Digest
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Fáðu birgja eftir
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} fannst ekki fyrir lið {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Fara í námskeið
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,skilaboð send
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Reikningur með hnúta barn er ekki hægt að setja eins og höfuðbók
@@ -3273,11 +3339,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Efni flutt til framleiðslu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Reikningur {0} er ekki til
 DocType: Project,Project Type,Project Type
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Barnaskipti er til fyrir þetta verkefni. Þú getur ekki eytt þessu verkefni.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Annaðhvort miða Magn eða miða upphæð er nauðsynlegur.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Kostnaður við ýmiss konar starfsemi
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Engar niðurstöður ennþá
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Kostnaður við ýmiss konar starfsemi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Stilling viðburðir til {0}, þar sem Starfsmannafélag fylgir að neðan sölufólk er ekki með notendanafn {1}"
 DocType: Timesheet,Billing Details,Billing Upplýsingar
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Uppspretta og miða vöruhús verður að vera öðruvísi
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Uppspretta og miða vöruhús verður að vera öðruvísi
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Ekki leyft að uppfæra lager viðskipti eldri en {0}
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Alveg Billed
@@ -3303,7 +3371,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,millifærsla
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Athugaðu alla
 DocType: Vehicle Log,Invoice Ref,Invoice Ref
-DocType: Purchase Order,Recurring Order,Fastir Order
 DocType: Company,Default Income Account,Sjálfgefið Tekjur Reikningur
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Viðskiptavinur Group / viðskiptavina
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed Fiscal Years Hagnaður / Tap (Credit)
@@ -3317,9 +3384,9 @@
 DocType: Patient,A Negative,Neikvætt
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Ekkert meira að sýna.
 DocType: Lead,From Customer,frá viðskiptavinar
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,símtöl
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,símtöl
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,A vara
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,Hópur
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,Hópur
 DocType: Project,Total Costing Amount (via Time Logs),Total Kosta Magn (með Time Logs)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Gerðu gjaldskrá
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
@@ -3343,7 +3410,7 @@
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Blöð og Holiday
 DocType: School Settings,Current Academic Term,Núverandi námsbraut
 DocType: Sales Order,Not Billed,ekki borgað
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Bæði Warehouse að tilheyra sama Company
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Bæði Warehouse að tilheyra sama Company
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Engir tengiliðir bætt við enn.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Landað Kostnaður skírteini Magn
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Víxlar hækkaðir um birgja.
@@ -3352,7 +3419,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,afsláttur Upphæð
 DocType: Purchase Invoice,Return Against Purchase Invoice,Return Against kaupa Reikningar
 DocType: Item,Warranty Period (in days),Ábyrgðartímabilið (í dögum)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',uppfæra `tabPatient Appointment` setja sales_invoice = &#39;{0}&#39; þar sem nafn = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Tengsl Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Handbært fé frá rekstri
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Liður 4
@@ -3361,8 +3427,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry Reikningur
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student Group
 DocType: Shopping Cart Settings,Quotation Series,Tilvitnun Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",Atriði til staðar með sama nafni ({0}) skaltu breyta liður heiti hópsins eða endurnefna hlutinn
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Vinsamlegast veldu viðskiptavin
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item",Atriði til staðar með sama nafni ({0}) skaltu breyta liður heiti hópsins eða endurnefna hlutinn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Vinsamlegast veldu viðskiptavin
 DocType: C-Form,I,ég
 DocType: Company,Asset Depreciation Cost Center,Eignastýring Afskriftir Kostnaður Center
 DocType: Sales Order Item,Sales Order Date,Velta Order Dagsetning
@@ -3371,6 +3437,7 @@
 DocType: Assessment Plan,Assessment Plan,mat Plan
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Viðskiptavinur {0} er búinn til.
 DocType: Stock Settings,Limit Percent,Limit Percent
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Eins og er ekki birgðir í boði á hvaða vöruhúsi
 ,Payment Period Based On Invoice Date,Greiðsla Tímabil Byggt á reikningi Dagsetning
 DocType: Sample Collection,No. of print,Fjöldi prenta
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Vantar gjaldeyri Verð fyrir {0}
@@ -3426,13 +3493,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Total Frádráttur - Lán Endurgreiðsla
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,Núverandi BOM og New BOM getur ekki verið það sama
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Laun Slip ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Laun Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Dagsetning starfsloka verður að vera hærri en Dagsetning Tengja
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Það komu upp villur við tímasetningu námskeið á:
 DocType: Sales Invoice,Against Income Account,Against þáttatekjum
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Skilað
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Liður {0}: Pantaði Magn {1} má ekki vera minna en lágmarks röð Fjöldi {2} (sem skilgreindur er í lið).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Liður {0}: Pantaði Magn {1} má ekki vera minna en lágmarks röð Fjöldi {2} (sem skilgreindur er í lið).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mánaðarleg Dreifing Hlutfall
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Vinsamlegast skráðu þig inn sem annar notandi.
 DocType: Territory,Territory Targets,Territory markmið
 DocType: Delivery Note,Transporter Info,Transporter Upplýsingar
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Vinsamlegast settu sjálfgefið {0} í félaginu {1}
@@ -3440,13 +3508,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Sama birgir hefur verið slegið mörgum sinnum
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Gross Hagnaður / Tap
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Purchase Order Item Staðar
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Nafn fyrirtækis er ekki hægt Company
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Nafn fyrirtækis er ekki hægt Company
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Bréf Heads fyrir prenta sniðmát.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titlar til prenta sniðmát td Próformareikningur.
 DocType: Program Enrollment,Walking,Ganga
 DocType: Student Guardian,Student Guardian,Student Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Verðmat gerð gjöld geta ekki merkt sem Inclusive
 DocType: POS Profile,Update Stock,Uppfæra Stock
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,í áskriftinni
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Mismunandi UOM að atriðum mun leiða til rangrar (alls) nettóþyngd gildi. Gakktu úr skugga um að nettóþyngd hvern hlut er í sama UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,Journal Entry fyrir rusl
@@ -3494,15 +3563,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System User (ur) ID. Ef sett, mun það verða sjálfgefið fyrir allar HR eyðublöð."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Frá {1}
 DocType: Task,depends_on,veltur á
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Í biðstöðu fyrir að uppfæra nýjustu verð í öllum efnisskránni. Það getur tekið nokkrar mínútur.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Í biðstöðu fyrir að uppfæra nýjustu verð í öllum efnisskránni. Það getur tekið nokkrar mínútur.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nafn nýja reikninginn. Ath: Vinsamlegast bý ekki reikninga fyrir viðskiptavini og birgja
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Land vitur sjálfgefið veffang Sniðmát
 DocType: Sales Order Item,Supplier delivers to Customer,Birgir skilar til viðskiptavinar
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) er út af lager
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Vegna / Reference Dagsetning má ekki vera á eftir {0}
+,Sales Payment Summary,Sala Greiðsla Yfirlit
+DocType: Restaurant,Restaurant,Veitingahús
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Vegna / Reference Dagsetning má ekki vera á eftir {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Gögn Innflutningur og útflutningur
 DocType: Patient,Account Details,Reikningsupplýsingar
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Engar nemendur Found
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Engar nemendur Found
 DocType: Medical Department,Medical Department,Medical Department
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Birgir Scorecard Scoring Criteria
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Reikningar Staða Date
@@ -3513,7 +3584,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Vinsamlegast veldu dagsetningu birtingar áður en þú velur Party
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Út af AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Vinsamlegast veldu Tilvitnanir
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Vinsamlegast veldu Tilvitnanir
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Fjöldi Afskriftir bókað getur ekki verið meiri en heildarfjöldi Afskriftir
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Gera Viðhald Heimsókn
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,Vinsamlegast hafðu samband við til notanda sem hefur sala Master Manager {0} hlutverki
@@ -3521,7 +3592,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Company (ekki viðskiptamenn eða birgja) skipstjóri.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Þetta er byggt á mætingu þessa Student
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Engar nemendur í
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Bæta við fleiri atriði eða opnu fulla mynd
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Bæta við fleiri atriði eða opnu fulla mynd
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Afhending Skýringar {0} verður lokað áður en hætta þessu Velta Order
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Fara til notenda
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Greiddur upphæð + afskrifa Upphæð má ekki vera meiri en Grand Total
@@ -3541,37 +3612,40 @@
 DocType: Fee Schedule,Fee Schedule,gjaldskrá
 DocType: Hub Settings,Publish Availability,birta Availability
 DocType: Company,Create Chart Of Accounts Based On,Búa graf af reikningum miðað við
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Ekki er hægt að umbreyta því til annarra hópa. Barnatriði eru til.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Fæðingardagur getur ekki verið meiri en í dag.
 ,Stock Ageing,Stock Ageing
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Student {0} hendi gegn kæranda nemandi {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Rounding Adjustment (Company Gjaldmiðill)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Tímatafla
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Tímatafla
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} &#39;{1}&#39; er óvirk
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Setja sem Open
 DocType: Cheque Print Template,Scanned Cheque,skönnuð ávísun
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Senda sjálfvirkar tölvupóst til Tengiliði á Sendi viðskiptum.
 DocType: Timesheet,Total Billable Amount,Alls Reikningur Upphæð
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Liður 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Pöntunarnúmer
 DocType: Purchase Order,Customer Contact Email,Viðskiptavinur samband við Tölvupóstur
 DocType: Warranty Claim,Item and Warranty Details,Item og Ábyrgð Details
 DocType: Sales Team,Contribution (%),Framlag (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Ath: Greiðsla Entry verður ekki búið síðan &#39;Cash eða Bank Account &quot;var ekki tilgreint
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Verkefni {0} er þegar til
 DocType: Medical Department,Nursing User,Hjúkrunarnotandi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,ábyrgð
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Gildistími þessa tilvitnunar er lokið.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Gildistími þessa tilvitnunar er lokið.
 DocType: Expense Claim Account,Expense Claim Account,Expense Krafa Reikningur
 DocType: Accounts Settings,Allow Stale Exchange Rates,Leyfa óbreyttu gengi
 DocType: Sales Person,Sales Person Name,Velta Person Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Vinsamlegast sláðu inn atleast 1 reikning í töflunni
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Bæta notendur
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Bæta notendur
 DocType: POS Item Group,Item Group,Liður Group
 DocType: Item,Safety Stock,Safety Stock
 DocType: Healthcare Settings,Healthcare Settings,Heilbrigðisstofnanir
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Progress% fyrir verkefni getur ekki verið meira en 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Progress% fyrir verkefni getur ekki verið meira en 100.
 DocType: Stock Reconciliation Item,Before reconciliation,áður sátta
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Til {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skattar og gjöld bætt (Company Gjaldmiðill)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Liður Tax Row {0} verður að hafa hliðsjón af tegund skatta eða tekjur eða gjöld eða Skuldfæranlegar
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Liður Tax Row {0} verður að hafa hliðsjón af tegund skatta eða tekjur eða gjöld eða Skuldfæranlegar
 DocType: Sales Order,Partly Billed,hluta Billed
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Liður {0} verður að vera fast eign Item
 DocType: Item,Default BOM,Sjálfgefið BOM
@@ -3587,6 +3661,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,Variable
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Frá Delivery Note
 DocType: Student,Student Email Address,Student Netfang
+DocType: Item,Hub Warehouse,Hub Vörugeymsla
 DocType: Physician Schedule Time Slot,From Time,frá Time
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Á lager:
 DocType: Notification Control,Custom Message,Custom Message
@@ -3594,9 +3669,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,Cash eða Bank Account er nauðsynlegur til að gera greiðslu færslu
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Námsmaður Heimilisfang
 DocType: Purchase Invoice,Price List Exchange Rate,Verðskrá Exchange Rate
+DocType: POS Profile,POS Profile Name,POS prófíl nafn
 DocType: Purchase Invoice Item,Rate,Gefa
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,netfang Nafn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,netfang Nafn
 DocType: Stock Entry,From BOM,frá BOM
 DocType: Assessment Code,Assessment Code,mat Code
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Basic
@@ -3610,11 +3686,12 @@
 DocType: Salary Slip,Salary Structure,laun Uppbygging
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Airline
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Issue Efni
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Issue Efni
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Villa kom upp við endurkomu
 DocType: Material Request Item,For Warehouse,fyrir Warehouse
 DocType: Employee,Offer Date,Tilboð Dagsetning
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Tilvitnun
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Þú ert í offline háttur. Þú munt ekki vera fær um að endurhlaða fyrr en þú hefur net.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Þú ert í offline háttur. Þú munt ekki vera fær um að endurhlaða fyrr en þú hefur net.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Engar Student Groups búin.
 DocType: Purchase Invoice Item,Serial No,Raðnúmer
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Mánaðarlega endurgreiðslu Upphæð má ekki vera meiri en lánsfjárhæð
@@ -3624,17 +3701,18 @@
 DocType: Salary Slip,Total Working Hours,Samtals Vinnutíminn
 DocType: Subscription,Next Schedule Date,Næsta Dagsetning Dagsetning
 DocType: Stock Entry,Including items for sub assemblies,Þ.mt atriði fyrir undir þingum
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Sláðu gildi verður að vera jákvæð
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Allir Territories
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Sláðu gildi verður að vera jákvæð
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Allir Territories
 DocType: Purchase Invoice,Items,atriði
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Nemandi er nú skráður.
 DocType: Fiscal Year,Year Name,ár Name
 DocType: Process Payroll,Process Payroll,aðferð Launaskrá
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Það eru fleiri frídagar en vinnudögum þessum mánuði.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Það eru fleiri frídagar en vinnudögum þessum mánuði.
 DocType: Product Bundle Item,Product Bundle Item,Vara Knippi Item
 DocType: Sales Partner,Sales Partner Name,Heiti Sales Partner
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Beiðni um tilvitnanir
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Beiðni um tilvitnanir
 DocType: Payment Reconciliation,Maximum Invoice Amount,Hámarks Invoice Amount
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Blóðmyndun
 DocType: Normal Test Items,Normal Test Items,Venjuleg prófunaratriði
 DocType: Student Language,Student Language,Student Tungumál
 apps/erpnext/erpnext/config/selling.py +23,Customers,viðskiptavinir
@@ -3645,10 +3723,11 @@
 DocType: Issue,Opening Time,opnun Time
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Frá og Til dagsetningar krafist
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Verðbréf &amp; hrávöru ungmennaskipti
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default Mælieiningin fyrir Variant &#39;{0}&#39; verða að vera sama og í sniðmáti &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default Mælieiningin fyrir Variant &#39;{0}&#39; verða að vera sama og í sniðmáti &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Reikna miðað við
 DocType: Delivery Note Item,From Warehouse,frá Warehouse
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Engar Verk með Bill of Materials að Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Engar Verk með Bill of Materials að Manufacture
+DocType: Restaurant,Default Customer,Sjálfgefið viðskiptavinur
 DocType: Assessment Plan,Supervisor Name,Umsjón Name
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Ekki staðfestu ef skipun er búin til fyrir sama dag
 DocType: Program Enrollment Course,Program Enrollment Course,Forritunarnámskeið
@@ -3675,7 +3754,7 @@
 DocType: Payment Entry,Internal Transfer,innri Transfer
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Barnið er til fyrir þennan reikning. Þú getur ekki eytt þessum reikningi.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Annaðhvort miða Magn eða miða upphæð er nauðsynlegur
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Ekkert sjálfgefið BOM er til fyrir lið {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Ekkert sjálfgefið BOM er til fyrir lið {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Vinsamlegast veldu dagsetningu birtingar fyrst
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Opnun Date ætti að vera áður lokadegi
 DocType: Leave Control Panel,Carry Forward,Haltu áfram
@@ -3710,6 +3789,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,alls Present
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,bókhald Yfirlýsingar
 DocType: Drug Prescription,Hour,klukkustund
+DocType: Restaurant Order Entry,Last Sales Invoice,Síðasta sala Reikningur
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,New Serial Nei getur ekki hafa Warehouse. Warehouse verður að setja af lager Entry eða kvittun
 DocType: Lead,Lead Type,Lead Tegund
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Þú hefur ekki heimild til að samþykkja lauf á Block Dagsetningar
@@ -3744,64 +3824,66 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Búa notendur
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,Gram
 DocType: Supplier Scorecard,Per Month,Á mánuði
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Magn á Framleiðsla verður að vera hærri en 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Magn á Framleiðsla verður að vera hærri en 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Heimsókn skýrslu fyrir símtal viðhald.
 DocType: Stock Entry,Update Rate and Availability,Update Rate og Framboð
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Hlutfall sem þú ert leyft að taka á móti eða afhenda fleiri gegn pantað magn. Til dæmis: Ef þú hefur pantað 100 einingar. og barnabætur er 10% þá er leyft að taka á móti 110 einingar.
 DocType: POS Customer Group,Customer Group,viðskiptavinur Group
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Ný lotunúmer (valfrjálst)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Ný lotunúmer (valfrjálst)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Kostnað reikningur er nauðsynlegur fyrir lið {0}
 DocType: BOM,Website Description,Vefsíða Lýsing
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Net breyting á eigin fé
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Nýjasta
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Vinsamlegast hætta kaupa Reikningar {0} fyrst
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Netfang verður að vera einstakt, þegar til fyrir {0}"
 DocType: Serial No,AMC Expiry Date,AMC Fyrningardagsetning
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,kvittun
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,kvittun
 ,Sales Register,velta Nýskráning
 DocType: Daily Work Summary Settings Company,Send Emails At,Senda póst At
 DocType: Quotation,Quotation Lost Reason,Tilvitnun Lost Ástæða
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Veldu lénið þitt
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',veldu * úr tabPatient þar sem nafn = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Tilvísunarnúmer viðskipta engin {0} dagsett {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Tilvísunarnúmer viðskipta engin {0} dagsett {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Það er ekkert að breyta.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Eyðublað
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Samantekt fyrir þennan mánuð og bið starfsemi
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Eyðublað
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Samantekt fyrir þennan mánuð og bið starfsemi
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Bættu notendum við fyrirtækið þitt, annað en sjálfan þig."
 DocType: Customer Group,Customer Group Name,Viðskiptavinar Group Name
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Engar viðskiptavinir ennþá!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Engar viðskiptavinir ennþá!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Sjóðstreymi
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lánið upphæð mega vera Hámarkslán af {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,License
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Vinsamlegast fjarlægðu þennan reikning {0} úr C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Vinsamlegast fjarlægðu þennan reikning {0} úr C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vinsamlegast veldu Yfirfæranlegt ef þú vilt líka að fela jafnvægi fyrra reikningsári er fer að þessu fjárhagsári
 DocType: GL Entry,Against Voucher Type,Against Voucher Tegund
 DocType: Physician,Phone (R),Sími (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Tími rifa bætt við
 DocType: Item,Attributes,Eigindir
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Virkja sniðmát
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vinsamlegast settu Nöfnunarröð fyrir {0} í gegnum Skipulag&gt; Stillingar&gt; Nöfnunarröð
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Vinsamlegast sláðu afskrifa reikning
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Síðasta Röð Dagsetning
 DocType: Patient,B Negative,B neikvæð
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Reikningur {0} er ekki tilheyrir fyrirtækinu {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Raðnúmer í röð {0} samsvarar ekki við Afhendingartilkynningu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Raðnúmer í röð {0} samsvarar ekki við Afhendingartilkynningu
 DocType: Student,Guardian Details,Guardian Upplýsingar
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Mæting fyrir margar starfsmenn
 DocType: Vehicle,Chassis No,undirvagn Ekkert
 DocType: Payment Request,Initiated,hafin
 DocType: Production Order,Planned Start Date,Áætlaðir Start Date
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Vinsamlegast veldu BOM
 DocType: Serial No,Creation Document Type,Creation Document Type
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Lokadagur verður að vera meiri en upphafsdagur
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Lokadagur verður að vera meiri en upphafsdagur
 DocType: Leave Type,Is Encash,er Encash
 DocType: Leave Allocation,New Leaves Allocated,Ný Leaves Úthlutað
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Project-vitur gögn eru ekki í boði fyrir Tilvitnun
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Enda á
 DocType: Project,Expected End Date,Væntanlegur Lokadagur
 DocType: Budget Account,Budget Amount,Budget Upphæð
 DocType: Appraisal Template,Appraisal Template Title,Úttekt Snið Title
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Frá Dagsetning {0} fyrir Starfsmaður {1} er ekki hægt áður en hann Dagsetning starfsmanns {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Commercial
 DocType: Patient,Alcohol Current Use,Notkun áfengisneyslu
+DocType: Student Admission Program,Student Admission Program,Námsmenntun
 DocType: Payment Entry,Account Paid To,Reikningur Greiddur Til
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent Item {0} mátt ekki vera Stock Item
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Allar vörur eða þjónustu.
@@ -3810,30 +3892,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Fjárhagsáætlun fyrir reikning {1} gegn {2} {3} er {4}. Það mun fara yfir um {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Reikningur verður að vera af gerðinni &#39;Fast Asset&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,út Magn
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Reglur til að reikna sendingarkostnað upphæð fyrir sölu
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,og unchcked fatlaður í
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Series er nauðsynlegur
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financial Services
 DocType: Student Sibling,Student ID,Student ID
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Tegundir starfsemi fyrir Time Logs
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Birgir Email
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Tegundir starfsemi fyrir Time Logs
 DocType: Tax Rule,Sales,velta
 DocType: Stock Entry Detail,Basic Amount,grunnfjárhæð
 DocType: Training Event,Exam,Exam
 DocType: Complaint,Complaint,Kvörtun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Warehouse krafist fyrir hlutabréfum lið {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Warehouse krafist fyrir hlutabréfum lið {0}
 DocType: Leave Allocation,Unused leaves,ónotuð leyfi
 DocType: Patient,Alcohol Past Use,Áfengisnotkun áfengis
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,cr
 DocType: Tax Rule,Billing State,Innheimta State
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Ná sprakk BOM (þ.mt undireiningar)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Ná sprakk BOM (þ.mt undireiningar)
 DocType: Authorization Rule,Applicable To (Employee),Gildir til (starfsmaður)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Skiladagur er nauðsynlegur
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Skiladagur er nauðsynlegur
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Vöxtur fyrir eigind {0} er ekki verið 0
 DocType: Journal Entry,Pay To / Recd From,Greiða til / Recd Frá
 DocType: Naming Series,Setup Series,skipulag Series
 DocType: Payment Reconciliation,To Invoice Date,Til dagsetningu reiknings
 DocType: Supplier,Contact HTML,Viltu samband við HTML
 ,Inactive Customers,óvirka viðskiptamenn
+DocType: Student Admission Program,Maximum Age,Hámarksaldur
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Purchase Kvittanir
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Hvernig Verðlagning Regla er beitt?
@@ -3852,6 +3936,7 @@
 DocType: GL Entry,Remarks,athugasemdir
 DocType: Payment Entry,Account Paid From,Reikningur greitt frá
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Item Code
+DocType: Task,Parent Task,Foreldraverkefni
 DocType: Journal Entry,Write Off Based On,Skrifaðu Off byggt á
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,gera Blý
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Prenta og Ritföng
@@ -3860,19 +3945,19 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Laun þegar unnin fyrir tímabilið milli {0} og {1}, Skildu umsókn tímabil getur ekki verið á milli þessu tímabili."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Uppsetning met fyrir Raðnúmer
 DocType: Guardian Interest,Guardian Interest,Guardian Vextir
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Uppsetningar sjálfgefin gildi fyrir POS-reikninga
 apps/erpnext/erpnext/config/hr.py +177,Training,Þjálfun
 DocType: Timesheet,Employee Detail,starfsmaður Detail
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Forráðamaður1 Netfang
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,Dagur næsta degi og endurtaka á Dagur mánaðar verður að vera jöfn
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Dagur næsta degi og endurtaka á Dagur mánaðar verður að vera jöfn
 DocType: Lab Prescription,Test Code,Prófunarregla
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Stillingar fyrir heimasíðu heimasíðuna
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQs eru ekki leyfð fyrir {0} vegna þess að stigatafla sem stendur fyrir {1}
 DocType: Offer Letter,Awaiting Response,bíður svars
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,hér að framan
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Samtals upphæð {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Ógild eiginleiki {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Samtals upphæð {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Ógild eiginleiki {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Tilgreindu ef ekki staðlað greiðslureikningur
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Sama hlutur hefur verið sleginn inn mörgum sinnum. {Listi}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Vinsamlegast veldu matshópinn annað en &#39;Öll matshópa&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Rú {0}: Kostnaðurarmiðstöð er krafist fyrir hlut {1}
 DocType: Training Event Employee,Optional,Valfrjálst
@@ -3895,19 +3980,20 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostnaður Center er nauðsynlegur fyrir lið {2}
 DocType: Vehicle,Policy No,stefna Nei
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Fá atriði úr Vara Knippi
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Eins og birgðir eru fyrir hlutinn {0}, getur þú ekki virkjað með varanlegum eignum"
 DocType: Asset,Straight Line,Bein lína
 DocType: Project User,Project User,Project User
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Skipta
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Skipta
 DocType: GL Entry,Is Advance,er Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Aðsókn Frá Dagsetning og Aðsókn hingað til er nauðsynlegur
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,Vinsamlegast sláðu inn &quot;Er undirverktöku&quot; eins já eða nei
+DocType: Item,Default Purchase Unit of Measure,Sjálfgefin kaupareining
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Síðasti samskiptadagur
 DocType: Sales Team,Contact No.,Viltu samband við No.
 DocType: Bank Reconciliation,Payment Entries,Greiðsla Entries
 DocType: Production Order,Scrap Warehouse,rusl Warehouse
 DocType: Production Order,Check if material transfer entry is not required,Athugaðu hvort efnisflutningsfærsla sé ekki krafist
 DocType: Program Enrollment Tool,Get Students From,Fá nemendur frá
-DocType: Hub Settings,Seller Country,Seljandi Country
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Birta Atriði á vefsvæðinu
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Hópur nemenda þín í lotur
 DocType: Authorization Rule,Authorization Rule,Heimildin Regla
@@ -3917,7 +4003,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Velta Skattar og gjöld Sniðmátsmyndir
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Alls (Credit)
 DocType: Repayment Schedule,Payment Date,Greiðsludagur
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Ný lotunúmer
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Ný lotunúmer
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Fatnaður &amp; Aukabúnaður
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,Gat ekki leyst veginn skora virka. Gakktu úr skugga um að formúlan sé gild.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Fjöldi Order
@@ -3935,6 +4021,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} er ekki hægt að skila, það er þegar {2}"
 DocType: Tax Rule,Billing Country,Innheimta Country
 DocType: Purchase Order Item,Expected Delivery Date,Áætlaðan fæðingardag
+DocType: Restaurant Order Entry,Restaurant Order Entry,Veitingahús Order Entry
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Greiðslu- ekki jafnir fyrir {0} # {1}. Munurinn er {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,risnu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Gera Material Beiðni
@@ -3947,9 +4034,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Reikningur með núverandi viðskipti getur ekki eytt
 DocType: Vehicle,Last Carbon Check,Síðasta Carbon Athuga
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,málskostnaðar
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Vinsamlegast veljið magn í röð
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Vinsamlegast veljið magn í röð
 DocType: Purchase Invoice,Posting Time,staða Time
 DocType: Timesheet,% Amount Billed,% Magn Billed
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Tími fyrir hvert skipun&quot; hefur ekki verið settur fyrir Dr {0}. Bættu því við í lækni meistara.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Sími Útgjöld
 DocType: Sales Partner,Logo,logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Hakaðu við þetta ef þú vilt að þvinga notendur til að velja röð áður en þú vistar. Það verður ekkert sjálfgefið ef þú athuga þetta.
@@ -3960,6 +4048,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ný Tekjur Viðskiptavinur
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Ferðakostnaður
 DocType: Maintenance Visit,Breakdown,Brotna niður
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Bæta við sérsniðnum reitinn Áskrift í letriðinu {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Reikningur: {0} með gjaldeyri: {1} Ekki er hægt að velja
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Uppfæra BOM kostnað sjálfkrafa með áætlun, byggt á nýjustu verðlagsgengi / verðskrárgengi / síðasta kaupgengi hráefna."
 DocType: Bank Reconciliation Detail,Cheque Date,ávísun Dagsetning
@@ -3984,7 +4073,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Total Billing Magn (með Time Logs)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,birgir Id
 DocType: Payment Request,Payment Gateway Details,Greiðsla Gateway Upplýsingar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Magn ætti að vera meiri en 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Magn ætti að vera meiri en 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Barn hnútar geta verið aðeins búin undir &#39;group&#39; tegund hnúta
 DocType: Leave Application,Half Day Date,Half Day Date
@@ -4002,12 +4091,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Ath: Item {0} inn mörgum sinnum
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Allir Tengiliðir.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,fyrirtæki Skammstöfun
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,User {0} er ekki til
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,User {0} er ekki til
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,skammstöfun
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Greiðsla Entry er þegar til
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ekki authroized síðan {0} umfram mörk
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Laun sniðmát húsbóndi.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Sjúkdómar
+DocType: Restaurant Order Entry,Restaurant Table,Veitingahús borðstofa
 DocType: Leave Type,Max Days Leave Allowed,Max Days Leave leyfðar
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Setja Tax Regla fyrir körfunni
 DocType: Purchase Invoice,Taxes and Charges Added,Skattar og gjöld bætt
@@ -4019,10 +4110,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Quotes að leiðir eða viðskiptavini.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Hlutverk Leyft að breyta fryst lager
 ,Territory Target Variance Item Group-Wise,Territory Target Dreifni Item Group-Wise
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Allir hópar viðskiptavina
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Allir hópar viðskiptavina
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Uppsafnaður Monthly
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er nauðsynlegur. Kannski gjaldeyri færsla er ekki búin fyrir {1} til {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Tax Snið er nauðsynlegur.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Tax Snið er nauðsynlegur.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Reikningur {0}: Foreldri reikningur {1} er ekki til
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Verðlisti Rate (Company Gjaldmiðill)
 DocType: Products Settings,Products Settings,Vörur Stillingar
@@ -4048,12 +4139,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Liður Wise Tax Nánar
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Institute Skammstöfun
 ,Item-wise Price List Rate,Item-vitur Verðskrá Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,birgir Tilvitnun
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,birgir Tilvitnun
 DocType: Quotation,In Words will be visible once you save the Quotation.,Í orðum verður sýnileg þegar þú hefur vistað tilvitnun.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Magn ({0}) getur ekki verið brot í röð {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,viðhorfin
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Strikamerki {0} nú þegar notuð í lið {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Strikamerki {0} nú þegar notuð í lið {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Reglur til að bæta sendingarkostnað.
 DocType: Item,Opening Stock,opnun Stock
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Viðskiptavinur er krafist
@@ -4071,9 +4162,8 @@
 DocType: Customer,From Lead,frá Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Pantanir út fyrir framleiðslu.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Veldu fjárhagsársins ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS Profile þarf að gera POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS Profile þarf að gera POS Entry
 DocType: Program Enrollment Tool,Enroll Students,innritast Nemendur
-DocType: Hub Settings,Name Token,heiti Token
 DocType: Lab Test,Approved Date,Samþykkt dagsetning
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Atleast einn vöruhús er nauðsynlegur
@@ -4091,7 +4181,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Mannauðs
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Greiðsla Sættir Greiðsla
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,skattinneign
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Framleiðslufyrirmæli hefur verið {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Framleiðslufyrirmæli hefur verið {0}
 DocType: BOM Item,BOM No,BOM Nei
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} hefur ekki reikning {1} eða þegar samsvarandi á móti öðrum skírteini
@@ -4111,7 +4201,7 @@
 DocType: Currency Exchange,To Currency,til Gjaldmiðill
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Leyfa eftirfarandi notendum að samþykkja yfirgefa Umsóknir um blokk daga.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Tegundir kostnað kröfu.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Salahlutfall fyrir atriði {0} er lægra en {1} þess. Sala ætti að vera að minnsta kosti {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Salahlutfall fyrir atriði {0} er lægra en {1} þess. Sala ætti að vera að minnsta kosti {2}
 DocType: Item,Taxes,Skattar
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Greitt og ekki afhent
 DocType: Project,Default Cost Center,Sjálfgefið Kostnaður Center
@@ -4125,15 +4215,15 @@
 DocType: Employee Loan,Fully Disbursed,Alveg afgreiddi
 DocType: Maintenance Visit,Customer Feedback,viðskiptavinur Feedback
 DocType: Account,Expense,Expense
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Score getur ekki verið meiri en hámarks stig
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Score getur ekki verið meiri en hámarks stig
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Viðskiptavinir og birgja
 DocType: Item Attribute,From Range,frá Range
 DocType: BOM,Set rate of sub-assembly item based on BOM,Stilla hlutfall af undir-samkoma atriði byggt á BOM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Málskipanarvilla í formúlu eða ástandi: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Málskipanarvilla í formúlu eða ástandi: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Daily Work Yfirlit Stillingar Company
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,Liður {0} hunsuð þar sem það er ekki birgðir atriði
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Senda þessari framleiðslu Raða til frekari vinnslu.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Senda þessari framleiðslu Raða til frekari vinnslu.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Að ekki um Verðlagning reglunni í tilteknu viðskiptum, öll viðeigandi Verðlagning Reglur ætti að vera óvirk."
 DocType: Assessment Group,Parent Assessment Group,Parent Mat Group
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Störf
@@ -4149,12 +4239,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Vinsamlegast stilltu Fyrirtæki sía eyða ef Group By er &#39;Company&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Staða Dagsetning má ekki vera liðinn
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} passar ekki við {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,til að búa til endurtekin
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Kjóll Leave
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Lab Próf UOM.
 DocType: Batch,Batch ID,hópur ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Ath: {0}
 ,Delivery Note Trends,Afhending Ath Trends
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Samantekt Í þessari viku er
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Samantekt Í þessari viku er
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Á lager Magn
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Reikningur: {0} Aðeins er hægt að uppfæra í gegnum lager Viðskipti
 DocType: Student Group Creation Tool,Get Courses,fá Námskeið
@@ -4168,7 +4259,6 @@
 DocType: Purchase Order,To Bill,Bill
 DocType: Material Request,% Ordered,% Pantaði
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Fyrir námsmiðaðan nemendahóp verður námskeiðið valið fyrir alla nemenda frá skráðum námskeiðum í námskrá.
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Sláðu inn netfangið aðskilin með kommum, reikningur verður sent sjálfkrafa tilteknum degi"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,ákvæðisvinnu
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Avg. kaupgengi
 DocType: Task,Actual Time (in Hours),Tíminn (í klst)
@@ -4182,7 +4272,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Liður {0} er ekki skipulag fyrir Serial Nos. Column verður auður
 DocType: Accounts Settings,Accounts Settings,reikninga Stillingar
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,samþykkja
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Engar niðurstöður til að senda inn
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Engar niðurstöður til að senda inn
 DocType: Customer,Sales Partner and Commission,Velta Partner og framkvæmdastjórnarinnar
 DocType: Employee Loan,Rate of Interest (%) / Year,Vextir (%) / Ár
 ,Project Quantity,Project Magn
@@ -4194,55 +4284,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Black
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Sprenging Item
 DocType: Account,Auditor,endurskoðandi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} atriði framleitt
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} atriði framleitt
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Læra meira
 DocType: Cheque Print Template,Distance from top edge,Fjarlægð frá efstu brún
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Verðlisti {0} er óvirk eða er ekki til
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Verðlisti {0} er óvirk eða er ekki til
 DocType: Purchase Invoice,Return,Return
 DocType: Production Order Operation,Production Order Operation,Framleiðsla Order Operation
 DocType: Pricing Rule,Disable,Slökkva
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Háttur af greiðslu er krafist til að greiða
 DocType: Project Task,Pending Review,Bíður Review
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Tilnefningar og samráð
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} er ekki skráður í lotuna {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} er ekki skráður í lotuna {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Eignastýring {0} er ekki hægt að rífa, eins og það er nú þegar {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense Krafa (með kostnað kröfu)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Gjaldmiðill af BOM # {1} ætti að vera jafn völdu gjaldmiðil {2}
 DocType: Journal Entry Account,Exchange Rate,Exchange Rate
 DocType: Patient,Additional information regarding the patient,Viðbótarupplýsingar um sjúklinginn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Velta Order {0} er ekki lögð
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Velta Order {0} er ekki lögð
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Fee Component
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Lo Stjórn
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Bæta atriði úr
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Lo Stjórn
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Bæta atriði úr
 DocType: Cheque Print Template,Regular,Venjulegur
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Alls weightage allra Námsmat Criteria verður að vera 100%
-DocType: BOM,Last Purchase Rate,Síðasta Kaup Rate
+DocType: Purchase Order Item,Last Purchase Rate,Síðasta Kaup Rate
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,verkefni ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock getur ekki til fyrir lið {0} síðan hefur afbrigði
 DocType: Lab Test,Mobile,Mobile
 ,Sales Person-wise Transaction Summary,Sala Person-vitur Transaction Samantekt
 DocType: Training Event,Contact Number,Númer tengiliðs
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Warehouse {0} er ekki til
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Register Fyrir ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Warehouse {0} er ekki til
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mánaðarleg Dreifing Prósentur
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Valið atriði getur ekki Hópur
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Verðmat hlutfall fannst ekki í lið {0}, sem er nauðsynlegt til að gera bókhald færslur fyrir {1} {2}. Ef hluturinn er transacting sem sýnishorn hlut í {1}, skaltu nefna að í {1} Liður borð. Annars skaltu búa mótteknu lager viðskipti fyrir hlutinn eða nefna verðmats hraða í Item met, og þá reyna submiting / hætta við þessa færslu"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Af efnum afhent gegn þessum Delivery Note
+DocType: Training Event,Has Certificate,Hefur vottorð
 DocType: Project,Customer Details,Nánar viðskiptavina
 DocType: Employee,Reports to,skýrslur til
 ,Unpaid Expense Claim,Ógreitt Expense Krafa
 DocType: Payment Entry,Paid Amount,greiddur Upphæð
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Kynntu söluferli
 DocType: Assessment Plan,Supervisor,Umsjón
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,Online
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,Online
 ,Available Stock for Packing Items,Laus Stock fyrir pökkun atriði
 DocType: Item Variant,Item Variant,Liður Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Mat Niðurstaða Tool
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Lagðar pantanir ekki hægt að eyða
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Lagðar pantanir ekki hægt að eyða
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Viðskiptajöfnuður þegar í Debit, þú ert ekki leyft að setja &#39;Balance Verður Be&#39; eins og &#39;Credit &quot;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Gæðastjórnun
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Liður {0} hefur verið gerð óvirk
@@ -4262,7 +4351,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: tímasetning átök með röð {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Leyfa núgildandi verðmæti
 DocType: Training Event Employee,Invited,boðið
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Margar virk launakerfum fundust fyrir starfsmann {0} fyrir gefnar dagsetningar
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Margar virk launakerfum fundust fyrir starfsmann {0} fyrir gefnar dagsetningar
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Skipulag Gateway reikninga.
 DocType: Employee,Employment Type,Atvinna Type
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Fastafjármunir
@@ -4274,7 +4363,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Tilkynning (dagar)
 DocType: Tax Rule,Sales Tax Template,Söluskattur Snið
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Veldu atriði til að bjarga reikning
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Veldu atriði til að bjarga reikning
 DocType: Employee,Encashment Date,Encashment Dagsetning
 DocType: Training Event,Internet,internet
 DocType: Special Test Template,Special Test Template,Sérstök próf sniðmát
@@ -4283,7 +4372,7 @@
 DocType: Production Order,Planned Operating Cost,Áætlaðir rekstrarkostnaður
 DocType: Academic Term,Term Start Date,Term Start Date
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Upp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Meðfylgjandi {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Meðfylgjandi {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bankayfirlit jafnvægi eins og á General Ledger
 DocType: Job Applicant,Applicant Name,umsækjandi Nafn
 DocType: Authorization Rule,Customer / Item Name,Viðskiptavinur / Item Name
@@ -4303,7 +4392,7 @@
 DocType: Guardian,Guardian Of ,Guardian Of
 DocType: Grading Scale Interval,Threshold,þröskuldur
 DocType: BOM Update Tool,Current BOM,Núverandi BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Bæta Serial Nei
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Bæta Serial Nei
 DocType: Production Order Item,Available Qty at Source Warehouse,Laus magn í Source Warehouse
 apps/erpnext/erpnext/config/support.py +22,Warranty,Ábyrgð í
 DocType: Purchase Invoice,Debit Note Issued,Debet Note Útgefið
@@ -4326,10 +4415,9 @@
 DocType: Account,Receivable,viðskiptakröfur
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Ekki leyfilegt að breyta birgi Purchase Order er þegar til
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Hlutverk sem er leyft að leggja viðskiptum sem fara lánamörk sett.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Veldu Hlutir til Manufacture
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Master gögn syncing, gæti það tekið smá tíma"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Veldu Hlutir til Manufacture
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Master gögn syncing, gæti það tekið smá tíma"
 DocType: Item,Material Issue,efni Issue
-DocType: Hub Settings,Seller Description,Seljandi Lýsing
 DocType: Employee Education,Qualification,HM
 DocType: Item Price,Item Price,Item verð
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sápa &amp; Þvottaefni
@@ -4337,7 +4425,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Frá tími getur ekki verið meiri en tíma.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Pantaði
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Halda áfram
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Halda áfram
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,Ef það er virkt þá mun kerfið ekki uppfæra reitina af afbrigði úr sniðmátinu en mun afrita gögnin af nefndum reitum meðan gerð er nýr afbrigði
 DocType: Salary Detail,Component,Component
 DocType: Assessment Criteria,Assessment Criteria Group,Námsmat Viðmið Group
 DocType: Healthcare Settings,Patient Name By,Nafn sjúklinga eftir
@@ -4347,7 +4436,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Vinsamlegast sláðu inn Samþykkir hlutverki eða samþykkir notandi
 DocType: Journal Entry,Write Off Entry,Skrifaðu Off færslu
 DocType: BOM,Rate Of Materials Based On,Hlutfall af efni byggt á
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Birgir&gt; Birgir Tegund
+DocType: Item Variant Settings,Do not Update Variants,Ekki uppfæra afbrigði
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Stuðningur Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Afhakaðu allt
 DocType: POS Profile,Terms and Conditions,Skilmálar og skilyrði
@@ -4356,7 +4445,7 @@
 DocType: Leave Block List,Applies to Company,Gildir til félagsins
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,Ekki er hægt að hætta við vegna þess að lögð Stock Entry {0} hendi
 DocType: Employee Loan,Disbursement Date,útgreiðsludagur
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&quot;Viðtakendur&quot; ekki tilgreind
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&quot;Viðtakendur&quot; ekki tilgreind
 DocType: BOM Update Tool,Update latest price in all BOMs,Uppfæra nýjustu verð í öllum BOMs
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Læknisskýrsla
 DocType: Vehicle,Vehicle,ökutæki
@@ -4371,14 +4460,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Upp / Leið%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Eignastýring Afskriftir og jafnvægi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Upphæð {0} {1} flutt frá {2} til {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Upphæð {0} {1} flutt frá {2} til {3}
 DocType: Sales Invoice,Get Advances Received,Fá Framfarir móttekin
 DocType: Email Digest,Add/Remove Recipients,Bæta við / fjarlægja viðtakendur
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Transaction ekki leyft móti hætt framleiðslu Order {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Til að stilla þessa rekstrarárs sem sjálfgefið, smelltu á &#39;Setja sem sjálfgefið&#39;"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Join
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Join
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,skortur Magn
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Liður afbrigði {0} hendi með sömu eiginleika
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Liður afbrigði {0} hendi með sömu eiginleika
 DocType: Employee Loan,Repay from Salary,Endurgreiða frá Laun
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Biðum greiðslu gegn {0} {1} fyrir upphæð {2}
@@ -4391,7 +4480,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Velta Order Item
 DocType: Salary Slip,Payment Days,Greiðsla Days
 DocType: Patient,Dormant,sofandi
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Vöruhús með hnúta barn er ekki hægt að breyta í höfuðbók
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Vöruhús með hnúta barn er ekki hægt að breyta í höfuðbók
 DocType: BOM,Manage cost of operations,Stjórna kostnaði við rekstur
 DocType: Accounts Settings,Stale Days,Gamall dagar
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Þegar einhverju merkt viðskipti eru &quot;Lögð&quot;, tölvupóst pop-upp sjálfkrafa opnað að senda tölvupóst til tilheyrandi &quot;Contact&quot; í því viðskiptum, við viðskiptin sem viðhengi. Notandinn mega eða mega ekki senda tölvupóst."
@@ -4405,10 +4494,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serial Nei {0} hefur þegar borist
 ,Requested Items To Be Transferred,Umbeðin Items til að flytja
 DocType: Expense Claim,Vehicle Log,ökutæki Log
-DocType: Purchase Invoice,Recurring Id,Fastir Id
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Hiti í kjölfarið (hitastig&gt; 38,5 ° C / viðvarandi hitastig&gt; 38 ° C / 100,4 ° F)"
 DocType: Customer,Sales Team Details,Upplýsingar Söluteymi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Eyða varanlega?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Eyða varanlega?
 DocType: Expense Claim,Total Claimed Amount,Alls tilkalli Upphæð
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Hugsanleg tækifæri til að selja.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Ógild {0}
@@ -4418,7 +4506,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Department Stores
 ,Item Delivery Date,Liður afhendingardags
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Skipulag School þín í ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Skipulag School þín í ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Breyta Upphæð (Company Gjaldmiðill)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Engar bókhald færslur fyrir eftirfarandi vöruhús
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Vistaðu skjalið fyrst.
@@ -4430,13 +4518,12 @@
 DocType: Task,Is Milestone,Er Milestone
 DocType: Daily Work Summary,Email Sent To,Tölvupóstur sendur til
 DocType: Budget,Warn,Warn
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Ertu viss um að þú viljir afskrá þig?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Allar aðrar athugasemdir, athyglisvert áreynsla sem ætti að fara í skrám."
 DocType: BOM,Manufacturing User,framleiðsla User
 DocType: Purchase Invoice,Raw Materials Supplied,Raw Materials Staðar
-DocType: Purchase Invoice,Recurring Print Format,Fastir Prenta Format
 DocType: C-Form,Series,Series
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Gjaldmiðill verðlista {0} verður að vera {1} eða {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Bæta við vörum
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Gjaldmiðill verðlista {0} verður að vera {1} eða {2}
 DocType: Appraisal,Appraisal Template,Úttekt Snið
 DocType: Item Group,Item Classification,Liður Flokkun
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Business Development Manager
@@ -4450,7 +4537,7 @@
 DocType: Item Attribute Value,Attribute Value,eigindi gildi
 ,Itemwise Recommended Reorder Level,Itemwise Mælt Uppröðun Level
 DocType: Salary Detail,Salary Detail,laun Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Vinsamlegast veldu {0} fyrst
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Vinsamlegast veldu {0} fyrst
 DocType: Appointment Type,Physician,Læknir
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Hópur {0} af Liður {1} hefur runnið út.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Samráð
@@ -4461,7 +4548,7 @@
 DocType: Salary Detail,Default Amount,Sjálfgefið Upphæð
 DocType: Lab Test Template,Descriptive,Lýsandi
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Warehouse fannst ekki í kerfinu
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Samantekt þessa mánaðar
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Samantekt þessa mánaðar
 DocType: Quality Inspection Reading,Quality Inspection Reading,Quality Inspection Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Stocks Eldri Than` ætti að vera minni en% d daga.
 DocType: Tax Rule,Purchase Tax Template,Kaup Tax sniðmáti
@@ -4484,12 +4571,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Þjálfun viðburðir / niðurstöður
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Uppsöfnuðum afskriftum og á
 DocType: Sales Invoice,C-Form Applicable,C-Form Gildir
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Operation Time verður að vera hærri en 0 fyrir notkun {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Operation Time verður að vera hærri en 0 fyrir notkun {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Warehouse er nauðsynlegur
 DocType: Supplier,Address and Contacts,Heimilisfang og Tengiliðir
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM viðskipta Detail
 DocType: Program,Program Abbreviation,program Skammstöfun
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Framleiðsla Order er ekki hægt að hækka gegn Item sniðmáti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Framleiðsla Order er ekki hægt að hækka gegn Item sniðmáti
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Gjöld eru uppfærðar á kvittun við hvert atriði
 DocType: Warranty Claim,Resolved By,leyst með
 DocType: Bank Guarantee,Start Date,Upphafsdagur
@@ -4515,26 +4602,27 @@
 DocType: Employee,Educational Qualification,námsgráðu
 DocType: Workstation,Operating Costs,því að rekstrarkostnaðurinn
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Aðgerð ef Uppsafnaður mánuðinn Budget meiri en
-DocType: Purchase Invoice,Submit on creation,Senda á sköpun
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Gjaldeyri fyrir {0} verður að vera {1}
+DocType: Subscription,Submit on creation,Senda á sköpun
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Gjaldeyri fyrir {0} verður að vera {1}
 DocType: Asset,Disposal Date,förgun Dagsetning
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Póstur verður sendur á öllum virkum Starfsmenn félagsins á tilteknu klukkustund, ef þeir hafa ekki frí. Samantekt á svörum verður sent á miðnætti."
 DocType: Employee Leave Approver,Employee Leave Approver,Starfsmaður Leave samþykkjari
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: An Uppröðun færslu þegar til fyrir þessa vöruhús {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Get ekki lýst því sem glatast, af því Tilvitnun hefur verið gert."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Þjálfun Feedback
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: An Uppröðun færslu þegar til fyrir þessa vöruhús {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Get ekki lýst því sem glatast, af því Tilvitnun hefur verið gert."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Þjálfun Feedback
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Framleiðslu Order {0} Leggja skal fram
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Birgir Scorecard Criteria
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Vinsamlegast veldu Ræsa og lokadag fyrir lið {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Auðvitað er skylda í röð {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Hingað til er ekki hægt að áður frá dagsetningu
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Bæta við / Breyta Verð
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Bæta við / Breyta Verð
 DocType: Batch,Parent Batch,Foreldri hópur
 DocType: Cheque Print Template,Cheque Print Template,Ávísun Prenta Snið
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Mynd af stoðsviða
 DocType: Lab Test Template,Sample Collection,Sýnishorn
 ,Requested Items To Be Ordered,Umbeðin Items til að panta
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Pantanir mínir
 DocType: Price List,Price List Name,Verðskrá Name
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Daily Work Yfirlit fyrir {0}
 DocType: Employee Loan,Totals,Samtölur
@@ -4553,12 +4641,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} einingar {1} þörf {2} á {3} {4} fyrir {5} að ljúka þessari færslu.
 DocType: Fee Schedule,Student Category,Student Flokkur
 DocType: Announcement,Student,Student
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Organization eining (umdæmi) skipstjóri.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Organization eining (umdæmi) skipstjóri.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Fara í herbergi
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Vinsamlegast sláðu inn skilaboð áður en þú sendir
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,LYFJA FOR LEIÐBEININGAR
 DocType: Email Digest,Pending Quotations,Bíður Tilvitnun
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Point-af-sölu Profile
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Point-af-sölu Profile
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Lab Test Configurations.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Ótryggð Lán
 DocType: Cost Center,Cost Center Name,Kostnaður Center Name
@@ -4568,6 +4656,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Alls Greiddur Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Skilaboð meiri en 160 stafir verður skipt í marga skilaboð
 DocType: Purchase Receipt Item,Received and Accepted,Móttekið og samþykkt
+DocType: Hub Settings,Company and Seller Profile,Fyrirtæki og seljanda
 ,GST Itemised Sales Register,GST hlutasala
 ,Serial No Service Contract Expiry,Serial Nei Service Contract gildir til
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Þú getur ekki kredit-og debetkort sama reikning á sama tíma
@@ -4577,10 +4666,11 @@
 DocType: Item,Variant Based On,Variant miðað við
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Alls weightage úthlutað ætti að vera 100%. Það er {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Birgjar þín
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Vinsamlegast lagaðu
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Get ekki stillt eins Lost og Sales Order er gert.
 DocType: Request for Quotation Item,Supplier Part No,Birgir Part No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Get ekki draga þegar flokkur er fyrir &#39;Verðmat&#39; eða &#39;Vaulation og heildar&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,fékk frá
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,fékk frá
 DocType: Lead,Converted,converted
 DocType: Item,Has Serial No,Hefur Serial Nei
 DocType: Employee,Date of Issue,Útgáfudagur
@@ -4588,7 +4678,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Eins og á kaupstillingarnar, ef kaupheimildin er krafist == &#39;YES&#39;, þá til að búa til innheimtufé, þarf notandi að búa til kaupgreiðsluna fyrst fyrir atriði {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Row # {0}: Setja Birgir fyrir lið {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Row {0}: Hours verður að vera stærri en núll.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Vefsíða Image {0} fylgir tl {1} er ekki hægt að finna
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Vefsíða Image {0} fylgir tl {1} er ekki hægt að finna
 DocType: Issue,Content Type,content Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,tölva
 DocType: Item,List this Item in multiple groups on the website.,Listi þetta atriði í mörgum hópum á vefnum.
@@ -4599,14 +4689,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Fá Unreconciled færslur
 DocType: Payment Reconciliation,From Invoice Date,Frá dagsetningu reiknings
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Þú hefur ekki heimild til að senda inn
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,Innheimta gjaldmiðli skal vera jöfn gjaldmiðil eða aðili reikning gjaldmiðli hvoru vanræksla Comapany er
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Innheimta gjaldmiðli skal vera jöfn gjaldmiðil eða aðili reikning gjaldmiðli hvoru vanræksla Comapany er
 DocType: Healthcare Settings,Laboratory Settings,Laboratory Settings
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Skildu Encashment
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Hvað gerir það?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,til Warehouse
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Allir Student Innlagnir
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Hvað gerir það?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,til Warehouse
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Allir Student Innlagnir
 ,Average Commission Rate,Meðal framkvæmdastjórnarinnar Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Hefur Serial Nei &#39;getur ekki verið&#39; Já &#39;fyrir non-lager lið
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Hefur Serial Nei &#39;getur ekki verið&#39; Já &#39;fyrir non-lager lið
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Veldu stöðu
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Aðsókn er ekki hægt að merkja fyrir framtíð dagsetningar
 DocType: Pricing Rule,Pricing Rule Help,Verðlagning Regla Hjálp
@@ -4624,40 +4714,40 @@
 DocType: Item,Customer Code,viðskiptavinur Code
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Afmæli Áminning fyrir {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dagar frá síðustu Order
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Debit Til reikning verður að vera Efnahagur reikning
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Debit Til reikning verður að vera Efnahagur reikning
 DocType: Buying Settings,Naming Series,nafngiftir Series
 DocType: Leave Block List,Leave Block List Name,Skildu Block List Nafn
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Tryggingar Start dagsetning ætti að vera minna en tryggingar lokadagsetning
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Vinsamlega settu upp leiðbeinanda Nafnakerfi í skólanum&gt; Skólastillingar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,lager Eignir
 DocType: Timesheet,Production Detail,framleiðsla Detail
+DocType: Restaurant,Active Menu,Virkur valmynd
 DocType: Target Detail,Target Qty,Target Magn
 DocType: Shopping Cart Settings,Checkout Settings,Checkout Stillingar
 DocType: Attendance,Present,Present
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Afhending Note {0} Ekki má leggja
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Afhending Note {0} Ekki má leggja
 DocType: Notification Control,Sales Invoice Message,Velta Invoice Message
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Lokun reikning {0} verður að vera af gerðinni ábyrgðar / Equity
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Laun Slip starfsmanns {0} þegar búið fyrir tíma blaði {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Laun Slip starfsmanns {0} þegar búið fyrir tíma blaði {1}
 DocType: Vehicle Log,Odometer,kílómetramæli
 DocType: Sales Order Item,Ordered Qty,Raðaður Magn
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Liður {0} er óvirk
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Liður {0} er óvirk
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen uppí
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM inniheldur ekki lager atriði
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Project virkni / verkefni.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM inniheldur ekki lager atriði
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Project virkni / verkefni.
 DocType: Vehicle Log,Refuelling Details,Eldsneytisstöðvar Upplýsingar
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Búa Laun laumar
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Kaup verður að vera merkt, ef við á er valið sem {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Afsláttur verður að vera minna en 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Síðustu kaup hlutfall fannst ekki
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skrifaðu Off Upphæð (Company Gjaldmiðill)
 DocType: Sales Invoice Timesheet,Billing Hours,Billing Hours
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,Sjálfgefið BOM fyrir {0} fannst ekki
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Row # {0}: Vinsamlegast settu pöntunarmark magn
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Sjálfgefið BOM fyrir {0} fannst ekki
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Row # {0}: Vinsamlegast settu pöntunarmark magn
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Pikkaðu á atriði til að bæta þeim við hér
 DocType: Fees,Program Enrollment,program Innritun
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landað Kostnaður Voucher
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Vinsamlegast settu {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Endurtakið á degi mánaðarins
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} er óvirkur nemandi
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} er óvirkur nemandi
 DocType: Employee,Health Details,Heilsa Upplýsingar
 DocType: Offer Letter,Offer Letter Terms,Tilboð bréf Skilmálar
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Til að búa til greiðslubeiðni þarf viðmiðunarskjal
@@ -4665,7 +4755,6 @@
 DocType: Employee External Work History,Salary,Laun
 DocType: Serial No,Delivery Document Type,Afhending Document Type
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Senda öll laun laumar fyrir ofan valin forsendum
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Items samstillt
 DocType: Sales Order,Partly Delivered,hluta Skilað
 DocType: Email Digest,Receivables,Viðskiptakröfur
 DocType: Lead Source,Lead Source,Lead Source
@@ -4686,19 +4775,19 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
 DocType: SG Creation Tool Course,Max Strength,max Strength
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM stað
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Veldu Atriði byggt á Afhendingardagur
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Veldu Atriði byggt á Afhendingardagur
 ,Sales Analytics,velta Analytics
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Laus {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Laus {0}
 ,Prospects Engaged But Not Converted,Horfur Engaged en ekki umbreytt
 DocType: Manufacturing Settings,Manufacturing Settings,framleiðsla Stillingar
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Setja upp tölvupóst
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Mobile No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Vinsamlegast sláðu inn sjálfgefið mynt í félaginu Master
 DocType: Stock Entry Detail,Stock Entry Detail,Stock Entry Detail
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Daglegar áminningar
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Daglegar áminningar
 DocType: Products Settings,Home Page is Products,Home Page er vörur
 ,Asset Depreciation Ledger,Asset Afskriftir Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Tax regla Árekstrar með {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Tax regla Árekstrar með {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nýtt nafn Account
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Raw Materials Staðar Kostnaður
 DocType: Selling Settings,Settings for Selling Module,Stillingar fyrir Selja Module
@@ -4712,8 +4801,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Liður {0} verður að vera birgðir Item
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Sjálfgefið Work In Progress Warehouse
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Sjálfgefnar stillingar fyrir bókhald viðskiptum.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vinsamlega settu upp starfsmannamiðlunarkerfi í mannauði&gt; HR-stillingar
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Væntanlegur Dagsetning má ekki vera áður Material Beiðni Dagsetning
+DocType: Restaurant,Default Tax Template,Sjálfgefið Skattamót
 DocType: Fees,Student Details,Nánari upplýsingar
 DocType: Purchase Invoice Item,Stock Qty,Fjöldi hluta
 DocType: Employee Loan,Repayment Period in Months,Lánstími í mánuði
@@ -4731,8 +4821,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Fara í Atriði
 DocType: Sales Partner,Partner Type,Gerð Partner
 DocType: Purchase Taxes and Charges,Actual,Raunveruleg
+DocType: Restaurant Menu,Restaurant Manager,Veitingahússtjóri
 DocType: Authorization Rule,Customerwise Discount,Customerwise Afsláttur
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Timesheet fyrir verkefni.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Timesheet fyrir verkefni.
 DocType: Purchase Invoice,Against Expense Account,Against kostnað reikning
 DocType: Production Order,Production Order,framleiðsla Order
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Uppsetning Ath {0} hefur þegar verið lögð fram
@@ -4740,7 +4831,6 @@
 DocType: Quotation Item,Against Docname,Against DOCNAME
 DocType: SMS Center,All Employee (Active),Allt Starfsmaður (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,skoða Now
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Veldu tímabil þegar reikningurinn verður sjálfkrafa
 DocType: BOM,Raw Material Cost,Raw Material Kostnaður
 DocType: Item Reorder,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Sláðu atriði og fyrirhugað Magn sem þú vilt að hækka framleiðslu pantanir eða sækja hráefni til greiningar.
@@ -4753,23 +4843,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Tegund skýrslu er nauðsynlegur
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Warehouse er nauðsynlegur fyrir hlutabréfum lið {0} í röð {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Bæta við forritum
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail &amp; Heildverslun
 DocType: Issue,First Responded On,Fyrst svöruðu
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Skráning Liður í mörgum hópum
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Reikningsár Start Date og Fiscal Year End Date eru nú þegar sett í Fiscal Year {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Úthreinsun Date uppfært
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Skipta lotu
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Skipta lotu
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,tókst Samræmd
 DocType: Request for Quotation Supplier,Download PDF,Sækja PDF
 DocType: Production Order,Planned End Date,Áætlaðir Lokadagur
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Vinsamlegast sláðu inn dagskrá dagsetningar
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Hvar hlutir eru geymdar.
 DocType: Request for Quotation,Supplier Detail,birgir Detail
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Villa í formúlu eða ástandi: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Villa í formúlu eða ástandi: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Upphæð á reikningi
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Viðmiðunarþyngd verður að bæta allt að 100%
 DocType: Attendance,Attendance,Aðsókn
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,lager vörur
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,lager vörur
 DocType: BOM,Materials,efni
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",Ef ekki hakað listi verður að vera bætt við hvorri deild þar sem það þarf að vera beitt.
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Uppruni og Target Warehouse getur ekki verið það sama
@@ -4787,6 +4877,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,Á Nettó
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Gildi fyrir eigind {0} verður að vera innan þeirra marka sem {1} til {2} í þrepum {3} fyrir lið {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Target vöruhús í röð {0} verður að vera það sama og framleiðslu Order
+DocType: Restaurant Reservation,Waitlisted,Bíddu á lista
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Gjaldmiðill er ekki hægt að breyta eftir að færslur með einhverja aðra mynt
 DocType: Vehicle Service,Clutch Plate,Clutch Plate
 DocType: Company,Round Off Account,Umferð Off reikning
@@ -4803,7 +4894,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nýtt Sales Person Name
 DocType: Packing Slip,Gross Weight UOM,Gross Weight UOM
 DocType: Delivery Note Item,Against Sales Invoice,Against sölureikningi
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Vinsamlegast sláðu inn raðnúmer fyrir raðnúmer
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Vinsamlegast sláðu inn raðnúmer fyrir raðnúmer
 DocType: Bin,Reserved Qty for Production,Frátekið Magn fyrir framleiðslu
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Leyfi óskráð ef þú vilt ekki íhuga hópur meðan þú setur námskeið.
 DocType: Asset,Frequency of Depreciation (Months),Tíðni Afskriftir (mánuðir)
@@ -4814,7 +4905,7 @@
 DocType: Lab Test,Test Group,Test Group
 DocType: Payment Reconciliation,Receivable / Payable Account,/ Viðskiptakröfur Account
 DocType: Delivery Note Item,Against Sales Order Item,Gegn Sales Order Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Vinsamlegast tilgreindu Attribute virði fyrir eigind {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Vinsamlegast tilgreindu Attribute virði fyrir eigind {0}
 DocType: Item,Default Warehouse,Sjálfgefið Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Fjárhagsáætlun er ekki hægt að úthlutað gegn Group reikninginn {0}
 DocType: Healthcare Settings,Patient Registration,Sjúklingur skráning
@@ -4843,6 +4934,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Sölufulltrúa
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Fjárhagsáætlun og kostnaður Center
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Margfeldi sjálfgefið greiðslumáti er ekki leyfilegt
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,fyrir
 ,Appointment Analytics,Ráðstefna Analytics
 DocType: Vehicle Service,Half Yearly,Half Árlega
 DocType: Lead,Blog Subscriber,Blog Notandanúmer
@@ -4860,7 +4952,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Tilvitnun
 ,BOM Stock Report,BOM Stock Report
 DocType: Stock Reconciliation Item,Quantity Difference,magn Mismunur
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Vinnsla Launaskrá
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Vinnsla Launaskrá
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Credit Upphæð
 DocType: Cheque Print Template,Signatory Position,Undirritaður Staða
@@ -4874,12 +4966,12 @@
 DocType: Tax Rule,Tax Rule,Tax Regla
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Halda Sama hlutfall á öllu söluferlið
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Skipuleggja tíma logs utan Workstation vinnutíma.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Viðskiptavinir í biðröð
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} hefur ekki læknaáætlun. Bættu því við í lækni meistara
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Viðskiptavinir í biðröð
 DocType: Student,Nationality,Þjóðerni
 ,Items To Be Requested,Hlutir til að biðja
-DocType: Purchase Order,Get Last Purchase Rate,Fá Síðasta kaupgengi
 DocType: Company,Company Info,Upplýsingar um fyrirtæki
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Veldu eða bæta við nýjum viðskiptavin
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Veldu eða bæta við nýjum viðskiptavin
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Kostnaður sent er nauðsynlegt að bóka kostnað kröfu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Umsókn um Funds (eignum)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Þetta er byggt á mætingu þessa starfsmanns
@@ -4887,6 +4979,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,skuldfærslureikning
 DocType: Fiscal Year,Year Start Date,Ár Start Date
 DocType: Attendance,Employee Name,starfsmaður Name
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Veitingahús Order Entry Item
 DocType: Sales Invoice,Rounded Total (Company Currency),Ávalur Total (Company Gjaldmiðill)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Get ekki leynilegar að samstæðunnar vegna Tegund reiknings er valinn.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} hefur verið breytt. Vinsamlegast hressa.
@@ -4897,6 +4990,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,starfskjör
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Pakkað magn verður að vera jafnt magn fyrir lið {0} í röð {1}
 DocType: Production Order,Manufactured Qty,Framleiðandi Magn
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Reikningur búin til
 DocType: Purchase Receipt Item,Accepted Quantity,Samþykkt Magn
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Vinsamlegast setja sjálfgefið Holiday lista fyrir Starfsmaður {0} eða fyrirtækis {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} er ekki til
@@ -4906,18 +5000,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Engin {0}: Upphæð má ekki vera meiri en Bíður Upphæð á móti kostnað {1} kröfu. Bið Upphæð er {2}
 DocType: Maintenance Schedule,Schedule,Dagskrá
 DocType: Account,Parent Account,Parent Reikningur
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Laus
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Laus
 DocType: Quality Inspection Reading,Reading 3,lestur 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,skírteini Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Verðlisti fannst ekki eða fatlaður
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Verðlisti fannst ekki eða fatlaður
 DocType: Lab Test,Approved,samþykkt
 DocType: Pricing Rule,Price,verð
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',Starfsmaður létta á {0} skal stilla eins &#39;Vinstri&#39;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Starfsmaður létta á {0} skal stilla eins &#39;Vinstri&#39;
+DocType: Hub Settings,Last Sync On,Síðasta samstilling á
 DocType: Guardian,Guardian,Guardian
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Úttekt {0} búin til starfsmanns {1} á tilteknu tímabili
 DocType: Employee,Education,menntun
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,Del
 DocType: Selling Settings,Campaign Naming By,Herferð Nafngift By
 DocType: Employee,Current Address Is,Núverandi Heimilisfang er
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Mánaðarlegt sölumarkmið
@@ -4932,7 +5027,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Námskeiðskóði:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Vinsamlegast sláðu inn kostnað reikning
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Tilvísun Document Type verður að vera einn af Purchase Order, Purchase Invoice eða Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Tilvísun Document Type verður að vera einn af Purchase Order, Purchase Invoice eða Journal Entry"
 DocType: Employee,Current Address,Núverandi heimilisfang
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ef hluturinn er afbrigði af annað lið þá lýsingu, mynd, verðlagningu, skatta osfrv sett verður úr sniðmátinu nema skýrt tilgreint"
 DocType: Serial No,Purchase / Manufacture Details,Kaup / Framleiðsla Upplýsingar
@@ -4963,7 +5058,7 @@
 DocType: Hub Settings,Hub Settings,Hub Stillingar
 DocType: Project,Gross Margin %,Heildarframlegð %
 DocType: BOM,With Operations,með starfsemi
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Bókhald færslur hafa verið gerðar í gjaldmiðli {0} fyrir fyrirtæki {1}. Vinsamlegast veldu nái eða greiða ber reikning með gjaldeyri {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Bókhald færslur hafa verið gerðar í gjaldmiðli {0} fyrir fyrirtæki {1}. Vinsamlegast veldu nái eða greiða ber reikning með gjaldeyri {0}.
 DocType: Asset,Is Existing Asset,Er núverandi eign
 DocType: Salary Detail,Statistical Component,Tölfræðilegur hluti
 DocType: Warranty Claim,If different than customer address,Ef öðruvísi en viðskiptavinur heimilisfangi
@@ -4971,13 +5066,14 @@
 DocType: BOM Operation,BOM Operation,BOM Operation
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Á fyrri röð Upphæð
 DocType: Student,Home Address,Heimilisfangið
+DocType: Item,Has Expiry Date,Hefur gildistími
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Variunarstillingar.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transfer Asset
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,Transfer Asset
 DocType: POS Profile,POS Profile,POS Profile
 DocType: Training Event,Event Name,Event Name
 DocType: Physician,Phone (Office),Sími (Skrifstofa)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,Aðgangseyrir
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Innlagnir fyrir {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,Aðgangseyrir
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Innlagnir fyrir {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Árstíðum til að setja fjárveitingar, markmið o.fl."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Breytilegt nafn
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",Liður {0} er sniðmát skaltu velja einn af afbrigði hennar
@@ -4986,7 +5082,7 @@
 DocType: Assessment Plan,Room,Room
 DocType: Purchase Order,Advance Paid,Advance Greiddur
 DocType: Item,Item Tax,Liður Tax
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Efni til Birgir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Efni til Birgir
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,vörugjöld Invoice
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% virðist oftar en einu sinni
 DocType: Expense Claim,Employees Email Id,Starfsmenn Netfang Id
@@ -4997,32 +5093,30 @@
 DocType: Program,Program Name,program Name
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Íhuga skatta og álaga fyrir
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Raunveruleg Magn er nauðsynlegur
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} er nú með {1} Birgir Stuðningskort og kauptilboð til þessa birgis skulu gefin út með varúð.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} er nú með {1} Birgir Stuðningskort og kauptilboð til þessa birgis skulu gefin út með varúð.
 DocType: Employee Loan,Loan Type,lán Type
 DocType: Scheduling Tool,Scheduling Tool,Tímasetningar Tool
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Kreditkort
 DocType: BOM,Item to be manufactured or repacked,Liður í að framleiða eða repacked
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Sjálfgefnar stillingar fyrir lager viðskipta.
-DocType: Purchase Invoice,Next Date,næsta Dagsetning
 DocType: Employee Education,Major/Optional Subjects,Major / valgreinum
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
+DocType: Hub Settings,Suspended,Hengdur
 DocType: Training Event,Attendees,Fundarmenn
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Hér er hægt að halda upplýsingar fjölskyldu eins og nafn og starfsheiti foreldri, maka og börn"
 DocType: Academic Term,Term End Date,Term Lokadagur
-DocType: Hub Settings,Seller Name,Seljandi Name
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Skattar og gjöld FrÃ¡ (Company Gjaldmiðill)
 DocType: Item Group,General Settings,Almennar stillingar
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Frá Gjaldmiðill og gjaldmiðla getur ekki verið það sama
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Bæta við leiðbeinendum
 DocType: Stock Entry,Repack,gera við
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Þú verður að vista eyðublaðið áður en lengra er haldið
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Vinsamlegast veldu félagið fyrst
 DocType: Item Attribute,Numeric Values,talnagildi
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,hengja Logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,lager Levels
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,lager Levels
 DocType: Customer,Commission Rate,Framkvæmdastjórnin Rate
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Búið til {0} stigakort fyrir {1} á milli:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,gera Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,gera Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Block orlofsrétt umsóknir deild.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Greiðsla Type verður að vera einn af fáum, Borga og Innri Transfer"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -5037,11 +5131,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Capital Stock
 DocType: Shopping Cart Settings,Show Public Attachments,Sýna opinberar viðhengi
 DocType: Packing Slip,Package Weight Details,Pakki Þyngd Upplýsingar
+DocType: Restaurant Reservation,Reservation Time,Afgreiðslutími
 DocType: Payment Gateway Account,Payment Gateway Account,Greiðsla Gateway Reikningur
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Að lokinni greiðslu áframsenda notandann til valda síðu.
 DocType: Company,Existing Company,núverandi Company
 DocType: Healthcare Settings,Result Emailed,Niðurstaða send
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",Skattflokki hefur verið breytt í &quot;Samtals&quot; vegna þess að öll atriðin eru hlutir sem ekki eru hlutir
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Vörunúmer&gt; Liðurhópur&gt; Vörumerki
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Vinsamlegast veldu csv skrá
 DocType: Student Leave Application,Mark as Present,Merkja sem Present
 DocType: Supplier Scorecard,Indicator Color,Vísir Litur
@@ -5066,11 +5162,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Gera Student Hópur
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Er bera fram
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Fá atriði úr BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Fá atriði úr BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time Days
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Staða Dagsetning skal vera það sama og kaupdegi {1} eignar {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Kannaðu þetta ef nemandi er búsettur í gistihúsinu.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Vinsamlegast sláðu sölu skipunum í töflunni hér að ofan
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Vinsamlegast sláðu sölu skipunum í töflunni hér að ofan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Ekki lögð Laun laumar
 ,Stock Summary,Stock Yfirlit
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Flytja eign frá einu vöruhúsi til annars
@@ -5086,5 +5182,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: gjaldfærslu ekki hægt að tengja með {1}
 DocType: Journal Entry,Subscription Section,Áskriftarspurning
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Reikningur {0} er ekki til
+DocType: Training Event,Training Program,Þjálfunaráætlun
 DocType: Account,Cash,Cash
 DocType: Employee,Short biography for website and other publications.,Stutt ævisaga um vefsíðu og öðrum ritum.
diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv
index 26934dc..c3a30ba 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Modalità di stipendio
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Registrare
 DocType: Patient,Divorced,Divorced
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Elementi già sincronizzati
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Consenti di aggiungere lo stesso articolo più volte in una transazione
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Annulla Materiale Visita {0} prima di annullare questa rivendicazione di Garanzia
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Prodotti di consumo
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Responsabili ferie
 DocType: Sales Partner,Dealer,Rivenditore
 DocType: Consultation,Investigations,indagini
+DocType: Restaurant Order Entry,Click Enter To Add,Fare clic su Invio per aggiungere
 DocType: Employee,Rented,Affittato
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Applicabile per utente
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Produzione Arrestato Ordine non può essere annullato, Unstop è prima di cancellare"
 DocType: Vehicle Service,Mileage,Chilometraggio
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Vuoi davvero di accantonare questo bene?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Vuoi davvero di accantonare questo bene?
 DocType: Drug Prescription,Update Schedule,Aggiorna la pianificazione
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Selezionare il Fornitore predefinito
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},E' necessario specificare la  valuta per il listino prezzi {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Verificare la disponibilità
 DocType: Job Applicant,Job Applicant,Candidati
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Questo si basa su operazioni relative a questo fornitore. Vedere cronologia sotto per i dettagli
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nessun altro risultato.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,legale
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Il tipo di imposta / tassa non può essere inclusa nella tariffa della riga {0}
 DocType: Bank Guarantee,Customer,Cliente
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Tasso di cambio deve essere uguale a {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nome Cliente
 DocType: Vehicle,Natural Gas,Gas naturale
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Il Conto bancario non si può chiamare {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Il Conto bancario non si può chiamare {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Soci (o società) per le quali le scritture contabili sono fatte e i saldi vengono mantenuti.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Eccezionale per {0} non può essere inferiore a zero ( {1} )
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Non ci sono pagamenti salariati da elaborare.
 DocType: Manufacturing Settings,Default 10 mins,Predefinito 10 minuti
 DocType: Leave Type,Leave Type Name,Lascia Tipo Nome
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Mostra aperta
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,È necessario prendere questa azione oggi stessa per quanto sopra riportato
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Serie Aggiornato con successo
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Check-out
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural diario Inserito
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Articolo dell'Ordine di Acquisto da ricevere
 DocType: SMS Center,All Supplier Contact,Tutti i Contatti Fornitori
 DocType: Support Settings,Support Settings,Impostazioni di supporto
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Data fine prevista non può essere inferiore a quella prevista data di inizio
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Data fine prevista non può essere inferiore a quella prevista data di inizio
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Riga #{0}: il Rapporto deve essere lo stesso di {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Nuovo Lascia Application
 ,Batch Item Expiry Status,Batch Item scadenza di stato
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Assegno Bancario
 DocType: Mode of Payment Account,Mode of Payment Account,Modalità di pagamento Conto
 DocType: Consultation,Consultation,Consultazione
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Vendite e restituzioni
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Mostra Varianti
 DocType: Academic Term,Academic Term,Termine Accademico
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiale
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Assistenza Sanitaria
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Ritardo nel pagamento (Giorni)
 DocType: Lab Prescription,Lab Prescription,Prescrizione di laboratorio
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Ordina per Prezzo
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,spese per servizi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Numero di serie: {0} è già indicato nella fattura di vendita: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Fattura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Numero di serie: {0} è già indicato nella fattura di vendita: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Fattura
 DocType: Maintenance Schedule Item,Periodicity,Periodicità
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiscal Year {0} è richiesto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Difesa
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Importo totale Costing
 DocType: Delivery Note,Vehicle No,Veicolo No
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Seleziona Listino Prezzi
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Seleziona Listino Prezzi
 DocType: Accounts Settings,Currency Exchange Settings,Impostazioni di cambio valuta
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Row # {0}: documento pagamento è richiesto per completare la trasaction
 DocType: Production Order Operation,Work In Progress,Lavori in corso
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Seleziona la data
 DocType: Employee,Holiday List,Elenco vacanza
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Impostare il Sistema di denominazione dell&#39;istituto in Scuola&gt; Impostazioni scolastiche
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Ragioniere
+DocType: Hub Settings,Selling Price List,Listino prezzi di vendita
 DocType: Patient,Tobacco Current Use,Uso corrente di tabacco
 DocType: Cost Center,Stock User,Utente Giacenze
 DocType: Company,Phone No,N. di telefono
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Orari corso creato:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Nuova {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Nuova {0}: # {1}
 ,Sales Partners Commission,Vendite Partners Commissione
 DocType: Purchase Invoice,Rounding Adjustment,Regolazione arrotondamento
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Le abbreviazioni non possono avere più di 5 caratteri
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Parent Dettaglio docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Riferimento: {0}, codice dell&#39;articolo: {1} e cliente: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kg
-DocType: Student Log,Log,Log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Apertura di un lavoro.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Risultato inviato
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Risultato inviato
 DocType: Item Attribute,Increment,Incremento
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Arco di tempo
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Seleziona Magazzino ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Sposato
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Non consentito per {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Ottenere elementi dal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Stock non può essere aggiornata contro Consegna Nota {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Stock non può essere aggiornata contro Consegna Nota {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Prodotto {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nessun elemento elencato
 DocType: Payment Reconciliation,Reconcile,conciliare
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondi Pensione
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,La data di ammortamento successivo non puó essere prima della Data di acquisto
 DocType: Consultation,Consultation Date,Data di consultazione
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Elenco e scoperta di prodotti per gli utenti di ERPNext
 DocType: SMS Center,All Sales Person,Tutti i Venditori
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Distribuzione mensile ** aiuta a distribuire il Budget / Target nei mesi, nel caso di di business stagionali."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Non articoli trovati
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Stipendio Struttura mancante
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Non articoli trovati
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Stipendio Struttura mancante
 DocType: Lead,Person Name,Nome della Persona
 DocType: Sales Invoice Item,Sales Invoice Item,Articolo della Fattura di Vendita
 DocType: Account,Credit,Avere
 DocType: POS Profile,Write Off Cost Center,Scrivi Off Centro di costo
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""","ad esempio, &quot;scuola elementare&quot; o &quot;Università&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""","ad esempio, ""Scuola Elementare"" o ""Università"""
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Reports Magazzino
 DocType: Warehouse,Warehouse Detail,Dettagli Magazzino
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Limite di credito è stato attraversato per il cliente {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Il Data Terminologia fine non può essere successiva alla data di fine anno dell&#39;anno accademico a cui il termine è legata (Anno Accademico {}). Si prega di correggere le date e riprovare.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""E' un Asset"" non può essere deselezionato, in quanto esiste già un movimento collegato"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""E' un Asset"" non può essere deselezionato, in quanto esiste già un movimento collegato"
 DocType: Vehicle Service,Brake Oil,olio freno
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Gruppo Clienti&gt; Territorio
 DocType: Tax Rule,Tax Type,Tipo fiscale
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Importo tassabile
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Non sei autorizzato ad aggiungere o aggiornare le voci prima di {0}
 DocType: BOM,Item Image (if not slideshow),Immagine Articolo (se non slideshow)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Esiste un cliente con lo stesso nome
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tasso Orario / 60) * tempo operazione effettivo
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Riga # {0}: Il tipo di documento di riferimento deve essere uno dei requisiti di spesa o voce del giornale
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Seleziona la Distinta Materiali
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Riga # {0}: Il tipo di documento di riferimento deve essere uno dei requisiti di spesa o voce del giornale
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Seleziona la Distinta Materiali
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Costo di oggetti consegnati
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,La vacanza su {0} non è tra da Data e A Data
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,prestito dipendenti
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Registro attività:
 DocType: Fee Schedule,Send Payment Request Email,Invia la richiesta di pagamento
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,L'articolo {0} non esiste nel sistema o è scaduto
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,L'articolo {0} non esiste nel sistema o è scaduto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Immobiliare
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Estratto conto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutici
@@ -210,17 +213,22 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Log Importazione
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Tirare Materiale Richiesta di tipo Produzione sulla base dei criteri di cui sopra
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Registrazione cancellata con successo.
 DocType: Training Result Employee,Grade,Grado
+DocType: Restaurant Table,No of Seats,No delle sedute
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Per aggiungere argomento dinamico, utilizzare i tag jinja come <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Consegnato dal Fornitore
 DocType: SMS Center,All Contact,Tutti i contatti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Ordine di produzione già creato per tutti gli elementi con BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Ordine di produzione già creato per tutti gli elementi con BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Stipendio Annuo
 DocType: Daily Work Summary,Daily Work Summary,Riepilogo lavori giornaliero
 DocType: Period Closing Voucher,Closing Fiscal Year,Chiusura Anno Fiscale
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} è bloccato
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Seleziona esistente Società per la creazione di piano dei conti
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} è bloccato
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Seleziona esistente Società per la creazione di piano dei conti
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Spese di stoccaggio
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Seleziona il Magazzino di Destinazione
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Seleziona il Magazzino di Destinazione
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Inserisci il contatto preferito Email
 DocType: Program Enrollment,School Bus,Scuolabus
 DocType: Journal Entry,Contra Entry,Contra Entry
@@ -232,15 +240,16 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +325,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Quantità accettata + rifiutata deve essere uguale alla quantità ricevuta per {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Fornire Materie Prime per l'Acquisto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +149,At least one mode of payment is required for POS invoice.,è richiesto almeno una modalità di pagamento per POS fattura.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +149,At least one mode of payment is required for POS invoice.,è richiesta almeno una modalità di pagamento per POS fattura.
 DocType: Products Settings,Show Products as a List,Mostra prodotti sotto forma di elenco
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Scarica il modello, compilare i dati appropriati e allegare il file modificato.
  Tutti date e dipendente combinazione nel periodo selezionato arriverà nel modello, con record di presenze esistenti"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,L'articolo {0} non è attivo o la fine della vita è stato raggiunta
+DocType: Student Admission Program,Minimum Age,Età minima
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Esempio: Matematica di base
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Per includere fiscale in riga {0} in rate articolo , tasse nelle righe {1} devono essere inclusi"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Impostazioni per il modulo HR
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Impostazioni per il modulo HR
 DocType: SMS Center,SMS Center,Centro SMS
 DocType: Sales Invoice,Change Amount,quantità di modifica
 DocType: BOM Update Tool,New BOM,Nuova Distinta Base
@@ -250,7 +259,7 @@
 DocType: Lead,Request Type,Tipo di richiesta
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Crea Dipendente
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,emittente
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Aggiungi camere
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Imposta modalità del POS (Online / Offline)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,esecuzione
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,I dettagli delle operazioni effettuate.
 DocType: Serial No,Maintenance Status,Stato di manutenzione
@@ -273,6 +282,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prezzo di listino deve essere applicabile per l'acquisto o la vendita di
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Data di installazione non può essere prima della data di consegna per la voce {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Sconto su Prezzo di Listino (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Biochimica
 DocType: Offer Letter,Select Terms and Conditions,Selezionare i Termini e Condizioni
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,Valore out
 DocType: Production Planning Tool,Sales Orders,Ordini di vendita
@@ -307,15 +317,15 @@
 DocType: Sales Partner,Reseller,Rivenditore
 DocType: Codification Table,Medical Code,Codice medico
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Se selezionato, comprenderà gli elementi non-azione nelle richieste dei materiali."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Inserisci Società
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Inserisci Società
 DocType: Delivery Note Item,Against Sales Invoice Item,a fronte dell'Articolo della Fattura di Vendita
 ,Production Orders in Progress,Ordini di produzione in corso
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Di cassa netto da finanziamento
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage è piena, non ha salvato"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage è piena, non ha salvato"
 DocType: Lead,Address & Contact,Indirizzo e Contatto
 DocType: Leave Allocation,Add unused leaves from previous allocations,Aggiungere le foglie non utilizzate precedentemente assegnata
 DocType: Sales Partner,Partner website,sito web partner
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Aggiungi articolo
+DocType: Restaurant Order Entry,Add Item,Aggiungi articolo
 DocType: Lab Test,Custom Result,Risultato personalizzato
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Nome Contatto
 DocType: Course Assessment Criteria,Course Assessment Criteria,Criteri di valutazione del corso
@@ -328,7 +338,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Richiesta di acquisto.
 DocType: Lab Test,Submitted Date,Data di invio
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Questo si basa sulla tabella dei tempi create contro questo progetto
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Retribuzione netta non può essere inferiore a 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Retribuzione netta non può essere inferiore a 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Per interrompere l&#39;invio di notifiche di errore ripetitive dal sistema, abbiamo verificato il campo Disabled nel sottoscrizione"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Solo il responsabile ferie scelto può sottoporre questa richiesta di ferie
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Data Alleviare deve essere maggiore di Data di giunzione
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Ferie per Anno
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,Profit &amp; Loss
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Litro
 DocType: Task,Total Costing Amount (via Time Sheet),Totale Costing Importo (tramite Time Sheet)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Impostare gli studenti in gruppi di studenti
 DocType: Item Website Specification,Item Website Specification,Specifica da Sito Web dell'articolo
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Lascia Bloccato
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},L'articolo {0} ha raggiunto la fine della sua vita su {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},L'articolo {0} ha raggiunto la fine della sua vita su {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Registrazioni bancarie
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,annuale
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Voce Riconciliazione Giacenza
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Corso di Gruppo Student strumento di creazione
 DocType: Lead,Do Not Contact,Non Contattaci
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,Le persone che insegnano presso la propria organizzazione
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,L&#39;ID univoco per il monitoraggio tutte le fatture ricorrenti. Si è generato su submit.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Qtà ordine minimo
 DocType: Pricing Rule,Supplier Type,Tipo Fornitore
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,Pubblicare in Hub
 DocType: Student Admission,Student Admission,L&#39;ammissione degli studenti
 ,Terretory,Territorio
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,L'articolo {0} è annullato
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Richiesta materiale
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,L'articolo {0} è annullato
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Richiesta materiale
 DocType: Bank Reconciliation,Update Clearance Date,Aggiornare Liquidazione Data
 DocType: Item,Purchase Details,"Acquisto, i dati"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Articolo {0} non trovato tra le 'Materie Prime Fornite' tabella in Ordine di Acquisto {1}
 DocType: Patient Relation,Relation,Relazione
 DocType: Shipping Rule,Worldwide Shipping,Spedizione in tutto il mondo
 DocType: Patient Relation,Mother,Madre
+DocType: Restaurant Reservation,Reservation End Time,Termine di prenotazione
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Ordini Confermati da Clienti.
 DocType: Purchase Receipt Item,Rejected Quantity,Rifiutato Quantità
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,La richiesta di pagamento {0} è stata creata
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,La richiesta di pagamento {0} è stata creata
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Sensibilità bassa
 DocType: Notification Control,Notification Control,Controllo di notifica
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Si prega di confermare una volta completata la tua formazione
 DocType: Lead,Suggestions,Suggerimenti
@@ -388,7 +401,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Messaggi di posta elettronica stipendio slittamento al dipendente sulla base di posta preferito selezionato a dipendenti
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Il primo responsabile ferie della lista sarà impostato come il responsabile ferie di default
 DocType: Tax Rule,Shipping County,Distretto di  Spedizione
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Imparare
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Guide
 DocType: Asset,Next Depreciation Date,Data ammortamento successivo
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Costo attività per dipendente
 DocType: Accounts Settings,Settings for Accounts,Impostazioni per gli account
@@ -399,13 +412,13 @@
 DocType: Item,Synced With Hub,Sincronizzati con Hub
 DocType: Vehicle,Fleet Manager,Responsabile flotta aziendale
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} non può essere negativo per la voce {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Password Errata
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Password Errata
 DocType: Item,Variant Of,Variante di
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Completato Quantità non può essere maggiore di 'Quantità di Fabbricazione'
 DocType: Period Closing Voucher,Closing Account Head,Chiudere Conto Primario
 DocType: Employee,External Work History,Storia del lavoro esterno
 DocType: Physician,Time per Appointment,Tempo per appuntamento
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Circular Error Reference
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Circular Error Reference
 DocType: Appointment Type,Is Inpatient,È ospedaliero
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Nome Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,In Parole (Export) sarà visibile una volta che si salva il DDT.
@@ -414,19 +427,18 @@
 DocType: Lead,Industry,Industria
 DocType: Employee,Job Profile,Profilo di lavoro
 DocType: BOM Item,Rate & Amount,Tariffa e importo
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Si prega di impostare la serie di numerazione per la partecipazione tramite Setup&gt; Serie di numerazione
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Questo si basa sulle transazioni contro questa Azienda. Vedere la sequenza temporale qui sotto per i dettagli
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notifica tramite e-mail sulla creazione di Richiesta automatica Materiale
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Resistente
 DocType: Journal Entry,Multi Currency,Multi valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo Fattura
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Gruppo Clienti&gt; Territorio
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Documento Di Trasporto
 DocType: Consultation,Encounter Impression,Incontro impressione
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Impostazione Tasse
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Costo del bene venduto
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,Pagamento ingresso è stato modificato dopo l'tirato. Si prega di tirare di nuovo.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} inserito due volte in tassazione articolo
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Riepilogo per questa settimana e le attività in corso
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} inserito due volte in tassazione articolo
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Riepilogo per questa settimana e le attività in corso
 DocType: Student Applicant,Admitted,Ammesso
 DocType: Workstation,Rent Cost,Affitto Costo
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Importo Dopo ammortamento
@@ -440,36 +452,35 @@
 DocType: Shipping Rule,Valid for Countries,Valido per paesi
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Questo articolo è un modello e non può essere utilizzato nelle transazioni. Attributi Voce verranno copiate nelle varianti meno che sia impostato 'No Copy'
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Totale ordine Considerato
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Titolo dipendente (p. es. amministratore delegato, direttore, CEO, ecc.)"
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Titolo dipendente (p. es. amministratore delegato, direttore, CEO, ecc.)"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tasso con cui la valuta Cliente viene convertita in valuta di base del cliente
 DocType: Course Scheduling Tool,Course Scheduling Tool,Corso strumento Pianificazione
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Acquisto fattura non può essere fatta contro un bene esistente {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Urgente] Errore durante la creazione di% s ricorrenti per% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Urgente] Errore durante la creazione di% s ricorrenti per% s
 DocType: Item Tax,Tax Rate,Aliquota Fiscale
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} già allocato il dipendente {1} per il periodo {2} a {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Seleziona elemento
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Seleziona elemento
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,La Fattura di Acquisto {0} è già stata presentata
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lotto n deve essere uguale a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convert to non-Group
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Lotto di un articolo
-DocType: C-Form Invoice Detail,Invoice Date,Data fattura
+DocType: C-Form Invoice Detail,Invoice Date,Data Fattura
 DocType: GL Entry,Debit Amount,Importo Debito
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Ci può essere solo 1 account per ogni impresa in {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Si prega di vedere allegato
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Ci può essere solo 1 account per ogni impresa in {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Si prega di vedere allegato
 DocType: Purchase Order,% Received,% Ricevuto
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Creazione di gruppi di studenti
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Setup già completo !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Setup già completo !
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Importo della nota di credito
 DocType: Setup Progress Action,Action Document,Documento d&#39;azione
 ,Finished Goods,Beni finiti
 DocType: Delivery Note,Instructions,Istruzione
 DocType: Quality Inspection,Inspected By,Verifica a cura di
 DocType: Maintenance Visit,Maintenance Type,Tipo di manutenzione
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} non è iscritto al corso {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Codice articolo&gt; Gruppo articoli&gt; Marchio
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} non è iscritto al corso {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial No {0} non appartiene alla Consegna Nota {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Aggiungi Articoli
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Aggiungi Articoli
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Voce di controllo di qualità dei parametri
 DocType: Leave Application,Leave Approver Name,Nome responsabile ferie
 DocType: Depreciation Schedule,Schedule Date,Programma Data
@@ -489,7 +500,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Orari di lavoro
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Cambia l'inizio/numero sequenza corrente per una serie esistente
 DocType: Dosage Strength,Strength,Forza
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Creare un nuovo cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Creare un nuovo cliente
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Se più regole dei prezzi continuano a prevalere, gli utenti sono invitati a impostare manualmente la priorità per risolvere il conflitto."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Creare ordini d&#39;acquisto
 ,Purchase Register,Registro Acquisti
@@ -508,7 +519,7 @@
 DocType: Lab Test Template,Single,Singolo
 DocType: Salary Slip,Total Loan Repayment,Totale Rimborso prestito
 DocType: Account,Cost of Goods Sold,Costo del venduto
-DocType: Purchase Invoice,Yearly,Annuale
+DocType: Subscription,Yearly,Annuale
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Inserisci Centro di costo
 DocType: Drug Prescription,Dosage,Dosaggio
 DocType: Journal Entry Account,Sales Order,Ordine di vendita
@@ -538,7 +549,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Impostazioni globali per tutti i processi produttivi.
 DocType: Accounts Settings,Accounts Frozen Upto,Conti congelati fino al
 DocType: SMS Log,Sent On,Inviata il
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Attributo {0} selezionato più volte in Attributi Tabella
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Attributo {0} selezionato più volte in Attributi Tabella
 DocType: HR Settings,Employee record is created using selected field. ,Record dipendente viene creato utilizzando campo selezionato.
 DocType: Sales Order,Not Applicable,Non Applicabile
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Vacanza principale.
@@ -563,13 +574,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Foglie totali assegnate è obbligatoria
 DocType: Patient,AB Positive,AB Positivo
 DocType: Job Opening,Description of a Job Opening,Descrizione dell'Offerta di Lavoro
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Attività di attesa per oggi
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Attività di attesa per oggi
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Archivio Presenze
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Componente Stipendio per il libro paga base scheda attività.
 DocType: Sales Order Item,Used for Production Plan,Usato per Piano di Produzione
 DocType: Employee Loan,Total Payment,Pagamento totale
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tempo tra le operazioni (in minuti)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} viene annullato in modo che l&#39;azione non possa essere completata
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} viene annullato in modo che l&#39;azione non possa essere completata
 DocType: Customer,Buyer of Goods and Services.,Buyer di beni e servizi.
 DocType: Journal Entry,Accounts Payable,Conti pagabili
 DocType: Patient,Allergies,allergie
@@ -581,22 +592,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Avvisa gli ordini di acquisto
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Elencare alcuni dei vostri clienti . Potrebbero essere organizzazioni o individui .
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Parti abbastanza per costruire
+DocType: POS Profile User,POS Profile User,Profilo utente POS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,reddito diretta
 DocType: Patient Appointment,Date TIme,Appuntamento
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Non è possibile filtrare sulla base di conto , se raggruppati per conto"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,responsabile amministrativo
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Seleziona Corso
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Seleziona Corso
 DocType: Codification Table,Codification Table,Tabella di codificazione
 DocType: Timesheet Detail,Hrs,ore
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Selezionare prego
 DocType: Stock Entry Detail,Difference Account,account differenza
 DocType: Purchase Invoice,Supplier GSTIN,Fornitore GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Impossibile chiudere compito il compito dipendente {0} non è chiuso.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,Inserisci il Magazzino per cui Materiale richiesta sarà sollevata
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Impossibile chiudere compito il compito dipendente {0} non è chiuso.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Inserisci il Magazzino per cui Materiale richiesta sarà sollevata
 DocType: Production Order,Additional Operating Cost,Ulteriori costi di esercizio
 DocType: Lab Test Template,Lab Routine,Laboratorio di routine
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,cosmetici
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Per unire , seguenti proprietà devono essere uguali per entrambe le voci"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Per unire , seguenti proprietà devono essere uguali per entrambe le voci"
 DocType: Shipping Rule,Net Weight,Peso netto
 DocType: Employee,Emergency Phone,Telefono di emergenza
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Acquistare
@@ -606,7 +618,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Definisci il grado per Soglia 0%
 DocType: Sales Order,To Deliver,Da Consegnare
 DocType: Purchase Invoice Item,Item,Articolo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Serial nessun elemento non può essere una frazione
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Alta sensibilità
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Serial nessun elemento non può essere una frazione
 DocType: Journal Entry,Difference (Dr - Cr),Differenza ( Dr - Cr )
 DocType: Account,Profit and Loss,Profitti e Perdite
 DocType: Patient,Risk Factors,Fattori di rischio
@@ -615,7 +628,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Gestione conto lavoro / terzista
 DocType: Vital Signs,Body Temperature,Temperatura corporea
 DocType: Project,Project will be accessible on the website to these users,Progetto sarà accessibile sul sito web per questi utenti
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Definisci il tipo di progetto.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Definisci il tipo di progetto.
 DocType: Supplier Scorecard,Weighting Function,Funzione di ponderazione
 DocType: Physician,OP Consulting Charge,Carica di consulenza OP
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Imposta il tuo
@@ -629,20 +642,20 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Incremento non può essere 0
 DocType: Production Planning Tool,Material Requirement,Richiesta Materiale
 DocType: Company,Delete Company Transactions,Elimina transazioni Azienda
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Di riferimento e di riferimento Data è obbligatoria per la transazione Bank
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Di riferimento e di riferimento Data è obbligatoria per la transazione Bank
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Aggiungere / Modificare tasse e ricarichi
-DocType: Payment Entry Reference,Supplier Invoice No,Fattura Fornitore N°
+DocType: Payment Entry Reference,Supplier Invoice No,Fattura Fornitore N.
 DocType: Territory,For reference,Per riferimento
 DocType: Healthcare Settings,Appointment Confirmation,Conferma dell&#39;appuntamento
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Impossibile eliminare N. di serie {0}, come si usa in transazioni di borsa"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Chiusura (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Ciao
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Sposta elemento
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Sposta elemento
 DocType: Serial No,Warranty Period (Days),Periodo di garanzia (Giorni)
 DocType: Installation Note Item,Installation Note Item,Installazione Nota articolo
 DocType: Production Plan Item,Pending Qty,In attesa Quantità
 DocType: Budget,Ignore,Ignora
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} non è attivo
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} non è attivo
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Configurazione Dimensioni Assegno per la stampa
 DocType: Salary Slip,Salary Slip Timesheet,Stipendio slittamento Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Magazzino Fornitore obbligatorio per ricevuta d'acquisto del conto lavoro
@@ -651,7 +664,7 @@
 DocType: Pricing Rule,Sales Partner,Partner vendite
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Tutti i punteggi dei fornitori.
 DocType: Buying Settings,Purchase Receipt Required,Ricevuta di Acquisto necessaria
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,La valorizzazione è obbligatoria se si tratta di una disponibilità iniziale di magazzino
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,La valorizzazione è obbligatoria se si tratta di una disponibilità iniziale di magazzino
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nessun record trovato nella tabella Fattura
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Per favore selezionare prima l'azienda e il tipo di Partner
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Esercizio finanziario / contabile .
@@ -688,7 +701,7 @@
 DocType: Quotation,Quotation To,Preventivo a
 DocType: Lead,Middle Income,Reddito Medio
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Opening ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unità di misura predefinita per la voce {0} non può essere modificato direttamente perché si è già fatto qualche operazione (s) con un altro UOM. Sarà necessario creare una nuova voce per utilizzare un diverso UOM predefinito.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unità di misura predefinita per la voce {0} non può essere modificato direttamente perché si è già fatto qualche operazione (s) con un altro UOM. Sarà necessario creare una nuova voce per utilizzare un diverso UOM predefinito.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,L'Importo assegnato non può essere negativo
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Imposti la Società
 DocType: Purchase Order Item,Billed Amt,Importo Fatturato
@@ -697,11 +710,12 @@
 DocType: Repayment Schedule,Principal Amount,Quota capitale
 DocType: Employee Loan Application,Total Payable Interest,Totale interessi passivi
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +59,Total Outstanding: {0},Totale eccezionale: {0}
-DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Fattura Timesheet
+DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Timesheet Fattura di Vendita
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},N. di riferimento & Reference Data è necessario per {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Selezionare Account pagamento per rendere Bank Entry
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Creare record dei dipendenti per la gestione foglie, rimborsi spese e del libro paga"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Periodo di prescrizione
+DocType: Restaurant Reservation,Restaurant Reservation,Prenotazione Ristorante
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Scrivere proposta
 DocType: Payment Entry Deduction,Payment Entry Deduction,Pagamento Entry Deduzione
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Un&#39;altra Sales Person {0} esiste con lo stesso ID Employee
@@ -709,7 +723,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Principali
 DocType: Assessment Plan,Maximum Assessment Score,Massimo punteggio
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Aggiorna le date delle transazioni bancarie
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Monitoraggio tempo
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Monitoraggio tempo
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,DUPLICATE PER IL TRASPORTATORE
 DocType: Fiscal Year Company,Fiscal Year Company,Anno Fiscale Società
 DocType: Packing Slip Item,DN Detail,Dettaglio DN
@@ -717,8 +731,9 @@
 DocType: Timesheet,Billed,Addebbitato
 DocType: Batch,Batch Description,Descrizione Batch
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Creazione di gruppi di studenti
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Payment Gateway account non ha creato, per favore creare uno manualmente."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Payment Gateway account non ha creato, per favore creare uno manualmente."
 DocType: Supplier Scorecard,Per Year,Per anno
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Non è ammissibile per l&#39;ammissione in questo programma come per DOB
 DocType: Sales Invoice,Sales Taxes and Charges,Tasse di vendita e oneri
 DocType: Employee,Organization Profile,Profilo dell'organizzazione
 DocType: Vital Signs,Height (In Meter),Altezza (in metro)
@@ -753,8 +768,8 @@
 DocType: Lab Test Template,Compound,Composto
 DocType: Student Batch Name,Batch Name,Batch Nome
 DocType: Fee Validity,Max number of visit,Numero massimo di visite
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet creato:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Si prega di impostare di default Contanti o conto bancario in Modalità di pagamento {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Scheda attività creata:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Si prega di impostare di default Contanti o conto bancario in Modalità di pagamento {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,Iscriversi
 DocType: GST Settings,GST Settings,Impostazioni GST
 DocType: Selling Settings,Customer Naming By,Creare il Nome Cliente da
@@ -786,29 +801,29 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Tasse Landed Cost e oneri
 DocType: Production Order Operation,Actual Start Time,Ora di inizio effettiva
 DocType: BOM Operation,Operation Time,Tempo di funzionamento
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Finire
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Finire
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Base
-DocType: Timesheet,Total Billed Hours,Totale ore fatturate
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Scrivi Off Importo
+DocType: Timesheet,Total Billed Hours,Totale Ore Fatturate
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Scrivi Off Importo
 DocType: Leave Block List Allow,Allow User,Consentire Utente
 DocType: Journal Entry,Bill No,Fattura N.
 DocType: Company,Gain/Loss Account on Asset Disposal,Conto profitti / perdite su Asset in smaltimento
 DocType: Vehicle Log,Service Details,Dettagli del servizio
-DocType: Purchase Invoice,Quarterly,Trimestralmente
+DocType: Subscription,Quarterly,Trimestralmente
 DocType: Lab Test Template,Grouped,raggruppate
 DocType: Selling Settings,Delivery Note Required,Documento di Trasporto Richiesto
 DocType: Bank Guarantee,Bank Guarantee Number,Numero di garanzia bancaria
 DocType: Assessment Criteria,Assessment Criteria,Criteri di valutazione
 DocType: BOM Item,Basic Rate (Company Currency),Tasso Base (Valuta Azienda)
 DocType: Student Attendance,Student Attendance,La partecipazione degli studenti
-DocType: Sales Invoice Timesheet,Time Sheet,Time Sheet
+DocType: Sales Invoice Timesheet,Time Sheet,Scheda attività
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Materie prime calcolate in base a
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Inserisci il dettaglio articolo
 DocType: Interest,Interest,Interesse
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre vendita
 DocType: Purchase Receipt,Other Details,Altri dettagli
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Lab Test,Test Template,Modello di prova
+DocType: Restaurant Order Entry Item,Served,servito
 DocType: Account,Accounts,Contabilità
 DocType: Vehicle,Odometer Value (Last),Valore del contachilometri (Last)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Modelli di criteri di scorecard fornitori.
@@ -820,25 +835,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Anteprima foglio paga
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Account {0} è stato inserito più volte
 DocType: Account,Expenses Included In Valuation,Spese incluse nella valorizzazione
-DocType: Hub Settings,Seller City,Città Venditore
 ,Absent Student Report,Report Assenze Studente
 DocType: Email Digest,Next email will be sent on:,La prossima Email verrà inviata il:
 DocType: Offer Letter Term,Offer Letter Term,Termine di Offerta
 DocType: Supplier Scorecard,Per Week,A settimana
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Articolo ha varianti.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Articolo ha varianti.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Studente totale
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Articolo {0} non trovato
 DocType: Bin,Stock Value,Valore Giacenza
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,I record delle tariffe verranno creati in background. In caso di errore il messaggio di errore verrà aggiornato nell&#39;Appendice.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Società di {0} non esiste
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} ha la validità della tassa fino a {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} ha la validità della tassa fino a {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,albero Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Quantità consumata per unità
 DocType: Serial No,Warranty Expiry Date,Data di scadenza Garanzia
 DocType: Material Request Item,Quantity and Warehouse,Quantità e Magazzino
+DocType: Hub Settings,Unregister,Annullare la registrazione
 DocType: Sales Invoice,Commission Rate (%),Tasso Commissione (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Seleziona Programma
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Seleziona Programma
 DocType: Project,Estimated Cost,Costo stimato
 DocType: Purchase Order,Link to material requests,Collegamento alle richieste di materiale
+DocType: Hub Settings,Publish,Pubblicare
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,aerospaziale
 DocType: Journal Entry,Credit Card Entry,Entry Carta di Credito
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Azienda e Contabilità
@@ -849,13 +866,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Chiudi Opportunità dopo giorni
 ,Reserved,riservato
 DocType: Purchase Order,Supply Raw Materials,Fornire Materie Prime
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Data in cui sarà emessa la prossima fattura. Viene creata su Conferma.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Attività correnti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} non è un articolo in scorta
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',"Per favore, condividi i tuoi commenti con la formazione cliccando su &quot;Informazioni sulla formazione&quot; e poi su &quot;Nuovo&quot;"
 DocType: Mode of Payment Account,Default Account,Account Predefinito
 DocType: Payment Entry,Received Amount (Company Currency),Importo ricevuto (Società di valuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,Il Lead deve essere impostato se l'opportunità è generata da un Lead
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,Il Lead deve essere impostato se l'opportunità è generata da un Lead
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Seleziona il giorno di riposo settimanale
 DocType: Patient,O Negative,O negativo
 DocType: Production Order Operation,Planned End Time,Planned End Time
@@ -871,10 +887,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Opportunità da
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Busta Paga Mensile.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Aggiungi Azienda
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Riga {0}: {1} Numeri di serie necessari per l&#39;articolo {2}. Hai fornito {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Riga {0}: {1} Numeri di serie necessari per l&#39;articolo {2}. Hai fornito {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Seleziona una tabella
 DocType: BOM,Website Specifications,Website Specifiche
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} è un indirizzo email non valido in &#39;Destinatari&#39;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} è un indirizzo email non valido in &#39;Destinatari&#39;
 DocType: Special Test Items,Particulars,particolari
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiotico.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Da {0} di tipo {1}
@@ -882,11 +898,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Riga {0}: fattore di conversione è obbligatoria
 DocType: Employee,A+,A+
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Più regole Prezzo esiste con stessi criteri, si prega di risolvere i conflitti tramite l&#39;assegnazione di priorità. Regole Prezzo: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,Impossibile disattivare o cancellare distinta in quanto è collegata con altri BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,Impossibile disattivare o cancellare distinta in quanto è collegata con altri BOM
 DocType: Opportunity,Maintenance,Manutenzione
 DocType: Item Attribute Value,Item Attribute Value,Valore Attributo Articolo
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Campagne di vendita .
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Crea un Timesheet
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Crea un Timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -943,12 +959,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Inserisci articolo prima
 DocType: Account,Liability,responsabilità
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Importo sanzionato non può essere maggiore di rivendicazione Importo in riga {0}.
+DocType: Salary Detail,Do not include in total,Non includere in totale
 DocType: Company,Default Cost of Goods Sold Account,Costo predefinito di Account merci vendute
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Listino Prezzi non selezionati
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Listino Prezzi non selezionati
 DocType: Employee,Family Background,Sfondo Famiglia
 DocType: Request for Quotation Supplier,Send Email,Invia Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Attenzione: L&#39;allegato non valido {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Nessuna autorizzazione
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Attenzione: L&#39;allegato non valido {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Nessuna autorizzazione
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Quotazione richiesta
 DocType: Vital Signs,Heart Rate / Pulse,Frequenza cardiaca / impulso
 DocType: Company,Default Bank Account,Conto Banca Predefinito
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Per filtrare sulla base del Partner, selezionare prima il tipo di Partner"
@@ -973,14 +991,13 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Il Centro di Costo {2} non appartiene all'azienda {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Il conto {2} non può essere un gruppo
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Articolo Row {} IDX: {DOCTYPE} {} docname non esiste nel precedente &#39;{} doctype&#39; tavolo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} è già completato o annullato
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,La scheda attività {0} è già stata completata o annullata
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Nessuna attività
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Il giorno del mese per cui la fattura automatica sarà generata, ad esempio 05, 28 ecc"
 DocType: Item Variant Settings,Copy Fields to Variant,Copia campi in variante
 DocType: Asset,Opening Accumulated Depreciation,Apertura del deprezzamento accumulato
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Punteggio deve essere minore o uguale a 5
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Il punteggio deve essere minore o uguale a 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Strumento di iscrizione Programma
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,Record C -Form
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,Record C -Form
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Cliente e Fornitore
 DocType: Email Digest,Email Digest Settings,Impostazioni Email di Sintesi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Grazie per il tuo business!
@@ -992,19 +1009,19 @@
 DocType: Bin,Moving Average Rate,Tasso Media Mobile
 DocType: Production Planning Tool,Select Items,Selezionare Elementi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} per fattura {1} in data {2}
-apps/erpnext/erpnext/utilities/user_progress.py +24,Setup Institution,Installazione Installazione
+apps/erpnext/erpnext/utilities/user_progress.py +24,Setup Institution,Configura istituzione
 DocType: Program Enrollment,Vehicle/Bus Number,Numero di veicolo / bus
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Orario del corso
 DocType: Request for Quotation Supplier,Quote Status,Quote Status
 DocType: Maintenance Visit,Completion Status,Stato Completamento
 DocType: HR Settings,Enter retirement age in years,Inserire l&#39;età pensionabile in anni
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Magazzino di Destinazione
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Seleziona un magazzino
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Magazzino di Destinazione
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Seleziona un magazzino
 DocType: Cheque Print Template,Starting location from left edge,A partire da posizione bordo sinistro
 DocType: Item,Allow over delivery or receipt upto this percent,Consenti superamento ricezione o invio fino a questa percentuale
 DocType: Stock Entry,STE-,STEREO
 DocType: Upload Attendance,Import Attendance,Importa presenze
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Tutti i Gruppi
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Tutti i Gruppi
 DocType: Process Payroll,Activity Log,Registro attività
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Utile / Perdita
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Comporre automaticamente il messaggio di presentazione delle transazioni .
@@ -1016,7 +1033,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Qtà Proiettata
 DocType: Sales Invoice,Payment Due Date,Scadenza
 DocType: Drug Prescription,Interval UOM,Intervallo UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Prodotto Modello {0} esiste già con gli stessi attributi
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Prodotto Modello {0} esiste già con gli stessi attributi
+DocType: Item,Hub Publishing Details,Dettagli di pubblicazione Hub
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening','Apertura'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Aperto per fare
 DocType: Notification Control,Delivery Note Message,Messaggio del Documento di Trasporto
@@ -1029,17 +1047,18 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Research & Development,Ricerca & Sviluppo
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Importo da Bill
 DocType: Company,Registration Details,Dettagli di Registrazione
-DocType: Timesheet,Total Billed Amount,Totale importo fatturato
+DocType: Timesheet,Total Billed Amount,Totale Importo Fatturato
 DocType: Item Reorder,Re-Order Qty,Quantità Ri-ordino
 DocType: Leave Block List Date,Leave Block List Date,Lascia Block List Data
 DocType: Pricing Rule,Price or Discount,Prezzo o Sconto
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: La materia prima non può essere uguale a quella principale
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Totale oneri addebitati in Acquisto tabella di carico Gli articoli devono essere uguale Totale imposte e oneri
 DocType: Sales Team,Incentives,Incentivi
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Registrati per Hub
 DocType: SMS Log,Requested Numbers,Numeri richiesti
 DocType: Production Planning Tool,Only Obtain Raw Materials,Ottenere solo materie prime
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Valutazione delle prestazioni.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","L&#39;attivazione di &#39;utilizzare per il Carrello&#39;, come Carrello è abilitato e ci dovrebbe essere almeno una regola imposta per Carrello"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","L&#39;attivazione di &#39;utilizzare per il Carrello&#39;, come Carrello è abilitato e ci dovrebbe essere almeno una regola imposta per Carrello"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","La registrazione di pagamento {0} è legata all'ordine {1}, controllare se deve essere considerato come anticipo in questa fattura."
 DocType: Sales Invoice Item,Stock Details,Dettagli Stock
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valore di progetto
@@ -1058,12 +1077,14 @@
 DocType: Salary Slip,Working Days,Giorni lavorativi
 DocType: Serial No,Incoming Rate,Tasso in ingresso
 DocType: Packing Slip,Gross Weight,Peso lordo
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,Il nome dell'azienda per la quale si sta configurando questo sistema.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Abilita Hub
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,Il nome dell'azienda per la quale si sta configurando questo sistema.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Includi vacanze in totale n. dei giorni lavorativi
 DocType: Job Applicant,Hold,Mantieni
 DocType: Employee,Date of Joining,Data Adesione
 DocType: Naming Series,Update Series,Update
 DocType: Supplier Quotation,Is Subcontracted,È in Conto Lavorazione
+DocType: Restaurant Table,Minimum Seating,Minima sede
 DocType: Item Attribute,Item Attribute Values,Valori Attributi Articolo
 DocType: Examination Result,Examination Result,L&#39;esame dei risultati
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Ricevuta di Acquisto
@@ -1074,13 +1095,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Impossibile trovare tempo di slot nei prossimi {0} giorni per l&#39;operazione {1}
 DocType: Production Order,Plan material for sub-assemblies,Materiale Piano per sub-assemblaggi
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,I partner di vendita e Territorio
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} deve essere attivo
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} deve essere attivo
 DocType: Journal Entry,Depreciation Entry,Ammortamenti Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Si prega di selezionare il tipo di documento prima
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Annulla Visite Materiale {0} prima di annullare questa visita di manutenzione
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial No {0} non appartiene alla voce {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Quantità richiesta
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Magazzini con transazione esistenti non possono essere convertiti in contabilità.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Magazzini con transazione esistenti non possono essere convertiti in contabilità.
 DocType: Bank Reconciliation,Total Amount,Totale Importo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Prescription Duration,Number,Numero
@@ -1091,7 +1112,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista Prezzo di vendita
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Se selezionato, verrà creato un cliente, associato a Paziente. Le fatture pazienti verranno create contro questo Cliente. È inoltre possibile selezionare il cliente esistente durante la creazione di paziente."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Pubblica sincronizzare gli elementi
 DocType: Bank Reconciliation,Account Currency,Valuta del saldo
 DocType: Lab Test,Sample ID,ID del campione
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Si prega di citare Arrotondamento account in azienda
@@ -1100,11 +1120,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Employee {0} non è attiva o non esiste
 DocType: Fee Structure,Components,componenti
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Si prega di inserire Asset categoria al punto {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Voce Varianti {0} aggiornato
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Voce Varianti {0} aggiornato
 DocType: Quality Inspection Reading,Reading 6,Lettura 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Impossibile {0} {1} {2} senza alcuna fattura in sospeso negativo
-DocType: Purchase Invoice Advance,Purchase Invoice Advance,Acquisto Advance Fattura
-DocType: Hub Settings,Sync Now,Sync Now
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","da generare. Se è ritardato, dovrai cambiare manualmente il campo &quot;Ripeti in Giorno del mese&quot;"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Impossibile {0} {1} {2} senza alcuna fattura in sospeso negativo
+DocType: Purchase Invoice Advance,Purchase Invoice Advance,Anticipo Fattura di Acquisto
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Riga {0}: ingresso di credito non può essere collegato con un {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Definire bilancio per l&#39;anno finanziario.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"""Conto Banca / Cassa predefinito"" sarà verrà automaticamente aggiornato nella fattura del punto vendita quando sarà selezionata questa modalità."
@@ -1116,13 +1137,13 @@
 DocType: Item,Is Purchase Item,È Acquisto Voce
 DocType: Asset,Purchase Invoice,Fattura di Acquisto
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail No
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Nuova fattura di vendita
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Nuova fattura di vendita
 DocType: Stock Entry,Total Outgoing Value,Totale Valore uscita
 DocType: Physician,Appointments,appuntamenti
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Data e Data di chiusura di apertura dovrebbe essere entro lo stesso anno fiscale
 DocType: Lead,Request for Information,Richiesta di Informazioni
 ,LeaderBoard,Classifica
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Sincronizzazione offline fatture
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Sincronizzazione Fatture Off-line
 DocType: Payment Request,Paid,Pagato
 DocType: Program Fee,Program Fee,Costo del programma
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1141,11 +1162,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Articolo dell'Ordine di Acquisto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Proventi indiretti
 DocType: Student Attendance Tool,Student Attendance Tool,Strumento Presenze
+DocType: Restaurant Menu,Price List (Auto created),Listino prezzi (creato automaticamente)
 DocType: Cheque Print Template,Date Settings,Impostazioni della data
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Varianza
 ,Company Name,Nome Azienda
 DocType: SMS Center,Total Message(s),Totale Messaggi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Selezionare la voce per il trasferimento
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Selezionare la voce per il trasferimento
 DocType: Purchase Invoice,Additional Discount Percentage,Percentuale di sconto Aggiuntivo
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Visualizzare un elenco di tutti i video di aiuto
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Selezionare conto capo della banca in cui assegno è stato depositato.
@@ -1162,6 +1184,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,metro
 DocType: Workstation,Electricity Cost,Costo Elettricità
 DocType: HR Settings,Don't send Employee Birthday Reminders,Non inviare Dipendente Birthday Reminders
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Salva le impostazioni
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Prodotti richiesti
 DocType: Item,Inspection Criteria,Criteri di ispezione
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Trasferiti
 DocType: BOM Website Item,BOM Website Item,Distinta Base dell'Articolo sul Sito Web
@@ -1178,11 +1202,11 @@
 DocType: Journal Entry,Total Amount in Words,Importo Totale in lettere
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Si è verificato un errore . Una ragione probabile potrebbe essere che non si è salvato il modulo. Si prega di contattare support@erpnext.com se il problema persiste .
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Il mio carrello
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Tipo ordine deve essere uno dei {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Tipo ordine deve essere uno dei {0}
 DocType: Lead,Next Contact Date,Data del contatto successivo
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Quantità di apertura
 DocType: Healthcare Settings,Appointment Reminder,Appuntamento promemoria
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Si prega di inserire account per quantità di modifica
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Si prega di inserire account per quantità di modifica
 DocType: Student Batch Name,Student Batch Name,Studente Batch Nome
 DocType: Consultation,Doctor,Medico
 DocType: Holiday List,Holiday List Name,Nome elenco vacanza
@@ -1190,12 +1214,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Programma del corso
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Stock Options
 DocType: Journal Entry Account,Expense Claim,Rimborso Spese
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Vuoi davvero ripristinare questo bene rottamato?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Quantità per {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Vuoi davvero ripristinare questo bene rottamato?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Quantità per {0}
 DocType: Leave Application,Leave Application,Applicazione Permessi
 DocType: Patient,Patient Relation,Relazione paziente
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Strumento Allocazione Permessi
+DocType: Item,Hub Category to Publish,Categoria Hub per pubblicare
 DocType: Leave Block List,Leave Block List Dates,Lascia Blocco Elenco date
+DocType: Sales Invoice,Billing Address GSTIN,Indirizzo di fatturazione GSTIN
 DocType: Workstation,Net Hour Rate,Tasso Netto Orario
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost ricevuta di acquisto
 DocType: Company,Default Terms,Termini di pagamento predefinito
@@ -1205,18 +1231,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Si prega di specificare un {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Eliminati elementi senza variazione di quantità o valore.
 DocType: Delivery Note,Delivery To,Consegna a
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Tavolo attributo è obbligatorio
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Tavolo attributo è obbligatorio
 DocType: Production Planning Tool,Get Sales Orders,Ottieni Ordini di Vendita
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} non può essere negativo
 DocType: Training Event,Self-Study,Autodidatta
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Sconto
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Sconto
 DocType: Asset,Total Number of Depreciations,Numero totale degli ammortamenti
-DocType: Sales Invoice Item,Rate With Margin,Vota con margine
+DocType: Sales Invoice Item,Rate With Margin,Prezzo con margine
 DocType: Workstation,Wages,Salari
 DocType: Task,Urgent,Urgente
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Si prega di specificare un ID Row valido per riga {0} nella tabella {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Impossibile trovare la variabile:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Seleziona un campo da modificare da numpad
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Seleziona un campo da modificare da numpad
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Vai al desktop e inizia a usare ERPNext
 DocType: Item,Manufacturer,Produttore
 DocType: Landed Cost Item,Purchase Receipt Item,Ricevuta di Acquisto Articolo
@@ -1247,8 +1273,8 @@
 DocType: GL Entry,Against,Previsione
 DocType: Item,Default Selling Cost Center,Centro di costo di vendita di default
 DocType: Sales Partner,Implementation Partner,Partner di implementazione
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,CAP
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Sales Order {0} è {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,CAP
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Sales Order {0} è {1}
 DocType: Opportunity,Contact Info,Info Contatto
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Creazione scorte
 DocType: Packing Slip,Net Weight UOM,Peso Netto (UdM)
@@ -1259,6 +1285,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Ottieni cadenze settimanali
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Data di Fine non può essere inferiore a Data di inizio
 DocType: Sales Person,Select company name first.,Selezionare il nome della società prima.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Dal basso all&#39;alto
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Preventivi ricevuti dai Fornitori.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Sostituire il BOM e aggiornare il prezzo più recente in tutte le BOM
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Per {0} | {1} {2}
@@ -1277,7 +1304,7 @@
 DocType: Program Enrollment,Transportation,Trasporto
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,attributo non valido
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} deve essere confermato
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},La quantità deve essere minore o uguale a {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},La quantità deve essere minore o uguale a {0}
 DocType: SMS Center,Total Characters,Totale Personaggi
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Seleziona BOM BOM in campo per la voce {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Detagli Fattura
@@ -1292,7 +1319,7 @@
 ,Ordered Items To Be Billed,Articoli ordinati da fatturare
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Da Campo deve essere inferiore al campo
 DocType: Global Defaults,Global Defaults,Predefiniti Globali
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Progetto di collaborazione Invito
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Progetto di collaborazione Invito
 DocType: Salary Slip,Deductions,Deduzioni
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Nome azione
@@ -1310,13 +1337,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Fattura di vendita (anticipata)
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Niente da chiedere
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Un altro record di bilancio &#39;{0}&#39; esiste già contro {1} &#39;{2}&#39; per l&#39;anno fiscale {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','Data Inizio effettivo' non può essere maggiore di 'Data di fine effettiva'
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','Data Inizio effettivo' non può essere maggiore di 'Data di fine effettiva'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Amministrazione
 DocType: Cheque Print Template,Payer Settings,Impostazioni Pagatore
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Questo sarà aggiunto al codice articolo della variante. Ad esempio, se la sigla è ""SM"", e il codice articolo è ""T-SHIRT"", il codice articolo della variante sarà ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Paga Netta (in lettere) sarà visibile una volta che si salva la busta paga.
 DocType: Purchase Invoice,Is Return,È Return
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Attenzione
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Attenzione
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Reso / Nota di Debito
 DocType: Price List Country,Price List Country,Listino Prezzi Nazione
 DocType: Item,UOMs,Unità di Misure
@@ -1331,17 +1358,18 @@
 DocType: Account,Balance Sheet,Bilancio Patrimoniale
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Centro di costo per articoli con Codice Prodotto '
 DocType: Fee Validity,Valid Till,Valido fino a
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modalità di pagamento non è configurato. Si prega di verificare, se account è stato impostato sulla modalità di pagamento o su POS profilo."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modalità di pagamento non è configurato. Si prega di verificare, se account è stato impostato sulla modalità di pagamento o su POS profilo."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Lo stesso articolo non può essere inserito più volte.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ulteriori conti possono essere fatti in Gruppi, ma le voci possono essere fatte contro i non-Gruppi"
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Debiti
 DocType: Course,Course Intro,corso di Introduzione
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Entrata Scorte di Magazzino {0} creata
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Si prega di impostare la serie di numerazione per la partecipazione tramite Setup&gt; Serie di numerazione
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Entrata Scorte di Magazzino {0} creata
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rifiutato Quantità non è possibile entrare in acquisto di ritorno
 ,Purchase Order Items To Be Billed,Articoli dell'Ordine di Acquisto da fatturare
 DocType: Purchase Invoice Item,Net Rate,Tasso Netto
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Seleziona un cliente
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Seleziona un cliente
 DocType: Purchase Invoice Item,Purchase Invoice Item,Articolo della Fattura di Acquisto
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Inserimenti Inventario e Libro Mastro sono aggiornati per le Ricevute di Acquisto selezionate
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Articolo 1
@@ -1360,7 +1388,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Fila Duplicate {0} con lo stesso {1}
 ,Trial Balance,Bilancio di verifica
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Anno fiscale {0} non trovato
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Impostazione dipendenti
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Impostazione dipendenti
 DocType: Sales Order,SO-,COSÌ-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Si prega di selezionare il prefisso prima
 DocType: Employee,O-,O-
@@ -1372,12 +1400,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,vista Ledger
 DocType: Grading Scale,Intervals,intervalli
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,La prima
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Esiste un gruppo di articoli con lo stesso nome, si prega di cambiare il nome dell'articolo o di rinominare il gruppo di articoli"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Esiste un gruppo di articoli con lo stesso nome, si prega di cambiare il nome dell'articolo o di rinominare il gruppo di articoli"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,No. studente in mobilità
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Resto del Mondo
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Resto del Mondo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,L'articolo {0} non può avere Lotto
 ,Budget Variance Report,Report Variazione Budget
 DocType: Salary Slip,Gross Pay,Paga lorda
+DocType: Item,Is Item from Hub,È elemento da Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Riga {0}: Tipo Attività è obbligatoria.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividendo liquidato
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Libro Mastro Contabile
@@ -1387,8 +1416,9 @@
 DocType: Vehicle Log,Service Detail,Particolare di servizio
 DocType: BOM,Item Description,Descrizione Articolo
 DocType: Student Sibling,Student Sibling,Student Sibling
-DocType: Purchase Invoice,Is Recurring,È ricorrente
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Modalità di pagamento
 DocType: Purchase Invoice,Supplied Items,Elementi in dotazione
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Imposta un menu attivo per il ristorante {0}
 DocType: Student,STUD.,PERNO.
 DocType: Production Order,Qty To Manufacture,Qtà da Produrre
 DocType: Email Digest,New Income,Nuovo reddito
@@ -1398,6 +1428,7 @@
 ,Student and Guardian Contact Details,Student and Guardian Contatti
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Riga {0}: Per il fornitore {0} l'Indirizzo e-mail è richiesto per inviare l'e-mail
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Apertura temporanea
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Visualizza Hub
 ,Employee Leave Balance,Saldo del Congedo Dipendete
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Il Saldo del Conto {0} deve essere sempre {1}
 DocType: Patient Appointment,More Info,Ulteriori Informazioni
@@ -1417,13 +1448,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Sales Order {0} non è valido
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Avvisa per la nuova richiesta per le citazioni
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Gli ordini di acquisto ti aiutano a pianificare e monitorare i tuoi acquisti
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Siamo spiacenti , le aziende non possono essere unite"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Siamo spiacenti , le aziende non possono essere unite"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Prescrizioni di laboratorio
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",La quantità emissione / trasferimento totale {0} in Materiale Richiesta {1} \ non può essere maggiore di quantità richiesta {2} per la voce {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Piccolo
 DocType: Employee,Employee Number,Numero Dipendente
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Caso n ( s) già in uso . Prova da Caso n {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Caso n ( s) già in uso . Prova da Caso n {0}
 DocType: Project,% Completed,% Completato
 ,Invoiced Amount (Exculsive Tax),Importo fatturato ( Exculsive Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Articolo 2
@@ -1438,11 +1469,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,spese indirette
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Riga {0}: Quantità è obbligatorio
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,agricoltura
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,I vostri prodotti o servizi
 DocType: Special Test Items,Special Test Items,Articoli speciali di prova
 DocType: Mode of Payment,Mode of Payment,Modalità di Pagamento
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Website Immagine dovrebbe essere un file o URL del sito web pubblico
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Website Immagine dovrebbe essere un file o URL del sito web pubblico
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Questo è un gruppo elemento principale e non può essere modificato .
@@ -1450,24 +1481,23 @@
 DocType: Vehicle,Fuel UOM,Fuel UOM
 DocType: Warehouse,Warehouse Contact Info,Contatti Magazzino
 DocType: Payment Entry,Write Off Difference Amount,Scrivi Off importo di differenza
-DocType: Purchase Invoice,Recurring Type,Tipo ricorrente
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: Indirizzo e-mail del dipendente non trovato, e-mail non inviata"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: Indirizzo e-mail del dipendente non trovato, e-mail non inviata"
 DocType: Item,Foreign Trade Details,Commercio Estero Dettagli
+,Assessment Plan Status,Stato del piano di valutazione
 DocType: Email Digest,Annual Income,Reddito annuo
 DocType: Serial No,Serial No Details,Serial No Dettagli
 DocType: Purchase Invoice Item,Item Tax Rate,Articolo Tax Rate
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,Seleziona Medico e Data
 DocType: Student Group Student,Group Roll Number,Numero di rotolo di gruppo
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Per {0}, solo i conti di credito possono essere collegati contro un'altra voce di addebito"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totale di tutti i pesi compito dovrebbe essere 1. Regolare i pesi di tutte le attività del progetto di conseguenza
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Il Documento di Trasporto {0} non è confermato
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totale di tutti i pesi compito dovrebbe essere 1. Regolare i pesi di tutte le attività del progetto di conseguenza
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Il Documento di Trasporto {0} non è confermato
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,L'Articolo {0} deve essere di un sub-contratto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Attrezzature Capital
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regola Prezzi viene prima selezionato in base al 'applicare sul campo', che può essere prodotto, Articolo di gruppo o di marca."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Impostare prima il codice dell&#39;articolo
-DocType: Hub Settings,Seller Website,Venditore Sito
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Impostare prima il codice dell&#39;articolo
 DocType: Item,ITEM-,ARTICOLO-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Totale percentuale assegnato per il team di vendita dovrebbe essere di 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Totale percentuale assegnato per il team di vendita dovrebbe essere di 100
 DocType: Sales Invoice Item,Edit Description,Modifica Descrizione
 DocType: Antibiotic,Antibiotic,Antibiotico
 ,Team Updates,squadra Aggiornamenti
@@ -1488,12 +1518,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Totale (Valuta Società)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Numero di serie {0} è entrato più di una volta
 DocType: Depreciation Schedule,Journal Entry,Registrazione Contabile
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} articoli in lavorazione
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} articoli in lavorazione
 DocType: Workstation,Workstation Name,Nome Stazione di lavoro
 DocType: Grading Scale Interval,Grade Code,Codice grado
 DocType: POS Item Group,POS Item Group,POS Gruppo Articolo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email di Sintesi:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},Distinta Base {0} non appartiene alla voce {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},Distinta Base {0} non appartiene alla voce {1}
 DocType: Sales Partner,Target Distribution,Distribuzione di destinazione
 DocType: Salary Slip,Bank Account No.,Conto Bancario N.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Questo è il numero dell&#39;ultimo transazione creata con questo prefisso
@@ -1509,12 +1539,11 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Fornitore della richiesta di offerta
 DocType: Healthcare Settings,Registration Message,Messaggio di registrazione
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Hardware
-DocType: Sales Order,Recurring Upto,ricorrente Fino
 DocType: Prescription Dosage,Prescription Dosage,Dosaggio prescrizione
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Seleziona una società
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Seleziona una società
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Lascia Privilege
-DocType: Purchase Invoice,Supplier Invoice Date,Data fattura Fornitore
+DocType: Purchase Invoice,Supplier Invoice Date,Data Fattura Fornitore
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,per
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,È necessario abilitare Carrello
 DocType: Payment Entry,Writeoff,Cancellare
@@ -1528,10 +1557,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Condizioni sovrapposti trovati tra :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Contro diario {0} è già regolata contro un altro buono
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Totale valore di ordine
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,cibo
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,cibo
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Gamma invecchiamento 3
 DocType: Maintenance Schedule Item,No of Visits,Num. di Visite
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Il programma di manutenzione {0} esiste contro {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Vuoi pubblicare i tuoi articoli in Hub?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,studente iscrivendosi
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta del Conto di chiusura deve essere {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Somma dei punti per tutti gli obiettivi dovrebbero essere 100. E &#39;{0}
@@ -1542,9 +1572,9 @@
 DocType: Authorization Rule,Average Discount,Sconto Medio
 DocType: Purchase Invoice Item,UOM,Unità di misura
 DocType: Rename Tool,Utilities,Utilità
-DocType: Purchase Invoice Item,Accounting,Contabilità
+DocType: POS Profile,Accounting,Contabilità
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Si prega di selezionare i batch per l&#39;articolo in scatola
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Si prega di selezionare i batch per l&#39;articolo in scatola
 DocType: Asset,Depreciation Schedules,piani di ammortamento
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Periodo di applicazione non può essere periodo di assegnazione congedo di fuori
 DocType: Activity Cost,Projects,Progetti
@@ -1556,11 +1586,11 @@
 DocType: Quotation,Shopping Cart,Carrello spesa
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Media giornaliera in uscita
 DocType: POS Profile,Campaign,Campagna
-DocType: Supplier,Name and Type,Nome e tipo
+DocType: Supplier,Name and Type,Nome e Tipo
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',Stato approvazione deve essere ' Approvato ' o ' Rifiutato '
 DocType: Physician,Contacts and Address,Contatti e indirizzo
 DocType: Purchase Invoice,Contact Person,Persona di Riferimento
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Data prevista di inizio' non può essere maggiore di 'Data di fine prevista'
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','Data prevista di inizio' non può essere maggiore di 'Data di fine prevista'
 DocType: Course Scheduling Tool,Course End Date,Corso Data fine
 DocType: Holiday List,Holidays,Vacanze
 DocType: Sales Order Item,Planned Quantity,Quantità Prevista
@@ -1568,10 +1598,11 @@
 DocType: Item,Maintain Stock,Movimenta l'articolo in magazzino
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Le voci di archivio già creati per ordine di produzione
 DocType: Employee,Prefered Email,preferito Email
+DocType: Student Admission,Eligibility and Details,Eligibilità e dettagli
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Variazione netta delle immobilizzazioni
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lasciare vuoto se considerato per tutte le designazioni
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Carica di tipo ' Actual ' in riga {0} non può essere incluso nella voce Tasso
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Da Datetime
 DocType: Email Digest,For Company,Per Azienda
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log comunicazione
@@ -1579,19 +1610,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Variabile di punteggio dei punteggi dei fornitori
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Importo Acquisto
 DocType: Sales Invoice,Shipping Address Name,Destinazione
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Piano dei Conti
 DocType: Material Request,Terms and Conditions Content,Termini e condizioni contenuti
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,non può essere superiore a 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,L'articolo {0} non è in Giagenza
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,L'articolo {0} non è in Giagenza
 DocType: Maintenance Visit,Unscheduled,Non in programma
 DocType: Employee,Owned,Di proprietà
 DocType: Salary Detail,Depends on Leave Without Pay,Dipende in aspettativa senza assegni
 DocType: Pricing Rule,"Higher the number, higher the priority","Più alto è il numero, maggiore è la priorità"
-,Purchase Invoice Trends,Acquisto Tendenze Fattura
+,Purchase Invoice Trends,Andamento Fatture di Acquisto
 DocType: Employee,Better Prospects,Prospettive Migliori
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Riga # {0}: Il batch {1} ha solo {2} qty. Si prega di selezionare un altro batch che dispone di {3} qty disponibile o si divide la riga in più righe, per consegnare / emettere da più batch"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Riga # {0}: Il batch {1} ha solo {2} qty. Si prega di selezionare un altro batch che dispone di {3} qty disponibile o si divide la riga in più righe, per consegnare / emettere da più batch"
 DocType: Vehicle,License Plate,Targa
 DocType: Appraisal,Goals,Obiettivi
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Selezionare Profilo POS
 DocType: Warranty Claim,Warranty / AMC Status,Garanzia / AMC Stato
 ,Accounts Browser,Esplora Conti
 DocType: Payment Entry Reference,Payment Entry Reference,Pagamento voce di riferimento
@@ -1610,7 +1641,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Il dipendente non può riportare a se stesso.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Se l'account viene bloccato , le voci sono autorizzati a utenti con restrizioni ."
 DocType: Email Digest,Bank Balance,Saldo bancario
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Ingresso contabile per {0}: {1} può essere fatto solo in valuta: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Ingresso contabile per {0}: {1} può essere fatto solo in valuta: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profilo Posizione , qualifiche richieste ecc"
 DocType: Journal Entry Account,Account Balance,Saldo a bilancio
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Regola fiscale per le operazioni.
@@ -1619,8 +1650,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Totale tasse e spese (Azienda valuta)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Mostra di P &amp; L saldi non chiusa anno fiscale di
 DocType: Lab Test Template,Collection Details,Dettagli raccolta
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","selezionare cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date da tabConsultation ct, `tabLab Prescription` cp dove ct.patient = &#39;{0}&#39; e cp.parent = ct. nome e cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Conto di Spedizione
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Il conto {2} è inattivo
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Creare gli Ordini di Vendita ti aiuta a pianificare la lavorazione e a consegnare entro i tempi stabiliti
@@ -1636,8 +1665,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Il Magazzino di provenienza è obbligatorio per il rigo {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Documento di trasporto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Affitto Ufficio
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Impostazioni del gateway configurazione di SMS
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importazione non riuscita!
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Configura impostazioni gateway SMS
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Importazione non riuscita!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Nessun indirizzo ancora aggiunto.
 DocType: Workstation Working Hour,Workstation Working Hour,Ore di lavoro Workstation
 DocType: Vital Signs,Blood Pressure,Pressione sanguigna
@@ -1662,7 +1691,7 @@
 DocType: Sales Invoice,Source,Fonte
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mostra chiusa
 DocType: Leave Type,Is Leave Without Pay,È lasciare senza stipendio
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Asset categoria è obbligatoria per voce delle immobilizzazioni
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Asset categoria è obbligatoria per voce delle immobilizzazioni
 DocType: Fee Validity,Fee Validity,Validità della tariffa
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nessun record trovato nella tabella di Pagamento
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Questo {0} conflitti con {1} per {2} {3}
@@ -1683,8 +1712,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,executive Search
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Creare un Lead
 DocType: Maintenance Schedule,Schedules,Orari
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,Il profilo POS è richiesto per utilizzare Point-of-Sale
 DocType: Purchase Invoice Item,Net Amount,Importo Netto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} non è stato inviato affinché l&#39;azione non possa essere completata
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} non è stato inviato affinché l&#39;azione non possa essere completata
 DocType: Purchase Order Item Supplied,BOM Detail No,Dettaglio BOM N.
 DocType: Landed Cost Voucher,Additional Charges,Spese aggiuntive
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Importo Sconto Aggiuntivo (valuta Azienda)
@@ -1693,7 +1723,7 @@
 ,Support Hour Distribution,Distribuzione dell&#39;orario di assistenza
 DocType: Maintenance Visit,Maintenance Visit,Visita di manutenzione
 DocType: Student,Leaving Certificate Number,Lasciando Numero del certificato
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Appuntamento annullato, esamina e annulla la fattura {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Appuntamento annullato, esamina e annulla la fattura {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Disponibile Quantità Batch in magazzino
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Aggiornamento Formato di Stampa
 DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Aiuto
@@ -1716,8 +1746,8 @@
 DocType: Patient,Tobacco Past Use,Uso passato del tabacco
 DocType: Sales Invoice Item,Brand Name,Nome Marchio
 DocType: Purchase Receipt,Transporter Details,Transporter Dettagli
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},L&#39;utente {0} è già assegnato a Physician {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Deposito di default è richiesto per gli elementi selezionati
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},L&#39;utente {0} è già assegnato a Physician {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Deposito di default è richiesto per gli elementi selezionati
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Scatola
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,Fornitore Possibile
 DocType: Budget,Monthly Distribution,Distribuzione Mensile
@@ -1727,7 +1757,7 @@
 DocType: Sales Partner,Sales Partner Target,Vendite Partner di destinazione
 DocType: Loan Type,Maximum Loan Amount,Importo massimo del prestito
 DocType: Pricing Rule,Pricing Rule,Regola Prezzi
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Duplica il numero di rotolo per lo studente {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Duplica il numero di rotolo per lo studente {0}
 DocType: Budget,Action if Annual Budget Exceeded,Azione da effettuarsi se si eccede il Budget Annuale
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Richiesta materiale per ordine d&#39;acquisto
 DocType: Shopping Cart Settings,Payment Success URL,Pagamento Successo URL
@@ -1744,7 +1774,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} deve apparire una sola volta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Non è consentito trasferire più {0} di {1} per Ordine d'Acquisto {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Lascia allocazione con successo per {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Non ci sono elementi per il confezionamento
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Non ci sono elementi per il confezionamento
 DocType: Shipping Rule Condition,From Value,Da Valore
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,La quantità da produrre è obbligatoria
 DocType: Employee Loan,Repayment Method,Metodo di rimborso
@@ -1758,6 +1788,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Passività in Giacenza
 DocType: Purchase Invoice,Supplier Warehouse,Magazzino Fornitore
 DocType: Opportunity,Contact Mobile No,Cellulare Contatto
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Seleziona Azienda
 ,Material Requests for which Supplier Quotations are not created,Richieste di materiale per le quali non sono state create Quotazioni dal Fornitore
 DocType: Student Group,Set 0 for no limit,Impostare 0 per nessun limite
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Le giornate per cui si stanno segnando le ferie sono già di vacanze. Non è necessario chiedere un permesso.
@@ -1767,24 +1798,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Crea Preventivo
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Altri Reports
 DocType: Dependent Task,Dependent Task,Task dipendente
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Fattore di conversione per unità di misura predefinita deve essere 1 in riga {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Fattore di conversione per unità di misura predefinita deve essere 1 in riga {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Lascia di tipo {0} non può essere superiore a {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Provare le operazioni per X giorni in programma in anticipo.
 DocType: HR Settings,Stop Birthday Reminders,Arresto Compleanno Promemoria
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Si prega di impostare di default Payroll conto da pagare in azienda {0}
 DocType: SMS Center,Receiver List,Lista Ricevitore
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Cerca articolo
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Cerca Articolo
 DocType: Patient Appointment,Referring Physician,Medico di riferimento
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantità consumata
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Variazione netta delle disponibilità
 DocType: Assessment Plan,Grading Scale,Scala di classificazione
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unità di misura {0} è stata inserita più volte nella tabella di conversione
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,Già completato
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unità di misura {0} è stata inserita più volte nella tabella di conversione
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,Già completato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock in mano
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Richiesta di Pagamento già esistente {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo di elementi Emesso
 DocType: Physician,Hospital,Ospedale
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Quantità non deve essere superiore a {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Quantità non deve essere superiore a {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Il Precedente Esercizio Finanziario non è chiuso
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Età (Giorni)
 DocType: Quotation Item,Quotation Item,Articolo del Preventivo
@@ -1795,8 +1826,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Fornitore Tipo master.
 DocType: Purchase Order Item,Supplier Part Number,Numero di articolo del fornitore
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Il tasso di conversione non può essere 0 o 1
-DocType: Sales Invoice,Reference Document,Documento di riferimento
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} viene cancellato o fermato
+DocType: Subscription,Reference Document,Documento di riferimento
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} viene cancellato o fermato
 DocType: Accounts Settings,Credit Controller,Controllare Credito
 DocType: Delivery Note,Vehicle Dispatch Date,Data Spedizione Veicolo
 DocType: Healthcare Settings,Default Medical Code Standard,Standard di codice medico di default
@@ -1805,6 +1836,7 @@
 DocType: Company,Default Payable Account,Conto da pagare Predefinito
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Impostazioni carrello della spesa, come Tipi di Spedizione, Listino Prezzi ecc"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Fatturato
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Ordina per Prezzo ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Riservato Quantità
 DocType: Party Account,Party Account,Account del Partner
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Risorse Umane
@@ -1816,13 +1848,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Crea una scrittura per l'esborso
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Riga {0}: L'anticipo verso Fornitore deve essere un debito
 DocType: Company,Default Values,Valori Predefiniti
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequency} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Frequency} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Dell&#39;importo totale rimborsato
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Questo si basa su tronchi contro questo veicolo. Vedere cronologia sotto per i dettagli
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Al ricevimento della Fattura Fornitore {0} datata {1}
 DocType: Customer,Default Price List,Listino Prezzi Predefinito
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,record di Asset Movimento {0} creato
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Non è possibile cancellare l&#39;anno fiscale {0}. Anno fiscale {0} è impostato in modo predefinito in Impostazioni globali
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Esiste già un cliente con lo stesso nome
 DocType: Journal Entry,Entry Type,Tipo voce
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Nessun piano di valutazione collegato a questo gruppo di valutazione
 ,Customer Credit Balance,Balance Credit clienti
@@ -1832,7 +1865,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Prezzi
 DocType: Quotation,Term Details,Dettagli Termini
 DocType: Project,Total Sales Cost (via Sales Order),Costo totale di vendita (tramite ordine di vendita)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Non possono iscriversi più di {0} studenti per questo gruppo di studenti.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Non possono iscriversi più di {0} studenti per questo gruppo di studenti.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Conto di piombo
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} deve essere maggiore di 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Capacity Planning per (giorni)
@@ -1848,9 +1881,11 @@
 DocType: Lab Test,Technician Name,Nome tecnico
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Scollegare il pagamento per la cancellazione della fattura
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},lettura corrente dell&#39;odometro inserito deve essere maggiore di contachilometri iniziale veicolo {0}
+DocType: Restaurant Reservation,No Show,Nessuno spettacolo
 DocType: Shipping Rule Country,Shipping Rule Country,Tipo di Spedizione per Nazione
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Permessi e Presenze
 DocType: Maintenance Visit,Partially Completed,Parzialmente completato
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Sensibilità moderata
 DocType: Leave Type,Include holidays within leaves as leaves,Includere le vacanze entro i fogli come foglie
 DocType: Sales Invoice,Packed Items,Articoli imballati
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Richiesta Garanzia per N. Serie
@@ -1867,13 +1902,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Importo pagato (valuta della società)
 DocType: Purchase Invoice,Additional Discount,Sconto aggiuntivo
 DocType: Selling Settings,Selling Settings,Impostazioni Vendite
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Conferma azione
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Aste online
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Si prega di specificare Quantitativo o Tasso di valutazione o di entrambi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Compimento
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Vedi Carrello
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Spese di Marketing
 ,Item Shortage Report,Report Carenza Articolo
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Il peso è menzionato, \n prega di citare ""Peso UOM"" troppo"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Il peso è menzionato, \n prega di citare ""Peso UOM"" troppo"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Richiesta di materiale usata per l'entrata giacenza
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Successivo ammortamento Data è obbligatoria per i nuovi beni
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Separare il gruppo di corso per ogni batch
@@ -1881,16 +1917,16 @@
 DocType: Fee Category,Fee Category,Fee Categoria
 DocType: Drug Prescription,Dosage by time interval,Dosaggio per intervallo di tempo
 ,Student Fee Collection,Student Fee Collection
-apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +23,Appointment Duration (mins),Appuntamento Durata (minuti)
+apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +23,Appointment Duration (mins),Durata dell'appuntamento (minuti)
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Crea una voce contabile per ogni movimento di scorta
 DocType: Leave Allocation,Total Leaves Allocated,Totale Foglie allocati
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Magazzino richiesto al Fila No {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Si prega di inserire valido Esercizio inizio e di fine
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Si prega di inserire valido Esercizio inizio e di fine
 DocType: Employee,Date Of Retirement,Data di pensionamento
 DocType: Upload Attendance,Get Template,Ottieni Modulo
 DocType: Material Request,Transferred,trasferito
 DocType: Vehicle,Doors,Porte
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,Installazione ERPNext completa!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,Installazione ERPNext completa!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Raccogliere la tariffa per la registrazione del paziente
 DocType: Course Assessment Criteria,Weightage,Pesa
 DocType: Purchase Invoice,Tax Breakup,Pausa fiscale
@@ -1909,36 +1945,36 @@
 DocType: Employee,AB+,AB+
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Se questa voce ha varianti, allora non può essere selezionata in ordini di vendita, ecc"
 DocType: Lead,Next Contact By,Contatto Successivo Con
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Quantità necessaria per la voce {0} in riga {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Quantità necessaria per la voce {0} in riga {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Deposito {0} non può essere cancellato in quanto esiste la quantità per l' articolo {1}
 DocType: Quotation,Order Type,Tipo di ordine
-DocType: Purchase Invoice,Notification Email Address,Indirizzo e-mail di notifica
 ,Item-wise Sales Register,Vendite articolo-saggio Registrati
 DocType: Asset,Gross Purchase Amount,Importo Acquisto Gross
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Balance di apertura
 DocType: Asset,Depreciation Method,Metodo di ammortamento
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Disconnesso
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Disconnesso
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,È questa tassa inclusi nel prezzo base?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Obiettivo totale
 DocType: Job Applicant,Applicant for a Job,Richiedente per un lavoro
 DocType: Production Plan Material Request,Production Plan Material Request,Piano di produzione Materiale Richiesta
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Ordini di Produzione non creati
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Ordini di Produzione non creati
 DocType: Stock Reconciliation,Reconciliation JSON,Riconciliazione JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Troppe colonne. Esportare il report e stamparlo utilizzando un foglio di calcolo.
 DocType: Purchase Invoice Item,Batch No,Lotto N.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Richiesta di offerta: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Consentire più ordini di vendita da un singolo ordine di un cliente
 DocType: Student Group Instructor,Student Group Instructor,Istruttore del gruppo di studenti
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,principale
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,principale
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Impostare prefisso per numerazione serie sulle transazioni
 DocType: Employee Attendance Tool,Employees HTML,Dipendenti HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,BOM default ({0}) deve essere attivo per questo articolo o il suo modello
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,BOM default ({0}) deve essere attivo per questo articolo o il suo modello
 DocType: Employee,Leave Encashed?,Lascia non incassati?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Dal campo è obbligatorio
 DocType: Email Digest,Annual Expenses,Spese annuali
 DocType: Item,Variants,Varianti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Crea ordine d'acquisto
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Crea ordine d'acquisto
 DocType: SMS Center,Send To,Invia a
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Non c'è equilibrio congedo sufficiente per Leave tipo {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Importo Assegnato
@@ -1954,6 +1990,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Forza del gruppo studente
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Contro diario {0} non ha alcun ineguagliata {1} entry
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Perizie
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Eventi formativi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Inserito Numero di Serie duplicato per l'articolo {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Una condizione per un Tipo di Spedizione
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Prego entra
@@ -1963,7 +2000,7 @@
 DocType: Sales Order,To Deliver and Bill,Da Consegnare e Fatturare
 DocType: Student Group,Instructors,Istruttori
 DocType: GL Entry,Credit Amount in Account Currency,Importo del credito Account Valuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} deve essere confermata
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} deve essere confermata
 DocType: Authorization Control,Authorization Control,Controllo Autorizzazioni
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Fila # {0}: Rifiutato Warehouse è obbligatoria per la voce respinto {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Pagamento
@@ -1982,11 +2019,11 @@
 DocType: Quotation Item,Actual Qty,Q.tà reale
 DocType: Sales Invoice Item,References,Riferimenti
 DocType: Quality Inspection Reading,Reading 10,Lettura 10
-DocType: Hub Settings,Hub Node,Nodo hub
+DocType: Hub Category,Hub Node,Nodo hub
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Hai inserito degli elementi duplicati . Si prega di correggere e riprovare .
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Associate
 DocType: Asset Movement,Asset Movement,Movimento Asset
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,Nuovo carrello
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,Nuovo carrello
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,L'articolo {0} non è un elemento serializzato
 DocType: SMS Center,Create Receiver List,Crea Elenco Ricezione
 DocType: Vehicle,Wheels,Ruote
@@ -1995,20 +2032,20 @@
 DocType: Production Planning Tool,Material Requests,Richieste di materiale
 DocType: Warranty Claim,Issue Date,Data di Emissione
 DocType: Activity Cost,Activity Cost,Costo attività
-DocType: Sales Invoice Timesheet,Timesheet Detail,Particolare timesheet
+DocType: Sales Invoice Timesheet,Timesheet Detail,Dettagli scheda attività
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Q.tà Consumata
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicazioni
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica che il pacchetto è una parte di questa consegna (solo Bozza)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Effettua Ricevuta di Pagamento
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Quantità per la voce {0} deve essere inferiore a {1}
-,Sales Invoice Trends,Fattura di vendita Tendenze
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Quantità per la voce {0} deve essere inferiore a {1}
+,Sales Invoice Trends,Andamento Fatture di vendita
 DocType: Leave Application,Apply / Approve Leaves,Applicare / Approva Leaves
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Per
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Per
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Può riferirsi fila solo se il tipo di carica è 'On Fila Indietro Importo ' o ' Indietro totale riga '
 DocType: Sales Order Item,Delivery Warehouse,Deposito di consegna
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Albero dei centri di costo finanziario.
 DocType: Serial No,Delivery Document No,Documento Consegna N.
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Si prega di impostare &#39;Conto / perdita di guadagno su Asset Disposal&#39; in compagnia {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Si prega di impostare &#39;Conto / perdita di guadagno su Asset Disposal&#39; in compagnia {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Ottenere elementi dal Acquisto Receipts
 DocType: Serial No,Creation Date,Data di Creazione
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},L'articolo {0} compare più volte nel Listino {1}
@@ -2019,11 +2056,12 @@
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Ha varianti
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Aggiorna risposta
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Hai già selezionato elementi da {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Hai già selezionato elementi da {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nome della distribuzione mensile
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,L&#39;ID batch è obbligatorio
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
-DocType: Purchase Invoice,Recurring Invoice,Fattura ricorrente
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Da alto a basso
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Selezionare prima il programma
 DocType: Patient Appointment,Patient Age,Età del paziente
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Gestione progetti
 DocType: Supplier,Supplier of Goods or Services.,Fornitore di beni o servizi.
@@ -2031,8 +2069,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Se non è impostato nel paziente per prenotare le spese di consultazione, è necessario utilizzare i conti di crediti di default."
 DocType: Vehicle Log,Fuel Price,Prezzo Carburante
 DocType: Budget,Budget,Budget
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Imposta aperta
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Un Bene Strumentale  deve essere un Bene Non di Magazzino
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Imposta aperta
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Un Bene Strumentale  deve essere un Bene Non di Magazzino
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Bilancio non può essere assegnato contro {0}, in quanto non è un conto entrate o uscite"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Raggiunto
 DocType: Student Admission,Application Form Route,Modulo di domanda di percorso
@@ -2046,12 +2084,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,L'articolo {0} non ha Numeri di Serie. Verifica l'Articolo Principale
 DocType: Maintenance Visit,Maintenance Time,Tempo di Manutenzione
 ,Amount to Deliver,Importo da consegnare
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Lo stesso oggetto è stato inserito più volte. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Il Data Terminologia di inizio non può essere anteriore alla data di inizio anno dell&#39;anno accademico a cui il termine è legata (Anno Accademico {}). Si prega di correggere le date e riprovare.
 DocType: Guardian,Guardian Interests,Custodi Interessi
 DocType: Naming Series,Current Value,Valore Corrente
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,esistono più esercizi per la data {0}. Si prega di impostare società l&#39;anno fiscale
 DocType: School Settings,Instructor Records to be created by,Istruttore Record da creare da
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} creato
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} creato
 DocType: Delivery Note Item,Against Sales Order,Contro Sales Order
 ,Serial No Status,Serial No Stato
 DocType: Payment Entry Reference,Outstanding,eccezionale
@@ -2062,10 +2101,10 @@
  deve essere maggiore o uguale a {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Questo si basa sui movimenti di magazzino. Vedere {0} per i dettagli
 DocType: Pricing Rule,Selling,Vendite
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Importo {0} {1} dedotto contro {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Importo {0} {1} dedotto contro {2}
 DocType: Employee,Salary Information,Informazioni stipendio
 DocType: Sales Person,Name and Employee ID,Nome e ID Dipendente
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,La Data di Scadenza non può essere antecedente alla Data di Registrazione
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,La Data di Scadenza non può essere antecedente alla Data di Registrazione
 DocType: Website Item Group,Website Item Group,Sito Gruppo Articolo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Dazi e tasse
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Inserisci Data di riferimento
@@ -2091,7 +2130,7 @@
 DocType: Issue,Resolution Details,Dettagli risoluzione
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Accantonamenti
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Criterio  di accettazione
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Si prega di inserire richieste materiale nella tabella di cui sopra
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Si prega di inserire richieste materiale nella tabella di cui sopra
 DocType: Item Attribute,Attribute Name,Nome Attributo
 DocType: BOM,Show In Website,Mostra Nel Sito Web
 DocType: Shopping Cart Settings,Show Quantity in Website,Mostra Quantità in Sito
@@ -2100,7 +2139,7 @@
 DocType: Item Reorder,Check in (group),Il check-in (gruppo)
 ,Qty to Order,Qtà da Ordinare
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","L&#39;account testa sotto responsabilità o di capitale, in cui sarà prenotato Utile / Perdita"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Diagramma di Gantt per tutte le attività.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Diagramma di Gantt per tutte le attività.
 DocType: Opportunity,Mins to First Response,Minuti per First Response
 DocType: Pricing Rule,Margin Type,Tipo di Margine
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} ore
@@ -2108,7 +2147,7 @@
 DocType: Appraisal,For Employee Name,Per Nome Dipendente
 DocType: Holiday List,Clear Table,Pulisci Tabella
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +98,Available slots,Slot disponibili
-DocType: C-Form Invoice Detail,Invoice No,Fattura n
+DocType: C-Form Invoice Detail,Invoice No,Fattura N
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +350,Make Payment,Effettua un  Pagamento
 DocType: Room,Room Name,Nome della stanza
 DocType: Prescription Duration,Prescription Duration,Durata della prescrizione
@@ -2121,35 +2160,35 @@
 DocType: Patient,Surgical History,Storia chirurgica
 DocType: Employee,Resignation Letter Date,Lettera di dimissioni Data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Regole dei prezzi sono ulteriormente filtrati in base alla quantità.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Impostare la data di unione per dipendente {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Impostare la data di unione per dipendente {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Importo totale di fatturazione (tramite Time Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ripetere Revenue clienti
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) deve avere il ruolo 'Approvatore Spese'
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Coppia
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Selezionare Distinta Materiali e Quantità per la  Produzione
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Selezionare Distinta Materiali e Quantità per la  Produzione
 DocType: Asset,Depreciation Schedule,piano di ammortamento
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Indirizzi e Contatti del Partner Vendite
 DocType: Bank Reconciliation Detail,Against Account,Previsione Conto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,La data di mezza giornata deve essere compresa da Data a Data
 DocType: Maintenance Schedule Detail,Actual Date,Data effettiva
 DocType: Item,Has Batch No,Ha lotto n.
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Fatturazione annuale: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Fatturazione annuale: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Tasse sui beni e servizi (GST India)
 DocType: Delivery Note,Excise Page Number,Accise Numero Pagina
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Società, da Data e fino ad oggi è obbligatoria"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Ottenga dalla consultazione
 DocType: Asset,Purchase Date,Data di acquisto
 DocType: Employee,Personal Details,Dettagli personali
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Si prega di impostare &#39;Asset Centro ammortamento dei costi&#39; in compagnia {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Si prega di impostare &#39;Asset Centro ammortamento dei costi&#39; in compagnia {0}
 ,Maintenance Schedules,Programmi di manutenzione
 DocType: Task,Actual End Date (via Time Sheet),Data di fine effettiva (da Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Importo {0} {1} contro {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Importo {0} {1} contro {2} {3}
 ,Quotation Trends,Tendenze di preventivo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Gruppo Articoli non menzionato nell'Articolo principale per l'Articolo {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Debito Per account deve essere un account di Credito
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Debito Per account deve essere un account di Credito
 DocType: Shipping Rule Condition,Shipping Amount,Importo spedizione
 DocType: Supplier Scorecard Period,Period Score,Punteggio periodo
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Aggiungi clienti
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Aggiungi clienti
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,In attesa di Importo
 DocType: Lab Test Template,Special,Speciale
 DocType: Purchase Invoice Item,Conversion Factor,Fattore di Conversione
@@ -2157,13 +2196,14 @@
 ,Vehicle Expenses,Spese del veicolo
 DocType: Serial No,Invoice Details,Dettagli della fattura
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Valore atteso dopo la vita utile deve essere maggiore o uguale a {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Inizia
+DocType: Hub Category,Hub Category,Categoria Hub
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Numero di veicoli
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,La data in cui la fattura ricorrente si concluderà
 DocType: Employee Loan,Loan Amount,Ammontare del prestito
 DocType: Program Enrollment,Self-Driving Vehicle,Autovettura
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Scorecard fornitore permanente
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Riga {0}: Distinta materiali non trovato per la voce {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Riga {0}: Distinta materiali non trovato per la voce {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Totale foglie assegnati {0} non può essere inferiore a foglie già approvati {1} per il periodo
 DocType: Journal Entry,Accounts Receivable,Conti esigibili
 ,Supplier-Wise Sales Analytics,Estensione statistiche di Vendita Fornitore
@@ -2174,7 +2214,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Corso di genitori (lasciare vuoto, se questo non fa parte del corso dei genitori)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Lasciare vuoto se considerato per tutti i tipi dipendenti
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuire oneri corrispondenti
-apps/erpnext/erpnext/hooks.py +131,Timesheets,schede attività
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Schede attività
 DocType: HR Settings,HR Settings,Impostazioni HR
 DocType: Salary Slip,net pay info,Informazioni retribuzione netta
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Questo valore viene aggiornato nell&#39;elenco dei prezzi di vendita predefinito.
@@ -2185,7 +2225,7 @@
 DocType: Patient,B Positive,B Positivo
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Quantità deve essere 1, poiche' si tratta di un Bene Strumentale. Si prega di utilizzare riga separata per quantita' multiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Lascia permesso blocco lista
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,L'abbr. non può essere vuota o spazio
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,L'abbr. non può essere vuota o spazio
 DocType: Patient Medical Record,Patient Medical Record,Registro medico paziente
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Gruppo di Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sportivo
@@ -2201,9 +2241,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Impossibile trovare il tasso di cambio per {0} a {1} per la data chiave {2}. Si prega di creare un record Exchange Exchange manualmente
 DocType: POS Profile,Price List,Listino Prezzi
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} è ora l'anno fiscale predefinito. Si prega di aggiornare il browser perché la modifica abbia effetto .
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Rimborsi spese
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Rimborsi spese
 DocType: Issue,Support,Post Vendita
 ,BOM Search,BOM Ricerca
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Pubblica &quot;in magazzino&quot; o &quot;non in magazzino&quot; su Hub sulla base di magazzino disponibile in questo magazzino.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Chiusura (apertura + totali)
 DocType: Vehicle,Fuel Type,Tipo di carburante
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Si prega di specificare la valuta in azienda
@@ -2215,16 +2256,16 @@
 DocType: Healthcare Settings,Remind Before,Ricorda prima
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Fattore di conversione Unità di Misurà è obbligatoria sulla riga {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Riferimento Tipo di documento deve essere uno dei ordini di vendita, fattura di vendita o diario"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Riferimento Tipo di documento deve essere uno dei ordini di vendita, fattura di vendita o diario"
 DocType: Salary Component,Deduction,Deduzioni
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Riga {0}: From Time To Time ed è obbligatoria.
 DocType: Stock Reconciliation Item,Amount Difference,importo Differenza
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Prezzo Articolo aggiunto per {0} in Listino Prezzi {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Prezzo Articolo aggiunto per {0} in Listino Prezzi {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Inserisci ID dipendente di questa persona di vendite
 DocType: Territory,Classification of Customers by region,Classificazione dei Clienti per regione
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Differenza L&#39;importo deve essere pari a zero
 DocType: Project,Gross Margin,Margine lordo
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Inserisci Produzione articolo prima
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Inserisci Produzione articolo prima
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Calcolato equilibrio estratto conto
 DocType: Normal Test Template,Normal Test Template,Modello di prova normale
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,utente disabilitato
@@ -2234,21 +2275,22 @@
 DocType: Salary Slip,Total Deduction,Deduzione totale
 ,Production Analytics,Analytics di produzione
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Questo è basato sulle transazioni contro questo paziente. Per dettagli vedere la sequenza temporale qui sotto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Costo Aggiornato
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Costo Aggiornato
 DocType: Employee,Date of Birth,Data Compleanno
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,L'articolo {0} è già stato restituito
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Anno Fiscale** rappresenta un anno contabile. Tutte le voci contabili e le altre operazioni importanti sono tracciati per **Anno Fiscale**.
 DocType: Opportunity,Customer / Lead Address,Indirizzo Cliente / Lead
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Impostazione Scorecard Fornitore
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Attenzione: certificato SSL non valido sull&#39;attaccamento {0}
-DocType: Student Admission,Eligibility,Eleggibilità
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Nome del piano di valutazione
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Attenzione: certificato SSL non valido sull&#39;attaccamento {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","I Leads ti aiutano ad incrementare il tuo business, aggiungi tutti i tuoi contatti come tuoi leads"
 DocType: Production Order Operation,Actual Operation Time,Tempo lavoro effettiva
 DocType: Authorization Rule,Applicable To (User),Applicabile a (Utente)
 DocType: Purchase Taxes and Charges,Deduct,Detrarre
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Descrizione Del Lavoro
 DocType: Student Applicant,Applied,Applicato
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Riaprire
 DocType: Sales Invoice Item,Qty as per Stock UOM,Quantità come da UOM Archivio
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Nome Guardian2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caratteri speciali tranne ""-"" ""."", ""#"", e ""/"" non consentito in denominazione serie"
@@ -2260,7 +2302,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Responsabile di produzione
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} è in garanzia fino a {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Split di consegna Nota in pacchetti.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Spedizioni
+apps/erpnext/erpnext/hooks.py +107,Shipments,Spedizioni
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Totale importo assegnato (Valuta della Società)
 DocType: Purchase Order Item,To be delivered to customer,Da consegnare al cliente
 DocType: BOM,Scrap Material Cost,Costo rottami Materiale
@@ -2282,8 +2324,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Impostazioni delle varianti dell&#39;elemento
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Seleziona Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Lasciare vuoto se considerato per tutti i reparti
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tipi di occupazione (permanente , contratti , ecc intern ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} è obbligatorio per la voce {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Tipi di occupazione (permanente , contratti , ecc intern ) ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} è obbligatorio per la voce {1}
 DocType: Process Payroll,Fortnightly,Quindicinale
 DocType: Currency Exchange,From Currency,Da Valuta
 DocType: Vital Signs,Weight (In Kilogram),Peso (in chilogrammo)
@@ -2306,8 +2348,8 @@
 DocType: Bank Guarantee,Bank Guarantee,Garanzia bancaria
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Si prega di cliccare su ' Generate Schedule ' per ottenere pianificazione
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Ci sono stati errori durante l&#39;eliminazione seguenti orari:
-DocType: Bin,Ordered Quantity,Ordinato Quantità
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","p. es. "" Costruire strumenti per i costruttori """
+DocType: Bin,Ordered Quantity,Quantità Ordinata
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","p. es. "" Costruire strumenti per i costruttori """
 DocType: Grading Scale,Grading Scale Intervals,Intervalli di classificazione di scala
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: La scrittura contabile {2} può essere effettuate solo in : {3}
 DocType: Production Order,In Process,In Process
@@ -2320,7 +2362,7 @@
 DocType: Activity Type,Default Billing Rate,Tariffa predefinita
 DocType: Fees,Include Payment,Includi il pagamento
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Gruppo Studenti creato.
-DocType: Sales Invoice,Total Billing Amount,Importo totale di fatturazione
+DocType: Sales Invoice,Total Billing Amount,Importo Totale di Fatturazione
 apps/erpnext/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py +17,There must be a default incoming Email Account enabled for this to work. Please setup a default incoming Email Account (POP/IMAP) and try again.,Ci deve essere un difetto in arrivo account e-mail abilitato per far funzionare tutto questo. Si prega di configurare un account e-mail di default in entrata (POP / IMAP) e riprovare.
 DocType: Healthcare Settings,Receivable Account,Conto Crediti
 apps/erpnext/erpnext/controllers/accounts_controller.py +553,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} è già {2}
@@ -2330,11 +2372,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Con pagamento di imposta
 DocType: Expense Claim Detail,Expense Claim Detail,Dettaglio Rimborso Spese
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICATO PER IL FORNITORE
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Seleziona account corretto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Seleziona account corretto
 DocType: Item,Weight UOM,Peso UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Stipendio Struttura dei dipendenti
 DocType: Patient,Blood Group,Gruppo Discendenza
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,In attesa
 DocType: Course,Course Name,Nome del corso
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Utenti che possono approvare le domande di permesso di un dipendente specifico
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Apparecchiature per ufficio
@@ -2353,7 +2394,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,I prezzi non verranno visualizzati se listino non è impostata
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Si prega di specificare un Paese per questo Tipo di Spedizione o controllare Spedizione in tutto il Mondo
 DocType: Stock Entry,Total Incoming Value,Totale Valore Incoming
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Debito A è richiesto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Debito A è richiesto
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Schede attività per tenere traccia del tempo, i costi e la fatturazione per attività fatta per tua squadra"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Acquisto Listino Prezzi
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Modelli delle variabili dei scorecard fornitori.
@@ -2363,19 +2404,22 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Pagamento Riconciliazione
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Si prega di selezionare il nome del Incharge persona
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tecnologia
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Totale non pagato: {0}
+DocType: Hub Settings,Unregister from Hub,Annullare la registrazione da Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Totale non pagato: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Pagina web
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Lettera di Offerta
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generare richieste di materiali (MRP) e ordini di produzione.
 DocType: Supplier Scorecard,Supplier Score,Punteggio del fornitore
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +76,Total Invoiced Amt,Totale fatturato Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +76,Total Invoiced Amt,Importo Totale Fatturato
 DocType: Supplier,Warn RFQs,Avvisa RFQ
 DocType: BOM,Conversion Rate,Tasso di conversione
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Ricerca prodotto
 DocType: Physician Schedule Time Slot,To Time,Per Tempo
 DocType: Authorization Rule,Approving Role (above authorized value),Approvazione di ruolo (di sopra del valore autorizzato)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Il conto in Accredita a  deve essere Conto Fornitore
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM ricorsivo: {0} non può essere un padre o un figlio di {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Si prega di scegliere l&#39;ammissione all&#39;allievo che è obbligatoria per il candidato scolastico pagato
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM ricorsivo: {0} non può essere un padre o un figlio di {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Seleziona un listino prezzi per pubblicare i prezzi
 DocType: Production Order Operation,Completed Qty,Q.tà Completata
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Per {0}, solo gli account di debito possono essere collegati contro un'altra voce di credito"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Prezzo di listino {0} è disattivato
@@ -2387,38 +2431,39 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} numeri di serie necessari per la voce {1}. Lei ha fornito {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Corrente Tasso di Valorizzazione
 DocType: Item,Customer Item Codes,Codici Voce clienti
+DocType: Training Event,Advance,Avanzare
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,per fare di nuovo ricorrenti.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Guadagno Exchange / Perdita
 DocType: Opportunity,Lost Reason,Motivo della perdita
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nuovo indirizzo
 DocType: Quality Inspection,Sample Size,Dimensione del campione
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Si prega di inserire prima il Documento di Ricevimento
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Tutti gli articoli sono già stati fatturati
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Si prega di specificare una valida &#39;Dalla sentenza n&#39;
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',Si prega di specificare una valida &#39;Dalla sentenza n&#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Ulteriori centri di costo possono essere fatte in Gruppi ma le voci possono essere fatte contro i non-Gruppi
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Utenti e Permessi
 DocType: Vehicle Log,VLOG.,VIDEO BLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Ordini produzione creata: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Ordini produzione creata: {0}
 DocType: Branch,Branch,Ramo
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Stampa e Branding
 DocType: Company,Total Monthly Sales,Totale vendite mensili
 DocType: Bin,Actual Quantity,Quantità reale
 DocType: Shipping Rule,example: Next Day Shipping,esempio: Spedizione il Giorno Successivo
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} non trovato
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},L&#39;abbonamento è stato {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},L&#39;abbonamento è stato {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Programma di programmazione delle tasse
 DocType: Fee Schedule Program,Student Batch,Batch Student
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,selezionare * da `tabVital Signs` dove patient = &#39;{0}&#39; ordinare da signs_date desc limit 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Crea Studente
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Min Grado
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Sei stato invitato a collaborare al progetto: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Medico non disponibile su {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Sei stato invitato a collaborare al progetto: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Medico non disponibile su {0}
 DocType: Leave Block List Date,Block Date,Data Blocco
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Aggiungi l&#39;ID abbonamento al campo personalizzato nel doctype {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Nota di consegna del fornitore
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Applica ora
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Applica ora
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Quantità effettiva {0} / Quantità attesa {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-commerce GSTIN
 DocType: Sales Order,Not Delivered,Non Consegnati
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,La data prevista non può essere prima della data di transazione
 ,Bank Clearance Summary,Sintesi Liquidazione Banca
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Creare e gestire giornalieri , settimanali e mensili digerisce email ."
 DocType: Appraisal Goal,Appraisal Goal,Obiettivo di Valutazione
@@ -2426,12 +2471,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,edifici
 DocType: Fee Schedule,Fee Structure,Fee Struttura
 DocType: Timesheet Detail,Costing Amount,Costing Importo
-DocType: Student Admission,Application Fee,Tassa d&#39;iscrizione
+DocType: Student Admission Program,Application Fee,Tassa d&#39;iscrizione
 DocType: Process Payroll,Submit Salary Slip,Presenta Busta Paga
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Sconto Max per la voce {0} {1} %
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Sconto Max per la voce {0} {1} %
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importazione Collettiva
 DocType: Sales Partner,Address & Contacts,Indirizzi & Contatti
 DocType: SMS Log,Sender Name,Nome mittente
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Ordina per Criteri
 DocType: POS Profile,[Select],[Seleziona]
 DocType: Vital Signs,Blood Pressure (diastolic),Pressione sanguigna (diastolica)
 DocType: SMS Log,Sent To,Inviato A
@@ -2440,7 +2486,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Successivo Contattaci data non puó essere in passato
 DocType: Company,For Reference Only.,Per riferimento soltanto.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Medico {0} non disponibile in {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Seleziona il numero di lotto
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Seleziona il numero di lotto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Non valido {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,Riferimento Inv
@@ -2456,15 +2502,15 @@
 DocType: Normal Test Items,Require Result Value,Richiedi valore di risultato
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Caso No. Non può essere 0
 DocType: Item,Show a slideshow at the top of the page,Visualizzare una presentazione in cima alla pagina
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Distinte Materiali
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,negozi
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Distinte Materiali
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,negozi
 DocType: Project Type,Projects Manager,Responsabile Progetti
 DocType: Serial No,Delivery Time,Tempo Consegna
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Invecchiamento Basato Su
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Appuntamento annullato
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Appuntamento annullato
 DocType: Item,End of Life,Fine Vita
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,viaggi
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Nessuna struttura attiva o stipendio predefinito trovato per dipendente {0} per le date indicate
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,viaggi
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Nessuna struttura attiva o stipendio predefinito trovato per dipendente {0} per le date indicate
 DocType: Leave Block List,Allow Users,Consentire Utenti
 DocType: Purchase Order,Customer Mobile No,Clienti mobile No
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Periodico
@@ -2473,12 +2519,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Aggiorna il Costo
 DocType: Item Reorder,Item Reorder,Articolo riordino
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Visualizza foglio paga
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Material Transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Material Transfer
 DocType: Fees,Send Payment Request,Invia richiesta di pagamento
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Specificare le operazioni, costi operativi e dare una gestione unica di no a vostre operazioni."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Questo documento è oltre il limite da {0} {1} per item {4}. State facendo un altro {3} contro lo stesso {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Si prega di impostare ricorrenti dopo il salvataggio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,conto importo Selezionare cambiamento
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,conto importo Selezionare cambiamento
 DocType: Purchase Invoice,Price List Currency,Prezzo di listino Valuta
 DocType: Naming Series,User must always select,L&#39;utente deve sempre selezionare
 DocType: Stock Settings,Allow Negative Stock,Permetti Scorte Negative
@@ -2498,7 +2544,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Dipendente
 DocType: Sample Collection,Collected Time,Tempo raccolto
 DocType: Company,Sales Monthly History,Vendite storiche mensili
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Seleziona Batch
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Seleziona Batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} è completamente fatturato
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Segni vitali
 DocType: Training Event,End Time,Ora fine
@@ -2506,16 +2552,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Deduzioni di pagamento o la perdita
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Condizioni contrattuali standard per la vendita o di acquisto.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Raggruppa per Voucher
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Sei sicuro di voler annullare questo appuntamento?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,pipeline di vendita
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Si prega di impostare account predefinito di stipendio componente {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Richiesto On
 DocType: Rename Tool,File to Rename,File da rinominare
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Seleziona BOM per la voce nella riga {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Seleziona BOM per la voce nella riga {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},L&#39;account {0} non corrisponde con la società {1} in modalità di account: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},BOM specificato {0} non esiste per la voce {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programma di manutenzione {0} deve essere cancellato prima di annullare questo ordine di vendita
+DocType: POS Profile,Applicable for Users,Applicabile agli Utenti
 DocType: Notification Control,Expense Claim Approved,Rimborso Spese Approvato
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Foglio paga del dipendente {0} già creato per questo periodo
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Foglio paga del dipendente {0} già creato per questo periodo
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Farmaceutico
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Costo dei beni acquistati
 DocType: Selling Settings,Sales Order Required,Ordine di Vendita richiesto
@@ -2539,6 +2587,7 @@
 DocType: Offer Letter,Accepted,Accettato
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Organizzazione
 DocType: BOM Update Tool,BOM Update Tool,Strumento di aggiornamento BOM
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Account partito non specificato, impostare l&#39;account partito di default in azienda"
 DocType: SG Creation Tool Course,Student Group Name,Nome gruppo Student
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Creazione di tariffe
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Assicurati di voler cancellare tutte le transazioni di questa azienda. I dati anagrafici rimarranno così com&#39;è. Questa azione non può essere annullata.
@@ -2547,29 +2596,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) non può essere superiore alla quantità pianificata ({2}) nell'ordine di produzione {3}
 DocType: Shipping Rule,Shipping Rule Label,Etichetta Tipo di Spedizione
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum utente
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Materie prime non può essere vuoto.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Impossibile aggiornare magazzino, fattura contiene articoli di trasporto di goccia."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Materie prime non può essere vuoto.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Impossibile aggiornare magazzino, fattura contiene articoli di trasporto di goccia."
 DocType: Lab Test Sample,Lab Test Sample,Campione di prova del laboratorio
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Breve diario
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Non è possibile cambiare tariffa se la distinta (BOM) è già assegnata a un articolo
+DocType: Restaurant,Invoice Series Prefix,Prefisso della serie di fatture
 DocType: Employee,Previous Work Experience,Precedente Esperienza Lavoro
 DocType: Stock Entry,For Quantity,Per Quantità
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Inserisci pianificato quantità per la voce {0} alla riga {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Inserisci pianificato quantità per la voce {0} alla riga {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} non è confermato
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Le richieste di articoli.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Ordine di produzione separata verrà creato per ogni buon prodotto finito.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} deve essere negativo nel documento di reso
 ,Minutes to First Response for Issues,Minuti per la prima risposta alla controversia
 DocType: Purchase Invoice,Terms and Conditions1,Termini e Condizioni
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,Il nome dell&#39;istituto per il quale si sta impostando questo sistema.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,Il nome dell&#39;istituto per il quale si sta impostando questo sistema.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Registrazione contabile congelato fino a questa data, nessuno può / Modifica voce eccetto ruolo specificato di seguito."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Si prega di salvare il documento prima di generare il programma di manutenzione
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Ultimo prezzo aggiornato in tutte le BOM
 DocType: Fee Schedule,Successful,Riuscito
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Stato del progetto
 DocType: UOM,Check this to disallow fractions. (for Nos),Seleziona per disabilitare frazioni. (per NOS)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,sono stati creati i seguenti ordini di produzione:
-DocType: Student Admission,Naming Series (for Student Applicant),Denominazione Serie (per studenti candidati)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,sono stati creati i seguenti ordini di produzione:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Denominazione Serie (per studenti candidati)
 DocType: Delivery Note,Transporter Name,Trasportatore Nome
 DocType: Authorization Rule,Authorized Value,Valore Autorizzato
 DocType: BOM,Show Operations,Mostra Operations
@@ -2593,7 +2643,7 @@
 ,Employees working on a holiday,I dipendenti che lavorano in un giorno festivo
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Segna come Presente
 DocType: Project,% Complete Method,% Completamento
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Droga
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Droga
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},La data di inizio manutenzione non può essere precedente alla consegna del Serial No {0}
 DocType: Production Order,Actual End Date,Data di fine effettiva
 DocType: BOM,Operating Cost (Company Currency),Costi di funzionamento (Società di valuta)
@@ -2611,19 +2661,20 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Approvazione utente non può essere uguale all'utente la regola è applicabile ad
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Valore base (come da UOM)
 DocType: SMS Log,No of Requested SMS,Num. di SMS richiesto
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Lascia senza pagare non corrisponde con i record Leave Application approvati
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Lascia senza pagare non corrisponde con i record Leave Application approvati
 DocType: Campaign,Campaign-.####,Campagna . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Prossimi passi
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Si prega di fornire gli elementi specificati ai migliori prezzi possibili
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Crea Fattura
 DocType: Selling Settings,Auto close Opportunity after 15 days,Chiudi automaticamente Opportunità dopo 15 giorni
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Gli ordini di acquisto non sono consentiti per {0} a causa di una posizione di scorecard di {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Gli ordini di acquisto non sono consentiti per {0} a causa di una posizione di scorecard di {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,fine Anno
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Data fine contratto deve essere maggiore di Data di giunzione
 DocType: Vital Signs,Nutrition Values,Valori nutrizionali
 DocType: Lab Test Template,Is billable,È fatturabile
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Sia &quot;Physician Schedule&quot; che Time per Appointment devono essere impostati per Dr {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un distributore / agenzia / affiliato / rivenditore che vende i prodotti delle aziende per una commissione.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} contro ordine di acquisto {1}
 DocType: Patient,Patient Demographics,Demografia del paziente
@@ -2673,7 +2724,6 @@
  10. Aggiungi o dedurre: Se si desidera aggiungere o detrarre l'imposta."
 DocType: Homepage,Homepage,Homepage
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Seleziona medico ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',Aggiorna tabConsultation set invoice = &#39;{0}&#39; dove name = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,RECD Quantità
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Records Fee Creato - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Categoria account
@@ -2685,14 +2735,14 @@
 DocType: Asset,Manual,Manuale
 DocType: Salary Component Account,Salary Component Account,Conto Stipendio Componente
 DocType: Global Defaults,Hide Currency Symbol,Nascondi Simbolo Valuta
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","p. es. Banca, Bonifico, Contanti, Carta di credito"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","p. es. Banca, Bonifico, Contanti, Carta di credito"
 DocType: Lead Source,Source Name,Source Name
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","La pressione sanguigna normale in un adulto è di circa 120 mmHg sistolica e 80 mmHg diastolica, abbreviata &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Nota di Credito
 DocType: Warranty Claim,Service Address,Service Indirizzo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Mobili e Infissi
 DocType: Item,Manufacture,Produzione
-apps/erpnext/erpnext/utilities/user_progress.py +24,Setup Company,Impresa di configurazione
+apps/erpnext/erpnext/utilities/user_progress.py +24,Setup Company,Configura società
 ,Lab Test Report,Lab Test Report
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Si prega di compilare prima il DDT
 DocType: Student Applicant,Application Date,Data di applicazione
@@ -2704,16 +2754,16 @@
 DocType: Patient,Occupation,Occupazione
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Riga {0} : Data di inizio deve essere precedente Data di fine
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Totale (Quantità)
-DocType: Sales Invoice,This Document,Questo documento
 DocType: Installation Note Item,Installed Qty,Qtà installata
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Ciò potrebbe essere dovuto a alcuni indirizzi email non validi nel
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Hai aggiunto
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Formazione Risultato
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Formazione Risultato
 DocType: Purchase Invoice,Is Paid,È pagato
 DocType: Salary Structure,Total Earning,Guadagnare totale
 DocType: Purchase Receipt,Time at which materials were received,Ora in cui sono stati ricevuti i materiali
 DocType: Stock Ledger Entry,Outgoing Rate,Tasso di uscita
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Ramo Organizzazione master.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Ramo Organizzazione master.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,oppure
 DocType: Sales Order,Billing Status,Stato Fatturazione
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Segnala un problema
@@ -2728,7 +2778,8 @@
 DocType: Notification Control,Sales Order Message,Sales Order Messaggio
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Impostare i valori predefiniti , come Società , valuta , corrente anno fiscale , ecc"
 DocType: Payment Entry,Payment Type,Tipo di pagamento
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Seleziona un batch per l&#39;articolo {0}. Impossibile trovare un unico batch che soddisfi questo requisito
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Seleziona un batch per l&#39;articolo {0}. Impossibile trovare un unico batch che soddisfi questo requisito
+DocType: Hub Category,Parent Category,Categoria Parent
 DocType: Process Payroll,Select Employees,Selezionare Dipendenti
 DocType: Opportunity,Potential Sales Deal,Deal potenziale di vendita
 DocType: Complaint,Complaints,"Denunce, contestazioni"
@@ -2765,7 +2816,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identificazione del pacchetto per la consegna (per la stampa)
 DocType: Bin,Reserved Quantity,Riservato Quantità
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Inserisci indirizzo email valido
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Seleziona un elemento nel carrello
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Seleziona un elemento nel carrello
 DocType: Landed Cost Voucher,Purchase Receipt Items,Acquistare oggetti Receipt
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Personalizzazione dei moduli
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,arretrato
@@ -2775,15 +2826,15 @@
 DocType: Payment Request,Amount in customer's currency,Importo nella valuta del cliente
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Consegna
 DocType: Stock Reconciliation Item,Current Qty,Quantità corrente
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Aggiungi Fornitori
+DocType: Restaurant Menu,Restaurant Menu,Ristorante Menu
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,prev
 DocType: Appraisal Goal,Key Responsibility Area,Area Responsabilità Chiave
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","I lotti degli studenti aiutano a tenere traccia di presenza, le valutazioni e le tasse per gli studenti"
 DocType: Payment Entry,Total Allocated Amount,Totale importo assegnato
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Imposta l&#39;account di inventario predefinito per l&#39;inventario perpetuo
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Imposta l&#39;account di inventario predefinito per l&#39;inventario perpetuo
 DocType: Item Reorder,Material Request Type,Tipo di richiesta materiale
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural diario per gli stipendi da {0} a {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage è pieno, non ha salvato"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage è pieno, non ha salvato"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Riga {0}: UOM fattore di conversione è obbligatoria
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Capacità della camera
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Rif
@@ -2822,16 +2873,18 @@
 DocType: Project,Task Completion,Completamento dell'attività
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Non in Stock
 DocType: Appraisal,HR User,HR utente
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Tasse e oneri dedotti
-apps/erpnext/erpnext/hooks.py +129,Issues,Controversie
+apps/erpnext/erpnext/hooks.py +138,Issues,Controversie
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Stato deve essere uno dei {0}
 DocType: Sales Invoice,Debit To,Addebito a
+DocType: Restaurant Menu Item,Restaurant Menu Item,Menu del menu del ristorante
 DocType: Delivery Note,Required only for sample item.,Richiesto solo per la voce di esempio.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Q.tà reale post-transazione
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Nessun slittamento di stipendio trovato tra {0} e {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Nessun slittamento di stipendio trovato tra {0} e {1}
 ,Pending SO Items For Purchase Request,Elementi in sospeso così per Richiesta di Acquisto
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Ammissioni di studenti
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} è disabilitato
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Ammissioni di studenti
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} è disabilitato
 DocType: Supplier,Billing Currency,Fatturazione valuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Extra Large
@@ -2854,6 +2907,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Si prega di citare nessuna delle visite richieste
 DocType: Stock Settings,Default Valuation Method,Metodo di valorizzazione predefinito
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,tassa
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Aggiornamento in corso. Potrebbe volerci un po &#39;.
 DocType: Vehicle Log,Fuel Qty,Quantità di carburante
 DocType: Production Order Operation,Planned Start Time,Ora di inizio prevista
 DocType: Course,Assessment,Valutazione
@@ -2869,7 +2923,7 @@
 DocType: Price List,Price List Master,Listino Principale
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Tutte le transazioni di vendita possono essere etichettati contro più persone ** ** di vendita in modo da poter impostare e monitorare gli obiettivi.
 ,S.O. No.,S.O. No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Si prega di creare il Cliente dal Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Si prega di creare il Cliente dal Lead {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Selezionare Paziente
 DocType: Price List,Applicable for Countries,Applicabile per i paesi
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Nome del parametro
@@ -2912,27 +2966,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,Dettagli Fattura Fornitore
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Expense / account Differenza ({0}) deve essere un 'utile o perdita' conto
 DocType: Project,Copied From,Copiato da
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Nome errore: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Carenza
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Nome errore: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,Carenza
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} non è associato con {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Assistenza per dipendente {0} è già contrassegnata
 DocType: Packing Slip,If more than one package of the same type (for print),Se più di un pacchetto dello stesso tipo (per la stampa)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Impostare il cliente predefinito in Impostazioni ristorante
 ,Salary Register,stipendio Register
 DocType: Warehouse,Parent Warehouse,Magazzino Parent
 DocType: C-Form Invoice Detail,Net Total,Totale Netto
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},La BOM di default non è stata trovata per l&#39;oggetto {0} e il progetto {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},La BOM di default non è stata trovata per l&#39;oggetto {0} e il progetto {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Definire i vari tipi di prestito
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Importo Dovuto
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Tempo (in minuti)
 DocType: Project Task,Working,Lavorando
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Code Giacenze (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Anno finanziario
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Anno finanziario
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} non appartiene alla società {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,Impossibile risolvere la funzione di valutazione dei criteri per {0}. Assicurarsi che la formula sia valida.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Costo come in
 DocType: Healthcare Settings,Out Patient Settings,Impostazioni paziente
 DocType: Account,Round Off,Arrotondare
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,La quantità deve essere positiva
 ,Requested Qty,richiesto Quantità
 DocType: Tax Rule,Use for Shopping Cart,Uso per Carrello
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Valore {0} per l&#39;attributo {1} non esiste nella lista della voce valida Attributo Valori per la voce {2}
@@ -2941,7 +2997,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Spese saranno distribuiti proporzionalmente basate su qty voce o importo, secondo la vostra selezione"
 DocType: Maintenance Visit,Purposes,Scopi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Atleast un elemento deve essere introdotto con quantità negativa nel documento ritorno
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Aggiungere corsi
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operazione {0} più di tutte le ore di lavoro disponibili a workstation {1}, abbattere l&#39;operazione in più operazioni"
 ,Requested,richiesto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Nessun Commento
@@ -2953,6 +3008,8 @@
 DocType: Employee Loan,Repaid/Closed,Rimborsato / Chiuso
 DocType: Item,Total Projected Qty,Totale intermedio Quantità proiettata
 DocType: Monthly Distribution,Distribution Name,Nome della Distribuzione
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Fornitore&gt; Tipo Fornitore
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Tasso di valutazione non trovato per l&#39;elemento {0}, che è necessario per le voci di contabilità per {1} {2}. Se l&#39;elemento sta trattando come elemento di tasso di valutazione zero nel {1}, si prega di menzionarlo nella tabella {1} Item. Altrimenti, crea un&#39;operazione di transazione in arrivo per la voce di valutazione di voce o di menzione nell&#39;annotazione dell&#39;articolo e prova quindi a inviare / annullare questa voce"
 DocType: Course,Course Code,Codice del corso
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Controllo qualità richiesta per la voce {0}
 DocType: POS Settings,Use POS in Offline Mode,Utilizza POS in modalità Offline
@@ -2963,14 +3020,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Gestire territorio ad albero
 DocType: Journal Entry Account,Sales Invoice,Fattura di Vendita
 DocType: Journal Entry Account,Party Balance,Saldo del Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,Si prega di selezionare Applica sconto su
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Si prega di selezionare Applica sconto su
 DocType: Company,Default Receivable Account,Account Crediti Predefinito
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Crea Banca Entry per il salario totale pagato per i criteri sopra selezionati
 DocType: Physician,Physician Schedule,Schedule del medico
 DocType: Purchase Invoice,Deemed Export,Deemed Export
 DocType: Stock Entry,Material Transfer for Manufacture,Trasferimento materiali  per Produzione
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Percentuale di sconto può essere applicato sia contro un listino prezzi o per tutti Listino.
-DocType: Purchase Invoice,Half-yearly,Semestrale
+DocType: Subscription,Half-yearly,Semestrale
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Voce contabilità per giacenza
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Hai già valutato i criteri di valutazione {}.
@@ -2999,13 +3056,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Extra Small
 DocType: Company,Standard Template,Template Standard
 DocType: Training Event,Theory,Teoria
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Attenzione : Materiale Qty richiesto è inferiore minima quantità
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Attenzione : Materiale Qty richiesto è inferiore minima quantità
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Il Conto {0} è congelato
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entità Legale / Controllata con un grafico separato di conti appartenenti all'organizzazione.
 DocType: Payment Request,Mute Email,Email muta
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Prodotti alimentari , bevande e tabacco"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Posso solo effettuare il pagamento non ancora fatturate contro {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Tasso Commissione non può essere superiore a 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Posso solo effettuare il pagamento non ancora fatturate contro {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Tasso Commissione non può essere superiore a 100
 DocType: Stock Entry,Subcontract,Conto lavoro
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Si prega di inserire {0} prima
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Nessuna replica da
@@ -3023,10 +3080,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Colore
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Criteri di valutazione del Piano
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Impedire gli ordini di acquisto
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,suscettibile
 DocType: Patient Appointment,Scheduled,Pianificate
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Richiesta di offerta.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Impostare il sistema di denominazione dei dipendenti in risorse umane&gt; Impostazioni HR
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Si prega di selezionare la voce dove &quot;è articolo di&quot; è &quot;No&quot; e &quot;Is Voce di vendita&quot; è &quot;Sì&quot;, e non c&#39;è nessun altro pacchetto di prodotti"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Seleziona cliente
 DocType: Student Log,Academic,Accademico
 DocType: Patient,Personal and Social History,Storia personale e sociale
 DocType: Fee Schedule,Fee Breakup for each student,Scomposizione per ogni studente
@@ -3036,7 +3094,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Tasso di Valorizzazione
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,diesel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Listino Prezzi Valuta non selezionati
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Listino Prezzi Valuta non selezionati
 apps/erpnext/erpnext/config/healthcare.py +46,Results,risultati
 ,Student Monthly Attendance Sheet,Presenze mensile Scheda
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Employee {0} ha già presentato domanda di {1} tra {2} e {3}
@@ -3051,7 +3109,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Gestire punti vendita
 DocType: Quality Inspection,Inspection Type,Tipo di ispezione
 DocType: Fee Validity,Visited yet,Visitato ancora
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Magazzini con transazione esistenti non possono essere convertiti in gruppo.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Magazzini con transazione esistenti non possono essere convertiti in gruppo.
 DocType: Assessment Result Tool,Result HTML,risultato HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Scade il
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Aggiungere studenti
@@ -3073,12 +3131,12 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Per la comodità dei clienti, questi codici possono essere utilizzati in formati di stampa, come fatture e Documenti di Trasporto"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Nome suplier
 apps/erpnext/erpnext/accounts/report/financial_statements.py +152,Could not retrieve information for {0}.,Impossibile recuperare le informazioni per {0}.
-DocType: Sales Invoice,Time Sheet List,Lista schedule
+DocType: Sales Invoice,Time Sheet List,Lista schede attività
 DocType: Employee,You can enter any date manually,È possibile immettere qualsiasi data manualmente
 DocType: Healthcare Settings,Result Printed,Risultato Stampato
 DocType: Asset Category Account,Depreciation Expense Account,Ammortamento spese account
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Periodo Di Prova
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Visualizza {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Visualizza {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Solo i nodi foglia sono ammessi nelle transazioni
 DocType: Expense Claim,Expense Approver,Responsabile Spese
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Riga {0}: Advance contro il Cliente deve essere di credito
@@ -3089,7 +3147,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Per Data Ora
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Orari del corso cancellato:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,I registri per il mantenimento dello stato di consegna sms
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Imposta target di vendita
 DocType: Accounts Settings,Make Payment via Journal Entry,Effettua il pagamento tramite Registrazione Contabile
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Stampato su
 DocType: Item,Inspection Required before Delivery,Ispezione richiesta prima della consegna
@@ -3097,7 +3154,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Attività in sospeso
 DocType: Patient Appointment,Reminded,ricordato
 DocType: Patient,PID-,PId-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,La tua organizzazione
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,La tua organizzazione
 DocType: Fee Component,Fees Category,tasse Categoria
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Inserisci la data alleviare .
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
@@ -3109,7 +3166,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Riordina Level
 DocType: Company,Chart Of Accounts Template,Modello del Piano dei Conti
 DocType: Attendance,Attendance Date,Data Presenza
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Prezzo Articolo aggiornato per {0} nel Listino {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Prezzo Articolo aggiornato per {0} nel Listino {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Stipendio rottura basato sul guadagno e di deduzione.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Account con nodi figlio non può essere convertito in libro mastro
 DocType: Purchase Invoice Item,Accepted Warehouse,Magazzino accettazione
@@ -3125,19 +3182,20 @@
 ,Employee Birthday,Compleanno Dipendente
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Studente Batch presenze Strumento
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,limite Crossed
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Pianificato Upto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,capitale a rischio
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Un termine accademico con questo &#39;Anno Accademico&#39; {0} e &#39;Term Nome&#39; {1} esiste già. Si prega di modificare queste voci e riprovare.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Poiché esistono transazioni esistenti rispetto all'oggetto {0}, non è possibile modificare il valore di {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Poiché esistono transazioni esistenti rispetto all'oggetto {0}, non è possibile modificare il valore di {1}"
 DocType: UOM,Must be Whole Number,Deve essere un Numero Intero
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nuove ferie attribuiti (in giorni)
 DocType: Purchase Invoice,Invoice Copy,Copia fattura
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serial No {0} non esiste
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Deposito Cliente (opzionale)
 DocType: Pricing Rule,Discount Percentage,Percentuale di sconto
-DocType: Payment Reconciliation Invoice,Invoice Number,Numero di fattura
+DocType: Payment Reconciliation Invoice,Invoice Number,Numero Fattura
 DocType: Shopping Cart Settings,Orders,Ordini
 DocType: Employee Leave Approver,Leave Approver,Responsabile Ferie
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Seleziona un batch
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Seleziona un batch
 DocType: Assessment Group,Assessment Group Name,Nome gruppo di valutazione
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materiale trasferito per Produzione
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Un utente con ruolo di ""Responsabile Spese"""
@@ -3152,7 +3210,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Entrata Periodo di chiusura
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Seleziona Dipartimento ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Centro di costo con le transazioni esistenti non può essere convertito in gruppo
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Importo {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Importo {0} {1} {2} {3}
 DocType: Account,Depreciation,ammortamento
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fornitore(i)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Impiegato presenze Strumento
@@ -3163,10 +3221,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,Le voci di pagamento {0} sono non-linked
 DocType: GL Entry,Voucher No,Voucher No
 ,Lead Owner Efficiency,Efficienza del proprietario del cavo
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Più popolare
 DocType: Leave Allocation,Leave Allocation,Lascia Allocazione
 DocType: Payment Request,Recipient Message And Payment Details,Destinatario del Messaggio e Modalità di Pagamento
 DocType: Training Event,Trainer Email,Trainer-mail
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Richieste di materiale {0} creato
+DocType: Restaurant Reservation,No of People,No di persone
 DocType: Production Planning Tool,Include sub-contracted raw materials,Includere le materie prime in subappalto
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Template di termini o di contratto.
 DocType: Purchase Invoice,Address and Contact,Indirizzo e contatto
@@ -3175,10 +3235,11 @@
 DocType: Supplier,Last Day of the Next Month,Ultimo giorno del mese prossimo
 DocType: Support Settings,Auto close Issue after 7 days,Chiudi la controversia automaticamente dopo 7 giorni
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Ferie non possono essere assegnati prima {0}, come equilibrio congedo è già stato inoltrato carry-in futuro record di assegnazione congedo {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: La data scadenza / riferimento supera i giorni ammessi per il credito dei clienti da {0} giorno (i)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: La data scadenza / riferimento supera i giorni ammessi per il credito dei clienti da {0} giorno (i)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Richiedente
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINALE PER IL RECIPIENTE
 DocType: Asset Category Account,Accumulated Depreciation Account,Conto per il fondo ammortamento
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Questa email è autogenerata
 DocType: Stock Settings,Freeze Stock Entries,Congela scorta voci
 DocType: Program Enrollment,Boarding Student,Studente di imbarco
 DocType: Asset,Expected Value After Useful Life,Valore atteso After Life utile
@@ -3186,7 +3247,7 @@
 DocType: Activity Cost,Billing Rate,Fatturazione Tasso
 ,Qty to Deliver,Qtà di Consegna
 ,Stock Analytics,Analytics Archivio
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Le operazioni non possono essere lasciati in bianco
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Le operazioni non possono essere lasciati in bianco
 DocType: Maintenance Visit Purpose,Against Document Detail No,Per Dettagli Documento N
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Tipo Partner è obbligatorio
 DocType: Quality Inspection,Outgoing,In partenza
@@ -3208,7 +3269,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Selezionare manualmente gli studenti per il gruppo basato sulle attività
 DocType: Journal Entry,User Remark,Osservazioni dell'utente
 DocType: Lead,Market Segment,Segmento di Mercato
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},L'Importo versato non può essere maggiore del totale importo dovuto negativo {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},L'Importo versato non può essere maggiore del totale importo dovuto negativo {0}
 DocType: Supplier Scorecard Period,Variables,variabili
 DocType: Employee Internal Work History,Employee Internal Work History,Storia lavorativa Interna del Dipendente
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Chiusura (Dr)
@@ -3227,7 +3288,7 @@
 DocType: Payment Request,Reference Details,Riferimento Dettagli
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Il valore atteso dopo la durata utile deve essere inferiore all' importo di acquisto lordo
 DocType: Sales Invoice Item,Available Qty at Warehouse,Quantità Disponibile a magazzino
-apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,importo fatturato
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Importo Fatturato
 DocType: Asset,Double Declining Balance,Doppia valori residui
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +179,Closed order cannot be cancelled. Unclose to cancel.,ordine chiuso non può essere cancellato. Unclose per annullare.
 DocType: Patient Relation,Father,Padre
@@ -3237,21 +3298,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Ricevi aggiornamenti
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Il conto {2} non appartiene alla società {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Richiesta materiale {0} è stato annullato o interrotto
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Lascia Gestione
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Lascia Gestione
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Raggruppa per Conto
 DocType: Sales Order,Fully Delivered,Completamente Consegnato
 DocType: Lead,Lower Income,Reddito più basso
+DocType: Restaurant Order Entry,Current Order,Ordine attuale
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Magazzino di origine e di destinazione non possono essere uguali per rigo {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Account La differenza deve essere un account di tipo attività / passività, dal momento che questo Stock riconciliazione è una voce di apertura"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Importo erogato non può essere superiore a prestito Importo {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Vai a Programmi
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Numero ordine di acquisto richiesto per la voce {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Ordine di produzione non ha creato
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Ordine di produzione non ha creato
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',' Dalla Data' deve essere successivo a 'Alla Data'
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Impossibile cambiare status di studente {0} è collegata con l&#39;applicazione studente {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Impossibile cambiare status di studente {0} è collegata con l&#39;applicazione studente {1}
 DocType: Asset,Fully Depreciated,completamente ammortizzato
 ,Stock Projected Qty,Qtà Prevista Giacenza
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Cliente {0} non appartiene a proiettare {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Cliente {0} non appartiene a proiettare {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Marcata presenze HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Le quotazioni sono proposte, offerte che hai inviato ai tuoi clienti"
 DocType: Sales Order,Customer's Purchase Order,Ordine di Acquisto del Cliente
@@ -3262,8 +3324,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Si prega di impostare Numero di ammortamenti Prenotato
 DocType: Supplier Scorecard Period,Calculations,calcoli
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Valore o Quantità
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Produzioni ordini non possono essere sollevati per:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Produzioni ordini non possono essere sollevati per:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Minuto
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Impostare Serie Naming per {0} tramite Impostazione&gt; Impostazioni&gt; Serie di denominazione
 DocType: Purchase Invoice,Purchase Taxes and Charges,Acquisto Tasse e Costi
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Vai a Fornitori
 ,Qty to Receive,Qtà da Ricevere
@@ -3276,7 +3339,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Credito Per account deve essere un account di Stato Patrimoniale
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Tutti i tipi di fornitori
 DocType: Global Defaults,Disable In Words,Disattiva in parole
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,Codice Articolo è obbligatoria in quanto articolo non è numerato automaticamente
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,Codice Articolo è obbligatoria in quanto articolo non è numerato automaticamente
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Preventivo {0} non di tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Voce del Programma di manutenzione
 DocType: Sales Order,%  Delivered,%  Consegnato
@@ -3298,23 +3361,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Apertura Balance Equità
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Riconciliazione
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Disponibile
 DocType: Appraisal,Appraisal,Valutazione
 DocType: Purchase Invoice,GST Details,Dettagli GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},E-mail inviata al fornitore {0}
+DocType: Item,Default Sales Unit of Measure,Unità di vendita predefinita di misura
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,La Data si Ripete
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Firma autorizzata
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Il responsabile ferie deve essere uno fra {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Crea tariffe
-DocType: Hub Settings,Seller Email,Venditore Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Costo totale di acquisto (tramite acquisto fattura)
 DocType: Training Event,Start Time,Ora di inizio
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Seleziona Quantità
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Seleziona Quantità
 DocType: Customs Tariff Number,Customs Tariff Number,Numero della tariffa doganale
 DocType: Patient Appointment,Patient Appointment,Appuntamento paziente
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Approvazione ruolo non può essere lo stesso ruolo la regola è applicabile ad
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Disiscriviti da questo Email Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Disiscriviti da questo Email Digest
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Ottenere fornitori di
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} non trovato per l&#39;articolo {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Vai ai corsi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Messaggio Inviato
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Il conto con nodi figli non può essere impostato come libro mastro
@@ -3327,11 +3393,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Materiale trasferito per produzione
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Il Conto {0} non esiste
 DocType: Project,Project Type,Tipo di progetto
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Esiste un compito di figlio per questa attività. Non è possibile eliminare questa attività.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Sia qty destinazione o importo obiettivo è obbligatoria .
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Costo di varie attività
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Nessun altro risultato
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Costo di varie attività
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Impostazione Eventi a {0}, in quanto il dipendente attaccato al di sotto personale di vendita non dispone di un ID utente {1}"
 DocType: Timesheet,Billing Details,Dettagli di fatturazione
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Magazzino di Origine e di Destinazione devono essere diversi
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Magazzino di Origine e di Destinazione devono essere diversi
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Non è permesso di aggiornare i documenti di magazzino di età superiore a {0}
 DocType: Purchase Invoice Item,PR Detail,PR Dettaglio
 DocType: Sales Order,Fully Billed,Completamente Fatturato
@@ -3350,30 +3418,29 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +128,Do you really want to Submit all Salary Slip from {0} to {1},Vuoi davvero confermare tutte le buste paga da {0} a {1}
 DocType: Cheque Print Template,Cheque Height,Altezza Assegno
 DocType: Supplier,Supplier Details,Dettagli del Fornitore
-DocType: Setup Progress,Setup Progress,Setup Progress
+DocType: Setup Progress,Setup Progress,Avanzamento configurazione
 DocType: Expense Claim,Approval Status,Stato Approvazione
 DocType: Hub Settings,Publish Items to Hub,Pubblicare Articoli al Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +43,From value must be less than to value in row {0},Dal valore deve essere inferiore al valore nella riga {0}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Bonifico bancario
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Seleziona tutto
 DocType: Vehicle Log,Invoice Ref,fattura Rif
-DocType: Purchase Order,Recurring Order,Ordine Ricorrente
 DocType: Company,Default Income Account,Conto predefinito Entrate
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Gruppi clienti / clienti
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Anni fiscali non chiusi - Utile/Perdita (credito)
-DocType: Sales Invoice,Time Sheets,fogli di presenza
+DocType: Sales Invoice,Time Sheets,Schede attività
 DocType: Lab Test Template,Change In Item,Modifica nell&#39;articolo
 DocType: Payment Gateway Account,Default Payment Request Message,Predefinito Richiesta Pagamento Messaggio
 DocType: Item Group,Check this if you want to show in website,Seleziona se vuoi mostrare nel sito web
 apps/erpnext/erpnext/config/accounts.py +142,Banking and Payments,Banche e Pagamenti
 ,Welcome to ERPNext,Benvenuti a ERPNext
 apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Lead a Preventivo
-DocType: Patient,A Negative,Negativo
+DocType: Patient,A Negative,Un Negativo
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Niente di più da mostrare.
 DocType: Lead,From Customer,Da Cliente
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,chiamate
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,chiamate
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Un prodotto
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,lotti
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,lotti
 DocType: Project,Total Costing Amount (via Time Logs),Importo totale Costing (via Time Diari)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Effettuare la programmazione dei costi
 DocType: Purchase Order Item Supplied,Stock UOM,UdM Giacenza
@@ -3397,7 +3464,7 @@
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Ferie e vacanze
 DocType: School Settings,Current Academic Term,Termine accademico attuale
 DocType: Sales Order,Not Billed,Non Fatturata
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Entrambi i magazzini devono appartenere alla stessa società
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Entrambi i magazzini devono appartenere alla stessa società
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Nessun contatto ancora aggiunto.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Landed Cost Voucher Importo
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Fatture emesse dai fornitori.
@@ -3406,7 +3473,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Importo sconto
 DocType: Purchase Invoice,Return Against Purchase Invoice,Ritorno Contro Acquisto Fattura
 DocType: Item,Warranty Period (in days),Periodo di garanzia (in giorni)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',aggiornare `tabPatient Appointment` impostare sales_invoice = &#39;{0}&#39; dove name = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Rapporto con Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Cassa netto da attività
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Articolo 4
@@ -3415,8 +3481,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Addebito Journal
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Gruppo Student
 DocType: Shopping Cart Settings,Quotation Series,Serie Preventivi
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Un elemento esiste con lo stesso nome ( {0} ) , si prega di cambiare il nome del gruppo o di rinominare la voce"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Seleziona cliente
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Un elemento esiste con lo stesso nome ( {0} ) , si prega di cambiare il nome del gruppo o di rinominare la voce"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Seleziona cliente
 DocType: C-Form,I,io
 DocType: Company,Asset Depreciation Cost Center,Asset Centro di ammortamento dei costi
 DocType: Sales Order Item,Sales Order Date,Ordine di vendita Data
@@ -3425,6 +3491,7 @@
 DocType: Assessment Plan,Assessment Plan,Piano di valutazione
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Il cliente {0} viene creato.
 DocType: Stock Settings,Limit Percent,limite percentuale
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Attualmente non ci sono stock in magazzino
 ,Payment Period Based On Invoice Date,Periodo di pagamento basati su Data fattura
 DocType: Sample Collection,No. of print,Numero di stampa
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Manca valuta Tassi di cambio in {0}
@@ -3466,7 +3533,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} non appartiene alla società {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,La fattura di vendita {0} è stata creata
 DocType: Employee,Confirmation Date,conferma Data
-DocType: C-Form,Total Invoiced Amount,Totale Importo fatturato
+DocType: C-Form,Total Invoiced Amount,Importo Totale Fatturato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +49,Min Qty can not be greater than Max Qty,La quantità Min non può essere maggiore della quantità Max
 DocType: Account,Accumulated Depreciation,Fondo di ammortamento
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Nome permanente
@@ -3480,13 +3547,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pay Gross - Deduzione totale - Rimborso prestito
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,BOM corrente e New BOM non può essere lo stesso
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Stipendio slittamento ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Stipendio slittamento ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,La Data di pensionamento deve essere successiva alla Data Assunzione
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Ci sono stati errori durante la pianificazione di corso:
 DocType: Sales Invoice,Against Income Account,Per Reddito Conto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Consegnato
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Articolo {0}: Qtà ordinata {1} non può essere inferiore a Qtà minima per ordine {2} (definita per l'Articolo).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Articolo {0}: Qtà ordinata {1} non può essere inferiore a Qtà minima per ordine {2} (definita per l'Articolo).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Percentuale Distribuzione Mensile
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Accedi come un altro utente.
 DocType: Territory,Territory Targets,Obiettivi Territorio
 DocType: Delivery Note,Transporter Info,Info Transporter
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Si prega di impostare di default {0} nell&#39;azienda {1}
@@ -3494,13 +3562,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Lo Stesso fornitore è stato inserito più volte
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Utile lordo / Perdita
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Articolo dell'Ordine di Acquisto Fornito
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Nome azienda non può essere azienda
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Nome azienda non può essere azienda
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Lettera intestazioni per modelli di stampa .
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titoli di modelli di stampa p. es. Fattura proforma
 DocType: Program Enrollment,Walking,A passeggio
 DocType: Student Guardian,Student Guardian,Student Guardiano
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Spese tipo di valutazione non possono contrassegnata come Inclusive
 DocType: POS Profile,Update Stock,Aggiornare Giacenza
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,nell&#39;abbonamento
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Una diversa Unità di Misura degli articoli darà come risultato un Peso Netto (Totale) non corretto.
 Assicurarsi che il peso netto di ogni articolo sia nella stessa Unità di Misura."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Tasso
@@ -3545,19 +3614,21 @@
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Offerte di lavoro
 DocType: Company,Stock Adjustment Account,Conto di regolazione Archivio
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Cancellare
-DocType: Timesheet Detail,Operation ID,Operazione ID
+DocType: Timesheet Detail,Operation ID,ID Operazione
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Utente di sistema (login) ID. Se impostato, esso diventerà di default per tutti i moduli HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Da {1}
 DocType: Task,depends_on,dipende da
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,In coda per aggiornare il prezzo più recente in tutte le fatture dei materiali. Può richiedere alcuni minuti.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,In coda per aggiornare il prezzo più recente in tutte le fatture dei materiali. Può richiedere alcuni minuti.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nome del nuovo conto. Nota: Si prega di non creare account per Clienti e Fornitori
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Modelli Country saggio di default Indirizzo
 DocType: Sales Order Item,Supplier delivers to Customer,il Fornitore consegna al Cliente
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/Item/{0}) è esaurito
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Data / Reference Data non può essere successiva {0}
+,Sales Payment Summary,Riepilogo dei pagamenti di vendita
+DocType: Restaurant,Restaurant,Ristorante
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Data / Reference Data non può essere successiva {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importazione ed esportazione dati
 DocType: Patient,Account Details,Dettagli Account
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Nessun studenti hanno trovato
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Nessun studenti hanno trovato
 DocType: Medical Department,Medical Department,Dipartimento di Medicina
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Criteri di valutazione del punteggio fornitore
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Fattura Data Pubblicazione
@@ -3568,7 +3639,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Si prega di selezionare la data di registrazione prima di selezionare il Partner
 DocType: Program Enrollment,School House,school House
 DocType: Serial No,Out of AMC,Fuori di AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Selezionare i Preventivi
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Selezionare i Preventivi
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numero degli ammortamenti prenotata non può essere maggiore di Numero totale degli ammortamenti
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Aggiungi visita manutenzione
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,Si prega di contattare l'utente che hanno Sales Master Responsabile {0} ruolo
@@ -3576,7 +3647,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Azienda ( non cliente o fornitore ) master.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Questo si basa sulla presenza di questo Student
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Nessun studente dentro
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Aggiungere altri elementi o piena forma aperta
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Aggiungere altri elementi o piena forma aperta
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,I Documenti di Trasporto {0} devono essere cancellati prima di annullare questo Ordine di Vendita
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Vai agli Utenti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Importo pagato + Scadenza Importo non può essere superiore a Totale generale
@@ -3596,37 +3667,40 @@
 DocType: Fee Schedule,Fee Schedule,Tariffario
 DocType: Hub Settings,Publish Availability,Pubblicare Disponibilità
 DocType: Company,Create Chart Of Accounts Based On,Crea il Piano dei conti in base a
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Non è possibile convertire in non gruppo. Esistono task per i minori.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Data di nascita non può essere maggiore rispetto a oggi.
 ,Stock Ageing,Invecchiamento Archivio
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Studente {0} esiste contro richiedente studente {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Adattamento arrotondamento (Valuta Società)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,timesheet
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Scheda attività
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' è disabilitato
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Imposta come Aperto
 DocType: Cheque Print Template,Scanned Cheque,Assegno scansionato
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Invia e-mail automatica ai contatti alla conferma.
-DocType: Timesheet,Total Billable Amount,Importo totale fatturabile
+DocType: Timesheet,Total Billable Amount,Importo Totale Fatturabile
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Articolo 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Inserimento ordini
 DocType: Purchase Order,Customer Contact Email,Customer Contact Email
 DocType: Warranty Claim,Item and Warranty Details,Voce e garanzia Dettagli
 DocType: Sales Team,Contribution (%),Contributo (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : non verrà creato il pagamento poiché non è stato specificato 'conto bancario o fido'
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Il progetto {0} esiste già
 DocType: Medical Department,Nursing User,Nursing User
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Responsabilità
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Il periodo di validità di questa quotazione è terminato.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Il periodo di validità di questa quotazione è terminato.
 DocType: Expense Claim Account,Expense Claim Account,Conto spese rivendicazione
 DocType: Accounts Settings,Allow Stale Exchange Rates,Consenti tariffe scadenti
 DocType: Sales Person,Sales Person Name,Vendite Nome persona
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Inserisci atleast 1 fattura nella tabella
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Aggiungi Utenti
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Aggiungi Utenti
 DocType: POS Item Group,Item Group,Gruppo Articoli
 DocType: Item,Safety Stock,Scorta di sicurezza
 DocType: Healthcare Settings,Healthcare Settings,Impostazioni sanitarie
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Progressi% per un compito non può essere superiore a 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Progressi% per un compito non può essere superiore a 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Prima di riconciliazione
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Per {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Tasse e spese aggiuntive (Azienda valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Voce fiscale Row {0} deve avere un account di tipo fiscale o di reddito o spese o addebitabile
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Voce fiscale Row {0} deve avere un account di tipo fiscale o di reddito o spese o addebitabile
 DocType: Sales Order,Partly Billed,Parzialmente Fatturato
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Voce {0} deve essere un asset Articolo fisso
 DocType: Item,Default BOM,Distinta Materiali Predefinita
@@ -3642,6 +3716,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,Variabile
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Da Documento di Trasporto
 DocType: Student,Student Email Address,Student Indirizzo e-mail
+DocType: Item,Hub Warehouse,Magazzino Hub
 DocType: Physician Schedule Time Slot,From Time,Da Periodo
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,In Stock:
 DocType: Notification Control,Custom Message,Messaggio Personalizzato
@@ -3649,9 +3724,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,Contanti o conto bancario è obbligatoria per effettuare il pagamento voce
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Indirizzo studente
 DocType: Purchase Invoice,Price List Exchange Rate,Listino Prezzi Tasso di Cambio
+DocType: POS Profile,POS Profile Name,Nome del profilo POS
 DocType: Purchase Invoice Item,Rate,Prezzo
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Stagista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,indirizzo Nome
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,indirizzo Nome
 DocType: Stock Entry,From BOM,Da Distinta Materiali
 DocType: Assessment Code,Assessment Code,Codice Assessment
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Base
@@ -3665,11 +3741,12 @@
 DocType: Salary Slip,Salary Structure,Struttura salariale
 DocType: Account,Bank,Banca
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,linea aerea
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Fornire Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Fornire Materiale
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Si è verificato un errore durante la creazione di ricorrenti
 DocType: Material Request Item,For Warehouse,Per Magazzino
 DocType: Employee,Offer Date,Data dell'offerta
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Preventivi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Sei in modalità non in linea. Si potrà ricaricare quando tornerà disponibile la connessione alla rete.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Sei in modalità non in linea. Si potrà ricaricare quando tornerà disponibile la connessione alla rete.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Non sono stati creati Gruppi Studenti
 DocType: Purchase Invoice Item,Serial No,Serial No
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Rimborso mensile non può essere maggiore di prestito Importo
@@ -3679,17 +3756,18 @@
 DocType: Salary Slip,Total Working Hours,Orario di lavoro totali
 DocType: Subscription,Next Schedule Date,Data di pianificazione successiva
 DocType: Stock Entry,Including items for sub assemblies,Compresi articoli per sub assemblaggi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Inserire il valore deve essere positivo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,tutti i Territori
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Inserire il valore deve essere positivo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,tutti i Territori
 DocType: Purchase Invoice,Items,Articoli
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Studente è già registrato.
 DocType: Fiscal Year,Year Name,Nome Anno
 DocType: Process Payroll,Process Payroll,Elaborazione Busta Paga
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Ci sono più feste che giorni di lavoro questo mese.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Ci sono più feste che giorni di lavoro questo mese.
 DocType: Product Bundle Item,Product Bundle Item,Prodotto Bundle Voce
 DocType: Sales Partner,Sales Partner Name,Nome partner vendite
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Richieste di offerta
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Richieste di offerta
 DocType: Payment Reconciliation,Maximum Invoice Amount,Importo Massimo Fattura
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Ematologia
 DocType: Normal Test Items,Normal Test Items,Elementi di prova normali
 DocType: Student Language,Student Language,Student Lingua
 apps/erpnext/erpnext/config/selling.py +23,Customers,Clienti
@@ -3700,10 +3778,11 @@
 DocType: Issue,Opening Time,Tempo di apertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Data Inizio e Fine sono obbligatorie
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & borse merci
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unità di misura predefinita per la variante &#39;{0}&#39; deve essere lo stesso in Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unità di misura predefinita per la variante &#39;{0}&#39; deve essere lo stesso in Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calcola in base a
 DocType: Delivery Note Item,From Warehouse,Dal Deposito
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Non ci sono elementi con Bill of Materials per la produzione
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Non ci sono elementi con Bill of Materials per la produzione
+DocType: Restaurant,Default Customer,Cliente predefinito
 DocType: Assessment Plan,Supervisor Name,Nome supervisore
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Non confermare se l&#39;appuntamento è stato creato per lo stesso giorno
 DocType: Program Enrollment Course,Program Enrollment Course,Corso di iscrizione al programma
@@ -3730,7 +3809,7 @@
 DocType: Payment Entry,Internal Transfer,Trasferimento interno
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Conto Child esiste per questo account . Non è possibile eliminare questo account .
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Sia qty destinazione o importo obiettivo è obbligatoria
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Non esiste Distinta Base predefinita per l'articolo {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Non esiste Distinta Base predefinita per l'articolo {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Seleziona Data Pubblicazione primo
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Data di apertura dovrebbe essere prima Data di chiusura
 DocType: Leave Control Panel,Carry Forward,Portare Avanti
@@ -3765,6 +3844,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Presente totale
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,Prospetti contabili
 DocType: Drug Prescription,Hour,Ora
+DocType: Restaurant Order Entry,Last Sales Invoice,Fattura di ultima vendita
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Un nuovo Serial No non può avere un magazzino. Il magazzino deve essere impostato  nell'entrata giacenza o su ricevuta d'acquisto
 DocType: Lead,Lead Type,Tipo Lead
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Non sei autorizzato ad approvare foglie su Date Block
@@ -3799,96 +3879,100 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,creare utenti
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,Grammo
 DocType: Supplier Scorecard,Per Month,Al mese
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Quantità di Fabbricazione deve essere maggiore di 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Quantità di Fabbricazione deve essere maggiore di 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Visita rapporto per chiamata di manutenzione.
 DocType: Stock Entry,Update Rate and Availability,Frequenza di aggiornamento e disponibilità
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Percentuale si è permesso di ricevere o consegnare di più contro la quantità ordinata. Per esempio: Se avete ordinato 100 unità. e il vostro assegno è 10% poi si è permesso di ricevere 110 unità.
 DocType: POS Customer Group,Customer Group,Gruppo Cliente
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Nuovo ID batch (opzionale)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Nuovo ID batch (opzionale)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Conto spese è obbligatoria per l'elemento {0}
 DocType: BOM,Website Description,Descrizione del sito
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Variazione netta Patrimonio
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,i più nuovi
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Si prega di annullare Acquisto Fattura {0} prima
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","l' indirizzo e-mail deve essere univoco, esiste già per {0}"
 DocType: Serial No,AMC Expiry Date,AMC Data Scadenza
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,Ricevuta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,Ricevuta
 ,Sales Register,Registro Vendite
 DocType: Daily Work Summary Settings Company,Send Emails At,Invia e-mail in
 DocType: Quotation,Quotation Lost Reason,Motivo per la mancata vendita
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Seleziona il tuo dominio
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',selezionare * da tabPatient dove name = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},di riferimento della transazione non {0} {1} datato
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},di riferimento della transazione non {0} {1} datato
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Non c'è nulla da modificare.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Vista forma
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Riepilogo per questo mese e le attività in corso
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Vista forma
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Riepilogo per questo mese e le attività in corso
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Aggiungi utenti alla tua organizzazione, diversa da te."
 DocType: Customer Group,Customer Group Name,Nome Gruppo Cliente
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Nessun Cliente ancora!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Nessun Cliente ancora!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Rendiconto finanziario
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Importo del prestito non può superare il massimo importo del prestito {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licenza
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Si prega di rimuovere questo Invoice {0} dal C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Si prega di rimuovere questo Invoice {0} dal C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Si prega di selezionare il riporto se anche voi volete includere equilibrio precedente anno fiscale di parte per questo anno fiscale
 DocType: GL Entry,Against Voucher Type,Per tipo Tagliando
 DocType: Physician,Phone (R),Telefono (R)
-apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Aggiunti slot di tempo
+apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Fascia temporale aggiunta
 DocType: Item,Attributes,Attributi
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Abilita il modello
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Impostare Serie Naming per {0} tramite Impostazione&gt; Impostazioni&gt; Serie di denominazione
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Inserisci Scrivi Off conto
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Ultima data di ordine
 DocType: Patient,B Negative,B Negativo
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Il Conto {0} non appartiene alla società {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,I numeri seriali nella riga {0} non corrispondono alla nota di consegna
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,I numeri seriali nella riga {0} non corrispondono alla nota di consegna
 DocType: Student,Guardian Details,Guardiano Dettagli
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Segna come  Presenze per più Dipendenti
 DocType: Vehicle,Chassis No,Telaio No
 DocType: Payment Request,Initiated,Iniziato
 DocType: Production Order,Planned Start Date,Data di inizio prevista
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Seleziona una BOM
 DocType: Serial No,Creation Document Type,Creazione tipo di documento
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,La data di fine deve essere maggiore della data di inizio
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,La data di fine deve essere maggiore della data di inizio
 DocType: Leave Type,Is Encash,È incassare
 DocType: Leave Allocation,New Leaves Allocated,Nuove ferie allocate
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Dati di progetto non sono disponibile per Preventivo
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Finisci
 DocType: Project,Expected End Date,Data di chiusura prevista
 DocType: Budget Account,Budget Amount,budget Importo
 DocType: Appraisal Template,Appraisal Template Title,Valutazione Titolo Modello
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Da Data {0} per Employee {1} non può essere prima di unirsi Data del dipendente {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,commerciale
 DocType: Patient,Alcohol Current Use,Uso corrente di alcool
+DocType: Student Admission Program,Student Admission Program,Programma di ammissione all&#39;allievo
 DocType: Payment Entry,Account Paid To,Account pagato a
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Voce genitore {0} non deve essere un Articolo Articolo
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Tutti i Prodotti o Servizi.
 DocType: Expense Claim,More Details,Maggiori dettagli
 DocType: Supplier Quotation,Supplier Address,Indirizzo Fornitore
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budget per l&#39;account {1} contro {2} {3} è {4}. Si supererà da {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budget per l'account {1} contro {2} {3} è {4}. Si supererà di {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Riga {0} # account deve essere di tipo 'Bene Strumentale'
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,out Quantità
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Regole per il calcolo dell&#39;importo di trasporto per una vendita
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,e disattivato disabilitato nel
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Series è obbligatorio
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Servizi finanziari
 DocType: Student Sibling,Student ID,Student ID
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Tipi di attività per i registri di tempo
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Email del fornitore
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Tipi di attività per i registri di tempo
 DocType: Tax Rule,Sales,Vendite
 DocType: Stock Entry Detail,Basic Amount,Importo di base
 DocType: Training Event,Exam,Esame
 DocType: Complaint,Complaint,Denuncia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Magazzino richiesto per l'Articolo in Giacenza {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Magazzino richiesto per l'Articolo in Giacenza {0}
 DocType: Leave Allocation,Unused leaves,Ferie non godute
 DocType: Patient,Alcohol Past Use,Utilizzo passato di alcool
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Stato di fatturazione
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Trasferimento
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Fetch BOM esplosa ( inclusi sottoassiemi )
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Trasferimento
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Fetch BOM esplosa ( inclusi sottoassiemi )
 DocType: Authorization Rule,Applicable To (Employee),Applicabile a (Dipendente)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Data di scadenza è obbligatoria
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Data di scadenza è obbligatoria
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Incremento per attributo {0} non può essere 0
 DocType: Journal Entry,Pay To / Recd From,Paga a / Ricevuto Da
 DocType: Naming Series,Setup Series,Serie Setup
 DocType: Payment Reconciliation,To Invoice Date,Per Data fattura
 DocType: Supplier,Contact HTML,Contatto HTML
 ,Inactive Customers,I clienti inattivi
+DocType: Student Admission Program,Maximum Age,Età massima
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Ricevute di acquisto
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Come viene applicata la Regola Tariffaria?
@@ -3900,13 +3984,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Bundle prodotto
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Impossibile trovare il punteggio a partire da {0}. È necessario avere punteggi in piedi che coprono 0 a 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Riga {0}: Riferimento non valido {1}
-DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Modelli Tasse di Acquisto e Oneri
+DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Modelli di Imposte e Spese di Acquisto
 DocType: Upload Attendance,Download Template,Scarica Modello
 DocType: Timesheet,TS-,TS
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: immetti  un importo a debito o a credito in {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Un importo a debito o a credito è richiesto per {2}
 DocType: GL Entry,Remarks,Osservazioni
 DocType: Payment Entry,Account Paid From,Account pagato da
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Codice Articolo Materia Prima
+DocType: Task,Parent Task,Attività del genitore
 DocType: Journal Entry,Write Off Based On,Scrivi Off Basato Su
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Crea un Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Di stampa e di cancelleria
@@ -3915,19 +4000,19 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Stipendio già elaborato per il periodo compreso tra {0} e {1}, Lascia periodo di applicazione non può essere tra questo intervallo di date."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Record di installazione per un numero di serie
 DocType: Guardian Interest,Guardian Interest,Guardiano interesse
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Imposta i valori predefiniti per le fatture POS
 apps/erpnext/erpnext/config/hr.py +177,Training,Formazione
 DocType: Timesheet,Employee Detail,Dettaglio dei dipendenti
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Email ID Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,Il giorno dopo di Data e Ripetere sul Giorno del mese deve essere uguale
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Il giorno dopo di Data e Ripetere sul Giorno del mese deve essere uguale
 DocType: Lab Prescription,Test Code,Codice di prova
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Impostazioni per homepage del sito
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},Le richieste di autorizzazione non sono consentite per {0} a causa di una posizione di scorecard di {1}
 DocType: Offer Letter,Awaiting Response,In attesa di risposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Sopra
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Importo totale {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},attributo non valido {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Importo totale {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},attributo non valido {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Si ricorda se un conto non pagabile
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Lo stesso oggetto è stato inserito più volte. {elenco}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Seleziona il gruppo di valutazione diverso da &#39;Tutti i gruppi di valutazione&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Riga {0}: è necessario un centro di costo per un elemento {1}
 DocType: Training Event Employee,Optional,Opzionale
@@ -3950,19 +4035,20 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: centro di costo è obbligatorio per la voce {2}
 DocType: Vehicle,Policy No,Politica No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Ottenere elementi dal pacchetto di prodotti
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Poiché il titolo esiste contro un elemento {0}, non è possibile abilitare la proprietà delle varianti"
 DocType: Asset,Straight Line,Retta
 DocType: Project User,Project User,progetto utente
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Diviso
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Diviso
 DocType: GL Entry,Is Advance,È Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Inizio e Fine data della frequenza soo obbligatori
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,Si prega di specificare ' è un Conto lavoro ' come Si o No
+DocType: Item,Default Purchase Unit of Measure,Unità di acquisto predefinita di misura
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Ultima data di comunicazione
 DocType: Sales Team,Contact No.,Contatto N.
 DocType: Bank Reconciliation,Payment Entries,Le voci di pagamento
 DocType: Production Order,Scrap Warehouse,Scrap Magazzino
 DocType: Production Order,Check if material transfer entry is not required,Controllare se non è richiesta la voce di trasferimento dei materiali
 DocType: Program Enrollment Tool,Get Students From,Get studenti di
-DocType: Hub Settings,Seller Country,Vendita Paese
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Pubblicare Articoli sul sito web
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Gruppo tuoi studenti in batch
 DocType: Authorization Rule,Authorization Rule,Ruolo Autorizzazione
@@ -3972,10 +4058,10 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Modelli di Imposte e spese di vendita
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Totale (Credito)
 DocType: Repayment Schedule,Payment Date,Data di Pagamento
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nuovo Batch Qty
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Nuovo Batch Qty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Abbigliamento e accessori
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,Impossibile risolvere la funzione di punteggio ponderato. Assicurarsi che la formula sia valida.
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Numero di ordinazione
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Numero d'Ordine
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner che verrà mostrato nella parte superiore della lista dei prodotti.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Specificare le condizioni per determinare il valore di spedizione
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Ruolo permesso di impostare conti congelati e modificare le voci congelati
@@ -3990,6 +4076,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} non può essere presentata, è già {2}"
 DocType: Tax Rule,Billing Country,Nazione di fatturazione
 DocType: Purchase Order Item,Expected Delivery Date,Data prevista di consegna
+DocType: Restaurant Order Entry,Restaurant Order Entry,Inserimento ordine del ristorante
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Dare e Avere non uguale per {0} # {1}. La differenza è {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Spese di rappresentanza
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Crea una Richiesta di Materiali
@@ -4002,9 +4089,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Account con transazione registrate non può essere cancellato
 DocType: Vehicle,Last Carbon Check,Ultima verifica carbon
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Spese legali
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Seleziona la quantità in fila
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Seleziona la quantità in fila
 DocType: Purchase Invoice,Posting Time,Ora di Registrazione
 DocType: Timesheet,% Amount Billed,% Importo Fatturato
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Time per Appointment&quot; non è stato impostato per Dr {0}. Aggiungerlo nel master del medico.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Spese telefoniche
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Seleziona se vuoi forzare l'utente a selezionare una serie prima di salvare, non ci sarà un valore di default."
@@ -4015,6 +4103,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nuovi Ricavi Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Spese di viaggio
 DocType: Maintenance Visit,Breakdown,Esaurimento
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Aggiungi abbonamento sul campo personalizzato nel doctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Account: {0} con valuta: {1} non può essere selezionato
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","L&#39;aggiornamento dei costi BOM avviene automaticamente via Scheduler, in base all&#39;ultimo tasso di valutazione / prezzo di listino / ultimo tasso di acquisto di materie prime."
 DocType: Bank Reconciliation Detail,Cheque Date,Data Assegno
@@ -4039,7 +4128,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Importo totale fatturazione (via Time Diari)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Id Fornitore
 DocType: Payment Request,Payment Gateway Details,Payment Gateway Dettagli
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Quantità deve essere maggiore di 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Quantità deve essere maggiore di 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,I nodi figli possono essere creati solo sotto i nodi di tipo &#39;Gruppo&#39;
 DocType: Leave Application,Half Day Date,Data di mezza giornata
@@ -4057,12 +4146,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Nota : Articolo {0} inserito più volte
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Tutti i contatti.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Abbreviazione Società
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Utente {0} non esiste
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Utente {0} non esiste
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Abbreviazione
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,La scrittura contabile del Pagamento esiste già
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Non autorizzato poiché {0} supera i limiti
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Modello Stipendio master.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Patologia
+DocType: Restaurant Order Entry,Restaurant Table,Ristorante Tavolo
 DocType: Leave Type,Max Days Leave Allowed,Max giorni di ferie domestici
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Set di regole fiscali per carrello della spesa
 DocType: Purchase Invoice,Taxes and Charges Added,Tasse e spese aggiuntive
@@ -4074,10 +4165,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Preventivo a Leads o a Clienti.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Ruolo ammessi da modificare stock congelato
 ,Territory Target Variance Item Group-Wise,Territorio di destinazione Varianza articolo Group- Wise
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Tutti i gruppi di clienti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Tutti i gruppi di clienti
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Accantonamento Mensile
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} è obbligatorio. Forse il record di cambio di valuta non è stato creato per {1} {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Tax modello è obbligatoria.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Tax modello è obbligatoria.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Account {0}: conto derivato {1} non esistente
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prezzo di listino (Valuta Azienda)
 DocType: Products Settings,Products Settings,Impostazioni Prodotti
@@ -4103,12 +4194,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Voce Wise fiscale Dettaglio
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Abbreviazione Institute
 ,Item-wise Price List Rate,Articolo -saggio Listino Tasso
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Preventivo Fornitore
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Preventivo Fornitore
 DocType: Quotation,In Words will be visible once you save the Quotation.,"""In Parole"" sarà visibile una volta che si salva il Preventivo."
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},La quantità ({0}) non può essere una frazione nella riga {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,la tentata
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Codice a barre {0} già utilizzato nel Prodotto {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Codice a barre {0} già utilizzato nel Prodotto {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Regole per l'aggiunta di spese di spedizione .
 DocType: Item,Opening Stock,Disponibilità Iniziale
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Il Cliente è tenuto
@@ -4126,9 +4217,8 @@
 DocType: Customer,From Lead,Da Contatto
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Gli ordini rilasciati per la produzione.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Selezionare l'anno fiscale ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS Profilo tenuto a POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS Profilo tenuto a POS Entry
 DocType: Program Enrollment Tool,Enroll Students,iscrivere gli studenti
-DocType: Hub Settings,Name Token,Nome Token
 DocType: Lab Test,Approved Date,Data approvata
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Listino di Vendita
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,È obbligatorio almeno un deposito
@@ -4146,7 +4236,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Risorsa Umana
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pagamento Riconciliazione di pagamento
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Attività fiscali
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},L&#39;ordine di produzione è stato {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},L&#39;ordine di produzione è stato {0}
 DocType: BOM Item,BOM No,BOM n.
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,La Scrittura Contabile {0} non ha conto {1} o già confrontato con un altro buono
@@ -4166,7 +4256,7 @@
 DocType: Currency Exchange,To Currency,Per valuta
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Consentire i seguenti utenti per approvare le richieste per i giorni di blocco.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Tipi di Nota Spese.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Il tasso di vendita per l&#39;elemento {0} è inferiore a quello {1}. Il tasso di vendita dovrebbe essere almeno {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Il tasso di vendita per l&#39;elemento {0} è inferiore a quello {1}. Il tasso di vendita dovrebbe essere almeno {2}
 DocType: Item,Taxes,Tasse
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Pagato e Non Consegnato
 DocType: Project,Default Cost Center,Centro di costo predefinito
@@ -4180,15 +4270,15 @@
 DocType: Employee Loan,Fully Disbursed,interamente versato
 DocType: Maintenance Visit,Customer Feedback,Opinione Cliente
 DocType: Account,Expense,Spesa
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Punteggio non può essere maggiore di massima Score
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Il punteggio non può essere maggiore del punteggio massimo
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Clienti e Fornitori
 DocType: Item Attribute,From Range,Da Gamma
 DocType: BOM,Set rate of sub-assembly item based on BOM,Imposta tasso di elemento di sotto-montaggio basato su BOM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Errore di sintassi nella formula o una condizione: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Errore di sintassi nella formula o una condizione: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Quotidiano lavoro riepilogo delle impostazioni azienda
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,Articolo {0} ignorato poiché non è in Giacenza
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Conferma questo ordine di produzione per l'ulteriore elaborazione .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Conferma questo ordine di produzione per l'ulteriore elaborazione .
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Per non applicare l'articolo Pricing in una determinata operazione, tutte le norme sui prezzi applicabili devono essere disabilitati."
 DocType: Assessment Group,Parent Assessment Group,Capogruppo di valutazione
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Posizioni
@@ -4205,15 +4295,16 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Impostare il filtro aziendale vuoto se Group By è &#39;Azienda&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,La Data di Registrazione non può essere una data futura
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Fila # {0}: N. di serie {1} non corrisponde con {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,per generare il ricorrente
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Casual Leave
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Lab Test UOM.
 DocType: Batch,Batch ID,Lotto ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Nota : {0}
 ,Delivery Note Trends,Tendenze Documenti di Trasporto
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Sintesi di questa settimana
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Sintesi di questa settimana
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Qtà in Stock
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Account: {0} può essere aggiornato solo tramite documenti di magazzino
-DocType: Student Group Creation Tool,Get Courses,Get Corsi
+DocType: Student Group Creation Tool,Get Courses,Ottieni Corsi
 DocType: GL Entry,Party,Partner
 DocType: Healthcare Settings,Patient Name,Nome paziente
 DocType: Variant Field,Variant Field,Campo di variante
@@ -4224,7 +4315,6 @@
 DocType: Purchase Order,To Bill,Da Fatturare
 DocType: Material Request,% Ordered,% Ordinato
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Per il corso del corso, il Corso sarà convalidato per ogni Studente dai corsi iscritti in iscrizione al programma."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Inserire l&#39;indirizzo e-mail separati da virgole, fattura sarà inviata automaticamente particolare data"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,lavoro a cottimo
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Avg. Buying Rate
 DocType: Task,Actual Time (in Hours),Tempo reale (in ore)
@@ -4238,7 +4328,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,L'articolo {0} non ha Numeri di Serie. La colonna deve essere vuota
 DocType: Accounts Settings,Accounts Settings,Impostazioni Conti
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,Approvare
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Nessun risultato da presentare
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Nessun risultato da presentare
 DocType: Customer,Sales Partner and Commission,Partner vendite e Commissione
 DocType: Employee Loan,Rate of Interest (%) / Year,Tasso di interesse (%) / anno
 ,Project Quantity,Progetto Quantità
@@ -4250,55 +4340,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Nero
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Articolo Esploso
 DocType: Account,Auditor,Uditore
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} articoli prodotti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} articoli prodotti
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Per saperne di più
 DocType: Cheque Print Template,Distance from top edge,Distanza dal bordo superiore
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Listino {0} è disattivato o non esiste
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Listino {0} è disattivato o non esiste
 DocType: Purchase Invoice,Return,Ritorno
 DocType: Production Order Operation,Production Order Operation,Ordine di produzione Operation
 DocType: Pricing Rule,Disable,Disattiva
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Modalità di pagamento è richiesto di effettuare un pagamento
 DocType: Project Task,Pending Review,In attesa recensione
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Appuntamenti e consultazioni
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} non è iscritto nel gruppo {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} non è iscritto nel gruppo {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} non può essere gettata, come è già {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Rimborso spese totale (via Expense Claim)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Contrassegna come Assente
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Riga {0}: Valuta del BOM # {1} deve essere uguale alla valuta selezionata {2}
 DocType: Journal Entry Account,Exchange Rate,Tasso di cambio:
 DocType: Patient,Additional information regarding the patient,Ulteriori informazioni sul paziente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,L'ordine di vendita {0} non è stato presentato
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,L'ordine di vendita {0} non è stato presentato
 DocType: Homepage,Tag Line,Tag Linea
 DocType: Fee Component,Fee Component,Fee Componente
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Gestione della flotta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Aggiungere elementi da
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Gestione della flotta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Aggiungere elementi da
 DocType: Cheque Print Template,Regular,Regolare
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Weightage totale di tutti i criteri di valutazione deve essere al 100%
-DocType: BOM,Last Purchase Rate,Ultima tasso di acquisto
+DocType: Purchase Order Item,Last Purchase Rate,Ultima tasso di acquisto
 DocType: Account,Asset,attività
 DocType: Project Task,Task ID,ID attività
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock non può esistere per la voce {0} dal ha varianti
 DocType: Lab Test,Mobile,Mobile
 ,Sales Person-wise Transaction Summary,Sales Person-saggio Sintesi dell&#39;Operazione
 DocType: Training Event,Contact Number,Numero di contatto
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Magazzino {0} non esiste
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrati ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Magazzino {0} non esiste
 DocType: Monthly Distribution,Monthly Distribution Percentages,Percentuali Distribuzione Mensile
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,La voce selezionata non può avere Batch
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","tasso di Valutazione non trovato per la voce {0}, che è necessario per fare delle scritture contabili per {1} {2}. Se l&#39;articolo è transazioni come un elemento di campione nel {1}, si prega di ricordare che nel {1} tavolo Item. In caso contrario, si prega di creare una transazione magazzino in entrata per il tasso di valutazione elemento o menzione nel record elemento e quindi provare submiting / cancellazione di questa voce"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% dei materiali consegnati di questa Bolla di Consegna
+DocType: Training Event,Has Certificate,Ha certificato
 DocType: Project,Customer Details,Dettagli Cliente
 DocType: Employee,Reports to,Reports a
 ,Unpaid Expense Claim,Richiesta di spesa non retribuita
 DocType: Payment Entry,Paid Amount,Importo pagato
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Esplora Ciclo di vendita
 DocType: Assessment Plan,Supervisor,Supervisore
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,online
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,online
 ,Available Stock for Packing Items,Stock Disponibile per Imballaggio Prodotti
 DocType: Item Variant,Item Variant,Elemento Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Strumento di valutazione dei risultati
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Articolo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,gli Ordini Confermati non possono essere eliminati
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,gli Ordini Confermati non possono essere eliminati
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo a bilancio già nel debito, non è permesso impostare il 'Saldo Futuro' come 'credito'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Gestione della qualità
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Voce {0} è stato disabilitato
@@ -4318,7 +4407,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: conflitti Timings con riga {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Consenti il tasso di valorizzazione Zero
 DocType: Training Event Employee,Invited,Invitato
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Molteplici strutture salariali attivi trovati per dipendente {0} per le date indicate
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Molteplici strutture salariali attivi trovati per dipendente {0} per le date indicate
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Conti Gateway Setup.
 DocType: Employee,Employment Type,Tipo Dipendente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,immobilizzazioni
@@ -4330,7 +4419,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Avviso ( giorni )
 DocType: Tax Rule,Sales Tax Template,Sales Tax Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Selezionare gli elementi per salvare la fattura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Selezionare gli elementi per salvare la fattura
 DocType: Employee,Encashment Date,Data Incasso
 DocType: Training Event,Internet,Internet
 DocType: Special Test Template,Special Test Template,Modello di prova speciale
@@ -4339,7 +4428,7 @@
 DocType: Production Order,Planned Operating Cost,Planned Cost operativo
 DocType: Academic Term,Term Start Date,Term Data di inizio
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},In allegato {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},In allegato {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Estratto conto banca come da Contabilità Generale
 DocType: Job Applicant,Applicant Name,Nome del Richiedente
 DocType: Authorization Rule,Customer / Item Name,Cliente / Nome Articolo
@@ -4359,7 +4448,7 @@
 DocType: Guardian,Guardian Of ,guardian of
 DocType: Grading Scale Interval,Threshold,Soglia
 DocType: BOM Update Tool,Current BOM,Distinta Materiali Corrente
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Aggiungi Numero di Serie
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Aggiungi Numero di Serie
 DocType: Production Order Item,Available Qty at Source Warehouse,Qtà disponibile presso Source Warehouse
 apps/erpnext/erpnext/config/support.py +22,Warranty,Garanzia
 DocType: Purchase Invoice,Debit Note Issued,Nota di Debito Emessa
@@ -4382,10 +4471,9 @@
 DocType: Account,Receivable,Ricevibile
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: Non è consentito cambiare il Fornitore quando l'Ordine di Acquisto esiste già
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Ruolo che è consentito di presentare le transazioni che superano i limiti di credito stabiliti.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Selezionare gli elementi da Fabbricazione
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","sincronizzazione dei dati principali, potrebbe richiedere un certo tempo"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Selezionare gli elementi da Fabbricazione
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","sincronizzazione dei dati principali, potrebbe richiedere un certo tempo"
 DocType: Item,Material Issue,Fornitura materiale
-DocType: Hub Settings,Seller Description,Venditore Descrizione
 DocType: Employee Education,Qualification,Qualifica
 DocType: Item Price,Item Price,Prezzo Articoli
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap & Detergente
@@ -4393,7 +4481,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Da tempo non può essere superiore al tempo.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordinato
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Curriculum vitae
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Curriculum vitae
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Se abilitato, il sistema non aggiornerà i campi delle varianti del modello, ma copierà i dati dei campi sottostanti durante la creazione di una nuova variante"
 DocType: Salary Detail,Component,Componente
 DocType: Assessment Criteria,Assessment Criteria Group,Criteri di valutazione del Gruppo
 DocType: Healthcare Settings,Patient Name By,Nome del paziente
@@ -4403,7 +4492,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Inserisci Approvazione ruolo o Approvazione utente
 DocType: Journal Entry,Write Off Entry,Scrivi Off Entry
 DocType: BOM,Rate Of Materials Based On,Tasso di materiali a base di
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Fornitore&gt; Tipo Fornitore
+DocType: Item Variant Settings,Do not Update Variants,Non aggiornare le varianti
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics supporto
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Deseleziona tutto
 DocType: POS Profile,Terms and Conditions,Termini e Condizioni
@@ -4412,7 +4501,7 @@
 DocType: Leave Block List,Applies to Company,Applica ad Azienda
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,Impossibile annullare perché esiste un movimento di magazzino {0}
 DocType: Employee Loan,Disbursement Date,L&#39;erogazione Data
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;Destinatari&#39; non specificati
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Destinatari&#39; non specificati
 DocType: BOM Update Tool,Update latest price in all BOMs,Aggiorna l&#39;ultimo prezzo in tutte le BOM
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Cartella medica
 DocType: Vehicle,Vehicle,Veicolo
@@ -4427,31 +4516,31 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Ammortamenti e saldi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Importo {0} {1} trasferito da {2} a {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Importo {0} {1} trasferito da {2} a {3}
 DocType: Sales Invoice,Get Advances Received,ottenere anticipo Ricevuto
 DocType: Email Digest,Add/Remove Recipients,Aggiungere/Rimuovere Destinatario
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Operazione non ammessi contro Production smesso di ordine {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Per impostare questo anno fiscale come predefinito , clicca su ' Imposta come predefinito'"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Aderire
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Aderire
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Carenza Quantità
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Variante item {0} esiste con le stesse caratteristiche
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Variante item {0} esiste con le stesse caratteristiche
 DocType: Employee Loan,Repay from Salary,Rimborsare da Retribuzione
 DocType: Leave Application,LAP/,GIRO/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Richiesta di Pagamento contro {0} {1} per quantità {2}
 DocType: Salary Slip,Salary Slip,Busta paga
 DocType: Lead,Lost Quotation,Preventivo Perso
 apps/erpnext/erpnext/utilities/user_progress.py +200,Student Batches,Lotti degli studenti
-DocType: Pricing Rule,Margin Rate or Amount,Margine o Ammontare
+DocType: Pricing Rule,Margin Rate or Amount,Margine  % o Importo
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,'Alla Data' è obbligatorio
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generare documenti di trasporto per i pacchetti da consegnare. Utilizzato per comunicare il numero del pacchetto, contenuto della confezione e il suo peso."
 DocType: Sales Invoice Item,Sales Order Item,Articolo dell'Ordine di Vendita
 DocType: Salary Slip,Payment Days,Giorni di Pagamento
 DocType: Patient,Dormant,inattivo
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Magazzini con nodi figli non possono essere convertiti a Ledger
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Magazzini con nodi figli non possono essere convertiti a Ledger
 DocType: BOM,Manage cost of operations,Gestire costi operazioni
 DocType: Accounts Settings,Stale Days,Giorni Stalli
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Quando una qualsiasi delle operazioni controllate sono &quot;inviati&quot;, una e-mail a comparsa visualizzata automaticamente per inviare una e-mail agli associati &quot;Contatto&quot; in tale operazione, con la transazione come allegato. L&#39;utente può o non può inviare l&#39;e-mail."
-apps/erpnext/erpnext/config/setup.py +14,Global Settings,Impostazioni globali
+apps/erpnext/erpnext/config/setup.py +14,Global Settings,Impostazioni Globali
 DocType: Assessment Result Detail,Assessment Result Detail,La valutazione dettagliata dei risultati
 DocType: Employee Education,Employee Education,Istruzione Dipendente
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +48,Duplicate item group found in the item group table,gruppo di articoli duplicato trovato nella tabella gruppo articoli
@@ -4461,10 +4550,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serial No {0} è già stato ricevuto
 ,Requested Items To Be Transferred,Voci si chiede il trasferimento
 DocType: Expense Claim,Vehicle Log,Vehicle Log
-DocType: Purchase Invoice,Recurring Id,Id ricorrente
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Presenza di febbre (temp&gt; 38,5 ° C / 101,3 ° F o temp. Durata&gt; 38 ° C / 100,4 ° F)"
 DocType: Customer,Sales Team Details,Vendite team Dettagli
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Eliminare in modo permanente?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Eliminare in modo permanente?
 DocType: Expense Claim,Total Claimed Amount,Totale importo richiesto
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potenziali opportunità di vendita.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Non valido {0}
@@ -4474,7 +4562,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Grandi magazzini
 ,Item Delivery Date,Data di consegna dell&#39;articolo
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Imposta la tua scuola a ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Imposta la tua scuola a ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base quantità di modifica (Società di valuta)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Nessuna scritture contabili per le seguenti magazzini
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Salvare prima il documento.
@@ -4486,13 +4574,12 @@
 DocType: Task,Is Milestone,È Milestone
 DocType: Daily Work Summary,Email Sent To,Email inviata a
 DocType: Budget,Warn,Avvisa
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Sei sicuro di voler annullare la registrazione?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Eventuali altre osservazioni, sforzo degno di nota che dovrebbe andare nelle registrazioni."
 DocType: BOM,Manufacturing User,Utente Produzione
 DocType: Purchase Invoice,Raw Materials Supplied,Materie prime fornite
-DocType: Purchase Invoice,Recurring Print Format,Formato di Stampa Ricorrente
 DocType: C-Form,Series,serie
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Valuta dell&#39;elenco dei prezzi {0} deve essere {1} o {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Aggiungi prodotti
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Valuta dell&#39;elenco dei prezzi {0} deve essere {1} o {2}
 DocType: Appraisal,Appraisal Template,Valutazione Modello
 DocType: Item Group,Item Classification,Classificazione Articolo
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Business Development Manager
@@ -4506,18 +4593,18 @@
 DocType: Item Attribute Value,Attribute Value,Valore Attributo
 ,Itemwise Recommended Reorder Level,Itemwise consigliata riordino Livello
 DocType: Salary Detail,Salary Detail,stipendio Dettaglio
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Si prega di selezionare {0} prima
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Si prega di selezionare {0} prima
 DocType: Appointment Type,Physician,Medico
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Il lotto {0} di {1} scaduto.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,consultazioni
 DocType: Sales Invoice,Commission,Commissione
-apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Time Sheet per la produzione.
+apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Scheda attività per la produzione.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Sub Totale
 DocType: Physician,Charges,oneri
 DocType: Salary Detail,Default Amount,Importo Predefinito
 DocType: Lab Test Template,Descriptive,Descrittivo
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Magazzino non trovato nel sistema
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Sommario di questo mese
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Sommario di questo mese
 DocType: Quality Inspection Reading,Quality Inspection Reading,Lettura Controllo Qualità
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Blocca Scorte più vecchie di` dovrebbero essere inferiori %d giorni .
 DocType: Tax Rule,Purchase Tax Template,Acquisto fiscale Template
@@ -4540,12 +4627,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Eventi di formazione / risultati
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Fondo ammortamento come su
 DocType: Sales Invoice,C-Form Applicable,C-Form Applicable
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Tempo di funzionamento deve essere maggiore di 0 per Operation {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Tempo di funzionamento deve essere maggiore di 0 per Operation {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Magazzino è obbligatorio
 DocType: Supplier,Address and Contacts,Indirizzo e contatti
 DocType: UOM Conversion Detail,UOM Conversion Detail,Dettaglio di conversione Unità di Misura
 DocType: Program,Program Abbreviation,Abbreviazione programma
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Ordine di produzione non può essere sollevata nei confronti di un modello di elemento
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Ordine di produzione non può essere sollevata nei confronti di un modello di elemento
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Le tariffe sono aggiornati in acquisto ricevuta contro ogni voce
 DocType: Warranty Claim,Resolved By,Deliberato dall&#39;Assemblea
 DocType: Bank Guarantee,Start Date,Data di inizio
@@ -4571,26 +4658,27 @@
 DocType: Employee,Educational Qualification,Titolo di Studio
 DocType: Workstation,Operating Costs,Costi operativi
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Azione da effettuarsi se si eccede il budget mensile
-DocType: Purchase Invoice,Submit on creation,Conferma su creazione
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Valuta per {0} deve essere {1}
+DocType: Subscription,Submit on creation,Conferma su creazione
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Valuta per {0} deve essere {1}
 DocType: Asset,Disposal Date,Smaltimento Data
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Messaggi di posta elettronica verranno inviati a tutti i dipendenti attivi della società nell&#39;ora dato, se non hanno le vacanze. Sintesi delle risposte verrà inviata a mezzanotte."
 DocType: Employee Leave Approver,Employee Leave Approver,Responsabile / Approvatore Ferie
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Riga {0}: Una voce di riordino esiste già per questo magazzino {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.",Non può essere dichiarato come perso perché è stato fatto un Preventivo.
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Formazione Commenti
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Riga {0}: Una voce di riordino esiste già per questo magazzino {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.",Non può essere dichiarato come perso perché è stato fatto un Preventivo.
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Formazione Commenti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,L'ordine di produzione {0} deve essere presentato
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Criteri di valutazione dei fornitori
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Scegliere una data di inizio e di fine per la voce {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Corso è obbligatoria in riga {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,'A Data' deve essere successiva a 'Da Data'
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Aggiungi / Modifica prezzi
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Aggiungi / Modifica prezzi
 DocType: Batch,Parent Batch,Parte Batch
 DocType: Cheque Print Template,Cheque Print Template,Modello di stampa dell'Assegno
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Grafico Centro di Costo
 DocType: Lab Test Template,Sample Collection,Raccolta di campioni
 ,Requested Items To Be Ordered,Elementi richiesti da ordinare
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,I Miei Ordini
 DocType: Price List,Price List Name,Prezzo di listino Nome
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Riepilogo giornaliero lavori  per {0}
 DocType: Employee Loan,Totals,Totali
@@ -4609,12 +4697,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} unità di {1} necessarie in {2} su {3} {4} di {5} per completare la transazione.
 DocType: Fee Schedule,Student Category,Student Categoria
 DocType: Announcement,Student,Alunno
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Unità organizzativa ( dipartimento) master.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Unità organizzativa ( dipartimento) master.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Vai alle Camere
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Inserisci il messaggio prima di inviarlo
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,DUPLICARE PER IL FORNITORE
 DocType: Email Digest,Pending Quotations,Preventivi Aperti
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Point-of-Sale Profilo
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Point-of-Sale Profilo
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Configurazioni di test di laboratorio.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Prestiti non garantiti
 DocType: Cost Center,Cost Center Name,Nome Centro di Costo
@@ -4624,6 +4712,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Totale versato Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Messaggio maggiore di 160 caratteri verrà divisa in mesage multipla
 DocType: Purchase Receipt Item,Received and Accepted,Ricevuti e accettati
+DocType: Hub Settings,Company and Seller Profile,Profilo dell&#39;azienda e del venditore
 ,GST Itemised Sales Register,GST Registro delle vendite specificato
 ,Serial No Service Contract Expiry,Serial No Contratto di Servizio di scadenza
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,"Non si può di credito e debito stesso conto , allo stesso tempo"
@@ -4633,10 +4722,11 @@
 DocType: Item,Variant Based On,Variante calcolate in base a
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Weightage totale assegnato dovrebbe essere al 100% . E ' {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,I Vostri Fornitori
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Correggi
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Impossibile impostare come persa come è fatto Sales Order .
 DocType: Request for Quotation Item,Supplier Part No,Articolo Fornitore No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Non può dedurre quando categoria è per &#39;valutazione&#39; o &#39;Vaulation e Total&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Ricevuto da
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Ricevuto da
 DocType: Lead,Converted,Convertito
 DocType: Item,Has Serial No,Ha numero di serie
 DocType: Employee,Date of Issue,Data Pubblicazione
@@ -4644,7 +4734,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Come per le Impostazioni di Acquisto se l&#39;acquisto di Reciept Required == &#39;YES&#39;, quindi per la creazione della fattura di acquisto, l&#39;utente deve creare prima la ricevuta di acquisto per l&#39;elemento {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Fila # {0}: Impostare Fornitore per Articolo {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Riga {0}: valore Ore deve essere maggiore di zero.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Website Immagine {0} collegata alla voce {1} non può essere trovato
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Website Immagine {0} collegata alla voce {1} non può essere trovato
 DocType: Issue,Content Type,Tipo Contenuto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,computer
 DocType: Item,List this Item in multiple groups on the website.,Elenco questo articolo a più gruppi sul sito.
@@ -4655,14 +4745,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Ottieni entrate non riconciliate
 DocType: Payment Reconciliation,From Invoice Date,Da Data fattura
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Non hai il permesso di presentare
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,La Valuta di fatturazione deve essere uguale alla valuta di default dell'azienda o del conto del Partner
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,La Valuta di fatturazione deve essere uguale alla valuta di default dell'azienda o del conto del Partner
 DocType: Healthcare Settings,Laboratory Settings,Impostazioni di laboratorio
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,lasciare Incasso
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Che cosa fa ?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Al Magazzino
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Tutte le ammissioni degli studenti
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Che cosa fa ?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Al Magazzino
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Tutte le ammissioni degli studenti
 ,Average Commission Rate,Tasso medio di commissione
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,'Ha un numero di serie' non può essere 'Sì' per gli articoli non in scorta
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,'Ha un numero di serie' non può essere 'Sì' per gli articoli non in scorta
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Seleziona Stato
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,La Presenza non può essere inserita nel futuro
 DocType: Pricing Rule,Pricing Rule Help,Regola Prezzi Aiuto
@@ -4680,40 +4770,40 @@
 DocType: Item,Customer Code,Codice Cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Promemoria Compleanno per {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Giorni dall'ultimo ordine
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Debito Per account deve essere un account di Stato Patrimoniale
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Debito Per account deve essere un account di Stato Patrimoniale
 DocType: Buying Settings,Naming Series,Denominazione Serie
 DocType: Leave Block List,Leave Block List Name,Lascia Block List Nome
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Assicurazione Data di inizio deve essere inferiore a Assicurazione Data Fine
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Impostare il Sistema di denominazione dell&#39;istituto in Scuola&gt; Impostazioni scolastiche
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Attivo Immagini
 DocType: Timesheet,Production Detail,Particolare di produzione
+DocType: Restaurant,Active Menu,Menu attivo
 DocType: Target Detail,Target Qty,Obiettivo Qtà
 DocType: Shopping Cart Settings,Checkout Settings,Impostazioni Acquista
 DocType: Attendance,Present,Presente
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Il Documento di Trasporto {0} non deve essere presentato
-DocType: Notification Control,Sales Invoice Message,Fattura Messaggio
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Il Documento di Trasporto {0} non deve essere presentato
+DocType: Notification Control,Sales Invoice Message,Messaggio Fattura di Vendita
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Chiusura account {0} deve essere di tipo Responsabilità / Patrimonio netto
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Salario Slip of dipendente {0} già creato per foglio di tempo {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Salario Slip of dipendente {0} già creato per foglio di tempo {1}
 DocType: Vehicle Log,Odometer,Odometro
 DocType: Sales Order Item,Ordered Qty,Quantità ordinato
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Articolo {0} è disattivato
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Articolo {0} è disattivato
 DocType: Stock Settings,Stock Frozen Upto,Giacenza Bloccate Fino
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM non contiene alcun elemento magazzino
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Attività / attività del progetto.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM non contiene alcun elemento magazzino
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Attività / attività del progetto.
 DocType: Vehicle Log,Refuelling Details,Dettagli di rifornimento
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generare buste paga
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","L'acquisto deve essere controllato, se ""applicabile per"" bisogna selezionarlo come {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Sconto deve essere inferiore a 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Ultimo tasso di acquisto non trovato
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Scrivi Off Importo (Società valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Ore di fatturazione
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,Distinta Materiali predefinita per {0} non trovato
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Fila # {0}: Si prega di impostare la quantità di riordino
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Distinta Materiali predefinita per {0} non trovato
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Fila # {0}: Si prega di impostare la quantità di riordino
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Tocca gli elementi da aggiungere qui
 DocType: Fees,Program Enrollment,programma Iscrizione
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Voucher Cost
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Impostare {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Ripetere il Giorno del mese
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} è uno studente inattivo
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} è uno studente inattivo
 DocType: Employee,Health Details,Dettagli Salute
 DocType: Offer Letter,Offer Letter Terms,Termini di Offerta
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Per creare un Riferimento di Richiesta di Pagamento è necessario un Documento
@@ -4721,7 +4811,6 @@
 DocType: Employee External Work History,Salary,Stipendio
 DocType: Serial No,Delivery Document Type,Tipo Documento Consegna
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Presenta tutte le buste paga per i criteri sopra selezionati
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} elementi sincronizzati
 DocType: Sales Order,Partly Delivered,Parzialmente Consegnato
 DocType: Email Digest,Receivables,Crediti
 DocType: Lead Source,Lead Source,Fonte del Lead
@@ -4732,7 +4821,7 @@
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Data di manutenzione
 DocType: Purchase Invoice Item,Rejected Serial No,Rifiutato Serial No
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,La data di inizio o di fine Anno si sovrappone {0}. Per risolvere questo problema impostare l'Azienda
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,La data di inizio o di fine Anno si sovrappone con {0}. Per risolvere questo problema impostare l'Azienda
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +94,Please mention the Lead Name in Lead {0},Si prega di citare il Lead Name in Lead {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Data di inizio dovrebbe essere inferiore a quella di fine per la voce {0}
 DocType: Item,"Example: ABCD.#####
@@ -4742,19 +4831,19 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Gamma Ageing 2
 DocType: SG Creation Tool Course,Max Strength,Forza Max
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM sostituita
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Selezionare gli elementi in base alla data di consegna
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Selezionare gli elementi in base alla data di consegna
 ,Sales Analytics,Analisi dei dati di vendita
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Disponibile {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Disponibile {0}
 ,Prospects Engaged But Not Converted,Prospettive impegnate ma non convertite
 DocType: Manufacturing Settings,Manufacturing Settings,Impostazioni di Produzione
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configurazione della posta elettronica
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 mobile No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Inserisci valuta predefinita in Azienda Maestro
 DocType: Stock Entry Detail,Stock Entry Detail,Dettaglio del Movimento di Magazzino
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Promemoria quotidiani
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Promemoria quotidiani
 DocType: Products Settings,Home Page is Products,La Home Page è Prodotti
 ,Asset Depreciation Ledger,Libro Mastro ammortamento degli asset
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Conflitti norma fiscale con {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Conflitti norma fiscale con {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nuovo Nome Account
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Costo Fornitura Materie Prime
 DocType: Selling Settings,Settings for Selling Module,Impostazioni per il Modulo Vendite
@@ -4768,8 +4857,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,L'Articolo {0} deve essere in Giacenza
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Deposito di default per Work In Progress
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Impostazioni predefinite per le operazioni contabili.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Impostare il sistema di denominazione dei dipendenti in risorse umane&gt; Impostazioni HR
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Data prevista non può essere precedente Material Data richiesta
+DocType: Restaurant,Default Tax Template,Modello fiscale predefinito
 DocType: Fees,Student Details,Dettagli dello studente
 DocType: Purchase Invoice Item,Stock Qty,Quantità di magazzino
 DocType: Employee Loan,Repayment Period in Months,Il rimborso Periodo in mese
@@ -4787,8 +4877,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Vai a Elementi
 DocType: Sales Partner,Partner Type,Tipo di partner
 DocType: Purchase Taxes and Charges,Actual,Attuale
+DocType: Restaurant Menu,Restaurant Manager,Gestore del ristorante
 DocType: Authorization Rule,Customerwise Discount,Sconto Cliente saggio
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Timesheet per le attività.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Scheda attività per le attività.
 DocType: Purchase Invoice,Against Expense Account,Per Spesa Conto
 DocType: Production Order,Production Order,Ordine di produzione
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Nota Installazione {0} già inserita
@@ -4796,7 +4887,6 @@
 DocType: Quotation Item,Against Docname,Per Nome Doc
 DocType: SMS Center,All Employee (Active),Tutti Dipendenti (Attivi)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Guarda ora
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Selezionare il periodo in cui la fattura viene generato automaticamente
 DocType: BOM,Raw Material Cost,Costo Materie Prime
 DocType: Item Reorder,Re-Order Level,Livello Ri-ordino
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Inserisci articoli e q.tà programmate per i quali si desidera raccogliere gli ordini di produzione o scaricare materie prime per l'analisi.
@@ -4809,23 +4899,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Tipo di Report è obbligatorio
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Magazzino è obbligatorio per l'Articolo in Giacenza {0} alla Riga {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Aggiungi programmi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Wholesale
 DocType: Issue,First Responded On,Ha risposto prima su
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Croce Listing dell'oggetto in più gruppi
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Anno fiscale Data di inizio e Data Fine dell'anno fiscale sono già impostati nel Fiscal Year {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Liquidazione Data di aggiornamento
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split Batch
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Riconciliati correttamente
 DocType: Request for Quotation Supplier,Download PDF,Scarica il pdf
 DocType: Production Order,Planned End Date,Data di fine pianificata
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Inserisci la data di programma
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Dove gli elementi vengono memorizzati.
 DocType: Request for Quotation,Supplier Detail,Dettaglio del Fornitore
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Errore nella formula o una condizione: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Importo fatturato
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Errore nella formula o una condizione: {0}
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Importo Fatturato
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,I pesi dei criteri devono aggiungere fino al 100%
 DocType: Attendance,Attendance,Presenze
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,Articoli di magazzino
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,Articoli di magazzino
 DocType: BOM,Materials,Materiali
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Se non controllati, la lista dovrà essere aggiunto a ciascun Dipartimento dove deve essere applicato."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Magazzino di Origine e di Destinazione non possono essere uguali
@@ -4843,6 +4933,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,Sul Totale Netto
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Valore per l&#39;attributo {0} deve essere all&#39;interno della gamma di {1} a {2} nei incrementi di {3} per la voce {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Magazzino di Destinazione sul rigo {0} deve essere uguale a quello dell'ordine di produzione
+DocType: Restaurant Reservation,Waitlisted,lista d&#39;attesa
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Valuta non può essere modificata dopo aver fatto le voci utilizzando qualche altra valuta
 DocType: Vehicle Service,Clutch Plate,Frizione
 DocType: Company,Round Off Account,Arrotondamento Account
@@ -4852,14 +4943,14 @@
 DocType: Journal Entry,Subscription,Sottoscrizione
 DocType: Purchase Invoice,Contact Email,Email Contatto
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Fee Creation In attesa
-DocType: Appraisal Goal,Score Earned,Punteggio Earned
+DocType: Appraisal Goal,Score Earned,Punteggio Guadagnato
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +229,Notice Period,Periodo Di Preavviso
 DocType: Asset Category,Asset Category Name,Asset Nome Categoria
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Questo è un territorio root e non può essere modificato .
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nome nuova persona vendite
 DocType: Packing Slip,Gross Weight UOM,Peso lordo U.M.
 DocType: Delivery Note Item,Against Sales Invoice,Per Fattura Vendita
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Inserisci i numeri di serie per l&#39;articolo serializzato
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Inserisci i numeri di serie per l&#39;articolo serializzato
 DocType: Bin,Reserved Qty for Production,Riservato Quantità per Produzione
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Lasciate non selezionate se non si desidera considerare il gruppo durante la creazione di gruppi basati sul corso.
 DocType: Asset,Frequency of Depreciation (Months),Frequenza di ammortamento (Mesi)
@@ -4870,7 +4961,7 @@
 DocType: Lab Test,Test Group,Gruppo di prova
 DocType: Payment Reconciliation,Receivable / Payable Account,Contabilità Clienti /Fornitori
 DocType: Delivery Note Item,Against Sales Order Item,Dall'Articolo dell'Ordine di Vendita
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Si prega di specificare Attributo Valore per l&#39;attributo {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Si prega di specificare Attributo Valore per l&#39;attributo {0}
 DocType: Item,Default Warehouse,Magazzino Predefinito
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Bilancio non può essere assegnato contro account gruppo {0}
 DocType: Healthcare Settings,Patient Registration,Registrazione del paziente
@@ -4899,6 +4990,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Addetto alle vendite
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Bilancio e Centro di costo
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Non è consentito il modo di pagamento multiplo predefinito
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,per il
 ,Appointment Analytics,Appuntamento Analytics
 DocType: Vehicle Service,Half Yearly,Semestrale
 DocType: Lead,Blog Subscriber,Abbonati Blog
@@ -4916,12 +5008,12 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Quot Count
 ,BOM Stock Report,BOM Stock Report
 DocType: Stock Reconciliation Item,Quantity Difference,Quantità Differenza
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Elaborazione paghe
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Elaborazione paghe
 DocType: Opportunity Item,Basic Rate,Tasso Base
 DocType: GL Entry,Credit Amount,Ammontare del credito
 DocType: Cheque Print Template,Signatory Position,Posizione firmatario
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Imposta come persa
-DocType: Timesheet,Total Billable Hours,Totale ore fatturabili
+DocType: Timesheet,Total Billable Hours,Totale Ore Fatturabili
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Nota Ricevuta di pagamento
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Questo si basa su operazioni contro questo cliente. Vedere cronologia sotto per i dettagli
 DocType: Supplier,Credit Days Based On,Giorni di credito in funzione
@@ -4930,12 +5022,12 @@
 DocType: Tax Rule,Tax Rule,Regola fiscale
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Mantenere lo stesso prezzo per tutto il ciclo di vendita
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Pianificare i registri di tempo al di fuori dell&#39;orario di lavoro Workstation.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,I clienti in coda
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} non dispone di un programma medico. Aggiungilo nel master del medico
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,I clienti in coda
 DocType: Student,Nationality,Nazionalità
 ,Items To Be Requested,Articoli da richiedere
-DocType: Purchase Order,Get Last Purchase Rate,Ottieni ultima quotazione acquisto
 DocType: Company,Company Info,Info Azienda
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Selezionare o aggiungere nuovo cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Selezionare o aggiungere nuovo cliente
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Centro di costo è necessario per prenotare un rimborso spese
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Applicazione dei fondi ( Assets )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Questo si basa sulla presenza di questo dipendente
@@ -4943,6 +5035,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Conto di addebito
 DocType: Fiscal Year,Year Start Date,Data di inizio anno
 DocType: Attendance,Employee Name,Nome Dipendente
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Ristorante Articolo di ordinazione voce
 DocType: Sales Invoice,Rounded Total (Company Currency),Totale arrotondato (Azienda valuta)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Non può convertirsi gruppo perché è stato selezionato Tipo di account.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} è stato modificato. Aggiornare prego.
@@ -4953,6 +5046,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Benefici per i dipendenti
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},La quantità imballata deve essere uguale per l'articolo {0} sulla riga {1}
 DocType: Production Order,Manufactured Qty,Q.tà Prodotte
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Fattura creata
 DocType: Purchase Receipt Item,Accepted Quantity,Quantità accettata
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Si prega di impostare un valore predefinito lista per le vacanze per i dipendenti {0} o {1} società
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} non esiste
@@ -4962,18 +5056,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila No {0}: Importo non può essere maggiore di attesa Importo contro Rimborso Spese {1}. In attesa importo è {2}
 DocType: Maintenance Schedule,Schedule,Pianificare
 DocType: Account,Parent Account,Account genitore
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Disponibile
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Disponibile
 DocType: Quality Inspection Reading,Reading 3,Lettura 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher Tipo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Listino Prezzi non trovato o disattivato
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Listino Prezzi non trovato o disattivato
 DocType: Lab Test,Approved,Approvato
 DocType: Pricing Rule,Price,Prezzo
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',Dipendente esonerato da {0} deve essere impostato come 'Congedato'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Dipendente esonerato da {0} deve essere impostato come 'Congedato'
+DocType: Hub Settings,Last Sync On,Ultima sincronizzazione attivata
 DocType: Guardian,Guardian,Custode
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Valutazione {0} creato per Employee {1} nel determinato intervallo di date
 DocType: Employee,Education,Educazione
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,del
 DocType: Selling Settings,Campaign Naming By,Creare il nome Campagna da
 DocType: Employee,Current Address Is,Indirizzo attuale è
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Target di vendita mensile (
@@ -4988,7 +5083,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Codice del corso:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Inserisci il Conto uscite
 DocType: Account,Stock,Magazzino
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Riferimento Tipo di documento deve essere uno di Ordine di Acquisto, fatture di acquisto o diario"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Riferimento Tipo di documento deve essere uno di Ordine di Acquisto, fatture di acquisto o diario"
 DocType: Employee,Current Address,Indirizzo Corrente
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Se l'articolo è una variante di un altro elemento poi descrizione, immagini, prezzi, tasse ecc verrà impostata dal modello se non espressamente specificato"
 DocType: Serial No,Purchase / Manufacture Details,Acquisto / Produzione Dettagli
@@ -5019,7 +5114,7 @@
 DocType: Hub Settings,Hub Settings,Impostazioni Hub
 DocType: Project,Gross Margin %,Margine lordo %
 DocType: BOM,With Operations,Con operazioni
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Scritture contabili sono già stati fatti in valuta {0} per azienda {1}. Si prega di selezionare un account di credito o da pagare con moneta {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Scritture contabili sono già stati fatti in valuta {0} per azienda {1}. Si prega di selezionare un account di credito o da pagare con moneta {0}.
 DocType: Asset,Is Existing Asset,È esistente Asset
 DocType: Salary Detail,Statistical Component,Componente statistico
 DocType: Warranty Claim,If different than customer address,Se diverso da indirizzo del cliente
@@ -5027,13 +5122,14 @@
 DocType: BOM Operation,BOM Operation,Operazione BOM
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Sul valore della riga precedente
 DocType: Student,Home Address,Indirizzo
+DocType: Item,Has Expiry Date,Ha la data di scadenza
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Impostazioni delle varianti dell&#39;elemento.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Trasferimento Asset
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,Trasferimento Asset
 DocType: POS Profile,POS Profile,POS Profilo
 DocType: Training Event,Event Name,Nome dell&#39;evento
 DocType: Physician,Phone (Office),Telefono (Ufficio)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,Ammissione
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Ammissioni per {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,Ammissione
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Ammissioni per {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Stagionalità per impostare i budget, obiettivi ecc"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Nome variabile
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","L'articolo {0} è un modello, si prega di selezionare una delle sue varianti"
@@ -5042,7 +5138,7 @@
 DocType: Assessment Plan,Room,Camera
 DocType: Purchase Order,Advance Paid,Anticipo versato
 DocType: Item,Item Tax,Tasse dell'Articolo
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Materiale al Fornitore
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Materiale al Fornitore
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Accise Fattura
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Soglia {0}% appare più di una volta
 DocType: Expense Claim,Employees Email Id,Email Dipendenti
@@ -5053,32 +5149,30 @@
 DocType: Program,Program Name,Nome programma
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Cnsidera Tasse o Cambio per
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,La q.tà reale è obbligatoria
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} ha attualmente una posizione di valutazione del fornitore {1} e gli ordini di acquisto a questo fornitore dovrebbero essere rilasciati con cautela.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} ha attualmente una posizione di valutazione del fornitore {1} e gli ordini di acquisto a questo fornitore dovrebbero essere rilasciati con cautela.
 DocType: Employee Loan,Loan Type,Tipo di prestito
 DocType: Scheduling Tool,Scheduling Tool,Strumento di pianificazione
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,carta di credito
 DocType: BOM,Item to be manufactured or repacked,Voce da fabbricati o nuovamente imballati
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Impostazioni predefinite per documenti di magazzino .
-DocType: Purchase Invoice,Next Date,Prossima Data
 DocType: Employee Education,Major/Optional Subjects,Principali / Opzionale Soggetti
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
+DocType: Hub Settings,Suspended,Sospeso
 DocType: Training Event,Attendees,I partecipanti
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Qui è possibile mantenere i dettagli della famiglia come il nome e l'occupazione del genitore, coniuge e figli"
 DocType: Academic Term,Term End Date,Data Terminologia fine
-DocType: Hub Settings,Seller Name,Venditore Nome
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Tasse e oneri dedotti (Azienda valuta)
 DocType: Item Group,General Settings,Impostazioni Generali
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Da Valuta e A Valuta non possono essere gli stessi
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Aggiungi istruttori
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,È necessario salvare il modulo prima di procedere
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Si prega di selezionare la società per primo
 DocType: Item Attribute,Numeric Values,Valori numerici
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Allega Logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,I livelli delle scorte
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,I livelli delle scorte
 DocType: Customer,Commission Rate,Tasso Commissione
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Creato {0} scorecard per {1} tra:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Crea variante
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Crea variante
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blocco domande uscita da ufficio.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Tipo di pagamento deve essere uno dei Ricevere, Pay e di trasferimento interno"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analitica
@@ -5093,11 +5187,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Capitale Sociale
 DocType: Shopping Cart Settings,Show Public Attachments,Mostra gli allegati pubblici
 DocType: Packing Slip,Package Weight Details,Pacchetto peso
+DocType: Restaurant Reservation,Reservation Time,Tempo di prenotazione
 DocType: Payment Gateway Account,Payment Gateway Account,Pagamento Conto Gateway
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Dopo il completamento pagamento reindirizzare utente a pagina selezionata.
 DocType: Company,Existing Company,società esistente
 DocType: Healthcare Settings,Result Emailed,Risultato inviato via email
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",La categoria fiscale è stata modificata in &quot;Totale&quot; perché tutti gli articoli sono oggetti non in magazzino
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Codice articolo&gt; Gruppo articoli&gt; Marchio
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Seleziona un file csv
 DocType: Student Leave Application,Mark as Present,Segna come Presente
 DocType: Supplier Scorecard,Indicator Color,Colore dell&#39;indicatore
@@ -5122,11 +5218,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Crea un Insieme di Studenti
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,È Portare Avanti
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Recupera elementi da Distinta Base
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Recupera elementi da Distinta Base
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Giorni per la Consegna
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Data di registrazione deve essere uguale alla data di acquisto {1} per l'asset {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Controllare questo se lo studente è residente presso l&#39;Ostello dell&#39;Istituto.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Si prega di inserire gli ordini di vendita nella tabella precedente
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Si prega di inserire gli ordini di vendita nella tabella precedente
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Buste Paga non Confermate
 ,Stock Summary,Sintesi della
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Trasferire un bene da un magazzino all&#39;altro
@@ -5142,5 +5238,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Riga {0}: addebito iscrizione non può essere collegato con un {1}
 DocType: Journal Entry,Subscription Section,Sezione di sottoscrizione
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Il Conto {0} non esiste
+DocType: Training Event,Training Program,Programma di allenamento
 DocType: Account,Cash,Contante
 DocType: Employee,Short biography for website and other publications.,Breve biografia per il sito web e altre pubblicazioni.
diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv
index 310fdfd..92f7f87 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,給与モード
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,登録
 DocType: Patient,Divorced,離婚
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,すでに同期されたアイテム
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,取引内でのアイテムの複数回追加を許可
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,この保証請求をキャンセルする前に資材訪問{0}をキャンセルしなくてはなりません
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,消費者製品
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,休暇承認者
 DocType: Sales Partner,Dealer,ディーラー
 DocType: Consultation,Investigations,調査
+DocType: Restaurant Order Entry,Click Enter To Add,追加する入力をクリックします
 DocType: Employee,Rented,賃貸
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,ユーザーに適用
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止中の製造指示をキャンセルすることはできません。キャンセルする前に停止解除してください
 DocType: Vehicle Service,Mileage,マイレージ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,本当にこの資産を廃棄しますか？
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,本当にこの資産を廃棄しますか？
 DocType: Drug Prescription,Update Schedule,スケジュールの更新
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,デフォルトサプライヤーを選択
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},価格表{0}には通貨が必要です
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,空室をチェック
 DocType: Job Applicant,Job Applicant,求職者
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,これは、このサプライヤーに対する取引に基づいています。詳細については、以下のタイムラインを参照してください。
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,これ以上、結果はありません。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,法務
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},「実際」タイプの税は行{0}内のアイテム額に含めることはできません
 DocType: Bank Guarantee,Customer,顧客
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),為替レートは {0} と同じでなければなりません {1}（{2}）
 DocType: Sales Invoice,Customer Name,顧客名
 DocType: Vehicle,Natural Gas,天然ガス
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},銀行口座は {0} のように名前を付けることはできません
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},銀行口座は {0} のように名前を付けることはできません
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,会計エントリに対する科目（またはグループ）が作成され、残高が維持されます
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),{0}の残高はゼロより小さくすることはできません（{1}）
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,処理するために提出された給与伝票はありません。
 DocType: Manufacturing Settings,Default 10 mins,デフォルト 10分
 DocType: Leave Type,Leave Type Name,休暇タイプ名
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,オープンを表示
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,上記の繰り返しのために、今日この行動を取ることが必要です
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,シリーズを正常に更新しました
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,チェックアウト
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,提出Accural仕訳
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,受領予定発注アイテム
 DocType: SMS Center,All Supplier Contact,全てのサプライヤー連絡先
 DocType: Support Settings,Support Settings,サポートの設定
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,終了予定日は、予想開始日より前にすることはできません
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,終了予定日は、予想開始日より前にすることはできません
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：単価は {1}と同じである必要があります：{2}（{3} / {4}）
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,新しい休暇申請
 ,Batch Item Expiry Status,バッチ項目の有効期限ステータス
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,銀行為替手形
 DocType: Mode of Payment Account,Mode of Payment Account,支払口座のモード
 DocType: Consultation,Consultation,相談
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,販売と返品
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,バリエーションを表示
 DocType: Academic Term,Academic Term,学術用語
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,材料
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,健康管理
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),支払遅延（日数）
 DocType: Lab Prescription,Lab Prescription,研究室処方
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,価格で並べ替え
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,サービス費用
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},シリアル番号：{0}は既に販売請求書：{1}で参照されています
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,請求
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},シリアル番号：{0}は既に販売請求書：{1}で参照されています
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,請求
 DocType: Maintenance Schedule Item,Periodicity,周期性
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,会計年度{0}が必要です
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,防御
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,行 {0}：
 DocType: Timesheet,Total Costing Amount,総原価計算量
 DocType: Delivery Note,Vehicle No,車両番号
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,価格表を選択してください
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,価格表を選択してください
 DocType: Accounts Settings,Currency Exchange Settings,通貨交換の設定
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,行＃{0}：支払文書がtrasactionを完了するために必要な
 DocType: Production Order Operation,Work In Progress,進行中の作業
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,日付を選択してください
 DocType: Employee,Holiday List,休日のリスト
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,学校でインストラクターのネーミングシステムを設定してください&gt;学校の設定
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,会計士
+DocType: Hub Settings,Selling Price List,販売価格リスト
 DocType: Patient,Tobacco Current Use,たばこの現在の使用
 DocType: Cost Center,Stock User,在庫ユーザー
 DocType: Company,Phone No,電話番号
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,作成したコーススケジュール：
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},新しい{0}：＃{1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},新しい{0}：＃{1}
 ,Sales Partners Commission,販売パートナー手数料
 DocType: Purchase Invoice,Rounding Adjustment,丸め調整
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,略語は5字以上使用することができません
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,親詳細文書名
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",参照：{0}、商品コード：{1}、顧客：{2}
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,kg
-DocType: Student Log,Log,ログ
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,欠員
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0}結果がサブミットされました
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0}結果がサブミットされました
 DocType: Item Attribute,Increment,増分
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,期間
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,倉庫を選択...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,結婚してる
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},{0} は許可されていません
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,からアイテムを取得します
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},納品書{0}に対して在庫を更新することはできません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},納品書{0}に対して在庫を更新することはできません
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},製品{0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,リストされたアイテム
 DocType: Payment Reconciliation,Reconcile,照合
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,年金基金
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,次の減価償却日付は購入日の前にすることはできません
 DocType: Consultation,Consultation Date,相談日
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNextユーザー向けの製品リストおよび検出
 DocType: SMS Center,All Sales Person,全ての営業担当者
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**毎月分配**は、あなたのビジネスで季節を持っている場合は、数ヶ月を横断予算/ターゲットを配布するのに役立ちます。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,アイテムが見つかりません
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,給与構造の欠落
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,アイテムが見つかりません
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,給与構造の欠落
 DocType: Lead,Person Name,人名
 DocType: Sales Invoice Item,Sales Invoice Item,請求明細
 DocType: Account,Credit,貸方
 DocType: POS Profile,Write Off Cost Center,償却コストセンター
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",例えば、「小学校」や「大学」
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",例えば、「小学校」や「大学」
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,在庫レポート
 DocType: Warehouse,Warehouse Detail,倉庫の詳細
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},顧客{0}の与信限度額を超えました {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,期間終了日は、後の項が（アカデミック・イヤー{}）リンクされている年度の年度終了日を超えることはできません。日付を訂正して、もう一度お試しください。
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",資産レコードが項目に対して存在するように、オフにすることはできません「固定資産です」
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",資産レコードが項目に対して存在するように、オフにすることはできません「固定資産です」
 DocType: Vehicle Service,Brake Oil,ブレーキオイル
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,顧客&gt;顧客グループ&gt;テリトリー
 DocType: Tax Rule,Tax Type,税タイプ
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,課税額
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},{0}以前のエントリーを追加または更新する権限がありません
 DocType: BOM,Item Image (if not slideshow),アイテム画像（スライドショーされていない場合）
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,同名の顧客が存在します
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,（時間単価 ÷ 60）× 実際の作業時間
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,行番号{0}：参照伝票タイプは経費請求または仕訳入力のいずれかでなければなりません
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,BOMを選択
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,行番号{0}：参照伝票タイプは経費請求または仕訳入力のいずれかでなければなりません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,BOMを選択
 DocType: SMS Log,SMS Log,SMSログ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,納品済アイテムの費用
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0}上の休日は、日付からと日付までの間ではありません
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,従業員のローン
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,活動ログ：
 DocType: Fee Schedule,Send Payment Request Email,支払い依頼メールを送信する
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,アイテム{0}は、システムに存在しないか有効期限が切れています
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,アイテム{0}は、システムに存在しないか有効期限が切れています
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,不動産
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,決算報告
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,医薬品
@@ -210,17 +213,22 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,インポートログ
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,上記の基準に基づいて、型製造の材料要求を引いて
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,正常に登録されていません。
 DocType: Training Result Employee,Grade,グレード
+DocType: Restaurant Table,No of Seats,席数
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>",動的な件名を追加するには、jinjaタグを使用します。 <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>
 DocType: Sales Invoice Item,Delivered By Supplier,サプライヤーにより配送済
 DocType: SMS Center,All Contact,全ての連絡先
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,すでにBOMを持つすべてのアイテム用に作成した製造指図
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,すでにBOMを持つすべてのアイテム用に作成した製造指図
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,年俸
 DocType: Daily Work Summary,Daily Work Summary,毎日の仕事の概要
 DocType: Period Closing Voucher,Closing Fiscal Year,閉会年度
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} は凍結されています
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,勘定科目表を作成するための既存の会社を選択してください
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} は凍結されています
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,勘定科目表を作成するための既存の会社を選択してください
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,在庫経費
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ターゲット倉庫の選択
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,ターゲット倉庫の選択
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,優先連絡先メールアドレスを入力してください。
 DocType: Program Enrollment,School Bus,スクールバス
 DocType: Journal Entry,Contra Entry,逆仕訳
@@ -238,9 +246,10 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","テンプレートをダウンロードし、適切なデータを記入した後、変更したファイルを添付してください。
 選択した期間内のすべての日付と従業員の組み合わせは、既存の出勤記録と一緒に、テンプレートに入ります"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,アイテム{0}は、アクティブでないか、販売終了となっています
+DocType: Student Admission Program,Minimum Age,最低年齢
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,例：基本的な数学
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",アイテム料金の行{0}に税を含めるには、行{1}の税も含まれていなければなりません
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,人事モジュール設定
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,人事モジュール設定
 DocType: SMS Center,SMS Center,SMSセンター
 DocType: Sales Invoice,Change Amount,変化量
 DocType: BOM Update Tool,New BOM,新しい部品表
@@ -250,7 +259,7 @@
 DocType: Lead,Request Type,要求タイプ
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,従業員作成
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,放送
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,部屋を追加
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),POS（オンライン/オフライン）の設定モード
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,実行
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,作業遂行の詳細
 DocType: Serial No,Maintenance Status,メンテナンスステータス
@@ -273,6 +282,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,価格表は売買に適用可能でなければなりません
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},設置日は、アイテム{0}の納品日より前にすることはできません
 DocType: Pricing Rule,Discount on Price List Rate (%),価格表での割引率（％）
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,生化学
 DocType: Offer Letter,Select Terms and Conditions,規約を選択
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,タイムアウト値
 DocType: Production Planning Tool,Sales Orders,受注
@@ -307,15 +317,15 @@
 DocType: Sales Partner,Reseller,リセラー
 DocType: Codification Table,Medical Code,医療コード
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.",チェックした場合、素材の要求で非在庫品目が含まれます。
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,「会社」を入力してください
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,「会社」を入力してください
 DocType: Delivery Note Item,Against Sales Invoice Item,対販売伝票アイテム
 ,Production Orders in Progress,進行中の製造指示
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,財務によるキャッシュ・フロー
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save",localStorageがいっぱいになった、保存されませんでした
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save",localStorageがいっぱいになった、保存されませんでした
 DocType: Lead,Address & Contact,住所・連絡先
 DocType: Leave Allocation,Add unused leaves from previous allocations,前回の割当から未使用の休暇を追加
 DocType: Sales Partner,Partner website,パートナーサイト
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,アイテムを追加
+DocType: Restaurant Order Entry,Add Item,アイテムを追加
 DocType: Lab Test,Custom Result,カスタム結果
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,担当者名
 DocType: Course Assessment Criteria,Course Assessment Criteria,コースの評価基準
@@ -328,7 +338,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,仕入要求
 DocType: Lab Test,Submitted Date,提出日
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,これは、このプロジェクトに対して作成されたタイムシートに基づいています
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,ネットペイは0未満にすることはできません
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,ネットペイは0未満にすることはできません
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",システムからの繰り返しのエラー通知の送信を停止するには、サブスクリプションのDisabledフィールドをチェックしています
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,選択した休暇承認者のみ、休暇申請を提出可能です
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,退職日は入社日より後でなければなりません
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,年次休暇
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,利益損失
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,リットル
 DocType: Task,Total Costing Amount (via Time Sheet),（タイムシートを介して）総原価計算量
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,学生グループの学生を設定してください
 DocType: Item Website Specification,Item Website Specification,アイテムのWebサイトの仕様
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,休暇
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},アイテム{0}は{1}に耐用年数の終わりに達します
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},アイテム{0}は{1}に耐用年数の終わりに達します
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,銀行エントリー
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,年次
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,在庫棚卸アイテム
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,学生グループ作成ツールコース
 DocType: Lead,Do Not Contact,コンタクト禁止
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,あなたの組織で教える人
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,定期的な請求書を全て追跡するための一意のIDで、提出時に生成されます
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,ソフトウェア開発者
 DocType: Item,Minimum Order Qty,最小注文数量
 DocType: Pricing Rule,Supplier Type,サプライヤータイプ
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,ハブに公開
 DocType: Student Admission,Student Admission,学生の入学
 ,Terretory,地域
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,アイテム{0}をキャンセルしました
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,資材要求
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,アイテム{0}をキャンセルしました
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,資材要求
 DocType: Bank Reconciliation,Update Clearance Date,清算日の更新
 DocType: Item,Purchase Details,仕入詳細
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},仕入注文 {1} の「原材料供給」テーブルにアイテム {0} が見つかりません
 DocType: Patient Relation,Relation,関連
 DocType: Shipping Rule,Worldwide Shipping,全世界出荷
 DocType: Patient Relation,Mother,母
+DocType: Restaurant Reservation,Reservation End Time,予約終了時刻
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,お客様からのご注文確認。
 DocType: Purchase Receipt Item,Rejected Quantity,拒否された数量
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,支払い要求{0}が作成されました
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,支払い要求{0}が作成されました
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,低感度
 DocType: Notification Control,Notification Control,通知制御
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,トレーニングが完了したら、確認してください
 DocType: Lead,Suggestions,提案
@@ -388,7 +401,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,従業員に選択された好適な電子メールに基づいて、従業員への電子メールの給与スリップ
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,リストに最初に追加される休暇承認者は、デフォルト休暇承認者として設定されます。
 DocType: Tax Rule,Shipping County,配送郡
-apps/erpnext/erpnext/config/desktop.py +158,Learn,学ぶ
+apps/erpnext/erpnext/config/desktop.py +159,Learn,学ぶ
 DocType: Asset,Next Depreciation Date,次の減価償却日
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,従業員一人あたりの活動費用
 DocType: Accounts Settings,Settings for Accounts,アカウント設定
@@ -399,13 +412,13 @@
 DocType: Item,Synced With Hub,ハブと同期
 DocType: Vehicle,Fleet Manager,フリートマネージャ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},行番号{0}：{1}項目{2}について陰性であることができません
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,間違ったパスワード
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,間違ったパスワード
 DocType: Item,Variant Of,バリエーション元
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',完成した数量は「製造数量」より大きくすることはできません
 DocType: Period Closing Voucher,Closing Account Head,決算科目
 DocType: Employee,External Work History,職歴（他社）
 DocType: Physician,Time per Appointment,アポイントメント1人当たりの時間
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,循環参照エラー
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,循環参照エラー
 DocType: Appointment Type,Is Inpatient,入院していますか？
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1名
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,納品書を保存すると「表記（エクスポート）」が表示されます。
@@ -414,19 +427,18 @@
 DocType: Lead,Industry,業種
 DocType: Employee,Job Profile,職務内容
 DocType: BOM Item,Rate & Amount,レートと金額
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,セットアップ&gt;ナンバリングシリーズで出席者用のナンバリングシリーズをセットアップしてください
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,これは、この会社に対する取引に基づいています。詳細は以下のタイムラインをご覧ください
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,自動的な資材要求の作成時にメールで通知
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,耐性
 DocType: Journal Entry,Multi Currency,複数通貨
 DocType: Payment Reconciliation Invoice,Invoice Type,請求書タイプ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,顧客&gt;顧客グループ&gt;テリトリー
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,納品書
 DocType: Consultation,Encounter Impression,出会いの印象
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,税設定
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,販売資産の取得原価
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,支払エントリが変更されています。引用しなおしてください
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,アイテムの税金に{0}が2回入力されています
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,今週と保留中の活動の概要
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,アイテムの税金に{0}が2回入力されています
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,今週と保留中の活動の概要
 DocType: Student Applicant,Admitted,認められました
 DocType: Workstation,Rent Cost,地代・賃料
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,減価償却後の金額
@@ -441,36 +453,35 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"この商品はテンプレートで、取引内で使用することはできません。
 「コピーしない」が設定されていない限り、アイテムの属性は、バリエーションにコピーされます"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,検討された注文合計
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",従業員の肩書（例：最高経営責任者（CEO）、取締役など）。
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).",従業員の肩書（例：最高経営責任者（CEO）、取締役など）。
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,顧客通貨が顧客の基本通貨に換算されるレート
 DocType: Course Scheduling Tool,Course Scheduling Tool,コーススケジュールツール
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行＃{0}：購入請求書は、既存の資産に対して行うことはできません。{1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[緊急]％sの定期的な％sを作成中にエラーが発生しました
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[緊急]％sの定期的な％sを作成中にエラーが発生しました
 DocType: Item Tax,Tax Rate,税率
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} は従業員 {1} の期間 {2} から {3} へ既に割り当てられています
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,アイテムを選択
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,アイテムを選択
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,仕入請求{0}はすでに提出されています
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},行＃{0}：バッチ番号は {1} {2}と同じである必要があります
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,非グループに変換
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,アイテムのバッチ（ロット）
 DocType: C-Form Invoice Detail,Invoice Date,請求日付
 DocType: GL Entry,Debit Amount,借方金額
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},{0} {1} では会社ごとに1アカウントのみとなります
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,添付ファイルを参照してください
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},{0} {1} では会社ごとに1アカウントのみとなります
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,添付ファイルを参照してください
 DocType: Purchase Order,% Received,％受領
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,学生グループを作成します。
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,セットアップはすでに完了しています！
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,セットアップはすでに完了しています！
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,クレジットメモ金額
 DocType: Setup Progress Action,Action Document,アクション文書
 ,Finished Goods,完成品
 DocType: Delivery Note,Instructions,説明書
 DocType: Quality Inspection,Inspected By,検査担当
 DocType: Maintenance Visit,Maintenance Type,メンテナンスタイプ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0}  -  {1}はコースに登録されていません{2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,商品コード&gt;商品グループ&gt;ブランド
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0}  -  {1}はコースに登録されていません{2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},シリアル番号 {0} は納品書 {1} に記載がありません
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNextデモ
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,アイテムを追加
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,アイテムを追加
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,アイテム品質検査パラメータ
 DocType: Leave Application,Leave Approver Name,休暇承認者名
 DocType: Depreciation Schedule,Schedule Date,期日
@@ -490,7 +501,7 @@
 DocType: Salary Slip Timesheet,Working Hours,労働時間
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,既存のシリーズについて、開始／現在の連続番号を変更します。
 DocType: Dosage Strength,Strength,力
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,新しい顧客を作成します。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,新しい顧客を作成します。
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",複数の価格設定ルールが優先しあった場合、ユーザーは、競合を解決するために、手動で優先度を設定するように求められます。
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,発注書を作成します。
 ,Purchase Register,仕入帳
@@ -509,7 +520,7 @@
 DocType: Lab Test Template,Single,シングル
 DocType: Salary Slip,Total Loan Repayment,合計ローンの返済
 DocType: Account,Cost of Goods Sold,売上原価
-DocType: Purchase Invoice,Yearly,毎年
+DocType: Subscription,Yearly,毎年
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,「コストセンター」を入力してください
 DocType: Drug Prescription,Dosage,投薬量
 DocType: Journal Entry Account,Sales Order,受注
@@ -539,7 +550,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,全製造プロセスの共通設定
 DocType: Accounts Settings,Accounts Frozen Upto,凍結口座上限
 DocType: SMS Log,Sent On,送信済
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,属性 {0} は属性表内で複数回選択されています
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,属性 {0} は属性表内で複数回選択されています
 DocType: HR Settings,Employee record is created using selected field. ,従業員レコードは選択されたフィールドを使用して作成されます。
 DocType: Sales Order,Not Applicable,特になし
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,休日マスター
@@ -564,13 +575,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,割り当てられた総葉は必須です
 DocType: Patient,AB Positive,ABポジティブ
 DocType: Job Opening,Description of a Job Opening,求人の説明
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,今日のために保留中の活動
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,今日のために保留中の活動
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,出勤レコード
 DocType: Salary Structure,Salary Component for timesheet based payroll.,タイムシートベースの給与の給与コンポーネント。
 DocType: Sales Order Item,Used for Production Plan,生産計画に使用
 DocType: Employee Loan,Total Payment,お支払い総額
 DocType: Manufacturing Settings,Time Between Operations (in mins),操作の間の時間（分単位）
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1}は取り消され、アクションは完了できません
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1}は取り消され、アクションは完了できません
 DocType: Customer,Buyer of Goods and Services.,物品・サービスのバイヤー
 DocType: Journal Entry,Accounts Payable,買掛金
 DocType: Patient,Allergies,アレルギー
@@ -582,22 +593,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,購入注文を警告する
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,あなたの顧客の一部を一覧表示します。彼らは、組織や個人である可能性があります。
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,制作するのに十分なパーツ
+DocType: POS Profile User,POS Profile User,POSプロファイルユーザー
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,直接利益
 DocType: Patient Appointment,Date TIme,日付時刻
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",アカウント別にグループ化されている場合、アカウントに基づいてフィルタリングすることはできません
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,管理担当者
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,コースを選択してください
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,コースを選択してください
 DocType: Codification Table,Codification Table,コード化表
 DocType: Timesheet Detail,Hrs,時間
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,会社を選択してください
 DocType: Stock Entry Detail,Difference Account,差損益
 DocType: Purchase Invoice,Supplier GSTIN,サプライヤーGSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,依存するタスク{0}がクローズされていないため、タスクをクローズできません
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,資材要求が発生する倉庫を入力してください
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,依存するタスク{0}がクローズされていないため、タスクをクローズできません
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,資材要求が発生する倉庫を入力してください
 DocType: Production Order,Additional Operating Cost,追加の営業費用
 DocType: Lab Test Template,Lab Routine,ラボルーチン
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,化粧品
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items",マージするには、両方のアイテムで次の属性が同じである必要があります。
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items",マージするには、両方のアイテムで次の属性が同じである必要があります。
 DocType: Shipping Rule,Net Weight,正味重量
 DocType: Employee,Emergency Phone,緊急電話
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,購入
@@ -607,7 +619,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,しきい値0％のグレードを定義してください
 DocType: Sales Order,To Deliver,配送する
 DocType: Purchase Invoice Item,Item,アイテム
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,シリアル番号の項目は、分数ではできません
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,高感度
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,シリアル番号の項目は、分数ではできません
 DocType: Journal Entry,Difference (Dr - Cr),差額（借方 - 貸方）
 DocType: Account,Profit and Loss,損益
 DocType: Patient,Risk Factors,危険因子
@@ -616,7 +629,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,業務委託管理
 DocType: Vital Signs,Body Temperature,体温
 DocType: Project,Project will be accessible on the website to these users,プロジェクトでは、これらのユーザーにウェブサイト上でアクセスできるようになります
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,プロジェクトタイプを定義します。
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,プロジェクトタイプを定義します。
 DocType: Supplier Scorecard,Weighting Function,加重関数
 DocType: Physician,OP Consulting Charge,OPコンサルティング料金
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,あなたのセットアップ
@@ -630,7 +643,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,増分は0にすることはできません
 DocType: Production Planning Tool,Material Requirement,資材所要量
 DocType: Company,Delete Company Transactions,会社の取引を削除
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,リファレンスはありませんし、基準日は、銀行取引のために必須です
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,リファレンスはありませんし、基準日は、銀行取引のために必須です
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,租税公課の追加/編集
 DocType: Payment Entry Reference,Supplier Invoice No,サプライヤー請求番号
 DocType: Territory,For reference,参考のため
@@ -638,12 +651,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions",それは株式取引で使用されているように、{0}シリアル番号を削除することはできません
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),（貸方）を閉じる
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,こんにちは
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,アイテムを移動します
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,アイテムを移動します
 DocType: Serial No,Warranty Period (Days),保証期間（日数）
 DocType: Installation Note Item,Installation Note Item,設置票アイテム
 DocType: Production Plan Item,Pending Qty,保留中の数量
 DocType: Budget,Ignore,無視
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1}アクティブではありません
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1}アクティブではありません
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,印刷用のセットアップチェック寸法
 DocType: Salary Slip,Salary Slip Timesheet,給与スリップタイムシート
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,下請け領収書のために必須のサプライヤーの倉庫
@@ -652,7 +665,7 @@
 DocType: Pricing Rule,Sales Partner,販売パートナー
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,すべてのサプライヤスコアカード。
 DocType: Buying Settings,Purchase Receipt Required,領収書が必要です
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,期首在庫が入力された場合は評価レートは必須です
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,期首在庫が入力された場合は評価レートは必須です
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,請求書テーブルにレコードが見つかりません
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,最初の会社と当事者タイプを選択してください
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,会計年度
@@ -689,7 +702,7 @@
 DocType: Quotation,Quotation To,見積先
 DocType: Lead,Middle Income,中収益
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),開く（貸方）
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,すでに別の測定単位でいくつかのトランザクションを行っているので、項目のデフォルトの単位は、{0}を直接変更することはできません。あなたは、異なるデフォルトのUOMを使用する新しいアイテムを作成する必要があります。
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,すでに別の測定単位でいくつかのトランザクションを行っているので、項目のデフォルトの単位は、{0}を直接変更することはできません。あなたは、異なるデフォルトのUOMを使用する新しいアイテムを作成する必要があります。
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,割当額をマイナスにすることはできません
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,会社を設定してください
 DocType: Purchase Order Item,Billed Amt,支払額
@@ -703,6 +716,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,銀行エントリを作るために決済口座を選択
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll",葉、経費請求の範囲及び給与を管理するために、従業員レコードを作成します。
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,処方期間
+DocType: Restaurant Reservation,Restaurant Reservation,レストラン予約
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,提案の作成
 DocType: Payment Entry Deduction,Payment Entry Deduction,支払エントリ控除
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,他の営業担当者 {0} が同じ従業員IDとして存在します
@@ -710,7 +724,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,マスター
 DocType: Assessment Plan,Maximum Assessment Score,最大の評価スコア
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,銀行取引日を更新
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,タイムトラッキング
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,タイムトラッキング
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,トランスポーラーとのデュプリケート
 DocType: Fiscal Year Company,Fiscal Year Company,会計年度（会社）
 DocType: Packing Slip Item,DN Detail,請求書詳細
@@ -718,8 +732,9 @@
 DocType: Timesheet,Billed,課金
 DocType: Batch,Batch Description,バッチ説明
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,学生グループの作成
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.",ペイメントゲートウェイアカウントが作成されていない、手動で作成してください。
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.",ペイメントゲートウェイアカウントが作成されていない、手動で作成してください。
 DocType: Supplier Scorecard,Per Year,1年当たり
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,DOBごとにこのプログラムの入学資格はない
 DocType: Sales Invoice,Sales Taxes and Charges,販売租税公課
 DocType: Employee,Organization Profile,組織プロファイル
 DocType: Vital Signs,Height (In Meter),高さ（メートルで）
@@ -755,7 +770,7 @@
 DocType: Student Batch Name,Batch Name,バッチ名
 DocType: Fee Validity,Max number of visit,訪問の最大数
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,タイムシートを作成しました：
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},支払方法{0}にデフォルトの現金や銀行口座を設定してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},支払方法{0}にデフォルトの現金や銀行口座を設定してください
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,登録します
 DocType: GST Settings,GST Settings,GSTの設定
 DocType: Selling Settings,Customer Naming By,顧客名設定
@@ -787,15 +802,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,陸揚費用租税公課
 DocType: Production Order Operation,Actual Start Time,実際の開始時間
 DocType: BOM Operation,Operation Time,作業時間
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,仕上げ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,仕上げ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,ベース
 DocType: Timesheet,Total Billed Hours,請求された総時間
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,償却額
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,償却額
 DocType: Leave Block List Allow,Allow User,ユーザを許可
 DocType: Journal Entry,Bill No,請求番号
 DocType: Company,Gain/Loss Account on Asset Disposal,資産売却益/損失勘定
 DocType: Vehicle Log,Service Details,サービスの詳細
-DocType: Purchase Invoice,Quarterly,4半期ごと
+DocType: Subscription,Quarterly,4半期ごと
 DocType: Lab Test Template,Grouped,グループ化された
 DocType: Selling Settings,Delivery Note Required,納品書必須
 DocType: Bank Guarantee,Bank Guarantee Number,銀行保証番号
@@ -804,12 +819,12 @@
 DocType: Student Attendance,Student Attendance,学生の出席
 DocType: Sales Invoice Timesheet,Time Sheet,タイムシート
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,原材料に基づくバックフラッシュ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,アイテムの詳細を入力してください
 DocType: Interest,Interest,関心
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,事前販売
 DocType: Purchase Receipt,Other Details,その他の詳細
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,テストテンプレート
+DocType: Restaurant Order Entry Item,Served,奉仕した
 DocType: Account,Accounts,アカウント
 DocType: Vehicle,Odometer Value (Last),オドメーター値（最終）
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,サプライヤスコアカード基準のテンプレート。
@@ -821,25 +836,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,プレビュー給与スリップ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,アカウント{0}を複数回入力されました
 DocType: Account,Expenses Included In Valuation,評価中経費
-DocType: Hub Settings,Seller City,販売者の市区町村
 ,Absent Student Report,不在学生レポート
 DocType: Email Digest,Next email will be sent on:,次のメール送信先：
 DocType: Offer Letter Term,Offer Letter Term,雇用契約書条件
 DocType: Supplier Scorecard,Per Week,毎週
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,アイテムはバリエーションがあります
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,アイテムはバリエーションがあります
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,総学生
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,アイテム{0}が見つかりません
 DocType: Bin,Stock Value,在庫価値
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,手数料の記録はバックグラウンドで作成されます。エラーが発生した場合は、エラーメッセージがスケジュールに反映されます。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,当社{0}は存在しません。
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0}は{1}になるまで有効です
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0}は{1}になるまで有効です
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,ツリー型
 DocType: BOM Explosion Item,Qty Consumed Per Unit,単位当たり消費数量
 DocType: Serial No,Warranty Expiry Date,保証有効期限
 DocType: Material Request Item,Quantity and Warehouse,数量と倉庫
+DocType: Hub Settings,Unregister,登録を解除する
 DocType: Sales Invoice,Commission Rate (%),手数料率（％）
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,プログラムを選択してください
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,プログラムを選択してください
 DocType: Project,Estimated Cost,推定費用
 DocType: Purchase Order,Link to material requests,材料の要求へのリンク
+DocType: Hub Settings,Publish,公開する
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,航空宇宙
 DocType: Journal Entry,Credit Card Entry,クレジットカードエントリ
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,会社およびアカウント
@@ -850,13 +867,12 @@
 DocType: Selling Settings,Close Opportunity After Days,日後に閉じるの機会
 ,Reserved,予約済
 DocType: Purchase Order,Supply Raw Materials,原材料供給
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,次の請求が生成される日（提出すると生成されます）
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,流動資産
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0}は在庫アイテムではありません
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',トレーニングのフィードバックをクリックしてから、あなたのフィードバックをトレーニングにフィードバックしてから、「新規」をクリックしてください。
 DocType: Mode of Payment Account,Default Account,デフォルトアカウント
 DocType: Payment Entry,Received Amount (Company Currency),受け取った金額（会社通貨）
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,リードから機会を作る場合は、リードが設定されている必要があります
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,リードから機会を作る場合は、リードが設定されている必要があります
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,週休日を選択してください
 DocType: Patient,O Negative,Oネガティブ
 DocType: Production Order Operation,Planned End Time,計画終了時間
@@ -872,10 +888,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,エネルギー
 DocType: Opportunity,Opportunity From,機会元
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,月次給与計算書。
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,会社を追加
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}：{1}アイテム{2}に必要なシリアル番号。あなたは{3}を提供しました。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}：{1}アイテム{2}に必要なシリアル番号。あなたは{3}を提供しました。
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,テーブルを選択してください
 DocType: BOM,Website Specifications,ウェブサイトの仕様
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0}は「受信者」のメールアドレスが無効です
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0}は「受信者」のメールアドレスが無効です
 DocType: Special Test Items,Particulars,詳細
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,抗生物質。
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}：タイプ{1}の{0}から
@@ -883,11 +899,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,行{0}：換算係数が必須です
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",複数の価格ルールは、同じ基準で存在し、優先順位を割り当てることにより、競合を解決してください。価格ルール：{0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,別の部品表にリンクされているため、無効化や部品表のキャンセルはできません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,別の部品表にリンクされているため、無効化や部品表のキャンセルはできません
 DocType: Opportunity,Maintenance,メンテナンス
 DocType: Item Attribute Value,Item Attribute Value,アイテムの属性値
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,販売キャンペーン。
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,タイムシートを作成します
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,タイムシートを作成します
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -951,12 +967,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,最初のアイテムを入力してください
 DocType: Account,Liability,負債
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,決済額は、行{0}での請求額を超えることはできません。
+DocType: Salary Detail,Do not include in total,合計に含めないでください
 DocType: Company,Default Cost of Goods Sold Account,製品販売アカウントのデフォルト費用
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,価格表が選択されていません
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,価格表が選択されていません
 DocType: Employee,Family Background,家族構成
 DocType: Request for Quotation Supplier,Send Email,メールを送信
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},注意：不正な添付ファイル{0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,権限がありませんん
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},注意：不正な添付ファイル{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,権限がありませんん
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,見積もり依頼
 DocType: Vital Signs,Heart Rate / Pulse,心拍数/パルス
 DocType: Company,Default Bank Account,デフォルト銀行口座
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",「当事者」に基づいてフィルタリングするには、最初の「当事者タイプ」を選択してください
@@ -983,12 +1001,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,アイテム行{idxの}：{DOCTYPE} {DOCNAME}上に存在しない &#39;{文書型}&#39;テーブル
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,タイムシート{0}はすでに完了またはキャンセルされます
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,いいえタスクはありません
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",自動請求を生成する日付（例：05、28など）
 DocType: Item Variant Settings,Copy Fields to Variant,フィールドをバリアントにコピー
 DocType: Asset,Opening Accumulated Depreciation,減価償却累計額を開きます
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,スコアは5以下でなければなりません
 DocType: Program Enrollment Tool,Program Enrollment Tool,プログラム登録ツール
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,Cフォームの記録
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,Cフォームの記録
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,顧客とサプライヤー
 DocType: Email Digest,Email Digest Settings,メールダイジェスト設定
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,お買い上げくださってありがとうございます！
@@ -1006,13 +1023,13 @@
 DocType: Request for Quotation Supplier,Quote Status,見積もりステータス
 DocType: Maintenance Visit,Completion Status,完了状況
 DocType: HR Settings,Enter retirement age in years,年間で退職年齢を入力してください
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,ターゲット倉庫
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,倉庫を選択してください
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,ターゲット倉庫
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,倉庫を選択してください
 DocType: Cheque Print Template,Starting location from left edge,左端からの位置を開始
 DocType: Item,Allow over delivery or receipt upto this percent,このパーセント以上の配送または受領を許可
 DocType: Stock Entry,STE-,ステ
 DocType: Upload Attendance,Import Attendance,出勤インポート
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,全てのアイテムグループ
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,全てのアイテムグループ
 DocType: Process Payroll,Activity Log,活動ログ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,純損益
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,取引の送信時、自動的にメッセージを作成します。
@@ -1024,7 +1041,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,予想数量
 DocType: Sales Invoice,Payment Due Date,支払期日
 DocType: Drug Prescription,Interval UOM,インターバルUOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,アイテムバリエーション{0}は既に同じ属性で存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,アイテムバリエーション{0}は既に同じ属性で存在しています
+DocType: Item,Hub Publishing Details,ハブ公開の詳細
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',「オープニング」
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,行うにオープン
 DocType: Notification Control,Delivery Note Message,納品書のメッセージ
@@ -1044,10 +1062,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM＃{0}：原材料はメイン商品と同じではありません
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,購入レシートItemsテーブル内の合計有料合計税金、料金と同じでなければなりません
 DocType: Sales Team,Incentives,インセンティブ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,ハブの登録
 DocType: SMS Log,Requested Numbers,要求された番号
 DocType: Production Planning Tool,Only Obtain Raw Materials,原料のみを取得
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,業績評価
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",ショッピングカートが有効になっているとして、「ショッピングカートのために使用する」の有効化とショッピングカートのための少なくとも一つの税務規則があるはずです
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",ショッピングカートが有効になっているとして、「ショッピングカートのために使用する」の有効化とショッピングカートのための少なくとも一つの税務規則があるはずです
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",それはこの請求書には、予めよう引っ張られるべきである場合に支払いエントリ{0}は注文{1}に対してリンクされているが、確認してください。
 DocType: Sales Invoice Item,Stock Details,在庫詳細
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,プロジェクトの価値
@@ -1066,12 +1085,14 @@
 DocType: Salary Slip,Working Days,勤務日
 DocType: Serial No,Incoming Rate,収入レート
 DocType: Packing Slip,Gross Weight,総重量
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,このシステムを設定する会社の名前
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,ハブを有効にする
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,このシステムを設定する会社の名前
 DocType: HR Settings,Include holidays in Total no. of Working Days,営業日数に休日を含む
 DocType: Job Applicant,Hold,保留
 DocType: Employee,Date of Joining,入社日
 DocType: Naming Series,Update Series,シリーズ更新
 DocType: Supplier Quotation,Is Subcontracted,下請け
+DocType: Restaurant Table,Minimum Seating,最小座席
 DocType: Item Attribute,Item Attribute Values,アイテムの属性値
 DocType: Examination Result,Examination Result,テスト結果
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,領収書
@@ -1082,13 +1103,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},操作{1}のための時間スロットは次の{0}日間に存在しません
 DocType: Production Order,Plan material for sub-assemblies,部分組立品資材計画
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,販売パートナーと地域
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,部品表{0}はアクティブでなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,部品表{0}はアクティブでなければなりません
 DocType: Journal Entry,Depreciation Entry,減価償却エントリ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,文書タイプを選択してください
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,このメンテナンス訪問をキャンセルする前に資材訪問{0}をキャンセルしなくてはなりません
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},アイテム {1} に関連付けが無いシリアル番号 {0}
 DocType: Purchase Receipt Item Supplied,Required Qty,必要な数量
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,既存の取引に倉庫は元帳に変換することはできません。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,既存の取引に倉庫は元帳に変換することはできません。
 DocType: Bank Reconciliation,Total Amount,合計
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,インターネット出版
 DocType: Prescription Duration,Number,数
@@ -1099,7 +1120,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,販売価格表
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.",オンにすると、顧客が作成され、患者にマッピングされます。この顧客に対して患者請求書が作成されます。患者作成中に既存の顧客を選択することもできます。
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,同期アイテムを公開
 DocType: Bank Reconciliation,Account Currency,アカウント通貨
 DocType: Lab Test,Sample ID,サンプルID
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,会社の丸め誤差アカウントを指定してください
@@ -1108,11 +1128,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,従業員{0}はアクティブでないか、存在しません
 DocType: Fee Structure,Components,コンポーネント
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},アイテムのアセットカテゴリを入力してください{0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,アイテムバリエーション{0}を更新しました
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,アイテムバリエーション{0}を更新しました
 DocType: Quality Inspection Reading,Reading 6,報告要素6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,することができません{0} {1} {2}任意の負の優れたインボイスなし
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this",生成される。遅れている場合は、この日の &quot;Repeat on Day of Month&quot;フィールドを手動で変更する必要があります
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,することができません{0} {1} {2}任意の負の優れたインボイスなし
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,仕入請求前払
-DocType: Hub Settings,Sync Now,今すぐ同期
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},行{0}：貸方エントリは{1}とリンクすることができません
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,会計年度の予算を定義します。
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,このモードを選択した場合、デフォルトの銀行口座／現金勘定がPOS請求書内で自動的に更新されます。
@@ -1124,13 +1145,13 @@
 DocType: Item,Is Purchase Item,仕入アイテム
 DocType: Asset,Purchase Invoice,仕入請求
 DocType: Stock Ledger Entry,Voucher Detail No,伝票詳細番号
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,新しい売上請求書
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,新しい売上請求書
 DocType: Stock Entry,Total Outgoing Value,支出価値合計
 DocType: Physician,Appointments,予約
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,開始日と終了日は同一会計年度内になければなりません
 DocType: Lead,Request for Information,情報要求
 ,LeaderBoard,リーダーボード
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,同期オフライン請求書
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,同期オフライン請求書
 DocType: Payment Request,Paid,支払済
 DocType: Program Fee,Program Fee,プログラムの料金
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1149,11 +1170,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,発注アイテム
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,間接収入
 DocType: Student Attendance Tool,Student Attendance Tool,学生の出席ツール
+DocType: Restaurant Menu,Price List (Auto created),価格表（自動作成）
 DocType: Cheque Print Template,Date Settings,日付の設定
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,差違
 ,Company Name,（会社名）
 DocType: SMS Center,Total Message(s),全メッセージ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,配送のためのアイテムを選択
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,配送のためのアイテムを選択
 DocType: Purchase Invoice,Additional Discount Percentage,追加割引パーセンテージ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,ヘルプ動画リストを表示
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,小切手が預けられた銀行の勘定科目を選択してください
@@ -1170,6 +1192,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,メーター
 DocType: Workstation,Electricity Cost,電気代
 DocType: HR Settings,Don't send Employee Birthday Reminders,従業員の誕生日リマインダを送信しないでください
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,設定を保存する
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,要求された製品
 DocType: Item,Inspection Criteria,検査基準
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,移転済
 DocType: BOM Website Item,BOM Website Item,BOMのウェブサイトのアイテム
@@ -1188,11 +1212,11 @@
 フォームを保存していないことが原因だと考えられます。
 問題が解決しない場合はsupport@erpnext.comにお問い合わせください。"
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Myカート
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},注文タイプは{0}のいずれかである必要があります
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},注文タイプは{0}のいずれかである必要があります
 DocType: Lead,Next Contact Date,次回連絡日
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,数量を開く
 DocType: Healthcare Settings,Appointment Reminder,アポイントメントリマインダ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,変更金額のためにアカウントを入力してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,変更金額のためにアカウントを入力してください
 DocType: Student Batch Name,Student Batch Name,学生バッチ名
 DocType: Consultation,Doctor,医師
 DocType: Holiday List,Holiday List Name,休日リストの名前
@@ -1200,12 +1224,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,スケジュールコース
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,ストックオプション
 DocType: Journal Entry Account,Expense Claim,経費請求
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,本当にこの廃棄資産を復元しますか？
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},{0}用数量
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,本当にこの廃棄資産を復元しますか？
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},{0}用数量
 DocType: Leave Application,Leave Application,休暇申請
 DocType: Patient,Patient Relation,患者関係
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,休暇割当ツール
+DocType: Item,Hub Category to Publish,公開するハブカテゴリ
 DocType: Leave Block List,Leave Block List Dates,休暇リスト日付
+DocType: Sales Invoice,Billing Address GSTIN,請求先住所GSTIN
 DocType: Workstation,Net Hour Rate,時給総計
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,輸入費用領収書
 DocType: Company,Default Terms,デフォルト規約
@@ -1215,18 +1241,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},{0}を指定してください
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,数量または値の変化のないアイテムを削除しました。
 DocType: Delivery Note,Delivery To,納品先
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,属性表は必須です
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,属性表は必須です
 DocType: Production Planning Tool,Get Sales Orders,注文を取得
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0}はマイナスにできません
 DocType: Training Event,Self-Study,独学
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,割引
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,割引
 DocType: Asset,Total Number of Depreciations,減価償却の合計数
 DocType: Sales Invoice Item,Rate With Margin,利益率
 DocType: Workstation,Wages,賃金
 DocType: Task,Urgent,緊急
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},テーブル{1}内の行{0}の有効な行IDを指定してください
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,変数を見つけることができません：
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,編集するフィールドを数字で選択してください
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,編集するフィールドを数字で選択してください
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,デスクトップに移動しERPNextの使用を開始します
 DocType: Item,Manufacturer,製造元
 DocType: Landed Cost Item,Purchase Receipt Item,領収書アイテム
@@ -1257,8 +1283,8 @@
 DocType: GL Entry,Against,に対して
 DocType: Item,Default Selling Cost Center,デフォルト販売コストセンター
 DocType: Sales Partner,Implementation Partner,導入パートナー
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,郵便番号
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},受注{0}は{1}です
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,郵便番号
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},受注{0}は{1}です
 DocType: Opportunity,Contact Info,連絡先情報
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,在庫エントリを作成
 DocType: Packing Slip,Net Weight UOM,正味重量単位
@@ -1269,6 +1295,7 @@
 DocType: Holiday List,Get Weekly Off Dates,週の休日を取得する
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,終了日は開始日より前にすることはできません
 DocType: Sales Person,Select company name first.,はじめに会社名を選択してください
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,低から高
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,サプライヤーから受け取った見積。
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOMを交換し、すべてのBOMで最新価格を更新する
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},{0} | {1} {2}
@@ -1287,7 +1314,7 @@
 DocType: Program Enrollment,Transportation,輸送
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,無効な属性
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1}は提出しなければなりません
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},数量は以下でなければなりません{0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},数量は以下でなければなりません{0}
 DocType: SMS Center,Total Characters,文字数合計
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},アイテム{0}の部品表フィールドで部品表を選択してください
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-フォーム請求書の詳細
@@ -1302,7 +1329,7 @@
 ,Ordered Items To Be Billed,支払予定注文済アイテム
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,範囲開始は範囲終了よりも小さくなければなりません
 DocType: Global Defaults,Global Defaults,共通デフォルト設定
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,プロジェクトコラボレーション招待
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,プロジェクトコラボレーション招待
 DocType: Salary Slip,Deductions,控除
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,アクション名
@@ -1320,13 +1347,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,前払金
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,要求するものがありません
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},別の予算レコードは、 &#39;{0}&#39;は既にに対して存在します{1} &#39;{2}&#39;年度の{3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',「実際の開始日」は、「実際の終了日」より後にすることはできません
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',「実際の開始日」は、「実際の終了日」より後にすることはできません
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,マネジメント
 DocType: Cheque Print Template,Payer Settings,支払人の設定
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",これはバリエーションのアイテムコードに追加されます。あなたの略称が「SM」であり、アイテムコードが「T-SHIRT」である場合は、バリエーションのアイテムコードは、「T-SHIRT-SM」になります
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,給与伝票を保存すると給与が表示されます。
 DocType: Purchase Invoice,Is Return,返品
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,あぶない
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,あぶない
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,リターン/デビットノート
 DocType: Price List Country,Price List Country,価格表内の国
 DocType: Item,UOMs,数量単位
@@ -1341,17 +1368,18 @@
 DocType: Account,Balance Sheet,貸借対照表
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',アイテムコードのあるアイテムのためのコストセンター
 DocType: Fee Validity,Valid Till,まで有効
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",お支払いモードが設定されていません。アカウントが支払いのモードやPOSプロファイルに設定されているかどうか、確認してください。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",お支払いモードが設定されていません。アカウントが支払いのモードやPOSプロファイルに設定されているかどうか、確認してください。
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,同じアイテムを複数回入力することはできません。
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",アカウントはさらにグループの下に作成できますが、エントリは非グループに対して作成できます
 DocType: Lead,Lead,リード
 DocType: Email Digest,Payables,買掛金
 DocType: Course,Course Intro,コースイントロ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,ストックエントリは、{0}を作成します
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,セットアップ&gt;ナンバリングシリーズで出席者用のナンバリングシリーズをセットアップしてください
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,ストックエントリは、{0}を作成します
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：拒否数量は「購買返品」に入力することはできません
 ,Purchase Order Items To Be Billed,支払予定発注アイテム
 DocType: Purchase Invoice Item,Net Rate,正味単価
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,顧客を選択してください
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,顧客を選択してください
 DocType: Purchase Invoice Item,Purchase Invoice Item,仕入請求アイテム
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,選択された領収書のために在庫元帳エントリと総勘定元帳エントリが再投稿されます
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,アイテム1
@@ -1370,7 +1398,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},行{0}は{1}と重複しています
 ,Trial Balance,試算表
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,年度は、{0}が見つかりません
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,従業員設定
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,従業員設定
 DocType: Sales Order,SO-,そう-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,接頭辞を選択してください
 DocType: Employee,O-,O-
@@ -1382,12 +1410,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,元帳の表示
 DocType: Grading Scale,Intervals,インターバル
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最初
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group",同名のアイテムグループが存在しますので、アイテム名を変えるか、アイテムグループ名を変更してください
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group",同名のアイテムグループが存在しますので、アイテム名を変えるか、アイテムグループ名を変更してください
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,学生モバイル号
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,その他の地域
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,その他の地域
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,アイテム{0}はバッチを持てません
 ,Budget Variance Report,予算差異レポート
 DocType: Salary Slip,Gross Pay,給与総額
+DocType: Item,Is Item from Hub,ハブからのアイテムです
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,行{0}：活動タイプは必須です。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,配当金支払額
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,会計元帳
@@ -1397,8 +1426,9 @@
 DocType: Vehicle Log,Service Detail,サービス詳細
 DocType: BOM,Item Description,アイテム説明
 DocType: Student Sibling,Student Sibling,学生兄弟
-DocType: Purchase Invoice,Is Recurring,繰り返し
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,支払いモード
 DocType: Purchase Invoice,Supplied Items,サプライヤー供給アイテム
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},レストラン{0}のアクティブメニューを設定してください
 DocType: Student,STUD.,STUD。
 DocType: Production Order,Qty To Manufacture,製造数
 DocType: Email Digest,New Income,新しい収入
@@ -1408,6 +1438,7 @@
 ,Student and Guardian Contact Details,学生や保護者連絡先の詳細
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,行{0}：サプライヤーのために{0}メールアドレスは、電子メールを送信するために必要とされます
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,仮勘定期首
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,ハブを表示
 ,Employee Leave Balance,従業員の残休暇数
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},アカウントの残高は{0}は常に{1}でなければなりません
 DocType: Patient Appointment,More Info,詳細情報
@@ -1427,13 +1458,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,受注{0}は有効ではありません
 DocType: Supplier Scorecard,Warn for new Request for Quotations,新しい見積もり要求を警告する
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,購買発注は、あなたの購入を計画し、フォローアップに役立ちます
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged",企業はマージできません
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged",企業はマージできません
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,ラボテストの処方箋
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",素材要求の総発行/転送量{0}が{1} \項目のための要求数量{2}を超えることはできません{3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,S
 DocType: Employee,Employee Number,従業員番号
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},ケース番号が既に使用されています。ケース番号 {0} から試してみてください
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},ケース番号が既に使用されています。ケース番号 {0} から試してみてください
 DocType: Project,% Completed,% 完了
 ,Invoiced Amount (Exculsive Tax),請求額（外税）
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,アイテム2
@@ -1448,11 +1479,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,間接経費
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,行{0}：数量は必須です
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,農業
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,同期マスタデータ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,同期マスタデータ
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,あなたの製品またはサービス
 DocType: Special Test Items,Special Test Items,特別試験項目
 DocType: Mode of Payment,Mode of Payment,支払方法
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,ウェブサイト画像は、公開ファイルまたはウェブサイトのURLを指定する必要があります
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,ウェブサイト画像は、公開ファイルまたはウェブサイトのURLを指定する必要があります
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,これは、ルートアイテムグループであり、編集することはできません。
@@ -1460,24 +1491,23 @@
 DocType: Vehicle,Fuel UOM,燃料UOM
 DocType: Warehouse,Warehouse Contact Info,倉庫連絡先情報
 DocType: Payment Entry,Write Off Difference Amount,差額をオフ書きます
-DocType: Purchase Invoice,Recurring Type,繰り返しタイプ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent",{0}：したがって、電子メールで送信されないことがわかっていない従業員の電子メール、
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent",{0}：したがって、電子メールで送信されないことがわかっていない従業員の電子メール、
 DocType: Item,Foreign Trade Details,外国貿易詳細
+,Assessment Plan Status,アセスメント計画のステータス
 DocType: Email Digest,Annual Income,年間収入
 DocType: Serial No,Serial No Details,シリアル番号詳細
 DocType: Purchase Invoice Item,Item Tax Rate,アイテムごとの税率
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,医師と日付を選択してください
 DocType: Student Group Student,Group Roll Number,グループロール番号
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0}には、別の借方エントリに対する貸方勘定のみリンクすることができます
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,すべてのタスクの重みの合計は1に応じて、すべてのプロジェクトのタスクの重みを調整してくださいする必要があります
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,納品書{0}は提出されていません
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,すべてのタスクの重みの合計は1に応じて、すべてのプロジェクトのタスクの重みを調整してくださいする必要があります
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,納品書{0}は提出されていません
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,アイテム{0}は下請けアイテムでなければなりません
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,資本設備
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",価格設定ルールは、「適用」フィールドに基づき、アイテム、アイテムグループ、ブランドとすることができます。
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,最初に商品コードを設定してください
-DocType: Hub Settings,Seller Website,販売者のウェブサイト
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,最初に商品コードを設定してください
 DocType: Item,ITEM-,項目-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,営業チームの割当率の合計は100でなければなりません
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,営業チームの割当率の合計は100でなければなりません
 DocType: Sales Invoice Item,Edit Description,説明編集
 DocType: Antibiotic,Antibiotic,抗生物質
 ,Team Updates,チームのアップデート
@@ -1498,12 +1528,12 @@
 DocType: Purchase Invoice,Total (Company Currency),計（会社通貨）
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,シリアル番号{0}は複数回入力されています
 DocType: Depreciation Schedule,Journal Entry,仕訳
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,進行中の{0}アイテム
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,進行中の{0}アイテム
 DocType: Workstation,Workstation Name,作業所名
 DocType: Grading Scale Interval,Grade Code,グレードコード
 DocType: POS Item Group,POS Item Group,POSアイテムのグループ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,メールダイジェスト：
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},部品表 {0}はアイテム{1}に属していません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},部品表 {0}はアイテム{1}に属していません
 DocType: Sales Partner,Target Distribution,ターゲット区分
 DocType: Salary Slip,Bank Account No.,銀行口座番号
 DocType: Naming Series,This is the number of the last created transaction with this prefix,この接頭辞が付いた最新の取引番号です
@@ -1519,10 +1549,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,見積サプライヤー要求
 DocType: Healthcare Settings,Registration Message,登録メッセージ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,ハードウェア
-DocType: Sales Order,Recurring Upto,定期的な点で最大
 DocType: Prescription Dosage,Prescription Dosage,処方用量
 DocType: Attendance,HR Manager,人事マネージャー
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,会社を選択してください
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,会社を選択してください
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,特別休暇
 DocType: Purchase Invoice,Supplier Invoice Date,サプライヤー請求日
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,毎
@@ -1538,10 +1567,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,次の条件が重複しています：
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,対仕訳{0}はすでにいくつか他の伝票に対して適応されています
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,注文価値合計
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,食べ物
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,食べ物
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,エイジングレンジ３
 DocType: Maintenance Schedule Item,No of Visits,訪問なし
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},{1}に対してメンテナンススケジュール{0}が存在します
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,アイテムをハブに公開しますか？
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,入学学生
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},締めるアカウントの通貨は {0} でなければなりません
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},全目標のポイントの合計は100でなければなりませんが、{0}になっています
@@ -1552,9 +1582,9 @@
 DocType: Authorization Rule,Average Discount,平均割引
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,ユーティリティー
-DocType: Purchase Invoice Item,Accounting,会計
+DocType: POS Profile,Accounting,会計
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,バッチ品目のロットを選択してください
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,バッチ品目のロットを選択してください
 DocType: Asset,Depreciation Schedules,減価償却スケジュール
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,申請期間は休暇割当期間外にすることはできません
 DocType: Activity Cost,Projects,プロジェクト
@@ -1570,7 +1600,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',承認ステータスは「承認」または「拒否」でなければなりません
 DocType: Physician,Contacts and Address,連絡先と住所
 DocType: Purchase Invoice,Contact Person,担当者
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',「開始予定日」は、「終了予定日」より後にすることはできません
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',「開始予定日」は、「終了予定日」より後にすることはできません
 DocType: Course Scheduling Tool,Course End Date,コース終了日
 DocType: Holiday List,Holidays,休日
 DocType: Sales Order Item,Planned Quantity,計画数
@@ -1578,10 +1608,11 @@
 DocType: Item,Maintain Stock,在庫維持
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,製造指示が作成済の在庫エントリー
 DocType: Employee,Prefered Email,れる好ましいメール
+DocType: Student Admission,Eligibility and Details,資格と詳細
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,固定資産の純変動
 DocType: Leave Control Panel,Leave blank if considered for all designations,全ての肩書を対象にする場合は空白のままにします
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}の料金タイプ「実費」はアイテムの料金に含めることはできません
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},最大：{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},最大：{0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,開始日時
 DocType: Email Digest,For Company,会社用
 apps/erpnext/erpnext/config/support.py +17,Communication log.,通信ログ。
@@ -1589,19 +1620,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,サプライヤスコアカードスコアリング変数
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,購入金額
 DocType: Sales Invoice,Shipping Address Name,配送先住所
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,勘定科目表
 DocType: Material Request,Terms and Conditions Content,規約の内容
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,100を超えることはできません
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
 DocType: Maintenance Visit,Unscheduled,スケジュール解除済
 DocType: Employee,Owned,所有済
 DocType: Salary Detail,Depends on Leave Without Pay,無給休暇に依存
 DocType: Pricing Rule,"Higher the number, higher the priority",大きい数は優先順位が高い
 ,Purchase Invoice Trends,仕入請求傾向
 DocType: Employee,Better Prospects,良い見通し
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",行番号{0}：バッチ{1}には{2}個しかありません。 {3}個の利用可能なバッチを選択するか、行を複数の行に分割して、複数のバッチから配信/発行してください
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",行番号{0}：バッチ{1}には{2}個しかありません。 {3}個の利用可能なバッチを選択するか、行を複数の行に分割して、複数のバッチから配信/発行してください
 DocType: Vehicle,License Plate,ナンバープレート
 DocType: Appraisal,Goals,ゴール
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,POSプロファイルの選択
 DocType: Warranty Claim,Warranty / AMC Status,保証/ 年間保守契約のステータス
 ,Accounts Browser,アカウントブラウザ
 DocType: Payment Entry Reference,Payment Entry Reference,支払エントリ参照
@@ -1620,7 +1651,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,従業員は自分自身に報告することはできません。
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",会計が凍結されている場合、エントリは限られたユーザーに許可されています。
 DocType: Email Digest,Bank Balance,銀行残高
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},{0}の勘定科目では{1}は通貨{2}でのみ作成可能です
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},{0}の勘定科目では{1}は通貨{2}でのみ作成可能です
 DocType: Job Opening,"Job profile, qualifications required etc.",必要な業務内容、資格など
 DocType: Journal Entry Account,Account Balance,口座残高
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,取引のための税ルール
@@ -1629,8 +1660,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),租税公課合計（報告通貨）
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,閉じられていない会計年度のP＆L残高を表示
 DocType: Lab Test Template,Collection Details,コレクションの詳細
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0",tabConsultation ct、 `tabLab Prescription` cp、ct.patient = &#39;{0}&#39;およびcp.parent = ctからcp.name、cp.test_code、cp.parent、cp.invoice、ct.physician、ct.consultation_dateを選択します。名前とcp.test_created = 0
 DocType: Shipping Rule,Shipping Account,出荷アカウント
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}：アカウントは、{2}に不活性であります
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,あなたの仕事を計画に役立つとオンタイム配信するために受注を作ります
@@ -1647,7 +1676,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,梱包伝票
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,事務所賃料
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,SMSゲートウェイの設定
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,インポートが失敗しました！
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,インポートが失敗しました！
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,アドレスがまだ追加されていません
 DocType: Workstation Working Hour,Workstation Working Hour,作業所の労働時間
 DocType: Vital Signs,Blood Pressure,血圧
@@ -1672,7 +1701,7 @@
 DocType: Sales Invoice,Source,ソース
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,クローズ済を表示
 DocType: Leave Type,Is Leave Without Pay,無給休暇
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,資産カテゴリーは、固定資産の項目は必須です
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,資産カテゴリーは、固定資産の項目は必須です
 DocType: Fee Validity,Fee Validity,手数料の妥当性
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,支払テーブルにレコードが見つかりません
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},この{2} {3}の{1}と{0}競合
@@ -1693,8 +1722,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ヘッドハンティング
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,リードを作成します。
 DocType: Maintenance Schedule,Schedules,スケジュール
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,POSプロファイルはPoint-of-Saleを使用する必要があります
 DocType: Purchase Invoice Item,Net Amount,正味金額
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1}は送信されていないため、アクションは完了できません
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1}は送信されていないため、アクションは完了できません
 DocType: Purchase Order Item Supplied,BOM Detail No,部品表詳細番号
 DocType: Landed Cost Voucher,Additional Charges,追加料金
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),追加割引額（会社通貨）
@@ -1703,7 +1733,7 @@
 ,Support Hour Distribution,サポート時間配分
 DocType: Maintenance Visit,Maintenance Visit,メンテナンスのための訪問
 DocType: Student,Leaving Certificate Number,証明書番号を残します
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}",予定がキャンセルされました。請求書{0}を確認してキャンセルしてください。
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}",予定がキャンセルされました。請求書{0}を確認してキャンセルしてください。
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,倉庫での利用可能なバッチ数量
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,更新印刷フォーマット
 DocType: Landed Cost Voucher,Landed Cost Help,陸揚費用ヘルプ
@@ -1727,8 +1757,8 @@
 DocType: Patient,Tobacco Past Use,タバコ過去使用
 DocType: Sales Invoice Item,Brand Name,ブランド名
 DocType: Purchase Receipt,Transporter Details,輸送業者詳細
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},ユーザー{0}は既に医師{1}に割り当てられています
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,デフォルトの倉庫は、選択した項目のために必要とされます
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},ユーザー{0}は既に医師{1}に割り当てられています
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,デフォルトの倉庫は、選択した項目のために必要とされます
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,箱
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,可能性のあるサプライヤー
 DocType: Budget,Monthly Distribution,月次配分
@@ -1738,7 +1768,7 @@
 DocType: Sales Partner,Sales Partner Target,販売パートナー目標
 DocType: Loan Type,Maximum Loan Amount,最大融資額
 DocType: Pricing Rule,Pricing Rule,価格設定ルール
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},生徒{0}のロール番号が重複しています
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},生徒{0}のロール番号が重複しています
 DocType: Budget,Action if Annual Budget Exceeded,アクションの年間予算は、超えた場合
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,仕入注文のための資材要求
 DocType: Shopping Cart Settings,Payment Success URL,支払成功URL
@@ -1755,7 +1785,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0}が重複しています
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},発注{2}に対して{1}より{0}以上を配送することはできません
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},休暇は{0}に正常に割り当てられました
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,梱包するアイテムはありません
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,梱包するアイテムはありません
 DocType: Shipping Rule Condition,From Value,値から
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,製造数量は必須です
 DocType: Employee Loan,Repayment Method,返済方法
@@ -1769,6 +1799,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,在庫負債
 DocType: Purchase Invoice,Supplier Warehouse,サプライヤー倉庫
 DocType: Opportunity,Contact Mobile No,連絡先携帯番号
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,会社を選択
 ,Material Requests for which Supplier Quotations are not created,サプライヤー見積が作成されていない資材要求
 DocType: Student Group,Set 0 for no limit,制限なしの場合は0を設定します
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,あなたは休暇を申請された日（複数可）は祝日です。あなたは休暇を申請する必要はありません。
@@ -1778,24 +1809,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,見積を作成
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,その他のレポート
 DocType: Dependent Task,Dependent Task,依存タスク
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},デフォルト数量単位は、行{0}の1でなければなりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},デフォルト数量単位は、行{0}の1でなければなりません
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},休暇タイプ{0}は、{1}よりも長くすることはできません
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,事前にX日の業務を計画してみてください
 DocType: HR Settings,Stop Birthday Reminders,誕生日リマインダを停止
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},当社ではデフォルトの給与支払ってくださいアカウントを設定してください{0}
 DocType: SMS Center,Receiver List,受領者リスト
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,探索項目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,探索項目
 DocType: Patient Appointment,Referring Physician,参照医師
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,消費額
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,現金の純変更
 DocType: Assessment Plan,Grading Scale,評価尺度
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,数量{0}が変換係数表に複数回記入されました。
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,すでに完了
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,数量{0}が変換係数表に複数回記入されました。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,すでに完了
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,手持ちの在庫
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},支払い要求がすでに存在している{0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,課題アイテムの費用
 DocType: Physician,Hospital,病院
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},数量は{0}以下でなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},数量は{0}以下でなければなりません
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,前会計年度が閉じられていません
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),期間（日）
 DocType: Quotation Item,Quotation Item,見積項目
@@ -1806,8 +1837,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,サプライヤータイプマスター
 DocType: Purchase Order Item,Supplier Part Number,サプライヤー部品番号
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,変換率は0か1にすることはできません
-DocType: Sales Invoice,Reference Document,参照文書
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1}はキャンセルまたは停止しています
+DocType: Subscription,Reference Document,参照文書
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1}はキャンセルまたは停止しています
 DocType: Accounts Settings,Credit Controller,与信管理
 DocType: Delivery Note,Vehicle Dispatch Date,配車日
 DocType: Healthcare Settings,Default Medical Code Standard,デフォルトの医療コード標準
@@ -1816,6 +1847,7 @@
 DocType: Company,Default Payable Account,デフォルト買掛金勘定
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",オンラインショッピングカート設定（出荷ルール・価格表など）
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}％支払済
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,価格で並べ替え...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,予約数量
 DocType: Party Account,Party Account,当事者アカウント
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,人事
@@ -1827,13 +1859,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,支出項目を作成します
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,行{0}：サプライヤーに対して事前に引き落としされなければなりません
 DocType: Company,Default Values,デフォルト値
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{頻度}ダイジェスト
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{頻度}ダイジェスト
 DocType: Expense Claim,Total Amount Reimbursed,総払戻額
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,これは、この車両に対するログに基づいています。詳細については、以下のタイムラインを参照してください。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},対サプライヤー請求書{0} 日付{1}
 DocType: Customer,Default Price List,デフォルト価格表
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,資産運動レコード{0}を作成
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,あなたは年度{0}を削除することはできません。年度{0}はグローバル設定でデフォルトとして設定されています
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,同じ名前の顧客が既に存在している
 DocType: Journal Entry,Entry Type,エントリタイプ
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,この評価グループに関連する評価計画はありません
 ,Customer Credit Balance,顧客貸方残高
@@ -1843,7 +1876,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,価格設定
 DocType: Quotation,Term Details,用語解説
 DocType: Project,Total Sales Cost (via Sales Order),総売上原価（受注による）
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,この学生グループのため{0}の学生よりも多くを登録することはできません。
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,この学生グループのため{0}の学生よりも多くを登録することはできません。
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,リードカウント
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} は0より大きくなければなりません
 DocType: Manufacturing Settings,Capacity Planning For (Days),キャパシティプランニング（日数）
@@ -1859,9 +1892,11 @@
 DocType: Lab Test,Technician Name,技術者の名前
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,請求書のキャンセルにお支払いのリンクを解除
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},入力された現在の走行距離計の読みは、初期の車両走行距離よりも大きくなければなりません{0}
+DocType: Restaurant Reservation,No Show,全く見せない
 DocType: Shipping Rule Country,Shipping Rule Country,国の出荷ルール
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,ままにして、出席
 DocType: Maintenance Visit,Partially Completed,一部完了
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,中程度の感度
 DocType: Leave Type,Include holidays within leaves as leaves,休暇内に休日を休暇として含む
 DocType: Sales Invoice,Packed Items,梱包済アイテム
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,シリアル番号に対する保証請求
@@ -1878,13 +1913,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),支払額（会社通貨）
 DocType: Purchase Invoice,Additional Discount,追加割引
 DocType: Selling Settings,Selling Settings,販売設定
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,アクションを確認する
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,オンラインオークション
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,数量または評価レートのいずれか、または両方を指定してください
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,フルフィルメント
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,カート内を見ます
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,マーケティング費用
 ,Item Shortage Report,アイテム不足レポート
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量が記載されていますので、あわせて「重量単位」を記載してください
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量が記載されていますので、あわせて「重量単位」を記載してください
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,この在庫エントリを作成するために使用される資材要求
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,次の減価償却日は、新しい資産のために必須です
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,バッチごとに個別のコースベースのグループ
@@ -1896,12 +1932,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,各在庫の動きを会計処理のエントリとして作成
 DocType: Leave Allocation,Total Leaves Allocated,休暇割当合計
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},行番号{0}には倉庫が必要です
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,有効な会計年度開始日と終了日を入力してください
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,有効な会計年度開始日と終了日を入力してください
 DocType: Employee,Date Of Retirement,退職日
 DocType: Upload Attendance,Get Template,テンプレートを取得
 DocType: Material Request,Transferred,転送された
 DocType: Vehicle,Doors,ドア
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNextのセットアップが完了！
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNextのセットアップが完了！
 DocType: Healthcare Settings,Collect Fee for Patient Registration,患者登録料を徴収する
 DocType: Course Assessment Criteria,Weightage,重み付け
 DocType: Purchase Invoice,Tax Breakup,税金分割
@@ -1921,36 +1957,36 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",このアイテムにバリエーションがある場合、受注などで選択することができません
 DocType: Lead,Next Contact By,次回連絡
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},行{1}のアイテム{0}に必要な数量
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},行{1}のアイテム{0}に必要な数量
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},アイテム{1}が存在するため倉庫{0}を削除することができません
 DocType: Quotation,Order Type,注文タイプ
-DocType: Purchase Invoice,Notification Email Address,通知メールアドレス
 ,Item-wise Sales Register,アイテムごとの販売登録
 DocType: Asset,Gross Purchase Amount,購入総額
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,開店残高
 DocType: Asset,Depreciation Method,減価償却法
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,オフライン
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,オフライン
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,この税金が基本料金に含まれているか
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,ターゲット合計
 DocType: Job Applicant,Applicant for a Job,求職者
 DocType: Production Plan Material Request,Production Plan Material Request,生産計画資材要求
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,製造指示が作成されていません
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,製造指示が作成されていません
 DocType: Stock Reconciliation,Reconciliation JSON,照合 JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,カラムが多すぎます。レポートをエクスポートして、スプレッドシートアプリケーションを使用して印刷します。
 DocType: Purchase Invoice Item,Batch No,バッチ番号
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},見積依頼：{0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,顧客の発注に対する複数の受注を許可
 DocType: Student Group Instructor,Student Group Instructor,学生グループインストラクター
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2モバイルはありません
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,メイン
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,メイン
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,バリエーション
 DocType: Naming Series,Set prefix for numbering series on your transactions,取引に連番の接頭辞を設定
 DocType: Employee Attendance Tool,Employees HTML,従業員HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,このアイテムまたはテンプレートには、デフォルトの部品表（{0}）がアクティブでなければなりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,このアイテムまたはテンプレートには、デフォルトの部品表（{0}）がアクティブでなければなりません
 DocType: Employee,Leave Encashed?,現金化された休暇？
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,機会元フィールドは必須です
 DocType: Email Digest,Annual Expenses,年間費用
 DocType: Item,Variants,バリエーション
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,発注を作成
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,発注を作成
 DocType: SMS Center,Send To,送信先
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},休暇タイプ{0}のための休暇残が足りません
 DocType: Payment Reconciliation Payment,Allocated amount,割当額
@@ -1966,6 +2002,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,学生グループの強み
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,対仕訳{0}に該当しないエントリ{1}
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,査定
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,トレーニングイベント
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},アイテム{0}に入力されたシリアル番号は重複しています
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,出荷ルールの条件
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,入力してください
@@ -1975,7 +2012,7 @@
 DocType: Sales Order,To Deliver and Bill,配送・請求する
 DocType: Student Group,Instructors,インストラクター
 DocType: GL Entry,Credit Amount in Account Currency,アカウント通貨での貸方金額
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,部品表{0}を登録しなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,部品表{0}を登録しなければなりません
 DocType: Authorization Control,Authorization Control,認証コントロール
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：倉庫拒否は却下されたアイテムに対して必須である{1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,支払
@@ -1994,11 +2031,11 @@
 DocType: Quotation Item,Actual Qty,実際の数量
 DocType: Sales Invoice Item,References,参照
 DocType: Quality Inspection Reading,Reading 10,報告要素10
-DocType: Hub Settings,Hub Node,ハブノード
+DocType: Hub Category,Hub Node,ハブノード
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,同じ商品が重複入力されました。修正してやり直してください
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,同僚
 DocType: Asset Movement,Asset Movement,アセット・ムーブメント
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,新しいカート
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,新しいカート
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,アイテム{0}にはシリアル番号が付与されていません
 DocType: SMS Center,Create Receiver List,受領者リストを作成
 DocType: Vehicle,Wheels,車輪
@@ -2012,15 +2049,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,通信
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),この納品の一部であることを梱包に示します（「下書き」のみ）
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,支払いエントリを作成
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},アイテム{0}の数量は{1}より小さくなければなりません
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},アイテム{0}の数量は{1}より小さくなければなりません
 ,Sales Invoice Trends,請求の傾向
 DocType: Leave Application,Apply / Approve Leaves,休暇を承認／適用
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,ための
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,ための
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',料金タイプが「前行の額」か「前行の合計」である場合にのみ、行を参照することができます
 DocType: Sales Order Item,Delivery Warehouse,配送倉庫
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,金融原価センタのツリー。
 DocType: Serial No,Delivery Document No,納品文書番号
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},当社では「資産売却益/損失勘定 &#39;を設定してください{0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},当社では「資産売却益/損失勘定 &#39;を設定してください{0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,領収書からアイテムを取得
 DocType: Serial No,Creation Date,作成日
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},アイテム{0}が価格表{1}に複数回表れています
@@ -2031,11 +2068,12 @@
 DocType: Student,Student Mobile Number,学生携帯電話番号
 DocType: Item,Has Variants,バリエーションあり
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,レスポンスの更新
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},あなたはすでにから項目を選択した{0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},あなたはすでにから項目を選択した{0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,月次配分の名前
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,バッチIDは必須です
 DocType: Sales Person,Parent Sales Person,親販売担当者
-DocType: Purchase Invoice,Recurring Invoice,定期的な請求
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,高いから低い
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,最初にプログラムを選択する
 DocType: Patient Appointment,Patient Age,患者年齢
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,プロジェクト管理
 DocType: Supplier,Supplier of Goods or Services.,物品やサービスのサプライヤー
@@ -2043,8 +2081,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,コンサルテーション料金を予約するために患者に設定されていない場合に使用されるデフォルトの債権アカウント。
 DocType: Vehicle Log,Fuel Price,燃料価格
 DocType: Budget,Budget,予算
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,セットオープン
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,固定資産の項目は非在庫項目でなければなりません。
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,セットオープン
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,固定資産の項目は非在庫項目でなければなりません。
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",収入または支出でない予算は、{0} に対して割り当てることができません
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,達成
 DocType: Student Admission,Application Form Route,申込書ルート
@@ -2058,12 +2096,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,アイテム{0}にはシリアル番号が設定されていません。アイテムマスタを確認してください。
 DocType: Maintenance Visit,Maintenance Time,メンテナンス時間
 ,Amount to Deliver,配送額
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},同じ項目が複数回入力されました。 {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,期間開始日は、用語がリンクされている年度の年度開始日より前にすることはできません（アカデミック・イヤー{}）。日付を訂正して、もう一度お試しください。
 DocType: Guardian,Guardian Interests,ガーディアン興味
 DocType: Naming Series,Current Value,現在の値
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,日付 {0} には複数の会計年度が存在します。会計年度に会社を設定してください
 DocType: School Settings,Instructor Records to be created by,インストラクターが作成するレコード
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} 作成
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} 作成
 DocType: Delivery Note Item,Against Sales Order,対受注書
 ,Serial No Status,シリアル番号ステータス
 DocType: Payment Entry Reference,Outstanding,傑出した
@@ -2073,10 +2112,10 @@
 						must be greater than or equal to {2}",行{0}：{1}の周期を設定するには、開始日から終了日までの期間が {2} 以上必要です
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,これは、株式の動きに基づいています。詳細については、{0}を参照してください。
 DocType: Pricing Rule,Selling,販売
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},量は{0} {1} {2}に対する控除します
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},量は{0} {1} {2}に対する控除します
 DocType: Employee,Salary Information,給与情報
 DocType: Sales Person,Name and Employee ID,名前と従業員ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,期限日を転記日付より前にすることはできません
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,期限日を転記日付より前にすることはできません
 DocType: Website Item Group,Website Item Group,ウェブサイトの項目グループ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,関税と税金
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,基準日を入力してください
@@ -2103,7 +2142,7 @@
 DocType: Issue,Resolution Details,課題解決詳細
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,割当
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,合否基準
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,上記の表に資材要求を入力してください
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,上記の表に資材要求を入力してください
 DocType: Item Attribute,Attribute Name,属性名
 DocType: BOM,Show In Website,ウェブサイトで表示
 DocType: Shopping Cart Settings,Show Quantity in Website,ウェブサイトでの数量を表示します
@@ -2112,7 +2151,7 @@
 DocType: Item Reorder,Check in (group),（グループ）で確認してください
 ,Qty to Order,注文数
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked",利益/損失が計上された負債または持分の下でアカウントヘッド、
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,すべてのタスクのガントチャート
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,すべてのタスクのガントチャート
 DocType: Opportunity,Mins to First Response,ファースト・レスポンスへの分
 DocType: Pricing Rule,Margin Type,証拠金の種類
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0}時間
@@ -2133,35 +2172,35 @@
 DocType: Patient,Surgical History,外科の歴史
 DocType: Employee,Resignation Letter Date,辞表提出日
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,価格設定ルールは量に基づいてさらにフィルタリングされます
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},従業員{0}の参加日を設定してください
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},従業員{0}の参加日を設定してください
 DocType: Task,Total Billing Amount (via Time Sheet),合計請求金額（タイムシートを介して）
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,リピート顧客の収益
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0}（{1}）は「経費承認者」の権限を持っている必要があります
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,組
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,生産のためのBOMと数量を選択
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,生産のためのBOMと数量を選択
 DocType: Asset,Depreciation Schedule,減価償却スケジュール
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,セールスパートナーのアドレスと連絡先
 DocType: Bank Reconciliation Detail,Against Account,アカウントに対して
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,半日日付は日付からと日付までの間であるべきです
 DocType: Maintenance Schedule Detail,Actual Date,実際の日付
 DocType: Item,Has Batch No,バッチ番号あり
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},年次請求：{0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},年次請求：{0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),財およびサービス税（GSTインド）
 DocType: Delivery Note,Excise Page Number,物品税ページ番号
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory",当社は、日付から現在までには必須です
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,相談から得る
 DocType: Asset,Purchase Date,購入日
 DocType: Employee,Personal Details,個人情報詳細
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},会社の「資産減価償却原価センタ &#39;を設定してください{0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},会社の「資産減価償却原価センタ &#39;を設定してください{0}
 ,Maintenance Schedules,メンテナンス予定
 DocType: Task,Actual End Date (via Time Sheet),（タイムシートを介して）実際の終了日
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},量{0} {1} {2} {3}に対して、
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},量{0} {1} {2} {3}に対して、
 ,Quotation Trends,見積傾向
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},アイテム{0}のアイテムマスターにはアイテムグループが記載されていません
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,借方計上は売掛金勘定でなければなりません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,借方計上は売掛金勘定でなければなりません
 DocType: Shipping Rule Condition,Shipping Amount,出荷量
 DocType: Supplier Scorecard Period,Period Score,期間スコア
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,顧客を追加する
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,顧客を追加する
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,保留中の金額
 DocType: Lab Test Template,Special,特別
 DocType: Purchase Invoice Item,Conversion Factor,換算係数
@@ -2169,13 +2208,14 @@
 ,Vehicle Expenses,車両費
 DocType: Serial No,Invoice Details,請求書の詳細
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},耐用年数後の期待値は以上である必要があります{0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,始める
+DocType: Hub Category,Hub Category,ハブカテゴリ
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,車両番号
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,繰り返し請求停止予定日
 DocType: Employee Loan,Loan Amount,融資額
 DocType: Program Enrollment,Self-Driving Vehicle,自走車
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,サプライヤスコアカード
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},列{0}：部品表項目{1}が見つかりません
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},列{0}：部品表項目{1}が見つかりません
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,総割り当てられた葉{0}の期間のために既に承認された葉{1}より小さくすることはできません
 DocType: Journal Entry,Accounts Receivable,売掛金
 ,Supplier-Wise Sales Analytics,サプライヤーごとのセールス分析
@@ -2186,7 +2226,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)",親コース（親コースの一部でない場合は空欄にしてください）
 DocType: Leave Control Panel,Leave blank if considered for all employee types,全従業員タイプを対象にする場合は空白のままにします
 DocType: Landed Cost Voucher,Distribute Charges Based On,支払按分基準
-apps/erpnext/erpnext/hooks.py +131,Timesheets,タイムシート
+apps/erpnext/erpnext/hooks.py +140,Timesheets,タイムシート
 DocType: HR Settings,HR Settings,人事設定
 DocType: Salary Slip,net pay info,ネット有料情報
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,この値は、デフォルトの販売価格一覧で更新されます。
@@ -2197,7 +2237,7 @@
 DocType: Patient,B Positive,Bポジティブ
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行＃{0}：項目は固定資産であるとして数量は、1でなければなりません。複数の数量のための個別の行を使用してください。
 DocType: Leave Block List Allow,Leave Block List Allow,許可する休暇リスト
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,略称は、空白またはスペースにすることはできません
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,略称は、空白またはスペースにすることはできません
 DocType: Patient Medical Record,Patient Medical Record,患者の医療記録
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,グループから非グループ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,スポーツ
@@ -2213,9 +2253,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,キー日付{2}の{0}から{1}への為替レートを見つけることができません。通貨レコードを手動で作成してください
 DocType: POS Profile,Price List,価格表
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0}はデフォルト会計年度です。変更を反映するためにブラウザを更新してください
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,経費請求
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,経費請求
 DocType: Issue,Support,サポート
 ,BOM Search,部品表（BOM）検索
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",この倉庫で在庫があることに基づいて、ハブの「在庫あり」または「在庫なし」を発行してください。
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),期末（期首＋合計）
 DocType: Vehicle,Fuel Type,燃料タイプ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,会社に通貨を指定してください
@@ -2227,16 +2268,16 @@
 DocType: Healthcare Settings,Remind Before,前に思い出させる
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},行{0}には数量単位変換係数が必要です
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行＃{0}：リファレンスドキュメントタイプは受注、納品書や仕訳のいずれかでなければなりません
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行＃{0}：リファレンスドキュメントタイプは受注、納品書や仕訳のいずれかでなければなりません
 DocType: Salary Component,Deduction,控除
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,行{0}：時間との時間からは必須です。
 DocType: Stock Reconciliation Item,Amount Difference,量差
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},価格表{1}の{0}にアイテム価格を追加しました
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},価格表{1}の{0}にアイテム価格を追加しました
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,営業担当者の従業員IDを入力してください
 DocType: Territory,Classification of Customers by region,地域別の顧客の分類
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,差額はゼロでなければなりません
 DocType: Project,Gross Margin,売上総利益
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,最初の生産アイテムを入力してください
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,最初の生産アイテムを入力してください
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,計算された銀行報告書の残高
 DocType: Normal Test Template,Normal Test Template,標準テストテンプレート
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,無効なユーザー
@@ -2246,21 +2287,22 @@
 DocType: Salary Slip,Total Deduction,控除合計
 ,Production Analytics,生産分析
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,これは、この患者に対する取引に基づいています。詳細は以下のタイムラインを参照してください
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,費用更新
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,費用更新
 DocType: Employee,Date of Birth,生年月日
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,アイテム{0}はすでに返品されています
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,「会計年度」は、会計年度を表します。すべての会計記帳および他の主要な取引は、「会計年度」に対して記録されます。
 DocType: Opportunity,Customer / Lead Address,顧客／リード住所
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,サプライヤスコアカードの設定
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},注意：添付ファイル{0}のSSL証明書が無効です
-DocType: Student Admission,Eligibility,適格性
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,評価計画名
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},注意：添付ファイル{0}のSSL証明書が無効です
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads",リードは、あなたのリードとしてすべての連絡先などを追加、あなたがビジネスを得るのを助けます
 DocType: Production Order Operation,Actual Operation Time,実作業時間
 DocType: Authorization Rule,Applicable To (User),（ユーザー）に適用
 DocType: Purchase Taxes and Charges,Deduct,差し引く
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,仕事内容
 DocType: Student Applicant,Applied,適用されました
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,再オープン
 DocType: Sales Invoice Item,Qty as per Stock UOM,在庫単位ごとの数量
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2名
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",「-」「#」「.」「/」以外の記号は、シリーズ名に使用できません
@@ -2272,7 +2314,7 @@
 DocType: Request for Quotation,Manufacturing Manager,製造マネージャー
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},シリアル番号{0}は {1}まで保証期間内です
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,梱包ごとに納品書を分割
-apps/erpnext/erpnext/hooks.py +98,Shipments,出荷
+apps/erpnext/erpnext/hooks.py +107,Shipments,出荷
 DocType: Payment Entry,Total Allocated Amount (Company Currency),総配分される金額（会社通貨）
 DocType: Purchase Order Item,To be delivered to customer,顧客に配信します
 DocType: BOM,Scrap Material Cost,スクラップ材料費
@@ -2294,8 +2336,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,明細バリアント設定
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,会社を選択...
 DocType: Leave Control Panel,Leave blank if considered for all departments,全部門が対象の場合は空白のままにします
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",雇用タイプ（正社員、契約社員、インターンなど）
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0}はアイテム{1}に必須です
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).",雇用タイプ（正社員、契約社員、インターンなど）
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0}はアイテム{1}に必須です
 DocType: Process Payroll,Fortnightly,2週間ごとの
 DocType: Currency Exchange,From Currency,通貨から
 DocType: Vital Signs,Weight (In Kilogram),重量（キログラム）
@@ -2319,7 +2361,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,「スケジュールを生成」をクリックしてスケジュールを取得してください
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,次のスケジュールの削除中にエラーが発生しました：
 DocType: Bin,Ordered Quantity,注文数
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",例「ビルダーのためのツール構築」
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",例「ビルダーのためのツール構築」
 DocType: Grading Scale,Grading Scale Intervals,グレーディングスケール間隔
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}：{3}：{2}だけ通貨で行うことができるための会計エントリを
 DocType: Production Order,In Process,処理中
@@ -2342,11 +2384,10 @@
 DocType: Purchase Invoice,With Payment of Tax,税金の支払い
 DocType: Expense Claim Detail,Expense Claim Detail,経費請求の詳細
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,サプライヤのためにTRIPLICATE
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,正しいアカウントを選択してください
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,正しいアカウントを選択してください
 DocType: Item,Weight UOM,重量単位
 DocType: Salary Structure Employee,Salary Structure Employee,給与構造の従業員
 DocType: Patient,Blood Group,血液型
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,保留
 DocType: Course,Course Name,コース名
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,特定の従業員の休暇申請を承認することができるユーザー
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,OA機器
@@ -2365,7 +2406,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,価格表が設定されていない場合の価格は表示されません
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,配送ルールに国を指定するか、全世界出荷をチェックしてください
 DocType: Stock Entry,Total Incoming Value,収入価値合計
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,デビットへが必要とされます
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,デビットへが必要とされます
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",タイムシートは、あなたのチームによって行わのactivitesのための時間、コストおよび課金を追跡するのに役立ち
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,仕入価格表
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,サプライヤスコアカード変数のテンプレート。
@@ -2375,7 +2416,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,支払照合
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,担当者名を選択してください
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,技術
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},総未払い：{0}
+DocType: Hub Settings,Unregister from Hub,ハブから登録を解除する
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},総未払い：{0}
 DocType: BOM Website Operation,BOM Website Operation,BOMウェブサイトの運用
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,雇用契約書
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,資材要求（MRP）と製造指示を生成
@@ -2387,7 +2429,9 @@
 DocType: Physician Schedule Time Slot,To Time,終了時間
 DocType: Authorization Rule,Approving Role (above authorized value),役割を承認（許可値以上）
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,「貸方へ」アカウントは買掛金でなければなりません
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},部品表再帰：{0} {2}の親または子にすることはできません
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,有料学生応募者に必須の学生入学を選択してください
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},部品表再帰：{0} {2}の親または子にすることはできません
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,価格を公開するには価格表を選択してください
 DocType: Production Order Operation,Completed Qty,完成した数量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",{0}には、別の貸方エントリに対する借方勘定のみリンクすることができます
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,価格表{0}は無効になっています
@@ -2399,38 +2443,39 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,アイテム {1} には {0} 件のシリアル番号が必要です。{2} 件指定されています
 DocType: Stock Reconciliation Item,Current Valuation Rate,現在の評価額
 DocType: Item,Customer Item Codes,顧客アイテムコード
+DocType: Training Event,Advance,前進
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,再発するために。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,取引利益/損失
 DocType: Opportunity,Lost Reason,失われた理由
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,新しい住所
 DocType: Quality Inspection,Sample Size,サンプルサイズ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,領収書の文書を入力してください。
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,全てのアイテムはすでに請求済みです
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',有効な「参照元ケース番号」を指定してください
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',有効な「参照元ケース番号」を指定してください
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,コストセンターはさらにグループの下に作成できますが、エントリは非グループに対して対して作成できます
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ユーザーと権限
 DocType: Vehicle Log,VLOG.,VLOG。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},作成された製造指図：{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},作成された製造指図：{0}
 DocType: Branch,Branch,支社・支店
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,印刷とブランディング
 DocType: Company,Total Monthly Sales,月間総売上高
 DocType: Bin,Actual Quantity,実際の数量
 DocType: Shipping Rule,example: Next Day Shipping,例：翌日発送
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,シリアル番号 {0} は見つかりません
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},サブスクリプションは{0}でした
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},サブスクリプションは{0}でした
 DocType: Fee Schedule Program,Fee Schedule Program,料金表プログラム
 DocType: Fee Schedule Program,Student Batch,学生バッチ
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,select * from `tabVital Signs`ここで、patient = &#39;{0}&#39;の順序はsigns_date desc limit 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,学生を作ります
 DocType: Supplier Scorecard Scoring Standing,Min Grade,最小等級
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},プロジェクト：{0} の共同作業に招待されました
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},医者は{0}で利用できません
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},プロジェクト：{0} の共同作業に招待されました
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},医者は{0}で利用できません
 DocType: Leave Block List Date,Block Date,ブロック日付
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Doctype {0}にカスタムフィールドのサブスクリプションIDを追加する
 DocType: Purchase Receipt,Supplier Delivery Note,サプライヤー配達ノート
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,今すぐ適用
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,今すぐ適用
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},実際の数量{0} /待機数{1}
 DocType: Purchase Invoice,E-commerce GSTIN,電子商取引GSTIN
 DocType: Sales Order,Not Delivered,未納品
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,期待される日付は取引日の前にすることはできません
 ,Bank Clearance Summary,銀行決済の概要
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",日次・週次・月次のメールダイジェストを作成・管理
 DocType: Appraisal Goal,Appraisal Goal,査定目標
@@ -2438,12 +2483,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,建物
 DocType: Fee Schedule,Fee Structure,料金体系
 DocType: Timesheet Detail,Costing Amount,原価計算額
-DocType: Student Admission,Application Fee,出願料
+DocType: Student Admission Program,Application Fee,出願料
 DocType: Process Payroll,Submit Salary Slip,給与伝票を提出
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,アイテム{0}の最大割引は {1}％です
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,アイテム{0}の最大割引は {1}％です
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,一括でインポート
 DocType: Sales Partner,Address & Contacts,住所・連絡先
 DocType: SMS Log,Sender Name,送信者名
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,条件で並べ替え
 DocType: POS Profile,[Select],[選択]
 DocType: Vital Signs,Blood Pressure (diastolic),血圧（拡張期）
 DocType: SMS Log,Sent To,送信先
@@ -2452,7 +2498,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,次の連絡先の日付は、過去にすることはできません
 DocType: Company,For Reference Only.,参考用
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},医者{0}は{1}で利用できません
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,バッチ番号を選択
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,バッチ番号を選択
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},無効な{0}：{1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,参照Inv
@@ -2468,15 +2514,15 @@
 DocType: Normal Test Items,Require Result Value,結果値が必要
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,ケース番号は0にすることはできません
 DocType: Item,Show a slideshow at the top of the page,ページの上部にスライドショーを表示
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,部品表
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,店舗
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,部品表
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,店舗
 DocType: Project Type,Projects Manager,プロジェクトマネージャー
 DocType: Serial No,Delivery Time,納品時間
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,エイジング基準
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,予定がキャンセルされました
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,予定がキャンセルされました
 DocType: Item,End of Life,提供終了
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,移動
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,与えられた日付の従業員{0}が見つかりませアクティブまたはデフォルトの給与構造はありません
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,移動
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,与えられた日付の従業員{0}が見つかりませアクティブまたはデフォルトの給与構造はありません
 DocType: Leave Block List,Allow Users,ユーザーを許可
 DocType: Purchase Order,Customer Mobile No,顧客携帯電話番号
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,繰り返し
@@ -2485,12 +2531,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,費用更新
 DocType: Item Reorder,Item Reorder,アイテム再注文
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,ショー給与スリップ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,資材配送
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,資材配送
 DocType: Fees,Send Payment Request,支払いリクエストを送る
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",「運用」には「運用コスト」「固有の運用番号」を指定してください。
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,この文書では、アイテム{4}の{0} {1}によって限界を超えています。あなたが作っている同じに対して別の{3} {2}？
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,保存した後、繰り返し設定をしてください
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,変化量のアカウントを選択
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,変化量のアカウントを選択
 DocType: Purchase Invoice,Price List Currency,価格表の通貨
 DocType: Naming Series,User must always select,ユーザーは常に選択する必要があります
 DocType: Stock Settings,Allow Negative Stock,マイナス在庫を許可
@@ -2511,7 +2557,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,従業員
 DocType: Sample Collection,Collected Time,収集時間
 DocType: Company,Sales Monthly History,販売月間の履歴
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,バッチを選択
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,バッチを選択
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1}は支払済です
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,バイタルサイン
 DocType: Training Event,End Time,終了時間
@@ -2519,16 +2565,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,支払控除や損失
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,販売・仕入用の標準的な契約条件
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,伝票によるグループ
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,この予約をキャンセルしてもよろしいですか？
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,セールスパイプライン
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},給与コンポーネントのデフォルトアカウントを設定してください{0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,必要な箇所
 DocType: Rename Tool,File to Rename,名前を変更するファイル
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},行 {0} 内のアイテムの部品表（BOM）を選択してください
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},行 {0} 内のアイテムの部品表（BOM）を選択してください
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},アカウント{0}は、アカウントモードで{1}の会社と一致しません：{2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},アイテム{1}には、指定した部品表{0}が存在しません
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、メンテナンス予定{0}をキャンセルしなければなりません
+DocType: POS Profile,Applicable for Users,ユーザーに適用
 DocType: Notification Control,Expense Claim Approved,経費請求を承認
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,従業員の給与スリップ{0}はすでにこの期間のために作成します
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,従業員の給与スリップ{0}はすでにこの期間のために作成します
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,医薬品
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,仕入アイテムの費用
 DocType: Selling Settings,Sales Order Required,受注必須
@@ -2552,6 +2600,7 @@
 DocType: Offer Letter,Accepted,承認済
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,組織
 DocType: BOM Update Tool,BOM Update Tool,BOM更新ツール
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company",当事者口座が指定されていない場合は、会社のデフォルト口座を設定してください
 DocType: SG Creation Tool Course,Student Group Name,学生グループ名
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,手数料の作成
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,本当にこの会社のすべての取引を削除するか確認してください。マスタデータは残ります。このアクションは、元に戻すことはできません。
@@ -2560,29 +2609,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0}（{1}）は製造指示{3}において計画数量（{2}）より大きくすることはできません
 DocType: Shipping Rule,Shipping Rule Label,出荷ルールラベル
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ユーザーフォーラム
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,原材料は空白にできません。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.",請求書は、ドロップシッピングの項目を含む、株式を更新できませんでした。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,原材料は空白にできません。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.",請求書は、ドロップシッピングの項目を含む、株式を更新できませんでした。
 DocType: Lab Test Sample,Lab Test Sample,ラボテストサンプル
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,クイック仕訳エントリー
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,アイテムに対して部品表が記載されている場合は、レートを変更することができません
+DocType: Restaurant,Invoice Series Prefix,請求書シリーズ接頭辞
 DocType: Employee,Previous Work Experience,前職歴
 DocType: Stock Entry,For Quantity,数量
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},アイテム{0}行{1}に予定数量を入力してください
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},アイテム{0}行{1}に予定数量を入力してください
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1}は提出されていません
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,アイテム要求
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,各完成品それぞれに独立した製造指示が作成されます。
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0}の戻り文書では負でなければなりません
 ,Minutes to First Response for Issues,問題のためのファースト・レスポンス分
 DocType: Purchase Invoice,Terms and Conditions1,規約１
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,あなたはこのシステムを設定している研究所の名前。
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,あなたはこのシステムを設定している研究所の名前。
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",会計エントリーはこの日から凍結され、以下の役割を除いて実行／変更できません。
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,保守スケジュールを生成する前に、ドキュメントを保存してください
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,すべてのBOMで更新された最新価格
 DocType: Fee Schedule,Successful,成功した
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,プロジェクトステータス
 DocType: UOM,Check this to disallow fractions. (for Nos),数に小数を許可しない場合チェック
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,以下の製造指示が作成されました：
-DocType: Student Admission,Naming Series (for Student Applicant),（学生申請者用）シリーズの命名
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,以下の製造指示が作成されました：
+DocType: Student Admission Program,Naming Series (for Student Applicant),（学生申請者用）シリーズの命名
 DocType: Delivery Note,Transporter Name,輸送者名
 DocType: Authorization Rule,Authorized Value,許可値
 DocType: BOM,Show Operations,表示操作
@@ -2606,7 +2656,7 @@
 ,Employees working on a holiday,休日に従事している従業員
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,マークプレゼント
 DocType: Project,% Complete Method,％完全な方法
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,ドラッグ
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,ドラッグ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},メンテナンスの開始日は、シリアル番号{0}の納品日より前にすることはできません
 DocType: Production Order,Actual End Date,実際の終了日
 DocType: BOM,Operating Cost (Company Currency),営業費用（会社通貨）
@@ -2624,19 +2674,20 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,承認ユーザーは、ルール適用対象ユーザーと同じにすることはできません
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),基本単価（在庫数量単位ごと）
 DocType: SMS Log,No of Requested SMS,要求されたSMSの数
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,承認された休暇申請の記録と一致しない無給休暇
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,承認された休暇申請の記録と一致しない無給休暇
 DocType: Campaign,Campaign-.####,キャンペーン。＃＃＃＃
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,次のステップ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,可能な限り最高のレートで指定した項目を入力してください
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,請求書を作成
 DocType: Selling Settings,Auto close Opportunity after 15 days,15日後にオートクローズ機会
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,スコアカードが{1}のため、購買発注は{0}には許可されません。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,スコアカードが{1}のため、購買発注は{0}には許可されません。
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,終了年
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,見積もり/リード％
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,契約終了日は、入社日よりも大きくなければなりません
 DocType: Vital Signs,Nutrition Values,栄養価
 DocType: Lab Test Template,Is billable,請求可能です
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Dr {0}の &quot;Physician Schedule&quot;と &quot;Appointment Time&quot;の両方を設定する必要があります。
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,コミッションのための企業の製品を販売している第三者の代理店/ディーラー/コミッションエージェント/アフィリエイト/リセラー。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},発注{1}に対する{0}
 DocType: Patient,Patient Demographics,患者の人口統計
@@ -2693,7 +2744,6 @@
 追加か控除かを選択します"
 DocType: Homepage,Homepage,ホームページ
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,医師を選択...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',tabConsultation set invoice = &#39;{0}&#39;を更新します。name = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,受領数量
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},作成したフィーレコード -  {0}
 DocType: Asset Category Account,Asset Category Account,資産カテゴリーアカウント
@@ -2705,7 +2755,7 @@
 DocType: Asset,Manual,マニュアル
 DocType: Salary Component Account,Salary Component Account,給与コンポーネントのアカウント
 DocType: Global Defaults,Hide Currency Symbol,通貨記号を非表示にする
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card",例「銀行」「現金払い」「クレジットカード払い」
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card",例「銀行」「現金払い」「クレジットカード払い」
 DocType: Lead Source,Source Name,ソース名
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""",成人の正常な安静時血圧は収縮期約120mmHgであり、拡張期血圧は80mmHgであり、「120 / 80mmHg」と略記される。
 DocType: Journal Entry,Credit Note,貸方票
@@ -2724,16 +2774,16 @@
 DocType: Patient,Occupation,職業
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,行{0}：開始日は終了日より前でなければなりません
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),合計（量）
-DocType: Sales Invoice,This Document,この文書
 DocType: Installation Note Item,Installed Qty,設置済数量
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,これは、一部の無効なメールアドレスが原因である可能性があります
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,あなたは追加しました
 DocType: Purchase Taxes and Charges,Parenttype,親タイプ
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,トレーニング結果
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,トレーニング結果
 DocType: Purchase Invoice,Is Paid,支払われます
 DocType: Salary Structure,Total Earning,収益合計
 DocType: Purchase Receipt,Time at which materials were received,資材受領時刻
 DocType: Stock Ledger Entry,Outgoing Rate,出庫率
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,組織支部マスター。
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,組織支部マスター。
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,または
 DocType: Sales Order,Billing Status,課金状況
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,課題をレポート
@@ -2748,7 +2798,8 @@
 DocType: Notification Control,Sales Order Message,受注メッセージ
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",会社、通貨、会計年度などのデフォルト値を設定
 DocType: Payment Entry,Payment Type,支払タイプ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,アイテム{0}のバッチを選択してください。この要件を満たす単一のバッチを見つけることができません
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,アイテム{0}のバッチを選択してください。この要件を満たす単一のバッチを見つけることができません
+DocType: Hub Category,Parent Category,親カテゴリ
 DocType: Process Payroll,Select Employees,従業員を選択
 DocType: Opportunity,Potential Sales Deal,潜在的販売取引
 DocType: Complaint,Complaints,苦情
@@ -2785,7 +2836,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),納品パッケージの識別票（印刷用）
 DocType: Bin,Reserved Quantity,予約数量
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,有効なメールアドレスを入力してください
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,カート内のアイテムを選択してください
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,カート内のアイテムを選択してください
 DocType: Landed Cost Voucher,Purchase Receipt Items,領収書アイテム
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,フォームのカスタマイズ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,滞納
@@ -2795,15 +2846,15 @@
 DocType: Payment Request,Amount in customer's currency,顧客通貨での金額
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,配送
 DocType: Stock Reconciliation Item,Current Qty,現在の数量
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,サプライヤを追加
+DocType: Restaurant Menu,Restaurant Menu,レストランメニュー
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,前の
 DocType: Appraisal Goal,Key Responsibility Area,重要責任分野
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",学生のバッチは、あなたが学生のための出席、アセスメントとサービス料を追跡するのに役立ち
 DocType: Payment Entry,Total Allocated Amount,総配分される金額
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,永続在庫のデフォルト在庫アカウントの設定
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,永続在庫のデフォルト在庫アカウントの設定
 DocType: Item Reorder,Material Request Type,資材要求タイプ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},{0} {1}への給与Accural仕訳
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save",localStorageがいっぱいになった、保存されませんでした
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save",localStorageがいっぱいになった、保存されませんでした
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,行{0}：数量単位（UOM）換算係数は必須です
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,部屋の容量
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,参照
@@ -2842,16 +2893,18 @@
 DocType: Project,Task Completion,タスク完了
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,在庫にありません
 DocType: Appraisal,HR User,人事ユーザー
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS？
 DocType: Purchase Invoice,Taxes and Charges Deducted,租税公課控除
-apps/erpnext/erpnext/hooks.py +129,Issues,課題
+apps/erpnext/erpnext/hooks.py +138,Issues,課題
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},ステータスは{0}のどれかでなければなりません
 DocType: Sales Invoice,Debit To,借方計上
+DocType: Restaurant Menu Item,Restaurant Menu Item,レストランメニュー項目
 DocType: Delivery Note,Required only for sample item.,サンプルアイテムにのみ必要です
 DocType: Stock Ledger Entry,Actual Qty After Transaction,トランザクションの後、実際の数量
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},{0}と{1}の間で見つかりませ給与スリップません
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},{0}と{1}の間で見つかりませ給与スリップません
 ,Pending SO Items For Purchase Request,仕入要求のため保留中の受注アイテム
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,学生の入学
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} は無効になっています
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,学生の入学
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} は無効になっています
 DocType: Supplier,Billing Currency,請求通貨
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,XL
@@ -2874,6 +2927,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,必要な訪問の数を記述してください
 DocType: Stock Settings,Default Valuation Method,デフォルト評価方法
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,費用
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,更新が進行中です。それはしばらく時間がかかるかもしれません。
 DocType: Vehicle Log,Fuel Qty,燃料数量
 DocType: Production Order Operation,Planned Start Time,計画開始時間
 DocType: Course,Assessment,評価
@@ -2889,7 +2943,7 @@
 DocType: Price List,Price List Master,価格表マスター
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,すべての販売取引について、複数の「営業担当者」に対するタグを付けることができるため、これによって目標を設定しチェックすることができます。
 ,S.O. No.,受注番号
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},リード{0}から顧客を作成してください
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},リード{0}から顧客を作成してください
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,患者の選択
 DocType: Price List,Applicable for Countries,国に適用
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,パラメータ名
@@ -2931,27 +2985,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,サプライヤの請求書の詳細
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,費用／差損益（{0}）は「損益」アカウントである必要があります
 DocType: Project,Copied From,コピー元
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},名前のエラー：{0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,不足
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},名前のエラー：{0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,不足
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} {2} {3}に関連付けられていません
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,従業員{0}の出勤はすでにマークされています
 DocType: Packing Slip,If more than one package of the same type (for print),同じタイプで複数パッケージの場合（印刷用）
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,レストランの設定でデフォルトの顧客を設定してください
 ,Salary Register,給与登録
 DocType: Warehouse,Parent Warehouse,親倉庫
 DocType: C-Form Invoice Detail,Net Total,差引計
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},アイテム{0}およびプロジェクト{1}にデフォルトBOMが見つかりません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},アイテム{0}およびプロジェクト{1}にデフォルトBOMが見つかりません
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,様々なローンのタイプを定義します
 DocType: Bin,FCFS Rate,FCFSレート
 DocType: Payment Reconciliation Invoice,Outstanding Amount,残高
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),（分単位）
 DocType: Project Task,Working,進行中
 DocType: Stock Ledger Entry,Stock Queue (FIFO),先入先出法
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,会計年度
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,会計年度
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} は会社 {1} に所属していません
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,{0}の基準スコア機能を解決できませんでした。数式が有効であることを確認します。
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,上のコスト
 DocType: Healthcare Settings,Out Patient Settings,患者の設定を外す
 DocType: Account,Round Off,丸め誤差
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,数量は正数でなければなりません
 ,Requested Qty,要求数量
 DocType: Tax Rule,Use for Shopping Cart,ショッピングカートに使用
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},値は{0}属性{1}のアイテムの属性値を有効な項目のリストに存在しない{2}
@@ -2960,7 +3016,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",料金は、選択によって、アイテムの数量または量に基づいて均等に分割されます
 DocType: Maintenance Visit,Purposes,目的
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,還付書内では、少なくとも1つの項目がマイナスで入力されていなければなりません
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,コースを追加
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",操作{0}は、ワークステーション{1}で使用可能な作業時間よりも長いため、複数の操作に分解してください
 ,Requested,要求済
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,備考がありません
@@ -2972,6 +3027,8 @@
 DocType: Employee Loan,Repaid/Closed,返済/クローズ
 DocType: Item,Total Projected Qty,全投影数量
 DocType: Monthly Distribution,Distribution Name,配布名
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,サプライヤ&gt;サプライヤタイプ
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",{1} {2}の会計処理を行うために必要なアイテム{0}の評価レートが見つかりません。アイテムが{1}のゼロ評価レートアイテムとして取引されている場合は、{1}アイテムテーブルにそのアイテムを記載してください。それ以外の場合は、明細レコードに到着した在庫トランザクションまたは評価レートを登録してから、このエントリの登録/取消を試みてください
 DocType: Course,Course Code,コースコード
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},アイテム{0}に必要な品質検査
 DocType: POS Settings,Use POS in Offline Mode,オフラインモードでPOSを使用する
@@ -2982,14 +3039,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,地域ツリーを管理
 DocType: Journal Entry Account,Sales Invoice,請求書
 DocType: Journal Entry Account,Party Balance,当事者残高
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,「割引を適用」を選択してください
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,「割引を適用」を選択してください
 DocType: Company,Default Receivable Account,デフォルト売掛金勘定
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,上記選択条件に支払われる総給与のための銀行エントリを作成
 DocType: Physician,Physician Schedule,医師のスケジュール
 DocType: Purchase Invoice,Deemed Export,輸出とみなされる
 DocType: Stock Entry,Material Transfer for Manufacture,製造用資材移送
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,割引率は、価格表に対して、またはすべての価格リストのいずれかを適用することができます。
-DocType: Purchase Invoice,Half-yearly,半年ごと
+DocType: Subscription,Half-yearly,半年ごと
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,在庫の会計エントリー
 DocType: Lab Test,LabTest Approver,LabTest承認者
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,既に評価基準{}を評価しています。
@@ -3018,13 +3075,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,XS
 DocType: Company,Standard Template,標準テンプレート
 DocType: Training Event,Theory,理論
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,警告：資材要求数が注文最小数を下回っています。
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,警告：資材要求数が注文最小数を下回っています。
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,アカウント{0}は凍結されています
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,組織内で別々の勘定科目を持つ法人／子会社
 DocType: Payment Request,Mute Email,ミュートメール
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",食品、飲料＆タバコ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},唯一の未請求{0}に対して支払いを行うことができます
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,手数料率は、100を超えることはできません。
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},唯一の未請求{0}に対して支払いを行うことができます
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,手数料率は、100を超えることはできません。
 DocType: Stock Entry,Subcontract,下請
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,先に{0}を入力してください
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,からの返信なし
@@ -3042,10 +3099,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,カラー
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,評価の計画基準
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,購入注文を防止する
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,影響を受けやすいです
 DocType: Patient Appointment,Scheduled,スケジュール設定済
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,見積を依頼
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,従業員の命名システムを人事管理&gt; HR設定で設定してください
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",「在庫アイテム」が「いいえ」であり「販売アイテム」が「はい」であり他の製品付属品が無いアイテムを選択してください。
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,顧客を選択
 DocType: Student Log,Academic,アカデミック
 DocType: Patient,Personal and Social History,個人と社会の歴史
 DocType: Fee Schedule,Fee Breakup for each student,学生一人ひとりの割増料金
@@ -3055,7 +3113,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,評価額
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,ディーゼル
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,価格表の通貨が選択されていません
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,価格表の通貨が選択されていません
 apps/erpnext/erpnext/config/healthcare.py +46,Results,結果
 ,Student Monthly Attendance Sheet,学生月次出席シート
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},従業員{0}は{2} と{3}の間の{1}を既に申請しています
@@ -3070,7 +3128,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,セールスパートナーを管理します。
 DocType: Quality Inspection,Inspection Type,検査タイプ
 DocType: Fee Validity,Visited yet,まだ訪問しました
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,既存の取引に倉庫を基に変換することはできません。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,既存の取引に倉庫を基に変換することはできません。
 DocType: Assessment Result Tool,Result HTML,結果HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,有効期限
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,学生を追加
@@ -3097,7 +3155,7 @@
 DocType: Healthcare Settings,Result Printed,結果印刷
 DocType: Asset Category Account,Depreciation Expense Account,減価償却費アカウント
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,試用期間
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},ビュー{0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},ビュー{0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,取引にはリーフノードのみ許可されています
 DocType: Expense Claim,Expense Approver,経費承認者
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,行{0}：お客様に対する事前クレジットでなければなりません
@@ -3108,7 +3166,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,終了日時
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,コーススケジュールを削除します：
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,SMSの配信状態を維持管理するためのログ
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,販売目標を設定する
 DocType: Accounts Settings,Make Payment via Journal Entry,仕訳を経由して支払いを行います
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,上に印刷
 DocType: Item,Inspection Required before Delivery,配達前に必要な検査
@@ -3116,7 +3173,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,保留中の活動
 DocType: Patient Appointment,Reminded,思い出した
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,あなたの組織
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,あなたの組織
 DocType: Fee Component,Fees Category,料金カテゴリー
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,退職日を入力してください。
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,量／額
@@ -3128,7 +3185,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,再注文レベル
 DocType: Company,Chart Of Accounts Template,アカウントテンプレートのチャート
 DocType: Attendance,Attendance Date,出勤日
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},アイテムの価格は価格表{1}で{0}の更新します
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},アイテムの価格は価格表{1}で{0}の更新します
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,給与の支給と控除
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,子ノードを持つ勘定は、元帳に変換することはできません
 DocType: Purchase Invoice Item,Accepted Warehouse,承認済み倉庫
@@ -3144,9 +3201,10 @@
 ,Employee Birthday,従業員の誕生日
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,学生バッチ出席ツール
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,リミットクロス
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,予定されている人まで
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ベンチャーキャピタル
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,この「アカデミックイヤー &#39;{0}と{1}はすでに存在している「中期名」との学術用語。これらのエントリを変更して、もう一度お試しください。
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}",項目{0}に対する既存のトランザクションがあるとして、あなたは{1}の値を変更することはできません
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}",項目{0}に対する既存のトランザクションがあるとして、あなたは{1}の値を変更することはできません
 DocType: UOM,Must be Whole Number,整数でなければなりません
 DocType: Leave Control Panel,New Leaves Allocated (In Days),新しい有給休暇（日数）
 DocType: Purchase Invoice,Invoice Copy,請求書のコピー
@@ -3156,7 +3214,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,請求番号
 DocType: Shopping Cart Settings,Orders,注文
 DocType: Employee Leave Approver,Leave Approver,休暇承認者
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,バッチを選択してください
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,バッチを選択してください
 DocType: Assessment Group,Assessment Group Name,評価グループ名
 DocType: Manufacturing Settings,Material Transferred for Manufacture,製造用移送資材
 DocType: Expense Claim,"A user with ""Expense Approver"" role",「経費承認者」の役割を持つユーザー
@@ -3171,7 +3229,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,決算エントリー
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,部門を選択...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,既存の取引があるコストセンターは、グループに変換することはできません
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},量{0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},量{0} {1} {2} {3}
 DocType: Account,Depreciation,減価償却
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),サプライヤー
 DocType: Employee Attendance Tool,Employee Attendance Tool,従業員出勤ツール
@@ -3182,10 +3240,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,支払エントリ{0}は未リンクされています
 DocType: GL Entry,Voucher No,伝票番号
 ,Lead Owner Efficiency,リードオーナーの効率
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,最も人気のある
 DocType: Leave Allocation,Leave Allocation,休暇割当
 DocType: Payment Request,Recipient Message And Payment Details,受信者のメッセージと支払いの詳細
 DocType: Training Event,Trainer Email,トレーナーメール
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,資材要求{0}は作成済
+DocType: Restaurant Reservation,No of People,人々の数
 DocType: Production Planning Tool,Include sub-contracted raw materials,下請け原料を含めます
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,規約・契約用テンプレート
 DocType: Purchase Invoice,Address and Contact,住所・連絡先
@@ -3194,10 +3254,11 @@
 DocType: Supplier,Last Day of the Next Month,次月末日
 DocType: Support Settings,Auto close Issue after 7 days,7日後にオートクローズ号
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",前に割り当てることができないままに、{0}、休暇バランスが既にキャリー転送将来の休暇の割り当てレコードであったように{1}
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注：支払期限／基準日の超過は顧客の信用日数{0}日間許容されます
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注：支払期限／基準日の超過は顧客の信用日数{0}日間許容されます
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,学生申請者
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,受取人のためのオリジナル
 DocType: Asset Category Account,Accumulated Depreciation Account,減価償却累計額勘定
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,このメールは自動的に生成されます
 DocType: Stock Settings,Freeze Stock Entries,凍結在庫エントリー
 DocType: Program Enrollment,Boarding Student,搭乗学生
 DocType: Asset,Expected Value After Useful Life,残存価額
@@ -3205,7 +3266,7 @@
 DocType: Activity Cost,Billing Rate,請求単価
 ,Qty to Deliver,配送数
 ,Stock Analytics,在庫分析
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,操作は空白のままにすることはできません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,操作は空白のままにすることはできません
 DocType: Maintenance Visit Purpose,Against Document Detail No,文書詳細番号に対して
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,パーティーの種類は必須です
 DocType: Quality Inspection,Outgoing,支出
@@ -3227,7 +3288,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,アクティビティベースのグループの学生を手動で選択する
 DocType: Journal Entry,User Remark,ユーザー備考
 DocType: Lead,Market Segment,市場区分
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},有料額は合計マイナスの残高を超えることはできません{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},有料額は合計マイナスの残高を超えることはできません{0}
 DocType: Supplier Scorecard Period,Variables,変数
 DocType: Employee Internal Work History,Employee Internal Work History,従業員の入社後の職歴
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),（借方）を閉じる
@@ -3256,21 +3317,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,アップデートを入手
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}：アカウントは、{2}会社に所属していない{3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,資材要求{0}はキャンセルまたは停止されています
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,休暇管理
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,休暇管理
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,勘定によるグループ
 DocType: Sales Order,Fully Delivered,全て納品済
 DocType: Lead,Lower Income,低収益
+DocType: Restaurant Order Entry,Current Order,現在の注文
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},出庫元／入庫先を同じ行{0}に入れることはできません
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",この在庫棚卸が繰越エントリであるため、差異勘定は資産／負債タイプのアカウントである必要があります
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},支出額は、ローン額を超えることはできません{0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,プログラムに行く
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},アイテム{0}には発注番号が必要です
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,製造指図が作成されていません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,製造指図が作成されていません
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',「終了日」は「開始日」の後にしてください。
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},学生としてのステータスを変更することはできません{0}学生のアプリケーションとリンクされている{1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},学生としてのステータスを変更することはできません{0}学生のアプリケーションとリンクされている{1}
 DocType: Asset,Fully Depreciated,完全に減価償却
 ,Stock Projected Qty,予測在庫数
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},顧客{0}はプロジェクト{1}に属していません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},顧客{0}はプロジェクト{1}に属していません
 DocType: Employee Attendance Tool,Marked Attendance HTML,著しい出席HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",名言は、あなたの顧客に送られてきた入札提案されています
 DocType: Sales Order,Customer's Purchase Order,顧客の購入注文
@@ -3281,8 +3343,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,予約された減価償却の数を設定してください
 DocType: Supplier Scorecard Period,Calculations,計算
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,値または数量
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,プロダクションの注文がために提起することができません。
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,プロダクションの注文がために提起することができません。
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,分
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,セットアップ&gt;設定&gt;ネーミングシリーズで{0}のネーミングシリーズを設定してください
 DocType: Purchase Invoice,Purchase Taxes and Charges,購入租税公課
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,サプライヤーに行く
 ,Qty to Receive,受領数
@@ -3295,7 +3358,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,貸方アカウントは貸借対照表アカウントである必要があります
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,全てのサプライヤータイプ
 DocType: Global Defaults,Disable In Words,文字表記無効
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,アイテムは自動的に採番されていないため、アイテムコードが必須です
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,アイテムは自動的に採番されていないため、アイテムコードが必須です
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},見積{0}はタイプ{1}ではありません
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,メンテナンス予定アイテム
 DocType: Sales Order,%  Delivered,％納品済
@@ -3317,23 +3380,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,開始残高 資本
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,和解
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,残り
 DocType: Appraisal,Appraisal,査定
 DocType: Purchase Invoice,GST Details,GSTの詳細
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},サプライヤに送信されたメール{0}
+DocType: Item,Default Sales Unit of Measure,既定の販売数量単位
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,日付が繰り返されます
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,決裁者
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},休暇承認者は{0}のいずれかである必要があります
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,料金の作成
-DocType: Hub Settings,Seller Email,販売者のメール
 DocType: Project,Total Purchase Cost (via Purchase Invoice),総仕入費用（仕入請求書経由）
 DocType: Training Event,Start Time,開始時間
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,数量を選択
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,数量を選択
 DocType: Customs Tariff Number,Customs Tariff Number,関税番号
 DocType: Patient Appointment,Patient Appointment,患者の任命
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,承認役割は、ルール適用対象役割と同じにすることはできません
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,このメールダイジェストから解除
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,このメールダイジェストから解除
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,仕入先を入手する
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},アイテム{1}に{0}が見つかりません
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,コースに行く
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,送信されたメッセージ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,子ノードを持つアカウントは元帳に設定することはできません
@@ -3346,11 +3412,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,製造用移設資材
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,アカウント{0}が存在しません
 DocType: Project,Project Type,プロジェクトタイプ
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,このタスクの子タスクが存在します。このタスクは削除できません。
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ターゲット数量や目標量のどちらかが必須です。
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,様々な活動の費用
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,もう結果はありません
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,様々な活動の費用
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",販売者以下に添付従業員は、ユーザーID {1}を持っていないため、{0}にイベントを設定します
 DocType: Timesheet,Billing Details,支払明細
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,ソースとターゲット・ウェアハウスは異なっている必要があります
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,ソースとターゲット・ウェアハウスは異なっている必要があります
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},{0}よりも古い在庫取引を更新することはできません
 DocType: Purchase Invoice Item,PR Detail,PR詳細
 DocType: Sales Order,Fully Billed,全て記帳済
@@ -3376,7 +3444,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,電信振込
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,すべてチェック
 DocType: Vehicle Log,Invoice Ref,請求書の参考文献
-DocType: Purchase Order,Recurring Order,定期的な注文
 DocType: Company,Default Income Account,デフォルト損益勘定
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,顧客グループ／顧客
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),閉じていない会計年度の利益/損失（クレジット）
@@ -3390,9 +3457,9 @@
 DocType: Patient,A Negative,ネガティブ
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,これ以上表示するものがありません
 DocType: Lead,From Customer,顧客から
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,電話
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,電話
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,製品
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,バッチ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,バッチ
 DocType: Project,Total Costing Amount (via Time Logs),総原価額（時間ログ経由）
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,料金表を作成する
 DocType: Purchase Order Item Supplied,Stock UOM,在庫単位
@@ -3416,7 +3483,7 @@
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,休暇・休日
 DocType: School Settings,Current Academic Term,現在の学期
 DocType: Sales Order,Not Billed,未記帳
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,両方の倉庫は同じ会社に属している必要があります
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,両方の倉庫は同じ会社に属している必要があります
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,連絡先がまだ追加されていません
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,陸揚費用伝票額
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,サプライヤーからの請求
@@ -3425,7 +3492,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,割引額
 DocType: Purchase Invoice,Return Against Purchase Invoice,仕入請求書に対する返品
 DocType: Item,Warranty Period (in days),保証期間（日数）
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',update &#39;tabPatient Appointment` set sales_invoice =&#39; {0} &#39;ここでname =&#39; {1} &#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Guardian1との関係
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,事業からの純キャッシュ・フロー
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,アイテム4
@@ -3434,8 +3500,8 @@
 DocType: Journal Entry Account,Journal Entry Account,仕訳勘定
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,学生グループ
 DocType: Shopping Cart Settings,Quotation Series,見積シリーズ
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",同名のアイテム（{0}）が存在しますので、アイテムグループ名を変えるか、アイテム名を変更してください
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,顧客を選択してください
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item",同名のアイテム（{0}）が存在しますので、アイテムグループ名を変えるか、アイテム名を変更してください
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,顧客を選択してください
 DocType: C-Form,I,私
 DocType: Company,Asset Depreciation Cost Center,資産減価償却コストセンター
 DocType: Sales Order Item,Sales Order Date,受注日
@@ -3444,6 +3510,7 @@
 DocType: Assessment Plan,Assessment Plan,評価計画
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,顧客{0}が作成されました。
 DocType: Stock Settings,Limit Percent,リミットパーセント
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,現在、どの倉庫でも在庫がありません
 ,Payment Period Based On Invoice Date,請求書の日付に基づく支払期間
 DocType: Sample Collection,No. of print,印刷枚数
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},{0}用の為替レートがありません
@@ -3499,13 +3566,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,グロスペイ - 合計控除 - ローン返済
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,「現在の部品表」と「新しい部品表」は同じにすることはできません
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,給与スリップID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,給与スリップID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,退職日は入社日より後でなければなりません
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,上のコースをスケジューリングするときにエラーが発生しました：
 DocType: Sales Invoice,Against Income Account,対損益勘定
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}％配送済
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,アイテム{0}：発注数量{1}は最小注文数量{2}（アイテム内で定義）より小さくすることはできません
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,アイテム{0}：発注数量{1}は最小注文数量{2}（アイテム内で定義）より小さくすることはできません
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,月次配分割合
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,別のユーザーとしてログインしてください。
 DocType: Territory,Territory Targets,ターゲット地域
 DocType: Delivery Note,Transporter Info,輸送情報
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},会社のデフォルト{0}を設定してください。{1}
@@ -3513,13 +3581,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,同じサプライヤーが複数回入力されています
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,売上総利益/損失
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,発注アイテム供給済
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,会社名は、当社にすることはできません
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,会社名は、当社にすることはできません
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,印刷テンプレートのレターヘッド。
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,印刷テンプレートのタイトル（例：「見積送り状」）
 DocType: Program Enrollment,Walking,ウォーキング
 DocType: Student Guardian,Student Guardian,学生ガーディアン
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,評価タイプの請求は「包括的」にマークすることはえきません
 DocType: POS Profile,Update Stock,在庫更新
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,購読で
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,アイテムごとに数量単位が異なると、（合計）正味重量値が正しくなりません。各アイテムの正味重量が同じ単位になっていることを確認してください。
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,部品表通貨レート
 DocType: Asset,Journal Entry for Scrap,スクラップ用の仕訳
@@ -3567,15 +3636,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",システムユーザー（ログイン）IDを指定します。設定すると、すべての人事フォームのデフォルトになります。
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}：{1}から
 DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,すべての部品表で最新の価格を更新するために待機します。数分かかることがあります。
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,すべての部品表で最新の価格を更新するために待機します。数分かかることがあります。
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新しいアカウント名。注：顧客やサプライヤーのためにアカウントを作成しないでください
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,国ごとのデフォルトのアドレステンプレート
 DocType: Sales Order Item,Supplier delivers to Customer,サプライヤーから顧客に配送
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}]（＃フォーム/商品/ {0}）在庫切れです
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},期限／基準日は{0}より後にすることはできません
+,Sales Payment Summary,販売支払概要
+DocType: Restaurant,Restaurant,レストラン
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},期限／基準日は{0}より後にすることはできません
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,データインポート・エクスポート
 DocType: Patient,Account Details,口座詳細
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,いいえ学生は見つかりませんでした
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,いいえ学生は見つかりませんでした
 DocType: Medical Department,Medical Department,医療部
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,サプライヤスコアカードスコアリング基準
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,請求書の転記日付
@@ -3586,7 +3657,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,パーティーを選択する前に転記日付を選択してください
 DocType: Program Enrollment,School House,スクールハウス
 DocType: Serial No,Out of AMC,年間保守契約外
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,見積もりを選択してください
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,見積もりを選択してください
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,予約された減価償却の数は、減価償却費の合計数を超えることはできません
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,メンテナンス訪問を作成
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,販売マスターマネージャー{0}の役割を持っているユーザーに連絡してください
@@ -3594,7 +3665,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,会社（顧客・サプライヤーではない）のマスター
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,これは、この生徒の出席に基づいています
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,学生はいない
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,複数のアイテムまたは全開フォームを追加
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,複数のアイテムまたは全開フォームを追加
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、納品書{0}をキャンセルしなければなりません
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,ユーザーに行く
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,支払額＋償却額は総計を超えることはできません
@@ -3614,37 +3685,40 @@
 DocType: Fee Schedule,Fee Schedule,料金表
 DocType: Hub Settings,Publish Availability,公開可用性
 DocType: Company,Create Chart Of Accounts Based On,アカウントベースでのグラフを作成
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,それを非グループに変換することはできません。子タスクが存在します。
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,生年月日は今日より後にすることはできません
 ,Stock Ageing,在庫エイジング
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},学生{0}は、学生の申請者に対して存在し、{1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),丸め調整（会社通貨）
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,タイムシート
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,タイムシート
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}'は無効になっています
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,オープンに設定
 DocType: Cheque Print Template,Scanned Cheque,スキャンした小切手
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,取引を処理した時に連絡先に自動メールを送信
 DocType: Timesheet,Total Billable Amount,合計請求可能な金額
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,アイテム3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,注文入力
 DocType: Purchase Order,Customer Contact Email,顧客連絡先メールアドレス
 DocType: Warranty Claim,Item and Warranty Details,アイテムおよび保証詳細
 DocType: Sales Team,Contribution (%),寄与度（％）
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注：「現金または銀行口座」が指定されていないため、支払エントリが作成されません
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,プロジェクト{0}は既に存在します
 DocType: Medical Department,Nursing User,看護ユーザー
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,責任
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,この見積りの有効期間は終了しました。
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,この見積りの有効期間は終了しました。
 DocType: Expense Claim Account,Expense Claim Account,経費請求アカウント
 DocType: Accounts Settings,Allow Stale Exchange Rates,失効した為替レートを許可する
 DocType: Sales Person,Sales Person Name,営業担当者名
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,表に少なくとも1件の請求書を入力してください
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,ユーザー追加
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,ユーザー追加
 DocType: POS Item Group,Item Group,アイテムグループ
 DocType: Item,Safety Stock,安全在庫
 DocType: Healthcare Settings,Healthcare Settings,ヘルスケアの設定
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,タスクの進捗％は100以上にすることはできません。
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,タスクの進捗％は100以上にすることはできません。
 DocType: Stock Reconciliation Item,Before reconciliation,照合前
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),租税公課が追加されました。（報告通貨）
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,アイテムごとの税の行{0}では、勘定タイプ「税」「収入」「経費」「支払」のいずれかが必要です
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,アイテムごとの税の行{0}では、勘定タイプ「税」「収入」「経費」「支払」のいずれかが必要です
 DocType: Sales Order,Partly Billed,一部支払済
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,アイテムは、{0}固定資産項目でなければなりません
 DocType: Item,Default BOM,デフォルト部品表
@@ -3660,6 +3734,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,変数
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,納品書から
 DocType: Student,Student Email Address,学生のメールアドレス
+DocType: Item,Hub Warehouse,ハブ倉庫
 DocType: Physician Schedule Time Slot,From Time,開始時間
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,在庫あり：
 DocType: Notification Control,Custom Message,カスタムメッセージ
@@ -3667,9 +3742,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,現金または銀行口座は、支払いのエントリを作成するための必須です
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,学生の住所
 DocType: Purchase Invoice,Price List Exchange Rate,価格表為替レート
+DocType: POS Profile,POS Profile Name,POSプロファイル名
 DocType: Purchase Invoice Item,Rate,単価／率
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,インターン
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,アドレス名称
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,アドレス名称
 DocType: Stock Entry,From BOM,参照元部品表
 DocType: Assessment Code,Assessment Code,評価コード
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,基本
@@ -3683,11 +3759,12 @@
 DocType: Salary Slip,Salary Structure,給与体系
 DocType: Account,Bank,銀行
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空会社
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,資材課題
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,資材課題
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,定期的に作成中にエラーが発生しました
 DocType: Material Request Item,For Warehouse,倉庫用
 DocType: Employee,Offer Date,雇用契約日
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,見積
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,オフラインモードになっています。あなたがネットワークを持ってまで、リロードすることができません。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,オフラインモードになっています。あなたがネットワークを持ってまで、リロードすることができません。
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,いいえ学生グループが作成されません。
 DocType: Purchase Invoice Item,Serial No,シリアル番号
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,毎月返済額は融資額を超えることはできません
@@ -3697,17 +3774,18 @@
 DocType: Salary Slip,Total Working Hours,総労働時間
 DocType: Subscription,Next Schedule Date,次のスケジュール日
 DocType: Stock Entry,Including items for sub assemblies,組立部品のためのアイテムを含む
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,入力値は正でなければなりません
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,全ての領域
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,入力値は正でなければなりません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,全ての領域
 DocType: Purchase Invoice,Items,アイテム
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,学生はすでに登録されています。
 DocType: Fiscal Year,Year Name,年の名前
 DocType: Process Payroll,Process Payroll,給与支払
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,休日数が月営業日数を上回っています
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,休日数が月営業日数を上回っています
 DocType: Product Bundle Item,Product Bundle Item,製品付属品アイテム
 DocType: Sales Partner,Sales Partner Name,販売パートナー名
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,見積依頼
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,見積依頼
 DocType: Payment Reconciliation,Maximum Invoice Amount,最大請求額
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,血液学
 DocType: Normal Test Items,Normal Test Items,通常のテスト項目
 DocType: Student Language,Student Language,学生の言語
 apps/erpnext/erpnext/config/selling.py +23,Customers,顧客
@@ -3718,10 +3796,11 @@
 DocType: Issue,Opening Time,「時間」を開く
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,期間日付が必要です
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,証券・商品取引所
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',バリエーションのデフォルト単位 '{0}' はテンプレート '{1}' と同じである必要があります
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',バリエーションのデフォルト単位 '{0}' はテンプレート '{1}' と同じである必要があります
 DocType: Shipping Rule,Calculate Based On,計算基準
 DocType: Delivery Note Item,From Warehouse,倉庫から
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,製造する部品表（BOM）を持つアイテムいいえ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,製造する部品表（BOM）を持つアイテムいいえ
+DocType: Restaurant,Default Customer,デフォルト顧客
 DocType: Assessment Plan,Supervisor Name,上司の名前
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,予定が同じ日に作成されているかどうかを確認しない
 DocType: Program Enrollment Course,Program Enrollment Course,プログラム入学コース
@@ -3748,7 +3827,7 @@
 DocType: Payment Entry,Internal Transfer,内部転送
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,このアカウントには子アカウントが存在しています。このアカウントを削除することはできません。
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ターゲット数量や目標量のどちらかが必須です
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},アイテム{0}にはデフォルトの部品表が存在しません
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},アイテム{0}にはデフォルトの部品表が存在しません
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,最初の転記日付を選択してください
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,開始日は終了日より前でなければなりません
 DocType: Leave Control Panel,Carry Forward,繰り越す
@@ -3783,6 +3862,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,総現在価値
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,計算書
 DocType: Drug Prescription,Hour,時
+DocType: Restaurant Order Entry,Last Sales Invoice,前回の請求書
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新しいシリアル番号には倉庫を指定することができません。倉庫は在庫エントリーか領収書によって設定する必要があります
 DocType: Lead,Lead Type,リードタイプ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,休暇申請を承認する権限がありません
@@ -3817,64 +3897,66 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,ユーザーの作成
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,グラム
 DocType: Supplier Scorecard,Per Month,毎月
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,製造数量は0より大きくなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,製造数量は0より大きくなければなりません
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,メンテナンス要請の訪問レポート。
 DocType: Stock Entry,Update Rate and Availability,単価と残量をアップデート
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,注文数に対して受領または提供が許可されている割合。例：100単位の注文を持っている状態で、割当が10％だった場合、110単位の受領を許可されます。
 DocType: POS Customer Group,Customer Group,顧客グループ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),新しいバッチID（オプション）
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),新しいバッチID（オプション）
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},アイテム{0}には経費科目が必須です
 DocType: BOM,Website Description,ウェブサイトの説明
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,資本の純変動
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,最新
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,最初の購入請求書{0}をキャンセルしてください
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",電子メールアドレスは一意である必要があり、すでに{0}のために存在します
 DocType: Serial No,AMC Expiry Date,年間保守契約の有効期限日
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,領収書
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,領収書
 ,Sales Register,販売登録
 DocType: Daily Work Summary Settings Company,Send Emails At,で電子メールを送ります
 DocType: Quotation,Quotation Lost Reason,失注理由
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,あなたのドメインを選択
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',select * from tabPatient where name = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},トランザクションの参照には{0} {1}日付けません
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},トランザクションの参照には{0} {1}日付けません
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,編集するものがありません
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,フォームビュー
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,今月と保留中の活動の概要
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,フォームビュー
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,今月と保留中の活動の概要
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.",自分以外の組織にユーザーを追加します。
 DocType: Customer Group,Customer Group Name,顧客グループ名
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,まだカスタマーはいません！
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,まだカスタマーはいません！
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,キャッシュフロー計算書
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},融資額は、{0}の最大融資額を超えることはできません。
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,ライセンス
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},C-フォーム{1}から請求書{0}を削除してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},C-フォーム{1}から請求書{0}を削除してください
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,過去の会計年度の残高を今年度に含めて残したい場合は「繰り越す」を選択してください
 DocType: GL Entry,Against Voucher Type,対伝票タイプ
 DocType: Physician,Phone (R),電話（R）
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,タイムスロットが追加されました
 DocType: Item,Attributes,属性
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,テンプレートを有効にする
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,セットアップ&gt;設定&gt;ネーミングシリーズで{0}のネーミングシリーズを設定してください
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,償却勘定を入力してください
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,最終注文日
 DocType: Patient,B Negative,Bネガティブ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},アカウント{0} は会社 {1} に所属していません
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,行{0}のシリアル番号が配達メモと一致しません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,行{0}のシリアル番号が配達メモと一致しません
 DocType: Student,Guardian Details,ガーディアン詳細
 DocType: C-Form,C-Form,C-フォーム
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,複数の従業員のためのマーク出席
 DocType: Vehicle,Chassis No,シャーシはありません
 DocType: Payment Request,Initiated,開始
 DocType: Production Order,Planned Start Date,計画開始日
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,BOMを選択してください
 DocType: Serial No,Creation Document Type,作成ドキュメントの種類
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,終了日は開始日より長くする必要があります
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,終了日は開始日より長くする必要があります
 DocType: Leave Type,Is Encash,現金化済
 DocType: Leave Allocation,New Leaves Allocated,新しい有給休暇
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,プロジェクトごとのデータは、引用符は使用できません
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,最後に
 DocType: Project,Expected End Date,終了予定日
 DocType: Budget Account,Budget Amount,予算額
 DocType: Appraisal Template,Appraisal Template Title,査定テンプレートタイトル
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},日付から{0}のための従業員{1}従業員の入社日前にすることはできません{2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,営利企業
 DocType: Patient,Alcohol Current Use,アルコール現在の使用
+DocType: Student Admission Program,Student Admission Program,学生入学プログラム
 DocType: Payment Entry,Account Paid To,アカウントに支払わ
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,親項目 {0} は在庫アイテムにはできません
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,全ての製品またはサービス。
@@ -3883,30 +3965,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0}アカウントの予算{1} {2} {3}に対しては{4}です。これは、{5}によって超えてしまいます
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',行{0}＃のアカウントタイプでなければなりません &quot;固定資産&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,出量
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,販売のために出荷量を計算するルール
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,アンカーされていない
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,シリーズは必須です
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,金融サービス
 DocType: Student Sibling,Student ID,学生証
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,時間ログの活動の種類
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,サプライヤの電子メール
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,時間ログの活動の種類
 DocType: Tax Rule,Sales,販売
 DocType: Stock Entry Detail,Basic Amount,基本額
 DocType: Training Event,Exam,試験
 DocType: Complaint,Complaint,苦情
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},在庫アイテム{0}には倉庫が必要です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},在庫アイテム{0}には倉庫が必要です
 DocType: Leave Allocation,Unused leaves,未使用の休暇
 DocType: Patient,Alcohol Past Use,アルコールの過去使用
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,貸方
 DocType: Tax Rule,Billing State,請求状況
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,移転
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),（部分組立品を含む）展開した部品表を取得する
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,移転
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),（部分組立品を含む）展開した部品表を取得する
 DocType: Authorization Rule,Applicable To (Employee),（従業員）に適用
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,期日は必須です
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,期日は必須です
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,属性 {0} の増分は0にすることはできません
 DocType: Journal Entry,Pay To / Recd From,支払先／受領元
 DocType: Naming Series,Setup Series,シリーズ設定
 DocType: Payment Reconciliation,To Invoice Date,請求書の日付へ
 DocType: Supplier,Contact HTML,連絡先HTML
 ,Inactive Customers,非アクティブ顧客
+DocType: Student Admission Program,Maximum Age,最大年齢
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,仕入領収書
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,どのように価格設定ルールが適用されている？
@@ -3925,6 +4009,7 @@
 DocType: GL Entry,Remarks,備考
 DocType: Payment Entry,Account Paid From,アカウントから支払わ
 DocType: Purchase Order Item Supplied,Raw Material Item Code,原材料アイテムコード
+DocType: Task,Parent Task,親タスク
 DocType: Journal Entry,Write Off Based On,償却基準
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,リードを作ります
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,印刷と文房具
@@ -3933,19 +4018,19 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",給与はすでに{0}と{1}、この日付範囲の間にすることはできません申請期間を残すとの間の期間のために処理しました。
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,シリアル番号の設置レコード
 DocType: Guardian Interest,Guardian Interest,ガーディアンインタレスト
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,POS請求書の初期値の設定
 apps/erpnext/erpnext/config/hr.py +177,Training,トレーニング
 DocType: Timesheet,Employee Detail,従業員の詳細
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Email ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,次の日と月次繰り返しの日は同じでなければなりません
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,次の日と月次繰り返しの日は同じでなければなりません
 DocType: Lab Prescription,Test Code,テストコード
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,ウェブサイトのホームページの設定
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},スコアカードが{1}のためRFQは{0}には許可されていません
 DocType: Offer Letter,Awaiting Response,応答を待っています
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,上記
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},合計金額{0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},無効な属性{0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},合計金額{0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},無効な属性{0} {1}
 DocType: Supplier,Mention if non-standard payable account,標準でない支払い可能な口座
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},同じ項目が複数回入力されました。 {リスト}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',「すべての評価グループ」以外の評価グループを選択してください
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},行{0}：アイテム{1}にコストセンターが必要です
 DocType: Training Event Employee,Optional,任意
@@ -3968,19 +4053,20 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：項目{2}には「コストセンター」が必須です
 DocType: Vehicle,Policy No,ポリシーはありません
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,付属品からアイテムを取得
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property",アイテム{0}に対して在庫が存在するため、バリアントのプロパティを有効にすることはできません
 DocType: Asset,Straight Line,直線
 DocType: Project User,Project User,プロジェクトユーザー
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,スプリット
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,スプリット
 DocType: GL Entry,Is Advance,前払金
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,出勤開始日と出勤日は必須です
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,「下請」にはYesかNoを入力してください
+DocType: Item,Default Purchase Unit of Measure,デフォルトの購入単位
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,最終連絡日
 DocType: Sales Team,Contact No.,連絡先番号
 DocType: Bank Reconciliation,Payment Entries,支払エントリ
 DocType: Production Order,Scrap Warehouse,スクラップ倉庫
 DocType: Production Order,Check if material transfer entry is not required,品目転送エントリが不要であるかどうかを確認する
 DocType: Program Enrollment Tool,Get Students From,からの留学生を取得
-DocType: Hub Settings,Seller Country,販売者所在国
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,ウェブサイト上でアイテムを公開
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,バッチでグループの学生
 DocType: Authorization Rule,Authorization Rule,認証ルール
@@ -3990,7 +4076,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,販売租税公課テンプレート
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),合計（クレジット）
 DocType: Repayment Schedule,Payment Date,支払期日
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,新しいバッチ数
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,新しいバッチ数
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,服飾
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,加重スコア機能を解決できませんでした。数式が有効であることを確認します。
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,注文数
@@ -4008,6 +4094,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行＃{0}：アセット{1}提出することができない、それはすでに{2}
 DocType: Tax Rule,Billing Country,請求先の国
 DocType: Purchase Order Item,Expected Delivery Date,配送予定日
+DocType: Restaurant Order Entry,Restaurant Order Entry,レストランオーダーエントリー
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,{0} #{1}の借方と貸方が等しくありません。差は{2} です。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,交際費
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,素材の要求を行います
@@ -4020,9 +4107,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,既存の取引を持つアカウントを削除することはできません
 DocType: Vehicle,Last Carbon Check,最後のカーボンチェック
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,訴訟費用
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,行数量を選択してください
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,行数量を選択してください
 DocType: Purchase Invoice,Posting Time,投稿時間
 DocType: Timesheet,% Amount Billed,％請求
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",Dr。{0}のために &quot;予約時間は&quot;設定されていません。医師のマスターに追加してください。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,電話代
 DocType: Sales Partner,Logo,ロゴ
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,あなたが保存する前に、一連の選択をユーザに強制したい場合は、これを確認してください。これをチェックするとデフォルトはありません。
@@ -4033,6 +4121,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,新規顧客の収益
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,旅費交通費
 DocType: Maintenance Visit,Breakdown,故障
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},doctype {0}にカスタムフィールドサブスクリプションを追加する
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,アカウント：{0} で通貨：{1}を選択することはできません
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",最新の評価レート/価格リストレート/原材料の最終購入レートに基づいて、スケジューラを使用してBOM原価を自動的に更新します。
 DocType: Bank Reconciliation Detail,Cheque Date,小切手日
@@ -4057,7 +4146,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),総請求金額（時間ログ経由）
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,サプライヤーID
 DocType: Payment Request,Payment Gateway Details,ペイメントゲートウェイ詳細
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,量は0より大きくなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,量は0より大きくなければなりません
 DocType: Journal Entry,Cash Entry,現金エントリー
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,子ノードは「グループ」タイプのノードの下に作成することができます
 DocType: Leave Application,Half Day Date,半日日
@@ -4075,12 +4164,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,注：アイテム{0}が複数回入力されています
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,全ての連絡先。
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,会社略称
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,ユーザー{0}は存在しません
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,ユーザー{0}は存在しません
 DocType: Subscription,SUB-,サブ-
 DocType: Item Attribute Value,Abbreviation,略語
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,支払項目が既に存在しています
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0}の限界を超えているので認証されません
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,給与テンプレートマスター
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,病理学
+DocType: Restaurant Order Entry,Restaurant Table,レストランのテーブル
 DocType: Leave Type,Max Days Leave Allowed,休暇割当最大日数
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,ショッピングカート用の税ルールを設定
 DocType: Purchase Invoice,Taxes and Charges Added,租税公課が追加されました。
@@ -4092,10 +4183,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,リードや顧客への見積。
 DocType: Stock Settings,Role Allowed to edit frozen stock,凍結在庫の編集が許可された役割
 ,Territory Target Variance Item Group-Wise,地域ターゲット差違（アイテムグループごと）
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,全ての顧客グループ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,全ての顧客グループ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,月間累計
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}は必須です。おそらく{1}から {2}のための通貨変換レコードが作成されていません
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,税テンプレートは必須です
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,税テンプレートは必須です
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,アカウント{0}：親アカウント{1}が存在しません
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),価格表単価（会社通貨）
 DocType: Products Settings,Products Settings,製品の設定
@@ -4121,12 +4212,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,アイテムごとの税の詳細
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,研究所の略
 ,Item-wise Price List Rate,アイテムごとの価格表単価
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,サプライヤー見積
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,サプライヤー見積
 DocType: Quotation,In Words will be visible once you save the Quotation.,見積を保存すると表示される表記内。
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},数量（{0}）は行{1}の小数部にはできません
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},バーコード{0}はアイテム{1}で使用済です
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},バーコード{0}はアイテム{1}で使用済です
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,送料を追加するためのルール
 DocType: Item,Opening Stock,期首在庫
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,顧客が必要です
@@ -4144,9 +4235,8 @@
 DocType: Customer,From Lead,リードから
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,製造の指示
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,年度選択...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POSエントリを作成するためにはPOSプロフィールが必要です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POSエントリを作成するためにはPOSプロフィールが必要です
 DocType: Program Enrollment Tool,Enroll Students,学生を登録
-DocType: Hub Settings,Name Token,名前トークン
 DocType: Lab Test,Approved Date,承認日
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,標準販売
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,倉庫は少なくとも1つ必須です
@@ -4164,7 +4254,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,人材
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,支払照合 支払
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,税金資産
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},製造指図は{0}でした
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},製造指図は{0}でした
 DocType: BOM Item,BOM No,部品表番号
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,仕訳{0}は、勘定{1}が無いか、既に他の伝票に照合されています
@@ -4185,7 +4275,7 @@
 DocType: Currency Exchange,To Currency,通貨
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,次のユーザーが休暇期間申請を承認することを許可
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,経費請求タイプ
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},アイテム{0}の販売率が{1}より低いです。販売価格は少なくともat {2}でなければなりません
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},アイテム{0}の販売率が{1}より低いです。販売価格は少なくともat {2}でなければなりません
 DocType: Item,Taxes,税
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,支払済かつ未配送
 DocType: Project,Default Cost Center,デフォルトコストセンター
@@ -4199,15 +4289,15 @@
 DocType: Employee Loan,Fully Disbursed,完全に支払わ
 DocType: Maintenance Visit,Customer Feedback,顧客フィードバック
 DocType: Account,Expense,経費
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,スコアが最大スコアよりも大きくすることはできません。
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,スコアが最大スコアよりも大きくすることはできません。
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,顧客とサプライヤ
 DocType: Item Attribute,From Range,範囲開始
 DocType: BOM,Set rate of sub-assembly item based on BOM,BOMに基づいてサブアセンブリアイテムのレートを設定する
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},式または条件の構文エラー：{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},式または条件の構文エラー：{0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,毎日の仕事の概要の設定会社
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,アイテム{0}は在庫アイテムではないので無視されます
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,この製造指示書を提出して次の処理へ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,この製造指示書を提出して次の処理へ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",特定の処理／取引で価格設定ルールを適用させないようにするために、全てに適用可能な価格設定ルールを無効にする必要があります。
 DocType: Assessment Group,Parent Assessment Group,親の評価グループ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,ジョブズ
@@ -4224,12 +4314,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Group Byが &#39;Company&#39;の場合、Companyフィルターを空白に設定してください
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,転記日付は将来の日付にすることはできません
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：シリアル番号 {1} が {2} {3}と一致しません
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,繰返しを生成するための
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,臨時休暇
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,LabテストUOM。
 DocType: Batch,Batch ID,バッチID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},注：{0}
 ,Delivery Note Trends,納品書の動向
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,今週の概要
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,今週の概要
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,在庫数量で
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,アカウント：{0}のみ株式取引を介して更新することができます
 DocType: Student Group Creation Tool,Get Courses,コースを取得
@@ -4243,7 +4334,6 @@
 DocType: Purchase Order,To Bill,請求先
 DocType: Material Request,% Ordered,％注文済
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",コースベースの学生グループの場合、コースはプログラム登録のコースからすべての生徒のために検証されます。
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date",カンマで区切られた電子メールアドレスを入力し、請求書が特定の日に自動的に郵送されます
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,出来高制
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,平均購入レート
 DocType: Task,Actual Time (in Hours),実際の時間（時）
@@ -4257,7 +4347,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,アイテム{0}にはシリアル番号が設定されていません。列は空白でなければなりません。
 DocType: Accounts Settings,Accounts Settings,アカウント設定
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,承認します
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,提出する結果がありません
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,提出する結果がありません
 DocType: Customer,Sales Partner and Commission,販売パートナーと手数料
 DocType: Employee Loan,Rate of Interest (%) / Year,利子率（％）/年
 ,Project Quantity,プロジェクト数量
@@ -4269,55 +4359,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,黒
 DocType: BOM Explosion Item,BOM Explosion Item,部品表展開アイテム
 DocType: Account,Auditor,監査人
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,生産{0}アイテム
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,生産{0}アイテム
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,もっと詳しく知る
 DocType: Cheque Print Template,Distance from top edge,上端からの距離
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,価格表{0}が無効になっているか、存在しません。
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,価格表{0}が無効になっているか、存在しません。
 DocType: Purchase Invoice,Return,返品
 DocType: Production Order Operation,Production Order Operation,製造指示作業
 DocType: Pricing Rule,Disable,無効にする
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,お支払い方法は、支払いを行う必要があります
 DocType: Project Task,Pending Review,レビュー待ち
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,予定と相談
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0}  -  {1}はバッチ{2}に登録されていません
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0}  -  {1}はバッチ{2}に登録されていません
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",資産{0}は{1}であるため廃棄することはできません
 DocType: Task,Total Expense Claim (via Expense Claim),総経費請求（経費請求経由）
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,マーク不在
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},行{0}：BOMの＃の通貨は、{1}選択した通貨と同じでなければなりません{2}
 DocType: Journal Entry Account,Exchange Rate,為替レート
 DocType: Patient,Additional information regarding the patient,患者に関する追加情報
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,受注{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,受注{0}は提出されていません
 DocType: Homepage,Tag Line,タグライン
 DocType: Fee Component,Fee Component,手数料コンポーネント
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,フリート管理
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,から項目を追加します。
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,フリート管理
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,から項目を追加します。
 DocType: Cheque Print Template,Regular,レギュラー
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,すべての評価基準の総Weightageは100％でなければなりません
-DocType: BOM,Last Purchase Rate,最新の仕入料金
+DocType: Purchase Order Item,Last Purchase Rate,最新の仕入料金
 DocType: Account,Asset,資産
 DocType: Project Task,Task ID,タスクID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,バリエーションを有しているのでアイテム{0}の在庫は存在させることができません
 DocType: Lab Test,Mobile,モバイル
 ,Sales Person-wise Transaction Summary,各営業担当者の取引概要
 DocType: Training Event,Contact Number,連絡先の番号
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,倉庫{0}は存在しません
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext Hubに登録する
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,倉庫{0}は存在しません
 DocType: Monthly Distribution,Monthly Distribution Percentages,月次配分割合
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,選択した項目はバッチを持てません
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",評価レート{1} {2}のための会計エントリを行うために必要とされる項目{0}、見つかりません。項目は、サンプルアイテムとして取引されている場合は、{1}、{1}項目テーブルであることを言及してください。それ以外の場合は、アイテムの着信在庫トランザクションを作成したり、言及評価率を項目レコードにして、このエントリをキャンセル/ submitingしてみてください
 DocType: Delivery Note,% of materials delivered against this Delivery Note,％の資材が納品済（この納品書を対象）
+DocType: Training Event,Has Certificate,証明書を持っている
 DocType: Project,Customer Details,顧客の詳細
 DocType: Employee,Reports to,レポート先
 ,Unpaid Expense Claim,未払い経費請求
 DocType: Payment Entry,Paid Amount,支払金額
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,販売サイクルを探る
 DocType: Assessment Plan,Supervisor,スーパーバイザー
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,オンライン
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,オンライン
 ,Available Stock for Packing Items,梱包可能な在庫
 DocType: Item Variant,Item Variant,アイテムバリエーション
 DocType: Assessment Result Tool,Assessment Result Tool,評価結果ツール
 DocType: BOM Scrap Item,BOM Scrap Item,BOMスクラップアイテム
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,提出された注文を削除することはできません
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,提出された注文を削除することはできません
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",口座残高がすでに借方に存在しており、「残高仕訳先」を「貸方」に設定することはできません
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,品質管理
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,アイテム{0}は無効になっています
@@ -4337,7 +4426,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},行 {0}：行{1}と時間が衝突しています
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,ゼロ評価レートを許可する
 DocType: Training Event Employee,Invited,招待
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,与えられた日付の従業員{0}が見つかり、複数のアクティブな給与構造
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,与えられた日付の従業員{0}が見つかり、複数のアクティブな給与構造
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,ゲートウェイアカウントを設定
 DocType: Employee,Employment Type,雇用の種類
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,固定資産
@@ -4349,7 +4438,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,学生メールID
 DocType: Employee,Notice (days),お知らせ（日）
 DocType: Tax Rule,Sales Tax Template,販売税テンプレート
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,請求書を保存する項目を選択します
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,請求書を保存する項目を選択します
 DocType: Employee,Encashment Date,現金化日
 DocType: Training Event,Internet,インターネット
 DocType: Special Test Template,Special Test Template,特殊テストテンプレート
@@ -4358,7 +4447,7 @@
 DocType: Production Order,Planned Operating Cost,予定営業費用
 DocType: Academic Term,Term Start Date,用語開始日
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,オップカウント
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},添付{0} を確認してください ＃{1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},添付{0} を確認してください ＃{1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,総勘定元帳ごとの銀行取引明細残高
 DocType: Job Applicant,Applicant Name,申請者名
 DocType: Authorization Rule,Customer / Item Name,顧客／アイテム名
@@ -4378,7 +4467,7 @@
 DocType: Guardian,Guardian Of ,の守護者
 DocType: Grading Scale Interval,Threshold,しきい値
 DocType: BOM Update Tool,Current BOM,現在の部品表
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,シリアル番号を追加
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,シリアル番号を追加
 DocType: Production Order Item,Available Qty at Source Warehouse,ソースウェアハウスで利用可能な数量
 apps/erpnext/erpnext/config/support.py +22,Warranty,保証
 DocType: Purchase Invoice,Debit Note Issued,デビットノート発行
@@ -4401,10 +4490,9 @@
 DocType: Account,Receivable,売掛金
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：注文がすでに存在しているとして、サプライヤーを変更することはできません
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,設定された与信限度額を超えた取引を提出することが許可されている役割
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,製造する項目を選択します
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time",マスタデータの同期、それはいくつかの時間がかかる場合があります
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,製造する項目を選択します
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time",マスタデータの同期、それはいくつかの時間がかかる場合があります
 DocType: Item,Material Issue,資材課題
-DocType: Hub Settings,Seller Description,販売者の説明
 DocType: Employee Education,Qualification,資格
 DocType: Item Price,Item Price,アイテム価格
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,石鹸＆洗剤
@@ -4412,7 +4500,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,随時よりも大きくすることはできません。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,映画＆ビデオ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,注文済
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,履歴書
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,履歴書
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,有効にすると、システムはテンプレートからバリアントのフィールドを更新しませんが、新しいバリアントを作成する際に、以下のフィールドのデータをコピーします
 DocType: Salary Detail,Component,成分
 DocType: Assessment Criteria,Assessment Criteria Group,評価基準のグループ
 DocType: Healthcare Settings,Patient Name By,患者名
@@ -4422,7 +4511,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,「役割承認」または「ユーザー承認」を入力してください
 DocType: Journal Entry,Write Off Entry,償却エントリ
 DocType: BOM,Rate Of Materials Based On,資材単価基準
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,サプライヤ&gt;サプライヤタイプ
+DocType: Item Variant Settings,Do not Update Variants,バリアントを更新しない
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,サポート分析
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,すべて選択解除
 DocType: POS Profile,Terms and Conditions,規約
@@ -4431,7 +4520,7 @@
 DocType: Leave Block List,Applies to Company,会社に適用
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,登録済みの在庫エントリ{0}が存在するため、キャンセルすることができません
 DocType: Employee Loan,Disbursement Date,支払い日
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,「受信者」は指定されていません
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,「受信者」は指定されていません
 DocType: BOM Update Tool,Update latest price in all BOMs,すべてのBOMで最新の価格を更新
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,医療記録
 DocType: Vehicle,Vehicle,車両
@@ -4446,14 +4535,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead％
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,資産減価償却と残高
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},量は{0} {1} {3}に{2}から転送します
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},量は{0} {1} {3}に{2}から転送します
 DocType: Sales Invoice,Get Advances Received,前受金を取得
 DocType: Email Digest,Add/Remove Recipients,受信者の追加／削除
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},停止された製造指示{0}に対しては取引が許可されていません
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",この会計年度をデフォルト値に設定するには、「デフォルトに設定」をクリックしてください
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,参加
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,参加
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,不足数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,アイテムバリエーション{0}は同じ属性で存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,アイテムバリエーション{0}は同じ属性で存在しています
 DocType: Employee Loan,Repay from Salary,給与から返済
 DocType: Leave Application,LAP/,ラップ/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},量のために、{0} {1}に対する支払いを要求{2}
@@ -4466,7 +4555,7 @@
 DocType: Sales Invoice Item,Sales Order Item,受注項目
 DocType: Salary Slip,Payment Days,支払日
 DocType: Patient,Dormant,休眠
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,子ノードを持つ倉庫は、元帳に変換することはできません
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,子ノードを持つ倉庫は、元帳に変換することはできません
 DocType: BOM,Manage cost of operations,作業費用を管理
 DocType: Accounts Settings,Stale Days,不朽の日々
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",チェックされた取引を「送信済」にすると、取引に関連付けられた「連絡先」あてのメールが、添付ファイル付きで、画面にポップアップします。ユーザーはメールを送信するか、キャンセルするかを選ぶことが出来ます。
@@ -4480,10 +4569,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,シリアル番号{0}はすでに受領されています
 ,Requested Items To Be Transferred,移転予定の要求アイテム
 DocType: Expense Claim,Vehicle Log,車両のログ
-DocType: Purchase Invoice,Recurring Id,繰り返しID
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),発熱（38.5℃/ 101.3°Fまたは38°C / 100.4°Fの持続温度）の存在
 DocType: Customer,Sales Team Details,営業チームの詳細
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,完全に削除しますか？
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,完全に削除しますか？
 DocType: Expense Claim,Total Claimed Amount,請求額合計
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,潜在的販売機会
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},無効な {0}
@@ -4493,7 +4581,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,デパート
 ,Item Delivery Date,納品日
 DocType: Warehouse,PIN,ピン
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,セットアップERPNextであなたの学校
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,セットアップERPNextであなたの学校
 DocType: Sales Invoice,Base Change Amount (Company Currency),基本変化量（会社通貨）
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,次の倉庫には会計エントリーがありません
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,先に文書を保存してください
@@ -4505,13 +4593,12 @@
 DocType: Task,Is Milestone,マイルストーンです
 DocType: Daily Work Summary,Email Sent To,に送信されたメール
 DocType: Budget,Warn,警告する
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,登録を解除してもよろしいですか？
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",記録内で注目に値する特記事項
 DocType: BOM,Manufacturing User,製造ユーザー
 DocType: Purchase Invoice,Raw Materials Supplied,原材料供給
-DocType: Purchase Invoice,Recurring Print Format,繰り返し用印刷フォーマット
 DocType: C-Form,Series,シリーズ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},価格表{0}の通貨は{1}または{2}でなければなりません
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,製品を追加
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},価格表{0}の通貨は{1}または{2}でなければなりません
 DocType: Appraisal,Appraisal Template,査定テンプレート
 DocType: Item Group,Item Classification,アイテム分類
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,ビジネス開発マネージャー
@@ -4525,7 +4612,7 @@
 DocType: Item Attribute Value,Attribute Value,属性値
 ,Itemwise Recommended Reorder Level,アイテムごとに推奨される再注文レベル
 DocType: Salary Detail,Salary Detail,給与詳細
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,{0}を選択してください
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,{0}を選択してください
 DocType: Appointment Type,Physician,医師
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,アイテム {1}のバッチ {0} は期限切れです
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,相談
@@ -4536,7 +4623,7 @@
 DocType: Salary Detail,Default Amount,デフォルト額
 DocType: Lab Test Template,Descriptive,記述的
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,システムに倉庫がありません。
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,今月の概要
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,今月の概要
 DocType: Quality Inspection Reading,Quality Inspection Reading,品質検査報告要素
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,「〜より古い在庫を凍結する」は %d 日よりも小さくしなくてはなりません
 DocType: Tax Rule,Purchase Tax Template,購入税テンプレート
@@ -4559,12 +4646,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,トレーニングイベント/結果
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,上と減価償却累計額
 DocType: Sales Invoice,C-Form Applicable,C-フォーム適用
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},作業 {0} の作業時間は0以上でなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},作業 {0} の作業時間は0以上でなければなりません
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,倉庫が必須です
 DocType: Supplier,Address and Contacts,住所・連絡先
 DocType: UOM Conversion Detail,UOM Conversion Detail,単位変換の詳細
 DocType: Program,Program Abbreviation,プログラムの略
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,製造指示はアイテムテンプレートに対して出すことができません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,製造指示はアイテムテンプレートに対して出すことができません
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,料金は、各アイテムに対して、領収書上で更新されます
 DocType: Warranty Claim,Resolved By,課題解決者
 DocType: Bank Guarantee,Start Date,開始日
@@ -4590,26 +4677,27 @@
 DocType: Employee,Educational Qualification,学歴
 DocType: Workstation,Operating Costs,営業費用
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,アクション毎月の予算が超過累積場合
-DocType: Purchase Invoice,Submit on creation,作成時に提出
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},{0} {1}でなければならないための通貨
+DocType: Subscription,Submit on creation,作成時に提出
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},{0} {1}でなければならないための通貨
 DocType: Asset,Disposal Date,処分日
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",彼らは休日を持っていない場合は電子メールは、与えられた時間で、会社のすべてのActive従業員に送信されます。回答の概要は、深夜に送信されます。
 DocType: Employee Leave Approver,Employee Leave Approver,従業員休暇承認者
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：この倉庫{1}には既に再注文エントリが存在しています
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.",見積が作成されているため、失注を宣言できません
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,トレーニングフィードバック
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：この倉庫{1}には既に再注文エントリが存在しています
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.",見積が作成されているため、失注を宣言できません
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,トレーニングフィードバック
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,製造指示{0}を提出しなければなりません
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,サプライヤのスコアカード基準
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},アイテム{0}の開始日と終了日を選択してください
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},コースは、行{0}に必須です
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,終了日を開始日の前にすることはできません
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc文書型
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,価格の追加/編集
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,価格の追加/編集
 DocType: Batch,Parent Batch,親バッチ
 DocType: Cheque Print Template,Cheque Print Template,小切手印刷テンプレート
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,コストセンターの表
 DocType: Lab Test Template,Sample Collection,サンプル収集
 ,Requested Items To Be Ordered,発注予定の要求アイテム
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,自分の注文
 DocType: Price List,Price List Name,価格表名称
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},{0}の毎日の仕事の概要
 DocType: Employee Loan,Totals,合計
@@ -4628,12 +4716,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1}に必要な{2}上で{3} {4} {5}このトランザクションを完了するための単位。
 DocType: Fee Schedule,Student Category,学生カテゴリー
 DocType: Announcement,Student,学生
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,組織単位（部門）マスター。
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,組織単位（部門）マスター。
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,部屋に行く
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,メッセージを入力してください
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,サプライヤとのデュプリケート
 DocType: Email Digest,Pending Quotations,保留中の名言
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,POSプロフィール
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,POSプロフィール
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,ラボテスト構成。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,無担保ローン
 DocType: Cost Center,Cost Center Name,コストセンター名
@@ -4643,6 +4731,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,支出額合計
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160文字を超えるメッセージは複数のメッセージに分割されます
 DocType: Purchase Receipt Item,Received and Accepted,受領・承認済
+DocType: Hub Settings,Company and Seller Profile,会社と販売者のプロフィール
 ,GST Itemised Sales Register,GST商品販売登録
 ,Serial No Service Contract Expiry,シリアル番号（サービス契約の有効期限）
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,同じ口座を同時に借方と貸方にすることはできません
@@ -4652,10 +4741,11 @@
 DocType: Item,Variant Based On,バリアントベースで
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},割り当てられた重みづけの合計は100％でなければなりません。{0}になっています。
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,サプライヤー
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,を修正してください
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,受注が作成されているため、失注にできません
 DocType: Request for Quotation Item,Supplier Part No,サプライヤー型番
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',カテゴリが「評価」または「Vaulationと合計」のためのものであるときに控除することはできません。
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,受領元
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,受領元
 DocType: Lead,Converted,変換済
 DocType: Item,Has Serial No,シリアル番号あり
 DocType: Employee,Date of Issue,発行日
@@ -4663,7 +4753,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",購買依頼が必要な場合の購買設定== &#39;はい&#39;の場合、購買請求書を登録するには、まず商品{0}の購買領収書を登録する必要があります
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},行＃{0}：アイテム {1} にサプライヤーを設定してください
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,行{0}：時間値がゼロより大きくなければなりません。
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,アイテム{1}に添付されたウェブサイト画像{0}が見つかりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,アイテム{1}に添付されたウェブサイト画像{0}が見つかりません
 DocType: Issue,Content Type,コンテンツタイプ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,コンピュータ
 DocType: Item,List this Item in multiple groups on the website.,ウェブサイト上の複数のグループでこのアイテムを一覧表示します。
@@ -4674,14 +4764,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,未照合のエントリーを取得
 DocType: Payment Reconciliation,From Invoice Date,請求書の日付から
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,送信する権限がありません
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,課金通貨はいずれかのデフォルトcomapanyの通貨やパーティーの口座通貨に等しくなければなりません
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,課金通貨はいずれかのデフォルトcomapanyの通貨やパーティーの口座通貨に等しくなければなりません
 DocType: Healthcare Settings,Laboratory Settings,実験室の設定
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,現金化を残します
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,これは何？
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,倉庫
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,すべての学生の入学
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,これは何？
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,倉庫
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,すべての学生の入学
 ,Average Commission Rate,平均手数料率
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,在庫アイテム以外は「シリアル番号あり」を「はい」にすることができません。
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,在庫アイテム以外は「シリアル番号あり」を「はい」にすることができません。
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,ステータスを選択
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,出勤は将来の日付にマークを付けることができません
 DocType: Pricing Rule,Pricing Rule Help,価格設定ルールヘルプ
@@ -4699,40 +4789,40 @@
 DocType: Item,Customer Code,顧客コード
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},{0}のための誕生日リマインダー
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,最新注文からの日数
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,借方アカウントは貸借対照表アカウントである必要があります
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,借方アカウントは貸借対照表アカウントである必要があります
 DocType: Buying Settings,Naming Series,シリーズ名を付ける
 DocType: Leave Block List,Leave Block List Name,休暇リスト名
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,保険開始日は、保険終了日未満でなければなりません
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,学校でインストラクターのネーミングシステムを設定してください&gt;学校の設定
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,在庫資産
 DocType: Timesheet,Production Detail,生産の詳細
+DocType: Restaurant,Active Menu,アクティブメニュー
 DocType: Target Detail,Target Qty,ターゲット数量
 DocType: Shopping Cart Settings,Checkout Settings,チェックアウト設定
 DocType: Attendance,Present,出勤
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,納品書{0}は提出済にすることはできません
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,納品書{0}は提出済にすることはできません
 DocType: Notification Control,Sales Invoice Message,請求書メッセージ
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,アカウント{0}を閉じると、型責任/エクイティのものでなければなりません
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},従業員の給与スリップ{0}はすでにタイムシート用に作成した{1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},従業員の給与スリップ{0}はすでにタイムシート用に作成した{1}
 DocType: Vehicle Log,Odometer,オドメーター
 DocType: Sales Order Item,Ordered Qty,注文数
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,アイテム{0}は無効です
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,アイテム{0}は無効です
 DocType: Stock Settings,Stock Frozen Upto,在庫凍結
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOMは、どの在庫品目が含まれていません
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,プロジェクト活動／タスク
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOMは、どの在庫品目が含まれていません
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,プロジェクト活動／タスク
 DocType: Vehicle Log,Refuelling Details,給油の詳細
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,給与明細を生成
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}",適用のためには次のように選択されている場合の購入は、チェックする必要があります{0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,割引は100未満でなければなりません
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,最後の購入率が見つかりません
 DocType: Purchase Invoice,Write Off Amount (Company Currency),償却額（会社通貨）
 DocType: Sales Invoice Timesheet,Billing Hours,課金時間
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,{0}が見つかりませんのデフォルトのBOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,行＃{0}：再注文数量を設定してください
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,{0}が見つかりませんのデフォルトのBOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,行＃{0}：再注文数量を設定してください
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,ここに追加する項目をタップします
 DocType: Fees,Program Enrollment,プログラム登録
 DocType: Landed Cost Voucher,Landed Cost Voucher,陸揚費用伝票
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},{0}を設定してください
-DocType: Purchase Invoice,Repeat on Day of Month,毎月繰り返し
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0}  -  {1}は非アクティブな生徒です
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0}  -  {1}は非アクティブな生徒です
 DocType: Employee,Health Details,健康の詳細
 DocType: Offer Letter,Offer Letter Terms,雇用契約書条件
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,支払請求書を作成するには参照書類が必要です
@@ -4740,7 +4830,6 @@
 DocType: Employee External Work History,Salary,給与
 DocType: Serial No,Delivery Document Type,納品文書タイプ
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,上で選択した条件で全ての給与伝票を提出
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} アイテム同期
 DocType: Sales Order,Partly Delivered,一部納品済
 DocType: Email Digest,Receivables,売掛金
 DocType: Lead Source,Lead Source,リード元
@@ -4763,19 +4852,19 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,エイジングレンジ２
 DocType: SG Creation Tool Course,Max Strength,最大強度
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,部品表交換
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,納期に基づいて商品を選択
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,納期に基づいて商品を選択
 ,Sales Analytics,販売分析
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},利用可能な{0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},利用可能な{0}
 ,Prospects Engaged But Not Converted,見通しは悪化するが変換されない
 DocType: Manufacturing Settings,Manufacturing Settings,製造設定
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,メール設定
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1モバイルはありません
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,会社マスターにデフォルトの通貨を入力してください
 DocType: Stock Entry Detail,Stock Entry Detail,在庫エントリー詳細
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,日次リマインダー
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,日次リマインダー
 DocType: Products Settings,Home Page is Products,ホームページは「製品」です
 ,Asset Depreciation Ledger,資産減価償却元帳
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},{0}と税ルールが衝突しています
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},{0}と税ルールが衝突しています
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,新しいアカウント名
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,原材料供給費用
 DocType: Selling Settings,Settings for Selling Module,販売モジュール設定
@@ -4789,8 +4878,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,アイテム{0}は在庫アイテムでなければなりません
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,デフォルト作業中倉庫
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,会計処理のデフォルト設定。
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,従業員の命名システムを人事管理&gt; HR設定で設定してください
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,予定日は資材要求日の前にすることはできません
+DocType: Restaurant,Default Tax Template,デフォルト税テンプレート
 DocType: Fees,Student Details,学生の詳細
 DocType: Purchase Invoice Item,Stock Qty,在庫数
 DocType: Employee Loan,Repayment Period in Months,ヶ月間における償還期間
@@ -4808,8 +4898,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,アイテムに移動
 DocType: Sales Partner,Partner Type,パートナーの種類
 DocType: Purchase Taxes and Charges,Actual,実際
+DocType: Restaurant Menu,Restaurant Manager,レストランマネージャー
 DocType: Authorization Rule,Customerwise Discount,顧客ごと割引
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,タスクのためのタイムシート。
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,タスクのためのタイムシート。
 DocType: Purchase Invoice,Against Expense Account,対経費
 DocType: Production Order,Production Order,製造指示
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,設置票{0}はすでに提出されています
@@ -4817,7 +4908,6 @@
 DocType: Quotation Item,Against Docname,文書名に対して
 DocType: SMS Center,All Employee (Active),全ての従業員（アクティブ）
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,表示
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,請求書が自動的に生成される期間を選択
 DocType: BOM,Raw Material Cost,原材料費
 DocType: Item Reorder,Re-Order Level,再注文レベル
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,製造指示を出すまたは分析用に原材料をダウンロードするための、アイテムと計画数を入力してください。
@@ -4830,23 +4920,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,レポートタイプは必須です
 DocType: Item,Serial Number Series,シリアル番号シリーズ
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},列{1}の在庫アイテム{0}には倉庫が必須です。
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,プログラムの追加
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,小売・卸売
 DocType: Issue,First Responded On,初回返答
 DocType: Website Item Group,Cross Listing of Item in multiple groups,複数のグループのアイテムのクロスリスト
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},会計年度開始・終了日は、すでに会計年度{0}に設定されています
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,クリアランス日更新
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,バッチ分割
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,バッチ分割
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,照合完了
 DocType: Request for Quotation Supplier,Download PDF,PDFのダウンロード
 DocType: Production Order,Planned End Date,計画終了日
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,スケジュールの日付を入力してください
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,アイテムが保存される場所
 DocType: Request for Quotation,Supplier Detail,サプライヤー詳細
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},式または条件でエラーが発生しました：{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},式または条件でエラーが発生しました：{0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,請求された額
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,基準の重みは100％まで加算する必要があります
 DocType: Attendance,Attendance,出勤
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,在庫アイテム
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,在庫アイテム
 DocType: BOM,Materials,資材
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",チェックされていない場合、リストを適用先の各カテゴリーに追加しなくてはなりません
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,ソースとターゲット・ウェアハウスは同じにすることはできません
@@ -4864,6 +4954,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,差引計
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},{0}アイテム{4} {1} {3}の単位で、{2}の範囲内でなければなりません属性の値
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,{0}列のターゲット倉庫は製造注文と同じでなければなりません。
+DocType: Restaurant Reservation,Waitlisted,待機リスト
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,他の通貨を使用してエントリーを作成した後には通貨を変更することができません
 DocType: Vehicle Service,Clutch Plate,クラッチプレート
 DocType: Company,Round Off Account,丸め誤差アカウント
@@ -4880,7 +4971,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,新しい営業担当者の名前
 DocType: Packing Slip,Gross Weight UOM,総重量数量単位
 DocType: Delivery Note Item,Against Sales Invoice,対納品書
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,シリアル化されたアイテムのシリアル番号を入力してください
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,シリアル化されたアイテムのシリアル番号を入力してください
 DocType: Bin,Reserved Qty for Production,生産のための予約済み数量
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,コースベースのグループを作る際にバッチを考慮したくない場合は、チェックを外したままにしておきます。
 DocType: Asset,Frequency of Depreciation (Months),減価償却費の周波数（ヶ月）
@@ -4891,7 +4982,7 @@
 DocType: Lab Test,Test Group,テストグループ
 DocType: Payment Reconciliation,Receivable / Payable Account,売掛金／買掛金
 DocType: Delivery Note Item,Against Sales Order Item,対受注アイテム
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},属性 {0} の属性値を指定してください
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},属性 {0} の属性値を指定してください
 DocType: Item,Default Warehouse,デフォルト倉庫
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},グループアカウント{0}に対して予算を割り当てることができません
 DocType: Healthcare Settings,Patient Registration,患者登録
@@ -4920,6 +5011,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,営業担当
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,予算とコストセンター
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,複数のデフォルトの支払い方法は許可されていません
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,のために
 ,Appointment Analytics,アポイントメントアナリティクス
 DocType: Vehicle Service,Half Yearly,半年ごと
 DocType: Lead,Blog Subscriber,ブログ購読者
@@ -4937,7 +5029,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,クォートカウント
 ,BOM Stock Report,BOM証券報告書
 DocType: Stock Reconciliation Item,Quantity Difference,数量違い
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,給与計算
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,給与計算
 DocType: Opportunity Item,Basic Rate,基本料金
 DocType: GL Entry,Credit Amount,貸方金額
 DocType: Cheque Print Template,Signatory Position,署名者の位置
@@ -4951,12 +5043,12 @@
 DocType: Tax Rule,Tax Rule,税ルール
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,販売サイクル全体で同じレートを維持
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,ワークステーションの労働時間外のタイムログを計画します。
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,キュー内のお客様
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0}には医師のスケジュールはありません。医師のマスターに追加してください
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,キュー内のお客様
 DocType: Student,Nationality,国籍
 ,Items To Be Requested,要求されるアイテム
-DocType: Purchase Order,Get Last Purchase Rate,最新の購入料金を取得
 DocType: Company,Company Info,会社情報
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,選択するか、新規顧客を追加
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,選択するか、新規顧客を追加
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,原価センタは、経費請求を予約するために必要とされます
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),資金運用（資産）
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,これは、この従業員の出席に基づいています
@@ -4964,6 +5056,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,借方アカウント
 DocType: Fiscal Year,Year Start Date,年始日
 DocType: Attendance,Employee Name,従業員名
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,レストランオーダーエントリーアイテム
 DocType: Sales Invoice,Rounded Total (Company Currency),合計（四捨五入）（会社通貨）
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,会計タイプが選択されているため、グループに変換することはできません
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1}が変更されています。画面を更新してください。
@@ -4974,6 +5067,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,従業員給付
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},梱包済数量は、行{1}のアイテム{0}の数量と等しくなければなりません
 DocType: Production Order,Manufactured Qty,製造数量
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,作成された請求書
 DocType: Purchase Receipt Item,Accepted Quantity,受入数
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},従業員のデフォルト休日リストを設定してください{0}または当社{1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}：{1}は存在しません
@@ -4983,18 +5077,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行番号 {0}：経費請求{1}に対して保留額より大きい額は指定できません。保留額は {2} です
 DocType: Maintenance Schedule,Schedule,スケジュール
 DocType: Account,Parent Account,親勘定
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,利用可
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,利用可
 DocType: Quality Inspection Reading,Reading 3,報告要素3
 ,Hub,ハブ
 DocType: GL Entry,Voucher Type,伝票タイプ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,価格表が見つからないか無効になっています
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,価格表が見つからないか無効になっています
 DocType: Lab Test,Approved,承認済
 DocType: Pricing Rule,Price,価格
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',{0}から取り除かれた従業員は「退職」に設定されなければなりません
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',{0}から取り除かれた従業員は「退職」に設定されなければなりません
+DocType: Hub Settings,Last Sync On,最後の同期オン
 DocType: Guardian,Guardian,保護者
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,指定期間内の従業員 {1} の査定 {0} が作成されました
 DocType: Employee,Education,教育
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,デル
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,デル
 DocType: Selling Settings,Campaign Naming By,キャンペーンの命名により、
 DocType: Employee,Current Address Is,現住所は：
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,月次販売目標（
@@ -5009,7 +5104,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,コースコード：
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,経費勘定を入力してください
 DocType: Account,Stock,在庫
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行＃{0}：リファレンスドキュメントタイプは、購買発注、購買請求書または仕訳のいずれかでなければなりません
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行＃{0}：リファレンスドキュメントタイプは、購買発注、購買請求書または仕訳のいずれかでなければなりません
 DocType: Employee,Current Address,現住所
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",アイテムが別のアイテムのバリエーションである場合には、明示的に指定しない限り、その後の説明、画像、価格、税金などはテンプレートから設定されます
 DocType: Serial No,Purchase / Manufacture Details,仕入／製造の詳細
@@ -5040,7 +5135,7 @@
 DocType: Hub Settings,Hub Settings,ハブの設定
 DocType: Project,Gross Margin %,粗利益率％
 DocType: BOM,With Operations,操作で
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,会計エントリがすでに会社{1}の通貨{0}に存在します。債権または債務アカウントを通貨{0}で選択してください。
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,会計エントリがすでに会社{1}の通貨{0}に存在します。債権または債務アカウントを通貨{0}で選択してください。
 DocType: Asset,Is Existing Asset,既存の資産は、
 DocType: Salary Detail,Statistical Component,統計コンポーネント
 DocType: Warranty Claim,If different than customer address,顧客の住所と異なる場合
@@ -5048,13 +5143,14 @@
 DocType: BOM Operation,BOM Operation,部品表の操作
 DocType: Purchase Taxes and Charges,On Previous Row Amount,前行の額
 DocType: Student,Home Address,ホームアドレス
+DocType: Item,Has Expiry Date,有効期限がある
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,明細バリアント設定。
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,資産を譲渡
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,資産を譲渡
 DocType: POS Profile,POS Profile,POSプロフィール
 DocType: Training Event,Event Name,イベント名
 DocType: Physician,Phone (Office),電話（オフィス）
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,入場
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},{0}のための入試
+apps/erpnext/erpnext/hooks.py +147,Admission,入場
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},{0}のための入試
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.",予算や目標などを設定する期間
 DocType: Supplier Scorecard Scoring Variable,Variable Name,変数名
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",アイテム{0}はテンプレートです。バリエーションのいずれかを選択してください
@@ -5063,7 +5159,7 @@
 DocType: Assessment Plan,Room,ルーム
 DocType: Purchase Order,Advance Paid,立替金
 DocType: Item,Item Tax,アイテムごとの税
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,サプライヤー用資材
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,サプライヤー用資材
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,消費税の請求書
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}％が複数回表示されます
 DocType: Expense Claim,Employees Email Id,従業員メールアドレス
@@ -5074,32 +5170,30 @@
 DocType: Program,Program Name,プログラム名
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,税金・料金を考慮
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,実際の数量は必須です
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0}には現在、{1}サプライヤスコアカードがあり、このサプライヤへの購入注文は慎重に発行する必要があります。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0}には現在、{1}サプライヤスコアカードがあり、このサプライヤへの購入注文は慎重に発行する必要があります。
 DocType: Employee Loan,Loan Type,ローンの種類
 DocType: Scheduling Tool,Scheduling Tool,スケジューリングツール
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,クレジットカード
 DocType: BOM,Item to be manufactured or repacked,製造または再梱包するアイテム
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,在庫取引のデフォルト設定
-DocType: Purchase Invoice,Next Date,次の日
 DocType: Employee Education,Major/Optional Subjects,大手/オプション科目
 DocType: Sales Invoice Item,Drop Ship,ドロップシッピング
+DocType: Hub Settings,Suspended,一時停止中
 DocType: Training Event,Attendees,参加者
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",ここでは、親、配偶者や子供の名前と職業などの家族の詳細を保持することができます
 DocType: Academic Term,Term End Date,期末日
-DocType: Hub Settings,Seller Name,販売者名
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),租税公課控除（会社通貨）
 DocType: Item Group,General Settings,一般設定
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,同じ通貨には変更できません
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,インストラクターを追加
 DocType: Stock Entry,Repack,再梱包
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,続行する前に、フォームを保存してください
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,最初に会社を選択してください
 DocType: Item Attribute,Numeric Values,数値
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,ロゴを添付
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,在庫レベル
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,在庫レベル
 DocType: Customer,Commission Rate,手数料率
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,{1}の間に{0}スコアカードが作成されました：
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,バリエーション作成
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,バリエーション作成
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,部門別休暇申請
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer",お支払い方法の種類は、受信のいずれかで支払うと内部転送する必要があります
 apps/erpnext/erpnext/config/selling.py +179,Analytics,分析
@@ -5114,11 +5208,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,株式資本
 DocType: Shopping Cart Settings,Show Public Attachments,パブリックアタッチメントを表示する
 DocType: Packing Slip,Package Weight Details,パッケージ重量詳細
+DocType: Restaurant Reservation,Reservation Time,予約時間
 DocType: Payment Gateway Account,Payment Gateway Account,ペイメントゲートウェイアカウント
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,支払完了後、選択したページにリダイレクトします
 DocType: Company,Existing Company,既存企業
 DocType: Healthcare Settings,Result Emailed,結果が電子メールで送信される
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",すべての商品アイテムが非在庫アイテムであるため、税カテゴリが「合計」に変更されました
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,商品コード&gt;商品グループ&gt;ブランド
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,csvファイルを選択してください
 DocType: Student Leave Application,Mark as Present,プレゼントとしてマーク
 DocType: Supplier Scorecard,Indicator Color,インジケータの色
@@ -5143,11 +5239,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,学生のバッチを作ります
 DocType: Fee Schedule,FRQ.,FRQ。
 DocType: Leave Type,Is Carry Forward,繰越済
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,部品表からアイテムを取得
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,部品表からアイテムを取得
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,リードタイム日数
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},資産の転記日付購入日と同じでなければなりません{1} {2}：行＃{0}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,学生が研究所のホステルに住んでいる場合はこれをチェックしてください。
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,上記の表に受注を入力してください
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,上記の表に受注を入力してください
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,給与スリップ提出されていません
 ,Stock Summary,株式の概要
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,別の倉庫から資産を移します
@@ -5163,5 +5259,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},行{0}：借方エントリは{1}とリンクすることができません
 DocType: Journal Entry,Subscription Section,サブスクリプションセクション
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,アカウント{0}は存在しません
+DocType: Training Event,Training Program,研修プログラム
 DocType: Account,Cash,現金
 DocType: Employee,Short biography for website and other publications.,ウェブサイトや他の出版物のための略歴
diff --git a/erpnext/translations/km.csv b/erpnext/translations/km.csv
index dc26224..4ba7df8 100644
--- a/erpnext/translations/km.csv
+++ b/erpnext/translations/km.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,របៀបប្រាក់បៀវត្ស
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,ចុះឈ្មោះ
 DocType: Patient,Divorced,លែងលះគ្នា
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,ធាតុដែលបានធ្វើសមកាលកម្មរួចទៅហើយ
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,អនុញ្ញាតឱ្យធាតុនឹងត្រូវបានបន្ថែមជាច្រើនដងនៅក្នុងប្រតិបត្តិការ
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,បោះបង់ {0} ទស្សនកិច្ចនៅមុនពេលលុបចោលសំភារៈបណ្តឹងធានានេះ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,ផលិតផលទំនិញប្រើប្រាស់
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,ទុកឱ្យការអនុម័ត
 DocType: Sales Partner,Dealer,អ្នកចែកបៀ
 DocType: Consultation,Investigations,ការស៊ើបអង្កេត
+DocType: Restaurant Order Entry,Click Enter To Add,ចុចបញ្ចូលដើម្បីបន្ថែម
 DocType: Employee,Rented,ជួល
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,អាចប្រើប្រាស់បានសំរាប់អ្នកប្រើប្រាស់
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",បញ្ឈប់ការបញ្ជាទិញផលិតផលដែលមិនអាចត្រូវបានលុបចោលឮវាជាលើកដំបូងដើម្បីបោះបង់
 DocType: Vehicle Service,Mileage,mileage
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,តើអ្នកពិតជាចង់លុបចោលទ្រព្យសម្បត្តិនេះ?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,តើអ្នកពិតជាចង់លុបចោលទ្រព្យសម្បត្តិនេះ?
 DocType: Drug Prescription,Update Schedule,ធ្វើបច្ចុប្បន្នភាពកាលវិភាគ
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,ជ្រើសផ្គត់ផ្គង់លំនាំដើម
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},រូបិយប័ណ្ណត្រូវបានទាមទារសម្រាប់តារាងតម្លៃ {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,ពិនិត្យភាពអាចរកបាន
 DocType: Job Applicant,Job Applicant,ការងារដែលអ្នកដាក់ពាក្យសុំ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,នេះផ្អែកលើប្រតិបត្តិការប្រឆាំងនឹងការផ្គត់ផ្គង់នេះ។ សូមមើលខាងក្រោមសម្រាប់សេចក្ដីលម្អិតកំណត់ពេលវេលា
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,មិនមានលទ្ធផលជាច្រើនទៀត។
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,ផ្នែកច្បាប់
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},ពន្ធលើប្រភេទពិតប្រាកដមិនអាចត្រូវបានរួមបញ្ចូលនៅក្នុងអត្រាធាតុនៅក្នុងជួរដេក {0}
 DocType: Bank Guarantee,Customer,អតិថិជន
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),អត្រាប្តូរប្រាក់ត្រូវតែមានដូចគ្នា {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ឈ្មោះអតិថិជន
 DocType: Vehicle,Natural Gas,ឧស្ម័នធម្មជាតិ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},គណនីធនាគារដែលមិនអាចត្រូវបានដាក់ឈ្មោះថាជា {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},គណនីធនាគារដែលមិនអាចត្រូវបានដាក់ឈ្មោះថាជា {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ក្បាល (ឬក្រុម) ប្រឆាំងនឹងធាតុគណនេយ្យនិងតុល្យភាពត្រូវបានធ្វើឡើងត្រូវបានរក្សា។
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),ឆ្នើមសម្រាប់ {0} មិនអាចតិចជាងសូន្យ ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,មិនមានប្រាក់ខែដែលបានដាក់ស្នើដើម្បីដំណើរការទេ។
 DocType: Manufacturing Settings,Default 10 mins,10 នាទីលំនាំដើម
 DocType: Leave Type,Leave Type Name,ទុកឱ្យប្រភេទឈ្មោះ
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,បង្ហាញតែការបើកចំហ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,វាចាំបាច់ណាស់ក្នុងការចាត់វិធានការនេះនៅថ្ងៃនេះដោយខ្លួនឯងសម្រាប់ការបកក្រោយដែលបានរៀបរាប់ខាងលើ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,កម្រងឯកសារបន្ទាន់សម័យដោយជោគជ័យ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,ពិនិត្យមុនពេលចេញ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,ភាពត្រឹមត្រូវ Journal Entry ផ្តល់ជូន
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,ការបញ្ជាទិញធាតុដែលនឹងត្រូវទទួលបាន
 DocType: SMS Center,All Supplier Contact,ទាំងអស់ផ្គត់ផ្គង់ទំនាក់ទំនង
 DocType: Support Settings,Support Settings,ការកំណត់ការគាំទ្រ
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,គេរំពឹងថានឹងកាលបរិច្ឆេទបញ្ចប់មិនអាចតិចជាងការរំពឹងទុកការចាប់ផ្តើមកាលបរិច្ឆេទ
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,គេរំពឹងថានឹងកាលបរិច្ឆេទបញ្ចប់មិនអាចតិចជាងការរំពឹងទុកការចាប់ផ្តើមកាលបរិច្ឆេទ
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ជួរដេក # {0}: អត្រាការប្រាក់ត្រូវតែមានដូចគ្នា {1} {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,ចាកចេញកម្មវិធីថ្មី
 ,Batch Item Expiry Status,ធាតុបាច់ស្ថានភាពផុតកំណត់
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,សេចក្តីព្រាងធនាគារ
 DocType: Mode of Payment Account,Mode of Payment Account,របៀបនៃការទូទាត់គណនី
 DocType: Consultation,Consultation,ការពិគ្រោះយោបល់
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,លក់និងត្រឡប់
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,បង្ហាញវ៉ារ្យ៉ង់
 DocType: Academic Term,Academic Term,រយៈពេលនៃការសិក្សា
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,សម្ភារៈ
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ការថែទាំសុខភាព
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ពន្យាពេលក្នុងការទូទាត់ (ថ្ងៃ)
 DocType: Lab Prescription,Lab Prescription,វេជ្ជបញ្ជាមន្ទីរពេទ្យ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,តម្រៀបតាមតម្លៃ
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ការចំណាយសេវា
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},លេខស៊េរី: {0} ត្រូវបានយោងរួចហើយនៅក្នុងវិក័យប័ត្រលក់: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,វិក័យប័ត្រ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},លេខស៊េរី: {0} ត្រូវបានយោងរួចហើយនៅក្នុងវិក័យប័ត្រលក់: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,វិក័យប័ត្រ
 DocType: Maintenance Schedule Item,Periodicity,រយៈពេល
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ឆ្នាំសារពើពន្ធ {0} ត្រូវបានទាមទារ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ការពារជាតិ
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,ជួរដេក # {0}:
 DocType: Timesheet,Total Costing Amount,ចំនួនទឹកប្រាក់ផ្សារសរុប
 DocType: Delivery Note,Vehicle No,គ្មានយានយន្ត
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,សូមជ្រើសតារាងតម្លៃ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,សូមជ្រើសតារាងតម្លៃ
 DocType: Accounts Settings,Currency Exchange Settings,ការកំណត់ប្តូររូបិយប័ណ្ណ
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,ជួរដេក # {0}: ឯកសារការទូទាត់ត្រូវបានទាមទារដើម្បីបញ្ចប់ trasaction នេះ
 DocType: Production Order Operation,Work In Progress,ការងារក្នុងវឌ្ឍនភាព
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,សូមជ្រើសរើសកាលបរិច្ឆេទ
 DocType: Employee,Holiday List,បញ្ជីថ្ងៃឈប់សម្រាក
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,សូមបង្កើតប្រព័ន្ធដាក់ឈ្មោះគ្រូក្នុងសាលារៀន&gt; ការកំណត់សាលារៀន
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,គណនេយ្យករ
+DocType: Hub Settings,Selling Price List,លក់បញ្ជីតំលៃ
 DocType: Patient,Tobacco Current Use,ការប្រើប្រាស់ថ្នាំជក់បច្ចុប្បន្ន
 DocType: Cost Center,Stock User,អ្នកប្រើប្រាស់ភាគហ៊ុន
 DocType: Company,Phone No,គ្មានទូរស័ព្ទ
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,កាលវិភាគការពិតណាស់ដែលបានបង្កើត:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},ថ្មី {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},ថ្មី {0}: # {1}
 ,Sales Partners Commission,គណៈកម្មាធិការលក់ដៃគូ
 DocType: Purchase Invoice,Rounding Adjustment,ការលៃតម្រូវការបង្គ្រប់
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,អក្សរកាត់មិនអាចមានច្រើនជាង 5 តួអក្សរ
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,ពត៌មានលំអិតរបស់ឪពុកម្តាយ docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","ឯកសារយោង: {0}, លេខកូដធាតុ: {1} និងអតិថិជន: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,គីឡូក្រាម
-DocType: Student Log,Log,កំណត់ហេតុ
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,បើកសម្រាប់ការងារ។
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} លទ្ធផលដែលបានបញ្ជូន
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} លទ្ធផលដែលបានបញ្ជូន
 DocType: Item Attribute,Increment,ចំនួនបន្ថែម
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,ពេលវេលា
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,ជ្រើសឃ្លាំង ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,រៀបការជាមួយ
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},មិនត្រូវបានអនុញ្ញាតសម្រាប់ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,ទទួលបានធាតុពី
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},ភាគហ៊ុនដែលមិនអាចធ្វើបច្ចុប្បន្នភាពការប្រឆាំងនឹងការដឹកជញ្ជូនចំណាំ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},ភាគហ៊ុនដែលមិនអាចធ្វើបច្ចុប្បន្នភាពការប្រឆាំងនឹងការដឹកជញ្ជូនចំណាំ {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ផលិតផល {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,គ្មានធាតុដែលបានរាយ
 DocType: Payment Reconciliation,Reconcile,សម្របសម្រួល
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,មូលនិធិសោធននិវត្តន៍
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,រំលស់បន្ទាប់កាលបរិច្ឆេទមិនអាចមុនពេលទិញកាលបរិច្ឆេទ
 DocType: Consultation,Consultation Date,កាលបរិច្ឆេទពិគ្រោះ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ការចុះបញ្ជីនិងការរកឃើញផលិតផលសម្រាប់អ្នកប្រើ ERPNext
 DocType: SMS Center,All Sales Person,ការលក់របស់បុគ្គលទាំងអស់
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ** ចែកចាយប្រចាំខែអាចជួយឱ្យអ្នកចែកថវិកា / គោលដៅនៅទូទាំងខែប្រសិនបើអ្នកមានរដូវកាលនៅក្នុងអាជីវកម្មរបស់អ្នក។
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,មិនមានធាតុដែលបានរកឃើញ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,បាត់ប្រាក់ខែរចនាសម្ព័ន្ធ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,មិនមានធាតុដែលបានរកឃើញ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,បាត់ប្រាក់ខែរចនាសម្ព័ន្ធ
 DocType: Lead,Person Name,ឈ្មោះបុគ្គល
 DocType: Sales Invoice Item,Sales Invoice Item,ការលក់វិក័យប័ត្រធាតុ
 DocType: Account,Credit,ឥណទាន
 DocType: POS Profile,Write Off Cost Center,បិទការសរសេរមជ្ឈមណ្ឌលថ្លៃដើម
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",ឧទាហរណ៍ &quot;សាលាបឋមសិក្សា&quot; ឬ &quot;សាកលវិទ្យាល័យ&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",ឧទាហរណ៍ &quot;សាលាបឋមសិក្សា&quot; ឬ &quot;សាកលវិទ្យាល័យ&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,របាយការណ៍ភាគហ៊ុន
 DocType: Warehouse,Warehouse Detail,ពត៌មានលំអិតឃ្លាំង
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},ដែនកំណត់ឥណទានត្រូវបានឆ្លងកាត់សម្រាប់អតិថិជន {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,កាលបរិច្ឆេទបញ្ចប់រយៈពេលមិនអាចមាននៅពេលក្រោយជាងឆ្នាំបញ្ចប់កាលបរិច្ឆេទនៃឆ្នាំសិក្សាដែលរយៈពេលនេះត្រូវបានតភ្ជាប់ (អប់រំឆ្នាំ {}) ។ សូមកែកាលបរិច្ឆេទនិងព្យាយាមម្ដងទៀត។
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",«តើអចលន &quot;មិនអាចត្រូវបានធីកមានទ្រព្យសម្បត្តិដែលជាកំណត់ត្រាប្រឆាំងនឹងធាតុ
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",«តើអចលន &quot;មិនអាចត្រូវបានធីកមានទ្រព្យសម្បត្តិដែលជាកំណត់ត្រាប្រឆាំងនឹងធាតុ
 DocType: Vehicle Service,Brake Oil,ប្រេងហ្វ្រាំង
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,អតិថិជន&gt; ក្រុមអតិថិជន&gt; ដែនដី
 DocType: Tax Rule,Tax Type,ប្រភេទពន្ធលើ
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,ចំនួនទឹកប្រាក់ដែលត្រូវជាប់ពន្ធ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យបន្ថែមឬធ្វើឱ្យទាន់សម័យធាតុមុន {0}
 DocType: BOM,Item Image (if not slideshow),រូបភាពធាតុ (ប្រសិនបើមិនមានការបញ្ចាំងស្លាយ)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,អតិថិជនមួយដែលមានឈ្មោះដូចគ្នា
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ហួរអត្រា / 60) * ជាក់ស្តែងប្រតិបត្តិការម៉ោង
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,ជួរដេក # {0}: ឯកសារយោងត្រូវតែជាផ្នែកមួយនៃពាក្យបណ្តឹងទាមទារឬធាតុចូល
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,ជ្រើស Bom
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,ជួរដេក # {0}: ឯកសារយោងត្រូវតែជាផ្នែកមួយនៃពាក្យបណ្តឹងទាមទារឬធាតុចូល
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,ជ្រើស Bom
 DocType: SMS Log,SMS Log,ផ្ញើសារជាអក្សរចូល
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,តម្លៃនៃធាតុដែលបានផ្តល់
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,ថ្ងៃឈប់សម្រាកនៅលើ {0} គឺមិនមានរវាងពីកាលបរិច្ឆេទនិងដើម្បីកាលបរិច្ឆេទ
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,ឥណទានបុគ្គលិក
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,កំណត់ហេតុសកម្មភាព:
 DocType: Fee Schedule,Send Payment Request Email,ផ្ញើសំណើការទូទាត់តាមអ៊ីម៉ែល
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,ធាតុ {0} មិនមាននៅក្នុងប្រព័ន្ធឬបានផុតកំណត់
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,ធាតុ {0} មិនមាននៅក្នុងប្រព័ន្ធឬបានផុតកំណត់
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,អចលនទ្រព្យ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,សេចក្តីថ្លែងការណ៍របស់គណនី
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ឱសថ
@@ -206,21 +209,26 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,ប្រភេទក្រុមហ៊ុនផ្គត់ផ្គង់ / ផ្គត់ផ្គង់
 DocType: Naming Series,Prefix,បុព្វបទ
 apps/erpnext/erpnext/hr/email_alert/training_scheduled/training_scheduled.html +7,Event Location,ទីតាំងព្រឹត្តិការណ៍
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Consumable,អ្នកប្រើប្រាស់
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Consumable,ប្រើប្រាស់
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,នាំចូលចូល
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,ទាញស្នើសុំសម្ភារៈនៃប្រភេទដែលបានផលិតដោយផ្អែកលើលក្ខណៈវិនិច្ឆ័យខាងលើនេះ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,មិនបានចុះបញ្ជីដោយជោគជ័យ។
 DocType: Training Result Employee,Grade,ថ្នាក់ទី
+DocType: Restaurant Table,No of Seats,ចំនួនកៅអី
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>",ដើម្បីបន្ថែមប្រធានបទថាមវន្តសូមប្រើស្លាក jinja ដូចជា <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>
 DocType: Sales Invoice Item,Delivered By Supplier,បានបញ្ជូនដោយអ្នកផ្គត់ផ្គង់
 DocType: SMS Center,All Contact,ទំនាក់ទំនងទាំងអស់
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,លំដាប់ផលិតកម្មបានបង្កើតរួចសម្រាប់ធាតុទាំងអស់ដែលមាន Bom
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,លំដាប់ផលិតកម្មបានបង្កើតរួចសម្រាប់ធាតុទាំងអស់ដែលមាន Bom
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,ប្រាក់បៀវត្សប្រចាំឆ្នាំប្រាក់
 DocType: Daily Work Summary,Daily Work Summary,សង្ខេបការងារប្រចាំថ្ងៃ
 DocType: Period Closing Voucher,Closing Fiscal Year,បិទឆ្នាំសារពើពន្ធ
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} ជាកក
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,សូមជ្រើសក្រុមហ៊ុនដែលមានស្រាប់សម្រាប់ការបង្កើតគណនីគំនូសតាង
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} ជាកក
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,សូមជ្រើសក្រុមហ៊ុនដែលមានស្រាប់សម្រាប់ការបង្កើតគណនីគំនូសតាង
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,ការចំណាយភាគហ៊ុន
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ជ្រើសគោលដៅឃ្លាំង
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,ជ្រើសគោលដៅឃ្លាំង
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,សូមបញ្ចូលអ៊ីម៉ែលទំនាក់ទំនងដែលពេញចិត្ត
 DocType: Program Enrollment,School Bus,ឡានសាលា
 DocType: Journal Entry,Contra Entry,ចូល contra
@@ -237,9 +245,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",ទាញយកទំព័រគំរូបំពេញទិន្នន័យត្រឹមត្រូវហើយភ្ជាប់ឯកសារដែលបានកែប្រែ។ កាលបរិច្ឆេទនិងបុគ្គលិកទាំងអស់រួមបញ្ចូលគ្នានៅក្នុងរយៈពេលដែលបានជ្រើសនឹងមកនៅក្នុងពុម្ពដែលមានស្រាប់ជាមួយនឹងកំណត់ត្រាវត្តមាន
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,ធាតុ {0} គឺមិនសកម្មឬទីបញ្ចប់នៃជីវិតត្រូវបានឈានដល់
+DocType: Student Admission Program,Minimum Age,អាយុអប្បបរមា
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,ឧទាហរណ៍: គណិតវិទ្យាមូលដ្ឋាន
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",ដើម្បីរួមបញ្ចូលពន្ធក្នុងជួរ {0} នៅក្នុងអត្រាធាតុពន្ធក្នុងជួរដេក {1} ត្រូវតែត្រូវបានរួមបញ្ចូល
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,ការកំណត់សម្រាប់ម៉ូឌុលធនធានមនុស្ស
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,ការកំណត់សម្រាប់ម៉ូឌុលធនធានមនុស្ស
 DocType: SMS Center,SMS Center,ផ្ញើសារជាអក្សរមជ្ឈមណ្ឌល
 DocType: Sales Invoice,Change Amount,ការផ្លាស់ប្តូរចំនួនទឹកប្រាក់
 DocType: BOM Update Tool,New BOM,Bom ដែលថ្មី
@@ -249,11 +258,11 @@
 DocType: Lead,Request Type,ប្រភេទនៃសំណើសុំ
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,ធ្វើឱ្យបុគ្គលិក
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ការផ្សព្វផ្សាយ
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,បន្ថែមបន្ទប់
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),របៀបតំឡើង POS (Online / Offline)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,ការប្រតិបត្តិ
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ពត៌មានលំអិតនៃការប្រតិបត្ដិការនេះបានអនុវត្ត។
 DocType: Serial No,Maintenance Status,ស្ថានភាពថែទាំ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: ផ្គត់ផ្គង់គឺត្រូវបានទាមទារប្រឆាំងនឹងគណនីទូទាត់ {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: អ្នកផ្គត់ផ្គង់គឺត្រូវបានទាមទារប្រឆាំងនឹងគណនីទូទាត់ {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,ធាតុនិងតម្លៃ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},ម៉ោងសរុប: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},ពីកាលបរិច្ឆេទគួរជានៅក្នុងឆ្នាំសារពើពន្ធ។ សន្មត់ថាពីកាលបរិច្ឆេទ = {0}
@@ -272,6 +281,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,បញ្ជីតម្លៃត្រូវតែមានការអនុវត្តសម្រាប់ទិញឬលក់
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},កាលបរិច្ឆេទដំឡើងមិនអាចជាមុនកាលបរិច្ឆេទចែកចាយសម្រាប់ធាតុ {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),ការបញ្ចុះតំលៃលើតំលៃអត្រាបញ្ជី (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,ជីវគីមី
 DocType: Offer Letter,Select Terms and Conditions,ជ្រើសលក្ខខណ្ឌ
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,តម្លៃចេញ
 DocType: Production Planning Tool,Sales Orders,ការបញ្ជាទិញការលក់
@@ -306,15 +316,15 @@
 DocType: Sales Partner,Reseller,លក់បន្ត
 DocType: Codification Table,Medical Code,លេខកូដពេទ្យ
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.",ប្រសិនបើបានធីកវានឹងរួមបញ្ចូលទាំងរបស់របរដែលមិនមែនជាភាគហ៊ុននៅក្នុងសំណើសម្ភារៈ។
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,សូមបញ្ចូលក្រុមហ៊ុន
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,សូមបញ្ចូលក្រុមហ៊ុន
 DocType: Delivery Note Item,Against Sales Invoice Item,ប្រឆាំងនឹងធាតុវិក័យប័ត្រលក់
 ,Production Orders in Progress,ការបញ្ជាទិញផលិតកម្មក្នុងវឌ្ឍនភាព
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,សាច់ប្រាក់សុទ្ធពីការផ្តល់ហិរញ្ញប្បទាន
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","ផ្ទុកទិន្នន័យមូលដ្ឋានជាការពេញលេញ, មិនបានរក្សាទុក"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","ផ្ទុកទិន្នន័យមូលដ្ឋានជាការពេញលេញ, មិនបានរក្សាទុក"
 DocType: Lead,Address & Contact,អាសយដ្ឋានទំនាក់ទំនង
 DocType: Leave Allocation,Add unused leaves from previous allocations,បន្ថែមស្លឹកដែលមិនបានប្រើពីការបែងចែកពីមុន
 DocType: Sales Partner,Partner website,គេហទំព័រជាដៃគូ
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,បន្ថែមធាតុ
+DocType: Restaurant Order Entry,Add Item,បន្ថែមធាតុ
 DocType: Lab Test,Custom Result,លទ្ធផលផ្ទាល់ខ្លួន
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,ឈ្មោះទំនាក់ទំនង
 DocType: Course Assessment Criteria,Course Assessment Criteria,លក្ខណៈវិនិច្ឆ័យការវាយតំលៃការពិតណាស់
@@ -327,7 +337,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ស្នើសុំសម្រាប់ការទិញ។
 DocType: Lab Test,Submitted Date,កាលបរិច្ឆេទដែលបានដាក់ស្នើ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,នេះមានមូលដ្ឋានលើតារាងពេលវេលាដែលបានបង្កើតការប្រឆាំងនឹងគម្រោងនេះ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,ប្រាក់ចំណេញសុទ្ធមិនអាចតិចជាង 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,ប្រាក់ចំណេញសុទ្ធមិនអាចតិចជាង 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",ដើម្បីបញ្ឈប់ការផ្ញើការជូនដំណឹងកំហុសម្តងហើយម្តងទៀតពីប្រព័ន្ធយើងបានពិនិត្យវាលដែលបានបិទនៅក្នុងការជាវប្រចាំ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,មានតែការយល់ព្រមចាកចេញជ្រើសអាចដាក់ពាក្យសុំចាកចេញនេះ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,បន្ថយកាលបរិច្ឆេទត្រូវតែធំជាងកាលបរិច្ឆេទនៃការចូលរួម
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,ស្លឹកមួយឆ្នាំ
@@ -336,9 +347,10 @@
 DocType: Email Digest,Profit & Loss,ប្រាក់ចំណេញនិងការបាត់បង់
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Litre
 DocType: Task,Total Costing Amount (via Time Sheet),សរុបការចំណាយចំនួនទឹកប្រាក់ (តាមរយៈសន្លឹកម៉ោង)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,សូមរៀបចំនិស្សិតក្រោមក្រុមនិស្សិត
 DocType: Item Website Specification,Item Website Specification,បញ្ជាក់ធាតុគេហទំព័រ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ទុកឱ្យទប់ស្កាត់
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},ធាតុ {0} បានឈានដល់ទីបញ្ចប់នៃជីវិតរបស់ខ្លួននៅលើ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},ធាតុ {0} បានឈានដល់ទីបញ្ចប់នៃជីវិតរបស់ខ្លួននៅលើ {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,ធាតុធនាគារ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,ប្រចាំឆ្នាំ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ធាតុភាគហ៊ុនការផ្សះផ្សា
@@ -347,7 +359,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,ឧបករណ៍វគ្គការបង្កើតក្រុមនិស្សិត
 DocType: Lead,Do Not Contact,កុំទំនាក់ទំនង
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,មនុស្សដែលបានបង្រៀននៅក្នុងអង្គការរបស់អ្នក
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,លេខសម្គាល់តែមួយគត់សម្រាប់ការតាមដានវិក័យប័ត្រកើតឡើងទាំងអស់។ វាត្រូវបានគេបង្កើតនៅលើការដាក់ស្នើ។
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,អភិវឌ្ឍន៍កម្មវិធី
 DocType: Item,Minimum Order Qty,អប្បរមាលំដាប់ Qty
 DocType: Pricing Rule,Supplier Type,ប្រភេទក្រុមហ៊ុនផ្គត់ផ្គង់
@@ -357,17 +368,19 @@
 DocType: Item,Publish in Hub,បោះពុម្ពផ្សាយនៅក្នុងមជ្ឈមណ្ឌល
 DocType: Student Admission,Student Admission,ការចូលរបស់សិស្ស
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,ធាតុ {0} ត្រូវបានលុបចោល
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,សម្ភារៈស្នើសុំ
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,ធាតុ {0} ត្រូវបានលុបចោល
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,សម្ភារៈស្នើសុំ
 DocType: Bank Reconciliation,Update Clearance Date,ធ្វើឱ្យទាន់សម័យបោសសំអាតកាលបរិច្ឆេទ
 DocType: Item,Purchase Details,ពត៌មានលំអិតទិញ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ធាតុ {0} មិនត្រូវបានរកឃើញនៅក្នុង &#39;វត្ថុធាតុដើមការី &quot;តារាងក្នុងការទិញលំដាប់ {1}
 DocType: Patient Relation,Relation,ការទំនាក់ទំនង
 DocType: Shipping Rule,Worldwide Shipping,ការដឹកជញ្ជូននៅទូទាំងពិភពលោក
 DocType: Patient Relation,Mother,ម្តាយ
+DocType: Restaurant Reservation,Reservation End Time,ពេលវេលាបញ្ចប់ការកក់
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,ការបញ្ជាទិញបានបញ្ជាក់អះអាងពីអតិថិជន។
 DocType: Purchase Receipt Item,Rejected Quantity,បរិមាណដែលត្រូវបានច្រានចោល
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,សំណើបង់ប្រាក់ {0} បានបង្កើត
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,សំណើបង់ប្រាក់ {0} បានបង្កើត
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,ការយល់ដឹងតិចតួច
 DocType: Notification Control,Notification Control,សេចក្តីជូនដំណឹងស្តីពីការត្រួតពិនិត្យ
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,សូមបញ្ជាក់នៅពេលដែលអ្នកបានបញ្ចប់ការបណ្តុះបណ្តាល
 DocType: Lead,Suggestions,ការផ្តល់យោបល់
@@ -387,7 +400,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,ប័ណ្ណប្រាក់ខែបុគ្គលិកដោយផ្អែកអ៊ីម៉ែលទៅកាន់អ៊ីម៉ែលពេញចិត្តលើជ្រើសក្នុងបុគ្គលិក
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,ការអនុម័តចាកចេញដំបូងក្នុងបញ្ជីនេះនឹងត្រូវបានកំណត់ជាលំនាំដើមចាកចេញការអនុម័ត
 DocType: Tax Rule,Shipping County,ការដឹកជញ្ជូនខោនធី
-apps/erpnext/erpnext/config/desktop.py +158,Learn,រៀន
+apps/erpnext/erpnext/config/desktop.py +159,Learn,រៀន
 DocType: Asset,Next Depreciation Date,រំលស់បន្ទាប់កាលបរិច្ឆេទ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,តម្លៃសកម្មភាពដោយបុគ្គលិក
 DocType: Accounts Settings,Settings for Accounts,ការកំណត់សម្រាប់គណនី
@@ -398,13 +411,13 @@
 DocType: Item,Synced With Hub,ធ្វើសមកាលកម្មជាមួយនឹងការហាប់
 DocType: Vehicle,Fleet Manager,កម្មវិធីគ្រប់គ្រងកងនាវា
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},ជួរដេក # {0}: {1} មិនអាចមានផលអវិជ្ជមានសម្រាប់ធាតុ {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,ពាក្យសម្ងាត់មិនត្រឹមត្រូវ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,ពាក្យសម្ងាត់មិនត្រឹមត្រូវ
 DocType: Item,Variant Of,វ៉ារ្យ៉ង់របស់
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Qty បានបញ្ចប់មិនអាចជាធំជាង Qty ដើម្បីផលិត &quot;
 DocType: Period Closing Voucher,Closing Account Head,បិទនាយកគណនី
 DocType: Employee,External Work History,ការងារខាងក្រៅប្រវត្តិ
 DocType: Physician,Time per Appointment,ពេលវេលាក្នុងការណាត់ជួប
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,កំហុសក្នុងការយោងសារាចរ
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,កំហុសក្នុងការយោងសារាចរ
 DocType: Appointment Type,Is Inpatient,តើអ្នកជំងឺចិត្តអត់ធ្មត់
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,ឈ្មោះ Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,នៅក្នុងពាក្យ (នាំចេញ) នឹងមើលឃើញនៅពេលដែលអ្នករក្សាទុកចំណាំដឹកជញ្ជូនផងដែរ។
@@ -413,19 +426,18 @@
 DocType: Lead,Industry,វិស័យឧស្សាហកម្ម
 DocType: Employee,Job Profile,ទម្រង់ការងារ
 DocType: BOM Item,Rate & Amount,អត្រា &amp; បរិមាណ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំស៊េរីលេខរៀងសម្រាប់ការចូលរួមតាមរយៈ Setup&gt; Serial Number
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,នេះគឺផ្អែកទៅលើប្រតិបត្តិការប្រឆាំងនឹងក្រុមហ៊ុននេះ។ សូមមើលតារាងពេលវេលាខាងក្រោមសម្រាប់ព័ត៌មានលំអិត
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ជូនដំណឹងដោយអ៊ីមែលនៅលើការបង្កើតសម្ភារៈស្នើសុំដោយស្វ័យប្រវត្តិ
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,មានភាពធន់ទ្រាំ
 DocType: Journal Entry,Multi Currency,រូបិយប័ណ្ណពហុ
 DocType: Payment Reconciliation Invoice,Invoice Type,ប្រភេទវិក័យប័ត្រ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,អតិថិជន&gt; ក្រុមអតិថិជន&gt; ដែនដី
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,ដឹកជញ្ជូនចំណាំ
 DocType: Consultation,Encounter Impression,ទទួលបានចំណាប់អារម្មណ៍
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,ការរៀបចំពន្ធ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,តម្លៃនៃការលក់អចលនទ្រព្យ
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,ចូលការទូទាត់ត្រូវបានកែប្រែបន្ទាប់ពីអ្នកបានទាញវា។ សូមទាញវាម្តងទៀត។
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} បានចូលពីរដងនៅក្នុងការប្រមូលពន្ធលើធាតុ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,សង្ខេបសម្រាប់សប្តាហ៍នេះនិងសកម្មភាពដែលមិនទាន់សម្រេច
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} បានចូលពីរដងនៅក្នុងការប្រមូលពន្ធលើធាតុ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,សង្ខេបសម្រាប់សប្តាហ៍នេះនិងសកម្មភាពដែលមិនទាន់សម្រេច
 DocType: Student Applicant,Admitted,បានទទួលស្គាល់ថា
 DocType: Workstation,Rent Cost,ការចំណាយជួល
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,ចំនួនទឹកប្រាក់បន្ទាប់ពីការរំលស់
@@ -439,36 +451,35 @@
 DocType: Shipping Rule,Valid for Countries,សុពលភាពសម្រាប់បណ្តាប្រទេស
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ធាតុនេះគឺជាគំរូមួយនិងមិនអាចត្រូវបានប្រើនៅក្នុងការតិបត្តិការ។ គុណលក្ខណៈធាតុនឹងត្រូវបានចម្លងចូលទៅក្នុងវ៉ារ្យ៉ង់នោះទេលុះត្រាតែ &#39;គ្មាន&#39; ចម្លង &#39;ត្រូវបានកំណត់
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ចំនួនសរុបត្រូវបានចាត់ទុកថាសណ្តាប់ធ្នាប់
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",រចនាបុគ្គលិក (ឧនាយកប្រតិបត្តិនាយកជាដើម) ។
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).",រចនាបុគ្គលិក (ឧនាយកប្រតិបត្តិនាយកជាដើម) ។
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,អត្រាដែលរូបិយវត្ថុរបស់អតិថិជនត្រូវបានបម្លែងទៅជារូបិយប័ណ្ណមូលដ្ឋានរបស់អតិថិជន
 DocType: Course Scheduling Tool,Course Scheduling Tool,ឧបករណ៍កាលវិភាគវគ្គសិក្សាបាន
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ជួរដេក # {0}: ការទិញវិក័យប័ត្រដែលមិនអាចត្រូវបានធ្វើឡើងប្រឆាំងនឹងទ្រព្យសម្បត្តិដែលមានស្រាប់ {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[បន្ទាន់] កំហុសខណៈពេលបង្កើតការកើតឡើងដដែលៗ% s សម្រាប់% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[បន្ទាន់] កំហុសខណៈពេលបង្កើតការកើតឡើងដដែលៗ% s សម្រាប់% s
 DocType: Item Tax,Tax Rate,អត្រាអាករ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} បម្រុងទុកសម្រាប់បុគ្គលិក {1} សម្រាប់រយៈពេល {2} ទៅ {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,ជ្រើសធាតុ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,ជ្រើសធាតុ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,ទិញ {0} វិក័យប័ត្រត្រូវបានដាក់ស្នើរួចទៅហើយ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},ជួរដេក # {0}: បាច់មិនមានត្រូវតែមានដូចគ្នា {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,បម្លែងទៅនឹងការមិនគ្រុប
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,បាច់ (ច្រើន) នៃវត្ថុមួយ។
 DocType: C-Form Invoice Detail,Invoice Date,វិក័យប័ត្រកាលបរិច្ឆេទ
 DocType: GL Entry,Debit Amount,ចំនួនឥណពន្ធ
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},មានតែអាចមានគណនីមួយក្រុមហ៊ុន 1 ក្នុង {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,សូមមើលឯកសារភ្ជាប់
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},មានតែអាចមានគណនីមួយក្រុមហ៊ុន 1 ក្នុង {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,សូមមើលឯកសារភ្ជាប់
 DocType: Purchase Order,% Received,% បានទទួល
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,បង្កើតក្រុមនិស្សិត
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,ការដំឡើងពេញលេញរួចទៅហើយ !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,ការដំឡើងពេញលេញរួចទៅហើយ !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,ចំនួនឥណទានចំណាំ
 DocType: Setup Progress Action,Action Document,ឯកសារសកម្មភាព
 ,Finished Goods,ទំនិញបានបញ្ចប់
 DocType: Delivery Note,Instructions,សេចក្តីណែនាំ
 DocType: Quality Inspection,Inspected By,បានត្រួតពិនិត្យដោយ
 DocType: Maintenance Visit,Maintenance Type,ប្រភេទថែទាំ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} មិនត្រូវបានចុះឈ្មោះក្នុងវគ្គសិក្សានេះ {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,លេខកូដធាតុ&gt; ក្រុមធាតុ&gt; ម៉ាក
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} មិនត្រូវបានចុះឈ្មោះក្នុងវគ្គសិក្សានេះ {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},សៀរៀល {0} គ្មានមិនមែនជាកម្មសិទ្ធិរបស់ដឹកជញ្ជូនចំណាំ {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext សាកល្បង
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,បន្ថែមធាតុ
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,បន្ថែមធាតុ
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,ធាតុគុណភាពអធិការកិច្ចប៉ារ៉ាម៉ែត្រ
 DocType: Leave Application,Leave Approver Name,ទុកឱ្យឈ្មោះការអនុម័ត
 DocType: Depreciation Schedule,Schedule Date,កាលបរិច្ឆេទកាលវិភាគ
@@ -488,13 +499,13 @@
 DocType: Salary Slip Timesheet,Working Hours,ម៉ោងធ្វើការ
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ផ្លាស់ប្តូរការចាប់ផ្តើមលេខលំដាប់ / នាពេលបច្ចុប្បន្ននៃស៊េរីដែលមានស្រាប់។
 DocType: Dosage Strength,Strength,កម្លាំង
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,បង្កើតអតិថិជនថ្មី
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,បង្កើតអតិថិជនថ្មី
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","បើសិនជាវិធានការបន្តតម្លៃជាច្រើនដែលមានជ័យជំនះ, អ្នកប្រើត្រូវបានសួរដើម្បីកំណត់អាទិភាពដោយដៃដើម្បីដោះស្រាយជម្លោះ។"
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,បង្កើតបញ្ជាទិញ
 ,Purchase Register,ទិញចុះឈ្មោះ
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,ការចោទប្រកាន់ដែលអាចអនុវត្តបាន
-DocType: Workstation,Consumable Cost,ការចំណាយរបស់អតិថិជនបាន
+DocType: Workstation,Consumable Cost,ចំណាយក្នុងការប្រើប្រាស់
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ត្រូវតែមានតួនាទី &quot;ចាកចេញអនុម័ត&quot;
 DocType: Purchase Receipt,Vehicle Date,កាលបរិច្ឆេទយានយន្ត
 DocType: Student Log,Medical,ពេទ្យ
@@ -507,7 +518,7 @@
 DocType: Lab Test Template,Single,នៅលីវ
 DocType: Salary Slip,Total Loan Repayment,សងប្រាក់កម្ចីសរុប
 DocType: Account,Cost of Goods Sold,តម្លៃនៃការលក់ទំនិញ
-DocType: Purchase Invoice,Yearly,រាល់ឆ្នាំ
+DocType: Subscription,Yearly,រាល់ឆ្នាំ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,សូមបញ្ចូលមជ្ឈមណ្ឌលការចំណាយ
 DocType: Drug Prescription,Dosage,កិតើ
 DocType: Journal Entry Account,Sales Order,សណ្តាប់ធ្នាប់ការលក់
@@ -515,7 +526,7 @@
 DocType: Assessment Plan,Examiner Name,ពិនិត្យឈ្មោះ
 DocType: Lab Test Template,No Result,គ្មានលទ្ធផល
 DocType: Purchase Invoice Item,Quantity and Rate,បរិមាណនិងអត្រាការប្រាក់
-DocType: Delivery Note,% Installed,% ដែលបានដំឡើង
+DocType: Delivery Note,% Installed,% បានដំឡើង
 apps/erpnext/erpnext/utilities/user_progress.py +209,Classrooms/ Laboratories etc where lectures can be scheduled.,ថ្នាក់រៀន / មន្ទីរពិសោធន៍លដែលជាកន្លែងដែលបង្រៀនអាចត្រូវបានកំណត់។
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,សូមបញ្ចូលឈ្មោះរបស់ក្រុមហ៊ុនដំបូង
 DocType: Purchase Invoice,Supplier Name,ឈ្មោះក្រុមហ៊ុនផ្គត់ផ្គង់
@@ -537,7 +548,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,ការកំណត់សកលសម្រាប់ដំណើរការផលិតទាំងអស់។
 DocType: Accounts Settings,Accounts Frozen Upto,រីករាយជាមួយនឹងទឹកកកគណនី
 DocType: SMS Log,Sent On,ដែលបានផ្ញើនៅថ្ងៃ
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,គុណលក្ខណៈ {0} បានជ្រើសរើសច្រើនដងក្នុងតារាងគុណលក្ខណៈ
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,គុណលក្ខណៈ {0} បានជ្រើសរើសច្រើនដងក្នុងតារាងគុណលក្ខណៈ
 DocType: HR Settings,Employee record is created using selected field. ,កំណត់ត្រាបុគ្គលិកត្រូវបានបង្កើតដោយប្រើវាលដែលបានជ្រើស។
 DocType: Sales Order,Not Applicable,ដែលមិនអាចអនុវត្តបាន
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,ចៅហ្វាយថ្ងៃឈប់សម្រាក។
@@ -562,13 +573,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ចំនួនសរុបដែលបានបម្រុងទុកគឺស្លឹកដែលចាំបាច់
 DocType: Patient,AB Positive,AB មានលក្ខណៈវិជ្ជមាន
 DocType: Job Opening,Description of a Job Opening,ការពិពណ៌នាសង្ខេបនៃការបើកការងារ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,សកម្មភាពដែលមិនទាន់សម្រេចសម្រាប់ថ្ងៃនេះ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,សកម្មភាពដែលមិនទាន់សម្រេចសម្រាប់ថ្ងៃនេះ
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,កំណត់ត្រាចូលរួម។
 DocType: Salary Structure,Salary Component for timesheet based payroll.,សមាសភាគបញ្ជីបើកប្រាក់ខែដែលមានមូលដ្ឋានលើប្រាក់បៀវត្សសម្រាប់ timesheet ។
 DocType: Sales Order Item,Used for Production Plan,ត្រូវបានប្រើសម្រាប់ផែនការផលិតកម្ម
 DocType: Employee Loan,Total Payment,ការទូទាត់សរុប
 DocType: Manufacturing Settings,Time Between Operations (in mins),ពេលវេលារវាងការប្រតិបត្តិការ (នៅក្នុងនាទី)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} ត្រូវបានលុបចោលដូច្នេះសកម្មភាពនេះមិនអាចត្រូវបានបញ្ចប់
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} ត្រូវបានលុបចោលដូច្នេះសកម្មភាពនេះមិនអាចត្រូវបានបញ្ចប់
 DocType: Customer,Buyer of Goods and Services.,អ្នកទិញទំនិញនិងសេវាកម្ម។
 DocType: Journal Entry,Accounts Payable,គណនីទូទាត់
 DocType: Patient,Allergies,អាឡែស៊ី
@@ -580,22 +591,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,ព្រមានការបញ្ជាទិញ
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,រាយមួយចំនួននៃអតិថិជនរបស់អ្នក។ ពួកគេអាចត្រូវបានអង្គការឬបុគ្គល។
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,ផ្នែកគ្រប់គ្រាន់ដើម្បីកសាង
+DocType: POS Profile User,POS Profile User,អ្នកប្រើប្រាស់បណ្តាញ POS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,ប្រាក់ចំណូលដោយផ្ទាល់
 DocType: Patient Appointment,Date TIme,ពេលណាត់ជួប
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","មិនអាចត្រងដោយផ្អែកលើគណនី, ប្រសិនបើការដាក់ជាក្រុមតាមគណនី"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,មន្រ្តីរដ្ឋបាល
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,សូមជ្រើសវគ្គសិក្សា
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,សូមជ្រើសវគ្គសិក្សា
 DocType: Codification Table,Codification Table,តារាងកំណត់កូដកម្ម
 DocType: Timesheet Detail,Hrs,ម៉ោង
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,សូមជ្រើសរើសក្រុមហ៊ុន
 DocType: Stock Entry Detail,Difference Account,គណនីមានភាពខុសគ្នា
 DocType: Purchase Invoice,Supplier GSTIN,GSTIN ក្រុមហ៊ុនផ្គត់ផ្គង់
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,មិនអាចភារកិច្ចជិតស្និទ្ធដូចជាការពឹងផ្អែករបស់ខ្លួនមានភារកិច្ច {0} គឺមិនត្រូវបានបិទ។
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,សូមបញ្ចូលឃ្លាំងដែលសម្ភារៈស្នើសុំនឹងត្រូវបានលើកឡើង
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,មិនអាចភារកិច្ចជិតស្និទ្ធដូចជាការពឹងផ្អែករបស់ខ្លួនមានភារកិច្ច {0} គឺមិនត្រូវបានបិទ។
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,សូមបញ្ចូលឃ្លាំងដែលសម្ភារៈស្នើសុំនឹងត្រូវបានលើកឡើង
 DocType: Production Order,Additional Operating Cost,ចំណាយប្រតិបត្តិការបន្ថែម
 DocType: Lab Test Template,Lab Routine,មន្ទីរពិសោធន៍ជាទម្លាប់
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,គ្រឿងសំអាង
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items",រួមបញ្ចូលគ្នានោះមានលក្ខណៈសម្បត្តិដូចខាងក្រោមនេះត្រូវដូចគ្នាសម្រាប់ធាតុទាំងពីរ
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items",រួមបញ្ចូលគ្នានោះមានលក្ខណៈសម្បត្តិដូចខាងក្រោមនេះត្រូវដូចគ្នាសម្រាប់ធាតុទាំងពីរ
 DocType: Shipping Rule,Net Weight,ទំងន់សុទ្ធ
 DocType: Employee,Emergency Phone,ទូរស័ព្ទសង្រ្គោះបន្ទាន់
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,ទិញ
@@ -605,7 +617,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,សូមកំណត់ថ្នាក់ទីសម្រាប់កម្រិតពន្លឺ 0%
 DocType: Sales Order,To Deliver,ដើម្បីរំដោះ
 DocType: Purchase Invoice Item,Item,ធាតុ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,សៀរៀលធាតុគ្មានមិនអាចត្រូវប្រភាគ
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,ភាពប្រែប្រួលខ្ពស់
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,សៀរៀលធាតុគ្មានមិនអាចត្រូវប្រភាគ
 DocType: Journal Entry,Difference (Dr - Cr),ភាពខុសគ្នា (លោកវេជ្ជបណ្ឌិត - Cr)
 DocType: Account,Profit and Loss,ប្រាក់ចំណេញនិងការបាត់បង់
 DocType: Patient,Risk Factors,កត្តាហានិភ័យ
@@ -614,7 +627,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,ការគ្រប់គ្រងអ្នកម៉ៅការបន្ត
 DocType: Vital Signs,Body Temperature,សីតុណ្ហភាពរាងកាយ
 DocType: Project,Project will be accessible on the website to these users,គម្រោងនឹងត្រូវបានចូលដំណើរការបាននៅលើគេហទំព័រទាំងនេះដល់អ្នកប្រើ
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,កំណត់ប្រភេទគម្រោង។
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,កំណត់ប្រភេទគម្រោង។
 DocType: Supplier Scorecard,Weighting Function,មុខងារថ្លឹង
 DocType: Physician,OP Consulting Charge,ភ្នាក់ងារទទួលខុសត្រូវ OP
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,ដំឡើងកម្មវិធីរបស់អ្នក
@@ -628,7 +641,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,ចំនួនបន្ថែមមិនអាចត្រូវបាន 0
 DocType: Production Planning Tool,Material Requirement,សម្ភារៈតម្រូវ
 DocType: Company,Delete Company Transactions,លុបប្រតិបត្តិការក្រុមហ៊ុន
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,សេចក្តីយោងកាលបរិច្ឆេទទេនិងយោងចាំបាច់សម្រាប់ប្រតិបត្តិការគឺធនាគារ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,សេចក្តីយោងកាលបរិច្ឆេទទេនិងយោងចាំបាច់សម្រាប់ប្រតិបត្តិការគឺធនាគារ
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,បន្ថែម / កែសម្រួលពន្ធនិងការចោទប្រកាន់
 DocType: Payment Entry Reference,Supplier Invoice No,វិក័យប័ត្រគ្មានការផ្គត់ផ្គង់
 DocType: Territory,For reference,សម្រាប់ជាឯកសារយោង
@@ -636,12 +649,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","មិនអាចលុបសៀរៀលគ្មាន {0}, ដូចដែលវាត្រូវបានគេប្រើនៅក្នុងប្រតិបត្តិការភាគហ៊ុន"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),បិទ (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,ជំរាបសួរ
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,ផ្លាស់ទីធាតុ
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,ផ្លាស់ទីធាតុ
 DocType: Serial No,Warranty Period (Days),រយៈពេលធានា (ថ្ងៃ)
 DocType: Installation Note Item,Installation Note Item,ធាតុចំណាំការដំឡើង
 DocType: Production Plan Item,Pending Qty,ដំណើ Qty
 DocType: Budget,Ignore,មិនអើពើ
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} គឺមិនសកម្ម
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} គឺមិនសកម្ម
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,វិមាត្ររៀបចំការពិនិត្យសម្រាប់ការបោះពុម្ព
 DocType: Salary Slip,Salary Slip Timesheet,Timesheet ប្រាក់បៀវត្សរ៍ប័ណ្ណ
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ឃ្លាំងក្រុមហ៊ុនផ្គត់ផ្គង់ចាំបាច់សម្រាប់ការទទួលទិញកិច្ចសន្យា
@@ -650,7 +663,7 @@
 DocType: Pricing Rule,Sales Partner,ដៃគូការលក់
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,កាតពិន្ទុទាំងអស់របស់អ្នកផ្គត់ផ្គង់។
 DocType: Buying Settings,Purchase Receipt Required,បង្កាន់ដៃត្រូវការទិញ
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,អត្រាការវាយតម្លៃជាការចាំបាច់ប្រសិនបើមានការបើកផ្សារហ៊ុនដែលបានបញ្ចូល
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,អត្រាការវាយតម្លៃជាការចាំបាច់ប្រសិនបើមានការបើកផ្សារហ៊ុនដែលបានបញ្ចូល
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,បានរកឃើញនៅក្នុងតារាងវិក័យប័ត្រកំណត់ត្រាគ្មាន
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,សូមជ្រើសប្រភេទក្រុមហ៊ុននិងបក្សទីមួយ
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,ហិរញ្ញវត្ថុ / ស្មើឆ្នាំ។
@@ -687,7 +700,7 @@
 DocType: Quotation,Quotation To,សម្រង់ដើម្បី
 DocType: Lead,Middle Income,ប្រាក់ចំណូលពាក់កណ្តាល
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),ពិធីបើក (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ឯកតាលំនាំដើមសម្រាប់ធាតុវិធានការ {0} មិនអាចត្រូវបានផ្លាស់ប្តូរដោយផ្ទាល់ដោយសារតែអ្នកបានធ្វើប្រតិបត្តិការមួយចំនួន (s) ដែលមាន UOM មួយទៀតរួចទៅហើយ។ អ្នកនឹងត្រូវការដើម្បីបង្កើតធាតុថ្មីមួយក្នុងការប្រើ UOM លំនាំដើមផ្សេងគ្នា។
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ឯកតាលំនាំដើមសម្រាប់ធាតុវិធានការ {0} មិនអាចត្រូវបានផ្លាស់ប្តូរដោយផ្ទាល់ដោយសារតែអ្នកបានធ្វើប្រតិបត្តិការមួយចំនួន (s) ដែលមាន UOM មួយទៀតរួចទៅហើយ។ អ្នកនឹងត្រូវការដើម្បីបង្កើតធាតុថ្មីមួយក្នុងការប្រើ UOM លំនាំដើមផ្សេងគ្នា។
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកសម្រាប់មិនអាចជាអវិជ្ជមាន
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,សូមកំណត់ក្រុមហ៊ុន
 DocType: Purchase Order Item,Billed Amt,វិក័យប័ត្រ AMT
@@ -701,6 +714,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,ជ្រើសគណនីទូទាត់ដើម្បីធ្វើឱ្យធាតុរបស់ធនាគារ
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll",បង្កើតកំណត់ត្រាបុគ្គលិកដើម្បីគ្រប់គ្រងស្លឹកពាក្យបណ្តឹងការចំណាយនិងបញ្ជីបើកប្រាក់ខែ
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,រយៈពេលវេជ្ជបញ្ជា
+DocType: Restaurant Reservation,Restaurant Reservation,កក់ភោជនីយដ្ឋាន
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,ការសរសេរសំណើរ
 DocType: Payment Entry Deduction,Payment Entry Deduction,ការដកហូតចូលការទូទាត់
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,បុគ្គលលក់មួយផ្សេងទៀត {0} មានដែលមានលេខសម្គាល់និយោជិតដូចគ្នា
@@ -708,7 +722,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,ថ្នាក់អនុបណ្ឌិត
 DocType: Assessment Plan,Maximum Assessment Score,ពិន្ទុអតិបរមាការវាយតំលៃ
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,កាលបរិច្ឆេទប្រតិបត្តិការធនាគារធ្វើឱ្យទាន់សម័យ
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,តាមដានពេលវេលា
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,តាមដានពេលវេលា
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,DUPLICATE សម្រាប់ការដឹកជញ្ជូន
 DocType: Fiscal Year Company,Fiscal Year Company,ក្រុមហ៊ុនឆ្នាំសារពើពន្ធ
 DocType: Packing Slip Item,DN Detail,ពត៌មានលំអិត DN
@@ -716,8 +730,9 @@
 DocType: Timesheet,Billed,ផ្សព្វផ្សាយ
 DocType: Batch,Batch Description,បាច់ការពិពណ៌នាសង្ខេប
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,ការបង្កើតក្រុមនិស្សិត
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.",គណនីទូទាត់មិនត្រូវបានបង្កើតទេសូមបង្កើតមួយដោយដៃ។
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.",គណនីទូទាត់មិនត្រូវបានបង្កើតទេសូមបង្កើតមួយដោយដៃ។
 DocType: Supplier Scorecard,Per Year,ក្នុងមួយឆ្នាំ
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,មិនមានសិទ្ធិចូលរៀនក្នុងកម្មវិធីនេះតាម DOB
 DocType: Sales Invoice,Sales Taxes and Charges,ពន្ធលក់និងការចោទប្រកាន់
 DocType: Employee,Organization Profile,ពត៌មានរបស់អង្គការ
 DocType: Vital Signs,Height (In Meter),កម្ពស់ (គិតជាម៉ែត្រ)
@@ -744,7 +759,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +120,Manager,កម្មវិធីគ្រប់គ្រង
 DocType: Payment Entry,Payment From / To,ការទូទាត់ពី / ទៅ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +127,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},កំណត់ឥណទានថ្មីនេះគឺមានចំនួនតិចជាងប្រាក់ដែលលេចធ្លោនាពេលបច្ចុប្បន្នសម្រាប់អតិថិជន។ ចំនួនកំណត់ឥណទានមានដើម្បីឱ្យមានយ៉ាងហោចណាស់ {0}
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&#39;ដោយផ្អែកលើ &quot;និង&quot; ក្រុមតាម&#39; មិនអាចជាដូចគ្នា
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"'ដោយផ្អែកលើ ""និង"" ក្រុមដោយ' មិនអាចដូចគ្នា"
 DocType: Sales Person,Sales Person Targets,ការលក់មនុស្សគោលដៅ
 DocType: Installation Note,IN-,ីជ
 DocType: Production Order Operation,In minutes,នៅក្នុងនាទី
@@ -753,7 +768,7 @@
 DocType: Student Batch Name,Batch Name,ឈ្មោះបាច់
 DocType: Fee Validity,Max number of visit,ចំនួនអតិបរមានៃដំណើរទស្សនកិច្ច
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet បង្កើត:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},សូមកំណត់លំនាំដើមឬគណនីសាច់ប្រាក់របស់ធនាគារក្នុងរបៀបនៃការទូទាត់ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},សូមកំណត់លំនាំដើមឬគណនីសាច់ប្រាក់របស់ធនាគារក្នុងរបៀបនៃការទូទាត់ {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,ចុះឈ្មោះ
 DocType: GST Settings,GST Settings,ការកំណត់ជីអេសធី
 DocType: Selling Settings,Customer Naming By,ឈ្មោះអតិថិជនដោយ
@@ -785,15 +800,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ពន្ធទូកចោទប្រកាន់ចំនាយ
 DocType: Production Order Operation,Actual Start Time,ជាក់ស្តែងពេលវេលាចាប់ផ្ដើម
 DocType: BOM Operation,Operation Time,ប្រតិបត្ដិការពេលវេលា
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,បញ្ចប់
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,បញ្ចប់
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,មូលដ្ឋាន
 DocType: Timesheet,Total Billed Hours,ម៉ោងធ្វើការបង់ប្រាក់សរុប
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,បិទការសរសេរចំនួនទឹកប្រាក់
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,បិទការសរសេរចំនួនទឹកប្រាក់
 DocType: Leave Block List Allow,Allow User,អនុញ្ញាតឱ្យអ្នកប្រើ
 DocType: Journal Entry,Bill No,គ្មានវិក័យប័ត្រ
 DocType: Company,Gain/Loss Account on Asset Disposal,គណនីកើនឡើង / ខាតបោះចោលទ្រព្យសកម្ម
 DocType: Vehicle Log,Service Details,សេវាលម្អិត
-DocType: Purchase Invoice,Quarterly,ប្រចាំត្រីមាស
+DocType: Subscription,Quarterly,ប្រចាំត្រីមាស
 DocType: Lab Test Template,Grouped,ដាក់ជាក្រុម
 DocType: Selling Settings,Delivery Note Required,ត្រូវការដឹកជញ្ជូនចំណាំ
 DocType: Bank Guarantee,Bank Guarantee Number,លេខធានា
@@ -802,12 +817,12 @@
 DocType: Student Attendance,Student Attendance,ការចូលរួមរបស់សិស្ស
 DocType: Sales Invoice Timesheet,Time Sheet,តារាងពេលវេលា
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush វត្ថុធាតុដើមដែលមានមូលដ្ឋាននៅលើ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,សូមបញ្ចូលសេចក្ដីលម្អិតធាតុ
 DocType: Interest,Interest,ការប្រាក់
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,ការលក់ជាមុន
 DocType: Purchase Receipt,Other Details,ពត៌មានលំអិតផ្សេងទៀត
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,គំរូសាកល្បង
+DocType: Restaurant Order Entry Item,Served,បានបម្រើ
 DocType: Account,Accounts,គណនី
 DocType: Vehicle,Odometer Value (Last),តម្លៃ odometer (ចុងក្រោយ)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,គំរូនៃលក្ខណៈវិនិច្ឆ័យពិន្ទុនៃក្រុមហ៊ុនផ្គត់ផ្គង់។
@@ -819,25 +834,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,គ្រូពេទ្យប្រហែលជាប្រាក់ខែការមើលជាមុន
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,គណនី {0} ត្រូវបានបញ្ចូលច្រើនដង
 DocType: Account,Expenses Included In Valuation,ការចំណាយដែលបានរួមបញ្ចូលនៅក្នុងការវាយតម្លៃ
-DocType: Hub Settings,Seller City,ទីក្រុងអ្នកលក់
 ,Absent Student Report,របាយការណ៍សិស្សអវត្តមាន
 DocType: Email Digest,Next email will be sent on:,អ៊ីម៉ែលបន្ទាប់នឹងត្រូវបានផ្ញើនៅលើ:
 DocType: Offer Letter Term,Offer Letter Term,ផ្តល់ជូននូវលិខិតអាណត្តិ
 DocType: Supplier Scorecard,Per Week,ក្នុងមួយសប្តាហ៍
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,ធាតុមានវ៉ារ្យ៉ង់។
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,ធាតុមានវ៉ារ្យ៉ង់។
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,សិស្សសរុប
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,ធាតុ {0} មិនបានរកឃើញ
 DocType: Bin,Stock Value,ភាគហ៊ុនតម្លៃ
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,កំណត់ត្រាថ្លៃសេវានឹងត្រូវបានបង្កើតនៅផ្ទៃខាងក្រោយ។ ក្នុងករណីមានកំហុសណាមួយសារកំហុសនឹងត្រូវបានធ្វើបច្ចុប្បន្នភាពនៅក្នុងតារាង។
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,ក្រុមហ៊ុន {0} មិនមានទេ
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} មានសុពលភាពគិតរហូតដល់ {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} មានសុពលភាពគិតរហូតដល់ {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,ប្រភេទដើមឈើ
 DocType: BOM Explosion Item,Qty Consumed Per Unit,qty ប្រើប្រាស់ក្នុងមួយឯកតា
 DocType: Serial No,Warranty Expiry Date,ការធានាកាលបរិច្ឆេទផុតកំណត់
 DocType: Material Request Item,Quantity and Warehouse,បរិមាណនិងឃ្លាំង
+DocType: Hub Settings,Unregister,មិនចុះឈ្មោះ
 DocType: Sales Invoice,Commission Rate (%),អត្រាប្រាក់កំរៃ (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,សូមជ្រើសកម្មវិធី
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,សូមជ្រើសកម្មវិធី
 DocType: Project,Estimated Cost,តំលៃ
 DocType: Purchase Order,Link to material requests,តំណភ្ជាប់ទៅនឹងសំណើសម្ភារៈ
+DocType: Hub Settings,Publish,ផ្សាយ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,អវកាស
 DocType: Journal Entry,Credit Card Entry,ចូលកាតឥណទាន
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,ក្រុមហ៊ុននិងគណនី
@@ -848,13 +865,12 @@
 DocType: Selling Settings,Close Opportunity After Days,ឱកាសការងារបន្ទាប់ពីថ្ងៃបិទ
 ,Reserved,បម្រុងទុក
 DocType: Purchase Order,Supply Raw Materials,ផ្គត់ផ្គង់សំភារៈឆៅ
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,កាលបរិច្ឆេទដែលវិក័យប័ត្រក្រោយនឹងត្រូវបានបង្កើត។ វាត្រូវបានគេបង្កើតនៅលើការដាក់ស្នើ។
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,ទ្រព្យនាពេលបច្ចុប្បន្ន
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} គឺមិនមានធាតុភាគហ៊ុន
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',សូមចែករំលែកមតិស្ថាបនារបស់អ្នកទៅហ្វឹកហាត់ដោយចុចលើ &#39;Feedback Feedback Training&#39; និង &#39;New&#39;
 DocType: Mode of Payment Account,Default Account,គណនីលំនាំដើម
 DocType: Payment Entry,Received Amount (Company Currency),ទទួលបានចំនួនទឹកប្រាក់ (ក្រុមហ៊ុនរូបិយប័ណ្ណ)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,ការនាំមុខត្រូវតែត្រូវបានកំណត់ប្រសិនបើមានឱកាសត្រូវបានធ្វើពីអ្នកដឹកនាំ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,ការនាំមុខត្រូវតែត្រូវបានកំណត់ប្រសិនបើមានឱកាសត្រូវបានធ្វើពីអ្នកដឹកនាំ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,សូមជ្រើសយកថ្ងៃឈប់សម្រាកប្រចាំសប្តាហ៍
 DocType: Patient,O Negative,អូអវិជ្ជមាន
 DocType: Production Order Operation,Planned End Time,ពេលវេលាដែលបានគ្រោងបញ្ចប់
@@ -870,10 +886,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,ថាមពល
 DocType: Opportunity,Opportunity From,ឱកាសការងារពី
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,សេចក្តីថ្លែងការប្រាក់បៀវត្សរ៍ប្រចាំខែ។
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,បន្ថែមក្រុមហ៊ុន
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ជួរដេក {0}: {1} លេខរៀងដែលទាមទារសម្រាប់ធាតុ {2} ។ អ្នកបានផ្តល់ {3} ។
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ជួរដេក {0}: {1} លេខរៀងដែលទាមទារសម្រាប់ធាតុ {2} ។ អ្នកបានផ្តល់ {3} ។
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,សូមជ្រើសរើសតារាង
 DocType: BOM,Website Specifications,ជាក់លាក់វេបសាយ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} គឺជាអាសយដ្ឋានអ៊ីមែលមិនត្រឹមត្រូវនៅក្នុង &#39;អ្នកទទួល&#39;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} គឺជាអាសយដ្ឋានអ៊ីមែលមិនត្រឹមត្រូវនៅក្នុង &#39;អ្នកទទួល&#39;
 DocType: Special Test Items,Particulars,ពិសេស
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,អង់ទីប៊ីយ៉ូទិក។
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: ពី {0} នៃប្រភេទ {1}
@@ -881,11 +897,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,ជួរដេក {0}: ការប្រែចិត្តជឿកត្តាគឺជាការចាំបាច់
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","វិធានតម្លៃច្រើនមានលក្ខណៈវិនិច្ឆ័យដូចគ្នា, សូមដោះស្រាយជម្លោះដោយផ្ដល់អាទិភាព។ វិធានតម្លៃ: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,មិនអាចធ្វើឱ្យឬបោះបង់ Bom ជាវាត្រូវបានផ្សារភ្ជាប់ជាមួយនឹង BOMs ផ្សេងទៀត
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,មិនអាចធ្វើឱ្យឬបោះបង់ Bom ជាវាត្រូវបានផ្សារភ្ជាប់ជាមួយនឹង BOMs ផ្សេងទៀត
 DocType: Opportunity,Maintenance,ការថែរក្សា
 DocType: Item Attribute Value,Item Attribute Value,តម្លៃគុណលក្ខណៈធាតុ
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,យុទ្ធនាការលក់។
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,ធ្វើឱ្យ Timesheet
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,ធ្វើឱ្យ Timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -923,12 +939,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,សូមបញ្ចូលធាតុដំបូង
 DocType: Account,Liability,ការទទួលខុសត្រូវ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ចំនួនទឹកប្រាក់បានអនុញ្ញាតមិនអាចជាចំនួនទឹកប្រាក់ធំជាងក្នុងជួរដេកណ្តឹងទាមទារសំណង {0} ។
+DocType: Salary Detail,Do not include in total,កុំរួមបញ្ចូលសរុប
 DocType: Company,Default Cost of Goods Sold Account,តម្លៃលំនាំដើមនៃគណនីទំនិញលក់
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,បញ្ជីតម្លៃដែលមិនបានជ្រើស
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,បញ្ជីតម្លៃដែលមិនបានជ្រើស
 DocType: Employee,Family Background,ប្រវត្តិក្រុមគ្រួសារ
 DocType: Request for Quotation Supplier,Send Email,ផ្ញើអ៊ីមែល
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},ព្រមាន &amp; ‧;: ឯកសារភ្ជាប់មិនត្រឹមត្រូវ {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,គ្មានសិទ្ធិ
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},ព្រមាន &amp; ‧;: ឯកសារភ្ជាប់មិនត្រឹមត្រូវ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,គ្មានសិទ្ធិ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,សំណូមពរដែលបានស្នើ
 DocType: Vital Signs,Heart Rate / Pulse,អត្រាចង្វាក់បេះដូង / បេះដូង
 DocType: Company,Default Bank Account,គណនីធនាគារលំនាំដើម
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",ដើម្បីត្រងដោយផ្អែកទៅលើគណបក្សជ្រើសគណបក្សវាយជាលើកដំបូង
@@ -955,12 +973,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ធាតុជួរដេក {idx}: {} {DOCNAME DOCTYPE} មិនមាននៅក្នុងខាងលើ &#39;{DOCTYPE}&#39; តុ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} ត្រូវបានបញ្ចប់រួចទៅហើយឬលុបចោល
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,គ្មានភារកិច្ច
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ថ្ងៃនៃខែដែលវិក័យប័ត្រដោយស្វ័យប្រវត្តិនឹងត្រូវបានបង្កើតឧ 05, 28 ល"
 DocType: Item Variant Settings,Copy Fields to Variant,ចម្លងវាលទៅវ៉ារ្យង់
 DocType: Asset,Opening Accumulated Depreciation,រំលស់បង្គរបើក
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ពិន្ទុត្រូវតែតិចជាងឬស្មើនឹង 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,ឧបករណ៍ការចុះឈ្មោះកម្មវិធី
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,កំណត់ត្រា C-សំណុំបែបបទ
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,កំណត់ត្រា C-សំណុំបែបបទ
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,ហាងទំនិញនិងអតិថិជន
 DocType: Email Digest,Email Digest Settings,ការកំណត់សង្ខេបអ៊ីម៉ែល
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,សូមអរគុណអ្នកសម្រាប់អាជីវកម្មរបស់អ្នក!
@@ -978,13 +995,13 @@
 DocType: Request for Quotation Supplier,Quote Status,ស្ថានភាពសម្រង់
 DocType: Maintenance Visit,Completion Status,ស្ថានភាពបញ្ចប់
 DocType: HR Settings,Enter retirement age in years,បញ្ចូលអាយុចូលនិវត្តន៍នៅក្នុងប៉ុន្មានឆ្នាំ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,គោលដៅឃ្លាំង
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,សូមជ្រើសឃ្លាំង
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,គោលដៅឃ្លាំង
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,សូមជ្រើសឃ្លាំង
 DocType: Cheque Print Template,Starting location from left edge,ការចាប់ផ្តើមទីតាំងពីគែមឆ្វេង
 DocType: Item,Allow over delivery or receipt upto this percent,អនុញ្ញាតឱ្យមានការចែកចាយឬទទួលបានជាងរីករាយជាមួយនឹងភាគរយ
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,នាំចូលវត្តមាន
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,ក្រុមធាតុទាំងអស់
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,ក្រុមធាតុទាំងអស់
 DocType: Process Payroll,Activity Log,សកម្មភាពកំណត់ហេតុ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,ប្រាក់ចំណេញសុទ្ធ / បាត់បង់
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,តែងសារស្វ័យប្រវត្តិនៅលើការដាក់ប្រតិបត្តិការ។
@@ -996,7 +1013,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,ការព្យាករ Qty
 DocType: Sales Invoice,Payment Due Date,ការទូទាត់កាលបរិច្ឆេទ
 DocType: Drug Prescription,Interval UOM,ចន្លោះពេលវេលា UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,ធាតុវ៉ារ្យង់ {0} រួចហើយដែលមានគុណលក្ខណៈដូចគ្នា
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,ធាតុវ៉ារ្យង់ {0} រួចហើយដែលមានគុណលក្ខណៈដូចគ្នា
+DocType: Item,Hub Publishing Details,ពត៌មានលម្អិតការបោះពុម្ព
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&quot;ការបើក&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ការបើកចំហរដើម្បីធ្វើ
 DocType: Notification Control,Delivery Note Message,សារដឹកជញ្ជូនចំណាំ
@@ -1016,10 +1034,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,មេកានិច # {0}: វត្ថុដើមមិនអាចដូចគ្នានឹងធាតុមេទេ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ការចោទប្រកាន់អនុវត្តសរុបនៅក្នុងការទិញតារាងការទទួលធាតុត្រូវដូចគ្នាដែលជាពន្ធសរុបនិងការចោទប្រកាន់
 DocType: Sales Team,Incentives,ការលើកទឹកចិត្ត
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,ចុះឈ្មោះសម្រាប់មណ្ឌល
 DocType: SMS Log,Requested Numbers,លេខដែលបានស្នើ
 DocType: Production Planning Tool,Only Obtain Raw Materials,មានតែវត្ថុធាតុដើមទទួល
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,វាយតម្លៃការអនុវត្ត។
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",បើក &#39;ប្រើសម្រាប់ការកន្រ្តកទំនិញដូចដែលត្រូវបានអនុញ្ញាតកន្រ្តកទំនិញនិងគួរតែមានច្បាប់ពន្ធយ៉ាងហោចណាស់មួយសម្រាប់ការកន្រ្តកទំនិញ
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",បើក &#39;ប្រើសម្រាប់ការកន្រ្តកទំនិញដូចដែលត្រូវបានអនុញ្ញាតកន្រ្តកទំនិញនិងគួរតែមានច្បាប់ពន្ធយ៉ាងហោចណាស់មួយសម្រាប់ការកន្រ្តកទំនិញ
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ចូលការទូទាត់ {0} ត្រូវបានផ្សារភ្ជាប់នឹងដីកាសម្រេច {1}, ពិនិត្យមើលថាតើវាគួរតែត្រូវបានដកមុននៅក្នុងវិក័យប័ត្រដែលជានេះ។"
 DocType: Sales Invoice Item,Stock Details,ភាគហ៊ុនលំអិត
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,តម្លៃគម្រោង
@@ -1038,12 +1057,14 @@
 DocType: Salary Slip,Working Days,ថ្ងៃធ្វើការ
 DocType: Serial No,Incoming Rate,អត្រាការមកដល់
 DocType: Packing Slip,Gross Weight,ទំងន់សរុបបាន
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,ឈ្មោះរបស់ក្រុមហ៊ុនរបស់អ្នកដែលអ្នកកំពុងបង្កើតប្រព័ន្ធនេះ។
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,បើកដំណើរការ Hub
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,ឈ្មោះរបស់ក្រុមហ៊ុនរបស់អ្នកដែលអ្នកកំពុងបង្កើតប្រព័ន្ធនេះ។
 DocType: HR Settings,Include holidays in Total no. of Working Days,រួមបញ្ចូលថ្ងៃឈប់សម្រាកនៅក្នុងការសរុបទេ។ នៃថ្ងៃធ្វើការ
 DocType: Job Applicant,Hold,សង្កត់
 DocType: Employee,Date of Joining,កាលបរិច្ឆេទនៃការចូលរួម
 DocType: Naming Series,Update Series,កម្រងឯកសារធ្វើឱ្យទាន់សម័យ
 DocType: Supplier Quotation,Is Subcontracted,ត្រូវបានម៉ៅការបន្ត
+DocType: Restaurant Table,Minimum Seating,កន្លែងអង្គុយអប្បបរមា
 DocType: Item Attribute,Item Attribute Values,តម្លៃគុណលក្ខណៈធាតុ
 DocType: Examination Result,Examination Result,លទ្ធផលការពិនិត្យសុខភាព
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,បង្កាន់ដៃទិញ
@@ -1053,14 +1074,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +198,Reference Doctype must be one of {0},សេចក្តីយោង DOCTYPE ត្រូវតែជាផ្នែកមួយនៃ {0}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},មិនអាចរកឃើញរន្ធពេលវេលាក្នុងការ {0} ថ្ងៃទៀតសម្រាប់ប្រតិបត្ដិការ {1}
 DocType: Production Order,Plan material for sub-assemblies,សម្ភារៈផែនការសម្រាប់ការអនុសភា
-apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,ដៃគូការលក់និងទឹកដី
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,Bom {0} ត្រូវតែសកម្ម
+apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,ដៃគូលក់និងដែនដី
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,Bom {0} ត្រូវតែសកម្ម
 DocType: Journal Entry,Depreciation Entry,ចូលរំលស់
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,សូមជ្រើសប្រភេទឯកសារនេះជាលើកដំបូង
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,បោះបង់ការមើលសម្ភារៈ {0} មុនពេលលុបចោលដំណើរទស្សនកិច្ចនេះជួសជុល
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},សៀរៀលគ្មាន {0} មិនមែនជារបស់ធាតុ {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,តម្រូវការ Qty
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,ប្រតិបត្តិការដែលមានស្រាប់ឃ្លាំងដោយមានមិនអាចត្រូវបានបម្លែងទៅជាសៀវភៅ។
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,ប្រតិបត្តិការដែលមានស្រាប់ឃ្លាំងដោយមានមិនអាចត្រូវបានបម្លែងទៅជាសៀវភៅ។
 DocType: Bank Reconciliation,Total Amount,ចំនួនសរុប
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,ការបោះពុម្ពអ៊ីធឺណិត
 DocType: Prescription Duration,Number,ចំនួន
@@ -1071,7 +1092,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,តារាងតម្លៃការលក់
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","ប្រសិនបើបានគូសធីក, អតិថិជននឹងត្រូវបានបង្កើត, ធ្វើផែនទីទៅអ្នកជំងឺ។ វិក័យប័ត្រអ្នកជំងឺនឹងត្រូវបានបង្កើតឡើងប្រឆាំងនឹងអតិថិជននេះ។ អ្នកក៏អាចជ្រើសរើសអតិថិជនដែលមានស្រាប់នៅពេលបង្កើតអ្នកជម្ងឺ។"
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,ធ្វើសមកាលកម្មធាតុបោះពុម្ពផ្សាយ
 DocType: Bank Reconciliation,Account Currency,រូបិយប័ណ្ណគណនី
 DocType: Lab Test,Sample ID,លេខសម្គាល់គំរូ
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,សូមនិយាយពីគណនីបិទជុំទីក្នុងក្រុមហ៊ុន
@@ -1080,11 +1100,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,បុគ្គលិក {0} គឺមិនសកម្មឬមិនមានទេ
 DocType: Fee Structure,Components,សមាសភាគ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},សូមបញ្ចូលប្រភេទទ្រព្យសម្បត្តិនៅក្នុងធាតុ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,ធាតុវ៉ារ្យ៉ង់ {0} ធ្វើឱ្យទាន់សម័យ
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,ធាតុវ៉ារ្យ៉ង់ {0} ធ្វើឱ្យទាន់សម័យ
 DocType: Quality Inspection Reading,Reading 6,ការអាន 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,មិនអាច {0} {1} {2} ដោយគ្មានវិក័យប័ត្រឆ្នើមអវិជ្ជមាន
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this",ត្រូវបានបង្កើត។ ប្រសិនបើបានពន្យាពេលអ្នកត្រូវផ្លាស់ប្តូរវាល &quot;ធ្វើម្តងទៀតនៅក្នុងខែ&quot; ដោយដៃនេះ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,មិនអាច {0} {1} {2} ដោយគ្មានវិក័យប័ត្រឆ្នើមអវិជ្ជមាន
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ទិញវិក័យប័ត្រជាមុន
-DocType: Hub Settings,Sync Now,ធ្វើសមកាលកម្មឥឡូវ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},ជួរដេក {0}: ធាតុឥណទានមិនអាចត្រូវបានផ្សារភ្ជាប់ទៅនឹងការ {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,កំណត់ថវិកាសម្រាប់ឆ្នាំហិរញ្ញវត្ថុ។
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,លំនាំដើមគណនីធនាគារ / សាច់ប្រាក់នឹងត្រូវបានធ្វើបច្ចុប្បន្នភាពដោយស្វ័យប្រវត្តិក្នុងម៉ាស៊ីនឆូតកាតវិក្កយបត្រពេលអ្នកប្រើរបៀបនេះត្រូវបានជ្រើស។
@@ -1096,13 +1117,13 @@
 DocType: Item,Is Purchase Item,តើមានធាតុទិញ
 DocType: Asset,Purchase Invoice,ការទិញវិក័យប័ត្រ
 DocType: Stock Ledger Entry,Voucher Detail No,ពត៌មានលំអិតកាតមានទឹកប្រាក់គ្មាន
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,វិក័យប័ត្រលក់ថ្មី
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,វិក័យប័ត្រលក់ថ្មី
 DocType: Stock Entry,Total Outgoing Value,តម្លៃចេញសរុប
 DocType: Physician,Appointments,ការតែងតាំង
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,បើកកាលបរិច្ឆេទនិងថ្ងៃផុតកំណត់គួរតែត្រូវបាននៅក្នុងឆ្នាំសារពើពន្ធដូចគ្នា
 DocType: Lead,Request for Information,សំណើសុំព័ត៌មាន
 ,LeaderBoard,តារាងពិន្ទុ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,ធ្វើសមកាលកម្មវិកិយប័ត្រក្រៅបណ្តាញ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,ធ្វើសមកាលកម្មវិកិយប័ត្រក្រៅបណ្តាញ
 DocType: Payment Request,Paid,Paid
 DocType: Program Fee,Program Fee,ថ្លៃសេវាកម្មវិធី
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1121,11 +1142,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,ទិញធាតុលំដាប់
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,ចំណូលប្រយោល
 DocType: Student Attendance Tool,Student Attendance Tool,ឧបករណ៍វត្តមានរបស់សិស្ស
+DocType: Restaurant Menu,Price List (Auto created),បញ្ជីតម្លៃ (បង្កើតដោយស្វ័យប្រវត្តិ)
 DocType: Cheque Print Template,Date Settings,ការកំណត់កាលបរិច្ឆេទ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,អថេរ
 ,Company Name,ឈ្មោះក្រុមហ៊ុន
 DocType: SMS Center,Total Message(s),សារសរុប (s បាន)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,ជ្រើសធាតុសម្រាប់ការផ្ទេរ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,ជ្រើសធាតុសម្រាប់ការផ្ទេរ
 DocType: Purchase Invoice,Additional Discount Percentage,ការបញ្ចុះតម្លៃបន្ថែមទៀតភាគរយ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,មើលបញ្ជីនៃការជួយវីដេអូទាំងអស់
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ជ្រើសប្រធានគណនីរបស់ធនាគារនេះដែលជាកន្លែងដែលការត្រួតពិនិត្យត្រូវបានតម្កល់ទុក។
@@ -1142,6 +1164,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,ម៉ែត្រ
 DocType: Workstation,Electricity Cost,តម្លៃអគ្គិសនី
 DocType: HR Settings,Don't send Employee Birthday Reminders,កុំផ្ញើបុគ្គលិករំលឹកខួបកំណើត
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,រក្សាទុកការកំណត់
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,ផលិតផលដែលបានស្នើសុំ
 DocType: Item,Inspection Criteria,លក្ខណៈវិនិច្ឆ័យអធិការកិច្ច
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,ផ្ទេរប្រាក់
 DocType: BOM Website Item,BOM Website Item,ធាតុគេហទំព័រ Bom
@@ -1158,11 +1182,11 @@
 DocType: Journal Entry,Total Amount in Words,ចំនួនសរុបនៅក្នុងពាក្យ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,មានកំហុស។ ហេតុផលមួយដែលអាចនឹងត្រូវបានប្រហែលជាដែលអ្នកមិនបានរក្សាទុកសំណុំបែបបទ។ សូមទាក់ទង support@erpnext.com ប្រសិនបើបញ្ហានៅតែបន្តកើតមាន។
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,កន្ត្រកទំនិញរបស់ខ្ញុំ
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},ប្រភេទការបញ្ជាទិញត្រូវតែជាផ្នែកមួយនៃ {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},ប្រភេទការបញ្ជាទិញត្រូវតែជាផ្នែកមួយនៃ {0}
 DocType: Lead,Next Contact Date,ទំនាក់ទំនងបន្ទាប់កាលបរិច្ឆេទ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,បើក Qty
 DocType: Healthcare Settings,Appointment Reminder,ការរំលឹកការណាត់
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,សូមបញ្ចូលគណនីសម្រាប់ការផ្លាស់ប្តូរចំនួនទឹកប្រាក់
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,សូមបញ្ចូលគណនីសម្រាប់ការផ្លាស់ប្តូរចំនួនទឹកប្រាក់
 DocType: Student Batch Name,Student Batch Name,ឈ្មោះបាច់សិស្ស
 DocType: Consultation,Doctor,វេជ្ជបណ្ឌិត
 DocType: Holiday List,Holiday List Name,បញ្ជីថ្ងៃឈប់សម្រាកឈ្មោះ
@@ -1170,12 +1194,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,វគ្គកាលវិភាគ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,ជម្រើសភាគហ៊ុន
 DocType: Journal Entry Account,Expense Claim,ពាក្យបណ្តឹងលើការចំណាយ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,តើអ្នកពិតជាចង់ស្តារទ្រព្យសកម្មបោះបង់ចោលនេះ?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},qty សម្រាប់ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,តើអ្នកពិតជាចង់ស្តារទ្រព្យសកម្មបោះបង់ចោលនេះ?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},qty សម្រាប់ {0}
 DocType: Leave Application,Leave Application,ការឈប់សម្រាករបស់កម្មវិធី
 DocType: Patient,Patient Relation,ទំនាក់ទំនងរវាងអ្នកជម្ងឺ
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,ទុកឱ្យឧបករណ៍បម្រុងទុក
+DocType: Item,Hub Category to Publish,ប្រភេទមជ្ឈមណ្ឌលសម្រាប់បោះពុម្ព
 DocType: Leave Block List,Leave Block List Dates,ទុកឱ្យប្លុកថ្ងៃបញ្ជី
+DocType: Sales Invoice,Billing Address GSTIN,អាសយដ្ឋានវិក័យប័ត្រ GSTIN
 DocType: Workstation,Net Hour Rate,អត្រាហួរសុទ្ធ
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,ទទួលទិញការចំណាយបានចុះចត
 DocType: Company,Default Terms,លក្ខខណ្ឌលំនាំដើម
@@ -1185,18 +1211,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},សូមបញ្ជាក់ {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,ធាតុបានយកចេញដោយការផ្លាស់ប្តូរក្នុងបរិមាណឬតម្លៃទេ។
 DocType: Delivery Note,Delivery To,ដឹកជញ្ជូនដើម្បី
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,តារាងគុណលក្ខណៈគឺជាការចាំបាច់
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,តារាងគុណលក្ខណៈគឺជាការចាំបាច់
 DocType: Production Planning Tool,Get Sales Orders,ទទួលបានការបញ្ជាទិញលក់
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} មិនអាចជាអវិជ្ជមាន
 DocType: Training Event,Self-Study,ស្វ័យសិក្សា
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,បញ្ចុះតំលៃ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,បញ្ចុះតំលៃ
 DocType: Asset,Total Number of Depreciations,ចំនួនសរុបនៃការធ្លាក់ថ្លៃ
 DocType: Sales Invoice Item,Rate With Margin,អត្រាជាមួយនឹងរឹម
 DocType: Workstation,Wages,ប្រាក់ឈ្នួល
 DocType: Task,Urgent,បន្ទាន់
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},សូមបញ្ជាក់លេខសម្គាល់ជួរដេកដែលមានសុពលភាពសម្រាប់ជួរ {0} ក្នុងតារាង {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,មិនអាចស្វែងរកអថេរ:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,សូមជ្រើសវាលដើម្បីកែសម្រួលពីលេខ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,សូមជ្រើសវាលដើម្បីកែសម្រួលពីលេខ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,ចូរទៅផ្ទៃតុហើយចាប់ផ្តើមដោយការប្រើ ERPNext
 DocType: Item,Manufacturer,ក្រុមហ៊ុនផលិត
 DocType: Landed Cost Item,Purchase Receipt Item,ធាតុបង្កាន់ដៃទិញ
@@ -1227,8 +1253,8 @@
 DocType: GL Entry,Against,ប្រឆាំងនឹងការ
 DocType: Item,Default Selling Cost Center,ចំណាយលើការលក់លំនាំដើមរបស់មជ្ឈមណ្ឌល
 DocType: Sales Partner,Implementation Partner,ដៃគូអនុវត្ដន៍
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,លេខកូដតំបន់
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},លំដាប់ការលក់ {0} គឺ {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,លេខកូដតំបន់
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},លំដាប់ការលក់ {0} គឺ {1}
 DocType: Opportunity,Contact Info,ពត៌មានទំនាក់ទំនង
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,ការធ្វើឱ្យធាតុហ៊ុន
 DocType: Packing Slip,Net Weight UOM,សុទ្ធទម្ងន់ UOM
@@ -1239,6 +1265,7 @@
 DocType: Holiday List,Get Weekly Off Dates,ដើម្បីទទួលបានកាលបរិច្ឆេទការបិទប្រចាំសប្តាហ៍
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,កាលបរិច្ឆេទបញ្ចប់មិនអាចតិចជាងការចាប់ផ្តើមកាលបរិច្ឆេទ
 DocType: Sales Person,Select company name first.,ជ្រើសឈ្មោះក្រុមហ៊ុនជាលើកដំបូង។
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,ទាបទៅខ្ពស់
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,សម្រង់ពាក្យដែលទទួលបានពីការផ្គត់ផ្គង់។
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,ដាក់ BOM និងធ្វើបច្ចុប្បន្នភាពតម្លៃចុងក្រោយបំផុតនៅក្នុងគ្រប់ប័ណ្ឌទាំងអស់
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},ដើម្បី {0} | {1} {2}
@@ -1257,7 +1284,7 @@
 DocType: Program Enrollment,Transportation,ការដឹកជញ្ជូន
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Attribute មិនត្រឹមត្រូវ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} ត្រូវតែត្រូវបានដាក់ជូន
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},បរិមាណដែលត្រូវទទួលទានត្រូវតែតិចជាងឬស្មើទៅនឹង {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},បរិមាណដែលត្រូវទទួលទានត្រូវតែតិចជាងឬស្មើទៅនឹង {0}
 DocType: SMS Center,Total Characters,តួអក្សរសរុប
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},សូមជ្រើស Bom នៅក្នុងវាល Bom សម្រាប់ធាតុ {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,ពត៌មានវិក័យប័ត្ររបស់ C-សំណុំបែបបទ
@@ -1272,7 +1299,7 @@
 ,Ordered Items To Be Billed,ធាតុបញ្ជាឱ្យនឹងត្រូវបានផ្សព្វផ្សាយ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,ពីជួរមានដើម្បីឱ្យមានតិចជាងដើម្បីជួរ
 DocType: Global Defaults,Global Defaults,លំនាំដើមជាសកល
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,ការអញ្ជើញសហការគម្រោង
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,ការអញ្ជើញសហការគម្រោង
 DocType: Salary Slip,Deductions,ការកាត់
 DocType: Leave Allocation,LAL/,លោក Lal /
 DocType: Setup Progress Action,Action Name,ឈ្មោះសកម្មភាព
@@ -1290,13 +1317,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,ការលក់វិក័យប័ត្រជាមុន
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,គ្មានអ្វីដែលត្រូវស្នើសុំ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},កំណត់ត្រាថវិកាមួយផ្សេងទៀត &#39;{0}&#39; រួចហើយប្រឆាំងនឹង {1} &#39;{2} &quot;សម្រាប់ឆ្នាំសារពើពន្ធ {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&quot;ជាក់ស្តែងកាលបរិច្ឆេទចាប់ផ្តើម&quot; មិនអាចជាធំជាងជាក់ស្តែងកាលបរិច្ឆេទបញ្ចប់ &quot;
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"""កាលបរិច្ឆេទចាប់ផ្តើមជាក់ស្តែង"" មិនអាចធំជាងកាលបរិច្ឆេទបញ្ចប់ """
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,ការគ្រប់គ្រង
 DocType: Cheque Print Template,Payer Settings,ការកំណត់អ្នកចេញការចំណាយ
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","នេះនឹងត្រូវបានបន្ថែមទៅក្នុងក្រមធាតុនៃវ៉ារ្យ៉ង់នោះ។ ឧទាហរណ៍ប្រសិនបើអក្សរកាត់របស់អ្នកគឺ &quot;ផលិតកម្ម SM&quot; និងលេខកូដធាតុគឺ &quot;អាវយឺត&quot;, លេខកូដធាតុនៃវ៉ារ្យ៉ង់នេះនឹងត្រូវបាន &quot;អាវយឺត-ផលិតកម្ម SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,ប្រាក់ចំណេញសុទ្ធ (និយាយម្យ៉ាង) នឹងមើលឃើញនៅពេលដែលអ្នករក្សាទុកប័ណ្ណប្រាក់បៀវត្ស។
 DocType: Purchase Invoice,Is Return,តើការវិលត្រឡប់
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,ប្រយ័ត្ន
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,ប្រយ័ត្ន
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,ការវិលត្រឡប់ / ឥណពន្ធចំណាំ
 DocType: Price List Country,Price List Country,បញ្ជីតម្លៃប្រទេស
 DocType: Item,UOMs,UOMs
@@ -1311,17 +1338,18 @@
 DocType: Account,Balance Sheet,តារាងតុល្យការ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',មជ្ឈមណ្ឌលចំណាយសម្រាប់ធាតុដែលមានលេខកូដធាតុ &quot;
 DocType: Fee Validity,Valid Till,មានសុពលភាពរហូតដល់
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",របៀបក្នុងការទូទាត់ត្រូវបានមិនបានកំណត់រចនាសម្ព័ន្ធ។ សូមពិនិត្យមើលថាតើគណនីត្រូវបានកំណត់នៅលើរបៀបនៃការទូទាត់ឬនៅលើប្រវត្តិរូបម៉ាស៊ីនឆូតកាត។
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",របៀបក្នុងការទូទាត់ត្រូវបានមិនបានកំណត់រចនាសម្ព័ន្ធ។ សូមពិនិត្យមើលថាតើគណនីត្រូវបានកំណត់នៅលើរបៀបនៃការទូទាត់ឬនៅលើប្រវត្តិរូបម៉ាស៊ីនឆូតកាត។
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,ធាតុដូចគ្នាមិនអាចត្រូវបានបញ្ចូលច្រើនដង។
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",គណនីដែលមានបន្ថែមទៀតអាចត្រូវបានធ្វើក្រោមការក្រុមនោះទេតែធាតុដែលអាចត្រូវបានធ្វើប្រឆាំងនឹងការដែលមិនមែនជាក្រុម
 DocType: Lead,Lead,ការនាំមុខ
 DocType: Email Digest,Payables,បង់
 DocType: Course,Course Intro,វគ្គបរិញ្ញ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,ភាគហ៊ុនចូល {0} បង្កើតឡើង
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំស៊េរីលេខរៀងសម្រាប់ការចូលរួមតាមរយៈ Setup&gt; Serial Number
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,ភាគហ៊ុនចូល {0} បង្កើតឡើង
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,ជួរដេក # {0}: បានច្រានចោលមិនអាច Qty បញ្ចូលនៅក្នុងការទិញត្រឡប់មកវិញ
 ,Purchase Order Items To Be Billed,ការបញ្ជាទិញធាតុដែលនឹងត្រូវបានផ្សព្វផ្សាយ
 DocType: Purchase Invoice Item,Net Rate,អត្រាការប្រាក់សុទ្ធ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,សូមជ្រើសរើសអតិថិជន
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,សូមជ្រើសរើសអតិថិជន
 DocType: Purchase Invoice Item,Purchase Invoice Item,ទិញទំនិញវិក័យប័ត្រ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,ភាគហ៊ុនរបស់ក្រុម GL ធាតុសៀវភៅធាតុត្រូវបាននិងសម្រាប់បង្កាន់ដៃ reposted ទិញបានជ្រើសរើស
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,ធាតុ 1
@@ -1340,7 +1368,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},ជួរស្ទួនជាមួយនឹង {0} {1} ដូចគ្នា
 ,Trial Balance,អង្គជំនុំតុល្យភាព
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,ឆ្នាំសារពើពន្ធ {0} មិនបានរកឃើញ
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,ការរៀបចំបុគ្គលិក
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,ការរៀបចំបុគ្គលិក
 DocType: Sales Order,SO-,SO-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,សូមជ្រើសបុព្វបទជាលើកដំបូង
 DocType: Employee,O-,O-
@@ -1352,12 +1380,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,មើលសៀវភៅ
 DocType: Grading Scale,Intervals,ចន្លោះពេល
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ដំបូងបំផុត
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group",ធាតុមួយពូលមានឈ្មោះដូចគ្នាសូមប្ដូរឈ្មោះធាតុឬប្ដូរឈ្មោះធាតុដែលជាក្រុម
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group",ធាតុមួយពូលមានឈ្មោះដូចគ្នាសូមប្ដូរឈ្មោះធាតុឬប្ដូរឈ្មោះធាតុដែលជាក្រុម
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,លេខទូរស័ព្ទចល័តរបស់សិស្ស
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,នៅសល់នៃពិភពលោក
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,នៅសល់នៃពិភពលោក
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,ធាតុនេះ {0} មិនអាចមានបាច់
 ,Budget Variance Report,របាយការណ៍អថេរថវិការ
 DocType: Salary Slip,Gross Pay,បង់សរុបបាន
+DocType: Item,Is Item from Hub,គឺជាធាតុពី Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,ជួរដេក {0}: ប្រភេទសកម្មភាពគឺជាការចាំបាច់។
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,ភាគលាភបង់ប្រាក់
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,គណនេយ្យសៀវភៅធំ
@@ -1367,8 +1396,9 @@
 DocType: Vehicle Log,Service Detail,សេវាលំអិត
 DocType: BOM,Item Description,ធាតុការពិពណ៌នាសង្ខេប
 DocType: Student Sibling,Student Sibling,បងប្អូនបង្កើតរបស់សិស្ស
-DocType: Purchase Invoice,Is Recurring,តើការកើតឡើង
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,របៀបទូទាត់ប្រាក់
 DocType: Purchase Invoice,Supplied Items,ធាតុដែលបានផ្គត់ផ្គង់
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},សូមកំណត់ម៉ឺនុយសកម្មសម្រាប់ភោជនីយដ្ឋាន {0}
 DocType: Student,STUD.,Stud ។
 DocType: Production Order,Qty To Manufacture,qty ដើម្បីផលិត
 DocType: Email Digest,New Income,ប្រាក់ចំនូលថ្មី
@@ -1378,6 +1408,7 @@
 ,Student and Guardian Contact Details,សិស្សនិងអាណាព្យាបាលទំនាក់ទំនងលំអិត
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,ជួរដេក {0}: សម្រាប់ផ្គត់ផ្គង់ {0} អាសយដ្ឋានអ៊ីម៉ែលត្រូវបានទាមទារដើម្បីផ្ញើអ៊ីម៉ែល
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,ពិធីបើកបណ្តោះអាសន្ន
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,មើលមជ្ឈមណ្ឌល
 ,Employee Leave Balance,បុគ្គលិកចាកចេញតុល្យភាព
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},តុល្យភាពសម្រាប់គណនី {0} តែងតែត្រូវតែមាន {1}
 DocType: Patient Appointment,More Info,ពត៌មានបន្ថែម
@@ -1388,7 +1419,7 @@
 DocType: GL Entry,Against Voucher,ប្រឆាំងនឹងប័ណ្ណ
 DocType: Item,Default Buying Cost Center,មជ្ឈមណ្ឌលការចំណាយទិញលំនាំដើម
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",ដើម្បីទទួលបានប្រយោជន៍ច្រើនបំផុតក្នុង ERPNext យើងផ្ដល់អនុសាសន៍ថាអ្នកបានយកពេលវេលាមួយចំនួននិងមើលវីដេអូបានជំនួយទាំងនេះ។
-apps/erpnext/erpnext/accounts/page/pos/pos.js +74, to ,ដើម្បី
+apps/erpnext/erpnext/accounts/page/pos/pos.js +74, to ,ដល់
 DocType: Supplier Quotation Item,Lead Time in days,អ្នកដឹកនាំការពេលវេលានៅក្នុងថ្ងៃ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,គណនីចងការប្រាក់សង្ខេប
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +337,Payment of salary from {0} to {1},ការទូទាត់សំណងនៃប្រាក់ខែពី {0} ទៅ {1}
@@ -1397,13 +1428,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,លំដាប់ការលក់ {0} មិនត្រឹមត្រូវ
 DocType: Supplier Scorecard,Warn for new Request for Quotations,ព្រមានសម្រាប់សំណើថ្មីសម្រាប់សម្រង់
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,ការបញ្ជាទិញជួយអ្នកមានគម្រោងនិងតាមដាននៅលើការទិញរបស់អ្នក
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","សូមអភ័យទោស, ក្រុមហ៊ុនមិនអាចត្រូវបានបញ្ចូលគ្នា"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","សូមអភ័យទោស, ក្រុមហ៊ុនមិនអាចត្រូវបានបញ្ចូលគ្នា"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,វេជ្ជបញ្ជាសាកល្បង
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",បរិមាណបញ្ហា / សេវាផ្ទេរប្រាក់សរុប {0} នៅក្នុងសំណើសម្ភារៈ {1} \ មិនអាចច្រើនជាងបរិមាណដែលបានស្នើរសុំ {2} សម្រាប់ធាតុ {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,ខ្នាតតូច
 DocType: Employee,Employee Number,ចំនួនបុគ្គលិក
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},ករណីគ្មានការ (s) បានរួចហើយនៅក្នុងការប្រើប្រាស់។ សូមព្យាយាមពីករណីគ្មាន {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},ករណីគ្មានការ (s) បានរួចហើយនៅក្នុងការប្រើប្រាស់។ សូមព្យាយាមពីករណីគ្មាន {0}
 DocType: Project,% Completed,% បានបញ្ចប់
 ,Invoiced Amount (Exculsive Tax),ចំនួន invoiced (ពន្ធលើ Exculsive)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,ធាតុ 2
@@ -1418,11 +1449,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,ការចំណាយដោយប្រយោល
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,ជួរដេក {0}: Qty គឺជាការចាំបាច់
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,កសិកម្ម
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,ធ្វើសមកាលកម្មទិន្នន័យមេ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,ធ្វើសមកាលកម្មទិន្នន័យមេ
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,ផលិតផលឬសេវាកម្មរបស់អ្នក
 DocType: Special Test Items,Special Test Items,ធាតុសាកល្បងពិសេស
 DocType: Mode of Payment,Mode of Payment,របៀបនៃការទូទាត់
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,វេបសាយរូបភាពគួរតែជាឯកសារសាធារណៈឬគេហទំព័ររបស់ URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,វេបសាយរូបភាពគួរតែជាឯកសារសាធារណៈឬគេហទំព័ររបស់ URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,Bom
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,នេះគឺជាក្រុមមួយដែលធាតុ root និងមិនអាចត្រូវបានកែសម្រួល។
@@ -1430,24 +1461,23 @@
 DocType: Vehicle,Fuel UOM,ប្រេងឥន្ធនៈ UOM
 DocType: Warehouse,Warehouse Contact Info,ឃ្លាំងពត៌មានទំនាក់ទំនង
 DocType: Payment Entry,Write Off Difference Amount,សរសេរបិទចំនួនទឹកប្រាក់ផ្សេងគ្នា
-DocType: Purchase Invoice,Recurring Type,ប្រភេទកើតឡើង
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: រកមិនឃើញអ៊ីម៉ែលបុគ្គលិក, ហេតុនេះមិនបានចាត់អ៊ីមែល"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: រកមិនឃើញអ៊ីម៉ែលបុគ្គលិក, ហេតុនេះមិនបានចាត់អ៊ីមែល"
 DocType: Item,Foreign Trade Details,សេចក្ដីលម្អិតពាណិជ្ជកម្មបរទេស
+,Assessment Plan Status,ស្ថានភាពវាយតម្លៃ
 DocType: Email Digest,Annual Income,ប្រាក់ចំណូលប្រចាំឆ្នាំ
 DocType: Serial No,Serial No Details,គ្មានព័ត៌មានលំអិតសៀរៀល
 DocType: Purchase Invoice Item,Item Tax Rate,អត្រាអាករធាតុ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,សូមជ្រើសរើសគ្រូពេទ្យនិងកាលបរិច្ឆេទ
 DocType: Student Group Student,Group Roll Number,លេខវិលគ្រុប
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} មានតែគណនីឥណទានអាចត្រូវបានតភ្ជាប់ប្រឆាំងនឹងធាតុឥណពន្ធផ្សេងទៀត
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,សរុបនៃភារកិច្ចទាំងអស់គួរតែមានទម្ងន់ 1. សូមលៃតម្រូវត្រូវមានភារកិច្ចគម្រោងទម្ងន់ទាំងអស់ទៅតាម
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,ការដឹកជញ្ជូនចំណាំ {0} គឺមិនត្រូវបានដាក់ស្នើ
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,សរុបនៃភារកិច្ចទាំងអស់គួរតែមានទម្ងន់ 1. សូមលៃតម្រូវត្រូវមានភារកិច្ចគម្រោងទម្ងន់ទាំងអស់ទៅតាម
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,ការដឹកជញ្ជូនចំណាំ {0} គឺមិនត្រូវបានដាក់ស្នើ
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,ធាតុ {0} ត្រូវតែជាធាតុអនុចុះកិច្ចសន្យា
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,ឧបករណ៍រាជធានី
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",វិធានកំណត់តម្លៃដំបូងត្រូវបានជ្រើសដោយផ្អែកលើ &#39;អនុវត្តនៅលើ&#39; វាលដែលអាចជាធាតុធាតុក្រុមឬម៉ាក។
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,សូមកំណត់កូដធាតុជាមុនសិន
-DocType: Hub Settings,Seller Website,វេបសាយអ្នកលក់
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,សូមកំណត់កូដធាតុជាមុនសិន
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,ចំនួនភាគរយត្រៀមបម្រុងទុកសរុបសម្រាប់លក់ក្រុមគួរមាន 100 នាក់
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,ចំនួនភាគរយត្រៀមបម្រុងទុកសរុបសម្រាប់លក់ក្រុមគួរមាន 100 នាក់
 DocType: Sales Invoice Item,Edit Description,កែសម្រួលការបរិយាយ
 DocType: Antibiotic,Antibiotic,អង់ទីប៊ីយ៉ូទិក
 ,Team Updates,ក្រុមការងារការធ្វើឱ្យទាន់សម័យ
@@ -1468,12 +1498,12 @@
 DocType: Purchase Invoice,Total (Company Currency),សរុប (ក្រុមហ៊ុនរូបិយវត្ថុ)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,លេខសម្គាល់ {0} បានចូលច្រើនជាងមួយដង
 DocType: Depreciation Schedule,Journal Entry,ធាតុទិនានុប្បវត្តិ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} ធាតុនៅក្នុងការរីកចំរើន
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} ធាតុនៅក្នុងការរីកចំរើន
 DocType: Workstation,Workstation Name,ឈ្មោះស្ថានីយការងារ Stencils
 DocType: Grading Scale Interval,Grade Code,កូដថ្នាក់ទី
 DocType: POS Item Group,POS Item Group,គ្រុបធាតុម៉ាស៊ីនឆូតកាត
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,សង្ខេបអ៊ីម៉ែល:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},Bom {0} មិនមែនជារបស់ធាតុ {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},Bom {0} មិនមែនជារបស់ធាតុ {1}
 DocType: Sales Partner,Target Distribution,ចែកចាយគោលដៅ
 DocType: Salary Slip,Bank Account No.,លេខគណនីធនាគារ
 DocType: Naming Series,This is the number of the last created transaction with this prefix,នេះជាចំនួននៃការប្រតិបត្តិការបង្កើតចុងក្រោយជាមួយបុព្វបទនេះ
@@ -1489,10 +1519,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,សំណើរសម្រាប់ការផ្គត់ផ្គង់សម្រង់
 DocType: Healthcare Settings,Registration Message,ការចុះឈ្មោះសារ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,ផ្នែករឹង
-DocType: Sales Order,Recurring Upto,រីករាយជាមួយនឹងកើតឡើង
 DocType: Prescription Dosage,Prescription Dosage,ឱសថតាមវេជ្ជបញ្ជា
 DocType: Attendance,HR Manager,កម្មវិធីគ្រប់គ្រងធនធានមនុស្ស
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,សូមជ្រើសរើសក្រុមហ៊ុន
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,សូមជ្រើសរើសក្រុមហ៊ុន
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,ឯកសិទ្ធិចាកចេញ
 DocType: Purchase Invoice,Supplier Invoice Date,កាលបរិច្ឆេទផ្គត់ផ្គង់វិក័យប័ត្រ
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,ក្នុងមួយ
@@ -1508,10 +1537,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,លក្ខខណ្ឌត្រួតស៊ីគ្នាបានរកឃើញរវាង:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,ប្រឆាំងនឹង Journal Entry {0} ត្រូវបានលៃតម្រូវរួចទៅហើយប្រឆាំងនឹងកាតមានទឹកប្រាក់មួយចំនួនផ្សេងទៀត
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,តម្លៃលំដាប់សរុប
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,អាហារ
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,អាហារ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,ជួរ Ageing 3
 DocType: Maintenance Schedule Item,No of Visits,គ្មានការមើល
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},កាលវិភាគថែរក្សា {0} ដែលមានការប្រឆាំងនឹង {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,តើអ្នកចង់បោះពុម្ពផ្សាយធាតុរបស់អ្នកទៅ Hub ដែរឬទេ?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,សិស្សចុះឈ្មោះ
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},រូបិយប័ណ្ណនៃគណនីបិទត្រូវតែជា {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},ផលបូកនៃចំនួនពិន្ទុសម្រាប់ការគ្រាប់បាល់បញ្ចូលទីទាំងអស់គួរតែ 100. វាជា {0}
@@ -1522,9 +1552,9 @@
 DocType: Authorization Rule,Average Discount,ការបញ្ចុះតម្លៃជាមធ្យម
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,ឧបករណ៍ប្រើប្រាស់
-DocType: Purchase Invoice Item,Accounting,គណនេយ្យ
+DocType: POS Profile,Accounting,គណនេយ្យ
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,សូមជ្រើសជំនាន់សម្រាប់ធាតុបាច់
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,សូមជ្រើសជំនាន់សម្រាប់ធាតុបាច់
 DocType: Asset,Depreciation Schedules,កាលវិភាគរំលស់
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,រយៈពេលប្រើប្រាស់មិនអាចមានការបែងចែកការឈប់សម្រាកនៅខាងក្រៅក្នុងរយៈពេល
 DocType: Activity Cost,Projects,គម្រោងការ
@@ -1540,7 +1570,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',ស្ថានភាពការអនុម័តត្រូវតែបាន &quot;ត្រូវបានអនុម័ត&quot; ឬ &quot;បានច្រានចោល&quot;
 DocType: Physician,Contacts and Address,ទំនាក់ទំនងនិងអាសយដ្ឋាន
 DocType: Purchase Invoice,Contact Person,ទំនាក់ទំនង
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&quot;ការរំពឹងទុកការចាប់ផ្តើមកាលបរិច្ឆេទ&quot; មិនអាចជាធំជាងការរំពឹងទុកកាលបរិច្ឆេទបញ្ចប់ &quot;
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&quot;ការរំពឹងទុកការចាប់ផ្តើមកាលបរិច្ឆេទ&quot; មិនអាចជាធំជាងការរំពឹងទុកកាលបរិច្ឆេទបញ្ចប់ &quot;
 DocType: Course Scheduling Tool,Course End Date,ការពិតណាស់កាលបរិច្ឆេទបញ្ចប់
 DocType: Holiday List,Holidays,ថ្ងៃឈប់សម្រាក
 DocType: Sales Order Item,Planned Quantity,បរិមាណដែលបានគ្រោងទុក
@@ -1548,10 +1578,11 @@
 DocType: Item,Maintain Stock,ការរក្សាហ៊ុន
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,ធាតុភាគហ៊ុនដែលបានបង្កើតរួចផលិតកម្មលំដាប់
 DocType: Employee,Prefered Email,ចំណង់ចំណូលចិត្តអ៊ីមែល
+DocType: Student Admission,Eligibility and Details,សិទ្ធិនិងព័ត៌មានលម្អិត
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,ការផ្លាស់ប្តូរសុទ្ធនៅលើអចលនទ្រព្យ
 DocType: Leave Control Panel,Leave blank if considered for all designations,ប្រសិនបើអ្នកទុកវាឱ្យទទេសម្រាប់ការរចនាទាំងអស់បានពិចារណាថា
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,បន្ទុកនៃប្រភេទ &#39;ជាក់ស្តែង &quot;នៅក្នុងជួរដេកដែលបាន {0} មិនអាចត្រូវបានរួមបញ្ចូលនៅក្នុងអត្រាធាតុ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},អតិបរមា: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},អតិបរមា: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,ចាប់ពី Datetime
 DocType: Email Digest,For Company,សម្រាប់ក្រុមហ៊ុន
 apps/erpnext/erpnext/config/support.py +17,Communication log.,កំណត់ហេតុនៃការទំនាក់ទំនង។
@@ -1559,19 +1590,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,ប័ណ្ណពិន្ទុរបស់អ្នកផ្គត់ផ្គង់អង្កេតអថេរ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,ចំនួនទឹកប្រាក់នៃការទិញ
 DocType: Sales Invoice,Shipping Address Name,ការដឹកជញ្ជូនឈ្មោះអាសយដ្ឋាន
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,គំនូសតាងគណនី
 DocType: Material Request,Terms and Conditions Content,លក្ខខណ្ឌមាតិកា
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,មិនអាចជាធំជាង 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,ធាតុ {0} គឺមិនមានធាតុភាគហ៊ុន
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,ធាតុ {0} គឺមិនមានធាតុភាគហ៊ុន
 DocType: Maintenance Visit,Unscheduled,គ្មានការគ្រោងទុក
 DocType: Employee,Owned,កម្មសិទ្ធផ្ទាល់ខ្លួន
 DocType: Salary Detail,Depends on Leave Without Pay,អាស្រ័យនៅលើស្លឹកដោយគ្មានប្រាក់ខែ
 DocType: Pricing Rule,"Higher the number, higher the priority","ខ្ពស់ជាងចំនួន, ខ្ពស់ជាងអាទិភាព"
 ,Purchase Invoice Trends,ទិញវិក័យប័ត្រនិន្នាការ
 DocType: Employee,Better Prospects,ទស្សនវិស័យល្អប្រសើរជាងមុន
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","ជួរដេក # {0}: បាច់នេះ {1} មានតែ {2} qty ។ សូមជ្រើសក្រុមមួយផ្សេងទៀតដែលមាន {3} qty អាចប្រើបានឬបំបែកជួរដេកដែលបានចូលទៅក្នុងជួរដេកច្រើន, ដើម្បីរំដោះ / បញ្ហាពីជំនាន់ច្រើន"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","ជួរដេក # {0}: បាច់នេះ {1} មានតែ {2} qty ។ សូមជ្រើសក្រុមមួយផ្សេងទៀតដែលមាន {3} qty អាចប្រើបានឬបំបែកជួរដេកដែលបានចូលទៅក្នុងជួរដេកច្រើន, ដើម្បីរំដោះ / បញ្ហាពីជំនាន់ច្រើន"
 DocType: Vehicle,License Plate,ស្លាកលេខ
 DocType: Appraisal,Goals,គ្រាប់បាល់បញ្ចូលទី
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,ជ្រើសរើសទិន្នន័យ POS
 DocType: Warranty Claim,Warranty / AMC Status,ការធានា / ស្ថានភាព AMC
 ,Accounts Browser,កម្មវិធីរុករកគណនី
 DocType: Payment Entry Reference,Payment Entry Reference,យោងធាតុការទូទាត់
@@ -1589,7 +1620,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,បុគ្គលិកមិនអាចរាយការណ៍ទៅខ្លួនឯង។
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",ប្រសិនបើគណនីគឺជាការកកធាតុត្រូវបានអនុញ្ញាតឱ្យអ្នកប្រើប្រាស់ដាក់កម្រិត។
 DocType: Email Digest,Bank Balance,ធនាគារតុល្យភាព
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},គណនេយ្យធាតុសម្រាប់ {0} {1} អាចត្រូវបានធ្វើតែនៅក្នុងរូបិយប័ណ្ណ: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},គណនេយ្យធាតុសម្រាប់ {0} {1} អាចត្រូវបានធ្វើតែនៅក្នុងរូបិយប័ណ្ណ: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.",ទម្រង់យ៉ូបបានទាមទារលក្ខណៈសម្បត្តិល
 DocType: Journal Entry Account,Account Balance,សមតុល្យគណនី
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,វិធានពន្ធសម្រាប់កិច្ចការជំនួញ។
@@ -1598,8 +1629,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),ពន្ធសរុបនិងការចោទប្រកាន់ (រូបិយប័ណ្ណរបស់ក្រុមហ៊ុន)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,"បង្ហាញសមតុល្យ, P &amp; L កាលពីឆ្នាំសារពើពន្ធរបស់មិនបិទ"
 DocType: Lab Test Template,Collection Details,ព័ត៌មានលំអិតនៃការប្រមូល
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","ជ្រើសរើស cp.name, cp.test_code, cp ។ parent, cp.invoice, ct.physician, ct.consultation_date ពី tabConsultation ct, `tabLab Prescription &#39;cp ដែល ct.patient =&#39; {0} &#39;និង cp.parent = ct ។ ឈ្មោះនិង cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,គណនីលើការដឹកជញ្ជូន
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: គណនី {2} អសកម្ម
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,ធ្វើឱ្យការបញ្ជាទិញលក់ដើម្បីជួយអ្នកមានគម្រោងការងាររបស់អ្នកនិងផ្តល់នូវនៅលើពេលវេលា
@@ -1607,7 +1636,7 @@
 DocType: Stock Entry,Total Additional Costs,ការចំណាយបន្ថែមទៀតសរុប
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),សំណល់អេតចាយសម្ភារៈតម្លៃ (ក្រុមហ៊ុនរូបិយប័ណ្ណ)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Sub Assemblies,សភាអនុ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Sub Assemblies,ផ្ដុំផ្នែកបញ្ចូលគ្នាជាឯកតា
 DocType: Asset,Asset Name,ឈ្មោះទ្រព្យសម្បត្តិ
 DocType: Project,Task Weight,ទម្ងន់ភារកិច្ច
 DocType: Shipping Rule Condition,To Value,ទៅតម្លៃ
@@ -1616,7 +1645,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,គ្រូពេទ្យប្រហែលជាវេចខ្ចប់
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,ការិយាល័យសំរាប់ជួល
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,ការកំណត់ច្រកចេញចូលការរៀបចំសារជាអក្សរ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,នាំចូលបានបរាជ័យ!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,នាំចូលបានបរាជ័យ!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,គ្មានអាសយដ្ឋានបន្ថែមនៅឡើយទេ។
 DocType: Workstation Working Hour,Workstation Working Hour,ស្ថានីយការងារការងារហួរ
 DocType: Vital Signs,Blood Pressure,សម្ពាធឈាម
@@ -1641,7 +1670,7 @@
 DocType: Sales Invoice,Source,ប្រភព
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,បង្ហាញបានបិទ
 DocType: Leave Type,Is Leave Without Pay,ត្រូវទុកឱ្យដោយគ្មានការបង់
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,ទ្រព្យសម្បត្តិប្រភេទជាការចាំបាច់សម្រាប់ធាតុទ្រព្យសកម្មថេរ
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,ទ្រព្យសម្បត្តិប្រភេទជាការចាំបាច់សម្រាប់ធាតុទ្រព្យសកម្មថេរ
 DocType: Fee Validity,Fee Validity,ថ្លៃសុពលភាព
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,រកឃើញនៅក្នុងតារាងគ្មានប្រាក់បង់ការកត់ត្រា
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},នេះ {0} ជម្លោះជាមួយ {1} សម្រាប់ {2} {3}
@@ -1662,8 +1691,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ស្វែងរកប្រតិបត្តិ
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,បង្កើតនាំទៅរក
 DocType: Maintenance Schedule,Schedules,កាលវិភាគ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,ព័ត៌មានអំពីម៉ាស៊ីនឆូតកាតត្រូវបានតម្រូវឱ្យប្រើ Point-of-Sale
 DocType: Purchase Invoice Item,Net Amount,ចំនួនទឹកប្រាក់សុទ្ធ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} មិនត្រូវបានដាក់ស្នើដូច្នេះសកម្មភាពនេះមិនអាចត្រូវបានបញ្ចប់
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} មិនត្រូវបានដាក់ស្នើដូច្នេះសកម្មភាពនេះមិនអាចត្រូវបានបញ្ចប់
 DocType: Purchase Order Item Supplied,BOM Detail No,ពត៌មានលំអិត Bom គ្មាន
 DocType: Landed Cost Voucher,Additional Charges,ការចោទប្រកាន់បន្ថែម
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),ចំនួនទឹកប្រាក់ដែលបញ្ចុះតម្លៃបន្ថែម (រូបិយប័ណ្ណរបស់ក្រុមហ៊ុន)
@@ -1672,7 +1702,7 @@
 ,Support Hour Distribution,Support Hour Distribution
 DocType: Maintenance Visit,Maintenance Visit,ថែទាំទស្សនកិច្ច
 DocType: Student,Leaving Certificate Number,ការចាកចេញពីវិញ្ញាបនប័ត្រលេខ
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}",បានលុបការណាត់សូមពិនិត្យឡើងវិញនិងបោះបង់វិក័យប័ត្រ {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}",បានលុបការណាត់សូមពិនិត្យឡើងវិញនិងបោះបង់វិក័យប័ត្រ {0}
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,បាច់អាចរកបាន Qty នៅឃ្លាំង
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,ធ្វើឱ្យទាន់សម័យបោះពុម្ពទ្រង់ទ្រាយ
 DocType: Landed Cost Voucher,Landed Cost Help,ជំនួយការចំណាយបានចុះចត
@@ -1695,8 +1725,8 @@
 DocType: Patient,Tobacco Past Use,ការប្រើប្រាស់ថ្នាំជក់កាលពីមុន
 DocType: Sales Invoice Item,Brand Name,ឈ្មោះម៉ាក
 DocType: Purchase Receipt,Transporter Details,សេចក្ដីលម្អិតដឹកជញ្ជូន
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},អ្នកប្រើ {0} ត្រូវបានកំណត់ទៅគ្រូពេទ្យ {1} រួចហើយ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,ឃ្លាំងលំនាំដើមគឺត្រូវបានទាមទារសម្រាប់ធាតុដែលបានជ្រើស
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},អ្នកប្រើ {0} ត្រូវបានកំណត់ទៅគ្រូពេទ្យ {1} រួចហើយ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,ឃ្លាំងលំនាំដើមគឺត្រូវបានទាមទារសម្រាប់ធាតុដែលបានជ្រើស
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,ប្រអប់
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,ហាងទំនិញដែលអាចធ្វើបាន
 DocType: Budget,Monthly Distribution,ចែកចាយប្រចាំខែ
@@ -1706,7 +1736,7 @@
 DocType: Sales Partner,Sales Partner Target,ដៃគូគោលដៅការលក់
 DocType: Loan Type,Maximum Loan Amount,ចំនួនទឹកប្រាក់កម្ចីអតិបរមា
 DocType: Pricing Rule,Pricing Rule,វិធានការកំណត់តម្លៃ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},ចំនួនសិស្សស្ទួនរមៀល {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},ចំនួនសិស្សស្ទួនរមៀល {0}
 DocType: Budget,Action if Annual Budget Exceeded,ប្រសិនបើមានថវិកាប្រចាំឆ្នាំសកម្មភាពលើសពី
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,សម្ភារៈសំណើទិញសណ្តាប់ធ្នាប់
 DocType: Shopping Cart Settings,Payment Success URL,ការទូទាត់ URL ដែលទទួលបានភាពជោគជ័យ
@@ -1723,7 +1753,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} ត្រូវតែបង្ហាញបានតែម្តង
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},មិនអនុញ្ញាតឱ្យការផ្តល់ជាច្រើនទៀត {0} {1} ជាជាងការប្រឆាំងនឹងការទិញលំដាប់ {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},ទុកបម្រុងទុកដោយជោគជ័យសម្រាប់ {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,គ្មានធាតុខ្ចប់
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,គ្មានធាតុខ្ចប់
 DocType: Shipping Rule Condition,From Value,ពីតម្លៃ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,បរិមាណដែលត្រូវទទួលទានគឺចាំបាច់កម្មន្តសាល
 DocType: Employee Loan,Repayment Method,វិធីសាស្រ្តការទូទាត់សង
@@ -1737,6 +1767,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,បំណុលភាគហ៊ុន
 DocType: Purchase Invoice,Supplier Warehouse,ឃ្លាំងក្រុមហ៊ុនផ្គត់ផ្គង់
 DocType: Opportunity,Contact Mobile No,ទំនាក់ទំនងទូរស័ព្ទគ្មាន
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,ជ្រើសរើសក្រុមហ៊ុន
 ,Material Requests for which Supplier Quotations are not created,សំណើសម្ភារៈដែលសម្រង់សម្តីផ្គត់ផ្គង់មិនត្រូវបានបង្កើត
 DocType: Student Group,Set 0 for no limit,កំណត់ 0 សម្រាប់គ្មានដែនកំណត់
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ថ្ងៃនេះ (s) បាននៅលើដែលអ្នកកំពុងដាក់ពាក្យសុំឈប់សម្រាកគឺជាថ្ងៃឈប់សម្រាក។ អ្នកត្រូវការត្រូវបានអនុវត្តសម្រាប់ការឈប់សម្រាក។
@@ -1746,24 +1777,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,ចូរធ្វើសម្រង់
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,របាយការណ៍ផ្សេងទៀត
 DocType: Dependent Task,Dependent Task,ការងារពឹងផ្អែក
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},កត្តាប្រែចិត្តជឿសម្រាប់អង្គភាពលំនាំដើមត្រូវតែមានវិធានការក្នុងមួយជួរដេក 1 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},កត្តាប្រែចិត្តជឿសម្រាប់អង្គភាពលំនាំដើមត្រូវតែមានវិធានការក្នុងមួយជួរដេក 1 {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},ការឈប់សម្រាកនៃប្រភេទ {0} មិនអាចមានយូរជាង {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ការធ្វើផែនការប្រតិបត្ដិការសម្រាប់ការព្យាយាមរបស់ X នៅមុនថ្ងៃ។
 DocType: HR Settings,Stop Birthday Reminders,បញ្ឈប់ការរំលឹកខួបកំណើត
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},សូមកំណត់បើកប្រាក់បៀវត្សគណនីទូទាត់លំនាំដើមក្នុងក្រុមហ៊ុន {0}
 DocType: SMS Center,Receiver List,បញ្ជីអ្នកទទួល
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,ស្វែងរកធាតុ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,ស្វែងរកធាតុ
 DocType: Patient Appointment,Referring Physician,សំដៅដល់វេជ្ជបណ្ឌិត
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ចំនួនទឹកប្រាក់ដែលគេប្រើប្រាស់
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,ការផ្លាស់ប្តូរសាច់ប្រាក់សុទ្ធ
 DocType: Assessment Plan,Grading Scale,ធ្វើមាត្រដ្ឋានពិន្ទុ
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ឯកតារង្វាស់ {0} ត្រូវបានបញ្ចូលលើសពីមួយដងនៅក្នុងការសន្ទនាកត្តាតារាង
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,បានបញ្ចប់រួចទៅហើយ
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ឯកតារង្វាស់ {0} ត្រូវបានបញ្ចូលលើសពីមួយដងនៅក្នុងការសន្ទនាកត្តាតារាង
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,បានបញ្ចប់រួចទៅហើយ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,ភាគហ៊ុននៅក្នុងដៃ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},ស្នើសុំការទូទាត់រួចហើយ {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,តម្លៃនៃធាតុដែលបានចេញផ្សាយ
 DocType: Physician,Hospital,មន្ទីរពេទ្យ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},បរិមាណមិនត្រូវការច្រើនជាង {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},បរិមាណមិនត្រូវការច្រើនជាង {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,មុនឆ្នាំហិរញ្ញវត្ថុមិនត្រូវបានបិទ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),អាយុ (ថ្ងៃ)
 DocType: Quotation Item,Quotation Item,ធាតុសម្រង់
@@ -1774,8 +1805,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,ប្រភេទផ្គត់ផ្គង់គ្រូ។
 DocType: Purchase Order Item,Supplier Part Number,ក្រុមហ៊ុនផ្គត់ផ្គង់ផ្នែកមួយចំនួន
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,អត្រានៃការប្រែចិត្តជឿមិនអាចជា 0 ឬ 1
-DocType: Sales Invoice,Reference Document,ឯកសារជាឯកសារយោង
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} ត្រូវបានលុបចោលឬបញ្ឈប់
+DocType: Subscription,Reference Document,ឯកសារជាឯកសារយោង
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} ត្រូវបានលុបចោលឬបញ្ឈប់
 DocType: Accounts Settings,Credit Controller,ឧបករណ៍ត្រួតពិនិត្យឥណទាន
 DocType: Delivery Note,Vehicle Dispatch Date,កាលបរិច្ឆេទបញ្ជូនយានយន្ត
 DocType: Healthcare Settings,Default Medical Code Standard,ស្តង់ដារវេជ្ជសាស្ត្រលំនាំដើម
@@ -1784,6 +1815,7 @@
 DocType: Company,Default Payable Account,គណនីទូទាត់លំនាំដើម
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",ការកំណត់សម្រាប់រទេះដើរទិញឥវ៉ាន់អនឡាញដូចជាវិធានការដឹកជញ្ជូនបញ្ជីតម្លៃល
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% បានបង់ប្រាក់
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,តម្រៀបតាមតម្លៃ ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,រក្សា Qty
 DocType: Party Account,Party Account,គណនីគណបក្ស
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,ធនធានមនុស្ស
@@ -1795,13 +1827,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,ធ្វើឱ្យការចំណាយធាតុ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,ជួរដេក {0}: ជាមុនប្រឆាំងនឹងការផ្គត់ផ្គង់ត្រូវតែឥណពន្ធ
 DocType: Company,Default Values,តម្លៃលំនាំដើម
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{ប្រេកង់} សង្ខេប
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{ប្រេកង់} សង្ខេប
 DocType: Expense Claim,Total Amount Reimbursed,ចំនួនទឹកប្រាក់សរុបដែលបានសងវិញ
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,នេះផ្អែកលើកំណត់ហេតុប្រឆាំងនឹងរថយន្តនេះ។ សូមមើលខាងក្រោមសម្រាប់សេចក្ដីលម្អិតកំណត់ពេលវេលា
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},ប្រឆាំងនឹងការផ្គត់ផ្គង់វិក័យប័ត្រ {0} {1} ចុះកាលបរិច្ឆេទ
 DocType: Customer,Default Price List,តារាងតម្លៃលំនាំដើម
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,កំណត់ត្រាចលនាទ្រព្យសកម្ម {0} បង្កើតឡើង
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,អ្នកមិនអាចលុបឆ្នាំសារពើពន្ធ {0} ។ ឆ្នាំសារពើពន្ធ {0} ត្រូវបានកំណត់ជាលំនាំដើមនៅក្នុងការកំណត់សកល
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,អតិថិជនដែលមានឈ្មោះដូចគ្នាមានរួចហើយ
 DocType: Journal Entry,Entry Type,ប្រភេទធាតុ
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,មិនមានផែនការវាយតម្លៃបានភ្ជាប់ជាមួយនឹងក្រុមវាយតម្លៃនេះ
 ,Customer Credit Balance,សមតុល្យឥណទានអតិថិជន
@@ -1811,7 +1844,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,ការកំណត់តម្លៃ
 DocType: Quotation,Term Details,ពត៌មានលំអិតរយៈពេល
 DocType: Project,Total Sales Cost (via Sales Order),សរុបតម្លៃលក់ (តាមរយៈលំដាប់លក់)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,មិនអាចចុះឈ្មោះចូលរៀនច្រើនជាង {0} សិស្សសម្រាប់ក្រុមនិស្សិតនេះ។
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,មិនអាចចុះឈ្មោះចូលរៀនច្រើនជាង {0} សិស្សសម្រាប់ក្រុមនិស្សិតនេះ។
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,អ្នកដឹកនាំការរាប់
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} ត្រូវតែធំជាង 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),ផែនការការកសាងសមត្ថភាពសម្រាប់ (ថ្ងៃ)
@@ -1827,9 +1860,11 @@
 DocType: Lab Test,Technician Name,ឈ្មោះអ្នកបច្ចេកទេស
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ដោះតំណទូទាត់វិក័យប័ត្រនៅលើការលុបចោល
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},បច្ចុប្បន្នប្រដាប់វាស់ចម្ងាយបានចូលអានគួរតែត្រូវបានរថយន្តធំជាងដំបូង {0} ប្រដាប់វាស់ចម្ងាយ
+DocType: Restaurant Reservation,No Show,គ្មានការបង្ហាញ
 DocType: Shipping Rule Country,Shipping Rule Country,វិធានការដឹកជញ្ជូនក្នុងប្រទេស
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,ទុកឱ្យនិងការចូលរួម
 DocType: Maintenance Visit,Partially Completed,បានបញ្ចប់ដោយផ្នែក
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,ភាពប្រែប្រួលកំរិតមធ្យម
 DocType: Leave Type,Include holidays within leaves as leaves,រួមបញ្ចូលថ្ងៃឈប់សម្រាកនៅក្នុងស្លឹកជាស្លឹក
 DocType: Sales Invoice,Packed Items,ធាតុ packed
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,ពាក្យបណ្តឹងប្រឆាំងនឹងលេខសៀរៀលធានា
@@ -1846,13 +1881,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),ចំនួនទឹកប្រាក់ដែលបានបង់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: Purchase Invoice,Additional Discount,បញ្ចុះតំលៃបន្ថែម
 DocType: Selling Settings,Selling Settings,ការលក់ការកំណត់
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,អះអាងសកម្មភាព
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ការដេញថ្លៃលើបណ្តាញ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,សូមបរិមាណឬអត្រាវាយតម្លៃឬទាំងពីរបានបញ្ជាក់
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,ការបំពេញ
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,មើលក្នុងកន្ត្រកទំនិញ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,ចំណាយទីផ្សារ
 ,Item Shortage Report,របាយការណ៍កង្វះធាតុ
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",ទំងន់ត្រូវបានបង្ហាញ \ n សូមនិយាយអំពី &quot;ទម្ងន់ UOM&quot; ពេក
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",ទំងន់ត្រូវបានបង្ហាញ \ n សូមនិយាយអំពី &quot;ទម្ងន់ UOM&quot; ពេក
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,សម្ភារៈស្នើសុំប្រើដើម្បីធ្វើឱ្យផ្សារហ៊ុននេះបានចូល
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,កាលបរិច្ឆេទគឺបន្ទាប់រំលស់ចាំបាច់សម្រាប់ទ្រព្យថ្មី
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,ក្រុមដែលមានមូលដ្ឋាននៅជំនាន់ការពិតណាស់ការដាច់ដោយឡែកសម្រាប់គ្រប់
@@ -1864,18 +1900,18 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ធ្វើឱ្យធាតុគណនេយ្យសម្រាប់គ្រប់ចលនាហ៊ុន
 DocType: Leave Allocation,Total Leaves Allocated,ចំនួនសរុបដែលបានបម្រុងទុកស្លឹក
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},ឃ្លាំងបានទាមទារនៅក្នុងជួរដេកគ្មាន {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,សូមបញ្ចូលឆ្នាំដែលមានសុពលភាពហិរញ្ញវត្ថុកាលបរិច្ឆេទចាប់ផ្ដើមនិងបញ្ចប់
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,សូមបញ្ចូលឆ្នាំដែលមានសុពលភាពហិរញ្ញវត្ថុកាលបរិច្ឆេទចាប់ផ្ដើមនិងបញ្ចប់
 DocType: Employee,Date Of Retirement,កាលបរិច្ឆេទនៃការចូលនិវត្តន៍
 DocType: Upload Attendance,Get Template,ទទួលបានទំព័រគំរូ
 DocType: Material Request,Transferred,ផ្ទេរ
 DocType: Vehicle,Doors,ទ្វារ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ការដំឡើង ERPNext ទាំងស្រុង!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ការដំឡើង ERPNext ទាំងស្រុង!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,ប្រមូលកម្រៃសម្រាប់ការចុះឈ្មោះអ្នកជំងឺ
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,បែកគ្នាពន្ធ
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: មជ្ឈមណ្ឌលតម្លៃត្រូវបានទាមទារសម្រាប់ &#39;ប្រាក់ចំណេញនិងការបាត់បង់&#39; គណនី {2} ។ សូមបង្កើតមជ្ឈមណ្ឌលតម្លៃលំនាំដើមសម្រាប់ក្រុមហ៊ុន។
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +118,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ការគ្រុបអតិថិជនមានឈ្មោះដូចគ្នាសូមផ្លាស់ប្តូរឈ្មោះរបស់អតិថិជនឬប្តូរឈ្មោះក្រុមរបស់អតិថិជន
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +118,A Customer Group exists with same name please change the Customer name or rename the Customer Group,គ្រុបអតិថិជនដែលមានឈ្មោះដូចគ្នាសូមផ្លាស់ប្តូរឈ្មោះរបស់អតិថិជនឬប្តូរឈ្មោះក្រុមរបស់អតិថិជន
 apps/erpnext/erpnext/public/js/templates/contact_list.html +37,New Contact,ទំនាក់ទំនងថ្មី
 DocType: Territory,Parent Territory,ដែនដីមាតាឬបិតា
 DocType: Sales Invoice,Place of Supply,ទីកន្លែងផ្គត់ផ្គង់
@@ -1888,36 +1924,36 @@
 DocType: Employee,AB+,ប់ AB + +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","ប្រសិនបើមានធាតុនេះមានវ៉ារ្យ៉ង់, បន្ទាប់មកវាមិនអាចត្រូវបានជ្រើសនៅក្នុងការបញ្ជាទិញការលក់ល"
 DocType: Lead,Next Contact By,ទំនាក់ទំនងបន្ទាប់ដោយ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},បរិមាណដែលទាមទារសម្រាប់ធាតុ {0} នៅក្នុងជួរដេក {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},បរិមាណដែលទាមទារសម្រាប់ធាតុ {0} នៅក្នុងជួរដេក {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},ឃ្លាំង {0} មិនអាចត្រូវបានលុបជាបរិមាណមានសម្រាប់ធាតុ {1}
 DocType: Quotation,Order Type,ប្រភេទលំដាប់
-DocType: Purchase Invoice,Notification Email Address,សេចក្តីជូនដំណឹងស្តីពីអាសយដ្ឋានអ៊ីម៉ែល
 ,Item-wise Sales Register,ធាតុប្រាជ្ញាលក់ចុះឈ្មោះ
 DocType: Asset,Gross Purchase Amount,ចំនួនទឹកប្រាក់សរុបការទិញ
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,បើកសមតុល្យ
 DocType: Asset,Depreciation Method,វិធីសាស្រ្តរំលស់
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,ក្រៅបណ្តាញ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,ក្រៅបណ្តាញ
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,តើការប្រមូលពន្ធលើនេះបានរួមបញ្ចូលក្នុងអត្រាជាមូលដ្ឋាន?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,គោលដៅសរុប
 DocType: Job Applicant,Applicant for a Job,កម្មវិធីសម្រាប់ការងារ
 DocType: Production Plan Material Request,Production Plan Material Request,ផលិតកម្មសំណើសម្ភារៈផែនការ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,គ្មានការបញ្ជាទិញផលិតផលដែលបានបង្កើត
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,គ្មានការបញ្ជាទិញផលិតផលដែលបានបង្កើត
 DocType: Stock Reconciliation,Reconciliation JSON,ការផ្សះផ្សា JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ជួរឈរច្រើនពេក។ នាំចេញរបាយការណ៍និងបោះពុម្ពដោយប្រើកម្មវិធីសៀវភៅបញ្ជីមួយ។
 DocType: Purchase Invoice Item,Batch No,បាច់គ្មាន
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},សំណើសុំសម្រង់: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,អនុញ្ញាតឱ្យមានការបញ្ជាទិញការលក់ការទិញសណ្តាប់ធ្នាប់ជាច្រើនប្រឆាំងនឹងអតិថិជនរបស់មួយ
 DocType: Student Group Instructor,Student Group Instructor,ក្រុមនិស្សិតគ្រូបង្រៀន
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 ទូរស័ព្ទដៃគ្មាន
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,ដើមចម្បង
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,ដើមចម្បង
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,វ៉ារ្យ៉ង់
 DocType: Naming Series,Set prefix for numbering series on your transactions,កំណត់បុព្វបទសម្រាប់លេខស៊េរីលើប្រតិបតិ្តការរបស់អ្នក
 DocType: Employee Attendance Tool,Employees HTML,និយោជិករបស់ HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Bom លំនាំដើម ({0}) ត្រូវតែសកម្មសម្រាប់ធាតុនេះឬពុម្ពរបស់ខ្លួន
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Bom លំនាំដើម ({0}) ត្រូវតែសកម្មសម្រាប់ធាតុនេះឬពុម្ពរបស់ខ្លួន
 DocType: Employee,Leave Encashed?,ទុកឱ្យ Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ឱកាសក្នុងវាលពីគឺចាំបាច់
 DocType: Email Digest,Annual Expenses,ការចំណាយប្រចាំឆ្នាំ
 DocType: Item,Variants,វ៉ារ្យ៉ង់
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,ធ្វើឱ្យការទិញសណ្តាប់ធ្នាប់
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,ធ្វើឱ្យការទិញសណ្តាប់ធ្នាប់
 DocType: SMS Center,Send To,បញ្ជូនទៅ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},មិនមានតុល្យភាពឈប់សម្រាកឱ្យបានគ្រប់គ្រាន់សម្រាប់ទុកឱ្យប្រភេទ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ទឹកប្រាក់ដែលត្រៀមបម្រុងទុក
@@ -1933,6 +1969,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,ក្រុមនិស្សិតកម្លាំង
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,ប្រឆាំងនឹង Journal Entry {0} មិនមានធាតុមិនផ្គូផ្គងណាមួយ {1}
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,វាយតម្ល្រ
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,ព្រឹត្តិការណ៍បណ្តុះបណ្តាល
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},គ្មានបានចូលស្ទួនសៀរៀលសម្រាប់ធាតុ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,លក្ខខណ្ឌមួយសម្រាប់វិធានការដឹកជញ្ជូនមួយ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,សូមបញ្ចូល
@@ -1942,7 +1979,7 @@
 DocType: Sales Order,To Deliver and Bill,ដើម្បីផ្តល់និង Bill
 DocType: Student Group,Instructors,គ្រូបង្វឹក
 DocType: GL Entry,Credit Amount in Account Currency,ចំនួនឥណទានរូបិយប័ណ្ណគណនី
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,Bom {0} ត្រូវតែត្រូវបានដាក់ជូន
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,Bom {0} ត្រូវតែត្រូវបានដាក់ជូន
 DocType: Authorization Control,Authorization Control,ការត្រួតពិនិត្យសេចក្តីអនុញ្ញាត
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ជួរដេក # {0}: ឃ្លាំងគឺជាការចាំបាច់បានច្រានចោលការប្រឆាំងនឹងធាតុច្រានចោល {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,ការទូទាត់
@@ -1961,11 +1998,11 @@
 DocType: Quotation Item,Actual Qty,ជាក់ស្តែ Qty
 DocType: Sales Invoice Item,References,ឯកសារយោង
 DocType: Quality Inspection Reading,Reading 10,ការអាន 10
-DocType: Hub Settings,Hub Node,ហាប់ថ្នាំង
+DocType: Hub Category,Hub Node,ហាប់ថ្នាំង
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,អ្នកបានបញ្ចូលធាតុស្ទួន។ សូមកែតម្រូវនិងព្យាយាមម្ដងទៀត។
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,រង
 DocType: Asset Movement,Asset Movement,ចលនាទ្រព្យសម្បត្តិ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,រទេះថ្មី
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,រទេះថ្មី
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,ធាតុ {0} គឺមិនមែនជាធាតុសៀរៀល
 DocType: SMS Center,Create Receiver List,បង្កើតបញ្ជីអ្នកទទួល
 DocType: Vehicle,Wheels,កង់
@@ -1979,15 +2016,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,ទូរគមនាគមន៍
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),បង្ហាញថាកញ្ចប់នេះគឺជាផ្នែកមួយនៃរឿងនេះការចែកចាយ (មានតែសេចក្តីព្រាង)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,ធ្វើឱ្យធាតុទូទាត់ប្រាក់
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},បរិមាណដែលត្រូវទទួលទានសម្រាប់ធាតុ {0} ត្រូវតិចជាង {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},បរិមាណដែលត្រូវទទួលទានសម្រាប់ធាតុ {0} ត្រូវតិចជាង {1}
 ,Sales Invoice Trends,ការលក់វិក័យប័ត្រនិន្នាការ
 DocType: Leave Application,Apply / Approve Leaves,អនុវត្ត / អនុម័តស្លឹក
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,ចំពោះ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,ចំពោះ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',អាចយោងជួរដេកតែប្រសិនបើប្រភេទបន្ទុកគឺ &quot;នៅលើចំនួនទឹកប្រាក់ជួរដេកមុន&quot; ឬ &quot;មុនជួរដេកសរុប
 DocType: Sales Order Item,Delivery Warehouse,ឃ្លាំងដឹកជញ្ជូន
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,មែកធាងនៃមជ្ឈមណ្ឌលការចំណាយហិរញ្ញវត្ថុ។
 DocType: Serial No,Delivery Document No,ចែកចាយឯកសារមិនមាន
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},សូមកំណត់ &#39;គណនី / ចំណេញនៅលើបោះចោលបាត់បង់ទ្រព្យសកម្ម &quot;ក្នុងក្រុមហ៊ុន {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},សូមកំណត់ &#39;គណនី / ចំណេញនៅលើបោះចោលបាត់បង់ទ្រព្យសកម្ម &quot;ក្នុងក្រុមហ៊ុន {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,ទទួលបានធាតុពីបង្កាន់ដៃទិញ
 DocType: Serial No,Creation Date,កាលបរិច្ឆេទបង្កើត
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},ធាតុ {0} លេចឡើងជាច្រើនដងនៅក្នុងបញ្ជីតម្លៃ {1}
@@ -1998,11 +2035,12 @@
 DocType: Student,Student Mobile Number,លេខទូរស័ព្ទរបស់សិស្ស
 DocType: Item,Has Variants,មានវ៉ារ្យ៉ង់
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,ធ្វើបច្ចុប្បន្នភាពចម្លើយ
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},អ្នកបានជ្រើសរួចហើយចេញពីធាតុ {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},អ្នកបានជ្រើសរួចហើយចេញពីធាតុ {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ឈ្មោះរបស់ចែកចាយប្រចាំខែ
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,លេខសម្គាល់បាច់ជាការចាំបាច់
 DocType: Sales Person,Parent Sales Person,ឪពុកម្តាយរបស់បុគ្គលលក់
-DocType: Purchase Invoice,Recurring Invoice,វិក័យប័ត្រកើតឡើង
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,ខ្ពស់ទៅទាប
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,ជ្រើសកម្មវិធីដំបូង
 DocType: Patient Appointment,Patient Age,អាយុអ្នកជម្ងឺ
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,ការគ្រប់គ្រងគម្រោង
 DocType: Supplier,Supplier of Goods or Services.,ក្រុមហ៊ុនផ្គត់ផ្គង់ទំនិញឬសេវា។
@@ -2010,8 +2048,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,គណនីដែលទទួលបានលំនាំដើមត្រូវបានប្រើប្រសិនបើមិនបានកំណត់ក្នុងជម្ងឺដើម្បីកក់ថ្លៃពិគ្រោះយោបល់។
 DocType: Vehicle Log,Fuel Price,តម្លៃប្រេងឥន្ធនៈ
 DocType: Budget,Budget,ថវិការ
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,កំណត់បើក
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,ធាតុទ្រព្យសកម្មថេរត្រូវតែជាធាតុដែលមិនមែនជាភាគហ៊ុន។
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,កំណត់បើក
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,ធាតុទ្រព្យសកម្មថេរត្រូវតែជាធាតុដែលមិនមែនជាភាគហ៊ុន។
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","ថវិកាដែលមិនអាចត្រូវបានផ្ដល់ប្រឆាំងនឹង {0}, ដែលជាវាមិនមែនជាគណនីដែលមានប្រាក់ចំណូលឬការចំណាយ"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,សម្រេចបាន
 DocType: Student Admission,Application Form Route,ពាក្យស្នើសុំផ្លូវ
@@ -2025,12 +2063,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,ធាតុ {0} មិនត្រូវបានដំឡើងសម្រាប់ការសៀរៀល Nos ។ សូមពិនិត្យមើលមេធាតុ
 DocType: Maintenance Visit,Maintenance Time,ថែទាំម៉ោង
 ,Amount to Deliver,ចំនួនទឹកប្រាក់ដែលផ្តល់
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},ធាតុដូចគ្នាត្រូវបានបញ្ចូលច្រើនដង។ {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,រយៈពេលកាលបរិច្ឆេទចាប់ផ្ដើមមិនអាចមានមុនជាងឆ្នាំចាប់ផ្ដើមកាលបរិច្ឆេទនៃឆ្នាំសិក្សាដែលរយៈពេលនេះត្រូវបានតភ្ជាប់ (អប់រំឆ្នាំ {}) ។ សូមកែកាលបរិច្ឆេទនិងព្យាយាមម្ដងទៀត។
 DocType: Guardian,Guardian Interests,ចំណាប់អារម្មណ៍របស់កាសែត The Guardian
 DocType: Naming Series,Current Value,តម្លៃបច្ចុប្បន្ន
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ឆ្នាំសារពើពន្ធច្រើនមានសម្រាប់កាលបរិច្ឆេទ {0} ។ សូមកំណត់ក្រុមហ៊ុននៅក្នុងឆ្នាំសារពើពន្ធ
 DocType: School Settings,Instructor Records to be created by,កំណត់ត្រាគ្រូបង្រៀនត្រូវបង្កើតដោយ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} បង្កើតឡើង
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} បង្កើតឡើង
 DocType: Delivery Note Item,Against Sales Order,ប្រឆាំងនឹងដីកាលក់
 ,Serial No Status,ស្ថានភាពគ្មានសៀរៀល
 DocType: Payment Entry Reference,Outstanding,ឆ្នើម
@@ -2040,10 +2079,10 @@
 						must be greater than or equal to {2}","ជួរដេក {0}: ដើម្បីកំណត់ {1} រយៈពេល, ភាពខុសគ្នារវាងពីនិងដើម្បីកាលបរិច្ឆេទ \ ត្រូវតែធំជាងឬស្មើទៅនឹង {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,នេះត្រូវបានផ្អែកលើចលនាភាគហ៊ុន។ សូមមើល {0} សម្រាប់សេចក្តីលម្អិត
 DocType: Pricing Rule,Selling,លក់
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},ចំនួនទឹកប្រាក់ {0} {1} បានកាត់ប្រឆាំងនឹង {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},ចំនួនទឹកប្រាក់ {0} {1} បានកាត់ប្រឆាំងនឹង {2}
 DocType: Employee,Salary Information,ពត៌មានប្រាក់បៀវត្ស
 DocType: Sales Person,Name and Employee ID,ឈ្មោះនិងលេខសម្គាល់របស់និយោជិត
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,កាលបរិច្ឆេទដោយសារតែមិនអាចមានមុនពេលការប្រកាសកាលបរិច្ឆេទ
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,កាលបរិច្ឆេទដោយសារតែមិនអាចមានមុនពេលការប្រកាសកាលបរិច្ឆេទ
 DocType: Website Item Group,Website Item Group,វេបសាយធាតុគ្រុប
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,ភារកិច្ចនិងពន្ធ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,សូមបញ្ចូលកាលបរិច្ឆេទយោង
@@ -2069,7 +2108,7 @@
 DocType: Issue,Resolution Details,ពត៌មានលំអិតការដោះស្រាយ
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,តុល្យភាព
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,លក្ខណៈវិនិច្ឆ័យក្នុងការទទួលយក
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,សូមបញ្ចូលសំណើសម្ភារៈនៅក្នុងតារាងខាងលើ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,សូមបញ្ចូលសំណើសម្ភារៈនៅក្នុងតារាងខាងលើ
 DocType: Item Attribute,Attribute Name,ឈ្មោះគុណលក្ខណៈ
 DocType: BOM,Show In Website,បង្ហាញនៅក្នុងវេបសាយ
 DocType: Shopping Cart Settings,Show Quantity in Website,បង្ហាញបរិមាណនៅលើគេហទំព័រ
@@ -2078,7 +2117,7 @@
 DocType: Item Reorder,Check in (group),សូមពិនិត្យមើលនៅក្នុង (ក្រុម)
 ,Qty to Order,qty ម៉ង់ទិញ
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked",ប្រធានគណនីដែលស្ថិតក្រោមការទទួលខុសត្រូវឬមូលប័ត្រដែលក្នុងនោះប្រាក់ចំណេញ / បាត់បង់នឹងត្រូវបានកក់
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,គំនូសតាង Gantt ភារកិច្ចទាំងអស់។
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,គំនូសតាង Gantt ភារកិច្ចទាំងអស់។
 DocType: Opportunity,Mins to First Response,នាទីដើម្បីឆ្លើយតបដំបូង
 DocType: Pricing Rule,Margin Type,ប្រភេទរឹម
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} ម៉ោង
@@ -2099,35 +2138,35 @@
 DocType: Patient,Surgical History,ប្រវត្តិវះកាត់
 DocType: Employee,Resignation Letter Date,កាលបរិច្ឆេទលិខិតលាលែងពីតំណែង
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,ក្បួនកំណត់តម្លៃត្រូវបានត្រងបន្ថែមទៀតដោយផ្អែកលើបរិមាណ។
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},សូមកំណត់កាលបរិច្ឆេទនៃការចូលរួមសម្រាប់បុគ្គលិកដែលបាន {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},សូមកំណត់កាលបរិច្ឆេទនៃការចូលរួមសម្រាប់បុគ្គលិកដែលបាន {0}
 DocType: Task,Total Billing Amount (via Time Sheet),ចំនួនវិក័យប័ត្រសរុប (តាមរយៈសន្លឹកម៉ោង)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ប្រាក់ចំណូលគយបានធ្វើម្តងទៀត
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ត្រូវតែមានតួនាទីជា &quot;អ្នកអនុម័តការចំណាយ&quot;
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,គូ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,ជ្រើស Bom និង Qty សម្រាប់ផលិតកម្ម
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,ជ្រើស Bom និង Qty សម្រាប់ផលិតកម្ម
 DocType: Asset,Depreciation Schedule,កាលវិភាគរំលស់
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,អាសយដ្ឋានដៃគូលក់និងទំនាក់ទំនង
 DocType: Bank Reconciliation Detail,Against Account,ប្រឆាំងនឹងគណនី
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,ថ្ងៃពាក់កណ្តាលកាលបរិច្ឆេទគួរត្រូវបានរវាងពីកាលបរិច្ឆេទនិងដើម្បីកាលបរិច្ឆេទ
 DocType: Maintenance Schedule Detail,Actual Date,ជាក់ស្តែងកាលបរិច្ឆេទ
 DocType: Item,Has Batch No,មានបាច់គ្មាន
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},វិក័យប័ត្រប្រចាំឆ្នាំ: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},វិក័យប័ត្រប្រចាំឆ្នាំ: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),ពន្ធទំនិញនិងសេវា (ជីអេសធីឥណ្ឌា)
 DocType: Delivery Note,Excise Page Number,រដ្ឋាករលេខទំព័រ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory",ក្រុមហ៊ុនមកពីកាលបរិច្ឆេទនិងដើម្បីកាលបរិច្ឆេទគឺជាការចាំបាច់
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,ទទួលបានពីការពិគ្រោះយោបល់
 DocType: Asset,Purchase Date,ទិញកាលបរិច្ឆេទ
 DocType: Employee,Personal Details,ពត៌មានលំអិតផ្ទាល់ខ្លួន
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},សូមកំណត់ &#39;ទ្រព្យសម្បត្តិមជ្ឈមណ្ឌលតម្លៃរំលស់ &quot;នៅក្នុងក្រុមហ៊ុន {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},សូមកំណត់ &#39;ទ្រព្យសម្បត្តិមជ្ឈមណ្ឌលតម្លៃរំលស់ &quot;នៅក្នុងក្រុមហ៊ុន {0}
 ,Maintenance Schedules,កាលវិភាគថែរក្សា
 DocType: Task,Actual End Date (via Time Sheet),បញ្ចប់ពិតប្រាកដកាលបរិច្ឆេទ (តាមរយៈសន្លឹកម៉ោង)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},ចំនួនទឹកប្រាក់ {0} {1} ប្រឆាំងនឹង {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},ចំនួនទឹកប្រាក់ {0} {1} ប្រឆាំងនឹង {2} {3}
 ,Quotation Trends,សម្រង់និន្នាការ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},ធាតុគ្រុបមិនបានរៀបរាប់នៅក្នុងមេធាតុសម្រាប់ធាតុ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,ឥណពន្ធវីសាទៅគណនីត្រូវតែជាគណនីដែលទទួល
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,ឥណពន្ធវីសាទៅគណនីត្រូវតែជាគណនីដែលទទួល
 DocType: Shipping Rule Condition,Shipping Amount,ចំនួនទឹកប្រាក់ការដឹកជញ្ជូន
 DocType: Supplier Scorecard Period,Period Score,កំឡុងពេលកំណត់
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,បន្ថែមអតិថិជន
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,បន្ថែមអតិថិជន
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,ចំនួនទឹកប្រាក់ដែលមិនទាន់សម្រេច
 DocType: Lab Test Template,Special,ពិសេស
 DocType: Purchase Invoice Item,Conversion Factor,ការប្រែចិត្តជឿកត្តា
@@ -2135,13 +2174,14 @@
 ,Vehicle Expenses,ចំណាយយានយន្ត
 DocType: Serial No,Invoice Details,សេចក្ដីលម្អិតវិក័យប័ត្រ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},តម្លៃដែលរំពឹងទុកបន្ទាប់ពីជីវិតដែលមានប្រយោជន៍ត្រូវតែធំជាងឬស្មើទៅនឹង {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,ចាប់ផ្ដើម
+DocType: Hub Category,Hub Category,ប្រភេទ Hub
 DocType: Purchase Invoice,SEZ,តំបន់សេដ្ឋកិច្ចពិសេស
 DocType: Purchase Receipt,Vehicle Number,ចំនួនរថយន្ត
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,ថ្ងៃដែលនឹងត្រូវកើតឡើងវិក្កយបត្របញ្ឈប់ការ
 DocType: Employee Loan,Loan Amount,ចំនួនប្រាក់កម្ចី
 DocType: Program Enrollment,Self-Driving Vehicle,រថយន្តបើកបរដោយខ្លួនឯង
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,សន្លឹកបៀអ្នកផ្គត់ផ្គង់អចិន្ត្រៃយ៍
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},ជួរដេក {0}: លោក Bill នៃសម្ភារៈមិនបានរកឃើញសម្រាប់ធាតុ {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},ជួរដេក {0}: លោក Bill នៃសម្ភារៈមិនបានរកឃើញសម្រាប់ធាតុ {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,ចំនួនសរុបដែលបានបម្រុងទុកស្លឹក {0} មិនអាចតិចជាងស្លឹកត្រូវបានអនុម័តរួចទៅហើយ {1} សម្រាប់រយៈពេលនេះ
 DocType: Journal Entry,Accounts Receivable,គណនីអ្នកទទួល
 ,Supplier-Wise Sales Analytics,ក្រុមហ៊ុនផ្គត់ផ្គង់ប្រាជ្ញាលក់វិភាគ
@@ -2152,7 +2192,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)",វគ្គសិក្សាមាតាបិតា (ទុកវាទទេប្រសិនបើនេះមិនមែនជាផ្នែកមួយនៃឪពុកម្តាយវគ្គសិក្សា)
 DocType: Leave Control Panel,Leave blank if considered for all employee types,ប្រសិនបើអ្នកទុកវាឱ្យទទេអស់ទាំងប្រភេទពិចារណាសម្រាប់បុគ្គលិក
 DocType: Landed Cost Voucher,Distribute Charges Based On,ដោយផ្អែកលើការចែកចាយការចោទប្រកាន់
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,ការកំណត់ធនធានមនុស្ស
 DocType: Salary Slip,net pay info,info ប្រាក់ខែសុទ្ធ
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,តម្លៃនេះត្រូវបានធ្វើបច្ចុប្បន្នភាពនៅក្នុងបញ្ជីតម្លៃលក់លំនាំដើម។
@@ -2163,7 +2203,7 @@
 DocType: Patient,B Positive,B វិជ្ជមាន
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ជួរដេក # {0}: Qty ត្រូវតែ 1, ជាធាតុជាទ្រព្យសកម្មថេរ។ សូមប្រើជួរដាច់ដោយឡែកសម្រាប់ qty ច្រើន។"
 DocType: Leave Block List Allow,Leave Block List Allow,បញ្ជីប្លុកអនុញ្ញាតឱ្យចាកចេញពី
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr មិនអាចមាននៅទទេឬទំហំ
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr មិនអាចមាននៅទទេឬទំហំ
 DocType: Patient Medical Record,Patient Medical Record,កំណត់ត្រាវេជ្ជសាស្រ្តរបស់អ្នកជម្ងឺ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,ជាក្រុមការមិនគ្រុប
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,កីឡា
@@ -2179,9 +2219,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,មិនអាចរកឃើញអត្រាប្តូរប្រាក់សម្រាប់ {0} ទៅ {1} សម្រាប់កាលបរិច្ឆេទគន្លឹះ {2} ។ សូមបង្កើតកំណត់ត្រាប្តូររូបិយប័ណ្ណដោយដៃ
 DocType: POS Profile,Price List,តារាងតម្លៃ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ឥឡូវនេះជាលំនាំដើមឆ្នាំសារពើពន្ធនេះ។ សូមធ្វើឱ្យកម្មវិធីរុករករបស់អ្នកសម្រាប់ការផ្លាស់ប្តូរមានប្រសិទ្ធិភាព។
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,ប្តឹងទាមទារសំណងលើការចំណាយ
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,ប្តឹងទាមទារសំណងលើការចំណាយ
 DocType: Issue,Support,ការគាំទ្រ
 ,BOM Search,ស្វែងរក Bom
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",បោះពុម្ព &quot;នៅក្នុងស្តុក&quot; ឬ &quot;មិននៅក្នុងស្តុក&quot; នៅលើ Hub ដោយផ្អែកលើស្តុកដែលមាននៅក្នុងឃ្លាំងនេះ។
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),បិទ (បើក + + សរុប)
 DocType: Vehicle,Fuel Type,ប្រភេទប្រេងឥន្ធនៈ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,សូមបញ្ជាក់រូបិយប័ណ្ណនៅក្នុងក្រុមហ៊ុន
@@ -2193,16 +2234,16 @@
 DocType: Healthcare Settings,Remind Before,រំឭកពីមុន
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},កត្តាប្រែចិត្តជឿ UOM គឺត្រូវបានទាមទារនៅក្នុងជួរដេក {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ជួរដេក # {0}: យោងប្រភេទឯកសារត្រូវតែជាផ្នែកមួយនៃដីកាលក់, ការលក់វិក័យប័ត្រឬធាតុទិនានុប្បវត្តិ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ជួរដេក # {0}: យោងប្រភេទឯកសារត្រូវតែជាផ្នែកមួយនៃដីកាលក់, ការលក់វិក័យប័ត្រឬធាតុទិនានុប្បវត្តិ"
 DocType: Salary Component,Deduction,ការដក
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,ជួរដេក {0}: ពីពេលវេលានិងទៅពេលវេលាគឺជាការចាំបាច់។
 DocType: Stock Reconciliation Item,Amount Difference,ភាពខុសគ្នាចំនួនទឹកប្រាក់
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},ថ្លៃទំនិញបានបន្ថែមសម្រាប់ {0} នៅក្នុងបញ្ជីតម្លៃ {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},ថ្លៃទំនិញបានបន្ថែមសម្រាប់ {0} នៅក្នុងបញ្ជីតម្លៃ {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,សូមបញ្ចូលនិយោជិតលេខសម្គាល់នេះបុគ្គលការលក់
 DocType: Territory,Classification of Customers by region,ចំណាត់ថ្នាក់នៃអតិថិជនដោយតំបន់
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,ចំនួនទឹកប្រាក់ផ្សេងគ្នាត្រូវតែសូន្យ
 DocType: Project,Gross Margin,ប្រាក់ចំណេញដុល
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,សូមបញ្ចូលធាតុដំបូងផលិតកម្ម
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,សូមបញ្ចូលធាតុដំបូងផលិតកម្ម
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,សេចក្តីថ្លែងការណ៍របស់ធនាគារគណនាតុល្យភាព
 DocType: Normal Test Template,Normal Test Template,គំរូសាកល្បងធម្មតា
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,អ្នកប្រើដែលបានបិទ
@@ -2212,21 +2253,22 @@
 DocType: Salary Slip,Total Deduction,ការកាត់សរុប
 ,Production Analytics,វិភាគផលិតកម្ម
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,នេះគឺផ្អែកលើប្រតិបត្តិការប្រឆាំងនឹងអ្នកជម្ងឺនេះ។ សូមមើលតារាងពេលវេលាខាងក្រោមសម្រាប់ព័ត៌មានលំអិត
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,ការចំណាយបន្ទាន់សម័យ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,ការចំណាយបន្ទាន់សម័យ
 DocType: Employee,Date of Birth,ថ្ងៃខែឆ្នាំកំណើត
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,ធាតុ {0} ត្រូវបានត្រឡប់មកវិញរួចហើយ
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ឆ្នាំសារពើពន្ធឆ្នាំ ** តំណាងឱ្យហិរញ្ញវត្ថុ។ ការបញ្ចូលគណនីទាំងអស់និងប្រតិបត្តិការដ៏ធំមួយផ្សេងទៀតត្រូវបានតាមដានការប្រឆាំងនឹងឆ្នាំសារពើពន្ធ ** ** ។
 DocType: Opportunity,Customer / Lead Address,អតិថិជន / អ្នកដឹកនាំការអាសយដ្ឋាន
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,ការដំឡើងកញ្ចប់ពិន្ទុនៃក្រុមហ៊ុនផ្គត់ផ្គង់
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},ព្រមាន: វិញ្ញាបនបត្រ SSL មិនត្រឹមត្រូវលើឯកសារភ្ជាប់ {0}
-DocType: Student Admission,Eligibility,សិទ្ធិទទួលបាន
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,ឈ្មោះផែនការវាយតម្លៃ
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},ព្រមាន: វិញ្ញាបនបត្រ SSL មិនត្រឹមត្រូវលើឯកសារភ្ជាប់ {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads",ការនាំមុខជួយឱ្យអ្នកទទួលអាជីវកម្មការបន្ថែមទំនាក់ទំនងរបស់អ្នកទាំងអស់និងច្រើនទៀតតម្រុយរបស់អ្នក
 DocType: Production Order Operation,Actual Operation Time,ប្រតិបត្ដិការពេលវេលាពិតប្រាកដ
 DocType: Authorization Rule,Applicable To (User),ដែលអាចអនុវត្តទៅ (អ្នកប្រើប្រាស់)
 DocType: Purchase Taxes and Charges,Deduct,កាត់
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,ការពិពណ៌នាការងារ
 DocType: Student Applicant,Applied,អនុវត្ត
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,បើកឡើងវិញ
 DocType: Sales Invoice Item,Qty as per Stock UOM,qty ដូចជាក្នុងមួយហ៊ុន UOM
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,ឈ្មោះ Guardian2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","តួអក្សរពិសេសលើកលែងតែ &quot;-&quot;, &quot;#&quot;, &quot;&quot; ។ និង &quot;/&quot; មិនត្រូវបានអនុញ្ញាតក្នុងការដាក់ឈ្មោះរបស់ស៊េរី"
@@ -2238,7 +2280,7 @@
 DocType: Request for Quotation,Manufacturing Manager,កម្មវិធីគ្រប់គ្រងកម្មន្តសាល
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},សៀរៀល {0} គ្មានរីករាយជាមួយនឹងស្ថិតនៅក្រោមការធានា {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,ចំណាំដឹកជញ្ជូនពុះចូលទៅក្នុងកញ្ចប់។
-apps/erpnext/erpnext/hooks.py +98,Shipments,ការនាំចេញ
+apps/erpnext/erpnext/hooks.py +107,Shipments,ការនាំចេញ
 DocType: Payment Entry,Total Allocated Amount (Company Currency),ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកសរុប (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: Purchase Order Item,To be delivered to customer,ត្រូវបានបញ្ជូនទៅកាន់អតិថិជន
 DocType: BOM,Scrap Material Cost,តម្លៃសំណល់អេតចាយសម្ភារៈ
@@ -2252,7 +2294,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ការចំណាយឬគណនីភាពខុសគ្នាគឺជាការចាំបាច់សម្រាប់ធាតុ {0} វាជាការរួមភាគហ៊ុនតម្លៃផលប៉ះពាល់
 DocType: Payment Request,PR,ការិយាល័យទទួលជំនួយផ្ទាល់
 DocType: Cheque Print Template,Bank Name,ឈ្មោះធនាគារ
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +29,-Above,-Above
+apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +29,-Above,-ខាងលើ
 DocType: Employee Loan,Employee Loan Account,គណនីឥណទានបុគ្គលិក
 DocType: Leave Application,Total Leave Days,សរុបថ្ងៃស្លឹក
 DocType: Email Digest,Note: Email will not be sent to disabled users,ចំណាំ: អ៊ីម៉ែលនឹងមិនត្រូវបានផ្ញើទៅកាន់អ្នកប្រើជនពិការ
@@ -2260,8 +2302,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,ធាតុវ៉ារ្យ៉ង់ធាតុ
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,ជ្រើសក្រុមហ៊ុន ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,ប្រសិនបើអ្នកទុកវាឱ្យទទេទាំងអស់ពិចារណាសម្រាប់នាយកដ្ឋាន
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",ប្រភេទការងារ (អចិន្ត្រយ៍កិច្ចសន្យាហាត់ជាដើម) ។
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} គឺជាការចាំបាច់សម្រាប់ធាតុ {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).",ប្រភេទការងារ (អចិន្ត្រយ៍កិច្ចសន្យាហាត់ជាដើម) ។
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} គឺជាការចាំបាច់សម្រាប់ធាតុ {1}
 DocType: Process Payroll,Fortnightly,ពីរសប្តាហ៍
 DocType: Currency Exchange,From Currency,ចាប់ពីរូបិយប័ណ្ណ
 DocType: Vital Signs,Weight (In Kilogram),ទំងន់ (ក្នុងគីឡូក្រាម)
@@ -2285,7 +2327,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,សូមចុចលើ &#39;បង្កើតកាលវិភាគ&#39; ដើម្បីទទួលបាននូវកាលវិភាគ
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,មានកំហុសខណៈពេលលុបកាលវិភាគដូចខាងក្រោមមាន:
 DocType: Bin,Ordered Quantity,បរិមាណដែលត្រូវបានបញ្ជាឱ្យ
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",ឧទាហរណ៏ &quot;ឧបករណ៍សម្រាប់អ្នកសាងសង់ស្ថាបនា&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",ឧទាហរណ៏ &quot;ឧបករណ៍សម្រាប់អ្នកសាងសង់ស្ថាបនា&quot;
 DocType: Grading Scale,Grading Scale Intervals,ចន្លោះពេលការដាក់ពិន្ទុធ្វើមាត្រដ្ឋាន
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: ធាតុគណនេយ្យសម្រាប់ {2} អាចត្រូវបានធ្វើតែនៅក្នុងរូបិយប័ណ្ណ: {3}
 DocType: Production Order,In Process,ក្នុងដំណើរការ
@@ -2308,11 +2350,10 @@
 DocType: Purchase Invoice,With Payment of Tax,ជាមួយការទូទាត់ពន្ធ
 DocType: Expense Claim Detail,Expense Claim Detail,ពត៌មានលំអិតពាក្យបណ្តឹងលើការចំណាយ
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,ចំនួនបីសម្រាប់ការផ្គត់ផ្គង់
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,សូមជ្រើសរើសគណនីដែលត្រឹមត្រូវ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,សូមជ្រើសរើសគណនីដែលត្រឹមត្រូវ
 DocType: Item,Weight UOM,ទំងន់ UOM
 DocType: Salary Structure Employee,Salary Structure Employee,និយោជិតបានប្រាក់ខែរចនាសម្ព័ន្ធ
 DocType: Patient,Blood Group,ក្រុមឈាម
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,ឡុងេពល
 DocType: Course,Course Name,ឈ្មោះវគ្គសិក្សាបាន
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,អ្នកប្រើដែលអាចអនុម័តកម្មវិធីដែលបានឈប់សម្រាកជាក់លាក់របស់បុគ្គលិក
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,សម្ភារៈការិយាល័យ
@@ -2331,17 +2372,18 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,តម្លៃនេះនឹងមិនត្រូវបានបង្ហាញទេប្រសិនបើបញ្ជីតម្លៃគឺមិនត្រូវបានកំណត់
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,សូមបញ្ជាក់ជាប្រទេសមួយសម្រាប់វិធានការដឹកជញ្ជូននេះឬពិនិត្យមើលការដឹកជញ្ជូននៅទូទាំងពិភពលោក
 DocType: Stock Entry,Total Incoming Value,តម្លៃចូលសរុប
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,ឥណពន្ធវីសាដើម្បីត្រូវបានទាមទារ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,ឥណពន្ធវីសាដើម្បីត្រូវបានទាមទារ
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",Timesheets ជួយរក្សាដាននៃពេលវេលាការចំណាយនិងវិក័យប័ត្រសំរាប់ការសកម្មភាពដែលបានធ្វើដោយក្រុមរបស់អ្នក
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,បញ្ជីតម្លៃទិញ
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,គំរូនៃអថេរពិន្ទុនៃក្រុមហ៊ុនផ្គត់ផ្គង់។
 DocType: Offer Letter Term,Offer Term,ផ្តល់ជូននូវរយៈពេល
 DocType: Quality Inspection,Quality Manager,គ្រប់គ្រងគុណភាព
-DocType: Job Applicant,Job Opening,ពិធីបើកការងារ
+DocType: Job Applicant,Job Opening,បើកការងារ
 DocType: Payment Reconciliation,Payment Reconciliation,ការផ្សះផ្សាការទូទាត់
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,សូមជ្រើសឈ្មោះ Incharge បុគ្គលរបស់
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,បច្ចេកវិទ្យា
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},សរុបគ្មានប្រាក់ខែ: {0}
+DocType: Hub Settings,Unregister from Hub,មិនចុះឈ្មោះពី Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},សរុបគ្មានប្រាក់ខែ: {0}
 DocType: BOM Website Operation,BOM Website Operation,Bom គេហទំព័រប្រតិបត្តិការ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,ផ្តល់ជូននូវលិខិត
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,បង្កើតសម្ភារៈសំណើរ (MRP) និងការបញ្ជាទិញផលិតផល។
@@ -2353,7 +2395,9 @@
 DocType: Physician Schedule Time Slot,To Time,ទៅពេល
 DocType: Authorization Rule,Approving Role (above authorized value),ការអនុម័តតួនាទី (ខាងលើតម្លៃដែលបានអនុញ្ញាត)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,ឥណទានទៅគណនីត្រូវតែជាគណនីទូទាត់មួយ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},ការហៅខ្លួនឯង Bom: {0} មិនអាចជាឪពុកម្តាយឬកូនរបស់ {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,សូមជ្រើសរើសការចូលរៀនរបស់និស្សិតដែលចាំបាច់សម្រាប់អ្នកដាក់ពាក្យសុំដែលបានបង់ថ្លៃសិក្សា
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},ការហៅខ្លួនឯង Bom: {0} មិនអាចជាឪពុកម្តាយឬកូនរបស់ {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,សូមជ្រើសរើសបញ្ជីតំលៃដើម្បីបោះពុម្ពផ្សាយតម្លៃ
 DocType: Production Order Operation,Completed Qty,Qty បានបញ្ចប់
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",{0} មានតែគណនីឥណពន្ធអាចត្រូវបានតភ្ជាប់ប្រឆាំងនឹងធាតុឥណទានផ្សេងទៀត
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,បញ្ជីតម្លៃ {0} ត្រូវបានបិទ
@@ -2365,38 +2409,39 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} លេខសៀរៀលដែលបានទាមទារសម្រាប់ធាតុ {1} ។ អ្នកបានផ្ដល់ {2} ។
 DocType: Stock Reconciliation Item,Current Valuation Rate,អត្រាវាយតម្លៃនាពេលបច្ចុប្បន្ន
 DocType: Item,Customer Item Codes,កូដធាតុអតិថិជន
+DocType: Training Event,Advance,បន្ត
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,សម្រាប់ការធ្វើឡើងវិញជាថ្មីម្តងទៀត។
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,អត្រាប្តូរប្រាក់ចំណេញ / បាត់បង់
 DocType: Opportunity,Lost Reason,បាត់បង់មូលហេតុ
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,អាសយដ្ឋានថ្មី
 DocType: Quality Inspection,Sample Size,ទំហំគំរូ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,សូមបញ្ចូលឯកសារបង្កាន់ដៃ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,ធាតុទាំងអស់ត្រូវបាន invoiced រួចទៅហើយ
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',សូមបញ្ជាក់ត្រឹមត្រូវមួយ &quot;ពីសំណុំរឿងលេខ&quot;
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',សូមបញ្ជាក់ត្រឹមត្រូវមួយ &quot;ពីសំណុំរឿងលេខ&quot;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,មជ្ឈមណ្ឌលការចំណាយបន្ថែមទៀតអាចត្រូវបានធ្វើឡើងនៅក្រោមការក្រុមនោះទេប៉ុន្តែធាតុដែលអាចត្រូវបានធ្វើប្រឆាំងនឹងការដែលមិនមែនជាក្រុម
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,អ្នកប្រើនិងសិទ្ធិ
 DocType: Vehicle Log,VLOG.,Vlogging ។
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},ការបញ្ជាទិញផលិតកម្មបានបង្កើត: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},ការបញ្ជាទិញផលិតកម្មបានបង្កើត: {0}
 DocType: Branch,Branch,សាខា
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ការបោះពុម្ពនិងម៉ាក
 DocType: Company,Total Monthly Sales,ការលក់សរុបប្រចាំខែ
 DocType: Bin,Actual Quantity,បរិមាណដែលត្រូវទទួលទានពិតប្រាកដ
 DocType: Shipping Rule,example: Next Day Shipping,ឧទាហរណ៍: ថ្ងៃបន្ទាប់ការដឹកជញ្ជូន
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,គ្មានសៀរៀល {0} មិនបានរកឃើញ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},ការជាវត្រូវបាន {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},ការជាវត្រូវបាន {0}
 DocType: Fee Schedule Program,Fee Schedule Program,កម្មវិធីកាលវិភាគថ្លៃ
 DocType: Fee Schedule Program,Student Batch,បាច់សិស្ស
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,ជ្រើស * ពី `ស្លាកសញ្ញា &#39;ជាកន្លែងដែលអ្នកជំងឺ =&#39; {0} &#39;លំដាប់ដោយសញ្ញាកំណត់ 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,ធ្វើឱ្យសិស្ស
 DocType: Supplier Scorecard Scoring Standing,Min Grade,ថ្នាក់ក្រោម
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},អ្នកបានត្រូវអញ្ជើញដើម្បីសហការគ្នាលើគម្រោងនេះ: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},គ្រូពេទ្យមិនមាននៅលើ {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},អ្នកបានត្រូវអញ្ជើញដើម្បីសហការគ្នាលើគម្រោងនេះ: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},គ្រូពេទ្យមិនមាននៅលើ {0}
 DocType: Leave Block List Date,Block Date,ប្លុកកាលបរិច្ឆេទ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},បន្ថែមអត្តសញ្ញាណវុ្ថតិលេខនៃការជាវប្រចាំនៅក្នុងវិទ្យាស្ថាន {0}
 DocType: Purchase Receipt,Supplier Delivery Note,កំណត់ត្រាដឹកជញ្ជូនអ្នកផ្គត់ផ្គង់
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,ដាក់ពាក្យឥឡូវនេះ
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,ដាក់ពាក្យឥឡូវនេះ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},ជាក់ស្តែង Qty {0} / រង់ចាំ Qty {1}
 DocType: Purchase Invoice,E-commerce GSTIN,ពាណិជ្ជកម្មអេឡិចត្រូនិក GSTIN
 DocType: Sales Order,Not Delivered,មិនបានផ្តល់
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,កាលបរិច្ឆេទដែលរំពឹងទុកមិនអាចនៅមុនថ្ងៃប្រតិបត្តិការទេ
 ,Bank Clearance Summary,ធនាគារសង្ខេបបោសសំអាត
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",បង្កើតនិងគ្រប់គ្រងការរំលាយអាហារបានអ៊ីម៉ែលជារៀងរាល់ថ្ងៃប្រចាំសប្តាហ៍និងប្រចាំខែ។
 DocType: Appraisal Goal,Appraisal Goal,គោលដៅវាយតម្លៃ
@@ -2404,13 +2449,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,អគារ
 DocType: Fee Schedule,Fee Structure,រចនាសម្ព័ន្ធថ្លៃសេវា
 DocType: Timesheet Detail,Costing Amount,ចំនួនទឹកប្រាក់ដែលចំណាយថវិកាអស់
-DocType: Student Admission,Application Fee,ថ្លៃសេវាកម្មវិធី
+DocType: Student Admission Program,Application Fee,ថ្លៃសេវាកម្មវិធី
 DocType: Process Payroll,Submit Salary Slip,ដាក់ស្នើប្រាក់ខែគ្រូពេទ្យប្រហែលជា
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,ការបញ្ចុះតម្លៃ Maxiumm សម្រាប់ធាតុ {0} គឺ {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,ការបញ្ចុះតម្លៃ Maxiumm សម្រាប់ធាតុ {0} គឺ {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,នាំចូលក្នុងក្រុម
 DocType: Sales Partner,Address & Contacts,អាសយដ្ឋាន &amp; ទំនាក់ទំនង
 DocType: SMS Log,Sender Name,ឈ្មោះរបស់អ្នកផ្ញើ
-DocType: POS Profile,[Select],[ជ្រើស]
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,តម្រៀបតាមលក្ខណៈវិនិច្ឆ័យ
+DocType: POS Profile,[Select],[ជ្រើសរើស]
 DocType: Vital Signs,Blood Pressure (diastolic),សម្ពាធឈាម (Diastolic)
 DocType: SMS Log,Sent To,ដែលបានផ្ញើទៅ
 DocType: Payment Request,Make Sales Invoice,ធ្វើឱ្យការលក់វិក័យប័ត្រ
@@ -2418,7 +2464,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,ទំនាក់ទំនងក្រោយកាលបរិច្ឆេទមិនអាចមានក្នុងពេលកន្លងមក
 DocType: Company,For Reference Only.,ឯកសារយោងប៉ុណ្ណោះ។
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},គ្រូពេទ្យ {0} មិនមាននៅលើ {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,ជ្រើសបាច់គ្មាន
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,ជ្រើសបាច់គ្មាន
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},មិនត្រឹមត្រូវ {0} {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,សេចក្តីយោងឯកសារ Inv
@@ -2434,15 +2480,15 @@
 DocType: Normal Test Items,Require Result Value,ទាមទារតម្លៃលទ្ធផល
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,សំណុំរឿងលេខមិនអាចមាន 0
 DocType: Item,Show a slideshow at the top of the page,បង្ហាញតែការបញ្ចាំងស្លាយមួយនៅផ្នែកខាងលើនៃទំព័រនេះ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,ហាងលក់
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,ហាងលក់
 DocType: Project Type,Projects Manager,ការគ្រប់គ្រងគម្រោង
 DocType: Serial No,Delivery Time,ម៉ោងដឹកជញ្ជូន
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Ageing ដោយផ្អែកលើការ
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,ការណាត់ជួបត្រូវបានលុបចោល
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,ការណាត់ជួបត្រូវបានលុបចោល
 DocType: Item,End of Life,ចុងបញ្ចប់នៃជីវិត
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,ការធ្វើដំណើរ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,គ្មានប្រាក់ខែរចនាសម្ព័ន្ធសកម្មឬបានរកឃើញសម្រាប់បុគ្គលិកលំនាំដើម {0} សម្រាប់កាលបរិច្ឆេទដែលបានផ្ដល់ឱ្យ
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,ការធ្វើដំណើរ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,គ្មានប្រាក់ខែរចនាសម្ព័ន្ធសកម្មឬបានរកឃើញសម្រាប់បុគ្គលិកលំនាំដើម {0} សម្រាប់កាលបរិច្ឆេទដែលបានផ្ដល់ឱ្យ
 DocType: Leave Block List,Allow Users,អនុញ្ញាតឱ្យអ្នកប្រើ
 DocType: Purchase Order,Customer Mobile No,គ្មានគយចល័ត
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,កើតឡើង
@@ -2451,12 +2497,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,តម្លៃដែលធ្វើឱ្យទាន់សម័យ
 DocType: Item Reorder,Item Reorder,ធាតុរៀបចំ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,គ្រូពេទ្យប្រហែលជាបង្ហាញប្រាក់ខែ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,សម្ភារៈសេវាផ្ទេរប្រាក់
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,សម្ភារៈសេវាផ្ទេរប្រាក់
 DocType: Fees,Send Payment Request,ផ្ញើសំណើទូទាត់
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","បញ្ជាក់ប្រតិបត្តិការ, ការចំណាយប្រតិបត្ដិការនិងផ្ដល់ឱ្យនូវប្រតិបត្ដិការតែមួយគត់នោះទេដើម្បីឱ្យប្រតិបត្តិការរបស់អ្នក។"
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ឯកសារនេះលើសកំណត់ដោយ {0} {1} សម្រាប់ធាតុ {4} ។ តើអ្នកបង្កើត {3} ផ្សេងទៀតប្រឆាំងនឹង {2} ដូចគ្នាដែរឬទេ?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,សូមកំណត់កើតឡើងបន្ទាប់ពីរក្សាទុក
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,គណនីចំនួនទឹកប្រាក់ជ្រើសការផ្លាស់ប្តូរ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,គណនីចំនួនទឹកប្រាក់ជ្រើសការផ្លាស់ប្តូរ
 DocType: Purchase Invoice,Price List Currency,បញ្ជីតម្លៃរូបិយប័ណ្ណ
 DocType: Naming Series,User must always select,អ្នកប្រើដែលត្រូវតែជ្រើសតែងតែ
 DocType: Stock Settings,Allow Negative Stock,អនុញ្ញាតឱ្យហ៊ុនអវិជ្ជមាន
@@ -2476,7 +2522,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,បុគ្គលិក
 DocType: Sample Collection,Collected Time,ពេលវេលាប្រមូល
 DocType: Company,Sales Monthly History,ប្រវត្តិការលក់ប្រចាំខែ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,ជ្រើសបាច់
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,ជ្រើសបាច់
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} ត្រូវបានផ្សព្វផ្សាយឱ្យបានពេញលេញ
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,សញ្ញាសំខាន់ៗ
 DocType: Training Event,End Time,ពេលវេលាបញ្ចប់
@@ -2484,16 +2530,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,កាត់ការទូទាត់ឬការបាត់បង់
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,លក្ខខណ្ឌនៃកិច្ចសន្យាស្តង់ដាមួយសម្រាប់ការលក់ឬទិញ។
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,ក្រុមតាមប័ណ្ណ
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,តើអ្នកប្រាកដថាអ្នកចង់លុបចោលការណាត់ជួបនេះទេ?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,បំពង់បង្ហូរប្រេងការលក់
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},សូមកំណត់គណនីលំនាំដើមនៅក្នុងសមាសភាគប្រាក់ខែ {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,តម្រូវការនៅលើ
 DocType: Rename Tool,File to Rename,ឯកសារដែលត្រូវប្តូរឈ្មោះ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},សូមជ្រើស Bom សម្រាប់ធាតុក្នុងជួរដេក {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},សូមជ្រើស Bom សម្រាប់ធាតុក្នុងជួរដេក {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},គណនី {0} មិនផ្គូផ្គងនឹងក្រុមហ៊ុន {1} នៅក្នុងរបៀបនៃគណនី: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Bom បានបញ្ជាក់ {0} មិនមានសម្រាប់ធាតុ {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,កាលវិភាគថែរក្សា {0} ត្រូវតែបានលុបចោលមុនពេលលុបចោលការបញ្ជាលក់នេះ
+DocType: POS Profile,Applicable for Users,អាចប្រើបានសម្រាប់អ្នកប្រើប្រាស់
 DocType: Notification Control,Expense Claim Approved,ពាក្យបណ្តឹងលើការចំណាយបានអនុម័ត
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,ប័ណ្ណប្រាក់ខែរបស់បុគ្គលិក {0} បានបង្កើតឡើងរួចទៅហើយសម្រាប់រយៈពេលនេះ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,ប័ណ្ណប្រាក់ខែរបស់បុគ្គលិក {0} បានបង្កើតឡើងរួចទៅហើយសម្រាប់រយៈពេលនេះ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,ឱសថ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,តម្លៃនៃធាតុដែលបានទិញ
 DocType: Selling Settings,Sales Order Required,ការលក់លំដាប់ដែលបានទាមទារ
@@ -2517,6 +2565,7 @@
 DocType: Offer Letter,Accepted,បានទទួលយក
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,អង្គការ
 DocType: BOM Update Tool,BOM Update Tool,ឧបករណ៍ធ្វើបច្ចុប្បន្នភាពមាត្រដ្ឋាន
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company",គណនីភាគីមិនបានបញ្ជាក់សូមរៀបចំគណនីភាគីដើមនៅក្នុងក្រុមហ៊ុន
 DocType: SG Creation Tool Course,Student Group Name,ឈ្មោះក្រុមសិស្ស
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,បង្កើតកម្រៃ
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,សូមប្រាកដថាអ្នកពិតជាចង់លុបប្រតិបតិ្តការទាំងអស់សម្រាប់ក្រុមហ៊ុននេះ។ ទិន្នន័យមេរបស់អ្នកនឹងនៅតែជាវាគឺជា។ សកម្មភាពនេះមិនអាចមិនធ្វើវិញ។
@@ -2525,29 +2574,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) មិនអាចច្រើនជាងការគ្រោងទុក quanitity ({2}) នៅក្នុងផលិតកម្មលំដាប់ {3}
 DocType: Shipping Rule,Shipping Rule Label,វិធានការដឹកជញ្ជូនស្លាក
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,វេទិកាអ្នកប្រើ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,វត្ថុធាតុដើមដែលមិនអាចត្រូវបានទទេ។
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","មិនអាចធ្វើឱ្យទាន់សម័យហ៊ុន, វិក័យប័ត្រមានធាតុដឹកជញ្ជូនទម្លាក់។"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,វត្ថុធាតុដើមដែលមិនអាចត្រូវបានទទេ។
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","មិនអាចធ្វើឱ្យទាន់សម័យហ៊ុន, វិក័យប័ត្រមានធាតុដឹកជញ្ជូនទម្លាក់។"
 DocType: Lab Test Sample,Lab Test Sample,គំរូតេស្តមន្ទីរពិសោធន៍
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,ធាតុទិនានុប្បវត្តិរហ័ស
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,អ្នកមិនអាចផ្លាស់ប្តូរអត្រាការបានប្រសិនបើ Bom បានរៀបរាប់ agianst ធាតុណាមួយ
+DocType: Restaurant,Invoice Series Prefix,បុព្វបទស៊េរីវិក្កយបត្រ
 DocType: Employee,Previous Work Experience,បទពិសោធន៍ការងារមុន
 DocType: Stock Entry,For Quantity,ចប់
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},សូមបញ្ចូលសម្រាប់ធាតុគ្រោងទុក Qty {0} នៅក្នុងជួរដេក {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},សូមបញ្ចូលសម្រាប់ធាតុគ្រោងទុក Qty {0} នៅក្នុងជួរដេក {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} មិនត្រូវបានដាក់ស្នើ
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,សំណើសម្រាប់ធាតុ។
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,គោលបំណងផលិតដោយឡែកពីគ្នានឹងត្រូវបានបង្កើតសម្រាប់ធាតុដ៏ល្អគ្នាបានបញ្ចប់។
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} ត្រូវតែអវិជ្ជមាននៅក្នុងឯកសារត្រឡប់មកវិញ
 ,Minutes to First Response for Issues,នាទីដើម្បីឆ្លើយតបដំបូងសម្រាប់បញ្ហា
 DocType: Purchase Invoice,Terms and Conditions1,លក្ខខណ្ឌនិង Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,ឈ្មោះរបស់វិទ្យាស្ថាននេះដែលអ្នកកំពុងកំណត់ប្រព័ន្ធនេះ។
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,ឈ្មោះរបស់វិទ្យាស្ថាននេះដែលអ្នកកំពុងកំណត់ប្រព័ន្ធនេះ។
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",ធាតុគណនេយ្យកករហូតដល់កាលបរិច្ឆេទនេះគ្មាននរណាម្នាក់អាចធ្វើ / កែប្រែធាតុមួយលើកលែងតែជាតួនាទីដែលបានបញ្ជាក់ខាងក្រោម។
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,សូមរក្សាទុកឯកសារមុនពេលដែលបង្កើតកាលវិភាគថែរក្សា
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,តម្លៃចុងក្រោយបំផុតត្រូវបានអាប់ដេតនៅគ្រប់បណ្តាញ
 DocType: Fee Schedule,Successful,ជោគជ័យ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,ស្ថានភាពគម្រោង
 DocType: UOM,Check this to disallow fractions. (for Nos),ធីកប្រអប់នេះដើម្បីមិនអនុញ្ញាតឱ្យប្រភាគ។ (សម្រាប់ Nos)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,លំដាប់ខាងក្រោមនេះត្រូវបានបង្កើតផលិតកម្ម:
-DocType: Student Admission,Naming Series (for Student Applicant),ការដាក់ឈ្មោះស៊េរី (សម្រាប់សិស្សកម្មវិធី)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,លំដាប់ខាងក្រោមនេះត្រូវបានបង្កើតផលិតកម្ម:
+DocType: Student Admission Program,Naming Series (for Student Applicant),ការដាក់ឈ្មោះស៊េរី (សម្រាប់សិស្សកម្មវិធី)
 DocType: Delivery Note,Transporter Name,ឈ្មោះដឹកជញ្ជូន
 DocType: Authorization Rule,Authorized Value,តម្លៃដែលបានអនុញ្ញាត
 DocType: BOM,Show Operations,បង្ហាញប្រតិបត្តិការ
@@ -2571,7 +2621,7 @@
 ,Employees working on a holiday,កម្មករនិយោជិតធ្វើការនៅលើថ្ងៃឈប់សម្រាកមួយ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,លោក Mark បច្ចុប្បន្ន
 DocType: Project,% Complete Method,វិធីសាស្រ្តពេញលេញ%
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,ឱសថ
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,ឱសថ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},កាលបរិច្ឆេទចាប់ផ្តើថែទាំមិនអាចត្រូវបានចែកចាយសម្រាប់ការមុនកាលបរិច្ឆេទសៀរៀលគ្មាន {0}
 DocType: Production Order,Actual End Date,ជាក់ស្តែកាលបរិច្ឆេទបញ្ចប់
 DocType: BOM,Operating Cost (Company Currency),ចំណាយប្រតិបត្តិការ (ក្រុមហ៊ុនរូបិយប័ណ្ណ)
@@ -2589,21 +2639,22 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,ការអនុម័តរបស់អ្នកប្រើមិនអាចជាដូចគ្នាទៅនឹងអ្នកប្រើច្បាប់នេះត្រូវបានអនុវត្ត
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),អត្រាការប្រាក់មូលដ្ឋាន (ដូចជាក្នុងមួយហ៊ុន UOM)
 DocType: SMS Log,No of Requested SMS,គ្មានសារជាអក្សរដែលបានស្នើ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,ទុកឱ្យដោយគ្មានប្រាក់ខែមិនផ្គូផ្គងនឹងកំណត់ត្រាកម្មវិធីចាកចេញអនុម័ត
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,ទុកឱ្យដោយគ្មានប្រាក់ខែមិនផ្គូផ្គងនឹងកំណត់ត្រាកម្មវិធីចាកចេញអនុម័ត
 DocType: Campaign,Campaign-.####,យុទ្ធនាការ។ - ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ជំហានបន្ទាប់
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,សូមផ្ដល់ធាតុដែលបានបញ្ជាក់នៅក្នុងអត្រាការប្រាក់ល្អបំផុតដែលអាចធ្វើទៅបាន
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,ធ្វើឱ្យមានការវិក័យប័ត្រ
 DocType: Selling Settings,Auto close Opportunity after 15 days,ដោយស្វ័យប្រវត្តិបន្ទាប់ពីឱកាសយ៉ាងជិតស្និទ្ធ 15 ថ្ងៃ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,ការបញ្ជាទិញមិនត្រូវបានអនុញ្ញាតសម្រាប់ {0} ដោយសារតែពិន្ទុពិន្ទុនៃ {1} ។
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,ការបញ្ជាទិញមិនត្រូវបានអនុញ្ញាតសម្រាប់ {0} ដោយសារតែពិន្ទុពិន្ទុនៃ {1} ។
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,ឆ្នាំបញ្ចប់
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,quot / នាំមុខ%
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,កិច្ចសន្យាដែលកាលបរិច្ឆេទបញ្ចប់ត្រូវតែធំជាងកាលបរិច្ឆេទនៃការចូលរួម
 DocType: Vital Signs,Nutrition Values,តម្លៃអាហារូបត្ថម្ភ
 DocType: Lab Test Template,Is billable,គឺអាចចេញវិក្កយបត្របាន
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",ទាំងពីរ &quot;កាលវិភាគគ្រូពេទ្យ&quot; និងពេលវេលាក្នុងការតែងតាំង &quot;ត្រូវតែត្រូវបានកំណត់សម្រាប់លោកវេជ្ជបណ្ឌិត {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,ការចែកចាយរបស់ភាគីទីបី / អ្នកចែកបៀ / គណៈកម្មការរបស់ភ្នាក់ងារ / បុត្រសម្ព័ន្ធ / លក់បន្តដែលលក់ផលិតផលរបស់ក្រុមហ៊ុនសម្រាប់គណៈកម្មាការមួយ។
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} ប្រឆាំងនឹងការទិញលំដាប់ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} បដិសេដនឹងការបញ្ជាទិញ {1}
 DocType: Patient,Patient Demographics,ប្រជាសាស្រ្តអ្នកជំងឺ
 DocType: Task,Actual Start Date (via Time Sheet),ពិតប្រាកដចាប់ផ្តើមកាលបរិច្ឆេទ (តាមរយៈសន្លឹកម៉ោង)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,នេះត្រូវបានគេហទំព័រជាឧទាហរណ៍មួយបង្កើតដោយស្វ័យប្រវត្តិពី ERPNext
@@ -2631,7 +2682,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","ពុម្ពស្តង់ដារដែលអាចពន្ធលើត្រូវបានអនុវត្តទៅប្រតិបត្តិការទិញទាំងអស់។ ពុម្ពនេះអាចផ្ទុកបញ្ជីនៃក្បាលពន្ធនិងក្បាលដទៃទៀតដែរដូចជាការការចំណាយ &quot;ការដឹកជញ្ជូន&quot;, &quot;ការធានារ៉ាប់រង&quot;, &quot;គ្រប់គ្រង&quot; ល #### ចំណាំអត្រាពន្ធដែលអ្នកបានកំណត់នៅទីនេះនឹងមានអត្រាស្តង់ដារសម្រាប់ទាំងអស់ ** ធាតុ * * ។ ប្រសិនបើមានធាតុ ** ** ដែលមានអត្រាការប្រាក់ខុសគ្នា, ពួកគេត្រូវតែត្រូវបានបន្ថែមនៅក្នុងការប្រមូលពន្ធលើធាតុ ** ** នៅ ** តារាងធាតុចៅហ្វាយ ** ។ #### ការពិពណ៌នាសង្ខេបនៃជួរឈរ 1. ប្រភេទគណនា: - នេះអាចមាននៅលើ ** សុទ្ធសរុប ** (នោះគឺជាការបូកនៃចំនួនទឹកប្រាក់ជាមូលដ្ឋាន) ។ - ** នៅលើជួរដេកមុនសរុប / ចំនួន ** (សម្រាប់ការបង់ពន្ធកើនឡើងឬការចោទប្រកាន់) ។ ប្រសិនបើអ្នកជ្រើសជម្រើសនេះ, ពន្ធនេះនឹងត្រូវបានអនុវត្តជាភាគរយនៃជួរដេកពីមុន (ក្នុងតារាងពន្ធនេះ) ចំនួនឬសរុប។ - ** ជាក់ស្តែង ** (ដូចដែលបានរៀបរាប់) ។ 2. ប្រមុខគណនី: សៀវភៅគណនីក្រោមដែលការបង់ពន្ធនេះនឹងត្រូវបានកក់មជ្ឈមណ្ឌលចំនាយ 3: បើពន្ធ / ការទទួលខុសត្រូវគឺជាប្រាក់ចំណូលមួយ (ដូចជាការដឹកជញ្ជូន) ឬចំវាត្រូវការដើម្បីត្រូវបានកក់ប្រឆាំងនឹងការចំណាយផងដែរ។ 4. ការពិពណ៌នាសង្ខេប: ការពិពណ៌នាសង្ខេបនៃការបង់ពន្ធនេះ (ដែលនឹងត្រូវបានបោះពុម្ពនៅក្នុងវិក័យប័ត្រ / សញ្ញាសម្រង់) ។ 5. អត្រាការប្រាក់: អត្រាពន្ធ។ 6. ចំនួន: ចំនួនប្រាក់ពន្ធ។ 7. សរុប: ចំនួនសរុបកើនដល់ចំណុចនេះ។ 8. បញ្ចូលជួរដេក: បើផ្អែកទៅលើ &quot;ជួរដេកពីមុនសរុប&quot; អ្នកអាចជ្រើសចំនួនជួរដេកដែលនឹងត្រូវបានយកជាមូលដ្ឋានមួយសម្រាប់ការគណនានេះ (លំនាំដើមគឺជួរដេកមុន) ។ 9 សូមពិចារណាអំពីការប្រមូលពន្ធលើឬការចោទប្រកាន់ចំពោះ: នៅក្នុងផ្នែកនេះអ្នកអាចបញ្ជាក់ប្រសិនបើពន្ធ / ការចោទប្រកាន់គឺសម្រាប់តែការវាយតម្លៃ (មិនមែនជាផ្នែកមួយនៃចំនួនសរុប) ឬសម្រាប់តែសរុប (មិនបានបន្ថែមតម្លៃដល់ធាតុ) ឬសម្រាប់ទាំងពីរ។ 10. បន្ថែមឬកាត់កង: តើអ្នកចង់បន្ថែមឬកាត់ពន្ធ។"
 DocType: Homepage,Homepage,គេហទំព័រ
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,ជ្រើសរើសគ្រូពេទ្យ ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',ធ្វើឱ្យទាន់សម័យ TabConsultation កំណត់ invoice = &#39;{0}&#39; ដែលឈ្មោះ = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,បរិមាណដែលត្រូវទទួលទាន Recd
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},កំណត់ត្រាថ្លៃសេវាបានបង្កើត - {0}
 DocType: Asset Category Account,Asset Category Account,គណនីទ្រព្យសកម្មប្រភេទ
@@ -2643,7 +2693,7 @@
 DocType: Asset,Manual,សៀវភៅដៃ
 DocType: Salary Component Account,Salary Component Account,គណនីប្រាក់បៀវត្សសមាសភាគ
 DocType: Global Defaults,Hide Currency Symbol,រូបិយប័ណ្ណនិមិត្តសញ្ញាលាក់
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","ឧធនាគារសាច់ប្រាក់, កាតឥណទាន"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","ឧធនាគារសាច់ប្រាក់, កាតឥណទាន"
 DocType: Lead Source,Source Name,ឈ្មោះប្រភព
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""",ការរក្សាសម្ពាធឈាមធម្មតាក្នុងមនុស្សពេញវ័យគឺប្រហែល 120 មីលីលីត្រស៊ីស្ត្រូកនិង 80 ម។ ម។ ឌីស្យុងអក្សរកាត់ &quot;120/80 មមអេហជី&quot;
 DocType: Journal Entry,Credit Note,ឥណទានចំណាំ
@@ -2662,16 +2712,16 @@
 DocType: Patient,Occupation,ការកាន់កាប់
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,ជួរដេក {0}: ចាប់ផ្តើមកាលបរិច្ឆេទត្រូវតែមុនពេលដែលកាលបរិច្ឆេទបញ្ចប់
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),សរុប (Qty)
-DocType: Sales Invoice,This Document,ឯកសារនេះ
 DocType: Installation Note Item,Installed Qty,ដែលបានដំឡើង Qty
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,នេះអាចដោយសារតែអាសយដ្ឋានអ៊ីមែលមិនត្រឹមត្រូវមួយចំនួននៅក្នុង
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,អ្នកបានបន្ថែម
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,លទ្ធផលបណ្តុះបណ្តាល
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,លទ្ធផលបណ្តុះបណ្តាល
 DocType: Purchase Invoice,Is Paid,គឺត្រូវបានបង់
 DocType: Salary Structure,Total Earning,ប្រាក់ចំណូលសរុប
 DocType: Purchase Receipt,Time at which materials were received,ពេលវេលាដែលបានសមា្ភារៈត្រូវបានទទួល
 DocType: Stock Ledger Entry,Outgoing Rate,អត្រាចេញ
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,ចៅហ្វាយសាខាអង្គការ។
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,ចៅហ្វាយសាខាអង្គការ។
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,ឬ
 DocType: Sales Order,Billing Status,ស្ថានភាពវិក័យប័ត្រ
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,រាយការណ៍បញ្ហា
@@ -2686,7 +2736,8 @@
 DocType: Notification Control,Sales Order Message,ការលក់លំដាប់សារ
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",កំណត់តម្លៃលំនាំដើមដូចជាការក្រុមហ៊ុនរូបិយប័ណ្ណបច្ចុប្បន្នឆ្នាំសារពើពន្ធល
 DocType: Payment Entry,Payment Type,ប្រភេទការទូទាត់
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,សូមជ្រើសបាច់សម្រាប់ធាតុ {0} ។ មិនអាចរកក្រុមតែមួយដែលបំពេញតម្រូវការនេះ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,សូមជ្រើសបាច់សម្រាប់ធាតុ {0} ។ មិនអាចរកក្រុមតែមួយដែលបំពេញតម្រូវការនេះ
+DocType: Hub Category,Parent Category,ប្រភេទមាតាបិតា
 DocType: Process Payroll,Select Employees,ជ្រើសបុគ្គលិក
 DocType: Opportunity,Potential Sales Deal,ឥឡូវនេះការលក់មានសក្តានុពល
 DocType: Complaint,Complaints,ពាក្យបណ្តឹង
@@ -2723,7 +2774,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),ការកំណត់អត្តសញ្ញាណនៃកញ្ចប់សម្រាប់ការចែកចាយ (សម្រាប់បោះពុម្ព)
 DocType: Bin,Reserved Quantity,បរិមាណបំរុងទុក
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,សូមបញ្ចូលអាសយដ្ឋានអ៊ីម៉ែលត្រឹមត្រូវ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,សូមជ្រើសរើសធាតុនៅក្នុងរទេះ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,សូមជ្រើសរើសធាតុនៅក្នុងរទេះ
 DocType: Landed Cost Voucher,Purchase Receipt Items,ទទួលទិញរបស់របរ
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,ទម្រង់តាមបំណង
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,ចុងក្រោយ
@@ -2733,15 +2784,15 @@
 DocType: Payment Request,Amount in customer's currency,ចំនួនទឹកប្រាក់របស់អតិថិជនជារូបិយប័ណ្ណ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,ការដឹកជញ្ជូន
 DocType: Stock Reconciliation Item,Current Qty,Qty នាពេលបច្ចុប្បន្ន
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,បន្ថែមអ្នកផ្គត់ផ្គង់
+DocType: Restaurant Menu,Restaurant Menu,ម៉ឺនុយភោជនីយដ្ឋាន
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,មុន
 DocType: Appraisal Goal,Key Responsibility Area,តំបន់ភារកិច្ចសំខាន់
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","ជំនាន់របស់សិស្សជួយអ្នកតាមដានការចូលរួម, ការវាយតម្លៃនិងថ្លៃសម្រាប់សិស្សនិស្សិត"
 DocType: Payment Entry,Total Allocated Amount,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកសរុប
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,កំណត់លំនាំដើមសម្រាប់គណនីសារពើភ័ណ្ឌរហូតសារពើភ័ណ្ឌ
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,កំណត់លំនាំដើមសម្រាប់គណនីសារពើភ័ណ្ឌរហូតសារពើភ័ណ្ឌ
 DocType: Item Reorder,Material Request Type,ប្រភេទស្នើសុំសម្ភារៈ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},ភាពត្រឹមត្រូវទិនានុប្បវត្តិធាតុសម្រាប់ប្រាក់ខែពី {0} ទៅ {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","ផ្ទុកទិន្នន័យមូលដ្ឋាននេះគឺជាការពេញលេញ, មិនបានរក្សាទុក"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","ផ្ទុកទិន្នន័យមូលដ្ឋាននេះគឺជាការពេញលេញ, មិនបានរក្សាទុក"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,ជួរដេក {0}: UOM ការប្រែចិត្តជឿកត្តាគឺជាការចាំបាច់
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,សមត្ថភាពបន្ទប់
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,យោង
@@ -2780,16 +2831,18 @@
 DocType: Project,Task Completion,ការបំពេញភារកិច្ច
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,មិនមែននៅក្នុងផ្សារ
 DocType: Appraisal,HR User,ធនធានមនុស្សរបស់អ្នកប្រើប្រាស់
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,ម៉ាស៊ីនឆូតកាត?
 DocType: Purchase Invoice,Taxes and Charges Deducted,ពន្ធនិងការចោទប្រកាន់កាត់
-apps/erpnext/erpnext/hooks.py +129,Issues,បញ្ហានានា
+apps/erpnext/erpnext/hooks.py +138,Issues,បញ្ហានានា
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},ស្ថានភាពត្រូវតែជាផ្នែកមួយនៃ {0}
 DocType: Sales Invoice,Debit To,ឥណពន្ធដើម្បី
+DocType: Restaurant Menu Item,Restaurant Menu Item,ធាតុម៉ឺនុយភោជនីយដ្ឋាន
 DocType: Delivery Note,Required only for sample item.,បានទាមទារសម្រាប់តែធាតុគំរូ។
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qty ពិតប្រាកដបន្ទាប់ពីការប្រតិបត្តិការ
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},គ្មានប័ណ្ណប្រាក់ខែបានរកឃើញរវាង {0} និង {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},គ្មានប័ណ្ណប្រាក់ខែបានរកឃើញរវាង {0} និង {1}
 ,Pending SO Items For Purchase Request,ការរង់ចាំការធាតុដូច្នេះសម្រាប់សំណើរសុំទិញ
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,សិស្សចុះឈ្មោះចូលរៀន
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} ត្រូវបានបិទ
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,សិស្សចុះឈ្មោះចូលរៀន
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} ត្រូវបានបិទ
 DocType: Supplier,Billing Currency,រូបិយប័ណ្ណវិក័យប័ត្រ
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,បន្ថែមទៀតដែលមានទំហំធំ
@@ -2812,6 +2865,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,សូមនិយាយពីមិនមាននៃការមើលដែលបានទាមទារ
 DocType: Stock Settings,Default Valuation Method,វិធីសាស្រ្តវាយតម្លៃលំនាំដើម
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,ថ្លៃសេវា
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,កំពុងធ្វើបច្ចុប្បន្នភាព។ វាអាចចំណាយពេលបន្តិច។
 DocType: Vehicle Log,Fuel Qty,ប្រេងឥន្ធនៈ Qty
 DocType: Production Order Operation,Planned Start Time,ពេលវេលាចាប់ផ្ដើមគ្រោងទុក
 DocType: Course,Assessment,ការវាយតំលៃ
@@ -2827,7 +2881,7 @@
 DocType: Price List,Price List Master,តារាងតម្លៃអនុបណ្ឌិត
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ទាំងអស់តិបត្តិការអាចនឹងត្រូវបានដាក់ស្លាកលក់បានច្រើនជនលក់ប្រឆាំងនឹង ** ** ដូច្នេះអ្នកអាចកំណត់និងត្រួតពិនិត្យគោលដៅ។
 ,S.O. No.,សូលេខ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},សូមបង្កើតអតិថិជនពីអ្នកដឹកនាំការ {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},សូមបង្កើតអតិថិជនពីអ្នកដឹកនាំការ {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,ជ្រើសរើសអ្នកជម្ងឺ
 DocType: Price List,Applicable for Countries,អនុវត្តសម្រាប់បណ្តាប្រទេស
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,ឈ្មោះប៉ារ៉ាម៉ែត្រ
@@ -2858,27 +2912,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,ក្រុមហ៊ុនផ្គត់ផ្គង់វិក័យប័ត្រលំអិត
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,គណនីក្នុងការចំណាយ / ភាពខុសគ្នា ({0}) ត្រូវតែជា &quot;ចំណញឬខាត &#39;គណនី
 DocType: Project,Copied From,ចម្លងពី
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},កំហុសឈ្មោះ: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,ការខ្វះខាត
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},កំហុសឈ្មោះ: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,ការខ្វះខាត
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} មិនបានផ្សារភ្ជាប់ជាមួយនឹង {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ការចូលរួមសម្រាប់ការ {0} បុគ្គលិកត្រូវបានសម្គាល់រួចហើយ
 DocType: Packing Slip,If more than one package of the same type (for print),បើកញ្ចប់ច្រើនជាងមួយនៃប្រភេទដូចគ្នា (សម្រាប់បោះពុម្ព)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,សូមកំណត់អតិថិជនលំនាំដើមនៅក្នុងការកំណត់ភោជនីយដ្ឋាន
 ,Salary Register,ប្រាក់បៀវត្សចុះឈ្មោះ
 DocType: Warehouse,Parent Warehouse,ឃ្លាំងមាតាបិតា
 DocType: C-Form Invoice Detail,Net Total,សរុប
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},រកមិនឃើញលំនាំដើម Bom សម្រាប់ធាតុនិង {0} {1} គម្រោង
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},រកមិនឃើញលំនាំដើម Bom សម្រាប់ធាតុនិង {0} {1} គម្រោង
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,កំណត់ប្រភេទប្រាក់កម្ចីនានា
 DocType: Bin,FCFS Rate,អត្រា FCFS
 DocType: Payment Reconciliation Invoice,Outstanding Amount,ចំនួនទឹកប្រាក់ដ៏ឆ្នើម
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),ពេលវេលា (នៅក្នុងនាទី)
 DocType: Project Task,Working,ការងារ
 DocType: Stock Ledger Entry,Stock Queue (FIFO),ភាគហ៊ុនជួរ (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,ឆ្នាំហិរញ្ញវត្ថុ
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,ឆ្នាំហិរញ្ញវត្ថុ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,មិនអាចដោះស្រាយមុខងារពិន្ទុលក្ខណៈវិនិច្ឆ័យសម្រាប់ {0} ។ ប្រាកដថារូបមន្តគឺត្រឹមត្រូវ។
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,ចំណាយប្រាក់អស់ដូចជានៅលើ
 DocType: Healthcare Settings,Out Patient Settings,ចេញការកំណត់អ្នកជម្ងឺ
 DocType: Account,Round Off,បិទការប្រកួតជុំទី
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,បរិមាណត្រូវតែជាវិជ្ជមាន
 ,Requested Qty,បានស្នើរសុំ Qty
 DocType: Tax Rule,Use for Shopping Cart,ប្រើសម្រាប់កន្រ្តកទំនិញ
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},តម្លៃ {0} សម្រាប់គុណលក្ខណៈ {1} មិនមាននៅក្នុងបញ្ជីនៃធាតុត្រឹមត្រូវសម្រាប់ធាតុតម្លៃគុណលក្ខណៈ {2}
@@ -2887,7 +2943,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",បទចោទប្រកាន់នឹងត្រូវបានចែកដោយផ្អែកលើធាតុ qty សមាមាត្រឬបរិមាណជាមួយជម្រើសរបស់អ្នក
 DocType: Maintenance Visit,Purposes,គោលបំនង
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,យ៉ាងហោចណាស់ធាតុមួយដែលគួរតែត្រូវបញ្ចូលដោយបរិមាណអវិជ្ជមាននៅក្នុងឯកសារវិលត្រឡប់មកវិញ
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,បន្ថែមវគ្គសិក្សា
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ប្រតិបត្ដិការ {0} យូរជាងម៉ោងធ្វើការដែលអាចប្រើណាមួយនៅក្នុងស្ថានីយការងារ {1}, បំបែកប្រតិបត្ដិការទៅក្នុងប្រតិបត្ដិការច្រើន"
 ,Requested,បានស្នើរសុំ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,គ្មានសុន្ទរកថា
@@ -2899,6 +2954,8 @@
 DocType: Employee Loan,Repaid/Closed,សង / បិទ
 DocType: Item,Total Projected Qty,សរុបរបស់គម្រោង Qty
 DocType: Monthly Distribution,Distribution Name,ឈ្មោះចែកចាយ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,អ្នកផ្គត់ផ្គង់&gt; ប្រភេទអ្នកផ្គត់ផ្គង់
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",អត្រាវាយតម្លៃមិនត្រូវបានរកឃើញសម្រាប់ធាតុ {0} ដែលត្រូវបានតម្រូវឱ្យធ្វើធាតុគណនេយ្យសម្រាប់ {1} {2} ។ ប្រសិនបើធាតុត្រូវបានធ្វើជាធាតុអត្រាតម្លៃសូន្យនៅក្នុង {1} សូមនិយាយថានៅក្នុងតារាងធាតុ {1} ។ បើមិនដូច្នោះទេសូមបង្កើតការជួញដូរភាគហ៊ុនមកដល់សម្រាប់ធាតុឬនិយាយពីអត្រាវាយតម្លៃនៅក្នុងកំណត់ត្រាធាតុហើយបន្ទាប់មកព្យាយាមផ្ញើ / បោះបង់ធាតុនេះ។
 DocType: Course,Course Code,ក្រមការពិតណាស់
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},ពិនិត្យគុណភាពបានទាមទារសម្រាប់ធាតុ {0}
 DocType: POS Settings,Use POS in Offline Mode,ប្រើម៉ាស៊ីនមេនៅក្រៅអ៊ីនធឺណិត
@@ -2909,14 +2966,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,គ្រប់គ្រងដើមឈើមួយដើមដែនដី។
 DocType: Journal Entry Account,Sales Invoice,វិក័យប័ត្រលក់
 DocType: Journal Entry Account,Party Balance,តុល្យភាពគណបក្ស
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,សូមជ្រើសរើសអនុវត្តបញ្ចុះតម្លៃនៅលើ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,សូមជ្រើសរើសអនុវត្តបញ្ចុះតម្លៃនៅលើ
 DocType: Company,Default Receivable Account,គណនីអ្នកទទួលលំនាំដើម
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,បង្កើតធាតុរបស់ធនាគារចំពោះប្រាក់បៀវត្សសរុបដែលបានបង់សម្រាប់លក្ខណៈវិនិច្ឆ័យដែលបានជ្រើសខាងលើ
 DocType: Physician,Physician Schedule,កាលវិភាគគ្រូពេទ្យ
 DocType: Purchase Invoice,Deemed Export,ចាត់ទុកថានាំចេញ
 DocType: Stock Entry,Material Transfer for Manufacture,ផ្ទេរសម្រាប់ការផលិតសម្ភារៈ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,ភាគរយបញ្ចុះតម្លៃអាចត្រូវបានអនុវត្តទាំងការប្រឆាំងនឹងតារាងតម្លៃមួយឬសម្រាប់តារាងតម្លៃទាំងអស់។
-DocType: Purchase Invoice,Half-yearly,ពាក់កណ្តាលប្រចាំឆ្នាំ
+DocType: Subscription,Half-yearly,ពាក់កណ្តាលប្រចាំឆ្នាំ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,ចូលគណនេយ្យសម្រាប់ក្រុមហ៊ុនផ្សារ
 DocType: Lab Test,LabTest Approver,អ្នកអនុម័ត LabTest
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,អ្នកបានវាយតម្លែរួចទៅហើយសម្រាប់លក្ខណៈវិនិច្ឆ័យវាយតម្លៃនេះ {} ។
@@ -2940,18 +2997,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},ឃ្លាំងគោលដៅគឺជាការចាំបាច់សម្រាប់ជួរ {0}
 DocType: Cheque Print Template,Primary Settings,ការកំណត់បឋមសិក្សា
 DocType: Purchase Invoice,Select Supplier Address,ជ្រើសអាសយដ្ឋានផ្គត់ផ្គង់
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +380,Add Employees,បន្ថែមបុគ្គលិក
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +380,Add Employees,បន្ថែម បុគ្គលិក
 DocType: Purchase Invoice Item,Quality Inspection,ពិនិត្យគុណភាព
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,បន្ថែមទៀតខ្នាតតូច
 DocType: Company,Standard Template,ទំព័រគំរូស្ដង់ដារ
 DocType: Training Event,Theory,ទ្រឹស្តី
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,ព្រមាន: សម្ភារៈដែលបានស្នើ Qty គឺតិចជាងអប្បបរមាលំដាប់ Qty
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,ព្រមាន: សម្ភារៈដែលបានស្នើ Qty គឺតិចជាងអប្បបរមាលំដាប់ Qty
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,គណនី {0} គឺការកក
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ផ្នែកច្បាប់អង្គភាព / តារាងរួមផ្សំជាមួយនឹងគណនីដាច់ដោយឡែកមួយដែលជាកម្មសិទ្ធិរបស់អង្គការនេះ។
 DocType: Payment Request,Mute Email,ស្ងាត់អ៊ីម៉ែល
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","អាហារ, ភេសជ្ជៈនិងថ្នាំជក់"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},ត្រឹមតែអាចធ្វើឱ្យការទូទាត់ប្រឆាំងនឹង unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,អត្រាការគណៈកម្មាការមិនអាចជាធំជាង 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},ត្រឹមតែអាចធ្វើឱ្យការទូទាត់ប្រឆាំងនឹង unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,អត្រាការគណៈកម្មាការមិនអាចជាធំជាង 100
 DocType: Stock Entry,Subcontract,របបម៉ៅការ
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,សូមបញ្ចូល {0} ដំបូង
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,ការឆ្លើយតបពីគ្មាន
@@ -2969,10 +3026,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,ពណ៌
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,លក្ខណៈវិនិច្ឆ័យការវាយតំលៃផែនការ
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,ទប់ស្កាត់ការបញ្ជាទិញ
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,ងាយយល់
 DocType: Patient Appointment,Scheduled,កំណត់ពេលវេលា
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,ស្នើសុំសម្រាប់សម្រង់។
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំប្រព័ន្ធដាក់ឈ្មោះនិយោជិកនៅក្នុងធនធានមនុស្ស&gt; ការកំណត់ធនធានមនុស្ស
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",សូមជ្រើសធាតុដែល &quot;គឺជាធាតុហ៊ុន&quot; គឺ &quot;ទេ&quot; ហើយ &quot;តើធាតុលក់&quot; គឺជា &quot;បាទ&quot; ហើយមិនមានកញ្ចប់ផលិតផលផ្សេងទៀត
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,ជ្រើសរើសអតិថិជន
 DocType: Student Log,Academic,អប់រំ
 DocType: Patient,Personal and Social History,ប្រវត្តិបុគ្គលនិងសង្គម
 DocType: Fee Schedule,Fee Breakup for each student,ការបែងចែកថ្លៃឈ្នួលសម្រាប់សិស្សម្នាក់ៗ
@@ -2982,7 +3040,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,អត្រាការវាយតម្លៃ
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,ម៉ាស៊ូត
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,រូបិយប័ណ្ណបញ្ជីតម្លៃមិនបានជ្រើសរើស
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,រូបិយប័ណ្ណបញ្ជីតម្លៃមិនបានជ្រើសរើស
 apps/erpnext/erpnext/config/healthcare.py +46,Results,លទ្ធផល
 ,Student Monthly Attendance Sheet,សិស្សសន្លឹកអវត្តមានប្រចាំខែ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},បុគ្គលិក {0} បានអនុវត្តរួចហើយសម្រាប់ {1} រវាង {2} និង {3}
@@ -2997,7 +3055,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,គ្រប់គ្រងការលក់ដៃគូ។
 DocType: Quality Inspection,Inspection Type,ប្រភេទអធិការកិច្ច
 DocType: Fee Validity,Visited yet,បានទៅទស្សនានៅឡើយ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,ប្រតិបត្តិការដែលមានស្រាប់ឃ្លាំងដោយមានមិនអាចត្រូវបានបម្លែងទៅជាក្រុម។
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,ប្រតិបត្តិការដែលមានស្រាប់ឃ្លាំងដោយមានមិនអាចត្រូវបានបម្លែងទៅជាក្រុម។
 DocType: Assessment Result Tool,Result HTML,លទ្ធផលរបស់ HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ផុតកំណត់នៅថ្ងៃទី
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,បន្ថែមសិស្ស
@@ -3024,7 +3082,7 @@
 DocType: Healthcare Settings,Result Printed,លទ្ធផលបោះពុម្ភ
 DocType: Asset Category Account,Depreciation Expense Account,គណនីរំលស់
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,រយៈពេលសាកល្បង
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},មើល {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},មើល {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,មានតែថ្នាំងស្លឹកត្រូវបានអនុញ្ញាតក្នុងប្រតិបត្តិការ
 DocType: Expense Claim,Expense Approver,ការអនុម័តការចំណាយ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,ជួរដេក {0}: ជាមុនប្រឆាំងនឹងការអតិថិជនត្រូវតែមានការឥណទាន
@@ -3035,7 +3093,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,ដើម្បី Datetime
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,កាលវិភាគវគ្គសិក្សាបានលុប:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,កំណត់ហេតុសម្រាប់ការរក្សាស្ថានភាពចែកចាយផ្ញើសារជាអក្សរ
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,កំណត់គោលដៅលក់
 DocType: Accounts Settings,Make Payment via Journal Entry,ធ្វើឱ្យសេវាទូទាត់តាមរយៈ Journal Entry
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,បោះពុម្ពលើ
 DocType: Item,Inspection Required before Delivery,ត្រូវការមុនពេលការដឹកជញ្ជូនអធិការកិច្ច
@@ -3043,7 +3100,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,សកម្មភាពដែលមិនទាន់សម្រេច
 DocType: Patient Appointment,Reminded,បានរំលឹក
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,អង្គការរបស់អ្នក
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,អង្គការរបស់អ្នក
 DocType: Fee Component,Fees Category,ថ្លៃសេវាប្រភេទ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,សូមបញ្ចូលកាលបរិច្ឆេទបន្ថយ។
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
@@ -3055,7 +3112,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,រៀបចំវគ្គ
 DocType: Company,Chart Of Accounts Template,តារាងនៃគណនីទំព័រគំរូ
 DocType: Attendance,Attendance Date,ការចូលរួមកាលបរិច្ឆេទ
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},ថ្លៃទំនិញឱ្យទាន់សម័យសម្រាប់ {0} នៅក្នុងបញ្ជីតម្លៃ {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},ថ្លៃទំនិញឱ្យទាន់សម័យសម្រាប់ {0} នៅក្នុងបញ្ជីតម្លៃ {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ការបែកបាក់គ្នាដោយផ្អែកលើការរកប្រាក់ចំណូលបានប្រាក់ខែនិងការកាត់។
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,គណនីជាមួយថ្នាំងជាកុមារមិនអាចត្រូវបានបម្លែងទៅសៀវភៅ
 DocType: Purchase Invoice Item,Accepted Warehouse,ឃ្លាំងទទួលយក
@@ -3071,9 +3128,10 @@
 ,Employee Birthday,បុគ្គលិកខួបកំណើត
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,ឧបករណ៍វត្តមានបាច់សិស្ស
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,ដែនកំណត់កាត់
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,គ្រោងទុករហូតដល់
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,យ្រប
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,មួយរយៈសិក្សាជាមួយនេះ &quot;ឆ្នាំសិក្សា&quot; {0} និង &#39;ឈ្មោះរយៈពេល&#39; {1} រួចហើយ។ សូមកែប្រែធាតុទាំងនេះនិងព្យាយាមម្ដងទៀត។
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","ដូចជាមានការប្រតិបតិ្តការដែលមានស្រាប់ប្រឆាំងនឹងធាតុ {0}, អ្នកមិនអាចផ្លាស់ប្តូរតម្លៃនៃ {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","ដូចជាមានការប្រតិបតិ្តការដែលមានស្រាប់ប្រឆាំងនឹងធាតុ {0}, អ្នកមិនអាចផ្លាស់ប្តូរតម្លៃនៃ {1}"
 DocType: UOM,Must be Whole Number,ត្រូវតែជាលេខទាំងមូល
 DocType: Leave Control Panel,New Leaves Allocated (In Days),ស្លឹកថ្មីដែលបានបម្រុងទុក (ក្នុងថ្ងៃ)
 DocType: Purchase Invoice,Invoice Copy,វិក័យប័ត្រចម្លង
@@ -3083,7 +3141,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,លេខវិក្ក័យប័ត្រ
 DocType: Shopping Cart Settings,Orders,ការបញ្ជាទិញ
 DocType: Employee Leave Approver,Leave Approver,ទុកឱ្យការអនុម័ត
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,សូមជ្រើសបាច់មួយ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,សូមជ្រើសបាច់មួយ
 DocType: Assessment Group,Assessment Group Name,ឈ្មោះការវាយតម្លៃជាក្រុម
 DocType: Manufacturing Settings,Material Transferred for Manufacture,សម្ភារៈផ្ទេរសម្រាប់ការផលិត
 DocType: Expense Claim,"A user with ""Expense Approver"" role",អ្នកប្រើដែលមាន &quot;ការចំណាយការអនុម័ត&quot; តួនាទីមួយ
@@ -3098,7 +3156,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,ចូលរយៈពេលបិទ
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,ជ្រើសរើសនាយកដ្ឋាន ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,ជាមួយនឹងការប្រតិបត្តិការនៃមជ្ឈមណ្ឌលការចំណាយដែលមានស្រាប់ដែលមិនអាចត្រូវបានបម្លែងទៅជាក្រុម
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},ចំនួនទឹកប្រាក់ {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},ចំនួនទឹកប្រាក់ {0} {1} {2} {3}
 DocType: Account,Depreciation,រំលស់
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ក្រុមហ៊ុនផ្គត់ផ្គង់ (s បាន)
 DocType: Employee Attendance Tool,Employee Attendance Tool,ឧបករណ៍វត្តមានបុគ្គលិក
@@ -3109,10 +3167,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,ធាតុការទូទាត់ {0} គឺជាតំណភ្ជាប់របស់អង្គការសហប្រជាជាតិ
 DocType: GL Entry,Voucher No,កាតមានទឹកប្រាក់គ្មាន
 ,Lead Owner Efficiency,ប្រសិទ្ធភាពម្ចាស់ការនាំមុខ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,ពេញនិយមបំផុត
 DocType: Leave Allocation,Leave Allocation,ទុកឱ្យការបម្រុងទុក
 DocType: Payment Request,Recipient Message And Payment Details,សារអ្នកទទួលនិងលម្អិតការបង់ប្រាក់
 DocType: Training Event,Trainer Email,គ្រូបង្គោលអ៊ីម៉ែល
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,សំណើសម្ភារៈ {0} បង្កើតឡើង
+DocType: Restaurant Reservation,No of People,ចំនួនប្រជាជន
 DocType: Production Planning Tool,Include sub-contracted raw materials,រួមបញ្ចូលវត្ថុធាតុដើមចុះកិច្ចសន្យាជាមួយ
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,ទំព័រគំរូនៃពាក្យឬកិច្ចសន្យា។
 DocType: Purchase Invoice,Address and Contact,អាស័យដ្ឋាននិងទំនាក់ទំនង
@@ -3121,10 +3181,11 @@
 DocType: Supplier,Last Day of the Next Month,ចុងក្រោយកាលពីថ្ងៃនៃខែបន្ទាប់
 DocType: Support Settings,Auto close Issue after 7 days,ដោយស្វ័យប្រវត្តិបន្ទាប់ពីបញ្ហានៅជិត 7 ថ្ងៃ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ទុកឱ្យមិនអាចត្រូវបានបម្រុងទុកមុន {0}, ដែលជាតុល្យភាពការឈប់សម្រាកបានជាទំនិញ-បានបញ្ជូនបន្តនៅក្នុងកំណត់ត្រាការបែងចែកការឈប់សម្រាកនាពេលអនាគតរួចទៅហើយ {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ចំណាំ: ដោយសារតែ / សេចក្តីយោងកាលបរិច្ឆេទលើសពីអនុញ្ញាតឱ្យថ្ងៃឥណទានរបស់អតិថិជនដោយ {0} ថ្ងៃ (s)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ចំណាំ: ដោយសារតែ / សេចក្តីយោងកាលបរិច្ឆេទលើសពីអនុញ្ញាតឱ្យថ្ងៃឥណទានរបស់អតិថិជនដោយ {0} ថ្ងៃ (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,ពាក្យសុំរបស់សិស្ស
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ដើមសម្រាប់អ្នកទទួល
 DocType: Asset Category Account,Accumulated Depreciation Account,គណនីរំលស់បង្គរ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,អ៊ីមែលនេះត្រូវបានបង្កើតដោយស្វ័យប្រវត្តិ
 DocType: Stock Settings,Freeze Stock Entries,ធាតុបង្កហ៊ុន
 DocType: Program Enrollment,Boarding Student,សិស្សប្រឹក្សាភិបាល
 DocType: Asset,Expected Value After Useful Life,តម្លៃបានគេរំពឹងថាបន្ទាប់ពីជីវិតដែលមានប្រយោជន៍
@@ -3132,7 +3193,7 @@
 DocType: Activity Cost,Billing Rate,អត្រាវិក័យប័ត្រ
 ,Qty to Deliver,qty សង្គ្រោះ
 ,Stock Analytics,ភាគហ៊ុនវិភាគ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,ប្រតិបត្តិការមិនអាចត្រូវបានទុកឱ្យនៅទទេ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,ប្រតិបត្តិការមិនអាចត្រូវបានទុកឱ្យនៅទទេ
 DocType: Maintenance Visit Purpose,Against Document Detail No,ពត៌មានលំអិតរបស់ឯកសារគ្មានការប្រឆាំងនឹងការ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,គណបក្សជាការចាំបាច់ប្រភេទ
 DocType: Quality Inspection,Outgoing,ចេញ
@@ -3155,7 +3216,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,ជ្រើសរើសសិស្សនិស្សិតដោយដៃសម្រាប់សកម្មភាពដែលមានមូលដ្ឋាននៅក្រុម
 DocType: Journal Entry,User Remark,សំគាល់របស់អ្នកប្រើ
 DocType: Lead,Market Segment,ចំណែកទីផ្សារ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},ចំនួនទឹកប្រាក់ដែលត្រូវចំណាយប្រាក់មិនអាចត្រូវបានធំជាងចំនួនទឹកប្រាក់សរុបអវិជ្ជមាន {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},ចំនួនទឹកប្រាក់ដែលត្រូវចំណាយប្រាក់មិនអាចត្រូវបានធំជាងចំនួនទឹកប្រាក់សរុបអវិជ្ជមាន {0}
 DocType: Supplier Scorecard Period,Variables,អថេរ
 DocType: Employee Internal Work History,Employee Internal Work History,ប្រវត្តិការងាររបស់បុគ្គលិកផ្ទៃក្នុង
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),បិទ (លោកបណ្ឌិត)
@@ -3184,21 +3245,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ទទួលបានការធ្វើឱ្យទាន់សម័យ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: គណនី {2} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,សម្ភារៈសំណើ {0} ត្រូវបានលុបចោលឬបញ្ឈប់
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,ទុកឱ្យការគ្រប់គ្រង
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,ទុកឱ្យការគ្រប់គ្រង
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,ក្រុមតាមគណនី
 DocType: Sales Order,Fully Delivered,ផ្តល់ឱ្យបានពេញលេញ
 DocType: Lead,Lower Income,ប្រាក់ចំណូលទាប
+DocType: Restaurant Order Entry,Current Order,លំដាប់បច្ចុប្បន្ន
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},ប្រភពនិងឃ្លាំងគោលដៅមិនអាចមានដូចគ្នាសម្រាប់ជួរដេក {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",គណនីមានភាពខុសគ្នាត្រូវតែជាគណនីប្រភេទទ្រព្យសកម្ម / ការទទួលខុសត្រូវចាប់តាំងពីការផ្សះផ្សានេះគឺផ្សារភាគហ៊ុនការបើកជាមួយធាតុ
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ចំនួនទឹកប្រាក់ដែលបានចំណាយមិនអាចមានប្រាក់កម្ចីចំនួនធំជាង {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,ចូលទៅកាន់កម្មវិធី
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},ទិញចំនួនលំដាប់ដែលបានទាមទារសម្រាប់ធាតុ {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,លំដាប់ផលិតកម្មមិនត្រូវបានបង្កើត
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;ពីកាលបរិច្ឆេទ&quot; ត្រូវតែមានបន្ទាប់ &#39;ដើម្បីកាលបរិច្ឆេទ &quot;
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},មិនអាចផ្លាស់ប្តូរស្ថានភាពជានិស្សិត {0} ត្រូវបានផ្សារភ្ជាប់ជាមួយនឹងកម្មវិធីនិស្សិត {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,លំដាប់ផលិតកម្មមិនត្រូវបានបង្កើត
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""ពីកាលបរិច្ឆេទ"" ត្រូវតែនៅបន្ទាប់ ""ដល់កាលបរិច្ឆេទ"""
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},មិនអាចផ្លាស់ប្តូរស្ថានភាពជានិស្សិត {0} ត្រូវបានផ្សារភ្ជាប់ជាមួយនឹងកម្មវិធីនិស្សិត {1}
 DocType: Asset,Fully Depreciated,ធ្លាក់ថ្លៃយ៉ាងពេញលេញ
 ,Stock Projected Qty,គម្រោង Qty ផ្សារភាគហ៊ុន
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},អតិថិជន {0} មិនមែនជារបស់គម្រោង {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},អតិថិជន {0} មិនមែនជារបស់គម្រោង {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,វត្តមានដែលបានសម្គាល់ជា HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",ដកស្រង់សំណើដេញថ្លៃដែលអ្នកបានផ្ញើទៅឱ្យអតិថិជនរបស់អ្នក
 DocType: Sales Order,Customer's Purchase Order,ទិញលំដាប់របស់អតិថិជន
@@ -3209,8 +3271,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,សូមកំណត់ចំនួននៃរំលស់បានកក់
 DocType: Supplier Scorecard Period,Calculations,ការគណនា
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,តំលៃឬ Qty
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,ការបញ្ជាទិញផលិតផលនេះមិនអាចត្រូវបានលើកឡើងសម្រាប់:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,ការបញ្ជាទិញផលិតផលនេះមិនអាចត្រូវបានលើកឡើងសម្រាប់:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,នាទី
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,សូមកំណត់ស៊ុមឈ្មោះសម្រាប់ {0} តាម Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Invoice,Purchase Taxes and Charges,ទិញពន្ធនិងការចោទប្រកាន់
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,ទៅកាន់អ្នកផ្គត់ផ្គង់
 ,Qty to Receive,qty ទទួល
@@ -3223,7 +3286,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,ឥណទានទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,ក្រុមហ៊ុនផ្គត់ផ្គង់គ្រប់ប្រភេទ
 DocType: Global Defaults,Disable In Words,បិទនៅក្នុងពាក្យ
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,ក្រមធាតុគឺជាចាំបាច់ដោយសារតែធាតុបង់លេខដោយស្វ័យប្រវត្តិគឺមិន
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,ក្រមធាតុគឺជាចាំបាច់ដោយសារតែធាតុបង់លេខដោយស្វ័យប្រវត្តិគឺមិន
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},សម្រង់ {0} មិនត្រូវបាននៃប្រភេទ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,កាលវិភាគធាតុថែទាំ
 DocType: Sales Order,%  Delivered,% ដឹកនាំ
@@ -3245,23 +3308,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,សមធម៌តុល្យភាពពិធីបើក
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,លេខ
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,ការផ្សះផ្សា
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,ដែលនៅសល់
 DocType: Appraisal,Appraisal,ការវាយតម្លៃ
 DocType: Purchase Invoice,GST Details,ព័ត៌មានលម្អិតរបស់ GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},អ៊ីម៉ែលដែលបានផ្ញើទៅឱ្យអ្នកផ្គត់ផ្គង់ {0}
+DocType: Item,Default Sales Unit of Measure,ផ្នែករង្វាស់នៃការលក់ជាលំនាំដើម
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,កាលបរិច្ឆេទគឺត្រូវបានធ្វើម្តងទៀត
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,ហត្ថលេខីដែលបានអនុញ្ញាត
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},ទុកឱ្យការអនុម័តត្រូវតែជាផ្នែកមួយនៃ {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,បង្កើតកម្រៃ
-DocType: Hub Settings,Seller Email,អ្នកលក់អ៊ីម៉ែល
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ការចំណាយទិញសរុប (តាមរយៈការទិញវិក័យប័ត្រ)
 DocType: Training Event,Start Time,ពេលវេលាចាប់ផ្ដើម
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,ជ្រើសបរិមាណ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,ជ្រើសបរិមាណ
 DocType: Customs Tariff Number,Customs Tariff Number,លេខពន្ធគយ
 DocType: Patient Appointment,Patient Appointment,ការតែងតាំងអ្នកជំងឺ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,អនុម័តតួនាទីមិនអាចជាដូចគ្នាទៅនឹងតួនាទីរបស់ច្បាប់ត្រូវបានអនុវត្ត
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,ជាវពីអ៊ីម៉ែលនេះសង្ខេប
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,ជាវពីអ៊ីម៉ែលនេះសង្ខេប
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,ទទួលបានអ្នកផ្គត់ផ្គង់តាម
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},រកមិនឃើញ {0} សម្រាប់ធាតុ {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,ចូលទៅកាន់វគ្គសិក្សា
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,សារដែលបានផ្ញើ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,គណនីជាមួយថ្នាំងជាកូនក្មេងដែលមិនអាចត្រូវបានកំណត់ជាសៀវភៅ
@@ -3274,11 +3340,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,សម្ភារៈផ្ទេរសម្រាប់កម្មន្តសាល
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,គណនី {0} មិនមាន
 DocType: Project,Project Type,ប្រភេទគម្រោង
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,កិច្ចការកុមារមានសម្រាប់ភារកិច្ចនេះ។ អ្នកមិនអាចលុបភារកិច្ចនេះបានទេ។
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ទាំង qty គោលដៅឬគោលដៅចំនួនទឹកប្រាក់គឺជាចាំបាច់។
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,ការចំណាយនៃសកម្មភាពនានា
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,មិនមានលទ្ធផលច្រើនទេ
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,ការចំណាយនៃសកម្មភាពនានា
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","ការកំណត់ព្រឹត្តិការណ៍ដើម្បី {0}, ចាប់តាំងពីបុគ្គលិកដែលបានភ្ជាប់ទៅខាងក្រោមនេះការលក់របស់បុគ្គលមិនមានលេខសម្គាល់អ្នកប្រើ {1}"
 DocType: Timesheet,Billing Details,សេចក្ដីលម្អិតវិក័យប័ត្រ
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,ប្រភពនិងឃ្លាំងគោលដៅត្រូវតែខុសគ្នា
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,ប្រភពនិងឃ្លាំងគោលដៅត្រូវតែខុសគ្នា
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},មិនត្រូវបានអនុញ្ញាតឱ្យធ្វើបច្ចុប្បន្នភាពប្រតិបតិ្តការភាគហ៊ុនចាស់ជាង {0}
 DocType: Purchase Invoice Item,PR Detail,ពត៌មាននៃការិយាល័យទទួលជំនួយផ្ទាល់
 DocType: Sales Order,Fully Billed,ផ្សព្វផ្សាយឱ្យបានពេញលេញ
@@ -3305,7 +3373,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,ការផ្ទេរខ្សែ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,សូមពិនិត្យមើលទាំងអស់
 DocType: Vehicle Log,Invoice Ref,Ref វិក័យប័ត្រ
-DocType: Purchase Order,Recurring Order,លំដាប់កើតឡើង
 DocType: Company,Default Income Account,គណនីចំណូលលំនាំដើម
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,ក្រុមផ្ទាល់ខ្លួន / អតិថិជន
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),unclosed សារពើពន្ធឆ្នាំប្រាក់ចំណេញ / បាត់បង់ (ឥណទាន)
@@ -3319,9 +3386,9 @@
 DocType: Patient,A Negative,អវិជ្ជមាន
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,គ្មានអ្វីច្រើនជាងនេះដើម្បីបង្ហាញ។
 DocType: Lead,From Customer,ពីអតិថិជន
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,ការហៅទូរស័ព្ទ
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,ការហៅទូរស័ព្ទ
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,ផលិតផល
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,ជំនាន់
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,ជំនាន់
 DocType: Project,Total Costing Amount (via Time Logs),ចំនួនទឹកប្រាក់ផ្សារសរុប (តាមរយៈការពេលវេលាកំណត់ហេតុ)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,កំណត់ថ្លៃកម្រៃ
 DocType: Purchase Order Item Supplied,Stock UOM,ភាគហ៊ុន UOM
@@ -3333,7 +3400,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +222,Serial No {0} does not belong to Warehouse {1},សៀរៀលគ្មាន {0} មិនមែនជារបស់ឃ្លាំង {1}
 apps/erpnext/erpnext/controllers/status_updater.py +174,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ចំណាំ: ប្រព័ន្ធនឹងមិនបានពិនិត្យមើលលើការចែកចាយនិងការកក់សម្រាប់ធាតុ {0} ជាបរិមាណឬចំនួនទឹកប្រាក់គឺ 0
 DocType: Notification Control,Quotation Message,សារសម្រង់
-DocType: Employee Loan,Employee Loan Application,កម្មវិធីបុគ្គលិកឥណទាន
+DocType: Employee Loan,Employee Loan Application,ពាក្យស្នើសុំកម្ចីរបស់និយោជិក
 DocType: Issue,Opening Date,ពិធីបើកកាលបរិច្ឆេទ
 apps/erpnext/erpnext/schools/api.py +80,Attendance has been marked successfully.,ការចូលរួមត្រូវបានគេបានសម្គាល់ដោយជោគជ័យ។
 DocType: Program Enrollment,Public Transport,ការដឹកជញ្ជូនសាធារណៈ
@@ -3346,7 +3413,7 @@
 DocType: School Settings,Current Academic Term,រយៈពេលសិក្សាបច្ចុប្បន្ន
 DocType: School Settings,Current Academic Term,រយៈពេលសិក្សាបច្ចុប្បន្ន
 DocType: Sales Order,Not Billed,មិនបានផ្សព្វផ្សាយ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,ឃ្លាំងទាំងពីរត្រូវតែជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុនដូចគ្នា
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,ឃ្លាំងទាំងពីរត្រូវតែជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុនដូចគ្នា
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,គ្មានទំនាក់ទំនងបានបន្ថែមនៅឡើយទេ។
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,ចំនួនប័ណ្ណការចំណាយបានចុះចត
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,វិក័យប័ត្រដែលបានលើកឡើងដោយអ្នកផ្គត់ផ្គង់។
@@ -3355,7 +3422,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,ចំនួនការបញ្ចុះតំលៃ
 DocType: Purchase Invoice,Return Against Purchase Invoice,ការវិលត្រឡប់ពីការប្រឆាំងនឹងការទិញវិក័យប័ត្រ
 DocType: Item,Warranty Period (in days),ការធានារយៈពេល (នៅក្នុងថ្ងៃ)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',ធ្វើបច្ចុប្បន្នភាព `ការកំណត់ការណាត់ជួប TabPatient &#39;sales_invoice =&#39; {0} &#39;ដែលឈ្មោះ =&#39; {1} &#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,ទំនាក់ទំនងជាមួយ Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,ប្រតិបត្ដិការសាច់ប្រាក់សុទ្ធពី
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,ធាតុ 4
@@ -3364,8 +3430,8 @@
 DocType: Journal Entry Account,Journal Entry Account,គណនីធាតុទិនានុប្បវត្តិ
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,ក្រុមនិស្សិត
 DocType: Shopping Cart Settings,Quotation Series,សម្រង់កម្រងឯកសារ
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","ធាតុមួយមានឈ្មោះដូចគ្នា ({0}), សូមផ្លាស់ប្តូរឈ្មោះធាតុឬប្ដូរឈ្មោះក្រុមធាតុ"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,សូមជ្រើសអតិថិជន
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","ធាតុមួយមានឈ្មោះដូចគ្នា ({0}), សូមផ្លាស់ប្តូរឈ្មោះធាតុឬប្ដូរឈ្មោះក្រុមធាតុ"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,សូមជ្រើសអតិថិជន
 DocType: C-Form,I,ខ្ញុំ
 DocType: Company,Asset Depreciation Cost Center,មជ្ឈមណ្ឌលតម្លៃរំលស់ទ្រព្យសម្បត្តិ
 DocType: Sales Order Item,Sales Order Date,លំដាប់ការលក់កាលបរិច្ឆេទ
@@ -3374,6 +3440,7 @@
 DocType: Assessment Plan,Assessment Plan,ផែនការការវាយតំលៃ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,អតិថិជន {0} ត្រូវបានបង្កើត។
 DocType: Stock Settings,Limit Percent,ដែនកំណត់ភាគរយ
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,បច្ចុប្បន្នពុំមានស្តុកនៅក្នុងឃ្លាំងណាមួយឡើយ
 ,Payment Period Based On Invoice Date,អំឡុងពេលបង់ប្រាក់ដែលមានមូលដ្ឋានលើវិក័យប័ត្រកាលបរិច្ឆេទ
 DocType: Sample Collection,No. of print,ចំនួននៃការបោះពុម្ព
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},បាត់ខ្លួនរូបិយប័ណ្ណប្តូរប្រាក់អត្រាការប្រាក់សម្រាប់ {0}
@@ -3429,13 +3496,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,ប្រាក់សរុប - ការដកហូតសរុប - សងប្រាក់កម្ចី
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,Bom បច្ចុប្បន្ននិងថ្មី Bom មិនអាចជាដូចគ្នា
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,លេខសម្គាល់ប័ណ្ណប្រាក់ខែ
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,លេខសម្គាល់ប័ណ្ណប្រាក់ខែ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,កាលបរិច្ឆេទនៃការចូលនិវត្តន៍ត្រូវតែធំជាងកាលបរិច្ឆេទនៃការចូលរួម
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,មានកំហុសខណៈពេលរៀបចំការពិតណាស់នៅលើគេ:
 DocType: Sales Invoice,Against Income Account,ប្រឆាំងនឹងគណនីចំណូល
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% ផ្តល់
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ធាតុ {0}: qty លំដាប់ {1} មិនអាចតិចជាង qty គោលបំណងអប្បរមា {2} (បានកំណត់ក្នុងធាតុ) ។
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ធាតុ {0}: qty លំដាប់ {1} មិនអាចតិចជាង qty គោលបំណងអប្បរមា {2} (បានកំណត់ក្នុងធាតុ) ។
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ភាគរយចែកចាយប្រចាំខែ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,សូមចូលជាអ្នកប្រើផ្សេង។
 DocType: Territory,Territory Targets,ទឹកដីគោលដៅ
 DocType: Delivery Note,Transporter Info,ពត៌មាន transporter
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},សូមកំណត់លំនាំដើមនៅ {0} {1} ក្រុមហ៊ុន
@@ -3443,13 +3511,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,ក្រុមហ៊ុនផ្គត់ផ្គង់ដូចគ្នាត្រូវបានបញ្ចូលច្រើនដង
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,ប្រាក់ចំណេញសរុប / បាត់បង់
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,ដីកាបង្គាប់របស់សហការីការទិញធាតុ
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,ឈ្មោះក្រុមហ៊ុនមិនអាចត្រូវបានក្រុមហ៊ុន
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,ឈ្មោះក្រុមហ៊ុនមិនអាចត្រូវបានក្រុមហ៊ុន
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ប្រមុខលិខិតសម្រាប់ពុម្ពអក្សរ។
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ការផ្តល់ប័ណ្ណសម្រាប់ពុម្ពដែលបោះពុម្ពឧ Proforma វិក័យប័ត្រ។
 DocType: Program Enrollment,Walking,ការដើរ
 DocType: Student Guardian,Student Guardian,អាណាព្យាបាលរបស់សិស្ស
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,ការចោទប្រកាន់មិនអាចវាយតម្លៃប្រភេទសម្គាល់ថាជាការរួមបញ្ចូល
 DocType: POS Profile,Update Stock,ធ្វើឱ្យទាន់សម័យហ៊ុន
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,នៅក្នុងការជាវ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ផ្សេងគ្នាសម្រាប់ធាតុនឹងនាំឱ្យមានមិនត្រឹមត្រូវ (សរុប) តម្លៃទម្ងន់សុទ្ធ។ សូមប្រាកដថាទម្ងន់សុទ្ធនៃធាតុគ្នាគឺនៅ UOM ដូចគ្នា។
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,អត្រា Bom
 DocType: Asset,Journal Entry for Scrap,ទិនានុប្បវត្តិធាតុសម្រាប់សំណល់អេតចាយ
@@ -3475,7 +3544,7 @@
 ,Stock Ledger,ភាគហ៊ុនសៀវភៅ
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},អត្រាការប្រាក់: {0}
 DocType: Company,Exchange Gain / Loss Account,គណនីប្តូរប្រាក់ចំណេញ / បាត់បង់
-apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,បុគ្គលិកនិងការចូលរួម
+apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,បុគ្គលិកនិងវត្តមាន
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},គោលបំណងត្រូវតែជាផ្នែកមួយនៃ {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Fill the form and save it,បំពេញសំណុំបែបបទនិងរក្សាទុកវា
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,ទាញយករបាយការណ៍ដែលមានវត្ថុធាតុដើមទាំងអស់ដែលមានស្ថានភាពសារពើភ័ណ្ឌចុងក្រោយបំផុតរបស់ពួកគេ
@@ -3499,15 +3568,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",អ្នកប្រើប្រព័ន្ធ (ចូល) លេខសម្គាល់។ ប្រសិនបើអ្នកបានកំណត់វានឹងក្លាយជាលំនាំដើមសម្រាប់ទម្រង់ធនធានមនុស្សទាំងអស់។
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: ពី {1}
 DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,រង់ចាំសម្រាប់ការធ្វើបច្ចុប្បន្នភាពតម្លៃចុងក្រោយនៅក្នុង Bill of Material ។ វាអាចចំណាយពេលពីរបីនាទី។
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,រង់ចាំសម្រាប់ការធ្វើបច្ចុប្បន្នភាពតម្លៃចុងក្រោយនៅក្នុង Bill of Material ។ វាអាចចំណាយពេលពីរបីនាទី។
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,ឈ្មោះនៃគណនីថ្មី។ ចំណាំ: សូមកុំបង្កើតគណនីសម្រាប់អតិថិជននិងអ្នកផ្គត់ផ្គង់
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,ប្រទេសអាស័យដ្ឋានពុម្ពលំនាំដើមរបស់អ្នកមានប្រាជ្ញា
 DocType: Sales Order Item,Supplier delivers to Customer,ក្រុមហ៊ុនផ្គត់ផ្គង់បានផ្ដល់នូវការទៅឱ្យអតិថិជន
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# សំណុំបែបបទ / ធាតុ / {0}) គឺចេញពីស្តុក
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},ដោយសារ / សេចក្តីយោងកាលបរិច្ឆេទមិនអាចបន្ទាប់ពី {0}
+,Sales Payment Summary,សង្ខេបការទូទាត់ការលក់
+DocType: Restaurant,Restaurant,ភោជនីយដ្ឋាន
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},ដោយសារ / សេចក្តីយោងកាលបរិច្ឆេទមិនអាចបន្ទាប់ពី {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,នាំចូលទិន្នន័យនិងការនាំចេញ
 DocType: Patient,Account Details,ព័ត៌មានអំពីគណនី
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,គ្មានសិស្សនិស្សិតបានរកឃើញ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,គ្មានសិស្សនិស្សិតបានរកឃើញ
 DocType: Medical Department,Medical Department,នាយកដ្ឋានវេជ្ជសាស្ត្រ
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,លក្ខណៈវិនិច្ឆ័យពិន្ទុអ្នកផ្គត់ផ្គង់
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,កាលបរិច្ឆេទវិក្ក័យប័ត្រ
@@ -3518,8 +3589,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,សូមជ្រើសរើសកាលបរិច្ឆេទមុនការជ្រើសគណបក្ស
 DocType: Program Enrollment,School House,សាលាផ្ទះ
 DocType: Serial No,Out of AMC,ចេញពីមជ្ឈមណ្ឌល AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,សូមជ្រើសសម្រង់សម្តី
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,សូមជ្រើសសម្រង់សម្តី
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,សូមជ្រើសសម្រង់សម្តី
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,សូមជ្រើសសម្រង់សម្តី
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ចំនួននៃការធ្លាក់ចុះបានកក់មិនអាចច្រើនជាងចំនួនសរុបនៃការធ្លាក់ថ្លៃ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,ធ្វើឱ្យការថែទាំទស្សនកិច្ច
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,សូមទាក់ទងទៅអ្នកប្រើដែលមានការលក់កម្មវិធីគ្រប់គ្រងអនុបណ្ឌិតតួនាទី {0}
@@ -3527,7 +3598,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,ក្រុមហ៊ុន (មិនមានអតិថិជនឬផ្គត់) មេ។
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,នេះត្រូវបានផ្អែកលើការចូលរួមរបស់សិស្សនេះ
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,គ្មានសិស្សនៅក្នុង
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,បន្ថែមធាតុបន្ថែមឬទម្រង់ពេញលេញបើកចំហ
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,បន្ថែមធាតុបន្ថែមឬទម្រង់ពេញលេញបើកចំហ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ភក្ដិកំណត់ត្រាកំណត់ការដឹកជញ្ជូន {0} ត្រូវតែបានលុបចោលមុនពេលលុបចោលការបញ្ជាលក់នេះ
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,ទៅកាន់អ្នកប្រើប្រាស់
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,ចំនួនទឹកប្រាក់ដែលបង់ + + បិទសរសេរចំនួនទឹកប្រាក់ដែលមិនអាចត្រូវបានធំជាងសម្ពោធសរុប
@@ -3547,37 +3618,40 @@
 DocType: Fee Schedule,Fee Schedule,តារាងកម្រៃសេវា
 DocType: Hub Settings,Publish Availability,្ងបោះពុម្ពផ្សាយ
 DocType: Company,Create Chart Of Accounts Based On,បង្កើតគំនូសតាងរបស់គណនីមូលដ្ឋាននៅលើ
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,មិនអាចបម្លែងវាទៅជាក្រុម។ កិច្ចការកុមារមាន។
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,ថ្ងៃខែឆ្នាំកំណើតមិនអាចមានចំនួនច្រើនជាងពេលបច្ចុប្បន្ននេះ។
 ,Stock Ageing,ភាគហ៊ុន Ageing
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},សិស្ស {0} មានការប្រឆាំងនឹងអ្នកសុំសិស្ស {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),ការកែសម្រួលជុំទី (រូបិយប័ណ្ណក្រុមហ៊ុន)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,តារាងពេលវេលា
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,តារាងពេលវេលា
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} &#39;{1} &quot;ត្រូវបានបិទ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ដែលបានកំណត់ជាបើកទូលាយ
 DocType: Cheque Print Template,Scanned Cheque,មូលប្បទានប័ត្រដែលបានស្កេន
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ផ្ញើអ៊ីម៉ែលដោយស្វ័យប្រវត្តិទៅទំនាក់ទំនងនៅលើដាក់ស្នើប្រតិបត្តិការ។
 DocType: Timesheet,Total Billable Amount,ចំនួនទឹកប្រាក់អាចចេញវិក្កយបត្រសរុប
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,ធាតុ 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,ធាតុលំដាប់
 DocType: Purchase Order,Customer Contact Email,ទំនាក់ទំនងអតិថិជនអ៊ីម៉ែល
 DocType: Warranty Claim,Item and Warranty Details,លម្អិតអំពីធាតុនិងការធានា
 DocType: Sales Team,Contribution (%),ចំែណក (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ចំណាំ: ការទូទាត់នឹងមិនចូលត្រូវបានបង្កើតតាំងពីសាច់ប្រាក់ឬគណនីធនាគារ &#39;មិនត្រូវបានបញ្ជាក់
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,គម្រោង {0} មានរួចហើយ
 DocType: Medical Department,Nursing User,អ្នកប្រើថែទាំ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,ការទទួលខុសត្រូវ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,រយៈពេលសុពលភាពនៃសម្រង់នេះត្រូវបានបញ្ចប់។
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,រយៈពេលសុពលភាពនៃសម្រង់នេះត្រូវបានបញ្ចប់។
 DocType: Expense Claim Account,Expense Claim Account,គណនីបណ្តឹងទាមទារការចំណាយ
 DocType: Accounts Settings,Allow Stale Exchange Rates,អនុញ្ញាតឱ្យមានអត្រាប្តូរប្រាក់ថេរ
 DocType: Sales Person,Sales Person Name,ការលក់ឈ្មោះបុគ្គល
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,សូមបញ្ចូលយ៉ាងហោចណាស់ 1 វិក័យប័ត្រក្នុងតារាង
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,បន្ថែមអ្នកប្រើ
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,បន្ថែមអ្នកប្រើ
 DocType: POS Item Group,Item Group,ធាតុគ្រុប
 DocType: Item,Safety Stock,ហ៊ុនសុវត្ថិភាព
 DocType: Healthcare Settings,Healthcare Settings,ការកំណត់សុខភាព
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,ការរីកចំរើន% សម្រាប់ភារកិច្ចមួយដែលមិនអាចមានច្រើនជាង 100 នាក់។
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,ការរីកចំរើន% សម្រាប់ភារកិច្ចមួយដែលមិនអាចមានច្រើនជាង 100 នាក់។
 DocType: Stock Reconciliation Item,Before reconciliation,មុនពេលការផ្សះផ្សាជាតិ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},ដើម្បី {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ពន្ធនិងការចោទប្រកាន់បន្ថែម (ក្រុមហ៊ុនរូបិយវត្ថុ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ជួរដេកពន្ធធាតុ {0} ត្រូវតែមានគណនីនៃប្រភេទពន្ធឬប្រាក់ចំណូលឬការចំណាយឬបន្ទុក
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ជួរដេកពន្ធធាតុ {0} ត្រូវតែមានគណនីនៃប្រភេទពន្ធឬប្រាក់ចំណូលឬការចំណាយឬបន្ទុក
 DocType: Sales Order,Partly Billed,ផ្សព្វផ្សាយមួយផ្នែក
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,ធាតុ {0} ត្រូវតែជាទ្រព្យសកម្មមួយដែលមានកាលកំណត់ធាតុ
 DocType: Item,Default BOM,Bom លំនាំដើម
@@ -3593,6 +3667,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,អថេរ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,ពីការដឹកជញ្ជូនចំណាំ
 DocType: Student,Student Email Address,អាសយដ្ឋានអ៊ីមែលរបស់សិស្ស
+DocType: Item,Hub Warehouse,ឃ្លាំង Hub
 DocType: Physician Schedule Time Slot,From Time,ចាប់ពីពេលវេលា
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,នៅក្នុងស្តុក:
 DocType: Notification Control,Custom Message,សារផ្ទាល់ខ្លួន
@@ -3601,9 +3676,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,អាសយដ្ឋានសិស្ស
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,អាសយដ្ឋានសិស្ស
 DocType: Purchase Invoice,Price List Exchange Rate,តារាងតម្លៃអត្រាប្តូរប្រាក់
+DocType: POS Profile,POS Profile Name,ឈ្មោះទម្រង់ POS
 DocType: Purchase Invoice Item,Rate,អត្រាការប្រាក់
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,ហាត់ការ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,ឈ្មោះអាសយដ្ឋាន
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,ឈ្មោះអាសយដ្ឋាន
 DocType: Stock Entry,From BOM,ចាប់ពី Bom
 DocType: Assessment Code,Assessment Code,ក្រមការវាយតំលៃ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,ជាមូលដ្ឋាន
@@ -3617,11 +3693,12 @@
 DocType: Salary Slip,Salary Structure,រចនាសម្ព័ន្ធប្រាក់បៀវត្ស
 DocType: Account,Bank,ធនាគារ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ក្រុមហ៊ុនអាកាសចរណ៍
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,សម្ភារៈបញ្ហា
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,សម្ភារៈបញ្ហា
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,កំហុសមួយបានកើតឡើងខណៈពេលបង្កើតការកើតឡើងដដែលៗ
 DocType: Material Request Item,For Warehouse,សម្រាប់ឃ្លាំង
 DocType: Employee,Offer Date,ការផ្តល់ជូនកាលបរិច្ឆេទ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,សម្រង់ពាក្យ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,អ្នកគឺជាអ្នកនៅក្នុងរបៀបក្រៅបណ្ដាញ។ អ្នកនឹងមិនអាចផ្ទុកឡើងវិញរហូតដល់អ្នកមានបណ្តាញ។
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,អ្នកគឺជាអ្នកនៅក្នុងរបៀបក្រៅបណ្ដាញ។ អ្នកនឹងមិនអាចផ្ទុកឡើងវិញរហូតដល់អ្នកមានបណ្តាញ។
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,គ្មានក្រុមនិស្សិតបានបង្កើត។
 DocType: Purchase Invoice Item,Serial No,សៀរៀលគ្មាន
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,ចំនួនទឹកប្រាក់ដែលត្រូវសងប្រចាំខែមិនអាចត្រូវបានធំជាងចំនួនទឹកប្រាក់ឥណទាន
@@ -3631,17 +3708,18 @@
 DocType: Salary Slip,Total Working Hours,ម៉ោងធ្វើការសរុប
 DocType: Subscription,Next Schedule Date,កាលបរិច្ឆេទកាលវិភាគបន្ទាប់
 DocType: Stock Entry,Including items for sub assemblies,អនុដែលរួមមានធាតុសម្រាប់សភា
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,បញ្ចូលតម្លៃត្រូវតែវិជ្ជមាន
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,ទឹកដីទាំងអស់
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,បញ្ចូលតម្លៃត្រូវតែវិជ្ជមាន
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,ទឹកដីទាំងអស់
 DocType: Purchase Invoice,Items,ធាតុ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,និស្សិតត្រូវបានចុះឈ្មោះរួចហើយ។
 DocType: Fiscal Year,Year Name,ឈ្មោះចូលឆ្នាំ
 DocType: Process Payroll,Process Payroll,បើកប្រាក់បៀវត្សដំណើរការ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,មានថ្ងៃឈប់សម្រាកច្រើនជាងថ្ងៃធ្វើការខែនេះ។
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,មានថ្ងៃឈប់សម្រាកច្រើនជាងថ្ងៃធ្វើការខែនេះ។
 DocType: Product Bundle Item,Product Bundle Item,ផលិតផលធាតុកញ្ចប់
 DocType: Sales Partner,Sales Partner Name,ឈ្មោះដៃគូការលក់
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,សំណើរពីតំលៃ
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,សំណើរពីតំលៃ
 DocType: Payment Reconciliation,Maximum Invoice Amount,ចំនួនវិក័យប័ត្រអតិបរមា
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hematology
 DocType: Normal Test Items,Normal Test Items,ធាតុសាកល្បងធម្មតា
 DocType: Student Language,Student Language,ភាសារបស់សិស្ស
 apps/erpnext/erpnext/config/selling.py +23,Customers,អតិថិជន
@@ -3653,10 +3731,11 @@
 DocType: Issue,Opening Time,ម៉ោងបើក
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,ពីនិងដើម្បីកាលបរិច្ឆេទដែលបានទាមទារ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,ផ្លាស់ប្តូរទំនិញនិងមូលបត្រ
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',អង្គភាពលំនាំដើមនៃវិធានការសម្រាប់វ៉ារ្យង់ &#39;{0} &quot;ត្រូវតែមានដូចគ្នានៅក្នុងទំព័រគំរូ&#39; {1} &#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',អង្គភាពលំនាំដើមនៃវិធានការសម្រាប់វ៉ារ្យង់ &#39;{0} &quot;ត្រូវតែមានដូចគ្នានៅក្នុងទំព័រគំរូ&#39; {1} &#39;
 DocType: Shipping Rule,Calculate Based On,គណនាមូលដ្ឋាននៅលើ
 DocType: Delivery Note Item,From Warehouse,ចាប់ពីឃ្លាំង
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,គ្មានធាតុជាមួយលោក Bill នៃសម្ភារៈដើម្បីផលិត
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,គ្មានធាតុជាមួយលោក Bill នៃសម្ភារៈដើម្បីផលិត
+DocType: Restaurant,Default Customer,អតិថិជនលំនាំដើម
 DocType: Assessment Plan,Supervisor Name,ឈ្មោះអ្នកគ្រប់គ្រង
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,កុំបញ្ជាក់ថាតើការណាត់ជួបត្រូវបានបង្កើតសម្រាប់ថ្ងៃតែមួយទេ
 DocType: Program Enrollment Course,Program Enrollment Course,កម្មវិធីវគ្គបណ្តុះបណ្តាលចុះឈ្មោះ
@@ -3672,7 +3751,7 @@
 DocType: Manufacturer,Limited to 12 characters,កំណត់ទៅជា 12 តួអក្សរ
 DocType: Journal Entry,Print Heading,បោះពុម្ពក្បាល
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,សរុបមិនអាចជាសូន្យ
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&quot;ថ្ងៃចាប់ពីលំដាប់ចុងក្រោយ &#39;ត្រូវតែធំជាងឬស្មើសូន្យ
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,"""ចាប់ទាំងពីថ្ងៃបញ្ជាចុងក្រោយ 'ត្រូវតែធំជាងឬស្មើសូន្យ"
 DocType: Process Payroll,Payroll Frequency,ភពញឹកញប់បើកប្រាក់បៀវត្ស
 DocType: Lab Test Template,Sensitivity,ភាពប្រែប្រួល
 DocType: Asset,Amended From,ធ្វើវិសោធនកម្មពី
@@ -3684,7 +3763,7 @@
 DocType: Payment Entry,Internal Transfer,សេវាផ្ទេរប្រាក់ផ្ទៃក្នុង
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,គណនីកុមារដែលមានសម្រាប់គណនីនេះ។ អ្នកមិនអាចលុបគណនីនេះ។
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ទាំង qty គោលដៅឬចំនួនគោលដៅគឺជាចាំបាច់
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},គ្មាន Bom លំនាំដើមសម្រាប់ធាតុមាន {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},គ្មាន Bom លំនាំដើមសម្រាប់ធាតុមាន {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,សូមជ្រើសរើសកាលបរិច្ឆេទដំបូងគេបង្អស់
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,បើកកាលបរិច្ឆេទគួរតែមានមុនកាលបរិចេ្ឆទផុតកំណត់
 DocType: Leave Control Panel,Carry Forward,អនុវត្តការទៅមុខ
@@ -3720,6 +3799,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,បច្ចុប្បន្នសរុប
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,របាយការណ៍គណនី
 DocType: Drug Prescription,Hour,ហួរ
+DocType: Restaurant Order Entry,Last Sales Invoice,វិក័យប័ត្រលក់ចុងក្រោយ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,គ្មានស៊េរីថ្មីនេះមិនអាចមានឃ្លាំង។ ឃ្លាំងត្រូវតែត្រូវបានកំណត់ដោយបង្កាន់ដៃហ៊ុនទិញចូលឬ
 DocType: Lead,Lead Type,ការនាំមុខប្រភេទ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យអនុម័តស្លឹកនៅលើកាលបរិច្ឆេទប្លុក
@@ -3756,65 +3836,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,បង្កើតអ្នកប្រើ
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,ក្រាម
 DocType: Supplier Scorecard,Per Month,ក្នុងមួយខែ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,បរិមាណដែលត្រូវទទួលទានក្នុងការផលិតត្រូវតែធំជាង 0 ។
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,បរិមាណដែលត្រូវទទួលទានក្នុងការផលិតត្រូវតែធំជាង 0 ។
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,សូមចូលទស្សនារបាយការណ៍សម្រាប់ការហៅថែទាំ។
 DocType: Stock Entry,Update Rate and Availability,អត្រាធ្វើឱ្យទាន់សម័យនិងអាចរកបាន
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,ចំនួនភាគរយដែលអ្នកត្រូវបានអនុញ្ញាតឱ្យទទួលបានច្រើនជាងការប្រឆាំងនឹងឬផ្តល់នូវបរិមាណបញ្ជាឱ្យ។ ឧទាហរណ៍: ប្រសិនបើអ្នកបានបញ្ជាឱ្យបាន 100 គ្រឿង។ និងអនុញ្ញាតឱ្យរបស់អ្នកគឺ 10% បន្ទាប់មកលោកអ្នកត្រូវបានអនុញ្ញាតឱ្យទទួលបាន 110 គ្រឿង។
 DocType: POS Customer Group,Customer Group,ក្រុមផ្ទាល់ខ្លួន
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),លេខសម្គាល់ជំនាន់ថ្មី (ជាជម្រើស)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),លេខសម្គាល់ជំនាន់ថ្មី (ជាជម្រើស)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),លេខសម្គាល់ជំនាន់ថ្មី (ជាជម្រើស)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),លេខសម្គាល់ជំនាន់ថ្មី (ជាជម្រើស)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},គណនីក្នុងការចំណាយជាការចាំបាច់សម្រាប់ធាតុ {0}
 DocType: BOM,Website Description,វេបសាយការពិពណ៌នាសង្ខេប
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ការផ្លាស់ប្តូរសុទ្ធនៅសមភាព
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,ថ្មីបំផុត
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,សូមបោះបង់ការទិញវិក័យប័ត្រ {0} ដំបូង
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","អាសយដ្ឋានអ៊ីមែលត្រូវតែមានតែមួយគត់, រួចហើយសម្រាប់ {0}"
 DocType: Serial No,AMC Expiry Date,កាលបរិច្ឆេទ AMC ផុតកំណត់
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,វិក័យប័ត្រ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,វិក័យប័ត្រ
 ,Sales Register,ការលក់ចុះឈ្មោះ
 DocType: Daily Work Summary Settings Company,Send Emails At,ផ្ញើអ៊ីម៉ែល
 DocType: Quotation,Quotation Lost Reason,សម្រង់បាត់បង់មូលហេតុ
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,ជ្រើសដែនរបស់អ្នក
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',ជ្រើស * ពី tabPatient ដែលឈ្មោះ = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},សេចក្ដីយោងប្រតិបត្តិការមិនមាន {0} {1} ចុះកាលបរិច្ឆេទ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},សេចក្ដីយោងប្រតិបត្តិការមិនមាន {0} {1} ចុះកាលបរិច្ឆេទ
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,មិនមានអ្វីដើម្បីកែសម្រួលទេ។
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,ទិដ្ឋភាពទម្រង់
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,សង្ខេបសម្រាប់ខែនេះនិងសកម្មភាពដែលមិនទាន់សម្រេច
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,ទិដ្ឋភាពទម្រង់
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,សង្ខេបសម្រាប់ខែនេះនិងសកម្មភាពដែលមិនទាន់សម្រេច
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.",បន្ថែមអ្នកប្រើទៅអង្គការរបស់អ្នកក្រៅពីខ្លួនឯង។
 DocType: Customer Group,Customer Group Name,ឈ្មោះក្រុមអតិថិជន
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,គ្មានអតិថិជននៅឡើយទេ!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,គ្មានអតិថិជននៅឡើយទេ!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,សេចក្តីថ្លែងការណ៍លំហូរសាច់ប្រាក់
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ចំនួនទឹកប្រាក់កម្ចីមិនអាចលើសពីចំនួនទឹកប្រាក់កម្ចីអតិបរមានៃ {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,អាជ្ញាប័ណ្ណ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},សូមយកវិក័យប័ត្រនេះ {0} ពី C-សំណុំបែបបទ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},សូមយកវិក័យប័ត្រនេះ {0} ពី C-សំណុំបែបបទ {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,សូមជ្រើសយកការទៅមុខផងដែរប្រសិនបើអ្នកចង់រួមបញ្ចូលតុល្យភាពឆ្នាំមុនសារពើពន្ធរបស់ទុកនឹងឆ្នាំសារពើពន្ធនេះ
 DocType: GL Entry,Against Voucher Type,ប្រឆាំងនឹងប្រភេទប័ណ្ណ
 DocType: Physician,Phone (R),ទូរស័ព្ទ (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,រន្ធបន្ថែមបានបន្ថែម
 DocType: Item,Attributes,គុណលក្ខណៈ
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,បើកពុម្ព
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,សូមកំណត់ស៊ុមឈ្មោះសម្រាប់ {0} តាម Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,សូមបញ្ចូលបិទសរសេរគណនី
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,លំដាប់ចុងក្រោយកាលបរិច្ឆេទ
 DocType: Patient,B Negative,ខអវិជ្ជមាន
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},គណនី {0} មិនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,លេខសៀរៀលនៅក្នុងជួរដេក {0} មិនផ្គូផ្គងនឹងការដឹកជញ្ជូនចំណាំ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,លេខសៀរៀលនៅក្នុងជួរដេក {0} មិនផ្គូផ្គងនឹងការដឹកជញ្ជូនចំណាំ
 DocType: Student,Guardian Details,កាសែត Guardian លំអិត
 DocType: C-Form,C-Form,C-សំណុំបែបបទ
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,លោក Mark វត្តមានសម្រាប់បុគ្គលិកច្រើន
 DocType: Vehicle,Chassis No,តួគ្មាន
 DocType: Payment Request,Initiated,ផ្តួចផ្តើម
 DocType: Production Order,Planned Start Date,ដែលបានគ្រោងទុកកាលបរិច្ឆេទចាប់ផ្តើម
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,សូមជ្រើសរើសលេខកូដសម្ងាត់
 DocType: Serial No,Creation Document Type,ការបង្កើតប្រភេទឯកសារ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,កាលបរិច្ឆេទបញ្ចប់ត្រូវតែធំជាងកាលបរិច្ឆេទចាប់ផ្តើម
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,កាលបរិច្ឆេទបញ្ចប់ត្រូវតែធំជាងកាលបរិច្ឆេទចាប់ផ្តើម
 DocType: Leave Type,Is Encash,តើការ Encash
 DocType: Leave Allocation,New Leaves Allocated,ស្លឹកថ្មីដែលបានបម្រុងទុក
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,ទិន្នន័យគម្រោងប្រាជ្ញាគឺមិនអាចប្រើបានសម្រាប់សម្រង់
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,បញ្ចប់នៅ
 DocType: Project,Expected End Date,គេរំពឹងថានឹងកាលបរិច្ឆេទបញ្ចប់
 DocType: Budget Account,Budget Amount,ថវិកាចំនួន
 DocType: Appraisal Template,Appraisal Template Title,ការវាយតម្លៃទំព័រគំរូចំណងជើង
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},ពីកាលបរិច្ឆេទសម្រាប់ការ {0} {1} និយោជិតមិនអាចមានការចូលរួមរបស់លោកមុនពេលដែលកាលបរិច្ឆេទបុគ្គលិក {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,ពាណិជ្ជ
 DocType: Patient,Alcohol Current Use,គ្រឿងស្រវឹងប្រើបច្ចុប្បន្ន
+DocType: Student Admission Program,Student Admission Program,កម្មវិធីចូលរៀនរបស់សិស្ស
 DocType: Payment Entry,Account Paid To,គណនីបង់ទៅ
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,ធាតុមេ {0} មិនត្រូវធាតុហ៊ុនមួយ
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,ផលិតផលឬសេវាកម្មទាំងអស់។
@@ -3823,30 +3905,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} ថវិកាសម្រាប់គណនី {1} ទល់នឹង {2} {3} គឺ {4} ។ វានឹងលើសពី {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',ជួរដេក {0} # គណនីត្រូវតែមានប្រភេទ &quot;ទ្រព្យ&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,ចេញ Qty
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,វិធានដើម្បីគណនាចំនួនដឹកជញ្ជូនសម្រាប់លក់
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,និងមិនបានដោះធីកនៅក្នុង
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,កម្រងឯកសារចាំបាច់
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,សេវាហិរញ្ញវត្ថុ
 DocType: Student Sibling,Student ID,លេខសម្គាល់របស់សិស្ស
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,ប្រភេទនៃសកម្មភាពសម្រាប់កំណត់ហេតុម៉ោង
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,អ៊ីម៉ែលផ្គត់ផ្គង់
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,ប្រភេទនៃសកម្មភាពសម្រាប់កំណត់ហេតុម៉ោង
 DocType: Tax Rule,Sales,ការលក់
 DocType: Stock Entry Detail,Basic Amount,ចំនួនទឹកប្រាក់ជាមូលដ្ឋាន
 DocType: Training Event,Exam,ការប្រឡង
 DocType: Complaint,Complaint,បណ្តឹង
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},ឃ្លាំងដែលបានទាមទារសម្រាប់ធាតុភាគហ៊ុន {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},ឃ្លាំងដែលបានទាមទារសម្រាប់ធាតុភាគហ៊ុន {0}
 DocType: Leave Allocation,Unused leaves,ស្លឹកមិនប្រើ
 DocType: Patient,Alcohol Past Use,អាល់កុលប្រើអតីតកាល
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,CR
 DocType: Tax Rule,Billing State,រដ្ឋវិក័យប័ត្រ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,សេវាផ្ទេរប្រាក់
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),យក Bom ផ្ទុះ (រួមបញ្ចូលទាំងសភាអនុ)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,សេវាផ្ទេរប្រាក់
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),យក Bom ផ្ទុះ (រួមបញ្ចូលទាំងសភាអនុ)
 DocType: Authorization Rule,Applicable To (Employee),ដែលអាចអនុវត្តទៅ (បុគ្គលិក)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,កាលបរិច្ឆេទដល់កំណត់គឺជាចាំបាច់
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,កាលបរិច្ឆេទដល់កំណត់គឺជាចាំបាច់
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,ចំនួនបន្ថែមសម្រាប់គុណលក្ខណៈ {0} មិនអាចជា 0
 DocType: Journal Entry,Pay To / Recd From,ចំណាយប្រាក់ដើម្បី / Recd ពី
 DocType: Naming Series,Setup Series,ការរៀបចំស៊េរី
 DocType: Payment Reconciliation,To Invoice Date,ដើម្បី invoice កាលបរិច្ឆេទ
 DocType: Supplier,Contact HTML,ការទំនាក់ទំនងរបស់ HTML
 ,Inactive Customers,អតិថិជនអសកម្ម
+DocType: Student Admission Program,Maximum Age,អាយុអតិបរមា
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,បង្កាន់ដៃទិញ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,តើធ្វើដូចម្តេចតម្លៃវិធានត្រូវបានអនុវត្ត?
@@ -3861,10 +3945,11 @@
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ទិញពន្ធនិងការចោទប្រកាន់ពីទំព័រគំរូ
 DocType: Upload Attendance,Download Template,ទំព័រគំរូទាញយក
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: ឥណពន្ធឬចំនួនទឹកប្រាក់ឥណទានទាំងត្រូវបានទាមទារសម្រាប់ {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: ទាំងឥណពន្ធឬចំនួនទឹកប្រាក់ឥណទានត្រូវបានទាមទារសម្រាប់ {2}
 DocType: GL Entry,Remarks,សុន្ទរកថា
 DocType: Payment Entry,Account Paid From,គណនីបង់ពី
 DocType: Purchase Order Item Supplied,Raw Material Item Code,លេខកូដធាតុវត្ថុធាតុដើម
+DocType: Task,Parent Task,កិច្ចការមាតាឬបិតា
 DocType: Journal Entry,Write Off Based On,បិទការសរសេរមូលដ្ឋាននៅលើ
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,ធ្វើឱ្យការនាំមុខ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,បោះពុម្ពនិងការិយាល័យ
@@ -3873,20 +3958,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","ប្រាក់បៀវត្សដែលបានដំណើរការរួចទៅហើយសម្រាប់សម័យនេះរវាង {0} និង {1}, ទុកឱ្យរយៈពេលកម្មវិធីមិនអាចមានរវាងជួរកាលបរិច្ឆេទនេះ។"
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,កំណត់ត្រាអំពីការដំឡើងសម្រាប់លេខស៊េរី
 DocType: Guardian Interest,Guardian Interest,កាសែត The Guardian ការប្រាក់
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,ដំឡើងតម្លៃលំនាំដើមសម្រាប់វិក្កយបត្រ POS
 apps/erpnext/erpnext/config/hr.py +177,Training,ការបណ្តុះបណ្តាល
 DocType: Timesheet,Employee Detail,បុគ្គលិកលំអិត
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,លេខសម្គាល់អ៊ីមែល Guardian1
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,លេខសម្គាល់អ៊ីមែល Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,ថ្ងៃកាលបរិច្ឆេទក្រោយនិងធ្វើម្តងទៀតនៅថ្ងៃនៃខែត្រូវតែស្មើ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,ថ្ងៃកាលបរិច្ឆេទក្រោយនិងធ្វើម្តងទៀតនៅថ្ងៃនៃខែត្រូវតែស្មើ
 DocType: Lab Prescription,Test Code,កូដសាកល្បង
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,ការកំណត់សម្រាប់គេហទំព័រគេហទំព័រ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQs មិនត្រូវបានអនុញ្ញាតសម្រាប់ {0} ដោយសារតែពិន្ទុនៃពិន្ទុនៃ {1}
 DocType: Offer Letter,Awaiting Response,រង់ចាំការឆ្លើយតប
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,ខាងលើ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},ចំនួនទឹកប្រាក់សរុប {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},គុណលក្ខណៈមិនត្រឹមត្រូវ {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},ចំនួនទឹកប្រាក់សរុប {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},គុណលក្ខណៈមិនត្រឹមត្រូវ {0} {1}
 DocType: Supplier,Mention if non-standard payable account,និយាយពីប្រសិនបើគណនីត្រូវបង់មិនស្តង់ដារ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},ធាតុដូចគ្នាត្រូវបានបញ្ចូលជាច្រើនដង។ {បញ្ជី}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',សូមជ្រើសក្រុមការវាយតម្លៃផ្សេងទៀតជាង &quot;ក្រុមវាយតម្លៃទាំងអស់ &#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},ជួរដេក {0}: មជ្ឈមណ្ឌលចំណាយត្រូវបានទាមទារសម្រាប់ធាតុ {1}
 DocType: Training Event Employee,Optional,ស្រេចចិត្ត
@@ -3909,13 +3994,15 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: មជ្ឈមណ្ឌលចំណាយគឺជាការចាំបាច់សម្រាប់ធាតុ {2}
 DocType: Vehicle,Policy No,គោលនយោបាយគ្មាន
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,ទទួលបានធាតុពីកញ្ចប់ផលិតផល
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","ក្នុងនាមជាភាគហ៊ុនដែលមានប្រឆាំងនឹងធាតុ {0} មួយ, អ្នកមិនអាចបើកមានលក្ខណៈសម្បត្តិវ៉ារ្យ៉ង់"
 DocType: Asset,Straight Line,បន្ទាត់ត្រង់
 DocType: Project User,Project User,អ្នកប្រើប្រាស់គម្រោង
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,ពុះ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,ពុះ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,ពុះ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,ពុះ
 DocType: GL Entry,Is Advance,តើការជាមុន
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,ការចូលរួមពីកាលបរិច្ឆេទនិងចូលរួមកាលបរិច្ឆេទគឺជាចាំបាច់
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,សូមបញ្ចូល &lt;តើកិច្ចសន្យាបន្ដ &#39;ជាបាទឬទេ
+DocType: Item,Default Purchase Unit of Measure,ឯកតាការទិញឯកតានៃការវាស់ស្ទង់
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,កាលបរិច្ឆេទចុងក្រោយការទំនាក់ទំនង
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,កាលបរិច្ឆេទចុងក្រោយការទំនាក់ទំនង
 DocType: Sales Team,Contact No.,លេខទំនាក់ទំនងទៅ
@@ -3924,7 +4011,6 @@
 DocType: Production Order,Check if material transfer entry is not required,ពិនិត្យមើលថាតើធាតុផ្ទេរសម្ភារៈមិនត្រូវបានទាមទារ
 DocType: Production Order,Check if material transfer entry is not required,ពិនិត្យមើលថាតើធាតុផ្ទេរសម្ភារៈមិនត្រូវបានទាមទារ
 DocType: Program Enrollment Tool,Get Students From,ទទួលយកសិស្សពី
-DocType: Hub Settings,Seller Country,អ្នកលក់ប្រទេស
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,បោះពុម្ពផ្សាយធាតុលើវេបសាយ
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,ក្រុមនិស្សិតរបស់អ្នកនៅក្នុងជំនាន់
 DocType: Authorization Rule,Authorization Rule,វិធានសេចក្តីអនុញ្ញាត
@@ -3934,8 +4020,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,ពន្ធលក់និងការចោទប្រកាន់ពីទំព័រគំរូ
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),សរុប (ឥណទាន)
 DocType: Repayment Schedule,Payment Date,កាលបរិច្ឆេទការទូទាត់
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,ជំនាន់ថ្មី Qty
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,ជំនាន់ថ្មី Qty
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,ជំនាន់ថ្មី Qty
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,ជំនាន់ថ្មី Qty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,សម្លៀកបំពាក់និងគ្រឿងបន្លាស់
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,មិនអាចដោះស្រាយមុខងារពិន្ទុមានទម្ងន់។ ប្រាកដថារូបមន្តគឺត្រឹមត្រូវ។
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,ចំនួននៃលំដាប់
@@ -3953,6 +4039,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មិនអាចត្រូវបានដាក់ស្នើ, វារួចទៅហើយ {2}"
 DocType: Tax Rule,Billing Country,វិក័យប័ត្រប្រទេស
 DocType: Purchase Order Item,Expected Delivery Date,គេរំពឹងថាការដឹកជញ្ជូនកាលបរិច្ឆេទ
+DocType: Restaurant Order Entry,Restaurant Order Entry,ភោជនីយដ្ឋានការបញ្ជាទិញចូល
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ឥណពន្ធនិងឥណទានមិនស្មើគ្នាសម្រាប់ {0} # {1} ។ ភាពខុសគ្នាគឺ {2} ។
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,ចំណាយកំសាន្ត
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,ធ្វើឱ្យសម្ភារៈសំណើ
@@ -3965,9 +4052,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,គណនីប្រតិបត្តិការដែលមានស្រាប់ដែលមិនអាចត្រូវបានលុប
 DocType: Vehicle,Last Carbon Check,ពិនិត្យកាបូនចុងក្រោយនេះ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,ការចំណាយផ្នែកច្បាប់
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,សូមជ្រើសរើសបរិមាណនៅលើជួរដេក
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,សូមជ្រើសរើសបរិមាណនៅលើជួរដេក
 DocType: Purchase Invoice,Posting Time,ម៉ោងប្រកាស
 DocType: Timesheet,% Amount Billed,% ចំនួន billed
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;ពេលវេលាក្នុងការតែងតាំង&quot; មិនត្រូវបានកំណត់សម្រាប់វេជ្ជបណ្ឌិត {0} ទេ។ បន្ថែមវាទៅគ្រូពេទ្យ។
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,ការចំណាយតាមទូរស័ព្ទ
 DocType: Sales Partner,Logo,រូបសញ្ញា
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,ធីកប្រអប់នេះប្រសិនបើអ្នកចង់បង្ខំឱ្យអ្នកប្រើជ្រើសស៊េរីមុនពេលរក្សាទុក។ វានឹងជាលំនាំដើមប្រសិនបើអ្នកធីកនេះ។
@@ -3978,6 +4066,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,ប្រាក់ចំណូលអតិថិជនថ្មី
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,ការចំណាយការធ្វើដំណើរ
 DocType: Maintenance Visit,Breakdown,ការវិភាគ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},បន្ថែមវាលផ្ទាល់ខ្លួនការជាវនៅក្នុង doctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,គណនី: {0} ដែលមានរូបិយប័ណ្ណ: {1} មិនអាចត្រូវបានជ្រើស &amp; ‧;
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",បន្ទាន់សម័យ BOM ចំណាយដោយស្វ័យប្រវត្តិតាមរយៈកម្មវិធីកំណត់ពេលដោយផ្អែកលើអត្រាតំលៃចុងក្រោយ / អត្រាតំលៃបញ្ជី / អត្រាទិញចុងក្រោយនៃវត្ថុធាតុដើម។
 DocType: Bank Reconciliation Detail,Cheque Date,កាលបរិច្ឆេទមូលប្បទានប័ត្រ
@@ -4002,7 +4091,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),ចំនួនវិក័យប័ត្រសរុប (តាមរយៈការពេលវេលាកំណត់ហេតុ)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,លេខសម្គាល់អ្នកផ្គត់ផ្គង់
 DocType: Payment Request,Payment Gateway Details,សេចក្ដីលម្អិតការទូទាត់
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,បរិមាណដែលត្រូវទទួលទានគួរជាធំជាង 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,បរិមាណដែលត្រូវទទួលទានគួរជាធំជាង 0
 DocType: Journal Entry,Cash Entry,ចូលជាសាច់ប្រាក់
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,ថ្នាំងកុមារអាចត្រូវបានបង្កើតតែនៅក្រោមថ្នាំងប្រភេទ &#39;ក្រុម
 DocType: Leave Application,Half Day Date,កាលបរិច្ឆេទពាក់កណ្តាលថ្ងៃ
@@ -4020,12 +4109,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,ចំណាំ: ធាតុ {0} បានចូលច្រើនដង
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,ទំនាក់ទំនងទាំងអស់។
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,អក្សរកាត់របស់ក្រុមហ៊ុន
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,ប្រើ {0} មិនមាន
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,ប្រើ {0} មិនមាន
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,អក្សរកាត់
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,ចូលការទូទាត់រួចហើយ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,មិន authroized តាំងពី {0} លើសពីដែនកំណត់
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,ចៅហ្វាយពុម្ពប្រាក់បៀវត្ស។
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,រោគសាស្ត្រ
+DocType: Restaurant Order Entry,Restaurant Table,តារាងភោជនីយដ្ឋាន
 DocType: Leave Type,Max Days Leave Allowed,អតិបរមាដែលបានអនុញ្ញាតទុកថ្ងៃ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,កំណត់ច្បាប់ពន្ធសម្រាប់រទេះដើរទិញឥវ៉ាន់
 DocType: Purchase Invoice,Taxes and Charges Added,ពន្ធនិងការចោទប្រកាន់បន្ថែម
@@ -4037,10 +4128,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ដកស្រង់ដើម្បីដឹកនាំឬអតិថិជន។
 DocType: Stock Settings,Role Allowed to edit frozen stock,តួនាទីដែលត្រូវបានអនុញ្ញាតឱ្យកែសម្រួលភាគហ៊ុនទឹកកក
 ,Territory Target Variance Item Group-Wise,ទឹកដីរបស់ធាតុគោលដៅអថេរ Group និងក្រុមហ៊ុនដែលមានប្រាជ្ញា
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,ក្រុមអតិថិជនទាំងអស់
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,ក្រុមអតិថិជនទាំងអស់
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,បង្គរប្រចាំខែ
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} គឺជាចាំបាច់។ ប្រហែលជាកំណត់ត្រាប្តូររូបិយប័ណ្ណមិនត្រូវបានបង្កើតឡើងសម្រាប់ {1} ទៅ {2} ។
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,ទំព័រគំរូពន្ធលើគឺជាចាំបាច់។
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,ទំព័រគំរូពន្ធលើគឺជាចាំបាច់។
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,គណនី {0}: គណនីមាតាបិតា {1} មិនមាន
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),បញ្ជីតម្លៃដែលអត្រា (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: Products Settings,Products Settings,ការកំណត់ផលិតផល
@@ -4066,13 +4157,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ពត៌មានលំអិតពន្ធលើដែលមានប្រាជ្ញាធាតុ
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,អក្សរកាត់វិទ្យាស្ថាន
 ,Item-wise Price List Rate,អត្រាតារាងតម្លៃធាតុប្រាជ្ញា
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,សម្រង់ក្រុមហ៊ុនផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,សម្រង់ក្រុមហ៊ុនផ្គត់ផ្គង់
 DocType: Quotation,In Words will be visible once you save the Quotation.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាទុកការសម្រង់នេះ។
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},បរិមាណ ({0}) មិនអាចជាប្រភាគក្នុងមួយជួរដេក {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},បរិមាណ ({0}) មិនអាចជាប្រភាគក្នុងមួយជួរដេក {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},លេខកូដ {0} ត្រូវបានប្រើរួចហើយនៅក្នុងធាតុ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},លេខកូដ {0} ត្រូវបានប្រើរួចហើយនៅក្នុងធាតុ {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,ក្បួនសម្រាប់ការបន្ថែមការចំណាយលើការដឹកជញ្ជូន។
 DocType: Item,Opening Stock,ការបើកផ្សារហ៊ុន
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,អតិថិជនគឺត្រូវបានទាមទារ
@@ -4090,16 +4181,15 @@
 DocType: Customer,From Lead,បានមកពីអ្នកដឹកនាំ
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ការបញ្ជាទិញដែលបានចេញផ្សាយសម្រាប់ការផលិត។
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,ជ្រើសឆ្នាំសារពើពន្ធ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,ម៉ាស៊ីនឆូតកាតពត៌មានផ្ទាល់ខ្លួនត្រូវបានទាមទារដើម្បីធ្វើឱ្យធាតុរបស់ម៉ាស៊ីនឆូតកាត
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,ម៉ាស៊ីនឆូតកាតពត៌មានផ្ទាល់ខ្លួនត្រូវបានទាមទារដើម្បីធ្វើឱ្យធាតុរបស់ម៉ាស៊ីនឆូតកាត
 DocType: Program Enrollment Tool,Enroll Students,ចុះឈ្មោះសិស្ស
-DocType: Hub Settings,Name Token,ឈ្មោះនិមិត្តសញ្ញា
 DocType: Lab Test,Approved Date,កាលបរិច្ឆេទអនុម័ត
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ស្តង់ដាលក់
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,យ៉ាងហោចណាស់មានម្នាក់ឃ្លាំងគឺជាចាំបាច់
 DocType: Serial No,Out of Warranty,ចេញពីការធានា
 DocType: BOM Update Tool,Replace,ជំនួស
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,គ្មានផលិតផលដែលបានរកឃើញ។
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} ប្រឆាំងនឹងវិក័យប័ត្រលក់ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} បដិសេដនឹងវិក័យប័ត្រលក់ {1}
 DocType: Antibiotic,Laboratory User,អ្នកប្រើមន្ទីរពិសោធន៍
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,ឈ្មោះគម្រោង
@@ -4110,7 +4200,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,ធនធានមនុស្ស
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,ការទូទាត់ការផ្សះផ្សាការទូទាត់
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,ការប្រមូលពន្ធលើទ្រព្យសម្បត្តិ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},ផលិតកម្មលំដាប់បាន {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},ផលិតកម្មលំដាប់បាន {0}
 DocType: BOM Item,BOM No,Bom គ្មាន
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,ធាតុទិនានុប្បវត្តិ {0} មិនមានគណនី {1} ឬកាតមានទឹកប្រាក់រួចហើយបានផ្គូផ្គងប្រឆាំងនឹងផ្សេងទៀត
@@ -4130,8 +4220,8 @@
 DocType: Currency Exchange,To Currency,ដើម្បីរូបិយប័ណ្ណ
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,អនុញ្ញាតឱ្យអ្នកប្រើដូចខាងក្រោមដើម្បីអនុម័តកម្មវិធីសុំច្បាប់សម្រាកសម្រាប់ថ្ងៃប្លុក។
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,ប្រភេទនៃការទាមទារសំណងថ្លៃ។
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},អត្រាសម្រាប់ធាតុលក់ {0} គឺទាបជាង {1} របស់ខ្លួន។ អត្រាលក់គួរមានយ៉ាងហោចណាស់ {2}
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},អត្រាសម្រាប់ធាតុលក់ {0} គឺទាបជាង {1} របស់ខ្លួន។ អត្រាលក់គួរមានយ៉ាងហោចណាស់ {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},អត្រាសម្រាប់ធាតុលក់ {0} គឺទាបជាង {1} របស់ខ្លួន។ អត្រាលក់គួរមានយ៉ាងហោចណាស់ {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},អត្រាសម្រាប់ធាតុលក់ {0} គឺទាបជាង {1} របស់ខ្លួន។ អត្រាលក់គួរមានយ៉ាងហោចណាស់ {2}
 DocType: Item,Taxes,ពន្ធ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,បង់និងការមិនផ្តល់
 DocType: Project,Default Cost Center,មជ្ឈមណ្ឌលតម្លៃលំនាំដើម
@@ -4145,15 +4235,15 @@
 DocType: Employee Loan,Fully Disbursed,ផ្តល់ឱ្រយអតិថិជនបានយ៉ាងពេញលេញ
 DocType: Maintenance Visit,Customer Feedback,ការឆ្លើយតបរបស់អតិថិជន
 DocType: Account,Expense,ការចំណាយ
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,ពិន្ទុមិនអាចត្រូវបានធំជាងពិន្ទុអតិបរមា
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,ពិន្ទុមិនអាចត្រូវបានធំជាងពិន្ទុអតិបរមា
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,អតិថិជននិងអ្នកផ្គត់ផ្គង់
 DocType: Item Attribute,From Range,ពីជួរ
 DocType: BOM,Set rate of sub-assembly item based on BOM,កំណត់អត្រានៃធាតុផ្សំរងដោយផ្អែកលើ BOM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},កំហុសវាក្យសម្ព័ន្ធនៅក្នុងរូបមន្តឬស្ថានភាព: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},កំហុសវាក្យសម្ព័ន្ធនៅក្នុងរូបមន្តឬស្ថានភាព: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,ក្រុមហ៊ុន Daily បានធ្វើការកំណត់ការសង្ខេប
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,ធាតុ {0} មិនអើពើចាប់តាំងពីវាគឺមិនមានធាតុភាគហ៊ុន
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,ដាក់ស្នើសម្រាប់ដំណើរការបន្ថែមផលិតកម្មលំដាប់នេះ។
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,ដាក់ស្នើសម្រាប់ដំណើរការបន្ថែមផលិតកម្មលំដាប់នេះ។
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",ការមិនអនុវត្តវិធានតម្លៃក្នុងប្រតិបត្តិការពិសេសមួយដែលអនុវត្តបានទាំងអស់ក្បួនតម្លៃគួរតែត្រូវបានបិទ។
 DocType: Assessment Group,Parent Assessment Group,ការវាយតំលៃគ្រុបមាតាបិតា
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,ការងារ
@@ -4170,12 +4260,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',សូមកំណត់ក្រុមហ៊ុនត្រងនៅទទេប្រសិនបើក្រុមតាមគឺ &#39;ក្រុមហ៊ុន&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,ការប្រកាសកាលបរិច្ឆេទមិនអាចបរិច្ឆេទនាពេលអនាគត
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},ជួរដេក # {0}: សៀរៀលគ្មាន {1} មិនផ្គូផ្គងនឹង {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,សម្រាប់ការបង្កើតឡើងវិញ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,ចាកចេញធម្មតា
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,ពិសោធន៍មន្ទីរពិសោធន៍ UOM ។
 DocType: Batch,Batch ID,លេខសម្គាល់បាច់
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},ចំណាំ: {0}
 ,Delivery Note Trends,និន្នាការដឹកជញ្ជូនចំណាំ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,សប្តាហ៍នេះមានសេចក្តីសង្ខេប
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,សប្តាហ៍នេះមានសេចក្តីសង្ខេប
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,នៅក្នុងផ្សារ Qty
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,គណនី: {0} អាចត្រូវបានធ្វើឱ្យទាន់សម័យបានតែតាមរយៈប្រតិបត្តិការហ៊ុន
 DocType: Student Group Creation Tool,Get Courses,ទទួលបានវគ្គសិក្សា
@@ -4189,7 +4280,6 @@
 DocType: Purchase Order,To Bill,លោក Bill
 DocType: Material Request,% Ordered,% លំដាប់
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",សម្រាប់សិស្សនិស្សិតដែលមានមូលដ្ឋានលើវគ្គសិក្សាជាក្រុមហើយវគ្គនេះនឹងមានសុពលភាពសម្រាប់គ្រប់សិស្សចុះឈ្មោះចូលរៀនវគ្គសិក្សានេះបានមកពីកម្មវិធីចុះឈ្មោះចូលរៀននៅ។
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","បញ្ចូលអាសយដ្ឋានអ៊ីមែលដែលបំបែកដោយសញ្ញាក្បៀស, វិក័យប័ត្រនឹងត្រូវបានផ្ញើដោយស្វ័យប្រវត្តិនៅលើកាលបរិច្ឆេទពិសេស"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,ម៉ៅការ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,ជាមធ្យម។ អត្រាទិញ
 DocType: Task,Actual Time (in Hours),ពេលវេលាពិតប្រាកដ (នៅក្នុងម៉ោងធ្វើការ)
@@ -4203,7 +4293,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,ធាតុ {0} មិនត្រូវបានដំឡើងសម្រាប់ការសៀរៀល Nos ។ ជួរឈរត្រូវទទេ
 DocType: Accounts Settings,Accounts Settings,ការកំណត់គណនី
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,អនុម័ត
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,គ្មានលទ្ធផលដើម្បីដាក់ស្នើ
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,គ្មានលទ្ធផលដើម្បីដាក់ស្នើ
 DocType: Customer,Sales Partner and Commission,ការលក់ដៃគូនិងគណៈកម្មការ
 DocType: Employee Loan,Rate of Interest (%) / Year,អត្រានៃការប្រាក់ (%) / ឆ្នាំ
 ,Project Quantity,បរិមាណគម្រោង
@@ -4215,55 +4305,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,ពណ៌ខ្មៅ
 DocType: BOM Explosion Item,BOM Explosion Item,ធាតុផ្ទុះ Bom
 DocType: Account,Auditor,សវនករ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} ធាតុផលិត
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} ធាតុផលិត
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,ស្វែងយល់បន្ថែម
 DocType: Cheque Print Template,Distance from top edge,ចម្ងាយពីគែមកំពូល
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,បញ្ជីតម្លៃ {0} ត្រូវបានបិទឬមិនមាន
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,បញ្ជីតម្លៃ {0} ត្រូវបានបិទឬមិនមាន
 DocType: Purchase Invoice,Return,ត្រឡប់មកវិញ
 DocType: Production Order Operation,Production Order Operation,ផលិតកម្មលំដាប់ប្រតិបត្តិការ
 DocType: Pricing Rule,Disable,មិនអនុញ្ញាត
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,របៀបនៃការទូទាត់គឺត្រូវបានទាមទារដើម្បីធ្វើឱ្យការទូទាត់
 DocType: Project Task,Pending Review,ការរង់ចាំការត្រួតពិនិត្យឡើងវិញ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,ការតែងតាំងនិងការពិគ្រោះយោបល់
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} មិនត្រូវបានចុះឈ្មោះក្នុងជំនាន់ទី {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} មិនត្រូវបានចុះឈ្មោះក្នុងជំនាន់ទី {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","ទ្រព្យសកម្ម {0} មិនអាចត្រូវបានបោះបង់ចោល, ដូចដែលវាមានរួចទៅ {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),ពាក្យបណ្តឹងការចំណាយសរុប (តាមរយៈបណ្តឹងទាមទារការចំណាយ)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,លោក Mark អវត្តមាន
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ជួរដេក {0}: រូបិយប័ណ្ណរបស់ Bom បាន # {1} គួរតែស្មើនឹងរូបិយប័ណ្ណដែលបានជ្រើស {2}
 DocType: Journal Entry Account,Exchange Rate,អត្រាប្តូរប្រាក់
 DocType: Patient,Additional information regarding the patient,ព័ត៌មានបន្ថែមទាក់ទងនឹងអ្នកជំងឺ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,ការលក់លំដាប់ {0} គឺមិនត្រូវបានដាក់ស្នើ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,ការលក់លំដាប់ {0} គឺមិនត្រូវបានដាក់ស្នើ
 DocType: Homepage,Tag Line,បន្ទាត់ស្លាក
 DocType: Fee Component,Fee Component,សមាសភាគថ្លៃសេវា
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,គ្រប់គ្រងកងនាវា
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,បន្ថែមធាតុពី
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,គ្រប់គ្រងកងនាវា
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,បន្ថែមធាតុពី
 DocType: Cheque Print Template,Regular,ទៀងទាត
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,weightage សរុបនៃលក្ខណៈវិនិច្ឆ័យការវាយតម្លៃទាំងអស់ត្រូវ 100%
-DocType: BOM,Last Purchase Rate,អត្រាទិញចុងក្រោយ
+DocType: Purchase Order Item,Last Purchase Rate,អត្រាទិញចុងក្រោយ
 DocType: Account,Asset,ទ្រព្យសកម្ម
 DocType: Project Task,Task ID,ភារកិច្ចលេខសម្គាល់
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,ភាគហ៊ុនមិនអាចមានសម្រាប់ធាតុ {0} តាំងពីមានវ៉ារ្យ៉ង់
 DocType: Lab Test,Mobile,ទូរស័ព្ទដៃ
 ,Sales Person-wise Transaction Summary,ការលក់បុគ្គលប្រាជ្ញាសង្ខេបប្រតិបត្តិការ
 DocType: Training Event,Contact Number,លេខទំនាក់ទំនង
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,ឃ្លាំង {0} មិនមាន
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ចុះឈ្មោះសម្រាប់ហាប់ ERPNext
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,ឃ្លាំង {0} មិនមាន
 DocType: Monthly Distribution,Monthly Distribution Percentages,ចំនួនភាគរយចែកចាយប្រចាំខែ
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,ធាតុដែលបានជ្រើសមិនអាចមានជំនាន់ទី
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","រកមិនឃើញអត្រានៃការវាយតម្លៃសម្រាប់ធាតុដែលបាន {0}, ដែលត្រូវបានតម្រូវឱ្យធ្វើការបញ្ចូលគណនីសម្រាប់ {1} {2} ។ បើធាតុនេះត្រូវបានប្រតិបត្តិការជាធាតុគំរូមួយនៅក្នុង {1}, សូមនិយាយថានៅក្នុង {1} តារាងធាតុ។ បើមិនដូច្នោះទេសូមបង្កើតភាគហ៊ុនប្រតិបត្តិការចូលសម្រាប់អត្រាតម្លៃធាតុឬការនិយាយនៅក្នុងកំណត់ត្រាធាតុហើយបន្ទាប់មកព្យាយាម submiting / លុបចោលធាតុនេះ"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,សមា្ភារៈបានបញ្ជូន% នៃការប្រឆាំងនឹងការផ្តល់ចំណាំនេះ
+DocType: Training Event,Has Certificate,មានវិញ្ញាបនប័ត្រ
 DocType: Project,Customer Details,ពត៌មានលំអិតរបស់អតិថិជន
 DocType: Employee,Reports to,របាយការណ៍ទៅ
 ,Unpaid Expense Claim,ពាក្យបណ្តឹងការចំណាយគ្មានប្រាក់ខែ
 DocType: Payment Entry,Paid Amount,ចំនួនទឹកប្រាក់ដែលបង់
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,រកមើលវដ្តនៃការលក់
 DocType: Assessment Plan,Supervisor,អ្នកគ្រប់គ្រង
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,លើបណ្តាញ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,លើបណ្តាញ
 ,Available Stock for Packing Items,អាចរកបានសម្រាប់វេចខ្ចប់ហ៊ុនរបស់របរ
 DocType: Item Variant,Item Variant,ធាតុវ៉ារ្យង់
 DocType: Assessment Result Tool,Assessment Result Tool,ការវាយតំលៃលទ្ធផលឧបករណ៍
 DocType: BOM Scrap Item,BOM Scrap Item,ធាតុសំណល់អេតចាយ Bom
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,ការបញ្ជាទិញដែលបានដាក់ស្នើមិនអាចត្រូវបានលុប
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,ការបញ្ជាទិញដែលបានដាក់ស្នើមិនអាចត្រូវបានលុប
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","សមតុល្យគណនីរួចហើយនៅក្នុងឥណពន្ធ, អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកំណត់ទឹកប្រាក់ត្រូវតែ &quot;ជា&quot; ឥណទាន &quot;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,គ្រប់គ្រងគុណភាព
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,ធាតុ {0} ត្រូវបានបិទ
@@ -4284,7 +4373,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,អនុញ្ញាតឱ្យអត្រាការវាយតម្លៃសូន្យ
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,អនុញ្ញាតឱ្យអត្រាការវាយតម្លៃសូន្យ
 DocType: Training Event Employee,Invited,បានអញ្ជើញ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,រចនាសម្ព័ន្ធប្រាក់ខែសកម្មច្រើនបានរកឃើញសម្រាប់ {0} បុគ្គលិកសម្រាប់កាលបរិច្ឆេទដែលបានផ្ដល់ឱ្យ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,រចនាសម្ព័ន្ធប្រាក់ខែសកម្មច្រើនបានរកឃើញសម្រាប់ {0} បុគ្គលិកសម្រាប់កាលបរិច្ឆេទដែលបានផ្ដល់ឱ្យ
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,រៀបចំគណនីច្រកផ្លូវ។
 DocType: Employee,Employment Type,ប្រភេទការងារធ្វើ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,ទ្រព្យសកម្មថេរ
@@ -4296,7 +4385,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,លេខសម្គាល់អ៊ីមែលរបស់សិស្ស
 DocType: Employee,Notice (days),សេចក្តីជូនដំណឹង (ថ្ងៃ)
 DocType: Tax Rule,Sales Tax Template,ទំព័រគំរូពន្ធលើការលក់
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,ជ្រើសធាតុដើម្បីរក្សាទុកការវិក្ក័យប័ត្រ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,ជ្រើសធាតុដើម្បីរក្សាទុកការវិក្ក័យប័ត្រ
 DocType: Employee,Encashment Date,Encashment កាលបរិច្ឆេទ
 DocType: Training Event,Internet,អ៊ីនធើណែ
 DocType: Special Test Template,Special Test Template,គំរូសាកល្បងពិសេស
@@ -4306,7 +4395,7 @@
 DocType: Academic Term,Term Start Date,រយៈពេលចាប់ផ្តើមកាលបរិច្ឆេទ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,រាប់ចម្បង
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,រាប់ចម្បង
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},សូមស្វែងរកការភ្ជាប់ {0} {1} #
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},សូមស្វែងរកការភ្ជាប់ {0} {1} #
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,ធនាគារតុល្យភាពសេចក្តីថ្លែងការណ៍ដូចជាក្នុងសៀវភៅធំ
 DocType: Job Applicant,Applicant Name,ឈ្មោះកម្មវិធី
 DocType: Authorization Rule,Customer / Item Name,អតិថិជន / ធាតុឈ្មោះ
@@ -4326,7 +4415,7 @@
 DocType: Guardian,Guardian Of ,អាណាព្យាបាល
 DocType: Grading Scale Interval,Threshold,កម្រិតពន្លឺ
 DocType: BOM Update Tool,Current BOM,Bom នាពេលបច្ចុប្បន្ន
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,បន្ថែមគ្មានសៀរៀល
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,បន្ថែមគ្មានសៀរៀល
 DocType: Production Order Item,Available Qty at Source Warehouse,ដែលអាចប្រើបាន Qty នៅឃ្លាំងប្រភព
 apps/erpnext/erpnext/config/support.py +22,Warranty,ការធានា
 DocType: Purchase Invoice,Debit Note Issued,ចេញផ្សាយឥណពន្ធចំណាំ
@@ -4349,10 +4438,9 @@
 DocType: Account,Receivable,អ្នកទទួល
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ជួរដេក # {0}: មិនត្រូវបានអនុញ្ញាតឱ្យផ្លាស់ប្តូរហាងទំនិញថាជាការទិញលំដាប់រួចហើយ
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,តួនាទីដែលត្រូវបានអនុញ្ញាតឱ្យដាក់ស្នើតិបត្តិការដែលលើសពីដែនកំណត់ឥណទានបានកំណត់។
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,ជ្រើសធាតុដើម្បីផលិត
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","ធ្វើសមកាលកម្មទិន្នន័យអនុបណ្ឌិត, វាអាចចំណាយពេលខ្លះ"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,ជ្រើសធាតុដើម្បីផលិត
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","ធ្វើសមកាលកម្មទិន្នន័យអនុបណ្ឌិត, វាអាចចំណាយពេលខ្លះ"
 DocType: Item,Material Issue,សម្ភារៈបញ្ហា
-DocType: Hub Settings,Seller Description,អ្នកលក់ការពិពណ៌នាសង្ខេប
 DocType: Employee Education,Qualification,គុណវុឌ្ឍិ
 DocType: Item Price,Item Price,ថ្លៃទំនិញ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,ដុំនិងសាប៊ូម្ស៉ៅ
@@ -4360,7 +4448,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,ចាប់ពីពេលដែលមិនអាចត្រូវបានធំជាងទៅពេលមួយ។
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,វីដេអូចលនារូបភាព &amp;
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,បានបញ្ជាឱ្យ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,ប្រវត្តិរូប
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,ប្រវត្តិរូប
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,ប្រសិនបើបើកដំណើរការនោះប្រព័ន្ធនឹងមិនធ្វើបច្ចុប្បន្នភាពវាលវ៉ារ្យង់ពីគំរូទេប៉ុន្តែនឹងចម្លងទិន្នន័យនៃវាលដែលបានរៀបរាប់ដូចខាងក្រោមខណៈពេលបង្កើតវ៉ារើថ្មី
 DocType: Salary Detail,Component,សមាសភាគ
 DocType: Assessment Criteria,Assessment Criteria Group,ការវាយតម្លៃលក្ខណៈវិនិច្ឆ័យជាក្រុម
 DocType: Healthcare Settings,Patient Name By,ឈ្មោះអ្នកជម្ងឺដោយ
@@ -4370,7 +4459,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,សូមបញ្ចូលអនុម័តតួនាទីឬការអនុម័តរបស់អ្នកប្រើប្រាស់
 DocType: Journal Entry,Write Off Entry,បិទសរសេរធាតុ
 DocType: BOM,Rate Of Materials Based On,អត្រានៃសម្ភារៈមូលដ្ឋាននៅលើ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,អ្នកផ្គត់ផ្គង់&gt; ប្រភេទអ្នកផ្គត់ផ្គង់
+DocType: Item Variant Settings,Do not Update Variants,កុំធ្វើបច្ចុប្បន្នភាពវ៉ារ្យង់
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,ការគាំទ្រ Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,ដោះធីកទាំងអស់
 DocType: POS Profile,Terms and Conditions,លក្ខខណ្ឌ
@@ -4379,7 +4468,7 @@
 DocType: Leave Block List,Applies to Company,អនុវត្តទៅក្រុមហ៊ុន
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,មិនអាចលុបចោលដោយសារតែការដាក់ស្នើផ្សារការធាតុមាន {0}
 DocType: Employee Loan,Disbursement Date,កាលបរិច្ឆេទបញ្ចេញឥណទាន
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;អ្នកទទួល&#39; មិនបានបញ្ជាក់
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;អ្នកទទួល&#39; មិនបានបញ្ជាក់
 DocType: BOM Update Tool,Update latest price in all BOMs,ធ្វើបច្ចុប្បន្នភាពតម្លៃចុងក្រោយនៅគ្រប់បណ្តាញ
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,កំណត់ត្រាវេជ្ជសាស្រ្ត
 DocType: Vehicle,Vehicle,រថយន្ត
@@ -4395,14 +4484,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,ចម្បង / នាំមុខ%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,សមតុលយទ្រព្យសកម្មរំលស់និងការ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},ចំនួនទឹកប្រាក់ {0} {1} បានផ្ទេរពី {2} ទៅ {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},ចំនួនទឹកប្រាក់ {0} {1} បានផ្ទេរពី {2} ទៅ {3}
 DocType: Sales Invoice,Get Advances Received,ទទួលបុរេប្រទានបានទទួល
 DocType: Email Digest,Add/Remove Recipients,បន្ថែម / យកអ្នកទទួល
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},ប្រតិបត្តិការមិនត្រូវបានអនុញ្ញាតប្រឆាំងនឹងផលិតកម្មបានឈប់លំដាប់ {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",ដើម្បីកំណត់ឆ្នាំសារពើពន្ធនេះជាលំនាំដើមសូមចុចលើ &quot;កំណត់ជាលំនាំដើម &#39;
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,ចូលរួមជាមួយ
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,ចូលរួមជាមួយ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,កង្វះខាត Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,វ៉ារ្យ៉ង់ធាតុ {0} មានដែលមានគុណលក្ខណៈដូចគ្នា
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,វ៉ារ្យ៉ង់ធាតុ {0} មានដែលមានគុណលក្ខណៈដូចគ្នា
 DocType: Employee Loan,Repay from Salary,សងពីប្រាក់ខែ
 DocType: Leave Application,LAP/,ភ្លៅ /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},ស្នើសុំការទូទាត់ប្រឆាំងនឹង {0} {1} ចំនួន {2}
@@ -4415,7 +4504,7 @@
 DocType: Sales Invoice Item,Sales Order Item,ធាតុលំដាប់ការលក់
 DocType: Salary Slip,Payment Days,ថ្ងៃការទូទាត់
 DocType: Patient,Dormant,អសកម្ម
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,ឃ្លាំងជាមួយថ្នាំងជាកូនមិនអាចត្រូវបានបម្លែងទៅសៀវភៅ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,ឃ្លាំងជាមួយថ្នាំងជាកូនមិនអាចត្រូវបានបម្លែងទៅសៀវភៅ
 DocType: BOM,Manage cost of operations,គ្រប់គ្រងការចំណាយប្រតិបត្តិការ
 DocType: Accounts Settings,Stale Days,Stale Days
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",នៅពេលណាដែលប្រតិបត្តិការដែលបានធីកត្រូវបាន &quot;ផ្តល់ជូន&quot; ដែលជាការលេចឡើងអ៊ីម៉ែលដែលបានបើកដោយស្វ័យប្រវត្តិដើម្បីផ្ញើអ៊ីមែលទៅជាប់ទាក់ទង &quot;ទំនាក់ទំនង&quot; នៅក្នុងប្រតិបត្តិការនោះដោយមានប្រតិបត្តិការជាមួយការភ្ជាប់នេះ។ អ្នកប្រើដែលអាចឬមិនអាចផ្ញើអ៊ីមែល។
@@ -4429,10 +4518,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,សៀរៀល {0} គ្មានត្រូវបានទទួលរួចហើយ
 ,Requested Items To Be Transferred,ធាតុដែលបានស្នើសុំឱ្យគេបញ្ជូន
 DocType: Expense Claim,Vehicle Log,រថយន្តចូល
-DocType: Purchase Invoice,Recurring Id,លេខសម្គាល់កើតឡើង
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"វត្តមាននៃជំងឺគ្រុនក្តៅ (បណ្ដោះអាសន្ន&gt; 38,5 អង្សាសេ / 101,3 អង្សារឬមានបណ្ដោះអាសន្ន&gt; 38 ° C / 100.4 ° F)"
 DocType: Customer,Sales Team Details,ពត៌មានលំអិតការលក់ក្រុមការងារ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,លុបជារៀងរហូត?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,លុបជារៀងរហូត?
 DocType: Expense Claim,Total Claimed Amount,ចំនួនទឹកប្រាក់អះអាងសរុប
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,ឱកាសក្នុងការមានសក្តានុពលសម្រាប់ការលក់។
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},មិនត្រឹមត្រូវ {0}
@@ -4442,7 +4530,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ហាងលក់នាយកដ្ឋាន
 ,Item Delivery Date,កាលបរិច្ឆេទប្រគល់ទំនិញ
 DocType: Warehouse,PIN,ម្ជុល
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,ការរៀបចំរបស់អ្នកនៅក្នុង ERPNext សាលា
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,ការរៀបចំរបស់អ្នកនៅក្នុង ERPNext សាលា
 DocType: Sales Invoice,Base Change Amount (Company Currency),មូលដ្ឋានផ្លាស់ប្តូរចំនួនទឹកប្រាក់ (ក្រុមហ៊ុនរូបិយប័ណ្ណ)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,គ្មានការបញ្ចូលគណនីសម្រាប់ឃ្លាំងដូចខាងក្រោមនេះ
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,រក្សាទុកឯកសារជាលើកដំបូង។
@@ -4454,13 +4542,12 @@
 DocType: Task,Is Milestone,តើការវិវឌ្ឍ
 DocType: Daily Work Summary,Email Sent To,អ៊ីម៉ែលដែលបានផ្ញើទៅ
 DocType: Budget,Warn,ព្រមាន
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,តើអ្នកប្រាកដជាចង់មិនចុះឈ្មោះ?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ការកត់សម្គាល់ណាមួយផ្សេងទៀត, ការខិតខំប្រឹងប្រែងគួរឱ្យកត់សម្គាល់ដែលគួរតែចូលទៅក្នុងរបាយការណ៍។"
 DocType: BOM,Manufacturing User,អ្នកប្រើប្រាស់កម្មន្តសាល
 DocType: Purchase Invoice,Raw Materials Supplied,វត្ថុធាតុដើមដែលសហការី
-DocType: Purchase Invoice,Recurring Print Format,កើតឡើងទ្រង់ទ្រាយបោះពុម្ព
 DocType: C-Form,Series,កម្រងឯកសារ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},រូបិយប័ណ្ណនៃបញ្ជីតម្លៃ {0} ត្រូវតែ {1} ឬ {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,បន្ថែមផលិតផល
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},រូបិយប័ណ្ណនៃបញ្ជីតម្លៃ {0} ត្រូវតែ {1} ឬ {2}
 DocType: Appraisal,Appraisal Template,ការវាយតម្លៃទំព័រគំរូ
 DocType: Item Group,Item Classification,ចំណាត់ថ្នាក់ធាតុ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,ប្រធានផ្នែកអភិវឌ្ឍន៍ពាណិជ្ជកម្ម
@@ -4474,7 +4561,7 @@
 DocType: Item Attribute Value,Attribute Value,តម្លៃគុណលក្ខណៈ
 ,Itemwise Recommended Reorder Level,Itemwise ផ្ដល់អនុសាសន៍រៀបចំវគ្គ
 DocType: Salary Detail,Salary Detail,លំអិតប្រាក់ខែ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,សូមជ្រើស {0} ដំបូង
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,សូមជ្រើស {0} ដំបូង
 DocType: Appointment Type,Physician,គ្រូពេទ្យ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,បាច់នៃ {0} {1} ធាតុបានផុតកំណត់។
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,ការពិគ្រោះយោបល់
@@ -4485,7 +4572,7 @@
 DocType: Salary Detail,Default Amount,ចំនួនលំនាំដើម
 DocType: Lab Test Template,Descriptive,ពិពណ៌នា
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,រកមិនឃើញឃ្លាំងក្នុងប្រព័ន្ធ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,សង្ខេបខែនេះ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,សង្ខេបខែនេះ
 DocType: Quality Inspection Reading,Quality Inspection Reading,កំរោងអានគម្ពីរមានគុណភាពអធិការកិច្ច
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`បង្កកដែលមានវ័យចំណាស់ Than` ភាគហ៊ុនគួរមានទំហំតូចជាងថ្ងៃ% d ។
 DocType: Tax Rule,Purchase Tax Template,ទិញពន្ធលើទំព័រគំរូ
@@ -4508,12 +4595,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,បណ្តុះបណ្តាព្រឹត្តិការណ៍ / លទ្ធផល
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,បង្គររំលស់ដូចជានៅលើ
 DocType: Sales Invoice,C-Form Applicable,C-ទម្រង់ពាក្យស្នើសុំ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},ប្រតិបត្ដិការពេលវេលាត្រូវតែធំជាង 0 សម្រាប់ប្រតិបត្ដិការ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},ប្រតិបត្ដិការពេលវេលាត្រូវតែធំជាង 0 សម្រាប់ប្រតិបត្ដិការ {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,ឃ្លាំងគឺជាការចាំបាច់
 DocType: Supplier,Address and Contacts,អាសយដ្ឋាននិងទំនាក់ទំនង
 DocType: UOM Conversion Detail,UOM Conversion Detail,ពត៌មាននៃការប្រែចិត្តជឿ UOM
 DocType: Program,Program Abbreviation,អក្សរកាត់កម្មវិធី
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,ផលិតកម្មលំដាប់មិនអាចត្រូវបានលើកឡើងប្រឆាំងនឹងការធាតុមួយទំព័រគំរូ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,ផលិតកម្មលំដាប់មិនអាចត្រូវបានលើកឡើងប្រឆាំងនឹងការធាតុមួយទំព័រគំរូ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,ការចោទប្រកាន់ត្រូវបានធ្វើបច្ចុប្បន្នភាពនៅបង្កាន់ដៃទិញប្រឆាំងនឹងធាតុគ្នា
 DocType: Warranty Claim,Resolved By,បានដោះស្រាយដោយ
 DocType: Bank Guarantee,Start Date,ថ្ងៃចាប់ផ្តើម
@@ -4539,27 +4626,28 @@
 DocType: Employee,Educational Qualification,គុណវុឌ្ឍិអប់រំ
 DocType: Workstation,Operating Costs,ចំណាយប្រតិបត្តិការ
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,ប្រសិនបើអ្នកបានប្រមូលថវិកាសកម្មភាពលើសពីប្រចាំខែ
-DocType: Purchase Invoice,Submit on creation,ដាក់ស្នើលើការបង្កើត
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},រូបិយប័ណ្ណសម្រាប់ {0} ត្រូវតែជា {1}
+DocType: Subscription,Submit on creation,ដាក់ស្នើលើការបង្កើត
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},រូបិយប័ណ្ណសម្រាប់ {0} ត្រូវតែជា {1}
 DocType: Asset,Disposal Date,បោះចោលកាលបរិច្ឆេទ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",អ៊ីមែលនឹងត្រូវបានផ្ញើទៅបុគ្គលិកសកម្មអស់ពីក្រុមហ៊ុននេះនៅម៉ោងដែលបានផ្តល់ឱ្យប្រសិនបើពួកគេមិនមានថ្ងៃឈប់សម្រាក។ សេចក្ដីសង្ខេបនៃការឆ្លើយតបនឹងត្រូវបានផ្ញើនៅកណ្តាលអធ្រាត្រ។
 DocType: Employee Leave Approver,Employee Leave Approver,ទុកឱ្យការអនុម័តបុគ្គលិក
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},ជួរដេក {0}: ធាតុរៀបចំមួយរួចហើយសម្រាប់ឃ្លាំងនេះ {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.",មិនអាចប្រកាសបាត់បង់នោះទេព្រោះសម្រង់ត្រូវបានធ្វើឡើង។
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,មតិការបណ្តុះបណ្តាល
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},ជួរដេក {0}: ធាតុរៀបចំមួយរួចហើយសម្រាប់ឃ្លាំងនេះ {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.",មិនអាចប្រកាសបាត់បង់នោះទេព្រោះសម្រង់ត្រូវបានធ្វើឡើង។
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,មតិការបណ្តុះបណ្តាល
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,ផលិតកម្មលំដាប់ {0} ត្រូវតែត្រូវបានដាក់ជូន
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,លក្ខណៈវិនិច្ឆ័យពិន្ទុនៃអ្នកផ្គត់ផ្គង់
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},សូមជ្រើសរើសកាលបរិច្ឆេទចាប់ផ្ដើមនិងកាលបរិច្ឆេទបញ្ចប់សម្រាប់ធាតុ {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},ពិតណាស់គឺចាំបាច់នៅក្នុងជួរដេក {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ដើម្បីកាលបរិច្ឆេទមិនអាចមានមុនពេលចេញពីកាលបរិច្ឆេទ
 DocType: Supplier Quotation Item,Prevdoc DocType,ចង្អុលបង្ហាញ Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,បន្ថែម / កែសម្រួលតម្លៃទំនិញ
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,បន្ថែម / កែសម្រួលតម្លៃទំនិញ
 DocType: Batch,Parent Batch,បាច់មាតាបិតា
 DocType: Batch,Parent Batch,បាច់មាតាបិតា
 DocType: Cheque Print Template,Cheque Print Template,ទំព័រគំរូបោះពុម្ពមូលប្បទានប័ត្រ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,គំនូសតាងនៃមជ្ឈមណ្ឌលការចំណាយ
 DocType: Lab Test Template,Sample Collection,ការប្រមូលគំរូ
 ,Requested Items To Be Ordered,ធាតុដែលបានស្នើដើម្បីឱ្យបានលំដាប់
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,ការបញ្ជាទិញរបស់ខ្ញុំ
 DocType: Price List,Price List Name,ឈ្មោះតារាងតម្លៃ
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},សេចក្តីសង្ខេបការងារប្រចាំថ្ងៃសម្រាប់ {0}
 DocType: Employee Loan,Totals,សរុប
@@ -4578,12 +4666,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} បំណែងនៃ {1} ដែលត្រូវការក្នុង {2} លើ {3} {4} សម្រាប់ {5} ដើម្បីបញ្ចប់ប្រតិបត្តិការនេះ។
 DocType: Fee Schedule,Student Category,ប្រភេទរបស់សិស្ស
 DocType: Announcement,Student,សិស្ស
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,អង្គភាព (ក្រសួង) មេ។
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,អង្គភាព (ក្រសួង) មេ។
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,ចូលទៅកាន់បន្ទប់
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,សូមបញ្ចូលសារមុនពេលផ្ញើ
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,DUPLICATE សម្រាប់ផ្គត់ផ្គង់
 DocType: Email Digest,Pending Quotations,ការរង់ចាំសម្រង់សម្តី
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,ចំណុចនៃការលក់ពត៌មានផ្ទាល់ខ្លួន
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,ចំណុចនៃការលក់ពត៌មានផ្ទាល់ខ្លួន
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,កំណត់រចនាសម្ព័ន្ធតេស្តបន្ទប់។
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,ការផ្តល់កម្ចីដោយគ្មានសុវត្ថិភាព
 DocType: Cost Center,Cost Center Name,ឈ្មោះមជ្ឈមណ្ឌលចំណាយអស់
@@ -4593,6 +4681,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,សរុបបង់ AMT
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,សារដែលបានធំជាង 160 តួអក្សរដែលនឹងត្រូវចែកចេញជាសារច្រើន
 DocType: Purchase Receipt Item,Received and Accepted,បានទទួលនិងទទួលយក
+DocType: Hub Settings,Company and Seller Profile,ពត៌មានរបស់ក្រុមហ៊ុននិងអ្នកលក់
 ,GST Itemised Sales Register,ជីអេសធីធាតុលក់ចុះឈ្មោះ
 ,Serial No Service Contract Expiry,គ្មានសេវាកិច្ចសន្យាសៀរៀលផុតកំណត់
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,អ្នកមិនអាចឥណទាននិងឥណពន្ធគណនីដូចគ្នានៅពេលតែមួយ
@@ -4602,10 +4691,11 @@
 DocType: Item,Variant Based On,វ៉ារ្យង់ដែលមានមូលដ្ឋាននៅលើ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},weightage សរុបដែលបានផ្ដល់គួរតែទទួលបាន 100% ។ វាគឺជា {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,អ្នកផ្គត់ផ្គង់របស់អ្នក
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,សូមកែ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,មិនអាចបាត់បង់ដូចដែលបានកំណត់ជាលំដាប់ត្រូវបានធ្វើឱ្យការលក់រថយន្ត។
 DocType: Request for Quotation Item,Supplier Part No,ក្រុមហ៊ុនផ្គត់ផ្គង់គ្រឿងបន្លាស់គ្មាន
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',មិនអាចកាត់ពេលដែលប្រភេទគឺសម្រាប់ &#39;វាយតម្លៃ&#39; ឬ &#39;Vaulation និងសរុប
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,ទទួលបានពី
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,ទទួលបានពី
 DocType: Lead,Converted,ប្រែចិត្តជឿ
 DocType: Item,Has Serial No,គ្មានសៀរៀល
 DocType: Employee,Date of Issue,កាលបរិច្ឆេទនៃបញ្ហា
@@ -4613,7 +4703,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","ជាមួយការកំណត់ការទិញប្រសិនបើមានការទិញ Reciept ទាមទារ == &quot;បាទ&quot; ហើយបន្ទាប់មកសម្រាប់ការបង្កើតការទិញវិក័យប័ត្រ, អ្នកប្រើត្រូវតែបង្កើតការទទួលទិញជាលើកដំបូងសម្រាប់ធាតុ {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},ជួរដេក # {0}: កំណត់ផ្គត់ផ្គង់សម្រាប់ធាតុ {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,ជួរដេក {0}: តម្លៃប៉ុន្មានម៉ោងត្រូវតែធំជាងសូន្យ។
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,គេហទំព័ររូបភាព {0} បានភ្ជាប់ទៅនឹងធាតុ {1} មិនអាចត្រូវបានរកឃើញ
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,គេហទំព័ររូបភាព {0} បានភ្ជាប់ទៅនឹងធាតុ {1} មិនអាចត្រូវបានរកឃើញ
 DocType: Issue,Content Type,ប្រភេទមាតិការ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,កុំព្យូទ័រ
 DocType: Item,List this Item in multiple groups on the website.,រាយធាតុនេះនៅក្នុងក្រុមជាច្រើននៅលើគេហទំព័រ។
@@ -4624,14 +4714,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,ទទួលបានធាតុ Unreconciled
 DocType: Payment Reconciliation,From Invoice Date,ចាប់ពីកាលបរិច្ឆេទវិក័យប័ត្រ
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,អ្នកមិនមានសិទ្ធិដើម្បីដាក់ស្នើ
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,រូបិយប័ណ្ណវិក័យប័ត្រត្រូវតែស្មើឬគណនីគណបក្សរូបិយប័ណ្ណទាំង comapany លំនាំដើមរូបិយប័ណ្ណរបស់
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,រូបិយប័ណ្ណវិក័យប័ត្រត្រូវតែស្មើឬគណនីគណបក្សរូបិយប័ណ្ណទាំង comapany លំនាំដើមរូបិយប័ណ្ណរបស់
 DocType: Healthcare Settings,Laboratory Settings,ការកំណត់មន្ទីរពិសោធន៍
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,ទុកឱ្យ Encashment
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,តើធ្វើដូចម្ដេច?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,ដើម្បីឃ្លាំង
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,សិស្សទាំងអស់ការចុះឈ្មោះចូលរៀន
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,តើធ្វើដូចម្ដេច?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,ដើម្បីឃ្លាំង
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,សិស្សទាំងអស់ការចុះឈ្មោះចូលរៀន
 ,Average Commission Rate,គណៈកម្មការជាមធ្យមអត្រាការ
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,&#39;មិនមានមិនសៀរៀល&#39; មិនអាចក្លាយជា &#39;បាទ&#39; សម្រាប់ធាតុដែលមិនមែនជាភាគហ៊ុន-
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,&#39;មិនមានមិនសៀរៀល&#39; មិនអាចក្លាយជា &#39;បាទ&#39; សម្រាប់ធាតុដែលមិនមែនជាភាគហ៊ុន-
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,ជ្រើសស្ថានភាព
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,ការចូលរួមមិនអាចត្រូវបានសម្គាល់សម្រាប់កាលបរិច្ឆេទនាពេលអនាគត
 DocType: Pricing Rule,Pricing Rule Help,វិធានកំណត់តម្លៃជំនួយ
@@ -4649,41 +4739,41 @@
 DocType: Item,Customer Code,លេខកូដអតិថិជន
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},កម្មវិធីរំលឹកខួបកំណើតសម្រាប់ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ថ្ងៃចាប់ពីលំដាប់ចុងក្រោយ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,ឥណពន្ធវីសាទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,ឥណពន្ធវីសាទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
 DocType: Buying Settings,Naming Series,ដាក់ឈ្មោះកម្រងឯកសារ
 DocType: Leave Block List,Leave Block List Name,ទុកឱ្យឈ្មោះបញ្ជីប្លុក
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,កាលបរិច្ឆេទការធានារ៉ាប់រងការចាប់ផ្តើមគួរតែតិចជាងកាលបរិច្ឆេទធានារ៉ាប់រងបញ្ចប់
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,សូមបង្កើតប្រព័ន្ធដាក់ឈ្មោះគ្រូក្នុងសាលារៀន&gt; ការកំណត់សាលារៀន
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,ភាគហ៊ុនទ្រព្យសកម្ម
 DocType: Timesheet,Production Detail,ផលិតកម្មលំអិត
+DocType: Restaurant,Active Menu,ម៉ឺនុយសកម្ម
 DocType: Target Detail,Target Qty,គោលដៅ Qty
 DocType: Shopping Cart Settings,Checkout Settings,ការកំណត់ Checkout
 DocType: Attendance,Present,នាពេលបច្ចុប្បន្ន
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,ការដឹកជញ្ជូនចំណាំ {0} មិនត្រូវបានដាក់ជូន
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,ការដឹកជញ្ជូនចំណាំ {0} មិនត្រូវបានដាក់ជូន
 DocType: Notification Control,Sales Invoice Message,វិក័យប័ត្រការលក់សារ
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,គណនី {0} បិទត្រូវតែមានប្រភេទបំណុល / សមភាព
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},ប័ណ្ណប្រាក់ខែរបស់បុគ្គលិក {0} បានបង្កើតឡើងរួចហើយសម្រាប់តារាងពេលវេលា {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},ប័ណ្ណប្រាក់ខែរបស់បុគ្គលិក {0} បានបង្កើតឡើងរួចហើយសម្រាប់តារាងពេលវេលា {1}
 DocType: Vehicle Log,Odometer,odometer
 DocType: Sales Order Item,Ordered Qty,បានបញ្ជាឱ្យ Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,ធាតុ {0} ត្រូវបានបិទ
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,ធាតុ {0} ត្រូវបានបិទ
 DocType: Stock Settings,Stock Frozen Upto,រីករាយជាមួយនឹងផ្សារភាគហ៊ុនទឹកកក
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,Bom មិនមានភាគហ៊ុនណាមួយឡើយធាតុ
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,សកម្មភាពរបស់គម្រោង / ភារកិច្ច។
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,Bom មិនមានភាគហ៊ុនណាមួយឡើយធាតុ
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,សកម្មភាពរបស់គម្រោង / ភារកិច្ច។
 DocType: Vehicle Log,Refuelling Details,សេចក្ដីលម្អិតចាក់ប្រេង
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,បង្កើតប្រាក់ខែគ្រូពេទ្យប្រហែលជា
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}",ទិញត្រូវតែត្រូវបានធីកបើកម្មវិធីសម្រាប់ការត្រូវបានជ្រើសរើសជា {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ការបញ្ចុះតម្លៃត្រូវតែមានតិចជាង 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,រកមិនឃើញអត្រាទិញមុនបាន
 DocType: Purchase Invoice,Write Off Amount (Company Currency),បិទការសរសេរចំនួនទឹកប្រាក់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: Sales Invoice Timesheet,Billing Hours,ម៉ោងវិក័យប័ត្រ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,Bom លំនាំដើមសម្រាប់ {0} មិនបានរកឃើញ
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,ជួរដេក # {0}: សូមកំណត់បរិមាណតម្រៀបឡើងវិញ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Bom លំនាំដើមសម្រាប់ {0} មិនបានរកឃើញ
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,ជួរដេក # {0}: សូមកំណត់បរិមាណតម្រៀបឡើងវិញ
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,ប៉ះធាតុដើម្បីបន្ថែមពួកវានៅទីនេះ
 DocType: Fees,Program Enrollment,កម្មវិធីការចុះឈ្មោះ
 DocType: Landed Cost Voucher,Landed Cost Voucher,ប័ណ្ណតម្លៃដែលបានចុះចត
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},សូមកំណត់ {0}
-DocType: Purchase Invoice,Repeat on Day of Month,ធ្វើម្តងទៀតនៅថ្ងៃនៃខែ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} ជានិស្សិតអសកម្ម
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} ជានិស្សិតអសកម្ម
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} ជានិស្សិតអសកម្ម
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} ជានិស្សិតអសកម្ម
 DocType: Employee,Health Details,ពត៌មានលំអិតសុខភាព
 DocType: Offer Letter,Offer Letter Terms,ផ្តល់ជូននូវលក្ខខណ្ឌលិខិត
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,ដើម្បីបង្កើតសំណើទូទាត់ឯកសារសេចក្ដីយោងគឺត្រូវបានទាមទារ
@@ -4692,7 +4782,6 @@
 DocType: Employee External Work History,Salary,ប្រាក់បៀវត្ស
 DocType: Serial No,Delivery Document Type,ដឹកជញ្ជូនប្រភេទឯកសារ
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,ដាក់ស្នើគ្រូពេទ្យប្រហែលជាបានប្រាក់ខែទាំងអស់សម្រាប់លក្ខណៈវិនិច្ឆ័យដែលបានជ្រើសខាងលើ
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} ធាតុដែលបានធ្វើសមកាលកម្ម
 DocType: Sales Order,Partly Delivered,ផ្តល់មួយផ្នែក
 DocType: Email Digest,Receivables,អ្នកទទួល
 DocType: Lead Source,Lead Source,អ្នកដឹកនាំការប្រភព
@@ -4713,9 +4802,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,ជួរ Ageing 2
 DocType: SG Creation Tool Course,Max Strength,កម្លាំងអតិបរមា
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,Bom បានជំនួស
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,ជ្រើសធាតុផ្អែកលើកាលបរិច្ឆេទដឹកជញ្ជូន
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,ជ្រើសធាតុផ្អែកលើកាលបរិច្ឆេទដឹកជញ្ជូន
 ,Sales Analytics,វិភាគការលក់
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},ដែលអាចប្រើបាន {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},ដែលអាចប្រើបាន {0}
 ,Prospects Engaged But Not Converted,ទស្សនវិស័យភ្ជាប់ពាក្យប៉ុន្តែមិនប្រែចិត្តទទួលជឿ
 ,Prospects Engaged But Not Converted,ទស្សនវិស័យភ្ជាប់ពាក្យប៉ុន្តែមិនប្រែចិត្តទទួលជឿ
 DocType: Manufacturing Settings,Manufacturing Settings,ការកំណត់កម្មន្តសាល
@@ -4723,10 +4812,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 ទូរស័ព្ទដៃគ្មាន
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,សូមបញ្ចូលរូបិយប័ណ្ណលំនាំដើមនៅក្នុងក្រុមហ៊ុនអនុបណ្ឌិត
 DocType: Stock Entry Detail,Stock Entry Detail,ពត៌មាននៃភាគហ៊ុនចូល
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,ការរំលឹកជារៀងរាល់ថ្ងៃ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,ការរំលឹកជារៀងរាល់ថ្ងៃ
 DocType: Products Settings,Home Page is Products,ទំព័រដើមទំព័រគឺផលិតផល
 ,Asset Depreciation Ledger,សៀវភៅរំលស់ទ្រព្យសម្បត្តិ
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},ការប៉ះទង្គិចវិធានពន្ធជាមួយនឹង {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},ការប៉ះទង្គិចវិធានពន្ធជាមួយនឹង {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,ឈ្មោះគណនីថ្មី
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,ការចំណាយវត្ថុធាតុដើមការី
 DocType: Selling Settings,Settings for Selling Module,ម៉ូឌុលការកំណត់សម្រាប់លក់
@@ -4740,8 +4829,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,ធាតុ {0} ត្រូវតែជាធាតុភាគហ៊ុន
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,ការងារលំនាំដើមនៅក្នុងឃ្លាំងវឌ្ឍនភាព
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,ការកំណត់លំនាំដើមសម្រាប់ប្រតិបត្តិការគណនេយ្យ។
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំប្រព័ន្ធដាក់ឈ្មោះនិយោជិកនៅក្នុងធនធានមនុស្ស&gt; ការកំណត់ធនធានមនុស្ស
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,កាលបរិច្ឆេទគេរំពឹងថានឹងមិនអាចមានមុនពេលដែលកាលបរិច្ឆេទនៃសំណើសុំសម្ភារៈ
+DocType: Restaurant,Default Tax Template,គំរូពន្ធលំនាំដើម
 DocType: Fees,Student Details,ព័ត៌មានលំអិតរបស់សិស្ស
 DocType: Purchase Invoice Item,Stock Qty,ហ៊ុន Qty
 DocType: Purchase Invoice Item,Stock Qty,ហ៊ុន Qty
@@ -4755,13 +4845,14 @@
 DocType: Sales Order Item,Produced Quantity,បរិមាណដែលបានផលិត
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +122,Engineer,វិស្វករ
 DocType: Journal Entry,Total Amount Currency,រូបិយប័ណ្ណចំនួនសរុប
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,សភាអនុស្វែងរក
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,ស្វែងរកផ្នែកផ្ដុំបញ្ចូលគ្នាជាឯកតា
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Item Code required at Row No {0},កូដធាតុបានទាមទារនៅជួរដេកគ្មាន {0}
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,ទៅកាន់ធាតុ
 DocType: Sales Partner,Partner Type,ប្រភេទជាដៃគូ
 DocType: Purchase Taxes and Charges,Actual,ពិតប្រាកដ
+DocType: Restaurant Menu,Restaurant Manager,អ្នកគ្រប់គ្រងភោជនីយដ្ឋាន
 DocType: Authorization Rule,Customerwise Discount,Customerwise បញ្ចុះតំលៃ
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Timesheet សម្រាប់ភារកិច្ច។
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Timesheet សម្រាប់ភារកិច្ច។
 DocType: Purchase Invoice,Against Expense Account,ប្រឆាំងនឹងការចំណាយតាមគណនី
 DocType: Production Order,Production Order,ផលិតកម្មលំដាប់
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,ការដំឡើងចំណាំ {0} ត្រូវបានដាក់ស្នើរួចទៅហើយ
@@ -4769,8 +4860,7 @@
 DocType: Quotation Item,Against Docname,ប្រឆាំងនឹងការ Docname
 DocType: SMS Center,All Employee (Active),ទាំងអស់និយោជិត (សកម្ម)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,មើលឥឡូវ
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,ជ្រើសអំឡុងពេលដែលវិក័យប័ត្រដែលនឹងត្រូវបានបង្កើតដោយស្វ័យប្រវត្តិ
-DocType: BOM,Raw Material Cost,វត្ថុធាតុដើមដែលការចំណាយ
+DocType: BOM,Raw Material Cost,តម្លៃនៃវត្ថុធាតុដើម
 DocType: Item Reorder,Re-Order Level,ដីកាសម្រេចកម្រិតឡើងវិញ
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,បញ្ចូលធាតុនិងការដែលបានគ្រោងទុក qty ដែលអ្នកចង់បានដើម្បីបង្កើនការបញ្ជាទិញផលិតផលឬទាញយកវត្ថុធាតុដើមសម្រាប់ការវិភាគ។
 apps/erpnext/erpnext/projects/doctype/project/project.js +64,Gantt Chart,គំនូសតាង Gantt
@@ -4782,24 +4872,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,របាយការណ៏ចាំបាច់ប្រភេទ
 DocType: Item,Serial Number Series,កម្រងឯកសារលេខសៀរៀល
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},ឃ្លាំងជាការចាំបាច់សម្រាប់ធាតុភាគហ៊ុននៅ {0} {1} ជួរដេក
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,បន្ថែមកម្មវិធី
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,ការលក់រាយលក់ដុំនិងចែកចាយ
 DocType: Issue,First Responded On,ជាលើកដំបូងបានឆ្លើយតបនៅលើ
 DocType: Website Item Group,Cross Listing of Item in multiple groups,កាកបាទបញ្ជីដែលមានធាតុនៅក្នុងក្រុមជាច្រើនដែល
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ឆ្នាំចាប់ផ្តើមកាលបរិច្ឆេទសារពើពន្ធឆ្នាំសារពើពន្ធបញ្ចប់និងកាលបរិច្ឆេទត្រូវបានកំណត់រួចហើយនៅក្នុងឆ្នាំសារពើពន្ធ {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,បោសសំអាតកាលបរិច្ឆេទធ្វើឱ្យទាន់សម័យ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,បាច់ពុះ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,បាច់ពុះ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,បាច់ពុះ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,បាច់ពុះ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,ផ្សះផ្សាដោយជោគជ័យ
 DocType: Request for Quotation Supplier,Download PDF,ទាញយកជា PDF
 DocType: Production Order,Planned End Date,កាលបរិច្ឆេទបញ្ចប់ការគ្រោងទុក
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,សូមបញ្ចូលកាលបរិច្ឆេទកាលវិភាគ
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,ដែលជាកន្លែងដែលធាតុត្រូវបានរក្សាទុក។
 DocType: Request for Quotation,Supplier Detail,ក្រុមហ៊ុនផ្គត់ផ្គង់លំអិត
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},កំហុសក្នុងការនៅក្នុងរូបមន្តឬស្ថានភាព: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},កំហុសក្នុងការនៅក្នុងរូបមន្តឬស្ថានភាព: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,ចំនួន invoiced
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,ទម្ងន់លក្ខណៈវិនិច្ឆ័យត្រូវបន្ថែមរហូតដល់ 100%
 DocType: Attendance,Attendance,ការចូលរួម
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,ធាតុក្នុងស្តុក
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,ធាតុក្នុងស្តុក
 DocType: BOM,Materials,សមា្ភារៈ
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",ប្រសិនបើមិនបានធីកបញ្ជីនេះនឹងត្រូវបានបន្ថែមទៅកាន់ក្រសួងគ្នាដែលជាកន្លែងដែលវាត្រូវបានអនុវត្ត។
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,ប្រភពនិងគោលដៅឃ្លាំងមិនអាចត្រូវបានដូចគ្នា
@@ -4817,6 +4907,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,នៅលើសុទ្ធសរុប
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},តម្លៃសម្រាប់គុណលក្ខណៈ {0} ត្រូវតែនៅក្នុងចន្លោះ {1} ដល់ {2} ក្នុងចំនួន {3} សម្រាប់ធាតុ {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,ឃ្លាំងគោលដៅក្នុងជួរ {0} ត្រូវតែមានដូចគ្នាដូចដែលបញ្ជាទិញផលិតផល
+DocType: Restaurant Reservation,Waitlisted,រង់ចាំក្នុងបញ្ជី
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,រូបិយប័ណ្ណមិនអាចត្រូវបានផ្លាស់ប្តូរបន្ទាប់ពីធ្វើការធាតុប្រើប្រាស់រូបិយប័ណ្ណផ្សេងទៀតមួយចំនួន
 DocType: Vehicle Service,Clutch Plate,សន្លឹកក្ដាប់
 DocType: Company,Round Off Account,បិទការប្រកួតជុំទីគណនី
@@ -4833,7 +4924,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,ឈ្មោះថ្មីលក់បុគ្គល
 DocType: Packing Slip,Gross Weight UOM,សរុបបានទំ UOM
 DocType: Delivery Note Item,Against Sales Invoice,ប្រឆាំងនឹងការវិក័យប័ត្រលក់
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,សូមបញ្ចូលលេខសៀរៀលសម្រាប់ធាតុសៀរៀល
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,សូមបញ្ចូលលេខសៀរៀលសម្រាប់ធាតុសៀរៀល
 DocType: Bin,Reserved Qty for Production,បម្រុងទុក Qty សម្រាប់ផលិតកម្ម
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ទុកឱ្យធីកបើអ្នកមិនចង់ឱ្យពិចារណាបាច់ខណៈពេលដែលធ្វើការពិតណាស់ដែលមានមូលដ្ឋាននៅក្រុម។
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ទុកឱ្យធីកបើអ្នកមិនចង់ឱ្យពិចារណាបាច់ខណៈពេលដែលធ្វើការពិតណាស់ដែលមានមូលដ្ឋាននៅក្រុម។
@@ -4845,7 +4936,7 @@
 DocType: Lab Test,Test Group,ក្រុមសាកល្បង
 DocType: Payment Reconciliation,Receivable / Payable Account,ទទួលគណនី / ចងការប្រាក់
 DocType: Delivery Note Item,Against Sales Order Item,ការប្រឆាំងនឹងការធាតុលក់សណ្តាប់ធ្នាប់
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},សូមបញ្ជាក់គុណតម្លៃសម្រាប់គុណលក្ខណៈ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},សូមបញ្ជាក់គុណតម្លៃសម្រាប់គុណលក្ខណៈ {0}
 DocType: Item,Default Warehouse,ឃ្លាំងលំនាំដើម
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},ថវិកាដែលមិនអាចត្រូវបានផ្ដល់ប្រឆាំងនឹងគណនីគ្រុប {0}
 DocType: Healthcare Settings,Patient Registration,ការចុះឈ្មោះអ្នកជំងឺ
@@ -4875,6 +4966,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,ការលក់បុគ្គល
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,មជ្ឈមណ្ឌលថវិកានិងការចំណាយ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,របៀបបង់ប្រាក់លំនាំដើមច្រើនមិនត្រូវបានអនុញ្ញាតទេ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,សម្រាប់
 ,Appointment Analytics,វិភាគណាត់ជួប
 DocType: Vehicle Service,Half Yearly,ពាក់កណ្តាលប្រចាំឆ្នាំ
 DocType: Lead,Blog Subscriber,អតិថិជនកំណត់ហេតុបណ្ដាញ
@@ -4882,7 +4974,7 @@
 DocType: Healthcare Settings,Consultations in valid days,ការពិគ្រោះយោបល់នៅថ្ងៃសុពលភាព
 DocType: Assessment Plan Criteria,Maximum Score,ពិន្ទុអតិបរមា
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,បង្កើតច្បាប់ដើម្បីរឹតបន្តឹងការធ្វើប្រតិបត្តិការដោយផ្អែកលើតម្លៃ។
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +49, Group Roll No,ក្រុមការវិលគ្មាន
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +49, Group Roll No,ក្រុមលេខវិលជុំ
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +9,Fee Creation Failed,ការបង្កើតកម្រៃបានបរាជ័យ
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,ទុកឱ្យនៅទទេប្រសិនបើអ្នកបានធ្វើឱ្យក្រុមសិស្សក្នុងមួយឆ្នាំ
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,ទុកឱ្យនៅទទេប្រសិនបើអ្នកបានធ្វើឱ្យក្រុមសិស្សក្នុងមួយឆ្នាំ
@@ -4894,7 +4986,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,រាប់ quot
 ,BOM Stock Report,របាយការណ៍ហ៊ុន Bom
 DocType: Stock Reconciliation Item,Quantity Difference,ភាពខុសគ្នាបរិមាណ
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,ដំណើរការសេវាបើកប្រាក់បៀវត្ស
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,ដំណើរការសេវាបើកប្រាក់បៀវត្ស
 DocType: Opportunity Item,Basic Rate,អត្រាជាមូលដ្ឋាន
 DocType: GL Entry,Credit Amount,ចំនួនឥណទាន
 DocType: Cheque Print Template,Signatory Position,ទីតាំងហត្ថលេខី
@@ -4908,12 +5000,12 @@
 DocType: Tax Rule,Tax Rule,ច្បាប់ពន្ធ
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,រក្សាអត្រាការវដ្តនៃការលក់ពេញមួយដូចគ្នា
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,គម្រោងការកំណត់ហេតុពេលវេលាដែលនៅក្រៅម៉ោងស្ថានីយការងារការងារ។
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,អតិថិជននៅក្នុងជួរ
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,បណ្ឌិត {0} មិនមានកាលវិភាគគ្រូពេទ្យទេ។ បន្ថែមវាទៅគ្រូពេទ្យ
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,អតិថិជននៅក្នុងជួរ
 DocType: Student,Nationality,សញ្ជាតិ
 ,Items To Be Requested,ធាតុដែលនឹងត្រូវបានស្នើ
-DocType: Purchase Order,Get Last Purchase Rate,ទទួលបានអត្រាការទិញចុងក្រោយ
 DocType: Company,Company Info,ពត៌មានរបស់ក្រុមហ៊ុន
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,ជ្រើសឬបន្ថែមអតិថិជនថ្មី
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,ជ្រើសឬបន្ថែមអតិថិជនថ្មី
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,កណ្តាលការចំណាយគឺត្រូវបានទាមទារដើម្បីកក់ពាក្យបណ្តឹងការចំណាយ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),កម្មវិធីរបស់មូលនិធិ (ទ្រព្យសកម្ម)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,នេះត្រូវបានផ្អែកលើការចូលរួមរបស់បុគ្គលិកនេះ
@@ -4921,6 +5013,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,គណនីឥណពន្ធវីសា
 DocType: Fiscal Year,Year Start Date,នៅឆ្នាំកាលបរិច្ឆេទចាប់ផ្តើម
 DocType: Attendance,Employee Name,ឈ្មោះបុគ្គលិក
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,ភោជនីយដ្ឋានលំដាប់ធាតុធាតុ
 DocType: Sales Invoice,Rounded Total (Company Currency),សរុបមូល (ក្រុមហ៊ុនរូបិយវត្ថុ)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,មិនអាចសម្ងាត់មួយដើម្បីពូលដោយសារតែប្រភេទគណនីត្រូវបានជ្រើស។
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} បានកែប្រែទេ។ សូមផ្ទុកឡើងវិញ។
@@ -4931,6 +5024,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,អត្ថប្រយោជន៍បុគ្គលិក
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},បរិមាណបរិមាណស្មើនឹងត្រូវ packed សម្រាប់ធាតុ {0} នៅក្នុងជួរដេក {1}
 DocType: Production Order,Manufactured Qty,បានផលិត Qty
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,វិក្កយប័ត្របានបង្កើត
 DocType: Purchase Receipt Item,Accepted Quantity,បរិមាណដែលត្រូវទទួលយក
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},សូមកំណត់លំនាំដើមបញ្ជីថ្ងៃឈប់សម្រាកសម្រាប់បុគ្គលិកឬ {0} {1} ក្រុមហ៊ុន
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0} {1} មិនមាន
@@ -4940,18 +5034,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ជួរដេកគ្មាន {0}: ចំនួនទឹកប្រាក់មិនអាចមានចំនួនច្រើនជាងការរង់ចាំការប្រឆាំងនឹងពាក្យបណ្តឹងការចំណាយទឹកប្រាក់ {1} ។ ចំនួនទឹកប្រាក់ដែលមិនទាន់សម្រេចគឺ {2}
 DocType: Maintenance Schedule,Schedule,កាលវិភាគ
 DocType: Account,Parent Account,គណនីមាតាឬបិតា
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,ដែលអាចប្រើបាន
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,ដែលអាចប្រើបាន
 DocType: Quality Inspection Reading,Reading 3,ការអានទី 3
 ,Hub,ហាប់
 DocType: GL Entry,Voucher Type,ប្រភេទកាតមានទឹកប្រាក់
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,រកមិនឃើញបញ្ជីថ្លៃឬជនពិការ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,រកមិនឃើញបញ្ជីថ្លៃឬជនពិការ
 DocType: Lab Test,Approved,បានអនុម័ត
 DocType: Pricing Rule,Price,តំលៃលក់
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',បុគ្គលិកធូរស្រាលនៅលើ {0} ត្រូវតែត្រូវបានកំណត់ជា &quot;ឆ្វេង&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',បុគ្គលិកធូរស្រាលនៅលើ {0} ត្រូវតែត្រូវបានកំណត់ជា &quot;ឆ្វេង&quot;
+DocType: Hub Settings,Last Sync On,ធ្វើសមកាលកម្មចុងក្រោយ
 DocType: Guardian,Guardian,កាសែត The Guardian
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ការវាយតម្លៃ {0} បានបង្កើតឡើងសម្រាប់បុគ្គលិក {1} នៅក្នុងជួរកាលបរិច្ឆេទដែលបានផ្ដល់
 DocType: Employee,Education,ការអប់រំ
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,del
 DocType: Selling Settings,Campaign Naming By,ដាក់ឈ្មោះការឃោសនាដោយ
 DocType: Employee,Current Address Is,អាសយដ្ឋានបច្ចុប្បន្នគឺ
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,គោលដៅលក់ប្រចាំខែ (
@@ -4965,8 +5060,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ជួរដេក {0}: គណបក្ស / គណនីមិនផ្គូផ្គងនឹង {1} / {2} នៅក្នុង {3} {4}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,កូដវគ្គសិក្សា:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,សូមបញ្ចូលចំណាយតាមគណនី
-DocType: Account,Stock,ភាគហ៊ុន
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ជួរដេក # {0}: យោងប្រភេទឯកសារត្រូវតែជាផ្នែកមួយនៃការទិញលំដាប់, ការទិញវិក័យប័ត្រឬធាតុទិនានុប្បវត្តិ"
+DocType: Account,Stock,ស្តុក
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ជួរដេក # {0}: យោងប្រភេទឯកសារត្រូវតែជាផ្នែកមួយនៃការទិញលំដាប់, ការទិញវិក័យប័ត្រឬធាតុទិនានុប្បវត្តិ"
 DocType: Employee,Current Address,អាសយដ្ឋានបច្ចុប្បន្ន
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ប្រសិនបើមានធាតុគឺវ៉ារ្យ៉ង់នៃធាតុផ្សេងទៀតបន្ទាប់មកពិពណ៌នា, រូបភាព, ការកំណត់តម្លៃពន្ធលនឹងត្រូវបានកំណត់ពីពុម្ពមួយនេះទេលុះត្រាតែបានបញ្ជាក់យ៉ាងជាក់លាក់"
 DocType: Serial No,Purchase / Manufacture Details,ទិញ / ពត៌មានលំអិតការផលិត
@@ -4997,7 +5092,7 @@
 DocType: Hub Settings,Hub Settings,ការកំណត់ហាប់
 DocType: Project,Gross Margin %,រឹម% សរុបបាន
 DocType: BOM,With Operations,ជាមួយនឹងការប្រតិបត្ដិការ
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,ធាតុគណនេយ្យត្រូវបានគេធ្វើរួចទៅហើយនៅក្នុងរូបិយប័ណ្ណ {0} សម្រាប់ក្រុមហ៊ុន {1} ។ សូមជ្រើសគណនីដែលត្រូវទទួលឬបង់រូបិយប័ណ្ណ {0} ។
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,ធាតុគណនេយ្យត្រូវបានគេធ្វើរួចទៅហើយនៅក្នុងរូបិយប័ណ្ណ {0} សម្រាប់ក្រុមហ៊ុន {1} ។ សូមជ្រើសគណនីដែលត្រូវទទួលឬបង់រូបិយប័ណ្ណ {0} ។
 DocType: Asset,Is Existing Asset,ទ្រព្យដែលមានស្រាប់ត្រូវបាន
 DocType: Salary Detail,Statistical Component,សមាសភាគស្ថិតិ
 DocType: Salary Detail,Statistical Component,សមាសភាគស្ថិតិ
@@ -5006,13 +5101,14 @@
 DocType: BOM Operation,BOM Operation,Bom ប្រតិបត្តិការ
 DocType: Purchase Taxes and Charges,On Previous Row Amount,នៅថ្ងៃទីចំនួនជួរដេកមុន
 DocType: Student,Home Address,អាសយដ្ឋានផ្ទះ
+DocType: Item,Has Expiry Date,មានកាលបរិច្ឆេទផុតកំណត់
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,ធាតុវ៉ារ្យ៉ង់ធាតុ។
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,ផ្ទេរទ្រព្យសម្បត្តិ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,ផ្ទេរទ្រព្យសម្បត្តិ
 DocType: POS Profile,POS Profile,ទម្រង់ ម៉ាស៊ីនឆូតកាត
 DocType: Training Event,Event Name,ឈ្មោះព្រឹត្តិការណ៍
 DocType: Physician,Phone (Office),ទូរស័ព្ទ (ការិយាល័យ)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,ការចូលរៀន
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},ការចូលសម្រាប់ {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,ការចូលរៀន
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},ការចូលសម្រាប់ {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.",រដូវកាលសម្រាប់ការកំណត់ថវិកាគោលដៅល
 DocType: Supplier Scorecard Scoring Variable,Variable Name,ឈ្មោះអថេរ
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",ធាតុ {0} គឺពុម្ពមួយសូមជ្រើសមួយក្នុងចំណោមវ៉ារ្យ៉ង់របស់ខ្លួន
@@ -5021,7 +5117,7 @@
 DocType: Assessment Plan,Room,បន្ទប់
 DocType: Purchase Order,Advance Paid,មុនបង់ប្រាក់
 DocType: Item,Item Tax,ការប្រមូលពន្ធលើធាតុ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,សម្ភារៈដើម្បីផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,សម្ភារៈដើម្បីផ្គត់ផ្គង់
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,រដ្ឋាករវិក័យប័ត្រ
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% ហាក់ដូចជាច្រើនជាងម្ដង
 DocType: Expense Claim,Employees Email Id,និយោជិអ៊ីម៉ែលលេខសម្គាល់
@@ -5032,32 +5128,30 @@
 DocType: Program,Program Name,ឈ្មោះកម្មវិធី
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,សូមពិចារណាឬបន្ទុកសម្រាប់ពន្ធលើ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,ជាក់ស្តែ Qty ចាំបាច់
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} បច្ចុប្បន្នមានជំហរ {1} លេខសម្គាល់អ្នកផ្គត់ផ្គង់ហើយការបញ្ជាទិញចំពោះអ្នកផ្គត់ផ្គង់នេះគួរតែត្រូវបានចេញដោយប្រុងប្រយ័ត្ន។
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} បច្ចុប្បន្នមានជំហរ {1} លេខសម្គាល់អ្នកផ្គត់ផ្គង់ហើយការបញ្ជាទិញចំពោះអ្នកផ្គត់ផ្គង់នេះគួរតែត្រូវបានចេញដោយប្រុងប្រយ័ត្ន។
 DocType: Employee Loan,Loan Type,ប្រភេទសេវាឥណទាន
 DocType: Scheduling Tool,Scheduling Tool,ឧបករណ៍កាលវិភាគ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,កាតឥណទាន
 DocType: BOM,Item to be manufactured or repacked,ធាតុនឹងត្រូវបានផលិតឬ repacked
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,ការកំណត់លំនាំដើមសម្រាប់ប្រតិបត្តិការភាគហ៊ុន។
-DocType: Purchase Invoice,Next Date,កាលបរិច្ឆេទបន្ទាប់
 DocType: Employee Education,Major/Optional Subjects,ដ៏ធំប្រធានបទ / ស្រេចចិត្ត
 DocType: Sales Invoice Item,Drop Ship,ទម្លាក់នាវា
+DocType: Hub Settings,Suspended,បានផ្អាក
 DocType: Training Event,Attendees,អ្នកចូលរួម
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",នៅទីនេះអ្នកអាចរក្សាបាននូវព័ត៌មានលម្អិតសម្រាប់ក្រុមគ្រួសារដូចជាឈ្មោះនិងមុខរបររបស់ឪពុកម្តាយប្តីប្រពន្ធនិងកូន
 DocType: Academic Term,Term End Date,រយៈពេលកាលបរិច្ឆេទបញ្ចប់
-DocType: Hub Settings,Seller Name,ឈ្មោះអ្នកលក់
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),ពន្ធនិងការចោទប្រកាន់កាត់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: Item Group,General Settings,ការកំណត់ទូទៅ
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,ចាប់ពីរូបិយវត្ថុនិងដើម្បីរូបិយវត្ថុមិនអាចជាដូចគ្នា
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,បន្ថែមអ្នកបង្ហាត់
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,អ្នកត្រូវតែរក្សាទុកសំណុំបែបបទមុនពេលដំណើរការសវនាការ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,សូមជ្រើសរើសក្រុមហ៊ុនមុន
 DocType: Item Attribute,Numeric Values,តម្លៃជាលេខ
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,ភ្ជាប់រូបសញ្ញា
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,កម្រិតភាគហ៊ុន
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,កម្រិតភាគហ៊ុន
 DocType: Customer,Commission Rate,អត្រាប្រាក់កំរៃ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,បានបង្កើត {0} សន្លឹកបៀសម្រាប់ {1} រវាង:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,ធ្វើឱ្យវ៉ារ្យង់
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,ធ្វើឱ្យវ៉ារ្យង់
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,កម្មវិធីដែលបានឈប់សម្រាកប្លុកដោយនាយកដ្ឋាន។
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer",ប្រភេទការទូទាត់ត្រូវតែជាផ្នែកមួយនៃការទទួលបានការសងប្រាក់និងផ្ទេរប្រាក់បរទេស
 apps/erpnext/erpnext/config/selling.py +179,Analytics,វិធីវិភាគ
@@ -5072,11 +5166,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,រាជធានីហ៊ុន
 DocType: Shopping Cart Settings,Show Public Attachments,បង្ហាញឯកសារភ្ជាប់សាធារណៈ
 DocType: Packing Slip,Package Weight Details,កញ្ចប់ព័ត៌មានលម្អិតទម្ងន់
+DocType: Restaurant Reservation,Reservation Time,ម៉ោងកក់
 DocType: Payment Gateway Account,Payment Gateway Account,គណនីទូទាត់
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,បន្ទាប់ពីការបញ្ចប់ការទូទាត់ប្តូរទិសអ្នកប្រើទំព័រដែលបានជ្រើស។
 DocType: Company,Existing Company,ក្រុមហ៊ុនដែលមានស្រាប់
 DocType: Healthcare Settings,Result Emailed,លទ្ធផលផ្ញើតាមអ៊ីម៉ែល
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","ប្រភេទពន្ធត្រូវបានផ្លាស់ប្តូរទៅជា ""សរុប"" ដោយសារតែធាតុទាំងអស់នេះគឺជាធាតុដែលមិនស្តុក"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,លេខកូដធាតុ&gt; ក្រុមធាតុ&gt; ម៉ាក
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,សូមជ្រើសឯកសារ csv
 DocType: Student Leave Application,Mark as Present,សម្គាល់ជាបច្ចុប្បន្ន
 DocType: Supplier Scorecard,Indicator Color,ពណ៌សូចនាករ
@@ -5101,11 +5197,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,ធ្វើឱ្យបាច់សិស្ស
 DocType: Fee Schedule,FRQ.,FRQ ។
 DocType: Leave Type,Is Carry Forward,គឺត្រូវបានអនុវត្តទៅមុខ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,ទទួលបានធាតុពី Bom
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,ទទួលបានធាតុពី Bom
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead ពេលថ្ងៃ
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ជួរដេក # {0}: ប្រកាសកាលបរិច្ឆេទត្រូវតែមានដូចគ្នាកាលបរិច្ឆេទទិញ {1} នៃទ្រព្យសម្បត្តិ {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,ធីកប្រអប់នេះបើសិស្សកំពុងរស់នៅនៅឯសណ្ឋាគារវិទ្យាស្ថាននេះ។
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,សូមបញ្ចូលការបញ្ជាទិញលក់នៅក្នុងតារាងខាងលើ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,សូមបញ្ចូលការបញ្ជាទិញលក់នៅក្នុងតារាងខាងលើ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,មិនផ្តល់ជូនប្រាក់ខែគ្រូពេទ្យប្រហែលជា
 ,Stock Summary,សង្ខេបភាគហ៊ុន
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,ផ្ទេរទ្រព្យសម្បត្តិមួយពីឃ្លាំងមួយទៅមួយទៀត
@@ -5121,5 +5217,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ជួរដេក {0}: ធាតុឥណពន្ធមិនអាចត្រូវបានផ្សារភ្ជាប់ទៅនឹងការ {1}
 DocType: Journal Entry,Subscription Section,ផ្នែកបរិវិសកម្ម
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,គណនី {0} មិនមាន
+DocType: Training Event,Training Program,កម្មវិធីបណ្តុះបណ្តាល
 DocType: Account,Cash,ជាសាច់ប្រាក់
 DocType: Employee,Short biography for website and other publications.,ប្រវត្ដិរូបខ្លីសម្រាប់គេហទំព័រនិងសៀវភៅផ្សេងទៀត។
diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv
index 4a0418b..89d3459 100644
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,ಸಂಬಳ ಫ್ಯಾಷನ್
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,ನೋಂದಣಿ
 DocType: Patient,Divorced,ವಿವಾಹವಿಚ್ಛೇದಿತ
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಸಿಂಕ್
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,ಐಟಂ ಒಂದು ವ್ಯವಹಾರದಲ್ಲಿ ಅನೇಕ ಬಾರಿ ಸೇರಿಸಬೇಕಾಗಿದೆ
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,ಮೆಟೀರಿಯಲ್ ಭೇಟಿ {0} ಈ ಖಾತರಿ ಹಕ್ಕು ರದ್ದು ಮೊದಲು ರದ್ದು
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,ಗ್ರಾಹಕ ಉತ್ಪನ್ನಗಳು
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Approvers ಬಿಡಿ
 DocType: Sales Partner,Dealer,ವ್ಯಾಪಾರಿ
 DocType: Consultation,Investigations,ತನಿಖೆಗಳು
+DocType: Restaurant Order Entry,Click Enter To Add,ಸೇರಿಸಲು ನಮೂದಿಸಿ ಕ್ಲಿಕ್ ಮಾಡಿ
 DocType: Employee,Rented,ಬಾಡಿಗೆ
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,ಬಳಕೆದಾರ ಅನ್ವಯಿಸುವುದಿಲ್ಲ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","ನಿಲ್ಲಿಸಿತು ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ರದ್ದುಗೊಳಿಸಲಾಗದು, ರದ್ದು ಮೊದಲು ಅಡ್ಡಿಯಾಗಿರುವುದನ್ನು ಬಿಡಿಸು"
 DocType: Vehicle Service,Mileage,ಮೈಲೇಜ್
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,ನೀವು ನಿಜವಾಗಿಯೂ ಈ ಆಸ್ತಿ ಸ್ಕ್ರ್ಯಾಪ್ ಬಯಸುತ್ತೀರಾ?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,ನೀವು ನಿಜವಾಗಿಯೂ ಈ ಆಸ್ತಿ ಸ್ಕ್ರ್ಯಾಪ್ ಬಯಸುತ್ತೀರಾ?
 DocType: Drug Prescription,Update Schedule,ಅಪ್ಡೇಟ್ ವೇಳಾಪಟ್ಟಿ
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,ಡೀಫಾಲ್ಟ್ ಸರಬರಾಜುದಾರ ಆಯ್ಕೆ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},ಕರೆನ್ಸಿ ಬೆಲೆ ಪಟ್ಟಿ ಅಗತ್ಯವಿದೆ {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,ಲಭ್ಯವಿದೆಯೇ
 DocType: Job Applicant,Job Applicant,ಜಾಬ್ ಸಂ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,ಈ ಸರಬರಾಜುದಾರ ವಿರುದ್ಧ ವ್ಯವಹಾರ ಆಧರಿಸಿದೆ. ಮಾಹಿತಿಗಾಗಿ ಕೆಳಗೆ ಟೈಮ್ಲೈನ್ ನೋಡಿ
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,ಹೆಚ್ಚು ಫಲಿತಾಂಶಗಳು.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,ಕಾನೂನಿನ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},ನಿಜವಾದ ರೀತಿಯ ತೆರಿಗೆ ಸತತವಾಗಿ ಐಟಂ ದರದಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ {0}
 DocType: Bank Guarantee,Customer,ಗಿರಾಕಿ
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),ವಿನಿಮಯ ದರ ಅದೇ ಇರಬೇಕು {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ಗ್ರಾಹಕ ಹೆಸರು
 DocType: Vehicle,Natural Gas,ನೈಸರ್ಗಿಕ ಅನಿಲ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},ಬ್ಯಾಂಕ್ ಖಾತೆಯಿಂದ ಹೆಸರಿನ ಸಾಧ್ಯವಿಲ್ಲ {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},ಬ್ಯಾಂಕ್ ಖಾತೆಯಿಂದ ಹೆಸರಿನ ಸಾಧ್ಯವಿಲ್ಲ {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ತಲೆ (ಅಥವಾ ಗುಂಪುಗಳು) ವಿರುದ್ಧ ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಮಾಡಲಾಗುತ್ತದೆ ಮತ್ತು ಸಮತೋಲನಗಳ ನಿರ್ವಹಿಸುತ್ತದೆ.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),ಮಹೋನ್ನತ {0} ಕಡಿಮೆ ಶೂನ್ಯ ಸಾಧ್ಯವಿಲ್ಲ ( {1} )
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಲು ಸಂಬಳದ ಸ್ಲಿಪ್ಸ್ ಸಲ್ಲಿಸಲಾಗಿಲ್ಲ.
 DocType: Manufacturing Settings,Default 10 mins,10 ನಿಮಿಷಗಳು ಡೀಫಾಲ್ಟ್
 DocType: Leave Type,Leave Type Name,TypeName ಬಿಡಿ
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,ತೆರೆದ ತೋರಿಸಿ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,ಮೇಲೆ ತಿಳಿಸಿದ ಪುನರಾವರ್ತಿತಕ್ಕಾಗಿ ಇಂದು ಈ ಕ್ರಿಯೆಯನ್ನು ಸ್ವತಃ ತೆಗೆದುಕೊಳ್ಳುವುದು ಅವಶ್ಯಕ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,ಸರಣಿ ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,ಚೆಕ್ಔಟ್
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural ಜರ್ನಲ್ ಎಂಟ್ರಿ ಸಲ್ಲಿಸಿದ
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,ಸ್ವೀಕರಿಸಬೇಕು ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಐಟಂಗಳು
 DocType: SMS Center,All Supplier Contact,ಎಲ್ಲಾ ಸಂಪರ್ಕಿಸಿ ಸರಬರಾಜುದಾರ
 DocType: Support Settings,Support Settings,ಬೆಂಬಲ ಸೆಟ್ಟಿಂಗ್ಗಳು
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,ನಿರೀಕ್ಷಿತ ಅಂತಿಮ ದಿನಾಂಕ ನಿರೀಕ್ಷಿತ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,ನಿರೀಕ್ಷಿತ ಅಂತಿಮ ದಿನಾಂಕ ನಿರೀಕ್ಷಿತ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ರೋ # {0}: ದರ ಅದೇ ಇರಬೇಕು {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,ಹೊಸ ರಜೆ ಅಪ್ಲಿಕೇಶನ್
 ,Batch Item Expiry Status,ಬ್ಯಾಚ್ ಐಟಂ ಅಂತ್ಯ ಸ್ಥಿತಿ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,ಬ್ಯಾಂಕ್ ಡ್ರಾಫ್ಟ್
 DocType: Mode of Payment Account,Mode of Payment Account,ಪಾವತಿ ಖಾತೆಯಿಂದ ಮೋಡ್
 DocType: Consultation,Consultation,ಸಮಾಲೋಚನೆ
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,ಮಾರಾಟ ಮತ್ತು ರಿಟರ್ನ್ಸ್
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,ತೋರಿಸು ಮಾರ್ಪಾಟುಗಳು
 DocType: Academic Term,Academic Term,ಶೈಕ್ಷಣಿಕ ಟರ್ಮ್
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,ವಸ್ತು
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ಆರೋಗ್ಯ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ಪಾವತಿ ವಿಳಂಬ (ದಿನಗಳು)
 DocType: Lab Prescription,Lab Prescription,ಲ್ಯಾಬ್ ಪ್ರಿಸ್ಕ್ರಿಪ್ಷನ್
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,ಬೆಲೆ ಪ್ರಕಾರ ವಿಂಗಡಿಸಿ
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ಸೇವೆ ಖರ್ಚು
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},ಕ್ರಮ ಸಂಖ್ಯೆ: {0} ಈಗಾಗಲೇ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಉಲ್ಲೇಖವಿದೆ: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,ಸರಕುಪಟ್ಟಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},ಕ್ರಮ ಸಂಖ್ಯೆ: {0} ಈಗಾಗಲೇ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಉಲ್ಲೇಖವಿದೆ: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,ಸರಕುಪಟ್ಟಿ
 DocType: Maintenance Schedule Item,Periodicity,ನಿಯತಕಾಲಿಕತೆ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ಹಣಕಾಸಿನ ವರ್ಷ {0} ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ರಕ್ಷಣೆ
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,ರೋ # {0}:
 DocType: Timesheet,Total Costing Amount,ಒಟ್ಟು ಕಾಸ್ಟಿಂಗ್ ಪ್ರಮಾಣ
 DocType: Delivery Note,Vehicle No,ವಾಹನ ನಂ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,ಬೆಲೆ ಪಟ್ಟಿ ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,ಬೆಲೆ ಪಟ್ಟಿ ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Accounts Settings,Currency Exchange Settings,ಕರೆನ್ಸಿ ವಿನಿಮಯ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,ರೋ # {0}: ಪಾವತಿ ಡಾಕ್ಯುಮೆಂಟ್ trasaction ಪೂರ್ಣಗೊಳಿಸಲು ಅಗತ್ಯವಿದೆ
 DocType: Production Order Operation,Work In Progress,ಪ್ರಗತಿಯಲ್ಲಿದೆ ಕೆಲಸ
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,ದಿನಾಂಕ ಆಯ್ಕೆ
 DocType: Employee,Holiday List,ಹಾಲಿಡೇ ಪಟ್ಟಿ
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,ದಯವಿಟ್ಟು ಶಾಲೆಯ&gt; ಶಾಲಾ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಬೋಧಕ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಸಿದ್ಧಗೊಳಿಸಿ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,ಅಕೌಂಟೆಂಟ್
+DocType: Hub Settings,Selling Price List,ಬೆಲೆ ಪಟ್ಟಿ ಮಾರಾಟ
 DocType: Patient,Tobacco Current Use,ತಂಬಾಕು ಪ್ರಸ್ತುತ ಬಳಕೆ
 DocType: Cost Center,Stock User,ಸ್ಟಾಕ್ ಬಳಕೆದಾರ
 DocType: Company,Phone No,ದೂರವಾಣಿ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,ಕೋರ್ಸ್ ವೇಳಾಪಟ್ಟಿಗಳು ದಾಖಲಿಸಿದವರು:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},ಹೊಸ {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},ಹೊಸ {0}: # {1}
 ,Sales Partners Commission,ಮಾರಾಟದ ಪಾರ್ಟ್ನರ್ಸ್ ಆಯೋಗ
 DocType: Purchase Invoice,Rounding Adjustment,ಪೂರ್ಣಾಂಕಗೊಳಿಸುವ ಹೊಂದಾಣಿಕೆ
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,ಸಂಕ್ಷೇಪಣ ಹೆಚ್ಚು 5 ಪಾತ್ರಗಳು ಸಾಧ್ಯವಿಲ್ಲ
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Docname ಪೋಷಕ ವಿವರ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","ರೆಫರೆನ್ಸ್: {0}, ಐಟಂ ಕೋಡ್: {1} ಮತ್ತು ಗ್ರಾಹಕ: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,ಕೆಜಿ
-DocType: Student Log,Log,ಲಾಗ್
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,ಕೆಲಸ ತೆರೆಯುತ್ತಿದೆ .
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} ಫಲಿತಾಂಶವನ್ನು ಸಲ್ಲಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} ಫಲಿತಾಂಶವನ್ನು ಸಲ್ಲಿಸಲಾಗಿದೆ
 DocType: Item Attribute,Increment,ಹೆಚ್ಚಳವನ್ನು
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,ಟೈಮ್ಸ್ಪ್ಯಾನ್
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,ವೇರ್ಹೌಸ್ ಆಯ್ಕೆ ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,ವಿವಾಹಿತರು
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},ಜಾಹೀರಾತು ಅನುಮತಿಯಿಲ್ಲ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},ಸ್ಟಾಕ್ ಡೆಲಿವರಿ ಗಮನಿಸಿ ವಿರುದ್ಧ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},ಸ್ಟಾಕ್ ಡೆಲಿವರಿ ಗಮನಿಸಿ ವಿರುದ್ಧ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ಉತ್ಪನ್ನ {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,ಯಾವುದೇ ಐಟಂಗಳನ್ನು ಪಟ್ಟಿ
 DocType: Payment Reconciliation,Reconcile,ರಾಜಿ ಮಾಡಿಸು
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,ಪಿಂಚಣಿ ನಿಧಿಗಳು
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಖರೀದಿ ದಿನಾಂಕ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Consultation,Consultation Date,ಸಮಾಲೋಚನೆ ದಿನಾಂಕ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNext ಬಳಕೆದಾರರಿಗೆ ಉತ್ಪನ್ನ ಪಟ್ಟಿ ಮತ್ತು ಶೋಧನೆ
 DocType: SMS Center,All Sales Person,ಎಲ್ಲಾ ಮಾರಾಟಗಾರನ
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ಮಾಸಿಕ ವಿತರಣೆ ** ನಿಮ್ಮ ವ್ಯವಹಾರದಲ್ಲಿ ಋತುಗಳು ಹೊಂದಿದ್ದರೆ ನೀವು ತಿಂಗಳ ಅಡ್ಡಲಾಗಿ ಬಜೆಟ್ / ಟಾರ್ಗೆಟ್ ವಿತರಿಸಲು ನೆರವಾಗುತ್ತದೆ.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,ಮಾಡಿರುವುದಿಲ್ಲ ಐಟಂಗಳನ್ನು ಕಂಡುಬಂದಿಲ್ಲ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,ಸಂಬಳ ರಚನೆ ಮಿಸ್ಸಿಂಗ್
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,ಮಾಡಿರುವುದಿಲ್ಲ ಐಟಂಗಳನ್ನು ಕಂಡುಬಂದಿಲ್ಲ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,ಸಂಬಳ ರಚನೆ ಮಿಸ್ಸಿಂಗ್
 DocType: Lead,Person Name,ವ್ಯಕ್ತಿ ಹೆಸರು
 DocType: Sales Invoice Item,Sales Invoice Item,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಐಟಂ
 DocType: Account,Credit,ಕ್ರೆಡಿಟ್
 DocType: POS Profile,Write Off Cost Center,ವೆಚ್ಚ ಸೆಂಟರ್ ಆಫ್ ಬರೆಯಿರಿ
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",ಉದಾಹರಣೆಗೆ &quot;ಪ್ರಾಥಮಿಕ ಶಾಲೆ&quot; ಅಥವಾ &quot;ವಿಶ್ವವಿದ್ಯಾಲಯ&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",ಉದಾಹರಣೆಗೆ &quot;ಪ್ರಾಥಮಿಕ ಶಾಲೆ&quot; ಅಥವಾ &quot;ವಿಶ್ವವಿದ್ಯಾಲಯ&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,ಸ್ಟಾಕ್ ವರದಿಗಳು
 DocType: Warehouse,Warehouse Detail,ವೇರ್ಹೌಸ್ ವಿವರ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಗ್ರಾಹಕ ದಾಟಿದೆ ಮಾಡಲಾಗಿದೆ {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ಟರ್ಮ್ ಎಂಡ್ ದಿನಾಂಕ ನಂತರ ಶೈಕ್ಷಣಿಕ ವರ್ಷದ ವರ್ಷಾಂತ್ಯದ ದಿನಾಂಕ ಪದವನ್ನು ಸಂಪರ್ಕಿತ ಉದ್ದವಾಗಿರುವಂತಿಲ್ಲ (ಅಕಾಡೆಮಿಕ್ ಇಯರ್ {}). ದಯವಿಟ್ಟು ದಿನಾಂಕಗಳನ್ನು ಸರಿಪಡಿಸಲು ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ಸ್ಥಿರ ಆಸ್ತಿ&quot; ಆಸ್ತಿ ದಾಖಲೆ ಐಟಂ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವಂತೆ, ಪರಿಶೀಲಿಸದೆ ಸಾಧ್ಯವಿಲ್ಲ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ಸ್ಥಿರ ಆಸ್ತಿ&quot; ಆಸ್ತಿ ದಾಖಲೆ ಐಟಂ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವಂತೆ, ಪರಿಶೀಲಿಸದೆ ಸಾಧ್ಯವಿಲ್ಲ"
 DocType: Vehicle Service,Brake Oil,ಬ್ರೇಕ್ ಆಯಿಲ್
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕರ ಗುಂಪು&gt; ಪ್ರದೇಶ
 DocType: Tax Rule,Tax Type,ಜನಪ್ರಿಯ ಕೌಟುಂಬಿಕತೆ
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,ತೆರಿಗೆ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},ನೀವು ಮೊದಲು ನಮೂದುಗಳನ್ನು ಸೇರಿಸಲು ಅಥವ ಅಪ್ಡೇಟ್ ಅಧಿಕಾರ {0}
 DocType: BOM,Item Image (if not slideshow),ಐಟಂ ಚಿತ್ರ (ಇಲ್ಲದಿದ್ದರೆ ಸ್ಲೈಡ್ಶೋ )
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ಗ್ರಾಹಕ ಅದೇ ಹೆಸರಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ಅವರ್ ದರ / 60) * ವಾಸ್ತವಿಕ ಆಪರೇಷನ್ ಟೈಮ್
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,ಸಾಲು # {0}: ಉಲ್ಲೇಖ ಡಾಕ್ಯುಮೆಂಟ್ ಪ್ರಕಾರವು ಖರ್ಚು ಕ್ಲೈಮ್ ಅಥವಾ ಜರ್ನಲ್ ಎಂಟ್ರಿಗಳಲ್ಲಿ ಒಂದಾಗಿರಬೇಕು
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,ಬಿಒಎಮ್ ಆಯ್ಕೆ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,ಸಾಲು # {0}: ಉಲ್ಲೇಖ ಡಾಕ್ಯುಮೆಂಟ್ ಪ್ರಕಾರವು ಖರ್ಚು ಕ್ಲೈಮ್ ಅಥವಾ ಜರ್ನಲ್ ಎಂಟ್ರಿಗಳಲ್ಲಿ ಒಂದಾಗಿರಬೇಕು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,ಬಿಒಎಮ್ ಆಯ್ಕೆ
 DocType: SMS Log,SMS Log,ಎಸ್ಎಂಎಸ್ ಲಾಗಿನ್
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,ತಲುಪಿಸುವುದಾಗಿರುತ್ತದೆ ವೆಚ್ಚ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} ರಜೆ ದಿನಾಂಕದಿಂದ ಮತ್ತು ದಿನಾಂಕ ನಡುವೆ ಅಲ್ಲ
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,ನೌಕರರ ಸಾಲ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,ಚಟುವಟಿಕೆ ಲಾಗ್ :
 DocType: Fee Schedule,Send Payment Request Email,ಪಾವತಿ ವಿನಂತಿ ಇಮೇಲ್ ಕಳುಹಿಸಿ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,ಐಟಂ {0} ವ್ಯವಸ್ಥೆಯ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ಅಥವಾ ಮುಗಿದಿದೆ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,ಐಟಂ {0} ವ್ಯವಸ್ಥೆಯ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ಅಥವಾ ಮುಗಿದಿದೆ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,ಸ್ಥಿರಾಸ್ತಿ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,ಖಾತೆ ಹೇಳಿಕೆ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ಫಾರ್ಮಾಸ್ಯುಟಿಕಲ್ಸ್
@@ -210,18 +213,23 @@
 DocType: Employee,B-,ಬಿ
 DocType: Upload Attendance,Import Log,ಆಮದು ಲಾಗ್
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,ಮೇಲೆ ಮಾನದಂಡಗಳನ್ನು ಆಧರಿಸಿ ರೀತಿಯ ತಯಾರಿಕೆ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ಪುಲ್
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,ಯಶಸ್ವಿಯಾಗಿ ನೋಂದಾಯಿಸಲಾಗಿಲ್ಲ.
 DocType: Training Result Employee,Grade,ಗ್ರೇಡ್
+DocType: Restaurant Table,No of Seats,ಆಸನಗಳ ಸಂಖ್ಯೆ
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","ಕ್ರಿಯಾತ್ಮಕ ವಿಷಯ ಸೇರಿಸಲು, ಜಿಂಜ ಟ್ಯಾಗ್ಗಳನ್ನು ಬಳಸಿ <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,ಸರಬರಾಜುದಾರ ವಿತರಣೆ
 DocType: SMS Center,All Contact,ಎಲ್ಲಾ ಸಂಪರ್ಕಿಸಿ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಈಗಾಗಲೇ ಬಿಒಎಮ್ ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ದಾಖಲಿಸಿದವರು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಈಗಾಗಲೇ ಬಿಒಎಮ್ ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ದಾಖಲಿಸಿದವರು
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,ವಾರ್ಷಿಕ ಸಂಬಳ
 DocType: Daily Work Summary,Daily Work Summary,ದೈನಂದಿನ ಕೆಲಸ ಸಾರಾಂಶ
 DocType: Period Closing Voucher,Closing Fiscal Year,ಹಣಕಾಸಿನ ವರ್ಷ ಕ್ಲೋಸಿಂಗ್
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} ಹೆಪ್ಪುಗಟ್ಟಿರುವ
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,ದಯವಿಟ್ಟು ಖಾತೆಗಳ ಪಟ್ಟಿ ರಚಿಸಲು ಕಂಪನಿಯ ಆಯ್ಕೆ
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} ಹೆಪ್ಪುಗಟ್ಟಿರುವ
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,ದಯವಿಟ್ಟು ಖಾತೆಗಳ ಪಟ್ಟಿ ರಚಿಸಲು ಕಂಪನಿಯ ಆಯ್ಕೆ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,ಸ್ಟಾಕ್ ವೆಚ್ಚಗಳು
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್ ಆಯ್ಕೆ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್ ಆಯ್ಕೆ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್ ಆಯ್ಕೆ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್ ಆಯ್ಕೆ
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,ದಯವಿಟ್ಟು ಇಷ್ಟದ ಸಂಪರ್ಕ ಇಮೇಲ್ ನಮೂದಿಸಿ
 DocType: Program Enrollment,School Bus,ಶಾಲಾ ಬಸ್
 DocType: Journal Entry,Contra Entry,ಕಾಂಟ್ರಾ ಎಂಟ್ರಿ
@@ -239,9 +247,10 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", ಟೆಂಪ್ಲೇಟು ಸೂಕ್ತ ಮಾಹಿತಿ ತುಂಬಲು ಮತ್ತು ಬದಲಾಯಿಸಲಾಗಿತ್ತು ಕಡತ ಲಗತ್ತಿಸಬಹುದು.
  ಆಯ್ಕೆ ಅವಧಿಯಲ್ಲಿ ಎಲ್ಲ ದಿನಾಂಕಗಳು ಮತ್ತು ನೌಕರ ಸಂಯೋಜನೆಯನ್ನು ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಹಾಜರಾತಿ ದಾಖಲೆಗಳು, ಟೆಂಪ್ಲೇಟ್ ಬರುತ್ತದೆ"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,ಐಟಂ {0} ಸಕ್ರಿಯವಾಗಿಲ್ಲ ಅಥವಾ ಜೀವನದ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿತು ಮಾಡಲಾಗಿದೆ
+DocType: Student Admission Program,Minimum Age,ಕನಿಷ್ಠ ವಯಸ್ಸು
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,ಉದಾಹರಣೆ: ಮೂಲಭೂತ ಗಣಿತ
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ಸತತವಾಗಿ ತೆರಿಗೆ ಸೇರಿಸಲು {0} ಐಟಂ ಪ್ರಮಾಣದಲ್ಲಿ , ಸಾಲುಗಳಲ್ಲಿ ತೆರಿಗೆ {1} , ಎಂದು ಸೇರಿಸಲೇಬೇಕು"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,ಮಾನವ ಸಂಪನ್ಮೂಲ ಮಾಡ್ಯೂಲ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,ಮಾನವ ಸಂಪನ್ಮೂಲ ಮಾಡ್ಯೂಲ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: SMS Center,SMS Center,ಸಂಚಿಕೆ ಸೆಂಟರ್
 DocType: Sales Invoice,Change Amount,ಪ್ರಮಾಣವನ್ನು ಬದಲಾವಣೆ
 DocType: BOM Update Tool,New BOM,ಹೊಸ BOM
@@ -251,7 +260,7 @@
 DocType: Lead,Request Type,ವಿನಂತಿ ಪ್ರಕಾರ
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,ನೌಕರರ ಮಾಡಿ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ಬ್ರಾಡ್ಕಾಸ್ಟಿಂಗ್
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,ಕೊಠಡಿಗಳನ್ನು ಸೇರಿಸಿ
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),ಪಿಓಎಸ್ನ ಸೆಟಪ್ ಮೋಡ್ (ಆನ್ಲೈನ್ / ಆಫ್ಲೈನ್)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,ಎಕ್ಸಿಕ್ಯೂಶನ್
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ಕಾರ್ಯಾಚರಣೆಗಳ ವಿವರಗಳು ನಡೆಸಿತು.
 DocType: Serial No,Maintenance Status,ನಿರ್ವಹಣೆ ಸ್ಥಿತಿಯನ್ನು
@@ -274,6 +283,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,ಬೆಲೆ ಪಟ್ಟಿ ಖರೀದಿ ಅಥವಾ ಮಾರಾಟದ ಜ ಇರಬೇಕು
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},ಅನುಸ್ಥಾಪನ ದಿನಾಂಕ ಐಟಂ ವಿತರಣಾ ದಿನಾಂಕದ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),ದರ ಪಟ್ಟಿ ದರ ರಿಯಾಯಿತಿ (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,ಬಯೋಕೆಮಿಸ್ಟ್ರಿ
 DocType: Offer Letter,Select Terms and Conditions,ಆಯ್ಕೆ ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,ಔಟ್ ಮೌಲ್ಯ
 DocType: Production Planning Tool,Sales Orders,ಮಾರಾಟ ಆದೇಶಗಳಿಗೆ
@@ -308,15 +318,15 @@
 DocType: Sales Partner,Reseller,ಮರುಮಾರಾಟ
 DocType: Codification Table,Medical Code,ವೈದ್ಯಕೀಯ ಕೋಡ್
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","ಪರಿಶೀಲಿಸಿದರೆ, ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ಅಲ್ಲದ ಸ್ಟಾಕ್ ಐಟಂಗಳನ್ನು ಒಳಗೊಂಡಿದೆ."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,ಕಂಪನಿ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,ಕಂಪನಿ ನಮೂದಿಸಿ
 DocType: Delivery Note Item,Against Sales Invoice Item,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಐಟಂ ವಿರುದ್ಧ
 ,Production Orders in Progress,ಪ್ರೋಗ್ರೆಸ್ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ಸ್
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,ಹಣಕಾಸು ನಿವ್ವಳ ನಗದು
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","ಸ್ಥಳಿಯಸಂಗ್ರಹಣೆ ಪೂರ್ಣ, ಉಳಿಸಲು ಮಾಡಲಿಲ್ಲ"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","ಸ್ಥಳಿಯಸಂಗ್ರಹಣೆ ಪೂರ್ಣ, ಉಳಿಸಲು ಮಾಡಲಿಲ್ಲ"
 DocType: Lead,Address & Contact,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕ
 DocType: Leave Allocation,Add unused leaves from previous allocations,ಹಿಂದಿನ ಹಂಚಿಕೆಗಳು ರಿಂದ ಬಳಕೆಯಾಗದ ಎಲೆಗಳು ಸೇರಿಸಿ
 DocType: Sales Partner,Partner website,ಸಂಗಾತಿ ವೆಬ್ಸೈಟ್
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,ಐಟಂ ಸೇರಿಸಿ
+DocType: Restaurant Order Entry,Add Item,ಐಟಂ ಸೇರಿಸಿ
 DocType: Lab Test,Custom Result,ಕಸ್ಟಮ್ ಫಲಿತಾಂಶ
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,ಸಂಪರ್ಕಿಸಿ ಹೆಸರು
 DocType: Course Assessment Criteria,Course Assessment Criteria,ಕೋರ್ಸ್ ಅಸೆಸ್ಮೆಂಟ್ ಕ್ರೈಟೀರಿಯಾ
@@ -329,7 +339,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ಖರೀದಿ ವಿನಂತಿ .
 DocType: Lab Test,Submitted Date,ಸಲ್ಲಿಸಿದ ದಿನಾಂಕ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,ಈ ಯೋಜನೆಯ ವಿರುದ್ಧ ಕಾಲ ಶೀಟ್ಸ್ ಆಧರಿಸಿದೆ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,ನಿವ್ವಳ ವೇತನ ಸಾಧ್ಯವಿಲ್ಲ ಕಡಿಮೆ 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,ನಿವ್ವಳ ವೇತನ ಸಾಧ್ಯವಿಲ್ಲ ಕಡಿಮೆ 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","ಸಿಸ್ಟಮ್ನಿಂದ ಪುನರಾವರ್ತಿತ ದೋಷ ಅಧಿಸೂಚನೆಗಳನ್ನು ಕಳುಹಿಸುವುದನ್ನು ನಿಲ್ಲಿಸಲು, ನಾವು ಚಂದಾದಾರಿಕೆಯಲ್ಲಿ ಅಂಗವಿಕಲ ಕ್ಷೇತ್ರವನ್ನು ಪರಿಶೀಲಿಸಿದ್ದೇವೆ"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,ಕೇವಲ ಆಯ್ದ ಲೀವ್ ಅನುಮೋದಕ ಈ ರಜೆ ಅಪ್ಲಿಕೇಶನ್ ಸಲ್ಲಿಸಬಹುದು
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,ದಿನಾಂಕ ನಿವಾರಿಸುವ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,ವರ್ಷಕ್ಕೆ ಎಲೆಗಳು
@@ -338,9 +349,10 @@
 DocType: Email Digest,Profit & Loss,ಲಾಭ ನಷ್ಟ
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,ಲೀಟರ್
 DocType: Task,Total Costing Amount (via Time Sheet),ಒಟ್ಟು ಕಾಸ್ಟಿಂಗ್ ಪ್ರಮಾಣ (ಟೈಮ್ ಶೀಟ್ ಮೂಲಕ)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,ದಯವಿಟ್ಟು ವಿದ್ಯಾರ್ಥಿ ಗುಂಪುಗಳ ಅಡಿಯಲ್ಲಿ ವಿದ್ಯಾರ್ಥಿಗಳನ್ನು ಸೆಟಪ್ ಮಾಡಿ
 DocType: Item Website Specification,Item Website Specification,ವಸ್ತು ವಿಶೇಷತೆಗಳು ವೆಬ್ಸೈಟ್
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ಬಿಡಿ ನಿರ್ಬಂಧಿಸಿದ
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},ಐಟಂ {0} ಜೀವನದ ತನ್ನ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿದೆ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},ಐಟಂ {0} ಜೀವನದ ತನ್ನ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿದೆ {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,ಬ್ಯಾಂಕ್ ನಮೂದುಗಳು
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,ವಾರ್ಷಿಕ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಐಟಂ
@@ -349,7 +361,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಸೃಷ್ಟಿ ಉಪಕರಣ ಕೋರ್ಸ್
 DocType: Lead,Do Not Contact,ಸಂಪರ್ಕಿಸಿ ಇಲ್ಲ
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,ನಿಮ್ಮ ಸಂಘಟನೆಯಲ್ಲಿ ಕಲಿಸಲು ಜನರು
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,ಎಲ್ಲಾ ಮರುಕಳಿಸುವ ಇನ್ವಾಯ್ಸ್ ಟ್ರ್ಯಾಕ್ ಅನನ್ಯ ID . ಇದು ಸಲ್ಲಿಸಲು ಮೇಲೆ ಉತ್ಪಾದಿಸಲಾಗುತ್ತದೆ.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,ಸಾಫ್ಟ್ವೇರ್ ಡೆವಲಪರ್
 DocType: Item,Minimum Order Qty,ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ
 DocType: Pricing Rule,Supplier Type,ಸರಬರಾಜುದಾರ ಪ್ರಕಾರ
@@ -359,17 +370,19 @@
 DocType: Item,Publish in Hub,ಹಬ್ ಪ್ರಕಟಿಸಿ
 DocType: Student Admission,Student Admission,ವಿದ್ಯಾರ್ಥಿ ಪ್ರವೇಶ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,ಐಟಂ {0} ರದ್ದು
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,ಐಟಂ {0} ರದ್ದು
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
 DocType: Bank Reconciliation,Update Clearance Date,ಅಪ್ಡೇಟ್ ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ
 DocType: Item,Purchase Details,ಖರೀದಿ ವಿವರಗಳು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ಖರೀದಿ ಆದೇಶದ &#39;ಕಚ್ಚಾ ವಸ್ತುಗಳ ಸರಬರಾಜು ಕೋಷ್ಟಕದಲ್ಲಿ ಕಂಡುಬಂದಿಲ್ಲ ಐಟಂ {0} {1}
 DocType: Patient Relation,Relation,ರಿಲೇಶನ್
 DocType: Shipping Rule,Worldwide Shipping,ವಿಶ್ವಾದ್ಯಂತ ಹಡಗು
 DocType: Patient Relation,Mother,ತಾಯಿಯ
+DocType: Restaurant Reservation,Reservation End Time,ಮೀಸಲಾತಿ ಅಂತ್ಯ ಸಮಯ
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,ಗ್ರಾಹಕರಿಂದ ಕನ್ಫರ್ಮ್ಡ್ ಆದೇಶಗಳನ್ನು .
 DocType: Purchase Receipt Item,Rejected Quantity,ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,ಪಾವತಿ ವಿನಂತಿಯನ್ನು {0} ರಚಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,ಪಾವತಿ ವಿನಂತಿಯನ್ನು {0} ರಚಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,ಕಡಿಮೆ ಸೂಕ್ಷ್ಮತೆ
 DocType: Notification Control,Notification Control,ಅಧಿಸೂಚನೆ ಕಂಟ್ರೋಲ್
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,ನಿಮ್ಮ ತರಬೇತಿ ಪೂರ್ಣಗೊಂಡ ನಂತರ ದಯವಿಟ್ಟು ದೃಢೀಕರಿಸಿ
 DocType: Lead,Suggestions,ಸಲಹೆಗಳು
@@ -389,7 +402,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,ಮೆಚ್ಚಿನ ಇಮೇಲ್ ನೌಕರರ ಆಯ್ಕೆ ಆಧರಿಸಿ ನೌಕರ ಇಮೇಲ್ಗಳನ್ನು ಸಂಬಳ ಸ್ಲಿಪ್
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,ಪಟ್ಟಿಯಲ್ಲಿ ಮೊದಲ ಲೀವ್ ಅನುಮೋದಕ ಡೀಫಾಲ್ಟ್ ಲೀವ್ ಅನುಮೋದಕ ಎಂದು ಸೆಟ್ ಮಾಡಲಾಗುತ್ತದೆ
 DocType: Tax Rule,Shipping County,ಶಿಪ್ಪಿಂಗ್ ಕೌಂಟಿ
-apps/erpnext/erpnext/config/desktop.py +158,Learn,ಕಲಿಯಿರಿ
+apps/erpnext/erpnext/config/desktop.py +159,Learn,ಕಲಿಯಿರಿ
 DocType: Asset,Next Depreciation Date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,ನೌಕರರ ಚಟುವಟಿಕೆಗಳನ್ನು ವೆಚ್ಚ
 DocType: Accounts Settings,Settings for Accounts,ಖಾತೆಗಳಿಗೆ ಸೆಟ್ಟಿಂಗ್ಗಳು
@@ -400,13 +413,13 @@
 DocType: Item,Synced With Hub,ಹಬ್ ಸಿಂಕ್
 DocType: Vehicle,Fleet Manager,ಫ್ಲೀಟ್ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},ರೋ # {0}: {1} ಐಟಂ ನಕಾರಾತ್ಮಕವಾಗಿರಬಾರದು {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,ತಪ್ಪು ಪಾಸ್ವರ್ಡ್
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,ತಪ್ಪು ಪಾಸ್ವರ್ಡ್
 DocType: Item,Variant Of,ಭಿನ್ನ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',ಹೆಚ್ಚು 'ಪ್ರಮಾಣ ತಯಾರಿಸಲು' ಮುಗಿದಿದೆ ಪ್ರಮಾಣ ಹೆಚ್ಚಾಗಿರುವುದು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Period Closing Voucher,Closing Account Head,ಖಾತೆ ಮುಚ್ಚುವಿಕೆಗೆ ಹೆಡ್
 DocType: Employee,External Work History,ಬಾಹ್ಯ ಕೆಲಸ ಇತಿಹಾಸ
 DocType: Physician,Time per Appointment,ನೇಮಕಾತಿಗೆ ಸಮಯ
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,ಸುತ್ತೋಲೆ ಆಧಾರದೋಷ
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,ಸುತ್ತೋಲೆ ಆಧಾರದೋಷ
 DocType: Appointment Type,Is Inpatient,ಒಳರೋಗಿ ಇದೆ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 ಹೆಸರು
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,ನೀವು ವಿತರಣಾ ಸೂಚನೆ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ( ರಫ್ತು ) ಗೋಚರಿಸುತ್ತದೆ.
@@ -415,19 +428,18 @@
 DocType: Lead,Industry,ಇಂಡಸ್ಟ್ರಿ
 DocType: Employee,Job Profile,ಜಾಬ್ ಪ್ರೊಫೈಲ್ಗಳು
 DocType: BOM Item,Rate & Amount,ದರ ಮತ್ತು ಮೊತ್ತ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ಸೆಟಪ್&gt; ಸಂಖ್ಯಾ ಸರಣಿಗಳ ಮೂಲಕ ಹಾಜರಾತಿಗಾಗಿ ಸೆಟಪ್ ಸಂಖ್ಯೆಯ ಸರಣಿ
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,ಇದು ಈ ಕಂಪೆನಿಯ ವಿರುದ್ಧ ವಹಿವಾಟುಗಳನ್ನು ಆಧರಿಸಿದೆ. ವಿವರಗಳಿಗಾಗಿ ಕೆಳಗೆ ಟೈಮ್ಲೈನ್ ನೋಡಿ
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ಸ್ವಯಂಚಾಲಿತ ವಸ್ತು ವಿನಂತಿಯನ್ನು ಸೃಷ್ಟಿ ಮೇಲೆ ಈಮೇಲ್ ಸೂಚಿಸಿ
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,ನಿರೋಧಕ
 DocType: Journal Entry,Multi Currency,ಮಲ್ಟಿ ಕರೆನ್ಸಿ
 DocType: Payment Reconciliation Invoice,Invoice Type,ಸರಕುಪಟ್ಟಿ ಪ್ರಕಾರ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕರ ಗುಂಪು&gt; ಪ್ರದೇಶ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
 DocType: Consultation,Encounter Impression,ಎನ್ಕೌಂಟರ್ ಇಂಪ್ರೆಷನ್
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,ತೆರಿಗೆಗಳು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,ಮಾರಾಟ ಆಸ್ತಿ ವೆಚ್ಚ
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,ನೀವು ಹೊರಹಾಕಿದ ನಂತರ ಪಾವತಿ ಎಂಟ್ರಿ ಮಾರ್ಪಡಿಸಲಾಗಿದೆ. ಮತ್ತೆ ಎಳೆಯಲು ದಯವಿಟ್ಟು.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} ಐಟಂ ತೆರಿಗೆ ಎರಡು ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,ಈ ವಾರ ಬಾಕಿ ಚಟುವಟಿಕೆಗಳಿಗೆ ಸಾರಾಂಶ
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} ಐಟಂ ತೆರಿಗೆ ಎರಡು ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,ಈ ವಾರ ಬಾಕಿ ಚಟುವಟಿಕೆಗಳಿಗೆ ಸಾರಾಂಶ
 DocType: Student Applicant,Admitted,ಒಪ್ಪಿಕೊಂಡರು
 DocType: Workstation,Rent Cost,ಬಾಡಿಗೆ ವೆಚ್ಚ
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,ಪ್ರಮಾಣ ಸವಕಳಿ ನಂತರ
@@ -442,36 +454,35 @@
 DocType: Shipping Rule,Valid for Countries,ದೇಶಗಳಿಗೆ ಅನ್ವಯಿಸುತ್ತದೆ
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ಈ ಐಟಂ ಒಂದು ಟೆಂಪ್ಲೇಟು ಮತ್ತು ವ್ಯವಹಾರಗಳಲ್ಲಿ ಬಳಸಲಾಗುವುದಿಲ್ಲ. 'ಯಾವುದೇ ನಕಲಿಸಿ' ಸೆಟ್ ಹೊರತು ಐಟಂ ಲಕ್ಷಣಗಳು ವೇರಿಯಂಟುಗಳನ್ನು ನಕಲು ಮಾಡಲಾಗುತ್ತದೆ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ಪರಿಗಣಿಸಲಾದ ಒಟ್ಟು ಆರ್ಡರ್
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","ನೌಕರರ ಹುದ್ದೆ ( ಇ ಜಿ ಸಿಇಒ , ನಿರ್ದೇಶಕ , ಇತ್ಯಾದಿ ) ."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","ನೌಕರರ ಹುದ್ದೆ ( ಇ ಜಿ ಸಿಇಒ , ನಿರ್ದೇಶಕ , ಇತ್ಯಾದಿ ) ."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,ಗ್ರಾಹಕ ಕರೆನ್ಸಿ ದರ ಗ್ರಾಹಕ ಬೇಸ್ ಕರೆನ್ಸಿ ಪರಿವರ್ತನೆ
 DocType: Course Scheduling Tool,Course Scheduling Tool,ಕೋರ್ಸ್ ನಿಗದಿಗೊಳಿಸುವ ಟೂಲ್
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ರೋ # {0} ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಸಾಧ್ಯವಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಆಸ್ತಿಯ ಕುರಿತು ಮಾಡಿದ {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[ತುರ್ತು]% s ಗಾಗಿ ಮರುಕಳಿಸುವ% s ಅನ್ನು ರಚಿಸುವಾಗ ದೋಷ ಉಂಟಾಗಿದೆ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[ತುರ್ತು]% s ಗಾಗಿ ಮರುಕಳಿಸುವ% s ಅನ್ನು ರಚಿಸುವಾಗ ದೋಷ ಉಂಟಾಗಿದೆ
 DocType: Item Tax,Tax Rate,ತೆರಿಗೆ ದರ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ಈಗಾಗಲೇ ನೌಕರರ ಹಂಚಿಕೆ {1} ಗೆ ಅವಧಿಯಲ್ಲಿ {2} ಫಾರ್ {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,ಆಯ್ಕೆ ಐಟಂ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,ಆಯ್ಕೆ ಐಟಂ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಿದ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},ರೋ # {0}: ಬ್ಯಾಚ್ ಯಾವುದೇ ಅದೇ ಇರಬೇಕು {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,ಅ ಗ್ರೂಪ್ ಗೆ ಪರಿವರ್ತಿಸಿ
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,ಐಟಂ ಬ್ಯಾಚ್ ( ಬಹಳಷ್ಟು ) .
 DocType: C-Form Invoice Detail,Invoice Date,ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ
 DocType: GL Entry,Debit Amount,ಡೆಬಿಟ್ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},ಮಾತ್ರ ಕಂಪನಿ ಪ್ರತಿ 1 ಖಾತೆ ಇಲ್ಲದಂತಾಗುತ್ತದೆ {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,ಬಾಂಧವ್ಯ ನೋಡಿ
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},ಮಾತ್ರ ಕಂಪನಿ ಪ್ರತಿ 1 ಖಾತೆ ಇಲ್ಲದಂತಾಗುತ್ತದೆ {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,ಬಾಂಧವ್ಯ ನೋಡಿ
 DocType: Purchase Order,% Received,% ಸ್ವೀಕರಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪುಗಳು ರಚಿಸಿ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,ಈಗಾಗಲೇ ಸೆಟಪ್ ಪೂರ್ಣಗೊಳಿಸಲು!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,ಈಗಾಗಲೇ ಸೆಟಪ್ ಪೂರ್ಣಗೊಳಿಸಲು!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,ಕ್ರೆಡಿಟ್ ಗಮನಿಸಿ ಪ್ರಮಾಣ
 DocType: Setup Progress Action,Action Document,ಆಕ್ಷನ್ ಡಾಕ್ಯುಮೆಂಟ್
 ,Finished Goods,ಪೂರ್ಣಗೊಂಡ ಸರಕನ್ನು
 DocType: Delivery Note,Instructions,ಸೂಚನೆಗಳು
 DocType: Quality Inspection,Inspected By,ಪರಿಶೀಲನೆ
 DocType: Maintenance Visit,Maintenance Type,ನಿರ್ವಹಣೆ ಪ್ರಕಾರ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} ಕೋರ್ಸ್ ಸೇರಿಕೊಂಡಳು ಇದೆ {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗ್ರೂಪ್&gt; ಬ್ರ್ಯಾಂಡ್
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} ಕೋರ್ಸ್ ಸೇರಿಕೊಂಡಳು ಇದೆ {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಡೆಲಿವರಿ ಗಮನಿಸಿ ಸೇರುವುದಿಲ್ಲ {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext ಡೆಮೊ
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,ವಸ್ತುಗಳು ಸೇರಿಸಿ
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,ವಸ್ತುಗಳು ಸೇರಿಸಿ
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,ಐಟಂ ಗುಣಮಟ್ಟ ತಪಾಸಣೆ ನಿಯತಾಂಕಗಳನ್ನು
 DocType: Leave Application,Leave Approver Name,ಅನುಮೋದಕ ಹೆಸರು ಬಿಡಿ
 DocType: Depreciation Schedule,Schedule Date,ವೇಳಾಪಟ್ಟಿ ದಿನಾಂಕ
@@ -493,7 +504,7 @@
 DocType: Salary Slip Timesheet,Working Hours,ದುಡಿಮೆಯು
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಸರಣಿಯ ಆರಂಭಿಕ / ಪ್ರಸ್ತುತ ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ಬದಲಾಯಿಸಿ.
 DocType: Dosage Strength,Strength,ಬಲ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,ಹೊಸ ಗ್ರಾಹಕ ರಚಿಸಿ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,ಹೊಸ ಗ್ರಾಹಕ ರಚಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","ಅನೇಕ ಬೆಲೆ ನಿಯಮಗಳು ಮೇಲುಗೈ ಮುಂದುವರಿದರೆ, ಬಳಕೆದಾರರು ಸಂಘರ್ಷ ಪರಿಹರಿಸಲು ಕೈಯಾರೆ ಆದ್ಯತಾ ಸೆಟ್ ತಿಳಿಸಲಾಗುತ್ತದೆ."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,ಖರೀದಿ ಆದೇಶಗಳನ್ನು ರಚಿಸಿ
 ,Purchase Register,ಖರೀದಿ ನೋಂದಣಿ
@@ -512,7 +523,7 @@
 DocType: Lab Test Template,Single,ಏಕೈಕ
 DocType: Salary Slip,Total Loan Repayment,ಒಟ್ಟು ಸಾಲದ ಮರುಪಾವತಿಯ
 DocType: Account,Cost of Goods Sold,ಮಾರಿದ ವಸ್ತುಗಳ ಬೆಲೆ
-DocType: Purchase Invoice,Yearly,ವಾರ್ಷಿಕ
+DocType: Subscription,Yearly,ವಾರ್ಷಿಕ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,ಒಂದು ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ನಮೂದಿಸಿ
 DocType: Drug Prescription,Dosage,ಡೋಸೇಜ್
 DocType: Journal Entry Account,Sales Order,ಮಾರಾಟದ ಆರ್ಡರ್
@@ -543,7 +554,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,ಎಲ್ಲಾ ಉತ್ಪಾದನಾ ಪ್ರಕ್ರಿಯೆಗಳು ಜಾಗತಿಕ ಸೆಟ್ಟಿಂಗ್ಗಳು.
 DocType: Accounts Settings,Accounts Frozen Upto,ಘನೀಕೃತ ವರೆಗೆ ಖಾತೆಗಳು
 DocType: SMS Log,Sent On,ಕಳುಹಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,ಗುಣಲಕ್ಷಣ {0} ಗುಣಲಕ್ಷಣಗಳು ಟೇಬಲ್ ಅನೇಕ ಬಾರಿ ಆಯ್ಕೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,ಗುಣಲಕ್ಷಣ {0} ಗುಣಲಕ್ಷಣಗಳು ಟೇಬಲ್ ಅನೇಕ ಬಾರಿ ಆಯ್ಕೆ
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,ಅನ್ವಯಿಸುವುದಿಲ್ಲ
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,ಹಾಲಿಡೇ ಮಾಸ್ಟರ್ .
@@ -569,13 +580,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ಹಂಚಿಕೆ ಒಟ್ಟು ಎಲೆಗಳು ಕಡ್ಡಾಯ
 DocType: Patient,AB Positive,ಎಬಿ ಧನಾತ್ಮಕ
 DocType: Job Opening,Description of a Job Opening,ಒಂದು ಉದ್ಯೋಗಾವಕಾಶದ ವಿವರಣೆ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,ಇಂದು ಬಾಕಿ ಚಟುವಟಿಕೆಗಳನ್ನು
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,ಇಂದು ಬಾಕಿ ಚಟುವಟಿಕೆಗಳನ್ನು
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,ಹಾಜರಾತಿ .
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Timesheet ಆಧಾರಿತ ವೇತನದಾರರ ಸಂಬಳ ಕಾಂಪೊನೆಂಟ್.
 DocType: Sales Order Item,Used for Production Plan,ಉತ್ಪಾದನೆ ಯೋಜನೆ ಉಪಯೋಗಿಸಿದ
 DocType: Employee Loan,Total Payment,ಒಟ್ಟು ಪಾವತಿ
 DocType: Manufacturing Settings,Time Between Operations (in mins),(ನಿಮಿಷಗಳು) ಕಾರ್ಯಾಚರಣೆ ನಡುವೆ ಸಮಯ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} ಕ್ರಮ ಪೂರ್ಣಗೊಳಿಸಲಾಗಲಿಲ್ಲ ಆದ್ದರಿಂದ ರದ್ದುಗೊಂಡಿತು
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} ಕ್ರಮ ಪೂರ್ಣಗೊಳಿಸಲಾಗಲಿಲ್ಲ ಆದ್ದರಿಂದ ರದ್ದುಗೊಂಡಿತು
 DocType: Customer,Buyer of Goods and Services.,ಸರಕು ಮತ್ತು ಸೇವೆಗಳ ಖರೀದಿದಾರನ.
 DocType: Journal Entry,Accounts Payable,ಖಾತೆಗಳನ್ನು ಕೊಡಬೇಕಾದ
 DocType: Patient,Allergies,ಅಲರ್ಜಿಗಳು
@@ -587,23 +598,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,ಖರೀದಿ ಆದೇಶಗಳನ್ನು ಎಚ್ಚರಿಸಿ
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,ನಿಮ್ಮ ಗ್ರಾಹಕರ ಕೆಲವು ಪಟ್ಟಿ. ಅವರು ಸಂಸ್ಥೆಗಳು ಅಥವಾ ವ್ಯಕ್ತಿಗಳು ಆಗಿರಬಹುದು .
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,ಸಾಕಷ್ಟು ಭಾಗಗಳನ್ನು ನಿರ್ಮಿಸಲು
+DocType: POS Profile User,POS Profile User,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಬಳಕೆದಾರ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,ನೇರ ಆದಾಯ
 DocType: Patient Appointment,Date TIme,ದಿನಾಂಕ ಸಮಯ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","ಖಾತೆ ವರ್ಗೀಕರಿಸಲಾದ ವೇಳೆ , ಖಾತೆ ಆಧರಿಸಿ ಫಿಲ್ಟರ್ ಸಾಧ್ಯವಿಲ್ಲ"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,ಆಡಳಿತಾಧಿಕಾರಿ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,ದಯವಿಟ್ಟು ಕೋರ್ಸ್ ಆಯ್ಕೆ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,ದಯವಿಟ್ಟು ಕೋರ್ಸ್ ಆಯ್ಕೆ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,ದಯವಿಟ್ಟು ಕೋರ್ಸ್ ಆಯ್ಕೆ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,ದಯವಿಟ್ಟು ಕೋರ್ಸ್ ಆಯ್ಕೆ
 DocType: Codification Table,Codification Table,ಕೋಡಿಫಿಕೇಷನ್ ಟೇಬಲ್
 DocType: Timesheet Detail,Hrs,ಗಂಟೆಗಳ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ
 DocType: Stock Entry Detail,Difference Account,ವ್ಯತ್ಯಾಸ ಖಾತೆ
 DocType: Purchase Invoice,Supplier GSTIN,ಸರಬರಾಜುದಾರ GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,ಇದನ್ನು ಅವಲಂಬಿಸಿರುವ ಕೆಲಸವನ್ನು {0} ಮುಚ್ಚಿಲ್ಲ ಹತ್ತಿರಕ್ಕೆ ಕೆಲಸವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,ವೇರ್ಹೌಸ್ ವಸ್ತು ವಿನಂತಿಯನ್ನು ಏರಿಸಲಾಗುತ್ತದೆ ಇದಕ್ಕಾಗಿ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,ಇದನ್ನು ಅವಲಂಬಿಸಿರುವ ಕೆಲಸವನ್ನು {0} ಮುಚ್ಚಿಲ್ಲ ಹತ್ತಿರಕ್ಕೆ ಕೆಲಸವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,ವೇರ್ಹೌಸ್ ವಸ್ತು ವಿನಂತಿಯನ್ನು ಏರಿಸಲಾಗುತ್ತದೆ ಇದಕ್ಕಾಗಿ ನಮೂದಿಸಿ
 DocType: Production Order,Additional Operating Cost,ಹೆಚ್ಚುವರಿ ವೆಚ್ಚವನ್ನು
 DocType: Lab Test Template,Lab Routine,ಲ್ಯಾಬ್ ನಿಯತಕ್ರಮ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,ಕಾಸ್ಮೆಟಿಕ್ಸ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","ವಿಲೀನಗೊಳ್ಳಲು , ನಂತರ ಲಕ್ಷಣಗಳು ಐಟಂಗಳನ್ನು ಸಾಮಾನ್ಯ ಇರಬೇಕು"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","ವಿಲೀನಗೊಳ್ಳಲು , ನಂತರ ಲಕ್ಷಣಗಳು ಐಟಂಗಳನ್ನು ಸಾಮಾನ್ಯ ಇರಬೇಕು"
 DocType: Shipping Rule,Net Weight,ನೆಟ್ ತೂಕ
 DocType: Employee,Emergency Phone,ತುರ್ತು ದೂರವಾಣಿ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,ಖರೀದಿ
@@ -614,7 +626,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,ದಯವಿಟ್ಟು ಥ್ರೆಶ್ಹೋಲ್ಡ್ 0% ಗ್ರೇಡ್ ವ್ಯಾಖ್ಯಾನಿಸಲು
 DocType: Sales Order,To Deliver,ತಲುಪಿಸಲು
 DocType: Purchase Invoice Item,Item,ವಸ್ತು
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,ಸೀರಿಯಲ್ ಯಾವುದೇ ಐಟಂ ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,ಹೆಚ್ಚಿನ ಸೂಕ್ಷ್ಮತೆ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,ಸೀರಿಯಲ್ ಯಾವುದೇ ಐಟಂ ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Journal Entry,Difference (Dr - Cr),ವ್ಯತ್ಯಾಸ ( ಡಾ - ಸಿಆರ್)
 DocType: Account,Profit and Loss,ಲಾಭ ಮತ್ತು ನಷ್ಟ
 DocType: Patient,Risk Factors,ರಿಸ್ಕ್ ಫ್ಯಾಕ್ಟರ್ಸ್
@@ -623,7 +636,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,ವ್ಯವಸ್ಥಾಪಕ ಉಪಗುತ್ತಿಗೆ
 DocType: Vital Signs,Body Temperature,ದೇಹ ತಾಪಮಾನ
 DocType: Project,Project will be accessible on the website to these users,ಪ್ರಾಜೆಕ್ಟ್ ಈ ಬಳಕೆದಾರರಿಗೆ ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ಪ್ರವೇಶಿಸಬಹುದಾಗಿದೆ
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,ಪ್ರಾಜೆಕ್ಟ್ ಪ್ರಕಾರವನ್ನು ವಿವರಿಸಿ.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,ಪ್ರಾಜೆಕ್ಟ್ ಪ್ರಕಾರವನ್ನು ವಿವರಿಸಿ.
 DocType: Supplier Scorecard,Weighting Function,ತೂಕದ ಕಾರ್ಯ
 DocType: Physician,OP Consulting Charge,ಓಪನ್ ಕನ್ಸಲ್ಟಿಂಗ್ ಚಾರ್ಜ್
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,ನಿಮ್ಮ ಹೊಂದಿಸಿ
@@ -637,7 +650,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,ಹೆಚ್ಚಳವನ್ನು 0 ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Production Planning Tool,Material Requirement,ಮೆಟೀರಿಯಲ್ ಅವಶ್ಯಕತೆ
 DocType: Company,Delete Company Transactions,ಕಂಪನಿ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಅಳಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,ರೆಫರೆನ್ಸ್ ಯಾವುದೇ ಮತ್ತು ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ಬ್ಯಾಂಕ್ ವ್ಯವಹಾರ ಕಡ್ಡಾಯವಾಗಿದೆ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,ರೆಫರೆನ್ಸ್ ಯಾವುದೇ ಮತ್ತು ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ಬ್ಯಾಂಕ್ ವ್ಯವಹಾರ ಕಡ್ಡಾಯವಾಗಿದೆ
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,ಸೇರಿಸಿ / ಸಂಪಾದಿಸಿ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 DocType: Payment Entry Reference,Supplier Invoice No,ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ನಂ
 DocType: Territory,For reference,ಪರಾಮರ್ಶೆಗಾಗಿ
@@ -645,12 +658,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","ಅಳಿಸಿಹಾಕಲಾಗದು ಸೀರಿಯಲ್ ಯಾವುದೇ {0}, ಇದು ಸ್ಟಾಕ್ ವ್ಯವಹಾರಗಳಲ್ಲಿ ಬಳಸಲಾಗುತ್ತದೆ"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),ಮುಚ್ಚುವ (ಸಿಆರ್)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,ಹಲೋ
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,ಐಟಂ ಸರಿಸಿ
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,ಐಟಂ ಸರಿಸಿ
 DocType: Serial No,Warranty Period (Days),ಖಾತರಿ ಕಾಲ (ದಿನಗಳು)
 DocType: Installation Note Item,Installation Note Item,ಅನುಸ್ಥಾಪನೆ ಸೂಚನೆ ಐಟಂ
 DocType: Production Plan Item,Pending Qty,ಬಾಕಿ ಪ್ರಮಾಣ
 DocType: Budget,Ignore,ಕಡೆಗಣಿಸು
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} ಸಕ್ರಿಯವಾಗಿಲ್ಲ
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} ಸಕ್ರಿಯವಾಗಿಲ್ಲ
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,ಮುದ್ರಣ ಸೆಟಪ್ ಚೆಕ್ ಆಯಾಮಗಳು
 DocType: Salary Slip,Salary Slip Timesheet,ಸಂಬಳ ಸ್ಲಿಪ್ Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ಉಪ ಒಪ್ಪಂದ ಖರೀದಿ ರಸೀತಿ ಕಡ್ಡಾಯ ಸರಬರಾಜುದಾರ ವೇರ್ಹೌಸ್
@@ -659,7 +672,7 @@
 DocType: Pricing Rule,Sales Partner,ಮಾರಾಟದ ಸಂಗಾತಿ
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,ಎಲ್ಲಾ ಪೂರೈಕೆದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ಗಳು.
 DocType: Buying Settings,Purchase Receipt Required,ಅಗತ್ಯ ಖರೀದಿ ರಸೀತಿ
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,ತೆರೆಯುವ ಸ್ಟಾಕ್ ಪ್ರವೇಶಿಸಿತು ಮೌಲ್ಯಾಂಕನ ದರ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,ತೆರೆಯುವ ಸ್ಟಾಕ್ ಪ್ರವೇಶಿಸಿತು ಮೌಲ್ಯಾಂಕನ ದರ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,ಸರಕುಪಟ್ಟಿ ಕೋಷ್ಟಕದಲ್ಲಿ ಯಾವುದೇ ದಾಖಲೆಗಳು
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,ಮೊದಲ ಕಂಪನಿ ಮತ್ತು ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,ಹಣಕಾಸು / ಲೆಕ್ಕಪರಿಶೋಧಕ ವರ್ಷ .
@@ -696,7 +709,7 @@
 DocType: Quotation,Quotation To,ಉದ್ಧರಣಾ
 DocType: Lead,Middle Income,ಮಧ್ಯಮ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),ತೆರೆಯುತ್ತಿದೆ ( ಸಿಆರ್)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ನೀವು ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಕೆಲವು ವ್ಯವಹಾರ (ರು) ಮಾಡಿರುವ ಕಾರಣ ಐಟಂ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ {0} ನೇರವಾಗಿ ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ. ನೀವು ಬೇರೆ ಡೀಫಾಲ್ಟ್ ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಬಳಸಲು ಹೊಸ ಐಟಂ ರಚಿಸಬೇಕಾಗಿದೆ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ನೀವು ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಕೆಲವು ವ್ಯವಹಾರ (ರು) ಮಾಡಿರುವ ಕಾರಣ ಐಟಂ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ {0} ನೇರವಾಗಿ ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ. ನೀವು ಬೇರೆ ಡೀಫಾಲ್ಟ್ ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಬಳಸಲು ಹೊಸ ಐಟಂ ರಚಿಸಬೇಕಾಗಿದೆ.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,ದಯವಿಟ್ಟು ಕಂಪನಿ ಸೆಟ್
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,ದಯವಿಟ್ಟು ಕಂಪನಿ ಸೆಟ್
@@ -711,6 +724,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,ಬ್ಯಾಂಕ್ ಎಂಟ್ರಿ ಮಾಡಲು ಆಯ್ಕೆ ಪಾವತಿ ಖಾತೆ
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","ಎಲೆಗಳು, ಖರ್ಚು ಹಕ್ಕು ಮತ್ತು ವೇತನದಾರರ ನಿರ್ವಹಿಸಲು ನೌಕರರ ದಾಖಲೆಗಳು ರಚಿಸಿ"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,ಪ್ರಿಸ್ಕ್ರಿಪ್ಷನ್ ಅವಧಿಯು
+DocType: Restaurant Reservation,Restaurant Reservation,ರೆಸ್ಟೋರೆಂಟ್ ಮೀಸಲಾತಿ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,ಪ್ರೊಪೋಸಲ್ ಬರವಣಿಗೆ
 DocType: Payment Entry Deduction,Payment Entry Deduction,ಪಾವತಿ ಎಂಟ್ರಿ ಡಿಡಕ್ಷನ್
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,ಮತ್ತೊಂದು ಮಾರಾಟಗಾರನ {0} ಅದೇ ನೌಕರರ ಐಡಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
@@ -718,7 +732,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,ಮಾಸ್ಟರ್ಸ್
 DocType: Assessment Plan,Maximum Assessment Score,ಗರಿಷ್ಠ ಅಸೆಸ್ಮೆಂಟ್ ಸ್ಕೋರ್
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,ಅಪ್ಡೇಟ್ ಬ್ಯಾಂಕ್ ವ್ಯವಹಾರ ದಿನಾಂಕ
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,ಟೈಮ್ ಟ್ರಾಕಿಂಗ್
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,ಟೈಮ್ ಟ್ರಾಕಿಂಗ್
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,ಟ್ರಾನ್ಸ್ಪೋರ್ಟರ್ DUPLICATE
 DocType: Fiscal Year Company,Fiscal Year Company,ಹಣಕಾಸಿನ ವರ್ಷ ಕಂಪನಿ
 DocType: Packing Slip Item,DN Detail,ಡಿ ವಿವರ
@@ -727,8 +741,9 @@
 DocType: Batch,Batch Description,ಬ್ಯಾಚ್ ವಿವರಣೆ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪುಗಳ ರಚಿಸಲಾಗುತ್ತಿದೆ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪುಗಳ ರಚಿಸಲಾಗುತ್ತಿದೆ
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.",ಪೇಮೆಂಟ್ ಗೇಟ್ ವೇ ಖಾತೆಯನ್ನು ಕೈಯಾರೆ ಒಂದು ರಚಿಸಿ.
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.",ಪೇಮೆಂಟ್ ಗೇಟ್ ವೇ ಖಾತೆಯನ್ನು ಕೈಯಾರೆ ಒಂದು ರಚಿಸಿ.
 DocType: Supplier Scorecard,Per Year,ವರ್ಷಕ್ಕೆ
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,DOB ಪ್ರಕಾರ ಈ ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ಪ್ರವೇಶ ಪಡೆಯಲು ಅರ್ಹವಾಗಿಲ್ಲ
 DocType: Sales Invoice,Sales Taxes and Charges,ಮಾರಾಟ ತೆರಿಗೆ ಮತ್ತು ಶುಲ್ಕಗಳು
 DocType: Employee,Organization Profile,ಸಂಸ್ಥೆ ಪ್ರೊಫೈಲ್ಗಳು
 DocType: Vital Signs,Height (In Meter),ಎತ್ತರ (ಮೀಟರ್)
@@ -764,7 +779,7 @@
 DocType: Student Batch Name,Batch Name,ಬ್ಯಾಚ್ ಹೆಸರು
 DocType: Fee Validity,Max number of visit,ಗರಿಷ್ಠ ಸಂಖ್ಯೆಯ ಭೇಟಿ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet ದಾಖಲಿಸಿದವರು:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},ಪಾವತಿಯ ಮಾದರಿಯು ಡೀಫಾಲ್ಟ್ ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಸೆಟ್ ದಯವಿಟ್ಟು {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},ಪಾವತಿಯ ಮಾದರಿಯು ಡೀಫಾಲ್ಟ್ ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಸೆಟ್ ದಯವಿಟ್ಟು {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,ದಾಖಲಾಗಿ
 DocType: GST Settings,GST Settings,ಜಿಎಸ್ಟಿ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Selling Settings,Customer Naming By,ಗ್ರಾಹಕ ಹೆಸರಿಸುವ ಮೂಲಕ
@@ -796,16 +811,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ಇಳಿಯಿತು ವೆಚ್ಚ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 DocType: Production Order Operation,Actual Start Time,ನಿಜವಾದ ಟೈಮ್
 DocType: BOM Operation,Operation Time,ಆಪರೇಷನ್ ಟೈಮ್
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,ಮುಕ್ತಾಯ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,ಮುಕ್ತಾಯ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,ಬೇಸ್
 DocType: Timesheet,Total Billed Hours,ಒಟ್ಟು ಖ್ಯಾತವಾದ ಅವರ್ಸ್
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,ಪ್ರಮಾಣ ಆಫ್ ಬರೆಯಿರಿ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,ಪ್ರಮಾಣ ಆಫ್ ಬರೆಯಿರಿ
 DocType: Leave Block List Allow,Allow User,ಬಳಕೆದಾರ ಅನುಮತಿಸಿ
 DocType: Journal Entry,Bill No,ಬಿಲ್ ನಂ
 DocType: Company,Gain/Loss Account on Asset Disposal,ಆಸ್ತಿ ವಿಲೇವಾರಿ ಮೇಲೆ ಗಳಿಕೆ / ನಷ್ಟ ಖಾತೆ
 DocType: Vehicle Log,Service Details,ಸೇವೆಯ ವಿವರಗಳು
 DocType: Vehicle Log,Service Details,ಸೇವೆಯ ವಿವರಗಳು
-DocType: Purchase Invoice,Quarterly,ತ್ರೈಮಾಸಿಕ
+DocType: Subscription,Quarterly,ತ್ರೈಮಾಸಿಕ
 DocType: Lab Test Template,Grouped,ಗುಂಪು ಮಾಡಲಾಗಿದೆ
 DocType: Selling Settings,Delivery Note Required,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಅಗತ್ಯ
 DocType: Bank Guarantee,Bank Guarantee Number,ಬ್ಯಾಂಕ್ ಗ್ಯಾರಂಟಿ ಸಂಖ್ಯೆ
@@ -815,12 +830,12 @@
 DocType: Student Attendance,Student Attendance,ವಿದ್ಯಾರ್ಥಿ ಅಟೆಂಡೆನ್ಸ್
 DocType: Sales Invoice Timesheet,Time Sheet,ವೇಳಾಚೀಟಿ
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush ಕಚ್ಚಾ ವಸ್ತುಗಳ ಆಧರಿಸಿದ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,ಐಟಂ ವಿವರಗಳು ನಮೂದಿಸಿ
 DocType: Interest,Interest,ಆಸಕ್ತಿ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,ಪೂರ್ವ ಮಾರಾಟದ
 DocType: Purchase Receipt,Other Details,ಇತರೆ ವಿವರಗಳು
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,ಪರೀಕ್ಷಾ ಟೆಂಪ್ಲೇಟ್
+DocType: Restaurant Order Entry Item,Served,ಸೇವೆ
 DocType: Account,Accounts,ಅಕೌಂಟ್ಸ್
 DocType: Vehicle,Odometer Value (Last),ದೂರಮಾಪಕ ಮೌಲ್ಯ (ಕೊನೆಯ)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,ಪೂರೈಕೆದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ಮಾನದಂಡದ ಟೆಂಪ್ಲೇಟ್ಗಳು.
@@ -832,26 +847,28 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,ಮುನ್ನೋಟ ಸಂಬಳ ಸ್ಲಿಪ್
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,ಖಾತೆ {0} ಅನೇಕ ಬಾರಿ ನಮೂದಿಸಲಾದ
 DocType: Account,Expenses Included In Valuation,ವೆಚ್ಚಗಳು ಮೌಲ್ಯಾಂಕನ ಸೇರಿಸಲಾಗಿದೆ
-DocType: Hub Settings,Seller City,ಮಾರಾಟಗಾರ ಸಿಟಿ
 ,Absent Student Report,ಆಬ್ಸೆಂಟ್ ವಿದ್ಯಾರ್ಥಿ ವರದಿ
 DocType: Email Digest,Next email will be sent on:,ಮುಂದೆ ಇಮೇಲ್ ಮೇಲೆ ಕಳುಹಿಸಲಾಗುವುದು :
 DocType: Offer Letter Term,Offer Letter Term,ಪತ್ರ ಟರ್ಮ್ ಆಫರ್
 DocType: Supplier Scorecard,Per Week,ವಾರಕ್ಕೆ
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,ಐಟಂ ವೇರಿಯಂಟ್.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,ಐಟಂ ವೇರಿಯಂಟ್.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,ಒಟ್ಟು ವಿದ್ಯಾರ್ಥಿ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,ಐಟಂ {0} ಕಂಡುಬಂದಿಲ್ಲ
 DocType: Bin,Stock Value,ಸ್ಟಾಕ್ ಮೌಲ್ಯ
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಶುಲ್ಕ ದಾಖಲೆಗಳನ್ನು ರಚಿಸಲಾಗುತ್ತದೆ. ಯಾವುದೇ ದೋಷದ ಸಂದರ್ಭದಲ್ಲಿ ದೋಷ ಸಂದೇಶವನ್ನು ವೇಳಾಪಟ್ಟಿನಲ್ಲಿ ನವೀಕರಿಸಲಾಗುತ್ತದೆ.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,ಕಂಪನಿ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} {1} ವರೆಗೆ ಶುಲ್ಕ ಮಾನ್ಯತೆ ಇರುತ್ತದೆ
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} {1} ವರೆಗೆ ಶುಲ್ಕ ಮಾನ್ಯತೆ ಇರುತ್ತದೆ
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,ಟ್ರೀ ಕೌಟುಂಬಿಕತೆ
 DocType: BOM Explosion Item,Qty Consumed Per Unit,ಪ್ರಮಾಣ ಘಟಕ ಬಳಸುತ್ತಿರುವ
 DocType: Serial No,Warranty Expiry Date,ಖಾತರಿ ಅಂತ್ಯ ದಿನಾಂಕ
 DocType: Material Request Item,Quantity and Warehouse,ಪ್ರಮಾಣ ಮತ್ತು ವೇರ್ಹೌಸ್
+DocType: Hub Settings,Unregister,ನೋಂದಣಿ ರದ್ದುಮಾಡಿ
 DocType: Sales Invoice,Commission Rate (%),ಕಮಿಷನ್ ದರ ( % )
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,ದಯವಿಟ್ಟು ಆಯ್ಕೆ ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,ದಯವಿಟ್ಟು ಆಯ್ಕೆ ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,ದಯವಿಟ್ಟು ಆಯ್ಕೆ ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,ದಯವಿಟ್ಟು ಆಯ್ಕೆ ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ
 DocType: Project,Estimated Cost,ಅಂದಾಜು ವೆಚ್ಚ
 DocType: Purchase Order,Link to material requests,ವಸ್ತು ವಿನಂತಿಗಳನ್ನು ಲಿಂಕ್
+DocType: Hub Settings,Publish,ಪ್ರಕಟಿಸು
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,ಏರೋಸ್ಪೇಸ್
 DocType: Journal Entry,Credit Card Entry,ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,ಕಂಪನಿ ಮತ್ತು ಖಾತೆಗಳು
@@ -862,13 +879,12 @@
 DocType: Selling Settings,Close Opportunity After Days,ದಿನಗಳ ಅವಕಾಶ ಮುಚ್ಚಿ
 ,Reserved,ಮೀಸಲಿಟ್ಟ
 DocType: Purchase Order,Supply Raw Materials,ಪೂರೈಕೆ ರಾ ಮೆಟೀರಿಯಲ್ಸ್
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,ಮುಂದಿನ ಸರಕುಪಟ್ಟಿ ಉತ್ಪಾದಿಸಬಹುದಾಗಿದೆ ಯಾವ ದಿನಾಂಕ. ಒಪ್ಪಿಸಬಹುದು ಮೇಲೆ ಉತ್ಪಾದಿಸಲಾಗುತ್ತದೆ.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,ಪ್ರಸಕ್ತ ಆಸ್ತಿಪಾಸ್ತಿಗಳು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',&#39;ತರಬೇತಿ ಪ್ರತಿಕ್ರಿಯೆ&#39; ಕ್ಲಿಕ್ ಮಾಡಿ ಮತ್ತು ನಂತರ &#39;ಹೊಸ&#39;
 DocType: Mode of Payment Account,Default Account,ಡೀಫಾಲ್ಟ್ ಖಾತೆ
 DocType: Payment Entry,Received Amount (Company Currency),ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,ಅವಕಾಶ ಪ್ರಮುಖ ತಯಾರಿಸಲಾಗುತ್ತದೆ ವೇಳೆ ಲೀಡ್ ಸೆಟ್ ಮಾಡಬೇಕು
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,ಅವಕಾಶ ಪ್ರಮುಖ ತಯಾರಿಸಲಾಗುತ್ತದೆ ವೇಳೆ ಲೀಡ್ ಸೆಟ್ ಮಾಡಬೇಕು
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,ಸಾಪ್ತಾಹಿಕ ದಿನ ಆಫ್ ಆಯ್ಕೆಮಾಡಿ
 DocType: Patient,O Negative,ಒ ಋಣಾತ್ಮಕ
 DocType: Production Order Operation,Planned End Time,ಯೋಜಿತ ಎಂಡ್ ಟೈಮ್
@@ -884,10 +900,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,ಶಕ್ತಿ
 DocType: Opportunity,Opportunity From,ಅವಕಾಶದಿಂದ
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,ಮಾಸಿಕ ವೇತನವನ್ನು ಹೇಳಿಕೆ .
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,ಕಂಪನಿ ಸೇರಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ಸಾಲು {0}: {1} ಐಟಂಗೆ ಸೀರಿಯಲ್ ಸಂಖ್ಯೆಗಳು ಅಗತ್ಯವಿದೆ {2}. ನೀವು {3} ಒದಗಿಸಿದ್ದೀರಿ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ಸಾಲು {0}: {1} ಐಟಂಗೆ ಸೀರಿಯಲ್ ಸಂಖ್ಯೆಗಳು ಅಗತ್ಯವಿದೆ {2}. ನೀವು {3} ಒದಗಿಸಿದ್ದೀರಿ.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,ದಯವಿಟ್ಟು ಟೇಬಲ್ ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
 DocType: BOM,Website Specifications,ವೆಬ್ಸೈಟ್ ವಿಶೇಷಣಗಳು
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} &#39;ಸ್ವೀಕರಿಸುವವರಲ್ಲಿ&#39; ಅಮಾನ್ಯ ಇಮೇಲ್ ವಿಳಾಸವಾಗಿದೆ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} &#39;ಸ್ವೀಕರಿಸುವವರಲ್ಲಿ&#39; ಅಮಾನ್ಯ ಇಮೇಲ್ ವಿಳಾಸವಾಗಿದೆ
 DocType: Special Test Items,Particulars,ವಿವರಗಳು
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,ಪ್ರತಿಜೀವಕ.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: ಗೆ {0} ರೀತಿಯ {1}
@@ -895,11 +911,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,ರೋ {0}: ಪರಿವರ್ತಿಸುವುದರ ಕಡ್ಡಾಯ
 DocType: Employee,A+,ಎ +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",ಬಹು ಬೆಲೆ ನಿಯಮಗಳು ಒಂದೇ ಮಾನದಂಡವನ್ನು ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಪ್ರಾಶಸ್ತ್ಯವನ್ನು ನಿಗದಿಪಡಿಸಬೇಕು ಸಂಘರ್ಷ ಪರಿಹರಿಸಲು ಮಾಡಿ. ಬೆಲೆ ನಿಯಮಗಳು: {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಅಥವಾ ಇತರ BOMs ಸಂಬಂಧ ಇದೆ ಎಂದು ಬಿಒಎಮ್ ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಅಥವಾ ಇತರ BOMs ಸಂಬಂಧ ಇದೆ ಎಂದು ಬಿಒಎಮ್ ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Opportunity,Maintenance,ಸಂರಕ್ಷಣೆ
 DocType: Item Attribute Value,Item Attribute Value,ಐಟಂ ಮೌಲ್ಯ ಲಕ್ಷಣ
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,ಮಾರಾಟದ ಶಿಬಿರಗಳನ್ನು .
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Timesheet ಮಾಡಿ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Timesheet ಮಾಡಿ
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -956,12 +972,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,ಮೊದಲ ಐಟಂ ನಮೂದಿಸಿ
 DocType: Account,Liability,ಹೊಣೆಗಾರಿಕೆ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ಮಂಜೂರು ಪ್ರಮಾಣ ರೋನಲ್ಲಿ ಹಕ್ಕು ಪ್ರಮಾಣವನ್ನು ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {0}.
+DocType: Salary Detail,Do not include in total,ಒಟ್ಟಾರೆಯಾಗಿ ಸೇರಿಸಬೇಡಿ
 DocType: Company,Default Cost of Goods Sold Account,ಸರಕುಗಳು ಮಾರಾಟ ಖಾತೆ ಡೀಫಾಲ್ಟ್ ವೆಚ್ಚ
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,ಬೆಲೆ ಪಟ್ಟಿಯನ್ನು ಅಲ್ಲ
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,ಬೆಲೆ ಪಟ್ಟಿಯನ್ನು ಅಲ್ಲ
 DocType: Employee,Family Background,ಕೌಟುಂಬಿಕ ಹಿನ್ನೆಲೆ
 DocType: Request for Quotation Supplier,Send Email,ಇಮೇಲ್ ಕಳುಹಿಸಿ
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},ಎಚ್ಚರಿಕೆ: ಅಮಾನ್ಯ ಲಗತ್ತು {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,ಯಾವುದೇ ಅನುಮತಿ
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},ಎಚ್ಚರಿಕೆ: ಅಮಾನ್ಯ ಲಗತ್ತು {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,ಯಾವುದೇ ಅನುಮತಿ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,ಉಲ್ಲೇಖ ವಿನಂತಿಸಲಾಗಿದೆ
 DocType: Vital Signs,Heart Rate / Pulse,ಹಾರ್ಟ್ ರೇಟ್ / ಪಲ್ಸ್
 DocType: Company,Default Bank Account,ಡೀಫಾಲ್ಟ್ ಬ್ಯಾಂಕ್ ಖಾತೆ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",ಪಕ್ಷದ ಆಧಾರದ ಮೇಲೆ ಫಿಲ್ಟರ್ ಆರಿಸಿ ಪಕ್ಷದ ಮೊದಲ ನೀಡಿರಿ
@@ -989,12 +1007,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ಐಟಂ ರೋ {IDX}: {DOCTYPE} {DOCNAME} ಮೇಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ &#39;{DOCTYPE}&#39; ಟೇಬಲ್
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} ಈಗಾಗಲೇ ಪೂರ್ಣಗೊಂಡ ಅಥವಾ ರದ್ದು
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ಯಾವುದೇ ಕಾರ್ಯಗಳು
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ಸ್ವಯಂ ಸರಕುಪಟ್ಟಿ 05, 28 ಇತ್ಯಾದಿ ಉದಾ ರಚಿಸಲಾಗಿದೆ ಮೇಲೆ ತಿಂಗಳ ದಿನ"
 DocType: Item Variant Settings,Copy Fields to Variant,ವಿಭಿನ್ನ ಕ್ಷೇತ್ರಗಳಿಗೆ ಕ್ಷೇತ್ರಗಳನ್ನು ನಕಲಿಸಿ
 DocType: Asset,Opening Accumulated Depreciation,ಕ್ರೋಢಿಕೃತ ಸವಕಳಿ ತೆರೆಯುವ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ಸ್ಕೋರ್ ಕಡಿಮೆ ಅಥವಾ 5 ಸಮಾನವಾಗಿರಬೇಕು
 DocType: Program Enrollment Tool,Program Enrollment Tool,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ನೋಂದಣಿ ಟೂಲ್
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,ಸಿ ಆಕಾರ ರೆಕಾರ್ಡ್ಸ್
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,ಸಿ ಆಕಾರ ರೆಕಾರ್ಡ್ಸ್
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,ಗ್ರಾಹಕ ಮತ್ತು ಸರಬರಾಜುದಾರ
 DocType: Email Digest,Email Digest Settings,ಡೈಜೆಸ್ಟ್ ಇಮೇಲ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,ನಿಮ್ಮ ವ್ಯಾಪಾರ ಧನ್ಯವಾದಗಳು!
@@ -1012,13 +1029,13 @@
 DocType: Request for Quotation Supplier,Quote Status,ಉದ್ಧರಣ ಸ್ಥಿತಿ
 DocType: Maintenance Visit,Completion Status,ಪೂರ್ಣಗೊಂಡ ಸ್ಥಿತಿ
 DocType: HR Settings,Enter retirement age in years,ವರ್ಷಗಳಲ್ಲಿ ನಿವೃತ್ತಿ ವಯಸ್ಸು ನಮೂದಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,ದಯವಿಟ್ಟು ಗೋದಾಮಿನ ಆಯ್ಕೆ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,ದಯವಿಟ್ಟು ಗೋದಾಮಿನ ಆಯ್ಕೆ
 DocType: Cheque Print Template,Starting location from left edge,ಎಡ ತುದಿಯಲ್ಲಿ ಸ್ಥಳ ಆರಂಭಗೊಂಡು
 DocType: Item,Allow over delivery or receipt upto this percent,ಈ ಶೇಕಡಾ ವರೆಗೆ ವಿತರಣೆ ಅಥವಾ ರಶೀದಿ ಮೇಲೆ ಅವಕಾಶ
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,ಆಮದು ಅಟೆಂಡೆನ್ಸ್
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,ಎಲ್ಲಾ ಐಟಂ ಗುಂಪುಗಳು
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,ಎಲ್ಲಾ ಐಟಂ ಗುಂಪುಗಳು
 DocType: Process Payroll,Activity Log,ಚಟುವಟಿಕೆ ಲಾಗ್
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,ನಿವ್ವಳ ಲಾಭ / ನಷ್ಟ
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,ಸ್ವಯಂಚಾಲಿತವಾಗಿ ವ್ಯವಹಾರಗಳ ಸಲ್ಲಿಕೆಯಲ್ಲಿ ಸಂದೇಶವನ್ನು ರಚಿಸಿದರು .
@@ -1030,7 +1047,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,ಪ್ರಮಾಣ ಯೋಜಿತ
 DocType: Sales Invoice,Payment Due Date,ಪಾವತಿ ಕಾರಣ ದಿನಾಂಕ
 DocType: Drug Prescription,Interval UOM,ಮಧ್ಯಂತರ UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಈಗಾಗಲೇ ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಈಗಾಗಲೇ ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
+DocType: Item,Hub Publishing Details,ಹಬ್ ಪಬ್ಲಿಷಿಂಗ್ ವಿವರಗಳು
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',ಉದ್ಘಾಟಿಸುತ್ತಿರುವುದು
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ಮಾಡಬೇಕಾದುದು ಓಪನ್
 DocType: Notification Control,Delivery Note Message,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಸಂದೇಶ
@@ -1050,10 +1068,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: ಕಚ್ಚಾ ವಸ್ತುಗಳ ಮುಖ್ಯ ವಸ್ತುವಾಗಿ ಒಂದೇ ಆಗಿರಬಾರದು
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ಖರೀದಿ ರಸೀತಿ ವಸ್ತುಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಒಟ್ಟು ಅನ್ವಯಿಸುವ ತೆರಿಗೆ ಒಟ್ಟು ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಅದೇ ಇರಬೇಕು
 DocType: Sales Team,Incentives,ಪ್ರೋತ್ಸಾಹ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,ಹಬ್ಗಾಗಿ ನೋಂದಾಯಿಸಿ
 DocType: SMS Log,Requested Numbers,ಕೋರಿಕೆ ಸಂಖ್ಯೆಗಳು
 DocType: Production Planning Tool,Only Obtain Raw Materials,ಕಚ್ಚಾ ವಸ್ತುಗಳನ್ನು ಮಾತ್ರ ಪಡೆದುಕೊಳ್ಳಿ
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,ಸಾಧನೆಯ ಮೌಲ್ಯ ನಿರ್ಣಯ .
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","ಸಕ್ರಿಯಗೊಳಿಸುವುದರಿಂದ ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಶಕ್ತಗೊಳ್ಳುತ್ತದೆ, &#39;ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಬಳಸಿ&#39; ಮತ್ತು ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಕಡೇಪಕ್ಷ ಒಂದು ತೆರಿಗೆ ನಿಯಮ ಇರಬೇಕು"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","ಸಕ್ರಿಯಗೊಳಿಸುವುದರಿಂದ ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಶಕ್ತಗೊಳ್ಳುತ್ತದೆ, &#39;ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಬಳಸಿ&#39; ಮತ್ತು ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಕಡೇಪಕ್ಷ ಒಂದು ತೆರಿಗೆ ನಿಯಮ ಇರಬೇಕು"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ಪಾವತಿ ಎಂಟ್ರಿ {0} ಆರ್ಡರ್ {1}, ಈ ಸರಕುಪಟ್ಟಿ ಮುಂಚಿತವಾಗಿ ಮಾಹಿತಿ ನಿಲ್ಲಿಸಲು ಏನನ್ನು ಪರೀಕ್ಷಿಸಲು ವಿರುದ್ಧ ಲಿಂಕ್ ಇದೆ."
 DocType: Sales Invoice Item,Stock Details,ಸ್ಟಾಕ್ ವಿವರಗಳು
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,ಪ್ರಾಜೆಕ್ಟ್ ಮೌಲ್ಯ
@@ -1072,12 +1091,14 @@
 DocType: Salary Slip,Working Days,ಕೆಲಸ ದಿನಗಳ
 DocType: Serial No,Incoming Rate,ಒಳಬರುವ ದರ
 DocType: Packing Slip,Gross Weight,ಒಟ್ಟು ತೂಕ
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,ನೀವು ಈ ಗಣಕವನ್ನು ಹೊಂದಿಸುವ ಇದು ನಿಮ್ಮ ಕಂಪನಿ ಹೆಸರು .
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,ಹಬ್ ಸಕ್ರಿಯಗೊಳಿಸಿ
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,ನೀವು ಈ ಗಣಕವನ್ನು ಹೊಂದಿಸುವ ಇದು ನಿಮ್ಮ ಕಂಪನಿ ಹೆಸರು .
 DocType: HR Settings,Include holidays in Total no. of Working Days,ಒಟ್ಟು ರಜಾದಿನಗಳು ಸೇರಿಸಿ ಕೆಲಸ ದಿನಗಳ ಯಾವುದೇ
 DocType: Job Applicant,Hold,ಹಿಡಿ
 DocType: Employee,Date of Joining,ಸೇರುವ ದಿನಾಂಕ
 DocType: Naming Series,Update Series,ಅಪ್ಡೇಟ್ ಸರಣಿ
 DocType: Supplier Quotation,Is Subcontracted,subcontracted ಇದೆ
+DocType: Restaurant Table,Minimum Seating,ಕನಿಷ್ಠ ಆಸನ
 DocType: Item Attribute,Item Attribute Values,ಐಟಂ ಲಕ್ಷಣ ಮೌಲ್ಯಗಳು
 DocType: Examination Result,Examination Result,ಪರೀಕ್ಷೆ ಫಲಿತಾಂಶ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,ಖರೀದಿ ರಸೀತಿ
@@ -1088,13 +1109,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},ಆಪರೇಷನ್ ಮುಂದಿನ {0} ದಿನಗಳಲ್ಲಿ ಟೈಮ್ ಸ್ಲಾಟ್ ಕಾಣಬರಲಿಲ್ಲ {1}
 DocType: Production Order,Plan material for sub-assemblies,ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಯೋಜನೆ ವಸ್ತು
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,ಮಾರಾಟದ ಪಾರ್ಟ್ನರ್ಸ್ ಮತ್ತು ಸಂಸ್ಥಾನದ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,ಬಿಒಎಮ್ {0} ಸಕ್ರಿಯ ಇರಬೇಕು
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,ಬಿಒಎಮ್ {0} ಸಕ್ರಿಯ ಇರಬೇಕು
 DocType: Journal Entry,Depreciation Entry,ಸವಕಳಿ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,ಮೊದಲ ದಾಖಲೆ ಪ್ರಕಾರ ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ಈ ನಿರ್ವಹಣೆ ಭೇಟಿ ರದ್ದು ಮೊದಲು ವಸ್ತು ಭೇಟಿ {0} ರದ್ದು
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಐಟಂ ಸೇರುವುದಿಲ್ಲ {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,ಅಗತ್ಯವಿದೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಗೋದಾಮುಗಳು ಲೆಡ್ಜರ್ ಪರಿವರ್ತಿಸಬಹುದು ಸಾಧ್ಯವಿಲ್ಲ.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಗೋದಾಮುಗಳು ಲೆಡ್ಜರ್ ಪರಿವರ್ತಿಸಬಹುದು ಸಾಧ್ಯವಿಲ್ಲ.
 DocType: Bank Reconciliation,Total Amount,ಒಟ್ಟು ಪ್ರಮಾಣ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,ಇಂಟರ್ನೆಟ್ ಪಬ್ಲಿಷಿಂಗ್
 DocType: Prescription Duration,Number,ಸಂಖ್ಯೆ
@@ -1105,7 +1126,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,ಮಾರಾಟ ಬೆಲೆ ಪಟ್ಟಿ
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","ಪರಿಶೀಲಿಸಿದಲ್ಲಿ, ಗ್ರಾಹಕರನ್ನು ರಚಿಸಲಾಗುವುದು, ರೋಗಿಯಲ್ಲಿ ಮ್ಯಾಪ್ ಮಾಡಲಾಗುವುದು. ಈ ಗ್ರಾಹಕರ ವಿರುದ್ಧ ರೋಗಿಯ ಇನ್ವಾಯ್ಸ್ಗಳನ್ನು ರಚಿಸಲಾಗುವುದು. ರೋಗಿಯನ್ನು ರಚಿಸುವಾಗ ನೀವು ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಗ್ರಾಹಕರನ್ನು ಆಯ್ಕೆ ಮಾಡಬಹುದು."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,ಐಟಂಗಳನ್ನು ಸಿಂಕ್ ಪ್ರಕಟಿಸಿ
 DocType: Bank Reconciliation,Account Currency,ಖಾತೆ ಕರೆನ್ಸಿ
 DocType: Lab Test,Sample ID,ಮಾದರಿ ID
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,ಕಂಪನಿಯಲ್ಲಿ ರೌಂಡ್ ಆಫ್ ಖಾತೆ ಕುರಿತು ಮಾಹಿತಿ ನೀಡಿ
@@ -1114,11 +1134,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,ನೌಕರರ {0} ಸಕ್ರಿಯವಾಗಿಲ್ಲ ಅಥವಾ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Fee Structure,Components,ಘಟಕಗಳು
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},ಐಟಂ ರಲ್ಲಿ ಆಸ್ತಿ ವರ್ಗ ನಮೂದಿಸಿ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು {0} ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು {0} ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 DocType: Quality Inspection Reading,Reading 6,6 ಓದುವಿಕೆ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,ಅಲ್ಲ {0} {1} {2} ಯಾವುದೇ ಋಣಾತ್ಮಕ ಮಹೋನ್ನತ ಸರಕುಪಟ್ಟಿ ಕ್ಯಾನ್
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","ಉತ್ಪಾದಿಸಲು. ವಿಳಂಬವಾದರೆ, ನೀವು ಇದನ್ನು &quot;ಪುನರಾವರ್ತನೆ ದಿನದಂದು&quot; ಕ್ಷೇತ್ರವನ್ನು ಹಸ್ತಚಾಲಿತವಾಗಿ ಬದಲಿಸಬೇಕಾಗುತ್ತದೆ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,ಅಲ್ಲ {0} {1} {2} ಯಾವುದೇ ಋಣಾತ್ಮಕ ಮಹೋನ್ನತ ಸರಕುಪಟ್ಟಿ ಕ್ಯಾನ್
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ಸರಕುಪಟ್ಟಿ ಮುಂಗಡ ಖರೀದಿ
-DocType: Hub Settings,Sync Now,ಸಿಂಕ್ ಈಗ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},ಸಾಲು {0}: ಕ್ರೆಡಿಟ್ ಪ್ರವೇಶ ಸಂಬಂಧ ಸಾಧ್ಯವಿಲ್ಲ ಒಂದು {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,ಆರ್ಥಿಕ ವರ್ಷದ ಬಜೆಟ್ ವಿವರಿಸಿ.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,ಈ ಕ್ರಮವನ್ನು ಆಯ್ಕೆ ಮಾಡಿದಾಗ ಡೀಫಾಲ್ಟ್ ಬ್ಯಾಂಕ್ / ನಗದು ಖಾತೆಯನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಪಿಓಎಸ್ ಸರಕುಪಟ್ಟಿ ರಲ್ಲಿ ನವೀಕರಿಸಲಾಗುತ್ತದೆ.
@@ -1130,13 +1151,13 @@
 DocType: Item,Is Purchase Item,ಖರೀದಿ ಐಟಂ
 DocType: Asset,Purchase Invoice,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ
 DocType: Stock Ledger Entry,Voucher Detail No,ಚೀಟಿ ವಿವರ ನಂ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,ಹೊಸ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,ಹೊಸ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ
 DocType: Stock Entry,Total Outgoing Value,ಒಟ್ಟು ಹೊರಹೋಗುವ ಮೌಲ್ಯ
 DocType: Physician,Appointments,ನೇಮಕಾತಿಗಳನ್ನು
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,ದಿನಾಂಕ ಮತ್ತು ಮುಕ್ತಾಯದ ದಿನಾಂಕ ತೆರೆಯುವ ಒಂದೇ ಆಗಿರುವ ಹಣಕಾಸಿನ ವರ್ಷವನ್ನು ಒಳಗೆ ಇರಬೇಕು
 DocType: Lead,Request for Information,ಮಾಹಿತಿಗಾಗಿ ಕೋರಿಕೆ
 ,LeaderBoard,ಲೀಡರ್
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,ಸಿಂಕ್ ಆಫ್ಲೈನ್ ಇನ್ವಾಯ್ಸ್ಗಳು
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,ಸಿಂಕ್ ಆಫ್ಲೈನ್ ಇನ್ವಾಯ್ಸ್ಗಳು
 DocType: Payment Request,Paid,ಹಣ
 DocType: Program Fee,Program Fee,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ಶುಲ್ಕ
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1155,11 +1176,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಐಟಂ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,ಪರೋಕ್ಷ ಆದಾಯ
 DocType: Student Attendance Tool,Student Attendance Tool,ವಿದ್ಯಾರ್ಥಿ ಅಟೆಂಡೆನ್ಸ್ ಉಪಕರಣ
+DocType: Restaurant Menu,Price List (Auto created),ಬೆಲೆ ಪಟ್ಟಿ (ಸ್ವಯಂ ರಚಿಸಲಾಗಿದೆ)
 DocType: Cheque Print Template,Date Settings,ದಿನಾಂಕ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,ಭಿನ್ನಾಭಿಪ್ರಾಯ
 ,Company Name,ಕಂಪನಿ ಹೆಸರು
 DocType: SMS Center,Total Message(s),ಒಟ್ಟು ಸಂದೇಶ (ಗಳು)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,ವರ್ಗಾವಣೆ ಆಯ್ಕೆ ಐಟಂ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,ವರ್ಗಾವಣೆ ಆಯ್ಕೆ ಐಟಂ
 DocType: Purchase Invoice,Additional Discount Percentage,ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಶೇಕಡಾವಾರು
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,ಎಲ್ಲಾ ಸಹಾಯ ವೀಡಿಯೊಗಳನ್ನು ಪಟ್ಟಿಯನ್ನು ವೀಕ್ಷಿಸಿ
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ಅಲ್ಲಿ ಚೆಕ್ ಠೇವಣಿ ಏನು ಬ್ಯಾಂಕ್ ಖಾತೆ ಮುಖ್ಯಸ್ಥ ಆಯ್ಕೆ .
@@ -1177,6 +1199,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,ಮೀಟರ್
 DocType: Workstation,Electricity Cost,ವಿದ್ಯುತ್ ಬೆಲೆ
 DocType: HR Settings,Don't send Employee Birthday Reminders,ನೌಕರರ ಜನ್ಮದಿನ ಜ್ಞಾಪನೆಗಳನ್ನು ಕಳುಹಿಸಬೇಡಿ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಉಳಿಸಿ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,ವಿನಂತಿಸಿದ ಉತ್ಪನ್ನಗಳು
 DocType: Item,Inspection Criteria,ಇನ್ಸ್ಪೆಕ್ಷನ್ ಮಾನದಂಡ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,ವರ್ಗಾವಣೆಯ
 DocType: BOM Website Item,BOM Website Item,ಬಿಒಎಮ್ ವೆಬ್ಸೈಟ್ ಐಟಂ
@@ -1194,11 +1218,11 @@
 DocType: Journal Entry,Total Amount in Words,ವರ್ಡ್ಸ್ ಒಟ್ಟು ಪ್ರಮಾಣ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,ಒಂದು ದೋಷ ಉಂಟಾಗಿದೆ . ನೀವು ಉಳಿಸಿಲ್ಲ ಮಾಡಲಿಲ್ಲ ಒಂದು ಸಂಭಾವ್ಯ ಕಾರಣ ಸಮಸ್ಯೆ ಮುಂದುವರಿದರೆ support@erpnext.com ಸಂಪರ್ಕಿಸಿ ಡಾಕ್ಯುಮೆಂಟ್ ಸಾಧ್ಯವಾಗಿಲ್ಲ .
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,ನನ್ನ ಕಾರ್ಟ್
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},ಆರ್ಡರ್ ಪ್ರಕಾರ ಒಂದು ಇರಬೇಕು {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},ಆರ್ಡರ್ ಪ್ರಕಾರ ಒಂದು ಇರಬೇಕು {0}
 DocType: Lead,Next Contact Date,ಮುಂದೆ ಸಂಪರ್ಕಿಸಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,ಆರಂಭಿಕ ಪ್ರಮಾಣ
 DocType: Healthcare Settings,Appointment Reminder,ನೇಮಕಾತಿ ಜ್ಞಾಪನೆ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,ದಯವಿಟ್ಟು ಪ್ರಮಾಣ ಚೇಂಜ್ ಖಾತೆಯನ್ನು ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,ದಯವಿಟ್ಟು ಪ್ರಮಾಣ ಚೇಂಜ್ ಖಾತೆಯನ್ನು ನಮೂದಿಸಿ
 DocType: Student Batch Name,Student Batch Name,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ಹೆಸರು
 DocType: Consultation,Doctor,ಡಾಕ್ಟರ್
 DocType: Holiday List,Holiday List Name,ಹಾಲಿಡೇ ಪಟ್ಟಿ ಹೆಸರು
@@ -1206,12 +1230,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,ವೇಳಾಪಟ್ಟಿ ಕೋರ್ಸ್
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,ಸ್ಟಾಕ್ ಆಯ್ಕೆಗಳು
 DocType: Journal Entry Account,Expense Claim,ಖರ್ಚು ಹಕ್ಕು
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,ನೀವು ನಿಜವಾಗಿಯೂ ಈ ಕೈಬಿಟ್ಟಿತು ಆಸ್ತಿ ಪುನಃಸ್ಥಾಪಿಸಲು ಬಯಸುವಿರಾ?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},ಫಾರ್ ಪ್ರಮಾಣ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,ನೀವು ನಿಜವಾಗಿಯೂ ಈ ಕೈಬಿಟ್ಟಿತು ಆಸ್ತಿ ಪುನಃಸ್ಥಾಪಿಸಲು ಬಯಸುವಿರಾ?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},ಫಾರ್ ಪ್ರಮಾಣ {0}
 DocType: Leave Application,Leave Application,ಅಪ್ಲಿಕೇಶನ್ ಬಿಡಿ
 DocType: Patient,Patient Relation,ರೋಗಿಯ ಸಂಬಂಧ
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,ಅಲೋಕೇಶನ್ ಉಪಕರಣ ಬಿಡಿ
+DocType: Item,Hub Category to Publish,ಹಬ್ ವರ್ಗ ಪ್ರಕಟಣೆ
 DocType: Leave Block List,Leave Block List Dates,ಖಂಡ ದಿನಾಂಕ ಬಿಡಿ
+DocType: Sales Invoice,Billing Address GSTIN,ಬಿಲ್ಲಿಂಗ್ ವಿಳಾಸ GSTIN
 DocType: Workstation,Net Hour Rate,ನೆಟ್ ಅವರ್ ದರ
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,ವೆಚ್ಚ ಖರೀದಿ ರಸೀತಿ ಇಳಿಯಿತು
 DocType: Company,Default Terms,ಡೀಫಾಲ್ಟ್ ನಿಯಮಗಳು
@@ -1221,11 +1247,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},ದಯವಿಟ್ಟು ಸೂಚಿಸಿ ಒಂದು {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯವನ್ನು ಯಾವುದೇ ಬದಲಾವಣೆ ತೆಗೆದುಹಾಕಲಾಗಿದೆ ಐಟಂಗಳನ್ನು.
 DocType: Delivery Note,Delivery To,ವಿತರಣಾ
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,ಗುಣಲಕ್ಷಣ ಟೇಬಲ್ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,ಗುಣಲಕ್ಷಣ ಟೇಬಲ್ ಕಡ್ಡಾಯ
 DocType: Production Planning Tool,Get Sales Orders,ಮಾರಾಟದ ಆರ್ಡರ್ಸ್ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
 DocType: Training Event,Self-Study,ಸ್ವ-ಅಧ್ಯಯನ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,ರಿಯಾಯಿತಿ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,ರಿಯಾಯಿತಿ
 DocType: Asset,Total Number of Depreciations,Depreciations ಒಟ್ಟು ಸಂಖ್ಯೆ
 DocType: Sales Invoice Item,Rate With Margin,ಮಾರ್ಜಿನ್ ಜೊತೆಗೆ ದರ
 DocType: Sales Invoice Item,Rate With Margin,ಮಾರ್ಜಿನ್ ಜೊತೆಗೆ ದರ
@@ -1233,7 +1259,7 @@
 DocType: Task,Urgent,ತುರ್ತಿನ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},ಕೋಷ್ಟಕದಲ್ಲಿ ಸಾಲು {0} ಮಾನ್ಯವಾದ ಸಾಲು ಐಡಿ ಸೂಚಿಸಿ {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,ವೇರಿಯಬಲ್ ಕಂಡುಹಿಡಿಯಲು ಸಾಧ್ಯವಿಲ್ಲ:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,ದಯವಿಟ್ಟು ನಂಪಡ್ನಿಂದ ಸಂಪಾದಿಸಲು ಕ್ಷೇತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,ದಯವಿಟ್ಟು ನಂಪಡ್ನಿಂದ ಸಂಪಾದಿಸಲು ಕ್ಷೇತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,ಡೆಸ್ಕ್ಟಾಪ್ ಹೋಗಿ ERPNext ಬಳಸಿಕೊಂಡು ಆರಂಭಿಸಲು
 DocType: Item,Manufacturer,ತಯಾರಕ
 DocType: Landed Cost Item,Purchase Receipt Item,ಖರೀದಿ ರಸೀತಿ ಐಟಂ
@@ -1264,8 +1290,8 @@
 DocType: GL Entry,Against,ವಿರುದ್ಧವಾಗಿ
 DocType: Item,Default Selling Cost Center,ಡೀಫಾಲ್ಟ್ ಮಾರಾಟ ವೆಚ್ಚ ಸೆಂಟರ್
 DocType: Sales Partner,Implementation Partner,ಅನುಷ್ಠಾನ ಸಂಗಾತಿ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,ZIP ಕೋಡ್
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಯನ್ನು {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,ZIP ಕೋಡ್
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಯನ್ನು {1}
 DocType: Opportunity,Contact Info,ಸಂಪರ್ಕ ಮಾಹಿತಿ
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,ಸ್ಟಾಕ್ ನಮೂದುಗಳು ಮೇಕಿಂಗ್
 DocType: Packing Slip,Net Weight UOM,ನೆಟ್ ತೂಕ UOM
@@ -1276,6 +1302,7 @@
 DocType: Holiday List,Get Weekly Off Dates,ದಿನಾಂಕ ವೀಕ್ಲಿ ಆಫ್ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,ಅಂತಿಮ ದಿನಾಂಕ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Sales Person,Select company name first.,ಮೊದಲ ಕಂಪನಿ ಹೆಸರು ಆಯ್ಕೆ ಮಾಡಿ.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,ಹೈ ಟು ಹೈ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ಉಲ್ಲೇಖಗಳು ವಿತರಕರಿಂದ ಪಡೆದ .
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOM ಅನ್ನು ಬದಲಾಯಿಸಿ ಮತ್ತು ಎಲ್ಲಾ BOM ಗಳಲ್ಲಿ ಇತ್ತೀಚಿನ ಬೆಲೆಯನ್ನು ನವೀಕರಿಸಿ
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},ಗೆ {0} | {1} {2}
@@ -1296,7 +1323,7 @@
 DocType: Program Enrollment,Transportation,ಸಾರಿಗೆ
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,ಅಮಾನ್ಯ ಲಕ್ಷಣ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} ಸಲ್ಲಿಸಬೇಕು
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},ಪ್ರಮಾಣ ಕಡಿಮೆ ಅಥವಾ ಸಮನಾಗಿರಬೇಕು {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},ಪ್ರಮಾಣ ಕಡಿಮೆ ಅಥವಾ ಸಮನಾಗಿರಬೇಕು {0}
 DocType: SMS Center,Total Characters,ಒಟ್ಟು ಪಾತ್ರಗಳು
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},ಐಟಂ ಬಿಒಎಮ್ ಕ್ಷೇತ್ರದಲ್ಲಿ ಬಿಒಎಮ್ ಆಯ್ಕೆಮಾಡಿ {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,ಸಿ ಆಕಾರ ಸರಕುಪಟ್ಟಿ ವಿವರ
@@ -1311,7 +1338,7 @@
 ,Ordered Items To Be Billed,ಖ್ಯಾತವಾದ ಐಟಂಗಳನ್ನು ಆದೇಶ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,ರೇಂಜ್ ಕಡಿಮೆ ಎಂದು ಹೊಂದಿದೆ ಹೆಚ್ಚಾಗಿ ಶ್ರೇಣಿಗೆ
 DocType: Global Defaults,Global Defaults,ಜಾಗತಿಕ ಪೂರ್ವನಿಯೋಜಿತಗಳು
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,ಪ್ರಾಜೆಕ್ಟ್ ಸಹಯೋಗ ಆಮಂತ್ರಣ
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,ಪ್ರಾಜೆಕ್ಟ್ ಸಹಯೋಗ ಆಮಂತ್ರಣ
 DocType: Salary Slip,Deductions,ನಿರ್ಣಯಗಳಿಂದ
 DocType: Leave Allocation,LAL/,ಲಾಲ್ /
 DocType: Setup Progress Action,Action Name,ಆಕ್ಷನ್ ಹೆಸರು
@@ -1329,13 +1356,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಅಡ್ವಾನ್ಸ್
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,ಮನವಿ ನಥಿಂಗ್
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},ಮತ್ತೊಂದು ಬಜೆಟ್ ದಾಖಲೆ &#39;{0}&#39; ಈಗಾಗಲೇ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1} &#39;{2}&#39; ಹಣಕಾಸು ವರ್ಷಕ್ಕೆ {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',' ನಿಜವಾದ ಆರಂಭ ದಿನಾಂಕ ' ಗ್ರೇಟರ್ ದ್ಯಾನ್ ' ನಿಜವಾದ ಅಂತಿಮ ದಿನಾಂಕ ' ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',' ನಿಜವಾದ ಆರಂಭ ದಿನಾಂಕ ' ಗ್ರೇಟರ್ ದ್ಯಾನ್ ' ನಿಜವಾದ ಅಂತಿಮ ದಿನಾಂಕ ' ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,ಆಡಳಿತ
 DocType: Cheque Print Template,Payer Settings,ಪಾವತಿಸುವ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ಈ ವ್ಯತ್ಯಯದ ಐಟಂ ಕೋಡ್ ಬಿತ್ತರಿಸಲಾಗುವುದು. ನಿಮ್ಮ ಸಂಕ್ಷೇಪಣ ""ಎಸ್ಎಮ್"", ಮತ್ತು ಉದಾಹರಣೆಗೆ, ಐಟಂ ಕೋಡ್ ""ಟಿ ಶರ್ಟ್"", ""ಟಿ-ಶರ್ಟ್ ಎಸ್.ಎಂ."" ಇರುತ್ತದೆ ವ್ಯತ್ಯಯದ ಐಟಂ ಸಂಕೇತ"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,ನೀವು ಸಂಬಳ ಸ್ಲಿಪ್ ಉಳಿಸಲು ಒಮ್ಮೆ ( ಮಾತಿನಲ್ಲಿ) ನಿವ್ವಳ ವೇತನ ಗೋಚರಿಸುತ್ತದೆ.
 DocType: Purchase Invoice,Is Return,ಮರಳುವುದು
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,ಎಚ್ಚರಿಕೆ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,ಎಚ್ಚರಿಕೆ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,ರಿಟರ್ನ್ / ಡೆಬಿಟ್ ಗಮನಿಸಿ
 DocType: Price List Country,Price List Country,ದರ ಪಟ್ಟಿ ಕಂಟ್ರಿ
 DocType: Item,UOMs,UOMs
@@ -1350,17 +1377,18 @@
 DocType: Account,Balance Sheet,ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ','ಐಟಂ ಕೋಡ್ನೊಂದಿಗೆ ಐಟಂ ಸೆಂಟರ್ ವೆಚ್ಚ
 DocType: Fee Validity,Valid Till,ಮಾನ್ಯ ಟಿಲ್
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",ಪಾವತಿ ಮೋಡ್ ಸಂರಚಿತವಾಗಿರುವುದಿಲ್ಲ. ಖಾತೆ ಪಾವತಿ ವಿಧಾನ ಮೇಲೆ ಅಥವಾ ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಹೊಂದಿಸಲಾಗಿದೆ ಎಂಬುದನ್ನು ದಯವಿಟ್ಟು ಪರಿಶೀಲಿಸಿ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",ಪಾವತಿ ಮೋಡ್ ಸಂರಚಿತವಾಗಿರುವುದಿಲ್ಲ. ಖಾತೆ ಪಾವತಿ ವಿಧಾನ ಮೇಲೆ ಅಥವಾ ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಹೊಂದಿಸಲಾಗಿದೆ ಎಂಬುದನ್ನು ದಯವಿಟ್ಟು ಪರಿಶೀಲಿಸಿ.
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,ಅದೇ ಐಟಂ ಅನೇಕ ಬಾರಿ ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","ಮತ್ತಷ್ಟು ಖಾತೆಗಳನ್ನು ಗುಂಪುಗಳು ಅಡಿಯಲ್ಲಿ ಮಾಡಬಹುದು, ಆದರೆ ನಮೂದುಗಳನ್ನು ಅಲ್ಲದ ಗುಂಪುಗಳ ವಿರುದ್ಧ ಮಾಡಬಹುದು"
 DocType: Lead,Lead,ಲೀಡ್
 DocType: Email Digest,Payables,ಸಂದಾಯಗಳು
 DocType: Course,Course Intro,ಕೋರ್ಸ್ ಪರಿಚಯ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ದಾಖಲಿಸಿದವರು
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ಸೆಟಪ್&gt; ಸಂಖ್ಯಾ ಸರಣಿಗಳ ಮೂಲಕ ಹಾಜರಾತಿಗಾಗಿ ಸೆಟಪ್ ಸಂಖ್ಯೆಯ ಸರಣಿ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ದಾಖಲಿಸಿದವರು
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,ರೋ # {0}: ಪ್ರಮಾಣ ಖರೀದಿ ರಿಟರ್ನ್ ಪ್ರವೇಶಿಸಿತು ಸಾಧ್ಯವಿಲ್ಲ ತಿರಸ್ಕರಿಸಲಾಗಿದೆ
 ,Purchase Order Items To Be Billed,ಪಾವತಿಸಬೇಕಾಗುತ್ತದೆ ಖರೀದಿ ಆದೇಶವನ್ನು ಐಟಂಗಳು
 DocType: Purchase Invoice Item,Net Rate,ನೆಟ್ ದರ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,ದಯವಿಟ್ಟು ಗ್ರಾಹಕರನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,ದಯವಿಟ್ಟು ಗ್ರಾಹಕರನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Purchase Invoice Item,Purchase Invoice Item,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಐಟಂ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,ಸ್ಟಾಕ್ ಲೆಡ್ಜರ್ ನಮೂದುಗಳನ್ನು ಮತ್ತು ಜಿಎಲ್ ನಮೂದುಗಳು ಆಯ್ಕೆ ಖರೀದಿ ರಸೀದಿಗಳನ್ನು ಫಾರ್ ವರದಿ ಮಾಡಿದ್ದರೆ ಮಾಡಲಾಗುತ್ತದೆ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,ಐಟಂ 1
@@ -1381,7 +1409,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},ನಕಲು ಸಾಲು {0} {1} ಒಂದೇ ಜೊತೆ
 ,Trial Balance,ಟ್ರಯಲ್ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,ಹಣಕಾಸಿನ ವರ್ಷ {0} ಕಂಡುಬಂದಿಲ್ಲ
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,ನೌಕರರು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,ನೌಕರರು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
 DocType: Sales Order,SO-,ಆದ್ದರಿಂದ-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,ಮೊದಲ ಪೂರ್ವಪ್ರತ್ಯಯ ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Employee,O-,O-
@@ -1393,12 +1421,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,ವೀಕ್ಷಿಸು ಲೆಡ್ಜರ್
 DocType: Grading Scale,Intervals,ಮಧ್ಯಂತರಗಳು
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ಮುಂಚಿನ
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","ಐಟಂ ಗುಂಪು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ , ಐಟಂ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ದಯವಿಟ್ಟು"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","ಐಟಂ ಗುಂಪು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ , ಐಟಂ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ದಯವಿಟ್ಟು"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,ವಿದ್ಯಾರ್ಥಿ ಮೊಬೈಲ್ ನಂ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,ವಿಶ್ವದ ಉಳಿದ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,ವಿಶ್ವದ ಉಳಿದ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,ಐಟಂ {0} ಬ್ಯಾಚ್ ಹೊಂದುವಂತಿಲ್ಲ
 ,Budget Variance Report,ಬಜೆಟ್ ವೈಷಮ್ಯವನ್ನು ವರದಿ
 DocType: Salary Slip,Gross Pay,ಗ್ರಾಸ್ ಪೇ
+DocType: Item,Is Item from Hub,ಹಬ್ನಿಂದ ಐಟಂ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,ರೋ {0}: ಚಟುವಟಿಕೆ ಕೌಟುಂಬಿಕತೆ ಕಡ್ಡಾಯವಾಗಿದೆ.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,ಫಲಕಾರಿಯಾಯಿತು
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,ಲೆಕ್ಕಪತ್ರ ಲೆಡ್ಜರ್
@@ -1408,8 +1437,9 @@
 DocType: Vehicle Log,Service Detail,ಸೇವೆ ವಿವರ
 DocType: BOM,Item Description,ಐಟಂ ವಿವರಣೆ
 DocType: Student Sibling,Student Sibling,ವಿದ್ಯಾರ್ಥಿ ಒಡಹುಟ್ಟಿದವರು
-DocType: Purchase Invoice,Is Recurring,ಮರುಕಳಿಸುವ ಆಗಿದೆ
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,ಪಾವತಿ ಮೋಡ್
 DocType: Purchase Invoice,Supplied Items,ವಿತರಿಸಿದ ವಸ್ತುಗಳನ್ನು
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},ದಯವಿಟ್ಟು ರೆಸ್ಟೋರೆಂಟ್ಗಾಗಿ ಸಕ್ರಿಯ ಮೆನುವನ್ನು ಹೊಂದಿಸಿ {0}
 DocType: Student,STUD.,ಸ್ಟಡ್.
 DocType: Production Order,Qty To Manufacture,ತಯಾರಿಸಲು ಪ್ರಮಾಣ
 DocType: Email Digest,New Income,ಹೊಸ ಆದಾಯ
@@ -1420,6 +1450,7 @@
 ,Student and Guardian Contact Details,ವಿದ್ಯಾರ್ಥಿ ಮತ್ತು ಗಾರ್ಡಿಯನ್ ಸಂಪರ್ಕ ವಿವರಗಳು
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,ರೋ {0}: ಪೂರೈಕೆದಾರ ಫಾರ್ {0} ಇಮೇಲ್ ವಿಳಾಸ ಇಮೇಲ್ ಕಳುಹಿಸಲು ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,ತಾತ್ಕಾಲಿಕ ಉದ್ಘಾಟನಾ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,ವೀಕ್ಷಿಸಿ ಹಬ್
 ,Employee Leave Balance,ನೌಕರರ ಲೀವ್ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},{0} ಯಾವಾಗಲೂ ಇರಬೇಕು ಖಾತೆ ಬಾಕಿ {1}
 DocType: Patient Appointment,More Info,ಇನ್ನಷ್ಟು ಮಾಹಿತಿ
@@ -1439,13 +1470,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಮಾನ್ಯವಾಗಿಲ್ಲ
 DocType: Supplier Scorecard,Warn for new Request for Quotations,ಉಲ್ಲೇಖಗಳಿಗಾಗಿ ಹೊಸ ವಿನಂತಿಗಾಗಿ ಎಚ್ಚರಿಕೆ ನೀಡಿ
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,ಖರೀದಿ ಆದೇಶ ನೀವು ಯೋಜನೆ ಸಹಾಯ ಮತ್ತು ನಿಮ್ಮ ಖರೀದಿ ಮೇಲೆ ಅನುಸರಿಸಿ
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","ಕ್ಷಮಿಸಿ, ಕಂಪನಿಗಳು ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","ಕ್ಷಮಿಸಿ, ಕಂಪನಿಗಳು ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,ಲ್ಯಾಬ್ ಟೆಸ್ಟ್ ಪ್ರಿಸ್ಕ್ರಿಪ್ಷನ್ಗಳು
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",ಒಟ್ಟು ಸಂಚಿಕೆ / ವರ್ಗಾವಣೆ ಪ್ರಮಾಣ {0} ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ರಲ್ಲಿ {1} \ ವಿನಂತಿಸಿದ ಪ್ರಮಾಣ {2} ಐಟಂ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,ಸಣ್ಣ
 DocType: Employee,Employee Number,ನೌಕರರ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},ಕೇಸ್ ಇಲ್ಲ (ಗಳು) ಈಗಾಗಲೇ ಬಳಕೆಯಲ್ಲಿದೆ. ಪ್ರಕರಣ ಸಂಖ್ಯೆ ನಿಂದ ಪ್ರಯತ್ನಿಸಿ {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},ಕೇಸ್ ಇಲ್ಲ (ಗಳು) ಈಗಾಗಲೇ ಬಳಕೆಯಲ್ಲಿದೆ. ಪ್ರಕರಣ ಸಂಖ್ಯೆ ನಿಂದ ಪ್ರಯತ್ನಿಸಿ {0}
 DocType: Project,% Completed,% ಪೂರ್ಣಗೊಂಡಿದೆ
 ,Invoiced Amount (Exculsive Tax),ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣ ( ತೆರಿಗೆ Exculsive )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,ಐಟಂ 2
@@ -1460,11 +1491,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,ಪರೋಕ್ಷ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,ರೋ {0}: ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,ವ್ಯವಸಾಯ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,ಸಿಂಕ್ ಮಾಸ್ಟರ್ ಡಾಟಾ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,ಸಿಂಕ್ ಮಾಸ್ಟರ್ ಡಾಟಾ
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,ನಿಮ್ಮ ಉತ್ಪನ್ನಗಳನ್ನು ಅಥವಾ ಸೇವೆಗಳನ್ನು
 DocType: Special Test Items,Special Test Items,ವಿಶೇಷ ಪರೀಕ್ಷಾ ಐಟಂಗಳು
 DocType: Mode of Payment,Mode of Payment,ಪಾವತಿಯ ಮಾದರಿಯು
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,ವೆಬ್ಸೈಟ್ ಚಿತ್ರ ಸಾರ್ವಜನಿಕ ಕಡತ ಅಥವಾ ವೆಬ್ಸೈಟ್ URL ಇರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,ವೆಬ್ಸೈಟ್ ಚಿತ್ರ ಸಾರ್ವಜನಿಕ ಕಡತ ಅಥವಾ ವೆಬ್ಸೈಟ್ URL ಇರಬೇಕು
 DocType: Student Applicant,AP,ಎಪಿ
 DocType: Purchase Invoice Item,BOM,ಬಿಒಎಮ್
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,ಈ ಒಂದು ಮೂಲ ಐಟಂ ಗುಂಪು ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
@@ -1472,9 +1503,9 @@
 DocType: Vehicle,Fuel UOM,ಇಂಧನ ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ
 DocType: Warehouse,Warehouse Contact Info,ವೇರ್ಹೌಸ್ ಸಂಪರ್ಕ ಮಾಹಿತಿ
 DocType: Payment Entry,Write Off Difference Amount,ವ್ಯತ್ಯಾಸ ಪ್ರಮಾಣ ಆಫ್ ಬರೆಯಿರಿ
-DocType: Purchase Invoice,Recurring Type,ಮರುಕಳಿಸುವ ಪ್ರಕಾರ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: ನೌಕರರ ಇಮೇಲ್ ಕಂಡುಬಂದಿಲ್ಲ, ಆದ್ದರಿಂದ ಕಳುಹಿಸಲಾಗಿಲ್ಲ ಇಮೇಲ್"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: ನೌಕರರ ಇಮೇಲ್ ಕಂಡುಬಂದಿಲ್ಲ, ಆದ್ದರಿಂದ ಕಳುಹಿಸಲಾಗಿಲ್ಲ ಇಮೇಲ್"
 DocType: Item,Foreign Trade Details,ವಿದೇಶಿ ವ್ಯಾಪಾರ ವಿವರಗಳು
+,Assessment Plan Status,ಅಸೆಸ್ಮೆಂಟ್ ಯೋಜನೆ ಸ್ಥಿತಿ
 DocType: Email Digest,Annual Income,ವಾರ್ಷಿಕ ಆದಾಯ
 DocType: Serial No,Serial No Details,ಯಾವುದೇ ಸೀರಿಯಲ್ ವಿವರಗಳು
 DocType: Purchase Invoice Item,Item Tax Rate,ಐಟಂ ತೆರಿಗೆ ದರ
@@ -1482,15 +1513,14 @@
 DocType: Student Group Student,Group Roll Number,ಗುಂಪು ರೋಲ್ ಸಂಖ್ಯೆ
 DocType: Student Group Student,Group Roll Number,ಗುಂಪು ರೋಲ್ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, ಮಾತ್ರ ಕ್ರೆಡಿಟ್ ಖಾತೆಗಳನ್ನು ಮತ್ತೊಂದು ಡೆಬಿಟ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಲಿಂಕ್ ಮಾಡಬಹುದು ಫಾರ್"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,ಎಲ್ಲಾ ಕೆಲಸವನ್ನು ತೂಕ ಒಟ್ಟು ಇರಬೇಕು 1. ಪ್ರಕಾರವಾಗಿ ಎಲ್ಲ ಪ್ರಾಜೆಕ್ಟ್ ಕಾರ್ಯಗಳ ತೂಕ ಹೊಂದಿಸಿಕೊಳ್ಳಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,ಎಲ್ಲಾ ಕೆಲಸವನ್ನು ತೂಕ ಒಟ್ಟು ಇರಬೇಕು 1. ಪ್ರಕಾರವಾಗಿ ಎಲ್ಲ ಪ್ರಾಜೆಕ್ಟ್ ಕಾರ್ಯಗಳ ತೂಕ ಹೊಂದಿಸಿಕೊಳ್ಳಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,ಐಟಂ {0} ಒಂದು ಉಪ ಒಪ್ಪಂದ ಐಟಂ ಇರಬೇಕು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,ಸಲಕರಣಾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","ಬೆಲೆ ರೂಲ್ ಮೊದಲ ಐಟಂ, ಐಟಂ ಗುಂಪು ಅಥವಾ ಬ್ರಾಂಡ್ ಆಗಿರಬಹುದು, ಕ್ಷೇತ್ರದಲ್ಲಿ 'ರಂದು ಅನ್ವಯಿಸು' ಆಧಾರದ ಮೇಲೆ ಆಯ್ಕೆ."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,ದಯವಿಟ್ಟು ಮೊದಲು ಐಟಂ ಕೋಡ್ ಅನ್ನು ಹೊಂದಿಸಿ
-DocType: Hub Settings,Seller Website,ಮಾರಾಟಗಾರ ವೆಬ್ಸೈಟ್
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,ದಯವಿಟ್ಟು ಮೊದಲು ಐಟಂ ಕೋಡ್ ಅನ್ನು ಹೊಂದಿಸಿ
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,ಮಾರಾಟದ ತಂಡಕ್ಕೆ ಹಂಚಿಕೆ ಶೇಕಡಾವಾರು ಒಟ್ಟು 100 ಶುಡ್
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,ಮಾರಾಟದ ತಂಡಕ್ಕೆ ಹಂಚಿಕೆ ಶೇಕಡಾವಾರು ಒಟ್ಟು 100 ಶುಡ್
 DocType: Sales Invoice Item,Edit Description,ಸಂಪಾದಿಸಿ ವಿವರಣೆ
 DocType: Antibiotic,Antibiotic,ಪ್ರತಿಜೀವಕ
 ,Team Updates,ತಂಡ ಅಪ್ಡೇಟ್ಗಳು
@@ -1511,12 +1541,12 @@
 DocType: Purchase Invoice,Total (Company Currency),ಒಟ್ಟು (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,ಕ್ರಮಸಂಖ್ಯೆ {0} ಒಮ್ಮೆ ಹೆಚ್ಚು ಪ್ರವೇಶಿಸಿತು
 DocType: Depreciation Schedule,Journal Entry,ಜರ್ನಲ್ ಎಂಟ್ರಿ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} ಪ್ರಗತಿಯಲ್ಲಿದೆ ಐಟಂಗಳನ್ನು
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} ಪ್ರಗತಿಯಲ್ಲಿದೆ ಐಟಂಗಳನ್ನು
 DocType: Workstation,Workstation Name,ಕಾರ್ಯಕ್ಷೇತ್ರ ಹೆಸರು
 DocType: Grading Scale Interval,Grade Code,ಗ್ರೇಡ್ ಕೋಡ್
 DocType: POS Item Group,POS Item Group,ಪಿಓಎಸ್ ಐಟಂ ಗ್ರೂಪ್
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ಡೈಜೆಸ್ಟ್ ಇಮೇಲ್:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},ಬಿಒಎಮ್ {0} ಐಟಂ ಸೇರುವುದಿಲ್ಲ {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},ಬಿಒಎಮ್ {0} ಐಟಂ ಸೇರುವುದಿಲ್ಲ {1}
 DocType: Sales Partner,Target Distribution,ಟಾರ್ಗೆಟ್ ಡಿಸ್ಟ್ರಿಬ್ಯೂಶನ್
 DocType: Salary Slip,Bank Account No.,ಬ್ಯಾಂಕ್ ಖಾತೆ ಸಂಖ್ಯೆ
 DocType: Naming Series,This is the number of the last created transaction with this prefix,ಈ ಪೂರ್ವನಾಮವನ್ನು ಹೊಂದಿರುವ ಲೋಡ್ ದಾಖಲಿಸಿದವರು ವ್ಯವಹಾರದ ಸಂಖ್ಯೆ
@@ -1533,10 +1563,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,ಉದ್ಧರಣ ಸರಬರಾಜುದಾರ ವಿನಂತಿ
 DocType: Healthcare Settings,Registration Message,ನೋಂದಣಿ ಸಂದೇಶ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,ಹಾರ್ಡ್ವೇರ್
-DocType: Sales Order,Recurring Upto,ಮರುಕಳಿಸುವ ವರೆಗೆ
 DocType: Prescription Dosage,Prescription Dosage,ಪ್ರಿಸ್ಕ್ರಿಪ್ಷನ್ ಡೋಸೇಜ್
 DocType: Attendance,HR Manager,ಮಾನವ ಸಂಪನ್ಮೂಲ ಮ್ಯಾನೇಜರ್
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,ಒಂದು ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,ಒಂದು ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,ಸವಲತ್ತು ಲೀವ್
 DocType: Purchase Invoice,Supplier Invoice Date,ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,ಪ್ರತಿ
@@ -1552,10 +1581,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,ನಡುವೆ ಕಂಡುಬರುವ ಅತಿಕ್ರಮಿಸುವ ಪರಿಸ್ಥಿತಿಗಳು :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,ಜರ್ನಲ್ ವಿರುದ್ಧ ಎಂಟ್ರಿ {0} ಈಗಾಗಲೇ ಕೆಲವು ಚೀಟಿ ವಿರುದ್ಧ ಸರಿಹೊಂದಿಸಲಾಗುತ್ತದೆ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,ಒಟ್ಟು ಆರ್ಡರ್ ಮೌಲ್ಯ
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,ಆಹಾರ
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,ಆಹಾರ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,ಏಜಿಂಗ್ ರೇಂಜ್ 3
 DocType: Maintenance Schedule Item,No of Visits,ಭೇಟಿ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ {0} ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,ನಿಮ್ಮ ಐಟಂಗಳನ್ನು ಹಬ್ಗೆ ಪ್ರಕಟಿಸಲು ನೀವು ಬಯಸುವಿರಾ?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,ನೋಂದಾಯಿತ ವಿದ್ಯಾರ್ಥಿ
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},ಖಾತೆ ಮುಚ್ಚುವಿಕೆಗೆ ಕರೆನ್ಸಿ ಇರಬೇಕು {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},ಎಲ್ಲಾ ಗುರಿಗಳನ್ನು ಅಂಕಗಳನ್ನು ಒಟ್ಟು ಮೊತ್ತ ಇದು 100 ಇರಬೇಕು {0}
@@ -1566,9 +1596,9 @@
 DocType: Authorization Rule,Average Discount,ಸರಾಸರಿ ರಿಯಾಯಿತಿ
 DocType: Purchase Invoice Item,UOM,ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ
 DocType: Rename Tool,Utilities,ಉಪಯುಕ್ತತೆಗಳನ್ನು
-DocType: Purchase Invoice Item,Accounting,ಲೆಕ್ಕಪರಿಶೋಧಕ
+DocType: POS Profile,Accounting,ಲೆಕ್ಕಪರಿಶೋಧಕ
 DocType: Employee,EMP/,ಕಂಪನ /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,ದಯವಿಟ್ಟು ಬ್ಯಾಚ್ ಮಾಡಿರುವ ಐಟಂ ಬ್ಯಾಚ್ಗಳು ಆಯ್ಕೆ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,ದಯವಿಟ್ಟು ಬ್ಯಾಚ್ ಮಾಡಿರುವ ಐಟಂ ಬ್ಯಾಚ್ಗಳು ಆಯ್ಕೆ
 DocType: Asset,Depreciation Schedules,ಸವಕಳಿ ವೇಳಾಪಟ್ಟಿಗಳು
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,ಅಪ್ಲಿಕೇಶನ್ ಅವಧಿಯಲ್ಲಿ ಹೊರಗೆ ರಜೆ ಹಂಚಿಕೆ ಅವಧಿಯಲ್ಲಿ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Activity Cost,Projects,ಯೋಜನೆಗಳು
@@ -1584,7 +1614,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',ಅನುಮೋದನೆ ಸ್ಥಿತಿ 'ಅಂಗೀಕಾರವಾದ' ಅಥವಾ ' ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ' ಮಾಡಬೇಕು
 DocType: Physician,Contacts and Address,ಸಂಪರ್ಕಗಳು ಮತ್ತು ವಿಳಾಸ
 DocType: Purchase Invoice,Contact Person,ಕಾಂಟ್ಯಾಕ್ಟ್ ಪರ್ಸನ್
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',' ನಿರೀಕ್ಷಿತ ಪ್ರಾರಂಭ ದಿನಾಂಕ ' ' ನಿರೀಕ್ಷಿತ ಅಂತಿಮ ದಿನಾಂಕ ' ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',' ನಿರೀಕ್ಷಿತ ಪ್ರಾರಂಭ ದಿನಾಂಕ ' ' ನಿರೀಕ್ಷಿತ ಅಂತಿಮ ದಿನಾಂಕ ' ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Course Scheduling Tool,Course End Date,ಕೋರ್ಸ್ ಅಂತಿಮ ದಿನಾಂಕ
 DocType: Holiday List,Holidays,ರಜಾದಿನಗಳು
 DocType: Sales Order Item,Planned Quantity,ಯೋಜಿತ ಪ್ರಮಾಣ
@@ -1592,10 +1622,11 @@
 DocType: Item,Maintain Stock,ಸ್ಟಾಕ್ ನಿರ್ವಹಿಸುವುದು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,ಈಗಾಗಲೇ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ ದಾಖಲಿಸಿದವರು ಸ್ಟಾಕ್ ನಮೂದುಗಳು
 DocType: Employee,Prefered Email,prefered ಇಮೇಲ್
+DocType: Student Admission,Eligibility and Details,ಅರ್ಹತೆ ಮತ್ತು ವಿವರಗಳು
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,ಸ್ಥಿರ ಸಂಪತ್ತಾದ ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 DocType: Leave Control Panel,Leave blank if considered for all designations,ಎಲ್ಲಾ ಅಂಕಿತಗಳು ಪರಿಗಣಿಸಲ್ಪಡುವ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ಮಾದರಿ ಸಾಲು {0} ನಲ್ಲಿ 'ವಾಸ್ತವಿಕ' ಉಸ್ತುವಾರಿ ಐಟಂ ದರದಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},ಮ್ಯಾಕ್ಸ್: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},ಮ್ಯಾಕ್ಸ್: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Datetime ಗೆ
 DocType: Email Digest,For Company,ಕಂಪನಿ
 apps/erpnext/erpnext/config/support.py +17,Communication log.,ಸಂವಹನ ದಾಖಲೆ .
@@ -1603,19 +1634,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,ಸರಬರಾಜುದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ಸ್ಕೋರಿಂಗ್ ವೇರಿಯಬಲ್
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,ಪ್ರಮಾಣ ಖರೀದಿ
 DocType: Sales Invoice,Shipping Address Name,ಶಿಪ್ಪಿಂಗ್ ವಿಳಾಸ ಹೆಸರು
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,ಖಾತೆಗಳ ಚಾರ್ಟ್
 DocType: Material Request,Terms and Conditions Content,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು ವಿಷಯ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
 DocType: Maintenance Visit,Unscheduled,ಅನಿಗದಿತ
 DocType: Employee,Owned,ಸ್ವಾಮ್ಯದ
 DocType: Salary Detail,Depends on Leave Without Pay,ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ಅವಲಂಬಿಸಿರುತ್ತದೆ
 DocType: Pricing Rule,"Higher the number, higher the priority","ಹೆಚ್ಚಿನ ಸಂಖ್ಯೆ, ಹೆಚ್ಚಿನ ಆದ್ಯತೆಯನ್ನು"
 ,Purchase Invoice Trends,ಸರಕುಪಟ್ಟಿ ಟ್ರೆಂಡ್ಸ್ ಖರೀದಿಸಿ
 DocType: Employee,Better Prospects,ಉತ್ತಮ ಜೀವನ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","ರೋ # {0}: ಬ್ಯಾಚ್ {1} ಕೇವಲ {2} ಪ್ರಮಾಣ ಹೊಂದಿದೆ. ದಯವಿಟ್ಟು {3} ಪ್ರಮಾಣ ಲಭ್ಯವಿದೆ, ಇನ್ನೊಂದು ತಂಡ ಆಯ್ಕೆ ಅಥವಾ ಅನೇಕ ಬ್ಯಾಚ್ಗಳು ರಿಂದ ಸಮಸ್ಯೆಯನ್ನು ತಲುಪಿಸಲು /, ಅನೇಕ ಸಾಲುಗಳನ್ನು ಸಾಲು ಬೇರ್ಪಟ್ಟು"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","ರೋ # {0}: ಬ್ಯಾಚ್ {1} ಕೇವಲ {2} ಪ್ರಮಾಣ ಹೊಂದಿದೆ. ದಯವಿಟ್ಟು {3} ಪ್ರಮಾಣ ಲಭ್ಯವಿದೆ, ಇನ್ನೊಂದು ತಂಡ ಆಯ್ಕೆ ಅಥವಾ ಅನೇಕ ಬ್ಯಾಚ್ಗಳು ರಿಂದ ಸಮಸ್ಯೆಯನ್ನು ತಲುಪಿಸಲು /, ಅನೇಕ ಸಾಲುಗಳನ್ನು ಸಾಲು ಬೇರ್ಪಟ್ಟು"
 DocType: Vehicle,License Plate,ಪರವಾನಗಿ ಫಲಕ
 DocType: Appraisal,Goals,ಗುರಿಗಳು
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,POS ಪ್ರೊಫೈಲ್ ಆಯ್ಕೆಮಾಡಿ
 DocType: Warranty Claim,Warranty / AMC Status,ಖಾತರಿ / ಎಎಮ್ಸಿ ಸ್ಥಿತಿ
 ,Accounts Browser,ಅಕೌಂಟ್ಸ್ ಬ್ರೌಸರ್
 DocType: Payment Entry Reference,Payment Entry Reference,ಪಾವತಿ ಎಂಟ್ರಿ ರೆಫರೆನ್ಸ್
@@ -1634,7 +1665,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,ನೌಕರರ ಸ್ವತಃ ವರದಿ ಸಾಧ್ಯವಿಲ್ಲ.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","ಖಾತೆ ಹೆಪ್ಪುಗಟ್ಟಿರುವ ವೇಳೆ , ನಮೂದುಗಳನ್ನು ನಿರ್ಬಂಧಿತ ಬಳಕೆದಾರರಿಗೆ ಅವಕಾಶವಿರುತ್ತದೆ ."
 DocType: Email Digest,Bank Balance,ಬ್ಯಾಂಕ್ ಬ್ಯಾಲೆನ್ಸ್
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ಮಾತ್ರ ಕರೆನ್ಸಿ ಮಾಡಬಹುದು: {0} ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ಮಾತ್ರ ಕರೆನ್ಸಿ ಮಾಡಬಹುದು: {0} ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","ಜಾಬ್ ಪ್ರೊಫೈಲ್ಗಳು , ಅಗತ್ಯ ವಿದ್ಯಾರ್ಹತೆಗಳು , ಇತ್ಯಾದಿ"
 DocType: Journal Entry Account,Account Balance,ಖಾತೆ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,ವ್ಯವಹಾರಗಳಿಗೆ ತೆರಿಗೆ ನಿಯಮ.
@@ -1643,8 +1674,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),ಒಟ್ಟು ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,ಮುಚ್ಚಿಲ್ಲದ ಆರ್ಥಿಕ ವರ್ಷದ ಪಿ &amp; ಎಲ್ ಬ್ಯಾಲೆನ್ಸ್ ತೋರಿಸಿ
 DocType: Lab Test Template,Collection Details,ಸಂಗ್ರಹಣೆ ವಿವರಗಳು
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date ನಿಂದ tabConsultation ct, `tabLab prescription` cp ಇಲ್ಲಿ ct.patient = &#39;{0}&#39; ಮತ್ತು cp.parent = ct ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ. ಹೆಸರು ಮತ್ತು cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,ಶಿಪ್ಪಿಂಗ್ ಖಾತೆ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: ಖಾತೆ {2} ನಿಷ್ಕ್ರಿಯವಾಗಿದೆ
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,ಆನ್ ಬಾರಿ ತಲುಪಿಸಲು ನಿಮ್ಮ ಕೆಲಸ ಯೋಜನೆ ಸಹಾಯ ಮಾರಾಟದ ಆರ್ಡರ್ಸ್ ಮತ್ತು ಮಾಡಿ
@@ -1661,7 +1690,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,ಕಚೇರಿ ಬಾಡಿಗೆ
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,ಸೆಟಪ್ SMS ಗೇಟ್ವೇ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,ಆಮದು ವಿಫಲವಾಗಿದೆ!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,ಆಮದು ವಿಫಲವಾಗಿದೆ!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,ಯಾವುದೇ ವಿಳಾಸ ಇನ್ನೂ ಸೇರಿಸಲಾಗಿದೆ.
 DocType: Workstation Working Hour,Workstation Working Hour,ಕಾರ್ಯಸ್ಥಳ ವರ್ಕಿಂಗ್ ಅವರ್
 DocType: Vital Signs,Blood Pressure,ರಕ್ತದೊತ್ತಡ
@@ -1686,7 +1715,7 @@
 DocType: Sales Invoice,Source,ಮೂಲ
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,ಮುಚ್ಚಲಾಗಿದೆ ಶೋ
 DocType: Leave Type,Is Leave Without Pay,ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ಇದೆ
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,ಆಸ್ತಿ ವರ್ಗ ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ ಕಡ್ಡಾಯವಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,ಆಸ್ತಿ ವರ್ಗ ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ ಕಡ್ಡಾಯವಾಗಿದೆ
 DocType: Fee Validity,Fee Validity,ಶುಲ್ಕ ಮಾನ್ಯತೆ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,ಪಾವತಿ ಕೋಷ್ಟಕದಲ್ಲಿ ಯಾವುದೇ ದಾಖಲೆಗಳು
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},ಈ {0} ಸಂಘರ್ಷಗಳನ್ನು {1} ಫಾರ್ {2} {3}
@@ -1707,8 +1736,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ಕಾರ್ಯನಿರ್ವಾಹಕ ಹುಡುಕು
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,ಕಾರಣವಾಗುತ್ತದೆ ರಚಿಸಿ
 DocType: Maintenance Schedule,Schedules,ವೇಳಾಪಟ್ಟಿಗಳು
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಪಾಯಿಂಟ್-ಆಫ್-ಮಾರಾಟವನ್ನು ಬಳಸಬೇಕಾಗುತ್ತದೆ
 DocType: Purchase Invoice Item,Net Amount,ನೆಟ್ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} ಸಲ್ಲಿಸಲಾಗಿಲ್ಲ ಕ್ರಮ ಪೂರ್ಣಗೊಳಿಸಲಾಗಲಿಲ್ಲ ಆದ್ದರಿಂದ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} ಸಲ್ಲಿಸಲಾಗಿಲ್ಲ ಕ್ರಮ ಪೂರ್ಣಗೊಳಿಸಲಾಗಲಿಲ್ಲ ಆದ್ದರಿಂದ
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM ವಿವರ ಯಾವುದೇ
 DocType: Landed Cost Voucher,Additional Charges,ಹೆಚ್ಚುವರಿ ಶುಲ್ಕಗಳು
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
@@ -1717,7 +1747,7 @@
 ,Support Hour Distribution,ಅವರ್ ವಿತರಣೆ ಬೆಂಬಲ
 DocType: Maintenance Visit,Maintenance Visit,ನಿರ್ವಹಣೆ ಭೇಟಿ
 DocType: Student,Leaving Certificate Number,ಸರ್ಟಿಫಿಕೇಟ್ ಸಂಖ್ಯೆ ಲೀವಿಂಗ್
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","ನೇಮಕಾತಿ ರದ್ದುಗೊಂಡಿದೆ, ದಯವಿಟ್ಟು ಸರಕುಪಟ್ಟಿ {0} ಪರಿಶೀಲಿಸಿ ಮತ್ತು ರದ್ದುಮಾಡಿ"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","ನೇಮಕಾತಿ ರದ್ದುಗೊಂಡಿದೆ, ದಯವಿಟ್ಟು ಸರಕುಪಟ್ಟಿ {0} ಪರಿಶೀಲಿಸಿ ಮತ್ತು ರದ್ದುಮಾಡಿ"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,ವೇರ್ಹೌಸ್ ಲಭ್ಯವಿದೆ ಬ್ಯಾಚ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,ಅಪ್ಡೇಟ್ ಪ್ರಿಂಟ್ ಫಾರ್ಮ್ಯಾಟ್
 DocType: Landed Cost Voucher,Landed Cost Help,ಇಳಿಯಿತು ವೆಚ್ಚ ಸಹಾಯ
@@ -1740,8 +1770,8 @@
 DocType: Patient,Tobacco Past Use,ತಂಬಾಕು ಕಳೆದ ಬಳಕೆ
 DocType: Sales Invoice Item,Brand Name,ಬ್ರಾಂಡ್ ಹೆಸರು
 DocType: Purchase Receipt,Transporter Details,ಟ್ರಾನ್ಸ್ಪೋರ್ಟರ್ ವಿವರಗಳು
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},ಬಳಕೆದಾರ {0} ಈಗಾಗಲೇ ವೈದ್ಯರಿಗೆ {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,ಡೀಫಾಲ್ಟ್ ಗೋದಾಮಿನ ಆಯ್ಕೆಮಾಡಿದ ಐಟಂ ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},ಬಳಕೆದಾರ {0} ಈಗಾಗಲೇ ವೈದ್ಯರಿಗೆ {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,ಡೀಫಾಲ್ಟ್ ಗೋದಾಮಿನ ಆಯ್ಕೆಮಾಡಿದ ಐಟಂ ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,ಪೆಟ್ಟಿಗೆ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,ಸಂಭಾವ್ಯ ಸರಬರಾಜುದಾರ
 DocType: Budget,Monthly Distribution,ಮಾಸಿಕ ವಿತರಣೆ
@@ -1751,8 +1781,8 @@
 DocType: Sales Partner,Sales Partner Target,ಮಾರಾಟದ ಸಂಗಾತಿ ಟಾರ್ಗೆಟ್
 DocType: Loan Type,Maximum Loan Amount,ಗರಿಷ್ಠ ಸಾಲದ
 DocType: Pricing Rule,Pricing Rule,ಬೆಲೆ ರೂಲ್
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},ವಿದ್ಯಾರ್ಥಿ ನಕಲು ರೋಲ್ ಸಂಖ್ಯೆ {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},ವಿದ್ಯಾರ್ಥಿ ನಕಲು ರೋಲ್ ಸಂಖ್ಯೆ {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},ವಿದ್ಯಾರ್ಥಿ ನಕಲು ರೋಲ್ ಸಂಖ್ಯೆ {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},ವಿದ್ಯಾರ್ಥಿ ನಕಲು ರೋಲ್ ಸಂಖ್ಯೆ {0}
 DocType: Budget,Action if Annual Budget Exceeded,ಆಕ್ಷನ್ ವಾರ್ಷಿಕ ಬಜೆಟ್ ಮೀರಿದ್ದಲ್ಲಿ
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,ಆರ್ಡರ್ ಖರೀದಿಸಿ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
 DocType: Shopping Cart Settings,Payment Success URL,ಪಾವತಿ ಯಶಸ್ಸು URL
@@ -1769,7 +1799,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} ಒಮ್ಮೆ ಮಾತ್ರ ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತವೆ ಮಾಡಬೇಕು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},ಹೆಚ್ಚು ವರ್ಗಾಯಿಸುವುದೇ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ {0} ಹೆಚ್ಚು {1} ಆರ್ಡರ್ ಖರೀದಿಸಿ ವಿರುದ್ಧ {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},ಎಲೆಗಳು ಯಶಸ್ವಿಯಾಗಿ ನಿಗದಿ {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,ಪ್ಯಾಕ್ ಯಾವುದೇ ಐಟಂಗಳು
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,ಪ್ಯಾಕ್ ಯಾವುದೇ ಐಟಂಗಳು
 DocType: Shipping Rule Condition,From Value,FromValue
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,ಮ್ಯಾನುಫ್ಯಾಕ್ಚರಿಂಗ್ ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
 DocType: Employee Loan,Repayment Method,ಮರುಪಾವತಿಯ ವಿಧಾನ
@@ -1783,6 +1813,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,ಸ್ಟಾಕ್ ಭಾದ್ಯತೆಗಳನ್ನು
 DocType: Purchase Invoice,Supplier Warehouse,ಸರಬರಾಜುದಾರ ವೇರ್ಹೌಸ್
 DocType: Opportunity,Contact Mobile No,ಸಂಪರ್ಕಿಸಿ ಮೊಬೈಲ್ ನಂ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ
 ,Material Requests for which Supplier Quotations are not created,ಯಾವ ಸರಬರಾಜುದಾರ ಉಲ್ಲೇಖಗಳು ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ದಾಖಲಿಸಿದವರು ಇಲ್ಲ
 DocType: Student Group,Set 0 for no limit,ಯಾವುದೇ ಮಿತಿ ಹೊಂದಿಸಿ 0
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ನೀವು ರಜೆ ಹಾಕುತ್ತಿವೆ ಮೇಲೆ ದಿನ (ಗಳು) ರಜಾದಿನಗಳು. ನೀವು ರಜೆ ಅನ್ವಯಿಸುವುದಿಲ್ಲ ಅಗತ್ಯವಿದೆ.
@@ -1792,24 +1823,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,ಉದ್ಧರಣ ಮಾಡಿ
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,ಇತರ ವರದಿಗಳು
 DocType: Dependent Task,Dependent Task,ಅವಲಂಬಿತ ಟಾಸ್ಕ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},ಅಳತೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ಪರಿವರ್ತಿಸುವುದರ ಸತತವಾಗಿ 1 ಇರಬೇಕು {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},ಅಳತೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ಪರಿವರ್ತಿಸುವುದರ ಸತತವಾಗಿ 1 ಇರಬೇಕು {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},ರೀತಿಯ ಲೀವ್ {0} ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ಮುಂಚಿತವಾಗಿ ಎಕ್ಸ್ ದಿನಗಳ ಕಾರ್ಯಾಚರಣೆ ಯೋಜನೆ ಪ್ರಯತ್ನಿಸಿ.
 DocType: HR Settings,Stop Birthday Reminders,ನಿಲ್ಲಿಸಿ ಜನ್ಮದಿನ ಜ್ಞಾಪನೆಗಳು
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},ಕಂಪನಿ ರಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ವೇತನದಾರರ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆ ಸೆಟ್ ಮಾಡಿ {0}
 DocType: SMS Center,Receiver List,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,ಹುಡುಕಾಟ ಐಟಂ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,ಹುಡುಕಾಟ ಐಟಂ
 DocType: Patient Appointment,Referring Physician,ವೈದ್ಯರನ್ನು ಉಲ್ಲೇಖಿಸುವುದು
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ಸೇವಿಸುವ ಪ್ರಮಾಣವನ್ನು
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,ನಗದು ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 DocType: Assessment Plan,Grading Scale,ಗ್ರೇಡಿಂಗ್ ಸ್ಕೇಲ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ಅಳತೆಯ ಘಟಕ {0} ಹೆಚ್ಚು ಪರಿವರ್ತಿಸುವುದರ ಟೇಬಲ್ ಒಮ್ಮೆ ಹೆಚ್ಚು ನಮೂದಿಸಲಾದ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,ಈಗಾಗಲೇ
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ಅಳತೆಯ ಘಟಕ {0} ಹೆಚ್ಚು ಪರಿವರ್ತಿಸುವುದರ ಟೇಬಲ್ ಒಮ್ಮೆ ಹೆಚ್ಚು ನಮೂದಿಸಲಾದ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,ಈಗಾಗಲೇ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,ಹ್ಯಾಂಡ್ ರಲ್ಲಿ ಸ್ಟಾಕ್
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},ಪಾವತಿ ವಿನಂತಿ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ನೀಡಲಾಗಿದೆ ಐಟಂಗಳು ವೆಚ್ಚ
 DocType: Physician,Hospital,ಆಸ್ಪತ್ರೆ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},ಪ್ರಮಾಣ ಹೆಚ್ಚು ಇರಬಾರದು {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},ಪ್ರಮಾಣ ಹೆಚ್ಚು ಇರಬಾರದು {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,ಹಿಂದಿನ ಹಣಕಾಸು ವರ್ಷದ ಮುಚ್ಚಿಲ್ಲ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),ವಯಸ್ಸು (ದಿನಗಳು)
 DocType: Quotation Item,Quotation Item,ನುಡಿಮುತ್ತುಗಳು ಐಟಂ
@@ -1820,8 +1851,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,ಸರಬರಾಜುದಾರ ಟೈಪ್ ಮಾಸ್ಟರ್ .
 DocType: Purchase Order Item,Supplier Part Number,ಸರಬರಾಜುದಾರ ಭಾಗ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,ಪರಿವರ್ತನೆ ದರವು 0 ಅಥವಾ 1 ಸಾಧ್ಯವಿಲ್ಲ
-DocType: Sales Invoice,Reference Document,ರೆಫರೆನ್ಸ್ ಡಾಕ್ಯುಮೆಂಟ್
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} ರದ್ದು ಅಥವಾ ನಿಲ್ಲಿಸಿದಾಗ
+DocType: Subscription,Reference Document,ರೆಫರೆನ್ಸ್ ಡಾಕ್ಯುಮೆಂಟ್
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} ರದ್ದು ಅಥವಾ ನಿಲ್ಲಿಸಿದಾಗ
 DocType: Accounts Settings,Credit Controller,ಕ್ರೆಡಿಟ್ ನಿಯಂತ್ರಕ
 DocType: Delivery Note,Vehicle Dispatch Date,ವಾಹನ ಡಿಸ್ಪ್ಯಾಚ್ ದಿನಾಂಕ
 DocType: Healthcare Settings,Default Medical Code Standard,ಡೀಫಾಲ್ಟ್ ವೈದ್ಯಕೀಯ ಕೋಡ್ ಸ್ಟ್ಯಾಂಡರ್ಡ್
@@ -1830,6 +1861,7 @@
 DocType: Company,Default Payable Account,ಡೀಫಾಲ್ಟ್ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆ
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","ಉದಾಹರಣೆಗೆ ಹಡಗು ನಿಯಮಗಳು, ಬೆಲೆ ಪಟ್ಟಿ ಇತ್ಯಾದಿ ಆನ್ಲೈನ್ ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳು"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% ಖ್ಯಾತವಾದ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,ಬೆಲೆ ಪ್ರಕಾರ ವಿಂಗಡಿಸಿ ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,ಕಾಯ್ದಿರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
 DocType: Party Account,Party Account,ಪಕ್ಷದ ಖಾತೆ
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,ಮಾನವ ಸಂಪನ್ಮೂಲ
@@ -1841,13 +1873,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,ವಿತರಣೆ ಎಂಟ್ರಿ ಮಾಡಿ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,ಸಾಲು {0}: ಸರಬರಾಜುದಾರ ವಿರುದ್ಧ ಅಡ್ವಾನ್ಸ್ ಡೆಬಿಟ್ ಮಾಡಬೇಕು
 DocType: Company,Default Values,ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯಗಳು
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{ಆವರ್ತನ} ಡೈಜೆಸ್ಟ್
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{ಆವರ್ತನ} ಡೈಜೆಸ್ಟ್
 DocType: Expense Claim,Total Amount Reimbursed,ಒಟ್ಟು ಪ್ರಮಾಣ ಮತ್ತೆ
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,ಈ ವಾಹನ ವಿರುದ್ಧ ದಾಖಲೆಗಳು ಆಧರಿಸಿದೆ. ಮಾಹಿತಿಗಾಗಿ ಕೆಳಗೆ ಟೈಮ್ಲೈನ್ ನೋಡಿ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},ಸರಬರಾಜುದಾರ ವಿರುದ್ಧ ಸರಕುಪಟ್ಟಿ {0} ರ {1}
 DocType: Customer,Default Price List,ಡೀಫಾಲ್ಟ್ ಬೆಲೆ ಪಟ್ಟಿ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,ಆಸ್ತಿ ಚಳವಳಿ ದಾಖಲೆ {0} ದಾಖಲಿಸಿದವರು
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,ನೀವು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಹಣಕಾಸಿನ ವರ್ಷದ {0}. ಹಣಕಾಸಿನ ವರ್ಷ {0} ಜಾಗತಿಕ ಸೆಟ್ಟಿಂಗ್ಗಳು ಡೀಫಾಲ್ಟ್ ಆಗಿ ಹೊಂದಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,ಅದೇ ಹೆಸರಿನ ಗ್ರಾಹಕರು ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದಾರೆ
 DocType: Journal Entry,Entry Type,ಎಂಟ್ರಿ ಟೈಪ್
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,ಈ ಸಲಹೆಯನ್ನು ಗುಂಪು ಸಂಬಂಧ ಇಲ್ಲ ಮೌಲ್ಯಮಾಪನ ಯೋಜನೆಯನ್ನು
 ,Customer Credit Balance,ಗ್ರಾಹಕ ಕ್ರೆಡಿಟ್ ಬ್ಯಾಲೆನ್ಸ್
@@ -1858,7 +1891,7 @@
 DocType: Quotation,Term Details,ಟರ್ಮ್ ವಿವರಗಳು
 DocType: Project,Total Sales Cost (via Sales Order),ಒಟ್ಟು ಮಾರಾಟದ ವೆಚ್ಚ (ಮಾರಾಟದ ಆರ್ಡರ್ ಮೂಲಕ)
 DocType: Project,Total Sales Cost (via Sales Order),ಒಟ್ಟು ಮಾರಾಟದ ವೆಚ್ಚ (ಮಾರಾಟದ ಆರ್ಡರ್ ಮೂಲಕ)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,{0} ಈ ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ವಿದ್ಯಾರ್ಥಿಗಳನ್ನು ಹೆಚ್ಚು ದಾಖಲಿಸಲಾಗುವುದಿಲ್ಲ.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,{0} ಈ ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ವಿದ್ಯಾರ್ಥಿಗಳನ್ನು ಹೆಚ್ಚು ದಾಖಲಿಸಲಾಗುವುದಿಲ್ಲ.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ಲೀಡ್ ಕೌಂಟ್
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ಲೀಡ್ ಕೌಂಟ್
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 ಹೆಚ್ಚು ಇರಬೇಕು
@@ -1876,9 +1909,11 @@
 DocType: Lab Test,Technician Name,ತಂತ್ರಜ್ಞ ಹೆಸರು
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ಸರಕುಪಟ್ಟಿ ರದ್ದು ಮೇಲೆ ಪಾವತಿ ಅನ್ಲಿಂಕ್
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},ಪ್ರವೇಶಿಸಿತು ಪ್ರಸ್ತುತ ದೂರಮಾಪಕ ಓದುವ ಆರಂಭಿಕ ವಾಹನ ದೂರಮಾಪಕ ಹೆಚ್ಚು ಇರಬೇಕು {0}
+DocType: Restaurant Reservation,No Show,ಶೋ ಇಲ್ಲ
 DocType: Shipping Rule Country,Shipping Rule Country,ಶಿಪ್ಪಿಂಗ್ ಆಡಳಿತ
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,ಬಿಟ್ಟು ಅಟೆಂಡೆನ್ಸ್
 DocType: Maintenance Visit,Partially Completed,ಭಾಗಶಃ ಪೂರ್ಣಗೊಂಡಿತು
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,ಮಧ್ಯಮ ಸೂಕ್ಷ್ಮತೆ
 DocType: Leave Type,Include holidays within leaves as leaves,ಎಲೆಗಳು ಎಲೆಗಳು ಒಳಗೆ ರಜಾ ಸೇರಿಸಿ
 DocType: Sales Invoice,Packed Items,ಪ್ಯಾಕ್ ಐಟಂಗಳು
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,ಸೀರಿಯಲ್ ನಂ ವಿರುದ್ಧ ಖಾತರಿ ಹಕ್ಕು
@@ -1895,13 +1930,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),ಪಾವತಿಸಿದ ಮೊತ್ತಕ್ಕೆ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 DocType: Purchase Invoice,Additional Discount,ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ
 DocType: Selling Settings,Selling Settings,ಸೆಟ್ಟಿಂಗ್ಗಳು ಮಾರಾಟ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,ಕ್ರಿಯೆ ದೃಢೀಕರಿಸಿ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ಆನ್ಲೈನ್ ಹರಾಜಿನಲ್ಲಿ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯಾಂಕನ ದರ ಅಥವಾ ಎರಡೂ ಸೂಚಿಸಲು ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,ಈಡೇರಿದ
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,ಕಾರ್ಟ್ ವೀಕ್ಷಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,ಮಾರ್ಕೆಟಿಂಗ್ ವೆಚ್ಚಗಳು
 ,Item Shortage Report,ಐಟಂ ಕೊರತೆ ವರದಿ
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ತೂಕ ತುಂಬಾ ""ತೂಕ ಮೈ.ವಿ.ವಿ.ಯ"" ನೀಡಿರಿ \n, ಉಲ್ಲೇಖಿಸಲಾಗಿದೆ"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ತೂಕ ತುಂಬಾ ""ತೂಕ ಮೈ.ವಿ.ವಿ.ಯ"" ನೀಡಿರಿ \n, ಉಲ್ಲೇಖಿಸಲಾಗಿದೆ"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ಈ ನೆಲದ ಎಂಟ್ರಿ ಮಾಡಲು ಬಳಸಲಾಗುತ್ತದೆ ವಿನಂತಿ ವಸ್ತು
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಹೊಸ ಆಸ್ತಿ ಕಡ್ಡಾಯವಾಗಿದೆ
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,ಪ್ರತಿ ಬ್ಯಾಚ್ ಪ್ರತ್ಯೇಕ ಕೋರ್ಸನ್ನು ಗುಂಪು
@@ -1914,12 +1950,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ಪ್ರತಿ ಸ್ಟಾಕ್ ಚಳುವಳಿ ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ ಮಾಡಿ
 DocType: Leave Allocation,Total Leaves Allocated,ನಿಗದಿ ಒಟ್ಟು ಎಲೆಗಳು
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},ರೋ ಯಾವುದೇ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,ಮಾನ್ಯ ಹಣಕಾಸು ವರ್ಷದ ಆರಂಭ ಮತ್ತು ಅಂತಿಮ ದಿನಾಂಕ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,ಮಾನ್ಯ ಹಣಕಾಸು ವರ್ಷದ ಆರಂಭ ಮತ್ತು ಅಂತಿಮ ದಿನಾಂಕ ನಮೂದಿಸಿ
 DocType: Employee,Date Of Retirement,ನಿವೃತ್ತಿ ದಿನಾಂಕ
 DocType: Upload Attendance,Get Template,ಟೆಂಪ್ಲೆಟ್ ಪಡೆಯಿರಿ
 DocType: Material Request,Transferred,ವರ್ಗಾಯಿಸಲ್ಪಟ್ಟ
 DocType: Vehicle,Doors,ಡೋರ್ಸ್
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext ಸೆಟಪ್ ಪೂರ್ಣಗೊಳಿಸಿ!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext ಸೆಟಪ್ ಪೂರ್ಣಗೊಳಿಸಿ!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,ರೋಗಿಯ ನೋಂದಣಿಗಾಗಿ ಶುಲ್ಕ ಸಂಗ್ರಹಿಸಿ
 DocType: Course Assessment Criteria,Weightage,weightage
 DocType: Purchase Invoice,Tax Breakup,ತೆರಿಗೆ ಬ್ರೇಕ್ಅಪ್
@@ -1938,37 +1974,37 @@
 DocType: Employee,AB+,ಎಬಿ +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","ಈ ಐಟಂ ವೇರಿಯಂಟ್, ಅದು ಮಾರಾಟ ಆದೇಶಗಳಿಗೆ ಇತ್ಯಾದಿ ಆಯ್ಕೆ ಸಾಧ್ಯವಿಲ್ಲ"
 DocType: Lead,Next Contact By,ಮುಂದೆ ಸಂಪರ್ಕಿಸಿ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},ಐಟಂ ಬೇಕಾದ ಪ್ರಮಾಣ {0} ಸತತವಾಗಿ {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},ಐಟಂ ಬೇಕಾದ ಪ್ರಮಾಣ {0} ಸತತವಾಗಿ {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},ಪ್ರಮಾಣ ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಎಂದು ವೇರ್ಹೌಸ್ {0} ಅಳಿಸಲಾಗಿಲ್ಲ {1}
 DocType: Quotation,Order Type,ಆರ್ಡರ್ ಪ್ರಕಾರ
-DocType: Purchase Invoice,Notification Email Address,ಅಧಿಸೂಚನೆ ಇಮೇಲ್ ವಿಳಾಸವನ್ನು
 ,Item-wise Sales Register,ಐಟಂ ಬಲ್ಲ ಮಾರಾಟದ ರಿಜಿಸ್ಟರ್
 DocType: Asset,Gross Purchase Amount,ಒಟ್ಟು ಖರೀದಿಯ ಮೊತ್ತ
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,ಬ್ಯಾಲೆನ್ಸ್ ತೆರೆಯುವುದು
 DocType: Asset,Depreciation Method,ಸವಕಳಿ ವಿಧಾನ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,ಆಫ್ಲೈನ್
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,ಆಫ್ಲೈನ್
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,ಈ ಮೂಲ ದರದ ತೆರಿಗೆ ಒಳಗೊಂಡಿದೆ?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,ಒಟ್ಟು ಟಾರ್ಗೆಟ್
 DocType: Job Applicant,Applicant for a Job,ಒಂದು ಜಾಬ್ ಅರ್ಜಿದಾರರ
 DocType: Production Plan Material Request,Production Plan Material Request,ಪ್ರೊಡಕ್ಷನ್ ಯೋಜನೆ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,ದಾಖಲಿಸಿದವರು ಯಾವುದೇ ನಿರ್ಮಾಣ ಆದೇಶಗಳನ್ನು
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,ದಾಖಲಿಸಿದವರು ಯಾವುದೇ ನಿರ್ಮಾಣ ಆದೇಶಗಳನ್ನು
 DocType: Stock Reconciliation,Reconciliation JSON,ಸಾಮರಸ್ಯ JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ಹಲವು ಕಾಲಮ್ಗಳನ್ನು. ವರದಿಯನ್ನು ರಫ್ತು ಸ್ಪ್ರೆಡ್ಶೀಟ್ ಅಪ್ಲಿಕೇಶನ್ ಬಳಸಿಕೊಂಡು ಅದನ್ನು ಮುದ್ರಿಸಲು.
 DocType: Purchase Invoice Item,Batch No,ಬ್ಯಾಚ್ ನಂ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},ಉದ್ಧರಣಕ್ಕಾಗಿ ವಿನಂತಿ: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,ಗ್ರಾಹಕರ ಖರೀದಿ ಆದೇಶದ ವಿರುದ್ಧ ಅನೇಕ ಮಾರಾಟ ಆದೇಶಗಳಿಗೆ ಅವಕಾಶ
 DocType: Student Group Instructor,Student Group Instructor,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಬೋಧಕ
 DocType: Student Group Instructor,Student Group Instructor,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಬೋಧಕ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 ಮೊಬೈಲ್ ಇಲ್ಲ
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,ಮುಖ್ಯ
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,ಮುಖ್ಯ
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,ಭಿನ್ನ
 DocType: Naming Series,Set prefix for numbering series on your transactions,ನಿಮ್ಮ ವ್ಯವಹಾರಗಳ ಮೇಲೆ ಸರಣಿ ಸಂಖ್ಯೆಗಳನ್ನು ಹೊಂದಿಸಿ ಪೂರ್ವಪ್ರತ್ಯಯ
 DocType: Employee Attendance Tool,Employees HTML,ನೌಕರರು ಎಚ್ಟಿಎಮ್ಎಲ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,ಡೀಫಾಲ್ಟ್ BOM ({0}) ಈ ಐಟಂ ಅಥವಾ ಅದರ ಟೆಂಪ್ಲೇಟ್ ಸಕ್ರಿಯ ಇರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,ಡೀಫಾಲ್ಟ್ BOM ({0}) ಈ ಐಟಂ ಅಥವಾ ಅದರ ಟೆಂಪ್ಲೇಟ್ ಸಕ್ರಿಯ ಇರಬೇಕು
 DocType: Employee,Leave Encashed?,Encashed ಬಿಡಿ ?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ಕ್ಷೇತ್ರದ ಅವಕಾಶ ಕಡ್ಡಾಯ
 DocType: Email Digest,Annual Expenses,ವಾರ್ಷಿಕ ವೆಚ್ಚಗಳು
 DocType: Item,Variants,ರೂಪಾಂತರಗಳು
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,ಮಾಡಿ ಪರ್ಚೇಸ್ ಆರ್ಡರ್
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,ಮಾಡಿ ಪರ್ಚೇಸ್ ಆರ್ಡರ್
 DocType: SMS Center,Send To,ಕಳಿಸಿ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},ಲೀವ್ ಪ್ರಕಾರ ಸಾಕಷ್ಟು ರಜೆ ಸಮತೋಲನ ಇಲ್ಲ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು
@@ -1986,6 +2022,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಸಾಮರ್ಥ್ಯ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,ಜರ್ನಲ್ ವಿರುದ್ಧ ಎಂಟ್ರಿ {0} ಯಾವುದೇ ಸಾಟಿಯಿಲ್ಲದ {1} ದಾಖಲೆಗಳನ್ನು ಹೊಂದಿಲ್ಲ
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,ರೀತಿಗೆ
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,ತರಬೇತಿ ಘಟನೆಗಳು
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},ಐಟಂ ಪ್ರವೇಶಿಸಿತು ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ನಕಲು {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ಒಂದು ಶಿಪ್ಪಿಂಗ್ ರೂಲ್ ಒಂದು ಸ್ಥಿತಿ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,ದಯವಿಟ್ಟು ನಮೂದಿಸಿ
@@ -1995,7 +2032,7 @@
 DocType: Sales Order,To Deliver and Bill,ತಲುಪಿಸಿ ಮತ್ತು ಬಿಲ್
 DocType: Student Group,Instructors,ತರಬೇತುದಾರರು
 DocType: GL Entry,Credit Amount in Account Currency,ಖಾತೆ ಕರೆನ್ಸಿ ಕ್ರೆಡಿಟ್ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,ಬಿಒಎಮ್ {0} ಸಲ್ಲಿಸಬೇಕು
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,ಬಿಒಎಮ್ {0} ಸಲ್ಲಿಸಬೇಕು
 DocType: Authorization Control,Authorization Control,ಅಧಿಕಾರ ಕಂಟ್ರೋಲ್
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ರೋ # {0}: ವೇರ್ಹೌಸ್ ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ತಿರಸ್ಕರಿಸಿದರು ಐಟಂ ವಿರುದ್ಧ ಕಡ್ಡಾಯ {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,ಪಾವತಿ
@@ -2014,11 +2051,11 @@
 DocType: Quotation Item,Actual Qty,ನಿಜವಾದ ಪ್ರಮಾಣ
 DocType: Sales Invoice Item,References,ಉಲ್ಲೇಖಗಳು
 DocType: Quality Inspection Reading,Reading 10,10 ಓದುವಿಕೆ
-DocType: Hub Settings,Hub Node,ಹಬ್ ನೋಡ್
+DocType: Hub Category,Hub Node,ಹಬ್ ನೋಡ್
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,ನೀವು ನಕಲಿ ಐಟಂಗಳನ್ನು ನಮೂದಿಸಿದ್ದೀರಿ. ನಿವಾರಿಸಿಕೊಳ್ಳಲು ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ .
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,ಜತೆಗೂಡಿದ
 DocType: Asset Movement,Asset Movement,ಆಸ್ತಿ ಮೂವ್ಮೆಂಟ್
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,ಹೊಸ ಕಾರ್ಟ್
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,ಹೊಸ ಕಾರ್ಟ್
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,ಐಟಂ {0} ಒಂದು ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ ಅಲ್ಲ
 DocType: SMS Center,Create Receiver List,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ ರಚಿಸಿ
 DocType: Vehicle,Wheels,ವೀಲ್ಸ್
@@ -2032,15 +2069,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,ದೂರಸಂಪರ್ಕ
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),ಪ್ಯಾಕೇಜ್ ಈ ವಿತರಣಾ ಒಂದು ಭಾಗ ಎಂದು ಸೂಚಿಸುತ್ತದೆ (ಮಾತ್ರ Draft)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,ಪಾವತಿ ಎಂಟ್ರಿ ಮಾಡಿ
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},ಪ್ರಮಾಣ ಐಟಂ {0} ಕಡಿಮೆ ಇರಬೇಕು {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},ಪ್ರಮಾಣ ಐಟಂ {0} ಕಡಿಮೆ ಇರಬೇಕು {1}
 ,Sales Invoice Trends,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಟ್ರೆಂಡ್ಸ್
 DocType: Leave Application,Apply / Approve Leaves,ಎಲೆಗಳು ಅನುಮೋದಿಸಿ / ಅನ್ವಯಿಸು
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,ಫಾರ್
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,ಫಾರ್
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',ಬ್ಯಾಚ್ ಮಾದರಿ ಅಥವಾ ' ಹಿಂದಿನ ರೋ ಒಟ್ಟು ' ' ಹಿಂದಿನ ರೋ ಪ್ರಮಾಣ ರಂದು ' ಮಾತ್ರ ಸಾಲು ಉಲ್ಲೇಖಿಸಬಹುದು
 DocType: Sales Order Item,Delivery Warehouse,ಡೆಲಿವರಿ ವೇರ್ಹೌಸ್
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,ಆರ್ಥಿಕ ವೆಚ್ಚ ಸೆಂಟರ್ಸ್ ಟ್ರೀ.
 DocType: Serial No,Delivery Document No,ಡೆಲಿವರಿ ಡಾಕ್ಯುಮೆಂಟ್ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},ಕಂಪನಿಯಲ್ಲಿ &#39;ಆಸ್ತಿ ವಿಲೇವಾರಿ ಮೇಲೆ ಗಳಿಕೆ / ನಷ್ಟ ಖಾತೆ&#39; ಸೆಟ್ ಮಾಡಿ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},ಕಂಪನಿಯಲ್ಲಿ &#39;ಆಸ್ತಿ ವಿಲೇವಾರಿ ಮೇಲೆ ಗಳಿಕೆ / ನಷ್ಟ ಖಾತೆ&#39; ಸೆಟ್ ಮಾಡಿ {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,ಖರೀದಿ ರಸೀದಿಗಳನ್ನು ವಸ್ತುಗಳನ್ನು ಪಡೆಯಲು
 DocType: Serial No,Creation Date,ರಚನೆ ದಿನಾಂಕ
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},ಐಟಂ {0} ಬೆಲೆ ಪಟ್ಟಿ ಅನೇಕ ಬಾರಿ ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತದೆ {1}
@@ -2051,12 +2088,13 @@
 DocType: Student,Student Mobile Number,ವಿದ್ಯಾರ್ಥಿ ಮೊಬೈಲ್ ಸಂಖ್ಯೆ
 DocType: Item,Has Variants,ವೇರಿಯಂಟ್
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,ಅಪ್ಡೇಟ್ ಪ್ರತಿಕ್ರಿಯೆ
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},ನೀವು ಈಗಾಗಲೇ ಆಯ್ಕೆ ಐಟಂಗಳನ್ನು ಎಂದು {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},ನೀವು ಈಗಾಗಲೇ ಆಯ್ಕೆ ಐಟಂಗಳನ್ನು ಎಂದು {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ಮಾಸಿಕ ವಿತರಣೆ ಹೆಸರು
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ಬ್ಯಾಚ್ ID ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ಬ್ಯಾಚ್ ID ಕಡ್ಡಾಯ
 DocType: Sales Person,Parent Sales Person,ಪೋಷಕ ಮಾರಾಟಗಾರ್ತಿ
-DocType: Purchase Invoice,Recurring Invoice,ಮರುಕಳಿಸುವ ಸರಕುಪಟ್ಟಿ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,ಕಡಿಮೆ ಮಟ್ಟದಿಂದ
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,ಮೊದಲು ಪ್ರೋಗ್ರಾಂ ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Patient Appointment,Patient Age,ರೋಗಿಯ ವಯಸ್ಸು
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,ಯೋಜನೆಗಳ ವ್ಯವಸ್ಥಾಪಕ
 DocType: Supplier,Supplier of Goods or Services.,ಸರಕುಗಳು ಅಥವಾ ಸೇವೆಗಳ ಪೂರೈಕೆದಾರ.
@@ -2064,8 +2102,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,ಕನ್ಸಲ್ಟೇಶನ್ ಆರೋಪಗಳನ್ನು ಬುಕ್ ಮಾಡಲು ರೋಗಿಯಲ್ಲಿ ಹೊಂದಿಸದಿದ್ದಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಸ್ವೀಕಾರಾರ್ಹ ಖಾತೆಗಳನ್ನು ಬಳಸಲಾಗುತ್ತದೆ.
 DocType: Vehicle Log,Fuel Price,ಇಂಧನ ಬೆಲೆ
 DocType: Budget,Budget,ಮುಂಗಡಪತ್ರ
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,ತೆರೆಯಿರಿ ಹೊಂದಿಸಿ
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,ತೆರೆಯಿರಿ ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",ಇದು ಆದಾಯ ಅಥವಾ ಖರ್ಚುವೆಚ್ಚ ಅಲ್ಲ ಎಂದು ಬಜೆಟ್ ವಿರುದ್ಧ {0} ನಿಯೋಜಿಸಲಾಗುವುದು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,ಸಾಧಿಸಿದ
 DocType: Student Admission,Application Form Route,ಅಪ್ಲಿಕೇಶನ್ ಫಾರ್ಮ್ ಮಾರ್ಗ
@@ -2079,12 +2117,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,ಐಟಂ {0} ಸೀರಿಯಲ್ ಸಂಖ್ಯೆ ಸ್ಥಾಪನೆಯ ಅಲ್ಲ ಐಟಂ ಮಾಸ್ಟರ್ ಪರಿಶೀಲಿಸಿ
 DocType: Maintenance Visit,Maintenance Time,ನಿರ್ವಹಣೆ ಟೈಮ್
 ,Amount to Deliver,ಪ್ರಮಾಣವನ್ನು ಬಿಡುಗಡೆಗೊಳಿಸಲು
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},ಒಂದೇ ಐಟಂ ಅನ್ನು ಅನೇಕ ಬಾರಿ ನಮೂದಿಸಲಾಗಿದೆ. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ಟರ್ಮ್ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಶೈಕ್ಷಣಿಕ ವರ್ಷದ ಪ್ರಾರಂಭ ವರ್ಷ ದಿನಾಂಕ ಪದವನ್ನು ಸಂಪರ್ಕಿತ ಮುಂಚಿತವಾಗಿರಬೇಕು ಸಾಧ್ಯವಿಲ್ಲ (ಅಕಾಡೆಮಿಕ್ ಇಯರ್ {}). ದಯವಿಟ್ಟು ದಿನಾಂಕಗಳನ್ನು ಸರಿಪಡಿಸಲು ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.
 DocType: Guardian,Guardian Interests,ಗಾರ್ಡಿಯನ್ ಆಸಕ್ತಿಗಳು
 DocType: Naming Series,Current Value,ಪ್ರಸ್ತುತ ಮೌಲ್ಯ
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ಬಹು ಹಣಕಾಸಿನ ವರ್ಷಗಳ ದಿನಾಂಕ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿವೆ. ದಯವಿಟ್ಟು ವರ್ಷದಲ್ಲಿ ಕಂಪನಿ ಸೆಟ್
 DocType: School Settings,Instructor Records to be created by,ಇನ್ಸ್ಟ್ರಕ್ಟರ್ ರೆಕಾರ್ಡ್ಸ್ ರಚಿಸಬೇಕಾಗಿದೆ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} ದಾಖಲಿಸಿದವರು
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} ದಾಖಲಿಸಿದವರು
 DocType: Delivery Note Item,Against Sales Order,ಮಾರಾಟದ ಆದೇಶದ ವಿರುದ್ಧ
 ,Serial No Status,ಯಾವುದೇ ಸೀರಿಯಲ್ ಸ್ಥಿತಿ
 DocType: Payment Entry Reference,Outstanding,ಅತ್ಯುತ್ತಮ
@@ -2095,10 +2134,10 @@
  ಗೆ ನಡುವಿನ ವ್ಯತ್ಯಾಸ ಹೆಚ್ಚು ಅಥವಾ ಸಮನಾಗಿರಬೇಕು {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,ಈ ಸ್ಟಾಕ್ ಚಲನೆಯನ್ನು ಆಧರಿಸಿದೆ. ನೋಡಿ {0} ವಿವರಗಳಿಗಾಗಿ
 DocType: Pricing Rule,Selling,ವಿಕ್ರಯ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},ಪ್ರಮಾಣ {0} {1} ವಿರುದ್ಧ ಕಡಿತಗೊಳಿಸಲಾಗುತ್ತದೆ {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},ಪ್ರಮಾಣ {0} {1} ವಿರುದ್ಧ ಕಡಿತಗೊಳಿಸಲಾಗುತ್ತದೆ {2}
 DocType: Employee,Salary Information,ವೇತನ ಮಾಹಿತಿ
 DocType: Sales Person,Name and Employee ID,ಹೆಸರು ಮತ್ತು ಉದ್ಯೋಗಿಗಳ ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,ಕಾರಣ ದಿನಾಂಕ ದಿನಾಂಕ ಪೋಸ್ಟ್ ಮುನ್ನ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,ಕಾರಣ ದಿನಾಂಕ ದಿನಾಂಕ ಪೋಸ್ಟ್ ಮುನ್ನ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Website Item Group,Website Item Group,ಐಟಂ ಗ್ರೂಪ್ ವೆಬ್ಸೈಟ್
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,ಕರ್ತವ್ಯಗಳು ಮತ್ತು ತೆರಿಗೆಗಳು
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ನಮೂದಿಸಿ
@@ -2124,7 +2163,7 @@
 DocType: Issue,Resolution Details,ರೆಸಲ್ಯೂಶನ್ ವಿವರಗಳು
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ಹಂಚಿಕೆಯು
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,ಒಪ್ಪಿಕೊಳ್ಳುವ ಅಳತೆಗೋಲುಗಳನ್ನು
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,ದಯವಿಟ್ಟು ಮೇಲಿನ ಕೋಷ್ಟಕದಲ್ಲಿ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ನಮೂದಿಸಿ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,ದಯವಿಟ್ಟು ಮೇಲಿನ ಕೋಷ್ಟಕದಲ್ಲಿ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ನಮೂದಿಸಿ
 DocType: Item Attribute,Attribute Name,ಹೆಸರು ಕಾರಣವಾಗಿದ್ದು
 DocType: BOM,Show In Website,ವೆಬ್ಸೈಟ್ ಹೋಗಿ
 DocType: Shopping Cart Settings,Show Quantity in Website,ವೆಬ್ಸೈಟ್ ಪ್ರಮಾಣ ತೋರಿಸಿ
@@ -2133,7 +2172,7 @@
 DocType: Item Reorder,Check in (group),ಚೆಕ್ (ಗುಂಪು)
 ,Qty to Order,ಪ್ರಮಾಣ ಆರ್ಡರ್
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","ಹೊಣೆಗಾರಿಕೆ ಅಥವಾ ಇಕ್ವಿಟಿ ಅಡಿಯಲ್ಲಿ ಖಾತೆಯನ್ನು ತಲೆ, ಇದರಲ್ಲಿ ಲಾಭ / ನಷ್ಟ ಕಾಯ್ದಿರಿಸಬೇಕು"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,ಎಲ್ಲಾ ಕಾರ್ಯಗಳ ಗಂಟ್ ಚಾರ್ಟ್ .
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,ಎಲ್ಲಾ ಕಾರ್ಯಗಳ ಗಂಟ್ ಚಾರ್ಟ್ .
 DocType: Opportunity,Mins to First Response,ಮೊದಲ ಪ್ರತಿಕ್ರಿಯೆ ನಿಮಿಷಗಳು
 DocType: Pricing Rule,Margin Type,ಮಾರ್ಜಿನ್ ಕೌಟುಂಬಿಕತೆ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} ಗಂಟೆಗಳ
@@ -2155,36 +2194,36 @@
 DocType: Patient,Surgical History,ಸರ್ಜಿಕಲ್ ಹಿಸ್ಟರಿ
 DocType: Employee,Resignation Letter Date,ರಾಜೀನಾಮೆ ಪತ್ರ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,ಬೆಲೆ ನಿಯಮಗಳಲ್ಲಿ ಮತ್ತಷ್ಟು ಪ್ರಮಾಣವನ್ನು ಆಧರಿಸಿ ಫಿಲ್ಟರ್.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},ನೌಕರ ಸೇರುವ ದಿನಾಂಕ ದಯವಿಟ್ಟು {0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},ನೌಕರ ಸೇರುವ ದಿನಾಂಕ ದಯವಿಟ್ಟು {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},ನೌಕರ ಸೇರುವ ದಿನಾಂಕ ದಯವಿಟ್ಟು {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},ನೌಕರ ಸೇರುವ ದಿನಾಂಕ ದಯವಿಟ್ಟು {0}
 DocType: Task,Total Billing Amount (via Time Sheet),ಒಟ್ಟು ಬಿಲ್ಲಿಂಗ್ ಪ್ರಮಾಣ (ಟೈಮ್ ಶೀಟ್ ಮೂಲಕ)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ಪುನರಾವರ್ತಿತ ಗ್ರಾಹಕ ಕಂದಾಯ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ಪಾತ್ರ 'ಖರ್ಚು ಅನುಮೋದಕ' ಆಗಿರಬೇಕು
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,ಜೋಡಿ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,ಪ್ರೊಡಕ್ಷನ್ ಬಿಒಎಮ್ ಮತ್ತು ಪ್ರಮಾಣ ಆಯ್ಕೆ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,ಪ್ರೊಡಕ್ಷನ್ ಬಿಒಎಮ್ ಮತ್ತು ಪ್ರಮಾಣ ಆಯ್ಕೆ
 DocType: Asset,Depreciation Schedule,ಸವಕಳಿ ವೇಳಾಪಟ್ಟಿ
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,ಮಾರಾಟದ ಸಂಗಾತಿ ವಿಳಾಸಗಳು ಮತ್ತು ಸಂಪರ್ಕಗಳು
 DocType: Bank Reconciliation Detail,Against Account,ಖಾತೆ ವಿರುದ್ಧ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,ಅರ್ಧ ದಿನ ದಿನಾಂಕ ದಿನಾಂಕದಿಂದ ಮತ್ತು ದಿನಾಂಕ ನಡುವೆ ಇರಬೇಕು
 DocType: Maintenance Schedule Detail,Actual Date,ನಿಜವಾದ ದಿನಾಂಕ
 DocType: Item,Has Batch No,ಬ್ಯಾಚ್ ನಂ ಹೊಂದಿದೆ
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},ವಾರ್ಷಿಕ ಬಿಲ್ಲಿಂಗ್: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},ವಾರ್ಷಿಕ ಬಿಲ್ಲಿಂಗ್: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),ಸರಕು ಮತ್ತು ಸೇವಾ ತೆರಿಗೆ (ಜಿಎಸ್ಟಿ ಭಾರತ)
 DocType: Delivery Note,Excise Page Number,ಅಬಕಾರಿ ಪುಟ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","ಕಂಪನಿ, ಈ ದಿನಾಂಕದಿಂದ ಮತ್ತು ದಿನಾಂಕ ಕಡ್ಡಾಯ"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,ಸಮಾಲೋಚನೆಯಿಂದ ಪಡೆಯಿರಿ
 DocType: Asset,Purchase Date,ಖರೀದಿಸಿದ ದಿನಾಂಕ
 DocType: Employee,Personal Details,ವೈಯಕ್ತಿಕ ವಿವರಗಳು
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},ದಯವಿಟ್ಟು ಕಂಪನಿಯಲ್ಲಿ &#39;ಆಸ್ತಿ ಸವಕಳಿ ವೆಚ್ಚದ ಕೇಂದ್ರ&#39; ಸೆಟ್ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},ದಯವಿಟ್ಟು ಕಂಪನಿಯಲ್ಲಿ &#39;ಆಸ್ತಿ ಸವಕಳಿ ವೆಚ್ಚದ ಕೇಂದ್ರ&#39; ಸೆಟ್ {0}
 ,Maintenance Schedules,ನಿರ್ವಹಣಾ ವೇಳಾಪಟ್ಟಿಗಳು
 DocType: Task,Actual End Date (via Time Sheet),ನಿಜವಾದ ಅಂತಿಮ ದಿನಾಂಕ (ಟೈಮ್ ಶೀಟ್ ಮೂಲಕ)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},ಪ್ರಮಾಣ {0} {1} ವಿರುದ್ಧ {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},ಪ್ರಮಾಣ {0} {1} ವಿರುದ್ಧ {2} {3}
 ,Quotation Trends,ನುಡಿಮುತ್ತುಗಳು ಟ್ರೆಂಡ್ಸ್
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},ಐಟಂ ಐಟಂ ಮಾಸ್ಟರ್ ಉಲ್ಲೇಖಿಸಿಲ್ಲ ಐಟಂ ಗ್ರೂಪ್ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಒಂದು ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಯನ್ನು ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಒಂದು ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಯನ್ನು ಇರಬೇಕು
 DocType: Shipping Rule Condition,Shipping Amount,ಶಿಪ್ಪಿಂಗ್ ಪ್ರಮಾಣ
 DocType: Supplier Scorecard Period,Period Score,ಅವಧಿ ಸ್ಕೋರ್
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,ಗ್ರಾಹಕರು ಸೇರಿಸಿ
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,ಗ್ರಾಹಕರು ಸೇರಿಸಿ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,ಬಾಕಿ ಪ್ರಮಾಣ
 DocType: Lab Test Template,Special,ವಿಶೇಷ
 DocType: Purchase Invoice Item,Conversion Factor,ಪರಿವರ್ತಿಸುವುದರ
@@ -2192,13 +2231,14 @@
 ,Vehicle Expenses,ವಾಹನ ವೆಚ್ಚಗಳು
 DocType: Serial No,Invoice Details,ಇನ್ವಾಯ್ಸ್ ವಿವರಗಳು
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},ಉಪಯುಕ್ತ ಜೀವನದ ನಂತರ ನಿರೀಕ್ಷಿತ ಮೌಲ್ಯ ಹೆಚ್ಚು ಅಥವಾ ಸಮನಾಗಿರಬೇಕು {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,ಪ್ರಾರಂಭಿಸಿ
+DocType: Hub Category,Hub Category,ಹಬ್ ವರ್ಗ
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,ವಾಹನ ಸಂಖ್ಯೆ
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,ಮರುಕಳಿಸುವ ಸರಕುಪಟ್ಟಿ ಸ್ಟಾಪ್ ಯಾವ ದಿನಾಂಕ
 DocType: Employee Loan,Loan Amount,ಸಾಲದ ಪ್ರಮಾಣ
 DocType: Program Enrollment,Self-Driving Vehicle,ಸ್ವಯಂ ಚಾಲಕ ವಾಹನ
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,ಸರಬರಾಜುದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ಸ್ಥಾಯಿ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},ಸಾಲು {0}: ಮೆಟೀರಿಯಲ್ಸ್ ಬಿಲ್ ಐಟಂ ಕಂಡುಬಂದಿಲ್ಲ {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},ಸಾಲು {0}: ಮೆಟೀರಿಯಲ್ಸ್ ಬಿಲ್ ಐಟಂ ಕಂಡುಬಂದಿಲ್ಲ {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,ಒಟ್ಟು ಹಂಚಿಕೆ ಎಲೆಗಳು {0} ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ ಕಾಲ ಈಗಾಗಲೇ ಅನುಮೋದನೆ ಎಲೆಗಳು {1} ಹೆಚ್ಚು
 DocType: Journal Entry,Accounts Receivable,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಗಳು
 ,Supplier-Wise Sales Analytics,ಸರಬರಾಜುದಾರ ವೈಸ್ ಮಾರಾಟದ ಅನಾಲಿಟಿಕ್ಸ್
@@ -2210,7 +2250,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","ಪೋಷಕ ಕೋರ್ಸ್ (ಈ ಪೋಷಕ ಕೋರ್ಸ್ ಭಾಗವಾಗಿ ವೇಳೆ, ಖಾಲಿ ಬಿಡಿ)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,ಎಲ್ಲಾ ನೌಕರ ರೀತಿಯ ಪರಿಗಣಿಸಲಾಗಿದೆ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
 DocType: Landed Cost Voucher,Distribute Charges Based On,ವಿತರಿಸಲು ಆರೋಪಗಳ ಮೇಲೆ
-apps/erpnext/erpnext/hooks.py +131,Timesheets,timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,timesheets
 DocType: HR Settings,HR Settings,ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Salary Slip,net pay info,ನಿವ್ವಳ ವೇತನ ಮಾಹಿತಿಯನ್ನು
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,ಈ ಮೌಲ್ಯವನ್ನು ಡೀಫಾಲ್ಟ್ ಮಾರಾಟದ ಬೆಲೆ ಪಟ್ಟಿನಲ್ಲಿ ನವೀಕರಿಸಲಾಗಿದೆ.
@@ -2221,7 +2261,7 @@
 DocType: Patient,B Positive,ಬಿ ಧನಾತ್ಮಕ
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ರೋ # {0}: ಪ್ರಮಾಣ 1, ಐಟಂ ಸ್ಥಿರ ಆಸ್ತಿ ಇರಬೇಕು. ದಯವಿಟ್ಟು ಬಹು ಪ್ರಮಾಣ ಪ್ರತ್ಯೇಕ ಸಾಲು ಬಳಸಿ."
 DocType: Leave Block List Allow,Leave Block List Allow,ಬ್ಲಾಕ್ ಲಿಸ್ಟ್ ಅನುಮತಿಸಿ ಬಿಡಿ
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr ಖಾಲಿ ಅಥವಾ ಜಾಗವನ್ನು ಇರುವಂತಿಲ್ಲ
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr ಖಾಲಿ ಅಥವಾ ಜಾಗವನ್ನು ಇರುವಂತಿಲ್ಲ
 DocType: Patient Medical Record,Patient Medical Record,ರೋಗಿಯ ವೈದ್ಯಕೀಯ ದಾಖಲೆ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,ಅಲ್ಲದ ಗ್ರೂಪ್ ಗ್ರೂಪ್
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ಕ್ರೀಡೆ
@@ -2238,9 +2278,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,ವಿನಿಮಯ ದರದ ಸಿಗಲಿಲ್ಲವಾದ್ದರಿಂದ {0} ನಿಂದ {1} ಪ್ರಮುಖ ದಿನಾಂಕದಂದು {2}. ದಯವಿಟ್ಟು ಕರೆನ್ಸಿ ವಿನಿಮಯ ದಾಖಲೆ ಕೈಯಾರೆ ರಚಿಸಲು
 DocType: POS Profile,Price List,ಬೆಲೆ ಪಟ್ಟಿ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ಈಗ ಡೀಫಾಲ್ಟ್ ಹಣಕಾಸಿನ ವರ್ಷ ಆಗಿದೆ . ಕಾರ್ಯಗತವಾಗಲು ಬದಲಾವಣೆಗೆ ನಿಮ್ಮ ಬ್ರೌಸರ್ ರಿಫ್ರೆಶ್ ಮಾಡಿ .
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,ಖರ್ಚು ಹಕ್ಕು
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,ಖರ್ಚು ಹಕ್ಕು
 DocType: Issue,Support,ಬೆಂಬಲ
 ,BOM Search,ಬೊಮ್ ಹುಡುಕಾಟ
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",ಈ ಗೋದಾಮಿನ ಲಭ್ಯವಿರುವ ಸ್ಟಾಕ್ ಆಧಾರದ ಮೇಲೆ &quot;ಸ್ಟಾಕ್ನಲ್ಲಿ&quot; ಅಥವಾ &quot;ನಾಟ್ ಇನ್ ಸ್ಟಾಕ್&quot; ಅನ್ನು ಪ್ರಕಟಿಸಿ.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),ಕ್ಲೋಸಿಂಗ್ (+ ಒಟ್ಟು ತೆರೆಯುವ)
 DocType: Vehicle,Fuel Type,ಇಂಧನ ಕೌಟುಂಬಿಕತೆ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,ಕಂಪನಿ ಕರೆನ್ಸಿ ಸೂಚಿಸಿ
@@ -2252,16 +2293,16 @@
 DocType: Healthcare Settings,Remind Before,ಮೊದಲು ಜ್ಞಾಪಿಸು
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM ಪರಿವರ್ತಿಸುವುದರ ಸತತವಾಗಿ ಅಗತ್ಯವಿದೆ {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ರೋ # {0}: ರೆಫರೆನ್ಸ್ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ ಮಾರಾಟದ ಆರ್ಡರ್ ಒಂದು, ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಅಥವಾ ಜರ್ನಲ್ ಎಂಟ್ರಿ ಇರಬೇಕು"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ರೋ # {0}: ರೆಫರೆನ್ಸ್ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ ಮಾರಾಟದ ಆರ್ಡರ್ ಒಂದು, ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಅಥವಾ ಜರ್ನಲ್ ಎಂಟ್ರಿ ಇರಬೇಕು"
 DocType: Salary Component,Deduction,ವ್ಯವಕಲನ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,ರೋ {0}: ಸಮಯ ಮತ್ತು ಟೈಮ್ ಕಡ್ಡಾಯ.
 DocType: Stock Reconciliation Item,Amount Difference,ಪ್ರಮಾಣ ವ್ಯತ್ಯಾಸ
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},ಐಟಂ ಬೆಲೆ ಸೇರ್ಪಡೆ {0} ದರ ಪಟ್ಟಿ ರಲ್ಲಿ {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},ಐಟಂ ಬೆಲೆ ಸೇರ್ಪಡೆ {0} ದರ ಪಟ್ಟಿ ರಲ್ಲಿ {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,ಈ ಮಾರಾಟಗಾರನ ಉದ್ಯೋಗಿ ಅನ್ನು ನಮೂದಿಸಿ
 DocType: Territory,Classification of Customers by region,ಪ್ರದೇಶವಾರು ಗ್ರಾಹಕರು ವರ್ಗೀಕರಣ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,ವ್ಯತ್ಯಾಸ ಪ್ರಮಾಣ ಶೂನ್ಯ ಇರಬೇಕು
 DocType: Project,Gross Margin,ಒಟ್ಟು ಅಂಚು
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,ಮೊದಲ ಉತ್ಪಾದನೆ ಐಟಂ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,ಮೊದಲ ಉತ್ಪಾದನೆ ಐಟಂ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,ಲೆಕ್ಕಹಾಕಿದ ಬ್ಯಾಂಕ್ ಹೇಳಿಕೆ ಸಮತೋಲನ
 DocType: Normal Test Template,Normal Test Template,ಸಾಧಾರಣ ಟೆಸ್ಟ್ ಟೆಂಪ್ಲೇಟು
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ಅಂಗವಿಕಲ ಬಳಕೆದಾರರ
@@ -2271,21 +2312,22 @@
 DocType: Salary Slip,Total Deduction,ಒಟ್ಟು ಕಳೆಯುವುದು
 ,Production Analytics,ಪ್ರೊಡಕ್ಷನ್ ಅನಾಲಿಟಿಕ್ಸ್
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,ಇದು ಈ ರೋಗಿಯ ವಿರುದ್ಧ ವಹಿವಾಟುಗಳನ್ನು ಆಧರಿಸಿದೆ. ವಿವರಗಳಿಗಾಗಿ ಕೆಳಗೆ ಟೈಮ್ಲೈನ್ ನೋಡಿ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,ವೆಚ್ಚ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,ವೆಚ್ಚ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 DocType: Employee,Date of Birth,ಜನ್ಮ ದಿನಾಂಕ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,ಐಟಂ {0} ಈಗಾಗಲೇ ಮರಳಿದರು
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ಹಣಕಾಸಿನ ವರ್ಷ ** ಒಂದು ಹಣಕಾಸು ವರ್ಷದ ಪ್ರತಿನಿಧಿಸುತ್ತದೆ. ಎಲ್ಲಾ ಲೆಕ್ಕ ನಮೂದುಗಳನ್ನು ಮತ್ತು ಇತರ ಪ್ರಮುಖ ವ್ಯವಹಾರಗಳ ** ** ಹಣಕಾಸಿನ ವರ್ಷ ವಿರುದ್ಧ ಕಂಡುಕೊಳ್ಳಲಾಯಿತು.
 DocType: Opportunity,Customer / Lead Address,ಗ್ರಾಹಕ / ಲೀಡ್ ವಿಳಾಸ
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,ಪೂರೈಕೆದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ಸೆಟಪ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},ಎಚ್ಚರಿಕೆ: ಬಾಂಧವ್ಯ ಅಮಾನ್ಯ SSL ಪ್ರಮಾಣಪತ್ರ {0}
-DocType: Student Admission,Eligibility,ಅರ್ಹತಾ
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,ಅಸೆಸ್ಮೆಂಟ್ ಪ್ಲಾನ್ ಹೆಸರು
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},ಎಚ್ಚರಿಕೆ: ಬಾಂಧವ್ಯ ಅಮಾನ್ಯ SSL ಪ್ರಮಾಣಪತ್ರ {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","ಕಾರಣವಾಗುತ್ತದೆ ನೀವು ಪಡೆಯಲು ವ್ಯಾಪಾರ, ನಿಮ್ಮ ತೀರಗಳು ಎಲ್ಲ ಸಂಪರ್ಕಗಳನ್ನು ಮತ್ತು ಹೆಚ್ಚು ಸೇರಿಸಲು ಸಹಾಯ"
 DocType: Production Order Operation,Actual Operation Time,ನಿಜವಾದ ಕಾರ್ಯಾಚರಣೆ ಟೈಮ್
 DocType: Authorization Rule,Applicable To (User),ಅನ್ವಯವಾಗುತ್ತದೆ ( ಬಳಕೆದಾರ )
 DocType: Purchase Taxes and Charges,Deduct,ಕಳೆ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,ಜಾಬ್ ವಿವರಣೆ
 DocType: Student Applicant,Applied,ಅಪ್ಲೈಡ್
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,ಮತ್ತೆತೆರೆಯಿರಿ
 DocType: Sales Invoice Item,Qty as per Stock UOM,ಪ್ರಮಾಣ ಸ್ಟಾಕ್ UOM ಪ್ರಕಾರ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 ಹೆಸರು
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","ಹೊರತುಪಡಿಸಿ ವಿಶೇಷ ಅಕ್ಷರಗಳು ""-"" ""."", ""#"", ಮತ್ತು ""/"" ಸರಣಿ ಹೆಸರಿಸುವ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ"
@@ -2297,7 +2339,7 @@
 DocType: Request for Quotation,Manufacturing Manager,ಉತ್ಪಾದನಾ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ವರೆಗೆ ವಾರಂಟಿ {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,ಪ್ರವಾಸ ಒಳಗೆ ಡೆಲಿವರಿ ಗಮನಿಸಿ ಸ್ಪ್ಲಿಟ್ .
-apps/erpnext/erpnext/hooks.py +98,Shipments,ಸಾಗಣೆಗಳು
+apps/erpnext/erpnext/hooks.py +107,Shipments,ಸಾಗಣೆಗಳು
 DocType: Payment Entry,Total Allocated Amount (Company Currency),ಒಟ್ಟು ನಿಗದಿ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 DocType: Purchase Order Item,To be delivered to customer,ಗ್ರಾಹಕನಿಗೆ ನೀಡಬೇಕಾಗಿದೆ
 DocType: BOM,Scrap Material Cost,ಸ್ಕ್ರ್ಯಾಪ್ ಮೆಟೀರಿಯಲ್ ವೆಚ್ಚ
@@ -2320,8 +2362,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,ಐಟಂ ವಿಭಿನ್ನ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,ಕಂಪನಿ ಆಯ್ಕೆ ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,ಎಲ್ಲಾ ವಿಭಾಗಗಳು ಪರಿಗಣಿಸಲ್ಪಡುವ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","ಉದ್ಯೋಗ ವಿಧಗಳು ( ಶಾಶ್ವತ , ಒಪ್ಪಂದ , ಇಂಟರ್ನ್ , ಇತ್ಯಾದಿ ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} ಐಟಂ ಕಡ್ಡಾಯ {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","ಉದ್ಯೋಗ ವಿಧಗಳು ( ಶಾಶ್ವತ , ಒಪ್ಪಂದ , ಇಂಟರ್ನ್ , ಇತ್ಯಾದಿ ) ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} ಐಟಂ ಕಡ್ಡಾಯ {1}
 DocType: Process Payroll,Fortnightly,ಪಾಕ್ಷಿಕ
 DocType: Currency Exchange,From Currency,ಚಲಾವಣೆಯ
 DocType: Vital Signs,Weight (In Kilogram),ತೂಕ (ಕಿಲೋಗ್ರಾಂನಲ್ಲಿ)
@@ -2346,7 +2388,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,ವೇಳಾಪಟ್ಟಿ ಪಡೆಯಲು ' ರಚಿಸಿ ವೇಳಾಪಟ್ಟಿ ' ಮೇಲೆ ಕ್ಲಿಕ್ ಮಾಡಿ
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,ಕೆಳಗಿನ ವೇಳಾಪಟ್ಟಿಯನ್ನು ಅಳಿಸುವಾಗ ದೋಷಗಳು ಇದ್ದವು:
 DocType: Bin,Ordered Quantity,ಆದೇಶ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","ಇ ಜಿ "" ಬಿಲ್ಡರ್ ಗಳು ಉಪಕರಣಗಳು ನಿರ್ಮಿಸಿ """
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","ಇ ಜಿ "" ಬಿಲ್ಡರ್ ಗಳು ಉಪಕರಣಗಳು ನಿರ್ಮಿಸಿ """
 DocType: Grading Scale,Grading Scale Intervals,ಗ್ರೇಡಿಂಗ್ ಸ್ಕೇಲ್ ಮಧ್ಯಂತರಗಳು
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {2} ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ ಮಾತ್ರ ಕರೆನ್ಸಿ ಮಾಡಬಹುದು: {3}
 DocType: Production Order,In Process,ಪ್ರಕ್ರಿಯೆಯಲ್ಲಿ
@@ -2370,11 +2412,10 @@
 DocType: Purchase Invoice,With Payment of Tax,ತೆರಿಗೆ ಪಾವತಿ
 DocType: Expense Claim Detail,Expense Claim Detail,ಖರ್ಚು ಹಕ್ಕು ವಿವರ
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,ಸರಬರಾಜುದಾರರು ಫಾರ್ triplicate
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,ಸರಿಯಾದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,ಸರಿಯಾದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ
 DocType: Item,Weight UOM,ತೂಕ UOM
 DocType: Salary Structure Employee,Salary Structure Employee,ಸಂಬಳ ರಚನೆ ನೌಕರರ
 DocType: Patient,Blood Group,ರಕ್ತ ಗುಂಪು
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,ಬಾಕಿ
 DocType: Course,Course Name,ಕೋರ್ಸ್ ಹೆಸರು
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ನಿರ್ದಿಷ್ಟ ನೌಕರನ ರಜೆ ಅನ್ವಯಗಳನ್ನು ಒಪ್ಪಿಗೆ ಬಳಕೆದಾರರು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,ಕಚೇರಿ ಉಪಕರಣ
@@ -2393,7 +2434,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,ದರ ಪಟ್ಟಿ ಹೊಂದಿಸದೆ ವೇಳೆ ಬೆಲೆಗಳು ತೋರಿಸಲಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,ಈ ಶಿಪ್ಪಿಂಗ್ ರೂಲ್ ಒಂದು ದೇಶದ ಸೂಚಿಸಲು ಅಥವಾ ವಿಶ್ವಾದ್ಯಂತ ಹಡಗು ಪರಿಶೀಲಿಸಿ
 DocType: Stock Entry,Total Incoming Value,ಒಟ್ಟು ಒಳಬರುವ ಮೌಲ್ಯ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,ಡೆಬಿಟ್ ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,ಡೆಬಿಟ್ ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ನಿಮ್ಮ ತಂಡದ ಮಾಡಲಾಗುತ್ತದೆ ಚಟುವಟಿಕೆಗಳನ್ನು ಫಾರ್ ಸಮಯ, ವೆಚ್ಚ ಮತ್ತು ಬಿಲ್ಲಿಂಗ್ ಟ್ರ್ಯಾಕ್ ಸಹಾಯ"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ಖರೀದಿ ಬೆಲೆ ಪಟ್ಟಿ
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,ಪೂರೈಕೆದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ಅಸ್ಥಿರಗಳ ಟೆಂಪ್ಲೇಟ್ಗಳು.
@@ -2403,7 +2444,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,ಪಾವತಿ ಸಾಮರಸ್ಯ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,ಉಸ್ತುವಾರಿ ವ್ಯಕ್ತಿಯ ಹೆಸರು ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,ತಂತ್ರಜ್ಞಾನ
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},ಒಟ್ಟು ಪೇಯ್ಡ್: {0}
+DocType: Hub Settings,Unregister from Hub,ಹಬ್ನಿಂದ ನೋಂದಣಿ ರದ್ದುಮಾಡಿ
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},ಒಟ್ಟು ಪೇಯ್ಡ್: {0}
 DocType: BOM Website Operation,BOM Website Operation,ಬಿಒಎಮ್ ವೆಬ್ಸೈಟ್ ಆಪರೇಷನ್
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,ಪತ್ರ ನೀಡಲು
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ( MRP ) ಮತ್ತು ಉತ್ಪಾದನೆ ಮುಖಾಂತರವೇ .
@@ -2415,7 +2457,9 @@
 DocType: Physician Schedule Time Slot,To Time,ಸಮಯ
 DocType: Authorization Rule,Approving Role (above authorized value),(ಅಧಿಕಾರ ಮೌಲ್ಯವನ್ನು ಮೇಲೆ) ಪಾತ್ರ ಅನುಮೋದನೆ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,ಖಾತೆಗೆ ಕ್ರೆಡಿಟ್ ಒಂದು ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ಇರಬೇಕು
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM ಪುನರಾವರ್ತನ : {0} ಪೋಷಕರು ಅಥವಾ ಮಗು ಸಾಧ್ಯವಿಲ್ಲ {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,ಪಾವತಿಸಿದ ವಿದ್ಯಾರ್ಥಿ ಅರ್ಜಿದಾರರಿಗೆ ಕಡ್ಡಾಯವಾಗಿ ವಿದ್ಯಾರ್ಥಿ ಪ್ರವೇಶವನ್ನು ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM ಪುನರಾವರ್ತನ : {0} ಪೋಷಕರು ಅಥವಾ ಮಗು ಸಾಧ್ಯವಿಲ್ಲ {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,ಬೆಲೆ ಪ್ರಕಟಿಸಲು ದಯವಿಟ್ಟು ಒಂದು ಬೆಲೆ ಪಟ್ಟಿ ಆಯ್ಕೆಮಾಡಿ
 DocType: Production Order Operation,Completed Qty,ಪೂರ್ಣಗೊಂಡಿದೆ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","{0}, ಮಾತ್ರ ಡೆಬಿಟ್ ಖಾತೆಗಳನ್ನು ಇನ್ನೊಂದು ಕ್ರೆಡಿಟ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಲಿಂಕ್ ಮಾಡಬಹುದು ಫಾರ್"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,ಬೆಲೆ ಪಟ್ಟಿ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
@@ -2428,39 +2472,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} ಐಟಂ ಬೇಕಾದ ಸೀರಿಯಲ್ ಸಂಖ್ಯೆಗಳು {1}. ನೀವು ಒದಗಿಸಿದ {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,ಪ್ರಸ್ತುತ ಮೌಲ್ಯಮಾಪನ ದರ
 DocType: Item,Customer Item Codes,ಗ್ರಾಹಕ ಐಟಂ ಕೋಡ್ಸ್
+DocType: Training Event,Advance,ಅಡ್ವಾನ್ಸ್
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,ಮತ್ತೆ ಪುನರಾವರ್ತಿಸಲು.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,ವಿನಿಮಯ ಗಳಿಕೆ / ನಷ್ಟ
 DocType: Opportunity,Lost Reason,ಲಾಸ್ಟ್ ಕಾರಣ
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,ಹೊಸ ವಿಳಾಸ
 DocType: Quality Inspection,Sample Size,ಸ್ಯಾಂಪಲ್ ಸೈಜ್
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,ದಯವಿಟ್ಟು ರಸೀತಿ ಡಾಕ್ಯುಮೆಂಟ್ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಸರಕುಪಟ್ಟಿ ಮಾಡಲಾಗಿದೆ
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',ಮಾನ್ಯ ಸೂಚಿಸಲು ದಯವಿಟ್ಟು ' ಕೇಸ್ ನಂ ಗೆ . '
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',ಮಾನ್ಯ ಸೂಚಿಸಲು ದಯವಿಟ್ಟು ' ಕೇಸ್ ನಂ ಗೆ . '
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,ಮತ್ತಷ್ಟು ವೆಚ್ಚ ಕೇಂದ್ರಗಳು ಗುಂಪುಗಳು ಅಡಿಯಲ್ಲಿ ಮಾಡಬಹುದು ಆದರೆ ನಮೂದುಗಳನ್ನು ಅಲ್ಲದ ಗುಂಪುಗಳ ವಿರುದ್ಧ ಮಾಡಬಹುದು
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ಬಳಕೆದಾರರು ಮತ್ತು ಅನುಮತಿಗಳು
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ಸ್ ರಚಿಸಲಾಗಿದೆ: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ಸ್ ರಚಿಸಲಾಗಿದೆ: {0}
 DocType: Branch,Branch,ಶಾಖೆ
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ಮುದ್ರಣ ಮತ್ತು ಬ್ರ್ಯಾಂಡಿಂಗ್
 DocType: Company,Total Monthly Sales,ಒಟ್ಟು ಮಾಸಿಕ ಮಾರಾಟಗಳು
 DocType: Bin,Actual Quantity,ನಿಜವಾದ ಪ್ರಮಾಣ
 DocType: Shipping Rule,example: Next Day Shipping,ಉದಾಹರಣೆಗೆ : ಮುಂದೆ ದಿನ ಶಿಪ್ಪಿಂಗ್
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,ಕಂಡುಬಂದಿಲ್ಲ ಸರಣಿ ಯಾವುದೇ {0}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},ಚಂದಾದಾರಿಕೆ {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},ಚಂದಾದಾರಿಕೆ {0}
 DocType: Fee Schedule Program,Fee Schedule Program,ಶುಲ್ಕ ವೇಳಾಪಟ್ಟಿ ಕಾರ್ಯಕ್ರಮ
 DocType: Fee Schedule Program,Student Batch,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,`ಟ್ಯಾಬ್ವಿಟಲ್ ಚಿಹ್ನೆಗಳು` ನಿಂದ ರೋಗಿಯ = &#39;{0}&#39; ಆದೇಶದಿಂದ ಚಿಹ್ನೆಗಳು_ಡೇಟ್ ಅವಧಿ ಮಿತಿ 1 ರಿಂದ ಆಯ್ಕೆಮಾಡಿ
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,ವಿದ್ಯಾರ್ಥಿ ಮಾಡಿ
 DocType: Supplier Scorecard Scoring Standing,Min Grade,ಕನಿಷ್ಠ ಗ್ರೇಡ್
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},ನೀವು ಯೋಜನೆಯ ಸಹಯೋಗಿಸಲು ಆಮಂತ್ರಿಸಲಾಗಿದೆ: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},ವೈದ್ಯರು {0} ನಲ್ಲಿ ಲಭ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},ನೀವು ಯೋಜನೆಯ ಸಹಯೋಗಿಸಲು ಆಮಂತ್ರಿಸಲಾಗಿದೆ: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},ವೈದ್ಯರು {0} ನಲ್ಲಿ ಲಭ್ಯವಿಲ್ಲ
 DocType: Leave Block List Date,Block Date,ಬ್ಲಾಕ್ ದಿನಾಂಕ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},ಕಸ್ಟಮ್ ಕ್ಷೇತ್ರ ಸೇರಿಸಿ ಡಾಕ್ಟೈಪ್ನಲ್ಲಿ ಚಂದಾದಾರಿಕೆ ಐಡಿ {0}
 DocType: Purchase Receipt,Supplier Delivery Note,ಪೂರೈಕೆದಾರ ಡೆಲಿವರಿ ನೋಟ್
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,ಈಗ ಅನ್ವಯಿಸು
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,ಈಗ ಅನ್ವಯಿಸು
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},ವಾಸ್ತವಿಕ ಪ್ರಮಾಣ {0} / ವೇಟಿಂಗ್ ಪ್ರಮಾಣ {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},ವಾಸ್ತವಿಕ ಪ್ರಮಾಣ {0} / ವೇಟಿಂಗ್ ಪ್ರಮಾಣ {1}
 DocType: Purchase Invoice,E-commerce GSTIN,ಇ-ವಾಣಿಜ್ಯ GSTIN
 DocType: Sales Order,Not Delivered,ಈಡೇರಿಸಿಲ್ಲ
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,ನಿರೀಕ್ಷಿತ ದಿನಾಂಕ ಟ್ರಾನ್ಸಾಕ್ಷನ್ ದಿನಾಂಕದ ಮೊದಲು ಇರುವಂತಿಲ್ಲ
 ,Bank Clearance Summary,ಬ್ಯಾಂಕ್ ಕ್ಲಿಯರೆನ್ಸ್ ಸಾರಾಂಶ
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","ರಚಿಸಿ ಮತ್ತು , ದೈನಂದಿನ ಸಾಪ್ತಾಹಿಕ ಮತ್ತು ಮಾಸಿಕ ಇಮೇಲ್ ಡೈಜೆಸ್ಟ್ ನಿರ್ವಹಿಸಿ ."
 DocType: Appraisal Goal,Appraisal Goal,ಅಪ್ರೇಸಲ್ ಗೋಲ್
@@ -2468,12 +2513,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,ಕಟ್ಟಡಗಳು
 DocType: Fee Schedule,Fee Structure,ಶುಲ್ಕ ರಚನೆ
 DocType: Timesheet Detail,Costing Amount,ವೆಚ್ಚದ ಪ್ರಮಾಣ
-DocType: Student Admission,Application Fee,ಅರ್ಜಿ ಶುಲ್ಕ
+DocType: Student Admission Program,Application Fee,ಅರ್ಜಿ ಶುಲ್ಕ
 DocType: Process Payroll,Submit Salary Slip,ಸಂಬಳ ಸ್ಲಿಪ್ ಸಲ್ಲಿಸಿ
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,ಐಟಂ Maxiumm ರಿಯಾಯಿತಿ {0} {1} % ಆಗಿದೆ
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,ಐಟಂ Maxiumm ರಿಯಾಯಿತಿ {0} {1} % ಆಗಿದೆ
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,ದೊಡ್ಡ ಆಮದು
 DocType: Sales Partner,Address & Contacts,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕಗಳು
 DocType: SMS Log,Sender Name,ಹೆಸರು
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,ಮಾನದಂಡದಿಂದ ವಿಂಗಡಿಸಿ
 DocType: POS Profile,[Select],[ ಆರಿಸಿರಿ ]
 DocType: Vital Signs,Blood Pressure (diastolic),ರಕ್ತದೊತ್ತಡ (ಡಯಾಸ್ಟೊಲಿಕ್)
 DocType: SMS Log,Sent To,ಕಳುಹಿಸಲಾಗುತ್ತದೆ
@@ -2482,7 +2528,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,ಮುಂದಿನ ಸಂಪರ್ಕಿಸಿ ದಿನಾಂಕ ಹಿಂದೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Company,For Reference Only.,ಪರಾಮರ್ಶೆಗಾಗಿ ಮಾತ್ರ.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},ವೈದ್ಯ {0} {1} ನಲ್ಲಿ ಲಭ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,ಬ್ಯಾಚ್ ಆಯ್ಕೆ ಇಲ್ಲ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,ಬ್ಯಾಚ್ ಆಯ್ಕೆ ಇಲ್ಲ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},ಅಮಾನ್ಯ {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,ರೆಫರೆನ್ಸ್ ಆಹ್ವಾನ
@@ -2498,15 +2544,15 @@
 DocType: Normal Test Items,Require Result Value,ಫಲಿತಾಂಶ ಮೌಲ್ಯ ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,ಪ್ರಕರಣ ಸಂಖ್ಯೆ 0 ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Item,Show a slideshow at the top of the page,ಪುಟದ ಮೇಲಿರುವ ಒಂದು ಸ್ಲೈಡ್ಶೋ ತೋರಿಸು
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,ಸ್ಟೋರ್ಸ್
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,ಸ್ಟೋರ್ಸ್
 DocType: Project Type,Projects Manager,ಯೋಜನೆಗಳು ನಿರ್ವಾಹಕ
 DocType: Serial No,Delivery Time,ಡೆಲಿವರಿ ಟೈಮ್
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,ರಂದು ಆಧರಿಸಿ ಏಜಿಂಗ್
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,ನೇಮಕಾತಿ ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,ನೇಮಕಾತಿ ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ
 DocType: Item,End of Life,ಲೈಫ್ ಅಂತ್ಯ
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,ಓಡಾಡು
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,ಯಾವುದೇ ಸಕ್ರಿಯ ಅಥವಾ ಡೀಫಾಲ್ಟ್ ಸಂಬಳ ರಚನೆ ನೀಡಿದ ದಿನಾಂಕಗಳನ್ನು ಉದ್ಯೋಗಿ {0} ಕಂಡುಬಂದಿಲ್ಲ
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,ಓಡಾಡು
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,ಯಾವುದೇ ಸಕ್ರಿಯ ಅಥವಾ ಡೀಫಾಲ್ಟ್ ಸಂಬಳ ರಚನೆ ನೀಡಿದ ದಿನಾಂಕಗಳನ್ನು ಉದ್ಯೋಗಿ {0} ಕಂಡುಬಂದಿಲ್ಲ
 DocType: Leave Block List,Allow Users,ಬಳಕೆದಾರರನ್ನು ಅನುಮತಿಸಿ
 DocType: Purchase Order,Customer Mobile No,ಗ್ರಾಹಕ ಮೊಬೈಲ್ ಯಾವುದೇ
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,ಮರುಕಳಿಸುವ
@@ -2515,12 +2561,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,ನವೀಕರಣ ವೆಚ್ಚ
 DocType: Item Reorder,Item Reorder,ಐಟಂ ಮರುಕ್ರಮಗೊಳಿಸಿ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,ಸಂಬಳ ಶೋ ಸ್ಲಿಪ್
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,ಟ್ರಾನ್ಸ್ಫರ್ ವಸ್ತು
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,ಟ್ರಾನ್ಸ್ಫರ್ ವಸ್ತು
 DocType: Fees,Send Payment Request,ಪಾವತಿ ವಿನಂತಿ ಕಳುಹಿಸಿ
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ಕಾರ್ಯಾಚರಣೆಗಳು , ನಿರ್ವಹಣಾ ವೆಚ್ಚ ನಿರ್ದಿಷ್ಟಪಡಿಸಲು ಮತ್ತು ಕಾರ್ಯಾಚರಣೆಗಳು ಒಂದು ಅನನ್ಯ ಕಾರ್ಯಾಚರಣೆ ಯಾವುದೇ ನೀಡಿ ."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ಈ ಡಾಕ್ಯುಮೆಂಟ್ ಮೂಲಕ ಮಿತಿಗಿಂತ {0} {1} ಐಟಂ {4}. ನೀವು ಮಾಡುತ್ತಿದ್ದಾರೆ ಇನ್ನೊಂದು ಅದೇ ವಿರುದ್ಧ {3} {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,ಉಳಿಸುವ ನಂತರ ಮರುಕಳಿಸುವ ಸೆಟ್ ಮಾಡಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,ಬದಲಾವಣೆ ಆಯ್ಕೆ ಪ್ರಮಾಣದ ಖಾತೆಯನ್ನು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,ಬದಲಾವಣೆ ಆಯ್ಕೆ ಪ್ರಮಾಣದ ಖಾತೆಯನ್ನು
 DocType: Purchase Invoice,Price List Currency,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ
 DocType: Naming Series,User must always select,ಬಳಕೆದಾರ ಯಾವಾಗಲೂ ಆಯ್ಕೆ ಮಾಡಬೇಕು
 DocType: Stock Settings,Allow Negative Stock,ನಕಾರಾತ್ಮಕ ಸ್ಟಾಕ್ ಅನುಮತಿಸಿ
@@ -2540,7 +2586,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,ನೌಕರರ
 DocType: Sample Collection,Collected Time,ಕಲೆಕ್ಟೆಡ್ ಟೈಮ್
 DocType: Company,Sales Monthly History,ಮಾರಾಟದ ಮಾಸಿಕ ಇತಿಹಾಸ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,ಬ್ಯಾಚ್ ಆಯ್ಕೆ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,ಬ್ಯಾಚ್ ಆಯ್ಕೆ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} ಸಂಪೂರ್ಣವಾಗಿ ವಿಧಿಸಲಾಗುತ್ತದೆ
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,ಮುಖ್ಯ ಲಕ್ಷಣಗಳು
 DocType: Training Event,End Time,ಎಂಡ್ ಟೈಮ್
@@ -2548,16 +2594,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,ಪಾವತಿ ಕಡಿತಗೊಳಿಸುವಿಕೆಗಳ ಅಥವಾ ನಷ್ಟ
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,ಮಾರಾಟದ ಅಥವಾ ಖರೀದಿಗಾಗಿ ಸ್ಟ್ಯಾಂಡರ್ಡ್ ಒಪ್ಪಂದದ ವಿಚಾರದಲ್ಲಿ .
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,ಚೀಟಿ ಮೂಲಕ ಗುಂಪು
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,ಈ ಅಪಾಯಿಂಟ್ಮೆಂಟ್ ರದ್ದುಗೊಳಿಸಲು ನೀವು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,ಮಾರಾಟದ ಪೈಪ್ಲೈನ್
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},ದಯವಿಟ್ಟು ಸಂಬಳ ಕಾಂಪೊನೆಂಟ್ ರಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಖಾತೆಯನ್ನು ಸೆಟ್ {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,ಅಗತ್ಯವಿದೆ ರಂದು
 DocType: Rename Tool,File to Rename,ಮರುಹೆಸರಿಸಲು ಫೈಲ್
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},ರೋನಲ್ಲಿ ಐಟಂ ಬಿಒಎಮ್ ಆಯ್ಕೆಮಾಡಿ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},ರೋನಲ್ಲಿ ಐಟಂ ಬಿಒಎಮ್ ಆಯ್ಕೆಮಾಡಿ {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},ಖಾತೆ {0} {1} ಖಾತೆಯ ಮೋಡ್ನಲ್ಲಿ ಕಂಪೆನಿಯೊಂದಿಗೆ ಹೋಲಿಕೆಯಾಗುವುದಿಲ್ಲ: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ನಿಗದಿತ ಬಿಒಎಮ್ {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
+DocType: POS Profile,Applicable for Users,ಬಳಕೆದಾರರಿಗೆ ಅನ್ವಯಿಸುತ್ತದೆ
 DocType: Notification Control,Expense Claim Approved,ಖರ್ಚು ಹಕ್ಕು ಅನುಮೋದನೆ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,ಉದ್ಯೋಗಿ ಸಂಬಳ ಸ್ಲಿಪ್ {0} ಈಗಾಗಲೇ ಈ ಅವಧಿಯಲ್ಲಿ ರಚಿಸಿದ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,ಉದ್ಯೋಗಿ ಸಂಬಳ ಸ್ಲಿಪ್ {0} ಈಗಾಗಲೇ ಈ ಅವಧಿಯಲ್ಲಿ ರಚಿಸಿದ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,ಔಷಧೀಯ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ಖರೀದಿಸಿದ ವಸ್ತುಗಳ ವೆಚ್ಚ
 DocType: Selling Settings,Sales Order Required,ಮಾರಾಟದ ಆದೇಶ ಅಗತ್ಯವಿರುವ
@@ -2582,6 +2630,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,ಸಂಸ್ಥೆ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,ಸಂಸ್ಥೆ
 DocType: BOM Update Tool,BOM Update Tool,BOM ಅಪ್ಡೇಟ್ ಟೂಲ್
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","ಪಕ್ಷದ ಖಾತೆಯನ್ನು ನಿರ್ದಿಷ್ಟಪಡಿಸಲಾಗಿಲ್ಲ, ದಯವಿಟ್ಟು ಕಂಪನಿಯಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಪಾರ್ಟಿ ಖಾತೆಯನ್ನು ಹೊಂದಿಸಿ"
 DocType: SG Creation Tool Course,Student Group Name,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಹೆಸರು
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,ಶುಲ್ಕಗಳು ರಚಿಸಲಾಗುತ್ತಿದೆ
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,ನೀವು ನಿಜವಾಗಿಯೂ ಈ ಕಂಪನಿಗೆ ಎಲ್ಲಾ ವ್ಯವಹಾರಗಳ ಅಳಿಸಲು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ. ಅದು ಎಂದು ನಿಮ್ಮ ಮಾಸ್ಟರ್ ಡೇಟಾ ಉಳಿಯುತ್ತದೆ. ಈ ಕಾರ್ಯವನ್ನು ರದ್ದುಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.
@@ -2590,29 +2639,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ಯೋಜನೆ quanitity ಅಧಿಕವಾಗಿರುತ್ತದೆ ಸಾಧ್ಯವಿಲ್ಲ ({2}) ಉತ್ಪಾದನೆಯಲ್ಲಿನ ಆರ್ಡರ್ {3}
 DocType: Shipping Rule,Shipping Rule Label,ಶಿಪ್ಪಿಂಗ್ ಲೇಬಲ್ ರೂಲ್
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ಬಳಕೆದಾರ ವೇದಿಕೆ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,ರಾ ಮೆಟೀರಿಯಲ್ಸ್ ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","ಸ್ಟಾಕ್ ನವೀಕರಣಗೊಳ್ಳುವುದಿಲ್ಲ, ಸರಕುಪಟ್ಟಿ ಡ್ರಾಪ್ ಹಡಗು ಐಟಂ ಹೊಂದಿದೆ."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,ರಾ ಮೆಟೀರಿಯಲ್ಸ್ ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","ಸ್ಟಾಕ್ ನವೀಕರಣಗೊಳ್ಳುವುದಿಲ್ಲ, ಸರಕುಪಟ್ಟಿ ಡ್ರಾಪ್ ಹಡಗು ಐಟಂ ಹೊಂದಿದೆ."
 DocType: Lab Test Sample,Lab Test Sample,ಲ್ಯಾಬ್ ಟೆಸ್ಟ್ ಮಾದರಿ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,ತ್ವರಿತ ಜರ್ನಲ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM ಯಾವುದೇ ಐಟಂ agianst ಪ್ರಸ್ತಾಪಿಸಿದ್ದಾರೆ ವೇಳೆ ನೀವು ದರ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
+DocType: Restaurant,Invoice Series Prefix,ಸರಕುಪಟ್ಟಿ ಪೂರ್ವಪ್ರತ್ಯಯ
 DocType: Employee,Previous Work Experience,ಹಿಂದಿನ ಅನುಭವ
 DocType: Stock Entry,For Quantity,ಪ್ರಮಾಣ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},ಐಟಂ ಯೋಜಿಸಿದ ಪ್ರಮಾಣ ನಮೂದಿಸಿ {0} ಸಾಲು {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},ಐಟಂ ಯೋಜಿಸಿದ ಪ್ರಮಾಣ ನಮೂದಿಸಿ {0} ಸಾಲು {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} ಸಲ್ಲಿಸದಿದ್ದರೆ
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,ಐಟಂಗಳನ್ನು ವಿನಂತಿಗಳು .
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,ಪ್ರತ್ಯೇಕ ಉತ್ಪಾದನಾ ಸಲುವಾಗಿ ಪ್ರತಿ ಸಿದ್ಧಪಡಿಸಿದ ಉತ್ತಮ ಐಟಂ ನಿರ್ಮಿಸಲಾಗುತ್ತದೆ .
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} ರಿಟರ್ನ್ ದಸ್ತಾವೇಜು ಋಣಾತ್ಮಕ ಇರಬೇಕು
 ,Minutes to First Response for Issues,ಇಷ್ಯೂಸ್ ಮೊದಲ ರೆಸ್ಪಾನ್ಸ್ ನಿಮಿಷಗಳ
 DocType: Purchase Invoice,Terms and Conditions1,ನಿಯಮಗಳು ಮತ್ತು Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,ಸಂಸ್ಥೆಯ ಹೆಸರು ಇದಕ್ಕಾಗಿ ನೀವು ಈ ವ್ಯವಸ್ಥೆಯ ಹೊಂದಿಸುವಾಗ.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,ಸಂಸ್ಥೆಯ ಹೆಸರು ಇದಕ್ಕಾಗಿ ನೀವು ಈ ವ್ಯವಸ್ಥೆಯ ಹೊಂದಿಸುವಾಗ.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","ಲೆಕ್ಕಪರಿಶೋಧಕ ಪ್ರವೇಶ ಈ ದಿನಾಂಕ ಫ್ರೀಜ್ , ಯಾರೂ / ಕೆಳಗೆ ಸೂಚಿಸಲಾದ ಪಾತ್ರವನ್ನು ಹೊರತುಪಡಿಸಿ ಪ್ರವೇಶ ಮಾರ್ಪಡಿಸಲು ಮಾಡಬಹುದು ."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಉತ್ಪಾದಿಸುವ ಮೊದಲು ಡಾಕ್ಯುಮೆಂಟ್ ಉಳಿಸಲು ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,ಎಲ್ಲಾ BOM ಗಳಲ್ಲಿ ನವೀಕರಿಸಿದ ಇತ್ತೀಚಿನ ಬೆಲೆ
 DocType: Fee Schedule,Successful,ಯಶಸ್ವಿಯಾಗಿದೆ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,ಸ್ಥಿತಿ
 DocType: UOM,Check this to disallow fractions. (for Nos),ಭಿನ್ನರಾಶಿಗಳನ್ನು ಅವಕಾಶ ಈ ಪರಿಶೀಲಿಸಿ . ( ಸೂಲ ಫಾರ್ )
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,ಕೆಳಗಿನ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ಸ್ ರಚಿಸಲಾಯಿತು:
-DocType: Student Admission,Naming Series (for Student Applicant),ಸರಣಿ ಹೆಸರಿಸುವ (ವಿದ್ಯಾರ್ಥಿ ಅರ್ಜಿದಾರರಿಂದ)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,ಕೆಳಗಿನ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ಸ್ ರಚಿಸಲಾಯಿತು:
+DocType: Student Admission Program,Naming Series (for Student Applicant),ಸರಣಿ ಹೆಸರಿಸುವ (ವಿದ್ಯಾರ್ಥಿ ಅರ್ಜಿದಾರರಿಂದ)
 DocType: Delivery Note,Transporter Name,ಟ್ರಾನ್ಸ್ಪೋರ್ಟರ್ ಹೆಸರು
 DocType: Authorization Rule,Authorized Value,ಅಧಿಕೃತ ಮೌಲ್ಯ
 DocType: BOM,Show Operations,ಕಾರ್ಯಾಚರಣೆಗಳಪರಿವಿಡಿಯನ್ನುತೋರಿಸು
@@ -2636,7 +2686,7 @@
 ,Employees working on a holiday,ಒಂದು ರಜಾ ಕೆಲಸ ನೌಕರರು
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,ಮಾರ್ಕ್ ಪ್ರೆಸೆಂಟ್
 DocType: Project,% Complete Method,% ಕಂಪ್ಲೀಟ್ ವಿಧಾನ
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,ಡ್ರಗ್
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,ಡ್ರಗ್
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},ನಿರ್ವಹಣೆ ಆರಂಭ ದಿನಾಂಕ ಯಾವುದೇ ಸೀರಿಯಲ್ ವಿತರಣಾ ದಿನಾಂಕದ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ {0}
 DocType: Production Order,Actual End Date,ನಿಜವಾದ ಅಂತಿಮ ದಿನಾಂಕ
 DocType: BOM,Operating Cost (Company Currency),ವೆಚ್ಚವನ್ನು (ಕಂಪನಿ ಕರೆನ್ಸಿ)
@@ -2654,13 +2704,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,ಬಳಕೆದಾರ ನಿಯಮ ಅನ್ವಯವಾಗುತ್ತದೆ ಎಂದು ಬಳಕೆದಾರ ಅನುಮೋದನೆ ಇರಲಾಗುವುದಿಲ್ಲ
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),ಮೂಲ ದರದ (ಸ್ಟಾಕ್ ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಪ್ರಕಾರ)
 DocType: SMS Log,No of Requested SMS,ವಿನಂತಿಸಲಾಗಿದೆ SMS ನ ನಂ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ರಜೆ ಅನುಮೋದನೆ ಅಪ್ಲಿಕೇಶನ್ ದಾಖಲೆಗಳು ಹೊಂದುವುದಿಲ್ಲ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ರಜೆ ಅನುಮೋದನೆ ಅಪ್ಲಿಕೇಶನ್ ದಾಖಲೆಗಳು ಹೊಂದುವುದಿಲ್ಲ
 DocType: Campaign,Campaign-.####,ಕ್ಯಾಂಪೇನ್ . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ಮುಂದಿನ ಕ್ರಮಗಳು
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,ದಯವಿಟ್ಟು ಸಾಧ್ಯವಾದಷ್ಟು ದರಗಳಲ್ಲಿ ನಿರ್ದಿಷ್ಟಪಡಿಸಿದ ಐಟಂಗಳನ್ನು ಸರಬರಾಜು
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,ಸರಕುಪಟ್ಟಿ ಮಾಡಿ
 DocType: Selling Settings,Auto close Opportunity after 15 days,15 ದಿನಗಳ ನಂತರ ಆಟೋ ನಿಕಟ ಅವಕಾಶ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} ಸ್ಕೋರ್ಕಾರ್ಡ್ ನಿಂತಿರುವ ಕಾರಣ {0} ಖರೀದಿ ಆದೇಶಗಳನ್ನು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} ಸ್ಕೋರ್ಕಾರ್ಡ್ ನಿಂತಿರುವ ಕಾರಣ {0} ಖರೀದಿ ಆದೇಶಗಳನ್ನು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,ಅಂತ್ಯ ವರ್ಷ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / ಲೀಡ್%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / ಲೀಡ್%
@@ -2668,6 +2718,7 @@
 DocType: Vital Signs,Nutrition Values,ನ್ಯೂಟ್ರಿಷನ್ ಮೌಲ್ಯಗಳು
 DocType: Lab Test Template,Is billable,ಬಿಲ್ ಮಾಡಲಾಗುವುದು
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",&quot;ಚಿಕಿತ್ಸಕ ವೇಳಾಪಟ್ಟಿ&quot; ಮತ್ತು ನೇಮಕಾತಿಯ ಸಮಯ &quot;ಎರಡನ್ನೂ ಡಾ {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,ನಿಯೋಜನೆಗಾಗಿ ಕಂಪನಿಗಳು ಉತ್ಪನ್ನಗಳನ್ನು ಮಾರುತ್ತದೆ ಒಬ್ಬ ಮೂರನೇ ವ್ಯಕ್ತಿಯ ವಿತರಕ / ಡೀಲರ್ / ಆಯೋಗದ ಏಜೆಂಟ್ / ಅಂಗ / ಮರುಮಾರಾಟಗಾರರ.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ವಿರುದ್ಧ {1}
 DocType: Patient,Patient Demographics,ರೋಗಿಯ ಜನಸಂಖ್ಯಾಶಾಸ್ತ್ರ
@@ -2717,7 +2768,6 @@
  10. ಸೇರಿಸಿ ಅಥವಾ ಕಡಿತಗೊಳಿಸದಿರುವುದರ: ನೀವು ಸೇರಿಸಲು ಅಥವಾ ತೆರಿಗೆ ಕಡಿತಗೊಳಿಸುವ ಬಯಸುವ ಎಂದು."
 DocType: Homepage,Homepage,ಮುಖಪುಟ
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,ವೈದ್ಯರನ್ನು ಆಯ್ಕೆ ಮಾಡಿ ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',ಅಪ್ಡೇಟ್ ಟ್ಯಾಬ್ಸಂಯೋಜನೆ ಸೆಟ್ ಸರಕುಪಟ್ಟಿ = &#39;{0}&#39; ಅಲ್ಲಿ ಹೆಸರು = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd ಪ್ರಮಾಣ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},ಶುಲ್ಕ ರೆಕಾರ್ಡ್ಸ್ ರಚಿಸಲಾಗಿದೆ - {0}
 DocType: Asset Category Account,Asset Category Account,ಆಸ್ತಿ ವರ್ಗ ಖಾತೆ
@@ -2729,7 +2779,7 @@
 DocType: Asset,Manual,ಕೈಪಿಡಿ
 DocType: Salary Component Account,Salary Component Account,ಸಂಬಳ ಕಾಂಪೊನೆಂಟ್ ಖಾತೆ
 DocType: Global Defaults,Hide Currency Symbol,ಕರೆನ್ಸಿ ಸಂಕೇತ ಮರೆಮಾಡಿ
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","ಇ ಜಿ ಬ್ಯಾಂಕ್ , ನಗದು, ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","ಇ ಜಿ ಬ್ಯಾಂಕ್ , ನಗದು, ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್"
 DocType: Lead Source,Source Name,ಮೂಲ ಹೆಸರು
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","ವಯಸ್ಕರಲ್ಲಿ ಸಾಮಾನ್ಯವಾದ ರಕ್ತದೊತ್ತಡ ಸುಮಾರು 120 mmHg ಸಂಕೋಚನ, ಮತ್ತು 80 mmHg ಡಯಾಸ್ಟೊಲಿಕ್, ಸಂಕ್ಷಿಪ್ತ &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,ಕ್ರೆಡಿಟ್ ಸ್ಕೋರ್
@@ -2748,16 +2798,16 @@
 DocType: Patient,Occupation,ಉದ್ಯೋಗ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,ರೋ {0} : ಪ್ರಾರಂಭ ದಿನಾಂಕ ಎಂಡ್ ದಿನಾಂಕದ ಮೊದಲು
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),ಒಟ್ಟು (ಪ್ರಮಾಣ)
-DocType: Sales Invoice,This Document,ಈ ಡಾಕ್ಯುಮೆಂಟ್
 DocType: Installation Note Item,Installed Qty,ಅನುಸ್ಥಾಪಿಸಲಾದ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,ಇದು ಕೆಲವು ಅಮಾನ್ಯ ಇಮೇಲ್ ವಿಳಾಸಗಳ ಕಾರಣದಿಂದಾಗಿರಬಹುದು
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,ನೀವು ಸೇರಿಸಿದ್ದೀರಿ
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,ತರಬೇತಿ ಫಲಿತಾಂಶ
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,ತರಬೇತಿ ಫಲಿತಾಂಶ
 DocType: Purchase Invoice,Is Paid,ಪಾವತಿಸಿದ ಇದೆ
 DocType: Salary Structure,Total Earning,ಒಟ್ಟು ದುಡಿಯುತ್ತಿದ್ದ
 DocType: Purchase Receipt,Time at which materials were received,ವಸ್ತುಗಳನ್ನು ಸ್ವೀಕರಿಸಿದ ಯಾವ ಸಮಯದಲ್ಲಿ
 DocType: Stock Ledger Entry,Outgoing Rate,ಹೊರಹೋಗುವ ದರ
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,ಸಂಸ್ಥೆ ಶಾಖೆ ಮಾಸ್ಟರ್ .
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,ಸಂಸ್ಥೆ ಶಾಖೆ ಮಾಸ್ಟರ್ .
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,ಅಥವಾ
 DocType: Sales Order,Billing Status,ಬಿಲ್ಲಿಂಗ್ ಸ್ಥಿತಿ
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ಸಮಸ್ಯೆಯನ್ನು ವರದಿಮಾಡಿ
@@ -2772,8 +2822,9 @@
 DocType: Notification Control,Sales Order Message,ಮಾರಾಟದ ಆರ್ಡರ್ ಸಂದೇಶ
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","ಇತ್ಯಾದಿ ಕಂಪನಿ, ಕರೆನ್ಸಿ , ಪ್ರಸಕ್ತ ಆರ್ಥಿಕ ವರ್ಷದ , ಹಾಗೆ ಹೊಂದಿಸಿ ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯಗಳು"
 DocType: Payment Entry,Payment Type,ಪಾವತಿ ಪ್ರಕಾರ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ಐಟಂ ಒಂದು ಬ್ಯಾಚ್ ಆಯ್ಕೆಮಾಡಿ {0}. ಈ ಅವಶ್ಯಕತೆಯನ್ನು ಪೂರೈಸುವ ಒಂದು ಬ್ಯಾಚ್ ಸಿಗಲಿಲ್ಲವಾದ್ದರಿಂದ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ಐಟಂ ಒಂದು ಬ್ಯಾಚ್ ಆಯ್ಕೆಮಾಡಿ {0}. ಈ ಅವಶ್ಯಕತೆಯನ್ನು ಪೂರೈಸುವ ಒಂದು ಬ್ಯಾಚ್ ಸಿಗಲಿಲ್ಲವಾದ್ದರಿಂದ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ಐಟಂ ಒಂದು ಬ್ಯಾಚ್ ಆಯ್ಕೆಮಾಡಿ {0}. ಈ ಅವಶ್ಯಕತೆಯನ್ನು ಪೂರೈಸುವ ಒಂದು ಬ್ಯಾಚ್ ಸಿಗಲಿಲ್ಲವಾದ್ದರಿಂದ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ಐಟಂ ಒಂದು ಬ್ಯಾಚ್ ಆಯ್ಕೆಮಾಡಿ {0}. ಈ ಅವಶ್ಯಕತೆಯನ್ನು ಪೂರೈಸುವ ಒಂದು ಬ್ಯಾಚ್ ಸಿಗಲಿಲ್ಲವಾದ್ದರಿಂದ
+DocType: Hub Category,Parent Category,ಪೋಷಕ ವರ್ಗ
 DocType: Process Payroll,Select Employees,ಆಯ್ಕೆ ನೌಕರರು
 DocType: Opportunity,Potential Sales Deal,ಸಂಭಾವ್ಯ ಮಾರಾಟ ಡೀಲ್
 DocType: Complaint,Complaints,ದೂರುಗಳು
@@ -2811,7 +2862,7 @@
 DocType: Bin,Reserved Quantity,ರಿಸರ್ವ್ಡ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,ದಯವಿಟ್ಟು ಮಾನ್ಯವಾದ ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ನಮೂದಿಸಿ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,ದಯವಿಟ್ಟು ಮಾನ್ಯವಾದ ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ನಮೂದಿಸಿ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,ದಯವಿಟ್ಟು ಕಾರ್ಟ್ನಲ್ಲಿ ಐಟಂ ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,ದಯವಿಟ್ಟು ಕಾರ್ಟ್ನಲ್ಲಿ ಐಟಂ ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Landed Cost Voucher,Purchase Receipt Items,ಖರೀದಿ ರಸೀತಿ ಐಟಂಗಳು
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,ಇಚ್ಛೆಗೆ ತಕ್ಕಂತೆ ಫಾರ್ಮ್ಸ್
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,ಉಳಿಕೆ
@@ -2821,15 +2872,15 @@
 DocType: Payment Request,Amount in customer's currency,ಗ್ರಾಹಕರ ಕರೆನ್ಸಿ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,ಡೆಲಿವರಿ
 DocType: Stock Reconciliation Item,Current Qty,ಪ್ರಸ್ತುತ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,ಪೂರೈಕೆದಾರರನ್ನು ಸೇರಿಸಿ
+DocType: Restaurant Menu,Restaurant Menu,ರೆಸ್ಟೋರೆಂಟ್ ಮೆನು
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,ಹಿಂದಿನದು
 DocType: Appraisal Goal,Key Responsibility Area,ಪ್ರಮುಖ ಜವಾಬ್ದಾರಿ ಪ್ರದೇಶ
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ಗಳು ನೀವು ವಿದ್ಯಾರ್ಥಿಗಳು ಹಾಜರಾತಿ, ಮೌಲ್ಯಮಾಪನಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಟ್ರ್ಯಾಕ್ ಸಹಾಯ"
 DocType: Payment Entry,Total Allocated Amount,ಒಟ್ಟು ನಿಗದಿ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,ಸಾರ್ವಕಾಲಿಕ ದಾಸ್ತಾನು ಹೊಂದಿಸಲಾದ ಪೂರ್ವನಿಯೋಜಿತ ದಾಸ್ತಾನು ಖಾತೆ
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,ಸಾರ್ವಕಾಲಿಕ ದಾಸ್ತಾನು ಹೊಂದಿಸಲಾದ ಪೂರ್ವನಿಯೋಜಿತ ದಾಸ್ತಾನು ಖಾತೆ
 DocType: Item Reorder,Material Request Type,ಮೆಟೀರಿಯಲ್ RequestType
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},ನಿಂದ {0} ಗೆ ಸಂಬಳ Accural ಜರ್ನಲ್ ಎಂಟ್ರಿ {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","ಸ್ಥಳಿಯಸಂಗ್ರಹಣೆ ಪೂರ್ಣ, ಉಳಿಸಿಲ್ಲ"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","ಸ್ಥಳಿಯಸಂಗ್ರಹಣೆ ಪೂರ್ಣ, ಉಳಿಸಿಲ್ಲ"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,ಸಾಲು {0}: ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಪರಿವರ್ತನಾ ಕಾರಕ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,ಕೊಠಡಿ ಸಾಮರ್ಥ್ಯ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,ತೀರ್ಪುಗಾರ
@@ -2868,16 +2919,18 @@
 DocType: Project,Task Completion,ಕಾರ್ಯ ಪೂರ್ಣಗೊಂಡ
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,ಮಾಡಿರುವುದಿಲ್ಲ ಸ್ಟಾಕ್
 DocType: Appraisal,HR User,ಮಾನವ ಸಂಪನ್ಮೂಲ ಬಳಕೆದಾರ
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,ಪಿಓಎಸ್?
 DocType: Purchase Invoice,Taxes and Charges Deducted,ಕಡಿತಗೊಳಿಸಲಾಗುತ್ತದೆ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
-apps/erpnext/erpnext/hooks.py +129,Issues,ತೊಂದರೆಗಳು
+apps/erpnext/erpnext/hooks.py +138,Issues,ತೊಂದರೆಗಳು
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},ಸ್ಥಿತಿ ಒಂದು ಇರಬೇಕು {0}
 DocType: Sales Invoice,Debit To,ಡೆಬಿಟ್
+DocType: Restaurant Menu Item,Restaurant Menu Item,ರೆಸ್ಟೋರೆಂಟ್ ಮೆನು ಐಟಂ
 DocType: Delivery Note,Required only for sample item.,ಕೇವಲ ಮಾದರಿ ಐಟಂ ಅಗತ್ಯವಿದೆ .
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ವ್ಯವಹಾರದ ನಂತರ ನಿಜವಾದ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},ಸಂಬಳ ಸ್ಲಿಪ್ ನಡುವಿನ ಭಾಗದಲ್ಲಿ {0} ಮತ್ತು {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},ಸಂಬಳ ಸ್ಲಿಪ್ ನಡುವಿನ ಭಾಗದಲ್ಲಿ {0} ಮತ್ತು {1}
 ,Pending SO Items For Purchase Request,ಖರೀದಿ ವಿನಂತಿ ಆದ್ದರಿಂದ ಐಟಂಗಳು ಬಾಕಿ
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,ವಿದ್ಯಾರ್ಥಿ ಪ್ರವೇಶ
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,ವಿದ್ಯಾರ್ಥಿ ಪ್ರವೇಶ
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Supplier,Billing Currency,ಬಿಲ್ಲಿಂಗ್ ಕರೆನ್ಸಿ
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,ಎಕ್ಸ್ಟ್ರಾ ದೊಡ್ಡದು
@@ -2900,6 +2953,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,ನಮೂದಿಸಿ ಅಗತ್ಯವಿದೆ ಭೇಟಿ ಯಾವುದೇ
 DocType: Stock Settings,Default Valuation Method,ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,ಶುಲ್ಕ
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,ನವೀಕರಣ ಪ್ರಗತಿಯಲ್ಲಿದೆ. ಸ್ವಲ್ಪ ಸಮಯ ತೆಗೆದುಕೊಳ್ಳಬಹುದು.
 DocType: Vehicle Log,Fuel Qty,ಇಂಧನ ಪ್ರಮಾಣ
 DocType: Production Order Operation,Planned Start Time,ಯೋಜಿತ ಆರಂಭಿಸಲು ಸಮಯ
 DocType: Course,Assessment,ಅಸೆಸ್ಮೆಂಟ್
@@ -2915,7 +2969,7 @@
 DocType: Price List,Price List Master,ದರ ಪಟ್ಟಿ ಮಾಸ್ಟರ್
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ನೀವು ಸೆಟ್ ಮತ್ತು ಗುರಿಗಳನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಆ ಎಲ್ಲಾ ಮಾರಾಟದ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಅನೇಕ ** ಮಾರಾಟದ ವ್ಯಕ್ತಿಗಳು ** ವಿರುದ್ಧ ಟ್ಯಾಗ್ ಮಾಡಬಹುದು.
 ,S.O. No.,S.O. ನಂ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},{0} ನಿಂದ ಗ್ರಾಹಕ ಲೀಡ್ ರಚಿಸಲು ದಯವಿಟ್ಟು
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},{0} ನಿಂದ ಗ್ರಾಹಕ ಲೀಡ್ ರಚಿಸಲು ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,ರೋಗಿಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Price List,Applicable for Countries,ದೇಶಗಳು ಅನ್ವಯಿಸುವುದಿಲ್ಲ
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,ನಿಯತಾಂಕದ ಹೆಸರು
@@ -2959,27 +3013,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ಖರ್ಚು / ವ್ಯತ್ಯಾಸ ಖಾತೆ ({0}) ಒಂದು 'ಲಾಭ ಅಥವಾ ನಷ್ಟ' ಖಾತೆ ಇರಬೇಕು
 DocType: Project,Copied From,ನಕಲು
 DocType: Project,Copied From,ನಕಲು
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},ಹೆಸರು ದೋಷ: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,ಕೊರತೆ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},ಹೆಸರು ದೋಷ: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,ಕೊರತೆ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} ಸಂಬಂಧಿಸಿದ ಇಲ್ಲ {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ನೌಕರ ಅಟೆಂಡೆನ್ಸ್ {0} ಈಗಾಗಲೇ ಗುರುತಿಸಲಾಗಿದೆ
 DocType: Packing Slip,If more than one package of the same type (for print),ವೇಳೆ ( ಮುದ್ರಣ ) ಅದೇ ರೀತಿಯ ಒಂದಕ್ಕಿಂತ ಹೆಚ್ಚು ಪ್ಯಾಕೇಜ್
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,ದಯವಿಟ್ಟು ರೆಸ್ಟೋರೆಂಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಗ್ರಾಹಕರನ್ನು ಹೊಂದಿಸಿ
 ,Salary Register,ಸಂಬಳ ನೋಂದಣಿ
 DocType: Warehouse,Parent Warehouse,ಪೋಷಕ ವೇರ್ಹೌಸ್
 DocType: C-Form Invoice Detail,Net Total,ನೆಟ್ ಒಟ್ಟು
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},ಡೀಫಾಲ್ಟ್ ಬಿಒಎಮ್ ಐಟಂ ಕಂಡುಬಂದಿಲ್ಲ {0} ಮತ್ತು ಪ್ರಾಜೆಕ್ಟ್ {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},ಡೀಫಾಲ್ಟ್ ಬಿಒಎಮ್ ಐಟಂ ಕಂಡುಬಂದಿಲ್ಲ {0} ಮತ್ತು ಪ್ರಾಜೆಕ್ಟ್ {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,ವಿವಿಧ ಸಾಲ ರೀತಿಯ ವಿವರಿಸಿ
 DocType: Bin,FCFS Rate,FCFS ದರ
 DocType: Payment Reconciliation Invoice,Outstanding Amount,ಮಹೋನ್ನತ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),ಟೈಮ್ (ನಿಮಿಷಗಳು)
 DocType: Project Task,Working,ಕೆಲಸ
 DocType: Stock Ledger Entry,Stock Queue (FIFO),ಸ್ಟಾಕ್ ಸರದಿಗೆ ( FIFO )
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,ಹಣಕಾಸು ವರ್ಷ
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,ಹಣಕಾಸು ವರ್ಷ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,{0} ಗಾಗಿ ಮಾನದಂಡ ಸ್ಕೋರ್ ಕಾರ್ಯವನ್ನು ಪರಿಹರಿಸಲಾಗಲಿಲ್ಲ. ಸೂತ್ರವು ಮಾನ್ಯವಾಗಿದೆ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,ಮೇಲೆ ವೆಚ್ಚ
 DocType: Healthcare Settings,Out Patient Settings,ರೋಗಿಯ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಔಟ್ ಮಾಡಿ
 DocType: Account,Round Off,ಆಫ್ ಸುತ್ತ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,ಪ್ರಮಾಣ ಧನಾತ್ಮಕವಾಗಿರಬೇಕು
 ,Requested Qty,ವಿನಂತಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
 DocType: Tax Rule,Use for Shopping Cart,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಬಳಸಲು
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},ಮೌಲ್ಯ {0} ವೈಶಿಷ್ಟ್ಯದ {1} ಮಾನ್ಯ ಐಟಂ ಪಟ್ಟಿಯಲ್ಲಿ ಐಟಂ ಆಟ್ರಿಬ್ಯೂಟ್ ಮೌಲ್ಯಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ {2}
@@ -2988,7 +3044,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","ಆರೋಪಗಳನ್ನು ಸೂಕ್ತ ಪ್ರಮಾಣದಲ್ಲಿ ನಿಮ್ಮ ಆಯ್ಕೆಯ ಪ್ರಕಾರ, ಐಟಂ ಪ್ರಮಾಣ ಅಥವಾ ಪ್ರಮಾಣವನ್ನು ಆಧರಿಸಿ ಹಂಚಲಾಗುತ್ತದೆ"
 DocType: Maintenance Visit,Purposes,ಉದ್ದೇಶಗಳಿಗಾಗಿ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,ಕನಿಷ್ಠ ಒಂದು ಐಟಂ ರಿಟರ್ನ್ ದಸ್ತಾವೇಜು ನಕಾರಾತ್ಮಕ ಪ್ರಮಾಣ ದಾಖಲಿಸಬೇಕಾಗುತ್ತದೆ
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,ಕೋರ್ಸ್ಗಳನ್ನು ಸೇರಿಸಿ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ಆಪರೇಷನ್ {0} ಕಾರ್ಯಸ್ಥಳ ಯಾವುದೇ ಲಭ್ಯವಿರುವ ಕೆಲಸದ ಹೆಚ್ಚು {1}, ಅನೇಕ ಕಾರ್ಯಾಚರಣೆಗಳು ಆಪರೇಷನ್ ಮುರಿಯಲು"
 ,Requested,ವಿನಂತಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,ಯಾವುದೇ ಟೀಕೆಗಳನ್ನು
@@ -3000,6 +3055,8 @@
 DocType: Employee Loan,Repaid/Closed,ಮರುಪಾವತಿ / ಮುಚ್ಚಲಾಗಿದೆ
 DocType: Item,Total Projected Qty,ಒಟ್ಟು ಯೋಜಿತ ಪ್ರಮಾಣ
 DocType: Monthly Distribution,Distribution Name,ವಿತರಣೆ ಹೆಸರು
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಪೂರೈಕೆದಾರ ಕೌಟುಂಬಿಕತೆ
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","{1} {2} ಗಾಗಿ ಅಕೌಂಟಿಂಗ್ ನಮೂದುಗಳನ್ನು ಮಾಡಲು ಅಗತ್ಯವಿರುವ ಐಟಂ {0} ಗಾಗಿ ಮೌಲ್ಯಮಾಪನ ದರ ಕಂಡುಬಂದಿಲ್ಲ. ಐಟಂ {1} ನಲ್ಲಿ ಸೊನ್ನೆ ಮೌಲ್ಯಮಾಪನ ದರ ಐಟಂನಂತೆ ವರ್ಗಾವಣೆಯಾಗುತ್ತಿದ್ದರೆ, ದಯವಿಟ್ಟು {1} ಐಟಂ ಟೇಬಲ್ನಲ್ಲಿ ಅದನ್ನು ಉಲ್ಲೇಖಿಸಿ. ಇಲ್ಲದಿದ್ದರೆ, ದಯವಿಟ್ಟು ಐಟಂಗಾಗಿ ಇನ್ಕಮಿಂಗ್ ಸ್ಟಾಕ್ ವಹಿವಾಟನ್ನು ರಚಿಸಿ ಅಥವಾ ಐಟಂ ರೆಕಾರ್ಡ್ನಲ್ಲಿ ಮೌಲ್ಯಾಂಕನ ದರವನ್ನು ಉಲ್ಲೇಖಿಸಿ, ತದನಂತರ ಈ ಪ್ರವೇಶವನ್ನು ಸಲ್ಲಿಸಿ / ರದ್ದುಮಾಡಲು ಪ್ರಯತ್ನಿಸಿ"
 DocType: Course,Course Code,ಕೋರ್ಸ್ ಕೋಡ್
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},ಐಟಂ ಬೇಕಾದ ಗುಣಮಟ್ಟ ತಪಾಸಣೆ {0}
 DocType: POS Settings,Use POS in Offline Mode,ಆಫ್ಲೈನ್ ಮೋಡ್ನಲ್ಲಿ ಪಿಓಎಸ್ ಬಳಸಿ
@@ -3010,14 +3067,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,ಪ್ರದೇಶ ಮ್ಯಾನೇಜ್ಮೆಂಟ್ ಟ್ರೀ .
 DocType: Journal Entry Account,Sales Invoice,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ
 DocType: Journal Entry Account,Party Balance,ಪಕ್ಷದ ಬ್ಯಾಲೆನ್ಸ್
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,ರಿಯಾಯತಿ ಅನ್ವಯಿಸು ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,ರಿಯಾಯತಿ ಅನ್ವಯಿಸು ಆಯ್ಕೆಮಾಡಿ
 DocType: Company,Default Receivable Account,ಡೀಫಾಲ್ಟ್ ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆ
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ಮೇಲೆ ಆಯ್ಕೆ ಮಾನದಂಡದ ಒಟ್ಟು ವೇತನ ಬ್ಯಾಂಕ್ ಎಂಟ್ರಿ ರಚಿಸಿ
 DocType: Physician,Physician Schedule,ಚಿಕಿತ್ಸಕ ವೇಳಾಪಟ್ಟಿ
 DocType: Purchase Invoice,Deemed Export,ಸ್ವಾಮ್ಯದ ರಫ್ತು
 DocType: Stock Entry,Material Transfer for Manufacture,ತಯಾರಿಕೆಗೆ ವಸ್ತು ವರ್ಗಾವಣೆ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,ರಿಯಾಯಿತಿ ಶೇಕಡಾವಾರು ಬೆಲೆ ಪಟ್ಟಿ ವಿರುದ್ಧ ಅಥವಾ ಎಲ್ಲಾ ಬೆಲೆ ಪಟ್ಟಿ ಎರಡೂ ಅನ್ವಯಿಸಬಹುದು.
-DocType: Purchase Invoice,Half-yearly,ಅರ್ಧವಾರ್ಷಿಕ
+DocType: Subscription,Half-yearly,ಅರ್ಧವಾರ್ಷಿಕ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,ಸ್ಟಾಕ್ ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ
 DocType: Lab Test,LabTest Approver,ಲ್ಯಾಬ್ಟೆಸ್ಟ್ ಅಪ್ರೋವರ್
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,ನೀವು ಈಗಾಗಲೇ ಮೌಲ್ಯಮಾಪನ ಮಾನದಂಡದ ನಿರ್ಣಯಿಸುವ {}.
@@ -3046,13 +3103,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,ಹೆಚ್ಚುವರಿ ಸಣ್ಣ
 DocType: Company,Standard Template,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ಟೆಂಪ್ಲೇಟು
 DocType: Training Event,Theory,ಥಿಯರಿ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,ಎಚ್ಚರಿಕೆ : ಪ್ರಮಾಣ ವಿನಂತಿಸಿದ ವಸ್ತು ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ ಕಡಿಮೆ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,ಎಚ್ಚರಿಕೆ : ಪ್ರಮಾಣ ವಿನಂತಿಸಿದ ವಸ್ತು ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ ಕಡಿಮೆ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,ಖಾತೆ {0} ಹೆಪ್ಪುಗಟ್ಟಿರುವ
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ಸಂಸ್ಥೆ ಸೇರಿದ ಖಾತೆಗಳ ಪ್ರತ್ಯೇಕ ಚಾರ್ಟ್ ಜೊತೆಗೆ ಕಾನೂನು ಘಟಕದ / ಅಂಗಸಂಸ್ಥೆ.
 DocType: Payment Request,Mute Email,ಮ್ಯೂಟ್ ಇಮೇಲ್
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","ಆಹಾರ , ಪಾನೀಯ ಮತ್ತು ತಂಬಾಕು"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},ಮಾತ್ರ ವಿರುದ್ಧ ಪಾವತಿ ಮಾಡಬಹುದು unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,ಕಮಿಷನ್ ದರ 100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},ಮಾತ್ರ ವಿರುದ್ಧ ಪಾವತಿ ಮಾಡಬಹುದು unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,ಕಮಿಷನ್ ದರ 100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Stock Entry,Subcontract,subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,ಮೊದಲ {0} ನಮೂದಿಸಿ
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,ಯಾವುದೇ ಪ್ರತ್ಯುತ್ತರಗಳನ್ನು
@@ -3070,10 +3127,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,ಬಣ್ಣದ
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,ಅಸೆಸ್ಮೆಂಟ್ ಯೋಜನೆ ಮಾನದಂಡ
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,ಖರೀದಿ ಆದೇಶಗಳನ್ನು ತಡೆಯಿರಿ
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,ಒಳಗಾಗಬಹುದು
 DocType: Patient Appointment,Scheduled,ಪರಿಶಿಷ್ಟ
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,ಉದ್ಧರಣಾ ಫಾರ್ ವಿನಂತಿ.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ಮಾನವ ಸಂಪನ್ಮೂಲ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಉದ್ಯೋಗಿ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಸಿದ್ಧಗೊಳಿಸಿ
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",&quot;ಇಲ್ಲ&quot; ಮತ್ತು &quot;ಮಾರಾಟ ಐಟಂ&quot; &quot;ಸ್ಟಾಕ್ ಐಟಂ&quot; ಅಲ್ಲಿ &quot;ಹೌದು&quot; ಐಟಂ ಆಯ್ಕೆ ಮತ್ತು ಯಾವುದೇ ಉತ್ಪನ್ನ ಕಟ್ಟು ಇಲ್ಲ ದಯವಿಟ್ಟು
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,ಗ್ರಾಹಕನನ್ನು ಆಯ್ಕೆಮಾಡಿ
 DocType: Student Log,Academic,ಶೈಕ್ಷಣಿಕ
 DocType: Patient,Personal and Social History,ವೈಯಕ್ತಿಕ ಮತ್ತು ಸಾಮಾಜಿಕ ಇತಿಹಾಸ
 DocType: Fee Schedule,Fee Breakup for each student,ಪ್ರತಿ ವಿದ್ಯಾರ್ಥಿಗಳಿಗೆ ಶುಲ್ಕ ವಿಭಜನೆ
@@ -3083,7 +3141,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,ಮೌಲ್ಯಾಂಕನ ದರ
 DocType: Stock Reconciliation,SR/,ಎಸ್ಆರ್ /
 DocType: Vehicle,Diesel,ಡೀಸೆಲ್
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ ಆಯ್ಕೆ ಇಲ್ಲ
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ ಆಯ್ಕೆ ಇಲ್ಲ
 apps/erpnext/erpnext/config/healthcare.py +46,Results,ಫಲಿತಾಂಶಗಳು
 ,Student Monthly Attendance Sheet,ವಿದ್ಯಾರ್ಥಿ ಮಾಸಿಕ ಅಟೆಂಡೆನ್ಸ್ ಶೀಟ್
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},ನೌಕರರ {0} ಈಗಾಗಲೇ {1} {2} ಮತ್ತು ನಡುವೆ ಅನ್ವಯಿಸಿದ್ದಾರೆ {3}
@@ -3099,7 +3157,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,ಮಾರಾಟದ ಪಾರ್ಟ್ನರ್ಸ್ ನಿರ್ವಹಿಸಿ.
 DocType: Quality Inspection,Inspection Type,ಇನ್ಸ್ಪೆಕ್ಷನ್ ಪ್ರಕಾರ
 DocType: Fee Validity,Visited yet,ಇನ್ನೂ ಭೇಟಿ ನೀಡಲಾಗಿದೆ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಗೋದಾಮುಗಳು ಗುಂಪು ಪರಿವರ್ತಿಸಬಹುದು ಸಾಧ್ಯವಿಲ್ಲ.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಗೋದಾಮುಗಳು ಗುಂಪು ಪರಿವರ್ತಿಸಬಹುದು ಸಾಧ್ಯವಿಲ್ಲ.
 DocType: Assessment Result Tool,Result HTML,ಪರಿಣಾಮವಾಗಿ HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ರಂದು ಅವಧಿ ಮೀರುತ್ತದೆ
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,ವಿದ್ಯಾರ್ಥಿಗಳು ಸೇರಿಸಿ
@@ -3126,7 +3184,7 @@
 DocType: Healthcare Settings,Result Printed,ಫಲಿತಾಂಶ ಮುದ್ರಿಸಲಾಗಿದೆ
 DocType: Asset Category Account,Depreciation Expense Account,ಸವಕಳಿ ಖರ್ಚುವೆಚ್ಚ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,ಉಮೇದುವಾರಿಕೆಯ ಅವಧಿಯಲ್ಲಿ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},{0} ವೀಕ್ಷಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},{0} ವೀಕ್ಷಿಸಿ
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ಮಾತ್ರ ಲೀಫ್ ನೋಡ್ಗಳು ವ್ಯವಹಾರದಲ್ಲಿ ಅವಕಾಶ
 DocType: Expense Claim,Expense Approver,ವೆಚ್ಚದಲ್ಲಿ ಅನುಮೋದಕ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,ಸಾಲು {0}: ಗ್ರಾಹಕ ವಿರುದ್ಧ ಅಡ್ವಾನ್ಸ್ ಕ್ರೆಡಿಟ್ ಇರಬೇಕು
@@ -3138,7 +3196,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Datetime ಗೆ
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,ಕೋರ್ಸ್ ವೇಳಾಪಟ್ಟಿಗಳು ಅಳಿಸಲಾಗಿದೆ:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,SMS ಡೆಲಿವರಿ ಸ್ಥಾನಮಾನ ಕಾಯ್ದುಕೊಳ್ಳುವುದು ದಾಖಲೆಗಳು
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,ಮಾರಾಟದ ಗುರಿ ಹೊಂದಿಸಿ
 DocType: Accounts Settings,Make Payment via Journal Entry,ಜರ್ನಲ್ ಎಂಟ್ರಿ ಮೂಲಕ ಪಾವತಿ ಮಾಡಲು
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,ಮುದ್ರಿಸಲಾಗಿತ್ತು
 DocType: Item,Inspection Required before Delivery,ತಪಾಸಣೆ ಅಗತ್ಯ ಡೆಲಿವರಿ ಮೊದಲು
@@ -3146,7 +3203,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,ಬಾಕಿ ಚಟುವಟಿಕೆಗಳು
 DocType: Patient Appointment,Reminded,ಜ್ಞಾಪಿಸಲಾಗಿದೆ
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,ನಿಮ್ಮ ಸಂಸ್ಥೆ
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,ನಿಮ್ಮ ಸಂಸ್ಥೆ
 DocType: Fee Component,Fees Category,ಶುಲ್ಕ ವರ್ಗ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,ದಿನಾಂಕ ನಿವಾರಿಸುವ ನಮೂದಿಸಿ.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,ಮೊತ್ತ
@@ -3158,7 +3215,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟ
 DocType: Company,Chart Of Accounts Template,ಖಾತೆಗಳನ್ನು ಟೆಂಪ್ಲೇಟು ಚಾರ್ಟ್
 DocType: Attendance,Attendance Date,ಅಟೆಂಡೆನ್ಸ್ ದಿನಾಂಕ
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},ಐಟಂ ಬೆಲೆ {0} ಬೆಲೆ ಪಟ್ಟಿ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},ಐಟಂ ಬೆಲೆ {0} ಬೆಲೆ ಪಟ್ಟಿ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ಸಂಬಳ ವಿಘಟನೆಯ ಸಂಪಾದಿಸಿದ ಮತ್ತು ಕಳೆಯುವುದು ಆಧರಿಸಿ .
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,ಚೈಲ್ಡ್ ನೋಡ್ಗಳ ಜೊತೆ ಖಾತೆ ಲೆಡ್ಜರ್ ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Purchase Invoice Item,Accepted Warehouse,ಅಕ್ಸೆಪ್ಟೆಡ್ ವೇರ್ಹೌಸ್
@@ -3174,9 +3231,10 @@
 ,Employee Birthday,ನೌಕರರ ಜನ್ಮದಿನ
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ಅಟೆಂಡೆನ್ಸ್ ಉಪಕರಣ
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,ಮಿತಿ ಕ್ರಾಸ್ಡ್
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,ನಿಗದಿಪಡಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ಸಾಹಸೋದ್ಯಮ ಬಂಡವಾಳ
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,ಈ ಶೈಕ್ಷಣಿಕ ವರ್ಷದ ಶೈಕ್ಷಣಿಕ ಪದವನ್ನು {0} ಮತ್ತು &#39;ಟರ್ಮ್ ಹೆಸರು&#39; {1} ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ. ದಯವಿಟ್ಟು ಈ ನಮೂದುಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","ಐಟಂ {0} ವಿರುದ್ಧದ ವ್ಯವಹಾರ ಇವೆ, ನೀವು ಮೌಲ್ಯವನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","ಐಟಂ {0} ವಿರುದ್ಧದ ವ್ಯವಹಾರ ಇವೆ, ನೀವು ಮೌಲ್ಯವನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ {1}"
 DocType: UOM,Must be Whole Number,ಹೋಲ್ ಸಂಖ್ಯೆ ಇರಬೇಕು
 DocType: Leave Control Panel,New Leaves Allocated (In Days),( ದಿನಗಳಲ್ಲಿ) ನಿಗದಿ ಹೊಸ ಎಲೆಗಳು
 DocType: Purchase Invoice,Invoice Copy,ಸರಕುಪಟ್ಟಿ ನಕಲಿಸಿ
@@ -3186,7 +3244,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,ಸರಕುಪಟ್ಟಿ ಸಂಖ್ಯೆ
 DocType: Shopping Cart Settings,Orders,ಆರ್ಡರ್ಸ್
 DocType: Employee Leave Approver,Leave Approver,ಅನುಮೋದಕ ಬಿಡಿ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,ದಯವಿಟ್ಟು ತಂಡ ಆಯ್ಕೆ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,ದಯವಿಟ್ಟು ತಂಡ ಆಯ್ಕೆ
 DocType: Assessment Group,Assessment Group Name,ಅಸೆಸ್ಮೆಂಟ್ ಗುಂಪು ಹೆಸರು
 DocType: Manufacturing Settings,Material Transferred for Manufacture,ವಸ್ತು ತಯಾರಿಕೆಗೆ ವರ್ಗಾಯಿಸಲಾಯಿತು
 DocType: Expense Claim,"A user with ""Expense Approver"" role","""ಖರ್ಚು ಅನುಮೋದಕ"" ಪಾತ್ರವನ್ನು ಒಂದು ಬಳಕೆದಾರ"
@@ -3201,7 +3259,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,ಅವಧಿಯ ಮುಕ್ತಾಯ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,ಇಲಾಖೆ ಆಯ್ಕೆ ಮಾಡಿ ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವ್ಯವಹಾರಗಳು ವೆಚ್ಚ ಸೆಂಟರ್ ಗುಂಪು ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},ಪ್ರಮಾಣ {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},ಪ್ರಮಾಣ {0} {1} {2} {3}
 DocType: Account,Depreciation,ಸವಕಳಿ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ಪೂರೈಕೆದಾರ (ರು)
 DocType: Employee Attendance Tool,Employee Attendance Tool,ನೌಕರರ ಅಟೆಂಡೆನ್ಸ್ ಉಪಕರಣ
@@ -3213,10 +3271,12 @@
 DocType: GL Entry,Voucher No,ಚೀಟಿ ಸಂಖ್ಯೆ
 ,Lead Owner Efficiency,ಲೀಡ್ ಮಾಲೀಕ ದಕ್ಷತೆ
 ,Lead Owner Efficiency,ಲೀಡ್ ಮಾಲೀಕ ದಕ್ಷತೆ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,ತುಂಬಾ ಜನಪ್ರಿಯವಾದ
 DocType: Leave Allocation,Leave Allocation,ಅಲೋಕೇಶನ್ ಬಿಡಿ
 DocType: Payment Request,Recipient Message And Payment Details,ಸ್ವೀಕರಿಸುವವರ ಸಂದೇಶ ಮತ್ತು ಪಾವತಿ ವಿವರಗಳು
 DocType: Training Event,Trainer Email,ತರಬೇತುದಾರ ಇಮೇಲ್
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳನ್ನು {0} ದಾಖಲಿಸಿದವರು
+DocType: Restaurant Reservation,No of People,ಜನರ ಸಂಖ್ಯೆ
 DocType: Production Planning Tool,Include sub-contracted raw materials,ಉಪ ಗುತ್ತಿಗೆ ಕಚ್ಚಾ ವಸ್ತುಗಳನ್ನು
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,ನಿಯಮಗಳು ಅಥವಾ ಒಪ್ಪಂದದ ಟೆಂಪ್ಲೇಟು .
 DocType: Purchase Invoice,Address and Contact,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕ
@@ -3225,10 +3285,11 @@
 DocType: Supplier,Last Day of the Next Month,ಮುಂದಿನ ತಿಂಗಳ ಕೊನೆಯ ದಿನ
 DocType: Support Settings,Auto close Issue after 7 days,7 ದಿನಗಳ ನಂತರ ಆಟೋ ನಿಕಟ ಸಂಚಿಕೆ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ಮೊದಲು ಹಂಚಿಕೆ ಸಾಧ್ಯವಿಲ್ಲ ಬಿಡಿ {0}, ರಜೆ ಸಮತೋಲನ ಈಗಾಗಲೇ ಕ್ಯಾರಿ ಫಾರ್ವರ್ಡ್ ಭವಿಷ್ಯದ ರಜೆ ಹಂಚಿಕೆ ದಾಖಲೆಯಲ್ಲಿ ಬಂದಿದೆ {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ಗಮನಿಸಿ: ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ {0} ದಿನ ಅವಕಾಶ ಗ್ರಾಹಕ ಕ್ರೆಡಿಟ್ ದಿನಗಳ ಮೀರಿದೆ (ರು)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ಗಮನಿಸಿ: ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ {0} ದಿನ ಅವಕಾಶ ಗ್ರಾಹಕ ಕ್ರೆಡಿಟ್ ದಿನಗಳ ಮೀರಿದೆ (ರು)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,ವಿದ್ಯಾರ್ಥಿ ಅರ್ಜಿದಾರರ
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ಸ್ವೀಕೃತದಾರರಿಗಾಗಿ ಮೂಲ
 DocType: Asset Category Account,Accumulated Depreciation Account,ಕ್ರೋಢಿಕೃತ ಸವಕಳಿ ಖಾತೆ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,ಈ ಇಮೇಲ್ ಸ್ವಯಂಜನಕವಾಗಿದೆ
 DocType: Stock Settings,Freeze Stock Entries,ಫ್ರೀಜ್ ಸ್ಟಾಕ್ ನಮೂದುಗಳು
 DocType: Program Enrollment,Boarding Student,ಬೋರ್ಡಿಂಗ್ ವಿದ್ಯಾರ್ಥಿ
 DocType: Asset,Expected Value After Useful Life,ಉಪಯುಕ್ತ ಲೈಫ್ ನಂತರ ನಿರೀಕ್ಷಿತ ಮೌಲ್ಯ
@@ -3236,7 +3297,7 @@
 DocType: Activity Cost,Billing Rate,ಬಿಲ್ಲಿಂಗ್ ದರ
 ,Qty to Deliver,ಡೆಲಿವರ್ ಪ್ರಮಾಣ
 ,Stock Analytics,ಸ್ಟಾಕ್ ಅನಾಲಿಟಿಕ್ಸ್
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,ಕಾರ್ಯಾಚರಣೆ ಖಾಲಿ ಬಿಡುವಂತಿಲ್ಲ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,ಕಾರ್ಯಾಚರಣೆ ಖಾಲಿ ಬಿಡುವಂತಿಲ್ಲ
 DocType: Maintenance Visit Purpose,Against Document Detail No,ಡಾಕ್ಯುಮೆಂಟ್ ವಿವರ ವಿರುದ್ಧ ನಂ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಕಡ್ಡಾಯ
 DocType: Quality Inspection,Outgoing,ನಿರ್ಗಮಿಸುವ
@@ -3259,7 +3320,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,ಚಟುವಟಿಕೆ ಆಧಾರಿತ ಗ್ರೂಪ್ ಕೈಯಾರೆ ವಿದ್ಯಾರ್ಥಿಗಳು ಆಯ್ಕೆ
 DocType: Journal Entry,User Remark,ಬಳಕೆದಾರ ಟೀಕಿಸು
 DocType: Lead,Market Segment,ಮಾರುಕಟ್ಟೆ ವಿಭಾಗ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},ಪಾವತಿಸಿದ ಮೊತ್ತ ಒಟ್ಟು ಋಣಾತ್ಮಕ ಬಾಕಿ ಮೊತ್ತದ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},ಪಾವತಿಸಿದ ಮೊತ್ತ ಒಟ್ಟು ಋಣಾತ್ಮಕ ಬಾಕಿ ಮೊತ್ತದ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ {0}
 DocType: Supplier Scorecard Period,Variables,ವೇರಿಯೇಬಲ್ಸ್
 DocType: Employee Internal Work History,Employee Internal Work History,ಆಂತರಿಕ ಕೆಲಸದ ಇತಿಹಾಸ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),ಮುಚ್ಚುವ (ಡಾ)
@@ -3289,21 +3350,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ಅಪ್ಡೇಟ್ಗಳು ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: ಖಾತೆ {2} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ {0} ರದ್ದು ಅಥವಾ ನಿಲ್ಲಿಸಿದಾಗ
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,ಮ್ಯಾನೇಜ್ಮೆಂಟ್ ಬಿಡಿ
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,ಮ್ಯಾನೇಜ್ಮೆಂಟ್ ಬಿಡಿ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,ಖಾತೆ ಗುಂಪು
 DocType: Sales Order,Fully Delivered,ಸಂಪೂರ್ಣವಾಗಿ ತಲುಪಿಸಲಾಗಿದೆ
 DocType: Lead,Lower Income,ಕಡಿಮೆ ವರಮಾನ
+DocType: Restaurant Order Entry,Current Order,ಪ್ರಸ್ತುತ ಆದೇಶ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},ಮೂಲ ಮತ್ತು ಗುರಿ ಗೋದಾಮಿನ ಸಾಲಿನ ಇರಲಾಗುವುದಿಲ್ಲ {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ಈ ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಒಂದು ಆರಂಭಿಕ ಎಂಟ್ರಿ ಏಕೆಂದರೆ ವ್ಯತ್ಯಾಸ ಖಾತೆ, ಒಂದು ಆಸ್ತಿ / ಹೊಣೆಗಾರಿಕೆ ರೀತಿಯ ಖಾತೆ ಇರಬೇಕು"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ಪಾವತಿಸಲಾಗುತ್ತದೆ ಪ್ರಮಾಣ ಸಾಲದ ಪ್ರಮಾಣ ಹೆಚ್ಚು ಹೆಚ್ಚಿರಬಾರದು {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,ಪ್ರೋಗ್ರಾಂಗಳಿಗೆ ಹೋಗಿ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಸಂಖ್ಯೆ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ರಚಿಸಿಲ್ಲ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ರಚಿಸಿಲ್ಲ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"ಇಂದ ದಿನಾಂಕ, ಗೆ ದಿನಾಂಕದ ಆಮೇಲೆ ಬರಬೇಕು"
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ಅಲ್ಲ ವಿದ್ಯಾರ್ಥಿಯಾಗಿ ಸ್ಥಿತಿಯನ್ನು ಬದಲಾಯಿಸಬಹುದು {0} ವಿದ್ಯಾರ್ಥಿ ಅಪ್ಲಿಕೇಶನ್ ಸಂಬಂಧ ಇದೆ {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},ಅಲ್ಲ ವಿದ್ಯಾರ್ಥಿಯಾಗಿ ಸ್ಥಿತಿಯನ್ನು ಬದಲಾಯಿಸಬಹುದು {0} ವಿದ್ಯಾರ್ಥಿ ಅಪ್ಲಿಕೇಶನ್ ಸಂಬಂಧ ಇದೆ {1}
 DocType: Asset,Fully Depreciated,ಸಂಪೂರ್ಣವಾಗಿ Depreciated
 ,Stock Projected Qty,ಸ್ಟಾಕ್ ಪ್ರಮಾಣ ಯೋಜಿತ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},ಗ್ರಾಹಕ {0} ಅಭಿವ್ಯಕ್ತಗೊಳಿಸಲು ಸೇರಿಲ್ಲ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},ಗ್ರಾಹಕ {0} ಅಭಿವ್ಯಕ್ತಗೊಳಿಸಲು ಸೇರಿಲ್ಲ {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,ಗುರುತು ಅಟೆಂಡೆನ್ಸ್ ಎಚ್ಟಿಎಮ್ಎಲ್
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","ಉಲ್ಲೇಖಗಳು ಪ್ರಸ್ತಾಪಗಳನ್ನು, ನಿಮ್ಮ ಗ್ರಾಹಕರಿಗೆ ಕಳುಹಿಸಿದ್ದಾರೆ ಬಿಡ್ ಇವೆ"
 DocType: Sales Order,Customer's Purchase Order,ಗ್ರಾಹಕರ ಆರ್ಡರ್ ಖರೀದಿಸಿ
@@ -3314,8 +3376,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,ದಯವಿಟ್ಟು ಸೆಟ್ Depreciations ಸಂಖ್ಯೆ ಬುಕ್ಡ್
 DocType: Supplier Scorecard Period,Calculations,ಲೆಕ್ಕಾಚಾರಗಳು
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,ಮೌಲ್ಯ ಅಥವಾ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,ಪ್ರೊಡಕ್ಷನ್ಸ್ ಆರ್ಡರ್ಸ್ ಬೆಳೆದ ಸಾಧ್ಯವಿಲ್ಲ:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,ಪ್ರೊಡಕ್ಷನ್ಸ್ ಆರ್ಡರ್ಸ್ ಬೆಳೆದ ಸಾಧ್ಯವಿಲ್ಲ:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,ಮಿನಿಟ್
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ದಯವಿಟ್ಟು ಸೆಟಪ್&gt; ಸೆಟ್ಟಿಂಗ್ಗಳು&gt; ಹೆಸರಿಸುವ ಸರಣಿ ಮೂಲಕ {0} ಹೆಸರಿಸುವ ಸರಣಿಗಳನ್ನು ಹೊಂದಿಸಿ
 DocType: Purchase Invoice,Purchase Taxes and Charges,ಖರೀದಿ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,ಪೂರೈಕೆದಾರರಿಗೆ ಹೋಗಿ
 ,Qty to Receive,ಸ್ವೀಕರಿಸುವ ಪ್ರಮಾಣ
@@ -3329,7 +3392,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಕ್ರೆಡಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,ಎಲ್ಲಾ ವಿಧಗಳು ಸರಬರಾಜುದಾರ
 DocType: Global Defaults,Disable In Words,ವರ್ಡ್ಸ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,ಐಟಂ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಂಖ್ಯೆಯ ಕಾರಣ ಐಟಂ ಕೋಡ್ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,ಐಟಂ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಂಖ್ಯೆಯ ಕಾರಣ ಐಟಂ ಕೋಡ್ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},ನುಡಿಮುತ್ತುಗಳು {0} ಅಲ್ಲ ರೀತಿಯ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಐಟಂ
 DocType: Sales Order,%  Delivered,ತಲುಪಿಸಲಾಗಿದೆ %
@@ -3351,23 +3414,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,ಆರಂಭಿಕ ಬ್ಯಾಲೆನ್ಸ್ ಇಕ್ವಿಟಿ
 DocType: Lead,CRM,ಸಿಆರ್ಎಂ
 DocType: Purchase Invoice,N,ಎನ್
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,ಸಾಮರಸ್ಯ
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,ಉಳಿದ
 DocType: Appraisal,Appraisal,ಬೆಲೆಕಟ್ಟುವಿಕೆ
 DocType: Purchase Invoice,GST Details,ಜಿಎಸ್ಟಿ ವಿವರಗಳು
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},ಇಮೇಲ್ ಪೂರೈಕೆದಾರ ಕಳುಹಿಸಲಾಗುವುದು {0}
+DocType: Item,Default Sales Unit of Measure,ಅಳತೆ ಡೀಫಾಲ್ಟ್ ಮಾರಾಟದ ಘಟಕ
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,ದಿನಾಂಕ ಪುನರಾವರ್ತಿಸುತ್ತದೆ
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,ಅಧಿಕೃತ ಸಹಿ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},ಬಿಡಿ ಅನುಮೋದಕ ಒಂದು ಇರಬೇಕು {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,ಶುಲ್ಕಗಳು ರಚಿಸಿ
-DocType: Hub Settings,Seller Email,ಮಾರಾಟಗಾರ ಇಮೇಲ್
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ಒಟ್ಟು ಖರೀದಿ ವೆಚ್ಚ (ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಮೂಲಕ)
 DocType: Training Event,Start Time,ಟೈಮ್
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,ಆಯ್ಕೆ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,ಆಯ್ಕೆ ಪ್ರಮಾಣ
 DocType: Customs Tariff Number,Customs Tariff Number,ಕಸ್ಟಮ್ಸ್ ಸುಂಕದ ಸಂಖ್ಯೆ
 DocType: Patient Appointment,Patient Appointment,ರೋಗಿಯ ನೇಮಕಾತಿ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,ಪಾತ್ರ ನಿಯಮ ಅನ್ವಯವಾಗುತ್ತದೆ ಪಾತ್ರ ಅನುಮೋದನೆ ಇರಲಾಗುವುದಿಲ್ಲ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,ಈ ಇಮೇಲ್ ಡೈಜೆಸ್ಟ್ ಅನ್ಸಬ್ಸ್ಕ್ರೈಬ್
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,ಈ ಇಮೇಲ್ ಡೈಜೆಸ್ಟ್ ಅನ್ಸಬ್ಸ್ಕ್ರೈಬ್
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,ಮೂಲಕ ಪೂರೈಕೆದಾರರನ್ನು ಪಡೆಯಿರಿ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} ಐಟಂ {1} ಗಾಗಿ ಕಂಡುಬಂದಿಲ್ಲ
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,ಕೋರ್ಸ್ಗಳಿಗೆ ಹೋಗಿ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,ಕಳುಹಿಸಿದ ಸಂದೇಶವನ್ನು
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,ಚೈಲ್ಡ್ ನೋಡ್ಗಳ ಜೊತೆ ಖಾತೆ ಲೆಡ್ಜರ್ ಎಂದು ಹೊಂದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
@@ -3380,11 +3446,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,ವಸ್ತು ಉತ್ಪಾದನೆ ವರ್ಗಾಯಿಸಲ್ಪಟ್ಟ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,ಖಾತೆ {0} ಮಾಡುವುದಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 DocType: Project,Project Type,ಪ್ರಾಜೆಕ್ಟ್ ಕೌಟುಂಬಿಕತೆ
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,ಈ ಕಾರ್ಯಕ್ಕಾಗಿ ಮಗುವಿನ ಕಾರ್ಯವು ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ. ಈ ಕಾರ್ಯವನ್ನು ನೀವು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ಗುರಿ ಪ್ರಮಾಣ ಅಥವಾ ಗುರಿ ಪ್ರಮಾಣವನ್ನು ಒಂದೋ ಕಡ್ಡಾಯ.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,ಅನೇಕ ಚಟುವಟಿಕೆಗಳ ವೆಚ್ಚ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,ಯಾವುದೇ ಫಲಿತಾಂಶಗಳಿಲ್ಲ
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,ಅನೇಕ ಚಟುವಟಿಕೆಗಳ ವೆಚ್ಚ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",ಕ್ರಿಯೆಗಳು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ {0} ರಿಂದ ಮಾರಾಟದ ವ್ಯಕ್ತಿಗಳು ಕೆಳಗೆ ಜೋಡಿಸಲಾದ ನೌಕರರ ಒಂದು ಬಳಕೆದಾರ ID ಹೊಂದಿಲ್ಲ {1}
 DocType: Timesheet,Billing Details,ಬಿಲ್ಲಿಂಗ್ ವಿವರಗಳು
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,ಮೂಲ ಮತ್ತು ಗುರಿ ಗೋದಾಮಿನ ಬೇರೆಯಾಗಿರಬೇಕು
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,ಮೂಲ ಮತ್ತು ಗುರಿ ಗೋದಾಮಿನ ಬೇರೆಯಾಗಿರಬೇಕು
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},ಹೆಚ್ಚು ಸ್ಟಾಕ್ ವ್ಯವಹಾರ ಹಳೆಯ ನವೀಕರಿಸಲು ಅವಕಾಶ {0}
 DocType: Purchase Invoice Item,PR Detail,ತರಬೇತಿ ವಿವರ
 DocType: Sales Order,Fully Billed,ಸಂಪೂರ್ಣವಾಗಿ ಖ್ಯಾತವಾದ
@@ -3411,7 +3479,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,ವೈರ್ ಟ್ರಾನ್ಸ್ಫರ್
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,ಎಲ್ಲಾ ಪರಿಶೀಲಿಸಿ
 DocType: Vehicle Log,Invoice Ref,ಸರಕುಪಟ್ಟಿ ಉಲ್ಲೇಖ
-DocType: Purchase Order,Recurring Order,ಮರುಕಳಿಸುವ ಆರ್ಡರ್
 DocType: Company,Default Income Account,ಡೀಫಾಲ್ಟ್ ಆದಾಯ ಖಾತೆ
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,ಗ್ರಾಹಕ ಗುಂಪಿನ / ಗ್ರಾಹಕ
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),ಮುಚ್ಚದ ಆರ್ಥಿಕ ವರ್ಷ ಲಾಭ / ನಷ್ಟ (ಕ್ರೆಡಿಟ್)
@@ -3425,9 +3492,9 @@
 DocType: Patient,A Negative,ಒಂದು ನಕಾರಾತ್ಮಕ
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,ಬೇರೇನೂ ತೋರಿಸಲು.
 DocType: Lead,From Customer,ಗ್ರಾಹಕ
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,ಕರೆಗಳು
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,ಕರೆಗಳು
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,ಉತ್ಪನ್ನ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,ಬ್ಯಾಚ್ಗಳು
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,ಬ್ಯಾಚ್ಗಳು
 DocType: Project,Total Costing Amount (via Time Logs),ಒಟ್ಟು ಕಾಸ್ಟಿಂಗ್ ಪ್ರಮಾಣ (ಸಮಯ ದಾಖಲೆಗಳು ಮೂಲಕ)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,ಶುಲ್ಕ ವೇಳಾಪಟ್ಟಿ ಮಾಡಿ
 DocType: Purchase Order Item Supplied,Stock UOM,ಸ್ಟಾಕ್ UOM
@@ -3452,7 +3519,7 @@
 DocType: School Settings,Current Academic Term,ಪ್ರಸ್ತುತ ಶೈಕ್ಷಣಿಕ ಟರ್ಮ್
 DocType: School Settings,Current Academic Term,ಪ್ರಸ್ತುತ ಶೈಕ್ಷಣಿಕ ಟರ್ಮ್
 DocType: Sales Order,Not Billed,ಖ್ಯಾತವಾದ ಮಾಡಿರುವುದಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,ಎರಡೂ ಗೋದಾಮಿನ ಅದೇ ಕಂಪನಿ ಸೇರಿರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,ಎರಡೂ ಗೋದಾಮಿನ ಅದೇ ಕಂಪನಿ ಸೇರಿರಬೇಕು
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,ಯಾವುದೇ ಸಂಪರ್ಕಗಳನ್ನು ಇನ್ನೂ ಸೇರಿಸಲಾಗಿದೆ.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,ಇಳಿಯಿತು ವೆಚ್ಚ ಚೀಟಿ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,ಪೂರೈಕೆದಾರರು ಬೆಳೆಸಿದರು ಬಿಲ್ಲುಗಳನ್ನು .
@@ -3461,7 +3528,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,ರಿಯಾಯಿತಿ ಪ್ರಮಾಣ
 DocType: Purchase Invoice,Return Against Purchase Invoice,ವಿರುದ್ಧ ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಹಿಂತಿರುಗಿ
 DocType: Item,Warranty Period (in days),( ದಿನಗಳಲ್ಲಿ ) ಖಾತರಿ ಅವಧಿಯ
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',ಅಪ್ಡೇಟ್ `ಟ್ಯಾಬ್ಪೋಷಿಯೆಂಟ್ ನೇಮಕಾತಿ` ಸೆಟ್ sales_invoice = &#39;{0}&#39; ಅಲ್ಲಿ ಹೆಸರು = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Guardian1 ಸಂಬಂಧ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,ಕಾರ್ಯಾಚರಣೆ ನಿವ್ವಳ ನಗದು
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,ಐಟಂ 4
@@ -3470,8 +3536,8 @@
 DocType: Journal Entry Account,Journal Entry Account,ಜರ್ನಲ್ ಎಂಟ್ರಿ ಖಾತೆ
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು
 DocType: Shopping Cart Settings,Quotation Series,ಉದ್ಧರಣ ಸರಣಿ
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","ಐಟಂ ( {0} ) , ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಹೆಸರನ್ನು ದಯವಿಟ್ಟು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,ದಯವಿಟ್ಟು ಗ್ರಾಹಕರ ಆಯ್ಕೆ
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","ಐಟಂ ( {0} ) , ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಹೆಸರನ್ನು ದಯವಿಟ್ಟು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,ದಯವಿಟ್ಟು ಗ್ರಾಹಕರ ಆಯ್ಕೆ
 DocType: C-Form,I,ನಾನು
 DocType: Company,Asset Depreciation Cost Center,ಆಸ್ತಿ ಸವಕಳಿ ವೆಚ್ಚದ ಕೇಂದ್ರ
 DocType: Sales Order Item,Sales Order Date,ಮಾರಾಟದ ಆದೇಶ ದಿನಾಂಕ
@@ -3480,6 +3546,7 @@
 DocType: Assessment Plan,Assessment Plan,ಅಸೆಸ್ಮೆಂಟ್ ಯೋಜನೆ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,ಗ್ರಾಹಕ {0} ರಚಿಸಲಾಗಿದೆ.
 DocType: Stock Settings,Limit Percent,ಮಿತಿ ಪರ್ಸೆಂಟ್
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,ಯಾವುದೇ ವೇರ್ಹೌಸ್ನಲ್ಲಿ ಪ್ರಸ್ತುತ ಯಾವುದೇ ಸ್ಟಾಕ್ ಲಭ್ಯವಿಲ್ಲ
 ,Payment Period Based On Invoice Date,ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕವನ್ನು ಆಧರಿಸಿ ಪಾವತಿ ಅವಧಿ
 DocType: Sample Collection,No. of print,ಮುದ್ರಣ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},ಕಾಣೆಯಾಗಿದೆ ಕರೆನ್ಸಿ ವಿನಿಮಯ ದರಗಳು {0}
@@ -3535,13 +3602,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,ಒಟ್ಟು ಪೇ - ಒಟ್ಟು ವಿನಾಯಿತಿ - ಸಾಲದ ಮರುಪಾವತಿಯ
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,ಪ್ರಸ್ತುತ BOM ಮತ್ತು ಹೊಸ BOM ಇರಲಾಗುವುದಿಲ್ಲ
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,ಸಂಬಳ ಸ್ಲಿಪ್ ಐಡಿ
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,ಸಂಬಳ ಸ್ಲಿಪ್ ಐಡಿ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,ನಿವೃತ್ತಿ ದಿನಾಂಕ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,ಮೇಲೆ ತೆರಳಬೇಕಾದರೆ ಸಹಜವಾಗಿ ಸಂದರ್ಭದಲ್ಲಿ ದೋಷಗಳು ಇದ್ದವು:
 DocType: Sales Invoice,Against Income Account,ಆದಾಯ ಖಾತೆ ವಿರುದ್ಧ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% ತಲುಪಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ಐಟಂ {0}: ಆದೇಶ ಪ್ರಮಾಣ {1} ಕನಿಷ್ಠ ಸಲುವಾಗಿ ಪ್ರಮಾಣ {2} (ಐಟಂ ವ್ಯಾಖ್ಯಾನಿಸಲಾಗಿದೆ) ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ಐಟಂ {0}: ಆದೇಶ ಪ್ರಮಾಣ {1} ಕನಿಷ್ಠ ಸಲುವಾಗಿ ಪ್ರಮಾಣ {2} (ಐಟಂ ವ್ಯಾಖ್ಯಾನಿಸಲಾಗಿದೆ) ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ಮಾಸಿಕ ವಿತರಣೆ ಶೇಕಡಾವಾರು
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,ದಯವಿಟ್ಟು ಇನ್ನೊಂದು ಬಳಕೆದಾರರಂತೆ ಲಾಗಿನ್ ಮಾಡಿ.
 DocType: Territory,Territory Targets,ಪ್ರದೇಶ ಗುರಿಗಳ
 DocType: Delivery Note,Transporter Info,ಸಾರಿಗೆ ಮಾಹಿತಿ
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},ದಯವಿಟ್ಟು ಡೀಫಾಲ್ಟ್ {0} ಕಂಪನಿ ಸೆಟ್ {1}
@@ -3549,13 +3617,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,ಅದೇ ಪೂರೈಕೆದಾರ ಅನೇಕ ಬಾರಿ ನಮೂದಿಸಲಾದ
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,ಒಟ್ಟು ಲಾಭ / ನಷ್ಟ
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಐಟಂ ವಿತರಿಸುತ್ತಾರೆ
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,ಕಂಪೆನಿ ಹೆಸರು ಕಂಪನಿ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,ಕಂಪೆನಿ ಹೆಸರು ಕಂಪನಿ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ಮುದ್ರಣ ಟೆಂಪ್ಲೆಟ್ಗಳನ್ನು letterheads .
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ಮುದ್ರಣ ಶೀರ್ಷಿಕೆ ಇ ಜಿ ಟೆಂಪ್ಲೇಟ್ಗಳು Proforma ಸರಕುಪಟ್ಟಿ .
 DocType: Program Enrollment,Walking,ವಾಕಿಂಗ್
 DocType: Student Guardian,Student Guardian,ವಿದ್ಯಾರ್ಥಿ ಗಾರ್ಡಿಯನ್
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,ಮೌಲ್ಯಾಂಕನ ರೀತಿಯ ಆರೋಪಗಳನ್ನು ಇನ್ಕ್ಲೂಸಿವ್ ಎಂದು ಗುರುತಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: POS Profile,Update Stock,ಸ್ಟಾಕ್ ನವೀಕರಿಸಲು
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,ಚಂದಾದಾರಿಕೆಯಲ್ಲಿ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,ಐಟಂಗಳನ್ನು ವಿವಿಧ UOM ತಪ್ಪು ( ಒಟ್ಟು ) ನೆಟ್ ತೂಕ ಮೌಲ್ಯವನ್ನು ಕಾರಣವಾಗುತ್ತದೆ . ಪ್ರತಿ ಐಟಂ ಮಾಡಿ surethat ನೆಟ್ ತೂಕ ಅದೇ UOM ಹೊಂದಿದೆ .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,ಬಿಒಎಮ್ ದರ
 DocType: Asset,Journal Entry for Scrap,ಸ್ಕ್ರ್ಯಾಪ್ ಜರ್ನಲ್ ಎಂಟ್ರಿ
@@ -3605,15 +3674,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","ವ್ಯವಸ್ಥೆ ಬಳಕೆದಾರರು ( ಲಾಗಿನ್ ) id. ಹೊಂದಿಸಿದಲ್ಲಿ , ಎಲ್ಲಾ ಮಾನವ ಸಂಪನ್ಮೂಲ ರೂಪಗಳು ಡೀಫಾಲ್ಟ್ ಪರಿಣಮಿಸುತ್ತದೆ ."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: ಗೆ {1}
 DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,ಎಲ್ಲಾ ಬಿಲ್ ಮೆಟೀರಿಯಲ್ಸ್ನಲ್ಲಿ ಇತ್ತೀಚಿನ ಬೆಲೆಯನ್ನು ನವೀಕರಿಸಲು ಸರದಿಯಿದೆ. ಇದು ಕೆಲವು ನಿಮಿಷಗಳನ್ನು ತೆಗೆದುಕೊಳ್ಳಬಹುದು.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,ಎಲ್ಲಾ ಬಿಲ್ ಮೆಟೀರಿಯಲ್ಸ್ನಲ್ಲಿ ಇತ್ತೀಚಿನ ಬೆಲೆಯನ್ನು ನವೀಕರಿಸಲು ಸರದಿಯಿದೆ. ಇದು ಕೆಲವು ನಿಮಿಷಗಳನ್ನು ತೆಗೆದುಕೊಳ್ಳಬಹುದು.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,ಹೊಸ ಖಾತೆ ಶಾಲೆಯ ಹೆಸರು. ಗಮನಿಸಿ: ಗ್ರಾಹಕರ ಹಾಗೂ ವಿತರಕರ ಖಾತೆಗಳನ್ನು ರಚಿಸಲು ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,ದೇಶದ ಬುದ್ಧಿವಂತ ಡೀಫಾಲ್ಟ್ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟ್ಗಳು
 DocType: Sales Order Item,Supplier delivers to Customer,ಸರಬರಾಜುದಾರ ಗ್ರಾಹಕ ನೀಡುತ್ತದೆ
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ಫಾರ್ಮ್ / ಐಟಂ / {0}) ಷೇರುಗಳ ಔಟ್
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ ನಂತರ ಇರುವಂತಿಲ್ಲ {0}
+,Sales Payment Summary,ಮಾರಾಟದ ಪಾವತಿ ಸಾರಾಂಶ
+DocType: Restaurant,Restaurant,ಉಪಹಾರ ಗೃಹ
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ ನಂತರ ಇರುವಂತಿಲ್ಲ {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ಡೇಟಾ ಆಮದು ಮತ್ತು ರಫ್ತು
 DocType: Patient,Account Details,ಖಾತೆ ವಿವರಗಳು
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,ಯಾವುದೇ ವಿದ್ಯಾರ್ಥಿಗಳು ಕಂಡುಬಂದಿಲ್ಲ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,ಯಾವುದೇ ವಿದ್ಯಾರ್ಥಿಗಳು ಕಂಡುಬಂದಿಲ್ಲ
 DocType: Medical Department,Medical Department,ವೈದ್ಯಕೀಯ ಇಲಾಖೆ
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,ಸರಬರಾಜುದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ಸ್ಕೋರಿಂಗ್ ಮಾನದಂಡ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,ಸರಕುಪಟ್ಟಿ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ
@@ -3624,8 +3695,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,ದಯವಿಟ್ಟು ಪಕ್ಷದ ಆರಿಸುವ ಮೊದಲು ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಆಯ್ಕೆ
 DocType: Program Enrollment,School House,ಸ್ಕೂಲ್ ಹೌಸ್
 DocType: Serial No,Out of AMC,ಎಎಂಸಿ ಔಟ್
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,ದಯವಿಟ್ಟು ಉಲ್ಲೇಖಗಳು ಆಯ್ಕೆ
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,ದಯವಿಟ್ಟು ಉಲ್ಲೇಖಗಳು ಆಯ್ಕೆ
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,ದಯವಿಟ್ಟು ಉಲ್ಲೇಖಗಳು ಆಯ್ಕೆ
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,ದಯವಿಟ್ಟು ಉಲ್ಲೇಖಗಳು ಆಯ್ಕೆ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ಬುಕ್ಡ್ Depreciations ಸಂಖ್ಯೆ ಒಟ್ಟು ಸಂಖ್ಯೆ Depreciations ಕ್ಕೂ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,ನಿರ್ವಹಣೆ ಭೇಟಿ ಮಾಡಿ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,ಮಾರಾಟದ ಮಾಸ್ಟರ್ ಮ್ಯಾನೇಜರ್ {0} ಪಾತ್ರದಲ್ಲಿ ಹೊಂದಿರುವ ಬಳಕೆದಾರರಿಗೆ ಸಂಪರ್ಕಿಸಿ
@@ -3633,7 +3704,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,ಕಂಪನಿ ( ಗ್ರಾಹಕ ಅಥವಾ ಸರಬರಾಜುದಾರ ) ಮಾಸ್ಟರ್ .
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ಈ ವಿದ್ಯಾರ್ಥಿ ಹಾಜರಾತಿ ಆಧರಿಸಿದೆ
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,ಯಾವುದೇ ವಿದ್ಯಾರ್ಥಿಗಳ ರಲ್ಲಿ
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,ಹೆಚ್ಚಿನ ಐಟಂಗಳನ್ನು ಅಥವಾ ಮುಕ್ತ ಪೂರ್ಣ ರೂಪ ಸೇರಿಸಿ
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,ಹೆಚ್ಚಿನ ಐಟಂಗಳನ್ನು ಅಥವಾ ಮುಕ್ತ ಪೂರ್ಣ ರೂಪ ಸೇರಿಸಿ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ಡೆಲಿವರಿ ಟಿಪ್ಪಣಿಗಳು {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,ಬಳಕೆದಾರರಿಗೆ ಹೋಗಿ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,ಪಾವತಿಸಿದ ಪ್ರಮಾಣದ + ಆಫ್ ಬರೆಯಿರಿ ಪ್ರಮಾಣ ಹೆಚ್ಚಿನ ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ಸಾಧ್ಯವಿಲ್ಲ
@@ -3653,37 +3724,40 @@
 DocType: Fee Schedule,Fee Schedule,ಶುಲ್ಕ ವೇಳಾಪಟ್ಟಿ
 DocType: Hub Settings,Publish Availability,ಲಭ್ಯತೆ ಪ್ರಕಟಿಸಿ
 DocType: Company,Create Chart Of Accounts Based On,ಖಾತೆಗಳನ್ನು ಆಧರಿಸಿ ಚಾರ್ಟ್ ರಚಿಸಿ
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,ಅದನ್ನು ಗುಂಪಿಗೆ ಪರಿವರ್ತಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಮಕ್ಕಳ ಕಾರ್ಯಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿವೆ.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,ಜನ್ಮ ದಿನಾಂಕ ಇಂದು ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ.
 ,Stock Ageing,ಸ್ಟಾಕ್ ಏಜಿಂಗ್
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},ವಿದ್ಯಾರ್ಥಿ {0} ವಿದ್ಯಾರ್ಥಿ ಅರ್ಜಿದಾರರ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿವೆ {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),ಪೂರ್ಣಾಂಕಗೊಳಿಸುವ ಹೊಂದಾಣಿಕೆ (ಕಂಪೆನಿ ಕರೆನ್ಸಿ)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,ವೇಳಾಚೀಟಿ
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,ವೇಳಾಚೀಟಿ
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ಓಪನ್ ಹೊಂದಿಸಿ
 DocType: Cheque Print Template,Scanned Cheque,ಸ್ಕ್ಯಾನ್ ಚೆಕ್
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ ವ್ಯವಹಾರಗಳ ಮೇಲೆ ಸಂಪರ್ಕಗಳು ಸ್ವಯಂಚಾಲಿತ ಕಳುಹಿಸು.
 DocType: Timesheet,Total Billable Amount,ಒಟ್ಟು ಬಿಲ್ ಮಾಡಬಹುದಾದ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,ಐಟಂ 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,ಆರ್ಡರ್ ಎಂಟ್ರಿ
 DocType: Purchase Order,Customer Contact Email,ಗ್ರಾಹಕ ಸಂಪರ್ಕ ಇಮೇಲ್
 DocType: Warranty Claim,Item and Warranty Details,ಐಟಂ ಮತ್ತು ಖಾತರಿ ವಿವರಗಳು
 DocType: Sales Team,Contribution (%),ಕೊಡುಗೆ ( % )
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ಗಮನಿಸಿ : ಪಾವತಿ ಎಂಟ್ರಿ 'ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ' ಏನು ನಿರ್ದಿಷ್ಟಪಡಿಸಿಲ್ಲ ರಿಂದ ರಚಿಸಲಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,ಪ್ರಾಜೆಕ್ಟ್ {0} ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 DocType: Medical Department,Nursing User,ನರ್ಸಿಂಗ್ ಬಳಕೆದಾರ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,ಜವಾಬ್ದಾರಿಗಳನ್ನು
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,ಈ ಉದ್ಧರಣದ ಮಾನ್ಯತೆಯ ಅವಧಿಯು ಕೊನೆಗೊಂಡಿದೆ.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,ಈ ಉದ್ಧರಣದ ಮಾನ್ಯತೆಯ ಅವಧಿಯು ಕೊನೆಗೊಂಡಿದೆ.
 DocType: Expense Claim Account,Expense Claim Account,ಖರ್ಚು ಹಕ್ಕು ಖಾತೆ
 DocType: Accounts Settings,Allow Stale Exchange Rates,ಸ್ಟಾಲ್ ಎಕ್ಸ್ಚೇಂಜ್ ದರಗಳನ್ನು ಅನುಮತಿಸಿ
 DocType: Sales Person,Sales Person Name,ಮಾರಾಟಗಾರನ ಹೆಸರು
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,ಕೋಷ್ಟಕದಲ್ಲಿ ಕನಿಷ್ಠ ಒಂದು ಸರಕುಪಟ್ಟಿ ನಮೂದಿಸಿ
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,ಬಳಕೆದಾರರು ಸೇರಿಸಿ
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,ಬಳಕೆದಾರರು ಸೇರಿಸಿ
 DocType: POS Item Group,Item Group,ಐಟಂ ಗುಂಪು
 DocType: Item,Safety Stock,ಸುರಕ್ಷತೆ ಸ್ಟಾಕ್
 DocType: Healthcare Settings,Healthcare Settings,ಆರೋಗ್ಯ ಸಂರಕ್ಷಣಾ ಸೆಟ್ಟಿಂಗ್ಗಳು
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,ಕಾರ್ಯ ಪ್ರಗತಿ% ಹೆಚ್ಚು 100 ಸಾಧ್ಯವಿಲ್ಲ.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,ಕಾರ್ಯ ಪ್ರಗತಿ% ಹೆಚ್ಚು 100 ಸಾಧ್ಯವಿಲ್ಲ.
 DocType: Stock Reconciliation Item,Before reconciliation,ಸಮನ್ವಯ ಮೊದಲು
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},ಗೆ {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ಸೇರಿಸಲಾಗಿದೆ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ಐಟಂ ತೆರಿಗೆ ರೋ {0} ಬಗೆಯ ತೆರಿಗೆ ಅಥವಾ ಆದಾಯ ಅಥವಾ ಖರ್ಚು ಅಥವಾ ಶುಲ್ಕಕ್ಕೆ ಖಾತೆಯನ್ನು ಹೊಂದಿರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ಐಟಂ ತೆರಿಗೆ ರೋ {0} ಬಗೆಯ ತೆರಿಗೆ ಅಥವಾ ಆದಾಯ ಅಥವಾ ಖರ್ಚು ಅಥವಾ ಶುಲ್ಕಕ್ಕೆ ಖಾತೆಯನ್ನು ಹೊಂದಿರಬೇಕು
 DocType: Sales Order,Partly Billed,ಹೆಚ್ಚಾಗಿ ಖ್ಯಾತವಾದ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,ಐಟಂ {0} ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ ಇರಬೇಕು
 DocType: Item,Default BOM,ಡೀಫಾಲ್ಟ್ BOM
@@ -3699,6 +3773,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,ವೇರಿಯಬಲ್
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
 DocType: Student,Student Email Address,ವಿದ್ಯಾರ್ಥಿ ಇಮೇಲ್ ವಿಳಾಸ
+DocType: Item,Hub Warehouse,ಹಬ್ ವೇರ್ಹೌಸ್
 DocType: Physician Schedule Time Slot,From Time,ಸಮಯದಿಂದ
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,ಉಪಲಬ್ದವಿದೆ:
 DocType: Notification Control,Custom Message,ಕಸ್ಟಮ್ ಸಂದೇಶ
@@ -3707,9 +3782,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,ವಿದ್ಯಾರ್ಥಿ ವಿಳಾಸ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,ವಿದ್ಯಾರ್ಥಿ ವಿಳಾಸ
 DocType: Purchase Invoice,Price List Exchange Rate,ಬೆಲೆ ಪಟ್ಟಿ ವಿನಿಮಯ ದರ
+DocType: POS Profile,POS Profile Name,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಹೆಸರು
 DocType: Purchase Invoice Item,Rate,ದರ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,ಆಂತರಿಕ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,ವಿಳಾಸ ಹೆಸರು
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,ವಿಳಾಸ ಹೆಸರು
 DocType: Stock Entry,From BOM,BOM ಗೆ
 DocType: Assessment Code,Assessment Code,ಅಸೆಸ್ಮೆಂಟ್ ಕೋಡ್
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,ಮೂಲಭೂತ
@@ -3723,11 +3799,12 @@
 DocType: Salary Slip,Salary Structure,ಸಂಬಳ ರಚನೆ
 DocType: Account,Bank,ಬ್ಯಾಂಕ್
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ಏರ್ಲೈನ್
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,ಸಂಚಿಕೆ ಮೆಟೀರಿಯಲ್
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,ಸಂಚಿಕೆ ಮೆಟೀರಿಯಲ್
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,ಮರುಕಳಿಸುವಿಕೆಯನ್ನು ರಚಿಸುವಾಗ ದೋಷ ಸಂಭವಿಸಿದೆ
 DocType: Material Request Item,For Warehouse,ಗೋದಾಮಿನ
 DocType: Employee,Offer Date,ಆಫರ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ಉಲ್ಲೇಖಗಳು
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,ಆಫ್ಲೈನ್ ಕ್ರಮದಲ್ಲಿ ಇವೆ. ನೀವು ಜಾಲಬಂಧ ತನಕ ರಿಲೋಡ್ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,ಆಫ್ಲೈನ್ ಕ್ರಮದಲ್ಲಿ ಇವೆ. ನೀವು ಜಾಲಬಂಧ ತನಕ ರಿಲೋಡ್ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,ಯಾವುದೇ ವಿದ್ಯಾರ್ಥಿ ಗುಂಪುಗಳು ದಾಖಲಿಸಿದವರು.
 DocType: Purchase Invoice Item,Serial No,ಅನುಕ್ರಮ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,ಮಾಸಿಕ ಮರುಪಾವತಿಯ ಪ್ರಮಾಣ ಸಾಲದ ಪ್ರಮಾಣ ಅಧಿಕವಾಗಿರುತ್ತದೆ ಸಾಧ್ಯವಿಲ್ಲ
@@ -3737,17 +3814,18 @@
 DocType: Salary Slip,Total Working Hours,ಒಟ್ಟು ವರ್ಕಿಂಗ್ ಅವರ್ಸ್
 DocType: Subscription,Next Schedule Date,ಮುಂದಿನ ವೇಳಾಪಟ್ಟಿ ದಿನಾಂಕ
 DocType: Stock Entry,Including items for sub assemblies,ಉಪ ಅಸೆಂಬ್ಲಿಗಳಿಗೆ ಐಟಂಗಳನ್ನು ಸೇರಿದಂತೆ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,ನಮೂದಿಸಿ ಮೌಲ್ಯವನ್ನು ಧನಾತ್ಮಕವಾಗಿರಬೇಕು
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,ಎಲ್ಲಾ ಪ್ರಾಂತ್ಯಗಳು
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,ನಮೂದಿಸಿ ಮೌಲ್ಯವನ್ನು ಧನಾತ್ಮಕವಾಗಿರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,ಎಲ್ಲಾ ಪ್ರಾಂತ್ಯಗಳು
 DocType: Purchase Invoice,Items,ಐಟಂಗಳನ್ನು
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,ವಿದ್ಯಾರ್ಥಿ ಈಗಾಗಲೇ ದಾಖಲಿಸಲಾಗಿದೆ.
 DocType: Fiscal Year,Year Name,ವರ್ಷದ ಹೆಸರು
 DocType: Process Payroll,Process Payroll,ಪ್ರಕ್ರಿಯೆ ವೇತನದಾರರ ಪಟ್ಟಿ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,ಈ ತಿಂಗಳ ದಿನಗಳ ಕೆಲಸ ಹೆಚ್ಚು ರಜಾದಿನಗಳಲ್ಲಿ ಇವೆ .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,ಈ ತಿಂಗಳ ದಿನಗಳ ಕೆಲಸ ಹೆಚ್ಚು ರಜಾದಿನಗಳಲ್ಲಿ ಇವೆ .
 DocType: Product Bundle Item,Product Bundle Item,ಉತ್ಪನ್ನ ಕಟ್ಟು ಐಟಂ
 DocType: Sales Partner,Sales Partner Name,ಮಾರಾಟದ ಸಂಗಾತಿ ಹೆಸರು
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,ಉಲ್ಲೇಖಗಳು ವಿನಂತಿ
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,ಉಲ್ಲೇಖಗಳು ವಿನಂತಿ
 DocType: Payment Reconciliation,Maximum Invoice Amount,ಗರಿಷ್ಠ ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣವನ್ನು
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,ಹೆಮಾಟೊಲಜಿ
 DocType: Normal Test Items,Normal Test Items,ಸಾಮಾನ್ಯ ಟೆಸ್ಟ್ ಐಟಂಗಳು
 DocType: Student Language,Student Language,ವಿದ್ಯಾರ್ಥಿ ಭಾಷಾ
 apps/erpnext/erpnext/config/selling.py +23,Customers,ಗ್ರಾಹಕರು
@@ -3759,10 +3837,11 @@
 DocType: Issue,Opening Time,ಆರಂಭಿಕ ಸಮಯ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,ಅಗತ್ಯವಿದೆ ದಿನಾಂಕ ಮತ್ತು ಮಾಡಲು
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,ಸೆಕ್ಯುರಿಟೀಸ್ ಮತ್ತು ಸರಕು ವಿನಿಮಯ
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ಭಿನ್ನ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ &#39;{0}&#39; ಟೆಂಪ್ಲೇಟು ಅದೇ ಇರಬೇಕು &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ಭಿನ್ನ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ &#39;{0}&#39; ಟೆಂಪ್ಲೇಟು ಅದೇ ಇರಬೇಕು &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ಆಧರಿಸಿದ ಲೆಕ್ಕ
 DocType: Delivery Note Item,From Warehouse,ಗೋದಾಮಿನ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,ಮೆಟೀರಿಯಲ್ಸ್ ಬಿಲ್ ಯಾವುದೇ ವಸ್ತುಗಳು ತಯಾರಿಸಲು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,ಮೆಟೀರಿಯಲ್ಸ್ ಬಿಲ್ ಯಾವುದೇ ವಸ್ತುಗಳು ತಯಾರಿಸಲು
+DocType: Restaurant,Default Customer,ಡೀಫಾಲ್ಟ್ ಗ್ರಾಹಕ
 DocType: Assessment Plan,Supervisor Name,ಮೇಲ್ವಿಚಾರಕ ಹೆಸರು
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,ಅದೇ ದಿನದಂದು ಅಪಾಯಿಂಟ್ಮೆಂಟ್ ರಚಿಸಿದ್ದರೆ ಅದನ್ನು ದೃಢೀಕರಿಸಬೇಡಿ
 DocType: Program Enrollment Course,Program Enrollment Course,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ದಾಖಲಾತಿ ಕೋರ್ಸ್
@@ -3790,7 +3869,7 @@
 DocType: Payment Entry,Internal Transfer,ಆಂತರಿಕ ಟ್ರಾನ್ಸ್ಫರ್
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,ಮಗುವಿನ ಖಾತೆಗೆ ಈ ಖಾತೆಗಾಗಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ . ನೀವು ಈ ಖಾತೆಯನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ .
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ಗುರಿ ಪ್ರಮಾಣ ಅಥವಾ ಗುರಿ ಪ್ರಮಾಣವನ್ನು ಒಂದೋ ಕಡ್ಡಾಯ
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ BOM ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ BOM ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,ಮೊದಲ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಆಯ್ಕೆಮಾಡಿ
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,ದಿನಾಂಕ ತೆರೆಯುವ ದಿನಾಂಕ ಮುಚ್ಚುವ ಮೊದಲು ಇರಬೇಕು
 DocType: Leave Control Panel,Carry Forward,ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ
@@ -3826,6 +3905,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,ಒಟ್ಟು ಪ್ರೆಸೆಂಟ್
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,ಲೆಕ್ಕಪರಿಶೋಧಕ ಹೇಳಿಕೆಗಳು
 DocType: Drug Prescription,Hour,ಗಂಟೆ
+DocType: Restaurant Order Entry,Last Sales Invoice,ಕೊನೆಯ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,ಹೊಸ ಸೀರಿಯಲ್ ನಂ ಗೋದಾಮಿನ ಸಾಧ್ಯವಿಲ್ಲ . ವೇರ್ಹೌಸ್ ಷೇರು ಖರೀದಿ ರಸೀತಿ ಎಂಟ್ರಿ ಅಥವಾ ಸೆಟ್ ಮಾಡಬೇಕು
 DocType: Lead,Lead Type,ಲೀಡ್ ಪ್ರಕಾರ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,ನೀವು ಬ್ಲಾಕ್ ದಿನಾಂಕ ಎಲೆಗಳು ಅನುಮೋದಿಸಲು ನಿನಗೆ ಅಧಿಕಾರವಿಲ್ಲ
@@ -3862,65 +3942,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,ಬಳಕೆದಾರರು ರಚಿಸಿ
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,ಗ್ರಾಮ
 DocType: Supplier Scorecard,Per Month,ಪ್ರತಿ ತಿಂಗಳು
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,ತಯಾರಿಸಲು ಪ್ರಮಾಣ 0 ಹೆಚ್ಚು ಇರಬೇಕು.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,ತಯಾರಿಸಲು ಪ್ರಮಾಣ 0 ಹೆಚ್ಚು ಇರಬೇಕು.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,ನಿರ್ವಹಣೆ ಕಾಲ್ ವರದಿ ಭೇಟಿ .
 DocType: Stock Entry,Update Rate and Availability,ಅಪ್ಡೇಟ್ ದರ ಮತ್ತು ಲಭ್ಯತೆ
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,ನೀವು ಪ್ರಮಾಣ ವಿರುದ್ಧ ಹೆಚ್ಚು ಸ್ವೀಕರಿಸಲು ಅಥವಾ ತಲುಪಿಸಲು ಅವಕಾಶ ಶೇಕಡಾವಾರು ಆದೇಶ . ಉದಾಹರಣೆಗೆ : ನೀವು 100 ಘಟಕಗಳು ಆದೇಶ ಇದ್ದರೆ . ನಿಮ್ಮ ಸೇವನೆ ನೀವು 110 ಘಟಕಗಳು ಸ್ವೀಕರಿಸಲು 10% ಅವಕಾಶವಿರುತ್ತದೆ ಇದೆ .
 DocType: POS Customer Group,Customer Group,ಗ್ರಾಹಕ ಗುಂಪಿನ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),ಹೊಸ ಬ್ಯಾಚ್ ID (ಐಚ್ಛಿಕ)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),ಹೊಸ ಬ್ಯಾಚ್ ID (ಐಚ್ಛಿಕ)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),ಹೊಸ ಬ್ಯಾಚ್ ID (ಐಚ್ಛಿಕ)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),ಹೊಸ ಬ್ಯಾಚ್ ID (ಐಚ್ಛಿಕ)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ಐಟಂ ಕಡ್ಡಾಯ {0}
 DocType: BOM,Website Description,ವೆಬ್ಸೈಟ್ ವಿವರಣೆ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ಇಕ್ವಿಟಿ ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,ಹೊಸತು
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ರದ್ದು ಮೊದಲು
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ಇಮೇಲ್ ವಿಳಾಸ, ಅನನ್ಯ ಇರಬೇಕು ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}"
 DocType: Serial No,AMC Expiry Date,ಎಎಂಸಿ ಅಂತ್ಯ ದಿನಾಂಕ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,ರಸೀತಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,ರಸೀತಿ
 ,Sales Register,ಮಾರಾಟದ ರಿಜಿಸ್ಟರ್
 DocType: Daily Work Summary Settings Company,Send Emails At,ನಲ್ಲಿ ಇಮೇಲ್ಗಳನ್ನು ಕಳುಹಿಸಿ
 DocType: Quotation,Quotation Lost Reason,ನುಡಿಮುತ್ತುಗಳು ಲಾಸ್ಟ್ ಕಾರಣ
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,ನಿಮ್ಮನ್ನು ಆಯ್ಕೆ
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',ಆಯ್ಕೆ ಮಾಡಿ * ಟ್ಯಾಬ್ಪ್ಯಾಟಿಯಂಟ್ ನಿಂದ ಅಲ್ಲಿ ಹೆಸರು = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},ವ್ಯವಹಾರ ಉಲ್ಲೇಖ ಯಾವುದೇ {0} ರ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},ವ್ಯವಹಾರ ಉಲ್ಲೇಖ ಯಾವುದೇ {0} ರ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ಸಂಪಾದಿಸಲು ಏನೂ ಇಲ್ಲ.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,ಫಾರ್ಮ್ ವೀಕ್ಷಿಸಿ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,ಈ ತಿಂಗಳ ಬಾಕಿ ಚಟುವಟಿಕೆಗಳಿಗೆ ಸಾರಾಂಶ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,ಫಾರ್ಮ್ ವೀಕ್ಷಿಸಿ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,ಈ ತಿಂಗಳ ಬಾಕಿ ಚಟುವಟಿಕೆಗಳಿಗೆ ಸಾರಾಂಶ
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","ನಿಮ್ಮನ್ನು ಹೊರತುಪಡಿಸಿ, ನಿಮ್ಮ ಸಂಸ್ಥೆಗೆ ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಿ."
 DocType: Customer Group,Customer Group Name,ಗ್ರಾಹಕ ಗುಂಪಿನ ಹೆಸರು
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,ಇನ್ನೂ ಯಾವುದೇ ಗ್ರಾಹಕರು!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,ಇನ್ನೂ ಯಾವುದೇ ಗ್ರಾಹಕರು!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,ಕ್ಯಾಶ್ ಫ್ಲೋ ಹೇಳಿಕೆ
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ಸಾಲದ ಪ್ರಮಾಣ ಗರಿಷ್ಠ ಸಾಲದ ಪ್ರಮಾಣ ಮೀರುವಂತಿಲ್ಲ {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,ಪರವಾನಗಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},ಸಿ ಫಾರ್ಮ್ ಈ ಸರಕುಪಟ್ಟಿ {0} ತೆಗೆದುಹಾಕಿ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},ಸಿ ಫಾರ್ಮ್ ಈ ಸರಕುಪಟ್ಟಿ {0} ತೆಗೆದುಹಾಕಿ {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,ನೀವು ಆದ್ದರಿಂದ ಈ ಹಿಂದಿನ ಆರ್ಥಿಕ ವರ್ಷದ ಬಾಕಿ ಈ ಆರ್ಥಿಕ ವರ್ಷ ಬಿಟ್ಟು ಸೇರಿವೆ ಬಯಸಿದರೆ ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ ಆಯ್ಕೆ ಮಾಡಿ
 DocType: GL Entry,Against Voucher Type,ಚೀಟಿ ಕೌಟುಂಬಿಕತೆ ವಿರುದ್ಧ
 DocType: Physician,Phone (R),ಫೋನ್ (ಆರ್)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,ಟೈಮ್ ಸ್ಲಾಟ್ಗಳು ಸೇರಿಸಲಾಗಿದೆ
 DocType: Item,Attributes,ಗುಣಲಕ್ಷಣಗಳು
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,ಟೆಂಪ್ಲೇಟ್ ಸಕ್ರಿಯಗೊಳಿಸಿ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ದಯವಿಟ್ಟು ಸೆಟಪ್&gt; ಸೆಟ್ಟಿಂಗ್ಗಳು&gt; ಹೆಸರಿಸುವ ಸರಣಿ ಮೂಲಕ {0} ಹೆಸರಿಸುವ ಸರಣಿಗಳನ್ನು ಹೊಂದಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,ಖಾತೆ ಆಫ್ ಬರೆಯಿರಿ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,ಕೊನೆಯ ಆದೇಶ ದಿನಾಂಕ
 DocType: Patient,B Negative,ಬಿ ಋಣಾತ್ಮಕ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ಖಾತೆ {0} ಮಾಡುತ್ತದೆ ಕಂಪನಿ ಸೇರಿದೆ ಅಲ್ಲ {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,ಸಾಲು {0} ಸರಣಿ ಸಂಖ್ಯೆಗಳು ಡೆಲಿವರಿ ಗಮನಿಸಿ ಹೊಂದುವುದಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,ಸಾಲು {0} ಸರಣಿ ಸಂಖ್ಯೆಗಳು ಡೆಲಿವರಿ ಗಮನಿಸಿ ಹೊಂದುವುದಿಲ್ಲ
 DocType: Student,Guardian Details,ಗಾರ್ಡಿಯನ್ ವಿವರಗಳು
 DocType: C-Form,C-Form,ಸಿ ಆಕಾರ
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,ಅನೇಕ ನೌಕರರು ಮಾರ್ಕ್ ಅಟೆಂಡೆನ್ಸ್
 DocType: Vehicle,Chassis No,ಚಾಸಿಸ್ ಯಾವುದೇ
 DocType: Payment Request,Initiated,ಚಾಲನೆ
 DocType: Production Order,Planned Start Date,ಯೋಜನೆ ಪ್ರಾರಂಭ ದಿನಾಂಕ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,ದಯವಿಟ್ಟು BOM ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Serial No,Creation Document Type,ಸೃಷ್ಟಿ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,ಅಂತಿಮ ದಿನಾಂಕವು ಪ್ರಾರಂಭ ದಿನಾಂಕಕ್ಕಿಂತ ಹೆಚ್ಚಿನದಾಗಿರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,ಅಂತಿಮ ದಿನಾಂಕವು ಪ್ರಾರಂಭ ದಿನಾಂಕಕ್ಕಿಂತ ಹೆಚ್ಚಿನದಾಗಿರಬೇಕು
 DocType: Leave Type,Is Encash,ಮುರಿಸು ಇದೆ
 DocType: Leave Allocation,New Leaves Allocated,ನಿಗದಿ ಹೊಸ ಎಲೆಗಳು
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,ಪ್ರಾಜೆಕ್ಟ್ ಬಲ್ಲ ದಶಮಾಂಶ ಉದ್ಧರಣ ಲಭ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,ಕೊನೆಗೊಳ್ಳುತ್ತದೆ
 DocType: Project,Expected End Date,ನಿರೀಕ್ಷಿತ ಅಂತಿಮ ದಿನಾಂಕ
 DocType: Budget Account,Budget Amount,ಬಜೆಟ್ ಪ್ರಮಾಣ
 DocType: Appraisal Template,Appraisal Template Title,ಅಪ್ರೇಸಲ್ ಟೆಂಪ್ಲೇಟು ಶೀರ್ಷಿಕೆ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},ದಿನಾಂಕ ಗೆ {0} ದಿ ಎಂಪ್ಲಾಯ್ {1} ನೌಕರನ ಸೇರುವ ದಿನಾಂಕ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,ವ್ಯಾಪಾರದ
 DocType: Patient,Alcohol Current Use,ಆಲ್ಕೋಹಾಲ್ ಪ್ರಸ್ತುತ ಬಳಕೆ
+DocType: Student Admission Program,Student Admission Program,ವಿದ್ಯಾರ್ಥಿ ಪ್ರವೇಶ ಕಾರ್ಯಕ್ರಮ
 DocType: Payment Entry,Account Paid To,ಖಾತೆಗೆ ಹಣ
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,ಪೋಷಕ ಐಟಂ {0} ಒಂದು ಸ್ಟಾಕ್ ಐಟಂ ಇರಬಾರದು
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,ಎಲ್ಲಾ ಉತ್ಪನ್ನಗಳು ಅಥವಾ ಸೇವೆಗಳ .
@@ -3929,30 +4011,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} ಖಾತೆಗೆ ಬಜೆಟ್ {1} ವಿರುದ್ಧ {2} {3} ಆಗಿದೆ {4}. ಇದು ಮೂಲಕ ಮೀರುತ್ತದೆ {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',ರೋ {0} # ಖಾತೆ ರೀತಿಯ ಇರಬೇಕು &#39;ಸ್ಥಿರ ಸ್ವತ್ತು&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,ಪ್ರಮಾಣ ಔಟ್
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,ಒಂದು ಮಾರಾಟ ಹಡಗು ಪ್ರಮಾಣವನ್ನು ಲೆಕ್ಕಾಚಾರ ನಿಯಮಗಳು
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,ಮತ್ತು ಅಶಕ್ತಗೊಂಡಿದೆ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,ಸರಣಿ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,ಹಣಕಾಸು ಸೇವೆಗಳು
 DocType: Student Sibling,Student ID,ವಿದ್ಯಾರ್ಥಿ ಗುರುತು
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,ಸಮಯ ದಾಖಲೆಗಳು ಚಟುವಟಿಕೆಗಳನ್ನು ವಿಧಗಳು
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,ಪೂರೈಕೆದಾರ ಇಮೇಲ್
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,ಸಮಯ ದಾಖಲೆಗಳು ಚಟುವಟಿಕೆಗಳನ್ನು ವಿಧಗಳು
 DocType: Tax Rule,Sales,ಮಾರಾಟದ
 DocType: Stock Entry Detail,Basic Amount,ಬೇಸಿಕ್ ಪ್ರಮಾಣ
 DocType: Training Event,Exam,ಪರೀಕ್ಷೆ
 DocType: Complaint,Complaint,ದೂರು
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},ಸ್ಟಾಕ್ ಐಟಂ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},ಸ್ಟಾಕ್ ಐಟಂ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
 DocType: Leave Allocation,Unused leaves,ಬಳಕೆಯಾಗದ ಎಲೆಗಳು
 DocType: Patient,Alcohol Past Use,ಆಲ್ಕೊಹಾಲ್ ಪಾಸ್ಟ್ ಯೂಸ್
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,ಕೋಟಿ
 DocType: Tax Rule,Billing State,ಬಿಲ್ಲಿಂಗ್ ರಾಜ್ಯ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,ವರ್ಗಾವಣೆ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),( ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಸೇರಿದಂತೆ ) ಸ್ಫೋಟಿಸಿತು BOM ಪಡೆದುಕೊಳ್ಳಿ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,ವರ್ಗಾವಣೆ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),( ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಸೇರಿದಂತೆ ) ಸ್ಫೋಟಿಸಿತು BOM ಪಡೆದುಕೊಳ್ಳಿ
 DocType: Authorization Rule,Applicable To (Employee),ಅನ್ವಯವಾಗುತ್ತದೆ ( ಉದ್ಯೋಗಗಳು)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,ಕಾರಣ ದಿನಾಂಕ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,ಕಾರಣ ದಿನಾಂಕ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,ಗುಣಲಕ್ಷಣ ಹೆಚ್ಚಳವನ್ನು {0} 0 ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Journal Entry,Pay To / Recd From,Recd ಗೆ / ಕಟ್ಟುವುದನ್ನು
 DocType: Naming Series,Setup Series,ಸೆಟಪ್ ಸರಣಿ
 DocType: Payment Reconciliation,To Invoice Date,ದಿನಾಂಕ ಸರಕುಪಟ್ಟಿ
 DocType: Supplier,Contact HTML,ಸಂಪರ್ಕಿಸಿ ಎಚ್ಟಿಎಮ್ಎಲ್
 ,Inactive Customers,ನಿಷ್ಕ್ರಿಯ ಗ್ರಾಹಕರು
+DocType: Student Admission Program,Maximum Age,ಗರಿಷ್ಠ ವಯಸ್ಸು
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,ಖರೀದಿ ರಸೀದಿಗಳನ್ನು
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,ಹೇಗೆ ಬೆಲೆ ರೂಲ್ ಅನ್ವಯಿಸಲಾಗುತ್ತದೆ?
@@ -3971,6 +4055,7 @@
 DocType: GL Entry,Remarks,ರಿಮಾರ್ಕ್ಸ್
 DocType: Payment Entry,Account Paid From,ಖಾತೆ ಪಾವತಿಸಿದ
 DocType: Purchase Order Item Supplied,Raw Material Item Code,ರಾ ಮೆಟೀರಿಯಲ್ ಐಟಂ ಕೋಡ್
+DocType: Task,Parent Task,ಪೋಷಕ ಕಾರ್ಯ
 DocType: Journal Entry,Write Off Based On,ಆಧರಿಸಿದ ಆಫ್ ಬರೆಯಿರಿ
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,ಲೀಡ್ ಮಾಡಿ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,ಮುದ್ರಣ ಮತ್ತು ಲೇಖನ ಸಾಮಗ್ರಿ
@@ -3979,20 +4064,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","ಸಂಬಳ ಈಗಾಗಲೇ ನಡುವೆ {0} ಮತ್ತು {1}, ಬಿಡಿ ಅಪ್ಲಿಕೇಶನ್ ಅವಧಿಯಲ್ಲಿ ಈ ದಿನಾಂಕ ಶ್ರೇಣಿ ನಡುವೆ ಸಾಧ್ಯವಿಲ್ಲ ಕಾಲ ಸಂಸ್ಕರಿಸಿದ."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,ಒಂದು ನೆಯ ಅನುಸ್ಥಾಪನೆ ದಾಖಲೆ .
 DocType: Guardian Interest,Guardian Interest,ಗಾರ್ಡಿಯನ್ ಬಡ್ಡಿ
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,POS ಇನ್ವಾಯ್ಸ್ಗಳಿಗಾಗಿ ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯಗಳನ್ನು ಹೊಂದಿಸಿ
 apps/erpnext/erpnext/config/hr.py +177,Training,ತರಬೇತಿ
 DocType: Timesheet,Employee Detail,ನೌಕರರ ವಿವರ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ಮೇಲ್
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ಮೇಲ್
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,ಮುಂದಿನ ದಿನಾಂಕ ದಿನ ಮತ್ತು ತಿಂಗಳ ದಿನದಂದು ಪುನರಾವರ್ತಿಸಿ ಸಮನಾಗಿರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,ಮುಂದಿನ ದಿನಾಂಕ ದಿನ ಮತ್ತು ತಿಂಗಳ ದಿನದಂದು ಪುನರಾವರ್ತಿಸಿ ಸಮನಾಗಿರಬೇಕು
 DocType: Lab Prescription,Test Code,ಪರೀಕ್ಷಾ ಕೋಡ್
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,ವೆಬ್ಸೈಟ್ ಮುಖಪುಟ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},{1} ರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ನಿಂತಿರುವ ಕಾರಣದಿಂದ {0} RFQ ಗಳನ್ನು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ.
 DocType: Offer Letter,Awaiting Response,ಪ್ರತಿಕ್ರಿಯೆ ಕಾಯುತ್ತಿದ್ದ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,ಮೇಲೆ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},ಒಟ್ಟು ಮೊತ್ತ {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},ಅಮಾನ್ಯ ಗುಣಲಕ್ಷಣ {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},ಒಟ್ಟು ಮೊತ್ತ {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},ಅಮಾನ್ಯ ಗುಣಲಕ್ಷಣ {0} {1}
 DocType: Supplier,Mention if non-standard payable account,ಹೇಳಿರಿ ಅಲ್ಲದ ಪ್ರಮಾಣಿತ ಪಾವತಿಸಬೇಕು ಖಾತೆಯನ್ನು ವೇಳೆ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},ಒಂದೇ ಐಟಂ ಅನ್ನು ಹಲವಾರು ಬಾರಿ ನಮೂದಿಸಲಾದ. {ಪಟ್ಟಿ}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',ದಯವಿಟ್ಟು &#39;ಎಲ್ಲಾ ಅಸೆಸ್ಮೆಂಟ್ ಗುಂಪುಗಳು&#39; ಬೇರೆ ಅಸೆಸ್ಮೆಂಟ್ ಗುಂಪು ಆಯ್ಕೆ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},ಸಾಲು {0}: ಐಟಂಗೆ ಕಾಸ್ಟ್ ಸೆಂಟರ್ ಅಗತ್ಯವಿರುತ್ತದೆ {1}
 DocType: Training Event Employee,Optional,ಐಚ್ಛಿಕ
@@ -4015,13 +4100,15 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ವೆಚ್ಚ ಸೆಂಟರ್ ಐಟಂ ಕಡ್ಡಾಯ {2}
 DocType: Vehicle,Policy No,ನೀತಿ ಇಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್ ವಸ್ತುಗಳನ್ನು ಪಡೆಯಲು
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","ಸ್ಟಾಕ್ ಐಟಂಗೆ ವಿರುದ್ಧವಾಗಿರುವಂತೆ {0}, ರೂಪಾಂತರಗಳು ಆಸ್ತಿಯನ್ನು ಹೊಂದಿಸಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ"
 DocType: Asset,Straight Line,ಸರಳ ರೇಖೆ
 DocType: Project User,Project User,ಪ್ರಾಜೆಕ್ಟ್ ಬಳಕೆದಾರ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,ಒಡೆದ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,ಒಡೆದ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,ಒಡೆದ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,ಒಡೆದ
 DocType: GL Entry,Is Advance,ಮುಂಗಡ ಹೊಂದಿದೆ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,ದಿನಾಂಕದಿಂದ ಮತ್ತು ದಿನಾಂಕ ಅಟೆಂಡೆನ್ಸ್ ಹಾಜರಿದ್ದ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,ನಮೂದಿಸಿ ಹೌದು ಅಥವಾ ಇಲ್ಲ ಎಂದು ' subcontracted ಈಸ್'
+DocType: Item,Default Purchase Unit of Measure,ಅಳತೆಯ ಡೀಫಾಲ್ಟ್ ಖರೀದಿ ಘಟಕ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,ಕೊನೆಯ ಸಂವಹನ ದಿನಾಂಕ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,ಕೊನೆಯ ಸಂವಹನ ದಿನಾಂಕ
 DocType: Sales Team,Contact No.,ಸಂಪರ್ಕಿಸಿ ನಂ
@@ -4030,7 +4117,6 @@
 DocType: Production Order,Check if material transfer entry is not required,ವಸ್ತು ವರ್ಗಾವಣೆ ಪ್ರವೇಶ ವೇಳೆ ಅಗತ್ಯವಿಲ್ಲ ಪರಿಶೀಲಿಸಿ
 DocType: Production Order,Check if material transfer entry is not required,ವಸ್ತು ವರ್ಗಾವಣೆ ಪ್ರವೇಶ ವೇಳೆ ಅಗತ್ಯವಿಲ್ಲ ಪರಿಶೀಲಿಸಿ
 DocType: Program Enrollment Tool,Get Students From,ವಿದ್ಯಾರ್ಥಿಗಳನ್ನು ಪಡೆಯಿರಿ
-DocType: Hub Settings,Seller Country,ಮಾರಾಟಗಾರ ಕಂಟ್ರಿ
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ಐಟಂಗಳನ್ನು ಪ್ರಕಟಿಸಿ
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,ಹಂತಹಂತವಾಗಿ ನಿಮ್ಮ ವಿದ್ಯಾರ್ಥಿಗಳು ಗ್ರೂಪ್
 DocType: Authorization Rule,Authorization Rule,ಅಧಿಕಾರ ರೂಲ್
@@ -4040,8 +4126,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,ಮಾರಾಟ ತೆರಿಗೆ ಮತ್ತು ಶುಲ್ಕಗಳು ಟೆಂಪ್ಲೇಟು
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),ಒಟ್ಟು (ಕ್ರೆಡಿಟ್)
 DocType: Repayment Schedule,Payment Date,ಪಾವತಿ ದಿನಾಂಕ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,ಹೊಸ ಬ್ಯಾಚ್ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,ಹೊಸ ಬ್ಯಾಚ್ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,ಹೊಸ ಬ್ಯಾಚ್ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,ಹೊಸ ಬ್ಯಾಚ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,ಬಟ್ಟೆಬರೆ ಮತ್ತು ಭಾಗಗಳು
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,ತೂಕದ ಸ್ಕೋರ್ ಕಾರ್ಯವನ್ನು ಪರಿಹರಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. ಸೂತ್ರವು ಮಾನ್ಯವಾಗಿದೆ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,ಆರ್ಡರ್ ಸಂಖ್ಯೆ
@@ -4059,6 +4145,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ರೋ # {0}: ಆಸ್ತಿ {1} ಮಾಡಬಹುದು ಸಲ್ಲಿಸಲಾಗುತ್ತದೆ, ಇದು ಈಗಾಗಲೇ {2}"
 DocType: Tax Rule,Billing Country,ಬಿಲ್ಲಿಂಗ್ ಕಂಟ್ರಿ
 DocType: Purchase Order Item,Expected Delivery Date,ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ
+DocType: Restaurant Order Entry,Restaurant Order Entry,ರೆಸ್ಟೋರೆಂಟ್ ಆರ್ಡರ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ಡೆಬಿಟ್ ಮತ್ತು ಕ್ರೆಡಿಟ್ {0} # ಸಮಾನ ಅಲ್ಲ {1}. ವ್ಯತ್ಯಾಸ {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,ಮನೋರಂಜನೆ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ಮಾಡಿ
@@ -4071,7 +4158,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಖಾತೆ ಅಳಿಸಲಾಗಿಲ್ಲ
 DocType: Vehicle,Last Carbon Check,ಕೊನೆಯ ಕಾರ್ಬನ್ ಪರಿಶೀಲಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,ಕಾನೂನು ವೆಚ್ಚ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,ದಯವಿಟ್ಟು ಸಾಲಿನಲ್ಲಿ ಪ್ರಮಾಣ ಆಯ್ಕೆ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,ದಯವಿಟ್ಟು ಸಾಲಿನಲ್ಲಿ ಪ್ರಮಾಣ ಆಯ್ಕೆ
 DocType: Purchase Invoice,Posting Time,ಟೈಮ್ ಪೋಸ್ಟ್
 DocType: Timesheet,% Amount Billed,ಖ್ಯಾತವಾದ % ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,ಟೆಲಿಫೋನ್ ವೆಚ್ಚಗಳು
@@ -4084,6 +4171,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,ಹೊಸ ಗ್ರಾಹಕ ಕಂದಾಯ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,ಪ್ರಯಾಣ ವೆಚ್ಚ
 DocType: Maintenance Visit,Breakdown,ಅನಾರೋಗ್ಯದಿಂದ ಕುಸಿತ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},ಕಸ್ಟಮ್ ಕ್ಷೇತ್ರ ಸೇರಿಸಿ ಚಂದಾದಾರಿಕೆ ಡಾಕ್ಟೈಪ್ನಲ್ಲಿ {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,ಖಾತೆ: {0} ಕರೆನ್ಸಿಗೆ: {1} ಆಯ್ಕೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",ಕಚ್ಚಾ ವಸ್ತುಗಳ ಇತ್ತೀಚಿನ ಮೌಲ್ಯಮಾಪನ ದರ / ಬೆಲೆ ಪಟ್ಟಿ ದರ / ಕೊನೆಯ ಖರೀದಿಯ ದರವನ್ನು ಆಧರಿಸಿ ವೇಳಾಪಟ್ಟಿ ಮೂಲಕ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ನವೀಕರಿಸಿ BOM ವೆಚ್ಚ.
 DocType: Bank Reconciliation Detail,Cheque Date,ಚೆಕ್ ದಿನಾಂಕ
@@ -4108,7 +4196,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),ಒಟ್ಟು ಬಿಲ್ಲಿಂಗ್ ಪ್ರಮಾಣ (ಸಮಯ ದಾಖಲೆಗಳು ಮೂಲಕ)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,ಪೂರೈಕೆದಾರ ಐಡಿ
 DocType: Payment Request,Payment Gateway Details,ಪೇಮೆಂಟ್ ಗೇಟ್ ವೇ ವಿವರಗಳು
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,ಪ್ರಮಾಣ 0 ಹೆಚ್ಚು ಇರಬೇಕು
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,ಪ್ರಮಾಣ 0 ಹೆಚ್ಚು ಇರಬೇಕು
 DocType: Journal Entry,Cash Entry,ನಗದು ಎಂಟ್ರಿ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,ಚೈಲ್ಡ್ ನೋಡ್ಗಳ ಮಾತ್ರ &#39;ಗುಂಪು&#39; ರೀತಿಯ ಗ್ರಂಥಿಗಳು ಅಡಿಯಲ್ಲಿ ರಚಿಸಬಹುದಾಗಿದೆ
 DocType: Leave Application,Half Day Date,ಅರ್ಧ ದಿನ ದಿನಾಂಕ
@@ -4126,12 +4214,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,ರೇಟಿಂಗ್ : ಐಟಂ {0} ಅನೇಕ ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,ಎಲ್ಲಾ ಸಂಪರ್ಕಗಳು .
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,ಕಂಪನಿ ಸಂಕ್ಷೇಪಣ
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,ಬಳಕೆದಾರ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,ಬಳಕೆದಾರ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,ಸಂಕ್ಷೇಪಣ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,ಪಾವತಿ ಎಂಟ್ರಿ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} ಮಿತಿಗಳನ್ನು ಮೀರಿದೆ ರಿಂದ authroized ಮಾಡಿರುವುದಿಲ್ಲ
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,ಸಂಬಳ ಮಾಸ್ಟರ್ ಟೆಂಪ್ಲೆಟ್ .
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,ರೋಗಶಾಸ್ತ್ರ
+DocType: Restaurant Order Entry,Restaurant Table,ರೆಸ್ಟೋರೆಂಟ್ ಟೇಬಲ್
 DocType: Leave Type,Max Days Leave Allowed,ಮ್ಯಾಕ್ಸ್ ಡೇಸ್ ಹೊರಹೋಗಲು ಆಸ್ಪದ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ತೆರಿಗೆಯ ರೂಲ್
 DocType: Purchase Invoice,Taxes and Charges Added,ಸೇರಿಸಲಾಗಿದೆ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
@@ -4143,10 +4233,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ಪಾತ್ರಗಳ ಅಥವಾ ಗ್ರಾಹಕರಿಗೆ ಹಿಟ್ಟಿಗೆ .
 DocType: Stock Settings,Role Allowed to edit frozen stock,ಪಾತ್ರ ಹೆಪ್ಪುಗಟ್ಟಿದ ಸ್ಟಾಕ್ ಸಂಪಾದಿಸಲು ಅನುಮತಿಸಲಾಗಿದೆ
 ,Territory Target Variance Item Group-Wise,ಪ್ರದೇಶ ಟಾರ್ಗೆಟ್ ವೈಷಮ್ಯವನ್ನು ಐಟಂ ಗ್ರೂಪ್ ವೈಸ್
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,ಎಲ್ಲಾ ಗ್ರಾಹಕ ಗುಂಪುಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,ಎಲ್ಲಾ ಗ್ರಾಹಕ ಗುಂಪುಗಳು
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,ಕ್ರೋಢಿಕೃತ ಮಾಸಿಕ
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ಕಡ್ಡಾಯ. ಬಹುಶಃ ಕರೆನ್ಸಿ ವಿನಿಮಯ ದಾಖಲೆ {2} ಗೆ {1} ದಾಖಲಿಸಿದವರು ಇದೆ.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟು ಕಡ್ಡಾಯವಾಗಿದೆ.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟು ಕಡ್ಡಾಯವಾಗಿದೆ.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,ಖಾತೆ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),ಬೆಲೆ ಪಟ್ಟಿ ದರ ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 DocType: Products Settings,Products Settings,ಉತ್ಪನ್ನಗಳು ಸೆಟ್ಟಿಂಗ್ಗಳು
@@ -4172,13 +4262,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ಐಟಂ ವೈಸ್ ತೆರಿಗೆ ವಿವರ
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,ಇನ್ಸ್ಟಿಟ್ಯೂಟ್ ಸಂಕ್ಷೇಪಣ
 ,Item-wise Price List Rate,ಐಟಂ ಬಲ್ಲ ಬೆಲೆ ಪಟ್ಟಿ ದರ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,ಸರಬರಾಜುದಾರ ನುಡಿಮುತ್ತುಗಳು
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,ಸರಬರಾಜುದಾರ ನುಡಿಮುತ್ತುಗಳು
 DocType: Quotation,In Words will be visible once you save the Quotation.,ನೀವು ಉದ್ಧರಣ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},ಪ್ರಮಾಣ ({0}) ಸತತವಾಗಿ ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},ಪ್ರಮಾಣ ({0}) ಸತತವಾಗಿ ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ {1}
 DocType: Consultation,C-,ಸಿ-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},ಬಾರ್ಕೋಡ್ {0} ಈಗಾಗಲೇ ಐಟಂ ಬಳಸಲಾಗುತ್ತದೆ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},ಬಾರ್ಕೋಡ್ {0} ಈಗಾಗಲೇ ಐಟಂ ಬಳಸಲಾಗುತ್ತದೆ {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,ಹಡಗು ವೆಚ್ಚ ಸೇರಿಸುವ ನಿಯಮಗಳು .
 DocType: Item,Opening Stock,ಸ್ಟಾಕ್ ತೆರೆಯುವ
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ಗ್ರಾಹಕ ಅಗತ್ಯವಿದೆ
@@ -4197,9 +4287,8 @@
 DocType: Customer,From Lead,ಮುಂಚೂಣಿಯಲ್ಲಿವೆ
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ಉತ್ಪಾದನೆಗೆ ಬಿಡುಗಡೆ ಆರ್ಡರ್ಸ್ .
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,ಹಣಕಾಸಿನ ವರ್ಷ ಆಯ್ಕೆ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಪಿಓಎಸ್ ಎಂಟ್ರಿ ಮಾಡಲು ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಪಿಓಎಸ್ ಎಂಟ್ರಿ ಮಾಡಲು ಅಗತ್ಯವಿದೆ
 DocType: Program Enrollment Tool,Enroll Students,ವಿದ್ಯಾರ್ಥಿಗಳು ದಾಖಲು
-DocType: Hub Settings,Name Token,ಹೆಸರು ಟೋಕನ್
 DocType: Lab Test,Approved Date,ಅನುಮೋದಿತ ದಿನಾಂಕ
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ವಿಕ್ರಯ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,ಕನಿಷ್ಠ ಒಂದು ಗೋದಾಮಿನ ಕಡ್ಡಾಯ
@@ -4217,7 +4306,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,ಮಾನವ ಸಂಪನ್ಮೂಲ
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,ಪಾವತಿ ರಾಜಿ ಪಾವತಿಗೆ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,ತೆರಿಗೆ ಸ್ವತ್ತುಗಳು
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಬಂದಿದೆ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಬಂದಿದೆ {0}
 DocType: BOM Item,BOM No,ಯಾವುದೇ BOM
 DocType: Instructor,INS/,ಐಎನ್ಎಸ್ /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,ಜರ್ನಲ್ ಎಂಟ್ರಿ {0} {1} ಅಥವಾ ಈಗಾಗಲೇ ಇತರ ಚೀಟಿ ವಿರುದ್ಧ ದಾಖಲೆಗಳುಸರಿಹೊಂದಿವೆ ಖಾತೆಯನ್ನು ಹೊಂದಿಲ್ಲ
@@ -4237,8 +4326,8 @@
 DocType: Currency Exchange,To Currency,ಕರೆನ್ಸಿ
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,ಕೆಳಗಿನ ಬಳಕೆದಾರರಿಗೆ ಬ್ಲಾಕ್ ದಿನಗಳ ಬಿಟ್ಟು ಅನ್ವಯಗಳು ಅನುಮೋದಿಸಲು ಅನುಮತಿಸಿ .
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,ಖರ್ಚು ಹಕ್ಕು ವಿಧಗಳು .
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ಅದರ {1} ಐಟಂ ಪ್ರಮಾಣ ಮಾರಾಟ {0} ಕಡಿಮೆಯಿದೆ. ಮಾರಾಟ ದರವನ್ನು ಇರಬೇಕು ಕನಿಷ್ಠ {2}
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ಅದರ {1} ಐಟಂ ಪ್ರಮಾಣ ಮಾರಾಟ {0} ಕಡಿಮೆಯಿದೆ. ಮಾರಾಟ ದರವನ್ನು ಇರಬೇಕು ಕನಿಷ್ಠ {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ಅದರ {1} ಐಟಂ ಪ್ರಮಾಣ ಮಾರಾಟ {0} ಕಡಿಮೆಯಿದೆ. ಮಾರಾಟ ದರವನ್ನು ಇರಬೇಕು ಕನಿಷ್ಠ {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ಅದರ {1} ಐಟಂ ಪ್ರಮಾಣ ಮಾರಾಟ {0} ಕಡಿಮೆಯಿದೆ. ಮಾರಾಟ ದರವನ್ನು ಇರಬೇಕು ಕನಿಷ್ಠ {2}
 DocType: Item,Taxes,ತೆರಿಗೆಗಳು
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,ಹಣ ಮತ್ತು ವಿತರಣೆ
 DocType: Project,Default Cost Center,ಡೀಫಾಲ್ಟ್ ವೆಚ್ಚ ಸೆಂಟರ್
@@ -4252,15 +4341,15 @@
 DocType: Employee Loan,Fully Disbursed,ಸಂಪೂರ್ಣವಾಗಿ ಪಾವತಿಸಲಾಗುತ್ತದೆ
 DocType: Maintenance Visit,Customer Feedback,ಪ್ರತಿಕ್ರಿಯೆ
 DocType: Account,Expense,ಖರ್ಚುವೆಚ್ಚಗಳು
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,ಸ್ಕೋರ್ ಗರಿಷ್ಠ ಸ್ಕೋರ್ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,ಸ್ಕೋರ್ ಗರಿಷ್ಠ ಸ್ಕೋರ್ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,ಗ್ರಾಹಕರು ಮತ್ತು ಪೂರೈಕೆದಾರರು
 DocType: Item Attribute,From Range,ವ್ಯಾಪ್ತಿಯ
 DocType: BOM,Set rate of sub-assembly item based on BOM,BOM ಆಧರಿಸಿ ಉಪ ಅಸೆಂಬ್ಲಿ ಐಟಂನ ದರ ನಿಗದಿಪಡಿಸಿ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},ಸೂತ್ರ ಅಥವಾ ಸ್ಥಿತಿಯಲ್ಲಿ ಸಿಂಟ್ಯಾಕ್ಸ್ ದೋಷ: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},ಸೂತ್ರ ಅಥವಾ ಸ್ಥಿತಿಯಲ್ಲಿ ಸಿಂಟ್ಯಾಕ್ಸ್ ದೋಷ: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,ದೈನಂದಿನ ಕೆಲಸ ಸಾರಾಂಶ ಸೆಟ್ಟಿಂಗ್ಗಳು ಕಂಪನಿ
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,ಇದು ಒಂದು ಸ್ಟಾಕ್ ಐಟಂ ಕಾರಣ ಐಟಂ {0} ಕಡೆಗಣಿಸಲಾಗುತ್ತದೆ
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,ಮತ್ತಷ್ಟು ಪ್ರಕ್ರಿಯೆಗೆ ಈ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಸಲ್ಲಿಸಿ .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,ಮತ್ತಷ್ಟು ಪ್ರಕ್ರಿಯೆಗೆ ಈ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಸಲ್ಲಿಸಿ .
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","ಒಂದು ನಿರ್ಧಿಷ್ಟ ವ್ಯವಹಾರಕ್ಕೆ ಬೆಲೆ ನಿಯಮ ಅನ್ವಯಿಸುವುದಿಲ್ಲ, ಎಲ್ಲಾ ಅನ್ವಯಿಸುವ ಬೆಲೆ ನಿಯಮಗಳಲ್ಲಿ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ ಮಾಡಬೇಕು."
 DocType: Assessment Group,Parent Assessment Group,ಪೋಷಕ ಅಸೆಸ್ಮೆಂಟ್ ಗುಂಪು
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,ಉದ್ಯೋಗ
@@ -4277,12 +4366,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',ಕಂಪನಿ ಖಾಲಿ ಫಿಲ್ಟರ್ ಸೆಟ್ ದಯವಿಟ್ಟು ಗುಂಪಿನ ಕಂಪೆನಿ &#39;ಆಗಿದೆ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಮುಂದಿನ ದಿನಾಂಕದಂದು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},ರೋ # {0}: ಸೀರಿಯಲ್ ಯಾವುದೇ {1} ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,ಮರುಕಳಿಸುವಿಕೆಯನ್ನು ಸೃಷ್ಟಿಸಲು
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,ರಜೆ
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,ಲ್ಯಾಬ್ ಟೆಸ್ಟ್ UOM.
 DocType: Batch,Batch ID,ಬ್ಯಾಚ್ ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},ರೇಟಿಂಗ್ : {0}
 ,Delivery Note Trends,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಪ್ರವೃತ್ತಿಗಳು
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,ಈ ವಾರದ ಸಾರಾಂಶ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,ಈ ವಾರದ ಸಾರಾಂಶ
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,ಸ್ಟಾಕ್ ಪ್ರಮಾಣ ರಲ್ಲಿ
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,ಖಾತೆ: {0} ಮಾತ್ರ ಸ್ಟಾಕ್ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಮೂಲಕ ಅಪ್ಡೇಟ್ ಮಾಡಬಹುದು
 DocType: Student Group Creation Tool,Get Courses,ಕೋರ್ಸ್ಗಳು ಪಡೆಯಿರಿ
@@ -4296,7 +4386,6 @@
 DocType: Purchase Order,To Bill,ಬಿಲ್
 DocType: Material Request,% Ordered,% ಆದೇಶ
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","ಕೋರ್ಸ್ ಆಧಾರಿತ ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಫಾರ್, ಕೋರ್ಸ್ ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ದಾಖಲಾತಿ ಸೇರಿಕೊಂಡಳು ಕೋರ್ಸ್ಗಳು ಪ್ರತಿ ವಿದ್ಯಾರ್ಥಿ ಪಡಿಸಿ ನಡೆಯಲಿದೆ."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","ಇಮೇಲ್ ವಿಳಾಸ ನಮೂದಿಸಿ ಬೇರ್ಪಡಿಸಲಾಗಿರುತ್ತದೆ, ಸರಕುಪಟ್ಟಿ ನಿರ್ದಿಷ್ಟ ದಿನಾಂಕದಂದು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಮೇಲ್ ಆಗುತ್ತದೆ"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Piecework
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,ಆವರೇಜ್. ಬೈಯಿಂಗ್ ದರ
 DocType: Task,Actual Time (in Hours),(ಘಂಟೆಗಳಲ್ಲಿ) ವಾಸ್ತವ ಟೈಮ್
@@ -4310,7 +4399,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,ಐಟಂ {0} ಸೀರಿಯಲ್ ಸಂಖ್ಯೆ ಸ್ಥಾಪನೆಯ ಅಲ್ಲ ಅಂಕಣ ಖಾಲಿಯಾಗಿರಬೇಕು
 DocType: Accounts Settings,Accounts Settings,ಸೆಟ್ಟಿಂಗ್ಗಳು ಖಾತೆಗಳು
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,ಅನುಮೋದಿಸಿ
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,ಸಲ್ಲಿಸಲು ಯಾವುದೇ ಫಲಿತಾಂಶವಿಲ್ಲ
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,ಸಲ್ಲಿಸಲು ಯಾವುದೇ ಫಲಿತಾಂಶವಿಲ್ಲ
 DocType: Customer,Sales Partner and Commission,ಮಾರಾಟದ ಸಂಗಾತಿ ಮತ್ತು ಆಯೋಗದ
 DocType: Employee Loan,Rate of Interest (%) / Year,ಬಡ್ಡಿ (%) / ವರ್ಷದ ದರ
 ,Project Quantity,ಪ್ರಾಜೆಕ್ಟ್ ಪ್ರಮಾಣ
@@ -4322,55 +4411,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,ಬ್ಲಾಕ್
 DocType: BOM Explosion Item,BOM Explosion Item,BOM ಸ್ಫೋಟ ಐಟಂ
 DocType: Account,Auditor,ಆಡಿಟರ್
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} ನಿರ್ಮಾಣ ಐಟಂಗಳನ್ನು
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} ನಿರ್ಮಾಣ ಐಟಂಗಳನ್ನು
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ
 DocType: Cheque Print Template,Distance from top edge,ಮೇಲಿನ ತುದಿಯಲ್ಲಿ ದೂರ
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,ದರ ಪಟ್ಟಿ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದರೆ ಅಥವಾ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,ದರ ಪಟ್ಟಿ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದರೆ ಅಥವಾ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Purchase Invoice,Return,ರಿಟರ್ನ್
 DocType: Production Order Operation,Production Order Operation,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಆಪರೇಷನ್
 DocType: Pricing Rule,Disable,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,ಪಾವತಿಸುವ ವಿಧಾನ ಪಾವತಿ ಮಾಡಬೇಕಿರುತ್ತದೆ
 DocType: Project Task,Pending Review,ಬಾಕಿ ರಿವ್ಯೂ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,ನೇಮಕಾತಿಗಳು ಮತ್ತು ಸಮಾಲೋಚನೆಗಳು
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ಬ್ಯಾಚ್ ಸೇರಿಕೊಂಡಳು ಇದೆ {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ಬ್ಯಾಚ್ ಸೇರಿಕೊಂಡಳು ಇದೆ {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",ಇದು ಈಗಾಗಲೇ ಆಸ್ತಿ {0} ನಿಷ್ಕ್ರಿಯವಾಗಲ್ಪಟ್ಟವು ಸಾಧ್ಯವಿಲ್ಲ {1}
 DocType: Task,Total Expense Claim (via Expense Claim),(ಖರ್ಚು ಹಕ್ಕು ಮೂಲಕ) ಒಟ್ಟು ಖರ್ಚು ಹಕ್ಕು
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,ಮಾರ್ಕ್ ಆಬ್ಸೆಂಟ್
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ರೋ {0}: ಆಫ್ ಬಿಒಎಮ್ # ಕರೆನ್ಸಿ {1} ಆಯ್ಕೆ ಕರೆನ್ಸಿ ಸಮಾನ ಇರಬೇಕು {2}
 DocType: Journal Entry Account,Exchange Rate,ವಿನಿಮಯ ದರ
 DocType: Patient,Additional information regarding the patient,ರೋಗಿಗೆ ಸಂಬಂಧಿಸಿದ ಹೆಚ್ಚುವರಿ ಮಾಹಿತಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 DocType: Homepage,Tag Line,ಟ್ಯಾಗ್ ಲೈನ್
 DocType: Fee Component,Fee Component,ಶುಲ್ಕ ಕಾಂಪೊನೆಂಟ್
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,ಫ್ಲೀಟ್ ಮ್ಯಾನೇಜ್ಮೆಂಟ್
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,ಐಟಂಗಳನ್ನು ಸೇರಿಸಿ
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,ಫ್ಲೀಟ್ ಮ್ಯಾನೇಜ್ಮೆಂಟ್
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,ಐಟಂಗಳನ್ನು ಸೇರಿಸಿ
 DocType: Cheque Print Template,Regular,ನಿಯಮಿತ
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,ಎಲ್ಲಾ ಅಸೆಸ್ಮೆಂಟ್ ಕ್ರೈಟೀರಿಯಾ ಒಟ್ಟು ಪ್ರಾಮುಖ್ಯತೆಯನ್ನು 100% ಇರಬೇಕು
-DocType: BOM,Last Purchase Rate,ಕೊನೆಯ ಖರೀದಿ ದರ
+DocType: Purchase Order Item,Last Purchase Rate,ಕೊನೆಯ ಖರೀದಿ ದರ
 DocType: Account,Asset,ಆಸ್ತಿಪಾಸ್ತಿ
 DocType: Project Task,Task ID,ಟಾಸ್ಕ್ ಐಡಿ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವುದಿಲ್ಲ ಸ್ಟಾಕ್ {0} ರಿಂದ ವೇರಿಯಂಟ್
 DocType: Lab Test,Mobile,ಮೊಬೈಲ್
 ,Sales Person-wise Transaction Summary,ಮಾರಾಟಗಾರನ ಬಲ್ಲ ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಸಾರಾಂಶ
 DocType: Training Event,Contact Number,ಸಂಪರ್ಕ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,ವೇರ್ಹೌಸ್ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext ಹಬ್ ನೋಂದಣಿ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,ವೇರ್ಹೌಸ್ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Monthly Distribution,Monthly Distribution Percentages,ಮಾಸಿಕ ವಿತರಣೆ ಶೇಕಡಾವಾರು
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,ಆಯ್ದುಕೊಂಡ ಬ್ಯಾಚ್ ಹೊಂದುವಂತಿಲ್ಲ
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","ಮೌಲ್ಯಾಂಕನ ದರ ಲೆಕ್ಕಪತ್ರ ನಮೂದುಗಳನ್ನು ಮಾಡಲು ಅಗತ್ಯವಿದೆ ಇದು ಐಟಂ {0}, ಕಂಡುಬಂದಿಲ್ಲ {1} {2}. ಐಟಂ ಒಂದು ಮಾದರಿ ಐಟಂ ವಹಿವಾಟುಗಳನ್ನು ವೇಳೆ {1}, {1} ಐಟಂ ಕೋಷ್ಟಕದಲ್ಲಿ ಕುರಿತು ಮಾಹಿತಿ ನೀಡಿ. ಇಲ್ಲವಾದರೆ, ಐಟಂ ದಾಖಲೆಯಲ್ಲಿ ಐಟಂ ಅಥವಾ ಉಲ್ಲೇಖವನ್ನು ಮೌಲ್ಯಮಾಪನ ದರ ಒಳಬರುವ ಶೇರು ವಹಿವಾಟು ರಚಿಸಲು, ತದನಂತರ / submiting ಪ್ರಯತ್ನಿಸಿ ಈ ನಮೂದನ್ನು ರದ್ದು ಮಾಡಿ"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,ಈ ಡೆಲಿವರಿ ಗಮನಿಸಿ ವಿರುದ್ಧ ವಿತರಿಸಲಾಯಿತು ವಸ್ತುಗಳ %
+DocType: Training Event,Has Certificate,ಪ್ರಮಾಣಪತ್ರ ಹೊಂದಿದೆ
 DocType: Project,Customer Details,ಗ್ರಾಹಕ ವಿವರಗಳು
 DocType: Employee,Reports to,ಗೆ ವರದಿಗಳು
 ,Unpaid Expense Claim,ಪೇಯ್ಡ್ ಖರ್ಚು ಹಕ್ಕು
 DocType: Payment Entry,Paid Amount,ಮೊತ್ತವನ್ನು
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,ಮಾರಾಟದ ಸೈಕಲ್ ಅನ್ವೇಷಿಸಿ
 DocType: Assessment Plan,Supervisor,ಮೇಲ್ವಿಚಾರಕ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,ಆನ್ಲೈನ್
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,ಆನ್ಲೈನ್
 ,Available Stock for Packing Items,ಐಟಂಗಳು ಪ್ಯಾಕಿಂಗ್ ಸ್ಟಾಕ್ ಲಭ್ಯವಿದೆ
 DocType: Item Variant,Item Variant,ಐಟಂ ಭಿನ್ನ
 DocType: Assessment Result Tool,Assessment Result Tool,ಅಸೆಸ್ಮೆಂಟ್ ಫಲಿತಾಂಶ ಟೂಲ್
 DocType: BOM Scrap Item,BOM Scrap Item,ಬಿಒಎಮ್ ಸ್ಕ್ರ್ಯಾಪ್ ಐಟಂ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,ಸಲ್ಲಿಸಲಾಗಿದೆ ಆದೇಶಗಳನ್ನು ಅಳಿಸಲಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,ಸಲ್ಲಿಸಲಾಗಿದೆ ಆದೇಶಗಳನ್ನು ಅಳಿಸಲಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ಈಗಾಗಲೇ ಡೆಬಿಟ್ ರಲ್ಲಿ ಖಾತೆ ಸಮತೋಲನ, ನೀವು 'ಕ್ರೆಡಿಟ್' 'ಬ್ಯಾಲೆನ್ಸ್ ಇರಬೇಕು ಹೊಂದಿಸಲು ಅನುಮತಿ ಇಲ್ಲ"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,ಗುಣಮಟ್ಟ ನಿರ್ವಹಣೆ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
@@ -4391,7 +4479,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,ಅನುಮತಿಸಿ ಶೂನ್ಯ ಮೌಲ್ಯಾಂಕನ ದರ
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,ಅನುಮತಿಸಿ ಶೂನ್ಯ ಮೌಲ್ಯಾಂಕನ ದರ
 DocType: Training Event Employee,Invited,ಆಹ್ವಾನಿತ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,ನೀಡಿದ ದಿನಾಂಕಗಳನ್ನು ಉದ್ಯೋಗಿ {0} ಗಾಗಿ ಬಹು ಸಕ್ರಿಯ ಸಂಬಳ ಸ್ಟ್ರಕ್ಚರ್ಸ್
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,ನೀಡಿದ ದಿನಾಂಕಗಳನ್ನು ಉದ್ಯೋಗಿ {0} ಗಾಗಿ ಬಹು ಸಕ್ರಿಯ ಸಂಬಳ ಸ್ಟ್ರಕ್ಚರ್ಸ್
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,ಸೆಟಪ್ ಗೇಟ್ವೇ ಖಾತೆಗಳನ್ನು.
 DocType: Employee,Employment Type,ಉದ್ಯೋಗ ಪ್ರಕಾರ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,ಸ್ಥಿರ ಆಸ್ತಿಗಳ
@@ -4403,7 +4491,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,ವಿದ್ಯಾರ್ಥಿ ಈಮೇಲ್ ಅಡ್ರೆಸ್
 DocType: Employee,Notice (days),ಎಚ್ಚರಿಕೆ ( ದಿನಗಳು)
 DocType: Tax Rule,Sales Tax Template,ಮಾರಾಟ ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟು
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,ಸರಕುಪಟ್ಟಿ ಉಳಿಸಲು ಐಟಂಗಳನ್ನು ಆಯ್ಕೆ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,ಸರಕುಪಟ್ಟಿ ಉಳಿಸಲು ಐಟಂಗಳನ್ನು ಆಯ್ಕೆ
 DocType: Employee,Encashment Date,ನಗದೀಕರಣ ದಿನಾಂಕ
 DocType: Training Event,Internet,ಇಂಟರ್ನೆಟ್
 DocType: Special Test Template,Special Test Template,ವಿಶೇಷ ಟೆಸ್ಟ್ ಟೆಂಪ್ಲೇಟು
@@ -4413,7 +4501,7 @@
 DocType: Academic Term,Term Start Date,ಟರ್ಮ್ ಪ್ರಾರಂಭ ದಿನಾಂಕ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,ಎದುರು ಕೌಂಟ್
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,ಎದುರು ಕೌಂಟ್
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},ಪತ್ತೆ ಮಾಡಿ ಲಗತ್ತಿಸಲಾದ {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},ಪತ್ತೆ ಮಾಡಿ ಲಗತ್ತಿಸಲಾದ {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,ಜನರಲ್ ಲೆಡ್ಜರ್ ಪ್ರಕಾರ ಬ್ಯಾಂಕ್ ಹೇಳಿಕೆ ಸಮತೋಲನ
 DocType: Job Applicant,Applicant Name,ಅರ್ಜಿದಾರರ ಹೆಸರು
 DocType: Authorization Rule,Customer / Item Name,ಗ್ರಾಹಕ / ಐಟಂ ಹೆಸರು
@@ -4433,7 +4521,7 @@
 DocType: Guardian,Guardian Of ,ಗಾರ್ಡಿಯನ್
 DocType: Grading Scale Interval,Threshold,ಮಿತಿ
 DocType: BOM Update Tool,Current BOM,ಪ್ರಸ್ತುತ BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,ಸೀರಿಯಲ್ ನಂ ಸೇರಿಸಿ
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,ಸೀರಿಯಲ್ ನಂ ಸೇರಿಸಿ
 DocType: Production Order Item,Available Qty at Source Warehouse,ಲಭ್ಯವಿರುವ ಪ್ರಮಾಣ ಮೂಲ ಕೋಠಿಯಲ್ಲಿ
 apps/erpnext/erpnext/config/support.py +22,Warranty,ಖಾತರಿ
 DocType: Purchase Invoice,Debit Note Issued,ಡೆಬಿಟ್ ಚೀಟಿಯನ್ನು ನೀಡಲಾಗಿದೆ
@@ -4456,10 +4544,9 @@
 DocType: Account,Receivable,ಲಭ್ಯ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ರೋ # {0}: ಆರ್ಡರ್ ಖರೀದಿಸಿ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಪೂರೈಕೆದಾರ ಬದಲಾಯಿಸಲು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,ಪಾತ್ರ ವ್ಯವಹಾರ ಸೆಟ್ ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಮಾಡಲಿಲ್ಲ ಸಲ್ಲಿಸಲು ಅವಕಾಶ ನೀಡಲಿಲ್ಲ .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,ಉತ್ಪಾದನೆ ಐಟಂಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","ಮಾಸ್ಟರ್ ಡಾಟಾ ಸಿಂಕ್, ಇದು ಸ್ವಲ್ಪ ಸಮಯ ತೆಗೆದುಕೊಳ್ಳಬಹುದು"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,ಉತ್ಪಾದನೆ ಐಟಂಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","ಮಾಸ್ಟರ್ ಡಾಟಾ ಸಿಂಕ್, ಇದು ಸ್ವಲ್ಪ ಸಮಯ ತೆಗೆದುಕೊಳ್ಳಬಹುದು"
 DocType: Item,Material Issue,ಮೆಟೀರಿಯಲ್ ಸಂಚಿಕೆ
-DocType: Hub Settings,Seller Description,ಮಾರಾಟಗಾರ ವಿವರಣೆ
 DocType: Employee Education,Qualification,ಅರ್ಹತೆ
 DocType: Item Price,Item Price,ಐಟಂ ಬೆಲೆ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,ಸಾಬೂನು ಹಾಗೂ ಮಾರ್ಜಕ
@@ -4467,7 +4554,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,ಟೈಮ್ ಟೈಮ್ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,ಚಲನಚಿತ್ರ ಮತ್ತು ವೀಡಿಯೊ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ಆದೇಶ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,ಪುನರಾರಂಭಿಸು
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,ಪುನರಾರಂಭಿಸು
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,ಸಕ್ರಿಯಗೊಳಿಸಿದಲ್ಲಿ ನಂತರ ಸಿಸ್ಟಮ್ ಟೆಂಪ್ಲೇಟ್ನಿಂದ ರೂಪಾಂತರಗಳ ಕ್ಷೇತ್ರಗಳನ್ನು ನವೀಕರಿಸುವುದಿಲ್ಲ ಆದರೆ ಹೊಸ ರೂಪಾಂತರ ಮಾಡುವಾಗ ಕೆಳಗೆ ತಿಳಿಸಲಾದ ಕ್ಷೇತ್ರಗಳ ಡೇಟಾವನ್ನು ನಕಲಿಸುತ್ತದೆ
 DocType: Salary Detail,Component,ಕಾಂಪೊನೆಂಟ್
 DocType: Assessment Criteria,Assessment Criteria Group,ಅಸೆಸ್ಮೆಂಟ್ ಕ್ರೈಟೀರಿಯಾ ಗ್ರೂಪ್
 DocType: Healthcare Settings,Patient Name By,ರೋಗಿಯ ಹೆಸರು ಇವರಿಂದ
@@ -4477,7 +4565,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,ಪಾತ್ರ ಅನುಮೋದಿಸಲಾಗುತ್ತಿದೆ ಅಥವಾ ಬಳಕೆದಾರ ಅನುಮೋದಿಸಲಾಗುತ್ತಿದೆ ನಮೂದಿಸಿ
 DocType: Journal Entry,Write Off Entry,ಎಂಟ್ರಿ ಆಫ್ ಬರೆಯಿರಿ
 DocType: BOM,Rate Of Materials Based On,ಮೆಟೀರಿಯಲ್ಸ್ ಆಧರಿಸಿದ ದರ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಪೂರೈಕೆದಾರ ಕೌಟುಂಬಿಕತೆ
+DocType: Item Variant Settings,Do not Update Variants,ರೂಪಾಂತರಗಳನ್ನು ನವೀಕರಿಸಬೇಡಿ
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,ಬೆಂಬಲ Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,ಎಲ್ಲವನ್ನೂ
 DocType: POS Profile,Terms and Conditions,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು
@@ -4486,7 +4574,7 @@
 DocType: Leave Block List,Applies to Company,ಕಂಪನಿ ಅನ್ವಯಿಸುತ್ತದೆ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,ಸಲ್ಲಿಸಿದ ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಏಕೆಂದರೆ ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Employee Loan,Disbursement Date,ವಿತರಣೆ ದಿನಾಂಕ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;ಸ್ವೀಕರಿಸುವವರು&#39; ಅನ್ನು ನಿರ್ದಿಷ್ಟಪಡಿಸಲಾಗಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;ಸ್ವೀಕರಿಸುವವರು&#39; ಅನ್ನು ನಿರ್ದಿಷ್ಟಪಡಿಸಲಾಗಿಲ್ಲ
 DocType: BOM Update Tool,Update latest price in all BOMs,ಎಲ್ಲಾ BOM ಗಳಲ್ಲೂ ಇತ್ತೀಚಿನ ಬೆಲೆ ನವೀಕರಿಸಿ
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,ವೈದ್ಯಕೀಯ ವರದಿ
 DocType: Vehicle,Vehicle,ವಾಹನ
@@ -4502,14 +4590,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,ಎದುರು / ಲೀಡ್%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,ಆಸ್ತಿ Depreciations ಮತ್ತು ಸಮತೋಲನ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},ಪ್ರಮಾಣ {0} {1} ವರ್ಗಾಯಿಸಲಾಯಿತು {2} ನಿಂದ {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},ಪ್ರಮಾಣ {0} {1} ವರ್ಗಾಯಿಸಲಾಯಿತು {2} ನಿಂದ {3}
 DocType: Sales Invoice,Get Advances Received,ಅಡ್ವಾನ್ಸಸ್ ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಪಡೆಯಿರಿ
 DocType: Email Digest,Add/Remove Recipients,ಸೇರಿಸಿ / ತೆಗೆದುಹಾಕಿ ಸ್ವೀಕೃತದಾರರ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ ವಿರುದ್ಧ ನಿಲ್ಲಿಸಿತು {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","ಡೀಫಾಲ್ಟ್ ಎಂದು ಈ ಆರ್ಥಿಕ ವರ್ಷ ಹೊಂದಿಸಲು, ' ಪೂರ್ವನಿಯೋಜಿತವಾಗಿನಿಗದಿಪಡಿಸು ' ಕ್ಲಿಕ್"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,ಸೇರಲು
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,ಸೇರಲು
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,ಕೊರತೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
 DocType: Employee Loan,Repay from Salary,ಸಂಬಳದಿಂದ ಬಂದ ಮರುಪಾವತಿ
 DocType: Leave Application,LAP/,ಲ್ಯಾಪ್ /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},ವಿರುದ್ಧ ಪಾವತಿ ಮನವಿ {0} {1} ಪ್ರಮಾಣದ {2}
@@ -4522,7 +4610,7 @@
 DocType: Sales Invoice Item,Sales Order Item,ಮಾರಾಟದ ಆರ್ಡರ್ ಐಟಂ
 DocType: Salary Slip,Payment Days,ಪಾವತಿ ಡೇಸ್
 DocType: Patient,Dormant,ಸುಪ್ತ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,ಚೈಲ್ಡ್ ನೋಡ್ಗಳ ಜೊತೆ ಗೋದಾಮುಗಳು ಲೆಡ್ಜರ್ ಪರಿವರ್ತಿಸಬಹುದು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,ಚೈಲ್ಡ್ ನೋಡ್ಗಳ ಜೊತೆ ಗೋದಾಮುಗಳು ಲೆಡ್ಜರ್ ಪರಿವರ್ತಿಸಬಹುದು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: BOM,Manage cost of operations,ಕಾರ್ಯಾಚರಣೆಗಳ ನಿರ್ವಹಣೆ ವೆಚ್ಚ
 DocType: Accounts Settings,Stale Days,ಸ್ಟಾಲ್ ಡೇಸ್
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","ಪರೀಕ್ಷಿಸಿದ್ದು ವ್ಯವಹಾರಗಳ ಯಾವುದೇ ""ಸಲ್ಲಿಸಿದ"" ಮಾಡಲಾಗುತ್ತದೆ , ಇಮೇಲ್ ಪಾಪ್ ಅಪ್ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಒಂದು ಅಟ್ಯಾಚ್ಮೆಂಟ್ ಆಗಿ ವ್ಯವಹಾರ ಜೊತೆ , ಮಾಡಿದರು ವ್ಯವಹಾರ ಸಂಬಂಧಿಸಿದ "" ಸಂಪರ್ಕಿಸಿ "" ಒಂದು ಇಮೇಲ್ ಕಳುಹಿಸಲು ತೆರೆಯಿತು . ಬಳಕೆದಾರ ಅಥವಾ ಜೂನ್ ಜೂನ್ ಇಮೇಲ್ ಕಳುಹಿಸಲು ."
@@ -4536,10 +4624,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಈಗಾಗಲೇ ಸ್ವೀಕರಿಸಲಾಗಿದೆ
 ,Requested Items To Be Transferred,ಬದಲಾಯಿಸಿಕೊಳ್ಳುವಂತೆ ವಿನಂತಿಸಲಾಗಿದೆ ಐಟಂಗಳು
 DocType: Expense Claim,Vehicle Log,ವಾಹನ ಲಾಗ್
-DocType: Purchase Invoice,Recurring Id,ಮರುಕಳಿಸುವ ಸಂ
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),ಜ್ವರದ ಉಪಸ್ಥಿತಿ (ಟೆಂಪ್&gt; 38.5 ° C / 101.3 ° F ಅಥವಾ ನಿರಂತರ ತಾಪಮಾನವು&gt; 38 ° C / 100.4 ° F)
 DocType: Customer,Sales Team Details,ಮಾರಾಟ ತಂಡದ ವಿವರಗಳು
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,ಶಾಶ್ವತವಾಗಿ ಅಳಿಸಿ?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,ಶಾಶ್ವತವಾಗಿ ಅಳಿಸಿ?
 DocType: Expense Claim,Total Claimed Amount,ಹಕ್ಕು ಪಡೆದ ಒಟ್ಟು ಪ್ರಮಾಣ
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,ಮಾರಾಟ ಸಮರ್ಥ ಅವಕಾಶಗಳನ್ನು .
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},ಅಮಾನ್ಯವಾದ {0}
@@ -4549,7 +4636,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ಡಿಪಾರ್ಟ್ಮೆಂಟ್ ಸ್ಟೋರ್ಸ್
 ,Item Delivery Date,ಐಟಂ ವಿತರಣೆ ದಿನಾಂಕ
 DocType: Warehouse,PIN,ಪಿನ್
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,ERPNext ನಿಮ್ಮ ಸ್ಕೂಲ್ ಸೆಟಪ್
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,ERPNext ನಿಮ್ಮ ಸ್ಕೂಲ್ ಸೆಟಪ್
 DocType: Sales Invoice,Base Change Amount (Company Currency),ಬೇಸ್ ಬದಲಾಯಿಸಬಹುದು ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,ನಂತರ ಗೋದಾಮುಗಳು ಯಾವುದೇ ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,ಮೊದಲ ದಾಖಲೆ ಉಳಿಸಿ.
@@ -4561,13 +4648,12 @@
 DocType: Task,Is Milestone,ಮೈಲ್ಸ್ಟೋನ್ ಈಸ್
 DocType: Daily Work Summary,Email Sent To,ಇಮೇಲ್ ಕಳುಹಿಸಲಾಗಿದೆ
 DocType: Budget,Warn,ಎಚ್ಚರಿಕೆ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,ನೋಂದಣಿ ರದ್ದು ಮಾಡಲು ನೀವು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ಯಾವುದೇ ಟೀಕೆಗಳನ್ನು, ದಾಖಲೆಗಳಲ್ಲಿ ಹೋಗಬೇಕು ಎಂದು ವಿವರಣೆಯಾಗಿದೆ ಪ್ರಯತ್ನ."
 DocType: BOM,Manufacturing User,ಉತ್ಪಾದನಾ ಬಳಕೆದಾರ
 DocType: Purchase Invoice,Raw Materials Supplied,ವಿತರಿಸುತ್ತಾರೆ ರಾ ಮೆಟೀರಿಯಲ್ಸ್
-DocType: Purchase Invoice,Recurring Print Format,ಮರುಕಳಿಸುವ ಪ್ರಿಂಟ್ ಫಾರ್ಮ್ಯಾಟ್
 DocType: C-Form,Series,ಸರಣಿ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},ಬೆಲೆ ಪಟ್ಟಿ {0} {1} ಅಥವಾ {2} ಆಗಿರಬೇಕು
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,ಉತ್ಪನ್ನಗಳನ್ನು ಸೇರಿಸಿ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},ಬೆಲೆ ಪಟ್ಟಿ {0} {1} ಅಥವಾ {2} ಆಗಿರಬೇಕು
 DocType: Appraisal,Appraisal Template,ಅಪ್ರೇಸಲ್ ಟೆಂಪ್ಲೇಟು
 DocType: Item Group,Item Classification,ಐಟಂ ವರ್ಗೀಕರಣ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,ವ್ಯವಹಾರ ಅಭಿವೃದ್ಧಿ ವ್ಯವಸ್ಥಾಪಕ
@@ -4581,7 +4667,7 @@
 DocType: Item Attribute Value,Attribute Value,ಮೌಲ್ಯ ಲಕ್ಷಣ
 ,Itemwise Recommended Reorder Level,Itemwise ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟ ಶಿಫಾರಸು
 DocType: Salary Detail,Salary Detail,ಸಂಬಳ ವಿವರ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,ಮೊದಲ {0} ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,ಮೊದಲ {0} ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Appointment Type,Physician,ವೈದ್ಯ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,ಐಟಂ ಬ್ಯಾಚ್ {0} {1} ಮುಗಿದಿದೆ.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,ಸಮಾಲೋಚನೆಗಳು
@@ -4592,7 +4678,7 @@
 DocType: Salary Detail,Default Amount,ಡೀಫಾಲ್ಟ್ ಪ್ರಮಾಣ
 DocType: Lab Test Template,Descriptive,ವಿವರಣಾತ್ಮಕ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,ವ್ಯವಸ್ಥೆಯ ಕಂಡುಬಂದಿಲ್ಲ ವೇರ್ಹೌಸ್
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,ಈ ತಿಂಗಳ ಸಾರಾಂಶ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,ಈ ತಿಂಗಳ ಸಾರಾಂಶ
 DocType: Quality Inspection Reading,Quality Inspection Reading,ಗುಣಮಟ್ಟದ ತಪಾಸಣೆ ಓದುವಿಕೆ
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,` ಸ್ಟಾಕ್ಗಳು ದ್ಯಾನ್ ಫ್ರೀಜ್ ` ಹಳೆಯ % d ದಿನಗಳಲ್ಲಿ ಹೆಚ್ಚು ಚಿಕ್ಕದಾಗಿರಬೇಕು.
 DocType: Tax Rule,Purchase Tax Template,ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟು ಖರೀದಿಸಿ
@@ -4615,12 +4701,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,ಕ್ರಿಯೆಗಳು / ಫಲಿತಾಂಶಗಳು ತರಬೇತಿ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,ಮೇಲೆ ಸವಕಳಿ ಕ್ರೋಢಿಕೃತ
 DocType: Sales Invoice,C-Form Applicable,ಅನ್ವಯಿಸುವ ಸಿ ಆಕಾರ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},ಆಪರೇಷನ್ ಟೈಮ್ ಆಪರೇಷನ್ 0 ಹೆಚ್ಚು ಇರಬೇಕು {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},ಆಪರೇಷನ್ ಟೈಮ್ ಆಪರೇಷನ್ 0 ಹೆಚ್ಚು ಇರಬೇಕು {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,ವೇರ್ಹೌಸ್ ಕಡ್ಡಾಯ
 DocType: Supplier,Address and Contacts,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕಗಳು
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM ಪರಿವರ್ತನೆ ವಿವರಗಳು
 DocType: Program,Program Abbreviation,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ಸಂಕ್ಷೇಪಣ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಒಂದು ಐಟಂ ಟೆಂಪ್ಲೇಟು ವಿರುದ್ಧ ಬೆಳೆದ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಒಂದು ಐಟಂ ಟೆಂಪ್ಲೇಟು ವಿರುದ್ಧ ಬೆಳೆದ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,ಆರೋಪಗಳನ್ನು ಪ್ರತಿ ಐಟಂ ವಿರುದ್ಧ ಖರೀದಿ ರಿಸೀಟ್ನ್ನು ನವೀಕರಿಸಲಾಗುವುದು
 DocType: Warranty Claim,Resolved By,ಪರಿಹರಿಸಲಾಗುವುದು
 DocType: Bank Guarantee,Start Date,ಪ್ರಾರಂಭ ದಿನಾಂಕ
@@ -4646,27 +4732,28 @@
 DocType: Employee,Educational Qualification,ಶೈಕ್ಷಣಿಕ ಅರ್ಹತೆ
 DocType: Workstation,Operating Costs,ವೆಚ್ಚದ
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,ಆಕ್ಷನ್ ಮಾಸಿಕ ಬಜೆಟ್ ಮೀರಿದೆ ತನ್ನತ್ತ
-DocType: Purchase Invoice,Submit on creation,ಸೃಷ್ಟಿ ಸಲ್ಲಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},ಕರೆನ್ಸಿ {0} ಇರಬೇಕು {1}
+DocType: Subscription,Submit on creation,ಸೃಷ್ಟಿ ಸಲ್ಲಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},ಕರೆನ್ಸಿ {0} ಇರಬೇಕು {1}
 DocType: Asset,Disposal Date,ವಿಲೇವಾರಿ ದಿನಾಂಕ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ಇಮೇಲ್ಗಳನ್ನು ಅವರು ರಜಾ ಹೊಂದಿಲ್ಲ ವೇಳೆ, ಗಂಟೆ ಕಂಪನಿಯ ಎಲ್ಲಾ ಸಕ್ರಿಯ ನೌಕರರು ಕಳುಹಿಸಲಾಗುವುದು. ಪ್ರತಿಕ್ರಿಯೆಗಳ ಸಾರಾಂಶ ಮಧ್ಯರಾತ್ರಿ ಕಳುಹಿಸಲಾಗುವುದು."
 DocType: Employee Leave Approver,Employee Leave Approver,ನೌಕರರ ಲೀವ್ ಅನುಮೋದಕ
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},ಸಾಲು {0}: ಒಂದು ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರವೇಶ ಈಗಾಗಲೇ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","ಸೋತು ಉದ್ಧರಣ ಮಾಡಲಾಗಿದೆ ಏಕೆಂದರೆ , ಘೋಷಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,ತರಬೇತಿ ಪ್ರತಿಕ್ರಿಯೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},ಸಾಲು {0}: ಒಂದು ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರವೇಶ ಈಗಾಗಲೇ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","ಸೋತು ಉದ್ಧರಣ ಮಾಡಲಾಗಿದೆ ಏಕೆಂದರೆ , ಘೋಷಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,ತರಬೇತಿ ಪ್ರತಿಕ್ರಿಯೆ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸಬೇಕು
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,ಸರಬರಾಜುದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ಮಾನದಂಡ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮತ್ತು ಐಟಂ ಎಂಡ್ ದಿನಾಂಕ ಆಯ್ಕೆ ಮಾಡಿ {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},ಕೋರ್ಸ್ ಸತತವಾಗಿ ಕಡ್ಡಾಯ {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ಇಲ್ಲಿಯವರೆಗೆ fromDate ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,/ ಸಂಪಾದಿಸಿ ಬೆಲೆಗಳು ಸೇರಿಸಿ
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,/ ಸಂಪಾದಿಸಿ ಬೆಲೆಗಳು ಸೇರಿಸಿ
 DocType: Batch,Parent Batch,ಪೋಷಕ ಬ್ಯಾಚ್
 DocType: Batch,Parent Batch,ಪೋಷಕ ಬ್ಯಾಚ್
 DocType: Cheque Print Template,Cheque Print Template,ಚೆಕ್ ಪ್ರಿಂಟ್ ಟೆಂಪ್ಲೇಟು
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,ವೆಚ್ಚ ಸೆಂಟರ್ಸ್ ಚಾರ್ಟ್
 DocType: Lab Test Template,Sample Collection,ಮಾದರಿ ಸಂಗ್ರಹ
 ,Requested Items To Be Ordered,ಆದೇಶ ಕೋರಲಾಗಿದೆ ಐಟಂಗಳು
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,ನನ್ನ ಆರ್ಡರ್ಸ್
 DocType: Price List,Price List Name,ಬೆಲೆ ಪಟ್ಟಿ ಹೆಸರು
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},ಡೈಲಿ ಕೆಲಸ ಸಾರಾಂಶ {0}
 DocType: Employee Loan,Totals,ಮೊತ್ತವನ್ನು
@@ -4685,12 +4772,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1} ಅಗತ್ಯವಿದೆ {2} {3} {4} ಫಾರ್ {5} ಈ ವ್ಯವಹಾರವನ್ನು ಪೂರ್ಣಗೊಳಿಸಲು ಮೇಲೆ ಘಟಕಗಳು.
 DocType: Fee Schedule,Student Category,ವಿದ್ಯಾರ್ಥಿ ವರ್ಗ
 DocType: Announcement,Student,ವಿದ್ಯಾರ್ಥಿ
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,ಸಂಸ್ಥೆ ಘಟಕ ( ಇಲಾಖೆ ) ಮಾಸ್ಟರ್ .
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,ಸಂಸ್ಥೆ ಘಟಕ ( ಇಲಾಖೆ ) ಮಾಸ್ಟರ್ .
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,ಕೊಠಡಿಗಳಿಗೆ ಹೋಗಿ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,ಕಳುಹಿಸುವ ಮೊದಲು ಸಂದೇಶವನ್ನು ನಮೂದಿಸಿ
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,ಸರಬರಾಜುದಾರರು ನಕಲು
 DocType: Email Digest,Pending Quotations,ಬಾಕಿ ಉಲ್ಲೇಖಗಳು
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,ಪಾಯಿಂಟ್ ಯಾ ಮಾರಾಟಕ್ಕೆ ವಿವರ
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,ಪಾಯಿಂಟ್ ಯಾ ಮಾರಾಟಕ್ಕೆ ವಿವರ
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,ಲ್ಯಾಬ್ ಟೆಸ್ಟ್ ಕಾನ್ಫಿಗರೇಶನ್ಗಳು.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,ಅಸುರಕ್ಷಿತ ಸಾಲ
 DocType: Cost Center,Cost Center Name,ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ಹೆಸರು
@@ -4700,6 +4787,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,ಒಟ್ಟು ಪಾವತಿಸಿದ ಆಮ್ಟ್
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 ಪಾತ್ರಗಳು ಹೆಚ್ಚು ಸಂದೇಶಗಳು ಅನೇಕ ಸಂದೇಶಗಳನ್ನು ವಿಭಜಿಸಲಾಗುವುದು
 DocType: Purchase Receipt Item,Received and Accepted,ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಮತ್ತು Accepted
+DocType: Hub Settings,Company and Seller Profile,ಕಂಪನಿ ಮತ್ತು ಮಾರಾಟಗಾರರ ವಿವರ
 ,GST Itemised Sales Register,ಜಿಎಸ್ಟಿ Itemized ಮಾರಾಟದ ನೋಂದಣಿ
 ,Serial No Service Contract Expiry,ಯಾವುದೇ ಸೀರಿಯಲ್ ಸೇವೆ ಕಾಂಟ್ರಾಕ್ಟ್ ಅಂತ್ಯ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,ನೀವು ಕ್ರೆಡಿಟ್ ಮತ್ತು sametime ನಲ್ಲಿ ಅದೇ ಖಾತೆಯನ್ನು ಡೆಬಿಟ್ ಸಾಧ್ಯವಿಲ್ಲ
@@ -4709,10 +4797,11 @@
 DocType: Item,Variant Based On,ಭಿನ್ನ ಬೇಸ್ಡ್ ರಂದು
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},ನಿಯೋಜಿಸಲಾಗಿದೆ ಒಟ್ಟು ಪ್ರಾಮುಖ್ಯತೆಯನ್ನು 100% ಇರಬೇಕು. ಇದು {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,ನಿಮ್ಮ ಪೂರೈಕೆದಾರರು
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,ದಯವಿಟ್ಟು ಸರಿಪಡಿಸಿ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,ಮಾರಾಟದ ಆರ್ಡರ್ ಮಾಡಿದ ಎಂದು ಕಳೆದು ಹೊಂದಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ .
 DocType: Request for Quotation Item,Supplier Part No,ಸರಬರಾಜುದಾರ ಭಾಗ ಯಾವುದೇ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ವರ್ಗದಲ್ಲಿ &#39;ಮೌಲ್ಯಾಂಕನ&#39; ಅಥವಾ &#39;Vaulation ಮತ್ತು ಒಟ್ಟು&#39; ಆಗಿದೆ ಮಾಡಿದಾಗ ಕಡಿತಗೊಳಿಸದಿರುವುದರ ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,ಸ್ವೀಕರಿಸಿದ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,ಸ್ವೀಕರಿಸಿದ
 DocType: Lead,Converted,ಪರಿವರ್ತಿತ
 DocType: Item,Has Serial No,ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ಹೊಂದಿದೆ
 DocType: Employee,Date of Issue,ಸಂಚಿಕೆ ದಿನಾಂಕ
@@ -4720,7 +4809,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","ಖರೀದಿ Reciept ಅಗತ್ಯವಿದೆ == &#39;ಹೌದು&#39;, ನಂತರ ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ರಚಿಸಲು, ಬಳಕೆದಾರ ಐಟಂ ಮೊದಲ ಖರೀದಿ ರಸೀತಿ ರಚಿಸಬೇಕಾಗಿದೆ ವೇಳೆ ಬೈಯಿಂಗ್ ಸೆಟ್ಟಿಂಗ್ಗಳು ಪ್ರಕಾರ {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},ರೋ # {0}: ಐಟಂ ಹೊಂದಿಸಿ ಸರಬರಾಜುದಾರ {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,ರೋ {0}: ಗಂಟೆಗಳು ಮೌಲ್ಯವನ್ನು ಶೂನ್ಯ ಹೆಚ್ಚು ಇರಬೇಕು.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,ಐಟಂ {1} ಜೋಡಿಸಲಾದ ವೆಬ್ಸೈಟ್ ಚಿತ್ರ {0} ದೊರೆಯುತ್ತಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,ಐಟಂ {1} ಜೋಡಿಸಲಾದ ವೆಬ್ಸೈಟ್ ಚಿತ್ರ {0} ದೊರೆಯುತ್ತಿಲ್ಲ
 DocType: Issue,Content Type,ವಿಷಯ ಪ್ರಕಾರ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,ಗಣಕಯಂತ್ರ
 DocType: Item,List this Item in multiple groups on the website.,ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ಅನೇಕ ಗುಂಪುಗಳಲ್ಲಿ ಈ ಐಟಂ ಪಟ್ಟಿ .
@@ -4731,14 +4820,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,ರಾಜಿಯಾಗದ ನಮೂದುಗಳು ಪಡೆಯಿರಿ
 DocType: Payment Reconciliation,From Invoice Date,ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ ಗೆ
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,ಸಲ್ಲಿಸಲು ನಿಮಗೆ ಅನುಮತಿ ಇಲ್ಲ
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,ಬಿಲ್ಲಿಂಗ್ ಕರೆನ್ಸಿ ಡೀಫಾಲ್ಟ್ comapany ಕರೆನ್ಸಿ ಅಥವಾ ಪಕ್ಷದ ಖಾತೆಯನ್ನು ಕರೆನ್ಸಿ ಸಮನಾಗಿರಬೇಕು
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,ಬಿಲ್ಲಿಂಗ್ ಕರೆನ್ಸಿ ಡೀಫಾಲ್ಟ್ comapany ಕರೆನ್ಸಿ ಅಥವಾ ಪಕ್ಷದ ಖಾತೆಯನ್ನು ಕರೆನ್ಸಿ ಸಮನಾಗಿರಬೇಕು
 DocType: Healthcare Settings,Laboratory Settings,ಪ್ರಯೋಗಾಲಯ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,ನಗದಾಗಿಸುವಿಕೆ ಬಿಡಿ
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,ಇದು ಏನು ಮಾಡುತ್ತದೆ?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,ಗೋದಾಮಿನ
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,ಎಲ್ಲಾ ವಿದ್ಯಾರ್ಥಿ ಪ್ರವೇಶ
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,ಇದು ಏನು ಮಾಡುತ್ತದೆ?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,ಗೋದಾಮಿನ
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,ಎಲ್ಲಾ ವಿದ್ಯಾರ್ಥಿ ಪ್ರವೇಶ
 ,Average Commission Rate,ಸರಾಸರಿ ಆಯೋಗದ ದರ
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,' ಸೀರಿಯಲ್ ನಂ ಹ್ಯಾಸ್ ' ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ' ಹೌದು ' ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,' ಸೀರಿಯಲ್ ನಂ ಹ್ಯಾಸ್ ' ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ' ಹೌದು ' ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,ಸ್ಥಿತಿ ಆಯ್ಕೆಮಾಡಿ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,ಅಟೆಂಡೆನ್ಸ್ ಭವಿಷ್ಯದ ದಿನಾಂಕ ಗುರುತಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Pricing Rule,Pricing Rule Help,ಬೆಲೆ ನಿಯಮ ಸಹಾಯ
@@ -4756,41 +4845,41 @@
 DocType: Item,Customer Code,ಗ್ರಾಹಕ ಕೋಡ್
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},ಹುಟ್ಟುಹಬ್ಬದ ಜ್ಞಾಪನೆ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ದಿನಗಳಿಂದಲೂ ಕೊನೆಯ ಆರ್ಡರ್
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
 DocType: Buying Settings,Naming Series,ಸರಣಿ ಹೆಸರಿಸುವ
 DocType: Leave Block List,Leave Block List Name,ಖಂಡ ಬಿಡಿ ಹೆಸರು
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ವಿಮೆ ಪ್ರಾರಂಭ ದಿನಾಂಕ ವಿಮಾ ಅಂತಿಮ ದಿನಾಂಕ ಕಡಿಮೆ ಇರಬೇಕು
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,ದಯವಿಟ್ಟು ಶಾಲೆಯ&gt; ಶಾಲಾ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಬೋಧಕ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಸಿದ್ಧಗೊಳಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,ಸ್ಟಾಕ್ ಸ್ವತ್ತುಗಳು
 DocType: Timesheet,Production Detail,ಪ್ರೊಡಕ್ಷನ್ ವಿವರ
+DocType: Restaurant,Active Menu,ಸಕ್ರಿಯ ಮೆನು
 DocType: Target Detail,Target Qty,ಟಾರ್ಗೆಟ್ ಪ್ರಮಾಣ
 DocType: Shopping Cart Settings,Checkout Settings,ಚೆಕ್ಔಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Attendance,Present,ಪ್ರೆಸೆಂಟ್
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸಿದ ಮಾಡಬಾರದು
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸಿದ ಮಾಡಬಾರದು
 DocType: Notification Control,Sales Invoice Message,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಸಂದೇಶ
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,ಖಾತೆ {0} ಮುಚ್ಚುವ ರೀತಿಯ ಹೊಣೆಗಾರಿಕೆ / ಇಕ್ವಿಟಿ ಇರಬೇಕು
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},ಉದ್ಯೋಗಿ ಸಂಬಳ ಸ್ಲಿಪ್ {0} ಈಗಾಗಲೇ ಸಮಯ ಹಾಳೆ ದಾಖಲಿಸಿದವರು {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},ಉದ್ಯೋಗಿ ಸಂಬಳ ಸ್ಲಿಪ್ {0} ಈಗಾಗಲೇ ಸಮಯ ಹಾಳೆ ದಾಖಲಿಸಿದವರು {1}
 DocType: Vehicle Log,Odometer,ದೂರಮಾಪಕ
 DocType: Sales Order Item,Ordered Qty,ಪ್ರಮಾಣ ಆದೇಶ
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Stock Settings,Stock Frozen Upto,ಸ್ಟಾಕ್ ಘನೀಕೃತ ವರೆಗೆ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,ಬಿಒಎಮ್ ಯಾವುದೇ ಸ್ಟಾಕ್ ಐಟಂ ಹೊಂದಿಲ್ಲ
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,ಪ್ರಾಜೆಕ್ಟ್ ಚಟುವಟಿಕೆ / ಕೆಲಸ .
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,ಬಿಒಎಮ್ ಯಾವುದೇ ಸ್ಟಾಕ್ ಐಟಂ ಹೊಂದಿಲ್ಲ
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,ಪ್ರಾಜೆಕ್ಟ್ ಚಟುವಟಿಕೆ / ಕೆಲಸ .
 DocType: Vehicle Log,Refuelling Details,Refuelling ವಿವರಗಳು
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,ಸಂಬಳ ಚೂರುಗಳನ್ನು ರಚಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","ಅನ್ವಯಿಸುವ ಹಾಗೆ ಆರಿಸಿದರೆ ಖರೀದಿ, ಪರೀಕ್ಷಿಸಬೇಕು {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ರಿಯಾಯಿತಿ ಕಡಿಮೆ 100 ಇರಬೇಕು
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,ಕೊನೆಯ ಖರೀದಿ ಕಂಡುಬಂದಿಲ್ಲ
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ಪ್ರಮಾಣದ ಆಫ್ ಬರೆಯಿರಿ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 DocType: Sales Invoice Timesheet,Billing Hours,ಬಿಲ್ಲಿಂಗ್ ಅವರ್ಸ್
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,ಫಾರ್ {0} ಕಂಡುಬಂದಿಲ್ಲ ಡೀಫಾಲ್ಟ್ ಬಿಒಎಮ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,ರೋ # {0}: ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,ಫಾರ್ {0} ಕಂಡುಬಂದಿಲ್ಲ ಡೀಫಾಲ್ಟ್ ಬಿಒಎಮ್
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,ರೋ # {0}: ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ ಹೊಂದಿಸಿ
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,ಅವುಗಳನ್ನು ಇಲ್ಲಿ ಸೇರಿಸಲು ಐಟಂಗಳನ್ನು ಟ್ಯಾಪ್
 DocType: Fees,Program Enrollment,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ನೋಂದಣಿ
 DocType: Landed Cost Voucher,Landed Cost Voucher,ಇಳಿಯಿತು ವೆಚ್ಚ ಚೀಟಿ
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},ಸೆಟ್ ದಯವಿಟ್ಟು {0}
-DocType: Purchase Invoice,Repeat on Day of Month,ತಿಂಗಳಿನ ದಿನ ಪುನರಾವರ್ತಿಸಿ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} ನಿಷ್ಕ್ರಿಯ ವಿದ್ಯಾರ್ಥಿ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} ನಿಷ್ಕ್ರಿಯ ವಿದ್ಯಾರ್ಥಿ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} ನಿಷ್ಕ್ರಿಯ ವಿದ್ಯಾರ್ಥಿ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} ನಿಷ್ಕ್ರಿಯ ವಿದ್ಯಾರ್ಥಿ
 DocType: Employee,Health Details,ಆರೋಗ್ಯ ವಿವರಗಳು
 DocType: Offer Letter,Offer Letter Terms,ಪತ್ರ ಕರಾರು ಆಫರ್
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,ಒಂದು ಪಾವತಿ ವಿನಂತಿ ಉಲ್ಲೇಖ ಡಾಕ್ಯುಮೆಂಟ್ ಅಗತ್ಯವಿದೆ ರಚಿಸಲು
@@ -4799,7 +4888,6 @@
 DocType: Employee External Work History,Salary,ಸಂಬಳ
 DocType: Serial No,Delivery Document Type,ಡೆಲಿವರಿ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,ಮೇಲೆ ಆಯ್ಕೆ ಮಾನದಂಡಗಳನ್ನು ಎಲ್ಲಾ ಸಂಬಳ ಚೂರುಗಳನ್ನು ಸಲ್ಲಿಸಿ
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} ಐಟಂಗಳು ಸಿಂಕ್
 DocType: Sales Order,Partly Delivered,ಭಾಗಶಃ ತಲುಪಿಸಲಾಗಿದೆ
 DocType: Email Digest,Receivables,ಕರಾರು
 DocType: Lead Source,Lead Source,ಲೀಡ್ ಮೂಲ
@@ -4821,9 +4909,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,ಏಜಿಂಗ್ ರೇಂಜ್ 2
 DocType: SG Creation Tool Course,Max Strength,ಮ್ಯಾಕ್ಸ್ ಸಾಮರ್ಥ್ಯ
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM ಬದಲಾಯಿಸಲ್ಪಟ್ಟಿದೆ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,ಡೆಲಿವರಿ ದಿನಾಂಕವನ್ನು ಆಧರಿಸಿ ಐಟಂಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,ಡೆಲಿವರಿ ದಿನಾಂಕವನ್ನು ಆಧರಿಸಿ ಐಟಂಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
 ,Sales Analytics,ಮಾರಾಟದ ಅನಾಲಿಟಿಕ್ಸ್
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},ಲಭ್ಯವಿರುವ {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},ಲಭ್ಯವಿರುವ {0}
 ,Prospects Engaged But Not Converted,ಪ್ರಾಸ್ಪೆಕ್ಟ್ಸ್ ಎಂಗೇಜಡ್ ಆದರೆ ಪರಿವರ್ತನೆಗೊಂಡಿಲ್ಲ
 ,Prospects Engaged But Not Converted,ಪ್ರಾಸ್ಪೆಕ್ಟ್ಸ್ ಎಂಗೇಜಡ್ ಆದರೆ ಪರಿವರ್ತನೆಗೊಂಡಿಲ್ಲ
 DocType: Manufacturing Settings,Manufacturing Settings,ಉತ್ಪಾದನಾ ಸೆಟ್ಟಿಂಗ್ಗಳು
@@ -4831,10 +4919,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 ಮೊಬೈಲ್ ಇಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,CompanyMaster ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ನಮೂದಿಸಿ
 DocType: Stock Entry Detail,Stock Entry Detail,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ ವಿವರಗಳು
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,ದೈನಂದಿನ ಜ್ಞಾಪನೆಗಳನ್ನು
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,ದೈನಂದಿನ ಜ್ಞಾಪನೆಗಳನ್ನು
 DocType: Products Settings,Home Page is Products,ಮುಖಪುಟ ಉತ್ಪನ್ನಗಳು ಆಗಿದೆ
 ,Asset Depreciation Ledger,ಆಸ್ತಿ ಸವಕಳಿ ಲೆಡ್ಜರ್
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},ತೆರಿಗೆ ನಿಯಮದ ನಡುವೆ ಘರ್ಷಣೆ {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},ತೆರಿಗೆ ನಿಯಮದ ನಡುವೆ ಘರ್ಷಣೆ {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,ಹೊಸ ಖಾತೆ ಹೆಸರು
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,ರಾ ಮೆಟೀರಿಯಲ್ಸ್ ಸರಬರಾಜು ವೆಚ್ಚ
 DocType: Selling Settings,Settings for Selling Module,ಮಾಡ್ಯೂಲ್ ಮಾರಾಟವಾಗುವ ಸೆಟ್ಟಿಂಗ್ಗಳು
@@ -4848,8 +4936,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,ಪ್ರೋಗ್ರೆಸ್ ಉಗ್ರಾಣದಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಕೆಲಸ
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,ಅಕೌಂಟಿಂಗ್ ವ್ಯವಹಾರ ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು .
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ಮಾನವ ಸಂಪನ್ಮೂಲ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಉದ್ಯೋಗಿ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಸಿದ್ಧಗೊಳಿಸಿ
 DocType: Maintenance Visit,MV,ಎಂವಿ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,ನಿರೀಕ್ಷಿತ ದಿನಾಂಕ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ದಿನಾಂಕ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
+DocType: Restaurant,Default Tax Template,ಡೀಫಾಲ್ಟ್ ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟು
 DocType: Fees,Student Details,ವಿದ್ಯಾರ್ಥಿ ವಿವರಗಳು
 DocType: Purchase Invoice Item,Stock Qty,ಸ್ಟಾಕ್ ಪ್ರಮಾಣ
 DocType: Purchase Invoice Item,Stock Qty,ಸ್ಟಾಕ್ ಪ್ರಮಾಣ
@@ -4868,8 +4957,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,ಐಟಂಗಳಿಗೆ ಹೋಗಿ
 DocType: Sales Partner,Partner Type,ಸಂಗಾತಿ ಪ್ರಕಾರ
 DocType: Purchase Taxes and Charges,Actual,ವಾಸ್ತವಿಕ
+DocType: Restaurant Menu,Restaurant Manager,ರೆಸ್ಟೋರೆಂಟ್ ಮ್ಯಾನೇಜರ್
 DocType: Authorization Rule,Customerwise Discount,Customerwise ಡಿಸ್ಕೌಂಟ್
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,ಕಾರ್ಯಗಳಿಗಾಗಿ timesheet.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,ಕಾರ್ಯಗಳಿಗಾಗಿ timesheet.
 DocType: Purchase Invoice,Against Expense Account,ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ವಿರುದ್ಧ
 DocType: Production Order,Production Order,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,ಅನುಸ್ಥಾಪನೆ ಸೂಚನೆ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
@@ -4877,7 +4967,6 @@
 DocType: Quotation Item,Against Docname,docName ವಿರುದ್ಧ
 DocType: SMS Center,All Employee (Active),ಎಲ್ಲಾ ನೌಕರರ ( ಸಕ್ರಿಯ )
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,ಈಗ ವೀಕ್ಷಿಸಿ
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,ಸರಕುಪಟ್ಟಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ರಚಿಸಲಾಗಿದೆ ಮಾಡಿದಾಗ ಅವಧಿಯಲ್ಲಿ ಆಯ್ಕೆ
 DocType: BOM,Raw Material Cost,ರಾ ಮೆಟೀರಿಯಲ್ ವೆಚ್ಚ
 DocType: Item Reorder,Re-Order Level,ಮರು ಕ್ರಮಾಂಕದ ಮಟ್ಟ
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,ನೀವು ಉತ್ಪಾದನೆ ಆದೇಶಗಳನ್ನು ಹೆಚ್ಚಿಸಲು ಅಥವಾ ವಿಶ್ಲೇಷಣೆ ಕಚ್ಚಾ ವಸ್ತುಗಳನ್ನು ಡೌನ್ಲೋಡ್ ಬಯಸುವ ಐಟಂಗಳನ್ನು ಮತ್ತು ಯೋಜಿಸಿದ ಪ್ರಮಾಣ ನಮೂದಿಸಿ.
@@ -4890,24 +4979,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,ವರದಿ ಪ್ರಕಾರ ಕಡ್ಡಾಯ
 DocType: Item,Serial Number Series,ಕ್ರಮ ಸಂಖ್ಯೆ ಸರಣಿ
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},ವೇರ್ಹೌಸ್ ಸ್ಟಾಕ್ ಐಟಂ ಕಡ್ಡಾಯ {0} ಸತತವಾಗಿ {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,ಪ್ರೋಗ್ರಾಂಗಳನ್ನು ಸೇರಿಸಿ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,ಚಿಲ್ಲರೆ & ಸಗಟು
 DocType: Issue,First Responded On,ಮೊದಲ ಪ್ರತಿಕ್ರಿಯೆ
 DocType: Website Item Group,Cross Listing of Item in multiple groups,ಅನೇಕ ಗುಂಪುಗಳಲ್ಲಿ ಐಟಂ ಅಡ್ಡ ಪಟ್ಟಿ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ಹಣಕಾಸಿನ ವರ್ಷ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮತ್ತು ಹಣಕಾಸಿನ ವರ್ಷದ ಅಂತ್ಯ ದಿನಾಂಕ ಈಗಾಗಲೇ ವಿತ್ತೀಯ ವರ್ಷದಲ್ಲಿ ಸೆಟ್ {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,ಒಡೆದ ಬ್ಯಾಚ್
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,ಒಡೆದ ಬ್ಯಾಚ್
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,ಒಡೆದ ಬ್ಯಾಚ್
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,ಒಡೆದ ಬ್ಯಾಚ್
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,ಯಶಸ್ವಿಯಾಗಿ ಮರುಕೌನ್ಸಿಲ್
 DocType: Request for Quotation Supplier,Download PDF,PDF ಡೌನ್ಲೋಡ್
 DocType: Production Order,Planned End Date,ಯೋಜನೆ ಅಂತಿಮ ದಿನಾಂಕ
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,ವೇಳಾಪಟ್ಟಿ ದಿನಾಂಕವನ್ನು ನಮೂದಿಸಿ
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,ಐಟಂಗಳನ್ನು ಸಂಗ್ರಹಿಸಲಾಗಿದೆ ಅಲ್ಲಿ .
 DocType: Request for Quotation,Supplier Detail,ಸರಬರಾಜುದಾರ ವಿವರ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},ಸೂತ್ರ ಅಥವಾ ಸ್ಥಿತಿಯಲ್ಲಿ ದೋಷ: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},ಸೂತ್ರ ಅಥವಾ ಸ್ಥಿತಿಯಲ್ಲಿ ದೋಷ: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,ಮಾನದಂಡದ ತೂಕವು 100%
 DocType: Attendance,Attendance,ಅಟೆಂಡೆನ್ಸ್
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,ಸ್ಟಾಕ್ ವಸ್ತುಗಳು
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,ಸ್ಟಾಕ್ ವಸ್ತುಗಳು
 DocType: BOM,Materials,ಮೆಟೀರಿಯಲ್
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","ಪರೀಕ್ಷಿಸಿದ್ದು ಅಲ್ಲ, ಪಟ್ಟಿ ಇದು ಅನ್ವಯಿಸಬಹುದು ಅಲ್ಲಿ ಪ್ರತಿ ಇಲಾಖೆಗಳು ಸೇರಿಸಲಾಗುತ್ತದೆ ಹೊಂದಿರುತ್ತದೆ ."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,ಮೂಲ ಮತ್ತು ಗುರಿ ವೇರ್ಹೌಸ್ ಇರಲಾಗುವುದಿಲ್ಲ
@@ -4925,6 +5014,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,ನೆಟ್ ಒಟ್ಟು ರಂದು
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},ಲಕ್ಷಣ {0} ಮೌಲ್ಯವನ್ನು ವ್ಯಾಪ್ತಿಯಲ್ಲಿ ಇರಬೇಕು {1} ನಿಂದ {2} ಏರಿಕೆಗಳಲ್ಲಿ {3} ಐಟಂ {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,ಸತತವಾಗಿ ಟಾರ್ಗೆಟ್ ಗೋದಾಮಿನ {0} ಅದೇ ಇರಬೇಕು ಉತ್ಪಾದನೆ ಆರ್ಡರ್
+DocType: Restaurant Reservation,Waitlisted,ನಿರೀಕ್ಷಿತ ಪಟ್ಟಿ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,ಕರೆನ್ಸಿ ಕೆಲವು ಇತರ ಕರೆನ್ಸಿ ಬಳಸಿಕೊಂಡು ನಮೂದುಗಳನ್ನು ಮಾಡಿದ ನಂತರ ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Vehicle Service,Clutch Plate,ಕ್ಲಚ್ ಪ್ಲೇಟ್
 DocType: Company,Round Off Account,ಖಾತೆ ಆಫ್ ಸುತ್ತ
@@ -4941,7 +5031,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,ಹೊಸ ಮಾರಾಟದ ವ್ಯಕ್ತಿ ಹೆಸರು
 DocType: Packing Slip,Gross Weight UOM,ಒಟ್ಟಾರೆ ತೂಕದ UOM
 DocType: Delivery Note Item,Against Sales Invoice,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ವಿರುದ್ಧ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,ದಯವಿಟ್ಟು ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ ಸರಣಿ ಸಂಖ್ಯೆಗಳನ್ನು ನಮೂದಿಸಿ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,ದಯವಿಟ್ಟು ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ ಸರಣಿ ಸಂಖ್ಯೆಗಳನ್ನು ನಮೂದಿಸಿ
 DocType: Bin,Reserved Qty for Production,ಪ್ರೊಡಕ್ಷನ್ ಪ್ರಮಾಣ ಕಾಯ್ದಿರಿಸಲಾಗಿದೆ
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ನೀವು ಕೋರ್ಸ್ ಆಧಾರಿತ ಗುಂಪುಗಳನ್ನು ಮಾಡುವಾಗ ಬ್ಯಾಚ್ ಪರಿಗಣಿಸಲು ಬಯಸದಿದ್ದರೆ ಪರಿಶೀಲಿಸದೆ ಬಿಟ್ಟುಬಿಡಿ.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ನೀವು ಕೋರ್ಸ್ ಆಧಾರಿತ ಗುಂಪುಗಳನ್ನು ಮಾಡುವಾಗ ಬ್ಯಾಚ್ ಪರಿಗಣಿಸಲು ಬಯಸದಿದ್ದರೆ ಪರಿಶೀಲಿಸದೆ ಬಿಟ್ಟುಬಿಡಿ.
@@ -4953,7 +5043,7 @@
 DocType: Lab Test,Test Group,ಟೆಸ್ಟ್ ಗುಂಪು
 DocType: Payment Reconciliation,Receivable / Payable Account,ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆ
 DocType: Delivery Note Item,Against Sales Order Item,ಮಾರಾಟದ ಆರ್ಡರ್ ಐಟಂ ವಿರುದ್ಧ
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯ ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯ ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ {0}
 DocType: Item,Default Warehouse,ಡೀಫಾಲ್ಟ್ ವೇರ್ಹೌಸ್
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},ಬಜೆಟ್ ಗ್ರೂಪ್ ಖಾತೆ ವಿರುದ್ಧ ನಿಯೋಜಿಸಲಾಗುವುದು ಸಾಧ್ಯವಿಲ್ಲ {0}
 DocType: Healthcare Settings,Patient Registration,ರೋಗಿಯ ನೋಂದಣಿ
@@ -4983,6 +5073,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,ಮಾರಾಟಗಾರ
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,ಬಜೆಟ್ ಮತ್ತು ವೆಚ್ಚದ ಕೇಂದ್ರ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,ಬಹುಪಾಲು ಡೀಫಾಲ್ಟ್ ಮೋಡ್ ಅನ್ನು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,ಫಾರ್
 ,Appointment Analytics,ನೇಮಕಾತಿ ಅನಾಲಿಟಿಕ್ಸ್
 DocType: Vehicle Service,Half Yearly,ಅರ್ಧ ವಾರ್ಷಿಕ
 DocType: Lead,Blog Subscriber,ಬ್ಲಾಗ್ ಚಂದಾದಾರರ
@@ -5002,7 +5093,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,quot ಕೌಂಟ್
 ,BOM Stock Report,ಬಿಒಎಮ್ ಸ್ಟಾಕ್ ವರದಿ
 DocType: Stock Reconciliation Item,Quantity Difference,ಪ್ರಮಾಣ ವ್ಯತ್ಯಾಸ
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,ಸಂಸ್ಕರಣ ವೇತನದಾರರ
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,ಸಂಸ್ಕರಣ ವೇತನದಾರರ
 DocType: Opportunity Item,Basic Rate,ಮೂಲ ದರದ
 DocType: GL Entry,Credit Amount,ಕ್ರೆಡಿಟ್ ಪ್ರಮಾಣ
 DocType: Cheque Print Template,Signatory Position,ಸಹಿ ಪೊಸಿಷನ್
@@ -5016,12 +5107,12 @@
 DocType: Tax Rule,Tax Rule,ತೆರಿಗೆ ನಿಯಮ
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,ಮಾರಾಟ ಸೈಕಲ್ ಉದ್ದಕ್ಕೂ ಅದೇ ದರ ಕಾಯ್ದುಕೊಳ್ಳಲು
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,ವರ್ಕ್ಸ್ಟೇಷನ್ ಕೆಲಸ ಅವಧಿಗಳನ್ನು ಹೊರತುಪಡಿಸಿ ಸಮಯ ದಾಖಲೆಗಳು ಯೋಜನೆ.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,ಸರದಿಯಲ್ಲಿ ಗ್ರಾಹಕರು
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,ಡಾ {0} ವೈದ್ಯರ ವೇಳಾಪಟ್ಟಿ ಹೊಂದಿಲ್ಲ. ವೈದ್ಯ ಮಾಸ್ಟರ್ನಲ್ಲಿ ಸೇರಿಸಿ
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,ಸರದಿಯಲ್ಲಿ ಗ್ರಾಹಕರು
 DocType: Student,Nationality,ರಾಷ್ಟ್ರೀಯತೆ
 ,Items To Be Requested,ಮನವಿ ಐಟಂಗಳನ್ನು
-DocType: Purchase Order,Get Last Purchase Rate,ಕೊನೆಯ ಖರೀದಿ ದರ ಸಿಗುತ್ತದೆ
 DocType: Company,Company Info,ಕಂಪನಿ ಮಾಹಿತಿ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,ಆಯ್ಕೆಮಾಡಿ ಅಥವಾ ಹೊಸ ಗ್ರಾಹಕ ಸೇರಿಸು
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,ಆಯ್ಕೆಮಾಡಿ ಅಥವಾ ಹೊಸ ಗ್ರಾಹಕ ಸೇರಿಸು
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ಒಂದು ಖರ್ಚು ಹಕ್ಕು ಕಾಯ್ದಿರಿಸಲು ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ನಿಧಿಗಳು ಅಪ್ಲಿಕೇಶನ್ ( ಆಸ್ತಿಗಳು )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ಈ ನೌಕರರ ಹಾಜರಾತಿ ಆಧರಿಸಿದೆ
@@ -5029,6 +5120,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,ಡೆಬಿಟ್ ಖಾತೆ
 DocType: Fiscal Year,Year Start Date,ವರ್ಷದ ಆರಂಭ ದಿನಾಂಕ
 DocType: Attendance,Employee Name,ನೌಕರರ ಹೆಸರು
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,ರೆಸ್ಟೋರೆಂಟ್ ಆರ್ಡರ್ ಎಂಟ್ರಿ ಐಟಂ
 DocType: Sales Invoice,Rounded Total (Company Currency),ದುಂಡಾದ ಒಟ್ಟು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,ಖಾತೆ ಕೌಟುಂಬಿಕತೆ ಆಯ್ಕೆ ಏಕೆಂದರೆ ಗ್ರೂಪ್ ನಿಗೂಢ ಸಾಧ್ಯವಿಲ್ಲ.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} ಮಾರ್ಪಡಿಸಲಾಗಿದೆ. ರಿಫ್ರೆಶ್ ಮಾಡಿ.
@@ -5039,6 +5131,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,ಉದ್ಯೋಗಿ ಸೌಲಭ್ಯಗಳು
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},{0} ಸತತವಾಗಿ {1} ಪ್ಯಾಕ್ಡ್ ಪ್ರಮಾಣ ಐಟಂ ಪ್ರಮಾಣ ಸಮ
 DocType: Production Order,Manufactured Qty,ತಯಾರಿಸಲ್ಪಟ್ಟ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,ಸರಕುಪಟ್ಟಿ ರಚಿಸಲಾಗಿದೆ
 DocType: Purchase Receipt Item,Accepted Quantity,Accepted ಪ್ರಮಾಣ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},ದಯವಿಟ್ಟು ಡೀಫಾಲ್ಟ್ ನೌಕರರ ಹಾಲಿಡೇ ಪಟ್ಟಿ ಸೆಟ್ {0} ಅಥವಾ ಕಂಪನಿ {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} ಮಾಡುವುದಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
@@ -5048,18 +5141,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ರೋ ಯಾವುದೇ {0}: ಪ್ರಮಾಣ ಖರ್ಚು ಹಕ್ಕು {1} ವಿರುದ್ಧ ಪ್ರಮಾಣ ಬಾಕಿ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ. ಬಾಕಿ ಪ್ರಮಾಣ {2}
 DocType: Maintenance Schedule,Schedule,ಕಾರ್ಯಕ್ರಮ
 DocType: Account,Parent Account,ಪೋಷಕರ ಖಾತೆಯ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,ಲಭ್ಯ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,ಲಭ್ಯ
 DocType: Quality Inspection Reading,Reading 3,3 ಓದುವಿಕೆ
 ,Hub,ಹಬ್
 DocType: GL Entry,Voucher Type,ಚೀಟಿ ಪ್ರಕಾರ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,ದರ ಪಟ್ಟಿ ಕಂಡುಬಂದಿಲ್ಲ ಅಥವಾ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,ದರ ಪಟ್ಟಿ ಕಂಡುಬಂದಿಲ್ಲ ಅಥವಾ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Lab Test,Approved,Approved
 DocType: Pricing Rule,Price,ಬೆಲೆ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',{0} ಮೇಲೆ ಬಿಡುಗಡೆ ನೌಕರರ ' ಎಡ ' ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',{0} ಮೇಲೆ ಬಿಡುಗಡೆ ನೌಕರರ ' ಎಡ ' ಹೊಂದಿಸಿ
+DocType: Hub Settings,Last Sync On,ಕೊನೆಯ ಸಿಂಕ್ ಆನ್
 DocType: Guardian,Guardian,ಗಾರ್ಡಿಯನ್
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ಅಪ್ರೇಸಲ್ {0} ನೌಕರ ದಾಖಲಿಸಿದವರು {1} givenName ದಿನಾಂಕ ವ್ಯಾಪ್ತಿಯಲ್ಲಿ
 DocType: Employee,Education,ಶಿಕ್ಷಣ
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,ಡೆಲ್
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,ಡೆಲ್
 DocType: Selling Settings,Campaign Naming By,ಅಭಿಯಾನ ಹೆಸರಿಸುವ
 DocType: Employee,Current Address Is,ಪ್ರಸ್ತುತ ವಿಳಾಸ ಈಸ್
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,ಮಾಸಿಕ ಮಾರಾಟದ ಗುರಿ (
@@ -5074,7 +5168,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,ಕೋರ್ಸ್ ಕೋಡ್:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ನಮೂದಿಸಿ
 DocType: Account,Stock,ಸ್ಟಾಕ್
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ರೋ # {0}: ರೆಫರೆನ್ಸ್ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ ಆರ್ಡರ್ ಖರೀದಿಸಿ ಒಂದು, ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಅಥವಾ ಜರ್ನಲ್ ಎಂಟ್ರಿ ಇರಬೇಕು"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ರೋ # {0}: ರೆಫರೆನ್ಸ್ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ ಆರ್ಡರ್ ಖರೀದಿಸಿ ಒಂದು, ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಅಥವಾ ಜರ್ನಲ್ ಎಂಟ್ರಿ ಇರಬೇಕು"
 DocType: Employee,Current Address,ಪ್ರಸ್ತುತ ವಿಳಾಸ
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ನಿಗದಿಸಬಹುದು ಹೊರತು ಐಟಂ ನಂತರ ವಿವರಣೆ, ಇಮೇಜ್, ಬೆಲೆ, ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟ್ ಸೆಟ್ ಮಾಡಲಾಗುತ್ತದೆ ಇತ್ಯಾದಿ ಮತ್ತೊಂದು ಐಟಂ ಒಂದು ಭೇದ ವೇಳೆ"
 DocType: Serial No,Purchase / Manufacture Details,ಖರೀದಿ / ತಯಾರಿಕೆ ವಿವರಗಳು
@@ -5105,7 +5199,7 @@
 DocType: Hub Settings,Hub Settings,ಹಬ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Project,Gross Margin %,ಒಟ್ಟು ಅಂಚು %
 DocType: BOM,With Operations,ಕಾರ್ಯಾಚರಣೆ
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಈಗಾಗಲೇ ಕರೆನ್ಸಿ ಮಾಡಲಾಗಿದೆ {0} ಕಂಪನಿಗೆ {1}. ಕರೆನ್ಸಿಯ ಜತೆ ಸ್ವೀಕೃತಿ ಅಥವಾ ಕೊಡಬೇಕಾದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಈಗಾಗಲೇ ಕರೆನ್ಸಿ ಮಾಡಲಾಗಿದೆ {0} ಕಂಪನಿಗೆ {1}. ಕರೆನ್ಸಿಯ ಜತೆ ಸ್ವೀಕೃತಿ ಅಥವಾ ಕೊಡಬೇಕಾದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ {0}.
 DocType: Asset,Is Existing Asset,ಆಸ್ತಿ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಇದೆ
 DocType: Salary Detail,Statistical Component,ಸ್ಟ್ಯಾಟಿಸ್ಟಿಕಲ್ ಕಾಂಪೊನೆಂಟ್
 DocType: Salary Detail,Statistical Component,ಸ್ಟ್ಯಾಟಿಸ್ಟಿಕಲ್ ಕಾಂಪೊನೆಂಟ್
@@ -5114,13 +5208,14 @@
 DocType: BOM Operation,BOM Operation,BOM ಕಾರ್ಯಾಚರಣೆ
 DocType: Purchase Taxes and Charges,On Previous Row Amount,ಹಿಂದಿನ ಸಾಲು ಪ್ರಮಾಣ ರಂದು
 DocType: Student,Home Address,ಮನೆ ವಿಳಾಸ
+DocType: Item,Has Expiry Date,ಅವಧಿ ಮುಗಿದಿದೆ
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,ಐಟಂ ವಿಭಿನ್ನ ಸೆಟ್ಟಿಂಗ್ಗಳು.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,ಟ್ರಾನ್ಸ್ಫರ್ ಸ್ವತ್ತು
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,ಟ್ರಾನ್ಸ್ಫರ್ ಸ್ವತ್ತು
 DocType: POS Profile,POS Profile,ಪಿಓಎಸ್ ವಿವರ
 DocType: Training Event,Event Name,ಈವೆಂಟ್ ಹೆಸರು
 DocType: Physician,Phone (Office),ಫೋನ್ (ಕಚೇರಿ)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,ಪ್ರವೇಶ
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},ಪ್ರವೇಶಾತಿಯು {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,ಪ್ರವೇಶ
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},ಪ್ರವೇಶಾತಿಯು {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","ಸ್ಥಾಪನೆಗೆ ಬಜೆಟ್, ಗುರಿಗಳನ್ನು ಇತ್ಯಾದಿ ಋತುಮಾನ"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,ವೇರಿಯೇಬಲ್ ಹೆಸರು
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","{0} ಐಟಂ ಒಂದು ಟೆಂಪ್ಲೇಟ್ ಆಗಿದೆ, ಅದರ ರೂಪಾಂತರಗಳು ಒಂದಾಗಿದೆ ಆಯ್ಕೆ ಮಾಡಿ"
@@ -5129,7 +5224,7 @@
 DocType: Assessment Plan,Room,ಕೊಠಡಿ
 DocType: Purchase Order,Advance Paid,ಅಡ್ವಾನ್ಸ್ ಪಾವತಿಸಿದ
 DocType: Item,Item Tax,ಐಟಂ ತೆರಿಗೆ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,ಸರಬರಾಜುದಾರ ವಸ್ತು
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,ಸರಬರಾಜುದಾರ ವಸ್ತು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,ಅಬಕಾರಿ ಸರಕುಪಟ್ಟಿ
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,ಟ್ರೆಶ್ಹೋಲ್ಡ್ {0}% ಹೆಚ್ಚು ಬಾರಿ ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತದೆ
 DocType: Expense Claim,Employees Email Id,ನೌಕರರು ಇಮೇಲ್ ಐಡಿ
@@ -5140,31 +5235,29 @@
 DocType: Program,Program Name,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ಹೆಸರು
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,ತೆರಿಗೆ ಅಥವಾ ಶುಲ್ಕ ಪರಿಗಣಿಸಿ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,ನಿಜವಾದ ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} ಪ್ರಸ್ತುತ ಒಂದು {1} ಪೂರೈಕೆದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ಸ್ಟ್ಯಾಂಡಿಂಗ್ ಅನ್ನು ಹೊಂದಿದೆ, ಮತ್ತು ಈ ಸರಬರಾಜುದಾರರಿಗೆ ಖರೀದಿ ಆದೇಶಗಳನ್ನು ಎಚ್ಚರಿಕೆಯಿಂದ ನೀಡಬೇಕು."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} ಪ್ರಸ್ತುತ ಒಂದು {1} ಪೂರೈಕೆದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ಸ್ಟ್ಯಾಂಡಿಂಗ್ ಅನ್ನು ಹೊಂದಿದೆ, ಮತ್ತು ಈ ಸರಬರಾಜುದಾರರಿಗೆ ಖರೀದಿ ಆದೇಶಗಳನ್ನು ಎಚ್ಚರಿಕೆಯಿಂದ ನೀಡಬೇಕು."
 DocType: Employee Loan,Loan Type,ಸಾಲದ ಬಗೆಯ
 DocType: Scheduling Tool,Scheduling Tool,ನಿಗದಿಗೊಳಿಸುವ ಟೂಲ್
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್
 DocType: BOM,Item to be manufactured or repacked,ಉತ್ಪಾದಿತ ಅಥವಾ repacked ಎಂದು ಐಟಂ
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,ಸ್ಟಾಕ್ ವ್ಯವಹಾರ ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು .
-DocType: Purchase Invoice,Next Date,NextDate
 DocType: Employee Education,Major/Optional Subjects,ಮೇಜರ್ / ಐಚ್ಛಿಕ ವಿಷಯಗಳ
 DocType: Sales Invoice Item,Drop Ship,ಡ್ರಾಪ್ ಹಡಗು
+DocType: Hub Settings,Suspended,ಅಮಾನತುಗೊಳಿಸಲಾಗಿದೆ
 DocType: Training Event,Attendees,ಹಾಜರಾದವರು
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","ಇಲ್ಲಿ ನೀವು ಮೂಲ , ಹೆಂಡತಿ ಮತ್ತು ಮಕ್ಕಳ ಹೆಸರು ಮತ್ತು ಉದ್ಯೋಗ ಕುಟುಂಬ ವಿವರಗಳು ಕಾಯ್ದುಕೊಳ್ಳಬಹುದು"
 DocType: Academic Term,Term End Date,ಟರ್ಮ್ ಅಂತಿಮ ದಿನಾಂಕ
-DocType: Hub Settings,Seller Name,ಮಾರಾಟಗಾರ ಹೆಸರು
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),ಕಡಿತಗೊಳಿಸಲಾಗುತ್ತದೆ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 DocType: Item Group,General Settings,ಸಾಮಾನ್ಯ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,ಚಲಾವಣೆಯ ಮತ್ತು ಕರೆನ್ಸಿ ಇರಲಾಗುವುದಿಲ್ಲ
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,ತರಬೇತುದಾರರನ್ನು ಸೇರಿಸಿ
 DocType: Stock Entry,Repack,ಮೂಟೆಕಟ್ಟು
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,ನೀವು ಮುಂದುವರೆಯುವುದಕ್ಕೆ ಮುಂಚಿತವಾಗಿ ರೂಪ ಉಳಿಸಬೇಕು
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,ದಯವಿಟ್ಟು ಮೊದಲು ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ
 DocType: Item Attribute,Numeric Values,ಸಂಖ್ಯೆಯ ಮೌಲ್ಯಗಳನ್ನು
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,ಲೋಗೋ ಲಗತ್ತಿಸಿ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,ಸ್ಟಾಕ್ ಲೆವೆಲ್ಸ್
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,ಸ್ಟಾಕ್ ಲೆವೆಲ್ಸ್
 DocType: Customer,Commission Rate,ಕಮಿಷನ್ ದರ
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,ಭಿನ್ನ ಮಾಡಿ
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,ಭಿನ್ನ ಮಾಡಿ
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,ಇಲಾಖೆ ರಜೆ ಅನ್ವಯಗಳನ್ನು ನಿರ್ಬಂಧಿಸಿ .
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","ಪಾವತಿ ಕೌಟುಂಬಿಕತೆ, ಸ್ವೀಕರಿಸಿ ಒಂದು ಇರಬೇಕು ಪೇ ಮತ್ತು ಆಂತರಿಕ ಟ್ರಾನ್ಸ್ಫರ್"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,ಅನಾಲಿಟಿಕ್ಸ್
@@ -5179,11 +5272,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,ಬಂಡವಾಳ
 DocType: Shopping Cart Settings,Show Public Attachments,ಸಾರ್ವಜನಿಕ ಲಗತ್ತುಗಳು ತೋರಿಸಿ
 DocType: Packing Slip,Package Weight Details,ಪ್ಯಾಕೇಜ್ ತೂಕ ವಿವರಗಳು
+DocType: Restaurant Reservation,Reservation Time,ಮೀಸಲಾತಿ ಸಮಯ
 DocType: Payment Gateway Account,Payment Gateway Account,ಪಾವತಿ ಗೇಟ್ವೇ ಖಾತೆ
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,ಪಾವತಿ ನಂತರ ಆಯ್ಕೆ ಪುಟ ಬಳಕೆದಾರ ಮರುನಿರ್ದೇಶನ.
 DocType: Company,Existing Company,ಕಂಪನಿಯ
 DocType: Healthcare Settings,Result Emailed,ಫಲಿತಾಂಶ ಇಮೇಲ್ ಮಾಡಲಾಗಿದೆ
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",ತೆರಿಗೆ ಬದಲಿಸಿ ಬದಲಾಯಿಸಲಾಗಿದೆ &quot;ಒಟ್ಟು&quot; ಎಲ್ಲಾ ವಸ್ತುಗಳು ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂಗಳನ್ನು ಏಕೆಂದರೆ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗ್ರೂಪ್&gt; ಬ್ರ್ಯಾಂಡ್
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,ಒಂದು CSV ಕಡತ ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Student Leave Application,Mark as Present,ಪ್ರೆಸೆಂಟ್ ಮಾರ್ಕ್
 DocType: Supplier Scorecard,Indicator Color,ಸೂಚಕ ಬಣ್ಣ
@@ -5208,11 +5303,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ಮಾಡಿ
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ ಇದೆ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,BOM ಐಟಂಗಳು ಪಡೆಯಿರಿ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,BOM ಐಟಂಗಳು ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ಟೈಮ್ ಡೇಸ್ ಲೀಡ್
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ರೋ # {0}: ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಖರೀದಿ ದಿನಾಂಕ ಅದೇ ಇರಬೇಕು {1} ಸ್ವತ್ತಿನ {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,ವಿದ್ಯಾರ್ಥಿ ಇನ್ಸ್ಟಿಟ್ಯೂಟ್ನ ಹಾಸ್ಟೆಲ್ ನಲ್ಲಿ ವಾಸಿಸುವ ಇದೆ ಎಂಬುದನ್ನು ಪರಿಶೀಲಿಸಿ.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,ದಯವಿಟ್ಟು ಮೇಲಿನ ಕೋಷ್ಟಕದಲ್ಲಿ ಮಾರಾಟದ ಆರ್ಡರ್ಸ್ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,ದಯವಿಟ್ಟು ಮೇಲಿನ ಕೋಷ್ಟಕದಲ್ಲಿ ಮಾರಾಟದ ಆರ್ಡರ್ಸ್ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,ಸಲ್ಲಿಸಿಲ್ಲ ಸಂಬಳ ತುಂಡಿನಲ್ಲಿ
 ,Stock Summary,ಸ್ಟಾಕ್ ಸಾರಾಂಶ
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,ಮತ್ತೊಂದು ಗೋದಾಮಿನ ಒಂದು ಆಸ್ತಿ ವರ್ಗಾವಣೆ
@@ -5228,5 +5323,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ಸಾಲು {0}: ಡೆಬಿಟ್ ಪ್ರವೇಶ ಸಂಬಂಧ ಸಾಧ್ಯವಿಲ್ಲ ಒಂದು {1}
 DocType: Journal Entry,Subscription Section,ಚಂದಾದಾರಿಕೆ ವಿಭಾಗ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,ಖಾತೆ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
+DocType: Training Event,Training Program,ತರಬೇತಿ ಕಾರ್ಯಕ್ರಮ
 DocType: Account,Cash,ನಗದು
 DocType: Employee,Short biography for website and other publications.,ವೆಬ್ಸೈಟ್ ಮತ್ತು ಇತರ ಪ್ರಕಟಣೆಗಳು ಕಿರು ಜೀವನಚರಿತ್ರೆ.
diff --git a/erpnext/translations/ko.csv b/erpnext/translations/ko.csv
index d3d0f47..49cf042 100644
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,급여 모드
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,레지스터
 DocType: Patient,Divorced,이혼
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,항목은 이미 동기화
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,항목은 트랜잭션에 여러 번 추가 할 수
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,재 방문 {0}이 보증 청구를 취소하기 전에 취소
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,소비자 제품
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,승인자를 남겨
 DocType: Sales Partner,Dealer,상인
 DocType: Consultation,Investigations,수사
+DocType: Restaurant Order Entry,Click Enter To Add,추가하려면 Enter를 클릭하십시오.
 DocType: Employee,Rented,대여
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,사용자에 대한 적용
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","중지 생산 주문이 취소 될 수 없으며, 취소 먼저 ...의 마개를 따다"
 DocType: Vehicle Service,Mileage,사용량
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,당신은 정말이 자산을 스크랩 하시겠습니까?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,당신은 정말이 자산을 스크랩 하시겠습니까?
 DocType: Drug Prescription,Update Schedule,일정 업데이트
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,선택 기본 공급 업체
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},환율은 가격 목록에 필요한 {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,이용 가능 여부 확인
 DocType: Job Applicant,Job Applicant,구직자
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,이이 공급 업체에 대한 거래를 기반으로합니다. 자세한 내용은 아래 일정을 참조하십시오
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,더 이상 결과가 없습니다.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,법률
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},실제의 형태 세금은 행의 항목 요금에 포함 할 수없는 {0}
 DocType: Bank Guarantee,Customer,고객
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),환율은 동일해야합니다 {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,고객 이름
 DocType: Vehicle,Natural Gas,천연 가스
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},은행 계정으로 명명 할 수없는 {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},은행 계정으로 명명 할 수없는 {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,머리 (또는 그룹)에있는 회계 항목은 만들어와 균형이 유지된다.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),뛰어난 {0}보다 작을 수 없습니다에 대한 ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,처리 할 제출 된 급여 전표가 없습니다.
 DocType: Manufacturing Settings,Default 10 mins,10 분을 기본
 DocType: Leave Type,Leave Type Name,유형 이름을 남겨주세요
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,오픈보기
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,위에서 언급 한 반복을 위해 오늘이 조치를 취할 필요가 있습니다.
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,시리즈가 업데이트
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,점검
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural 분개가 제출
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,수신 될 구매 주문 아이템
 DocType: SMS Center,All Supplier Contact,모든 공급 업체에게 연락 해주기
 DocType: Support Settings,Support Settings,지원 설정
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,예상 종료 날짜는 예상 시작 날짜보다 작을 수 없습니다
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,예상 종료 날짜는 예상 시작 날짜보다 작을 수 없습니다
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,행 번호 {0} : 속도가 동일해야합니다 {1} {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,새로운 허가 신청
 ,Batch Item Expiry Status,일괄 상품 만료 상태
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,은행 어음
 DocType: Mode of Payment Account,Mode of Payment Account,지불 계정의 모드
 DocType: Consultation,Consultation,상의
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,판매 및 반품
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,쇼 변형
 DocType: Academic Term,Academic Term,학술 용어
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,자료
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,건강 관리
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),지급 지연 (일)
 DocType: Lab Prescription,Lab Prescription,실험실 처방전
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,가격순 정렬
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,서비스 비용
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},일련 번호 : {0}은 (는) 판매 송장에서 이미 참조되었습니다. {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,송장
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},일련 번호 : {0}은 (는) 판매 송장에서 이미 참조되었습니다. {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,송장
 DocType: Maintenance Schedule Item,Periodicity,주기성
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,회계 연도는 {0} 필요
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,방어
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,행 번호 {0} :
 DocType: Timesheet,Total Costing Amount,총 원가 계산 금액
 DocType: Delivery Note,Vehicle No,차량 없음
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,가격리스트를 선택하세요
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,가격리스트를 선택하세요
 DocType: Accounts Settings,Currency Exchange Settings,통화 교환 설정
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,행 # {0} : 결제 문서는 trasaction을 완료하는 데 필요한
 DocType: Production Order Operation,Work In Progress,진행중인 작업
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,날짜를 선택하세요
 DocType: Employee,Holiday List,휴일 목록
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,학교에서 강사 이름 시스템 설정&gt; 학교 설정
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,회계사
+DocType: Hub Settings,Selling Price List,판매 가격리스트
 DocType: Patient,Tobacco Current Use,담배 현재 사용
 DocType: Cost Center,Stock User,재고 사용자
 DocType: Company,Phone No,전화 번호
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,코스 스케줄 작성 :
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},신규 {0} : # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},신규 {0} : # {1}
 ,Sales Partners Commission,영업 파트너위원회
 DocType: Purchase Invoice,Rounding Adjustment,반올림 조정
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,약어는 5 개 이상의 문자를 가질 수 없습니다
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,부모 상세 docName 같은
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","참조 : {0}, 상품 코드 : {1} 및 고객 : {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,KG
-DocType: Student Log,Log,기록
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,작업에 대한 열기.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} 결과 제출 됨
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} 결과 제출 됨
 DocType: Item Attribute,Increment,증가
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,시간 범위
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,창고를 선택합니다 ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,결혼 한
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},허용되지 {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,에서 항목을 가져 오기
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},스톡 배달 주에 업데이트 할 수 없습니다 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},스톡 배달 주에 업데이트 할 수 없습니다 {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},제품 {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,나열된 항목이 없습니다.
 DocType: Payment Reconciliation,Reconcile,조정
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,연금 펀드
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,다음 감가 상각 날짜는 구매 날짜 이전 될 수 없습니다
 DocType: Consultation,Consultation Date,상담 일
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNext 사용자를위한 제품 목록 및 검색
 DocType: SMS Center,All Sales Person,모든 판매 사람
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** 월간 배포 ** 당신이 당신의 사업에 계절성이있는 경우는 개월에 걸쳐 예산 / 대상을 배포하는 데 도움이됩니다.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,항목을 찾을 수 없습니다
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,급여 구조 누락
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,항목을 찾을 수 없습니다
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,급여 구조 누락
 DocType: Lead,Person Name,사람 이름
 DocType: Sales Invoice Item,Sales Invoice Item,판매 송장 상품
 DocType: Account,Credit,신용
 DocType: POS Profile,Write Off Cost Center,비용 센터를 오프 쓰기
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""","예를 들어, &quot;초등 학교&quot;또는 &quot;대학&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""","예를 들어, &quot;초등 학교&quot;또는 &quot;대학&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,재고 보고서
 DocType: Warehouse,Warehouse Detail,창고 세부 정보
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},신용 한도는 고객에 대한 교차 된 {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,계약 기간 종료 날짜 나중에 용어가 연결되는 학술 올해의 연말 날짜 초과 할 수 없습니다 (학년 {}). 날짜를 수정하고 다시 시도하십시오.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","자산 레코드 항목에 대해 존재하는, 선택 해제 할 수 없습니다 &quot;고정 자산&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","자산 레코드 항목에 대해 존재하는, 선택 해제 할 수 없습니다 &quot;고정 자산&quot;"
 DocType: Vehicle Service,Brake Oil,브레이크 오일
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,고객&gt; 고객 그룹&gt; 지역
 DocType: Tax Rule,Tax Type,세금의 종류
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,과세 대상 금액
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},당신은 전에 항목을 추가하거나 업데이트 할 수있는 권한이 없습니다 {0}
 DocType: BOM,Item Image (if not slideshow),상품의 이미지 (그렇지 않으면 슬라이드 쇼)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,고객은 같은 이름을 가진
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(시간  / 60) * 실제 작업 시간
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,행 번호 {0} : 참조 문서 유형은 경비 청구 또는 분개 중 하나 여야합니다.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,선택 BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,행 번호 {0} : 참조 문서 유형은 경비 청구 또는 분개 중 하나 여야합니다.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,선택 BOM
 DocType: SMS Log,SMS Log,SMS 로그
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,배달 항목의 비용
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0}의 휴가 날짜부터 현재까지 사이 아니다
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,직원 대출
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,활동 로그 :
 DocType: Fee Schedule,Send Payment Request Email,지불 요청 이메일 보내기
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,{0} 항목을 시스템에 존재하지 않거나 만료
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,{0} 항목을 시스템에 존재하지 않거나 만료
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,부동산
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,거래명세표
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,제약
@@ -210,18 +213,23 @@
 DocType: Employee,B-,비-
 DocType: Upload Attendance,Import Log,가져 오기 로그
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,위의 기준에 따라 유형 제조의 자료 요청을 당겨
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,등록이 취소되었습니다.
 DocType: Training Result Employee,Grade,학년
+DocType: Restaurant Table,No of Seats,좌석 수
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>",동적 제목을 추가하려면 다음과 같은 jinja 태그를 사용하십시오. <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>
 DocType: Sales Invoice Item,Delivered By Supplier,공급 업체에 의해 전달
 DocType: SMS Center,All Contact,모든 연락처
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,생산 주문이 이미 BOM 모든 항목에 대해 작성
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,생산 주문이 이미 BOM 모든 항목에 대해 작성
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,연봉
 DocType: Daily Work Summary,Daily Work Summary,매일 작업 요약
 DocType: Period Closing Voucher,Closing Fiscal Year,회계 연도 결산
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} 냉동입니다
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,계정의 차트를 만드는 기존 회사를 선택하세요
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} 냉동입니다
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,계정의 차트를 만드는 기존 회사를 선택하세요
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,재고 비용
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,대상 창고 선택
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,대상 창고 선택
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,대상 창고 선택
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,대상 창고 선택
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,기본 연락 이메일을 입력하세요
 DocType: Program Enrollment,School Bus,학교 버스
 DocType: Journal Entry,Contra Entry,콘트라 항목
@@ -239,9 +247,10 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", 템플릿을 다운로드 적절한 데이터를 입력하고 수정 된 파일을 첨부합니다.
  선택한 기간의 모든 날짜와 직원 조합은 기존의 출석 기록과 함께, 템플릿에 올 것이다"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,{0} 항목을 활성화하지 않거나 수명이 도달했습니다
+DocType: Student Admission Program,Minimum Age,최소 연령
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,예 : 기본 수학
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","행에있는 세금을 포함하려면 {0} 항목의 요금에, 행의 세금은 {1}도 포함되어야한다"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,HR 모듈에 대한 설정
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,HR 모듈에 대한 설정
 DocType: SMS Center,SMS Center,SMS 센터
 DocType: Sales Invoice,Change Amount,변화량
 DocType: BOM Update Tool,New BOM,신규 BOM
@@ -251,7 +260,7 @@
 DocType: Lead,Request Type,요청 유형
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,직원을
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,방송
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,객실 추가
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),POS (온라인 / 오프라인) 설정 모드
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,실행
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,작업의 세부 사항은 실시.
 DocType: Serial No,Maintenance Status,유지 보수 상태
@@ -274,6 +283,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,가격리스트는 구매 또는 판매에 적용해야합니다
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},설치 날짜는 항목에 대한 배달 날짜 이전 할 수 없습니다 {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),가격 목록 요금에 할인 (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,생화학
 DocType: Offer Letter,Select Terms and Conditions,이용 약관 선택
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,제한 값
 DocType: Production Planning Tool,Sales Orders,판매 주문
@@ -308,15 +318,15 @@
 DocType: Sales Partner,Reseller,리셀러
 DocType: Codification Table,Medical Code,의료 코드
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","이 옵션이 선택되면, 자재 요청에 재고 항목이 포함됩니다."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,회사를 입력하십시오
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,회사를 입력하십시오
 DocType: Delivery Note Item,Against Sales Invoice Item,견적서 항목에 대하여
 ,Production Orders in Progress,진행 중 생산 주문
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Financing의 순 현금
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","로컬 저장이 가득, 저장하지 않은"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","로컬 저장이 가득, 저장하지 않은"
 DocType: Lead,Address & Contact,주소 및 연락처
 DocType: Leave Allocation,Add unused leaves from previous allocations,이전 할당에서 사용하지 않는 잎 추가
 DocType: Sales Partner,Partner website,파트너 웹 사이트
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,항목 추가
+DocType: Restaurant Order Entry,Add Item,항목 추가
 DocType: Lab Test,Custom Result,맞춤 검색 결과
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,담당자 이름
 DocType: Course Assessment Criteria,Course Assessment Criteria,코스 평가 기준
@@ -329,7 +339,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,구입 요청합니다.
 DocType: Lab Test,Submitted Date,제출 날짜
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,이는이 프로젝트에 대해 만든 시간 시트를 기반으로
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,인터넷 결제는 0보다 작은 수 없습니다
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,인터넷 결제는 0보다 작은 수 없습니다
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",시스템에서 반복적 인 오류 알림을 보내지 않으려면 구독에서 Disabled 필드를 선택했습니다.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,만 선택 안함 승인자이 허가 신청을 제출할 수 있습니다
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,날짜를 완화하는 것은 가입 날짜보다 커야합니다
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,연간 잎
@@ -338,9 +349,10 @@
 DocType: Email Digest,Profit & Loss,이익 및 손실
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,리터
 DocType: Task,Total Costing Amount (via Time Sheet),(시간 시트를 통해) 총 원가 계산 금액
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,학생 그룹에 학생을 설치하십시오.
 DocType: Item Website Specification,Item Website Specification,항목 웹 사이트 사양
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,남겨 차단
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},항목 {0}에 수명이 다한 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},항목 {0}에 수명이 다한 {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,은행 입장
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,연간
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,재고 조정 항목
@@ -349,7 +361,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,학생 그룹 생성 도구 코스
 DocType: Lead,Do Not Contact,연락하지 말라
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,조직에서 가르치는 사람들
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,모든 반복 송장을 추적하는 고유 ID.그것은 제출에 생성됩니다.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,소프트웨어 개발자
 DocType: Item,Minimum Order Qty,최소 주문 수량
 DocType: Pricing Rule,Supplier Type,공급 업체 유형
@@ -359,17 +370,19 @@
 DocType: Item,Publish in Hub,허브에 게시
 DocType: Student Admission,Student Admission,학생 입학
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,{0} 항목 취소
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,자료 요청
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,{0} 항목 취소
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,자료 요청
 DocType: Bank Reconciliation,Update Clearance Date,업데이트 통관 날짜
 DocType: Item,Purchase Details,구매 상세 정보
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},구매 주문에 &#39;원료 공급&#39;테이블에없는 항목 {0} {1}
 DocType: Patient Relation,Relation,관계
 DocType: Shipping Rule,Worldwide Shipping,해외 배송
 DocType: Patient Relation,Mother,어머니
+DocType: Restaurant Reservation,Reservation End Time,예약 종료 시간
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,고객의 확정 주문.
 DocType: Purchase Receipt Item,Rejected Quantity,거부 수량
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,지불 요청 {0}이 생성되었습니다.
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,지불 요청 {0}이 생성되었습니다.
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,낮은 감도
 DocType: Notification Control,Notification Control,알림 제어
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,교육을 마친 후에 확인하십시오.
 DocType: Lead,Suggestions,제안
@@ -389,7 +402,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,직원에서 선택한 선호하는 이메일을 기반으로 직원에게 이메일 급여 명세서
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,목록의 첫 번째 허가 승인자는 기본 남겨 승인자로 설정됩니다
 DocType: Tax Rule,Shipping County,배송 카운티
-apps/erpnext/erpnext/config/desktop.py +158,Learn,배우다
+apps/erpnext/erpnext/config/desktop.py +159,Learn,배우다
 DocType: Asset,Next Depreciation Date,다음 감가 상각 날짜
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,직원 당 활동 비용
 DocType: Accounts Settings,Settings for Accounts,계정에 대한 설정
@@ -400,13 +413,13 @@
 DocType: Item,Synced With Hub,허브와 동기화
 DocType: Vehicle,Fleet Manager,함대 관리자
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},행 번호 {0} : {1} 항목에 대한 음수가 될 수 없습니다 {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,잘못된 비밀번호
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,잘못된 비밀번호
 DocType: Item,Variant Of,의 변형
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',보다 '수량 제조하는'완료 수량은 클 수 없습니다
 DocType: Period Closing Voucher,Closing Account Head,마감 계정 헤드
 DocType: Employee,External Work History,외부 작업의 역사
 DocType: Physician,Time per Appointment,예약 시간
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,순환 참조 오류
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,순환 참조 오류
 DocType: Appointment Type,Is Inpatient,입원 환자인가
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 이름
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,당신은 배달 주를 저장 한 단어에서 (수출) 표시됩니다.
@@ -415,19 +428,18 @@
 DocType: Lead,Industry,산업
 DocType: Employee,Job Profile,작업 프로필
 DocType: BOM Item,Rate & Amount,요금 및 금액
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,셋업&gt; 번호 매기기 시리즈를 통해 출석을위한 번호 매기기 시리즈를 설정하십시오.
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,이것은이 회사와의 거래를 기반으로합니다. 자세한 내용은 아래 일정을 참조하십시오.
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,자동 자료 요청의 생성에 이메일로 통보
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,저항하는
 DocType: Journal Entry,Multi Currency,멀티 통화
 DocType: Payment Reconciliation Invoice,Invoice Type,송장 유형
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,고객&gt; 고객 그룹&gt; 지역
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,상품 수령증
 DocType: Consultation,Encounter Impression,만남의 인상
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,세금 설정
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,판매 자산의 비용
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,당신이 그것을 끌어 후 결제 항목이 수정되었습니다.다시 당깁니다.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} 항목의 세금에 두 번 입력
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,이번 주 보류중인 활동에 대한 요약
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} 항목의 세금에 두 번 입력
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,이번 주 보류중인 활동에 대한 요약
 DocType: Student Applicant,Admitted,인정
 DocType: Workstation,Rent Cost,임대 비용
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,금액 감가 상각 후
@@ -442,36 +454,35 @@
 DocType: Shipping Rule,Valid for Countries,나라 유효한
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,이 항목은 템플릿과 거래에 사용할 수 없습니다.'카피'가 설정되어 있지 않는 항목 속성은 변형에 복사합니다
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,고려 총 주문
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","직원 지정 (예 : CEO, 이사 등)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","직원 지정 (예 : CEO, 이사 등)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,고객 통화는 고객의 기본 통화로 변환하는 속도에
 DocType: Course Scheduling Tool,Course Scheduling Tool,코스 일정 도구
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},행 # {0} : 구매 송장 기존 자산에 대해 할 수 없습니다 {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[긴급] 반복되는 % s을 % s에 생성하는 동안 오류가 발생했습니다.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[긴급] 반복되는 % s을 % s에 생성하는 동안 오류가 발생했습니다.
 DocType: Item Tax,Tax Rate,세율
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} 이미 직원에 할당 {1}에 기간 {2}에 대한 {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,항목 선택
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,항목 선택
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,구매 송장 {0}이 (가) 이미 제출
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},행 번호 {0} : 일괄 없음은 동일해야합니다 {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,비 그룹으로 변환
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,항목의 일괄처리 (lot).
 DocType: C-Form Invoice Detail,Invoice Date,송장의 날짜
 DocType: GL Entry,Debit Amount,직불 금액
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},만에 회사 당 1 계정이있을 수 있습니다 {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,첨부 파일을 참조하시기 바랍니다
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},만에 회사 당 1 계정이있을 수 있습니다 {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,첨부 파일을 참조하시기 바랍니다
 DocType: Purchase Order,% Received,% 수신
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,학생 그룹 만들기
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,이미 설치 완료!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,이미 설치 완료!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,대변 메모 금액
 DocType: Setup Progress Action,Action Document,액션 문서
 ,Finished Goods,완성품
 DocType: Delivery Note,Instructions,지침
 DocType: Quality Inspection,Inspected By,검사
 DocType: Maintenance Visit,Maintenance Type,유지 보수 유형
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1}이 (가) 과정에 등록되지 않았습니다. {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 상품 그룹&gt; 브랜드
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1}이 (가) 과정에 등록되지 않았습니다. {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},일련 번호 {0} 배달 주에 속하지 않는 {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext 데모
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,항목 추가
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,항목 추가
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,상품 품질 검사 매개 변수
 DocType: Leave Application,Leave Approver Name,승인자 이름을 남겨주세요
 DocType: Depreciation Schedule,Schedule Date,일정 날짜
@@ -493,7 +504,7 @@
 DocType: Salary Slip Timesheet,Working Hours,근무 시간
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,기존 시리즈의 시작 / 현재의 순서 번호를 변경합니다.
 DocType: Dosage Strength,Strength,힘
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,새로운 고객을 만들기
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,새로운 고객을 만들기
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","여러 가격의 규칙이 우선 계속되면, 사용자는 충돌을 해결하기 위해 수동으로 우선 순위를 설정하라는 메시지가 표시됩니다."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,구매 오더를 생성
 ,Purchase Register,회원에게 구매
@@ -512,7 +523,7 @@
 DocType: Lab Test Template,Single,미혼
 DocType: Salary Slip,Total Loan Repayment,총 대출 상환
 DocType: Account,Cost of Goods Sold,매출원가
-DocType: Purchase Invoice,Yearly,매년
+DocType: Subscription,Yearly,매년
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,비용 센터를 입력 해주십시오
 DocType: Drug Prescription,Dosage,복용량
 DocType: Journal Entry Account,Sales Order,판매 주문
@@ -543,7 +554,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,모든 제조 공정에 대한 글로벌 설정.
 DocType: Accounts Settings,Accounts Frozen Upto,까지에게 동결계정
 DocType: SMS Log,Sent On,에 전송
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,속성 {0} 속성 테이블에서 여러 번 선택
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,속성 {0} 속성 테이블에서 여러 번 선택
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,적용 할 수 없음
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,휴일 마스터.
@@ -569,13 +580,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,할당 된 총 잎은 필수입니다
 DocType: Patient,AB Positive,AB 긍정적
 DocType: Job Opening,Description of a Job Opening,구인에 대한 설명
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,오늘 보류 활동
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,오늘 보류 활동
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,출석 기록.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,작업 표 기반의 급여에 대한 급여의 구성 요소.
 DocType: Sales Order Item,Used for Production Plan,생산 계획에 사용
 DocType: Employee Loan,Total Payment,총 결제
 DocType: Manufacturing Settings,Time Between Operations (in mins),(분에) 작업 사이의 시간
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1}이 (가) 취소되어 작업을 완료 할 수 없습니다.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1}이 (가) 취소되어 작업을 완료 할 수 없습니다.
 DocType: Customer,Buyer of Goods and Services.,제품 및 서비스의 구매자.
 DocType: Journal Entry,Accounts Payable,미지급금
 DocType: Patient,Allergies,알레르기
@@ -587,23 +598,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,구매 주문 경고
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,고객의 몇 가지를 나열합니다.그들은 조직 또는 개인이 될 수 있습니다.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,충분한 부품 작성하기
+DocType: POS Profile User,POS Profile User,POS 프로필 사용자
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,직접 수입
 DocType: Patient Appointment,Date TIme,날짜 시간
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","계정별로 분류하면, 계정을 기준으로 필터링 할 수 없습니다"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,관리 책임자
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,코스를 선택하십시오
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,코스를 선택하십시오
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,코스를 선택하십시오
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,코스를 선택하십시오
 DocType: Codification Table,Codification Table,목록 화표
 DocType: Timesheet Detail,Hrs,시간
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,회사를 선택하세요
 DocType: Stock Entry Detail,Difference Account,차이 계정
 DocType: Purchase Invoice,Supplier GSTIN,공급 업체 GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,종속 작업 {0}이 닫혀 있지 가까운 작업을 할 수 없습니다.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,자료 요청이 발생합니다있는 창고를 입력 해주십시오
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,종속 작업 {0}이 닫혀 있지 가까운 작업을 할 수 없습니다.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,자료 요청이 발생합니다있는 창고를 입력 해주십시오
 DocType: Production Order,Additional Operating Cost,추가 운영 비용
 DocType: Lab Test Template,Lab Routine,실험실 루틴
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,화장품
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items",병합하려면 다음과 같은 속성이 두 항목에 대해 동일해야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items",병합하려면 다음과 같은 속성이 두 항목에 대해 동일해야합니다
 DocType: Shipping Rule,Net Weight,순중량
 DocType: Employee,Emergency Phone,긴급 전화
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,사다
@@ -614,7 +626,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,임계 값 0 %의 등급을 정의하십시오.
 DocType: Sales Order,To Deliver,전달하기
 DocType: Purchase Invoice Item,Item,항목
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,일련 번호 항목 일부가 될 수 없습니다
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,고감도
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,일련 번호 항목 일부가 될 수 없습니다
 DocType: Journal Entry,Difference (Dr - Cr),차이 (박사 - 크롬)
 DocType: Account,Profit and Loss,이익과 손실
 DocType: Patient,Risk Factors,위험 요소
@@ -623,7 +636,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,관리 하도급
 DocType: Vital Signs,Body Temperature,체온
 DocType: Project,Project will be accessible on the website to these users,프로젝트는 이러한 사용자에게 웹 사이트에 액세스 할 수 있습니다
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,프로젝트 유형을 정의하십시오.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,프로젝트 유형을 정의하십시오.
 DocType: Supplier Scorecard,Weighting Function,가중치 함수
 DocType: Physician,OP Consulting Charge,영업 컨설팅 담당
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,설정
@@ -637,7 +650,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,증가는 0이 될 수 없습니다
 DocType: Production Planning Tool,Material Requirement,자료 요구
 DocType: Company,Delete Company Transactions,회사 거래 삭제
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,참조 번호 및 참조 날짜는 은행 거래를위한 필수입니다
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,참조 번호 및 참조 날짜는 은행 거래를위한 필수입니다
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,세금과 요금 추가/편집
 DocType: Payment Entry Reference,Supplier Invoice No,공급 업체 송장 번호
 DocType: Territory,For reference,참고로
@@ -645,12 +658,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","삭제할 수 없습니다 시리얼 번호 {0}, 그것은 증권 거래에 사용되는로"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),결산 (CR)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,안녕하세요
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,이동 항목
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,이동 항목
 DocType: Serial No,Warranty Period (Days),보증 기간 (일)
 DocType: Installation Note Item,Installation Note Item,설치 노트 항목
 DocType: Production Plan Item,Pending Qty,보류 수량
 DocType: Budget,Ignore,무시
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} 활성화되지 않습니다
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} 활성화되지 않습니다
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,인쇄 설정 확인 치수
 DocType: Salary Slip,Salary Slip Timesheet,급여 슬립 표
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,하청 구입 영수증 필수 공급 업체 창고
@@ -659,7 +672,7 @@
 DocType: Pricing Rule,Sales Partner,영업 파트너
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,모든 공급자 스코어 카드.
 DocType: Buying Settings,Purchase Receipt Required,필수 구입 영수증
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,열기 재고 입력 한 경우 평가 비율은 필수입니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,열기 재고 입력 한 경우 평가 비율은 필수입니다
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,송장 테이블에있는 레코드 없음
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,첫번째 회사와 파티 유형을 선택하세요
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,금융 / 회계 연도.
@@ -696,7 +709,7 @@
 DocType: Quotation,Quotation To,에 견적
 DocType: Lead,Middle Income,중간 소득
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),오프닝 (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,이미 다른 UOM 일부 거래 (들)을 만들었 때문에 항목에 대한 측정의 기본 단위는 {0} 직접 변경할 수 없습니다. 당신은 다른 기본 UOM을 사용하여 새 항목을 작성해야합니다.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,이미 다른 UOM 일부 거래 (들)을 만들었 때문에 항목에 대한 측정의 기본 단위는 {0} 직접 변경할 수 없습니다. 당신은 다른 기본 UOM을 사용하여 새 항목을 작성해야합니다.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,할당 된 금액은 음수 일 수 없습니다
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,회사를 설정하십시오.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,회사를 설정하십시오.
@@ -711,6 +724,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,선택 결제 계좌는 은행 항목을 만들려면
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","잎, 비용 청구 및 급여를 관리하는 직원 레코드를 작성"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,처방 기간
+DocType: Restaurant Reservation,Restaurant Reservation,식당 예약
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,제안서 작성
 DocType: Payment Entry Deduction,Payment Entry Deduction,결제 항목 공제
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,또 다른 판매 사람 {0} 같은 직원 ID 존재
@@ -718,7 +732,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,석사
 DocType: Assessment Plan,Maximum Assessment Score,최대 평가 점수
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,업데이트 은행 거래 날짜
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,시간 추적
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,시간 추적
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,전송자 용 복제
 DocType: Fiscal Year Company,Fiscal Year Company,회계 연도 회사
 DocType: Packing Slip Item,DN Detail,DN 세부 정보
@@ -727,8 +741,9 @@
 DocType: Batch,Batch Description,일괄처리 설명
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,학생 그룹 만들기
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,학생 그룹 만들기
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.",지불 게이트웨이 계정이 생성되지 수동으로 하나를 만드십시오.
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.",지불 게이트웨이 계정이 생성되지 수동으로 하나를 만드십시오.
 DocType: Supplier Scorecard,Per Year,연간
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,DOB에 따라이 프로그램의 입학 자격이 없습니다.
 DocType: Sales Invoice,Sales Taxes and Charges,판매 세금 및 요금
 DocType: Employee,Organization Profile,기업 프로필
 DocType: Vital Signs,Height (In Meter),높이 (미터로 표시)
@@ -764,7 +779,7 @@
 DocType: Student Batch Name,Batch Name,배치 이름
 DocType: Fee Validity,Max number of visit,최대 방문 횟수
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,작업 표 작성 :
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},지불 모드로 기본 현금 또는 은행 계정을 설정하십시오 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},지불 모드로 기본 현금 또는 은행 계정을 설정하십시오 {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,싸다
 DocType: GST Settings,GST Settings,GST 설정
 DocType: Selling Settings,Customer Naming By,고객 이름 지정으로
@@ -796,16 +811,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,착륙 비용 세금 및 요금
 DocType: Production Order Operation,Actual Start Time,실제 시작 시간
 DocType: BOM Operation,Operation Time,운영 시간
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,끝
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,끝
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,베이스
 DocType: Timesheet,Total Billed Hours,총 청구 시간
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,금액을 상각
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,금액을 상각
 DocType: Leave Block List Allow,Allow User,사용자에게 허용
 DocType: Journal Entry,Bill No,청구 번호
 DocType: Company,Gain/Loss Account on Asset Disposal,자산 처분 이익 / 손실 계정
 DocType: Vehicle Log,Service Details,서비스 세부 정보
 DocType: Vehicle Log,Service Details,서비스 세부 정보
-DocType: Purchase Invoice,Quarterly,분기 별
+DocType: Subscription,Quarterly,분기 별
 DocType: Lab Test Template,Grouped,그룹화 된
 DocType: Selling Settings,Delivery Note Required,배송 참고 필요한
 DocType: Bank Guarantee,Bank Guarantee Number,은행 보증 번호
@@ -814,12 +829,12 @@
 DocType: Student Attendance,Student Attendance,학생의 출석
 DocType: Sales Invoice Timesheet,Time Sheet,시간 시트
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,백 플러시 원료 기반에
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,항목의 세부 사항을 입력하십시오
 DocType: Interest,Interest,관심
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,사전 판매
 DocType: Purchase Receipt,Other Details,기타 세부 사항
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,테스트 템플릿
+DocType: Restaurant Order Entry Item,Served,제공된
 DocType: Account,Accounts,회계
 DocType: Vehicle,Odometer Value (Last),주행 거리계 값 (마지막)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,공급 업체 스코어 카드 기준의 템플릿.
@@ -831,26 +846,28 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,미리보기 연봉 슬립
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,계정 {0} 여러 번 입력 된
 DocType: Account,Expenses Included In Valuation,비용은 평가에 포함
-DocType: Hub Settings,Seller City,판매자 도시
 ,Absent Student Report,결석 한 학생 보고서
 DocType: Email Digest,Next email will be sent on:,다음 이메일에 전송됩니다 :
 DocType: Offer Letter Term,Offer Letter Term,편지 기간을 제공
 DocType: Supplier Scorecard,Per Week,한 주에
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,항목 변종이있다.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,항목 변종이있다.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,총 학생수
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,{0} 항목을 찾을 수 없습니다
 DocType: Bin,Stock Value,재고 가치
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,요금 기록은 백그라운드에서 작성됩니다. 오류가 발생하면 오류 메시지가 Schedule에 업데이트됩니다.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,회사 {0} 존재하지 않습니다
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0}은 (는) {1}까지 수수료 유효 기간이 있습니다.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0}은 (는) {1}까지 수수료 유효 기간이 있습니다.
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,나무의 종류
 DocType: BOM Explosion Item,Qty Consumed Per Unit,수량 단위 시간당 소비
 DocType: Serial No,Warranty Expiry Date,보증 유효 기간
 DocType: Material Request Item,Quantity and Warehouse,수량 및 창고
+DocType: Hub Settings,Unregister,등록 취소
 DocType: Sales Invoice,Commission Rate (%),위원회 비율 (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,프로그램을 선택하십시오.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,프로그램을 선택하십시오.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,프로그램을 선택하십시오.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,프로그램을 선택하십시오.
 DocType: Project,Estimated Cost,예상 비용
 DocType: Purchase Order,Link to material requests,자료 요청에 대한 링크
+DocType: Hub Settings,Publish,게시
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,항공 우주
 DocType: Journal Entry,Credit Card Entry,신용 카드 입력
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,회사 및 계정
@@ -861,13 +878,12 @@
 DocType: Selling Settings,Close Opportunity After Days,일 후 닫기 기회
 ,Reserved,예약
 DocType: Purchase Order,Supply Raw Materials,공급 원료
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,다음 송장이 생성됩니다되는 날짜입니다. 그것은 제출에 생성됩니다.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,유동 자산
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} 재고 상품이 아닌
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',&#39;교육 피드백&#39;을 클릭 한 다음 &#39;새로 만들기&#39;를 클릭하여 의견을 공유하십시오.
 DocType: Mode of Payment Account,Default Account,기본 계정
 DocType: Payment Entry,Received Amount (Company Currency),받은 금액 (회사 통화)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,기회고객을 리드고객으로 만든 경우 리드고객를 설정해야합니다
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,기회고객을 리드고객으로 만든 경우 리드고객를 설정해야합니다
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,매주 오프 날짜를 선택하세요
 DocType: Patient,O Negative,오 네거티브
 DocType: Production Order Operation,Planned End Time,계획 종료 시간
@@ -883,10 +899,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,에너지
 DocType: Opportunity,Opportunity From,기회에서
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,월급의 문.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,회사 추가
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,행 {0} : {1} 품목 {2}에 필요한 일련 번호. 귀하는 {3}을 (를) 제공했습니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,행 {0} : {1} 품목 {2}에 필요한 일련 번호. 귀하는 {3}을 (를) 제공했습니다.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,표를 선택하십시오.
 DocType: BOM,Website Specifications,웹 사이트 사양
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0}은 (는) &#39;수신자&#39;의 이메일 주소가 잘못되었습니다.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0}은 (는) &#39;수신자&#39;의 이메일 주소가 잘못되었습니다.
 DocType: Special Test Items,Particulars,상세
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,항생 물질.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}에서 {0} 유형의 {1}
@@ -894,11 +910,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,행 {0} : 변환 계수는 필수입니다
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",여러 가격 규칙은 동일한 기준으로 존재 우선 순위를 할당하여 충돌을 해결하십시오. 가격 규칙 : {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,비활성화하거나 다른 BOM을 함께 연결되어로 BOM을 취소 할 수 없습니다
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,비활성화하거나 다른 BOM을 함께 연결되어로 BOM을 취소 할 수 없습니다
 DocType: Opportunity,Maintenance,유지
 DocType: Item Attribute Value,Item Attribute Value,항목 속성 값
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,판매 캠페인.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,표 만들기
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,표 만들기
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -955,12 +971,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,첫 번째 항목을 입력하십시오
 DocType: Account,Liability,부채
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,제재 금액 행에 청구 금액보다 클 수 없습니다 {0}.
+DocType: Salary Detail,Do not include in total,총계에 포함시키지 말라.
 DocType: Company,Default Cost of Goods Sold Account,제품 판매 계정의 기본 비용
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,가격 목록을 선택하지
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,가격 목록을 선택하지
 DocType: Employee,Family Background,가족 배경
 DocType: Request for Quotation Supplier,Send Email,이메일 보내기
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},경고 : 잘못된 첨부 파일 {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,아무 권한이 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},경고 : 잘못된 첨부 파일 {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,아무 권한이 없습니다
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,견적 요청 됨
 DocType: Vital Signs,Heart Rate / Pulse,심박수 / 맥박수
 DocType: Company,Default Bank Account,기본 은행 계좌
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",파티를 기반으로 필터링하려면 선택 파티 첫 번째 유형
@@ -988,12 +1006,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,항목 행 {IDX} {문서 타입} {DOCNAME} 위에 존재하지 않는 &#39;{문서 타입}&#39;테이블
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,표 {0} 이미 완료 또는 취소
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,어떤 작업을하지
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","자동 청구서는 05, 28 등의 예를 들어 생성되는 달의 날"
 DocType: Item Variant Settings,Copy Fields to Variant,필드를 변형에 복사
 DocType: Asset,Opening Accumulated Depreciation,감가 상각 누계액 열기
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,점수보다 작거나 5 같아야
 DocType: Program Enrollment Tool,Program Enrollment Tool,프로그램 등록 도구
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C 형태의 기록
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C 형태의 기록
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,고객 및 공급 업체
 DocType: Email Digest,Email Digest Settings,알림 이메일 설정
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,귀하의 비즈니스 주셔서 감사합니다!
@@ -1011,13 +1028,13 @@
 DocType: Request for Quotation Supplier,Quote Status,견적 상태
 DocType: Maintenance Visit,Completion Status,완료 상태
 DocType: HR Settings,Enter retirement age in years,년에 은퇴 연령을 입력
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,목표웨어 하우스
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,창고를 선택하십시오.
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,목표웨어 하우스
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,창고를 선택하십시오.
 DocType: Cheque Print Template,Starting location from left edge,왼쪽 가장자리에서 위치 시작
 DocType: Item,Allow over delivery or receipt upto this percent,이 퍼센트 개까지 배달 또는 영수증을 통해 허용
 DocType: Stock Entry,STE-,스테
 DocType: Upload Attendance,Import Attendance,수입 출석
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,모든 상품 그룹
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,모든 상품 그룹
 DocType: Process Payroll,Activity Log,활동 로그
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,당기 순이익 / 손실
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,자동 거래의 제출에 메시지를 작성합니다.
@@ -1029,7 +1046,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,수량을 예상
 DocType: Sales Invoice,Payment Due Date,지불 기한
 DocType: Drug Prescription,Interval UOM,간격 UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,항목 변형 {0} 이미 동일한 속성을 가진 존재
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,항목 변형 {0} 이미 동일한 속성을 가진 존재
+DocType: Item,Hub Publishing Details,허브 출판 세부 정보
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;열기&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,수행하려면 열기
 DocType: Notification Control,Delivery Note Message,납품서 메시지
@@ -1049,10 +1067,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0} : 원자재는 주 품목과 같을 수 없습니다.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,구매 영수증 항목 테이블에 전체 적용 요금은 총 세금 및 요금과 동일해야합니다
 DocType: Sales Team,Incentives,장려책
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,허브 등록
 DocType: SMS Log,Requested Numbers,신청 번호
 DocType: Production Planning Tool,Only Obtain Raw Materials,만 원료를 얻
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,성능 평가.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","사용 쇼핑 카트가 활성화 될 때, &#39;쇼핑 카트에 사용&#39;및 장바구니 적어도 하나의 세금 규칙이 있어야한다"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","사용 쇼핑 카트가 활성화 될 때, &#39;쇼핑 카트에 사용&#39;및 장바구니 적어도 하나의 세금 규칙이 있어야한다"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","결제 항목 {0} 주문이이 송장에 미리으로 당겨 할 필요가있는 경우 {1}, 확인에 연결되어 있습니다."
 DocType: Sales Invoice Item,Stock Details,재고 상세
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,프로젝트 값
@@ -1071,12 +1090,14 @@
 DocType: Salary Slip,Working Days,작업 일
 DocType: Serial No,Incoming Rate,수신 속도
 DocType: Packing Slip,Gross Weight,총중량
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,이 시스템을 설정하는하는 기업의 이름입니다.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,허브 사용
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,이 시스템을 설정하는하는 기업의 이름입니다.
 DocType: HR Settings,Include holidays in Total no. of Working Days,없이 총 휴일을 포함. 작업 일의
 DocType: Job Applicant,Hold,길게 누르기
 DocType: Employee,Date of Joining,가입 날짜
 DocType: Naming Series,Update Series,업데이트 시리즈
 DocType: Supplier Quotation,Is Subcontracted,하청
+DocType: Restaurant Table,Minimum Seating,최소 좌석 수
 DocType: Item Attribute,Item Attribute Values,항목 속성 값
 DocType: Examination Result,Examination Result,시험 결과
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,구입 영수증
@@ -1087,13 +1108,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},작업에 대한 다음 {0} 일 시간 슬롯을 찾을 수 없습니다 {1}
 DocType: Production Order,Plan material for sub-assemblies,서브 어셈블리 계획 물질
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,판매 파트너 및 지역
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0}이 활성화되어 있어야합니다
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0}이 활성화되어 있어야합니다
 DocType: Journal Entry,Depreciation Entry,감가 상각 항목
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,첫 번째 문서 유형을 선택하세요
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,"이 유지 보수 방문을 취소하기 전, 재질 방문 {0} 취소"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},일련 번호 {0} 항목에 속하지 않는 {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,필요한 수량
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,기존 거래와 창고가 원장으로 변환 할 수 없습니다.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,기존 거래와 창고가 원장으로 변환 할 수 없습니다.
 DocType: Bank Reconciliation,Total Amount,총액
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,인터넷 게시
 DocType: Prescription Duration,Number,번호
@@ -1104,7 +1125,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,판매 가격 목록
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.",이 옵션을 선택하면 환자가 생성되고 환자에게 매핑됩니다. 환자 청구서는이 고객에 대해 작성됩니다. 환자를 생성하는 동안 기존 고객을 선택할 수도 있습니다.
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,항목을 동기화 게시
 DocType: Bank Reconciliation,Account Currency,계정 통화
 DocType: Lab Test,Sample ID,샘플 ID
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,회사에 라운드 오프 계정을 언급 해주십시오
@@ -1113,11 +1133,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,직원 {0} 활성화되지 않거나 존재하지 않습니다
 DocType: Fee Structure,Components,구성 요소들
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},상품에 자산 카테고리를 입력하세요 {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,항목 변형 {0} 업데이트
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,항목 변형 {0} 업데이트
 DocType: Quality Inspection Reading,Reading 6,6 읽기
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,하지 {0} {1} {2}없이 음의 뛰어난 송장 수
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this",생성 될 수 있습니다. 지체 된 경우이 작업의 &quot;반복 월의 반복&quot;필드를 수동으로 변경해야합니다.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,하지 {0} {1} {2}없이 음의 뛰어난 송장 수
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,송장 전진에게 구입
-DocType: Hub Settings,Sync Now,지금 동기화
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},행은 {0} : 신용 항목에 링크 할 수 없습니다 {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,회계 연도 예산을 정의합니다.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,이 모드를 선택하면 기본 은행 / 현금 계정은 자동으로 POS 송장에 업데이트됩니다.
@@ -1129,13 +1150,13 @@
 DocType: Item,Is Purchase Item,구매 상품입니다
 DocType: Asset,Purchase Invoice,구매 송장
 DocType: Stock Ledger Entry,Voucher Detail No,바우처 세부 사항 없음
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,새로운 판매 송장
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,새로운 판매 송장
 DocType: Stock Entry,Total Outgoing Value,총 보내는 값
 DocType: Physician,Appointments,설비
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,날짜 및 마감일을 열면 동일 회계 연도 내에 있어야합니다
 DocType: Lead,Request for Information,정보 요청
 ,LeaderBoard,리더 보드
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,동기화 오프라인 송장
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,동기화 오프라인 송장
 DocType: Payment Request,Paid,지불
 DocType: Program Fee,Program Fee,프로그램 비용
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1154,11 +1175,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,구매 주문 상품
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,간접 소득
 DocType: Student Attendance Tool,Student Attendance Tool,학생 출석 도구
+DocType: Restaurant Menu,Price List (Auto created),가격표 (자동 생성)
 DocType: Cheque Print Template,Date Settings,날짜 설정
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,변화
 ,Company Name,회사 명
 DocType: SMS Center,Total Message(s),전체 메시지 (들)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,전송 항목 선택
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,전송 항목 선택
 DocType: Purchase Invoice,Additional Discount Percentage,추가 할인 비율
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,모든 도움말 동영상 목록보기
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,검사가 입금 된 은행 계좌 머리를 선택합니다.
@@ -1176,6 +1198,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,미터
 DocType: Workstation,Electricity Cost,전기 비용
 DocType: HR Settings,Don't send Employee Birthday Reminders,직원 생일 알림을 보내지 마십시오
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,설정 저장
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,요청한 제품
 DocType: Item,Inspection Criteria,검사 기준
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,옮겨진
 DocType: BOM Website Item,BOM Website Item,BOM 웹 사이트 항목
@@ -1193,11 +1217,11 @@
 DocType: Journal Entry,Total Amount in Words,단어의 합계 금액
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,오류가 발생했습니다.한 가지 가능한 이유는 양식을 저장하지 않은 경우입니다.문제가 계속되면 support@erpnext.com에 문의하시기 바랍니다.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,내 장바구니
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},주문 유형 중 하나 여야합니다 {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},주문 유형 중 하나 여야합니다 {0}
 DocType: Lead,Next Contact Date,다음 접촉 날짜
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,열기 수량
 DocType: Healthcare Settings,Appointment Reminder,약속 알림
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,변경 금액에 대한 계정을 입력하세요
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,변경 금액에 대한 계정을 입력하세요
 DocType: Student Batch Name,Student Batch Name,학생 배치 이름
 DocType: Consultation,Doctor,의사
 DocType: Holiday List,Holiday List Name,휴일 목록 이름
@@ -1205,12 +1229,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,일정 코스
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,재고 옵션
 DocType: Journal Entry Account,Expense Claim,비용 청구
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,당신은 정말이 폐기 자산을 복원 하시겠습니까?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},대한 수량 {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,당신은 정말이 폐기 자산을 복원 하시겠습니까?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},대한 수량 {0}
 DocType: Leave Application,Leave Application,휴가 신청
 DocType: Patient,Patient Relation,환자 관계
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,할당 도구를 남겨
+DocType: Item,Hub Category to Publish,게시 할 허브 카테고리
 DocType: Leave Block List,Leave Block List Dates,차단 목록 날짜를 남겨
+DocType: Sales Invoice,Billing Address GSTIN,대금 청구 주소 GSTIN
 DocType: Workstation,Net Hour Rate,인터넷 시간 비율
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,비용 구매 영수증 랜디
 DocType: Company,Default Terms,기본 약관
@@ -1220,11 +1246,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},지정하여 주시기 바랍니다 {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,양 또는 값의 변화없이 제거 항목.
 DocType: Delivery Note,Delivery To,에 배달
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,속성 테이블은 필수입니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,속성 테이블은 필수입니다
 DocType: Production Planning Tool,Get Sales Orders,판매 주문을 받아보세요
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} 음수가 될 수 없습니다
 DocType: Training Event,Self-Study,자율 학습
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,할인
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,할인
 DocType: Asset,Total Number of Depreciations,감가 상각의 총 수
 DocType: Sales Invoice Item,Rate With Margin,이익률
 DocType: Sales Invoice Item,Rate With Margin,이익률
@@ -1232,7 +1258,7 @@
 DocType: Task,Urgent,긴급한
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},테이블의 행 {0}에 대한 올바른 행 ID를 지정하십시오 {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,변수를 찾을 수 없습니다 :
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,숫자판에서 편집 할 입력란을 선택하십시오.
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,숫자판에서 편집 할 입력란을 선택하십시오.
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,바탕 화면으로 이동 ERPNext를 사용하여 시작
 DocType: Item,Manufacturer,제조사:
 DocType: Landed Cost Item,Purchase Receipt Item,구매 영수증 항목
@@ -1263,8 +1289,8 @@
 DocType: GL Entry,Against,에 대하여
 DocType: Item,Default Selling Cost Center,기본 판매 비용 센터
 DocType: Sales Partner,Implementation Partner,구현 파트너
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,우편 번호
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},판매 주문 {0}를 {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,우편 번호
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},판매 주문 {0}를 {1}
 DocType: Opportunity,Contact Info,연락처 정보
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,재고 항목 만들기
 DocType: Packing Slip,Net Weight UOM,순 중량 UOM
@@ -1275,6 +1301,7 @@
 DocType: Holiday List,Get Weekly Off Dates,날짜 매주 하차
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,종료 날짜는 시작 날짜보다 작을 수 없습니다
 DocType: Sales Person,Select company name first.,첫 번째 회사 이름을 선택합니다.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,낮음에서 높음
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,인용문은 공급 업체에서 받았다.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,모든 BOM에서 BOM 교체 및 최신 가격 업데이트
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},에 {0} | {1} {2}
@@ -1295,7 +1322,7 @@
 DocType: Program Enrollment,Transportation,교통비
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,잘못된 속성
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} 제출해야합니다
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},수량보다 작거나 같아야합니다 {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},수량보다 작거나 같아야합니다 {0}
 DocType: SMS Center,Total Characters,전체 문자
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},상품에 대한 BOM 필드에서 BOM을 선택하세요 {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-양식 송장 세부 정보
@@ -1310,7 +1337,7 @@
 ,Ordered Items To Be Billed,청구 항목을 주문한
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,범위이어야한다보다는에게 범위
 DocType: Global Defaults,Global Defaults,글로벌 기본값
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,프로젝트 협력 초대
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,프로젝트 협력 초대
 DocType: Salary Slip,Deductions,공제
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,작업 이름
@@ -1328,13 +1355,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,선행 견적서
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,요청하지 마
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},또 다른 예산 기록은 &#39;{0}&#39;이 (가) 이미 존재에 대해 {1} &#39;{2}&#39;회계 연도 {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','시작 날짜가' '종료 날짜 '보다 클 수 없습니다
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','시작 날짜가' '종료 날짜 '보다 클 수 없습니다
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,관리
 DocType: Cheque Print Template,Payer Settings,지불 설정
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","이 변형의 상품 코드에 추가됩니다.귀하의 약어는 ""SM""이며, 예를 들어, 아이템 코드는 ""T-SHIRT"", ""T-SHIRT-SM""입니다 변형의 항목 코드"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,당신이 급여 슬립을 저장하면 (즉) 순 유료가 표시됩니다.
 DocType: Purchase Invoice,Is Return,돌아가요
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,주의
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,주의
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,반품 / 직불 참고
 DocType: Price List Country,Price List Country,가격 목록 나라
 DocType: Item,UOMs,UOMs
@@ -1349,17 +1376,18 @@
 DocType: Account,Balance Sheet,대차 대조표
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ','상품 코드와 항목에 대한 센터 비용
 DocType: Fee Validity,Valid Till,까지 유효
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",지불 방식은 구성되어 있지 않습니다. 계정 결제의 모드 또는 POS 프로필에 설정되어 있는지 확인하십시오.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",지불 방식은 구성되어 있지 않습니다. 계정 결제의 모드 또는 POS 프로필에 설정되어 있는지 확인하십시오.
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,동일 상품을 여러 번 입력 할 수 없습니다.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","또한 계정의 그룹에서 제조 될 수 있지만, 항목은 비 - 그룹에 대해 만들어 질 수있다"
 DocType: Lead,Lead,리드 고객
 DocType: Email Digest,Payables,채무
 DocType: Course,Course Intro,코스 소개
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,재고 입력 {0} 완료
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,설치&gt; 번호 매기기 시리즈를 통해 출석을위한 번호 매기기 시리즈를 설정하십시오.
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,재고 입력 {0} 완료
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,행 번호 {0} : 수량은 구매 대가로 입력 할 수 없습니다 거부
 ,Purchase Order Items To Be Billed,청구 할 수 구매 주문 아이템
 DocType: Purchase Invoice Item,Net Rate,인터넷 속도
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,고객을 선택하십시오.
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,고객을 선택하십시오.
 DocType: Purchase Invoice Item,Purchase Invoice Item,구매 송장 항목
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,재고 원장 항목 및 GL 항목은 선택 구매 영수증에 대한 재 게시된다
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,항목 1
@@ -1380,7 +1408,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},중복 행 {0}과 같은 {1}
 ,Trial Balance,시산표
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,찾을 수 없습니다 회계 연도 {0}
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,직원 설정
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,직원 설정
 DocType: Sales Order,SO-,그래서-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,첫 번째 접두사를 선택하세요
 DocType: Employee,O-,영형-
@@ -1392,12 +1420,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,보기 원장
 DocType: Grading Scale,Intervals,간격
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,처음
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group",항목 그룹이 동일한 이름을 가진 항목의 이름을 변경하거나 항목 그룹의 이름을 바꾸십시오
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group",항목 그룹이 동일한 이름을 가진 항목의 이름을 변경하거나 항목 그룹의 이름을 바꾸십시오
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,학생 휴대 전화 번호
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,세계의 나머지
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,세계의 나머지
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,항목 {0} 배치를 가질 수 없습니다
 ,Budget Variance Report,예산 차이 보고서
 DocType: Salary Slip,Gross Pay,총 지불
+DocType: Item,Is Item from Hub,허브로부터의 아이템인가
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,행 {0} : 활동 유형은 필수입니다.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,배당금 지급
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,회계 원장
@@ -1407,8 +1436,9 @@
 DocType: Vehicle Log,Service Detail,서비스 세부 정보
 DocType: BOM,Item Description,항목 설명
 DocType: Student Sibling,Student Sibling,학생 형제
-DocType: Purchase Invoice,Is Recurring,반복인가
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,지불 방식
 DocType: Purchase Invoice,Supplied Items,제공 한
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Restaurant {0}에 대한 활성 메뉴를 설정하십시오.
 DocType: Student,STUD.,마개.
 DocType: Production Order,Qty To Manufacture,제조하는 수량
 DocType: Email Digest,New Income,새로운 소득
@@ -1419,6 +1449,7 @@
 ,Student and Guardian Contact Details,학생 및 보호자 연락처 세부 사항
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,행 {0} : 공급 업체 {0} 이메일 주소는 이메일을 보낼 필요
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,임시 열기
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,허브보기
 ,Employee Leave Balance,직원 허가 밸런스
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},{0} 계정 잔고는 항상 {1}  이어야합니다
 DocType: Patient Appointment,More Info,추가 정보
@@ -1438,13 +1469,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,판매 주문 {0} 유효하지 않습니다
 DocType: Supplier Scorecard,Warn for new Request for Quotations,견적 요청에 대한 새로운 경고
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,구매 주문은 당신이 계획하는 데 도움이 당신의 구입에 후속
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","죄송합니다, 회사는 병합 할 수 없습니다"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","죄송합니다, 회사는 병합 할 수 없습니다"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,실험실 처방전
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",자료 요청의 총 발행 / 전송 양 {0} {1} \ 항목에 대한 요청한 수량 {2}보다 클 수 없습니다 {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,작은
 DocType: Employee,Employee Number,직원 수
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},케이스 없음 (들)을 이미 사용.케이스 없음에서 시도 {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},케이스 없음 (들)을 이미 사용.케이스 없음에서 시도 {0}
 DocType: Project,% Completed,% 완료
 ,Invoiced Amount (Exculsive Tax),송장에 청구 된 금액 (Exculsive 세금)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,항목 2
@@ -1459,11 +1490,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,간접 비용
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,행 {0} : 수량은 필수입니다
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,농업
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,싱크 마스터 데이터
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,싱크 마스터 데이터
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,귀하의 제품이나 서비스
 DocType: Special Test Items,Special Test Items,특별 시험 항목
 DocType: Mode of Payment,Mode of Payment,결제 방식
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,웹 사이트의 이미지가 공개 파일 또는 웹 사이트 URL이어야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,웹 사이트의 이미지가 공개 파일 또는 웹 사이트 URL이어야합니다
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,이 루트 항목 그룹 및 편집 할 수 없습니다.
@@ -1471,9 +1502,9 @@
 DocType: Vehicle,Fuel UOM,연료 UOM
 DocType: Warehouse,Warehouse Contact Info,창고 연락처 정보
 DocType: Payment Entry,Write Off Difference Amount,차이 금액 오프 쓰기
-DocType: Purchase Invoice,Recurring Type,경상 유형
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0} : 직원의 이메일을 찾을 수 없습니다, 따라서 보낸 이메일이 아닌"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0} : 직원의 이메일을 찾을 수 없습니다, 따라서 보낸 이메일이 아닌"
 DocType: Item,Foreign Trade Details,대외 무역 세부 사항
+,Assessment Plan Status,평가 계획 상태
 DocType: Email Digest,Annual Income,연간 소득
 DocType: Serial No,Serial No Details,일련 번호 세부 사항
 DocType: Purchase Invoice Item,Item Tax Rate,항목 세율
@@ -1481,15 +1512,14 @@
 DocType: Student Group Student,Group Roll Number,그룹 롤 번호
 DocType: Student Group Student,Group Roll Number,그룹 롤 번호
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} 만 신용 계정은 자동 이체 항목에 링크 할 수 있습니다 들어
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,모든 작업 가중치의 합계 1. 따라 모든 프로젝트 작업의 가중치를 조정하여주십시오해야한다
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,배송 참고 {0} 제출되지
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,모든 작업 가중치의 합계 1. 따라 모든 프로젝트 작업의 가중치를 조정하여주십시오해야한다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,배송 참고 {0} 제출되지
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,{0} 항목 하위 계약 품목이어야합니다
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,자본 장비
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","가격 규칙은 첫 번째 항목, 항목 그룹 또는 브랜드가 될 수있는 필드 '에 적용'에 따라 선택됩니다."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,먼저 상품 코드를 설정하십시오.
-DocType: Hub Settings,Seller Website,판매자 웹 사이트
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,먼저 상품 코드를 설정하십시오.
 DocType: Item,ITEM-,목-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,영업 팀의 총 할당 비율은 100해야한다
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,영업 팀의 총 할당 비율은 100해야한다
 DocType: Sales Invoice Item,Edit Description,편집 설명
 DocType: Antibiotic,Antibiotic,항생 물질
 ,Team Updates,팀 업데이트
@@ -1510,12 +1540,12 @@
 DocType: Purchase Invoice,Total (Company Currency),총 (회사 통화)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,일련 번호 {0} 번 이상 입력
 DocType: Depreciation Schedule,Journal Entry,분개
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,진행중인 {0} 항목
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,진행중인 {0} 항목
 DocType: Workstation,Workstation Name,워크 스테이션 이름
 DocType: Grading Scale Interval,Grade Code,등급 코드
 DocType: POS Item Group,POS Item Group,POS 항목 그룹
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,다이제스트 이메일 :
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} 아이템에 속하지 않는 {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} 아이템에 속하지 않는 {1}
 DocType: Sales Partner,Target Distribution,대상 배포
 DocType: Salary Slip,Bank Account No.,은행 계좌 번호
 DocType: Naming Series,This is the number of the last created transaction with this prefix,이것은이 접두사를 마지막으로 생성 된 트랜잭션의 수입니다
@@ -1532,10 +1562,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,견적 공급 업체 요청
 DocType: Healthcare Settings,Registration Message,등록 메시지
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,하드웨어
-DocType: Sales Order,Recurring Upto,반복 개까지
 DocType: Prescription Dosage,Prescription Dosage,처방전 복용량
 DocType: Attendance,HR Manager,HR 관리자
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,회사를 선택하세요
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,회사를 선택하세요
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,권한 허가
 DocType: Purchase Invoice,Supplier Invoice Date,공급 업체 송장 날짜
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,당
@@ -1551,10 +1580,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,사이에있는 중복 조건 :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,저널에 대하여 항목은 {0}이 (가) 이미 다른 쿠폰에 대해 조정
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,총 주문액
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,음식
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,음식
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,고령화 범위 3
 DocType: Maintenance Schedule Item,No of Visits,방문 없음
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},{1}에 대한 유지 관리 일정 {0}이 (가) 있습니다.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Items to Hub를 게시 하시겠습니까?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,등록 학생
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},닫기 계정의 통화가 있어야합니다 {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},모든 목표에 대한 포인트의 합은 그것이 100해야한다 {0}
@@ -1565,9 +1595,9 @@
 DocType: Authorization Rule,Average Discount,평균 할인
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,"공공요금(전기세, 상/하 수도세, 가스세, 쓰레기세 등)"
-DocType: Purchase Invoice Item,Accounting,회계
+DocType: POS Profile,Accounting,회계
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,배치 항목에 대한 배치를 선택하십시오.
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,배치 항목에 대한 배치를 선택하십시오.
 DocType: Asset,Depreciation Schedules,감가 상각 스케줄
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,신청 기간은 외부 휴가 할당 기간이 될 수 없습니다
 DocType: Activity Cost,Projects,프로젝트
@@ -1583,7 +1613,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',승인 상태가 '승인'또는 '거부'해야
 DocType: Physician,Contacts and Address,연락처 및 주소
 DocType: Purchase Invoice,Contact Person,담당자
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','예상 시작 날짜'는'예상 종료 날짜 ' 이전이어야 합니다.
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','예상 시작 날짜'는'예상 종료 날짜 ' 이전이어야 합니다.
 DocType: Course Scheduling Tool,Course End Date,코스 종료 날짜
 DocType: Holiday List,Holidays,휴가
 DocType: Sales Order Item,Planned Quantity,계획 수량
@@ -1591,10 +1621,11 @@
 DocType: Item,Maintain Stock,재고 유지
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,이미 생산 오더에 대 한 만든 항목
 DocType: Employee,Prefered Email,선호하는 이메일
+DocType: Student Admission,Eligibility and Details,자격 및 세부 정보
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,고정 자산의 순 변화
 DocType: Leave Control Panel,Leave blank if considered for all designations,모든 지정을 고려하는 경우 비워 둡니다
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,유형 행 {0}에있는 '실제'의 책임은 상품 요금에 포함 할 수 없습니다
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},최대 : {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},최대 : {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,날짜 시간에서
 DocType: Email Digest,For Company,회사
 apps/erpnext/erpnext/config/support.py +17,Communication log.,통신 로그.
@@ -1602,19 +1633,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,공급 업체 스코어 카드 채점 변수
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,금액을 구매
 DocType: Sales Invoice,Shipping Address Name,배송 주소 이름
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,계정 차트
 DocType: Material Request,Terms and Conditions Content,약관 내용
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,100보다 큰 수 없습니다
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,{0} 항목을 재고 항목이 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,{0} 항목을 재고 항목이 없습니다
 DocType: Maintenance Visit,Unscheduled,예약되지 않은
 DocType: Employee,Owned,소유
 DocType: Salary Detail,Depends on Leave Without Pay,무급 휴가에 따라 다름
 DocType: Pricing Rule,"Higher the number, higher the priority",숫자가 클수록 더 높은 우선 순위
 ,Purchase Invoice Trends,송장 동향을 구입
 DocType: Employee,Better Prospects,더 나은 전망
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",행 # {0} : 배치 {1}에는 {2} 개의 수량 만 있습니다. {3} 수량이있는 다른 배치를 선택하거나 행을 여러 행으로 분할하여 여러 배치에서 전달 / 발행하십시오.
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",행 # {0} : 배치 {1}에는 {2} 개의 수량 만 있습니다. {3} 수량이있는 다른 배치를 선택하거나 행을 여러 행으로 분할하여 여러 배치에서 전달 / 발행하십시오.
 DocType: Vehicle,License Plate,차량 번호판
 DocType: Appraisal,Goals,목표
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,POS 프로파일 선택
 DocType: Warranty Claim,Warranty / AMC Status,보증 / AMC 상태
 ,Accounts Browser,계정 브라우저
 DocType: Payment Entry Reference,Payment Entry Reference,결제 항목 참조
@@ -1633,7 +1664,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,직원은 자신에게보고 할 수 없습니다.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","계정이 동결 된 경우, 항목은 제한된 사용자에게 허용됩니다."
 DocType: Email Digest,Bank Balance,은행 잔액
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} 만 통화 할 수있다 : {0}에 대한 회계 항목 {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} 만 통화 할 수있다 : {0}에 대한 회계 항목 {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","필요한 작업 프로필, 자격 등"
 DocType: Journal Entry Account,Account Balance,계정 잔액
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,거래에 대한 세금 규칙.
@@ -1642,8 +1673,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),총 세금 및 요금 (회사 통화)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,닫히지 않은 회계 연도의 P &amp; L 잔액을보기
 DocType: Lab Test Template,Collection Details,컬렉션 세부 정보
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","tabConsultation ct,`tabLab Prescription` cp에서 ct.patient = &#39;{0}&#39;및 cp.parent = ct에서 cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date를 선택하십시오. 이름 및 cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,배송 계정
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1} 계정 {2} 비활성
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,판매 주문이 당신의 일을 계획하는 데 도움과에 시간 제공 할 수 있도록
@@ -1660,7 +1689,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,포장 명세서
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,사무실 임대
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,설치 SMS 게이트웨이 설정
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,가져 오기 실패!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,가져 오기 실패!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,어떤 주소는 아직 추가되지 않습니다.
 DocType: Workstation Working Hour,Workstation Working Hour,워크 스테이션 작업 시간
 DocType: Vital Signs,Blood Pressure,혈압
@@ -1685,7 +1714,7 @@
 DocType: Sales Invoice,Source,소스
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,쇼 폐쇄
 DocType: Leave Type,Is Leave Without Pay,지불하지 않고 남겨주세요
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,자산의 종류는 고정 자산 항목에 대해 필수입니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,자산의 종류는 고정 자산 항목에 대해 필수입니다
 DocType: Fee Validity,Fee Validity,요금 유효 기간
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,지불 테이블에있는 레코드 없음
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},이 {0} 충돌 {1}의 {2} {3}
@@ -1706,8 +1735,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,대표 조사
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,리드 만들기
 DocType: Maintenance Schedule,Schedules,일정
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,POS 프로파일은 Point-of-Sale을 사용해야합니다.
 DocType: Purchase Invoice Item,Net Amount,순액
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1}이 (가) 제출되지 않았으므로 조치를 완료 할 수 없습니다.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1}이 (가) 제출되지 않았으므로 조치를 완료 할 수 없습니다.
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM 세부 사항 없음
 DocType: Landed Cost Voucher,Additional Charges,추가 요금
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),추가 할인 금액 (회사 통화)
@@ -1716,7 +1746,7 @@
 ,Support Hour Distribution,지원 시간 분포
 DocType: Maintenance Visit,Maintenance Visit,유지 보수 방문
 DocType: Student,Leaving Certificate Number,인증서 번호를 남겨
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}",약속이 취소되었습니다. 인보이스 {0}을 검토하고 취소하십시오.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}",약속이 취소되었습니다. 인보이스 {0}을 검토하고 취소하십시오.
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,창고에서 사용 가능한 배치 수량
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,업데이트 인쇄 형식
 DocType: Landed Cost Voucher,Landed Cost Help,착륙 비용 도움말
@@ -1739,8 +1769,8 @@
 DocType: Patient,Tobacco Past Use,과거의 담배 사용
 DocType: Sales Invoice Item,Brand Name,브랜드 명
 DocType: Purchase Receipt,Transporter Details,수송기 상세
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},사용자 {0}은 (는) 의사 {1}에게 이미 할당되었습니다.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,기본 창고가 선택한 항목에 대한 필요
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},사용자 {0}은 (는) 의사 {1}에게 이미 할당되었습니다.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,기본 창고가 선택한 항목에 대한 필요
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,상자
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,가능한 공급 업체
 DocType: Budget,Monthly Distribution,예산 월간 배분
@@ -1750,8 +1780,8 @@
 DocType: Sales Partner,Sales Partner Target,영업 파트너 대상
 DocType: Loan Type,Maximum Loan Amount,최대 대출 금액
 DocType: Pricing Rule,Pricing Rule,가격 규칙
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},학생 {0}의 중복 롤 번호
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},학생 {0}의 중복 롤 번호
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},학생 {0}의 중복 롤 번호
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},학생 {0}의 중복 롤 번호
 DocType: Budget,Action if Annual Budget Exceeded,액션 연간 예산 초과하는 경우
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,주문을 (를) 구매하려면 자료 요청
 DocType: Shopping Cart Settings,Payment Success URL,지불 성공 URL
@@ -1768,7 +1798,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} 한 번만 표시합니다
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},더 tranfer 할 수 없습니다 {0}보다 {1} 구매 주문에 대한 {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},잎에 성공적으로 할당 된 {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,포장하는 항목이 없습니다
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,포장하는 항목이 없습니다
 DocType: Shipping Rule Condition,From Value,값에서
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,제조 수량이 필수입니다
 DocType: Employee Loan,Repayment Method,상환 방법
@@ -1782,6 +1812,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,재고 부채
 DocType: Purchase Invoice,Supplier Warehouse,공급 업체 창고
 DocType: Opportunity,Contact Mobile No,연락처 모바일 없음
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,회사 선택
 ,Material Requests for which Supplier Quotations are not created,공급 업체의 견적이 생성되지 않는 자재 요청
 DocType: Student Group,Set 0 for no limit,제한 없음 0 설정
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,당신이 휴가를 신청하는 날 (들)은 휴일입니다. 당신은 휴가를 신청할 필요가 없습니다.
@@ -1791,24 +1822,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,견적 확인
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,기타 보고서
 DocType: Dependent Task,Dependent Task,종속 작업
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},측정의 기본 단위에 대한 변환 계수는 행에 반드시 1이 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},측정의 기본 단위에 대한 변환 계수는 행에 반드시 1이 {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},유형의 휴가는 {0}을 넘을 수 없습니다 {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,사전에 X 일에 대한 작업을 계획 해보십시오.
 DocType: HR Settings,Stop Birthday Reminders,정지 생일 알림
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},회사에서 기본 급여 채무 계정을 설정하십시오 {0}
 DocType: SMS Center,Receiver List,수신기 목록
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,검색 항목
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,검색 항목
 DocType: Patient Appointment,Referring Physician,추천 의사
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,소비 금액
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,현금의 순 변화
 DocType: Assessment Plan,Grading Scale,등급 규모
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,측정 단위는 {0}보다 변환 계수 표에 두 번 이상 입력 한
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,이미 완료
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,측정 단위는 {0}보다 변환 계수 표에 두 번 이상 입력 한
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,이미 완료
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,손에 주식
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},지불 요청이 이미 존재 {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,발행 항목의 비용
 DocType: Physician,Hospital,병원
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},수량 이하이어야한다 {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},수량 이하이어야한다 {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,이전 회계 연도가 종료되지 않습니다
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),나이 (일)
 DocType: Quotation Item,Quotation Item,견적 상품
@@ -1819,8 +1850,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,공급 유형 마스터.
 DocType: Purchase Order Item,Supplier Part Number,공급 업체 부품 번호
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,변환 속도는 0 또는 1이 될 수 없습니다
-DocType: Sales Invoice,Reference Document,참조 문헌
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} 취소 또는 정지되었습니다.
+DocType: Subscription,Reference Document,참조 문헌
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} 취소 또는 정지되었습니다.
 DocType: Accounts Settings,Credit Controller,신용 컨트롤러
 DocType: Delivery Note,Vehicle Dispatch Date,차량 파견 날짜
 DocType: Healthcare Settings,Default Medical Code Standard,기본 의료 코드 표준
@@ -1829,6 +1860,7 @@
 DocType: Company,Default Payable Account,기본 지불 계정
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","이러한 운송 규칙, 가격 목록 등 온라인 쇼핑 카트에 대한 설정"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0} % 청구
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,가격순 정렬 ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,예약 수량
 DocType: Party Account,Party Account,당 계정
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,인적 자원
@@ -1840,13 +1872,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,지급 항목을 만듭니다
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,행 {0} : 공급 업체에 대한 사전 직불해야
 DocType: Company,Default Values,기본값
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{빈도} 다이제스트
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{빈도} 다이제스트
 DocType: Expense Claim,Total Amount Reimbursed,총 금액 상환
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,이이 차량에 대한 로그를 기반으로합니다. 자세한 내용은 아래 일정을 참조하십시오
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},공급 업체 청구서를 {0} 일자 {1}
 DocType: Customer,Default Price List,기본 가격리스트
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,자산 이동 기록 {0} 작성
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,당신은 삭제할 수 없습니다 회계 연도 {0}. 회계 연도 {0} 전역 설정에서 기본값으로 설정
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,같은 이름의 고객이 이미 있습니다.
 DocType: Journal Entry,Entry Type,항목 유형
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,이 평가 그룹과 연결된 평가 계획이 없습니다.
 ,Customer Credit Balance,고객 신용 잔액
@@ -1857,7 +1890,7 @@
 DocType: Quotation,Term Details,용어의 자세한 사항
 DocType: Project,Total Sales Cost (via Sales Order),총 판매 비용 (판매 주문을 통한)
 DocType: Project,Total Sales Cost (via Sales Order),총 판매 비용 (판매 주문을 통한)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,이 학생 그룹에 대한 {0} 학생 이상 등록 할 수 없습니다.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,이 학생 그룹에 대한 {0} 학생 이상 등록 할 수 없습니다.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,리드 카운트
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,리드 카운트
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0보다 커야합니다
@@ -1875,9 +1908,11 @@
 DocType: Lab Test,Technician Name,기술자 이름
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,송장의 취소에 지불 연결 해제
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},입력 현재 주행 독서는 초기 차량 주행보다 커야합니다 {0}
+DocType: Restaurant Reservation,No Show,더 쇼 없다
 DocType: Shipping Rule Country,Shipping Rule Country,배송 규칙 나라
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,두고 출석
 DocType: Maintenance Visit,Partially Completed,부분적으로 완료
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,보통 민감도
 DocType: Leave Type,Include holidays within leaves as leaves,잎으로 잎에서 휴일을 포함
 DocType: Sales Invoice,Packed Items,포장 항목
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,일련 번호에 대한 보증 청구
@@ -1894,13 +1929,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),지불 금액 (회사 통화)
 DocType: Purchase Invoice,Additional Discount,추가 할인
 DocType: Selling Settings,Selling Settings,판매 설정
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,액션 확인
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,온라인 경매
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,수량이나 평가 비율 또는 둘 중 하나를 지정하십시오
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,이행
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,쇼핑 카트에보기
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,마케팅 비용
 ,Item Shortage Report,매물 부족 보고서
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","무게도 ""무게 UOM""를 언급 해주십시오 \n, 언급"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","무게도 ""무게 UOM""를 언급 해주십시오 \n, 언급"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,자료 요청이 재고 항목을 확인하는 데 사용
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,다음 감가 상각 날짜는 새로운 자산에 대한 필수입니다
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,모든 일괄 처리를위한 별도의 과정 기반 그룹
@@ -1913,12 +1949,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,모든 재고 이동을위한 회계 항목을 만듭니다
 DocType: Leave Allocation,Total Leaves Allocated,할당 된 전체 잎
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},행 없음에 필요한 창고 {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,유효한 회계 연도 시작 및 종료 날짜를 입력하십시오
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,유효한 회계 연도 시작 및 종료 날짜를 입력하십시오
 DocType: Employee,Date Of Retirement,은퇴 날짜
 DocType: Upload Attendance,Get Template,양식 구하기
 DocType: Material Request,Transferred,이전 됨
 DocType: Vehicle,Doors,문
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext 설치가 완료!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext 설치가 완료!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,환자 등록 수수료 지불
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,세금 분열
@@ -1937,37 +1973,37 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","이 항목이 변형을 갖는다면, 이는 판매 주문 등을 선택할 수 없다"
 DocType: Lead,Next Contact By,다음 접촉
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},상품에 필요한 수량 {0} 행에서 {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},상품에 필요한 수량 {0} 행에서 {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},수량이 항목에 대한 존재하는 창고 {0} 삭제할 수 없습니다 {1}
 DocType: Quotation,Order Type,주문 유형
-DocType: Purchase Invoice,Notification Email Address,알림 전자 메일 주소
 ,Item-wise Sales Register,상품이 많다는 판매 등록
 DocType: Asset,Gross Purchase Amount,총 구매 금액
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,기초 잔액
 DocType: Asset,Depreciation Method,감가 상각 방법
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,오프라인
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,오프라인
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,이 세금은 기본 요금에 포함되어 있습니까?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,총 대상
 DocType: Job Applicant,Applicant for a Job,작업에 대한 신청자
 DocType: Production Plan Material Request,Production Plan Material Request,생산 계획 자료 요청
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,생성 된 NO 생성 주문하지
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,생성 된 NO 생성 주문하지
 DocType: Stock Reconciliation,Reconciliation JSON,화해 JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,열이 너무 많습니다.보고서를 내 보낸 스프레드 시트 응용 프로그램을 사용하여 인쇄 할 수 있습니다.
 DocType: Purchase Invoice Item,Batch No,배치 없음
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},견적 요청 : {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,고객의 구매 주문에 대해 여러 판매 주문 허용
 DocType: Student Group Instructor,Student Group Instructor,학생 그룹 강사
 DocType: Student Group Instructor,Student Group Instructor,학생 그룹 강사
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 모바일 없음
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,주요 기능
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,주요 기능
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,변체
 DocType: Naming Series,Set prefix for numbering series on your transactions,트랜잭션에 일련 번호에 대한 설정 접두사
 DocType: Employee Attendance Tool,Employees HTML,직원 HTML을
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,기본 BOM은 ({0})이 항목 또는 템플릿에 대한 활성화되어 있어야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,기본 BOM은 ({0})이 항목 또는 템플릿에 대한 활성화되어 있어야합니다
 DocType: Employee,Leave Encashed?,Encashed 남겨?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,필드에서 기회는 필수입니다
 DocType: Email Digest,Annual Expenses,연간 비용
 DocType: Item,Variants,변종
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,확인 구매 주문
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,확인 구매 주문
 DocType: SMS Center,Send To,보내기
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},허가 유형에 대한 충분한 휴가 밸런스가 없습니다 {0}
 DocType: Payment Reconciliation Payment,Allocated amount,할당 된 양
@@ -1985,6 +2021,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,학생 그룹의 힘
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,저널에 대하여 항목 {0} 어떤 타의 추종을 불허 {1} 항목이없는
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,감정
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,교육 이벤트
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},중복 된 일련 번호는 항목에 대해 입력 {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,배송 규칙의 조건
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,들어 오세요
@@ -1994,7 +2031,7 @@
 DocType: Sales Order,To Deliver and Bill,제공 및 법안
 DocType: Student Group,Instructors,강사
 DocType: GL Entry,Credit Amount in Account Currency,계정 통화 신용의 양
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM은 {0} 제출해야합니다
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM은 {0} 제출해야합니다
 DocType: Authorization Control,Authorization Control,권한 제어
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},행 번호 {0} : 창고 거부 거부 항목에 대해 필수입니다 {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,지불
@@ -2013,11 +2050,11 @@
 DocType: Quotation Item,Actual Qty,실제 수량
 DocType: Sales Invoice Item,References,참조
 DocType: Quality Inspection Reading,Reading 10,10 읽기
-DocType: Hub Settings,Hub Node,허브 노드
+DocType: Hub Category,Hub Node,허브 노드
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,중복 항목을 입력했습니다.조정하고 다시 시도하십시오.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,준
 DocType: Asset Movement,Asset Movement,자산 이동
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,새로운 장바구니
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,새로운 장바구니
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} 항목을 직렬화 된 상품이 없습니다
 DocType: SMS Center,Create Receiver List,수신기 목록 만들기
 DocType: Vehicle,Wheels,휠
@@ -2031,15 +2068,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,통신
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),패키지이 배달의 일부임을 나타냅니다 (만 안)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,지불 항목을 만듭니다
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},수량 항목에 대한 {0}보다 작아야합니다 {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},수량 항목에 대한 {0}보다 작아야합니다 {1}
 ,Sales Invoice Trends,견적서 동향
 DocType: Leave Application,Apply / Approve Leaves,잎을 승인 / 적용
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,에 대한
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,에 대한
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"충전 타입 또는 '이전 행 전체', '이전 행의 양에'인 경우에만 행을 참조 할 수 있습니다"
 DocType: Sales Order Item,Delivery Warehouse,배송 창고
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,금융 코스트 센터의 나무.
 DocType: Serial No,Delivery Document No,납품 문서 없음
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},회사의 &#39;자산 처분 이익 / 손실 계정&#39;으로 설정하십시오 {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},회사의 &#39;자산 처분 이익 / 손실 계정&#39;으로 설정하십시오 {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,구매 영수증에서 항목 가져 오기
 DocType: Serial No,Creation Date,만든 날짜
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},{0} 항목을 가격 목록에 여러 번 나타납니다 {1}
@@ -2050,12 +2087,13 @@
 DocType: Student,Student Mobile Number,학생 휴대 전화 번호
 DocType: Item,Has Variants,변형을 가지고
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,응답 업데이트
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},이미에서 항목을 선택한 {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},이미에서 항목을 선택한 {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,월별 분포의 이름
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,일괄 ID는 필수 항목입니다.
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,일괄 ID는 필수 항목입니다.
 DocType: Sales Person,Parent Sales Person,부모 판매 사람
-DocType: Purchase Invoice,Recurring Invoice,경상 송장
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,높음 - 낮음
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,먼저 프로그램을 선택하십시오.
 DocType: Patient Appointment,Patient Age,환자 연령
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,프로젝트 관리
 DocType: Supplier,Supplier of Goods or Services.,제품 또는 서비스의 공급.
@@ -2063,8 +2101,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,상담 요금을 예약하기 위해 환자에게 설정되지 않은 경우 사용할 기본 채권 계정.
 DocType: Vehicle Log,Fuel Price,연료 가격
 DocType: Budget,Budget,예산
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,세트 열기
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,고정 자산 항목은 재고 항목 있어야합니다.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,세트 열기
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,고정 자산 항목은 재고 항목 있어야합니다.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",이 수입 또는 비용 계정이 아니다으로 예산이에 대해 {0}에 할당 할 수 없습니다
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,달성
 DocType: Student Admission,Application Form Route,신청서 경로
@@ -2078,12 +2116,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,{0} 항목을 직렬 제의 체크 항목 마스터에 대한 설정이 없습니다
 DocType: Maintenance Visit,Maintenance Time,유지 시간
 ,Amount to Deliver,금액 제공하는
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},동일한 항목이 여러 번 입력되었습니다. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,계약 기간의 시작 날짜는 용어가 연결되는 학술 올해의 올해의 시작 날짜보다 이전이 될 수 없습니다 (학년 {}). 날짜를 수정하고 다시 시도하십시오.
 DocType: Guardian,Guardian Interests,가디언 관심
 DocType: Naming Series,Current Value,현재 값
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,여러 회계 연도 날짜 {0} 존재한다. 회계 연도에 회사를 설정하세요
 DocType: School Settings,Instructor Records to be created by,에 의해 생성되는 강사 기록
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} 생성
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} 생성
 DocType: Delivery Note Item,Against Sales Order,판매 주문에 대해
 ,Serial No Status,일련 번호 상태
 DocType: Payment Entry Reference,Outstanding,두드러진
@@ -2094,10 +2133,10 @@
 에 차이는보다 크거나 같아야합니다 {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,이는 재고의 움직임을 기반으로합니다. 참조 {0} 자세한 내용은
 DocType: Pricing Rule,Selling,판매
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},금액은 {0} {1}에 대해 공제 {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},금액은 {0} {1}에 대해 공제 {2}
 DocType: Employee,Salary Information,급여정보
 DocType: Sales Person,Name and Employee ID,이름 및 직원 ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,기한 날짜를 게시하기 전에 할 수 없습니다
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,기한 날짜를 게시하기 전에 할 수 없습니다
 DocType: Website Item Group,Website Item Group,웹 사이트 상품 그룹
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,관세 및 세금
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,참고 날짜를 입력 해주세요
@@ -2123,7 +2162,7 @@
 DocType: Issue,Resolution Details,해상도 세부 사항
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,할당
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,허용 기준
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,위의 표에 자료 요청을 입력하세요
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,위의 표에 자료 요청을 입력하세요
 DocType: Item Attribute,Attribute Name,속성 이름
 DocType: BOM,Show In Website,웹 사이트에 표시
 DocType: Shopping Cart Settings,Show Quantity in Website,웹 사이트에서 수량보기
@@ -2132,7 +2171,7 @@
 DocType: Item Reorder,Check in (group),(그룹)에서 확인
 ,Qty to Order,수량은 주문
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","이익 / 손실이 예약 될 것이다 책임 또는 주식에서 계정 머리,"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,모든 작업의 Gantt 차트.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,모든 작업의 Gantt 차트.
 DocType: Opportunity,Mins to First Response,첫 번째 응답에 분
 DocType: Pricing Rule,Margin Type,여백 유형
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} 시간
@@ -2154,36 +2193,36 @@
 DocType: Patient,Surgical History,외과 적 병력
 DocType: Employee,Resignation Letter Date,사직서 날짜
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,가격 규칙은 또한 수량에 따라 필터링됩니다.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},직원 {0}의 가입 날짜를 설정하십시오.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},직원 {0}의 가입 날짜를 설정하십시오.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},직원 {0}의 가입 날짜를 설정하십시오.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},직원 {0}의 가입 날짜를 설정하십시오.
 DocType: Task,Total Billing Amount (via Time Sheet),총 결제 금액 (시간 시트를 통해)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,반복 고객 수익
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1})은 '지출 승인자'이어야 합니다.
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,페어링
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,생산을위한 BOM 및 수량 선택
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,생산을위한 BOM 및 수량 선택
 DocType: Asset,Depreciation Schedule,감가 상각 일정
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,영업 파트너 주소 및 연락처
 DocType: Bank Reconciliation Detail,Against Account,계정에 대하여
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,하프 데이 데이트 날짜부터 현재까지 사이에 있어야한다
 DocType: Maintenance Schedule Detail,Actual Date,실제 날짜
 DocType: Item,Has Batch No,일괄 없음에게 있습니다
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},연간 결제 : {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},연간 결제 : {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),재화 및 서비스 세금 (GST 인도)
 DocType: Delivery Note,Excise Page Number,소비세의 페이지 번호
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory",회사는 날짜부터 현재까지는 필수입니다
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,상담을 통해 얻으십시오.
 DocType: Asset,Purchase Date,구입 날짜
 DocType: Employee,Personal Details,개인 정보
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},회사의 &#39;자산 감가 상각 비용 센터&#39;를 설정하십시오 {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},회사의 &#39;자산 감가 상각 비용 센터&#39;를 설정하십시오 {0}
 ,Maintenance Schedules,관리 스케줄
 DocType: Task,Actual End Date (via Time Sheet),실제 종료 날짜 (시간 시트를 통해)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},양 {0} {1}에 대한 {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},양 {0} {1}에 대한 {2} {3}
 ,Quotation Trends,견적 동향
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},항목에 대한 항목을 마스터에 언급되지 않은 항목 그룹 {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,차변계정은 채권 계정이어야합니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,차변계정은 채권 계정이어야합니다
 DocType: Shipping Rule Condition,Shipping Amount,배송 금액
 DocType: Supplier Scorecard Period,Period Score,기간 점수
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,고객 추가
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,고객 추가
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,대기중인 금액
 DocType: Lab Test Template,Special,특별한
 DocType: Purchase Invoice Item,Conversion Factor,변환 계수
@@ -2191,13 +2230,14 @@
 ,Vehicle Expenses,차량 비용
 DocType: Serial No,Invoice Details,인보이스 세부 정보
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},연수 후 예상 값보다 크거나 같아야합니다 {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,시작하다
+DocType: Hub Category,Hub Category,허브 카테고리
 DocType: Purchase Invoice,SEZ,경제 특구
 DocType: Purchase Receipt,Vehicle Number,차량 번호
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,반복 송장이 중단 될 일자
 DocType: Employee Loan,Loan Amount,대출금
 DocType: Program Enrollment,Self-Driving Vehicle,자가 운전 차량
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,공급 업체 스코어 카드 대기 중
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},행 {0} : 재료 명세서 (BOM) 항목 찾을 수 없습니다 {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},행 {0} : 재료 명세서 (BOM) 항목 찾을 수 없습니다 {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,총 할당 된 잎 {0} 작을 수 없습니다 기간 동안 이미 승인 된 잎 {1}보다
 DocType: Journal Entry,Accounts Receivable,미수금
 ,Supplier-Wise Sales Analytics,공급 업체별 판매 분석
@@ -2209,7 +2249,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)",학부모 과정 (학부모 과정에 포함되지 않은 경우 비워 둡니다)
 DocType: Leave Control Panel,Leave blank if considered for all employee types,모든 직원의 유형을 고려하는 경우 비워 둡니다
 DocType: Landed Cost Voucher,Distribute Charges Based On,배포 요금을 기준으로
-apps/erpnext/erpnext/hooks.py +131,Timesheets,작업 표
+apps/erpnext/erpnext/hooks.py +140,Timesheets,작업 표
 DocType: HR Settings,HR Settings,HR 설정
 DocType: Salary Slip,net pay info,순 임금 정보
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,이 값은 기본 판매 가격리스트에서 갱신됩니다.
@@ -2220,7 +2260,7 @@
 DocType: Patient,B Positive,B 양성
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",행 번호 {0} 항목이 고정 자산이기 때문에 수량은 1이어야합니다. 여러 수량에 대해 별도의 행을 사용하십시오.
 DocType: Leave Block List Allow,Leave Block List Allow,차단 목록은 허용 남겨
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,약어는 비워둘수 없습니다
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,약어는 비워둘수 없습니다
 DocType: Patient Medical Record,Patient Medical Record,환자의 의료 기록
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,비 그룹에 그룹
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,스포츠
@@ -2237,9 +2277,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,주요 날짜 {2}에 대해 {0}에서 {1}까지의 환율을 찾을 수 없습니다. 통화 기록을 수동으로 작성하십시오.
 DocType: POS Profile,Price List,가격리스트
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} 이제 기본 회계 연도이다.변경 내용을 적용하기 위해 브라우저를 새로 고침하십시오.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,비용 청구
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,비용 청구
 DocType: Issue,Support,기술 지원
 ,BOM Search,BOM 검색
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",이 창고에서 재고가있는 허브를 기반으로 &quot;재고 있음&quot;또는 &quot;재고 없음&quot;을 게시하십시오.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),닫기 (+ 합계 열기)
 DocType: Vehicle,Fuel Type,연료 형태
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,회사에 통화를 지정하십시오
@@ -2251,16 +2292,16 @@
 DocType: Healthcare Settings,Remind Before,미리 알림
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM 변환 계수는 행에 필요한 {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","행 번호 {0} 참조 문서 형식은 판매 주문 중 하나, 판매 송장 또는 분개해야합니다"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","행 번호 {0} 참조 문서 형식은 판매 주문 중 하나, 판매 송장 또는 분개해야합니다"
 DocType: Salary Component,Deduction,공제
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,행 {0} : 시간에서와 시간은 필수입니다.
 DocType: Stock Reconciliation Item,Amount Difference,금액 차이
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},상품 가격은 추가 {0} 가격 목록에서 {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},상품 가격은 추가 {0} 가격 목록에서 {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,이 영업 사원의 직원 ID를 입력하십시오
 DocType: Territory,Classification of Customers by region,지역별 고객의 분류
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,차이 금액이 0이어야합니다
 DocType: Project,Gross Margin,매출 총 이익률
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,첫 번째 생산 품목을 입력하십시오
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,첫 번째 생산 품목을 입력하십시오
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,계산 된 은행 잔고 잔액
 DocType: Normal Test Template,Normal Test Template,일반 테스트 템플릿
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,사용하지 않는 사용자
@@ -2270,21 +2311,22 @@
 DocType: Salary Slip,Total Deduction,총 공제
 ,Production Analytics,생산 분석
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,이것은이 환자와의 거래를 기반으로합니다. 자세한 내용은 아래 타임 라인을 참조하십시오.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,비용 업데이트
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,비용 업데이트
 DocType: Employee,Date of Birth,생년월일
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,항목 {0}이 (가) 이미 반환 된
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** 회계 연도는 ** 금융 년도 나타냅니다.모든 회계 항목 및 기타 주요 거래는 ** ** 회계 연도에 대해 추적됩니다.
 DocType: Opportunity,Customer / Lead Address,고객 / 리드 주소
 DocType: Patient,DOB,외설 (DOB)
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,공급 업체 성과표 설정
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},경고 : 첨부 파일에 잘못된 SSL 인증서 {0}
-DocType: Student Admission,Eligibility,적임
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,평가 계획 이름
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},경고 : 첨부 파일에 잘못된 SSL 인증서 {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","리드는 당신이 사업은, 모든 연락처 등을 리드로 추가하는 데 도움"
 DocType: Production Order Operation,Actual Operation Time,실제 작업 시간
 DocType: Authorization Rule,Applicable To (User),에 적용 (사용자)
 DocType: Purchase Taxes and Charges,Deduct,공제
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,작업 설명
 DocType: Student Applicant,Applied,적용된
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,재 오픈
 DocType: Sales Invoice Item,Qty as per Stock UOM,수량 재고 UOM 당
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 이름
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","를 제외한 특수 문자 ""-"" ""."", ""#"", 그리고 ""/""시리즈 이름에 사용할 수 없습니다"
@@ -2296,7 +2338,7 @@
 DocType: Request for Quotation,Manufacturing Manager,제조 관리자
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},일련 번호는 {0}까지 보증 {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,패키지로 배달 주를 분할합니다.
-apps/erpnext/erpnext/hooks.py +98,Shipments,선적
+apps/erpnext/erpnext/hooks.py +107,Shipments,선적
 DocType: Payment Entry,Total Allocated Amount (Company Currency),총 할당 된 금액 (회사 통화)
 DocType: Purchase Order Item,To be delivered to customer,고객에게 전달 될
 DocType: BOM,Scrap Material Cost,스크랩 재료 비용
@@ -2319,8 +2361,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,품목 변형 설정
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,회사를 선택 ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,모든 부서가 있다고 간주 될 경우 비워 둡니다
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","고용 (영구, 계약, 인턴 등)의 종류."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} 항목에 대한 필수입니다 {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","고용 (영구, 계약, 인턴 등)의 종류."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} 항목에 대한 필수입니다 {1}
 DocType: Process Payroll,Fortnightly,이주일에 한번의
 DocType: Currency Exchange,From Currency,통화와
 DocType: Vital Signs,Weight (In Kilogram),무게 (킬로그램 단위)
@@ -2345,7 +2387,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,일정을 얻기 위해 '생성 일정'을 클릭 해주세요
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,다음 일정을 삭제하는 동안 오류가 발생했습니다 :
 DocType: Bin,Ordered Quantity,주문 수량
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","예) ""빌더를 위한  빌드 도구"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","예) ""빌더를 위한  빌드 도구"""
 DocType: Grading Scale,Grading Scale Intervals,등급 스케일 간격
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1} {2}에 대한 회계 항목 만 통화 할 수있다 : {3}
 DocType: Production Order,In Process,처리 중
@@ -2369,11 +2411,10 @@
 DocType: Purchase Invoice,With Payment of Tax,세금 납부와 함께
 DocType: Expense Claim Detail,Expense Claim Detail,비용 청구 상세 정보
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,공급 업체를위한 TRIPLICATE
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,올바른 계정을 선택하세요
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,올바른 계정을 선택하세요
 DocType: Item,Weight UOM,무게 UOM
 DocType: Salary Structure Employee,Salary Structure Employee,급여 구조의 직원
 DocType: Patient,Blood Group,혈액 그룹
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,대기 중
 DocType: Course,Course Name,코스 명
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,특정 직원의 휴가 응용 프로그램을 승인 할 수 있습니다 사용자
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,사무용품
@@ -2392,7 +2433,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,가격리스트가 설정되지 않은 경우 가격이 표시되지
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,이 배송 규칙에 대한 국가를 지정하거나 전세계 배송을 확인하시기 바랍니다
 DocType: Stock Entry,Total Incoming Value,총 수신 값
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,직불 카드에 대한이 필요합니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,직불 카드에 대한이 필요합니다
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","작업 표는 팀에 의해 수행하는 행동이 시간, 비용 및 결제 추적 할 수 있도록"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,구매 가격 목록
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,공급자 스코어 카드 변수의 템플릿.
@@ -2402,7 +2443,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,결제 조정
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,INCHARGE 사람의 이름을 선택하세요
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,기술
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},총 미지급 : {0}
+DocType: Hub Settings,Unregister from Hub,허브 등록 취소
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},총 미지급 : {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM 웹 사이트 운영
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,편지를 제공
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,자료 요청 (MRP) 및 생산 오더를 생성합니다.
@@ -2414,7 +2456,9 @@
 DocType: Physician Schedule Time Slot,To Time,시간
 DocType: Authorization Rule,Approving Role (above authorized value),(승인 된 값 이상) 역할을 승인
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,대변계정은 채무 계정이어야합니다
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM 재귀 : {0} 부모 또는 자녀가 될 수 없습니다 {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,유급 학생 지원자에게 의무적 인 학생 입학을 선택하십시오.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM 재귀 : {0} 부모 또는 자녀가 될 수 없습니다 {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,가격을 공개하려면 가격표를 선택하십시오.
 DocType: Production Order Operation,Completed Qty,완료 수량
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",{0} 만 직불 계정은 다른 신용 항목에 링크 할 수 있습니다 들어
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,가격 목록 {0} 비활성화
@@ -2427,37 +2471,38 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} 항목에 필요한 일련 번호 {1}. 당신이 제공 한 {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,현재 평가 비율
 DocType: Item,Customer Item Codes,고객 상품 코드
+DocType: Training Event,Advance,전진
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,다시 되풀이하는 것.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,교환 이득 / 손실
 DocType: Opportunity,Lost Reason,분실 된 이유
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,새 주소
 DocType: Quality Inspection,Sample Size,표본 크기
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,수신 문서를 입력하세요
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,모든 상품은 이미 청구 된
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.','사건 번호에서'유효 기간을 지정하십시오
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.','사건 번호에서'유효 기간을 지정하십시오
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,또한 비용 센터 그룹에서 할 수 있지만 항목이 아닌 그룹에 대해 할 수있다
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,사용자 및 권한
 DocType: Vehicle Log,VLOG.,동영상 블로그.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},생산 오더 생성 : {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},생산 오더 생성 : {0}
 DocType: Branch,Branch,Branch
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,인쇄 및 브랜딩
 DocType: Company,Total Monthly Sales,총 월간 판매액
 DocType: Bin,Actual Quantity,실제 수량
 DocType: Shipping Rule,example: Next Day Shipping,예 : 익일 배송
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,발견되지 일련 번호 {0}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},구독이 {0}되었습니다.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},구독이 {0}되었습니다.
 DocType: Fee Schedule Program,Fee Schedule Program,요금표 프로그램
 DocType: Fee Schedule Program,Student Batch,학생 배치
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,select * from`tabVital Signs` 어디 환자 = &#39;{0}&#39;주문에 의해 signs_date desc limit 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,학생을
 DocType: Supplier Scorecard Scoring Standing,Min Grade,최소 학년
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},당신은 프로젝트 공동 작업에 초대되었습니다 : {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},의사는 {0}에서 사용할 수 없습니다.
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},당신은 프로젝트 공동 작업에 초대되었습니다 : {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},의사는 {0}에서 사용할 수 없습니다.
 DocType: Leave Block List Date,Block Date,블록 날짜
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},doctype {0}에 사용자 정의 필드 가입 아이디를 추가하십시오.
 DocType: Purchase Receipt,Supplier Delivery Note,공급자 납품서
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,지금 적용
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,지금 적용
 DocType: Purchase Invoice,E-commerce GSTIN,전자 상거래 GSTIN
 DocType: Sales Order,Not Delivered,전달되지 않음
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,예상 날짜는 거래 날짜 이전 일 수 없습니다.
 ,Bank Clearance Summary,은행 정리 요약
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","만들고, 매일, 매주 및 매월 이메일 다이제스트를 관리 할 수 있습니다."
 DocType: Appraisal Goal,Appraisal Goal,평가목표
@@ -2465,12 +2510,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,건물
 DocType: Fee Schedule,Fee Structure,요금 구조
 DocType: Timesheet Detail,Costing Amount,원가 계산 금액
-DocType: Student Admission,Application Fee,신청비
+DocType: Student Admission Program,Application Fee,신청비
 DocType: Process Payroll,Submit Salary Slip,급여 슬립 제출
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,항목에 대한 Maxiumm 할인은 {0} {1} %에게 is
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,항목에 대한 Maxiumm 할인은 {0} {1} %에게 is
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,대량 수입
 DocType: Sales Partner,Address & Contacts,주소 및 연락처
 DocType: SMS Log,Sender Name,보낸 사람 이름
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,기준별로 정렬
 DocType: POS Profile,[Select],[선택]
 DocType: Vital Signs,Blood Pressure (diastolic),혈압 (확장기)
 DocType: SMS Log,Sent To,전송
@@ -2479,7 +2525,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,다음으로 연락 날짜는 과거가 될 수 없습니다
 DocType: Company,For Reference Only.,참조 용으로 만 사용됩니다.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},의사 {0}은 (는) {1}에서 사용할 수 없습니다.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,배치 번호 선택
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,배치 번호 선택
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},잘못된 {0} : {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,참조 인보이스
@@ -2495,15 +2541,15 @@
 DocType: Normal Test Items,Require Result Value,결과 값 필요
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,케이스 번호는 0이 될 수 없습니다
 DocType: Item,Show a slideshow at the top of the page,페이지의 상단에 슬라이드 쇼보기
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,BOM을
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,상점
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,BOM을
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,상점
 DocType: Project Type,Projects Manager,프로젝트 관리자
 DocType: Serial No,Delivery Time,배달 시간
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,을 바탕으로 고령화
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,예약 취소됨
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,예약 취소됨
 DocType: Item,End of Life,수명 종료
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,여행
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,지정된 날짜에 대해 직원 {0}에 대한 검색 활성 또는 기본 급여 구조 없다
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,여행
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,지정된 날짜에 대해 직원 {0}에 대한 검색 활성 또는 기본 급여 구조 없다
 DocType: Leave Block List,Allow Users,사용자에게 허용
 DocType: Purchase Order,Customer Mobile No,고객 모바일 없음
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,반복
@@ -2512,12 +2558,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,업데이트 비용
 DocType: Item Reorder,Item Reorder,항목 순서 바꾸기
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,쇼 급여 슬립
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,전송 자료
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,전송 자료
 DocType: Fees,Send Payment Request,지불 요청 보내기
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","운영, 운영 비용을 지정하고 작업에 고유 한 작업에게 더를 제공합니다."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,이 문서에 의해 제한을 초과 {0} {1} 항목 {4}. 당신은하고 있습니다 동일에 대한 또 다른 {3} {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,저장 한 후 반복 설정하십시오
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,선택 변화량 계정
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,선택 변화량 계정
 DocType: Purchase Invoice,Price List Currency,가격리스트 통화
 DocType: Naming Series,User must always select,사용자는 항상 선택해야합니다
 DocType: Stock Settings,Allow Negative Stock,음의 재고 허용
@@ -2537,7 +2583,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,종업원
 DocType: Sample Collection,Collected Time,수집 시간
 DocType: Company,Sales Monthly History,판매 월별 기록
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,배치 선택
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,배치 선택
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} 전액 지불되었습니다.
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,활력 징후
 DocType: Training Event,End Time,종료 시간
@@ -2545,16 +2591,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,지불 공제 또는 손실
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,판매 또는 구매를위한 표준 계약 조건.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,바우처 그룹
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,이 약속을 취소 하시겠습니까?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,판매 파이프 라인
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},급여 구성 요소에서 기본 계정을 설정하십시오 {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,필요에
 DocType: Rename Tool,File to Rename,이름 바꾸기 파일
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},행에 항목에 대한 BOM을 선택하세요 {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},행에 항목에 대한 BOM을 선택하세요 {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},계정 {0}이 (가) 계정 모드에서 회사 {1}과 (과) 일치하지 않습니다 : {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},상품에 대한 존재하지 않습니다 BOM {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,유지 보수 일정은 {0}이 판매 주문을 취소하기 전에 취소해야합니다
+DocType: POS Profile,Applicable for Users,사용자에게 적용 가능
 DocType: Notification Control,Expense Claim Approved,비용 청구 승인
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,직원의 급여 슬립은 {0} 이미이 기간 동안 생성
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,직원의 급여 슬립은 {0} 이미이 기간 동안 생성
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,제약
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,구입 한 항목의 비용
 DocType: Selling Settings,Sales Order Required,판매 주문 필수
@@ -2579,6 +2627,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,조직
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,조직
 DocType: BOM Update Tool,BOM Update Tool,BOM 업데이트 도구
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company",당사자 계정이 지정되지 않았습니다. 회사의 기본 당사자 계정을 설정하십시오.
 DocType: SG Creation Tool Course,Student Group Name,학생 그룹 이름
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,수수료 만들기
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,당신이 정말로이 회사에 대한 모든 트랜잭션을 삭제 하시겠습니까 확인하시기 바랍니다. 그대로 마스터 데이터는 유지됩니다. 이 작업은 취소 할 수 없습니다.
@@ -2587,29 +2636,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{3}  생산 주문시 {0} ({1}) 수량은 ({2})} 보다 클 수 없습니다.
 DocType: Shipping Rule,Shipping Rule Label,배송 규칙 라벨
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,사용자 포럼
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,원료는 비워 둘 수 없습니다.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","주식을 업데이트 할 수 없습니다, 송장은 하락 선박 항목이 포함되어 있습니다."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,원료는 비워 둘 수 없습니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","주식을 업데이트 할 수 없습니다, 송장은 하락 선박 항목이 포함되어 있습니다."
 DocType: Lab Test Sample,Lab Test Sample,실험실 테스트 샘플
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,빠른 분개
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM 어떤 항목 agianst 언급 한 경우는 속도를 변경할 수 없습니다
+DocType: Restaurant,Invoice Series Prefix,송장 시리즈 접두사
 DocType: Employee,Previous Work Experience,이전 작업 경험
 DocType: Stock Entry,For Quantity,수량
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},항목에 대한 계획 수량을 입력하십시오 {0} 행에서 {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},항목에 대한 계획 수량을 입력하십시오 {0} 행에서 {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} 제출되지 않았습니다.
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,상품에 대한 요청.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,별도의 생산 순서는 각 완제품 항목에 대해 작성됩니다.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} 반환 문서에 부정적인해야합니다
 ,Minutes to First Response for Issues,문제에 대한 첫 번째 응답에 분
 DocType: Purchase Invoice,Terms and Conditions1,약관 및 상태 인 경우 1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,연구소의 이름은 당신이 시스템을 설정하고 있습니다.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,연구소의 이름은 당신이 시스템을 설정하고 있습니다.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","회계 항목이 날짜까지 동결, 아무도 / 아래 지정된 역할을 제외하고 항목을 수정하지 않을 수 있습니다."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,유지 보수 일정을 생성하기 전에 문서를 저장하십시오
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,모든 BOM에서 최신 가격 업데이트
 DocType: Fee Schedule,Successful,성공한
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,프로젝트 상태
 DocType: UOM,Check this to disallow fractions. (for Nos),분수를 허용하려면이 옵션을 선택합니다. (NOS의 경우)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,다음 생산 오더가 생성했다 :
-DocType: Student Admission,Naming Series (for Student Applicant),시리즈 이름 지정 (학생 지원자의 경우)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,다음 생산 오더가 생성했다 :
+DocType: Student Admission Program,Naming Series (for Student Applicant),시리즈 이름 지정 (학생 지원자의 경우)
 DocType: Delivery Note,Transporter Name,트랜스 포터의 이름
 DocType: Authorization Rule,Authorized Value,공인 값
 DocType: BOM,Show Operations,보기 운영
@@ -2633,7 +2683,7 @@
 ,Employees working on a holiday,휴일에 일하는 직원
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,마크 선물
 DocType: Project,% Complete Method,완료율 방법
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,약
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,약
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},유지 보수 시작 날짜 일련 번호에 대한 배달 날짜 이전 할 수 없습니다 {0}
 DocType: Production Order,Actual End Date,실제 종료 날짜
 DocType: BOM,Operating Cost (Company Currency),운영 비용 (기업 통화)
@@ -2651,19 +2701,20 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,사용자가 승인하면 규칙에 적용 할 수있는 사용자로 동일 할 수 없습니다
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),기본 요금 (재고 UOM에 따라)
 DocType: SMS Log,No of Requested SMS,요청 SMS 없음
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,승인 된 휴가 신청 기록과 일치하지 않습니다 지불하지 않고 남겨주세요
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,승인 된 휴가 신청 기록과 일치하지 않습니다 지불하지 않고 남겨주세요
 DocType: Campaign,Campaign-.####,캠페인.# # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,다음 단계
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,최상의 요금으로 지정된 항목을 제공하십시오
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,송장 생성
 DocType: Selling Settings,Auto close Opportunity after 15 days,15 일이 경과되면 자동 가까운 기회
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,스코어 카드가 {1} (으)로 인해 구매 주문이 {0}에 허용되지 않습니다.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,스코어 카드가 {1} (으)로 인해 구매 주문이 {0}에 허용되지 않습니다.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,최종 년도
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,따옴표 / 리드 %
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,계약 종료 날짜는 가입 날짜보다 커야합니다
 DocType: Vital Signs,Nutrition Values,영양가
 DocType: Lab Test Template,Is billable,청구 가능
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Dr {0}에 대해 &quot;Physician Schedule&quot;과 &quot;Appointment Time&quot;을 모두 설정해야합니다.
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,수수료에 대한 회사의 제품을 판매하는 타사 대리점 / 딜러 /위원회 에이전트 / 제휴 / 대리점.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} 구매 주문에 대한 {1}
 DocType: Patient,Patient Demographics,환자 인구 통계
@@ -2713,7 +2764,6 @@
  10.추가 공제 : 추가하거나 세금을 공제할지 여부를 선택합니다."
 DocType: Homepage,Homepage,홈페이지
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,의사 선택 ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',업데이트 tabConsultation 인보이스 = &#39;{0}&#39;여기서 name = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd 수량
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},요금 기록 작성 - {0}
 DocType: Asset Category Account,Asset Category Account,자산 분류 계정
@@ -2725,7 +2775,7 @@
 DocType: Asset,Manual,조작
 DocType: Salary Component Account,Salary Component Account,급여 구성 요소 계정
 DocType: Global Defaults,Hide Currency Symbol,통화 기호에게 숨기기
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","예) 은행, 현금, 신용 카드"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","예) 은행, 현금, 신용 카드"
 DocType: Lead Source,Source Name,원본 이름
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""",성인의 정상적인 휴식 혈압은 수축기 약 120 mmHg이고 이완기 혈압은 80 mmHg ( &quot;120/80 mmHg&quot;
 DocType: Journal Entry,Credit Note,신용 주
@@ -2744,16 +2794,16 @@
 DocType: Patient,Occupation,직업
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,행 {0} : 시작 날짜가 종료 날짜 이전이어야합니다
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),합계 (수량)
-DocType: Sales Invoice,This Document,이 문서
 DocType: Installation Note Item,Installed Qty,설치 수량
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,이는 이메일 주소의 일부 잘못된 이메일 주소 때문일 수 있습니다.
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,당신이 추가했습니다.
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,교육 결과
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,교육 결과
 DocType: Purchase Invoice,Is Paid,지급
 DocType: Salary Structure,Total Earning,총 적립
 DocType: Purchase Receipt,Time at which materials were received,재료가 수신 된 시간입니다
 DocType: Stock Ledger Entry,Outgoing Rate,보내는 속도
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,조직 분기의 마스터.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,조직 분기의 마스터.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,또는
 DocType: Sales Order,Billing Status,결제 상태
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,문제 신고
@@ -2768,8 +2818,9 @@
 DocType: Notification Control,Sales Order Message,판매 주문 메시지
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","기타 회사, 통화, 당해 사업 연도와 같은 기본값을 설정"
 DocType: Payment Entry,Payment Type,지불 유형
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,{0} 항목에 대한 배치를 선택하십시오. 이 요구 사항을 충족하는 단일 배치를 찾을 수 없습니다.
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,{0} 항목에 대한 배치를 선택하십시오. 이 요구 사항을 충족하는 단일 배치를 찾을 수 없습니다.
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,{0} 항목에 대한 배치를 선택하십시오. 이 요구 사항을 충족하는 단일 배치를 찾을 수 없습니다.
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,{0} 항목에 대한 배치를 선택하십시오. 이 요구 사항을 충족하는 단일 배치를 찾을 수 없습니다.
+DocType: Hub Category,Parent Category,상위 카테고리
 DocType: Process Payroll,Select Employees,직원 선택
 DocType: Opportunity,Potential Sales Deal,잠재적 인 판매 거래
 DocType: Complaint,Complaints,불평
@@ -2807,7 +2858,7 @@
 DocType: Bin,Reserved Quantity,예약 주문
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,유효한 이메일 주소를 입력하십시오.
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,올바른 이메일 주소를 입력하십시오.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,장바구니에서 항목을 선택하십시오.
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,장바구니에서 항목을 선택하십시오.
 DocType: Landed Cost Voucher,Purchase Receipt Items,구매 영수증 항목
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,사용자 정의 양식
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,지체
@@ -2817,15 +2868,15 @@
 DocType: Payment Request,Amount in customer's currency,고객의 통화 금액
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,배달
 DocType: Stock Reconciliation Item,Current Qty,현재 수량
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,공급 업체 추가
+DocType: Restaurant Menu,Restaurant Menu,식당 메뉴
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,예전
 DocType: Appraisal Goal,Key Responsibility Area,주요 책임 지역
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","학생 배치는 학생에 대한 출석, 평가 및 비용을 추적하는 데 도움이"
 DocType: Payment Entry,Total Allocated Amount,총 할당 된 금액
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,영구 인벤토리에 대한 기본 재고 계정 설정
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,영구 인벤토리에 대한 기본 재고 계정 설정
 DocType: Item Reorder,Material Request Type,자료 요청 유형
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},{0}에에서 급여에 대한 Accural 분개 {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","로컬 저장이 가득, 저장하지 않은"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","로컬 저장이 가득, 저장하지 않은"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,행 {0} : UOM 변환 계수는 필수입니다
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,객실 용량
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,참조
@@ -2864,16 +2915,18 @@
 DocType: Project,Task Completion,작업 완료
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,재고에
 DocType: Appraisal,HR User,HR 사용자
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,차감 세금과 요금
-apps/erpnext/erpnext/hooks.py +129,Issues,문제
+apps/erpnext/erpnext/hooks.py +138,Issues,문제
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},상태 중 하나 여야합니다 {0}
 DocType: Sales Invoice,Debit To,To 직불
+DocType: Restaurant Menu Item,Restaurant Menu Item,식당 메뉴 항목
 DocType: Delivery Note,Required only for sample item.,단지 샘플 항목에 필요합니다.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,거래 후 실제 수량
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},사이 찾지 급여 슬립하지 {0}과 {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},사이 찾지 급여 슬립하지 {0}과 {1}
 ,Pending SO Items For Purchase Request,구매 요청에 대한 SO 항목 보류
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,학생 입학
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} 비활성화
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,학생 입학
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} 비활성화
 DocType: Supplier,Billing Currency,결제 통화
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,아주 큰
@@ -2896,6 +2949,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,언급 해주십시오 필요한 방문 없음
 DocType: Stock Settings,Default Valuation Method,기본 평가 방법
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,보수
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,진행중인 업데이트. 시간이 좀 걸릴 수 있습니다.
 DocType: Vehicle Log,Fuel Qty,연료 수량
 DocType: Production Order Operation,Planned Start Time,계획 시작 시간
 DocType: Course,Assessment,평가
@@ -2911,7 +2965,7 @@
 DocType: Price List,Price List Master,가격 목록 마스터
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,당신이 설정 한 목표를 모니터링 할 수 있도록 모든 판매 트랜잭션은 여러 ** 판매 사람 **에 태그 할 수 있습니다.
 ,S.O. No.,SO 번호
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},리드에서 고객을 생성 해주세요 {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},리드에서 고객을 생성 해주세요 {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,환자 선택
 DocType: Price List,Applicable for Countries,국가에 대한 적용
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,매개 변수 이름
@@ -2955,27 +3009,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,비용 / 차이 계정 ({0})의 이익 또는 손실 '계정이어야합니다
 DocType: Project,Copied From,에서 복사 됨
 DocType: Project,Copied From,에서 복사 됨
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},이름 오류 : {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,부족
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},이름 오류 : {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,부족
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1}과 연관되지 않는 {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,직원의 출석 {0}이 (가) 이미 표시되어
 DocType: Packing Slip,If more than one package of the same type (for print),만약 (프린트) 동일한 유형의 하나 이상의 패키지
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,레스토랑 설정에서 기본 고객을 설정하십시오.
 ,Salary Register,연봉 회원 가입
 DocType: Warehouse,Parent Warehouse,부모 창고
 DocType: C-Form Invoice Detail,Net Total,합계액
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},항목 {0} 및 프로젝트 {1}에 대한 기본 BOM을 찾을 수 없습니다
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},항목 {0} 및 프로젝트 {1}에 대한 기본 BOM을 찾을 수 없습니다
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,다양한 대출 유형을 정의
 DocType: Bin,FCFS Rate,FCFS 평가
 DocType: Payment Reconciliation Invoice,Outstanding Amount,잔액
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),(분에) 시간
 DocType: Project Task,Working,인식 중
 DocType: Stock Ledger Entry,Stock Queue (FIFO),재고 큐 (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,회계 연도
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,회계 연도
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} 회사에 속하지 않는 {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,{0}에 대한 기준 점수 기능을 해결할 수 없습니다. 수식이 유효한지 확인하십시오.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,등의 비용
 DocType: Healthcare Settings,Out Patient Settings,환자 설정
 DocType: Account,Round Off,에누리
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,수량은 양수 여야합니다.
 ,Requested Qty,요청 수량
 DocType: Tax Rule,Use for Shopping Cart,쇼핑 카트에 사용
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},값은 {0} 속성에 대한 {1} 항목에 대한 속성 값 유효한 항목 목록에 존재하지 않는 {2}
@@ -2984,7 +3040,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","요금은 비례 적으로 사용자의 선택에 따라, 상품 수량 또는 금액에 따라 배포됩니다"
 DocType: Maintenance Visit,Purposes,목적
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,이어야 하나의 항목이 반환 문서에 부정적인 수량 입력해야합니다
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,코스 추가
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","작업 {0} 워크 스테이션에서 사용 가능한 근무 시간 이상 {1}, 여러 작업으로 작업을 분해"
 ,Requested,요청
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,없음 비고
@@ -2996,6 +3051,8 @@
 DocType: Employee Loan,Repaid/Closed,/ 상환 휴무
 DocType: Item,Total Projected Qty,총 예상 수량
 DocType: Monthly Distribution,Distribution Name,배포 이름
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",{1} {2}에 대한 계정 항목을 수행해야하는 항목 {0}에 대한 평가율이 없습니다. 항목이 {1}의 0 평가 항목으로 거래중인 경우 {1} 항목 테이블에 언급하십시오. 그렇지 않은 경우 항목에 대한 재고 트랜잭션을 생성하거나 항목 레코드에 평가율을 언급 한 다음이 항목을 제출 / 취소하십시오.
 DocType: Course,Course Code,코스 코드
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},상품에 필요한 품질 검사 {0}
 DocType: POS Settings,Use POS in Offline Mode,오프라인 모드에서 POS 사용
@@ -3006,14 +3063,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,지역의 나무를 관리합니다.
 DocType: Journal Entry Account,Sales Invoice,판매 송장
 DocType: Journal Entry Account,Party Balance,파티 밸런스
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,할인에 적용을 선택하세요
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,할인에 적용을 선택하세요
 DocType: Company,Default Receivable Account,기본 채권 계정
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,위의 선택 기준에 대해 지불 한 총 연봉 은행 항목 만들기
 DocType: Physician,Physician Schedule,의사 스케줄
 DocType: Purchase Invoice,Deemed Export,간주 수출
 DocType: Stock Entry,Material Transfer for Manufacture,제조에 대한 자료 전송
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,할인 비율은 가격 목록에 대해 또는 전체 가격 목록에 하나를 적용 할 수 있습니다.
-DocType: Purchase Invoice,Half-yearly,반년마다
+DocType: Subscription,Half-yearly,반년마다
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,재고에 대한 회계 항목
 DocType: Lab Test,LabTest Approver,LabTest 승인자
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,이미 평가 기준 {}을 (를) 평가했습니다.
@@ -3042,13 +3099,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,매우 작은
 DocType: Company,Standard Template,표준 템플릿
 DocType: Training Event,Theory,이론
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,경고 : 수량 요청 된 자료는 최소 주문 수량보다 적은
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,경고 : 수량 요청 된 자료는 최소 주문 수량보다 적은
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,계정 {0} 동결
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,조직에 속한 계정의 별도의 차트와 법인 / 자회사.
 DocType: Payment Request,Mute Email,음소거 이메일
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","음식, 음료 및 담배"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},단지에 대한 지불을 할 수 미 청구 {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,수수료율은 100보다 큰 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},단지에 대한 지불을 할 수 미 청구 {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,수수료율은 100보다 큰 수 없습니다
 DocType: Stock Entry,Subcontract,하청
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,첫 번째 {0}을 입력하세요
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,에서 아무 응답 없음
@@ -3066,10 +3123,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,컬러
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,평가 계획 기준
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,구매 주문 방지
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,느끼기 쉬운
 DocType: Patient Appointment,Scheduled,예약된
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,견적 요청.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,인력&gt; 인사말 설정에서 Employee Naming System을 설정하십시오.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",&quot;아니오&quot;와 &quot;판매 상품은&quot; &quot;주식의 항목으로&quot;여기서 &quot;예&quot;인 항목을 선택하고 다른 제품 번들이없는하세요
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,고객 선택
 DocType: Student Log,Academic,학생
 DocType: Patient,Personal and Social History,개인 및 사회 역사
 DocType: Fee Schedule,Fee Breakup for each student,각 학생에 대한 비용 해체
@@ -3079,7 +3137,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,평가 평가
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,디젤
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,가격리스트 통화 선택하지
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,가격리스트 통화 선택하지
 apps/erpnext/erpnext/config/healthcare.py +46,Results,결과
 ,Student Monthly Attendance Sheet,학생 월별 출석 시트
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},직원 {0}이 (가) 이미 사이에 {1}를 신청했다 {2}와 {3}
@@ -3095,7 +3153,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,판매 파트너를 관리합니다.
 DocType: Quality Inspection,Inspection Type,검사 유형
 DocType: Fee Validity,Visited yet,아직 방문하지 않았습니다.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,기존 거래와 창고 그룹으로 변환 할 수 없습니다.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,기존 거래와 창고 그룹으로 변환 할 수 없습니다.
 DocType: Assessment Result Tool,Result HTML,결과 HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,에 만료
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,학생들 추가
@@ -3122,7 +3180,7 @@
 DocType: Healthcare Settings,Result Printed,결과 인쇄 됨
 DocType: Asset Category Account,Depreciation Expense Account,감가 상각 비용 계정
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,수습 기간
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},보기 {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},보기 {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,만 잎 노드는 트랜잭션에 허용
 DocType: Expense Claim,Expense Approver,지출 승인
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,행 {0} : 고객에 대한 사전 신용해야합니다
@@ -3134,7 +3192,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,날짜 시간에
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,코스 스케줄 삭제 :
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,SMS 전달 상태를 유지하기위한 로그
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,판매 목표 설정
 DocType: Accounts Settings,Make Payment via Journal Entry,분개를 통해 결제하기
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,인쇄에
 DocType: Item,Inspection Required before Delivery,검사 배달 전에 필수
@@ -3142,7 +3199,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,보류 활동
 DocType: Patient Appointment,Reminded,생각 나게하다
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,조직
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,조직
 DocType: Fee Component,Fees Category,요금 종류
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,날짜를 덜어 입력 해 주시기 바랍니다.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
@@ -3154,7 +3211,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,재정렬 수준
 DocType: Company,Chart Of Accounts Template,계정 템플릿의 차트
 DocType: Attendance,Attendance Date,출석 날짜
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},상품 가격은 {0}에서 가격 목록 업데이트 {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},상품 가격은 {0}에서 가격 목록 업데이트 {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,급여 이별은 적립 및 차감에 따라.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,자식 노드와 계정 원장으로 변환 할 수 없습니다
 DocType: Purchase Invoice Item,Accepted Warehouse,허용 창고
@@ -3170,9 +3227,10 @@
 ,Employee Birthday,직원 생일
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,학생 배치 출석 도구
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,한계를 넘어
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,예정된 개까지
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,벤처 캐피탈
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,이 &#39;학년&#39;과 학술 용어는 {0}과 &#39;기간 이름&#39;{1} 이미 존재합니다. 이 항목을 수정하고 다시 시도하십시오.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","항목 {0}에 대한 기존의 트랜잭션이, 당신은의 값을 변경할 수 없습니다 {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","항목 {0}에 대한 기존의 트랜잭션이, 당신은의 값을 변경할 수 없습니다 {1}"
 DocType: UOM,Must be Whole Number,전체 숫자 여야합니다
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(일) 할당 된 새로운 잎
 DocType: Purchase Invoice,Invoice Copy,송장 사본
@@ -3182,7 +3240,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,송장 번호
 DocType: Shopping Cart Settings,Orders,명령
 DocType: Employee Leave Approver,Leave Approver,승인자를 남겨
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,일괄 처리를 선택하십시오.
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,일괄 처리를 선택하십시오.
 DocType: Assessment Group,Assessment Group Name,평가 그룹 이름
 DocType: Manufacturing Settings,Material Transferred for Manufacture,재료 제조에 양도
 DocType: Expense Claim,"A user with ""Expense Approver"" role","""비용 승인자""역할이있는 사용자"
@@ -3197,7 +3255,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,기간 결산 항목
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,부서 선택 ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,기존의 트랜잭션 비용 센터는 그룹으로 변환 할 수 없습니다
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},양 {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},양 {0} {1} {2} {3}
 DocType: Account,Depreciation,감가 상각
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),공급 업체 (들)
 DocType: Employee Attendance Tool,Employee Attendance Tool,직원의 출석 도구
@@ -3209,10 +3267,12 @@
 DocType: GL Entry,Voucher No,바우처 없음
 ,Lead Owner Efficiency,리드 소유자 효율성
 ,Lead Owner Efficiency,리드 소유자 효율성
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,가장 인기 많은
 DocType: Leave Allocation,Leave Allocation,휴가 배정
 DocType: Payment Request,Recipient Message And Payment Details,받는 사람의 메시지와 지불 세부 사항
 DocType: Training Event,Trainer Email,트레이너 이메일
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,자료 요청 {0} 생성
+DocType: Restaurant Reservation,No of People,사람들의 수
 DocType: Production Planning Tool,Include sub-contracted raw materials,하청 원료를 포함
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,조건 또는 계약의 템플릿.
 DocType: Purchase Invoice,Address and Contact,주소와 연락처
@@ -3221,10 +3281,11 @@
 DocType: Supplier,Last Day of the Next Month,다음 달의 마지막 날
 DocType: Support Settings,Auto close Issue after 7 days,칠일 후 자동으로 닫 문제
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","이전에 할당 할 수없는 남기기 {0}, 휴가 균형이 이미 반입 전달 미래 휴가 할당 기록되었습니다로 {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),참고 : 지원 / 참조 날짜가 {0} 일에 의해 허용 된 고객의 신용 일을 초과 (들)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),참고 : 지원 / 참조 날짜가 {0} 일에 의해 허용 된 고객의 신용 일을 초과 (들)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,학생 신청자
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,수취인 본래
 DocType: Asset Category Account,Accumulated Depreciation Account,누적 감가 상각 계정
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,이 이메일은 자동 생성되었습니다.
 DocType: Stock Settings,Freeze Stock Entries,동결 재고 항목
 DocType: Program Enrollment,Boarding Student,기숙 학생
 DocType: Asset,Expected Value After Useful Life,내용 연수 후 예상 값
@@ -3232,7 +3293,7 @@
 DocType: Activity Cost,Billing Rate,결제 비율
 ,Qty to Deliver,제공하는 수량
 ,Stock Analytics,재고 분석
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,작업은 비워 둘 수 없습니다
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,작업은 비워 둘 수 없습니다
 DocType: Maintenance Visit Purpose,Against Document Detail No,문서의 세부 사항에 대한 없음
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,파티의 종류는 필수입니다
 DocType: Quality Inspection,Outgoing,발신
@@ -3255,7 +3316,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,활동 기반 그룹을 위해 학생들을 수동으로 선택하십시오.
 DocType: Journal Entry,User Remark,사용자 비고
 DocType: Lead,Market Segment,시장 세분
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},지불 금액은 총 음의 뛰어난 금액보다 클 수 없습니다 {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},지불 금액은 총 음의 뛰어난 금액보다 클 수 없습니다 {0}
 DocType: Supplier Scorecard Period,Variables,변수
 DocType: Employee Internal Work History,Employee Internal Work History,직원 내부 작업 기록
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),결산 (박사)
@@ -3285,21 +3346,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,업데이트 받기
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1} 계정 {2} 회사에 속하지 않는 {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,자료 요청 {0} 취소 또는 정지
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,관리를 남겨주세요
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,관리를 남겨주세요
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,계정별 그룹
 DocType: Sales Order,Fully Delivered,완전 배달
 DocType: Lead,Lower Income,낮은 소득
+DocType: Restaurant Order Entry,Current Order,현재 주문
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},소스와 목표웨어 하우스는 행에 대해 동일 할 수 없습니다 {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","콘텐츠 화해는 열기 항목이기 때문에 차이 계정, 자산 / 부채 형 계정이어야합니다"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},지급 금액은 대출 금액보다 클 수 없습니다 {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,프로그램으로 이동
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},구매 주문 번호 항목에 필요한 {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,생산 주문이 작성되지
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,생산 주문이 작성되지
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','시작일자'는  '마감일자' 이전이어야 합니다
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},학생으로 상태를 변경할 수 없습니다 {0} 학생 응용 프로그램과 연결되어 {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},학생으로 상태를 변경할 수 없습니다 {0} 학생 응용 프로그램과 연결되어 {1}
 DocType: Asset,Fully Depreciated,완전 상각
 ,Stock Projected Qty,재고 수량을 예상
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},고객 {0} 프로젝트에 속하지 않는 {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},고객 {0} 프로젝트에 속하지 않는 {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,표시된 출석 HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","견적, 당신은 당신의 고객에게 보낸 입찰 제안서 있습니다"
 DocType: Sales Order,Customer's Purchase Order,고객의 구매 주문
@@ -3310,8 +3372,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,감가 상각 수 예약을 설정하십시오
 DocType: Supplier Scorecard Period,Calculations,계산
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,값 또는 수량
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,생산 주문을 사육 할 수 없습니다
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,생산 주문을 사육 할 수 없습니다
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,분
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,설정&gt; 설정&gt; 이름 지정 시리즈를 통해 이름 지정 시리즈를 {0}으로 설정하십시오.
 DocType: Purchase Invoice,Purchase Taxes and Charges,구매 세금과 요금
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,공급 업체로 이동
 ,Qty to Receive,받도록 수량
@@ -3325,7 +3388,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,계정에 신용은 대차 대조표 계정이어야합니다
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,모든 공급 유형
 DocType: Global Defaults,Disable In Words,단어에서 해제
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,항목이 자동으로 번호가되어 있지 않기 때문에 상품 코드는 필수입니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,항목이 자동으로 번호가되어 있지 않기 때문에 상품 코드는 필수입니다
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},견적 {0}은 유형 {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,유지 보수 일정 상품
 DocType: Sales Order,%  Delivered,% 배달
@@ -3347,23 +3410,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,잔액 지분
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,엔
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,화해
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,남은
 DocType: Appraisal,Appraisal,펑가
 DocType: Purchase Invoice,GST Details,GST 세부 정보
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},공급 업체에 보낸 이메일 {0}
+DocType: Item,Default Sales Unit of Measure,기본 판매 단위
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,날짜는 반복된다
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,공인 서명자
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},남겨 승인 중 하나 여야합니다 {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,수수료 생성
-DocType: Hub Settings,Seller Email,판매자 이메일
 DocType: Project,Total Purchase Cost (via Purchase Invoice),총 구매 비용 (구매 송장을 통해)
 DocType: Training Event,Start Time,시작 시간
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,수량 선택
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,수량 선택
 DocType: Customs Tariff Number,Customs Tariff Number,관세 번호
 DocType: Patient Appointment,Patient Appointment,환자 예약
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,역할을 승인하면 규칙이 적용됩니다 역할로 동일 할 수 없습니다
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,이 이메일 다이제스트 수신 거부
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,이 이메일 다이제스트 수신 거부
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,공급자 제공
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{1} 항목에 대해 {0}을 (를) 찾을 수 없습니다.
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,코스로 이동
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,보낸 메시지
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,자식 노드와 계좌 원장은로 설정 될 수 없다
@@ -3376,11 +3442,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,재료 제조에 대한 양도
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,계정 {0}이 존재하지 않습니다
 DocType: Project,Project Type,프로젝트 형식
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,이 작업에 대한 하위 작업이 있습니다. 이 작업은 삭제할 수 없습니다.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,목표 수량 또는 목표량 하나는 필수입니다.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,다양한 활동 비용
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,결과가 더 이상 없음
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,다양한 활동 비용
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","에 이벤트를 설정 {0}, 판매 사람 아래에 부착 된 직원이 사용자 ID를 가지고 있지 않기 때문에 {1}"
 DocType: Timesheet,Billing Details,결제 세부 정보
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,소스 및 대상웨어 하우스는 달라야합니다
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,소스 및 대상웨어 하우스는 달라야합니다
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},이상 재고 거래는 이전 업데이트 할 수 없습니다 {0}
 DocType: Purchase Invoice Item,PR Detail,PR의 세부 사항
 DocType: Sales Order,Fully Billed,완전 청구
@@ -3407,7 +3475,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,송금
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,모두 확인
 DocType: Vehicle Log,Invoice Ref,송장 참조
-DocType: Purchase Order,Recurring Order,반복 주문
 DocType: Company,Default Income Account,기본 수입 계정
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,고객 그룹 / 고객
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),닫히지 않은 회계 연도 이익 / 손실 (신용)
@@ -3421,9 +3488,9 @@
 DocType: Patient,A Negative,부정적인
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,더 아무것도 표시가 없습니다.
 DocType: Lead,From Customer,고객의
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,통화
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,통화
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,제품
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,배치
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,배치
 DocType: Project,Total Costing Amount (via Time Logs),총 원가 계산 금액 (시간 로그를 통해)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,요금표 만들기
 DocType: Purchase Order Item Supplied,Stock UOM,재고 UOM
@@ -3448,7 +3515,7 @@
 DocType: School Settings,Current Academic Term,현재 학기
 DocType: School Settings,Current Academic Term,현재 학기
 DocType: Sales Order,Not Billed,청구되지 않음
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,두 창고는 같은 회사에 속해 있어야합니다
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,두 창고는 같은 회사에 속해 있어야합니다
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,주소록은 아직 추가되지 않습니다.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,착륙 비용 바우처 금액
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,공급 업체에 의해 제기 된 지폐입니다.
@@ -3457,7 +3524,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,할인 금액
 DocType: Purchase Invoice,Return Against Purchase Invoice,에 대하여 구매 송장을 돌려줍니다
 DocType: Item,Warranty Period (in days),(일) 보증 기간
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',update &#39;tabPatient Appointment` set sales_invoice =&#39;{0} &#39;여기서 name =&#39;{1} &#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Guardian1와의 관계
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,조작에서 순 현금
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,항목 4
@@ -3466,8 +3532,8 @@
 DocType: Journal Entry Account,Journal Entry Account,분개 계정
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,학생 그룹
 DocType: Shopping Cart Settings,Quotation Series,견적 시리즈
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",항목 ({0}) 항목의 그룹 이름을 변경하거나 항목의 이름을 변경하시기 바랍니다 같은 이름을 가진
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,고객을 선택하세요
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item",항목 ({0}) 항목의 그룹 이름을 변경하거나 항목의 이름을 변경하시기 바랍니다 같은 이름을 가진
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,고객을 선택하세요
 DocType: C-Form,I,나는
 DocType: Company,Asset Depreciation Cost Center,자산 감가 상각 비용 센터
 DocType: Sales Order Item,Sales Order Date,판매 주문 날짜
@@ -3476,6 +3542,7 @@
 DocType: Assessment Plan,Assessment Plan,평가 계획
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,고객 {0}이 (가) 생성되었습니다.
 DocType: Stock Settings,Limit Percent,제한 비율
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,현재 어떤 창고에서도 재고가 없습니다.
 ,Payment Period Based On Invoice Date,송장의 날짜를 기준으로 납부 기간
 DocType: Sample Collection,No. of print,인쇄 매수
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},대한 누락 된 통화 환율 {0}
@@ -3531,13 +3598,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,총 급여 - 총 공제 - 대출 상환
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,현재 BOM 및 새로운 BOM은 동일 할 수 없습니다
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,급여 슬립 ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,급여 슬립 ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,은퇴 날짜 가입 날짜보다 커야합니다
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,에 코스를 예약하는 동안 오류가 발생했습니다 :
 DocType: Sales Invoice,Against Income Account,손익 계정에 대한
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0} % 배달
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,항목 {0} : 정렬 된 수량은 {1} 최소 주문 수량 {2} (항목에 정의)보다 작을 수 없습니다.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,항목 {0} : 정렬 된 수량은 {1} 최소 주문 수량 {2} (항목에 정의)보다 작을 수 없습니다.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,월별 분포 비율
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,다른 사용자로 로그인하십시오.
 DocType: Territory,Territory Targets,지역 대상
 DocType: Delivery Note,Transporter Info,트랜스 정보
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},회사의 기본 {0}을 설정하십시오 {1}
@@ -3545,13 +3613,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,동일한 공급자는 여러 번 입력 된
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,총 이익 / 손실
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,구매 주문 상품 공급
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,회사 이름은 회사가 될 수 없습니다
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,회사 이름은 회사가 될 수 없습니다
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,인쇄 템플릿에 대한 편지 머리.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,인쇄 템플릿의 제목은 형식 상 청구서를 예.
 DocType: Program Enrollment,Walking,보행
 DocType: Student Guardian,Student Guardian,가디언
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,평가 유형 요금은 포괄적으로 표시 할 수 없습니다
 DocType: POS Profile,Update Stock,재고 업데이트
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,구독 정보
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,항목에 대해 서로 다른 UOM가 잘못 (총) 순 중량 값으로 이어질 것입니다.각 항목의 순 중량이 동일한 UOM에 있는지 확인하십시오.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM 평가
 DocType: Asset,Journal Entry for Scrap,스크랩에 대한 분개
@@ -3601,15 +3670,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","시스템 사용자 (로그인) ID. 설정하면, 모든 HR 양식의 기본이 될 것입니다."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}에서 {1}
 DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,모든 BOM에서 최신 가격 업데이트 대기. 몇 분이 소요될 수 있습니다.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,모든 BOM에서 최신 가격 업데이트 대기. 몇 분이 소요될 수 있습니다.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,새로운 계정의 이름입니다. 참고 : 고객 및 공급 업체에 대한 계정을 생성하지 마십시오
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,국가 현명한 기본 주소 템플릿
 DocType: Sales Order Item,Supplier delivers to Customer,공급자는 고객에게 제공
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# 양식 / 상품 / {0}) 품절
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},때문에 / 참조 날짜 이후 수 없습니다 {0}
+,Sales Payment Summary,판매 대금 지급 요약
+DocType: Restaurant,Restaurant,레스토랑
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},때문에 / 참조 날짜 이후 수 없습니다 {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,데이터 가져 오기 및 내보내기
 DocType: Patient,Account Details,합계좌 세부사항
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,어떤 학생들은 찾을 수 없음
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,어떤 학생들은 찾을 수 없음
 DocType: Medical Department,Medical Department,의료부
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,공급 업체 성과표 채점 기준
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,송장 전기 일
@@ -3620,8 +3691,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,파티를 선택하기 전에 게시 날짜를 선택하세요
 DocType: Program Enrollment,School House,학교 하우스
 DocType: Serial No,Out of AMC,AMC의 아웃
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,견적을 선택하십시오
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,견적을 선택하십시오
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,견적을 선택하십시오
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,견적을 선택하십시오
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,예약 감가 상각의 수는 감가 상각의 총 수보다 클 수 없습니다
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,유지 보수 방문을합니다
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,판매 마스터 관리자 {0} 역할이 사용자에게 문의하시기 바랍니다
@@ -3629,7 +3700,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,회사 (안 고객 또는 공급 업체) 마스터.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,이이 학생의 출석을 기반으로
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,학생 없음
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,더 많은 항목 또는 완전 개방 형태로 추가
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,더 많은 항목 또는 완전 개방 형태로 추가
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,배달 노트는 {0}이 판매 주문을 취소하기 전에 취소해야합니다
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,사용자 이동
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,지불 금액 + 금액 오프 쓰기 총합보다 클 수 없습니다
@@ -3649,37 +3720,40 @@
 DocType: Fee Schedule,Fee Schedule,요금 일정
 DocType: Hub Settings,Publish Availability,가용성을 게시
 DocType: Company,Create Chart Of Accounts Based On,계정 기반에서의 차트 만들기
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,그룹화되지 않은 그룹으로 변환 할 수 없습니다. 하위 작업이 있습니다.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,생년월일은 오늘보다 미래일 수 없습니다.
 ,Stock Ageing,재고 고령화
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},학생 {0} 학생 신청자에 존재 {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),반올림 조정 (회사 통화)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,출퇴근 시간 기록 용지
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,출퇴근 시간 기록 용지
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' 사용할 수 없습니다.
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,열기로 설정
 DocType: Cheque Print Template,Scanned Cheque,스캔 한 수표
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,제출 거래에 연락처에 자동으로 이메일을 보내십시오.
 DocType: Timesheet,Total Billable Amount,총 청구 금액
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,항목 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,주문 입력
 DocType: Purchase Order,Customer Contact Email,고객 연락처 이메일
 DocType: Warranty Claim,Item and Warranty Details,상품 및 보증의 자세한 사항
 DocType: Sales Team,Contribution (%),기여도 (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,참고 : 결제 항목이 '현금 또는 은행 계좌'이 지정되지 않았기 때문에 생성되지 않습니다
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,프로젝트 {0}이 (가) 이미 있습니다.
 DocType: Medical Department,Nursing User,간호 사용자
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,책임
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,이 견적의 유효 기간이 종료되었습니다.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,이 견적의 유효 기간이 종료되었습니다.
 DocType: Expense Claim Account,Expense Claim Account,경비 청구서 계정
 DocType: Accounts Settings,Allow Stale Exchange Rates,부실 환율 허용
 DocType: Sales Person,Sales Person Name,영업 사원명
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,표에이어야 1 송장을 입력하십시오
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,사용자 추가
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,사용자 추가
 DocType: POS Item Group,Item Group,항목 그룹
 DocType: Item,Safety Stock,안전 재고
 DocType: Healthcare Settings,Healthcare Settings,건강 관리 설정
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,작업에 대한 진행 상황 % 이상 100 수 없습니다.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,작업에 대한 진행 상황 % 이상 100 수 없습니다.
 DocType: Stock Reconciliation Item,Before reconciliation,계정조정전
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},에 {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),추가 세금 및 수수료 (회사 통화)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,상품 세금 행 {0} 유형의 세금 또는 수입 비용 또는 청구의 계정이 있어야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,상품 세금 행 {0} 유형의 세금 또는 수입 비용 또는 청구의 계정이 있어야합니다
 DocType: Sales Order,Partly Billed,일부 청구
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,항목 {0} 고정 자산 항목이어야합니다
 DocType: Item,Default BOM,기본 BOM
@@ -3695,6 +3769,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,변하기 쉬운
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,배달 주에서
 DocType: Student,Student Email Address,학생 이메일 주소
+DocType: Item,Hub Warehouse,허브 창고
 DocType: Physician Schedule Time Slot,From Time,시간에서
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,재고:
 DocType: Notification Control,Custom Message,사용자 지정 메시지
@@ -3703,9 +3778,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,학생 주소
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,학생 주소
 DocType: Purchase Invoice,Price List Exchange Rate,가격 기준 환율
+DocType: POS Profile,POS Profile Name,POS 프로필 이름
 DocType: Purchase Invoice Item,Rate,비율
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,인턴
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,주소 명
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,주소 명
 DocType: Stock Entry,From BOM,BOM에서
 DocType: Assessment Code,Assessment Code,평가 코드
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,기본
@@ -3719,11 +3795,12 @@
 DocType: Salary Slip,Salary Structure,급여 체계
 DocType: Account,Bank,은행
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,항공 회사
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,문제의 소재
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,문제의 소재
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,되풀이를 만드는 동안 오류가 발생했습니다.
 DocType: Material Request Item,For Warehouse,웨어 하우스
 DocType: Employee,Offer Date,제공 날짜
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,견적
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,당신은 오프라인 모드에 있습니다. 당신은 당신이 네트워크를 때까지 다시로드 할 수 없습니다.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,당신은 오프라인 모드에 있습니다. 당신은 당신이 네트워크를 때까지 다시로드 할 수 없습니다.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,어떤 학생 그룹이 생성되지 않습니다.
 DocType: Purchase Invoice Item,Serial No,일련 번호
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,월별 상환 금액은 대출 금액보다 클 수 없습니다
@@ -3733,17 +3810,18 @@
 DocType: Salary Slip,Total Working Hours,총 근로 시간
 DocType: Subscription,Next Schedule Date,다음 일정 날짜
 DocType: Stock Entry,Including items for sub assemblies,서브 어셈블리에 대한 항목을 포함
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,입력 값은 양수 여야합니다
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,모든 국가
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,입력 값은 양수 여야합니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,모든 국가
 DocType: Purchase Invoice,Items,아이템
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,학생이 이미 등록되어 있습니다.
 DocType: Fiscal Year,Year Name,올해의 이름
 DocType: Process Payroll,Process Payroll,프로세스 급여
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,이번 달 작업 일 이상 휴일이 있습니다.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,이번 달 작업 일 이상 휴일이 있습니다.
 DocType: Product Bundle Item,Product Bundle Item,번들 제품 항목
 DocType: Sales Partner,Sales Partner Name,영업 파트너 명
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,견적 요청
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,견적 요청
 DocType: Payment Reconciliation,Maximum Invoice Amount,최대 송장 금액
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,혈액학
 DocType: Normal Test Items,Normal Test Items,정상 검사 항목
 DocType: Student Language,Student Language,학생 언어
 apps/erpnext/erpnext/config/selling.py +23,Customers,고객
@@ -3755,10 +3833,11 @@
 DocType: Issue,Opening Time,영업 시간
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,일자 및 끝
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,증권 및 상품 교환
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',변형에 대한 측정의 기본 단위는 &#39;{0}&#39;템플릿에서와 동일해야합니다 &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',변형에 대한 측정의 기본 단위는 &#39;{0}&#39;템플릿에서와 동일해야합니다 &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,에 의거에게 계산
 DocType: Delivery Note Item,From Warehouse,창고에서
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,재료 명세서 (BOM)와 어떤 항목은 제조 없습니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,재료 명세서 (BOM)와 어떤 항목은 제조 없습니다
+DocType: Restaurant,Default Customer,기본 고객
 DocType: Assessment Plan,Supervisor Name,관리자 이름
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,같은 날 약속이 만들어 졌는지 확인하지 마십시오.
 DocType: Program Enrollment Course,Program Enrollment Course,프로그램 등록 과정
@@ -3786,7 +3865,7 @@
 DocType: Payment Entry,Internal Transfer,내부 전송
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,이 계정에 하위계정이 존재합니다.이 계정을 삭제할 수 없습니다.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,목표 수량 또는 목표량 하나는 필수입니다
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},기본의 BOM은 존재하지 않습니다 항목에 대한 {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},기본의 BOM은 존재하지 않습니다 항목에 대한 {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,첫 번째 게시 날짜를 선택하세요
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,날짜를 열기 날짜를 닫기 전에해야
 DocType: Leave Control Panel,Carry Forward,이월하다
@@ -3822,6 +3901,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,전체 현재
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,회계 문
 DocType: Drug Prescription,Hour,시간
+DocType: Restaurant Order Entry,Last Sales Invoice,마지막 판매 송장
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,새로운 시리얼 번호는 창고를 가질 수 없습니다.창고 재고 항목 또는 구입 영수증으로 설정해야합니다
 DocType: Lead,Lead Type,리드 타입
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,당신은 블록 날짜에 잎을 승인 할 수있는 권한이 없습니다
@@ -3858,65 +3938,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,사용자 만들기
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,그램
 DocType: Supplier Scorecard,Per Month,달마다
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,제조하는 수량은 0보다 커야합니다.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,제조하는 수량은 0보다 커야합니다.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,유지 보수 통화에 대해 보고서를 참조하십시오.
 DocType: Stock Entry,Update Rate and Availability,업데이트 속도 및 가용성
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,당신이 양에 대해 더 수신하거나 전달하도록 허용 비율 명령했다.예를 들면 : 당신이 100 대를 주문한 경우. 당신의 수당은 다음 110 단위를받을 10 % 허용된다.
 DocType: POS Customer Group,Customer Group,고객 그룹
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),새 일괄 처리 ID (선택 사항)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),새 일괄 처리 ID (선택 사항)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),새 일괄 처리 ID (선택 사항)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),새 일괄 처리 ID (선택 사항)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},비용 계정 항목에 대한 필수 {0}
 DocType: BOM,Website Description,웹 사이트 설명
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,자본에 순 변경
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,최신
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,첫 번째 구매 송장 {0}을 취소하십시오
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","이메일 주소는 이미 존재, 고유해야합니다 {0}"
 DocType: Serial No,AMC Expiry Date,AMC 유효 날짜
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,영수증
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,영수증
 ,Sales Register,판매 등록
 DocType: Daily Work Summary Settings Company,Send Emails At,에 이메일 보내기
 DocType: Quotation,Quotation Lost Reason,견적 잃어버린 이유
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,귀하의 도메인을 선택
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',select * from tabPatient 여기서 name = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},거래 기준은 {0}에 제출하지 {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},거래 기준은 {0}에 제출하지 {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,편집 할 수있는 것은 아무 것도 없습니다.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,양식보기
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,이 달 보류중인 활동에 대한 요약
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,양식보기
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,이 달 보류중인 활동에 대한 요약
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.",자신 이외의 조직에 사용자를 추가하십시오.
 DocType: Customer Group,Customer Group Name,고객 그룹 이름
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,아직 고객 없음!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,아직 고객 없음!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,현금 흐름표
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},대출 금액은 최대 대출 금액을 초과 할 수 없습니다 {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,특허
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},C-양식에서이 송장 {0}을 제거하십시오 {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},C-양식에서이 송장 {0}을 제거하십시오 {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,당신은 또한 이전 회계 연도의 균형이 회계 연도에 나뭇잎 포함 할 경우 이월를 선택하세요
 DocType: GL Entry,Against Voucher Type,바우처 형식에 대한
 DocType: Physician,Phone (R),전화 (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,시간 슬롯이 추가되었습니다.
 DocType: Item,Attributes,속성
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,템플릿 사용
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,설정&gt; 설정&gt; 이름 지정 시리즈를 통해 이름 지정 시리즈를 {0}으로 설정하십시오.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,계정을 끄기 쓰기 입력하십시오
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,마지막 주문 날짜
 DocType: Patient,B Negative,B 네거티브
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},계정 {0} 수행은 회사 소유하지 {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,행 {0}의 일련 번호가 배달 참고와 일치하지 않습니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,행 {0}의 일련 번호가 배달 참고와 일치하지 않습니다.
 DocType: Student,Guardian Details,가디언의 자세한 사항
 DocType: C-Form,C-Form,C-양식
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,여러 직원 마크 출석
 DocType: Vehicle,Chassis No,섀시 없음
 DocType: Payment Request,Initiated,개시
 DocType: Production Order,Planned Start Date,계획 시작 날짜
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,BOM을 선택하십시오.
 DocType: Serial No,Creation Document Type,작성 문서 형식
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,종료일은 시작일보다 커야합니다.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,종료일은 시작일보다 커야합니다.
 DocType: Leave Type,Is Encash,현금화는
 DocType: Leave Allocation,New Leaves Allocated,할당 된 새로운 잎
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,프로젝트 와이즈 데이터는 견적을 사용할 수 없습니다
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,끝내기
 DocType: Project,Expected End Date,예상 종료 날짜
 DocType: Budget Account,Budget Amount,예산 금액
 DocType: Appraisal Template,Appraisal Template Title,평가 템플릿 제목
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},날짜 {0}에 대한 직원 {1} 직원의 입사 날짜 이전 될 수 없습니다 {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,광고 방송
 DocType: Patient,Alcohol Current Use,알콜 현재 사용
+DocType: Student Admission Program,Student Admission Program,학생 모집 프로그램
 DocType: Payment Entry,Account Paid To,계정에 유료
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,상위 항목 {0} 주식 항목이 아니어야합니다
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,모든 제품 또는 서비스.
@@ -3925,30 +4007,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},계정에 대한 {0} 예산 {1}에 대한 {2} {3}는 {4}. 그것은에 의해 초과 {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',행 {0} # 계정 유형이어야합니다 &#39;고정 자산&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,수량 아웃
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,판매 배송 금액을 계산하는 규칙
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,및 unchcked에서 장애인
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,시리즈는 필수입니다
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,금융 서비스
 DocType: Student Sibling,Student ID,학생 아이디
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,시간 로그에 대한 활동의 종류
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,공급 업체 이메일
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,시간 로그에 대한 활동의 종류
 DocType: Tax Rule,Sales,판매
 DocType: Stock Entry Detail,Basic Amount,기본 금액
 DocType: Training Event,Exam,시험
 DocType: Complaint,Complaint,불평
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},재고 품목에 필요한 창고 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},재고 품목에 필요한 창고 {0}
 DocType: Leave Allocation,Unused leaves,사용하지 않는 잎
 DocType: Patient,Alcohol Past Use,알콜 과거 사용
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,CR
 DocType: Tax Rule,Billing State,결제 주
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,이체
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),(서브 어셈블리 포함) 폭발 BOM 가져 오기
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,이체
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),(서브 어셈블리 포함) 폭발 BOM 가져 오기
 DocType: Authorization Rule,Applicable To (Employee),에 적용 (직원)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,마감일은 필수입니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,마감일은 필수입니다
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,속성에 대한 증가는 {0} 0이 될 수 없습니다
 DocType: Journal Entry,Pay To / Recd From,지불 / 수취처
 DocType: Naming Series,Setup Series,설치 시리즈
 DocType: Payment Reconciliation,To Invoice Date,날짜를 청구 할
 DocType: Supplier,Contact HTML,연락 HTML
 ,Inactive Customers,비활성 고객
+DocType: Student Admission Program,Maximum Age,최대 연령
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,구매 영수증
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,어떻게 가격의 규칙이 적용됩니다?
@@ -3967,6 +4051,7 @@
 DocType: GL Entry,Remarks,Remarks
 DocType: Payment Entry,Account Paid From,계정에서 유료
 DocType: Purchase Order Item Supplied,Raw Material Item Code,원료 상품 코드
+DocType: Task,Parent Task,학부모 과제
 DocType: Journal Entry,Write Off Based On,에 의거 오프 쓰기
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,리드를 확인
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,인쇄 및 문구
@@ -3975,20 +4060,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","급여는 이미 {0}과 {1},이 기간 사이가 될 수 없습니다 신청 기간을 남겨 사이의 기간에 대해 처리."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,일련 번호의 설치 기록
 DocType: Guardian Interest,Guardian Interest,가디언 관심
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,POS 송장의 기본값 설정
 apps/erpnext/erpnext/config/hr.py +177,Training,훈련
 DocType: Timesheet,Employee Detail,직원 세부 정보
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 이메일 ID
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 이메일 ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,다음 날짜의 날짜와 동일해야한다 이달의 날에 반복
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,다음 날짜의 날짜와 동일해야한다 이달의 날에 반복
 DocType: Lab Prescription,Test Code,테스트 코드
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,웹 사이트 홈페이지에 대한 설정
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},{1}의 스코어 카드로 인해 RFQ가 {0}에 허용되지 않습니다.
 DocType: Offer Letter,Awaiting Response,응답을 기다리는 중
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,위
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},총 금액 {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},잘못된 속성 {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},총 금액 {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},잘못된 속성 {0} {1}
 DocType: Supplier,Mention if non-standard payable account,표준이 아닌 지불 계정에 대한 언급
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},동일한 항목이 여러 번 입력되었습니다. {명부}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',&#39;모든 평가 그룹&#39;이외의 평가 그룹을 선택하십시오.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},행 {0} : 항목 {1}에 코스트 센터가 필요합니다.
 DocType: Training Event Employee,Optional,선택 과목
@@ -4011,13 +4096,15 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1} : 코스트 센터는 항목에 대해 필수입니다 {2}
 DocType: Vehicle,Policy No,정책 없음
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,제품 번들에서 항목 가져 오기
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property",{0} 항목에 대해 재고가 있으므로 변형 품 속성을 사용할 수 없습니다
 DocType: Asset,Straight Line,일직선
 DocType: Project User,Project User,프로젝트 사용자
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,스플릿
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,스플릿
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,스플릿
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,스플릿
 DocType: GL Entry,Is Advance,사전인가
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,날짜에 날짜 및 출석 출석은 필수입니다
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,입력 해주십시오은 예 또는 아니오로 '하청'
+DocType: Item,Default Purchase Unit of Measure,기본 구매 단위
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,마지막 통신 날짜
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,마지막 통신 날짜
 DocType: Sales Team,Contact No.,연락 번호
@@ -4026,7 +4113,6 @@
 DocType: Production Order,Check if material transfer entry is not required,자재 이전 항목이 필요하지 않은지 확인하십시오.
 DocType: Production Order,Check if material transfer entry is not required,자재 이전 항목이 필요하지 않은지 확인하십시오.
 DocType: Program Enrollment Tool,Get Students From,학생들 가져 오기
-DocType: Hub Settings,Seller Country,판매자 나라
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,웹 사이트에 항목을 게시
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,일괄 그룹 학생
 DocType: Authorization Rule,Authorization Rule,권한 부여 규칙
@@ -4036,8 +4122,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,판매 세금 및 요금 템플릿
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),합계 (신용)
 DocType: Repayment Schedule,Payment Date,지불 날짜
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,새로운 일괄 수량
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,새로운 일괄 수량
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,새로운 일괄 수량
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,새로운 일괄 수량
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,의류 및 액세서리
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,가중 점수 기능을 해결할 수 없습니다. 수식이 유효한지 확인하십시오.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,주문 번호
@@ -4055,6 +4141,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","행 번호 {0} 자산이 {1} 제출할 수 없습니다, 그것은 이미 {2}"
 DocType: Tax Rule,Billing Country,결제 나라
 DocType: Purchase Order Item,Expected Delivery Date,예상 배송 날짜
+DocType: Restaurant Order Entry,Restaurant Order Entry,레스토랑 주문 입력
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,직불 및 신용 {0} #에 대한 동일하지 {1}. 차이는 {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,접대비
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,자료 요청합니다
@@ -4067,9 +4154,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,기존 거래 계정은 삭제할 수 없습니다
 DocType: Vehicle,Last Carbon Check,마지막으로 탄소 확인
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,법률 비용
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,행의 수량을 선택하십시오.
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,행의 수량을 선택하십시오.
 DocType: Purchase Invoice,Posting Time,등록시간
 DocType: Timesheet,% Amount Billed,청구 % 금액
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;약속 시간 (Time Per Appointment)&quot;이 {0} Dr에 대해 설정되지 않았습니다. 의사 마스터에 추가하십시오.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,전화 비용
 DocType: Sales Partner,Logo,로고
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,당신은 저장하기 전에 시리즈를 선택하도록 강제하려는 경우이 옵션을 선택합니다.당신이 선택하면 기본이되지 않습니다.
@@ -4080,6 +4168,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,새로운 고객 수익
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,여행 비용
 DocType: Maintenance Visit,Breakdown,고장
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Doctype {0}에 사용자 정의 필드 가입을 추가하십시오.
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,계정 : {0} 통화로 : {1}을 선택할 수 없습니다
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",최신 평가 률 / 가격 목록 비율 / 원자재의 최종 구매 률을 기반으로 Scheduler를 통해 자동으로 BOM 비용을 업데이트합니다.
 DocType: Bank Reconciliation Detail,Cheque Date,수표 날짜
@@ -4104,7 +4193,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),총 결제 금액 (시간 로그를 통해)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,공급 업체 아이디
 DocType: Payment Request,Payment Gateway Details,지불 게이트웨이의 자세한 사항
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,수량이 0보다 커야합니다
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,수량이 0보다 커야합니다
 DocType: Journal Entry,Cash Entry,현금 항목
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,자식 노드은 &#39;그룹&#39;유형 노드에서 생성 할 수 있습니다
 DocType: Leave Application,Half Day Date,하프 데이 데이트
@@ -4122,12 +4211,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,참고 : {0} 항목을 여러 번 입력
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,모든 연락처.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,회사의 약어
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,{0} 사용자가 존재하지 않습니다
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,{0} 사용자가 존재하지 않습니다
 DocType: Subscription,SUB-,보결-
 DocType: Item Attribute Value,Abbreviation,약어
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,결제 항목이 이미 존재합니다
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} 한도를 초과 한 authroized Not
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,급여 템플릿 마스터.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,병리학
+DocType: Restaurant Order Entry,Restaurant Table,레스토랑 테이블
 DocType: Leave Type,Max Days Leave Allowed,최대 일 허가 허용
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,쇼핑 카트에 설정 세금 규칙
 DocType: Purchase Invoice,Taxes and Charges Added,추가 세금 및 수수료
@@ -4139,10 +4230,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,리드 또는 고객에게 인용.
 DocType: Stock Settings,Role Allowed to edit frozen stock,동결 재고을 편집 할 수 있는 역할
 ,Territory Target Variance Item Group-Wise,지역 대상 분산 상품 그룹 와이즈
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,모든 고객 그룹
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,모든 고객 그룹
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,누적 월별
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} 필수입니다.아마 통화 기록은 {2}로 {1}에 만들어지지 않습니다.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,세금 템플릿은 필수입니다.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,세금 템플릿은 필수입니다.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,계정 {0} : 부모 계정 {1}이 (가) 없습니다
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),가격 목록 비율 (회사 통화)
 DocType: Products Settings,Products Settings,제품 설정
@@ -4168,13 +4259,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,항목 와이즈 세금 세부 정보
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,연구소 약어
 ,Item-wise Price List Rate,상품이 많다는 가격리스트 평가
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,공급 업체 견적
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,공급 업체 견적
 DocType: Quotation,In Words will be visible once you save the Quotation.,당신은 견적을 저장 한 단어에서 볼 수 있습니다.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},수량 ({0})은 행 {1}의 분수가 될 수 없습니다.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},수량 ({0})은 행 {1}의 분수가 될 수 없습니다.
 DocType: Consultation,C-,기음-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},바코드 {0}이 (가) 이미 상품에 사용되는 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},바코드 {0}이 (가) 이미 상품에 사용되는 {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,비용을 추가하는 규칙.
 DocType: Item,Opening Stock,열기 증권
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,고객이 필요합니다
@@ -4192,9 +4283,8 @@
 DocType: Customer,From Lead,리드에서
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,생산 발표 순서.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,회계 연도 선택 ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS 프로필 POS 항목을 만드는 데 필요한
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS 프로필 POS 항목을 만드는 데 필요한
 DocType: Program Enrollment Tool,Enroll Students,학생 등록
-DocType: Hub Settings,Name Token,이름 토큰
 DocType: Lab Test,Approved Date,승인 날짜
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,표준 판매
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,이어야 한 창고는 필수입니다
@@ -4212,7 +4302,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,인적 자원
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,지불 화해 지불
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,법인세 자산
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},생산 오더가 {0}되었습니다.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},생산 오더가 {0}되었습니다.
 DocType: BOM Item,BOM No,BOM 없음
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,분개 {0} {1} 또는 이미 다른 쿠폰에 대해 일치하는 계정이 없습니다
@@ -4232,8 +4322,8 @@
 DocType: Currency Exchange,To Currency,통화로
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,다음 사용자가 블록 일에 대한 허가 신청을 승인 할 수 있습니다.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,비용 청구의 유형.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},항목 {0}의 판매율이 {1}보다 낮습니다. 판매율은 atleast 여야합니다 {2}
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},항목 {0}의 판매율이 {1}보다 낮습니다. 판매율은 atleast 여야합니다 {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},항목 {0}의 판매율이 {1}보다 낮습니다. 판매율은 atleast 여야합니다 {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},항목 {0}의 판매율이 {1}보다 낮습니다. 판매율은 atleast 여야합니다 {2}
 DocType: Item,Taxes,세금
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,유료 및 전달되지 않음
 DocType: Project,Default Cost Center,기본 비용 센터
@@ -4247,15 +4337,15 @@
 DocType: Employee Loan,Fully Disbursed,완전 지급
 DocType: Maintenance Visit,Customer Feedback,고객 의견
 DocType: Account,Expense,지출
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,점수 최대 점수보다 클 수 없습니다
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,점수 최대 점수보다 클 수 없습니다
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,고객 및 공급 업체
 DocType: Item Attribute,From Range,범위에서
 DocType: BOM,Set rate of sub-assembly item based on BOM,BOM을 기준으로 하위 어셈블리 항목의 비율 설정
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},식 또는 조건에 구문 오류 : {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},식 또는 조건에 구문 오류 : {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,매일 작업 요약 설정 회사
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,그것은 재고 품목이 아니기 때문에 {0} 항목을 무시
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,추가 처리를 위해이 생산 주문을 제출합니다.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,추가 처리를 위해이 생산 주문을 제출합니다.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",특정 트랜잭션에서 가격 규칙을 적용하지 않으려면 모두 적용 가격 규칙 비활성화해야합니다.
 DocType: Assessment Group,Parent Assessment Group,상위 평가 그룹
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,채용 정보
@@ -4272,12 +4362,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',그룹화 기준이 &#39;회사&#39;인 경우 회사 필터를 비워 두십시오.
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,게시 날짜는 미래의 날짜 수 없습니다
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},행 번호 {0} : 일련 번호 {1}과 일치하지 않는 {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,되풀이 생성을위한
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,캐주얼 허가
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,실험실 테스트 UOM.
 DocType: Batch,Batch ID,일괄 처리 ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},참고 : {0}
 ,Delivery Note Trends,배송 참고 동향
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,이번 주 요약
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,이번 주 요약
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,재고 수량에서
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,계정 : {0} 만 재고 거래를 통해 업데이트 할 수 있습니다
 DocType: Student Group Creation Tool,Get Courses,과정을 받으세요
@@ -4291,7 +4382,6 @@
 DocType: Purchase Order,To Bill,빌
 DocType: Material Request,% Ordered,% 발주
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","과정 기반 학생 그룹의 경우, 과정은 등록 된 과정의 등록 된 과정에서 모든 학생에 대해 유효성이 검사됩니다."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","쉼표로 구분하여 입력 이메일 주소, 청구서는 특정 날짜에 자동으로 발송됩니다"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,일한 분량에 따라 공임을 지급받는 일
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,평균. 구매 비율
 DocType: Task,Actual Time (in Hours),(시간) 실제 시간
@@ -4305,7 +4395,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,{0} 항목을 직렬 제 칼럼에 대한 설정이 비어 있어야하지
 DocType: Accounts Settings,Accounts Settings,계정 설정
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,승인
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,제출할 결과가 없습니다.
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,제출할 결과가 없습니다.
 DocType: Customer,Sales Partner and Commission,판매 파트너 및위원회
 DocType: Employee Loan,Rate of Interest (%) / Year,이자 (%) / 년의 속도
 ,Project Quantity,프로젝트 수량
@@ -4317,55 +4407,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,검정
 DocType: BOM Explosion Item,BOM Explosion Item,BOM 폭발 상품
 DocType: Account,Auditor,감사
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,생산 {0} 항목
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,생산 {0} 항목
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,더 알아보기
 DocType: Cheque Print Template,Distance from top edge,상단으로부터의 거리
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,가격 목록 {0} 비활성화 또는 존재하지 않는
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,가격 목록 {0} 비활성화 또는 존재하지 않는
 DocType: Purchase Invoice,Return,반환
 DocType: Production Order Operation,Production Order Operation,생산 오더 운영
 DocType: Pricing Rule,Disable,사용 안함
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,지불 모드는 지불 할 필요
 DocType: Project Task,Pending Review,검토 중
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,약속 및 협의
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1}은 (는) 배치 {2}에 등록되지 않았습니다.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1}은 (는) 배치 {2}에 등록되지 않았습니다.
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","이미 같이 자산 {0}, 폐기 될 수 없다 {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),(비용 청구를 통해) 총 경비 요청
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,마크 결석
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},행 {0} 다음 BOM 번호의 통화 {1} 선택한 통화 같아야한다 {2}
 DocType: Journal Entry Account,Exchange Rate,환율
 DocType: Patient,Additional information regarding the patient,환자에 관한 추가 정보
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,판매 주문 {0} 제출되지 않았습니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,판매 주문 {0} 제출되지 않았습니다.
 DocType: Homepage,Tag Line,태그 라인
 DocType: Fee Component,Fee Component,요금 구성 요소
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,함대 관리
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,에서 항목 추가
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,함대 관리
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,에서 항목 추가
 DocType: Cheque Print Template,Regular,정규병
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,모든 평가 기준 총 Weightage 100 %이어야합니다
-DocType: BOM,Last Purchase Rate,마지막 구매 비율
+DocType: Purchase Order Item,Last Purchase Rate,마지막 구매 비율
 DocType: Account,Asset,자산
 DocType: Project Task,Task ID,태스크 ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,상품에 대한 존재할 수 없다 재고 {0} 이후 변종이있다
 DocType: Lab Test,Mobile,변하기 쉬운
 ,Sales Person-wise Transaction Summary,판매 사람이 많다는 거래 요약
 DocType: Training Event,Contact Number,연락 번호
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,창고 {0}이 (가) 없습니다
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext 허브에 등록
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,창고 {0}이 (가) 없습니다
 DocType: Monthly Distribution,Monthly Distribution Percentages,예산 월간 배분 백분율
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,선택한 항목이 배치를 가질 수 없습니다
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","평가 비율은 회계 항목을 수행하는 데 필요한 항목 {0} 찾을 수 없습니다 {1} {2}. 항목의 샘플 항목으로 거래되는 경우 {1}, {1} (으) 항목 테이블에서 그 언급 해주십시오. 그렇지 않으면, / 제출 중 노력이 항목을 취소 한 다음 항목 레코드의 항목이나 언급 평가 비율에 대한 들어오는 재고 트랜잭션을 생성하고십시오"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,이 납품서에 대해 배송자재 %
+DocType: Training Event,Has Certificate,인증서 보유
 DocType: Project,Customer Details,고객 상세 정보
 DocType: Employee,Reports to,에 대한 보고서
 ,Unpaid Expense Claim,미지급 비용 청구
 DocType: Payment Entry,Paid Amount,지불 금액
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,판매주기 탐색
 DocType: Assessment Plan,Supervisor,감독자
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,온라인으로
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,온라인으로
 ,Available Stock for Packing Items,항목 포장 재고품
 DocType: Item Variant,Item Variant,항목 변형
 DocType: Assessment Result Tool,Assessment Result Tool,평가 결과 도구
 DocType: BOM Scrap Item,BOM Scrap Item,BOM 스크랩 항목
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,제출 된 주문은 삭제할 수 없습니다
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,제출 된 주문은 삭제할 수 없습니다
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","이미 직불의 계정 잔액, 당신은 같은 '신용', '균형이어야합니다'설정할 수 없습니다"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,품질 관리
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,{0} 항목이 비활성화되었습니다
@@ -4386,7 +4475,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,평점 0 허용
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,평점 0 허용
 DocType: Training Event Employee,Invited,초대
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,지정된 날짜에 대해 직원 {0}에 대해 발견 된 여러 활성 급여 구조
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,지정된 날짜에 대해 직원 {0}에 대해 발견 된 여러 활성 급여 구조
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,설치 게이트웨이를 차지한다.
 DocType: Employee,Employment Type,고용 유형
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,고정 자산
@@ -4398,7 +4487,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,학생 이메일 ID
 DocType: Employee,Notice (days),공지 사항 (일)
 DocType: Tax Rule,Sales Tax Template,판매 세 템플릿
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,송장을 저장하는 항목을 선택
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,송장을 저장하는 항목을 선택
 DocType: Employee,Encashment Date,현금화 날짜
 DocType: Training Event,Internet,인터넷
 DocType: Special Test Template,Special Test Template,특수 테스트 템플릿
@@ -4408,7 +4497,7 @@
 DocType: Academic Term,Term Start Date,기간 시작 날짜
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},첨부 {0} # {1} 찾기
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},첨부 {0} # {1} 찾기
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,총계정 원장에 따라 은행 잔고 잔액
 DocType: Job Applicant,Applicant Name,신청자 이름
 DocType: Authorization Rule,Customer / Item Name,고객 / 상품 이름
@@ -4428,7 +4517,7 @@
 DocType: Guardian,Guardian Of ,의 가디언
 DocType: Grading Scale Interval,Threshold,문지방
 DocType: BOM Update Tool,Current BOM,현재 BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,일련 번호 추가
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,일련 번호 추가
 DocType: Production Order Item,Available Qty at Source Warehouse,출하 창고에서 사용 가능한 수량
 apps/erpnext/erpnext/config/support.py +22,Warranty,보증
 DocType: Purchase Invoice,Debit Note Issued,직불 주 발행
@@ -4451,10 +4540,9 @@
 DocType: Account,Receivable,받을 수있는
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,행 번호 {0} : 구매 주문이 이미 존재로 공급 업체를 변경할 수 없습니다
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,설정 신용 한도를 초과하는 거래를 제출하도록 허용 역할.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,제조 할 항목을 선택합니다
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","마스터 데이터 동기화, 그것은 시간이 걸릴 수 있습니다"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,제조 할 항목을 선택합니다
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","마스터 데이터 동기화, 그것은 시간이 걸릴 수 있습니다"
 DocType: Item,Material Issue,소재 호
-DocType: Hub Settings,Seller Description,판매자 설명
 DocType: Employee Education,Qualification,자격
 DocType: Item Price,Item Price,상품 가격
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,비누 및 세제
@@ -4462,7 +4550,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,때때로보다 클 수 없습니다.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,영화 및 비디오
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,주문
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,이력서
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,이력서
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,사용 설정하면 시스템에서 템플릿의 변형 필드를 업데이트하지 않지만 새 변형을 만드는 동안 아래에서 언급 한 필드의 데이터를 복사합니다.
 DocType: Salary Detail,Component,구성 요소
 DocType: Assessment Criteria,Assessment Criteria Group,평가 기준 그룹
 DocType: Healthcare Settings,Patient Name By,환자 이름 작성자
@@ -4472,7 +4561,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,역할을 승인 또는 사용을 승인 입력하십시오
 DocType: Journal Entry,Write Off Entry,항목 오프 쓰기
 DocType: BOM,Rate Of Materials Based On,자료에 의거 한 속도
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
+DocType: Item Variant Settings,Do not Update Variants,변형 안 함
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,지원 Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,모두 선택 취소
 DocType: POS Profile,Terms and Conditions,이용약관
@@ -4481,7 +4570,7 @@
 DocType: Leave Block List,Applies to Company,회사에 적용
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,제출 된 재고 항목 {0}이 존재하기 때문에 취소 할 수 없습니다
 DocType: Employee Loan,Disbursement Date,지급 날짜
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;수신자&#39;가 지정되지 않았습니다.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;수신자&#39;가 지정되지 않았습니다.
 DocType: BOM Update Tool,Update latest price in all BOMs,모든 BOM의 최신 가격 업데이트
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,의료 기록
 DocType: Vehicle,Vehicle,차량
@@ -4497,14 +4586,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead %
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,자산 감가 상각 및 잔액
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},금액은 {0} {1}에서 전송 {2}에 {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},금액은 {0} {1}에서 전송 {2}에 {3}
 DocType: Sales Invoice,Get Advances Received,선불수취
 DocType: Email Digest,Add/Remove Recipients,추가 /받는 사람을 제거
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},거래 정지 생산 오더에 대해 허용되지 {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",기본값으로이 회계 연도 설정하려면 '기본값으로 설정'을 클릭
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,어울리다
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,어울리다
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,부족 수량
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,항목 변형 {0} 같은 속성을 가진 존재
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,항목 변형 {0} 같은 속성을 가진 존재
 DocType: Employee Loan,Repay from Salary,급여에서 상환
 DocType: Leave Application,LAP/,무릎/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},에 대한 지불을 요청 {0} {1} 금액에 대한 {2}
@@ -4517,7 +4606,7 @@
 DocType: Sales Invoice Item,Sales Order Item,판매 주문 품목
 DocType: Salary Slip,Payment Days,지불 일
 DocType: Patient,Dormant,잠자는
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,자식 노드와 창고가 원장으로 변환 할 수 없습니다
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,자식 노드와 창고가 원장으로 변환 할 수 없습니다
 DocType: BOM,Manage cost of operations,작업의 비용 관리
 DocType: Accounts Settings,Stale Days,부실한 날들
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","체크 거래의 하나가 ""제출""하면, 이메일 팝업이 자동으로 첨부 파일로 트랜잭션, 트랜잭션에 관련된 ""연락처""로 이메일을 보내 열었다.사용자는 나 이메일을 보낼 수도 있고 그렇지 않을 수도 있습니다."
@@ -4531,10 +4620,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,일련 번호 {0}이 (가) 이미 수신 된
 ,Requested Items To Be Transferred,전송할 요청 항목
 DocType: Expense Claim,Vehicle Log,차량 로그인
-DocType: Purchase Invoice,Recurring Id,경상 아이디
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),열이있는 경우 (온도가 38.5 ° C / 101.3 ° F 또는 지속 온도가 38 ° C / 100.4 ° F 인 경우)
 DocType: Customer,Sales Team Details,판매 팀의 자세한 사항
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,영구적으로 삭제 하시겠습니까?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,영구적으로 삭제 하시겠습니까?
 DocType: Expense Claim,Total Claimed Amount,총 주장 금액
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,판매를위한 잠재적 인 기회.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},잘못된 {0}
@@ -4544,7 +4632,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,백화점
 ,Item Delivery Date,상품 배송일
 DocType: Warehouse,PIN,핀
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,ERPNext에 설치 학교
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,ERPNext에 설치 학교
 DocType: Sales Invoice,Base Change Amount (Company Currency),자료 변경 금액 (회사 통화)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,다음 창고에 대한 회계 항목이 없음
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,먼저 문서를 저장합니다.
@@ -4556,13 +4644,12 @@
 DocType: Task,Is Milestone,마일스톤이다
 DocType: Daily Work Summary,Email Sent To,이메일로 발송
 DocType: Budget,Warn,경고
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,등록 취소 하시겠습니까?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","다른 발언, 기록에 가야한다 주목할만한 노력."
 DocType: BOM,Manufacturing User,제조 사용자
 DocType: Purchase Invoice,Raw Materials Supplied,공급 원료
-DocType: Purchase Invoice,Recurring Print Format,반복 인쇄 형식
 DocType: C-Form,Series,시리즈
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},가격 목록 {0}의 통화는 {1} 또는 {2}이어야합니다.
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,제품 추가
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},가격 목록 {0}의 통화는 {1} 또는 {2}이어야합니다.
 DocType: Appraisal,Appraisal Template,평가 템플릿
 DocType: Item Group,Item Classification,품목 분류
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,비즈니스 개발 매니저
@@ -4576,7 +4663,7 @@
 DocType: Item Attribute Value,Attribute Value,속성 값
 ,Itemwise Recommended Reorder Level,Itemwise는 재주문 수준에게 추천
 DocType: Salary Detail,Salary Detail,급여 세부 정보
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,먼저 {0}를 선택하세요
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,먼저 {0}를 선택하세요
 DocType: Appointment Type,Physician,내과 의사
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,항목의 일괄 {0} {1} 만료되었습니다.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,상담
@@ -4587,7 +4674,7 @@
 DocType: Salary Detail,Default Amount,기본 금액
 DocType: Lab Test Template,Descriptive,설명 적
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,시스템에서 찾을 수없는 창고
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,이 달의 요약
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,이 달의 요약
 DocType: Quality Inspection Reading,Quality Inspection Reading,품질 검사 읽기
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`확정된 재고'는 `% d의 일보다 작아야한다.
 DocType: Tax Rule,Purchase Tax Template,세금 템플릿을 구입
@@ -4610,12 +4697,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,교육 이벤트 / 결과
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,등의 감가 상각 누계액
 DocType: Sales Invoice,C-Form Applicable,해당 C-양식
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},작업 시간은 작업에 대한 0보다 큰 수 있어야 {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},작업 시간은 작업에 대한 0보다 큰 수 있어야 {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,창고는 필수입니다
 DocType: Supplier,Address and Contacts,주소 및 연락처
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM 변환 세부 사항
 DocType: Program,Program Abbreviation,프로그램의 약자
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,생산 주문은 항목 템플릿에 대해 제기 할 수 없습니다
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,생산 주문은 항목 템플릿에 대해 제기 할 수 없습니다
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,요금은 각 항목에 대해 구매 영수증에 업데이트됩니다
 DocType: Warranty Claim,Resolved By,에 의해 해결
 DocType: Bank Guarantee,Start Date,시작 날짜
@@ -4641,27 +4728,28 @@
 DocType: Employee,Educational Qualification,교육 자격
 DocType: Workstation,Operating Costs,운영 비용
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,액션 월별 예산이 초과 축적 된 경우
-DocType: Purchase Invoice,Submit on creation,창조에 제출
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},환율 {0}해야합니다에 대한 {1}
+DocType: Subscription,Submit on creation,창조에 제출
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},환율 {0}해야합니다에 대한 {1}
 DocType: Asset,Disposal Date,폐기 날짜
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","그들은 휴일이없는 경우 이메일은, 주어진 시간에 회사의 모든 Active 직원에 전송됩니다. 응답 요약 자정에 전송됩니다."
 DocType: Employee Leave Approver,Employee Leave Approver,직원 허가 승인자
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},행 {0} : 재주문 항목이 이미이웨어 하우스 존재 {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","손실로 견적이되었습니다 때문에, 선언 할 수 없습니다."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,교육 피드백
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},행 {0} : 재주문 항목이 이미이웨어 하우스 존재 {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","손실로 견적이되었습니다 때문에, 선언 할 수 없습니다."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,교육 피드백
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,생산 오더 {0} 제출해야합니다
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,공급 업체 성과표 기준
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},시작 날짜와 항목에 대한 종료 날짜를 선택하세요 {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},코스 행의 필수 {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,지금까지 날로부터 이전 할 수 없습니다
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc의 문서 종류
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,가격 추가/편집
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,가격 추가/편집
 DocType: Batch,Parent Batch,상위 일괄 처리
 DocType: Batch,Parent Batch,상위 일괄 처리
 DocType: Cheque Print Template,Cheque Print Template,수표 인쇄 템플릿
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,코스트 센터의 차트
 DocType: Lab Test Template,Sample Collection,샘플 수집
 ,Requested Items To Be Ordered,주문 요청 항목
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,내 주문
 DocType: Price List,Price List Name,가격리스트 이름
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},일일 작업 요약 {0}
 DocType: Employee Loan,Totals,합계
@@ -4680,12 +4768,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1}에 필요한 {2}에서 {3} {4} {5}이 거래를 완료 할 수의 단위.
 DocType: Fee Schedule,Student Category,학생 분류
 DocType: Announcement,Student,학생
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,조직 단위 (현)의 마스터.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,조직 단위 (현)의 마스터.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,방으로 이동
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,전송하기 전에 메시지를 입력 해주세요
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,공급 업체와 중복
 DocType: Email Digest,Pending Quotations,견적을 보류
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,판매 시점 프로필
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,판매 시점 프로필
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,랩 테스트 구성.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,무담보 대출
 DocType: Cost Center,Cost Center Name,코스트 센터의 이름
@@ -4695,6 +4783,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,총 유료 AMT 사의
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 자보다 큰 메시지는 여러 개의 메시지로 분할됩니다
 DocType: Purchase Receipt Item,Received and Accepted,접수 및 승인
+DocType: Hub Settings,Company and Seller Profile,회사 및 판매자 프로필
 ,GST Itemised Sales Register,GST 항목 별 판매 등록
 ,Serial No Service Contract Expiry,일련 번호 서비스 계약 유효
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,당신은 신용과 같은 시간에 같은 계좌에서 금액을 인출 할 수 없습니다
@@ -4704,10 +4793,11 @@
 DocType: Item,Variant Based On,변형 기반에
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},할당 된 총 weightage 100 %이어야한다.그것은 {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,공급 업체
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,다음을 수정하십시오.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,판매 주문이 이루어질으로 분실로 설정할 수 없습니다.
 DocType: Request for Quotation Item,Supplier Part No,공급 업체 부품 번호
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',카테고리는 &#39;평가&#39;또는 &#39;Vaulation과 전체&#39;에 대한 때 공제 할 수 없음
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,에서 수신
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,에서 수신
 DocType: Lead,Converted,변환
 DocType: Item,Has Serial No,시리얼 No에게 있습니다
 DocType: Employee,Date of Issue,발행일
@@ -4715,7 +4805,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","구매 요청이 필요한 경우 구매 설정에 따라 == &#39;예&#39;, 구매 송장 생성을 위해 사용자는 {0} 품목의 구매 영수증을 먼저 생성해야합니다."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},행 번호 {0} 항목에 대한 설정 공급 업체 {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,행 {0} : 시간의 값은 0보다 커야합니다.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,부품 {1}에 연결된 웹 사이트 콘텐츠 {0}를 찾을 수없는
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,부품 {1}에 연결된 웹 사이트 콘텐츠 {0}를 찾을 수없는
 DocType: Issue,Content Type,컨텐츠 유형
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,컴퓨터
 DocType: Item,List this Item in multiple groups on the website.,웹 사이트에 여러 그룹에이 항목을 나열합니다.
@@ -4726,14 +4816,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,비 조정 항목을보세요
 DocType: Payment Reconciliation,From Invoice Date,송장 일로부터
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,제출할 권한이 없습니다.
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,결제 통화 중 기본의 comapany의 통화 또는 파티 계정 통화와 동일해야합니다
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,결제 통화 중 기본의 comapany의 통화 또는 파티 계정 통화와 동일해야합니다
 DocType: Healthcare Settings,Laboratory Settings,실험실 설정
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,현금화를 남겨
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,그것은 무엇을 하는가?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,창고
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,모든 학생 입학
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,그것은 무엇을 하는가?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,창고
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,모든 학생 입학
 ,Average Commission Rate,평균위원회 평가
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,'시리얼 번호를 가지고 있음'의 경우 무재고 항목에 대해 '예'일 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,'시리얼 번호를 가지고 있음'의 경우 무재고 항목에 대해 '예'일 수 없습니다
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,상태 선택
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,출석은 미래의 날짜에 표시 할 수 없습니다
 DocType: Pricing Rule,Pricing Rule Help,가격 규칙 도움말
@@ -4751,41 +4841,41 @@
 DocType: Item,Customer Code,고객 코드
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},생일 알림 {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,일 이후 마지막 주문
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,계정에 직불는 대차 대조표 계정이어야합니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,계정에 직불는 대차 대조표 계정이어야합니다
 DocType: Buying Settings,Naming Series,시리즈 이름 지정
 DocType: Leave Block List,Leave Block List Name,차단 목록의 이름을 남겨주세요
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,보험 시작일은 보험 종료일보다 작아야합니다
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,학교에서 강사 이름 시스템 설정&gt; 학교 설정
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,재고 자산
 DocType: Timesheet,Production Detail,생산 세부 사항
+DocType: Restaurant,Active Menu,활성 메뉴
 DocType: Target Detail,Target Qty,목표 수량
 DocType: Shopping Cart Settings,Checkout Settings,체크 아웃 설정
 DocType: Attendance,Present,선물
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,배송 참고 {0} 제출하지 않아야합니다
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,배송 참고 {0} 제출하지 않아야합니다
 DocType: Notification Control,Sales Invoice Message,판매 송장 메시지
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,계정 {0}을 닫으면 형 책임 / 주식이어야합니다
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},직원의 급여 슬립 {0} 이미 시간 시트 생성 {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},직원의 급여 슬립 {0} 이미 시간 시트 생성 {1}
 DocType: Vehicle Log,Odometer,주행 거리계
 DocType: Sales Order Item,Ordered Qty,수량 주문
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,항목 {0} 사용할 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,항목 {0} 사용할 수 없습니다
 DocType: Stock Settings,Stock Frozen Upto,재고 동결 개까지
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM은 재고 아이템을 포함하지 않는
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,프로젝트 활동 / 작업.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM은 재고 아이템을 포함하지 않는
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,프로젝트 활동 / 작업.
 DocType: Vehicle Log,Refuelling Details,급유 세부 사항
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,급여 전표 생성
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}",해당 법령에가로 선택된 경우 구매 확인해야합니다 {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,할인 100 미만이어야합니다
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,마지막 구매 비율을 찾을 수 없습니다
 DocType: Purchase Invoice,Write Off Amount (Company Currency),금액을 상각 (회사 통화)
 DocType: Sales Invoice Timesheet,Billing Hours,결제 시간
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,{0}를 찾을 수 없습니다에 대한 기본 BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,행 번호 {0} : 재주문 수량을 설정하세요
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,{0}를 찾을 수 없습니다에 대한 기본 BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,행 번호 {0} : 재주문 수량을 설정하세요
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,항목을 탭하여 여기에 추가하십시오.
 DocType: Fees,Program Enrollment,프로그램 등록
 DocType: Landed Cost Voucher,Landed Cost Voucher,착륙 비용 바우처
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},설정하십시오 {0}
-DocType: Purchase Invoice,Repeat on Day of Month,이달의 날 반복
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1}은 (는) 비활성 학생입니다.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1}은 (는) 비활성 학생입니다.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1}은 (는) 비활성 학생입니다.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1}은 (는) 비활성 학생입니다.
 DocType: Employee,Health Details,건강의 자세한 사항
 DocType: Offer Letter,Offer Letter Terms,편지 약관 제공
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,지불 요청 참조 문서를 작성하려면 필수 항목입니다.
@@ -4794,7 +4884,6 @@
 DocType: Employee External Work History,Salary,급여
 DocType: Serial No,Delivery Document Type,납품 문서 형식
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,위의 선택 기준에 대한 모든 급여 전표 제출
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} 항목 동기화
 DocType: Sales Order,Partly Delivered,일부 배달
 DocType: Email Digest,Receivables,채권
 DocType: Lead Source,Lead Source,리드 소스
@@ -4816,9 +4905,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,고령화 범위 2
 DocType: SG Creation Tool Course,Max Strength,최대 강도
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM 교체
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,배달 날짜를 기준으로 품목 선택
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,배달 날짜를 기준으로 품목 선택
 ,Sales Analytics,판매 분석
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},사용 가능한 {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},사용 가능한 {0}
 ,Prospects Engaged But Not Converted,잠재 고객은 참여했지만 전환하지 않았습니다.
 ,Prospects Engaged But Not Converted,잠재 고객은 참여했지만 전환하지 않았습니다.
 DocType: Manufacturing Settings,Manufacturing Settings,제조 설정
@@ -4826,10 +4915,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 모바일 없음
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,회사 마스터에 기본 통화를 입력 해주십시오
 DocType: Stock Entry Detail,Stock Entry Detail,재고 입력 상세
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,매일 알림
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,매일 알림
 DocType: Products Settings,Home Page is Products,홈 페이지는 제품입니다
 ,Asset Depreciation Ledger,자산 감가 상각 원장
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},와 세금 규칙 충돌 {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},와 세금 규칙 충돌 {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,새 계정 이름
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,원료 공급 비용
 DocType: Selling Settings,Settings for Selling Module,모듈 판매에 대한 설정
@@ -4843,8 +4932,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,{0} 항목을 재고 품목 수 있어야합니다
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,진행웨어 하우스의 기본 작업
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,회계 거래의 기본 설정.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,인력&gt; 인사말 설정에서 Employee Naming System을 설정하십시오.
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,예상 날짜 자료 요청 날짜 이전 할 수 없습니다
+DocType: Restaurant,Default Tax Template,기본 세금 템플릿
 DocType: Fees,Student Details,학생 세부 사항
 DocType: Purchase Invoice Item,Stock Qty,재고 수량
 DocType: Purchase Invoice Item,Stock Qty,재고 수량
@@ -4863,8 +4953,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,항목으로 이동
 DocType: Sales Partner,Partner Type,파트너 유형
 DocType: Purchase Taxes and Charges,Actual,실제
+DocType: Restaurant Menu,Restaurant Manager,레스토랑 매니저
 DocType: Authorization Rule,Customerwise Discount,Customerwise 할인
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,작업에 대한 작업 표.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,작업에 대한 작업 표.
 DocType: Purchase Invoice,Against Expense Account,비용 계정에 대한
 DocType: Production Order,Production Order,생산 주문
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,설치 노트 {0}이 (가) 이미 제출되었습니다
@@ -4872,7 +4963,6 @@
 DocType: Quotation Item,Against Docname,docName 같은 반대
 DocType: SMS Center,All Employee (Active),모든 직원 (활성)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,지금보기
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,송장이 자동으로 생성됩니다 기간을 선택
 DocType: BOM,Raw Material Cost,원료 비용
 DocType: Item Reorder,Re-Order Level,다시 주문 수준
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,당신이 생산 주문을 올리거나 분석을위한 원시 자료를 다운로드하고자하는 항목 및 계획 수량을 입력합니다.
@@ -4885,24 +4975,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,보고서 유형이 필수입니다
 DocType: Item,Serial Number Series,일련 번호 시리즈
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},창고 재고 상품의 경우 필수 {0} 행에서 {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,프로그램 추가
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,소매 및 도매
 DocType: Issue,First Responded On,첫 번째에 반응했다
 DocType: Website Item Group,Cross Listing of Item in multiple groups,여러 그룹에서 항목의 크로스 리스팅
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},회계 연도의 시작 날짜 및 회계 연도 종료 날짜가 이미 회계 연도에 설정되어 {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,정리 날짜 업데이트
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,배치 분할
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,배치 분할
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,배치 분할
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,배치 분할
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,성공적으로 조정 됨
 DocType: Request for Quotation Supplier,Download PDF,다운로드 PDF
 DocType: Production Order,Planned End Date,계획 종료 날짜
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,일정 날짜를 입력하십시오.
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,항목이 저장되는 위치.
 DocType: Request for Quotation,Supplier Detail,공급 업체 세부 정보
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},식 또는 조건에서 오류 : {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},식 또는 조건에서 오류 : {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,송장에 청구 된 금액
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,기준 가중치는 최대 100 %
 DocType: Attendance,Attendance,출석
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,재고 물품
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,재고 물품
 DocType: BOM,Materials,도구
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","선택되지 않으면, 목록은인가되는 각 부서가 여기에 첨가되어야 할 것이다."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,소스 및 대상웨어 하우스는 동일 할 수 없습니다
@@ -4920,6 +5010,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,인터넷 전체에
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},{0} 속성에 대한 값의 범위 내에 있어야합니다 {1}에 {2}의 단위 {3} 항목에 대한 {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,행의 목표웨어 하우스가 {0}과 동일해야합니다 생산 주문
+DocType: Restaurant Reservation,Waitlisted,대기자 명단에 올랐다.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,환율이 다른 통화를 사용하여 항목을 한 후 변경할 수 없습니다
 DocType: Vehicle Service,Clutch Plate,클러치 플레이트
 DocType: Company,Round Off Account,반올림
@@ -4936,7 +5027,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,새로운 판매 사람 이름
 DocType: Packing Slip,Gross Weight UOM,총중량 UOM
 DocType: Delivery Note Item,Against Sales Invoice,견적서에 대하여
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,일련 번호가 지정된 항목의 일련 번호를 입력하십시오.
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,일련 번호가 지정된 항목의 일련 번호를 입력하십시오.
 DocType: Bin,Reserved Qty for Production,생산 수량 예약
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,과정 기반 그룹을 만드는 동안 배치를 고려하지 않으려면 선택하지 마십시오.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,과정 기반 그룹을 만드는 동안 일괄 처리를 고려하지 않으려면 선택하지 않습니다.
@@ -4948,7 +5039,7 @@
 DocType: Lab Test,Test Group,테스트 그룹
 DocType: Payment Reconciliation,Receivable / Payable Account,채권 / 채무 계정
 DocType: Delivery Note Item,Against Sales Order Item,판매 주문 항목에 대하여
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},속성에 대한 속성 값을 지정하십시오 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},속성에 대한 속성 값을 지정하십시오 {0}
 DocType: Item,Default Warehouse,기본 창고
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},예산은 그룹 계정에 할당 할 수 없습니다 {0}
 DocType: Healthcare Settings,Patient Registration,환자 등록
@@ -4978,6 +5069,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,영업 사원
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,예산 및 비용 센터
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,여러 기본 결제 방법이 허용되지 않습니다.
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,그
 ,Appointment Analytics,약속 분석
 DocType: Vehicle Service,Half Yearly,반년
 DocType: Lead,Blog Subscriber,블로그 구독자
@@ -4997,7 +5089,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,퀴즈 카운트
 ,BOM Stock Report,BOM 재고 보고서
 DocType: Stock Reconciliation Item,Quantity Difference,수량 차이
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,가공 급여
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,가공 급여
 DocType: Opportunity Item,Basic Rate,기본 요금
 DocType: GL Entry,Credit Amount,신용 금액
 DocType: Cheque Print Template,Signatory Position,서명자 위치
@@ -5011,12 +5103,12 @@
 DocType: Tax Rule,Tax Rule,세금 규칙
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,판매주기 전반에 걸쳐 동일한 비율을 유지
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,워크 스테이션 근무 시간 외에 시간 로그를 계획합니다.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,대기열의 고객
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,의사 {0}에게는 의사 일정이 없습니다. 의사 마스터에 추가하십시오.
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,대기열의 고객
 DocType: Student,Nationality,국적
 ,Items To Be Requested,요청 할 항목
-DocType: Purchase Order,Get Last Purchase Rate,마지막 구매께서는보세요
 DocType: Company,Company Info,회사 소개
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,선택하거나 새로운 고객을 추가
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,선택하거나 새로운 고객을 추가
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,비용 센터 비용 청구를 예약 할 필요
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),펀드의 응용 프로그램 (자산)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,이이 직원의 출석을 기반으로
@@ -5024,6 +5116,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,자동 이체 계좌
 DocType: Fiscal Year,Year Start Date,년 시작 날짜
 DocType: Attendance,Employee Name,직원 이름
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,식당 주문 입력 항목
 DocType: Sales Invoice,Rounded Total (Company Currency),둥근 합계 (회사 통화)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,계정 유형을 선택하기 때문에 그룹을 변환 할 수 없습니다.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} 수정되었습니다.새로 고침하십시오.
@@ -5034,6 +5127,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,종업원 급여
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},{0} 행에서 {1} 포장 수량의 수량을 동일해야합니다
 DocType: Production Order,Manufactured Qty,제조 수량
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,생성 된 송장
 DocType: Purchase Receipt Item,Accepted Quantity,허용 수량
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},직원에 대한 기본 홀리데이 목록을 설정하십시오 {0} 또는 회사 {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0} : {1} 수행하지 존재
@@ -5043,18 +5137,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},행 번호 {0} : 금액 경비 요청 {1}에 대해 금액을 보류보다 클 수 없습니다. 등록되지 않은 금액은 {2}
 DocType: Maintenance Schedule,Schedule,일정
 DocType: Account,Parent Account,부모 계정
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,사용 가능함
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,사용 가능함
 DocType: Quality Inspection Reading,Reading 3,3 읽기
 ,Hub,허브
 DocType: GL Entry,Voucher Type,바우처 유형
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,가격 목록 발견되지 않았거나 비활성화
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,가격 목록 발견되지 않았거나 비활성화
 DocType: Lab Test,Approved,인가 된
 DocType: Pricing Rule,Price,가격
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',{0}에 안심 직원은 '왼쪽'으로 설정해야합니다
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',{0}에 안심 직원은 '왼쪽'으로 설정해야합니다
+DocType: Hub Settings,Last Sync On,마지막 동기화
 DocType: Guardian,Guardian,보호자
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,평가 {0} {1} 지정된 날짜 범위에서 직원에 대해 생성
 DocType: Employee,Education,교육
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,델
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,델
 DocType: Selling Settings,Campaign Naming By,캠페인 이름 지정으로
 DocType: Employee,Current Address Is,현재 주소는
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,월간 판매 목표 (
@@ -5069,7 +5164,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,코스 코드 :
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,비용 계정을 입력하십시오
 DocType: Account,Stock,재고
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",행 번호 {0} 참조 문서 형식은 구매 주문 중 하나를 구매 송장 또는 분개해야합니다
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",행 번호 {0} 참조 문서 형식은 구매 주문 중 하나를 구매 송장 또는 분개해야합니다
 DocType: Employee,Current Address,현재 주소
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","명시 적으로 지정하지 않는 항목은 다음 설명, 이미지, 가격은 세금이 템플릿에서 설정됩니다 등 다른 항목의 변형 인 경우"
 DocType: Serial No,Purchase / Manufacture Details,구매 / 제조 세부 사항
@@ -5100,7 +5195,7 @@
 DocType: Hub Settings,Hub Settings,허브 설정
 DocType: Project,Gross Margin %,매출 총 이익률의 %
 DocType: BOM,With Operations,운영과
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,회계 항목이 이미 통화로 된 {0} 회사의 {1}. 통화와 채권 또는 채무 계정을 선택하세요 {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,회계 항목이 이미 통화로 된 {0} 회사의 {1}. 통화와 채권 또는 채무 계정을 선택하세요 {0}.
 DocType: Asset,Is Existing Asset,자산을 기존됩니다
 DocType: Salary Detail,Statistical Component,통계 구성 요소
 DocType: Salary Detail,Statistical Component,통계 구성 요소
@@ -5109,13 +5204,14 @@
 DocType: BOM Operation,BOM Operation,BOM 운영
 DocType: Purchase Taxes and Charges,On Previous Row Amount,이전 행의 양에
 DocType: Student,Home Address,집 주소
+DocType: Item,Has Expiry Date,만기일 있음
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,품목 변형 설정.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,전송 자산
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,전송 자산
 DocType: POS Profile,POS Profile,POS 프로필
 DocType: Training Event,Event Name,이벤트 이름
 DocType: Physician,Phone (Office),전화 (사무실)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,입장
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},대한 입학 {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,입장
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},대한 입학 {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","설정 예산, 목표 등 계절성"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,변수 이름
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","{0} 항목 템플릿이며, 그 변종 중 하나를 선택하십시오"
@@ -5124,7 +5220,7 @@
 DocType: Assessment Plan,Room,방
 DocType: Purchase Order,Advance Paid,사전 유료
 DocType: Item,Item Tax,상품의 세금
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,공급 업체에 소재
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,공급 업체에 소재
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,소비세 송장
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0} %가 한 번 이상 나타납니다
 DocType: Expense Claim,Employees Email Id,직원 이드 이메일
@@ -5135,32 +5231,30 @@
 DocType: Program,Program Name,프로그램 이름
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,세금이나 요금에 대한 고려
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,실제 수량은 필수입니다
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0}에는 현재 {1} 공급 업체 성과표가 있으며이 공급 업체에 대한 구매 주문은 신중하게 발행해야합니다.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0}에는 현재 {1} 공급 업체 성과표가 있으며이 공급 업체에 대한 구매 주문은 신중하게 발행해야합니다.
 DocType: Employee Loan,Loan Type,대출 유형
 DocType: Scheduling Tool,Scheduling Tool,예약 도구
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,신용카드
 DocType: BOM,Item to be manufactured or repacked,제조 또는 재 포장 할 항목
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,재고 거래의 기본 설정.
-DocType: Purchase Invoice,Next Date,다음 날짜
 DocType: Employee Education,Major/Optional Subjects,주요 / 선택 주제
 DocType: Sales Invoice Item,Drop Ship,드롭 선박
+DocType: Hub Settings,Suspended,매달린
 DocType: Training Event,Attendees,참석자
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","여기에서 당신은 부모, 배우자와 자녀의 이름과 직업 등 가족 세부 사항을 유지 관리 할 수 있습니다"
 DocType: Academic Term,Term End Date,기간 종료 날짜
-DocType: Hub Settings,Seller Name,판매자 이름
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),차감 세금 및 수수료 (회사 통화)
 DocType: Item Group,General Settings,일반 설정
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,통화와 통화하는 방법은 동일 할 수 없습니다
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,강사 추가
 DocType: Stock Entry,Repack,재 포장
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,당신은 진행하기 전에 양식을 저장해야합니다
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,먼저 회사를 선택하십시오
 DocType: Item Attribute,Numeric Values,숫자 값
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,로고 첨부
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,재고 수준
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,재고 수준
 DocType: Customer,Commission Rate,위원회 평가
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,{1}의 {0} 스코어 카드 생성 :
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,변형을 확인
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,변형을 확인
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,부서에서 허가 응용 프로그램을 차단합니다.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","결제 유형, 수신 중 하나가 될 지불하고 내부 전송합니다"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,분석
@@ -5175,11 +5269,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,자본금
 DocType: Shopping Cart Settings,Show Public Attachments,공용 첨부 파일 표시
 DocType: Packing Slip,Package Weight Details,포장 무게 세부 정보
+DocType: Restaurant Reservation,Reservation Time,예약 시간
 DocType: Payment Gateway Account,Payment Gateway Account,지불 게이트웨이 계정
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,결제 완료 후 선택한 페이지로 사용자를 리디렉션.
 DocType: Company,Existing Company,기존 회사
 DocType: Healthcare Settings,Result Emailed,결과가 이메일로 전송되었습니다.
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",모든 품목이 비 재고 품목이므로 Tax Category가 &quot;Total&quot;로 변경되었습니다.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 상품 그룹&gt; 브랜드
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,CSV 파일을 선택하세요
 DocType: Student Leave Application,Mark as Present,현재로 표시
 DocType: Supplier Scorecard,Indicator Color,표시기 색상
@@ -5204,11 +5300,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,학생 배치 확인
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,이월된다
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,BOM에서 항목 가져 오기
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,BOM에서 항목 가져 오기
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,시간 일 리드
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},행 # {0} : 날짜를 게시하면 구입 날짜와 동일해야합니다 {1} 자산의 {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,학생이 연구소의 숙소에 거주하고 있는지 확인하십시오.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,위의 표에 판매 주문을 입력하세요
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,위의 표에 판매 주문을 입력하세요
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,급여 전표 제출하지 않음
 ,Stock Summary,재고 요약
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,다른 한 창고에서 자산을 이동
@@ -5224,5 +5320,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},행 {0} 차변 항목과 링크 될 수 없다 {1}
 DocType: Journal Entry,Subscription Section,구독 섹션
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,계정 {0}이 (가) 없습니다
+DocType: Training Event,Training Program,교육 프로그램
 DocType: Account,Cash,자금
 DocType: Employee,Short biography for website and other publications.,웹 사이트 및 기타 간행물에 대한 짧은 전기.
diff --git a/erpnext/translations/ku.csv b/erpnext/translations/ku.csv
index 4d59dc1..90a5823 100644
--- a/erpnext/translations/ku.csv
+++ b/erpnext/translations/ku.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Mode meaş
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Fêhrist
 DocType: Patient,Divorced,berdayî
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Nawy jixwe senkronîzekirin
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Destûrê babet ji bo çend caran bê zêdekirin di mêjera
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Betal Material Visit {0} berî betalkirinê ev Îdîaya Warranty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Products Serfkaran
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Dev ji Approvers
 DocType: Sales Partner,Dealer,Dealer
 DocType: Consultation,Investigations,Lêpirsîn
+DocType: Restaurant Order Entry,Click Enter To Add,Bişkojka Enter Add Add
 DocType: Employee,Rented,bi kirê
 DocType: Purchase Order,PO-,"ramyarî,"
 DocType: POS Profile,Applicable for User,Wergirtinê ji bo User
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Rawestandin Production Order ne dikarin bên îptal kirin, ew unstop yekem to cancel"
 DocType: Vehicle Service,Mileage,Mileage
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Ma tu bi rastî dixwazî bibit vê hebûnê?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Ma tu bi rastî dixwazî bibit vê hebûnê?
 DocType: Drug Prescription,Update Schedule,Schedule Update
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Supplier Default Hilbijêre
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Pereyan ji bo List Price pêwîst e {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Peyda bikin
 DocType: Job Applicant,Job Applicant,Applicant Job
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Ev li ser danûstandinên li dijî vê Supplier bingeha. Dîtina cedwela li jêr bo hûragahiyan
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,No results more.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Mafî
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},baca type rastî dikarin di rêjeya babetî di row ne bê beşdar kirin {0}
 DocType: Bank Guarantee,Customer,Miştirî
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Exchange Rate divê eynî wek {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Navê mişterî
 DocType: Vehicle,Natural Gas,Gaza natûral
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},hesabê bankê dikare wekî ne bê bi navê {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},hesabê bankê dikare wekî ne bê bi navê {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Serên (an jî Komên) dijî ku Arşîva Accounting bi made û hevsengiyên parast in.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Outstanding ji bo {0} nikare were kêmî ji sifir ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Li vir pêvajoyên heqê belaş nehatiye şandin.
 DocType: Manufacturing Settings,Default 10 mins,Default 10 mins
 DocType: Leave Type,Leave Type Name,Dev ji Name Type
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,nîşan vekirî
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Pêdivî ye ku ev çalakiya îro ji bo jorîna jorîn ya jorîn bistînin
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Series Demê serket
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Lêkolîn
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural Peyam Journal Şandin
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,"Buy Order Nawy To Be, pêşwazî"
 DocType: SMS Center,All Supplier Contact,Hemû Supplier Contact
 DocType: Support Settings,Support Settings,Mîhengên piştgiriya
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Hêvîkirin End Date nikare bibe kêmtir ji hêvîkirin Date Start
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Hêvîkirin End Date nikare bibe kêmtir ji hêvîkirin Date Start
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Row # {0} ye: Pûan bide, divê heman be {1}: {2} ({3} / {4})"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,New Leave Application
 ,Batch Item Expiry Status,Batch babet Status Expiry
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,pêşnûmeya Bank
 DocType: Mode of Payment Account,Mode of Payment Account,Mode of Account Payment
 DocType: Consultation,Consultation,Şêwir
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Sales and Returns
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Show Variants
 DocType: Academic Term,Academic Term,Term (Ekadîmî)
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Mal
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Parastina saxlemîyê
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Delay di peredana (Days)
 DocType: Lab Prescription,Lab Prescription,Lab prescription
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Bi bihayê bihayê
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Expense Service
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Hejmara Serial: {0} jixwe li Sales bi fatûreyên referans: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Biha
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Hejmara Serial: {0} jixwe li Sales bi fatûreyên referans: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Biha
 DocType: Maintenance Schedule Item,Periodicity,Periodicity
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Sal malî {0} pêwîst e
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Parastinî
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Temamê meblaxa bi qurûşekî
 DocType: Delivery Note,Vehicle No,Vehicle No
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Ji kerema xwe ve List Price hilbijêre
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Ji kerema xwe ve List Price hilbijêre
 DocType: Accounts Settings,Currency Exchange Settings,Guhertina Exchange Exchange
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Row # {0}: belgeya Payment pêwîst e ji bo temamkirina trasaction
 DocType: Production Order Operation,Work In Progress,Kar berdewam e
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Ji kerema xwe ve date hilbijêre
 DocType: Employee,Holiday List,Lîsteya Holiday
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Ji kerema xwe veguherandina Sîstema Sîstema Navneteweyî ya Navneteweyî di dibistana dibistanê&gt; Sîstema dibistanê
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Hesabdar
+DocType: Hub Settings,Selling Price List,Lîsteya bihayê bihayê
 DocType: Patient,Tobacco Current Use,Bikaranîna Pêdivî ye
 DocType: Cost Center,Stock User,Stock Bikarhêner
 DocType: Company,Phone No,Phone No
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Schedules Kurs tên afirandin:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},New {0}: {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},New {0}: {1}
 ,Sales Partners Commission,Komîsyona Partners Sales
 DocType: Purchase Invoice,Rounding Adjustment,Hîndarkirinê Rounding
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Abbreviation dikarin zêdetir ji 5 characters ne xwedî
@@ -124,7 +127,6 @@
 DocType: Packed Item,Parent Detail docname,docname Detail dê û bav
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","World: Kurdî: {0}, Code babet: {1} û Mişterî: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,kg
-DocType: Student Log,Log,Rojname
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Vekirina ji bo Job.
 DocType: Item Attribute,Increment,Increment
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Timespan
@@ -134,7 +136,7 @@
 DocType: Patient,Married,Zewicî
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},ji bo destûr ne {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Get tomar ji
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Stock dikare li hember Delivery Têbînî ne bê ewe {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Stock dikare li hember Delivery Têbînî ne bê ewe {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Product {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,No tomar di lîsteyê de
 DocType: Payment Reconciliation,Reconcile,li hev
@@ -144,29 +146,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,kalîyê
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Next Date Farhad. Nikarim li ber Date Purchase be
 DocType: Consultation,Consultation Date,Dîroka Şêwirmendiyê
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Pirtûka hilber û lêgerînê ji bo bikarhênerên ERPNext
 DocType: SMS Center,All Sales Person,Hemû Person Sales
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Belavkariya Ayda ** alîkariya te dike belavkirin Budçeya / Armanc seranser mehan Eger tu dzanî seasonality di karê xwe.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Ne tumar hatin dîtin
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Missing Structure meaş
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Ne tumar hatin dîtin
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Missing Structure meaş
 DocType: Lead,Person Name,Navê kesê
 DocType: Sales Invoice Item,Sales Invoice Item,Babetê firotina bi fatûreyên
 DocType: Account,Credit,Krêdî
 DocType: POS Profile,Write Off Cost Center,Hewe Off Navenda Cost
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",eg &quot;Dibistana Seretayî&quot; an &quot;University&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",eg &quot;Dibistana Seretayî&quot; an &quot;University&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Reports Stock
 DocType: Warehouse,Warehouse Detail,Detail warehouse
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},limit Credit hatiye dîtin ji bo mişterî re derbas {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,The Date Term End ne dikarin paşê ji Date Sal End of the Year (Ekadîmî) ji bo ku di dema girêdayî be (Year (Ekadîmî) {}). Ji kerema xwe re li rojên bike û careke din biceribîne.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Ma Asset Fixed&quot; nikare bibe nedixwest, wek record Asset li dijî babete heye"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Ma Asset Fixed&quot; nikare bibe nedixwest, wek record Asset li dijî babete heye"
 DocType: Vehicle Service,Brake Oil,Oil şikand
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Giştî&gt; Giştî ya Giştî&gt; Herêmî
 DocType: Tax Rule,Tax Type,Type bacê
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Şêwaz ber bacê
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Destûra te tune ku lê zêde bike an update entries berî {0}
 DocType: BOM,Item Image (if not slideshow),Wêne Babetê (eger Mîhrîcana ne)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,An Mişterî ya bi heman navî heye
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Saet Rate / 60) * Time Actual Operation
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Divê Daxuyaniya Dokumenta Pêdivî ye Yek ji Mirova Claim an Çîroka Çandî be
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Hilbijêre BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Divê Daxuyaniya Dokumenta Pêdivî ye Yek ji Mirova Claim an Çîroka Çandî be
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Hilbijêre BOM
 DocType: SMS Log,SMS Log,SMS bike Têkeve Têkeve
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Cost ji Nawy Çiyan
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Cejna li ser {0} e di navbera From Date û To Date ne
@@ -194,7 +197,7 @@
 DocType: Journal Entry Account,Employee Loan,Xebatkarê Loan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Têkeve çalakiyê:
 DocType: Fee Schedule,Send Payment Request Email,Request Request Email bişîne
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,"Babetê {0} nayê di sîstema tune ne, an jî xelas bûye"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,"Babetê {0} nayê di sîstema tune ne, an jî xelas bûye"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Emlak
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Daxûyanîya Account
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
@@ -209,18 +212,23 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Import bike Têkeve Têkeve
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Kolane Daxwaza maddî ya type Manufacture li ser bingeha krîterên ku li jor
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Serkeftî nayê qeyd kirin.
 DocType: Training Result Employee,Grade,Sinif
+DocType: Restaurant Table,No of Seats,No Seats
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Ji bo mijara dînamîkî zêde bike, wekî jinja tagên bikar bînin <div style=""""><pre style=""""> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Teslîmî By Supplier
 DocType: SMS Center,All Contact,Hemû Contact
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Production Order berê ve ji bo hemû tomar bi BOM tên afirandin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Production Order berê ve ji bo hemû tomar bi BOM tên afirandin
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Salary salane
 DocType: Daily Work Summary,Daily Work Summary,Nasname Work rojane
 DocType: Period Closing Voucher,Closing Fiscal Year,Girtina sala diravî
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} frozen e
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Ji kerema xwe ve û taybet de Company ji bo afirandina Chart Dageriyê hilbijêre
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} frozen e
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Ji kerema xwe ve û taybet de Company ji bo afirandina Chart Dageriyê hilbijêre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Mesref Stock
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Select Target Warehouse
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Select Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Select Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Select Target Warehouse
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Ji kerema xwe re têkevin Preferred Contact Email
 DocType: Program Enrollment,School Bus,Otobûsa xwendingehê
 DocType: Journal Entry,Contra Entry,Peyam kontrayî
@@ -237,9 +245,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Download Şablon, welat guncaw tije û pelê de hate guherandin ve girêbidin. Hemû dîrokên û karker combination di dema hilbijartî dê di şablon bên, bi records amadebûnê heyî"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Babetê {0} e çalak ne jî dawiya jiyana gihîştiye
+DocType: Student Admission Program,Minimum Age,Dîroka Min
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Mînak: Matematîk Basic
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To de baca li row {0} di rêjeya Babetê, bacên li rêzên {1} divê jî di nav de bê"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Mîhengên ji bo Module HR
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Mîhengên ji bo Module HR
 DocType: SMS Center,SMS Center,Navenda SMS
 DocType: Sales Invoice,Change Amount,Change Mîqdar
 DocType: BOM Update Tool,New BOM,New BOM
@@ -249,7 +258,7 @@
 DocType: Lead,Request Type,request type
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Make Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Broadcasting
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Odeyên Add
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Modela Setup ya POS (Online / Offline)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Birêverbirî
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Details ji operasyonên hatiye lidarxistin.
 DocType: Serial No,Maintenance Status,Rewş Maintenance
@@ -272,6 +281,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,"List Price, divê pêkanîn, ji bo Kirîna an Firotina be"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},date Installation nikarim li ber roja çêbûna ji bo babet bê {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Li ser navnîshana List Price Rate (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Biochemistry
 DocType: Offer Letter,Select Terms and Conditions,Hilbijêre şert û mercan
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,Nirx out
 DocType: Production Planning Tool,Sales Orders,ordênên Sales
@@ -306,15 +316,15 @@
 DocType: Sales Partner,Reseller,Reseller
 DocType: Codification Table,Medical Code,Kodê bijîşk
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Eger kontrolkirin, Will de tomar non-stock di Requests Material."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Ji kerema xwe ve Company binivîse
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Ji kerema xwe ve Company binivîse
 DocType: Delivery Note Item,Against Sales Invoice Item,Li dijî Sales bi fatûreyên babetî
 ,Production Orders in Progress,Ordênên Production in Progress
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Cash Net ji Fînansa
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage tije ye, rizgar ne"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage tije ye, rizgar ne"
 DocType: Lead,Address & Contact,Navnîşana &amp; Contact
 DocType: Leave Allocation,Add unused leaves from previous allocations,Lê zêde bike pelên feyde ji xerciyên berê
 DocType: Sales Partner,Partner website,malpera partner
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,lê zêde bike babetî
+DocType: Restaurant Order Entry,Add Item,lê zêde bike babetî
 DocType: Lab Test,Custom Result,Encam
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Contact Name
 DocType: Course Assessment Criteria,Course Assessment Criteria,Şertên Nirxandina Kurs
@@ -327,7 +337,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ji bo kirînê bixwaze.
 DocType: Lab Test,Submitted Date,Dîroka Submitted
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Ev li ser Sheets Time de tên li dijî vê projeyê
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Pay Net nikare bibe kêmtir ji 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Pay Net nikare bibe kêmtir ji 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Ji bo agahdariya çewtiya şaşkirina şaşkirina şertên şandina dravê rawestînin, me li ser beşdariya seqetkirî hate kontrolkirin"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Tenê hilbijartin Leave Approver dikarin vê Leave Application submit
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Destkêşana Date divê mezintir Date of bizaveka be
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Dihêle per Sal
@@ -336,9 +347,10 @@
 DocType: Email Digest,Profit & Loss,Qezencê &amp; Loss
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Litre
 DocType: Task,Total Costing Amount (via Time Sheet),Bi tevahî bi qurûşekî jî Mîqdar (via Time Sheet)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Ji kerema xwe xwendekarên Xwendekar ji Komên Xwendekar re saz bikin
 DocType: Item Website Specification,Item Website Specification,Specification babete Website
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Dev ji astengkirin
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Babetê {0} dawiya wê ya jiyanê li ser gihîşt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Babetê {0} dawiya wê ya jiyanê li ser gihîşt {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Arşîva Bank
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Yeksalî
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Babetê Stock Lihevkirinê
@@ -347,7 +359,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Kurs Komeleya Xwendekarên Tool Creation
 DocType: Lead,Do Not Contact,Serî
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,Kesên ku di rêxistina xwe hînî
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,The id yekane ji bo êşekê hemû hisab dubare bikin. Ev li ser submit bi giştî.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Developer
 DocType: Item,Minimum Order Qty,Siparîşa hindiktirîn Qty
 DocType: Pricing Rule,Supplier Type,Supplier Type
@@ -357,17 +368,19 @@
 DocType: Item,Publish in Hub,Weşana Hub
 DocType: Student Admission,Student Admission,Admission Student
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Babetê {0} betal e
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Daxwaza maddî
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Babetê {0} betal e
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Daxwaza maddî
 DocType: Bank Reconciliation,Update Clearance Date,Update Date Clearance
 DocType: Item,Purchase Details,Details kirîn
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Babetê {0} di &#39;Delîlên Raw Supplied&#39; sifrê li Purchase Kom nehate dîtin {1}
 DocType: Patient Relation,Relation,Meriv
 DocType: Shipping Rule,Worldwide Shipping,Shipping Worldwide
 DocType: Patient Relation,Mother,Dê
+DocType: Restaurant Reservation,Reservation End Time,Demjimêra Niştecîhê
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,emir Confirmed ji muşteriyan.
 DocType: Purchase Receipt Item,Rejected Quantity,Quantity red
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Daxwaza tezmînatê {0} hat afirandin
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Daxwaza tezmînatê {0} hat afirandin
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Sensiyatîfa kêm
 DocType: Notification Control,Notification Control,Control agahdar bike
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Ji kerema xwe hûn perwerdeya xwe temam kirî piştrast bikin
 DocType: Lead,Suggestions,pêşniyarên
@@ -387,7 +400,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,slip Emails meaş ji bo karker li ser epeyamê yê xwestî di karkirinê yên hilbijartî
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"The yekem Approver Leave di lîsteyê de, wê bê weke default Leave Approver danîn"
 DocType: Tax Rule,Shipping County,Shipping County
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Fêrbûn
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Fêrbûn
 DocType: Asset,Next Depreciation Date,Next Date Farhad.
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Cost Activity per Employee
 DocType: Accounts Settings,Settings for Accounts,Mîhengên ji bo Accounts
@@ -398,13 +411,13 @@
 DocType: Item,Synced With Hub,Senkronîzekirin Bi Hub
 DocType: Vehicle,Fleet Manager,Fîloya Manager
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} nikare were ji bo em babete neyînî {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Şîfreya çewt
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Şîfreya çewt
 DocType: Item,Variant Of,guhertoya Of
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Qediya Qty ne dikarin bibin mezintir &#39;Qty ji bo Manufacture&#39;
 DocType: Period Closing Voucher,Closing Account Head,Girtina Serokê Account
 DocType: Employee,External Work History,Dîroka Work Link
 DocType: Physician,Time per Appointment,Demjimêr Demjimêr
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Error Reference bezandin
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Error Reference bezandin
 DocType: Appointment Type,Is Inpatient,Nexweş e
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Navê Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Li Words (Export) xuya dê bibe dema ku tu Delivery Têbînî xilas bike.
@@ -413,19 +426,18 @@
 DocType: Lead,Industry,Ava
 DocType: Employee,Job Profile,Profile Job
 DocType: BOM Item,Rate & Amount,Nirxandin û Nirxandinê
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ji kerema xwe veşartina nimûne ji bo Tevlêbûnê ya Setup&gt; Pirtûka Nimûne
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Ev li ser vê kompaniyê veguherîn li ser veguhestinê ye. Ji bo agahdariyên jêrîn binêrin
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notify by Email li ser çêkirina Daxwaza Material otomatîk
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Berxwedana
 DocType: Journal Entry,Multi Currency,Multi Exchange
 DocType: Payment Reconciliation Invoice,Invoice Type,bi fatûreyên Type
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Giştî&gt; Giştî ya Giştî&gt; Herêmî
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Delivery Note
 DocType: Consultation,Encounter Impression,Têkoşîna Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Avakirina Baca
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Cost ji Asset Sold
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,"Peyam di peredana hatiye guherandin, piştî ku we paş de vekişiyaye. Ji kerema xwe re dîsa ew vekişîne."
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} du caran li Bacê babet ketin
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Nasname ji bo vê hefteyê û çalakiyên hîn
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} du caran li Bacê babet ketin
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Nasname ji bo vê hefteyê û çalakiyên hîn
 DocType: Student Applicant,Admitted,xwe mikur
 DocType: Workstation,Rent Cost,Cost kirê
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Şêwaz Piştî Farhad.
@@ -440,36 +452,35 @@
 DocType: Shipping Rule,Valid for Countries,Pasport tenê ji bo welatên
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Em babete a Şablon e û dikare karê bê bikaranîn. xerîbkirin babete wê bê ser nav Guhertoyên kopîkirin, eger &#39;No ber Bigire&#39; Biryar e"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total Order çavlêkirina
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","teklîfê Employee (nimûne: CEO, Director û hwd.)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","teklîfê Employee (nimûne: CEO, Director û hwd.)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Rate li ku Mişterî Exchange ji bo pereyan base mişterî bîya
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kurs Scheduling Tool
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Purchase bi fatûreyên nikare li hemberî sermaye heyî ne bên kirin {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Bêguman] Di dema destpêkirina% s ji bo% s de çewtî
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Bêguman] Di dema destpêkirina% s ji bo% s de çewtî
 DocType: Item Tax,Tax Rate,Rate bacê
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} berê ji bo karkirinê yên bi rêk û {1} ji bo dema {2} ji bo {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Hilbijêre babetî
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Hilbijêre babetî
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Bikirin bi fatûreyên {0} ji xwe şandin
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch No divê eynî wek {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convert to non-Group
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Batch (gelek) ji vî babetî.
 DocType: C-Form Invoice Detail,Invoice Date,Date bi fatûreyên
 DocType: GL Entry,Debit Amount,Şêwaz Debit
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Li wir bi tenê dikare 1 Account per Company di be {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Ji kerema xwe ve attachment bibînin
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Li wir bi tenê dikare 1 Account per Company di be {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Ji kerema xwe ve attachment bibînin
 DocType: Purchase Order,% Received,% pêşwazî
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Create komên xwendekaran
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Setup Jixwe Complete !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Setup Jixwe Complete !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Credit Têbînî Mîqdar
 DocType: Setup Progress Action,Action Document,Belgeya Çalakiyê
 ,Finished Goods,Goods qedand
 DocType: Delivery Note,Instructions,Telîmata
 DocType: Quality Inspection,Inspected By,teftîş kirin By
 DocType: Maintenance Visit,Maintenance Type,Type Maintenance
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} ku di Kurs jimartin ne {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kodê Asayîş&gt; Tîpa Group&gt; Brand
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} ku di Kurs jimartin ne {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial No {0} nayê to Delivery Têbînî girêdayî ne {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,lê zêde bike babetî
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,lê zêde bike babetî
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Babet Berhemên parametreyê
 DocType: Leave Application,Leave Approver Name,Dev ji Name Approver
 DocType: Depreciation Schedule,Schedule Date,Date de Cedwela
@@ -491,7 +502,7 @@
 DocType: Salary Slip Timesheet,Working Hours,dema xebatê
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Guhertina Guherandinên / hejmara cihekê niha ya series heyî.
 DocType: Dosage Strength,Strength,Qawet
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Create a Mişterî ya nû
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Create a Mişterî ya nû
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ger Rules Pricing multiple berdewam bi ser keve, bikarhênerên pirsî danîna Priority bi destan ji bo çareserkirina pevçûnan."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Create Orders Purchase
 ,Purchase Register,Buy Register
@@ -510,7 +521,7 @@
 DocType: Lab Test Template,Single,Yekoyek
 DocType: Salary Slip,Total Loan Repayment,Total vegerandinê Loan
 DocType: Account,Cost of Goods Sold,Cost mal Sold
-DocType: Purchase Invoice,Yearly,Hit
+DocType: Subscription,Yearly,Hit
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Ji kerema xwe ve Navenda Cost binivîse
 DocType: Drug Prescription,Dosage,Pîvanîk
 DocType: Journal Entry Account,Sales Order,Sales Order
@@ -541,7 +552,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,settings Global ji bo hemû pêvajoyên bi aktîvîteyên.
 DocType: Accounts Settings,Accounts Frozen Upto,Hesabên Frozen Upto
 DocType: SMS Log,Sent On,şandin ser
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Pêşbîr {0} çend caran li Attributes Table hilbijartin
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Pêşbîr {0} çend caran li Attributes Table hilbijartin
 DocType: HR Settings,Employee record is created using selected field. ,record Employee bikaranîna hilbijartî tên afirandin e.
 DocType: Sales Order,Not Applicable,Rêveber
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,master Holiday.
@@ -567,13 +578,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Hemû pelên bi rêk û wêneke e
 DocType: Patient,AB Positive,AB positive
 DocType: Job Opening,Description of a Job Opening,Description of a Opening Job
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,çalakiyên hîn ji bo îro
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,çalakiyên hîn ji bo îro
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,record amadebûnê.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Component meaş ji bo payroll li timesheet.
 DocType: Sales Order Item,Used for Production Plan,Tê bikaranîn ji bo Plan Production
 DocType: Employee Loan,Total Payment,Total Payment
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time di navbera Operasyonên (li mins)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,"{0} {1} betal e da ku di çalakiyê de ne, dikare bi dawî bibe"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,"{0} {1} betal e da ku di çalakiyê de ne, dikare bi dawî bibe"
 DocType: Customer,Buyer of Goods and Services.,Buyer yên mal û xizmetan.
 DocType: Journal Entry,Accounts Payable,bikarhênerên cîhde
 DocType: Patient,Allergies,Alerjî
@@ -585,23 +596,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Biryarên kirînê bikujin
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,"Lîsteya çend ji mişterîyên xwe. Ew dikarin bibin rêxistin, yan jî kesên."
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Parts bes ji bo Build
+DocType: POS Profile User,POS Profile User,POS Profîl User
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Dahata rasterast
 DocType: Patient Appointment,Date TIme,Dîroka TIme
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Dikarin li ser Account ne filter bingeha, eger destê Account komkirin"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Berpirsê kargêrî
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Tikaye Kurs hilbijêre
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Tikaye Kurs hilbijêre
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Tikaye Kurs hilbijêre
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Tikaye Kurs hilbijêre
 DocType: Codification Table,Codification Table,Table Codification
 DocType: Timesheet Detail,Hrs,hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Ji kerema xwe ve Company hilbijêre
 DocType: Stock Entry Detail,Difference Account,Account Cudahiya
 DocType: Purchase Invoice,Supplier GSTIN,Supplier GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Can karê nêzîkî wek karekî girêdayî wê {0} e girtî ne ne.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,Ji kerema xwe ve Warehouse ji bo ku Daxwaza Material wê werin zindî binivîse
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Can karê nêzîkî wek karekî girêdayî wê {0} e girtî ne ne.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Ji kerema xwe ve Warehouse ji bo ku Daxwaza Material wê werin zindî binivîse
 DocType: Production Order,Additional Operating Cost,Cost Operating Additional
 DocType: Lab Test Template,Lab Routine,Lîwaya Labê
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosmetics
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","To merge, milkên li jêr, divê ji bo hem tomar be"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","To merge, milkên li jêr, divê ji bo hem tomar be"
 DocType: Shipping Rule,Net Weight,Loss net
 DocType: Employee,Emergency Phone,Phone Emergency
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Kirrîn
@@ -612,7 +624,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Tikaye pola bo Qeyrana 0% define
 DocType: Sales Order,To Deliver,Gihandin
 DocType: Purchase Invoice Item,Item,Şanî
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Serial no babete nikare bibe fraction
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Sensîteya Bilind
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Serial no babete nikare bibe fraction
 DocType: Journal Entry,Difference (Dr - Cr),Cudahiya (Dr - Kr)
 DocType: Account,Profit and Loss,Qezenc û Loss
 DocType: Patient,Risk Factors,Faktorên Raks
@@ -621,7 +634,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,birêvebirina îhaleya
 DocType: Vital Signs,Body Temperature,Temperature Temperature
 DocType: Project,Project will be accessible on the website to these users,Project li ser malpera ji bo van bikarhênerên were gihiştin
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Pergala projeyê define.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Pergala projeyê define.
 DocType: Supplier Scorecard,Weighting Function,Performansa Barkirina
 DocType: Physician,OP Consulting Charge,OP Consulting Charge
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Xwe hilbijêre
@@ -635,7 +648,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Increment nikare bibe 0
 DocType: Production Planning Tool,Material Requirement,Divê materyalên
 DocType: Company,Delete Company Transactions,Vemirandina Transactions Company
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Çavkanî No û Date: Çavkanî ji bo muameleyan Bank wêneke e
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Çavkanî No û Date: Çavkanî ji bo muameleyan Bank wêneke e
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Lê zêde bike Baca / Edit û doz li
 DocType: Payment Entry Reference,Supplier Invoice No,Supplier bi fatûreyên No
 DocType: Territory,For reference,ji bo referansa
@@ -643,12 +656,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","ne dikarin jêbirin Serial No {0}, wekî ku di karbazarên stock bikaranîn"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Girtina (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Slav
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Babetê move
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Babetê move
 DocType: Serial No,Warranty Period (Days),Period Warranty (Days)
 DocType: Installation Note Item,Installation Note Item,Installation Têbînî babetî
 DocType: Production Plan Item,Pending Qty,Pending Qty
 DocType: Budget,Ignore,Berçavnegirtin
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} e çalak ne
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} e çalak ne
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,aliyên check Setup ji bo çapkirinê
 DocType: Salary Slip,Salary Slip Timesheet,Timesheet meaş Slip
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Supplier Warehouse diyarkirî ji bo-sub bi peyman Meqbûz Purchase
@@ -657,7 +670,7 @@
 DocType: Pricing Rule,Sales Partner,Partner Sales
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,All Supplier Scorecards.
 DocType: Buying Settings,Purchase Receipt Required,Meqbûz kirînê pêwîst
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Rate Valuation diyarkirî ye, eger Opening Stock ketin"
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,"Rate Valuation diyarkirî ye, eger Opening Stock ketin"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,No records dîtin li ser sifrê bi fatûreyên
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Ji kerema xwe ve yekem Company û Partiya Type hilbijêre
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Financial / salê.
@@ -694,7 +707,7 @@
 DocType: Quotation,Quotation To,quotation To
 DocType: Lead,Middle Income,Dahata Navîn
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default Unit ji pîvanê ji bo babet {0} rasterast nikarin bên guhertin ji ber ku te berê kirin hin muameleyan (s) bi UOM din. Ji we re lazim ê ji bo afirandina a babet nû bi kar Default UOM cuda.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default Unit ji pîvanê ji bo babet {0} rasterast nikarin bên guhertin ji ber ku te berê kirin hin muameleyan (s) bi UOM din. Ji we re lazim ê ji bo afirandina a babet nû bi kar Default UOM cuda.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,butçe ne dikare bibe neyînî
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Xêra xwe li Company
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Xêra xwe li Company
@@ -709,6 +722,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Hilbijêre Account Payment ji bo Peyam Bank
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Qeydên a Karkeran, ji bo birêvebirina pelên, îdîaya k&#39;îsî û payroll"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Dema nivîsandinê
+DocType: Restaurant Reservation,Restaurant Reservation,Reservation Restaurant
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Writing Pêşniyarek
 DocType: Payment Entry Deduction,Payment Entry Deduction,Payment dabirîna Peyam
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Din Person Sales {0} bi heman id karkirinê heye
@@ -716,7 +730,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Masters
 DocType: Assessment Plan,Maximum Assessment Score,Maximum Score Nirxandina
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Kurdî Nexşe Transaction Update Bank
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Tracking Time
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Tracking Time
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,Li Curenivîsên Dubare BO ardûyê
 DocType: Fiscal Year Company,Fiscal Year Company,Sal Company malî
 DocType: Packing Slip Item,DN Detail,Detail DN
@@ -725,8 +739,9 @@
 DocType: Batch,Batch Description,batch Description
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Afirandina komên xwendekaran
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Afirandina komên xwendekaran
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Payment Account Gateway tên afirandin ne, ji kerema xwe ve yek bi destan biafirîne."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Payment Account Gateway tên afirandin ne, ji kerema xwe ve yek bi destan biafirîne."
 DocType: Supplier Scorecard,Per Year,Serê sal
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Ji bo vê bernameya ku DOB-ê ji bo serîlêdanê qebûl nake
 DocType: Sales Invoice,Sales Taxes and Charges,Baca firotina û doz li
 DocType: Employee,Organization Profile,rêxistina Profile
 DocType: Vital Signs,Height (In Meter),Bilind (Di Meterê de)
@@ -762,7 +777,7 @@
 DocType: Student Batch Name,Batch Name,Navê batch
 DocType: Fee Validity,Max number of visit,Hejmareke zêde ya serdana
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet tên afirandin:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Ji kerema xwe ve Cash default an account Bank set li Mode of Payment {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Ji kerema xwe ve Cash default an account Bank set li Mode of Payment {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,Nivîsîn
 DocType: GST Settings,GST Settings,Settings gst
 DocType: Selling Settings,Customer Naming By,Qada Mişterî By
@@ -794,16 +809,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,"Bac, Cost siwar bûn û doz li"
 DocType: Production Order Operation,Actual Start Time,Time rastî Start
 DocType: BOM Operation,Operation Time,Time Operation
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Qedandin
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Qedandin
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Bingeh
 DocType: Timesheet,Total Billed Hours,Total Hours billed
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Hewe Off Mîqdar
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Hewe Off Mîqdar
 DocType: Leave Block List Allow,Allow User,Destûrê bide Bikarhêner
 DocType: Journal Entry,Bill No,Bill No
 DocType: Company,Gain/Loss Account on Asset Disposal,Account qezenc / Loss li ser çespandina Asset
 DocType: Vehicle Log,Service Details,Details Service
 DocType: Vehicle Log,Service Details,Details Service
-DocType: Purchase Invoice,Quarterly,Bultena
+DocType: Subscription,Quarterly,Bultena
 DocType: Lab Test Template,Grouped,Grouped
 DocType: Selling Settings,Delivery Note Required,Delivery Têbînî pêwîst
 DocType: Bank Guarantee,Bank Guarantee Number,Bank Hejmara garantiyalênêrînê
@@ -813,12 +828,12 @@
 DocType: Student Attendance,Student Attendance,Beşdariyê Student
 DocType: Sales Invoice Timesheet,Time Sheet,Bîlançoya Time
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush madeyên xav ser
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Ji kerema xwe ve hûragahiyan babete binivîse
 DocType: Interest,Interest,Zem
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Sales Pre
 DocType: Purchase Receipt,Other Details,din Details
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,Template Template
+DocType: Restaurant Order Entry Item,Served,Served
 DocType: Account,Accounts,bikarhênerên
 DocType: Vehicle,Odometer Value (Last),Nirx Green (dawî)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Templates of supplier scorecard standard.
@@ -830,26 +845,28 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Preview Bikini Salary
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Account {0} hatiye bicihkirin çend caran
 DocType: Account,Expenses Included In Valuation,Mesrefên di nav Valuation
-DocType: Hub Settings,Seller City,Seller City
 ,Absent Student Report,Absent Report Student
 DocType: Email Digest,Next email will be sent on:,email Next dê li ser şand:
 DocType: Offer Letter Term,Offer Letter Term,Pêşkêşkirina Letter Term
 DocType: Supplier Scorecard,Per Week,Per Week
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Em babete Guhertoyên.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Em babete Guhertoyên.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Tendurist
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Babetê {0} nehate dîtin
 DocType: Bin,Stock Value,Stock Nirx
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,Daxuyaniya Fee ya di paşê paşê de were afirandin. Di rewşeke çewtiyê de peyamên çewtiyê dê di navdêriya weşanê de bêne nûkirin.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Company {0} tune
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} xerca xercê heya ku {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} xerca xercê heya ku {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Type dara
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Qty telef Per Unit
 DocType: Serial No,Warranty Expiry Date,Mîsoger Date Expiry
 DocType: Material Request Item,Quantity and Warehouse,Quantity û Warehouse
+DocType: Hub Settings,Unregister,Unregister
 DocType: Sales Invoice,Commission Rate (%),Komîsyona Rate (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Please select Program
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Please select Program
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Please select Program
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Please select Program
 DocType: Project,Estimated Cost,Cost texmînkirin
 DocType: Purchase Order,Link to material requests,Link to daxwazên maddî
+DocType: Hub Settings,Publish,Weşandin
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
 DocType: Journal Entry,Credit Card Entry,Peyam Credit Card
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Company û Hesab
@@ -860,13 +877,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Close Opportunity Piştî Rojan
 ,Reserved,reserved.
 DocType: Purchase Order,Supply Raw Materials,Supply Alav Raw
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Roja ku fatûra next bi giştî wê bê. Ev li ser submit bi giştî.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,heyînên vegeryayî
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} e a stock babet ne
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',Ji kerema xwe re bersiva we re biceribînin ji hêla &#39;Feedback Perwerde&#39; bitikîne û paşê &#39;Nû&#39;
 DocType: Mode of Payment Account,Default Account,Account Default
 DocType: Payment Entry,Received Amount (Company Currency),Pêşwaziya Mîqdar (Company Exchange)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,Lead bê mîhenkirin eger derfetek e ji Lead kirin
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,Lead bê mîhenkirin eger derfetek e ji Lead kirin
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Ji kerema xwe re bi roj off heftane hilbijêre
 DocType: Patient,O Negative,O Negative
 DocType: Production Order Operation,Planned End Time,Bi plan Time End
@@ -882,10 +898,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Înercî
 DocType: Opportunity,Opportunity From,derfet ji
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,daxuyaniyê de meaşê mehane.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Şirketê zêde bike
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Hejmarên Serial Ji bo {2} Pêdivî ye. Te destnîşan kir {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Hejmarên Serial Ji bo {2} Pêdivî ye. Te destnîşan kir {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Ji kerema xwe sifrê hilbijêrin
 DocType: BOM,Website Specifications,Specifications Website
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} Navnîşa e-nameyek e ku li &#39;Recipients&#39;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} Navnîşa e-nameyek e ku li &#39;Recipients&#39;
 DocType: Special Test Items,Particulars,Peyvên
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antîbîyotîk.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Ji {0} ji type {1}
@@ -893,11 +909,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Row {0}: Factor Converter wêneke e
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Rules Price Multiple bi pîvanên heman heye, ji kerema xwe ve çareser şer ji aliyê hêzeke pêşanî. Rules Biha: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,ne dikarin neçalak bikî an betal BOM wekî ku bi din dikeye girêdayî
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,ne dikarin neçalak bikî an betal BOM wekî ku bi din dikeye girêdayî
 DocType: Opportunity,Maintenance,Lênerrînî
 DocType: Item Attribute Value,Item Attribute Value,Babetê nirxê taybetmendiyê
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,kampanyayên firotina.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Make timesheet
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Make timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -935,12 +951,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Ji kerema xwe ve yekem babetî bikevin
 DocType: Account,Liability,Bar
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Şêwaz belê ne dikarin li Row mezintir Mîqdar Îdîaya {0}.
+DocType: Salary Detail,Do not include in total,Bi tevahî nabe
 DocType: Company,Default Cost of Goods Sold Account,Default Cost ji Account Goods Sold
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,List Price hilbijartî ne
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,List Price hilbijartî ne
 DocType: Employee,Family Background,Background Family
 DocType: Request for Quotation Supplier,Send Email,Send Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Hişyarî: Attachment Invalid {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,No Destûr
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Hişyarî: Attachment Invalid {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,No Destûr
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Gotinê
 DocType: Vital Signs,Heart Rate / Pulse,Dilê Dil / Pulse
 DocType: Company,Default Bank Account,Account Bank Default
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Fîltre li ser bingeha Partîya, Partîya select yekem Type"
@@ -968,12 +986,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Babetê Row {IDX}: {doctype} {docname} nayê li jor de tune ne &#39;{doctype}&#39; sifrê
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} ji xwe temam an jî betalkirin
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,No erkên
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dotira rojê ya meha ku li ser fatûra auto nimûne, 05, 28 û hwd. Jî wê bi giştî bê"
 DocType: Item Variant Settings,Copy Fields to Variant,Keviyên Kopî Variant
 DocType: Asset,Opening Accumulated Depreciation,Vekirina Farhad. Accumulated
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score gerek kêmtir an jî wekhev ji bo 5 be
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program hejmartina Tool
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,records C-Form
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,records C-Form
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Mişterî û Supplier
 DocType: Email Digest,Email Digest Settings,Email Settings Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Spas dikim ji bo karê te!
@@ -991,13 +1008,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Rewşa Status
 DocType: Maintenance Visit,Completion Status,Rewş cebîr
 DocType: HR Settings,Enter retirement age in years,temenê teqawidîyê Enter di salên
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Warehouse target
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Ji kerema xwe re warehouse hilbijêre
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Warehouse target
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Ji kerema xwe re warehouse hilbijêre
 DocType: Cheque Print Template,Starting location from left edge,Guherandinên location ji devê hiştin
 DocType: Item,Allow over delivery or receipt upto this percent,Destûrê bide ser teslîmkirina an jî meqbûza upto ev ji sedî
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Beşdariyê Import
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Hemû Groups babetî
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Hemû Groups babetî
 DocType: Process Payroll,Activity Log,Activity bike Têkeve Têkeve
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Profit Net / Loss
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,"Otomatîk helbestan, peyamek li ser sertewandina muamele."
@@ -1009,7 +1026,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,projeya Qty
 DocType: Sales Invoice,Payment Due Date,Payment Date ji ber
 DocType: Drug Prescription,Interval UOM,UOM Interfer
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Babetê Variant {0} ji xwe bi taybetmendiyên xwe heman heye
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Babetê Variant {0} ji xwe bi taybetmendiyên xwe heman heye
+DocType: Item,Hub Publishing Details,Agahdariyên Hub
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;Dergeh&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Open To Do
 DocType: Notification Control,Delivery Note Message,Delivery Têbînî Message
@@ -1029,10 +1047,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: Materyal rawek nikare wek tişta sereke ne
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Total doz li wergirtinê li Purchase Nawy Meqbûz sifrê divê eynî wek Total Bac, û doz li be"
 DocType: Sales Team,Incentives,aborîve
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Bo Hub
 DocType: SMS Log,Requested Numbers,Numbers xwestin
 DocType: Production Planning Tool,Only Obtain Raw Materials,Tenê Wergirtin Alav Raw
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,nirxandina Performance.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Ne bitenê &#39;bi kar bîne ji bo Têxe selikê&#39;, wek Têxe selikê pêk tê û divê bi kêmanî yek Rule Bacê ji bo Têxe selikê li wir be"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Ne bitenê &#39;bi kar bîne ji bo Têxe selikê&#39;, wek Têxe selikê pêk tê û divê bi kêmanî yek Rule Bacê ji bo Têxe selikê li wir be"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Peyam di peredana {0} li dijî Order {1}, ka jî, divê wekî pêşda li vê fatoreyê de vekişiyaye ve girêdayî ye."
 DocType: Sales Invoice Item,Stock Details,Stock Details
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Project Nirx
@@ -1051,12 +1070,14 @@
 DocType: Salary Slip,Working Days,rojên xebatê
 DocType: Serial No,Incoming Rate,Rate Incoming
 DocType: Packing Slip,Gross Weight,Giraniya
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,The name of şirketa we ji bo ku hûn bi avakirina vê sîstemê.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Hub Enable
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,The name of şirketa we ji bo ku hûn bi avakirina vê sîstemê.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Usa jî cejnên li Bi tevahî tune. ji rojên xebatê
 DocType: Job Applicant,Hold,Rawestan
 DocType: Employee,Date of Joining,Date of bizaveka
 DocType: Naming Series,Update Series,update Series
 DocType: Supplier Quotation,Is Subcontracted,Ma Subcontracted
+DocType: Restaurant Table,Minimum Seating,Min kêm rûniştinê
 DocType: Item Attribute,Item Attribute Values,Nirxên Pêşbîr babetî
 DocType: Examination Result,Examination Result,Encam muayene
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Meqbûz kirîn
@@ -1067,13 +1088,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Nikare bibînin Slot Time di pêş {0} rojan de ji bo Operasyona {1}
 DocType: Production Order,Plan material for sub-assemblies,maddî Plan ji bo sub-meclîsên
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Partners Sales û Herêmê
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} divê çalak be
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} divê çalak be
 DocType: Journal Entry,Depreciation Entry,Peyam Farhad.
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Ji kerema xwe re ji cureyê pelgeyê hilbijêre
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Betal Serdan Material {0} berî betalkirinê ev Maintenance Visit
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial No {0} nayê to Babetê girêdayî ne {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,required Qty
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Wargehan de bi mêjera yên heyî dikarin bi ledger ne bê guhertin.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Wargehan de bi mêjera yên heyî dikarin bi ledger ne bê guhertin.
 DocType: Bank Reconciliation,Total Amount,Temamê meblaxa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publishing Internet
 DocType: Prescription Duration,Number,Jimare
@@ -1084,7 +1105,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lîsteya firotina Price
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Heke kontrol kirin, dê mişterek dê were çêkirin, mapped to nexweş. Li dijî vê miqametê dê dê vexwendin nexweşan. Hûn dikarin di dema dema dermanan de bargêrînerê mêvandar hilbijêre."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Weşana senkronîze tomar
 DocType: Bank Reconciliation,Account Currency,account Exchange
 DocType: Lab Test,Sample ID,Nasnameya nimûne
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Ji kerema xwe re qala Round Account Off li Company
@@ -1093,11 +1113,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Xebatkarê {0} e çalak ne an tune ne
 DocType: Fee Structure,Components,Components
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Ji kerema xwe ve Asset Category li babet binivîse {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Babetê Variants {0} ve
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Babetê Variants {0} ve
 DocType: Quality Inspection Reading,Reading 6,Reading 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Can ne {0} {1} {2} bêyî ku fatûra hilawîstî neyînî
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","bên afirandin. Heke derengî, divê hûn bixweber bikin &quot;Guhertina Di Roja meha&quot; de"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Can ne {0} {1} {2} bêyî ku fatûra hilawîstî neyînî
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Bikirin bi fatûreyên Advance
-DocType: Hub Settings,Sync Now,Sync Now
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: entry Credit ne bi were bi girêdayî a {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Define budceya ji bo salekê aborî.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Default account Bank / Cash wê were li POS bi fatûreyên ve dema ku ev moda hilbijartî ye.
@@ -1109,13 +1130,13 @@
 DocType: Item,Is Purchase Item,E Purchase babetî
 DocType: Asset,Purchase Invoice,Buy bi fatûreyên
 DocType: Stock Ledger Entry,Voucher Detail No,Detail fîşeke No
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,New bi fatûreyên Sales
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,New bi fatûreyên Sales
 DocType: Stock Entry,Total Outgoing Value,Total Nirx Afganî
 DocType: Physician,Appointments,Rûniştin
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Vekirina Date û roja dawî divê di heman sala diravî be
 DocType: Lead,Request for Information,Daxwaza ji bo Information
 ,LeaderBoard,Leaderboard
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Syncê girêdayî hisab
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Syncê girêdayî hisab
 DocType: Payment Request,Paid,tê dayin
 DocType: Program Fee,Program Fee,Fee Program
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1134,11 +1155,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Bikirin Order babetî
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Dahata nerasterast di
 DocType: Student Attendance Tool,Student Attendance Tool,Amûra Beşdariyê Student
+DocType: Restaurant Menu,Price List (Auto created),Lîsteya bihayê (Auto-created)
 DocType: Cheque Print Template,Date Settings,Settings Date
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variance
 ,Company Name,Navê Company
 DocType: SMS Center,Total Message(s),Total Message (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Hilbijêre babet ji bo transfera
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Hilbijêre babet ji bo transfera
 DocType: Purchase Invoice,Additional Discount Percentage,Rêjeya Discount Additional
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,View lîsteya hemû videos alîkarî
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,serê account Hilbijêre ji bank ku check danenîye bû.
@@ -1156,6 +1178,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Jimarvan
 DocType: Workstation,Electricity Cost,Cost elektrîkê
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ma Employee Birthday Reminders bişîne ne
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Settings
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Berhemên Pêdivî ye
 DocType: Item,Inspection Criteria,Şertên Serperiştiya
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,cezakirin
 DocType: BOM Website Item,BOM Website Item,BOM babet Website
@@ -1173,11 +1197,11 @@
 DocType: Journal Entry,Total Amount in Words,Temamê meblaxa li Words
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"çewtiyek derket. Yek ji sedemên muhtemel, dikarin bibin, ku tu formê de hatine tomarkirin ne. Ji kerema xwe ve support@erpnext.com li gel ku pirsgirêk berdewam dike."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Têxe min
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},"Order Type, divê yek ji yên bê {0}"
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},"Order Type, divê yek ji yên bê {0}"
 DocType: Lead,Next Contact Date,Next Contact Date
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,vekirina Qty
 DocType: Healthcare Settings,Appointment Reminder,Reminder Reminder
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Ji kerema xwe ve Account ji bo Guhertina Mîqdar binivîse
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Ji kerema xwe ve Account ji bo Guhertina Mîqdar binivîse
 DocType: Student Batch Name,Student Batch Name,Xwendekarên Name Batch
 DocType: Consultation,Doctor,Pizişk
 DocType: Holiday List,Holiday List Name,Navê Lîsteya Holiday
@@ -1185,12 +1209,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Kurs de Cedwela
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Vebijêrkên Stock
 DocType: Journal Entry Account,Expense Claim,mesrefan
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Ma tu bi rastî dixwazî ji bo restorekirina vê hebûnê belav buye?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Qty ji bo {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Ma tu bi rastî dixwazî ji bo restorekirina vê hebûnê belav buye?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Qty ji bo {0}
 DocType: Leave Application,Leave Application,Leave Application
 DocType: Patient,Patient Relation,Têkiliya Nexweş
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Dev ji Tool Kodek
+DocType: Item,Hub Category to Publish,Kategorî Weşanê
 DocType: Leave Block List,Leave Block List Dates,Dev ji Lîsteya Block Kurdî Nexşe
+DocType: Sales Invoice,Billing Address GSTIN,Navnîşana GSTIN
 DocType: Workstation,Net Hour Rate,Rate Saet Net
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Cost Landed Meqbûz Purchase
 DocType: Company,Default Terms,Termên Default
@@ -1200,11 +1226,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Ji kerema xwe binivîsin a {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,tomar rakirin bi ti guhertinek di dorpêçê de an nirxê.
 DocType: Delivery Note,Delivery To,Delivery To
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,table taybetmendiyê de bivênevê ye
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,table taybetmendiyê de bivênevê ye
 DocType: Production Planning Tool,Get Sales Orders,Get Orders Sales
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ne dikare bibe neyînî
 DocType: Training Event,Self-Study,Xweseriya Xweser
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Kêmkirinî
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Kêmkirinî
 DocType: Asset,Total Number of Depreciations,Hejmara giştî ya Depreciations
 DocType: Sales Invoice Item,Rate With Margin,Rate Bi Kenarê
 DocType: Sales Invoice Item,Rate With Margin,Rate Bi Kenarê
@@ -1212,7 +1238,7 @@
 DocType: Task,Urgent,Acîl
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Ji kerema xwe re ID Row derbasdar bo row {0} li ser sifrê diyar {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Ne pejirandin bibînin:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Ji kerema xwe qadek hilbijêre ji bo numpadê biguherînin
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Ji kerema xwe qadek hilbijêre ji bo numpadê biguherînin
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Go to the desktop û dest bi bikaranîna ERPNext
 DocType: Item,Manufacturer,Çêker
 DocType: Landed Cost Item,Purchase Receipt Item,Buy babet Meqbûz
@@ -1243,8 +1269,8 @@
 DocType: GL Entry,Against,Dijî
 DocType: Item,Default Selling Cost Center,Default Navenda Cost Selling
 DocType: Sales Partner,Implementation Partner,Partner Kiryariya
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Kode ya postî
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Sales Order {0} e {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Kode ya postî
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Sales Order {0} e {1}
 DocType: Opportunity,Contact Info,Têkilî
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Making Stock Arşîva
 DocType: Packing Slip,Net Weight UOM,Net Loss UOM
@@ -1255,6 +1281,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Get Weekly Off Kurdî Nexşe
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,End Date nikare bibe kêmtir ji Serî Date
 DocType: Sales Person,Select company name first.,Hilbijêre navê kompaniya yekemîn a me.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Low to High
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Quotations ji Suppliers wergirt.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOM re biguherînin û buhayên herî dawî yên li BOMs nû bikin
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},{0} | {1} {2}
@@ -1275,7 +1302,7 @@
 DocType: Program Enrollment,Transportation,Neqlîye
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Pêşbîr Invalid
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} de divê bê şandin
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Quantity gerek kêmtir an jî wekhev be {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Quantity gerek kêmtir an jî wekhev be {0}
 DocType: SMS Center,Total Characters,Total Characters
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Ji kerema xwe ve BOM di warê BOM hilbijêre ji bo babet {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Detail C-Form bi fatûreyên
@@ -1290,7 +1317,7 @@
 ,Ordered Items To Be Billed,Nawy emir ye- Be
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Ji Range ev be ku kêmtir ji To Range
 DocType: Global Defaults,Global Defaults,Têrbûn Global
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Project Dawetname Tevkarî
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Project Dawetname Tevkarî
 DocType: Salary Slip,Deductions,bi dabirînê
 DocType: Leave Allocation,LAL/,lal /
 DocType: Setup Progress Action,Action Name,Navekî Çalak
@@ -1308,13 +1335,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Sales bi fatûreyên Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Tu tişt ji bo daxwazkirina
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Din record Budget &#39;{0}&#39; jixwe li dijî heye {1} &#39;{2}&#39; ji bo sala diravî ya {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&#39;Actual Date Serî&#39; nikare bibe mezintir &#39;Date End Actual&#39;
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&#39;Actual Date Serî&#39; nikare bibe mezintir &#39;Date End Actual&#39;
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Serekî
 DocType: Cheque Print Template,Payer Settings,Settings Jaaniya
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ev dê ji qanûna Babetê ji guhertoya bendên. Ji bo nimûne, eger kurtenivîsên SYR ji we &quot;SM&quot;, e û code babete de ye &quot;T-SHIRT&quot;, code babete ji yên ku guhertoya wê bibe &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pay Net (di peyvên) xuya wê carekê hûn Slip Salary li xilas bike.
 DocType: Purchase Invoice,Is Return,e Return
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Baldaynî
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Baldaynî
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Return / Debit Têbînî
 DocType: Price List Country,Price List Country,List Price Country
 DocType: Item,UOMs,UOMs
@@ -1329,17 +1356,18 @@
 DocType: Account,Balance Sheet,Bîlançoya
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Navenda bihagiranîyê ji bo babet bi Code Babetê &#39;
 DocType: Fee Validity,Valid Till,Till
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode tezmînatê nehatiye mîhenkirin. Ji kerema xwe, gelo account hatiye dîtin li ser Mode of Payments an li ser POS Profile danîn."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode tezmînatê nehatiye mîhenkirin. Ji kerema xwe, gelo account hatiye dîtin li ser Mode of Payments an li ser POS Profile danîn."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,babete eynî ne dikarin ketin bê çend caran.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","bikarhênerên berfireh dikarin di bin Groups kirin, di heman demê de entries dikare li dijî non-Groups kirin"
 DocType: Lead,Lead,Gûlle
 DocType: Email Digest,Payables,Payables
 DocType: Course,Course Intro,Intro Kurs
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Stock Peyam di {0} tên afirandin
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ji kerema xwe veşartina nimûne ji bo Tevlêbûnê ya Setup&gt; Pirtûka Nimûne
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Stock Peyam di {0} tên afirandin
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Redkirin Qty ne dikarin li Purchase Return ketin were
 ,Purchase Order Items To Be Billed,Buy Order Nawy ye- Be
 DocType: Purchase Invoice Item,Net Rate,Rate net
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Ji kerema xwe mişterek hilbijêrin
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Ji kerema xwe mişterek hilbijêrin
 DocType: Purchase Invoice Item,Purchase Invoice Item,Bikirin bi fatûreyên babetî
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Ledger Arşîva û GL berheman ji bo hilbijartin Purchase Receipts reposted
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Babetê 1
@@ -1360,7 +1388,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Pekana row {0} bi heman {1}
 ,Trial Balance,Balance trial
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Sal malî {0} nehate dîtin
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Avakirina Karmendên
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Avakirina Karmendên
 DocType: Sales Order,SO-,WIHA-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Ji kerema xwe ve yekem prefix hilbijêre
 DocType: Employee,O-,öó
@@ -1372,12 +1400,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,View Ledger
 DocType: Grading Scale,Intervals,navberan
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Kevintirîn
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","An Pol babet bi heman navî heye, ji kerema xwe biguherînin navê babete an jî datayê biguherîne koma babete de"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","An Pol babet bi heman navî heye, ji kerema xwe biguherînin navê babete an jî datayê biguherîne koma babete de"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,"Na, xwendekarê Mobile"
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Din ên cîhanê
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Din ên cîhanê
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,The babet {0} ne dikarin Batch hene
 ,Budget Variance Report,Budceya Report Variance
 DocType: Salary Slip,Gross Pay,Pay Gross
+DocType: Item,Is Item from Hub,Gelek ji Hubê ye
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Row {0}: Type Activity bivênevê ye.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,destkeftineke Paid
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Accounting Ledger
@@ -1387,8 +1416,9 @@
 DocType: Vehicle Log,Service Detail,Detail Service
 DocType: BOM,Item Description,Babetê Description
 DocType: Student Sibling,Student Sibling,Xwendekarên Sibling
-DocType: Purchase Invoice,Is Recurring,nûkirin e
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Mode Payment
 DocType: Purchase Invoice,Supplied Items,Nawy Supplied
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Ji kerema xwe veguherîna çalak a çalakiyê ji bo Restaurant {0}
 DocType: Student,STUD.,Fehlan.
 DocType: Production Order,Qty To Manufacture,Qty To Manufacture
 DocType: Email Digest,New Income,Dahata New
@@ -1399,6 +1429,7 @@
 ,Student and Guardian Contact Details,Xwendekar û Guardian Contact Details
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Row {0}: Ji bo dabînkerê {0} Email Address pêwîst e ji bo şandina email
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Opening demî
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,View Hub
 ,Employee Leave Balance,Xebatkarê Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Balance bo Account {0} tim divê {1}
 DocType: Patient Appointment,More Info,Agahî
@@ -1418,13 +1449,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Sales Order {0} ne derbasdar e
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Ji bo Quotations ji bo daxwaza nû ya hişyar bikin
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,emir kirînê alîkariya we û plankirina û li pey xwe li ser kirînên te
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Mixabin, şîrketên bi yek bên"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Mixabin, şîrketên bi yek bên"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Prescriptions
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}","Bi giştî dikele, Doza / Transfer {0} li Daxwaza Material {1} \ ne dikarin bibin mezintir dorpêçê de xwestin {2} ji bo babet {3}"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Biçûk
 DocType: Employee,Employee Number,Hejmara karker
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Case No (s) jixwe tê bikaranîn. Try ji Case No {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Case No (s) jixwe tê bikaranîn. Try ji Case No {0}
 DocType: Project,% Completed,% Qediya
 ,Invoiced Amount (Exculsive Tax),Şêwaz fatore (Exculsive Bacê)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Babetê 2
@@ -1439,11 +1470,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Mesref nerasterast di
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Row {0}: Qty wêneke e
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Cotyarî
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Syncê Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Syncê Master Data
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Products an Services te
 DocType: Special Test Items,Special Test Items,Tîmên Taybet
 DocType: Mode of Payment,Mode of Payment,Mode of Payment
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,"Website Wêne, divê pel giştî an URL malpera be"
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,"Website Wêne, divê pel giştî an URL malpera be"
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Ev komeke babete root e û ne jî dikarim di dahatûyê de were.
@@ -1451,9 +1482,9 @@
 DocType: Vehicle,Fuel UOM,UOM mazotê
 DocType: Warehouse,Warehouse Contact Info,Warehouse Têkilî
 DocType: Payment Entry,Write Off Difference Amount,Hewe Off Mîqdar Cudahiya
-DocType: Purchase Invoice,Recurring Type,nişankirin Type
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: email Employee dîtin ne, yanî email şandin ne"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: email Employee dîtin ne, yanî email şandin ne"
 DocType: Item,Foreign Trade Details,Details Bazirganiya Derve
+,Assessment Plan Status,Rewşa Nirxandina Rewşa Rewşa
 DocType: Email Digest,Annual Income,Dahata salane ya
 DocType: Serial No,Serial No Details,Serial Details No
 DocType: Purchase Invoice Item,Item Tax Rate,Rate Bacê babetî
@@ -1461,15 +1492,14 @@
 DocType: Student Group Student,Group Roll Number,Pol Hejmara Roll
 DocType: Student Group Student,Group Roll Number,Pol Hejmara Roll
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Ji bo {0}, tenê bikarhênerên credit dikare li dijî entry debit din ve girêdayî"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Bi tevahî ji hemû pîvan Erka divê bê nîşandan 1. kerema xwe pîvan ji hemû erkên Project eyar bikin li gorî
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Delivery Têbînî {0} tê şandin ne
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Bi tevahî ji hemû pîvan Erka divê bê nîşandan 1. kerema xwe pîvan ji hemû erkên Project eyar bikin li gorî
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Delivery Têbînî {0} tê şandin ne
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,"Babetê {0}, divê babete-bînrawe bi peyman be"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Teçxîzatên hatiye capital
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Rule Pricing is yekem li ser esasê hilbijartin &#39;Bisepîne Li ser&#39; qada, ku dikare bê Babetê, Babetê Pol an Brand."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Ji kerema xwe kodê yekem hilbijêre
-DocType: Hub Settings,Seller Website,Seller Website
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Ji kerema xwe kodê yekem hilbijêre
 DocType: Item,ITEM-,ŞANÎ-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Total beşek veqetand ji bo tîma firotina divê 100 be
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Total beşek veqetand ji bo tîma firotina divê 100 be
 DocType: Sales Invoice Item,Edit Description,biguherîne Description
 DocType: Antibiotic,Antibiotic,Antîbîyotîk
 ,Team Updates,Updates Team
@@ -1490,12 +1520,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Total (Company Exchange)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,"hejmara Serial {0} ketin, ji carekê zêdetir"
 DocType: Depreciation Schedule,Journal Entry,Peyam di Journal
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} tomar di pêşketina
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} tomar di pêşketina
 DocType: Workstation,Workstation Name,Navê Workstation
 DocType: Grading Scale Interval,Grade Code,Code pola
 DocType: POS Item Group,POS Item Group,POS babetî Pula
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} nayê to Babetê girêdayî ne {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} nayê to Babetê girêdayî ne {1}
 DocType: Sales Partner,Target Distribution,Belavkariya target
 DocType: Salary Slip,Bank Account No.,No. Account Bank
 DocType: Naming Series,This is the number of the last created transaction with this prefix,"Ev hejmara dawî ya muameleyan tên afirandin, bi vê prefix e"
@@ -1512,10 +1542,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Daxwaza ji bo Supplier Quotation
 DocType: Healthcare Settings,Registration Message,Peyama Serkeftinê
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Car
-DocType: Sales Order,Recurring Upto,nişankirin Upto
 DocType: Prescription Dosage,Prescription Dosage,Dosage Dosage
 DocType: Attendance,HR Manager,Manager HR
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Ji kerema xwe re Company hilbijêre
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Ji kerema xwe re Company hilbijêre
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Supplier Date bi fatûreyên
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,her
@@ -1531,10 +1560,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,şert û mercên gihîjte dîtin navbera:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Li dijî Journal Peyam di {0} ji nuha ve li dijî hin fîşeke din hebę
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Total Order Nirx
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Xûrek
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Xûrek
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Range Ageing 3
 DocType: Maintenance Schedule Item,No of Visits,No ji Serdan
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Maintenance Cedwela {0} dijî heye {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Ma hûn dixwazin ji we re şîfreyê xwe bişînin Hub?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,xwendekarê qeyîtkirine
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Pereyan ji Account Girtina divê {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Sum ji xalên ji bo hemû armancên divê bê 100. Ev e {0}
@@ -1545,9 +1575,9 @@
 DocType: Authorization Rule,Average Discount,Average Discount
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Utilities
-DocType: Purchase Invoice Item,Accounting,Accounting
+DocType: POS Profile,Accounting,Accounting
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Tikaye lekerên bo em babete batched hilbijêre
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Tikaye lekerên bo em babete batched hilbijêre
 DocType: Asset,Depreciation Schedules,Schedules Farhad.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,dema Application nikare bibe îzina li derve dema dabeşkirina
 DocType: Activity Cost,Projects,projeyên
@@ -1563,7 +1593,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',Rewş erêkirina divê &#39;status&#39; an jî &#39;Redkirin&#39;
 DocType: Physician,Contacts and Address,Têkilî û Navnîşan
 DocType: Purchase Invoice,Contact Person,Contact Person
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&#39;Hêvîkirin Date Serî&#39; nikare bibe mezintir &#39;ya bende Date End&#39;
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&#39;Hêvîkirin Date Serî&#39; nikare bibe mezintir &#39;ya bende Date End&#39;
 DocType: Course Scheduling Tool,Course End Date,Kurs End Date
 DocType: Holiday List,Holidays,Holidays
 DocType: Sales Order Item,Planned Quantity,Quantity plankirin
@@ -1571,10 +1601,11 @@
 DocType: Item,Maintain Stock,Pêkanîna Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Stock berheman jixwe ji bo Production Order tên afirandin
 DocType: Employee,Prefered Email,prefered Email
+DocType: Student Admission,Eligibility and Details,Nirx û Agahdariyê
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Change Net di Asset Fixed
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Vala bihêlin, eger ji bo hemû deverî nirxandin"
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Pere ji type &#39;Actual&#39; li row {0} ne bi were di Rate babetî di nav de
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,ji DateTime
 DocType: Email Digest,For Company,ji bo Company
 apps/erpnext/erpnext/config/support.py +17,Communication log.,log-Ragihandin a.
@@ -1582,19 +1613,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Supplier Scorecard Variable Scoring
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Asta kirîn
 DocType: Sales Invoice,Shipping Address Name,Shipping Name Address
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Chart Dageriyê
 DocType: Material Request,Terms and Conditions Content,Şert û mercan Content
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,dikarin bibin mezintir 100 ne
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Babetê {0} e a stock babete ne
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Babetê {0} e a stock babete ne
 DocType: Maintenance Visit,Unscheduled,rayis
 DocType: Employee,Owned,Owned
 DocType: Salary Detail,Depends on Leave Without Pay,Dimîne li ser Leave Bê Pay
 DocType: Pricing Rule,"Higher the number, higher the priority","Bilind hejmara, bilind pêşanî"
 ,Purchase Invoice Trends,Bikirin Trends bi fatûreyên
 DocType: Employee,Better Prospects,baştir e
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Row # {0}: The hevîrê {1} tenê {2} qty. Tikaye Demîralp, ku {3} qty License de hilbijêre yan parçekirina row nav rêzên multiple, bi azadkirina / pirsa ji lekerên multiple"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Row # {0}: The hevîrê {1} tenê {2} qty. Tikaye Demîralp, ku {3} qty License de hilbijêre yan parçekirina row nav rêzên multiple, bi azadkirina / pirsa ji lekerên multiple"
 DocType: Vehicle,License Plate,License Plate
 DocType: Appraisal,Goals,armancên
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,POS Profîl hilbijêre
 DocType: Warranty Claim,Warranty / AMC Status,Mîsoger / AMC Rewş
 ,Accounts Browser,bikarhênerên Browser
 DocType: Payment Entry Reference,Payment Entry Reference,Payment Reference Peyam
@@ -1612,7 +1643,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Xebatkarê ne dikarin ji xwe re rapor.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Eger account bêhest e, entries bi bikarhênerên sînorkirin destûr."
 DocType: Email Digest,Bank Balance,Balance Bank
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Peyam Accounting ji bo {0}: {1} dikarin tenê li pereyan kir: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Peyam Accounting ji bo {0}: {1} dikarin tenê li pereyan kir: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","profile kar, bi dawîanîna pêwîst hwd."
 DocType: Journal Entry Account,Account Balance,Mêzîna Hesabê
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Rule Bacê ji bo muameleyên.
@@ -1621,8 +1652,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),"Total Bac, û doz li (Company Exchange)"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Nîşan P &amp; hevsengiyên L sala diravî ya negirtî ya
 DocType: Lab Test Template,Collection Details,Agahiya Danezanê
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","hilbijêre cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date ctr, `tabLab Prescription` cp li ct.patient = &#39;{0}&#39; û cp.parent = ct. nav û cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Account Shipping
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} neçalak e
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Make Orders Sales ji bo alîkarîya te plana karê xwe û azad li ser-dem
@@ -1639,7 +1668,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Packing Slip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Office Rent
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,settings deryek Setup SMS
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import ser neket!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import ser neket!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,No address added yet.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Saet Xebatê
 DocType: Vital Signs,Blood Pressure,Pressure Pressure
@@ -1664,7 +1693,7 @@
 DocType: Sales Invoice,Source,Kanî
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Show girtî
 DocType: Leave Type,Is Leave Without Pay,Ma Leave Bê Pay
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Asset Category bo em babete Asset Fixed wêneke e
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Asset Category bo em babete Asset Fixed wêneke e
 DocType: Fee Validity,Fee Validity,Valahiyê
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,No records dîtin li ser sifrê (DGD)
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ev {0} pevçûnên bi {1} ji bo {2} {3}
@@ -1685,8 +1714,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Rêveber Search
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Create Leads
 DocType: Maintenance Schedule,Schedules,schedules
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,POS Profê pêwîst e ku ji bo Point-of-Sale bikar bînin
 DocType: Purchase Invoice Item,Net Amount,Şêwaz net
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} hatiye nehatine şandin, da ku çalakiyên ne dikarin bi dawî bê"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} hatiye nehatine şandin, da ku çalakiyên ne dikarin bi dawî bê"
 DocType: Purchase Order Item Supplied,BOM Detail No,Detail BOM No
 DocType: Landed Cost Voucher,Additional Charges,Li dijî wan doz Additional
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Şêwaz Discount Additional (Exchange Company)
@@ -1717,8 +1747,8 @@
 DocType: Patient,Tobacco Past Use,Bikaranîna Past Tobago
 DocType: Sales Invoice Item,Brand Name,Navê marka
 DocType: Purchase Receipt,Transporter Details,Details Transporter
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Bikarhêner {0} berê ji bo Bijîşk {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Default warehouse bo em babete helbijartî pêwîst e
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Bikarhêner {0} berê ji bo Bijîşk {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Default warehouse bo em babete helbijartî pêwîst e
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Qûtîk
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,Supplier gengaz
 DocType: Budget,Monthly Distribution,Belavkariya mehane
@@ -1728,8 +1758,8 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 DocType: Loan Type,Maximum Loan Amount,Maximum Mîqdar Loan
 DocType: Pricing Rule,Pricing Rule,Rule Pricing
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},hejmara roll Pekana ji bo xwendekarê {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},hejmara roll Pekana ji bo xwendekarê {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},hejmara roll Pekana ji bo xwendekarê {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},hejmara roll Pekana ji bo xwendekarê {0}
 DocType: Budget,Action if Annual Budget Exceeded,Action eger salane ya Budceyê de DYE&#39;yê
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Daxwaza madî ji bo Buy Order
 DocType: Shopping Cart Settings,Payment Success URL,Payment URL bi serket
@@ -1746,7 +1776,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} de divê bi tenê carekê xuya
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},destûr ne ji bo tranfer zêdetir {0} ji {1} dijî Purchase Order {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Pelên bi awayekî serketî ji bo bi rêk û {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,No babet to pack
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,No babet to pack
 DocType: Shipping Rule Condition,From Value,ji Nirx
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Manufacturing Quantity wêneke e
 DocType: Employee Loan,Repayment Method,Method vegerandinê
@@ -1760,6 +1790,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Deynên Stock
 DocType: Purchase Invoice,Supplier Warehouse,Supplier Warehouse
 DocType: Opportunity,Contact Mobile No,Contact Mobile No
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Şirket hilbijêre
 ,Material Requests for which Supplier Quotations are not created,Daxwazên madî ji bo ku Quotations Supplier bi tên bi
 DocType: Student Group,Set 0 for no limit,Set 0 bo sînorê
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dotira rojê (s) li ser ku hûn bi ji bo xatir hukm û cejnên in. Tu divê ji bo xatir ne.
@@ -1769,24 +1800,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Make Quotation
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,din Reports
 DocType: Dependent Task,Dependent Task,Task girêdayî
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},faktora Converter ji bo default Unit ji pîvanê divê 1 li row be {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},faktora Converter ji bo default Unit ji pîvanê divê 1 li row be {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Leave a type {0} nikare were êdî ji {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Try plan operasyonên ji bo rojên X di pêş.
 DocType: HR Settings,Stop Birthday Reminders,Stop Birthday Reminders
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Ji kerema xwe ve Default payroll cîhde Account set li Company {0}
 DocType: SMS Center,Receiver List,Lîsteya Receiver
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Search babetî
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Search babetî
 DocType: Patient Appointment,Referring Physician,Pizîşkek Referring
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Şêwaz telef
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Change Net di Cash
 DocType: Assessment Plan,Grading Scale,pîvanê de
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,"Unit ji Measure {0} hatiye, ji carekê zêdetir li Converter Factor Table nivîsandin"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,jixwe temam
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,"Unit ji Measure {0} hatiye, ji carekê zêdetir li Converter Factor Table nivîsandin"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,jixwe temam
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock Li Hand
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Daxwaza peredana ji berê ve heye {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost ji Nawy Issued
 DocType: Physician,Hospital,Nexweşxane
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},"Dorpêçê de ne, divê bêhtir ji {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},"Dorpêçê de ne, divê bêhtir ji {0}"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Previous Financial Sal is girtî ne
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Age (Days)
 DocType: Quotation Item,Quotation Item,Babetê quotation
@@ -1797,8 +1828,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Supplier Type master.
 DocType: Purchase Order Item,Supplier Part Number,Supplier Hejmara Part
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,rêjeya Converter nikare bibe 0 an 1
-DocType: Sales Invoice,Reference Document,Dokumentê Reference
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} ji betalkirin an sekinî
+DocType: Subscription,Reference Document,Dokumentê Reference
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} ji betalkirin an sekinî
 DocType: Accounts Settings,Credit Controller,Controller Credit
 DocType: Delivery Note,Vehicle Dispatch Date,Vehicle Date Dispatch
 DocType: Healthcare Settings,Default Medical Code Standard,Standard Code
@@ -1807,6 +1838,7 @@
 DocType: Company,Default Payable Account,Default Account cîhde
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Mîhengên ji bo Têxe selikê bike wek qaîdeyên shipping, lîsteya buhayên hwd."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% billed
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Bi Sort By Price ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserved Qty
 DocType: Party Account,Party Account,Account Partiya
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Çavkaniyên Mirovî
@@ -1818,13 +1850,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Make Disbursement Peyam
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Advance dijî Supplier divê kom kirin
 DocType: Company,Default Values,Nirxên Default
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequency} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Frequency} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Total qasa dayîna
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ev li ser têketin li dijî vê Vehicle bingeha. Dîtina cedwela li jêr bo hûragahiyan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Li dijî Supplier bi fatûreyên {0} dîroka {1}
 DocType: Customer,Default Price List,Default List Price
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,record Tevgera Asset {0} tên afirandin
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Tu nikarî bibî Fiscal Sal {0}. Sal malî {0} wek default li Settings Global danîn
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Pêwendiyek bi heman navî heye
 DocType: Journal Entry,Entry Type,Type entry
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,No plan nirxandineke girêdayî bi vê koma nirxandina
 ,Customer Credit Balance,Balance Credit Mişterî
@@ -1835,7 +1868,7 @@
 DocType: Quotation,Term Details,Details term
 DocType: Project,Total Sales Cost (via Sales Order),Total Cost Sales (bi rêya Sales Order)
 DocType: Project,Total Sales Cost (via Sales Order),Total Cost Sales (bi rêya Sales Order)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,ne dikarin zêdetir ji {0} xwendekar ji bo vê koma xwendekaran kul.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,ne dikarin zêdetir ji {0} xwendekar ji bo vê koma xwendekaran kul.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,View Lead
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,View Lead
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} divê mezintir 0 be
@@ -1853,9 +1886,11 @@
 DocType: Lab Test,Technician Name,Nûnerê Teknîkî
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Unlink Payment li ser komcivîna me ya bi fatûreyên
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},xwendina Green niha ketin divê mezintir destpêkê Vehicle Green be {0}
+DocType: Restaurant Reservation,No Show,Pêşanî tune
 DocType: Shipping Rule Country,Shipping Rule Country,Shipping Rule Country
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Dev û Beşdariyê
 DocType: Maintenance Visit,Partially Completed,Qismen Qediya
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Sensîteya Navendî ya Navendî
 DocType: Leave Type,Include holidays within leaves as leaves,Usa jî holidays di nava pelên wek pelên
 DocType: Sales Invoice,Packed Items,Nawy Packed
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Îdîaya Warranty dijî No. Serial
@@ -1872,13 +1907,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Pereyan (Company Exchange)
 DocType: Purchase Invoice,Additional Discount,Discount Additional
 DocType: Selling Settings,Selling Settings,Firoştina Settings
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Şertê Çalak
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Auctions bike
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Ji kerema xwe, yan Quantity an Rate Valuation an hem diyar bike"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Bicihanînî
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,View li Têxe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Mesref marketing
 ,Item Shortage Report,Babetê Report pirsgirêka
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Loss de behsa, \ nJi kerema xwe behsa &quot;Loss UOM&quot; jî"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Loss de behsa, \ nJi kerema xwe behsa &quot;Loss UOM&quot; jî"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Daxwaza maddî tê bikaranîn ji bo ku ev Stock Peyam
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Next Date Farhad ji bo sermaye nû wêneke e
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Cuda Bêguman Pol bingeha ji bo her Batch
@@ -1891,12 +1927,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Make Peyam Accounting bo her Stock Tevgera
 DocType: Leave Allocation,Total Leaves Allocated,Total Leaves veqetandin
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Warehouse pêwîst li Row No {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Ji kerema xwe ve derbas dibe Financial Sal destpêkirin û dawîlêanîna binivîse
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Ji kerema xwe ve derbas dibe Financial Sal destpêkirin û dawîlêanîna binivîse
 DocType: Employee,Date Of Retirement,Date Of Teqawîdiyê
 DocType: Upload Attendance,Get Template,Get Şablon
 DocType: Material Request,Transferred,veguhestin
 DocType: Vehicle,Doors,Doors
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext Sazkirin Qediya!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext Sazkirin Qediya!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Ji bo Pêwîstiya Nexweşiya Xwe Bikin
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,Breakup Bacê
@@ -1915,37 +1951,37 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Eger tu dzanî ev babete Guhertoyên, hingê wê ne li gor fermanên firotina hwd bên hilbijartin"
 DocType: Lead,Next Contact By,Contact Next By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Quantity pêwîst ji bo vî babetî {0} li row {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Quantity pêwîst ji bo vî babetî {0} li row {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Warehouse {0} ne jêbirin wek dorpêçê de ji bo babet heye {1}
 DocType: Quotation,Order Type,Order Type
-DocType: Purchase Invoice,Notification Email Address,Hişyariya Email Address
 ,Item-wise Sales Register,Babetê-şehreza Sales Register
 DocType: Asset,Gross Purchase Amount,Şêwaz Purchase Gross
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Hilbijartina Balance
 DocType: Asset,Depreciation Method,Method Farhad.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Ne girêdayî
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Ne girêdayî
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ma ev Tax di nav Rate Basic?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Total Target
 DocType: Job Applicant,Applicant for a Job,Applicant bo Job
 DocType: Production Plan Material Request,Production Plan Material Request,Production Daxwaza Plan Material
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,No Orders Production tên afirandin
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,No Orders Production tên afirandin
 DocType: Stock Reconciliation,Reconciliation JSON,Lihevkirin JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Jî gelek stûnên. Versiyon ji raporê û print ew bikaranîna serlêdana spreadsheet.
 DocType: Purchase Invoice Item,Batch No,batch No
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Serdana Quotation: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Destûrê bide multiple Orders Sales dijî Mişterî ya Purchase Order
 DocType: Student Group Instructor,Student Group Instructor,Instructor Student Group
 DocType: Student Group Instructor,Student Group Instructor,Instructor Student Group
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Ser
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Ser
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Set prefix ji bo ku hijmara series li ser danûstandinên xwe
 DocType: Employee Attendance Tool,Employees HTML,karmendên HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,"Default BOM ({0}), divê ji bo em babete an şablonê xwe çalak be"
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,"Default BOM ({0}), divê ji bo em babete an şablonê xwe çalak be"
 DocType: Employee,Leave Encashed?,Dev ji Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Derfeta ji qadê de bivênevê ye
 DocType: Email Digest,Annual Expenses,Mesref ya salane
 DocType: Item,Variants,Guhertoyên
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Make Purchase Order
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Make Purchase Order
 DocType: SMS Center,Send To,Send To
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},e balance îzna bes ji bo Leave Type li wir ne {0}
 DocType: Payment Reconciliation Payment,Allocated amount,butçe
@@ -1963,6 +1999,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Hêz Student Group
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,"Li dijî Journal Peyam di {0} ti {1} entry berdar, ne xwedî"
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Şiroveyên
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Çalakiyên Perwerdehiyê
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Curenivîsên Serial No bo Babetê ketin {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,A rewşa ji bo Rule Shipping
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Ji kerema xwe re têkevin
@@ -1972,7 +2009,7 @@
 DocType: Sales Order,To Deliver and Bill,To azad û Bill
 DocType: Student Group,Instructors,Instructors
 DocType: GL Entry,Credit Amount in Account Currency,Şêwaz Credit li Account Exchange
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} de divê bê şandin
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} de divê bê şandin
 DocType: Authorization Control,Authorization Control,Control Authorization
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Redkirin Warehouse dijî babet red wêneke e {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Diravdanî
@@ -1991,11 +2028,11 @@
 DocType: Quotation Item,Actual Qty,rastî Qty
 DocType: Sales Invoice Item,References,Çavkanî
 DocType: Quality Inspection Reading,Reading 10,Reading 10
-DocType: Hub Settings,Hub Node,hub Node
+DocType: Hub Category,Hub Node,hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Hûn ketin tomar lînkek kirine. Ji kerema xwe re çak û careke din biceribîne.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Şirîk
 DocType: Asset Movement,Asset Movement,Tevgera Asset
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,Têxe New
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,Têxe New
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Babetê {0} e a babete weşandin ne
 DocType: SMS Center,Create Receiver List,Create Lîsteya Receiver
 DocType: Vehicle,Wheels,wheels
@@ -2009,15 +2046,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Agahdanyarî
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Nîşan dide ku, pakêta beşek ji vê delivery (Tenê bi Pêşnûmeya) e"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Make Peyam Payment
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Dorpêçê de ji bo babet {0} gerek kêmtir be {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Dorpêçê de ji bo babet {0} gerek kêmtir be {1}
 ,Sales Invoice Trends,Sales Trends bi fatûreyên
 DocType: Leave Application,Apply / Approve Leaves,Apply / Approve Leaves
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Bo
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Bo
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Can row têne tenê eger type belaş e &#39;li ser Previous Mîqdar Row&#39; an jî &#39;Previous Row Total&#39;
 DocType: Sales Order Item,Delivery Warehouse,Warehouse Delivery
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Tree of Navendên Cost aborî.
 DocType: Serial No,Delivery Document No,Delivery dokumênt No
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Ji kerema xwe ve &#39;Gain Account / Loss li ser çespandina Asset&#39; set li Company {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Ji kerema xwe ve &#39;Gain Account / Loss li ser çespandina Asset&#39; set li Company {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Get Nawy Ji Buy Receipts
 DocType: Serial No,Creation Date,Date creation
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Babetê {0} xuya çend caran li List Price {1}
@@ -2028,12 +2065,13 @@
 DocType: Student,Student Mobile Number,Xwendekarên Hejmara Mobile
 DocType: Item,Has Variants,has Variants
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Response Update
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Jixwe te tomar ji hilbijartî {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Jixwe te tomar ji hilbijartî {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Name ji Belavkariya Ayda
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID wêneke e
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID wêneke e
 DocType: Sales Person,Parent Sales Person,Person bav Sales
-DocType: Purchase Invoice,Recurring Invoice,bi fatûreyên nûkirin
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Bilind to Low
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Bernameya yekem hilbijêre
 DocType: Patient Appointment,Patient Age,Mêjûya Nexweş
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,birêvebirina Projeyên
 DocType: Supplier,Supplier of Goods or Services.,Supplier ji mal an Services.
@@ -2041,8 +2079,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Hesabên standard yên ku ji bo nexweşî ve girêdayî ye ku ji bo nexweşan re bihayê şêwirdariyê bibînin.
 DocType: Vehicle Log,Fuel Price,sotemeniyê Price
 DocType: Budget,Budget,Sermîyan
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Vekirî veke
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,"Babetê Asset Fixed, divê babete non-stock be."
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Vekirî veke
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,"Babetê Asset Fixed, divê babete non-stock be."
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budceya dikare li hember {0} ne bên wezîfedarkirin, wek ku ev hesabê Hatinê an jî Expense ne"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,nebine
 DocType: Student Admission,Application Form Route,Forma serlêdana Route
@@ -2056,12 +2094,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Babetê {0} e setup bo Serial Nos ne. Kontrol bike master babetî
 DocType: Maintenance Visit,Maintenance Time,Maintenance Time
 ,Amount to Deliver,Mîqdar ji bo azad
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Bi heman demê de tiştek gelek caran ketiye. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,The Date Serî Term ne dikarin zûtir ji Date Sal Start of the Year (Ekadîmî) ji bo ku di dema girêdayî be (Year (Ekadîmî) {}). Ji kerema xwe re li rojên bike û careke din biceribîne.
 DocType: Guardian,Guardian Interests,Guardian Interests
 DocType: Naming Series,Current Value,Nirx niha:
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,salan malî Multiple ji bo roja {0} hene. Ji kerema xwe ve şîrketa ku di sala diravî
 DocType: School Settings,Instructor Records to be created by,Danûstandinên Mamosteyan ku ji hêla tên afirandin
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} tên afirandin
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} tên afirandin
 DocType: Delivery Note Item,Against Sales Order,Li dijî Sales Order
 ,Serial No Status,Serial Status No
 DocType: Payment Entry Reference,Outstanding,Mayî
@@ -2071,10 +2110,10 @@
 						must be greater than or equal to {2}","Row {0}: To set {1} periodicity, cudahiya di navbera ji û bo date \ divê mezintir an wekhev bin {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Ev li ser tevgera stock bingeha. Dîtina {0} Ji bo hûragahiyan li
 DocType: Pricing Rule,Selling,firotin
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Şêwaz {0} {1} dabirîn dijî {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Şêwaz {0} {1} dabirîn dijî {2}
 DocType: Employee,Salary Information,Information meaş
 DocType: Sales Person,Name and Employee ID,Name û Xebatkarê ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Date ji ber nikarim li ber Mesaj Date be
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Date ji ber nikarim li ber Mesaj Date be
 DocType: Website Item Group,Website Item Group,Website babetî Pula
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Erk û Baca
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Ji kerema xwe ve date Çavkanî binivîse
@@ -2100,7 +2139,7 @@
 DocType: Issue,Resolution Details,Resolution Details
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,xercî
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Şertên qebûlkirinê
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Ji kerema xwe ve Requests Material li ser sifrê li jor binivîse
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Ji kerema xwe ve Requests Material li ser sifrê li jor binivîse
 DocType: Item Attribute,Attribute Name,Pêşbîr Name
 DocType: BOM,Show In Website,Show Li Website
 DocType: Shopping Cart Settings,Show Quantity in Website,Nîşan Quantity li Website
@@ -2109,7 +2148,7 @@
 DocType: Item Reorder,Check in (group),Check in (koma)
 ,Qty to Order,Qty siparîş
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Serê account di bin mesulîyetê, an tebîî, li ku Profit / Loss tê veqetandin, wê bê"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Gantt chart ji hemû erkên.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Gantt chart ji hemû erkên.
 DocType: Opportunity,Mins to First Response,Mins ji bo Response First
 DocType: Pricing Rule,Margin Type,Type margin
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} saetan
@@ -2131,36 +2170,36 @@
 DocType: Patient,Surgical History,Dîroka Surgical
 DocType: Employee,Resignation Letter Date,Îstîfa Date Letter
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Rules Pricing bi zêdetir li ser bingeha dorpêçê de tê fîltrekirin.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Xêra xwe li Date Of bizaveka bo karker {0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Xêra xwe li Date Of bizaveka bo karker {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Xêra xwe li Date Of bizaveka bo karker {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Xêra xwe li Date Of bizaveka bo karker {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Temamê meblaxa Billing (via Time Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Hatiniyên Mişterî Repeat
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), divê rola &#39;Approver Expense&#39; heye"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Cot
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Select BOM û Qty bo Production
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Select BOM û Qty bo Production
 DocType: Asset,Depreciation Schedule,Cedwela Farhad.
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Navnîşan Sales Partner Û Têkilî
 DocType: Bank Reconciliation Detail,Against Account,li dijî Account
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Nîv Date Day divê di navbera From Date û To Date be
 DocType: Maintenance Schedule Detail,Actual Date,Date rastî
 DocType: Item,Has Batch No,Has Batch No
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Billing salane: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Billing salane: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Mal û xizmetan Bacê (gst India)
 DocType: Delivery Note,Excise Page Number,Baca Hejmara Page
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Company, Ji Date û To Date wêneke e"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Ji Şêwirdariyê bistînin
 DocType: Asset,Purchase Date,Date kirîn
 DocType: Employee,Personal Details,Details şexsî
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Ji kerema xwe ve &#39;Asset Navenda Farhad. Cost&#39; li Company set {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Ji kerema xwe ve &#39;Asset Navenda Farhad. Cost&#39; li Company set {0}
 ,Maintenance Schedules,Schedules Maintenance
 DocType: Task,Actual End Date (via Time Sheet),Rastî End Date (via Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Şêwaz {0} {1} dijî {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Şêwaz {0} {1} dijî {2} {3}
 ,Quotation Trends,Trends quotation
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Babetê Pol di master babete bo em babete behsa ne {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,"Debit To account, divê hesabekî teleb be"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,"Debit To account, divê hesabekî teleb be"
 DocType: Shipping Rule Condition,Shipping Amount,Şêwaz Shipping
 DocType: Supplier Scorecard Period,Period Score,Dawîn Score
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,lê zêde muşteriyan
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,lê zêde muşteriyan
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,hîn Mîqdar
 DocType: Lab Test Template,Special,Taybetî
 DocType: Purchase Invoice Item,Conversion Factor,Factor converter
@@ -2168,13 +2207,14 @@
 ,Vehicle Expenses,Mesref Vehicle
 DocType: Serial No,Invoice Details,Details bi fatûreyên
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},"nirxa hêvîkirin ku piştî jiyana kêrhatî, divê mezintir an wekhev bin {0}"
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Destpê bike
+DocType: Hub Category,Hub Category,Kategorî
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Hejmara Vehicle
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,Roja ku dubare fatûra bê dê bê rawestandin
 DocType: Employee Loan,Loan Amount,Şêwaz deyn
 DocType: Program Enrollment,Self-Driving Vehicle,Vehicle Self-Driving
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Supplier Scorecard Standing
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Row {0}: Bill of material ji bo babet dîtin ne {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Row {0}: Bill of material ji bo babet dîtin ne {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Hemû pelên bi rêk û {0} nikare were kêmî ji pelên jixwe pejirandin {1} ji bo dema
 DocType: Journal Entry,Accounts Receivable,hesabê hilgirtinê
 ,Supplier-Wise Sales Analytics,Supplier-Wise Sales Analytics
@@ -2186,7 +2226,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Kurs dê û bav (Leave vala, ger ev e beşek ji dê û bav Kurs ne)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Vala bihêlin, eger ji bo hemû cureyên karkirek"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Belavkirin doz li ser bingeha
-apps/erpnext/erpnext/hooks.py +131,Timesheets,timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,timesheets
 DocType: HR Settings,HR Settings,Settings HR
 DocType: Salary Slip,net pay info,info net pay
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Ev nirx di lîsteya bihayê bihayê ya nû de nûvekirî ye.
@@ -2197,7 +2237,7 @@
 DocType: Patient,B Positive,B Positive
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty divê 1 be, wek babete a hebûnê sabît e. Ji kerema xwe ve row cuda ji bo QTY multiple bi kar tînin."
 DocType: Leave Block List Allow,Leave Block List Allow,Dev ji Lîsteya Block Destûrê bide
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Kurte nikare bibe vala an space
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Kurte nikare bibe vala an space
 DocType: Patient Medical Record,Patient Medical Record,Radyoya Tenduristî
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Pol to non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sports
@@ -2214,9 +2254,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Nikare bibînin rate ji bo {0} ji bo {1} ji bo date key {2}. Ji kerema xwe re qeyda Exchange biafirîne bi destan
 DocType: POS Profile,Price List,Lîsteya bihayan
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} e niha standard sala diravî. Ji kerema xwe (browser) xwe nû dikin ji bo vê guhertinê ji bandora.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Îdîayên Expense
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Îdîayên Expense
 DocType: Issue,Support,Alîkarî
 ,BOM Search,BOM Search
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Li ser vê barehouse li &quot;Li Stock&quot; an &quot;Heya Ne Stockê&quot; li Hub-ê li ser peyda tête weşandin.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Girtina (Opening + Totals)
 DocType: Vehicle,Fuel Type,Type mazotê
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Ji kerema xwe ve pereyan li Company diyar
@@ -2228,16 +2269,16 @@
 DocType: Healthcare Settings,Remind Before,Beriya Remindê
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},faktora UOM Converter li row pêwîst e {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: World: Kurdî: Corî dokumênt, divê yek ji Sales Order, Sales bi fatûreyên an Peyam Journal be"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: World: Kurdî: Corî dokumênt, divê yek ji Sales Order, Sales bi fatûreyên an Peyam Journal be"
 DocType: Salary Component,Deduction,Jêkişî
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Row {0}: Ji Time û To Time de bivênevê ye.
 DocType: Stock Reconciliation Item,Amount Difference,Cudahiya di Mîqdar
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Babetê Price added for {0} li List Price {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Babetê Price added for {0} li List Price {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Ji kerema xwe ve Employee Id bikevin vî kesî yên firotina
 DocType: Territory,Classification of Customers by region,Dabeşandina yên muşteriyan bi herêma
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Şêwaz Cudahiya divê sifir be
 DocType: Project,Gross Margin,Kenarê Gross
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Ji kerema xwe ve yekemîn babet Production binivîse
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Ji kerema xwe ve yekemîn babet Production binivîse
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Di esasa balance Bank Statement
 DocType: Normal Test Template,Normal Test Template,Şablon
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,user seqet
@@ -2247,21 +2288,22 @@
 DocType: Salary Slip,Total Deduction,Total dabirîna
 ,Production Analytics,Analytics Production
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Ev li ser nexweşiya li ser veguhestinê ye. Ji bo agahdariyên jêrîn binêrin
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,cost Demê
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,cost Demê
 DocType: Employee,Date of Birth,Rojbûn
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Babetê {0} ji niha ve hatine vegerandin
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiscal Sal ** temsîl Sal Financial. Re hemû ketanên hisêba û din muamele mezin bi dijî Sal Fiscal ** Molla **.
 DocType: Opportunity,Customer / Lead Address,Mişterî / Lead Address
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Supplier Scorecard Setup
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Hişyarî: belgeya SSL çewt li ser attachment {0}
-DocType: Student Admission,Eligibility,ku mafê
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Pîlana Nirxandinê Navê
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Hişyarî: belgeya SSL çewt li ser attachment {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Rêça te alîkarîya te bike business, lê zêde bike hemû têkiliyên xwe û zêdetir wek rêça te"
 DocType: Production Order Operation,Actual Operation Time,Rastî Time Operation
 DocType: Authorization Rule,Applicable To (User),To de evin: (User)
 DocType: Purchase Taxes and Charges,Deduct,Jinavkişîn
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Job Description
 DocType: Student Applicant,Applied,sepandin
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Re-vekirî
 DocType: Sales Invoice Item,Qty as per Stock UOM,Qty wek per Stock UOM
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Navê Guardian2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Characters taybet ji bilî &quot;-&quot; &quot;.&quot;, &quot;#&quot;, û &quot;/&quot; li Beyazit, series destûr ne"
@@ -2273,7 +2315,7 @@
 DocType: Request for Quotation,Manufacturing Manager,manufacturing Manager
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} e bin garantiya upto {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Dîmenê Têbînî Delivery nav pakêtan.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Barên
+apps/erpnext/erpnext/hooks.py +107,Shipments,Barên
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Temamê meblaxa veqetandin (Company Exchange)
 DocType: Purchase Order Item,To be delivered to customer,Ji bo mişterî teslîmî
 DocType: BOM,Scrap Material Cost,Cost xurde Material
@@ -2296,8 +2338,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Peldanka Variant
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Select Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Vala bihêlin, eger ji bo hemû beşên nirxandin"
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Cure yên kar (daîmî, peymana, û hwd. Intern)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} ji bo babet wêneke e {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Cure yên kar (daîmî, peymana, û hwd. Intern)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} ji bo babet wêneke e {1}
 DocType: Process Payroll,Fortnightly,Livînê
 DocType: Currency Exchange,From Currency,ji Exchange
 DocType: Vital Signs,Weight (In Kilogram),Weight (Kilogram)
@@ -2322,7 +2364,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Ji kerema xwe re li ser &#39;Çêneke Cedwela&#39; click to get schedule
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,bûn çewtî jêbirinê koma demên jêr hene:
 DocType: Bin,Ordered Quantity,Quantity ferman
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",eg &quot;Build Amûrên ji bo hostayan&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",eg &quot;Build Amûrên ji bo hostayan&quot;
 DocType: Grading Scale,Grading Scale Intervals,Navberan pîvanê de
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Peyam Accounting ji bo {2} dikarin tenê li pereyan kir: {3}
 DocType: Production Order,In Process,di pêvajoya
@@ -2346,11 +2388,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Bi Payment Taxê
 DocType: Expense Claim Detail,Expense Claim Detail,Expense Detail Îdîaya
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICATE BO SUPPLIER
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Ji kerema xwe ve hesabê xwe rast hilbijêre
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Ji kerema xwe ve hesabê xwe rast hilbijêre
 DocType: Item,Weight UOM,Loss UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Xebatkarê Structure meaş
 DocType: Patient,Blood Group,xwîn Group
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Nexelas
 DocType: Course,Course Name,Navê Kurs
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Bikarhêner ku dikarin sepanên îzna a karker taybetî ya erê
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Teçxîzatên hatiye Office
@@ -2369,7 +2410,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Bihayê wê li banî tê ne bê eger List Price is set ne
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Ji kerema xwe ve welatekî ji bo vê Rule Shipping diyar bike an jî Shipping Worldwide
 DocType: Stock Entry,Total Incoming Value,Total Nirx Incoming
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Debit To pêwîst e
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Debit To pêwîst e
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets alîkariya şopandibe, dem, mesrefa û fatûre ji bo activites kirin ji aliyê ekîba xwe"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Buy List Price
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Templates of supplier variables variables.
@@ -2379,7 +2420,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Lihevhatin û dayina
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Ji kerema xwe re navê Incharge Person ya hilbijêre
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknolocî
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Total Unpaid: {0}
+DocType: Hub Settings,Unregister from Hub,Unregister from Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Total Unpaid: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Website Operation
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,pêşkêşkirina Letter
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Çêneke Requests Material (MRP) û Orders Production.
@@ -2391,7 +2433,9 @@
 DocType: Physician Schedule Time Slot,To Time,to Time
 DocType: Authorization Rule,Approving Role (above authorized value),Erêkirina Role (li jorê nirxa destûr)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,"Credit To account, divê hesabekî fêhmkirin be"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM kûrahiya: {0} nikare bibe dê û bav an jî zarok ji {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Ji kerema xwe bigihîjin Xwendekarê Xwendekarê hilbijêre ku ji bo daxwaznameya xwendekarê drav anî ye
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM kûrahiya: {0} nikare bibe dê û bav an jî zarok ji {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Ji kerema xwe lîsteya bêjeya hilbijêre hilbijêre ku prensîpê belav bikin
 DocType: Production Order Operation,Completed Qty,Qediya Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Ji bo {0}, tenê bikarhênerên debit dikare li dijî entry credit din ve girêdayî"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,List Price {0} neçalak e
@@ -2404,39 +2448,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numbers Serial pêwîst ji bo vî babetî {1}. Hûn hatine {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Rate Valuation niha:
 DocType: Item,Customer Item Codes,Codes babet Mişterî
+DocType: Training Event,Advance,Pêşveçûn
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,ji bo veguhestinê dîsa.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange Gain / Loss
 DocType: Opportunity,Lost Reason,ji dest Sedem
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,New Address
 DocType: Quality Inspection,Sample Size,Size rate
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Ji kerema xwe ve dokumênt Meqbûz binivîse
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Hemû tomar niha ji fatore dîtin
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Ji kerema xwe binivîsin derbasbar a &#39;Ji Case Na&#39;
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',Ji kerema xwe binivîsin derbasbar a &#39;Ji Case Na&#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,navendên mesrefa berfireh dikarin di bin Groups made di heman demê de entries dikare li dijî non-Groups kirin
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Bikarhêner û Permissions
 DocType: Vehicle Log,VLOG.,Sjnaka.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Ordênên Production nû: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Ordênên Production nû: {0}
 DocType: Branch,Branch,Liq
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Printing û Branding
 DocType: Company,Total Monthly Sales,Tişta Tevahî Mijar
 DocType: Bin,Actual Quantity,Quantity rastî
 DocType: Shipping Rule,example: Next Day Shipping,nimûne: Shipping Next Day
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} nehate dîtin
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Alîkarî {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Alîkarî {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Programa Fee Schedule
 DocType: Fee Schedule Program,Student Batch,Batch Student
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,hilbijêre * ji &#39;tabVital Signs` vebijêre ku nexweş =&#39; {0} &#39;ji alîyê alîyê signs_date desc limit 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Make Student
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Min Grade
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Hûn hatine vexwendin ji bo hevkariyê li ser vê projeyê: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Lênêrînê li ser {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Hûn hatine vexwendin ji bo hevkariyê li ser vê projeyê: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Lênêrînê li ser {0}
 DocType: Leave Block List Date,Block Date,Date block
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Vebijêrkek taybetmendiyê Daveroka Id di doctype {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Têkiliya Delivery Delivery
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Apply Now
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Apply Now
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Actual Qty {0} / Waiting Qty {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Actual Qty {0} / Waiting Qty {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-Bazirganiya GSTIN
 DocType: Sales Order,Not Delivered,Delivered ne
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Dîroka Expected Date Ji ber Transaction Dîrok nikare ne
 ,Bank Clearance Summary,Bank Clearance Nasname
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Create û rêvebirin û digests email rojane, hefteyî û mehane."
 DocType: Appraisal Goal,Appraisal Goal,Goal appraisal
@@ -2444,12 +2489,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,avahiyên
 DocType: Fee Schedule,Fee Structure,Structure Fee
 DocType: Timesheet Detail,Costing Amount,yên arzane ku Mîqdar
-DocType: Student Admission,Application Fee,Fee application
+DocType: Student Admission Program,Application Fee,Fee application
 DocType: Process Payroll,Submit Salary Slip,Submit Slip Salary
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,discount Maxiumm ji bo babet {0} e {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,discount Maxiumm ji bo babet {0} e {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import li Gir
 DocType: Sales Partner,Address & Contacts,Navnîşana &amp; Têkilî
 DocType: SMS Log,Sender Name,Navê virrêkerî
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Bi nirxandin
 DocType: POS Profile,[Select],[Neqandin]
 DocType: Vital Signs,Blood Pressure (diastolic),Pressure Pressure (diastolic)
 DocType: SMS Log,Sent To,şandin To
@@ -2458,7 +2504,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Next Contact Date ne di dema borî de be
 DocType: Company,For Reference Only.,For Reference Only.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Bijîşk {0} ne li ser {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Hilbijêre Batch No
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Hilbijêre Batch No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Invalid {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-direvin
 DocType: Fee Validity,Reference Inv,Reference Inv
@@ -2474,15 +2520,15 @@
 DocType: Normal Test Items,Require Result Value,Pêwîste Result Value
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,"Case Na, nikare bibe 0"
 DocType: Item,Show a slideshow at the top of the page,Nîşan a slideshow li jor li ser vê rûpelê
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,dikeye
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,dikanên
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,dikeye
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,dikanên
 DocType: Project Type,Projects Manager,Project Manager
 DocType: Serial No,Delivery Time,Time Delivery
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Ageing li ser bingeha
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Serdanek betal kirin
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Serdanek betal kirin
 DocType: Item,End of Life,End of Life
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Gerrîn
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,No çalak an Salary default Structure dîtin ji bo karker {0} ji bo dîrokan dayîn
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Gerrîn
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,No çalak an Salary default Structure dîtin ji bo karker {0} ji bo dîrokan dayîn
 DocType: Leave Block List,Allow Users,Rê bide bikarhênerên
 DocType: Purchase Order,Customer Mobile No,Mişterî Mobile No
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,nûkirin
@@ -2491,12 +2537,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,update Cost
 DocType: Item Reorder,Item Reorder,Babetê DIRTYHERTZ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Slip Show Salary
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,transfer Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,transfer Material
 DocType: Fees,Send Payment Request,Request Payment Send
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Hên operasyonên, mesrefa xebatê û bide Operation yekane no ji bo operasyonên xwe."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ev belge li ser sînor ji aliyê {0} {1} ji bo em babete {4}. Ma tu ji yekî din {3} li dijî heman {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Ji kerema xwe ve set dubare piştî tomarkirinê
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Hilbijêre guhertina account mîqdara
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Hilbijêre guhertina account mîqdara
 DocType: Purchase Invoice,Price List Currency,List Price Exchange
 DocType: Naming Series,User must always select,Bikarhêner her tim divê hilbijêre
 DocType: Stock Settings,Allow Negative Stock,Destûrê bide Stock Negative
@@ -2516,7 +2562,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Karker
 DocType: Sample Collection,Collected Time,Demjimêr Hatin
 DocType: Company,Sales Monthly History,Dîroka Monthly History
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Hilbijêre Batch
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Hilbijêre Batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,"{0} {1} e, bi temamî billed"
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Vital Signs
 DocType: Training Event,End Time,Time End
@@ -2524,16 +2570,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Daşikandinên Payment an Loss
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,mercên peymana Standard ji bo Sales an Buy.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Pol destê Vienna
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Ma hûn bawer dikin ku hûn bixwazin vê serdanê betal bikin?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,pipeline Sales
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Ji kerema xwe ve account default set li Salary Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,required ser
 DocType: Rename Tool,File to Rename,File to Rename
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Ji kerema xwe ve BOM li Row hilbijêre ji bo babet {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Ji kerema xwe ve BOM li Row hilbijêre ji bo babet {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Account {0} nayê bi Company {1} li Mode of Account hev nagirin: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},BOM diyarkirî {0} nayê ji bo Babetê tune {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Maintenance Cedwela {0} divê berî betalkirinê ev Sales Order were betalkirin
+DocType: POS Profile,Applicable for Users,Ji bo Bikaranîna bikarhêneran
 DocType: Notification Control,Expense Claim Approved,Mesrefan Pejirandin
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Slip meaşê karmendekî {0} berê ve ji bo vê pêvajoyê de tên
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Slip meaşê karmendekî {0} berê ve ji bo vê pêvajoyê de tên
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,dermanan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Cost ji Nawy Purchased
 DocType: Selling Settings,Sales Order Required,Sales Order Required
@@ -2558,6 +2606,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Sazûman
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Sazûman
 DocType: BOM Update Tool,BOM Update Tool,Tool Tool BOM
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Hesabê partiyê ne diyar e, kerema xwe li kompaniya partiyê default set up"
 DocType: SG Creation Tool Course,Student Group Name,Navê Komeleya Xwendekarên
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Pargîdanî
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Kerema xwe binêre ka tu bi rastî dixwazî jê bibî hemû muamele û ji bo vê şirketê. Daneyên axayê te dê pevê wekî xwe ye. Ev çalakî nayê vegerandin.
@@ -2566,29 +2615,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne dikarin bibin mezintir quanitity plankirin ({2}) li Production Order {3}
 DocType: Shipping Rule,Shipping Rule Label,Label Shipping Rule
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum Bikarhêner
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Madeyên xav nikare bibe vala.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Gelo stock update ne, fatûra dihewîne drop babete shipping."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Madeyên xav nikare bibe vala.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Gelo stock update ne, fatûra dihewîne drop babete shipping."
 DocType: Lab Test Sample,Lab Test Sample,Sample Lab Lab
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Peyam di Journal Quick
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Tu dikarî rêjeya nayê guhertin, eger BOM agianst tu babete behsa"
+DocType: Restaurant,Invoice Series Prefix,Prefix Preoice Prefix
 DocType: Employee,Previous Work Experience,Previous serê kurda
 DocType: Stock Entry,For Quantity,ji bo Diravan
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Ji kerema xwe ve Plankirî Qty ji bo babet {0} at row binivîse {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Ji kerema xwe ve Plankirî Qty ji bo babet {0} at row binivîse {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} ji pêşkêşkirî ne
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Daxwazên ji bo tomar.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Ji bo hilberîna cuda de wê ji bo her babete baş bi dawî tên.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} divê di belgeya vegera neyînî be
 ,Minutes to First Response for Issues,Minutes ji bo First Response bo Issues
 DocType: Purchase Invoice,Terms and Conditions1,Termên û Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,The name of peymangeha ji bo ku hûn bi avakirina vê sîstemê.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,The name of peymangeha ji bo ku hûn bi avakirina vê sîstemê.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","entry Accounting ji vê dîrokê de sar up, kes nikare do / ya xeyrandin di entry ji bilî rola li jêr hatiye diyarkirin."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Ji kerema xwe ve belgeya ku berî bi afrandina schedule maintenance xilas bike
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Buhayê herî dawî ya BOM di nû de nûvekirin
 DocType: Fee Schedule,Successful,Serfiraz
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Rewş Project
 DocType: UOM,Check this to disallow fractions. (for Nos),Vê kontrol bike li hevûdu fractions. (Ji bo Nos)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,The Orders Production li jêr tên kirin:
-DocType: Student Admission,Naming Series (for Student Applicant),Bidin Series (ji bo Xwendekarên ALES)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,The Orders Production li jêr tên kirin:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Bidin Series (ji bo Xwendekarên ALES)
 DocType: Delivery Note,Transporter Name,Navê Transporter
 DocType: Authorization Rule,Authorized Value,Nirx destûr
 DocType: BOM,Show Operations,Show Operasyonên
@@ -2612,7 +2662,7 @@
 ,Employees working on a holiday,Karmendên li ser dixebitin ku cejna
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Present Mark
 DocType: Project,% Complete Method,% Method Complete
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Tevazok
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Tevazok
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},date destpêka Maintenance nikarim li ber roja çêbûna ji bo Serial No be {0}
 DocType: Production Order,Actual End Date,Rastî Date End
 DocType: BOM,Operating Cost (Company Currency),Cost Operating (Company Exchange)
@@ -2630,13 +2680,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Erêkirina User nikare bibe eynî wek user bi serweriya To evin e
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Rate bingehîn (wek per Stock UOM)
 DocType: SMS Log,No of Requested SMS,No yên SMS Wîkîpediyayê
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Leave bê pere nayê bi erêkirin records Leave Application hev nagirin
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Leave bê pere nayê bi erêkirin records Leave Application hev nagirin
 DocType: Campaign,Campaign-.####,Bêşvekirin-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Steps Next
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,"Ji kerema xwe wan tedarîk bikin ji tomar xwe bişinî at the best, rêjeya muhtemel"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Invoice Make
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto Opportunity nêzîkî piştî 15 rojan de
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Birêvebirina kirînê ji ber ku {1} stand scorecard ji {0} ne têne destnîşankirin.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Birêvebirina kirînê ji ber ku {1} stand scorecard ji {0} ne têne destnîşankirin.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,End Sal
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2673,7 +2723,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","şablonê bacê Standard ku dikare ji bo hemû Transactions Purchase sepandin. Ev şablon dikare de dihewîne list of serê bacê û bi yên din, serê kîsî wek &quot;Shipping&quot;, &quot;Sîgorta&quot;, &quot;Handling&quot; hwd #### Têbînî Rêjeya bacê li vir define hûn dê rêjeya baca standard ên ji bo hemû ** Nawy * *. Ger Nawy ** ** ku rêjeyên cuda hebe, divê ew di ** Bacê babet bê zêdekirin ** sifrê di ** babet ** master. #### Description Stûnan 1. Tîpa hesaba: - Ev dikare li ser ** Net Total ** be (ku bi qasî meblexa bingehîn e). - ** Li ser Row Previous Total / Mîqdar ** (ji bo bacên zane an doz). Heke tu vê bijare hilbijêre, baca wê wekî beşek ji rêza berê (li ser sifrê bacê) mîqdara an total sepandin. - ** Actual ** (wek behsa). 2. Serokê Account: The ledger Account bin ku ev tax dê bên veqetandin, 3. Navenda Cost: Heke bac / pere ji hatina (wek shipping) e an budceya lazim e ji bo li dijî Navenda Cost spariş kirin. 4. Description: Description ji baca (ku dê di hisab / quotes çapkirin). 5. Rate: rêjeya bacê. 6. Şêwaz: mîqdara Bacê. 7. Total: total xidar ji bo vê mijarê. 8. Enter Row: Heke li ser bingeha &quot;Row Previous Total&quot; tu hejmara row ku wek bingehek ji bo vê calculation (default rêza berê ye) hatin binçavkirin wê hilbijêrî. 9. Bacê an Charge bo binêrin: Di vê beşê de tu dikarî diyar bike eger bacê / belaş bi tenê ji bo nirxandinê e (beşek ji total ne) an jî bi tenê ji bo total (nayê nirxa Bi xweşî hatî ferhenga babete lê zêde bike ne) an ji bo hem. 10. lê zêde bike an dadixînin: Pirsek ev e, tu dixwazî lê zêde bike an birîn bacê."
 DocType: Homepage,Homepage,Homepage
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Bijîşk bijartin ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',nûçeyên nûvekirina sazkirinê veguhastin. &#39;&#39; {0} &#39;ku navê =&#39; {1} &#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd Diravan
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Records Fee Created - {0}
 DocType: Asset Category Account,Asset Category Account,Account Asset Kategorî
@@ -2685,7 +2734,7 @@
 DocType: Asset,Manual,Destî
 DocType: Salary Component Account,Salary Component Account,Account meaş Component
 DocType: Global Defaults,Hide Currency Symbol,Naverokan veşêre Exchange Symbol
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","eg Bank, Cash, Credit Card"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","eg Bank, Cash, Credit Card"
 DocType: Lead Source,Source Name,Navê Source
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Gelek tedbîrên xwînê ya normal di nav zilamê de nêzîkî 120 mmHg sîstolol e, û 80 mmHg diastolic, bişkoka &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Credit Note
@@ -2704,16 +2753,16 @@
 DocType: Patient,Occupation,Sinet
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: Destpêk Date divê berî End Date be
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qty)
-DocType: Sales Invoice,This Document,Ev Document
 DocType: Installation Note Item,Installed Qty,sazkirin Qty
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Ev dibe ku ji bo hin Navnîşanên Navnîşên Navnîşan yên nederbas be
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Te zêde kir
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Encam Training
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Encam Training
 DocType: Purchase Invoice,Is Paid,tê dan
 DocType: Salary Structure,Total Earning,Total Earning
 DocType: Purchase Receipt,Time at which materials were received,Time li ku materyalên pêşwazî kirin
 DocType: Stock Ledger Entry,Outgoing Rate,Rate nikarbe
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,master şaxê Organization.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,master şaxê Organization.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,an
 DocType: Sales Order,Billing Status,Rewş Billing
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Report an Dozî Kurd
@@ -2728,8 +2777,9 @@
 DocType: Notification Control,Sales Order Message,Sales Order Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Set Nirxên Default wek Company, Exchange, niha: Sala diravî, û hwd."
 DocType: Payment Entry,Payment Type,Type Payment
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Ji kerema xwe re Batch ji bo babet hilbijêre {0}. Nikare bibînin hevîrê single ku vê daxwazê ji cî û
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Ji kerema xwe re Batch ji bo babet hilbijêre {0}. Nikare bibînin hevîrê single ku vê daxwazê ji cî û
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Ji kerema xwe re Batch ji bo babet hilbijêre {0}. Nikare bibînin hevîrê single ku vê daxwazê ji cî û
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Ji kerema xwe re Batch ji bo babet hilbijêre {0}. Nikare bibînin hevîrê single ku vê daxwazê ji cî û
+DocType: Hub Category,Parent Category,Kategorî
 DocType: Process Payroll,Select Employees,Hilbijêre Karmendên
 DocType: Opportunity,Potential Sales Deal,Deal Sales Potential
 DocType: Complaint,Complaints,Gilî
@@ -2767,7 +2817,7 @@
 DocType: Bin,Reserved Quantity,Quantity reserved.
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,"Kerema xwe, navnîşana email derbasdar têkeve ji"
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,"Kerema xwe, navnîşana email derbasdar têkeve ji"
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Ji kerema xwe di kartê de tiştek hilbijêrin
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Ji kerema xwe di kartê de tiştek hilbijêrin
 DocType: Landed Cost Voucher,Purchase Receipt Items,Nawy kirînê Meqbûz
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Cureyên Customizing
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,Arrear
@@ -2777,15 +2827,15 @@
 DocType: Payment Request,Amount in customer's currency,Şêwaz li currency mişterî
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Şandinî
 DocType: Stock Reconciliation Item,Current Qty,Qty niha:
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Add Suppliers
+DocType: Restaurant Menu,Restaurant Menu,Menu Menu
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Borî
 DocType: Appraisal Goal,Key Responsibility Area,Area Berpirsiyariya Key
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Lekerên Student alîkarîya we bişopîne hazirbûn, nirxandinên û xercên ji bo xwendekaran"
 DocType: Payment Entry,Total Allocated Amount,Temamê meblaxa veqetandin
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Set account ambaran de default bo ambaran de perpetual
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Set account ambaran de default bo ambaran de perpetual
 DocType: Item Reorder,Material Request Type,Maddî request type
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Peyam di Journal Accural ji bo mûçeyên ji {0} ji bo {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage tije ye, rizgar ne"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage tije ye, rizgar ne"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Factor Converter wêneke e
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Kapîteya Room
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref
@@ -2824,16 +2874,18 @@
 DocType: Project,Task Completion,Task cebîr
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Ne li Stock
 DocType: Appraisal,HR User,Bikarhêner hr
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Bac û doz li dabirîn
-apps/erpnext/erpnext/hooks.py +129,Issues,pirsên
+apps/erpnext/erpnext/hooks.py +138,Issues,pirsên
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},"Rewş, divê yek ji yên bê {0}"
 DocType: Sales Invoice,Debit To,Debit To
+DocType: Restaurant Menu Item,Restaurant Menu Item,Peldanka Menu Restaurant
 DocType: Delivery Note,Required only for sample item.,tenê ji bo em babete test pêwîst.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qty rastî Piştî Transaction
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},No slip meaş dîtin di navbera {0} û {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},No slip meaş dîtin di navbera {0} û {1}
 ,Pending SO Items For Purchase Request,Hîn SO Nawy Ji bo Daxwaza Purchase
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Admissions Student
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} neçalak e
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Admissions Student
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} neçalak e
 DocType: Supplier,Billing Currency,Billing Exchange
 DocType: Sales Invoice,SINV-RET-,SINV-direvin
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Extra Large
@@ -2856,6 +2908,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Ji kerema xwe re tu ji serdanên pêwîst behsa
 DocType: Stock Settings,Default Valuation Method,Default Method Valuation
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,Xerc
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Pêşkeftina pêşveçûnê. Ew dibe ku demekê bigirin.
 DocType: Vehicle Log,Fuel Qty,Qty mazotê
 DocType: Production Order Operation,Planned Start Time,Bi plan Time Start
 DocType: Course,Assessment,Bellîkirinî
@@ -2871,7 +2924,7 @@
 DocType: Price List,Price List Master,Price List Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Hemû Transactions Sales dikare li dijî multiple Persons Sales ** ** tagged, da ku tu set û şopandina hedef."
 ,S.O. No.,SO No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Ji kerema Mişterî ji Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Ji kerema Mişterî ji Lead {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Nexşêre hilbijêre
 DocType: Price List,Applicable for Countries,Wergirtinê ji bo welatên
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Navê navnîşê
@@ -2903,27 +2956,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"account Expense / Cudahiya ({0}), divê hesabekî &#39;Profit an Loss&#39; be"
 DocType: Project,Copied From,Kopiyek ji From
 DocType: Project,Copied From,Kopiyek ji From
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},error Name: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Kêmasî
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},error Name: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,Kêmasî
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} nayê bi têkildar ne {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Amadebûna ji bo karker {0} jixwe nîşankirin
 DocType: Packing Slip,If more than one package of the same type (for print),Eger zêdetir ji pakêta cureyê eynî (ji bo print)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Ji kerema xwe ya mişterî ya li Restaurant Settings
 ,Salary Register,meaş Register
 DocType: Warehouse,Parent Warehouse,Warehouse dê û bav
 DocType: C-Form Invoice Detail,Net Total,Total net
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Default BOM ji bo babet dîtin ne {0} û Project {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Default BOM ji bo babet dîtin ne {0} û Project {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Define cureyên cuda yên deyn
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,mayî
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Time (li mins)
 DocType: Project Task,Working,Xebatê
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock Dorê (FIFOScheduler)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Sala Fînansê
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Sala Fînansê
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} nayê to Company girêdayî ne {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,Ji bo {0} karûbarên nirxên nirxan nehatin çareser kirin. Bawer bikin ku formula derbasdar e.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Mesrefa ku li ser
 DocType: Healthcare Settings,Out Patient Settings,Setup Patient
 DocType: Account,Round Off,li dora Off
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Hêjeya erênî erênî ye
 ,Requested Qty,Qty xwestin
 DocType: Tax Rule,Use for Shopping Cart,Bi kar tînin ji bo Têxe selikê
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Nirx {0} ji bo Pêşbîr {1} nayê ji di lîsteyê de Babetê derbasdar tune ne derbasbare Nirxên ji bo babet {2}
@@ -2932,7 +2987,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Li dijî wan doz dê were belavkirin bibihure li ser QTY babete an miqdar bingeha, wek per selection te"
 DocType: Maintenance Visit,Purposes,armancên
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Li Hindîstan û yek babete divê bi elemanekî negatîvî di belgeya vegera ketin
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Add Courses
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operasyona {0} êdî ji hemû dema xebatê di linux {1}, birûxîne operasyona nav operasyonên piralî"
 ,Requested,xwestin
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,No têbînî
@@ -2944,6 +2998,8 @@
 DocType: Employee Loan,Repaid/Closed,De bergîdana / Girtî
 DocType: Item,Total Projected Qty,Bi tevahî projeya Qty
 DocType: Monthly Distribution,Distribution Name,Navê Belavkariya
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Supplier&gt; Supplier Type
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Rêjeya nirxandina naveroka ji bo Item {0}, ku hewce ne ku ji bo {1} {2} navnîşên hesabê çêbikin. Heke ku ew tişt di nav {1} de nirxa nirxa sîvîl veguherîn e, ji kerema xwe li sifrêya 1 {1} binivîse. Wekî din, ji kerema xwe veguhastina veguhestina peyda ya peyda kirina an naveroka valahiyê binirxînin, û paşê hewl bidin ku têketina vê navnîşê / betal bikin"
 DocType: Course,Course Code,Code Kurs
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Serperiştiya Quality pêwîst ji bo vî babetî {0}
 DocType: POS Settings,Use POS in Offline Mode,POS di Mode ya Offline bikar bînin
@@ -2954,14 +3010,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Manage Tree Herêmê.
 DocType: Journal Entry Account,Sales Invoice,bi fatûreyên Sales
 DocType: Journal Entry Account,Party Balance,Balance Partiya
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,Ji kerema xwe ve Apply Discount Li ser hilbijêre
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Ji kerema xwe ve Apply Discount Li ser hilbijêre
 DocType: Company,Default Receivable Account,Default Account teleb
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Create Peyam Bank ji bo meaş total pere ji bo ku krîterên ku li jor hatiye hilbijartin
 DocType: Physician,Physician Schedule,Dixtorê doktor
 DocType: Purchase Invoice,Deemed Export,Export Export
 DocType: Stock Entry,Material Transfer for Manufacture,Transfer madî ji bo Manufacture
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Rêjeya Discount jî yan li dijî List Price an jî ji bo hemû List Price sepandin.
-DocType: Purchase Invoice,Half-yearly,Nîvsal carekî pişkinînên didanan
+DocType: Subscription,Half-yearly,Nîvsal carekî pişkinînên didanan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Peyam Accounting bo Stock
 DocType: Lab Test,LabTest Approver,LabTest nêzî
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Tu niha ji bo nirxandina nirxandin {}.
@@ -2990,13 +3046,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Extra Small
 DocType: Company,Standard Template,Şablon Standard
 DocType: Training Event,Theory,Dîtinî
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Hişyarî: Material Wîkîpediyayê Qty kêmtir ji Minimum Order Qty e
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Hişyarî: Material Wîkîpediyayê Qty kêmtir ji Minimum Order Qty e
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Account {0} frozen e
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Legal Entity / destekkirinê bi Chart cuda yên Accounts mensûbê Rêxistina.
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Food, Beverage &amp; tutunê"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},dikarin bi tenê peredayînê dijî make unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,rêjeya Komîsyona ne dikarin bibin mezintir ji 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},dikarin bi tenê peredayînê dijî make unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,rêjeya Komîsyona ne dikarin bibin mezintir ji 100
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Ji kerema xwe {0} yekem binivîse
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,No bersivęn wan ji
@@ -3014,10 +3070,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Reng
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Şertên Plan Nirxandina
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Pêşniyarên kirînê bikujin
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Neheq
 DocType: Patient Appointment,Scheduled,scheduled
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,ji bo gotinên li bixwaze.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ji kerema xwe veguhastina Sîstema Sîstema Navnetewî di Çavkaniya Mirovan&gt; HR Set
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Ji kerema xwe ve Babetê hilbijêre ku &quot;Ma Stock Babetî&quot; e &quot;No&quot; û &quot;Gelo babetî Nest&quot; e &quot;Erê&quot; e û tu Bundle Product din li wê derê
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Vebijêrk hilbijêrin
 DocType: Student Log,Academic,Danişgayî
 DocType: Patient,Personal and Social History,Dîroka Kesane û Civakî
 DocType: Fee Schedule,Fee Breakup for each student,Ji bo her xwendekaran ji bo şermezarkirina xerîb
@@ -3027,7 +3084,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Rate Valuation
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,List Price Exchange hilbijartî ne
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,List Price Exchange hilbijartî ne
 apps/erpnext/erpnext/config/healthcare.py +46,Results,results
 ,Student Monthly Attendance Sheet,Xwendekarên mihasebeya Beşdariyê Ayda
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Xebatkarê {0} hatiye ji bo bidestxistina {1} di navbera {2} û {3}
@@ -3043,7 +3100,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Manage Partners Sales.
 DocType: Quality Inspection,Inspection Type,Type Serperiştiya
 DocType: Fee Validity,Visited yet,Dîsa nêzî
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Wargehan de bi mêjera yên heyî dikarin bi komeke ne bê guhertin.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Wargehan de bi mêjera yên heyî dikarin bi komeke ne bê guhertin.
 DocType: Assessment Result Tool,Result HTML,Di encama HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ketin ser
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,lê zêde bike Xwendekarên
@@ -3070,7 +3127,7 @@
 DocType: Healthcare Settings,Result Printed,Result Çapkirin
 DocType: Asset Category Account,Depreciation Expense Account,Account qereçî Expense
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,ceribandinê de
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},View {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},View {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Tenê hucûma pel di mêjera destûr
 DocType: Expense Claim,Expense Approver,Approver Expense
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,"Row {0}: Advance dijî Mişterî, divê credit be"
@@ -3082,7 +3139,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,to DateTime
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Schedules Kurs deleted:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Têketin ji bo parastina statûya delivery sms
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Target Target Target
 DocType: Accounts Settings,Make Payment via Journal Entry,Make Payment via Peyam di Journal
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Çap ser
 DocType: Item,Inspection Required before Delivery,Serperiştiya pêwîst berî Delivery
@@ -3090,7 +3146,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Çalakî hîn
 DocType: Patient Appointment,Reminded,Reminded
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Rêxistina te
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Rêxistina te
 DocType: Fee Component,Fees Category,xercên Kategorî
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Ji kerema xwe ve date ûjdanê xwe binivîse.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
@@ -3102,7 +3158,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Level DIRTYHERTZ
 DocType: Company,Chart Of Accounts Template,Chart bikarhênerên Şablon
 DocType: Attendance,Attendance Date,Date amadebûnê
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Babetê Price ve ji bo {0} li List Price {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Babetê Price ve ji bo {0} li List Price {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,jihevketina meaşê li ser Earning û vê rêyê.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Account bi hucûma zarok nikare bê guhartina ji bo ledger
 DocType: Purchase Invoice Item,Accepted Warehouse,Warehouse qebûlkirin
@@ -3118,9 +3174,10 @@
 ,Employee Birthday,Xebatkarê Birthday
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Xwendekarên Tool Batch Beşdariyê
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,Sînora Crossed
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Dema Scheduled Up
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,An term akademîk bi vê &#39;Sala (Ekadîmî)&#39; {0} û &#39;Name Term&#39; {1} ji berê ve heye. Ji kerema xwe re van entries xeyrandin û careke din biceribîne.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","As in muamele heyî dijî babete {0} hene, tu bi nirxê biguherînin {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","As in muamele heyî dijî babete {0} hene, tu bi nirxê biguherînin {1}"
 DocType: UOM,Must be Whole Number,Divê Hejmara Whole
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Leaves New veqetandin (Di Days)
 DocType: Purchase Invoice,Invoice Copy,bi fatûreyên Copy
@@ -3130,7 +3187,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Hejmara fatûreyên
 DocType: Shopping Cart Settings,Orders,ordênên
 DocType: Employee Leave Approver,Leave Approver,Dev ji Approver
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Tikaye hevîrê hilbijêre
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Tikaye hevîrê hilbijêre
 DocType: Assessment Group,Assessment Group Name,Navê Nirxandina Group
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Maddî Transferred bo Manufacture
 DocType: Expense Claim,"A user with ""Expense Approver"" role",A user bi &quot;Expense Approver&quot; rola
@@ -3145,7 +3202,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Peyam di dema Girtina
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Daîreya Hilbijêre ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Navenda Cost bi muamele û yên heyî dikarin bi komeke ne venegerin
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Şêwaz {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Şêwaz {0} {1} {2} {3}
 DocType: Account,Depreciation,Farhad.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Supplier (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Xebatkarê Tool Beşdariyê
@@ -3157,10 +3214,12 @@
 DocType: GL Entry,Voucher No,fîşeke No
 ,Lead Owner Efficiency,Efficiency Xwedîyê Lead
 ,Lead Owner Efficiency,Efficiency Xwedîyê Lead
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Gelek Popular
 DocType: Leave Allocation,Leave Allocation,Dev ji mûçeyan
 DocType: Payment Request,Recipient Message And Payment Details,Recipient Message Û Details Payment
 DocType: Training Event,Trainer Email,Trainer Email
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Daxwazên maddî {0} tên afirandin
+DocType: Restaurant Reservation,No of People,Nabe Gel
 DocType: Production Planning Tool,Include sub-contracted raw materials,Usa jî madeyên xav-sub bi peyman
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Şablon ji alî an peymaneke.
 DocType: Purchase Invoice,Address and Contact,Address û Contact
@@ -3169,10 +3228,11 @@
 DocType: Supplier,Last Day of the Next Month,Last Day of the Month Next
 DocType: Support Settings,Auto close Issue after 7 days,Auto Doza nêzîkî piştî 7 rojan
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Leave nikarim li ber terxan kirin {0}, wekî parsenga îzinê jixwe-hilgire hatiye şandin, di qeyda dabeşkirina îzna pêş {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Têbînî: Ji ber / Date: Çavkanî qat bi destûr rojan credit mişterî destê {0} roj (s)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Têbînî: Ji ber / Date: Çavkanî qat bi destûr rojan credit mişterî destê {0} roj (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Xwendekarên Applicant
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL BO SITENDÊR
 DocType: Asset Category Account,Accumulated Depreciation Account,Account Farhad. Accumulated
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Ev e-nameya otogenerkirî ye
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Arşîva
 DocType: Program Enrollment,Boarding Student,Xwendekarên înternat
 DocType: Asset,Expected Value After Useful Life,Nirx a bende Piştî Jiyana
@@ -3180,7 +3240,7 @@
 DocType: Activity Cost,Billing Rate,Rate Billing
 ,Qty to Deliver,Qty ji bo azad
 ,Stock Analytics,Stock Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Operasyonên bi vala neyê hiştin
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Operasyonên bi vala neyê hiştin
 DocType: Maintenance Visit Purpose,Against Document Detail No,Li dijî Detail dokumênt No
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Type Partiya wêneke e
 DocType: Quality Inspection,Outgoing,nikarbe
@@ -3203,7 +3263,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,xwendekarên bi destan ji bo Activity bingeha Pol Hilbijêre
 DocType: Journal Entry,User Remark,Remark Bikarhêner
 DocType: Lead,Market Segment,Segment Market
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Şêwaz pere ne dikarin bibin mezintir total mayî neyînî {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Şêwaz pere ne dikarin bibin mezintir total mayî neyînî {0}
 DocType: Supplier Scorecard Period,Variables,Variables
 DocType: Employee Internal Work History,Employee Internal Work History,Xebatkarê Navxweyî Dîroka Work
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Girtina (Dr)
@@ -3233,21 +3293,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Get rojanekirî
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} ne ji Company girêdayî ne {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Daxwaza maddî {0} betal e an sekinî
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Dev ji Management
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Dev ji Management
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Pol destê Account
 DocType: Sales Order,Fully Delivered,bi temamî Çiyan
 DocType: Lead,Lower Income,Dahata Lower
+DocType: Restaurant Order Entry,Current Order,Armanca Dawîn
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Source û warehouse hedef ne dikarin heman tiştî ji bo row {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Account Cudahiya, divê hesabekî type Asset / mesulîyetê be, ji ber ku ev Stock Lihevkirinê an Peyam Opening e"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Şêwaz dandin de ne dikarin bibin mezintir Loan Mîqdar {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Herin bernameyan
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Bikirin siparîşê pêwîst ji bo vî babetî {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Production Order tên afirandin ne
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Production Order tên afirandin ne
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;Ji Date&#39; Divê piştî &#39;To Date&#39; be
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Dikare biguhere status wek xwendekarê bi {0} bi serlêdana xwendekaran ve girêdayî {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Dikare biguhere status wek xwendekarê bi {0} bi serlêdana xwendekaran ve girêdayî {1}
 DocType: Asset,Fully Depreciated,bi temamî bicūkkirin
 ,Stock Projected Qty,Stock projeya Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Mişterî {0} ne aîdî raxe {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Mişterî {0} ne aîdî raxe {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Beşdariyê nîşankirin HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Quotations pêşniyarên in, bids ku hûn û mişterîyên xwe şandin"
 DocType: Sales Order,Customer's Purchase Order,Mişterî ya Purchase Order
@@ -3258,8 +3319,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Ji kerema xwe ve set Hejmara Depreciations civanan
 DocType: Supplier Scorecard Period,Calculations,Pawlos
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Nirx an Qty
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,"Ordênên Productions dikarin ji bo ne, bêne zindî kirin:"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,"Ordênên Productions dikarin ji bo ne, bêne zindî kirin:"
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Deqqe
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ji kerema xwe veşartî ji bo {0} bi Sîstema Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Invoice,Purchase Taxes and Charges,"Bikirin Bac, û doz li"
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Herin Berzê
 ,Qty to Receive,Qty Werdigire
@@ -3273,7 +3335,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,"Credit To account, divê hesabekî Bîlançoya be"
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,All Types Supplier
 DocType: Global Defaults,Disable In Words,Disable Li Words
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,Code babete wêneke e ji ber ku em babete bixweber hejmartî ne
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,Code babete wêneke e ji ber ku em babete bixweber hejmartî ne
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Quotation {0} ne ji type {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Maintenance babet Cedwela
 DocType: Sales Order,%  Delivered,% Çiyan
@@ -3295,23 +3357,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Opening Sebra Balance
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Têkilî
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Jiberma
 DocType: Appraisal,Appraisal,Qinetbirrînî
 DocType: Purchase Invoice,GST Details,GST Dîtin
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},"Email şandin, da ku dabînkerê {0}"
+DocType: Item,Default Sales Unit of Measure,Yekitiya firotanê ya Çargoşe ya Measure
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Date tê dubarekirin
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,mafdar
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},"Dev ji approver, divê yek ji yên bê {0}"
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Pêvek çêbikin
-DocType: Hub Settings,Seller Email,Seller Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total Cost Purchase (via Purchase bi fatûreyên)
 DocType: Training Event,Start Time,Time Start
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Hilbijêre Diravan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Hilbijêre Diravan
 DocType: Customs Tariff Number,Customs Tariff Number,Gumrikê Hejmara tarîfan
 DocType: Patient Appointment,Patient Appointment,Serdanek Nexweş
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Erêkirina Role ne dikarin heman rola desthilata To evin e
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Vê grûpê Email Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Vê grûpê Email Digest
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Bi Dirîkariyê Bişînin
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} ji bo Peldanka {1} nehat dîtin.
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Herin Courses
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Peyam nehat şandin
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Account bi hucûma zarok dikare wek ledger ne bê danîn
@@ -3324,11 +3389,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Maddî Transferred bo Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Account {0} nayê heye ne
 DocType: Project,Project Type,Type Project
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Taskek Zarok ji bo vê Taskê heye. Hûn nikarin vê Taskê nadeve.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,An QTY hedef an target mîqdara bivênevê ye.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Cost ji çalakiyên cuda
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Ne encam nîne
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Cost ji çalakiyên cuda
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Bikin Events {0}, ji ber ku Employee girêdayî jêr Persons Sales nade a ID&#39;ya bikarhêner heye ne {1}"
 DocType: Timesheet,Billing Details,Details Billing
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Source û warehouse target divê cuda bê
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Source û warehouse target divê cuda bê
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},destûra te ya rojanekirina muameleyên borsayê yên kevintir ji {0}
 DocType: Purchase Invoice Item,PR Detail,Detail PR
 DocType: Sales Order,Fully Billed,bi temamî billed
@@ -3355,7 +3422,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Transfer wire
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Check hemû
 DocType: Vehicle Log,Invoice Ref,bi fatûreyên Ref
-DocType: Purchase Order,Recurring Order,nişankirin Order
 DocType: Company,Default Income Account,Account Default da-
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Mişterî Group / mişterî
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Negirtî Fiscal Years Profit / Loss (Credit)
@@ -3369,9 +3435,9 @@
 DocType: Patient,A Negative,Negative
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Tiştek din nîşan bidin.
 DocType: Lead,From Customer,ji Mişterî
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Banga
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Banga
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,A Product
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,lekerên
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,lekerên
 DocType: Project,Total Costing Amount (via Time Logs),Temamê meblaxa bi qurûşekî jî (bi riya Time Têketin)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Make Schedule Schedule
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
@@ -3396,7 +3462,7 @@
 DocType: School Settings,Current Academic Term,Term (Ekadîmî) Current
 DocType: School Settings,Current Academic Term,Term (Ekadîmî) Current
 DocType: Sales Order,Not Billed,billed ne
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,"Herdu Warehouse, divê ji bo eynî Company aîdî"
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,"Herdu Warehouse, divê ji bo eynî Company aîdî"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,No têkiliyên added yet.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Cost Landed Mîqdar Vienna
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Fatoreyên rakir destê Suppliers.
@@ -3405,7 +3471,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Şêwaz discount
 DocType: Purchase Invoice,Return Against Purchase Invoice,Vegere li dijî Purchase bi fatûreyên
 DocType: Item,Warranty Period (in days),Period Warranty (di rojên)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',update `tabPatient Appointment` set sales_invoice = &#39;{0}&#39; where nav = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Peywendiya bi Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Cash Net ji operasyonên
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Babetê 4
@@ -3414,8 +3479,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Account Peyam di Journal
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Komeleya Xwendekarên
 DocType: Shopping Cart Settings,Quotation Series,quotation Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","An babete bi heman navî heye ({0}), ji kerema xwe biguherînin li ser navê koma babete an navê babete"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Ji kerema xwe ve mişterî hilbijêre
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","An babete bi heman navî heye ({0}), ji kerema xwe biguherînin li ser navê koma babete an navê babete"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Ji kerema xwe ve mişterî hilbijêre
 DocType: C-Form,I,ez
 DocType: Company,Asset Depreciation Cost Center,Asset Navenda Farhad. Cost
 DocType: Sales Order Item,Sales Order Date,Sales Order Date
@@ -3424,6 +3489,7 @@
 DocType: Assessment Plan,Assessment Plan,Plan nirxandina
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Têkilî {0} hatiye afirandin.
 DocType: Stock Settings,Limit Percent,Sedî Sînora
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Niha tu firotek li her wareyê heye
 ,Payment Period Based On Invoice Date,Period tezmînat li ser Date bi fatûreyên
 DocType: Sample Collection,No. of print,Hejmara çapkirinê
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Exchange wenda Exchange ji bo {0}
@@ -3479,13 +3545,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pay Gross - dabirîna Total - Loan vegerandinê
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,BOM û niha New BOM ne dikarin heman
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Meaş ID Slip
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Meaş ID Slip
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,"Date Of Teqawîdiyê, divê mezintir Date of bizaveka be"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,bûn çewtî dema ku bername- Bêguman li ser heye:
 DocType: Sales Invoice,Against Income Account,Li dijî Account da-
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Çiyan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Babetê {0}: QTY fermana {1} nikare were kêmî ji kêm QTY da {2} (danasîn li babete).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Babetê {0}: QTY fermana {1} nikare were kêmî ji kêm QTY da {2} (danasîn li babete).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Rêjeya Belavkariya mehane
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Ji kerema xwe bikarhênerê din bikar bînin.
 DocType: Territory,Territory Targets,Armanc axa
 DocType: Delivery Note,Transporter Info,Transporter Info
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Ji kerema xwe ve set default {0} li Company {1}
@@ -3493,13 +3560,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,dabînkerê heman hatiye bicihkirin çend caran
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Profit Gross / Loss
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Bikirin Order babet Supplied
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Navê Company nikare bibe Company
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Navê Company nikare bibe Company
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Serên nameyek ji bo şablonan print.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titles ji bo şablonan print wek proforma.
 DocType: Program Enrollment,Walking,Walking
 DocType: Student Guardian,Student Guardian,Xwendekarên Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,doz type Valuation ne dikarin weke berfireh nîşankirin
 DocType: POS Profile,Update Stock,update Stock
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,di beşdariyê de
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM cuda ji bo tomar dê ji bo Şaşî (Total) nirxa Loss Net rê. Bawer bî ku Loss Net ji hev babete di UOM heman e.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,Peyam di Journal ji bo Scrap
@@ -3549,15 +3617,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Sîstema User (login) ID. Heke were avakirin, ew jî wê bibin standard ji bo hemû formên HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Ji {1}
 DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Ji bo hemî bereya Tenduristî ya bihayê nûçeyê nûjen kirin. Ew dikare çend deqeyan bistînin.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Ji bo hemî bereya Tenduristî ya bihayê nûçeyê nûjen kirin. Ew dikare çend deqeyan bistînin.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Name ji Account nû. Not: Ji kerema xwe, hesabên ji bo muşteriyan û Bed biafirîne"
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Country default şehreza Şablonên Address
 DocType: Sales Order Item,Supplier delivers to Customer,Supplier xelas dike ji bo Mişterî
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (Form # / babet / {0}) e ji stock
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Date ji ber / Çavkanî ne dikarin piştî be {0}
+,Sales Payment Summary,Bargirtina Baca Bazirganiyê
+DocType: Restaurant,Restaurant,Aşxane
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Date ji ber / Çavkanî ne dikarin piştî be {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data Import û Export
 DocType: Patient,Account Details,Agahdariyên Hesab
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,No xwendekarên dîtin.Di
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,No xwendekarên dîtin.Di
 DocType: Medical Department,Medical Department,Daîreya lênêrînê
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Supplier Scorecard Criteria Scoring
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Bi fatûreyên Mesaj Date
@@ -3568,8 +3638,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Ji kerema xwe ve Mesaj Date Beriya hilbijartina Partiya hilbijêre
 DocType: Program Enrollment,School House,House School
 DocType: Serial No,Out of AMC,Out of AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Tikaye Quotations hilbijêre
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Tikaye Quotations hilbijêre
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Tikaye Quotations hilbijêre
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Tikaye Quotations hilbijêre
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Hejmara Depreciations civanan ne dikarin bibin mezintir Hejmara Depreciations
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Make Maintenance Visit
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,Ji kerema xwe re ji bo ku bikarhêner ku Sales Manager Master {0} rola xwedî têkilî bi
@@ -3577,7 +3647,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Company (ne Mişterî an Supplier) master.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Ev li ser amadebûna vê Xwendekarên li
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,No Xwendekarên li
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Lê zêde bike tomar zêdetir an form tije vekirî
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Lê zêde bike tomar zêdetir an form tije vekirî
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Notes Delivery {0} divê berî betalkirinê ev Sales Order were betalkirin
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Herin Bikarhênerên
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,pereyan + hewe Off Mîqdar ne dikarin bibin mezintir Grand Total
@@ -3597,37 +3667,40 @@
 DocType: Fee Schedule,Fee Schedule,Cedwela Fee
 DocType: Hub Settings,Publish Availability,Weşana Availability
 DocType: Company,Create Chart Of Accounts Based On,Create Chart bikarhênerên li ser
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Ne nikarin ew bi ne-koman veguherînin. Tîmên Zarokan hene.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Roja bûyînê ne dikarin bibin mezintir îro.
 ,Stock Ageing,Stock Ageing
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Xwendekarên {0} dijî serlêder Xwendekarê hene {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Pargîdaniya Rounding
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,timesheet
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,timesheet
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} &#39;{1}&#39; neçalak e
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Set as Open
 DocType: Cheque Print Template,Scanned Cheque,Scanned Cheque
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Send emails otomatîk ji Têkilî li ser danûstandinên Radestkirina.
 DocType: Timesheet,Total Billable Amount,Temamê meblaxa Billable
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Babetê 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Entry Order
 DocType: Purchase Order,Customer Contact Email,Mişterî Contact Email
 DocType: Warranty Claim,Item and Warranty Details,Babetê û Warranty Details
 DocType: Sales Team,Contribution (%),Alîkarên (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Têbînî: em Peyam Pere dê ji ber ku tên afirandin, ne bê &#39;Cash an Account Bank&#39; ne diyar bû"
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Projeya {0} berê heye
 DocType: Medical Department,Nursing User,Nursing User
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,berpirsiyariya
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Dema valahiyê ya vê kursiyê qediya.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Dema valahiyê ya vê kursiyê qediya.
 DocType: Expense Claim Account,Expense Claim Account,Account mesrefan
 DocType: Accounts Settings,Allow Stale Exchange Rates,Allow Stale Exchange Rates
 DocType: Sales Person,Sales Person Name,Sales Name Person
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Ji kerema xwe ve Hindîstan û 1 fatûra li ser sifrê binivîse
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,lê zêde bike Users
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,lê zêde bike Users
 DocType: POS Item Group,Item Group,Babetê Group
 DocType: Item,Safety Stock,Stock Safety
 DocType: Healthcare Settings,Healthcare Settings,Mîhengên tenduristiyê
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Terakkî% ji bo karekî ne dikarin zêdetir ji 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Terakkî% ji bo karekî ne dikarin zêdetir ji 100.
 DocType: Stock Reconciliation Item,Before reconciliation,berî ku lihevhatina
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Bac û tawana Ev babete ji layê: (Company Exchange)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Bacê babete {0} de divê hesabê type Bacê an Hatinê an jî Expense an Chargeable hene
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Bacê babete {0} de divê hesabê type Bacê an Hatinê an jî Expense an Chargeable hene
 DocType: Sales Order,Partly Billed,hinekî billed
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,"Babetê {0}, divê babete Asset Fixed be"
 DocType: Item,Default BOM,Default BOM
@@ -3643,6 +3716,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,Têgûherr
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Ji Delivery Note
 DocType: Student,Student Email Address,Xwendekarên Email Address
+DocType: Item,Hub Warehouse,Hub Warehouse
 DocType: Physician Schedule Time Slot,From Time,ji Time
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Ez bêzarim:
 DocType: Notification Control,Custom Message,Message Custom
@@ -3651,9 +3725,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Address Student
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Address Student
 DocType: Purchase Invoice,Price List Exchange Rate,List Price Exchange Rate
+DocType: POS Profile,POS Profile Name,Navê POS Navê
 DocType: Purchase Invoice Item,Rate,Qûrs
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Pizişka destpêker
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Address Name
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Address Name
 DocType: Stock Entry,From BOM,ji BOM
 DocType: Assessment Code,Assessment Code,Code nirxandina
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Bingehîn
@@ -3667,11 +3742,12 @@
 DocType: Salary Slip,Salary Structure,Structure meaş
 DocType: Account,Bank,Banke
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Şîrketa balafiran
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Doza Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Doza Material
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Çewtiyek çêkir dema dema veguhestinê de ye
 DocType: Material Request Item,For Warehouse,ji bo Warehouse
 DocType: Employee,Offer Date,Pêşkêşiya Date
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Quotations
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,"Tu di moda negirêdayî ne. Tu nikarî wê ji nû ve, heta ku hûn torê."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,"Tu di moda negirêdayî ne. Tu nikarî wê ji nû ve, heta ku hûn torê."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,No komên xwendekaran tên afirandin.
 DocType: Purchase Invoice Item,Serial No,Serial No
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Şêwaz vegerandinê mehane ne dikarin bibin mezintir Loan Mîqdar
@@ -3681,17 +3757,18 @@
 DocType: Salary Slip,Total Working Hours,Total dema xebatê
 DocType: Subscription,Next Schedule Date,Dîroka Schedule ya din
 DocType: Stock Entry,Including items for sub assemblies,Di nav wan de tomar bo sub meclîsên
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Enter nirxa divê erênî be
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Hemû Territories
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Enter nirxa divê erênî be
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Hemû Territories
 DocType: Purchase Invoice,Items,Nawy
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Xwendekarên jixwe digirin.
 DocType: Fiscal Year,Year Name,Navê sal
 DocType: Process Payroll,Process Payroll,payroll pêvajoya
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,in holidays zêdetir ji rojên xebatê de vê mehê hene.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,in holidays zêdetir ji rojên xebatê de vê mehê hene.
 DocType: Product Bundle Item,Product Bundle Item,Product Bundle babetî
 DocType: Sales Partner,Sales Partner Name,Navê firotina Partner
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Daxwaza ji bo Quotations
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Daxwaza ji bo Quotations
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maximum Mîqdar bi fatûreyên
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hematolojiyê
 DocType: Normal Test Items,Normal Test Items,Test Test Items
 DocType: Student Language,Student Language,Ziman Student
 apps/erpnext/erpnext/config/selling.py +23,Customers,muşteriyan
@@ -3703,10 +3780,11 @@
 DocType: Issue,Opening Time,Time vekirinê
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,From û To dîrokên pêwîst
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Ewlehiya &amp; Borsayên Tirkiyeyê
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Default Unit ji pîvanê ji bo Variant &#39;{0}&#39;, divê wekî li Şablon be &#39;{1}&#39;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Default Unit ji pîvanê ji bo Variant &#39;{0}&#39;, divê wekî li Şablon be &#39;{1}&#39;"
 DocType: Shipping Rule,Calculate Based On,Calcolo li ser
 DocType: Delivery Note Item,From Warehouse,ji Warehouse
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,No babet bi Bill ji materyalên ji bo Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,No babet bi Bill ji materyalên ji bo Manufacture
+DocType: Restaurant,Default Customer,Berpirsiyarê Default
 DocType: Assessment Plan,Supervisor Name,Navê Supervisor
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Bawer bikin ku heger wê roja ku ji bo rûniştinê hate çêkirin
 DocType: Program Enrollment Course,Program Enrollment Course,Program hejmartina Kurs
@@ -3734,7 +3812,7 @@
 DocType: Payment Entry,Internal Transfer,Transfer navxweyî
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,account zarok ji bo vê çîrokê de heye. Tu dikarî vê account jêbirin.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,An QTY hedef an miqdar hedef diyarkirî e
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},No BOM default ji bo vî babetî heye {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},No BOM default ji bo vî babetî heye {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Ji kerema xwe ve yekem Mesaj Date hilbijêre
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Vekirina Date divê berî Girtina Date be
 DocType: Leave Control Panel,Carry Forward,çêşît Forward
@@ -3770,6 +3848,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Total Present
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,Rageyendrawekanî Accounting
 DocType: Drug Prescription,Hour,Seet
+DocType: Restaurant Order Entry,Last Sales Invoice,Last Sales Invoice
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"No New Serial ne dikarin Warehouse hene. Warehouse kirin, divê ji aliyê Stock Peyam an Meqbûz Purchase danîn"
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Destûra te tune ku ji bo pejirandina pelên li ser Kurdî Nexşe Block
@@ -3806,65 +3885,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Create Users
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,Xiram
 DocType: Supplier Scorecard,Per Month,Per Month
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Diravan ji bo Manufacture divê mezintir 0 be.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Diravan ji bo Manufacture divê mezintir 0 be.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,rapora ji bo banga parastina biçin.
 DocType: Stock Entry,Update Rate and Availability,Update Rate û Amadeyî
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Rêjeya we bi destûr bistînin an rizgar zêdetir li dijî dorpêçê de ferman da. Ji bo nimûne: Ger tu 100 yekîneyên emir kirine. û bistînin xwe 10% îdî tu bi destûr bo wergirtina 110 yekîneyên e.
 DocType: POS Customer Group,Customer Group,mişterî Group
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Batch ID New (Li gorî daxwazê)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Batch ID New (Li gorî daxwazê)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Batch ID New (Li gorî daxwazê)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Batch ID New (Li gorî daxwazê)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},account Expense bo em babete wêneke e {0}
 DocType: BOM,Website Description,Website Description
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Change Net di Sebra min
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Newest
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Ji kerema xwe ve poşmaniya kirînê bi fatûreyên {0} pêşîn
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Email Address divê yekta be, ji niha ve ji bo heye {0}"
 DocType: Serial No,AMC Expiry Date,AMC Expiry Date
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,Meqbûz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,Meqbûz
 ,Sales Register,Sales Register
 DocType: Daily Work Summary Settings Company,Send Emails At,Send Emails At
 DocType: Quotation,Quotation Lost Reason,Quotation Lost Sedem
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Select Domain te
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',hilbijêre * ji navnîşa ku navê = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Muameleyan referansa no {0} dîroka {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Muameleyan referansa no {0} dîroka {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,e ku tu tişt ji bo weşînertiya hene.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Form View
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Nasname ji bo vê mehê de û çalakiyên hîn
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Form View
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Nasname ji bo vê mehê de û çalakiyên hîn
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Bikaranîna xwe ji rêxistinê xwe, ji bilî xwe zêde bike."
 DocType: Customer Group,Customer Group Name,Navê Mişterî Group
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,No muşteriyan yet!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,No muşteriyan yet!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Daxûyanîya Flow Cash
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Deyn Mîqdar dikarin Maximum Mîqdar deyn ji mideyeka ne bêtir ji {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Îcaze
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Ji kerema xwe re vê bi fatûreyên {0} ji C-Form jê {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Ji kerema xwe re vê bi fatûreyên {0} ji C-Form jê {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Ji kerema xwe ve çêşît Forward hilbijêre, eger hûn jî dixwazin ku di nav hevsengiyê sala diravî ya berî bernadin ji bo vê sala diravî ya"
 DocType: GL Entry,Against Voucher Type,Li dijî Type Vienna
 DocType: Physician,Phone (R),Telefon (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Slots zêdekirin
 DocType: Item,Attributes,taybetmendiyên xwe
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Şablon
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ji kerema xwe veşartî ji bo {0} bi Sîstema Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Ji kerema xwe re têkevin hewe Off Account
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Last Order Date
 DocType: Patient,B Negative,B Negative
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Account {0} nayê ji şîrketa endamê ne {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Numbers Serial li row {0} nayê bi Delivery Têbînî hev nagirin
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Numbers Serial li row {0} nayê bi Delivery Têbînî hev nagirin
 DocType: Student,Guardian Details,Guardian Details
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Beşdariyê Mark ji bo karmendên multiple
 DocType: Vehicle,Chassis No,Chassis No
 DocType: Payment Request,Initiated,destpêkirin
 DocType: Production Order,Planned Start Date,Plankirin Date Start
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Ji kerema xwe BOM hilbijêre
 DocType: Serial No,Creation Document Type,Creation Corî dokumênt
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Dîroka dawîn ji roja destpêkê mezintir be
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Dîroka dawîn ji roja destpêkê mezintir be
 DocType: Leave Type,Is Encash,e Encash
 DocType: Leave Allocation,New Leaves Allocated,Leaves New veqetandin
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Daneyên Project-aqil e ji bo Quotation ne amade ne
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Dawîn
 DocType: Project,Expected End Date,Hêvîkirin Date End
 DocType: Budget Account,Budget Amount,budceya Mîqdar
 DocType: Appraisal Template,Appraisal Template Title,Appraisal Şablon Title
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Ji Date {0} ji bo karkirinê {1} nikarim li ber Date tevlî karker be {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Commercial
 DocType: Patient,Alcohol Current Use,Bikaranîna Niha Alkol
+DocType: Student Admission Program,Student Admission Program,Bername Bernameya Xwendekarên
 DocType: Payment Entry,Account Paid To,Hesabê To
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,"Dê û bav babet {0} ne, divê bibe babeta Stock"
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Hemû Products an Services.
@@ -3873,30 +3954,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Budget bo Account {1} dijî {2} {3} e {4}. Ev dê ji aliyê biqede {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Account divê ji type be &#39;Asset Fixed&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,out Qty
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Qaîdeyên ji bo hesibandina mîqdara shipping ji bo firotina
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,û Neçalak kirin di nav
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Series wêneke e
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financial Services
 DocType: Student Sibling,Student ID,ID Student
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Cureyên çalakiyên ji bo Têketin Time
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Email
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Cureyên çalakiyên ji bo Têketin Time
 DocType: Tax Rule,Sales,Sales
 DocType: Stock Entry Detail,Basic Amount,Şêwaz bingehîn
 DocType: Training Event,Exam,Bilbilên
 DocType: Complaint,Complaint,Gilî
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Warehouse pêwîst ji bo vî babetî stock {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Warehouse pêwîst ji bo vî babetî stock {0}
 DocType: Leave Allocation,Unused leaves,pelên Unused
 DocType: Patient,Alcohol Past Use,Bikaranîna Pêdivî ya Alkol
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Kr
 DocType: Tax Rule,Billing State,Dewletê Billing
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Derbaskirin
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Fetch BOM teqiya (di nav wan de sub-meclîs)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Derbaskirin
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Fetch BOM teqiya (di nav wan de sub-meclîs)
 DocType: Authorization Rule,Applicable To (Employee),To wergirtinê (Xebatkarê)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Date ji ber wêneke e
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Date ji ber wêneke e
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Increment bo Pêşbîr {0} nikare bibe 0
 DocType: Journal Entry,Pay To / Recd From,Pay To / Recd From
 DocType: Naming Series,Setup Series,Series Setup
 DocType: Payment Reconciliation,To Invoice Date,To bi fatûreyên Date
 DocType: Supplier,Contact HTML,Contact HTML
 ,Inactive Customers,muşteriyan neçalak e
+DocType: Student Admission Program,Maximum Age,Mezin Age
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Receipts kirîn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Çawa Pricing Rule sepandin?
@@ -3915,6 +3998,7 @@
 DocType: GL Entry,Remarks,têbînî
 DocType: Payment Entry,Account Paid From,Hesabê From
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Code babetî
+DocType: Task,Parent Task,Task Parêz
 DocType: Journal Entry,Write Off Based On,Hewe Off li ser
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Make Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Print û Stationery
@@ -3923,20 +4007,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Meaşê niha ve ji bo dema di navbera {0} û {1}, Leave dema serlêdana ne di navbera vê R‧ezkirina dema bê vehûnandin."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,record Installation bo No. Serial
 DocType: Guardian Interest,Guardian Interest,Guardian Interest
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Nirxên default default Setup for POS
 apps/erpnext/erpnext/config/hr.py +177,Training,Hîndarî
 DocType: Timesheet,Employee Detail,Detail karker
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ID Email
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ID Email
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,roj Date Next û Dubare li ser Day of Month wekhev bin
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,roj Date Next û Dubare li ser Day of Month wekhev bin
 DocType: Lab Prescription,Test Code,Kodê testê
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Mîhengên ji bo homepage malpera
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ ji bo {1} ji bila {0} ji bo karmendek ji
 DocType: Offer Letter,Awaiting Response,li benda Response
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Ser
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Tevahî Amount {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},taybetmendiyê de çewt {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Tevahî Amount {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},taybetmendiyê de çewt {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Qala eger ne-standard account cîhde
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},babete heman hatiye nivîsandin çend caran. {rêzok}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Kerema xwe re koma nirxandina ya din jî ji bilî &#39;Hemû Groups Nirxandina&#39; hilbijêrî
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Row {0}: Navenda kredê pêwîst e ku {1}
 DocType: Training Event Employee,Optional,Bixwe
@@ -3961,11 +4045,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Get Nawy ji Bundle Product
 DocType: Asset,Straight Line,Line Straight
 DocType: Project User,Project User,Project Bikarhêner
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Qelişandin
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Qelişandin
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Qelişandin
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Qelişandin
 DocType: GL Entry,Is Advance,e Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Alîkarîkirinê ji Date û amadebûnê To Date wêneke e
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,Ji kerema xwe re têkevin &#39;Ma Subcontracted&#39; wek Yes an No
+DocType: Item,Default Purchase Unit of Measure,Yekîneya Kirûmetî ya Bingeha Navîn
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Last Date Ragihandin
 DocType: Sales Team,Contact No.,Contact No.
 DocType: Bank Reconciliation,Payment Entries,Arşîva Payment
@@ -3973,7 +4058,6 @@
 DocType: Production Order,Check if material transfer entry is not required,Check eger entry transfer maddî ne hewceyî
 DocType: Production Order,Check if material transfer entry is not required,Check eger entry transfer maddî ne hewceyî
 DocType: Program Enrollment Tool,Get Students From,Get xwendekarên ji
-DocType: Hub Settings,Seller Country,Seller Country
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Weşana Nawy li ser Website
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Pol xwendekarên xwe li lekerên
 DocType: Authorization Rule,Authorization Rule,Rule Authorization
@@ -3983,8 +4067,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Baca firotina û doz li Şablon
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Total (Credit)
 DocType: Repayment Schedule,Payment Date,Date Payment
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Batch New Qty
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Batch New Qty
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Batch New Qty
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Batch New Qty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Apparel &amp; Accessories
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,Nikare karûbarên giran ên giran nekirin. Bawer bikin ku formula derbasdar e.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Hejmara Order
@@ -4002,6 +4086,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} ne dikarin bên şandin, ev e jixwe {2}"
 DocType: Tax Rule,Billing Country,Billing Country
 DocType: Purchase Order Item,Expected Delivery Date,Hêvîkirin Date Delivery
+DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurant Order Entry
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit û Credit ji bo {0} # wekhev ne {1}. Cudahiya e {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Mesref Entertainment
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Make Daxwaza Material
@@ -4014,7 +4099,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Account bi mêjera heyî ne jêbirin
 DocType: Vehicle,Last Carbon Check,Last Check Carbon
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Mesref Yasayî
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Ji kerema xwe ve dorpêçê de li ser rêza hilbijêre
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Ji kerema xwe ve dorpêçê de li ser rêza hilbijêre
 DocType: Purchase Invoice,Posting Time,deaktîv bike Time
 DocType: Timesheet,% Amount Billed,% Mîqdar billed
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Mesref Telefon
@@ -4027,6 +4112,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Hatiniyên Mişterî New
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Travel Expenses
 DocType: Maintenance Visit,Breakdown,Qeza
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Vebijêrkek taybetiyê Add Subscription in doctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Account: {0} bi currency: {1} ne bên hilbijartin
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","BOM bi otomatîk bi otomotîfê xwe bixweber bike, li ser rêjeya bihayê bihayê / bihayê rêjeya bihayê / rêjeya kirînê ya bihayê rawestî."
 DocType: Bank Reconciliation Detail,Cheque Date,Date Cheque
@@ -4051,7 +4137,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Temamê meblaxa Billing (via Time Têketin)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Supplier Id
 DocType: Payment Request,Payment Gateway Details,Payment Details Gateway
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Quantity divê mezintir 0 be
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Quantity divê mezintir 0 be
 DocType: Journal Entry,Cash Entry,Peyam Cash
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,hucûma zarok dikare bi tenê di bin &#39;Group&#39; type hucûma tên afirandin
 DocType: Leave Application,Half Day Date,Date nîv Day
@@ -4069,12 +4155,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Têbînî: em babet {0} ketin çend caran
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Hemû Têkilî.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Abbreviation Company
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Bikarhêner {0} tune
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Bikarhêner {0} tune
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Kinkirî
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Peyam di peredana ji berê ve heye
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,authroized ne ji ber ku {0} dibuhure ji sînorên
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,master şablonê meaş.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Pathology
+DocType: Restaurant Order Entry,Restaurant Table,Restaurant Table
 DocType: Leave Type,Max Days Leave Allowed,"Max Rojan Leave, nehiştin"
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Set Rule Bacê ji bo Têxe selikê
 DocType: Purchase Invoice,Taxes and Charges Added,Bac û tawana Ev babete ji layê
@@ -4086,10 +4174,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Quotes and Leads an muşteriyan.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Role Yorumlar ji bo weşînertiya stock bêhest
 ,Territory Target Variance Item Group-Wise,Axa Target Variance babetî Pula-Wise
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Hemû Groups Mişterî
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Hemû Groups Mişterî
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Accumulated Ayda
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} de bivênevê ye. Dibe ku rekor Exchange ji bo {1} ji bo {2} tên afirandin ne.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Şablon Bacê de bivênevê ye.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Şablon Bacê de bivênevê ye.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Account {0}: account Parent {1} tune
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Price List Rate (Company Exchange)
 DocType: Products Settings,Products Settings,Products Settings
@@ -4115,13 +4203,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Babetê Detail Wise Bacê
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Abbreviation Enstîtuya
 ,Item-wise Price List Rate,List Price Rate babete-şehreza
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Supplier Quotation
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Supplier Quotation
 DocType: Quotation,In Words will be visible once you save the Quotation.,Li Words xuya dê bibe dema ku tu Quotation xilas bike.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Diravan ({0}) ne dikarin bibin fraction li row {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Diravan ({0}) ne dikarin bibin fraction li row {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Barcode {0} niha di vî babetî bikaranîn {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Barcode {0} niha di vî babetî bikaranîn {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,"Qaîdeyên ji bo got, heqê şandinê."
 DocType: Item,Opening Stock,vekirina Stock
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Mişterî pêwîst e
@@ -4139,9 +4227,8 @@
 DocType: Customer,From Lead,ji Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Emir ji bo hilberîna berdan.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Select Fiscal Sal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS Profile pêwîst ji bo Peyam POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS Profile pêwîst ji bo Peyam POS
 DocType: Program Enrollment Tool,Enroll Students,kul Xwendekarên
-DocType: Hub Settings,Name Token,Navê Token
 DocType: Lab Test,Approved Date,Dîroka Endamê
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Selling Standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Li Hindîstan û yek warehouse wêneke e
@@ -4159,7 +4246,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,çavkaniyê binirxîne mirovan
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Lihevhatin û dayina tezmînat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Maldarî bacê
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Production Order hatiye {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Production Order hatiye {0}
 DocType: BOM Item,BOM No,BOM No
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Peyam di kovara {0} nayê Hesabê te nîne {1} an ji niha ve bi rêk û pêk li dijî din fîşeke
@@ -4179,8 +4266,8 @@
 DocType: Currency Exchange,To Currency,to Exchange
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Destûrê bide bikarhêneran li jêr ji bo pejirandina Applications Leave ji bo rojên block.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Types ji mesrefan.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},rêjeya bo em babete Firotina {0} kêmtir e {1} xwe. rêjeya firotina divê bê Hindîstan û {2}
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},rêjeya bo em babete Firotina {0} kêmtir e {1} xwe. rêjeya firotina divê bê Hindîstan û {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},rêjeya bo em babete Firotina {0} kêmtir e {1} xwe. rêjeya firotina divê bê Hindîstan û {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},rêjeya bo em babete Firotina {0} kêmtir e {1} xwe. rêjeya firotina divê bê Hindîstan û {2}
 DocType: Item,Taxes,bacê
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Pere û bidana
 DocType: Project,Default Cost Center,Navenda Cost Default
@@ -4194,15 +4281,15 @@
 DocType: Employee Loan,Fully Disbursed,bi temamî dandin de
 DocType: Maintenance Visit,Customer Feedback,Feedback mişterî
 DocType: Account,Expense,Xercî
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Score ne dikarin bibin mezintir Maximum Score
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Score ne dikarin bibin mezintir Maximum Score
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Bazirganî û Bazirganî
 DocType: Item Attribute,From Range,ji Range
 DocType: BOM,Set rate of sub-assembly item based on BOM,Bi rêjeya BOM-ê li ser rêjeya rûniştinê binirxînin
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Çewtiya Hevoksaziyê li formula an rewşa: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Çewtiya Hevoksaziyê li formula an rewşa: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Daily Work Settings Nasname Company
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,Babetê {0} hesibandin ji ber ku ew e ku em babete stock ne
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Submit ev Production Order bo processing zêdetir.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Submit ev Production Order bo processing zêdetir.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","To Rule Pricing di danûstandina bi taybetî jî derbas nabe, hemû Rules Pricing pêkanîn, divê neçalak bibin."
 DocType: Assessment Group,Parent Assessment Group,Dê û bav Nirxandina Group
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Jobs
@@ -4219,12 +4306,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Xêra xwe Company wêr&#39;a vala eger Pol By e &#39;Company&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Deaktîv bike Date nikare bibe dîroka pêşerojê de
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} nayê bi hev nagirin {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,ji bo hilberandina veguhestinê
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Leave Casual
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,UOM Lab Lab
 DocType: Batch,Batch ID,ID batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Têbînî: {0}
 ,Delivery Note Trends,Trends Delivery Note
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Nasname vê hefteyê
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Nasname vê hefteyê
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,In Stock Qty
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Account: {0} bi tenê dikare bi rêya Transactions Stock ve
 DocType: Student Group Creation Tool,Get Courses,Get Kursên
@@ -4238,7 +4326,6 @@
 DocType: Purchase Order,To Bill,ji bo Bill
 DocType: Material Request,% Ordered,% Ordered
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Ji bo qursa li Komeleya Xwendekarên Kurdistanê, li Kurs dê ji bo her Xwendekarên ji Kursên helîna li Program hejmartina vîze."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Enter Email Address ji hev biqetîne, fatûra wê were li ser date taybetî bêt"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Piecework
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Avg. Rate kirîn
 DocType: Task,Actual Time (in Hours),Time rastî (di Hours)
@@ -4252,7 +4339,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Babetê {0} e setup bo Serial Nos ne. Stûna divê vala be
 DocType: Accounts Settings,Accounts Settings,Hesabên Settings
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,Destûrdan
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Ne encam nabe ku şandin
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Ne encam nabe ku şandin
 DocType: Customer,Sales Partner and Commission,Partner Sales û Komîsyona
 DocType: Employee Loan,Rate of Interest (%) / Year,Rêjeya faîzên (%) / Sal
 ,Project Quantity,Quantity Project
@@ -4264,55 +4351,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Reş
 DocType: BOM Explosion Item,BOM Explosion Item,BOM babet teqîn
 DocType: Account,Auditor,xwîndin
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} tomar çêkirin
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} tomar çêkirin
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Bêtir hîn bibin
 DocType: Cheque Print Template,Distance from top edge,Distance ji devê top
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,List Price {0} kêmendam e yan jî tune
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,List Price {0} kêmendam e yan jî tune
 DocType: Purchase Invoice,Return,Vegerr
 DocType: Production Order Operation,Production Order Operation,Production Order Operation
 DocType: Pricing Rule,Disable,neçalak bike
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Mode dayinê pêwist e ji bo ku tezmînat
 DocType: Project Task,Pending Review,hîn Review
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Serdan û Şêwirmendan
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ku di Batch jimartin ne {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ku di Batch jimartin ne {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} nikarin belav bibin, wekî ku ji niha ve {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Îdîaya Expense Total (via mesrefan)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Exchange ji BOM # di {1} de divê ji bo pereyê hilbijartin wekhev be {2}
 DocType: Journal Entry Account,Exchange Rate,Rate
 DocType: Patient,Additional information regarding the patient,Agahiyên bêtir li ser nexweşiyê
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Sales Order {0} tê şandin ne
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Sales Order {0} tê şandin ne
 DocType: Homepage,Tag Line,Line Tag
 DocType: Fee Component,Fee Component,Fee Component
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Management ya Korsan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Lê zêde bike tomar ji
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Management ya Korsan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Lê zêde bike tomar ji
 DocType: Cheque Print Template,Regular,Rêzbirêz
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Weightage tevahî ji hemû Krîterên Nirxandina divê 100% be
-DocType: BOM,Last Purchase Rate,Last Rate Purchase
+DocType: Purchase Order Item,Last Purchase Rate,Last Rate Purchase
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Task ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock ne dikarin ji bo vî babetî hene {0} ji ber ku heye Guhertoyên
 DocType: Lab Test,Mobile,Hejî
 ,Sales Person-wise Transaction Summary,Nasname Transaction firotina Person-şehreza
 DocType: Training Event,Contact Number,Hejmara Contact
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Warehouse {0} tune
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Register Ji bo ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Warehouse {0} tune
 DocType: Monthly Distribution,Monthly Distribution Percentages,Sedaneya Belavkariya mehane
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,The em babete kilîk ne dikarin Batch hene
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","rêjeya Valuation ji bo babet {0}, ku pêwîst e ji bo ku ez entries, hesabgirê bo dîtin ne {1} {2}. Ger babete drust wek babete test li transacting li {1}, ji kerema xwe ve behsa ku di {1} sifrê Babetê. Na, ji kerema xwe mêjera stock höndör bo em babete an behsa rêjeya muhletan di qeyda Babetê hatî, û piştre hewl Submiting / betalkirinê ev entry"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Ji materyalên li dijî vê Delivery Têbînî teslîmî
+DocType: Training Event,Has Certificate,Sertîfîkayê heye
 DocType: Project,Customer Details,Details mişterî
 DocType: Employee,Reports to,raporên ji bo
 ,Unpaid Expense Claim,Îdîaya Expense Unpaid
 DocType: Payment Entry,Paid Amount,Şêwaz pere
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Dîtina Sales Cycle
 DocType: Assessment Plan,Supervisor,Gûhliser
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,bike
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,bike
 ,Available Stock for Packing Items,Stock ji bo Nawy jî tê de
 DocType: Item Variant,Item Variant,Babetê Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Nirxandina Tool Encam
 DocType: BOM Scrap Item,BOM Scrap Item,BOM babet Scrap
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,emir Submitted nikare were jêbirin
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,emir Submitted nikare were jêbirin
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","balance Account jixwe di Debit, hûn bi destûr ne ji bo danîna wek &#39;Credit&#39; &#39;Balance Must Be&#39;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Management Quality
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Babetê {0} neçalakirin
@@ -4333,7 +4419,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Destûrê bide Rate Valuation Zero
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Destûrê bide Rate Valuation Zero
 DocType: Training Event Employee,Invited,vexwendin
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Multiple Structures Salary çalak ji bo karker {0} ji bo dîrokan dayîn dîtin
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Multiple Structures Salary çalak ji bo karker {0} ji bo dîrokan dayîn dîtin
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Setup bikarhênerên Gateway.
 DocType: Employee,Employment Type,Type kar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Maldarî Fixed
@@ -4345,7 +4431,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Xwendekarên ID Email
 DocType: Employee,Notice (days),Notice (rojan)
 DocType: Tax Rule,Sales Tax Template,Şablon firotina Bacê
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Select tomar bo rizgarkirina fatûra
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Select tomar bo rizgarkirina fatûra
 DocType: Employee,Encashment Date,Date Encashment
 DocType: Training Event,Internet,Internet
 DocType: Special Test Template,Special Test Template,Şablon
@@ -4355,7 +4441,7 @@
 DocType: Academic Term,Term Start Date,Term Serî Date
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,View opp
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,View opp
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Ji kerema xwe ve bibînin girêdayî {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Ji kerema xwe ve bibînin girêdayî {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,balance Statement Bank wek per General Ledger
 DocType: Job Applicant,Applicant Name,Navê Applicant
 DocType: Authorization Rule,Customer / Item Name,Mişterî / Navê babetî
@@ -4375,7 +4461,7 @@
 DocType: Guardian,Guardian Of ,Guardian Of
 DocType: Grading Scale Interval,Threshold,Nepxok
 DocType: BOM Update Tool,Current BOM,BOM niha:
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Lê zêde bike No Serial
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Lê zêde bike No Serial
 DocType: Production Order Item,Available Qty at Source Warehouse,License de derbasdar Qty li Source Warehouse
 apps/erpnext/erpnext/config/support.py +22,Warranty,Libersekînîn
 DocType: Purchase Invoice,Debit Note Issued,Debit Têbînî Issued
@@ -4398,10 +4484,9 @@
 DocType: Account,Receivable,teleb
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: destûr Not bo guherandina Supplier wek Purchase Order jixwe heye
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rola ku destûr ji bo pêşkêşkirina muamele ku di mideyeka sînorên credit danîn.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Select Nawy ji bo Manufacture
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Master senkronîzekirina welat, bibe hinek dem bigire"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Select Nawy ji bo Manufacture
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Master senkronîzekirina welat, bibe hinek dem bigire"
 DocType: Item,Material Issue,Doza maddî
-DocType: Hub Settings,Seller Description,Seller Description
 DocType: Employee Education,Qualification,Zanyarî
 DocType: Item Price,Item Price,Babetê Price
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sabûn &amp; Detergent
@@ -4409,7 +4494,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Ji Time ne dikarin bibin mezintir To Time.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,emir kir
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Dîsa vekirin
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Dîsa vekirin
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Heke çalak be, dê pergalê dê peldankên variants ji nûçeyê ji nû ve nû bikin lê lêgerîn daneyên daneyên jêrîn ên ku di guhertina nû de kopî bikî"
 DocType: Salary Detail,Component,Perçe
 DocType: Assessment Criteria,Assessment Criteria Group,Şertên Nirxandina Group
 DocType: Healthcare Settings,Patient Name By,Navê Nûnerê
@@ -4419,7 +4505,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Ji kerema xwe re têkevin Erêkirina Role an Erêkirina Bikarhêner
 DocType: Journal Entry,Write Off Entry,Hewe Off Peyam
 DocType: BOM,Rate Of Materials Based On,Rate ji materyalên li ser bingeha
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Supplier&gt; Supplier Type
+DocType: Item Variant Settings,Do not Update Variants,Vebijêrin Nabe
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Support
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,menuya hemû
 DocType: POS Profile,Terms and Conditions,Şert û mercan
@@ -4428,7 +4514,7 @@
 DocType: Leave Block List,Applies to Company,Ji bo Company
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,ne dikarin betal bike ji ber ku nehatine şandin Stock Peyam di {0} heye
 DocType: Employee Loan,Disbursement Date,Date Disbursement
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;Recipients&#39; ne diyar kirin
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Recipients&#39; ne diyar kirin
 DocType: BOM Update Tool,Update latest price in all BOMs,Buhayê herî dawî ya BOM-ê nûve bikin
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Radyoya Tenduristiyê
 DocType: Vehicle,Vehicle,Erebok
@@ -4444,14 +4530,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp /% Lead
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Depreciations Asset û hevsengiyên
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Şêwaz {0} {1} veguhestin ji {2} ji bo {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Şêwaz {0} {1} veguhestin ji {2} ji bo {3}
 DocType: Sales Invoice,Get Advances Received,Get pêşketina pêşwazî
 DocType: Email Digest,Add/Remove Recipients,Zêde Bike / Rake Recipients
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Bo danûstandina li dijî Production rawestandin destûr ne Order {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Ji bo danîna vê sala diravî wek Default, klîk le &#39;Set wek Default&#39;"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Bihevgirêdan
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Bihevgirêdan
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,kêmbûna Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,variant babete {0} bi taybetmendiyên xwe heman heye
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,variant babete {0} bi taybetmendiyên xwe heman heye
 DocType: Employee Loan,Repay from Salary,H&#39;eyfê ji Salary
 DocType: Leave Application,LAP/,HIMBÊZ/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Ku daxwaz dikin tezmînat li dijî {0} {1} ji bo mîktarê {2}
@@ -4464,7 +4550,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Sales Order babetî
 DocType: Salary Slip,Payment Days,Rojan Payment
 DocType: Patient,Dormant,dikele û
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Wargehan de bi hucûma zarok nikare bê guhartina ji bo ledger
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Wargehan de bi hucûma zarok nikare bê guhartina ji bo ledger
 DocType: BOM,Manage cost of operations,Manage mesrefa ji operasyonên
 DocType: Accounts Settings,Stale Days,Rojên Stale
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Gava ku tu ji wan muamele kontrolkirin bi &quot;on&quot;, an email pop-up automatically vekir, da ku email bişînin bo têkildar de &quot;Contact&quot; li ku mêjera, bi mêjera wek girêdana. The bikarhêner dikarin yan dibe ku email bişînin bo ne."
@@ -4478,10 +4564,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serial No {0} ji niha ve wergirtin
 ,Requested Items To Be Transferred,Nawy xwestin veguhestin
 DocType: Expense Claim,Vehicle Log,Têkeve Vehicle
-DocType: Purchase Invoice,Recurring Id,nişankirin Id
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),Pevçûnek tûşî (temaşe&gt; 38.5 ° C / 101.3 ° F an tempê tête&gt; 38 ° C / 100.4 ° F)
 DocType: Customer,Sales Team Details,Details firotina Team
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Vemirandina mayînde?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Vemirandina mayînde?
 DocType: Expense Claim,Total Claimed Amount,Temamê meblaxa îdîa
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,derfetên Potential ji bo firotina.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Invalid {0}
@@ -4491,7 +4576,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,dikanên
 ,Item Delivery Date,Dîroka Delivery Date
 DocType: Warehouse,PIN,DERZÎ
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Setup Dibistana xwe li ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Setup Dibistana xwe li ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Change Mîqdar (Company Exchange)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,No entries hisêba ji bo wargehan de li jêr
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Save yekemîn belgeya.
@@ -4503,13 +4588,12 @@
 DocType: Task,Is Milestone,e Milestone
 DocType: Daily Work Summary,Email Sent To,Email şandin
 DocType: Budget,Warn,Gazîgîhandin
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Ma hûn bawer dikin ku hûn naxwazin ne?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bęjeyek ji axaftinên din jî, hewldana wê xalê de, ku divê di qeydên here."
 DocType: BOM,Manufacturing User,manufacturing Bikarhêner
 DocType: Purchase Invoice,Raw Materials Supplied,Madeyên xav Supplied
-DocType: Purchase Invoice,Recurring Print Format,Nişankirin Format bo çapkirinê
 DocType: C-Form,Series,Doranî
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Pirtûka lîsteya bihayê {0} divê {1} an jî {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Products Add
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Pirtûka lîsteya bihayê {0} divê {1} an jî {2}
 DocType: Appraisal,Appraisal Template,appraisal Şablon
 DocType: Item Group,Item Classification,Classification babetî
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Business Development Manager
@@ -4523,7 +4607,7 @@
 DocType: Item Attribute Value,Attribute Value,nirxê taybetmendiyê
 ,Itemwise Recommended Reorder Level,Itemwise Baştir DIRTYHERTZ Level
 DocType: Salary Detail,Salary Detail,Detail meaş
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Ji kerema xwe {0} hilbijêre yekem
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Ji kerema xwe {0} hilbijêre yekem
 DocType: Appointment Type,Physician,Bijîşk
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Batch {0} yên babet {1} xelas bûye.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Şêwirdarî
@@ -4534,7 +4618,7 @@
 DocType: Salary Detail,Default Amount,Default Mîqdar
 DocType: Lab Test Template,Descriptive,Descriptive
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Warehouse li sîstema nehat dîtin
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Nasname vê mehê da
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Nasname vê mehê da
 DocType: Quality Inspection Reading,Quality Inspection Reading,Reading Berhemên Quality
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Cîran Cîran Freeze kevintir Than` divê kêmtir ji% d roj be.
 DocType: Tax Rule,Purchase Tax Template,Bikirin Şablon Bacê
@@ -4557,12 +4641,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Perwerdekirina Events / Results
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Accumulated Farhad ku li ser
 DocType: Sales Invoice,C-Form Applicable,C-Forma serlêdanê
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Operasyona Time divê mezintir 0 bo operasyonê bibin {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Operasyona Time divê mezintir 0 bo operasyonê bibin {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Warehouse wêneke e
 DocType: Supplier,Address and Contacts,Address û Têkilî
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detail UOM Converter
 DocType: Program,Program Abbreviation,Abbreviation Program
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,"Production Order dikarin li dijî Şablon babet ne, bêne zindî kirin"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,"Production Order dikarin li dijî Şablon babet ne, bêne zindî kirin"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Li dijî wan doz bi wergirtina Purchase dijî hev babete ve
 DocType: Warranty Claim,Resolved By,Biryar By
 DocType: Bank Guarantee,Start Date,Destpêk Date
@@ -4588,26 +4672,27 @@
 DocType: Employee,Educational Qualification,Qualification perwerdeyî
 DocType: Workstation,Operating Costs,Mesrefên xwe Operating
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Action eger Accumulated Ayda Budget derbas
-DocType: Purchase Invoice,Submit on creation,Submit li ser çêkirina
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Pereyan ji bo {0} divê {1}
+DocType: Subscription,Submit on creation,Submit li ser çêkirina
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Pereyan ji bo {0} divê {1}
 DocType: Asset,Disposal Date,Date çespandina
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Emails wê ji bo hemû xebatkarên me Active ji şîrketa saet dayîn şandin, eger ew cejna tune ne. Nasname ji bersivên wê li nîvê şevê şandin."
 DocType: Employee Leave Approver,Employee Leave Approver,Xebatkarê Leave Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: An entry DIRTYHERTZ berê ve ji bo vê warehouse heye {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","ne dikare ragihîne wek wenda, ji ber ku Quotation hatiye çêkirin."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Training Feedback
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: An entry DIRTYHERTZ berê ve ji bo vê warehouse heye {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","ne dikare ragihîne wek wenda, ji ber ku Quotation hatiye çêkirin."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Training Feedback
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Production Order {0} de divê bê şandin
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Supplier Scorecard Criteria
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Ji kerema xwe ve Date Start û End Date ji bo babet hilbijêre {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Helbet li row wêneke e {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,To date nikarim li ber ji date be
 DocType: Supplier Quotation Item,Prevdoc DocType,DocType Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Lê zêde bike / Edit Prices
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Lê zêde bike / Edit Prices
 DocType: Batch,Parent Batch,Batch dê û bav
 DocType: Cheque Print Template,Cheque Print Template,Cheque Şablon bo çapkirinê
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Chart Navendên Cost
 DocType: Lab Test Template,Sample Collection,Collection Collection
 ,Requested Items To Be Ordered,Nawy xwestin To fermana Be
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Birayên min
 DocType: Price List,Price List Name,List Price Name
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Nasname xebata rojane de ji bo {0}
 DocType: Employee Loan,Totals,Totals
@@ -4626,12 +4711,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} yekîneyên {1} pêwîst in {2} li {3} {4} ji bo {5} ji bo temamkirina vê de mêjera.
 DocType: Fee Schedule,Student Category,Xwendekarên Kategorî
 DocType: Announcement,Student,Zankoyî
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,yekîneya Organization (beşa) master.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,yekîneya Organization (beşa) master.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Herin odeyê
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Ji kerema xwe re berî şandina peyamek binivîse
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,Li Curenivîsên Dubare BO SUPPLIER
 DocType: Email Digest,Pending Quotations,hîn Quotations
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Point-ji-Sale Profile
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Point-ji-Sale Profile
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Configurations Lab Lab
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Loans bê çarerserkirin.
 DocType: Cost Center,Cost Center Name,Mesrefa Name Navenda
@@ -4641,6 +4726,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Total pere Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Messages mezintir 160 characters wê bê nav mesajên piralî qelişîn
 DocType: Purchase Receipt Item,Received and Accepted,"Stand, û pejirandî"
+DocType: Hub Settings,Company and Seller Profile,Profîl û firotanê kiryarê
 ,GST Itemised Sales Register,Gst bidine Sales Register
 ,Serial No Service Contract Expiry,Serial No Service Peymana Expiry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Tu nikarî û kom heman account di heman demê de
@@ -4650,10 +4736,11 @@
 DocType: Item,Variant Based On,Li ser varyanta
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Total weightage rêdan divê 100% be. Ev e {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Suppliers te
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Ji kerema xwe rast bikin
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,ne dikarin set wek Lost wek Sales Order çêkirin.
 DocType: Request for Quotation Item,Supplier Part No,Supplier Part No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ne dikarin dadixînin dema kategoriyê e ji bo &#39;Valuation&#39; an jî &#39;Vaulation û Total&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,pêşwaziya From
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,pêşwaziya From
 DocType: Lead,Converted,xwe guhert
 DocType: Item,Has Serial No,Has No Serial
 DocType: Employee,Date of Issue,Date of Dozî Kurd
@@ -4661,7 +4748,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Li gor Settings Buying eger Buy reciept gireke == &#39;ERÊ&#39;, piştre ji bo afirandina Buy bi fatûreyên, bikarhêner ji bo afirandina Meqbûz Buy yekem bo em babete {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Row # {0}: Set Supplier bo em babete {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Row {0}: value Hours divê ji sifirê mezintir be.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Website Wêne {0} girêdayî babet {1} nayê dîtin
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Website Wêne {0} girêdayî babet {1} nayê dîtin
 DocType: Issue,Content Type,Content Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Komûter
 DocType: Item,List this Item in multiple groups on the website.,Lîsteya ev babet di koman li ser malpera me.
@@ -4672,14 +4759,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Get Unreconciled Arşîva
 DocType: Payment Reconciliation,From Invoice Date,Ji fatûreyên Date
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Tu destûr nabe ku daxwaza we bikin
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,"currency Billing, divê ji bo pereyan an account partiya currency yan jî standard comapany ya wekhev be"
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,"currency Billing, divê ji bo pereyan an account partiya currency yan jî standard comapany ya wekhev be"
 DocType: Healthcare Settings,Laboratory Settings,Settings
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Dev ji Encashment
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Çi bikim?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,to Warehouse
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Hemû Admissions Student
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Çi bikim?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,to Warehouse
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Hemû Admissions Student
 ,Average Commission Rate,Average Rate Komîsyona
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,&#39;Has No Serial&#39; nikare bibe &#39;&#39; Erê &#39;&#39; ji bo non-stock babete
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,&#39;Has No Serial&#39; nikare bibe &#39;&#39; Erê &#39;&#39; ji bo non-stock babete
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Status hilbijêre
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Amadebûna dikarin di dîrokên pêşeroja bo ne bên nîşankirin
 DocType: Pricing Rule,Pricing Rule Help,Rule Pricing Alîkarî
@@ -4697,41 +4784,41 @@
 DocType: Item,Customer Code,Code mişterî
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Reminder Birthday ji bo {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Rojan de ji sala Last Order
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,"Debit To account, divê hesabekî Bîlançoya be"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,"Debit To account, divê hesabekî Bîlançoya be"
 DocType: Buying Settings,Naming Series,Series Bidin
 DocType: Leave Block List,Leave Block List Name,Dev ji Lîsteya Block Name
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,date Insurance Serî divê kêmtir ji date Insurance End be
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Ji kerema xwe veguherandina Sîstema Sîstema Navneteweyî ya Navneteweyî di dibistana dibistanê&gt; Sîstema dibistanê
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Maldarî
 DocType: Timesheet,Production Detail,Detail Production
+DocType: Restaurant,Active Menu,Menu menu
 DocType: Target Detail,Target Qty,Qty target
 DocType: Shopping Cart Settings,Checkout Settings,Settings Checkout
 DocType: Attendance,Present,Amade
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Delivery Têbînî {0} divê şandin ne bê
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Delivery Têbînî {0} divê şandin ne bê
 DocType: Notification Control,Sales Invoice Message,Sales bi fatûreyên Message
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Girtina Account {0} de divê ji type mesulîyetê / Sebra min be
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Slip meaşê karmendekî {0} berê ji bo kaxeza dem tên afirandin {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Slip meaşê karmendekî {0} berê ji bo kaxeza dem tên afirandin {1}
 DocType: Vehicle Log,Odometer,Green
 DocType: Sales Order Item,Ordered Qty,emir kir Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Babetê {0} neçalak e
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Babetê {0} neçalak e
 DocType: Stock Settings,Stock Frozen Upto,Stock Upto Frozen
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM nade ti stock babete ne
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,çalakiyên Project / erka.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM nade ti stock babete ne
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,çalakiyên Project / erka.
 DocType: Vehicle Log,Refuelling Details,Details Refuelling
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Çêneke Salary Slips
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Kirîn, divê werin kontrolkirin, eger Ji bo serlêdanê ya ku weke hilbijartî {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Discount gerek kêmtir ji 100 be
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Ev rûpel cara rêjeya kirîn nehate dîtin
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Hewe Off Mîqdar (Company Exchange)
 DocType: Sales Invoice Timesheet,Billing Hours,Saet Billing
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,BOM Default ji bo {0} nehate dîtin
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Row # {0}: Hêvîye set dorpêçê de DIRTYHERTZ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM Default ji bo {0} nehate dîtin
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Row # {0}: Hêvîye set dorpêçê de DIRTYHERTZ
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Tap tomar ji wan re lê zêde bike here
 DocType: Fees,Program Enrollment,Program nivîsînî
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Voucher Cost
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Ji kerema xwe ve set {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Dubare li ser Day of Month
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} Xwendekarê neçalak e
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} Xwendekarê neçalak e
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} Xwendekarê neçalak e
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} Xwendekarê neçalak e
 DocType: Employee,Health Details,Details Health
 DocType: Offer Letter,Offer Letter Terms,Sertên Letter
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Ji bo afirandina daxwaza Payment belge referansa pêwîst e
@@ -4740,7 +4827,6 @@
 DocType: Employee External Work History,Salary,Meaş
 DocType: Serial No,Delivery Document Type,Delivery Corî dokumênt
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Submit hemû slips meaş ji bo ku krîterên ku li jor hatiye hilbijartin
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Nawy senkronîzekirin
 DocType: Sales Order,Partly Delivered,hinekî Çiyan
 DocType: Email Digest,Receivables,telebê
 DocType: Lead Source,Lead Source,Source Lead
@@ -4760,9 +4846,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Range Ageing 2
 DocType: SG Creation Tool Course,Max Strength,Max Hêz
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM şûna
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Li gor danûstandinên Navnîşê li ser hilbijêre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Li gor danûstandinên Navnîşê li ser hilbijêre
 ,Sales Analytics,Analytics Sales
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Available {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Available {0}
 ,Prospects Engaged But Not Converted,Perspektîvên Engaged Lê Converted Not
 ,Prospects Engaged But Not Converted,Perspektîvên Engaged Lê Converted Not
 DocType: Manufacturing Settings,Manufacturing Settings,Settings manufacturing
@@ -4770,10 +4856,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Mobile No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Ji kerema xwe ve currency default li Company Master binivîse
 DocType: Stock Entry Detail,Stock Entry Detail,Detail Stock Peyam
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Reminders rojane
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Reminders rojane
 DocType: Products Settings,Home Page is Products,Home Page e Products
 ,Asset Depreciation Ledger,Asset Ledger Farhad.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Pevçûn Rule Bacê bi {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Pevçûn Rule Bacê bi {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,New Name Account
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Cost madeyên xav Supplied
 DocType: Selling Settings,Settings for Selling Module,Mîhengên ji bo Firotina Module
@@ -4787,8 +4873,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Babetê {0} divê stock babete be
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Default Kar In Warehouse Progress
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,mîhengên standard ji bo muameleyên hisêba.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ji kerema xwe veguhastina Sîstema Sîstema Navnetewî di Çavkaniya Mirovan&gt; HR Set
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Date hêvîkirin nikarim li ber Material Daxwaza Date be
+DocType: Restaurant,Default Tax Template,Şablon
 DocType: Fees,Student Details,Agahdariya Xwendekaran
 DocType: Purchase Invoice Item,Stock Qty,Stock Qty
 DocType: Purchase Invoice Item,Stock Qty,Stock Qty
@@ -4807,8 +4894,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Herin Vegere
 DocType: Sales Partner,Partner Type,Type partner
 DocType: Purchase Taxes and Charges,Actual,Rast
+DocType: Restaurant Menu,Restaurant Manager,Rêveberê Restaurant
 DocType: Authorization Rule,Customerwise Discount,Customerwise Discount
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Timesheet ji bo karên.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Timesheet ji bo karên.
 DocType: Purchase Invoice,Against Expense Account,Li dijî Account Expense
 DocType: Production Order,Production Order,Production Order
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Installation Têbînî {0} ji niha ve hatine radestkirin
@@ -4816,7 +4904,6 @@
 DocType: Quotation Item,Against Docname,li dijî Docname
 DocType: SMS Center,All Employee (Active),Hemû Employee (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,View Now
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,dema Select dema ku fatûra wê were bipêşxistin
 DocType: BOM,Raw Material Cost,Cost Raw
 DocType: Item Reorder,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,tomar û QTY plan ji bo ku tu dixwazî bilind emir hilberîna an download madeyên xav ji bo analîzê binivîse.
@@ -4829,24 +4916,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Report Type wêneke e
 DocType: Item,Serial Number Series,Series Hejmara Serial
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Warehouse bo stock babet {0} li row wêneke e {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Add Programs
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail &amp; Wholesale
 DocType: Issue,First Responded On,First Responded ser
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Xaça Listing of babetî di koman
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Malî Sal Date Start û malî Sal End Date bi xwe di sala diravî set {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Date Clearance ve
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Batch Split
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Batch Split
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Batch Split
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Batch Split
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,bi serkeftî li hev
 DocType: Request for Quotation Supplier,Download PDF,download PDF
 DocType: Production Order,Planned End Date,Plankirin Date End
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Ji kerema xwe veşartina dîroka xwe binivîse
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Li ku derê tomar tên veşartin.
 DocType: Request for Quotation,Supplier Detail,Detail Supplier
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Çewtî di formula an rewşa: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Çewtî di formula an rewşa: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Şêwaz fatore
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Divê giravên nirxê 100%
 DocType: Attendance,Attendance,Amadetî
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,Nawy Stock
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,Nawy Stock
 DocType: BOM,Materials,materyalên
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Heke ne, di lîsteyê de wê ji bo her Beşa ku wê were sepandin bê zêdekirin."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Source û Target Warehouse ne dikarin heman
@@ -4864,6 +4951,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,Li ser Net Total
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Nirx ji bo Pêşbîr {0} de divê di nava cûrbecûr yên bê {1} ji bo {2} di çend qonaxan ji {3} ji bo babet {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,warehouse Target li row {0} divê eynî wek Production Order be
+DocType: Restaurant Reservation,Waitlisted,Waitlisted
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Exchange dikarin piştî çêkirina entries bikaranîna hinek dî ne bê guhertin
 DocType: Vehicle Service,Clutch Plate,Clutch deşta
 DocType: Company,Round Off Account,Li dora Off Account
@@ -4880,7 +4968,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Navê New Person Sales
 DocType: Packing Slip,Gross Weight UOM,Gross Loss UOM
 DocType: Delivery Note Item,Against Sales Invoice,Li dijî bi fatûreyên Sales
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Tikaye hejmara serial bo em babete weşandin diyar binvêse!
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Tikaye hejmara serial bo em babete weşandin diyar binvêse!
 DocType: Bin,Reserved Qty for Production,Qty Reserved bo Production
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Dev ji zilma eger tu dixwazî ji bo ku li hevîrê di dema çêkirina komên Helbet bingeha.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Dev ji zilma eger tu dixwazî ji bo ku li hevîrê di dema çêkirina komên Helbet bingeha.
@@ -4892,7 +4980,7 @@
 DocType: Lab Test,Test Group,Koma Tîpa
 DocType: Payment Reconciliation,Receivable / Payable Account,Teleb / cîhde Account
 DocType: Delivery Note Item,Against Sales Order Item,Li dijî Sales Order babetî
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Ji kerema xwe binivîsin nirxê taybetmendiyê ji bo pêşbîrê {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Ji kerema xwe binivîsin nirxê taybetmendiyê ji bo pêşbîrê {0}
 DocType: Item,Default Warehouse,Default Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budceya dikare li hember Account Pol ne bibin xwediyê rêdan û {0}
 DocType: Healthcare Settings,Patient Registration,Pêdivî ye
@@ -4922,6 +5010,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Person Sales
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Budceya û Navenda Cost
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Modeya piralî ya pêdivî ye ku pêdivî ye
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,bo
 ,Appointment Analytics,Analytics
 DocType: Vehicle Service,Half Yearly,nîv Hit
 DocType: Lead,Blog Subscriber,abonetiyê Blog
@@ -4941,7 +5030,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,View quot
 ,BOM Stock Report,BOM Stock Report
 DocType: Stock Reconciliation Item,Quantity Difference,Cudahiya di Diravan
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,processing payroll
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,processing payroll
 DocType: Opportunity Item,Basic Rate,Rate bingehîn
 DocType: GL Entry,Credit Amount,Şêwaz Credit
 DocType: Cheque Print Template,Signatory Position,Asta îmze
@@ -4955,12 +5044,12 @@
 DocType: Tax Rule,Tax Rule,Rule bacê
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Pêkanîna Rate Same Seranserê Cycle Sales
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Plan dem têketin derveyî Hours Workstation Xebatê.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Muşteriyan li Dorê
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} nihînkek bijîşk tune ye. Di mamosteyê doktorî de zêde bike
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Muşteriyan li Dorê
 DocType: Student,Nationality,Niştimanî
 ,Items To Be Requested,Nawy To bê xwestin
-DocType: Purchase Order,Get Last Purchase Rate,Get Last Purchase Rate
 DocType: Company,Company Info,Company Info
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Select an jî lê zêde bike mişterî nû
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Select an jî lê zêde bike mişterî nû
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,navenda Cost pêwîst e ji bo kitêba mesrefan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Sepanê ji Funds (Maldarî)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ev li ser amadebûna vê Xebatkara li
@@ -4968,6 +5057,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Account Debit
 DocType: Fiscal Year,Year Start Date,Sal Serî Date
 DocType: Attendance,Employee Name,Navê xebatkara
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restaurant Order Entry Item
 DocType: Sales Invoice,Rounded Total (Company Currency),Total Rounded (Company Exchange)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"ne dikarin bi Pol nepenî, ji ber Type Account hilbijartî ye."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} hate guherandin. Ji kerema xwe nû dikin.
@@ -4978,6 +5068,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Qezenca kardarîyê
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},"dorpêçê de bi timamî, divê dorpêçê de ji bo babet {0} li row pêşya {1}"
 DocType: Production Order,Manufactured Qty,Manufactured Qty
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Invoice afirandin
 DocType: Purchase Receipt Item,Accepted Quantity,Quantity qebûlkirin
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Ji kerema xwe ve set a default Lîsteya Holiday ji bo karkirinê {0} an Company {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} nizane heye ne
@@ -4987,18 +5078,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row No {0}: Mîqdar ne mezintir Pending Mîqdar dijî {1} mesrefan. Hîn Mîqdar e {2}
 DocType: Maintenance Schedule,Schedule,Pîlan
 DocType: Account,Parent Account,Account dê û bav
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Berdeste
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Berdeste
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,hub
 DocType: GL Entry,Voucher Type,fîşeke Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,List Price nehate dîtin an jî neçalakirinName
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,List Price nehate dîtin an jî neçalakirinName
 DocType: Lab Test,Approved,pejirandin
 DocType: Pricing Rule,Price,Biha
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',Xebatkarê hebekî li ser {0} bê mîhenkirin wek &#39;Çepê&#39;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Xebatkarê hebekî li ser {0} bê mîhenkirin wek &#39;Çepê&#39;
+DocType: Hub Settings,Last Sync On,Sync Dîroka Dawîn
 DocType: Guardian,Guardian,Wekîl
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Appraisal {0} ji bo karkirinê yên tên afirandin {1} di R‧ezkirina dema daye
 DocType: Employee,Education,Zanyarî
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,del
 DocType: Selling Settings,Campaign Naming By,Qada kampanyaya By
 DocType: Employee,Current Address Is,Niha navnîşana e
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Target Target (
@@ -5013,7 +5105,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Koda kursê
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Ji kerema xwe ve Expense Account binivîse
 DocType: Account,Stock,Embar
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: World: Kurdî: Corî dokumênt, divê yek ji Purchase Order, Buy bi fatûreyên an Peyam Journal be"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: World: Kurdî: Corî dokumênt, divê yek ji Purchase Order, Buy bi fatûreyên an Peyam Journal be"
 DocType: Employee,Current Address,niha Address
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ger babete guhertoya yên babete din wê description, wêne, sewqiyata, bac û hwd dê ji şablonê set e, heta ku eşkere û diyar"
 DocType: Serial No,Purchase / Manufacture Details,Buy / Details Manufacture
@@ -5044,7 +5136,7 @@
 DocType: Hub Settings,Hub Settings,Settings hub
 DocType: Project,Gross Margin %,Kenarê% Gross
 DocType: BOM,With Operations,bi operasyonên
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,entries Accounting niha ve li currency kirin {0} ji bo şîrketa {1}. Ji kerema xwe re hesabekî teleb an cîhde bi pereyan hilbijêre {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,entries Accounting niha ve li currency kirin {0} ji bo şîrketa {1}. Ji kerema xwe re hesabekî teleb an cîhde bi pereyan hilbijêre {0}.
 DocType: Asset,Is Existing Asset,Ma karpêkirî Asset
 DocType: Salary Detail,Statistical Component,Component Îstatîstîkê
 DocType: Salary Detail,Statistical Component,Component Îstatîstîkê
@@ -5053,13 +5145,14 @@
 DocType: BOM Operation,BOM Operation,BOM Operation
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Li ser Previous Mîqdar Row
 DocType: Student,Home Address,Navnîşana malê
+DocType: Item,Has Expiry Date,Dîroka Pîrozbahiyê ye
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Peldanka Variant
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Asset transfer
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,Asset transfer
 DocType: POS Profile,POS Profile,Profile POS
 DocType: Training Event,Event Name,Navê Event
 DocType: Physician,Phone (Office),Telefon (Office)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,Mûkir
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Admissions ji bo {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,Mûkir
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Admissions ji bo {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Seasonality ji bo avakirin, budceyên, armancên hwd."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Navekî Navîn
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Babetê {0} a şablonê ye, ji kerema xwe ve yek ji Guhertoyên xwe hilbijêre"
@@ -5068,7 +5161,7 @@
 DocType: Assessment Plan,Room,Jûre
 DocType: Purchase Order,Advance Paid,Advance Paid
 DocType: Item,Item Tax,Bacê babetî
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Madî ji bo Supplier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Madî ji bo Supplier
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,baca bi fatûreyên
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% ji carekê zêdetir xuya
 DocType: Expense Claim,Employees Email Id,Karmendên Email Id
@@ -5079,32 +5172,30 @@
 DocType: Program,Program Name,Navê bernameyê
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,"Binêre, Bacê an Charge ji bo"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Rastî Qty wêneke e
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} niha li ser {1} Pargîdanîya Scorecard heye, û Kirêdar kirina vê pargîdaniyê divê bi hişyariyê re bêne belav kirin."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} niha li ser {1} Pargîdanîya Scorecard heye, û Kirêdar kirina vê pargîdaniyê divê bi hişyariyê re bêne belav kirin."
 DocType: Employee Loan,Loan Type,Type deyn
 DocType: Scheduling Tool,Scheduling Tool,Amûra scheduling
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Li kû çûn
 DocType: BOM,Item to be manufactured or repacked,Babete binêre bo çêkirin an repacked
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,mîhengên standard ji bo muameleyên borsayê.
-DocType: Purchase Invoice,Next Date,Date Next
 DocType: Employee Education,Major/Optional Subjects,Major / Subjects Bijarî
 DocType: Sales Invoice Item,Drop Ship,drop ship
+DocType: Hub Settings,Suspended,Suspended
 DocType: Training Event,Attendees,ayinê
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Li vir tu dikarî hûragahiyan li malbata wek name û dagirkirina dê û bav, hevjîn û zarokên bidomînin"
 DocType: Academic Term,Term End Date,Term End Date
-DocType: Hub Settings,Seller Name,Navê Seller
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Bac û doz li dabirîn (Company Exchange)
 DocType: Item Group,General Settings,Mîhengên giştî
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Ji Exchange û To Exchange ne dikarin heman
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Instructors Add
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Divê hûn li ser form getê Save
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Ji kerema xwe re yekem şirket hilbijêre
 DocType: Item Attribute,Numeric Values,Nirxên hejmar
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,attach Logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,di dereca Stock
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,di dereca Stock
 DocType: Customer,Commission Rate,Rate Komîsyona
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,{1} ji bo {1} scorecards {
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Make Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Make Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,sepanên Block xatir ji aliyê beşa.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Type pereyî, divê yek ji peyamek be, Pay û Şandina Hundirîn"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analytics
@@ -5119,11 +5210,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,capital Stock
 DocType: Shopping Cart Settings,Show Public Attachments,Nîşan Attachments Public
 DocType: Packing Slip,Package Weight Details,Package Details Loss
+DocType: Restaurant Reservation,Reservation Time,Wextê rezervan
 DocType: Payment Gateway Account,Payment Gateway Account,Account Gateway Payment
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Piştî encamdayîna peredana beralî bike user ji bo rûpel hilbijartin.
 DocType: Company,Existing Company,heyî Company
 DocType: Healthcare Settings,Result Emailed,Result Email Email
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","Bacê Category hatiye bi &quot;tevahî&quot; hatin guhertin, ji ber ku hemû Nawy tomar non-stock in"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kodê Asayîş&gt; Tîpa Group&gt; Brand
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Ji kerema xwe re file CSV hilbijêre
 DocType: Student Leave Application,Mark as Present,Mark wek Present
 DocType: Supplier Scorecard,Indicator Color,Indicator Color
@@ -5148,11 +5241,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Make Batch Student
 DocType: Fee Schedule,FRQ.,FRQ
 DocType: Leave Type,Is Carry Forward,Ma çêşît Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Get Nawy ji BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Get Nawy ji BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Rê Time Rojan
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Mesaj Date divê eynî wek tarîxa kirînê be {1} ji sermaye {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"vê kontrol bike, eger ku xwendevan û geştê li Hostel a Enstîtuyê ye."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Ji kerema xwe ve Orders Sales li ser sifrê li jor binivîse
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Ji kerema xwe ve Orders Sales li ser sifrê li jor binivîse
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Şandin ne Salary Slips
 ,Stock Summary,Stock Nasname
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Transferkirina sermaye ji yek warehouse din
@@ -5168,5 +5261,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debît entry dikarin bi ne bê lînkkirî a {1}
 DocType: Journal Entry,Subscription Section,Beşê Beşê
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Account {0} tune
+DocType: Training Event,Training Program,Bernameya Perwerdehiyê
 DocType: Account,Cash,Perê pêşîn
 DocType: Employee,Short biography for website and other publications.,biography kurt de ji bo malpera û belavokên din.
diff --git a/erpnext/translations/lo.csv b/erpnext/translations/lo.csv
index d21ca9a..d62cae6 100644
--- a/erpnext/translations/lo.csv
+++ b/erpnext/translations/lo.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Mode ເງິນເດືອນ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,ລົງທະບຽນ
 DocType: Patient,Divorced,ການຢ່າຮ້າງ
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,ລາຍການຊິ້ງຂໍ້ມູນແລ້ວ
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,ອະນຸຍາດໃຫ້ສິນຄ້າທີ່ຈະເພີ່ມເວລາຫຼາຍໃນການເປັນ
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,ຍົກເລີກການວັດສະດຸເຂົ້າ {0} ກ່ອນການຍົກເລີກການຮຽກຮ້ອງຮັບປະກັນນີ້
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,ຜະລິດຕະພັນຜູ້ບໍລິໂພກ
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,ອອກຈາກການອະນຸມັດ
 DocType: Sales Partner,Dealer,ຕົວແທນຈໍາຫນ່າຍ
 DocType: Consultation,Investigations,ການສືບສວນ
+DocType: Restaurant Order Entry,Click Enter To Add,ກົດ Enter ເພື່ອຕື່ມ
 DocType: Employee,Rented,ເຊົ່າ
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,ສາມາດນໍາໃຊ້ສໍາລັບຜູ້ໃຊ້
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","ໃບສັ່ງຜະລິດຢຸດເຊົາບໍ່ສາມາດໄດ້ຮັບການຍົກເລີກ, ຈຸກມັນຄັ້ງທໍາອິດເພື່ອຍົກເລີກການ"
 DocType: Vehicle Service,Mileage,mileage
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,ທ່ານກໍ່ຕ້ອງການທີ່ຈະ scrap ຊັບສິນນີ້?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,ທ່ານກໍ່ຕ້ອງການທີ່ຈະ scrap ຊັບສິນນີ້?
 DocType: Drug Prescription,Update Schedule,ປັບປຸງຕາຕະລາງ
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,ເລືອກຜູ້ຜະລິດມາດຕະຖານ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},ສະກຸນເງິນແມ່ນຕ້ອງການສໍາລັບລາຄາ {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,ກວດເບິ່ງທີ່ມີຢູ່
 DocType: Job Applicant,Job Applicant,ວຽກເຮັດງານທໍາສະຫມັກ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,ນີ້ແມ່ນອີງໃສ່ການເຮັດທຸລະກໍາກັບຜູ້ນີ້. ເບິ່ງໄລຍະເວລາຂ້າງລຸ່ມນີ້ສໍາລັບລາຍລະອຽດ
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,ບໍ່ມີຜົນໄດ້ຮັບຫຼາຍ.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,ທາງດ້ານກົດຫມາຍ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},ພາສີປະເພດທີ່ແທ້ຈິງບໍ່ສາມາດລວມຢູ່ໃນລາຍການຕິດຕໍ່ກັນ {0}
 DocType: Bank Guarantee,Customer,ລູກຄ້າ
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),ອັດຕາແລກປ່ຽນຈະຕ້ອງເປັນເຊັ່ນດຽວກັນກັບ {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ຊື່ຂອງລູກຄ້າ
 DocType: Vehicle,Natural Gas,ອາຍແກັສທໍາມະຊາດ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},ບັນຊີທະນາຄານບໍ່ສາມາດໄດ້ຮັບການຕັ້ງຊື່ເປັນ {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},ບັນຊີທະນາຄານບໍ່ສາມາດໄດ້ຮັບການຕັ້ງຊື່ເປັນ {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ຫົວຫນ້າ (ຫຼືກຸ່ມ) ການຕໍ່ຕ້ານທີ່ Entries ບັນຊີທີ່ຜະລິດແລະຍອດຖືກຮັກສາໄວ້.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),ທີ່ຍັງຄ້າງຄາສໍາລັບ {0} ບໍ່ສາມາດຈະຫນ້ອຍກ່ວາສູນ ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,ບໍ່ມີສົ່ງເງິນເດືອນຄວາມຜິດພາດພຽງທີ່ຈະປະມວນຜົນ.
 DocType: Manufacturing Settings,Default 10 mins,ມາດຕະຖານ 10 ນາທີ
 DocType: Leave Type,Leave Type Name,ອອກຈາກຊື່ປະເພດ
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,ສະແດງໃຫ້ເຫັນການເປີດ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,ມັນເປັນສິ່ງຈໍາເປັນທີ່ຈະດໍາເນີນການປະຕິບັດງານໃນມື້ນີ້ສໍາລັບຕົວຢ່າງທີ່ກ່າວມາຂ້າງເທິງ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,ຊຸດອັບເດດຮຽບຮ້ອຍ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,ກວດເບິ່ງ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,ຖືກຕ້ອງອະນຸ Submitted
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,ລາຍການສັ່ງຊື້ທີ່ຈະໄດ້ຮັບ
 DocType: SMS Center,All Supplier Contact,ທັງຫມົດຂອງຜູ້ຕິດຕໍ່
 DocType: Support Settings,Support Settings,ການຕັ້ງຄ່າສະຫນັບສະຫນູນ
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,ຄາດວ່າສິ້ນສຸດວັນທີ່ບໍ່ສາມາດຈະຫນ້ອຍກ່ວາຄາດວ່າຈະເລີ່ມວັນທີ່
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,ຄາດວ່າສິ້ນສຸດວັນທີ່ບໍ່ສາມາດຈະຫນ້ອຍກ່ວາຄາດວ່າຈະເລີ່ມວັນທີ່
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"ຕິດຕໍ່ກັນ, {0}: ອັດຕາຈະຕ້ອງດຽວກັນເປັນ {1}: {2} ({3} / {4})"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,ການນໍາໃຊ້ອອກໃຫມ່
 ,Batch Item Expiry Status,ຊຸດສິນຄ້າສະຖານະຫມົດອາຍຸ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,ຮ່າງຂອງທະນາຄານ
 DocType: Mode of Payment Account,Mode of Payment Account,ຮູບແບບຂອງບັນຊີຊໍາລະເງິນ
 DocType: Consultation,Consultation,ການປຶກສາຫາລື
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,ການຂາຍແລະການກັບຄືນ
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,ສະແດງໃຫ້ເຫັນທີ່ແຕກຕ່າງກັນ
 DocType: Academic Term,Academic Term,ໄລຍະທາງວິຊາການ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,ອຸປະກອນການ
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ຮັກສາສຸຂະພາບ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ຄວາມຊັກຊ້າໃນການຈ່າຍເງິນ (ວັນ)
 DocType: Lab Prescription,Lab Prescription,Lab Prescription
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,ຈັດຮຽງໂດຍລາຄາ
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ຄ່າໃຊ້ຈ່າຍໃນການບໍລິການ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Serial Number: {0} ອ້າງອິງແລ້ວໃນ Sales ໃບເກັບເງິນ: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,ໃບເກັບເງິນ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Serial Number: {0} ອ້າງອິງແລ້ວໃນ Sales ໃບເກັບເງິນ: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,ໃບເກັບເງິນ
 DocType: Maintenance Schedule Item,Periodicity,ໄລຍະເວລາ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ປີງົບປະມານ {0} ຈໍາເປັນຕ້ອງມີ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ປ້ອງກັນປະເທດ
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,"ຕິດຕໍ່ກັນ, {0}:"
 DocType: Timesheet,Total Costing Amount,ຈໍານວນເງິນຕົ້ນທຶນທັງຫມົດ
 DocType: Delivery Note,Vehicle No,ຍານພາຫະນະບໍ່ມີ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,ກະລຸນາເລືອກລາຄາ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,ກະລຸນາເລືອກລາຄາ
 DocType: Accounts Settings,Currency Exchange Settings,ການຕັ້ງຄ່າແລກປ່ຽນສະກຸນເງິນ
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,"ຕິດຕໍ່ກັນ, {0}: ເອກະສານການຊໍາລະເງິນທີ່ຕ້ອງການເພື່ອໃຫ້ສໍາເລັດ trasaction ໄດ້"
 DocType: Production Order Operation,Work In Progress,ກໍາລັງດໍາເນີນການ
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,ກະລຸນາເລືອກເອົາວັນທີ
 DocType: Employee,Holiday List,ຊີວັນພັກ
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,ກະລຸນາຕິດຕັ້ງລະບົບຕັ້ງຊື່ຜູ້ສອນໃນໂຮງຮຽນ&gt; ການຕັ້ງຄ່າໂຮງຮຽນ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,ບັນຊີ
+DocType: Hub Settings,Selling Price List,ລາຄາຂາຍລາຄາ
 DocType: Patient,Tobacco Current Use,Tobacco Current Use
 DocType: Cost Center,Stock User,User Stock
 DocType: Company,Phone No,ໂທລະສັບທີ່ບໍ່ມີ
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,ຕາຕະລາງການຂອງລາຍວິຊາການສ້າງຕັ້ງ:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},ໃຫມ່ {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},ໃຫມ່ {0} # {1}
 ,Sales Partners Commission,ຄະນະກໍາມະ Partners ຂາຍ
 DocType: Purchase Invoice,Rounding Adjustment,ການປັບຕໍາແຫນ່ງຮອບ
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,ຫຍໍ້ບໍ່ສາມາດມີຫຼາຍກ່ວາ 5 ລັກສະນະ
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,ພໍ່ແມ່ຂໍ້ docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","ອ້າງອິງ: {0}, ລະຫັດສິນຄ້າ: {1} ແລະລູກຄ້າ: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,ກິໂລກຣາມ
-DocType: Student Log,Log,ເຂົ້າສູ່ລະບົບ
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,ການເປີດກວ້າງການວຽກ.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} ຜົນໄດ້ຮັບສົ່ງ
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} ຜົນໄດ້ຮັບສົ່ງ
 DocType: Item Attribute,Increment,ການເພີ່ມຂຶ້ນ
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Timespan
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,ເລືອກ Warehouse ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,ການແຕ່ງງານ
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},ບໍ່ອະນຸຍາດໃຫ້ສໍາລັບການ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,ໄດ້ຮັບການລາຍການຈາກ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Stock ບໍ່ສາມາດຮັບການປັບປຸງຕໍ່ການສົ່ງເງິນ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Stock ບໍ່ສາມາດຮັບການປັບປຸງຕໍ່ການສົ່ງເງິນ {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ຜະລິດຕະພັນ {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,ບໍ່ມີລາຍະລະບຸໄວ້
 DocType: Payment Reconciliation,Reconcile,ທໍາ
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,ກອງທຶນບໍານານ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາບໍ່ສາມາດກ່ອນທີ່ວັນເວລາຊື້
 DocType: Consultation,Consultation Date,ວັນທີປຶກສາຫາລື
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ລາຍະການສິນຄ້າແລະການຄົ້ນພົບສໍາລັບຜູ້ໃຊ້ ERPNext
 DocType: SMS Center,All Sales Person,ທັງຫມົດຄົນຂາຍ
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ການແຜ່ກະຈາຍລາຍເດືອນ ** ຈະຊ່ວຍໃຫ້ທ່ານການແຈກຢາຍງົບປະມານ / ເປົ້າຫມາຍໃນທົ່ວເດືອນຖ້າຫາກວ່າທ່ານມີຕາມລະດູໃນທຸລະກິດຂອງທ່ານ.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,ບໍ່ພົບລາຍການ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,ໂຄງປະກອບການເງິນເດືອນທີ່ຫາຍໄປ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,ບໍ່ພົບລາຍການ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,ໂຄງປະກອບການເງິນເດືອນທີ່ຫາຍໄປ
 DocType: Lead,Person Name,ຊື່ບຸກຄົນ
 DocType: Sales Invoice Item,Sales Invoice Item,ສິນຄ້າລາຄາ Invoice
 DocType: Account,Credit,ການປ່ອຍສິນເຊື່ອ
 DocType: POS Profile,Write Off Cost Center,ຂຽນ Off ສູນຕົ້ນທຶນ
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",ຕົວຢ່າງ: &quot;ໂຮງຮຽນປະຖົມ&quot; ຫຼື &quot;ວິທະຍາໄລ&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",ຕົວຢ່າງ: &quot;ໂຮງຮຽນປະຖົມ&quot; ຫຼື &quot;ວິທະຍາໄລ&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,ບົດລາຍງານ Stock
 DocType: Warehouse,Warehouse Detail,ຂໍ້ມູນ Warehouse
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},ຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອໄດ້ຮັບການ crossed ສໍາລັບລູກຄ້າ {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ວັນທີໄລຍະສຸດທ້າຍບໍ່ສາມາດຈະຕໍ່ມາກ່ວາປີທີ່ສິ້ນສຸດຂອງປີທາງວິຊາການທີ່ໃນໄລຍະການມີການເຊື່ອມຕໍ່ (ປີທາງວິຊາການ {}). ກະລຸນາແກ້ໄຂຂໍ້ມູນວັນແລະພະຍາຍາມອີກເທື່ອຫນຶ່ງ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ແມ່ນຊັບສິນຄົງທີ່&quot; ບໍ່ສາມາດຈະມີການກວດກາ, ເປັນການບັນທຶກຊັບສິນລາຄາຕໍ່ລາຍການ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ແມ່ນຊັບສິນຄົງທີ່&quot; ບໍ່ສາມາດຈະມີການກວດກາ, ເປັນການບັນທຶກຊັບສິນລາຄາຕໍ່ລາຍການ"
 DocType: Vehicle Service,Brake Oil,ນ້ໍາມັນຫ້າມລໍ້
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ລູກຄ້າ&gt; ກຸ່ມລູກຄ້າ&gt; ອານາເຂດ
 DocType: Tax Rule,Tax Type,ປະເພດອາກອນ
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,ຈໍານວນພາສີ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},ເຈົ້າຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ເພີ່ມຫຼືການປັບປຸງການອອກສຽງກ່ອນ {0}
 DocType: BOM,Item Image (if not slideshow),ລາຍການຮູບພາບ (ຖ້າຫາກວ່າບໍ່ໂຊ)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ການລູກຄ້າທີ່ມີຢູ່ມີຊື່ດຽວກັນ
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ຊົ່ວໂມງອັດຕາ / 60) * ຈິງທີ່ໃຊ້ເວລາການດໍາເນີນງານ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,ແຖວ # {0}: Reference ປະເພດເອກະສານຕ້ອງເປັນຫນຶ່ງໃນການຮຽກຮ້ອງຄ່າຫຼືອະນຸທິນ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,ເລືອກ BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,ແຖວ # {0}: Reference ປະເພດເອກະສານຕ້ອງເປັນຫນຶ່ງໃນການຮຽກຮ້ອງຄ່າຫຼືອະນຸທິນ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,ເລືອກ BOM
 DocType: SMS Log,SMS Log,SMS ເຂົ້າສູ່ລະບົບ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,ຄ່າໃຊ້ຈ່າຍຂອງການສົ່ງ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,ວັນພັກໃນ {0} ບໍ່ແມ່ນລະຫວ່າງຕັ້ງແຕ່ວັນທີ່ແລະວັນທີ
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,ເງິນກູ້ພະນັກງານ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,ເຂົ້າສູ່ລະບົບກິດຈະກໍາ:
 DocType: Fee Schedule,Send Payment Request Email,ສົ່ງອີເມວການຈ່າຍເງິນ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,ລາຍການ {0} ບໍ່ຢູ່ໃນລະບົບຫຼືຫມົດອາຍຸແລ້ວ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,ລາຍການ {0} ບໍ່ຢູ່ໃນລະບົບຫຼືຫມົດອາຍຸແລ້ວ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,ອະສັງຫາລິມະຊັບ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,ຖະແຫຼງການຂອງບັນຊີ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ຢາ
@@ -210,18 +213,23 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,ການນໍາເຂົ້າເຂົ້າສູ່ລະບົບ
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,ດຶງຂໍການວັດສະດຸປະເພດຜະລິດໂດຍອີງໃສ່ເງື່ອນໄຂຂ້າງເທິງນີ້
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Unregistered ສົບຜົນສໍາເລັດ.
 DocType: Training Result Employee,Grade,Grade
+DocType: Restaurant Table,No of Seats,ບໍ່ມີບ່ອນນັ່ງ
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","ການເພີ່ມຫົວຂໍ້ແບບເຄື່ອນໄຫວ, ໃຫ້ໃຊ້ jinja tags ຄື <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,ສົ່ງໂດຍຜູ້ສະຫນອງ
 DocType: SMS Center,All Contact,ທັງຫມົດຕິດຕໍ່
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,ໃບສັ່ງຜະລິດສ້າງແລ້ວສໍາລັບລາຍການທັງຫມົດທີ່ມີ BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,ໃບສັ່ງຜະລິດສ້າງແລ້ວສໍາລັບລາຍການທັງຫມົດທີ່ມີ BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,ເງິນເດືອນປະຈໍາປີ
 DocType: Daily Work Summary,Daily Work Summary,Summary ວຽກປະຈໍາວັນ
 DocType: Period Closing Voucher,Closing Fiscal Year,ປິດປີງົບປະມານ
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} ແມ່ນ frozen
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,ກະລຸນາເລືອກບໍລິສັດທີ່ມີຢູ່ສໍາລັບການສ້າງຕາຕະລາງຂອງການບັນຊີ
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} ແມ່ນ frozen
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,ກະລຸນາເລືອກບໍລິສັດທີ່ມີຢູ່ສໍາລັບການສ້າງຕາຕະລາງຂອງການບັນຊີ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,ຄ່າໃຊ້ຈ່າຍ Stock
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ເລືອກ Warehouse ເປົ້າຫມາຍ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ເລືອກ Warehouse ເປົ້າຫມາຍ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,ເລືອກ Warehouse ເປົ້າຫມາຍ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,ເລືອກ Warehouse ເປົ້າຫມາຍ
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,ກະລຸນາໃສ່ຕ້ອງການຕິດຕໍ່ອີເມວ
 DocType: Program Enrollment,School Bus,ລົດເມໂຮງຮຽນ
 DocType: Journal Entry,Contra Entry,Contra Entry
@@ -238,9 +246,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","ດາວນ໌ໂຫລດແມ່ແບບ, ໃຫ້ຕື່ມຂໍ້ມູນທີ່ເຫມາະສົມແລະຕິດແຟ້ມທີ່ແກ້ໄຂໄດ້. ທັງຫມົດກໍານົດວັນທີແລະພະນັກງານປະສົມປະສານໃນໄລຍະເວລາທີ່ເລືອກຈະມາໃນແມ່ແບບ, ມີການບັນທຶກການເຂົ້າຮຽນທີ່ມີຢູ່ແລ້ວ"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,ລາຍການ {0} ບໍ່ເຮັດວຽກຫຼືໃນຕອນທ້າຍຂອງຊີວິດໄດ້ຮັບການບັນລຸໄດ້
+DocType: Student Admission Program,Minimum Age,Age Minimum
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,ຕົວຢ່າງ: ຄະນິດສາດພື້ນຖານ
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ເພື່ອປະກອບມີພາສີໃນການຕິດຕໍ່ກັນ {0} ໃນອັດຕາການສິນຄ້າ, ພາສີອາກອນໃນແຖວເກັດທີ່ຢູ່ {1} ຍັງຕ້ອງໄດ້ຮັບການປະກອບ"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,ການຕັ້ງຄ່າສໍາລັບ Module HR
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,ການຕັ້ງຄ່າສໍາລັບ Module HR
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,ການປ່ຽນແປງຈໍານວນເງິນ
 DocType: BOM Update Tool,New BOM,BOM ໃຫມ່
@@ -250,7 +259,7 @@
 DocType: Lead,Request Type,ຄໍາຮ້ອງຂໍປະເພດ
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,ເຮັດໃຫ້ພະນັກງານ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ກະຈາຍສຽງ
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,ຕື່ມການຫ້ອງ
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),ໂຫມດການຕັ້ງຄ່າຂອງ POS (ອອນລາຍ / Offline)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,ການປະຕິບັດ
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ລາຍລະອຽດຂອງການດໍາເນີນງານປະຕິບັດ.
 DocType: Serial No,Maintenance Status,ສະຖານະບໍາລຸງຮັກສາ
@@ -273,6 +282,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,ລາຄາຈະຕ້ອງສາມາດນໍາໃຊ້ສໍາລັບການຊື້ຫຼືການຂາຍ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},ວັນທີການຕິດຕັ້ງບໍ່ສາມາດກ່ອນທີ່ວັນທີສໍາລັບລາຍການ {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),ສ່ວນຫຼຸດກ່ຽວກັບລາຄາອັດຕາ (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Biochemistry
 DocType: Offer Letter,Select Terms and Conditions,ເລືອກເງື່ອນໄຂການແລະເງື່ອນໄຂ
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,ມູນຄ່າອອກ
 DocType: Production Planning Tool,Sales Orders,ຄໍາສັ່ງການຂາຍ
@@ -307,15 +317,15 @@
 DocType: Sales Partner,Reseller,ຕົວແທນຈໍາຫນ່າຍ
 DocType: Codification Table,Medical Code,Medical Code
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","ຖ້າຫາກວ່າການກວດກາ, ຈະປະກອບມີລາຍການລາຍການທີ່ບໍ່ແມ່ນຫຼັກຊັບໃນຄໍາຮ້ອງຂໍການວັດສະດຸ."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,ກະລຸນາໃສ່ບໍລິສັດ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,ກະລຸນາໃສ່ບໍລິສັດ
 DocType: Delivery Note Item,Against Sales Invoice Item,ຕໍ່ຕ້ານການຂາຍໃບແຈ້ງຫນີ້ສິນຄ້າ
 ,Production Orders in Progress,ໃບສັ່ງຜະລິດໃນຄວາມຄືບຫນ້າ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,ເງິນສົດສຸດທິຈາກການເງິນ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage ແມ່ນອັນເຕັມທີ່, ບໍ່ໄດ້ປະຢັດ"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage ແມ່ນອັນເຕັມທີ່, ບໍ່ໄດ້ປະຢັດ"
 DocType: Lead,Address & Contact,ທີ່ຢູ່ຕິດຕໍ່
 DocType: Leave Allocation,Add unused leaves from previous allocations,ຕື່ມການໃບທີ່ບໍ່ໄດ້ໃຊ້ຈາກການຈັດສັນທີ່ຜ່ານມາ
 DocType: Sales Partner,Partner website,ເວັບໄຊທ໌ Partner
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,ເພີ່ມລາຍການລາຍ
+DocType: Restaurant Order Entry,Add Item,ເພີ່ມລາຍການລາຍ
 DocType: Lab Test,Custom Result,Custom Result
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,ຊື່ຕິດຕໍ່
 DocType: Course Assessment Criteria,Course Assessment Criteria,ເງື່ອນໄຂການປະເມີນຜົນຂອງລາຍວິຊາ
@@ -328,7 +338,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ຮ້ອງຂໍໃຫ້ມີສໍາລັບການຊື້.
 DocType: Lab Test,Submitted Date,Submitted Date
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,ນີ້ແມ່ນອີງໃສ່ແຜ່ນທີ່ໃຊ້ເວລາສ້າງຕໍ່ຕ້ານໂຄງການນີ້
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,ຈ່າຍສຸດທິບໍ່ສາມາດຈະຫນ້ອຍກ່ວາ 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,ຈ່າຍສຸດທິບໍ່ສາມາດຈະຫນ້ອຍກ່ວາ 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","ເພື່ອຢຸດການສົ່ງແຈ້ງເຕືອນຄວາມຜິດພາດທີ່ຊ້ໍາຄືນມາຈາກລະບົບ, ພວກເຮົາໄດ້ກວດເບິ່ງເຂດທີ່ຖືກປິດໃນການສະຫມັກ"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,ພຽງແຕ່ອະນຸມັດອອກຈາກການຄັດເລືອກສາມາດສົ່ງຄໍາຮ້ອງສະຫມັກອອກຈາກ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,ບັນເທົາອາການທີ່ສະຫມັກຈະຕ້ອງຫຼາຍກ່ວາວັນຂອງການເຂົ້າຮ່ວມ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,ໃບຕໍ່ປີ
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,ກໍາໄລແລະຂາດທຶນ
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,ລິດ
 DocType: Task,Total Costing Amount (via Time Sheet),ມູນຄ່າທັງຫມົດຈໍານວນເງິນ (ຜ່ານທີ່ໃຊ້ເວລາ Sheet)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,ກະລຸນາຕິດຕັ້ງນັກຮຽນພາຍໃຕ້ກຸ່ມນັກຮຽນ
 DocType: Item Website Specification,Item Website Specification,ຂໍ້ມູນຈໍາເພາະລາຍການເວັບໄຊທ໌
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ອອກຈາກສະກັດ
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},ລາຍການ {0} ໄດ້ບັນລຸໃນຕອນທ້າຍຂອງຊີວິດໃນ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},ລາຍການ {0} ໄດ້ບັນລຸໃນຕອນທ້າຍຂອງຊີວິດໃນ {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,ການອອກສຽງທະນາຄານ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,ປະຈໍາປີ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Reconciliation Item
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,ຂອງລາຍວິຊາ Group ນັກສຶກສາເຄື່ອງມືການສ້າງ
 DocType: Lead,Do Not Contact,ບໍ່ໄດ້ຕິດຕໍ່
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,ປະຊາຊົນຜູ້ທີ່ສອນໃນອົງການຈັດຕັ້ງຂອງທ່ານ
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,The id ເປັນເອກະລັກສໍາລັບການຕິດຕາມໃບແຈ້ງການທີ່ເກີດຂຶ້ນທັງຫມົດ. ມັນຖືກສ້າງຂຶ້ນກ່ຽວກັບການ.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,ຊອບແວພັດທະນາ
 DocType: Item,Minimum Order Qty,ຈໍານວນການສັ່ງຊື້ຂັ້ນຕ່ໍາ
 DocType: Pricing Rule,Supplier Type,ປະເພດຜູ້ສະຫນອງ
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,ເຜີຍແຜ່ໃນ Hub
 DocType: Student Admission,Student Admission,ຮັບສະຫມັກນັກສຶກສາ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,ລາຍການ {0} ຈະຖືກຍົກເລີກ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,ຂໍອຸປະກອນການ
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,ລາຍການ {0} ຈະຖືກຍົກເລີກ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,ຂໍອຸປະກອນການ
 DocType: Bank Reconciliation,Update Clearance Date,ວັນທີ່ປັບປຸງການເກັບກູ້
 DocType: Item,Purchase Details,ລາຍລະອຽດການຊື້
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ລາຍການ {0} ບໍ່ພົບເຫັນຢູ່ໃນຕາຕະລາງ &#39;ຈໍາຫນ່າຍວັດຖຸດິບໃນການສັ່ງຊື້ {1}
 DocType: Patient Relation,Relation,ປະຊາສໍາພັນ
 DocType: Shipping Rule,Worldwide Shipping,ສົ່ງທົ່ວໂລກ
 DocType: Patient Relation,Mother,ແມ່
+DocType: Restaurant Reservation,Reservation End Time,ເວລາ Reservation ການສິ້ນສຸດ
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,ຢືນຢັນຄໍາສັ່ງຈາກລູກຄ້າ.
 DocType: Purchase Receipt Item,Rejected Quantity,ປະລິມານການປະຕິເສດ
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,ຄໍາຮ້ອງຂໍການຊໍາລະເງິນ {0} ຖືກສ້າງຂຶ້ນ
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,ຄໍາຮ້ອງຂໍການຊໍາລະເງິນ {0} ຖືກສ້າງຂຶ້ນ
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Low Sensitivity
 DocType: Notification Control,Notification Control,ການຄວບຄຸມການແຈ້ງເຕືອນ
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,ກະລຸນາຢືນຢັນເມື່ອທ່ານໄດ້ສໍາເລັດການຝຶກອົບຮົມຂອງທ່ານ
 DocType: Lead,Suggestions,ຄໍາແນະນໍາ
@@ -388,7 +401,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,ຄວາມຜິດພາດພຽງອີເມວເງິນເດືອນໃຫ້ພະນັກງານໂດຍອີງໃສ່ອີເມວທີ່ແນະນໍາການຄັດເລືອກໃນພະນັກງານ
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,ການອະນຸມັດອອກຄັ້ງທໍາອິດໃນບັນຊີລາຍການຈະໄດ້ຮັບການກໍານົດເປັນມາດຕະຖານອອກຈາກອະນຸມັດ
 DocType: Tax Rule,Shipping County,Shipping County
-apps/erpnext/erpnext/config/desktop.py +158,Learn,ຮຽນຮູ້
+apps/erpnext/erpnext/config/desktop.py +159,Learn,ຮຽນຮູ້
 DocType: Asset,Next Depreciation Date,ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,ຄ່າໃຊ້ຈ່າຍຂອງກິດຈະກໍາຕໍ່ພະນັກງານ
 DocType: Accounts Settings,Settings for Accounts,ການຕັ້ງຄ່າສໍາລັບການບັນຊີ
@@ -399,13 +412,13 @@
 DocType: Item,Synced With Hub,ຊິ້ງຂໍ້ມູນກັບ Hub
 DocType: Vehicle,Fleet Manager,ຜູ້ຈັດການເຮືອ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},ແຖວ # {0}: {1} ບໍ່ສາມາດຈະລົບສໍາລັບລາຍການ {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,ລະຫັດຜ່ານຜິດ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,ລະຫັດຜ່ານຜິດ
 DocType: Item,Variant Of,variant ຂອງ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',ສໍາເລັດຈໍານວນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ &#39;ຈໍານວນການຜະລິດ&#39;
 DocType: Period Closing Voucher,Closing Account Head,ປິດຫົວຫນ້າບັນຊີ
 DocType: Employee,External Work History,ວັດການເຮັດວຽກພາຍນອກ
 DocType: Physician,Time per Appointment,ເວລາຕໍ່ການນັດຫມາຍ
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Error Reference ວົງ
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Error Reference ວົງ
 DocType: Appointment Type,Is Inpatient,ແມ່ນຜູ້ປ່ວຍນອກ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,ຊື່ Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,ໃນຄໍາສັບຕ່າງໆ (Export) ຈະສັງເກດເຫັນເມື່ອທ່ານຊ່ວຍປະຢັດການຈັດສົ່ງ.
@@ -414,19 +427,18 @@
 DocType: Lead,Industry,ອຸດສາຫະກໍາ
 DocType: Employee,Job Profile,ຂໍ້ມູນວຽກເຮັດງານທໍາ
 DocType: BOM Item,Rate & Amount,ອັດຕາແລະຈໍານວນ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ກະລຸນາຕິດຕັ້ງຈໍານວນຊຸດສໍາລັບການເຂົ້າຮ່ວມໂດຍຜ່ານ Setup&gt; ເລກລໍາດັບ
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,ນີ້ແມ່ນອີງໃສ່ທຸລະກໍາກັບບໍລິສັດນີ້. ເບິ່ງໄລຍະເວລາຕ່ໍາກວ່າສໍາລັບລາຍລະອຽດ
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ແຈ້ງໂດຍ Email ກ່ຽວກັບການສ້າງຂອງຄໍາຮ້ອງຂໍອຸປະກອນອັດຕະໂນມັດ
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,ທົນທານຕໍ່
 DocType: Journal Entry,Multi Currency,ສະກຸນເງິນຫຼາຍ
 DocType: Payment Reconciliation Invoice,Invoice Type,ປະເພດໃບເກັບເງິນ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ລູກຄ້າ&gt; ກຸ່ມລູກຄ້າ&gt; ອານາເຂດ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,ການສົ່ງເງິນ
 DocType: Consultation,Encounter Impression,Impression Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,ການຕັ້ງຄ່າພາສີອາກອນ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,ຄ່າໃຊ້ຈ່າຍຂອງຊັບສິນຂາຍ
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,Entry ການຊໍາລະເງິນໄດ້ຮັບການແກ້ໄຂພາຍຫຼັງທີ່ທ່ານໄດ້ດຶງມັນ. ກະລຸນາດຶງມັນອີກເທື່ອຫນຶ່ງ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} ເຂົ້າສອງຄັ້ງໃນພາສີສິນຄ້າ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,ສະຫຼຸບສັງລວມສໍາລັບອາທິດນີ້ແລະກິດຈະກໍາທີ່ຍັງຄ້າງ
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} ເຂົ້າສອງຄັ້ງໃນພາສີສິນຄ້າ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,ສະຫຼຸບສັງລວມສໍາລັບອາທິດນີ້ແລະກິດຈະກໍາທີ່ຍັງຄ້າງ
 DocType: Student Applicant,Admitted,ຍອມຮັບຢ່າງຈິງ
 DocType: Workstation,Rent Cost,ເຊົ່າທຶນ
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,ຈໍານວນເງິນຫຼັງຈາກຄ່າເສື່ອມລາຄາ
@@ -441,36 +453,35 @@
 DocType: Shipping Rule,Valid for Countries,ຖືກຕ້ອງສໍາລັບປະເທດ
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ລາຍການນີ້ແມ່ນແມ່ແບບແລະບໍ່ສາມາດຖືກນໍາໃຊ້ໃນການຄ້າຂາຍ. ຄຸນລັກສະນະລາຍການຈະໄດ້ຮັບການຄັດລອກໄປເຂົ້າໄປໃນ variants ເວັ້ນເສຍແຕ່ວ່າ &#39;ບໍ່ມີສໍາເນົາ&#39; ໄດ້ຖືກກໍານົດ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ຄໍາສັ່ງທັງຫມົດພິຈາລະນາ
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","ການອອກແບບຂອງພະນັກງານ (ຕົວຢ່າງ CEO, ຜູ້ອໍານວຍການແລະອື່ນໆ)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","ການອອກແບບຂອງພະນັກງານ (ຕົວຢ່າງ CEO, ຜູ້ອໍານວຍການແລະອື່ນໆ)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,ອັດຕາທີ່ສະກຸນເງິນຂອງລູກຄ້າຈະຖືກແປງເປັນສະກຸນເງິນຂອງລູກຄ້າຂອງພື້ນຖານ
 DocType: Course Scheduling Tool,Course Scheduling Tool,ຂອງລາຍວິຊາເຄື່ອງມືການຕັ້ງເວລາ
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},"ຕິດຕໍ່ກັນ, {0}: Purchase Invoice ບໍ່ສາມາດຈະດໍາເນີນຕໍ່ຊັບສິນທີ່ມີຢູ່ແລ້ວ {1}"
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Urgent] Error while creating% s ສໍາລັບ% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Urgent] Error while creating% s ສໍາລັບ% s
 DocType: Item Tax,Tax Rate,ອັດຕາພາສີ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ຈັດສັນແລ້ວສໍາລັບພະນັກງານ {1} ສໍາລັບໄລຍະເວລາ {2} ກັບ {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,ເລືອກລາຍການ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,ເລືອກລາຍການ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,ຊື້ Invoice {0} ໄດ້ຖືກສົ່ງແລ້ວ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"ຕິດຕໍ່ກັນ, {0}: Batch ບໍ່ຕ້ອງເຊັ່ນດຽວກັນກັບ {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,ປ່ຽນກັບທີ່ບໍ່ແມ່ນ Group
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Batch (ຫຼາຍ) ຂອງສິນຄ້າ.
 DocType: C-Form Invoice Detail,Invoice Date,ວັນທີ່ໃບເກັບເງິນ
 DocType: GL Entry,Debit Amount,ຈໍານວນເງິນເດບິດ
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},ມີພຽງແຕ່ສາມາດ 1 ບັນຊີຕໍ່ບໍລິສັດໃນ {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,ກະລຸນາເບິ່ງການຕິດ
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},ມີພຽງແຕ່ສາມາດ 1 ບັນຊີຕໍ່ບໍລິສັດໃນ {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,ກະລຸນາເບິ່ງການຕິດ
 DocType: Purchase Order,% Received,% ທີ່ໄດ້ຮັບ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ສ້າງກຸ່ມນັກສຶກສາ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,ຕິດຕັ້ງແລ້ວສົມບູນ !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,ຕິດຕັ້ງແລ້ວສົມບູນ !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Credit Note ຈໍານວນ
 DocType: Setup Progress Action,Action Document,ເອກະສານປະຕິບັດ
 ,Finished Goods,ສິນຄ້າສໍາເລັດຮູບ
 DocType: Delivery Note,Instructions,ຄໍາແນະນໍາ
 DocType: Quality Inspection,Inspected By,ການກວດກາໂດຍ
 DocType: Maintenance Visit,Maintenance Type,ປະເພດບໍາລຸງຮັກສາ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} ບໍ່ໄດ້ລົງທະບຽນໃນວິຊາທີ່ {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,ລະຫັດສິນຄ້າ&gt; ກຸ່ມສິນຄ້າ&gt; ຍີ່ຫໍ້
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} ບໍ່ໄດ້ລົງທະບຽນໃນວິຊາທີ່ {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial No {0} ບໍ່ໄດ້ຂຶ້ນກັບການສົ່ງເງິນ {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,ເພີ່ມລາຍການລາຍ
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,ເພີ່ມລາຍການລາຍ
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,ລາຍການຄຸນນະພາບກວດສອບພາລາມິເຕີ
 DocType: Leave Application,Leave Approver Name,ອອກຈາກຊື່ຜູ້ອະນຸມັດ
 DocType: Depreciation Schedule,Schedule Date,ກໍານົດເວລາວັນທີ່
@@ -492,7 +503,7 @@
 DocType: Salary Slip Timesheet,Working Hours,ຊົ່ວໂມງເຮັດວຽກ
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ການປ່ຽນແປງ / ຈໍານວນລໍາດັບການເລີ່ມຕົ້ນໃນປັດຈຸບັນຂອງໄລຍະການທີ່ມີຢູ່ແລ້ວ.
 DocType: Dosage Strength,Strength,ຄວາມເຂັ້ມແຂງ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,ສ້າງລູກຄ້າໃຫມ່
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,ສ້າງລູກຄ້າໃຫມ່
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","ຖ້າຫາກວ່າກົດລະບຽບການຕັ້ງລາຄາທີ່ຫຼາກຫຼາຍສືບຕໍ່ໄຊຊະນະ, ຜູ້ໃຊ້ໄດ້ຮ້ອງຂໍໃຫ້ກໍານົດບຸລິມະສິດດ້ວຍຕົນເອງເພື່ອແກ້ໄຂບັນຫາຂໍ້ຂັດແຍ່ງ."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,ສ້າງໃບສັ່ງຊື້
 ,Purchase Register,ລົງທະບຽນການຊື້
@@ -511,7 +522,7 @@
 DocType: Lab Test Template,Single,ດຽວ
 DocType: Salary Slip,Total Loan Repayment,ທັງຫມົດຊໍາລະຄືນເງິນກູ້
 DocType: Account,Cost of Goods Sold,ຄ່າໃຊ້ຈ່າຍຂອງສິນຄ້າຂາຍ
-DocType: Purchase Invoice,Yearly,ປະຈໍາປີ
+DocType: Subscription,Yearly,ປະຈໍາປີ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,ກະລຸນາໃສ່ສູນຕົ້ນທຶນ
 DocType: Drug Prescription,Dosage,Dosage
 DocType: Journal Entry Account,Sales Order,ຂາຍສິນຄ້າ
@@ -542,7 +553,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,ການຕັ້ງຄ່າທົ່ວໂລກສໍາລັບຂະບວນການຜະລິດທັງຫມົດ.
 DocType: Accounts Settings,Accounts Frozen Upto,ບັນຊີ Frozen ເກີນ
 DocType: SMS Log,Sent On,ສົ່ງກ່ຽວກັບ
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,ຄຸນລັກສະນະ {0} ເລືອກເວລາຫຼາຍໃນຕາຕະລາງຄຸນສົມບັດ
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,ຄຸນລັກສະນະ {0} ເລືອກເວລາຫຼາຍໃນຕາຕະລາງຄຸນສົມບັດ
 DocType: HR Settings,Employee record is created using selected field. ,ການບັນທຶກຂອງພະນັກງານແມ່ນການສ້າງຕັ້ງການນໍາໃຊ້ພາກສະຫນາມການຄັດເລືອກ.
 DocType: Sales Order,Not Applicable,ບໍ່ສາມາດໃຊ້
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,ຕົ້ນສະບັບວັນພັກ.
@@ -568,13 +579,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ໃບທັງຫມົດການຈັດສັນແມ່ນການບັງຄັບ
 DocType: Patient,AB Positive,AB Positive
 DocType: Job Opening,Description of a Job Opening,ລາຍລະອຽດຂອງການໃຊ້ວຽກ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,ກິດຈະກໍາທີ່ຍັງຄ້າງສໍາລັບມື້ນີ້
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,ກິດຈະກໍາທີ່ຍັງຄ້າງສໍາລັບມື້ນີ້
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,ບັນທຶກການເຂົ້າຮຽນ.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,ອົງປະກອບເງິນເດືອນສໍາລັບເງິນເດືອນຕາມ timesheet.
 DocType: Sales Order Item,Used for Production Plan,ນໍາໃຊ້ສໍາລັບແຜນການຜະລິດ
 DocType: Employee Loan,Total Payment,ການຊໍາລະເງິນທັງຫມົດ
 DocType: Manufacturing Settings,Time Between Operations (in mins),ທີ່ໃຊ້ເວລາລະຫວ່າງການປະຕິບັດ (ໃນນາທີ)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} ຖືກຍົກເລີກນັ້ນການປະຕິບັດທີ່ບໍ່ສາມາດໄດ້ຮັບການສໍາເລັດ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} ຖືກຍົກເລີກນັ້ນການປະຕິບັດທີ່ບໍ່ສາມາດໄດ້ຮັບການສໍາເລັດ
 DocType: Customer,Buyer of Goods and Services.,ຜູ້ຊື້ສິນຄ້າແລະບໍລິການ.
 DocType: Journal Entry,Accounts Payable,Accounts Payable
 DocType: Patient,Allergies,Allergies
@@ -586,23 +597,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,ເຕືອນໃບສັ່ງຊື້
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,ບອກໄດ້ບໍ່ຫຼາຍປານໃດຂອງລູກຄ້າຂອງທ່ານ. ພວກເຂົາເຈົ້າສາມາດຈະມີອົງການຈັດຕັ້ງຫຼືບຸກຄົນ.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Parts ພຽງພໍທີ່ຈະກໍ່ສ້າງ
+DocType: POS Profile User,POS Profile User,POS User Profile
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,ລາຍໄດ້ໂດຍກົງ
 DocType: Patient Appointment,Date TIme,Date TIme
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","ບໍ່ສາມາດກັ່ນຕອງໂດຍອີງໃສ່ບັນຊີ, ຖ້າຫາກວ່າເປັນກຸ່ມຕາມບັນຊີ"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,ຫ້ອງການປົກຄອງ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,ກະລຸນາເລືອກລາຍວິຊາ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,ກະລຸນາເລືອກລາຍວິຊາ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,ກະລຸນາເລືອກລາຍວິຊາ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,ກະລຸນາເລືອກລາຍວິຊາ
 DocType: Codification Table,Codification Table,ຕາຕະລາງການອ້າງອີງ
 DocType: Timesheet Detail,Hrs,ຊົ່ວໂມງ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,ກະລຸນາເລືອກບໍລິສັດ
 DocType: Stock Entry Detail,Difference Account,ບັນຊີທີ່ແຕກຕ່າງກັນ
 DocType: Purchase Invoice,Supplier GSTIN,GSTIN Supplier
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,ສາມາດເຮັດໄດ້ບໍ່ແມ່ນວຽກງານຢ່າງໃກ້ຊິດເປັນວຽກງານຂຶ້ນຂອງຕົນ {0} ບໍ່ໄດ້ປິດ.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,ກະລຸນາໃສ່ Warehouse ສໍາລັບການທີ່ວັດສະດຸການຈອງຈະໄດ້ຮັບການຍົກຂຶ້ນມາ
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,ສາມາດເຮັດໄດ້ບໍ່ແມ່ນວຽກງານຢ່າງໃກ້ຊິດເປັນວຽກງານຂຶ້ນຂອງຕົນ {0} ບໍ່ໄດ້ປິດ.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,ກະລຸນາໃສ່ Warehouse ສໍາລັບການທີ່ວັດສະດຸການຈອງຈະໄດ້ຮັບການຍົກຂຶ້ນມາ
 DocType: Production Order,Additional Operating Cost,ຄ່າໃຊ້ຈ່າຍເພີ່ມເຕີມ
 DocType: Lab Test Template,Lab Routine,Lab routine
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,ເຄື່ອງສໍາອາງ
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items",ການຜະສານຄຸນສົມບັດດັ່ງຕໍ່ໄປນີ້ຈະຕ້ອງດຽວກັນສໍາລັບການລາຍການທັງສອງ
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items",ການຜະສານຄຸນສົມບັດດັ່ງຕໍ່ໄປນີ້ຈະຕ້ອງດຽວກັນສໍາລັບການລາຍການທັງສອງ
 DocType: Shipping Rule,Net Weight,ນໍ້າຫນັກສຸດທິ
 DocType: Employee,Emergency Phone,ໂທລະສັບສຸກເສີນ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,ຊື້
@@ -613,7 +625,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,ກະລຸນາອະທິບາຍຊັ້ນສໍາລັບ Threshold 0%
 DocType: Sales Order,To Deliver,ການສົ່ງ
 DocType: Purchase Invoice Item,Item,ລາຍການ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Serial ລາຍການທີ່ບໍ່ມີບໍ່ສາມາດຈະສ່ວນຫນຶ່ງເປັນ
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,ຄວາມໄວສູງ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Serial ລາຍການທີ່ບໍ່ມີບໍ່ສາມາດຈະສ່ວນຫນຶ່ງເປັນ
 DocType: Journal Entry,Difference (Dr - Cr),ຄວາມແຕກຕ່າງກັນ (Dr - Cr)
 DocType: Account,Profit and Loss,ກໍາໄລແລະຂາດທຶນ
 DocType: Patient,Risk Factors,ປັດໄຈຄວາມສ່ຽງ
@@ -622,7 +635,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,ການຄຸ້ມຄອງການ Subcontracting
 DocType: Vital Signs,Body Temperature,ອຸນຫະພູມຮ່າງກາຍ
 DocType: Project,Project will be accessible on the website to these users,ໂຄງການຈະສາມາດເຂົ້າເຖິງກ່ຽວກັບເວັບໄຊທ໌ເພື່ອຜູ້ໃຊ້ເຫລົ່ານີ້
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,ກໍານົດປະເພດໂຄງການ.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,ກໍານົດປະເພດໂຄງການ.
 DocType: Supplier Scorecard,Weighting Function,Function Weighting
 DocType: Physician,OP Consulting Charge,OP Consulting Charge
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,ຕິດຕັ້ງຂອງທ່ານ
@@ -636,7 +649,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,ການເພີ່ມຂຶ້ນບໍ່ສາມາດຈະເປັນ 0
 DocType: Production Planning Tool,Material Requirement,ຄວາມຕ້ອງການອຸປະກອນການ
 DocType: Company,Delete Company Transactions,ລົບລາຍະການບໍລິສັດ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,ກະສານອ້າງອີງບໍ່ມີແລະວັນທີເອກະສານແມ່ນການບັງຄັບສໍາລັບການເຮັດທຸລະກໍາທະນາຄານ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,ກະສານອ້າງອີງບໍ່ມີແລະວັນທີເອກະສານແມ່ນການບັງຄັບສໍາລັບການເຮັດທຸລະກໍາທະນາຄານ
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,ເພີ່ມ / ແກ້ໄຂພາສີອາກອນແລະຄ່າບໍລິການ
 DocType: Payment Entry Reference,Supplier Invoice No,Supplier Invoice No
 DocType: Territory,For reference,ສໍາລັບການກະສານອ້າງອີງ
@@ -644,12 +657,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","ບໍ່ສາມາດລົບ Serial No {0}, ຍ້ອນວ່າມັນໄດ້ຖືກນໍາໃຊ້ໃນທຸລະກໍາຫຼັກຊັບ"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),ປິດ (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,ສະບາຍດີ
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,ການເຄື່ອນໄຫວສິນຄ້າ
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,ການເຄື່ອນໄຫວສິນຄ້າ
 DocType: Serial No,Warranty Period (Days),ໄລຍະເວລາຮັບປະກັນ (ວັນ)
 DocType: Installation Note Item,Installation Note Item,ການຕິດຕັ້ງຫມາຍເຫດລາຍການ
 DocType: Production Plan Item,Pending Qty,ຢູ່ລະຫວ່າງການຈໍານວນ
 DocType: Budget,Ignore,ບໍ່ສົນໃຈ
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} ບໍ່ເຮັດວຽກ
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} ບໍ່ເຮັດວຽກ
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,ຂະຫນາດການຕິດຕັ້ງການກວດສໍາລັບການພິມ
 DocType: Salary Slip,Salary Slip Timesheet,Timesheet ເງິນເດືອນ Slip
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Supplier Warehouse ບັງຄັບສໍາລັບອະນຸສັນຍາຮັບຊື້
@@ -658,7 +671,7 @@
 DocType: Pricing Rule,Sales Partner,Partner ຂາຍ
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,ທັງຫມົດ scorecards Supplier.
 DocType: Buying Settings,Purchase Receipt Required,ຊື້ຮັບທີ່ກໍານົດໄວ້
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,ອັດຕາມູນຄ່າເປັນການບັງຄັບຖ້າຫາກວ່າການເປີດກວ້າງການຕະຫຼາດເຂົ້າໄປ
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,ອັດຕາມູນຄ່າເປັນການບັງຄັບຖ້າຫາກວ່າການເປີດກວ້າງການຕະຫຼາດເຂົ້າໄປ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,ບໍ່ມີພົບເຫັນຢູ່ໃນຕາຕະລາງການບັນທຶກການໃບເກັບເງິນ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,ກະລຸນາເລືອກບໍລິສັດແລະພັກປະເພດທໍາອິດ
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,ທາງດ້ານການເງິນ / ການບັນຊີປີ.
@@ -695,7 +708,7 @@
 DocType: Quotation,Quotation To,ສະເຫນີລາຄາການ
 DocType: Lead,Middle Income,ລາຍໄດ້ປານກາງ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),ເປີດ (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ມາດຕະຖານ Unit of Measure ສໍາລັບລາຍການ {0} ບໍ່ສາມາດໄດ້ຮັບການປ່ຽນແປງໂດຍກົງເພາະວ່າທ່ານໄດ້ເຮັດແລ້ວການເຮັດທຸລະກໍາບາງ (s) ມີ UOM ອື່ນ. ທ່ານຈະຕ້ອງການເພື່ອສ້າງເປັນລາຍການໃຫມ່ທີ່ຈະນໍາໃຊ້ UOM ມາດຕະຖານທີ່ແຕກຕ່າງກັນ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ມາດຕະຖານ Unit of Measure ສໍາລັບລາຍການ {0} ບໍ່ສາມາດໄດ້ຮັບການປ່ຽນແປງໂດຍກົງເພາະວ່າທ່ານໄດ້ເຮັດແລ້ວການເຮັດທຸລະກໍາບາງ (s) ມີ UOM ອື່ນ. ທ່ານຈະຕ້ອງການເພື່ອສ້າງເປັນລາຍການໃຫມ່ທີ່ຈະນໍາໃຊ້ UOM ມາດຕະຖານທີ່ແຕກຕ່າງກັນ.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,ຈໍານວນເງິນທີ່ຈັດສັນບໍ່ສາມາດຈະກະທົບທາງລົບ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,ກະລຸນາຕັ້ງບໍລິສັດໄດ້
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,ກະລຸນາຕັ້ງບໍລິສັດໄດ້
@@ -710,6 +723,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,ເລືອກບັນຊີຊໍາລະເງິນເພື່ອເຮັດໃຫ້ການອອກສຽງທະນາຄານ
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","ສ້າງການບັນທຶກຂອງພະນັກວຽກໃນການຄຸ້ມຄອງໃບ, ການຮຽກຮ້ອງຄ່າໃຊ້ຈ່າຍແລະການຈ່າຍເງິນເດືອນ"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Prescription Period
+DocType: Restaurant Reservation,Restaurant Reservation,ຮ້ານອາຫານການຈອງ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,ຂຽນບົດສະເຫນີ
 DocType: Payment Entry Deduction,Payment Entry Deduction,ການຫັກ Entry ການຊໍາລະເງິນ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,ອີກປະການຫນຶ່ງບຸກຄົນ Sales {0} ມີຢູ່ກັບ id ພະນັກງານດຽວກັນ
@@ -717,7 +731,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,ຕົ້ນສະບັບ
 DocType: Assessment Plan,Maximum Assessment Score,ຄະແນນປະເມີນຜົນສູງສຸດ
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,ການປັບປຸງທະນາຄານວັນ Transaction
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,ການຕິດຕາມທີ່ໃຊ້ເວລາ
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,ການຕິດຕາມທີ່ໃຊ້ເວລາ
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,ຊ້ໍາສໍາລັບ TRANSPORTER
 DocType: Fiscal Year Company,Fiscal Year Company,ບໍລິສັດປີງົບປະມານ
 DocType: Packing Slip Item,DN Detail,DN ຂໍ້ມູນ
@@ -726,8 +740,9 @@
 DocType: Batch,Batch Description,ລາຍລະອຽດຊຸດ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,ສ້າງກຸ່ມນັກສຶກສາ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,ສ້າງກຸ່ມນັກສຶກສາ
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","ການຊໍາລະເງິນ Gateway ບັນຊີບໍ່ໄດ້ສ້າງ, ກະລຸນາສ້າງດ້ວຍຕົນເອງ."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","ການຊໍາລະເງິນ Gateway ບັນຊີບໍ່ໄດ້ສ້າງ, ກະລຸນາສ້າງດ້ວຍຕົນເອງ."
 DocType: Supplier Scorecard,Per Year,ຕໍ່ປີ
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,ບໍ່ມີສິດໄດ້ຮັບການເຂົ້າຮຽນຢູ່ໃນໂຄງການນີ້ຕາມ DOB
 DocType: Sales Invoice,Sales Taxes and Charges,ພາສີອາກອນການຂາຍແລະຄ່າບໍລິການ
 DocType: Employee,Organization Profile,ຂໍ້ມູນອົງການຈັດຕັ້ງ
 DocType: Vital Signs,Height (In Meter),ຄວາມສູງ (ໃນແມັດ)
@@ -763,7 +778,7 @@
 DocType: Student Batch Name,Batch Name,ຊື່ batch
 DocType: Fee Validity,Max number of visit,ຈໍານວນການຢ້ຽມຢາມສູງສຸດ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet ສ້າງ:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},ກະລຸນາທີ່ກໍານົດໄວ້ເງິນສົດໃນຕອນຕົ້ນຫຼືບັນຊີທະນາຄານໃນຮູບແບບການຊໍາລະເງິນ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},ກະລຸນາທີ່ກໍານົດໄວ້ເງິນສົດໃນຕອນຕົ້ນຫຼືບັນຊີທະນາຄານໃນຮູບແບບການຊໍາລະເງິນ {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,ລົງທະບຽນ
 DocType: GST Settings,GST Settings,ການຕັ້ງຄ່າສີມູນຄ່າເພີ່ມ
 DocType: Selling Settings,Customer Naming By,ຊື່ລູກຄ້າໂດຍ
@@ -795,16 +810,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ລູກຈ້າງພາສີອາກອນແລະຄ່າໃຊ້ຈ່າຍຄ່າບໍລິການ
 DocType: Production Order Operation,Actual Start Time,ເວລາທີ່ແທ້ຈິງ
 DocType: BOM Operation,Operation Time,ທີ່ໃຊ້ເວລາການດໍາເນີນງານ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,ສໍາເລັດຮູບ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,ສໍາເລັດຮູບ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,ຖານ
 DocType: Timesheet,Total Billed Hours,ທັງຫມົດຊົ່ວໂມງບິນ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,ຂຽນ Off ຈໍານວນ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,ຂຽນ Off ຈໍານວນ
 DocType: Leave Block List Allow,Allow User,ອະນຸຍາດໃຫ້ຜູ້ໃຊ້
 DocType: Journal Entry,Bill No,ບັນຊີລາຍການບໍ່ມີ
 DocType: Company,Gain/Loss Account on Asset Disposal,ບັນຊີກໍາໄຮ / ຂາດທຶນຈາກການທໍາລາຍຊັບສິນ
 DocType: Vehicle Log,Service Details,ລາຍລະອຽດການບໍລິການ
 DocType: Vehicle Log,Service Details,ລາຍລະອຽດການບໍລິການ
-DocType: Purchase Invoice,Quarterly,ໄຕມາດ
+DocType: Subscription,Quarterly,ໄຕມາດ
 DocType: Lab Test Template,Grouped,Grouped
 DocType: Selling Settings,Delivery Note Required,ສົ່ງຂໍ້ທີ່ກໍານົດ
 DocType: Bank Guarantee,Bank Guarantee Number,ທະນາຄານຈໍານວນການຮັບປະກັນ
@@ -814,12 +829,12 @@
 DocType: Student Attendance,Student Attendance,ຜູ້ເຂົ້າຮ່ວມນັກສຶກສາ
 DocType: Sales Invoice Timesheet,Time Sheet,ທີ່ໃຊ້ເວລາ Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,ວັດຖຸດິບ Backflush ຖານກ່ຽວກັບ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,ກະລຸນາໃສ່ລາຍລະອຽດລາຍການ
 DocType: Interest,Interest,ທີ່ຫນ້າສົນໃຈ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Sales Pre
 DocType: Purchase Receipt,Other Details,ລາຍລະອຽດອື່ນໆ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,Test Template
+DocType: Restaurant Order Entry Item,Served,ຮັບໃຊ້
 DocType: Account,Accounts,ບັນຊີ
 DocType: Vehicle,Odometer Value (Last),ມູນຄ່າໄມ (ຫຼ້າສຸດ)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,ແມ່ແບບຂອງເກນສະຫນອງດັດນີຊີ້ວັດ.
@@ -831,26 +846,28 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,ສະແດງຄວາມຜິດພາດພຽງເງິນເດືອນ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,ບັນຊີ {0} ໄດ້ຮັບການປ້ອນເວລາຫຼາຍ
 DocType: Account,Expenses Included In Valuation,ຄ່າໃຊ້ຈ່າຍລວມຢູ່ໃນການປະເມີນຄ່າ
-DocType: Hub Settings,Seller City,ຜູ້ຂາຍເມືອງ
 ,Absent Student Report,ບົດລາຍງານນັກສຶກສາບໍ່
 DocType: Email Digest,Next email will be sent on:,email ຕໍ່ໄປຈະຖືກສົ່ງໄປຕາມ:
 DocType: Offer Letter Term,Offer Letter Term,ສະເຫນີຈົດຫມາຍໄລຍະ
 DocType: Supplier Scorecard,Per Week,ຕໍ່ອາທິດ
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,ລາຍການມີ variants.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,ລາຍການມີ variants.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,ນັກຮຽນລວມ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,ບໍ່ພົບລາຍການ {0}
 DocType: Bin,Stock Value,ມູນຄ່າຫຼັກຊັບ
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,ບັນທຶກຄ່າທໍານຽມຈະຖືກສ້າງຂຶ້ນໃນພື້ນຫລັງ. ໃນກໍລະນີຂອງຂໍ້ຜິດພາດຂໍ້ຄວາມສະແດງຂໍ້ຜິດພາດຈະໄດ້ຮັບການປັບປຸງໃນຕາຕະລາງ.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,ບໍລິສັດ {0} ບໍ່ມີ
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} ມີຄ່າທໍານຽມຕໍ່ {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} ມີຄ່າທໍານຽມຕໍ່ {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,ປະເພດຕົ້ນໄມ້
 DocType: BOM Explosion Item,Qty Consumed Per Unit,ຈໍານວນການບໍລິໂພກຕໍ່ຫນ່ວຍ
 DocType: Serial No,Warranty Expiry Date,ການຮັບປະກັນວັນທີ່ຫມົດອາຍຸ
 DocType: Material Request Item,Quantity and Warehouse,ປະລິມານແລະຄັງສິນຄ້າ
+DocType: Hub Settings,Unregister,ຍົກເລີກ
 DocType: Sales Invoice,Commission Rate (%),ຄະນະກໍາມະອັດຕາ (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,ກະລຸນາເລືອກໂຄງການ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,ກະລຸນາເລືອກໂຄງການ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,ກະລຸນາເລືອກໂຄງການ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,ກະລຸນາເລືອກໂຄງການ
 DocType: Project,Estimated Cost,ຕົ້ນທຶນຄາດຄະເນ
 DocType: Purchase Order,Link to material requests,ການເຊື່ອມຕໍ່ກັບການຮ້ອງຂໍອຸປະກອນການ
+DocType: Hub Settings,Publish,ເຜີຍແຜ່
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,ຍານອະວະກາດ
 DocType: Journal Entry,Credit Card Entry,Entry ບັດເຄດິດ
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,ບໍລິສັດແລະບັນຊີ
@@ -861,13 +878,12 @@
 DocType: Selling Settings,Close Opportunity After Days,ປິດໂອກາດຫຼັງຈາກວັນ
 ,Reserved,ລິຂະສິດ
 DocType: Purchase Order,Supply Raw Materials,ການສະຫນອງວັດຖຸດິບ
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,ວັນທີ່ໃບເກັບເງິນຕໍ່ໄປຈະໄດ້ຮັບການຜະລິດ. ມັນຖືກສ້າງຂຶ້ນກ່ຽວກັບການ.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,ຊັບສິນປັດຈຸບັນ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} ບໍ່ແມ່ນຫົວຂໍ້ຫຼັກຊັບ
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',ກະລຸນາຕໍານິຕິຊົມຂອງທ່ານເພື່ອຝຶກອົບຮົມໂດຍການຄລິກໃສ່ &#39;ການຝຶກອົບຮົມ Feedback&#39; ແລະຫຼັງຈາກນັ້ນ &#39;New&#39;
 DocType: Mode of Payment Account,Default Account,ບັນຊີມາດຕະຖານ
 DocType: Payment Entry,Received Amount (Company Currency),ໄດ້ຮັບຈໍານວນເງິນ (ບໍລິສັດສະກຸນເງິນ)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,ຜູ້ນໍາພາຕ້ອງໄດ້ຮັບການກໍານົດຖ້າຫາກວ່າໂອກາດແມ່ນໄດ້ມາຈາກຜູ້ນໍາ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,ຜູ້ນໍາພາຕ້ອງໄດ້ຮັບການກໍານົດຖ້າຫາກວ່າໂອກາດແມ່ນໄດ້ມາຈາກຜູ້ນໍາ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,ກະລຸນາເລືອກວັນໄປປະຈໍາອາທິດ
 DocType: Patient,O Negative,O Negative
 DocType: Production Order Operation,Planned End Time,ການວາງແຜນທີ່ໃຊ້ເວລາສຸດທ້າຍ
@@ -883,10 +899,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,ພະລັງງານ
 DocType: Opportunity,Opportunity From,ໂອກາດຈາກ
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,ຄໍາຖະແຫຼງທີ່ເງິນເດືອນ.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,ຕື່ມການບໍລິສັດ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ແຖວ {0}: {1} ຈໍານວນ Serial ຈໍາເປັນສໍາລັບລາຍການ {2}. ທ່ານໄດ້ສະຫນອງ {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ແຖວ {0}: {1} ຈໍານວນ Serial ຈໍາເປັນສໍາລັບລາຍການ {2}. ທ່ານໄດ້ສະຫນອງ {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,ກະລຸນາເລືອກຕາຕະລາງ
 DocType: BOM,Website Specifications,ຂໍ້ມູນຈໍາເພາະເວັບໄຊທ໌
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} ເປັນທີ່ຢູ່ອີເມວທີ່ບໍ່ຖືກຕ້ອງໃນ &#39;ຜູ້ຮັບ&#39;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} ເປັນທີ່ຢູ່ອີເມວທີ່ບໍ່ຖືກຕ້ອງໃນ &#39;ຜູ້ຮັບ&#39;
 DocType: Special Test Items,Particulars,Particulars
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,ຢາຕ້ານເຊື້ອ.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: ຈາກ {0} ຂອງປະເພດ {1}
@@ -894,11 +910,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,ຕິດຕໍ່ກັນ {0}: ປັດໄຈການແປງເປັນການບັງຄັບ
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","ກົດລະບຽບລາຄາທີ່ຫຼາກຫຼາຍທີ່ມີຢູ່ກັບເງື່ອນໄຂດຽວກັນ, ກະລຸນາແກ້ໄຂບັນຫາຂໍ້ຂັດແຍ່ງໂດຍການມອບຫມາຍບູລິມະສິດ. ກົດລະບຽບລາຄາ: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,ບໍ່ສາມາດຍົກເລີກຫລືຍົກເລີກການ BOM ເປັນມັນແມ່ນການເຊື່ອມຕໍ່ກັບແອບເປີ້ນອື່ນໆ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,ບໍ່ສາມາດຍົກເລີກຫລືຍົກເລີກການ BOM ເປັນມັນແມ່ນການເຊື່ອມຕໍ່ກັບແອບເປີ້ນອື່ນໆ
 DocType: Opportunity,Maintenance,ບໍາລຸງຮັກສາ
 DocType: Item Attribute Value,Item Attribute Value,ລາຍການສະແດງທີ່ມູນຄ່າ
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,ຂະບວນການຂາຍ.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,ເຮັດໃຫ້ Timesheet
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,ເຮັດໃຫ້ Timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -936,12 +952,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,ກະລຸນາໃສ່ລາຍການທໍາອິດ
 DocType: Account,Liability,ຄວາມຮັບຜິດຊອບ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ທີ່ຖືກເກືອດຫ້າມຈໍານວນເງິນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກວ່າການຮຽກຮ້ອງຈໍານວນເງິນໃນແຖວ {0}.
+DocType: Salary Detail,Do not include in total,ບໍ່ລວມຢູ່ໃນທັງຫມົດ
 DocType: Company,Default Cost of Goods Sold Account,ມາດຕະຖານຄ່າໃຊ້ຈ່າຍຂອງບັນຊີສິນຄ້າຂາຍ
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,ບັນຊີລາຄາບໍ່ໄດ້ເລືອກ
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,ບັນຊີລາຄາບໍ່ໄດ້ເລືອກ
 DocType: Employee,Family Background,ຄວາມເປັນມາຂອງຄອບຄົວ
 DocType: Request for Quotation Supplier,Send Email,ການສົ່ງອີເມວ
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},ການເຕືອນໄພ: Attachment ບໍ່ຖືກຕ້ອງ {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,ບໍ່ມີການອະນຸຍາດ
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},ການເຕືອນໄພ: Attachment ບໍ່ຖືກຕ້ອງ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,ບໍ່ມີການອະນຸຍາດ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Quote Requested
 DocType: Vital Signs,Heart Rate / Pulse,Heart Rate / Pulse
 DocType: Company,Default Bank Account,ມາດຕະຖານບັນຊີທະນາຄານ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","ການກັ່ນຕອງໂດຍອີງໃສ່ພັກ, ເລືອກເອົາພັກປະເພດທໍາອິດ"
@@ -969,12 +987,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ລາຍການຕິດຕໍ່ກັນ {idx}: {doctype} {docname} ບໍ່ມີຢູ່ໃນຂ້າງເທິງ &#39;{doctype}&#39; ຕາຕະລາງ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} ແມ່ນໄດ້ສໍາເລັດໄປແລ້ວຫລືຍົກເລີກ
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ມີວຽກງານທີ່
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ມື້ຂອງເດືອນທີ່ໃບເກັບເງິນອັດຕະໂນມັດຈະໄດ້ຮັບການຜະລິດເຊັ່ນ: 05, 28 ແລະອື່ນໆ"
 DocType: Item Variant Settings,Copy Fields to Variant,ຄັດລອກເຂດການປ່ຽນແປງ
 DocType: Asset,Opening Accumulated Depreciation,ເປີດຄ່າເສື່ອມລາຄາສະສົມ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ຄະແນນຕ້ອງຕ່ໍາກວ່າຫຼືເທົ່າກັບ 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,ເຄື່ອງມືການລົງທະບຽນໂຄງການ
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,ການບັນທຶກການ C ແບບຟອມ
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,ການບັນທຶກການ C ແບບຟອມ
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,ລູກຄ້າແລະຜູ້ຜະລິດ
 DocType: Email Digest,Email Digest Settings,Email Settings Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,ຂໍຂອບໃຈທ່ານສໍາລັບທຸລະກິດຂອງທ່ານ!
@@ -992,13 +1009,13 @@
 DocType: Request for Quotation Supplier,Quote Status,ສະຖານະອ້າງ
 DocType: Maintenance Visit,Completion Status,ສະຖານະສໍາເລັດ
 DocType: HR Settings,Enter retirement age in years,ກະລຸນາໃສ່ອາຍຸບໍານານໃນປີ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Warehouse ເປົ້າຫມາຍ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,ກະລຸນາເລືອກສາງໄດ້
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Warehouse ເປົ້າຫມາຍ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,ກະລຸນາເລືອກສາງໄດ້
 DocType: Cheque Print Template,Starting location from left edge,ເລີ່ມຕົ້ນສະຖານທີ່ຈາກແຂບໄວ້
 DocType: Item,Allow over delivery or receipt upto this percent,ອະນຸຍາດໃຫ້ໃນໄລຍະການຈັດສົ່ງຫຼືໄດ້ຮັບບໍ່ເກີນຮ້ອຍນີ້
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,ການນໍາເຂົ້າເຂົ້າຮ່ວມ
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,ທັງຫມົດກຸ່ມສິນຄ້າ
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,ທັງຫມົດກຸ່ມສິນຄ້າ
 DocType: Process Payroll,Activity Log,ກິດຈະກໍາເຂົ້າສູ່ລະບົບ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,ກໍາໄຮ / ການສູນເສຍ
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,ປະກອບອັດຕະໂນມັດຂໍ້ຄວາມກ່ຽວກັບການຍື່ນສະເຫນີຂອງກິດຈະກໍາ.
@@ -1010,7 +1027,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,ຄາດຈໍານວນ
 DocType: Sales Invoice,Payment Due Date,ການຊໍາລະເງິນກໍາຫນົດ
 DocType: Drug Prescription,Interval UOM,Interval UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,ລາຍການ Variant {0} ມີຢູ່ແລ້ວກັບຄຸນລັກສະນະດຽວກັນ
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,ລາຍການ Variant {0} ມີຢູ່ແລ້ວກັບຄຸນລັກສະນະດຽວກັນ
+DocType: Item,Hub Publishing Details,Hub Publishing Details
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&quot;ເປີດ &#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ເປີດການເຮັດ
 DocType: Notification Control,Delivery Note Message,ການສົ່ງເງິນເຖິງຂໍ້ຄວາມ
@@ -1030,10 +1048,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: ວັດຖຸດິບບໍ່ສາມາດເຊັ່ນດຽວກັນກັບລາຍການຕົ້ນຕໍ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ຄ່າໃຊ້ຈ່າຍທັງຫມົດໃນການຊື້ຕາຕະລາງໃບລາຍການຈະຕ້ອງເຊັ່ນດຽວກັນກັບພາສີອາກອນທັງຫມົດແລະຄ່າບໍລິການ
 DocType: Sales Team,Incentives,ສິ່ງຈູງໃຈ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,ລົງທະບຽນສໍາລັບ Hub
 DocType: SMS Log,Requested Numbers,ຈໍານວນການຮ້ອງຂໍ
 DocType: Production Planning Tool,Only Obtain Raw Materials,ໄດ້ຮັບພຽງແຕ່ວັດຖຸດິບ
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,ການປະເມີນຜົນການປະຕິບັດ.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","ເຮັດໃຫ້ &#39;ການນໍາໃຊ້ສໍາລັບສິນຄ້າ, ເປັນການຄ້າໂຄງຮ່າງການເປີດໃຊ້ວຽກແລະຄວນຈະມີກົດລະບຽບພາສີຢ່າງຫນ້ອຍຫນຶ່ງສໍາລັບການຄ້າໂຄງຮ່າງການ"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","ເຮັດໃຫ້ &#39;ການນໍາໃຊ້ສໍາລັບສິນຄ້າ, ເປັນການຄ້າໂຄງຮ່າງການເປີດໃຊ້ວຽກແລະຄວນຈະມີກົດລະບຽບພາສີຢ່າງຫນ້ອຍຫນຶ່ງສໍາລັບການຄ້າໂຄງຮ່າງການ"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Entry ການຊໍາລະເງິນ {0} ແມ່ນການເຊື່ອມຕໍ່ກັບຄໍາສັ່ງ {1}, ເບິ່ງວ່າມັນຄວນຈະໄດ້ຮັບການດຶງເປັນລ່ວງຫນ້າໃນໃບເກັບເງິນນີ້."
 DocType: Sales Invoice Item,Stock Details,ລາຍລະອຽດ Stock
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,ມູນຄ່າໂຄງການ
@@ -1052,12 +1071,14 @@
 DocType: Salary Slip,Working Days,ວັນເຮັດວຽກ
 DocType: Serial No,Incoming Rate,ອັດຕາເຂົ້າມາ
 DocType: Packing Slip,Gross Weight,ນ້ໍາຫນັກລວມ
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,ຊື່ຂອງບໍລິສັດຂອງທ່ານສໍາລັບການທີ່ທ່ານຈະຕິດຕັ້ງລະບົບນີ້.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,ເປີດ Hub
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,ຊື່ຂອງບໍລິສັດຂອງທ່ານສໍາລັບການທີ່ທ່ານຈະຕິດຕັ້ງລະບົບນີ້.
 DocType: HR Settings,Include holidays in Total no. of Working Days,ປະກອບມີວັນພັກໃນຈໍານວນທີ່ບໍ່ມີ. ຂອງວັນເຮັດວຽກ
 DocType: Job Applicant,Hold,ຖື
 DocType: Employee,Date of Joining,ວັນທີຂອງການເຂົ້າຮ່ວມ
 DocType: Naming Series,Update Series,ການປັບປຸງ Series
 DocType: Supplier Quotation,Is Subcontracted,ແມ່ນເຫມົາຊ່ວງ
+DocType: Restaurant Table,Minimum Seating,ບ່ອນນັ່ງນ້ອຍສຸດ
 DocType: Item Attribute,Item Attribute Values,ຄ່າລາຍການຄຸນລັກສະນະ
 DocType: Examination Result,Examination Result,ຜົນການສອບເສັງ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,ຮັບຊື້
@@ -1068,13 +1089,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},ບໍ່ສາມາດຊອກຫາສະລັອດຕິງໃຊ້ເວລາໃນ {0} ວັນຕໍ່ໄປສໍາລັບການດໍາເນີນງານ {1}
 DocType: Production Order,Plan material for sub-assemblies,ອຸປະກອນການວາງແຜນສໍາລັບອະນຸສະພາແຫ່ງ
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Partners ການຂາຍແລະອານາເຂດ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} ຕ້ອງມີການເຄື່ອນໄຫວ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} ຕ້ອງມີການເຄື່ອນໄຫວ
 DocType: Journal Entry,Depreciation Entry,Entry ຄ່າເສື່ອມລາຄາ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,ກະລຸນາເລືອກປະເພດເອກະສານທໍາອິດ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ຍົກເລີກການໄປຢ້ຽມຢາມວັດສະດຸ {0} ກ່ອນຍົກເລີກການນີ້ບໍາລຸງຮັກສາ Visit
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial No {0} ບໍ່ໄດ້ຂຶ້ນກັບ Item {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,ທີ່ກໍານົດໄວ້ຈໍານວນ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,ຄັງສິນຄ້າກັບການຊື້ຂາຍທີ່ມີຢູ່ແລ້ວບໍ່ສາມາດປ່ຽນໃຈເຫລື້ອມໃສຊີແຍກປະເພດ.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,ຄັງສິນຄ້າກັບການຊື້ຂາຍທີ່ມີຢູ່ແລ້ວບໍ່ສາມາດປ່ຽນໃຈເຫລື້ອມໃສຊີແຍກປະເພດ.
 DocType: Bank Reconciliation,Total Amount,ຈໍານວນທັງຫມົດ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publishing ອິນເຕີເນັດ
 DocType: Prescription Duration,Number,ຈໍານວນ
@@ -1085,7 +1106,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,ບັນຊີລາຄາຂາຍ
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","ຖ້າຖືກກວດສອບ, ລູກຄ້າຈະໄດ້ຮັບການສ້າງຂຶ້ນ, ທີ່ຖືກສະແດງໃຫ້ກັບຜູ້ເຈັບ. ໃບແຈ້ງຫນີ້ຂອງຜູ້ປ່ວຍຈະຖືກສ້າງຂື້ນຕໍ່ລູກຄ້ານີ້. ທ່ານຍັງສາມາດເລືອກລູກຄ້າທີ່ມີຢູ່ໃນຂະນະທີ່ສ້າງຄົນເຈັບ."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,ເຜີຍແຜ່ການຊິງລາຍການ
 DocType: Bank Reconciliation,Account Currency,ສະກຸນເງິນບັນຊີ
 DocType: Lab Test,Sample ID,ID ຕົວຢ່າງ
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,ກະລຸນາຮອບບັນຊີ Off ໃນບໍລິສັດ
@@ -1094,11 +1114,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Employee {0} ບໍ່ແມ່ນການເຄື່ອນໄຫວຫຼືບໍ່ມີ
 DocType: Fee Structure,Components,ອົງປະກອບ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},ກະລຸນາໃສ່ປະເພດຊັບສິນໃນ Item {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,ລາຍການທີ່ແຕກຕ່າງກັນ {0} ການປັບປຸງ
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,ລາຍການທີ່ແຕກຕ່າງກັນ {0} ການປັບປຸງ
 DocType: Quality Inspection Reading,Reading 6,ອ່ານ 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,ສາມາດເຮັດໄດ້ບໍ່ {0} {1} {2} ໂດຍບໍ່ມີການໃບເກັບເງິນທີ່ຍັງຄ້າງຄາໃນທາງລົບ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","ຈະໄດ້ຮັບການຜະລິດ. ຖ້າຫາກວ່າມີຄວາມຊັກຊ້າ, ທ່ານຈະຕ້ອງປ່ຽນ &quot;ເລື້ມຄືນໃນວັນຂອງເດືອນ&quot; ດ້ວຍຕົນເອງ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,ສາມາດເຮັດໄດ້ບໍ່ {0} {1} {2} ໂດຍບໍ່ມີການໃບເກັບເງິນທີ່ຍັງຄ້າງຄາໃນທາງລົບ
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ຊື້ Invoice Advance
-DocType: Hub Settings,Sync Now,Sync ໃນປັດຈຸບັນ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},ຕິດຕໍ່ກັນ {0}: ເຂົ້າ Credit ບໍ່ສາມາດໄດ້ຮັບການຕິດພັນກັບ {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,ກໍານົດງົບປະມານສໍາລັບປີການເງິນ.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,ມາດຕະຖານບັນຊີທະນາຄານ / ເງິນສົດຈະໄດ້ຮັບການປັບປຸງອັດຕະໂນມັດໃນ POS Invoice ໃນເວລາທີ່ຮູບແບບນີ້ແມ່ນການຄັດເລືອກ.
@@ -1110,13 +1131,13 @@
 DocType: Item,Is Purchase Item,ສັ່ງຊື້ສິນຄ້າ
 DocType: Asset,Purchase Invoice,ໃບເກັບເງິນຊື້
 DocType: Stock Ledger Entry,Voucher Detail No,ຂໍ້ມູນຄູປອງ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,ໃບເກັບເງິນໃນການຂາຍໃຫມ່
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,ໃບເກັບເງິນໃນການຂາຍໃຫມ່
 DocType: Stock Entry,Total Outgoing Value,ມູນຄ່າລາຍຈ່າຍທັງຫມົດ
 DocType: Physician,Appointments,ການນັດຫມາຍ
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,ເປີດວັນທີ່ສະຫມັກແລະວັນທີຢ່າງໃກ້ຊິດຄວນຈະຢູ່ພາຍໃນດຽວກັນຂອງປີງົບປະມານ
 DocType: Lead,Request for Information,ການຮ້ອງຂໍສໍາລັບການຂໍ້ມູນຂ່າວສານ
 ,LeaderBoard,ກະດານ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Sync Offline ໃບແຈ້ງຫນີ້
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Sync Offline ໃບແຈ້ງຫນີ້
 DocType: Payment Request,Paid,ການຊໍາລະເງິນ
 DocType: Program Fee,Program Fee,ຄ່າບໍລິການໂຄງການ
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1135,11 +1156,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,ການສັ່ງຊື້ສິນຄ້າ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,ລາຍໄດ້ທາງອ້ອມ
 DocType: Student Attendance Tool,Student Attendance Tool,ເຄື່ອງມືນັກສຶກສາເຂົ້າຮ່ວມ
+DocType: Restaurant Menu,Price List (Auto created),ລາຄາລາຄາ (ສ້າງໂດຍອັດຕະໂນມັດ)
 DocType: Cheque Print Template,Date Settings,ການຕັ້ງຄ່າວັນທີ່
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,ການປ່ຽນແປງ
 ,Company Name,ຊື່ບໍລິສັດ
 DocType: SMS Center,Total Message(s),ຂໍ້ຄວາມທັງຫມົດ (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,ເລືອກລາຍການສໍາລັບການຖ່າຍໂອນ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,ເລືອກລາຍການສໍາລັບການຖ່າຍໂອນ
 DocType: Purchase Invoice,Additional Discount Percentage,ເພີ່ມເຕີມຮ້ອຍສ່ວນລົດ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,ເບິ່ງບັນຊີລາຍຊື່ຂອງການທັງຫມົດການຊ່ວຍເຫຼືອວິດີໂອໄດ້
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ເລືອກຫົວບັນຊີຂອງທະນາຄານບ່ອນທີ່ເຊັກອິນໄດ້ຝາກ.
@@ -1157,6 +1179,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Meter
 DocType: Workstation,Electricity Cost,ຄ່າໃຊ້ຈ່າຍໄຟຟ້າ
 DocType: HR Settings,Don't send Employee Birthday Reminders,ບໍ່ໄດ້ສົ່ງພະນັກງານວັນເດືອນປີເກີດເຕືອນ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,ບັນທຶກການຕັ້ງຄ່າ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,ຜະລິດຕະພັນທີ່ຕ້ອງການ
 DocType: Item,Inspection Criteria,ເງື່ອນໄຂການກວດກາ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Transfered
 DocType: BOM Website Item,BOM Website Item,BOM Item ເວັບໄຊທ໌
@@ -1174,11 +1198,11 @@
 DocType: Journal Entry,Total Amount in Words,ຈໍານວນທັງຫມົດໃນຄໍາສັບຕ່າງໆ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,ມີຄວາມຜິດພາດ. ຫນຶ່ງໃນເຫດຜົນອາດຈະສາມາດຈະເປັນທີ່ທ່ານຍັງບໍ່ທັນໄດ້ບັນທຶກໄວ້ໃນແບບຟອມ. ກະລຸນາຕິດຕໍ່ຫາ support@erpnext.com ຖ້າຫາກວ່າບັນຫາຍັງຄົງ.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,ໂຄງຮ່າງການຂອງຂ້າພະເຈົ້າ
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},ປະເພດຕ້ອງໄດ້ຮັບການຫນຶ່ງຂອງ {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},ປະເພດຕ້ອງໄດ້ຮັບການຫນຶ່ງຂອງ {0}
 DocType: Lead,Next Contact Date,ຖັດໄປວັນທີ່
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,ເປີດຈໍານວນ
 DocType: Healthcare Settings,Appointment Reminder,Appointment Reminder
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,ກະລຸນາໃສ່ບັນຊີສໍາລັບການປ່ຽນແປງຈໍານວນເງິນ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,ກະລຸນາໃສ່ບັນຊີສໍາລັບການປ່ຽນແປງຈໍານວນເງິນ
 DocType: Student Batch Name,Student Batch Name,ຊື່ນັກ Batch
 DocType: Consultation,Doctor,ທ່ານຫມໍ
 DocType: Holiday List,Holiday List Name,ລາຍຊື່ຂອງວັນພັກ
@@ -1186,12 +1210,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,ຂອງລາຍວິຊາກໍານົດເວລາ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,ທາງເລືອກຫຼັກຊັບ
 DocType: Journal Entry Account,Expense Claim,ການຮ້ອງຂໍຄ່າໃຊ້ຈ່າຍ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,ທ່ານກໍ່ຕ້ອງການທີ່ຈະຟື້ນຟູຊັບສິນຢຸດນີ້?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},ຈໍານວນ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,ທ່ານກໍ່ຕ້ອງການທີ່ຈະຟື້ນຟູຊັບສິນຢຸດນີ້?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},ຈໍານວນ {0}
 DocType: Leave Application,Leave Application,ການນໍາໃຊ້ອອກ
 DocType: Patient,Patient Relation,Patient Relation
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,ອອກຈາກເຄື່ອງມືການຈັດສັນ
+DocType: Item,Hub Category to Publish,Category Hub ເພື່ອເຜີຍແຜ່
 DocType: Leave Block List,Leave Block List Dates,ອອກຈາກວັນ Block ຊີ
+DocType: Sales Invoice,Billing Address GSTIN,ທີ່ຢູ່ໃບບິນໃບບິນ GSTIN
 DocType: Workstation,Net Hour Rate,ອັດຕາຊົ່ວໂມງສຸດທິ
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,ລູກຈ້າງລາຄາຮັບຊື້
 DocType: Company,Default Terms,ເງື່ອນໄຂມາດຕະຖານ
@@ -1201,11 +1227,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},ກະລຸນາລະບຸ {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,ລາຍການໂຍກຍ້າຍອອກມີການປ່ຽນແປງໃນປະລິມານຫຼືມູນຄ່າບໍ່ມີ.
 DocType: Delivery Note,Delivery To,ການຈັດສົ່ງກັບ
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,ຕາຕະລາງຄຸນສົມບັດເປັນການບັງຄັບ
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,ຕາຕະລາງຄຸນສົມບັດເປັນການບັງຄັບ
 DocType: Production Planning Tool,Get Sales Orders,ໄດ້ຮັບໃບສັ່ງຂາຍ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ບໍ່ສາມາດຈະກະທົບທາງລົບ
 DocType: Training Event,Self-Study,ການສຶກສາຂອງຕົນເອງ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,ສ່ວນລົດ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,ສ່ວນລົດ
 DocType: Asset,Total Number of Depreciations,ຈໍານວນທັງຫມົດຂອງຄ່າເສື່ອມລາຄາ
 DocType: Sales Invoice Item,Rate With Margin,ອັດຕາດ້ວຍ Margin
 DocType: Sales Invoice Item,Rate With Margin,ອັດຕາດ້ວຍ Margin
@@ -1213,7 +1239,7 @@
 DocType: Task,Urgent,ການອັນຮີບດ່ວນ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},ກະລຸນາລະບຸ ID Row ທີ່ຖືກຕ້ອງສໍາລັບການຕິດຕໍ່ກັນ {0} ໃນຕາຕະລາງ {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,ບໍ່ສາມາດຊອກຫາການປ່ຽນແປງ:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,ກະລຸນາເລືອກພາກສະຫນາມເພື່ອແກ້ໄຂຈາກຈໍານວນເງິນ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,ກະລຸນາເລືອກພາກສະຫນາມເພື່ອແກ້ໄຂຈາກຈໍານວນເງິນ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,ໄປ Desktop ແລະເລີ່ມຕົ້ນການນໍາໃຊ້ ERPNext
 DocType: Item,Manufacturer,ຜູ້ຜະລິດ
 DocType: Landed Cost Item,Purchase Receipt Item,ຊື້ຮັບສິນຄ້າ
@@ -1244,8 +1270,8 @@
 DocType: GL Entry,Against,ຕໍ່
 DocType: Item,Default Selling Cost Center,ມາດຕະຖານສູນຕົ້ນທຶນຂາຍ
 DocType: Sales Partner,Implementation Partner,Partner ການປະຕິບັດ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,ລະຫັດໄປສະນີ
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},ໃບສັ່ງຂາຍ {0} ເປັນ {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,ລະຫັດໄປສະນີ
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},ໃບສັ່ງຂາຍ {0} ເປັນ {1}
 DocType: Opportunity,Contact Info,ຂໍ້ມູນຕິດຕໍ່
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,ເຮັດໃຫ້ການອອກສຽງ Stock
 DocType: Packing Slip,Net Weight UOM,ສຸດທິ UOM ນ້ໍາຫນັກ
@@ -1256,6 +1282,7 @@
 DocType: Holiday List,Get Weekly Off Dates,ໄດ້ຮັບປະຈໍາອາທິດ Off ວັນ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,ວັນທີ່ສິ້ນສຸດບໍ່ສາມາດຈະຫນ້ອຍກ່ວາການເລີ່ມຕົ້ນວັນທີ່
 DocType: Sales Person,Select company name first.,ເລືອກຊື່ບໍລິສັດທໍາອິດ.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,ສູງເຖິງສູງ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ສະເຫນີລາຄາທີ່ໄດ້ຮັບຈາກຜູ້ຜະລິດ.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,ແທນທີ່ BOM ແລະປັບປຸງລາຄາຫລ້າສຸດໃນ Boms ທັງຫມົດ
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},ເພື່ອ {0} | {1} {2}
@@ -1276,7 +1303,7 @@
 DocType: Program Enrollment,Transportation,ການຂົນສົ່ງ
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,ຄຸນລັກສະນະທີ່ບໍ່ຖືກຕ້ອງ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} ຕ້ອງໄດ້ຮັບການສົ່ງ
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},ປະລິມານຈະຕ້ອງຫນ້ອຍກ່ວາຫຼືເທົ່າກັບ {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},ປະລິມານຈະຕ້ອງຫນ້ອຍກ່ວາຫຼືເທົ່າກັບ {0}
 DocType: SMS Center,Total Characters,ລັກສະນະທັງຫມົດ
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},ກະລຸນາເລືອກ BOM ໃນພາກສະຫນາມ BOM ສໍາລັບລາຍການ {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C ແບບຟອມໃບແຈ້ງຫນີ້ຂໍ້ມູນ
@@ -1291,7 +1318,7 @@
 ,Ordered Items To Be Billed,ລາຍການຄໍາສັ່ງຈະ billed
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,ຈາກລະດັບທີ່ຈະຫນ້ອຍມີກ່ວາເພື່ອ Range
 DocType: Global Defaults,Global Defaults,ຄ່າເລີ່ມຕົ້ນຂອງໂລກ
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,ເຊີນຮ່ວມມືໂຄງການ
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,ເຊີນຮ່ວມມືໂຄງການ
 DocType: Salary Slip,Deductions,ຫັກຄ່າໃຊ້ຈ່າຍ
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,ປະຕິບັດຊື່
@@ -1309,13 +1336,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,ຂາຍ Invoice Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,ບໍ່ມີຫຍັງໃນການຮ້ອງຂໍ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},ບັນທຶກງົບປະມານອີກປະການຫນຶ່ງ &#39;{0}&#39; ແລ້ວຢູ່ຕໍ່ {1} &#39;{2}&#39; ສໍາລັບປີງົບປະມານ {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&#39;ທີ່ແທ້ຈິງວັນທີ່ເລີ່ມຕົ້ນ &quot;ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ&#39; ຈິງ End Date &#39;
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&#39;ທີ່ແທ້ຈິງວັນທີ່ເລີ່ມຕົ້ນ &quot;ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ&#39; ຈິງ End Date &#39;
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,ການຈັດການ
 DocType: Cheque Print Template,Payer Settings,ການຕັ້ງຄ່າ payer
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ນີ້ຈະໄດ້ຮັບການຜນວກເຂົ້າກັບຂໍ້ມູນລະຫັດຂອງຕົວແປ. ສໍາລັບການຍົກຕົວຢ່າງ, ຖ້າຫາກວ່າຕົວຫຍໍ້ຂອງທ່ານແມ່ນ &quot;SM&quot;, ແລະລະຫັດສິນຄ້າແມ່ນ &quot;ເສື້ອທີເຊີດ&quot;, ລະຫັດສິນຄ້າຂອງ variant ຈະ &quot;ເສື້ອທີເຊີດ, SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,ຈ່າຍສຸດທິ (ໃນຄໍາສັບຕ່າງໆ) ຈະສັງເກດເຫັນເມື່ອທ່ານຊ່ວຍປະຢັດ Slip ເງິນເດືອນໄດ້.
 DocType: Purchase Invoice,Is Return,ແມ່ນກັບຄືນ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,ລະມັດລະວັງ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,ລະມັດລະວັງ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Return / ເດບິດຫມາຍເຫດ
 DocType: Price List Country,Price List Country,ລາຄາປະເທດ
 DocType: Item,UOMs,UOMs
@@ -1330,17 +1357,18 @@
 DocType: Account,Balance Sheet,ງົບດຸນ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',ສູນເສຍຄ່າໃຊ້ຈ່າຍສໍາລັບການລາຍການທີ່ມີລະຫັດສິນຄ້າ &#39;
 DocType: Fee Validity,Valid Till,ຖືກຕ້ອງ Till
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ການຊໍາລະເງິນບໍ່ໄດ້ຖືກຕັ້ງ. ກະລຸນາກວດສອບ, ບໍ່ວ່າຈະເປັນບັນຊີໄດ້ຮັບການກໍານົດກ່ຽວກັບຮູບແບບການຊໍາລະເງິນຫຼືຂໍ້ມູນ POS."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ການຊໍາລະເງິນບໍ່ໄດ້ຖືກຕັ້ງ. ກະລຸນາກວດສອບ, ບໍ່ວ່າຈະເປັນບັນຊີໄດ້ຮັບການກໍານົດກ່ຽວກັບຮູບແບບການຊໍາລະເງິນຫຼືຂໍ້ມູນ POS."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,ລາຍການແມ່ນບໍ່ສາມາດເຂົ້າໄປໃນເວລາຫຼາຍ.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","ບັນຊີເພີ່ມເຕີມສາມາດເຮັດໄດ້ພາຍໃຕ້ການກຸ່ມ, ແຕ່ການອອກສຽງສາມາດຈະດໍາເນີນຕໍ່ບໍ່ແມ່ນ Groups"
 DocType: Lead,Lead,ເປັນຜູ້ນໍາພາ
 DocType: Email Digest,Payables,ເຈົ້າຫນີ້
 DocType: Course,Course Intro,ຫລັກສູດ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Stock Entry {0} ສ້າງ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ກະລຸນາຕິດຕັ້ງຈໍານວນຊຸດສໍາລັບການເຂົ້າຮ່ວມໂດຍຜ່ານ Setup&gt; ເລກລໍາດັບ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Stock Entry {0} ສ້າງ
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,"ຕິດຕໍ່ກັນ, {0}: ປະຕິເສດຈໍານວນບໍ່ສາມາດໄດ້ຮັບເຂົ້າໄປໃນກັບຄືນຊື້"
 ,Purchase Order Items To Be Billed,ລາຍການສັ່ງຊື້ເພື່ອໄດ້ຮັບການ billed
 DocType: Purchase Invoice Item,Net Rate,ອັດຕາສຸດທິ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,ກະລຸນາເລືອກລູກຄ້າ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,ກະລຸນາເລືອກລູກຄ້າ
 DocType: Purchase Invoice Item,Purchase Invoice Item,ຊື້ໃບແຈ້ງຫນີ້ສິນຄ້າ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Ledger Entries and GL Entries ແມ່ນ reposted ສໍາລັບຮັບຊື້ເລືອກ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,ລາຍການ 1
@@ -1361,7 +1389,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},ຕິດຕໍ່ກັນຊ້ໍາກັນ {0} ກັບດຽວກັນ {1}
 ,Trial Balance,trial Balance
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,ປີງົບປະມານ {0} ບໍ່ໄດ້ພົບເຫັນ
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,ການສ້າງຕັ້ງພະນັກງານ
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,ການສ້າງຕັ້ງພະນັກງານ
 DocType: Sales Order,SO-,ພົນລະ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,ກະລຸນາເລືອກຄໍານໍາຫນ້າທໍາອິດ
 DocType: Employee,O-,O-
@@ -1373,12 +1401,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,View Ledger
 DocType: Grading Scale,Intervals,ໄລຍະ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ທໍາອິດ
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","ເປັນກຸ່ມສິນຄ້າລາຄາທີ່ມີຊື່ດຽວກັນ, ກະລຸນາມີການປ່ຽນແປງຊື່ສິນຄ້າຫລືປ່ຽນຊື່ກຸ່ມລາຍການ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","ເປັນກຸ່ມສິນຄ້າລາຄາທີ່ມີຊື່ດຽວກັນ, ກະລຸນາມີການປ່ຽນແປງຊື່ສິນຄ້າຫລືປ່ຽນຊື່ກຸ່ມລາຍການ"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,ເລກນັກສຶກສາໂທລະສັບມືຖື
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,ສ່ວນທີ່ເຫຼືອຂອງໂລກ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,ສ່ວນທີ່ເຫຼືອຂອງໂລກ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,ລາຍການ {0} ບໍ່ສາມາດມີ Batch
 ,Budget Variance Report,ງົບປະມານລາຍຕ່າງ
 DocType: Salary Slip,Gross Pay,ຈ່າຍລວມທັງຫມົດ
+DocType: Item,Is Item from Hub,ແມ່ນຈຸດຈາກ Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,ຕິດຕໍ່ກັນ {0}: ປະເພດຂອງກິດຈະກໍາແມ່ນບັງຄັບ.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,ເງິນປັນຜົນການຊໍາລະເງິນ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Ledger ການບັນຊີ
@@ -1388,8 +1417,9 @@
 DocType: Vehicle Log,Service Detail,ບໍລິການ
 DocType: BOM,Item Description,ລາຍລະອຽດສິນຄ້າ
 DocType: Student Sibling,Student Sibling,ລູກຫຼານນັກສຶກສາ
-DocType: Purchase Invoice,Is Recurring,ແມ່ນ Recurring
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,ໂຫມດການຊໍາລະເງິນ
 DocType: Purchase Invoice,Supplied Items,ລາຍະການ Supplied
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},ກະລຸນາຕັ້ງເມນູທີ່ໃຊ້ສໍາລັບຮ້ານອາຫານ {0}
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,ຈໍານວນການຜະລິດ
 DocType: Email Digest,New Income,ລາຍໄດ້ໃຫມ່
@@ -1400,6 +1430,7 @@
 ,Student and Guardian Contact Details,ນັກສຶກສາແລະຂໍ້ມູນຕິດຕໍ່ຜູ້ປົກຄອງ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,ຕິດຕໍ່ກັນ {0}: ສໍາລັບຜູ້ສະຫນອງ {0} ທີ່ຢູ່ອີເມວທີ່ຈໍາເປັນຕ້ອງສົ່ງອີເມວ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,ເປີດຊົ່ວຄາວ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,View Hub
 ,Employee Leave Balance,ພະນັກງານອອກຈາກດຸນ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},ການດຸ່ນດ່ຽງບັນຊີ {0} ຕ້ອງສະເຫມີໄປຈະ {1}
 DocType: Patient Appointment,More Info,ຂໍ້ມູນເພີ່ມເຕີມ
@@ -1419,13 +1450,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,ໃບສັ່ງຂາຍ {0} ບໍ່ຖືກຕ້ອງ
 DocType: Supplier Scorecard,Warn for new Request for Quotations,ເຕືອນສໍາລັບການຮ້ອງຂໍສໍາລັບວົງຢືມ
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,ສັ່ງຊື້ຊ່ວຍໃຫ້ທ່ານວາງແຜນແລະປະຕິບັດຕາມເຖິງກ່ຽວກັບການຊື້ຂອງທ່ານ
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","ຂໍອະໄພ, ບໍລິສັດບໍ່ສາມາດລວມ"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","ຂໍອະໄພ, ບໍລິສັດບໍ່ສາມາດລວມ"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab test Test
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",ປະລິມານທີ່ຈົດທະບຽນ / ການຖ່າຍໂອນທັງຫມົດ {0} ໃນວັດສະດຸການຈອງ {1} \ ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາປະລິມານການຮ້ອງຂໍ {2} ສໍາລັບລາຍການ {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,ຂະຫນາດນ້ອຍ
 DocType: Employee,Employee Number,ຈໍານວນພະນັກງານ
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},ກໍລະນີທີ່ບໍ່ມີ (s) ມາແລ້ວໃນການນໍາໃຊ້. ພະຍາຍາມຈາກກໍລະນີທີ່ບໍ່ມີ {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},ກໍລະນີທີ່ບໍ່ມີ (s) ມາແລ້ວໃນການນໍາໃຊ້. ພະຍາຍາມຈາກກໍລະນີທີ່ບໍ່ມີ {0}
 DocType: Project,% Completed,% ສໍາເລັດ
 ,Invoiced Amount (Exculsive Tax),ອະນຸຈໍານວນເງິນ (exculsive ພາສີ)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,ລາຍການ 2
@@ -1440,11 +1471,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,ຄ່າໃຊ້ຈ່າຍທາງອ້ອມ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,ຕິດຕໍ່ກັນ {0}: ຈໍານວນເປັນການບັງຄັບ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,ການກະສິກໍາ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sync ຂໍ້ມູນຫລັກ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sync ຂໍ້ມູນຫລັກ
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,ຜະລິດຕະພັນຫຼືການບໍລິການຂອງທ່ານ
 DocType: Special Test Items,Special Test Items,Special Test Items
 DocType: Mode of Payment,Mode of Payment,ຮູບແບບການຊໍາລະເງິນ
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,ເວັບໄຊທ໌ຮູບພາບຄວນຈະເປັນເອກະສານສາທາລະນະຫຼືທີ່ຢູ່ເວັບເວັບໄຊທ໌
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,ເວັບໄຊທ໌ຮູບພາບຄວນຈະເປັນເອກະສານສາທາລະນະຫຼືທີ່ຢູ່ເວັບເວັບໄຊທ໌
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,ນີ້ເປັນກຸ່ມລາຍການຮາກແລະບໍ່ສາມາດໄດ້ຮັບການແກ້ໄຂ.
@@ -1452,9 +1483,9 @@
 DocType: Vehicle,Fuel UOM,ນໍ້າມັນເຊື້ອໄຟ UOM
 DocType: Warehouse,Warehouse Contact Info,Warehouse ຂໍ້ມູນຕິດຕໍ່
 DocType: Payment Entry,Write Off Difference Amount,ຂຽນ Off ຈໍານວນທີ່ແຕກຕ່າງກັນ
-DocType: Purchase Invoice,Recurring Type,Recurring ປະເພດ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: ບໍ່ໄດ້ພົບເຫັນ email ພະນັກງານ, ເພາະສະນັ້ນອີເມວບໍ່ໄດ້ສົ່ງ"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: ບໍ່ໄດ້ພົບເຫັນ email ພະນັກງານ, ເພາະສະນັ້ນອີເມວບໍ່ໄດ້ສົ່ງ"
 DocType: Item,Foreign Trade Details,ລາຍລະອຽດການຄ້າຕ່າງປະເທດ
+,Assessment Plan Status,ສະຖານະພາບແຜນການປະເມີນຜົນ
 DocType: Email Digest,Annual Income,ລາຍຮັບປະຈໍາປີ
 DocType: Serial No,Serial No Details,Serial ລາຍລະອຽດບໍ່ມີ
 DocType: Purchase Invoice Item,Item Tax Rate,ອັດຕາພາສີສິນຄ້າ
@@ -1462,15 +1493,14 @@
 DocType: Student Group Student,Group Roll Number,Group ຈໍານວນມ້ວນ
 DocType: Student Group Student,Group Roll Number,Group ຈໍານວນມ້ວນ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, ພຽງແຕ່ລະເງິນກູ້ຢືມສາມາດໄດ້ຮັບການເຊື່ອມຕໍ່ເຂົ້າເດບິດອື່ນ"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,ຈໍານວນທັງຫມົດຂອງທັງຫມົດນ້ໍາວຽກງານຄວນຈະ 1. ກະລຸນາປັບປຸງນ້ໍາຂອງວຽກງານໂຄງການທັງຫມົດຕາມຄວາມເຫມາະສົມ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,ສົ່ງຫມາຍເຫດ {0} ບໍ່ໄດ້ສົ່ງ
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,ຈໍານວນທັງຫມົດຂອງທັງຫມົດນ້ໍາວຽກງານຄວນຈະ 1. ກະລຸນາປັບປຸງນ້ໍາຂອງວຽກງານໂຄງການທັງຫມົດຕາມຄວາມເຫມາະສົມ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,ສົ່ງຫມາຍເຫດ {0} ບໍ່ໄດ້ສົ່ງ
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,ລາຍການ {0} ຈະຕ້ອງເປັນອະນຸສັນຍາລາຍການ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,ອຸປະກອນນະຄອນຫຼວງ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","ກົດລະບຽບການຕັ້ງລາຄາໄດ້ຖືກຄັດເລືອກທໍາອິດໂດຍອີງໃສ່ &#39;ສະຫມັກຕໍາກ່ຽວກັບ&#39; ພາກສະຫນາມ, ທີ່ສາມາດຈະມີລາຍການ, ກຸ່ມສິນຄ້າຫຼືຍີ່ຫໍ້."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,ກະລຸນາຕັ້ງມູນລະຫັດທໍາອິດ
-DocType: Hub Settings,Seller Website,ຜູ້ຂາຍເວັບໄຊທ໌
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,ກະລຸນາຕັ້ງມູນລະຫັດທໍາອິດ
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,ອັດຕາສ່ວນການຈັດສັນທັງຫມົດສໍາລັບທີມງານການຂາຍຄວນຈະເປັນ 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,ອັດຕາສ່ວນການຈັດສັນທັງຫມົດສໍາລັບທີມງານການຂາຍຄວນຈະເປັນ 100
 DocType: Sales Invoice Item,Edit Description,ແກ້ໄຂລາຍລະອຽດ
 DocType: Antibiotic,Antibiotic,ຢາຕ້ານເຊື້ອ
 ,Team Updates,ການປັບປຸງທີມງານ
@@ -1491,12 +1521,12 @@
 DocType: Purchase Invoice,Total (Company Currency),ທັງຫມົດ (ບໍລິສັດສະກຸນເງິນ)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,ຈໍານວນ Serial {0} ເຂົ້າໄປຫຼາຍກ່ວາຫນຶ່ງຄັ້ງ
 DocType: Depreciation Schedule,Journal Entry,ວາລະສານການອອກສຽງ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} ລາຍການມີຄວາມຄືບຫນ້າ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} ລາຍການມີຄວາມຄືບຫນ້າ
 DocType: Workstation,Workstation Name,ຊື່ Workstation
 DocType: Grading Scale Interval,Grade Code,ລະຫັດ Grade
 DocType: POS Item Group,POS Item Group,ກຸ່ມສິນຄ້າ POS
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ອີເມວສໍາຄັນ:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} ບໍ່ໄດ້ຂຶ້ນກັບ Item {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} ບໍ່ໄດ້ຂຶ້ນກັບ Item {1}
 DocType: Sales Partner,Target Distribution,ການແຜ່ກະຈາຍເປົ້າຫມາຍ
 DocType: Salary Slip,Bank Account No.,ເລກທີ່ບັນຊີທະນາຄານ
 DocType: Naming Series,This is the number of the last created transaction with this prefix,ນີ້ແມ່ນຈໍານວນຂອງການສ້າງຕັ້ງຂື້ນໃນທີ່ຜ່ານມາມີຄໍານໍາຫນ້ານີ້
@@ -1513,10 +1543,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,ການຮ້ອງຂໍສໍາລັບການຜະລິດສະເຫນີລາຄາ
 DocType: Healthcare Settings,Registration Message,ຂໍ້ຄວາມລົງທະບຽນ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,ອຸປະກອນ
-DocType: Sales Order,Recurring Upto,Recurring ເກີນ
 DocType: Prescription Dosage,Prescription Dosage,Prescription Dosage
 DocType: Attendance,HR Manager,Manager HR
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,ກະລຸນາເລືອກບໍລິສັດ
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,ກະລຸນາເລືອກບໍລິສັດ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,ສິດທິພິເສດອອກຈາກ
 DocType: Purchase Invoice,Supplier Invoice Date,ຜູ້ສະຫນອງວັນໃບກໍາກັບ
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,ຕໍ່
@@ -1532,10 +1561,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,ເງື່ອນໄຂທີ່ທັບຊ້ອນກັນພົບເຫັນລະຫວ່າງ:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,ຕໍ່ຕ້ານອະນຸ {0} ຈະຖືກປັບແລ້ວຕໍ່ບາງ voucher ອື່ນໆ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,ມູນຄ່າການສັ່ງຊື້ທັງຫມົດ
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,ສະບຽງອາຫານ
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,ສະບຽງອາຫານ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Range Ageing 3
 DocType: Maintenance Schedule Item,No of Visits,ບໍ່ມີການລົງໂທດ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},ຕາຕະລາງການບໍາລຸງຮັກ {0} ມີຢູ່ຕ້ານ {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,ທ່ານຕ້ອງການເຜີຍແຜ່ລາຍການຂອງທ່ານໄປ Hub?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,ນັກສຶກສາລົງທະບຽນຮຽນ
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},ສະກຸນເງິນຂອງບັນຊີປິດຈະຕ້ອງ {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},ຜົນບວກຂອງຈຸດສໍາລັບເປົ້າຫມາຍທັງຫມົດຄວນຈະເປັນ 100 ມັນເປັນ {0}
@@ -1546,9 +1576,9 @@
 DocType: Authorization Rule,Average Discount,ສ່ວນລົດສະເລ່ຍປະຈໍາ
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,ລະນູປະໂພກ
-DocType: Purchase Invoice Item,Accounting,ການບັນຊີ
+DocType: POS Profile,Accounting,ການບັນຊີ
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,ກະລຸນາເລືອກຂະບວນການສໍາລັບລາຍການ batch
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,ກະລຸນາເລືອກຂະບວນການສໍາລັບລາຍການ batch
 DocType: Asset,Depreciation Schedules,ຕາຕະລາງຄ່າເສື່ອມລາຄາ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,ໄລຍະເວລາການນໍາໃຊ້ບໍ່ສາມາດເປັນໄລຍະເວການຈັດສັນອອກຈາກພາຍນອກ
 DocType: Activity Cost,Projects,ໂຄງການ
@@ -1564,7 +1594,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',ສະຖານະການອະນຸມັດຕ້ອງໄດ້ຮັບການ &#39;ອະນຸມັດ&#39; ຫລື &#39;ປະຕິເສດ&#39;
 DocType: Physician,Contacts and Address,ຕິດຕໍ່ແລະທີ່ຢູ່
 DocType: Purchase Invoice,Contact Person,ຕິດຕໍ່ບຸກຄົນ
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&#39;ວັນທີຄາດວ່າເລີ່ມຕົ້ນ &quot;ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ&#39; ວັນທີຄາດວ່າສຸດທ້າຍ &#39;
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&#39;ວັນທີຄາດວ່າເລີ່ມຕົ້ນ &quot;ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ&#39; ວັນທີຄາດວ່າສຸດທ້າຍ &#39;
 DocType: Course Scheduling Tool,Course End Date,ແນ່ນອນວັນທີ່ສິ້ນສຸດ
 DocType: Holiday List,Holidays,ວັນພັກ
 DocType: Sales Order Item,Planned Quantity,ການວາງແຜນຈໍານວນ
@@ -1572,10 +1602,11 @@
 DocType: Item,Maintain Stock,ຮັກສາ Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Stock Entries ສ້າງຮຽບຮ້ອຍແລ້ວສໍາລັບການສັ່ງຊື້ສິນຄ້າ
 DocType: Employee,Prefered Email,ບຸລິມະສິດ Email
+DocType: Student Admission,Eligibility and Details,ສິດແລະລາຍລະອຽດ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,ການປ່ຽນແປງສຸດທິໃນຊັບສິນຄົງທີ່
 DocType: Leave Control Panel,Leave blank if considered for all designations,ໃຫ້ຫວ່າງໄວ້ຖ້າພິຈາລະນາສໍາລັບການອອກແບບທັງຫມົດ
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ຮັບຜິດຊອບຂອງປະເພດ &#39;ທີ່ແທ້ຈິງໃນການຕິດຕໍ່ກັນ {0} ບໍ່ສາມາດລວມຢູ່ໃນລາຄາສິນຄ້າ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},ສູງສຸດທີ່ເຄຍ: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},ສູງສຸດທີ່ເຄຍ: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,ຈາກ DATETIME
 DocType: Email Digest,For Company,ສໍາລັບບໍລິສັດ
 apps/erpnext/erpnext/config/support.py +17,Communication log.,ເຂົ້າສູ່ລະບົບການສື່ສານ.
@@ -1583,19 +1614,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,ຈໍານວນການຊື້
 DocType: Sales Invoice,Shipping Address Name,Shipping Address ຊື່
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,ຕາຕະລາງຂອງການບັນຊີ
 DocType: Material Request,Terms and Conditions Content,ຂໍ້ກໍານົດແລະເງື່ອນໄຂເນື້ອໃນ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,ບໍ່ສາມາດຈະຫຼາຍກ່ວາ 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,ລາຍການ {0} ບໍ່ແມ່ນຫົວຂໍ້ຫຼັກຊັບ
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,ລາຍການ {0} ບໍ່ແມ່ນຫົວຂໍ້ຫຼັກຊັບ
 DocType: Maintenance Visit,Unscheduled,ນອກເຫນືອຈາກ
 DocType: Employee,Owned,ເປັນເຈົ້າຂອງ
 DocType: Salary Detail,Depends on Leave Without Pay,ຂຶ້ນຢູ່ກັບອອກໂດຍບໍ່ມີການຈ່າຍ
 DocType: Pricing Rule,"Higher the number, higher the priority","ສູງກວ່າຕົວເລກທີ່, ທີ່ສູງກວ່າບູລິມະສິດ"
 ,Purchase Invoice Trends,ຊື້ແນວໂນ້ມ Invoice
 DocType: Employee,Better Prospects,ອະນາຄົດທີ່ດີກວ່າ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","ແຖວ # {0}: ການ batch {1} ມີພຽງແຕ່ {2} ຈໍານວນ. ກະລຸນາເລືອກ batch ທີ່ມີ {3} ຈໍານວນສາມາດໃຊ້ໄດ້ອີກຫລືແຍກແຖວເປັນແຖວເກັດທີ່ຢູ່ຫຼາຍ, ເພື່ອສົ່ງ / ບັນຫາຈາກຂະບວນການທີ່ຫຼາກຫຼາຍ"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","ແຖວ # {0}: ການ batch {1} ມີພຽງແຕ່ {2} ຈໍານວນ. ກະລຸນາເລືອກ batch ທີ່ມີ {3} ຈໍານວນສາມາດໃຊ້ໄດ້ອີກຫລືແຍກແຖວເປັນແຖວເກັດທີ່ຢູ່ຫຼາຍ, ເພື່ອສົ່ງ / ບັນຫາຈາກຂະບວນການທີ່ຫຼາກຫຼາຍ"
 DocType: Vehicle,License Plate,ແຜ່ນໃບອະນຸຍາດ
 DocType: Appraisal,Goals,ເປົ້າຫມາຍ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,ເລືອກລາຍຊື່ POS
 DocType: Warranty Claim,Warranty / AMC Status,ການຮັບປະກັນ / AMC ສະຖານະ
 ,Accounts Browser,ບັນຊີຂອງຕົວທ່ອງເວັບ
 DocType: Payment Entry Reference,Payment Entry Reference,ເອກະສານການອອກສຽງການຊໍາລະເງິນ
@@ -1613,7 +1644,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,ພະນັກງານບໍ່ສາມາດລາຍງານໃຫ້ຕົນເອງ.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","ຖ້າຫາກວ່າບັນຊີແມ່ນ frozen, entries ກໍາລັງອະນຸຍາດໃຫ້ຜູ້ຊົມໃຊ້ຈໍາກັດ."
 DocType: Email Digest,Bank Balance,ທະນາຄານ Balance
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Entry ບັນຊີສໍາລັບ {0}: {1} ສາມາດເຮັດໄດ້ພຽງແຕ່ຢູ່ໃນສະກຸນເງິນ: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Entry ບັນຊີສໍາລັບ {0}: {1} ສາມາດເຮັດໄດ້ພຽງແຕ່ຢູ່ໃນສະກຸນເງິນ: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","profile ວຽກເຮັດງານທໍາ, ຄຸນນະວຸດທິທີ່ຕ້ອງການແລະອື່ນໆ"
 DocType: Journal Entry Account,Account Balance,ດຸນບັນຊີ
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,ກົດລະບຽບອາກອນສໍາລັບທຸລະກໍາ.
@@ -1622,8 +1653,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),ພາສີອາກອນທັງຫມົດແລະຄ່າບໍລິການ (ສະກຸນເງິນຂອງບໍລິສັດ)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,ສະແດງໃຫ້ເຫັນ P &amp; ຍອດ L ປີງົບປະມານ unclosed ຂອງ
 DocType: Lab Test Template,Collection Details,Details Collection
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","ເລືອກ cp.name, cp.test_code, cp.parent, cp.invoice, ctphysician, ct.consultation_date ຈາກ tabConsultation ct, `tabLab Prescription` cp ທີ່ ctpatient = &#39;{0}&#39; ແລະ cp.parent = ct. ຊື່ແລະ cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,ບັນຊີ Shipping
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} ແມ່ນ inactive
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,ເຮັດໃຫ້ຄໍາສັ່ງການຂາຍຈະຊ່ວຍໃຫ້ທ່ານວາງແຜນການເຮັດວຽກຂອງທ່ານແລະໃຫ້ສຸດທີ່ໃຊ້ເວລາ
@@ -1640,7 +1669,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,ບັນຈຸ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,ຫ້ອງການໃຫ້ເຊົ່າ
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,ການຕັ້ງຄ່າປະຕູການຕິດຕັ້ງ SMS
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,ການນໍາເຂົ້າບໍ່ສາມາດ!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,ການນໍາເຂົ້າບໍ່ສາມາດ!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,ບໍ່ມີທີ່ຢູ່ເພີ່ມທັນ.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation ຊົ່ວໂມງເຮັດວຽກ
 DocType: Vital Signs,Blood Pressure,ຄວາມດັນເລືອດ
@@ -1665,7 +1694,7 @@
 DocType: Sales Invoice,Source,ແຫຼ່ງຂໍ້ມູນ
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,ສະແດງໃຫ້ເຫັນປິດ
 DocType: Leave Type,Is Leave Without Pay,ແມ່ນອອກຈາກໂດຍບໍ່ມີການຈ່າຍ
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,ປະເພດຊັບສິນທີ່ເປັນການບັງຄັບສໍາລັບລາຍການຊັບສິນຄົງທີ່
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,ປະເພດຊັບສິນທີ່ເປັນການບັງຄັບສໍາລັບລາຍການຊັບສິນຄົງທີ່
 DocType: Fee Validity,Fee Validity,Fee Validity
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,ບໍ່ມີພົບເຫັນຢູ່ໃນຕາຕະລາງການຊໍາລະເງິນການບັນທຶກການ
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},ນີ້ {0} ຄວາມຂັດແຍ້ງກັບ {1} ສໍາລັບ {2} {3}
@@ -1686,8 +1715,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ຄົ້ນຫາການບໍລິຫານ
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,ສ້າງ Leads
 DocType: Maintenance Schedule,Schedules,ຕາຕະລາງ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,ໂປຼແກຼມ POS ຕ້ອງໃຊ້ Point-of-Sale
 DocType: Purchase Invoice Item,Net Amount,ຈໍານວນສຸດທິ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} ຍັງບໍ່ທັນໄດ້ສົ່ງສະນັ້ນການດໍາເນີນການບໍ່ສາມາດໄດ້ຮັບການສໍາເລັດ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} ຍັງບໍ່ທັນໄດ້ສົ່ງສະນັ້ນການດໍາເນີນການບໍ່ສາມາດໄດ້ຮັບການສໍາເລັດ
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM ຂໍ້ມູນທີ່ບໍ່ມີ
 DocType: Landed Cost Voucher,Additional Charges,ຄ່າບໍລິການເພີ່ມເຕີມ
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),ຈໍານວນລົດເພີ່ມເຕີມ (ສະກຸນເງິນຂອງບໍລິສັດ)
@@ -1696,7 +1726,7 @@
 ,Support Hour Distribution,ການແຜ່ກະຈາຍສະຫນັບສະຫນູນຊົ່ວໂມງ
 DocType: Maintenance Visit,Maintenance Visit,ບໍາລຸງຮັກສາ Visit
 DocType: Student,Leaving Certificate Number,ຊຶ່ງເຮັດໃຫ້ຈໍານວນໃບຢັ້ງຢືນການ
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","ການນັດຫມາຍຖືກຍົກເລີກ, ກະລຸນາທົບທວນແລະຍົກເລີກໃບບິນ {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","ການນັດຫມາຍຖືກຍົກເລີກ, ກະລຸນາທົບທວນແລະຍົກເລີກໃບບິນ {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Batch ມີຈໍານວນຢູ່ໃນສາງ
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,ຮູບແບບການພິມການປັບປຸງ
 DocType: Landed Cost Voucher,Landed Cost Help,ລູກຈ້າງຊ່ວຍເຫລືອຄ່າໃຊ້ຈ່າຍ
@@ -1719,8 +1749,8 @@
 DocType: Patient,Tobacco Past Use,Tobacco Past Use
 DocType: Sales Invoice Item,Brand Name,ຊື່ຍີ່ຫໍ້
 DocType: Purchase Receipt,Transporter Details,ລາຍລະອຽດການຂົນສົ່ງ
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},ຜູ້ໃຊ້ {0} ຖືກມອບໃຫ້ແພດຫມໍ {1} ແລ້ວ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,ສາງມາດຕະຖານທີ່ຕ້ອງການສໍາລັບການເລືອກເອົາລາຍການ
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},ຜູ້ໃຊ້ {0} ຖືກມອບໃຫ້ແພດຫມໍ {1} ແລ້ວ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,ສາງມາດຕະຖານທີ່ຕ້ອງການສໍາລັບການເລືອກເອົາລາຍການ
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Box
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,ຜູ້ຜະລິດທີ່ເປັນໄປໄດ້
 DocType: Budget,Monthly Distribution,ການແຜ່ກະຈາຍປະຈໍາເດືອນ
@@ -1730,8 +1760,8 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner ເປົ້າຫມາຍ
 DocType: Loan Type,Maximum Loan Amount,ຈໍານວນເງິນກູ້ສູງສຸດ
 DocType: Pricing Rule,Pricing Rule,ກົດລະບຽບການຕັ້ງລາຄາ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},ຈໍານວນມ້ວນຊ້ໍາກັນສໍາລັບນັກຮຽນ {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},ຈໍານວນມ້ວນຊ້ໍາກັນສໍາລັບນັກຮຽນ {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},ຈໍານວນມ້ວນຊ້ໍາກັນສໍາລັບນັກຮຽນ {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},ຈໍານວນມ້ວນຊ້ໍາກັນສໍາລັບນັກຮຽນ {0}
 DocType: Budget,Action if Annual Budget Exceeded,ການປະຕິບັດຖ້າຫາກວ່າງົບປະມານປະຈໍາປີເກີນ
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,ຂໍອຸປະກອນການການສັ່ງຊື້
 DocType: Shopping Cart Settings,Payment Success URL,ການຊໍາລະເງິນ URL ສົບຜົນສໍາເລັດ
@@ -1748,7 +1778,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} ຈະຕ້ອງປາກົດພຽງແຕ່ຄັ້ງດຽວ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},ບໍ່ອະນຸຍາດໃຫ້ໂອນຫຼາຍ {0} ກວ່າ {1} ຕໍ່ສັ່ງຊື້ {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},ໃບຈັດສັນສົບຜົນສໍາເລັດສໍາລັບການ {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,ບໍ່ມີສິນຄ້າທີ່ຈະຊອງ
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,ບໍ່ມີສິນຄ້າທີ່ຈະຊອງ
 DocType: Shipping Rule Condition,From Value,ຈາກມູນຄ່າ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,ປະລິມານການຜະລິດເປັນການບັງຄັບ
 DocType: Employee Loan,Repayment Method,ວິທີການຊໍາລະ
@@ -1762,6 +1792,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,ຫນີ້ສິນ Stock
 DocType: Purchase Invoice,Supplier Warehouse,Supplier Warehouse
 DocType: Opportunity,Contact Mobile No,ການຕິດຕໍ່ໂທລະສັບມືຖື
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,ເລືອກບໍລິສັດ
 ,Material Requests for which Supplier Quotations are not created,ການຮ້ອງຂໍອຸປະກອນການສໍາລັບການທີ່ Quotations Supplier ຍັງບໍ່ໄດ້ສ້າງ
 DocType: Student Group,Set 0 for no limit,ກໍານົດ 0 ສໍາລັບທີ່ບໍ່ມີຂອບເຂດຈໍາກັດ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ມື້ (s) ທີ່ທ່ານກໍາລັງສະຫມັກສໍາລັບໃບມີວັນພັກ. ທ່ານບໍ່ຈໍາເປັນຕ້ອງນໍາໃຊ້ສໍາລັບການອອກຈາກ.
@@ -1771,24 +1802,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,ເຮັດໃຫ້ສະເຫນີລາຄາ
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,ບົດລາຍງານອື່ນ ໆ
 DocType: Dependent Task,Dependent Task,Task ຂຶ້ນ
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},ປັດໄຈທີ່ປ່ຽນແປງສໍາລັບຫນ່ວຍໃນຕອນຕົ້ນຂອງການປະມານ 1 ປີຕິດຕໍ່ກັນ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},ປັດໄຈທີ່ປ່ຽນແປງສໍາລັບຫນ່ວຍໃນຕອນຕົ້ນຂອງການປະມານ 1 ປີຕິດຕໍ່ກັນ {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},ອອກຈາກການປະເພດ {0} ບໍ່ສາມາດຈະຕໍ່ໄປອີກແລ້ວກ່ວາ {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ພະຍາຍາມການວາງແຜນການດໍາເນີນງານສໍາລັບມື້ X ໃນການລ່ວງຫນ້າ.
 DocType: HR Settings,Stop Birthday Reminders,ຢຸດວັນເດືອນປີເກີດເຕືອນ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},ກະລຸນາທີ່ກໍານົດໄວ້ມາດຕະຖານ Payroll Account Payable ໃນບໍລິສັດ {0}
 DocType: SMS Center,Receiver List,ບັນຊີຮັບ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,ຄົ້ນຫາສິນຄ້າ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,ຄົ້ນຫາສິນຄ້າ
 DocType: Patient Appointment,Referring Physician,ອ້າງເຖິງແພດ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ຈໍານວນການບໍລິໂພກ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,ການປ່ຽນແປງສຸດທິໃນເງິນສົດ
 DocType: Assessment Plan,Grading Scale,ຂະຫນາດການຈັດລໍາດັບ
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ຫນ່ວຍບໍລິການຂອງການ {0} ໄດ້ຮັບເຂົ້າໄປຫຼາຍກ່ວາຫນຶ່ງຄັ້ງໃນການສົນທະນາປັດໄຈຕາຕະລາງ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,ສໍາເລັດແລ້ວ
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ຫນ່ວຍບໍລິການຂອງການ {0} ໄດ້ຮັບເຂົ້າໄປຫຼາຍກ່ວາຫນຶ່ງຄັ້ງໃນການສົນທະນາປັດໄຈຕາຕະລາງ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,ສໍາເລັດແລ້ວ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock ໃນມື
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},ຄໍາຂໍຊໍາລະຢູ່ແລ້ວ {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ຄ່າໃຊ້ຈ່າຍຂອງລາຍການອອກ
 DocType: Physician,Hospital,ໂຮງຫມໍ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},ປະລິມານຈະຕ້ອງບໍ່ຫຼາຍກ່ວາ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},ປະລິມານຈະຕ້ອງບໍ່ຫຼາຍກ່ວາ {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,ກ່ອນຫນ້າປີດ້ານການເງິນແມ່ນບໍ່ມີການປິດ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),ອາຍຸສູງສຸດ (ວັນ)
 DocType: Quotation Item,Quotation Item,ສະເຫນີລາຄາສິນຄ້າ
@@ -1799,8 +1830,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,ປະເພດຜູ້ສະຫນອງຕົ້ນສະບັບ.
 DocType: Purchase Order Item,Supplier Part Number,ຜູ້ຜະລິດຈໍານວນສ່ວນ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,ອັດຕາການປ່ຽນໃຈເຫລື້ອມໃສບໍ່ສາມາດຈະເປັນ 0 ຫລື 1
-DocType: Sales Invoice,Reference Document,ເອກະສານກະສານອ້າງອີງ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} ຖືກຍົກເລີກຫຼືຢຸດເຊົາການ
+DocType: Subscription,Reference Document,ເອກະສານກະສານອ້າງອີງ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} ຖືກຍົກເລີກຫຼືຢຸດເຊົາການ
 DocType: Accounts Settings,Credit Controller,ຄວບຄຸມການປ່ອຍສິນເຊື່ອ
 DocType: Delivery Note,Vehicle Dispatch Date,ຍານພາຫະນະວັນຫນັງສືທາງການ
 DocType: Healthcare Settings,Default Medical Code Standard,ແບບມາດຕະຖານຢາມາດຕະຖານ
@@ -1809,6 +1840,7 @@
 DocType: Company,Default Payable Account,ມາດຕະຖານບັນຊີເຈົ້າຫນີ້
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","ການຕັ້ງຄ່າສໍາລັບໂຄງຮ່າງການໄປຊື້ເຄື່ອງອອນໄລນ໌ເຊັ່ນ: ກົດລະບຽບການຂົນສົ່ງ, ບັນຊີລາຍການລາຄາແລະອື່ນໆ"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% ບິນ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,ຮຽງຕາມລາຄາ ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserved ຈໍານວນ
 DocType: Party Account,Party Account,ບັນຊີພັກ
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,ຊັບພະຍາກອນມະນຸດ
@@ -1820,13 +1852,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,ເຮັດໃຫ້ນໍາເຂົ້າການອອກສຽງ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,ຕິດຕໍ່ກັນ {0}: Advance ຕໍ່ຜູ້ຜະລິດຕ້ອງໄດ້ຮັບການຫັກ
 DocType: Company,Default Values,ຄ່າເລີ່ມຕົ້ນ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{ຄວາມຖີ່} ຫົວຂໍ້ສໍາຄັນ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{ຄວາມຖີ່} ຫົວຂໍ້ສໍາຄັນ
 DocType: Expense Claim,Total Amount Reimbursed,ຈໍານວນທັງຫມົດການຊົດເຊີຍຄືນ
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,ນີ້ແມ່ນອີງໃສ່ໄມ້ຕໍ່ກັບຍານພາຫະນະນີ້. ເບິ່ງໄລຍະເວລາຂ້າງລຸ່ມນີ້ສໍາລັບລາຍລະອຽດ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},ຕໍ່ Supplier Invoice {0} ວັນ {1}
 DocType: Customer,Default Price List,ລາຄາມາດຕະຖານ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,ການບັນທຶກການເຄື່ອນໄຫວຊັບສິນ {0} ສ້າງ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,ທ່ານບໍ່ສາມາດລົບປະຈໍາປີ {0}. ປີງົບປະມານ {0} ກໍານົດເປັນມາດຕະຖານໃນການຕັ້ງຄ່າ Global
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,ລູກຄ້າທີ່ມີຊື່ດຽວກັນກໍ່ມີຢູ່ແລ້ວ
 DocType: Journal Entry,Entry Type,ປະເພດເຂົ້າ
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,No ແຜນການປະເມີນຜົນການເຊື່ອມໂຍງກັບກຸ່ມການປະເມີນຜົນນີ້
 ,Customer Credit Balance,ຍອດສິນເຊື່ອລູກຄ້າ
@@ -1837,7 +1870,7 @@
 DocType: Quotation,Term Details,ລາຍລະອຽດໃນໄລຍະ
 DocType: Project,Total Sales Cost (via Sales Order),ມູນຄ່າທັງຫມົດ Sales (ຜ່ານສັ່ງຊື້ຂາຍ)
 DocType: Project,Total Sales Cost (via Sales Order),ມູນຄ່າທັງຫມົດ Sales (ຜ່ານສັ່ງຊື້ຂາຍ)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,ບໍ່ສາມາດລົງທະບຽນຫຼາຍກ່ວາ {0} ນັກສຶກສາສໍາລັບກຸ່ມນັກສຶກສານີ້.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,ບໍ່ສາມາດລົງທະບຽນຫຼາຍກ່ວາ {0} ນັກສຶກສາສໍາລັບກຸ່ມນັກສຶກສານີ້.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ນັບເປັນຜູ້ນໍາພາ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ນັບເປັນຜູ້ນໍາພາ
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} ຕ້ອງໄດ້ຫຼາຍກ່ວາ 0
@@ -1855,9 +1888,11 @@
 DocType: Lab Test,Technician Name,ຊື່ Technician
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Unlink ການຊໍາລະເງິນກ່ຽວກັບການຍົກເລີກການໃບເກັບເງິນ
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},ອ່ານໄມປັດຈຸບັນເຂົ້າໄປຄວນຈະເປັນຫຼາຍກ່ວາເບື້ອງຕົ້ນພາຫະນະໄມ {0}
+DocType: Restaurant Reservation,No Show,ບໍ່ມີສະແດງ
 DocType: Shipping Rule Country,Shipping Rule Country,Shipping ກົດລະບຽບປະເທດ
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,ອອກຈາກແລະເຂົ້າຮ່ວມ
 DocType: Maintenance Visit,Partially Completed,ສໍາເລັດບາງສ່ວນ
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Moderate Sensitivity
 DocType: Leave Type,Include holidays within leaves as leaves,ປະກອບມີວັນພັກໃນໃບເປັນໃບ
 DocType: Sales Invoice,Packed Items,ການບັນຈຸ
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,ການຮັບປະກັນການຮຽກຮ້ອງຕໍ່ສະບັບເລກທີ Serial
@@ -1874,13 +1909,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),ການຊໍາລະເງິນຈໍານວນເງິນ (ບໍລິສັດສະກຸນເງິນ)
 DocType: Purchase Invoice,Additional Discount,ສ່ວນລົດເພີ່ມເຕີມ
 DocType: Selling Settings,Selling Settings,ຂາຍ Settings
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,ຢືນຢັນການປະຕິບັດ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ການປະມູນອອນໄລນ໌
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,ກະລຸນາລະບຸບໍ່ວ່າຈະປະລິມານຫຼືອັດຕາການປະເມີນມູນຄ່າຫຼືທັງສອງຢ່າງ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,ປະຕິບັດຕາມ
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,ເບິ່ງໃນໂຄງຮ່າງການ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,ຄ່າໃຊ້ຈ່າຍການຕະຫຼາດ
 ,Item Shortage Report,ບົດລາຍງານການຂາດແຄນສິນຄ້າ
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ນ້ໍາທີ່ໄດ້ກ່າວມາ, \ nPlease ເວົ້າເຖິງ &quot;ນ້ໍາຫນັກ UOM&quot; ເຊັ່ນດຽວກັນ"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ນ້ໍາທີ່ໄດ້ກ່າວມາ, \ nPlease ເວົ້າເຖິງ &quot;ນ້ໍາຫນັກ UOM&quot; ເຊັ່ນດຽວກັນ"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ຂໍອຸປະກອນການນໍາໃຊ້ເພື່ອເຮັດໃຫ້ການອອກສຽງ Stock
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາເປັນການບັງຄັບສໍາລັບຊັບສິນໃຫມ່
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Group ແຍກຕາມແນ່ນອນສໍາລັບທຸກຊຸດ
@@ -1893,12 +1929,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ເຮັດໃຫ້ການເຂົ້າບັນຊີສໍາຫລັບທຸກການເຄື່ອນໄຫວ Stock
 DocType: Leave Allocation,Total Leaves Allocated,ໃບທັງຫມົດຈັດສັນ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Warehouse ກໍານົດໄວ້ຢູ່ແຖວ No {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,ກະລຸນາໃສ່ປີເລີ່ມຕົ້ນທີ່ຖືກຕ້ອງທາງດ້ານການເງິນແລະວັນສຸດທ້າຍ
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,ກະລຸນາໃສ່ປີເລີ່ມຕົ້ນທີ່ຖືກຕ້ອງທາງດ້ານການເງິນແລະວັນສຸດທ້າຍ
 DocType: Employee,Date Of Retirement,ວັນທີ່ສະຫມັກບໍານານ
 DocType: Upload Attendance,Get Template,ໄດ້ຮັບ Template
 DocType: Material Request,Transferred,ໂອນ
 DocType: Vehicle,Doors,ປະຕູ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,Setup ERPNext ສໍາເລັດ!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,Setup ERPNext ສໍາເລັດ!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,ເກັບຄ່າທໍານຽມສໍາລັບການຈົດທະບຽນຄົນເຈັບ
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,Breakup ພາສີ
@@ -1917,37 +1953,37 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","ຖ້າຫາກວ່າລາຍການນີ້ມີ variants, ຫຼັງຈາກນັ້ນມັນກໍສາມາດບໍ່ໄດ້ຮັບການຄັດເລືອກໃນໃບສັ່ງຂາຍແລະອື່ນໆ"
 DocType: Lead,Next Contact By,ຕິດຕໍ່ຕໍ່ໄປໂດຍ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},ປະລິມານທີ່ກໍານົດໄວ້ສໍາລັບລາຍການ {0} ຕິດຕໍ່ກັນ {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},ປະລິມານທີ່ກໍານົດໄວ້ສໍາລັບລາຍການ {0} ຕິດຕໍ່ກັນ {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Warehouse {0} ບໍ່ສາມາດໄດ້ຮັບການລຶບເປັນປະລິມານທີ່ມີຢູ່ສໍາລັບລາຍການ {1}
 DocType: Quotation,Order Type,ປະເພດຄໍາສັ່ງ
-DocType: Purchase Invoice,Notification Email Address,ແຈ້ງທີ່ຢູ່ອີເມວ
 ,Item-wise Sales Register,ລາຍການສະຫລາດ Sales ຫມັກສະມາຊິກ
 DocType: Asset,Gross Purchase Amount,ການຊື້ທັງຫມົດ
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,ເປີດເຄື່ອງຊັ່ງ
 DocType: Asset,Depreciation Method,ວິທີການຄ່າເສື່ອມລາຄາ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,ອອຟໄລ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,ອອຟໄລ
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,ເປັນພາສີນີ້ລວມຢູ່ໃນອັດຕາພື້ນຖານ?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,ເປົ້າຫມາຍທັງຫມົດ
 DocType: Job Applicant,Applicant for a Job,ສະຫມັກວຽກຄິກທີ່ນີ້
 DocType: Production Plan Material Request,Production Plan Material Request,ການຜະລິດແຜນການວັດສະດຸຂໍ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,ບໍ່ມີໃບສັ່ງຜະລິດສ້າງ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,ບໍ່ມີໃບສັ່ງຜະລິດສ້າງ
 DocType: Stock Reconciliation,Reconciliation JSON,reconciliation JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ຄໍລໍາຈໍານວນຫຼາຍເກີນໄປ. ສົ່ງອອກບົດລາຍງານແລະພິມການນໍາໃຊ້ຄໍາຮ້ອງສະຫມັກລາງໄດ້.
 DocType: Purchase Invoice Item,Batch No,ຊຸດບໍ່ມີ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},ການຮ້ອງຂໍສໍາລັບການສະເຫນີຂາຍ: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,ອະນຸຍາດໃຫ້ຂາຍສິນຄ້າຫລາຍຕໍ່ການສັ່ງຊື້ຂອງລູກຄ້າເປັນ
 DocType: Student Group Instructor,Student Group Instructor,Group Student ສອນ
 DocType: Student Group Instructor,Student Group Instructor,Group Student ສອນ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,ຕົ້ນຕໍ
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,ຕົ້ນຕໍ
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,ຕັ້ງຄໍານໍາຫນ້າສໍາລັບການຈໍານວນໄລຍະກ່ຽວກັບການໂອນຂອງທ່ານ
 DocType: Employee Attendance Tool,Employees HTML,ພະນັກງານ HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,ມາດຕະຖານ BOM ({0}) ຕ້ອງມີການເຄື່ອນໄຫວສໍາລັບລາຍການນີ້ຫຼືແມ່ຂອງຕົນ
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,ມາດຕະຖານ BOM ({0}) ຕ້ອງມີການເຄື່ອນໄຫວສໍາລັບລາຍການນີ້ຫຼືແມ່ຂອງຕົນ
 DocType: Employee,Leave Encashed?,ອອກຈາກ Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ໂອກາດຈາກພາກສະຫນາມເປັນການບັງຄັບ
 DocType: Email Digest,Annual Expenses,ຄ່າໃຊ້ຈ່າຍປະຈໍາປີ
 DocType: Item,Variants,variants
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,ເຮັດໃຫ້ການສັ່ງຊື້
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,ເຮັດໃຫ້ການສັ່ງຊື້
 DocType: SMS Center,Send To,ສົ່ງເຖິງ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},ຍັງບໍ່ທັນມີຄວາມສົມດູນອອກພຽງພໍສໍາລັບການອອກຈາກປະເພດ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ຈໍານວນເງິນທີ່ຈັດສັນ
@@ -1965,6 +2001,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Strength Group ນັກສຶກສາ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,ຕໍ່ຕ້ານອະນຸ {0} ບໍ່ມີການ unmatched {1} ເຂົ້າ
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,ການປະເມີນຜົນ
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,ການຝຶກອົບຮົມເຫດການ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},ຊ້ໍາບໍ່ມີ Serial ເຂົ້າສໍາລັບລາຍການ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,A ເງື່ອນໄຂສໍາລັບລະບຽບການຈັດສົ່ງສິນຄ້າ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,ກະລຸນາໃສ່
@@ -1974,7 +2011,7 @@
 DocType: Sales Order,To Deliver and Bill,ການສົ່ງແລະບັນຊີລາຍການ
 DocType: Student Group,Instructors,instructors
 DocType: GL Entry,Credit Amount in Account Currency,ການປ່ອຍສິນເຊື່ອໃນສະກຸນເງິນບັນຊີ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} ຕ້ອງໄດ້ຮັບການສົ່ງ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} ຕ້ອງໄດ້ຮັບການສົ່ງ
 DocType: Authorization Control,Authorization Control,ການຄວບຄຸມການອະນຸຍາດ
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},"ຕິດຕໍ່ກັນ, {0}: ປະຕິເສດ Warehouse ເປັນການບັງຄັບຕໍ່ຕ້ານສິນຄ້າປະຕິເສດ {1}"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,ການຊໍາລະເງິນ
@@ -1993,11 +2030,11 @@
 DocType: Quotation Item,Actual Qty,ຕົວຈິງຈໍານວນ
 DocType: Sales Invoice Item,References,ເອກະສານ
 DocType: Quality Inspection Reading,Reading 10,ອ່ານ 10
-DocType: Hub Settings,Hub Node,Hub Node
+DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,ທ່ານໄດ້ເຂົ້າໄປລາຍການລາຍການທີ່ຊ້ໍາ. ກະລຸນາແກ້ໄຂແລະພະຍາຍາມອີກເທື່ອຫນຶ່ງ.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,ສະມາຄົມ
 DocType: Asset Movement,Asset Movement,ການເຄື່ອນໄຫວຊັບສິນ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,ໂຄງຮ່າງການໃຫມ່
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,ໂຄງຮ່າງການໃຫມ່
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,ລາຍການ {0} ບໍ່ແມ່ນລາຍການຕໍ່ເນື່ອງ
 DocType: SMS Center,Create Receiver List,ສ້າງບັນຊີຮັບ
 DocType: Vehicle,Wheels,ຂັບລົດ
@@ -2011,15 +2048,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,ຄົມມະນາຄົມ
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),ຊີ້ໃຫ້ເຫັນວ່າຊຸດແມ່ນສ່ວນຫນຶ່ງຂອງການຈັດສົ່ງ (ພຽງແຕ່ Draft) ນີ້
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,ເຮັດໃຫ້ການເຂົ້າການຊໍາລະເງິນ
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},ປະລິມານສໍາລັບລາຍການ {0} ຕ້ອງຫນ້ອຍກ່ວາ {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},ປະລິມານສໍາລັບລາຍການ {0} ຕ້ອງຫນ້ອຍກ່ວາ {1}
 ,Sales Invoice Trends,Sales ແນວໂນ້ມ Invoice
 DocType: Leave Application,Apply / Approve Leaves,ສະຫມັກຕໍາ / ອະນຸມັດໃບ
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,ສໍາລັບການ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,ສໍາລັບການ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',ສາມາດສົ່ງຕິດຕໍ່ກັນພຽງແຕ່ຖ້າຫາກວ່າປະເພດຄ່າໃຊ້ຈ່າຍແມ່ນ &#39;ກ່ຽວກັບຈໍານວນແຖວ Previous&#39; ຫຼື &#39;ກ່ອນຫນ້າ Row ລວມ
 DocType: Sales Order Item,Delivery Warehouse,Warehouse ສົ່ງ
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,ເປັນໄມ້ຢືນຕົ້ນຂອງສູນຕົ້ນທຶນທາງດ້ານການເງິນ.
 DocType: Serial No,Delivery Document No,ສົ່ງເອກະສານທີ່ບໍ່ມີ
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},ກະລຸນາຕັ້ງ &#39;ບັນຊີ / ການສູນເສຍກໍາໄຮຈາກການທໍາລາຍຊັບສິນໃນບໍລິສັດ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},ກະລຸນາຕັ້ງ &#39;ບັນຊີ / ການສູນເສຍກໍາໄຮຈາກການທໍາລາຍຊັບສິນໃນບໍລິສັດ {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,ຮັບສິນຄ້າຈາກການຊື້ຮັບ
 DocType: Serial No,Creation Date,ວັນທີ່ສ້າງ
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},ລາຍການ {0} ປາກົດຂຶ້ນຫລາຍຄັ້ງໃນລາຄາ {1}
@@ -2030,12 +2067,13 @@
 DocType: Student,Student Mobile Number,ຈໍານວນໂທລະສັບມືຖືນັກສຶກສາ
 DocType: Item,Has Variants,ມີ Variants
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,ການປັບປຸງການຕອບສະຫນອງ
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},ທ່ານໄດ້ຄັດເລືອກເອົາແລ້ວລາຍການຈາກ {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},ທ່ານໄດ້ຄັດເລືອກເອົາແລ້ວລາຍການຈາກ {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ຊື່ຂອງການແຜ່ກະຈາຍລາຍເດືອນ
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ID batch ເປັນການບັງຄັບ
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ID batch ເປັນການບັງຄັບ
 DocType: Sales Person,Parent Sales Person,ບຸກຄົນຜູ້ປົກຄອງ Sales
-DocType: Purchase Invoice,Recurring Invoice,ໃບເກັບເງິນທີ່ເກີດຂຶ້ນ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,ສູງເຖິງຕ່ໍາ
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,ເລືອກໂຄງການກ່ອນ
 DocType: Patient Appointment,Patient Age,ອາຍຸຜູ້ປ່ວຍ
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,ການຄຸ້ມຄອງການໂຄງການ
 DocType: Supplier,Supplier of Goods or Services.,ຜູ້ສະຫນອງສິນຄ້າຫຼືການບໍລິການ.
@@ -2043,8 +2081,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,ບັນຊີລູກຫນີ້ທີ່ຖືກຕ້ອງທີ່ຈະຖືກນໍາໃຊ້ຖ້າບໍ່ໄດ້ກໍານົດໄວ້ໃນຄົນເຈັບໃນການຈອງຄ່າບໍລິການປຶກສາ.
 DocType: Vehicle Log,Fuel Price,ລາຄານໍ້າມັນເຊື້ອໄຟ
 DocType: Budget,Budget,ງົບປະມານ
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Set Open
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,ລາຍການສິນຊັບຖາວອນຕ້ອງຈະເປັນລາຍການບໍ່ແມ່ນຫຼັກຊັບ.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Set Open
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,ລາຍການສິນຊັບຖາວອນຕ້ອງຈະເປັນລາຍການບໍ່ແມ່ນຫຼັກຊັບ.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","ງົບປະມານບໍ່ສາມາດໄດ້ຮັບການມອບຫມາຍຕໍ່ຕ້ານ {0}, ຍ້ອນວ່າມັນບໍ່ແມ່ນເປັນບັນຊີລາຍໄດ້ຫຼືຄ່າໃຊ້ຈ່າຍ"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,ໄດ້ບັນລຸຜົນ
 DocType: Student Admission,Application Form Route,ຄໍາຮ້ອງສະຫມັກແບບຟອມການເສັ້ນທາງ
@@ -2058,12 +2096,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,ລາຍການ {0} ບໍ່ແມ່ນການຕິດຕັ້ງສໍາລັບການ Serial Nos. ກວດສອບການຕົ້ນສະບັບລາຍການ
 DocType: Maintenance Visit,Maintenance Time,ທີ່ໃຊ້ເວລາບໍາລຸງຮັກສາ
 ,Amount to Deliver,ຈໍານວນການສົ່ງ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},ລາຍະການດຽວກັນໄດ້ຖືກເຂົ້າຫລາຍຄັ້ງ. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ວັນທີໄລຍະເລີ່ມຕົ້ນບໍ່ສາມາດຈະກ່ອນຫນ້ານັ້ນກ່ວາປີເລີ່ມວັນທີຂອງປີທາງວິຊາການທີ່ໃນໄລຍະການມີການເຊື່ອມຕໍ່ (ປີທາງວິຊາການ {}). ກະລຸນາແກ້ໄຂຂໍ້ມູນວັນແລະພະຍາຍາມອີກເທື່ອຫນຶ່ງ.
 DocType: Guardian,Guardian Interests,ຄວາມສົນໃຈຜູ້ປົກຄອງ
 DocType: Naming Series,Current Value,ມູນຄ່າປະຈຸບັນ
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ປີງົບປະມານຫຼາຍມີສໍາລັບວັນທີ {0}. ກະລຸນາຕັ້ງບໍລິສັດໃນປີງົບປະມານ
 DocType: School Settings,Instructor Records to be created by,ບັນທຶກສອນທີ່ຈະສ້າງຂຶ້ນໂດຍ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} ສ້າງ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} ສ້າງ
 DocType: Delivery Note Item,Against Sales Order,ຕໍ່ຂາຍສິນຄ້າ
 ,Serial No Status,ບໍ່ມີ Serial ສະຖານະ
 DocType: Payment Entry Reference,Outstanding,ທີ່ຍັງຄ້າງຄາ
@@ -2073,10 +2112,10 @@
 						must be greater than or equal to {2}","ຕິດຕໍ່ກັນ {0}: ເພື່ອກໍານົດ {1} ໄລຍະເວລາ, ຄວາມແຕກຕ່າງກັນລະຫວ່າງຈາກແລະກັບວັນທີ \ ຕ້ອງໄດ້ຫຼາຍກ່ວາຫຼືເທົ່າກັບ {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,ນີ້ແມ່ນອີງໃສ່ການເຄື່ອນຍ້າຍ. ເບິ່ງ {0} ສໍາລັບລາຍລະອຽດ
 DocType: Pricing Rule,Selling,ຂາຍ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},ຈໍານວນ {0} {1} ຫັກຕໍ່ {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},ຈໍານວນ {0} {1} ຫັກຕໍ່ {2}
 DocType: Employee,Salary Information,ຂໍ້ມູນເງິນເດືອນ
 DocType: Sales Person,Name and Employee ID,ຊື່ແລະລະຫັດພະນັກງານ
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,ເນື່ອງຈາກວັນທີບໍ່ສາມາດກ່ອນທີ່ໂພດວັນທີ່
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,ເນື່ອງຈາກວັນທີບໍ່ສາມາດກ່ອນທີ່ໂພດວັນທີ່
 DocType: Website Item Group,Website Item Group,ກຸ່ມສິນຄ້າເວັບໄຊທ໌
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,ຫນ້າທີ່ແລະພາສີອາກອນ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,ກະລຸນາໃສ່ວັນທີເອກະສານ
@@ -2102,7 +2141,7 @@
 DocType: Issue,Resolution Details,ລາຍລະອຽດຄວາມລະອຽດ
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ການຈັດສັນ
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,ເງື່ອນໄຂການຍອມຮັບ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,ກະລຸນາໃສ່ການຮ້ອງຂໍການວັດສະດຸໃນຕາຕະລາງຂ້າງເທິງ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,ກະລຸນາໃສ່ການຮ້ອງຂໍການວັດສະດຸໃນຕາຕະລາງຂ້າງເທິງ
 DocType: Item Attribute,Attribute Name,ສະແດງຊື່
 DocType: BOM,Show In Website,ສະແດງໃຫ້ເຫັນໃນເວັບໄຊທ໌
 DocType: Shopping Cart Settings,Show Quantity in Website,ສະແດງໃຫ້ເຫັນຈໍານວນໃນເວັບໄຊທ໌
@@ -2111,7 +2150,7 @@
 DocType: Item Reorder,Check in (group),ໃຫ້ກວດເບິ່ງໃນ (ກຸ່ມ)
 ,Qty to Order,ຈໍານວນທີ່ຈະສັ່ງຊື້ສິນຄ້າ
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","ຫົວຫນ້າບັນຊີພາຍໃຕ້ຄວາມຮັບຜິດຊອບຫຼືການລົງທຶນ, ໃນທີ່ກໍາໄຮ / ການສູນເສຍຈະໄດ້ຮັບການຈອງ"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,ຕາຕະລາງ Gantt ຂອງຫນ້າວຽກທັງຫມົດ.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,ຕາຕະລາງ Gantt ຂອງຫນ້າວຽກທັງຫມົດ.
 DocType: Opportunity,Mins to First Response,ນາທີຄວາມຮັບຜິດຊອບຫນ້າທໍາອິດ
 DocType: Pricing Rule,Margin Type,ປະເພດ margin
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} ຊົ່ວໂມງ
@@ -2133,36 +2172,36 @@
 DocType: Patient,Surgical History,Surgical History
 DocType: Employee,Resignation Letter Date,ການລາອອກວັນທີ່ສະຫມັກຈົດຫມາຍສະບັບ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,ກົດລະບຽບການຕັ້ງລາຄາໄດ້ຖືກກັ່ນຕອງຕື່ມອີກໂດຍອີງໃສ່ປະລິມານ.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},ກະລຸນາຕັ້ງວັນທີ່ຂອງການເຂົ້າຮ່ວມສໍາລັບພະນັກງານທີ່ {0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},ກະລຸນາຕັ້ງວັນທີ່ຂອງການເຂົ້າຮ່ວມສໍາລັບພະນັກງານທີ່ {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},ກະລຸນາຕັ້ງວັນທີ່ຂອງການເຂົ້າຮ່ວມສໍາລັບພະນັກງານທີ່ {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},ກະລຸນາຕັ້ງວັນທີ່ຂອງການເຂົ້າຮ່ວມສໍາລັບພະນັກງານທີ່ {0}
 DocType: Task,Total Billing Amount (via Time Sheet),ຈໍານວນການເອີ້ນເກັບເງິນທັງຫມົດ (ໂດຍຜ່ານທີ່ໃຊ້ເວລາ Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ລາຍການລູກຄ້າຊ້ໍາ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ຕ້ອງມີພາລະບົດບາດ &#39;ຄ່າໃຊ້ຈ່າຍການອະນຸມັດ
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,ຄູ່
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,ເລືອກ BOM ແລະຈໍານວນການຜະລິດ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,ເລືອກ BOM ແລະຈໍານວນການຜະລິດ
 DocType: Asset,Depreciation Schedule,ຕາຕະລາງຄ່າເສື່ອມລາຄາ
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,ທີ່ຢູ່ Partner ຂາຍແລະຕິດຕໍ່
 DocType: Bank Reconciliation Detail,Against Account,ຕໍ່ບັນຊີ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,ເຄິ່ງຫນຶ່ງຂອງວັນທີ່ຄວນຈະມີລະຫວ່າງຕັ້ງແຕ່ວັນທີ່ແລະວັນທີ
 DocType: Maintenance Schedule Detail,Actual Date,ວັນທີ່
 DocType: Item,Has Batch No,ມີ Batch No
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},ການເອີ້ນເກັບເງິນປະຈໍາປີ: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},ການເອີ້ນເກັບເງິນປະຈໍາປີ: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),ສິນຄ້າແລະບໍລິການພາສີ (GST ອິນເດຍ)
 DocType: Delivery Note,Excise Page Number,ອາກອນຊົມໃຊ້ຈໍານວນຫນ້າ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","ບໍລິສັດ, ຈາກວັນທີ່ສະຫມັກແລະວັນທີບັງຄັບ"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,ໄດ້ຮັບຈາກການປຶກສາຫາລື
 DocType: Asset,Purchase Date,ວັນທີ່ຊື້
 DocType: Employee,Personal Details,ຂໍ້ມູນສ່ວນຕົວ
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},ກະລຸນາຕັ້ງຊັບ Center ຄ່າເສື່ອມລາຄາຕົ້ນທຶນໃນບໍລິສັດ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},ກະລຸນາຕັ້ງຊັບ Center ຄ່າເສື່ອມລາຄາຕົ້ນທຶນໃນບໍລິສັດ {0}
 ,Maintenance Schedules,ຕາຕະລາງການບໍາລຸງຮັກສາ
 DocType: Task,Actual End Date (via Time Sheet),ຕົວຈິງວັນທີ່ສິ້ນສຸດ (ຜ່ານທີ່ໃຊ້ເວລາ Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},ຈໍານວນ {0} {1} ກັບ {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},ຈໍານວນ {0} {1} ກັບ {2} {3}
 ,Quotation Trends,ແນວໂນ້ມວົງຢືມ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},ກຸ່ມສິນຄ້າບໍ່ໄດ້ກ່າວເຖິງໃນຕົ້ນສະບັບລາຍການສໍາລັບການ item {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,ເດບິດການບັນຊີຈະຕ້ອງບັນຊີລູກຫນີ້
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,ເດບິດການບັນຊີຈະຕ້ອງບັນຊີລູກຫນີ້
 DocType: Shipping Rule Condition,Shipping Amount,ການຂົນສົ່ງຈໍານວນເງິນ
 DocType: Supplier Scorecard Period,Period Score,ຄະແນນໄລຍະເວລາ
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,ຕື່ມການລູກຄ້າ
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,ຕື່ມການລູກຄ້າ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,ທີ່ຍັງຄ້າງຈໍານວນ
 DocType: Lab Test Template,Special,ພິເສດ
 DocType: Purchase Invoice Item,Conversion Factor,ປັດໄຈການປ່ຽນແປງ
@@ -2170,13 +2209,14 @@
 ,Vehicle Expenses,ຄ່າໃຊ້ຈ່າຍຍານພາຫະນະ
 DocType: Serial No,Invoice Details,ລາຍລະອຽດໃບແຈ້ງຫນີ້
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},ມູນຄ່າຄາດວ່າຫຼັງຈາກຊີວິດທີ່ເປັນປະໂຫຍດຕ້ອງໄດ້ຫຼາຍກ່ວາຫຼືເທົ່າກັບ {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,ເລີ່ມຕົ້ນສຸດ
+DocType: Hub Category,Hub Category,Category Hub
 DocType: Purchase Invoice,SEZ,ຂພສ
 DocType: Purchase Receipt,Vehicle Number,ຈໍານວນຍານພາຫະນະ
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,ວັນທີ່ໃບເກັບເງິນທີ່ເກີດຂຶ້ນຈະໄດ້ຮັບການຢຸດເຊົາການ
 DocType: Employee Loan,Loan Amount,ຈໍານວນເງິນກູ້ຢືມເງິນ
 DocType: Program Enrollment,Self-Driving Vehicle,ຍານພາຫະນະຂອງຕົນເອງຂັບລົດ
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Supplier Scorecard ປະຈໍາ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},ແຖວ {0}: ບັນຊີລາຍການຂອງວັດສະດຸບໍ່ພົບມູນ {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},ແຖວ {0}: ບັນຊີລາຍການຂອງວັດສະດຸບໍ່ພົບມູນ {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,ໃບຈັດສັນທັງຫມົດ {0} ບໍ່ສາມາດຈະຫນ້ອຍກ່ວາໃບອະນຸມັດແລ້ວ {1} ສໍາລັບໄລຍະເວລາ
 DocType: Journal Entry,Accounts Receivable,ບັນຊີລູກຫນີ້
 ,Supplier-Wise Sales Analytics,"ຜູ້ຜະລິດ, ສະຫລາດວິເຄາະ Sales"
@@ -2188,7 +2228,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","ຂອງລາຍວິຊາຂອງພໍ່ແມ່ (ອອກ blank, ຖ້າຫາກວ່ານີ້ບໍ່ແມ່ນສ່ວນຫນຶ່ງຂອງພໍ່ແມ່ຂອງລາຍວິຊາ)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,ໃຫ້ຫວ່າງໄວ້ຖ້າພິຈາລະນາສໍາລັບທຸກປະເພດຂອງພະນັກງານ
 DocType: Landed Cost Voucher,Distribute Charges Based On,ການແຈກຢາຍຄ່າບໍລິການຂຶ້ນຢູ່ກັບ
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,ການຕັ້ງຄ່າ HR
 DocType: Salary Slip,net pay info,ຂໍ້ມູນການຈ່າຍເງິນສຸດທິ
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,ມູນຄ່ານີ້ຈະຖືກປັບປຸງໃນລາຄາການຂາຍລາຄາຕໍ່າສຸດ.
@@ -2199,7 +2239,7 @@
 DocType: Patient,B Positive,B Positive
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ຕິດຕໍ່ກັນ, {0}: ຈໍານວນປະມານ 1 ປີ, ເປັນລາຍການເປັນສິນຊັບຖາວອນ. ກະລຸນາໃຊ້ຕິດຕໍ່ກັນທີ່ແຍກຕ່າງຫາກສໍາລັບການຈໍານວນຫຼາຍ."
 DocType: Leave Block List Allow,Leave Block List Allow,ອອກຈາກສະໄຫມອະນຸຍາດໃຫ້
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,abbr ບໍ່ສາມາດມີຊ່ອງຫວ່າງຫຼືຊ່ອງ
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,abbr ບໍ່ສາມາດມີຊ່ອງຫວ່າງຫຼືຊ່ອງ
 DocType: Patient Medical Record,Patient Medical Record,Patient Medical Record
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,ກຸ່ມທີ່ບໍ່ແມ່ນກຸ່ມ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ກິລາ
@@ -2216,9 +2256,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,ບໍ່ສາມາດຊອກຫາອັດຕາແລກປ່ຽນໃນລາຄາ {0} ກັບ {1} ສໍາລັບວັນທີທີ່ສໍາຄັນ {2}. ກະລຸນາສ້າງບັນທຶກຕາແລກປ່ຽນເງິນດ້ວຍຕົນເອງ
 DocType: POS Profile,Price List,ລາຍການລາຄາ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ແມ່ນໃນປັດຈຸບັນເລີ່ມຕົ້ນປີງົບປະມານ. ກະລຸນາໂຫຼດຫນ້າຈໍຄືນຂອງຕົວທ່ອງເວັບຂອງທ່ານສໍາລັບການປ່ຽນແປງທີ່ຈະມີຜົນກະທົບ.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,ການຮຽກຮ້ອງຄ່າໃຊ້ຈ່າຍ
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,ການຮຽກຮ້ອງຄ່າໃຊ້ຈ່າຍ
 DocType: Issue,Support,ສະຫນັບສະຫນູນ
 ,BOM Search,ຄົ້ນຫາ BOM
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",ຂຽນ &quot;ໃນສະຕັອກ&quot; ຫຼື &quot;ບໍ່ຢູ່ໃນຫຼັກຊັບ&quot; ໃນ Hub ໂດຍອີງໃສ່ຫຼັກຊັບທີ່ມີຢູ່ໃນສາງນີ້.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),ປິດ (ການເປີດກວ້າງການທັງຫມົດ +)
 DocType: Vehicle,Fuel Type,ປະເພດນ້ໍາມັນ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,ກະລຸນາລະບຸສະກຸນເງິນໃນບໍລິສັດ
@@ -2230,16 +2271,16 @@
 DocType: Healthcare Settings,Remind Before,ເຕືອນກ່ອນ
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},ປັດໄຈທີ່ UOM ສົນທະນາແມ່ນຕ້ອງການໃນການຕິດຕໍ່ກັນ {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ຕິດຕໍ່ກັນ, {0}: Reference ປະເພດເອກະສານຕ້ອງເປັນສ່ວນຫນຶ່ງຂອງຄໍາສັ່ງຂາຍ, ຂາຍໃບເກັບເງິນຫຼືການອະນຸທິນ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ຕິດຕໍ່ກັນ, {0}: Reference ປະເພດເອກະສານຕ້ອງເປັນສ່ວນຫນຶ່ງຂອງຄໍາສັ່ງຂາຍ, ຂາຍໃບເກັບເງິນຫຼືການອະນຸທິນ"
 DocType: Salary Component,Deduction,ການຫັກ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,ຕິດຕໍ່ກັນ {0}: ຈາກທີ່ໃຊ້ເວລາແລະຈະໃຊ້ເວລາເປັນການບັງຄັບ.
 DocType: Stock Reconciliation Item,Amount Difference,ຈໍານວນທີ່ແຕກຕ່າງກັນ
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},ລາຍການລາຄາເພີ່ມຂຶ້ນສໍາລັບ {0} ໃນລາຄາ {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},ລາຍການລາຄາເພີ່ມຂຶ້ນສໍາລັບ {0} ໃນລາຄາ {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,ກະລຸນາໃສ່ລະຫັດພະນັກງານຂອງບຸກຄົນການຂາຍນີ້
 DocType: Territory,Classification of Customers by region,ການຈັດປະເພດຂອງລູກຄ້າຕາມພູມິພາກ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,ຄວາມແຕກຕ່າງກັນຈໍານວນເງິນຕ້ອງເປັນສູນ
 DocType: Project,Gross Margin,ຂອບໃບລວມຍອດ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,ກະລຸນາໃສ່ການຜະລິດສິນຄ້າຄັ້ງທໍາອິດ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,ກະລຸນາໃສ່ການຜະລິດສິນຄ້າຄັ້ງທໍາອິດ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,ການຄິດໄລ່ຄວາມດຸ່ນດ່ຽງທະນາຄານ
 DocType: Normal Test Template,Normal Test Template,Normal Test Template
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ຜູ້ໃຊ້ຄົນພິການ
@@ -2249,21 +2290,22 @@
 DocType: Salary Slip,Total Deduction,ຫັກຈໍານວນທັງຫມົດ
 ,Production Analytics,ການວິເຄາະການຜະລິດ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,ນີ້ແມ່ນອີງໃສ່ການໂອນເງິນກັບຜູ້ປ່ວຍນີ້. ເບິ່ງຕາຕະລາງຂ້າງລຸ່ມສໍາລັບລາຍລະອຽດ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,ຄ່າໃຊ້ຈ່າຍ Updated
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,ຄ່າໃຊ້ຈ່າຍ Updated
 DocType: Employee,Date of Birth,ວັນເດືອນປີເກີດ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,ລາຍການ {0} ໄດ້ຖືກສົ່ງຄືນແລ້ວ
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ປີງົບປະມານ ** ເປັນຕົວແທນເປັນປີການເງິນ. entries ບັນຊີທັງຫມົດແລະເຮັດທຸລະກໍາທີ່ສໍາຄັນອື່ນໆມີການຕິດຕາມຕໍ່ປີງົບປະມານ ** **.
 DocType: Opportunity,Customer / Lead Address,ລູກຄ້າ / ທີ່ຢູ່ນໍາ
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Supplier Setup Scorecard
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},ການເຕືອນໄພ: ໃບຢັ້ງຢືນການ SSL ບໍ່ຖືກຕ້ອງກ່ຽວກັບສິ່ງທີ່ແນບມາ {0}
-DocType: Student Admission,Eligibility,ມີສິດໄດ້ຮັບ
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,ຊື່ແຜນການປະເມີນຜົນ
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},ການເຕືອນໄພ: ໃບຢັ້ງຢືນການ SSL ບໍ່ຖືກຕ້ອງກ່ຽວກັບສິ່ງທີ່ແນບມາ {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","ນໍາໄປສູ່ການຊ່ວຍເຫຼືອທີ່ທ່ານໄດ້ຮັບທຸລະກິດ, ເພີ່ມການຕິດຕໍ່ທັງຫມົດຂອງທ່ານແລະຫຼາຍເປັນຜູ້ນໍາພາຂອງທ່ານ"
 DocType: Production Order Operation,Actual Operation Time,ທີ່ແທ້ຈິງທີ່ໃຊ້ເວລາການດໍາເນີນງານ
 DocType: Authorization Rule,Applicable To (User),ສາມາດນໍາໃຊ້ໄປ (User)
 DocType: Purchase Taxes and Charges,Deduct,ຫັກ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,ລາຍລະອຽດວຽກເຮັດງານທໍາ
 DocType: Student Applicant,Applied,ການນໍາໃຊ້
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Re: ເປີດ
 DocType: Sales Invoice Item,Qty as per Stock UOM,ຈໍານວນເປັນຕໍ່ Stock UOM
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,ຊື່ Guardian2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","ລັກສະນະພິເສດຍົກເວັ້ນ &quot;-&quot; &quot;.&quot;, &quot;#&quot;, ແລະ &quot;/&quot; ບໍ່ອະນຸຍາດໃຫ້ໃນການຕັ້ງຊື່ຊຸດ"
@@ -2275,7 +2317,7 @@
 DocType: Request for Quotation,Manufacturing Manager,ຜູ້ຈັດການການຜະລິດ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} ແມ່ນຢູ່ພາຍໃຕ້ການຮັບປະກັນບໍ່ເກີນ {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,ການແບ່ງປັນການຈັດສົ່ງເຂົ້າໄປໃນການຫຸ້ມຫໍ່.
-apps/erpnext/erpnext/hooks.py +98,Shipments,ການຂົນສົ່ງ
+apps/erpnext/erpnext/hooks.py +107,Shipments,ການຂົນສົ່ງ
 DocType: Payment Entry,Total Allocated Amount (Company Currency),ທັງຫມົດຈັດສັນຈໍານວນເງິນ (ບໍລິສັດສະກຸນເງິນ)
 DocType: Purchase Order Item,To be delivered to customer,ທີ່ຈະສົ່ງໃຫ້ລູກຄ້າ
 DocType: BOM,Scrap Material Cost,Cost Scrap ການວັດສະດຸ
@@ -2298,8 +2340,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Item Variant Settings
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,ເລືອກບໍລິສັດ ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,ໃຫ້ຫວ່າງໄວ້ຖ້າພິຈາລະນາສໍາລັບການພະແນກການທັງຫມົດ
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","ປະເພດຂອງການຈ້າງງານ (ຖາວອນ, ສັນຍາ, ແລະອື່ນໆພາຍໃນ)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} ເປັນການບັງຄັບສໍາລັບລາຍການ {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","ປະເພດຂອງການຈ້າງງານ (ຖາວອນ, ສັນຍາ, ແລະອື່ນໆພາຍໃນ)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} ເປັນການບັງຄັບສໍາລັບລາຍການ {1}
 DocType: Process Payroll,Fortnightly,ສອງອາທິດ
 DocType: Currency Exchange,From Currency,ຈາກສະກຸນເງິນ
 DocType: Vital Signs,Weight (In Kilogram),ນ້ໍາຫນັກ (ໃນກິໂລກໍາ)
@@ -2324,7 +2366,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,ກະລຸນາຄລິກໃສ່ &quot;ສ້າງຕາຕະລາງການ &#39;ໄດ້ຮັບການກໍານົດເວລາ
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,ມີຄວາມຜິດພາດໃນຂະນະທີ່ການລົບຕາຕະລາງຕໍ່ໄປນີ້ແມ່ນ:
 DocType: Bin,Ordered Quantity,ຈໍານວນຄໍາສັ່ງ
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",ຕົວຢ່າງ: &quot;ການກໍ່ສ້າງເຄື່ອງມືສໍາລັບການສ້າງ&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",ຕົວຢ່າງ: &quot;ການກໍ່ສ້າງເຄື່ອງມືສໍາລັບການສ້າງ&quot;
 DocType: Grading Scale,Grading Scale Intervals,ໄລຍະການຈັດລໍາດັບຂະຫນາດ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Entry ບັນຊີສໍາລັບ {2} ສາມາດເຮັດໄດ້ພຽງແຕ່ຢູ່ໃນສະກຸນເງິນ: {3}
 DocType: Production Order,In Process,ໃນຂະບວນການ
@@ -2348,11 +2390,10 @@
 DocType: Purchase Invoice,With Payment of Tax,ມີການຊໍາລະເງິນຂອງສ່ວຍສາອາກອນ
 DocType: Expense Claim Detail,Expense Claim Detail,ຄ່າໃຊ້ຈ່າຍຂໍ້ມູນການຮ້ອງຂໍ
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,ສາມສະບັບຄືການ SUPPLIER
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,ກະລຸນາເລືອກບັນຊີທີ່ຖືກຕ້ອງ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,ກະລຸນາເລືອກບັນຊີທີ່ຖືກຕ້ອງ
 DocType: Item,Weight UOM,ນ້ໍາຫນັກ UOM
 DocType: Salary Structure Employee,Salary Structure Employee,ພະນັກງານໂຄງສ້າງເງິນເດືອນ
 DocType: Patient,Blood Group,Group ເລືອດ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,ທີ່ຍັງຄ້າງ
 DocType: Course,Course Name,ຫລັກສູດ
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ຜູ້ໃຊ້ທີ່ສາມາດອະນຸມັດຄໍາຮ້ອງສະຫມັກອອກຈາກພະນັກງານສະເພາະຂອງ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,ອຸປະກອນຫ້ອງການ
@@ -2371,7 +2412,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,ລາຄາຈະບໍ່ໄດ້ຮັບການສະແດງໃຫ້ເຫັນວ່າລາຄາບໍ່ໄດ້ຕັ້ງ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,ກະລຸນາລະບຸປະເທດສໍາລັບກົດລະບຽບດັ່ງກ່າວນີ້ຫຼືກວດເບິ່ງເຮືອໃນທົ່ວໂລກ
 DocType: Stock Entry,Total Incoming Value,ມູນຄ່າຂາເຂົ້າທັງຫມົດ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,ເດບິດການຈໍາເປັນຕ້ອງ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,ເດບິດການຈໍາເປັນຕ້ອງ
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ຊ່ວຍຮັກສາຕິດຕາມຂອງທີ່ໃຊ້ເວລາ, ຄ່າໃຊ້ຈ່າຍແລະການເອີ້ນເກັບເງິນສໍາລັບກິດຈະກໍາເຮັດໄດ້ໂດຍທີມງານຂອງທ່ານ"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ລາຄາຊື້
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,ແມ່ແບບຂອງຕົວປ່ຽນແປງຈໍາຫນ່າຍດັດນີຊີ້ວັດ.
@@ -2381,7 +2422,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,ສ້າງຄວາມປອງດອງການຊໍາລະເງິນ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,ກະລຸນາເລືອກຊື່ Incharge ຂອງບຸກຄົນ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,ເຕັກໂນໂລຊີ
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},ທັງຫມົດບໍ່ທັນໄດ້ຈ່າຍ: {0}
+DocType: Hub Settings,Unregister from Hub,ຍົກເລີກຈາກ Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},ທັງຫມົດບໍ່ທັນໄດ້ຈ່າຍ: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM ການດໍາເນີນງານເວັບໄຊທ໌
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,ສະເຫນີຈົດຫມາຍ
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,ສ້າງການຮ້ອງຂໍການວັດສະດຸ (MRP) ແລະໃບສັ່ງຜະລິດ.
@@ -2393,7 +2435,9 @@
 DocType: Physician Schedule Time Slot,To Time,ການທີ່ໃຊ້ເວລາ
 DocType: Authorization Rule,Approving Role (above authorized value),ການອະນຸມັດພາລະບົດບາດ (ສູງກວ່າຄ່າອະນຸຍາດ)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,ການປ່ອຍສິນເຊື່ອການບັນຊີຈະຕ້ອງບັນຊີເຈົ້າຫນີ້
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM recursion {0} ບໍ່ສາມາດພໍ່ແມ່ຫລືລູກຂອງ {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,ກະລຸນາເລືອກການເຂົ້າຮຽນຂອງນັກຮຽນເຊິ່ງບັງຄັບໃຫ້ນັກຮຽນທີ່ໄດ້ຮັບຄ່າຈ້າງ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM recursion {0} ບໍ່ສາມາດພໍ່ແມ່ຫລືລູກຂອງ {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,ກະລຸນາເລືອກລາຄາລາຄາເພື່ອເຜີຍແຜ່ລາຄາ
 DocType: Production Order Operation,Completed Qty,ສໍາເລັດຈໍານວນ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","{0}, ພຽງແຕ່ບັນຊີເດບິດສາມາດເຊື່ອມໂຍງກັບເຂົ້າການປ່ອຍສິນເຊື່ອອີກ"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,ລາຄາ {0} ເປັນຄົນພິການ
@@ -2406,39 +2450,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} ຈໍານວນ Serial ຕ້ອງການສໍາລັບລາຍການ {1}. ທ່ານໄດ້ສະຫນອງ {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,ອັດຕາປະເມີນມູນຄ່າໃນປະຈຸບັນ
 DocType: Item,Customer Item Codes,ລະຫັດລູກຄ້າສິນຄ້າ
+DocType: Training Event,Advance,Advance
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,ສໍາລັບການເຮັດ recurring ອີກເທື່ອຫນຶ່ງ.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,ແລກປ່ຽນເງິນຕາໄດ້ຮັບ / ການສູນເສຍ
 DocType: Opportunity,Lost Reason,ລືມເຫດຜົນ
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,ທີ່ຢູ່ໃຫມ່
 DocType: Quality Inspection,Sample Size,ຂະຫນາດຕົວຢ່າງ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,ກະລຸນາໃສ່ເອກະສານຮັບ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,ລາຍການທັງຫມົດໄດ້ຮັບການອະນຸແລ້ວ
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',ກະລຸນາລະບຸທີ່ຖືກຕ້ອງ &#39;ຈາກກໍລະນີສະບັບເລກທີ
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',ກະລຸນາລະບຸທີ່ຖືກຕ້ອງ &#39;ຈາກກໍລະນີສະບັບເລກທີ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,ສູນຕົ້ນທຶນເພີ່ມເຕີມສາມາດເຮັດໄດ້ພາຍໃຕ້ Groups ແຕ່ລາຍະການສາມາດຈະດໍາເນີນຕໍ່ບໍ່ແມ່ນ Groups
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ຜູ້ຊົມໃຊ້ແລະການອະນຸຍາດ
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},ໃບສັ່ງຜະລິດຂຽນເມື່ອ: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},ໃບສັ່ງຜະລິດຂຽນເມື່ອ: {0}
 DocType: Branch,Branch,ສາຂາ
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ການພິມແລະຍີ່ຫໍ້
 DocType: Company,Total Monthly Sales,Sales ລາຍເດືອນທັງຫມົດ
 DocType: Bin,Actual Quantity,ຈໍານວນຈິງ
 DocType: Shipping Rule,example: Next Day Shipping,ຍົກຕົວຢ່າງ: Shipping ວັນຖັດໄປ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} ບໍ່ໄດ້ພົບເຫັນ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},ການສະຫມັກແມ່ນ {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},ການສະຫມັກແມ່ນ {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Fee Schedule Program
 DocType: Fee Schedule Program,Student Batch,Batch ນັກສຶກສາ
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,ເລືອກ * ຈາກ `tabVital Signs` ບ່ອນທີ່ຄົນເຈັບ = &#39;{0}&#39; ຄໍາສັ່ງໂດຍ sign_date desc limit 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,ເຮັດໃຫ້ນັກສຶກສາ
 DocType: Supplier Scorecard Scoring Standing,Min Grade,ຕ່ໍາສຸດ Grade
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},ທ່ານໄດ້ຖືກເຊື້ອເຊີນເພື່ອເຮັດວຽກຮ່ວມກັນກ່ຽວກັບໂຄງການ: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},ແພດບໍ່ມີຢູ່ໃນ {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},ທ່ານໄດ້ຖືກເຊື້ອເຊີນເພື່ອເຮັດວຽກຮ່ວມກັນກ່ຽວກັບໂຄງການ: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},ແພດບໍ່ມີຢູ່ໃນ {0}
 DocType: Leave Block List Date,Block Date,Block ວັນທີ່
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},ເພີ່ມຊື່ສະຖານທີ່ການສະເຫນີຂາຍໃນ doctype {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Supplier ສົ່ງຫມາຍເຫດ
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,ສະຫມັກວຽກນີ້
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,ສະຫມັກວຽກນີ້
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},ຕົວຈິງຈໍານວນ {0} / ລໍຖ້າຈໍານວນ {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},ຕົວຈິງຈໍານວນ {0} / ລໍຖ້າຈໍານວນ {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-commerce GSTIN
 DocType: Sales Order,Not Delivered,ບໍ່ໄດ້ສົ່ງ
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,ວັນທີຄາດວ່າຈະບໍ່ສາມາດເປັນວັນທີທີ່ມີການເຄື່ອນໄຫວ
 ,Bank Clearance Summary,ທະນາຄານ Summary Clearance
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","ສ້າງແລະຄຸ້ມຄອງປະຈໍາວັນ, ປະຈໍາອາທິດແລະປະຈໍາເດືອນຫົວເລື່ອງອີເມລ໌."
 DocType: Appraisal Goal,Appraisal Goal,ການປະເມີນຜົນເປົ້າຫມາຍ
@@ -2446,12 +2491,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,ອາຄານ
 DocType: Fee Schedule,Fee Structure,ຄ່າບໍລິການ
 DocType: Timesheet Detail,Costing Amount,ການໃຊ້ຈ່າຍຈໍານວນເງິນ
-DocType: Student Admission,Application Fee,ຄໍາຮ້ອງສະຫມັກຄ່າທໍານຽມ
+DocType: Student Admission Program,Application Fee,ຄໍາຮ້ອງສະຫມັກຄ່າທໍານຽມ
 DocType: Process Payroll,Submit Salary Slip,ຍື່ນສະເຫນີການ Slip ເງິນເດືອນ
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,ສ່ວນລົດ Maxiumm ສໍາລັບລາຍການ {0} ເປັນ {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,ສ່ວນລົດ Maxiumm ສໍາລັບລາຍການ {0} ເປັນ {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,ການນໍາເຂົ້າໃນການເປັນກຸ່ມ
 DocType: Sales Partner,Address & Contacts,ທີ່ຢູ່ແລະຕິດຕໍ່ພົວພັນ
 DocType: SMS Log,Sender Name,ຊື່ຜູ້ສົ່ງ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,ຈັດຮຽງຕາມເງື່ອນໄຂ
 DocType: POS Profile,[Select],[ເລືອກ]
 DocType: Vital Signs,Blood Pressure (diastolic),ຄວາມດັນເລືອດ (Diastolic)
 DocType: SMS Log,Sent To,ຖືກສົ່ງໄປ
@@ -2460,7 +2506,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,ຖັດໄປວັນທີບໍ່ສາມາດຈະຢູ່ໃນໄລຍະຜ່ານມາ
 DocType: Company,For Reference Only.,ສໍາລັບການກະສານອ້າງອີງເທົ່ານັ້ນ.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},ທ່ານຫມໍ {0} ບໍ່ມີຢູ່ໃນ {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,ເລືອກຊຸດ No
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,ເລືອກຊຸດ No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},ບໍ່ຖືກຕ້ອງ {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,"PINV, RET-"
 DocType: Fee Validity,Reference Inv,Reference Inv
@@ -2476,15 +2522,15 @@
 DocType: Normal Test Items,Require Result Value,ຕ້ອງການມູນຄ່າຜົນໄດ້ຮັບ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,ກໍລະນີສະບັບເລກທີບໍ່ສາມາດຈະເປັນ 0
 DocType: Item,Show a slideshow at the top of the page,ສະແດງໃຫ້ເຫັນ slideshow ເປັນຢູ່ປາຍສຸດຂອງຫນ້າ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,ແອບເປີ້ນ
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,ຮ້ານຄ້າ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,ແອບເປີ້ນ
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,ຮ້ານຄ້າ
 DocType: Project Type,Projects Manager,Manager ໂຄງການ
 DocType: Serial No,Delivery Time,ເວລາຂົນສົ່ງ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,ຜູ້ສູງອາຍຸຈາກຈໍານວນກ່ຽວກັບ
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,ການນັດຫມາຍຖືກຍົກເລີກ
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,ການນັດຫມາຍຖືກຍົກເລີກ
 DocType: Item,End of Life,ໃນຕອນທ້າຍຂອງການມີຊີວິດ
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,ການເດີນທາງ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,ບໍ່ມີການເຄື່ອນໄຫວຫຼືເລີ່ມຕົ້ນເງິນເດືອນໂຄງປະກອບການທີ່ພົບເຫັນສໍາລັບພະນັກງານ {0} ສໍາລັບກໍານົດວັນທີດັ່ງກ່າວ
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,ການເດີນທາງ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,ບໍ່ມີການເຄື່ອນໄຫວຫຼືເລີ່ມຕົ້ນເງິນເດືອນໂຄງປະກອບການທີ່ພົບເຫັນສໍາລັບພະນັກງານ {0} ສໍາລັບກໍານົດວັນທີດັ່ງກ່າວ
 DocType: Leave Block List,Allow Users,ອະນຸຍາດໃຫ້ຜູ້ຊົມໃຊ້
 DocType: Purchase Order,Customer Mobile No,ລູກຄ້າໂທລະສັບມືຖື
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Recurring
@@ -2493,12 +2539,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,ການປັບປຸງຄ່າໃຊ້ຈ່າຍ
 DocType: Item Reorder,Item Reorder,ລາຍການຮຽງລໍາດັບໃຫມ່
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Slip ສະແດງໃຫ້ເຫັນເງິນເດືອນ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,ການຖ່າຍໂອນການວັດສະດຸ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,ການຖ່າຍໂອນການວັດສະດຸ
 DocType: Fees,Send Payment Request,ສົ່ງຄໍາຮ້ອງຂໍການຊໍາລະເງິນ
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ລະບຸການດໍາເນີນງານ, ຄ່າໃຊ້ຈ່າຍປະຕິບັດແລະໃຫ້ການດໍາເນີນງານເປັນເອກະລັກທີ່ບໍ່ມີການປະຕິບັດງານຂອງທ່ານ."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ເອກະສານນີ້ແມ່ນໃນໄລຍະຂອບເຂດຈໍາກັດໂດຍ {0} {1} ສໍາລັບ item {4}. ທ່ານກໍາລັງເຮັດໃຫ້ຄົນອື່ນ {3} ຕໍ່ຕ້ານດຽວກັນ {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,ກະລຸນາທີ່ກໍານົດໄວ້ໄດ້ເກີດຂຶ້ນຫລັງຈາກບັນທຶກ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,ບັນຊີຈໍານວນເລືອກການປ່ຽນແປງ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,ບັນຊີຈໍານວນເລືອກການປ່ຽນແປງ
 DocType: Purchase Invoice,Price List Currency,ລາຄາສະກຸນເງິນ
 DocType: Naming Series,User must always select,ຜູ້ໃຊ້ຕ້ອງໄດ້ເລືອກ
 DocType: Stock Settings,Allow Negative Stock,ອະນຸຍາດໃຫ້ລົບ Stock
@@ -2518,7 +2564,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,ພະນັກງານ
 DocType: Sample Collection,Collected Time,ເກັບເວລາ
 DocType: Company,Sales Monthly History,ປະຫວັດລາຍເດືອນຂາຍ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,ເລືອກຊຸດ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,ເລືອກຊຸດ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} ແມ່ນບິນໄດ້ຢ່າງເຕັມສ່ວນ
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Vital Signs
 DocType: Training Event,End Time,ທີ່ໃຊ້ເວລາສຸດທ້າຍ
@@ -2526,16 +2572,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,ນຫັກລົບການຊໍາລະເງິນຫຼືການສູນເສຍ
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,ເງື່ອນໄຂສັນຍາມາດຕະຖານສໍາລັບການຂາຍຫຼືຊື້.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Group ໂດຍ Voucher
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,ທ່ານແນ່ໃຈວ່າທ່ານຕ້ອງການຍົກເລີກການນັດຫມາຍນີ້ບໍ?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,ແຜນການຂາຍ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},ກະລຸນາທີ່ກໍານົດໄວ້ບັນຊີມາດຕະຖານເງິນເດືອນ Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,ຄວາມຕ້ອງການໃນ
 DocType: Rename Tool,File to Rename,ເອກະສານການປ່ຽນຊື່
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},ກະລຸນາເລືອກ BOM ສໍາລັບລາຍການໃນແຖວ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},ກະລຸນາເລືອກ BOM ສໍາລັບລາຍການໃນແຖວ {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},ບັນຊີ {0} ບໍ່ກົງກັບກັບບໍລິສັດ {1} ໃນ Mode ຈາກບັນຊີ: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},ລະບຸ BOM {0} ບໍ່ມີສໍາລັບລາຍການ {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ຕາຕະລາງການບໍາລຸງຮັກສາ {0} ຕ້ອງໄດ້ຮັບການຍົກເລີກກ່ອນການຍົກເລີກການຂາຍສິນຄ້ານີ້
+DocType: POS Profile,Applicable for Users,ສາມາດໃຊ້ໄດ້ສໍາລັບຜູ້ໃຊ້
 DocType: Notification Control,Expense Claim Approved,ຄ່າໃຊ້ຈ່າຍການຮ້ອງຂໍອະນຸມັດ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Slip ເງິນເດືອນຂອງພະນັກງານ {0} ສ້າງຮຽບຮ້ອຍແລ້ວສໍາລັບການໄລຍະເວລານີ້
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Slip ເງິນເດືອນຂອງພະນັກງານ {0} ສ້າງຮຽບຮ້ອຍແລ້ວສໍາລັບການໄລຍະເວລານີ້
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,ຢາ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ຄ່າໃຊ້ຈ່າຍຂອງສິນຄ້າທີ່ຊື້
 DocType: Selling Settings,Sales Order Required,ຕ້ອງການຂາຍສິນຄ້າ
@@ -2560,6 +2608,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,ອົງການຈັດຕັ້ງ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,ອົງການຈັດຕັ້ງ
 DocType: BOM Update Tool,BOM Update Tool,ເຄື່ອງມື Update BOM
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","ບັນຊີພັກບໍ່ໄດ້ກໍານົດໄວ້, ກະລຸນາຕິດຕັ້ງບັນຊີພັກຝ່າຍດຽວໃນບໍລິສັດ"
 DocType: SG Creation Tool Course,Student Group Name,ຊື່ກຸ່ມນັກສຶກສາ
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,ສ້າງຄ່າທໍານຽມ
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,ກະລຸນາເຮັດໃຫ້ແນ່ໃຈວ່າທ່ານຕ້ອງການທີ່ຈະລົບເຮັດທຸລະກໍາທັງຫມົດຂອງບໍລິສັດນີ້. ຂໍ້ມູນຕົ້ນສະບັບຂອງທ່ານຈະຍັງຄົງເປັນມັນເປັນ. ການດໍາເນີນການນີ້ບໍ່ສາມາດຍົກເລີກໄດ້.
@@ -2568,29 +2617,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ quanitity ການວາງແຜນ ({2}) ໃນການຜະລິດການສັ່ງຊື້ {3}
 DocType: Shipping Rule,Shipping Rule Label,Label Shipping ກົດລະບຽບ
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,User Forum
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,ວັດຖຸດິບບໍ່ສາມາດມີຊ່ອງຫວ່າງ.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","ບໍ່ສາມາດປັບປຸງຫຼັກຊັບ, ໃບເກັບເງິນປະກອບດ້ວຍການຫຼຸດລົງລາຍການການຂົນສົ່ງ."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,ວັດຖຸດິບບໍ່ສາມາດມີຊ່ອງຫວ່າງ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","ບໍ່ສາມາດປັບປຸງຫຼັກຊັບ, ໃບເກັບເງິນປະກອບດ້ວຍການຫຼຸດລົງລາຍການການຂົນສົ່ງ."
 DocType: Lab Test Sample,Lab Test Sample,Lab Test Sample
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,ໄວອະນຸທິນ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,ທ່ານບໍ່ສາມາດມີການປ່ຽນແປງອັດຕາການຖ້າຫາກວ່າ BOM ທີ່ໄດ້ກ່າວມາ agianst ລາຍການໃດ
+DocType: Restaurant,Invoice Series Prefix,Invoice Series Prefix
 DocType: Employee,Previous Work Experience,ຕໍາແຫນ່ງທີ່ເຄີຍເຮັດຜ່ານມາ
 DocType: Stock Entry,For Quantity,ສໍາລັບປະລິມານ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},ກະລຸນາໃສ່ການວາງແຜນຈໍານວນສໍາລັບລາຍການ {0} ທີ່ຕິດຕໍ່ກັນ {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},ກະລຸນາໃສ່ການວາງແຜນຈໍານວນສໍາລັບລາຍການ {0} ທີ່ຕິດຕໍ່ກັນ {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} ບໍ່ໄດ້ສົ່ງ
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,ການຮ້ອງຂໍສໍາລັບລາຍການ.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,ຄໍາສັ່ງການຜະລິດແຍກຕ່າງຫາກຈະໄດ້ຮັບການສ້າງຕັ້ງຂື້ນສໍາລັບລາຍການດີໃນແຕ່ລະສໍາເລັດຮູບ.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} ຕ້ອງກະທົບທາງລົບໃນເອກະສານຜົນຕອບແທນ
 ,Minutes to First Response for Issues,ນາທີຄວາມຮັບຜິດຊອບຫນ້າທໍາອິດສໍາລັບບັນຫາ
 DocType: Purchase Invoice,Terms and Conditions1,ຂໍ້ກໍານົດແລະ Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,ຊື່ຂອງສະຖາບັນສໍາລັບການທີ່ທ່ານຈະຕິດຕັ້ງລະບົບນີ້.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,ຊື່ຂອງສະຖາບັນສໍາລັບການທີ່ທ່ານຈະຕິດຕັ້ງລະບົບນີ້.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","ເຂົ້າບັນຊີ frozen ເຖິງວັນນີ້, ບໍ່ມີໃຜສາມາດເຮັດໄດ້ / ປັບປຸງແກ້ໄຂການເຂົ້າຍົກເວັ້ນພາລະບົດບາດທີ່ລະບຸໄວ້ຂ້າງລຸ່ມນີ້."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,ກະລຸນາຊ່ວຍປະຢັດເອກະສານກ່ອນການສ້າງຕາຕະລາງການບໍາລຸງຮັກສາ
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,ລາຄາຫຼ້າສຸດປັບປຸງໃນ Boms ທັງຫມົດ
 DocType: Fee Schedule,Successful,ປະສົບຜົນສໍາເລັດ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,ສະຖານະການ
 DocType: UOM,Check this to disallow fractions. (for Nos),ກວດສອບນີ້ຈະບໍ່ອະນຸຍາດແຕ່ສ່ວນຫນຶ່ງ. (ສໍາລັບພວກເຮົາ)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,ໄດ້ໃບສັ່ງຜະລິດຕໍ່ໄປນີ້ໄດ້ຮັບການສ້າງຕັ້ງ:
-DocType: Student Admission,Naming Series (for Student Applicant),ການຕັ້ງຊື່ Series (ສໍາລັບນັກສຶກສາສະຫມັກ)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,ໄດ້ໃບສັ່ງຜະລິດຕໍ່ໄປນີ້ໄດ້ຮັບການສ້າງຕັ້ງ:
+DocType: Student Admission Program,Naming Series (for Student Applicant),ການຕັ້ງຊື່ Series (ສໍາລັບນັກສຶກສາສະຫມັກ)
 DocType: Delivery Note,Transporter Name,ຊື່ການຂົນສົ່ງ
 DocType: Authorization Rule,Authorized Value,ມູນຄ່າອະນຸຍາດ
 DocType: BOM,Show Operations,ສະແດງໃຫ້ເຫັນການປະຕິບັດ
@@ -2614,7 +2664,7 @@
 ,Employees working on a holiday,ພະນັກງານເຮັດວຽກກ່ຽວກັບວັນພັກ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,ເຄື່ອງຫມາຍປັດຈຸບັນ
 DocType: Project,% Complete Method,% ວິທີການສໍາເລັດ
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,ຢາເສບຕິດ
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,ຢາເສບຕິດ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},ວັນທີເລີ່ມຕົ້ນບໍາລຸງຮັກສາບໍ່ສາມາດກ່ອນທີ່ວັນທີສໍາລັບການບໍ່ມີ Serial {0}
 DocType: Production Order,Actual End Date,ຕົວຈິງວັນທີ່ສິ້ນສຸດ
 DocType: BOM,Operating Cost (Company Currency),ຄ່າໃຊ້ຈ່າຍປະຕິບັດການ (ບໍລິສັດສະກຸນເງິນ)
@@ -2632,13 +2682,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,ການອະນຸມັດຜູ້ໃຊ້ບໍ່ສາມາດເຊັ່ນດຽວກັນກັບຜູ້ໃຊ້ລະບຽບການກ່ຽວຂ້ອງກັບ
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),ອັດຕາຂັ້ນພື້ນຖານ (ຕາມ Stock UOM)
 DocType: SMS Log,No of Requested SMS,ບໍ່ມີຂອງ SMS ຂໍ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,ອອກຈາກໂດຍບໍ່ມີການຈ່າຍບໍ່ມີຄໍາວ່າດ້ວຍການອະນຸມັດການບັນທຶກການອອກຈາກຄໍາຮ້ອງສະຫມັກ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,ອອກຈາກໂດຍບໍ່ມີການຈ່າຍບໍ່ມີຄໍາວ່າດ້ວຍການອະນຸມັດການບັນທຶກການອອກຈາກຄໍາຮ້ອງສະຫມັກ
 DocType: Campaign,Campaign-.####,ຂະບວນການ -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ຂັ້ນຕອນຕໍ່ໄປ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,ກະລຸນາສະຫນອງໃຫ້ແກ່ລາຍການທີ່ລະບຸໄວ້ໃນລາຄາທີ່ເປັນໄປໄດ້ທີ່ດີທີ່ສຸດ
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Make Invoice
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto ໃກ້ໂອກາດພາຍໃນ 15 ວັນ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,ໃບສັ່ງຊື້ຍັງບໍ່ໄດ້ຮັບອະນຸຍາດສໍາລັບການ {0} ເນື່ອງຈາກການນຸ່ງປະຈໍາດັດນີຊີ້ວັດຂອງ {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,ໃບສັ່ງຊື້ຍັງບໍ່ໄດ້ຮັບອະນຸຍາດສໍາລັບການ {0} ເນື່ອງຈາກການນຸ່ງປະຈໍາດັດນີຊີ້ວັດຂອງ {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,ປີສຸດທ້າຍ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,quot /% Lead
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,quot /% Lead
@@ -2646,6 +2696,7 @@
 DocType: Vital Signs,Nutrition Values,Nutrition Values
 DocType: Lab Test Template,Is billable,ແມ່ນໃບລາຍຈ່າຍ
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",&quot;ຕາຕະລາງການແພດ&quot; ແລະ &quot;ເວລາກໍານົດການແຕ່ງຕັ້ງ&quot; ຕ້ອງຖືກກໍານົດໃຫ້ທ່ານດຣ {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,A ຈໍາຫນ່າຍພາກສ່ວນທີສາມ / dealer / ຄະນະກໍາມະຕົວແທນ / ເປັນພີ່ນ້ອງກັນ / ຕົວແທນຈໍາຫນ່າຍຜູ້ທີ່ຂາຍໃນລາຄາຜະລິດຕະພັນບໍລິສັດສໍາລັບຄະນະກໍາມະ.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} ຕໍ່ສັ່ງຊື້ {1}
 DocType: Patient,Patient Demographics,Patient Demographics
@@ -2675,7 +2726,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","ແມ່ແບບພາສີມາດຕະຖານທີ່ສາມາດໄດ້ຮັບການນໍາໃຊ້ກັບທຸກການຊື້. ແມ່ແບບນີ້ສາມາດປະກອບດ້ວຍບັນຊີລາຍຊື່ຂອງຫົວຫນ້າພາສີແລະຍັງຫົວຫນ້າຄ່າໃຊ້ຈ່າຍອື່ນໆເຊັ່ນ: &quot;ສົ່ງ&quot;, &quot;ການປະກັນໄພ&quot;, &quot;ການຈັດການ&quot; ແລະອື່ນໆ #### ຫມາຍເຫດອັດຕາພາສີທີ່ທ່ານອະທິບາຍຢູ່ທີ່ນີ້ຈະເປັນອັດຕາພາສີມາດຕະຖານສໍາລັບການທັງຫມົດ ** ລາຍະການ * *. ຖ້າຫາກວ່າມີການ ** ** ທີ່ມີອັດຕາທີ່ແຕກຕ່າງກັນ, ພວກເຂົາເຈົ້າຕ້ອງໄດ້ຮັບການເພີ່ມໃນ ** ພາສີສິນຄ້າ ** ຕາຕະລາງໃນ ** ສິນຄ້າ ** ຕົ້ນສະບັບ. #### ລາຍລະອຽດຂອງຖັນ 1 ເຄື່ອງກວດ: - ນີ້ສາມາດຈະຢູ່ ** ສຸດທິທັງຫມົດ ** (ທີ່ເປັນຜົນລວມຂອງຈໍານວນເງິນຂັ້ນພື້ນຖານ). - ** ກ່ຽວກັບ Row ກ່ອນຫນ້າທັງຫມົດ / ຈໍານວນເງິນ ** (ສໍາລັບພາສີອາກອນສະສົມຫຼືຄ່າບໍລິການ). ຖ້າຫາກວ່າທ່ານເລືອກຕົວເລືອກນີ້, ພາສີຈະໄດ້ຮັບການນໍາໃຊ້ເປັນອັດຕາສ່ວນຂອງການຕິດຕໍ່ກັນທີ່ຜ່ານມາ (ໃນຕາຕະລາງພາສີ) ເປັນຈໍານວນເງິນຫຼືຈໍານວນທັງຫມົດ. - ** ຈິງ ** (ທີ່ໄດ້ກ່າວມາ). 2. ຫົວຫນ້າບັນຊີ: ບັນຊີແຍກປະບັນຊີພາຍໃຕ້ການທີ່ພາສີນີ້ຈະໄດ້ຮັບການຈອງ 3 ສູນຕົ້ນທຶນ: ຖ້າຫາກວ່າພາສີ / ຄ່າໃຊ້ຈ່າຍແມ່ນເປັນລາຍຮັບ (ເຊັ່ນ: ການຂົນສົ່ງ) ຫລືຄ່າໃຊ້ຈ່າຍມັນຈໍາເປັນຕ້ອງໄດ້ຮັບການ booked ຕໍ່ສູນຕົ້ນທຶນໄດ້. 4. ລາຍລະອຽດ: ລາຍລະອຽດຂອງພາສີ (ທີ່ຈະໄດ້ຮັບການພິມອອກໃນໃບແຈ້ງຫນີ້ / ຄໍາເວົ້າ). 5. ອັດຕາ: ອັດຕາພາສີ. 6. ຈໍານວນເງິນ: ຈໍານວນເງິນພາສີ. 7 ທັງຫມົດ: ທັງຫມົດທີ່ສະສົມກັບຈຸດນີ້. 8. ກະລຸນາໃສ່ Row: ຖ້າຫາກວ່າຂຶ້ນຢູ່ກັບ &quot;Row ກ່ອນຫນ້າທັງຫມົດ&quot; ທ່ານສາມາດເລືອກຈໍານວນການຕິດຕໍ່ກັນທີ່ຈະໄດ້ຮັບການປະຕິບັດເປັນພື້ນຖານສໍາລັບການຄິດໄລ່ນີ້ (ໃນຕອນຕົ້ນແມ່ນຕິດຕໍ່ກັນຜ່ານມາ). 9. ພິຈາລະນາຈ່າຍພາສີຫລືຄ່າທໍານຽມສໍາລັບການ: ໃນພາກນີ້ທ່ານສາມາດກໍານົດຖ້າຫາກວ່າພາສີ / ຮັບຜິດຊອບແມ່ນມີພຽງແຕ່ສໍາລັບການປະເມີນມູນຄ່າ (ບໍ່ແມ່ນສ່ວນຫນຶ່ງຂອງທັງຫມົດ) ຫຼືພຽງແຕ່ສໍາລັບການທັງຫມົດ (ບໍ່ເພີ່ມມູນຄ່າໃຫ້ສິນຄ້າ) ຫຼືສໍາລັບທັງສອງ. 10 ເພີ່ມຫຼືຫັກ: ບໍ່ວ່າຈະເປັນທ່ານຕ້ອງການທີ່ຈະເພີ່ມຫຼືຫັກອາກອນ."
 DocType: Homepage,Homepage,ຫນ້າທໍາອິດ
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,ເລືອກຫມໍ ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',update tabConsultation set invoice = &#39;{0}&#39; where name = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd ຈໍານວນ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},ຄ່າບໍລິການບັນທຶກຂຽນເມື່ອຫລາຍ - {0}
 DocType: Asset Category Account,Asset Category Account,ບັນຊີຊັບສິນປະເພດ
@@ -2687,7 +2737,7 @@
 DocType: Asset,Manual,ຄູ່ມື
 DocType: Salary Component Account,Salary Component Account,ບັນຊີເງິນເດືອນ Component
 DocType: Global Defaults,Hide Currency Symbol,ຊ່ອນສະກຸນເງິນ Symbol
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","ຕົວຢ່າງ: ທະນາຄານ, ເງິນສົດ, ບັດເຄຣດິດ"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","ຕົວຢ່າງ: ທະນາຄານ, ເງິນສົດ, ບັດເຄຣດິດ"
 DocType: Lead Source,Source Name,ແຫຼ່ງຊື່
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","ຄວາມດັນເລືອດປົກກະຕິຢູ່ໃນຜູ້ໃຫຍ່ແມ່ນປະມານ 120 mmHg systolic ແລະ 80 mmHg diastolic, ຫຍໍ້ວ່າ &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Credit Note
@@ -2706,16 +2756,16 @@
 DocType: Patient,Occupation,ອາຊີບ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,ຕິດຕໍ່ກັນ {0}: ວັນທີ່ເລີ່ມຕ້ອງມີກ່ອນວັນທີ່ສິ້ນສຸດ
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),ທັງຫມົດ (ຈໍານວນ)
-DocType: Sales Invoice,This Document,ເອກະສານນີ້
 DocType: Installation Note Item,Installed Qty,ການຕິດຕັ້ງຈໍານວນ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,ນີ້ອາດຈະເປັນເພາະວ່າບາງທີ່ຢູ່ອີເມວບໍ່ຖືກຕ້ອງໃນ
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,ທ່ານເພີ່ມ
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,ຜົນການຝຶກອົບຮົມ
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,ຜົນການຝຶກອົບຮົມ
 DocType: Purchase Invoice,Is Paid,ແມ່ນການຊໍາລະເງິນ
 DocType: Salary Structure,Total Earning,ກໍາໄຮທັງຫມົດ
 DocType: Purchase Receipt,Time at which materials were received,ເວລາທີ່ອຸປະກອນທີ່ໄດ້ຮັບ
 DocType: Stock Ledger Entry,Outgoing Rate,ອັດຕາລາຍຈ່າຍ
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,ຕົ້ນສະບັບສາຂາອົງການຈັດຕັ້ງ.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,ຕົ້ນສະບັບສາຂາອົງການຈັດຕັ້ງ.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,ຫຼື
 DocType: Sales Order,Billing Status,ສະຖານະການເອີ້ນເກັບເງິນ
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ລາຍງານສະບັບທີ່ເປັນ
@@ -2730,8 +2780,9 @@
 DocType: Notification Control,Sales Order Message,Message ຂາຍສິນຄ້າ
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","ກໍານົດມູນຄ່າມາດຕະຖານຄືບໍລິສັດ, ສະກຸນເງິນ, ປັດຈຸບັນປີງົບປະມານ, ແລະອື່ນໆ"
 DocType: Payment Entry,Payment Type,ປະເພດການຊໍາລະເງິນ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ກະລຸນາເລືອກຊຸດສໍາລັບລາຍການທີ່ {0}. ບໍ່ສາມາດຊອກຫາ batch ດຽວທີ່ຕອບສະຫນອງຂໍ້ກໍານົດນີ້
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ກະລຸນາເລືອກຊຸດສໍາລັບລາຍການທີ່ {0}. ບໍ່ສາມາດຊອກຫາ batch ດຽວທີ່ຕອບສະຫນອງຂໍ້ກໍານົດນີ້
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ກະລຸນາເລືອກຊຸດສໍາລັບລາຍການທີ່ {0}. ບໍ່ສາມາດຊອກຫາ batch ດຽວທີ່ຕອບສະຫນອງຂໍ້ກໍານົດນີ້
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ກະລຸນາເລືອກຊຸດສໍາລັບລາຍການທີ່ {0}. ບໍ່ສາມາດຊອກຫາ batch ດຽວທີ່ຕອບສະຫນອງຂໍ້ກໍານົດນີ້
+DocType: Hub Category,Parent Category,ຫມວດຫມູ່ຂອງພໍ່ແມ່
 DocType: Process Payroll,Select Employees,ເລືອກພະນັກງານ
 DocType: Opportunity,Potential Sales Deal,Deal Sales ທ່າແຮງ
 DocType: Complaint,Complaints,ການຮ້ອງທຸກ
@@ -2769,7 +2820,7 @@
 DocType: Bin,Reserved Quantity,ຈໍານວນສະຫງວນ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,ກະລຸນາໃສ່ທີ່ຢູ່ອີເມວທີ່ຖືກຕ້ອງ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,ກະລຸນາໃສ່ທີ່ຢູ່ອີເມວທີ່ຖືກຕ້ອງ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,ກະລຸນາເລືອກລາຍະການໃນລົດເຂັນ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,ກະລຸນາເລືອກລາຍະການໃນລົດເຂັນ
 DocType: Landed Cost Voucher,Purchase Receipt Items,ລາຍການຊື້ຮັບ
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,ຮູບແບບການປັບແຕ່ງ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,ງານທີ່ຄັ່ງຄ້າງ
@@ -2779,15 +2830,15 @@
 DocType: Payment Request,Amount in customer's currency,ຈໍານວນເງິນໃນສະກຸນເງິນຂອງລູກຄ້າ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,ສົ່ງ
 DocType: Stock Reconciliation Item,Current Qty,ຈໍານວນໃນປັດຈຸບັນ
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,ຕື່ມການສະຫນອງ
+DocType: Restaurant Menu,Restaurant Menu,ຮ້ານອາຫານເມນູ
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,prev
 DocType: Appraisal Goal,Key Responsibility Area,ຄວາມຮັບຜິດຊອບທີ່ສໍາຄັນ
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","ສໍາຫລັບຂະບວນນັກສຶກສາຊ່ວຍໃຫ້ທ່ານຕິດຕາມການເຂົ້າຮຽນ, ການປະເມີນຜົນແລະຄ່າທໍານຽມສໍາລັບນັກສຶກສາ"
 DocType: Payment Entry,Total Allocated Amount,ນວນການຈັດສັນທັງຫມົດ
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,ກໍານົດບັນຊີສິນຄ້າຄົງຄັງໃນຕອນຕົ້ນສໍາລັບການສິນຄ້າຄົງຄັງ perpetual
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,ກໍານົດບັນຊີສິນຄ້າຄົງຄັງໃນຕອນຕົ້ນສໍາລັບການສິນຄ້າຄົງຄັງ perpetual
 DocType: Item Reorder,Material Request Type,ອຸປະກອນການຮ້ອງຂໍປະເພດ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},ຖືກຕ້ອງອະນຸເງິນເດືອນຈາກ {0} ກັບ {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage ແມ່ນອັນເຕັມທີ່, ບໍ່ໄດ້ປະຢັດ"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage ແມ່ນອັນເຕັມທີ່, ບໍ່ໄດ້ປະຢັດ"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,ຕິດຕໍ່ກັນ {0}: UOM ປັດໄຈການແປງເປັນການບັງຄັບ
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,ຄວາມອາດສາມາດຫ້ອງ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref
@@ -2826,16 +2877,18 @@
 DocType: Project,Task Completion,ວຽກງານສໍາເລັດ
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,ບໍ່ໄດ້ຢູ່ໃນ Stock
 DocType: Appraisal,HR User,User HR
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,ພາສີອາກອນແລະຄ່າບໍລິການຫັກ
-apps/erpnext/erpnext/hooks.py +129,Issues,ບັນຫາ
+apps/erpnext/erpnext/hooks.py +138,Issues,ບັນຫາ
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},ສະຖານະພາບຕ້ອງເປັນຫນຶ່ງໃນ {0}
 DocType: Sales Invoice,Debit To,ເດບິດໄປ
+DocType: Restaurant Menu Item,Restaurant Menu Item,Restaurant Menu Item
 DocType: Delivery Note,Required only for sample item.,ຕ້ອງການສໍາລັບລາຍການຕົວຢ່າງ.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ຈໍານວນຕົວຈິງຫຼັງຈາກການ
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},ບໍ່ມີຄວາມຜິດພາດພຽງເງິນເດືອນພົບໃນລະຫວ່າງ {0} ແລະ {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},ບໍ່ມີຄວາມຜິດພາດພຽງເງິນເດືອນພົບໃນລະຫວ່າງ {0} ແລະ {1}
 ,Pending SO Items For Purchase Request,ທີ່ຍັງຄ້າງ SO ລາຍການສໍາລັບການຈອງຊື້
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,ຮັບສະຫມັກນັກສຶກສາ
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} ເປັນຄົນພິການ
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,ຮັບສະຫມັກນັກສຶກສາ
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} ເປັນຄົນພິການ
 DocType: Supplier,Billing Currency,ສະກຸນເງິນ Billing
 DocType: Sales Invoice,SINV-RET-,"SINV, RET-"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,ຂະຫນາດໃຫຍ່ພິເສດ
@@ -2858,6 +2911,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,ກະລຸນາທີ່ບໍ່ມີການໄປຢ້ຽມຢາມທີ່ຕ້ອງການ
 DocType: Stock Settings,Default Valuation Method,ວິທີການປະເມີນມູນຄ່າໃນຕອນຕົ້ນ
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,ຄ່າບໍລິການ
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,ປັບປຸງໃນຄວາມຄືບຫນ້າ. ມັນອາດຈະໃຊ້ເວລາໃນຂະນະທີ່.
 DocType: Vehicle Log,Fuel Qty,ນໍ້າມັນເຊື້ອໄຟຈໍານວນ
 DocType: Production Order Operation,Planned Start Time,ເວລາການວາງແຜນ
 DocType: Course,Assessment,ການປະເມີນຜົນ
@@ -2873,7 +2927,7 @@
 DocType: Price List,Price List Master,ລາຄາຕົ້ນສະບັບ
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ທັງຫມົດຂອງທຸລະກໍາສາມາດຕິດແທຕໍ່ຫລາຍຄົນຂາຍ ** ** ດັ່ງນັ້ນທ່ານສາມາດກໍານົດແລະຕິດຕາມກວດກາເປົ້າຫມາຍ.
 ,S.O. No.,ດັ່ງນັ້ນສະບັບເລກທີ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},ກະລຸນາສ້າງລູກຄ້າຈາກ Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},ກະລຸນາສ້າງລູກຄ້າຈາກ Lead {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,ເລືອກຄົນເຈັບ
 DocType: Price List,Applicable for Countries,ສາມາດນໍາໃຊ້ສໍາລັບປະເທດ
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,ຊື່ພາລາມິເຕີ
@@ -2905,27 +2959,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ບັນຊີຄ່າໃຊ້ຈ່າຍ / ຄວາມແຕກຕ່າງ ({0}) ຈະຕ້ອງບັນຊີກໍາໄຮຫລືຂາດທຶນ &#39;
 DocType: Project,Copied From,ຄັດລອກຈາກ
 DocType: Project,Copied From,ຄັດລອກຈາກ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},ຄວາມຜິດພາດຊື່: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,ການຂາດແຄນ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},ຄວາມຜິດພາດຊື່: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,ການຂາດແຄນ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} ບໍ່ທີ່ກ່ຽວຂ້ອງກັບ {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ຜູ້ເຂົ້າຮ່ວມສໍາລັບພະນັກງານ {0} ແມ່ນຫມາຍແລ້ວ
 DocType: Packing Slip,If more than one package of the same type (for print),ຖ້າຫາກວ່າຫຼາຍກ່ວາຫນຶ່ງຊຸດຂອງປະເພດດຽວກັນ (ສໍາລັບການພິມ)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,ກະລຸນາຕັ້ງຄ່າລູກຄ້າເລີ່ມຕົ້ນໃນການຕັ້ງຮ້ານອາຫານ
 ,Salary Register,ເງິນເດືອນຫມັກສະມາຊິກ
 DocType: Warehouse,Parent Warehouse,Warehouse ພໍ່ແມ່
 DocType: C-Form Invoice Detail,Net Total,Total net
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Default BOM ບໍ່ພົບລາຍການ {0} ແລະໂຄງການ {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Default BOM ບໍ່ພົບລາຍການ {0} ແລະໂຄງການ {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,ກໍານົດປະເພດການກູ້ຢືມເງິນຕ່າງໆ
 DocType: Bin,FCFS Rate,FCFS ອັດຕາ
 DocType: Payment Reconciliation Invoice,Outstanding Amount,ຈໍານວນເງິນທີ່ຍັງຄ້າງຄາ
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),ທີ່ໃຊ້ເວລາ (ໃນນາທີ)
 DocType: Project Task,Working,ການເຮັດວຽກ
 DocType: Stock Ledger Entry,Stock Queue (FIFO),ແຖວ Stock (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,ປີທາງດ້ານການເງິນ
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,ປີທາງດ້ານການເງິນ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,ບໍ່ສາມາດແກ້ໄຂມາດຕະຖານການທໍາງານຂອງຄະແນນສໍາລັບ {0}. ເຮັດໃຫ້ແນ່ໃຈວ່າສູດແມ່ນຖືກຕ້ອງ.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,ມີລາຄາຖືກທີ່ສຸດ
 DocType: Healthcare Settings,Out Patient Settings,ອອກກໍາລັງກາຍຂອງຄົນເຈັບ
 DocType: Account,Round Off,ຕະຫຼອດໄປ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,ຈໍານວນຕ້ອງເປັນບວກ
 ,Requested Qty,ຮຽກຮ້ອງໃຫ້ຈໍານວນ
 DocType: Tax Rule,Use for Shopping Cart,ນໍາໃຊ້ສໍາລັບໂຄງຮ່າງການໄປຊື້ເຄື່ອງ
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},ມູນຄ່າ {0} ສໍາລັບຄຸນສົມບັດ {1} ບໍ່ມີຢູ່ໃນບັນຊີລາຍຊື່ຂອງສິນຄ້າທີ່ຖືກຕ້ອງຂອງສິນຄຸນຄ່າສໍາລັບລາຍການ {2}
@@ -2934,7 +2990,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","ຄ່າບໍລິການຈະໄດ້ຮັບການແຈກຢາຍໂດຍອີງທຽບໃນຈໍານວນລາຍການຫຼືຈໍານວນເງິນທີ່, ເປັນຕໍ່ການຄັດເລືອກຂອງ"
 DocType: Maintenance Visit,Purposes,ວັດຖຸປະສົງ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,atleast ຫນຶ່ງລາຍການຄວນຈະໄດ້ຮັບເຂົ້າໄປໃນປະລິມານກະທົບທາງລົບໃນເອກະສານຜົນຕອບແທນ
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,ຕື່ມການສະຫນາມ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ການດໍາເນີນງານ {0} ຕໍ່ໄປອີກແລ້ວກ່ວາຊົ່ວໂມງການເຮັດວຽກທີ່ມີຢູ່ໃນເວີກສະເຕຊັນ {1}, ທໍາລາຍລົງດໍາເນີນການເຂົ້າໄປໃນການດໍາເນີນງານຫຼາຍ"
 ,Requested,ການຮ້ອງຂໍ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,ບໍ່ມີຂໍ້ສັງເກດ
@@ -2946,6 +3001,8 @@
 DocType: Employee Loan,Repaid/Closed,ຊໍາລະຄືນ / ປິດ
 DocType: Item,Total Projected Qty,ທັງຫມົດໂຄງການຈໍານວນ
 DocType: Monthly Distribution,Distribution Name,ຊື່ການແຜ່ກະຈາຍ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Supplier&gt; Supplier Type
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","ອັດຕາການປະເມີນບໍ່ພົບສໍາລັບລາຍການ {0}, ທີ່ຕ້ອງການເຮັດບັນຊີການບັນຊີສໍາລັບ {1} {2}. ຖ້າລາຍການກໍາລັງດໍາເນີນການເປັນລາຍະການອັດຕາການປະເມີນຄ່າຢູ່ໃນ {1}, ກະລຸນາບອກວ່າຢູ່ໃນຕາຕະລາງ {1} ຕາຕະລາງ. ຖ້າບໍ່ດັ່ງນັ້ນ, ກະລຸນາສ້າງການຊື້ຂາຍຮຸ້ນສໍາລັບລາຍະການຫຼືບອກອັດຕາການປະເມີນໃນບັນທຶກລາຍການ, ແລະຫຼັງຈາກນັ້ນໃຫ້ສົ່ງ / ຍົກເລີກການເຂົ້ານີ້"
 DocType: Course,Course Code,ລະຫັດຂອງລາຍວິຊາ
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},ກວດສອບຄຸນນະພາບທີ່ຕ້ອງການສໍາລັບລາຍການ {0}
 DocType: POS Settings,Use POS in Offline Mode,ໃຊ້ POS ໃນໂຫມດ Offline
@@ -2956,14 +3013,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,ການຄຸ້ມຄອງການເປັນໄມ້ຢືນຕົ້ນອານາເຂດຂອງ.
 DocType: Journal Entry Account,Sales Invoice,ໃບເກັບເງິນການຂາຍ
 DocType: Journal Entry Account,Party Balance,ດຸນພັກ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,ກະລຸນາເລືອກສະຫມັກຕໍາ Discount On
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,ກະລຸນາເລືອກສະຫມັກຕໍາ Discount On
 DocType: Company,Default Receivable Account,ມາດຕະຖານ Account Receivable
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ສ້າງ Entry ທະນາຄານສໍາລັບການເງິນເດືອນທັງຫມົດໄດ້ຈ່າຍສໍາລັບເງື່ອນໄຂການຄັດເລືອກຂ້າງເທິງ
 DocType: Physician,Physician Schedule,Schedule Physician
 DocType: Purchase Invoice,Deemed Export,Deemed ສົ່ງອອກ
 DocType: Stock Entry,Material Transfer for Manufacture,ອຸປະກອນການໂອນສໍາລັບການຜະລິດ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,ເປີເຊັນສ່ວນລົດສາມາດນໍາໃຊ້ບໍ່ວ່າຈະຕໍ່ລາຄາຫຼືສໍາລັບລາຄາທັງຫມົດ.
-DocType: Purchase Invoice,Half-yearly,ເຄິ່ງຫນຶ່ງຂອງການປະຈໍາປີ
+DocType: Subscription,Half-yearly,ເຄິ່ງຫນຶ່ງຂອງການປະຈໍາປີ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Entry ບັນຊີສໍາລັບ Stock
 DocType: Lab Test,LabTest Approver,ຜູ້ຮັບຮອງ LabTest
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,ທ່ານໄດ້ປະເມີນແລ້ວສໍາລັບມາດຕະຖານການປະເມີນຜົນ {}.
@@ -2992,13 +3049,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,ພິເສດຂະຫນາດນ້ອຍ
 DocType: Company,Standard Template,ແມ່ແບບມາດຕະຖານ
 DocType: Training Event,Theory,ທິດສະດີ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,ການເຕືອນໄພ: ວັດສະດຸຂໍຈໍານວນແມ່ນຫນ້ອຍກ່ວາສັ່ງຊື້ຂັ້ນຕ່ໍາຈໍານວນ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,ການເຕືອນໄພ: ວັດສະດຸຂໍຈໍານວນແມ່ນຫນ້ອຍກ່ວາສັ່ງຊື້ຂັ້ນຕ່ໍາຈໍານວນ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,ບັນຊີ {0} ແມ່ນ frozen
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ນິຕິບຸກຄົນ / ບໍລິສັດຍ່ອຍທີ່ມີໃນຕາຕະລາງທີ່ແຍກຕ່າງຫາກຂອງບັນຊີເປັນອົງການຈັດຕັ້ງ.
 DocType: Payment Request,Mute Email,mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","ສະບຽງອາຫານ, ເຄື່ອງດື່ມແລະຢາສູບ"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},ພຽງແຕ່ສາມາດເຮັດໃຫ້ຊໍາລະເງິນກັບຍັງບໍ່ເອີ້ນເກັບ {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,ອັດຕາການຄະນະກໍາມະບໍ່ສາມາດຈະຫຼາຍກ່ວາ 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},ພຽງແຕ່ສາມາດເຮັດໃຫ້ຊໍາລະເງິນກັບຍັງບໍ່ເອີ້ນເກັບ {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,ອັດຕາການຄະນະກໍາມະບໍ່ສາມາດຈະຫຼາຍກ່ວາ 100
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,ກະລຸນາໃສ່ {0} ທໍາອິດ
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,ບໍ່ມີການຕອບຈາກ
@@ -3016,10 +3073,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,ສີ
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,ເງື່ອນໄຂການປະເມີນຜົນ
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,ປ້ອງກັນບໍ່ໃຫ້ໃບສັ່ງຊື້
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,ຫນ້າຢ້ານ
 DocType: Patient Appointment,Scheduled,ກໍານົດ
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,ຮ້ອງຂໍໃຫ້ມີສໍາລັບວົງຢືມ.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ກະລຸນາຕັ້ງລະບົບການຕັ້ງຊື່ພະນັກງານໃນຊັບພະຍາກອນມະນຸດ&gt; HR Settings
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",ກະລຸນາເລືອກລາຍການທີ່ &quot;ແມ່ນ Stock Item&quot; ແມ່ນ &quot;ບໍ່ມີ&quot; ແລະ &quot;ແມ່ນສິນຄ້າລາຄາ&quot; ເປັນ &quot;ແມ່ນ&quot; ແລະບໍ່ມີມັດຜະລິດຕະພັນອື່ນໆ
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,ເລືອກລູກຄ້າ
 DocType: Student Log,Academic,ວິຊາການ
 DocType: Patient,Personal and Social History,ປະວັດສາດສ່ວນບຸກຄົນແລະສັງຄົມ
 DocType: Fee Schedule,Fee Breakup for each student,ຄ່າທໍານຽມສໍາລັບນັກຮຽນແຕ່ລະຄົນ
@@ -3029,7 +3087,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,ອັດຕາປະເມີນມູນຄ່າ
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,ລາຄາສະກຸນເງິນບໍ່ໄດ້ເລືອກ
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,ລາຄາສະກຸນເງິນບໍ່ໄດ້ເລືອກ
 apps/erpnext/erpnext/config/healthcare.py +46,Results,ຜົນການຄົ້ນຫາ
 ,Student Monthly Attendance Sheet,ນັກສຶກສາ Sheet ເຂົ້າຮ່ວມລາຍເດືອນ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Employee {0} ໄດ້ຖືກນໍາໃຊ້ແລ້ວສໍາລັບ {1} ລະຫວ່າງ {2} ແລະ {3}
@@ -3045,7 +3103,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,ການຄຸ້ມຄອງ Partners ຂາຍ.
 DocType: Quality Inspection,Inspection Type,ປະເພດການກວດກາ
 DocType: Fee Validity,Visited yet,ຢ້ຽມຊົມແລ້ວ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,ຄັງສິນຄ້າກັບການຊື້ຂາຍທີ່ມີຢູ່ແລ້ວບໍ່ສາມາດປ່ຽນໃຈເຫລື້ອມໃສກຸ່ມ.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,ຄັງສິນຄ້າກັບການຊື້ຂາຍທີ່ມີຢູ່ແລ້ວບໍ່ສາມາດປ່ຽນໃຈເຫລື້ອມໃສກຸ່ມ.
 DocType: Assessment Result Tool,Result HTML,ຜົນ HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ທີ່ຫມົດອາຍຸ
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,ຕື່ມການນັກສຶກສາ
@@ -3072,7 +3130,7 @@
 DocType: Healthcare Settings,Result Printed,Result Printed
 DocType: Asset Category Account,Depreciation Expense Account,ບັນຊີຄ່າເສື່ອມລາຄາຄ່າໃຊ້ຈ່າຍ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,ໄລຍະເວລາແຫ່ງການທົດລອງ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},ເບິ່ງ {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},ເບິ່ງ {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ພຽງແຕ່ໂຫນດໃບອະນຸຍາດໃຫ້ໃນການເຮັດທຸ
 DocType: Expense Claim,Expense Approver,ຜູ້ອະນຸມັດຄ່າໃຊ້ຈ່າຍ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,ຕິດຕໍ່ກັນ {0}: Advance ຕໍ່ລູກຄ້າຈະຕ້ອງເປັນການປ່ອຍສິນເຊື່ອ
@@ -3084,7 +3142,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,ການ DATETIME
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,ຕາຕະລາງການຂອງລາຍວິຊາການລຶບ:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,ຂໍ້ມູນບັນທຶກການຮັກສາສະຖານະພາບການຈັດສົ່ງ sms
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Set Sales Target
 DocType: Accounts Settings,Make Payment via Journal Entry,ເຮັດໃຫ້ການຊໍາລະເງິນໂດຍຜ່ານການອະນຸທິນ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,ພິມກ່ຽວກັບ
 DocType: Item,Inspection Required before Delivery,ການກວດກາທີ່ກໍານົດໄວ້ກ່ອນທີ່ຈະຈັດສົ່ງສິນຄ້າ
@@ -3092,7 +3149,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,ກິດຈະກໍາທີ່ຍັງຄ້າງ
 DocType: Patient Appointment,Reminded,ເຕືອນ
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,ອົງການຈັດຕັ້ງຂອງທ່ານ
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,ອົງການຈັດຕັ້ງຂອງທ່ານ
 DocType: Fee Component,Fees Category,ຄ່າທໍານຽມປະເພດ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,ກະລຸນາໃສ່ການເຈັບວັນທີ.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,amt
@@ -3104,7 +3161,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,ລະດັບລໍາດັບ
 DocType: Company,Chart Of Accounts Template,ຕາຕະລາງຂອງບັນຊີແມ່ແບບ
 DocType: Attendance,Attendance Date,ວັນທີ່ສະຫມັກຜູ້ເຂົ້າຮ່ວມ
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},ລາຍການລາຄາການປັບປຸງສໍາລັບ {0} ໃນລາຄາ {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},ລາຍການລາຄາການປັບປຸງສໍາລັບ {0} ໃນລາຄາ {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ກະຈັດກະຈາຍເງິນເດືອນໂດຍອີງໃສ່ລາຍໄດ້ແລະການຫັກ.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,ບັນຊີທີ່ມີຂໍ້ເດັກນ້ອຍທີ່ບໍ່ສາມາດໄດ້ຮັບການປ່ຽນແປງເພື່ອຊີແຍກປະເພດ
 DocType: Purchase Invoice Item,Accepted Warehouse,Warehouse ຮັບການຍອມຮັບ
@@ -3120,9 +3177,10 @@
 ,Employee Birthday,ພະນັກງານວັນເດືອນປີເກີດ
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,ນັກສຶກສາເຄື່ອງມືການເຂົ້າຮ່ວມກຸ່ມ
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,ຂອບເຂດຈໍາກັດອົງການກາ
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,ກໍານົດໄວ້ Upto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ການຮ່ວມລົງທຶນ
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,ເປັນໄລຍະທາງວິຊາການກັບນີ້ປີທາງວິຊາການ &#39;{0} ແລະ&#39; ໄລຍະຊື່ &#39;{1} ມີຢູ່ແລ້ວ. ກະລຸນາປັບປຸງແກ້ໄຂການອອກສຽງເຫຼົ່ານີ້ແລະພະຍາຍາມອີກເທື່ອຫນຶ່ງ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","ເນື່ອງຈາກວ່າມີທຸລະກໍາທີ່ມີຢູ່ແລ້ວຕໍ່ item {0}, ທ່ານບໍ່ສາມາດມີການປ່ຽນແປງມູນຄ່າຂອງ {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","ເນື່ອງຈາກວ່າມີທຸລະກໍາທີ່ມີຢູ່ແລ້ວຕໍ່ item {0}, ທ່ານບໍ່ສາມາດມີການປ່ຽນແປງມູນຄ່າຂອງ {1}"
 DocType: UOM,Must be Whole Number,ຕ້ອງເປັນຈໍານວນທັງຫມົດ
 DocType: Leave Control Panel,New Leaves Allocated (In Days),ໃບໃຫມ່ຈັດສັນ (ໃນວັນ)
 DocType: Purchase Invoice,Invoice Copy,ໃບເກັບເງິນສໍາເນົາ
@@ -3132,7 +3190,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,ຈໍານວນໃບເກັບເງິນ
 DocType: Shopping Cart Settings,Orders,ຄໍາສັ່ງ
 DocType: Employee Leave Approver,Leave Approver,ອອກຈາກອະນຸມັດ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,ກະລຸນາເລືອກ batch ເປັນ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,ກະລຸນາເລືອກ batch ເປັນ
 DocType: Assessment Group,Assessment Group Name,ຊື່ການປະເມີນຜົນ Group
 DocType: Manufacturing Settings,Material Transferred for Manufacture,ອຸປະກອນການໂອນສໍາລັບການຜະລິດ
 DocType: Expense Claim,"A user with ""Expense Approver"" role",ຜູ່ໃຊ້ທີ່ມີ &quot;ຄ່າໃຊ້ຈ່າຍອະນຸມັດ&quot; ພາລະບົດບາດ
@@ -3147,7 +3205,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Entry ໄລຍະເວລາປິດ
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,ເລືອກຫ້ອງ ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,ສູນຕົ້ນທຶນກັບທຸລະກໍາທີ່ມີຢູ່ແລ້ວບໍ່ສາມາດປ່ຽນໃຈເຫລື້ອມໃສກຸ່ມ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},ຈໍານວນ {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},ຈໍານວນ {0} {1} {2} {3}
 DocType: Account,Depreciation,ຄ່າເສື່ອມລາຄາ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ຜູ້ສະຫນອງ (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,ເຄື່ອງມືການເຂົ້າຮ່ວມຂອງພະນັກງານ
@@ -3159,10 +3217,12 @@
 DocType: GL Entry,Voucher No,Voucher No
 ,Lead Owner Efficiency,ປະສິດທິພາບເຈົ້າຂອງຜູ້ນໍາພາ
 ,Lead Owner Efficiency,ປະສິດທິພາບເຈົ້າຂອງຜູ້ນໍາພາ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,ທີ່ນິຍົມຫລາຍທີ່ສຸດ
 DocType: Leave Allocation,Leave Allocation,ອອກຈາກການຈັດສັນ
 DocType: Payment Request,Recipient Message And Payment Details,ຜູ້ຮັບຂໍ້ຄວາມແລະລາຍລະອຽດການຊໍາລະເງິນ
 DocType: Training Event,Trainer Email,ຄູຝຶກ Email
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,ການຮ້ອງຂໍອຸປະກອນການ {0} ສ້າງ
+DocType: Restaurant Reservation,No of People,No of People
 DocType: Production Planning Tool,Include sub-contracted raw materials,ປະກອບມີອຸປະກອນການເປັນວັດຖຸດິບຍ່ອຍເຮັດສັນຍາ
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,ຮູບແບບຂອງຂໍ້ກໍານົດຫຼືການເຮັດສັນຍາ.
 DocType: Purchase Invoice,Address and Contact,ທີ່ຢູ່ແລະຕິດຕໍ່
@@ -3171,10 +3231,11 @@
 DocType: Supplier,Last Day of the Next Month,ວັນສຸດທ້າຍຂອງເດືອນຖັດໄປ
 DocType: Support Settings,Auto close Issue after 7 days,Auto ໃກ້ Issue ພາຍໃນ 7 ມື້
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ອອກຈາກບໍ່ສາມາດໄດ້ຮັບການຈັດສັນກ່ອນ {0}, ເປັນການດຸ່ນດ່ຽງອອກໄດ້ແລ້ວປະຕິບັດ, ສົ່ງໃນການບັນທຶກການຈັດສັນອອກໃນອະນາຄົດ {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ຫມາຍເຫດ: ເນື່ອງຈາກ / ວັນທີ່ເອກະສານຫຼາຍກວ່າວັນການປ່ອຍສິນເຊື່ອຂອງລູກຄ້າອະນຸຍາດໃຫ້ໂດຍ {0} ວັນ (s)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ຫມາຍເຫດ: ເນື່ອງຈາກ / ວັນທີ່ເອກະສານຫຼາຍກວ່າວັນການປ່ອຍສິນເຊື່ອຂອງລູກຄ້າອະນຸຍາດໃຫ້ໂດຍ {0} ວັນ (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,ສະຫມັກນັກສຶກສາ
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL ສໍາລັບຜູ້ຮັບບໍລິ
 DocType: Asset Category Account,Accumulated Depreciation Account,ບັນຊີຄ່າເສື່ອມລາຄາສະສົມ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,ອີເມວນີ້ຈະຖືກສ້າງຂຶ້ນໂດຍອັດຕະໂນມັດ
 DocType: Stock Settings,Freeze Stock Entries,Freeze Entries Stock
 DocType: Program Enrollment,Boarding Student,ນັກສຶກສາຄະນະ
 DocType: Asset,Expected Value After Useful Life,ມູນຄ່າຄາດວ່າຫຼັງຈາກຊີວິດທີ່ເປັນປະໂຫຍດ
@@ -3182,7 +3243,7 @@
 DocType: Activity Cost,Billing Rate,ອັດຕາການເອີ້ນເກັບເງິນ
 ,Qty to Deliver,ຈໍານວນການສົ່ງ
 ,Stock Analytics,ການວິເຄາະຫຼັກຊັບ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,ການດໍາເນີນງານບໍ່ສາມາດໄດ້ຮັບການປະໄວ້ເປົ່າ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,ການດໍາເນີນງານບໍ່ສາມາດໄດ້ຮັບການປະໄວ້ເປົ່າ
 DocType: Maintenance Visit Purpose,Against Document Detail No,ຕໍ່ຂໍ້ມູນເອກະສານທີ່ບໍ່ມີ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,ປະເພດບຸກຄົນທີ່ບັງຄັບ
 DocType: Quality Inspection,Outgoing,ລາຍຈ່າຍ
@@ -3205,7 +3266,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,ເລືອກນັກສຶກສາດ້ວຍຕົນເອງສໍາລັບກຸ່ມບໍລິສັດກິດຈະກໍາຕາມ
 DocType: Journal Entry,User Remark,User ຂໍ້ສັງເກດ
 DocType: Lead,Market Segment,ສ່ວນຕະຫຼາດ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},ການຊໍາລະເງິນຈໍານວນບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດປະລິມານທີ່ຍັງຄ້າງຄາໃນທາງລົບ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},ການຊໍາລະເງິນຈໍານວນບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດປະລິມານທີ່ຍັງຄ້າງຄາໃນທາງລົບ {0}
 DocType: Supplier Scorecard Period,Variables,ຕົວແປ
 DocType: Employee Internal Work History,Employee Internal Work History,ພະນັກງານປະຫວັດການເຮັດພາຍໃນປະເທດ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),ປິດ (Dr)
@@ -3235,21 +3296,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ໄດ້ຮັບການປັບປຸງ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,ຂໍອຸປະກອນການ {0} ຈະຖືກຍົກເລີກຫຼືຢຸດເຊົາການ
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,ອອກຈາກການຄຸ້ມຄອງ
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,ອອກຈາກການຄຸ້ມຄອງ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Group ໂດຍບັນຊີ
 DocType: Sales Order,Fully Delivered,ສົ່ງຢ່າງເຕັມທີ່
 DocType: Lead,Lower Income,ລາຍໄດ້ຕ່ໍາ
+DocType: Restaurant Order Entry,Current Order,Order Order ປັດຈຸບັນ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},ແຫຼ່ງຂໍ້ມູນແລະຄັງສິນຄ້າເປົ້າຫມາຍບໍ່ສາມາດຈະດຽວກັນສໍາລັບການຕິດຕໍ່ກັນ {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ບັນຊີທີ່ແຕກຕ່າງກັນຈະຕ້ອງບັນຊີປະເພດຊັບສິນ / ຫນີ້ສິນ, ນັບຕັ້ງແຕ່ນີ້ Stock Reconciliation ເປັນ Entry ເປີດ"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ຈ່າຍຈໍານວນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາເງິນກູ້ຈໍານວນ {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,ໄປທີ່ Programs
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},ຊື້ຈໍານວນຄໍາສັ່ງທີ່ຕ້ອງການສໍາລັບລາຍການ {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,ຜະລິດພັນທີ່ບໍ່ໄດ້ສ້າງ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,ຜະລິດພັນທີ່ບໍ່ໄດ້ສ້າງ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;ຈາກວັນທີ່ສະຫມັກ&#39; ຈະຕ້ອງຫລັງຈາກທີ່ໄປວັນ &#39;
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ບໍ່ສາມາດມີການປ່ຽນແປງສະຖານະພາບເປັນນັກສຶກສາ {0} ແມ່ນການເຊື່ອມຕໍ່ກັບຄໍາຮ້ອງສະຫມັກນັກສຶກສາ {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},ບໍ່ສາມາດມີການປ່ຽນແປງສະຖານະພາບເປັນນັກສຶກສາ {0} ແມ່ນການເຊື່ອມຕໍ່ກັບຄໍາຮ້ອງສະຫມັກນັກສຶກສາ {1}
 DocType: Asset,Fully Depreciated,ຄ່າເສື່ອມລາຄາຢ່າງເຕັມສ່ວນ
 ,Stock Projected Qty,Stock ປະມານການຈໍານວນ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},ລູກຄ້າ {0} ບໍ່ໄດ້ຂຶ້ນກັບໂຄງການ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},ລູກຄ້າ {0} ບໍ່ໄດ້ຂຶ້ນກັບໂຄງການ {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,ເຄື່ອງຫມາຍຜູ້ເຂົ້າຮ່ວມ HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","ການຊື້ຂາຍແມ່ນການສະເຫນີ, ສະເຫນີລາຄາທີ່ທ່ານໄດ້ຖືກສົ່ງໄປໃຫ້ກັບລູກຄ້າຂອງທ່ານ"
 DocType: Sales Order,Customer's Purchase Order,ການສັ່ງຊື້ຂອງລູກຄ້າ
@@ -3260,8 +3322,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,ກະລຸນາທີ່ກໍານົດໄວ້ຈໍານວນຂອງການອ່ອນຄ່າຈອງ
 DocType: Supplier Scorecard Period,Calculations,ການຄິດໄລ່
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,ມູນຄ່າຫຼືຈໍານວນ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,ຜະລິດພັນທີ່ບໍ່ສາມາດໄດ້ຮັບການຍົກຂຶ້ນມາສໍາລັບການ:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,ຜະລິດພັນທີ່ບໍ່ສາມາດໄດ້ຮັບການຍົກຂຶ້ນມາສໍາລັບການ:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,ນາທີ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ກະລຸນາຕັ້ງຊື່ຊຸດຊື່ສໍາລັບ {0} ຜ່ານ Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Invoice,Purchase Taxes and Charges,ຊື້ພາສີອາກອນແລະຄ່າບໍລິການ
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,ໄປທີ່ສະຫນອງ
 ,Qty to Receive,ຈໍານວນທີ່ຈະໄດ້ຮັບ
@@ -3275,7 +3338,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,ການປ່ອຍສິນເຊື່ອການບັນຊີຈະຕ້ອງບັນຊີງົບດຸນ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,ທຸກປະເພດຜະລິດ
 DocType: Global Defaults,Disable In Words,ປິດການໃຊ້ງານໃນຄໍາສັບຕ່າງໆ
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,ລະຫັດສິນຄ້າເປັນການບັງຄັບເນື່ອງຈາກວ່າລາຍການບໍ່ໄດ້ນັບຈໍານວນອັດຕະໂນມັດ
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,ລະຫັດສິນຄ້າເປັນການບັງຄັບເນື່ອງຈາກວ່າລາຍການບໍ່ໄດ້ນັບຈໍານວນອັດຕະໂນມັດ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},ສະເຫນີລາຄາ {0} ບໍ່ປະເພດ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,ບໍາລຸງຮັກສາຕາຕະລາງລາຍການ
 DocType: Sales Order,%  Delivered,% ສົ່ງ
@@ -3297,23 +3360,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Equity Balance ເປີດ
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,ການປະຕິຮູບ
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,ສ່ວນທີ່ຍັງເຫຼືອ
 DocType: Appraisal,Appraisal,ການປະເມີນຜົນ
 DocType: Purchase Invoice,GST Details,ລາຍລະອຽດ GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},ອີເມລ໌ສົ່ງໃຫ້ຜູ້ຂາຍ {0}
+DocType: Item,Default Sales Unit of Measure,ຫນ່ວຍຍອດຂາຍມາດຕະຖານມາດຕະຖານ
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,ວັນທີ່ຖືກຊ້ໍາ
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,ລົງນາມອະນຸຍາດ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},ອອກຈາກອະນຸມັດຕ້ອງເປັນຫນຶ່ງໃນ {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,ສ້າງຄ່າທໍານຽມ
-DocType: Hub Settings,Seller Email,ຜູ້ຂາຍ Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ມູນຄ່າທັງຫມົດຊື້ (ຜ່ານຊື້ Invoice)
 DocType: Training Event,Start Time,ທີ່ໃຊ້ເວລາເລີ່ມຕົ້ນ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,ເລືອກປະລິມານ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,ເລືອກປະລິມານ
 DocType: Customs Tariff Number,Customs Tariff Number,ພາສີຈໍານວນພາສີ
 DocType: Patient Appointment,Patient Appointment,Appointment ຜູ້ປ່ວຍ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,ການອະນຸມັດບົດບາດບໍ່ສາມາດເຊັ່ນດຽວກັນກັບພາລະບົດບາດລະບຽບການກ່ຽວຂ້ອງກັບ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,ຍົກເລີກການ Email ນີ້ Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,ຍົກເລີກການ Email ນີ້ Digest
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,ໄດ້ຮັບສະຫນອງໂດຍ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} ບໍ່ພົບສໍາລັບລາຍການ {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,ໄປທີ່ສະຫນາມ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,ຂໍ້ຄວາມທີ່ສົ່ງ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,ບັນຊີທີ່ມີຂໍ້ເດັກນ້ອຍທີ່ບໍ່ສາມາດໄດ້ຮັບການກໍານົດໄວ້ເປັນຊີແຍກປະເພດ
@@ -3326,11 +3392,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,ອຸປະກອນການໂອນສໍາລັບການຜະລິດ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,ບັນຊີ {0} ບໍ່ໄດ້ຢູ່
 DocType: Project,Project Type,ປະເພດໂຄງການ
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,ວຽກງານຂອງເດັກຢູ່ສໍາລັບວຽກງານນີ້. ທ່ານບໍ່ສາມາດລຶບ Task ນີ້.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ທັງຈໍານວນເປົ້າຫມາຍຫຼືເປົ້າຫມາຍຈໍານວນແມ່ນບັງຄັບ.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,ຄ່າໃຊ້ຈ່າຍຂອງກິດຈະກໍາຕ່າງໆ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,ບໍ່ມີຜົນໄດ້ຮັບຫຼາຍ
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,ຄ່າໃຊ້ຈ່າຍຂອງກິດຈະກໍາຕ່າງໆ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","ການສ້າງຕັ້ງກິດຈະກໍາເພື່ອ {0}, ນັບຕັ້ງແຕ່ພະນັກງານທີ່ຕິດກັບຂ້າງລຸ່ມນີ້ຄົນຂາຍບໍ່ມີ User ID {1}"
 DocType: Timesheet,Billing Details,ລາຍລະອຽດການເອີ້ນເກັບເງິນ
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,ແຫຼ່ງຂໍ້ມູນແລະຄັງສິນຄ້າເປົ້າຫມາຍຕ້ອງໄດ້ຮັບທີ່ແຕກຕ່າງກັນ
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,ແຫຼ່ງຂໍ້ມູນແລະຄັງສິນຄ້າເປົ້າຫມາຍຕ້ອງໄດ້ຮັບທີ່ແຕກຕ່າງກັນ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},ບໍ່ອະນຸຍາດໃຫ້ປັບປຸງການເຮັດທຸລະຫຸ້ນອາຍຸຫຼາຍກວ່າ {0}
 DocType: Purchase Invoice Item,PR Detail,ຂໍ້ມູນ PR
 DocType: Sales Order,Fully Billed,ບິນໄດ້ຢ່າງເຕັມສ່ວນ
@@ -3357,7 +3425,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,ການໂອນ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,ກວດເບິ່ງທັງຫມົດ
 DocType: Vehicle Log,Invoice Ref,Ref ໃບເກັບເງິນ
-DocType: Purchase Order,Recurring Order,Order Recurring
 DocType: Company,Default Income Account,ບັນຊີມາດຕະຖານລາຍໄດ້
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,ກຸ່ມລູກຄ້າ / ລູກຄ້າ
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),unclosed ປີງົບປະມານກໍາໄຮ / ການສູນເສຍ (Credit)
@@ -3371,9 +3438,9 @@
 DocType: Patient,A Negative,A Negative
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,ບໍ່ມີຫຍັງຫຼາຍກວ່າທີ່ຈະສະແດງໃຫ້ເຫັນ.
 DocType: Lead,From Customer,ຈາກລູກຄ້າ
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,ໂທຫາເຄືອຂ່າຍ
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,ໂທຫາເຄືອຂ່າຍ
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,A ຜະລິດຕະພັນ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,ສໍາຫລັບຂະບວນ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,ສໍາຫລັບຂະບວນ
 DocType: Project,Total Costing Amount (via Time Logs),ຈໍານວນເງິນຕົ້ນທຶນ (ໂດຍຜ່ານທີ່ໃຊ້ເວລາບັນທຶກ)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,ເຮັດຕາລາງຄ່າທໍານຽມ
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
@@ -3398,7 +3465,7 @@
 DocType: School Settings,Current Academic Term,ໄລຍະວິຊາການໃນປະຈຸບັນ
 DocType: School Settings,Current Academic Term,ໄລຍະວິຊາການໃນປະຈຸບັນ
 DocType: Sales Order,Not Billed,ບໍ່ບິນ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,ທັງສອງ Warehouse ຕ້ອງເປັນບໍລິສັດດຽວກັນ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,ທັງສອງ Warehouse ຕ້ອງເປັນບໍລິສັດດຽວກັນ
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,ບໍ່ມີການຕິດຕໍ່ເຂົ້າມາເທື່ອ.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,ລູກຈ້າງຄ່າໃຊ້ຈ່າຍຈໍານວນເງິນ Voucher
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,ໃບບິນຄ່າໄດ້ຍົກຂຶ້ນມາໂດຍຜູ້ສະຫນອງ.
@@ -3407,7 +3474,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,ຈໍານວນສ່ວນລົດ
 DocType: Purchase Invoice,Return Against Purchase Invoice,ກັບຄືນຕໍ່ຊື້ Invoice
 DocType: Item,Warranty Period (in days),ໄລຍະເວລາຮັບປະກັນ (ໃນວັນເວລາ)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',ອັບເດດການຕັ້ງຄ່າ &#39;tabPatient Appointment&#39; ຕັ້ງ sales_invoice = &#39;{0}&#39; ບ່ອນທີ່ຊື່ = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,ຄວາມສໍາພັນກັບ Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,ເງິນສົດສຸດທິຈາກການດໍາເນີນວຽກ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,ຂໍ້ 4
@@ -3416,8 +3482,8 @@
 DocType: Journal Entry Account,Journal Entry Account,ບັນຊີ Entry ວາລະສານ
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,ກຸ່ມນັກສຶກສາ
 DocType: Shopping Cart Settings,Quotation Series,ວົງຢືມ Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","ລາຍການລາຄາທີ່ມີຊື່ດຽວກັນ ({0}), ກະລຸນາມີການປ່ຽນແປງຊື່ກຸ່ມສິນຄ້າຫລືປ່ຽນຊື່ລາຍການ"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,ກະລຸນາເລືອກລູກຄ້າ
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","ລາຍການລາຄາທີ່ມີຊື່ດຽວກັນ ({0}), ກະລຸນາມີການປ່ຽນແປງຊື່ກຸ່ມສິນຄ້າຫລືປ່ຽນຊື່ລາຍການ"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,ກະລຸນາເລືອກລູກຄ້າ
 DocType: C-Form,I,ຂ້າພະເຈົ້າ
 DocType: Company,Asset Depreciation Cost Center,Asset Center ຄ່າເສື່ອມລາຄາຄ່າໃຊ້ຈ່າຍ
 DocType: Sales Order Item,Sales Order Date,ວັນທີ່ສະຫມັກໃບສັ່ງຂາຍ
@@ -3426,6 +3492,7 @@
 DocType: Assessment Plan,Assessment Plan,ແຜນການປະເມີນຜົນ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,ລູກຄ້າ {0} ຖືກສ້າງຂຶ້ນ.
 DocType: Stock Settings,Limit Percent,ເປີເຊັນຂອບເຂດຈໍາກັດ
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,ໃນປະຈຸບັນບໍ່ມີຫຼັກຊັບໃນຄັງສິນຄ້າໃດໆ
 ,Payment Period Based On Invoice Date,ໄລຍະເວລາການຊໍາລະເງິນໂດຍອີງໃສ່ວັນ Invoice
 DocType: Sample Collection,No. of print,No of print
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},ອັດຕາແລກປ່ຽນທີ່ຂາດຫາຍໄປສະກຸນເງິນສໍາລັບ {0}
@@ -3481,13 +3548,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,ຈ່າຍລວມທັງຫມົດ - ການຫັກທັງຫມົດ - ການຊໍາລະຫນີ້
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,BOM ປັດຈຸບັນແລະໃຫມ່ BOM ບໍ່ສາມາດຈະເປັນຄືກັນ
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,ເງິນເດືອນ ID Slip
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,ເງິນເດືອນ ID Slip
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,ວັນທີ່ສະຫມັກຂອງເງິນກະສຽນຈະຕ້ອງຫຼາຍກ່ວາວັນທີຂອງການເຂົ້າຮ່ວມ
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,ມີຄວາມຜິດພາດໃນຂະນະທີ່ການຕັ້ງເວລາແນ່ນອນກ່ຽວກັບຄື:
 DocType: Sales Invoice,Against Income Account,ຕໍ່ບັນຊີລາຍໄດ້
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% ສົ່ງ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ລາຍການ {0}: ຄໍາສັ່ງຈໍານວນ {1} ບໍ່ສາມາດຈະຫນ້ອຍກ່ວາຈໍານວນຄໍາສັ່ງຂັ້ນຕ່ໍາ {2} (ລະບຸໄວ້ໃນລາຍການ).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ລາຍການ {0}: ຄໍາສັ່ງຈໍານວນ {1} ບໍ່ສາມາດຈະຫນ້ອຍກ່ວາຈໍານວນຄໍາສັ່ງຂັ້ນຕ່ໍາ {2} (ລະບຸໄວ້ໃນລາຍການ).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ເປີເຊັນຂອງການແຜ່ກະຈາຍປະຈໍາເດືອນ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,ກະລຸນາເຂົ້າສູ່ລະບົບເປັນຜູ້ໃຊ້ອື່ນ.
 DocType: Territory,Territory Targets,ຄາດຫມາຍຕົ້ນຕໍອານາເຂດ
 DocType: Delivery Note,Transporter Info,ຂໍ້ມູນການຂົນສົ່ງ
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},ກະລຸນາທີ່ກໍານົດໄວ້ໃນຕອນຕົ້ນ {0} ໃນບໍລິສັດ {1}
@@ -3495,13 +3563,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,ຄ້າຄົນດຽວກັນໄດ້ຮັບການປ້ອນເວລາຫຼາຍ
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,ກໍາໄຮຂັ້ນຕົ້ນ / ການສູນເສຍ
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,ການສັ່ງຊື້ສິນຄ້າທີ່ຈໍາຫນ່າຍ
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,ຊື່ບໍລິສັດບໍ່ສາມາດບໍລິສັດ
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,ຊື່ບໍລິສັດບໍ່ສາມາດບໍລິສັດ
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ຫົວຫນ້າຈົດຫມາຍສະບັບສໍາລັບການພິມແມ່ແບບ.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ຫົວຂໍ້ສໍາລັບແມ່ແບບພິມເຊັ່ນ Proforma Invoice.
 DocType: Program Enrollment,Walking,ຍ່າງ
 DocType: Student Guardian,Student Guardian,ຜູ້ປົກຄອງນັກສຶກສາ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,ຄ່າບໍລິການປະເພດການປະເມີນຄ່າບໍ່ສາມາດເຮັດເຄື່ອງຫມາຍເປັນ Inclusive
 DocType: POS Profile,Update Stock,ຫລັກຊັບ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,ໃນການຈອງ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ທີ່ແຕກຕ່າງກັນສໍາລັບລາຍການທີ່ຈະນໍາໄປສູ່ການທີ່ບໍ່ຖືກຕ້ອງ (Total) ຄ່ານ້ໍາຫນັກສຸດທິ. ໃຫ້ແນ່ໃຈວ່ານ້ໍາຫນັກສຸດທິຂອງແຕ່ລະລາຍການແມ່ນຢູ່ໃນ UOM ດຽວກັນ.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM ອັດຕາ
 DocType: Asset,Journal Entry for Scrap,ວາລະສານການອອກສຽງ Scrap
@@ -3551,15 +3620,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","ຜູ້ໃຊ້ລະບົບ (ເຂົ້າສູ່ລະບົບ) ID. ຖ້າຫາກວ່າກໍານົດໄວ້, ມັນຈະກາຍເປັນມາດຕະຖານສໍາລັບຮູບແບບ HR ທັງຫມົດ."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: ຈາກ {1}
 DocType: Task,depends_on,ຂຶ້ນກັບ
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,ຄິວສໍາລັບການອັບເດດລາຄາຫລ້າສຸດໃນທຸກບັນຊີລາຍການຂອງວັດສະດຸ. ມັນອາດຈະໃຊ້ເວລາສອງສາມນາທີ.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,ຄິວສໍາລັບການອັບເດດລາຄາຫລ້າສຸດໃນທຸກບັນຊີລາຍການຂອງວັດສະດຸ. ມັນອາດຈະໃຊ້ເວລາສອງສາມນາທີ.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,ຊື່ຂອງບັນຊີໃຫມ່. ຫມາຍເຫດ: ກະລຸນາຢ່າສ້າງບັນຊີສໍາລັບລູກຄ້າແລະຜູ້ສະຫນອງ
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,ປະເທດແມ່ແບບທີ່ຢູ່ໃນຕອນຕົ້ນສະຫລາດ
 DocType: Sales Order Item,Supplier delivers to Customer,ຜູ້ຈັດຈໍາຫນ່າຍໃຫ້ກັບລູກຄ້າ
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (ແບບຟອມ # / Item / {0}) ເປັນ out of stock
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},ກໍາຫນົດ / Reference ບໍ່ສາມາດໄດ້ຮັບຫຼັງຈາກ {0}
+,Sales Payment Summary,ສະຫຼຸບການຂາຍການຂາຍ
+DocType: Restaurant,Restaurant,ຮ້ານອາຫານ
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},ກໍາຫນົດ / Reference ບໍ່ສາມາດໄດ້ຮັບຫຼັງຈາກ {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ນໍາເຂົ້າຂໍ້ມູນແລະສົ່ງອອກ
 DocType: Patient,Account Details,ລາຍລະອຽດບັນຊີ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,ບໍ່ພົບຂໍ້ມູນນັກສຶກສາ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,ບໍ່ພົບຂໍ້ມູນນັກສຶກສາ
 DocType: Medical Department,Medical Department,ກົມການແພດ
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Supplier ເກນ Scorecard Scoring
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,ໃບເກັບເງິນວັນທີ່ປະກາດ
@@ -3570,8 +3641,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,ກະລຸນາເລືອກວັນທີ່ປະກາດກ່ອນທີ່ຈະເລືອກພັກ
 DocType: Program Enrollment,School House,ໂຮງຮຽນບ້ານ
 DocType: Serial No,Out of AMC,ອອກຈາກ AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,ກະລຸນາເລືອກແນວໂນ້ມ
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,ກະລຸນາເລືອກແນວໂນ້ມ
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,ກະລຸນາເລືອກແນວໂນ້ມ
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,ກະລຸນາເລືອກແນວໂນ້ມ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ຈໍານວນຂອງການອ່ອນຄ່າຈອງບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດຂອງຄ່າເສື່ອມລາຄາ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,ເຮັດໃຫ້ບໍາລຸງຮັກສາ Visit
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,ກະລຸນາຕິດຕໍ່ກັບຜູ້ໃຊ້ທີ່ມີການຂາຍລິນຍາໂທ Manager {0} ພາລະບົດບາດ
@@ -3579,7 +3650,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,ບໍລິສັດ (ໄດ້ລູກຄ້າຫລືຜູ້ຜະລິດ) ຕົ້ນສະບັບ.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ນີ້ແມ່ນອີງໃສ່ການເຂົ້າຮ່ວມຂອງນັກສຶກສານີ້
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,No ນັກສຶກສາໃນ
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,ເພີ່ມລາຍການເພີ່ມເຕີມຫຼືເຕັມຮູບແບບເປີດ
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,ເພີ່ມລາຍການເພີ່ມເຕີມຫຼືເຕັມຮູບແບບເປີດ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ການຈັດສົ່ງ {0} ຕ້ອງໄດ້ຮັບການຍົກເລີກກ່ອນການຍົກເລີກການຂາຍສິນຄ້ານີ້
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,ໄປທີ່ຜູ້ໃຊ້
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,ຈໍານວນເງິນທີ່ຊໍາລະເງິນ + ຂຽນ Off ຈໍານວນເງິນບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດ
@@ -3599,37 +3670,40 @@
 DocType: Fee Schedule,Fee Schedule,ຕາຕະລາງຄ່າທໍານຽມ
 DocType: Hub Settings,Publish Availability,ເຜີຍແຜ່ມີຈໍາຫນ່າຍ
 DocType: Company,Create Chart Of Accounts Based On,ສ້າງຕາຕະລາງຂອງການບັນຊີພື້ນຖານກ່ຽວກັບ
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,ບໍ່ສາມາດປ່ຽນມັນໄປເປັນກຸ່ມ. ວຽກງານຂອງເດັກຢູ່.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,ວັນທີຂອງການເກີດບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາໃນມື້ນີ້.
 ,Stock Ageing,Stock Ageing
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},ນັກສຶກສາ {0} ມີຕໍ່ສະຫມັກນັກສຶກສາ {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),ການດັດປັບຮອບ (ເງິນສະກຸນຂອງບໍລິສັດ)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Timesheet
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Timesheet
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} {1} &#39;ແມ່ນຄົນພິການ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ກໍານົດເປັນທຸກ
 DocType: Cheque Print Template,Scanned Cheque,ສະແກນກະແສລາຍວັນ
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ສົ່ງອີເມວອັດຕະໂນມັດທີ່ຈະຕິດຕໍ່ພົວພັນກ່ຽວກັບການໂອນສົ່ງ.
 DocType: Timesheet,Total Billable Amount,ຈໍານວນເງິນເອີ້ນເກັບເງິນ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,ຂໍ້ 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Order Entry
 DocType: Purchase Order,Customer Contact Email,ລູກຄ້າຕິດຕໍ່ Email
 DocType: Warranty Claim,Item and Warranty Details,ລາຍການແລະການຮັບປະກັນລາຍລະອຽດ
 DocType: Sales Team,Contribution (%),ການປະກອບສ່ວນ (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ຫມາຍເຫດ: ແບບການຊໍາລະເງິນຈະບໍ່ໄດ້ຮັບການສ້າງຂຶ້ນຕັ້ງແຕ່ &#39;ເງິນສົດຫຼືບັນຊີທະນາຄານບໍ່ໄດ້ລະບຸ
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,ໂຄງການ {0} ມີຢູ່ແລ້ວ
 DocType: Medical Department,Nursing User,ຜູ້ໃຊ້ພະຍາບານ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,ຄວາມຮັບຜິດຊອບ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,ໄລຍະເວລາຕັ້ງແຕ່ວັນທີ່ຂອງວົງຢືມນີ້ໄດ້ສິ້ນສຸດລົງ.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,ໄລຍະເວລາຕັ້ງແຕ່ວັນທີ່ຂອງວົງຢືມນີ້ໄດ້ສິ້ນສຸດລົງ.
 DocType: Expense Claim Account,Expense Claim Account,ບັນຊີຄ່າໃຊ້ຈ່າຍການຮ້ອງຂໍ
 DocType: Accounts Settings,Allow Stale Exchange Rates,ອະນຸຍາດໃຫ້ອັດຕາແລກປ່ຽນຂອງ Stale
 DocType: Sales Person,Sales Person Name,Sales Person ຊື່
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,ກະລຸນາໃສ່ atleast 1 ໃບເກັບເງິນໃນຕາຕະລາງ
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,ເພີ່ມຜູ້ໃຊ້
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,ເພີ່ມຜູ້ໃຊ້
 DocType: POS Item Group,Item Group,ກຸ່ມສິນຄ້າ
 DocType: Item,Safety Stock,Stock ຄວາມປອດໄພ
 DocType: Healthcare Settings,Healthcare Settings,Health Settings Settings
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,% ຄວາມຄືບຫນ້າສໍາລັບວຽກງານທີ່ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,% ຄວາມຄືບຫນ້າສໍາລັບວຽກງານທີ່ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ 100.
 DocType: Stock Reconciliation Item,Before reconciliation,ກ່ອນທີ່ຈະ reconciliation
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},ເພື່ອ {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ພາສີອາກອນແລະຄ່າບໍລິການເພີ່ມ (ບໍລິສັດສະກຸນເງິນ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row ພາສີລາຍ {0} ຕ້ອງມີບັນຊີຂອງສ່ວຍສາອາກອນປະເພດຫຼືລາຍໄດ້ຫຼືຄ່າໃຊ້ຈ່າຍຫຼື Chargeable
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row ພາສີລາຍ {0} ຕ້ອງມີບັນຊີຂອງສ່ວຍສາອາກອນປະເພດຫຼືລາຍໄດ້ຫຼືຄ່າໃຊ້ຈ່າຍຫຼື Chargeable
 DocType: Sales Order,Partly Billed,ບິນສ່ວນຫນຶ່ງແມ່ນ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,ລາຍການ {0} ຈະຕ້ອງເປັນລາຍການຊັບສິນຄົງທີ່
 DocType: Item,Default BOM,ມາດຕະຖານ BOM
@@ -3645,6 +3719,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,ການປ່ຽນແປງ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,ຈາກການສົ່ງເງິນ
 DocType: Student,Student Email Address,ທີ່ຢູ່ອີເມວຂອງນັກຮຽນ
+DocType: Item,Hub Warehouse,Hub Warehouse
 DocType: Physician Schedule Time Slot,From Time,ຈາກທີ່ໃຊ້ເວລາ
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,ໃນສາງ:
 DocType: Notification Control,Custom Message,ຂໍ້ຄວາມ Custom
@@ -3653,9 +3728,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,ທີ່ຢູ່ Student
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,ທີ່ຢູ່ Student
 DocType: Purchase Invoice,Price List Exchange Rate,ລາຄາອັດຕາແລກປ່ຽນບັນຊີ
+DocType: POS Profile,POS Profile Name,ຊື່ທຸລະກິດ POS
 DocType: Purchase Invoice Item,Rate,ອັດຕາການ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,ລິງທີ່ກ່ຽວຂ້ອງ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,ລິງທີ່ກ່ຽວຂ້ອງ
 DocType: Stock Entry,From BOM,ຈາກ BOM
 DocType: Assessment Code,Assessment Code,ລະຫັດການປະເມີນຜົນ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,ພື້ນຖານ
@@ -3669,11 +3745,12 @@
 DocType: Salary Slip,Salary Structure,ໂຄງສ້າງເງິນເດືອນ
 DocType: Account,Bank,ທະນາຄານ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ສາຍການບິນ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,ວັດສະດຸບັນຫາ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,ວັດສະດຸບັນຫາ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,ຂໍ້ຜິດພາດເກີດຂື້ນໃນຂະນະທີ່ການສ້າງການລວບລວມ
 DocType: Material Request Item,For Warehouse,ສໍາລັບການຄັງສິນຄ້າ
 DocType: Employee,Offer Date,ວັນທີ່ສະຫມັກສະເຫນີ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ການຊື້ຂາຍ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,ທ່ານຢູ່ໃນຮູບແບບອອຟໄລ. ທ່ານຈະບໍ່ສາມາດທີ່ຈະໂຫລດຈົນກ່ວາທ່ານມີເຄືອຂ່າຍ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,ທ່ານຢູ່ໃນຮູບແບບອອຟໄລ. ທ່ານຈະບໍ່ສາມາດທີ່ຈະໂຫລດຈົນກ່ວາທ່ານມີເຄືອຂ່າຍ.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,ບໍ່ມີກຸ່ມນັກສຶກສາສ້າງຕັ້ງຂື້ນ.
 DocType: Purchase Invoice Item,Serial No,Serial No
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,ຈໍານວນເງິນຊໍາລະຄືນປະຈໍາເດືອນບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນເງິນກູ້
@@ -3683,17 +3760,18 @@
 DocType: Salary Slip,Total Working Hours,ທັງຫມົດຊົ່ວໂມງເຮັດວຽກ
 DocType: Subscription,Next Schedule Date,Next Schedule Date
 DocType: Stock Entry,Including items for sub assemblies,ລວມທັງລາຍການສໍາລັບການສະພາແຫ່ງຍ່ອຍ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,ມູນຄ່າໃສ່ຈະຕ້ອງໃນທາງບວກ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,ອານາເຂດທັງຫມົດ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,ມູນຄ່າໃສ່ຈະຕ້ອງໃນທາງບວກ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,ອານາເຂດທັງຫມົດ
 DocType: Purchase Invoice,Items,ລາຍການ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,ນັກສຶກສາແມ່ນໄດ້ລົງທະບຽນແລ້ວ.
 DocType: Fiscal Year,Year Name,ຊື່ປີ
 DocType: Process Payroll,Process Payroll,Payroll ຂະບວນການ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,ມີວັນພັກຫຼາຍກ່ວາມື້ທີ່ເຮັດວຽກໃນເດືອນນີ້ແມ່ນ.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,ມີວັນພັກຫຼາຍກ່ວາມື້ທີ່ເຮັດວຽກໃນເດືອນນີ້ແມ່ນ.
 DocType: Product Bundle Item,Product Bundle Item,ຜະລິດຕະພັນ Bundle Item
 DocType: Sales Partner,Sales Partner Name,ຊື່ Partner ຂາຍ
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,ການຮ້ອງຂໍສໍາລັບວົງຢືມ
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,ການຮ້ອງຂໍສໍາລັບວົງຢືມ
 DocType: Payment Reconciliation,Maximum Invoice Amount,ຈໍານວນໃບເກັບເງິນສູງສຸດ
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hematology
 DocType: Normal Test Items,Normal Test Items,Normal Test Items
 DocType: Student Language,Student Language,ພາສານັກສຶກສາ
 apps/erpnext/erpnext/config/selling.py +23,Customers,ລູກຄ້າ
@@ -3705,10 +3783,11 @@
 DocType: Issue,Opening Time,ທີ່ໃຊ້ເວລາເປີດ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,ຈາກແລະໄປວັນທີ່ຄຸນຕ້ອງ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,ຫຼັກຊັບແລະການແລກປ່ຽນສິນຄ້າ
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ມາດຕະຖານຫນ່ວຍງານຂອງມາດຕະການ Variant &#39;{0}&#39; ຈະຕ້ອງເຊັ່ນດຽວກັນກັບໃນແມ່ &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ມາດຕະຖານຫນ່ວຍງານຂອງມາດຕະການ Variant &#39;{0}&#39; ຈະຕ້ອງເຊັ່ນດຽວກັນກັບໃນແມ່ &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ຄິດໄລ່ພື້ນຖານກ່ຽວກັບ
 DocType: Delivery Note Item,From Warehouse,ຈາກ Warehouse
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,ບໍ່ມີສິນຄ້າທີ່ມີບັນຊີລາຍການຂອງວັດສະດຸໃນການຜະລິດ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,ບໍ່ມີສິນຄ້າທີ່ມີບັນຊີລາຍການຂອງວັດສະດຸໃນການຜະລິດ
+DocType: Restaurant,Default Customer,Customer Default
 DocType: Assessment Plan,Supervisor Name,ຊື່ Supervisor
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,ຢ່າຢືນຢັນວ່າການນັດຫມາຍຖືກສ້າງຂື້ນໃນມື້ດຽວກັນ
 DocType: Program Enrollment Course,Program Enrollment Course,ຂອງລາຍວິຊາການເຂົ້າໂຮງຮຽນໂຄງການ
@@ -3736,7 +3815,7 @@
 DocType: Payment Entry,Internal Transfer,ພາຍໃນການຖ່າຍໂອນ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,ບັນຊີຂອງລູກຢູ່ໃນບັນຊີນີ້. ທ່ານບໍ່ສາມາດລຶບບັນຊີນີ້.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ທັງຈໍານວນເປົ້າຫມາຍຫຼືຈໍານວນເປົ້າຫມາຍແມ່ນການບັງຄັບ
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},ບໍ່ມີມາດຕະຖານ BOM ຢູ່ສໍາລັບລາຍການ {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},ບໍ່ມີມາດຕະຖານ BOM ຢູ່ສໍາລັບລາຍການ {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,ກະລຸນາເລືອກວັນທີ່ປະກາດຄັ້ງທໍາອິດ
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,ເປີດວັນທີ່ຄວນເປັນກ່ອນທີ່ຈະປິດວັນທີ່
 DocType: Leave Control Panel,Carry Forward,ປະຕິບັດໄປຂ້າງຫນ້າ
@@ -3772,6 +3851,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,ປັດຈຸບັນທັງຫມົດ
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,ການບັນຊີ
 DocType: Drug Prescription,Hour,ຊົ່ວໂມງ
+DocType: Restaurant Order Entry,Last Sales Invoice,ໃບຄໍາສັ່ງຊື້ຂາຍສຸດທ້າຍ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,ໃຫມ່ບໍ່ມີ Serial ບໍ່ສາມາດມີ Warehouse. Warehouse ຕ້ອງໄດ້ຮັບການກໍານົດໂດຍ Stock Entry ຫລືຮັບຊື້
 DocType: Lead,Lead Type,ປະເພດນໍາ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,ເຈົ້າຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ອະນຸມັດໃບໃນວັນທີ Block
@@ -3808,65 +3888,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,ສ້າງຜູ້ໃຊ້
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,ກໍາ
 DocType: Supplier Scorecard,Per Month,ຕໍ່ເດືອນ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,ປະລິມານການຜະລິດຕ້ອງໄດ້ຫຼາຍກ່ວາ 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,ປະລິມານການຜະລິດຕ້ອງໄດ້ຫຼາຍກ່ວາ 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,ໄປຢ້ຽມຢາມບົດລາຍງານສໍາລັບການໂທບໍາລຸງຮັກສາ.
 DocType: Stock Entry,Update Rate and Availability,ການປັບປຸງອັດຕາແລະຈໍາຫນ່າຍ
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,ອັດຕາສ່ວນທີ່ທ່ານກໍາລັງອະນຸຍາດໃຫ້ໄດ້ຮັບຫຼືໃຫ້ຫຼາຍຕໍ່ກັບປະລິມານຂອງຄໍາສັ່ງ. ສໍາລັບການຍົກຕົວຢ່າງ: ຖ້າຫາກວ່າທ່ານມີຄໍາສັ່ງ 100 ຫົວຫນ່ວຍ. ແລະອະນຸຍາດຂອງທ່ານແມ່ນ 10% ຫຼັງຈາກນັ້ນທ່ານກໍາລັງອະນຸຍາດໃຫ້ໄດ້ຮັບ 110 ຫົວຫນ່ວຍ.
 DocType: POS Customer Group,Customer Group,ກຸ່ມລູກຄ້າ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),ລະຫັດຊຸດໃຫມ່ (ຖ້າຕ້ອງການ)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),ລະຫັດຊຸດໃຫມ່ (ຖ້າຕ້ອງການ)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),ລະຫັດຊຸດໃຫມ່ (ຖ້າຕ້ອງການ)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),ລະຫັດຊຸດໃຫມ່ (ຖ້າຕ້ອງການ)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},ບັນຊີຄ່າໃຊ້ຈ່າຍເປັນການບັງຄັບສໍາລັບ item {0}
 DocType: BOM,Website Description,ລາຍລະອຽດເວັບໄຊທ໌
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ການປ່ຽນແປງສຸດທິໃນການລົງທຶນ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,ຫຼ້າສຸດ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,ກະລຸນາຍົກເລີກການຊື້ Invoice {0} ທໍາອິດ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ທີ່ຢູ່ອີເມວຈະຕ້ອງເປັນເອກະລັກ, ລາຄາສໍາລັບ {0}"
 DocType: Serial No,AMC Expiry Date,AMC ຫມົດເຂດ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,ຮັບ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,ຮັບ
 ,Sales Register,ລົງທະບຽນການຂາຍ
 DocType: Daily Work Summary Settings Company,Send Emails At,ສົ່ງອີເມວໃນ
 DocType: Quotation,Quotation Lost Reason,ວົງຢືມລືມເຫດຜົນ
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,ເລືອກ Domain ຂອງທ່ານ
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',ເລືອກ * ຈາກ tabPatient ບ່ອນທີ່ຊື່ = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},ກະສານອ້າງອີງການທີ່ບໍ່ມີ {0} ວັນ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},ກະສານອ້າງອີງການທີ່ບໍ່ມີ {0} ວັນ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ມີບໍ່ມີຫຍັງທີ່ຈະແກ້ໄຂແມ່ນ.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Form View
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,ສະຫຼຸບສັງລວມສໍາລັບເດືອນນີ້ແລະກິດຈະກໍາທີ່ຍັງຄ້າງ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Form View
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,ສະຫຼຸບສັງລວມສໍາລັບເດືອນນີ້ແລະກິດຈະກໍາທີ່ຍັງຄ້າງ
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","ເພີ່ມຜູ້ຊົມໃຊ້ທີ່ຈະອົງການຈັດຕັ້ງຂອງທ່ານ, ນອກຈາກຕົວທ່ານເອງ."
 DocType: Customer Group,Customer Group Name,ຊື່ກຸ່ມລູກຄ້າ
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,No ລູກຄ້າທັນ!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,No ລູກຄ້າທັນ!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,ຖະແຫຼງການກະແສເງິນສົດ
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ຈໍານວນເງິນກູ້ບໍ່ເກີນຈໍານວນເງິນກູ້ສູງສຸດຂອງ {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,ໃບອະນຸຍາດ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},ກະລຸນາເອົາໃບເກັບເງິນນີ້ {0} ຈາກ C ແບບຟອມ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},ກະລຸນາເອົາໃບເກັບເງິນນີ້ {0} ຈາກ C ແບບຟອມ {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,ກະລຸນາເລືອກປະຕິບັດຕໍ່ຖ້າຫາກວ່າທ່ານຍັງຕ້ອງການທີ່ຈະປະກອບມີຍອດເຫຼືອເດືອນກ່ອນປີງົບປະມານຂອງໃບປີງົບປະມານນີ້
 DocType: GL Entry,Against Voucher Type,ຕໍ່ຕ້ານປະເພດ Voucher
 DocType: Physician,Phone (R),ໂທລະສັບ (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,ຊ່ອງທີ່ໃຊ້ເວລາເພີ່ມ
 DocType: Item,Attributes,ຄຸນລັກສະນະ
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,ເປີດຕົວແມ່ແບບ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ກະລຸນາຕັ້ງຊື່ຊຸດຊື່ສໍາລັບ {0} ຜ່ານ Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,ກະລຸນາໃສ່ການຕັດບັນຊີ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,ຄັ້ງສຸດທ້າຍວັນ Order
 DocType: Patient,B Negative,B Negative
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ບັນຊີ {0} ບໍ່ໄດ້ເປັນບໍລິສັດ {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,ຈໍານວນ serial ໃນແຖວ {0} ບໍ່ກົງກັບກັບການຈັດສົ່ງຫມາຍເຫດ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,ຈໍານວນ serial ໃນແຖວ {0} ບໍ່ກົງກັບກັບການຈັດສົ່ງຫມາຍເຫດ
 DocType: Student,Guardian Details,ລາຍລະອຽດຜູ້ປົກຄອງ
 DocType: C-Form,C-Form,"C, ແບບຟອມການ"
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,ເຄື່ອງຫມາຍຜູ້ເຂົ້າຮ່ວມສໍາລັບພະນັກງານທີ່ຫຼາກຫຼາຍ
 DocType: Vehicle,Chassis No,ແຊດຊີ
 DocType: Payment Request,Initiated,ການລິເລີ່ມ
 DocType: Production Order,Planned Start Date,ການວາງແຜນວັນທີ່
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,ກະລຸນາເລືອກ BOM
 DocType: Serial No,Creation Document Type,ການສ້າງປະເພດເອກະສານ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,ວັນສິ້ນສຸດຕ້ອງຫຼາຍກວ່າວັນທີເລີ່ມຕົ້ນ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,ວັນສິ້ນສຸດຕ້ອງຫຼາຍກວ່າວັນທີເລີ່ມຕົ້ນ
 DocType: Leave Type,Is Encash,ແມ່ນ Encash
 DocType: Leave Allocation,New Leaves Allocated,ໃບໃຫມ່ຈັດສັນ
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,ຂໍ້ມູນໂຄງການທີ່ສະຫລາດບໍ່ສາມາດໃຊ້ສໍາລັບການສະເຫນີລາຄາ
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,ສຸດສຸດ
 DocType: Project,Expected End Date,ຄາດວ່າສິ້ນສຸດວັນທີ່
 DocType: Budget Account,Budget Amount,ງົບປະມານຈໍານວນ
 DocType: Appraisal Template,Appraisal Template Title,ການປະເມີນ Template Title
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},ຈາກວັນທີ່ {0} ສໍາລັບພະນັກງານ {1} ບໍ່ສາມາດກ່ອນທີ່ຂອງພະນັກງານວັນເຂົ້າຮ່ວມ {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,ການຄ້າ
 DocType: Patient,Alcohol Current Use,Alcohol Current Use
+DocType: Student Admission Program,Student Admission Program,Student Admission Program
 DocType: Payment Entry,Account Paid To,ບັນຊີເງິນໃນການ
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,ສິນຄ້າພໍ່ແມ່ {0} ບໍ່ຕ້ອງເປັນສິນຄ້າພ້ອມສົ່ງ
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,ຜະລິດຕະພັນຫຼືການບໍລິການທັງຫມົດ.
@@ -3875,30 +3957,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} ງົບປະມານສໍາລັບບັນຊີ {1} ກັບ {2} {3} ເປັນ {4}. ມັນຈະຫຼາຍກວ່າ {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',ຕິດຕໍ່ກັນ {0} # ບັນຊີຈະຕ້ອງການປະເພດ &#39;ສິນຊັບຖາວອນ&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,ອອກຈໍານວນ
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,ກົດລະບຽບການຄິດໄລ່ຈໍານວນການຂົນສົ່ງສໍາລັບການຂາຍ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,ແລະ unchcked Disabled ໃນ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Series ເປັນການບັງຄັບ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,ການບໍລິການທາງດ້ານການເງິນ
 DocType: Student Sibling,Student ID,ID ນັກສຶກສາ
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,ປະເພດຂອງກິດຈະກໍາສໍາລັບການທີ່ໃຊ້ເວລາບັນທຶກ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Email Supplier
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,ປະເພດຂອງກິດຈະກໍາສໍາລັບການທີ່ໃຊ້ເວລາບັນທຶກ
 DocType: Tax Rule,Sales,Sales
 DocType: Stock Entry Detail,Basic Amount,ຈໍານວນພື້ນຖານ
 DocType: Training Event,Exam,ການສອບເສັງ
 DocType: Complaint,Complaint,ຄໍາຮ້ອງທຸກ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Warehouse ຕ້ອງການສໍາລັບສິນຄ້າຫຼັກຊັບ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Warehouse ຕ້ອງການສໍາລັບສິນຄ້າຫຼັກຊັບ {0}
 DocType: Leave Allocation,Unused leaves,ໃບທີ່ບໍ່ໄດ້ໃຊ້
 DocType: Patient,Alcohol Past Use,Alcohol Past Use
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,State Billing
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,ການຖ່າຍໂອນ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),ມາດດຶງຂໍ້ມູນລະເບີດ BOM (ລວມທັງອະນຸປະກອບ)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,ການຖ່າຍໂອນ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),ມາດດຶງຂໍ້ມູນລະເບີດ BOM (ລວມທັງອະນຸປະກອບ)
 DocType: Authorization Rule,Applicable To (Employee),ສາມາດນໍາໃຊ້ການ (ພະນັກງານ)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,ອັນເນື່ອງມາຈາກວັນທີ່ເປັນການບັງຄັບ
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,ອັນເນື່ອງມາຈາກວັນທີ່ເປັນການບັງຄັບ
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,ເພີ່ມຂຶ້ນສໍາລັບຄຸນສົມບັດ {0} ບໍ່ສາມາດຈະເປັນ 0
 DocType: Journal Entry,Pay To / Recd From,ຈ່າຍໄປ / Recd ຈາກ
 DocType: Naming Series,Setup Series,Series ຕິດຕັ້ງ
 DocType: Payment Reconciliation,To Invoice Date,ສົ່ງໃບເກັບເງິນວັນທີ່
 DocType: Supplier,Contact HTML,ຕິດຕໍ່ HTML
 ,Inactive Customers,ລູກຄ້າບໍ່ໄດ້ໃຊ້ວຽກ
+DocType: Student Admission Program,Maximum Age,ສູງສຸດອາຍຸ
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,ລາຍໄດ້ຈາກການຊື້
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,ວິທີການກົດລະບຽບລາຄາຖືກນໍາໃຊ້?
@@ -3917,6 +4001,7 @@
 DocType: GL Entry,Remarks,ຂໍ້ສັງເກດ
 DocType: Payment Entry,Account Paid From,ບັນຊີຊໍາລະເງິນຈາກ
 DocType: Purchase Order Item Supplied,Raw Material Item Code,ວັດຖຸດິບລະຫັດສິນຄ້າ
+DocType: Task,Parent Task,Task Parent
 DocType: Journal Entry,Write Off Based On,ຂຽນ Off ຖານກ່ຽວກັບ
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,ເຮັດໃຫ້ຕະກົ່ວ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Print ແລະເຄື່ອງຮັບໃຊ້ຫ້ອງ
@@ -3925,20 +4010,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","ເງິນເດືອນດໍາເນີນການສໍາລັບການໄລຍະເວລາລະຫວ່າງ {0} ແລະ {1}, ອອກຈາກໄລຍະເວລາຄໍາຮ້ອງສະຫມັກບໍ່ສາມາດຈະຢູ່ລະຫວ່າງລະດັບວັນທີນີ້."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,ການບັນທຶກການຕິດຕັ້ງສໍາລັບການສະບັບເລກທີ Serial
 DocType: Guardian Interest,Guardian Interest,ຜູ້ປົກຄອງທີ່ຫນ້າສົນໃຈ
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,ຕັ້ງຄ່າຄ່າເລີ່ມຕົ້ນສໍາຫລັບໃບແຈ້ງຫນີ້ POS
 apps/erpnext/erpnext/config/hr.py +177,Training,ການຝຶກອົບຮົມ
 DocType: Timesheet,Employee Detail,ຂໍ້ມູນພະນັກງານ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ລະຫັດອີເມວ Guardian1
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ລະຫັດອີເມວ Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,ມື້ວັນຖັດໄປແລະເຮັດເລື້ມຄືນໃນວັນປະຈໍາເດືອນຈະຕ້ອງເທົ່າທຽມກັນ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,ມື້ວັນຖັດໄປແລະເຮັດເລື້ມຄືນໃນວັນປະຈໍາເດືອນຈະຕ້ອງເທົ່າທຽມກັນ
 DocType: Lab Prescription,Test Code,Test Code
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,ການຕັ້ງຄ່າສໍາລັບຫນ້າທໍາອິດຂອງເວັບໄຊທ໌
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQs ຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ສໍາລັບການ {0} ເນື່ອງຈາກການນຸ່ງປະຈໍາດັດນີຊີ້ວັດຂອງ {1}
 DocType: Offer Letter,Awaiting Response,ລັງລໍຖ້າການຕອບໂຕ້
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,ຂ້າງເທິງ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},ຍອດລວມ {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},ເຫດຜົນທີ່ບໍ່ຖືກຕ້ອງ {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},ຍອດລວມ {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},ເຫດຜົນທີ່ບໍ່ຖືກຕ້ອງ {0} {1}
 DocType: Supplier,Mention if non-standard payable account,ກ່າວເຖິງຖ້າຫາກວ່າບໍ່ໄດ້ມາດຕະຖານບັນຊີທີ່ຕ້ອງຈ່າຍ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},ລາຍການດຽວກັນໄດ້ຮັບເຂົ້າໄປຫຼາຍເທື່ອ. {} ບັນຊີລາຍຊື່
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',ກະລຸນາເລືອກກຸ່ມການປະເມີນຜົນອື່ນທີ່ບໍ່ແມ່ນ &#39;ທັງຫມົດ Assessment Groups&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},ແຖວ {0}: ສູນຕົ້ນທຶນຈໍາເປັນຕ້ອງມີສໍາລັບລາຍການ {1}
 DocType: Training Event Employee,Optional,ທາງເລືອກ
@@ -3961,13 +4046,15 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ສູນຕົ້ນທຶນເປັນການບັງຄັບສໍາລັບລາຍການ {2}
 DocType: Vehicle,Policy No,ນະໂຍບາຍທີ່ບໍ່ມີ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,ຮັບສິນຄ້າຈາກມັດດຽວກັນຜະລິດຕະພັນ
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","ເມື່ອມີຫຼັກຊັບຢູ່ກັບລາຍການ {0}, ທ່ານບໍ່ສາມາດເຮັດໃຫ້ມີຄຸນສົມບັດຕົວແປໄດ້"
 DocType: Asset,Straight Line,Line ຊື່
 DocType: Project User,Project User,User ໂຄງການ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Split
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Split
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Split
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Split
 DocType: GL Entry,Is Advance,ແມ່ນ Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,ຜູ້ເຂົ້າຮ່ວມຈາກວັນທີ່ສະຫມັກແລະຜູ້ເຂົ້າຮ່ວມເຖິງວັນທີ່ມີຜົນບັງຄັບ
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,ກະລຸນາໃສ່ &#39;ແມ່ນເຫມົາຊ່ວງເປັນ Yes or No
+DocType: Item,Default Purchase Unit of Measure,ຫນ່ວຍການຊື້ວັດຖຸມາດຕະຖານມາດຕະຖານ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,ຫຼ້າສຸດວັນທີ່ສື່ສານ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,ຫຼ້າສຸດວັນທີ່ສື່ສານ
 DocType: Sales Team,Contact No.,ເລກທີ່
@@ -3976,7 +4063,6 @@
 DocType: Production Order,Check if material transfer entry is not required,ໃຫ້ກວດເບິ່ງວ່າ entry ໂອນວັດສະດຸແມ່ນບໍ່ຈໍາເປັນຕ້ອງ
 DocType: Production Order,Check if material transfer entry is not required,ໃຫ້ກວດເບິ່ງວ່າ entry ໂອນວັດສະດຸແມ່ນບໍ່ຈໍາເປັນຕ້ອງ
 DocType: Program Enrollment Tool,Get Students From,ໄດ້ຮັບນັກສຶກສາຈາກ
-DocType: Hub Settings,Seller Country,ຜູ້ຂາຍປະເທດ
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,ເຜີຍແຜ່ລາຍການກ່ຽວກັບເວັບໄຊທ໌
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,ກຸ່ມນັກສຶກສາຂອງທ່ານໃນຂະບວນການ
 DocType: Authorization Rule,Authorization Rule,ກົດລະບຽບການອະນຸຍາດ
@@ -3986,8 +4072,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,ພາສີອາກອນການຂາຍແລະຄ່າບໍລິການ Template
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),ທັງຫມົດ (Credit)
 DocType: Repayment Schedule,Payment Date,ວັນທີ່ສະຫມັກການຊໍາລະເງິນ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,ຊຸດໃຫມ່ຈໍານວນ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,ຊຸດໃຫມ່ຈໍານວນ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,ຊຸດໃຫມ່ຈໍານວນ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,ຊຸດໃຫມ່ຈໍານວນ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,ເຄື່ອງແຕ່ງກາຍແລະອຸປະກອນ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,ບໍ່ສາມາດແກ້ໄຂການທໍາງານຂອງຄະແນນປະເມີນ. ເຮັດໃຫ້ແນ່ໃຈວ່າສູດແມ່ນຖືກຕ້ອງ.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,ຈໍານວນຂອງຄໍາສັ່ງ
@@ -4005,6 +4091,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ຕິດຕໍ່ກັນ, {0}: Asset {1} ບໍ່ສາມາດໄດ້ຮັບການສົ່ງ, ມັນແມ່ນແລ້ວ {2}"
 DocType: Tax Rule,Billing Country,ປະເທດໃບບິນ
 DocType: Purchase Order Item,Expected Delivery Date,ວັນທີຄາດວ່າການຈັດສົ່ງ
+DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurant Order Entry
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ບັດເດບິດແລະເຄຣດິດບໍ່ເທົ່າທຽມກັນສໍາລັບ {0} # {1}. ຄວາມແຕກຕ່າງກັນເປັນ {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,ຄ່າໃຊ້ຈ່າຍການບັນເທີງ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,ເຮັດໃຫ້ວັດສະດຸຂໍ
@@ -4017,9 +4104,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,ບັນຊີກັບທຸລະກໍາທີ່ມີຢູ່ແລ້ວບໍ່ສາມາດໄດ້ຮັບການລຶບ
 DocType: Vehicle,Last Carbon Check,Check Carbon ຫຼ້າສຸດ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,ຄ່າໃຊ້ຈ່າຍດ້ານກົດຫມາຍ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,ກະລຸນາເລືອກປະລິມານກ່ຽວກັບການຕິດຕໍ່ກັນ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,ກະລຸນາເລືອກປະລິມານກ່ຽວກັບການຕິດຕໍ່ກັນ
 DocType: Purchase Invoice,Posting Time,ເວລາທີ່ປະກາດ
 DocType: Timesheet,% Amount Billed,% ຈໍານວນເງິນບິນ
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;ເວລາສໍາລັບການນັດຫມາຍ&quot; ບໍ່ໄດ້ຖືກກໍານົດໄວ້ໃນ Dr {0}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,ຄ່າໃຊ້ຈ່າຍທາງໂທລະສັບ
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,ກວດສອບການຖ້າຫາກວ່າທ່ານຕ້ອງການທີ່ຈະບັງຄັບໃຫ້ຜູ້ໃຊ້ສາມາດເລືອກໄລຍະກ່ອນທີ່ຈະປະຢັດ. ຈະມີບໍ່ມີມາດຕະຖານຖ້າຫາກວ່າທ່ານກວດສອບນີ້.
@@ -4030,6 +4118,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,ລາຍການລູກຄ້າໃຫມ່
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,ຄ່າໃຊ້ຈ່າຍເດີນທາງ
 DocType: Maintenance Visit,Breakdown,ລາຍລະອຽດ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},ເພີ່ມທົ່ງນາທີ່ກໍານົດໄວ້ໃນການລົງທືນໃນ doctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,ບັນຊີ: {0} ກັບສະກຸນເງິນ: {1} ບໍ່ສາມາດໄດ້ຮັບການຄັດເລືອກ
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","ຄ່າໃຊ້ຈ່າຍການປັບປຸງອັດຕະໂນມັດ BOM ຜ່ານ Scheduler, ໂດຍອີງໃສ່ບັນຊີລາຍຊື່ອັດຕາມູນຄ່າ / ລາຄາອັດຕາການ / ອັດຕາການຊື້ຫລ້າສຸດທີ່ຜ່ານມາຂອງວັດຖຸດິບ."
 DocType: Bank Reconciliation Detail,Cheque Date,ວັນທີ່ສະຫມັກ Cheque
@@ -4054,7 +4143,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),ຈໍານວນການເອີ້ນເກັບເງິນທັງຫມົດ (ໂດຍຜ່ານທີ່ໃຊ້ເວລາບັນທຶກ)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Id Supplier
 DocType: Payment Request,Payment Gateway Details,ການຊໍາລະເງິນລະອຽດ Gateway
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,ປະລິມານຕ້ອງຫຼາຍກ່ວາ 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,ປະລິມານຕ້ອງຫຼາຍກ່ວາ 0
 DocType: Journal Entry,Cash Entry,Entry ເງິນສົດ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,ຂໍ້ເດັກນ້ອຍສາມາດໄດ້ຮັບການສ້າງຕັ້ງພຽງແຕ່ພາຍໃຕ້ &#39;ຂອງກຸ່ມຂໍ້ປະເພດ
 DocType: Leave Application,Half Day Date,ເຄິ່ງຫນຶ່ງຂອງວັນທີວັນ
@@ -4072,12 +4161,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,ຫມາຍເຫດ: {0} ເຂົ້າໄປເວລາຫຼາຍ
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,ຕິດຕໍ່ພົວພັນທັງຫມົດ.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,ຊື່ຫຍໍ້ຂອງບໍລິສັດ
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,ຜູ້ໃຊ້ {0} ບໍ່ມີ
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,ຜູ້ໃຊ້ {0} ບໍ່ມີ
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,ຊື່ຫຍໍ້
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Entry ການຊໍາລະເງິນທີ່ມີຢູ່ແລ້ວ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,ບໍ່ authroized ນັບຕັ້ງແຕ່ {0} ເກີນຈໍາກັດ
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,ແມ່ແບບຕົ້ນສະບັບເງິນເດືອນ.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Pathology
+DocType: Restaurant Order Entry,Restaurant Table,Restaurant Table
 DocType: Leave Type,Max Days Leave Allowed,ນ້ໍາວັນອອກອະນຸຍາດ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,ກໍານົດກົດລະບຽບພາສີສໍາລັບສິນຄ້າ
 DocType: Purchase Invoice,Taxes and Charges Added,ພາສີອາກອນແລະຄ່າບໍລິການເພີ່ມ
@@ -4089,10 +4180,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ໃຫ້ຄໍາປຶກສາຈະນໍາໄປສູ່ຫຼືລູກຄ້າ.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ພາລະບົດບາດອະນຸຍາດໃຫ້ແກ້ໄຂຫຸ້ນ frozen
 ,Territory Target Variance Item Group-Wise,"ອານາເຂດຂອງເປົ້າຫມາຍຕ່າງ Item Group, ສະຫລາດ"
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,ກຸ່ມສົນທະນາຂອງລູກຄ້າທັງຫມົດ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,ກຸ່ມສົນທະນາຂອງລູກຄ້າທັງຫມົດ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,ສະສົມລາຍເດືອນ
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ເປັນການບັງຄັບ. ບາງທີບັນທຶກຕາແລກປ່ຽນເງິນບໍ່ໄດ້ສ້າງຂື້ນສໍາລັບ {1} ກັບ {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,ແມ່ແບບພາສີເປັນການບັງຄັບ.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,ແມ່ແບບພາສີເປັນການບັງຄັບ.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,ບັນຊີ {0}: ບັນຊີຂອງພໍ່ແມ່ {1} ບໍ່ມີ
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),ລາຄາອັດຕາ (ບໍລິສັດສະກຸນເງິນ)
 DocType: Products Settings,Products Settings,ການຕັ້ງຄ່າຜະລິດຕະພັນ
@@ -4118,13 +4209,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ລາຍການຂໍ້ມູນພາສີສະຫລາດ
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,ສະຖາບັນສະບັບຫຍໍ້
 ,Item-wise Price List Rate,ລາຍການສະຫລາດອັດຕາລາຄາ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,ສະເຫນີລາຄາຜູ້ຜະລິດ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,ສະເຫນີລາຄາຜູ້ຜະລິດ
 DocType: Quotation,In Words will be visible once you save the Quotation.,ໃນຄໍາສັບຕ່າງໆຈະສັງເກດເຫັນເມື່ອທ່ານຊ່ວຍປະຢັດການຊື້ຂາຍ.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},ປະລິມານ ({0}) ບໍ່ສາມາດຈະສ່ວນໃນຕິດຕໍ່ກັນ {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},ປະລິມານ ({0}) ບໍ່ສາມາດຈະສ່ວນໃນຕິດຕໍ່ກັນ {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Barcode {0} ນໍາໃຊ້ແລ້ວໃນ Item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Barcode {0} ນໍາໃຊ້ແລ້ວໃນ Item {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,ກົດລະບຽບສໍາລັບການເພີ່ມຄ່າໃຊ້ຈ່າຍໃນການຂົນສົ່ງ.
 DocType: Item,Opening Stock,ເປີດ Stock
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ລູກຄ້າທີ່ຕ້ອງການ
@@ -4142,9 +4233,8 @@
 DocType: Customer,From Lead,ຈາກ Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ຄໍາສັ່ງປ່ອຍອອກມາເມື່ອສໍາລັບການຜະລິດ.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,ເລືອກປີງົບປະມານ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS ຂໍ້ມູນທີ່ຕ້ອງການເພື່ອເຮັດໃຫ້ POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS ຂໍ້ມູນທີ່ຕ້ອງການເພື່ອເຮັດໃຫ້ POS Entry
 DocType: Program Enrollment Tool,Enroll Students,ລົງທະບຽນນັກສຶກສາ
-DocType: Hub Settings,Name Token,ຊື່ Token
 DocType: Lab Test,Approved Date,ວັນທີ່ຖືກອະນຸມັດ
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ຂາຍມາດຕະຖານ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,atleast ຫນຶ່ງ warehouse ເປັນການບັງຄັບ
@@ -4162,7 +4252,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,ຊັບພະຍາກອນມະນຸດ
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,ສ້າງຄວາມປອງດອງການຊໍາລະເງິນ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,ຊັບສິນອາກອນ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Production ສັ່ງຊື້ໄດ້ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Production ສັ່ງຊື້ໄດ້ {0}
 DocType: BOM Item,BOM No,BOM No
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,ວາລະສານ Entry {0} ບໍ່ມີບັນຊີ {1} ຫລືແລ້ວປຽບທຽບບັດອື່ນໆ
@@ -4182,8 +4272,8 @@
 DocType: Currency Exchange,To Currency,ການສະກຸນເງິນ
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,ອະນຸຍາດໃຫ້ຜູ້ຊົມໃຊ້ຕໍ່ໄປນີ້ເພື່ອອະນຸມັດຄໍາຮ້ອງສະຫມັກສໍາລັບໃບວັນຕັນ.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,ປະເພດຂອງຄ່າໃຊ້ຈ່າຍການຮຽກຮ້ອງ.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ອັດຕາການສໍາລັບລາຍການຂາຍ {0} ແມ່ນຕ່ໍາກ່ວາຂອງຕົນ {1}. ອັດຕາການຂາຍຄວນຈະ atleast {2}
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ອັດຕາການສໍາລັບລາຍການຂາຍ {0} ແມ່ນຕ່ໍາກ່ວາຂອງຕົນ {1}. ອັດຕາການຂາຍຄວນຈະ atleast {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ອັດຕາການສໍາລັບລາຍການຂາຍ {0} ແມ່ນຕ່ໍາກ່ວາຂອງຕົນ {1}. ອັດຕາການຂາຍຄວນຈະ atleast {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ອັດຕາການສໍາລັບລາຍການຂາຍ {0} ແມ່ນຕ່ໍາກ່ວາຂອງຕົນ {1}. ອັດຕາການຂາຍຄວນຈະ atleast {2}
 DocType: Item,Taxes,ພາສີອາກອນ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,ການຊໍາລະເງິນແລະບໍ່ໄດ້ສົ່ງ
 DocType: Project,Default Cost Center,ສູນຕົ້ນທຶນມາດຕະຖານ
@@ -4197,15 +4287,15 @@
 DocType: Employee Loan,Fully Disbursed,ຈ່າຍຢ່າງເຕັມສ່ວນ
 DocType: Maintenance Visit,Customer Feedback,ຜົນຕອບຮັບຂອງລູກຄ້າ
 DocType: Account,Expense,ຄ່າໃຊ້ຈ່າຍ
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,ຜະລິດແນນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາຄະແນນສູງສຸດ
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,ຜະລິດແນນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາຄະແນນສູງສຸດ
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,ລູກຄ້າແລະຜູ້ສະຫນອງ
 DocType: Item Attribute,From Range,ຈາກ Range
 DocType: BOM,Set rate of sub-assembly item based on BOM,ກໍານົດອັດຕາຂອງລາຍການຍ່ອຍປະກອບອີງໃສ່ BOM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},ຄວາມຜິດພາດ syntax ໃນສູດຫຼືສະພາບ: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},ຄວາມຜິດພາດ syntax ໃນສູດຫຼືສະພາບ: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,ເຮັດບໍລິສັດ Settings Summary ປະຈໍາວັນ
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,ລາຍການ {0} ລະເລີຍຕັ້ງແຕ່ມັນບໍ່ແມ່ນຫົວຂໍ້ຫຼັກຊັບ
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,ຍື່ນສະເຫນີການສັ່ງຜະລິດນີ້ສໍາລັບການປຸງແຕ່ງຕື່ມອີກ.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,ຍື່ນສະເຫນີການສັ່ງຜະລິດນີ້ສໍາລັບການປຸງແຕ່ງຕື່ມອີກ.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","ບໍ່ໃຊ້ກົດລະບຽບການຕັ້ງລາຄາໃນການສະເພາະໃດຫນຶ່ງ, ກົດລະບຽບການຕັ້ງລາຄາສາມາດນໍາໃຊ້ທັງຫມົດທີ່ຄວນຈະໄດ້ຮັບການພິການ."
 DocType: Assessment Group,Parent Assessment Group,ພໍ່ແມ່ກຸ່ມການປະເມີນຜົນ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,ວຽກເຮັດງານທໍາ
@@ -4222,12 +4312,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',ກະລຸນາຕັ້ງບໍລິສັດກັ່ນຕອງ blank ຖ້າ Group By ແມ່ນ &#39;Company&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,ວັນທີ່ບໍ່ສາມາດເປັນວັນໃນອະນາຄົດ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},"ຕິດຕໍ່ກັນ, {0}: ບໍ່ມີ Serial {1} ບໍ່ກົງກັບ {2} {3}"
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,ສໍາລັບການຜະລິດ recurring ໄດ້
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,ອອກຈາກການບາດເຈັບແລະ
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Lab Test UOM
 DocType: Batch,Batch ID,ID batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},ຫມາຍເຫດ: {0}
 ,Delivery Note Trends,ທ່າອ່ຽງການສົ່ງເງິນ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Summary ອາທິດນີ້
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Summary ອາທິດນີ້
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,ສິນຄ້າພ້ອມສົ່ງ
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,ບັນຊີ: {0} ພຽງແຕ່ສາມາດໄດ້ຮັບການປັບປຸງໂດຍຜ່ານທຸລະກໍາຫຼັກຊັບ
 DocType: Student Group Creation Tool,Get Courses,ໄດ້ຮັບວິຊາ
@@ -4241,7 +4332,6 @@
 DocType: Purchase Order,To Bill,ການບັນຊີລາຍການ
 DocType: Material Request,% Ordered,% ຄໍາສັ່ງ
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","ສໍາລັບວິຊາທີ່ນັກສຶກສາ Group, ຂອງລາຍວິຊາການຈະໄດ້ຮັບການກວດສອບສໍາລັບທຸກນັກສຶກສາຈາກວິຊາທີ່ລົງທະບຽນໃນໂຄງການການເຂົ້າໂຮງຮຽນ."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","ກະລຸນາໃສ່ທີ່ຢູ່ອີເມວຂັ້ນດ້ວຍຈໍ້າຈຸດ, ໃບແຈ້ງຫນີ້ຈະໄດ້ຮັບການສົ່ງອັດຕະໂນມັດໃນວັນທີສະເພາະໃດຫນຶ່ງ"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,ເຫມົາ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,avg. ອັດຕາການຊື້
 DocType: Task,Actual Time (in Hours),ທີ່ໃຊ້ເວລາຕົວຈິງ (ໃນຊົ່ວໂມງ)
@@ -4255,7 +4345,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,ລາຍການ {0} ບໍ່ແມ່ນການຕິດຕັ້ງສໍາລັບການ Serial Nos. Column ຕ້ອງມີຊ່ອງຫວ່າງ
 DocType: Accounts Settings,Accounts Settings,ບັນຊີ Settings
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,ອະນຸມັດ
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,ບໍ່ມີຜົນການສົ່ງ
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,ບໍ່ມີຜົນການສົ່ງ
 DocType: Customer,Sales Partner and Commission,Partner ຂາຍແລະຄະນະກໍາມະ
 DocType: Employee Loan,Rate of Interest (%) / Year,ອັດຕາການທີ່ຫນ້າສົນໃຈ (%) / ປີ
 ,Project Quantity,ຈໍານວນໂຄງການ
@@ -4267,55 +4357,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,ສີດໍາ
 DocType: BOM Explosion Item,BOM Explosion Item,BOM ລະເບີດ Item
 DocType: Account,Auditor,ຜູ້ສອບບັນຊີ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} ລາຍການຜະລິດ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} ລາຍການຜະລິດ
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,ຮຽນຮູ້ເພີ່ມເຕີມ
 DocType: Cheque Print Template,Distance from top edge,ໄລຍະຫ່າງຈາກຂອບດ້ານເທິງ
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,ລາຄາ {0} ເປັນຄົນພິການຫຼືບໍ່ມີ
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,ລາຄາ {0} ເປັນຄົນພິການຫຼືບໍ່ມີ
 DocType: Purchase Invoice,Return,ການກັບຄືນມາ
 DocType: Production Order Operation,Production Order Operation,ການດໍາເນີນງານໃບສັ່ງຜະລິດ
 DocType: Pricing Rule,Disable,ປິດການທໍາງານ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,ຮູບແບບຂອງການຈ່າຍເງິນເປັນສິ່ງຈໍາເປັນເພື່ອເຮັດໃຫ້ການຊໍາລະເງິນ
 DocType: Project Task,Pending Review,ລໍຖ້າການທົບທວນຄືນ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,ການແຕ່ງຕັ້ງແລະການປຶກສາຫາລື
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ບໍ່ໄດ້ລົງທະບຽນໃນຊຸດໄດ້ {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ບໍ່ໄດ້ລົງທະບຽນໃນຊຸດໄດ້ {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",Asset {0} ບໍ່ສາມາດໄດ້ຮັບການທະເລາະວິວາດກັນແລ້ວ {1}
 DocType: Task,Total Expense Claim (via Expense Claim),ການຮ້ອງຂໍຄ່າໃຊ້ຈ່າຍທັງຫມົດ (ໂດຍຜ່ານຄ່າໃຊ້ຈ່າຍການຮຽກຮ້ອງ)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,ເຄື່ອງຫມາຍຂາດ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ຕິດຕໍ່ກັນ {0}: ສະກຸນເງິນຂອງ BOM: {1} ຄວນຈະເທົ່າກັບສະກຸນເງິນການຄັດເລືອກ {2}
 DocType: Journal Entry Account,Exchange Rate,ອັດຕາແລກປ່ຽນ
 DocType: Patient,Additional information regarding the patient,ຂໍ້ມູນເພີ່ມເຕີມກ່ຽວກັບຄົນເຈັບ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,ໃບສັ່ງຂາຍ {0} ບໍ່ໄດ້ສົ່ງ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,ໃບສັ່ງຂາຍ {0} ບໍ່ໄດ້ສົ່ງ
 DocType: Homepage,Tag Line,Line Tag
 DocType: Fee Component,Fee Component,ຄ່າບໍລິການສ່ວນປະກອບ
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,ການຈັດການ Fleet
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,ເພີ່ມລາຍການລາຍການ
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,ການຈັດການ Fleet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,ເພີ່ມລາຍການລາຍການ
 DocType: Cheque Print Template,Regular,ເປັນປົກກະຕິ
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Weightage ທັງຫມົດຂອງທັງຫມົດເງື່ອນໄຂການປະເມີນຜົນຈະຕ້ອງ 100%
-DocType: BOM,Last Purchase Rate,ອັດຕາການຊື້ຫຼ້າສຸດ
+DocType: Purchase Order Item,Last Purchase Rate,ອັດຕາການຊື້ຫຼ້າສຸດ
 DocType: Account,Asset,ຊັບສິນ
 DocType: Project Task,Task ID,ວຽກງານ ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock ບໍ່ສາມາດມີສໍາລັບລາຍການ {0} ນັບຕັ້ງແຕ່ມີ variants
 DocType: Lab Test,Mobile,ໂທລະສັບມືຖື
 ,Sales Person-wise Transaction Summary,Summary ທຸລະກໍາຄົນສະຫລາດ
 DocType: Training Event,Contact Number,ຫມາຍເລກໂທລະສັບ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Warehouse {0} ບໍ່ມີ
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ລົງທະບຽນສໍາລັບ ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Warehouse {0} ບໍ່ມີ
 DocType: Monthly Distribution,Monthly Distribution Percentages,ອັດຕາສ່ວນການແຜ່ກະຈາຍປະຈໍາເດືອນ
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,ການລາຍການທີ່ເລືອກບໍ່ສາມາດມີ Batch
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","ອັດຕາການປະເມີນມູນຄ່າບໍ່ໄດ້ພົບເຫັນສໍາລັບລາຍການ {0}, ຊຶ່ງຈໍາເປັນຕ້ອງເຮັດແນວໃດການອອກສຽງການບັນຊີສໍາລັບ {1} {2}. ຖ້າຫາກວ່າລາຍການແມ່ນ transacting ເປັນລາຍການຕົວຢ່າງໃນ {1}, ກະລຸນາລະບຸວ່າໃນ {1} ຕາຕະລາງລາຍການ. ຖ້າບໍ່ດັ່ງນັ້ນ, ກະລຸນາສ້າງທຸລະກໍາຫຼັກຊັບເຂົ້າມາສໍາລັບລາຍການຫຼືການກ່າວເຖິງອັດຕາການປະເມີນມູນຄ່າສິນຄ້າບັນທຶກ, ແລະຫຼັງຈາກນັ້ນພະຍາຍາມ submiting / ຍົກເລີກພານີ້"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% ຂອງອຸປະກອນການສົ່ງຕໍ່ສົ່ງນີ້ຫມາຍເຫດ
+DocType: Training Event,Has Certificate,ມີໃບຢັ້ງຢືນ
 DocType: Project,Customer Details,ລາຍລະອຽດຂອງລູກຄ້າ
 DocType: Employee,Reports to,ບົດລາຍງານການ
 ,Unpaid Expense Claim,ການຮ້ອງຂໍຄ່າໃຊ້ຈ່າຍບໍ່ທັນໄດ້ຈ່າຍ
 DocType: Payment Entry,Paid Amount,ຈໍານວນເງິນຊໍາລະເງິນ
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,ໂຄງການຂຸດຄົ້ນ Cycle Sales
 DocType: Assessment Plan,Supervisor,Supervisor
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,ອອນໄລນ໌
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,ອອນໄລນ໌
 ,Available Stock for Packing Items,ສິນຄ້າສໍາລັບການບັນຈຸ
 DocType: Item Variant,Item Variant,ລາຍການ Variant
 DocType: Assessment Result Tool,Assessment Result Tool,ເຄື່ອງມືການປະເມີນຜົນ
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,ຄໍາສັ່ງສົ່ງບໍ່ສາມາດລຶບ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,ຄໍາສັ່ງສົ່ງບໍ່ສາມາດລຶບ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ການດຸ່ນດ່ຽງບັນຊີແລ້ວໃນເດບິດ, ທ່ານຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ກໍານົດ &#39;ສົມຕ້ອງໄດ້ຮັບ&#39; ເປັນ &#39;Credit&#39;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,ການບໍລິຫານຄຸນະພາບ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,ລາຍການ {0} ໄດ້ຖືກປິດ
@@ -4336,7 +4425,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,ອະນຸຍາດໃຫ້ສູນອັດຕາປະເມີນມູນຄ່າ
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,ອະນຸຍາດໃຫ້ສູນອັດຕາປະເມີນມູນຄ່າ
 DocType: Training Event Employee,Invited,ເຊື້ອເຊີນ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,ຫຼາຍໂຄງສ້າງເງິນເດືອນກິດຈະກໍາພົບພະນັກງານ {0} ສໍາລັບກໍານົດວັນທີດັ່ງກ່າວ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,ຫຼາຍໂຄງສ້າງເງິນເດືອນກິດຈະກໍາພົບພະນັກງານ {0} ສໍາລັບກໍານົດວັນທີດັ່ງກ່າວ
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,ການຕັ້ງຄ່າບັນຊີ Gateway.
 DocType: Employee,Employment Type,ປະເພດວຽກເຮັດງານທໍາ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,ຊັບສິນຄົງທີ່
@@ -4348,7 +4437,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,ID Email ນັກສຶກສາ
 DocType: Employee,Notice (days),ຫນັງສືແຈ້ງການ (ວັນ)
 DocType: Tax Rule,Sales Tax Template,ແມ່ແບບພາສີການຂາຍ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,ເລືອກລາຍການທີ່ຈະຊ່ວຍປະຢັດໃບເກັບເງິນ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,ເລືອກລາຍການທີ່ຈະຊ່ວຍປະຢັດໃບເກັບເງິນ
 DocType: Employee,Encashment Date,ວັນທີ່ສະຫມັກ Encashment
 DocType: Training Event,Internet,ອິນເຕີເນັດ
 DocType: Special Test Template,Special Test Template,ແບບທົດສອບພິເສດ
@@ -4358,7 +4447,7 @@
 DocType: Academic Term,Term Start Date,ວັນທີ່ສະຫມັກໃນໄລຍະເລີ່ມຕົ້ນ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,ນັບ Opp
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,ນັບ Opp
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},ກະລຸນາຊອກຫາທີ່ຕິດຄັດມາ {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},ກະລຸນາຊອກຫາທີ່ຕິດຄັດມາ {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,ທະນາຄານການດຸ່ນດ່ຽງງົບເປັນຕໍ່ຊີແຍກປະເພດທົ່ວໄປ
 DocType: Job Applicant,Applicant Name,ຊື່ຜູ້ສະຫມັກ
 DocType: Authorization Rule,Customer / Item Name,ລູກຄ້າ / ສິນຄ້າ
@@ -4378,7 +4467,7 @@
 DocType: Guardian,Guardian Of ,ຜູ້ປົກຄອງຂອງ
 DocType: Grading Scale Interval,Threshold,ໃກ້ຈະເຂົ້າສູ່
 DocType: BOM Update Tool,Current BOM,BOM ປັດຈຸບັນ
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,ເພີ່ມບໍ່ມີ Serial
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,ເພີ່ມບໍ່ມີ Serial
 DocType: Production Order Item,Available Qty at Source Warehouse,ສາມາດໃຊ້ໄດ້ຈໍານວນທີ່ມາ Warehouse
 apps/erpnext/erpnext/config/support.py +22,Warranty,ການຮັບປະກັນ
 DocType: Purchase Invoice,Debit Note Issued,Debit Note ອອກ
@@ -4401,10 +4490,9 @@
 DocType: Account,Receivable,ຮັບ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"ຕິດຕໍ່ກັນ, {0}: ບໍ່ອະນຸຍາດໃຫ້ມີການປ່ຽນແປງຜູ້ຜະລິດເປັນການສັ່ງຊື້ຢູ່ແລ້ວ"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,ພາລະບົດບາດທີ່ຖືກອະນຸຍາດໃຫ້ສົ່ງການທີ່ເກີນຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອທີ່ກໍານົດໄວ້.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,ເລືອກລາຍການການຜະລິດ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","ຕົ້ນສະບັບການຊິ້ງຂໍ້ມູນຂໍ້ມູນ, ມັນອາດຈະໃຊ້ເວລາທີ່ໃຊ້ເວລາບາງ"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,ເລືອກລາຍການການຜະລິດ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","ຕົ້ນສະບັບການຊິ້ງຂໍ້ມູນຂໍ້ມູນ, ມັນອາດຈະໃຊ້ເວລາທີ່ໃຊ້ເວລາບາງ"
 DocType: Item,Material Issue,ສະບັບອຸປະກອນການ
-DocType: Hub Settings,Seller Description,ຜູ້ຂາຍລາຍລະອຽດ
 DocType: Employee Education,Qualification,ຄຸນສົມບັດ
 DocType: Item Price,Item Price,ລາຍການລາຄາ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,ສະບູ່ແລະຜົງຊັກຟອກ
@@ -4412,7 +4500,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,ຈາກທີ່ໃຊ້ເວລາບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາທີ່ໃຊ້ເວລາ.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture ແລະວິດີໂອ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ຄໍາສັ່ງ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Resume
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Resume
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,ຖ້າເປີດໃຊ້ແລ້ວລະບົບຈະບໍ່ປັບປຸງທົ່ງນາຂອງຕົວແປຕ່າງໆຈາກແມ່ແບບແຕ່ຈະສໍາເນົາຂໍ້ມູນຂອງຂົງເຂດທີ່ໄດ້ລະບຸໄວ້ຂ້າງລຸ່ມໃນຂະນະທີ່ເຮັດໃຫ້ການປ່ຽນແປງໃຫມ່
 DocType: Salary Detail,Component,ອົງປະກອບ
 DocType: Assessment Criteria,Assessment Criteria Group,Group ເງື່ອນໄຂການປະເມີນຜົນ
 DocType: Healthcare Settings,Patient Name By,Name Patient By
@@ -4422,7 +4511,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,ກະລຸນາໃສ່ອະນຸມັດການພາລະບົດບາດຫຼືອະນຸມັດຜູ້ໃຊ້
 DocType: Journal Entry,Write Off Entry,ຂຽນ Off Entry
 DocType: BOM,Rate Of Materials Based On,ອັດຕາຂອງວັດສະດຸພື້ນຖານກ່ຽວກັບ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Supplier&gt; Supplier Type
+DocType: Item Variant Settings,Do not Update Variants,ຢ່າປັບປຸງ Variants
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics ສະຫນັບສະຫນູນ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,ຍົກເລີກທັງຫມົດ
 DocType: POS Profile,Terms and Conditions,ຂໍ້ກໍານົດແລະເງື່ອນໄຂ
@@ -4431,7 +4520,7 @@
 DocType: Leave Block List,Applies to Company,ໃຊ້ໄດ້ກັບບໍລິສັດ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,ບໍ່ສາມາດຍົກເລີກເພາະວ່າສົ່ງ Stock Entry {0} ມີຢູ່
 DocType: Employee Loan,Disbursement Date,ວັນທີ່ສະຫມັກນໍາເຂົ້າ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;ຜູ້ຮັບ&#39; ບໍ່ໄດ້ກໍານົດ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;ຜູ້ຮັບ&#39; ບໍ່ໄດ້ກໍານົດ
 DocType: BOM Update Tool,Update latest price in all BOMs,ອັບເດດລາຄາຫລ້າສຸດໃນ Boms ທັງຫມົດ
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Medical Record
 DocType: Vehicle,Vehicle,ຍານພາຫະນະ
@@ -4447,14 +4536,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,ຄ່າເສື່ອມລາຄາຂອງຊັບສິນແລະຍອດ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},ຈໍານວນ {0} {1} ການຍົກຍ້າຍຈາກ {2} ກັບ {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},ຈໍານວນ {0} {1} ການຍົກຍ້າຍຈາກ {2} ກັບ {3}
 DocType: Sales Invoice,Get Advances Received,ໄດ້ຮັບການຄວາມກ້າວຫນ້າທີ່ໄດ້ຮັບ
 DocType: Email Digest,Add/Remove Recipients,Add / Remove ຜູ້ຮັບ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},ການບໍ່ອະນຸຍາດໃຫ້ຕໍ່ຕ້ານການຜະລິດຢຸດເຊົາການສັ່ງຊື້ {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","ການຕັ້ງຄ່ານີ້ປີງົບປະມານເປັນຄ່າເລີ່ມຕົ້ນ, ໃຫ້ຄລິກໃສ່ &#39;ກໍານົດເປັນມາດຕະຖານ&#39;"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,ເຂົ້າຮ່ວມ
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,ເຂົ້າຮ່ວມ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,ການຂາດແຄນຈໍານວນ
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,variant item {0} ມີຢູ່ກັບຄຸນລັກສະນະດຽວກັນ
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,variant item {0} ມີຢູ່ກັບຄຸນລັກສະນະດຽວກັນ
 DocType: Employee Loan,Repay from Salary,ຕອບບຸນແທນຄຸນຈາກເງິນເດືອນ
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},ຂໍຊໍາລະເງິນກັບ {0} {1} ສໍາລັບຈໍານວນເງິນທີ່ {2}
@@ -4467,7 +4556,7 @@
 DocType: Sales Invoice Item,Sales Order Item,ລາຍການຂາຍສິນຄ້າ
 DocType: Salary Slip,Payment Days,Days ການຊໍາລະເງິນ
 DocType: Patient,Dormant,dormant
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,ຄັງສິນຄ້າທີ່ມີຂໍ້ເດັກນ້ອຍທີ່ບໍ່ສາມາດໄດ້ຮັບການປ່ຽນແປງເພື່ອຊີແຍກປະເພດ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,ຄັງສິນຄ້າທີ່ມີຂໍ້ເດັກນ້ອຍທີ່ບໍ່ສາມາດໄດ້ຮັບການປ່ຽນແປງເພື່ອຊີແຍກປະເພດ
 DocType: BOM,Manage cost of operations,ການຄຸ້ມຄອງຄ່າໃຊ້ຈ່າຍຂອງການດໍາເນີນງານ
 DocType: Accounts Settings,Stale Days,Stale Days
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","ໃນເວລາທີ່ຂອງກິດຈະກໍາການກວດກາໄດ້ຖືກ &quot;ສະ&quot;, ອີເມລ໌ບໍ່ເຖິງເປີດອັດຕະໂນມັດທີ່ຈະສົ່ງອີເມວໄປທີ່ກ່ຽວຂ້ອງ &quot;Contact&quot; ໃນການທີ່ມີການເຮັດທຸລະກໍາເປັນທີ່ຄັດຕິດ. ຜູ້ໃຊ້ອາດຈະມີຫຼືອາດຈະບໍ່ສົ່ງອີເມວການ."
@@ -4481,10 +4570,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serial No {0} ໄດ້ຮັບແລ້ວ
 ,Requested Items To Be Transferred,ການຮ້ອງຂໍໃຫ້ໄດ້ຮັບການໂອນ
 DocType: Expense Claim,Vehicle Log,ຍານພາຫະນະເຂົ້າສູ່ລະບົບ
-DocType: Purchase Invoice,Recurring Id,Id Recurring
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),ການມີອາການໄຂ້ (ຄວາມຮ້ອນ&gt; 385 ° C / 1013 ° F ຫຼືຄວາມຊ້າ&gt; 38 ° C / 1004 ° F)
 DocType: Customer,Sales Team Details,ລາຍລະອຽດ Team Sales
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,ລຶບຢ່າງຖາວອນ?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,ລຶບຢ່າງຖາວອນ?
 DocType: Expense Claim,Total Claimed Amount,ຈໍານວນທັງຫມົດອ້າງວ່າ
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,ກາລະໂອກາດທີ່ອາດມີສໍາລັບການຂາຍ.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},ບໍ່ຖືກຕ້ອງ {0}
@@ -4494,7 +4582,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ພະແນກຮ້ານຄ້າ
 ,Item Delivery Date,ລາຍການວັນທີ່ສົ່ງ
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,ຕິດຕັ້ງໂຮງຮຽນຂອງທ່ານໃນ ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,ຕິດຕັ້ງໂຮງຮຽນຂອງທ່ານໃນ ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),ຖານການປ່ຽນແປງຈໍານວນເງິນ (ບໍລິສັດສະກຸນເງິນ)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,ບໍ່ມີການຈົດບັນຊີສໍາລັບການສາງດັ່ງຕໍ່ໄປນີ້
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,ຊ່ວຍປະຢັດເອກະສານທໍາອິດ.
@@ -4506,13 +4594,12 @@
 DocType: Task,Is Milestone,ແມ່ນເຫດການສໍາຄັນ
 DocType: Daily Work Summary,Email Sent To,ສົ່ງອີເມວການ
 DocType: Budget,Warn,ເຕືອນ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,ທ່ານແນ່ໃຈວ່າທ່ານຕ້ອງການຍົກເລີກການຈົດທະບຽນ?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ໃດຂໍ້ສັງເກດອື່ນໆ, ຄວາມພະຍາຍາມສັງເກດວ່າຄວນຈະຢູ່ໃນບັນທຶກດັ່ງກ່າວ."
 DocType: BOM,Manufacturing User,ຜູ້ໃຊ້ການຜະລິດ
 DocType: Purchase Invoice,Raw Materials Supplied,ວັດຖຸດິບທີ່ຈໍາຫນ່າຍ
-DocType: Purchase Invoice,Recurring Print Format,ຮູບແບບພິມ Recurring
 DocType: C-Form,Series,Series
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},ສະກຸນເງິນຂອງລາຍຊື່ລາຄາ {0} ຕ້ອງເປັນ {1} ຫຼື {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,ຕື່ມການຜະລິດຕະພັນ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},ສະກຸນເງິນຂອງລາຍຊື່ລາຄາ {0} ຕ້ອງເປັນ {1} ຫຼື {2}
 DocType: Appraisal,Appraisal Template,ແມ່ແບບການປະເມີນຜົນ
 DocType: Item Group,Item Classification,ການຈັດປະເພດສິນຄ້າ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,ຜູ້ຈັດການພັດທະນາທຸລະກິດ
@@ -4526,7 +4613,7 @@
 DocType: Item Attribute Value,Attribute Value,ສະແດງມູນຄ່າ
 ,Itemwise Recommended Reorder Level,Itemwise ແນະນໍາຈັດລໍາດັບລະດັບ
 DocType: Salary Detail,Salary Detail,ຂໍ້ມູນເງິນເດືອນ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,ກະລຸນາເລືອກ {0} ທໍາອິດ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,ກະລຸນາເລືອກ {0} ທໍາອິດ
 DocType: Appointment Type,Physician,ແພດ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Batch {0} ຂໍ້ມູນ {1} ໄດ້ຫມົດອາຍຸແລ້ວ.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,ການປຶກສາຫາລື
@@ -4537,7 +4624,7 @@
 DocType: Salary Detail,Default Amount,ມາດຕະຖານຈໍານວນ
 DocType: Lab Test Template,Descriptive,Descriptive
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,ບໍ່ພົບຄັງສິນຄ້າໃນລະບົບ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,ຂອງເດືອນນີ້ Summary
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,ຂອງເດືອນນີ້ Summary
 DocType: Quality Inspection Reading,Quality Inspection Reading,ມີຄຸນະພາບກວດສອບການອ່ານຫນັງສື
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze ຫຸ້ນເກົ່າ Than` ຄວນຈະເປັນຂະຫນາດນ້ອຍກ່ວາ% d ມື້.
 DocType: Tax Rule,Purchase Tax Template,ຊື້ແມ່ແບບພາສີ
@@ -4560,12 +4647,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,ການຝຶກອົບຮົມກິດຈະກໍາ / ຜົນການຄົ້ນຫາ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,ສະສົມຄ່າເສື່ອມລາຄາເປັນ
 DocType: Sales Invoice,C-Form Applicable,"C, ໃບສະຫມັກ"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},ການດໍາເນີນງານທີ່ໃຊ້ເວລາຕ້ອງໄດ້ຫຼາຍກ່ວາ 0 ສໍາລັບການດໍາເນີນງານ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},ການດໍາເນີນງານທີ່ໃຊ້ເວລາຕ້ອງໄດ້ຫຼາຍກ່ວາ 0 ສໍາລັບການດໍາເນີນງານ {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Warehouse ເປັນການບັງຄັບ
 DocType: Supplier,Address and Contacts,ທີ່ຢູ່ແລະຕິດຕໍ່ພົວພັນ
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM ແປງຂໍ້ມູນ
 DocType: Program,Program Abbreviation,ຊື່ຫຍໍ້ໂຄງການ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,ຜະລິດພັນທີ່ບໍ່ສາມາດໄດ້ຮັບການຍົກຂຶ້ນມາຕໍ່ຕ້ານແມ່ແບບລາຍການ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,ຜະລິດພັນທີ່ບໍ່ສາມາດໄດ້ຮັບການຍົກຂຶ້ນມາຕໍ່ຕ້ານແມ່ແບບລາຍການ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,ຄ່າບໍລິການມີການປັບປຸງໃນການຮັບຊື້ຕໍ່ແຕ່ລະລາຍການ
 DocType: Warranty Claim,Resolved By,ການແກ້ໄຂໂດຍ
 DocType: Bank Guarantee,Start Date,ວັນທີ່ເລີ່ມ
@@ -4591,27 +4678,28 @@
 DocType: Employee,Educational Qualification,ຄຸນສົມບັດການສຶກສາ
 DocType: Workstation,Operating Costs,ຄ່າໃຊ້ຈ່າຍປະຕິບັດການ
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,ການປະຕິບັດຖ້າຫາກວ່າສະສົມງົບປະມານປະຈໍາເດືອນເກີນ
-DocType: Purchase Invoice,Submit on creation,ຍື່ນສະເຫນີກ່ຽວກັບການສ້າງ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},ສະກຸນເງິນສໍາລັບ {0} ຕ້ອງ {1}
+DocType: Subscription,Submit on creation,ຍື່ນສະເຫນີກ່ຽວກັບການສ້າງ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},ສະກຸນເງິນສໍາລັບ {0} ຕ້ອງ {1}
 DocType: Asset,Disposal Date,ວັນທີ່ຈໍາຫນ່າຍ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ອີເມວຈະຖືກສົ່ງໄປຫາພະນັກງານກິດຈະກໍາຂອງບໍລິສັດຢູ່ໃນຊົ່ວໂມງດັ່ງກ່າວ, ຖ້າຫາກວ່າພວກເຂົາເຈົ້າບໍ່ມີວັນພັກ. ສະຫຼຸບສັງລວມຂອງການຕອບສະຫນອງຈະໄດ້ຮັບການສົ່ງໄປຢູ່ໃນເວລາທ່ຽງຄືນ."
 DocType: Employee Leave Approver,Employee Leave Approver,ພະນັກງານອອກຈາກອະນຸມັດ
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},ຕິດຕໍ່ກັນ {0}: ຍະການຮຽງລໍາດັບໃຫມ່ທີ່ມີຢູ່ແລ້ວສໍາລັບການສາງນີ້ {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","ບໍ່ສາມາດປະກາດເປັນການສູນເສຍ, ເນື່ອງຈາກວ່າສະເຫນີລາຄາໄດ້ຖືກເຮັດໃຫ້."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,ການຝຶກອົບຮົມຜົນຕອບຮັບ
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},ຕິດຕໍ່ກັນ {0}: ຍະການຮຽງລໍາດັບໃຫມ່ທີ່ມີຢູ່ແລ້ວສໍາລັບການສາງນີ້ {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","ບໍ່ສາມາດປະກາດເປັນການສູນເສຍ, ເນື່ອງຈາກວ່າສະເຫນີລາຄາໄດ້ຖືກເຮັດໃຫ້."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,ການຝຶກອົບຮົມຜົນຕອບຮັບ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,ສັ່ງຊື້ສິນຄ້າ {0} ຕ້ອງໄດ້ຮັບການສົ່ງ
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,ເງື່ອນໄຂຜູ້ສະຫນອງ Scorecard
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},ກະລຸນາເລືອກເອົາວັນທີເລີ່ມຕົ້ນແລະການສິ້ນສຸດວັນທີ່ສໍາລັບລາຍການ {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},ຂອງລາຍວິຊາແມ່ນບັງຄັບໃນການຕິດຕໍ່ກັນ {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ວັນທີບໍ່ສາມາດຈະກ່ອນທີ່ຈະຈາກວັນທີ່
 DocType: Supplier Quotation Item,Prevdoc DocType,DocType Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,ເພີ່ມ / ແກ້ໄຂລາຄາ
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,ເພີ່ມ / ແກ້ໄຂລາຄາ
 DocType: Batch,Parent Batch,ຊຸດຂອງພໍ່ແມ່
 DocType: Batch,Parent Batch,ຊຸດຂອງພໍ່ແມ່
 DocType: Cheque Print Template,Cheque Print Template,ແມ່ແບບພິມກະແສລາຍວັນ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,ຕາຕະລາງຂອງສູນຕົ້ນທຶນ
 DocType: Lab Test Template,Sample Collection,Sample Collection
 ,Requested Items To Be Ordered,ການຮ້ອງຂໍການສັ່ງ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,ຄໍາສັ່ງຂອງຂ້ອຍ
 DocType: Price List,Price List Name,ລາຄາຊື່
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Summary ເຮັດປະຈໍາວັນ {0}
 DocType: Employee Loan,Totals,ຈໍານວນທັງຫມົດ
@@ -4630,12 +4718,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} ຫົວຫນ່ວຍຂອງ {1} ທີ່ຈໍາເປັນໃນ {2} ໃນ {3} {4} ສໍາລັບ {5} ເພື່ອໃຫ້ສໍາເລັດການນີ້.
 DocType: Fee Schedule,Student Category,ນັກສຶກສາປະເພດ
 DocType: Announcement,Student,ນັກສຶກສາ
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,ຫນ່ວຍບໍລິການອົງການຈັດຕັ້ງ (ຈັງຫວັດ) ຕົ້ນສະບັບ.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,ຫນ່ວຍບໍລິການອົງການຈັດຕັ້ງ (ຈັງຫວັດ) ຕົ້ນສະບັບ.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,ໄປທີ່ຫ້ອງ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,ກະລຸນາໃສ່ຂໍ້ຄວາມກ່ອນທີ່ຈະສົ່ງ
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,ຊ້ໍາສໍາລັບ SUPPLIER
 DocType: Email Digest,Pending Quotations,ທີ່ຍັງຄ້າງ Quotations
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,ຈຸດຂອງການຂາຍຂໍ້ມູນ
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,ຈຸດຂອງການຂາຍຂໍ້ມູນ
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,ການທົດສອບການທົດສອບຂອງຫ້ອງທົດລອງ.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,ເງິນກູ້ຢືມທີ່ບໍ່ປອດໄພ
 DocType: Cost Center,Cost Center Name,ມີລາຄາຖືກຊື່ Center
@@ -4645,6 +4733,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,ມູນຄ່າລວມ Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,ຂໍ້ຄວາມຫຼາຍກ່ວາ 160 ລັກສະນະຈະໄດ້ຮັບການແບ່ງປັນເຂົ້າໄປໃນຂໍ້ຄວາມຫລາຍ
 DocType: Purchase Receipt Item,Received and Accepted,ໄດ້ຮັບແລະຮັບການຍອມຮັບ
+DocType: Hub Settings,Company and Seller Profile,ຊື່ບໍລິສັດແລະຜູ້ຂາຍ
 ,GST Itemised Sales Register,GST ສິນຄ້າລາຄາລົງທະບຽນ
 ,Serial No Service Contract Expiry,Serial No ບໍລິການສັນຍາຫມົດອາຍຸ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,ທ່ານບໍ່ສາມາດປ່ອຍສິນເຊື່ອແລະຫັກບັນຊີດຽວກັນໃນເວລາດຽວກັນ
@@ -4654,10 +4743,11 @@
 DocType: Item,Variant Based On,Variant Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},weightage ທັງຫມົດໄດ້ຮັບມອບຫມາຍຄວນຈະເປັນ 100%. ມັນເປັນ {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,ຜູ້ສະຫນອງຂອງທ່ານ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,ກະລຸນາແກ້ໄຂ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,ບໍ່ສາມາດກໍານົດເປັນການສູນເສຍທີ່ເປັນຄໍາສັ່ງຂາຍແມ່ນ.
 DocType: Request for Quotation Item,Supplier Part No,Supplier Part No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ບໍ່ສາມາດຫັກໃນເວລາທີ່ປະເພດແມ່ນສໍາລັບການ &#39;ປະເມີນມູນຄ່າ&#39; ຫຼື &#39;Vaulation ແລະລວມ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,ໄດ້ຮັບຈາກ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,ໄດ້ຮັບຈາກ
 DocType: Lead,Converted,ປ່ຽນໃຈເຫລື້ອມໃສ
 DocType: Item,Has Serial No,ມີບໍ່ມີ Serial
 DocType: Employee,Date of Issue,ວັນທີຂອງການຈົດທະບຽນ
@@ -4665,7 +4755,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","ໂດຍອີງຕາມການຕັ້ງຄ່າຊື້ຖ້າຊື້ Reciept ຕ້ອງ == &#39;ໃຊ່&#39;, ຫຼັງຈາກນັ້ນສໍາລັບການສ້າງ Purchase ໃບເກັບເງິນ, ຜູ້ໃຊ້ຈໍາເປັນຕ້ອງໄດ້ສ້າງໃບຊື້ຄັ້ງທໍາອິດສໍາລັບລາຍການ {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},"ຕິດຕໍ່ກັນ, {0} ຕັ້ງຄ່າການຜະລິດສໍາລັບການ item {1}"
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,ຕິດຕໍ່ກັນ {0}: ມູນຄ່າຊົ່ວໂມງຕ້ອງມີຄ່າຫລາຍກ່ວາສູນ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Image ເວັບໄຊທ໌ {0} ຕິດກັບ Item {1} ບໍ່ສາມາດໄດ້ຮັບການພົບເຫັນ
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Image ເວັບໄຊທ໌ {0} ຕິດກັບ Item {1} ບໍ່ສາມາດໄດ້ຮັບການພົບເຫັນ
 DocType: Issue,Content Type,ປະເພດເນື້ອຫາ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,ຄອມພິວເຕີ
 DocType: Item,List this Item in multiple groups on the website.,ລາຍຊື່ສິນຄ້ານີ້ຢູ່ໃນກຸ່ມຫຼາກຫຼາຍກ່ຽວກັບເວັບໄຊທ໌.
@@ -4676,14 +4766,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,ໄດ້ຮັບ Unreconciled Entries
 DocType: Payment Reconciliation,From Invoice Date,ຈາກ Invoice ວັນທີ່
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,ທ່ານບໍ່ມີສິດໃນການສົ່ງ
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,ສະກຸນເງິນໃບບິນຈະຕ້ອງເທົ່າທຽມກັນກັບສະກຸນເງິນຫຼືບັນຊີຝ່າຍບໍ່ວ່າຈະ comapany ໃນຕອນຕົ້ນຂອງສະກຸນເງິນ
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,ສະກຸນເງິນໃບບິນຈະຕ້ອງເທົ່າທຽມກັນກັບສະກຸນເງິນຫຼືບັນຊີຝ່າຍບໍ່ວ່າຈະ comapany ໃນຕອນຕົ້ນຂອງສະກຸນເງິນ
 DocType: Healthcare Settings,Laboratory Settings,ການຕັ້ງຄ່າຫ້ອງທົດລອງ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,ອອກຈາກ Encashment
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,ມັນຈະເປັນແນວໃດເຮັດແນວໃດ?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,ການຄັງສິນຄ້າ
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,ທັງຫມົດ Admissions ນັກສຶກສາ
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,ມັນຈະເປັນແນວໃດເຮັດແນວໃດ?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,ການຄັງສິນຄ້າ
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,ທັງຫມົດ Admissions ນັກສຶກສາ
 ,Average Commission Rate,ສະເລ່ຍອັດຕາຄະນະກໍາມະ
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,&#39;ມີບໍ່ມີ Serial&#39; ບໍ່ສາມາດຈະ &quot;ແມ່ນ&quot; ລາຍການຫຼັກຊັບບໍ່
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,&#39;ມີບໍ່ມີ Serial&#39; ບໍ່ສາມາດຈະ &quot;ແມ່ນ&quot; ລາຍການຫຼັກຊັບບໍ່
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,ເລືອກສະຖານະພາບ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,ຜູ້ເຂົ້າຮ່ວມບໍ່ສາມາດໄດ້ຮັບການຫມາຍໄວ້ສໍາລັບກໍານົດວັນທີໃນອະນາຄົດ
 DocType: Pricing Rule,Pricing Rule Help,ລາຄາກົດລະບຽບຊ່ວຍເຫລືອ
@@ -4701,41 +4791,41 @@
 DocType: Item,Customer Code,ລະຫັດລູກຄ້າ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},ເຕືອນວັນເດືອນປີເກີດສໍາລັບ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ວັນນັບຕັ້ງແຕ່ສັ່ງຫຼ້າສຸດ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,ເດບິດການບັນຊີຈະຕ້ອງບັນຊີງົບດຸນ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,ເດບິດການບັນຊີຈະຕ້ອງບັນຊີງົບດຸນ
 DocType: Buying Settings,Naming Series,ການຕັ້ງຊື່ Series
 DocType: Leave Block List,Leave Block List Name,ອອກຈາກຊື່ Block ຊີ
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ວັນປະກັນໄພ Start ຄວນຈະມີຫນ້ອຍກ່ວາວັນການປະກັນໄພ End
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,ກະລຸນາຕິດຕັ້ງລະບົບຕັ້ງຊື່ຜູ້ສອນໃນໂຮງຮຽນ&gt; ການຕັ້ງຄ່າໂຮງຮຽນ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,ຊັບສິນ Stock
 DocType: Timesheet,Production Detail,ຂໍ້ມູນການຜະລິດ
+DocType: Restaurant,Active Menu,Active Menu
 DocType: Target Detail,Target Qty,ເປົ້າຫມາຍຈໍານວນ
 DocType: Shopping Cart Settings,Checkout Settings,ການຕັ້ງຄ່າການຊໍາລະເງິນ
 DocType: Attendance,Present,ປັດຈຸບັນ
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,ສົ່ງຫມາຍເຫດ {0} ຕ້ອງບໍ່ໄດ້ຮັບການສົ່ງ
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,ສົ່ງຫມາຍເຫດ {0} ຕ້ອງບໍ່ໄດ້ຮັບການສົ່ງ
 DocType: Notification Control,Sales Invoice Message,ຂໍ້ຄວາມການຂາຍໃບເກັບເງິນ
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,ບັນຊີ {0} ປິດຈະຕ້ອງເປັນຂອງປະເພດຄວາມຮັບຜິດຊອບ / Equity
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Slip ເງິນເດືອນຂອງພະນັກງານ {0} ສ້າງຮຽບຮ້ອຍແລ້ວສໍາລັບເອກະສານທີ່ໃຊ້ເວລາ {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Slip ເງິນເດືອນຂອງພະນັກງານ {0} ສ້າງຮຽບຮ້ອຍແລ້ວສໍາລັບເອກະສານທີ່ໃຊ້ເວລາ {1}
 DocType: Vehicle Log,Odometer,ໄມ
 DocType: Sales Order Item,Ordered Qty,ຄໍາສັ່ງຈໍານວນ
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,ລາຍການ {0} ເປັນຄົນພິການ
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,ລາຍການ {0} ເປັນຄົນພິການ
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen ເກີນ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM ບໍ່ໄດ້ປະກອບດ້ວຍລາຍການຫຼັກຊັບໃດຫນຶ່ງ
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,ກິດຈະກໍາໂຄງການ / ວຽກງານ.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM ບໍ່ໄດ້ປະກອບດ້ວຍລາຍການຫຼັກຊັບໃດຫນຶ່ງ
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,ກິດຈະກໍາໂຄງການ / ວຽກງານ.
 DocType: Vehicle Log,Refuelling Details,ລາຍລະອຽດເຊື້ອເພີງ
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,ສ້າງເງິນເດືອນ Slips
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","ການຊື້ຕ້ອງໄດ້ຮັບການກວດສອບ, ຖ້າຫາກວ່າສາມາດນໍາໃຊ້ສໍາລັບການໄດ້ຖືກຄັດເລືອກເປັນ {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ສ່ວນລົດຕ້ອງຫນ້ອຍກ່ວາ 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,ບໍ່ພົບອັດຕາການຊື້ຫຼ້າສຸດ
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ຂຽນ Off ຈໍານວນເງິນ (ບໍລິສັດສະກຸນເງິນ)
 DocType: Sales Invoice Timesheet,Billing Hours,ຊົ່ວໂມງໃນການເກັບເງິນ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,BOM ມາດຕະຖານສໍາລັບການ {0} ບໍ່ໄດ້ພົບເຫັນ
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,"ຕິດຕໍ່ກັນ, {0}: ກະລຸນາທີ່ກໍານົດໄວ້ປະລິມານ reorder"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM ມາດຕະຖານສໍາລັບການ {0} ບໍ່ໄດ້ພົບເຫັນ
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,"ຕິດຕໍ່ກັນ, {0}: ກະລຸນາທີ່ກໍານົດໄວ້ປະລິມານ reorder"
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,ແຕະລາຍການຈະເພີ່ມໃຫ້ເຂົາເຈົ້າຢູ່ທີ່ນີ້
 DocType: Fees,Program Enrollment,ໂຄງການລົງທະບຽນ
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher ມູນຄ່າທີ່ດິນ
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},ກະລຸນາຕັ້ງ {0}
-DocType: Purchase Invoice,Repeat on Day of Month,ເຮັດເລື້ມຄືນໃນວັນປະຈໍາເດືອນ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} ແມ່ນນັກສຶກສາ inactive
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} ແມ່ນນັກສຶກສາ inactive
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} ແມ່ນນັກສຶກສາ inactive
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} ແມ່ນນັກສຶກສາ inactive
 DocType: Employee,Health Details,ລາຍລະອຽດສຸຂະພາບ
 DocType: Offer Letter,Offer Letter Terms,ສະເຫນີເງື່ອນໄຂຈົດຫມາຍ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,ເພື່ອສ້າງເປັນຂໍການຊໍາລະເງິນເອກະສານອ້າງອິງຈໍາເປັນຕ້ອງມີ
@@ -4744,7 +4834,6 @@
 DocType: Employee External Work History,Salary,ເງິນເດືອນ
 DocType: Serial No,Delivery Document Type,ສົ່ງປະເພດເອກະສານ
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,ຍື່ນສະເຫນີການຄວາມຜິດພາດພຽງເງິນເດືອນທັງຫມົດສໍາລັບເງື່ອນໄຂການຄັດເລືອກຂ້າງເທິງ
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} ລາຍະການຊິ້ງຂໍ້ມູນ
 DocType: Sales Order,Partly Delivered,ສົ່ງສ່ວນຫນຶ່ງແມ່ນ
 DocType: Email Digest,Receivables,ລູກຫນີ້
 DocType: Lead Source,Lead Source,ມາເປັນຜູ້ນໍາພາ
@@ -4765,9 +4854,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Range Ageing 2
 DocType: SG Creation Tool Course,Max Strength,ຄວາມສູງສຸດທີ່ເຄຍ
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM ທົດແທນ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,ເລືອກລາຍການໂດຍອີງໃສ່ວັນທີ່ສົ່ງ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,ເລືອກລາຍການໂດຍອີງໃສ່ວັນທີ່ສົ່ງ
 ,Sales Analytics,ການວິເຄາະການຂາຍ
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},ມີ {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},ມີ {0}
 ,Prospects Engaged But Not Converted,ຄວາມສົດໃສດ້ານຫມັ້ນແຕ່ບໍ່ປ່ຽນໃຈເຫລື້ອມໃສ
 ,Prospects Engaged But Not Converted,ຄວາມສົດໃສດ້ານຫມັ້ນແຕ່ບໍ່ປ່ຽນໃຈເຫລື້ອມໃສ
 DocType: Manufacturing Settings,Manufacturing Settings,ການຕັ້ງຄ່າການຜະລິດ
@@ -4775,10 +4864,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Mobile No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,ກະລຸນາໃສ່ສະກຸນເງິນເລີ່ມຕົ້ນໃນບໍລິສັດລິນຍາໂທ
 DocType: Stock Entry Detail,Stock Entry Detail,Entry ຕ໊ອກ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,ເຕືອນປະຈໍາວັນ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,ເຕືອນປະຈໍາວັນ
 DocType: Products Settings,Home Page is Products,ຫນ້າທໍາອິດແມ່ນຜະລິດຕະພັນ
 ,Asset Depreciation Ledger,Ledger ຄ່າເສື່ອມລາຄາຊັບສິນ
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},ການຂັດແຍ້ງດ້ານກົດລະບຽບພາສີກັບ {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},ການຂັດແຍ້ງດ້ານກົດລະບຽບພາສີກັບ {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,ຊື່ບັນຊີໃຫມ່
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,ຕົ້ນທຶນວັດຖຸດິບທີ່ຈໍາຫນ່າຍ
 DocType: Selling Settings,Settings for Selling Module,ການຕັ້ງຄ່າສໍາລັບຂາຍ Module
@@ -4792,8 +4881,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,ລາຍການ {0} ຈະຕ້ອງເປັນລາຍການຫຼັກຊັບ
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,ເຮັດໃນຕອນຕົ້ນໃນ Warehouse Progress
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,ການຕັ້ງຄ່າມາດຕະຖານສໍາລັບການເຮັດທຸລະກໍາການບັນຊີ.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ກະລຸນາຕັ້ງລະບົບການຕັ້ງຊື່ພະນັກງານໃນຊັບພະຍາກອນມະນຸດ&gt; HR Settings
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,ວັນທີທີ່ຄາດບໍ່ສາມາດກ່ອນທີ່ວັດສະດຸການຈອງວັນທີ່
+DocType: Restaurant,Default Tax Template,ແມ່ແບບພາສີມາດຕະຖານ
 DocType: Fees,Student Details,ລາຍລະອຽດນັກຮຽນ
 DocType: Purchase Invoice Item,Stock Qty,ສິນຄ້າພ້ອມສົ່ງ
 DocType: Purchase Invoice Item,Stock Qty,ສິນຄ້າພ້ອມສົ່ງ
@@ -4812,8 +4902,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,ໄປທີ່ລາຍການ
 DocType: Sales Partner,Partner Type,ປະເພດຄູ່ຮ່ວມງານ
 DocType: Purchase Taxes and Charges,Actual,ທີ່ແທ້ຈິງ
+DocType: Restaurant Menu,Restaurant Manager,ຜູ້ຈັດການຮ້ານອາຫານ
 DocType: Authorization Rule,Customerwise Discount,Customerwise ສ່ວນລົດ
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Timesheet ສໍາລັບວຽກງານ.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Timesheet ສໍາລັບວຽກງານ.
 DocType: Purchase Invoice,Against Expense Account,ຕໍ່ບັນຊີຄ່າໃຊ້ຈ່າຍ
 DocType: Production Order,Production Order,ສັ່ງຊື້ສິນຄ້າ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,ການຕິດຕັ້ງຫມາຍເຫດ {0} ໄດ້ຖືກສົ່ງແລ້ວ
@@ -4821,7 +4912,6 @@
 DocType: Quotation Item,Against Docname,ຕໍ່ Docname
 DocType: SMS Center,All Employee (Active),ທັງຫມົດພະນັກງານ (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,ເບິ່ງໃນປັດຈຸບັນ
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,ເລືອກໄລຍະເວລາໃນເວລາທີ່ໃບເກັບເງິນຈະໄດ້ຮັບການຜະລິດອັດຕະໂນມັດ
 DocType: BOM,Raw Material Cost,ຕົ້ນທຶນວັດຖຸດິບ
 DocType: Item Reorder,Re-Order Level,Re: ຄໍາສັ່ງລະດັບ
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,ກະລຸນາໃສ່ລາຍການແລະການວາງແຜນຈໍານວນທີ່ທ່ານຕ້ອງການທີ່ຈະຍົກສູງບົດບາດສັ່ງຜະລິດຫຼືດາວໂຫຼດອຸປະກອນການເປັນວັດຖຸດິບສໍາລັບການວິເຄາະ.
@@ -4834,24 +4924,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,ປະເພດບົດລາຍງານແມ່ນການບັງຄັບ
 DocType: Item,Serial Number Series,Series ຈໍານວນ Serial
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Warehouse ເປັນການບັງຄັບສໍາລັບລາຍການຫຸ້ນ {0} ຕິດຕໍ່ກັນ {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,ຕື່ມ Programs
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,ຂາຍຍ່ອຍແລະຂາຍສົ່ງ
 DocType: Issue,First Responded On,ຄັ້ງທໍາອິດຕອບຫຼ້າສຸດໂດຍ
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross ລາຍການລາຍການໃນຫລາຍກຸ່ມ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ງົບປະມານປີເລີ່ມວັນແລະງົບປະມານປີສຸດທ້າຍວັນທີ່ກໍານົດໄວ້ແລ້ວໃນປີງົບປະມານ {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,ການເກັບກູ້ວັນທີ່ປັບປຸງ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,ຊຸດ Split
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,ຊຸດ Split
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,ຊຸດ Split
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,ຊຸດ Split
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,ຄືນສົບຜົນສໍາເລັດ
 DocType: Request for Quotation Supplier,Download PDF,ດາວໂຫລດ PDF
 DocType: Production Order,Planned End Date,ການວາງແຜນວັນທີ່ສິ້ນສຸດ
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,ກະລຸນາໃສ່ Date Schedule
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,ບ່ອນທີ່ລາຍການເກັບຮັກສາໄວ້.
 DocType: Request for Quotation,Supplier Detail,ຂໍ້ມູນຈໍາຫນ່າຍ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},ຄວາມຜິດພາດໃນສູດຫຼືສະພາບ: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},ຄວາມຜິດພາດໃນສູດຫຼືສະພາບ: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,ຈໍານວນອະນຸ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,ນ້ໍາຫນັກມາດຕະຖານຕ້ອງໄດ້ເພີ່ມສູງເຖິງ 100%
 DocType: Attendance,Attendance,ຜູ້ເຂົ້າຮ່ວມ
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,ສິນຄ້າພ້ອມສົ່ງ
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,ສິນຄ້າພ້ອມສົ່ງ
 DocType: BOM,Materials,ອຸປະກອນການ
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","ຖ້າຫາກວ່າບໍ່ໄດ້ກວດສອບ, ບັນຊີລາຍການຈະຕ້ອງໄດ້ຮັບການເພີ່ມໃນແຕ່ລະພະແນກບ່ອນທີ່ມັນຈະຕ້ອງມີການນໍາໃຊ້."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,ແຫລ່ງທີ່ມາແລະເປົ້າຫມາຍ Warehouse ບໍ່ສາມາດຈະເປັນຄືກັນ
@@ -4869,6 +4959,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,ກ່ຽວກັບສຸດທິທັງຫມົດ
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},ມູນຄ່າສໍາລັບຄຸນສົມບັດ {0} ຕ້ອງຢູ່ພາຍໃນລະດັບຄວາມຂອງ {1} ກັບ {2} ໃນ increments ຂອງ {3} ສໍາລັບລາຍການ {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,ຄັງສິນຄ້າເປົ້າຫມາຍໃນການຕິດຕໍ່ກັນ {0} ຈະຕ້ອງດຽວກັນເປັນໃບສັ່ງຜະລິດ
+DocType: Restaurant Reservation,Waitlisted,ລໍຖ້າລາຍການ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,ສະກຸນເງິນບໍ່ສາມາດມີການປ່ຽນແປງຫຼັງຈາກການເຮັດໃຫ້ການອອກສຽງການນໍາໃຊ້ສະກຸນເງິນອື່ນ ໆ
 DocType: Vehicle Service,Clutch Plate,ເສື້ອ
 DocType: Company,Round Off Account,ຕະຫຼອດໄປ Account
@@ -4885,7 +4976,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,ຊື່ໃຫມ່ຂາຍສ່ວນບຸກຄົນ
 DocType: Packing Slip,Gross Weight UOM,ນ້ໍາຫນັກ UOM
 DocType: Delivery Note Item,Against Sales Invoice,ຕໍ່ Invoice Sales
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,ກະລຸນາໃສ່ຈໍານວນ serial ສໍາລັບລາຍການເນື່ອງ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,ກະລຸນາໃສ່ຈໍານວນ serial ສໍາລັບລາຍການເນື່ອງ
 DocType: Bin,Reserved Qty for Production,ລິຂະສິດຈໍານວນການຜະລິດ
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ອອກຈາກການກວດກາຖ້າຫາກວ່າທ່ານບໍ່ຕ້ອງການທີ່ຈະພິຈາລະນາໃນຂະນະທີ່ batch ເຮັດໃຫ້ກຸ່ມແນ່ນອນຕາມ.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ອອກຈາກການກວດກາຖ້າຫາກວ່າທ່ານບໍ່ຕ້ອງການທີ່ຈະພິຈາລະນາໃນຂະນະທີ່ batch ເຮັດໃຫ້ກຸ່ມແນ່ນອນຕາມ.
@@ -4897,7 +4988,7 @@
 DocType: Lab Test,Test Group,Test Group
 DocType: Payment Reconciliation,Receivable / Payable Account,Receivable / Account Payable
 DocType: Delivery Note Item,Against Sales Order Item,ຕໍ່ສັ່ງຂາຍສິນຄ້າ
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},ກະລຸນາລະບຸຄຸນສົມບັດມູນຄ່າສໍາລັບເຫດຜົນ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},ກະລຸນາລະບຸຄຸນສົມບັດມູນຄ່າສໍາລັບເຫດຜົນ {0}
 DocType: Item,Default Warehouse,ມາດຕະຖານ Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},ງົບປະມານບໍ່ສາມາດໄດ້ຮັບການມອບຫມາຍຕໍ່ບັນຊີ Group {0}
 DocType: Healthcare Settings,Patient Registration,ການລົງທະບຽນຜູ້ປ່ວຍ
@@ -4927,6 +5018,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,ຄົນຂາຍ
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,ງົບປະມານແລະສູນຕົ້ນທຶນ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,ຮູບແບບໃນຕອນຕົ້ນຫຼາຍຂອງການຊໍາລະເງິນບໍ່ໄດ້ອະນຸຍາດໃຫ້
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,ສໍາລັບ
 ,Appointment Analytics,Appointment Analytics
 DocType: Vehicle Service,Half Yearly,ເຄິ່ງຫນຶ່ງປະຈໍາປີ
 DocType: Lead,Blog Subscriber,ຈອງ Blog
@@ -4946,7 +5038,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,ນັບ quot
 ,BOM Stock Report,Report Stock BOM
 DocType: Stock Reconciliation Item,Quantity Difference,ປະລິມານທີ່ແຕກຕ່າງກັນ
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,ການປຸງແຕ່ງ Payroll
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,ການປຸງແຕ່ງ Payroll
 DocType: Opportunity Item,Basic Rate,ອັດຕາພື້ນຖານ
 DocType: GL Entry,Credit Amount,ການປ່ອຍສິນເຊື່ອ
 DocType: Cheque Print Template,Signatory Position,ຕໍາແຫນ່ງລົງນາມ
@@ -4960,12 +5052,12 @@
 DocType: Tax Rule,Tax Rule,ກົດລະບຽບພາສີ
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,ຮັກສາອັດຕາດຽວກັນຕະຫຼອດວົງຈອນ Sales
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,ການວາງແຜນການບັນທຶກທີ່ໃຊ້ເວລານອກຊົ່ວໂມງ Workstation ເຮັດວຽກ.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,ລູກຄ້າໃນຄິວ
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,ທ່ານດຣ {0} ບໍ່ມີຕາຕະລາງແພດ. ຕື່ມມັນຢູ່ໃນຫມໍຫມໍ
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,ລູກຄ້າໃນຄິວ
 DocType: Student,Nationality,ສັນຊາດ
 ,Items To Be Requested,ລາຍການທີ່ຈະໄດ້ຮັບການຮ້ອງຂໍ
-DocType: Purchase Order,Get Last Purchase Rate,ໄດ້ຮັບຫຼ້າສຸດອັດຕາການຊື້
 DocType: Company,Company Info,ຂໍ້ມູນບໍລິສັດ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,ເລືອກຫລືເພີ່ມລູກຄ້າໃຫມ່
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,ເລືອກຫລືເພີ່ມລູກຄ້າໃຫມ່
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,ສູນຕົ້ນທຶນທີ່ຈໍາເປັນຕ້ອງເຂົ້າເອີ້ນຮ້ອງຄ່າໃຊ້ຈ່າຍ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ຄໍາຮ້ອງສະຫມັກຂອງກອງທຶນ (ຊັບສິນ)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ນີ້ແມ່ນອີງໃສ່ການເຂົ້າຮ່ວມຂອງພະນັກງານນີ້
@@ -4973,6 +5065,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,ບັນຊີເດບິດ
 DocType: Fiscal Year,Year Start Date,ປີເລີ່ມວັນທີ່
 DocType: Attendance,Employee Name,ຊື່ພະນັກງານ
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,ລາຍະການສັ່ງຊື້ລາຍະການຮ້ານອາຫານ
 DocType: Sales Invoice,Rounded Total (Company Currency),ກົມທັງຫມົດ (ບໍລິສັດສະກຸນເງິນ)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,ບໍ່ສາມາດ covert ກັບ Group ເນື່ອງຈາກວ່າປະເພດບັນຊີໄດ້ຖືກຄັດເລືອກ.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} ໄດ້ຮັບການແກ້ໄຂ. ກະລຸນາໂຫຼດຫນ້າຈໍຄືນ.
@@ -4983,6 +5076,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,ຜົນປະໂຫຍດພະນັກງານ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},ປະລິມານບັນຈຸຕ້ອງເທົ່າກັບປະລິມານສໍາລັບລາຍການ {0} ຕິດຕໍ່ກັນ {1}
 DocType: Production Order,Manufactured Qty,ຜະລິດຕະພັນຈໍານວນ
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Invoice Created
 DocType: Purchase Receipt Item,Accepted Quantity,ຈໍານວນທີ່ໄດ້ຮັບການ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},ກະລຸນາທີ່ກໍານົດໄວ້ມາດຕະຖານບັນຊີພັກຜ່ອນສໍາລັບພະນັກງານ {0} ຫລືບໍລິສັດ {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} ບໍ່ໄດ້ຢູ່
@@ -4992,18 +5086,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ຕິດຕໍ່ກັນບໍ່ໄດ້ຊື້ {0}: ຈໍານວນເງິນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ Pending ຈໍານວນຕໍ່ຄ່າໃຊ້ຈ່າຍ {1} ການຮຽກຮ້ອງ. ທີ່ຍັງຄ້າງຈໍານວນເງິນເປັນ {2}
 DocType: Maintenance Schedule,Schedule,ກໍານົດເວລາ
 DocType: Account,Parent Account,ບັນຊີຂອງພໍ່ແມ່
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,ສາມາດໃຊ້ໄດ້
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,ສາມາດໃຊ້ໄດ້
 DocType: Quality Inspection Reading,Reading 3,ອ່ານ 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,ປະເພດ Voucher
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,ລາຄາບໍ່ພົບຫຼືຄົນພິການ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,ລາຄາບໍ່ພົບຫຼືຄົນພິການ
 DocType: Lab Test,Approved,ການອະນຸມັດ
 DocType: Pricing Rule,Price,ລາຄາ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',ພະນັກງານສະບາຍໃຈໃນ {0} ຕ້ອງໄດ້ຮັບການສ້າງຕັ້ງເປັນ &#39;ຊ້າຍ&#39;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',ພະນັກງານສະບາຍໃຈໃນ {0} ຕ້ອງໄດ້ຮັບການສ້າງຕັ້ງເປັນ &#39;ຊ້າຍ&#39;
+DocType: Hub Settings,Last Sync On,Last Sync On
 DocType: Guardian,Guardian,ຜູ້ປົກຄອງ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ການປະເມີນ {0} ສ້າງຕັ້ງສໍາລັບພະນັກງານ {1} ໃນຊ່ວງວັນທີ່ໄດ້ຮັບ
 DocType: Employee,Education,ການສຶກສາ
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,Del
 DocType: Selling Settings,Campaign Naming By,ຊື່ແຄມເປນໂດຍ
 DocType: Employee,Current Address Is,ທີ່ຢູ່ປັດຈຸບັນແມ່ນ
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,ເປົ້າຫມາຍການຂາຍລາຍເດືອນ (
@@ -5018,7 +5113,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,ລະຫັດຂອງລາຍວິຊາ:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,ກະລຸນາໃສ່ທີ່ຄຸ້ມຄ່າ
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ຕິດຕໍ່ກັນ, {0}: Reference ປະເພດເອກະສານຕ້ອງເປັນສ່ວນຫນຶ່ງຂອງຄໍາສັ່ງຊື້, ຊື້ໃບເກັບເງິນຫຼືການອະນຸທິນ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ຕິດຕໍ່ກັນ, {0}: Reference ປະເພດເອກະສານຕ້ອງເປັນສ່ວນຫນຶ່ງຂອງຄໍາສັ່ງຊື້, ຊື້ໃບເກັບເງິນຫຼືການອະນຸທິນ"
 DocType: Employee,Current Address,ທີ່ຢູ່ປະຈຸບັນ
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ຖ້າຫາກວ່າລາຍການແມ່ນ variant ຂອງລາຍການອື່ນຫຼັງຈາກນັ້ນອະທິບາຍ, ຮູບພາບ, ລາຄາ, ພາສີອາກອນແລະອື່ນໆຈະໄດ້ຮັບການກໍານົດໄວ້ຈາກແມ່ແບບເວັ້ນເສຍແຕ່ລະບຸຢ່າງຊັດເຈນ"
 DocType: Serial No,Purchase / Manufacture Details,ຊື້ / ລາຍລະອຽດຜະລິດ
@@ -5049,7 +5144,7 @@
 DocType: Hub Settings,Hub Settings,ການຕັ້ງຄ່າ Hub
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,ກັບການປະຕິບັດ
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,entries ບັນຊີໄດ້ຮັບການເຮັດໃຫ້ຢູ່ໃນສະກຸນເງິນ {0} ສໍາລັບບໍລິສັດ {1}. ກະລຸນາເລືອກບັນຊີລູກຫນີ້ຫລືເຈົ້າຫນີ້ທີ່ມີສະກຸນເງິນ {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,entries ບັນຊີໄດ້ຮັບການເຮັດໃຫ້ຢູ່ໃນສະກຸນເງິນ {0} ສໍາລັບບໍລິສັດ {1}. ກະລຸນາເລືອກບັນຊີລູກຫນີ້ຫລືເຈົ້າຫນີ້ທີ່ມີສະກຸນເງິນ {0}.
 DocType: Asset,Is Existing Asset,ແມ່ນທີ່ມີຢູ່ Asset
 DocType: Salary Detail,Statistical Component,Component ສະຖິຕິ
 DocType: Salary Detail,Statistical Component,Component ສະຖິຕິ
@@ -5058,13 +5153,14 @@
 DocType: BOM Operation,BOM Operation,BOM ການດໍາເນີນງານ
 DocType: Purchase Taxes and Charges,On Previous Row Amount,ກ່ຽວກັບຈໍານວນແຖວ Previous
 DocType: Student,Home Address,ທີ່ຢູ່ເຮືອນ
+DocType: Item,Has Expiry Date,ມີວັນຫມົດອາຍຸ
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Item Variant Settings
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Asset ການຖ່າຍໂອນ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,Asset ການຖ່າຍໂອນ
 DocType: POS Profile,POS Profile,ຂໍ້ມູນ POS
 DocType: Training Event,Event Name,ຊື່ກໍລະນີ
 DocType: Physician,Phone (Office),ໂທລະສັບ (ຫ້ອງການ)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,ເປີດປະຕູຮັບ
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},ການຮັບສະຫມັກສໍາລັບການ {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,ເປີດປະຕູຮັບ
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},ການຮັບສະຫມັກສໍາລັບການ {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","ລະດູການສໍາລັບການສ້າງຕັ້ງງົບປະມານ, ເປົ້າຫມາຍແລະອື່ນໆ"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,ຊື່ຂອງຕົວປ່ຽນແປງ
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","ລາຍການ {0} ເປັນແມ່ແບບໄດ້, ກະລຸນາເລືອກເອົາຫນຶ່ງຂອງ variants ຂອງຕົນ"
@@ -5073,7 +5169,7 @@
 DocType: Assessment Plan,Room,ຫ້ອງ
 DocType: Purchase Order,Advance Paid,ລ່ວງຫນ້າການຊໍາລະເງິນ
 DocType: Item,Item Tax,ພາສີລາຍ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,ອຸປະກອນການຜະລິດ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,ອຸປະກອນການຜະລິດ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,ອາກອນຊົມໃຊ້ໃບເກັບເງິນ
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% ປະກົດວ່າຫຼາຍກ່ວາຫນຶ່ງຄັ້ງ
 DocType: Expense Claim,Employees Email Id,Id ພະນັກງານ Email
@@ -5084,32 +5180,30 @@
 DocType: Program,Program Name,ຊື່ໂຄງການ
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,ພິຈາລະນາຈ່າຍພາສີຫລືຄ່າທໍານຽມສໍາລັບ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,ຕົວຈິງຈໍານວນເປັນການບັງຄັບ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} ປະຈຸບັນມີ {1} ຈໍາ Supplier Scorecard, ແລະໃບສັ່ງຊື້ເພື່ອຈໍາຫນ່າຍນີ້ຄວນໄດ້ຮັບການອອກກັບລະມັດລະວັງ."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} ປະຈຸບັນມີ {1} ຈໍາ Supplier Scorecard, ແລະໃບສັ່ງຊື້ເພື່ອຈໍາຫນ່າຍນີ້ຄວນໄດ້ຮັບການອອກກັບລະມັດລະວັງ."
 DocType: Employee Loan,Loan Type,ປະເພດເງິນກູ້
 DocType: Scheduling Tool,Scheduling Tool,ເຄື່ອງມືການຕັ້ງເວລາ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,ບັດເຄຣດິດ
 DocType: BOM,Item to be manufactured or repacked,ລາຍການທີ່ຈະໄດ້ຮັບຜະລິດຕະພັນຫຼືຫຸ້ມຫໍ່
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,ການຕັ້ງຄ່າມາດຕະຖານສໍາລັບການເຮັດທຸລະກໍາຫຼັກຊັບ.
-DocType: Purchase Invoice,Next Date,ວັນຖັດໄປ
 DocType: Employee Education,Major/Optional Subjects,ທີ່ສໍາຄັນ / ວິຊາຖ້າຕ້ອງການ
 DocType: Sales Invoice Item,Drop Ship,Drop ການຂົນສົ່ງ
+DocType: Hub Settings,Suspended,Suspended
 DocType: Training Event,Attendees,ເຂົ້າຮ່ວມປະຊຸມ
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","ໃນທີ່ນີ້ທ່ານສາມາດຮັກສາລາຍລະອຽດຂອງຄອບຄົວເຊັ່ນ: ຊື່ແລະອາຊີບຂອງພໍ່ແມ່, ຄູ່ສົມລົດແລະເດັກນ້ອຍ"
 DocType: Academic Term,Term End Date,ໄລຍະສຸດທ້າຍວັນທີ່
-DocType: Hub Settings,Seller Name,ຊື່ຜູ້ຂາຍ
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),ພາສີອາກອນແລະຄ່າບໍລິການຫັກ (ບໍລິສັດສະກຸນເງິນ)
 DocType: Item Group,General Settings,ການຕັ້ງຄ່າທົ່ວໄປ
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,ຈາກສະກຸນເງິນແລະສະກຸນເງິນບໍ່ສາມາດຈະເປັນຄືກັນ
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,ຕື່ມ Instructors
 DocType: Stock Entry,Repack,ຫຸ້ມຫໍ່ຄືນ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,ທ່ານຈະຕ້ອງຊ່ວຍປະຢັດຮູບແບບກ່ອນທີ່ຈະດໍາເນີນຄະດີ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,ກະລຸນາເລືອກບໍລິສັດທໍາອິດ
 DocType: Item Attribute,Numeric Values,ມູນຄ່າຈໍານວນ
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,ຄັດຕິດ Logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,ລະດັບ Stock
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,ລະດັບ Stock
 DocType: Customer,Commission Rate,ອັດຕາຄະນະກໍາມະ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,ສ້າງ {0} scorecards ສໍາລັບ {1} ລະຫວ່າງ:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,ເຮັດໃຫ້ Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,ເຮັດໃຫ້ Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,ຄໍາຮ້ອງສະຫມັກ Block ໃບໂດຍພະແນກ.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","ປະເພດການຈ່າຍເງິນຕ້ອງເປັນຫນຶ່ງໃນໄດ້ຮັບການ, ການຊໍາລະເງິນແລະພາຍໃນການຖ່າຍໂອນ"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,ການວິເຄາະ
@@ -5124,11 +5218,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,ນະຄອນຫຼວງ Stock
 DocType: Shopping Cart Settings,Show Public Attachments,ສະແດງ Attachments ສາທາລະນະ
 DocType: Packing Slip,Package Weight Details,Package Details ນ້ໍາຫນັກ
+DocType: Restaurant Reservation,Reservation Time,ເວລາ Reservation
 DocType: Payment Gateway Account,Payment Gateway Account,ການຊໍາລະເງິນບັນຊີ Gateway
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,ຫຼັງຈາກສໍາເລັດການຊໍາລະເງິນໂອນຜູ້ໃຊ້ຫນ້າທີ່ເລືອກ.
 DocType: Company,Existing Company,ບໍລິສັດທີ່ມີຢູ່ແລ້ວ
 DocType: Healthcare Settings,Result Emailed,ຜົນໄດ້ຮັບ Emailed
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",ປະເພດສ່ວຍສາອາກອນໄດ້ຮັບການປ່ຽນແປງກັບ &quot;Total&quot; ເນື່ອງຈາກວ່າລາຍການທັງຫມົດລາຍການບໍ່ແມ່ນຫຼັກຊັບ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,ລະຫັດສິນຄ້າ&gt; ກຸ່ມສິນຄ້າ&gt; ຍີ່ຫໍ້
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,ກະລຸນາເລືອກໄຟລ໌ CSV
 DocType: Student Leave Application,Mark as Present,ເຄື່ອງຫມາຍການນໍາສະເຫນີ
 DocType: Supplier Scorecard,Indicator Color,ຕົວຊີ້ວັດສີ
@@ -5153,11 +5249,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,ເຮັດໃຫ້ກຸ່ມນັກສຶກສາ
 DocType: Fee Schedule,FRQ.,FRQ
 DocType: Leave Type,Is Carry Forward,ແມ່ນປະຕິບັດຕໍ່
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,ຮັບສິນຄ້າຈາກ BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,ຮັບສິນຄ້າຈາກ BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ນໍາໄປສູ່ການທີ່ໃຊ້ເວລາວັນ
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"ຕິດຕໍ່ກັນ, {0}: ປະກາດວັນທີ່ຈະຕ້ອງເຊັ່ນດຽວກັນກັບວັນທີ່ຊື້ {1} ຂອງຊັບສິນ {2}"
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,ກວດສອບນີ້ຖ້າຫາກວ່ານັກສຶກສາໄດ້ອາໄສຢູ່ໃນ Hostel ສະຖາບັນຂອງ.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,ກະລຸນາໃສ່ຄໍາສັ່ງຂາຍໃນຕາຕະລາງຂ້າງເທິງ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,ກະລຸນາໃສ່ຄໍາສັ່ງຂາຍໃນຕາຕະລາງຂ້າງເທິງ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,ບໍ່ Submitted ເງິນເດືອນ Slips
 ,Stock Summary,Stock Summary
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,ໂອນຊັບສິນຈາກສາງກັບຄົນອື່ນ
@@ -5173,5 +5269,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ຕິດຕໍ່ກັນ {0}: ເຂົ້າເດບິດບໍ່ສາມາດໄດ້ຮັບການຕິດພັນກັບ {1}
 DocType: Journal Entry,Subscription Section,Section Subscription
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,ບັນຊີ {0} ບໍ່ມີ
+DocType: Training Event,Training Program,ໂຄງການຝຶກອົບຮົມ
 DocType: Account,Cash,ເງິນສົດ
 DocType: Employee,Short biography for website and other publications.,biography ສັ້ນສໍາລັບເວັບໄຊທ໌ແລະສິ່ງພິມອື່ນໆ.
diff --git a/erpnext/translations/lt.csv b/erpnext/translations/lt.csv
index 9a0b22d..1e449a4 100644
--- a/erpnext/translations/lt.csv
+++ b/erpnext/translations/lt.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Pajamos režimas
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Registruotis
 DocType: Patient,Divorced,išsiskyręs
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Daiktai jau sinchronizuojami
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Leisti punktas turi būti pridėtas kelis kartus iš sandorio
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Atšaukti medžiaga Apsilankymas {0} prieš panaikinant šį garantinės pretenzijos
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Vartotojų gaminiai
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Palikite Approvers
 DocType: Sales Partner,Dealer,prekiautojas
 DocType: Consultation,Investigations,Tyrimai
+DocType: Restaurant Order Entry,Click Enter To Add,Spustelėkite &quot;Įtraukti&quot;
 DocType: Employee,Rented,nuomojamos
 DocType: Purchase Order,PO-,po-
 DocType: POS Profile,Applicable for User,Taikoma Vartotojo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Sustabdyta Gamybos nurodymas negali būti atšauktas, atkišti ji pirmą kartą atšaukti"
 DocType: Vehicle Service,Mileage,Rida
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Ar tikrai norite atsisakyti šios turtą?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Ar tikrai norite atsisakyti šios turtą?
 DocType: Drug Prescription,Update Schedule,Atnaujinti tvarkaraštį
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Pasirinkti Default Tiekėjas
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Valiutų reikia kainoraščio {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Patikrinkite užimtumą
 DocType: Job Applicant,Job Applicant,Darbas Pareiškėjas
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Tai grindžiama sandorių atžvilgiu šis tiekėjas. Žiūrėti grafikas žemiau detales
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nieko daugiau rezultatų.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,juridinis
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Tikrasis tipas mokestis negali būti įtrauktos prekės lygis eilės {0}
 DocType: Bank Guarantee,Customer,klientas
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),"Valiutų kursai turi būti toks pat, kaip {0} {1} ({2})"
 DocType: Sales Invoice,Customer Name,Klientas
 DocType: Vehicle,Natural Gas,Gamtinių dujų
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Banko sąskaita negali būti vadinamas {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Banko sąskaita negali būti vadinamas {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Vadovai (ar jų grupės), pagal kurį apskaitos įrašai yra pagaminti ir likučiai išlieka."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Neįvykdyti {0} negali būti mažesnė už nulį ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Apdorojimo atlyginimo užstatas nėra.
 DocType: Manufacturing Settings,Default 10 mins,Numatytasis 10 min
 DocType: Leave Type,Leave Type Name,Palikite Modelio pavadinimas
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Rodyti atvira
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Šiuos veiksmus reikia pačiam patys imtis pirmiau minėtuose pasikartojančiuose veiksmuose
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Serija Atnaujinta sėkmingai
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Užsakymas
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural leidinys Įėjimo Pateikė
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Pirkimui užsakyti prekes bus gauta
 DocType: SMS Center,All Supplier Contact,Visi tiekėju Kontaktai Reklama
 DocType: Support Settings,Support Settings,paramos Nustatymai
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Tikimasi Pabaigos data negali būti mažesnė nei planuotos datos
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Tikimasi Pabaigos data negali būti mažesnė nei planuotos datos
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Eilutės # {0}: dydis turi būti toks pat, kaip {1} {2} ({3} / {4})"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Nauja atostogos taikymas
 ,Batch Item Expiry Status,Serija punktas Galiojimo Būsena
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,bankas projektas
 DocType: Mode of Payment Account,Mode of Payment Account,mokėjimo sąskaitos režimas
 DocType: Consultation,Consultation,Konsultacijos
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Pardavimai ir grąžinimai
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Rodyti Variantai
 DocType: Academic Term,Academic Term,akademinė terminas
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,medžiaga
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sveikatos apsauga
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Delsimas mokėjimo (dienomis)
 DocType: Lab Prescription,Lab Prescription,Lab receptas
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Rūšiuoti pagal kainą
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Paslaugų išlaidų
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijos numeris: {0} jau yra nuorodos į pardavimo sąskaita-faktūra: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,faktūra
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijos numeris: {0} jau yra nuorodos į pardavimo sąskaita-faktūra: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,faktūra
 DocType: Maintenance Schedule Item,Periodicity,periodiškumas
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Finansiniai metai {0} reikalingas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,apsauga
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Eilutės # {0}:
 DocType: Timesheet,Total Costing Amount,Iš viso Sąnaudų suma
 DocType: Delivery Note,Vehicle No,Automobilio Nėra
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Prašome pasirinkti Kainoraštis
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Prašome pasirinkti Kainoraštis
 DocType: Accounts Settings,Currency Exchange Settings,Valiutos keitimo nustatymai
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Eilutės # {0}: mokėjimo dokumentas privalo baigti trasaction
 DocType: Production Order Operation,Work In Progress,Darbas vyksta
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Prašome pasirinkti datą
 DocType: Employee,Holiday List,Atostogų sąrašas
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Nustatykite Instruktorių pavadinimo sistemą mokykloje&gt; Mokyklos nustatymai
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,buhalteris
+DocType: Hub Settings,Selling Price List,Pardavimo kainoraštis
 DocType: Patient,Tobacco Current Use,Tabako vartojimas
 DocType: Cost Center,Stock User,akcijų Vartotojas
 DocType: Company,Phone No,Telefonas Nėra
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Kursų tvarkaraštis sukurta:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Nauja {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Nauja {0}: # {1}
 ,Sales Partners Commission,Pardavimų Partneriai Komisija
 DocType: Purchase Invoice,Rounding Adjustment,Apvalinimo reguliavimas
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Santrumpa negali turėti daugiau nei 5 simboliai
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Tėvų Išsamiau DOCNAME
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Nuoroda: {0}, Prekės kodas: {1} ir klientų: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kilogramas
-DocType: Student Log,Log,Prisijungti
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Atidarymo dėl darbo.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Rezultatų pateikimas
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Rezultatų pateikimas
 DocType: Item Attribute,Increment,prieaugis
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Laiko tarpas
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Pasirinkite sandėlio ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Vedęs
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Neleidžiama {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Gauk elementus iš
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},"Akcijų, negali būti atnaujintas prieš važtaraštyje {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},"Akcijų, negali būti atnaujintas prieš važtaraštyje {0}"
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Prekės {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nėra išvardytus punktus
 DocType: Payment Reconciliation,Reconcile,suderinti
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,pensijų fondai
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Kitas Nusidėvėjimas data negali būti prieš perkant data
 DocType: Consultation,Consultation Date,Konsultacijos data
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Produktų sąrašas ir atradimas ERPNext vartotojams
 DocType: SMS Center,All Sales Person,Visi pardavimo asmuo
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Mėnesio pasiskirstymas ** Jums padės platinti biudžeto / target visoje mėnesius, jei turite sezoniškumą savo verslą."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Nerasta daiktai
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Darbo užmokesčio struktūrą Trūksta
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Nerasta daiktai
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Darbo užmokesčio struktūrą Trūksta
 DocType: Lead,Person Name,"asmens vardas, pavardė"
 DocType: Sales Invoice Item,Sales Invoice Item,Pardavimų sąskaita faktūra punktas
 DocType: Account,Credit,kreditas
 DocType: POS Profile,Write Off Cost Center,Nurašyti išlaidų centrus
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",pvz &quot;pradinė mokykla&quot; arba &quot;Universitetas&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",pvz &quot;pradinė mokykla&quot; arba &quot;Universitetas&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Akcijų ataskaitos
 DocType: Warehouse,Warehouse Detail,Sandėlių detalės
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Kredito limitas buvo kirto klientui {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Kadencijos pabaigos data negali būti vėlesnė nei metų pabaigoje mokslo metų data, iki kurios terminas yra susijęs (akademiniai metai {}). Ištaisykite datas ir bandykite dar kartą."
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Ar Ilgalaikio turto&quot; negali būti nepažymėta, kaip Turto įrašas egzistuoja nuo elemento"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Ar Ilgalaikio turto&quot; negali būti nepažymėta, kaip Turto įrašas egzistuoja nuo elemento"
 DocType: Vehicle Service,Brake Oil,stabdžių Nafta
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klientas&gt; Klientų grupė&gt; Teritorija
 DocType: Tax Rule,Tax Type,mokesčių tipas
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,apmokestinamoji vertė
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Jūs nesate įgaliotas pridėti ar atnaujinti įrašus prieš {0}
 DocType: BOM,Item Image (if not slideshow),Prekė vaizdas (jei ne skaidrių)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Klientų egzistuoja to paties pavadinimo
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Valandą greičiu / 60) * Tikrasis veikimo laikas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Eilutė # {0}: standartinio dokumento tipas turi būti vienas iš išlaidų reikalavimo arba leidimo įrašo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Pasirinkite BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Eilutė # {0}: standartinio dokumento tipas turi būti vienas iš išlaidų reikalavimo arba leidimo įrašo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Pasirinkite BOM
 DocType: SMS Log,SMS Log,SMS Prisijungti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Išlaidos pristatyto objekto
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Atostogų į {0} yra ne tarp Nuo datos ir iki šiol
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,Darbuotojų Paskolos
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Veiklos žurnalas:
 DocType: Fee Schedule,Send Payment Request Email,Siųsti mokėjimo užklausą el. Paštu
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Prekė {0} neegzistuoja sistemoje arba pasibaigęs
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Prekė {0} neegzistuoja sistemoje arba pasibaigęs
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nekilnojamasis turtas
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Sąskaitų ataskaita
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,vaistai
@@ -210,18 +213,23 @@
 DocType: Employee,B-,B
 DocType: Upload Attendance,Import Log,importas Prisijungti
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Ištraukite Material prašymu tipo Gamyba remiantis pirmiau minėtais kriterijais
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Sėkmingai neįregistruota.
 DocType: Training Result Employee,Grade,klasė
+DocType: Restaurant Table,No of Seats,Sėdimų vietų skaičius
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Norėdami pridėti dinaminį temą, naudokite jinja žymes kaip <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Paskelbta tiekėjo
 DocType: SMS Center,All Contact,visi Susisiekite
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Gamybos Užsakyti jau sukurtas visų daiktų su BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Gamybos Užsakyti jau sukurtas visų daiktų su BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Metinis atlyginimas
 DocType: Daily Work Summary,Daily Work Summary,Dienos darbo santrauka
 DocType: Period Closing Voucher,Closing Fiscal Year,Uždarius finansinius metus
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} yra sušaldyti
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Prašome pasirinkti veikiančią bendrovę kurti sąskaitų planą
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} yra sušaldyti
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Prašome pasirinkti veikiančią bendrovę kurti sąskaitų planą
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Akcijų išlaidos
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Pasirinkite Target sandėlis
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Pasirinkite Target sandėlis
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Pasirinkite Target sandėlis
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Pasirinkite Target sandėlis
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Prašome įvesti Pageidautina kontaktinį elektroninio pašto adresą
 DocType: Program Enrollment,School Bus,Mokyklinis autobusas
 DocType: Journal Entry,Contra Entry,contra įrašas
@@ -238,9 +246,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Atsisiųskite šabloną, užpildykite reikiamus duomenis ir pridėti naują failą. Visos datos ir darbuotojas kombinacija Pasirinkto laikotarpio ateis šabloną, su esamais lankomumo įrašų"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,"Prekė {0} nėra aktyvus, ar buvo pasiektas gyvenimo pabaigos"
+DocType: Student Admission Program,Minimum Age,Minimalus amžius
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Pavyzdys: Elementarioji matematika
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Įtraukti mokestį iš eilės {0} prekės norma, mokesčiai eilučių {1}, taip pat turi būti įtraukti"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Nustatymai HR modulio
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Nustatymai HR modulio
 DocType: SMS Center,SMS Center,SMS centro
 DocType: Sales Invoice,Change Amount,Pakeisti suma
 DocType: BOM Update Tool,New BOM,nauja BOM
@@ -250,7 +259,7 @@
 DocType: Lead,Request Type,prašymas tipas
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Padaryti Darbuotojas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,transliavimas
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Pridėti kambarius
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),POS nustatymas (internetu / neprisijungus)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,vykdymas
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Išsami informacija apie atliktas operacijas.
 DocType: Serial No,Maintenance Status,techninės priežiūros būseną
@@ -273,6 +282,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Kainų sąrašas turi būti taikoma perkant ar parduodant
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Montavimo data gali būti ne anksčiau pristatymo datos punkte {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Nuolaida Kainų sąrašas tarifas (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Biochemija
 DocType: Offer Letter,Select Terms and Conditions,Pasirinkite Terminai ir sąlygos
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,iš Vertė
 DocType: Production Planning Tool,Sales Orders,pardavimų užsakymai
@@ -307,15 +317,15 @@
 DocType: Sales Partner,Reseller,perpardavinėjimo
 DocType: Codification Table,Medical Code,Medicinos kodeksas
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Jei pažymėta, apims ne atsargos medžiagoje prašymus."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Prašome įvesti Įmonės
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Prašome įvesti Įmonės
 DocType: Delivery Note Item,Against Sales Invoice Item,Prieš Pardavimų sąskaitos punktas
 ,Production Orders in Progress,Gamybos užsakymai Progress
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Grynieji pinigų srautai iš finansavimo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage &quot;yra pilna, neišsaugojo"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage &quot;yra pilna, neišsaugojo"
 DocType: Lead,Address & Contact,Adresas ir kontaktai
 DocType: Leave Allocation,Add unused leaves from previous allocations,Pridėti nepanaudotas lapus iš ankstesnių paskirstymų
 DocType: Sales Partner,Partner website,partnerio svetainė
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Pridėti Prekę
+DocType: Restaurant Order Entry,Add Item,Pridėti Prekę
 DocType: Lab Test,Custom Result,Tinkintas rezultatas
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Kontaktinis vardas
 DocType: Course Assessment Criteria,Course Assessment Criteria,Žinoma vertinimo kriterijai
@@ -328,7 +338,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Užsisakyti įsigyti.
 DocType: Lab Test,Submitted Date,Pateiktas data
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,"Tai grindžiama darbo laiko apskaitos žiniaraščiai, sukurtų prieš šį projektą"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Neto darbo užmokestis negali būti mažesnis už 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Neto darbo užmokestis negali būti mažesnis už 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Norėdami sustabdyti pakartotinių klaidų pranešimų siuntimą iš sistemos, prenumeruojame lauką &quot;Išjungta&quot;"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Tik pasirinktas atostogos Tvirtintojas gali pateikti šias atostogas taikymas
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Malšinančių data turi būti didesnis nei įstoti data
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Lapai per metus
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,Pelnas ir nuostoliai
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,litrų
 DocType: Task,Total Costing Amount (via Time Sheet),Iš viso Sąnaudų suma (per Time lapas)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Nustatykite studentus pagal studentų grupes
 DocType: Item Website Specification,Item Website Specification,Prekė svetainė Specifikacija
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Palikite Užblokuoti
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Prekė {0} pasiekė savo gyvenimo pabaigos apie {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Prekė {0} pasiekė savo gyvenimo pabaigos apie {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Banko įrašai
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,metinis
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Akcijų Susitaikymas punktas
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Studentų grupė kūrimo įrankis kursai
 DocType: Lead,Do Not Contact,Nėra jokio tikslo susisiekti
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,"Žmonės, kurie mokyti savo organizaciją"
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Unikalus ID sekimo visas pasikartojančias sąskaitas faktūras. Jis generuoja pateikti.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Programinės įrangos kūrėjas
 DocType: Item,Minimum Order Qty,Mažiausias užsakymo Kiekis
 DocType: Pricing Rule,Supplier Type,tiekėjas tipas
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,Skelbia Hub
 DocType: Student Admission,Student Admission,Studentų Priėmimas
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Prekė {0} atšaukiamas
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,medžiaga Prašymas
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Prekė {0} atšaukiamas
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,medžiaga Prašymas
 DocType: Bank Reconciliation,Update Clearance Date,Atnaujinti Sąskaitų data
 DocType: Item,Purchase Details,pirkimo informacija
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Prekė {0} nerastas &quot;In žaliavos&quot; stalo Užsakymo {1}
 DocType: Patient Relation,Relation,santykis
 DocType: Shipping Rule,Worldwide Shipping,pasaulyje Pristatymas
 DocType: Patient Relation,Mother,Motina
+DocType: Restaurant Reservation,Reservation End Time,Rezervacijos pabaiga
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Patvirtinti užsakymus iš klientų.
 DocType: Purchase Receipt Item,Rejected Quantity,atmesta Kiekis
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Mokesčio užklausa {0} sukurta
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Mokesčio užklausa {0} sukurta
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Žemas jautrumas
 DocType: Notification Control,Notification Control,pranešimas Valdymo
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,"Patvirtinkite, kai baigsite savo mokymą"
 DocType: Lead,Suggestions,Pasiūlymai
@@ -388,7 +401,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Parašyta darbo užmokestį į darbuotojo remiantis pageidaujamą paštu pasirinkto darbuotojo
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Pirmasis atostogos Tvirtintojas sąraše bus nustatytas kaip numatytasis Palikite jį patvirtinusio
 DocType: Tax Rule,Shipping County,Pristatymas apskritis
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Mokytis
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Mokytis
 DocType: Asset,Next Depreciation Date,Kitas Nusidėvėjimas data
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Veiklos sąnaudos vienam darbuotojui
 DocType: Accounts Settings,Settings for Accounts,Nustatymai sąskaitų
@@ -399,13 +412,13 @@
 DocType: Item,Synced With Hub,Sinchronizuojami su Hub
 DocType: Vehicle,Fleet Manager,laivyno direktorius
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Eilutė # {0}: {1} negali būti neigiamas už prekę {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Neteisingas slaptažodis
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Neteisingas slaptažodis
 DocType: Item,Variant Of,variantas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Užbaigtas Kiekis negali būti didesnis nei &quot;Kiekis iki Gamyba&quot;
 DocType: Period Closing Voucher,Closing Account Head,Uždarymo sąskaita vadovas
 DocType: Employee,External Work History,Išorinis darbo istoriją
 DocType: Physician,Time per Appointment,Paskyrimo laikas
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Ciklinę nuorodą Klaida
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Ciklinę nuorodą Klaida
 DocType: Appointment Type,Is Inpatient,Yra stacionarus
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 Vardas
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Žodžiais (eksportas) bus matomas, kai jūs išgelbėti važtaraštyje."
@@ -414,19 +427,18 @@
 DocType: Lead,Industry,Industrija
 DocType: Employee,Job Profile,darbo profilis
 DocType: BOM Item,Rate & Amount,Įvertinti ir sumą
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Nustatykite numeriravimo serijas lankytojams per sąranką&gt; numeravimo serija
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Tai grindžiama sandoriais prieš šią bendrovę. Žiūrėkite žemiau pateiktą laiko juostą
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Praneškite elektroniniu paštu steigti automatinio Medžiaga Užsisakyti
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Atsparus
 DocType: Journal Entry,Multi Currency,Daugiafunkciniai Valiuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Sąskaitos faktūros tipas
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klientas&gt; Klientų grupė&gt; Teritorija
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Važtaraštis
 DocType: Consultation,Encounter Impression,Susiduria su įspūdžiais
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Įsteigti Mokesčiai
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Kaina Parduota turto
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,"Mokėjimo Įrašas buvo pakeistas po to, kai ištraukė ją. Prašome traukti jį dar kartą."
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} įvestas du kartus Prekės mokesčio
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Santrauka šią savaitę ir laukiant veikla
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} įvestas du kartus Prekės mokesčio
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Santrauka šią savaitę ir laukiant veikla
 DocType: Student Applicant,Admitted,pripažino
 DocType: Workstation,Rent Cost,nuomos kaina
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Suma po nusidėvėjimo
@@ -441,36 +453,35 @@
 DocType: Shipping Rule,Valid for Countries,Galioja šalių
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Šis punktas yra šablonų ir negali būti naudojamas sandoriams. Elemento atributai bus nukopijuoti į variantai nebent &quot;Ne Kopijuoti&quot; yra nustatytas
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Viso Užsakyti Laikomas
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Darbuotojų žymėjimas (pvz Vadovas, direktorius ir tt)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Darbuotojų žymėjimas (pvz Vadovas, direktorius ir tt)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Norma, pagal kurią Klientas valiuta konvertuojama į kliento bazine valiuta"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Žinoma planavimas įrankių
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Eilutės # {0}: Pirkimo sąskaita faktūra negali būti pareikštas esamo turto {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Skubi] Klaida kuriant pasikartojančius% s% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Skubi] Klaida kuriant pasikartojančius% s% s
 DocType: Item Tax,Tax Rate,Mokesčio tarifas
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} jau skirta darbuotojo {1} laikotarpiui {2} į {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Pasirinkite punktas
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Pasirinkite punktas
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Pirkimo sąskaita faktūra {0} jau pateiktas
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"Eilutės # {0}: Serijos Nr turi būti toks pat, kaip {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Konvertuoti į ne grupės
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Serija (daug) elemento.
 DocType: C-Form Invoice Detail,Invoice Date,Sąskaitos data
 DocType: GL Entry,Debit Amount,debeto suma
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Gali būti tik 1 sąskaita už Bendrovės {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Žiūrėkite priedą
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Gali būti tik 1 sąskaita už Bendrovės {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Žiūrėkite priedą
 DocType: Purchase Order,% Received,% vartojo
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Sukurti studentų grupių
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Sąranka jau baigti !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Sąranka jau baigti !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Kredito Pastaba suma
 DocType: Setup Progress Action,Action Document,Veiksmų dokumentas
 ,Finished Goods,gatavų prekių
 DocType: Delivery Note,Instructions,instrukcijos
 DocType: Quality Inspection,Inspected By,tikrina
 DocType: Maintenance Visit,Maintenance Type,priežiūra tipas
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} nėra įtraukti į objekto {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Prekės kodas&gt; Prekės grupė&gt; Gamintojas
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} nėra įtraukti į objekto {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serijos Nr {0} nepriklauso važtaraštyje {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Pridėti prekę
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Pridėti prekę
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Prekė kokybės inspekcija Parametras
 DocType: Leave Application,Leave Approver Name,Palikite jį patvirtinusio pavadinimas
 DocType: Depreciation Schedule,Schedule Date,Tvarkaraštis data
@@ -492,7 +503,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Darbo valandos
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Pakeisti pradinį / trumpalaikiai eilės numerį esamo serijos.
 DocType: Dosage Strength,Strength,Jėga
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Sukurti naują klientų
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Sukurti naują klientų
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Jei ir toliau vyrauja daug kainodaros taisyklės, vartotojai, prašoma, kad prioritetas rankiniu būdu išspręsti konfliktą."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Sukurti Pirkimų užsakymus
 ,Purchase Register,pirkimo Registruotis
@@ -511,7 +522,7 @@
 DocType: Lab Test Template,Single,vienas
 DocType: Salary Slip,Total Loan Repayment,Viso paskolų grąžinimas
 DocType: Account,Cost of Goods Sold,Parduotų prekių kaina
-DocType: Purchase Invoice,Yearly,kasmet
+DocType: Subscription,Yearly,kasmet
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Prašome įvesti sąnaudų centro
 DocType: Drug Prescription,Dosage,Dozavimas
 DocType: Journal Entry Account,Sales Order,Pardavimo užsakymas
@@ -542,7 +553,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Global nustatymai visus gamybos procesus.
 DocType: Accounts Settings,Accounts Frozen Upto,Sąskaitos Šaldyti upto
 DocType: SMS Log,Sent On,išsiųstas
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Įgūdis {0} pasirinktas kelis kartus požymiai lentelėje
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Įgūdis {0} pasirinktas kelis kartus požymiai lentelėje
 DocType: HR Settings,Employee record is created using selected field. ,Darbuotojų įrašas sukurtas naudojant pasirinktą lauką.
 DocType: Sales Order,Not Applicable,Netaikoma
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Atostogų meistras.
@@ -568,13 +579,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,skiriamos viso lapai yra privalomi
 DocType: Patient,AB Positive,AB teigiamas
 DocType: Job Opening,Description of a Job Opening,Aprašymas apie Darbo skelbimai
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Kol veikla šiandien
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Kol veikla šiandien
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Lankomumas įrašas.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Pajamos komponentas žiniaraštis pagrįstą darbo užmokesčio.
 DocType: Sales Order Item,Used for Production Plan,Naudojamas gamybos planas
 DocType: Employee Loan,Total Payment,bendras Apmokėjimas
 DocType: Manufacturing Settings,Time Between Operations (in mins),Laikas tarp operacijų (minutėmis)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} yra atšaukta ir todėl veiksmai negali būti užbaigtas
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} yra atšaukta ir todėl veiksmai negali būti užbaigtas
 DocType: Customer,Buyer of Goods and Services.,Pirkėjas prekes ir paslaugas.
 DocType: Journal Entry,Accounts Payable,MOKĖTINOS SUMOS
 DocType: Patient,Allergies,Alergijos
@@ -586,23 +597,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Įspėti pirkimo užsakymus
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Sąrašas keletą savo klientams. Jie gali būti organizacijos ar asmenys.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Pakankamai Dalys sukurti
+DocType: POS Profile User,POS Profile User,POS vartotojo profilis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,tiesioginių pajamų
 DocType: Patient Appointment,Date TIme,Data TIme
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Negali filtruoti pagal sąskaitą, jei sugrupuoti pagal sąskaitą"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,administracijos pareigūnas
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Prašome pasirinkti kursai
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Prašome pasirinkti kursai
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Prašome pasirinkti kursai
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Prašome pasirinkti kursai
 DocType: Codification Table,Codification Table,Kodifikavimo lentelė
 DocType: Timesheet Detail,Hrs,h
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Prašome pasirinkti kompaniją
 DocType: Stock Entry Detail,Difference Account,skirtumas paskyra
 DocType: Purchase Invoice,Supplier GSTIN,tiekėjas GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Ar nėra artimas užduotis, nes jos priklauso nuo užduoties {0} nėra uždarytas."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,"Prašome įvesti sandėlis, kuris bus iškeltas Medžiaga Prašymas"
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Ar nėra artimas užduotis, nes jos priklauso nuo užduoties {0} nėra uždarytas."
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Prašome įvesti sandėlis, kuris bus iškeltas Medžiaga Prašymas"
 DocType: Production Order,Additional Operating Cost,Papildoma eksploatavimo išlaidos
 DocType: Lab Test Template,Lab Routine,&quot;Lab Routine&quot;
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Sujungti, šie savybės turi būti tokios pačios tiek daiktų"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Sujungti, šie savybės turi būti tokios pačios tiek daiktų"
 DocType: Shipping Rule,Net Weight,Grynas svoris
 DocType: Employee,Emergency Phone,avarinis telefonas
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,nupirkti
@@ -613,7 +625,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Prašome apibrėžti kokybės už slenksčio 0%
 DocType: Sales Order,To Deliver,Pristatyti
 DocType: Purchase Invoice Item,Item,punktas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Serijos Nr punktas negali būti frakcija
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Didelis jautrumas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Serijos Nr punktas negali būti frakcija
 DocType: Journal Entry,Difference (Dr - Cr),Skirtumas (dr - Cr)
 DocType: Account,Profit and Loss,Pelnas ir nuostoliai
 DocType: Patient,Risk Factors,Rizikos veiksniai
@@ -622,7 +635,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,valdymas Subranga
 DocType: Vital Signs,Body Temperature,Kūno temperatūra
 DocType: Project,Project will be accessible on the website to these users,Projektas bus prieinama tinklalapyje šių vartotojų
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Nurodykite projekto tipą.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Nurodykite projekto tipą.
 DocType: Supplier Scorecard,Weighting Function,Svorio funkcija
 DocType: Physician,OP Consulting Charge,&quot;OP Consulting&quot; mokestis
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Nustatykite savo
@@ -636,7 +649,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,"Prieaugis negali būti 0,"
 DocType: Production Planning Tool,Material Requirement,medžiagų poreikis
 DocType: Company,Delete Company Transactions,Ištrinti bendrovės verslo sandoriai
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Nuorodos Nr ir nuoroda data yra privalomas banko sandorio
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Nuorodos Nr ir nuoroda data yra privalomas banko sandorio
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Įdėti / Redaguoti mokesčių ir rinkliavų
 DocType: Payment Entry Reference,Supplier Invoice No,Tiekėjas sąskaitoje Nr
 DocType: Territory,For reference,prašymą priimti prejudicinį sprendimą
@@ -644,12 +657,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Negalite trinti Serijos Nr {0}, kaip ji yra naudojama akcijų sandorių"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Uždarymo (CR)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Sveiki
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Perkelti punktas
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Perkelti punktas
 DocType: Serial No,Warranty Period (Days),Garantinis laikotarpis (dienomis)
 DocType: Installation Note Item,Installation Note Item,Įrengimas Pastaba Prekė
 DocType: Production Plan Item,Pending Qty,Kol Kiekis
 DocType: Budget,Ignore,ignoruoti
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} is not active
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} is not active
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Sąranka patikrinti matmenys spausdinti
 DocType: Salary Slip,Salary Slip Timesheet,Pajamos Kuponas Lapą
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Tiekėjas tiekiantis sandėlis privalomas SUBRANGOVAMS pirkimo kvito
@@ -658,7 +671,7 @@
 DocType: Pricing Rule,Sales Partner,Partneriai pardavimo
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Visi tiekėjų rezultatų kortelės.
 DocType: Buying Settings,Purchase Receipt Required,Pirkimo kvito Reikalinga
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Vertinimo rodiklis yra privalomas, jei atidarymas sandėlyje įvesta"
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,"Vertinimo rodiklis yra privalomas, jei atidarymas sandėlyje įvesta"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,rasti sąskaitos faktūros lentelės Nėra įrašų
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Prašome pasirinkti bendrovė ir šalies tipo pirmas
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Finansų / apskaitos metus.
@@ -695,7 +708,7 @@
 DocType: Quotation,Quotation To,citatos
 DocType: Lead,Middle Income,vidutines pajamas
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Anga (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Numatytasis Matavimo vienetas už prekę {0} negali būti pakeistas tiesiogiai, nes jūs jau padarė tam tikrą sandorį (-ius) su kitu UOM. Jums reikės sukurti naują elementą naudoti kitą numatytąjį UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Numatytasis Matavimo vienetas už prekę {0} negali būti pakeistas tiesiogiai, nes jūs jau padarė tam tikrą sandorį (-ius) su kitu UOM. Jums reikės sukurti naują elementą naudoti kitą numatytąjį UOM."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Paskirti suma negali būti neigiama
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Prašome nurodyti Bendrovei
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Prašome nurodyti Bendrovei
@@ -710,6 +723,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,"Pasirinkite mokėjimo sąskaitos, kad bankų įėjimo"
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Sukurti darbuotojams įrašus valdyti lapai, išlaidų paraiškos ir darbo užmokesčio"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Išrašymo laikotarpis
+DocType: Restaurant Reservation,Restaurant Reservation,Restorano rezervavimas
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Pasiūlymas rašymas
 DocType: Payment Entry Deduction,Payment Entry Deduction,Mokėjimo Įėjimo išskaičiavimas
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Kitas pardavimų asmuo {0} egzistuoja su tuo pačiu Darbuotojo ID
@@ -717,7 +731,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Kandidatas
 DocType: Assessment Plan,Maximum Assessment Score,Maksimalus vertinimo balas
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Atnaujinti banko sandorio dieną
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,laikas stebėjimas
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,laikas stebėjimas
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,Dublikatą TRANSPORTER
 DocType: Fiscal Year Company,Fiscal Year Company,Finansiniai metai Įmonės
 DocType: Packing Slip Item,DN Detail,DN detalės
@@ -726,8 +740,9 @@
 DocType: Batch,Batch Description,Serija Aprašymas
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Studentų grupės kūrimas
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Studentų grupės kūrimas
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Mokėjimo šliuzai paskyra nebuvo sukurta, prašome sukurti rankiniu būdu."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Mokėjimo šliuzai paskyra nebuvo sukurta, prašome sukurti rankiniu būdu."
 DocType: Supplier Scorecard,Per Year,Per metus
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Negalima dalyvauti šioje programoje pagal DOB
 DocType: Sales Invoice,Sales Taxes and Charges,Pardavimų Mokesčiai ir rinkliavos
 DocType: Employee,Organization Profile,organizacijos profilį
 DocType: Vital Signs,Height (In Meter),Aukštis (matuoklyje)
@@ -763,7 +778,7 @@
 DocType: Student Batch Name,Batch Name,Serija Vardas
 DocType: Fee Validity,Max number of visit,Maksimalus apsilankymo skaičius
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Lapą sukurta:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Prašome nustatyti numatytąją grynaisiais ar banko sąskaitą mokėjimo būdas {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Prašome nustatyti numatytąją grynaisiais ar banko sąskaitą mokėjimo būdas {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,įrašyti
 DocType: GST Settings,GST Settings,GST Nustatymai
 DocType: Selling Settings,Customer Naming By,Klientų įvardijimas Iki
@@ -795,16 +810,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Įvežtinė kaina Mokesčiai ir rinkliavos
 DocType: Production Order Operation,Actual Start Time,Tikrasis Pradžios laikas
 DocType: BOM Operation,Operation Time,veikimo laikas
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Baigti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Baigti
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Bazė
 DocType: Timesheet,Total Billed Hours,Iš viso Apmokestintos valandos
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Nurašyti suma
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Nurašyti suma
 DocType: Leave Block List Allow,Allow User,leidžia vartotojui
 DocType: Journal Entry,Bill No,Billas Nėra
 DocType: Company,Gain/Loss Account on Asset Disposal,Pelnas / nuostolis paskyra nuo turto perdavimo
 DocType: Vehicle Log,Service Details,paslaugų detalės
 DocType: Vehicle Log,Service Details,paslaugų detalės
-DocType: Purchase Invoice,Quarterly,kas ketvirtį
+DocType: Subscription,Quarterly,kas ketvirtį
 DocType: Lab Test Template,Grouped,Grupuojami
 DocType: Selling Settings,Delivery Note Required,Reikalinga Važtaraštis
 DocType: Bank Guarantee,Bank Guarantee Number,Banko garantija Taškų
@@ -814,12 +829,12 @@
 DocType: Student Attendance,Student Attendance,Studentų dalyvavimas
 DocType: Sales Invoice Timesheet,Time Sheet,laikas lapas
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Žaliavos remiantis
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Prašome įvesti Išsamesnė informacija
 DocType: Interest,Interest,palūkanos
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre Pardavimai
 DocType: Purchase Receipt,Other Details,Kitos detalės
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Lab Test,Test Template,Bandymo šablonas
+DocType: Restaurant Order Entry Item,Served,Pateikta
 DocType: Account,Accounts,sąskaitos
 DocType: Vehicle,Odometer Value (Last),Odometras Vertė (Paskutinis)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Tiekimo rezultatų vertinimo kriterijų šablonai.
@@ -831,26 +846,28 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Peržiūrėti darbo užmokestį
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Sąskaita {0} buvo įrašytas kelis kartus
 DocType: Account,Expenses Included In Valuation,"Sąnaudų, įtrauktų Vertinimo"
-DocType: Hub Settings,Seller City,Pardavėjo Miestas
 ,Absent Student Report,Nėra studento ataskaitos
 DocType: Email Digest,Next email will be sent on:,Kitas laiškas bus išsiųstas į:
 DocType: Offer Letter Term,Offer Letter Term,Laiško su pasiūlymu terminas
 DocType: Supplier Scorecard,Per Week,Per savaitę
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Prekė turi variantus.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Prekė turi variantus.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Viso studento
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Prekė {0} nerastas
 DocType: Bin,Stock Value,vertybinių popierių kaina
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,Mokesčių įrašai bus sukurti fone. Bet kokios klaidos atveju klaidos pranešimas bus atnaujintas Tvarkaraštyje.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Įmonės {0} neegzistuoja
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} mokestis galioja iki {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} mokestis galioja iki {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,medis tipas
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Kiekis Suvartoti Vieneto
 DocType: Serial No,Warranty Expiry Date,Garantija Galiojimo data
 DocType: Material Request Item,Quantity and Warehouse,Kiekis ir sandėliavimo
+DocType: Hub Settings,Unregister,Atsisakyti registracijos
 DocType: Sales Invoice,Commission Rate (%),Komisija tarifas (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Prašome pasirinkti programą
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Prašome pasirinkti programą
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Prašome pasirinkti programą
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Prašome pasirinkti programą
 DocType: Project,Estimated Cost,Numatoma kaina
 DocType: Purchase Order,Link to material requests,Nuoroda į materialinių prašymus
+DocType: Hub Settings,Publish,Paskelbti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aviacija
 DocType: Journal Entry,Credit Card Entry,Kreditinė kortelė įrašas
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Įmonė ir sąskaitos
@@ -861,13 +878,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Uždaryti progą dienų
 ,Reserved,rezervuotas
 DocType: Purchase Order,Supply Raw Materials,Tiekimo Žaliavos
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Data, kada bus sukurtas sekančią sąskaitą faktūrą. Jis generuoja pateikti."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Turimas turtas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} nėra sandėlyje punktas
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',"Prašome pasidalinti savo atsiliepimais su mokymu spustelėdami &quot;Mokymo atsiliepimai&quot;, tada &quot;Naujas&quot;"
 DocType: Mode of Payment Account,Default Account,numatytoji paskyra
 DocType: Payment Entry,Received Amount (Company Currency),Gautos sumos (Įmonės valiuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,"Švinas turi būti nustatyti, jei galimybės yra pagamintas iš švino"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,"Švinas turi būti nustatyti, jei galimybės yra pagamintas iš švino"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Prašome pasirinkti savaitę nuo dieną
 DocType: Patient,O Negative,O neigiamas
 DocType: Production Order Operation,Planned End Time,Planuojamas Pabaigos laikas
@@ -883,10 +899,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,energija
 DocType: Opportunity,Opportunity From,galimybė Nuo
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mėnesinis darbo užmokestis pareiškimas.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Pridėti įmonę
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Eilutė {0}: {1} {2} elementui reikalingi eilės numeriai. Jūs pateikė {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Eilutė {0}: {1} {2} elementui reikalingi eilės numeriai. Jūs pateikė {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Pasirinkite lentelę
 DocType: BOM,Website Specifications,Interneto svetainė duomenys
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} yra netinkamas el. Pašto adresas &quot;gavėjams&quot;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} yra netinkamas el. Pašto adresas &quot;gavėjams&quot;
 DocType: Special Test Items,Particulars,Duomenys
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiotikas.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Nuo {0} tipo {1}
@@ -894,11 +910,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Eilutės {0}: konversijos faktorius yra privalomas
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Keli Kaina Taisyklės egzistuoja tais pačiais kriterijais, prašome išspręsti konfliktą suteikti pirmenybę. Kaina Taisyklės: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,Negalima išjungti arba atšaukti BOM kaip ji yra susijusi su kitais BOMs
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,Negalima išjungti arba atšaukti BOM kaip ji yra susijusi su kitais BOMs
 DocType: Opportunity,Maintenance,priežiūra
 DocType: Item Attribute Value,Item Attribute Value,Prekė Pavadinimas Reikšmė
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Pardavimų kampanijas.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Padaryti žiniaraštis
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Padaryti žiniaraštis
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -936,12 +952,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Prašome įvesti Elementą pirmas
 DocType: Account,Liability,atsakomybė
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcijos suma negali būti didesnė nei ieškinio suma eilutėje {0}.
+DocType: Salary Detail,Do not include in total,Neįtraukite iš viso
 DocType: Company,Default Cost of Goods Sold Account,Numatytasis išlaidos parduotų prekių sąskaita
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Kainų sąrašas nepasirinkote
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Kainų sąrašas nepasirinkote
 DocType: Employee,Family Background,šeimos faktai
 DocType: Request for Quotation Supplier,Send Email,Siųsti laišką
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Įspėjimas: Neteisingas Priedas {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Nėra leidimo
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Įspėjimas: Neteisingas Priedas {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Nėra leidimo
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Citata prašoma
 DocType: Vital Signs,Heart Rate / Pulse,Širdies ritmas / impulsas
 DocType: Company,Default Bank Account,Numatytasis banko sąskaitos
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Filtruoti remiantis partijos, pasirinkite Šalis Įveskite pirmą"
@@ -969,12 +987,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Prekė eilutė {IDX}: {DOCTYPE} {DOCNAME} neegzistuoja viršaus &quot;{DOCTYPE}&quot; stalo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Lapą {0} jau baigė arba atšaukti
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,nėra užduotys
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Mėnesio diena, kurią bus sukurta pvz 05, 28 ir tt automatinis sąskaitos faktūros"
 DocType: Item Variant Settings,Copy Fields to Variant,Kopijuoti laukus į variantą
 DocType: Asset,Opening Accumulated Depreciation,Atidarymo sukauptas nusidėvėjimas
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Rezultatas turi būti mažesnis arba lygus 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Programos Įrašas įrankis
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,"įrašų, C-forma"
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,"įrašų, C-forma"
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Klientų ir tiekėjas
 DocType: Email Digest,Email Digest Settings,Siųsti Digest Nustatymai
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Dėkoju Jums už bendradarbiavimą!
@@ -992,13 +1009,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Citata statusas
 DocType: Maintenance Visit,Completion Status,užbaigimo būsena
 DocType: HR Settings,Enter retirement age in years,Įveskite pensinį amžių metais
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Tikslinė sandėlis
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Prašome pasirinkti sandėlį
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Tikslinė sandėlis
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Prašome pasirinkti sandėlį
 DocType: Cheque Print Template,Starting location from left edge,Nuo vietą iš kairiojo krašto
 DocType: Item,Allow over delivery or receipt upto this percent,Leisti per pristatymą ar gavimo net iki šio proc
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,importas Lankomumas
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Visi punktas Grupės
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Visi punktas Grupės
 DocType: Process Payroll,Activity Log,veiklos žurnalas
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Grynasis pelnas / nuostolis
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatiškai kurti pranešimą pateikus sandorius.
@@ -1010,7 +1027,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,"prognozuojama, Kiekis"
 DocType: Sales Invoice,Payment Due Date,Sumokėti iki
 DocType: Drug Prescription,Interval UOM,Intervalas UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Prekė variantas {0} jau egzistuoja su tais pačiais atributais
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Prekė variantas {0} jau egzistuoja su tais pačiais atributais
+DocType: Item,Hub Publishing Details,Hub Publishing duomenys
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&quot;Atidarymas&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Atidarykite daryti
 DocType: Notification Control,Delivery Note Message,Važtaraštis pranešimas
@@ -1030,10 +1048,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: žaliava negali būti tokia pati kaip pagrindinis elementas
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Iš viso taikomi mokesčiai į pirkimo kvito sumų lentelė turi būti tokios pačios kaip viso mokesčių ir rinkliavų
 DocType: Sales Team,Incentives,paskatos
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Užsiregistruokite Hub
 DocType: SMS Log,Requested Numbers,Pageidaujami numeriai
 DocType: Production Planning Tool,Only Obtain Raw Materials,Gauti tik žaliavų panaudojimas
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Veiklos vertinimas.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Įjungus &quot;Naudokite krepšelį&quot;, kaip Krepšelis yra įjungtas ir ten turėtų būti bent viena Mokesčių taisyklė krepšelį"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Įjungus &quot;Naudokite krepšelį&quot;, kaip Krepšelis yra įjungtas ir ten turėtų būti bent viena Mokesčių taisyklė krepšelį"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Mokėjimo Įėjimo {0} yra susijęs su ordino {1}, patikrinti, ar jis turi būti traukiamas kaip anksto šioje sąskaitoje faktūroje."
 DocType: Sales Invoice Item,Stock Details,akcijų detalės
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,projekto vertė
@@ -1052,12 +1071,14 @@
 DocType: Salary Slip,Working Days,Darbo dienos
 DocType: Serial No,Incoming Rate,Priimamojo Balsuok
 DocType: Packing Slip,Gross Weight,Bendras svoris
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,"Jūsų įmonės pavadinimas, dėl kurių jūs nustatote šią sistemą."
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Įgalinti koncentratorių
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,"Jūsų įmonės pavadinimas, dėl kurių jūs nustatote šią sistemą."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Įtraukti atostogas iš viso ne. darbo dienų
 DocType: Job Applicant,Hold,laikyti
 DocType: Employee,Date of Joining,Data Prisijungimas
 DocType: Naming Series,Update Series,Atnaujinti serija
 DocType: Supplier Quotation,Is Subcontracted,subrangos sutartis
+DocType: Restaurant Table,Minimum Seating,Minimali sėdimoji vietovė
 DocType: Item Attribute,Item Attribute Values,Prekė atributų reikšmes
 DocType: Examination Result,Examination Result,tyrimo rezultatas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,pirkimo kvito
@@ -1068,13 +1089,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Nepavyko rasti laiko tarpsnių per ateinančius {0} dienų darbui {1}
 DocType: Production Order,Plan material for sub-assemblies,Planas medžiaga mazgams
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Pardavimų Partneriai ir teritorija
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} turi būti aktyvus
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} turi būti aktyvus
 DocType: Journal Entry,Depreciation Entry,Nusidėvėjimas įrašas
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Prašome pasirinkti dokumento tipą pirmas
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Atšaukti Medžiaga Apsilankymai {0} prieš atšaukiant šią Priežiūros vizitas
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serijos Nr {0} nepriklauso punkte {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Reikalinga Kiekis
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Sandėliai su esamais sandoris negali būti konvertuojamos į knygą.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Sandėliai su esamais sandoris negali būti konvertuojamos į knygą.
 DocType: Bank Reconciliation,Total Amount,Visas kiekis
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Interneto leidyba
 DocType: Prescription Duration,Number,Numeris
@@ -1085,7 +1106,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Pardavimų Kainų sąrašas
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Jei pažymėsite, klientas bus sukurtas, priskirtas pacientui. Paciento sąskaita bus sukurta prieš šį Klientą. Kuriant pacientą galite pasirinkti esamą klientą."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publikuokite sinchronizuoti daiktų
 DocType: Bank Reconciliation,Account Currency,sąskaita Valiuta
 DocType: Lab Test,Sample ID,Pavyzdžio ID
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Paminėkite suapvalinti Narystė Bendrovėje
@@ -1094,11 +1114,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Darbuotojų {0} is not active arba neegzistuoja
 DocType: Fee Structure,Components,komponentai
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Prašome įvesti Turto kategorija prekės {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Prekė Variantai {0} atnaujinama
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Prekė Variantai {0} atnaujinama
 DocType: Quality Inspection Reading,Reading 6,Skaitymas 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Negaliu {0} {1} {2} be jokio neigiamo išskirtinis sąskaita
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","turi būti sukurta. Jei vėluojama, turėsite rankiniu būdu pakeisti lauko &quot;Kartoti mėnesio dieną&quot; lauką"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Negaliu {0} {1} {2} be jokio neigiamo išskirtinis sąskaita
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Pirkimo faktūros Advance
-DocType: Hub Settings,Sync Now,Sinchronizuoti dabar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Eilutės {0}: Kredito įrašas negali būti susieta su {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Nustatykite biudžetą per finansinius metus.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Numatytasis Bankas / Pinigų sąskaita bus automatiškai atnaujinta POS sąskaita faktūra, kai pasirinktas šis būdas."
@@ -1110,13 +1131,13 @@
 DocType: Item,Is Purchase Item,Ar pirkimas Prekės
 DocType: Asset,Purchase Invoice,pirkimo sąskaita faktūra
 DocType: Stock Ledger Entry,Voucher Detail No,Bon Išsamiau Nėra
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Nauja pardavimo sąskaita-faktūra
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Nauja pardavimo sąskaita-faktūra
 DocType: Stock Entry,Total Outgoing Value,Iš viso Siuntimo kaina
 DocType: Physician,Appointments,Paskyrimai
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Atidarymo data ir galutinis terminas turėtų būti per patį finansiniams metams
 DocType: Lead,Request for Information,Paprašyti informacijos
 ,LeaderBoard,Lyderių
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Sinchronizuoti Atsijungęs Sąskaitos
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Sinchronizuoti Atsijungęs Sąskaitos
 DocType: Payment Request,Paid,Mokama
 DocType: Program Fee,Program Fee,programos mokestis
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1135,11 +1156,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Pirkimui užsakyti Elementą
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,netiesioginė pajamos
 DocType: Student Attendance Tool,Student Attendance Tool,Studentų dalyvavimas įrankis
+DocType: Restaurant Menu,Price List (Auto created),Kainoraštis (automatiškai sukurta)
 DocType: Cheque Print Template,Date Settings,data Nustatymai
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,variantiškumas
 ,Company Name,Įmonės pavadinimas
 DocType: SMS Center,Total Message(s),Bendras pranešimas (-ai)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Pasirinkite punktas perkelti
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Pasirinkite punktas perkelti
 DocType: Purchase Invoice,Additional Discount Percentage,Papildoma nuolaida procentais
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Peržiūrėkite visas pagalbos video sąrašą
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Pasirinkite sąskaita Banko vadovas kurioje patikrinimas buvo deponuoti.
@@ -1157,6 +1179,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,matuoklis
 DocType: Workstation,Electricity Cost,elektros kaina
 DocType: HR Settings,Don't send Employee Birthday Reminders,Nesiųskite Darbuotojų Gimimo diena Priminimai
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Išsaugoti nustatymus
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Prašomi produktai
 DocType: Item,Inspection Criteria,tikrinimo kriterijai
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,pervestos
 DocType: BOM Website Item,BOM Website Item,BOM svetainė punktas
@@ -1174,11 +1198,11 @@
 DocType: Journal Entry,Total Amount in Words,Iš viso suma žodžiais
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Įvyko klaida. Vienas tikėtina priežastis gali būti, kad jūs neišsaugojote formą. Prašome susisiekti su support@erpnext.com jei problema išlieka."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Mano krepšelis
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Pavedimo tipas turi būti vienas iš {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Pavedimo tipas turi būti vienas iš {0}
 DocType: Lead,Next Contact Date,Kitas Kontaktinė data
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,atidarymo Kiekis
 DocType: Healthcare Settings,Appointment Reminder,Paskyrimų priminimas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Prašome įvesti sąskaitą pokyčio sumą
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Prašome įvesti sąskaitą pokyčio sumą
 DocType: Student Batch Name,Student Batch Name,Studentų Serija Vardas
 DocType: Consultation,Doctor,Gydytojas
 DocType: Holiday List,Holiday List Name,Atostogų sąrašas Vardas
@@ -1186,12 +1210,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Tvarkaraštis Kurso
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Akcijų pasirinkimai
 DocType: Journal Entry Account,Expense Claim,Kompensuojamos Pretenzija
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Ar tikrai norite atstatyti šį metalo laužą turtą?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Kiekis dėl {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Ar tikrai norite atstatyti šį metalo laužą turtą?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Kiekis dėl {0}
 DocType: Leave Application,Leave Application,atostogos taikymas
 DocType: Patient,Patient Relation,Paciento santykis
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Palikite Allocation įrankis
+DocType: Item,Hub Category to Publish,Hub kategorija paskelbti
 DocType: Leave Block List,Leave Block List Dates,Palikite blokuojamų sąrašą Datos
+DocType: Sales Invoice,Billing Address GSTIN,Atsiskaitymo adresas GSTIN
 DocType: Workstation,Net Hour Rate,Grynasis valandą greičiu
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Nusileido Kaina pirkimas gavimas
 DocType: Company,Default Terms,numatytieji sąlygos
@@ -1201,11 +1227,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Nurodykite {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,"Pašalinti elementai, be jokių kiekio ar vertės pokyčius."
 DocType: Delivery Note,Delivery To,Pristatyti
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Įgūdis lentelė yra privalomi
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Įgūdis lentelė yra privalomi
 DocType: Production Planning Tool,Get Sales Orders,Gauk pardavimo užsakymus
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} negali būti neigiamas
 DocType: Training Event,Self-Study,Savarankiškas mokymasis
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Nuolaida
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Nuolaida
 DocType: Asset,Total Number of Depreciations,Viso nuvertinimai
 DocType: Sales Invoice Item,Rate With Margin,Norma atsargos
 DocType: Sales Invoice Item,Rate With Margin,Norma atsargos
@@ -1213,7 +1239,7 @@
 DocType: Task,Urgent,skubus
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Nurodykite tinkamą Row ID eilės {0} lentelėje {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Neįmanoma rasti kintamojo:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,"Pasirinkite lauką, kurį norite redaguoti iš numpad"
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,"Pasirinkite lauką, kurį norite redaguoti iš numpad"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Eiti į Desktop ir pradėti naudoti ERPNext
 DocType: Item,Manufacturer,gamintojas
 DocType: Landed Cost Item,Purchase Receipt Item,Pirkimo kvito punktas
@@ -1244,8 +1270,8 @@
 DocType: GL Entry,Against,prieš
 DocType: Item,Default Selling Cost Center,Numatytasis Parduodami Kaina centras
 DocType: Sales Partner,Implementation Partner,įgyvendinimas partneriu
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Pašto kodas
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Pardavimų užsakymų {0} yra {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Pašto kodas
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Pardavimų užsakymų {0} yra {1}
 DocType: Opportunity,Contact Info,Kontaktinė informacija
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Padaryti atsargų papildymams
 DocType: Packing Slip,Net Weight UOM,Grynasis svoris UOM
@@ -1256,6 +1282,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Gauk Savaitinis Off Datos
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Pabaigos data negali būti mažesnė negu pradžios data
 DocType: Sales Person,Select company name first.,Pasirinkite įmonės pavadinimas pirmas.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Nuo mažo iki aukšto
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,"Citatos, gautų iš tiekėjų."
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Pakeiskite BOM ir atnaujinkite naujausią kainą visose BOM
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Norėdami {0} | {1} {2}
@@ -1276,7 +1303,7 @@
 DocType: Program Enrollment,Transportation,Transportavimas
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Neteisingas Įgūdis
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} turi būti pateiktas
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Kiekis turi būti mažesnis arba lygus {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Kiekis turi būti mažesnis arba lygus {0}
 DocType: SMS Center,Total Characters,Iš viso Veikėjai
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Prašome pasirinkti BOM BOM į lauką punkte {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-formos sąskaita faktūra detalės
@@ -1291,7 +1318,7 @@
 ,Ordered Items To Be Billed,Užsakytas prekes Norėdami būti mokami
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Iš klasės turi būti mažesnis nei svyruoja
 DocType: Global Defaults,Global Defaults,Global Numatytasis
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Projektų Bendradarbiavimas Kvietimas
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Projektų Bendradarbiavimas Kvietimas
 DocType: Salary Slip,Deductions,atskaitymai
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Veiksmo pavadinimas
@@ -1309,13 +1336,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Pardavimų sąskaita faktūra Išankstinis
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Nieko prašyti
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Kitas Biudžeto įrašas &#39;{0} &quot;jau egzistuoja nuo {1} {2}&quot; fiskalinio metų {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Tikrasis pradžios data&quot; gali būti ne didesnis nei faktinio End Date &quot;
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Tikrasis pradžios data&quot; gali būti ne didesnis nei faktinio End Date &quot;
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,valdymas
 DocType: Cheque Print Template,Payer Settings,mokėtojo Nustatymai
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Tai bus pridėtas prie elemento kodekso variante. Pavyzdžiui, jei jūsų santrumpa yra &quot;S.&quot;, o prekės kodas yra T-shirt &quot;, elementas kodas variantas bus&quot; T-shirt-SM &quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Neto darbo užmokestis (žodžiais) bus matomas, kai jums sutaupyti darbo užmokestį."
 DocType: Purchase Invoice,Is Return,Ar Grįžti
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Atsargiai
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Atsargiai
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Prekių grąžinimas / debeto aviza
 DocType: Price List Country,Price List Country,Kainų sąrašas Šalis
 DocType: Item,UOMs,UOMs
@@ -1330,17 +1357,18 @@
 DocType: Account,Balance Sheet,Balanso lapas
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Kainuos centras už prekę su Prekės kodas &quot;
 DocType: Fee Validity,Valid Till,Galioja iki
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mokėjimo būdas yra neužpildė. Prašome patikrinti, ar sąskaita buvo nustatytas mokėjimų Mode arba POS profilis."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mokėjimo būdas yra neužpildė. Prašome patikrinti, ar sąskaita buvo nustatytas mokėjimų Mode arba POS profilis."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Tas pats daiktas negali būti įrašytas kelis kartus.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Daugiau sąskaitos gali būti grupėse, tačiau įrašai gali būti pareikštas ne grupės"
 DocType: Lead,Lead,Vadovauti
 DocType: Email Digest,Payables,Mokėtinos sumos
 DocType: Course,Course Intro,Žinoma Įvadas
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,"Atsargų, {0} sukūrė"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Nustatykite numerių seriją lankytojams per sąranką&gt; numeravimo serija
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,"Atsargų, {0} sukūrė"
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Eilutės # {0}: Atmesta Kiekis negali būti įrašytas į pirkimo Grįžti
 ,Purchase Order Items To Be Billed,Pirkimui užsakyti klausimai turi būti apmokestinama
 DocType: Purchase Invoice Item,Net Rate,grynasis Balsuok
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Pasirinkite klientą
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Pasirinkite klientą
 DocType: Purchase Invoice Item,Purchase Invoice Item,Pirkimo faktūros Elementą
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Akcijų Ledgeris Įrašai ir GL Įrašai pakartotinai paskelbtas kur nors pasirinktų įsigijimo kvitai
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,1 punktas
@@ -1361,7 +1389,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Dubliuoti eilutė {0} su tuo pačiu {1}
 ,Trial Balance,bandomasis balansas
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Finansiniai metai {0} nerastas
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Įsteigti Darbuotojai
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Įsteigti Darbuotojai
 DocType: Sales Order,SO-,SO
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Prašome pasirinkti prefiksą pirmas
 DocType: Employee,O-,O-
@@ -1373,12 +1401,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Peržiūrėti Ledgeris
 DocType: Grading Scale,Intervals,intervalai
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Seniausi
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Prekę grupė egzistuoja to paties pavadinimo, prašom pakeisti elementą vardą ar pervardyti elementą grupę"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Prekę grupė egzistuoja to paties pavadinimo, prašom pakeisti elementą vardą ar pervardyti elementą grupę"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Studentų Mobilus Ne
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Likęs pasaulis
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Likęs pasaulis
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Naudodami {0} punktas negali turėti Serija
 ,Budget Variance Report,Biudžeto Dispersija ataskaita
 DocType: Salary Slip,Gross Pay,Pilna Mokėti
+DocType: Item,Is Item from Hub,Ar prekė iš centro
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Eilutės {0}: veiklos rūšis yra privalomas.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividendai
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,apskaitos Ledgeris
@@ -1388,8 +1417,9 @@
 DocType: Vehicle Log,Service Detail,Paslaugų detalės
 DocType: BOM,Item Description,Prekės Aprašymas
 DocType: Student Sibling,Student Sibling,Studentų giminystės
-DocType: Purchase Invoice,Is Recurring,Ar Pasikartojančios
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Mokėjimo būdas
 DocType: Purchase Invoice,Supplied Items,"prekių tiekimu,"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Nustatykite aktyvų Restorano {0} meniu
 DocType: Student,STUD.,Stud.
 DocType: Production Order,Qty To Manufacture,Kiekis gaminti
 DocType: Email Digest,New Income,nauja pajamos
@@ -1400,6 +1430,7 @@
 ,Student and Guardian Contact Details,Studentų ir globėjas Kontaktinė informacija
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Eilutės {0}: Dėl tiekėjo {0} el.pašto adresas yra reikalingi siųsti laišką
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,laikinas atidarymas
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Peržiūrėti centru
 ,Employee Leave Balance,Darbuotojų atostogos balansas
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Likutis sąskaitoje {0} visada turi būti {1}
 DocType: Patient Appointment,More Info,Daugiau informacijos
@@ -1419,13 +1450,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Pardavimų užsakymų {0} negalioja
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Įspėti apie naują prašymą dėl pasiūlymų
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Pirkimo pavedimai padės jums planuoti ir sekti savo pirkimų
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Atsiprašome, įmonės negali būti sujungtos"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Atsiprašome, įmonės negali būti sujungtos"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab testo rekvizitai
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Bendras išdavimas / Pervežimas kiekis {0} Krovimas Užsisakyti {1} \ negali būti didesnis nei prašomo kiekio {2} už prekę {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,mažas
 DocType: Employee,Employee Number,Darbuotojo numeris
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Byloje Nr (-ai) jau naudojamas. Pabandykite iš byloje Nr {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Byloje Nr (-ai) jau naudojamas. Pabandykite iš byloje Nr {0}
 DocType: Project,% Completed,% Baigtas
 ,Invoiced Amount (Exculsive Tax),Sąskaitoje suma (Exculsive Mokesčių)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,2 punktas
@@ -1440,11 +1471,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,netiesioginės išlaidos
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Eilutės {0}: Kiekis yra privalomi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Žemdirbystė
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sinchronizavimo Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sinchronizavimo Master Data
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Savo produktus ar paslaugas
 DocType: Special Test Items,Special Test Items,Specialūs testo elementai
 DocType: Mode of Payment,Mode of Payment,mokėjimo būdas
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Interneto svetainė Paveikslėlis turėtų būti valstybės failą ar svetainės URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Interneto svetainė Paveikslėlis turėtų būti valstybės failą ar svetainės URL
 DocType: Student Applicant,AP,A.
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Tai yra šaknis punktas grupė ir negali būti pakeisti.
@@ -1452,9 +1483,9 @@
 DocType: Vehicle,Fuel UOM,kuro UOM
 DocType: Warehouse,Warehouse Contact Info,Sandėlių Kontaktinė informacija
 DocType: Payment Entry,Write Off Difference Amount,Nurašyti skirtumo suma
-DocType: Purchase Invoice,Recurring Type,pasikartojančios tipas
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: Darbuotojų elektroninio pašto nerastas, todėl elektroninių laiškų, nesiunčiamas"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: Darbuotojų elektroninio pašto nerastas, todėl elektroninių laiškų, nesiunčiamas"
 DocType: Item,Foreign Trade Details,Užsienio prekybos informacija
+,Assessment Plan Status,Vertinimo plano būsena
 DocType: Email Digest,Annual Income,Metinės pajamos
 DocType: Serial No,Serial No Details,Serijos Nr detalės
 DocType: Purchase Invoice Item,Item Tax Rate,Prekė Mokesčio tarifas
@@ -1462,15 +1493,14 @@
 DocType: Student Group Student,Group Roll Number,Grupė salė Taškų
 DocType: Student Group Student,Group Roll Number,Grupė salė Taškų
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",Dėl {0} tik kredito sąskaitos gali būti susijęs su kitos debeto įrašą
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Bendras visų užduočių svoriai turėtų būti 1. Prašome reguliuoti svareliai visų projekto užduotis atitinkamai
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Važtaraštis {0} nebus pateiktas
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Bendras visų užduočių svoriai turėtų būti 1. Prašome reguliuoti svareliai visų projekto užduotis atitinkamai
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Važtaraštis {0} nebus pateiktas
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Prekė {0} turi būti Prekė pagal subrangos sutartis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,kapitalo įranga
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Kainodaros taisyklė pirmiausia atrenkami remiantis &quot;Taikyti&quot; srityje, kuris gali būti punktas, punktas Grupė ar prekės ženklą."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Pirmiausia nustatykite elemento kodą
-DocType: Hub Settings,Seller Website,Pardavėjo Interneto svetainė
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Pirmiausia nustatykite elemento kodą
 DocType: Item,ITEM-,item-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Iš viso skyrė procentas pardavimų vadybininkas turi būti 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Iš viso skyrė procentas pardavimų vadybininkas turi būti 100
 DocType: Sales Invoice Item,Edit Description,Redaguoti Aprašymas
 DocType: Antibiotic,Antibiotic,Antibiotikas
 ,Team Updates,komanda Atnaujinimai
@@ -1491,12 +1521,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Iš viso (Įmonės valiuta)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Serijos numeris {0} įvesta daugiau nei vieną kartą
 DocType: Depreciation Schedule,Journal Entry,žurnalo įrašą
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} elementų pažangą
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} elementų pažangą
 DocType: Workstation,Workstation Name,Kompiuterizuotos darbo vietos Vardas
 DocType: Grading Scale Interval,Grade Code,Įvertinimas kodas
 DocType: POS Item Group,POS Item Group,POS punktas grupė
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Siųskite Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} nepriklauso punkte {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} nepriklauso punkte {1}
 DocType: Sales Partner,Target Distribution,Tikslinė pasiskirstymas
 DocType: Salary Slip,Bank Account No.,Banko sąskaitos Nr
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Tai yra paskutinio sukurto skaičius operacijoje su šio prefikso
@@ -1513,10 +1543,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Užklausimas Tiekėjo
 DocType: Healthcare Settings,Registration Message,Registracijos pranešimas
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,techninė įranga
-DocType: Sales Order,Recurring Upto,pasikartojančios upto
 DocType: Prescription Dosage,Prescription Dosage,Receptinis dozavimas
 DocType: Attendance,HR Manager,Žmogiškųjų išteklių vadybininkas
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,"Prašome pasirinkti įmonę,"
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,"Prašome pasirinkti įmonę,"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,privilegija atostogos
 DocType: Purchase Invoice,Supplier Invoice Date,Tiekėjas sąskaitos faktūros išrašymo data
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,už
@@ -1532,10 +1561,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,rasti tarp sutampančių sąlygos:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Prieš leidinyje Įėjimo {0} jau koreguojama kitu kuponą
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Iš viso užsakymo vertė
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,maistas
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,maistas
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Senėjimas klasės 3
 DocType: Maintenance Schedule Item,No of Visits,Nėra apsilankymų
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Techninės priežiūros grafikas {0} egzistuoja nuo {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Ar norite paskelbti savo elementus į centrą?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,mokosi studentas
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valiuta uždarymo sąskaita turi būti {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma kiekis visų tikslų turėtų būti 100. Tai {0}
@@ -1546,9 +1576,9 @@
 DocType: Authorization Rule,Average Discount,Vidutinis nuolaida
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Komunalinės paslaugos
-DocType: Purchase Invoice Item,Accounting,apskaita
+DocType: POS Profile,Accounting,apskaita
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Prašome pasirinkti partijas partijomis prekę
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Prašome pasirinkti partijas partijomis prekę
 DocType: Asset,Depreciation Schedules,nusidėvėjimo Tvarkaraščiai
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Taikymo laikotarpis negali būti ne atostogos paskirstymo laikotarpis
 DocType: Activity Cost,Projects,projektai
@@ -1564,7 +1594,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',Patvirtinimo būsena turi būti &quot;Patvirtinta&quot; arba &quot;Atmesta&quot;
 DocType: Physician,Contacts and Address,Kontaktai ir adresas
 DocType: Purchase Invoice,Contact Person,kontaktinis asmuo
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&quot;Tikėtinas pradžios data&quot; gali būti ne didesnis nei &quot;Expected Pabaigos data&quot;
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&quot;Tikėtinas pradžios data&quot; gali būti ne didesnis nei &quot;Expected Pabaigos data&quot;
 DocType: Course Scheduling Tool,Course End Date,Žinoma Pabaigos data
 DocType: Holiday List,Holidays,šventės
 DocType: Sales Order Item,Planned Quantity,planuojamas kiekis
@@ -1572,10 +1602,11 @@
 DocType: Item,Maintain Stock,išlaikyti Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Akcijų įrašai jau sukurtos gamybos ordino
 DocType: Employee,Prefered Email,Pageidaujamas paštas
+DocType: Student Admission,Eligibility and Details,Tinkamumas ir detalės
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Grynasis pokytis ilgalaikio turto
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Palikite tuščią, jei laikomas visų pavadinimų"
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Mokesčio tipas &quot;Tikrasis&quot; iš eilės {0} negali būti įtraukti į klausimus lygis
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,nuo datetime
 DocType: Email Digest,For Company,dėl Company
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Ryšio žurnalas.
@@ -1583,19 +1614,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Tiekėjo rezultatų lentelės vertinimo kintamasis
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Ieško suma
 DocType: Sales Invoice,Shipping Address Name,Pristatymas Adresas Pavadinimas
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Sąskaitų planas
 DocType: Material Request,Terms and Conditions Content,Terminai ir sąlygos turinys
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,negali būti didesnis nei 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Prekė {0} nėra sandėlyje punktas
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Prekė {0} nėra sandėlyje punktas
 DocType: Maintenance Visit,Unscheduled,Neplanuotai
 DocType: Employee,Owned,priklauso
 DocType: Salary Detail,Depends on Leave Without Pay,Priklauso nuo atostogų be Pay
 DocType: Pricing Rule,"Higher the number, higher the priority","Kuo didesnis skaičius, didesnis prioritetas"
 ,Purchase Invoice Trends,Pirkimo faktūros tendencijos
 DocType: Employee,Better Prospects,Geresnės perspektyvos
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Eilutė # {0}: Partija {1} turi tik {2} vnt. Prašome pasirinkti kitą partiją, kuri turi gauti {3} Kiekis arba padalinti eilutę į kelias eilutes, pristatyti / problemą iš kelių partijų"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Eilutė # {0}: Partija {1} turi tik {2} vnt. Prašome pasirinkti kitą partiją, kuri turi gauti {3} Kiekis arba padalinti eilutę į kelias eilutes, pristatyti / problemą iš kelių partijų"
 DocType: Vehicle,License Plate,Valstybinis numeris
 DocType: Appraisal,Goals,Tikslai
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Pasirinkite POS profilį
 DocType: Warranty Claim,Warranty / AMC Status,Garantija / AMC Būsena
 ,Accounts Browser,sąskaitos naršyklė
 DocType: Payment Entry Reference,Payment Entry Reference,Mokėjimo Įėjimo Nuoroda
@@ -1613,7 +1644,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Darbuotojas negali pranešti pats.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jei sąskaita yra sušaldyti, įrašai leidžiama ribojamų vartotojams."
 DocType: Email Digest,Bank Balance,banko balansas
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Apskaitos įrašas už {0}: {1} galima tik valiuta: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Apskaitos įrašas už {0}: {1} galima tik valiuta: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Darbo profilis, reikalingas kvalifikacijos ir tt"
 DocType: Journal Entry Account,Account Balance,Sąskaitos balansas
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Mokesčių taisyklė sandorius.
@@ -1638,7 +1669,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Pakavimo lapelis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Biuro nuoma
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Sąranka SMS Gateway nustatymai
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importas Nepavyko!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Importas Nepavyko!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Nėra adresas pridėta dar.
 DocType: Workstation Working Hour,Workstation Working Hour,Kompiuterizuotos darbo vietos Darbo valandos
 DocType: Vital Signs,Blood Pressure,Kraujo spaudimas
@@ -1663,7 +1694,7 @@
 DocType: Sales Invoice,Source,šaltinis
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Rodyti uždarytas
 DocType: Leave Type,Is Leave Without Pay,Ar palikti be Pay
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Turto Kategorija privaloma ilgalaikio turto
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Turto Kategorija privaloma ilgalaikio turto
 DocType: Fee Validity,Fee Validity,Mokesčio galiojimas
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,rasti Mokėjimo stalo Nėra įrašų
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Šis {0} prieštarauja {1} ir {2} {3}
@@ -1684,8 +1715,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Sukurti leads
 DocType: Maintenance Schedule,Schedules,tvarkaraščiai
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,"Pozicijos profilis reikalingas, norint naudoti &quot;Point-of-Sale&quot;"
 DocType: Purchase Invoice Item,Net Amount,Grynoji suma
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} nebuvo pateikta ir todėl veiksmai negali būti užbaigtas
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} nebuvo pateikta ir todėl veiksmai negali būti užbaigtas
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Išsamiau Nėra
 DocType: Landed Cost Voucher,Additional Charges,Papildomi mokesčiai
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Papildoma nuolaida Suma (Įmonės valiuta)
@@ -1694,7 +1726,7 @@
 ,Support Hour Distribution,Paramos valandos platinimas
 DocType: Maintenance Visit,Maintenance Visit,priežiūra Aplankyti
 DocType: Student,Leaving Certificate Number,Palikus Sertifikato numeris
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}",Paskyrimas atšauktas. Peržiūrėkite ir atšaukite sąskaitą {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}",Paskyrimas atšauktas. Peržiūrėkite ir atšaukite sąskaitą {0}
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Turimas Serija Kiekis į sandėlį
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Atnaujinti Spausdinti Formatas
 DocType: Landed Cost Voucher,Landed Cost Help,Nusileido kaina Pagalba
@@ -1717,8 +1749,8 @@
 DocType: Patient,Tobacco Past Use,Tabako praeitis
 DocType: Sales Invoice Item,Brand Name,Markės pavadinimas
 DocType: Purchase Receipt,Transporter Details,Transporter detalės
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Naudotojas {0} jau yra priskirtas gydytojui {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Numatytasis sandėlis reikalingas pasirinktą elementą
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Naudotojas {0} jau yra priskirtas gydytojui {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Numatytasis sandėlis reikalingas pasirinktą elementą
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Dėžė
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,galimas Tiekėjas
 DocType: Budget,Monthly Distribution,Mėnesio pasiskirstymas
@@ -1728,8 +1760,8 @@
 DocType: Sales Partner,Sales Partner Target,Partneriai pardavimo Tikslinė
 DocType: Loan Type,Maximum Loan Amount,Maksimali paskolos suma
 DocType: Pricing Rule,Pricing Rule,kainodaros taisyklė
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Dublikatas ritinys numeris studentas {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Dublikatas ritinys numeris studentas {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Dublikatas ritinys numeris studentas {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Dublikatas ritinys numeris studentas {0}
 DocType: Budget,Action if Annual Budget Exceeded,"Veiksmų, jei metinio biudžeto Viršytas"
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Medžiaga Prašymas Pirkimo užsakymas
 DocType: Shopping Cart Settings,Payment Success URL,Mokėjimo Sėkmės adresas
@@ -1746,7 +1778,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} turi būti tik vieną kartą
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Neleidžiama pavedimu daugiau {0} nei {1} prieš Užsakymo {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Lapai Paskirti sėkmingai {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Neturite prekių pakuotės
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Neturite prekių pakuotės
 DocType: Shipping Rule Condition,From Value,nuo Vertė
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Gamyba Kiekis yra privalomi
 DocType: Employee Loan,Repayment Method,grąžinimas būdas
@@ -1760,6 +1792,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Akcijų Įsipareigojimai
 DocType: Purchase Invoice,Supplier Warehouse,tiekėjas tiekiantis sandėlis
 DocType: Opportunity,Contact Mobile No,Kontaktinė Mobilus Nėra
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Pasirinkite įmonę
 ,Material Requests for which Supplier Quotations are not created,Medžiaga Prašymai dėl kurių Tiekėjas Citatos nėra sukurtos
 DocType: Student Group,Set 0 for no limit,Nustatykite 0 jokios ribos
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Dieną (-os), kada prašote atostogų yra šventės. Jums nereikia prašyti atostogų."
@@ -1769,24 +1802,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Padaryti Citata
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Kiti pranešimai
 DocType: Dependent Task,Dependent Task,priklauso nuo darbo
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Konversijos koeficientas pagal nutylėjimą Matavimo vienetas turi būti 1 eilės {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Konversijos koeficientas pagal nutylėjimą Matavimo vienetas turi būti 1 eilės {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Atostogos tipo {0} negali būti ilgesnis nei {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Pabandykite planuoja operacijas X dienų iš anksto.
 DocType: HR Settings,Stop Birthday Reminders,Sustabdyti Gimimo diena Priminimai
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Prašome Set Default Darbo užmokesčio MOKĖTINOS Narystė Bendrovėje {0}
 DocType: SMS Center,Receiver List,imtuvas sąrašas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Paieška punktas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Paieška punktas
 DocType: Patient Appointment,Referring Physician,Kreipiantis gydytojas
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,suvartoti suma
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Grynasis Pakeisti pinigais
 DocType: Assessment Plan,Grading Scale,vertinimo skalė
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Matavimo vienetas {0} buvo įrašytas daugiau nei vieną kartą konversijos koeficientas lentelėje
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,jau baigtas
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Matavimo vienetas {0} buvo įrašytas daugiau nei vieną kartą konversijos koeficientas lentelėje
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,jau baigtas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Akcijų In Hand
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Mokėjimo prašymas jau yra {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kaina išduotą prekės
 DocType: Physician,Hospital,Ligoninė
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Kiekis turi būti ne daugiau kaip {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Kiekis turi būti ne daugiau kaip {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Praėję finansiniai metai yra neuždarytas
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Amžius (dienomis)
 DocType: Quotation Item,Quotation Item,citata punktas
@@ -1797,8 +1830,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Tiekėjas tipas meistras.
 DocType: Purchase Order Item,Supplier Part Number,Tiekėjas Dalies numeris
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Perskaičiavimo kursas negali būti 0 arba 1
-DocType: Sales Invoice,Reference Document,Informacinis dokumentas
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} yra atšauktas arba sustabdytas
+DocType: Subscription,Reference Document,Informacinis dokumentas
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} yra atšauktas arba sustabdytas
 DocType: Accounts Settings,Credit Controller,kredito valdiklis
 DocType: Delivery Note,Vehicle Dispatch Date,Automobilio išsiuntimo data
 DocType: Healthcare Settings,Default Medical Code Standard,Numatytasis medicinos kodekso standartas
@@ -1807,6 +1840,7 @@
 DocType: Company,Default Payable Account,Numatytasis Mokėtina paskyra
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Nustatymai internetinėje krepšelį pavyzdžiui, laivybos taisykles, kainoraštį ir tt"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Įvardintas
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Rūšiuoti pagal kainą ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,saugomos Kiekis
 DocType: Party Account,Party Account,šalis paskyra
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Žmogiškieji ištekliai
@@ -1818,13 +1852,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Padaryti Išmok ÷ jimo įrašas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Eilutės {0}: Išankstinis prieš Tiekėjas turi būti nurašyti
 DocType: Company,Default Values,numatytosios vertės
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Dažnis} Digest &quot;
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Dažnis} Digest &quot;
 DocType: Expense Claim,Total Amount Reimbursed,Iš viso kompensuojama suma
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Tai grindžiama rąstų prieš šią transporto priemonę. Žiūrėti grafikas žemiau detales
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Prieš tiekėjo sąskaitoje {0} data {1}
 DocType: Customer,Default Price List,Numatytasis Kainų sąrašas
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Turto Judėjimo įrašas {0} sukūrė
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Jūs negalite trinti finansiniai metai {0}. Finansiniai metai {0} yra numatytoji Global Settings
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Tokio paties kliento klientas jau egzistuoja
 DocType: Journal Entry,Entry Type,įrašo tipas
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Nėra vertinimo planas susijęs su šio vertinimo grupės
 ,Customer Credit Balance,Klientų kredito likučio
@@ -1835,7 +1870,7 @@
 DocType: Quotation,Term Details,Terminuoti detalės
 DocType: Project,Total Sales Cost (via Sales Order),Iš viso pardavimų savikainoje (per pardavimo tvarka)
 DocType: Project,Total Sales Cost (via Sales Order),Iš viso pardavimų savikainoje (per pardavimo tvarka)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Negalima registruotis daugiau nei {0} studentams šio studentų grupę.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Negalima registruotis daugiau nei {0} studentams šio studentų grupę.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Švinas Grafas
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Švinas Grafas
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} turi būti didesnis nei 0
@@ -1853,9 +1888,11 @@
 DocType: Lab Test,Technician Name,Technikos vardas
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Atsieti Apmokėjimas atšaukimas sąskaita faktūra
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Dabartinis Odometro skaitymo įvesta turėtų būti didesnis nei pradinis transporto priemonės hodometro {0}
+DocType: Restaurant Reservation,No Show,Nr šou
 DocType: Shipping Rule Country,Shipping Rule Country,Pristatymas taisyklė Šalis
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Palikite ir lankymas
 DocType: Maintenance Visit,Partially Completed,dalinai užpildytą
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Vidutinis jautrumas
 DocType: Leave Type,Include holidays within leaves as leaves,Įtraukti atostogas per lapus kaip lapai
 DocType: Sales Invoice,Packed Items,Fasuoti daiktai
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garantija pretenzija Serijos Nr
@@ -1872,13 +1909,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Mokama suma (Įmonės valiuta)
 DocType: Purchase Invoice,Additional Discount,Papildoma nuolaida
 DocType: Selling Settings,Selling Settings,parduoda Nustatymai
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Patvirtinti veiksmą
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Dabar Aukcionai
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Prašome nurodyti arba kiekis ar Vertinimo norma arba abu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,įvykdymas
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Žiūrėti krepšelį
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,rinkodaros išlaidos
 ,Item Shortage Report,Prekė trūkumas ataskaita
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",Svoris paminėta \ nLūdzu paminėti &quot;Svoris UOM&quot; per
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",Svoris paminėta \ nLūdzu paminėti &quot;Svoris UOM&quot; per
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,"Medžiaga Prašymas naudojamas, kad šių išteklių įrašas"
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Kitas Nusidėvėjimas data yra privalomas naujo turto
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Atskiras kursas grindžiamas grupė kiekvieną partiją
@@ -1891,12 +1929,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Padaryti apskaitos įrašas Kiekvienas vertybinių popierių judėjimo
 DocType: Leave Allocation,Total Leaves Allocated,Iš viso Lapai Paskirti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Sandėlių reikalaujama Row Nr {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Prašome įvesti galiojantį finansinių metų pradžios ir pabaigos datos
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Prašome įvesti galiojantį finansinių metų pradžios ir pabaigos datos
 DocType: Employee,Date Of Retirement,Data nuo išėjimo į pensiją
 DocType: Upload Attendance,Get Template,Gauk šabloną
 DocType: Material Request,Transferred,Perduotas
 DocType: Vehicle,Doors,durys
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext sąranka baigta
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext sąranka baigta
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Rinkti paciento registracijos mokestį
 DocType: Course Assessment Criteria,Weightage,weightage
 DocType: Purchase Invoice,Tax Breakup,mokesčių Breakup
@@ -1915,37 +1953,37 @@
 DocType: Employee,AB+,AB &quot;+&quot;
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Jei ši prekė yra variantų, tada jis negali būti parenkamos pardavimo užsakymus ir tt"
 DocType: Lead,Next Contact By,Kitas Susisiekti
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},reikalingas punktas {0} iš eilės Kiekis {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},reikalingas punktas {0} iš eilės Kiekis {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},"Sandėlių {0} negali būti išbrauktas, nes egzistuoja kiekis už prekę {1}"
 DocType: Quotation,Order Type,pavedimo tipas
-DocType: Purchase Invoice,Notification Email Address,Pranešimas Elektroninio pašto adresas
 ,Item-wise Sales Register,Prekė išmintingas Pardavimų Registruotis
 DocType: Asset,Gross Purchase Amount,Pilna Pirkimo suma
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Atidarymo likučiai
 DocType: Asset,Depreciation Method,nusidėvėjimo metodas
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Atsijungęs
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Atsijungęs
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ar šis mokestis įtrauktas į bazinę palūkanų normą?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Iš viso Tikslinė
 DocType: Job Applicant,Applicant for a Job,Pareiškėjas dėl darbo
 DocType: Production Plan Material Request,Production Plan Material Request,Gamybos planas Medžiaga Prašymas
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Nieko gamybos užsakymų sukurtas
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Nieko gamybos užsakymų sukurtas
 DocType: Stock Reconciliation,Reconciliation JSON,susitaikymas JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Per daug stulpelių. Eksportuoti ataskaitą ir jį atspausdinti naudojant skaičiuoklės programą.
 DocType: Purchase Invoice Item,Batch No,Serijos Nr
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Prašymas pateikti pasiūlymą: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Leisti kelis pardavimų užsakymų prieš Kliento Užsakymo
 DocType: Student Group Instructor,Student Group Instructor,Studentų grupė instruktorius
 DocType: Student Group Instructor,Student Group Instructor,Studentų grupė instruktorius
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobilus Nėra
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,pagrindinis
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,pagrindinis
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,variantas
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nustatyti priešdėlis numeracijos seriją apie sandorius savo
 DocType: Employee Attendance Tool,Employees HTML,darbuotojai HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Numatytasis BOM ({0}) turi būti aktyvus šią prekę ar jo šabloną
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Numatytasis BOM ({0}) turi būti aktyvus šią prekę ar jo šabloną
 DocType: Employee,Leave Encashed?,Palikite Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Galimybė Nuo srityje yra privalomas
 DocType: Email Digest,Annual Expenses,metinės išlaidos
 DocType: Item,Variants,variantai
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Padaryti pirkinių užsakymą
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Padaryti pirkinių užsakymą
 DocType: SMS Center,Send To,siųsti
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Nėra pakankamai atostogos balansas Palikti tipas {0}
 DocType: Payment Reconciliation Payment,Allocated amount,skirtos sumos
@@ -1963,6 +2001,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Studentų grupė Stiprumas
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Prieš leidinyje Įėjimo {0} neturi neprilygstamą {1} įrašą
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,vertinimai
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Mokymo renginiai
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Duplicate Serijos Nr įvestas punkte {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Sąlyga laivybos taisyklės
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Prašome įvesti
@@ -1972,7 +2011,7 @@
 DocType: Sales Order,To Deliver and Bill,Pristatyti ir Bill
 DocType: Student Group,Instructors,instruktoriai
 DocType: GL Entry,Credit Amount in Account Currency,Kredito sumą sąskaitos valiuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} turi būti pateiktas
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} turi būti pateiktas
 DocType: Authorization Control,Authorization Control,autorizacija Valdymo
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Eilutės # {0}: Atmesta Sandėlis yra privalomas prieš atmetė punkte {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,mokėjimas
@@ -1991,11 +2030,11 @@
 DocType: Quotation Item,Actual Qty,Tikrasis Kiekis
 DocType: Sales Invoice Item,References,Nuorodos
 DocType: Quality Inspection Reading,Reading 10,Skaitymas 10
-DocType: Hub Settings,Hub Node,Stebulės mazgas
+DocType: Hub Category,Hub Node,Stebulės mazgas
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Jūs įvedėte pasikartojančius elementus. Prašome ištaisyti ir bandykite dar kartą.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Bendradarbis
 DocType: Asset Movement,Asset Movement,turto judėjimas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,nauja krepšelį
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,nauja krepšelį
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Prekė {0} nėra išspausdintas punktas
 DocType: SMS Center,Create Receiver List,Sukurti imtuvas sąrašas
 DocType: Vehicle,Wheels,ratai
@@ -2009,15 +2048,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikacijos
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Nurodo, kad paketas yra šio pristatymo (tik projekto) dalis"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Padaryti Mokėjimo įrašą
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Kiekis už prekę {0} turi būti mažesnis nei {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Kiekis už prekę {0} turi būti mažesnis nei {1}
 ,Sales Invoice Trends,Pardavimo sąskaita-faktūra tendencijos
 DocType: Leave Application,Apply / Approve Leaves,Taikyti / Patvirtinti lapai
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Dėl
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Dėl
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Gali kreiptis eilutę tik jei įkrova tipas &quot;Dėl ankstesnės eilės suma&quot; ar &quot;ankstesnės eilės Total&quot;
 DocType: Sales Order Item,Delivery Warehouse,Pristatymas sandėlis
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Medis finansinių išlaidų centrai.
 DocType: Serial No,Delivery Document No,Pristatymas dokumentas Nr
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Prašome nustatyti &quot;Gain / Loss sąskaitą turto perdavimo&quot; Bendrovėje {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Prašome nustatyti &quot;Gain / Loss sąskaitą turto perdavimo&quot; Bendrovėje {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Gauti prekes iš įsigijimo kvitai
 DocType: Serial No,Creation Date,Sukūrimo data
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Prekė {0} pasirodo kelis kartus kainoraštis {1}
@@ -2028,12 +2067,13 @@
 DocType: Student,Student Mobile Number,Studentų Mobilusis Telefonas Numeris
 DocType: Item,Has Variants,turi variantams
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Atnaujinti atsakymą
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Jūs jau pasirinkote elementus iš {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Jūs jau pasirinkote elementus iš {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Pavadinimas Mėnesio pasiskirstymas
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Serija ID privalomi
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Serija ID privalomi
 DocType: Sales Person,Parent Sales Person,Tėvų pardavimų asmuo
-DocType: Purchase Invoice,Recurring Invoice,pasikartojančios Sąskaita
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Nuo didelio iki mažo
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Pirmiausia pasirinkite programą
 DocType: Patient Appointment,Patient Age,Paciento amžius
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,projektų valdymas
 DocType: Supplier,Supplier of Goods or Services.,Tiekėjas tiekiantis prekes ar paslaugas.
@@ -2041,8 +2081,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Numatytos gautinos sąskaitos, kurios bus naudojamos, jei nenustatytos Pacientui, kad galėtumėte užsisakyti konsultacijų mokesčius."
 DocType: Vehicle Log,Fuel Price,kuro Kaina
 DocType: Budget,Budget,biudžetas
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Nustatyti Atidaryti
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Ilgalaikio turto turi būti ne akcijų punktas.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Nustatyti Atidaryti
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Ilgalaikio turto turi būti ne akcijų punktas.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Biudžetas negali būti skiriamas prieš {0}, nes tai ne pajamos ar sąnaudos sąskaita"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,pasiektas
 DocType: Student Admission,Application Form Route,Prašymo forma Vartojimo būdas
@@ -2056,12 +2096,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Prekė {0} nėra setup Serijos Nr. Patikrinkite Elementą meistras
 DocType: Maintenance Visit,Maintenance Time,Priežiūros laikas
 ,Amount to Deliver,Suma pristatyti
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Tas pats elementas buvo įvestas keletą kartų. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term pradžios data negali būti vėlesnė nei metų pradžioje data mokslo metams, kuris terminas yra susijęs (akademiniai metai {}). Ištaisykite datas ir bandykite dar kartą."
 DocType: Guardian,Guardian Interests,Guardian Pomėgiai
 DocType: Naming Series,Current Value,Dabartinė vertė
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Keli fiskalinius metus egzistuoja datos {0}. Prašome nustatyti bendrovės finansiniams metams
 DocType: School Settings,Instructor Records to be created by,"Instruktorių įrašai, kuriuos turi sukurti"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} sukūrė
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} sukūrė
 DocType: Delivery Note Item,Against Sales Order,Prieš Pardavimų ordino
 ,Serial No Status,Serijos Nr Būsena
 DocType: Payment Entry Reference,Outstanding,neišspręstas
@@ -2071,10 +2112,10 @@
 						must be greater than or equal to {2}","Eilutės {0}: Norėdami nustatyti {1} periodiškumas, skirtumas tarp iš ir į datą \ turi būti didesnis nei arba lygus {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Tai remiantis akcijų judėjimo. Žiūrėti {0} daugiau informacijos
 DocType: Pricing Rule,Selling,pardavimas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Suma {0} {1} išskaičiuota nuo {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Suma {0} {1} išskaičiuota nuo {2}
 DocType: Employee,Salary Information,Pajamos Informacija
 DocType: Sales Person,Name and Employee ID,Vardas ir darbuotojo ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Terminas negali būti prieš paskelbdami data
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Terminas negali būti prieš paskelbdami data
 DocType: Website Item Group,Website Item Group,Interneto svetainė punktas grupė
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Muitai ir mokesčiai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Prašome įvesti Atskaitos data
@@ -2100,7 +2141,7 @@
 DocType: Issue,Resolution Details,geba detalės
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,asignavimai
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,priimtinumo kriterijai
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Prašome įvesti Materialieji prašymus pirmiau pateiktoje lentelėje
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Prašome įvesti Materialieji prašymus pirmiau pateiktoje lentelėje
 DocType: Item Attribute,Attribute Name,atributo pavadinimas
 DocType: BOM,Show In Website,Rodyti svetainė
 DocType: Shopping Cart Settings,Show Quantity in Website,Rodyti Kiekis svetainė
@@ -2109,7 +2150,7 @@
 DocType: Item Reorder,Check in (group),Atvykimas (grupė)
 ,Qty to Order,Kiekis užsisakyti
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Sąskaitos galva pagal įsipareigojimą arba nuosavybės, kurioje Pelnas / nuostolis bus nubaustas"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Ganto diagrama visų užduočių.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Ganto diagrama visų užduočių.
 DocType: Opportunity,Mins to First Response,Min First Response
 DocType: Pricing Rule,Margin Type,marža tipas
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} valandos
@@ -2131,36 +2172,36 @@
 DocType: Patient,Surgical History,Chirurginė istorija
 DocType: Employee,Resignation Letter Date,Atsistatydinimas raštas data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Kainodaros taisyklės yra toliau filtruojamas remiantis kiekį.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Prašome nustatykite data Prisijungimas darbuotojo {0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Prašome nustatykite data Prisijungimas darbuotojo {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Prašome nustatykite data Prisijungimas darbuotojo {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Prašome nustatykite data Prisijungimas darbuotojo {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Iš viso Atsiskaitymo suma (per Time lapas)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Pakartokite Klientų pajamos
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) turi vaidmenį &quot;sąskaita patvirtinusio&quot;
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Pora
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Pasirinkite BOM ir Kiekis dėl gamybos
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Pasirinkite BOM ir Kiekis dėl gamybos
 DocType: Asset,Depreciation Schedule,Nusidėvėjimas Tvarkaraštis
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Pardavimų Partnerių Adresai ir kontaktai
 DocType: Bank Reconciliation Detail,Against Account,prieš sąskaita
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Pusė dienos data turi būti tarp Nuo datos ir iki šiol
 DocType: Maintenance Schedule Detail,Actual Date,Tikrasis data
 DocType: Item,Has Batch No,Turi Serijos Nr
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Metinė Atsiskaitymo: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Metinė Atsiskaitymo: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Prekių ir paslaugų mokesčio (PVM Indija)
 DocType: Delivery Note,Excise Page Number,Akcizo puslapio numeris
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Įmonės, Nuo datos ir iki šiol yra privalomi"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Paimkite iš konsultacijos
 DocType: Asset,Purchase Date,Pirkimo data
 DocType: Employee,Personal Details,Asmeninės detalės
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Prašome nustatyti &quot;turto nusidėvėjimo sąnaudų centro&quot; įmonėje {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Prašome nustatyti &quot;turto nusidėvėjimo sąnaudų centro&quot; įmonėje {0}
 ,Maintenance Schedules,priežiūros Tvarkaraščiai
 DocType: Task,Actual End Date (via Time Sheet),Tikrasis Pabaigos data (per Time lapas)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Suma {0} {1} prieš {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Suma {0} {1} prieš {2} {3}
 ,Quotation Trends,Kainų tendencijos
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Prekė Grupė nepaminėta prekės šeimininkui už prekę {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Debeto sąskaitą turi būti Gautinos sąskaitos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Debeto sąskaitą turi būti Gautinos sąskaitos
 DocType: Shipping Rule Condition,Shipping Amount,Pristatymas suma
 DocType: Supplier Scorecard Period,Period Score,Laikotarpio balas
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Pridėti klientams
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Pridėti klientams
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,kol suma
 DocType: Lab Test Template,Special,Specialus
 DocType: Purchase Invoice Item,Conversion Factor,konversijos koeficientas
@@ -2168,13 +2209,14 @@
 ,Vehicle Expenses,Transporto išlaidos
 DocType: Serial No,Invoice Details,informacija apie sąskaitą
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Tikimasi vertė po naudingo tarnavimo laiką turi būti didesnis nei arba lygus {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Pradėk nuo
+DocType: Hub Category,Hub Category,Hub kategorija
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Automobilio numeris
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Data, kada bus sustabdyti kartojasi sąskaita"
 DocType: Employee Loan,Loan Amount,Paskolos suma
 DocType: Program Enrollment,Self-Driving Vehicle,Savęs Vairavimas automobiliai
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Tiekėjo rezultatų lentelė nuolatinė
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Eilutė {0}: bilis medžiagas prekė nerasta {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Eilutė {0}: bilis medžiagas prekė nerasta {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Iš viso skiriami lapai {0} negali būti mažesnė nei jau patvirtintų lapų {1} laikotarpiu
 DocType: Journal Entry,Accounts Receivable,gautinos
 ,Supplier-Wise Sales Analytics,Tiekėjas išmintingas Pardavimų Analytics &quot;
@@ -2186,7 +2228,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Tėvų kursai (palikti tuščią, jei tai ne dalis Pagrindinės žinoma)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Palikite tuščią, jei laikomas visų darbuotojų tipų"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Paskirstykite Mokesčiai remiantis
-apps/erpnext/erpnext/hooks.py +131,Timesheets,laiko apskaitos žiniaraščiai
+apps/erpnext/erpnext/hooks.py +140,Timesheets,laiko apskaitos žiniaraščiai
 DocType: HR Settings,HR Settings,HR Nustatymai
 DocType: Salary Slip,net pay info,neto darbo užmokestis informacijos
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Ši vertė yra atnaujinta pagal numatytą pardavimo kainoraštį.
@@ -2197,7 +2239,7 @@
 DocType: Patient,B Positive,B teigiamas
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Eilutės # {0}: Kiekis turi būti 1, kaip elementas yra ilgalaikio turto. Prašome naudoti atskirą eilutę daugkartiniam vnt."
 DocType: Leave Block List Allow,Leave Block List Allow,Palikite Blokuoti sąrašas Leisti
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr negali būti tuščias arba vietos
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr negali būti tuščias arba vietos
 DocType: Patient Medical Record,Patient Medical Record,Paciento medicinos ataskaita
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Grupė ne grupės
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sporto
@@ -2214,9 +2256,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,"Negali rasti keitimo kursą {0}, kad {1} rakto dienos {2}. Prašome sukurti valiutos keitykla įrašą rankiniu būdu"
 DocType: POS Profile,Price List,Kainoraštis
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} dabar numatytasis finansinius metus. Prašome atnaujinti savo naršyklę pakeitimas įsigaliotų.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Išlaidų Pretenzijos
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Išlaidų Pretenzijos
 DocType: Issue,Support,parama
 ,BOM Search,BOM Paieška
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.","Paskelbkite &quot;Sandėliuoju&quot; arba &quot;Nėra sandelyje&quot; centre, priklausomai nuo sandėlyje esančių atsargų."
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Uždarymo (atidarymas + suma)
 DocType: Vehicle,Fuel Type,degalų tipas
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Prašome nurodyti valiutą Company
@@ -2228,16 +2271,16 @@
 DocType: Healthcare Settings,Remind Before,Prisiminti anksčiau
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM Konversijos koeficientas yra reikalaujama iš eilės {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Eilutės # {0}: Informacinis dokumentas tipas turi būti vienas iš pardavimų užsakymų, pardavimo sąskaitoje-faktūroje ar žurnalo įrašą"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Eilutės # {0}: Informacinis dokumentas tipas turi būti vienas iš pardavimų užsakymų, pardavimo sąskaitoje-faktūroje ar žurnalo įrašą"
 DocType: Salary Component,Deduction,Atskaita
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Eilutės {0}: Nuo Laikas ir laiko yra privalomas.
 DocType: Stock Reconciliation Item,Amount Difference,suma skirtumas
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Prekė Kaina pridėta {0} kainoraštis {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Prekė Kaina pridėta {0} kainoraštis {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Prašome įvesti darbuotojo ID Šio pardavimo asmuo
 DocType: Territory,Classification of Customers by region,Klasifikacija klientams regione
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Skirtumas suma turi būti lygi nuliui
 DocType: Project,Gross Margin,bendroji marža
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Prašome įvesti Gamybos Elementą pirmas
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Prašome įvesti Gamybos Elementą pirmas
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Apskaičiuota bankas pareiškimas balansas
 DocType: Normal Test Template,Normal Test Template,Normalioji bandymo šablonas
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,neįgaliesiems vartotojas
@@ -2247,21 +2290,22 @@
 DocType: Salary Slip,Total Deduction,Iš viso išskaičiavimas
 ,Production Analytics,gamybos Analytics &quot;
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Tai pagrįsta operacijomis su šiuo pacientu. Išsamiau žr. Toliau pateiktą laiko juostą
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,kaina Atnaujinta
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,kaina Atnaujinta
 DocType: Employee,Date of Birth,Gimimo data
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Prekė {0} jau grįžo
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Finansiniai metai ** reiškia finansinius metus. Visi apskaitos įrašai ir kiti pagrindiniai sandoriai yra stebimi nuo ** finansiniams metams **.
 DocType: Opportunity,Customer / Lead Address,Klientas / Švino Adresas
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Tiekėjo rezultatų kortelės sąranka
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Įspėjimas: Neteisingas SSL sertifikatas nuo prisirišimo {0}
-DocType: Student Admission,Eligibility,Tinkamumas
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Vertinimo plano pavadinimas
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Įspėjimas: Neteisingas SSL sertifikatas nuo prisirišimo {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Laidai padėti jums gauti verslo, pridėti visus savo kontaktus ir daugiau kaip jūsų laidų"
 DocType: Production Order Operation,Actual Operation Time,Tikrasis veikimo laikas
 DocType: Authorization Rule,Applicable To (User),Taikoma (Vartotojas)
 DocType: Purchase Taxes and Charges,Deduct,atskaityti
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Darbo aprašymas
 DocType: Student Applicant,Applied,taikomas
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Iš naujo atidarykite
 DocType: Sales Invoice Item,Qty as per Stock UOM,Kiekis pagal vertybinių popierių UOM
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 Vardas
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specialūs simboliai, išskyrus &quot;-&quot;. &quot;,&quot; # &quot;, ir &quot;/&quot; neleidžiama pavadinimų seriją"
@@ -2273,7 +2317,7 @@
 DocType: Request for Quotation,Manufacturing Manager,gamybos direktorius
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serijos Nr {0} yra garantija net iki {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Splitas Važtaraštis į paketus.
-apps/erpnext/erpnext/hooks.py +98,Shipments,vežimas
+apps/erpnext/erpnext/hooks.py +107,Shipments,vežimas
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Visos skirtos sumos (Įmonės valiuta)
 DocType: Purchase Order Item,To be delivered to customer,Turi būti pristatytas pirkėjui
 DocType: BOM,Scrap Material Cost,Laužas medžiagų sąnaudos
@@ -2296,8 +2340,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Elemento variantų nustatymai
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Pasirinkite bendrovė ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Palikite tuščią, jei manoma, skirtų visiems departamentams"
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tipai darbo (nuolatinis, sutarčių, vidaus ir kt.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} yra privalomas punktas {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Tipai darbo (nuolatinis, sutarčių, vidaus ir kt.)"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} yra privalomas punktas {1}
 DocType: Process Payroll,Fortnightly,kas dvi savaitės
 DocType: Currency Exchange,From Currency,nuo valiuta
 DocType: Vital Signs,Weight (In Kilogram),Svoris (kilogramais)
@@ -2322,7 +2366,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Prašome spausti &quot;Generuoti grafiką&quot; gauti tvarkaraštį
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Įvyko klaidų trinant šiuos grafikus:
 DocType: Bin,Ordered Quantity,Užsakytas Kiekis
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",pvz &quot;Build įrankiai statybininkai&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",pvz &quot;Build įrankiai statybininkai&quot;
 DocType: Grading Scale,Grading Scale Intervals,Vertinimo skalė intervalai
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: apskaitos įrašas už {2} galima tik valiuta: {3}
 DocType: Production Order,In Process,Procese
@@ -2346,11 +2390,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Mokesčio mokėjimas
 DocType: Expense Claim Detail,Expense Claim Detail,Kompensuojamos Pretenzija detalės
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Trimis egzemplioriais tiekėjas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Prašome pasirinkti tinkamą sąskaitą
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Prašome pasirinkti tinkamą sąskaitą
 DocType: Item,Weight UOM,Svoris UOM
 DocType: Salary Structure Employee,Salary Structure Employee,"Darbo užmokesčio struktūrą, darbuotojų"
 DocType: Patient,Blood Group,Kraujo grupė
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,kol
 DocType: Course,Course Name,Kurso pavadinimas
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Vartotojai, kurie gali patvirtinti konkretaus darbuotojo atostogų prašymus"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Biuro įranga
@@ -2369,7 +2412,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Kainos nebus rodomas, jei Kainų sąrašas nenustatytas"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Prašome nurodyti šalį šio Pristatymo taisyklės arba patikrinti pasaulio Pristatymas
 DocType: Stock Entry,Total Incoming Value,Iš viso Priimamojo Vertė
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Debeto reikalingas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Debeto reikalingas
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Laiko apskaitos žiniaraščiai padėti sekti laiko, išlaidų ir sąskaitų už veiklose padaryti jūsų komanda"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pirkimo Kainų sąrašas
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Tiekimo rezultatų kortelės kintamųjų šablonai.
@@ -2379,7 +2422,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Mokėjimo suderinimas
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Prašome pasirinkti Incharge Asmens vardas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,technologija
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Iš viso nesumokėtas: {0}
+DocType: Hub Settings,Unregister from Hub,Išregistruoti iš &quot;Hub&quot;
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Iš viso nesumokėtas: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM svetainė Operacija
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,laiško su pasiūlymu
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Sukurti Materialieji prašymų (MRP) ir gamybos užsakymus.
@@ -2391,7 +2435,9 @@
 DocType: Physician Schedule Time Slot,To Time,laiko
 DocType: Authorization Rule,Approving Role (above authorized value),Patvirtinimo vaidmenį (virš įgalioto vertės)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Kreditas sąskaitos turi būti mokėtinos sąskaitos
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM rekursija: {0} negali būti tėvų ar vaikas {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Prašome pasirinkti Studentų priėmimą, kuris yra privalomas mokamam studento pareiškėjui"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM rekursija: {0} negali būti tėvų ar vaikas {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,"Pasirinkite kainoraštį, kad paskelbtumėte kainodarą"
 DocType: Production Order Operation,Completed Qty,užbaigtas Kiekis
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Dėl {0}, tik debeto sąskaitos gali būti susijęs su kitos kredito įrašą"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Kainų sąrašas {0} yra išjungtas
@@ -2404,39 +2450,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Serial numeriai reikalingi punkte {1}. Jūs sąlyga {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Dabartinis vertinimas Balsuok
 DocType: Item,Customer Item Codes,Klientų punktas kodai
+DocType: Training Event,Advance,Iš anksto
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,dar kartą pasikartoti.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Valiutų Pelnas / nuostolis
 DocType: Opportunity,Lost Reason,Pamiršote Priežastis
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Naujas adresas
 DocType: Quality Inspection,Sample Size,imties dydis
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Prašome įvesti Gavimas dokumentą
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Visos prekės jau išrašyta sąskaita
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Nurodykite tinkamą &quot;Nuo byloje Nr &#39;
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',Nurodykite tinkamą &quot;Nuo byloje Nr &#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Daugiau kaštų centrai gali būti grupėse, tačiau įrašai gali būti pareikštas ne grupės"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Vartotojai ir leidimai
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Gamybos užsakymų Sukurta: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Gamybos užsakymų Sukurta: {0}
 DocType: Branch,Branch,filialas
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Spausdinimo ir paviljonai
 DocType: Company,Total Monthly Sales,Bendras mėnesinis pardavimas
 DocType: Bin,Actual Quantity,Tikrasis Kiekis
 DocType: Shipping Rule,example: Next Day Shipping,Pavyzdys: Sekanti diena Pristatymas
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serijos Nr {0} nerastas
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Prenumerata buvo {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Prenumerata buvo {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Mokesčių tvarkaraščio programa
 DocType: Fee Schedule Program,Student Batch,Studentų Serija
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,"pasirinkite * iš &quot;tabVital Signs&quot;, kur pacientas = &#39;{0}&#39; užsisakykite pagal signs_date desc limit 1"
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Padaryti Studentas
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Min. Kategorija
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Jūs buvote pakviestas bendradarbiauti su projektu: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Gydytojas nėra {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Jūs buvote pakviestas bendradarbiauti su projektu: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Gydytojas nėra {0}
 DocType: Leave Block List Date,Block Date,Blokuoti data
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Pridėkite priskirto lauko prenumeratos identifikatorių doctype {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Tiekėjo pristatymo pastaba
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,taikyti Dabar
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,taikyti Dabar
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Faktinis Kiekis {0} / laukimo Kiekis {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Faktinis Kiekis {0} / laukimo Kiekis {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-komercija GSTIN
 DocType: Sales Order,Not Delivered,Nepristatytas
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Laukiama data negali būti prieš sandorio datą
 ,Bank Clearance Summary,Bankas Sąskaitų santrauka
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Kurkite ir tvarkykite savo dienos, savaitės ir mėnesio el suskaldyti."
 DocType: Appraisal Goal,Appraisal Goal,vertinimas tikslas
@@ -2444,12 +2491,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Pastatai
 DocType: Fee Schedule,Fee Structure,mokestis struktūra
 DocType: Timesheet Detail,Costing Amount,Sąnaudų dydis
-DocType: Student Admission,Application Fee,Paraiškos mokestis
+DocType: Student Admission Program,Application Fee,Paraiškos mokestis
 DocType: Process Payroll,Submit Salary Slip,Pateikti darbo užmokestį
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maxiumm nuolaida Prekės {0} yra {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Maxiumm nuolaida Prekės {0} yra {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importas į taros
 DocType: Sales Partner,Address & Contacts,Adresas ir kontaktai
 DocType: SMS Log,Sender Name,siuntėjas Vardas
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Rūšiuoti pagal kriterijus
 DocType: POS Profile,[Select],[Pasirinkti]
 DocType: Vital Signs,Blood Pressure (diastolic),Kraujo spaudimas (diastolinis)
 DocType: SMS Log,Sent To,Siunčiami į
@@ -2458,7 +2506,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Kitas Kontaktinė data negali būti praeityje
 DocType: Company,For Reference Only.,Tik nuoroda.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Gydytojas {0} negalimas {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Pasirinkite Serija Nėra
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Pasirinkite Serija Nėra
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Neteisingas {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,Informacinė investicija
@@ -2474,15 +2522,15 @@
 DocType: Normal Test Items,Require Result Value,Reikalauti rezultato vertės
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Byla Nr negali būti 0
 DocType: Item,Show a slideshow at the top of the page,Rodyti skaidrių peržiūrą į puslapio viršuje
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,parduotuvės
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,parduotuvės
 DocType: Project Type,Projects Manager,Projektų vadovas
 DocType: Serial No,Delivery Time,Pristatymo laikas
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Senėjimo remiantis
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Paskyrimas atšauktas
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Paskyrimas atšauktas
 DocType: Item,End of Life,Gyvenimo pabaiga
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Kelionė
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Nėra aktyvus arba numatytąjį darbo užmokesčio struktūrą ir darbuotojo {0} nerasta pagal nurodytą datą
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Kelionė
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Nėra aktyvus arba numatytąjį darbo užmokesčio struktūrą ir darbuotojo {0} nerasta pagal nurodytą datą
 DocType: Leave Block List,Allow Users,leisti vartotojams
 DocType: Purchase Order,Customer Mobile No,Klientų Mobilus Nėra
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,pasikartojančios
@@ -2491,12 +2539,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Atnaujinti Kaina
 DocType: Item Reorder,Item Reorder,Prekė Pertvarkyti
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Rodyti Pajamos Kuponas
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,perduoti medžiagą
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,perduoti medžiagą
 DocType: Fees,Send Payment Request,Siųsti mokėjimo užklausą
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Nurodykite operacijas, veiklos sąnaudas ir suteikti unikalią eksploatuoti ne savo operacijas."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Šis dokumentas yra virš ribos iki {0} {1} už prekę {4}. Darai dar {3} prieš patį {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Prašome nustatyti pasikartojančių po taupymo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Pasirinkite Keisti suma sąskaita
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Pasirinkite Keisti suma sąskaita
 DocType: Purchase Invoice,Price List Currency,Kainų sąrašas Valiuta
 DocType: Naming Series,User must always select,Vartotojas visada turi pasirinkti
 DocType: Stock Settings,Allow Negative Stock,Leiskite Neigiama Stock
@@ -2516,7 +2564,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Darbuotojas
 DocType: Sample Collection,Collected Time,Surinktas laikas
 DocType: Company,Sales Monthly History,Pardavimų mėnesio istorija
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Pasirinkite Serija
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Pasirinkite Serija
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} yra pilnai mokami
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Gyvybės ženklai
 DocType: Training Event,End Time,pabaigos laikas
@@ -2524,16 +2572,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Apmokėjimo Atskaitymai arba nuostolis
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standartinės sutarčių sąlygos pardavimo ar pirkimo.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Grupė kuponą
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Ar tikrai norite atšaukti šį susitikimą?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,pardavimų vamzdynų
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Prašome nustatyti numatytąją sąskaitą užmokesčių Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Reikalinga Apie
 DocType: Rename Tool,File to Rename,Failo pervadinti
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Prašome pasirinkti BOM už prekę eilutėje {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Prašome pasirinkti BOM už prekę eilutėje {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Sąskaita {0} nesutampa su kompanija {1} iš sąskaitos būdas: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Neapibūdintas BOM {0} neegzistuoja punkte {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Priežiūros planas {0} turi būti atšauktas prieš panaikinant šį pardavimo užsakymų
+DocType: POS Profile,Applicable for Users,Taikoma naudotojams
 DocType: Notification Control,Expense Claim Approved,Kompensuojamos Pretenzija Patvirtinta
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Pajamos Kuponas darbuotojo {0} jau sukurta per šį laikotarpį
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Pajamos Kuponas darbuotojo {0} jau sukurta per šį laikotarpį
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Farmacijos
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kaina įsigytų daiktų
 DocType: Selling Settings,Sales Order Required,Pardavimų užsakymų Reikalinga
@@ -2558,6 +2608,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,organizacija
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,organizacija
 DocType: BOM Update Tool,BOM Update Tool,BOM naujinimo įrankis
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Šalies paskyra nenurodyta, prašome nustatyti įmonės numatytąją banko sąskaitą"
 DocType: SG Creation Tool Course,Student Group Name,Studentų Grupės pavadinimas
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Mokesčių kūrimas
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Prašome įsitikinkite, kad jūs tikrai norite ištrinti visus šios bendrovės sandorius. Jūsų pagrindiniai duomenys liks kaip ji yra. Šis veiksmas negali būti atšauktas."
@@ -2566,29 +2617,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) negali būti didesnis nei planuota quanitity ({2}) Gamybos Užsakyti {3}
 DocType: Shipping Rule,Shipping Rule Label,Pristatymas taisyklė Etiketė
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,vartotojas Forumas
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Žaliavos negali būti tuščias.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Nepavyko atnaujinti atsargų, sąskaitos faktūros yra lašas laivybos elementą."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Žaliavos negali būti tuščias.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Nepavyko atnaujinti atsargų, sąskaitos faktūros yra lašas laivybos elementą."
 DocType: Lab Test Sample,Lab Test Sample,Laboratorinio bandinio pavyzdys
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Greita leidinys įrašas
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Jūs negalite keisti greitį, jei BOM minėta agianst bet kurį elementą"
+DocType: Restaurant,Invoice Series Prefix,Sąskaitų serijos prefiksas
 DocType: Employee,Previous Work Experience,Ankstesnis Darbo patirtis
 DocType: Stock Entry,For Quantity,dėl Kiekis
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Prašome įvesti planuojama Kiekis už prekę {0} ne eilės {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Prašome įvesti planuojama Kiekis už prekę {0} ne eilės {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} nebus pateiktas
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Prašymai daiktais.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Atskirų gamybos užsakymas bus sukurtas kiekvienos gatavo gero prekę nėra.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} turi būti neigiama grąžinimo dokumentą
 ,Minutes to First Response for Issues,Minučių iki Pirmosios atsakas klausimai
 DocType: Purchase Invoice,Terms and Conditions1,Taisyklės ir sąlygų1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,"Instituto pavadinimas, kurį nustatote šią sistemą."
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,"Instituto pavadinimas, kurį nustatote šią sistemą."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Apskaitos įrašas, užšaldyti iki šios datos, niekas negali padaryti / pakeisti įrašą, išskyrus žemiau nurodytą vaidmenį."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Prašome įrašyti dokumentą prieš generuoti priežiūros tvarkaraštį
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Paskutinė kaina atnaujinta visose BOM
 DocType: Fee Schedule,Successful,Sėkmingas
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,projekto statusas
 DocType: UOM,Check this to disallow fractions. (for Nos),Pažymėkite tai norėdami atmesti frakcijas. (Už Nr)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Buvo sukurtos naujos gamybos užsakymų:
-DocType: Student Admission,Naming Series (for Student Applicant),Pavadinimų serija (Studentų pareiškėjas)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Buvo sukurtos naujos gamybos užsakymų:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Pavadinimų serija (Studentų pareiškėjas)
 DocType: Delivery Note,Transporter Name,Vežėjas pavadinimas
 DocType: Authorization Rule,Authorized Value,įgaliotas Vertė
 DocType: BOM,Show Operations,Rodyti operacijos
@@ -2612,7 +2664,7 @@
 ,Employees working on a holiday,"Darbuotojai, dirbantys atostogų"
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Pažymėti dabartis
 DocType: Project,% Complete Method,% Visiškas būdas
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Narkotikai
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Narkotikai
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Priežiūra pradžios data negali būti iki pristatymo datos Serijos Nr {0}
 DocType: Production Order,Actual End Date,Tikrasis Pabaigos data
 DocType: BOM,Operating Cost (Company Currency),Operacinė Kaina (Įmonės valiuta)
@@ -2630,13 +2682,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Patvirtinimo vartotoją negali būti tas pats kaip vartotojas taisyklė yra taikoma
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Bazinis tarifas (pagal vertybinių popierių UOM)
 DocType: SMS Log,No of Requested SMS,Ne prašomosios SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Palikite be darbo užmokesčio nesutampa su patvirtintais prašymo suteikti atostogas įrašų
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Palikite be darbo užmokesčio nesutampa su patvirtintais prašymo suteikti atostogas įrašų
 DocType: Campaign,Campaign-.####,Kampanija-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Tolesni žingsniai
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Prašome pateikti nurodytus elementus ne į geriausias įmanomas normas
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Padaryti sąskaitą faktūrą
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto arti Galimybė po 15 dienų
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,"Įsigijimo užsakymai neleidžiami {0} dėl rodiklio, kuris yra {1}."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,"Įsigijimo užsakymai neleidžiami {0} dėl rodiklio, kuris yra {1}."
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,pabaigos metai
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Švinas%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Švinas%
@@ -2644,6 +2696,7 @@
 DocType: Vital Signs,Nutrition Values,Mitybos vertės
 DocType: Lab Test Template,Is billable,Apmokestinamas
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Reikia nustatyti Dr. {0} &quot;Gydytojų tvarkaraštis&quot; ir &quot;Laikas per susitikimą&quot;
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Trečioji šalis Platintojas / atstovas / Komisijos atstovas / filialo / perpardavinėtojas, kuris parduoda bendrovių produktus komisija."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} prieš Užsakymo {1}
 DocType: Patient,Patient Demographics,Paciento demografija
@@ -2684,7 +2737,7 @@
 DocType: Asset,Manual,vadovas
 DocType: Salary Component Account,Salary Component Account,Pajamos Sudėtinės paskyra
 DocType: Global Defaults,Hide Currency Symbol,Slėpti valiutos simbolį
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","pvz bankas, grynieji pinigai, kreditinės kortelės"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","pvz bankas, grynieji pinigai, kreditinės kortelės"
 DocType: Lead Source,Source Name,šaltinis Vardas
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Suaugusio kraujo spaudimo normalus palaikymas yra maždaug 120 mmHg sistolinis ir 80 mmHg diastolinis, sutrumpintas &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,kredito Pastaba
@@ -2703,16 +2756,16 @@
 DocType: Patient,Occupation,okupacija
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Eilutės {0}: pradžios data turi būti prieš End data
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Iš viso (Kiekis)
-DocType: Sales Invoice,This Document,Šis dokumentas
 DocType: Installation Note Item,Installed Qty,įdiegta Kiekis
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Tai gali būti dėl tam tikrų netinkamų el. Pašto adresų
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Pridėjote
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Mokymai rezultatas
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Mokymai rezultatas
 DocType: Purchase Invoice,Is Paid,yra mokama
 DocType: Salary Structure,Total Earning,Iš viso Pelningiausi
 DocType: Purchase Receipt,Time at which materials were received,"Laikas, per kurį buvo gauta medžiagos"
 DocType: Stock Ledger Entry,Outgoing Rate,Siunčiami Balsuok
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Organizacija filialas meistras.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Organizacija filialas meistras.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,arba
 DocType: Sales Order,Billing Status,atsiskaitymo būsena
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Pranešti apie problemą
@@ -2727,8 +2780,9 @@
 DocType: Notification Control,Sales Order Message,Pardavimų užsakymų pranešimas
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Numatytosios reikšmės, kaip kompanija, valiuta, einamuosius fiskalinius metus, ir tt"
 DocType: Payment Entry,Payment Type,Mokėjimo tipas
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Prašome pasirinkti partiją punktas {0}. Nepavyko rasti vieną partiją, kuri atitinka šį reikalavimą"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Prašome pasirinkti partiją punktas {0}. Nepavyko rasti vieną partiją, kuri atitinka šį reikalavimą"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Prašome pasirinkti partiją punktas {0}. Nepavyko rasti vieną partiją, kuri atitinka šį reikalavimą"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Prašome pasirinkti partiją punktas {0}. Nepavyko rasti vieną partiją, kuri atitinka šį reikalavimą"
+DocType: Hub Category,Parent Category,Tėvų kategorija
 DocType: Process Payroll,Select Employees,pasirinkite Darbuotojai
 DocType: Opportunity,Potential Sales Deal,Galimas Pardavimų Spręsti
 DocType: Complaint,Complaints,Skundai
@@ -2766,7 +2820,7 @@
 DocType: Bin,Reserved Quantity,reserved Kiekis
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,"Prašome įvesti galiojantį elektroninio pašto adresą,"
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,"Prašome įvesti galiojantį elektroninio pašto adresą,"
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Prašome pasirinkti prekę krepšelyje
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Prašome pasirinkti prekę krepšelyje
 DocType: Landed Cost Voucher,Purchase Receipt Items,Pirkimo kvito daiktai
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,PRITAIKYMAS formos
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,Įsiskolinimas
@@ -2776,15 +2830,15 @@
 DocType: Payment Request,Amount in customer's currency,Suma kliento valiuta
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,pristatymas
 DocType: Stock Reconciliation Item,Current Qty,Dabartinis Kiekis
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Pridėti tiekėjų
+DocType: Restaurant Menu,Restaurant Menu,Restorano meniu
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Ankstesnis
 DocType: Appraisal Goal,Key Responsibility Area,Pagrindinė atsakomybė Plotas
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Studentų Partijos padėti jums sekti lankomumo, vertinimai ir rinkliavos studentams"
 DocType: Payment Entry,Total Allocated Amount,Visos skirtos sumos
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Nustatykite numatytąjį inventoriaus sąskaitos už amžiną inventoriaus
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Nustatykite numatytąjį inventoriaus sąskaitos už amžiną inventoriaus
 DocType: Item Reorder,Material Request Type,Medžiaga Prašymas tipas
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural leidinys Įėjimo atlyginimus iš {0} ir {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage &quot;yra pilna, neišsaugojo"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage &quot;yra pilna, neišsaugojo"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Eilutės {0}: UOM konversijos faktorius yra privalomas
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Kambarių talpa
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,teisėjas
@@ -2823,16 +2877,18 @@
 DocType: Project,Task Completion,užduotis užbaigimas
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Nėra sandėlyje
 DocType: Appraisal,HR User,HR Vartotojas
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Mokesčiai ir rinkliavos Išskaityta
-apps/erpnext/erpnext/hooks.py +129,Issues,Problemos
+apps/erpnext/erpnext/hooks.py +138,Issues,Problemos
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Statusas turi būti vienas iš {0}
 DocType: Sales Invoice,Debit To,debeto
+DocType: Restaurant Menu Item,Restaurant Menu Item,Restorano meniu punktas
 DocType: Delivery Note,Required only for sample item.,Reikalinga tik imties elemento.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Tikrasis Kiekis Po Sandorio
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Ne darbo užmokestį rasti tarp {0} ir {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Ne darbo užmokestį rasti tarp {0} ir {1}
 ,Pending SO Items For Purchase Request,Kol SO daiktai įsigyti Užsisakyti
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,studentų Priėmimo
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} yra išjungtas
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,studentų Priėmimo
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} yra išjungtas
 DocType: Supplier,Billing Currency,atsiskaitymo Valiuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Labai didelis
@@ -2855,6 +2911,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Paminėkite nėra apsilankymų reikalingų
 DocType: Stock Settings,Default Valuation Method,Numatytasis vertinimo metodas
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,Rinkliava
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Atnaujinimas vyksta. Tai gali užtrukti.
 DocType: Vehicle Log,Fuel Qty,kuro Kiekis
 DocType: Production Order Operation,Planned Start Time,Planuojamas Pradžios laikas
 DocType: Course,Assessment,įvertinimas
@@ -2870,7 +2927,7 @@
 DocType: Price List,Price List Master,Kainų sąrašas magistras
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Visi pardavimo sandoriai gali būti pažymėti prieš kelis ** pardavėjai **, kad būtų galima nustatyti ir stebėti tikslus."
 ,S.O. No.,SO Nr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Prašome sukurti klientui Švinas {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Prašome sukurti klientui Švinas {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Pasirinkite pacientą
 DocType: Price List,Applicable for Countries,Taikoma šalių
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Parametro pavadinimas
@@ -2902,27 +2959,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Kompensuojamos / Skirtumas sąskaita ({0}) turi būti &quot;pelnas arba nuostolis&quot; sąskaita
 DocType: Project,Copied From,Nukopijuota iš
 DocType: Project,Copied From,Nukopijuota iš
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Vardas klaida: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Trūkumas
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Vardas klaida: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,Trūkumas
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} nėra susijęs su {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Lankomumas darbuotojo {0} jau yra pažymėtas
 DocType: Packing Slip,If more than one package of the same type (for print),Jeigu yra daugiau nei vienas paketas tos pačios rūšies (spausdinimui)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Nustatykite numatytąjį klientą Restoranų nustatymuose
 ,Salary Register,Pajamos Registruotis
 DocType: Warehouse,Parent Warehouse,tėvų sandėlis
 DocType: C-Form Invoice Detail,Net Total,grynasis Iš viso
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Numatytąją BOM ne punktą rasti {0} ir projekto {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Numatytąją BOM ne punktą rasti {0} ir projekto {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Apibrėžti įvairių paskolų tipų
 DocType: Bin,FCFS Rate,FCFS Balsuok
 DocType: Payment Reconciliation Invoice,Outstanding Amount,nesumokėtos sumos
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Laikas (min)
 DocType: Project Task,Working,darbo
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Akcijų eilę (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Finansiniai metai
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Finansiniai metai
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} nepriklauso Company {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,"Nepavyko spręsti {0} kriterijų rezultatų funkcijos. Įsitikinkite, kad formulė galioja."
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Kainuoti apie
 DocType: Healthcare Settings,Out Patient Settings,Išeikite paciento nustatymus
 DocType: Account,Round Off,suapvalinti
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Kiekis turi būti teigiamas
 ,Requested Qty,prašoma Kiekis
 DocType: Tax Rule,Use for Shopping Cart,Naudokite krepšelį
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Vertė {0} atributas {1} neegzistuoja taikomi tinkamos prekių ar paslaugų sąrašą Įgūdis vertes punkte {2}
@@ -2931,7 +2990,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Mokesčiai bus platinamas proporcingai remiantis punktas Kiekis arba sumos, kaip už savo pasirinkimą"
 DocType: Maintenance Visit,Purposes,Tikslai
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Atleast vienas punktas turi būti įrašomas neigiamas kiekio grąžinimo dokumentą
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Pridėti kursus
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacija {0} ilgiau nei bet kokiomis darbo valandų darbo vietos {1}, suskaidyti operaciją į kelių operacijų"
 ,Requested,prašoma
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,nėra Pastabos
@@ -2943,6 +3001,8 @@
 DocType: Employee Loan,Repaid/Closed,Grąžinama / Uždarymo
 DocType: Item,Total Projected Qty,Iš viso prognozuojama Kiekis
 DocType: Monthly Distribution,Distribution Name,platinimo Vardas
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Tiekėjas&gt; Tiekėjo tipas
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Prekės {0} neįvertinta, kuri reikalinga apskaitos įrašams atlikti {1} {2}. Jei objektas sandoriuos kaip nulinis vertinimo koeficiento elementas {1}, prašome paminėti tai {1} elemento lentelėje. Priešingu atveju, sukurkite gautą atsarginį sandorį elementui arba paminėkite vertinimo rodiklį elemento įraše, tada pabandykite pateikti / atšaukti šį įrašą"
 DocType: Course,Course Code,Dalyko kodas
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Kokybės inspekcija privalo už prekę {0}
 DocType: POS Settings,Use POS in Offline Mode,Naudokite POS neprisijungus
@@ -2953,14 +3013,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Tvarkyti Teritorija medį.
 DocType: Journal Entry Account,Sales Invoice,pardavimų sąskaita faktūra
 DocType: Journal Entry Account,Party Balance,šalis balansas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,Prašome pasirinkti Taikyti nuolaidą
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Prašome pasirinkti Taikyti nuolaidą
 DocType: Company,Default Receivable Account,Numatytasis Gautinos sąskaitos
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,"Sukurti Bank įrašas visos algos, mokamos už pirmiau pasirinktus kriterijus"
 DocType: Physician,Physician Schedule,Gydytojo tvarkaraštis
 DocType: Purchase Invoice,Deemed Export,Laikomas eksportas
 DocType: Stock Entry,Material Transfer for Manufacture,Medžiagos pernešimas gamybai
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Nuolaida procentas gali būti taikomas bet prieš kainoraštis arba visų kainų sąrašas.
-DocType: Purchase Invoice,Half-yearly,Kartą per pusmetį
+DocType: Subscription,Half-yearly,Kartą per pusmetį
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Apskaitos įrašas už Sandėlyje
 DocType: Lab Test,LabTest Approver,&quot;LabTest&quot; patvirtintojai
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Jūs jau įvertintas vertinimo kriterijus {}.
@@ -2989,13 +3049,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Papildomas Mažas
 DocType: Company,Standard Template,standartinį šabloną
 DocType: Training Event,Theory,teorija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Įspėjimas: Medžiaga Prašoma Kiekis yra mažesnis nei minimalus užsakymas Kiekis
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Įspėjimas: Medžiaga Prašoma Kiekis yra mažesnis nei minimalus užsakymas Kiekis
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Sąskaita {0} yra sušaldyti
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Juridinio asmens / Dukterinė įmonė su atskiru Chart sąskaitų, priklausančių organizacijos."
 DocType: Payment Request,Mute Email,Nutildyti paštas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Maistas, gėrimai ir tabako"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Gali tik sumokėti prieš Neapmokestinama {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Komisinis mokestis gali būti ne didesnė kaip 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Gali tik sumokėti prieš Neapmokestinama {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Komisinis mokestis gali būti ne didesnė kaip 100
 DocType: Stock Entry,Subcontract,subrangos sutartys
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Prašome įvesti {0} pirmas
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Nėra atsakymų
@@ -3013,10 +3073,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Spalva
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Vertinimo planas kriterijai
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Užkirsti kelią pirkimo užsakymams
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Jautrus
 DocType: Patient Appointment,Scheduled,planuojama
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Užklausimas.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prašome nustatyti darbuotojų pavadinimo sistemą žmogiškųjų išteklių&gt; HR nustatymai
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Prašome pasirinkti Elementą kur &quot;Ar riedmenys&quot; yra &quot;Ne&quot; ir &quot;Ar Pardavimų punktas&quot; yra &quot;Taip&quot; ir nėra jokio kito Prekės Rinkinys
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Pasirinkite klientą
 DocType: Student Log,Academic,akademinis
 DocType: Patient,Personal and Social History,Asmeninė ir socialinė istorija
 DocType: Fee Schedule,Fee Breakup for each student,Mokesčio perviršis kiekvienam studentui
@@ -3026,7 +3087,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Vertinimo Balsuok
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,dyzelinis
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Kainų sąrašas Valiuta nepasirinkote
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Kainų sąrašas Valiuta nepasirinkote
 apps/erpnext/erpnext/config/healthcare.py +46,Results,rezultatai
 ,Student Monthly Attendance Sheet,Studentų Mėnesio Lankomumas lapas
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Darbuotojų {0} jau yra kreipęsis dėl {1} tarp {2} ir {3}
@@ -3042,7 +3103,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Tvarkyti Pardavimų Partneriai.
 DocType: Quality Inspection,Inspection Type,Patikrinimo tipas
 DocType: Fee Validity,Visited yet,Aplankė dar
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Sandėliai su esamais sandoris negali būti konvertuojamos į grupę.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Sandėliai su esamais sandoris negali būti konvertuojamos į grupę.
 DocType: Assessment Result Tool,Result HTML,rezultatas HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Baigia galioti
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Pridėti Studentai
@@ -3069,7 +3130,7 @@
 DocType: Healthcare Settings,Result Printed,Rezultatas spausdintas
 DocType: Asset Category Account,Depreciation Expense Account,Nusidėvėjimo sąnaudos paskyra
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Bandomasis laikotarpis
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Peržiūrėti {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Peržiūrėti {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Tik lapų mazgai leidžiama sandorio
 DocType: Expense Claim,Expense Approver,Kompensuojamos Tvirtintojas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Eilutės {0}: Išankstinis prieš užsakovui turi būti kredito
@@ -3081,7 +3142,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Norėdami datetime
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Kursų tvarkaraštis išbraukiama:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Rąstai išlaikyti sms būsenos
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Nustatyti pardavimo tikslą
 DocType: Accounts Settings,Make Payment via Journal Entry,Atlikti mokėjimą per žurnalo įrašą
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Atspausdinta ant
 DocType: Item,Inspection Required before Delivery,Patikrinimo Reikalinga prieš Pristatymas
@@ -3089,7 +3149,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Kol veiklos
 DocType: Patient Appointment,Reminded,Primena
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Jūsų organizacija
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Jūsų organizacija
 DocType: Fee Component,Fees Category,Mokesčiai Kategorija
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Prašome įvesti malšinančių datą.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,amt
@@ -3101,7 +3161,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Pertvarkyti lygis
 DocType: Company,Chart Of Accounts Template,Sąskaitų planas Šablonas
 DocType: Attendance,Attendance Date,lankomumas data
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Prekė Kaina atnaujintas {0} kainoraštis {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Prekė Kaina atnaujintas {0} kainoraštis {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Pajamos Griauti remiantis uždirbti ir atskaitą.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Sąskaita su vaikų mazgų negali būti konvertuojamos į sąskaitų knygos
 DocType: Purchase Invoice Item,Accepted Warehouse,Priimamos sandėlis
@@ -3117,9 +3177,10 @@
 ,Employee Birthday,Darbuotojų Gimimo diena
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Studentų Serija Lankomumas įrankis
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,riba Crossed
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Suplanuotas iki
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital &quot;
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Akademinis terminas su šia &quot;Akademinio metų&quot; {0} ir &quot;Terminas Vardas&quot; {1} jau egzistuoja. Prašome pakeisti šiuos įrašus ir pabandykite dar kartą.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Kadangi yra esami sandoriai prieš {0} elementą, jūs negalite pakeisti vertę {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Kadangi yra esami sandoriai prieš {0} elementą, jūs negalite pakeisti vertę {1}"
 DocType: UOM,Must be Whole Number,Turi būti sveikasis skaičius
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Naujų lapų Pervedimaiį (dienomis)
 DocType: Purchase Invoice,Invoice Copy,sąskaitos kopiją
@@ -3129,7 +3190,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Sąskaitos numeris
 DocType: Shopping Cart Settings,Orders,Užsakymai
 DocType: Employee Leave Approver,Leave Approver,Palikite jį patvirtinusio
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Prašome pasirinkti partiją
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Prašome pasirinkti partiją
 DocType: Assessment Group,Assessment Group Name,Vertinimas Grupės pavadinimas
 DocType: Manufacturing Settings,Material Transferred for Manufacture,"Medžiagos, perduotos gamybai"
 DocType: Expense Claim,"A user with ""Expense Approver"" role",Vartotojas su &quot;išlaidų Tvirtintojas&quot; vaidmenį
@@ -3144,7 +3205,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Laikotarpis uždarymas Įėjimas
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Pasirinkite skyrių ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Kaina centras su esamais sandoriai negali būti konvertuojamos į grupės
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Suma {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Suma {0} {1} {2} {3}
 DocType: Account,Depreciation,amortizacija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Tiekėjas (-ai)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Darbuotojų dalyvavimas įrankis
@@ -3156,10 +3217,12 @@
 DocType: GL Entry,Voucher No,Bon Nėra
 ,Lead Owner Efficiency,Švinas Savininko efektyvumas
 ,Lead Owner Efficiency,Švinas Savininko efektyvumas
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Populiariausias
 DocType: Leave Allocation,Leave Allocation,Palikite paskirstymas
 DocType: Payment Request,Recipient Message And Payment Details,Gavėjas pranešimą ir Mokėjimo informacija
 DocType: Training Event,Trainer Email,treneris paštas
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Medžiaga Prašymai {0} sukūrė
+DocType: Restaurant Reservation,No of People,Žmonių skaičius
 DocType: Production Planning Tool,Include sub-contracted raw materials,Įtraukti SUBRANGOVAMS žaliavas
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Šablonas terminų ar sutarties.
 DocType: Purchase Invoice,Address and Contact,Adresas ir kontaktai
@@ -3168,10 +3231,11 @@
 DocType: Supplier,Last Day of the Next Month,Paskutinė diena iki kito mėnesio
 DocType: Support Settings,Auto close Issue after 7 days,Auto arti išdavimas po 7 dienų
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Palikite negali būti skiriama iki {0}, kaip atostogos balansas jau perkėlimo persiunčiami būsimos atostogos paskirstymo įrašo {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Pastaba: Dėl / Nuoroda data viršija leidžiama klientų kredito dienas iki {0} dieną (-ai)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Pastaba: Dėl / Nuoroda data viršija leidžiama klientų kredito dienas iki {0} dieną (-ai)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Studentų Pareiškėjas
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,Originalus GAVĖJAS
 DocType: Asset Category Account,Accumulated Depreciation Account,Sukauptas nusidėvėjimas paskyra
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Šis el. Laiškas yra automatiškai sukurtas
 DocType: Stock Settings,Freeze Stock Entries,Freeze Akcijų įrašai
 DocType: Program Enrollment,Boarding Student,internatinė Studentų
 DocType: Asset,Expected Value After Useful Life,Tikimasi Vertė Po naudingo tarnavimo
@@ -3179,7 +3243,7 @@
 DocType: Activity Cost,Billing Rate,atsiskaitymo Balsuok
 ,Qty to Deliver,Kiekis pristatyti
 ,Stock Analytics,Akcijų Analytics &quot;
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Operacijos negali būti paliktas tuščias
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Operacijos negali būti paliktas tuščias
 DocType: Maintenance Visit Purpose,Against Document Detail No,Su dokumentų Išsamiau Nėra
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Šalis tipas yra privalomi
 DocType: Quality Inspection,Outgoing,išeinantis
@@ -3202,7 +3266,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Pasirinkite studentai rankiniu veikla grindžiamo grupės
 DocType: Journal Entry,User Remark,vartotojas Pastaba
 DocType: Lead,Market Segment,Rinkos segmentas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Sumokėta suma negali būti didesnė nei visos neigiamos nesumokėtos sumos {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Sumokėta suma negali būti didesnė nei visos neigiamos nesumokėtos sumos {0}
 DocType: Supplier Scorecard Period,Variables,Kintamieji
 DocType: Employee Internal Work History,Employee Internal Work History,Darbuotojų vidaus darbo Istorija
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Uždarymo (dr)
@@ -3232,21 +3296,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Gaukite atnaujinimus
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Sąskaitos {2} nepriklauso Company {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Medžiaga Prašymas {0} atšauktas ar sustabdytas
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Palikite valdymas
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Palikite valdymas
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Grupė sąskaitų
 DocType: Sales Order,Fully Delivered,pilnai Paskelbta
 DocType: Lead,Lower Income,mažesnes pajamas
+DocType: Restaurant Order Entry,Current Order,Dabartinis užsakymas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Originalo ir vertimo sandėlis negali būti vienodi eilės {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Skirtumas paskyra turi būti turto / įsipareigojimų tipo sąskaita, nes tai sandėlyje Susitaikymas yra atidarymas įrašas"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Išmokėta suma negali būti didesnis nei paskolos suma {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Eikite į &quot;Programos&quot;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},"Pirkimo užsakymo numerį, reikalingą punkto {0}"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Gamybos Kad nebūtų sukurta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Gamybos Kad nebūtų sukurta
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Nuo data&quot; turi būti po &quot;Iki datos&quot;
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Nepavyksta pakeisti statusą kaip studentas {0} yra susijęs su studento taikymo {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Nepavyksta pakeisti statusą kaip studentas {0} yra susijęs su studento taikymo {1}
 DocType: Asset,Fully Depreciated,visiškai nusidėvėjusi
 ,Stock Projected Qty,Akcijų Numatoma Kiekis
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Klientų {0} nepriklauso projekto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Klientų {0} nepriklauso projekto {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Pažymėti Lankomumas HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Citatos yra pasiūlymų, pasiūlymai turite atsiųsti savo klientams"
 DocType: Sales Order,Customer's Purchase Order,Kliento Užsakymo
@@ -3257,8 +3322,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Prašome nustatyti Taškų nuvertinimai Užsakytas
 DocType: Supplier Scorecard Period,Calculations,Skaičiavimai
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Vertė arba Kiekis
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Productions pavedimai negali būti padidinta:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Productions pavedimai negali būti padidinta:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Minutė
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nustatymų seriją galite nustatyti {0} naudodami sąranką&gt; Nustatymai&gt; vardų serija
 DocType: Purchase Invoice,Purchase Taxes and Charges,Pirkimo mokesčius bei rinkliavas
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Eikite į tiekėjus
 ,Qty to Receive,Kiekis Gavimo
@@ -3272,7 +3338,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Kreditas sąskaitos turi būti balansas sąskaitos
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Visi Tiekėjo tipai
 DocType: Global Defaults,Disable In Words,Išjungti žodžiais
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Prekės kodas yra privalomas, nes prekės nėra automatiškai sunumeruoti"
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,"Prekės kodas yra privalomas, nes prekės nėra automatiškai sunumeruoti"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Citata {0} nėra tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Priežiūra Tvarkaraštis punktas
 DocType: Sales Order,%  Delivered,% Pristatyta
@@ -3294,23 +3360,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Atidarymas Balansas Akcijų
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Susitaikymas
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,likęs
 DocType: Appraisal,Appraisal,įvertinimas
 DocType: Purchase Invoice,GST Details,GST duomenys
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},Paštas išsiųstas tiekėjo {0}
+DocType: Item,Default Sales Unit of Measure,Numatytasis pardavimų matavimo vienetas
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data kartojamas
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Įgaliotas signataras
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Palikite Tvirtintojas turi būti vienas iš {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Sukurkite mokesčius
-DocType: Hub Settings,Seller Email,pardavėjas paštas
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Viso įsigijimo savikainą (per pirkimo sąskaitoje faktūroje)
 DocType: Training Event,Start Time,Pradžios laikas
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Pasirinkite Kiekis
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Pasirinkite Kiekis
 DocType: Customs Tariff Number,Customs Tariff Number,Muitų tarifo numeris
 DocType: Patient Appointment,Patient Appointment,Paciento paskyrimas
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Patvirtinimo vaidmuo gali būti ne tas pats kaip vaidmens taisyklė yra taikoma
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Atsisakyti Šis el.pašto Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Atsisakyti Šis el.pašto Digest
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Gaukite tiekėjų
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} nerasta {1} elementui
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Eikite į kursus
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Žinutė išsiųsta
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Sąskaita su vaikų mazgų negali būti nustatyti kaip knygoje
@@ -3323,11 +3392,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,"Medžiagos, perduotos gamybos"
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Sąskaita {0} neegzistuoja
 DocType: Project,Project Type,projekto tipas
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Ši užduotis yra vaiko užduotis. Negalite ištrinti šios užduotys.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Bet tikslas Kiekis arba planuojama suma yra privalomas.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Išlaidos įvairiose veiklos
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Daugiau rezultatų nebebus
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Išlaidos įvairiose veiklos
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Nustatymas įvykių {0}, nes pridedamas prie žemiau pardavėjai darbuotojas neturi naudotojo ID {1}"
 DocType: Timesheet,Billing Details,Atsiskaitymo informacija
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Originalo ir vertimo sandėlis turi skirtis
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Originalo ir vertimo sandėlis turi skirtis
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Neleidžiama atnaujinti akcijų sandorius senesnis nei {0}
 DocType: Purchase Invoice Item,PR Detail,PR detalės
 DocType: Sales Order,Fully Billed,pilnai Įvardintas
@@ -3354,7 +3425,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,pavedimu
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Viską Patikrink
 DocType: Vehicle Log,Invoice Ref,Sąskaitos faktūros Nuoroda
-DocType: Purchase Order,Recurring Order,pasikartojančios Užsakyti
 DocType: Company,Default Income Account,Numatytasis pajamų sąskaita
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Klientų grupė / Klientų
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Neuždara fiskalinių metų pelnas / nuostolis (kreditas)
@@ -3368,9 +3438,9 @@
 DocType: Patient,A Negative,Neigiamas
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Nieko daugiau parodyti.
 DocType: Lead,From Customer,nuo Klientui
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,ragina
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,ragina
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Produktas
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,partijos
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,partijos
 DocType: Project,Total Costing Amount (via Time Logs),Iš viso Sąnaudų suma (per laiko Įrašai)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Padaryti mokestį
 DocType: Purchase Order Item Supplied,Stock UOM,akcijų UOM
@@ -3395,7 +3465,7 @@
 DocType: School Settings,Current Academic Term,Dabartinis akademinės terminas
 DocType: School Settings,Current Academic Term,Dabartinis akademinės terminas
 DocType: Sales Order,Not Billed,ne Įvardintas
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Tiek Sandėlis turi priklausyti pati bendrovė
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Tiek Sandėlis turi priklausyti pati bendrovė
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,pridėjo dar neturi kontaktai.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Nusileido kaina kupono suma
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Vekseliai iškelti tiekėjų.
@@ -3412,8 +3482,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Leidinys sumokėjimas
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Studentų grupė
 DocType: Shopping Cart Settings,Quotation Series,citata serija
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Elementas egzistuoja to paties pavadinimo ({0}), prašome pakeisti elementą grupės pavadinimą ar pervardyti elementą"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Prašome pasirinkti klientui
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Elementas egzistuoja to paties pavadinimo ({0}), prašome pakeisti elementą grupės pavadinimą ar pervardyti elementą"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Prašome pasirinkti klientui
 DocType: C-Form,I,aš
 DocType: Company,Asset Depreciation Cost Center,Turto nusidėvėjimo išlaidos centras
 DocType: Sales Order Item,Sales Order Date,Pardavimų užsakymų data
@@ -3422,6 +3492,7 @@
 DocType: Assessment Plan,Assessment Plan,vertinimo planas
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Klientas {0} sukurtas.
 DocType: Stock Settings,Limit Percent,riba procentais
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Šiuo metu sandėlyje nėra sandėlyje
 ,Payment Period Based On Invoice Date,Mokėjimo periodas remiantis sąskaitos faktūros išrašymo data
 DocType: Sample Collection,No. of print,Spaudos numeris
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Trūksta Valiutų kursai už {0}
@@ -3477,13 +3548,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pilna darbo užmokestis - Iš viso išskaičiavimas - Paskolų grąžinimas
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,Dabartinis BOM ir Naujoji BOM negali būti tas pats
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Pajamos Kuponas ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Pajamos Kuponas ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Data nuo išėjimo į pensiją turi būti didesnis nei įstoti data
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,"Įvyko klaidų, o planavimas kursą:"
 DocType: Sales Invoice,Against Income Account,Prieš pajamų sąskaita
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Paskelbta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Prekė {0}: Užsakytas Kiekis {1} negali būti mažesnis nei minimalus užsakymo Kiekis {2} (apibrėžtą punktas).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Prekė {0}: Užsakytas Kiekis {1} negali būti mažesnis nei minimalus užsakymo Kiekis {2} (apibrėžtą punktas).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mėnesio pasiskirstymas procentais
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Prašau prisijungti kaip kitas vartotojas.
 DocType: Territory,Territory Targets,Teritorija tikslai
 DocType: Delivery Note,Transporter Info,transporteris Informacija
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Prašome nustatyti numatytąjį {0} įmonėje {1}
@@ -3491,13 +3563,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Tas pats tiekėjas buvo įrašytas kelis kartus
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Bendrasis pelnas / nuostolis
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Pirkimui užsakyti punktas Pateikiamas
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Įmonės pavadinimas negali būti Įmonės
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Įmonės pavadinimas negali būti Įmonės
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Laiškas vadovai dėl spausdinimo šablonus.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Pavadinimus spausdinimo šablonų pvz išankstinio mokėjimo sąskaitą.
 DocType: Program Enrollment,Walking,vaikščiojimas
 DocType: Student Guardian,Student Guardian,Studentų globėjas
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Vertinimo tipas mokesčiai negali pažymėta kaip įskaičiuota
 DocType: POS Profile,Update Stock,Atnaujinti sandėlyje
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,prenumeruojant
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Įvairūs UOM daiktų bus neteisinga (iš viso) Grynasis svoris vertės. Įsitikinkite, kad grynasis svoris kiekvieno elemento yra toje pačioje UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Balsuok
 DocType: Asset,Journal Entry for Scrap,Žurnalo įrašą laužo
@@ -3547,15 +3620,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Sistemos vartotojas (Prisijunk) adresas. Jei nustatyta, ji taps nutylėjimą visiems HR formas."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Nuo {1}
 DocType: Task,depends_on,priklauso nuo
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Kviečiame atnaujinti naujausią kainą visame medžiagų sąraše. Tai gali užtrukti kelias minutes.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Kviečiame atnaujinti naujausią kainą visame medžiagų sąraše. Tai gali užtrukti kelias minutes.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Pavadinimas naują paskyrą. Pastaba: nekurkite sąskaitas klientai ir tiekėjai
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Šalis protinga numatytasis adresas Šablonai
 DocType: Sales Order Item,Supplier delivers to Customer,Tiekėjas pristato Klientui
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Forma / Prekės / {0}) yra sandelyje
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Dėl / Nuoroda data negali būti po {0}
+,Sales Payment Summary,Pardavimų mokėjimo suvestinė
+DocType: Restaurant,Restaurant,Restoranas
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Dėl / Nuoroda data negali būti po {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Duomenų importas ir eksportas
 DocType: Patient,Account Details,Išsami paskyros informacija
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Studentai Surasta
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Studentai Surasta
 DocType: Medical Department,Medical Department,Medicinos skyrius
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Tiekėjo vertinimo rezultatų vertinimo kriterijai
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Sąskaita Siunčiamos data
@@ -3566,8 +3641,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Prašome pasirinkti Skelbimo data prieš pasirinkdami Šaliai
 DocType: Program Enrollment,School House,Mokykla Namas
 DocType: Serial No,Out of AMC,Iš AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Prašome pasirinkti Citatos
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Prašome pasirinkti Citatos
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Prašome pasirinkti Citatos
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Prašome pasirinkti Citatos
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Taškų nuvertinimai REZERVUOTA negali būti didesnis nei bendras skaičius nuvertinimai
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Padaryti Priežiūros vizitas
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,"Prašome susisiekti su vartotojo, kuris turi pardavimo magistras Manager {0} vaidmenį"
@@ -3575,7 +3650,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Įmonės (ne klientas ar tiekėjas) meistras.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,"Tai yra, remiantis šio mokinių lankomumą"
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Nėra Studentai
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Pridėti daugiau elementų arba atidaryti visą formą
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Pridėti daugiau elementų arba atidaryti visą formą
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Pristatymo Pastabos {0} turi būti atšauktas prieš panaikinant šį pardavimo užsakymų
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Eikite į &quot;Vartotojai&quot;
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Mokama suma + nurašyti suma negali būti didesnė nei IŠ VISO
@@ -3595,37 +3670,40 @@
 DocType: Fee Schedule,Fee Schedule,mokestis Tvarkaraštis
 DocType: Hub Settings,Publish Availability,Paskelbti Prieinamumas
 DocType: Company,Create Chart Of Accounts Based On,Sukurti sąskaitų planą remiantis
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Negalima konvertuoti į ne grupę. Vaikų užduotys egzistuoja.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Gimimo data negali būti didesnis nei dabar.
 ,Stock Ageing,akcijų senėjimas
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Studentų {0} egzistuoja nuo studento pareiškėjo {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Apvalinimo koregavimas (įmonės valiuta)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,darbo laiko apskaitos žiniaraštis
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,darbo laiko apskaitos žiniaraštis
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} &quot;{1}&quot; yra išjungta
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nustatyti kaip Open
 DocType: Cheque Print Template,Scanned Cheque,Nuskaityti čekis
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,"Siųsti automatinius laiškus Kontaktai, kaip pateikti sandorių."
 DocType: Timesheet,Total Billable Amount,Iš viso Apmokestinama suma
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,3 punktas
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Užsakymo įrašas
 DocType: Purchase Order,Customer Contact Email,Klientų Kontaktai El.paštas
 DocType: Warranty Claim,Item and Warranty Details,Punktas ir garantijos informacija
 DocType: Sales Team,Contribution (%),Indėlis (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Pastaba: mokėjimo įrašas nebus sukurtos nuo &quot;pinigais arba banko sąskaitos&quot; nebuvo nurodyta
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Projektas {0} jau egzistuoja
 DocType: Medical Department,Nursing User,Slaugos naudotojas
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,atsakomybė
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Pasibaigė šios citatos galiojimo laikotarpis.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Pasibaigė šios citatos galiojimo laikotarpis.
 DocType: Expense Claim Account,Expense Claim Account,Kompensuojamos Pretenzija paskyra
 DocType: Accounts Settings,Allow Stale Exchange Rates,Leisti nejudančius valiutų keitimo kursus
 DocType: Sales Person,Sales Person Name,Pardavimų Asmuo Vardas
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Prašome įvesti atleast 1 sąskaitą lentelėje
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Pridėti Vartotojai
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Pridėti Vartotojai
 DocType: POS Item Group,Item Group,Prekė grupė
 DocType: Item,Safety Stock,saugos kodas
 DocType: Healthcare Settings,Healthcare Settings,Sveikatos priežiūros nustatymai
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Pažanga% užduoties negali būti daugiau nei 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Pažanga% užduoties negali būti daugiau nei 100.
 DocType: Stock Reconciliation Item,Before reconciliation,prieš susitaikymo
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Norėdami {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Mokesčiai ir rinkliavos Pridėta (Įmonės valiuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Prekė Mokesčių eilutė {0} turi atsižvelgti tipo mokesčio ar pajamų ar sąnaudų arba Apmokestinimo
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Prekė Mokesčių eilutė {0} turi atsižvelgti tipo mokesčio ar pajamų ar sąnaudų arba Apmokestinimo
 DocType: Sales Order,Partly Billed,dalinai Įvardintas
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Prekė {0} turi būti ilgalaikio turto
 DocType: Item,Default BOM,numatytasis BOM
@@ -3641,6 +3719,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,kintamas
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Nuo važtaraštyje
 DocType: Student,Student Email Address,Studentų elektroninio pašto adresas
+DocType: Item,Hub Warehouse,&quot;Hub&quot; sandėlis
 DocType: Physician Schedule Time Slot,From Time,nuo Laikas
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Prekyboje:
 DocType: Notification Control,Custom Message,Pasirinktinis pranešimas
@@ -3649,9 +3728,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Studentų Adresas
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Studentų Adresas
 DocType: Purchase Invoice,Price List Exchange Rate,Kainų sąrašas Valiutų kursai
+DocType: POS Profile,POS Profile Name,POS profilio vardas
 DocType: Purchase Invoice Item,Rate,Kaina
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,internas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,adresas pavadinimas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,adresas pavadinimas
 DocType: Stock Entry,From BOM,nuo BOM
 DocType: Assessment Code,Assessment Code,vertinimas kodas
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,pagrindinis
@@ -3665,11 +3745,12 @@
 DocType: Salary Slip,Salary Structure,Pajamos struktūra
 DocType: Account,Bank,bankas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aviakompanija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,klausimas Medžiaga
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,klausimas Medžiaga
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Kuriant pakartotinai įvyko klaida
 DocType: Material Request Item,For Warehouse,Sandėliavimo
 DocType: Employee,Offer Date,Siūlau data
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,citatos
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,"Jūs esate neprisijungę. Jūs negalite įkelti, kol turite tinklą."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,"Jūs esate neprisijungę. Jūs negalite įkelti, kol turite tinklą."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Nėra Studentų grupės sukurta.
 DocType: Purchase Invoice Item,Serial No,Serijos Nr
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Mėnesio grąžinimo suma negali būti didesnė nei paskolos suma
@@ -3679,17 +3760,18 @@
 DocType: Salary Slip,Total Working Hours,Iš viso darbo valandų
 DocType: Subscription,Next Schedule Date,Kitas tvarkaraščio data
 DocType: Stock Entry,Including items for sub assemblies,Įskaitant daiktų sub asamblėjose
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Įveskite vertė turi būti teigiamas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,visos teritorijos
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Įveskite vertė turi būti teigiamas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,visos teritorijos
 DocType: Purchase Invoice,Items,Daiktai
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Studentų jau mokosi.
 DocType: Fiscal Year,Year Name,metai Vardas
 DocType: Process Payroll,Process Payroll,procesas Darbo užmokesčio
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Yra daugiau švenčių nei darbo dienas šį mėnesį.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Yra daugiau švenčių nei darbo dienas šį mėnesį.
 DocType: Product Bundle Item,Product Bundle Item,Prekės Rinkinys punktas
 DocType: Sales Partner,Sales Partner Name,Partneriai pardavimo Vardas
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Prašymas citatos
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Prašymas citatos
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimalus Sąskaitos faktūros suma
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hematologija
 DocType: Normal Test Items,Normal Test Items,Normalūs testo elementai
 DocType: Student Language,Student Language,Studentų kalba
 apps/erpnext/erpnext/config/selling.py +23,Customers,klientai
@@ -3701,10 +3783,11 @@
 DocType: Issue,Opening Time,atidarymo laikas
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"Iš ir į datas, reikalingų"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vertybinių popierių ir prekių biržose
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Numatytasis vienetas priemonė variantas &quot;{0}&quot; turi būti toks pat, kaip Šablonas &quot;{1}&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Numatytasis vienetas priemonė variantas &quot;{0}&quot; turi būti toks pat, kaip Šablonas &quot;{1}&quot;"
 DocType: Shipping Rule,Calculate Based On,Apskaičiuoti remiantis
 DocType: Delivery Note Item,From Warehouse,iš sandėlio
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,"Neturite prekių su Bill iš medžiagų, Gamyba"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,"Neturite prekių su Bill iš medžiagų, Gamyba"
+DocType: Restaurant,Default Customer,Numatytasis klientas
 DocType: Assessment Plan,Supervisor Name,priežiūros Vardas
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Nenurodykite, ar paskyrimas sukurtas tą pačią dieną"
 DocType: Program Enrollment Course,Program Enrollment Course,Programos Priėmimas kursai
@@ -3732,7 +3815,7 @@
 DocType: Payment Entry,Internal Transfer,vidaus perkėlimo
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Vaikų sąskaita egzistuoja šioje sąskaitoje. Jūs negalite trinti šią sąskaitą.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Bet tikslas Kiekis arba planuojama suma yra privalomi
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Nėra numatytąją BOM egzistuoja punkte {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Nėra numatytąją BOM egzistuoja punkte {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Prašome pasirinkti Skelbimo data pirmas
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Atidarymo data turėtų būti prieš uždarant data
 DocType: Leave Control Panel,Carry Forward,Tęsti
@@ -3768,6 +3851,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Iš viso dabartis
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,apskaitos ataskaitos
 DocType: Drug Prescription,Hour,valanda
+DocType: Restaurant Order Entry,Last Sales Invoice,Paskutinė pardavimo sąskaita faktūra
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nauja Serijos Nr negalite turime sandėlyje. Sandėlių turi nustatyti vertybinių popierių atvykimo arba pirkimo kvito
 DocType: Lead,Lead Type,Švinas tipas
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Jūs nesate įgaliotas tvirtinti lapus Block Datos
@@ -3804,65 +3888,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Sukurti Vartotojai
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,gramas
 DocType: Supplier Scorecard,Per Month,Per mėnesį
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,"Kiekis, Gamyba turi būti didesnis nei 0."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,"Kiekis, Gamyba turi būti didesnis nei 0."
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Aplankykite ataskaitą priežiūros skambučio.
 DocType: Stock Entry,Update Rate and Availability,Atnaujinti Įvertinti ir prieinamumas
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procentas jums leidžiama gauti arba pristatyti daugiau prieš užsakyto kiekio. Pavyzdžiui: Jei užsisakėte 100 vienetų. ir jūsų pašalpa yra 10%, tada jums yra leidžiama gauti 110 vienetų."
 DocType: POS Customer Group,Customer Group,Klientų grupė
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Nauja Serija kodas (neprivaloma)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Nauja Serija kodas (neprivaloma)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Nauja Serija kodas (neprivaloma)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Nauja Serija kodas (neprivaloma)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Kompensuojamos sąskaitos yra privalomas už prekę {0}
 DocType: BOM,Website Description,Interneto svetainė Aprašymas
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Grynasis pokytis nuosavo kapitalo
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Naujausias
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Prašome anuliuoti sąskaitą-faktūrą {0} pirmas
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Pašto adresas turi būti unikalus, jau egzistuoja {0}"
 DocType: Serial No,AMC Expiry Date,AMC Galiojimo data
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,gavimas
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,gavimas
 ,Sales Register,pardavimų Registruotis
 DocType: Daily Work Summary Settings Company,Send Emails At,Siųsti laiškus Šiuo
 DocType: Quotation,Quotation Lost Reason,Citata Pamiršote Priežastis
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Pasirinkite savo domeną
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',"pasirinkite * iš tabPatient, kur name = &#39;{0}&#39;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Operacijos identifikacinis ne {0} data {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Operacijos identifikacinis ne {0} data {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nėra nieko keisti.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Formos peržiūra
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Santrauka šį mėnesį ir laukiant veikla
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Formos peržiūra
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Santrauka šį mėnesį ir laukiant veikla
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Pridėkite naudotojų prie savo organizacijos, išskyrus save."
 DocType: Customer Group,Customer Group Name,Klientų Grupės pavadinimas
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Nėra Klientai dar!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Nėra Klientai dar!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Pinigų srautų ataskaita
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Paskolos suma negali viršyti maksimalios paskolos sumos iš {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,licencija
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Prašome pašalinti šioje sąskaitoje faktūroje {0} iš C formos {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Prašome pašalinti šioje sąskaitoje faktūroje {0} iš C formos {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Prašome pasirinkti perkelti skirtumą, jei taip pat norite įtraukti praėjusius finansinius metus balanso palieka šią fiskalinių metų"
 DocType: GL Entry,Against Voucher Type,Prieš čekių tipas
 DocType: Physician,Phone (R),Telefonas (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Laiko laiko intervalai pridedami
 DocType: Item,Attributes,atributai
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Įgalinti šabloną
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nustatymų seriją galite nustatyti {0} naudodami sąranką&gt; Nustatymai&gt; vardų serija
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Prašome įvesti nurašyti paskyrą
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Paskutinė užsakymo data
 DocType: Patient,B Negative,B Neigiamas
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Sąskaita {0} nėra siejamas su kompanijos {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Serijiniai numeriai {0} eilės nesutampa su Važtaraštis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Serijiniai numeriai {0} eilės nesutampa su Važtaraštis
 DocType: Student,Guardian Details,&quot;guardian&quot; informacija
 DocType: C-Form,C-Form,C-Forma
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Pažymėti Dalyvavimas kelių darbuotojų
 DocType: Vehicle,Chassis No,Važiuoklės Nėra
 DocType: Payment Request,Initiated,inicijuotas
 DocType: Production Order,Planned Start Date,Planuojama pradžios data
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Pasirinkite BOM
 DocType: Serial No,Creation Document Type,Kūrimas Dokumento tipas
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Pabaigos data turi būti didesnė už pradžios datą
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Pabaigos data turi būti didesnė už pradžios datą
 DocType: Leave Type,Is Encash,Ar inkasuoti
 DocType: Leave Allocation,New Leaves Allocated,Naujų lapų Paskirti
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projektų išmintingas duomenys nėra prieinami Citata
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Pabaiskite
 DocType: Project,Expected End Date,Tikimasi Pabaigos data
 DocType: Budget Account,Budget Amount,biudžeto dydis
 DocType: Appraisal Template,Appraisal Template Title,Vertinimas Šablonas Pavadinimas
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Nuo datos {0} Darbuotojo {1} gali būti ne anksčiau darbuotojo jungianti data {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,prekybos
 DocType: Patient,Alcohol Current Use,Alkoholio vartojimas
+DocType: Student Admission Program,Student Admission Program,Studentų priėmimo programa
 DocType: Payment Entry,Account Paid To,Sąskaita Paide
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Tėvų {0} Prekė turi būti ne riedmenys
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Visi produktus ar paslaugas.
@@ -3871,30 +3957,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} biudžetas paskyra {1} prieš {2} {3} yra {4}. Jis bus viršyti {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Eilutės {0} # sąskaita turi būti tipo &quot;ilgalaikio turto&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,iš Kiekis
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Taisyklės apskaičiuoti siuntimo sumą už pardavimą
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,ir nepakeista. Išjungta
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Serija yra privalomi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansinės paslaugos
 DocType: Student Sibling,Student ID,Studento pažymėjimas
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Veiklos rūšys Time Įrašai
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Tiekėjo el. Pašto adresas
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Veiklos rūšys Time Įrašai
 DocType: Tax Rule,Sales,pardavimų
 DocType: Stock Entry Detail,Basic Amount,bazinis dydis
 DocType: Training Event,Exam,Egzaminas
 DocType: Complaint,Complaint,Skundas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Sandėlių reikalingas akcijų punkte {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Sandėlių reikalingas akcijų punkte {0}
 DocType: Leave Allocation,Unused leaves,nepanaudoti lapai
 DocType: Patient,Alcohol Past Use,Alkoholio praeities vartojimas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,kr
 DocType: Tax Rule,Billing State,atsiskaitymo valstybė
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,perkėlimas
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Paduok sprogo BOM (įskaitant mazgus)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,perkėlimas
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Paduok sprogo BOM (įskaitant mazgus)
 DocType: Authorization Rule,Applicable To (Employee),Taikoma (Darbuotojų)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Terminas yra privalomi
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Terminas yra privalomi
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Taškinis atributas {0} negali būti 0
 DocType: Journal Entry,Pay To / Recd From,Apmokėti / Recd Nuo
 DocType: Naming Series,Setup Series,Sąranka serija
 DocType: Payment Reconciliation,To Invoice Date,Norėdami sąskaitos faktūros išrašymo data
 DocType: Supplier,Contact HTML,Susisiekite su HTML
 ,Inactive Customers,neaktyvūs Klientai
+DocType: Student Admission Program,Maximum Age,Didžiausias amžius
 DocType: Landed Cost Voucher,LCV,lengvųjų komercinių automobilių
 DocType: Landed Cost Voucher,Purchase Receipts,pirkimo kvitai
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Kaip kainodaros taisyklė yra taikoma?
@@ -3913,6 +4001,7 @@
 DocType: GL Entry,Remarks,Pastabos
 DocType: Payment Entry,Account Paid From,Sąskaita mokama iš
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Žaliavų punktas kodas
+DocType: Task,Parent Task,Tėvų užduotis
 DocType: Journal Entry,Write Off Based On,Nurašyti remiantis
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Padaryti Švinas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Spausdinti Kanceliarinės
@@ -3921,20 +4010,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Pajamos jau tvarkomi laikotarpį tarp {0} ir {1}, palikite taikymo laikotarpį negali būti tarp šios datos intervalą."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Įrengimas rekordas Serijos Nr
 DocType: Guardian Interest,Guardian Interest,globėjas Palūkanos
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Nustatykite POS sąskaitų faktūrų numatytasis vertes
 apps/erpnext/erpnext/config/hr.py +177,Training,mokymas
 DocType: Timesheet,Employee Detail,Darbuotojų detalės
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 E-mail ID
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 E-mail ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,Būsima data diena ir Pakartokite Mėnesio diena turi būti lygi
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Būsima data diena ir Pakartokite Mėnesio diena turi būti lygi
 DocType: Lab Prescription,Test Code,Bandymo kodas
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Nustatymai svetainės puslapyje
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},"Paraiškos dėl RFQ dėl {0} neleidžiamos, nes rezultatų rodymas yra {1}"
 DocType: Offer Letter,Awaiting Response,Laukiama atsakymo
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,virš
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Bendra suma {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Neteisingas atributas {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Bendra suma {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Neteisingas atributas {0} {1}
 DocType: Supplier,Mention if non-standard payable account,"Paminėkite, jei nestandartinis mokama sąskaita"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Tas pats daiktas buvo įvesta kelis kartus. {Sąrašas}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Prašome pasirinkti kitą nei &quot;visų vertinimo grupės&quot; įvertinimo grupė
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Eilutė {0}: reikalingas elementas {1}
 DocType: Training Event Employee,Optional,Neprivaloma
@@ -3957,13 +4046,15 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kaina centras yra privalomas punktas {2}
 DocType: Vehicle,Policy No,politikos Nėra
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Gauti prekes iš prekė Bundle
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Kadangi egzistuoja daiktas {0}, jūs negalite įjungti variantų nuosavybės"
 DocType: Asset,Straight Line,Tiesi linija
 DocType: Project User,Project User,Projektų Vartotojas
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,skilimas
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,skilimas
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,skilimas
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,skilimas
 DocType: GL Entry,Is Advance,Ar Išankstinis
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Lankomumas Iš data ir lankomumo data yra privalomi
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,"Prašome įvesti &quot;subrangos sutartis&quot;, nes taip ar ne"
+DocType: Item,Default Purchase Unit of Measure,Numatytasis pirkimo vienetas
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Paskutinis Bendravimas data
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Paskutinis Bendravimas data
 DocType: Sales Team,Contact No.,Kontaktinė Nr
@@ -3972,7 +4063,6 @@
 DocType: Production Order,Check if material transfer entry is not required,"Patikrinkite, ar medžiaga perdavimo įrašas nereikia"
 DocType: Production Order,Check if material transfer entry is not required,"Patikrinkite, ar medžiaga perdavimo įrašas nereikia"
 DocType: Program Enrollment Tool,Get Students From,Gauk Studentai iš
-DocType: Hub Settings,Seller Country,Pardavėjo šalis
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Paskelbti daiktai tinklalapyje
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Grupė jūsų mokiniai partijomis
 DocType: Authorization Rule,Authorization Rule,autorizacija taisyklė
@@ -3982,8 +4072,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Pardavimų Mokesčiai ir rinkliavos Šablonų
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Iš viso (kreditų)
 DocType: Repayment Schedule,Payment Date,Mokėjimo diena
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nauja Serija Kiekis
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nauja Serija Kiekis
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Nauja Serija Kiekis
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Nauja Serija Kiekis
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Drabužiai ir aksesuarai
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,"Nepavyko išspręsti svorio rezultatų funkcijos. Įsitikinkite, kad formulė galioja."
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Taškų ordino
@@ -4001,6 +4091,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Eilutės # {0}: Turto {1} negali būti pateikti, tai jau {2}"
 DocType: Tax Rule,Billing Country,atsiskaitymo Šalis
 DocType: Purchase Order Item,Expected Delivery Date,Numatomas pristatymo datos
+DocType: Restaurant Order Entry,Restaurant Order Entry,Restorano užsakymo įrašas
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debeto ir kredito nėra vienoda {0} # {1}. Skirtumas yra {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Reprezentacinės išlaidos
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Padaryti Material užklausa
@@ -4013,9 +4104,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Sąskaita su esamais sandoris negali būti išbrauktas
 DocType: Vehicle,Last Carbon Check,Paskutinis Anglies Atvykimas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,teisinės išlaidos
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Prašome pasirinkti kiekį ant eilėje
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Prašome pasirinkti kiekį ant eilėje
 DocType: Purchase Invoice,Posting Time,Siunčiamos laikas
 DocType: Timesheet,% Amount Billed,% Suma Įvardintas
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Laikas per susitikimą&quot; nebuvo nustatytas Dr {0}. Pridėkite jį gydytojo kapitonui.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,telefono išlaidas
 DocType: Sales Partner,Logo,logotipas
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Pažymėkite, jei norite priversti vartotoją prieš taupymo pasirinkti seriją. Nebus nutylėjimą, jei jums patikrinti tai."
@@ -4026,6 +4118,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Naujas klientas pajamos
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Kelionės išlaidos
 DocType: Maintenance Visit,Breakdown,Palaužti
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Pridėti priskirtą lauko prenumeratą doctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Sąskaita: {0} su valiutos: {1} negalima pasirinkti
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Atnaujinti BOM išlaidas automatiškai per planuotoją, remiantis naujausiu žaliavų įvertinimo / kainų sąrašo norma / paskutine pirkimo norma."
 DocType: Bank Reconciliation Detail,Cheque Date,čekis data
@@ -4050,7 +4143,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Iš viso Atsiskaitymo suma (per laiko Įrašai)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,tiekėjas ID
 DocType: Payment Request,Payment Gateway Details,Mokėjimo šliuzai detalės
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Kiekis turėtų būti didesnis už 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Kiekis turėtų būti didesnis už 0
 DocType: Journal Entry,Cash Entry,Pinigai įrašas
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Vaiko mazgai gali būti kuriamos tik pagal &quot;grupė&quot; tipo mazgų
 DocType: Leave Application,Half Day Date,Pusė dienos data
@@ -4068,12 +4161,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Pastaba: Prekės {0} įvesta kelis kartus
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Visi kontaktai.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Įmonės santrumpa
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Vartotojas {0} neegzistuoja
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Vartotojas {0} neegzistuoja
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,santrumpa
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Mokėjimo įrašas jau yra
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ne authroized nuo {0} viršija ribas
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Pajamos šablonas meistras.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Patologija
+DocType: Restaurant Order Entry,Restaurant Table,Restorano stalas
 DocType: Leave Type,Max Days Leave Allowed,Maksimalus dienų atostogas Leido
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Nustatyti Mokesčių taisyklė krepšelį
 DocType: Purchase Invoice,Taxes and Charges Added,Mokesčiai ir rinkliavos Pridėta
@@ -4085,10 +4180,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Citatos klientų ar.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Vaidmuo leidžiama redaguoti šaldytą žaliavą
 ,Territory Target Variance Item Group-Wise,Teritorija Tikslinė Dispersija punktas grupė-Išminčius
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Visi klientų grupėms
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Visi klientų grupėms
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,sukauptas Mėnesio
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} yra privalomas. Gal Valiutų įrašas nėra sukurtas {1} ir {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Mokesčių šablonas yra privalomi.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Mokesčių šablonas yra privalomi.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Sąskaita {0}: Tėvų sąskaitą {1} neegzistuoja
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Kainų sąrašas greitis (Įmonės valiuta)
 DocType: Products Settings,Products Settings,produktai Nustatymai
@@ -4114,13 +4209,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Prekė Išminčius Mokesčių detalės
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,institutas santrumpa
 ,Item-wise Price List Rate,Prekė išmintingas Kainų sąrašas Balsuok
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,tiekėjas Citata
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,tiekėjas Citata
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Žodžiais bus matomas, kai jūs išgelbėti citatos."
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Kiekis ({0}) negali būti iš eilės frakcija {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Kiekis ({0}) negali būti iš eilės frakcija {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Brūkšninis kodas {0} jau naudojamas prekės {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Brūkšninis kodas {0} jau naudojamas prekės {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Taisyklės pridedant siuntimo išlaidas.
 DocType: Item,Opening Stock,atidarymo sandėlyje
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Klientas turi
@@ -4138,9 +4233,8 @@
 DocType: Customer,From Lead,nuo švino
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Užsakymai išleido gamybai.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Pasirinkite fiskalinių metų ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,"POS profilis reikalaujama, kad POS įrašą"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,"POS profilis reikalaujama, kad POS įrašą"
 DocType: Program Enrollment Tool,Enroll Students,stoti Studentai
-DocType: Hub Settings,Name Token,vardas ženklas
 DocType: Lab Test,Approved Date,Patvirtinta data
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standartinė Parduodami
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Atleast vienas sandėlis yra privalomas
@@ -4158,7 +4252,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Žmogiškieji ištekliai
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Mokėjimo Susitaikymas Mokėjimo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,mokesčio turtas
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Gamybos užsakymas buvo {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Gamybos užsakymas buvo {0}
 DocType: BOM Item,BOM No,BOM Nėra
 DocType: Instructor,INS/,IP /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Žurnalo įrašą {0} neturi paskyros {1} arba jau suderinta su kitų kuponą
@@ -4178,8 +4272,8 @@
 DocType: Currency Exchange,To Currency,valiutos
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Leiskite šie vartotojai patvirtinti Leave Paraiškos bendrosios dienų.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Tipai sąskaita reikalavimą.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Pardavimo normą punkto {0} yra mažesnis nei {1}. Pardavimo kursas turėtų būti atleast {2}
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Pardavimo normą punkto {0} yra mažesnis nei {1}. Pardavimo kursas turėtų būti atleast {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Pardavimo normą punkto {0} yra mažesnis nei {1}. Pardavimo kursas turėtų būti atleast {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Pardavimo normą punkto {0} yra mažesnis nei {1}. Pardavimo kursas turėtų būti atleast {2}
 DocType: Item,Taxes,Mokesčiai
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Mokama ir nepareiškė
 DocType: Project,Default Cost Center,Numatytasis Kaina centras
@@ -4193,15 +4287,15 @@
 DocType: Employee Loan,Fully Disbursed,visiškai išmokėta
 DocType: Maintenance Visit,Customer Feedback,Klientų Atsiliepimai
 DocType: Account,Expense,išlaidos
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Rezultatas gali būti ne didesnis nei maksimalus įvertinimas
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Rezultatas gali būti ne didesnis nei maksimalus įvertinimas
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Klientai ir tiekėjai
 DocType: Item Attribute,From Range,nuo spektrui
 DocType: BOM,Set rate of sub-assembly item based on BOM,Nustatykite komponento surinkimo greitį pagal BOM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Sintaksės klaida formulei ar būklės: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Sintaksės klaida formulei ar būklės: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Dienos darbo santrauka Nustatymai Įmonės
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,"Prekė {0} ignoruojami, nes tai nėra sandėlyje punktas"
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Pateikti šios produkcijos Rūšiuoti tolesniam perdirbimui.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Pateikti šios produkcijos Rūšiuoti tolesniam perdirbimui.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Norėdami netaikoma kainodaros taisyklė konkrečiu sandoriu, visos taikomos kainodaros taisyklės turi būti išjungta."
 DocType: Assessment Group,Parent Assessment Group,Tėvų vertinimas Grupė
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Darbas
@@ -4218,12 +4312,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Prašome nustatyti Įmonės filtruoti tuščias, jei Grupuoti pagal tai &quot;kompanija&quot;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Siunčiamos data negali būti ateitis data
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Eilutės # {0}: Serijos Nr {1} nesutampa su {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,generuoti pasikartojančius
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Laisvalaikio atostogos
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Lab Test UOM.
 DocType: Batch,Batch ID,Serija ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Pastaba: {0}
 ,Delivery Note Trends,Važtaraštis tendencijos
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Šios savaitės suvestinė
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Šios savaitės suvestinė
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Sandėlyje Kiekis
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Sąskaita: {0} gali būti atnaujintas tik per vertybinių popierių sandorių
 DocType: Student Group Creation Tool,Get Courses,Gauk kursai
@@ -4237,7 +4332,6 @@
 DocType: Purchase Order,To Bill,Bill
 DocType: Material Request,% Ordered,% Užsakytas
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Kursą, pagrįstą studentų grupės, kurso bus patvirtintas kiekvienas studentas iš užprogramuoto kursai programoje registraciją."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Įveskite el atskirti kableliais, sąskaitos faktūros bus išsiųstas automatiškai konkrečią datą"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,vienetinį
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Vid. Ieško Balsuok
 DocType: Task,Actual Time (in Hours),Tikrasis laikas (valandomis)
@@ -4251,7 +4345,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Prekė {0} nėra setup Serijos Nr. Skiltis turi būti tuščias
 DocType: Accounts Settings,Accounts Settings,Sąskaitos Nustatymai
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,patvirtinti
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Nėra rezultato pateikti
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Nėra rezultato pateikti
 DocType: Customer,Sales Partner and Commission,Pardavimų partneris ir Komisija
 DocType: Employee Loan,Rate of Interest (%) / Year,Palūkanų norma (%) / metus
 ,Project Quantity,Projektų Kiekis
@@ -4263,55 +4357,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,juodas
 DocType: BOM Explosion Item,BOM Explosion Item,BOM sprogimo punktas
 DocType: Account,Auditor,auditorius
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} daiktai gaminami
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} daiktai gaminami
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Sužinoti daugiau
 DocType: Cheque Print Template,Distance from top edge,Atstumas nuo viršutinio krašto
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Kainų sąrašas {0} yra išjungtas arba neegzistuoja
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Kainų sąrašas {0} yra išjungtas arba neegzistuoja
 DocType: Purchase Invoice,Return,sugrįžimas
 DocType: Production Order Operation,Production Order Operation,Gamybos Užsakyti Operacija
 DocType: Pricing Rule,Disable,išjungti
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,mokėjimo būdas turi atlikti mokėjimą
 DocType: Project Task,Pending Review,kol apžvalga
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Paskyrimai ir konsultacijos
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nėra įtraukti į Serija {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nėra įtraukti į Serija {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Turto {0} negali būti sunaikintas, nes jis jau yra {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Bendras išlaidų pretenzija (per expense punktą)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Pažymėti Nėra
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Eilutės {0}: Valiuta BOM # {1} turi būti lygus pasirinkta valiuta {2}
 DocType: Journal Entry Account,Exchange Rate,Valiutos kursas
 DocType: Patient,Additional information regarding the patient,Papildoma informacija apie pacientą
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Pardavimų užsakymų {0} nebus pateiktas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Pardavimų užsakymų {0} nebus pateiktas
 DocType: Homepage,Tag Line,Gairė linija
 DocType: Fee Component,Fee Component,mokestis komponentas
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,laivyno valdymo
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Pridėti elementus iš
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,laivyno valdymo
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Pridėti elementus iš
 DocType: Cheque Print Template,Regular,reguliarus
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Iš viso weightage visų vertinimo kriterijai turi būti 100%
-DocType: BOM,Last Purchase Rate,Paskutinis užsakymo kaina
+DocType: Purchase Order Item,Last Purchase Rate,Paskutinis užsakymo kaina
 DocType: Account,Asset,Turtas
 DocType: Project Task,Task ID,užduoties ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Akcijų negali egzistuoti už prekę {0} nes turi variantus
 DocType: Lab Test,Mobile,Mobilus
 ,Sales Person-wise Transaction Summary,Pardavimų Asmuo išmintingas Sandorio santrauka
 DocType: Training Event,Contact Number,Kontaktinis telefono numeris
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Sandėlių {0} neegzistuoja
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registruotis Dėl ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Sandėlių {0} neegzistuoja
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mėnesio Paskirstymo Procentai
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Pasirinktas elementas negali turėti Serija
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Vertinimo rodiklis į {0} punkte, kurie privalo daryti apskaitos įrašus nerastas {1} {2}. Jei elementas yra santykiuose kaip imties elementą {1}, paminėkite, kad {1} punkto lentelėje. Priešingu atveju, prašome sukurti atvykstamąjį akcijų sandorį elemento arba paminėti vertinimo lygis Prekės įrašo, tada bandykite submiting / atšaukti šį įrašą"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Medžiagų pristatytas prieš šią važtaraštyje
+DocType: Training Event,Has Certificate,Turi sertifikatą
 DocType: Project,Customer Details,klientų informacija
 DocType: Employee,Reports to,Pranešti
 ,Unpaid Expense Claim,Nemokamos išlaidų Pretenzija
 DocType: Payment Entry,Paid Amount,sumokėta suma
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Naršyti pardavimo ciklą
 DocType: Assessment Plan,Supervisor,vadovas
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,Prisijunges
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,Prisijunges
 ,Available Stock for Packing Items,Turimas sandėlyje pakuoti prekės
 DocType: Item Variant,Item Variant,Prekė variantas
 DocType: Assessment Result Tool,Assessment Result Tool,Vertinimo rezultatas įrankis
 DocType: BOM Scrap Item,BOM Scrap Item,BOM laužas punktas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Pateikė užsakymai negali būti ištrintas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Pateikė užsakymai negali būti ištrintas
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Sąskaitos likutis jau debeto, jums neleidžiama nustatyti &quot;Balansas turi būti&quot; kaip &quot;Kreditas&quot;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,kokybės valdymas
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Prekė {0} buvo išjungta
@@ -4332,7 +4425,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Leiskite Zero Vertinimo Balsuok
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Leiskite Zero Vertinimo Balsuok
 DocType: Training Event Employee,Invited,kviečiami
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Keli darbuotojo {0} nerasta pagal nurodytą datų aktyvių Atlyginimo struktūros
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Keli darbuotojo {0} nerasta pagal nurodytą datų aktyvių Atlyginimo struktūros
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Parametrų Gateway sąskaitos.
 DocType: Employee,Employment Type,Užimtumas tipas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Ilgalaikis turtas
@@ -4344,7 +4437,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Studentų E-mail ID
 DocType: Employee,Notice (days),Pranešimas (dienų)
 DocType: Tax Rule,Sales Tax Template,Pardavimo mokestis Šablono
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Pasirinkite elementus išsaugoti sąskaitą faktūrą
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Pasirinkite elementus išsaugoti sąskaitą faktūrą
 DocType: Employee,Encashment Date,išgryninimo data
 DocType: Training Event,Internet,internetas
 DocType: Special Test Template,Special Test Template,Specialusis bandomasis šablonas
@@ -4354,7 +4447,7 @@
 DocType: Academic Term,Term Start Date,Kadencijos pradžios data
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,opp Grafas
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,opp Grafas
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Pridedamas {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Pridedamas {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Banko pažyma likutis vienam General Ledger
 DocType: Job Applicant,Applicant Name,Vardas pareiškėjas
 DocType: Authorization Rule,Customer / Item Name,Klientas / Prekės pavadinimas
@@ -4374,7 +4467,7 @@
 DocType: Guardian,Guardian Of ,sergėtojos
 DocType: Grading Scale Interval,Threshold,Slenkstis
 DocType: BOM Update Tool,Current BOM,Dabartinis BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Pridėti Serijos Nr
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Pridėti Serijos Nr
 DocType: Production Order Item,Available Qty at Source Warehouse,Turimas Kiekis prie šaltinio Warehouse
 apps/erpnext/erpnext/config/support.py +22,Warranty,garantija
 DocType: Purchase Invoice,Debit Note Issued,Debeto Pastaba Išduotas
@@ -4397,10 +4490,9 @@
 DocType: Account,Receivable,gautinos
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Eilutės # {0}: Neleidžiama keisti tiekėjo Užsakymo jau egzistuoja
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Vaidmenį, kurį leidžiama pateikti sandorius, kurie viršija nustatytus kredito limitus."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Pasirinkite prekę Gamyba
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Master Data sinchronizavimą, tai gali užtrukti šiek tiek laiko"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Pasirinkite prekę Gamyba
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Master Data sinchronizavimą, tai gali užtrukti šiek tiek laiko"
 DocType: Item,Material Issue,medžiaga išdavimas
-DocType: Hub Settings,Seller Description,pardavėjas Aprašymas
 DocType: Employee Education,Qualification,kvalifikacija
 DocType: Item Price,Item Price,Prekė Kaina
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,"Muilas, skalbimo"
@@ -4408,7 +4500,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Nuo laikas negali būti didesnis nei laiko.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Filmavimo ir vaizdo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Užsakytas
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Tęsti
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Tęsti
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Jei įjungta, sistema nepakeis variantų laukų iš šablono, bet kopijuos žemiau nurodytų laukų duomenis, kai sukurs naują variantą"
 DocType: Salary Detail,Component,Komponentas
 DocType: Assessment Criteria,Assessment Criteria Group,Vertinimo kriterijai grupė
 DocType: Healthcare Settings,Patient Name By,Paciento vardas
@@ -4418,7 +4511,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Prašome įvesti patvirtinimo vaidmuo arba patvirtinimo vartotoją
 DocType: Journal Entry,Write Off Entry,Nurašyti įrašą
 DocType: BOM,Rate Of Materials Based On,Norma medžiagų pagrindu
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Tiekėjas&gt; Tiekėjo tipas
+DocType: Item Variant Settings,Do not Update Variants,Negalima atnaujinti variantų
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,paramos Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Nuimkite visus
 DocType: POS Profile,Terms and Conditions,Terminai ir sąlygos
@@ -4427,7 +4520,7 @@
 DocType: Leave Block List,Applies to Company,Taikoma Company
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,"Negali atšaukti, nes pateiktas sandėlyje Įėjimo {0} egzistuoja"
 DocType: Employee Loan,Disbursement Date,išmokėjimas data
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&quot;Gavėjai&quot; nenurodyta
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&quot;Gavėjai&quot; nenurodyta
 DocType: BOM Update Tool,Update latest price in all BOMs,Atnaujinkite naujausią kainą visose BOM
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Medicininis įrašas
 DocType: Vehicle,Vehicle,transporto priemonė
@@ -4443,14 +4536,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Švinas%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Turto Nusidėvėjimas ir likučiai
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Suma {0} {1} perkeliamas iš {2} į {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Suma {0} {1} perkeliamas iš {2} į {3}
 DocType: Sales Invoice,Get Advances Received,Gauti gautų išankstinių
 DocType: Email Digest,Add/Remove Recipients,Įdėti / pašalinti gavėjus
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Sandorio neleidžiama prieš nutraukė gamybą Užsakyti {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Norėdami nustatyti šią fiskalinių metų kaip numatytąjį, spustelėkite ant &quot;Set as Default&quot;"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,prisijungti
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,prisijungti
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,trūkumo Kiekis
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Prekė variantas {0} egzistuoja pačių savybių
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Prekė variantas {0} egzistuoja pačių savybių
 DocType: Employee Loan,Repay from Salary,Grąžinti iš Pajamos
 DocType: Leave Application,LAP/,juosmens /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},"Prašančioji mokėjimą nuo {0} {1} už sumą, {2}"
@@ -4463,7 +4556,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Pardavimų užsakymų punktas
 DocType: Salary Slip,Payment Days,Atsiskaitymo diena
 DocType: Patient,Dormant,neveikiantis
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Sandėliai su vaikų mazgų negali būti konvertuojamos į sąskaitų knygos
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Sandėliai su vaikų mazgų negali būti konvertuojamos į sąskaitų knygos
 DocType: BOM,Manage cost of operations,Tvarkyti išlaidas operacijoms
 DocType: Accounts Settings,Stale Days,Pasenusios dienos
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Kai bet kuri iš patikrintų sandorių &quot;Pateikė&quot;, elektroninio pašto Iššokantis automatiškai atidaryti siųsti el.laišką susijusios &quot;Kontaktai&quot; toje sandorio su sandoriu kaip priedą. Vartotojas gali arba negali siųsti laišką."
@@ -4477,10 +4570,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serijos Nr {0} jau gavo
 ,Requested Items To Be Transferred,Pageidaujami daiktai turi būti perkeltos
 DocType: Expense Claim,Vehicle Log,Automobilio Prisijungti
-DocType: Purchase Invoice,Recurring Id,pasikartojančios ID
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Karščiavimas (temperatūra&gt; 38,5 ° C / 101,3 ° F arba išlaikoma temperatūra&gt; 38 ° C / 100,4 ° F)"
 DocType: Customer,Sales Team Details,Sales Team detalės
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Ištrinti visam laikui?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Ištrinti visam laikui?
 DocType: Expense Claim,Total Claimed Amount,Iš viso ieškinių suma
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Galimas galimybės pardavinėti.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Neteisingas {0}
@@ -4490,7 +4582,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Universalinės parduotuvės
 ,Item Delivery Date,Prekės pristatymo data
 DocType: Warehouse,PIN,PIN kodas
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Nustatykite savo mokykla ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Nustatykite savo mokykla ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Bazinė Pakeisti Suma (Įmonės valiuta)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Nieko apskaitos įrašai šiuos sandėlius
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Išsaugoti dokumentą pirmas.
@@ -4502,13 +4594,12 @@
 DocType: Task,Is Milestone,Ar Milestone
 DocType: Daily Work Summary,Email Sent To,Paštas siunčiami
 DocType: Budget,Warn,įspėti
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Ar tikrai norite atsisakyti registracijos?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bet koks kitas pastabas, pažymėtina pastangų, kad reikia eiti į apskaitą."
 DocType: BOM,Manufacturing User,gamyba Vartotojas
 DocType: Purchase Invoice,Raw Materials Supplied,Žaliavos Pateikiamas
-DocType: Purchase Invoice,Recurring Print Format,Pasikartojančios Spausdinti Formatas
 DocType: C-Form,Series,serija
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Kainų sąrašo {0} valiuta turi būti {1} arba {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Pridėti produktus
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Kainų sąrašo {0} valiuta turi būti {1} arba {2}
 DocType: Appraisal,Appraisal Template,vertinimas Šablono
 DocType: Item Group,Item Classification,Prekė klasifikavimas
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Verslo plėtros vadybininkas
@@ -4522,7 +4613,7 @@
 DocType: Item Attribute Value,Attribute Value,Pavadinimas Reikšmė
 ,Itemwise Recommended Reorder Level,Itemwise Rekomenduojama Pertvarkyti lygis
 DocType: Salary Detail,Salary Detail,Pajamos detalės
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Prašome pasirinkti {0} pirmas
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Prašome pasirinkti {0} pirmas
 DocType: Appointment Type,Physician,Gydytojas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Serija {0} punkto {1} yra pasibaigęs.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Konsultacijos
@@ -4533,7 +4624,7 @@
 DocType: Salary Detail,Default Amount,numatytasis dydis
 DocType: Lab Test Template,Descriptive,Apibūdinamasis
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Sandėlių nerastas sistemos
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Šio mėnesio suvestinė
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Šio mėnesio suvestinė
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kokybės inspekcija skaitymas
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,&quot;Freeze Atsargos Senesni Than` turėtų būti mažesnis nei% d dienų.
 DocType: Tax Rule,Purchase Tax Template,Pirkimo Mokesčių šabloną
@@ -4556,12 +4647,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Mokymo Renginiai / Rezultatai
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Sukauptas nusidėvėjimas nuo
 DocType: Sales Invoice,C-Form Applicable,"C-formos, taikomos"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Operacijos metu turi būti didesnis nei 0 darbui {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Operacijos metu turi būti didesnis nei 0 darbui {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Sandėlių yra privalomi
 DocType: Supplier,Address and Contacts,Adresas ir kontaktai
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM konversijos detalės
 DocType: Program,Program Abbreviation,programos santrumpa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Gamybos nurodymas negali būti iškeltas prieš Prekės Šablonas
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Gamybos nurodymas negali būti iškeltas prieš Prekės Šablonas
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Mokesčiai yra atnaujinama pirkimo kvitą su kiekvieno elemento
 DocType: Warranty Claim,Resolved By,sprendžiami
 DocType: Bank Guarantee,Start Date,Pradžios data
@@ -4587,27 +4678,28 @@
 DocType: Employee,Educational Qualification,edukacinė kvalifikacija
 DocType: Workstation,Operating Costs,Veiklos sąnaudos
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Veiksmų, jei sukauptos mėnesio biudžetas Viršytas"
-DocType: Purchase Invoice,Submit on creation,Pateikti steigti
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Valiuta {0} turi būti {1}
+DocType: Subscription,Submit on creation,Pateikti steigti
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Valiuta {0} turi būti {1}
 DocType: Asset,Disposal Date,Atliekų data
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Laiškai bus siunčiami į visus aktyvius bendrovės darbuotojams už tam tikrą valandą, jei jie neturi atostogų. Atsakymų santrauka bus išsiųstas vidurnaktį."
 DocType: Employee Leave Approver,Employee Leave Approver,Darbuotojų atostogos Tvirtintojas
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Eilutės {0}: an Pertvarkyti įrašas jau yra šiam sandėlį {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Negali paskelbti, kad prarastas, nes Citata buvo padaryta."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Mokymai Atsiliepimai
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Eilutės {0}: an Pertvarkyti įrašas jau yra šiam sandėlį {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Negali paskelbti, kad prarastas, nes Citata buvo padaryta."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Mokymai Atsiliepimai
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Gamybos Užsakyti {0} turi būti pateiktas
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Tiekėjo rezultatų vertinimo kriterijai
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Prašome pasirinkti pradžios ir pabaigos data punkte {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},"Žinoma, yra privalomi eilės {0}"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Iki šiol gali būti ne anksčiau iš dienos
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc dokumentų tipas
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Įdėti / Redaguoti kainas
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Įdėti / Redaguoti kainas
 DocType: Batch,Parent Batch,tėvų Serija
 DocType: Batch,Parent Batch,tėvų Serija
 DocType: Cheque Print Template,Cheque Print Template,Čekis Spausdinti Šablono
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Schema sąnaudų centrams
 DocType: Lab Test Template,Sample Collection,Pavyzdžių rinkinys
 ,Requested Items To Be Ordered,Pageidaujami Daiktai nurodoma padengti
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Mano įsakymai
 DocType: Price List,Price List Name,Kainų sąrašas vardas
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Kasdieniniame darbe santrauka {0}
 DocType: Employee Loan,Totals,sumos
@@ -4626,12 +4718,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} vienetai {1} reikia {2} į {3} {4} ir {5} užbaigti šį sandorį.
 DocType: Fee Schedule,Student Category,Studentų Kategorija
 DocType: Announcement,Student,Studentas
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Organizavimo skyrius (departamentas) meistras.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Organizavimo skyrius (departamentas) meistras.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Eikite į kambarius
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Prašome įvesti žinutę prieš išsiunčiant
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,DUBLIKATAS tiekėjas
 DocType: Email Digest,Pending Quotations,kol Citatos
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Point-of-Sale profilis
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Point-of-Sale profilis
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Lab testo konfigūracijos.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,neužtikrintas paskolas
 DocType: Cost Center,Cost Center Name,Kainuos centras vardas
@@ -4641,6 +4733,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Visų mokamų Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Žinutės didesnis nei 160 simboliai bus padalintas į keletą pranešimų
 DocType: Purchase Receipt Item,Received and Accepted,Gavo ir patvirtino
+DocType: Hub Settings,Company and Seller Profile,Įmonės ir pardavėjo profilis
 ,GST Itemised Sales Register,"Paaiškėjo, kad GST Detalios Pardavimų Registruotis"
 ,Serial No Service Contract Expiry,Serijos Nr Paslaugų sutarties galiojimo pabaigos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Jūs negalite Kredito ir debeto pačią sąskaitą tuo pačiu metu
@@ -4650,10 +4743,11 @@
 DocType: Item,Variant Based On,Variantas remiantis
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Iš viso weightage priskirti turi būti 100%. Ji yra {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Jūsų tiekėjai
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Prašome ištaisyti
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Negalima nustatyti kaip Pamiršote nes yra pagamintas pardavimų užsakymų.
 DocType: Request for Quotation Item,Supplier Part No,Tiekėjas partijos nr
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Negali atskaityti, kai kategorija skirta &quot;Vertinimo&quot; arba &quot;Vaulation ir viso&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Gautas nuo
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Gautas nuo
 DocType: Lead,Converted,Perskaičiuotas
 DocType: Item,Has Serial No,Turi Serijos Nr
 DocType: Employee,Date of Issue,Išleidimo data
@@ -4661,7 +4755,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Kaip už pirkimo parametrus, jei pirkimas Čekio Reikalinga == &quot;Taip&quot;, tada sukurti sąskaitą-faktūrą, vartotojo pirmiausia reikia sukurti pirkimo kvitą už prekę {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Eilutės # {0}: Nustatykite Tiekėjas už prekę {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Eilutės {0}: valandos vertė turi būti didesnė už nulį.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Interneto svetainė Paveikslėlis {0} pridedamas prie punkto {1} negali būti rastas
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Interneto svetainė Paveikslėlis {0} pridedamas prie punkto {1} negali būti rastas
 DocType: Issue,Content Type,turinio tipas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Kompiuteris
 DocType: Item,List this Item in multiple groups on the website.,Sąrašas šį Elementą keliomis grupėmis svetainėje.
@@ -4672,14 +4766,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Gauk Unreconciled įrašai
 DocType: Payment Reconciliation,From Invoice Date,Iš sąskaitos faktūros išrašymo data
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Jūs neturite leidimo pateikti
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,Atsiskaitymo valiuta turi būti lygi arba numatytosios comapany anketa valiutos arba asmens sąskaita valiuta
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Atsiskaitymo valiuta turi būti lygi arba numatytosios comapany anketa valiutos arba asmens sąskaita valiuta
 DocType: Healthcare Settings,Laboratory Settings,Laboratoriniai nustatymai
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Palikite išgryninimo
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Ką tai daro?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,į sandėlį
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Visi Studentų Priėmimo
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Ką tai daro?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,į sandėlį
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Visi Studentų Priėmimo
 ,Average Commission Rate,Vidutinis Komisija Balsuok
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Ar Serijos ne&quot; negali būti &quot;Taip&quot; už NON-STOCK punktą
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Ar Serijos ne&quot; negali būti &quot;Taip&quot; už NON-STOCK punktą
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Pasirinkite būseną
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Dalyvavimas negali būti ženklinami ateities datas
 DocType: Pricing Rule,Pricing Rule Help,Kainodaros taisyklė Pagalba
@@ -4697,41 +4791,41 @@
 DocType: Item,Customer Code,Kliento kodas
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Gimimo diena priminimas {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dienas nuo paskutinė užsakymo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Debeto sąskaitą turi būti balansas sąskaitos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Debeto sąskaitą turi būti balansas sąskaitos
 DocType: Buying Settings,Naming Series,Pavadinimų serija
 DocType: Leave Block List,Leave Block List Name,Palikite blokuojamų sąrašą pavadinimas
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Draudimo pradžios data turėtų būti ne mažesnė nei draudimo pabaigos data
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Nustatykite Instruktorių pavadinimo sistemą mokykloje&gt; Mokyklos nustatymai
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Akcijų turtas
 DocType: Timesheet,Production Detail,Gamybos detalės
+DocType: Restaurant,Active Menu,Aktyvus meniu
 DocType: Target Detail,Target Qty,Tikslinė Kiekis
 DocType: Shopping Cart Settings,Checkout Settings,Vykdyti Nustatymai
 DocType: Attendance,Present,Pateikti
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Važtaraštis {0} negali būti pateikta
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Važtaraštis {0} negali būti pateikta
 DocType: Notification Control,Sales Invoice Message,Pardavimų sąskaita faktūra pranešimas
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Uždarymo Narystė {0} turi būti tipo atsakomybės / nuosavas kapitalas
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Pajamos Kuponas darbuotojo {0} jau sukurta laiko lape {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Pajamos Kuponas darbuotojo {0} jau sukurta laiko lape {1}
 DocType: Vehicle Log,Odometer,odometras
 DocType: Sales Order Item,Ordered Qty,Užsakytas Kiekis
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Prekė {0} yra išjungtas
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Prekė {0} yra išjungtas
 DocType: Stock Settings,Stock Frozen Upto,Akcijų Šaldyti upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM nėra jokių akcijų elementą
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Projekto veikla / užduotis.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM nėra jokių akcijų elementą
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Projekto veikla / užduotis.
 DocType: Vehicle Log,Refuelling Details,Degalų detalės
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Sukurti apie atlyginimų
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Ieško turi būti patikrinta, jei taikoma pasirinkta kaip {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Nuolaida turi būti mažesnis nei 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Paskutinis pirkinys norma nerastas
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Nurašyti suma (Įmonės valiuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Atsiskaitymo laikas
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,Numatytasis BOM už {0} nerastas
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Eilutės # {0}: Prašome nustatyti pertvarkyti kiekį
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Numatytasis BOM už {0} nerastas
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Eilutės # {0}: Prašome nustatyti pertvarkyti kiekį
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Bakstelėkite elementus įtraukti juos čia
 DocType: Fees,Program Enrollment,programos Įrašas
 DocType: Landed Cost Voucher,Landed Cost Voucher,Nusileido kaina čekis
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Prašome nustatyti {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Pakartokite Mėnesio diena
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} yra neaktyvus studentas
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} yra neaktyvus studentas
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} yra neaktyvus studentas
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} yra neaktyvus studentas
 DocType: Employee,Health Details,sveikatos informacija
 DocType: Offer Letter,Offer Letter Terms,Laiško su pasiūlymu Terminų
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Norėdami sukurti mokėjimo prašymas nuoroda dokumentas yra reikalingas
@@ -4740,7 +4834,6 @@
 DocType: Employee External Work History,Salary,atlyginimas
 DocType: Serial No,Delivery Document Type,Pristatymas Dokumento tipas
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Pateikti visus atlyginimų lapelius dėl pirmiau pasirinktus kriterijus
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Daiktai sinchronizuojami
 DocType: Sales Order,Partly Delivered,dalinai Paskelbta
 DocType: Email Digest,Receivables,gautinos sumos
 DocType: Lead Source,Lead Source,Švinas Šaltinis
@@ -4761,9 +4854,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Senėjimas klasės 2
 DocType: SG Creation Tool Course,Max Strength,Maksimali jėga
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM pakeisti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Pasirinkite elementus pagal pristatymo datą
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Pasirinkite elementus pagal pristatymo datą
 ,Sales Analytics,pardavimų Analytics &quot;
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Turimas {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Turimas {0}
 ,Prospects Engaged But Not Converted,Perspektyvos Užsiima Bet nevirsta
 ,Prospects Engaged But Not Converted,Perspektyvos Užsiima Bet nevirsta
 DocType: Manufacturing Settings,Manufacturing Settings,Gamybos Nustatymai
@@ -4771,10 +4864,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Mobilus Nėra
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Prašome įvesti numatytasis valiuta įmonėje Master
 DocType: Stock Entry Detail,Stock Entry Detail,Akcijų įrašo informaciją
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Dienos Priminimai
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Dienos Priminimai
 DocType: Products Settings,Home Page is Products,Titulinis puslapis yra Produktai
 ,Asset Depreciation Ledger,Turto nusidėvėjimas Ledgeris
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Mokesčių taisyklė prieštarauja {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Mokesčių taisyklė prieštarauja {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nauja Sąskaitos pavadinimas
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Žaliavos Pateikiamas Kaina
 DocType: Selling Settings,Settings for Selling Module,Nustatymai parduoti modulis
@@ -4788,8 +4881,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Prekė {0} turi būti akcijų punktas
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Numatytasis nebaigtos Warehouse
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Numatytieji nustatymai apskaitos operacijų.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prašome nustatyti darbuotojų pavadinimo sistemą žmogiškųjų išteklių&gt; HR nustatymai
 DocType: Maintenance Visit,MV,V.
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Numatoma data negali būti prieš Medžiaga prašymo pateikimo dienos
+DocType: Restaurant,Default Tax Template,Numatytas mokesčio šablonas
 DocType: Fees,Student Details,Studento duomenys
 DocType: Purchase Invoice Item,Stock Qty,akcijų Kiekis
 DocType: Purchase Invoice Item,Stock Qty,akcijų Kiekis
@@ -4808,8 +4902,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Eiti į elementus
 DocType: Sales Partner,Partner Type,partnerio tipas
 DocType: Purchase Taxes and Charges,Actual,faktinis
+DocType: Restaurant Menu,Restaurant Manager,Restorano vadybininkas
 DocType: Authorization Rule,Customerwise Discount,Customerwise nuolaida
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Lapą užduotims.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Lapą užduotims.
 DocType: Purchase Invoice,Against Expense Account,Prieš neskaičiuojantiems
 DocType: Production Order,Production Order,Gamybos Užsakyti
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Įrengimas Pastaba {0} jau buvo pateikta
@@ -4817,7 +4912,6 @@
 DocType: Quotation Item,Against Docname,prieš DOCNAME
 DocType: SMS Center,All Employee (Active),Viskas Darbuotojų (aktyvus)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,peržiūrėti Dabar
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Pasirinkite laikotarpį, kai sąskaita faktūra bus sukurtas automatiškai"
 DocType: BOM,Raw Material Cost,Žaliavų kaina
 DocType: Item Reorder,Re-Order Level,Re įsakymu lygis
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Įveskite elementus ir planuojamą vnt, už kuriuos norite padidinti gamybos užsakymus arba atsisiųsti žaliavas analizė."
@@ -4830,24 +4924,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Ataskaitos tipas yra privalomi
 DocType: Item,Serial Number Series,Eilės numeris serija
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Sandėlių yra privalomas akcijų punkte {0} iš eilės {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Pridėti programas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Mažmeninė prekyba ir didmeninė prekyba
 DocType: Issue,First Responded On,Pirma atsakė
 DocType: Website Item Group,Cross Listing of Item in multiple groups,"Kryžius, sąrašas elementą kelių grupių"
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiskalinė metų pradžios data ir fiskalinių metų pabaigos data jau nustatyta fiskaliniais metais {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Atnaujintas klirensas data
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Splitas Serija
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Splitas Serija
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Splitas Serija
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Splitas Serija
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,sėkmingai Suderinta
 DocType: Request for Quotation Supplier,Download PDF,atsisiųsti PDF
 DocType: Production Order,Planned End Date,Planuojamas Pabaigos data
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Įveskite Tvarkaraščio datą
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Kur elementai yra saugomi.
 DocType: Request for Quotation,Supplier Detail,tiekėjas detalės
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Klaida formulę ar būklės: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Klaida formulę ar būklės: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Sąskaitoje suma
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kriterijų svoriai turi sudaryti iki 100%
 DocType: Attendance,Attendance,lankomumas
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,atsargos
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,atsargos
 DocType: BOM,Materials,medžiagos
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Jei nepažymėta, sąrašas turi būti pridedamas prie kiekvieno padalinio, kuriame jis turi būti taikomas."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Originalo ir vertimo Sandėlis negali būti tas pats
@@ -4865,6 +4959,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,Dėl grynuosius
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Vertė Attribute {0} turi būti intervale {1} ir {2} į žingsniais {3} už prekę {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,"Tikslinė sandėlis {0} eilės turi būti toks pat, kaip gamybos ordino"
+DocType: Restaurant Reservation,Waitlisted,Waitlisted
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,"Valiuta negali būti pakeistas po to, kai įrašus naudojant kai kita valiuta"
 DocType: Vehicle Service,Clutch Plate,Sankabos diskas
 DocType: Company,Round Off Account,Suapvalinti paskyrą
@@ -4881,7 +4976,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nauja pardavimų asmuo Vardas
 DocType: Packing Slip,Gross Weight UOM,Bendras svoris UOM
 DocType: Delivery Note Item,Against Sales Invoice,Prieš pardavimo sąskaita-faktūra
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Prašome įvesti serijinius numerius serializowanej prekę
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Prašome įvesti serijinius numerius serializowanej prekę
 DocType: Bin,Reserved Qty for Production,Reserved Kiekis dėl gamybos
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Palikite nepažymėtą jei nenorite atsižvelgti į partiją, o todėl kursų pagrįstas grupes."
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Palikite nepažymėtą jei nenorite atsižvelgti į partiją, o todėl kursų pagrįstas grupes."
@@ -4893,7 +4988,7 @@
 DocType: Lab Test,Test Group,Bandymo grupė
 DocType: Payment Reconciliation,Receivable / Payable Account,Gautinos / mokėtinos sąskaitos
 DocType: Delivery Note Item,Against Sales Order Item,Prieš Pardavimų įsakymu punktas
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Prašome nurodyti Įgūdis požymio reikšmę {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Prašome nurodyti Įgūdis požymio reikšmę {0}
 DocType: Item,Default Warehouse,numatytasis sandėlis
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Biudžetas negali būti skiriamas prieš grupės sąskaitoje {0}
 DocType: Healthcare Settings,Patient Registration,Paciento registracija
@@ -4923,6 +5018,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Pardavėjas
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Biudžeto ir išlaidų centras
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Kelis numatytasis mokėjimo būdas neleidžiamas
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,už
 ,Appointment Analytics,Paskyrimų analizė
 DocType: Vehicle Service,Half Yearly,pusmečio
 DocType: Lead,Blog Subscriber,Dienoraštis abonento
@@ -4942,7 +5038,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,quot Grafas
 ,BOM Stock Report,BOM sandėlyje ataskaita
 DocType: Stock Reconciliation Item,Quantity Difference,kiekis skirtumas
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,apdorojimo darbo užmokesčio
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,apdorojimo darbo užmokesčio
 DocType: Opportunity Item,Basic Rate,bazinis tarifas
 DocType: GL Entry,Credit Amount,kredito suma
 DocType: Cheque Print Template,Signatory Position,signataras pozicijos
@@ -4956,12 +5052,12 @@
 DocType: Tax Rule,Tax Rule,mokesčių taisyklė
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Išlaikyti tą patį tarifą Kiaurai pardavimo ciklą
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planuokite laiką rąstų lauko Workstation &quot;darbo valandomis.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Klientai eilėje
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} neturi gydytojo tvarkaraščio. Pridėkite jį gydytojo kapitale
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Klientai eilėje
 DocType: Student,Nationality,Tautybė
 ,Items To Be Requested,"Daiktai, kurių bus prašoma"
-DocType: Purchase Order,Get Last Purchase Rate,Gauk paskutinį pirkinį Balsuok
 DocType: Company,Company Info,Įmonės informacija
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Pasirinkite arba pridėti naujų klientų
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Pasirinkite arba pridėti naujų klientų
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Kaina centras privalo užsakyti sąnaudomis pretenziją
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Taikymas lėšos (turtas)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,"Tai yra, remiantis šio darbuotojo dalyvavimo"
@@ -4969,6 +5065,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,debeto sąskaita
 DocType: Fiscal Year,Year Start Date,Metų pradžios data
 DocType: Attendance,Employee Name,Darbuotojo vardas
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restorano užsakymo įrašas
 DocType: Sales Invoice,Rounded Total (Company Currency),Suapvalinti Iš viso (Įmonės valiuta)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Negalima paslėptas į grupę, nes sąskaitos tipas yra pasirinktas."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} buvo pakeistas. Prašome atnaujinti.
@@ -4979,6 +5076,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Išmokos darbuotojams
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Supakuotas kiekis turi vienodas kiekis už prekę {0} iš eilės {1}
 DocType: Production Order,Manufactured Qty,pagaminta Kiekis
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Sukurta sąskaita
 DocType: Purchase Receipt Item,Accepted Quantity,Priimamos Kiekis
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Prašome nustatyti numatytąjį Atostogų sąrašas Darbuotojo {0} arba Įmonės {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} neegzistuoja
@@ -4988,18 +5086,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Eilutės Nėra {0}: suma negali būti didesnė nei Kol Suma prieš expense punktą {1}. Kol suma yra {2}
 DocType: Maintenance Schedule,Schedule,grafikas
 DocType: Account,Parent Account,tėvų paskyra
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,pasiekiamas
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,pasiekiamas
 DocType: Quality Inspection Reading,Reading 3,Skaitymas 3
 ,Hub,įvorė
 DocType: GL Entry,Voucher Type,Bon tipas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Kainų sąrašas nerastas arba išjungtas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Kainų sąrašas nerastas arba išjungtas
 DocType: Lab Test,Approved,patvirtinta
 DocType: Pricing Rule,Price,kaina
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',Darbuotojų atleidžiamas nuo {0} turi būti nustatyti kaip &quot;Left&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Darbuotojų atleidžiamas nuo {0} turi būti nustatyti kaip &quot;Left&quot;
+DocType: Hub Settings,Last Sync On,Paskutinė sinchronizacija įjungta
 DocType: Guardian,Guardian,globėjas
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Vertinimas {0} sukurtas darbuotojo {1} konkrečioje dat
 DocType: Employee,Education,švietimas
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,del
 DocType: Selling Settings,Campaign Naming By,Kampanija įvardijimas Iki
 DocType: Employee,Current Address Is,Dabartinis adresas
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Mėnesio pardavimo tikslai (
@@ -5014,7 +5113,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Modulio kodas:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Prašome įvesti sąskaita paskyrą
 DocType: Account,Stock,ištekliai
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Eilutės # {0}: Informacinis dokumentas tipas turi būti vienas iš pirkimo tvarka, pirkimo sąskaitoje faktūroje ar žurnalo įrašą"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Eilutės # {0}: Informacinis dokumentas tipas turi būti vienas iš pirkimo tvarka, pirkimo sąskaitoje faktūroje ar žurnalo įrašą"
 DocType: Employee,Current Address,Dabartinis adresas
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Jei elementas yra kito elemento, tada aprašymas, vaizdo, kainodara, mokesčiai ir tt bus nustatytas nuo šablono variantas, nebent aiškiai nurodyta"
 DocType: Serial No,Purchase / Manufacture Details,Pirkimas / Gamyba detalės
@@ -5045,7 +5144,7 @@
 DocType: Hub Settings,Hub Settings,Hub Nustatymai
 DocType: Project,Gross Margin %,"Bendroji marža,%"
 DocType: BOM,With Operations,su operacijų
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Apskaitos įrašai jau buvo padaryta valiuta {0} kompanijai {1}. Prašome pasirinkti gautinai ar mokėtinai sumai sąskaitą valiuta {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Apskaitos įrašai jau buvo padaryta valiuta {0} kompanijai {1}. Prašome pasirinkti gautinai ar mokėtinai sumai sąskaitą valiuta {0}.
 DocType: Asset,Is Existing Asset,Ar turimo turto
 DocType: Salary Detail,Statistical Component,Statistiniai komponentas
 DocType: Salary Detail,Statistical Component,Statistiniai komponentas
@@ -5054,13 +5153,14 @@
 DocType: BOM Operation,BOM Operation,BOM operacija
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Dėl ankstesnės eilės Suma
 DocType: Student,Home Address,Namų adresas
+DocType: Item,Has Expiry Date,Turi galiojimo datą
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Elemento variantų nustatymai.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,perduoto turto
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,perduoto turto
 DocType: POS Profile,POS Profile,POS profilis
 DocType: Training Event,Event Name,Įvykio pavadinimas
 DocType: Physician,Phone (Office),Telefonas (biuras)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,priėmimas
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Priėmimo dėl {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,priėmimas
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Priėmimo dėl {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Sezoniškumas nustatymo biudžetai, tikslai ir tt"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Kintamasis pavadinimas
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Prekė {0} yra šablonas, prašome pasirinkti vieną iš jo variantai"
@@ -5069,7 +5169,7 @@
 DocType: Assessment Plan,Room,Kambarys
 DocType: Purchase Order,Advance Paid,sumokėto avanso
 DocType: Item,Item Tax,Prekė Mokesčių
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,"Medžiaga, iš Tiekėjui"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,"Medžiaga, iš Tiekėjui"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,akcizo Sąskaita
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% atrodo daugiau nei vieną kartą
 DocType: Expense Claim,Employees Email Id,Darbuotojai elektroninio pašto numeris
@@ -5080,31 +5180,29 @@
 DocType: Program,Program Name,programos pavadinimas
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Apsvarstykite mokestį arba rinkliavą už
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Tikrasis Kiekis yra privalomi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} šiuo metu turi {1} tiekėjų rezultatų kortelę, o šio tiekėjo pirkimo užsakymai turėtų būti išduodami atsargiai."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} šiuo metu turi {1} tiekėjų rezultatų kortelę, o šio tiekėjo pirkimo užsakymai turėtų būti išduodami atsargiai."
 DocType: Employee Loan,Loan Type,paskolos tipas
 DocType: Scheduling Tool,Scheduling Tool,planavimas įrankis
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Kreditinė kortelė
 DocType: BOM,Item to be manufactured or repacked,Prekė turi būti pagaminti arba perpakuoti
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Numatytieji nustatymai akcijų sandorių.
-DocType: Purchase Invoice,Next Date,Kitas data
 DocType: Employee Education,Major/Optional Subjects,Pagrindinės / Laisvai pasirenkami dalykai
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
+DocType: Hub Settings,Suspended,Sustabdyta
 DocType: Training Event,Attendees,Dalyviai
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Čia galite išsaugoti šeimos detalės, pavyzdžiui, pavadinimą ir okupacijos patronuojančią įmonę, sutuoktiniui ir vaikams"
 DocType: Academic Term,Term End Date,Kadencijos pabaigos data
-DocType: Hub Settings,Seller Name,pardavėjas Vardas
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Mokesčiai ir rinkliavos Išskaityta (Įmonės valiuta)
 DocType: Item Group,General Settings,Bendrieji nustatymai
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Nuo Valiuta ir valiutos negali būti tas pats
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Pridėti instruktorių
 DocType: Stock Entry,Repack,Iš naujo supakuokite
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Jūs turite išgelbėti prieš tęsdami formą
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Pirmiausia pasirinkite kompaniją
 DocType: Item Attribute,Numeric Values,reikšmes
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,prisegti logotipas
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,atsargų kiekis
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,atsargų kiekis
 DocType: Customer,Commission Rate,Komisija Balsuok
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Padaryti variantas
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Padaryti variantas
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blokuoti atostogų prašymai departamento.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer",Mokėjimo tipas turi būti vienas iš Gauti Pay ir vidaus perkėlimo
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Google Analytics
@@ -5119,11 +5217,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Kapitalas
 DocType: Shopping Cart Settings,Show Public Attachments,Rodyti Viešieji Priedai
 DocType: Packing Slip,Package Weight Details,Pakuotės svoris detalės
+DocType: Restaurant Reservation,Reservation Time,Rezervacijos laikas
 DocType: Payment Gateway Account,Payment Gateway Account,Mokėjimo šliuzai paskyra
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Po mokėjimo pabaigos nukreipti vartotoją į pasirinktame puslapyje.
 DocType: Company,Existing Company,Esama Įmonės
 DocType: Healthcare Settings,Result Emailed,Rezultatas išsiųstas el. Paštu
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","Mokesčių Kategorija buvo pakeistas į &quot;Total&quot;, nes visi daiktai yra ne atsargos"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Prekės kodas&gt; Prekės grupė&gt; Gamintojas
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Prašome pasirinkti CSV failą
 DocType: Student Leave Application,Mark as Present,Žymėti kaip dabartis
 DocType: Supplier Scorecard,Indicator Color,Rodiklio spalva
@@ -5148,11 +5248,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Padaryti Studentų Serija
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Ar perkelti
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Gauti prekes iš BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Gauti prekes iš BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Švinas Laikas dienas
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Eilutės # {0}: Siunčiamos data turi būti tokia pati kaip pirkimo datos {1} Turto {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Pažymėkite, jei tas studentas gyvena institute bendrabutyje."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Prašome įvesti pardavimų užsakymų pirmiau pateiktoje lentelėje
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Prašome įvesti pardavimų užsakymų pirmiau pateiktoje lentelėje
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Nepateikusių Pajamos Apatinukai
 ,Stock Summary,akcijų santrauka
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Perduoti turtą iš vieno sandėlio į kitą
@@ -5168,5 +5268,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Eilutės {0}: debeto įrašą negali būti susieta su {1}
 DocType: Journal Entry,Subscription Section,Prenumeratos skyrius
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Sąskaita {0} neegzistuoja
+DocType: Training Event,Training Program,Treniravimosi programa
 DocType: Account,Cash,pinigai
 DocType: Employee,Short biography for website and other publications.,Trumpa biografija interneto svetainės ir kitų leidinių.
diff --git a/erpnext/translations/lv.csv b/erpnext/translations/lv.csv
index 8cd2a2f..1914d8e 100644
--- a/erpnext/translations/lv.csv
+++ b/erpnext/translations/lv.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Alga Mode
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Reģistrēties
 DocType: Patient,Divorced,Šķīries
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Preces jau sinhronizēts
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Atļaut punkts jāpievieno vairākas reizes darījumā
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Atcelt Materiāls Visit {0} pirms lauzt šo garantijas prasību
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Atstājiet Approvers
 DocType: Sales Partner,Dealer,Tirgotājs
 DocType: Consultation,Investigations,Izmeklējumi
+DocType: Restaurant Order Entry,Click Enter To Add,"Noklikšķiniet uz Ievadīt, lai pievienotu"
 DocType: Employee,Rented,Īrēts
 DocType: Purchase Order,PO-,po-
 DocType: POS Profile,Applicable for User,Piemērojams Lietotājs
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Pārtraucis ražošanu rīkojums nevar tikt atcelts, Unstop to vispirms, lai atceltu"
 DocType: Vehicle Service,Mileage,Nobraukums
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Vai jūs tiešām vēlaties atteikties šo aktīvu?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Vai jūs tiešām vēlaties atteikties šo aktīvu?
 DocType: Drug Prescription,Update Schedule,Atjaunināt plānu
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Select Default piegādātājs
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Valūta ir nepieciešama Cenrāža {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Pārbaudīt pieejamību
 DocType: Job Applicant,Job Applicant,Darba iesniedzējs
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Tas ir balstīts uz darījumiem pret šo piegādātāju. Skatīt grafiku zemāk informāciju
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nav vairāk rezultātu.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Juridisks
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Faktiskais veids nodokli nevar iekļaut vienības likmes kārtas {0}
 DocType: Bank Guarantee,Customer,Klients
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Valūtas kurss ir tāds pats kā {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Klienta vārds
 DocType: Vehicle,Natural Gas,Dabasgāze
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Bankas konts nevar tikt nosaukts par {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Bankas konts nevar tikt nosaukts par {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Vadītāji (vai grupas), pret kuru grāmatvedības ieraksti tiek veikti, un atlikumi tiek uzturēti."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Iekavēti {0} nevar būt mazāka par nulli ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Apstrādei nav iesniegti algu aploksnes.
 DocType: Manufacturing Settings,Default 10 mins,Pēc noklusējuma 10 min
 DocType: Leave Type,Leave Type Name,Atstājiet veida nosaukums
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Rādīt open
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Pašlaik ir jārīkojas pašiem par iepriekš minēto
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Series Atjaunots Veiksmīgi
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,izrakstīšanās
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural Journal Entry Ievietots
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,"Pirkuma pasūtījuma posteņi, kas saņemami"
 DocType: SMS Center,All Supplier Contact,Visi Piegādātājs Contact
 DocType: Support Settings,Support Settings,atbalsta iestatījumi
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,"Paredzams, beigu datums nevar būt mazāki nekā paredzēts sākuma datuma"
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,"Paredzams, beigu datums nevar būt mazāki nekā paredzēts sākuma datuma"
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Novērtēt jābūt tāda pati kā {1} {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Jauns atvaļinājuma pieteikums
 ,Batch Item Expiry Status,Partijas Prece derīguma statuss
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Banka projekts
 DocType: Mode of Payment Account,Mode of Payment Account,Mode maksājumu konta
 DocType: Consultation,Consultation,Konsultācija
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Pārdošana un atdošana
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Rādīt Variants
 DocType: Academic Term,Academic Term,Akadēmiskā Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,materiāls
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Veselības aprūpe
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Maksājuma kavējums (dienas)
 DocType: Lab Prescription,Lab Prescription,Lab prescription
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Kārtot pēc cenas
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Servisa izdevumu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Sērijas numurs: {0} jau ir atsauce pārdošanas rēķina: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Pavadzīme
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Sērijas numurs: {0} jau ir atsauce pārdošanas rēķina: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Pavadzīme
 DocType: Maintenance Schedule Item,Periodicity,Periodiskums
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskālā gads {0} ir vajadzīga
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Aizstāvēšana
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Kopā Izmaksu summa
 DocType: Delivery Note,Vehicle No,Transportlīdzekļu Nr
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,"Lūdzu, izvēlieties cenrādi"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,"Lūdzu, izvēlieties cenrādi"
 DocType: Accounts Settings,Currency Exchange Settings,Valūtas maiņas iestatījumi
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,"Row # {0}: Maksājuma dokuments ir nepieciešams, lai pabeigtu trasaction"
 DocType: Production Order Operation,Work In Progress,Work In Progress
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,"Lūdzu, izvēlieties datumu"
 DocType: Employee,Holiday List,Brīvdienu saraksts
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,"Lūdzu, uzstādiet Instruktoru nosaukumu sistēmu skolā&gt; Skolas iestatījumi"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Grāmatvedis
+DocType: Hub Settings,Selling Price List,Pārdošanas cenrādis
 DocType: Patient,Tobacco Current Use,Tabakas patēriņš
 DocType: Cost Center,Stock User,Stock User
 DocType: Company,Phone No,Tālruņa Nr
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Kursu Saraksti izveidots:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Jaunais {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Jaunais {0}: # {1}
 ,Sales Partners Commission,Sales Partners Komisija
 DocType: Purchase Invoice,Rounding Adjustment,Noapaļošana korekcija
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Saīsinājums nedrīkst būt vairāk par 5 rakstzīmes
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Reference: {0}, Produkta kods: {1} un Klients: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kg
-DocType: Student Log,Log,log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Atvēršana uz darbu.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Rezultāti iesniegti
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Rezultāti iesniegti
 DocType: Item Attribute,Increment,Pieaugums
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Laika sprīdis
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Izvēlieties noliktava ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Precējies
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Aizliegts {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Dabūtu preces no
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Preces nevar atjaunināt pret piegāde piezīme {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Preces nevar atjaunināt pret piegāde piezīme {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkta {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nav minētie posteņi
 DocType: Payment Reconciliation,Reconcile,Saskaņot
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensiju fondi
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Nākamais nolietojums datums nevar būt pirms iegādes datuma
 DocType: Consultation,Consultation Date,Konsultācijas datums
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Produktu saraksts un atrašana ERPNext lietotājiem
 DocType: SMS Center,All Sales Person,Visi Sales Person
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Mēneša Distribution ** palīdz izplatīt Budžeta / Target pāri mēnešiem, ja jums ir sezonalitātes jūsu biznesu."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Nav atrastas preces
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Algu struktūra Trūkst
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Nav atrastas preces
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Algu struktūra Trūkst
 DocType: Lead,Person Name,Persona Name
 DocType: Sales Invoice Item,Sales Invoice Item,PPR produkts
 DocType: Account,Credit,Kredīts
 DocType: POS Profile,Write Off Cost Center,Uzrakstiet Off izmaksu centram
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""","piemēram, &quot;Pamatskola&quot; vai &quot;universitāte&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""","piemēram, &quot;Pamatskola&quot; vai &quot;universitāte&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,akciju Ziņojumi
 DocType: Warehouse,Warehouse Detail,Noliktava Detail
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Kredīta limits ir šķērsojis klientam {0}{1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term Beigu datums nedrīkst būt vēlāk kā gadu beigu datums akadēmiskā gada, uz kuru termiņš ir saistīts (akadēmiskais gads {}). Lūdzu izlabojiet datumus un mēģiniet vēlreiz."
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Vai pamatlīdzeklis&quot; nevar būt nekontrolēti, jo Asset ieraksts pastāv pret posteņa"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Vai pamatlīdzeklis&quot; nevar būt nekontrolēti, jo Asset ieraksts pastāv pret posteņa"
 DocType: Vehicle Service,Brake Oil,bremžu eļļa
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Pasūtītājs&gt; Klientu grupa&gt; Teritorija
 DocType: Tax Rule,Tax Type,Nodokļu Type
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Ar nodokli apliekamā summa
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Jums nav atļauts pievienot vai atjaunināt ierakstus pirms {0}
 DocType: BOM,Item Image (if not slideshow),Postenis attēls (ja ne slideshow)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Klientu pastāv ar tādu pašu nosaukumu
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Stundas likme / 60) * Faktiskais darba laiks
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Rinda # {0}: atsauces dokumenta tipam jābūt vienam no izdevumu pieprasījuma vai žurnāla ieraksta
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Select BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Rinda # {0}: atsauces dokumenta tipam jābūt vienam no izdevumu pieprasījuma vai žurnāla ieraksta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Select BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Izmaksas piegādāto preču
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Svētki uz {0} nav starp No Datums un līdz šim
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,Darbinieku Loan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Aktivitāte Log:
 DocType: Fee Schedule,Send Payment Request Email,Sūtīt maksājuma pieprasījuma e-pastu
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Postenis {0} nepastāv sistēmā vai ir beidzies
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Postenis {0} nepastāv sistēmā vai ir beidzies
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Real Estate
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Paziņojums par konta
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
@@ -210,18 +213,23 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Import Log
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,"Pull Materiālu pieprasījuma tipa ražošana, pamatojoties uz iepriekš minētajiem kritērijiem,"
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Veiksmīgi nereģistrēta.
 DocType: Training Result Employee,Grade,pakāpe
+DocType: Restaurant Table,No of Seats,Sēdvietu skaits
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Lai pievienotu dinamisko tēmu, izmantojiet jinja tagus, piemēram, <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Pasludināts piegādātāja
 DocType: SMS Center,All Contact,Visi Contact
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Ražošanas rīkojums jau radīta visiem posteņiem ar BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Ražošanas rīkojums jau radīta visiem posteņiem ar BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Gada alga
 DocType: Daily Work Summary,Daily Work Summary,Ikdienas darbs kopsavilkums
 DocType: Period Closing Voucher,Closing Fiscal Year,Noslēguma fiskālajā gadā
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} ir iesaldēts
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,"Lūdzu, izvēlieties esošo uzņēmumu radīšanai kontu plānu"
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} ir iesaldēts
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,"Lūdzu, izvēlieties esošo uzņēmumu radīšanai kontu plānu"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Akciju Izdevumi
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Atlasīt Target noliktava
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Atlasīt Target noliktava
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Atlasīt Target noliktava
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Atlasīt Target noliktava
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Ievadiet Vēlamā Kontaktinformācija E-pasts
 DocType: Program Enrollment,School Bus,Skolas autobuss
 DocType: Journal Entry,Contra Entry,Contra Entry
@@ -238,9 +246,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Lejupielādēt veidni, aizpildīt atbilstošus datus un pievienot modificētu failu. Visi datumi un darbinieku saspēles izvēlēto periodu nāks veidnē, ar esošajiem apmeklējuma reģistru"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Postenis {0} nav aktīvs vai ir sasniegts nolietoto
+DocType: Student Admission Program,Minimum Age,Minimālais vecums
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Piemērs: Basic Mathematics
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Lai iekļautu nodokli rindā {0} vienības likmes, nodokļi rindās {1} ir jāiekļauj arī"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Iestatījumi HR moduļa
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Iestatījumi HR moduļa
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Mainīt Summa
 DocType: BOM Update Tool,New BOM,Jaunais BOM
@@ -250,7 +259,7 @@
 DocType: Lead,Request Type,Pieprasījums Type
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Izveidot darbinieku
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Apraides
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Pievienot numurus
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),POS (tiešsaistes / bezsaistes) iestatīšanas režīms
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Izpildīšana
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Sīkāka informācija par veiktajām darbībām.
 DocType: Serial No,Maintenance Status,Uzturēšana statuss
@@ -273,6 +282,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cenrādis ir jāpiemēro pērk vai pārdod
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Uzstādīšana datums nevar būt pirms piegādes datuma postenī {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Atlaide Cenrādis Rate (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Bioķīmija
 DocType: Offer Letter,Select Terms and Conditions,Izvēlieties Noteikumi un nosacījumi
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,out Value
 DocType: Production Planning Tool,Sales Orders,Pārdošanas pasūtījumu
@@ -307,15 +317,15 @@
 DocType: Sales Partner,Reseller,Reseller
 DocType: Codification Table,Medical Code,Medicīnas kods
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Ja ieslēgts, ietvers nav pieejama preces materiāla pieprasījumiem."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Ievadiet Company
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Ievadiet Company
 DocType: Delivery Note Item,Against Sales Invoice Item,Pret pārdošanas rēķinu posteni
 ,Production Orders in Progress,Pasūtījums Progress
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Neto naudas no finansēšanas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage ir pilna, nebija glābt"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage ir pilna, nebija glābt"
 DocType: Lead,Address & Contact,Adrese un kontaktinformācija
 DocType: Leave Allocation,Add unused leaves from previous allocations,Pievienot neizmantotās lapas no iepriekšējiem piešķīrumiem
 DocType: Sales Partner,Partner website,Partner mājas lapa
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Pievienot objektu
+DocType: Restaurant Order Entry,Add Item,Pievienot objektu
 DocType: Lab Test,Custom Result,Pielāgots rezultāts
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Contact Name
 DocType: Course Assessment Criteria,Course Assessment Criteria,Protams novērtēšanas kritēriji
@@ -328,7 +338,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Pieprasīt iegādei.
 DocType: Lab Test,Submitted Date,Iesniegtais datums
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Tas ir balstīts uz laika loksnes radīti pret šo projektu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Net Pay nedrīkst būt mazāka par 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Net Pay nedrīkst būt mazāka par 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Lai pārtrauktu atkārtotu kļūdu paziņojumu nosūtīšanu no sistēmas, mēs abonementā esam atzīmējuši lauku Atspējoti"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Tikai izvēlētais Leave apstiprinātājs var iesniegt šo atvaļinājums
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Atbrīvojot datums nedrīkst būt lielāks par datums savienošana
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Lapām gadā
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,Peļņas un zaudējumu
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Litrs
 DocType: Task,Total Costing Amount (via Time Sheet),Kopā Izmaksu summa (via laiks lapas)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,"Lūdzu, izveidojiet Studentu grupas Studentu grupas ietvaros"
 DocType: Item Website Specification,Item Website Specification,Postenis Website Specifikācija
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Atstājiet Bloķēts
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Postenis {0} ir sasniedzis beigas dzīves uz {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Postenis {0} ir sasniedzis beigas dzīves uz {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,bankas ieraksti
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Gada
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Samierināšanās postenis
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Studentu grupa Creation Tool Course
 DocType: Lead,Do Not Contact,Nesazināties
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,"Cilvēki, kuri māca jūsu organizācijā"
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,"Unikāls id, lai izsekotu visas periodiskās rēķinus. Tas ir radīts apstiprināšanas."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimālais Order Daudz
 DocType: Pricing Rule,Supplier Type,Piegādātājs Type
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,Publicē Hub
 DocType: Student Admission,Student Admission,Studentu uzņemšana
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Postenis {0} ir atcelts
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Materiāls Pieprasījums
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Postenis {0} ir atcelts
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Materiāls Pieprasījums
 DocType: Bank Reconciliation,Update Clearance Date,Update Klīrenss Datums
 DocType: Item,Purchase Details,Pirkuma Details
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},{0} Prece nav atrasts &quot;Izejvielu Kopā&quot; tabulā Pirkuma pasūtījums {1}
 DocType: Patient Relation,Relation,Attiecība
 DocType: Shipping Rule,Worldwide Shipping,Worldwide Shipping
 DocType: Patient Relation,Mother,māte
+DocType: Restaurant Reservation,Reservation End Time,Rezervācijas beigu laiks
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Apstiprināti pasūtījumus no klientiem.
 DocType: Purchase Receipt Item,Rejected Quantity,Noraidīts daudzums
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Maksājuma pieprasījums {0} izveidots
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Maksājuma pieprasījums {0} izveidots
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Zema jūtība
 DocType: Notification Control,Notification Control,Paziņošana Control
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,"Lūdzu, apstipriniet, kad esat pabeidzis savu apmācību"
 DocType: Lead,Suggestions,Ieteikumi
@@ -388,7 +401,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,"E-pasti algas kvīts darbiniekam, pamatojoties uz vēlamo e-pastu izvēlēts Darbinieku"
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Pirmais Atstājiet apstiprinātājs sarakstā tiks iestatīts kā noklusējuma Leave apstiprinātāja
 DocType: Tax Rule,Shipping County,Piegāde County
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Mācīties
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Mācīties
 DocType: Asset,Next Depreciation Date,Nākamais Nolietojums Datums
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivitāte izmaksas uz vienu darbinieku
 DocType: Accounts Settings,Settings for Accounts,Iestatījumi kontu
@@ -399,13 +412,13 @@
 DocType: Item,Synced With Hub,Sinhronizēts ar Hub
 DocType: Vehicle,Fleet Manager,flotes vadītājs
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Rinda # {0}: {1} nevar būt negatīvs postenim {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Nepareiza Parole
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Nepareiza Parole
 DocType: Item,Variant Of,Variants
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"Pabeigts Daudz nevar būt lielāks par ""Daudz, lai ražotu"""
 DocType: Period Closing Voucher,Closing Account Head,Noslēguma konta vadītājs
 DocType: Employee,External Work History,Ārējā Work Vēsture
 DocType: Physician,Time per Appointment,Laiks uz iecelšanu
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Apļveida Reference kļūda
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Apļveida Reference kļūda
 DocType: Appointment Type,Is Inpatient,Ir stacionārs
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 vārds
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Vārdos (eksportam) būs redzams pēc tam, kad jums ietaupīt pavadzīmi."
@@ -414,19 +427,18 @@
 DocType: Lead,Industry,Rūpniecība
 DocType: Employee,Job Profile,Darba Profile
 DocType: BOM Item,Rate & Amount,Cena un summa
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Lūdzu, uzstādiet apmeklētāju numerācijas sēriju, izmantojot iestatīšanas&gt; numerācijas sēriju"
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Tas ir balstīts uz darījumiem ar šo uzņēmumu. Sīkāku informāciju skatiet tālāk redzamajā laika skalā
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Paziņot pa e-pastu uz izveidojot automātisku Material pieprasījuma
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Izturīgs
 DocType: Journal Entry,Multi Currency,Multi Valūtas
 DocType: Payment Reconciliation Invoice,Invoice Type,Rēķins Type
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Pasūtītājs&gt; Klientu grupa&gt; Teritorija
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Piegāde Note
 DocType: Consultation,Encounter Impression,Encounter Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Iestatīšana Nodokļi
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Izmaksas Sold aktīva
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,"Maksājums Entry ir modificēts pēc velk to. Lūdzu, velciet to vēlreiz."
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} ieraksta divreiz Vienības nodokli
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Kopsavilkums par šo nedēļu un izskatāmo darbību
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} ieraksta divreiz Vienības nodokli
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Kopsavilkums par šo nedēļu un izskatāmo darbību
 DocType: Student Applicant,Admitted,uzņemta
 DocType: Workstation,Rent Cost,Rent izmaksas
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Summa Pēc nolietojums
@@ -441,36 +453,35 @@
 DocType: Shipping Rule,Valid for Countries,Derīgs valstīm
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Šis postenis ir Template un nevar tikt izmantoti darījumos. Postenis atribūti tiks pārkopēti uz variantiem, ja ""Nē Copy"" ir iestatīts"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Kopā Order Uzskata
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Darbinieku apzīmējums (piemēram, CEO, direktors uc)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Darbinieku apzīmējums (piemēram, CEO, direktors uc)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Ātrums, kādā Klients Valūtu pārvērsts klienta bāzes valūtā"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Protams plānošanas rīks
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Pirkuma rēķins nevar būt pret esošā aktīva {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,"[Urgent] Kļūda, veidojot% s periodiskumu% s"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,"[Urgent] Kļūda, veidojot% s periodiskumu% s"
 DocType: Item Tax,Tax Rate,Nodokļa likme
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} jau piešķirtais Darbinieku {1} par periodu {2} līdz {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Select postenis
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Select postenis
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Pirkuma rēķins {0} jau ir iesniegts
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Partijas Nr jābūt tāda pati kā {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Pārvērst ne-Group
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,(Sērijas) posteņa.
 DocType: C-Form Invoice Detail,Invoice Date,Rēķina datums
 DocType: GL Entry,Debit Amount,Debets Summa
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Tur var būt tikai 1 konts per Company {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,"Lūdzu, skatiet pielikumu"
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Tur var būt tikai 1 konts per Company {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,"Lūdzu, skatiet pielikumu"
 DocType: Purchase Order,% Received,% Saņemts
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Izveidot studentu grupas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Setup Jau Complete !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Setup Jau Complete !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Kredītu piezīme summa
 DocType: Setup Progress Action,Action Document,Rīcības dokuments
 ,Finished Goods,Gatavās preces
 DocType: Delivery Note,Instructions,Instrukcijas
 DocType: Quality Inspection,Inspected By,Pārbaudīti Līdz
 DocType: Maintenance Visit,Maintenance Type,Uzturēšānas veids
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} nav uzņemts Course {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Vienības kods&gt; Vienības grupa&gt; Zīmols
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} nav uzņemts Course {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Sērijas Nr {0} nepieder komplektāciju {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Pievienot preces
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Pievienot preces
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Postenis kvalitātes pārbaudes parametrs
 DocType: Leave Application,Leave Approver Name,Atstājiet apstiprinātāja Vārds
 DocType: Depreciation Schedule,Schedule Date,Grafiks Datums
@@ -492,7 +503,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Darba laiks
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Mainīt sākuma / pašreizējo kārtas numuru esošam sēriju.
 DocType: Dosage Strength,Strength,Stiprums
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Izveidot jaunu Klientu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Izveidot jaunu Klientu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ja vairāki Cenu Noteikumi turpina dominēt, lietotāji tiek aicināti noteikt prioritāti manuāli atrisināt konfliktu."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Izveidot pirkuma pasūtījumu
 ,Purchase Register,Pirkuma Reģistrēties
@@ -511,7 +522,7 @@
 DocType: Lab Test Template,Single,Viens
 DocType: Salary Slip,Total Loan Repayment,Kopā Aizdevuma atmaksa
 DocType: Account,Cost of Goods Sold,Pārdotās produkcijas ražošanas izmaksas
-DocType: Purchase Invoice,Yearly,Katru gadu
+DocType: Subscription,Yearly,Katru gadu
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Ievadiet izmaksu centram
 DocType: Drug Prescription,Dosage,Devas
 DocType: Journal Entry Account,Sales Order,Sales Order
@@ -542,7 +553,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globālie uzstādījumi visām ražošanas procesiem.
 DocType: Accounts Settings,Accounts Frozen Upto,Konti Frozen Līdz pat
 DocType: SMS Log,Sent On,Nosūtīts
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Prasme {0} izvēlēts vairākas reizes atribūtos tabulā
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Prasme {0} izvēlēts vairākas reizes atribūtos tabulā
 DocType: HR Settings,Employee record is created using selected field. ,"Darbinieku ieraksts tiek izveidota, izmantojot izvēlēto laukumu."
 DocType: Sales Order,Not Applicable,Nav piemērojams
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Brīvdienu pārvaldnieks
@@ -567,13 +578,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Kopā lapas piešķirtās ir obligāta
 DocType: Patient,AB Positive,AB pozitīvs
 DocType: Job Opening,Description of a Job Opening,Apraksts par vakanču
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Neapstiprinātas aktivitātes šodienu
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Neapstiprinātas aktivitātes šodienu
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Apmeklējumu ieraksts.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Alga Component kontrolsaraksts balstīta algas.
 DocType: Sales Order Item,Used for Production Plan,Izmanto ražošanas plānu
 DocType: Employee Loan,Total Payment,kopējais maksājums
 DocType: Manufacturing Settings,Time Between Operations (in mins),Laiks starp operācijām (Min)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} tiek anulēts tā darbība nevar tikt pabeigta
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} tiek anulēts tā darbība nevar tikt pabeigta
 DocType: Customer,Buyer of Goods and Services.,Pircējs Preču un pakalpojumu.
 DocType: Journal Entry,Accounts Payable,Kreditoru
 DocType: Patient,Allergies,Alerģijas
@@ -585,23 +596,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Brīdināt pirkumu pasūtījumus
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Uzskaitīt daži no saviem klientiem. Tie varētu būt organizācijas vai privātpersonas.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Pietiekami Parts Build
+DocType: POS Profile User,POS Profile User,POS lietotāja profils
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Direct Ienākumi
 DocType: Patient Appointment,Date TIme,Datums Laiks
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Nevar filtrēt, pamatojoties uz kontu, ja grupēti pēc kontu"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Administratīvā amatpersona
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,"Lūdzu, izvēlieties kurss"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,"Lūdzu, izvēlieties kurss"
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,"Lūdzu, izvēlieties kurss"
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,"Lūdzu, izvēlieties kurss"
 DocType: Codification Table,Codification Table,Kodifikācijas tabula
 DocType: Timesheet Detail,Hrs,h
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,"Lūdzu, izvēlieties Uzņēmums"
 DocType: Stock Entry Detail,Difference Account,Atšķirība konts
 DocType: Purchase Invoice,Supplier GSTIN,Piegādātājs GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Nevar aizvērt uzdevums, jo tās atkarīgas uzdevums {0} nav slēgta."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,"Ievadiet noliktava, par kuru Materiāls Pieprasījums tiks izvirzīts"
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Nevar aizvērt uzdevums, jo tās atkarīgas uzdevums {0} nav slēgta."
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Ievadiet noliktava, par kuru Materiāls Pieprasījums tiks izvirzīts"
 DocType: Production Order,Additional Operating Cost,Papildus ekspluatācijas izmaksas
 DocType: Lab Test Template,Lab Routine,Laboratorijas kārtība
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmētika
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Apvienoties, šādi īpašībām jābūt vienādam abiem posteņiem"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Apvienoties, šādi īpašībām jābūt vienādam abiem posteņiem"
 DocType: Shipping Rule,Net Weight,Neto svars
 DocType: Employee,Emergency Phone,Avārijas Phone
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,pirkt
@@ -612,7 +624,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Lūdzu noteikt atzīmi par sliekšņa 0%
 DocType: Sales Order,To Deliver,Piegādāt
 DocType: Purchase Invoice Item,Item,Prece
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Sērijas neviens punkts nevar būt daļa
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Augsta jutība
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Sērijas neviens punkts nevar būt daļa
 DocType: Journal Entry,Difference (Dr - Cr),Starpība (Dr - Cr)
 DocType: Account,Profit and Loss,Peļņa un zaudējumi
 DocType: Patient,Risk Factors,Riska faktori
@@ -621,7 +634,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Managing Apakšuzņēmēji
 DocType: Vital Signs,Body Temperature,Ķermeņa temperatūra
 DocType: Project,Project will be accessible on the website to these users,Projekts būs pieejams tīmekļa vietnē ar šo lietotāju
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Definējiet projekta veidu.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Definējiet projekta veidu.
 DocType: Supplier Scorecard,Weighting Function,Svēršanas funkcija
 DocType: Physician,OP Consulting Charge,OP Consulting maksas
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Uzstādiet savu
@@ -635,7 +648,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Pieaugums nevar būt 0
 DocType: Production Planning Tool,Material Requirement,Materiālu vajadzības
 DocType: Company,Delete Company Transactions,Dzēst Uzņēmums Darījumi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Atsauces Nr un atsauces datums ir obligāta Bank darījumu
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Atsauces Nr un atsauces datums ir obligāta Bank darījumu
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Pievienot / rediģēt nodokļiem un maksājumiem
 DocType: Payment Entry Reference,Supplier Invoice No,Piegādātāju rēķinu Nr
 DocType: Territory,For reference,Par atskaites
@@ -643,12 +656,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Nevar izdzēst Sērijas Nr {0}, jo tas tiek izmantots akciju darījumiem"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Noslēguma (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Sveiki
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Pārvietot Preci
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Pārvietot Preci
 DocType: Serial No,Warranty Period (Days),Garantijas periods (dienas)
 DocType: Installation Note Item,Installation Note Item,Uzstādīšana Note postenis
 DocType: Production Plan Item,Pending Qty,Kamēr Daudz
 DocType: Budget,Ignore,Ignorēt
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} nav aktīvs
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} nav aktīvs
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Setup pārbaudīt izmēri drukāšanai
 DocType: Salary Slip,Salary Slip Timesheet,Alga Slip laika kontrolsaraksts
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Piegādātājs Noliktava obligāta nolīgta apakšuzņēmuma pirkuma čeka
@@ -657,7 +670,7 @@
 DocType: Pricing Rule,Sales Partner,Sales Partner
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Visi Piegādātāju rādītāju kartes.
 DocType: Buying Settings,Purchase Receipt Required,Pirkuma čeka Nepieciešamais
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Vērtēšana Rate ir obligāta, ja atvēršana Stock ievadīts"
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,"Vērtēšana Rate ir obligāta, ja atvēršana Stock ievadīts"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nav atrasti rēķinu tabulas ieraksti
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Lūdzu, izvēlieties Uzņēmumu un Party tips pirmais"
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Finanšu / grāmatvedības gadā.
@@ -694,7 +707,7 @@
 DocType: Quotation,Quotation To,Piedāvājums:
 DocType: Lead,Middle Income,Middle Ienākumi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Atvere (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Default mērvienība postenī {0} nevar mainīt tieši tāpēc, ka jums jau ir zināma darījuma (-us) ar citu UOM. Jums būs nepieciešams, lai izveidotu jaunu posteni, lai izmantotu citu Default UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Default mērvienība postenī {0} nevar mainīt tieši tāpēc, ka jums jau ir zināma darījuma (-us) ar citu UOM. Jums būs nepieciešams, lai izveidotu jaunu posteni, lai izmantotu citu Default UOM."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Piešķirtā summa nevar būt negatīvs
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Lūdzu noteikt Company
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Lūdzu noteikt Company
@@ -709,6 +722,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Izvēlieties Maksājumu konts padarīt Banka Entry
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Izveidot Darbinieku uzskaiti, lai pārvaldītu lapiņas, izdevumu deklarācijas un algas"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Izrakstīšanas periods
+DocType: Restaurant Reservation,Restaurant Reservation,Restorāna rezervēšana
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Priekšlikums Writing
 DocType: Payment Entry Deduction,Payment Entry Deduction,Maksājumu Entry atskaitīšana
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Vēl Sales Person {0} pastāv ar to pašu darbinieku id
@@ -716,7 +730,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Masters
 DocType: Assessment Plan,Maximum Assessment Score,Maksimālais novērtējuma rādītājs
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Update Bankas Darījumu datumi
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Time Tracking
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Time Tracking
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,Dublikāts TRANSPORTER
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskālā Gads Company
 DocType: Packing Slip Item,DN Detail,DN Detail
@@ -725,8 +739,9 @@
 DocType: Batch,Batch Description,Partijas Apraksts
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Izveide studentu grupām
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Izveide studentu grupām
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Maksājumu Gateway konts nav izveidots, lūdzu, izveidojiet to manuāli."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Maksājumu Gateway konts nav izveidots, lūdzu, izveidojiet to manuāli."
 DocType: Supplier Scorecard,Per Year,Gadā
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Nav atļauts pieteikties šajā programmā kā vienu DOB
 DocType: Sales Invoice,Sales Taxes and Charges,Pārdošanas nodokļi un maksājumi
 DocType: Employee,Organization Profile,Organizācija Profile
 DocType: Vital Signs,Height (In Meter),Augstums (metros)
@@ -762,7 +777,7 @@
 DocType: Student Batch Name,Batch Name,partijas nosaukums
 DocType: Fee Validity,Max number of visit,Maksimālais apmeklējuma skaits
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Kontrolsaraksts izveidots:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Lūdzu iestatītu standarta kases vai bankas kontu maksājuma veidu {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Lūdzu iestatītu standarta kases vai bankas kontu maksājuma veidu {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,uzņemt
 DocType: GST Settings,GST Settings,GST iestatījumi
 DocType: Selling Settings,Customer Naming By,Klientu nosaukšana Līdz
@@ -794,15 +809,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Izkrauti Izmaksu nodokļi un maksājumi
 DocType: Production Order Operation,Actual Start Time,Faktiskais Sākuma laiks
 DocType: BOM Operation,Operation Time,Darbība laiks
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,apdare
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,apdare
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,bāze
 DocType: Timesheet,Total Billed Hours,Kopā Apmaksājamie Stundas
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Uzrakstiet Off summa
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Uzrakstiet Off summa
 DocType: Leave Block List Allow,Allow User,Atļaut lietotāju
 DocType: Journal Entry,Bill No,Bill Nr
 DocType: Company,Gain/Loss Account on Asset Disposal,Gain / zaudējumu aprēķins par aktīva atsavināšana
 DocType: Vehicle Log,Service Details,Detalizēta informācija par pakalpojumu
-DocType: Purchase Invoice,Quarterly,Ceturkšņa
+DocType: Subscription,Quarterly,Ceturkšņa
 DocType: Lab Test Template,Grouped,Sagrupēti
 DocType: Selling Settings,Delivery Note Required,Nepieciešamais Piegāde Note
 DocType: Bank Guarantee,Bank Guarantee Number,Bankas garantijas skaits
@@ -812,12 +827,12 @@
 DocType: Student Attendance,Student Attendance,Student apmeklējums
 DocType: Sales Invoice Timesheet,Time Sheet,Laika uzskaites tabula
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush izejvielas Based On
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Ievadiet Papildus informācija
 DocType: Interest,Interest,Interese
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre Sales
 DocType: Purchase Receipt,Other Details,Cita informācija
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Lab Test,Test Template,Pārbaudes veidne
+DocType: Restaurant Order Entry Item,Served,Pasniegts
 DocType: Account,Accounts,Konti
 DocType: Vehicle,Odometer Value (Last),Odometra vērtību (Pēdējā)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Piegādes rezultātu rādītāju kritēriju kritēriji.
@@ -829,26 +844,28 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Preview Alga Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Konts {0} ir ievadīts vairākas reizes
 DocType: Account,Expenses Included In Valuation,Izdevumi iekļauts vērtēšanā
-DocType: Hub Settings,Seller City,Pārdevējs City
 ,Absent Student Report,Nekonstatē Student pārskats
 DocType: Email Digest,Next email will be sent on:,Nākamais e-pastu tiks nosūtīts uz:
 DocType: Offer Letter Term,Offer Letter Term,Akcija vēstule termins
 DocType: Supplier Scorecard,Per Week,Nedēļā
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Prece ir varianti.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Prece ir varianti.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Kopējais studējošais
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,{0} prece nav atrasta
 DocType: Bin,Stock Value,Stock Value
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,Maksa par ierakstiem tiks izveidota fonā. Kļūdu ziņojuma gadījumā kļūdu ziņojums tiks atjaunināts programmā.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Uzņēmuma {0} neeksistē
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} maksa ir spēkā līdz {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} maksa ir spēkā līdz {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Tree Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Daudz Patērētā Vienības
 DocType: Serial No,Warranty Expiry Date,Garantijas Derīguma termiņš
 DocType: Material Request Item,Quantity and Warehouse,Daudzums un Noliktavas
+DocType: Hub Settings,Unregister,Izņemt reģistrāciju
 DocType: Sales Invoice,Commission Rate (%),Komisijas likme (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,"Lūdzu, izvēlieties programma"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,"Lūdzu, izvēlieties programma"
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,"Lūdzu, izvēlieties programma"
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,"Lūdzu, izvēlieties programma"
 DocType: Project,Estimated Cost,Paredzamās izmaksas
 DocType: Purchase Order,Link to material requests,Saite uz materiālo pieprasījumiem
+DocType: Hub Settings,Publish,Publicēt
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
 DocType: Journal Entry,Credit Card Entry,Kredītkarte Entry
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Kompānija un konti
@@ -859,13 +876,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Aizvērt Iespēja pēc dienas
 ,Reserved,Rezervēts
 DocType: Purchase Order,Supply Raw Materials,Piegādes izejvielas
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Datums, kurā nākamais rēķins tiks radīts. Tas ir radīts apstiprināšanas."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Ilgtermiņa aktīvi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} nav krājums punkts
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',"Lūdzu, dalīties ar jūsu atsauksmēm par apmācību, noklikšķinot uz &quot;Apmācības atsauksmes&quot; un pēc tam uz &quot;Jauns&quot;"
 DocType: Mode of Payment Account,Default Account,Default Account
 DocType: Payment Entry,Received Amount (Company Currency),Saņemtā summa (Company valūta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,"Potenciālais klients ir jānosaka, ja IESPĒJA ir izveidota no Potenciālā klienta"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,"Potenciālais klients ir jānosaka, ja IESPĒJA ir izveidota no Potenciālā klienta"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Lūdzu, izvēlieties nedēļas off diena"
 DocType: Patient,O Negative,O negatīvs
 DocType: Production Order Operation,Planned End Time,Plānotais Beigu laiks
@@ -881,10 +897,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Enerģija
 DocType: Opportunity,Opportunity From,Iespēja no
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mēnešalga paziņojumu.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Pievienot uzņēmumu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rinda {0}: {1} {2} vienumam ir vajadzīgi sērijas numuri. Jūs esat iesniedzis {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rinda {0}: {1} {2} vienumam ir vajadzīgi sērijas numuri. Jūs esat iesniedzis {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,"Lūdzu, atlasiet tabulu"
 DocType: BOM,Website Specifications,Website specifikācijas
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} ir nederīga e-pasta adrese saukumā &quot;Saņēmēji&quot;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} ir nederīga e-pasta adrese saukumā &quot;Saņēmēji&quot;
 DocType: Special Test Items,Particulars,Daži dati
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiotika.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: No {0} tipa {1}
@@ -892,11 +908,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Rinda {0}: pārveidošanas koeficients ir obligāta
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Vairāki Cena Noteikumi pastāv ar tiem pašiem kritērijiem, lūdzu atrisināt konfliktus, piešķirot prioritāti. Cena Noteikumi: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nevar atslēgt vai anulēt BOM, jo tas ir saistīts ar citām BOMs"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nevar atslēgt vai anulēt BOM, jo tas ir saistīts ar citām BOMs"
 DocType: Opportunity,Maintenance,Uzturēšana
 DocType: Item Attribute Value,Item Attribute Value,Postenis īpašības vērtība
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Pārdošanas kampaņas.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,veikt laika kontrolsaraksts
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,veikt laika kontrolsaraksts
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -934,12 +950,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Ievadiet Prece pirmais
 DocType: Account,Liability,Atbildība
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sodīt Summa nevar būt lielāka par prasības summas rindā {0}.
+DocType: Salary Detail,Do not include in total,Neiekļaujiet kopā
 DocType: Company,Default Cost of Goods Sold Account,Default pārdotās produkcijas ražošanas izmaksas konta
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Cenrādis nav izvēlēts
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Cenrādis nav izvēlēts
 DocType: Employee,Family Background,Ģimene Background
 DocType: Request for Quotation Supplier,Send Email,Sūtīt e-pastu
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Brīdinājums: Invalid Pielikums {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Nav Atļaujas
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Brīdinājums: Invalid Pielikums {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Nav Atļaujas
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Citāts pieprasīts
 DocType: Vital Signs,Heart Rate / Pulse,Sirdsdarbības ātrums / impulss
 DocType: Company,Default Bank Account,Default bankas kontu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Lai filtrētu pamatojoties uz partijas, izvēlieties Party Type pirmais"
@@ -967,12 +985,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Prece Row {idx}: {DOCTYPE} {DOCNAME} neeksistē iepriekš &#39;{DOCTYPE}&#39; tabula
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Kontrolsaraksts {0} jau ir pabeigts vai atcelts
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Nav uzdevumi
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Mēneša diena, kurā auto rēķins tiks radīts, piemēram 05, 28 utt"
 DocType: Item Variant Settings,Copy Fields to Variant,Kopēt laukus variējumam
 DocType: Asset,Opening Accumulated Depreciation,Atklāšanas Uzkrātais nolietojums
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Rezultāts ir mazāks par vai vienāds ar 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Uzņemšanas Tool
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C-Form ieraksti
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C-Form ieraksti
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Klientu un piegādātāju
 DocType: Email Digest,Email Digest Settings,E-pasta Digest iestatījumi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Paldies par jūsu biznesu!
@@ -990,13 +1007,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Citāts statuss
 DocType: Maintenance Visit,Completion Status,Pabeigšana statuss
 DocType: HR Settings,Enter retirement age in years,Ievadiet pensionēšanās vecumu gados
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Mērķa Noliktava
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,"Lūdzu, izvēlieties noliktavu"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Mērķa Noliktava
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,"Lūdzu, izvēlieties noliktavu"
 DocType: Cheque Print Template,Starting location from left edge,Sākot atrašanās vietu no kreisās malas
 DocType: Item,Allow over delivery or receipt upto this percent,Atļaut pār piegādi vai saņemšanu līdz pat šim procentiem
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Import apmeklējums
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Visi punkts grupas
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Visi punkts grupas
 DocType: Process Payroll,Activity Log,Aktivitāte Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Neto peļņa / zaudējumi
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automātiski komponēt ziņu iesniegšanas darījumiem.
@@ -1008,7 +1025,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Prognozēts Daudz
 DocType: Sales Invoice,Payment Due Date,Maksājuma Due Date
 DocType: Drug Prescription,Interval UOM,Intervāls UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Postenis Variant {0} jau eksistē ar tiem pašiem atribūtiem
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Postenis Variant {0} jau eksistē ar tiem pašiem atribūtiem
+DocType: Item,Hub Publishing Details,Hub Publicēšanas informācija
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&quot;Atklāšana&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Atvērt darīt
 DocType: Notification Control,Delivery Note Message,Piegāde Note Message
@@ -1028,10 +1046,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: izejviela nevar būt tāda pati kā galvenais postenis
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Kopā piemērojamām izmaksām, kas pirkuma čeka Items galda jābūt tāds pats kā Kopā nodokļiem un nodevām"
 DocType: Sales Team,Incentives,Stimuli
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Reģistrējieties centrā
 DocType: SMS Log,Requested Numbers,Pieprasītie Numbers
 DocType: Production Planning Tool,Only Obtain Raw Materials,Iegūt tikai izejvielas
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Izpildes novērtējuma.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Iespējojot &quot;izmantošana Grozs&quot;, kā Grozs ir iespējota, un ir jābūt vismaz vienam Tax nolikums Grozs"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Iespējojot &quot;izmantošana Grozs&quot;, kā Grozs ir iespējota, un ir jābūt vismaz vienam Tax nolikums Grozs"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Maksājumu Entry {0} ir saistīta pret ordeņa {1}, pārbaudiet, vai tā būtu velk kā iepriekš šajā rēķinā."
 DocType: Sales Invoice Item,Stock Details,Stock Details
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekts Value
@@ -1050,12 +1069,14 @@
 DocType: Salary Slip,Working Days,Darba dienas
 DocType: Serial No,Incoming Rate,Ienākošais Rate
 DocType: Packing Slip,Gross Weight,Bruto svars
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,"Jūsu uzņēmuma nosaukums, par kuru jums ir izveidot šo sistēmu."
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Iespējot centru
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,"Jūsu uzņēmuma nosaukums, par kuru jums ir izveidot šo sistēmu."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Iekļaut brīvdienas Kopā nē. Darba dienu
 DocType: Job Applicant,Hold,Turēt
 DocType: Employee,Date of Joining,Datums Pievienošanās
 DocType: Naming Series,Update Series,Update Series
 DocType: Supplier Quotation,Is Subcontracted,Tiek slēgti apakšuzņēmuma līgumi
+DocType: Restaurant Table,Minimum Seating,Minimālais sēdvietu skaits
 DocType: Item Attribute,Item Attribute Values,Postenis Prasme Vērtības
 DocType: Examination Result,Examination Result,eksāmens rezultāts
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Pirkuma čeka
@@ -1066,13 +1087,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Nevar atrast laika nišu nākamajos {0} dienas ekspluatācijai {1}
 DocType: Production Order,Plan material for sub-assemblies,Plāns materiāls mezgliem
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Pārdošanas Partneri un teritorija
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} jābūt aktīvam
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} jābūt aktīvam
 DocType: Journal Entry,Depreciation Entry,nolietojums Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Lūdzu, izvēlieties dokumenta veidu pirmais"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Atcelt Materiāls Vizītes {0} pirms lauzt šo apkopes vizīte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Sērijas Nr {0} nepieder posteni {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Nepieciešamais Daudz
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Noliktavas ar esošo darījumu nevar pārvērst par virsgrāmatu.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Noliktavas ar esošo darījumu nevar pārvērst par virsgrāmatu.
 DocType: Bank Reconciliation,Total Amount,Kopējā summa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Interneta Publishing
 DocType: Prescription Duration,Number,Numurs
@@ -1083,7 +1104,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Pārdošanas Cenrādis
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Ja tiek atzīmēts, klients tiks izveidots, piesaistīts pacientam. Pacienta rēķini tiks radīti pret šo Klientu. Jūs varat arī izvēlēties pašreizējo Klientu, veidojot pacientu."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicēt sinhronizēt priekšmetus
 DocType: Bank Reconciliation,Account Currency,Konta valūta
 DocType: Lab Test,Sample ID,Parauga ID
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,"Lūdzu, atsaucieties uz noapaļot konta Company"
@@ -1092,11 +1112,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Darbinieku {0} nav aktīvs vai neeksistē
 DocType: Fee Structure,Components,sastāvdaļas
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Ievadiet aktīvu kategorijas postenī {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Postenis Variants {0} atjaunināta
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Postenis Variants {0} atjaunināta
 DocType: Quality Inspection Reading,Reading 6,Lasīšana 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Nevar {0} {1} {2} bez jebkāda negatīva izcili rēķins
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","lai radītu. Ja tiek aizkavēts, jums būs manuāli jāmaina lauka &quot;Atkārtot par mēneša dienu&quot;"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Nevar {0} {1} {2} bez jebkāda negatīva izcili rēķins
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Pirkuma rēķins Advance
-DocType: Hub Settings,Sync Now,Sync Tagad
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Rinda {0}: Credit ierakstu nevar saistīt ar {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Definēt budžetu finanšu gada laikā.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Default Bank / Naudas konts tiks automātiski atjaunināti POS Rēķinā, ja ir izvēlēts šis režīms."
@@ -1108,13 +1129,13 @@
 DocType: Item,Is Purchase Item,Vai iegāde postenis
 DocType: Asset,Purchase Invoice,Pirkuma rēķins
 DocType: Stock Ledger Entry,Voucher Detail No,Kuponu Detail Nr
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Jaunu pārdošanas rēķinu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Jaunu pārdošanas rēķinu
 DocType: Stock Entry,Total Outgoing Value,Kopā Izejošais vērtība
 DocType: Physician,Appointments,Tikšanās
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Atvēršanas datums un aizvēršanas datums ir jāatrodas vienā fiskālā gada
 DocType: Lead,Request for Information,Lūgums sniegt informāciju
 ,LeaderBoard,Līderu saraksts
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Sync Offline rēķini
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Sync Offline rēķini
 DocType: Payment Request,Paid,Samaksāts
 DocType: Program Fee,Program Fee,Program Fee
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1133,11 +1154,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Pasūtījuma postenis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Netieša Ienākumi
 DocType: Student Attendance Tool,Student Attendance Tool,Student Apmeklējumu Tool
+DocType: Restaurant Menu,Price List (Auto created),Cenrādis (automātiski izveidots)
 DocType: Cheque Print Template,Date Settings,Datums iestatījumi
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Pretruna
 ,Company Name,Uzņēmuma nosaukums
 DocType: SMS Center,Total Message(s),Kopējais ziņojumu (-i)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Izvēlieties Prece pārneses
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Izvēlieties Prece pārneses
 DocType: Purchase Invoice,Additional Discount Percentage,Papildu Atlaide procentuālā
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Skatīt sarakstu ar visu palīdzību video
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Izvēlieties kontu vadītājs banku, kurā tika deponēts pārbaude."
@@ -1155,6 +1177,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,metrs
 DocType: Workstation,Electricity Cost,Elektroenerģijas izmaksas
 DocType: HR Settings,Don't send Employee Birthday Reminders,Nesūtiet darbinieku dzimšanas dienu atgādinājumus
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Saglabājiet iestatījumus
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Pieprasītie produkti
 DocType: Item,Inspection Criteria,Pārbaudes kritēriji
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Nodota
 DocType: BOM Website Item,BOM Website Item,BOM Website punkts
@@ -1172,11 +1196,11 @@
 DocType: Journal Entry,Total Amount in Words,Kopā summa vārdiem
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Tur bija kļūda. Viens iespējamais iemesls varētu būt, ka jūs neesat saglabājis formu. Lūdzu, sazinieties ar support@erpnext.com ja problēma joprojām pastāv."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Grozs
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Rīkojums Type jābūt vienam no {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Rīkojums Type jābūt vienam no {0}
 DocType: Lead,Next Contact Date,Nākamais Contact Datums
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Atklāšanas Daudzums
 DocType: Healthcare Settings,Appointment Reminder,Atgādinājums par iecelšanu amatā
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Ievadiet Kontu pārmaiņu summa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Ievadiet Kontu pārmaiņu summa
 DocType: Student Batch Name,Student Batch Name,Student Partijas nosaukums
 DocType: Consultation,Doctor,Ārsts
 DocType: Holiday List,Holiday List Name,Brīvdienu saraksta Nosaukums
@@ -1184,12 +1208,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,grafiks Course
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Akciju opcijas
 DocType: Journal Entry Account,Expense Claim,Izdevumu Pretenzija
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Vai jūs tiešām vēlaties atjaunot šo metāllūžņos aktīvu?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Daudz par {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Vai jūs tiešām vēlaties atjaunot šo metāllūžņos aktīvu?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Daudz par {0}
 DocType: Leave Application,Leave Application,Atvaļinājuma pieteikums
 DocType: Patient,Patient Relation,Pacienta saistība
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Atstājiet Allocation rīks
+DocType: Item,Hub Category to Publish,Hub kategorijas publicēšanai
 DocType: Leave Block List,Leave Block List Dates,Atstājiet Block List Datumi
+DocType: Sales Invoice,Billing Address GSTIN,Norēķinu adrese GSTIN
 DocType: Workstation,Net Hour Rate,Neto stundas likme
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Izkrauti izmaksas pirkuma čeka
 DocType: Company,Default Terms,Noklusējuma noteikumi
@@ -1199,11 +1225,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},"Lūdzu, norādiet {0}"
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Noņemts preces bez izmaiņām daudzumā vai vērtībā.
 DocType: Delivery Note,Delivery To,Piegāde uz
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Atribūts tabula ir obligāta
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Atribūts tabula ir obligāta
 DocType: Production Planning Tool,Get Sales Orders,Saņemt klientu pasūtījumu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} nevar būt negatīvs
 DocType: Training Event,Self-Study,Pašmācība
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Atlaide
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Atlaide
 DocType: Asset,Total Number of Depreciations,Kopējais skaits nolietojuma
 DocType: Sales Invoice Item,Rate With Margin,Novērtēt Ar Margin
 DocType: Sales Invoice Item,Rate With Margin,Novērtēt Ar Margin
@@ -1211,7 +1237,7 @@
 DocType: Task,Urgent,Steidzams
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},"Lūdzu, norādiet derīgu Row ID kārtas {0} tabulā {1}"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Nevar atrast mainīgo:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,"Lūdzu, izvēlieties lauku, kuru vēlaties rediģēt no numpad"
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,"Lūdzu, izvēlieties lauku, kuru vēlaties rediģēt no numpad"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Iet uz Desktop un sākt izmantot ERPNext
 DocType: Item,Manufacturer,Ražotājs
 DocType: Landed Cost Item,Purchase Receipt Item,Pirkuma čeka postenis
@@ -1242,8 +1268,8 @@
 DocType: GL Entry,Against,Pret
 DocType: Item,Default Selling Cost Center,Default pārdošana Izmaksu centrs
 DocType: Sales Partner,Implementation Partner,Īstenošana Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Pasta indekss
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Sales Order {0} {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Pasta indekss
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Sales Order {0} {1}
 DocType: Opportunity,Contact Info,Kontaktinformācija
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Making Krājumu
 DocType: Packing Slip,Net Weight UOM,Neto svara Mērvienība
@@ -1254,6 +1280,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Saņemt Nedēļas Off Datumi
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Beigu Datums nevar būt mazāks par sākuma datuma
 DocType: Sales Person,Select company name first.,Izvēlieties uzņēmuma nosaukums pirmo reizi.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,No augšas uz augšu
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,"Citāti, kas saņemti no piegādātājiem."
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Aizstāt BOM un atjaunināt jaunāko cenu visās BOMs
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Uz {0} | {1}{2}
@@ -1274,7 +1301,7 @@
 DocType: Program Enrollment,Transportation,Transportēšana
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Nederīga Atribūtu
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0}{1} jāiesniedz
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Daudzumam ir jābūt mazākam vai vienādam ar {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Daudzumam ir jābūt mazākam vai vienādam ar {0}
 DocType: SMS Center,Total Characters,Kopā rakstzīmes
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},"Lūdzu, izvēlieties BOM BOM jomā postenim {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form rēķinu Detail
@@ -1289,7 +1316,7 @@
 ,Ordered Items To Be Billed,Pasūtītās posteņi ir Jāmaksā
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,No Range ir jābūt mazāk nekā svārstās
 DocType: Global Defaults,Global Defaults,Globālie Noklusējumi
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Projektu Sadarbība Ielūgums
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Projektu Sadarbība Ielūgums
 DocType: Salary Slip,Deductions,Atskaitījumi
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Darbības nosaukums
@@ -1307,13 +1334,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,PPR Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Nav ko pieprasīt
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Vēl Budget ieraksts &#39;{0}&#39; jau eksistē pret {1} &#39;{2}&#39; uz fiskālo gadu {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"""Faktiskais sākuma datums"" nevar būt lielāks par ""Faktisko beigu datumu"""
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"""Faktiskais sākuma datums"" nevar būt lielāks par ""Faktisko beigu datumu"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Vadība
 DocType: Cheque Print Template,Payer Settings,maksātājs iestatījumi
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Tas tiks pievienots Vienības kodeksa variantu. Piemēram, ja jūsu saīsinājums ir ""SM"", un pozīcijas kods ir ""T-krekls"", postenis kods variants būs ""T-krekls-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Neto Pay (vārdiem), būs redzams pēc tam, kad esat saglabāt algas aprēķinu."
 DocType: Purchase Invoice,Is Return,Vai Return
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Uzmanību!
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Uzmanību!
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Atgriešana / debeta Note
 DocType: Price List Country,Price List Country,Cenrādis Valsts
 DocType: Item,UOMs,Mērvienības
@@ -1328,17 +1355,18 @@
 DocType: Account,Balance Sheet,Bilance
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',"Izmaksās Center postenī ar Preces kods """
 DocType: Fee Validity,Valid Till,Derīgs līdz
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Maksājums Mode nav konfigurēta. Lūdzu, pārbaudiet, vai konts ir iestatīts uz maksājumu Mode vai POS profils."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Maksājums Mode nav konfigurēta. Lūdzu, pārbaudiet, vai konts ir iestatīts uz maksājumu Mode vai POS profils."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Pašu posteni nevar ievadīt vairākas reizes.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Turpmākas kontus var veikt saskaņā grupās, bet ierakstus var izdarīt pret nepilsoņu grupām"
 DocType: Lead,Lead,Potenciālie klienti
 DocType: Email Digest,Payables,Piegādātājiem un darbuzņēmējiem
 DocType: Course,Course Intro,Protams Intro
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Stock Entry {0} izveidots
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Lūdzu, uzstādiet apmeklētāju numerācijas sēriju, izmantojot iestatīšanas&gt; numerācijas sēriju"
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Stock Entry {0} izveidots
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Noraidīts Daudz nevar jāieraksta Pirkuma Atgriezties
 ,Purchase Order Items To Be Billed,Pirkuma pasūtījuma posteņi ir Jāmaksā
 DocType: Purchase Invoice Item,Net Rate,Net Rate
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,"Lūdzu, izvēlieties klientu"
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,"Lūdzu, izvēlieties klientu"
 DocType: Purchase Invoice Item,Purchase Invoice Item,Pirkuma rēķins postenis
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Akciju Ledger Ieraksti un GL Ieraksti tiek nepārpublicēt izraudzītajiem pirkumu čekus
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Postenis 1
@@ -1359,7 +1387,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Dublikāts rinda {0} ar pašu {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Fiskālā gads {0} nav atrasts
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Iestatīšana Darbinieki
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Iestatīšana Darbinieki
 DocType: Sales Order,SO-,TĀTAD-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,"Lūdzu, izvēlieties kodu pirmais"
 DocType: Employee,O-,O-
@@ -1371,12 +1399,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,View Ledger
 DocType: Grading Scale,Intervals,intervāli
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Senākās
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Prece Group pastāv ar tādu pašu nosaukumu, lūdzu mainīt rindas nosaukumu vai pārdēvēt objektu grupu"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Prece Group pastāv ar tādu pašu nosaukumu, lūdzu mainīt rindas nosaukumu vai pārdēvēt objektu grupu"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Pārējā pasaule
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Pārējā pasaule
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,{0} postenis nevar būt partijas
 ,Budget Variance Report,Budžets Variance ziņojums
 DocType: Salary Slip,Gross Pay,Bruto Pay
+DocType: Item,Is Item from Hub,Ir vienība no centrmezgla
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Rinda {0}: darbības veids ir obligāta.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Izmaksātajām dividendēm
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Grāmatvedības Ledger
@@ -1386,8 +1415,9 @@
 DocType: Vehicle Log,Service Detail,Servisa Detail
 DocType: BOM,Item Description,Vienība Apraksts
 DocType: Student Sibling,Student Sibling,Student Radniecīga
-DocType: Purchase Invoice,Is Recurring,Vai Atkārtojas
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Maksājumu Mode
 DocType: Purchase Invoice,Supplied Items,Komplektā Items
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},"Lūdzu, iestatiet aktīvo izvēlni restorānā {0}"
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Daudz ražot
 DocType: Email Digest,New Income,Jauns Ienākumi
@@ -1398,6 +1428,7 @@
 ,Student and Guardian Contact Details,Studentu un Guardian kontaktinformācija
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,"Rinda {0}: piegādātājs {0} e-pasta adrese ir nepieciešams, lai nosūtītu e-pastu"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Pagaidu atklāšana
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Skatīt centru
 ,Employee Leave Balance,Darbinieku Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Atlikums kontā {0} vienmēr jābūt {1}
 DocType: Patient Appointment,More Info,Vairāk info
@@ -1417,13 +1448,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Pasūtījumu {0} nav derīga
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Brīdinājums par jaunu kvotu pieprasījumu
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Pirkuma pasūtījumu palīdzēt jums plānot un sekot līdzi saviem pirkumiem
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Atvainojiet, uzņēmumi nevar tikt apvienots"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Atvainojiet, uzņēmumi nevar tikt apvienots"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab testēšanas priekšraksti
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Kopējais Issue / Transfer daudzums {0} Iekraušanas Pieprasījums {1} \ nedrīkst būt lielāks par pieprasīto daudzumu {2} postenim {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Mazs
 DocType: Employee,Employee Number,Darbinieku skaits
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},"Gadījums (-i), kas jau ir lietošanā. Izmēģināt no lietā Nr {0}"
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},"Gadījums (-i), kas jau ir lietošanā. Izmēģināt no lietā Nr {0}"
 DocType: Project,% Completed,% Pabeigts
 ,Invoiced Amount (Exculsive Tax),Rēķinā Summa (Exculsive nodoklis)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Prece 2
@@ -1438,11 +1469,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Netiešie izdevumi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Rinda {0}: Daudz ir obligāta
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Lauksaimniecība
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Jūsu Produkti vai Pakalpojumi
 DocType: Special Test Items,Special Test Items,Īpašie testa vienumi
 DocType: Mode of Payment,Mode of Payment,Maksājuma veidu
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Website Image vajadzētu būt publiski failu vai tīmekļa URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Website Image vajadzētu būt publiski failu vai tīmekļa URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Tas ir sakne posteni grupas un to nevar rediģēt.
@@ -1450,9 +1481,9 @@
 DocType: Vehicle,Fuel UOM,degvielas UOM
 DocType: Warehouse,Warehouse Contact Info,Noliktava Kontaktinformācija
 DocType: Payment Entry,Write Off Difference Amount,Norakstīt starpības summa
-DocType: Purchase Invoice,Recurring Type,Atkārtojas Type
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: Darbinieku e-pasts nav atrasts, līdz ar to e-pasts nav nosūtīts"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: Darbinieku e-pasts nav atrasts, līdz ar to e-pasts nav nosūtīts"
 DocType: Item,Foreign Trade Details,Ārējās tirdzniecības Detaļas
+,Assessment Plan Status,Novērtējuma plāna statuss
 DocType: Email Digest,Annual Income,Gada ienākumi
 DocType: Serial No,Serial No Details,Sērijas Nr Details
 DocType: Purchase Invoice Item,Item Tax Rate,Postenis Nodokļu likme
@@ -1460,15 +1491,14 @@
 DocType: Student Group Student,Group Roll Number,Grupas Roll skaits
 DocType: Student Group Student,Group Roll Number,Grupas Roll skaits
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Par {0}, tikai kredīta kontus var saistīt pret citu debeta ierakstu"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Kopējais visu uzdevumu atsvari būtu 1. Lūdzu regulēt svaru visām projekta uzdevumus atbilstoši
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Piegāde piezīme {0} nav iesniegta
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Kopējais visu uzdevumu atsvari būtu 1. Lūdzu regulēt svaru visām projekta uzdevumus atbilstoši
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Piegāde piezīme {0} nav iesniegta
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Postenis {0} jābūt Apakšuzņēmēju postenis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapitāla Ekipējums
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cenu noteikums vispirms izvēlas, pamatojoties uz ""Apply On 'jomā, kas var būt punkts, punkts Koncerns vai Brand."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,"Lūdzu, vispirms iestatiet preces kodu"
-DocType: Hub Settings,Seller Website,Pārdevējs Website
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,"Lūdzu, vispirms iestatiet preces kodu"
 DocType: Item,ITEM-,PRIEKŠMETS-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Kopējais piešķirtais procentuālu pārdošanas komanda būtu 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Kopējais piešķirtais procentuālu pārdošanas komanda būtu 100
 DocType: Sales Invoice Item,Edit Description,Edit Apraksts
 DocType: Antibiotic,Antibiotic,Antibiotika
 ,Team Updates,Team Updates
@@ -1489,12 +1519,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Kopā (Uzņēmējdarbības valūta)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Sērijas numurs {0} ieraksta vairāk nekā vienu reizi
 DocType: Depreciation Schedule,Journal Entry,Journal Entry
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} preces progress
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} preces progress
 DocType: Workstation,Workstation Name,Darba vietas nosaukums
 DocType: Grading Scale Interval,Grade Code,grade Code
 DocType: POS Item Group,POS Item Group,POS Prece Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-pasts Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} nepieder posteni {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} nepieder posteni {1}
 DocType: Sales Partner,Target Distribution,Mērķa Distribution
 DocType: Salary Slip,Bank Account No.,Banka Konta Nr
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Tas ir skaitlis no pēdējiem izveidots darījuma ar šo prefiksu
@@ -1511,10 +1541,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Pieprasījums Piedāvājums Piegādātāja
 DocType: Healthcare Settings,Registration Message,Reģistrācijas ziņa
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Detaļas
-DocType: Sales Order,Recurring Upto,Periodisks Līdz pat
 DocType: Prescription Dosage,Prescription Dosage,Recepšu deva
 DocType: Attendance,HR Manager,HR vadītājs
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,"Lūdzu, izvēlieties Company"
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,"Lūdzu, izvēlieties Company"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Piegādātāju rēķinu Datums
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,par
@@ -1530,10 +1559,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Pārklāšanās apstākļi atrasts starp:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Pret Vēstnesī Entry {0} jau ir koriģēts pret kādu citu talonu
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Kopā pasūtījuma vērtība
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Pārtika
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Pārtika
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Novecošana Range 3
 DocType: Maintenance Schedule Item,No of Visits,Nē apmeklējumu
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Maintenance grafiks {0} eksistē pret {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Vai vēlaties publicēt savus vienumus uz centru?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,Mācās students
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valūta Noslēguma kontā jābūt {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Punktu summa visiem mērķiem vajadzētu būt 100. Tas ir {0}
@@ -1544,9 +1574,9 @@
 DocType: Authorization Rule,Average Discount,Vidēji Atlaide
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Utilities
-DocType: Purchase Invoice Item,Accounting,Grāmatvedība
+DocType: POS Profile,Accounting,Grāmatvedība
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,"Lūdzu, izvēlieties partijas par iepildīja preci"
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,"Lūdzu, izvēlieties partijas par iepildīja preci"
 DocType: Asset,Depreciation Schedules,amortizācijas grafiki
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Pieteikumu iesniegšanas termiņš nevar būt ārpus atvaļinājuma piešķiršana periods
 DocType: Activity Cost,Projects,Projekti
@@ -1562,7 +1592,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',"Apstiprinājums statuss ir ""Apstiprināts"" vai ""noraidīts"""
 DocType: Physician,Contacts and Address,Kontakti un adrese
 DocType: Purchase Invoice,Contact Person,Kontaktpersona
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"""Sagaidāmais Sākuma datums"" nevar būt lielāka par ""Sagaidāmais beigu datums"""
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""Sagaidāmais Sākuma datums"" nevar būt lielāka par ""Sagaidāmais beigu datums"""
 DocType: Course Scheduling Tool,Course End Date,"Protams, beigu datums"
 DocType: Holiday List,Holidays,Brīvdienas
 DocType: Sales Order Item,Planned Quantity,Plānotais daudzums
@@ -1570,10 +1600,11 @@
 DocType: Item,Maintain Stock,Uzturēt Noliktava
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Krājumu jau radīti Ražošanas Pasūtīt
 DocType: Employee,Prefered Email,vēlamais Email
+DocType: Student Admission,Eligibility and Details,Atbilstība un detaļas
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Neto izmaiņas pamatlīdzekļa
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Atstāt tukšu, ja to uzskata par visiem apzīmējumiem"
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Lādiņš tips ""Faktiskais"" rindā {0} nevar iekļaut postenī Rate"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,No DATETIME
 DocType: Email Digest,For Company,Par Company
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Sakaru žurnāls.
@@ -1581,19 +1612,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Piegādātāju rezultātu tabulas vērtēšanas mainīgais
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Iepirkuma Summa
 DocType: Sales Invoice,Shipping Address Name,Piegāde Adrese Nosaukums
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Kontu
 DocType: Material Request,Terms and Conditions Content,Noteikumi un nosacījumi saturs
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,nevar būt lielāks par 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Postenis {0} nav krājums punkts
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Postenis {0} nav krājums punkts
 DocType: Maintenance Visit,Unscheduled,Neplānotā
 DocType: Employee,Owned,Pieder
 DocType: Salary Detail,Depends on Leave Without Pay,Atkarīgs Bezalgas atvaļinājums
 DocType: Pricing Rule,"Higher the number, higher the priority","Lielāks skaitlis, augstākā prioritāte"
 ,Purchase Invoice Trends,Pirkuma rēķins tendences
 DocType: Employee,Better Prospects,Labākas izredzes
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Rinda # {0}: Partiju {1} ir tikai {2} gb. Lūdzu, izvēlieties citu partiju, kas ir {3} qty pieejama vai sadalīt rindu uz vairākās rindās, lai nodrošinātu / problēmu no vairākām partijām"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Rinda # {0}: Partiju {1} ir tikai {2} gb. Lūdzu, izvēlieties citu partiju, kas ir {3} qty pieejama vai sadalīt rindu uz vairākās rindās, lai nodrošinātu / problēmu no vairākām partijām"
 DocType: Vehicle,License Plate,Numurzīme
 DocType: Appraisal,Goals,Mērķi
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Izvēlieties POS profilu
 DocType: Warranty Claim,Warranty / AMC Status,Garantijas / AMC statuss
 ,Accounts Browser,Konti Browser
 DocType: Payment Entry Reference,Payment Entry Reference,Maksājumu Entry Reference
@@ -1611,7 +1642,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Darbinieks nevar ziņot sev.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ja konts ir sasalusi, ieraksti ir atļauts ierobežotas lietotājiem."
 DocType: Email Digest,Bank Balance,Bankas bilance
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Grāmatvedības ieraksts par {0}: {1} var veikt tikai valūtā: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Grāmatvedības ieraksts par {0}: {1} var veikt tikai valūtā: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Darba profils, nepieciešams kvalifikācija uc"
 DocType: Journal Entry Account,Account Balance,Konta atlikuma
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Nodokļu noteikums par darījumiem.
@@ -1620,8 +1651,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Kopā nodokļi un maksājumi (Company valūtā)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Rādīt Atvērto fiskālajā gadā ir P &amp; L atlikumus
 DocType: Lab Test Template,Collection Details,Kolekcijas dati
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","izvēlieties cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date no tabConsultation ct, `tabLab Prescription` cp, kur ct.patient = &#39;{0}&#39; un cp.parent = ct. nosaukums un cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Piegāde Konts
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} ir neaktīvs
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Padarīt Pārdošanas pasūtījumu lai palīdzētu jums plānot savu darbu un piegādāt uz laiku
@@ -1638,7 +1667,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Iepakošanas Slip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Office Rent
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS vārti iestatījumi
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import neizdevās!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import neizdevās!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Neviena adrese vēl nav pievienota.
 DocType: Workstation Working Hour,Workstation Working Hour,Darba vietas darba stunda
 DocType: Vital Signs,Blood Pressure,Asinsspiediens
@@ -1663,7 +1692,7 @@
 DocType: Sales Invoice,Source,Avots
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Rādīt slēgts
 DocType: Leave Type,Is Leave Without Pay,Vai atstāt bez Pay
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Asset kategorija ir obligāta ilgtermiņa ieguldījumu postenim
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Asset kategorija ir obligāta ilgtermiņa ieguldījumu postenim
 DocType: Fee Validity,Fee Validity,Maksa derīguma termiņš
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nav atrasti Maksājuma tabulā ieraksti
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Šī {0} konflikti ar {1} uz {2} {3}
@@ -1684,8 +1713,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Izveidot Sasaistes
 DocType: Maintenance Schedule,Schedules,Saraksti
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,"POS profils ir nepieciešams, lai izmantotu pārdošanas vietas"
 DocType: Purchase Invoice Item,Net Amount,Neto summa
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} nav iesniegts tā darbību nevar pabeigt
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} nav iesniegts tā darbību nevar pabeigt
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nr
 DocType: Landed Cost Voucher,Additional Charges,papildu maksa
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Papildu Atlaide Summa (Uzņēmējdarbības valūta)
@@ -1694,7 +1724,7 @@
 ,Support Hour Distribution,Atbalsta stundu izplatīšana
 DocType: Maintenance Visit,Maintenance Visit,Uzturēšana Apmeklēt
 DocType: Student,Leaving Certificate Number,Atstājot apliecības numurs
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Iecelšana atcelta, lūdzu, pārskatiet un atceliet rēķinu {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Iecelšana atcelta, lūdzu, pārskatiet un atceliet rēķinu {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Pieejams Partijas Daudz at Noliktava
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Update Print Format
 DocType: Landed Cost Voucher,Landed Cost Help,Izkrauti izmaksas Palīdzība
@@ -1717,8 +1747,8 @@
 DocType: Patient,Tobacco Past Use,Tabakas iepriekšējā lietošana
 DocType: Sales Invoice Item,Brand Name,Brand Name
 DocType: Purchase Receipt,Transporter Details,Transporter Details
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Lietotājs {0} jau ir piešķirts ārstiem {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Default noliktava ir nepieciešama atsevišķiem posteni
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Lietotājs {0} jau ir piešķirts ārstiem {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Default noliktava ir nepieciešama atsevišķiem posteni
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Kaste
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,iespējams piegādātājs
 DocType: Budget,Monthly Distribution,Mēneša Distribution
@@ -1728,8 +1758,8 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Mērķa
 DocType: Loan Type,Maximum Loan Amount,Maksimālais Kredīta summa
 DocType: Pricing Rule,Pricing Rule,Cenu noteikums
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Duplicate roll numurs students {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Duplicate roll numurs students {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Duplicate roll numurs students {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Duplicate roll numurs students {0}
 DocType: Budget,Action if Annual Budget Exceeded,"Rīcība, ja gada budžets pārsniegts"
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Materiāls Pieprasījums Pirkuma pasūtījums
 DocType: Shopping Cart Settings,Payment Success URL,Maksājumu Success URL
@@ -1746,7 +1776,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} jānorāda tikai vienu reizi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nav atļauts pārsūtīšana vairāk {0} nekā {1} pret Pirkuma pasūtījums {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Lapām Piešķirts Veiksmīgi par {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nav Preces pack
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Nav Preces pack
 DocType: Shipping Rule Condition,From Value,No vērtība
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Ražošanas daudzums ir obligāta
 DocType: Employee Loan,Repayment Method,atmaksas metode
@@ -1760,6 +1790,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Akciju Saistības
 DocType: Purchase Invoice,Supplier Warehouse,Piegādātājs Noliktava
 DocType: Opportunity,Contact Mobile No,Kontaktinformācija Mobilais Nr
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Izvēlieties uzņēmumu
 ,Material Requests for which Supplier Quotations are not created,"Materiāls pieprasījumi, par kuriem Piegādātājs Citāti netiek radīti"
 DocType: Student Group,Set 0 for no limit,Uzstādīt 0 bez ierobežojuma
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Diena (-s), kad jūs piesakāties atvaļinājumu ir brīvdienas. Jums ir nepieciešams, neattiecas uz atvaļinājumu."
@@ -1769,24 +1800,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Padarīt citāts
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,citas Ziņojumi
 DocType: Dependent Task,Dependent Task,Atkarīgs Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Konversijas faktors noklusējuma mērvienība ir 1 kārtas {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Konversijas faktors noklusējuma mērvienība ir 1 kārtas {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Atvaļinājums tipa {0} nevar būt ilgāks par {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Mēģiniet plānojot operācijas X dienas iepriekš.
 DocType: HR Settings,Stop Birthday Reminders,Stop Birthday atgādinājumi
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Lūdzu noteikt Noklusējuma Algas Kreditoru kontu Uzņēmumu {0}
 DocType: SMS Center,Receiver List,Uztvērējs Latviešu
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Meklēt punkts
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Meklēt punkts
 DocType: Patient Appointment,Referring Physician,Referējošais ārsts
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Patērētā summa
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Neto izmaiņas naudas
 DocType: Assessment Plan,Grading Scale,Šķirošana Scale
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mērvienība {0} ir ievadīts vairāk nekā vienu reizi Conversion Factor tabulā
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,jau pabeigts
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mērvienība {0} ir ievadīts vairāk nekā vienu reizi Conversion Factor tabulā
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,jau pabeigts
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock In Hand
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Maksājuma pieprasījums jau eksistē {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Izmaksas Izdoti preces
 DocType: Physician,Hospital,Slimnīca
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Daudzums nedrīkst būt lielāks par {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Daudzums nedrīkst būt lielāks par {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Iepriekšējais finanšu gads nav slēgts
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Vecums (dienas)
 DocType: Quotation Item,Quotation Item,Piedāvājuma rinda
@@ -1797,8 +1828,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Piegādātājs Type meistars.
 DocType: Purchase Order Item,Supplier Part Number,Piegādātājs Part Number
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Konversijas ātrums nevar būt 0 vai 1
-DocType: Sales Invoice,Reference Document,atsauces dokuments
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} tiek atcelts vai pārtraukta
+DocType: Subscription,Reference Document,atsauces dokuments
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} tiek atcelts vai pārtraukta
 DocType: Accounts Settings,Credit Controller,Kredīts Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Transportlīdzekļu Nosūtīšanas datums
 DocType: Healthcare Settings,Default Medical Code Standard,Noklusētais medicīnisko kodu standarts
@@ -1807,6 +1838,7 @@
 DocType: Company,Default Payable Account,Default Kreditoru konts
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Iestatījumi tiešsaistes iepirkšanās grozs, piemēram, kuģošanas noteikumus, cenrādi uc"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Jāmaksā
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Kārtot pēc cenas ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Rezervēts Daudz
 DocType: Party Account,Party Account,Party konts
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Cilvēkresursi
@@ -1818,13 +1850,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Padarīt izmaksa Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Advance pret Piegādātāju ir norakstīt
 DocType: Company,Default Values,Noklusējuma vērtības
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frekvence} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Frekvence} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Atmaksāto līdzekļu kopsummas
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Tas ir balstīts uz baļķiem pret šo Vehicle. Skatīt grafiku zemāk informāciju
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Pret Piegādātāju rēķinu {0} datēts {1}
 DocType: Customer,Default Price List,Default Cenrādis
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Asset Kustība ierakstīt {0} izveidots
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Jūs nevarat izdzēst saimnieciskais gads {0}. Fiskālā gads {0} ir noteikta kā noklusējuma Global iestatījumi
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Klients ar tādu pašu nosaukumu jau pastāv
 DocType: Journal Entry,Entry Type,Entry Type
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Nav novērtējums plāns ir saistīta ar šo novērtēšanas grupu
 ,Customer Credit Balance,Klientu kredīta atlikuma
@@ -1835,7 +1868,7 @@
 DocType: Quotation,Term Details,Term Details
 DocType: Project,Total Sales Cost (via Sales Order),Kopējais pārdošanas izmaksas (ar pārdošanas rīkojumu)
 DocType: Project,Total Sales Cost (via Sales Order),Kopējais pārdošanas izmaksas (ar pārdošanas rīkojumu)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Nevar uzņemt vairāk nekā {0} studentiem šai studentu grupai.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Nevar uzņemt vairāk nekā {0} studentiem šai studentu grupai.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead skaits
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead skaits
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} nedrīkst būt lielāks par 0
@@ -1853,9 +1886,11 @@
 DocType: Lab Test,Technician Name,Tehniķa vārds
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Atsaistītu maksājumu par anulēšana rēķina
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Pašreizējais Kilometru skaits stājās jābūt lielākam nekā sākotnēji Transportlīdzekļa odometra {0}
+DocType: Restaurant Reservation,No Show,Nav šovu
 DocType: Shipping Rule Country,Shipping Rule Country,Piegāde noteikums Country
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Atstājiet un apmeklējums
 DocType: Maintenance Visit,Partially Completed,Daļēji Pabeigts
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Mērena jutība
 DocType: Leave Type,Include holidays within leaves as leaves,"Iekļaut brīvdienas laikā lapām, lapas"
 DocType: Sales Invoice,Packed Items,Iepakotas preces
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garantijas Prasījums pret Sērijas Nr
@@ -1872,13 +1907,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Apmaksātais Summa (Company valūta)
 DocType: Purchase Invoice,Additional Discount,Papildu Atlaide
 DocType: Selling Settings,Selling Settings,Pārdošanas iestatījumi
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Apstipriniet darbību
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Izsoles
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Lūdzu, norādiet nu Daudzums vai Vērtēšanas Rate vai abus"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,izpilde
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,View in grozs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Mārketinga izdevumi
 ,Item Shortage Report,Postenis trūkums ziņojums
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Svars ir minēts, \ nLūdzu nerunājot ""Svara UOM"" too"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Svars ir minēts, \ nLūdzu nerunājot ""Svara UOM"" too"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,"Materiāls Pieprasījums izmantoti, lai šā krājuma Entry"
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Nākamais Nolietojums datums ir obligāta jaunu aktīvu
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Atsevišķa kurss balstās grupa katru Partijas
@@ -1891,12 +1927,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Padarīt grāmatvedības ieraksts Katrs krājumu aprites
 DocType: Leave Allocation,Total Leaves Allocated,Kopā Leaves Piešķirtie
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Noliktava vajadzīgi Row Nr {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Ievadiet derīgu finanšu gada sākuma un beigu datumi
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Ievadiet derīgu finanšu gada sākuma un beigu datumi
 DocType: Employee,Date Of Retirement,Brīža līdz pensionēšanās
 DocType: Upload Attendance,Get Template,Saņemt Template
 DocType: Material Request,Transferred,Pārskaitīts
 DocType: Vehicle,Doors,durvis
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext Setup Complete!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Savākt maksu par pacienta reģistrāciju
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,Nodokļu sabrukuma
@@ -1915,37 +1951,37 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ja šis postenis ir varianti, tad tas nevar izvēlēties pārdošanas pasūtījumiem uc"
 DocType: Lead,Next Contact By,Nākamais Kontakti Pēc
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},"Daudzumu, kas vajadzīgs postenī {0} rindā {1}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},"Daudzumu, kas vajadzīgs postenī {0} rindā {1}"
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},"Noliktava {0} nevar izdzēst, jo pastāv postenī daudzums {1}"
 DocType: Quotation,Order Type,Order Type
-DocType: Purchase Invoice,Notification Email Address,Paziņošana e-pasta adrese
 ,Item-wise Sales Register,Postenis gudrs Sales Reģistrēties
 DocType: Asset,Gross Purchase Amount,Gross Pirkuma summa
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Atvēršanas atlikumi
 DocType: Asset,Depreciation Method,nolietojums metode
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Bezsaistē
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Bezsaistē
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Vai šis nodoklis iekļauts pamatlikmes?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Kopā Mērķa
 DocType: Job Applicant,Applicant for a Job,Pretendents uz darbu
 DocType: Production Plan Material Request,Production Plan Material Request,Ražošanas plāns Materiāls pieprasījums
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Nav Ražošanas Pasūtījumi izveidoti
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Nav Ražošanas Pasūtījumi izveidoti
 DocType: Stock Reconciliation,Reconciliation JSON,Izlīgums JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,"Pārāk daudz kolonnas. Eksportēt ziņojumu un izdrukāt to, izmantojot izklājlapu lietotni."
 DocType: Purchase Invoice Item,Batch No,Partijas Nr
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Pieprasījums pēc citātiem: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Atļaut vairākas pārdošanas pasūtījumos pret Klienta Pirkuma pasūtījums
 DocType: Student Group Instructor,Student Group Instructor,Studentu grupas instruktors
 DocType: Student Group Instructor,Student Group Instructor,Studentu grupas instruktors
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobilo Nr
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Galvenais
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Galvenais
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variants
 DocType: Naming Series,Set prefix for numbering series on your transactions,Uzstādīt tituls numerāciju sērijas par jūsu darījumiem
 DocType: Employee Attendance Tool,Employees HTML,darbinieki HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) ir jābūt aktīvam par šo priekšmetu vai tās veidni
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) ir jābūt aktīvam par šo priekšmetu vai tās veidni
 DocType: Employee,Leave Encashed?,Atvaļinājums inkasēta?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Iespēja No jomā ir obligāta
 DocType: Email Digest,Annual Expenses,gada izdevumi
 DocType: Item,Variants,Varianti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Izveidot pirkuma pasūtījumu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Izveidot pirkuma pasūtījumu
 DocType: SMS Center,Send To,Sūtīt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Nav pietiekami daudz atvaļinājums bilance Atstāt tipa {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Piešķirtā summa
@@ -1963,6 +1999,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Studentu grupa Strength
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Pret Vēstnesī Entry {0} nav nekādas nesaskaņota {1} ierakstu
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,vērtējumi
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Apmācības pasākumi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Dublēt Sērijas Nr stājās postenī {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Nosacījums Shipping Reglamenta
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,ievadiet
@@ -1972,7 +2009,7 @@
 DocType: Sales Order,To Deliver and Bill,Rīkoties un Bill
 DocType: Student Group,Instructors,instruktori
 DocType: GL Entry,Credit Amount in Account Currency,Kredīta summa konta valūtā
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} jāiesniedz
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} jāiesniedz
 DocType: Authorization Control,Authorization Control,Autorizācija Control
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Noraidīts Warehouse ir obligāta pret noraidīts postenī {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Maksājums
@@ -1991,11 +2028,11 @@
 DocType: Quotation Item,Actual Qty,Faktiskais Daudz
 DocType: Sales Invoice Item,References,Atsauces
 DocType: Quality Inspection Reading,Reading 10,Reading 10
-DocType: Hub Settings,Hub Node,Hub Mezgls
+DocType: Hub Category,Hub Node,Hub Mezgls
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Esat ievadījis dublikātus preces. Lūdzu, labot un mēģiniet vēlreiz."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Līdzstrādnieks
 DocType: Asset Movement,Asset Movement,Asset kustība
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,Jauns grozs
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,Jauns grozs
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Postenis {0} nav sērijveida punkts
 DocType: SMS Center,Create Receiver List,Izveidot Uztvērēja sarakstu
 DocType: Vehicle,Wheels,Riteņi
@@ -2009,15 +2046,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikācijas
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Norāda, ka pakete ir daļa no šīs piegādes (Tikai projekts)"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Izveidot maksājuma Ierakstu
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Daudzums postenī {0} nedrīkst būt mazāks par {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Daudzums postenī {0} nedrīkst būt mazāks par {1}
 ,Sales Invoice Trends,PPR tendences
 DocType: Leave Application,Apply / Approve Leaves,Piesakies / Apstiprināt lapām
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Par
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Par
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Var attiekties rindu tikai tad, ja maksa tips ir ""On iepriekšējās rindas summu"" vai ""iepriekšējās rindas Kopā"""
 DocType: Sales Order Item,Delivery Warehouse,Piegādes Noliktava
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Tree finanšu izmaksu centriem.
 DocType: Serial No,Delivery Document No,Piegāde Dokuments Nr
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Lūdzu noteikt &quot;Gain / zaudējumu aprēķinā par aktīvu aizvākšanu&quot; uzņēmumā {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Lūdzu noteikt &quot;Gain / zaudējumu aprēķinā par aktīvu aizvākšanu&quot; uzņēmumā {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Dabūtu preces no pirkumu čekus
 DocType: Serial No,Creation Date,Izveides datums
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Šķiet postenis {0} vairākas reizes Cenrādī {1}
@@ -2028,12 +2065,13 @@
 DocType: Student,Student Mobile Number,Studentu Mobilā tālruņa numurs
 DocType: Item,Has Variants,Ir Varianti
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Atjaunināt atbildi
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Jūs jau atsevišķus posteņus {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Jūs jau atsevišķus posteņus {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nosaukums Mēneša Distribution
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Partijas ID ir obligāta
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Partijas ID ir obligāta
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
-DocType: Purchase Invoice,Recurring Invoice,Atkārtojas rēķins
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,No augšas līdz zemam
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Vispirms izvēlieties programmu
 DocType: Patient Appointment,Patient Age,Pacienta vecums
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Managing Projects
 DocType: Supplier,Supplier of Goods or Services.,Preču piegādātājam vai pakalpojumu.
@@ -2041,8 +2079,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Neapstiprinātie debitoru parādi, kas jāizmanto, ja nav noteikts Pacientam, lai rezervētu konsultāciju izmaksas."
 DocType: Vehicle Log,Fuel Price,degvielas cena
 DocType: Budget,Budget,Budžets
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Iestatīt atvērtu
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Ilgtermiņa ieguldījumu postenim jābūt ne-akciju posteni.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Iestatīt atvērtu
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Ilgtermiņa ieguldījumu postenim jābūt ne-akciju posteni.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budžets nevar iedalīt pret {0}, jo tas nav ienākumu vai izdevumu kontu"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Izpildīts
 DocType: Student Admission,Application Form Route,Pieteikums forma
@@ -2056,12 +2094,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Postenis {0} nav setup Serial Nr. Pārbaudiet Vienības kapteinis
 DocType: Maintenance Visit,Maintenance Time,Apkopes laiks
 ,Amount to Deliver,Summa rīkoties
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Viens un tas pats priekšmets ir ievadīts vairākas reizes. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term Sākuma datums nevar būt pirms Year Sākuma datums mācību gada, uz kuru termiņš ir saistīts (akadēmiskais gads {}). Lūdzu izlabojiet datumus un mēģiniet vēlreiz."
 DocType: Guardian,Guardian Interests,Guardian intereses
 DocType: Naming Series,Current Value,Pašreizējā vērtība
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Vairāki fiskālie gadi pastāv dienas {0}. Lūdzu noteikt uzņēmuma finanšu gads
 DocType: School Settings,Instructor Records to be created by,"Instruktoru ieraksti, ko izveido"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} izveidots
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} izveidots
 DocType: Delivery Note Item,Against Sales Order,Pret pārdošanas rīkojumu
 ,Serial No Status,Sērijas Nr statuss
 DocType: Payment Entry Reference,Outstanding,izcils
@@ -2071,10 +2110,10 @@
 						must be greater than or equal to {2}","Rinda {0}: Lai iestatītu {1} periodiskumu, atšķirība no un uz datuma \ jābūt lielākam par vai vienādam ar {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,"Tas ir balstīts uz krājumu kustības. Skatīt {0}, lai uzzinātu"
 DocType: Pricing Rule,Selling,Pārdošana
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Summa {0} {1} atskaitīt pret {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Summa {0} {1} atskaitīt pret {2}
 DocType: Employee,Salary Information,Alga informācija
 DocType: Sales Person,Name and Employee ID,Darbinieka Vārds un ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Due Date nevar būt pirms nosūtīšanas datums
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Due Date nevar būt pirms nosūtīšanas datums
 DocType: Website Item Group,Website Item Group,Mājas lapa Prece Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Nodevas un nodokļi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Ievadiet Atsauces datums
@@ -2100,7 +2139,7 @@
 DocType: Issue,Resolution Details,Izšķirtspēja Details
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,piešķīrumi
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Pieņemšanas kritēriji
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Ievadiet Materiālu Pieprasījumi tabulā iepriekš
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Ievadiet Materiālu Pieprasījumi tabulā iepriekš
 DocType: Item Attribute,Attribute Name,Atribūta nosaukums
 DocType: BOM,Show In Website,Show In Website
 DocType: Shopping Cart Settings,Show Quantity in Website,Rādīt Daudzums Website
@@ -2109,7 +2148,7 @@
 DocType: Item Reorder,Check in (group),Reģistrēšanās (grupas)
 ,Qty to Order,Daudz pasūtījuma
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Konts galva ar pasīvu vai kapitāla, kurā peļņa / zaudējumi tiks iegrāmatoti"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Ganta shēma visiem uzdevumiem.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Ganta shēma visiem uzdevumiem.
 DocType: Opportunity,Mins to First Response,Min līdz First Response
 DocType: Pricing Rule,Margin Type,Margin Type
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} stundas
@@ -2131,36 +2170,36 @@
 DocType: Patient,Surgical History,Ķirurģijas vēsture
 DocType: Employee,Resignation Letter Date,Atkāpšanās no amata vēstule Datums
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,"Cenu Noteikumi tālāk filtrē, pamatojoties uz daudzumu."
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Lūdzu datumu nosaka Pievienojoties par darbiniekam {0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Lūdzu datumu nosaka Pievienojoties par darbiniekam {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Lūdzu datumu nosaka Pievienojoties par darbiniekam {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Lūdzu datumu nosaka Pievienojoties par darbiniekam {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Kopā Norēķinu Summa (via laiks lapas)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Atkārtot Klientu Ieņēmumu
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) ir jābūt lomu rēķina apstiprinātāja """
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Pāris
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Izvēlieties BOM un Daudzums nobarojamām
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Izvēlieties BOM un Daudzums nobarojamām
 DocType: Asset,Depreciation Schedule,nolietojums grafiks
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Pārdošanas Partner adreses un kontakti
 DocType: Bank Reconciliation Detail,Against Account,Pret kontu
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Half Day Date jābūt starp No Datums un līdz šim
 DocType: Maintenance Schedule Detail,Actual Date,Faktiskais datums
 DocType: Item,Has Batch No,Partijas Nr
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Gada Norēķinu: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Gada Norēķinu: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Preču un pakalpojumu nodokli (PVN Indija)
 DocType: Delivery Note,Excise Page Number,Akcīzes Page Number
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Company, no Datums un līdz šim ir obligāta"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Iegūstiet no konsultācijas
 DocType: Asset,Purchase Date,Pirkuma datums
 DocType: Employee,Personal Details,Personīgie Details
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Lūdzu noteikt &quot;nolietojuma izmaksas centrs&quot; uzņēmumā {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Lūdzu noteikt &quot;nolietojuma izmaksas centrs&quot; uzņēmumā {0}
 ,Maintenance Schedules,Apkopes grafiki
 DocType: Task,Actual End Date (via Time Sheet),Faktiskā Beigu datums (via laiks lapas)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Summa {0} {1} pret {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Summa {0} {1} pret {2} {3}
 ,Quotation Trends,Piedāvājumu tendences
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Postenis Group vienības kapteinis nav minēts par posteni {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Debets Lai kontā jābūt pasūtītāju konta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Debets Lai kontā jābūt pasūtītāju konta
 DocType: Shipping Rule Condition,Shipping Amount,Piegāde Summa
 DocType: Supplier Scorecard Period,Period Score,Perioda rādītājs
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Pievienot Klienti
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Pievienot Klienti
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Kamēr Summa
 DocType: Lab Test Template,Special,Īpašs
 DocType: Purchase Invoice Item,Conversion Factor,Conversion Factor
@@ -2168,13 +2207,14 @@
 ,Vehicle Expenses,transportlīdzekļu Izdevumi
 DocType: Serial No,Invoice Details,Informācija par rēķinu
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Sagaidāmais vērtība pēc lietderīgās jābūt lielākam vai vienādam ar {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Sāciet
+DocType: Hub Category,Hub Category,Hub kategorijas
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Transportlīdzekļu skaits
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Datums, kurā atkārtojas rēķins tiks apstāties"
 DocType: Employee Loan,Loan Amount,Kredīta summa
 DocType: Program Enrollment,Self-Driving Vehicle,Self-Braukšanas Transportlīdzekļu
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Piegādātāju rādītāju karte pastāvīga
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Rinda {0}: Bill of Materials nav atrasta postenī {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Rinda {0}: Bill of Materials nav atrasta postenī {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Kopā piešķirtie lapas {0} nevar būt mazāka par jau apstiprināto lapām {1} par periodu
 DocType: Journal Entry,Accounts Receivable,Debitoru parādi
 ,Supplier-Wise Sales Analytics,Piegādātājs-Wise Sales Analytics
@@ -2186,7 +2226,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Mātes kursi (atstājiet tukšu, ja tas nav daļa no mātes kursa)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Atstājiet tukšu, ja uzskatīja visus darbinieku tipiem"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Izplatīt Maksa Based On
-apps/erpnext/erpnext/hooks.py +131,Timesheets,timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,timesheets
 DocType: HR Settings,HR Settings,HR iestatījumi
 DocType: Salary Slip,net pay info,Neto darba samaksa info
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Šī vērtība tiek atjaunināta Noklusējuma pārdošanas cenu sarakstā.
@@ -2197,7 +2237,7 @@
 DocType: Patient,B Positive,B Pozitīvs
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Daudz jābūt 1, jo prece ir pamatlīdzeklis. Lūdzu, izmantojiet atsevišķu rindu daudzkārtējai qty."
 DocType: Leave Block List Allow,Leave Block List Allow,Atstājiet Block Latviešu Atļaut
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr nevar būt tukšs vai telpa
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr nevar būt tukšs vai telpa
 DocType: Patient Medical Record,Patient Medical Record,Pacienta medicīniskais ieraksts
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Group Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sporta
@@ -2214,9 +2254,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,"Nevar atrast valūtas kursu {0} uz {1} par galveno dienas {2}. Lūdzu, izveidojiet Valūtas maiņas rekordu manuāli"
 DocType: POS Profile,Price List,Cenrādis
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} tagad ir noklusējuma saimnieciskais gads. Lūdzu, atsvaidziniet savu pārlūkprogrammu, lai izmaiņas stātos spēkā."
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Izdevumu Prasības
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Izdevumu Prasības
 DocType: Issue,Support,Atbalsts
 ,BOM Search,BOM Meklēt
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.","Publicēt &quot;Noliktavā&quot; vai &quot;Nav noliktavā&quot; uz centra, pamatojoties uz noliktavā pieejamo noliktavu."
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Noslēguma (atvēršana + kopsummas)
 DocType: Vehicle,Fuel Type,degvielas veids
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Lūdzu, norādiet valūtu Company"
@@ -2228,16 +2269,16 @@
 DocType: Healthcare Settings,Remind Before,Atgādināt pirms
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM pārrēķināšanas koeficients ir nepieciešams rindā {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Document Type jābūt vienam no pārdošanas rīkojumu, pārdošanas rēķinu vai Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Document Type jābūt vienam no pārdošanas rīkojumu, pārdošanas rēķinu vai Journal Entry"
 DocType: Salary Component,Deduction,Atskaitīšana
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Rinda {0}: laiku un uz laiku ir obligāta.
 DocType: Stock Reconciliation Item,Amount Difference,summa Starpība
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Prece Cena pievienots {0} Cenrādī {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Prece Cena pievienots {0} Cenrādī {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Ievadiet Darbinieku Id šīs pārdošanas persona
 DocType: Territory,Classification of Customers by region,Klasifikācija klientiem pa reģioniem
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Starpības summa ir nulle
 DocType: Project,Gross Margin,Bruto peļņa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Ievadiet Ražošanas Prece pirmais
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Ievadiet Ražošanas Prece pirmais
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Aprēķinātais Bankas pārskats bilance
 DocType: Normal Test Template,Normal Test Template,Normālās pārbaudes veidne
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,invalīdiem lietotāju
@@ -2247,21 +2288,22 @@
 DocType: Salary Slip,Total Deduction,Kopā atskaitīšana
 ,Production Analytics,ražošanas Analytics
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Tas ir balstīts uz darījumiem ar šo pacientu. Sīkāku informāciju skatiet tālāk redzamajā laika grafikā
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Izmaksas Atjaunots
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Izmaksas Atjaunots
 DocType: Employee,Date of Birth,Dzimšanas datums
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Postenis {0} jau ir atgriezies
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Saimnieciskais gads ** pārstāv finanšu gads. Visus grāmatvedības ierakstus un citi lielākie darījumi kāpurķēžu pret ** fiskālā gada **.
 DocType: Opportunity,Customer / Lead Address,Klients / Lead adrese
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Piegādātāju veiktspējas kartes iestatīšana
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Brīdinājums: Invalid SSL sertifikātu par arestu {0}
-DocType: Student Admission,Eligibility,Tiesības
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Vērtēšanas plāna nosaukums
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Brīdinājums: Invalid SSL sertifikātu par arestu {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Sasaistes palīdzēt jums iegūt biznesa, pievienot visus savus kontaktus un vairāk kā jūsu rezultātā"
 DocType: Production Order Operation,Actual Operation Time,Faktiskais Darbības laiks
 DocType: Authorization Rule,Applicable To (User),Piemērojamais Lai (lietotājs)
 DocType: Purchase Taxes and Charges,Deduct,Atskaitīt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Darba apraksts
 DocType: Student Applicant,Applied,praktisks
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Re-open
 DocType: Sales Invoice Item,Qty as per Stock UOM,Daudz kā vienu akciju UOM
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 vārds
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciālās rakstzīmes, izņemot ""-"" ""."", ""#"", un ""/"" nav atļauts nosaucot sērijas"
@@ -2273,7 +2315,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Ražošanas vadītājs
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Sērijas Nr {0} ir garantijas līdz pat {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Split Piegāde piezīme paketēs.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Sūtījumi
+apps/erpnext/erpnext/hooks.py +107,Shipments,Sūtījumi
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Kopējā piešķirtā summa (Company valūta)
 DocType: Purchase Order Item,To be delivered to customer,Jāpiegādā klientam
 DocType: BOM,Scrap Material Cost,Lūžņi materiālu izmaksas
@@ -2296,8 +2338,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Vienuma variantu iestatījumi
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Izvēlieties Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Atstāt tukšu, ja to uzskata par visu departamentu"
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Nodarbinātības veidi (pastāvīgs, līgums, intern uc)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} ir obligāta postenī {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Nodarbinātības veidi (pastāvīgs, līgums, intern uc)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} ir obligāta postenī {1}
 DocType: Process Payroll,Fortnightly,divnedēļu
 DocType: Currency Exchange,From Currency,No Valūta
 DocType: Vital Signs,Weight (In Kilogram),Svars (kilogramā)
@@ -2322,7 +2364,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Lūdzu, noklikšķiniet uz ""Generate grafiks"", lai saņemtu grafiku"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,"Bija kļūdas, vienlaikus dzēšot šādus grafikus:"
 DocType: Bin,Ordered Quantity,Pasūtīts daudzums
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","piemēram, ""Build instrumenti celtniekiem"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","piemēram, ""Build instrumenti celtniekiem"""
 DocType: Grading Scale,Grading Scale Intervals,Skalu intervāli
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Grāmatvedība Entry par {2} var veikt tikai valūtā: {3}
 DocType: Production Order,In Process,In process
@@ -2346,11 +2388,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Ar nodokļa samaksu
 DocType: Expense Claim Detail,Expense Claim Detail,Izdevumu Pretenzija Detail
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Trīs eksemplāros piegādātājs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,"Lūdzu, izvēlieties pareizo kontu"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,"Lūdzu, izvēlieties pareizo kontu"
 DocType: Item,Weight UOM,Svara Mērvienība
 DocType: Salary Structure Employee,Salary Structure Employee,Alga Struktūra Darbinieku
 DocType: Patient,Blood Group,Asins Group
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Līdz
 DocType: Course,Course Name,Kursa nosaukums
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Lietotāji, kuri var apstiprināt konkrētā darbinieka atvaļinājumu pieteikumus"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Biroja iekārtas
@@ -2369,7 +2410,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Cenas netiks parādīts, ja Cenrādis nav noteikts"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Lūdzu, norādiet valsti šim Shipping noteikuma vai pārbaudīt Worldwide Shipping"
 DocType: Stock Entry,Total Incoming Value,Kopā Ienākošais vērtība
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Debets ir nepieciešama
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Debets ir nepieciešama
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets palīdz sekot līdzi laika, izmaksu un rēķinu par aktivitātēm, ko veic savu komandu"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pirkuma Cenrādis
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Piegādes rezultātu tabulas mainīgie modeļi.
@@ -2379,7 +2420,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Maksājumu Izlīgums
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Lūdzu, izvēlieties incharge Personas vārds"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tehnoloģija
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Pavisam Neapmaksāta: {0}
+DocType: Hub Settings,Unregister from Hub,Izņemt reģistrāciju no centra
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Pavisam Neapmaksāta: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Mājas Darbība
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Piedāvājuma vēstule
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Izveidot Materiāls Pieprasījumi (MRP) un pasūtījumu.
@@ -2391,7 +2433,9 @@
 DocType: Physician Schedule Time Slot,To Time,Uz laiku
 DocType: Authorization Rule,Approving Role (above authorized value),Apstiprinot loma (virs atļautā vērtība)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Kredīts kontā jābūt Kreditoru konts
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM rekursijas: {0} nevar būt vecāks vai bērns {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Lūdzu, izvēlieties Studentu uzņemšanu, kas ir obligāta apmaksātajam studenta pretendentam"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM rekursijas: {0} nevar būt vecāks vai bērns {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,"Lūdzu, izvēlieties cenu sarakstu, lai publicētu cenu"
 DocType: Production Order Operation,Completed Qty,Pabeigts Daudz
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Par {0}, tikai debeta kontus var saistīt pret citu kredīta ierakstu"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Cenrādis {0} ir invalīds
@@ -2404,39 +2448,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} kārtas numurus, kas nepieciešami postenī {1}. Jums ir sniegušas {2}."
 DocType: Stock Reconciliation Item,Current Valuation Rate,Pašreizējais Vērtēšanas Rate
 DocType: Item,Customer Item Codes,Klientu punkts Codes
+DocType: Training Event,Advance,Avanss
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,lai atkārtotu atkārtotu darbību.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange Gain / zaudējumi
 DocType: Opportunity,Lost Reason,Zaudēja Iemesls
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Jaunā adrese
 DocType: Quality Inspection,Sample Size,Izlases lielums
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Ievadiet saņemšana dokuments
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Visi posteņi jau ir rēķinā
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Lūdzu, norādiet derīgu ""No lietā Nr '"
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',"Lūdzu, norādiet derīgu ""No lietā Nr '"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Turpmākie izmaksu centrus var izdarīt ar grupu, bet ierakstus var izdarīt pret nepilsoņu grupām"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Lietotāji un atļaujas
 DocType: Vehicle Log,VLOG.,Vlogi.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Ražošanas Pasūtījumi Izveidoja: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Ražošanas Pasūtījumi Izveidoja: {0}
 DocType: Branch,Branch,Filiāle
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Drukāšana un zīmols
 DocType: Company,Total Monthly Sales,Kopējie mēneša pārdošanas apjomi
 DocType: Bin,Actual Quantity,Faktiskais daudzums
 DocType: Shipping Rule,example: Next Day Shipping,Piemērs: Nākošā diena Piegāde
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Sērijas Nr {0} nav atrasts
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Abonements ir {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Abonements ir {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Maksu grafika programma
 DocType: Fee Schedule Program,Student Batch,Student Partijas
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,"izvēlieties * no &quot;tabVital Signs&quot;, kur pacients = &#39;{0}&#39; kārtībā ar signs_date desc limit 1"
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,padarīt Students
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Minimālais vērtējums
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Jūs esat uzaicināts sadarboties projektam: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Ārsts nav pieejams {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Jūs esat uzaicināts sadarboties projektam: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Ārsts nav pieejams {0}
 DocType: Leave Block List Date,Block Date,Block Datums
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Pievienojiet pielāgota lauka abonēšanas ID doctype {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Piegādātāja piegādes piezīme
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Pieteikties tagad
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Pieteikties tagad
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Faktiskais Daudz {0} / Waiting Daudz {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Faktiskais Daudz {0} / Waiting Daudz {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-komercija GSTIN
 DocType: Sales Order,Not Delivered,Nav sniegusi
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Paredzamais datums nevar būt pirms darījuma datuma
 ,Bank Clearance Summary,Banka Klīrenss kopsavilkums
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Izveidot un pārvaldīt ikdienas, iknedēļas un ikmēneša e-pasta hidrolizātus."
 DocType: Appraisal Goal,Appraisal Goal,Izvērtēšana Goal
@@ -2444,12 +2489,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,ēkas
 DocType: Fee Schedule,Fee Structure,maksa struktūra
 DocType: Timesheet Detail,Costing Amount,Izmaksu summa
-DocType: Student Admission,Application Fee,Pieteikuma maksa
+DocType: Student Admission Program,Application Fee,Pieteikuma maksa
 DocType: Process Payroll,Submit Salary Slip,Iesniegt par atalgojumu
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maxiumm atlaide Vienības {0}{1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Maxiumm atlaide Vienības {0}{1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import masas
 DocType: Sales Partner,Address & Contacts,Adrese & Kontakti
 DocType: SMS Log,Sender Name,Sūtītājs Vārds
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Kārtot pēc kritērijiem
 DocType: POS Profile,[Select],[Izvēlēties]
 DocType: Vital Signs,Blood Pressure (diastolic),Asinsspiediens (diastoliskais)
 DocType: SMS Log,Sent To,Nosūtīts
@@ -2458,7 +2504,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Nākamais Kontaktinformācija datums nedrīkst būt pagātnē
 DocType: Company,For Reference Only.,Tikai atsaucei.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Ārsts {0} nav pieejams {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Izvēlieties Partijas Nr
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Izvēlieties Partijas Nr
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Nederīga {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,Atsauces ieguldījums
@@ -2474,15 +2520,15 @@
 DocType: Normal Test Items,Require Result Value,Pieprasīt rezultātu vērtību
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case No. nevar būt 0
 DocType: Item,Show a slideshow at the top of the page,Parādiet slaidrādi augšpusē lapas
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,BOMs
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Veikali
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,BOMs
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Veikali
 DocType: Project Type,Projects Manager,Projektu vadītāja
 DocType: Serial No,Delivery Time,Piegādes laiks
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Novecošanās Based On
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Iecelšana atcelta
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Iecelšana atcelta
 DocType: Item,End of Life,End of Life
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Ceļot
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Nav aktīvas vai noklusējuma Alga struktūra down darbiniekam {0} par dotajiem datumiem
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Ceļot
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Nav aktīvas vai noklusējuma Alga struktūra down darbiniekam {0} par dotajiem datumiem
 DocType: Leave Block List,Allow Users,Atļaut lietotājiem
 DocType: Purchase Order,Customer Mobile No,Klientu Mobile Nr
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Atkārtojas
@@ -2491,12 +2537,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Atjaunināt izmaksas
 DocType: Item Reorder,Item Reorder,Postenis Pārkārtot
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Rādīt Alga Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Transfer Materiāls
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Transfer Materiāls
 DocType: Fees,Send Payment Request,Sūtīt maksājuma pieprasījumu
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Norādiet operācijas, ekspluatācijas izmaksas un sniegt unikālu ekspluatācijā ne jūsu darbībām."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Šis dokuments ir pāri robežai ar {0} {1} par posteni {4}. Jūs padarīt vēl {3} pret pats {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Lūdzu noteikt atkārtojas pēc glābšanas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Izvēlieties Mainīt summu konts
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Izvēlieties Mainīt summu konts
 DocType: Purchase Invoice,Price List Currency,Cenrādis Currency
 DocType: Naming Series,User must always select,Lietotājam ir vienmēr izvēlēties
 DocType: Stock Settings,Allow Negative Stock,Atļaut negatīvs Stock
@@ -2516,7 +2562,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Darbinieks
 DocType: Sample Collection,Collected Time,Savāktais laiks
 DocType: Company,Sales Monthly History,Pārdošanas mēneša vēsture
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Izvēlieties Partijas
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Izvēlieties Partijas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0}{1} ir pilnībā jāmaksā
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Vital Signs
 DocType: Training Event,End Time,Beigu laiks
@@ -2524,16 +2570,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Maksājumu Atskaitījumi vai zaudējumi
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standarta līguma noteikumi par pārdošanu vai pirkšanu.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Grupa ar kuponu
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Vai tiešām vēlaties atcelt šo tikšanos?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Sales Pipeline
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Lūdzu iestatīt noklusēto kontu Algu komponentes {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nepieciešamais On
 DocType: Rename Tool,File to Rename,Failu pārdēvēt
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Lūdzu, izvēlieties BOM par posteni rindā {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Lūdzu, izvēlieties BOM par posteni rindā {0}"
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Konta {0} nesakrīt ar uzņēmumu {1} no konta režīms: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Noteiktais BOM {0} nepastāv postenī {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Uzturēšana Kalendārs {0} ir atcelts pirms anulējot šo klientu pasūtījumu
+DocType: POS Profile,Applicable for Users,Attiecas uz lietotājiem
 DocType: Notification Control,Expense Claim Approved,Izdevumu Pretenzija Apstiprināts
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Alga Slip darbinieka {0} jau izveidotas šajā periodā
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Alga Slip darbinieka {0} jau izveidotas šajā periodā
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Farmaceitisks
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Izmaksas iegādātās preces
 DocType: Selling Settings,Sales Order Required,Pasūtījumu Nepieciešamais
@@ -2558,6 +2606,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,organizēšana
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,organizēšana
 DocType: BOM Update Tool,BOM Update Tool,BOM atjaunināšanas rīks
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Puses konts nav norādīts, lūdzu, uzstādiet uzņēmuma pārapdrošināšanas kontu"
 DocType: SG Creation Tool Course,Student Group Name,Student Grupas nosaukums
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Maksu izveidošana
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Lūdzu, pārliecinieties, ka jūs tiešām vēlaties dzēst visus darījumus šajā uzņēmumā. Jūsu meistars dati paliks kā tas ir. Šo darbību nevar atsaukt."
@@ -2566,29 +2615,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}), nevar būt lielāks par plānoto daudzumu ({2}) ražošanas pasūtījumā {3}"
 DocType: Shipping Rule,Shipping Rule Label,Piegāde noteikums Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,lietotāju forums
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Izejvielas nevar būt tukšs.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Nevarēja atjaunināt sastāvu, rēķins ir piliens kuģniecības objektu."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Izejvielas nevar būt tukšs.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Nevarēja atjaunināt sastāvu, rēķins ir piliens kuģniecības objektu."
 DocType: Lab Test Sample,Lab Test Sample,Laba testa paraugs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Jūs nevarat mainīt likmi, ja BOM minēja agianst jebkuru posteni"
+DocType: Restaurant,Invoice Series Prefix,Rēķinu sērijas prefikss
 DocType: Employee,Previous Work Experience,Iepriekšējā darba pieredze
 DocType: Stock Entry,For Quantity,Par Daudzums
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Ievadiet Plānotais Daudzums postenī {0} pēc kārtas {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Ievadiet Plānotais Daudzums postenī {0} pēc kārtas {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0}{1} nav iesniegta
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Lūgumus par.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Atsevišķa produkcija pasūtījums tiks izveidots katrā gatavā labu posteni.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} ir negatīva atgriešanās dokumentā
 ,Minutes to First Response for Issues,Minūtes First Response jautājumos
 DocType: Purchase Invoice,Terms and Conditions1,Noteikumi un Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,"Institūta nosaukums, ko jums ir izveidot šo sistēmu."
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,"Institūta nosaukums, ko jums ir izveidot šo sistēmu."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Grāmatvedības ieraksts iesaldēta līdz šim datumam, neviens nevar darīt / mainīt ierakstu izņemot lomu zemāk norādīto."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Lūdzu, saglabājiet dokumentu pirms ražošanas apkopes grafiku"
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Jaunākā cena atjaunināta visos BOM
 DocType: Fee Schedule,Successful,Veiksmīga
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekta statuss
 DocType: UOM,Check this to disallow fractions. (for Nos),Pārbaudiet to neatļaut frakcijas. (Par Nr)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Tika izveidoti šādi pasūtījumu:
-DocType: Student Admission,Naming Series (for Student Applicant),Naming Series (par studentu Pieteikuma)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Tika izveidoti šādi pasūtījumu:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Naming Series (par studentu Pieteikuma)
 DocType: Delivery Note,Transporter Name,Transporter Name
 DocType: Authorization Rule,Authorized Value,Autorizēts Value
 DocType: BOM,Show Operations,Rādīt Operations
@@ -2612,7 +2662,7 @@
 ,Employees working on a holiday,Darbinieki strādā par brīvdienu
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Present
 DocType: Project,% Complete Method,% Complete metode
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Narkotiku lietošana
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Narkotiku lietošana
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Uzturēšana sākuma datums nevar būt pirms piegādes datuma Serial Nr {0}
 DocType: Production Order,Actual End Date,Faktiskais beigu datums
 DocType: BOM,Operating Cost (Company Currency),Ekspluatācijas izmaksas (Company valūta)
@@ -2630,13 +2680,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,"Apstiprinot lietotājs nevar pats, lietotājs noteikums ir piemērojams"
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (par katru akciju UOM)
 DocType: SMS Log,No of Requested SMS,Neviens pieprasījuma SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Atstāt bez samaksas nesakrīt ar apstiprināto atvaļinājums ierakstus
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Atstāt bez samaksas nesakrīt ar apstiprināto atvaļinājums ierakstus
 DocType: Campaign,Campaign-.####,Kampaņa -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Nākamie soļi
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Lūdzu sniegt norādītos objektus pēc iespējas zemas cenas
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Veikt rēķinu
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto tuvu Opportunity pēc 15 dienām
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Pirkuma pasūtījumi nav atļauti {0} dēļ rezultātu rādītāja statusā {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Pirkuma pasūtījumi nav atļauti {0} dēļ rezultātu rādītāja statusā {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,beigu gads
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2644,6 +2694,7 @@
 DocType: Vital Signs,Nutrition Values,Uztura vērtības
 DocType: Lab Test Template,Is billable,Ir apmaksājams
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}","Gan &quot;Ārstu grafiks&quot;, gan Laiks pēc iecelšanas &quot;ir jānosaka Dr {0}"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Trešā persona izplatītājs / tirgotājs / komisijas pārstāvis / filiāli / izplatītāja, kurš pārdod uzņēmumiem produktus komisija."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} pret Pirkuma pasūtījums {1}
 DocType: Patient,Patient Demographics,Pacientu demogrāfiskie dati
@@ -2673,7 +2724,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","Standarts nodokļu veidni, ko var attiecināt uz visiem pirkuma darījumiem. Šī veidne var saturēt sarakstu nodokļu galvas un arī citu izdevumu vadītāji, piemēram, ""Shipping"", ""apdrošināšanu"", ""Handling"" uc #### Piezīme nodokļa likmi jūs definētu šeit būs standarta nodokļa likme visiem ** preces * *. Ja ir ** Preces **, kas ir atšķirīgas cenas, tie ir jāiekļauj tajā ** Vienības nodokli ** tabulu ** Vienības ** meistars. #### Apraksts kolonnas 1. Aprēķins tips: - Tas var būt ** Neto Kopā ** (tas ir no pamatsummas summa). - ** On iepriekšējā rindā Total / Summa ** (kumulatīvais nodokļiem un nodevām). Ja izvēlaties šo opciju, nodoklis tiks piemērots kā procentus no iepriekšējās rindas (jo nodokļa tabulas) summu vai kopā. - ** Faktiskais ** (kā minēts). 2. Konta vadītājs: Account grāmata, saskaņā ar kuru šis nodoklis tiks rezervēts 3. Izmaksu Center: Ja nodoklis / maksa ir ienākumi (piemēram, kuģošanas) vai izdevumu tai jārezervē pret izmaksām centra. 4. Apraksts: apraksts nodokļa (kas tiks drukāts faktūrrēķinu / pēdiņām). 5. Rate: Nodokļa likme. 6. Summa: nodokļu summa. 7. Kopējais: kumulatīvais kopējais šo punktu. 8. Ievadiet rinda: ja, pamatojoties uz ""Iepriekšējā Row Total"", jūs varat izvēlēties rindas numuru, kas tiks ņemta par pamatu šim aprēķinam (noklusējums ir iepriekšējā rinda). 9. uzskata nodokļu vai maksājumu par: Šajā sadaļā jūs varat norādīt, vai nodoklis / maksa ir tikai novērtēšanas (nevis daļa no kopējā apjoma), vai tikai kopā (nepievieno vērtību vienība), vai abiem. 10. Pievienot vai atņem: Vai jūs vēlaties, lai pievienotu vai atskaitīt nodokli."
 DocType: Homepage,Homepage,Mājaslapa
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Izvēlieties ārstu ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',"atjaunināt cilniKonsulācijas iestatījums rēķins = &#39;{0}&#39;, kur nosaukums = &#39;{1}&#39;"
 DocType: Purchase Receipt Item,Recd Quantity,Recd daudzums
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Maksa Records Izveidoja - {0}
 DocType: Asset Category Account,Asset Category Account,Asset kategorija konts
@@ -2685,7 +2735,7 @@
 DocType: Asset,Manual,rokasgrāmata
 DocType: Salary Component Account,Salary Component Account,Algas Component konts
 DocType: Global Defaults,Hide Currency Symbol,Slēpt valūtas simbolu
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","piemēram, Bank, Cash, Credit Card"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","piemēram, Bank, Cash, Credit Card"
 DocType: Lead Source,Source Name,Source Name
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Parastā asinsspiediena atgūšana pieaugušajam ir aptuveni 120 mmHg sistoliskā un 80 mmHg diastoliskā, saīsināti &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Kredīts Note
@@ -2704,16 +2754,16 @@
 DocType: Patient,Occupation,nodarbošanās
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Rinda {0}: Sākuma datumam jābūt pirms beigu datuma
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Kopā (Daudz)
-DocType: Sales Invoice,This Document,šo dokumentu
 DocType: Installation Note Item,Installed Qty,Uzstādītas Daudz
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Tas varētu būt dažu nederīgu e-pasta adreses dēļ
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Jūs pievienojāt
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,apmācības rezultāts
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,apmācības rezultāts
 DocType: Purchase Invoice,Is Paid,tiek pievērsta
 DocType: Salary Structure,Total Earning,Kopā krāšana
 DocType: Purchase Receipt,Time at which materials were received,"Laiks, kurā materiāli tika saņemti"
 DocType: Stock Ledger Entry,Outgoing Rate,Izejošais Rate
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Organizācija filiāle meistars.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Organizācija filiāle meistars.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,vai
 DocType: Sales Order,Billing Status,Norēķinu statuss
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Ziņojiet par problēmu
@@ -2728,8 +2778,9 @@
 DocType: Notification Control,Sales Order Message,Sales Order Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Iestatītu noklusētās vērtības, piemēram, Company, valūtas, kārtējā fiskālajā gadā, uc"
 DocType: Payment Entry,Payment Type,Maksājuma veids
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Lūdzu, izvēlieties partijai postenis {0}. Nevar atrast vienu partiju, kas atbilst šo prasību"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Lūdzu, izvēlieties partijai postenis {0}. Nevar atrast vienu partiju, kas atbilst šo prasību"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Lūdzu, izvēlieties partijai postenis {0}. Nevar atrast vienu partiju, kas atbilst šo prasību"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Lūdzu, izvēlieties partijai postenis {0}. Nevar atrast vienu partiju, kas atbilst šo prasību"
+DocType: Hub Category,Parent Category,Vecāku kategorija
 DocType: Process Payroll,Select Employees,Izvēlieties Darbinieki
 DocType: Opportunity,Potential Sales Deal,Potenciālie Sales Deal
 DocType: Complaint,Complaints,Sūdzības
@@ -2767,7 +2818,7 @@
 DocType: Bin,Reserved Quantity,Rezervēts daudzums
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Ievadiet derīgu e-pasta adresi
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Ievadiet derīgu e-pasta adresi
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,"Lūdzu, izvēlieties preci grozā"
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,"Lūdzu, izvēlieties preci grozā"
 DocType: Landed Cost Voucher,Purchase Receipt Items,Pirkuma čeka Items
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Pielāgošana Veidlapas
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,Arrear
@@ -2777,15 +2828,15 @@
 DocType: Payment Request,Amount in customer's currency,Summa klienta valūtā
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Nodošana
 DocType: Stock Reconciliation Item,Current Qty,Pašreizējais Daudz
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Pievienojiet piegādātājus
+DocType: Restaurant Menu,Restaurant Menu,Restorāna ēdienkarte
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Iepriekšējā
 DocType: Appraisal Goal,Key Responsibility Area,Key Atbildība Platība
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Studentu Partijas palīdzēs jums izsekot apmeklējumu, slēdzienus un maksu studentiem"
 DocType: Payment Entry,Total Allocated Amount,Kopējā piešķirtā summa
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Iestatīt noklusējuma inventāra veido pastāvīgās uzskaites
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Iestatīt noklusējuma inventāra veido pastāvīgās uzskaites
 DocType: Item Reorder,Material Request Type,Materiāls Pieprasījuma veids
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural Journal Entry algām no {0} līdz {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage ir pilna, nav ietaupīt"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage ir pilna, nav ietaupīt"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Conversion Factor ir obligāta
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Telpas ietilpība
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref
@@ -2824,16 +2875,18 @@
 DocType: Project,Task Completion,uzdevums pabeigšana
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Nav noliktavā
 DocType: Appraisal,HR User,HR User
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Nodokļi un maksājumi Atskaitīts
-apps/erpnext/erpnext/hooks.py +129,Issues,Jautājumi
+apps/erpnext/erpnext/hooks.py +138,Issues,Jautājumi
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Statuss ir jābūt vienam no {0}
 DocType: Sales Invoice,Debit To,Debets
+DocType: Restaurant Menu Item,Restaurant Menu Item,Restorāna izvēlnes vienums
 DocType: Delivery Note,Required only for sample item.,Nepieciešams tikai paraugu posteni.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Faktiskais Daudz Pēc Darījuma
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Nav alga slip atrasts starp {0} un {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Nav alga slip atrasts starp {0} un {1}
 ,Pending SO Items For Purchase Request,Kamēr SO šeit: pirkuma pieprasījumu
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,studentu Uzņemšana
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} ir izslēgts
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,studentu Uzņemšana
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} ir izslēgts
 DocType: Supplier,Billing Currency,Norēķinu valūta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Īpaši liels
@@ -2856,6 +2909,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Lūdzu, norādiet neviena apmeklējumu nepieciešamo"
 DocType: Stock Settings,Default Valuation Method,Default Vērtēšanas metode
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,Maksa
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Atjaunināšana notiek Tas var aizņemt laiku.
 DocType: Vehicle Log,Fuel Qty,degvielas Daudz
 DocType: Production Order Operation,Planned Start Time,Plānotais Sākuma laiks
 DocType: Course,Assessment,novērtējums
@@ -2871,7 +2925,7 @@
 DocType: Price List,Price List Master,Cenrādis Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Visi pārdošanas darījumi var tagged pret vairāku ** pārdevēji **, lai jūs varat noteikt un kontrolēt mērķus."
 ,S.O. No.,SO No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},"Lūdzu, izveidojiet Klientam no Svins {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},"Lūdzu, izveidojiet Klientam no Svins {0}"
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Atlasiet pacientu
 DocType: Price List,Applicable for Countries,Piemērojams valstīs
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Parametra nosaukums
@@ -2903,27 +2957,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Izdevumu / Starpība konts ({0}) ir jābūt ""peļņa vai zaudējumi"" konts"
 DocType: Project,Copied From,kopēts no
 DocType: Project,Copied From,kopēts no
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Vārds kļūda: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,trūkums
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Vārds kļūda: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,trūkums
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} nav saistīta ar {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Apmeklējumu par darbiniekam {0} jau ir atzīmēts
 DocType: Packing Slip,If more than one package of the same type (for print),"Ja vairāk nekā viens iepakojums, no tā paša veida (drukāšanai)"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,"Lūdzu, iestatiet noklusējuma klientu restorāna iestatījumos"
 ,Salary Register,alga Reģistrēties
 DocType: Warehouse,Parent Warehouse,Parent Noliktava
 DocType: C-Form Invoice Detail,Net Total,Net Kopā
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Default BOM nav atrasts postenī {0} un Project {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Default BOM nav atrasts postenī {0} un Project {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Definēt dažādus aizdevumu veidus
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Izcila Summa
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Laiks (min)
 DocType: Project Task,Working,Darba
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock Rinda (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Finanšu gads
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Finanšu gads
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} nepieder Sabiedrībai {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,"Nevarēja atrisināt kritēriju novērtēšanas funkciju {0}. Pārliecinieties, vai formula ir derīga."
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Maksāt tik uz
 DocType: Healthcare Settings,Out Patient Settings,Notiek pacienta iestatījumi
 DocType: Account,Round Off,Noapaļot
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Daudzumam jābūt pozitīvam
 ,Requested Qty,Pieprasīts Daudz
 DocType: Tax Rule,Use for Shopping Cart,Izmantot Grozs
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Vērtība {0} atribūtam {1} neeksistē sarakstā derīgu posteņa īpašības vērtības posteni {2}
@@ -2932,7 +2988,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Maksas tiks izplatīts proporcionāli, pamatojoties uz vienību Daudz vai summu, kā par savu izvēli"
 DocType: Maintenance Visit,Purposes,Mērķiem
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Vismaz vienu posteni jānorāda ar negatīvu daudzumu atgriešanās dokumentā
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Pievienot kursus
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Darbība {0} vairāk nekā visus pieejamos darba stundas darbstaciju {1}, nojauktu darbību vairākos operācijām"
 ,Requested,Pieprasīts
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Nav Piezīmes
@@ -2944,6 +2999,8 @@
 DocType: Employee Loan,Repaid/Closed,/ Atmaksāto Slēgts
 DocType: Item,Total Projected Qty,Kopā prognozēts Daudz
 DocType: Monthly Distribution,Distribution Name,Distribution vārds
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Piegādātājs&gt; Piegādātāja tips
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Novērtējuma pakāpe nav atrasta vienumam {0}, kas jāveic, lai veiktu grāmatvedības ierakstus par {1} {2}. Ja vienums darījums tiek veikts kā nulles vērtēšanas pakāpes postenis {1}, lūdzu, norādiet to {1} vienumu tabulā. Pretējā gadījumā, lūdzu, izveidojiet priekšmeta ienākošo krājumu darījumu vai norādiet vērtēšanas pakāpi vienuma ierakstā un pēc tam mēģiniet iesniegt / atcelt šo ierakstu"
 DocType: Course,Course Code,kursa kods
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Kvalitātes pārbaudes nepieciešamas postenī {0}
 DocType: POS Settings,Use POS in Offline Mode,Izmantojiet POS bezsaistes režīmā
@@ -2954,14 +3011,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Pārvaldīt Territory Tree.
 DocType: Journal Entry Account,Sales Invoice,PPR (Pārdošanas Pavadzīme)
 DocType: Journal Entry Account,Party Balance,Party Balance
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,"Lūdzu, izvēlieties Piesakies atlaide"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,"Lūdzu, izvēlieties Piesakies atlaide"
 DocType: Company,Default Receivable Account,Default pasūtītāju konta
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Izveidot Bank ierakstu par kopējo algu maksā par iepriekš izvēlētajiem kritērijiem
 DocType: Physician,Physician Schedule,Ārstu grafiks
 DocType: Purchase Invoice,Deemed Export,Atzīta eksporta
 DocType: Stock Entry,Material Transfer for Manufacture,Materiāls pārsūtīšana Ražošana
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Atlaide Procentos var piemērot vai nu pret Cenrādī vai visām Cenrāža.
-DocType: Purchase Invoice,Half-yearly,Reizi pusgadā
+DocType: Subscription,Half-yearly,Reizi pusgadā
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Grāmatvedības Entry par noliktavā
 DocType: Lab Test,LabTest Approver,LabTest apstiprinātājs
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Jūs jau izvērtēta vērtēšanas kritērijiem {}.
@@ -2990,13 +3047,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Extra Small
 DocType: Company,Standard Template,Standard Template
 DocType: Training Event,Theory,teorija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Brīdinājums: Materiāls Pieprasītā Daudz ir mazāks nekā minimālais pasūtījums Daudz
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Brīdinājums: Materiāls Pieprasītā Daudz ir mazāks nekā minimālais pasūtījums Daudz
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Konts {0} ir sasalusi
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Juridiskā persona / meitas uzņēmums ar atsevišķu kontu plānu, kas pieder Organizācijai."
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Pārtika, dzērieni un tabakas"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Var tikai veikt maksājumus pret unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Komisijas likme nevar būt lielāka par 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Var tikai veikt maksājumus pret unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Komisijas likme nevar būt lielāka par 100
 DocType: Stock Entry,Subcontract,Apakšlīgumu
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Ievadiet {0} pirmais
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Nav atbildes
@@ -3014,10 +3071,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Krāsa
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Novērtējums plāns Kritēriji
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Novērst pirkumu pasūtījumus
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Uzņēmīgs
 DocType: Patient Appointment,Scheduled,Plānotais
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Pieprasīt Piedāvājumu.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Lūdzu, izveidojiet darbinieku nosaukumu sistēmu cilvēkresursu vadībā&gt; Personāla iestatījumi"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Lūdzu, izvēlieties elements, &quot;Vai Stock Vienība&quot; ir &quot;nē&quot; un &quot;Vai Pārdošanas punkts&quot; ir &quot;jā&quot;, un nav cita Product Bundle"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Atlasiet Klientu
 DocType: Student Log,Academic,akadēmisks
 DocType: Patient,Personal and Social History,Personiskā un sociālā vēsture
 DocType: Fee Schedule,Fee Breakup for each student,Maksas sadalījums katram studentam
@@ -3027,7 +3085,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Vērtēšanas Rate
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,dīzelis
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Cenrādis Valūtu nav izvēlēta
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Cenrādis Valūtu nav izvēlēta
 apps/erpnext/erpnext/config/healthcare.py +46,Results,rezultāti
 ,Student Monthly Attendance Sheet,Student Mēneša Apmeklējumu lapa
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Darbinieku {0} jau ir pieprasījis {1} no {2} un {3}
@@ -3043,7 +3101,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Pārvaldīt tirdzniecības partneri.
 DocType: Quality Inspection,Inspection Type,Inspekcija Type
 DocType: Fee Validity,Visited yet,Apmeklēts vēl
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Noliktavas ar esošo darījumu nevar pārvērst grupai.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Noliktavas ar esošo darījumu nevar pārvērst grupai.
 DocType: Assessment Result Tool,Result HTML,rezultāts HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Beigu termiņš
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Pievienot Students
@@ -3070,7 +3128,7 @@
 DocType: Healthcare Settings,Result Printed,Rezultāts izdrukāts
 DocType: Asset Category Account,Depreciation Expense Account,Nolietojums Izdevumu konts
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Pārbaudes laiks
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Skatīt {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Skatīt {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Tikai lapu mezgli ir atļauts darījumā
 DocType: Expense Claim,Expense Approver,Izdevumu apstiprinātājs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Row {0}: Advance pret Klientu jābūt kredīts
@@ -3082,7 +3140,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Lai DATETIME
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Kursu Saraksti svītro:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Baļķi uzturēšanai sms piegādes statusu
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Iestatiet pārdošanas mērķi
 DocType: Accounts Settings,Make Payment via Journal Entry,Veikt maksājumus caur Journal Entry
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Printed On
 DocType: Item,Inspection Required before Delivery,Pārbaude Nepieciešamais pirms Piegāde
@@ -3090,7 +3147,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Neapstiprinātas aktivitātes
 DocType: Patient Appointment,Reminded,Atgādināts
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Jūsu organizācija
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Jūsu organizācija
 DocType: Fee Component,Fees Category,maksas kategorija
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Ievadiet atbrīvojot datumu.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
@@ -3102,7 +3159,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Pārkārtot Level
 DocType: Company,Chart Of Accounts Template,Kontu plāns Template
 DocType: Attendance,Attendance Date,Apmeklējumu Datums
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Prece Cena atjaunināts {0} Cenrādī {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Prece Cena atjaunināts {0} Cenrādī {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Alga sabrukuma pamatojoties uz izpeļņu un atskaitīšana.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Konts ar bērniem mezglu nevar pārvērst par virsgrāmatā
 DocType: Purchase Invoice Item,Accepted Warehouse,Pieņemts Noliktava
@@ -3118,9 +3175,10 @@
 ,Employee Birthday,Darbinieku Birthday
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Partijas Apmeklējumu Tool
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,Limit Crossed
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Plānots līdz
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Akadēmiskā termins ar šo &quot;mācību gada&quot; {0} un &quot;Termina nosaukums&quot; {1} jau eksistē. Lūdzu mainīt šos ierakstus un mēģiniet vēlreiz.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Tā kā ir esošie darījumi pret posteni {0}, jūs nevarat mainīt vērtību {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Tā kā ir esošie darījumi pret posteni {0}, jūs nevarat mainīt vērtību {1}"
 DocType: UOM,Must be Whole Number,Jābūt veselam skaitlim
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Jaunas lapas Piešķirtas (dienās)
 DocType: Purchase Invoice,Invoice Copy,Rēķina kopija
@@ -3130,7 +3188,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Rēķina numurs
 DocType: Shopping Cart Settings,Orders,Pasūtījumi
 DocType: Employee Leave Approver,Leave Approver,Atstājiet apstiprinātāja
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,"Lūdzu, izvēlieties partiju"
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,"Lūdzu, izvēlieties partiju"
 DocType: Assessment Group,Assessment Group Name,Novērtējums Grupas nosaukums
 DocType: Manufacturing Settings,Material Transferred for Manufacture,"Materiāls pārvietoti, lai ražošana"
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Lietotājs ar ""Izdevumu apstiprinātājs"" lomu"
@@ -3145,7 +3203,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Periods Noslēguma Entry
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Izvēlieties nodaļu ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,"Izmaksas Center ar esošajiem darījumiem, nevar pārvērst par grupai"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Summa {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Summa {0} {1} {2} {3}
 DocType: Account,Depreciation,Nolietojums
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Piegādātājs (-i)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Darbinieku apmeklējums Tool
@@ -3157,10 +3215,12 @@
 DocType: GL Entry,Voucher No,Kuponu Nr
 ,Lead Owner Efficiency,Lead Īpašnieks Efektivitāte
 ,Lead Owner Efficiency,Lead Īpašnieks Efektivitāte
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Populārākais
 DocType: Leave Allocation,Leave Allocation,Atstājiet sadale
 DocType: Payment Request,Recipient Message And Payment Details,Saņēmēja ziņu un apmaksas detaļas
 DocType: Training Event,Trainer Email,treneris Email
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Materiāls Pieprasījumi {0} izveidoti
+DocType: Restaurant Reservation,No of People,Cilvēku skaits
 DocType: Production Planning Tool,Include sub-contracted raw materials,Iekļaut Apakšuzņēmēju izejvielas
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Šablons noteikumiem vai līgumu.
 DocType: Purchase Invoice,Address and Contact,Adrese un kontaktinformācija
@@ -3169,10 +3229,11 @@
 DocType: Supplier,Last Day of the Next Month,Pēdējā diena nākamajā mēnesī
 DocType: Support Settings,Auto close Issue after 7 days,Auto tuvu Issue pēc 7 dienām
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Atvaļinājumu nevar tikt piešķirts pirms {0}, jo atvaļinājumu bilance jau ir rokas nosūtīja nākotnē atvaļinājumu piešķiršanas ierakstu {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Piezīme: Due / Reference Date pārsniedz ļāva klientu kredītu dienām ar {0} dienā (s)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Piezīme: Due / Reference Date pārsniedz ļāva klientu kredītu dienām ar {0} dienā (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Pretendents
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL RECIPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,Uzkrātais nolietojums konts
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Šis e-pasts ir automātiski ģenerēts
 DocType: Stock Settings,Freeze Stock Entries,Iesaldēt krājumu papildināšanu
 DocType: Program Enrollment,Boarding Student,iekāpšanas Student
 DocType: Asset,Expected Value After Useful Life,"Paredzams, vērtība pēc Noderīga Life"
@@ -3180,7 +3241,7 @@
 DocType: Activity Cost,Billing Rate,Norēķinu Rate
 ,Qty to Deliver,Daudz rīkoties
 ,Stock Analytics,Akciju Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Darbības nevar atstāt tukšu
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Darbības nevar atstāt tukšu
 DocType: Maintenance Visit Purpose,Against Document Detail No,Pret Dokumentu Detail Nr
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Puse Type ir obligāts
 DocType: Quality Inspection,Outgoing,Izejošs
@@ -3203,7 +3264,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Izvēlieties studenti manuāli Grupas darbības balstītas
 DocType: Journal Entry,User Remark,Lietotājs Piezīme
 DocType: Lead,Market Segment,Tirgus segmentā
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Samaksātā summa nedrīkst būt lielāka par kopējo negatīvo nenomaksātās summas {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Samaksātā summa nedrīkst būt lielāka par kopējo negatīvo nenomaksātās summas {0}
 DocType: Supplier Scorecard Period,Variables,Mainīgie
 DocType: Employee Internal Work History,Employee Internal Work History,Darbinieku Iekšējā Work Vēsture
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Noslēguma (Dr)
@@ -3233,21 +3294,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Saņemt atjauninājumus
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} nepieder Uzņēmumu {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Materiāls Pieprasījums {0} ir atcelts vai pārtraukta
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Atstājiet Management
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Atstājiet Management
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Grupa ar kontu
 DocType: Sales Order,Fully Delivered,Pilnībā Pasludināts
 DocType: Lead,Lower Income,Lower Ienākumi
+DocType: Restaurant Order Entry,Current Order,Kārtējais pasūtījums
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Avota un mērķa noliktava nevar būt vienāda rindā {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Starpība Konts jābūt aktīva / saistību veidu konts, jo šis fonds Salīdzināšana ir atklāšana Entry"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Izmaksātā summa nedrīkst būt lielāka par aizdevuma summu {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Iet uz programmām
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},"Pasūtījuma skaitu, kas nepieciešams postenī {0}"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Produkcija Pasūtījums nav izveidots
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Produkcija Pasūtījums nav izveidots
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""No Datuma 'jābūt pēc"" Uz Datumu'"
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Nevar mainīt statusu kā studentam {0} ir saistīta ar studentu pieteikumu {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Nevar mainīt statusu kā studentam {0} ir saistīta ar studentu pieteikumu {1}
 DocType: Asset,Fully Depreciated,pilnībā amortizēta
 ,Stock Projected Qty,Stock Plānotais Daudzums
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Klientu {0} nepieder projekta {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Klientu {0} nepieder projekta {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Ievērojama Apmeklējumu HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Citāti ir priekšlikumi, cenas jums ir nosūtīti uz jūsu klientiem"
 DocType: Sales Order,Customer's Purchase Order,Klienta Pasūtījuma
@@ -3258,8 +3320,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Lūdzu noteikts skaits nolietojuma Rezervēts
 DocType: Supplier Scorecard Period,Calculations,Aprēķini
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Vērtība vai Daudz
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Iestudējumi Rīkojumi nevar izvirzīts par:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Iestudējumi Rīkojumi nevar izvirzīts par:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Minūte
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Lūdzu, iestatiet Nosaukumu sēriju {0}, izmantojot iestatījumu&gt; Iestatījumi&gt; Nosaukumu sērija"
 DocType: Purchase Invoice,Purchase Taxes and Charges,Pirkuma nodokļiem un maksājumiem
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Iet uz piegādātājiem
 ,Qty to Receive,Daudz saņems
@@ -3273,7 +3336,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Kredīts kontā jābūt bilance konts
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Visi Piegādātājs veidi
 DocType: Global Defaults,Disable In Words,Atslēgt vārdos
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Postenis Kodekss ir obligāts, jo vienība nav automātiski numurētas"
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,"Postenis Kodekss ir obligāts, jo vienība nav automātiski numurētas"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Piedāvājums {0} nav tips {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Uzturēšana grafiks postenis
 DocType: Sales Order,%  Delivered,% Piegādāts
@@ -3295,23 +3358,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Atklāšanas Balance Equity
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Saskaņošana
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,atlikušais
 DocType: Appraisal,Appraisal,Novērtējums
 DocType: Purchase Invoice,GST Details,GST detaļas
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},E-pasts nosūtīts piegādātājam {0}
+DocType: Item,Default Sales Unit of Measure,Noklusētā pārdošanas apjoma vienība
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datums tiek atkārtots
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Autorizēts Parakstītājs
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Atstājiet apstiprinātājs jābūt vienam no {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Izveidot maksas
-DocType: Hub Settings,Seller Email,Pārdevējs Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total Cost iegāde (via pirkuma rēķina)
 DocType: Training Event,Start Time,Sākuma laiks
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Izvēlieties Daudzums
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Izvēlieties Daudzums
 DocType: Customs Tariff Number,Customs Tariff Number,Muitas tarifa numurs
 DocType: Patient Appointment,Patient Appointment,Pacienta iecelšana
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Apstiprinot loma nevar būt tāds pats kā loma noteikums ir piemērojams
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Atteikties no šo e-pastu Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Atteikties no šo e-pastu Digest
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Iegūt piegādātājus līdz
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} nav atrasts vienumam {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Iet uz kursiem
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Ziņojums nosūtīts
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Konts ar bērnu mezglu nevar iestatīt kā virsgrāmatā
@@ -3324,11 +3390,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,"Materiāls pārvietoti, lai Manufacturing"
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Konts {0} neeksistē
 DocType: Project,Project Type,Projekts Type
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Bērna uzdevums pastāv šim uzdevumam. Jūs nevarat izdzēst šo uzdevumu.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Nu mērķa Daudzums vai paredzētais apjoms ir obligāta.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Izmaksas dažādu aktivitāšu
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Nav vairāk rezultātu
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Izmaksas dažādu aktivitāšu
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Setting notikumi {0}, jo darbinieku pievienots zemāk Sales personām nav lietotāja ID {1}"
 DocType: Timesheet,Billing Details,Norēķinu Details
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Avota un mērķa noliktava jāatšķiras
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Avota un mērķa noliktava jāatšķiras
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},"Nav atļauts izmainīt akciju darījumiem, kas vecāki par {0}"
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Pilnībā Jāmaksā
@@ -3355,7 +3423,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Pārbaudi visu
 DocType: Vehicle Log,Invoice Ref,rēķina Ref
-DocType: Purchase Order,Recurring Order,Atkārtojas rīkojums
 DocType: Company,Default Income Account,Default Ienākumu konta
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Klientu Group / Klientu
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Neaizvērta Fiskālā Years peļņa / zaudējumi (Credit)
@@ -3369,9 +3436,9 @@
 DocType: Patient,A Negative,Negatīvs
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,"Nekas vairāk, lai parādītu."
 DocType: Lead,From Customer,No Klienta
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Zvani
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Zvani
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Produkts
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,partijām
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,partijām
 DocType: Project,Total Costing Amount (via Time Logs),Kopā Izmaksu summa (via Time Baļķi)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Veidojiet maksas rēķinu
 DocType: Purchase Order Item Supplied,Stock UOM,Krājumu Mērvienība
@@ -3396,7 +3463,7 @@
 DocType: School Settings,Current Academic Term,Pašreizējais Akadēmiskā Term
 DocType: School Settings,Current Academic Term,Pašreizējais Akadēmiskā Term
 DocType: Sales Order,Not Billed,Nav Jāmaksā
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Gan Noliktavas jāpieder pie pats uzņēmums
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Gan Noliktavas jāpieder pie pats uzņēmums
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Nav kontaktpersonu vēl nav pievienota.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Izkrauti izmaksas kuponu Summa
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,"Rēķini, ko piegādātāji izvirzītie."
@@ -3405,7 +3472,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Atlaide Summa
 DocType: Purchase Invoice,Return Against Purchase Invoice,Atgriezties Pret pirkuma rēķina
 DocType: Item,Warranty Period (in days),Garantijas periods (dienās)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',"update `tabPatient appointment` set sales_invoice = &#39;{0}&quot;, kur name =&#39; {1} &quot;"
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Saistība ar Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Neto naudas no operāciju
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Prece 4
@@ -3414,8 +3480,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry konts
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Studentu grupa
 DocType: Shopping Cart Settings,Quotation Series,Piedāvājuma sērija
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Priekšmets pastāv ar tādu pašu nosaukumu ({0}), lūdzu, nomainiet priekšmets grupas nosaukumu vai pārdēvēt objektu"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,"Lūdzu, izvēlieties klientu"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Priekšmets pastāv ar tādu pašu nosaukumu ({0}), lūdzu, nomainiet priekšmets grupas nosaukumu vai pārdēvēt objektu"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,"Lūdzu, izvēlieties klientu"
 DocType: C-Form,I,es
 DocType: Company,Asset Depreciation Cost Center,Aktīvu amortizācijas izmaksas Center
 DocType: Sales Order Item,Sales Order Date,Sales Order Date
@@ -3424,6 +3490,7 @@
 DocType: Assessment Plan,Assessment Plan,novērtējums Plan
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Klients {0} ir izveidots.
 DocType: Stock Settings,Limit Percent,Limit Percent
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Pašlaik nav nevienas noliktavas noliktavā
 ,Payment Period Based On Invoice Date,"Samaksa periodā, pamatojoties uz rēķina datuma"
 DocType: Sample Collection,No. of print,Drukas numurs
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Trūkst Valūtu kursi par {0}
@@ -3479,13 +3546,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Kopā atskaitīšana - Kredīta atmaksas
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,Pašreizējā BOM un New BOM nevar būt vienādi
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Alga Slip ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Alga Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Brīža līdz pensionēšanās jābūt lielākam nekā datums savienošana
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,"Bija kļūdas, bet plānošana, kursu par:"
 DocType: Sales Invoice,Against Income Account,Pret ienākuma kontu
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Pasludināts
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Prece {0}: pasūtīts Daudzums {1} nevar būt mazāka par minimālo pasūtījuma daudzumu {2} (definēts postenī).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Prece {0}: pasūtīts Daudzums {1} nevar būt mazāka par minimālo pasūtījuma daudzumu {2} (definēts postenī).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mēneša procentuālais sadalījums
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,"Lūdzu, piesakieties kā citam lietotājam."
 DocType: Territory,Territory Targets,Teritorija Mērķi
 DocType: Delivery Note,Transporter Info,Transporter Info
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Lūdzu iestatīt noklusēto {0} uzņēmumā {1}
@@ -3493,13 +3561,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Pats piegādātājs ir ievadīts vairākas reizes
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Bruto peļņa / zaudējumi
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Pasūtījuma Prece Kopā
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Uzņēmuma nosaukums nevar būt uzņēmums
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Uzņēmuma nosaukums nevar būt uzņēmums
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Vēstuļu Heads iespiesto veidnes.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Nosaukumi drukāt veidnes, piemēram, rēķins."
 DocType: Program Enrollment,Walking,iešana
 DocType: Student Guardian,Student Guardian,Student Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Vērtēšanas veida maksājumus nevar atzīmēts kā Inclusive
 DocType: POS Profile,Update Stock,Update Stock
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,abonementā
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Different UOM objektus, novedīs pie nepareizas (kopā) Neto svars vērtību. Pārliecinieties, ka neto svars katru posteni ir tādā pašā UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,Journal Entry metāllūžņos
@@ -3549,15 +3618,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System User (login) ID. Ja kas, tas kļūs noklusējuma visiem HR formām."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: No {1}
 DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Rindā tiek atjaunināta pēdējā cena visās materiālu bilancēs. Tas var aizņemt dažas minūtes.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Rindā tiek atjaunināta pēdējā cena visās materiālu bilancēs. Tas var aizņemt dažas minūtes.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Nosaukums jaunu kontu. Piezīme: Lūdzu, nav izveidot klientu kontus un piegādātājiem"
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Valsts gudrs noklusējuma Adrese veidnes
 DocType: Sales Order Item,Supplier delivers to Customer,Piegādātājs piegādā Klientam
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / postenis / {0}) ir no krājumiem
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Due / Atsauce Date nevar būt pēc {0}
+,Sales Payment Summary,Pārdošanas maksājumu kopsavilkums
+DocType: Restaurant,Restaurant,Restorāns
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Due / Atsauce Date nevar būt pēc {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Datu importēšana un eksportēšana
 DocType: Patient,Account Details,Konta informācija
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Nav studenti Atrasts
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Nav studenti Atrasts
 DocType: Medical Department,Medical Department,Medicīnas nodaļa
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Piegādātāju rādītāju kartes kritēriji
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Rēķina Posting Date
@@ -3568,8 +3639,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,"Lūdzu, izvēlieties Publicēšanas datums pirms izvēloties puse"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,"Lūdzu, izvēlieties citāti"
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,"Lūdzu, izvēlieties citāti"
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,"Lūdzu, izvēlieties citāti"
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,"Lūdzu, izvēlieties citāti"
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Skaits nolietojuma kartīti nedrīkst būt lielāks par kopskaita nolietojuma
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Izveidot tehniskās apkopes vizīti
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,"Lūdzu, sazinieties ar lietotāju, kurš ir Sales Master vadītājs {0} lomu"
@@ -3577,7 +3648,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Company (nav Klients vai piegādātājs) kapteinis.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Tas ir balstīts uz piedalīšanos šajā Student
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Nav Skolēni
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Pievienotu citus objektus vai Atvērt pilnu formu
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Pievienotu citus objektus vai Atvērt pilnu formu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Piegāde Notes {0} ir atcelts pirms anulējot šo klientu pasūtījumu
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Iet uz Lietotājiem
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Samaksāta summa + norakstīt summa nedrīkst būt lielāka par Grand Kopā
@@ -3597,37 +3668,40 @@
 DocType: Fee Schedule,Fee Schedule,maksa grafiks
 DocType: Hub Settings,Publish Availability,Publicēt Availability
 DocType: Company,Create Chart Of Accounts Based On,"Izveidot kontu plāns, pamatojoties uz"
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Nevar pārvērst to par nekonfidenciālu. Bērnu uzdevumi pastāv.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Dzimšanas datums nevar būt lielāks nekā šodien.
 ,Stock Ageing,Stock Novecošana
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Student {0} nepastāv pret studenta pieteikuma {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Noapaļošanas korekcija (uzņēmuma valūta)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Laika uzskaites tabula
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Laika uzskaites tabula
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' ir neaktīvs
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Uzstādīt kā Atvērt
 DocType: Cheque Print Template,Scanned Cheque,Skanētie Čeku
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Nosūtīt automātisko e-pastus kontaktiem Iesniedzot darījumiem.
 DocType: Timesheet,Total Billable Amount,Kopā Billable Summa
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Postenis 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Pasūtījuma ieraksts
 DocType: Purchase Order,Customer Contact Email,Klientu Kontakti Email
 DocType: Warranty Claim,Item and Warranty Details,Elements un Garantija Details
 DocType: Sales Team,Contribution (%),Ieguldījums (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Piezīme: Maksājumu ievades netiks izveidota, jo ""naudas vai bankas konts"" netika norādīta"
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Projekts {0} jau eksistē
 DocType: Medical Department,Nursing User,Aprūpes lietotājs
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Pienākumi
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Šīs kotācijas derīguma termiņš ir beidzies.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Šīs kotācijas derīguma termiņš ir beidzies.
 DocType: Expense Claim Account,Expense Claim Account,Izdevumu Prasība konts
 DocType: Accounts Settings,Allow Stale Exchange Rates,Atļaut mainīt valūtas kursus
 DocType: Sales Person,Sales Person Name,Sales Person Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Ievadiet Vismaz 1 rēķinu tabulā
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Pievienot lietotājus
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Pievienot lietotājus
 DocType: POS Item Group,Item Group,Postenis Group
 DocType: Item,Safety Stock,Drošības fonds
 DocType: Healthcare Settings,Healthcare Settings,Veselības aprūpes iestatījumi
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Progress% par uzdevumu nevar būt lielāks par 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Progress% par uzdevumu nevar būt lielāks par 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Pirms samierināšanās
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Uz {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Nodokļi un maksājumi Pievienoja (Company valūta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Postenis Nodokļu Row {0} ir jābūt vērā tipa nodokli vai ienākumu vai izdevumu, vai jāmaksā"
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Postenis Nodokļu Row {0} ir jābūt vērā tipa nodokli vai ienākumu vai izdevumu, vai jāmaksā"
 DocType: Sales Order,Partly Billed,Daļēji Jāmaksā
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Prece {0} ir jābūt pamatlīdzekļu posteni
 DocType: Item,Default BOM,Default BOM
@@ -3643,6 +3717,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,mainīgs
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,No piegāde piezīme
 DocType: Student,Student Email Address,Student e-pasta adrese
+DocType: Item,Hub Warehouse,Hub noliktava
 DocType: Physician Schedule Time Slot,From Time,No Time
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Noliktavā:
 DocType: Notification Control,Custom Message,Custom Message
@@ -3651,9 +3726,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Studentu adrese
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Studentu adrese
 DocType: Purchase Invoice,Price List Exchange Rate,Cenrādis Valūtas kurss
+DocType: POS Profile,POS Profile Name,POS Profila nosaukums
 DocType: Purchase Invoice Item,Rate,Likme
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Interns
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Adrese nosaukums
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Adrese nosaukums
 DocType: Stock Entry,From BOM,No BOM
 DocType: Assessment Code,Assessment Code,novērtējums Code
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Pamata
@@ -3667,11 +3743,12 @@
 DocType: Salary Slip,Salary Structure,Algu struktūra
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aviokompānija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Jautājums Materiāls
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Jautājums Materiāls
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,"Radot atkārtotu saturu, radās kļūda"
 DocType: Material Request Item,For Warehouse,Noliktavai
 DocType: Employee,Offer Date,Piedāvājuma Datums
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citāti
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,"Jūs esat bezsaistes režīmā. Jūs nevarēsiet, lai pārlādētu, kamēr jums ir tīkls."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,"Jūs esat bezsaistes režīmā. Jūs nevarēsiet, lai pārlādētu, kamēr jums ir tīkls."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Nav Studentu grupas izveidots.
 DocType: Purchase Invoice Item,Serial No,Sērijas Nr
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Ikmēneša atmaksa summa nedrīkst būt lielāka par aizdevuma summu
@@ -3681,17 +3758,18 @@
 DocType: Salary Slip,Total Working Hours,Kopējais darba laiks
 DocType: Subscription,Next Schedule Date,Nākamā grafika datums
 DocType: Stock Entry,Including items for sub assemblies,Ieskaitot posteņiem apakš komplektiem
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Ievadiet vērtība ir pozitīva
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Visas teritorijas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Ievadiet vērtība ir pozitīva
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Visas teritorijas
 DocType: Purchase Invoice,Items,Preces
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Students jau ir uzņemti.
 DocType: Fiscal Year,Year Name,Gadā Name
 DocType: Process Payroll,Process Payroll,Process Algas
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Ir vairāk svētku nekā darba dienu šajā mēnesī.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Ir vairāk svētku nekā darba dienu šajā mēnesī.
 DocType: Product Bundle Item,Product Bundle Item,Produkta Bundle Prece
 DocType: Sales Partner,Sales Partner Name,Sales Partner Name
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Pieprasījums citāti
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Pieprasījums citāti
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimālais Rēķina summa
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hematoloģija
 DocType: Normal Test Items,Normal Test Items,Normālie pārbaudes vienumi
 DocType: Student Language,Student Language,Student valoda
 apps/erpnext/erpnext/config/selling.py +23,Customers,Klienti
@@ -3702,10 +3780,11 @@
 DocType: Issue,Opening Time,Atvēršanas laiks
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,No un uz datumiem nepieciešamo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vērtspapīru un preču biržu
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default mērvienība Variant &#39;{0}&#39; jābūt tāds pats kā Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default mērvienība Variant &#39;{0}&#39; jābūt tāds pats kā Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,"Aprēķināt, pamatojoties uz"
 DocType: Delivery Note Item,From Warehouse,No Noliktavas
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Nav Preces ar Bill materiālu ražošana
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Nav Preces ar Bill materiālu ražošana
+DocType: Restaurant,Default Customer,Noklusējuma klients
 DocType: Assessment Plan,Supervisor Name,uzraudzītājs Name
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Nevar apstiprināt, vai tikšanās ir izveidota tajā pašā dienā"
 DocType: Program Enrollment Course,Program Enrollment Course,Programmas Uzņemšana kurss
@@ -3733,7 +3812,7 @@
 DocType: Payment Entry,Internal Transfer,iekšējā Transfer
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Bērnu konts pastāv šim kontam. Jūs nevarat dzēst šo kontu.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Nu mērķa Daudzums vai paredzētais apjoms ir obligāta
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Nē noklusējuma BOM pastāv postenī {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Nē noklusējuma BOM pastāv postenī {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,"Lūdzu, izvēlieties Publicēšanas datums pirmais"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Atvēršanas datums būtu pirms slēgšanas datums
 DocType: Leave Control Panel,Carry Forward,Virzīt uz priekšu
@@ -3769,6 +3848,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Kopā Present
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,grāmatvedības pārskati
 DocType: Drug Prescription,Hour,Stunda
+DocType: Restaurant Order Entry,Last Sales Invoice,Pēdējais pārdošanas rēķins
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"Jaunais Sērijas Nē, nevar būt noliktava. Noliktavu jānosaka ar Fondu ieceļošanas vai pirkuma čeka"
 DocType: Lead,Lead Type,Potenciālā klienta Veids (Type)
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Jums nav atļauts apstiprināt lapas par Grantu datumi
@@ -3805,65 +3885,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Izveidot lietotāju
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,grams
 DocType: Supplier Scorecard,Per Month,Mēnesī
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,"Daudzums, ražošana jābūt lielākam par 0."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,"Daudzums, ražošana jābūt lielākam par 0."
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Apmeklējiet pārskatu uzturēšanas zvanu.
 DocType: Stock Entry,Update Rate and Availability,Atjaunināšanas ātrumu un pieejamība
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procents jums ir atļauts saņemt vai piegādāt vairāk pret pasūtīto daudzumu. Piemēram: Ja esi pasūtījis 100 vienības. un jūsu pabalsts ir, tad jums ir atļauts saņemt 110 vienības 10%."
 DocType: POS Customer Group,Customer Group,Klientu Group
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Jaunais grupas ID (pēc izvēles)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Jaunais grupas ID (pēc izvēles)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Jaunais grupas ID (pēc izvēles)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Jaunais grupas ID (pēc izvēles)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Izdevumu konts ir obligāta posteni {0}
 DocType: BOM,Website Description,Mājas lapa Apraksts
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Neto pašu kapitāla izmaiņas
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Jaunākās
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Lūdzu atcelt pirkuma rēķina {0} pirmais
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-pasta adrese ir unikāls, jau pastāv {0}"
 DocType: Serial No,AMC Expiry Date,AMC Derīguma termiņš
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,kvīts
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,kvīts
 ,Sales Register,Sales Reģistrēties
 DocType: Daily Work Summary Settings Company,Send Emails At,Sūtīt e-pastus
 DocType: Quotation,Quotation Lost Reason,Piedāvājuma Zaudējuma Iemesls
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Izvēlieties savu domēnu
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',"izvēlieties * no tabPatient, kur nosaukums = &#39;{0}&#39;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Darījuma atsauces numurs {0} datēts {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Darījuma atsauces numurs {0} datēts {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,"Nav nekas, lai rediģētu."
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Veidlapas skats
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Kopsavilkums par šo mēnesi un izskatāmo darbību
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Veidlapas skats
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Kopsavilkums par šo mēnesi un izskatāmo darbību
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Pievienojiet lietotājus savai organizācijai, izņemot sevi."
 DocType: Customer Group,Customer Group Name,Klientu Grupas nosaukums
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,"No klientiem, kuri vēl!"
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,"No klientiem, kuri vēl!"
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Naudas plūsmas pārskats
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kredīta summa nedrīkst pārsniegt maksimālo summu {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,licence
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},"Lūdzu, noņemiet šo rēķinu {0} no C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},"Lūdzu, noņemiet šo rēķinu {0} no C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Lūdzu, izvēlieties Carry priekšu, ja jūs arī vēlaties iekļaut iepriekšējā finanšu gadā bilance atstāj šajā fiskālajā gadā"
 DocType: GL Entry,Against Voucher Type,Pret kupona Tips
 DocType: Physician,Phone (R),Tālrunis (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Pievienotie laika intervāli
 DocType: Item,Attributes,Atribūti
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Iespējot veidni
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Lūdzu, iestatiet Nosaukumu sēriju {0}, izmantojot Iestatīšana&gt; Iestatījumi&gt; Nosaukumu sērija"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Ievadiet norakstīt kontu
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Pēdējā pasūtījuma datums
 DocType: Patient,B Negative,B negatīvs
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konts {0} nav pieder uzņēmumam {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Sērijas numurus kārtas {0} nesakrīt ar piegādes piezīme
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Sērijas numurus kārtas {0} nesakrīt ar piegādes piezīme
 DocType: Student,Guardian Details,Guardian Details
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark apmeklēšana vairākiem darbiniekiem
 DocType: Vehicle,Chassis No,šasijas Nr
 DocType: Payment Request,Initiated,Uzsāka
 DocType: Production Order,Planned Start Date,Plānotais sākuma datums
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,"Lūdzu, izvēlieties BOM"
 DocType: Serial No,Creation Document Type,Izveide Dokumenta tips
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Beigu datumam jābūt lielākam par sākuma datumu
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Beigu datumam jābūt lielākam par sākuma datumu
 DocType: Leave Type,Is Encash,Ir iekasēt skaidrā naudā
 DocType: Leave Allocation,New Leaves Allocated,Jaunas lapas Piešķirtie
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projekts gudrs dati nav pieejami aptauja
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Beigās
 DocType: Project,Expected End Date,"Paredzams, beigu datums"
 DocType: Budget Account,Budget Amount,budžeta apjoms
 DocType: Appraisal Template,Appraisal Template Title,Izvērtēšana Template sadaļa
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},No Datums {0} uz Employee {1} nevar būt pirms darbinieka savieno datums {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Tirdzniecības
 DocType: Patient,Alcohol Current Use,Alkohola pašreizējā lietošana
+DocType: Student Admission Program,Student Admission Program,Studentu uzņemšanas programma
 DocType: Payment Entry,Account Paid To,Konts Paid To
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent postenis {0} nedrīkst būt Stock Vienība
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Visi Produkti vai Pakalpojumi.
@@ -3872,30 +3954,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budžets konta {1} pret {2} {3} ir {4}. Tas pārsniegs līdz {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Rinda {0} # jāņem tipa &quot;pamatlīdzekļu&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Out Daudz
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Noteikumi aprēķināt kuģniecības summu pārdošanu
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,un unchecked invalīdiem
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Dokumenta numurs ir obligāts
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finanšu pakalpojumi
 DocType: Student Sibling,Student ID,Student ID
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Darbības veidi Time Baļķi
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Piegādātāja e-pasts
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Darbības veidi Time Baļķi
 DocType: Tax Rule,Sales,Pārdevums
 DocType: Stock Entry Detail,Basic Amount,Pamatsumma
 DocType: Training Event,Exam,eksāmens
 DocType: Complaint,Complaint,Sūdzība
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Noliktava nepieciešama krājumu postenī {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Noliktava nepieciešama krājumu postenī {0}
 DocType: Leave Allocation,Unused leaves,Neizmantotās lapas
 DocType: Patient,Alcohol Past Use,Alkohola iepriekšējā lietošana
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Norēķinu Valsts
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Nodošana
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Atnest eksplodēja BOM (ieskaitot mezglus)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Nodošana
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Atnest eksplodēja BOM (ieskaitot mezglus)
 DocType: Authorization Rule,Applicable To (Employee),Piemērojamais Lai (Darbinieku)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Due Date ir obligāts
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Due Date ir obligāts
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Pieaugums par atribūtu {0} nevar būt 0
 DocType: Journal Entry,Pay To / Recd From,Pay / Recd No
 DocType: Naming Series,Setup Series,Dokumentu numuru Iestatījumi
 DocType: Payment Reconciliation,To Invoice Date,Lai rēķina datuma
 DocType: Supplier,Contact HTML,Contact HTML
 ,Inactive Customers,neaktīvi Klienti
+DocType: Student Admission Program,Maximum Age,Maksimālais vecums
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Pirkuma Kvītis
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Kā Cenu noteikums tiek piemērots?
@@ -3914,6 +3998,7 @@
 DocType: GL Entry,Remarks,Piezīmes
 DocType: Payment Entry,Account Paid From,Konts maksā no
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Izejvielas Produkta kods
+DocType: Task,Parent Task,Mātes uzdevums
 DocType: Journal Entry,Write Off Based On,Uzrakstiet Off Based On
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,padarīt Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Drukas un Kancelejas
@@ -3922,20 +4007,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Alga jau sagatavotas laika posmā no {0} un {1}, atstājiet piemērošanas periods nevar būt starp šo datumu diapazonā."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Uzstādīšana rekords Serial Nr
 DocType: Guardian Interest,Guardian Interest,Guardian Procentu
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Iestatiet POS rēķinu noklusējuma vērtības
 apps/erpnext/erpnext/config/hr.py +177,Training,treniņš
 DocType: Timesheet,Employee Detail,Darbinieku Detail
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Email ID
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Email ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,Nākamajam datumam diena un Atkārtot Mēneša diena jābūt vienādam
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Nākamajam datumam diena un Atkārtot Mēneša diena jābūt vienādam
 DocType: Lab Prescription,Test Code,Pārbaudes kods
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Iestatījumi mājas lapā mājas lapā
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ nav atļauts {0} dēļ rezultātu rādītāja stāvokļa {1}
 DocType: Offer Letter,Awaiting Response,Gaida atbildi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Iepriekš
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Kopā summa {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Nederīga atribūts {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Kopā summa {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Nederīga atribūts {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Pieminēt ja nestandarta jāmaksā konts
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Same postenis ir ievadīts vairākas reizes. {Saraksts}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',"Lūdzu, izvēlieties novērtējuma grupu, kas nav &quot;All novērtēšanas grupas&quot;"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Rinda {0}: priekšmeta {1} ir nepieciešams izmaksu centrs.
 DocType: Training Event Employee,Optional,Pēc izvēles
@@ -3958,13 +4043,15 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0}{1}: Izmaksu centrs ir obligāta postenī {2}
 DocType: Vehicle,Policy No,politikas Nr
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Dabūtu preces no produkta Bundle
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Tā kā tiek veikts krājums pret vienumu {0}, jūs nevarat iespējot variantu īpašumu"
 DocType: Asset,Straight Line,Taisne
 DocType: Project User,Project User,projekta User
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,sadalīt
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,sadalīt
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,sadalīt
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,sadalīt
 DocType: GL Entry,Is Advance,Vai Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Apmeklējumu No Datums un apmeklētība līdz šim ir obligāta
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,"Ievadiet ""tiek slēgti apakšuzņēmuma līgumi"", kā jā vai nē"
+DocType: Item,Default Purchase Unit of Measure,Noklusējuma iegādes mērvienība
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Pēdējais Komunikācijas Datums
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Pēdējais Komunikācijas Datums
 DocType: Sales Team,Contact No.,Contact No.
@@ -3973,7 +4060,6 @@
 DocType: Production Order,Check if material transfer entry is not required,"Pārbaudiet, vai materiāls nodošana ieraksts nav vajadzīgs"
 DocType: Production Order,Check if material transfer entry is not required,"Pārbaudiet, vai materiāls nodošana ieraksts nav vajadzīgs"
 DocType: Program Enrollment Tool,Get Students From,Iegūt studentus no
-DocType: Hub Settings,Seller Country,Pārdevējs Country
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publicēt punkti Website
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Grupu jūsu skolēni partijās
 DocType: Authorization Rule,Authorization Rule,Autorizācija noteikums
@@ -3983,8 +4069,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Pārdošanas nodokļi un maksājumi Template
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Kopā (kredīts)
 DocType: Repayment Schedule,Payment Date,Maksājuma datums
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Jaunais Partijas Daudz
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Jaunais Partijas Daudz
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Jaunais Partijas Daudz
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Jaunais Partijas Daudz
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Apģērbs un Aksesuāri
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,"Nevarēja atrisināt svērto rezultātu funkciju. Pārliecinieties, vai formula ir derīga."
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Skaits ordeņa
@@ -4002,6 +4088,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} nevar iesniegt, tas jau {2}"
 DocType: Tax Rule,Billing Country,Norēķinu Country
 DocType: Purchase Order Item,Expected Delivery Date,Gaidīts Piegāde Datums
+DocType: Restaurant Order Entry,Restaurant Order Entry,Restorāna pasūtījuma ieraksts
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debeta un kredīta nav vienāds {0} # {1}. Atšķirība ir {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Izklaides izdevumi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Padarīt Material pieprasījums
@@ -4014,9 +4101,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Konts ar esošo darījumu nevar izdzēst
 DocType: Vehicle,Last Carbon Check,Pēdējais Carbon pārbaude
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Juridiskie izdevumi
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,"Lūdzu, izvēlieties daudzums uz rindu"
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,"Lūdzu, izvēlieties daudzums uz rindu"
 DocType: Purchase Invoice,Posting Time,Norīkošanu laiks
 DocType: Timesheet,% Amount Billed,% Summa Jāmaksā
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",Netika iestatīts Dr {0} &quot;Laiks uz sapulci&quot;. Pievienojiet to ārsta meistram.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefona izdevumi
 DocType: Sales Partner,Logo,Logotips
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Atzīmējiet šo, ja vēlaties, lai piespiestu lietotājam izvēlēties vairākus pirms saglabāšanas. Nebūs noklusējuma, ja jūs pārbaudīt šo."
@@ -4027,6 +4115,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Jaunais klientu Ieņēmumu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Ceļa izdevumi
 DocType: Maintenance Visit,Breakdown,Avārija
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Pievienojiet pielāgoto lauku abonementu doctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Konts: {0} ar valūtu: {1} nevar atlasīt
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Automātiski atjaunināt BOM izmaksas, izmantojot plānotāju, pamatojoties uz jaunāko novērtēšanas likmi / cenrāžu likmi / izejvielu pēdējo pirkumu likmi."
 DocType: Bank Reconciliation Detail,Cheque Date,Čeku Datums
@@ -4051,7 +4140,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Kopā Norēķinu Summa (via Time Baļķi)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Piegādātājs Id
 DocType: Payment Request,Payment Gateway Details,Maksājumu Gateway Details
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Daudzums ir jābūt lielākam par 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Daudzums ir jābūt lielākam par 0
 DocType: Journal Entry,Cash Entry,Naudas Entry
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Bērnu mezgli var izveidot tikai ar &quot;grupa&quot; tipa mezgliem
 DocType: Leave Application,Half Day Date,Half Day Date
@@ -4069,12 +4158,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Piezīme: postenis {0} ieraksta vairākas reizes
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Visi Kontakti.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Uzņēmuma saīsinājums
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Lietotāja {0} nepastāv
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Lietotāja {0} nepastāv
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Saīsinājums
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Maksājumu Entry jau eksistē
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ne authroized kopš {0} pārsniedz ierobežojumus
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Algu veidni meistars.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Patoloģija
+DocType: Restaurant Order Entry,Restaurant Table,Restorāna galds
 DocType: Leave Type,Max Days Leave Allowed,Max dienu atvaļinājumu Atļauts
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Uzstādīt Nodokļu noteikums par iepirkumu grozs
 DocType: Purchase Invoice,Taxes and Charges Added,Nodokļi un maksājumi Pievienoja
@@ -4086,10 +4177,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Citāti par potenciālajiem klientiem vai klientiem.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Loma Atļauts rediģēt saldētas krājumus
 ,Territory Target Variance Item Group-Wise,Teritorija Mērķa Variance Prece Group-Wise
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Visas klientu grupas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Visas klientu grupas
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,uzkrātais Mēneša
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ir obligāta. Varbūt Valūtas ieraksts nav izveidots {1} uz {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Nodokļu veidne ir obligāta.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Nodokļu veidne ir obligāta.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Konts {0}: Mātes vērā {1} neeksistē
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cenrādis Rate (Company valūta)
 DocType: Products Settings,Products Settings,Produkcija iestatījumi
@@ -4115,13 +4206,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Postenis Wise Nodokļu Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Institute saīsinājums
 ,Item-wise Price List Rate,Postenis gudrs Cenrādis Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Piegādātāja Piedāvājums
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Piegādātāja Piedāvājums
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Vārdos būs redzami, kad saglabājat citāts."
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Daudzums ({0}) nevar būt daļa rindā {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Daudzums ({0}) nevar būt daļa rindā {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Svītrkodu {0} jau izmanto postenī {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Svītrkodu {0} jau izmanto postenī {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Noteikumi par piebilstot piegādes izmaksas.
 DocType: Item,Opening Stock,Atklāšanas Stock
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Klientam ir pienākums
@@ -4139,9 +4230,8 @@
 DocType: Customer,From Lead,No Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Pasūtījumi izlaists ražošanai.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Izvēlieties fiskālajā gadā ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS Profile jāveic POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS Profile jāveic POS Entry
 DocType: Program Enrollment Tool,Enroll Students,uzņemt studentus
-DocType: Hub Settings,Name Token,Nosaukums Token
 DocType: Lab Test,Approved Date,Apstiprināts datums
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard pārdošana
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Vismaz viena noliktava ir obligāta
@@ -4159,7 +4249,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Cilvēkresursi
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Maksājumu Samierināšanās Maksājumu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Nodokļu Aktīvi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Ražošanas rīkojums ir {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Ražošanas rīkojums ir {0}
 DocType: BOM Item,BOM No,BOM Nr
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} nav konta {1} vai jau saskaņota pret citu talonu
@@ -4179,8 +4269,8 @@
 DocType: Currency Exchange,To Currency,Līdz Valūta
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Ļauj šie lietotāji apstiprināt Leave Pieteikumi grupveida dienas.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Veidi Izdevumu prasību.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Pārdošanas likmi postenī {0} ir zemāks nekā tā {1}. Pārdošanas kursa vajadzētu būt atleast {2}
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Pārdošanas likmi postenī {0} ir zemāks nekā tā {1}. Pārdošanas kursa vajadzētu būt atleast {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Pārdošanas likmi postenī {0} ir zemāks nekā tā {1}. Pārdošanas kursa vajadzētu būt atleast {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Pārdošanas likmi postenī {0} ir zemāks nekā tā {1}. Pārdošanas kursa vajadzētu būt atleast {2}
 DocType: Item,Taxes,Nodokļi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Maksas un nav sniegusi
 DocType: Project,Default Cost Center,Default Izmaksu centrs
@@ -4194,15 +4284,15 @@
 DocType: Employee Loan,Fully Disbursed,Pilnībā Izmaksātā
 DocType: Maintenance Visit,Customer Feedback,Klientu Atsauksmes
 DocType: Account,Expense,Izdevumi
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Rādītājs nedrīkst būt lielāks par maksimālo punktu skaitu
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Rādītājs nedrīkst būt lielāks par maksimālo punktu skaitu
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Klienti un piegādātāji
 DocType: Item Attribute,From Range,No Range
 DocType: BOM,Set rate of sub-assembly item based on BOM,"Iestatiet apakšsistēmas posteņa likmi, pamatojoties uz BOM"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Sintakses kļūda formulā vai stāvoklī: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Sintakses kļūda formulā vai stāvoklī: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Ikdienas darbs kopsavilkums Settings Company
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,"{0} priekšmets ignorēt, jo tas nav akciju postenis"
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Iesniedz šo ražošanas kārtību tālākai apstrādei.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Iesniedz šo ražošanas kārtību tālākai apstrādei.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Nepiemērot cenošanas Reglamenta konkrētā darījumā, visi piemērojamie Cenu noteikumi būtu izslēgta."
 DocType: Assessment Group,Parent Assessment Group,Parent novērtējums Group
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Darbs
@@ -4219,12 +4309,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Lūdzu noteikt Company filtrēt tukšu, ja Group By ir &quot;Uzņēmuma&quot;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Norīkošanu datums nevar būt nākotnes datums
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Sērijas Nr {1} nesakrīt ar {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,lai radītu atkārtotu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Casual Leave
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Lab Test UOM.
 DocType: Batch,Batch ID,Partijas ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Piezīme: {0}
 ,Delivery Note Trends,Piegāde Piezīme tendences
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,ŠONEDĒĻ kopsavilkums
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,ŠONEDĒĻ kopsavilkums
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Noliktavā Daudz
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Konts: {0} var grozīt tikai ar akciju darījumiem
 DocType: Student Group Creation Tool,Get Courses,Iegūt Kursi
@@ -4238,7 +4329,6 @@
 DocType: Purchase Order,To Bill,Bill
 DocType: Material Request,% Ordered,% Pasūtīts
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Par Kurss balstās studentu grupas, protams, būs jāapstiprina par katru students no uzņemtajiem kursiem programmā Uzņemšanas."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Ievadiet e-pasta adrese atdalīti ar komatiem, rēķins tiks nosūtīts automātiski konkrētā datumā"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Gabaldarbs
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Vid. Pirkšana Rate
 DocType: Task,Actual Time (in Hours),Faktiskais laiks (stundās)
@@ -4252,7 +4342,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Postenis {0} nav setup Serial Nr. Kolonnas jābūt tukšs
 DocType: Accounts Settings,Accounts Settings,Konti Settings
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,apstiprināt
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Nav iesniegts rezultāts
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Nav iesniegts rezultāts
 DocType: Customer,Sales Partner and Commission,Pārdošanas Partner un Komisija
 DocType: Employee Loan,Rate of Interest (%) / Year,Procentu likme (%) / gads
 ,Project Quantity,projekta daudzums
@@ -4264,55 +4354,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Melns
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion postenis
 DocType: Account,Auditor,Revidents
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} preces ražotas
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} preces ražotas
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Uzzināt vairāk
 DocType: Cheque Print Template,Distance from top edge,Attālums no augšējās malas
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Cenrādis {0} ir invalīds vai neeksistē
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Cenrādis {0} ir invalīds vai neeksistē
 DocType: Purchase Invoice,Return,Atgriešanās
 DocType: Production Order Operation,Production Order Operation,Ražošanas Order Operation
 DocType: Pricing Rule,Disable,Atslēgt
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,"maksāšanas režīmā ir nepieciešams, lai veiktu maksājumu"
 DocType: Project Task,Pending Review,Kamēr apskats
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Tikšanās un konsultācijas
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nav uzņemts Batch {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nav uzņemts Batch {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} nevar tikt izmesta, jo tas jau ir {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Kopējo izdevumu Pretenzijas (via Izdevumu Claim)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Nekonstatē
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rinda {0}: valūta BOM # {1} jābūt vienādam ar izvēlētās valūtas {2}
 DocType: Journal Entry Account,Exchange Rate,Valūtas kurss
 DocType: Patient,Additional information regarding the patient,Papildu informācija par pacientu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Pasūtījumu {0} nav iesniegta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Pasūtījumu {0} nav iesniegta
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,maksa Component
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Fleet Management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Pievienot preces no
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Fleet Management
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Pievienot preces no
 DocType: Cheque Print Template,Regular,regulārs
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Kopējais weightage no visiem vērtēšanas kritērijiem ir jābūt 100%
-DocType: BOM,Last Purchase Rate,"Pēdējā pirkuma ""Rate"""
+DocType: Purchase Order Item,Last Purchase Rate,"Pēdējā pirkuma ""Rate"""
 DocType: Account,Asset,Aktīvs
 DocType: Project Task,Task ID,Uzdevums ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Preces nevar pastāvēt postenī {0}, jo ir varianti"
 DocType: Lab Test,Mobile,Mobilais
 ,Sales Person-wise Transaction Summary,Sales Person-gudrs Transaction kopsavilkums
 DocType: Training Event,Contact Number,Kontaktpersonas numurs
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Noliktava {0} nepastāv
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Reģistrēties Par ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Noliktava {0} nepastāv
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mēneša procentuālo sadalījumu
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Izvēlētais objekts nevar būt partijas
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Vērtēšanas likme nav atrasts par Pozīcijas {0}, kas ir nepieciešama, lai darīt grāmatvedības ierakstus {1} {2}. Ja prece ir transakcijas kā izlases vienumu {1}, lūdzu, norādiet, ka {1} Vienības tabulā. Pretējā gadījumā, lūdzu, izveidojiet ienākošo krājumu darījumu par objektu vai pieminēt vērtēšanas likmi postenī ierakstu, un tad mēģiniet submiting / šo ierakstu atcelšana"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materiālu piegādā pret šo piegāde piezīmes
+DocType: Training Event,Has Certificate,Ir sertifikāts
 DocType: Project,Customer Details,Klientu Details
 DocType: Employee,Reports to,Ziņojumi
 ,Unpaid Expense Claim,Neapmaksāta Izdevumu Prasība
 DocType: Payment Entry,Paid Amount,Samaksāta summa
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Izpētiet pārdošanas ciklu
 DocType: Assessment Plan,Supervisor,uzraugs
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,Online
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,Online
 ,Available Stock for Packing Items,Pieejams Stock uz iepakojuma vienības
 DocType: Item Variant,Item Variant,Postenis Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Novērtējums rezultāts Tool
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Metāllūžņu punkts
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Iesniegtie pasūtījumus nevar izdzēst
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Iesniegtie pasūtījumus nevar izdzēst
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konta atlikums jau debets, jums nav atļauts noteikt ""Balance Must Be"", jo ""Kredīts"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Kvalitātes vadība
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Prece {0} ir atspējota
@@ -4333,7 +4422,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Atļaut Zero vērtēšanas likme
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Atļaut Zero vērtēšanas likme
 DocType: Training Event Employee,Invited,uzaicināts
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Vairāki aktīvās Algu Structures atrasti darbiniekam {0} par dotajiem datumiem
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Vairāki aktīvās Algu Structures atrasti darbiniekam {0} par dotajiem datumiem
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Setup Gateway konti.
 DocType: Employee,Employment Type,Nodarbinātības Type
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Pamatlīdzekļi
@@ -4345,7 +4434,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Paziņojums (dienas)
 DocType: Tax Rule,Sales Tax Template,Sales Tax Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,"Izvēlētos objektus, lai saglabātu rēķinu"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,"Izvēlētos objektus, lai saglabātu rēķinu"
 DocType: Employee,Encashment Date,Inkasācija Datums
 DocType: Training Event,Internet,internets
 DocType: Special Test Template,Special Test Template,Īpašās pārbaudes veidne
@@ -4355,7 +4444,7 @@
 DocType: Academic Term,Term Start Date,Term sākuma datums
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp skaits
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp skaits
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Pievienoju {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Pievienoju {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bankas paziņojums bilance kā vienu virsgrāmatas
 DocType: Job Applicant,Applicant Name,Pieteikuma iesniedzēja nosaukums
 DocType: Authorization Rule,Customer / Item Name,Klients / vienības nosaukums
@@ -4375,7 +4464,7 @@
 DocType: Guardian,Guardian Of ,sargs
 DocType: Grading Scale Interval,Threshold,slieksnis
 DocType: BOM Update Tool,Current BOM,Pašreizējā BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Pievienot Sērijas nr
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Pievienot Sērijas nr
 DocType: Production Order Item,Available Qty at Source Warehouse,Pieejams Daudz at Avots noliktavā
 apps/erpnext/erpnext/config/support.py +22,Warranty,garantija
 DocType: Purchase Invoice,Debit Note Issued,Parādzīme Izdoti
@@ -4398,10 +4487,9 @@
 DocType: Account,Receivable,Saņemams
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Row # {0}: Nav atļauts mainīt piegādātāju, jo jau pastāv Pasūtījuma"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Loma, kas ir atļauts iesniegt darījumus, kas pārsniedz noteiktos kredīta limitus."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Izvēlieties preces Rūpniecība
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Master datu sinhronizācija, tas var aizņemt kādu laiku"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Izvēlieties preces Rūpniecība
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Master datu sinhronizācija, tas var aizņemt kādu laiku"
 DocType: Item,Material Issue,Materiāls Issue
-DocType: Hub Settings,Seller Description,Pārdevējs Apraksts
 DocType: Employee Education,Qualification,Kvalifikācija
 DocType: Item Price,Item Price,Vienība Cena
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Ziepes un mazgāšanas
@@ -4409,7 +4497,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,No laiks nedrīkst būt lielāks par uz laiku.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Pasūtīts
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Turpināt
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Turpināt
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Ja ir iespējota, tad sistēma netiks atjaunināta variantu lauku no veidnes, bet kopēt zemāk minēto lauku datus, veidojot jaunu variantu"
 DocType: Salary Detail,Component,komponents
 DocType: Assessment Criteria,Assessment Criteria Group,Vērtēšanas kritēriji Group
 DocType: Healthcare Settings,Patient Name By,Pacienta nosaukums līdz
@@ -4419,7 +4508,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Ievadiet apstiprināšana loma vai apstiprināšana lietotāju
 DocType: Journal Entry,Write Off Entry,Uzrakstiet Off Entry
 DocType: BOM,Rate Of Materials Based On,Novērtējiet materiālu specifikācijas Based On
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Piegādātājs&gt; Piegādātāja tips
+DocType: Item Variant Settings,Do not Update Variants,Neatjauniniet variantus
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Atbalsta Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Noņemiet visas
 DocType: POS Profile,Terms and Conditions,Noteikumi un nosacījumi
@@ -4428,7 +4517,7 @@
 DocType: Leave Block List,Applies to Company,Attiecas uz Company
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,"Nevar atcelt, jo iesniegts Stock Entry {0} eksistē"
 DocType: Employee Loan,Disbursement Date,izmaksu datums
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&quot;Saņēmēji&quot; nav norādīti
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&quot;Saņēmēji&quot; nav norādīti
 DocType: BOM Update Tool,Update latest price in all BOMs,Atjauniniet jaunāko cenu visās BOM
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Medicīniskais ieraksts
 DocType: Vehicle,Vehicle,transporta līdzeklis
@@ -4444,14 +4533,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,OPP / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Aktīvu vērtības kritumu un Svari
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Summa {0} {1} pārcelts no {2} līdz {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Summa {0} {1} pārcelts no {2} līdz {3}
 DocType: Sales Invoice,Get Advances Received,Get Saņemtā Avansa
 DocType: Email Digest,Add/Remove Recipients,Add / Remove saņēmējus
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Darījums nav atļauts pret pārtrauca ražošanu Pasūtīt {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Lai uzstādītu šo taksācijas gadu kā noklusējumu, noklikšķiniet uz ""Set as Default"""
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,pievienoties
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,pievienoties
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Trūkums Daudz
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Postenis variants {0} nepastāv ar tiem pašiem atribūtiem
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Postenis variants {0} nepastāv ar tiem pašiem atribūtiem
 DocType: Employee Loan,Repay from Salary,Atmaksāt no algas
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Pieprasot samaksu pret {0} {1} par summu {2}
@@ -4464,7 +4553,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Pasūtījumu postenis
 DocType: Salary Slip,Payment Days,Maksājumu dienas
 DocType: Patient,Dormant,potenciāls
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Noliktavas ar bērnu mezglu nevar pārvērst par virsgrāmatā
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Noliktavas ar bērnu mezglu nevar pārvērst par virsgrāmatā
 DocType: BOM,Manage cost of operations,Pārvaldīt darbības izmaksām
 DocType: Accounts Settings,Stale Days,Stale dienas
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Ja kāda no pārbaudītajiem darījumiem ir ""Iesniegtie"", e-pasts pop-up automātiski atvērta, lai nosūtītu e-pastu uz saistīto ""Kontakti"" šajā darījumā, ar darījumu kā pielikumu. Lietotājs var vai nevar nosūtīt e-pastu."
@@ -4478,10 +4567,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Sērijas Nr {0} jau ir saņēmis
 ,Requested Items To Be Transferred,Pieprasīto pozīcijas jāpārskaita
 DocType: Expense Claim,Vehicle Log,servisa
-DocType: Purchase Invoice,Recurring Id,Atkārtojas Id
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),Drudzis (temp&gt; 38.5 ° C / 101.3 ° F vai ilgstoša temperatūra&gt; 38 ° C / 100.4 ° F)
 DocType: Customer,Sales Team Details,Sales Team Details
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Izdzēst neatgriezeniski?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Izdzēst neatgriezeniski?
 DocType: Expense Claim,Total Claimed Amount,Kopējais pieprasītā summa
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potenciālie iespējas pārdot.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Nederīga {0}
@@ -4491,7 +4579,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Departaments veikali
 ,Item Delivery Date,Vienības piegādes datums
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Setup jūsu skola ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Setup jūsu skola ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Change Summa (Company valūta)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Nav grāmatvedības ieraksti par šādām noliktavām
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Saglabājiet dokumentu pirmās.
@@ -4503,13 +4591,12 @@
 DocType: Task,Is Milestone,Vai Milestone
 DocType: Daily Work Summary,Email Sent To,E-pasts nosūtīts
 DocType: Budget,Warn,Brīdināt
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Vai tiešām vēlaties atsaukt reģistrāciju?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Jebkādas citas piezīmes, ievērības cienīgs piepūles ka jāiet ierakstos."
 DocType: BOM,Manufacturing User,Manufacturing User
 DocType: Purchase Invoice,Raw Materials Supplied,Izejvielas Kopā
-DocType: Purchase Invoice,Recurring Print Format,Atkārtojas Print Format
 DocType: C-Form,Series,Dokumenta numurs
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Cenrādi {0} valūtā jābūt {1} vai {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Pievienot produktus
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Cenrādi {0} valūtā jābūt {1} vai {2}
 DocType: Appraisal,Appraisal Template,Izvērtēšana Template
 DocType: Item Group,Item Classification,Postenis klasifikācija
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Biznesa attīstības vadītājs
@@ -4523,7 +4610,7 @@
 DocType: Item Attribute Value,Attribute Value,Atribūta vērtība
 ,Itemwise Recommended Reorder Level,Itemwise Ieteicams Pārkārtot Level
 DocType: Salary Detail,Salary Detail,alga Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,"Lūdzu, izvēlieties {0} pirmais"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,"Lūdzu, izvēlieties {0} pirmais"
 DocType: Appointment Type,Physician,Ārsts
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Sērija {0} no posteņa {1} ir beidzies.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Konsultācijas
@@ -4534,7 +4621,7 @@
 DocType: Salary Detail,Default Amount,Default Summa
 DocType: Lab Test Template,Descriptive,Aprakstošs
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Noliktava nav atrasts sistēmā
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Šī mēneša kopsavilkums
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Šī mēneša kopsavilkums
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalitātes pārbaudes Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Iesaldēt Krājumus vecākus par` jābūt mazākam par %d dienām.
 DocType: Tax Rule,Purchase Tax Template,Iegādāties Nodokļu veidne
@@ -4557,12 +4644,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Mācību pasākumu / Rezultāti
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Uzkrātais nolietojums kā uz
 DocType: Sales Invoice,C-Form Applicable,C-Form Piemērojamais
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Darbība Time jābūt lielākam par 0 ekspluatācijai {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Darbība Time jābūt lielākam par 0 ekspluatācijai {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Noliktava ir obligāta
 DocType: Supplier,Address and Contacts,Adrese un kontakti
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Conversion Detail
 DocType: Program,Program Abbreviation,Program saīsinājums
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Ražošanas rīkojums nevar tikt izvirzīts pret Vienības Template
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Ražošanas rīkojums nevar tikt izvirzīts pret Vienības Template
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Izmaksas tiek atjauninātas pirkuma čeka pret katru posteni
 DocType: Warranty Claim,Resolved By,Atrisināts Līdz
 DocType: Bank Guarantee,Start Date,Sākuma datums
@@ -4588,27 +4675,28 @@
 DocType: Employee,Educational Qualification,Izglītības Kvalifikācijas
 DocType: Workstation,Operating Costs,Ekspluatācijas Izmaksas
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Darbība ja uzkrātie ikmēneša budžets pārsniegts
-DocType: Purchase Invoice,Submit on creation,Iesniegt radīšanas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Valūta {0} ir {1}
+DocType: Subscription,Submit on creation,Iesniegt radīšanas
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Valūta {0} ir {1}
 DocType: Asset,Disposal Date,Atbrīvošanās datums
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-pastu tiks nosūtīts visiem Active uzņēmuma darbiniekiem tajā konkrētajā stundā, ja viņiem nav brīvdienu. Atbilžu kopsavilkums tiks nosūtīts pusnaktī."
 DocType: Employee Leave Approver,Employee Leave Approver,Darbinieku Leave apstiprinātājs
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Rinda {0}: Pārkārtot ieraksts jau eksistē šī noliktava {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Nevar atzīt par zaudēto, jo citāts ir veikts."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,apmācības Atsauksmes
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Rinda {0}: Pārkārtot ieraksts jau eksistē šī noliktava {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Nevar atzīt par zaudēto, jo citāts ir veikts."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,apmācības Atsauksmes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Ražošanas Order {0} jāiesniedz
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Piegādātāju vērtēšanas kritēriju kritēriji
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},"Lūdzu, izvēlieties sākuma datumu un beigu datums postenim {0}"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Kurss ir obligāta kārtas {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Līdz šim nevar būt agrāk no dienas
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Pievienot / rediģēt Cenas
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Pievienot / rediģēt Cenas
 DocType: Batch,Parent Batch,Mātes Partijas
 DocType: Batch,Parent Batch,Mātes Partijas
 DocType: Cheque Print Template,Cheque Print Template,Čeku Print Template
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Shēma izmaksu centriem
 DocType: Lab Test Template,Sample Collection,Paraugu kolekcija
 ,Requested Items To Be Ordered,Pieprasītās Preces jāpasūta
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Mani Pasūtījumi
 DocType: Price List,Price List Name,Cenrādis Name
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Ikdienas darbā kopsavilkums {0}
 DocType: Employee Loan,Totals,Kopsummas
@@ -4627,12 +4715,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,"{0} vienības {1} nepieciešama {2} uz {3} {4} uz {5}, lai pabeigtu šo darījumu."
 DocType: Fee Schedule,Student Category,Student kategorija
 DocType: Announcement,Student,students
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Organizācijas struktūrvienība (departaments) meistars.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Organizācijas struktūrvienība (departaments) meistars.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Doties uz Istabas
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Ievadiet ziņu pirms nosūtīšanas
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,Dublikāts piegādātājs
 DocType: Email Digest,Pending Quotations,Līdz Citāti
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Point-of-Sale Profils
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Point-of-Sale Profils
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Lab testēšanas konfigurācijas.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Nenodrošināti aizdevumi
 DocType: Cost Center,Cost Center Name,Cost Center Name
@@ -4642,6 +4730,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Kopējais apmaksātais Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,"Vēstules, kas pārsniedz 160 rakstzīmes tiks sadalīta vairākos ziņas"
 DocType: Purchase Receipt Item,Received and Accepted,Saņemts un pieņemts
+DocType: Hub Settings,Company and Seller Profile,Uzņēmuma un pārdevēja profils
 ,GST Itemised Sales Register,GST atšifrējums Pārdošanas Reģistrēties
 ,Serial No Service Contract Expiry,Sērijas Nr Pakalpojumu līgums derīguma
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,"Var nav kredīta un debeta pašu kontu, tajā pašā laikā"
@@ -4651,10 +4740,11 @@
 DocType: Item,Variant Based On,"Variants, kura pamatā"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Kopā weightage piešķirts vajadzētu būt 100%. Tas ir {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Jūsu Piegādātāji
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,"Lūdzu, labojiet"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Nevar iestatīt kā Lost kā tiek veikts Sales Order.
 DocType: Request for Quotation Item,Supplier Part No,Piegādātājs daļas nr
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nevar atskaitīt, ja kategorija ir &quot;vērtēšanas&quot; vai &quot;Vaulation un Total&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Saņemts no
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Saņemts no
 DocType: Lead,Converted,Konvertē
 DocType: Item,Has Serial No,Ir Sērijas nr
 DocType: Employee,Date of Issue,Izdošanas datums
@@ -4662,7 +4752,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Kā vienu Pirkšana iestatījumu, ja pirkuma čeka Nepieciešams == &quot;JĀ&quot;, tad, lai izveidotu pirkuma rēķinu, lietotājam ir nepieciešams, lai izveidotu pirkuma kvīts vispirms posteni {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Row # {0}: Set Piegādātājs posteni {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Rinda {0}: Stundas vērtībai ir jābūt lielākai par nulli.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Website Image {0} pievienots posteni {1} nevar atrast
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Website Image {0} pievienots posteni {1} nevar atrast
 DocType: Issue,Content Type,Content Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Dators
 DocType: Item,List this Item in multiple groups on the website.,Uzskaitīt šo Prece vairākās grupās par mājas lapā.
@@ -4673,14 +4763,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Saņemt Unreconciled Ieraksti
 DocType: Payment Reconciliation,From Invoice Date,No rēķina datuma
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Jums nav atļaujas iesniegt
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,Norēķinu valūta ir jābūt vienādam vai nu noklusējuma comapany valūtu vai partija konta valūtā
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Norēķinu valūta ir jābūt vienādam vai nu noklusējuma comapany valūtu vai partija konta valūtā
 DocType: Healthcare Settings,Laboratory Settings,Laboratorijas iestatījumi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,atstājiet inkasācijas
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Ko tas dod?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Uz noliktavu
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Visas Studentu Uzņemšana
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Ko tas dod?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Uz noliktavu
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Visas Studentu Uzņemšana
 ,Average Commission Rate,Vidēji Komisija likme
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,"""Ir Sērijas Nr"" nevar būt ""Jā"", ja nav krājumu postenis"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,"""Ir Sērijas Nr"" nevar būt ""Jā"", ja nav krājumu postenis"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Atlasiet statusu
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Apmeklējumu nevar atzīmēti nākamajām datumiem
 DocType: Pricing Rule,Pricing Rule Help,Cenu noteikums Palīdzība
@@ -4698,41 +4788,41 @@
 DocType: Item,Customer Code,Klienta kods
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Dzimšanas dienu atgādinājums par {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dienas Kopš pēdējā pasūtījuma
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Debets kontā jābūt bilance konts
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Debets kontā jābūt bilance konts
 DocType: Buying Settings,Naming Series,Nosaucot Series
 DocType: Leave Block List,Leave Block List Name,Atstājiet Block Saraksta nosaukums
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Apdrošināšanas Sākuma datums jābūt mazākam nekā apdrošināšana Beigu datums
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,"Lūdzu, uzstādiet Instruktoru nosaukumu sistēmu skolā&gt; Skolas iestatījumi"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Akciju aktīvi
 DocType: Timesheet,Production Detail,Ražošanas Detail
+DocType: Restaurant,Active Menu,Aktīvā izvēlne
 DocType: Target Detail,Target Qty,Mērķa Daudz
 DocType: Shopping Cart Settings,Checkout Settings,Checkout iestatījumi
 DocType: Attendance,Present,Dāvana
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Piegāde piezīme {0} nedrīkst jāiesniedz
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Piegāde piezīme {0} nedrīkst jāiesniedz
 DocType: Notification Control,Sales Invoice Message,PPR ziņojums
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Noslēguma kontu {0} jābūt tipa Atbildības / Equity
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Alga Slip darbinieka {0} jau radīts laiks lapas {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Alga Slip darbinieka {0} jau radīts laiks lapas {1}
 DocType: Vehicle Log,Odometer,odometra
 DocType: Sales Order Item,Ordered Qty,Pasūtīts daudzums
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Postenis {0} ir invalīds
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Postenis {0} ir invalīds
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Līdz pat
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM nesatur krājuma priekšmetu
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Projekta aktivitāte / uzdevums.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM nesatur krājuma priekšmetu
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Projekta aktivitāte / uzdevums.
 DocType: Vehicle Log,Refuelling Details,Degvielas uzpildes Details
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Izveidot algas lapas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Pirkšana jāpārbauda, ja nepieciešams, par ir izvēlēts kā {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Atlaide jābūt mazāk nekā 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Pēdējā pirkuma likmes nav atrasts
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Norakstīt summu (Company valūta)
 DocType: Sales Invoice Timesheet,Billing Hours,Norēķinu Stundas
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,Default BOM par {0} nav atrasts
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Row # {0}: Lūdzu noteikt pasūtīšanas daudzumu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Default BOM par {0} nav atrasts
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Row # {0}: Lūdzu noteikt pasūtīšanas daudzumu
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,"Pieskarieties objektus, lai pievienotu tos šeit"
 DocType: Fees,Program Enrollment,Program Uzņemšanas
 DocType: Landed Cost Voucher,Landed Cost Voucher,Izkrauti izmaksas kuponu
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Lūdzu noteikt {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Atkārtot mēneša diena
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} ir neaktīvs students
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} ir neaktīvs students
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} ir neaktīvs students
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} ir neaktīvs students
 DocType: Employee,Health Details,Veselības Details
 DocType: Offer Letter,Offer Letter Terms,Piedāvājuma vēstule Noteikumi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Lai izveidotu maksājuma pieprasījums ir nepieciešama atsauces dokuments
@@ -4741,7 +4831,6 @@
 DocType: Employee External Work History,Salary,Alga
 DocType: Serial No,Delivery Document Type,Piegāde Dokumenta tips
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Iesniegt visas algas lapas par iepriekš izvēlētajiem kritērijiem
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Preces sinhronizētas
 DocType: Sales Order,Partly Delivered,Daļēji Pasludināts
 DocType: Email Digest,Receivables,Debitoru parādi
 DocType: Lead Source,Lead Source,Lead Source
@@ -4762,9 +4851,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Novecošana Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Stiprums
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM aizstāj
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,"Atlasiet vienumus, pamatojoties uz piegādes datumu"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,"Atlasiet vienumus, pamatojoties uz piegādes datumu"
 ,Sales Analytics,Pārdošanas Analīze
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Pieejams {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Pieejams {0}
 ,Prospects Engaged But Not Converted,Prospects Nodarbojas bet nav konvertēts
 ,Prospects Engaged But Not Converted,Prospects Nodarbojas bet nav konvertēts
 DocType: Manufacturing Settings,Manufacturing Settings,Ražošanas iestatījumi
@@ -4772,10 +4861,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Mobilo Nr
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Ievadiet noklusējuma valūtu Uzņēmuma Master
 DocType: Stock Entry Detail,Stock Entry Detail,Stock Entry Detail
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Ikdienas atgādinājumi
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Ikdienas atgādinājumi
 DocType: Products Settings,Home Page is Products,Mājas lapa ir produkti
 ,Asset Depreciation Ledger,Aktīvu nolietojums Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Nodokļu noteikums Konflikti ar {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Nodokļu noteikums Konflikti ar {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Jaunais Konta nosaukums
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Izejvielas Kopā izmaksas
 DocType: Selling Settings,Settings for Selling Module,Iestatījumi Pārdošana modulis
@@ -4789,8 +4878,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Postenis {0} jābūt krājums punkts
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Default nepabeigtie Noliktava
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Noklusējuma iestatījumi grāmatvedības darījumiem.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Lūdzu, izveidojiet darbinieku nosaukumu sistēmu cilvēkresursu vadībā&gt; Personāla iestatījumi"
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,"Paredzams, datums nevar būt pirms Material Pieprasīt Datums"
+DocType: Restaurant,Default Tax Template,Noklusējuma nodokļu veidlapa
 DocType: Fees,Student Details,Studentu detaļas
 DocType: Purchase Invoice Item,Stock Qty,Stock Daudz
 DocType: Purchase Invoice Item,Stock Qty,Stock Daudz
@@ -4809,8 +4899,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Doties uz vienumiem
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Faktisks
+DocType: Restaurant Menu,Restaurant Manager,Restorāna vadītājs
 DocType: Authorization Rule,Customerwise Discount,Customerwise Atlaide
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Kontrolsaraksts uzdevumiem.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Kontrolsaraksts uzdevumiem.
 DocType: Purchase Invoice,Against Expense Account,Pret Izdevumu kontu
 DocType: Production Order,Production Order,Ražošanas rīkojums
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Jau ir iesniegta uzstādīšana Note {0}
@@ -4818,7 +4909,6 @@
 DocType: Quotation Item,Against Docname,Pret Docname
 DocType: SMS Center,All Employee (Active),Visi Employee (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Skatīt Tagad
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Izvēlieties laiku, kad rēķins tiks ģenerētas automātiski"
 DocType: BOM,Raw Material Cost,Izejvielas izmaksas
 DocType: Item Reorder,Re-Order Level,Re-Order līmenis
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Ievadiet preces un plānoto qty par kuru vēlaties paaugstināt ražošanas pasūtījumus vai lejupielādēt izejvielas analīzei.
@@ -4831,24 +4921,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Ziņojums Type ir obligāts
 DocType: Item,Serial Number Series,Sērijas numurs Series
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Noliktava ir obligāta krājuma priekšmetu {0} rindā {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Pievienot programmas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Tirdzniecība un vairumtirdzniecība
 DocType: Issue,First Responded On,First atbildēja
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross uzskaitījums Prece ir vairākām grupām
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiskālā gada sākuma datums un fiskālā gada beigu datums jau ir paredzēta fiskālā gada {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,atjaunināts klīrenss Datums
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Partijas
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Partijas
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split Partijas
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split Partijas
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Veiksmīgi jāsaskaņo
 DocType: Request for Quotation Supplier,Download PDF,Lejupielādēt PDF
 DocType: Production Order,Planned End Date,Plānotais beigu datums
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,"Lūdzu, ievadiet grafiku datumu"
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,"Gadījumos, kad preces tiek uzglabāti."
 DocType: Request for Quotation,Supplier Detail,piegādātājs Detail
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Kļūda formulu vai stāvoklī: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Kļūda formulu vai stāvoklī: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Rēķinā summa
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kritēriju svariem jābūt līdz 100%
 DocType: Attendance,Attendance,Apmeklētība
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,akciju preces
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,akciju preces
 DocType: BOM,Materials,Materiāli
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ja nav atzīmēts, sarakstā būs jāpievieno katrā departamentā, kur tas ir jāpiemēro."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Avota un mērķa Warehouse nevar būt vienādi
@@ -4866,6 +4956,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,No kopējiem neto
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Cenas atribūtu {0} ir jābūt robežās no {1} līdz {2} Jo soli {3} uz posteni {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Mērķa noliktava rindā {0} ir jābūt tādai pašai kā Production ordeņa
+DocType: Restaurant Reservation,Waitlisted,Waitlisted
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Valūtas nevar mainīt pēc tam ierakstus izmantojot kādu citu valūtu
 DocType: Vehicle Service,Clutch Plate,sajūga Plate
 DocType: Company,Round Off Account,Noapaļot kontu
@@ -4882,7 +4973,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Jauns Sales Person vārds
 DocType: Packing Slip,Gross Weight UOM,Bruto svara Mērvienība
 DocType: Delivery Note Item,Against Sales Invoice,Pret pārdošanas rēķinu
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Ievadiet sērijas numuri serializēto preci
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Ievadiet sērijas numuri serializēto preci
 DocType: Bin,Reserved Qty for Production,Rezervēts Daudzums uz ražošanas
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Atstājiet neieslēgtu ja nevēlaties izskatīt partiju, vienlaikus, protams, balstās grupas."
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Atstājiet neieslēgtu ja nevēlaties izskatīt partiju, vienlaikus, protams, balstās grupas."
@@ -4894,7 +4985,7 @@
 DocType: Lab Test,Test Group,Testa grupa
 DocType: Payment Reconciliation,Receivable / Payable Account,Debitoru / kreditoru konts
 DocType: Delivery Note Item,Against Sales Order Item,Pret Sales Order posteni
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},"Lūdzu, norādiet īpašības Value atribūtam {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},"Lūdzu, norādiet īpašības Value atribūtam {0}"
 DocType: Item,Default Warehouse,Default Noliktava
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budžets nevar iedalīt pret grupas kontā {0}
 DocType: Healthcare Settings,Patient Registration,Pacienta reģistrācija
@@ -4924,6 +5015,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Sales Person
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Budžets un izmaksu centrs
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Vairāki noklusējuma maksājuma veidi nav atļauti
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,priekš
 ,Appointment Analytics,Iecelšana par Analytics
 DocType: Vehicle Service,Half Yearly,Pusgada
 DocType: Lead,Blog Subscriber,Blog Abonenta
@@ -4943,7 +5035,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,quot skaits
 ,BOM Stock Report,BOM Stock pārskats
 DocType: Stock Reconciliation Item,Quantity Difference,daudzums Starpība
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Apstrāde algu
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Apstrāde algu
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Kredīta summa
 DocType: Cheque Print Template,Signatory Position,Parakstītājs Position
@@ -4957,12 +5049,12 @@
 DocType: Tax Rule,Tax Rule,Nodokļu noteikums
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Uzturēt pašu likmi VISĀ pārdošanas ciklā
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Plānot laiku ārpus Darba vietas darba laika.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Klienti rindā
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} nav ārstu grafika. Pievienojiet to ārsta meistram
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Klienti rindā
 DocType: Student,Nationality,pilsonība
 ,Items To Be Requested,"Preces, kas jāpieprasa"
-DocType: Purchase Order,Get Last Purchase Rate,Saņemt pēdējā pirkšanas likme
 DocType: Company,Company Info,Uzņēmuma informācija
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Izvēlieties vai pievienot jaunu klientu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Izvēlieties vai pievienot jaunu klientu
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Izmaksu centrs ir nepieciešams rezervēt izdevumu prasību
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Līdzekļu (aktīvu)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Tas ir balstīts uz piedalīšanos šī darbinieka
@@ -4970,6 +5062,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Debeta kontu
 DocType: Fiscal Year,Year Start Date,Gadu sākuma datums
 DocType: Attendance,Employee Name,Darbinieku Name
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restorāna pasūtījuma ieraksta vienība
 DocType: Sales Invoice,Rounded Total (Company Currency),Noapaļota Kopā (Company valūta)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Nevar slēptu to grupai, jo ir izvēlēta Account Type."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0}{1} ir mainīta. Lūdzu atsvaidzināt.
@@ -4980,6 +5073,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Darbinieku pabalsti
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Pildīta daudzums ir jābūt vienādai daudzums postenim {0} rindā {1}
 DocType: Production Order,Manufactured Qty,Ražoti Daudz
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Izveidots rēķins
 DocType: Purchase Receipt Item,Accepted Quantity,Pieņemts daudzums
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Lūdzu iestatīt noklusējuma brīvdienu sarakstu par darbinieka {0} vai Company {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} neeksistē
@@ -4989,18 +5083,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nr {0}: Summa nevar būt lielāks par rezervēta summa pret Izdevumu pretenzijā {1}. Līdz Summa ir {2}
 DocType: Maintenance Schedule,Schedule,Grafiks
 DocType: Account,Parent Account,Mātes vērā
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Pieejams
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Pieejams
 DocType: Quality Inspection Reading,Reading 3,Lasīšana 3
 ,Hub,Rumba
 DocType: GL Entry,Voucher Type,Kuponu Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Cenrādis nav atrasts vai invalīds
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Cenrādis nav atrasts vai invalīds
 DocType: Lab Test,Approved,Apstiprināts
 DocType: Pricing Rule,Price,Cena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',"Darbinieku atvieglots par {0} ir jānosaka kā ""Kreisais"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',"Darbinieku atvieglots par {0} ir jānosaka kā ""Kreisais"""
+DocType: Hub Settings,Last Sync On,Pēdējā sinhronizācija ir ieslēgta
 DocType: Guardian,Guardian,aizbildnis
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Izvērtēšana {0} radīts Darbinieku {1} dotajā datumu diapazonā
 DocType: Employee,Education,Izglītība
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,Del
 DocType: Selling Settings,Campaign Naming By,Kampaņas nosaukšana Līdz
 DocType: Employee,Current Address Is,Pašreizējā adrese ir
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Ikmēneša pārdošanas mērķis (
@@ -5015,7 +5110,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Kursa kods:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Ievadiet izdevumu kontu
 DocType: Account,Stock,Noliktava
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Document Type jābūt vienam no Pirkuma ordeņa, Pirkuma rēķins vai Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Document Type jābūt vienam no Pirkuma ordeņa, Pirkuma rēķins vai Journal Entry"
 DocType: Employee,Current Address,Pašreizējā adrese
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ja prece ir variants citā postenī, tad aprakstu, attēlu, cenas, nodokļi utt tiks noteikts no šablona, ja vien nav skaidri norādīts"
 DocType: Serial No,Purchase / Manufacture Details,Pirkuma / Ražošana Details
@@ -5046,7 +5141,7 @@
 DocType: Hub Settings,Hub Settings,Hub iestatījumi
 DocType: Project,Gross Margin %,Bruto rezerve%
 DocType: BOM,With Operations,Ar operāciju
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Grāmatvedības ieraksti jau ir veikts valūtā {0} kompānijai {1}. Lūdzu, izvēlieties saņemamo vai maksājamo konts valūtā {0}."
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Grāmatvedības ieraksti jau ir veikts valūtā {0} kompānijai {1}. Lūdzu, izvēlieties saņemamo vai maksājamo konts valūtā {0}."
 DocType: Asset,Is Existing Asset,Vai esošajam aktīvam
 DocType: Salary Detail,Statistical Component,statistikas komponents
 DocType: Salary Detail,Statistical Component,statistikas komponents
@@ -5055,13 +5150,14 @@
 DocType: BOM Operation,BOM Operation,BOM Operation
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Uz iepriekšējo rindu summas
 DocType: Student,Home Address,Mājas adrese
+DocType: Item,Has Expiry Date,Ir derīguma termiņš
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Vienuma variantu iestatījumi.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transfer Asset
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,Transfer Asset
 DocType: POS Profile,POS Profile,POS Profile
 DocType: Training Event,Event Name,Event Name
 DocType: Physician,Phone (Office),Tālrunis (birojs)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,uzņemšana
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Uzņemšana par {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,uzņemšana
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Uzņemšana par {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Sezonalitāte, nosakot budžetu, mērķus uc"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Mainīgais nosaukums
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Prece {0} ir veidne, lūdzu, izvēlieties vienu no saviem variantiem"
@@ -5070,7 +5166,7 @@
 DocType: Assessment Plan,Room,istaba
 DocType: Purchase Order,Advance Paid,Izmaksāto avansu
 DocType: Item,Item Tax,Postenis Nodokļu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Materiāls piegādātājam
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Materiāls piegādātājam
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Akcīzes Invoice
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% parādās vairāk nekā vienu reizi
 DocType: Expense Claim,Employees Email Id,Darbinieki e-pasta ID
@@ -5081,32 +5177,30 @@
 DocType: Program,Program Name,programmas nosaukums
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,"Apsveriet nodokļi un maksājumi, lai"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiskais Daudz ir obligāta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} pašlaik ir {1} piegādātāju rādītāju karte, un šī piegādātāja iepirkuma rīkojumi jāizsaka piesardzīgi."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} pašlaik ir {1} piegādātāju rādītāju karte, un šī piegādātāja iepirkuma rīkojumi jāizsaka piesardzīgi."
 DocType: Employee Loan,Loan Type,aizdevuma veids
 DocType: Scheduling Tool,Scheduling Tool,plānošana Tool
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Kredītkarte
 DocType: BOM,Item to be manufactured or repacked,Postenis tiks ražots pārsaiņojamā
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Noklusējuma iestatījumi akciju darījumiem.
-DocType: Purchase Invoice,Next Date,Nākamais datums
 DocType: Employee Education,Major/Optional Subjects,Lielākie / Izvēles priekšmeti
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
+DocType: Hub Settings,Suspended,Apturēts
 DocType: Training Event,Attendees,Dalībnieki
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Šeit jūs varat saglabāt ģimenes informāciju, piemēram, vārdu un okupācijas mātes, laulātā un bērnu"
 DocType: Academic Term,Term End Date,Term beigu datums
-DocType: Hub Settings,Seller Name,Pārdevējs Vārds
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Nodokļi un maksājumi Atskaitīts (Company valūta)
 DocType: Item Group,General Settings,Vispārīgie iestatījumi
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,No valūtu un valūtu nevar būt vienādi
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Pievienot instruktorus
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Nepieciešams saglabāt formu pirms procedūras
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Vispirms izvēlieties uzņēmumu
 DocType: Item Attribute,Numeric Values,Skaitliskās vērtības
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Pievienojiet Logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,krājumu līmeņi
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,krājumu līmeņi
 DocType: Customer,Commission Rate,Komisija Rate
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Izveidoja {0} rādītāju kartes par {1} starp:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Izveidot Variantu
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Izveidot Variantu
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Block atvaļinājums iesniegumi departamentā.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Maksājuma veids ir viens no saņemšana, Pay un Iekšējās Transfer"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -5121,11 +5215,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Pamatkapitāls
 DocType: Shopping Cart Settings,Show Public Attachments,Parādīt publisko pielikumus
 DocType: Packing Slip,Package Weight Details,Iepakojuma svars Details
+DocType: Restaurant Reservation,Reservation Time,Rezervācijas laiks
 DocType: Payment Gateway Account,Payment Gateway Account,Maksājumu Gateway konts
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Pēc maksājuma pabeigšanas novirzīt lietotāju uz izvēlētā lapā.
 DocType: Company,Existing Company,esošās Company
 DocType: Healthcare Settings,Result Emailed,Rezultāts nosūtīts pa e-pastu
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","Nodokļu kategorija ir mainīts uz &quot;Kopā&quot;, jo visi priekšmeti ir nenoteiktas akciju preces"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Vienības kods&gt; Vienības grupa&gt; Zīmols
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,"Lūdzu, izvēlieties csv failu"
 DocType: Student Leave Application,Mark as Present,Atzīmēt kā Present
 DocType: Supplier Scorecard,Indicator Color,Indikatora krāsa
@@ -5150,11 +5246,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Padarīt Student Sērija
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Vai Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Dabūtu preces no BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Dabūtu preces no BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Izpildes laiks dienas
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: norīkošana datums jābūt tāds pats kā iegādes datums {1} no aktīva {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Atzīmējiet šo, ja students dzīvo pie institūta Hostel."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Ievadiet klientu pasūtījumu tabulā iepriekš
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Ievadiet klientu pasūtījumu tabulā iepriekš
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Nav iesniegti algas lapas
 ,Stock Summary,Stock kopsavilkums
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Nodot aktīvus no vienas noliktavas uz otru
@@ -5170,5 +5266,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Rinda {0}: debeta ierakstu nevar saistīt ar {1}
 DocType: Journal Entry,Subscription Section,Abonēšanas sadaļa
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Konts {0} nepastāv
+DocType: Training Event,Training Program,Apmācības programma
 DocType: Account,Cash,Nauda
 DocType: Employee,Short biography for website and other publications.,Īsa biogrāfija mājas lapas un citas publikācijas.
diff --git a/erpnext/translations/mk.csv b/erpnext/translations/mk.csv
index 6aad720..a5b1849 100644
--- a/erpnext/translations/mk.csv
+++ b/erpnext/translations/mk.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Режим на плата
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Регистрирај се
 DocType: Patient,Divorced,Разведен
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Предмети веќе се синхронизираат
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Овозможува ставките да се додадат повеќе пати во една трансакција
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Откажи материјали Посетете {0} пред да го раскине овој Гаранција побарување
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Производи за широка потрошувачка
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Остави Approvers
 DocType: Sales Partner,Dealer,Дилер
 DocType: Consultation,Investigations,Истраги
+DocType: Restaurant Order Entry,Click Enter To Add,Кликнете Enter за да додадете
 DocType: Employee,Rented,Изнајмени
 DocType: Purchase Order,PO-,поли-
 DocType: POS Profile,Applicable for User,Применливи за пристап
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Престана производството со цел да не може да биде укинат, отпушвам тоа прво да го откажете"
 DocType: Vehicle Service,Mileage,километражата
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Дали навистина сакате да ја укине оваа предност?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Дали навистина сакате да ја укине оваа предност?
 DocType: Drug Prescription,Update Schedule,Распоред за ажурирање
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Одберете Default Добавувачот
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Е потребно валута за Ценовник {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Проверете достапност
 DocType: Job Applicant,Job Applicant,Работа на апликантот
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Ова е врз основа на трансакции против оваа Добавувачот. Види времеплов подолу за детали
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Нема повеќе резултати.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Правни
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},даноците не може да бидат содржани во ставките во ред {0}
 DocType: Bank Guarantee,Customer,Клиент
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Девизниот курс мора да биде иста како {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Име на Клиент
 DocType: Vehicle,Natural Gas,Природен гас
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Банкарска сметка не може да се именува како {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Банкарска сметка не може да се именува како {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Глави (или групи), против кои се направени на сметководствените ставки и рамнотежи се одржува."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Најдобро за {0} не може да биде помала од нула ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Нема поднесени План за плата за обработка.
 DocType: Manufacturing Settings,Default 10 mins,Стандардно 10 минути
 DocType: Leave Type,Leave Type Name,Остави видот на името
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Show open
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Неопходно е да се преземе оваа акција денес сама за горенаведените периодични
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Серија успешно ажурирани
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Плаќање
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural весник Влегување Поднесени
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,"Нарачката елементи, за да бидат примени"
 DocType: SMS Center,All Supplier Contact,Сите Добавувачот Контакт
 DocType: Support Settings,Support Settings,Прилагодувања за поддршка
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Се очекува Крај Датум не може да биде помал од очекуваниот почеток Датум
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Се очекува Крај Датум не може да биде помал од очекуваниот почеток Датум
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ред # {0}: Оцени мора да биде иста како {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Нов Оставете апликација
 ,Batch Item Expiry Status,Серија ставка истечен статус
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Банкарски Draft
 DocType: Mode of Payment Account,Mode of Payment Account,Начин на плаќање сметка
 DocType: Consultation,Consultation,Консултација
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Продажба и враќање
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Прикажи Варијанти
 DocType: Academic Term,Academic Term,академски мандат
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,материјал
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Здравствена заштита
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Задоцнување на плаќањето (во денови)
 DocType: Lab Prescription,Lab Prescription,Рецепт за лабораторија
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Подреди по цена
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Расходи на услуги
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Сериски број: {0} веќе е наведено во Продај фактура: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Фактура
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Сериски број: {0} веќе е наведено во Продај фактура: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Поените
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Фискална година {0} е потребен
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Одбрана
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Ред # {0}:
 DocType: Timesheet,Total Costing Amount,Вкупно Чини Износ
 DocType: Delivery Note,Vehicle No,Возило Не
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Ве молиме изберете Ценовник
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Ве молиме изберете Ценовник
 DocType: Accounts Settings,Currency Exchange Settings,Подесувања за размена на валута
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Ред # {0}: документ на плаќање е потребно да се заврши trasaction
 DocType: Production Order Operation,Work In Progress,Работа во прогрес
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Ве молиме одберете датум
 DocType: Employee,Holiday List,Список со Празници
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Ве молиме поставете Систем за наведување на наставници во училиште&gt; Поставувања за училиштата
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Сметководител
+DocType: Hub Settings,Selling Price List,Продажба на ценовник
 DocType: Patient,Tobacco Current Use,Тековна употреба на тутун
 DocType: Cost Center,Stock User,Акциите пристап
 DocType: Company,Phone No,Телефон број
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Распоред на курсот е основан:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Нов {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Нов {0}: # {1}
 ,Sales Partners Commission,Продај Партнери комисија
 DocType: Purchase Invoice,Rounding Adjustment,Прилагодување за заокружување
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Кратенка не може да има повеќе од 5 знаци
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Родител Детална docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Суд: {0}, Точка Код: {1} и од купувачи: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Кг
-DocType: Student Log,Log,Пријавете се
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Отворање на работа.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Резултатот е поднесен
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Резултатот е поднесен
 DocType: Item Attribute,Increment,Прираст
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Timespan
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Изберете Магацински ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Брак
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Не се дозволени за {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Се предмети од
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Акции не може да се ажурира против Испратница {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Акции не може да се ажурира против Испратница {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Производ {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Нема ставки наведени
 DocType: Payment Reconciliation,Reconcile,Помират
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пензиски фондови
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Следна Амортизација датум не може да биде пред Дата на продажба
 DocType: Consultation,Consultation Date,Датум на консултации
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Листа на производи и откритија за корисници на ERPNext
 DocType: SMS Center,All Sales Person,Сите продажбата на лице
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** ** Месечен Дистрибуција помага да се дистрибуираат на буџетот / Целна низ месеци, ако има сезоната во вашиот бизнис."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Не се пронајдени производи
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Плата Структура исчезнати
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Не се пронајдени производи
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Плата Структура исчезнати
 DocType: Lead,Person Name,Име лице
 DocType: Sales Invoice Item,Sales Invoice Item,Продажна Фактура Артикал
 DocType: Account,Credit,Кредит
 DocType: POS Profile,Write Off Cost Center,Отпише трошоците центар
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""","на пример, &quot;ОУ&quot; или &quot;Универзитетот&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""","на пример, &quot;ОУ&quot; или &quot;Универзитетот&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,акции на извештаи
 DocType: Warehouse,Warehouse Detail,Магацински Детал
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Кредитен лимит е преминаа за клиентите {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Термин Датум на завршување не може да биде подоцна од годината Датум на завршување на учебната година во која е поврзана на зборот (академска година {}). Ве молам поправете датумите и обидете се повторно.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Дали е фиксни средства"" не може да е немаркирано , како што постои евиденција на средствата во однос на ставките"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Дали е фиксни средства"" не може да е немаркирано , како што постои евиденција на средствата во однос на ставките"
 DocType: Vehicle Service,Brake Oil,кочница нафта
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Група на клиенти&gt; Територија
 DocType: Tax Rule,Tax Type,Тип на данок
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,оданочливиот износ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Немате дозвола за да додадете или да ги ажурирате записи пред {0}
 DocType: BOM,Item Image (if not slideshow),Точка слика (доколку не слајдшоу)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Постои клиентите со исто име
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Час Оцени / 60) * Крај на време операција
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Ред # {0}: Тип на референтен документ мора да биде еден од тврдењата за трошок или запис на дневникот
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,изберете Бум
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Ред # {0}: Тип на референтен документ мора да биде еден од тврдењата за трошок или запис на дневникот
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,изберете Бум
 DocType: SMS Log,SMS Log,SMS Влез
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Цената на испорачани материјали
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Празникот на {0} не е меѓу Од датум и до денес
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,вработен кредит
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Влез активност:
 DocType: Fee Schedule,Send Payment Request Email,Испрати е-пошта за барање за исплата
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Точка {0} не постои во системот или е истечен
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Точка {0} не постои во системот или е истечен
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Недвижнини
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Состојба на сметката
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Лекови
@@ -210,18 +213,23 @@
 DocType: Employee,B-,Б-
 DocType: Upload Attendance,Import Log,Увоз Влез
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Повлечете материјал Барање од типот Производство врз основа на горенаведените критериуми
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Успешно нерегистриран.
 DocType: Training Result Employee,Grade,одделение
+DocType: Restaurant Table,No of Seats,Број на седишта
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","За да додадете динамичен предмет, користете ги џинските ознаки како <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Дадено од страна на Добавувачот
 DocType: SMS Center,All Contact,Сите Контакт
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Производството со цел веќе создадена за сите предмети со Бум
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Производството со цел веќе создадена за сите предмети со Бум
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Годишна плата
 DocType: Daily Work Summary,Daily Work Summary,Секојдневната работа Резиме
 DocType: Period Closing Voucher,Closing Fiscal Year,Затворање на фискалната година
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} е замрзнат
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Ве молиме одберете постоечка компанија за создавање сметковниот
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} е замрзнат
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Ве молиме одберете постоечка компанија за создавање сметковниот
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Акции Трошоци
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Одберете Целна Магацински
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Одберете Целна Магацински
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Одберете Целна Магацински
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Одберете Целна Магацински
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Ве молиме внесете Корисно Контакт е-маил
 DocType: Program Enrollment,School Bus,Школскиот автобус
 DocType: Journal Entry,Contra Entry,Контра Влегување
@@ -238,9 +246,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Преземете ја Шаблон, пополнете соодветни податоци и да го прикачите по промената на податотеката. Сите датуми и вработен комбинација на избраниот период ќе дојде во дефиниција, со постоечките записи посетеност"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Ставка {0} е неактивна или е истечен рокот
+DocType: Student Admission Program,Minimum Age,Минимална возраст
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Пример: Основни математика
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","За да го вклучите данок во ред {0} на стапката точка, даноци во редови {1} исто така, мора да бидат вклучени"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Прилагодувања за Модул со хумани ресурси
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Прилагодувања за Модул со хумани ресурси
 DocType: SMS Center,SMS Center,SMS центарот
 DocType: Sales Invoice,Change Amount,промени Износ
 DocType: BOM Update Tool,New BOM,Нов Бум
@@ -250,7 +259,7 @@
 DocType: Lead,Request Type,Тип на Барањето
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Направете вработените
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Емитување
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Додај соби
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Режим на поставување на ПОС (онлајн / офлајн)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Извршување
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Детали за операции извршени.
 DocType: Serial No,Maintenance Status,Одржување Статус
@@ -273,6 +282,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Мора да се примени Ценовник за Купување или Продажба
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Датум на инсталација не може да биде пред датумот на испорака за Точка {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Попуст на Ценовник стапка (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Биохемија
 DocType: Offer Letter,Select Terms and Conditions,Изберете Услови и правила
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,Од вредност
 DocType: Production Planning Tool,Sales Orders,Продај Нарачка
@@ -307,15 +317,15 @@
 DocType: Sales Partner,Reseller,Препродавач
 DocType: Codification Table,Medical Code,Медицински законик
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Ако е избрано, ќе ги вклучува не-акции ставки во материјалот барања."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Ве молиме внесете компанијата
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Ве молиме внесете компанијата
 DocType: Delivery Note Item,Against Sales Invoice Item,Во однос на ставка од Продажна фактура
 ,Production Orders in Progress,Производство налози во прогрес
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Нето паричен тек од финансирањето
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage е полна, не штедеше"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage е полна, не штедеше"
 DocType: Lead,Address & Contact,Адреса и контакт
 DocType: Leave Allocation,Add unused leaves from previous allocations,Додади неискористени листови од претходните алокации
 DocType: Sales Partner,Partner website,веб-страница партнер
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Додај ставка
+DocType: Restaurant Order Entry,Add Item,Додај ставка
 DocType: Lab Test,Custom Result,Прилагоден резултат
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Име за Контакт
 DocType: Course Assessment Criteria,Course Assessment Criteria,Критериуми за оценување на курсот
@@ -328,7 +338,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Барање за купување.
 DocType: Lab Test,Submitted Date,Датум на поднесување
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Ова се базира на време листови создадени против овој проект
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Нето плата не може да биде помал од 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Нето плата не може да биде помал од 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","За да престанеме да испраќаме повторувачки известувања за грешки од системот, ние го проверивме полето Disabled во претплатата"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Само избраните Остави Approver може да го достави овој Оставете апликација
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Ослободување Датум мора да биде поголема од датумот на пристап
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Остава на годишно ниво
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,Добивка и загуба
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,литарски
 DocType: Task,Total Costing Amount (via Time Sheet),Вкупно Износ на трошоци (преку време лист)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Те молам постави ученици од студентски групи
 DocType: Item Website Specification,Item Website Specification,Точка на вебсајт Спецификација
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Остави блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Точка {0} достигна својот крај на животот на {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Точка {0} достигна својот крај на животот на {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Банката записи
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Годишен
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Акции помирување Точка
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Група на студенти инструмент за создавање на курсот
 DocType: Lead,Do Not Contact,Не го допирајте
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,Луѓето кои учат во вашата организација
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,На уникатен проект за следење на сите периодични фактури. Тоа е генерирана за поднесете.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Развивач на софтвер
 DocType: Item,Minimum Order Qty,Минимална Подреди Количина
 DocType: Pricing Rule,Supplier Type,Добавувачот Тип
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,Објави во Hub
 DocType: Student Admission,Student Admission,за прием на студентите
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Точка {0} е откажана
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Материјал Барање
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Точка {0} е откажана
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Материјал Барање
 DocType: Bank Reconciliation,Update Clearance Date,Ажурирање Чистење Датум
 DocType: Item,Purchase Details,Купување Детали за
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Точка {0} не се најде во &quot;суровини испорачува&quot; маса во нарачката {1}
 DocType: Patient Relation,Relation,Врска
 DocType: Shipping Rule,Worldwide Shipping,Светот превозот
 DocType: Patient Relation,Mother,мајка
+DocType: Restaurant Reservation,Reservation End Time,Резервирано време за резервација
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Потврди налози од клиенти.
 DocType: Purchase Receipt Item,Rejected Quantity,Одбиени Кол
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Барањето за исплата {0} создадено
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Барањето за исплата {0} создадено
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Ниска чувствителност
 DocType: Notification Control,Notification Control,Известување за контрола
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Ве молиме потврдете откако ќе завршите со обуката
 DocType: Lead,Suggestions,Предлози
@@ -388,7 +401,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Пораките плата лизга на вработените врз основа на склопот на е-маил избрани во вработените
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Првиот Leave Approver во листата ќе биде поставена како стандардна Остави Approver
 DocType: Tax Rule,Shipping County,округот превозот
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Научат
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Научат
 DocType: Asset,Next Depreciation Date,Следна Амортизација Датум
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Трошоци активност по вработен
 DocType: Accounts Settings,Settings for Accounts,Поставки за сметки
@@ -399,13 +412,13 @@
 DocType: Item,Synced With Hub,Синхронизираат со Hub
 DocType: Vehicle,Fleet Manager,Fleet Manager
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Ред # {0}: {1} не може да биде негативен за ставката {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Погрешна лозинка
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Погрешна лозинка
 DocType: Item,Variant Of,Варијанта на
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Завршено Количина не може да биде поголем од &quot;Количина на производство&quot;
 DocType: Period Closing Voucher,Closing Account Head,Завршната сметка на главата
 DocType: Employee,External Work History,Надворешни Историја работа
 DocType: Physician,Time per Appointment,Време по назначувањето
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Кружни Суд Грешка
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Кружни Суд Грешка
 DocType: Appointment Type,Is Inpatient,Е болен
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Име Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Во зборови (извоз) ќе биде видлив откако ќе ја зачувате за испорака.
@@ -414,19 +427,18 @@
 DocType: Lead,Industry,Индустрија
 DocType: Employee,Job Profile,Профил работа
 DocType: BOM Item,Rate & Amount,Стапка и износ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ве молиме наместете серија за нумерација за Присуство преку Поставување&gt; Нумерирање
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Ова се базира на трансакции против оваа компанија. Погледнете временска рамка подолу за детали
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Да го извести преку е-пошта на создавање на автоматски материјал Барање
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Отпорна
 DocType: Journal Entry,Multi Currency,Мулти Валута
 DocType: Payment Reconciliation Invoice,Invoice Type,Тип на фактура
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Група на клиенти&gt; Територија
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Потврда за испорака
 DocType: Consultation,Encounter Impression,Се судрите со впечатокот
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Поставување Даноци
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Трошоци на продадени средства
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,Плаќање Влегување е изменета откако ќе го влечат. Ве молиме да се повлече повторно.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} влезе двапати во ставка Данок
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,"Резимето на оваа недела, а во очекување на активности"
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} влезе двапати во ставка Данок
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,"Резимето на оваа недела, а во очекување на активности"
 DocType: Student Applicant,Admitted,призна
 DocType: Workstation,Rent Cost,Изнајмување на трошоците
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Износ по амортизација
@@ -441,36 +453,35 @@
 DocType: Shipping Rule,Valid for Countries,Важат за земјите
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Оваа содржина е моделот и не може да се користи во трансакциите. Точка атрибути ќе бидат копирани во текот на варијанти освен ако е &quot;Не Копирај&quot; е поставена
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Вкупно Разгледани Нарачки
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Ознака за вработените (на пример, извршен директор, директор итн)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Ознака за вработените (на пример, извршен директор, директор итн)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Стапка по која клиентите Валута се претвора во основната валута купувачи
 DocType: Course Scheduling Tool,Course Scheduling Tool,Курс Планирање алатката
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ред # {0}: Набавка фактура не може да се направи против постоечко средство {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Итно] Грешка при создавање на повторувачки% s за% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Итно] Грешка при создавање на повторувачки% s за% s
 DocType: Item Tax,Tax Rate,Даночна стапка
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} веќе наменети за вработените {1} за период {2} до {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Одберете ја изборната ставка
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Одберете ја изборната ставка
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Купување на фактура {0} е веќе поднесен
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Ред # {0}: Серија Не мора да биде иста како {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Претворат во не-групата
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Серија (дел) од една ставка.
 DocType: C-Form Invoice Detail,Invoice Date,Датум на фактурата
 DocType: GL Entry,Debit Amount,Износ дебитна
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Може да има само 1 профил на компанијата во {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Ве молиме погледнете приврзаност
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Може да има само 1 профил на компанијата во {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Ве молиме погледнете приврзаност
 DocType: Purchase Order,% Received,% Доби
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Креирај студентски групи
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Поставување веќе е завршено !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Поставување веќе е завршено !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Забелешка кредит Износ
 DocType: Setup Progress Action,Action Document,Акционен документ
 ,Finished Goods,Готови производи
 DocType: Delivery Note,Instructions,Инструкции
 DocType: Quality Inspection,Inspected By,Прегледано од страна на
 DocType: Maintenance Visit,Maintenance Type,Тип одржување
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} не е запишано во текот {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код на ставка&gt; Група на производи&gt; Бренд
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} не е запишано во текот {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Сериски № {0} не му припаѓа на испорака Забелешка {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Демо
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Додај ставки
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Додај ставки
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Точка испитување квалитет Параметар
 DocType: Leave Application,Leave Approver Name,Остави Approver Име
 DocType: Depreciation Schedule,Schedule Date,Распоред Датум
@@ -492,7 +503,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Работно време
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Промените почетниот / тековниот број на секвенца на постоечки серија.
 DocType: Dosage Strength,Strength,Сила
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Креирај нов клиент
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Креирај нов клиент
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ако има повеќе Правила Цените и понатаму преовладуваат, корисниците се бара да поставите приоритет рачно за решавање на конфликтот."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Создаде купување на налози
 ,Purchase Register,Купување Регистрирај се
@@ -511,7 +522,7 @@
 DocType: Lab Test Template,Single,Еден
 DocType: Salary Slip,Total Loan Repayment,Вкупно кредит Отплата
 DocType: Account,Cost of Goods Sold,Трошоците на продадени производи
-DocType: Purchase Invoice,Yearly,Годишно
+DocType: Subscription,Yearly,Годишно
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Ве молиме внесете цена центар
 DocType: Drug Prescription,Dosage,Дозирање
 DocType: Journal Entry Account,Sales Order,Продај Побарувања
@@ -542,7 +553,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобалните поставувања за сите производствени процеси.
 DocType: Accounts Settings,Accounts Frozen Upto,Сметки замрзнати до
 DocType: SMS Log,Sent On,Испрати на
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} одбрани неколку пати во атрибути на табелата
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} одбрани неколку пати во атрибути на табелата
 DocType: HR Settings,Employee record is created using selected field. ,Рекорд вработен е креирана преку избрани поле.
 DocType: Sales Order,Not Applicable,Не е применливо
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Одмор господар.
@@ -568,13 +579,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Вкупно Отсуства распределени е задолжително
 DocType: Patient,AB Positive,АБ Позитивен
 DocType: Job Opening,Description of a Job Opening,Опис на работно место
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Во очекување на активности за денес
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Во очекување на активности за денес
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Присуство евиденција.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Плата Компонента за timesheet врз основа на платен список.
 DocType: Sales Order Item,Used for Production Plan,Се користат за производство план
 DocType: Employee Loan,Total Payment,Вкупно исплата
 DocType: Manufacturing Settings,Time Between Operations (in mins),Време помеѓу операции (во минути)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,"{0} {1} е откажана, па не може да се заврши на акција"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,"{0} {1} е откажана, па не може да се заврши на акција"
 DocType: Customer,Buyer of Goods and Services.,Купувач на стоки и услуги.
 DocType: Journal Entry,Accounts Payable,Сметки се плаќаат
 DocType: Patient,Allergies,Алергии
@@ -586,23 +597,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Предупреди налози за набавка
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Листа на неколку од вашите клиенти. Тие можат да бидат организации или поединци.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Доволно делови да се изгради
+DocType: POS Profile User,POS Profile User,POS профил корисник
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Директните приходи
 DocType: Patient Appointment,Date TIme,Датум време
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Не може да се филтрираат врз основа на сметка, ако групирани по сметка"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Административен службеник
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Ве молиме изберете курсот
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Ве молиме изберете курсот
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Ве молиме изберете курсот
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Ве молиме изберете курсот
 DocType: Codification Table,Codification Table,Табела за кодификација
 DocType: Timesheet Detail,Hrs,часот
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Ве молиме изберете ја компанијата
 DocType: Stock Entry Detail,Difference Account,Разликата профил
 DocType: Purchase Invoice,Supplier GSTIN,добавувачот GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Не може да се затвори задача како свој зависни задача {0} не е затворена.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,Ве молиме внесете Магацински за кои ќе се зголеми материјал Барање
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Не може да се затвори задача како свој зависни задача {0} не е затворена.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Ве молиме внесете Магацински за кои ќе се зголеми материјал Барање
 DocType: Production Order,Additional Operating Cost,Дополнителни оперативни трошоци
 DocType: Lab Test Template,Lab Routine,Лабораторија рутински
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Козметика
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","За да се логирате, следниве својства мора да биде иста за двата предмети"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","За да се логирате, следниве својства мора да биде иста за двата предмети"
 DocType: Shipping Rule,Net Weight,Нето тежина
 DocType: Employee,Emergency Phone,Итни Телефон
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Размислете за купување
@@ -613,7 +625,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Ве молиме да се дефинира одделение за Праг 0%
 DocType: Sales Order,To Deliver,За да овозможи
 DocType: Purchase Invoice Item,Item,Точка
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Сериски број ставка не може да биде дел
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Висока чувствителност
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Сериски број ставка не може да биде дел
 DocType: Journal Entry,Difference (Dr - Cr),Разлика (Д-р - Cr)
 DocType: Account,Profit and Loss,Добивка и загуба
 DocType: Patient,Risk Factors,Фактори на ризик
@@ -622,7 +635,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Управување Склучување
 DocType: Vital Signs,Body Temperature,Температура на телото
 DocType: Project,Project will be accessible on the website to these users,Проектот ќе биде достапен на веб страната за овие корисници
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Дефинирајте го типот на проектот.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Дефинирајте го типот на проектот.
 DocType: Supplier Scorecard,Weighting Function,Функција за мерење
 DocType: Physician,OP Consulting Charge,ОП Консалтинг задолжен
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Поставете го вашиот
@@ -636,7 +649,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Зголемување не може да биде 0
 DocType: Production Planning Tool,Material Requirement,Материјал Потребно
 DocType: Company,Delete Company Transactions,Избриши компанијата Трансакции
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Референтен број и референтен датум е задолжително за банкарски трансакции
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Референтен број и референтен датум е задолжително за банкарски трансакции
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Додај / Уреди даноци и такси
 DocType: Payment Entry Reference,Supplier Invoice No,Добавувачот Фактура бр
 DocType: Territory,For reference,За референца
@@ -644,12 +657,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Не можат да избришат сериски Не {0}, како што се користи во акции трансакции"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Затворање (ЦР)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Здраво
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Премести ставка
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Премести ставка
 DocType: Serial No,Warranty Period (Days),Гарантниот период (денови)
 DocType: Installation Note Item,Installation Note Item,Инсталација Забелешка Точка
 DocType: Production Plan Item,Pending Qty,Во очекување на Количина
 DocType: Budget,Ignore,Игнорирај
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} не е активен
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} не е активен
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,проверка подесување димензии за печатење
 DocType: Salary Slip,Salary Slip Timesheet,Плата фиш timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Добавувачот Магацински задолжително за под-договор Набавка Потврда
@@ -658,7 +671,7 @@
 DocType: Pricing Rule,Sales Partner,Продажбата партнер
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Сите броеви за оценување на добавувачи.
 DocType: Buying Settings,Purchase Receipt Required,Купување Прием Потребно
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Вреднување курс е задолжително ако влезе отворање на Акции
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,Вреднување курс е задолжително ако влезе отворање на Акции
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Не се пронајдени во табелата Фактура рекорди
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Ве молиме изберете компанија и Партијата Тип прв
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Финансиски / пресметковната година.
@@ -695,7 +708,7 @@
 DocType: Quotation,Quotation To,Понуда за
 DocType: Lead,Middle Income,Среден приход
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Отворање (ЦР)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Стандардна единица мерка за ставка {0} не можат да се менуваат директно затоа што веќе се направени некои трансакција (и) со друг UOM. Ќе треба да се создаде нова ставка и да се користи различен стандарден UOM.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Стандардна единица мерка за ставка {0} не можат да се менуваат директно затоа што веќе се направени некои трансакција (и) со друг UOM. Ќе треба да се создаде нова ставка и да се користи различен стандарден UOM.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Распределени износ не може да биде негативен
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Ве молиме да се постави на компанијата
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Ве молиме да се постави на компанијата
@@ -710,6 +723,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Изберете Account плаќање да се направи банка Влегување
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Креирај вработен евиденција за управување со лисја, барања за трошоци и плати"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Период на рецепт
+DocType: Restaurant Reservation,Restaurant Reservation,Ресторан резерви
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Пишување предлози
 DocType: Payment Entry Deduction,Payment Entry Deduction,Плаќање за влез Одбивање
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Постои уште еден продажбата на лице {0} со истиот Вработен проект
@@ -717,7 +731,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Мајстори
 DocType: Assessment Plan,Maximum Assessment Score,Максимална оценка на рејтинг
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Ажурирање банка Термини Трансакција
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Следење на времето
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Следење на времето
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,Дупликат за транспортер
 DocType: Fiscal Year Company,Fiscal Year Company,Фискална година компанијата
 DocType: Packing Slip Item,DN Detail,DN Детална
@@ -726,8 +740,9 @@
 DocType: Batch,Batch Description,Серија Опис
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Креирање на студентски групи
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Креирање на студентски групи
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Исплата Портал сметка не е создадена, Ве молиме да се создаде една рачно."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Исплата Портал сметка не е создадена, Ве молиме да се создаде една рачно."
 DocType: Supplier Scorecard,Per Year,Годишно
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Не ги исполнувате условите за прием во оваа програма според ДОБ
 DocType: Sales Invoice,Sales Taxes and Charges,Продажбата на даноци и такси
 DocType: Employee,Organization Profile,Организација Профил
 DocType: Vital Signs,Height (In Meter),Висина (во метар)
@@ -763,7 +778,7 @@
 DocType: Student Batch Name,Batch Name,Име на серијата
 DocType: Fee Validity,Max number of visit,Макс број на посети
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet е основан:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Ве молиме да поставите основен готовина или Банкарска сметка во начинот на плаќање {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Ве молиме да поставите основен готовина или Банкарска сметка во начинот на плаќање {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,запишат
 DocType: GST Settings,GST Settings,GST Settings
 DocType: Selling Settings,Customer Naming By,Именувањето на клиентите со
@@ -795,16 +810,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Слета Цена даноци и такси
 DocType: Production Order Operation,Actual Start Time,Старт на проектот Време
 DocType: BOM Operation,Operation Time,Операција Време
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Заврши
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Заврши
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,база
 DocType: Timesheet,Total Billed Hours,Вкупно Опишан часа
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Отпише Износ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Отпише Износ
 DocType: Leave Block List Allow,Allow User,Овозможи пристап
 DocType: Journal Entry,Bill No,Бил Не
 DocType: Company,Gain/Loss Account on Asset Disposal,Добивка / загуба сметка за располагање со средства
 DocType: Vehicle Log,Service Details,Детали услуга
 DocType: Vehicle Log,Service Details,Детали услуга
-DocType: Purchase Invoice,Quarterly,Квартален
+DocType: Subscription,Quarterly,Квартален
 DocType: Lab Test Template,Grouped,Групирани
 DocType: Selling Settings,Delivery Note Required,Испратница Задолжителни
 DocType: Bank Guarantee,Bank Guarantee Number,Број на банкарска гаранција
@@ -814,12 +829,12 @@
 DocType: Student Attendance,Student Attendance,студентски Публика
 DocType: Sales Invoice Timesheet,Time Sheet,време лист
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Суровини врз основа на
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Ве молиме внесете детали ставка
 DocType: Interest,Interest,интерес
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,пред продажбата
 DocType: Purchase Receipt,Other Details,Други детали
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Lab Test,Test Template,Тест шаблон
+DocType: Restaurant Order Entry Item,Served,Служеше
 DocType: Account,Accounts,Сметки
 DocType: Vehicle,Odometer Value (Last),Километража вредност (последна)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Шаблони за критериуми за оценување на добавувачот.
@@ -831,26 +846,28 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Преглед Плата фиш
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Сметка {0} е внесен повеќе пати
 DocType: Account,Expenses Included In Valuation,Трошоци Вклучени Во Вреднување
-DocType: Hub Settings,Seller City,Продавачот на градот
 ,Absent Student Report,Отсутни Студентски извештај
 DocType: Email Digest,Next email will be sent on:,Следната е-мејл ќе бидат испратени на:
 DocType: Offer Letter Term,Offer Letter Term,Понуда писмо Рок
 DocType: Supplier Scorecard,Per Week,Неделно
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Ставка има варијанти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Ставка има варијанти.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Вкупно студент
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Точка {0} не е пронајдена
 DocType: Bin,Stock Value,Акции вредност
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,"Во позадина ќе се креираат записи за надоместоци. Во случај на грешка, пораката за грешка ќе се ажурира во Распоредот."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Компанијата {0} не постои
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} има валидност на плаќање до {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} има валидност на плаќање до {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Тип на дрвото
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Количина Потрошена по единица
 DocType: Serial No,Warranty Expiry Date,Гаранција датумот на истекување
 DocType: Material Request Item,Quantity and Warehouse,Кол и Магацински
+DocType: Hub Settings,Unregister,Одрегистрирај се
 DocType: Sales Invoice,Commission Rate (%),Комисијата стапка (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Ве молиме одберете програма
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Ве молиме одберете програма
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Ве молиме одберете програма
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Ве молиме одберете програма
 DocType: Project,Estimated Cost,Проценетите трошоци
 DocType: Purchase Order,Link to material requests,Линк материјал барања
+DocType: Hub Settings,Publish,Објавете
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Воздухопловна
 DocType: Journal Entry,Credit Card Entry,Кредитна картичка за влез
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Компанија и сметки
@@ -861,13 +878,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Затвори можност по денови
 ,Reserved,Задржани
 DocType: Purchase Order,Supply Raw Materials,Снабдување со суровини
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Датумот на кој ќе биде генериранa следната фактура. Тоа е генерирана за поднесете.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Тековни средства
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} не е складишна ставка
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',Ве молиме споделете ги вашите повратни информации на обуката со кликнување на &quot;Feedback Feedback&quot; и потоа &quot;New&quot;
 DocType: Mode of Payment Account,Default Account,Стандардно профил
 DocType: Payment Entry,Received Amount (Company Currency),Добиениот износ (Фирма валута)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,Мора да се креира Потенцијален клиент ако Можноста е направена од Потенцијален клиент
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,Мора да се креира Потенцијален клиент ако Можноста е направена од Потенцијален клиент
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Ве молиме изберете неделно слободен ден
 DocType: Patient,O Negative,О негативно
 DocType: Production Order Operation,Planned End Time,Планирани Крај
@@ -883,10 +899,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Енергија
 DocType: Opportunity,Opportunity From,Можност од
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Месечен извештај плата.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Додај компанија
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ред {0}: {1} Сериски броеви потребни за точка {2}. Вие сте доставиле {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ред {0}: {1} Сериски броеви потребни за точка {2}. Вие сте доставиле {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Изберете табела
 DocType: BOM,Website Specifications,Веб-страница Спецификации
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} е неважечка е-поштенска адреса во &#39;Примачи&#39;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} е неважечка е-поштенска адреса во &#39;Примачи&#39;
 DocType: Special Test Items,Particulars,Спецификации
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Антибиотик.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Од {0} од типот на {1}
@@ -894,11 +910,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Ред {0}: Фактор на конверзија е задолжително
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Повеќе Правила Цена постои со истите критериуми, ве молиме да го реши конфликтот со давање приоритет. Правила Цена: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не може да го деактивирате или да го откажете Бум како што е поврзано со други BOMs
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не може да го деактивирате или да го откажете Бум како што е поврзано со други BOMs
 DocType: Opportunity,Maintenance,Одржување
 DocType: Item Attribute Value,Item Attribute Value,Точка вредноста на атрибутот
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Продажбата на кампањи.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Направете timesheet
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Направете timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -936,12 +952,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Ве молиме внесете стварта прв
 DocType: Account,Liability,Одговорност
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционирани сума не може да биде поголема од Тврдат Износ во ред {0}.
+DocType: Salary Detail,Do not include in total,Не вклучувајте вкупно
 DocType: Company,Default Cost of Goods Sold Account,Стандардно трошоците на продадени производи профил
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Ценовник не е избрано
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Ценовник не е избрано
 DocType: Employee,Family Background,Семејно потекло
 DocType: Request for Quotation Supplier,Send Email,Испрати E-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Предупредување: Невалиден прилог {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Нема дозвола
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Предупредување: Невалиден прилог {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Нема дозвола
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Цитат е побарано
 DocType: Vital Signs,Heart Rate / Pulse,Срцева стапка / пулс
 DocType: Company,Default Bank Account,Стандардно банкарска сметка
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","За филтрирање врз основа на партија, изберете партија Тип прв"
@@ -969,12 +987,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Точка ред IDX {}: {DOCTYPE} {docname} не постои во над &quot;{DOCTYPE}&quot; маса
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} е веќе завршен проект или откажани
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Не задачи
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","На ден од месецот на кој авто фактура ќе биде генериранa на пример 05, 28 итн"
 DocType: Item Variant Settings,Copy Fields to Variant,Копирај полиња на варијанта
 DocType: Asset,Opening Accumulated Depreciation,Отворање Акумулирана амортизација
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Поени мора да е помала или еднаква на 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Програма за запишување на алатката
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C-Форма записи
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C-Форма записи
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Клиентите и вршителите
 DocType: Email Digest,Email Digest Settings,E-mail билтени Settings
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Ви благодариме за вашиот бизнис!
@@ -992,13 +1009,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Статус на цитат
 DocType: Maintenance Visit,Completion Status,Проектот Статус
 DocType: HR Settings,Enter retirement age in years,Внесете пензионирање возраст во години
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Целна Магацински
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Ве молам изберете еден магацин
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Целна Магацински
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Ве молам изберете еден магацин
 DocType: Cheque Print Template,Starting location from left edge,Почетна локација од левиот раб
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволете врз доставувањето или приемот до овој процент
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Увоз Публика
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Сите групи на ставки
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Сите групи на ставки
 DocType: Process Payroll,Activity Log,Активност Влез
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Нето добивка / загуба
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Автоматски компонира порака на поднесување на трансакции.
@@ -1010,7 +1027,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Проектирани Количина
 DocType: Sales Invoice,Payment Due Date,Плаќање најдоцна до Датум
 DocType: Drug Prescription,Interval UOM,Интервал UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Ставка Варијанта {0} веќе постои со истите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Ставка Варијанта {0} веќе постои со истите атрибути
+DocType: Item,Hub Publishing Details,Детали за објавување на центар
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;Отворање&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Отворете го направите
 DocType: Notification Control,Delivery Note Message,Испратница порака
@@ -1030,10 +1048,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: Суровината не може да биде иста како главната ставка
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Вкупно применливи давачки во Набавка Потврда Предмети маса мора да биде иста како и вкупните даноци и давачки
 DocType: Sales Team,Incentives,Стимулации
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Регистрирај се за Hub
 DocType: SMS Log,Requested Numbers,Бара броеви
 DocType: Production Planning Tool,Only Obtain Raw Materials,Добивање само суровини
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Оценка.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Овозможувањето на &quot;Користи за Корпа&quot;, како што Кошничка е овозможено и треба да има најмалку еден данок Правилникот за Кошничка"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Овозможувањето на &quot;Користи за Корпа&quot;, како што Кошничка е овозможено и треба да има најмалку еден данок Правилникот за Кошничка"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Плаќање Влегување {0} е поврзана против редот на {1}, проверете дали тоа треба да се повлече како напредок во оваа фактура."
 DocType: Sales Invoice Item,Stock Details,Детали за акцијата
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Проектот вредност
@@ -1052,12 +1071,14 @@
 DocType: Salary Slip,Working Days,Работни дена
 DocType: Serial No,Incoming Rate,Влезна Цена
 DocType: Packing Slip,Gross Weight,Бруто тежина на апаратот
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,Името на вашата компанија за која сте за создавање на овој систем.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Овозможи Hub
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,Името на вашата компанија за која сте за создавање на овој систем.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Вклучи празници во Вкупен број. на работните денови
 DocType: Job Applicant,Hold,Задржете
 DocType: Employee,Date of Joining,Датум на приклучување
 DocType: Naming Series,Update Series,Ажурирање Серија
 DocType: Supplier Quotation,Is Subcontracted,Се дава под договор
+DocType: Restaurant Table,Minimum Seating,Минимално седење
 DocType: Item Attribute,Item Attribute Values,Точка атрибут вредности
 DocType: Examination Result,Examination Result,испитување резултат
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Купување Потврда
@@ -1068,13 +1089,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Не можам да најдам временски слот во следните {0} денови за работа {1}
 DocType: Production Order,Plan material for sub-assemblies,План материјал за потсклопови
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Продај Партнери и територија
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} мора да биде активен
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} мора да биде активен
 DocType: Journal Entry,Depreciation Entry,амортизација за влез
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Изберете го типот на документот прв
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Откажи материјал Посети {0} пред да го раскине овој Одржување Посета
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Сериски № {0} не припаѓаат на Точка {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Потребни Количина
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Магацини со постоечките трансакцијата не може да се конвертира во главната книга.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Магацини со постоечките трансакцијата не може да се конвертира во главната книга.
 DocType: Bank Reconciliation,Total Amount,Вкупен износ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Интернет издаваштво
 DocType: Prescription Duration,Number,Број
@@ -1085,7 +1106,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Цена за продажба Листа
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Доколку се провери, клиентот ќе биде креиран, мапиран на пациент. Парични фактури ќе бидат креирани против овој клиент. Можете исто така да изберете постоечки клиент додека креирате пациент."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Го објави за да ги синхронизирате предмети
 DocType: Bank Reconciliation,Account Currency,Валута сметка
 DocType: Lab Test,Sample ID,Примерок проект
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Ве молиме спомнете заокружуваат сметка во компанијата
@@ -1094,11 +1114,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Вработен {0} не е активна или не постои
 DocType: Fee Structure,Components,делови
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Ве молиме внесете Категорија средства во точка {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Точка Варијанти {0} ажурирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Точка Варијанти {0} ажурирани
 DocType: Quality Inspection Reading,Reading 6,Читање 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Не може да се {0} {1} {2} без никакви негативни извонредна фактура
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","да се генерира. Ако е одложено, ќе треба рачно да го промените полето &quot;Повторете на денот на месецот&quot; за ова"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Не може да се {0} {1} {2} без никакви негативни извонредна фактура
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Купување на фактура напредување
-DocType: Hub Settings,Sync Now,Sync Сега
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Ред {0}: Кредитни влез не можат да бидат поврзани со {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Дефинирање на буџетот за финансиската година.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Стандардно банка / готовинска сметка ќе се ажурира автоматски во POS Фактура кога е избрана оваа опција.
@@ -1110,13 +1131,13 @@
 DocType: Item,Is Purchase Item,Е Набавка Точка
 DocType: Asset,Purchase Invoice,Купување на фактура
 DocType: Stock Ledger Entry,Voucher Detail No,Ваучер Детална Не
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Нов почеток на продажбата на фактура
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Нов почеток на продажбата на фактура
 DocType: Stock Entry,Total Outgoing Value,Вкупна Тековна Вредност
 DocType: Physician,Appointments,Назначувања
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Датум на отворање и затворање Датум треба да биде во рамките на истата фискална година
 DocType: Lead,Request for Information,Барање за информации
 ,LeaderBoard,табла
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Sync Офлајн Фактури
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Sync Офлајн Фактури
 DocType: Payment Request,Paid,Платени
 DocType: Program Fee,Program Fee,Надомест програма
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1135,11 +1156,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Нарачка Точка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Индиректни доход
 DocType: Student Attendance Tool,Student Attendance Tool,Студентски Публика алатката
+DocType: Restaurant Menu,Price List (Auto created),Ценовник (автоматски креиран)
 DocType: Cheque Print Template,Date Settings,датум Settings
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Варијанса
 ,Company Name,Име на компанијата
 DocType: SMS Center,Total Message(s),Вкупно пораки
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Одберете ја изборната ставка за трансфер
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Одберете ја изборната ставка за трансфер
 DocType: Purchase Invoice,Additional Discount Percentage,Дополнителен попуст Процент
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Преглед на листа на сите помош видеа
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Изберете Account главата на банката во која е депониран чек.
@@ -1157,6 +1179,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Метар
 DocType: Workstation,Electricity Cost,Цената на електричната енергија
 DocType: HR Settings,Don't send Employee Birthday Reminders,Не праќај вработените роденден потсетници
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Зачувај поставки
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Бараните производи
 DocType: Item,Inspection Criteria,Критериуми за инспекција
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Трансферираните
 DocType: BOM Website Item,BOM Website Item,BOM на вебсајт ставки
@@ -1174,11 +1198,11 @@
 DocType: Journal Entry,Total Amount in Words,Вкупен износ со зборови
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Се случи грешка. Можеби не сте ја зачувале формата. Ве молиме контактирајте не на support@erpnext.com ако проблемот продолжи.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Моја кошничка
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Цел типот мора да биде еден од {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Цел типот мора да биде еден од {0}
 DocType: Lead,Next Contact Date,Следна Контакт Датум
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Отворање Количина
 DocType: Healthcare Settings,Appointment Reminder,Потсетник за назначување
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Ве молиме внесете го за промени Износ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Ве молиме внесете го за промени Износ
 DocType: Student Batch Name,Student Batch Name,Студентски Серија Име
 DocType: Consultation,Doctor,Доктор
 DocType: Holiday List,Holiday List Name,Одмор Листа на Име
@@ -1186,12 +1210,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,распоред на курсот
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Опции на акции
 DocType: Journal Entry Account,Expense Claim,Сметка побарување
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Дали навистина сакате да го направите ова укинати средства?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Количина за {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Дали навистина сакате да го направите ова укинати средства?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Количина за {0}
 DocType: Leave Application,Leave Application,Отсуство на апликација
 DocType: Patient,Patient Relation,Однос на пациенти
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Остави алатката Распределба
+DocType: Item,Hub Category to Publish,Категорија на хаб за објавување
 DocType: Leave Block List,Leave Block List Dates,Остави Забрани Листа Датуми
+DocType: Sales Invoice,Billing Address GSTIN,Адреса за фактурирање GSTIN
 DocType: Workstation,Net Hour Rate,Нето час стапка
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Слета купување цена Потврда
 DocType: Company,Default Terms,Стандардно Услови
@@ -1201,11 +1227,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Ве молиме наведете {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Отстранет предмети без промена во количината или вредноста.
 DocType: Delivery Note,Delivery To,Испорака на
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Атрибут маса е задолжително
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Атрибут маса е задолжително
 DocType: Production Planning Tool,Get Sales Orders,Земете Продај Нарачка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} не може да биде негативен
 DocType: Training Event,Self-Study,Самопроучување
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Попуст
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Попуст
 DocType: Asset,Total Number of Depreciations,Вкупен број на амортизација
 DocType: Sales Invoice Item,Rate With Margin,Стапка со маргина
 DocType: Sales Invoice Item,Rate With Margin,Стапка со маргина
@@ -1213,7 +1239,7 @@
 DocType: Task,Urgent,Итно
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Ве молиме наведете валидна ред проект за спорот {0} во табелата {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Не може да се најде променлива:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Изберете поле за уредување од numpad
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Изберете поле за уредување од numpad
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Одат на десктоп и да почне со користење ERPNext
 DocType: Item,Manufacturer,Производител
 DocType: Landed Cost Item,Purchase Receipt Item,Купување Потврда Точка
@@ -1244,8 +1270,8 @@
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,Стандарден Продажен трошочен центар
 DocType: Sales Partner,Implementation Partner,Партнер имплементација
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Поштенски
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Продај Побарувања {0} е {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Поштенски
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Продај Побарувања {0} е {1}
 DocType: Opportunity,Contact Info,Контакт инфо
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Акции правење записи
 DocType: Packing Slip,Net Weight UOM,Нето тежина UOM
@@ -1256,6 +1282,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Земете Неделен Off Датуми
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Датум на крајот не може да биде помал од Почеток Датум
 DocType: Sales Person,Select company name first.,Изберете името на компанијата во прв план.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Ниско до Високо
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Понуди добиени од Добавувачи.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Заменете Бум и ажурирајте ја најновата цена во сите спецификации
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},{0} | {1} {2}
@@ -1276,7 +1303,7 @@
 DocType: Program Enrollment,Transportation,Превоз
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Невалиден Атрибут
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} мора да се поднесе
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Количините може да биде помалку од или еднакво на {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Количините може да биде помалку од или еднакво на {0}
 DocType: SMS Center,Total Characters,Вкупно Карактери
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Ве молиме изберете Бум Бум во полето за предмет {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Детална C-Образец Фактура
@@ -1291,7 +1318,7 @@
 ,Ordered Items To Be Billed,Нареди ставки за да бидат фактурирани
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Од опсег мора да биде помала од на опсег
 DocType: Global Defaults,Global Defaults,Глобална Стандардни
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Проектот Соработка Покана
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Проектот Соработка Покана
 DocType: Salary Slip,Deductions,Одбивања
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Име на акција
@@ -1309,13 +1336,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Продажна Про-Фактура
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Ништо да побара
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Уште еден рекорд буџет &quot;{0}&quot; веќе постои од {1} {2} &quot;за фискалната {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Старт на проектот Датум &#39;не може да биде поголема од&#39; Крај на екстремна датум&quot;
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Старт на проектот Датум &#39;не може да биде поголема од&#39; Крај на екстремна датум&quot;
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,За управување со
 DocType: Cheque Print Template,Payer Settings,Прилагодување обврзник
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ова ќе биде додаден на Кодексот точка на варијанта. На пример, ако вашиот кратенката е &quot;СМ&quot; и кодот на предметот е &quot;Т-маица&quot;, кодот го ставка на варијанта ќе биде &quot;Т-маица-СМ&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Нето плати (со зборови) ќе биде видлив откако ќе ја зачувате фиш плата.
 DocType: Purchase Invoice,Is Return,Е враќање
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Внимание
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Внимание
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Враќање / задолжување
 DocType: Price List Country,Price List Country,Ценовник Земја
 DocType: Item,UOMs,UOMs
@@ -1330,17 +1357,18 @@
 DocType: Account,Balance Sheet,Биланс на состојба
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Цена центар за предмет со точка законик &quot;
 DocType: Fee Validity,Valid Till,Валидно до
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Начин на плаќање не е конфигуриран. Ве молиме проверете, дали сметка е поставен на режим на пари или на POS профил."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Начин на плаќање не е конфигуриран. Ве молиме проверете, дали сметка е поставен на режим на пари или на POS профил."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Истата ставка не може да се внесе повеќе пати.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Понатаму сметки може да се направи под Групи, но записи може да се направи врз несрпското групи"
 DocType: Lead,Lead,Потенцијален клиент
 DocType: Email Digest,Payables,Обврски кон добавувачите
 DocType: Course,Course Intro,Се разбира Вовед
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Акции Влегување {0} создадена
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ве молиме наместете серија за нумерација за Присуство преку Поставување&gt; Нумерирање
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Акции Влегување {0} создадена
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ред # {0}: Отфрлени Количина не може да се влезе во Набавка Враќање
 ,Purchase Order Items To Be Billed,"Нарачката елементи, за да бидат фактурирани"
 DocType: Purchase Invoice Item,Net Rate,Нето стапката
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Ве молиме изберете клиент
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Ве молиме изберете клиент
 DocType: Purchase Invoice Item,Purchase Invoice Item,Купување на фактура Точка
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Акции Леџер записи и GL записи се објавува за избраниот Набавка Разписки
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Точка 1
@@ -1361,7 +1389,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Дупликат ред {0} со истиот {1}
 ,Trial Balance,Судскиот биланс
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Фискалната година {0} не е пронајден
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Поставување на вработените
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Поставување на вработените
 DocType: Sales Order,SO-,SO-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Ве молиме изберете префикс прв
 DocType: Employee,O-,О-
@@ -1373,12 +1401,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Види Леџер
 DocType: Grading Scale,Intervals,интервали
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Први
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Ставка група постои со истото име, Ве молиме да се промени името на точка или преименувате групата точка"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Ставка група постои со истото име, Ве молиме да се промени името на точка или преименувате групата точка"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Студентски мобилен број
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Остатокот од светот
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Остатокот од светот
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Ставката {0} не може да има Batch
 ,Budget Variance Report,Буџетот Варијанса Злоупотреба
 DocType: Salary Slip,Gross Pay,Бруто плата
+DocType: Item,Is Item from Hub,Е предмет од Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Ред {0}: Тип на активност е задолжително.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Дивидендите кои ги исплатува
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Сметководство Леџер
@@ -1388,8 +1417,9 @@
 DocType: Vehicle Log,Service Detail,сервис детали
 DocType: BOM,Item Description,Опис
 DocType: Student Sibling,Student Sibling,студент на браќата и сестрите
-DocType: Purchase Invoice,Is Recurring,Е Повторувачки
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Начин на плаќање
 DocType: Purchase Invoice,Supplied Items,Испорачани делови
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Поставете активен мени за Ресторан {0}
 DocType: Student,STUD.,Обетка.
 DocType: Production Order,Qty To Manufacture,Количина на производство
 DocType: Email Digest,New Income,нови приходи
@@ -1400,6 +1430,7 @@
 ,Student and Guardian Contact Details,Студент и Гардијан Податоци за контакт
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Ред {0}: За снабдувач {0} E-mail адреса за да се испрати е-маил
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Привремено отворање
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Прегледајте Hub
 ,Employee Leave Balance,Вработен Остави Биланс
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Биланс на сметка {0} мора секогаш да биде {1}
 DocType: Patient Appointment,More Info,Повеќе Информации
@@ -1419,13 +1450,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Продај Побарувања {0} не е валиден
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Предупреди за ново барање за цитати
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Купување на налози да ви помогне да планираат и да се надоврзе на вашите купувања
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","За жал, компаниите не можат да се спојат"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","За жал, компаниите не можат да се спојат"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Рецепти за лабораториски тестови
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",вкупната количина на прашањето / Трансфер {0} во Материјал Барање {1} \ не може да биде поголема од бараната количина {2} за ставката {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Мали
 DocType: Employee,Employee Number,Број вработен
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Нема случај (и) веќе е во употреба. Обидете се од случај не {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Нема случај (и) веќе е во употреба. Обидете се од случај не {0}
 DocType: Project,% Completed,% Завршено
 ,Invoiced Amount (Exculsive Tax),Фактурираниот износ (Exculsive на доход)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Точка 2
@@ -1440,11 +1471,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Индиректни трошоци
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Ред {0}: Количина е задолжително
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Земјоделството
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sync мајстор на податоци
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sync мајстор на податоци
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Вашите производи или услуги
 DocType: Special Test Items,Special Test Items,Специјални тестови
 DocType: Mode of Payment,Mode of Payment,Начин на плаќање
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Веб-страница на слика треба да биде јавен датотеката или URL на веб страната
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Веб-страница на слика треба да биде јавен датотеката или URL на веб страната
 DocType: Student Applicant,AP,АП
 DocType: Purchase Invoice Item,BOM,BOM (Список на материјали)
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Ова е корен елемент група и не може да се уредува.
@@ -1452,9 +1483,9 @@
 DocType: Vehicle,Fuel UOM,UOM гориво
 DocType: Warehouse,Warehouse Contact Info,Магацински Контакт Инфо
 DocType: Payment Entry,Write Off Difference Amount,Отпише разликата Износ
-DocType: Purchase Invoice,Recurring Type,Повторувачки Тип
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: е-маил на вработените не се најде, па затоа не е-мејл испратен"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: е-маил на вработените не се најде, па затоа не е-мејл испратен"
 DocType: Item,Foreign Trade Details,Надворешна трговија Детали
+,Assessment Plan Status,Статус на планот за проценка
 DocType: Email Digest,Annual Income,Годишен приход
 DocType: Serial No,Serial No Details,Сериски № Детали за
 DocType: Purchase Invoice Item,Item Tax Rate,Точка даночна стапка
@@ -1462,15 +1493,14 @@
 DocType: Student Group Student,Group Roll Number,Група тек број
 DocType: Student Group Student,Group Roll Number,Група тек број
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки може да се поврзат против друг запис дебитна"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Вкупниот износ на сите задача тежина треба да биде 1. Ве молиме да се приспособат тежини на сите задачи на проектот соодветно
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Испратница {0} не е поднесен
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Вкупниот износ на сите задача тежина треба да биде 1. Ве молиме да се приспособат тежини на сите задачи на проектот соодветно
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Испратница {0} не е поднесен
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Точка {0} мора да биде под-договор Точка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Капитал опрема
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Цените правило е првата избрана врз основа на &quot;Apply On&quot; поле, која може да биде точка, точка група или бренд."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Те молам прво наместете го Код
-DocType: Hub Settings,Seller Website,Продавачот веб-страница
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Те молам прво наместете го Код
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Вкупно одобрени процентот за продажбата на тимот треба да биде 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Вкупно одобрени процентот за продажбата на тимот треба да биде 100
 DocType: Sales Invoice Item,Edit Description,Измени Опис
 DocType: Antibiotic,Antibiotic,Антибиотик
 ,Team Updates,тим Новости
@@ -1491,12 +1521,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Вкупно (Валута на Фирма )
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Сериски број {0} влегоа повеќе од еднаш
 DocType: Depreciation Schedule,Journal Entry,Весник Влегување
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} ставки во тек
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} ставки во тек
 DocType: Workstation,Workstation Name,Работна станица Име
 DocType: Grading Scale Interval,Grade Code,одделение законик
 DocType: POS Item Group,POS Item Group,ПОС Точка група
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail билтени:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} не му припаѓа на идентот {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} не му припаѓа на идентот {1}
 DocType: Sales Partner,Target Distribution,Целна Дистрибуција
 DocType: Salary Slip,Bank Account No.,Жиро сметка број
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Ова е бројот на последниот создадена трансакција со овој префикс
@@ -1513,10 +1543,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Барање за прибирање понуди Добавувачот
 DocType: Healthcare Settings,Registration Message,Порака за регистрација
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Хардвер
-DocType: Sales Order,Recurring Upto,Повторувачки Upto
 DocType: Prescription Dosage,Prescription Dosage,Дозирање на рецепт
 DocType: Attendance,HR Manager,Менаџер за човечки ресурси
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Ве молиме изберете една компанија
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Ве молиме изберете една компанија
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Привилегија Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Добавувачот датум на фактурата
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,на
@@ -1532,10 +1561,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Преклопување состојби помеѓу:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Против весник Влегување {0} е веќе приспособена против некои други ваучер
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Вкупна Вредност на Нарачка
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Храна
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Храна
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Стареењето опсег од 3
 DocType: Maintenance Schedule Item,No of Visits,Број на посети
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},"Одржување распоред {0} постои се против, {1}"
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Дали сакате да ги објавите вашите ставки во Hub?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,Запишувањето на студентите
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валута на завршната сметка мора да биде {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Збир на бодови за сите цели треба да бидат 100. Тоа е {0}
@@ -1546,9 +1576,9 @@
 DocType: Authorization Rule,Average Discount,Просечната попуст
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Комунални услуги
-DocType: Purchase Invoice Item,Accounting,Сметководство
+DocType: POS Profile,Accounting,Сметководство
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Ве молиме одберете серии за дозирани точка
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Ве молиме одберете серии за дозирани точка
 DocType: Asset,Depreciation Schedules,амортизација Распоред
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Период апликација не може да биде надвор одмор период распределба
 DocType: Activity Cost,Projects,Проекти
@@ -1564,7 +1594,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',Одобрување статус мора да биде &#39;одобрена&#39; или &#39;Одбиен&#39;
 DocType: Physician,Contacts and Address,Контакти и адреса
 DocType: Purchase Invoice,Contact Person,Лице за контакт
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"""Очекуваниот почетен датум"" не може да биде поголем од 'очекуван краен датум """
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""Очекуваниот почетен датум"" не може да биде поголем од 'очекуван краен датум """
 DocType: Course Scheduling Tool,Course End Date,Курс Датум на завршување
 DocType: Holiday List,Holidays,Празници
 DocType: Sales Order Item,Planned Quantity,Планирана количина
@@ -1572,10 +1602,11 @@
 DocType: Item,Maintain Stock,Одржување на берза
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Акции записи веќе создадена за цел производство
 DocType: Employee,Prefered Email,склопот Е-пошта
+DocType: Student Admission,Eligibility and Details,Подобност и детали
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Нето промени во основни средства
 DocType: Leave Control Panel,Leave blank if considered for all designations,Оставете го празно ако се земе предвид за сите ознаки
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Полнење од типот &quot;Крај&quot; во ред {0} не може да бидат вклучени во точка Оцени
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Макс: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Макс: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Од DateTime
 DocType: Email Digest,For Company,За компанијата
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Комуникација се логирате.
@@ -1583,19 +1614,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Променлива оценка на постигнати резултати
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Купување Износ
 DocType: Sales Invoice,Shipping Address Name,Адреса за Испорака Име
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Сметковниот план
 DocType: Material Request,Terms and Conditions Content,Услови и правила Содржина
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,не може да биде поголема од 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Ставка {0} не е складишна ставка
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Ставка {0} не е складишна ставка
 DocType: Maintenance Visit,Unscheduled,Непланирана
 DocType: Employee,Owned,Сопственост
 DocType: Salary Detail,Depends on Leave Without Pay,Зависи неплатено отсуство
 DocType: Pricing Rule,"Higher the number, higher the priority","Повисок број, поголем приоритет"
 ,Purchase Invoice Trends,Купување на фактура трендови
 DocType: Employee,Better Prospects,Подобри можности
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","На редот бр # {0}: на серијата {1} има само {2} Количина. Ве молам изберете друга серија која има на располагање {3} Количина или поделени на ред во повеќе редови, да ја испорача / прашање од повеќе серии"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","На редот бр # {0}: на серијата {1} има само {2} Количина. Ве молам изберете друга серија која има на располагање {3} Количина или поделени на ред во повеќе редови, да ја испорача / прашање од повеќе серии"
 DocType: Vehicle,License Plate,Табличка
 DocType: Appraisal,Goals,Цели
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Изберете POS профил
 DocType: Warranty Claim,Warranty / AMC Status,Гаранција / АМЦ Статус
 ,Accounts Browser,Сметки Browser
 DocType: Payment Entry Reference,Payment Entry Reference,Плаќање за влез Суд
@@ -1613,7 +1644,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Вработените не можат да известуваат за себе.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ако на сметката е замрзната, записи им е дозволено да ограничено корисници."
 DocType: Email Digest,Bank Balance,Банката биланс
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Сметководство за влез на {0}: {1} може да се направи само во валута: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Сметководство за влез на {0}: {1} може да се направи само во валута: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Работа профил, потребните квалификации итн"
 DocType: Journal Entry Account,Account Balance,Баланс на сметка
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Правило данок за трансакции.
@@ -1622,8 +1653,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Вкупно Даноци и Такси (Валута на Фирма )
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Прикажи незатворени фискална година L салда на P &amp;
 DocType: Lab Test Template,Collection Details,Детали за колекцијата
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","изберете cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date од tabConsultation ct, `tabLab Prescription` cp каде ct.patient = &#39;{0}&#39; и cp.parent = ct. име и cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Испорака на профилот
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Сметка {2} е неактивен
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Направете Продај Нарачка да ви помогне да планирате вашата работа и дава на време
@@ -1640,7 +1669,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Пакување фиш
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Канцеларијата изнајмување
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Поставките за поставка на SMS портал
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Увоз Не успеав!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Увоз Не успеав!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Постои адреса додаде уште.
 DocType: Workstation Working Hour,Workstation Working Hour,Работна станица работен час
 DocType: Vital Signs,Blood Pressure,Крвен притисок
@@ -1665,7 +1694,7 @@
 DocType: Sales Invoice,Source,Извор
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Прикажи затворени
 DocType: Leave Type,Is Leave Without Pay,Е неплатено отсуство
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Категорија средства е задолжително за ставка од основните средства
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Категорија средства е задолжително за ставка од основните средства
 DocType: Fee Validity,Fee Validity,Валидност на надоместокот
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Не се пронајдени во табелата за платен записи
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ова {0} конфликти со {1} и {2} {3}
@@ -1686,8 +1715,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Извршниот Барај
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Креирај води
 DocType: Maintenance Schedule,Schedules,Распоред
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,ПОС профилот е потребен за користење на Point-of-Sale
 DocType: Purchase Invoice Item,Net Amount,Нето износ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} не е поднесено, па не може да се заврши на акција"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} не е поднесено, па не може да се заврши на акција"
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM детален број
 DocType: Landed Cost Voucher,Additional Charges,дополнителни трошоци
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Дополнителен попуст Износ (Фирма валута)
@@ -1696,7 +1726,7 @@
 ,Support Hour Distribution,Поддршка Часовна дистрибуција
 DocType: Maintenance Visit,Maintenance Visit,Одржување Посета
 DocType: Student,Leaving Certificate Number,Оставањето сертификат Број
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Именувањето е откажано, Ве молиме прегледајте и откажете ја фактурата {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Именувањето е откажано, Ве молиме прегледајте и откажете ја фактурата {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Достапни Серија Количина на складиште
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Update за печатење формат
 DocType: Landed Cost Voucher,Landed Cost Help,Слета Цена Помош
@@ -1719,8 +1749,8 @@
 DocType: Patient,Tobacco Past Use,Користење на тутун за минатото
 DocType: Sales Invoice Item,Brand Name,Името на брендот
 DocType: Purchase Receipt,Transporter Details,Транспортерот Детали
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Корисникот {0} веќе е назначен на лекар {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Потребен е стандарден магацин за избраната ставка
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Корисникот {0} веќе е назначен на лекар {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Потребен е стандарден магацин за избраната ставка
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Кутија
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,можни Добавувачот
 DocType: Budget,Monthly Distribution,Месечен Дистрибуција
@@ -1730,8 +1760,8 @@
 DocType: Sales Partner,Sales Partner Target,Продажбата партнер Целна
 DocType: Loan Type,Maximum Loan Amount,Максимален заем Износ
 DocType: Pricing Rule,Pricing Rule,Цените Правило
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Duplicate број ролна за ученикот {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Duplicate број ролна за ученикот {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Duplicate број ролна за ученикот {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Duplicate број ролна за ученикот {0}
 DocType: Budget,Action if Annual Budget Exceeded,Акција доколку годишниот буџет пречекорување
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Материјал Барање за нарачка
 DocType: Shopping Cart Settings,Payment Success URL,Плаќање успех URL
@@ -1748,7 +1778,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} мора да се појави само еднаш
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Не е дозволено да tranfer повеќе {0} од {1} против нарачка {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Остава распределени успешно за {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Нема податоци за пакет
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Нема податоци за пакет
 DocType: Shipping Rule Condition,From Value,Од вредност
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Производна количина е задолжително
 DocType: Employee Loan,Repayment Method,Начин на отплата
@@ -1762,6 +1792,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Акции Обврски
 DocType: Purchase Invoice,Supplier Warehouse,Добавувачот Магацински
 DocType: Opportunity,Contact Mobile No,Контакт Мобилни Не
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Изберете компанија
 ,Material Requests for which Supplier Quotations are not created,Материјал Барања за кои не се создадени Добавувачот Цитати
 DocType: Student Group,Set 0 for no limit,Поставете 0 за да нема ограничување
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Ден (а) на која аплицирате за дозвола се одмори. Вие не треба да аплицираат за одмор.
@@ -1771,24 +1802,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Направете цитат
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,други извештаи
 DocType: Dependent Task,Dependent Task,Зависни Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Фактор на конверзија за стандардно единица мерка мора да биде 1 во ред {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Фактор на конверзија за стандардно единица мерка мора да биде 1 во ред {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Отсуство од типот {0} не може да биде подолг од {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Обидете се планира операции за X дена однапред.
 DocType: HR Settings,Stop Birthday Reminders,Стоп роденден потсетници
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Поставете Стандардна Даноци се плаќаат сметка во Друштвото {0}
 DocType: SMS Center,Receiver List,Листа на примачот
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Барај точка
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Барај точка
 DocType: Patient Appointment,Referring Physician,Осврнувајќи се лекар
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Конзумира Износ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Нето промени во Пари
 DocType: Assessment Plan,Grading Scale,скала за оценување
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица мерка {0} е внесен повеќе од еднаш во конверзија Фактор Табела
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,веќе завршени
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица мерка {0} е внесен повеќе од еднаш во конверзија Фактор Табела
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,веќе завршени
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Акции во рака
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Веќе постои плаќање Барам {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Цената на издадени материјали
 DocType: Physician,Hospital,Болница
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Кол не смее да биде повеќе од {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Кол не смее да биде повеќе од {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Претходната финансиска година не е затворен
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Возраст (во денови)
 DocType: Quotation Item,Quotation Item,Артикал од Понуда
@@ -1799,8 +1830,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Добавувачот Тип господар.
 DocType: Purchase Order Item,Supplier Part Number,Добавувачот Дел број
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Стапка на конверзија не може да биде 0 или 1
-DocType: Sales Invoice,Reference Document,референтен документ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{1} {0} е откажана или запрена
+DocType: Subscription,Reference Document,референтен документ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{1} {0} е откажана или запрена
 DocType: Accounts Settings,Credit Controller,Кредитна контролор
 DocType: Delivery Note,Vehicle Dispatch Date,Возило диспечерски Датум
 DocType: Healthcare Settings,Default Medical Code Standard,Стандарден стандард за медицински кодови
@@ -1809,6 +1840,7 @@
 DocType: Company,Default Payable Account,Стандардно се плаќаат профил
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Подесувања за онлајн шопинг количка како и со правилата за испорака, ценовник, итн"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Опишан
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Подреди по Цена ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Количина задржани
 DocType: Party Account,Party Account,Партијата на профилот
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Човечки ресурси
@@ -1820,13 +1852,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Направете исплата Влегување
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Ред {0}: Адванс против Добавувачот мора да се задолжи
 DocType: Company,Default Values,Стандардни вредности
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Фреквенција} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Фреквенција} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Вкупен износ Надоместени
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ова се базира на логови против ова возило. Види времеплов подолу за детали
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Против Добавувачот Фактура {0} датум {1}
 DocType: Customer,Default Price List,Стандардно Ценовник
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,рекорд движење средства {0} создадена
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Не може да избришете фискалната {0}. Фискалната година {0} е поставена како стандардна во глобалните поставувања
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Потрошувач со исто име веќе постои
 DocType: Journal Entry,Entry Type,Тип на влез
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Нема план за оценување поврзани со оваа група оценување
 ,Customer Credit Balance,Клиент кредитна биланс
@@ -1837,7 +1870,7 @@
 DocType: Quotation,Term Details,Рок Детали за
 DocType: Project,Total Sales Cost (via Sales Order),Вкупната продажба на трошоците (преку Продај Побарувања)
 DocType: Project,Total Sales Cost (via Sales Order),Вкупната продажба на трошоците (преку Продај Побарувања)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Не може да се запишат повеќе од {0} студентите за оваа група студенти.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Не може да се запишат повеќе од {0} студентите за оваа група студенти.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Водач Грофот
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Водач Грофот
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} мора да биде поголем од 0
@@ -1855,9 +1888,11 @@
 DocType: Lab Test,Technician Name,Име на техничар
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Прекин на врска плаќање за поништување на Фактура
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Тековни километражата влезе треба да биде поголема од првичната возила Километража {0}
+DocType: Restaurant Reservation,No Show,Нема шоу
 DocType: Shipping Rule Country,Shipping Rule Country,Превозот Правило Земја
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Остави и Публика
 DocType: Maintenance Visit,Partially Completed,Делумно завршени
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Умерена чувствителност
 DocType: Leave Type,Include holidays within leaves as leaves,Вклучи празници во листовите како лисја
 DocType: Sales Invoice,Packed Items,Спакувани Теми
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Гаранција побарување врз Сериски број
@@ -1874,13 +1909,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Платениот износ (Фирма валута)
 DocType: Purchase Invoice,Additional Discount,Дополнителен попуст
 DocType: Selling Settings,Selling Settings,Нагодувања за Продажби
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Потврди акција
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Онлајн аукции
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Ве молиме напишете и некоја Кол или вреднување стапка или двете
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,исполнување
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Види во кошничката
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Маркетинг трошоци
 ,Item Shortage Report,Точка Недостаток Извештај
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се споменува, \ Променете спомене &quot;Тежина UOM&quot; премногу"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се споменува, \ Променете спомене &quot;Тежина UOM&quot; премногу"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Материјал Барање користат да се направи овој парк Влегување
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Следна Амортизација Регистриран е задолжително за нови средства
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Посебен разбира врз основа група за секоја серија
@@ -1893,12 +1929,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Направете влез сметководството за секој берза движење
 DocType: Leave Allocation,Total Leaves Allocated,Вкупно Отсуства Распределени
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Магацински бара во ред Нема {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Ве молиме внесете валидна Финансиска година на отпочнување и завршување
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Ве молиме внесете валидна Финансиска година на отпочнување и завршување
 DocType: Employee,Date Of Retirement,Датум на заминување во пензија
 DocType: Upload Attendance,Get Template,Земете Шаблон
 DocType: Material Request,Transferred,пренесени
 DocType: Vehicle,Doors,врати
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext Setup Complete!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Наплати надоместок за регистрација на пациентите
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,данок распад
@@ -1917,37 +1953,37 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ако оваа точка има варијанти, тогаш тоа не може да биде избран во продажбата на налози итн"
 DocType: Lead,Next Contact By,Следна Контакт Со
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Количината потребна за Точка {0} во ред {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Количината потребна за Точка {0} во ред {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Магацински {0} не може да биде избришан како што постои количина за ставката {1}
 DocType: Quotation,Order Type,Цел Тип
-DocType: Purchase Invoice,Notification Email Address,Известување за е-мејл адреса
 ,Item-wise Sales Register,Точка-мудар Продажбата Регистрирај се
 DocType: Asset,Gross Purchase Amount,Бруто купување износ
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Отворање на салда
 DocType: Asset,Depreciation Method,амортизација Метод
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Надвор од мрежа
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Надвор од мрежа
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Е овој данок се вклучени во основната стапка?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Вкупно Целна вредност
 DocType: Job Applicant,Applicant for a Job,Подносителот на барањето за работа
 DocType: Production Plan Material Request,Production Plan Material Request,Производство план материјал Барање
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Нема производство наредби создаде
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Нема производство наредби создаде
 DocType: Stock Reconciliation,Reconciliation JSON,Помирување JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Премногу колона. Извоз на извештајот и печатење со помош на апликацијата табела.
 DocType: Purchase Invoice Item,Batch No,Серија Не
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Барање за понуда: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Им овозможи на повеќе Продај Нарачка против нарачка на купувачи
 DocType: Student Group Instructor,Student Group Instructor,Група на студенти инструктор
 DocType: Student Group Instructor,Student Group Instructor,Група на студенти инструктор
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Мобилен телефон
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Главните
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Главните
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Варијанта
 DocType: Naming Series,Set prefix for numbering series on your transactions,Намести префикс за нумерирање серија на вашиот трансакции
 DocType: Employee Attendance Tool,Employees HTML,вработените HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Стандардно Бум ({0}) мора да бидат активни за оваа стварта или нејзиниот дефиниција
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Стандардно Бум ({0}) мора да бидат активни за оваа стварта или нејзиниот дефиниција
 DocType: Employee,Leave Encashed?,Остави Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Можност од поле е задолжително
 DocType: Email Digest,Annual Expenses,годишните трошоци
 DocType: Item,Variants,Варијанти
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Направи нарачка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Направи нарачка
 DocType: SMS Center,Send To,Испрати до
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Нема доволно одмор биланс за Оставете Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,"Лимит,"
@@ -1965,6 +2001,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Група на студенти Сила
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Против весник Влегување {0} не се имате било какви неспоредлив {1} влез
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,оценувања
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Настани за обука
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},СТРОГО серија № влезе за точка {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Услов за испорака Правило
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Ве молиме внесете
@@ -1974,7 +2011,7 @@
 DocType: Sales Order,To Deliver and Bill,Да дава и Бил
 DocType: Student Group,Instructors,инструктори
 DocType: GL Entry,Credit Amount in Account Currency,Износ на кредитот во профил Валута
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,Бум {0} мора да се поднесе
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,Бум {0} мора да се поднесе
 DocType: Authorization Control,Authorization Control,Овластување за контрола
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ред # {0}: Отфрлени Магацински е задолжително против отфрли Точка {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Плаќање
@@ -1993,11 +2030,11 @@
 DocType: Quotation Item,Actual Qty,Крај на Количина
 DocType: Sales Invoice Item,References,Референци
 DocType: Quality Inspection Reading,Reading 10,Читањето 10
-DocType: Hub Settings,Hub Node,Центар Јазол
+DocType: Hub Category,Hub Node,Центар Јазол
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Внесовте дупликат предмети. Ве молиме да се поправат и обидете се повторно.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Соработник
 DocType: Asset Movement,Asset Movement,средства движење
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,нов кошничка
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,нов кошничка
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Ставка {0} не е во серија
 DocType: SMS Center,Create Receiver List,Креирај Листа ресивер
 DocType: Vehicle,Wheels,тркала
@@ -2011,15 +2048,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Телекомуникации
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Покажува дека пакетот е дел од оваа испорака (Само Предлог)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Направете плаќање Влегување
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Кол за ставката {0} мора да биде помала од {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Кол за ставката {0} мора да биде помала од {1}
 ,Sales Invoice Trends,Продажбата Трендови Фактура
 DocType: Leave Application,Apply / Approve Leaves,Спроведување / одобрија Лисја
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,За
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,За
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Може да се однесува на ред само ако видот на пресметување е 'Износ на претходниот ред' или 'Вкупно на претходниот ред'
 DocType: Sales Order Item,Delivery Warehouse,Испорака Магацински
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Дрвото на Центрите финансиски трошоци.
 DocType: Serial No,Delivery Document No,Испорака л.к
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Поставете &quot;добивка / загуба сметка за располагање со средства во компанијата {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Поставете &quot;добивка / загуба сметка за располагање со средства во компанијата {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Се предмети од Набавка Разписки
 DocType: Serial No,Creation Date,Датум на креирање
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Точка {0} се појавува неколку пати во Ценовникот {1}
@@ -2030,12 +2067,13 @@
 DocType: Student,Student Mobile Number,Студентски мобилен број
 DocType: Item,Has Variants,Има варијанти
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Ажурирај го одговорот
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Веќе сте одбрале предмети од {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Веќе сте одбрале предмети од {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Име на месечна Дистрибуција
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID е задолжително
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID е задолжително
 DocType: Sales Person,Parent Sales Person,Родител продажбата на лице
-DocType: Purchase Invoice,Recurring Invoice,Повторувачки Фактура
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Висок до низок
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Прво изберете ја програмата
 DocType: Patient Appointment,Patient Age,Возраст на пациентот
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Управување со проекти
 DocType: Supplier,Supplier of Goods or Services.,Снабдувач на стоки или услуги.
@@ -2043,8 +2081,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Ненаплатени сметки што треба да се користат ако не се поставени во Пациентот за да се резервираат трошоци за консултации.
 DocType: Vehicle Log,Fuel Price,гориво Цена
 DocType: Budget,Budget,Буџет
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Поставете го отворен
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Фиксни средства точка мора да биде точка на не-парк.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Поставете го отворен
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Фиксни средства точка мора да биде точка на не-парк.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Буџетот не може да биде доделен од {0}, како што не е сметката за приходи и трошоци"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Постигнати
 DocType: Student Admission,Application Form Route,Формулар Пат
@@ -2058,12 +2096,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Ставка {0} не е подесување за сериски бр. Проверете главна ставка
 DocType: Maintenance Visit,Maintenance Time,Одржување Време
 ,Amount to Deliver,Износ за да овозможи
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Истата ставка е внесена неколку пати. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Датум на поимот на проектот не може да биде порано од годината Датум на почеток на академската година на кој е поврзан на зборот (академска година {}). Ве молам поправете датумите и обидете се повторно.
 DocType: Guardian,Guardian Interests,Гардијан Интереси
 DocType: Naming Series,Current Value,Сегашна вредност
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,постојат повеќе фискални години за датумот {0}. Поставете компанијата во фискалната
 DocType: School Settings,Instructor Records to be created by,Записи за инструктори кои треба да се креираат од
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} создаден
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} создаден
 DocType: Delivery Note Item,Against Sales Order,Против Продај Побарувања
 ,Serial No Status,Сериски № Статус
 DocType: Payment Entry Reference,Outstanding,Најдобро
@@ -2073,10 +2112,10 @@
 						must be greater than or equal to {2}","Ред {0}: За да го поставите {1} поените, разликата помеѓу од и до денес \ мора да биде поголем или еднаков на {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Ова е врз основа на акциите на движење. Види {0} за повеќе детали
 DocType: Pricing Rule,Selling,Продажби
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Износот {0} {1} одзема против {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Износот {0} {1} одзема против {2}
 DocType: Employee,Salary Information,Плата Информации
 DocType: Sales Person,Name and Employee ID,Име и вработените проект
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Поради Датум не може да биде пред Праќање пораки во Датум
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Поради Датум не може да биде пред Праќање пораки во Датум
 DocType: Website Item Group,Website Item Group,Веб-страница Точка група
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Давачки и даноци
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Ве молиме внесете референтен датум
@@ -2102,7 +2141,7 @@
 DocType: Issue,Resolution Details,Резолуцијата Детали за
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,алокации
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Прифаќање критериуми
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Ве молиме внесете Материјал Барања во горната табела
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Ве молиме внесете Материјал Барања во горната табела
 DocType: Item Attribute,Attribute Name,Атрибут Име
 DocType: BOM,Show In Website,Прикажи Во вебсајт
 DocType: Shopping Cart Settings,Show Quantity in Website,Прикажи Кол во веб-страница
@@ -2111,7 +2150,7 @@
 DocType: Item Reorder,Check in (group),Проверете во (група)
 ,Qty to Order,Количина да нарачате
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","главата на сметката под одговорност или капиталот, во кој ќе бидат резервирани Добивка / загуба"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Gantt шема на сите задачи.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Gantt шема на сите задачи.
 DocType: Opportunity,Mins to First Response,Минути до првата реакција
 DocType: Pricing Rule,Margin Type,маргина Тип
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} часа
@@ -2133,36 +2172,36 @@
 DocType: Patient,Surgical History,Хируршка историја
 DocType: Employee,Resignation Letter Date,Оставка писмо Датум
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Правила цените се уште се филтрирани врз основа на квантитетот.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Поставете го датумот на пристап за вработените {0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Поставете го датумот на пристап за вработените {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Поставете го датумот на пристап за вработените {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Поставете го датумот на пристап за вработените {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Вкупен износ за наплата (преку време лист)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Повторете приходи за корисници
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) мора да имаат улога &quot;расход Approver&quot;
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Пар
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Изберете BOM и Количина за производство
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Изберете BOM и Количина за производство
 DocType: Asset,Depreciation Schedule,амортизација Распоред
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Продажбата партнер адреси и контакти
 DocType: Bank Reconciliation Detail,Against Account,Против профил
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Половина ден датум треба да биде помеѓу Од датум и до денес
 DocType: Maintenance Schedule Detail,Actual Date,Крај Датум
 DocType: Item,Has Batch No,Има Batch Не
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Годишен регистрации: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Годишен регистрации: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Стоки и услуги на даночните (GST Индија)
 DocType: Delivery Note,Excise Page Number,Акцизни Број на страница
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Компанија, од денот и до денес е задолжителна"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Дојдете од консултации
 DocType: Asset,Purchase Date,Дата на продажба
 DocType: Employee,Personal Details,Лични податоци
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Поставете &quot;Асет Амортизација трошоците центар во компанијата {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Поставете &quot;Асет Амортизација трошоците центар во компанијата {0}
 ,Maintenance Schedules,Распоред за одржување
 DocType: Task,Actual End Date (via Time Sheet),Крај Крај Датум (преку време лист)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Износот {0} {1} од {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Износот {0} {1} од {2} {3}
 ,Quotation Trends,Трендови на Понуди
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Точка Група кои не се споменати во точка мајстор за ставката {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Дебит сметка мора да биде побарувања сметка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Дебит сметка мора да биде побарувања сметка
 DocType: Shipping Rule Condition,Shipping Amount,Испорака Износ
 DocType: Supplier Scorecard Period,Period Score,Период на рејтинг
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Додади Клиентите
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Додади Клиентите
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Во очекување Износ
 DocType: Lab Test Template,Special,Специјални
 DocType: Purchase Invoice Item,Conversion Factor,Конверзија Фактор
@@ -2170,13 +2209,14 @@
 ,Vehicle Expenses,Трошоци возило
 DocType: Serial No,Invoice Details,Детали за фактура
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Предвидена вредност по корисен век мора да биде поголемо од или еднакво на {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Почнете
+DocType: Hub Category,Hub Category,Категорија на категории
 DocType: Purchase Invoice,SEZ,СЕЗ
 DocType: Purchase Receipt,Vehicle Number,Број на возило
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,Датумот на кој се повторуваат фактура ќе се запре
 DocType: Employee Loan,Loan Amount,Износ на кредитот
 DocType: Program Enrollment,Self-Driving Vehicle,Само-управување со моторно возило
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Постојана
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Ред {0}: Бил на материјали не најде за Точка {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Ред {0}: Бил на материјали не најде за Точка {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Вкупно одобрени лисја {0} не може да биде помал од веќе одобрен лисја {1} за периодот
 DocType: Journal Entry,Accounts Receivable,Побарувања
 ,Supplier-Wise Sales Analytics,Добавувачот-wise Продажбата анализи
@@ -2188,7 +2228,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Родител на предметната програма (Оставете го празно, ако тоа не е дел од родител на курсот)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Оставете го празно ако се земе предвид за сите видови на вработените
 DocType: Landed Cost Voucher,Distribute Charges Based On,Дистрибуирање пријави Врз основа на
-apps/erpnext/erpnext/hooks.py +131,Timesheets,timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,timesheets
 DocType: HR Settings,HR Settings,Поставки за човечки ресурси
 DocType: Salary Slip,net pay info,нето плата информации
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Оваа вредност се ажурира на ценовната листа на стандардни продажби.
@@ -2199,7 +2239,7 @@
 DocType: Patient,B Positive,Б Позитивен
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ред # {0}: Количина мора да биде 1, како точка е на основните средства. Ве молиме користете посебен ред за повеќе количество."
 DocType: Leave Block List Allow,Leave Block List Allow,Остави Забрани Листа Дозволете
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr не може да биде празно или простор
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr не може да биде празно или простор
 DocType: Patient Medical Record,Patient Medical Record,Медицински рекорд на пациенти
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Група за Не-групата
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спорт
@@ -2216,9 +2256,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Не може да се најде на девизниот курс за {0} до {1} за клучните датум {2}. Ве молиме да се создаде рекорд Девизен рачно
 DocType: POS Profile,Price List,Ценовник
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} сега е стандардно фискална година. Ве молиме да обновите вашиот прелистувач за промените да имаат ефект.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Сметка побарувања
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Сметка побарувања
 DocType: Issue,Support,Поддршка
 ,BOM Search,BOM пребарувај
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Објавете &quot;Има во залиха&quot; или &quot;Нема во акции&quot; на Hub врз основа на акции достапни во овој склад.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Затворање (Отворање + Вкупно)
 DocType: Vehicle,Fuel Type,Тип на гориво
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Ве молиме наведете валута во компанијата
@@ -2230,16 +2271,16 @@
 DocType: Healthcare Settings,Remind Before,Потсетете претходно
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Фактор UOM конверзија е потребно во ред {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Ред # {0}: Референтен документ тип треба да биде еден од Продај Побарувања, продажба фактура или весник Влегување"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Ред # {0}: Референтен документ тип треба да биде еден од Продај Побарувања, продажба фактура или весник Влегување"
 DocType: Salary Component,Deduction,Одбивање
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Ред {0}: Од време и на време е задолжително.
 DocType: Stock Reconciliation Item,Amount Difference,износот на разликата
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Ставка Цена додаде за {0} во Ценовник {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Ставка Цена додаде за {0} во Ценовник {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Ве молиме внесете Id на вработените на ова продажбата на лице
 DocType: Territory,Classification of Customers by region,Класификација на клиенти од регионот
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Разликата Износот мора да биде нула
 DocType: Project,Gross Margin,Бруто маржа
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Ве молиме внесете Производство стварта прв
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Ве молиме внесете Производство стварта прв
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Пресметаната извод од банка биланс
 DocType: Normal Test Template,Normal Test Template,Нормален тест образец
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,корисник со посебни потреби
@@ -2249,21 +2290,22 @@
 DocType: Salary Slip,Total Deduction,Вкупно Расходи
 ,Production Analytics,производство и анализатор
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Ова се базира на трансакции против овој пациент. Погледнете временска рамка подолу за детали
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Цена освежено
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Цена освежено
 DocType: Employee,Date of Birth,Датум на раѓање
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Точка {0} веќе се вратени
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Фискалната година ** претставува финансиска година. Сите сметководствени записи и други големи трансакции се следи против ** ** фискалната година.
 DocType: Opportunity,Customer / Lead Address,Клиент / Потенцијален клиент адреса
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Поставување на картичка за снабдувач
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Предупредување: Невалиден SSL сертификат прикачување {0}
-DocType: Student Admission,Eligibility,подобност
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Име на планот за проценка
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Предупредување: Невалиден SSL сертификат прикачување {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Води да ви помогне да се бизнис, да додадете сите ваши контакти и повеќе како вашиот води"
 DocType: Production Order Operation,Actual Operation Time,Крај на време операција
 DocType: Authorization Rule,Applicable To (User),Се применуваат за (Корисник)
 DocType: Purchase Taxes and Charges,Deduct,Одземе
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Опис на работата
 DocType: Student Applicant,Applied,Аплицира
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Повторно да се отвори
 DocType: Sales Invoice Item,Qty as per Stock UOM,Количина како на берза UOM
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Име Guardian2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специјални знаци освен &quot;-&quot; &quot;.&quot;, &quot;#&quot;, и &quot;/&quot; не е дозволено во именување серија"
@@ -2275,7 +2317,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Производство менаџер
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Сериски № {0} е под гаранција до {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Сплит за испорака во пакети.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Пратки
+apps/erpnext/erpnext/hooks.py +107,Shipments,Пратки
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Вкупно одобрени Износ (Фирма валута)
 DocType: Purchase Order Item,To be delivered to customer,Да бидат доставени до клиентите
 DocType: BOM,Scrap Material Cost,Отпад материјални трошоци
@@ -2298,8 +2340,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Поставки за варијанта на ставка
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Изберете компанијата ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Оставете го празно ако се земе предвид за сите одделенија
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Видови на вработување (постојан, договор, стаж итн)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} е задолжително за ставката {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Видови на вработување (постојан, договор, стаж итн)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} е задолжително за ставката {1}
 DocType: Process Payroll,Fortnightly,на секои две недели
 DocType: Currency Exchange,From Currency,Од валутен
 DocType: Vital Signs,Weight (In Kilogram),Тежина (во килограм)
@@ -2324,7 +2366,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Ве молиме кликнете на &quot;Генерирање Распоред&quot; да се добие распоред
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Имаше грешка при бришењето на следниов распоред:
 DocType: Bin,Ordered Quantity,Нареди Кол
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","на пример, &quot;Изградба на алатки за градители&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","на пример, &quot;Изградба на алатки за градители&quot;"
 DocType: Grading Scale,Grading Scale Intervals,Скала за оценување интервали
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Сметководство за влез на {2} може да се направи само во валута: {3}
 DocType: Production Order,In Process,Во процесот
@@ -2348,11 +2390,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Со плаќање на данок
 DocType: Expense Claim Detail,Expense Claim Detail,Барање Детална сметка
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Три примероци за обезбедувачот
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Ве молиме изберете ја точната сметка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Ве молиме изберете ја точната сметка
 DocType: Item,Weight UOM,Тежина UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Плата Структура на вработените
 DocType: Patient,Blood Group,Крвна група
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Во очекување
 DocType: Course,Course Name,Име на курсот
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Корисниците кои може да одобри апликации одмор одредена вработениот
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Канцеларија опрема
@@ -2371,7 +2412,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Цените нема да бидат прикажани ако цената листата не е поставена
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Наведи земјата за оваа Испорака Правило или проверете Во светот испорака
 DocType: Stock Entry,Total Incoming Value,Вкупно Вредност на Прилив
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Дебитна Да се бара
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Дебитна Да се бара
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets помогне да ги пратите на време, трошоци и платежна за активности направено од страна на вашиот тим"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Откупната цена Листа
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Шаблони на променливите на резултатите од добавувачот.
@@ -2381,7 +2422,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Плаќање помирување
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Ве молиме изберете име incharge на лицето
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Технологија
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Вкупно ненаплатени: {0}
+DocType: Hub Settings,Unregister from Hub,Одрегистрирајте се од Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Вкупно ненаплатени: {0}
 DocType: BOM Website Operation,BOM Website Operation,Бум на вебсајт Операција
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Понуда писмо
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Генерирање Материјал Барања (MRP) и производство наредби.
@@ -2393,7 +2435,9 @@
 DocType: Physician Schedule Time Slot,To Time,На време
 DocType: Authorization Rule,Approving Role (above authorized value),Одобрување Улогата (над овластени вредност)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Кредит на сметка мора да биде плаќаат сметка
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},Бум на рекурзијата: {0} не може да биде родител или дете на {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Ве молиме изберете Студентски прием кој е задолжителен за платен студент апликант
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},Бум на рекурзијата: {0} не може да биде родител или дете на {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Ве молиме изберете Ценовник за објавување на цените
 DocType: Production Order Operation,Completed Qty,Завршено Количина
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само задолжува сметки може да се поврзат против друга кредитна влез"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Ценовник {0} е исклучен
@@ -2406,39 +2450,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} сериски броеви потребно за ставка {1}. Сте ги доставиле {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Тековни Вреднување стапка
 DocType: Item,Customer Item Codes,Клиент Точка Код
+DocType: Training Event,Advance,Однапред
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,за повторно да се повторува.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Размена добивка / загуба
 DocType: Opportunity,Lost Reason,Си ја заборавивте Причина
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Нова адреса
 DocType: Quality Inspection,Sample Size,Големина на примерокот
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Ве молиме внесете Потврда документ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Сите ставки се спремни за фактурирање
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Ве молиме наведете валидна &quot;од случај бр &#39;
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',Ве молиме наведете валидна &quot;од случај бр &#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Понатаму центри цена може да се направи под Групи но записи може да се направи врз несрпското групи
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Корисници и дозволи
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Производство наредби Направено: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Производство наредби Направено: {0}
 DocType: Branch,Branch,Филијали
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Печатење и Брендирање
 DocType: Company,Total Monthly Sales,Вкупно месечни продажби
 DocType: Bin,Actual Quantity,Крај на Кол
 DocType: Shipping Rule,example: Next Day Shipping,пример: Следен ден на испорака
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Сериски № {0} не е пронајдена
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Претплата е {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Претплата е {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Програма Распоред програма
 DocType: Fee Schedule Program,Student Batch,студентски Batch
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,одберете * од `tabVital Signs` каде што пациентот = &#39;{0}&#39; со цел од signs_date desc limit 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Направете Студентски
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Min одделение
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Вие сте поканети да соработуваат на проектот: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Лекарот не е достапен на {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Вие сте поканети да соработуваат на проектот: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Лекарот не е достапен на {0}
 DocType: Leave Block List Date,Block Date,Датум на блок
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Додајте сопствено поле за претплата на поле во док типтот {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Белешка за испорака на добавувачи
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Аплицирај сега
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Аплицирај сега
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Старт Количина {0} / чекање Количина {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Старт Количина {0} / чекање Количина {1}
 DocType: Purchase Invoice,E-commerce GSTIN,Е-трговија GSTIN
 DocType: Sales Order,Not Delivered,Не Дадени
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Очекуваниот датум не може да биде пред датумот на трансакција
 ,Bank Clearance Summary,Банката Чистење Резиме
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Креирање и управување со дневни, неделни и месечни Е-содржините."
 DocType: Appraisal Goal,Appraisal Goal,Процена Цел
@@ -2446,12 +2491,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,згради
 DocType: Fee Schedule,Fee Structure,Провизија Структура
 DocType: Timesheet Detail,Costing Amount,Чини Износ
-DocType: Student Admission,Application Fee,Такса
+DocType: Student Admission Program,Application Fee,Такса
 DocType: Process Payroll,Submit Salary Slip,Поднесе Плата фиш
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maxiumm попуст за ставката {0} е {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Maxiumm попуст за ставката {0} е {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Увоз во Масовно
 DocType: Sales Partner,Address & Contacts,Адреса и контакти
 DocType: SMS Log,Sender Name,Испраќачот Име
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Подреди според критериуми
 DocType: POS Profile,[Select],[Избери]
 DocType: Vital Signs,Blood Pressure (diastolic),Крвен притисок (дијастолен)
 DocType: SMS Log,Sent To,Испратени до
@@ -2460,7 +2506,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Следна Контакт датум не може да биде во минатото
 DocType: Company,For Reference Only.,За повикување само.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Лекарот {0} не е достапен на {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Изберете Серија Не
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Изберете Серија Не
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Невалиден {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,Референтен инв
@@ -2476,15 +2522,15 @@
 DocType: Normal Test Items,Require Result Value,Потребна вредност на резултатот
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,На случај бр не може да биде 0
 DocType: Item,Show a slideshow at the top of the page,Прикажи слајдшоу на врвот на страната
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Продавници
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Продавници
 DocType: Project Type,Projects Manager,Проект менаџер
 DocType: Serial No,Delivery Time,Време на испорака
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Стареењето Врз основа на
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Назначувањето е откажано
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Назначувањето е откажано
 DocType: Item,End of Life,Крајот на животот
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Патување
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Нема активни или стандардно Плата Структура најде за вработените {0} за дадените датуми
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Патување
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Нема активни или стандардно Плата Структура најде за вработените {0} за дадените датуми
 DocType: Leave Block List,Allow Users,Им овозможи на корисниците
 DocType: Purchase Order,Customer Mobile No,Клиент Мобилни Не
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Повторувачки
@@ -2493,12 +2539,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Ажурирање на трошоците
 DocType: Item Reorder,Item Reorder,Пренареждане точка
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Прикажи Плата фиш
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Пренос на материјал
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Пренос на материјал
 DocType: Fees,Send Payment Request,Испрати барање за исплата
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Наведете операции, оперативните трошоци и даде единствена работа нема да вашето работење."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Овој документ е над границата од {0} {1} за ставката {4}. Ви се прави уште една {3} против истиот {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Поставете се повторуваат по спасување
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,износот сметка Одберете промени
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,износот сметка Одберете промени
 DocType: Purchase Invoice,Price List Currency,Ценовник Валута
 DocType: Naming Series,User must always select,Корисникот мора секогаш изберете
 DocType: Stock Settings,Allow Negative Stock,Дозволете негативна состојба
@@ -2518,7 +2564,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Вработен
 DocType: Sample Collection,Collected Time,Собрано време
 DocType: Company,Sales Monthly History,Месечна историја за продажба
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,изберете Batch
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,изберете Batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} е целосно фактурирани
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Витални знаци
 DocType: Training Event,End Time,Крајот на времето
@@ -2526,16 +2572,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Плаќање одбивања или загуба
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Стандардна условите на договорот за продажба или купување.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Група од Ваучер
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Дали сте сигурни дека сакате да го откажете овој состанок?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,гасоводот продажба
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Поставете стандардна сметка во Плата Компонента {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Потребни на
 DocType: Rename Tool,File to Rename,Датотека за да ја преименувате
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Ве молам изберете Бум објект во ред {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Ве молам изберете Бум објект во ред {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Сметка {0} не се поклопува со компанијата {1} во режим на сметка: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Назначена Бум {0} не постои точка за {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Распоред за одржување {0} мора да биде укинат пред да го раскине овој Продај Побарувања
+DocType: POS Profile,Applicable for Users,Применливо за корисници
 DocType: Notification Control,Expense Claim Approved,Сметка Тврдат Одобрени
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Плата фиш на вработените {0} веќе создадена за овој период
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Плата фиш на вработените {0} веќе создадена за овој период
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Фармацевтската
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Цената на купените предмети
 DocType: Selling Settings,Sales Order Required,Продај Побарувања задолжителни
@@ -2560,6 +2608,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,организација
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,организација
 DocType: BOM Update Tool,BOM Update Tool,Алатка за ажурирање на BOM
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Партиската сметка не е одредена, молам постави стандардна партија сметка во компанијата"
 DocType: SG Creation Tool Course,Student Group Name,Име Група на студенти
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Создавање такси
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Ве молиме бидете сигурни дека навистина сакате да ги избришете сите трансакции за оваа компанија. Вашиот господар на податоци ќе остане како што е. Ова дејство не може да се врати назад.
@@ -2568,29 +2617,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) не може да биде поголема од планираното quanitity ({2}) во продукција налог {3}
 DocType: Shipping Rule,Shipping Rule Label,Испорака Правило Етикета
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,корисникот форум
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,"Суровини, не може да биде празна."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Не може да го ажурира трговија, фактура содржи капка превозот ставка."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,"Суровини, не може да биде празна."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Не може да го ажурира трговија, фактура содржи капка превозот ставка."
 DocType: Lab Test Sample,Lab Test Sample,Примерок за лабораториски испитувања
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Брзо весник Влегување
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Вие не може да го промени стапка ако Бум споменати agianst која било ставка
+DocType: Restaurant,Invoice Series Prefix,Префикс на серија на фактури
 DocType: Employee,Previous Work Experience,Претходно работно искуство
 DocType: Stock Entry,For Quantity,За Кол
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Ве молиме внесете предвидено Количина за Точка {0} во ред {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Ве молиме внесете предвидено Количина за Точка {0} во ред {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} не е поднесен
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Барања за предмети.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Одделни производни цел ќе биде направена за секоја завршена добра ствар.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,"{0} мора да биде негативен, во замена документ"
 ,Minutes to First Response for Issues,Минути за прв одговор за прашања
 DocType: Purchase Invoice,Terms and Conditions1,Услови и Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,Името на Институтот за кои ќе се поставување на овој систем.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,Името на Институтот за кои ќе се поставување на овој систем.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Сметководство влез замрзнати до овој датум, никој не може да се направи / менувате влез освен улога наведени подолу."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Ве молиме да ги зачувате документот пред генерирање на одржување распоред
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Најновата цена се ажурира во сите спецификации
 DocType: Fee Schedule,Successful,Успешно
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Статус на проектот
 DocType: UOM,Check this to disallow fractions. (for Nos),Изберете го ова за да ги оневозможите фракции. (За NOS)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,се создадени по производство наредби:
-DocType: Student Admission,Naming Series (for Student Applicant),Именување серија (за студентски барателот)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,се создадени по производство наредби:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Именување серија (за студентски барателот)
 DocType: Delivery Note,Transporter Name,Превозник Име
 DocType: Authorization Rule,Authorized Value,Овластен Вредност
 DocType: BOM,Show Operations,Прикажи операции
@@ -2614,7 +2664,7 @@
 ,Employees working on a holiday,Вработени кои работат на одмор
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Марк Тековен
 DocType: Project,% Complete Method,% Комплетен метод
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Дрога
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Дрога
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Почеток одржување датум не може да биде пред датумот на испорака за серија № {0}
 DocType: Production Order,Actual End Date,Крај Крај Датум
 DocType: BOM,Operating Cost (Company Currency),Оперативни трошоци (Фирма валута)
@@ -2632,13 +2682,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Одобрување на корисникот не може да биде ист како корисник на владеењето се применува на
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Основната стапка (како на Акции UOM)
 DocType: SMS Log,No of Requested SMS,Број на Побарано СМС
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Неплатено отсуство не се поклопува со одобрен евиденција оставите апликацијата
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Неплатено отсуство не се поклопува со одобрен евиденција оставите апликацијата
 DocType: Campaign,Campaign-.####,Кампања -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следните чекори
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Внесете ја определени предмети на најдобар можен стапки
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Направете Фактура
 DocType: Selling Settings,Auto close Opportunity after 15 days,Авто блиску можност по 15 дена
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Нарачките за нарачка не се дозволени за {0} поради картичка со резултати од {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Нарачките за нарачка не се дозволени за {0} поради картичка со резултати од {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,крајот на годината
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / олово%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / олово%
@@ -2646,6 +2696,7 @@
 DocType: Vital Signs,Nutrition Values,Вредности на исхрана
 DocType: Lab Test Template,Is billable,Дали е наплатлив
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",И &quot;Распоредот на лекарот&quot; и времето по назначувањето &quot;мора да бидат поставени за д-р {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Трето лице дистрибутер / дилер / комисионен застапник / партнер / препродавач кој ги продава компании производи за провизија.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} против нарачка {1}
 DocType: Patient,Patient Demographics,Демографија на пациентот
@@ -2675,7 +2726,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","Стандардни даночни образец во кој може да се примени на сите Набавка трансакции. Овој шаблон може да содржи листа на даночните глави и исто така и други трошоци глави како &quot;испорака&quot;, &quot;осигурување&quot;, &quot;Ракување&quot; и др #### Забелешка Стапката на данокот ќе се дефинира овде ќе биде стандардна даночна стапка за сите предмети ** * *. Ако има ** ** Теми кои имаат различни стапки, тие мора да се додаде во ** точка Данок ** табелата во точка ** ** господар. #### Опис колумни 1. Пресметка Тип: - Ова може да биде на ** Нет Вкупно ** (што е збирот на основниот износ). - ** На претходниот ред Вкупно / Износ ** (за кумулативни даноци или давачки). Ако ја изберете оваа опција, данокот ќе се применуваат како процент од претходниот ред (во даночната маса) износот или вкупно. - Крај ** ** (како што е споменато). 2. профил Раководител: книга на сметка под кои овој данок ќе се резервира 3. Цена Центар: Ако данок / цената е приход (како превозот) или расходите треба да се резервира против трошок центар. 4. Опис: Опис на данокот (кој ќе биде испечатен во фактури / наводници). 5. Оцени: Даночна стапка. 6. Висина: висината на данокот. 7. Вкупно: Кумулативни вкупно на оваа точка. 8. Внесете ред: Ако врз основа на &quot;претходниот ред Вкупно&quot; можете да изберете број на ред кои ќе бидат земени како основа за оваа пресметка (стандардно е претходниот ред). 9. сметаат дека даночните или задолжен за: Во овој дел можете да наведете дали данок / цената е само за вреднување (не е дел од вкупниот број) или само за вкупно (не додаваат вредност на ставка) или за двете. 10. Додадете или одлежа: Без разлика дали сакате да го додадете или одземе данок."
 DocType: Homepage,Homepage,Почетната страница од пребарувачот
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Избери лекар ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',update tabConsultation set-фактура = &#39;{0}&#39; каде името = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd Кол
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Надомест записи создадени - {0}
 DocType: Asset Category Account,Asset Category Account,Средства Категорија сметка
@@ -2687,7 +2737,7 @@
 DocType: Asset,Manual,прирачник
 DocType: Salary Component Account,Salary Component Account,Плата Компонента сметка
 DocType: Global Defaults,Hide Currency Symbol,Сокриј Валута Симбол
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","на пример, банка, пари, кредитни картички"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","на пример, банка, пари, кредитни картички"
 DocType: Lead Source,Source Name,извор Име
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Нормалниот крвен притисок за одмор кај возрасни е приближно 120 mmHg систолен и дијастолен 80 mmHg, со кратенка &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Кредитна Забелешка
@@ -2706,16 +2756,16 @@
 DocType: Patient,Occupation,професија
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Ред {0}: Почеток Датум мора да биде пред Крај Датум
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Вкупно (Количина)
-DocType: Sales Invoice,This Document,овој документ
 DocType: Installation Note Item,Installed Qty,Инсталиран Количина
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Ова може да биде поради некои неважечки е-мејл адреси во
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Додадовте
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,обука Резултат
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,обука Резултат
 DocType: Purchase Invoice,Is Paid,се плаќа
 DocType: Salary Structure,Total Earning,Вкупно Заработка
 DocType: Purchase Receipt,Time at which materials were received,На кој беа примени материјали време
 DocType: Stock Ledger Entry,Outgoing Rate,Тековна стапка
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Организација гранка господар.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Организација гранка господар.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,или
 DocType: Sales Order,Billing Status,Платежна Статус
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Изнеле
@@ -2730,8 +2780,9 @@
 DocType: Notification Control,Sales Order Message,Продај Побарувања порака
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Постави стандардните вредности, како компанија, валута, тековната фискална година, и др"
 DocType: Payment Entry,Payment Type,Тип на плаќање
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Ве молиме одберете Серија за Точка {0}. Не може да се најде една серија која ги исполнува ова барање
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Ве молиме одберете Серија за Точка {0}. Не може да се најде една серија која ги исполнува ова барање
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Ве молиме одберете Серија за Точка {0}. Не може да се најде една серија која ги исполнува ова барање
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Ве молиме одберете Серија за Точка {0}. Не може да се најде една серија која ги исполнува ова барање
+DocType: Hub Category,Parent Category,Категорија на родители
 DocType: Process Payroll,Select Employees,Избери Вработени
 DocType: Opportunity,Potential Sales Deal,Потенцијален Продај договор
 DocType: Complaint,Complaints,Жалби
@@ -2769,7 +2820,7 @@
 DocType: Bin,Reserved Quantity,Кол задржани
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Ве молиме внесете валидна е-мејл адреса
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Ве молиме внесете валидна е-мејл адреса
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Изберете ставка во кошничката
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Изберете ставка во кошничката
 DocType: Landed Cost Voucher,Purchase Receipt Items,Купување Потврда Теми
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Персонализација форми
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,"задоцнетите плаќања,"
@@ -2779,15 +2830,15 @@
 DocType: Payment Request,Amount in customer's currency,Износ во валута на клиентите
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Испорака
 DocType: Stock Reconciliation Item,Current Qty,Тековни Количина
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Додај добавувачи
+DocType: Restaurant Menu,Restaurant Menu,Мени за ресторани
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Пред
 DocType: Appraisal Goal,Key Responsibility Area,Клучна одговорност Површина
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Студентски Пакетите да ви помогне да ги пратите на посетеност, проценки и такси за студентите"
 DocType: Payment Entry,Total Allocated Amount,"Вкупно лимит,"
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Поставете инвентар стандардна сметка за постојана инвентар
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Поставете инвентар стандардна сметка за постојана инвентар
 DocType: Item Reorder,Material Request Type,Материјал Тип на Барањето
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural весник за влез на платите од {0} до {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage е полна, не штедеше"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage е полна, не штедеше"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Ред {0}: UOM конверзија фактор е задолжително
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Капацитет на соба
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Реф
@@ -2826,16 +2877,18 @@
 DocType: Project,Task Completion,задача Завршување
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Не во парк
 DocType: Appraisal,HR User,HR пристап
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Даноци и давачки одземени
-apps/erpnext/erpnext/hooks.py +129,Issues,Прашања
+apps/erpnext/erpnext/hooks.py +138,Issues,Прашања
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Статус мора да биде еден од {0}
 DocType: Sales Invoice,Debit To,Дебит
+DocType: Restaurant Menu Item,Restaurant Menu Item,Мени за ресторанот
 DocType: Delivery Note,Required only for sample item.,Потребно е само за примерок точка.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Крај Количина По трансакцијата
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Не се лизга плата и помеѓу {0} и {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Не се лизга плата и помеѓу {0} и {1}
 ,Pending SO Items For Purchase Request,Во очекување на ПА Теми за купување Барање
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,студент Запишување
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} е исклучен
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,студент Запишување
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} е исклучен
 DocType: Supplier,Billing Currency,Платежна валута
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Extra Large
@@ -2858,6 +2911,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Ве молиме спомнете Број на посети бара
 DocType: Stock Settings,Default Valuation Method,Метод за проценка стандардно
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,Провизија
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Ажурирањето е во тек. Тоа може да потрае некое време.
 DocType: Vehicle Log,Fuel Qty,Количина на гориво
 DocType: Production Order Operation,Planned Start Time,Планирани Почеток Време
 DocType: Course,Assessment,проценка
@@ -2873,7 +2927,7 @@
 DocType: Price List,Price List Master,Ценовник мајстор
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Сите Продажбата Трансакцијата може да бидат означени против повеќе ** продажба на лица **, така што ќе може да се постави и да се следи цели."
 ,S.O. No.,ПА број
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Ве молиме креирајте Клиент од Потенцијален клиент {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Ве молиме креирајте Клиент од Потенцијален клиент {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Изберете пациент
 DocType: Price List,Applicable for Countries,Применливи за земјите
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Име на параметри
@@ -2905,27 +2959,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Расход / Разлика сметка ({0}) мора да биде на сметка &quot;Добивка или загуба&quot;
 DocType: Project,Copied From,копирани од
 DocType: Project,Copied From,копирани од
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Име грешка: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,недостаток
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Име грешка: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,недостаток
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} не се поврзани со {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Публика за вработен {0} е веќе означени
 DocType: Packing Slip,If more than one package of the same type (for print),Ако повеќе од еден пакет од ист тип (за печатење)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Ве молиме поставете стандарден клиент во поставките за ресторани
 ,Salary Register,плата Регистрирај се
 DocType: Warehouse,Parent Warehouse,родител Магацински
 DocType: C-Form Invoice Detail,Net Total,Нето Вкупно
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Аватарот на Бум не е најдена Точка {0} и Проектот {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Аватарот на Бум не е најдена Точка {0} и Проектот {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Дефинирање на различни видови на кредитот
 DocType: Bin,FCFS Rate,FCFS стапка
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Преостанатиот износ за наплата
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Време (во минути)
 DocType: Project Task,Working,Работната
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Акции на дното (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Финансиска година
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Финансиска година
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} не припаѓа на компанијата {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,Не може да се реши функцијата за критериуми за {0}. Осигурајте се дека формулата е валидна.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Чини како на
 DocType: Healthcare Settings,Out Patient Settings,Параметри на пациентот
 DocType: Account,Round Off,Заокружуваат
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Количината мора да биде позитивна
 ,Requested Qty,Бара Количина
 DocType: Tax Rule,Use for Shopping Cart,Користите за Кошничка
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Вредност {0} {1} Атрибут не постои во листа на валидни Точка атрибут вредности за ставката {2}
@@ -2934,7 +2990,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Кривична пријава ќе биде дистрибуиран пропорционално врз основа на точка количество: Контакт лице или количина, како на вашиот избор"
 DocType: Maintenance Visit,Purposes,Цели
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Барем една ставка треба да се внесуваат со негативен количество во замена документ
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Додај курсеви
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операција {0} подолго од било кој на располагање на работното време во станица {1}, се прекине работењето во повеќе операции"
 ,Requested,Побарано
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Нема забелешки
@@ -2946,6 +3001,8 @@
 DocType: Employee Loan,Repaid/Closed,Вратени / Затворено
 DocType: Item,Total Projected Qty,Вкупно планираните Количина
 DocType: Monthly Distribution,Distribution Name,Дистрибуција Име
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Добавувачот&gt; Тип на добавувач
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Стапката на проценка не е пронајдена за Точката {0}, што е потребно да се извршат сметководствени записи за {1} {2}. Ако предметот е склучен како ставка за проценка на нулта вредност во {1}, наведете го тоа во табелата {1} Точка. Во спротивно, ве молиме креирајте дојдовна трансакција на акции за ставката или споменете проценка на проценката во записот Ставка, а потоа пробајте да го поднесете / откажете овој запис"
 DocType: Course,Course Code,Код на предметната програма
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Квалитет инспекција потребни за Точка {0}
 DocType: POS Settings,Use POS in Offline Mode,Користете POS во Offline режим
@@ -2956,14 +3013,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Управување со Територија на дрвото.
 DocType: Journal Entry Account,Sales Invoice,Продажна Фактура
 DocType: Journal Entry Account,Party Balance,Партијата Биланс
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,Ве молиме изберете Примени попуст на
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Ве молиме изберете Примени попуст на
 DocType: Company,Default Receivable Account,Стандардно побарувања профил
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Креирај Банка Влез за вкупниот износ на плата исплатена за погоре избраниот критериум
 DocType: Physician,Physician Schedule,Распоред на лекар
 DocType: Purchase Invoice,Deemed Export,Се смета дека е извоз
 DocType: Stock Entry,Material Transfer for Manufacture,Материјал трансфер за Производство
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Попуст Процент може да се примени или против некој Ценовник или за сите ценовникот.
-DocType: Purchase Invoice,Half-yearly,Полугодишен
+DocType: Subscription,Half-yearly,Полугодишен
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Сметководство за влез на берза
 DocType: Lab Test,LabTest Approver,LabTest одобрувач
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Веќе сте се проценува за критериумите за оценување {}.
@@ -2992,13 +3049,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Екстра Мали
 DocType: Company,Standard Template,стандардна дефиниција
 DocType: Training Event,Theory,теорија
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Предупредување: Материјал Бараниот Количина е помалку од Минимална Подреди Количина
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Предупредување: Материјал Бараниот Количина е помалку од Минимална Подреди Количина
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,На сметка {0} е замрзнат
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Правното лице / Подружница со посебен сметковен кои припаѓаат на Организацијата.
 DocType: Payment Request,Mute Email,Неми-пошта
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Храна, пијалаци и тутун"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Може само да се направи исплата против нефактурираното {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Комисијата стапка не може да биде поголема од 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Може само да се направи исплата против нефактурираното {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Комисијата стапка не може да биде поголема од 100
 DocType: Stock Entry,Subcontract,Поддоговор
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Ве молиме внесете {0} прв
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Нема одговори од
@@ -3016,10 +3073,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Боја
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,План за оценување на критериумите
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Спречи налози за набавки
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Подложни
 DocType: Patient Appointment,Scheduled,Закажана
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Барање за прибирање НА ПОНУДИ.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ве молиме подесете Систем за имиџ на вработените во човечки ресурси&gt; Поставувања за човечки ресурси
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Ве молиме одберете ја изборната ставка каде што &quot;Дали берза Точка&quot; е &quot;Не&quot; и &quot;е продажба точка&quot; е &quot;Да&quot; и не постои друг Бовча производ
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Изберете го клиентот
 DocType: Student Log,Academic,академски
 DocType: Patient,Personal and Social History,Лична и социјална историја
 DocType: Fee Schedule,Fee Breakup for each student,Провизија на отплата за секој ученик
@@ -3029,7 +3087,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Вреднување стапка
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,дизел
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Ценовник Валута не е избрано
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Ценовник Валута не е избрано
 apps/erpnext/erpnext/config/healthcare.py +46,Results,резултати
 ,Student Monthly Attendance Sheet,Студентски Месечен евидентен лист
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Вработен {0} веќе има поднесено барање за {1} помеѓу {2} и {3}
@@ -3045,7 +3103,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Управуваат со продажбата партнери.
 DocType: Quality Inspection,Inspection Type,Тип на инспекцијата
 DocType: Fee Validity,Visited yet,Посетено досега
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Магацини со постоечките трансакцијата не може да се конвертира во групата.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Магацини со постоечките трансакцијата не може да се конвертира во групата.
 DocType: Assessment Result Tool,Result HTML,резултат HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,истекува на
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Додај Студентите
@@ -3072,7 +3130,7 @@
 DocType: Healthcare Settings,Result Printed,Резултатот е отпечатен
 DocType: Asset Category Account,Depreciation Expense Account,Амортизација сметка сметка
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Пробниот период
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Приказ {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Приказ {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Само лист јазли се дозволени во трансакција
 DocType: Expense Claim,Expense Approver,Сметка Approver
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Ред {0}: напредување во однос на клиентите мора да бидат кредит
@@ -3084,7 +3142,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Да DateTime
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Распоред на курсот избришани:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Дневници за одржување на статусот на испораката смс
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Поставете ја продажната цел
 DocType: Accounts Settings,Make Payment via Journal Entry,Се направи исплата преку весник Влегување
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,отпечатена на
 DocType: Item,Inspection Required before Delivery,Потребни инспекција пред породувањето
@@ -3092,7 +3149,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Активности во тек
 DocType: Patient Appointment,Reminded,Потсети
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,вашата организација
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,вашата организација
 DocType: Fee Component,Fees Category,надоместоци Категорија
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Ве молиме внесете ослободување датум.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,АМТ
@@ -3104,7 +3161,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Пренареждане ниво
 DocType: Company,Chart Of Accounts Template,Сметковниот план Шаблон
 DocType: Attendance,Attendance Date,Публика Датум
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Точка Цена ажурирани за {0} во Ценовникот {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Точка Цена ажурирани за {0} во Ценовникот {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Плата распадот врз основа на заработка и одбивање.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Сметка со дете јазли не можат да се конвертираат во Леџер
 DocType: Purchase Invoice Item,Accepted Warehouse,Прифатени Магацински
@@ -3120,9 +3177,10 @@
 ,Employee Birthday,Вработен Роденден
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Студентски Серија Публика алатката
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,граница Преминал
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Планирано Upto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Вложување на капитал
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Академски мандат, со ова &#39;академска година&#39; {0} и &quot;Рок Име&quot; {1} веќе постои. Ве молиме да ги менувате овие ставки и обидете се повторно."
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Како што веќе постојат трансакции против ставка {0}, не може да се промени вредноста на {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Како што веќе постојат трансакции против ставка {0}, не може да се промени вредноста на {1}"
 DocType: UOM,Must be Whole Number,Мора да биде цел број
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Нови лисја распределени (во денови)
 DocType: Purchase Invoice,Invoice Copy,фактура Копија
@@ -3132,7 +3190,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Број на фактура
 DocType: Shopping Cart Settings,Orders,Нарачка
 DocType: Employee Leave Approver,Leave Approver,Остави Approver
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Ве молиме изберете една серија
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Ве молиме изберете една серија
 DocType: Assessment Group,Assessment Group Name,Името на групата за процена
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Материјал префрлени за Производство
 DocType: Expense Claim,"A user with ""Expense Approver"" role",Корисник со &quot;Расходи Approver&quot; улога
@@ -3147,7 +3205,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Период Затворање Влегување
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Изберете оддел ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Трошоците центар со постојните трансакции не може да се конвертира во групата
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Износот {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Износот {0} {1} {2} {3}
 DocType: Account,Depreciation,Амортизација
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Добавувачот (и)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Вработен Публика алатката
@@ -3159,10 +3217,12 @@
 DocType: GL Entry,Voucher No,Ваучер Не
 ,Lead Owner Efficiency,Водач сопственик ефикасност
 ,Lead Owner Efficiency,Водач сопственик ефикасност
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Најпопуларен
 DocType: Leave Allocation,Leave Allocation,Остави Распределба
 DocType: Payment Request,Recipient Message And Payment Details,Примателот на пораката и детали за плаќање
 DocType: Training Event,Trainer Email,тренер-пошта
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Материјал Барања {0} создаден
+DocType: Restaurant Reservation,No of People,Број на луѓе
 DocType: Production Planning Tool,Include sub-contracted raw materials,Вклучување на под-договор суровини
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Дефиниција на условите или договор.
 DocType: Purchase Invoice,Address and Contact,Адреса и контакт
@@ -3171,10 +3231,11 @@
 DocType: Supplier,Last Day of the Next Month,Последниот ден од наредниот месец
 DocType: Support Settings,Auto close Issue after 7 days,Авто блиску прашање по 7 дена
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Одмор не може да се одвои пред {0}, како рамнотежа одмор веќе е рачна пренасочат во рекордно идната распределба одмор {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забелешка: Поради / референтен датум надминува дозволено клиент кредит дена од {0} ден (а)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забелешка: Поради / референтен датум надминува дозволено клиент кредит дена од {0} ден (а)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,студентски Подносител
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL за RECIPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,Акумулирана амортизација сметка
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Оваа е-пошта е автогенерирана
 DocType: Stock Settings,Freeze Stock Entries,Замрзнување берза записи
 DocType: Program Enrollment,Boarding Student,интернат Студентски
 DocType: Asset,Expected Value After Useful Life,Предвидена вредност По корисен век
@@ -3182,7 +3243,7 @@
 DocType: Activity Cost,Billing Rate,Платежна стапка
 ,Qty to Deliver,Количина да Избави
 ,Stock Analytics,Акции анализи
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Работење не може да се остави празно
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Работење не може да се остави празно
 DocType: Maintenance Visit Purpose,Against Document Detail No,Против Детална л.к
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Тип на партијата е задолжително
 DocType: Quality Inspection,Outgoing,Заминување
@@ -3205,7 +3266,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Изберете рачно студентите за активност врз група
 DocType: Journal Entry,User Remark,Корисникот Напомена
 DocType: Lead,Market Segment,Сегмент од пазарот
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Уплатениот износ нема да биде поголема од вкупните одобрени негативен износ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Уплатениот износ нема да биде поголема од вкупните одобрени негативен износ {0}
 DocType: Supplier Scorecard Period,Variables,Променливи
 DocType: Employee Internal Work History,Employee Internal Work History,Вработен внатрешна работа Историја
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Затворање (д-р)
@@ -3235,21 +3296,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Добијат ажурирања
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Сметка {2} не припаѓа на компанијата {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Материјал Барање {0} е откажана или запрена
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Остави менаџмент
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Остави менаџмент
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Група од сметка
 DocType: Sales Order,Fully Delivered,Целосно Дадени
 DocType: Lead,Lower Income,Помал приход
+DocType: Restaurant Order Entry,Current Order,Тековен ред
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Изворот и целните склад не може да биде иста за спорот {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разликата сметките мора да бидат типот на средствата / одговорност сметка, бидејќи овој парк помирување претставува Отворање Влегување"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Повлечениот износ не може да биде поголема од кредит Износ {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Одете во Програми
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Нарачка број потребен за Точка {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Производство цел не создаде
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Производство цел не создаде
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Од датум"" мора да биде по ""до датум"""
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},не може да го промени својот статус како студент {0} е поврзан со примена студент {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},не може да го промени својот статус како студент {0} е поврзан со примена студент {1}
 DocType: Asset,Fully Depreciated,целосно амортизираните
 ,Stock Projected Qty,Акции Проектирани Количина
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Клиент {0} не му припаѓа на проектот {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Клиент {0} не му припаѓа на проектот {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Забележително присуство на HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",Цитати се и понудите што сте ги испратиле на вашите клиенти
 DocType: Sales Order,Customer's Purchase Order,Нарачка на купувачот
@@ -3260,8 +3322,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Поставете Број на амортизациони Резервирано
 DocType: Supplier Scorecard Period,Calculations,Пресметки
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Вредност или Количина
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,"Продукција наредби, а не може да се зголеми за:"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,"Продукција наредби, а не може да се зголеми за:"
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Минута
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ве молиме наместете го Селектирањето за {0} преку Setup&gt; Settings&gt; Series за именување
 DocType: Purchase Invoice,Purchase Taxes and Charges,Купување на даноци и такси
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Одете на добавувачи
 ,Qty to Receive,Количина да добијам
@@ -3275,7 +3338,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Кредит на сметка мора да биде на сметка Биланс на состојба
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Сите типови на Добавувачот
 DocType: Global Defaults,Disable In Words,Оневозможи со зборови
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Точка законик е задолжително, бидејќи точка не се нумерирани автоматски"
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,"Точка законик е задолжително, бидејќи точка не се нумерирани автоматски"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Понудата {0} не е од типот {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Одржување Распоред Точка
 DocType: Sales Order,%  Delivered,% Дадени
@@ -3297,23 +3360,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Салдо инвестициски фондови
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Помирување
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,останатите
 DocType: Appraisal,Appraisal,Процена
 DocType: Purchase Invoice,GST Details,Детали за GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},Е-мејл испратен до снабдувачот {0}
+DocType: Item,Default Sales Unit of Measure,Стандардна единица за продажба на мерка
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Датум се повторува
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Овластен потписник
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Остави approver мора да биде еден од {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Направете такси
-DocType: Hub Settings,Seller Email,Продавачот Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Вкупен трошок за Набавка (преку Влезна фактура)
 DocType: Training Event,Start Time,Почеток Време
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Изберете количина
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Изберете количина
 DocType: Customs Tariff Number,Customs Tariff Number,Тарифен број обичаи
 DocType: Patient Appointment,Patient Appointment,Именување на пациентот
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Одобрување улога не може да биде иста како и улогата на владеење е се применуваат на
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Се откажете од оваа е-мејл билтени
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Се откажете од оваа е-мејл билтени
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Добивај добавувачи
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} не е пронајден за Точка {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Оди на курсеви
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Пораката испратена
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Сметка со дете јазли не можат да се постават како Леџер
@@ -3326,11 +3392,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Материјал пренесен за производство
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,На сметка {0} не постои
 DocType: Project,Project Type,Тип на проект
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Дете задача е за оваа задача. Не можете да ја избришете оваа задача.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Или цел количество: Контакт лице или целниот износ е задолжително.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Цената на различни активности
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Нема повеќе резултати
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Цената на различни активности
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Поставување на настани во {0}, бидејќи вработените во прилог на подолу продажба на лица нема User ID {1}"
 DocType: Timesheet,Billing Details,Детали за наплата
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Изворот и целните склад мора да бидат различни
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Изворот и целните склад мора да бидат различни
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Не е дозволено да се ажурира акции трансакции постари од {0}
 DocType: Purchase Invoice Item,PR Detail,ПР Детална
 DocType: Sales Order,Fully Billed,Целосно Опишан
@@ -3357,7 +3425,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Проверете ги сите
 DocType: Vehicle Log,Invoice Ref,фактура Реф
-DocType: Purchase Order,Recurring Order,Повторувачки Побарувања
 DocType: Company,Default Income Account,Сметка стандардно на доход
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Клиент група / клиентите
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Незатворени фискални години Добивка / загуба (кредит)
@@ -3371,9 +3438,9 @@
 DocType: Patient,A Negative,Негативно
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Ништо повеќе да се покаже.
 DocType: Lead,From Customer,Од Клиент
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Повици
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Повици
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,А производ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,серии
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,серии
 DocType: Project,Total Costing Amount (via Time Logs),Вкупен Износ на Чинење (преку Временски дневници)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Направете распоред за плаќање
 DocType: Purchase Order Item Supplied,Stock UOM,Акции UOM
@@ -3398,7 +3465,7 @@
 DocType: School Settings,Current Academic Term,Тековни академски мандат
 DocType: School Settings,Current Academic Term,Тековни академски мандат
 DocType: Sales Order,Not Billed,Не Опишан
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Двете Магацински мора да припаѓа на истата компанија
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Двете Магацински мора да припаѓа на истата компанија
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Не контакти додаде уште.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Слета Цена ваучер Износ
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Сметки кои произлегуваат од добавувачи.
@@ -3407,7 +3474,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Износ попуст
 DocType: Purchase Invoice,Return Against Purchase Invoice,Врати против Набавка Фактура
 DocType: Item,Warranty Period (in days),Гарантниот период (во денови)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',ажурирање `tabPatient Appointment` постави sales_invoice = &#39;{0}&#39; каде име = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Врска со Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Нето готовина од работењето
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Точка 4
@@ -3416,8 +3482,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Весник Влегување профил
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,група на студенти
 DocType: Shopping Cart Settings,Quotation Series,Серија на Понуди
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Ставка ({0}) со исто име веќе постои, ве молиме сменете го името на групата ставки или името на ставката"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Ве молам изберете клиентите
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Ставка ({0}) со исто име веќе постои, ве молиме сменете го името на групата ставки или името на ставката"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Ве молам изберете клиентите
 DocType: C-Form,I,јас
 DocType: Company,Asset Depreciation Cost Center,Центар Амортизација Трошоци средства
 DocType: Sales Order Item,Sales Order Date,Продажбата на Ред Датум
@@ -3426,6 +3492,7 @@
 DocType: Assessment Plan,Assessment Plan,план за оценување
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Клиентот {0} е создаден.
 DocType: Stock Settings,Limit Percent,Процент граница
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Немам моментални ставки на пазарот
 ,Payment Period Based On Invoice Date,Плаќање период врз основа на датум на фактурата
 DocType: Sample Collection,No. of print,Бр. На печатење
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Недостасува размена на валута стапки за {0}
@@ -3481,13 +3548,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Бруто плата - Вкупно Одбивање - Кредитот пресудите
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,Тековни Бум и Нов Бум не може да биде ист
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Плата фиш проект
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Плата фиш проект
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Денот на неговото пензионирање мора да биде поголема од датумот на пристап
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Имаше грешки при закажување разбира на:
 DocType: Sales Invoice,Against Income Account,Против профил доход
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Дадени
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Точка {0}: Нареди Количина {1} не може да биде помала од минималната Количина налог {2} (што е дефинирано во точка).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Точка {0}: Нареди Количина {1} не може да биде помала од минималната Количина налог {2} (што е дефинирано во точка).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Месечен Процентуална распределба
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Пријавете се како друг корисник.
 DocType: Territory,Territory Targets,Територија Цели
 DocType: Delivery Note,Transporter Info,Превозникот Информации
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Поставете стандардно {0} во компанијата {1}
@@ -3495,13 +3563,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Ист снабдувач се внесени повеќе пати
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Бруто добивка / загуба
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Нарачка точка Опрема што се испорачува
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Име на компанија не може да биде компанија
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Име на компанија не може да биде компанија
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Писмо глави за печатење на обрасци.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Наслови за печатење шаблони пр проформа фактура.
 DocType: Program Enrollment,Walking,одење
 DocType: Student Guardian,Student Guardian,студентски Гардијан
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Трошоци тип вреднување не може да го означи како Инклузивна
 DocType: POS Profile,Update Stock,Ажурирање берза
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,во претплатата
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Различни ЕМ за Артикли ќе доведе до Неточна (Вкупно) вредност за Нето тежина. Проверете дали Нето тежината на секој артикал е во иста ЕМ.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Бум стапка
 DocType: Asset,Journal Entry for Scrap,Весник за влез Отпад
@@ -3550,15 +3619,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Систем за корисници (Најавете се) проект. Ако е поставено, тоа ќе биде стандардно за сите форми на човечките ресурси."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Од {1}
 DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Редовна за ажурирање на најновата цена во сите нацрт материјали. Може да потрае неколку минути.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Редовна за ажурирање на најновата цена во сите нацрт материјали. Може да потрае неколку минути.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Име на нова сметка. Забелешка: Ве молиме да не се создаде сметки за клиентите и добавувачите
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Земја мудро стандардно адреса Урнеци
 DocType: Sales Order Item,Supplier delivers to Customer,Снабдувачот доставува до клиентите
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Образец / ставка / {0}) е надвор од складиште
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Поради / референтен датум не може да биде по {0}
+,Sales Payment Summary,Резиме за исплата на продажба
+DocType: Restaurant,Restaurant,Ресторан
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Поради / референтен датум не може да биде по {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Податоци за увоз и извоз
 DocType: Patient,Account Details,детали за сметка
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Не е пронајдено студенти
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Не е пронајдено студенти
 DocType: Medical Department,Medical Department,Медицински оддел
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Критериуми за оценување на резултатите од добавувачот
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Датум на фактура во врска со Мислењата
@@ -3569,8 +3640,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Ве молам изберете Праќање пораки во Датум пред изборот партија
 DocType: Program Enrollment,School House,школа куќа
 DocType: Serial No,Out of AMC,Од АМЦ
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Ве молиме изберете Цитати
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Ве молиме изберете Цитати
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Ве молиме изберете Цитати
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Ве молиме изберете Цитати
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Број на амортизациони резервација не може да биде поголем од вкупниот број на амортизација
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Направете Одржување Посета
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,Ве молиме контактирајте на корисникот кој има {0} функции Продажбата мајстор менаџер
@@ -3578,7 +3649,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Компанијата (не клиент или добавувач) господар.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Ова се базира на присуството на овој студент
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Не Студентите во
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Додај повеќе ставки или отвори образец
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Додај повеќе ставки или отвори образец
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Испорака белешки {0} мора да биде укинат пред да го раскине овој Продај Побарувања
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Одете на Корисниците
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Уплатениот износ + Отпишана сума не може да биде поголемо од Сѐ Вкупно
@@ -3598,37 +3669,40 @@
 DocType: Fee Schedule,Fee Schedule,Провизија Распоред
 DocType: Hub Settings,Publish Availability,Објавуваат Достапност
 DocType: Company,Create Chart Of Accounts Based On,Креирај сметковниот план врз основа на
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Не може да се претвори во некоја група. Постојат задачи за деца.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Датум на раѓање не може да биде поголема отколку денес.
 ,Stock Ageing,Акции стареење
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Студентски {0} постојат против студентот барателот {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Прилагодување за заокружување (Валута на компанијата)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,timesheet
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,timesheet
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} {1} &quot;е оневозможено
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Постави како отворено
 DocType: Cheque Print Template,Scanned Cheque,скенирани чекови
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Испрати автоматски пораки до контакти за доставување на трансакции.
 DocType: Timesheet,Total Billable Amount,Вкупно Платимите Износ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Точка 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Внеси налог
 DocType: Purchase Order,Customer Contact Email,Контакт е-маил клиент
 DocType: Warranty Claim,Item and Warranty Details,Точка и гаранција Детали за
 DocType: Sales Team,Contribution (%),Придонес (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Забелешка: Плаќањето за влез нема да бидат направивме од &quot;Пари или банкарска сметка &#39;не е одредено,"
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Проектот {0} веќе постои
 DocType: Medical Department,Nursing User,Корисник за нега
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Одговорности
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Периодот на валидност на овој цитат заврши.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Периодот на валидност на овој цитат заврши.
 DocType: Expense Claim Account,Expense Claim Account,Тврдат сметка сметка
 DocType: Accounts Settings,Allow Stale Exchange Rates,Дозволи замени стапки на размена
 DocType: Sales Person,Sales Person Name,Продажбата на лице Име
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Ве молиме внесете барем 1 фактура во табелата
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Додади корисници
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Додади корисници
 DocType: POS Item Group,Item Group,Точка група
 DocType: Item,Safety Stock,безбедноста на акции
 DocType: Healthcare Settings,Healthcare Settings,Поставки за здравствена заштита
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Напредок% за задача не може да биде повеќе од 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Напредок% за задача не може да биде повеќе од 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Пред помирување
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Даноци и давачки Додадено (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Точка Даночниот спор во {0} мора да има предвид типот Данок или на приход или трошок или Наплатлив
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Точка Даночниот спор во {0} мора да има предвид типот Данок или на приход или трошок или Наплатлив
 DocType: Sales Order,Partly Billed,Делумно Опишан
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Ставка {0} мора да биде основни средства
 DocType: Item,Default BOM,Стандардно Бум
@@ -3644,6 +3718,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,променлива
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Од Испратница
 DocType: Student,Student Email Address,Студент е-мејл адреса
+DocType: Item,Hub Warehouse,Hub магацин
 DocType: Physician Schedule Time Slot,From Time,Од време
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,На залиха:
 DocType: Notification Control,Custom Message,Прилагодено порака
@@ -3652,9 +3727,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,студентски адреса
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,студентски адреса
 DocType: Purchase Invoice,Price List Exchange Rate,Ценовник курс
+DocType: POS Profile,POS Profile Name,ПОС профил име
 DocType: Purchase Invoice Item,Rate,Цена
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Практикант
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,адреса
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,адреса
 DocType: Stock Entry,From BOM,Од бирото
 DocType: Assessment Code,Assessment Code,Код оценување
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Основни
@@ -3668,11 +3744,12 @@
 DocType: Salary Slip,Salary Structure,Структура плата
 DocType: Account,Bank,Банка
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авиокомпанијата
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Материјал прашање
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Материјал прашање
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Се појави грешка при создавање на периодични
 DocType: Material Request Item,For Warehouse,За Магацински
 DocType: Employee,Offer Date,Датум на понуда
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Понуди
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Вие сте моментално во режим без мрежа. Вие нема да бидете во можност да ја превчитате додека имате мрежа.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Вие сте моментално во режим без мрежа. Вие нема да бидете во можност да ја превчитате додека имате мрежа.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Не студентски групи создадени.
 DocType: Purchase Invoice Item,Serial No,Сериски Не
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Месечна отплата износ не може да биде поголем од кредит Износ
@@ -3682,17 +3759,18 @@
 DocType: Salary Slip,Total Working Hours,Вкупно Работно време
 DocType: Subscription,Next Schedule Date,Следен датум на распоред
 DocType: Stock Entry,Including items for sub assemblies,Вклучувајќи и предмети за суб собранија
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Внесете ја вредноста мора да биде позитивен
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Сите територии
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Внесете ја вредноста мора да биде позитивен
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Сите територии
 DocType: Purchase Invoice,Items,Теми
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Студентот се веќе запишани.
 DocType: Fiscal Year,Year Name,Име на Година
 DocType: Process Payroll,Process Payroll,Процесот Даноци
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Постојат повеќе одмори од работни дена овој месец.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Постојат повеќе одмори од работни дена овој месец.
 DocType: Product Bundle Item,Product Bundle Item,Производ Бовча Точка
 DocType: Sales Partner,Sales Partner Name,Продажбата партнер Име
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Барање за прибирање на понуди
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Барање за прибирање на понуди
 DocType: Payment Reconciliation,Maximum Invoice Amount,Максималниот износ на фактура
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Хематологија
 DocType: Normal Test Items,Normal Test Items,Нормални тестови
 DocType: Student Language,Student Language,студентски јазик
 apps/erpnext/erpnext/config/selling.py +23,Customers,клиентите
@@ -3704,10 +3782,11 @@
 DocType: Issue,Opening Time,Отворање Време
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Од и до датуми потребни
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Хартии од вредност и стоковни берзи
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Стандардно единица мерка за Варијанта &#39;{0}&#39; мора да биде иста како и во Мострата &quot;{1}&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Стандардно единица мерка за Варијанта &#39;{0}&#39; мора да биде иста како и во Мострата &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,Се пресмета врз основа на
 DocType: Delivery Note Item,From Warehouse,Од Магацин
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Нема предмети со Бил на материјали за производство на
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Нема предмети со Бил на материјали за производство на
+DocType: Restaurant,Default Customer,Стандарден клиент
 DocType: Assessment Plan,Supervisor Name,Име супервизор
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Не потврдувајте дали состанок е креиран за истиот ден
 DocType: Program Enrollment Course,Program Enrollment Course,Програма за запишување на курсот
@@ -3735,7 +3814,7 @@
 DocType: Payment Entry,Internal Transfer,внатрешен трансфер
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Сметка детето постои за оваа сметка. Не можете да ја избришете оваа сметка.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Или цел количество: Контакт лице или целниот износ е задолжително
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Постои стандарден Бум постои точка за {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Постои стандарден Бум постои точка за {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Ве молиме изберете ја со Мислењата Датум прв
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Отворање датум треба да биде пред крајниот датум
 DocType: Leave Control Panel,Carry Forward,Пренесување
@@ -3771,6 +3850,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Вкупно Сегашно
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,сметководствени извештаи
 DocType: Drug Prescription,Hour,Час
+DocType: Restaurant Order Entry,Last Sales Invoice,Последна продажба фактура
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Нова серија № не може да има складиште. Склад мора да бидат поставени од страна берза за влез или купување Потврда
 DocType: Lead,Lead Type,Потенцијален клиент Тип
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Немате дозвола да го одобри лисјата Забрани Термини
@@ -3807,65 +3887,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,креирате корисници
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,грам
 DocType: Supplier Scorecard,Per Month,Месечно
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Количина за производство мора да биде поголем од 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Количина за производство мора да биде поголем од 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Посетете извештај за одржување повик.
 DocType: Stock Entry,Update Rate and Availability,Ажурирање курс и Достапност
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Процент ви е дозволено да примате или да испорача повеќе во однос на количината нареди. На пример: Ако го наредил 100 единици. и вашиот додаток е 10%, тогаш ви е дозволено да се добијат 110 единици."
 DocType: POS Customer Group,Customer Group,Група на потрошувачи
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Нова серија проект (по избор)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Нова серија проект (по избор)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Нова серија проект (по избор)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Нова серија проект (по избор)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Сметка сметка е задолжително за ставката {0}
 DocType: BOM,Website Description,Веб-сајт Опис
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Нето промени во капиталот
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Најновиот
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Ве молиме откажете купувањето фактура {0} првиот
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail адреса мора да биде уникатен, веќе постои за {0}"
 DocType: Serial No,AMC Expiry Date,АМЦ датумот на истекување
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,приемот
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,приемот
 ,Sales Register,Продажбата Регистрирај се
 DocType: Daily Work Summary Settings Company,Send Emails At,Испрати е-пошта во
 DocType: Quotation,Quotation Lost Reason,Причина за Нереализирана Понуда
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Изберете го вашиот домен
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',одбереш * од табулаторот каде што името = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},референтна трансакцијата не {0} {1} датум
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},референтна трансакцијата не {0} {1} датум
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Нема ништо да се променат.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Преглед на форма
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Резиме за овој месец и во очекување на активности
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Преглед на форма
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Резиме за овој месец и во очекување на активности
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Додајте корисници во вашата организација, освен вас."
 DocType: Customer Group,Customer Group Name,Клиент Име на групата
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Сè уште нема клиенти!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Сè уште нема клиенти!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Извештај за паричниот тек
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Износ на кредитот не може да надмине максимален заем во износ од {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,лиценца
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Ве молиме да се отстрани оваа фактура {0} од C-Форма {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Ве молиме да се отстрани оваа фактура {0} од C-Форма {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Ве молиме изберете ја носи напред ако вие исто така сакаат да се вклучат во претходната фискална година биланс остава на оваа фискална година
 DocType: GL Entry,Against Voucher Type,Против ваучер Тип
 DocType: Physician,Phone (R),Телефон (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Додадени се временски слотови
 DocType: Item,Attributes,Атрибути
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Овозможи дефиниција
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ве молиме наместете го Селектирањето за {0} преку Setup&gt; Settings&gt; Series за именување
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Ве молиме внесете го отпише профил
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Последните Ред Датум
 DocType: Patient,B Negative,Б Негативно
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},На сметка {0} не припаѓа на компанијата {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Сериски броеви во ред {0} не се поклопува со Потврда за испорака
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Сериски броеви во ред {0} не се поклопува со Потврда за испорака
 DocType: Student,Guardian Details,Гардијан Детали
 DocType: C-Form,C-Form,C-Форма
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Марк посетеност за повеќе вработени
 DocType: Vehicle,Chassis No,Не шасија
 DocType: Payment Request,Initiated,Инициран
 DocType: Production Order,Planned Start Date,Планираниот почеток Датум
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Ве молиме изберете Бум
 DocType: Serial No,Creation Document Type,Креирање Вид на документ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Крајниот датум мора да биде поголем од датумот на почеток
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Крајниот датум мора да биде поголем од датумот на почеток
 DocType: Leave Type,Is Encash,Е инкасирам
 DocType: Leave Allocation,New Leaves Allocated,Нови лисја Распределени
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Проект-мудар податоци не се достапни за котација
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Заврши
 DocType: Project,Expected End Date,Се очекува Крај Датум
 DocType: Budget Account,Budget Amount,износи од буџетот
 DocType: Appraisal Template,Appraisal Template Title,Процена Шаблон Наслов
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Од датум {0} {1} вработените не може да биде пред да се приклучи Датум на вработениот {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Комерцијален
 DocType: Patient,Alcohol Current Use,Тековна употреба на алкохол
+DocType: Student Admission Program,Student Admission Program,Програма за прием на студенти
 DocType: Payment Entry,Account Paid To,Сметка Платиле да
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Родител Точка {0} не мора да биде Акции Точка
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Сите производи или услуги.
@@ -3874,30 +3956,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} буџетот на сметка {1} од {2} {3} е {4}. Тоа ќе се надмине со {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Ред {0} # сметка мора да биде од типот &quot;основни средства&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Од Количина
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Правила за да се пресмета износот превозот за продажба
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,и unchcked Исклучено во
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Серија е задолжително
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Финансиски Услуги
 DocType: Student Sibling,Student ID,студентски проект
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Типови на активности за Време на дневници
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Испратена е-пошта
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Типови на активности за Време на дневници
 DocType: Tax Rule,Sales,Продажба
 DocType: Stock Entry Detail,Basic Amount,Основицата
 DocType: Training Event,Exam,испит
 DocType: Complaint,Complaint,Жалба
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Магацински потребни за акции Точка {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Магацински потребни за акции Точка {0}
 DocType: Leave Allocation,Unused leaves,Неискористени листови
 DocType: Patient,Alcohol Past Use,Користење на алкохол за минатото
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Платежна држава
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Трансфер
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Земи експлодира Бум (вклучувајќи ги и потсклопови)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Трансфер
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Земи експлодира Бум (вклучувајќи ги и потсклопови)
 DocType: Authorization Rule,Applicable To (Employee),Применливи To (вработените)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Поради Датум е задолжително
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Поради Датум е задолжително
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Интервалот за Атрибут {0} не може да биде 0
 DocType: Journal Entry,Pay To / Recd From,Да се плати / Recd Од
 DocType: Naming Series,Setup Series,Подесување Серија
 DocType: Payment Reconciliation,To Invoice Date,Датум на фактура
 DocType: Supplier,Contact HTML,Контакт HTML
 ,Inactive Customers,неактивни корисници
+DocType: Student Admission Program,Maximum Age,Максимална возраст
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Набавка Разписки
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Како Цените правило се применува?
@@ -3916,6 +4000,7 @@
 DocType: GL Entry,Remarks,Забелешки
 DocType: Payment Entry,Account Paid From,Сметка платени од
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Суровина Точка законик
+DocType: Task,Parent Task,Родителска задача
 DocType: Journal Entry,Write Off Based On,Отпише врз основа на
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Направете Водач
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Печатење и идентитет
@@ -3924,20 +4009,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",Плата веќе обработени за периодот од {0} и {1} Остави период апликација не може да биде помеѓу овој период.
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Инсталација рекорд за сериски број
 DocType: Guardian Interest,Guardian Interest,Гардијан камати
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Поставување на стандардните вредности за POS фактури
 apps/erpnext/erpnext/config/hr.py +177,Training,обука
 DocType: Timesheet,Employee Detail,детали за вработените
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 e-mail проект
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 e-mail проект
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,ден следниот датум и Повторете на Денот од месецот мора да биде еднаква
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,ден следниот датум и Повторете на Денот од месецот мора да биде еднаква
 DocType: Lab Prescription,Test Code,Тест законик
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Подесувања за веб-сајт почетната страница од пребарувачот
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},Барањата за RFQ не се дозволени за {0} поради поставената оценка од {1}
 DocType: Offer Letter,Awaiting Response,Чекам одговор
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Над
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Вкупно износ {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Невалиден атрибут {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Вкупно износ {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Невалиден атрибут {0} {1}
 DocType: Supplier,Mention if non-standard payable account,"Спомене, ако не-стандардни плаќа сметката"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Истата ставка се внесени повеќе пати. {Листа}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Ве молиме изберете ја групата за процена освен &quot;Сите групи оценување&quot;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Ред {0}: потребен е центар за трошоци за елемент {1}
 DocType: Training Event Employee,Optional,Факултативно
@@ -3960,13 +4045,15 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Цена центар е задолжително за ставката {2}
 DocType: Vehicle,Policy No,Не политика
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Се предмети од производот Бовча
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Бидејќи состојбата постои против ставка {0}, не можете да овозможите својства на варијанти"
 DocType: Asset,Straight Line,Права линија
 DocType: Project User,Project User,корисник на проектот
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Подели
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Подели
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Подели
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Подели
 DocType: GL Entry,Is Advance,Е напредување
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Публика од денот и Публика во тек е задолжително
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,"Ве молиме внесете &#39;се дава под договор &quot;, како Да или Не"
+DocType: Item,Default Purchase Unit of Measure,Стандардна набавна единица за мерка
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Датум на последната комуникација
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Датум на последната комуникација
 DocType: Sales Team,Contact No.,Контакт број
@@ -3975,7 +4062,6 @@
 DocType: Production Order,Check if material transfer entry is not required,Проверете дали не е потребно влез материјал трансфер
 DocType: Production Order,Check if material transfer entry is not required,Проверете дали не е потребно влез материјал трансфер
 DocType: Program Enrollment Tool,Get Students From,Земете студенти од
-DocType: Hub Settings,Seller Country,Продавачот Земја
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Предмети објавуваат на веб-страницата
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Група на учениците во групи
 DocType: Authorization Rule,Authorization Rule,Овластување Правило
@@ -3985,8 +4071,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Продажбата на даноци и такси Шаблон
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Вкупно (кредит)
 DocType: Repayment Schedule,Payment Date,Датум за плаќање
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Нова серија Количина
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Нова серија Количина
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Нова серија Количина
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Нова серија Количина
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Облека и додатоци
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,Не може да се реши пондерирана оценка. Осигурајте се дека формулата е валидна.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Број на нарачка
@@ -4004,6 +4090,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ред # {0}: {1} средства не може да се поднесе, тоа е веќе {2}"
 DocType: Tax Rule,Billing Country,Платежна Земја
 DocType: Purchase Order Item,Expected Delivery Date,Се очекува испорака датум
+DocType: Restaurant Order Entry,Restaurant Order Entry,Влез во рецепција за ресторани
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебитни и кредитни не се еднакви за {0} # {1}. Разликата е во тоа {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Забава трошоци
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Направете материјал Барање
@@ -4016,9 +4103,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Сметка со постоечките трансакцијата не може да се избришат
 DocType: Vehicle,Last Carbon Check,Последните јаглерод Проверете
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Правни трошоци
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Ве молиме изберете количина на ред
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Ве молиме изберете количина на ред
 DocType: Purchase Invoice,Posting Time,Праќање пораки во Време
 DocType: Timesheet,% Amount Billed,% Износ Опишан
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Време по назначувањето&quot; не е поставено за Dr {0}. Додајте го во господар на лекар.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Телефонски трошоци
 DocType: Sales Partner,Logo,Логото
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Обележете го ова ако сакате да ги принуди на корисникот за да изберете серија пред зачувување. Нема да има стандардно Ако ја изберете оваа.
@@ -4029,6 +4117,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Нов корисник приходи
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Патни трошоци
 DocType: Maintenance Visit,Breakdown,Дефект
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Додајте сопствено поле Претплати во доктјето {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Сметка: {0} со валутна: не може да се одбрани {1}
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Ажурирајте го БОМ трошокот автоматски преку Распоредувачот, врз основа на најновата проценка за стапката / ценовниот лист / последната стапка на набавка на суровини."
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Датум
@@ -4053,7 +4142,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Вкупен Износ на Наплата (преку Временски дневници)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Id снабдувач
 DocType: Payment Request,Payment Gateway Details,Исплата Портал Детали
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Количина треба да биде поголем од 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Количина треба да биде поголем од 0
 DocType: Journal Entry,Cash Entry,Кеш Влегување
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,јазли дете може да се создаде само под јазли типот &quot;група&quot;
 DocType: Leave Application,Half Day Date,Половина ден Датум
@@ -4071,12 +4160,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Забелешка: Точката {0} влегоа неколку пати
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Сите контакти.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Компанијата Кратенка
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Корисник {0} не постои
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Корисник {0} не постои
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Кратенка
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Плаќање Влегување веќе постои
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Не authroized од {0} надминува граници
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Плата дефиниција господар.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Патологија
+DocType: Restaurant Order Entry,Restaurant Table,Ресторан Табела
 DocType: Leave Type,Max Days Leave Allowed,Макс дена ја напушти Дозволено
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Постави Данок Правило за количката
 DocType: Purchase Invoice,Taxes and Charges Added,Даноци и давачки Додадено
@@ -4088,10 +4179,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Понуди до Потенцијални клиенти или Клиенти.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Улогата дозволено да ја менувате замрзнати акции
 ,Territory Target Variance Item Group-Wise,Територија Целна Варијанса Точка група-wise
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Сите групи потрошувачи
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Сите групи потрошувачи
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Акумулирана Месечни
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} е задолжително. Можеби рекорд размена на валута не е создадена за {1} до {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Данок Шаблон е задолжително.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Данок Шаблон е задолжително.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,На сметка {0}: Родител на сметка {1} не постои
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ценовник стапка (Фирма валута)
 DocType: Products Settings,Products Settings,производи Settings
@@ -4117,13 +4208,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Точка Мудриот Данок Детална
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Институтот Кратенка
 ,Item-wise Price List Rate,Точка-мудар Ценовник стапка
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Понуда од Добавувач
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Понуда од Добавувач
 DocType: Quotation,In Words will be visible once you save the Quotation.,Во Зборови ќе бидат видливи откако ќе го спаси котација.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Количина ({0}) не може да биде дел во ред {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Количина ({0}) не може да биде дел во ред {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Баркод {0} веќе се користи во ставка {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Баркод {0} веќе се користи во ставка {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Правила за додавање на трошоците за испорака.
 DocType: Item,Opening Stock,отворање на Акции
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Се бара купувачи
@@ -4141,9 +4232,8 @@
 DocType: Customer,From Lead,Од Потенцијален клиент
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Нарачка пуштени во производство.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Изберете фискалната година ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS Профил потребно да се направи ПОС Влегување
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS Профил потребно да се направи ПОС Влегување
 DocType: Program Enrollment Tool,Enroll Students,Студентите кои се запишуваат
-DocType: Hub Settings,Name Token,Име знак
 DocType: Lab Test,Approved Date,Датум на одобрување
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Стандардна Продажба
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Барем еден магацин е задолжително
@@ -4161,7 +4251,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Човечки ресурси
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Плаќање помирување на плаќање
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Даночни средства
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Производство цел е {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Производство цел е {0}
 DocType: BOM Item,BOM No,BOM број
 DocType: Instructor,INS/,ИНС /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Весник Влегување {0} нема сметка {1} или веќе се споредуваат со други ваучер
@@ -4181,8 +4271,8 @@
 DocType: Currency Exchange,To Currency,До Валута
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Им овозможи на овие корисници да се одобри отсуство Апликации за блок дена.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Видови на расходи тврдење.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},стапка за продажба точка {0} е пониска од својот {1}. продажба стапка треба да биде барем {2}
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},стапка за продажба точка {0} е пониска од својот {1}. продажба стапка треба да биде барем {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},стапка за продажба точка {0} е пониска од својот {1}. продажба стапка треба да биде барем {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},стапка за продажба точка {0} е пониска од својот {1}. продажба стапка треба да биде барем {2}
 DocType: Item,Taxes,Даноци
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Платени и не предаде
 DocType: Project,Default Cost Center,Стандардната цена центар
@@ -4196,15 +4286,15 @@
 DocType: Employee Loan,Fully Disbursed,целосно исплатен
 DocType: Maintenance Visit,Customer Feedback,Клиент повратни информации
 DocType: Account,Expense,Сметка
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Резултатот не може да биде поголема од максималната резултат
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Резултатот не може да биде поголема од максималната резултат
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Клиенти и добавувачи
 DocType: Item Attribute,From Range,Од Опсег
 DocType: BOM,Set rate of sub-assembly item based on BOM,Поставете ја стапката на елементот за склопување врз основа на BOM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Грешка во синтаксата во формулата или состојба: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Грешка во синтаксата во формулата или состојба: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Секојдневната работа поставки резиме на компанијата
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,"Точка {0} игнорира, бидејќи тоа не е предмет на акции"
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Пратете овој производството со цел за понатамошна обработка.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Пратете овој производството со цел за понатамошна обработка.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Да не се применуваат Цените правило во одредена трансакција, сите важечки правила на цените треба да биде исклучен."
 DocType: Assessment Group,Parent Assessment Group,Родител група за оценување
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Вработувања
@@ -4221,12 +4311,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Поставете компанијата филтер празно ако група од страна е &quot;Друштвото&quot;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Датум на објавување не може да биде иднина
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Ред # {0}: Сериски Не {1} не се совпаѓа со {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,за генерирање на периодични
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Обичните Leave
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Лабораториски тест UOM.
 DocType: Batch,Batch ID,Серија проект
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Забелешка: {0}
 ,Delivery Note Trends,Испратница трендови
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Краток преглед на оваа недела
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Краток преглед на оваа недела
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Во акциите на количество
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Сметка: {0} можат да се ажурираат само преку акции трансакции
 DocType: Student Group Creation Tool,Get Courses,Земете курсеви
@@ -4240,7 +4331,6 @@
 DocType: Purchase Order,To Bill,Бил
 DocType: Material Request,% Ordered,Нареди%
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","За базирани разбира Група на студенти, се разбира ќе биде потврдена за секој студент од запишаните предмети во програмата за запишување."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Внесете е-мејл адреса, разделени со запирки, фактура ќе бидат испратени автоматски на одреден датум"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Плаќаат на парче
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Ср. Купување стапка
 DocType: Task,Actual Time (in Hours),Крај на времето (во часови)
@@ -4254,7 +4344,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Ставка {0} не е подесување за сериски бр. Колоната мора да биде празна
 DocType: Accounts Settings,Accounts Settings,Сметки Settings
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,одобри
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Нема резултат што треба да се поднесе
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Нема резултат што треба да се поднесе
 DocType: Customer,Sales Partner and Commission,Продажба партнер и на Комисијата
 DocType: Employee Loan,Rate of Interest (%) / Year,Каматна стапка (%) / година
 ,Project Quantity,проектот Кол
@@ -4266,55 +4356,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Црна
 DocType: BOM Explosion Item,BOM Explosion Item,BOM разделен ставка по ставка
 DocType: Account,Auditor,Ревизор
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} произведени ставки
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} произведени ставки
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Научи повеќе
 DocType: Cheque Print Template,Distance from top edge,Одалеченост од горниот раб
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Ценовник {0} е оневозможено или не постои
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Ценовник {0} е оневозможено или не постои
 DocType: Purchase Invoice,Return,Враќање
 DocType: Production Order Operation,Production Order Operation,Производството со цел Операција
 DocType: Pricing Rule,Disable,Оневозможи
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Начин на плаќање е потребно да се изврши плаќање
 DocType: Project Task,Pending Review,Во очекување Преглед
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Назначувања и консултации
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} не е запишано во серијата {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} не е запишано во серијата {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Асет {0} не може да се уништи, како што е веќе {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Вкупно Побарување за Расход (преку Побарување за Расход)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Марк Отсутни
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Ред {0}: Валута на Бум # {1} треба да биде еднаква на избраната валута {2}
 DocType: Journal Entry Account,Exchange Rate,На девизниот курс
 DocType: Patient,Additional information regarding the patient,Дополнителни информации во врска со пациентот
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Продај Побарувања {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Продај Побарувања {0} не е поднесен
 DocType: Homepage,Tag Line,таг линија
 DocType: Fee Component,Fee Component,надомест Компонента
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,транспортен менаџмент
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Додадете ставки од
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,транспортен менаџмент
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Додадете ставки од
 DocType: Cheque Print Template,Regular,редовни
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Вкупно weightage на сите критериуми за оценување мора да биде 100%
-DocType: BOM,Last Purchase Rate,Последните Набавка стапка
+DocType: Purchase Order Item,Last Purchase Rate,Последните Набавка стапка
 DocType: Account,Asset,Средства
 DocType: Project Task,Task ID,Задача проект
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Акции не може да постои на точка {0} бидејќи има варијанти
 DocType: Lab Test,Mobile,Мобилен
 ,Sales Person-wise Transaction Summary,Продажбата на лице-мудар Преглед на трансакциите
 DocType: Training Event,Contact Number,Број за контакт
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Магацински {0} не постои
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Регистрирајте се за ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Магацински {0} не постои
 DocType: Monthly Distribution,Monthly Distribution Percentages,Месечен Процентите Дистрибуција
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,На избраната ставка не може да има Batch
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","стапка на вреднување не најде за Точка {0}, кои се потребни да се направи на сметководствените ставки за {1} {2}. Ако објектот е transacting како вид на примерок во {1}, Ве молиме да се напомене дека во {1} маса точка. Ако не е, се создаде дојдовен акциите на трансакцијата за стапката на вреднување ставка или споменува во евиденцијата на објектот, а потоа се обиде доставување / поништување на овој запис"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% На материјалите доставени од ова за испорака
+DocType: Training Event,Has Certificate,Има сертификат
 DocType: Project,Customer Details,Детали за корисници
 DocType: Employee,Reports to,Извештаи до
 ,Unpaid Expense Claim,Неплатени трошоците Тврдат
 DocType: Payment Entry,Paid Amount,Уплатениот износ
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Истражувај го циклусот на продажба
 DocType: Assessment Plan,Supervisor,супервизор
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,онлајн
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,онлајн
 ,Available Stock for Packing Items,Достапни берза за материјали за пакување
 DocType: Item Variant,Item Variant,Точка Варијанта
 DocType: Assessment Result Tool,Assessment Result Tool,Проценка Резултат алатката
 DocType: BOM Scrap Item,BOM Scrap Item,BOM на отпад/кало
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Поднесени налози не може да биде избришан
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Поднесени налози не може да биде избришан
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс на сметка веќе во Дебитна, не Ви е дозволено да се постави рамнотежа мора да биде &quot;како&quot; кредит &quot;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Управување со квалитет
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Точка {0} е исклучена
@@ -4335,7 +4424,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Дозволете нула Вреднување курс
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Дозволете нула Вреднување курс
 DocType: Training Event Employee,Invited,поканети
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Повеќе најде за вработените {0} за дадените датуми активни платежни структури
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Повеќе најде за вработените {0} за дадените датуми активни платежни структури
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Портал сметки поставување.
 DocType: Employee,Employment Type,Тип на вработување
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,"Основни средства,"
@@ -4347,7 +4436,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Студент e-mail проект
 DocType: Employee,Notice (days),Известување (во денови)
 DocType: Tax Rule,Sales Tax Template,Данок на промет Шаблон
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Изберете предмети за да се спаси фактура
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Изберете предмети за да се спаси фактура
 DocType: Employee,Encashment Date,Датум на инкасо
 DocType: Training Event,Internet,интернет
 DocType: Special Test Template,Special Test Template,Специјален тест образец
@@ -4357,7 +4446,7 @@
 DocType: Academic Term,Term Start Date,Терминот Дата на започнување
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Грофот
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Грофот
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Ви доставуваме # {0} {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Ви доставуваме # {0} {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,"Извод од банка биланс, како на генералниот Леџер"
 DocType: Job Applicant,Applicant Name,Подносител на барањето Име
 DocType: Authorization Rule,Customer / Item Name,Клиент / Item Име
@@ -4377,7 +4466,7 @@
 DocType: Guardian,Guardian Of ,чувар на
 DocType: Grading Scale Interval,Threshold,праг
 DocType: BOM Update Tool,Current BOM,Тековни Бум
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Додади Сериски Не
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Додади Сериски Не
 DocType: Production Order Item,Available Qty at Source Warehouse,Достапно Количина на изворот Магацински
 apps/erpnext/erpnext/config/support.py +22,Warranty,гаранција
 DocType: Purchase Invoice,Debit Note Issued,Задолжување Издадено
@@ -4400,10 +4489,9 @@
 DocType: Account,Receivable,Побарувања
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ред # {0}: Не е дозволено да се промени Добавувачот како веќе постои нарачка
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Улогата што може да поднесе трансакции кои надминуваат кредитни лимити во собата.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Изберете предмети за производство
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Господар синхронизација на податоци, тоа може да потрае некое време"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Изберете предмети за производство
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Господар синхронизација на податоци, тоа може да потрае некое време"
 DocType: Item,Material Issue,Материјал Број
-DocType: Hub Settings,Seller Description,Продавачот Опис
 DocType: Employee Education,Qualification,Квалификација
 DocType: Item Price,Item Price,Ставка Цена
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Сапун и детергент
@@ -4411,7 +4499,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Од време не може да биде поголема отколку на време.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Филмски и видео
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Нареди
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Продолжи
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Продолжи
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Ако е овозможено тогаш системот нема да ги ажурира полињата на варијанти од шаблонот, туку ќе ги копира податоците од подолу наведените полиња додека прави нова варијанта"
 DocType: Salary Detail,Component,компонента
 DocType: Assessment Criteria,Assessment Criteria Group,Критериуми за оценување група
 DocType: Healthcare Settings,Patient Name By,Име на пациентот од
@@ -4421,7 +4510,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Ве молиме внесете Одобрување улога или одобрување на пристап
 DocType: Journal Entry,Write Off Entry,Отпише Влегување
 DocType: BOM,Rate Of Materials Based On,Стапка на материјали врз основа на
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Добавувачот&gt; Тип на добавувач
+DocType: Item Variant Settings,Do not Update Variants,Не ажурирајте варијанти
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Поддршка Аналитика
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Отстранете ги сите
 DocType: POS Profile,Terms and Conditions,Услови и правила
@@ -4430,7 +4519,7 @@
 DocType: Leave Block List,Applies to Company,Се однесува на компанијата
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,Не може да се откаже затоа што {0} постои поднесени берза Влегување
 DocType: Employee Loan,Disbursement Date,Датум на повлекување средства
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;Не е наведено примачот&#39;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Не е наведено примачот&#39;
 DocType: BOM Update Tool,Update latest price in all BOMs,Ажурирај ја најновата цена во сите спецификации
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Медицински рекорд
 DocType: Vehicle,Vehicle,возило
@@ -4446,14 +4535,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / олово%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Средства амортизација и рамнотежа
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Износот {0} {1} премина од {2} до {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Износот {0} {1} премина од {2} до {3}
 DocType: Sales Invoice,Get Advances Received,Се аванси
 DocType: Email Digest,Add/Remove Recipients,Додадете / отстраните примачи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Трансакцијата не е дозволено против запре производството со цел {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Да го поставите на оваа фискална година како стандарден, кликнете на &quot;Постави како стандарден&quot;"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Зачлени се
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Зачлени се
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Недостаток Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Постои ставка варијанта {0} со истите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Постои ставка варијанта {0} со истите атрибути
 DocType: Employee Loan,Repay from Salary,Отплати од плата
 DocType: Leave Application,LAP/,КРУГ/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Барајќи исплата од {0} {1} за износот {2}
@@ -4466,7 +4555,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Продај Побарувања Точка
 DocType: Salary Slip,Payment Days,Плаќање дена
 DocType: Patient,Dormant,хибернација
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Магацини со дете јазли не може да се конвертира Леџер
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Магацини со дете јазли не може да се конвертира Леџер
 DocType: BOM,Manage cost of operations,Управување со трошоците на работење
 DocType: Accounts Settings,Stale Days,Стари денови
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Кога било кој од обележаните трансакции се &quot;поднесе&quot;, е-мејл pop-up автоматски се отвори да се испрати е-маил до поврзани &quot;Контакт&quot; во таа трансакција, со трансакцијата како прилог. Корисникот може или не може да го испрати е-мејл."
@@ -4480,10 +4569,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Сериски № {0} е веќе доби
 ,Requested Items To Be Transferred,Бара предмети да бидат префрлени
 DocType: Expense Claim,Vehicle Log,возилото се Влез
-DocType: Purchase Invoice,Recurring Id,Повторувачки Id
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Присуство на температура (температура&gt; 38,5 ° C / 101,3 ° F или постојана температура&gt; 38 ° C / 100,4 ° F)"
 DocType: Customer,Sales Team Details,Тим за продажба Детали за
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Избриши засекогаш?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Избриши засекогаш?
 DocType: Expense Claim,Total Claimed Amount,Вкупен Износ на Побарувања
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Потенцијални можности за продажба.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Неважечки {0}
@@ -4493,7 +4581,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Одделот на мало
 ,Item Delivery Date,Датум на испорака
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Конфигурирање на вашиот школа во ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Конфигурирање на вашиот школа во ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),База промени Износ (Фирма валута)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Не сметководствените ставки за следните магацини
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Зачувај го документот во прв план.
@@ -4505,13 +4593,12 @@
 DocType: Task,Is Milestone,е Milestone
 DocType: Daily Work Summary,Email Sent To,-Мејл испратен до
 DocType: Budget,Warn,Предупреди
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Дали сте сигурни дека сакате да се регистрирате?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Било други забелешки, да се спомене напори кои треба да одат во евиденцијата."
 DocType: BOM,Manufacturing User,Производство корисник
 DocType: Purchase Invoice,Raw Materials Supplied,Суровини Опрема што се испорачува
-DocType: Purchase Invoice,Recurring Print Format,Повторувачки печатење формат
 DocType: C-Form,Series,Серија
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Валутата на ценовникот {0} мора да биде {1} или {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Додади производи
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Валутата на ценовникот {0} мора да биде {1} или {2}
 DocType: Appraisal,Appraisal Template,Процена Шаблон
 DocType: Item Group,Item Classification,Точка Класификација
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Бизнис менаџер за развој
@@ -4525,7 +4612,7 @@
 DocType: Item Attribute Value,Attribute Value,Вредноста на атрибутот
 ,Itemwise Recommended Reorder Level,Itemwise Препорачани Пренареждане ниво
 DocType: Salary Detail,Salary Detail,плата детали
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Ве молиме изберете {0} Првиот
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Ве молиме изберете {0} Првиот
 DocType: Appointment Type,Physician,Лекар
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Серија {0} од ставка {1} е истечен.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Консултации
@@ -4536,7 +4623,7 @@
 DocType: Salary Detail,Default Amount,Стандардно Износ
 DocType: Lab Test Template,Descriptive,Описни
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Магацински не се најде во системот
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Резиме Овој месец
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Резиме Овој месец
 DocType: Quality Inspection Reading,Quality Inspection Reading,Квалитет инспекција читање
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Замрзнување резерви Постарите Than` треба да биде помала од% d дена.
 DocType: Tax Rule,Purchase Tax Template,Купување Данок Шаблон
@@ -4559,12 +4646,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Обука Настани / Резултати
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,"Акумулираната амортизација, како на"
 DocType: Sales Invoice,C-Form Applicable,C-Форма Применливи
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Операција на времето мора да биде поголема од 0 за операција {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Операција на времето мора да биде поголема од 0 за операција {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Складиште е задолжително
 DocType: Supplier,Address and Contacts,Адреса и контакти
 DocType: UOM Conversion Detail,UOM Conversion Detail,Детална UOM конверзија
 DocType: Program,Program Abbreviation,Програмата Кратенка
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Производство цел не може да се зголеми во однос на точка Шаблон
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Производство цел не може да се зголеми во однос на точка Шаблон
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Обвиненијата се ажурирани Набавка Потврда против секоја ставка
 DocType: Warranty Claim,Resolved By,Реши со
 DocType: Bank Guarantee,Start Date,Датум на почеток
@@ -4590,27 +4677,28 @@
 DocType: Employee,Educational Qualification,Образовните квалификации
 DocType: Workstation,Operating Costs,Оперативни трошоци
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Акција доколку акумулираните Месечен буџет пречекорување
-DocType: Purchase Invoice,Submit on creation,Достават на создавањето
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Валута за {0} мора да биде {1}
+DocType: Subscription,Submit on creation,Достават на создавањето
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Валута за {0} мора да биде {1}
 DocType: Asset,Disposal Date,отстранување Датум
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Пораките ќе бидат испратени до сите активни вработени на компанијата во дадениот час, ако тие немаат одмор. Резиме на одговорите ќе бидат испратени на полноќ."
 DocType: Employee Leave Approver,Employee Leave Approver,Вработен Остави Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Ред {0}: Тоа е внесување Пренареждане веќе постои за оваа магацин {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Не може да се декларираат како изгубени, бидејќи цитат е направен."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,обука Повратни информации
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Ред {0}: Тоа е внесување Пренареждане веќе постои за оваа магацин {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Не може да се декларираат како изгубени, бидејќи цитат е направен."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,обука Повратни информации
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Производство на налози {0} мора да се поднесе
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Критериуми за оценување на добавувачи
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Ве молиме одберете Start Датум и краен датум за Точка {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Курсот е задолжително во ред {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,До денес не може да биде пред од денот
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Додај / Уреди цени
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Додај / Уреди цени
 DocType: Batch,Parent Batch,родител Batch
 DocType: Batch,Parent Batch,родител Batch
 DocType: Cheque Print Template,Cheque Print Template,Чек Шаблон за печатење
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Шема на трошоците центри
 DocType: Lab Test Template,Sample Collection,Збирка примероци
 ,Requested Items To Be Ordered,Бара предмети да се средат
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Мои нарачки
 DocType: Price List,Price List Name,Ценовник Име
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Секојдневната работа Резиме за {0}
 DocType: Employee Loan,Totals,Вкупни вредности
@@ -4629,12 +4717,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} единици од {1} потребни {2} на {3} {4} {5} за да се заврши оваа трансакција.
 DocType: Fee Schedule,Student Category,студентски Категорија
 DocType: Announcement,Student,студент
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Организациона единица (оддел) господар.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Организациона единица (оддел) господар.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Оди во соби
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Ве молиме внесете ја пораката пред испраќањето
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,Дупликат за добавувачот
 DocType: Email Digest,Pending Quotations,Во очекување Цитати
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Point-of-Продажба Профил
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Point-of-Продажба Профил
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Конфигурации за тестирање на лаборатории.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Необезбедени кредити
 DocType: Cost Center,Cost Center Name,Чини Име центар
@@ -4644,6 +4732,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Вкупно Исплатени изн.
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Пораки поголема од 160 карактери ќе бидат поделени во повеќе пораки
 DocType: Purchase Receipt Item,Received and Accepted,Примени и прифатени
+DocType: Hub Settings,Company and Seller Profile,Профил на компанијата и на продавачот
 ,GST Itemised Sales Register,GST Индивидуална продажба Регистрирај се
 ,Serial No Service Contract Expiry,Сериски Нема договор за услуги Важи
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Вие не може да кредитни и дебитни истата сметка во исто време
@@ -4653,10 +4742,11 @@
 DocType: Item,Variant Based On,Варијанта врз основа на
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Вкупно weightage доделени треба да биде 100%. Тоа е {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Вашите добавувачи
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Те молам поправете
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Не може да се постави како изгубени како Продај Побарувања е направен.
 DocType: Request for Quotation Item,Supplier Part No,Добавувачот Дел Не
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',не може да се одбие кога категорија е наменета за &quot;оценка&quot; или &quot;Vaulation и вкупно&quot;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Добиени од
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Добиени од
 DocType: Lead,Converted,Конвертираната
 DocType: Item,Has Serial No,Има серија №
 DocType: Employee,Date of Issue,Датум на издавање
@@ -4664,7 +4754,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Како на Settings Купување ако Набавка Reciept задолжителни == &quot;ДА&quot;, тогаш за создавање Набавка фактура, корисникот треба да се создаде Набавка Потврда за прв елемент {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Ред # {0}: Постави Добавувачот за ставката {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Ред {0}: часови вредност мора да биде поголема од нула.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Веб-страница на слика {0} прилог Точка {1} Не може да се најде
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Веб-страница на слика {0} прилог Точка {1} Не може да се најде
 DocType: Issue,Content Type,Типот на содржина
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Компјутер
 DocType: Item,List this Item in multiple groups on the website.,Листа на оваа точка во повеќе групи на веб страната.
@@ -4675,14 +4765,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Земете неусогласеност записи
 DocType: Payment Reconciliation,From Invoice Date,Фактура од Датум
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Немате дозвола да поднесете
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,Платежна валута мора да биде еднаков на валута или партиската сметка валута или comapany е стандардно
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Платежна валута мора да биде еднаков на валута или партиската сметка валута или comapany е стандардно
 DocType: Healthcare Settings,Laboratory Settings,Лабораториски поставки
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Оставете Инкасо
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Што да направам?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Да се Магацински
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Сите студентски приемните
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Што да направам?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Да се Магацински
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Сите студентски приемните
 ,Average Commission Rate,Просечната стапка на Комисијата
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,"""Серискиот број"" не може да биде ""Да"" за не-складишни ставки"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,"""Серискиот број"" не може да биде ""Да"" за не-складишни ставки"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Изберете Статус
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Публика не можат да бидат означени за идните датуми
 DocType: Pricing Rule,Pricing Rule Help,Цените Правило Помош
@@ -4700,41 +4790,41 @@
 DocType: Item,Customer Code,Код на клиентите
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Роденден Потсетник за {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дена од денот на нарачка
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Должење на сметка мора да биде на сметка Биланс на состојба
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Должење на сметка мора да биде на сметка Биланс на состојба
 DocType: Buying Settings,Naming Series,Именување Серија
 DocType: Leave Block List,Leave Block List Name,Остави Забрани Листа на Име
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Дата на започнување осигурување треба да биде помал од осигурување Дата на завршување
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Ве молиме поставете Систем за наведување на наставници во училиште&gt; Поставувања за училиштата
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Акции средства
 DocType: Timesheet,Production Detail,производство детали
+DocType: Restaurant,Active Menu,Активно мени
 DocType: Target Detail,Target Qty,Целна Количина
 DocType: Shopping Cart Settings,Checkout Settings,Плаќање Settings
 DocType: Attendance,Present,Моментов
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Испратница {0} не мора да се поднесе
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Испратница {0} не мора да се поднесе
 DocType: Notification Control,Sales Invoice Message,Продажна Фактура Порака
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Завршната сметка {0} мора да биде од типот Одговорност / инвестициски фондови
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Плата фиш на вработените {0} веќе создадена за време лист {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Плата фиш на вработените {0} веќе создадена за време лист {1}
 DocType: Vehicle Log,Odometer,километража
 DocType: Sales Order Item,Ordered Qty,Нареди Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Ставката {0} е оневозможено
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Ставката {0} е оневозможено
 DocType: Stock Settings,Stock Frozen Upto,Акции Замрзнати до
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM не содржи количини
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Проектна активност / задача.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM не содржи количини
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Проектна активност / задача.
 DocType: Vehicle Log,Refuelling Details,Полнење Детали
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Генерирање на исплатните листи
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Купување мора да се провери, ако е применливо за е избран како {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Попуст смее да биде помал од 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Последните купување стапка не е пронајден
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Отпише Износ (Фирма валута)
 DocType: Sales Invoice Timesheet,Billing Hours,платежна часа
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,Аватарот на бирото за {0} не е пронајден
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Ред # {0}: Поставете редоследот квантитетот
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Аватарот на бирото за {0} не е пронајден
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Ред # {0}: Поставете редоследот квантитетот
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Допрете ставки за да го додадете ги овде
 DocType: Fees,Program Enrollment,програма за запишување
 DocType: Landed Cost Voucher,Landed Cost Voucher,Слета Цена на ваучер
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Ве молиме да се постави {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Повторете на Денот од месецот
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} е неактивен ученикот
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} е неактивен ученикот
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} е неактивен ученикот
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} е неактивен ученикот
 DocType: Employee,Health Details,Детали за здравство
 DocType: Offer Letter,Offer Letter Terms,Понуда писмо Услови
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Да се создаде Барање исплата е потребно референтен документ
@@ -4743,7 +4833,6 @@
 DocType: Employee External Work History,Salary,Плата
 DocType: Serial No,Delivery Document Type,Испорака Вид на документ
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Да ги достават сите лизга плата за горе избраните критериуми
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} синхронизирани ставки
 DocType: Sales Order,Partly Delivered,Делумно Дадени
 DocType: Email Digest,Receivables,Побарувања
 DocType: Lead Source,Lead Source,доведе извор
@@ -4764,9 +4853,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Стареењето опсег 2
 DocType: SG Creation Tool Course,Max Strength,Макс Сила
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,Бум замени
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Изберете предмети врз основа на датумот на испорака
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Изберете предмети врз основа на датумот на испорака
 ,Sales Analytics,Продажбата анализи
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Достапно {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Достапно {0}
 ,Prospects Engaged But Not Converted,"Изгледите ангажирани, но не се претворат"
 ,Prospects Engaged But Not Converted,"Изгледите ангажирани, но не се претворат"
 DocType: Manufacturing Settings,Manufacturing Settings,"Подесување ""Производство"""
@@ -4774,10 +4863,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Мобилен телефон
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Ве молиме внесете го стандардно валута во компанијата мајстор
 DocType: Stock Entry Detail,Stock Entry Detail,Акции Влегување Детална
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Дневен Потсетници
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Дневен Потсетници
 DocType: Products Settings,Home Page is Products,Главна страница е Производи
 ,Asset Depreciation Ledger,Асет Амортизација Леџер
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Данок Правило Конфликтите со {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Данок Правило Конфликтите со {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Нови име на сметка
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Суровини и материјали обезбедени Цена
 DocType: Selling Settings,Settings for Selling Module,Нагодувања за модулот Продажби
@@ -4791,8 +4880,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Точка {0} мора да биде акции Точка
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Стандардно работа во магацин за напредокот
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Стандардните поставувања за сметководствени трансакции.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ве молиме подесете Систем за имиџ на вработените во човечки ресурси&gt; Поставувања за човечки ресурси
 DocType: Maintenance Visit,MV,МВ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Очекуваниот датум не може да биде пред Материјал Барање Датум
+DocType: Restaurant,Default Tax Template,Стандардна даночна образец
 DocType: Fees,Student Details,Детали за учениците
 DocType: Purchase Invoice Item,Stock Qty,акции Количина
 DocType: Purchase Invoice Item,Stock Qty,акции Количина
@@ -4811,8 +4901,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Одете во Предмети
 DocType: Sales Partner,Partner Type,Тип партнер
 DocType: Purchase Taxes and Charges,Actual,Крај
+DocType: Restaurant Menu,Restaurant Manager,Ресторан менаџер
 DocType: Authorization Rule,Customerwise Discount,Customerwise попуст
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Timesheet за задачите.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Timesheet за задачите.
 DocType: Purchase Invoice,Against Expense Account,Против сметка сметка
 DocType: Production Order,Production Order,Производството со цел
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Инсталација Забелешка {0} е веќе испратена
@@ -4820,7 +4911,6 @@
 DocType: Quotation Item,Against Docname,Против Docname
 DocType: SMS Center,All Employee (Active),Сите вработените (Активни)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Прикажи Сега
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Изберете го периодот кога фактурата ќе се генерираат автоматски
 DocType: BOM,Raw Material Cost,Суровина трошоци
 DocType: Item Reorder,Re-Order Level,Повторно да Ниво
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Внесете предмети и планирани Количина за која сакате да се зголеми производството наредби или преземете суровини за анализа.
@@ -4833,24 +4923,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Тип на излагањето е задолжително
 DocType: Item,Serial Number Series,Сериски број Серија
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Складиште е задолжително за акциите Точка {0} во ред {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Додај програми
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Мало и големо
 DocType: Issue,First Responded On,Прво одговорија
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Крстот на оглас на точка во повеќе групи
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фискална година Почеток Датум и фискалната година Крај Датум веќе се поставени во фискалната {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Дозвола Датум ажурирани
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Сплит Batch
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Сплит Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Сплит Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Сплит Batch
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Успешно помири
 DocType: Request for Quotation Supplier,Download PDF,Преземи како PDF
 DocType: Production Order,Planned End Date,Планирани Крај Датум
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Ве молиме внесете Датум на датум
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Каде што предмети се чуваат.
 DocType: Request for Quotation,Supplier Detail,добавувачот детали
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Грешка во формулата или состојба: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Грешка во формулата или состојба: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Фактурираниот износ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Тежините на критериумите мора да содржат до 100%
 DocType: Attendance,Attendance,Публика
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,акции предмети
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,акции предмети
 DocType: BOM,Materials,Материјали
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ако не е означено, листата ќе мора да се додаде на секој оддел каде што треба да се примени."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Изворот и целните Магацински не може да биде ист
@@ -4868,6 +4958,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,На Нето Вкупно
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Вредноста за атрибутот {0} мора да биде во рамките на опсег од {1} до {2} во интервали од {3} за Точка {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Целна магацин во ред {0} мора да биде иста како цел производство
+DocType: Restaurant Reservation,Waitlisted,Листа на чекање
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Валута не може да се промени по правење записи со употреба на други валута
 DocType: Vehicle Service,Clutch Plate,спојката Плоча
 DocType: Company,Round Off Account,Заокружуваат профил
@@ -4884,7 +4975,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Име на нови продажбата на лице
 DocType: Packing Slip,Gross Weight UOM,Бруто тежина на апаратот UOM
 DocType: Delivery Note Item,Against Sales Invoice,Во однос на Продажна фактура
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Ве молиме внесете сериски броеви за серијали точка
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Ве молиме внесете сериски броеви за серијали точка
 DocType: Bin,Reserved Qty for Production,Резервирано Количина за производство
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Оставете неизбрано ако не сакате да се разгледа серија правејќи се разбира врз основа групи.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Оставете неизбрано ако не сакате да се разгледа серија правејќи се разбира врз основа групи.
@@ -4896,7 +4987,7 @@
 DocType: Lab Test,Test Group,Тест група
 DocType: Payment Reconciliation,Receivable / Payable Account,Побарувања / Платив сметка
 DocType: Delivery Note Item,Against Sales Order Item,Во однос на ставка од продажна нарачка
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Ве молиме наведете Атрибут Вредноста за атрибутот {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Ве молиме наведете Атрибут Вредноста за атрибутот {0}
 DocType: Item,Default Warehouse,Стандардно Магацински
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Буџетот не може да биде доделен од група на сметка {0}
 DocType: Healthcare Settings,Patient Registration,Регистрација на пациенти
@@ -4926,6 +5017,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Продажбата на лице
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Буџетот и трошоците центар
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Не е дозволен повеќекратен стандарден начин на плаќање
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,за
 ,Appointment Analytics,Именување на анализи
 DocType: Vehicle Service,Half Yearly,Половина годишно
 DocType: Lead,Blog Subscriber,Блог Претплатникот
@@ -4945,7 +5037,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Грофот quot
 ,BOM Stock Report,Бум Пријави Акции
 DocType: Stock Reconciliation Item,Quantity Difference,Кол разликата
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Обработка на платен список
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Обработка на платен список
 DocType: Opportunity Item,Basic Rate,Основната стапка
 DocType: GL Entry,Credit Amount,Износ на кредитот
 DocType: Cheque Print Template,Signatory Position,потписник Позиција
@@ -4959,12 +5051,12 @@
 DocType: Tax Rule,Tax Rule,Данок Правило
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Одржување на иста стапка текот продажбата циклус
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,План Време на дневници надвор Workstation работно време.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Клиенти во редицата
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Др. {0} нема распоред за лекари. Додај го во господар на лекар
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Клиенти во редицата
 DocType: Student,Nationality,националност
 ,Items To Be Requested,Предмети да се бара
-DocType: Purchase Order,Get Last Purchase Rate,Земете Последна Набавка стапка
 DocType: Company,Company Info,Инфо за компанијата
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Изберете или да додадете нови клиенти
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Изберете или да додадете нови клиенти
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,центар за трошоци е потребно да се резервира на барање за сметка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Примена на средства (средства)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ова се базира на присуството на вработениот
@@ -4972,6 +5064,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Дебитни сметка
 DocType: Fiscal Year,Year Start Date,Година започнува на Датум
 DocType: Attendance,Employee Name,Име на вработениот
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Ресторан Цел Влезна точка
 DocType: Sales Invoice,Rounded Total (Company Currency),Вкупно Заокружено (Валута на Фирма)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Не може да се тајните на група, бидејќи е избран тип на сметка."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} е изменета. Ве молиме да се одмориме.
@@ -4982,6 +5075,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Користи за вработените
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Спакувани количество мора да биде еднаков количина за ставката {0} во ред {1}
 DocType: Production Order,Manufactured Qty,Произведени Количина
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Создадена е фактура
 DocType: Purchase Receipt Item,Accepted Quantity,Прифатени Кол
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Поставете стандардно летни Листа за вработените {0} или куќа {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} не постои
@@ -4991,18 +5085,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Нема {0}: Износ не може да биде поголема од До Износ против расходи Тврдат {1}. Во очекување сума е {2}
 DocType: Maintenance Schedule,Schedule,Распоред
 DocType: Account,Parent Account,Родител профил
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Достапни
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Достапни
 DocType: Quality Inspection Reading,Reading 3,Читање 3
 ,Hub,Центар
 DocType: GL Entry,Voucher Type,Ваучер Тип
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Ценовник не е пронајдена или со посебни потреби
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Ценовник не е пронајдена или со посебни потреби
 DocType: Lab Test,Approved,Одобрени
 DocType: Pricing Rule,Price,Цена
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',Вработен ослободен на {0} мора да биде поставено како &quot;Лево&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Вработен ослободен на {0} мора да биде поставено како &quot;Лево&quot;
+DocType: Hub Settings,Last Sync On,Последно синхронизирање е вклучено
 DocType: Guardian,Guardian,Гардијан
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Процена {0} создадена за вработените {1} во дадениот период
 DocType: Employee,Education,Образование
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,дел
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,дел
 DocType: Selling Settings,Campaign Naming By,Именувањето на кампањата од страна на
 DocType: Employee,Current Address Is,Тековни адреса е
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Месечна продажна цел (
@@ -5017,7 +5112,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Код:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Ве молиме внесете сметка сметка
 DocType: Account,Stock,На акции
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ред # {0}: Референтен документ тип треба да биде еден од нарачка, купување фактура или весник Влегување"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ред # {0}: Референтен документ тип треба да биде еден од нарачка, купување фактура или весник Влегување"
 DocType: Employee,Current Address,Тековна адреса
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ако предмет е варијанта на друг елемент тогаш опис, слики, цени, даноци и слично ќе бидат поставени од дефиниција освен ако експлицитно не е наведено"
 DocType: Serial No,Purchase / Manufacture Details,Купување / Производство Детали за
@@ -5048,7 +5143,7 @@
 DocType: Hub Settings,Hub Settings,Settings центар
 DocType: Project,Gross Margin %,Бруто маржа%
 DocType: BOM,With Operations,Со операции
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Сметководствени записи се веќе направени во валута {0} за компанија {1}. Ве молиме одберете побарувања или треба да се плати сметката со валутна {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Сметководствени записи се веќе направени во валута {0} за компанија {1}. Ве молиме одберете побарувања или треба да се плати сметката со валутна {0}.
 DocType: Asset,Is Existing Asset,Е постојните средства
 DocType: Salary Detail,Statistical Component,Компонента за статистика
 DocType: Salary Detail,Statistical Component,Компонента за статистика
@@ -5057,13 +5152,14 @@
 DocType: BOM Operation,BOM Operation,BOM операции
 DocType: Purchase Taxes and Charges,On Previous Row Amount,На претходниот ред Износ
 DocType: Student,Home Address,Домашна адреса
+DocType: Item,Has Expiry Date,Има датум на истекување
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Поставки за варијанта на ставка.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,пренос на средствата;
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,пренос на средствата;
 DocType: POS Profile,POS Profile,POS Профил
 DocType: Training Event,Event Name,Име на настанот
 DocType: Physician,Phone (Office),Телефон (канцеларија)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,Услови за прием
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Запишување за {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,Услови за прием
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Запишување за {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Сезоната за поставување на буџети, цели итн"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Име на променлива
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Точка {0} е шаблон, ве молиме изберете една од неговите варијанти"
@@ -5072,7 +5168,7 @@
 DocType: Assessment Plan,Room,соба
 DocType: Purchase Order,Advance Paid,Однапред платени
 DocType: Item,Item Tax,Точка Данок
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Материјал на Добавувачот
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Материјал на Добавувачот
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Акцизни Фактура
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% чини повеќе од еднаш
 DocType: Expense Claim,Employees Email Id,Вработените-пошта Id
@@ -5083,32 +5179,30 @@
 DocType: Program,Program Name,Име на програмата
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Сметаат дека даночните или полнење за
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Крај Количина е задолжително
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} во моментов има {1} Оценка за набавувачот, а Купувачките налози на овој добавувач треба да бидат претпазливи."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} во моментов има {1} Оценка за набавувачот, а Купувачките налози на овој добавувач треба да бидат претпазливи."
 DocType: Employee Loan,Loan Type,Тип на кредит
 DocType: Scheduling Tool,Scheduling Tool,распоред алатка
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Со кредитна картичка
 DocType: BOM,Item to be manufactured or repacked,"Елемент, за да се произведе или да се препакува"
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Стандардните поставувања за акциите трансакции.
-DocType: Purchase Invoice,Next Date,Следниот датум
 DocType: Employee Education,Major/Optional Subjects,Големи / изборни предмети
 DocType: Sales Invoice Item,Drop Ship,Капка Брод
+DocType: Hub Settings,Suspended,Суспендирани
 DocType: Training Event,Attendees,присутните
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Тука може да го задржи семејството детали како име и окупација на родител, брачен другар и деца"
 DocType: Academic Term,Term End Date,Терминот Датум на завршување
-DocType: Hub Settings,Seller Name,Продавачот Име
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Даноци и такси одзема (Фирма валута)
 DocType: Item Group,General Settings,Општи поставки
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Од валутен и до Валута не може да биде ист
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Додајте инструктори
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Мора да ги зачувате форма пред да продолжите
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Прво изберете ја компанијата
 DocType: Item Attribute,Numeric Values,Нумерички вредности
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Прикачи Logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,акции степени
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,акции степени
 DocType: Customer,Commission Rate,Комисијата стапка
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Создадени {0} броеви за карти за {1} помеѓу:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Направи Варијанта
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Направи Варијанта
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Апликации одмор блок од страна на одделот.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Тип на плаќање мора да биде еден од примање, Плати и внатрешен трансфер"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,анализатор
@@ -5123,11 +5217,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Капитал
 DocType: Shopping Cart Settings,Show Public Attachments,Прикажи јавни додатоци
 DocType: Packing Slip,Package Weight Details,Пакет Тежина Детали за
+DocType: Restaurant Reservation,Reservation Time,Време на резервација
 DocType: Payment Gateway Account,Payment Gateway Account,Исплата Портал профил
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,По уплатата пренасочува корисникот да избраната страница.
 DocType: Company,Existing Company,постојните компанија
 DocType: Healthcare Settings,Result Emailed,Резултат е-пошта
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","Данок Категорија е променето во &quot;Вкупно&quot;, бидејќи сите предмети се не-акции ставки"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код на ставка&gt; Група на производи&gt; Бренд
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Ве молиме изберете CSV датотека
 DocType: Student Leave Application,Mark as Present,Означи како Тековен
 DocType: Supplier Scorecard,Indicator Color,Боја на индикаторот
@@ -5152,11 +5248,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Направете Студентски Batch
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Е пренесување
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Земи ставки од BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Земи ставки од BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Потенцијален клиент Време Денови
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Ред # {0}: Праќање пораки во Датум мора да биде иста како датум на купување {1} на средства {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Изберете го ова ако ученикот е престојуваат во Хостел на Институтот.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Ве молиме внесете Продај Нарачка во горната табела
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Ве молиме внесете Продај Нарачка во горната табела
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Не е оставено исплатните листи
 ,Stock Summary,акции Резиме
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Трансфер на средства од еден склад во друг
@@ -5172,5 +5268,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Ред {0}: Дебитна влез не можат да бидат поврзани со {1}
 DocType: Journal Entry,Subscription Section,Секција за претплата
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,На сметка {0} не постои
+DocType: Training Event,Training Program,Програма за обука
 DocType: Account,Cash,Пари
 DocType: Employee,Short biography for website and other publications.,Кратка биографија за веб-страница и други публикации.
diff --git a/erpnext/translations/ml.csv b/erpnext/translations/ml.csv
index 8304957..59cad75 100644
--- a/erpnext/translations/ml.csv
+++ b/erpnext/translations/ml.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,ശമ്പളം മോഡ്
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,രജിസ്റ്റർ ചെയ്യുക
 DocType: Patient,Divorced,ആരുമില്ലെന്ന
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,ഇതിനകം സമന്വയിപ്പിച്ച ഇനങ്ങൾ
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,ഇനം ഒരു ഇടപാട് ഒന്നിലധികം തവണ ചേർക്കാൻ അനുവദിക്കുക
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,ഈ വാറന്റി ക്ലെയിം റദ്ദാക്കുന്നതിൽ മുമ്പ് മെറ്റീരിയൽ സന്ദർശനം {0} റദ്ദാക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,കൺസ്യൂമർ ഉൽപ്പന്നങ്ങൾ
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Approvers വിടുക
 DocType: Sales Partner,Dealer,ഡീലർ
 DocType: Consultation,Investigations,അന്വേഷണം
+DocType: Restaurant Order Entry,Click Enter To Add,Add to Enter ക്ലിക്ക് ചെയ്യുക
 DocType: Employee,Rented,വാടകയ്ക്ക് എടുത്തത്
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,ഉപയോക്താവ് ബാധകമായ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","പ്രൊഡക്ഷൻ ഓർഡർ റദ്ദാക്കാൻ ആദ്യം Unstop, റദ്ദാക്കാൻ കഴിയില്ല നിർത്തി"
 DocType: Vehicle Service,Mileage,മൈലേജ്
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,ശരിക്കും ഈ അസറ്റ് മുൻസർക്കാരിന്റെ ആഗ്രഹിക്കുന്നുണ്ടോ?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,ശരിക്കും ഈ അസറ്റ് മുൻസർക്കാരിന്റെ ആഗ്രഹിക്കുന്നുണ്ടോ?
 DocType: Drug Prescription,Update Schedule,ഷെഡ്യൂൾ അപ്ഡേറ്റുചെയ്യുക
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,സ്വതേ വിതരണക്കാരൻ തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},കറൻസി വില പട്ടിക {0} ആവശ്യമാണ്
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,ലഭ്യത ഉറപ്പു വരുത്തുക
 DocType: Job Applicant,Job Applicant,ഇയ്യോബ് അപേക്ഷകന്
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,ഇത് ഈ വിതരണക്കാരൻ നേരെ ഇടപാടുകൾ അടിസ്ഥാനമാക്കിയുള്ളതാണ്. വിശദാംശങ്ങൾക്ക് ടൈംലൈൻ കാണുക
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,കൂടുതൽ ഫലങ്ങൾ ഇല്ല.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,നിയമ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},യഥാർത്ഥ തരം നികുതി വരി {0} ൽ ഇനം നിരക്ക് ഉൾപ്പെടുത്തിയിട്ടുണ്ട് ചെയ്യാൻ കഴിയില്ല
 DocType: Bank Guarantee,Customer,കസ്റ്റമർ
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),വിനിമയ നിരക്ക് {1} {0} അതേ ആയിരിക്കണം ({2})
 DocType: Sales Invoice,Customer Name,ഉപഭോക്താവിന്റെ പേര്
 DocType: Vehicle,Natural Gas,പ്രകൃതി വാതകം
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},ബാങ്ക് അക്കൗണ്ട് {0} എന്ന് നാമകരണം ചെയ്യാൻ കഴിയില്ല
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},ബാങ്ക് അക്കൗണ്ട് {0} എന്ന് നാമകരണം ചെയ്യാൻ കഴിയില്ല
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,മേധാവികൾ (അല്ലെങ്കിൽ ഗ്രൂപ്പുകൾ) അക്കൗണ്ടിംഗ് വിഭാഗരേഖകൾ തീർത്തതു നീക്കിയിരിപ്പും സൂക്ഷിക്കുന്ന ഏത് നേരെ.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),പ്രമുഖ {0} പൂജ്യം ({1}) കുറവായിരിക്കണം കഴിയില്ല വേണ്ടി
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,പ്രോസസ്സ് ചെയ്യാൻ സമർപ്പിച്ച സാലറി സ്ലിപ്പുകളൊന്നും ഇല്ല.
 DocType: Manufacturing Settings,Default 10 mins,10 മിനിറ്റ് സ്വതേ സ്വതേ
 DocType: Leave Type,Leave Type Name,ടൈപ്പ് പേര് വിടുക
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,തുറക്കുക കാണിക്കുക
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,മേൽപ്പറഞ്ഞ ആവർത്തനത്തിന് ഇന്ന് തന്നെ ഈ പ്രവർത്തനം ആവശ്യമാണ്
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,സീരീസ് വിജയകരമായി അപ്ഡേറ്റ്
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,ചെക്ക് ഔട്ട്
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural ജേണൽ എൻട്രി സമർപ്പിച്ചു
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,പ്രാപിക്കേണ്ട ഓർഡർ ഇനങ്ങൾ വാങ്ങുക
 DocType: SMS Center,All Supplier Contact,എല്ലാ വിതരണക്കാരൻ കോൺടാക്റ്റ്
 DocType: Support Settings,Support Settings,പിന്തുണ സജ്ജീകരണങ്ങൾ
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,പ്രതീക്ഷിച്ച അവസാന തീയതി പ്രതീക്ഷിച്ച ആരംഭ തീയതി കുറവായിരിക്കണം കഴിയില്ല
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,പ്രതീക്ഷിച്ച അവസാന തീയതി പ്രതീക്ഷിച്ച ആരംഭ തീയതി കുറവായിരിക്കണം കഴിയില്ല
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,വരി # {0}: {2} ({3} / {4}): റേറ്റ് {1} അതേ ആയിരിക്കണം
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,പുതിയ അനുവാദ ആപ്ലിക്കേഷൻ
 ,Batch Item Expiry Status,ബാച്ച് ഇനം കാലഹരണപ്പെടൽ അവസ്ഥ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,ബാങ്ക് ഡ്രാഫ്റ്റ്
 DocType: Mode of Payment Account,Mode of Payment Account,പേയ്മെന്റ് അക്കൗണ്ട് മോഡ്
 DocType: Consultation,Consultation,കൺസൾട്ടേഷൻ
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,വിൽപ്പനയും വരുമാനവും
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,ഷോ രൂപഭേദങ്ങൾ
 DocType: Academic Term,Academic Term,അക്കാദമിക് ടേം
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,മെറ്റീരിയൽ
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ആരോഗ്യ പരിരക്ഷ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),പേയ്മെന്റ് കാലതാമസം (ദിവസം)
 DocType: Lab Prescription,Lab Prescription,പ്രിസ്ക്രിപ്ഷൻ ലാബ്
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,വില അനുസരിച്ച് അടുക്കുക
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,സേവന ചിലവേറിയ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},സീരിയൽ നമ്പർ: {0} ഇതിനകം സെയിൽസ് ഇൻവോയ്സ് പരാമർശിച്ചിരിക്കുന്ന ആണ്: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,വികയപതം
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},സീരിയൽ നമ്പർ: {0} ഇതിനകം സെയിൽസ് ഇൻവോയ്സ് പരാമർശിച്ചിരിക്കുന്ന ആണ്: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,വികയപതം
 DocType: Maintenance Schedule Item,Periodicity,ഇതേ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,സാമ്പത്തിക വർഷത്തെ {0} ആവശ്യമാണ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,പ്രതിരോധ
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,വരി # {0}:
 DocType: Timesheet,Total Costing Amount,ആകെ ആറെണ്ണവും തുക
 DocType: Delivery Note,Vehicle No,വാഹനം ഇല്ല
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,വില ലിസ്റ്റ് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,വില ലിസ്റ്റ് തിരഞ്ഞെടുക്കുക
 DocType: Accounts Settings,Currency Exchange Settings,കറൻസി വിനിമയ ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,വരി # {0}: പേയ്മെന്റ് പ്രമാണം trasaction പൂർത്തിയാക്കേണ്ടതുണ്ട്
 DocType: Production Order Operation,Work In Progress,പ്രവൃത്തി പുരോഗതിയിലാണ്
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,തീയതി തിരഞ്ഞെടുക്കുക
 DocType: Employee,Holiday List,ഹോളിഡേ പട്ടിക
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,സ്കൂളിൽ ക്രമീകരണങ്ങളിൽ സെറ്റ് അപ് പരിശീലകൻ നവീകരണ സിസ്റ്റം സ്കൂൾ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,കണക്കെഴുത്തുകാരന്
+DocType: Hub Settings,Selling Price List,വില ലിസ്റ്റ് വിൽക്കുന്നു
 DocType: Patient,Tobacco Current Use,പുകയില നിലവിലുളള ഉപയോഗം
 DocType: Cost Center,Stock User,സ്റ്റോക്ക് ഉപയോക്താവ്
 DocType: Company,Phone No,ഫോൺ ഇല്ല
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,കോഴ്സ് സമയക്രമം സൃഷ്ടിച്ചത്:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},പുതിയ {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},പുതിയ {0}: # {1}
 ,Sales Partners Commission,സെയിൽസ് പങ്കാളികൾ കമ്മീഷൻ
 DocType: Purchase Invoice,Rounding Adjustment,റൌണ്ടിംഗ് അഡ്ജസ്റ്റ്മെന്റ്
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,ചുരുക്കെഴുത്ത് ലധികം 5 പ്രതീകങ്ങൾ കഴിയില്ല
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,പാരന്റ് വിശദാംശം docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","പരാമർശം: {2}: {0}, ഇനം കോഡ്: {1} ഉപഭോക്തൃ"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,കി. ഗ്രാം
-DocType: Student Log,Log,പ്രവേശിക്കുക
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,ഒരു ജോലിക്കായി തുറക്കുന്നു.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} ഫലം സമർപ്പിച്ചു
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} ഫലം സമർപ്പിച്ചു
 DocType: Item Attribute,Increment,വർദ്ധന
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,ടൈംസ്പൻ
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,വെയർഹൗസ് തിരഞ്ഞെടുക്കുക ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,വിവാഹിത
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},{0} അനുവദനീയമല്ല
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,നിന്ന് ഇനങ്ങൾ നേടുക
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},ഓഹരി ഡെലിവറി നോട്ട് {0} നേരെ അപ്ഡേറ്റ് ചെയ്യാൻ സാധിക്കില്ല
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},ഓഹരി ഡെലിവറി നോട്ട് {0} നേരെ അപ്ഡേറ്റ് ചെയ്യാൻ സാധിക്കില്ല
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ഉൽപ്പന്ന {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,ഇനങ്ങളൊന്നും ലിസ്റ്റ്
 DocType: Payment Reconciliation,Reconcile,രഞ്ജിപ്പുണ്ടാക്കണം
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,പെൻഷൻ ഫണ്ട്
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,അടുത്ത മൂല്യത്തകർച്ച തീയതി വാങ്ങിയ തിയതി ആകരുത്
 DocType: Consultation,Consultation Date,കൺസൾട്ടേഷൻ തീയതി
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,"ERPNext ഉപയോക്താക്കൾക്കുള്ള ഉൽപ്പന്ന ലിസ്റ്റിംഗ്, കണ്ടെത്തൽ"
 DocType: SMS Center,All Sales Person,എല്ലാ സെയിൽസ് വ്യാക്തി
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** പ്രതിമാസ വിതരണം ** നിങ്ങളുടെ ബിസിനസ്സിൽ seasonality ഉണ്ടെങ്കിൽ മാസം ഉടനീളം ബജറ്റ് / target വിതരണം സഹായിക്കുന്നു.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,കണ്ടെത്തിയില്ല ഇനങ്ങൾ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,ശമ്പള ഘടന കാണാതായ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,കണ്ടെത്തിയില്ല ഇനങ്ങൾ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,ശമ്പള ഘടന കാണാതായ
 DocType: Lead,Person Name,വ്യക്തി നാമം
 DocType: Sales Invoice Item,Sales Invoice Item,സെയിൽസ് ഇൻവോയിസ് ഇനം
 DocType: Account,Credit,ക്രെഡിറ്റ്
 DocType: POS Profile,Write Off Cost Center,കോസ്റ്റ് കേന്ദ്രം ഓഫാക്കുക എഴുതുക
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",ഉദാ: &quot;പ്രൈമറി സ്കൂൾ&quot; അല്ലെങ്കിൽ &quot;യൂണിവേഴ്സിറ്റി&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",ഉദാ: &quot;പ്രൈമറി സ്കൂൾ&quot; അല്ലെങ്കിൽ &quot;യൂണിവേഴ്സിറ്റി&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,ഓഹരി റിപ്പോർട്ടുകൾ
 DocType: Warehouse,Warehouse Detail,വെയർഹൗസ് വിശദാംശം
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},ക്രെഡിറ്റ് പരിധി {1} / {2} {0} ഉപഭോക്താവിന് മുറിച്ചുകടന്നു ചെയ്തു
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ടേം അവസാന തീയതി പിന്നീട് ഏത് പദം (അക്കാദമിക് വർഷം {}) ബന്ധിപ്പിച്ചിട്ടുള്ളാതാവനായി അക്കാദമിക വർഷത്തിന്റെ വർഷം അവസാനം തീയതി കൂടുതലാകാൻ പാടില്ല. എൻറർ ശരിയാക്കി വീണ്ടും ശ്രമിക്കുക.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ഫിക്സ്ഡ് സ്വത്ത്&quot; അസറ്റ് റെക്കോർഡ് ഇനം നേരെ നിലവിലുള്ളതിനാൽ, അൺചെക്കുചെയ്തു പാടില്ല"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ഫിക്സ്ഡ് സ്വത്ത്&quot; അസറ്റ് റെക്കോർഡ് ഇനം നേരെ നിലവിലുള്ളതിനാൽ, അൺചെക്കുചെയ്തു പാടില്ല"
 DocType: Vehicle Service,Brake Oil,ബ്രേക്ക് ഓയിൽ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ഉപഭോക്താവ്&gt; കസ്റ്റമർ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
 DocType: Tax Rule,Tax Type,നികുതി തരം
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,ടാക്സബിളല്ല തുക
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},നിങ്ങൾ {0} മുമ്പായി എൻട്രികൾ ചേർക്കാൻ അല്ലെങ്കിൽ അപ്ഡേറ്റ് ചെയ്യാൻ അധികാരമില്ല
 DocType: BOM,Item Image (if not slideshow),ഇനം ഇമേജ് (അതില് അല്ല എങ്കിൽ)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ഒരു കസ്റ്റമർ സമാന പേരിൽ നിലവിലുണ്ട്
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(അന്ത്യസമയം റേറ്റ് / 60) * യഥാർത്ഥ ഓപ്പറേഷൻ സമയം
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,വരി # {0}: റഫറൻസ് പ്രമാണ തരം ചെലവിൽ ക്ലെയിമുകളോ ജേർണൽ എൻട്രിയിലോ ആയിരിക്കണം
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,BOM ൽ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,വരി # {0}: റഫറൻസ് പ്രമാണ തരം ചെലവിൽ ക്ലെയിമുകളോ ജേർണൽ എൻട്രിയിലോ ആയിരിക്കണം
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,BOM ൽ തിരഞ്ഞെടുക്കുക
 DocType: SMS Log,SMS Log,എസ്എംഎസ് ലോഗ്
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,കൈമാറി ഇനങ്ങൾ ചെലവ്
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,ന് {0} അവധി തീയതി മുതൽ ദിവസവും തമ്മിലുള്ള അല്ല
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,ജീവനക്കാരുടെ വായ്പ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,പ്രവർത്തന ലോഗ്:
 DocType: Fee Schedule,Send Payment Request Email,പേയ്മെന്റ് അഭ്യർത്ഥന ഇമെയിൽ അയയ്ക്കുക
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,ഇനം {0} വ്യവസ്ഥിതിയിൽ നിലവിലില്ല അല്ലെങ്കിൽ കാലഹരണപ്പെട്ടു
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,ഇനം {0} വ്യവസ്ഥിതിയിൽ നിലവിലില്ല അല്ലെങ്കിൽ കാലഹരണപ്പെട്ടു
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,റിയൽ എസ്റ്റേറ്റ്
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,അക്കൗണ്ട് പ്രസ്താവന
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ഫാർമസ്യൂട്ടിക്കൽസ്
@@ -210,18 +213,23 @@
 DocType: Employee,B-,ലോകോത്തര
 DocType: Upload Attendance,Import Log,ഇറക്കുമതി പ്രവർത്തനരേഖ
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,മുകളിൽ മാനദണ്ഡങ്ങൾ അടിസ്ഥാനമാക്കി തരം ഉത്പാദനം ഭൗതിക അഭ്യർത്ഥന വലിക്കുക
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,വിജയകരമായി രജിസ്റ്റർ ചെയ്തത്.
 DocType: Training Result Employee,Grade,പദവി
+DocType: Restaurant Table,No of Seats,സീറ്റുകളുടെ എണ്ണം
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","ഡൈനാമിക് വിഷയം ചേർക്കാൻ, like jinja tags ഉപയോഗിക്കുക <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,വിതരണക്കാരൻ രക്ഷപ്പെടുത്തി
 DocType: SMS Center,All Contact,എല്ലാ കോൺടാക്റ്റ്
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,ഇതിനകം BOM ലേക്ക് എല്ലാ ഇനങ്ങളും സൃഷ്ടിച്ച പ്രൊഡക്ഷൻ ഓർഡർ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,ഇതിനകം BOM ലേക്ക് എല്ലാ ഇനങ്ങളും സൃഷ്ടിച്ച പ്രൊഡക്ഷൻ ഓർഡർ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,വാർഷിക ശമ്പളം
 DocType: Daily Work Summary,Daily Work Summary,നിത്യജീവിതത്തിലെ ഔദ്യോഗിക ചുരുക്കം
 DocType: Period Closing Voucher,Closing Fiscal Year,അടയ്ക്കുന്ന ധനകാര്യ വർഷം
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} മരവിച്ചു
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,അക്കൗണ്ട്സ് ചാർട്ട് സൃഷ്ടിക്കുന്നതിനുള്ള കമ്പനി തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} മരവിച്ചു
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,അക്കൗണ്ട്സ് ചാർട്ട് സൃഷ്ടിക്കുന്നതിനുള്ള കമ്പനി തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,സ്റ്റോക്ക് ചെലവുകൾ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ടാർഗെറ്റ് വെയർഹൗസ് തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ടാർഗെറ്റ് വെയർഹൗസ് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,ടാർഗെറ്റ് വെയർഹൗസ് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,ടാർഗെറ്റ് വെയർഹൗസ് തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,ദയവായി തിരഞ്ഞെടുത്ത ബന്ധപ്പെടുന്നതിനുള്ള ഇമെയിൽ നൽകുക
 DocType: Program Enrollment,School Bus,സ്കൂൾ ബസ്
 DocType: Journal Entry,Contra Entry,കോൺട്ര എൻട്രി
@@ -238,9 +246,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","ഫലകം ഡൗൺലോഡ്, ഉചിതമായ ഡാറ്റ പൂരിപ്പിക്കുക പ്രമാണത്തെ കൂട്ടിച്ചേർക്കുക. തിരഞ്ഞെടുത്ത കാലയളവിൽ എല്ലാ തീയതി ജീവനക്കാരൻ കോമ്പിനേഷൻ നിലവിലുള്ള ഹാജർ രേഖകളുമായി, ടെംപ്ലേറ്റ് വരും"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,ഇനം {0} സജീവ അല്ലെങ്കിൽ ജീവിതാവസാനം അല്ല എത്തികഴിഞ്ഞു
+DocType: Student Admission Program,Minimum Age,കുറഞ്ഞ പ്രായം
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,ഉദാഹരണം: അടിസ്ഥാന ഗണിതം
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","നികുതി ഉൾപ്പെടുത്തുന്നതിനായി നിരയിൽ {0} ഇനം നിരക്ക്, വരികൾ {1} ലെ നികുതികൾ കൂടി ഉൾപ്പെടുത്തും വേണം"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,എച്ച് മൊഡ്യൂൾ വേണ്ടി ക്രമീകരണങ്ങൾ
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,എച്ച് മൊഡ്യൂൾ വേണ്ടി ക്രമീകരണങ്ങൾ
 DocType: SMS Center,SMS Center,എസ്എംഎസ് കേന്ദ്രം
 DocType: Sales Invoice,Change Amount,തുക മാറ്റുക
 DocType: BOM Update Tool,New BOM,പുതിയ BOM
@@ -250,7 +259,7 @@
 DocType: Lead,Request Type,അഭ്യർത്ഥന തരം
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,ജീവനക്കാരുടെ നിർമ്മിക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,പ്രക്ഷേപണം
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,റൂമുകൾ ചേർക്കുക
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),POS- യുടെ സെറ്റ്അപ്പ് മോഡ് (ഓൺലൈൻ / ഓഫ്ലൈൻ)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,വധശിക്ഷയുടെ
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,പ്രവർത്തനങ്ങൾ വിശദാംശങ്ങൾ പുറത്തു കൊണ്ടുപോയി.
 DocType: Serial No,Maintenance Status,മെയിൻറനൻസ് അവസ്ഥ
@@ -273,6 +282,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,വില പട്ടിക വാങ്ങുമ്പോള് വില്ക്കുകയും ബാധകമായ ആയിരിക്കണം
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},ഇന്സ്റ്റലേഷന് തീയതി ഇനം {0} വേണ്ടി ഡെലിവറി തീയതി മുമ്പ് ആകാൻ പാടില്ല
 DocType: Pricing Rule,Discount on Price List Rate (%),വില പട്ടിക നിരക്ക് (%) ന് ഡിസ്കൗണ്ട്
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,ബയോകെമിസ്ട്രി
 DocType: Offer Letter,Select Terms and Conditions,നിബന്ധനകളും വ്യവസ്ഥകളും തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,മൂല്യം ഔട്ട്
 DocType: Production Planning Tool,Sales Orders,സെയിൽസ് ഉത്തരവുകൾ
@@ -307,15 +317,15 @@
 DocType: Sales Partner,Reseller,റീസെല്ലറിൽ
 DocType: Codification Table,Medical Code,മെഡിക്കൽ കോഡ്
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","പരിശോധിച്ചാൽ, മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ അല്ലാത്ത സ്റ്റോക്ക് ഇനങ്ങൾ ഉൾപ്പെടുത്തും."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,കമ്പനി നൽകുക
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,കമ്പനി നൽകുക
 DocType: Delivery Note Item,Against Sales Invoice Item,സെയിൽസ് ഇൻവോയിസ് ഇനം എഗെൻസ്റ്റ്
 ,Production Orders in Progress,പുരോഗതിയിലാണ് പ്രൊഡക്ഷൻ ഉത്തരവുകൾ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,ഫിനാൻസിംഗ് നിന്നുള്ള നെറ്റ് ക്യാഷ്
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage രക്ഷിച്ചില്ല, നിറഞ്ഞിരിക്കുന്നു"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage രക്ഷിച്ചില്ല, നിറഞ്ഞിരിക്കുന്നു"
 DocType: Lead,Address & Contact,വിലാസം &amp; ബന്ധപ്പെടാനുള്ള
 DocType: Leave Allocation,Add unused leaves from previous allocations,മുൻ വിഹിതം നിന്ന് ഉപയോഗിക്കാത്ത ഇലകൾ ചേർക്കുക
 DocType: Sales Partner,Partner website,പങ്കാളി വെബ്സൈറ്റ്
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,ഇനം ചേർക്കുക
+DocType: Restaurant Order Entry,Add Item,ഇനം ചേർക്കുക
 DocType: Lab Test,Custom Result,ഇഷ്ടാനുസൃത ഫലം
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,കോൺടാക്റ്റ് പേര്
 DocType: Course Assessment Criteria,Course Assessment Criteria,കോഴ്സ് അസസ്മെന്റ് മാനദണ്ഡം
@@ -328,7 +338,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,വാങ്ങിയതിന് അഭ്യർത്ഥന.
 DocType: Lab Test,Submitted Date,സമർപ്പിച്ച തീയതി
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,ഇത് ഈ പദ്ധതി നേരെ സൃഷ്ടിച്ച സമയം ഷീറ്റുകൾ അടിസ്ഥാനമാക്കിയുള്ളതാണ്
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,നെറ്റ് ശമ്പള 0 കുറവ് പാടില്ല
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,നെറ്റ് ശമ്പള 0 കുറവ് പാടില്ല
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","സിസ്റ്റത്തിൽ നിന്നുള്ള ആവർത്തിച്ചുള്ള പിശക് അറിയിപ്പുകൾ അയക്കുന്നത് നിർത്താൻ, ഞങ്ങൾ സബ്സ്ക്രിപ്ഷനിൽ ഡിസ്വാഡ് ഫീൽഡ് പരിശോധിച്ചു"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,മാത്രം തിരഞ്ഞെടുത്ത അനുവാദ Approver ഈ അനുവാദ ആപ്ലിക്കേഷൻ സമർപ്പിക്കാം
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,തീയതി വിടുതൽ ചേരുന്നു തീയതി വലുതായിരിക്കണം
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,പ്രതിവർഷം ഇലകൾ
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,ലാഭം നഷ്ടം
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,ലിറ്റർ
 DocType: Task,Total Costing Amount (via Time Sheet),ആകെ ആറെണ്ണവും തുക (ടൈം ഷീറ്റ് വഴി)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,സ്റ്റുഡന്റ് ഗ്രൂപ്പുകൾക്ക് കീഴിലുള്ള വിദ്യാർത്ഥികളെ ക്രമീകരിക്കുക
 DocType: Item Website Specification,Item Website Specification,ഇനം വെബ്സൈറ്റ് സ്പെസിഫിക്കേഷൻ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,വിടുക തടയപ്പെട്ട
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},ഇനം {0} {1} ജീവിതം അതിന്റെ അവസാനം എത്തിയിരിക്കുന്നു
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},ഇനം {0} {1} ജീവിതം അതിന്റെ അവസാനം എത്തിയിരിക്കുന്നു
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,ബാങ്ക് എൻട്രികൾ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,വാർഷിക
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ഓഹരി അനുരഞ്ജനം ഇനം
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് ക്രിയേഷൻ ടൂൾ കോഴ്സ്
 DocType: Lead,Do Not Contact,ബന്ധപ്പെടുക ചെയ്യരുത്
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,നിങ്ങളുടെ ഓർഗനൈസേഷനിലെ പഠിപ്പിക്കാൻ ആളുകൾ
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,എല്ലാ ആവർത്തന ഇൻവോയ്സുകൾ ട്രാക്കുചെയ്യുന്നതിനുള്ള അതുല്യ ഐഡി. സമർപ്പിക്കുക ന് ഉത്പാദിപ്പിക്കപ്പെടുന്നത്.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,സോഫ്റ്റ്വെയർ ഡെവലപ്പർ
 DocType: Item,Minimum Order Qty,മിനിമം ഓർഡർ Qty
 DocType: Pricing Rule,Supplier Type,വിതരണക്കാരൻ തരം
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,ഹബ് ലെ പ്രസിദ്ധീകരിക്കുക
 DocType: Student Admission,Student Admission,വിദ്യാർത്ഥിയുടെ അഡ്മിഷൻ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,ഇനം {0} റദ്ദാക്കി
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥന
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,ഇനം {0} റദ്ദാക്കി
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥന
 DocType: Bank Reconciliation,Update Clearance Date,അപ്ഡേറ്റ് ക്ലിയറൻസ് തീയതി
 DocType: Item,Purchase Details,വിശദാംശങ്ങൾ വാങ്ങുക
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ഇനം {0} വാങ്ങൽ ഓർഡർ {1} ൽ &#39;അസംസ്കൃത വസ്തുക്കളുടെ നൽകിയത് മേശയിൽ കണ്ടെത്തിയില്ല
 DocType: Patient Relation,Relation,ബന്ധം
 DocType: Shipping Rule,Worldwide Shipping,ലോകമൊട്ടാകെ ഷിപ്പിംഗ്
 DocType: Patient Relation,Mother,അമ്മ
+DocType: Restaurant Reservation,Reservation End Time,റിസർവേഷൻ എൻഡ് സമയം
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,ഇടപാടുകാർ നിന്ന് സ്ഥിരീകരിച്ച ഓർഡറുകൾ.
 DocType: Purchase Receipt Item,Rejected Quantity,നിരസിച്ചു ക്വാണ്ടിറ്റി
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,പേയ്മെന്റ് അഭ്യർത്ഥന {0} സൃഷ്ടിച്ചു
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,പേയ്മെന്റ് അഭ്യർത്ഥന {0} സൃഷ്ടിച്ചു
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,കുറഞ്ഞ സെൻസിറ്റിവിറ്റി
 DocType: Notification Control,Notification Control,അറിയിപ്പ് നിയന്ത്രണ
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,നിങ്ങൾ പരിശീലനം പൂർത്തിയാക്കിയശേഷം സ്ഥിരീകരിക്കുക
 DocType: Lead,Suggestions,നിർദ്ദേശങ്ങൾ
@@ -388,7 +401,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,തിരഞ്ഞെടുത്ത ഇമെയിൽ ജീവനക്കാർ തിരഞ്ഞെടുത്ത അടിസ്ഥാനമാക്കി ജീവനക്കാരൻ ഇമെയിലുകൾ ശമ്പളം സ്ലിപ്പ്
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,പട്ടികയിലുള്ള ആദ്യത്തെ അനുവാദ Approver സ്വതവേയുള്ള അനുവാദ Approver സജ്ജമാക്കപ്പെടും
 DocType: Tax Rule,Shipping County,ഷിപ്പിംഗ് കൗണ്ടി
-apps/erpnext/erpnext/config/desktop.py +158,Learn,അറിയുക
+apps/erpnext/erpnext/config/desktop.py +159,Learn,അറിയുക
 DocType: Asset,Next Depreciation Date,അടുത്ത മൂല്യത്തകർച്ച തീയതി
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,ജീവനക്കാർ ശതമാനം പ്രവർത്തനം ചെലവ്
 DocType: Accounts Settings,Settings for Accounts,അക്കൗണ്ടുകൾക്കുമുള്ള ക്രമീകരണങ്ങൾ
@@ -399,13 +412,13 @@
 DocType: Item,Synced With Hub,ഹബ് കൂടി സമന്വയിപ്പിച്ചു
 DocType: Vehicle,Fleet Manager,ഫ്ലീറ്റ് മാനേജർ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},വരി # {0}: {1} ഇനം {2} നെഗറ്റീവ് പാടില്ല
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,തെറ്റായ പാസ്വേഡ്
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,തെറ്റായ പാസ്വേഡ്
 DocType: Item,Variant Of,ഓഫ് വേരിയന്റ്
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',പൂർത്തിയാക്കി Qty &#39;Qty നിർമ്മിക്കാനുള്ള&#39; വലുതായിരിക്കും കഴിയില്ല
 DocType: Period Closing Voucher,Closing Account Head,അടയ്ക്കുന്ന അക്കൗണ്ട് ഹെഡ്
 DocType: Employee,External Work History,പുറത്തേക്കുള്ള വർക്ക് ചരിത്രം
 DocType: Physician,Time per Appointment,നിയമനത്തിനായുള്ള സമയം
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,വൃത്താകൃതിയിലുള്ള റഫറൻസ് പിശക്
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,വൃത്താകൃതിയിലുള്ള റഫറൻസ് പിശക്
 DocType: Appointment Type,Is Inpatient,ഇൻപേഷ്യന്റ് ആണ്
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,ഗുഅര്ദിഅന്൧ പേര്
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,നിങ്ങൾ ഡെലിവറി നോട്ട് ലാഭിക്കാൻ ഒരിക്കൽ വാക്കുകൾ (എക്സ്പോർട്ട്) ൽ ദൃശ്യമാകും.
@@ -414,19 +427,18 @@
 DocType: Lead,Industry,വ്യവസായം
 DocType: Employee,Job Profile,ഇയ്യോബ് പ്രൊഫൈൽ
 DocType: BOM Item,Rate & Amount,നിരക്ക് &amp; അളവ്
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,സെറ്റപ്പ്&gt; നമ്പറിംഗ് സീരീസുകൾ വഴി ഹാജരാക്കാനായി സെറ്റപ്പ് നമ്പറുകൾ ക്രമീകരിക്കുക
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,ഇത് ഈ കമ്പനിക്കെതിരെയുള്ള ഇടപാടുകൾ അടിസ്ഥാനമാക്കിയുള്ളതാണ്. വിശദാംശങ്ങൾക്കായി താഴെയുള്ള ടൈംലൈൻ കാണുക
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ഓട്ടോമാറ്റിക് മെറ്റീരിയൽ അഭ്യർത്ഥന സൃഷ്ടിക്ക് ന് ഇമെയിൽ വഴി അറിയിക്കുക
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,ചെറുത്തുനിൽപ്പ്
 DocType: Journal Entry,Multi Currency,മൾട്ടി കറൻസി
 DocType: Payment Reconciliation Invoice,Invoice Type,ഇൻവോയിസ് തരം
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ഉപഭോക്താവ്&gt; കസ്റ്റമർ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,ഡെലിവറി നോട്ട്
 DocType: Consultation,Encounter Impression,എൻകോർട്ട് ഇംപ്രഷൻ
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,നികുതികൾ സജ്ജമാക്കുന്നു
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,വിറ്റത് അസറ്റ് ചെലവ്
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,നിങ്ങൾ അതു കടിച്ചുകീറി ശേഷം പെയ്മെന്റ് എൻട്രി പരിഷ്ക്കരിച്ചു. വീണ്ടും തുടയ്ക്കുക ദയവായി.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} ഇനം നികുതി തവണ പ്രവേശിച്ചപ്പോൾ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,ഈ ആഴ്ച തിർച്ചപ്പെടുത്താത്ത പ്രവർത്തനങ്ങൾക്കായി ചുരുക്കം
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} ഇനം നികുതി തവണ പ്രവേശിച്ചപ്പോൾ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,ഈ ആഴ്ച തിർച്ചപ്പെടുത്താത്ത പ്രവർത്തനങ്ങൾക്കായി ചുരുക്കം
 DocType: Student Applicant,Admitted,പ്രവേശിപ്പിച്ചു
 DocType: Workstation,Rent Cost,രെംട് ചെലവ്
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,മൂല്യത്തകർച്ച ശേഷം തുക
@@ -441,36 +453,35 @@
 DocType: Shipping Rule,Valid for Countries,രാജ്യങ്ങൾ സാധുവായ
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ഈ ഇനം ഒരു ഫലകം ആണ് ഇടപാടുകൾ ഉപയോഗിക്കാവൂ കഴിയില്ല. &#39;നോ പകർത്തുക&#39; വെച്ചിരിക്കുന്നു ചെയ്തിട്ടില്ലെങ്കിൽ ഇനം ആട്റിബ്യൂട്ടുകൾക്ക് വകഭേദങ്ങളും കടന്നുവന്നു പകർത്തുന്നു
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ആകെ ഓർഡർ പരിഗണിക്കും
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","ജീവനക്കാർ പദവിയും (ഉദാ സിഇഒ, ഡയറക്ടർ മുതലായവ)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","ജീവനക്കാർ പദവിയും (ഉദാ സിഇഒ, ഡയറക്ടർ മുതലായവ)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,കസ്റ്റമർ നാണയ ഉപഭോക്താവിന്റെ അടിസ്ഥാന കറൻസി മാറ്റുമ്പോൾ തോത്
 DocType: Course Scheduling Tool,Course Scheduling Tool,കോഴ്സ് സമയംസജ്ജീകരിയ്ക്കുന്നു ടൂൾ
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},വരി # {0}: വാങ്ങൽ ഇൻവോയ്സ് നിലവിലുള്ള അസറ്റ് {1} നേരെ ഉണ്ടാക്കി കഴിയില്ല
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,% S എന്നതിനായുള്ള ആവർത്തിച്ചുള്ള% s സൃഷ്ടിക്കുന്നതിനിടയിൽ [തീർന്നു] പിശക്
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,% S എന്നതിനായുള്ള ആവർത്തിച്ചുള്ള% s സൃഷ്ടിക്കുന്നതിനിടയിൽ [തീർന്നു] പിശക്
 DocType: Item Tax,Tax Rate,നികുതി നിരക്ക്
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ഇതിനകം കാലാവധിയിൽ എംപ്ലോയിസ് {1} അനുവദിച്ചിട്ടുണ്ട് {2} {3} വരെ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,ഇനം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,ഇനം തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,വാങ്ങൽ ഇൻവോയിസ് {0} ഇതിനകം സമർപ്പിച്ചു ആണ്
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},വരി # {0}: ബാച്ച് ഇല്ല {1} {2} അതേ ആയിരിക്കണം
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,നോൺ-ഗ്രൂപ്പ് പരിവർത്തനം
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,ഒരു ഇനത്തിന്റെ ബാച്ച് (ചീട്ടു).
 DocType: C-Form Invoice Detail,Invoice Date,രസീത് തീയതി
 DocType: GL Entry,Debit Amount,ഡെബിറ്റ് തുക
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},മാത്രം {0} {1} കമ്പനി 1 അക്കൗണ്ട് ഉണ്ട് ആകാം
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,അറ്റാച്ച്മെന്റ് ദയവായി
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},മാത്രം {0} {1} കമ്പനി 1 അക്കൗണ്ട് ഉണ്ട് ആകാം
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,അറ്റാച്ച്മെന്റ് ദയവായി
 DocType: Purchase Order,% Received,% ലഭിച്ചു
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,വിദ്യാർത്ഥി ഗ്രൂപ്പുകൾ സൃഷ്ടിക്കുക
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,ഇതിനകം പൂർത്തിയാക്കുക സെറ്റപ്പ് !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,ഇതിനകം പൂർത്തിയാക്കുക സെറ്റപ്പ് !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,ക്രെഡിറ്റ് നോട്ട് തുക
 DocType: Setup Progress Action,Action Document,പ്രവർത്തന പ്രമാണം
 ,Finished Goods,ഫിനിഷ്ഡ് സാധനങ്ങളുടെ
 DocType: Delivery Note,Instructions,നിർദ്ദേശങ്ങൾ
 DocType: Quality Inspection,Inspected By,പരിശോധിച്ചത്
 DocType: Maintenance Visit,Maintenance Type,മെയിൻറനൻസ് തരം
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} കോഴ്സ് {2} എൻറോൾ ചെയ്തിട്ടില്ല
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,ഇനം കോഡ്&gt; ഇനം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} കോഴ്സ് {2} എൻറോൾ ചെയ്തിട്ടില്ല
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},സീരിയൽ ഇല്ല {0} ഡെലിവറി നോട്ട് {1} സ്വന്തമല്ല
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext ഡെമോ
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,ഇനങ്ങൾ ചേർക്കുക
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,ഇനങ്ങൾ ചേർക്കുക
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,ഇനം ക്വാളിറ്റി പരിശോധന പാരാമീറ്റർ
 DocType: Leave Application,Leave Approver Name,Approver പേര് വിടുക
 DocType: Depreciation Schedule,Schedule Date,ഷെഡ്യൂൾ തീയതി
@@ -492,7 +503,7 @@
 DocType: Salary Slip Timesheet,Working Hours,ജോലിചെയ്യുന്ന സമയം
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,നിലവിലുള്ള ഒരു പരമ്പരയിലെ തുടങ്ങുന്ന / നിലവിലെ ക്രമസംഖ്യ മാറ്റുക.
 DocType: Dosage Strength,Strength,ശക്തി
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,ഒരു പുതിയ കസ്റ്റമർ സൃഷ്ടിക്കുക
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,ഒരു പുതിയ കസ്റ്റമർ സൃഷ്ടിക്കുക
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","ഒന്നിലധികം പ്രൈസിങ് നിയമങ്ങൾ വിജയം തുടരുകയാണെങ്കിൽ, ഉപയോക്താക്കൾക്ക് വൈരുദ്ധ്യം പരിഹരിക്കാൻ മാനുവലായി മുൻഗണന സജ്ജീകരിക്കാൻ ആവശ്യപ്പെട്ടു."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,വാങ്ങൽ ഓർഡറുകൾ സൃഷ്ടിക്കുക
 ,Purchase Register,രജിസ്റ്റർ വാങ്ങുക
@@ -511,7 +522,7 @@
 DocType: Lab Test Template,Single,സിംഗിൾ
 DocType: Salary Slip,Total Loan Repayment,ആകെ വായ്പ തിരിച്ചടവ്
 DocType: Account,Cost of Goods Sold,വിറ്റ സാധനങ്ങളുടെ വില
-DocType: Purchase Invoice,Yearly,വാർഷികം
+DocType: Subscription,Yearly,വാർഷികം
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,കോസ്റ്റ് കേന്ദ്രം നൽകുക
 DocType: Drug Prescription,Dosage,മരുന്നിന്റെ
 DocType: Journal Entry Account,Sales Order,വിൽപ്പന ഓർഡർ
@@ -542,7 +553,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,എല്ലാ നിർമാണ പ്രക്രിയകൾ വേണ്ടി ആഗോള ക്രമീകരണങ്ങൾ.
 DocType: Accounts Settings,Accounts Frozen Upto,ശീതീകരിച്ച വരെ അക്കൗണ്ടുകൾ
 DocType: SMS Log,Sent On,ദിവസം അയച്ചു
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,ഗുണ {0} വിശേഷണങ്ങൾ പട്ടിക ഒന്നിലധികം തവണ തെരഞ്ഞെടുത്തു
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,ഗുണ {0} വിശേഷണങ്ങൾ പട്ടിക ഒന്നിലധികം തവണ തെരഞ്ഞെടുത്തു
 DocType: HR Settings,Employee record is created using selected field. ,ജീവനക്കാർ റെക്കോർഡ് തിരഞ്ഞെടുത്ത ഫീൽഡ് ഉപയോഗിച്ച് സൃഷ്ടിക്കപ്പെട്ടിരിക്കുന്നത്.
 DocType: Sales Order,Not Applicable,ബാധകമല്ല
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,ഹോളിഡേ മാസ്റ്റർ.
@@ -568,13 +579,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,അനുവദിച്ച മൊത്തം ഇലകൾ നിർബന്ധമായും
 DocType: Patient,AB Positive,AB പോസിറ്റീവ്
 DocType: Job Opening,Description of a Job Opening,ഒരു ഇയ്യോബ് തുറക്കുന്നു വിവരണം
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,ഇന്ന് അവശേഷിക്കുന്ന പ്രവർത്തനങ്ങൾ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,ഇന്ന് അവശേഷിക്കുന്ന പ്രവർത്തനങ്ങൾ
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,ഹാജർ റെക്കോഡ്.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet അടിസ്ഥാനമാക്കിയുള്ള പേറോളിന് ശമ്പളം ഘടകം.
 DocType: Sales Order Item,Used for Production Plan,പ്രൊഡക്ഷൻ പ്ലാൻ ഉപയോഗിച്ച
 DocType: Employee Loan,Total Payment,ആകെ പേയ്മെന്റ്
 DocType: Manufacturing Settings,Time Between Operations (in mins),(മിനിറ്റ്) ഓപ്പറേഷൻസ് നുമിടയിൽ സമയം
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,അങ്ങനെ നടപടി പൂർത്തിയാക്കാൻ കഴിയില്ല {1} {0} റദ്ദാക്കി
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,അങ്ങനെ നടപടി പൂർത്തിയാക്കാൻ കഴിയില്ല {1} {0} റദ്ദാക്കി
 DocType: Customer,Buyer of Goods and Services.,ചരക്കും സേവനങ്ങളും വാങ്ങുന്നയാൾ.
 DocType: Journal Entry,Accounts Payable,നൽകാനുള്ള പണം
 DocType: Patient,Allergies,അലർജികൾ
@@ -586,23 +597,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,വാങ്ങൽ ഓർഡറുകൾക്ക് മുന്നറിയിപ്പ് നൽകുക
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,"നിങ്ങളുടെ ഉപഭോക്താക്കൾ ഏതാനും കാണിയ്ക്കുക. അവർ സംഘടനകൾ, വ്യക്തികളുടെ ആകാം."
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,ബിൽഡ് മതിയായ ഭാഗങ്ങൾ
+DocType: POS Profile User,POS Profile User,POS പ്രൊഫൈൽ ഉപയോക്താവ്
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,നേരിട്ടുള്ള ആദായ
 DocType: Patient Appointment,Date TIme,തീയതി സമയം
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","അക്കൗണ്ട് ഭൂഖണ്ടക്രമത്തിൽ, അക്കൗണ്ട് അടിസ്ഥാനമാക്കി ഫിൽട്ടർ ചെയ്യാൻ കഴിയില്ല"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,അഡ്മിനിസ്ട്രേറ്റീവ് ഓഫീസർ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,കോഴ്സ് തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,കോഴ്സ് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,കോഴ്സ് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,കോഴ്സ് തിരഞ്ഞെടുക്കുക
 DocType: Codification Table,Codification Table,Codification പട്ടിക
 DocType: Timesheet Detail,Hrs,hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,കമ്പനി തിരഞ്ഞെടുക്കുക
 DocType: Stock Entry Detail,Difference Account,വ്യത്യാസം അക്കൗണ്ട്
 DocType: Purchase Invoice,Supplier GSTIN,വിതരണക്കാരൻ ഗ്സ്തിന്
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,അതിന്റെ ചുമതല {0} ക്ലോസ്ഡ് അല്ല അടുത്തുവരെ കാര്യമല്ല Can.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,സംഭരണശാല മെറ്റീരിയൽ അഭ്യർത്ഥന ഉയർത്തുകയും ചെയ്യുന്ന വേണ്ടി നൽകുക
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,അതിന്റെ ചുമതല {0} ക്ലോസ്ഡ് അല്ല അടുത്തുവരെ കാര്യമല്ല Can.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,സംഭരണശാല മെറ്റീരിയൽ അഭ്യർത്ഥന ഉയർത്തുകയും ചെയ്യുന്ന വേണ്ടി നൽകുക
 DocType: Production Order,Additional Operating Cost,അധിക ഓപ്പറേറ്റിംഗ് ചെലവ്
 DocType: Lab Test Template,Lab Routine,ലാബ് റൗണ്ടീൻ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,കോസ്മെറ്റിക്സ്
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","ലയിപ്പിക്കാൻ, താഴെ പറയുന്ന ആണ് ഇരു ഇനങ്ങളുടെ ഒരേ ആയിരിക്കണം"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","ലയിപ്പിക്കാൻ, താഴെ പറയുന്ന ആണ് ഇരു ഇനങ്ങളുടെ ഒരേ ആയിരിക്കണം"
 DocType: Shipping Rule,Net Weight,മൊത്തം ഭാരം
 DocType: Employee,Emergency Phone,എമർജൻസി ഫോൺ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,വാങ്ങാൻ
@@ -613,7 +625,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,ത്രെഷോൾഡ് 0% വേണ്ടി ഗ്രേഡ് define ദയവായി
 DocType: Sales Order,To Deliver,വിടുവിപ്പാൻ
 DocType: Purchase Invoice Item,Item,ഇനം
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,സീരിയൽ യാതൊരു ഇനം ഒരു അംശം കഴിയില്ല
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,ഉയർന്ന സെൻസിറ്റിവിറ്റി
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,സീരിയൽ യാതൊരു ഇനം ഒരു അംശം കഴിയില്ല
 DocType: Journal Entry,Difference (Dr - Cr),വ്യത്യാസം (ഡോ - CR)
 DocType: Account,Profit and Loss,ലാഭവും നഷ്ടവും
 DocType: Patient,Risk Factors,അപകടസാധ്യത ഘടകങ്ങൾ
@@ -622,7 +635,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,മാനേജിംഗ് ചൂടുകാലമാണെന്നത്
 DocType: Vital Signs,Body Temperature,ശരീര താപനില
 DocType: Project,Project will be accessible on the website to these users,പ്രോജക്ട് ഈ ഉപയോക്താക്കൾക്ക് വെബ്സൈറ്റിൽ ആക്സസ്സുചെയ്യാനാവൂ
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,പ്രോജക്റ്റ് തരം നിർവ്വചിക്കുക.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,പ്രോജക്റ്റ് തരം നിർവ്വചിക്കുക.
 DocType: Supplier Scorecard,Weighting Function,തൂക്കമുള്ള പ്രവർത്തനം
 DocType: Physician,OP Consulting Charge,ഒപി കൺസൾട്ടിംഗ് ചാർജ്
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,നിങ്ങളുടെ സജ്ജമാക്കുക
@@ -636,7 +649,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,വർദ്ധന 0 ആയിരിക്കും കഴിയില്ല
 DocType: Production Planning Tool,Material Requirement,മെറ്റീരിയൽ ആവശ്യകതകൾ
 DocType: Company,Delete Company Transactions,കമ്പനി ഇടപാടുകൾ ഇല്ലാതാക്കുക
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,യാതൊരു പരാമർശവുമില്ല ആൻഡ് റഫറൻസ് തീയതി ബാങ്ക് ഇടപാട് നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,യാതൊരു പരാമർശവുമില്ല ആൻഡ് റഫറൻസ് തീയതി ബാങ്ക് ഇടപാട് നിര്ബന്ധമാണ്
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ എഡിറ്റ് നികുതികളും ചുമത്തിയിട്ടുള്ള ചേർക്കുക
 DocType: Payment Entry Reference,Supplier Invoice No,വിതരണക്കമ്പനിയായ ഇൻവോയിസ് ഇല്ല
 DocType: Territory,For reference,പരിഗണനയ്ക്കായി
@@ -644,12 +657,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","അത് സ്റ്റോക്ക് ഇടപാടുകൾ ഉപയോഗിക്കുന്ന പോലെ, {0} സീരിയൽ ഇല്ല ഇല്ലാതാക്കാൻ കഴിയില്ല"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),(CR) അടയ്ക്കുന്നു
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,ഹലോ
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,ഇനം നീക്കുക
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,ഇനം നീക്കുക
 DocType: Serial No,Warranty Period (Days),വാറന്റി പിരീഡ് (ദിവസം)
 DocType: Installation Note Item,Installation Note Item,ഇന്സ്റ്റലേഷന് കുറിപ്പ് ഇനം
 DocType: Production Plan Item,Pending Qty,തീർച്ചപ്പെടുത്തിയിട്ടില്ല Qty
 DocType: Budget,Ignore,അവഗണിക്കുക
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} സജീവമല്ല
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} സജീവമല്ല
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,അച്ചടിക്കുള്ള സെറ്റപ്പ് ചെക്ക് അളവുകൾ
 DocType: Salary Slip,Salary Slip Timesheet,ശമ്പള ജി Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,സബ്-ചുരുങ്ങി വാങ്ങൽ റെസീപ്റ്റ് നിയമപരമായി വിതരണക്കാരൻ വെയർഹൗസ്
@@ -658,7 +671,7 @@
 DocType: Pricing Rule,Sales Partner,സെയിൽസ് പങ്കാളി
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,എല്ലാ വിതരണ സ്റ്റോർകാർഡ്സും.
 DocType: Buying Settings,Purchase Receipt Required,വാങ്ങൽ രസീത് ആവശ്യമാണ്
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,ഓപ്പണിങ് സ്റ്റോക്ക് നൽകിയിട്ടുണ്ടെങ്കിൽ മൂലധനം നിരക്ക് നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,ഓപ്പണിങ് സ്റ്റോക്ക് നൽകിയിട്ടുണ്ടെങ്കിൽ മൂലധനം നിരക്ക് നിര്ബന്ധമാണ്
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,ഇൻവോയിസ് പട്ടികയിൽ കണ്ടെത്തിയില്ല റെക്കോർഡുകൾ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"ആദ്യം കമ്പനി, പാർട്ടി ടൈപ്പ് തിരഞ്ഞെടുക്കുക"
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,ഫിനാൻഷ്യൽ / അക്കൌണ്ടിംഗ് വർഷം.
@@ -695,7 +708,7 @@
 DocType: Quotation,Quotation To,ക്വട്ടേഷൻ ചെയ്യുക
 DocType: Lead,Middle Income,മിഡിൽ ആദായ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),തുറക്കുന്നു (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,നിങ്ങൾ ഇതിനകം മറ്റൊരു UOM കൊണ്ട് ചില ഇടപാട് (ങ്ങൾ) നടത്തിയതിനാലോ ഇനം അളവ് സ്വതവേയുള്ള യൂണിറ്റ് {0} നേരിട്ട് മാറ്റാൻ കഴിയില്ല. നിങ്ങൾ ഒരു വ്യത്യസ്ത സ്വതേ UOM ഉപയോഗിക്കാൻ ഒരു പുതിയ ഇനം സൃഷ്ടിക്കേണ്ടതുണ്ട്.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,നിങ്ങൾ ഇതിനകം മറ്റൊരു UOM കൊണ്ട് ചില ഇടപാട് (ങ്ങൾ) നടത്തിയതിനാലോ ഇനം അളവ് സ്വതവേയുള്ള യൂണിറ്റ് {0} നേരിട്ട് മാറ്റാൻ കഴിയില്ല. നിങ്ങൾ ഒരു വ്യത്യസ്ത സ്വതേ UOM ഉപയോഗിക്കാൻ ഒരു പുതിയ ഇനം സൃഷ്ടിക്കേണ്ടതുണ്ട്.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,പദ്ധതി തുക നെഗറ്റീവ് ആയിരിക്കാൻ കഴിയില്ല
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,കമ്പനി സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,കമ്പനി സജ്ജീകരിക്കുക
@@ -710,6 +723,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,ബാങ്ക് എൻട്രി ഉണ്ടാക്കുവാൻ പേയ്മെന്റ് അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","ഇല, ചെലവിൽ വാദങ്ങളിൽ പേറോളിന് നിയന്ത്രിക്കാൻ ജീവനക്കാരൻ റെക്കോർഡുകൾ സൃഷ്ടിക്കുക"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,കുറിപ്പിന്റെ കാലാവധി
+DocType: Restaurant Reservation,Restaurant Reservation,റെസ്റ്റോറന്റ് റിസർവേഷൻ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Proposal എഴുത്ത്
 DocType: Payment Entry Deduction,Payment Entry Deduction,പേയ്മെന്റ് എൻട്രി കിഴിച്ചുകൊണ്ടു
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,മറ്റൊരു സെയിൽസ് പേഴ്സൺ {0} ഒരേ ജീവനക്കാരന്റെ ഐഡി നിലവിലുണ്ട്
@@ -717,7 +731,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,മാസ്റ്റേഴ്സ്
 DocType: Assessment Plan,Maximum Assessment Score,പരമാവധി അസസ്മെന്റ് സ്കോർ
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,പുതുക്കിയ ബാങ്ക് ഇടപാട് തീയതി
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,സമയം ട്രാക്കിംഗ്
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,സമയം ട്രാക്കിംഗ്
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,ട്രാൻസ്പോർട്ടർ ഡ്യൂപ്ലിക്കേറ്റ്
 DocType: Fiscal Year Company,Fiscal Year Company,ധനകാര്യ വർഷം കമ്പനി
 DocType: Packing Slip Item,DN Detail,ഡിഎൻ വിശദാംശം
@@ -726,8 +740,9 @@
 DocType: Batch,Batch Description,ബാച്ച് വിവരണം
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,സൃഷ്ടിക്കുന്നു വിദ്യാർത്ഥി ഗ്രൂപ്പുകൾ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,സൃഷ്ടിക്കുന്നു വിദ്യാർത്ഥി ഗ്രൂപ്പുകൾ
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.",പേയ്മെന്റ് ഗേറ്റ്വേ അക്കൗണ്ട് സൃഷ്ടിച്ചിട്ടില്ല സ്വമേധയാ ഒരെണ്ണം സൃഷ്ടിക്കുക.
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.",പേയ്മെന്റ് ഗേറ്റ്വേ അക്കൗണ്ട് സൃഷ്ടിച്ചിട്ടില്ല സ്വമേധയാ ഒരെണ്ണം സൃഷ്ടിക്കുക.
 DocType: Supplier Scorecard,Per Year,പ്രതിവർഷം
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,ഈ പരിപാടിയിൽ ഡി.ഇ.ബി പ്രകാരം പ്രവേശനത്തിന് യോഗ്യതയില്ല
 DocType: Sales Invoice,Sales Taxes and Charges,സെയിൽസ് നികുതികളും ചുമത്തിയിട്ടുള്ള
 DocType: Employee,Organization Profile,ഓർഗനൈസേഷൻ പ്രൊഫൈൽ
 DocType: Vital Signs,Height (In Meter),ഉയരം (മീറ്റർ)
@@ -763,7 +778,7 @@
 DocType: Student Batch Name,Batch Name,ബാച്ച് പേര്
 DocType: Fee Validity,Max number of visit,സന്ദർശിക്കുന്ന പരമാവധി എണ്ണം
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet സൃഷ്ടിച്ചത്:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},അടക്കേണ്ട രീതി {0} ൽ സ്ഥിരസ്ഥിതി ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട് സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},അടക്കേണ്ട രീതി {0} ൽ സ്ഥിരസ്ഥിതി ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട് സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,പേരെഴുതുക
 DocType: GST Settings,GST Settings,ചരക്കുസേവന ക്രമീകരണങ്ങൾ
 DocType: Selling Settings,Customer Naming By,ഉപയോക്താക്കൾക്കായി നാമകരണ
@@ -795,16 +810,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ചെലവ് നികുതികളും ചുമത്തിയിട്ടുള്ള റജിസ്റ്റർ
 DocType: Production Order Operation,Actual Start Time,യഥാർത്ഥ ആരംഭിക്കേണ്ട സമയം
 DocType: BOM Operation,Operation Time,ഓപ്പറേഷൻ സമയം
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,തീര്ക്കുക
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,തീര്ക്കുക
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,അടിത്തറ
 DocType: Timesheet,Total Billed Hours,ആകെ ബില്ലുചെയ്യുന്നത് മണിക്കൂർ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,തുക ഓഫാക്കുക എഴുതുക
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,തുക ഓഫാക്കുക എഴുതുക
 DocType: Leave Block List Allow,Allow User,ഉപയോക്താവ് അനുവദിക്കുക
 DocType: Journal Entry,Bill No,ബിൽ ഇല്ല
 DocType: Company,Gain/Loss Account on Asset Disposal,അസറ്റ് തീർപ്പ് ന് ഗെയിൻ / നഷ്ടം അക്കൗണ്ട്
 DocType: Vehicle Log,Service Details,സേവന വിശദാംശങ്ങൾ
 DocType: Vehicle Log,Service Details,സേവന വിശദാംശങ്ങൾ
-DocType: Purchase Invoice,Quarterly,പാദവാർഷികം
+DocType: Subscription,Quarterly,പാദവാർഷികം
 DocType: Lab Test Template,Grouped,ഗ്രൂപ്പുചെയ്തു
 DocType: Selling Settings,Delivery Note Required,ഡെലിവറി നോട്ട് ആവശ്യമാണ്
 DocType: Bank Guarantee,Bank Guarantee Number,ബാങ്ക് ഗ്യാരണ്ടി നമ്പർ
@@ -814,12 +829,12 @@
 DocType: Student Attendance,Student Attendance,വിദ്യാർത്ഥിയുടെ ഹാജർ
 DocType: Sales Invoice Timesheet,Time Sheet,സമയം ഷീറ്റ്
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush അസംസ്കൃത വസ്തുക്കൾ അടിസ്ഥാനത്തിൽ ഓൺ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,ഐറ്റം വിശദാംശങ്ങൾ നൽകുക
 DocType: Interest,Interest,പലിശ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,പ്രീ സെയിൽസ്
 DocType: Purchase Receipt,Other Details,മറ്റ് വിവരങ്ങൾ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,ടെംപ്ലേറ്റ് ടെസ്റ്റ് ചെയ്യുക
+DocType: Restaurant Order Entry Item,Served,സേവിച്ചു
 DocType: Account,Accounts,അക്കൗണ്ടുകൾ
 DocType: Vehicle,Odometer Value (Last),ഓഡോമീറ്റർ മൂല്യം (അവസാനം)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,വിതരണക്കാരൻ സ്കോർകാർഡ് മാനദണ്ഡങ്ങളുടെ ഫലകങ്ങൾ.
@@ -831,12 +846,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,പ്രിവ്യൂ ശമ്പളം ജി
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,അക്കൗണ്ട് {0} ഒന്നിലധികം തവണ നൽകിയിട്ടുണ്ടെന്നും
 DocType: Account,Expenses Included In Valuation,മൂലധനം ഉൾപ്പെടുത്തിയിട്ടുണ്ട് ചിലവുകൾ
-DocType: Hub Settings,Seller City,വില്പനക്കാരന്റെ സിറ്റി
 ,Absent Student Report,നിലവില്ല വിദ്യാർത്ഥി റിപ്പോർട്ട്
 DocType: Email Digest,Next email will be sent on:,അടുത്തത് ഇമെയിൽ ന് അയയ്ക്കും:
 DocType: Offer Letter Term,Offer Letter Term,കത്ത് ടേം ഓഫർ
 DocType: Supplier Scorecard,Per Week,ആഴ്ചയിൽ
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,ഇനം വകഭേദങ്ങളും ഉണ്ട്.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,ഇനം വകഭേദങ്ങളും ഉണ്ട്.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,ആകെ വിദ്യാർത്ഥി
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,ഇനം {0} കാണാനായില്ല
 DocType: Bin,Stock Value,സ്റ്റോക്ക് മൂല്യം
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,പശ്ചാത്തലത്തിൽ ഫീസ് റെക്കോഡുകൾ സൃഷ്ടിക്കും. എന്തെങ്കിലും പിഴവുകളുണ്ടെങ്കിൽ ഷെഡ്യൂളിൽ പിശക് സന്ദേശം പുതുക്കപ്പെടും.
@@ -845,11 +860,13 @@
 DocType: BOM Explosion Item,Qty Consumed Per Unit,യൂണിറ്റിന് ക്ഷയിച്ചിരിക്കുന്നു Qty
 DocType: Serial No,Warranty Expiry Date,വാറന്റി കാലഹരണ തീയതി
 DocType: Material Request Item,Quantity and Warehouse,അളവിലും വെയർഹൗസ്
+DocType: Hub Settings,Unregister,രജിസ്റ്റർ ചെയ്തത് മാറ്റുക
 DocType: Sales Invoice,Commission Rate (%),കമ്മീഷൻ നിരക്ക് (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,പ്രോഗ്രാം തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,പ്രോഗ്രാം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,പ്രോഗ്രാം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,പ്രോഗ്രാം തിരഞ്ഞെടുക്കുക
 DocType: Project,Estimated Cost,കണക്കാക്കിയ ചെലവ്
 DocType: Purchase Order,Link to material requests,ഭൗതിക അഭ്യർത്ഥനകൾ വരെ ലിങ്ക്
+DocType: Hub Settings,Publish,പ്രസിദ്ധീകരിക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,എയറോസ്പേസ്
 DocType: Journal Entry,Credit Card Entry,ക്രെഡിറ്റ് കാർഡ് എൻട്രി
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,അക്കൗണ്ടുകൾ കമ്പനി ആൻഡ്
@@ -860,13 +877,12 @@
 DocType: Selling Settings,Close Opportunity After Days,ദിവസം കഴിഞ്ഞശേഷം അടയ്ക്കുക അവസരം
 ,Reserved,വാര്ത്തയും
 DocType: Purchase Order,Supply Raw Materials,സപ്ലൈ അസംസ്കൃത വസ്തുക്കൾ
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,അടുത്ത ഇൻവോയ്സ് സൃഷ്ടിക്കപ്പെടില്ല തീയതി. സമർപ്പിക്കുക ന് ഉത്പാദിപ്പിക്കപ്പെടുന്നത്.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,നിലവിലെ ആസ്തി
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} ഒരു സ്റ്റോക്ക് ഇനം അല്ല
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',"പരിശീലന ഫീഡ്ബാക്ക്, തുടർന്ന് &#39;പുതിയത്&#39; എന്നിവ ക്ലിക്കുചെയ്ത് പരിശീലനത്തിലേക്ക് നിങ്ങളുടെ ഫീഡ്ബാക്ക് പങ്കിടുക."
 DocType: Mode of Payment Account,Default Account,സ്ഥിര അക്കൗണ്ട്
 DocType: Payment Entry,Received Amount (Company Currency),ലഭിച്ച തുകയുടെ (കമ്പനി കറൻസി)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,അവസരം ലീഡ് നിന്നും ചെയ്താൽ ലീഡ് സജ്ജമാക്കാൻ വേണം
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,അവസരം ലീഡ് നിന്നും ചെയ്താൽ ലീഡ് സജ്ജമാക്കാൻ വേണം
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,പ്രതിവാര അവധി ദിവസം തിരഞ്ഞെടുക്കുക
 DocType: Patient,O Negative,ഹേ ന്യൂക്ലിയർ
 DocType: Production Order Operation,Planned End Time,പ്ലാൻ ചെയ്തു അവസാനിക്കുന്ന സമയം
@@ -882,10 +898,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,എനർജി
 DocType: Opportunity,Opportunity From,നിന്ന് ഓപ്പർച്യൂനിറ്റി
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,പ്രതിമാസ ശമ്പളം പ്രസ്താവന.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,കമ്പനി ചേർക്കുക
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,വരി {0}: {1} ഇനം {2} എന്നതിന് സീരിയൽ നമ്പറുകൾ ആവശ്യമാണ്. നിങ്ങൾ {3} നൽകി.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,വരി {0}: {1} ഇനം {2} എന്നതിന് സീരിയൽ നമ്പറുകൾ ആവശ്യമാണ്. നിങ്ങൾ {3} നൽകി.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,ദയവായി ഒരു പട്ടിക തിരഞ്ഞെടുക്കുക
 DocType: BOM,Website Specifications,വെബ്സൈറ്റ് വ്യതിയാനങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} എന്നത് &#39;സ്വീകർത്താക്കളുടെ&#39; അസാധുവായ ഇമെയിൽ വിലാസമാണ്
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} എന്നത് &#39;സ്വീകർത്താക്കളുടെ&#39; അസാധുവായ ഇമെയിൽ വിലാസമാണ്
 DocType: Special Test Items,Particulars,വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,ആൻറിബയോട്ടിക്.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: {1} തരത്തിലുള്ള {0} നിന്ന്
@@ -893,11 +909,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,വരി {0}: പരിവർത്തന ഫാക്ടർ നിർബന്ധമായും
 DocType: Employee,A+,എ +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","ഒന്നിലധികം വില നിയമങ്ങൾ തിരയാം നിലവിലുള്ളതിനാൽ, മുൻഗണന നൽകിക്കൊണ്ട് വൈരുദ്ധ്യം പരിഹരിക്കുക. വില നിയമങ്ങൾ: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,അത് മറ്റ് BOMs ബന്ധിപ്പിച്ചിരിക്കുന്നതു പോലെ BOM നിർജ്ജീവമാക്കി അല്ലെങ്കിൽ റദ്ദാക്കാൻ കഴിയില്ല
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,അത് മറ്റ് BOMs ബന്ധിപ്പിച്ചിരിക്കുന്നതു പോലെ BOM നിർജ്ജീവമാക്കി അല്ലെങ്കിൽ റദ്ദാക്കാൻ കഴിയില്ല
 DocType: Opportunity,Maintenance,മെയിൻറനൻസ്
 DocType: Item Attribute Value,Item Attribute Value,ഇനത്തിനും മൂല്യം
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,സെയിൽസ് പ്രചാരണങ്ങൾ.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Timesheet നടത്തുക
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Timesheet നടത്തുക
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -935,12 +951,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,ആദ്യം ഇനം നൽകുക
 DocType: Account,Liability,ബാധ്യത
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,അനുവദിക്കപ്പെട്ട തുക വരി {0} ൽ ക്ലെയിം തുക വലുതായിരിക്കണം കഴിയില്ല.
+DocType: Salary Detail,Do not include in total,മൊത്തം ഉൾപ്പെടുത്തരുത്
 DocType: Company,Default Cost of Goods Sold Account,ഗുഡ്സ് സ്വതവേയുള്ള ചെലവ് അക്കൗണ്ട് വിറ്റു
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,വില പട്ടിക തിരഞ്ഞെടുത്തിട്ടില്ല
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,വില പട്ടിക തിരഞ്ഞെടുത്തിട്ടില്ല
 DocType: Employee,Family Background,കുടുംബ പശ്ചാത്തലം
 DocType: Request for Quotation Supplier,Send Email,ഇമെയിൽ അയയ്ക്കുക
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},മുന്നറിയിപ്പ്: അസാധുവായ സഹപത്രങ്ങൾ {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,ഇല്ല അനുമതി
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},മുന്നറിയിപ്പ്: അസാധുവായ സഹപത്രങ്ങൾ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,ഇല്ല അനുമതി
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,ക്വാട്ട് അഭ്യർത്ഥിച്ചു
 DocType: Vital Signs,Heart Rate / Pulse,ഹാർട്ട് റേറ്റ് / പൾസ്
 DocType: Company,Default Bank Account,സ്ഥിരസ്ഥിതി ബാങ്ക് അക്കൗണ്ട്
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","പാർട്ടി അടിസ്ഥാനമാക്കി ഫിൽട്ടർ, ആദ്യം പാർട്ടി ടൈപ്പ് തിരഞ്ഞെടുക്കുക"
@@ -968,12 +986,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ഇനം വരി {IDX}: {doctype} {DOCNAME} മുകളിൽ &#39;{doctype}&#39; പട്ടികയിൽ നിലവിലില്ല
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} ഇതിനകം പൂർത്തിയായി അല്ലെങ്കിൽ റദ്ദാക്കി
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ടാസ്ക്കുകളൊന്നുമില്ല
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ഓട്ടോ ഇൻവോയ്സ് 05, 28 തുടങ്ങിയവ ഉദാ നിർമ്മിക്കപ്പെടും ഏതെല്ലാം മാസത്തിലെ ദിവസം"
 DocType: Item Variant Settings,Copy Fields to Variant,വേരിയന്റിലേക്ക് ഫീൽഡുകൾ പകർത്തുക
 DocType: Asset,Opening Accumulated Depreciation,സൂക്ഷിക്കുന്നത് മൂല്യത്തകർച്ച തുറക്കുന്നു
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,സ്കോർ കുറവോ അല്ലെങ്കിൽ 5 വരെയോ ആയിരിക്കണം
 DocType: Program Enrollment Tool,Program Enrollment Tool,പ്രോഗ്രാം എൻറോൾമെന്റ് ടൂൾ
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,സി-ഫോം റെക്കോർഡുകൾ
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,സി-ഫോം റെക്കോർഡുകൾ
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,കസ്റ്റമർ വിതരണക്കാരൻ
 DocType: Email Digest,Email Digest Settings,ഇമെയിൽ ഡൈജസ്റ്റ് സജ്ജീകരണങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,നിങ്ങളുടെ ബിസിനസ്സ് നന്ദി!
@@ -991,13 +1008,13 @@
 DocType: Request for Quotation Supplier,Quote Status,ക്വോട്ട് നില
 DocType: Maintenance Visit,Completion Status,പൂർത്തീകരണവും അവസ്ഥ
 DocType: HR Settings,Enter retirement age in years,വർഷങ്ങളിൽ വിരമിക്കൽ പ്രായം നൽകുക
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,ടാർജറ്റ് വെയർഹൗസ്
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,വെയർഹൗസ് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,ടാർജറ്റ് വെയർഹൗസ്
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,വെയർഹൗസ് തിരഞ്ഞെടുക്കുക
 DocType: Cheque Print Template,Starting location from left edge,ഇടത് അറ്റം നിന്ന് ലൊക്കേഷൻ ആരംഭിക്കുന്നു
 DocType: Item,Allow over delivery or receipt upto this percent,ഈ ശതമാനം വരെ ഡെലിവറി അല്ലെങ്കിൽ രസീത് മേൽ അനുവദിക്കുക
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,ഇംപോർട്ട് ഹാജർ
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,എല്ലാ ഇനം ഗ്രൂപ്പുകൾ
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,എല്ലാ ഇനം ഗ്രൂപ്പുകൾ
 DocType: Process Payroll,Activity Log,പ്രവർത്തന ലോഗ്
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,അറ്റാദായം / നഷ്ടം
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,യാന്ത്രികമായി ഇടപാടുകളുടെ സമർപ്പിക്കാനുള്ള സന്ദേശം എഴുതുക.
@@ -1009,7 +1026,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,അനുമാനിക്കപ്പെടുന്ന Qty
 DocType: Sales Invoice,Payment Due Date,പെയ്മെന്റ് നിശ്ചിത തീയതിയിൽ
 DocType: Drug Prescription,Interval UOM,ഇടവേള UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,ഇനം വേരിയന്റ് {0} ഇതിനകം അതേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,ഇനം വേരിയന്റ് {0} ഇതിനകം അതേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
+DocType: Item,Hub Publishing Details,ഹബ് പബ്ലിഷിംഗ് വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;തുറക്കുന്നു&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ചെയ്യാനുള്ളത് തുറക്കുക
 DocType: Notification Control,Delivery Note Message,ഡെലിവറി നോട്ട് സന്ദേശം
@@ -1029,10 +1047,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: അസംസ്കൃത വസ്തു പ്രധാന മൂലകമായിരിക്കരുത്
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,വാങ്ങൽ രസീത് ഇനങ്ങൾ പട്ടികയിൽ ആകെ ബാധകമായ നിരക്കുകളും ആകെ നികുതി ചാർജുകളും തുല്യമായിരിക്കണം
 DocType: Sales Team,Incentives,ഇൻസെന്റീവ്സ്
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,ഹബിലേക്ക് രജിസ്റ്റർ ചെയ്യുക
 DocType: SMS Log,Requested Numbers,അഭ്യർത്ഥിച്ചു സംഖ്യാപുസ്തകം
 DocType: Production Planning Tool,Only Obtain Raw Materials,അസംസ്കൃത വസ്തുക്കൾ മാത്രം ലഭ്യമാക്കുക
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,പ്രകടനം വിലയിരുത്തൽ.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","ആയി ഷോപ്പിംഗ് കാർട്ട് പ്രവർത്തനക്ഷമമാക്കി, &#39;ഷോപ്പിംഗ് കാർട്ട് ഉപയോഗിക്കുക&#39; പ്രാപ്തമാക്കുന്നത് എന്നും ഷോപ്പിംഗ് കാർട്ട് കുറഞ്ഞത് ഒരു നികുതി റൂൾ വേണം"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","ആയി ഷോപ്പിംഗ് കാർട്ട് പ്രവർത്തനക്ഷമമാക്കി, &#39;ഷോപ്പിംഗ് കാർട്ട് ഉപയോഗിക്കുക&#39; പ്രാപ്തമാക്കുന്നത് എന്നും ഷോപ്പിംഗ് കാർട്ട് കുറഞ്ഞത് ഒരു നികുതി റൂൾ വേണം"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ഈ ഇൻവോയ്സ് ലെ പുരോഗതി എന്ന കടിച്ചുകീറി വേണം എങ്കിൽ പേയ്മെന്റ് എൻട്രി {0} ഓർഡർ {1} ബന്ധപ്പെടുത്തിയിരിക്കുന്നു, പരിശോധിക്കുക."
 DocType: Sales Invoice Item,Stock Details,സ്റ്റോക്ക് വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,പ്രോജക്ട് മൂല്യം
@@ -1051,12 +1070,14 @@
 DocType: Salary Slip,Working Days,പ്രവർത്തി ദിവസങ്ങൾ
 DocType: Serial No,Incoming Rate,ഇൻകമിംഗ് റേറ്റ്
 DocType: Packing Slip,Gross Weight,ആകെ ഭാരം
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,നിങ്ങൾ ഈ സിസ്റ്റം ക്രമീകരിക്കുന്നതിനായി ചെയ്തിട്ടുളള നിങ്ങളുടെ കമ്പനിയുടെ പേര്.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,ഹബി പ്രവർത്തനക്ഷമമാക്കുക
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,നിങ്ങൾ ഈ സിസ്റ്റം ക്രമീകരിക്കുന്നതിനായി ചെയ്തിട്ടുളള നിങ്ങളുടെ കമ്പനിയുടെ പേര്.
 DocType: HR Settings,Include holidays in Total no. of Working Days,ഇല്ല ആകെ ലെ അവധി ദിവസങ്ങൾ ഉൾപ്പെടുത്തുക. ജോലി നാളുകളിൽ
 DocType: Job Applicant,Hold,പിടിക്കുക
 DocType: Employee,Date of Joining,ചേരുന്നു തീയതി
 DocType: Naming Series,Update Series,അപ്ഡേറ്റ് സീരീസ്
 DocType: Supplier Quotation,Is Subcontracted,Subcontracted മാത്രമാവില്ലല്ലോ
+DocType: Restaurant Table,Minimum Seating,കുറഞ്ഞ സീറ്റിംഗ്
 DocType: Item Attribute,Item Attribute Values,ഇനം ഗുണ മൂല്യങ്ങൾ
 DocType: Examination Result,Examination Result,പരീക്ഷാ ഫലം
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,വാങ്ങൽ രസീത്
@@ -1067,13 +1088,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},ഓപ്പറേഷൻ {1} അടുത്ത {0} ദിവസങ്ങളിൽ സമയം സ്ലോട്ട് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
 DocType: Production Order,Plan material for sub-assemblies,സബ് സമ്മേളനങ്ങൾ പദ്ധതി മെറ്റീരിയൽ
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,സെയിൽസ് പങ്കാളികളും ടെറിട്ടറി
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM ലേക്ക് {0} സജീവ ആയിരിക്കണം
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM ലേക്ക് {0} സജീവ ആയിരിക്കണം
 DocType: Journal Entry,Depreciation Entry,മൂല്യത്തകർച്ച എൻട്രി
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,ആദ്യം ഡോക്യുമെന്റ് തരം തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ഈ മെയിൻറനൻസ് സന്ദർശനം റദ്ദാക്കുന്നതിൽ മുമ്പ് മെറ്റീരിയൽ സന്ദർശനങ്ങൾ {0} റദ്ദാക്കുക
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},സീരിയൽ ഇല്ല {0} ഇനം വരെ {1} സ്വന്തമല്ല
 DocType: Purchase Receipt Item Supplied,Required Qty,ആവശ്യമായ Qty
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,നിലവിലുള്ള ഇടപാടിനെ അബദ്ധങ്ങളും ലെഡ്ജർ പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,നിലവിലുള്ള ഇടപാടിനെ അബദ്ധങ്ങളും ലെഡ്ജർ പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല.
 DocType: Bank Reconciliation,Total Amount,മൊത്തം തുക
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,ഇന്റർനെറ്റ് പ്രസിദ്ധീകരിക്കൽ
 DocType: Prescription Duration,Number,സംഖ്യ
@@ -1084,7 +1105,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,സെയിൽസ് വില പട്ടിക
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","പരിശോധിച്ചാൽ, ഒരു ഉപഭോക്താവ് സൃഷ്ടിക്കും, രോഗിക്ക് മാപ്പ് നൽകും. ഈ കസ്റ്റമർക്കെതിരെ രോഗി ഇൻവോയ്സുകൾ സൃഷ്ടിക്കും. രോഗിയെ സൃഷ്ടിക്കുന്ന സമയത്ത് നിങ്ങൾക്ക് നിലവിലുള്ള കസ്റ്റമർ തിരഞ്ഞെടുക്കാം."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,ഇനങ്ങളുടെ സമന്വയിപ്പിക്കാൻ പ്രസിദ്ധീകരിക്കുക
 DocType: Bank Reconciliation,Account Currency,അക്കൗണ്ട് കറന്സി
 DocType: Lab Test,Sample ID,സാമ്പിൾ ഐഡി
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,കമ്പനിയിൽ അക്കൗണ്ട് ഓഫാക്കുക റൌണ്ട് സൂചിപ്പിക്കുക
@@ -1093,11 +1113,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,ജീവനക്കാർ {0} സജീവമല്ല അല്ലെങ്കിൽ നിലവിലില്ല
 DocType: Fee Structure,Components,ഘടകങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},ദയവായി ഇനം {0} ൽ അസറ്റ് വിഭാഗം നൽകുക
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,ഇനം രൂപഭേദങ്ങൾ {0} നവീകരിച്ചത്
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,ഇനം രൂപഭേദങ്ങൾ {0} നവീകരിച്ചത്
 DocType: Quality Inspection Reading,Reading 6,6 Reading
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,അല്ല {0} കഴിയുമോ {1} {2} നെഗറ്റിവ് കുടിശ്ശിക ഇൻവോയ്സ് ഇല്ലാതെ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","സൃഷ്ടിക്കാൻ. കാലതാമസം നേരിട്ടെങ്കിൽ, നിങ്ങൾക്ക് ഈ മാസം തന്നെ &quot;മാസത്തിലുടനീളം ആവർത്തിക്കുക&quot; എന്ന രീതിയിൽ മാറ്റം വരുത്തണം"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,അല്ല {0} കഴിയുമോ {1} {2} നെഗറ്റിവ് കുടിശ്ശിക ഇൻവോയ്സ് ഇല്ലാതെ
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,വാങ്ങൽ ഇൻവോയിസ് അഡ്വാൻസ്
-DocType: Hub Settings,Sync Now,ഇപ്പോൾ സമന്വയിപ്പിക്കുക
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},വരി {0}: ക്രെഡിറ്റ് എൻട്രി ഒരു {1} ലിങ്കുചെയ്തിരിക്കുന്നതിനാൽ ചെയ്യാൻ കഴിയില്ല
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,ഒരു സാമ്പത്തിക വർഷം ബജറ്റ് നിർവചിക്കുക.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,ഈ മോഡ് തെരഞ്ഞെടുക്കുമ്പോഴും സ്വതേ ബാങ്ക് / ക്യാഷ് അംഗത്വം POS ൽ ഇൻവോയിസ് അപ്ഡേറ്റ് ചെയ്യും.
@@ -1109,13 +1130,13 @@
 DocType: Item,Is Purchase Item,വാങ്ങൽ ഇനം തന്നെയല്ലേ
 DocType: Asset,Purchase Invoice,വാങ്ങൽ ഇൻവോയിസ്
 DocType: Stock Ledger Entry,Voucher Detail No,സാക്ഷപ്പെടുത്തല് വിശദാംശം ഇല്ല
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,പുതിയ സെയിൽസ് ഇൻവോയ്സ്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,പുതിയ സെയിൽസ് ഇൻവോയ്സ്
 DocType: Stock Entry,Total Outgoing Value,ആകെ ഔട്ട്ഗോയിംഗ് മൂല്യം
 DocType: Physician,Appointments,നിയമനങ്ങൾ
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,തീയതിയും അടയ്ക്കുന്ന തീയതി തുറക്കുന്നു ഒരേ സാമ്പത്തിക വർഷത്തിൽ ഉള്ളിൽ ആയിരിക്കണം
 DocType: Lead,Request for Information,വിവരങ്ങൾ അഭ്യർത്ഥന
 ,LeaderBoard,ലീഡർബോർഡ്
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,സമന്വയം ഓഫ്ലൈൻ ഇൻവോയിസുകൾ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,സമന്വയം ഓഫ്ലൈൻ ഇൻവോയിസുകൾ
 DocType: Payment Request,Paid,പണമടച്ചു
 DocType: Program Fee,Program Fee,പ്രോഗ്രാം ഫീസ്
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1134,11 +1155,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,വാങ്ങൽ ഓർഡർ ഇനം
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,പരോക്ഷ ആദായ
 DocType: Student Attendance Tool,Student Attendance Tool,വിദ്യാർത്ഥിയുടെ ഹാജർ ടൂൾ
+DocType: Restaurant Menu,Price List (Auto created),വിലവിവരങ്ങൾ (സ്വയമേവ സൃഷ്ടിച്ചത്)
 DocType: Cheque Print Template,Date Settings,തീയതി ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,ഭിന്നിച്ചു
 ,Company Name,കമ്പനി പേര്
 DocType: SMS Center,Total Message(s),ആകെ സന്ദേശം (ങ്ങൾ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,ട്രാൻസ്ഫർ വേണ്ടി ഇനം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,ട്രാൻസ്ഫർ വേണ്ടി ഇനം തിരഞ്ഞെടുക്കുക
 DocType: Purchase Invoice,Additional Discount Percentage,അധിക കിഴിവും ശതമാനം
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,എല്ലാ സഹായം വീഡിയോ ലിസ്റ്റ് കാണൂ
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ചെക്ക് സൂക്ഷിച്ചത് എവിടെ ബാങ്കിന്റെ അക്കൗണ്ട് തല തിരഞ്ഞെടുക്കുക.
@@ -1156,6 +1178,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,മീറ്റർ
 DocType: Workstation,Electricity Cost,വൈദ്യുതി ചെലവ്
 DocType: HR Settings,Don't send Employee Birthday Reminders,എംപ്ലോയീസ് ജന്മദിന ഓർമ്മക്കുറിപ്പുകൾ അയയ്ക്കരുത്
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,ക്രമീകരണങ്ങൾ സംരക്ഷിക്കുക
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,ഉൽപ്പന്നങ്ങൾ അഭ്യർത്ഥിച്ചു
 DocType: Item,Inspection Criteria,ഇൻസ്പെക്ഷൻ മാനദണ്ഡം
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,ട്രാൻസ്ഫർ
 DocType: BOM Website Item,BOM Website Item,BOM ൽ വെബ്സൈറ്റ് ഇനം
@@ -1173,11 +1197,11 @@
 DocType: Journal Entry,Total Amount in Words,വാക്കുകൾ മൊത്തം തുക
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,ഒരു പിശക് ഉണ്ടായിരുന്നു. ഒന്ന് ഇതെന്നു കാരണം ഫോം രക്ഷിച്ചു ചെയ്തിട്ടില്ല വരാം. പ്രശ്നം നിലനിൽക്കുകയാണെങ്കിൽ support@erpnext.com ബന്ധപ്പെടുക.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,എന്റെ വണ്ടി
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},ഓർഡർ ടൈപ്പ് {0} ഒന്നാണ് ആയിരിക്കണം
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},ഓർഡർ ടൈപ്പ് {0} ഒന്നാണ് ആയിരിക്കണം
 DocType: Lead,Next Contact Date,അടുത്തത് കോൺടാക്റ്റ് തീയതി
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Qty തുറക്കുന്നു
 DocType: Healthcare Settings,Appointment Reminder,അപ്പോയിന്മെന്റ് റിമൈൻഡർ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,ദയവായി തുക മാറ്റത്തിനായി അക്കൗണ്ട് നൽകുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,ദയവായി തുക മാറ്റത്തിനായി അക്കൗണ്ട് നൽകുക
 DocType: Student Batch Name,Student Batch Name,വിദ്യാർത്ഥിയുടെ ബാച്ച് പേര്
 DocType: Consultation,Doctor,ഡോക്ടർ
 DocType: Holiday List,Holiday List Name,ഹോളിഡേ പട്ടിക പേര്
@@ -1185,12 +1209,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,ഷെഡ്യൂൾ കോഴ്സ്
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,സ്റ്റോക്ക് ഓപ്ഷനുകൾ
 DocType: Journal Entry Account,Expense Claim,ചിലവേറിയ ക്ലെയിം
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,നിങ്ങൾക്ക് ശരിക്കും ഈ എന്തുതോന്നുന്നു അസറ്റ് പുനഃസ്ഥാപിക്കാൻ ആഗ്രഹിക്കുന്നുണ്ടോ?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},{0} വേണ്ടി Qty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,നിങ്ങൾക്ക് ശരിക്കും ഈ എന്തുതോന്നുന്നു അസറ്റ് പുനഃസ്ഥാപിക്കാൻ ആഗ്രഹിക്കുന്നുണ്ടോ?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},{0} വേണ്ടി Qty
 DocType: Leave Application,Leave Application,ആപ്ലിക്കേഷൻ വിടുക
 DocType: Patient,Patient Relation,രോഗി ബന്ധം
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,വിഹിതം ടൂൾ വിടുക
+DocType: Item,Hub Category to Publish,പ്രസിദ്ധീകരിക്കുന്നതിനുള്ള ഹബ് വിഭാഗം
 DocType: Leave Block List,Leave Block List Dates,ബ്ലോക്ക് പട്ടിക തീയതി വിടുക
+DocType: Sales Invoice,Billing Address GSTIN,ബില്ലിംഗ് വിലാസം GSTIN
 DocType: Workstation,Net Hour Rate,നെറ്റ് അന്ത്യസമയം റേറ്റ്
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,കോസ്റ്റ് വാങ്ങൽ രസീത് റജിസ്റ്റർ
 DocType: Company,Default Terms,സ്ഥിരസ്ഥിതി നിബന്ധനകൾ
@@ -1200,11 +1226,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},ദയവായി ഒരു {0} വ്യക്തമാക്കുക
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,അളവ് അല്ലെങ്കിൽ മൂല്യം മാറ്റമൊന്നും വരുത്താതെ ഇനങ്ങളെ നീക്കംചെയ്തു.
 DocType: Delivery Note,Delivery To,ഡെലിവറി
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,ഗുണ മേശ നിർബന്ധമാണ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,ഗുണ മേശ നിർബന്ധമാണ്
 DocType: Production Planning Tool,Get Sales Orders,സെയിൽസ് ഉത്തരവുകൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} നെഗറ്റീവ് ആയിരിക്കാൻ കഴിയില്ല
 DocType: Training Event,Self-Study,സ്വയം പഠനം
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,ഡിസ്കൗണ്ട്
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,ഡിസ്കൗണ്ട്
 DocType: Asset,Total Number of Depreciations,Depreciations ആകെ എണ്ണം
 DocType: Sales Invoice Item,Rate With Margin,മാർജിൻ കൂടി നിരക്ക്
 DocType: Sales Invoice Item,Rate With Margin,മാർജിൻ കൂടി നിരക്ക്
@@ -1212,7 +1238,7 @@
 DocType: Task,Urgent,തിടുക്കപ്പെട്ടതായ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},{1} പട്ടികയിലെ വരി {0} ഒരു സാധുതയുള്ള വരി ID വ്യക്തമാക്കുക
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,വേരിയബിനെ കണ്ടെത്താനായില്ല:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,നോർമപ്പിൽ നിന്ന് എഡിറ്റുചെയ്യാൻ ദയവായി ഒരു ഫീൽഡ് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,നോർമപ്പിൽ നിന്ന് എഡിറ്റുചെയ്യാൻ ദയവായി ഒരു ഫീൽഡ് തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,ഡെസ്ക്ടോപ്പ് ലേക്ക് പോയി ERPNext ഉപയോഗിച്ച് തുടങ്ങുക
 DocType: Item,Manufacturer,നിർമ്മാതാവ്
 DocType: Landed Cost Item,Purchase Receipt Item,വാങ്ങൽ രസീത് ഇനം
@@ -1243,8 +1269,8 @@
 DocType: GL Entry,Against,എഗെൻസ്റ്റ്
 DocType: Item,Default Selling Cost Center,സ്ഥിരസ്ഥിതി അതേസമയം ചെലവ് കേന്ദ്രം
 DocType: Sales Partner,Implementation Partner,നടപ്പാക്കൽ പങ്കാളി
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,സിപ്പ് കോഡ്
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},സെയിൽസ് ഓർഡർ {0} {1} ആണ്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,സിപ്പ് കോഡ്
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},സെയിൽസ് ഓർഡർ {0} {1} ആണ്
 DocType: Opportunity,Contact Info,ബന്ധപ്പെടുന്നതിനുള്ള വിവരം
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,സ്റ്റോക്ക് എൻട്രികളിൽ ഉണ്ടാക്കുന്നു
 DocType: Packing Slip,Net Weight UOM,മൊത്തം ഭാരം UOM
@@ -1255,6 +1281,7 @@
 DocType: Holiday List,Get Weekly Off Dates,വീക്കിലി ഓഫാക്കുക നേടുക തീയതി
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,അവസാനിക്കുന്ന തീയതി ആരംഭിക്കുന്ന തീയതി കുറവായിരിക്കണം കഴിയില്ല
 DocType: Sales Person,Select company name first.,ആദ്യം കമ്പനിയുടെ പേര് തിരഞ്ഞെടുക്കുക.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,കുറഞ്ഞതിൽ നിന്ന് ഉയർന്നത്
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ഉദ്ധരണികളും വിതരണക്കാരിൽനിന്നുമാണ് ലഭിച്ചു.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOM മാറ്റി പകരം എല്ലാ BOM- കളിൽ ഏറ്റവും പുതിയ വിലയും പുതുക്കുക
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},{0} ചെയ്യുക | {1} {2}
@@ -1275,7 +1302,7 @@
 DocType: Program Enrollment,Transportation,ഗതാഗതം
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,അസാധുവായ ആട്രിബ്യൂട്ട്
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} സമർപ്പിക്കേണ്ടതാണ്
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},ക്വാണ്ടിറ്റി കുറവോ {0} തുല്യമായിരിക്കണം
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},ക്വാണ്ടിറ്റി കുറവോ {0} തുല്യമായിരിക്കണം
 DocType: SMS Center,Total Characters,ആകെ പ്രതീകങ്ങൾ
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},ഇനം വേണ്ടി BOM ലേക്ക് വയലിൽ {0} BOM തിരഞ്ഞെടുക്കുക
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,സി-ഫോം ഇൻവോയിസ് വിശദാംശം
@@ -1290,7 +1317,7 @@
 ,Ordered Items To Be Billed,ബില്ല് ഉത്തരവിട്ടു ഇനങ്ങൾ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,റേഞ്ച് നിന്നും പരിധി വരെ കുറവ് ഉണ്ട്
 DocType: Global Defaults,Global Defaults,ആഗോള സ്ഥിരസ്ഥിതികൾ
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,പ്രോജക്റ്റ് സഹകരണത്തിന് ക്ഷണം
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,പ്രോജക്റ്റ് സഹകരണത്തിന് ക്ഷണം
 DocType: Salary Slip,Deductions,പൂർണമായും
 DocType: Leave Allocation,LAL/,ലാൽ /
 DocType: Setup Progress Action,Action Name,പ്രവർത്തന നാമം
@@ -1308,13 +1335,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,സെയിൽസ് ഇൻവോയിസ് അഡ്വാൻസ്
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,അഭ്യർത്ഥിക്കാൻ ഒന്നുമില്ല
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},മറ്റൊരു ബജറ്റ് റെക്കോർഡ് &#39;{0}&#39; ഇതിനകം സാമ്പത്തിക വർഷം &#39;{2}&#39; നേരെ {1} നിലവിലുണ്ട് {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&#39;യഥാർത്ഥ ആരംഭ തീയതി&#39; &#39;യഥാർത്ഥ അവസാന തീയതി&#39; വലുതായിരിക്കും കഴിയില്ല
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&#39;യഥാർത്ഥ ആരംഭ തീയതി&#39; &#39;യഥാർത്ഥ അവസാന തീയതി&#39; വലുതായിരിക്കും കഴിയില്ല
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,മാനേജ്മെന്റ്
 DocType: Cheque Print Template,Payer Settings,പണത്തിന് ക്രമീകരണങ്ങൾ
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ഈ വകഭേദം എന്ന ഇനം കോഡ് ചേർക്കപ്പെടുകയും ചെയ്യും. നിങ്ങളുടെ ചുരുക്കെഴുത്ത് &quot;എസ് എം &#39;എന്താണ്, ഐറ്റം കോഡ്&#39; ടി-ഷർട്ട് &#39;ഉദാഹരണത്തിന്, വകഭേദം എന്ന ഐറ്റം കോഡ്&#39; ടി-ഷർട്ട്-എസ് എം&quot; ആയിരിക്കും"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,നിങ്ങൾ ശമ്പളം ജി ലാഭിക്കാൻ ഒരിക്കൽ (വാക്കുകളിൽ) നെറ്റ് വേതനം ദൃശ്യമാകും.
 DocType: Purchase Invoice,Is Return,മടക്കം
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,ജാഗ്രത
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,ജാഗ്രത
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,മടക്ക / ഡെബിറ്റ് നോട്ട്
 DocType: Price List Country,Price List Country,വില പട്ടിക രാജ്യം
 DocType: Item,UOMs,UOMs
@@ -1329,17 +1356,18 @@
 DocType: Account,Balance Sheet,ബാലൻസ് ഷീറ്റ്
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',ഇനം കോഡ് ഉപയോഗിച്ച് ഇനം വേണ്ടി ചെലവ് കേന്ദ്രം &#39;
 DocType: Fee Validity,Valid Till,സാധുവാണ്
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","പേയ്മെന്റ് മോഡ് ക്രമീകരിച്ചിട്ടില്ല. അക്കൗണ്ട് പെയ്മെന്റിന്റെയും മോഡ് അല്ലെങ്കിൽ POS ൽ പ്രൊഫൈൽ വെച്ചിരിക്കുന്ന എന്ന്, പരിശോധിക്കുക."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","പേയ്മെന്റ് മോഡ് ക്രമീകരിച്ചിട്ടില്ല. അക്കൗണ്ട് പെയ്മെന്റിന്റെയും മോഡ് അല്ലെങ്കിൽ POS ൽ പ്രൊഫൈൽ വെച്ചിരിക്കുന്ന എന്ന്, പരിശോധിക്കുക."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,ഒരേ ഇനം ഒന്നിലധികം തവണ നൽകി കഴിയില്ല.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","കൂടുതലായ അക്കൗണ്ടുകൾ ഗ്രൂപ്പ്സ് കീഴിൽ കഴിയും, പക്ഷേ എൻട്രികൾ നോൺ-ഗ്രൂപ്പുകൾ നേരെ കഴിയും"
 DocType: Lead,Lead,ഈയം
 DocType: Email Digest,Payables,Payables
 DocType: Course,Course Intro,കോഴ്സ് ആമുഖം
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,ഓഹരി എൻട്രി {0} സൃഷ്ടിച്ചു
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,സെറ്റപ്പ്&gt; നമ്പറിംഗ് സീരീസുകൾ വഴി ഹാജരാക്കാനായി സെറ്റപ്പ് നമ്പറുകൾ ക്രമീകരിക്കുക
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,ഓഹരി എൻട്രി {0} സൃഷ്ടിച്ചു
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,വരി # {0}: നിരസിച്ചു Qty വാങ്ങൽ പകരമായി പ്രവേശിക്കുവാൻ പാടില്ല
 ,Purchase Order Items To Be Billed,ബില്ല് ക്രമത്തിൽ ഇനങ്ങൾ വാങ്ങുക
 DocType: Purchase Invoice Item,Net Rate,നെറ്റ് റേറ്റ്
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,ഒരു ഉപഭോക്താവിനെ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,ഒരു ഉപഭോക്താവിനെ തിരഞ്ഞെടുക്കുക
 DocType: Purchase Invoice Item,Purchase Invoice Item,വാങ്ങൽ ഇൻവോയിസ് ഇനം
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,ഓഹരി ലെഡ്ജർ എൻട്രികളും ജിഎൽ എൻട്രികൾ തിരഞ്ഞെടുത്ത വാങ്ങൽ വരവ് വേണ്ടി ലൈനില് ചെയ്യുന്നു
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,ഇനം 1
@@ -1360,7 +1388,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},{1} അതേ കൂടെ വരി {0} തനിപ്പകർപ്പെടുക്കുക
 ,Trial Balance,ട്രയൽ ബാലൻസ്
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,സാമ്പത്തിക വർഷത്തെ {0} കണ്ടെത്തിയില്ല
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,എംപ്ലോയീസ് സജ്ജമാക്കുന്നു
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,എംപ്ലോയീസ് സജ്ജമാക്കുന്നു
 DocType: Sales Order,SO-,SO-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,ആദ്യം പ്രിഫിക്സ് തിരഞ്ഞെടുക്കുക
 DocType: Employee,O-,O-
@@ -1372,12 +1400,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,കാണുക ലെഡ്ജർ
 DocType: Grading Scale,Intervals,ഇടവേളകളിൽ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,പഴയവ
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","ഒരു ഇനം ഗ്രൂപ്പ് ഇതേ പേരിലുള്ള നിലവിലുണ്ട്, ഐറ്റം പേര് മാറ്റാനോ ഐറ്റം ഗ്രൂപ്പ് പുനർനാമകരണം ദയവായി"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","ഒരു ഇനം ഗ്രൂപ്പ് ഇതേ പേരിലുള്ള നിലവിലുണ്ട്, ഐറ്റം പേര് മാറ്റാനോ ഐറ്റം ഗ്രൂപ്പ് പുനർനാമകരണം ദയവായി"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,വിദ്യാർത്ഥി മൊബൈൽ നമ്പർ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,ലോകം റെസ്റ്റ്
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,ലോകം റെസ്റ്റ്
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,ഇനം {0} ബാച്ച് പാടില്ല
 ,Budget Variance Report,ബജറ്റ് പൊരുത്തമില്ലായ്മ റിപ്പോർട്ട്
 DocType: Salary Slip,Gross Pay,മൊത്തം വേതനം
+DocType: Item,Is Item from Hub,ഇനം ഹബ് ആണ്
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,വരി {0}: പ്രവർത്തന തരം നിർബന്ധമാണ്.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,പണമടച്ചു ഡിവിഡന്റ്
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,ലെഡ്ജർ എണ്ണുകയും
@@ -1387,7 +1416,7 @@
 DocType: Vehicle Log,Service Detail,സേവന വിശദാംശങ്ങൾ
 DocType: BOM,Item Description,ഇനത്തെ കുറിച്ചുള്ള വിശദീകരണം
 DocType: Student Sibling,Student Sibling,സ്റ്റുഡന്റ് സിബ്ലിംഗ്
-DocType: Purchase Invoice,Is Recurring,ആവർത്തക ചെയ്യുന്നുണ്ടോ
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,പേയ്മെന്റ് മോഡ്
 DocType: Purchase Invoice,Supplied Items,സപ്ലൈ ഇനങ്ങൾ
 DocType: Student,STUD.,തമാശയല്ല.
 DocType: Production Order,Qty To Manufacture,നിർമ്മിക്കാനുള്ള Qty
@@ -1399,6 +1428,7 @@
 ,Student and Guardian Contact Details,സ്റ്റുഡന്റ് മേൽനോട്ടം ബന്ധപ്പെടാനുള്ള വിവരങ്ങൾ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,വരി {0}: വിതരണക്കാരൻ വേണ്ടി {0} ഇമെയിൽ വിലാസം ഇമെയിൽ അയയ്ക്കാൻ ആവശ്യമാണ്
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,താൽക്കാലിക തുറക്കുന്നു
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,ഹബ് കാണുക
 ,Employee Leave Balance,ജീവനക്കാരുടെ അവധി ബാലൻസ്
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},അക്കൗണ്ട് ബാലൻസ് {0} എപ്പോഴും {1} ആയിരിക്കണം
 DocType: Patient Appointment,More Info,കൂടുതൽ വിവരങ്ങൾ
@@ -1418,13 +1448,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,സെയിൽസ് ഓർഡർ {0} സാധുവല്ല
 DocType: Supplier Scorecard,Warn for new Request for Quotations,ഉദ്ധരണികൾക്കുള്ള പുതിയ അഭ്യർത്ഥനയ്ക്കായി മുന്നറിയിപ്പ് നൽകുക
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,വാങ്ങൽ ഓർഡറുകൾ നിങ്ങളുടെ വാങ്ങലുകൾ ന് ആസൂത്രണം ഫോളോ അപ്പ് സഹായിക്കാൻ
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","ക്ഷമിക്കണം, കമ്പനികൾ ലയിപ്പിക്കാൻ കഴിയില്ല"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","ക്ഷമിക്കണം, കമ്പനികൾ ലയിപ്പിക്കാൻ കഴിയില്ല"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,ലാബ് ടെസ്റ്റ് കുറിപ്പുകൾ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",മൊത്തം ഇഷ്യു / ട്രാൻസ്ഫർ അളവ് {0} മെറ്റീരിയൽ അഭ്യർത്ഥനയിൽ {1} \ അഭ്യർത്ഥിച്ച അളവ് {2} ഇനം {3} വേണ്ടി ശ്രേഷ്ഠ പാടില്ല
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,ചെറുകിട
 DocType: Employee,Employee Number,ജീവനക്കാരുടെ നമ്പർ
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},നേരത്തെ ഉപയോഗത്തിലുണ്ട് കേസ് ഇല്ല (കൾ). കേസ് ഇല്ല {0} മുതൽ ശ്രമിക്കുക
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},നേരത്തെ ഉപയോഗത്തിലുണ്ട് കേസ് ഇല്ല (കൾ). കേസ് ഇല്ല {0} മുതൽ ശ്രമിക്കുക
 DocType: Project,% Completed,% പൂർത്തിയാക്കിയത്
 ,Invoiced Amount (Exculsive Tax),Invoiced തുക (Exculsive നികുതി)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,ഇനം 2
@@ -1439,11 +1469,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,പരോക്ഷമായ ചെലവുകൾ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,വരി {0}: Qty നിർബന്ധമായും
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,കൃഷി
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,സമന്വയം മാസ്റ്റർ ഡാറ്റ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,സമന്വയം മാസ്റ്റർ ഡാറ്റ
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,നിങ്ങളുടെ ഉല്പന്നങ്ങൾ അല്ലെങ്കിൽ സേവനങ്ങൾ
 DocType: Special Test Items,Special Test Items,പ്രത്യേക ടെസ്റ്റ് ഇനങ്ങൾ
 DocType: Mode of Payment,Mode of Payment,അടക്കേണ്ട മോഡ്
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,വെബ്സൈറ്റ് ചിത്രം ഒരു പൊതു ഫയൽ അല്ലെങ്കിൽ വെബ്സൈറ്റ് URL ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,വെബ്സൈറ്റ് ചിത്രം ഒരു പൊതു ഫയൽ അല്ലെങ്കിൽ വെബ്സൈറ്റ് URL ആയിരിക്കണം
 DocType: Student Applicant,AP,എ.പി.
 DocType: Purchase Invoice Item,BOM,BOM ൽ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,ഇത് ഒരു റൂട്ട് ഐറ്റം ഗ്രൂപ്പ് ആണ് എഡിറ്റ് ചെയ്യാൻ കഴിയില്ല.
@@ -1451,9 +1481,9 @@
 DocType: Vehicle,Fuel UOM,ഇന്ധന UOM
 DocType: Warehouse,Warehouse Contact Info,വെയർഹൗസ് ബന്ധപ്പെടാനുള്ള വിവരങ്ങളും
 DocType: Payment Entry,Write Off Difference Amount,വ്യത്യാസം തുക എഴുതുക
-DocType: Purchase Invoice,Recurring Type,ആവർത്തക തരം
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: ജീവനക്കാരുടെ ഇമെയിൽ കണ്ടെത്തിയില്ല, ഇവിടെനിന്നു മെയിൽ അയച്ചിട്ടില്ല"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: ജീവനക്കാരുടെ ഇമെയിൽ കണ്ടെത്തിയില്ല, ഇവിടെനിന്നു മെയിൽ അയച്ചിട്ടില്ല"
 DocType: Item,Foreign Trade Details,വിദേശ വ്യാപാര വിവരങ്ങൾ
+,Assessment Plan Status,അസസ്സ്മെന്റ് പ്ലാൻ സ്റ്റാറ്റസ്
 DocType: Email Digest,Annual Income,വാർഷിക വരുമാനം
 DocType: Serial No,Serial No Details,സീരിയൽ വിശദാംശങ്ങളൊന്നും
 DocType: Purchase Invoice Item,Item Tax Rate,ഇനം നിരക്ക്
@@ -1461,15 +1491,14 @@
 DocType: Student Group Student,Group Roll Number,ഗ്രൂപ്പ് റോൾ നമ്പർ
 DocType: Student Group Student,Group Roll Number,ഗ്രൂപ്പ് റോൾ നമ്പർ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} മാത്രം ക്രെഡിറ്റ് അക്കൗണ്ടുകൾ മറ്റൊരു ഡെബിറ്റ് എൻട്രി നേരെ ലിങ്ക്ഡ് കഴിയും
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,എല്ലാ ടാസ്ക് തൂക്കം ആകെ 1. അതനുസരിച്ച് എല്ലാ പദ്ധതി ചുമതലകളുടെ തൂക്കം ക്രമീകരിക്കാൻ വേണം ദയവായി
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,ഡെലിവറി നോട്ട് {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,എല്ലാ ടാസ്ക് തൂക്കം ആകെ 1. അതനുസരിച്ച് എല്ലാ പദ്ധതി ചുമതലകളുടെ തൂക്കം ക്രമീകരിക്കാൻ വേണം ദയവായി
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,ഡെലിവറി നോട്ട് {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,ഇനം {0} ഒരു സബ് കരാറിൽ ഇനം ആയിരിക്കണം
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,ക്യാപ്പിറ്റൽ ഉപകരണങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","പ്രൈസിങ് റൂൾ ആദ്യം ഇനം, ഇനം ഗ്രൂപ്പ് അല്ലെങ്കിൽ ബ്രാൻഡ് ആകാം വയലിലെ &#39;പുരട്ടുക&#39; അടിസ്ഥാനമാക്കി തിരഞ്ഞെടുത്തുവെന്ന്."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,ആദ്യം ഇനം കോഡ് സജ്ജീകരിക്കുക
-DocType: Hub Settings,Seller Website,വില്പനക്കാരന്റെ വെബ്സൈറ്റ്
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,ആദ്യം ഇനം കോഡ് സജ്ജീകരിക്കുക
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,വിൽപ്പന സംഘത്തെ വേണ്ടി ആകെ നീക്കിവച്ചിരുന്നു ശതമാനം 100 ആയിരിക്കണം
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,വിൽപ്പന സംഘത്തെ വേണ്ടി ആകെ നീക്കിവച്ചിരുന്നു ശതമാനം 100 ആയിരിക്കണം
 DocType: Sales Invoice Item,Edit Description,എഡിറ്റ് വിവരണം
 DocType: Antibiotic,Antibiotic,ആൻറിബയോട്ടിക്
 ,Team Updates,ടീം അപ്ഡേറ്റുകൾ
@@ -1490,12 +1519,12 @@
 DocType: Purchase Invoice,Total (Company Currency),ആകെ (കമ്പനി കറൻസി)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,സീരിയൽ നമ്പർ {0} ഒരിക്കൽ അധികം പ്രവേശിച്ചപ്പോൾ
 DocType: Depreciation Schedule,Journal Entry,ജേർണൽ എൻട്രി
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} പുരോഗതിയിലാണ് ഇനങ്ങൾ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} പുരോഗതിയിലാണ് ഇനങ്ങൾ
 DocType: Workstation,Workstation Name,വറ്ക്ക്സ്റ്റേഷൻ പേര്
 DocType: Grading Scale Interval,Grade Code,ഗ്രേഡ് കോഡ്
 DocType: POS Item Group,POS Item Group,POS ഇനം ഗ്രൂപ്പ്
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ഡൈജസ്റ്റ് ഇമെയിൽ:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM ലേക്ക് {0} ഇനം വരെ {1} സ്വന്തമല്ല
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM ലേക്ക് {0} ഇനം വരെ {1} സ്വന്തമല്ല
 DocType: Sales Partner,Target Distribution,ടാർജറ്റ് വിതരണം
 DocType: Salary Slip,Bank Account No.,ബാങ്ക് അക്കൗണ്ട് നമ്പർ
 DocType: Naming Series,This is the number of the last created transaction with this prefix,ഇത് ഈ കൂടിയ അവസാന സൃഷ്ടിച്ച ഇടപാട് എണ്ണം ആണ്
@@ -1512,10 +1541,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,ക്വട്ടേഷൻ വിതരണക്കാരൻ അഭ്യർത്ഥന
 DocType: Healthcare Settings,Registration Message,രജിസ്ട്രേഷൻ സന്ദേശം
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,ഹാര്ഡ്വെയര്
-DocType: Sales Order,Recurring Upto,വരെയും ആവർത്തന
 DocType: Prescription Dosage,Prescription Dosage,കുറിപ്പടി ഡോസേജ്
 DocType: Attendance,HR Manager,എച്ച് മാനേജർ
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,ഒരു കമ്പനി തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,ഒരു കമ്പനി തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,പ്രിവിലേജ് അവധി
 DocType: Purchase Invoice,Supplier Invoice Date,വിതരണക്കാരൻ ഇൻവോയിസ് തീയതി
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,ഓരോ
@@ -1531,10 +1559,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,തമ്മിൽ ഓവർലാപ്പുചെയ്യുന്ന അവസ്ഥ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,ജേർണൽ എൻട്രി {0} എഗെൻസ്റ്റ് ഇതിനകം മറ്റ് ചില വൗച്ചർ നേരെ ക്രമീകരിക്കുന്ന
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,ആകെ ഓർഡർ മൂല്യം
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,ഭക്ഷ്യ
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,ഭക്ഷ്യ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,എയ്ജിങ് ശ്രേണി 3
 DocType: Maintenance Schedule Item,No of Visits,സന്ദർശനങ്ങൾ ഒന്നും
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},മെയിൻറനൻസ് ഷെഡ്യൂൾ {0} നേരെ {1} നിലവിലുണ്ട്
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,നിങ്ങളുടെ ഇനങ്ങൾ ഹബ്ബിൽ പ്രസിദ്ധീകരിക്കാൻ ആഗ്രഹമുണ്ടോ?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,എൻറോൾ വിദ്യാർത്ഥി
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},സമാപന അക്കൗണ്ട് കറൻസി {0} ആയിരിക്കണം
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},എല്ലാ ഗോളുകൾ വേണ്ടി പോയിന്റിന്റെ സം 100 ആയിരിക്കണം അത് {0} ആണ്
@@ -1545,9 +1574,9 @@
 DocType: Authorization Rule,Average Discount,ശരാശരി ഡിസ്ക്കൌണ്ട്
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,യൂട്ടിലിറ്റിക
-DocType: Purchase Invoice Item,Accounting,അക്കൗണ്ടിംഗ്
+DocType: POS Profile,Accounting,അക്കൗണ്ടിംഗ്
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,ബാച്ചുചെയ്ത ഇനം വേണ്ടി ബാച്ചുകൾ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,ബാച്ചുചെയ്ത ഇനം വേണ്ടി ബാച്ചുകൾ തിരഞ്ഞെടുക്കുക
 DocType: Asset,Depreciation Schedules,മൂല്യത്തകർച്ച സമയക്രമം
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,അപേക്ഷാ കാലയളവിൽ പുറത്ത് ലീവ് അലോക്കേഷൻ കാലഘട്ടം ആകാൻ പാടില്ല
 DocType: Activity Cost,Projects,പ്രോജക്റ്റുകൾ
@@ -1563,7 +1592,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',അംഗീകാരം സ്റ്റാറ്റസ് &#39;അംഗീകരിച്ചു&#39; അല്ലെങ്കിൽ &#39;നിഷേധിക്കപ്പെട്ടിട്ടുണ്ട്&#39; വേണം
 DocType: Physician,Contacts and Address,കോൺടാക്റ്റുകളും വിലാസവും
 DocType: Purchase Invoice,Contact Person,സമ്പർക്ക വ്യക്തി
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&#39;പ്രതീക്ഷിച്ച ആരംഭ തീയതി&#39; &#39;പ്രതീക്ഷിച്ച അവസാന തീയതി&#39; വലുതായിരിക്കും കഴിയില്ല
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&#39;പ്രതീക്ഷിച്ച ആരംഭ തീയതി&#39; &#39;പ്രതീക്ഷിച്ച അവസാന തീയതി&#39; വലുതായിരിക്കും കഴിയില്ല
 DocType: Course Scheduling Tool,Course End Date,കോഴ്സ് അവസാന തീയതി
 DocType: Holiday List,Holidays,അവധിദിനങ്ങൾ
 DocType: Sales Order Item,Planned Quantity,ആസൂത്രണം ചെയ്ത ക്വാണ്ടിറ്റി
@@ -1571,10 +1600,11 @@
 DocType: Item,Maintain Stock,സ്റ്റോക്ക് നിലനിറുത്തുക
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,ഇതിനകം പ്രൊഡക്ഷൻ ഓർഡർ സൃഷ്ടിച്ചു സ്റ്റോക്ക് എൻട്രികൾ
 DocType: Employee,Prefered Email,Prefered ഇമെയിൽ
+DocType: Student Admission,Eligibility and Details,യോഗ്യതയും വിശദാംശങ്ങളും
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,സ്ഥിര അസറ്റ് ലെ നെറ്റ് മാറ്റുക
 DocType: Leave Control Panel,Leave blank if considered for all designations,എല്ലാ തരത്തിലുള്ള വേണ്ടി പരിഗണിക്കും എങ്കിൽ ശൂന്യമായിടൂ
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,&#39;യഥാർത്ഥ&#39; തരം ചുമതലയുള്ള വരിയിലെ {0} ഇനം റേറ്റ് ഉൾപ്പെടുത്തിയിട്ടുണ്ട് ചെയ്യാൻ കഴിയില്ല
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},പരമാവധി: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},പരമാവധി: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,തീയതി-ൽ
 DocType: Email Digest,For Company,കമ്പനിക്ക് വേണ്ടി
 apps/erpnext/erpnext/config/support.py +17,Communication log.,കമ്മ്യൂണിക്കേഷൻ രേഖ.
@@ -1582,19 +1612,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,വിതരണക്കാരൻ സ്കോർബോർഡ് സ്കോർ വേരിയബിൾ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,വാങ്ങൽ തുക
 DocType: Sales Invoice,Shipping Address Name,ഷിപ്പിംഗ് വിലാസം പേര്
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,അക്കൗണ്ട്സ് ചാർട്ട്
 DocType: Material Request,Terms and Conditions Content,നിബന്ധനകളും വ്യവസ്ഥകളും ഉള്ളടക്കം
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,100 വലുതായിരിക്കും കഴിയില്ല
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം അല്ല
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം അല്ല
 DocType: Maintenance Visit,Unscheduled,വരണേ
 DocType: Employee,Owned,ഉടമസ്ഥതയിലുള്ളത്
 DocType: Salary Detail,Depends on Leave Without Pay,ശമ്പള പുറത്തുകടക്കാൻ ആശ്രയിച്ചിരിക്കുന്നു
 DocType: Pricing Rule,"Higher the number, higher the priority","ഹയർ സംഖ്യ, ഉയർന്ന മുൻഗണന"
 ,Purchase Invoice Trends,വാങ്ങൽ ഇൻവോയിസ് ട്രെൻഡുകൾ
 DocType: Employee,Better Prospects,മെച്ചപ്പെട്ട സാദ്ധ്യതകളും
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","വരി # {0}: ബാച്ച് {1} മാത്രമേ {2} അളവ് ഉണ്ട്. ഉണ്ട് {3} ലഭ്യമായ അളവ് മറ്റൊരു ബാച്ച് തിരഞ്ഞെടുക്കുക അല്ലെങ്കിൽ ഒന്നിലധികം ബാച്ചുകൾ നിന്ന് / പ്രശ്നം വിടുവിപ്പാൻ, ഒന്നിലധികം വരികൾ കയറി വരി വേർതിരിക്കുക"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","വരി # {0}: ബാച്ച് {1} മാത്രമേ {2} അളവ് ഉണ്ട്. ഉണ്ട് {3} ലഭ്യമായ അളവ് മറ്റൊരു ബാച്ച് തിരഞ്ഞെടുക്കുക അല്ലെങ്കിൽ ഒന്നിലധികം ബാച്ചുകൾ നിന്ന് / പ്രശ്നം വിടുവിപ്പാൻ, ഒന്നിലധികം വരികൾ കയറി വരി വേർതിരിക്കുക"
 DocType: Vehicle,License Plate,ലൈസൻസ് പ്ലേറ്റ്
 DocType: Appraisal,Goals,ലക്ഷ്യങ്ങൾ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,POS പ്രൊഫൈൽ തിരഞ്ഞെടുക്കുക
 DocType: Warranty Claim,Warranty / AMC Status,വാറന്റി / എഎംസി അവസ്ഥ
 ,Accounts Browser,അക്കൗണ്ടുകൾ ബ്രൗസർ
 DocType: Payment Entry Reference,Payment Entry Reference,പേയ്മെന്റ് എൻട്രി റഫറൻസ്
@@ -1612,7 +1642,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,ജീവനക്കാർ തനിക്കായി റിപ്പോർട്ട് ചെയ്യാൻ കഴിയില്ല.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","അക്കൗണ്ട് മരവിപ്പിച്ചു എങ്കിൽ, എൻട്രികൾ നിയന്ത്രിത ഉപയോക്താക്കൾക്ക് അനുവദിച്ചിരിക്കുന്ന."
 DocType: Email Digest,Bank Balance,ബാങ്ക് ബാലൻസ്
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} വേണ്ടി അക്കൗണ്ടിംഗ് എൻട്രി: {1} മാത്രം കറൻസി കഴിയും: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} വേണ്ടി അക്കൗണ്ടിംഗ് എൻട്രി: {1} മാത്രം കറൻസി കഴിയും: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","ഇയ്യോബ് പ്രൊഫൈൽ, യോഗ്യത തുടങ്ങിയവ ആവശ്യമാണ്"
 DocType: Journal Entry Account,Account Balance,അക്കൗണ്ട് ബാലൻസ്
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,ഇടപാടുകൾക്ക് നികുതി റൂൾ.
@@ -1621,8 +1651,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),ആകെ നികുതി ചാർജുകളും (കമ്പനി കറൻസി)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,അടയ്ക്കാത്ത സാമ്പത്തിക വർഷത്തെ പി &amp; എൽ തുലാസിൽ കാണിക്കുക
 DocType: Lab Test Template,Collection Details,ശേഖരത്തിന്റെ വിശദാംശങ്ങൾ
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date ടാബ് നിന്നുള്ള ഉപവിഭാഗം ct, `tabLab പ്രിസ്ക്രിപ്ഷൻ` cp ഇവിടെ ct.patient = &#39;{0}&#39; ഉം cp.parent = ct ഉം തിരഞ്ഞെടുക്കുക. പേര്, cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,ഷിപ്പിംഗ് അക്കൗണ്ട്
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: അക്കൗണ്ട് {2} സജ്ജമല്ല
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,നിങ്ങളുടെ പ്രവൃത്തി പദ്ധതിയും സഹായിക്കാൻ ഓൺ സമയം വിടുവിപ്പാൻ സെയിൽസ് ഓർഡറുകൾ നടത്തുക
@@ -1639,7 +1667,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,പാക്കിംഗ് സ്ലിപ്പ്
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,ഓഫീസ് രെംട്
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,സെറ്റപ്പ് എസ്എംഎസ് ഗേറ്റ്വേ ക്രമീകരണങ്ങൾ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,ഇംപോർട്ട് പരാജയപ്പെട്ടു!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,ഇംപോർട്ട് പരാജയപ്പെട്ടു!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,ഇല്ല വിലാസം ഇതുവരെ ചേർത്തു.
 DocType: Workstation Working Hour,Workstation Working Hour,വർക്ക്സ്റ്റേഷൻ ജോലി അന്ത്യസമയം
 DocType: Vital Signs,Blood Pressure,രക്തസമ്മര്ദ്ദം
@@ -1664,7 +1692,7 @@
 DocType: Sales Invoice,Source,ഉറവിടം
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,അടച്ചു കാണിക്കുക
 DocType: Leave Type,Is Leave Without Pay,ശമ്പള ഇല്ലാതെ തന്നെ തന്നു
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,അസറ്റ് വിഭാഗം ഫിക്സ്ഡ് അസറ്റ് ഇനം നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,അസറ്റ് വിഭാഗം ഫിക്സ്ഡ് അസറ്റ് ഇനം നിര്ബന്ധമാണ്
 DocType: Fee Validity,Fee Validity,ഫീസ് സാധുത
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,പേയ്മെന്റ് പട്ടികയിൽ കണ്ടെത്തിയില്ല റെക്കോർഡുകൾ
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},ഈ {0} {2} {3} ഉപയോഗിച്ച് {1} വൈരുദ്ധ്യങ്ങൾ
@@ -1685,8 +1713,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,എക്സിക്യൂട്ടീവ് തിരച്ചിൽ
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,വിജയസാധ്യതയുള്ളത് സൃഷ്ടിക്കുക
 DocType: Maintenance Schedule,Schedules,സമയക്രമങ്ങൾ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,Point-of-Sale ഉപയോഗിക്കുന്നതിന് POS പ്രൊഫൈൽ ആവശ്യമാണ്
 DocType: Purchase Invoice Item,Net Amount,ആകെ തുക
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} അങ്ങനെ നടപടി പൂർത്തിയാക്കാൻ കഴിയില്ല സമർപ്പിച്ചിട്ടില്ല
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} അങ്ങനെ നടപടി പൂർത്തിയാക്കാൻ കഴിയില്ല സമർപ്പിച്ചിട്ടില്ല
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM വിശദാംശം ഇല്ല
 DocType: Landed Cost Voucher,Additional Charges,അധിക ചാര്ജ്
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),അഡീഷണൽ കിഴിവ് തുക (കമ്പനി കറൻസി)
@@ -1717,8 +1746,8 @@
 DocType: Patient,Tobacco Past Use,പുകവലിയ Past ഉപയോഗം
 DocType: Sales Invoice Item,Brand Name,ബ്രാൻഡ് പേര്
 DocType: Purchase Receipt,Transporter Details,ട്രാൻസ്പോർട്ടർ വിശദാംശങ്ങൾ
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},ഉപയോക്താവ് {0} ഇതിനകം ഫിസിഷ്യൻ {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,സ്വതേ വെയർഹൗസ് തിരഞ്ഞെടുത്ത ഇനം ആവശ്യമാണ്
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},ഉപയോക്താവ് {0} ഇതിനകം ഫിസിഷ്യൻ {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,സ്വതേ വെയർഹൗസ് തിരഞ്ഞെടുത്ത ഇനം ആവശ്യമാണ്
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,ബോക്സ്
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,സാധ്യമായ വിതരണക്കാരൻ
 DocType: Budget,Monthly Distribution,പ്രതിമാസ വിതരണം
@@ -1728,8 +1757,8 @@
 DocType: Sales Partner,Sales Partner Target,സെയിൽസ് പങ്കാളി ടാർജറ്റ്
 DocType: Loan Type,Maximum Loan Amount,പരമാവധി വായ്പാ തുക
 DocType: Pricing Rule,Pricing Rule,പ്രൈസിങ് റൂൾ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},വിദ്യാർത്ഥി {0} എന്ന റോൾ നമ്പർ തനിപ്പകർപ്പ്
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},വിദ്യാർത്ഥി {0} എന്ന റോൾ നമ്പർ തനിപ്പകർപ്പ്
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},വിദ്യാർത്ഥി {0} എന്ന റോൾ നമ്പർ തനിപ്പകർപ്പ്
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},വിദ്യാർത്ഥി {0} എന്ന റോൾ നമ്പർ തനിപ്പകർപ്പ്
 DocType: Budget,Action if Annual Budget Exceeded,ആക്ഷൻ വാർഷിക ബജറ്റ് കവിഞ്ഞു എങ്കിൽ
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,ഓർഡർ വാങ്ങാൻ മെറ്റീരിയൽ അഭ്യർത്ഥന
 DocType: Shopping Cart Settings,Payment Success URL,പേയ്മെന്റ് വിജയം യുആർഎൽ
@@ -1746,7 +1775,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} ഒരിക്കൽ മാത്രമേ ദൃശ്യമാകും വേണം
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},വാങ്ങൽ ഓർഡർ {2} നേരെ {1} അധികം {0} കൂടുതൽ കൈമാറണോ അനുവദിച്ചിട്ടില്ല
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},{0} വിജയകരമായി നീക്കിവച്ചിരുന്നു ഇലകൾ
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,പാക്ക് ഇനങ്ങൾ ഇല്ല
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,പാക്ക് ഇനങ്ങൾ ഇല്ല
 DocType: Shipping Rule Condition,From Value,മൂല്യം നിന്നും
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,ണം ക്വാണ്ടിറ്റി നിർബന്ധമാണ്
 DocType: Employee Loan,Repayment Method,തിരിച്ചടവ് രീതി
@@ -1760,6 +1789,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,സ്റ്റോക്ക് ബാദ്ധ്യതകളും
 DocType: Purchase Invoice,Supplier Warehouse,വിതരണക്കാരൻ വെയർഹൗസ്
 DocType: Opportunity,Contact Mobile No,മൊബൈൽ ഇല്ല ബന്ധപ്പെടുക
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,കമ്പനി തിരഞ്ഞെടുക്കുക
 ,Material Requests for which Supplier Quotations are not created,വിതരണക്കാരൻ ഉദ്ധരണികളും സൃഷ്ടിച്ചിട്ടില്ല ചെയ്തിട്ടുളള മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ
 DocType: Student Group,Set 0 for no limit,പരിധികൾ 0 സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,നിങ്ങൾ അനുവാദം അപേക്ഷിക്കുന്ന ചെയ്തിട്ടുള്ള ദിവസം (ങ്ങൾ) വിശേഷദിവസങ്ങൾ ആകുന്നു. നിങ്ങൾ അനുവാദം അപേക്ഷ നല്കേണ്ടതില്ല.
@@ -1769,24 +1799,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,ക്വട്ടേഷൻ നിർമ്മിക്കുക
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,മറ്റ് റിപ്പോർട്ടുകളിൽ
 DocType: Dependent Task,Dependent Task,ആശ്രിത ടാസ്ക്
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},അളവു സ്വതവേയുള്ള യൂണിറ്റ് വേണ്ടി പരിവർത്തന ഘടകം വരി 1 {0} ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},അളവു സ്വതവേയുള്ള യൂണിറ്റ് വേണ്ടി പരിവർത്തന ഘടകം വരി 1 {0} ആയിരിക്കണം
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},{0} ഇനി {1} അധികം ആകാൻ പാടില്ല തരത്തിലുള്ള വിടുക
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,മുൻകൂട്ടി എക്സ് ദിവസം വേണ്ടി ഓപ്പറേഷൻസ് ആസൂത്രണം ശ്രമിക്കുക.
 DocType: HR Settings,Stop Birthday Reminders,ജന്മദിന ഓർമ്മക്കുറിപ്പുകൾ നിർത്തുക
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},കമ്പനി {0} ൽ സ്ഥിര ശമ്പളപ്പട്ടിക പേയബിൾ അക്കൗണ്ട് സജ്ജീകരിക്കുക
 DocType: SMS Center,Receiver List,റിസീവർ പട്ടിക
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,തിരയൽ ഇനം
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,തിരയൽ ഇനം
 DocType: Patient Appointment,Referring Physician,ഫിസിഷ്യനെ പരാമർശിക്കുന്നു
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ക്ഷയിച്ചിരിക്കുന്നു തുക
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,പണമായി നെറ്റ് മാറ്റുക
 DocType: Assessment Plan,Grading Scale,ഗ്രേഡിംഗ് സ്കെയിൽ
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,മെഷർ {0} യൂണിറ്റ് ഒരിക്കൽ പരിവർത്തന ഫാക്ടർ പട്ടികയിലെ അധികം നൽകി
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,ഇതിനകം പൂർത്തിയായ
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,മെഷർ {0} യൂണിറ്റ് ഒരിക്കൽ പരിവർത്തന ഫാക്ടർ പട്ടികയിലെ അധികം നൽകി
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,ഇതിനകം പൂർത്തിയായ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,കയ്യിൽ ഓഹരി
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},പേയ്മെന്റ് അഭ്യർത്ഥന ഇതിനകം {0} നിലവിലുണ്ട്
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ഇഷ്യൂ ഇനങ്ങൾ ചെലവ്
 DocType: Physician,Hospital,ആശുപത്രി
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},ക്വാണ്ടിറ്റി {0} അധികം പാടില്ല
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},ക്വാണ്ടിറ്റി {0} അധികം പാടില്ല
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,കഴിഞ്ഞ സാമ്പത്തിക വർഷം അടച്ചിട്ടില്ല
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),പ്രായം (ദിവസം)
 DocType: Quotation Item,Quotation Item,ക്വട്ടേഷൻ ഇനം
@@ -1797,8 +1827,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,വിതരണക്കമ്പനിയായ തരം മാസ്റ്റർ.
 DocType: Purchase Order Item,Supplier Part Number,വിതരണക്കമ്പനിയായ ഭാഗം നമ്പർ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,പരിവർത്തന നിരക്ക് 0 അല്ലെങ്കിൽ 1 കഴിയില്ല
-DocType: Sales Invoice,Reference Document,റെഫറൻസ് പ്രമാണം
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} റദ്ദാക്കി അല്ലെങ്കിൽ നിറുത്തി
+DocType: Subscription,Reference Document,റെഫറൻസ് പ്രമാണം
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} റദ്ദാക്കി അല്ലെങ്കിൽ നിറുത്തി
 DocType: Accounts Settings,Credit Controller,ക്രെഡിറ്റ് കൺട്രോളർ
 DocType: Delivery Note,Vehicle Dispatch Date,വാഹന ഡിസ്പാച്ച് തീയതി
 DocType: Healthcare Settings,Default Medical Code Standard,സ്ഥിരസ്ഥിതി മെഡിക്കൽ കോഡ് സ്റ്റാൻഡേർഡ്
@@ -1807,6 +1837,7 @@
 DocType: Company,Default Payable Account,സ്ഥിരസ്ഥിതി അടയ്ക്കേണ്ട അക്കൗണ്ട്
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","മുതലായ ഷിപ്പിംഗ് നിയമങ്ങൾ, വില ലിസ്റ്റ് പോലെ ഓൺലൈൻ ഷോപ്പിംഗ് കാർട്ട് ക്രമീകരണങ്ങൾ"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,ഈടാക്കൂ {0}%
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,വില പ്രകാരം അടുക്കുക ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,നിക്ഷിപ്തം Qty
 DocType: Party Account,Party Account,പാർട്ടി അക്കൗണ്ട്
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,ഹ്യൂമൻ റിസോഴ്സസ്
@@ -1818,13 +1849,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,ചിലവ് എൻട്രി നടത്തുക
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,വരി {0}: വിതരണക്കാരൻ നേരെ അഡ്വാൻസ് ഡെബിറ്റ് വേണം
 DocType: Company,Default Values,സ്ഥിരസ്ഥിതി മൂല്യങ്ങൾ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{ആവൃത്തി} ഡൈജസ്റ്റ്
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{ആവൃത്തി} ഡൈജസ്റ്റ്
 DocType: Expense Claim,Total Amount Reimbursed,ആകെ തുക Reimbursed
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,ഇത് ഈ വാഹനം നേരെ രേഖകൾ അടിസ്ഥാനമാക്കിയുള്ളതാണ്. വിശദാംശങ്ങൾക്ക് ടൈംലൈൻ കാണുക
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},വിതരണക്കാരൻ ഇൻവോയിസ് {0} എഗെൻസ്റ്റ് {1} dated
 DocType: Customer,Default Price List,സ്ഥിരസ്ഥിതി വില പട്ടിക
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,അസറ്റ് മൂവ്മെന്റ് റെക്കോർഡ് {0} സൃഷ്ടിച്ചു
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,നിങ്ങൾ സാമ്പത്തിക വർഷത്തെ {0} ഇല്ലാതാക്കാൻ കഴിയില്ല. സാമ്പത്തിക വർഷത്തെ {0} ആഗോള ക്രമീകരണങ്ങൾ സ്വതവേ സജ്ജീകരിച്ച
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,സമാന പേരിലുള്ള ഒരു ഉപയോക്താവ് ഇതിനകം നിലവിലുണ്ട്
 DocType: Journal Entry,Entry Type,എൻട്രി തരം
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,ഈ വിലയിരുത്തൽ ഗ്രൂപ്പുമായി ലിങ്ക്ഡ് ഇല്ല വിലയിരുത്തൽ പദ്ധതി
 ,Customer Credit Balance,കസ്റ്റമർ ക്രെഡിറ്റ് ബാലൻസ്
@@ -1835,7 +1867,7 @@
 DocType: Quotation,Term Details,ടേം വിശദാംശങ്ങൾ
 DocType: Project,Total Sales Cost (via Sales Order),ആകെ സെയിൽസ് ചെലവ് (സെയിൽസ് ഓർഡർ വഴി)
 DocType: Project,Total Sales Cost (via Sales Order),ആകെ സെയിൽസ് ചെലവ് (സെയിൽസ് ഓർഡർ വഴി)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,{0} ഈ വിദ്യാർത്ഥി ഗ്രൂപ്പിനായി വിദ്യാർത്ഥികൾ കൂടുതൽ എൻറോൾ ചെയ്യാൻ കഴിയില്ല.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,{0} ഈ വിദ്യാർത്ഥി ഗ്രൂപ്പിനായി വിദ്യാർത്ഥികൾ കൂടുതൽ എൻറോൾ ചെയ്യാൻ കഴിയില്ല.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ലീഡ് എണ്ണം
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ലീഡ് എണ്ണം
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 വലുതായിരിക്കണം
@@ -1853,9 +1885,11 @@
 DocType: Lab Test,Technician Name,സാങ്കേതിക നാമം നാമം
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ഇൻവോയ്സ് റദ്ദാക്കൽ പേയ്മെന്റ് അൺലിങ്കുചെയ്യുക
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},നിലവിൽ തലത്തില് നൽകിയ പ്രാരംഭ വാഹനം ഓഡോമീറ്റർ {0} കൂടുതലായിരിക്കണം
+DocType: Restaurant Reservation,No Show,പ്രദര്ശനം ഇല്ല
 DocType: Shipping Rule Country,Shipping Rule Country,ഷിപ്പിംഗ് റൂൾ രാജ്യം
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,"ഉപേക്ഷിക്കുക, ഹാജർ"
 DocType: Maintenance Visit,Partially Completed,ഭാഗികമായി പൂർത്തിയാക്കി
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,മോഡറേറ്റ് സെൻസിറ്റിവിറ്റി
 DocType: Leave Type,Include holidays within leaves as leaves,ഇല പോലെ ഇല ഉള്ളിൽ അവധി ദിവസങ്ങൾ ഉൾപ്പെടുത്തുക
 DocType: Sales Invoice,Packed Items,ചിലരാകട്ടെ ഇനങ്ങൾ
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,സീരിയൽ നമ്പർ നേരെ വാറന്റി ക്ലെയിം
@@ -1872,13 +1906,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),തുക (കമ്പനി കറൻസി)
 DocType: Purchase Invoice,Additional Discount,അധിക ഡിസ്ക്കൌണ്ട്
 DocType: Selling Settings,Selling Settings,സജ്ജീകരണങ്ങൾ വിൽക്കുന്ന
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,പ്രവർത്തനം സ്ഥിരീകരിക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ഓൺലൈൻ ലേലം
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,ക്വാണ്ടിറ്റി അല്ലെങ്കിൽ മൂലധനം റേറ്റ് അല്ലെങ്കിൽ രണ്ട് വ്യക്തമാക്കുക
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,നിർവ്വഹണം
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,വണ്ടിയിൽ കാണുക
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,മാർക്കറ്റിംഗ് ചെലവുകൾ
 ,Item Shortage Report,ഇനം ദൗർലഭ്യം റിപ്പോർട്ട്
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ഭാരോദ്വഹനം പരാമർശിച്ചിരിക്കുന്നത്, \ n ദയവായി വളരെ &quot;ഭാരോദ്വഹനം UOM&quot; മറന്ന"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ഭാരോദ്വഹനം പരാമർശിച്ചിരിക്കുന്നത്, \ n ദയവായി വളരെ &quot;ഭാരോദ്വഹനം UOM&quot; മറന്ന"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ഈ ഓഹരി എൻട്രി ചെയ്യുന്നതിനുപയോഗിക്കുന്ന മെറ്റീരിയൽ അഭ്യർത്ഥന
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,അടുത്ത മൂല്യത്തകർച്ച തീയതി പുതിയ അസറ്റ് നിര്ബന്ധമാണ്
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,അടിസ്ഥാനമാക്കിയുള്ള ഗ്രൂപ്പ് പ്രത്യേക കോഴ്സ് ഓരോ ബാച്ച് വേണ്ടി
@@ -1891,12 +1926,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ഓരോ ഓഹരി പ്രസ്ഥാനത്തിന് വേണ്ടി അക്കൗണ്ടിംഗ് എൻട്രി വരുത്തുക
 DocType: Leave Allocation,Total Leaves Allocated,അനുവദിച്ച മൊത്തം ഇലകൾ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},വരി ഇല്ല {0} ആവശ്യമാണ് വെയർഹൗസ്
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,"സാധുവായ സാമ്പത്തിക വർഷം ആരംഭ, അവസാന തീയതി നൽകുക"
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,"സാധുവായ സാമ്പത്തിക വർഷം ആരംഭ, അവസാന തീയതി നൽകുക"
 DocType: Employee,Date Of Retirement,വിരമിക്കൽ തീയതി
 DocType: Upload Attendance,Get Template,ഫലകം നേടുക
 DocType: Material Request,Transferred,മാറ്റിയത്
 DocType: Vehicle,Doors,ഡോറുകൾ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,സമ്പൂർണ്ണ ERPNext സജ്ജീകരണം!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,സമ്പൂർണ്ണ ERPNext സജ്ജീകരണം!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,രോഗി രജിസ്ട്രേഷനായി ഫീസ് വാങ്ങുക
 DocType: Course Assessment Criteria,Weightage,വെയിറ്റേജ്
 DocType: Purchase Invoice,Tax Breakup,നികുതി ഖണ്ഡങ്ങളായി
@@ -1915,37 +1950,37 @@
 DocType: Employee,AB+,എബി +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","ഈ ഐറ്റം വകഭേദങ്ങളും ഉണ്ട് എങ്കിൽ, അത് തുടങ്ങിയവ വിൽപ്പന ഉത്തരവ് തിരഞ്ഞെടുക്കാനിടയുള്ളൂ കഴിയില്ല"
 DocType: Lead,Next Contact By,അടുത്തത് കോൺടാക്റ്റ് തന്നെയാണ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},നിരയിൽ ഇനം {0} ആവശ്യമുള്ളതിൽ ക്വാണ്ടിറ്റി {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},നിരയിൽ ഇനം {0} ആവശ്യമുള്ളതിൽ ക്വാണ്ടിറ്റി {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},അളവ് ഇനം {1} വേണ്ടി നിലവിലുണ്ട് പോലെ വെയർഹൗസ് {0} ഇല്ലാതാക്കാൻ കഴിയില്ല
 DocType: Quotation,Order Type,ഓർഡർ തരം
-DocType: Purchase Invoice,Notification Email Address,വിജ്ഞാപന ഇമെയിൽ വിലാസം
 ,Item-wise Sales Register,ഇനം തിരിച്ചുള്ള സെയിൽസ് രജിസ്റ്റർ
 DocType: Asset,Gross Purchase Amount,മൊത്തം വാങ്ങൽ തുക
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,ബാലൻസ് തുറക്കുന്നു
 DocType: Asset,Depreciation Method,മൂല്യത്തകർച്ച രീതി
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,ഓഫ്ലൈൻ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,ഓഫ്ലൈൻ
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,ബേസിക് റേറ്റ് ഉൾപ്പെടുത്തിയിട്ടുണ്ട് ഈ നികുതി ആണോ?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,ആകെ ടാർഗെറ്റ്
 DocType: Job Applicant,Applicant for a Job,ഒരു ജോലിക്കായി അപേക്ഷകന്
 DocType: Production Plan Material Request,Production Plan Material Request,പ്രൊഡക്ഷൻ പ്ലാൻ മെറ്റീരിയൽ അഭ്യർത്ഥന
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,സൃഷ്ടിച്ച ഇല്ല പ്രൊഡക്ഷൻ ഉത്തരവുകൾ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,സൃഷ്ടിച്ച ഇല്ല പ്രൊഡക്ഷൻ ഉത്തരവുകൾ
 DocType: Stock Reconciliation,Reconciliation JSON,അനുരഞ്ജനം JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,വളരെയധികം നിരകൾ. റിപ്പോർട്ട് കയറ്റുമതി ഒരു സ്പ്രെഡ്ഷീറ്റ് ആപ്ലിക്കേഷൻ ഉപയോഗിച്ച് അത് പ്രിന്റ്.
 DocType: Purchase Invoice Item,Batch No,ബാച്ച് ഇല്ല
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},ഉദ്ധരണിക്കായുള്ള അഭ്യർത്ഥന: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,കസ്റ്റമറുടെ വാങ്ങൽ ഓർഡർ നേരെ ഒന്നിലധികം സെയിൽസ് ഉത്തരവുകൾ അനുവദിക്കുക
 DocType: Student Group Instructor,Student Group Instructor,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് പരിശീലകൻ
 DocType: Student Group Instructor,Student Group Instructor,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് പരിശീലകൻ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,ഗുഅര്ദിഅന്൨ മൊബൈൽ ഇല്ല
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,പ്രധാന
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,പ്രധാന
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,മാറ്റമുള്ള
 DocType: Naming Series,Set prefix for numbering series on your transactions,നിങ്ങളുടെ ഇടപാടുകൾ പരമ്പര എണ്ണം പ്രിഫിക്സ് സജ്ജമാക്കുക
 DocType: Employee Attendance Tool,Employees HTML,എംപ്ലോയീസ് എച്ച്ടിഎംഎൽ
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,സ്വതേ BOM ({0}) ഈ ഇനം അല്ലെങ്കിൽ അതിന്റെ ടെംപ്ലേറ്റ് സജീവമാകും ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,സ്വതേ BOM ({0}) ഈ ഇനം അല്ലെങ്കിൽ അതിന്റെ ടെംപ്ലേറ്റ് സജീവമാകും ആയിരിക്കണം
 DocType: Employee,Leave Encashed?,കാശാക്കാം വിടണോ?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,വയലിൽ നിന്ന് ഓപ്പർച്യൂനിറ്റി നിർബന്ധമാണ്
 DocType: Email Digest,Annual Expenses,വാർഷിക ചെലവുകൾ
 DocType: Item,Variants,വകഭേദങ്ങളും
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,വാങ്ങൽ ഓർഡർ നിർമ്മിക്കുക
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,വാങ്ങൽ ഓർഡർ നിർമ്മിക്കുക
 DocType: SMS Center,Send To,അയക്കുക
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},അനുവാദ ടൈപ്പ് {0} മതി ലീവ് ബാലൻസ് ഒന്നും ഇല്ല
 DocType: Payment Reconciliation Payment,Allocated amount,പദ്ധതി തുക
@@ -1963,6 +1998,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് ദൃഢത
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,ജേർണൽ എൻട്രി {0} എഗെൻസ്റ്റ് ഏതെങ്കിലും സമാനതകളില്ലാത്ത {1} എൻട്രി ഇല്ല
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,വിലയിരുത്തലുകളും
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,പരിശീലന പരിപാടികൾ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},സീരിയൽ ഇല്ല ഇനം {0} നൽകിയ തനിപ്പകർപ്പെടുക്കുക
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ഒരു ഷിപ്പിംഗ് റൂൾ വ്യവസ്ഥ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,ദയവായി നൽകുക
@@ -1972,7 +2008,7 @@
 DocType: Sales Order,To Deliver and Bill,എത്തിക്കേണ്ടത് ബിൽ ചെയ്യുക
 DocType: Student Group,Instructors,ഗുരുക്കന്മാർ
 DocType: GL Entry,Credit Amount in Account Currency,അക്കൗണ്ട് കറൻസി ക്രെഡിറ്റ് തുക
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM ലേക്ക് {0} സമർപ്പിക്കേണ്ടതാണ്
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM ലേക്ക് {0} സമർപ്പിക്കേണ്ടതാണ്
 DocType: Authorization Control,Authorization Control,അംഗീകാര നിയന്ത്രണ
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},വരി # {0}: നിരസിച്ചു വെയർഹൗസ് തള്ളിക്കളഞ്ഞ ഇനം {1} നേരെ നിർബന്ധമായും
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,പേയ്മെന്റ്
@@ -1991,11 +2027,11 @@
 DocType: Quotation Item,Actual Qty,യഥാർത്ഥ Qty
 DocType: Sales Invoice Item,References,അവലംബം
 DocType: Quality Inspection Reading,Reading 10,10 Reading
-DocType: Hub Settings,Hub Node,ഹബ് നോഡ്
+DocType: Hub Category,Hub Node,ഹബ് നോഡ്
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,നിങ്ങൾ ഡ്യൂപ്ലിക്കേറ്റ് ഇനങ്ങളുടെ പ്രവേശിച്ചിരിക്കുന്നു. പരിഹരിക്കാൻ വീണ്ടും ശ്രമിക്കുക.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,അസോസിയേറ്റ്
 DocType: Asset Movement,Asset Movement,അസറ്റ് പ്രസ്ഥാനം
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,പുതിയ കാർട്ട്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,പുതിയ കാർട്ട്
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,ഇനം {0} ഒരു സീരിയൽ ഇനം അല്ല
 DocType: SMS Center,Create Receiver List,റിസീവർ ലിസ്റ്റ് സൃഷ്ടിക്കുക
 DocType: Vehicle,Wheels,ചക്രങ്ങളും
@@ -2009,15 +2045,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,ടെലികമ്യൂണിക്കേഷൻസ്
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),(മാത്രം ഡ്രാഫ്റ്റ്) പാക്കേജ് ഈ ഡെലിവറി ഒരു ഭാഗമാണ് സൂചിപ്പിക്കുന്നു
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,പേയ്മെന്റ് എൻട്രി നിർമ്മിക്കുക
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},ഇനം {0} വേണ്ടി ക്വാണ്ടിറ്റി {1} താഴെ ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},ഇനം {0} വേണ്ടി ക്വാണ്ടിറ്റി {1} താഴെ ആയിരിക്കണം
 ,Sales Invoice Trends,സെയിൽസ് ഇൻവോയിസ് ട്രെൻഡുകൾ
 DocType: Leave Application,Apply / Approve Leaves,പ്രയോഗിക്കുക / ഇലകൾ അംഗീകരിക്കുക
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,എന്ന
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,എന്ന
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',അല്ലെങ്കിൽ &#39;മുൻ വരി ആകെ&#39; &#39;മുൻ വരി തുകയ്ക്ക്&#39; ചാർജ് തരം മാത്രമേ വരി പരാമർശിക്കാൻ കഴിയും
 DocType: Sales Order Item,Delivery Warehouse,ഡെലിവറി വെയർഹൗസ്
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,സാമ്പത്തിക ചെലവ് സെന്റേഴ്സ് ട്രീ.
 DocType: Serial No,Delivery Document No,ഡെലിവറി ഡോക്യുമെന്റ് ഇല്ല
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},&#39;അസറ്റ് തീർപ്പ് ന് ഗെയിൻ / നഷ്ടം അക്കൗണ്ട്&#39; സജ്ജമാക്കുക കമ്പനി {0} ൽ
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},&#39;അസറ്റ് തീർപ്പ് ന് ഗെയിൻ / നഷ്ടം അക്കൗണ്ട്&#39; സജ്ജമാക്കുക കമ്പനി {0} ൽ
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,വാങ്ങൽ വരവ് നിന്നുള്ള ഇനങ്ങൾ നേടുക
 DocType: Serial No,Creation Date,ക്രിയേഷൻ തീയതി
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},ഇനം {0} വില പട്ടിക {1} ഒന്നിലധികം പ്രാവശ്യം
@@ -2028,12 +2064,13 @@
 DocType: Student,Student Mobile Number,സ്റ്റുഡന്റ് മൊബൈൽ നമ്പർ
 DocType: Item,Has Variants,രൂപഭേദങ്ങൾ ഉണ്ട്
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,പ്രതികരണം അപ്ഡേറ്റുചെയ്യുക
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},നിങ്ങൾ ഇതിനകം നിന്ന് {0} {1} ഇനങ്ങൾ തിരഞ്ഞെടുത്തു
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},നിങ്ങൾ ഇതിനകം നിന്ന് {0} {1} ഇനങ്ങൾ തിരഞ്ഞെടുത്തു
 DocType: Monthly Distribution,Name of the Monthly Distribution,പ്രതിമാസ വിതരണം പേര്
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ബാച്ച് ഐഡി നിർബന്ധമായും
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ബാച്ച് ഐഡി നിർബന്ധമായും
 DocType: Sales Person,Parent Sales Person,പേരന്റ്ഫോള്ഡര് സെയിൽസ് വ്യാക്തി
-DocType: Purchase Invoice,Recurring Invoice,ആവർത്തക ഇൻവോയിസ്
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,ഉയർന്നതിൽ നിന്ന് താഴ്ന്നത്
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,ആദ്യം പ്രോഗ്രാം തെരഞ്ഞെടുക്കുക
 DocType: Patient Appointment,Patient Age,രോഗിയുടെ പ്രായം
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,മാനേജിംഗ് പ്രോജക്റ്റുകൾ
 DocType: Supplier,Supplier of Goods or Services.,സാധനങ്ങളുടെ അല്ലെങ്കിൽ സേവനങ്ങളുടെ വിതരണക്കാരൻ.
@@ -2041,8 +2078,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,കൺസൾട്ടൻസി ചാർജ് ബുക്കു ചെയ്യാനായി രോഗിയിൽ സജ്ജമാക്കാതിരിക്കുകയാണെങ്കിൽ സ്വീകാര്യമായ സ്വീകാര്യമായ അക്കൗണ്ടുകൾ ഉപയോഗിക്കും.
 DocType: Vehicle Log,Fuel Price,ഇന്ധന വില
 DocType: Budget,Budget,ബജറ്റ്
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,തുറക്കുക സജ്ജമാക്കുക
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,ഫിക്സ്ഡ് അസറ്റ് ഇനം ഒരു നോൺ-സ്റ്റോക്ക് ഇനം ആയിരിക്കണം.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,തുറക്കുക സജ്ജമാക്കുക
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,ഫിക്സ്ഡ് അസറ്റ് ഇനം ഒരു നോൺ-സ്റ്റോക്ക് ഇനം ആയിരിക്കണം.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","അത് ഒരു ആദായ അല്ലെങ്കിൽ ചിലവേറിയ അല്ല പോലെ ബജറ്റ്, {0} നേരെ നിയോഗിക്കുകയും കഴിയില്ല"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,കൈവരിച്ച
 DocType: Student Admission,Application Form Route,അപേക്ഷാ ഫോം റൂട്ട്
@@ -2056,12 +2093,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,ഇനം {0} സീരിയൽ ഒഴിവ് വിവരത്തിനു അല്ല. ഇനം മാസ്റ്റർ പരിശോധിക്കുക
 DocType: Maintenance Visit,Maintenance Time,മെയിൻറനൻസ് സമയം
 ,Amount to Deliver,വിടുവിപ്പാൻ തുക
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},ഇതേ ഇനം ഒന്നിലധികം തവണ നൽകി. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ടേം ആരംഭ തീയതി ഏത് പദം (അക്കാദമിക് വർഷം {}) ബന്ധിപ്പിച്ചിട്ടുള്ളാതാവനായി അക്കാദമിക വർഷത്തിന്റെ വർഷം ആരംഭിക്കുന്ന തീയതിയ്ക്ക് നേരത്തെ പാടില്ല. എൻറർ ശരിയാക്കി വീണ്ടും ശ്രമിക്കുക.
 DocType: Guardian,Guardian Interests,ഗാർഡിയൻ താൽപ്പര്യങ്ങൾ
 DocType: Naming Series,Current Value,ഇപ്പോഴത്തെ മൂല്യം
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ഒന്നിലധികം വർഷത്തേക്ക് തീയതി {0} കണക്കേ. സാമ്പത്തിക വർഷം കമ്പനി സജ്ജീകരിക്കുക
 DocType: School Settings,Instructor Records to be created by,അധ്യാപക റെക്കോർഡുകൾ സൃഷ്ടിക്കേണ്ടതുണ്ട്
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} സൃഷ്ടിച്ചു
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} സൃഷ്ടിച്ചു
 DocType: Delivery Note Item,Against Sales Order,സെയിൽസ് എതിരായ
 ,Serial No Status,സീരിയൽ നില ഇല്ല
 DocType: Payment Entry Reference,Outstanding,പ്രമുഖ
@@ -2071,10 +2109,10 @@
 						must be greater than or equal to {2}","വരി {0}: തീയതി \ എന്നിവ തമ്മിലുള്ള വ്യത്യാസം വലിയവനോ അല്ലെങ്കിൽ {2} തുല്യമോ ആയിരിക്കണം, {1} കാലഘട്ടം സജ്ജമാക്കുന്നതിനായി"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,ഈ സ്റ്റോക്ക് പ്രസ്ഥാനം അടിസ്ഥാനമാക്കിയുള്ളതാണ്. വിവരങ്ങൾക്ക് {0} കാണുക
 DocType: Pricing Rule,Selling,വിൽപ്പനയുള്ളത്
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},തുക {0} {1} {2} നേരെ കുറച്ചുകൊണ്ടിരിക്കും
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},തുക {0} {1} {2} നേരെ കുറച്ചുകൊണ്ടിരിക്കും
 DocType: Employee,Salary Information,ശമ്പളം വിവരങ്ങൾ
 DocType: Sales Person,Name and Employee ID,പേര് തൊഴിൽ ഐഡി
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,നിശ്ചിത തീയതി തീയതി പതിച്ച മുമ്പ് ആകാൻ പാടില്ല
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,നിശ്ചിത തീയതി തീയതി പതിച്ച മുമ്പ് ആകാൻ പാടില്ല
 DocType: Website Item Group,Website Item Group,വെബ്സൈറ്റ് ഇനം ഗ്രൂപ്പ്
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,"കടമകൾ, നികുതി"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,റഫറൻസ് തീയതി നൽകുക
@@ -2100,7 +2138,7 @@
 DocType: Issue,Resolution Details,മിഴിവ് വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,വിഹിതം
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,സ്വീകാര്യത മാനദണ്ഡം
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,മുകളിലുള്ള പട്ടികയിൽ മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ നൽകുക
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,മുകളിലുള്ള പട്ടികയിൽ മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ നൽകുക
 DocType: Item Attribute,Attribute Name,പേര് ആട്രിബ്യൂട്ട്
 DocType: BOM,Show In Website,വെബ്സൈറ്റ് കാണിക്കുക
 DocType: Shopping Cart Settings,Show Quantity in Website,വെബ്സൈറ്റ് ക്വാണ്ടിറ്റി കാണിക്കുക
@@ -2109,7 +2147,7 @@
 DocType: Item Reorder,Check in (group),(ഗ്രൂപ്പ്) ചെക്ക് ഇൻ
 ,Qty to Order,ഓർഡർ Qty
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","ലാഭം / നഷ്ടം നൽകും ബാധ്യത അല്ലെങ്കിൽ ഇക്വിറ്റി കീഴിൽ അക്കൗണ്ട് തല,"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,എല്ലാ ചുമതലകളും Gantt ചാർട്ട്.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,എല്ലാ ചുമതലകളും Gantt ചാർട്ട്.
 DocType: Opportunity,Mins to First Response,ആദ്യപ്രതികരണം ലേക്കുള്ള mins
 DocType: Pricing Rule,Margin Type,മാർജിൻ ഇനം
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} മണിക്കൂർ
@@ -2131,36 +2169,36 @@
 DocType: Patient,Surgical History,സർജിക്കൽ ചരിത്രം
 DocType: Employee,Resignation Letter Date,രാജിക്കത്ത് തീയതി
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,പ്രൈസിങ് നിയമങ്ങൾ കൂടുതൽ അളവ് അടിസ്ഥാനമാക്കി ഫിൽറ്റർ.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},ജീവനക്കാരൻ {0} പ്രവേശനത്തിനുള്ള തീയതി സജ്ജീകരിക്കുക
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},ജീവനക്കാരൻ {0} പ്രവേശനത്തിനുള്ള തീയതി സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},ജീവനക്കാരൻ {0} പ്രവേശനത്തിനുള്ള തീയതി സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},ജീവനക്കാരൻ {0} പ്രവേശനത്തിനുള്ള തീയതി സജ്ജീകരിക്കുക
 DocType: Task,Total Billing Amount (via Time Sheet),ആകെ ബില്ലിംഗ് തുക (ടൈം ഷീറ്റ് വഴി)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ആവർത്തിക്കുക കസ്റ്റമർ റവന്യൂ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) പങ്ക് &#39;ചിലവിടൽ Approver&#39; ഉണ്ടായിരിക്കണം
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,ജോഡി
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,ഉത്പാദനം BOM ലേക്ക് ആൻഡ് അളവ് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,ഉത്പാദനം BOM ലേക്ക് ആൻഡ് അളവ് തിരഞ്ഞെടുക്കുക
 DocType: Asset,Depreciation Schedule,മൂല്യത്തകർച്ച ഷെഡ്യൂൾ
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,സെയിൽസ് പങ്കാളി വിലാസങ്ങളും ബന്ധങ്ങൾ
 DocType: Bank Reconciliation Detail,Against Account,അക്കൗണ്ടിനെതിരായ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,അര ദിവസം തീയതി തീയതി മുതൽ ദിവസവും തമ്മിലുള്ള ആയിരിക്കണം
 DocType: Maintenance Schedule Detail,Actual Date,യഥാർഥ
 DocType: Item,Has Batch No,ബാച്ച് ഇല്ല ഉണ്ട്
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},വാർഷിക ബില്ലിംഗ്: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},വാർഷിക ബില്ലിംഗ്: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),ഉൽപ്പന്നങ്ങളും സേവനങ്ങളും നികുതി (ചരക്കുസേവന ഇന്ത്യ)
 DocType: Delivery Note,Excise Page Number,എക്സൈസ് പേജ് നമ്പർ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","കമ്പനി, തീയതി മുതൽ ദിവസവും നിർബന്ധമായും"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,കൺസൾട്ടേഷനിൽ നിന്ന് നേടുക
 DocType: Asset,Purchase Date,വാങ്ങിയ തിയതി
 DocType: Employee,Personal Details,പേഴ്സണൽ വിവരങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},കമ്പനി {0} ൽ &#39;അസറ്റ് മൂല്യത്തകർച്ച കോസ്റ്റ് സെന്റർ&#39; സജ്ജമാക്കുക
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},കമ്പനി {0} ൽ &#39;അസറ്റ് മൂല്യത്തകർച്ച കോസ്റ്റ് സെന്റർ&#39; സജ്ജമാക്കുക
 ,Maintenance Schedules,മെയിൻറനൻസ് സമയക്രമങ്ങൾ
 DocType: Task,Actual End Date (via Time Sheet),യഥാർത്ഥ അവസാന തീയതി (ടൈം ഷീറ്റ് വഴി)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},തുക {0} {1} {2} {3} നേരെ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},തുക {0} {1} {2} {3} നേരെ
 ,Quotation Trends,ക്വട്ടേഷൻ ട്രെൻഡുകൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},ഐറ്റം {0} ഐറ്റം മാസ്റ്റർ പരാമർശിച്ചു അല്ല ഇനം ഗ്രൂപ്പ്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു സ്വീകാ അക്കൗണ്ട് ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു സ്വീകാ അക്കൗണ്ട് ആയിരിക്കണം
 DocType: Shipping Rule Condition,Shipping Amount,ഷിപ്പിംഗ് തുക
 DocType: Supplier Scorecard Period,Period Score,കാലയളവ് സ്കോർ
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,ഉപഭോക്താക്കൾ ചേർക്കുക
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,ഉപഭോക്താക്കൾ ചേർക്കുക
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,തീർച്ചപ്പെടുത്തിയിട്ടില്ല തുക
 DocType: Lab Test Template,Special,പ്രത്യേക
 DocType: Purchase Invoice Item,Conversion Factor,പരിവർത്തന ഫാക്ടർ
@@ -2168,13 +2206,14 @@
 ,Vehicle Expenses,വാഹന ചെലവുകൾ
 DocType: Serial No,Invoice Details,ഇൻവോയ്സ് വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},ഉപയോഗപ്രദമായ ജീവിതം ശേഷം പ്രതീക്ഷിക്കുന്ന മൂല്യം ശ്രേഷ്ഠ അല്ലെങ്കിൽ {0} തുല്യമായിരിക്കണം
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,ആരംഭിക്കുക
+DocType: Hub Category,Hub Category,ഹബ് വിഭാഗം
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,വാഹന നമ്പർ
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,ആവർത്തന ഇൻവോയ്സ് സ്റ്റോപ്പ് ആയിരിക്കും തീയതി
 DocType: Employee Loan,Loan Amount,വായ്പാ തുക
 DocType: Program Enrollment,Self-Driving Vehicle,സ്വയം-ഡ്രൈവിംഗ് വാഹനം
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,വിതരണക്കാരൻ സ്കോറർ സ്റ്റാൻഡിംഗ്
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},വരി {0}: വസ്തുക്കൾ ബിൽ ഇനം {1} കണ്ടില്ല
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},വരി {0}: വസ്തുക്കൾ ബിൽ ഇനം {1} കണ്ടില്ല
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,ആകെ അലോക്കേറ്റഡ് ഇല {0} കാലയളവിലേക്ക് ഇതിനകം അംഗീകരിച്ച ഇല {1} കുറവായിരിക്കണം കഴിയില്ല
 DocType: Journal Entry,Accounts Receivable,സ്വീകാരയോഗ്യമായ കണക്കുകള്
 ,Supplier-Wise Sales Analytics,വിതരണക്കമ്പനിയായ യുക്തിമാനും സെയിൽസ് അനലിറ്റിക്സ്
@@ -2186,7 +2225,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","പാരന്റ് കോഴ്സ് (, ശൂന്യമായിടൂ പാരന്റ് കോഴ്സിന്റെ ഭാഗമായി അല്ല എങ്കിൽ)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,എല്ലാ ജീവനക്കാരുടെ തരം പരിഗണിക്കില്ല എങ്കിൽ ശൂന്യമായിടൂ
 DocType: Landed Cost Voucher,Distribute Charges Based On,അടിസ്ഥാനമാക്കി നിരക്കുകൾ വിതരണം
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,എച്ച് ക്രമീകരണങ്ങൾ
 DocType: Salary Slip,net pay info,വല ശമ്പള വിവരം
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,ഈ മൂല്യം സ്ഥിരസ്ഥിതി വിലകളുടെ പട്ടികയിൽ അപ്ഡേറ്റ് ചെയ്തിരിക്കുന്നു.
@@ -2197,7 +2236,7 @@
 DocType: Patient,B Positive,ബി പോസിറ്റീവ്
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","വരി # {0}: അളവ് 1, ഇനം ഒരു നിശ്ചിത അസറ്റ് പോലെ ആയിരിക്കണം. ഒന്നിലധികം അളവ് പ്രത്യേകം വരി ഉപയോഗിക്കുക."
 DocType: Leave Block List Allow,Leave Block List Allow,അനുവദിക്കുക ബ്ലോക്ക് ലിസ്റ്റ് വിടുക
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr ബ്ലാങ്ക് ബഹിരാകാശ ആകാൻ പാടില്ല
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr ബ്ലാങ്ക് ബഹിരാകാശ ആകാൻ പാടില്ല
 DocType: Patient Medical Record,Patient Medical Record,രോഗിയുടെ മെഡിക്കൽ റെക്കോർഡ്
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,നോൺ-ഗ്രൂപ്പ് വരെ ഗ്രൂപ്പ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,സ്പോർട്സ്
@@ -2214,9 +2253,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,കീ തീയതി {2} വരെ {1} {0} വിനിമയ നിരക്ക് കണ്ടെത്താൻ കഴിഞ്ഞില്ല. സ്വയം ഒരു കറൻസി എക്സ്ചേഞ്ച് റെക്കോർഡ് സൃഷ്ടിക്കുക
 DocType: POS Profile,Price List,വിലവിവരപട്ടിക
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ഇപ്പോൾ സ്വതവേയുള്ള ധനകാര്യ വർഷം ആണ്. പ്രാബല്യത്തിൽ മാറ്റം നിങ്ങളുടെ ബ്രൗസർ പുതുക്കുക.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,ചിലവേറിയ ക്ലെയിമുകൾ
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,ചിലവേറിയ ക്ലെയിമുകൾ
 DocType: Issue,Support,പിന്തുണ
 ,BOM Search,BOM തിരച്ചിൽ
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",ഈ സംഭരണശാലയിൽ ലഭ്യമായ സ്റ്റോക്ക് അടിസ്ഥാനമാക്കിയുള്ള &quot;ഓഹരിയിൽ&quot; അല്ലെങ്കിൽ &quot;നോട്ട് ഇൻ സ്റ്റോക്ക്&quot; പ്രസിദ്ധീകരിക്കുക.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),(+ ആകെ തുറക്കുന്നു) അടയ്ക്കുന്നു
 DocType: Vehicle,Fuel Type,ഇന്ധന തരം
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,കമ്പനിയിൽ കറൻസി വ്യക്തമാക്കുക
@@ -2228,16 +2268,16 @@
 DocType: Healthcare Settings,Remind Before,മുമ്പ് ഓർമ്മിപ്പിക്കുക
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM പരിവർത്തന ഘടകം വരി {0} ആവശ്യമാണ്
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","വരി # {0}: പരാമർശം ഡോക്യുമെന്റ് തരം വിൽപ്പന ഓർഡർ, സെയിൽസ് ഇൻവോയ്സ് അല്ലെങ്കിൽ ജേർണൽ എൻട്രി ഒന്ന് ആയിരിക്കണം"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","വരി # {0}: പരാമർശം ഡോക്യുമെന്റ് തരം വിൽപ്പന ഓർഡർ, സെയിൽസ് ഇൻവോയ്സ് അല്ലെങ്കിൽ ജേർണൽ എൻട്രി ഒന്ന് ആയിരിക്കണം"
 DocType: Salary Component,Deduction,കുറയ്ക്കല്
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,വരി {0}: സമയവും സമയാസമയങ്ങളിൽ നിർബന്ധമാണ്.
 DocType: Stock Reconciliation Item,Amount Difference,തുക വ്യത്യാസം
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},ഇനം വില വില പട്ടിക {1} ൽ {0} വേണ്ടി ചേർത്തു
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},ഇനം വില വില പട്ടിക {1} ൽ {0} വേണ്ടി ചേർത്തു
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,ഈ വിൽപ്പന ആളിന്റെ ജീവനക്കാരന്റെ ഐഡി നൽകുക
 DocType: Territory,Classification of Customers by region,പ്രാദേശികതയും ഉപഭോക്താക്കൾക്ക് തിരിക്കൽ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,വ്യത്യാസം തുക പൂജ്യം ആയിരിക്കണം
 DocType: Project,Gross Margin,മൊത്തം മാർജിൻ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,പ്രൊഡക്ഷൻ ഇനം ആദ്യം നൽകുക
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,പ്രൊഡക്ഷൻ ഇനം ആദ്യം നൽകുക
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,കണക്കുകൂട്ടിയത് ബാങ്ക് സ്റ്റേറ്റ്മെന്റ് ബാലൻസ്
 DocType: Normal Test Template,Normal Test Template,സാധാരണ ടെസ്റ്റ് ടെംപ്ലേറ്റ്
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,അപ്രാപ്തമാക്കിയ ഉപയോക്താവിനെ
@@ -2247,21 +2287,22 @@
 DocType: Salary Slip,Total Deduction,ആകെ കിഴിച്ചുകൊണ്ടു
 ,Production Analytics,പ്രൊഡക്ഷൻ അനലിറ്റിക്സ്
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,ഈ രോഗിക്ക് എതിരായ ഇടപാടുകൾ അടിസ്ഥാനമാക്കിയുള്ളതാണ്. വിശദാംശങ്ങൾക്ക് ചുവടെയുള്ള ടൈംലൈൻ കാണുക
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,ചെലവ് അപ്ഡേറ്റ്
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,ചെലവ് അപ്ഡേറ്റ്
 DocType: Employee,Date of Birth,ജനിച്ച ദിവസം
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,ഇനം {0} ഇതിനകം മടങ്ങി ചെയ്തു
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** സാമ്പത്തിക വർഷത്തെ ** ഒരു സാമ്പത്തിക വർഷം പ്രതിനിധീകരിക്കുന്നത്. എല്ലാ അക്കൗണ്ടിങ് എൻട്രികൾ മറ്റ് പ്രധാന ഇടപാടുകൾ ** ** സാമ്പത്തിക വർഷത്തിൽ നേരെ അത്രകണ്ട്.
 DocType: Opportunity,Customer / Lead Address,കസ്റ്റമർ / ലീഡ് വിലാസം
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,വിതരണ സ്കോർബോർഡ് സജ്ജീകരണം
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},മുന്നറിയിപ്പ്: അറ്റാച്ച്മെന്റ് {0} ന് അസാധുവായ SSL സർട്ടിഫിക്കറ്റ്
-DocType: Student Admission,Eligibility,യോഗ്യത
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,അസസ്സ്മെന്റ് പ്ലാൻ നാമം
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},മുന്നറിയിപ്പ്: അറ്റാച്ച്മെന്റ് {0} ന് അസാധുവായ SSL സർട്ടിഫിക്കറ്റ്
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","ലീഡുകൾ നിങ്ങളുടെ നയിക്കുന്നത് പോലെയും നിങ്ങളുടെ എല്ലാ ബന്ധങ്ങൾ കൂടുതൽ ചേർക്കുക, നിങ്ങൾ ബിസിനസ്സ് ലഭിക്കാൻ സഹായിക്കും"
 DocType: Production Order Operation,Actual Operation Time,യഥാർത്ഥ ഓപ്പറേഷൻ സമയം
 DocType: Authorization Rule,Applicable To (User),(ഉപയോക്താവ്) ബാധകമായ
 DocType: Purchase Taxes and Charges,Deduct,കുറയ്ക്കാവുന്നതാണ്
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,ജോലി വിവരണം
 DocType: Student Applicant,Applied,അപ്ലൈഡ്
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,വീണ്ടും തുറക്കുക
 DocType: Sales Invoice Item,Qty as per Stock UOM,ഓഹരി UOM പ്രകാരം Qty
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,ഗുഅര്ദിഅന്൨ പേര്
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","ഒഴികെ പ്രത്യേക പ്രതീകങ്ങൾ &quot;-&quot;, &quot;#&quot;, &quot;.&quot; ഒപ്പം &quot;/&quot; പരമ്പര പേരെടുത്ത് അനുവദനീയമല്ല"
@@ -2273,7 +2314,7 @@
 DocType: Request for Quotation,Manufacturing Manager,ണം മാനേജർ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},സീരിയൽ ഇല്ല {0} {1} വരെ വാറന്റി കീഴിൽ ആണ്
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,പാക്കേജുകൾ കടന്നു ഡെലിവറി നോട്ട് വിഭജിക്കുക.
-apps/erpnext/erpnext/hooks.py +98,Shipments,കയറ്റുമതി
+apps/erpnext/erpnext/hooks.py +107,Shipments,കയറ്റുമതി
 DocType: Payment Entry,Total Allocated Amount (Company Currency),ആകെ തുക (കമ്പനി കറൻസി)
 DocType: Purchase Order Item,To be delivered to customer,ഉപഭോക്താവിന് പ്രസവം
 DocType: BOM,Scrap Material Cost,സ്ക്രാപ്പ് വസ്തുക്കളുടെ വില
@@ -2296,8 +2337,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,ഇനം ഭേദം സജ്ജീകരണങ്ങൾ
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,കമ്പനി തിരഞ്ഞെടുക്കുക ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,എല്ലാ വകുപ്പുകളുടെയും വേണ്ടി പരിഗണിക്കും എങ്കിൽ ശൂന്യമായിടൂ
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","തൊഴിൽ വിവിധതരം (സ്ഥിരമായ, കരാർ, തടവുകാരി മുതലായവ)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} ഇനം {1} നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","തൊഴിൽ വിവിധതരം (സ്ഥിരമായ, കരാർ, തടവുകാരി മുതലായവ)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} ഇനം {1} നിര്ബന്ധമാണ്
 DocType: Process Payroll,Fortnightly,രണ്ടാഴ്ചയിലൊരിക്കൽ
 DocType: Currency Exchange,From Currency,കറൻസി
 DocType: Vital Signs,Weight (In Kilogram),ഭാരം (കിലൊഗ്രാമിൽ)
@@ -2322,7 +2363,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,ഷെഡ്യൂൾ ലഭിക്കുന്നതിന് &#39;ജനറേറ്റ് ഷെഡ്യൂൾ&#39; ക്ലിക്ക് ചെയ്യുക ദയവായി
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,താഴെ ഷെഡ്യൂളുകൾ ഇല്ലാതാക്കുമ്പോൾ പിശകുകൾ ഉണ്ടായിരുന്നു:
 DocType: Bin,Ordered Quantity,ഉത്തരവിട്ടു ക്വാണ്ടിറ്റി
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",ഉദാ: &quot;നിർമ്മാതാക്കളുടേയും ഉപകരണങ്ങൾ നിർമ്മിക്കുക&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",ഉദാ: &quot;നിർമ്മാതാക്കളുടേയും ഉപകരണങ്ങൾ നിർമ്മിക്കുക&quot;
 DocType: Grading Scale,Grading Scale Intervals,ഗ്രേഡിംഗ് സ്കെയിൽ ഇടവേളകൾ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {3}: വേണ്ടി {2} മാത്രം കറൻസി കഴിയും അക്കൗണ്ടിംഗ് എൻട്രി
 DocType: Production Order,In Process,പ്രക്രിയയിൽ
@@ -2346,11 +2387,10 @@
 DocType: Purchase Invoice,With Payment of Tax,നികുതി അടച്ചുകൊണ്ട്
 DocType: Expense Claim Detail,Expense Claim Detail,ചിലവേറിയ ക്ലെയിം വിശദാംശം
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,വിതരണക്കാരൻ നുവേണ്ടി ത്രിപ്ലിചതെ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,ശരിയായ അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,ശരിയായ അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
 DocType: Item,Weight UOM,ഭാരോദ്വഹനം UOM
 DocType: Salary Structure Employee,Salary Structure Employee,ശമ്പള ഘടന ജീവനക്കാരുടെ
 DocType: Patient,Blood Group,രക്ത ഗ്രൂപ്പ്
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,തീർച്ചപ്പെടുത്തിയിട്ടില്ല
 DocType: Course,Course Name,കോഴ്സിന്റെ പേര്
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ഒരു പ്രത്യേക ജീവനക്കാരന്റെ ലീവ് അപേക്ഷകൾ അംഗീകരിക്കാം ഉപയോക്താക്കൾ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,ഓഫീസ് ഉപകരണങ്ങൾ
@@ -2369,7 +2409,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,വിലവിവര ലിസ്റ്റ് സജ്ജമാക്കിയിട്ടില്ലെങ്കിൽ വിലകൾ കാണിക്കില്ല
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,ഈ ഷിപ്പിംഗ് റൂൾ ഒരു രാജ്യം വ്യക്തമാക്കൂ ലോകമൊട്ടാകെ ഷിപ്പിംഗ് പരിശോധിക്കുക
 DocType: Stock Entry,Total Incoming Value,ആകെ ഇൻകമിംഗ് മൂല്യം
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,ഡെബിറ്റ് ആവശ്യമാണ്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,ഡെബിറ്റ് ആവശ്യമാണ്
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","തിമെശെഎത്സ് സമയം, നിങ്ങളുടെ ടീം നടക്കുന്ന പ്രവർത്തനങ്ങൾ ചിലവു ബില്ലിംഗ് ട്രാക്ക് സൂക്ഷിക്കാൻ സഹായിക്കുന്നു"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,വാങ്ങൽ വില പട്ടിക
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,വിതരണക്കാരന്റെ സ്കോർബോർഡ് വേരിയബിളുകൾ.
@@ -2379,7 +2419,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,പേയ്മെന്റ് അനുരഞ്ജനം
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Incharge വ്യക്തിയുടെ പേര് തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,ടെക്നോളജി
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},ആകെ ലഭിക്കാത്ത: {0}
+DocType: Hub Settings,Unregister from Hub,ഹബ് നിന്ന് രജിസ്റ്റർ ചെയ്തത് മാറ്റുക
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},ആകെ ലഭിക്കാത്ത: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM ൽ വെബ്സൈറ്റ് ഓപ്പറേഷൻ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,ഓഫർ ലെറ്ററിന്റെ
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ (എംആർപി) നിർമ്മാണവും ഉത്തരവുകൾ ജനറേറ്റുചെയ്യുക.
@@ -2391,7 +2432,9 @@
 DocType: Physician Schedule Time Slot,To Time,സമയം ചെയ്യുന്നതിനായി
 DocType: Authorization Rule,Approving Role (above authorized value),(അംഗീകൃത മൂല്യം മുകളിൽ) അംഗീകരിച്ചതിന് റോൾ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,അക്കൗണ്ടിലേക്ക് ക്രെഡിറ്റ് ഒരു അടയ്ക്കേണ്ട അക്കൗണ്ട് ആയിരിക്കണം
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM ലേക്ക് വിശകലനത്തിനുവേണ്ടിയാണീ: {0} {2} മാതാപിതാക്കൾ കുട്ടികളുടെ ആകാൻ പാടില്ല
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,വിദ്യാർത്ഥി അപേക്ഷകന് നിർബന്ധിതമായ വിദ്യാർത്ഥി അഡ്മിഷൻ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM ലേക്ക് വിശകലനത്തിനുവേണ്ടിയാണീ: {0} {2} മാതാപിതാക്കൾ കുട്ടികളുടെ ആകാൻ പാടില്ല
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,വിലനിർണ്ണയം പ്രസിദ്ധീകരിക്കാൻ ഒരു ശ്രേണിക പട്ടിക തിരഞ്ഞെടുക്കുക
 DocType: Production Order Operation,Completed Qty,പൂർത്തിയാക്കി Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",{0} മാത്രം ഡെബിറ്റ് അക്കൗണ്ടുകൾ മറ്റൊരു ക്രെഡിറ്റ് എൻട്രി നേരെ ലിങ്ക്ഡ് കഴിയും
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,വില പട്ടിക {0} പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ
@@ -2404,38 +2447,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,ഇനം {1} വേണ്ടി ആവശ്യമായ {0} സീരിയൽ സംഖ്യാപുസ്തകം. നിങ്ങൾ {2} നൽകിയിട്ടുള്ള.
 DocType: Stock Reconciliation Item,Current Valuation Rate,ഇപ്പോഴത്തെ മൂലധനം റേറ്റ്
 DocType: Item,Customer Item Codes,കസ്റ്റമർ ഇനം കോഡുകൾ
+DocType: Training Event,Advance,അഡ്വാൻസ്
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,വീണ്ടും ആവർത്തിക്കുന്നു.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,എക്സ്ചേഞ്ച് ഗെയിൻ / നഷ്ടം
 DocType: Opportunity,Lost Reason,നഷ്ടപ്പെട്ട കാരണം
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,പുതിയ വിലാസം
 DocType: Quality Inspection,Sample Size,സാമ്പിളിന്റെവലിപ്പം
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,ദയവായി രസീത് പ്രമാണം നൽകുക
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,എല്ലാ ഇനങ്ങളും ഇതിനകം invoiced ചെയ്തു
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;കേസ് നമ്പർ നിന്നും&#39; ഒരു സാധുവായ വ്യക്തമാക്കുക
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',&#39;കേസ് നമ്പർ നിന്നും&#39; ഒരു സാധുവായ വ്യക്തമാക്കുക
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,പ്രശ്നപരിഹാരത്തിനായി കുറഞ്ഞ കേന്ദ്രങ്ങൾ ഗ്രൂപ്പുകൾ കീഴിൽ കഴിയും പക്ഷേ എൻട്രികൾ നോൺ-ഗ്രൂപ്പുകൾ നേരെ കഴിയും
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ഉപയോക്താക്കൾ അനുമതികളും
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},സൃഷ്ടിച്ചു പ്രൊഡക്ഷൻ ഓർഡറുകൾ: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},സൃഷ്ടിച്ചു പ്രൊഡക്ഷൻ ഓർഡറുകൾ: {0}
 DocType: Branch,Branch,ബ്രാഞ്ച്
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,"അച്ചടി, ബ്രാൻഡിംഗ്"
 DocType: Company,Total Monthly Sales,മൊത്തം പ്രതിമാസ വിൽപ്പന
 DocType: Bin,Actual Quantity,യഥാർത്ഥ ക്വാണ്ടിറ്റി
 DocType: Shipping Rule,example: Next Day Shipping,ഉദാഹരണം: അടുത്ത ദിവസം ഷിപ്പിംഗ്
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,{0} കാണാനായില്ല സീരിയൽ ഇല്ല
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},സബ്സ്ക്രിപ്ഷൻ {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},സബ്സ്ക്രിപ്ഷൻ {0}
 DocType: Fee Schedule Program,Fee Schedule Program,ഫീസ് ഷെഡ്യൂൾ പ്രോഗ്രാം
 DocType: Fee Schedule Program,Student Batch,വിദ്യാർത്ഥിയുടെ ബാച്ച്
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,`ടാബിൽ നിന്നുള്ള സൂചനകൾ &#39;എന്നതിൽ നിന്ന് * രോഗനിർണ്ണയം =&#39; {0} &#39;ഓർഡറുകൾ _ഡെറ്റ് ഡെഡ് പരിധി 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,കുട്ടിയാണെന്ന്
 DocType: Supplier Scorecard Scoring Standing,Min Grade,കുറഞ്ഞ ഗ്രേഡ്
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},നിങ്ങൾ പദ്ധതി സഹകരിക്കുക ക്ഷണിച്ചു: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},{0} ൽ ഫിസിഷ്യൻ ലഭ്യമല്ല
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},നിങ്ങൾ പദ്ധതി സഹകരിക്കുക ക്ഷണിച്ചു: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},{0} ൽ ഫിസിഷ്യൻ ലഭ്യമല്ല
 DocType: Leave Block List Date,Block Date,ബ്ലോക്ക് തീയതി
 DocType: Purchase Receipt,Supplier Delivery Note,വിതരണ ഡെലിവറി നോട്ട്
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,ഇപ്പോൾ പ്രയോഗിക്കുക
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,ഇപ്പോൾ പ്രയോഗിക്കുക
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},യഥാർത്ഥ അളവ് {0} / കാത്തിരിപ്പ് അളവ് {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},യഥാർത്ഥ അളവ് {0} / കാത്തിരിപ്പ് അളവ് {1}
 DocType: Purchase Invoice,E-commerce GSTIN,ഇ-കൊമേഴ്സ് GSTIN
 DocType: Sales Order,Not Delivered,കൈമാറിയില്ല
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,പ്രതീക്ഷിച്ച തീയതി ട്രാൻസാക്ഷൻ തീയതിക്ക് മുമ്പായിരിക്കരുത്
 ,Bank Clearance Summary,ബാങ്ക് ക്ലിയറൻസ് ചുരുക്കം
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","സൃഷ്ടിക്കുക ദിവസേന നിയന്ത്രിക്കുക, പ്രതിവാര മാസ ഇമെയിൽ digests."
 DocType: Appraisal Goal,Appraisal Goal,മൂല്യനിർണയം ഗോൾ
@@ -2443,12 +2488,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,കെട്ടിടങ്ങൾ
 DocType: Fee Schedule,Fee Structure,ഫീസ് ഘടന
 DocType: Timesheet Detail,Costing Amount,തുക ആറെണ്ണവും
-DocType: Student Admission,Application Fee,അപേക്ഷ ഫീസ്
+DocType: Student Admission Program,Application Fee,അപേക്ഷ ഫീസ്
 DocType: Process Payroll,Submit Salary Slip,ശമ്പളം ജി സമർപ്പിക്കുക
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,ഇനം {0} വേണ്ടി Maxiumm നല്കിയിട്ടുള്ള {1}% ആണ്
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,ഇനം {0} വേണ്ടി Maxiumm നല്കിയിട്ടുള്ള {1}% ആണ്
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,ബൾക്ക് ലെ ഇംപോർട്ട്
 DocType: Sales Partner,Address & Contacts,വിലാസം &amp; ബന്ധങ്ങൾ
 DocType: SMS Log,Sender Name,പ്രേഷിതനാമം
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,മാനദണ്ഡം അനുസരിച്ച് അടുക്കുക
 DocType: POS Profile,[Select],[തിരഞ്ഞെടുക്കുക]
 DocType: Vital Signs,Blood Pressure (diastolic),രക്തസമ്മർദ്ദം (ഡയസ്റ്റോളിക്)
 DocType: SMS Log,Sent To,ലേക്ക് അയച്ചു
@@ -2457,7 +2503,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,അടുത്ത ബന്ധപ്പെടുക തീയതി കഴിഞ്ഞ ലെ പാടില്ല
 DocType: Company,For Reference Only.,മാത്രം റഫറൻസിനായി.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},{1} എന്ന വൈദ്യരിൽ {0} ലഭ്യമല്ല
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,തിരഞ്ഞെടുക്കുക ബാച്ച് ഇല്ല
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,തിരഞ്ഞെടുക്കുക ബാച്ച് ഇല്ല
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},അസാധുവായ {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,റെഫറൻസ് ആഹ്
@@ -2473,15 +2519,15 @@
 DocType: Normal Test Items,Require Result Value,റിസൾട്ട് മൂല്യം ആവശ്യമാണ്
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,കേസ് നമ്പർ 0 ആയിരിക്കും കഴിയില്ല
 DocType: Item,Show a slideshow at the top of the page,പേജിന്റെ മുകളിൽ ഒരു സ്ലൈഡ്ഷോ കാണിക്കുക
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,സ്റ്റോറുകൾ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,സ്റ്റോറുകൾ
 DocType: Project Type,Projects Manager,പ്രോജക്റ്റുകൾ മാനേജർ
 DocType: Serial No,Delivery Time,വിതരണ സമയം
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,എയ്ജിങ് അടിസ്ഥാനത്തിൽ ഓൺ
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,നിയമനം റദ്ദാക്കി
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,നിയമനം റദ്ദാക്കി
 DocType: Item,End of Life,ജീവിതാവസാനം
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,യാത്ര
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,സജീവ അല്ലെങ്കിൽ സ്ഥിര ശമ്പള ഘടന തന്നിരിക്കുന്ന തീയതികളിൽ ജീവനക്കാരൻ {0} കണ്ടെത്തിയില്ല
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,യാത്ര
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,സജീവ അല്ലെങ്കിൽ സ്ഥിര ശമ്പള ഘടന തന്നിരിക്കുന്ന തീയതികളിൽ ജീവനക്കാരൻ {0} കണ്ടെത്തിയില്ല
 DocType: Leave Block List,Allow Users,അനുവദിക്കുക ഉപയോക്താക്കൾ
 DocType: Purchase Order,Customer Mobile No,കസ്റ്റമർ മൊബൈൽ ഇല്ല
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,ആവർത്തിക്കുന്നു
@@ -2490,12 +2536,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,അപ്ഡേറ്റ് ചെലവ്
 DocType: Item Reorder,Item Reorder,ഇനം പുനഃക്രമീകരിക്കുക
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,ശമ്പള ജി കാണിക്കുക
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,മെറ്റീരിയൽ കൈമാറുക
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,മെറ്റീരിയൽ കൈമാറുക
 DocType: Fees,Send Payment Request,പേയ്മെന്റ് അഭ്യർത്ഥന അയയ്ക്കുക
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",", ഓപ്പറേഷൻസ് വ്യക്തമാക്കുക ഓപ്പറേറ്റിങ് വില നിങ്ങളുടെ പ്രവർത്തനങ്ങൾക്ക് ഒരു അതുല്യമായ ഓപ്പറേഷൻ ഒന്നും തരും."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ഈ പ്രമാണം ഇനം {4} വേണ്ടി {0} {1} വഴി പരിധിക്കു. നിങ്ങൾ നിർമ്മിക്കുന്നത് ഒരേ {2} നേരെ മറ്റൊരു {3}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,സംരക്ഷിക്കുന്നതിൽ ശേഷം ആവർത്തിക്കുന്ന സജ്ജമാക്കുക
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,മാറ്റം തുക അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,മാറ്റം തുക അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
 DocType: Purchase Invoice,Price List Currency,വില പട്ടിക കറന്സി
 DocType: Naming Series,User must always select,ഉപയോക്താവ് എപ്പോഴും തിരഞ്ഞെടുക്കണം
 DocType: Stock Settings,Allow Negative Stock,നെഗറ്റീവ് സ്റ്റോക്ക് അനുവദിക്കുക
@@ -2515,7 +2561,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,ജീവനക്കാരുടെ
 DocType: Sample Collection,Collected Time,ശേഖരിച്ച സമയം
 DocType: Company,Sales Monthly History,സെയിൽസ് മൺലി ഹിസ്റ്ററി
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,ബാച്ച് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,ബാച്ച് തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} പൂർണ്ണമായി കൊക്കുമാണ്
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,ജീവത്പ്രധാനമായ അടയാളങ്ങൾ
 DocType: Training Event,End Time,അവസാനിക്കുന്ന സമയം
@@ -2523,16 +2569,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,പേയ്മെന്റ് ിയിളവുകള്ക്ക് അല്ലെങ്കിൽ നഷ്ടം
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,സെയിൽസ് വാങ്ങാനും സ്റ്റാൻഡേർഡ് കരാർ നിബന്ധനകൾ.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,വൗച്ചർ എന്നയാളുടെ ഗ്രൂപ്പ്
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,ഈ അപ്പോയിന്റ്മെന്റ് റദ്ദാക്കണമെന്ന് നിങ്ങൾക്ക് തീർച്ചയാണോ?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,സെയിൽസ് പൈപ്പ്ലൈൻ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},ശമ്പള ഘടക {0} ൽ സ്ഥിര അക്കൗണ്ട് സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,ആവശ്യമാണ്
 DocType: Rename Tool,File to Rename,പേരു്മാറ്റുക ഫയൽ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},ദയവായി വരി {0} ൽ ഇനം വേണ്ടി BOM ൽ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},ദയവായി വരി {0} ൽ ഇനം വേണ്ടി BOM ൽ തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},"അക്കൗണ്ട് {0}, വിചാരണയുടെ മോഡിൽ കമ്പനി {1} ഉപയോഗിച്ച് പൊരുത്തപ്പെടുന്നില്ല: {2}"
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},സൂചിപ്പിച്ചിരിക്കുന്ന BOM ലേക്ക് {0} ഇനം {1} വേണ്ടി നിലവിലില്ല
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,മെയിൻറനൻസ് ഷെഡ്യൂൾ {0} ഈ സെയിൽസ് ഓർഡർ റദ്ദാക്കുന്നതിൽ മുമ്പ് റദ്ദാക്കി വേണം
+DocType: POS Profile,Applicable for Users,ഉപയോക്താക്കൾക്ക് ബാധകമാണ്
 DocType: Notification Control,Expense Claim Approved,ചിലവേറിയ ക്ലെയിം അംഗീകരിച്ചു
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,ഉദ്യോഗസ്ഥ ജാമ്യം ജി {0} ഇതിനകം ഈ കാലയളവിൽ സൃഷ്ടിച്ച
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,ഉദ്യോഗസ്ഥ ജാമ്യം ജി {0} ഇതിനകം ഈ കാലയളവിൽ സൃഷ്ടിച്ച
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,ഫാർമസ്യൂട്ടിക്കൽ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,വാങ്ങിയ ഇനങ്ങൾ ചെലവ്
 DocType: Selling Settings,Sales Order Required,സെയിൽസ് ഓർഡർ ആവശ്യമുണ്ട്
@@ -2557,6 +2605,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,സംഘടന
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,സംഘടന
 DocType: BOM Update Tool,BOM Update Tool,BOM അപ്ഡേറ്റ് ടൂൾ
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","പാർട്ടി അക്കൗണ്ട് വ്യക്തമാക്കിയിട്ടില്ല, ദയവായി കമ്പനിയുടെ സ്ഥിരസ്ഥിതി പാർട്ടി അക്കൗണ്ട് സജ്ജീകരിക്കുക"
 DocType: SG Creation Tool Course,Student Group Name,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് പേര്
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,ഫീസ് സൃഷ്ടിക്കുന്നു
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,ശരിക്കും ഈ കമ്പനിയുടെ എല്ലാ ഇടപാടുകൾ ഇല്ലാതാക്കാൻ ആഗ്രഹിക്കുന്ന ദയവായി ഉറപ്പാക്കുക. അത് പോലെ നിങ്ങളുടെ മാസ്റ്റർ ഡാറ്റ തുടരും. ഈ പ്രവർത്തനം തിരുത്താൻ കഴിയില്ല.
@@ -2565,29 +2614,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) പ്രൊഡക്ഷൻ ഓർഡർ {3} ആസൂത്രണം quanitity ({2}) വലുതായിരിക്കും കഴിയില്ല
 DocType: Shipping Rule,Shipping Rule Label,ഷിപ്പിംഗ് റൂൾ ലേബൽ
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ഉപയോക്തൃ ഫോറം
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,അസംസ്കൃത വസ്തുക്കൾ ശൂന്യമായിരിക്കാൻ കഴിയില്ല.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","ഇൻവോയ്സ് ഡ്രോപ്പ് ഷിപ്പിംഗ് ഇനം ഉൾപ്പെടുന്നു, സ്റ്റോക്ക് അപ്ഡേറ്റുചെയ്യാനായില്ല."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,അസംസ്കൃത വസ്തുക്കൾ ശൂന്യമായിരിക്കാൻ കഴിയില്ല.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","ഇൻവോയ്സ് ഡ്രോപ്പ് ഷിപ്പിംഗ് ഇനം ഉൾപ്പെടുന്നു, സ്റ്റോക്ക് അപ്ഡേറ്റുചെയ്യാനായില്ല."
 DocType: Lab Test Sample,Lab Test Sample,ലാബ് ടെസ്റ്റ് സാമ്പിൾ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,ദ്രുത ജേർണൽ എൻട്രി
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM ലേക്ക് ഏതെങ്കിലും ഇനത്തിന്റെ agianst പരാമർശിച്ചു എങ്കിൽ നിങ്ങൾ നിരക്ക് മാറ്റാൻ കഴിയില്ല
+DocType: Restaurant,Invoice Series Prefix,ഇൻവോയ്സ് ശ്രേണി പ്രിഫിക്സ്
 DocType: Employee,Previous Work Experience,മുമ്പത്തെ ജോലി പരിചയം
 DocType: Stock Entry,For Quantity,ക്വാണ്ടിറ്റി വേണ്ടി
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},വരി ചെയ്തത് ഇനം {0} ആസൂത്രണം Qty നൽകുക {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},വരി ചെയ്തത് ഇനം {0} ആസൂത്രണം Qty നൽകുക {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,ഇനങ്ങളുടെ വേണ്ടി അപേക്ഷ.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,ഓരോ നല്ല ഇനത്തിനും തീർന്നശേഷം പ്രത്യേക ഉത്പാദനം ഓർഡർ സൃഷ്ടിക്കപ്പെടും.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} മടക്കം പ്രമാണത്തിൽ നെഗറ്റീവ് ആയിരിക്കണം
 ,Minutes to First Response for Issues,ഇഷ്യുവിനായുള്ള ആദ്യപ്രതികരണം ലേക്കുള്ള മിനിറ്റ്
 DocType: Purchase Invoice,Terms and Conditions1,നിബന്ധനകളും Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,ഈ സിസ്റ്റത്തിൽ സജ്ജീകരിക്കുന്നത് ഏത് ഇൻസ്റ്റിറ്റ്യൂട്ട് പേര്.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,ഈ സിസ്റ്റത്തിൽ സജ്ജീകരിക്കുന്നത് ഏത് ഇൻസ്റ്റിറ്റ്യൂട്ട് പേര്.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","ഈ കാലികമായി മരവിപ്പിച്ചു അക്കൗണ്ടിംഗ് എൻട്രി, ആരും ചെയ്യാൻ കഴിയും / ചുവടെ വ്യക്തമാക്കിയ പങ്ക് ഒഴികെ എൻട്രി പരിഷ്ക്കരിക്കുക."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,അറ്റകുറ്റപ്പണി ഷെഡ്യൂൾ സൃഷ്ടിക്കുന്നതിൽ മുമ്പ് പ്രമാണം സംരക്ഷിക്കുക ദയവായി
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,എല്ലാ BOM കളിലും പുതിയ വില അപ്ഡേറ്റ് ചെയ്തു
 DocType: Fee Schedule,Successful,വിജയകരം
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,പ്രോജക്ട് അവസ്ഥ
 DocType: UOM,Check this to disallow fractions. (for Nos),ഘടകാംശങ്ങൾ അനുമതി ഇല്ലാതാക്കുന്നത് ഇത് ചെക്ക്. (ഒഴിവ് വേണ്ടി)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,താഴെ പ്രൊഡക്ഷൻ ഓർഡറുകൾ സൃഷ്ടിച്ചിട്ടില്ല:
-DocType: Student Admission,Naming Series (for Student Applicant),സീരീസ് (സ്റ്റുഡന്റ് അപേക്ഷകൻ) എന്നു
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,താഴെ പ്രൊഡക്ഷൻ ഓർഡറുകൾ സൃഷ്ടിച്ചിട്ടില്ല:
+DocType: Student Admission Program,Naming Series (for Student Applicant),സീരീസ് (സ്റ്റുഡന്റ് അപേക്ഷകൻ) എന്നു
 DocType: Delivery Note,Transporter Name,ട്രാൻസ്പോർട്ടർ പേര്
 DocType: Authorization Rule,Authorized Value,അംഗീകൃത മൂല്യം
 DocType: BOM,Show Operations,ഓപ്പറേഷൻസ് കാണിക്കുക
@@ -2611,7 +2661,7 @@
 ,Employees working on a holiday,ഒരു അവധിക്കാലം പ്രവർത്തിക്കുന്ന ജീവനക്കാരിൽ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,മർക്കോസ് നിലവിലുള്ളജാലകങ്ങള്
 DocType: Project,% Complete Method,% പൂർത്തിയായി രീതി
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,ഡ്രഗ്
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,ഡ്രഗ്
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},മെയിൻറനൻസ് ആരംഭ തീയതി സീരിയൽ ഇല്ല {0} വേണ്ടി ഡെലിവറി തീയതി മുമ്പ് ആകാൻ പാടില്ല
 DocType: Production Order,Actual End Date,യഥാർത്ഥ അവസാന തീയതി
 DocType: BOM,Operating Cost (Company Currency),ഓപ്പറേറ്റിങ് ചെലവ് (കമ്പനി കറൻസി)
@@ -2629,13 +2679,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,ഉപയോക്താവ് അംഗീകരിക്കുന്നതിൽ ഭരണം ബാധകമാകുന്നതാണ് ഉപയോക്താവിന് അതേ ആകും കഴിയില്ല
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),(സ്റ്റോക്ക് UOM പ്രകാരം) അടിസ്ഥാന റേറ്റ്
 DocType: SMS Log,No of Requested SMS,അഭ്യർത്ഥിച്ച എസ്എംഎസ് ഒന്നും
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,ശമ്പള വിടണമെന്ന് അംഗീകൃത അനുവാദ ആപ്ലിക്കേഷന് രേഖകളുമായി പൊരുത്തപ്പെടുന്നില്ല
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,ശമ്പള വിടണമെന്ന് അംഗീകൃത അനുവാദ ആപ്ലിക്കേഷന് രേഖകളുമായി പൊരുത്തപ്പെടുന്നില്ല
 DocType: Campaign,Campaign-.####,കാമ്പയിൻ -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,അടുത്ത ഘട്ടങ്ങൾ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,മികച്ച സാധ്യത നിരക്കിൽ വ്യക്തമാക്കിയ ഇനങ്ങൾ നൽകുക
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,ഇൻവോയ്സ് ഉണ്ടാക്കുക
 DocType: Selling Settings,Auto close Opportunity after 15 days,15 ദിവസം കഴിഞ്ഞ് ഓട്ടോ അടയ്ക്കൂ അവസരം
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} എന്ന സ്കോർക്കോർഡ് നിലയ്ക്കൽ കാരണം {0} വാങ്ങൽ ഓർഡറുകൾ അനുവദനീയമല്ല.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} എന്ന സ്കോർക്കോർഡ് നിലയ്ക്കൽ കാരണം {0} വാങ്ങൽ ഓർഡറുകൾ അനുവദനീയമല്ല.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,അവസാനിക്കുന്ന വർഷം
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot /% Lead
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot /% Lead
@@ -2672,7 +2722,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","എല്ലാ വാങ്ങൽ ഇടപാടുകൾ പ്രയോഗിക്കാൻ കഴിയുന്ന സാധാരണം നികുതി ടെംപ്ലേറ്റ്. * ഈ ഫലകം നികുതി തലവന്മാരും പട്ടിക ഉൾക്കൊള്ളാൻ കഴിയും ഒപ്പം &quot;ഷിപ്പിങ്&quot;, &quot;ഇൻഷുറൻസ്&quot;, തുടങ്ങിയവ &quot;കൈകാര്യം&quot; #### പോലുള്ള മറ്റ് ചെലവിൽ തലവന്മാരും നിങ്ങൾ ഇവിടെ നിർവ്വചിക്കുന്ന നികുതി നിരക്ക് എല്ലാ ** ഇനങ്ങൾ വേണ്ടി സ്റ്റാൻഡേർഡ് നികുതി നിരക്ക് ആയിരിക്കും ശ്രദ്ധിക്കുക *. വ്യത്യസ്ത നിരക്കുകൾ ഉണ്ടു എന്നു ** ഇനങ്ങൾ ** അവിടെ അവ ** ഇനം നികുതി ചേർത്തു വേണം ** ടേബിൾ ** ഇനം ** മാസ്റ്റർ. ഈ ** ആകെ ** നെറ്റിലെ കഴിയും (ആ അടിസ്ഥാന തുക ആകെത്തുകയാണ്) -: നിരകൾ 1. കണക്കുകൂട്ടല് തരം #### വിവരണം. - ** മുൻ വരി ന് ആകെ / തുക ** (വർദ്ധിക്കുന്നത് നികുതികൾ അല്ലെങ്കിൽ ചാർജുകളും). നിങ്ങൾ ഈ ഓപ്ഷൻ തിരഞ്ഞെടുക്കുകയാണെങ്കിൽ, നികുതി മുൻ വരി (നികുതി പട്ടിക ൽ) അളവിലോ ആകെ ശതമാനത്തിൽ പ്രയോഗിക്കും. - ** (സൂചിപ്പിച്ച പോലെ) ** യഥാർത്ഥ. 2. അക്കൗണ്ട് ഹെഡ്: നികുതി / ചാർജ് (ഷിപ്പിംഗ് പോലെ) ഒരു വരുമാനം ആണ് അല്ലെങ്കിൽ അത് ഒരു കോസ്റ്റ് കേന്ദ്രം നേരെ ബുക്ക് ആവശ്യമാണ് അഴിപ്പാന് എങ്കിൽ: ഈ നികുതി 3. ചെലവ് കേന്ദ്രം ബുക്ക് ചെയ്യും പ്രകാരം അക്കൗണ്ട് ലെഡ്ജർ. 4. വിവരണം: (ഇൻവോയ്സുകൾ / ഉദ്ധരണികൾ പ്രിന്റ് ചെയ്യുക എന്ന്) നികുതി വിവരണം. 5. നിരക്ക്: നികുതി നിരക്ക്. 6. തുക: നികുതി തുക. 7. ആകെ: ഈ പോയിന്റിന് സഞ്ചിയിപ്പിച്ചിട്ടുള്ള മൊത്തം. 8. വരി നൽകുക: &quot;മുൻ വരി ആകെ&quot; അടിസ്ഥാനമാക്കി നിങ്ങൾ ഈ കണക്കുകൂട്ടൽ അടിസ്ഥാനമായി എടുത്ത ചെയ്യുന്ന വരി നമ്പർ (സ്വതവേയുള്ള മുൻ വരി ആണ്) തിരഞ്ഞെടുക്കാം. 9. വേണ്ടി നികുതി അഥവാ ചാർജ് പരിഗണിക്കുക: നികുതി / ചാർജ് മൂലധനം (മൊത്തം അല്ല ഒരു ഭാഗം) അല്ലെങ്കിൽ മാത്രം ആകെ (ഇനത്തിലേക്ക് മൂല്യം ചേർക്കുക ഇല്ല) അല്ലെങ്കിൽ രണ്ടും മാത്രമാണ് ഈ വിഭാഗത്തിലെ നിങ്ങളെ വ്യക്തമാക്കാൻ കഴിയും. 10. ചേർക്കുക അല്ലെങ്കിൽ നിയമഭേദഗതി: നിങ്ങൾ നികുതി ചേർക്കാൻ അല്ലെങ്കിൽ കുറച്ചാണ് ആഗ്രഹിക്കുന്ന എന്നു്."
 DocType: Homepage,Homepage,ഹോംപേജ്
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,ഫിസിഷ്യനെ തിരഞ്ഞെടുക്കുക ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',അപ്ഡേറ്റ് ടാബ്കോൺഷൂട്ടിംഗ് സെറ്റ് ഇൻവോയ്സ് = &#39;{0}&#39; ഇവിടെ name = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd ക്വാണ്ടിറ്റി
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},സൃഷ്ടിച്ചു ഫീസ് റെക്കോർഡ്സ് - {0}
 DocType: Asset Category Account,Asset Category Account,അസറ്റ് വർഗ്ഗം അക്കൗണ്ട്
@@ -2684,7 +2733,7 @@
 DocType: Asset,Manual,കൈകൊണ്ടുള്ള
 DocType: Salary Component Account,Salary Component Account,ശമ്പള ഘടകങ്ങളുടെ അക്കൗണ്ട്
 DocType: Global Defaults,Hide Currency Symbol,കറൻസി ചിഹ്നം മറയ്ക്കുക
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","ഉദാ ബാങ്ക്, ക്യാഷ്, ക്രെഡിറ്റ് കാർഡ്"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","ഉദാ ബാങ്ക്, ക്യാഷ്, ക്രെഡിറ്റ് കാർഡ്"
 DocType: Lead Source,Source Name,ഉറവിട പേര്
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","മുതിർന്നവരിൽ സാധാരണ രക്തസമ്മർദ്ദം 120 mmHg systolic, 80 mmHg ഡയസ്റ്റോളിക്, ചുരുക്കി &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,ക്രെഡിറ്റ് കുറിപ്പ്
@@ -2703,16 +2752,16 @@
 DocType: Patient,Occupation,തൊഴില്
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,വരി {0}: ആരംഭ തീയതി അവസാന തീയതി മുമ്പ് ആയിരിക്കണം
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),ആകെ (Qty)
-DocType: Sales Invoice,This Document,ഈ പ്രമാണം
 DocType: Installation Note Item,Installed Qty,ഇൻസ്റ്റോൾ ചെയ്ത Qty
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,ചില അസാധുവായ ഇമെയിൽ വിലാസങ്ങൾ കാരണം ഇത് ആയിരിക്കും
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,നിങ്ങൾ ചേർത്തു
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,പരിശീലന ഫലം
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,പരിശീലന ഫലം
 DocType: Purchase Invoice,Is Paid,നൽകപ്പെടും
 DocType: Salary Structure,Total Earning,മൊത്തം സമ്പാദ്യം
 DocType: Purchase Receipt,Time at which materials were received,വസ്തുക്കൾ ലഭിച്ച ഏത് സമയം
 DocType: Stock Ledger Entry,Outgoing Rate,ഔട്ട്ഗോയിംഗ് റേറ്റ്
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,ഓർഗനൈസേഷൻ ബ്രാഞ്ച് മാസ്റ്റർ.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,ഓർഗനൈസേഷൻ ബ്രാഞ്ച് മാസ്റ്റർ.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,അഥവാ
 DocType: Sales Order,Billing Status,ബില്ലിംഗ് അവസ്ഥ
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ഒരു പ്രശ്നം റിപ്പോർട്ടുചെയ്യുക
@@ -2727,8 +2776,9 @@
 DocType: Notification Control,Sales Order Message,സെയിൽസ് ഓർഡർ സന്ദേശം
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","കമ്പനി, കറൻസി, നടപ്പു സാമ്പത്തിക വർഷം, തുടങ്ങിയ സജ്ജമാക്കുക സ്വതേ മൂല്യങ്ങൾ"
 DocType: Payment Entry,Payment Type,പേയ്മെന്റ് തരം
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ഇനം {0} ഒരു ബാച്ച് തിരഞ്ഞെടുക്കുക. ഈ നിബന്ധനയുടെ പൂര്ത്തീകരിക്കുന്നു എന്ന് ഒരു ബാച്ച് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ഇനം {0} ഒരു ബാച്ച് തിരഞ്ഞെടുക്കുക. ഈ നിബന്ധനയുടെ പൂര്ത്തീകരിക്കുന്നു എന്ന് ഒരു ബാച്ച് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ഇനം {0} ഒരു ബാച്ച് തിരഞ്ഞെടുക്കുക. ഈ നിബന്ധനയുടെ പൂര്ത്തീകരിക്കുന്നു എന്ന് ഒരു ബാച്ച് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ഇനം {0} ഒരു ബാച്ച് തിരഞ്ഞെടുക്കുക. ഈ നിബന്ധനയുടെ പൂര്ത്തീകരിക്കുന്നു എന്ന് ഒരു ബാച്ച് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
+DocType: Hub Category,Parent Category,രക്ഷാകർതൃ വിഭാഗം
 DocType: Process Payroll,Select Employees,എംപ്ലോയീസ് തിരഞ്ഞെടുക്കുക
 DocType: Opportunity,Potential Sales Deal,സാധ്യതയുള്ള സെയിൽസ് പ്രവർത്തിച്ചു
 DocType: Complaint,Complaints,പരാതികൾ
@@ -2766,7 +2816,7 @@
 DocType: Bin,Reserved Quantity,സംരക്ഷിത ക്വാണ്ടിറ്റി
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,ദയവായി സാധുവായ ഇമെയിൽ വിലാസം നൽകുക
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,ദയവായി സാധുവായ ഇമെയിൽ വിലാസം നൽകുക
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,വണ്ടിയിൽ ഒരു ഇനം ദയവായി തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,വണ്ടിയിൽ ഒരു ഇനം ദയവായി തിരഞ്ഞെടുക്കുക
 DocType: Landed Cost Voucher,Purchase Receipt Items,രസീത് ഇനങ്ങൾ വാങ്ങുക
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,യഥേഷ്ടമാക്കുക ഫോമുകൾ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,കുടിശിക
@@ -2776,15 +2826,15 @@
 DocType: Payment Request,Amount in customer's currency,ഉപഭോക്താവിന്റെ കറൻസി തുക
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,ഡെലിവറി
 DocType: Stock Reconciliation Item,Current Qty,ഇപ്പോഴത്തെ Qty
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,സപ്ലയർമാരെ ചേർക്കുക
+DocType: Restaurant Menu,Restaurant Menu,റെസ്റ്റോറന്റ് മെനു
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,മുമ്പത്തെ
 DocType: Appraisal Goal,Key Responsibility Area,കീ ഉത്തരവാദിത്വം ഏരിയ
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",സ്റ്റുഡന്റ് ബാച്ചുകൾ നിങ്ങൾ വിദ്യാർത്ഥികൾക്ക് ഹാജർ അസെസ്മെന്റുകൾ ഫീസും കണ്ടെത്താൻ സഹായിക്കുന്ന
 DocType: Payment Entry,Total Allocated Amount,ആകെ തുക
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,ശാശ്വതമായ സാധനങ്ങളും സ്ഥിരസ്ഥിതി സാധനങ്ങളും അക്കൗണ്ട് സജ്ജമാക്കുക
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,ശാശ്വതമായ സാധനങ്ങളും സ്ഥിരസ്ഥിതി സാധനങ്ങളും അക്കൗണ്ട് സജ്ജമാക്കുക
 DocType: Item Reorder,Material Request Type,മെറ്റീരിയൽ അഭ്യർത്ഥന തരം
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},{0} ലേക്ക് {1} നിന്ന് ശമ്പളം വേണ്ടി Accural ജേണൽ എൻട്രി
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage രക്ഷിച്ചില്ല, നിറഞ്ഞിരിക്കുന്നു"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage രക്ഷിച്ചില്ല, നിറഞ്ഞിരിക്കുന്നു"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,വരി {0}: UOM പരിവർത്തന ഫാക്ടർ നിർബന്ധമായും
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,റൂം ശേഷി
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,റഫറൻസ്
@@ -2823,16 +2873,18 @@
 DocType: Project,Task Completion,ടാസ്ക് പൂർത്തീകരണവും
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,അല്ല സ്റ്റോക്കുണ്ട്
 DocType: Appraisal,HR User,എച്ച് ഉപയോക്താവ്
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,നികുതി ചാർജുകളും വെട്ടിക്കുറയ്ക്കും
-apps/erpnext/erpnext/hooks.py +129,Issues,പ്രശ്നങ്ങൾ
+apps/erpnext/erpnext/hooks.py +138,Issues,പ്രശ്നങ്ങൾ
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},നില {0} ഒന്നാണ് ആയിരിക്കണം
 DocType: Sales Invoice,Debit To,ഡെബിറ്റ് ചെയ്യുക
+DocType: Restaurant Menu Item,Restaurant Menu Item,റെസ്റ്റോറന്റ് മെനു ഇനം
 DocType: Delivery Note,Required only for sample item.,മാത്രം സാമ്പിൾ ഇനത്തിന്റെ ആവശ്യമാണ്.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ഇടപാട് ശേഷം യഥാർത്ഥ Qty
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},"ശമ്പളം സ്ലിപ്പ് ഇല്ല {0}, {1} തമ്മിലുള്ള കണ്ടെത്തി"
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},"ശമ്പളം സ്ലിപ്പ് ഇല്ല {0}, {1} തമ്മിലുള്ള കണ്ടെത്തി"
 ,Pending SO Items For Purchase Request,പർച്ചേസ് അഭ്യർത്ഥന അവശേഷിക്കുന്ന ഷൂട്ട്ഔട്ട് ഇനങ്ങൾ
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,സ്റ്റുഡന്റ് പ്രവേശന
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} അപ്രാപ്തമാക്കിയിട്ടുണ്ടെങ്കിൽ
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,സ്റ്റുഡന്റ് പ്രവേശന
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} അപ്രാപ്തമാക്കിയിട്ടുണ്ടെങ്കിൽ
 DocType: Supplier,Billing Currency,ബില്ലിംഗ് കറന്സി
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,അതിബൃഹത്തായ
@@ -2855,6 +2907,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,ആവശ്യമായ സന്ദർശനങ്ങൾ യാതൊരു സൂചിപ്പിക്കുക
 DocType: Stock Settings,Default Valuation Method,സ്ഥിരസ്ഥിതി മൂലധനം രീതിയുടെ
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,ഫീസ്
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,അപ്ഡേറ്റ് പുരോഗതിയിലാണ്. ഇതിന് കുറച്ച് സമയമെടുത്തേക്കാം.
 DocType: Vehicle Log,Fuel Qty,ഇന്ധന അളവ്
 DocType: Production Order Operation,Planned Start Time,ആസൂത്രണം ചെയ്ത ആരംഭിക്കുക സമയം
 DocType: Course,Assessment,നികുതിചുമത്തല്
@@ -2870,7 +2923,7 @@
 DocType: Price List,Price List Master,വില പട്ടിക മാസ്റ്റർ
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,എല്ലാ സെയിൽസ് ഇടപാട് ഒന്നിലധികം ** സെയിൽസ് പേഴ്സൺസ് നേരെ ടാഗ് ചെയ്യാൻ കഴിയും ** നിങ്ങൾ ലക്ഷ്യങ്ങളിലൊന്നാണ് സജ്ജമാക്കാൻ നിരീക്ഷിക്കുവാനും കഴിയും.
 ,S.O. No.,ഷൂട്ട്ഔട്ട് നമ്പർ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},ലീഡ് നിന്ന് {0} കസ്റ്റമർ സൃഷ്ടിക്കാൻ ദയവായി
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},ലീഡ് നിന്ന് {0} കസ്റ്റമർ സൃഷ്ടിക്കാൻ ദയവായി
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,രോഗിയെ തിരഞ്ഞെടുക്കുക
 DocType: Price List,Applicable for Countries,രാജ്യങ്ങൾ വേണ്ടി ബാധകമായ
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,പാരാമീറ്റർ നാമം
@@ -2902,27 +2955,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ചിലവേറിയ / വ്യത്യാസം അക്കൗണ്ട് ({0}) ഒരു &#39;പ്രോഫിറ്റ് അല്ലെങ്കിൽ നഷ്ടം&#39; അക്കൗണ്ട് ആയിരിക്കണം
 DocType: Project,Copied From,നിന്നും പകർത്തി
 DocType: Project,Copied From,നിന്നും പകർത്തി
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},പേര് പിശക്: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,കുറവ്
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},പേര് പിശക്: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,കുറവ്
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} {2} {3} ബന്ധപ്പെടുത്തിയ ഇല്ല
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ജീവനക്കാരൻ {0} വേണ്ടി ഹാജർ ഇതിനകം മലിനമായിരിക്കുന്നു
 DocType: Packing Slip,If more than one package of the same type (for print),(പ്രിന്റ് വേണ്ടി) ഒരേ തരത്തിലുള്ള ഒന്നിലധികം പാക്കേജ് എങ്കിൽ
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,റെസ്റ്റോറന്റ് ക്രമീകരണങ്ങളിൽ സ്ഥിരസ്ഥിതി ഉപഭോക്താവിനെ സജ്ജീകരിക്കുക
 ,Salary Register,ശമ്പള രജിസ്റ്റർ
 DocType: Warehouse,Parent Warehouse,രക്ഷാകർതൃ വെയർഹൗസ്
 DocType: C-Form Invoice Detail,Net Total,നെറ്റ് ആകെ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},സ്വതേ BOM ലേക്ക് ഇനം {0} കണ്ടില്ല പദ്ധതി {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},സ്വതേ BOM ലേക്ക് ഇനം {0} കണ്ടില്ല പദ്ധതി {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,വിവിധ വായ്പാ തരം നിർവചിക്കുക
 DocType: Bin,FCFS Rate,അരക്ഷിതാവസ്ഥയിലും റേറ്റ്
 DocType: Payment Reconciliation Invoice,Outstanding Amount,നിലവിലുള്ള തുക
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),സമയം (മിനിറ്റിനുള്ളിൽ)
 DocType: Project Task,Working,ജോലി
 DocType: Stock Ledger Entry,Stock Queue (FIFO),ഓഹരി ക്യൂ (fifo തുറക്കാന്കഴിയില്ല)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,സാമ്പത്തിക വർഷം
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,സാമ്പത്തിക വർഷം
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} കമ്പനി {1} സ്വന്തമല്ല
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,{0} എന്നതിനുള്ള മാനദണ്ഡ സ്കോർ ഫംഗ്ഷൻ പരിഹരിക്കാൻ കഴിഞ്ഞില്ല. സമവാക്യം സാധുവാണെന്ന് ഉറപ്പുവരുത്തുക.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,പോലെ ന്റെ ചിലവു
 DocType: Healthcare Settings,Out Patient Settings,രോഗിയുടെ സജ്ജീകരണങ്ങൾ
 DocType: Account,Round Off,ഓഫാക്കുക റൌണ്ട്
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,അളവ് പോസിറ്റീവ് ആയിരിക്കണം
 ,Requested Qty,അഭ്യർത്ഥിച്ചു Qty
 DocType: Tax Rule,Use for Shopping Cart,ഷോപ്പിംഗ് കാർട്ട് വേണ്ടി ഉപയോഗിക്കുക
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},മൂല്യം {0} ആട്രിബ്യൂട്ടിനായുള്ള {1} സാധുവായ ഇനം പട്ടികയിൽ നിലവിലില്ല ഇനം {2} മൂല്യങ്ങളെ ആട്രിബ്യൂട്ടുചെയ്യുക
@@ -2931,7 +2986,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","നിരക്കുകൾ നിങ്ങളുടെ നിരക്കു പ്രകാരം, ഐറ്റം qty അല്ലെങ്കിൽ തുക അടിസ്ഥാനമാക്കി ആനുപാതികമായി വിതരണം ചെയ്യും"
 DocType: Maintenance Visit,Purposes,ആവശ്യകതകൾ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,കുറഞ്ഞത് ഒരു ഐറ്റം മടക്കം പ്രമാണത്തിൽ നെഗറ്റീവ് അളവ് കടന്നു വേണം
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,കോഴ്സുകൾ ചേർക്കുക
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ഓപ്പറേഷൻ {0} ഇനി വറ്ക്ക്സ്റ്റേഷൻ {1} ഏതെങ്കിലും ലഭ്യമായ പ്രവ്യത്തി അധികം, ഒന്നിലധികം ഓപ്പറേഷൻസ് കടന്നു ഓപ്പറേഷൻ ഇടിച്ചു"
 ,Requested,അഭ്യർത്ഥിച്ചു
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,ഇല്ല അഭിപ്രായപ്രകടനം
@@ -2943,6 +2997,8 @@
 DocType: Employee Loan,Repaid/Closed,പ്രതിഫലം / അടച്ചു
 DocType: Item,Total Projected Qty,ആകെ പ്രൊജക്റ്റുചെയ്തു അളവ്
 DocType: Monthly Distribution,Distribution Name,വിതരണ പേര്
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണക്കാരൻ തരം
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","{0} {2} for accounting entries ചെയ്യേണ്ട ഇനം {0} എന്നതിന് മൂല്യനിർണ്ണയ നിരക്ക് കണ്ടെത്തിയില്ല. {1} പൂജ്യം മൂല്യം പൂരിപ്പിച്ച വസ്തു എന്ന സ്ഥാനത്തേക്കാണ് ഇനം വരുന്നതെങ്കിൽ, അത് {1} ഇന പട്ടികയിൽ പരാമർശിക്കുക. അല്ലെങ്കിൽ, ഇനത്തിനായുള്ള ഒരു ഇൻകമിംഗ് സ്റ്റോക്ക് ട്രാൻസാക്ഷൻ ഉണ്ടാക്കുക അല്ലെങ്കിൽ ഇനം റിക്കോർഡിലെ മൂല്യനിർണ്ണയ നിരക്ക് പരാമർശിക്കുക, തുടർന്ന് ഈ എൻട്രി സമർപ്പിക്കുന്നതിൽ / സമർപ്പിക്കുന്നതിനായി ശ്രമിക്കുക"
 DocType: Course,Course Code,കോഴ്സ് കോഡ്
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},ഇനം {0} ആവശ്യമുള്ളതിൽ ഗുണനിലവാര പരിശോധന
 DocType: POS Settings,Use POS in Offline Mode,ഓഫ്സ് മോഡിൽ POS ഉപയോഗിക്കുക
@@ -2953,14 +3009,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,ടെറിട്ടറി ട്രീ നിയന്ത്രിക്കുക.
 DocType: Journal Entry Account,Sales Invoice,സെയിൽസ് ഇൻവോയിസ്
 DocType: Journal Entry Account,Party Balance,പാർട്ടി ബാലൻസ്
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,ഡിസ്കൌണ്ട് പ്രയോഗിക്കുക തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,ഡിസ്കൌണ്ട് പ്രയോഗിക്കുക തിരഞ്ഞെടുക്കുക
 DocType: Company,Default Receivable Account,സ്ഥിരസ്ഥിതി സ്വീകാ അക്കൗണ്ട്
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,മുകളിൽ തിരഞ്ഞെടുത്ത തിരയാം അടച്ച മൊത്തം ശമ്പളത്തിനായി ബാങ്ക് എൻട്രി സൃഷ്ടിക്കുക
 DocType: Physician,Physician Schedule,ഫിസിഷ്യൻ ഷെഡ്യൂൾ
 DocType: Purchase Invoice,Deemed Export,എക്സ്പോർട്ട് ഡിമാൻഡ്
 DocType: Stock Entry,Material Transfer for Manufacture,ഉല്പാദനത്തിനുള്ള മെറ്റീരിയൽ ട്രാൻസ്ഫർ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,കിഴിവും ശതമാനം ഒരു വില പട്ടിക നേരെ അല്ലെങ്കിൽ എല്ലാ വില പട്ടിക വേണ്ടി ഒന്നുകിൽ പ്രയോഗിക്കാൻ കഴിയും.
-DocType: Purchase Invoice,Half-yearly,അർദ്ധവാർഷികം
+DocType: Subscription,Half-yearly,അർദ്ധവാർഷികം
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,ഓഹരി വേണ്ടി അക്കൗണ്ടിംഗ് എൻട്രി
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,ഇതിനകം നിങ്ങൾ വിലയിരുത്തൽ മാനദണ്ഡങ്ങൾ {} വേണ്ടി വിലയിരുത്തി ചെയ്തു.
@@ -2989,13 +3045,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,എക്സ്ട്രാ ചെറുകിട
 DocType: Company,Standard Template,സ്റ്റാൻഡേർഡ് ഫലകം
 DocType: Training Event,Theory,സിദ്ധാന്തം
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,മുന്നറിയിപ്പ്: Qty അഭ്യർത്ഥിച്ചു മെറ്റീരിയൽ മിനിമം ഓർഡർ Qty കുറവാണ്
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,മുന്നറിയിപ്പ്: Qty അഭ്യർത്ഥിച്ചു മെറ്റീരിയൽ മിനിമം ഓർഡർ Qty കുറവാണ്
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,അക്കൗണ്ട് {0} മരവിച്ചു
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,സംഘടന പെടുന്ന അക്കൗണ്ടുകൾ ഒരു പ്രത്യേക ചാർട്ട് കൊണ്ട് നിയമ വിഭാഗമായാണ് / സബ്സിഡിയറി.
 DocType: Payment Request,Mute Email,നിശബ്ദമാക്കുക ഇമെയിൽ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","ഫുഡ്, ബീവറേജ് &amp; പുകയില"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},മാത്രം unbilled {0} നേരെ തീർക്കാം കഴിയുമോ
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,കമ്മീഷൻ നിരക്ക് 100 വലുതായിരിക്കും കഴിയില്ല
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},മാത്രം unbilled {0} നേരെ തീർക്കാം കഴിയുമോ
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,കമ്മീഷൻ നിരക്ക് 100 വലുതായിരിക്കും കഴിയില്ല
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,ആദ്യം {0} നൽകുക
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,നിന്ന് മറുപടികൾ ഇല്ല
@@ -3013,10 +3069,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,കളർ
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,അസസ്മെന്റ് പദ്ധതി മാനദണ്ഡം
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,വാങ്ങൽ ഓർഡറുകൾ തടയുക
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,സംശയിക്കാവുന്ന
 DocType: Patient Appointment,Scheduled,ഷെഡ്യൂൾഡ്
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,ഉദ്ധരണി അഭ്യർത്ഥന.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,മാനവ വിഭവശേഷി&gt; എച്ച്ആർ സജ്ജീകരണങ്ങളിൽ ദയവായി എംപ്ലോയീ നെയിമിങ് സിസ്റ്റം സെറ്റപ്പ് ചെയ്യുക
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",&quot;ഓഹരി ഇനം ആകുന്നു &#39;എവിടെ ഇനം തിരഞ്ഞെടുക്കുക&quot; ഇല്ല &quot;ആണ്&quot; സെയിൽസ് ഇനം തന്നെയല്ലേ &quot;&quot; അതെ &quot;ആണ് മറ്റൊരു പ്രൊഡക്ട് ബണ്ടിൽ ഇല്ല ദയവായി
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,ഉപഭോക്താവിനെ തിരഞ്ഞെടുക്കുക
 DocType: Student Log,Academic,പണ്ഡിതോചിതമായ
 DocType: Patient,Personal and Social History,വ്യക്തിപരവും സാമൂഹ്യവുമായ ചരിത്രം
 DocType: Fee Schedule,Fee Breakup for each student,ഓരോ വിദ്യാർത്ഥിക്കും ഫീസ് ഒടിക്കാൻ
@@ -3026,7 +3083,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,മൂലധനം റേറ്റ്
 DocType: Stock Reconciliation,SR/,എസ്.ആർ /
 DocType: Vehicle,Diesel,ഡീസൽ
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,വില പട്ടിക കറന്സി തിരഞ്ഞെടുത്തിട്ടില്ല
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,വില പട്ടിക കറന്സി തിരഞ്ഞെടുത്തിട്ടില്ല
 apps/erpnext/erpnext/config/healthcare.py +46,Results,ഫലം
 ,Student Monthly Attendance Sheet,വിദ്യാർത്ഥി പ്രതിമാസ ഹാജർ ഷീറ്റ്
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},ജീവനക്കാർ {0} ഇതിനകം {1} {2} ഉം {3} തമ്മിലുള്ള അപേക്ഷിച്ചു
@@ -3042,7 +3099,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,സെയിൽസ് പങ്കാളികൾ നിയന്ത്രിക്കുക.
 DocType: Quality Inspection,Inspection Type,ഇൻസ്പെക്ഷൻ തരം
 DocType: Fee Validity,Visited yet,ഇതുവരെ സന്ദർശിച്ചു
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,നിലവിലുള്ള ഇടപാടിനെ അബദ്ധങ്ങളും ഗ്രൂപ്പ് പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,നിലവിലുള്ള ഇടപാടിനെ അബദ്ധങ്ങളും ഗ്രൂപ്പ് പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല.
 DocType: Assessment Result Tool,Result HTML,ഫലം എച്ച്ടിഎംഎൽ
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ഓൺ കാലഹരണപ്പെടുന്നു
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,വിദ്യാർത്ഥികൾ ചേർക്കുക
@@ -3069,7 +3126,7 @@
 DocType: Healthcare Settings,Result Printed,ഫലം പ്രിന്റ് ചെയ്തു
 DocType: Asset Category Account,Depreciation Expense Account,മൂല്യത്തകർച്ച ചിലവേറിയ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,പരിശീലന കാലഖട്ടം
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},{0} കാണുക
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},{0} കാണുക
 DocType: Customer Group,Only leaf nodes are allowed in transaction,മാത്രം ഇല നോഡുകൾ ഇടപാട് അനുവദനീയമാണ്
 DocType: Expense Claim,Expense Approver,ചിലവേറിയ Approver
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,വരി {0}: കസ്റ്റമർ നേരെ മുൻകൂർ ക്രെഡിറ്റ് ആയിരിക്കണം
@@ -3081,7 +3138,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,തീയതി-ചെയ്യുന്നതിനായി
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,കോഴ്സ് സമയക്രമം ഇല്ലാതാക്കി:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,SMS ഡെലിവറി നില പരിപാലിക്കുന്നതിനായി ക്ഌപ്തപ്പെടുത്താവുന്നതാണ്
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,സെൽറ്റുകൾ ടാർഗെറ്റ് ചെയ്യുക
 DocType: Accounts Settings,Make Payment via Journal Entry,ജേർണൽ എൻട്രി വഴി പേയ്മെന്റ് നിർമ്മിക്കുക
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,പ്രിന്റ്
 DocType: Item,Inspection Required before Delivery,ഡെലിവറി മുമ്പ് ആവശ്യമായ ഇൻസ്പെക്ഷൻ
@@ -3089,7 +3145,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,തീർച്ചപ്പെടുത്തിയിട്ടില്ലാത്ത പ്രവർത്തനങ്ങൾ
 DocType: Patient Appointment,Reminded,ഓർമ്മപ്പെടുത്തി
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,നിങ്ങളുടെ ഓർഗനൈസേഷൻ
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,നിങ്ങളുടെ ഓർഗനൈസേഷൻ
 DocType: Fee Component,Fees Category,ഫീസ് വർഗ്ഗം
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,തീയതി വിടുതൽ നൽകുക.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,ശാരീരിക
@@ -3101,7 +3157,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,പുനഃക്രമീകരിക്കുക ലെവൽ
 DocType: Company,Chart Of Accounts Template,അക്കൗണ്ടുകൾ ഫലകം ചാർട്ട്
 DocType: Attendance,Attendance Date,ഹാജർ തീയതി
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},ഇനത്തിന്റെ വില വില പട്ടിക {1} ൽ {0} അപ്ഡേറ്റുചെയ്തിട്ടുള്ളൂ
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},ഇനത്തിന്റെ വില വില പട്ടിക {1} ൽ {0} അപ്ഡേറ്റുചെയ്തിട്ടുള്ളൂ
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,വരുമാനമുള്ളയാളും കിഴിച്ചുകൊണ്ടു അടിസ്ഥാനമാക്കി ശമ്പളം ഖണ്ഡങ്ങളായി.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,കുട്ടി നോഡുകൾ കൊണ്ട് അക്കൗണ്ട് ലെഡ്ജർ പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല
 DocType: Purchase Invoice Item,Accepted Warehouse,അംഗീകരിച്ച വെയർഹൗസ്
@@ -3117,9 +3173,10 @@
 ,Employee Birthday,ജീവനക്കാരുടെ ജന്മദിനം
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,സ്റ്റുഡന്റ് ബാച്ച് ഹാജർ ടൂൾ
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,പരിധി ക്രോസ്
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,ഷെഡ്യൂൾ ചെയ്തു
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,വെഞ്ച്വർ ക്യാപ്പിറ്റൽ
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"ഈ &#39;അക്കാദമിക് വർഷം&#39; {0}, {1} ഇതിനകം നിലവിലുണ്ട് &#39;ടേം പേര്&#39; ഒരു അക്കാദമിക് കാലാവധി. ഈ എൻട്രികൾ പരിഷ്ക്കരിച്ച് വീണ്ടും ശ്രമിക്കുക."
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","ഇനം {0} നേരെ നിലവിലുള്ള ഇടപാടുകൾ ഉണ്ട് നിലയിൽ, {1} മൂല്യം മാറ്റാൻ കഴിയില്ല"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","ഇനം {0} നേരെ നിലവിലുള്ള ഇടപാടുകൾ ഉണ്ട് നിലയിൽ, {1} മൂല്യം മാറ്റാൻ കഴിയില്ല"
 DocType: UOM,Must be Whole Number,മുഴുവനുമുള്ള നമ്പർ ആയിരിക്കണം
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(ദിവസങ്ങളിൽ) അനുവദിച്ചതായും പുതിയ ഇലകൾ
 DocType: Purchase Invoice,Invoice Copy,ഇൻവോയ്സ് പകർത്തുക
@@ -3129,7 +3186,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,ഇൻവോയിസ് നമ്പർ
 DocType: Shopping Cart Settings,Orders,ഉത്തരവുകൾ
 DocType: Employee Leave Approver,Leave Approver,Approver വിടുക
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,ഒരു ബാച്ച് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,ഒരു ബാച്ച് തിരഞ്ഞെടുക്കുക
 DocType: Assessment Group,Assessment Group Name,അസസ്മെന്റ് ഗ്രൂപ്പ് പേര്
 DocType: Manufacturing Settings,Material Transferred for Manufacture,ഉല്പാദനത്തിനുള്ള മാറ്റിയത് മെറ്റീരിയൽ
 DocType: Expense Claim,"A user with ""Expense Approver"" role",&quot;ചിലവേറിയ Approver&quot; വേഷം ഒരു ഉപയോക്താവ്
@@ -3144,7 +3201,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,കാലയളവ് സമാപന എൻട്രി
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,ഡിപ്പാർട്ട്മെന്റ് തിരഞ്ഞെടുക്കുക ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,നിലവിലുള്ള ഇടപാടുകൾ ചെലവ് കേന്ദ്രം ഗ്രൂപ്പ് പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},തുക {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},തുക {0} {1} {2} {3}
 DocType: Account,Depreciation,മൂല്യശോഷണം
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),വിതരണക്കമ്പനിയായ (കൾ)
 DocType: Employee Attendance Tool,Employee Attendance Tool,ജീവനക്കാരുടെ ഹാജർ ടൂൾ
@@ -3156,10 +3213,12 @@
 DocType: GL Entry,Voucher No,സാക്ഷപ്പെടുത്തല് ഇല്ല
 ,Lead Owner Efficiency,ലീഡ് ഉടമ എഫിഷ്യൻസി
 ,Lead Owner Efficiency,ലീഡ് ഉടമ എഫിഷ്യൻസി
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,ഏറ്റവും ജനപ്രിയമായ
 DocType: Leave Allocation,Leave Allocation,വിഹിതം വിടുക
 DocType: Payment Request,Recipient Message And Payment Details,സ്വീകർത്താവിന്റെ സന്ദേശവും പേയ്മെന്റ് വിശദാംശങ്ങൾ
 DocType: Training Event,Trainer Email,പരിശീലകൻ ഇമെയിൽ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ {0} സൃഷ്ടിച്ചു
+DocType: Restaurant Reservation,No of People,ആളുകളുടെ എണ്ണം
 DocType: Production Planning Tool,Include sub-contracted raw materials,സബ് ചുരുങ്ങി അസംസ്കൃത വസ്തുക്കൾ ഉൾപ്പെടുത്തുക
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,നിബന്ധനകളോ കരാറിലെ ഫലകം.
 DocType: Purchase Invoice,Address and Contact,വിശദാംശവും ബന്ധപ്പെടാനുള്ള
@@ -3168,10 +3227,11 @@
 DocType: Supplier,Last Day of the Next Month,അടുത്തത് മാസത്തിലെ അവസാന ദിവസം
 DocType: Support Settings,Auto close Issue after 7 days,7 ദിവസം കഴിഞ്ഞശേഷം ഓട്ടോ അടയ്ക്കൂ പ്രശ്നം
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ലീവ് ബാലൻസ് ഇതിനകം ഭാവിയിൽ ലീവ് അലോക്കേഷൻ റെക്കോർഡ് {1} ൽ കാരി മുന്നോട്ടയയ്ക്കുകയും ലീവ്, {0} മുമ്പ് വിഹിതം കഴിയില്ല"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),കുറിപ്പ്: ചില / പരാമർശം തീയതി {0} ദിവസം (ങ്ങൾ) അനുവദിച്ചിരിക്കുന്ന ഉപഭോക്തൃ ക്രെഡിറ്റ് ദിവസം അധികരിക്കുന്നു
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),കുറിപ്പ്: ചില / പരാമർശം തീയതി {0} ദിവസം (ങ്ങൾ) അനുവദിച്ചിരിക്കുന്ന ഉപഭോക്തൃ ക്രെഡിറ്റ് ദിവസം അധികരിക്കുന്നു
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,സ്റ്റുഡന്റ് അപേക്ഷകന്
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,RECIPIENT യഥാർത്ഥ
 DocType: Asset Category Account,Accumulated Depreciation Account,സൂക്ഷിക്കുന്നത് മൂല്യത്തകർച്ച അക്കൗണ്ട്
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,ഈ ഇമെയിൽ ഓട്ടോജെനറേറ്റഡ് ആണ്
 DocType: Stock Settings,Freeze Stock Entries,ഫ്രീസുചെയ്യുക സ്റ്റോക്ക് എൻട്രികളിൽ
 DocType: Program Enrollment,Boarding Student,ബോർഡിംഗ് വിദ്യാർത്ഥി
 DocType: Asset,Expected Value After Useful Life,ഉപയോഗപ്രദമായ ലൈഫ് ശേഷം പ്രതീക്ഷിക്കുന്ന മൂല്യം
@@ -3179,7 +3239,7 @@
 DocType: Activity Cost,Billing Rate,ബില്ലിംഗ് റേറ്റ്
 ,Qty to Deliver,വിടുവിപ്പാൻ Qty
 ,Stock Analytics,സ്റ്റോക്ക് അനലിറ്റിക്സ്
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,ഓപ്പറേഷൻ ശൂന്യമായിടാൻ കഴിയില്ല
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,ഓപ്പറേഷൻ ശൂന്യമായിടാൻ കഴിയില്ല
 DocType: Maintenance Visit Purpose,Against Document Detail No,ഡോക്യുമെന്റ് വിശദാംശം പോസ്റ്റ് എഗൻസ്റ്റ്
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,പാർട്ടി ഇനം നിർബന്ധമായും
 DocType: Quality Inspection,Outgoing,അയയ്ക്കുന്ന
@@ -3202,7 +3262,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,പ്രവർത്തനം അടിസ്ഥാനമാക്കി ഗ്രൂപ്പ് മാനുവലായി വിദ്യാർത്ഥികളെ തിരഞ്ഞെടുക്കുക
 DocType: Journal Entry,User Remark,ഉപയോക്താവിന്റെ അഭിപ്രായപ്പെടുക
 DocType: Lead,Market Segment,മാർക്കറ്റ് സെഗ്മെന്റ്
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},തുക മൊത്തം നെഗറ്റീവ് ശേഷിക്കുന്ന തുക {0} ശ്രേഷ്ഠ പാടില്ല
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},തുക മൊത്തം നെഗറ്റീവ് ശേഷിക്കുന്ന തുക {0} ശ്രേഷ്ഠ പാടില്ല
 DocType: Supplier Scorecard Period,Variables,വേരിയബിളുകൾ
 DocType: Employee Internal Work History,Employee Internal Work History,ജീവനക്കാർ ആന്തരിക വർക്ക് ചരിത്രം
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),(ഡോ) അടയ്ക്കുന്നു
@@ -3232,21 +3292,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,അപ്ഡേറ്റുകൾ നേടുക
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: അക്കൗണ്ട് {2} കമ്പനി {3} സ്വന്തമല്ല
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,മെറ്റീരിയൽ അഭ്യർത്ഥന {0} റദ്ദാക്കി അല്ലെങ്കിൽ നിറുത്തി
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,മാനേജ്മെന്റ് വിടുക
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,മാനേജ്മെന്റ് വിടുക
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,അക്കൗണ്ട് വഴി ഗ്രൂപ്പ്
 DocType: Sales Order,Fully Delivered,പൂർണ്ണമായി കൈമാറി
 DocType: Lead,Lower Income,ലോവർ ആദായ
+DocType: Restaurant Order Entry,Current Order,നിലവിലെ ഓർഡർ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},ഉറവിടം ടാർഗെറ്റ് വെയർഹൗസ് വരി {0} ഒരേ ആയിരിക്കും കഴിയില്ല
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ഈ ഓഹരി അനുരഞ്ജനം ഒരു തുറക്കുന്നു എൻട്രി മുതൽ വ്യത്യാസം അക്കൗണ്ട്, ഒരു അസറ്റ് / ബാധ്യത തരം അക്കൌണ്ട് ആയിരിക്കണം"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},വിതരണം തുക വായ്പാ തുക {0} അധികമാകരുത് കഴിയില്ല
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,പ്രോഗ്രാമിലേക്ക് പോകുക
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},ഇനം {0} വേണ്ടി ആവശ്യമാണ് വാങ്ങൽ ഓർഡർ നമ്പർ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,പ്രൊഡക്ഷൻ ഓർഡർ സൃഷ്ടിച്ചിട്ടില്ല
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,പ്രൊഡക്ഷൻ ഓർഡർ സൃഷ്ടിച്ചിട്ടില്ല
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;ഈ തീയതി മുതൽ&#39; &#39;തീയതി ആരംഭിക്കുന്ന&#39; ശേഷം ആയിരിക്കണം
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ആയി വിദ്യാർഥി {0} വിദ്യാർഥി അപേക്ഷ {1} ലിങ്കുചെയ്തതിരിക്കുന്നതിനാൽ നില മാറ്റാൻ കഴിയില്ല
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},ആയി വിദ്യാർഥി {0} വിദ്യാർഥി അപേക്ഷ {1} ലിങ്കുചെയ്തതിരിക്കുന്നതിനാൽ നില മാറ്റാൻ കഴിയില്ല
 DocType: Asset,Fully Depreciated,പൂർണ്ണമായി മൂല്യത്തകർച്ചയുണ്ടായ
 ,Stock Projected Qty,ഓഹരി Qty അനുമാനിക്കപ്പെടുന്ന
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},കസ്റ്റമർ {0} {1} പ്രൊജക്ട് സ്വന്തമല്ല
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},കസ്റ്റമർ {0} {1} പ്രൊജക്ട് സ്വന്തമല്ല
 DocType: Employee Attendance Tool,Marked Attendance HTML,അടയാളപ്പെടുത്തിയിരിക്കുന്ന ഹാജർ എച്ച്ടിഎംഎൽ
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","ഉദ്ധരണികൾ നിർദേശങ്ങൾ, നിങ്ങളുടെ ഉപഭോക്താക്കൾക്ക് അയച്ചിരിക്കുന്നു ബിഡ്ഡുകൾ ആകുന്നു"
 DocType: Sales Order,Customer's Purchase Order,കസ്റ്റമർ പർച്ചേസ് ഓർഡർ
@@ -3257,8 +3318,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,ബുക്കുചെയ്തു Depreciations എണ്ണം ക്രമീകരിക്കുക ദയവായി
 DocType: Supplier Scorecard Period,Calculations,കണക്കുകൂട്ടലുകൾ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,മൂല്യം അഥവാ Qty
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,പ്രൊഡക്ഷൻസ് ഓർഡറുകൾ ഉയിർപ്പിച്ചുമിരിക്കുന്ന കഴിയില്ല:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,പ്രൊഡക്ഷൻസ് ഓർഡറുകൾ ഉയിർപ്പിച്ചുമിരിക്കുന്ന കഴിയില്ല:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,മിനിറ്റ്
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup&gt; Settings&gt; Naming Series വഴി {0} നാമത്തിനായുള്ള പരമ്പര സജ്ജീകരിക്കുക
 DocType: Purchase Invoice,Purchase Taxes and Charges,നികുതി ചാർജുകളും വാങ്ങുക
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,സപ്ലയർമാർക്ക് പോകുക
 ,Qty to Receive,സ്വീകരിക്കാൻ Qty
@@ -3272,7 +3334,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,അക്കൗണ്ടിലേക്ക് ക്രെഡിറ്റ് ഒരു ബാലൻസ് ഷീറ്റ് അക്കൗണ്ട് ആയിരിക്കണം
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,എല്ലാ വിതരണക്കാരൻ രീതികൾ
 DocType: Global Defaults,Disable In Words,വാക്കുകളിൽ പ്രവർത്തനരഹിതമാക്കുക
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,ഇനം സ്വയം നമ്പരുള്ള കാരണം ഇനം കോഡ് നിർബന്ധമാണ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,ഇനം സ്വയം നമ്പരുള്ള കാരണം ഇനം കോഡ് നിർബന്ധമാണ്
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},{0} അല്ല തരത്തിലുള്ള ക്വട്ടേഷൻ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,മെയിൻറനൻസ് ഷെഡ്യൂൾ ഇനം
 DocType: Sales Order,%  Delivered,% കൈമാറി
@@ -3294,23 +3356,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,ബാലൻസ് ഇക്വിറ്റി തുറക്കുന്നു
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,അനുരഞ്ജനം
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,അവശേഷിക്കുന്ന
 DocType: Appraisal,Appraisal,വിലനിശ്ചയിക്കല്
 DocType: Purchase Invoice,GST Details,GST വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},വിതരണക്കമ്പനിയായ {0} അയച്ച ഇമെയിൽ
+DocType: Item,Default Sales Unit of Measure,മെഷർ സെലക്ട് സെൽപ്പ് യൂണിറ്റ്
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,തീയതി ആവർത്തിക്കുന്നുണ്ട്
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,അധികാരങ്ങളും നല്കുകയും
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},{0} ഒന്നാണ് ആയിരിക്കണം approver വിടുക
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,ഫീസ് സൃഷ്ടിക്കുക
-DocType: Hub Settings,Seller Email,വില്പനക്കാരന്റെ ഇമെയിൽ
 DocType: Project,Total Purchase Cost (via Purchase Invoice),(വാങ്ങൽ ഇൻവോയിസ് വഴി) ആകെ വാങ്ങൽ ചെലവ്
 DocType: Training Event,Start Time,ആരംഭ സമയം
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,ക്വാണ്ടിറ്റി തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,ക്വാണ്ടിറ്റി തിരഞ്ഞെടുക്കുക
 DocType: Customs Tariff Number,Customs Tariff Number,കസ്റ്റംസ് താരിഫ് നമ്പർ
 DocType: Patient Appointment,Patient Appointment,രോഗി നിയമനം
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,റോൾ അംഗീകരിക്കുന്നതിൽ ഭരണം ബാധകമാകുന്നതാണ് പങ്ക് അതേ ആകും കഴിയില്ല
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,ഈ ഇമെയിൽ ഡൈജസ്റ്റ് നിന്ന് അൺസബ്സ്ക്രൈബ്
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,ഈ ഇമെയിൽ ഡൈജസ്റ്റ് നിന്ന് അൺസബ്സ്ക്രൈബ്
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,വഴി വിതരണക്കാരെ നേടുക
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} ഇനത്തിനായുള്ള {0} കണ്ടെത്തിയില്ല
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,കോഴ്സിലേക്ക് പോകുക
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,സന്ദേശം അയച്ചു
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,കുട്ടി നോഡുകൾ കൊണ്ട് അക്കൗണ്ട് ലെഡ്ജർ ആയി സജ്ജമാക്കാൻ കഴിയില്ല
@@ -3323,11 +3388,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,ണം വേണ്ടി മാറ്റിയത് മെറ്റീരിയൽ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,അക്കൗണ്ട് {0} നിലവിലുണ്ട് ഇല്ല
 DocType: Project,Project Type,പ്രോജക്ട് തരം
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,ഈ ടാസ്ക്കിനായി ചൈൽഡ് ടാസ്ക് നിലവിലുണ്ട്. നിങ്ങൾക്ക് ഈ ടാസ്ക് ഇല്ലാതാക്കാൻ കഴിയില്ല.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ലക്ഷ്യം qty അല്ലെങ്കിൽ ലക്ഷ്യം തുക ഒന്നുകിൽ നിർബന്ധമാണ്.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,വിവിധ പ്രവർത്തനങ്ങളുടെ ചെലവ്
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,കൂടുതൽ ഫലങ്ങളില്ല
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,വിവിധ പ്രവർത്തനങ്ങളുടെ ചെലവ്
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","സെയിൽസ് പേഴ്സൺസ് താഴെ ഘടിപ്പിച്ചിരിക്കുന്ന ജീവനക്കാർ {1} ഒരു ഉപയോക്താവിന്റെ ഐഡി ഇല്ല ശേഷം, ലേക്കുള്ള {0} ഇവന്റുകൾ ക്രമീകരിക്കുന്നു"
 DocType: Timesheet,Billing Details,ബില്ലിംഗ് വിശദാംശങ്ങൾ
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,"ഉറവിട, ടാർഗെറ്റ് വെയർഹൗസ് വ്യത്യസ്തമായിരിക്കണം"
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,"ഉറവിട, ടാർഗെറ്റ് വെയർഹൗസ് വ്യത്യസ്തമായിരിക്കണം"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},{0} ചെന്നവർ സ്റ്റോക്ക് ഇടപാടുകൾ പുതുക്കുന്നതിനായി അനുവാദമില്ല
 DocType: Purchase Invoice Item,PR Detail,പി ആർ വിശദാംശം
 DocType: Sales Order,Fully Billed,പൂർണ്ണമായി ഈടാക്കൂ
@@ -3354,7 +3421,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,വയർ ട്രാൻസ്ഫർ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,എല്ലാം പരിശോധിക്കുക
 DocType: Vehicle Log,Invoice Ref,ഇൻവോയ്സ് റഫറൻസ്
-DocType: Purchase Order,Recurring Order,ആവർത്തക ഓർഡർ
 DocType: Company,Default Income Account,സ്ഥിരസ്ഥിതി ആദായ അക്കൗണ്ട്
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,കസ്റ്റമർ ഗ്രൂപ്പ് / കസ്റ്റമർ
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),അടയ്ക്കാത്ത വർഷത്തേക്ക് ലാഭം / നഷ്ടം (ക്രെഡിറ്റ്)
@@ -3368,9 +3434,9 @@
 DocType: Patient,A Negative,ഒരു നെഗറ്റീവ്
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,കാണിക്കാൻ കൂടുതൽ ഒന്നും.
 DocType: Lead,From Customer,കസ്റ്റമർ നിന്ന്
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,കോളുകൾ
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,കോളുകൾ
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,ഒരു ഉൽപ്പന്നം
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,ബാച്ചുകൾ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,ബാച്ചുകൾ
 DocType: Project,Total Costing Amount (via Time Logs),(ടൈം ലോഗുകൾ വഴി) ആകെ ആറെണ്ണവും തുക
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,ഫീസ് ഷെഡ്യൂൾ ഉണ്ടാക്കുക
 DocType: Purchase Order Item Supplied,Stock UOM,ഓഹരി UOM
@@ -3395,7 +3461,7 @@
 DocType: School Settings,Current Academic Term,നിലവിലെ അക്കാദമിക് ടേം
 DocType: School Settings,Current Academic Term,നിലവിലെ അക്കാദമിക് ടേം
 DocType: Sales Order,Not Billed,ഈടാക്കൂ ഒരിക്കലും പാടില്ല
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,രണ്ടും വെയർഹൗസ് ഒരേ കമ്പനി സ്വന്തമായിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,രണ്ടും വെയർഹൗസ് ഒരേ കമ്പനി സ്വന്തമായിരിക്കണം
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,കോൺടാക്റ്റുകളൊന്നും ഇതുവരെ ചേർത്തു.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,കോസ്റ്റ് വൗച്ചർ തുക റജിസ്റ്റർ
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,വിതരണക്കാരും ഉയര്ത്തുന്ന ബില്ലുകള്.
@@ -3404,7 +3470,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,കിഴിവും തുക
 DocType: Purchase Invoice,Return Against Purchase Invoice,വാങ്ങൽ ഇൻവോയിസ് എഗെൻസ്റ്റ് മടങ്ങുക
 DocType: Item,Warranty Period (in days),(ദിവസങ്ങളിൽ) വാറന്റി കാലാവധി
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',update `tabPatient Appointment` set sales_invoice = &#39;{0}&#39; where name = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,ഗുഅര്ദിഅന്൧ കൂടെ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,ഓപ്പറേഷൻസ് നിന്നുള്ള നെറ്റ് ക്യാഷ്
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,ഇനം 4
@@ -3413,8 +3478,8 @@
 DocType: Journal Entry Account,Journal Entry Account,ജേണൽ എൻട്രി അക്കൗണ്ട്
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,സ്റ്റുഡന്റ് ഗ്രൂപ്പ്
 DocType: Shopping Cart Settings,Quotation Series,ക്വട്ടേഷൻ സീരീസ്
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","ഒരു ഇനം ഇതേ പേര് ({0}) നിലവിലുണ്ട്, ഐറ്റം ഗ്രൂപ്പിന്റെ പേര് മാറ്റാനോ ഇനം പുനർനാമകരണം ദയവായി"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,കസ്റ്റമർ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","ഒരു ഇനം ഇതേ പേര് ({0}) നിലവിലുണ്ട്, ഐറ്റം ഗ്രൂപ്പിന്റെ പേര് മാറ്റാനോ ഇനം പുനർനാമകരണം ദയവായി"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,കസ്റ്റമർ തിരഞ്ഞെടുക്കുക
 DocType: C-Form,I,ഞാന്
 DocType: Company,Asset Depreciation Cost Center,അസറ്റ് മൂല്യത്തകർച്ച കോസ്റ്റ് സെന്റർ
 DocType: Sales Order Item,Sales Order Date,സെയിൽസ് ഓർഡർ തീയതി
@@ -3423,6 +3488,7 @@
 DocType: Assessment Plan,Assessment Plan,അസസ്മെന്റ് പദ്ധതി
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,ഉപഭോക്താവ് {0} സൃഷ്ടിച്ചു.
 DocType: Stock Settings,Limit Percent,ശതമാനം പരിമിതപ്പെടുത്തുക
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,ഏതൊരു വെയർഹൌസിലും നിലവിൽ സ്റ്റോക്കില്ല
 ,Payment Period Based On Invoice Date,ഇൻവോയിസ് തീയതി അടിസ്ഥാനമാക്കി പേയ്മെന്റ് പിരീഡ്
 DocType: Sample Collection,No. of print,പ്രിന്റ് ഇല്ല
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},{0} വേണ്ടി കറൻസി എക്സ്ചേഞ്ച് നിരക്കുകൾ കാണാതായ
@@ -3478,13 +3544,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,ഗ്രോസ് പേ - ആകെ കിഴിച്ചുകൊണ്ടു - വായ്പാ തിരിച്ചടവ്
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,ഇപ്പോഴത്തെ BOM ലേക്ക് ന്യൂ BOM ഒന്നുതന്നെയായിരിക്കരുത്
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,ശമ്പള ജി ഐഡി
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,ശമ്പള ജി ഐഡി
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,വിരമിക്കുന്ന തീയതി ചേരുന്നു തീയതി വലുതായിരിക്കണം
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,ന് കോഴ്സ് ഷെഡ്യൂൾ സമയത്ത് പിശകുകൾ ഉണ്ടായിരുന്നു:
 DocType: Sales Invoice,Against Income Account,ആദായ അക്കൗണ്ടിനെതിരായ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,കൈമാറി {0}%
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ഇനം {0}: ക്രമപ്പെടുത്തിയ qty {1} {2} (ഇനത്തിലെ നിർവചിച്ചിരിക്കുന്നത്) മിനിമം ഓർഡർ qty താഴെയായിരിക്കണം കഴിയില്ല.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ഇനം {0}: ക്രമപ്പെടുത്തിയ qty {1} {2} (ഇനത്തിലെ നിർവചിച്ചിരിക്കുന്നത്) മിനിമം ഓർഡർ qty താഴെയായിരിക്കണം കഴിയില്ല.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,പ്രതിമാസ വിതരണ ശതമാനം
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,മറ്റൊരു ഉപയോക്താവായി ലോഗിൻ ചെയ്യുക.
 DocType: Territory,Territory Targets,ടെറിറ്ററി ടാർഗെറ്റ്
 DocType: Delivery Note,Transporter Info,ട്രാൻസ്പോർട്ടർ വിവരം
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},കമ്പനി {1} ൽ സ്ഥിര {0} സജ്ജമാക്കുക
@@ -3492,13 +3559,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,ഒരേ വിതരണക്കമ്പനിയായ ഒന്നിലധികം തവണ നൽകിയിട്ടുണ്ടെന്നും
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,മൊത്തം ലാഭം / നഷ്ടം
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,വാങ്ങൽ ഓർഡർ ഇനം നൽകിയത്
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,കമ്പനിയുടെ പേര് കമ്പനി ആകാൻ പാടില്ല
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,കമ്പനിയുടെ പേര് കമ്പനി ആകാൻ പാടില്ല
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,പ്രിന്റ് ടെംപ്ലേറ്റുകൾക്കായി കത്ത് മേധാവികൾ.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,പ്രിന്റ് ടെംപ്ലേറ്റുകൾക്കായി ശീര്ഷകം ഇൻവോയ്സിന്റെ ഉദാഹരണമാണ്.
 DocType: Program Enrollment,Walking,നടത്തം
 DocType: Student Guardian,Student Guardian,സ്റ്റുഡന്റ് ഗാർഡിയൻ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,മൂലധനം തരം ചാർജ് സഹായകം ആയി അടയാളപ്പെടുത്തി കഴിയില്ല
 DocType: POS Profile,Update Stock,സ്റ്റോക്ക് അപ്ഡേറ്റ്
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,സബ്സ്ക്രിപ്ഷനിൽ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,ഇനങ്ങളുടെ വ്യത്യസ്ത UOM തെറ്റായ (ആകെ) മൊത്തം ഭാരം മൂല്യം നയിക്കും. ഓരോ ഇനത്തിന്റെ മൊത്തം ഭാരം ഇതേ UOM ഉണ്ടു എന്ന് ഉറപ്പു വരുത്തുക.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM റേറ്റ്
 DocType: Asset,Journal Entry for Scrap,സ്ക്രാപ്പ് ജേണൽ എൻട്രി
@@ -3548,15 +3616,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","സിസ്റ്റം ഉപയോക്താവ് (ലോഗിൻ) ഐഡി. സജ്ജമാക്കിയാൽ, അത് എല്ലാ എച്ച് ഫോമുകൾ ഡീഫോൾട്ട് മാറും."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1} നിന്ന്
 DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,എല്ലാ ബില്ലും മെറ്റീരിയലുകളിൽ ഏറ്റവും പുതിയ വില അപ്ഡേറ്റ് ചെയ്യുന്നതിനായി ക്യൂവിലാണ്. ഇതിന് അൽപ്പസമയമെടുത്തേക്കാം.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,എല്ലാ ബില്ലും മെറ്റീരിയലുകളിൽ ഏറ്റവും പുതിയ വില അപ്ഡേറ്റ് ചെയ്യുന്നതിനായി ക്യൂവിലാണ്. ഇതിന് അൽപ്പസമയമെടുത്തേക്കാം.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,പുതിയ അക്കൗണ്ട് പേര്. കുറിപ്പ്: ഉപയോക്താക്കൾക്ക് വിതരണക്കാർക്കും അക്കൗണ്ടുകൾ സൃഷ്ടിക്കാൻ ദയവായി
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,രാജ്യം ജ്ഞാനികൾ സഹജമായ വിലാസം ഫലകങ്ങൾ
 DocType: Sales Order Item,Supplier delivers to Customer,വിതരണക്കമ്പനിയായ ഉപയോക്താക്കൾക്കായി വിടുവിക്കുന്നു
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ഫോം / ഇനം / {0}) സ്റ്റോക്കില്ല
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},ഇക്കാരണങ്ങൾ / പരാമർശം തീയതി {0} ശേഷം ആകാൻ പാടില്ല
+,Sales Payment Summary,സെയിൽ പേയ്മെന്റ് സംഗ്രഹം
+DocType: Restaurant,Restaurant,റെസ്റ്റോറന്റ്
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},ഇക്കാരണങ്ങൾ / പരാമർശം തീയതി {0} ശേഷം ആകാൻ പാടില്ല
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ഡാറ്റാ ഇറക്കുമതി എക്സ്പോർട്ട്
 DocType: Patient,Account Details,അക്കൗണ്ട് വിശദാംശങ്ങൾ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,ഇല്ല വിദ്യാർത്ഥികൾ കണ്ടെത്തിയില്ല
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,ഇല്ല വിദ്യാർത്ഥികൾ കണ്ടെത്തിയില്ല
 DocType: Medical Department,Medical Department,മെഡിക്കൽ വിഭാഗം
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,വിതരണക്കാരൻ സ്കോര്കാര്ഡ് സ്കോറിംഗ് മാനദണ്ഡം
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,ഇൻവോയിസ് പ്രസിദ്ധീകരിക്കൽ തീയതി
@@ -3567,8 +3637,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,പാർട്ടി തിരഞ്ഞെടുക്കുന്നതിന് മുമ്പ് പോസ്റ്റിംഗ് തീയതി തിരഞ്ഞെടുക്കുക
 DocType: Program Enrollment,School House,സ്കൂൾ ഹൗസ്
 DocType: Serial No,Out of AMC,എഎംസി പുറത്താണ്
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,ഉദ്ധരണികൾ തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,ഉദ്ധരണികൾ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,ഉദ്ധരണികൾ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,ഉദ്ധരണികൾ തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ബുക്കുചെയ്തു Depreciations എണ്ണം Depreciations മൊത്തം എണ്ണം വലുതായിരിക്കും കഴിയില്ല
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,മെയിൻറനൻസ് സന്ദർശനം നിർമ്മിക്കുക
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,സെയിൽസ് മാസ്റ്റർ മാനേജർ {0} പങ്കുണ്ട് ആർ ഉപയോക്താവിന് ബന്ധപ്പെടുക
@@ -3576,7 +3646,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,കമ്പനി (അല്ല കസ്റ്റമർ അല്ലെങ്കിൽ വിതരണക്കാരൻ) മാസ്റ്റർ.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ഇത് ഈ വിദ്യാർത്ഥി ഹാജർ അടിസ്ഥാനമാക്കിയുള്ളതാണ്
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,ഇല്ല വിദ്യാർത്ഥികൾ
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,കൂടുതൽ ഇനങ്ങൾ അല്ലെങ്കിൽ തുറക്കാറുണ്ട് ഫോം ചേർക്കുക
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,കൂടുതൽ ഇനങ്ങൾ അല്ലെങ്കിൽ തുറക്കാറുണ്ട് ഫോം ചേർക്കുക
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ഡെലിവറി കുറിപ്പുകൾ {0} ഈ സെയിൽസ് ഓർഡർ റദ്ദാക്കുന്നതിൽ മുമ്പ് റദ്ദാക്കി വേണം
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,ഉപയോക്താക്കളിലേക്ക് പോകുക
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,തുക + തുക ആകെ മൊത്തം വലുതായിരിക്കും കഴിയില്ല ഓഫാക്കുക എഴുതുക
@@ -3596,37 +3666,40 @@
 DocType: Fee Schedule,Fee Schedule,ഷെഡ്യുള്
 DocType: Hub Settings,Publish Availability,ലഭ്യത പ്രസിദ്ധീകരിക്കുക
 DocType: Company,Create Chart Of Accounts Based On,അക്കൗണ്ടുകൾ അടിസ്ഥാനമാക്കിയുള്ള ചാർട്ട് സൃഷ്ടിക്കുക
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,ഗ്രൂപ്പ് അല്ലാത്തവരെ ഇത് പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല. ശിശു ചുമതലകൾ നിലവിലുണ്ട്.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,ജനന തീയതി ഇന്ന് വലുതായിരിക്കും കഴിയില്ല.
 ,Stock Ageing,സ്റ്റോക്ക് എയ്ജിങ്
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},വിദ്യാർത്ഥി {0} വിദ്യാർത്ഥി അപേക്ഷകൻ {1} നേരെ നിലവിലില്ല
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),റൗണ്ടിംഗ് അഡ്ജസ്റ്റ്മെന്റ് (കമ്പനി കറൻസി)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Timesheet
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Timesheet
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} &#39;{1}&#39; അപ്രാപ്തമാക്കിയിട്ടുണ്ടെങ്കിൽ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ഓപ്പൺ സജ്ജമാക്കുക
 DocType: Cheque Print Template,Scanned Cheque,സ്കാൻ ചെയ്ത ചെക്ക്
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,സമർപ്പിക്കുന്നു ഇടപാടുകൾ ബന്ധങ്ങൾ ഓട്ടോമാറ്റിക് ഇമെയിലുകൾ അയയ്ക്കുക.
 DocType: Timesheet,Total Billable Amount,ആകെ ബില്ലടയ്ക്കണം തുക
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,ഇനം 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,ഓർഡർ എൻട്രി
 DocType: Purchase Order,Customer Contact Email,കസ്റ്റമർ കോൺടാക്റ്റ് ഇമെയിൽ
 DocType: Warranty Claim,Item and Warranty Details,ഇനം വാറണ്ടിയുടെയും വിശദാംശങ്ങൾ
 DocType: Sales Team,Contribution (%),കോൺട്രിബ്യൂഷൻ (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,കുറിപ്പ്: &#39;ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട്&#39; വ്യക്തമാക്കിയില്ല മുതലുള്ള പേയ്മെന്റ് എൻട്രി സൃഷ്ടിച്ച ചെയ്യില്ല
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,പ്രോജക്റ്റ് {0} ഇതിനകം നിലവിലുണ്ട്
 DocType: Medical Department,Nursing User,നഴ്സിംഗ് ഉപയോക്താവ്
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,ഉത്തരവാദിത്വങ്ങൾ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,ഈ ഉദ്ധരണിയുടെ സാധുതാ കാലാവധി കഴിഞ്ഞു.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,ഈ ഉദ്ധരണിയുടെ സാധുതാ കാലാവധി കഴിഞ്ഞു.
 DocType: Expense Claim Account,Expense Claim Account,ചിലവേറിയ ക്ലെയിം അക്കൗണ്ട്
 DocType: Accounts Settings,Allow Stale Exchange Rates,സ്റ്റേലെറ്റ് എക്സ്ചേഞ്ച് നിരക്കുകൾ അനുവദിക്കുക
 DocType: Sales Person,Sales Person Name,സെയിൽസ് വ്യക്തി നാമം
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,പട്ടികയിലെ കുറയാതെ 1 ഇൻവോയ്സ് നൽകുക
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,ഉപയോക്താക്കൾ ചേർക്കുക
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,ഉപയോക്താക്കൾ ചേർക്കുക
 DocType: POS Item Group,Item Group,ഇനം ഗ്രൂപ്പ്
 DocType: Item,Safety Stock,സുരക്ഷാ സ്റ്റോക്ക്
 DocType: Healthcare Settings,Healthcare Settings,ആരോഗ്യ സംരക്ഷണ ക്രമീകരണം
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,ടാസ്കിനുള്ള പുരോഗതി% 100 ലധികം പാടില്ല.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,ടാസ്കിനുള്ള പുരോഗതി% 100 ലധികം പാടില്ല.
 DocType: Stock Reconciliation Item,Before reconciliation,"നിരപ്പു മുമ്പ്,"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0} ചെയ്യുക
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ചേർത്തു നികുതി ചാർജുകളും (കമ്പനി കറൻസി)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ഇനം നികുതി റോ {0} ടൈപ്പ് നികുതി അഥവാ ആദായ അല്ലെങ്കിൽ ചിലവേറിയ അല്ലെങ്കിൽ ഈടാക്കുന്നതല്ല എന്ന അക്കൗണ്ട് ഉണ്ടായിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ഇനം നികുതി റോ {0} ടൈപ്പ് നികുതി അഥവാ ആദായ അല്ലെങ്കിൽ ചിലവേറിയ അല്ലെങ്കിൽ ഈടാക്കുന്നതല്ല എന്ന അക്കൗണ്ട് ഉണ്ടായിരിക്കണം
 DocType: Sales Order,Partly Billed,ഭാഗികമായി ഈടാക്കൂ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,ഇനം {0} ഒരു നിശ്ചിത അസറ്റ് ഇനം ആയിരിക്കണം
 DocType: Item,Default BOM,സ്വതേ BOM ലേക്ക്
@@ -3642,6 +3715,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,വേരിയബിൾ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,ഡെലിവറി നോട്ട് നിന്ന്
 DocType: Student,Student Email Address,വിദ്യാർത്ഥിയുടെ ഇമെയിൽ വിലാസം
+DocType: Item,Hub Warehouse,ഹബ് വെയർഹൗസ്
 DocType: Physician Schedule Time Slot,From Time,സമയം മുതൽ
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,സ്റ്റോക്കുണ്ട്:
 DocType: Notification Control,Custom Message,കസ്റ്റം സന്ദേശം
@@ -3650,9 +3724,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,വിദ്യാർത്ഥിയുടെ വിലാസം
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,വിദ്യാർത്ഥിയുടെ വിലാസം
 DocType: Purchase Invoice,Price List Exchange Rate,വില പട്ടിക എക്സ്ചേഞ്ച് റേറ്റ്
+DocType: POS Profile,POS Profile Name,POS പ്രൊഫൈൽ നാമം
 DocType: Purchase Invoice Item,Rate,റേറ്റ്
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,തടവുകാരി
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,വിലാസം പേര്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,വിലാസം പേര്
 DocType: Stock Entry,From BOM,BOM നിന്നും
 DocType: Assessment Code,Assessment Code,അസസ്മെന്റ് കോഡ്
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,അടിസ്ഥാന
@@ -3666,11 +3741,12 @@
 DocType: Salary Slip,Salary Structure,ശമ്പളം ഘടന
 DocType: Account,Bank,ബാങ്ക്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,എയർ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,പ്രശ്നം മെറ്റീരിയൽ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,പ്രശ്നം മെറ്റീരിയൽ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,ആവർത്തന സൃഷ്ടിക്കുന്നതിനിടയിൽ ഒരു പിശക് സംഭവിച്ചു
 DocType: Material Request Item,For Warehouse,വെയർഹൗസ് വേണ്ടി
 DocType: Employee,Offer Date,ആഫര് തീയതി
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ഉദ്ധരണികളും
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,നിങ്ങൾ ഓഫ്ലൈൻ മോഡിലാണ്. നിങ്ങൾ നെറ്റ്വർക്ക് ഞങ്ങൾക്കുണ്ട് വരെ ലോഡുചെയ്യണോ കഴിയില്ല.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,നിങ്ങൾ ഓഫ്ലൈൻ മോഡിലാണ്. നിങ്ങൾ നെറ്റ്വർക്ക് ഞങ്ങൾക്കുണ്ട് വരെ ലോഡുചെയ്യണോ കഴിയില്ല.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,ഇല്ല സ്റ്റുഡന്റ് ഗ്രൂപ്പുകൾ സൃഷ്ടിച്ചു.
 DocType: Purchase Invoice Item,Serial No,സീരിയൽ ഇല്ല
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,പ്രതിമാസ തിരിച്ചടവ് തുക വായ്പാ തുക ശ്രേഷ്ഠ പാടില്ല
@@ -3680,17 +3756,18 @@
 DocType: Salary Slip,Total Working Hours,ആകെ ജോലി മണിക്കൂർ
 DocType: Subscription,Next Schedule Date,അടുത്ത ഷെഡ്യൂൾ തീയതി
 DocType: Stock Entry,Including items for sub assemblies,സബ് സമ്മേളനങ്ങൾ ഇനങ്ങൾ ഉൾപ്പെടെ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,നൽകുക മൂല്യം പോസിറ്റീവ് ആയിരിക്കണം
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,എല്ലാ പ്രദേശങ്ങളും
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,നൽകുക മൂല്യം പോസിറ്റീവ് ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,എല്ലാ പ്രദേശങ്ങളും
 DocType: Purchase Invoice,Items,ഇനങ്ങൾ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,വിദ്യാർത്ഥി ഇതിനകം എൻറോൾ ചെയ്തു.
 DocType: Fiscal Year,Year Name,വർഷം പേര്
 DocType: Process Payroll,Process Payroll,പ്രോസസ്സ് ശമ്പളപ്പട്ടിക
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,ഈ മാസം പ്രവർത്തി ദിവസങ്ങളിൽ അധികം വിശേഷദിവസങ്ങൾ ഉണ്ട്.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,ഈ മാസം പ്രവർത്തി ദിവസങ്ങളിൽ അധികം വിശേഷദിവസങ്ങൾ ഉണ്ട്.
 DocType: Product Bundle Item,Product Bundle Item,ഉൽപ്പന്ന ബണ്ടിൽ ഇനം
 DocType: Sales Partner,Sales Partner Name,സെയിൽസ് പങ്കാളി പേര്
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,ഉദ്ധരണികൾ അഭ്യർത്ഥന
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,ഉദ്ധരണികൾ അഭ്യർത്ഥന
 DocType: Payment Reconciliation,Maximum Invoice Amount,പരമാവധി ഇൻവോയിസ് തുക
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,ഹെമറ്റോളജി
 DocType: Normal Test Items,Normal Test Items,സാധാരണ പരീക്ഷണ ഇനങ്ങൾ
 DocType: Student Language,Student Language,വിദ്യാർത്ഥിയുടെ ഭാഷ
 apps/erpnext/erpnext/config/selling.py +23,Customers,ഇടപാടുകാർ
@@ -3702,10 +3779,11 @@
 DocType: Issue,Opening Time,സമയം തുറക്കുന്നു
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,നിന്ന് ആവശ്യമായ തീയതികൾ ചെയ്യുക
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,സെക്യൂരിറ്റീസ് &amp; ചരക്ക് കൈമാറ്റ
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',മോഡലിന് അളവു യൂണിറ്റ് &#39;{0}&#39; ഫലകം അതേ ആയിരിക്കണം &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',മോഡലിന് അളവു യൂണിറ്റ് &#39;{0}&#39; ഫലകം അതേ ആയിരിക്കണം &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,അടിസ്ഥാനത്തിൽ ഓൺ കണക്കുകൂട്ടുക
 DocType: Delivery Note Item,From Warehouse,വെയർഹൗസിൽ നിന്ന്
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,നിർമ്മിക്കാനുള്ള വസ്തുക്കളുടെ ബിൽ കൂടിയ ഇനങ്ങൾ ഇല്ല
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,നിർമ്മിക്കാനുള്ള വസ്തുക്കളുടെ ബിൽ കൂടിയ ഇനങ്ങൾ ഇല്ല
+DocType: Restaurant,Default Customer,സ്ഥിരസ്ഥിതി ഉപഭോക്താവ്
 DocType: Assessment Plan,Supervisor Name,സൂപ്പർവൈസർ പേര്
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,ഒരേ ദിവസം തന്നെ അസൈൻ ചെയ്യപ്പെട്ടാൽ അത് സ്ഥിരീകരിക്കരുത്
 DocType: Program Enrollment Course,Program Enrollment Course,പ്രോഗ്രാം എൻറോൾമെന്റ് കോഴ്സ്
@@ -3733,7 +3811,7 @@
 DocType: Payment Entry,Internal Transfer,ആന്തരിക ട്രാൻസ്ഫർ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,ശിശു അക്കൌണ്ട് ഈ അക്കൗണ്ടിന് നിലവിലുണ്ട്. നിങ്ങൾ ഈ അക്കൗണ്ട് ഇല്ലാതാക്കാൻ കഴിയില്ല.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ലക്ഷ്യം qty അല്ലെങ്കിൽ ലക്ഷ്യം തുക ഒന്നുകിൽ നിർബന്ധമായും
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},BOM ലേക്ക് ഇനം {0} വേണ്ടി നിലവിലുണ്ട് സഹജമായ
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},BOM ലേക്ക് ഇനം {0} വേണ്ടി നിലവിലുണ്ട് സഹജമായ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,പോസ്റ്റിംഗ് തീയതി ആദ്യം തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,തീയതി തുറക്കുന്നു തീയതി അടയ്ക്കുന്നത് മുമ്പ് ആയിരിക്കണം
 DocType: Leave Control Panel,Carry Forward,മുന്നോട്ട് കൊണ്ടുപോകും
@@ -3769,6 +3847,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,ആകെ നിലവിലുള്ളജാലകങ്ങള്
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,അക്കൗണ്ടിംഗ് പ്രസ്താവനകൾ
 DocType: Drug Prescription,Hour,അന്ത്യസമയം
+DocType: Restaurant Order Entry,Last Sales Invoice,അവസാന സെയിൽസ് ഇൻവോയ്സ്
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,പുതിയ സീരിയൽ പാണ്ടികശാലയും പാടില്ല. വെയർഹൗസ് ഓഹരി എൻട്രി വാങ്ങാനും റെസീപ്റ്റ് സജ്ജമാക്കി വേണം
 DocType: Lead,Lead Type,ലീഡ് തരം
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,നിങ്ങൾ തടയുക തീയതികളിൽ ഇല അംഗീകരിക്കാൻ അംഗീകാരമില്ല
@@ -3805,65 +3884,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,ഉപയോക്താക്കളെ സൃഷ്ടിക്കുക
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,പയറ്
 DocType: Supplier Scorecard,Per Month,മാസം തോറും
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,നിർമ്മിക്കാനുള്ള ക്വാണ്ടിറ്റി 0 വലുതായിരിക്കണം.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,നിർമ്മിക്കാനുള്ള ക്വാണ്ടിറ്റി 0 വലുതായിരിക്കണം.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,അറ്റകുറ്റപ്പണി കോൾ വേണ്ടി റിപ്പോർട്ട് സന്ദർശിക്കുക.
 DocType: Stock Entry,Update Rate and Availability,റേറ്റ് ലഭ്യത അപ്ഡേറ്റ്
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,ശതമാനം നിങ്ങളെ ഉത്തരവിട്ടു അളവ് നേരെ കൂടുതൽ സ്വീകരിക്കാനോ വിടുവിപ്പാൻ അനുവദിച്ചിരിക്കുന്ന. ഉദാഹരണം: 100 യൂണിറ്റ് ഉത്തരവിട്ടു ഉണ്ടെങ്കിൽ. ഒപ്പം നിങ്ങളുടെ അലവൻസ് നിങ്ങളെ 110 യൂണിറ്റുകൾ സ്വീകരിക്കാൻ അനുവദിച്ചിരിക്കുന്ന പിന്നീട് 10% ആണ്.
 DocType: POS Customer Group,Customer Group,കസ്റ്റമർ ഗ്രൂപ്പ്
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),പുതിയ ബാച്ച് ഐഡി (ഓപ്ഷണൽ)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),പുതിയ ബാച്ച് ഐഡി (ഓപ്ഷണൽ)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),പുതിയ ബാച്ച് ഐഡി (ഓപ്ഷണൽ)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),പുതിയ ബാച്ച് ഐഡി (ഓപ്ഷണൽ)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},ചിലവേറിയ ഇനത്തിന്റെ {0} നിര്ബന്ധമാണ്
 DocType: BOM,Website Description,വെബ്സൈറ്റ് വിവരണം
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ഇക്വിറ്റി ലെ മൊത്തം മാറ്റം
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,ഏറ്റവും പുതിയത്
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,വാങ്ങൽ ഇൻവോയ്സ് {0} ആദ്യം റദ്ദാക്കുകയോ ചെയ്യുക
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ഇമെയിൽ വിലാസം അതുല്യമായ ആയിരിക്കണം, ഇതിനകം {0} നിലവിലുണ്ട്"
 DocType: Serial No,AMC Expiry Date,എഎംസി കാലഹരണ തീയതി
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,രസീത്
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,രസീത്
 ,Sales Register,സെയിൽസ് രജിസ്റ്റർ
 DocType: Daily Work Summary Settings Company,Send Emails At,ഇമെയിലുകൾ അയയ്ക്കുക
 DocType: Quotation,Quotation Lost Reason,ക്വട്ടേഷൻ ലോസ്റ്റ് കാരണം
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,നിങ്ങളുടെ ഡൊമെയ്ൻ തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',tabPatient ൽ നിന്ന് * * name = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},ഇടപാട് യാതൊരു പരാമർശവുമില്ല {0} dated {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},ഇടപാട് യാതൊരു പരാമർശവുമില്ല {0} dated {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,തിരുത്തിയെഴുതുന്നത് ഒന്നുമില്ല.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,ഫോം കാഴ്ച
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,ഈ മാസത്തെ ചുരുക്കം തിർച്ചപ്പെടുത്താത്ത പ്രവർത്തനങ്ങൾ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,ഫോം കാഴ്ച
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,ഈ മാസത്തെ ചുരുക്കം തിർച്ചപ്പെടുത്താത്ത പ്രവർത്തനങ്ങൾ
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","നിങ്ങളെക്കാളുപരി, നിങ്ങളുടെ ഓർഗനൈസേഷനിൽ ഉപയോക്താക്കളെ ചേർക്കുക."
 DocType: Customer Group,Customer Group Name,കസ്റ്റമർ ഗ്രൂപ്പ് പേര്
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,ഇതുവരെ ഉപഭോക്താക്കൾ!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,ഇതുവരെ ഉപഭോക്താക്കൾ!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,ക്യാഷ് ഫ്ളോ പ്രസ്താവന
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},വായ്പാ തുക {0} പരമാവധി വായ്പാ തുക കവിയാൻ പാടില്ല
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,അനുമതി
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},സി-ഫോം {1} നിന്നും ഈ ഇൻവോയിസ് {0} നീക്കം ദയവായി
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},സി-ഫോം {1} നിന്നും ഈ ഇൻവോയിസ് {0} നീക്കം ദയവായി
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,നിങ്ങൾക്ക് മുൻ സാമ്പത്തിക വർഷത്തെ ബാലൻസ് ഈ സാമ്പത്തിക വർഷം വിട്ടുതരുന്നു ഉൾപ്പെടുത്താൻ ആഗ്രഹിക്കുന്നുവെങ്കിൽ മുന്നോട്ട് തിരഞ്ഞെടുക്കുക
 DocType: GL Entry,Against Voucher Type,വൗച്ചർ തരം എഗെൻസ്റ്റ്
 DocType: Physician,Phone (R),ഫോൺ (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,ടൈം സ്ലോട്ടുകൾ ചേർത്തു
 DocType: Item,Attributes,വിശേഷണങ്ങൾ
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,ടെംപ്ലേറ്റ് പ്രാപ്തമാക്കുക
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup&gt; Settings&gt; Naming Series വഴി {0} നാമത്തിനായുള്ള പരമ്പര സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,അക്കൗണ്ട് ഓഫാക്കുക എഴുതുക നൽകുക
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,അവസാന ഓർഡർ തീയതി
 DocType: Patient,B Negative,ബി നെഗറ്റീവ്
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},അക്കൗണ്ട് {0} കമ്പനി {1} വകയാണ് ഇല്ല
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,തുടർച്ചയായ സീരിയൽ നമ്പറുകൾ {0} ഡെലിവറി നോട്ട് ഉപയോഗിച്ച് പൊരുത്തപ്പെടുന്നില്ല
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,തുടർച്ചയായ സീരിയൽ നമ്പറുകൾ {0} ഡെലിവറി നോട്ട് ഉപയോഗിച്ച് പൊരുത്തപ്പെടുന്നില്ല
 DocType: Student,Guardian Details,ഗാർഡിയൻ വിവരങ്ങൾ
 DocType: C-Form,C-Form,സി-ഫോം
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,ഒന്നിലധികം ജീവനക്കാരുടെ അടയാളപ്പെടുത്തുക ഹാജർ
 DocType: Vehicle,Chassis No,ഷാസി ഇല്ല
 DocType: Payment Request,Initiated,ആകൃഷ്ടനായി
 DocType: Production Order,Planned Start Date,ആസൂത്രണം ചെയ്ത ആരംഭ തീയതി
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,ദയവായി ഒരു BOM തിരഞ്ഞെടുക്കുക
 DocType: Serial No,Creation Document Type,ക്രിയേഷൻ ഡോക്യുമെന്റ് തരം
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,ആരംഭിക്കുന്ന തീയതി ആരംഭിക്കുന്ന തീയതിയിൽ കൂടുതലായിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,ആരംഭിക്കുന്ന തീയതി ആരംഭിക്കുന്ന തീയതിയിൽ കൂടുതലായിരിക്കണം
 DocType: Leave Type,Is Encash,Encash Is
 DocType: Leave Allocation,New Leaves Allocated,അലോക്കേറ്റഡ് പുതിയ ഇലകൾ
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,പ്രോജക്ട് തിരിച്ചുള്ള ഡാറ്റ ക്വട്ടേഷൻ ലഭ്യമല്ല
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,അവസാനിപ്പിക്കുക
 DocType: Project,Expected End Date,പ്രതീക്ഷിച്ച അവസാന തീയതി
 DocType: Budget Account,Budget Amount,ബജറ്റ് തുക
 DocType: Appraisal Template,Appraisal Template Title,അപ്രൈസൽ ഫലകം ശീർഷകം
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},തീയതി മുതൽ {0} ജീവനക്കാർക്ക് {1} ജീവനക്കാരന്റെ ചേരുന്നത് ദിവസവും {2} ആകരുത്
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,ആവശ്യത്തിന്
 DocType: Patient,Alcohol Current Use,ആൽക്കഹോൾ നിലവിലെ ഉപയോഗം
+DocType: Student Admission Program,Student Admission Program,വിദ്യാർത്ഥി പ്രവേശന പരിപാടി
 DocType: Payment Entry,Account Paid To,അക്കൗണ്ടിലേക്ക് പണമടച്ചു
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,പാരന്റ് ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം പാടില്ല
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,എല്ലാ ഉല്പന്നങ്ങൾ അല്ലെങ്കിൽ സേവനങ്ങൾ.
@@ -3872,30 +3953,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} അക്കൗണ്ട് ബജറ്റ് {1} {2} {3} നേരെ {4} ആണ്. ഇത് {5} വഴി കവിയുമെന്നും
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',&#39;നിശ്ചിത അസറ്റ്&#39; വരിയുടെ {0} # അക്കൗണ്ട് തരം ആയിരിക്കണം
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Qty ഔട്ട്
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,ഒരു വില്പനയ്ക്ക് ഷിപ്പിംഗ് തുക കണക്കുകൂട്ടാൻ നിയമങ്ങൾ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,ഒപ്പം അൺചെക്കുചെയ്തത് അപ്രാപ്തമാക്കി
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,സീരീസ് നിർബന്ധമാണ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,സാമ്പത്തിക സേവനങ്ങൾ
 DocType: Student Sibling,Student ID,സ്റ്റുഡന്റ് ഐഡി
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,സമയം ലോഗുകൾക്കായി പ്രവർത്തനങ്ങൾ തരങ്ങൾ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,വിതരണക്കാരൻ ഇമെയിൽ
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,സമയം ലോഗുകൾക്കായി പ്രവർത്തനങ്ങൾ തരങ്ങൾ
 DocType: Tax Rule,Sales,സെയിൽസ്
 DocType: Stock Entry Detail,Basic Amount,അടിസ്ഥാന തുക
 DocType: Training Event,Exam,പരീക്ഷ
 DocType: Complaint,Complaint,പരാതി
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},ഓഹരി ഇനം {0} ആവശ്യമുള്ളതിൽ വെയർഹൗസ്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},ഓഹരി ഇനം {0} ആവശ്യമുള്ളതിൽ വെയർഹൗസ്
 DocType: Leave Allocation,Unused leaves,ഉപയോഗിക്കപ്പെടാത്ത ഇല
 DocType: Patient,Alcohol Past Use,മദ്യപിക്കുന്ന ഭൂതകാല ഉപയോഗം
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,കോടിയുടെ
 DocType: Tax Rule,Billing State,ബില്ലിംഗ് സ്റ്റേറ്റ്
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,ട്രാൻസ്ഫർ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),(സബ്-സമ്മേളനങ്ങൾ ഉൾപ്പെടെ) പൊട്ടിത്തെറിക്കുന്ന BOM ലഭ്യമാക്കുക
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,ട്രാൻസ്ഫർ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),(സബ്-സമ്മേളനങ്ങൾ ഉൾപ്പെടെ) പൊട്ടിത്തെറിക്കുന്ന BOM ലഭ്യമാക്കുക
 DocType: Authorization Rule,Applicable To (Employee),(ജീവനക്കാർ) ബാധകമായ
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,അവസാന തീയതി നിർബന്ധമാണ്
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,അവസാന തീയതി നിർബന്ധമാണ്
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,ഗുണ {0} 0 ആകാൻ പാടില്ല വേണ്ടി വർദ്ധന
 DocType: Journal Entry,Pay To / Recd From,നിന്നും / Recd നൽകാൻ
 DocType: Naming Series,Setup Series,സെറ്റപ്പ് സീരീസ്
 DocType: Payment Reconciliation,To Invoice Date,ഇൻവോയിസ് തീയതി ചെയ്യുക
 DocType: Supplier,Contact HTML,കോൺടാക്റ്റ് എച്ച്ടിഎംഎൽ
 ,Inactive Customers,നിഷ്ക്രിയ ഇടപാടുകാർ
+DocType: Student Admission Program,Maximum Age,പരമാവധി പ്രായം
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,വാങ്ങൽ രസീതുകൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,എങ്ങനെ പ്രൈസിങ് റൂൾ പ്രയോഗിക്കുന്നു?
@@ -3914,6 +3997,7 @@
 DocType: GL Entry,Remarks,അഭിപ്രായപ്രകടനം
 DocType: Payment Entry,Account Paid From,അക്കൗണ്ടിൽ നിന്ന് പണമടച്ചു
 DocType: Purchase Order Item Supplied,Raw Material Item Code,അസംസ്കൃത വസ്തുക്കളുടെ ഇനം കോഡ്
+DocType: Task,Parent Task,പാരന്റ് ടാസ്ക്
 DocType: Journal Entry,Write Off Based On,അടിസ്ഥാനത്തിൽ ന് എഴുതുക
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,ലീഡ് നിർമ്മിക്കുക
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,അച്ചടിച്ച് സ്റ്റേഷനറി
@@ -3922,19 +4006,19 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","ശമ്പള ഇതിനകം തമ്മിലുള്ള {0} കാലയളവിൽ പ്രോസസ്സ് {1}, അപ്ലിക്കേഷൻ കാലയളവിൽ വിടുക ഈ തീയതി പരിധിയിൽ തമ്മിലുള്ള പാടില്ല."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,ഒരു സീരിയൽ നമ്പർ ഇന്സ്റ്റലേഷന് റെക്കോർഡ്
 DocType: Guardian Interest,Guardian Interest,ഗാർഡിയൻ പലിശ
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,POS ഇൻവോയിസുകൾക്കായി സ്ഥിര മൂല്യങ്ങൾ സജ്ജമാക്കുക
 apps/erpnext/erpnext/config/hr.py +177,Training,പരിശീലനം
 DocType: Timesheet,Employee Detail,ജീവനക്കാരുടെ വിശദാംശം
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ഗുഅര്ദിഅന്൧ ഇമെയിൽ ഐഡി
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ഗുഅര്ദിഅന്൧ ഇമെയിൽ ഐഡി
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,മാസം അടുത്ത ദിവസം തിയതി ദിവസം ആവർത്തിക്കുക തുല്യമായിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,മാസം അടുത്ത ദിവസം തിയതി ദിവസം ആവർത്തിക്കുക തുല്യമായിരിക്കണം
 DocType: Lab Prescription,Test Code,ടെസ്റ്റ് കോഡ്
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,വെബ്സൈറ്റ് ഹോംപേജിൽ ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},{1} എന്ന സ്കോർകാർഡ് സ്റ്റാൻഡേർഡ് കാരണം {0}
 DocType: Offer Letter,Awaiting Response,കാത്തിരിക്കുന്നു പ്രതികരണത്തിന്റെ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,മുകളിൽ
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},അസാധുവായ ആട്രിബ്യൂട്ട് {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},അസാധുവായ ആട്രിബ്യൂട്ട് {0} {1}
 DocType: Supplier,Mention if non-standard payable account,സ്റ്റാൻഡേർഡ് അല്ലാത്ത മാറാവുന്ന അക്കൗണ്ട് എങ്കിൽ പരാമർശിക്കുക
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},ഒരേ ഇനം ഒന്നിലധികം തവണ നൽകി. {പട്ടിക}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',ദയവായി &#39;എല്ലാ വിലയിരുത്തൽ ഗ്രൂപ്പുകൾ&#39; പുറമെ വിലയിരുത്തൽ ഗ്രൂപ്പ് തിരഞ്ഞെടുക്കുക
 DocType: Training Event Employee,Optional,ഓപ്ഷണൽ
 DocType: Salary Slip,Earning & Deduction,സമ്പാദിക്കാനുള്ള &amp; കിഴിച്ചുകൊണ്ടു
@@ -3958,11 +4042,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,ഉൽപ്പന്ന ബണ്ടിൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
 DocType: Asset,Straight Line,വര
 DocType: Project User,Project User,പദ്ധതി ഉപയോക്താവ്
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,രണ്ടായി പിരിയുക
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,രണ്ടായി പിരിയുക
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,രണ്ടായി പിരിയുക
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,രണ്ടായി പിരിയുക
 DocType: GL Entry,Is Advance,മുൻകൂർ തന്നെയല്ലേ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,തീയതി ആരംഭിക്കുന്ന തീയതിയും ഹാജർ നിന്ന് ഹാജർ നിർബന്ധമാണ്
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,നൽകുക അതെ അല്ലെങ്കിൽ അല്ല ആയി &#39;Subcontracted മാത്രമാവില്ലല്ലോ&#39;
+DocType: Item,Default Purchase Unit of Measure,മെഷർ സ്ഥിരസ്ഥിതിയായി വാങ്ങൽ യൂണിറ്റ്
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,അവസാനം കമ്യൂണിക്കേഷൻ തീയതി
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,അവസാനം കമ്യൂണിക്കേഷൻ തീയതി
 DocType: Sales Team,Contact No.,കോൺടാക്റ്റ് നമ്പർ
@@ -3971,7 +4056,6 @@
 DocType: Production Order,Check if material transfer entry is not required,മെറ്റീരിയൽ ട്രാൻസ്ഫർ എൻട്രി ആവശ്യമില്ല പരിശോധിക്കുക
 DocType: Production Order,Check if material transfer entry is not required,മെറ്റീരിയൽ ട്രാൻസ്ഫർ എൻട്രി ആവശ്യമില്ല പരിശോധിക്കുക
 DocType: Program Enrollment Tool,Get Students From,വിദ്യാർത്ഥികൾ നേടുക
-DocType: Hub Settings,Seller Country,വില്പനക്കാരന്റെ രാജ്യം
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,വെബ്സൈറ്റ് ഇനങ്ങൾ പ്രസിദ്ധീകരിക്കുക
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,ബാച്ചുകളായി ഗ്രൂപ്പ് നിങ്ങളുടെ വിദ്യാർത്ഥികൾക്ക്
 DocType: Authorization Rule,Authorization Rule,അംഗീകാര റൂൾ
@@ -3981,8 +4065,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,സെയിൽസ് നികുതികളും ചുമത്തിയിട്ടുള്ള ഫലകം
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),ആകെ (ക്രെഡിറ്റ്)
 DocType: Repayment Schedule,Payment Date,പേയ്മെന്റ് തീയതി
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,പുതിയ ബാച്ച് അളവ്
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,പുതിയ ബാച്ച് അളവ്
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,പുതിയ ബാച്ച് അളവ്
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,പുതിയ ബാച്ച് അളവ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,അപ്പാരൽ ആക്സസ്സറികളും
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,വെയ്റ്റഡ് സ്കോർ ഫംഗ്ഷൻ പരിഹരിക്കാനായില്ല. സമവാക്യം സാധുവാണെന്ന് ഉറപ്പുവരുത്തുക.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,ഓർഡർ എണ്ണം
@@ -4000,6 +4084,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","വരി # {0}: അസറ്റ് {1} സമർപ്പിക്കാൻ കഴിയില്ല, അത് ഇതിനകം {2} ആണ്"
 DocType: Tax Rule,Billing Country,ബില്ലിംഗ് രാജ്യം
 DocType: Purchase Order Item,Expected Delivery Date,പ്രതീക്ഷിച്ച ഡെലിവറി തീയതി
+DocType: Restaurant Order Entry,Restaurant Order Entry,റെസ്റ്റോറന്റ് ഓർഡർ എൻട്രി
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,"{0} # {1} തുല്യ അല്ല ഡെബിറ്റ്, ക്രെഡിറ്റ്. വ്യത്യാസം {2} ആണ്."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,വിനോദം ചെലവുകൾ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥന നടത്തുക
@@ -4012,7 +4097,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,നിലവിലുള്ള ഇടപാട് ഉപയോഗിച്ച് അക്കൗണ്ട് ഇല്ലാതാക്കാൻ കഴിയില്ല
 DocType: Vehicle,Last Carbon Check,അവസാനം കാർബൺ ചെക്ക്
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,നിയമ ചെലവുകൾ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,വരിയിൽ അളവ് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,വരിയിൽ അളവ് തിരഞ്ഞെടുക്കുക
 DocType: Purchase Invoice,Posting Time,പോസ്റ്റിംഗ് സമയം
 DocType: Timesheet,% Amount Billed,ഈടാക്കൂ% തുക
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,ടെലിഫോൺ ചെലവുകൾ
@@ -4025,6 +4110,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,പുതിയ കസ്റ്റമർ റവന്യൂ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,യാത്രാ ചെലവ്
 DocType: Maintenance Visit,Breakdown,പ്രവർത്തന രഹിതം
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},ഡോക്യുമെന്റിൽ ഇഷ്ടാനുസൃത ഫീൽഡ് സബ്സ്ക്രിപ്ഷൻ ചേർക്കുക {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,അക്കൗണ്ട്: {0} കറൻസി കൂടെ: {1} തിരഞ്ഞെടുത്ത ചെയ്യാൻ കഴിയില്ല
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",ഏറ്റവും പുതിയ മൂല്യനിർണ്ണയ നിരക്ക് / വിലനിർണയ നിരക്ക് / അസംസ്കൃത വസ്തുക്കളുടെ അവസാന വാങ്ങൽ നിരക്ക് എന്നിവ അടിസ്ഥാനമാക്കി ഷെഡ്യൂളർ വഴി BOM നിരക്ക് അപ്ഡേറ്റ് ചെയ്യുക.
 DocType: Bank Reconciliation Detail,Cheque Date,ചെക്ക് തീയതി
@@ -4049,7 +4135,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),(ടൈം ലോഗുകൾ വഴി) ആകെ ബില്ലിംഗ് തുക
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,വിതരണക്കമ്പനിയായ ഐഡി
 DocType: Payment Request,Payment Gateway Details,പേയ്മെന്റ് ഗേറ്റ്വേ വിവരങ്ങൾ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,ക്വാണ്ടിറ്റി 0 കൂടുതലായിരിക്കണം
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,ക്വാണ്ടിറ്റി 0 കൂടുതലായിരിക്കണം
 DocType: Journal Entry,Cash Entry,ക്യാഷ് എൻട്രി
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,ശിശു നോഡുകൾ മാത്രം &#39;ഗ്രൂപ്പ്&#39; തരം നോഡുകൾ കീഴിൽ സൃഷ്ടിക്കാൻ കഴിയും
 DocType: Leave Application,Half Day Date,അര ദിവസം തീയതി
@@ -4067,12 +4153,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,കുറിപ്പ്: ഇനം {0} ഒന്നിലധികം തവണ നൽകി
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,എല്ലാ ബന്ധങ്ങൾ.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,കമ്പനി സംഗ്രഹ
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,ഉപയോക്താവ് {0} നിലവിലില്ല
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,ഉപയോക്താവ് {0} നിലവിലില്ല
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,ചുരുക്കല്
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,പേയ്മെന്റ് എൻട്രി ഇതിനകം നിലവിലുണ്ട്
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} പരിധികൾ കവിയുന്നു മുതലുള്ള authroized ഒരിക്കലും പാടില്ല
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,ശമ്പളം ടെംപ്ലേറ്റ് മാസ്റ്റർ.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,പാത്തോളജി
+DocType: Restaurant Order Entry,Restaurant Table,റെസ്റ്റോറന്റ് ടേബിൾ
 DocType: Leave Type,Max Days Leave Allowed,മാക്സ് ദിനങ്ങൾ അവധി അനുവദനീയം
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,ഷോപ്പിംഗ് കാർട്ട് നികുതി റൂൾ സജ്ജീകരിക്കുക
 DocType: Purchase Invoice,Taxes and Charges Added,നികുതി ചാർജുകളും ചേർത്തു
@@ -4084,10 +4172,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,നയിക്കുന്നു അല്ലെങ്കിൽ ഉപഭോക്താക്കൾക്ക് ഉദ്ധരണികൾ.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ശീതീകരിച്ച സ്റ്റോക്ക് തിരുത്തിയെഴുതുന്നത് അനുവദനീയം റോൾ
 ,Territory Target Variance Item Group-Wise,ടെറിട്ടറി ടാര്ഗറ്റ് പൊരുത്തമില്ലായ്മ ഇനം ഗ്രൂപ്പ് യുക്തിമാനും
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,എല്ലാ ഉപഭോക്തൃ ഗ്രൂപ്പുകൾ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,എല്ലാ ഉപഭോക്തൃ ഗ്രൂപ്പുകൾ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,പ്രതിമാസം കുമിഞ്ഞു
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} നിർബന്ധമാണ്. ഒരുപക്ഷേ കറൻസി എക്സ്ചേഞ്ച് റെക്കോർഡ് {1} {2} വേണ്ടി സൃഷ്ടിക്കപ്പെട്ടിട്ടില്ല.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,നികുതി ഫലകം നിർബന്ധമാണ്.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,നികുതി ഫലകം നിർബന്ധമാണ്.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,അക്കൗണ്ട് {0}: പാരന്റ് അക്കൌണ്ട് {1} നിലവിലില്ല
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),വില പട്ടിക നിരക്ക് (കമ്പനി കറൻസി)
 DocType: Products Settings,Products Settings,ഉല്പന്നങ്ങൾ ക്രമീകരണങ്ങൾ
@@ -4113,13 +4201,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ഇനം യുക്തിമാനും നികുതി വിശദാംശം
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,ഇൻസ്റ്റിറ്റ്യൂട്ട് സംഗ്രഹം
 ,Item-wise Price List Rate,ഇനം തിരിച്ചുള്ള വില പട്ടിക റേറ്റ്
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ
 DocType: Quotation,In Words will be visible once you save the Quotation.,നിങ്ങൾ ക്വട്ടേഷൻ ലാഭിക്കാൻ ഒരിക്കൽ വാക്കുകളിൽ ദൃശ്യമാകും.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},ക്വാണ്ടിറ്റി ({0}) വരി {1} ഒരു അംശം പാടില്ല
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},ക്വാണ്ടിറ്റി ({0}) വരി {1} ഒരു അംശം പാടില്ല
 DocType: Consultation,C-,സി-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},ബാർകോഡ് {0} ഇതിനകം ഇനം {1} ഉപയോഗിക്കുന്ന
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},ബാർകോഡ് {0} ഇതിനകം ഇനം {1} ഉപയോഗിക്കുന്ന
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,ഷിപ്പിംഗ് ചിലവും ചേർത്ത് നിയമങ്ങൾ.
 DocType: Item,Opening Stock,ഓഹരി തുറക്കുന്നു
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,കസ്റ്റമർ ആവശ്യമാണ്
@@ -4137,9 +4225,8 @@
 DocType: Customer,From Lead,ലീഡ് നിന്ന്
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ഉത്പാദനത്തിന് പുറത്തുവിട്ട ഉത്തരവ്.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,ധനകാര്യ വർഷം തിരഞ്ഞെടുക്കുക ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS ൽ എൻട്രി ഉണ്ടാക്കുവാൻ ആവശ്യമായ POS പ്രൊഫൈൽ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS ൽ എൻട്രി ഉണ്ടാക്കുവാൻ ആവശ്യമായ POS പ്രൊഫൈൽ
 DocType: Program Enrollment Tool,Enroll Students,വിദ്യാർഥികൾ എൻറോൾ
-DocType: Hub Settings,Name Token,ടോക്കൺ പേര്
 DocType: Lab Test,Approved Date,അംഗീകരിച്ച തീയതി
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,സ്റ്റാൻഡേർഡ് വിൽപ്പനയുള്ളത്
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,കുറഞ്ഞത് ഒരു പണ്ടകശാല നിർബന്ധമാണ്
@@ -4157,7 +4244,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,മാനവ വിഭവശേഷി
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,പേയ്മെന്റ് അനുരഞ്ജനം പേയ്മെന്റ്
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,നികുതി ആസ്തികൾ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},പ്രൊഡക്ഷൻ ഓർഡർ ചെയ്തു {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},പ്രൊഡക്ഷൻ ഓർഡർ ചെയ്തു {0}
 DocType: BOM Item,BOM No,BOM ഇല്ല
 DocType: Instructor,INS/,ഐഎൻഎസ് /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,ജേർണൽ എൻട്രി {0} അക്കൗണ്ട് {1} അല്ലെങ്കിൽ ഇതിനകം മറ്റ് വൗച്ചർ പൊരുത്തപ്പെടും ഇല്ല
@@ -4177,8 +4264,8 @@
 DocType: Currency Exchange,To Currency,കറൻസി ചെയ്യുക
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,താഴെ ഉപയോക്താക്കളെ ബ്ലോക്ക് ദിവസം വേണ്ടി ലീവ് ആപ്ലിക്കേഷൻസ് അംഗീകരിക്കാൻ അനുവദിക്കുക.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,ചിലവിടൽ ക്ലെയിം തരം.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ഇനം {0} നിരക്ക് വിൽക്കുന്ന അധികം അതിന്റെ {1} കുറവാണ്. വിൽക്കുന്ന നിരക്ക് കുറയാതെ {2} ആയിരിക്കണം
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ഇനം {0} നിരക്ക് വിൽക്കുന്ന അധികം അതിന്റെ {1} കുറവാണ്. വിൽക്കുന്ന നിരക്ക് കുറയാതെ {2} ആയിരിക്കണം
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ഇനം {0} നിരക്ക് വിൽക്കുന്ന അധികം അതിന്റെ {1} കുറവാണ്. വിൽക്കുന്ന നിരക്ക് കുറയാതെ {2} ആയിരിക്കണം
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ഇനം {0} നിരക്ക് വിൽക്കുന്ന അധികം അതിന്റെ {1} കുറവാണ്. വിൽക്കുന്ന നിരക്ക് കുറയാതെ {2} ആയിരിക്കണം
 DocType: Item,Taxes,നികുതികൾ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,"പെയ്ഡ്, ഒരിക്കലും പാടില്ല കൈമാറി"
 DocType: Project,Default Cost Center,സ്ഥിരസ്ഥിതി ചെലവ് കേന്ദ്രം
@@ -4192,15 +4279,15 @@
 DocType: Employee Loan,Fully Disbursed,പൂർണ്ണമായി വിതരണം
 DocType: Maintenance Visit,Customer Feedback,കസ്റ്റമർ ഫീഡ്ബാക്ക്
 DocType: Account,Expense,ചിലവേറിയ
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,സ്കോർ പരമാവധി സ്കോർ ശ്രേഷ്ഠ പാടില്ല
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,സ്കോർ പരമാവധി സ്കോർ ശ്രേഷ്ഠ പാടില്ല
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,ഉപഭോക്താക്കളും വിതരണക്കാരും
 DocType: Item Attribute,From Range,ശ്രേണിയിൽ നിന്നും
 DocType: BOM,Set rate of sub-assembly item based on BOM,BOM അടിസ്ഥാനമാക്കിയുള്ള സബ് അസംബ്ലിയുടെ ഇനം സജ്ജമാക്കുക
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},ഫോർമുല അല്ലെങ്കിൽ അവസ്ഥയിൽ വ്യാകരണ പിശക്: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},ഫോർമുല അല്ലെങ്കിൽ അവസ്ഥയിൽ വ്യാകരണ പിശക്: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,നിത്യജീവിതത്തിലെ വർക്ക് ചുരുക്കം ക്രമീകരണങ്ങൾ കമ്പനി
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,അത് ഒരു സ്റ്റോക്ക് ഇനവും സ്ഥിതിക്ക് ഇനം {0} അവഗണിച്ച
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,കൂടുതൽ സംസ്കരണം ഈ ഉല്പാദനം ഓർഡർ സമർപ്പിക്കുക.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,കൂടുതൽ സംസ്കരണം ഈ ഉല്പാദനം ഓർഡർ സമർപ്പിക്കുക.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","ഒരു പ്രത്യേക ഇടപാടിലും പ്രൈസിങ് .കൂടുതൽ ചെയ്യുന്നതിനായി, ബാധകമായ എല്ലാ വിലനിർണ്ണയത്തിലേക്ക് പ്രവർത്തനരഹിതമാകും വേണം."
 DocType: Assessment Group,Parent Assessment Group,രക്ഷാകർതൃ അസസ്മെന്റ് ഗ്രൂപ്പ്
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,ജോലി
@@ -4217,12 +4304,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',ശൂന്യമായ ഫിൽട്ടർ ഗ്രൂപ്പ് &#39;കമ്പനി&#39; എങ്കിൽ കമ്പനി സജ്ജമാക്കുക
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,പോസ്റ്റുചെയ്ത തീയതി ഭാവി തീയതി കഴിയില്ല
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},വരി # {0}: സീരിയൽ ഇല്ല {1} {2} {3} കൂടെ പൊരുത്തപ്പെടുന്നില്ല
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,ആവർത്തനത്തെ സൃഷ്ടിക്കുന്നതിന്
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,കാഷ്വൽ ലീവ്
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,ടെസ്റ്റ് UOM പരീക്ഷിക്കുക.
 DocType: Batch,Batch ID,ബാച്ച് ഐഡി
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},കുറിപ്പ്: {0}
 ,Delivery Note Trends,ഡെലിവറി നോട്ട് ട്രെൻഡുകൾ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,ഈ ആഴ്ചത്തെ ചുരുക്കം
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,ഈ ആഴ്ചത്തെ ചുരുക്കം
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,ഓഹരി അളവ് ൽ
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,അക്കൗണ്ട്: {0} മാത്രം ഓഹരി ഇടപാടുകൾ വഴി അപ്ഡേറ്റ് ചെയ്യാൻ കഴിയില്ല
 DocType: Student Group Creation Tool,Get Courses,കോഴ്സുകൾ നേടുക
@@ -4236,7 +4324,6 @@
 DocType: Purchase Order,To Bill,ബില്ലിന്
 DocType: Material Request,% Ordered,% ക്രമപ്പെടുത്തിയ
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","കോഴ്സ് അടിസ്ഥാനമാക്കിയുള്ള സ്റ്റുഡന്റ് ഗ്രൂപ്പ്, കോഴ്സ് പ്രോഗ്രാം എൻറോൾമെന്റ് എൻറോൾ കോഴ്സുകൾ നിന്ന് എല്ലാ വിദ്യാർത്ഥികൾക്കും വേണ്ടി സാധൂകരിക്കാൻ ചെയ്യും."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","കോമ ഉപയോഗിച്ച് വേർതിരിച്ച് ഇമെയിൽ വിലാസം നൽകുക, ഇൻവോയ്സ് പ്രത്യേക തീയതി സ്വയം മെയിൽ ചെയ്യപ്പെടും"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Piecework
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,ശരാ. വാങ്ങുക റേറ്റ്
 DocType: Task,Actual Time (in Hours),(അവേഴ്സ്) യഥാർത്ഥ സമയം
@@ -4250,7 +4337,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,ഇനം {0} സീരിയൽ ഒഴിവ് വിവരത്തിനു അല്ല. കോളം ശ്യൂന്യമായിടണം
 DocType: Accounts Settings,Accounts Settings,ക്രമീകരണങ്ങൾ അക്കൗണ്ടുകൾ
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,അംഗീകരിക്കുക
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,സമർപ്പിക്കുന്നതിന് ഫലങ്ങളൊന്നുമില്ല
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,സമർപ്പിക്കുന്നതിന് ഫലങ്ങളൊന്നുമില്ല
 DocType: Customer,Sales Partner and Commission,"സെയിൽസ് പങ്കാളി, കമ്മീഷൻ"
 DocType: Employee Loan,Rate of Interest (%) / Year,പലിശ നിരക്ക് (%) / വർഷം
 ,Project Quantity,പദ്ധതി ക്വാണ്ടിറ്റി
@@ -4262,55 +4349,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,ബ്ലാക്ക്
 DocType: BOM Explosion Item,BOM Explosion Item,BOM പൊട്ടിത്തെറി ഇനം
 DocType: Account,Auditor,ഓഡിറ്റർ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} നിർമ്മിക്കുന്ന ഇനങ്ങൾ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} നിർമ്മിക്കുന്ന ഇനങ്ങൾ
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,കൂടുതലറിവ് നേടുക
 DocType: Cheque Print Template,Distance from top edge,മുകളറ്റത്തെ നിന്നുള്ള ദൂരം
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,വില ലിസ്റ്റ് {0} പ്രവർത്തനരഹിതമാക്കി അല്ലെങ്കിൽ നിലവിലില്ല
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,വില ലിസ്റ്റ് {0} പ്രവർത്തനരഹിതമാക്കി അല്ലെങ്കിൽ നിലവിലില്ല
 DocType: Purchase Invoice,Return,മടങ്ങിവരവ്
 DocType: Production Order Operation,Production Order Operation,പ്രൊഡക്ഷൻ ഓർഡർ ഓപ്പറേഷൻ
 DocType: Pricing Rule,Disable,അപ്രാപ്തമാക്കുക
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,പേയ്മെന്റ് മോഡ് പേയ്മെന്റ് നടത്താൻ ആവശ്യമാണ്
 DocType: Project Task,Pending Review,അവശേഷിക്കുന്ന അവലോകനം
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,നിയമനങ്ങളും കൺസൾട്ടേഷനുകളും
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ബാച്ച് {2} എൻറോൾ ചെയ്തിട്ടില്ല
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ബാച്ച് {2} എൻറോൾ ചെയ്തിട്ടില്ല
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","അത് ഇതിനകം {1} പോലെ അസറ്റ്, {0} ബോംബെടുക്കുന്നവനും കഴിയില്ല"
 DocType: Task,Total Expense Claim (via Expense Claim),(ചിലവിടൽ ക്ലെയിം വഴി) ആകെ ചിലവേറിയ ക്ലെയിം
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,മാർക് േചാദി
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},വരി {0}: കറന്സി BOM ൽ # ന്റെ {1} {2} തിരഞ്ഞെടുത്തു കറൻസി തുല്യമോ വേണം
 DocType: Journal Entry Account,Exchange Rate,വിനിമയ നിരക്ക്
 DocType: Patient,Additional information regarding the patient,രോഗിയെ സംബന്ധിച്ച കൂടുതൽ വിവരങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,സെയിൽസ് ഓർഡർ {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,സെയിൽസ് ഓർഡർ {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 DocType: Homepage,Tag Line,ടാഗ് ലൈൻ
 DocType: Fee Component,Fee Component,ഫീസ്
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,ഫ്ലീറ്റ് മാനേജ്മെന്റ്
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,നിന്ന് ഇനങ്ങൾ ചേർക്കുക
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,ഫ്ലീറ്റ് മാനേജ്മെന്റ്
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,നിന്ന് ഇനങ്ങൾ ചേർക്കുക
 DocType: Cheque Print Template,Regular,സ്ഥിരമായ
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,എല്ലാ വിലയിരുത്തിയശേഷം മാനദണ്ഡം ആകെ വെയ്റ്റേജ് 100% ആയിരിക്കണം
-DocType: BOM,Last Purchase Rate,കഴിഞ്ഞ വാങ്ങൽ റേറ്റ്
+DocType: Purchase Order Item,Last Purchase Rate,കഴിഞ്ഞ വാങ്ങൽ റേറ്റ്
 DocType: Account,Asset,അസറ്റ്
 DocType: Project Task,Task ID,ടാസ്ക് ഐഡി
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,വകഭേദങ്ങളും ഇല്ലല്ലോ ഓഹരി ഇനം {0} വേണ്ടി നിലവിലില്ല കഴിയില്ല
 DocType: Lab Test,Mobile,മൊബൈൽ
 ,Sales Person-wise Transaction Summary,സെയിൽസ് പേഴ്സൺ തിരിച്ചുള്ള ഇടപാട് ചുരുക്കം
 DocType: Training Event,Contact Number,കോൺടാക്റ്റ് നമ്പർ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,വെയർഹൗസ് {0} നിലവിലില്ല
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext ഹബ് രജിസ്റ്റർ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,വെയർഹൗസ് {0} നിലവിലില്ല
 DocType: Monthly Distribution,Monthly Distribution Percentages,പ്രതിമാസ വിതരണ ശതമാനങ്ങൾ
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,തിരഞ്ഞെടുത്ത ഐറ്റം ബാച്ച് പാടില്ല
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","മൂലധനം നിരക്ക് ഇനം {0}, വേണ്ടി {2} {1} അക്കൗണ്ടിങ് എൻട്രികൾ ചെയ്യാൻ ആവശ്യമായ കണ്ടില്ല. ഇനത്തിൽ {1} ഒരു സാമ്പിൾ ഇനമായി transacting എങ്കിൽ, {1} ഇനം പട്ടികയിലെ ആ പരാമർശിക്കുക. അല്ലാത്തപക്ഷം, ഒരു ഇൻകമിംഗ് സ്റ്റോക്ക് ഇടപാട് ഇനം റെക്കോർഡിൽ മൂലധനം നിരക്ക് ഇനം വേണ്ടി സൃഷ്ടിക്കുക പരാമർശിക്കാനോ, തുടർന്ന് submiting / ഈ എൻട്രി റദ്ദാക്കുന്നതിൽ ശ്രമിക്കുക"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,ഈ ഡെലിവറി നോട്ട് നേരെ ഏല്പിച്ചു വസ്തുക്കൾ%
+DocType: Training Event,Has Certificate,സർട്ടിഫിക്കറ്റ് ഉണ്ട്
 DocType: Project,Customer Details,ഉപഭോക്തൃ വിശദാംശങ്ങൾ
 DocType: Employee,Reports to,റിപ്പോർട്ടുകൾ
 ,Unpaid Expense Claim,നൽകപ്പെടാത്ത ചിലവിടൽ ക്ലെയിം
 DocType: Payment Entry,Paid Amount,തുക
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,സെൽസ് സൈക്കിൾ പര്യവേക്ഷണം ചെയ്യുക
 DocType: Assessment Plan,Supervisor,പരിശോധക
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,ഓൺലൈൻ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,ഓൺലൈൻ
 ,Available Stock for Packing Items,ഇനങ്ങൾ ക്ലാസ്സിലേക് ലഭ്യമാണ് ഓഹരി
 DocType: Item Variant,Item Variant,ഇനം മാറ്റമുള്ള
 DocType: Assessment Result Tool,Assessment Result Tool,അസസ്മെന്റ് ഫലം ടൂൾ
 DocType: BOM Scrap Item,BOM Scrap Item,BOM ലേക്ക് സ്ക്രാപ്പ് ഇനം
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,സമർപ്പിച്ച ഓർഡറുകൾ ഇല്ലാതാക്കാൻ കഴിയില്ല
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,സമർപ്പിച്ച ഓർഡറുകൾ ഇല്ലാതാക്കാൻ കഴിയില്ല
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ഡെബിറ്റ് ഇതിനകം അക്കൗണ്ട് ബാലൻസ്, നിങ്ങൾ &#39;ക്രെഡിറ്റ്&#39; ആയി &#39;ബാലൻസ് ആയിരിക്കണം&#39; സജ്ജീകരിക്കാൻ അനുവാദമില്ലാത്ത"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,ക്വാളിറ്റി മാനേജ്മെന്റ്
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,ഇനം {0} അപ്രാപ്തമാക്കി
@@ -4331,7 +4417,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,സീറോ മൂലധനം നിരക്ക് അനുവദിക്കുക
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,സീറോ മൂലധനം നിരക്ക് അനുവദിക്കുക
 DocType: Training Event Employee,Invited,ക്ഷണിച്ചു
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,ഒന്നിലധികം സജീവ ശമ്പളം ഘടന തന്നിരിക്കുന്ന തീയതികളിൽ ജീവനക്കാരൻ {0} കണ്ടെത്തിയില്ല
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,ഒന്നിലധികം സജീവ ശമ്പളം ഘടന തന്നിരിക്കുന്ന തീയതികളിൽ ജീവനക്കാരൻ {0} കണ്ടെത്തിയില്ല
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,സെറ്റപ്പ് ഗേറ്റ്വേ അക്കൗണ്ടുകൾ.
 DocType: Employee,Employment Type,തൊഴിൽ തരം
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,നിശ്ചിത ആസ്തികൾ
@@ -4343,7 +4429,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,വിദ്യാർത്ഥിയുടെ ഇമെയിൽ ഐഡി
 DocType: Employee,Notice (days),അറിയിപ്പ് (ദിവസം)
 DocType: Tax Rule,Sales Tax Template,സെയിൽസ് ടാക്സ് ഫലകം
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,ഇൻവോയ്സ് സംരക്ഷിക്കാൻ ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,ഇൻവോയ്സ് സംരക്ഷിക്കാൻ ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
 DocType: Employee,Encashment Date,ലീവ് തീയതി
 DocType: Training Event,Internet,ഇന്റർനെറ്റ്
 DocType: Special Test Template,Special Test Template,പ്രത്യേക ടെസ്റ്റ് ടെംപ്ലേറ്റ്
@@ -4353,7 +4439,7 @@
 DocType: Academic Term,Term Start Date,ടേം ആരംഭ തീയതി
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,സ്ഥലം പരിശോധന എണ്ണം
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,സ്ഥലം പരിശോധന എണ്ണം
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},{0} # {1} ചേർക്കപ്പട്ടവ ദയവായി
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},{0} # {1} ചേർക്കപ്പട്ടവ ദയവായി
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,ജനറൽ ലെഡ്ജർ പ്രകാരം ബാങ്ക് സ്റ്റേറ്റ്മെന്റ് ബാലൻസ്
 DocType: Job Applicant,Applicant Name,അപേക്ഷകന് പേര്
 DocType: Authorization Rule,Customer / Item Name,കസ്റ്റമർ / ഇനം പേര്
@@ -4373,7 +4459,7 @@
 DocType: Guardian,Guardian Of ,മേൽനോട്ടം
 DocType: Grading Scale Interval,Threshold,ഉമ്മറം
 DocType: BOM Update Tool,Current BOM,ഇപ്പോഴത്തെ BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,സീരിയൽ ഇല്ല ചേർക്കുക
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,സീരിയൽ ഇല്ല ചേർക്കുക
 DocType: Production Order Item,Available Qty at Source Warehouse,ഉറവിടം വെയർഹൗസ് ലഭ്യമാണ് അളവ്
 apps/erpnext/erpnext/config/support.py +22,Warranty,ഉറപ്പ്
 DocType: Purchase Invoice,Debit Note Issued,ഡെബിറ്റ് കുറിപ്പ് നൽകിയത്
@@ -4396,10 +4482,9 @@
 DocType: Account,Receivable,സ്വീകാ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,വരി # {0}: പർച്ചേസ് ഓർഡർ ഇതിനകം നിലവിലുണ്ട് പോലെ വിതരണക്കാരൻ മാറ്റാൻ അനുവദനീയമല്ല
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,സജ്ജമാക്കാൻ ക്രെഡിറ്റ് പരിധി ഇടപാടുകള് സമർപ്പിക്കാൻ അനുവാദമുള്ളൂ ആ റോൾ.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,നിർമ്മിക്കാനുള്ള ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","മാസ്റ്റർ ഡാറ്റ സമന്വയിപ്പിക്കുന്നത്, അതു കുറച്ച് സമയം എടുത്തേക്കാം"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,നിർമ്മിക്കാനുള്ള ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","മാസ്റ്റർ ഡാറ്റ സമന്വയിപ്പിക്കുന്നത്, അതു കുറച്ച് സമയം എടുത്തേക്കാം"
 DocType: Item,Material Issue,മെറ്റീരിയൽ പ്രശ്നം
-DocType: Hub Settings,Seller Description,വില്പനക്കാരന്റെ വിവരണം
 DocType: Employee Education,Qualification,യോഗ്യത
 DocType: Item Price,Item Price,ഇനം വില
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,സോപ്പ് &amp; മാലിനനിര്മാര്ജനി
@@ -4407,7 +4492,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,കാലാകാലങ്ങളിൽ ശ്രേഷ്ഠ പാടില്ല.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,മോഷൻ പിക്ചർ &amp; വീഡിയോ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ഉത്തരവിട്ടു
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,പുനരാരംഭിക്കുക
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,പുനരാരംഭിക്കുക
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"പ്രവർത്തനസജ്ജമാക്കിയാൽ, ടെംപ്ലേറ്റിൽ നിന്നും വകഭേദങ്ങളുടെ വിന്യാസങ്ങൾ പരിഷ്ക്കരിക്കുകയില്ലെങ്കിലും പുതിയ രൂപകൽപന ചെയ്യുമ്പോൾ താഴെപ്പറയുന്ന ഫീൽഡുകളുടെ ഡാറ്റ പകർത്തും"
 DocType: Salary Detail,Component,ഘടകം
 DocType: Assessment Criteria,Assessment Criteria Group,അസസ്മെന്റ് മാനദണ്ഡം ഗ്രൂപ്പ്
 DocType: Healthcare Settings,Patient Name By,വഴി രോഗിയുടെ പേര്
@@ -4417,7 +4503,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,റോൾ അംഗീകരിക്കുന്നു അല്ലെങ്കിൽ ഉപയോക്താവ് അംഗീകരിക്കുന്നു നൽകുക
 DocType: Journal Entry,Write Off Entry,എൻട്രി എഴുതുക
 DocType: BOM,Rate Of Materials Based On,മെറ്റീരിയൽസ് അടിസ്ഥാനത്തിൽ ഓൺ നിരക്ക്
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണക്കാരൻ തരം
+DocType: Item Variant Settings,Do not Update Variants,വേരിയന്റുകൾ അപ്ഡേറ്റുചെയ്യരുത്
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,പിന്തുണ Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,എല്ലാത്തിൻറെയും പരിശോധന
 DocType: POS Profile,Terms and Conditions,ഉപാധികളും നിബന്ധനകളും
@@ -4426,7 +4512,7 @@
 DocType: Leave Block List,Applies to Company,കമ്പനി പ്രയോഗിക്കുന്നു
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,സമർപ്പിച്ച ഓഹരി എൻട്രി {0} നിലവിലുണ്ട് കാരണം റദ്ദാക്കാൻ കഴിയില്ല
 DocType: Employee Loan,Disbursement Date,ചിലവ് തീയതി
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;സ്വീകർത്താക്കൾ&#39; വ്യക്തമാക്കിയിട്ടില്ല
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;സ്വീകർത്താക്കൾ&#39; വ്യക്തമാക്കിയിട്ടില്ല
 DocType: BOM Update Tool,Update latest price in all BOMs,എല്ലാ BOM കളിലും പുതിയ വില അപ്ഡേറ്റ് ചെയ്യുക
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,മെഡിക്കൽ റെക്കോർഡ്
 DocType: Vehicle,Vehicle,വാഹനം
@@ -4442,14 +4528,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,സ്ഥലം പരിശോധന / ലീഡ്%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,അസറ്റ് Depreciations നീക്കിയിരിപ്പും
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},തുക {0} {1} ലേക്ക് {3} {2} നിന്ന് കൈമാറി
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},തുക {0} {1} ലേക്ക് {3} {2} നിന്ന് കൈമാറി
 DocType: Sales Invoice,Get Advances Received,അഡ്വാൻസുകളും സ്വീകരിച്ചു നേടുക
 DocType: Email Digest,Add/Remove Recipients,ചേർക്കുക / സ്വീകരിക്കുന്നവരെ നീക്കംചെയ്യുക
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},ഇടപാട് നിർത്തിവച്ചു പ്രൊഡക്ഷൻ ഓർഡർ {0} നേരെ അനുവദിച്ചിട്ടില്ല
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","സഹജമായിസജ്ജീകരിയ്ക്കുക സാമ്പത്തിക വർഷം സജ്ജമാക്കാൻ, &#39;സഹജമായിസജ്ജീകരിയ്ക്കുക&#39; ക്ലിക്ക് ചെയ്യുക"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,ചേരുക
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,ചേരുക
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,ദൌർലഭ്യം Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,ഇനം വേരിയന്റ് {0} ഒരേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,ഇനം വേരിയന്റ് {0} ഒരേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
 DocType: Employee Loan,Repay from Salary,ശമ്പളത്തിൽ നിന്ന് പകരം
 DocType: Leave Application,LAP/,ലാപ് /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},തുക {0} {1} നേരെ പേയ്മെന്റ് അഭ്യർത്ഥിക്കുന്നു {2}
@@ -4462,7 +4548,7 @@
 DocType: Sales Invoice Item,Sales Order Item,സെയിൽസ് ഓർഡർ ഇനം
 DocType: Salary Slip,Payment Days,പേയ്മെന്റ് ദിനങ്ങൾ
 DocType: Patient,Dormant,വായടക്ക്
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,കുട്ടി നോഡുകൾ ഉപയോഗിച്ച് അബദ്ധങ്ങളും ലെഡ്ജർ പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,കുട്ടി നോഡുകൾ ഉപയോഗിച്ച് അബദ്ധങ്ങളും ലെഡ്ജർ പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല
 DocType: BOM,Manage cost of operations,ഓപ്പറേഷൻസ് ചെലവ് നിയന്ത്രിക്കുക
 DocType: Accounts Settings,Stale Days,പഴക്കം ചെന്ന ദിവസങ്ങൾ
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","ചെക്ക് ചെയ്ത ഇടപാടുകൾ ഏതെങ്കിലും &#39;സമർപ്പിച്ചു &quot;ചെയ്യുമ്പോൾ, ഒരു ഇമെയിൽ പോപ്പ്-അപ്പ് സ്വയം ഒരടുപ്പം നിലയിൽ ഇടപാട് കൂടെ ആ ഇടപാട് ബന്ധപ്പെട്ട്&quot; ബന്ധപ്പെടുക &quot;എന്ന മെയിൽ അയക്കാൻ തുറന്നു. ഉപയോക്താവിനെ അല്ലെങ്കിൽ കഴിയണമെന്നില്ല ഇമെയിൽ അയയ്ക്കാം."
@@ -4476,10 +4562,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,സീരിയൽ ഇല്ല {0} ഇതിനകം ലഭിച്ചു ചെയ്തു
 ,Requested Items To Be Transferred,മാറ്റിയത് അഭ്യർത്ഥിച്ചു ഇനങ്ങൾ
 DocType: Expense Claim,Vehicle Log,വാഹന ലോഗ്
-DocType: Purchase Invoice,Recurring Id,ആവർത്തക ഐഡി
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),പനിവിന്റെ സാന്നിധ്യം (താൽക്കാലിക&gt; 38.5 ° C / 101.3 ° F അല്ലെങ്കിൽ സുസ്ഥിരമായ താപനില&gt; 38 ° C / 100.4 ° F)
 DocType: Customer,Sales Team Details,സെയിൽസ് ടീം വിശദാംശങ്ങൾ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,ശാശ്വതമായി ഇല്ലാതാക്കുക?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,ശാശ്വതമായി ഇല്ലാതാക്കുക?
 DocType: Expense Claim,Total Claimed Amount,ആകെ ക്ലെയിം ചെയ്ത തുക
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,വില്ക്കുകയും വരാവുന്ന അവസരങ്ങൾ.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},അസാധുവായ {0}
@@ -4489,7 +4574,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ഡിപ്പാർട്ട്മെന്റ് സ്റ്റോറുകൾ
 ,Item Delivery Date,ഇനം ഡെലിവറി തീയതി
 DocType: Warehouse,PIN,പിൻ
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,സജ്ജീകരണം എര്പ്നെക്സത് നിങ്ങളുടെ സ്കൂൾ
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,സജ്ജീകരണം എര്പ്നെക്സത് നിങ്ങളുടെ സ്കൂൾ
 DocType: Sales Invoice,Base Change Amount (Company Currency),തുക ബേസ് മാറ്റുക (കമ്പനി കറൻസി)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,താഴെ അബദ്ധങ്ങളും വേണ്ടി ഇല്ല അക്കൌണ്ടിങ് എൻട്രികൾ
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,ആദ്യം പ്രമാണം സംരക്ഷിക്കുക.
@@ -4501,13 +4586,12 @@
 DocType: Task,Is Milestone,Milestone ആണോ
 DocType: Daily Work Summary,Email Sent To,അയച്ച ഇമെയിൽ
 DocType: Budget,Warn,മുന്നറിയിപ്പുകൊടുക്കുക
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,രജിസ്റ്റർ ചെയ്തത് മാറ്റണമെന്ന് നിങ്ങൾക്ക് തീർച്ചയാണോ?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","മറ്റേതെങ്കിലും പരാമർശമാണ്, റെക്കോർഡുകൾ ചെല്ലേണ്ടതിന്നു ശ്രദ്ധേയമാണ് ശ്രമം."
 DocType: BOM,Manufacturing User,ണം ഉപയോക്താവ്
 DocType: Purchase Invoice,Raw Materials Supplied,നൽകിയത് അസംസ്കൃത വസ്തുക്കൾ
-DocType: Purchase Invoice,Recurring Print Format,ആവർത്തക പ്രിന്റ് ഫോർമാറ്റ്
 DocType: C-Form,Series,സീരീസ്
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},വിലവിവരങ്ങളുടെ നാണയം {0} {1} അല്ലെങ്കിൽ {2} ആയിരിക്കണം
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,ഉൽപ്പന്നങ്ങൾ ചേർക്കുക
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},വിലവിവരങ്ങളുടെ നാണയം {0} {1} അല്ലെങ്കിൽ {2} ആയിരിക്കണം
 DocType: Appraisal,Appraisal Template,അപ്രൈസൽ ഫലകം
 DocType: Item Group,Item Classification,ഇനം തിരിക്കൽ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,ബിസിനസ് ഡെവലപ്മെന്റ് മാനേജർ
@@ -4521,7 +4605,7 @@
 DocType: Item Attribute Value,Attribute Value,ന്റെതിരച്ചറിവിനു്തെറ്റായധാര്മ്മികമൂല്യം
 ,Itemwise Recommended Reorder Level,Itemwise പുനഃക്രമീകരിക്കുക ലെവൽ ശുപാർശിത
 DocType: Salary Detail,Salary Detail,ശമ്പള വിശദാംശം
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,ആദ്യം {0} തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,ആദ്യം {0} തിരഞ്ഞെടുക്കുക
 DocType: Appointment Type,Physician,വൈദ്യൻ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,ബാച്ച് {0} ഇനത്തിന്റെ {1} കാലഹരണപ്പെട്ടു.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,കൺസൾട്ടേഷനുകൾ
@@ -4532,7 +4616,7 @@
 DocType: Salary Detail,Default Amount,സ്ഥിരസ്ഥിതി തുക
 DocType: Lab Test Template,Descriptive,വിവരണാത്മക
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,വെയർഹൗസ് സിസ്റ്റം കണ്ടെത്തിയില്ല
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,ഈ മാസം ചുരുക്കം
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,ഈ മാസം ചുരുക്കം
 DocType: Quality Inspection Reading,Quality Inspection Reading,ക്വാളിറ്റി ഇൻസ്പെക്ഷൻ വായന
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`ഫ്രീസുചെയ്യുക സ്റ്റോക്കുകൾ പഴയ Than`% d ദിവസം കുറവായിരിക്കണം.
 DocType: Tax Rule,Purchase Tax Template,വാങ്ങൽ നികുതി ഫലകം
@@ -4555,12 +4639,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,പരിശീലന പരിപാടികൾ / ഫലങ്ങൾ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,ഓൺ ആയി സൂക്ഷിക്കുന്നത് മൂല്യത്തകർച്ച
 DocType: Sales Invoice,C-Form Applicable,ബാധകമായ സി-ഫോം
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},ഓപ്പറേഷൻ സമയം ഓപ്പറേഷൻ {0} വേണ്ടി 0 വലുതായിരിക്കണം
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},ഓപ്പറേഷൻ സമയം ഓപ്പറേഷൻ {0} വേണ്ടി 0 വലുതായിരിക്കണം
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,വെയർഹൗസ് നിർബന്ധമാണ്
 DocType: Supplier,Address and Contacts,വിശദാംശവും ബന്ധങ്ങൾ
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM പരിവർത്തന വിശദാംശം
 DocType: Program,Program Abbreviation,പ്രോഗ്രാം സംഗ്രഹം
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,പ്രൊഡക്ഷൻ ഓർഡർ ഒരു ഇനം ഫലകം ഈടിന്മേൽ ചെയ്യാൻ കഴിയില്ല
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,പ്രൊഡക്ഷൻ ഓർഡർ ഒരു ഇനം ഫലകം ഈടിന്മേൽ ചെയ്യാൻ കഴിയില്ല
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,വിചാരണ ഓരോ ഇനത്തിനും നേരെ പർച്ചേസ് രസീതിലെ അപ്ഡേറ്റ്
 DocType: Warranty Claim,Resolved By,തന്നെയാണ പരിഹരിക്കപ്പെട്ട
 DocType: Bank Guarantee,Start Date,തുടങ്ങുന്ന ദിവസം
@@ -4586,27 +4670,28 @@
 DocType: Employee,Educational Qualification,വിദ്യാഭ്യാസ യോഗ്യത
 DocType: Workstation,Operating Costs,ഓപ്പറേറ്റിംഗ് വിലയും
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,സൂക്ഷിക്കുന്നത് പ്രതിമാസം ബജറ്റ് നടപടികൾ കവിഞ്ഞു
-DocType: Purchase Invoice,Submit on creation,സൃഷ്ടിക്കൽ സമർപ്പിക്കുക
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},{0} {1} ആയിരിക്കണം വേണ്ടി കറൻസി
+DocType: Subscription,Submit on creation,സൃഷ്ടിക്കൽ സമർപ്പിക്കുക
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},{0} {1} ആയിരിക്കണം വേണ്ടി കറൻസി
 DocType: Asset,Disposal Date,തീർപ്പ് തീയതി
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ഇമെയിലുകൾ അവർ അവധി ഇല്ലെങ്കിൽ, തന്നിരിക്കുന്ന നാഴിക കമ്പനിയുടെ എല്ലാ സജീവ ജീവനക്കാർക്ക് അയയ്ക്കും. പ്രതികരണങ്ങളുടെ സംഗ്രഹം അർദ്ധരാത്രിയിൽ അയയ്ക്കും."
 DocType: Employee Leave Approver,Employee Leave Approver,ജീവനക്കാരുടെ അവധി Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},വരി {0}: ഒരു പുനഃക്രമീകരിക്കുക എൻട്രി ഇതിനകം ഈ വെയർഹൗസ് {1} നിലവിലുണ്ട്
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","നഷ്ടപ്പെട്ട പോലെ ക്വട്ടേഷൻ വെളിപ്പെടുത്താമോ കാരണം, വർണ്ണിക്കും ചെയ്യാൻ കഴിയില്ല."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,പരിശീലന പ്രതികരണം
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},വരി {0}: ഒരു പുനഃക്രമീകരിക്കുക എൻട്രി ഇതിനകം ഈ വെയർഹൗസ് {1} നിലവിലുണ്ട്
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","നഷ്ടപ്പെട്ട പോലെ ക്വട്ടേഷൻ വെളിപ്പെടുത്താമോ കാരണം, വർണ്ണിക്കും ചെയ്യാൻ കഴിയില്ല."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,പരിശീലന പ്രതികരണം
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,പ്രൊഡക്ഷൻ ഓർഡർ {0} സമർപ്പിക്കേണ്ടതാണ്
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,വിതരണക്കാരൻ സ്കോർകാർഡ് മാനദണ്ഡം
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},ഇനം {0} ആരംഭ തീയതിയും അവസാന തീയതി തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},കോഴ്സ് വരി {0} ലെ നിർബന്ധമായും
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ഇന്നുവരെ തീയതി മുതൽ മുമ്പ് ആകാൻ പാടില്ല
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,എഡിറ്റ് വിലകൾ / ചേർക്കുക
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,എഡിറ്റ് വിലകൾ / ചേർക്കുക
 DocType: Batch,Parent Batch,പാരന്റ് ബാച്ച്
 DocType: Batch,Parent Batch,പാരന്റ് ബാച്ച്
 DocType: Cheque Print Template,Cheque Print Template,ചെക്ക് പ്രിന്റ് ഫലകം
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,ചെലവ് സെന്റേഴ്സ് ചാർട്ട്
 DocType: Lab Test Template,Sample Collection,സാമ്പിൾ ശേഖരണം
 ,Requested Items To Be Ordered,ക്രമപ്പെടുത്തിയ അഭ്യർത്ഥിച്ചു ഇനങ്ങൾ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,എന്റെ ഉത്തരവുകൾ
 DocType: Price List,Price List Name,വില പട്ടിക പേര്
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},{0} പ്രതിദിന ഔദ്യോഗിക ചുരുക്കം
 DocType: Employee Loan,Totals,ആകെത്തുകകൾ
@@ -4625,12 +4710,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {3} {4} {5} ഈ ഇടപാട് പൂർത്തിയാക്കാൻ വേണ്ടി ന് {2} ൽ ആവശ്യമായ {1} യൂണിറ്റ്.
 DocType: Fee Schedule,Student Category,വിദ്യാർത്ഥിയുടെ വർഗ്ഗം
 DocType: Announcement,Student,വിദ്യാർത്ഥി
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,ഓർഗനൈസേഷൻ യൂണിറ്റ് (വകുപ്പ്) മാസ്റ്റർ.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,ഓർഗനൈസേഷൻ യൂണിറ്റ് (വകുപ്പ്) മാസ്റ്റർ.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,റൂമിലേക്ക് പോകുക
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,അയക്കുന്നതിന് മുമ്പ് സന്ദേശം നൽകുക
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,വിതരണക്കാരൻ ഡ്യൂപ്ലിക്കേറ്റ്
 DocType: Email Digest,Pending Quotations,തീർച്ചപ്പെടുത്തിയിട്ടില്ല ഉദ്ധരണികൾ
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,പോയിന്റ്-ഓഫ്-വില്പനയ്ക്ക് പ്രൊഫൈൽ
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,പോയിന്റ്-ഓഫ്-വില്പനയ്ക്ക് പ്രൊഫൈൽ
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,ലാസ്റ്റ് ടെസ്റ്റ് കോൺഫിഗറേഷൻ.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,മുൻവാതിൽ വായ്പകൾ
 DocType: Cost Center,Cost Center Name,കോസ്റ്റ് സെന്റർ പേര്
@@ -4640,6 +4725,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,ആകെ പണമടച്ചു ശാരീരിക
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 അക്ഷരങ്ങളിൽ കൂടുതൽ ഗുരുതരമായത് സന്ദേശങ്ങൾ ഒന്നിലധികം സന്ദേശങ്ങൾ വിഭജിക്കും
 DocType: Purchase Receipt Item,Received and Accepted,ലഭിച്ച അംഗീകരിക്കപ്പെടുകയും
+DocType: Hub Settings,Company and Seller Profile,കമ്പനിയും വിൽപ്പനക്കാരന്റെ പ്രൊഫൈലും
 ,GST Itemised Sales Register,ചരക്കുസേവന ഇനമാക്കിയിട്ടുള്ള സെയിൽസ് രജിസ്റ്റർ
 ,Serial No Service Contract Expiry,സീരിയൽ ഇല്ല സേവനം കരാര് കാലഹരണ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,"ഒരേ സമയത്ത് ഒരേ അക്കൗണ്ട് ക്രെഡിറ്റ്, ഡെബിറ്റ് കഴിയില്ല"
@@ -4649,10 +4735,11 @@
 DocType: Item,Variant Based On,വേരിയന്റ് അടിസ്ഥാനമാക്കിയുള്ള
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},അസൈൻ ആകെ വെയിറ്റേജ് 100% ആയിരിക്കണം. ഇത് {0} ആണ്
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,നിങ്ങളുടെ വിതരണക്കാരും
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,ദയവായി അത് ശരിയാക്കുക
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,സെയിൽസ് ഓർഡർ കഴിക്കുന്ന പോലെ ലോസ്റ്റ് ആയി സജ്ജമാക്കാൻ കഴിയില്ല.
 DocType: Request for Quotation Item,Supplier Part No,വിതരണക്കാരൻ ഭാഗം ഇല്ല
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',വർഗ്ഗം &#39;മൂലധനം&#39; അല്ലെങ്കിൽ &#39;Vaulation മൊത്തം&#39; എന്ന എപ്പോൾ കുറയ്ക്കാവുന്നതാണ് കഴിയില്ല
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,നിന്നു ലഭിച്ച
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,നിന്നു ലഭിച്ച
 DocType: Lead,Converted,പരിവർത്തനം
 DocType: Item,Has Serial No,സീരിയൽ പോസ്റ്റ് ഉണ്ട്
 DocType: Employee,Date of Issue,പുറപ്പെടുവിച്ച തീയതി
@@ -4660,7 +4747,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","വാങ്ങൽ തല്ലാൻ ആവശ്യമുണ്ട് == &#39;അതെ&#39;, പിന്നീട് വാങ്ങൽ ഇൻവോയ്സ് സൃഷ്ടിക്കാൻ, ഉപയോക്തൃ ഇനം {0} ആദ്യം വാങ്ങൽ രസീത് സൃഷ്ടിക്കാൻ ആവശ്യമെങ്കിൽ വാങ്ങൽ ക്രമീകരണങ്ങൾ പ്രകാരം"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},വരി # {0}: ഇനത്തിന്റെ വേണ്ടി സജ്ജമാക്കുക വിതരണക്കാരൻ {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,വരി {0}: മണിക്കൂറുകൾ മൂല്യം പൂജ്യത്തേക്കാൾ വലുതായിരിക്കണം.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,വെബ്സൈറ്റ് ചിത്രം {0} ഇനം ഘടിപ്പിച്ചിരിക്കുന്ന {1} കണ്ടെത്താൻ കഴിയുന്നില്ല
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,വെബ്സൈറ്റ് ചിത്രം {0} ഇനം ഘടിപ്പിച്ചിരിക്കുന്ന {1} കണ്ടെത്താൻ കഴിയുന്നില്ല
 DocType: Issue,Content Type,ഉള്ളടക്ക തരം
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,കമ്പ്യൂട്ടർ
 DocType: Item,List this Item in multiple groups on the website.,വെബ്സൈറ്റിൽ ഒന്നിലധികം സംഘങ്ങളായി ഈ ഇനം കാണിയ്ക്കുക.
@@ -4671,14 +4758,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled എൻട്രികൾ നേടുക
 DocType: Payment Reconciliation,From Invoice Date,ഇൻവോയിസ് തീയതി മുതൽ
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,നിങ്ങൾക്ക് സമർപ്പിക്കാൻ അനുമതിയില്ല
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,ബില്ലിംഗ് കറൻസി ഒന്നുകിൽ സ്ഥിര comapany നാണയത്തിൽ അല്ലെങ്കിൽ പാർട്ടി അക്കൗണ്ട് കറൻസി തുല്യമായിരിക്കണം
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,ബില്ലിംഗ് കറൻസി ഒന്നുകിൽ സ്ഥിര comapany നാണയത്തിൽ അല്ലെങ്കിൽ പാർട്ടി അക്കൗണ്ട് കറൻസി തുല്യമായിരിക്കണം
 DocType: Healthcare Settings,Laboratory Settings,ലബോറട്ടറി ക്രമീകരണം
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,ലീവ്
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,അത് എന്തു ചെയ്യുന്നു?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,വെയർഹൗസ് ചെയ്യുക
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,എല്ലാ സ്റ്റുഡന്റ് പ്രവേശന
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,അത് എന്തു ചെയ്യുന്നു?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,വെയർഹൗസ് ചെയ്യുക
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,എല്ലാ സ്റ്റുഡന്റ് പ്രവേശന
 ,Average Commission Rate,ശരാശരി കമ്മീഷൻ നിരക്ക്
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,&#39;അതെ&#39; നോൺ-ഓഹരി ഇനത്തിന്റെ വേണ്ടി ആകാൻ പാടില്ല &#39;സീരിയൽ നോ ഉണ്ട്&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,&#39;അതെ&#39; നോൺ-ഓഹരി ഇനത്തിന്റെ വേണ്ടി ആകാൻ പാടില്ല &#39;സീരിയൽ നോ ഉണ്ട്&#39;
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,നില തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,ഹാജർ ഭാവി തീയതി വേണ്ടി അടയാളപ്പെടുത്തും കഴിയില്ല
 DocType: Pricing Rule,Pricing Rule Help,പ്രൈസിങ് റൂൾ സഹായം
@@ -4696,41 +4783,41 @@
 DocType: Item,Customer Code,കസ്റ്റമർ കോഡ്
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},{0} വേണ്ടി ജന്മദിനം
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,കഴിഞ്ഞ ഓർഡർ നു ശേഷം ദിനങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു ബാലൻസ് ഷീറ്റ് അക്കൗണ്ട് ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു ബാലൻസ് ഷീറ്റ് അക്കൗണ്ട് ആയിരിക്കണം
 DocType: Buying Settings,Naming Series,സീരീസ് നാമകരണം
 DocType: Leave Block List,Leave Block List Name,ബ്ലോക്ക് പട്ടിക പേര് വിടുക
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ഇൻഷുറൻസ് ആരംഭ തീയതി ഇൻഷുറൻസ് അവസാന തീയതി കുറവായിരിക്കണം
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,സ്കൂളിൽ ക്രമീകരണങ്ങളിൽ സെറ്റ് അപ് പരിശീലകൻ നവീകരണ സിസ്റ്റം സ്കൂൾ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,സ്റ്റോക്ക് അസറ്റുകൾ
 DocType: Timesheet,Production Detail,പ്രൊഡക്ഷൻ വിശദാംശം
+DocType: Restaurant,Active Menu,സജീവ മെനു
 DocType: Target Detail,Target Qty,ടാർജറ്റ് Qty
 DocType: Shopping Cart Settings,Checkout Settings,ചെക്കൗട്ട് ക്രമീകരണങ്ങൾ
 DocType: Attendance,Present,ഇപ്പോഴത്തെ
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,ഡെലിവറി നോട്ട് {0} സമർപ്പിയ്ക്കാൻ വേണം
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,ഡെലിവറി നോട്ട് {0} സമർപ്പിയ്ക്കാൻ വേണം
 DocType: Notification Control,Sales Invoice Message,സെയിൽസ് ഇൻവോയിസ് സന്ദേശം
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,അക്കൗണ്ട് {0} അടയ്ക്കുന്നത് തരം ബാധ്യത / ഇക്വിറ്റി എന്ന ഉണ്ടായിരിക്കണം
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},ഉദ്യോഗസ്ഥ ജാമ്യം ജി {0} ഇതിനകം സമയം ഷീറ്റ് {1} സൃഷ്ടിച്ച
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},ഉദ്യോഗസ്ഥ ജാമ്യം ജി {0} ഇതിനകം സമയം ഷീറ്റ് {1} സൃഷ്ടിച്ച
 DocType: Vehicle Log,Odometer,ഓഡോമീറ്റർ
 DocType: Sales Order Item,Ordered Qty,ഉത്തരവിട്ടു Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,ഇനം {0} പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,ഇനം {0} പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ
 DocType: Stock Settings,Stock Frozen Upto,ഓഹരി ശീതീകരിച്ച വരെ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM ലേക്ക് ഏതെങ്കിലും ഓഹരി ഇനം അടങ്ങിയിട്ടില്ല
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,പ്രോജക്ട് പ്രവർത്തനം / ചുമതല.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM ലേക്ക് ഏതെങ്കിലും ഓഹരി ഇനം അടങ്ങിയിട്ടില്ല
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,പ്രോജക്ട് പ്രവർത്തനം / ചുമതല.
 DocType: Vehicle Log,Refuelling Details,Refuelling വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,ശമ്പളം സ്ലിപ്പിൽ ജനറേറ്റുചെയ്യൂ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","ബാധകമായ വേണ്ടി {0} തിരഞ്ഞെടുക്കപ്പെട്ടു എങ്കിൽ വാങ്ങൽ, ചെക്ക് ചെയ്തിരിക്കണം"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ഡിസ്കൗണ്ട് 100 താഴെ ആയിരിക്കണം
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,അവസാനം വാങ്ങൽ നിരക്ക് കണ്ടെത്തിയില്ല
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ഓഫാക്കുക എഴുതുക തുക (കമ്പനി കറൻസി)
 DocType: Sales Invoice Timesheet,Billing Hours,ബില്ലിംഗ് മണിക്കൂർ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,{0} കണ്ടെത്തിയില്ല സ്ഥിര BOM ൽ
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,വരി # {0}: സജ്ജീകരിക്കുക പുനഃക്രമീകരിക്കുക അളവ്
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,{0} കണ്ടെത്തിയില്ല സ്ഥിര BOM ൽ
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,വരി # {0}: സജ്ജീകരിക്കുക പുനഃക്രമീകരിക്കുക അളവ്
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,ഇവിടെ ചേർക്കാൻ ഇനങ്ങൾ ടാപ്പ്
 DocType: Fees,Program Enrollment,പ്രോഗ്രാം എൻറോൾമെന്റ്
 DocType: Landed Cost Voucher,Landed Cost Voucher,ചെലവ് വൗച്ചർ റജിസ്റ്റർ
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},{0} സജ്ജീകരിക്കുക
-DocType: Purchase Invoice,Repeat on Day of Month,മാസം നാളിൽ ആവർത്തിക്കുക
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} വിദ്യാർത്ഥി നിഷ്ക്രിയമാണ്
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} വിദ്യാർത്ഥി നിഷ്ക്രിയമാണ്
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} വിദ്യാർത്ഥി നിഷ്ക്രിയമാണ്
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} വിദ്യാർത്ഥി നിഷ്ക്രിയമാണ്
 DocType: Employee,Health Details,ആരോഗ്യ വിശദാംശങ്ങൾ
 DocType: Offer Letter,Offer Letter Terms,ഓഫർ ലെറ്ററിന്റെ നിബന്ധനകൾ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,ഒരു പേയ്മെന്റ് അഭ്യർത്ഥന റഫറൻസ് പ്രമാണം ആവശ്യമാണ് സൃഷ്ടിക്കാൻ
@@ -4739,7 +4826,6 @@
 DocType: Employee External Work History,Salary,ശമ്പളം
 DocType: Serial No,Delivery Document Type,ഡെലിവറി ഡോക്യുമെന്റ് തരം
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,മുകളിൽ തിരഞ്ഞെടുത്ത തിരയാം എല്ലാ ശമ്പളം സ്ലിപ്പിൽ സമർപ്പിക്കുക
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,സമന്വയിപ്പിച്ചു {0} ഇനങ്ങൾ
 DocType: Sales Order,Partly Delivered,ഭാഗികമായി കൈമാറി
 DocType: Email Digest,Receivables,Receivables
 DocType: Lead Source,Lead Source,ലീഡ് ഉറവിടം
@@ -4759,9 +4845,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,എയ്ജിങ് ശ്രേണി 2
 DocType: SG Creation Tool Course,Max Strength,മാക്സ് ദൃഢത
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM ലേക്ക് മാറ്റിസ്ഥാപിച്ചു
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,ഡെലിവറി തീയതി അടിസ്ഥാനമാക്കിയുള്ള ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,ഡെലിവറി തീയതി അടിസ്ഥാനമാക്കിയുള്ള ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
 ,Sales Analytics,സെയിൽസ് അനലിറ്റിക്സ്
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},ലഭ്യമായ {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},ലഭ്യമായ {0}
 ,Prospects Engaged But Not Converted,സാദ്ധ്യതകളും നിശ്ചയം എന്നാൽ പരിവർത്തനം
 ,Prospects Engaged But Not Converted,സാദ്ധ്യതകളും നിശ്ചയം എന്നാൽ പരിവർത്തനം
 DocType: Manufacturing Settings,Manufacturing Settings,ണം ക്രമീകരണങ്ങൾ
@@ -4769,10 +4855,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,ഗുഅര്ദിഅന്൧ മൊബൈൽ ഇല്ല
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,കമ്പനി മാസ്റ്റർ സ്വതവേയുള്ള കറൻസി നൽകുക
 DocType: Stock Entry Detail,Stock Entry Detail,സ്റ്റോക്ക് എൻട്രി വിശദാംശം
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,പ്രതിദിന ഓർമപ്പെടുത്തലുകൾ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,പ്രതിദിന ഓർമപ്പെടുത്തലുകൾ
 DocType: Products Settings,Home Page is Products,ഹോം പേജ് ഉല്പന്നങ്ങൾ ആണ്
 ,Asset Depreciation Ledger,അസറ്റ് മൂല്യത്തകർച്ച ലെഡ്ജർ
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},{0} ഉപയോഗിച്ച് നികുതി നിയമം പൊരുത്തപ്പെടുന്നില്ല
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},{0} ഉപയോഗിച്ച് നികുതി നിയമം പൊരുത്തപ്പെടുന്നില്ല
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,പുതിയ അക്കൗണ്ട് പേര്
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,അസംസ്കൃത വസ്തുക്കൾ ചെലവ് നൽകിയത്
 DocType: Selling Settings,Settings for Selling Module,അതേസമയം മൊഡ്യൂൾ വേണ്ടി ക്രമീകരണങ്ങൾ
@@ -4786,8 +4872,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം ആയിരിക്കണം
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,പ്രോഗ്രസ് വെയർഹൗസ് സ്വതവെയുള്ള വർക്ക്
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,അക്കൗണ്ടിങ് ഇടപാടുകൾക്ക് സ്ഥിരസ്ഥിതി ക്രമീകരണങ്ങൾ.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,മാനവ വിഭവശേഷി&gt; എച്ച്ആർ സജ്ജീകരണങ്ങളിൽ ദയവായി എംപ്ലോയീ നെയിമിങ് സിസ്റ്റം സെറ്റപ്പ് ചെയ്യുക
 DocType: Maintenance Visit,MV,എം.വി.
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,പ്രതീക്ഷിച്ച തീയതി മെറ്റീരിയൽ അഭ്യർത്ഥന തീയതി മുമ്പ് ആകാൻ പാടില്ല
+DocType: Restaurant,Default Tax Template,സ്ഥിര ടാക്സ് ടെംപ്ലേറ്റ്
 DocType: Fees,Student Details,വിദ്യാർത്ഥിയുടെ വിശദാംശങ്ങൾ
 DocType: Purchase Invoice Item,Stock Qty,ഓഹരി അളവ്
 DocType: Purchase Invoice Item,Stock Qty,ഓഹരി അളവ്
@@ -4806,8 +4893,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,ഇനങ്ങൾ പോകുക
 DocType: Sales Partner,Partner Type,പങ്കാളി തരം
 DocType: Purchase Taxes and Charges,Actual,യഥാർത്ഥ
+DocType: Restaurant Menu,Restaurant Manager,റെസ്റ്റോറന്റ് മാനേജർ
 DocType: Authorization Rule,Customerwise Discount,Customerwise ഡിസ്കൗണ്ട്
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,ടാസ്ക്കുകൾക്കായി Timesheet.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,ടാസ്ക്കുകൾക്കായി Timesheet.
 DocType: Purchase Invoice,Against Expense Account,ചിലവേറിയ എഗെൻസ്റ്റ്
 DocType: Production Order,Production Order,പ്രൊഡക്ഷൻ ഓർഡർ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,ഇന്സ്റ്റലേഷന് കുറിപ്പ് {0} ഇതിനകം സമർപ്പിച്ചു
@@ -4815,7 +4903,6 @@
 DocType: Quotation Item,Against Docname,Docname എഗെൻസ്റ്റ്
 DocType: SMS Center,All Employee (Active),എല്ലാ ജീവനക്കാരുടെ (സജീവമായ)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,ഇപ്പോൾ കാണുക
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,ഇൻവോയ്സ് യാന്ത്രികമായി സൃഷ്ടിച്ച് ചെയ്യുന്ന കാലഘട്ടം തിരഞ്ഞെടുക്കുക
 DocType: BOM,Raw Material Cost,അസംസ്കൃത വസ്തുക്കളുടെ വില
 DocType: Item Reorder,Re-Order Level,വീണ്ടും ഓർഡർ ലെവൽ
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"ഇനങ്ങൾ നൽകുക, നിങ്ങൾ പ്രൊഡക്ഷൻ ഉത്തരവുകൾ ഉയർത്തരുത് വിശകലനം അസംസ്കൃത വസ്തുക്കൾ ഡൌൺലോഡ് ചെയ്യാൻ ആഗ്രഹിക്കുന്ന qty ആസൂത്രണം."
@@ -4828,24 +4915,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,റിപ്പോർട്ട് തരം നിർബന്ധമാണ്
 DocType: Item,Serial Number Series,സീരിയൽ നമ്പർ സീരീസ്
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},വെയർഹൗസ് നിരയിൽ സ്റ്റോക്ക് ഇനം {0} നിര്ബന്ധമാണ് {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,പ്രോഗ്രാമുകൾ ചേർക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,"ലാഭേച്ചയില്ലാത്തതും, ചാരിറ്റിയും"
 DocType: Issue,First Responded On,ആദ്യം പ്രതികരിച്ചു
 DocType: Website Item Group,Cross Listing of Item in multiple groups,ഒന്നിലധികം സംഘങ്ങളായി ഇനത്തിന്റെ ലിസ്റ്റിങ്
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},സാമ്പത്തിക വർഷത്തെ ആരംഭ തീയതി സാമ്പത്തിക വർഷം അവസാനിക്കുന്ന തീയതി ഇതിനകം സാമ്പത്തിക വർഷം {0} സജ്ജമാക്കിയിരിക്കുന്നുവെങ്കിലും
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,ക്ലിയറൻസ് തീയതി അപ്ഡേറ്റ്
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,സ്പ്ലിറ്റ് ബാച്ച്
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,സ്പ്ലിറ്റ് ബാച്ച്
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,സ്പ്ലിറ്റ് ബാച്ച്
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,സ്പ്ലിറ്റ് ബാച്ച്
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,വിജയകരമായി പൊരുത്തപ്പെട്ട
 DocType: Request for Quotation Supplier,Download PDF,PDF ഡൗൺലോഡ്
 DocType: Production Order,Planned End Date,ആസൂത്രണം ചെയ്ത അവസാന തീയതി
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,ഷെഡ്യൂൾ ചെയ്ത തീയതി നൽകുക
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,എവിടെ ഇനങ്ങളുടെ സൂക്ഷിച്ചിരിക്കുന്നു.
 DocType: Request for Quotation,Supplier Detail,വിതരണക്കാരൻ വിശദാംശം
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},ഫോർമുല അല്ലെങ്കിൽ അവസ്ഥയിൽ പിശക്: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},ഫോർമുല അല്ലെങ്കിൽ അവസ്ഥയിൽ പിശക്: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Invoiced തുക
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,മാനദണ്ഡങ്ങളുടെ ഘടന 100%
 DocType: Attendance,Attendance,ഹാജർ
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,ഓഹരി ഇനങ്ങൾ
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,ഓഹരി ഇനങ്ങൾ
 DocType: BOM,Materials,മെറ്റീരിയൽസ്
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","ചെക്കുചെയ്യാത്തത്, പട്ടിക അത് ബാധകമായി ഉണ്ട് എവിടെ ഓരോ വകുപ്പ് ചേർക്കും വരും."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,"ഉറവിട, ടാർഗെറ്റ് വെയർഹൗസ് ഒന്നുതന്നെയായിരിക്കരുത്"
@@ -4863,6 +4950,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,നെറ്റ് ആകെ ന്
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},ആട്രിബ്യൂട്ട് {0} {4} ഇനം വേണ്ടി {1} എന്ന {3} വർദ്ധനവിൽ {2} ലേക്ക് പരിധി ആയിരിക്കണം മൂല്യം
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,നിരയിൽ ടാർഗെറ്റ് വെയർഹൗസ് {0} പ്രൊഡക്ഷൻ ഓർഡർ അതേ ആയിരിക്കണം
+DocType: Restaurant Reservation,Waitlisted,കാത്തിരുന്നു
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,കറൻസി മറ്റ് ചില കറൻസി ഉപയോഗിച്ച് എൻട്രികൾ ചെയ്തശേഷം മാറ്റാൻ കഴിയില്ല
 DocType: Vehicle Service,Clutch Plate,ക്ലച്ച് പ്ലേറ്റ്
 DocType: Company,Round Off Account,അക്കൗണ്ട് ഓഫാക്കുക റൌണ്ട്
@@ -4879,7 +4967,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,പുതിയ സെയിൽസ് വ്യക്തി നാമം
 DocType: Packing Slip,Gross Weight UOM,ആകെ ഭാരം UOM
 DocType: Delivery Note Item,Against Sales Invoice,സെയിൽസ് ഇൻവോയിസ് എഗെൻസ്റ്റ്
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,ദയവായി സീരിയൽ ഇനം സീരിയൽ നമ്പറുകളോ നൽകുക
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,ദയവായി സീരിയൽ ഇനം സീരിയൽ നമ്പറുകളോ നൽകുക
 DocType: Bin,Reserved Qty for Production,പ്രൊഡക്ഷൻ സംവരണം അളവ്
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,നിങ്ങൾ കോഴ്സ് അടിസ്ഥാനമാക്കിയുള്ള ഗ്രൂപ്പുകൾ അവസരത്തിൽ ബാച്ച് പരിഗണിക്കുക ആഗ്രഹിക്കുന്നില്ല പരിശോധിക്കാതെ വിടുക.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,നിങ്ങൾ കോഴ്സ് അടിസ്ഥാനമാക്കിയുള്ള ഗ്രൂപ്പുകൾ അവസരത്തിൽ ബാച്ച് പരിഗണിക്കുക ആഗ്രഹിക്കുന്നില്ല പരിശോധിക്കാതെ വിടുക.
@@ -4891,7 +4979,7 @@
 DocType: Lab Test,Test Group,ടെസ്റ്റ് ഗ്രൂപ്പ്
 DocType: Payment Reconciliation,Receivable / Payable Account,സ്വീകാ / അടയ്ക്കേണ്ട അക്കൗണ്ട്
 DocType: Delivery Note Item,Against Sales Order Item,സെയിൽസ് ഓർഡർ ഇനം എഗെൻസ്റ്റ്
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},ആട്രിബ്യൂട്ട് {0} മൂല്യം ആട്രിബ്യൂട്ട് വ്യക്തമാക്കുക
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},ആട്രിബ്യൂട്ട് {0} മൂല്യം ആട്രിബ്യൂട്ട് വ്യക്തമാക്കുക
 DocType: Item,Default Warehouse,സ്ഥിരസ്ഥിതി വെയർഹൗസ്
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},ബജറ്റ് ഗ്രൂപ്പ് അക്കൗണ്ട് {0} നേരെ നിയോഗിക്കുകയും കഴിയില്ല
 DocType: Healthcare Settings,Patient Registration,രോഗി രജിസ്ട്രേഷൻ
@@ -4921,6 +5009,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,സെയിൽസ് വ്യാക്തി
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,ബജറ്റ് ചെലവ് കേന്ദ്രം
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,പണമടയ്ക്കലിന്റെ സ്ഥിരസ്ഥിതി മോഡ് അനുവദനീയമല്ല
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,വേണ്ടി
 ,Appointment Analytics,അപ്പോയിന്റ്മെൻറ് അനലിറ്റിക്സ്
 DocType: Vehicle Service,Half Yearly,പകുതി വാർഷികം
 DocType: Lead,Blog Subscriber,ബ്ലോഗ് സബ്സ്ക്രൈബർ
@@ -4940,7 +5029,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,quot എണ്ണം
 ,BOM Stock Report,BOM ൽ സ്റ്റോക്ക് റിപ്പോർട്ട്
 DocType: Stock Reconciliation Item,Quantity Difference,ക്വാണ്ടിറ്റി വ്യത്യാസം
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,പ്രോസസിങ് ശമ്പളപ്പട്ടിക
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,പ്രോസസിങ് ശമ്പളപ്പട്ടിക
 DocType: Opportunity Item,Basic Rate,അടിസ്ഥാന റേറ്റ്
 DocType: GL Entry,Credit Amount,ക്രെഡിറ്റ് തുക
 DocType: Cheque Print Template,Signatory Position,ഒപ്പുടമയുടെ സ്ഥാനം
@@ -4954,12 +5043,11 @@
 DocType: Tax Rule,Tax Rule,നികുതി റൂൾ
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,സെയിൽസ് സൈക്കിൾ മുഴുവൻ അതേ നിലനിറുത്തുക
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,വർക്ക്സ്റ്റേഷൻ പ്രവൃത്തി സമയത്തിന് പുറത്തുള്ള സമയം പ്രവർത്തനരേഖകൾ ആസൂത്രണം ചെയ്യുക.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,ക്യൂവിൽ ഉപഭോക്താക്കൾ
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,ക്യൂവിൽ ഉപഭോക്താക്കൾ
 DocType: Student,Nationality,പൗരതം
 ,Items To Be Requested,അഭ്യർത്ഥിച്ചു ഇനങ്ങൾ
-DocType: Purchase Order,Get Last Purchase Rate,അവസാനം വാങ്ങൽ റേറ്റ് നേടുക
 DocType: Company,Company Info,കമ്പനി വിവരങ്ങൾ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,പുതിയ ഉപഭോക്തൃ തിരഞ്ഞെടുക്കുക അല്ലെങ്കിൽ ചേർക്കുക
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,പുതിയ ഉപഭോക്തൃ തിരഞ്ഞെടുക്കുക അല്ലെങ്കിൽ ചേർക്കുക
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,കോസ്റ്റ് സെന്റർ ഒരു ചെലവിൽ ക്ലെയിം ബുക്ക് ആവശ്യമാണ്
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ഫണ്ട് അപേക്ഷാ (ആസ്തികൾ)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ഈ ജോലിയില് ഹാജർ അടിസ്ഥാനമാക്കിയുള്ളതാണ്
@@ -4967,6 +5055,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,ഡെബിറ്റ് അക്കൗണ്ട്
 DocType: Fiscal Year,Year Start Date,വർഷം ആരംഭ തീയതി
 DocType: Attendance,Employee Name,ജീവനക്കാരുടെ പേര്
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,റെസ്റ്റോറന്റ് ഓർഡർ ഇനം
 DocType: Sales Invoice,Rounded Total (Company Currency),വൃത്തത്തിലുള്ള ആകെ (കമ്പനി കറൻസി)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,അക്കൗണ്ട് തരം തിരഞ്ഞെടുത്തുവെന്ന് കാരണം ഗ്രൂപ്പിലേക്ക് മറവിൽ ചെയ്യാൻ കഴിയില്ല.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} പരിഷ്ക്കരിച്ചു. പുതുക്കുക.
@@ -4977,6 +5066,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,ജീവനക്കാരുടെ ആനുകൂല്യങ്ങൾ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},ചിലരാകട്ടെ അളവ് വരി {1} ൽ ഇനം {0} വേണ്ടി അളവ് ഒക്കുന്നില്ല വേണം
 DocType: Production Order,Manufactured Qty,മാന്യുഫാക്ച്ചേർഡ് Qty
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,ഇൻവോയ്സ് സൃഷ്ടിച്ചു
 DocType: Purchase Receipt Item,Accepted Quantity,അംഗീകരിച്ചു ക്വാണ്ടിറ്റി
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},ഒരു സ്ഥിര ഹോളിഡേ ലിസ്റ്റ് സജ്ജമാക്കാൻ ദയവായി എംപ്ലോയിസ് {0} അല്ലെങ്കിൽ കമ്പനി {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} നിലവിലുണ്ട് ഇല്ല
@@ -4986,18 +5076,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},വരി ഇല്ല {0}: തുക ചിലവിടൽ ക്ലെയിം {1} നേരെ തുക തീർച്ചപ്പെടുത്തിയിട്ടില്ല വലുതായിരിക്കണം കഴിയില്ല. തീർച്ചപ്പെടുത്തിയിട്ടില്ല തുക {2} ആണ്
 DocType: Maintenance Schedule,Schedule,ഷെഡ്യൂൾ
 DocType: Account,Parent Account,പാരന്റ് അക്കൗണ്ട്
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,ലഭ്യമായ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,ലഭ്യമായ
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,ഹബ്
 DocType: GL Entry,Voucher Type,സാക്ഷപ്പെടുത്തല് തരം
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,വില പട്ടിക കണ്ടെത്തിയില്ല അല്ലെങ്കിൽ പ്രവർത്തനരഹിതമാക്കിയിട്ടില്ലെന്ന്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,വില പട്ടിക കണ്ടെത്തിയില്ല അല്ലെങ്കിൽ പ്രവർത്തനരഹിതമാക്കിയിട്ടില്ലെന്ന്
 DocType: Lab Test,Approved,അംഗീകരിച്ചു
 DocType: Pricing Rule,Price,വില
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',{0} &#39;ഇടത്&#39; ആയി സജ്ജമാക്കാൻ വേണം ന് ആശ്വാസമായി ജീവനക്കാരൻ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',{0} &#39;ഇടത്&#39; ആയി സജ്ജമാക്കാൻ വേണം ന് ആശ്വാസമായി ജീവനക്കാരൻ
+DocType: Hub Settings,Last Sync On,അവസാനമായി സമന്വയിപ്പിക്കുക ഓണാണ്
 DocType: Guardian,Guardian,ഗാർഡിയൻ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,മൂല്യനിർണയം {0} നൽകിയ തീയതി പരിധി എംപ്ലോയിസ് {1} വേണ്ടി സൃഷ്ടിച്ചു
 DocType: Employee,Education,വിദ്യാഭ്യാസം
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,del
 DocType: Selling Settings,Campaign Naming By,ആയപ്പോഴേക്കും നാമകരണം കാമ്പെയ്ൻ
 DocType: Employee,Current Address Is,ഇപ്പോഴത്തെ വിലാസമാണിത്
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,മാസംതോറുമുള്ള ടാർഗെറ്റ് (
@@ -5012,7 +5103,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,കോഴ്സ് കോഡ്:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,ചിലവേറിയ നൽകുക
 DocType: Account,Stock,സ്റ്റോക്ക്
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","വരി # {0}: പരാമർശം ഡോക്യുമെന്റ് തരം പർച്ചേസ് ഓർഡർ, പർച്ചേസ് ഇൻവോയ്സ് അല്ലെങ്കിൽ ജേർണൽ എൻട്രി ഒന്ന് ആയിരിക്കണം"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","വരി # {0}: പരാമർശം ഡോക്യുമെന്റ് തരം പർച്ചേസ് ഓർഡർ, പർച്ചേസ് ഇൻവോയ്സ് അല്ലെങ്കിൽ ജേർണൽ എൻട്രി ഒന്ന് ആയിരിക്കണം"
 DocType: Employee,Current Address,ഇപ്പോഴത്തെ വിലാസം
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ഇനത്തിന്റെ മറ്റൊരു ഇനത്തിന്റെ ഒരു വകഭേദം ഇതാണെങ്കിൽ കീഴ്വഴക്കമായി വ്യക്തമാക്കപ്പെടുന്നതുവരെ പിന്നെ വിവരണം, ചിത്രം, ഉള്ളവയും, നികുതികൾ തുടങ്ങിയവ ടെംപ്ലേറ്റിൽ നിന്നും ആയിരിക്കും"
 DocType: Serial No,Purchase / Manufacture Details,വാങ്ങൽ / ഉത്പാദനം വിവരങ്ങൾ
@@ -5043,7 +5134,7 @@
 DocType: Hub Settings,Hub Settings,ഹബ് ക്രമീകരണങ്ങൾ
 DocType: Project,Gross Margin %,മൊത്തം മാർജിൻ%
 DocType: BOM,With Operations,പ്രവർത്തനവുമായി
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,അക്കൗണ്ടിംഗ് എൻട്രികൾ ഇതിനകം കമ്പനി {1} വേണ്ടി കറൻസി {0} ഉണ്ടായിട്ടുണ്ട്. കറൻസി {0} ഉപയോഗിച്ച് ഒരു സ്വീകരിക്കുന്ന അല്ലെങ്കിൽ മാറാവുന്ന അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,അക്കൗണ്ടിംഗ് എൻട്രികൾ ഇതിനകം കമ്പനി {1} വേണ്ടി കറൻസി {0} ഉണ്ടായിട്ടുണ്ട്. കറൻസി {0} ഉപയോഗിച്ച് ഒരു സ്വീകരിക്കുന്ന അല്ലെങ്കിൽ മാറാവുന്ന അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക.
 DocType: Asset,Is Existing Asset,നിലവിലുള്ള സ്വത്ത്
 DocType: Salary Detail,Statistical Component,സ്റ്റാറ്റിസ്റ്റിക്കൽ ഘടക
 DocType: Salary Detail,Statistical Component,സ്റ്റാറ്റിസ്റ്റിക്കൽ ഘടക
@@ -5052,13 +5143,14 @@
 DocType: BOM Operation,BOM Operation,BOM ഓപ്പറേഷൻ
 DocType: Purchase Taxes and Charges,On Previous Row Amount,മുൻ വരി തുക
 DocType: Student,Home Address,ഹോം വിലാസം
+DocType: Item,Has Expiry Date,കാലഹരണപ്പെടുന്ന തീയതി
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,ഇനം വേരിയന്റ് ക്രമീകരണങ്ങൾ.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,അസറ്റ് കൈമാറൽ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,അസറ്റ് കൈമാറൽ
 DocType: POS Profile,POS Profile,POS പ്രൊഫൈൽ
 DocType: Training Event,Event Name,ഇവന്റ് പേര്
 DocType: Physician,Phone (Office),ഫോൺ (ഓഫീസ്)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,അഡ്മിഷൻ
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},വേണ്ടി {0} പ്രവേശനം
+apps/erpnext/erpnext/hooks.py +147,Admission,അഡ്മിഷൻ
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},വേണ്ടി {0} പ്രവേശനം
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","ബജറ്റുകൾ സ്ഥാപിക്കുന്നതിനുള്ള Seasonality, ടാർഗറ്റുകൾ തുടങ്ങിയവ"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,വേരിയബിൾ പേര്
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",ഇനം {0} ഫലകം അതിന്റെ വകഭേദങ്ങളും തിരഞ്ഞെടുക്കുക
@@ -5067,7 +5159,7 @@
 DocType: Assessment Plan,Room,ഇടം
 DocType: Purchase Order,Advance Paid,മുൻകൂർ പണമടച്ചു
 DocType: Item,Item Tax,ഇനം നികുതി
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,വിതരണക്കാരൻ വരെ മെറ്റീരിയൽ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,വിതരണക്കാരൻ വരെ മെറ്റീരിയൽ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,എക്സൈസ് ഇൻവോയിസ്
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,ത്രെഷോൾഡ് {0}% ഒന്നിലധികം തവണ ലഭ്യമാകുന്നു
 DocType: Expense Claim,Employees Email Id,എംപ്ലോയീസ് ഇമെയിൽ ഐഡി
@@ -5078,32 +5170,30 @@
 DocType: Program,Program Name,പ്രോഗ്രാം പേര്
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,വേണ്ടി നികുതി അഥവാ ചാർജ് പരിചിന്തിക്കുക
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,യഥാർത്ഥ Qty നിർബന്ധമായും
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} നിലവിൽ ഒരു {1} സപ്ലിയർ സ്കോർകാർഡ് സ്റ്റാൻഡ് ഉണ്ട്, ഈ വിതരണക്കാരന് പർച്ചേസ് ഓർഡറുകൾ മുൻകരുതൽ നൽകണം."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} നിലവിൽ ഒരു {1} സപ്ലിയർ സ്കോർകാർഡ് സ്റ്റാൻഡ് ഉണ്ട്, ഈ വിതരണക്കാരന് പർച്ചേസ് ഓർഡറുകൾ മുൻകരുതൽ നൽകണം."
 DocType: Employee Loan,Loan Type,ലോൺ ഇനം
 DocType: Scheduling Tool,Scheduling Tool,സമയംസജ്ജീകരിയ്ക്കുന്നു ടൂൾ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,ക്രെഡിറ്റ് കാർഡ്
 DocType: BOM,Item to be manufactured or repacked,ഇനം നിർമിക്കുന്ന അല്ലെങ്കിൽ repacked ചെയ്യേണ്ട
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,ഓഹരി ഇടപാടുകൾക്ക് സ്ഥിരസ്ഥിതി ക്രമീകരണങ്ങൾ.
-DocType: Purchase Invoice,Next Date,അടുത്തത് തീയതി
 DocType: Employee Education,Major/Optional Subjects,മേജർ / ഓപ്ഷണൽ വിഷയങ്ങൾ
 DocType: Sales Invoice Item,Drop Ship,ഡ്രോപ്പ് കപ്പൽ
+DocType: Hub Settings,Suspended,സസ്പെൻഡുചെയ്തു
 DocType: Training Event,Attendees,പങ്കെടുക്കുന്നവരെല്ലാം
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","ഇവിടെ നിങ്ങൾ പാരന്റ്, പങ്കാളിയുടെ മക്കളുടെ പേര്, തൊഴിൽ പോലുള്ള കുടുംബ വിവരങ്ങൾ നിലനിർത്താൻ കഴിയും"
 DocType: Academic Term,Term End Date,ടേം അവസാന തീയതി
-DocType: Hub Settings,Seller Name,വില്പനക്കാരന്റെ പേര്
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),ഒടുക്കിയ നികുതി ചാർജുകളും (കമ്പനി കറൻസി)
 DocType: Item Group,General Settings,പൊതുവായ ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,കറൻസി കറൻസി ഒരേ ആയിരിക്കും കഴിയില്ല
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,പരിശീലകരെ ചേർക്കുക
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,മുന്നോട്ടു മുമ്പ് ഫോം സംരക്ഷിക്കുക വേണം
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,ആദ്യം കമ്പനി തിരഞ്ഞെടുക്കുക
 DocType: Item Attribute,Numeric Values,സാംഖിക മൂല്യങ്ങൾ
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,ലോഗോ അറ്റാച്ച്
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,ഓഹരി ലെവലുകൾ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,ഓഹരി ലെവലുകൾ
 DocType: Customer,Commission Rate,കമ്മീഷൻ നിരക്ക്
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,{0} എന്നതിന് വേണ്ടി {1} എന്നതിനുള്ള സ്കോർകാർഡ് സൃഷ്ടിച്ചു:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,വേരിയന്റ് നിർമ്മിക്കുക
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,വേരിയന്റ് നിർമ്മിക്കുക
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,വകുപ്പിന്റെ ലീവ് പ്രയോഗങ്ങൾ തടയുക.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","പേയ്മെന്റ് ഇനം, സ്വീകരിക്കുക ഒന്ന് ആയിരിക്കണം അടച്ച് ആന്തരിക ട്രാൻസ്ഫർ"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,അനലിറ്റിക്സ്
@@ -5118,11 +5208,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,ക്യാപിറ്റൽ സ്റ്റോക്ക്
 DocType: Shopping Cart Settings,Show Public Attachments,പൊതു അറ്റാച്മെന്റ് കാണിക്കുക
 DocType: Packing Slip,Package Weight Details,പാക്കേജ് ഭാരം വിശദാംശങ്ങൾ
+DocType: Restaurant Reservation,Reservation Time,റിസർവേഷൻ സമയം
 DocType: Payment Gateway Account,Payment Gateway Account,പേയ്മെന്റ് ഗേറ്റ്വേ അക്കൗണ്ട്
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,പേയ്മെന്റ് പൂർത്തിയായ ശേഷം തിരഞ്ഞെടുത്ത പേജിലേക്ക് ഉപയോക്താവിനെ തിരിച്ചുവിടൽ.
 DocType: Company,Existing Company,നിലവിലുള്ള കമ്പനി
 DocType: Healthcare Settings,Result Emailed,ഫലം ഇമെയിൽ ചെയ്തു
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",എല്ലാ ഇനങ്ങളും ഇതര ഓഹരി ഇനങ്ങൾ കാരണം നികുതി വിഭാഗം &quot;ആകെ&quot; മാറ്റി
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,ഇനം കോഡ്&gt; ഇനം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,ഒരു CSV ഫയൽ തിരഞ്ഞെടുക്കുക
 DocType: Student Leave Application,Mark as Present,അവതരിപ്പിക്കുക അടയാളപ്പെടുത്തുക
 DocType: Supplier Scorecard,Indicator Color,സൂചക നിറം
@@ -5147,11 +5239,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,വിദ്യാർത്ഥിയുടെ ബാച്ച് നിർമ്മിക്കുക
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,മുന്നോട്ട് വിലക്കുണ്ടോ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,BOM ൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,BOM ൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ലീഡ് സമയം ദിനങ്ങൾ
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},വരി # {0}: {1} പോസ്റ്റുചെയ്ത തീയതി വാങ്ങൽ തീയതി തുല്യമായിരിക്കണം ആസ്തിയുടെ {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,വിദ്യാർത്ഥി ഇൻസ്റ്റിറ്റ്യൂട്ട് ഹോസ്റ്റൽ വസിക്കുന്നു എങ്കിൽ ഈ പരിശോധിക്കുക.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,മുകളിലുള്ള പട്ടികയിൽ സെയിൽസ് ഓർഡറുകൾ നൽകുക
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,മുകളിലുള്ള പട്ടികയിൽ സെയിൽസ് ഓർഡറുകൾ നൽകുക
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,ശമ്പള സ്ലിപ്പുകൾ സമർപ്പിച്ചിട്ടില്ല
 ,Stock Summary,ഓഹരി ചുരുക്കം
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,തമ്മിൽ വെയർഹൗസിൽ നിന്ന് ഒരു അസറ്റ് കൈമാറൽ
@@ -5167,5 +5259,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},വരി {0}: ഡെബിറ്റ് എൻട്രി ഒരു {1} ലിങ്കുചെയ്തിരിക്കുന്നതിനാൽ ചെയ്യാൻ കഴിയില്ല
 DocType: Journal Entry,Subscription Section,സബ്സ്ക്രിപ്ഷൻ വിഭാഗം
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,അക്കൗണ്ട് {0} നിലവിലില്ല
+DocType: Training Event,Training Program,പരിശീലന പരിപാടി
 DocType: Account,Cash,ക്യാഷ്
 DocType: Employee,Short biography for website and other publications.,വെബ്സൈറ്റ് മറ്റ് പ്രസിദ്ധീകരണങ്ങളിൽ ഷോർട്ട് ജീവചരിത്രം.
diff --git a/erpnext/translations/mr.csv b/erpnext/translations/mr.csv
index 64761ab..638c74e 100644
--- a/erpnext/translations/mr.csv
+++ b/erpnext/translations/mr.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,पगार मोड
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,नोंदणी करा
 DocType: Patient,Divorced,घटस्फोट
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,आयटम आधीच समक्रमित
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,आयटम व्यवहार अनेक वेळा जोडले जाण्यास अनुमती द्या
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,साहित्य भेट रद्द करा {0} हा हमी दावा रद्द होण्यापुर्वी रद्द करा
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,ग्राहक उत्पादने
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,रजा साक्षीदार
 DocType: Sales Partner,Dealer,विक्रेता
 DocType: Consultation,Investigations,अन्वेषण
+DocType: Restaurant Order Entry,Click Enter To Add,जोडण्यासाठी Enter क्लिक करा
 DocType: Employee,Rented,भाड्याने
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,वापरकर्त्यांसाठी  लागू
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","थांबविलेली  उत्पादन ऑर्डर रद्द करता येणार नाही, रद्द करण्यासाठी प्रथम ती Unstop करा"
 DocType: Vehicle Service,Mileage,मायलेज
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,आपण खरोखर या मालमत्ता स्क्रॅप इच्छित आहे का?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,आपण खरोखर या मालमत्ता स्क्रॅप इच्छित आहे का?
 DocType: Drug Prescription,Update Schedule,वेळापत्रक अद्यतनित करा
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,निवडा मुलभूत पुरवठादार
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},चलन दर सूची आवश्यक आहे {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,उपलब्धता तपासा
 DocType: Job Applicant,Job Applicant,ईयोब अर्जदाराचे
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,हे या पुरवठादार विरुद्ध व्यवहार आधारित आहे. तपशीलासाठी खालील टाइमलाइन पाहू
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,अधिक परिणाम नाहीत.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,कायदेशीर
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},प्रत्यक्ष प्रकार कर सलग बाबींचा दर समाविष्ट केले जाऊ शकत नाही {0}
 DocType: Bank Guarantee,Customer,ग्राहक
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),विनिमय दर समान असणे आवश्यक आहे {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ग्राहक नाव
 DocType: Vehicle,Natural Gas,नैसर्गिक वायू
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},बँक खाते म्हणून नावाच्या करणे शक्य नाही {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},बँक खाते म्हणून नावाच्या करणे शक्य नाही {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,प्रमुख (किंवा गट) ज्या लेखा नोंदी केले जातात व शिल्लक ठेवली आहेत.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),{0} साठीची बाकी   शून्य ({1}) पेक्षा कमी असू शकत नाही
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,प्रक्रियेसाठी कोणतेही जमा वेतन स्लिप्स नाहीत.
 DocType: Manufacturing Settings,Default 10 mins,10 मि डीफॉल्ट
 DocType: Leave Type,Leave Type Name,रजा प्रकारचे नाव
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,खुल्या दर्शवा
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,उपरोक्त आवर्तीसाठी आजच ही क्रिया करणे आवश्यक आहे
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,मालिका यशस्वीपणे अद्यतनित
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,चेकआऊट
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural जर्नल प्रवेश सबमिट
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,पर्चेस आयटम प्राप्त करण्यासाठी
 DocType: SMS Center,All Supplier Contact,सर्व पुरवठादार संपर्क
 DocType: Support Settings,Support Settings,समर्थन सेटिंग्ज
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,अपेक्षित अंतिम तारीख अपेक्षित प्रारंभ तारीख पेक्षा कमी असू शकत नाही
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,अपेक्षित अंतिम तारीख अपेक्षित प्रारंभ तारीख पेक्षा कमी असू शकत नाही
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,रो # {0}: दर सारखाच असणे आवश्यक आहे {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,नवी रजेचा अर्ज
 ,Batch Item Expiry Status,बॅच बाबींचा कालावधी समाप्ती स्थिती
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,बँक ड्राफ्ट
 DocType: Mode of Payment Account,Mode of Payment Account,भरणा खात्याचे  मोड
 DocType: Consultation,Consultation,सल्ला
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,विक्री आणि परतावा
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,रूपे दर्शवा
 DocType: Academic Term,Academic Term,शैक्षणिक मुदत
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,साहित्य
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,हेल्थ केअर
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),भरणा विलंब (दिवस)
 DocType: Lab Prescription,Lab Prescription,लॅब प्रिस्क्रिप्शन
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,किंमतानुसार क्रमवारी लावा
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,सेवा खर्च
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},अनुक्रमांक: {0} आधीच विक्री चलन संदर्भ आहे: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,चलन
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},अनुक्रमांक: {0} आधीच विक्री चलन संदर्भ आहे: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,चलन
 DocType: Maintenance Schedule Item,Periodicity,ठराविक मुदतीने पुन: पुन्हा उगवणे
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,आर्थिक वर्ष {0} आवश्यक आहे
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,संरक्षण
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,रो # {0}:
 DocType: Timesheet,Total Costing Amount,एकूण भांडवलाच्या रक्कम
 DocType: Delivery Note,Vehicle No,वाहन क्रमांक
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,कृपया किंमत सूची निवडा
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,कृपया किंमत सूची निवडा
 DocType: Accounts Settings,Currency Exchange Settings,चलन विनिमय सेटिंग्ज
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,सलग # {0}: भरणा दस्तऐवज trasaction पूर्ण करणे आवश्यक आहे
 DocType: Production Order Operation,Work In Progress,कार्य प्रगती मध्ये आहे
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,कृपया तारीख निवडा
 DocType: Employee,Holiday List,सुट्टी यादी
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,कृपया शाळेतील प्रशासक नेमिंग सिस्टम सेट करा&gt; शाळा सेटिंग्ज
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,लेखापाल
+DocType: Hub Settings,Selling Price List,किंमत सूची विक्री
 DocType: Patient,Tobacco Current Use,तंबाखू वर्तमान वापर
 DocType: Cost Center,Stock User,शेअर सदस्य
 DocType: Company,Phone No,फोन नाही
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,अर्थात वेळापत्रक तयार:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},नवी {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},नवी {0}: # {1}
 ,Sales Partners Commission,विक्री भागीदार आयोग
 DocType: Purchase Invoice,Rounding Adjustment,गोलाकार समायोजन
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,संक्षेपला 5 पेक्षा जास्त वर्ण असू शकत नाही
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,पालक तपशील docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","संदर्भ: {0}, आयटम कोड: {1} आणि ग्राहक: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,किलो
-DocType: Student Log,Log,लॉग
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,जॉब साठी उघडत आहे.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} परिणाम सादर केले
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} परिणाम सादर केले
 DocType: Item Attribute,Increment,बढती
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,कालावधी
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,वखार निवडा ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,लग्न
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},{0} ला परवानगी नाही
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,आयटम मिळवा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},शेअर वितरण टीप विरुद्ध अद्यतनित करणे शक्य नाही {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},शेअर वितरण टीप विरुद्ध अद्यतनित करणे शक्य नाही {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},उत्पादन {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,कोणतेही आयटम सूचीबद्ध
 DocType: Payment Reconciliation,Reconcile,समेट
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,पेन्शन फंड्स
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,पुढील घसारा तारीख खरेदी तारीख असू शकत नाही
 DocType: Consultation,Consultation Date,सल्ला तारीख
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNext वापरकर्त्यांसाठी उत्पादन सूची आणि शोध
 DocType: SMS Center,All Sales Person,सर्व विक्री व्यक्ती
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** मासिक वितरण ** आपण आपल्या व्यवसायात हंगामी असेल तर बजेट / लक्ष्य महिने ओलांडून वितरण मदत करते.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,नाही आयटम आढळला
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,पगार संरचना गहाळ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,नाही आयटम आढळला
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,पगार संरचना गहाळ
 DocType: Lead,Person Name,व्यक्ती नाव
 DocType: Sales Invoice Item,Sales Invoice Item,विक्री चलन आयटम
 DocType: Account,Credit,क्रेडिट
 DocType: POS Profile,Write Off Cost Center,Write Off खर्च केंद्र
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",उदा &quot;प्राथमिक शाळा&quot; किंवा &quot;युनिव्हर्सिटी&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",उदा &quot;प्राथमिक शाळा&quot; किंवा &quot;युनिव्हर्सिटी&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,शेअर अहवाल
 DocType: Warehouse,Warehouse Detail,वखार तपशील
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},ग्राहक {0} {1} / {2} साठी क्रेडिट मर्यादा पार गेले आहे
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,मुदत समाप्ती तारीख नंतर जे मुदत लिंक आहे शैक्षणिक वर्ष वर्ष अंतिम तारीख पेक्षा असू शकत नाही (शैक्षणिक वर्ष {}). तारखा दुरुस्त करा आणि पुन्हा प्रयत्न करा.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;मुदत मालमत्ता आहे&quot; मालमत्ता रेकॉर्ड आयटम विरुद्ध अस्तित्वात आहे म्हणून, अनचेक केले जाऊ शकत नाही"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;मुदत मालमत्ता आहे&quot; मालमत्ता रेकॉर्ड आयटम विरुद्ध अस्तित्वात आहे म्हणून, अनचेक केले जाऊ शकत नाही"
 DocType: Vehicle Service,Brake Oil,ब्रेक तेल
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक गट&gt; प्रदेश
 DocType: Tax Rule,Tax Type,कर प्रकार
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,करपात्र रक्कम
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},आपल्याला आधी नोंदी जमा करण्यासाठी  किंवा सुधारणा करण्यासाठी अधिकृत नाही {0}
 DocType: BOM,Item Image (if not slideshow),आयटम प्रतिमा (स्लाईड शो नसेल  तर)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,एक ग्राहक समान नाव अस्तित्वात
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(तास रेट / 60) * प्रत्यक्ष ऑपरेशन वेळ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: संदर्भ दस्तऐवज प्रकार हा खर्च दावा किंवा जर्नल एंट्री असावा
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,BOM निवडा
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: संदर्भ दस्तऐवज प्रकार हा खर्च दावा किंवा जर्नल एंट्री असावा
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,BOM निवडा
 DocType: SMS Log,SMS Log,एसएमएस लॉग
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,वितरित केले आयटम खर्च
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} वरील  सुट्टी तारखेपासून आणि तारखेपर्यंत  च्या दरम्यान नाही
@@ -196,7 +199,7 @@
 DocType: Journal Entry Account,Employee Loan,कर्मचारी कर्ज
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,क्रियाकलाप लॉग:
 DocType: Fee Schedule,Send Payment Request Email,पेमेंट विनंती ईमेल पाठवा
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,आयटम {0} प्रणालीत  अस्तित्वात नाही किंवा कालबाह्य झाला आहे
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,आयटम {0} प्रणालीत  अस्तित्वात नाही किंवा कालबाह्य झाला आहे
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,स्थावर मालमत्ता
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,खाते स्टेटमेंट
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,फार्मास्युटिकल्स
@@ -211,18 +214,23 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,आयात लॉग
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,प्रकार उत्पादन साहित्य विनंती वरील निकषावर आधारित खेचणे
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,यशस्वीरित्या नोंदणी रद्द न केलेले
 DocType: Training Result Employee,Grade,ग्रेड
+DocType: Restaurant Table,No of Seats,सीटची संख्या
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","डायनॅमिक विषय जोडण्यासाठी, जेंजा टॅग्जचा वापर करा <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,पुरवठादार करून वितरित
 DocType: SMS Center,All Contact,सर्व संपर्क
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,उत्पादन ऑर्डर BOM सर्व आयटम आधीपासूनच तयार
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,उत्पादन ऑर्डर BOM सर्व आयटम आधीपासूनच तयार
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,वार्षिक पगार
 DocType: Daily Work Summary,Daily Work Summary,दररोज काम सारांश
 DocType: Period Closing Voucher,Closing Fiscal Year,आर्थिक वर्ष बंद
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} गोठविले
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,कृपया खाती चार्ट तयार करण्यासाठी विद्यमान कंपनी निवडा
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} गोठविले
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,कृपया खाती चार्ट तयार करण्यासाठी विद्यमान कंपनी निवडा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,शेअर खर्च
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,लक्ष्य वखार निवडा
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,लक्ष्य वखार निवडा
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,लक्ष्य वखार निवडा
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,लक्ष्य वखार निवडा
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,प्रविष्ट करा प्राधान्य संपर्क ईमेल
 DocType: Program Enrollment,School Bus,शाळेची बस
 DocType: Journal Entry,Contra Entry,विरुद्ध प्रवेश
@@ -239,9 +247,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","टेम्पलेट डाउनलोड करा , योग्य डेटा भरा आणि संचिकेशी संलग्न करा . निवडलेल्या कालावधीत मध्ये सर्व तारखा आणि कर्मचारी संयोजन , विद्यमान उपस्थिती रेकॉर्ड सह टेम्पलेट मधे येइल"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,आयटम {0} सक्रिय नाही किंवा आयुष्याच्या शेवट  गाठला  आहे
+DocType: Student Admission Program,Minimum Age,किमान वय
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,उदाहरण: मूलभूत गणित
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","आयटम दर सलग {0} मधे कर समाविष्ट करण्यासाठी, पंक्ती मध्ये कर {1} समाविष्ट करणे आवश्यक आहे"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,एचआर विभाग सेटिंग्ज
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,एचआर विभाग सेटिंग्ज
 DocType: SMS Center,SMS Center,एसएमएस केंद्र
 DocType: Sales Invoice,Change Amount,रक्कम बदल
 DocType: BOM Update Tool,New BOM,नवीन BOM
@@ -251,7 +260,7 @@
 DocType: Lead,Request Type,विनंती प्रकार
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,कर्मचारी करा
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,प्रसारण
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,खोल्या जोडा
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),पीओएसची सेटअप मोड (ऑनलाइन / ऑफलाइन)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,कार्यवाही
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ऑपरेशन तपशील चालते.
 DocType: Serial No,Maintenance Status,देखभाल स्थिती
@@ -274,6 +283,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,किंमत सूची खरेदी किंवा विक्रीसाठी  लागू असणे आवश्यक आहे
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},आयटम {0} साठी प्रतिष्ठापन तारीख  वितरणाच्या  तारीखेनंतर  असू शकत नाही
 DocType: Pricing Rule,Discount on Price List Rate (%),दर सूची रेट सूट (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,बायोकेमेस्ट्री
 DocType: Offer Letter,Select Terms and Conditions,अटी आणि नियम निवडा
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,मूल्य Qty
 DocType: Production Planning Tool,Sales Orders,विक्री ऑर्डर
@@ -308,15 +318,15 @@
 DocType: Sales Partner,Reseller,विक्रेता
 DocType: Codification Table,Medical Code,वैद्यकीय कोड
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","चेक केलेले असल्यास, साहित्य विनंत्या गैर-स्टॉक आयटम समाविष्ट होईल."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,कंपनी प्रविष्ट करा
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,कंपनी प्रविष्ट करा
 DocType: Delivery Note Item,Against Sales Invoice Item,विक्री चलन आयटम विरुद्ध
 ,Production Orders in Progress,प्रगती उत्पादन आदेश
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,आर्थिक निव्वळ रोख
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage पूर्ण आहे, जतन नाही"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage पूर्ण आहे, जतन नाही"
 DocType: Lead,Address & Contact,पत्ता व संपर्क
 DocType: Leave Allocation,Add unused leaves from previous allocations,मागील वाटप पासून न वापरलेल्या पाने जोडा
 DocType: Sales Partner,Partner website,भागीदार वेबसाइट
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,आयटम जोडा
+DocType: Restaurant Order Entry,Add Item,आयटम जोडा
 DocType: Lab Test,Custom Result,सानुकूल परिणाम
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,संपर्क नाव
 DocType: Course Assessment Criteria,Course Assessment Criteria,अर्थात मूल्यांकन निकष
@@ -329,7 +339,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,खरेदीसाठी विनंती.
 DocType: Lab Test,Submitted Date,सबमिट केलेली तारीख
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,या या प्रकल्पास विरोध तयार केलेली वेळ पत्रके आधारित आहे
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,निव्वळ वेतन 0 पेक्षा कमी असू शकत नाही
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,निव्वळ वेतन 0 पेक्षा कमी असू शकत नाही
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","सिस्टमवरून पुनरावृत्त त्रुटी सूचना पाठविणे थांबविण्यासाठी, आम्ही सदस्यता मधील अक्षम फील्ड तपासले आहे"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,केवळ निवडलेले रजा साक्षीदार या रजेचा अर्ज सादर करू शकतात
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,relieving तारीख  प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,रजा वर्ष प्रति
@@ -338,9 +349,10 @@
 DocType: Email Digest,Profit & Loss,नफा व तोटा
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,लीटर
 DocType: Task,Total Costing Amount (via Time Sheet),एकूण कोस्टींग रक्कम (वेळ पत्रक द्वारे)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,विद्यार्थी गटांद्वारे विद्यार्थी सेट करा
 DocType: Item Website Specification,Item Website Specification,आयटम वेबसाइट तपशील
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,रजा अवरोधित
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},आयटम {0} ने त्याच्या जीवनाचा शेवट  {1} वर गाठला  आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},आयटम {0} ने त्याच्या जीवनाचा शेवट  {1} वर गाठला  आहे
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,बँक नोंदी
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,वार्षिक
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,शेअर मेळ आयटम
@@ -349,7 +361,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,विद्यार्थी गट तयार साधन कोर्स
 DocType: Lead,Do Not Contact,संपर्क करू नका
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,आपल्या संस्थेतील शिकविता लोक
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,सर्व आवर्ती पावत्या ट्रॅक अद्वितीय आयडी. हे सबमिट निर्माण होते.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,सॉफ्टवेअर डेव्हलपर
 DocType: Item,Minimum Order Qty,किमान ऑर्डर Qty
 DocType: Pricing Rule,Supplier Type,पुरवठादार प्रकार
@@ -359,17 +370,19 @@
 DocType: Item,Publish in Hub,हब मध्ये प्रकाशित
 DocType: Student Admission,Student Admission,विद्यार्थी प्रवेश
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,{0} आयटम रद्द
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,साहित्य विनंती
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,{0} आयटम रद्द
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,साहित्य विनंती
 DocType: Bank Reconciliation,Update Clearance Date,अद्यतन लाभ तारीख
 DocType: Item,Purchase Details,खरेदी तपशील
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},आयटम {0} खरेदी ऑर्डर {1} मध्ये ' कच्चा माल पुरवठा ' टेबल मध्ये आढळला  नाही
 DocType: Patient Relation,Relation,नाते
 DocType: Shipping Rule,Worldwide Shipping,जगभरातील शिपिंग
 DocType: Patient Relation,Mother,आई
+DocType: Restaurant Reservation,Reservation End Time,आरक्षण समाप्ती वेळ
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,ग्राहक समोर ऑर्डर.
 DocType: Purchase Receipt Item,Rejected Quantity,नाकारल्याचे प्रमाण
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,{0} चे देयक भरणा विनंती
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,{0} चे देयक भरणा विनंती
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,कमी संवेदनशीलता
 DocType: Notification Control,Notification Control,सूचना नियंत्रण
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,एकदा आपण आपले प्रशिक्षण पूर्ण केल्यानंतर कृपया पुष्टी करा
 DocType: Lead,Suggestions,सूचना
@@ -389,7 +402,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,प्राधान्य ईमेल कर्मचारी निवड आधारित कर्मचारी ईमेल पगारपत्रक
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,सूचीतील पहिली रजा मंजुरी मुलभूत रजा मंजुरी म्हणून सेट केले जाईल
 DocType: Tax Rule,Shipping County,शिपिंग परगणा
-apps/erpnext/erpnext/config/desktop.py +158,Learn,जाणून घ्या
+apps/erpnext/erpnext/config/desktop.py +159,Learn,जाणून घ्या
 DocType: Asset,Next Depreciation Date,पुढील घसारा दिनांक
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,कर्मचारी दर क्रियाकलाप खर्च
 DocType: Accounts Settings,Settings for Accounts,खाती सेटिंग्ज
@@ -400,13 +413,13 @@
 DocType: Item,Synced With Hub,हबला  समक्रमित
 DocType: Vehicle,Fleet Manager,वेगवान व्यवस्थापक
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},पंक्ती # {0}: {1} आयटम नकारात्मक असू शकत नाही {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,चुकीचा संकेतशब्द
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,चुकीचा संकेतशब्द
 DocType: Item,Variant Of,जिच्यामध्ये variant
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',पूर्ण Qty  'Qty निर्मिती करण्या ' पेक्षा जास्त असू शकत नाही
 DocType: Period Closing Voucher,Closing Account Head,खाते प्रमुख बंद
 DocType: Employee,External Work History,बाह्य कार्य इतिहास
 DocType: Physician,Time per Appointment,प्रति भेटीची वेळ
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,परिपत्रक संदर्भ त्रुटी
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,परिपत्रक संदर्भ त्रुटी
 DocType: Appointment Type,Is Inpatient,रुग्णाची तक्रार आहे
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 नाव
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,शब्दा मध्ये   ( निर्यात करा) डिलिव्हरी टीप एकदा save केल्यावर दृश्यमान होईल
@@ -415,19 +428,18 @@
 DocType: Lead,Industry,उद्योग
 DocType: Employee,Job Profile,कामाचे
 DocType: BOM Item,Rate & Amount,दर आणि रक्कम
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; क्रमांकिंग सीरिजद्वारे उपस्थिततेसाठी सेटिग नंबरिंग सिरीज
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,हे या कंपनीविरुद्धच्या व्यवहारांवर आधारित आहे. तपशीलासाठी खाली टाइमलाइन पहा
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,स्वयंचलित साहित्य विनंती निर्माण ईमेल द्वारे सूचित करा
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,प्रतिरोधक
 DocType: Journal Entry,Multi Currency,मल्टी चलन
 DocType: Payment Reconciliation Invoice,Invoice Type,चलन प्रकार
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक गट&gt; प्रदेश
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,डिलिव्हरी टीप
 DocType: Consultation,Encounter Impression,एन्काउंटर इंप्रेशन
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,कर सेट अप
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,विक्री मालमत्ता खर्च
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,तुम्ही तो pull केल्यानंतर भरणा प्रवेशात   सुधारणा करण्यात आली आहे. तो पुन्हा  खेचा.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} ने आयटम कर दोनदा प्रवेश केला
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,या आठवड्यासाठी  आणि प्रलंबित उपक्रम सारांश
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} ने आयटम कर दोनदा प्रवेश केला
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,या आठवड्यासाठी  आणि प्रलंबित उपक्रम सारांश
 DocType: Student Applicant,Admitted,दाखल
 DocType: Workstation,Rent Cost,भाडे खर्च
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,घसारा केल्यानंतर रक्कम
@@ -442,36 +454,35 @@
 DocType: Shipping Rule,Valid for Countries,देश वैध
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,हा आयटम साचा आहे आणि व्यवहारात  वापरला  जाऊ शकत नाही. 'प्रत बनवू नका ' वर सेट केले नसेल आयटम गुणधर्म पर्यायी रूपांमध्ये प्रती कॉपी होईल
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,मानलेली  एकूण ऑर्डर
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","कर्मचारी नाव (उदा मुख्य कार्यकारी अधिकारी, संचालक इ)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","कर्मचारी नाव (उदा मुख्य कार्यकारी अधिकारी, संचालक इ)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,ग्राहक चलन ग्राहक बेस चलन रूपांतरित दर
 DocType: Course Scheduling Tool,Course Scheduling Tool,अर्थात अनुसूचित साधन
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},सलग # {0}: चलन खरेदी विद्यमान मालमत्तेचे विरुद्ध केली जाऊ शकत नाही {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,% S साठी आवर्त% s तयार करताना [त्वरित] त्रुटी
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,% S साठी आवर्त% s तयार करताना [त्वरित] त्रुटी
 DocType: Item Tax,Tax Rate,कर दर
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} आधीच कर्मचार्यांसाठी वाटप {1} काळात {2} साठी {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,आयटम निवडा
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,आयटम निवडा
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,चलन  खरेदी {0} आधीच सादर केलेला आहे
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},रो # {0}: बॅच क्रमांक  {1} {2} ला  समान असणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,नॉन-गट रूपांतरित करा
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,एक आयटम बॅच (भरपूर).
 DocType: C-Form Invoice Detail,Invoice Date,चलन तारीख
 DocType: GL Entry,Debit Amount,डेबिट रक्कम
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},{0} {1} मधे प्रत्येक  कंपनीला 1 खाते असू शकते
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,कृपया संलग्नक पहा
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},{0} {1} मधे प्रत्येक  कंपनीला 1 खाते असू शकते
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,कृपया संलग्नक पहा
 DocType: Purchase Order,% Received,% मिळाले
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,विद्यार्थी गट तयार करा
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,सेटअप आधीच पूर्ण !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,सेटअप आधीच पूर्ण !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,क्रेडिट टीप रक्कम
 DocType: Setup Progress Action,Action Document,क्रिया दस्तऐवज
 ,Finished Goods,तयार वस्तू
 DocType: Delivery Note,Instructions,सूचना
 DocType: Quality Inspection,Inspected By,करून पाहणी केली
 DocType: Maintenance Visit,Maintenance Type,देखभाल प्रकार
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} कोर्स नोंदणी केलेली नाही आहे {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,आयटम कोड&gt; आयटम गट&gt; ब्रँड
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} कोर्स नोंदणी केलेली नाही आहे {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},सिरियल क्रमांक {0} वितरण टीप {1} शी  संबंधित नाही
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext डेमो
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,आयटम जोडा
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,आयटम जोडा
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,आयटम गुणवत्ता तपासणी मापदंड
 DocType: Leave Application,Leave Approver Name,रजा साक्षीदारा चे   नाव
 DocType: Depreciation Schedule,Schedule Date,वेळापत्रक तारीख
@@ -493,7 +504,7 @@
 DocType: Salary Slip Timesheet,Working Hours,कामाचे तास
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,विद्यमान मालिकेत सुरू / वर्तमान क्रम संख्या बदला.
 DocType: Dosage Strength,Strength,सामर्थ्य
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,एक नवीन ग्राहक तयार करा
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,एक नवीन ग्राहक तयार करा
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","अनेक किंमत नियम विजय सुरू केल्यास, वापरकर्त्यांना संघर्षाचे निराकरण करण्यासाठी स्वतः प्राधान्य सेट करण्यास सांगितले जाते."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,खरेदी ऑर्डर तयार करा
 ,Purchase Register,खरेदी नोंदणी
@@ -512,7 +523,7 @@
 DocType: Lab Test Template,Single,सिंगल
 DocType: Salary Slip,Total Loan Repayment,एकूण कर्ज परतफेड
 DocType: Account,Cost of Goods Sold,माल किंमत विक्री
-DocType: Purchase Invoice,Yearly,वार्षिक
+DocType: Subscription,Yearly,वार्षिक
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,खर्च केंद्र प्रविष्ट करा
 DocType: Drug Prescription,Dosage,डोस
 DocType: Journal Entry Account,Sales Order,विक्री ऑर्डर
@@ -543,7 +554,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,सर्व उत्पादन प्रक्रिया साठीचे ग्लोबल सेटिंग्ज.
 DocType: Accounts Settings,Accounts Frozen Upto,खाती फ्रोजन पर्यंत
 DocType: SMS Log,Sent On,रोजी पाठविले
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,विशेषता {0} विशेषता टेबल अनेक वेळा निवडले
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,विशेषता {0} विशेषता टेबल अनेक वेळा निवडले
 DocType: HR Settings,Employee record is created using selected field. ,कर्मचारी रेकॉर्ड निवडलेले  फील्ड वापरून तयार आहे.
 DocType: Sales Order,Not Applicable,लागू नाही
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,सुट्टी मास्टर.
@@ -569,13 +580,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,वाटप एकूण रजा  अनिवार्य आहे
 DocType: Patient,AB Positive,अबाला सकारात्मक
 DocType: Job Opening,Description of a Job Opening,एक जॉब ओपनिंग वर्णन
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,आज प्रलंबित उपक्रम
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,आज प्रलंबित उपक्रम
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,उपस्थिती रेकॉर्ड
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet आधारित उपयोग पे रोल पगार घटक.
 DocType: Sales Order Item,Used for Production Plan,उत्पादन योजना करीता वापरले जाते
 DocType: Employee Loan,Total Payment,एकूण भरणा
 DocType: Manufacturing Settings,Time Between Operations (in mins),(मि) प्रक्रिये च्या  दरम्यानची  वेळ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} कारवाई पूर्ण करणे शक्य नाही रद्द
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} कारवाई पूर्ण करणे शक्य नाही रद्द
 DocType: Customer,Buyer of Goods and Services.,वस्तू आणि सेवा खरेदीदार.
 DocType: Journal Entry,Accounts Payable,देय खाती
 DocType: Patient,Allergies,ऍलर्जी
@@ -587,23 +598,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,खरेदी ऑर्डर चेतावणी द्या
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,आपल्या ग्राहकांची यादी करा.  ते संघटना किंवा व्यक्तींना असू शकते.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,बिल्ड पुरेसे भाग
+DocType: POS Profile User,POS Profile User,पीओएस प्रोफाइल वापरकर्ता
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,थेट उत्पन्न
 DocType: Patient Appointment,Date TIme,तारीख वेळ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","खाते प्रमाणे गटात समाविष्ट केले, तर खाते आधारित फिल्टर करू शकत नाही"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,प्रशासकीय अधिकारी
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,कृपया कोर्स निवडा
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,कृपया कोर्स निवडा
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,कृपया कोर्स निवडा
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,कृपया कोर्स निवडा
 DocType: Codification Table,Codification Table,कोडिंग टेबल
 DocType: Timesheet Detail,Hrs,तास
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,कृपया कंपनी निवडा
 DocType: Stock Entry Detail,Difference Account,फरक खाते
 DocType: Purchase Invoice,Supplier GSTIN,पुरवठादार GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,त्याच्या भोवतालची कार्य {0} बंद नाही म्हणून बंद कार्य करू शकत नाही.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,ज्या  वखाराविरुद्ध साहित्य विनंती उठविली  जाईल ते  प्रविष्ट करा
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,त्याच्या भोवतालची कार्य {0} बंद नाही म्हणून बंद कार्य करू शकत नाही.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,ज्या  वखाराविरुद्ध साहित्य विनंती उठविली  जाईल ते  प्रविष्ट करा
 DocType: Production Order,Additional Operating Cost,अतिरिक्त कार्यकारी खर्च
 DocType: Lab Test Template,Lab Routine,लॅब नियमानुसार
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,सौंदर्यप्रसाधन
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","विलीन करण्यासाठी, खालील गुणधर्म दोन्ही आयटम समान असणे आवश्यक आहे"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","विलीन करण्यासाठी, खालील गुणधर्म दोन्ही आयटम समान असणे आवश्यक आहे"
 DocType: Shipping Rule,Net Weight,नेट वजन
 DocType: Employee,Emergency Phone,आणीबाणी फोन
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,खरेदी
@@ -614,7 +626,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,सुरूवातीचे 0% ग्रेड व्याख्या करा
 DocType: Sales Order,To Deliver,वितरीत करण्यासाठी
 DocType: Purchase Invoice Item,Item,आयटम
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,सिरियल नाही आयटम एक अपूर्णांक असू शकत नाही
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,उच्च संवेदनशीलता
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,सिरियल नाही आयटम एक अपूर्णांक असू शकत नाही
 DocType: Journal Entry,Difference (Dr - Cr),फरक  (Dr - Cr)
 DocType: Account,Profit and Loss,नफा व तोटा
 DocType: Patient,Risk Factors,धोका कारक
@@ -623,7 +636,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,व्यवस्थापकीय Subcontracting
 DocType: Vital Signs,Body Temperature,शरीराचे तापमान
 DocType: Project,Project will be accessible on the website to these users,"प्रकल्प या वापरकर्त्यांना वेबसाइटवर उपलब्ध राहील,"
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,प्रकल्प प्रकार परिभाषित करा.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,प्रकल्प प्रकार परिभाषित करा.
 DocType: Supplier Scorecard,Weighting Function,भार कार्य
 DocType: Physician,OP Consulting Charge,ओपी सल्लागार शुल्क
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,आपले सेटअप करा
@@ -637,7 +650,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,बढती 0 असू शकत नाही
 DocType: Production Planning Tool,Material Requirement,साहित्य आवश्यकता
 DocType: Company,Delete Company Transactions,कंपनी व्यवहार हटवा
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,संदर्भ व संदर्भ तारीख बँक व्यवहार अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,संदर्भ व संदर्भ तारीख बँक व्यवहार अनिवार्य आहे
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,कर आणि शुल्क जोडा / संपादित करा
 DocType: Payment Entry Reference,Supplier Invoice No,पुरवठादार चलन क्रमांक
 DocType: Territory,For reference,संदर्भासाठी
@@ -645,12 +658,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions",सिरियल  क्रमांक {0} हटवू शकत नाही कारण  तो स्टॉक व्यवहार मध्ये  वापरला जातो
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),बंद (कोटी)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,हॅलो
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,आयटम हलवा
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,आयटम हलवा
 DocType: Serial No,Warranty Period (Days),वॉरंटी कालावधी (दिवस)
 DocType: Installation Note Item,Installation Note Item,प्रतिष्ठापन टीप आयटम
 DocType: Production Plan Item,Pending Qty,प्रलंबित Qty
 DocType: Budget,Ignore,दुर्लक्ष करा
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} सक्रिय नाही
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} सक्रिय नाही
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,मुद्रणासाठी सेटअप तपासणी परिमाणे
 DocType: Salary Slip,Salary Slip Timesheet,पगाराच्या स्लिप्स Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,उप-करारबद्ध खरेदी पावती बंधनकारक पुरवठादार कोठार
@@ -659,7 +672,7 @@
 DocType: Pricing Rule,Sales Partner,विक्री भागीदार
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,सर्व पुरवठादार स्कोरकार्ड
 DocType: Buying Settings,Purchase Receipt Required,खरेदी पावती आवश्यक
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,शेअर उघडत प्रविष्ट केले असतील तर मूल्यांकन दर अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,शेअर उघडत प्रविष्ट केले असतील तर मूल्यांकन दर अनिवार्य आहे
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,चलन टेबल मधे  रेकॉर्ड आढळले नाहीत
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,कृपया पहिले कंपनी आणि पक्षाचे प्रकार निवडा
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,आर्थिक / लेखा वर्षी.
@@ -696,7 +709,7 @@
 DocType: Quotation,Quotation To,करण्यासाठी कोटेशन
 DocType: Lead,Middle Income,मध्यम उत्पन्न
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),उघडणे (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,आपण अगोदरच काही व्यवहार (चे) दुसर्या UOM केलेल्या कारण {0} थेट बदलले करू शकत नाही आयटम माप मुलभूत युनिट जाईल. आपण वेगळी डीफॉल्ट UOM वापरण्यासाठी एक नवीन आयटम तयार करणे आवश्यक आहे.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,आपण अगोदरच काही व्यवहार (चे) दुसर्या UOM केलेल्या कारण {0} थेट बदलले करू शकत नाही आयटम माप मुलभूत युनिट जाईल. आपण वेगळी डीफॉल्ट UOM वापरण्यासाठी एक नवीन आयटम तयार करणे आवश्यक आहे.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,रक्कम नकारात्मक असू शकत नाही
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,कंपनी सेट करा
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,कंपनी सेट करा
@@ -711,6 +724,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,भरणा खाते निवडा बँक प्रवेश करण्यासाठी
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","पाने, खर्च दावे आणि उपयोग पे रोल व्यवस्थापित करण्यासाठी कर्मचारी रेकॉर्ड तयार"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,प्रिस्क्रिप्शन कालावधी
+DocType: Restaurant Reservation,Restaurant Reservation,रेस्टॉरन्ट आरक्षण
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,प्रस्ताव लेखन
 DocType: Payment Entry Deduction,Payment Entry Deduction,भरणा प्रवेश कापून
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,आणखी विक्री व्यक्ती {0} त्याच कर्मचारी ID अस्तित्वात
@@ -718,7 +732,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,मास्टर्स
 DocType: Assessment Plan,Maximum Assessment Score,जास्तीत जास्त मूल्यांकन धावसंख्या
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,सुधारणा बँक व्यवहार तारखा
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,वेळ ट्रॅकिंग
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,वेळ ट्रॅकिंग
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,वाहतुक डुप्लिकेट
 DocType: Fiscal Year Company,Fiscal Year Company,आर्थिक वर्ष कंपनी
 DocType: Packing Slip Item,DN Detail,DN तपशील
@@ -727,8 +741,9 @@
 DocType: Batch,Batch Description,बॅच वर्णन
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,विद्यार्थी गट तयार करत आहे
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,विद्यार्थी गट तयार करत आहे
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","पेमेंट गेटवे खाते तयार नाही, स्वतः एक तयार करा."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","पेमेंट गेटवे खाते तयार नाही, स्वतः एक तयार करा."
 DocType: Supplier Scorecard,Per Year,दर वर्षी
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,डीओबीनुसार या कार्यक्रमात प्रवेशासाठी पात्र नाही
 DocType: Sales Invoice,Sales Taxes and Charges,विक्री कर आणि शुल्क
 DocType: Employee,Organization Profile,संघटना प्रोफाइल
 DocType: Vital Signs,Height (In Meter),उंची (मीटरमध्ये)
@@ -764,7 +779,7 @@
 DocType: Student Batch Name,Batch Name,बॅच नाव
 DocType: Fee Validity,Max number of visit,भेटीची कमाल संख्या
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet तयार:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},मोड ऑफ पेमेंट्स मध्ये डीफॉल्ट रोख किंवा बँक खाते सेट करा {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},मोड ऑफ पेमेंट्स मध्ये डीफॉल्ट रोख किंवा बँक खाते सेट करा {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,नाव नोंदणी करा
 DocType: GST Settings,GST Settings,&#39;जीएसटी&#39; सेटिंग्ज
 DocType: Selling Settings,Customer Naming By,करून ग्राहक नामांकन
@@ -796,16 +811,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,स्थावर खर्च कर आणि शुल्क
 DocType: Production Order Operation,Actual Start Time,वास्तविक प्रारंभ वेळ
 DocType: BOM Operation,Operation Time,ऑपरेशन वेळ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,समाप्त
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,समाप्त
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,बेस
 DocType: Timesheet,Total Billed Hours,एकूण बिल आकारले तास
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Write Off रक्कम
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Write Off रक्कम
 DocType: Leave Block List Allow,Allow User,सदस्य परवानगी द्या
 DocType: Journal Entry,Bill No,बिल नाही
 DocType: Company,Gain/Loss Account on Asset Disposal,लाभ / तोटा लेखा मालमत्ता विल्हेवाट वर
 DocType: Vehicle Log,Service Details,सेवा तपशील
 DocType: Vehicle Log,Service Details,सेवा तपशील
-DocType: Purchase Invoice,Quarterly,तिमाही
+DocType: Subscription,Quarterly,तिमाही
 DocType: Lab Test Template,Grouped,गटबद्ध
 DocType: Selling Settings,Delivery Note Required,डिलिव्हरी टीप आवश्यक
 DocType: Bank Guarantee,Bank Guarantee Number,बँक गॅरंटी क्रमांक
@@ -815,12 +830,12 @@
 DocType: Student Attendance,Student Attendance,विद्यार्थी उपस्थिती
 DocType: Sales Invoice Timesheet,Time Sheet,वेळ पत्रक
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush कच्चा माल आधारित रोजी
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,आयटम तपशील प्रविष्ट करा
 DocType: Interest,Interest,व्याज
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,पूर्व विक्री
 DocType: Purchase Receipt,Other Details,इतर तपशील
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,टेस्ट टेम्पलेट
+DocType: Restaurant Order Entry Item,Served,सेवा केली
 DocType: Account,Accounts,खाते
 DocType: Vehicle,Odometer Value (Last),ओडोमीटर मूल्य (अंतिम)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,पुरवठादार स्कोरकार्ड मापदंडाच्या टेम्पलेट
@@ -832,26 +847,28 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,पूर्वावलोकन पगाराच्या स्लिप्स
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,खाते {0} अनेक वेळा प्रविष्ट केले गेले आहे
 DocType: Account,Expenses Included In Valuation,खर्च मूल्यांकन मध्ये समाविष्ट
-DocType: Hub Settings,Seller City,विक्रेता सिटी
 ,Absent Student Report,अनुपस्थित विद्यार्थी अहवाल
 DocType: Email Digest,Next email will be sent on:,पुढील ई-मेल वर पाठविण्यात येईल:
 DocType: Offer Letter Term,Offer Letter Term,पत्र मुदत ऑफर
 DocType: Supplier Scorecard,Per Week,प्रति आठवडा
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,आयटमला रूपे आहेत.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,आयटमला रूपे आहेत.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,एकूण विद्यार्थी
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,आयटम {0} आढळला नाही
 DocType: Bin,Stock Value,शेअर मूल्य
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,शुल्क रेकॉर्ड बॅकग्राउंड मध्ये तयार केले जाईल. कोणत्याही त्रुटीमुळे त्रुटी संदेश शेड्यूलमध्ये अद्ययावत केला जाईल.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,कंपनी {0} अस्तित्वात नाही
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} चे शुल्क वैधता {1} पर्यंत आहे
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} चे शुल्क वैधता {1} पर्यंत आहे
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,वृक्ष प्रकार
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Qty प्रति युनिट नाश
 DocType: Serial No,Warranty Expiry Date,हमी कालावधी समाप्ती तारीख
 DocType: Material Request Item,Quantity and Warehouse,प्रमाण आणि कोठार
+DocType: Hub Settings,Unregister,नोंदणी रद्द करा
 DocType: Sales Invoice,Commission Rate (%),आयोग दर (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,कृपया निवडा कार्यक्रम
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,कृपया निवडा कार्यक्रम
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,कृपया निवडा कार्यक्रम
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,कृपया निवडा कार्यक्रम
 DocType: Project,Estimated Cost,अंदाजे खर्च
 DocType: Purchase Order,Link to material requests,साहित्य विनंत्या दुवा
+DocType: Hub Settings,Publish,प्रकाशित करा
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,एरोस्पेस
 DocType: Journal Entry,Credit Card Entry,क्रेडिट कार्ड प्रवेश
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,कंपनी व लेखा
@@ -862,13 +879,12 @@
 DocType: Selling Settings,Close Opportunity After Days,संधी दिवसांनी बंद करा
 ,Reserved,राखीव
 DocType: Purchase Order,Supply Raw Materials,पुरवठा कच्चा माल
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"पुढील चलन निर्माण केले जातील, ज्या तारखेला. हे सबमिट निर्माण होते."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,वर्तमान मालमत्ता
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} एक स्टॉक आयटम नाही
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',ट्रेनिंग फीडबॅकवर क्लिक करून आणि नंतर &#39;नवीन&#39;
 DocType: Mode of Payment Account,Default Account,मुलभूत खाते
 DocType: Payment Entry,Received Amount (Company Currency),प्राप्त केलेली रक्कम (कंपनी चलन)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,संधी आघाडी केले आहे तर आघाडी सेट करणे आवश्यक आहे
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,संधी आघाडी केले आहे तर आघाडी सेट करणे आवश्यक आहे
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,कृपया साप्ताहिक बंद दिवस निवडा
 DocType: Patient,O Negative,ओ नकारात्मक
 DocType: Production Order Operation,Planned End Time,नियोजनबद्ध समाप्ती वेळ
@@ -884,10 +900,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,ऊर्जा
 DocType: Opportunity,Opportunity From,पासून संधी
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,मासिक पगार विधान.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,कंपनी जोडा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{0} पंक्ती: {1} आयटम {2} साठी आवश्यक क्रम संख्या. आपण {3} प्रदान केले आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{0} पंक्ती: {1} आयटम {2} साठी आवश्यक क्रम संख्या. आपण {3} प्रदान केले आहे
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,कृपया एक सारणी निवडा
 DocType: BOM,Website Specifications,वेबसाइट वैशिष्ट्य
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} &#39;प्राप्तकर्ते&#39; मध्ये अवैध ईमेल पत्ता आहे
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} &#39;प्राप्तकर्ते&#39; मध्ये अवैध ईमेल पत्ता आहे
 DocType: Special Test Items,Particulars,तपशील
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,प्रतिजैविक
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: {0} पासून {1} प्रकारच्या
@@ -895,11 +911,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,रो {0}: रूपांतरण फॅक्टर अनिवार्य आहे
 DocType: Employee,A+,अ +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","अनेक किंमतीचे  नियम समान निकषा सह  अस्तित्वात नाहीत , प्राधान्य सोपवून संघर्षाचे निराकरण करा. किंमत नियम: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,इतर BOMs निगडीत आहे म्हणून BOM निष्क्रिय किंवा रद्द करू शकत नाही
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,इतर BOMs निगडीत आहे म्हणून BOM निष्क्रिय किंवा रद्द करू शकत नाही
 DocType: Opportunity,Maintenance,देखभाल
 DocType: Item Attribute Value,Item Attribute Value,आयटम मूल्य विशेषता
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,विक्री मोहिम.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Timesheet करा
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Timesheet करा
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -937,12 +953,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,पहिल्या आयटम लिस्ट मधे प्रविष्ट करा
 DocType: Account,Liability,दायित्व
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,मंजूर रक्कम रो {0} मधे मागणी रक्कमेपेक्षा  जास्त असू शकत नाही.
+DocType: Salary Detail,Do not include in total,एकूण मध्ये समाविष्ट करू नका
 DocType: Company,Default Cost of Goods Sold Account,वस्तू विकल्या खाते डीफॉल्ट खर्च
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,किंमत सूची निवडलेली  नाही
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,किंमत सूची निवडलेली  नाही
 DocType: Employee,Family Background,कौटुंबिक पार्श्वभूमी
 DocType: Request for Quotation Supplier,Send Email,ईमेल पाठवा
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},चेतावणी: अवैध संलग्नक {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,कोणतीही परवानगी नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},चेतावणी: अवैध संलग्नक {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,कोणतीही परवानगी नाही
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,विनंती केलेली रक्कम
 DocType: Vital Signs,Heart Rate / Pulse,हृदय गती / पल्स
 DocType: Company,Default Bank Account,मुलभूत बँक खाते
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","पार्टी आधारित फिल्टर कर यासाठी,   पहिले पार्टी पयायय टाइप करा"
@@ -970,12 +988,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,आयटम रो {idx}: {doctype} {docName} वरील अस्तित्वात नाही &#39;{doctype}&#39; टेबल
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} आधीच पूर्ण किंवा रद्द
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,कोणतीही कार्ये
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ऑटो अशी यादी तयार करणे 05, 28 इत्यादी उदा निर्माण होणार महिन्याचा दिवस"
 DocType: Item Variant Settings,Copy Fields to Variant,फील्ड ते व्हेरियंट कॉपी करा
 DocType: Asset,Opening Accumulated Depreciation,जमा घसारा उघडत
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,धावसंख्या 5 या पेक्षा कमी किंवा या समान असणे आवश्यक आहे
 DocType: Program Enrollment Tool,Program Enrollment Tool,कार्यक्रम नावनोंदणी साधन
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,सी-फॉर्म रेकॉर्ड
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,सी-फॉर्म रेकॉर्ड
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,ग्राहक आणि पुरवठादार
 DocType: Email Digest,Email Digest Settings,ईमेल डायजेस्ट सेटिंग्ज
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,आपला व्यवसाय धन्यवाद!
@@ -993,13 +1010,13 @@
 DocType: Request for Quotation Supplier,Quote Status,कोट स्थिती
 DocType: Maintenance Visit,Completion Status,पूर्ण स्थिती
 DocType: HR Settings,Enter retirement age in years,वर्षांत निवृत्तीचे वय प्रविष्ट करा
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,लक्ष्य कोठार
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,कृपया एक कोठार निवडा
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,लक्ष्य कोठार
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,कृपया एक कोठार निवडा
 DocType: Cheque Print Template,Starting location from left edge,बाकी धार पासून स्थान सुरू करत आहे
 DocType: Item,Allow over delivery or receipt upto this percent,या टक्के पर्यंत डिलिव्हरी किंवा पावती अनुमती द्या
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,आयात हजेरी
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,सर्व आयटम गट
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,सर्व आयटम गट
 DocType: Process Payroll,Activity Log,क्रियाकलाप लॉग
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,निव्वळ नफा / तोटा
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,स्वयंचलितपणे व्यवहार सादर संदेश तयार करा.
@@ -1011,7 +1028,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,अंदाज Qty
 DocType: Sales Invoice,Payment Due Date,पैसे भरण्याची शेवटची तारिख
 DocType: Drug Prescription,Interval UOM,मध्यांतर UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,आयटम व्हेरियंट {0} आधीच समान गुणधर्म अस्तित्वात आहे
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,आयटम व्हेरियंट {0} आधीच समान गुणधर्म अस्तित्वात आहे
+DocType: Item,Hub Publishing Details,हब प्रकाशन तपशील
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;उघडणे&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,का मुक्त
 DocType: Notification Control,Delivery Note Message,डिलिव्हरी टीप संदेश
@@ -1031,10 +1049,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: कच्चा माल मुख्य घटक म्हणून समान असू शकत नाही
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,खरेदी पावती आयटम टेबल एकूण लागू शुल्क एकूण कर आणि शुल्क म्हणून समान असणे आवश्यक आहे
 DocType: Sales Team,Incentives,प्रोत्साहन
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,हबसाठी नोंदणी करा
 DocType: SMS Log,Requested Numbers,विनंती संख्या
 DocType: Production Planning Tool,Only Obtain Raw Materials,फक्त कच्चा माल प्राप्त
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,कामाचे मूल्यमापन.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","सक्षम हे खरेदी सूचीत टाका सक्षम आहे की, हे खरेदी सूचीत टाका वापरा &#39;आणि हे खरेदी सूचीत टाका आणि कमीत कमी एक कर नियम असावा"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","सक्षम हे खरेदी सूचीत टाका सक्षम आहे की, हे खरेदी सूचीत टाका वापरा &#39;आणि हे खरेदी सूचीत टाका आणि कमीत कमी एक कर नियम असावा"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","भरणा प्रवेश {0} ऑर्डर {1}, हे चलन आगाऊ म्हणून कुलशेखरा धावचीत केले पाहिजे की नाही हे तपासण्यासाठी विरूद्ध जोडली आहे."
 DocType: Sales Invoice Item,Stock Details,शेअर तपशील
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,प्रकल्प मूल्य
@@ -1053,12 +1072,14 @@
 DocType: Salary Slip,Working Days,कामाचे दिवस
 DocType: Serial No,Incoming Rate,येणार्या दर
 DocType: Packing Slip,Gross Weight,एकूण वजन
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,"आपल्या कंपनीचे नाव, जे आपण या प्रणालीत  सेट केले  आहे."
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,हब सक्षम करा
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,"आपल्या कंपनीचे नाव, जे आपण या प्रणालीत  सेट केले  आहे."
 DocType: HR Settings,Include holidays in Total no. of Working Days,एकूण कार्यरत दिवसामधे  सुट्ट्यांचा सामावेश करा
 DocType: Job Applicant,Hold,धरा
 DocType: Employee,Date of Joining,प्रवेश दिनांक
 DocType: Naming Series,Update Series,अद्यतन मालिका
 DocType: Supplier Quotation,Is Subcontracted,Subcontracted आहे
+DocType: Restaurant Table,Minimum Seating,किमान आसन
 DocType: Item Attribute,Item Attribute Values,आयटम विशेषता मूल्ये
 DocType: Examination Result,Examination Result,परीक्षेचा निकाल
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,खरेदी पावती
@@ -1069,13 +1090,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},ऑपरेशन  {1} साठी पुढील {0} दिवसांत वेळ शोधू शकला नाही
 DocType: Production Order,Plan material for sub-assemblies,उप-विधानसभा योजना साहित्य
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,विक्री भागीदार आणि प्रदेश
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} सक्रिय असणे आवश्यक आहे
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} सक्रिय असणे आवश्यक आहे
 DocType: Journal Entry,Depreciation Entry,घसारा प्रवेश
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,पहले दस्तऐवज प्रकार निवडा
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,साहित्य भेट रद्द करा {0} ही  देखभाल भेट रद्द होण्यापुर्वी रद्द करा
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},सिरियल क्रमांक {0} आयटम  {1} शी संबंधित नाही
 DocType: Purchase Receipt Item Supplied,Required Qty,आवश्यक Qty
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,विद्यमान व्यवहार गोदामे खातेवही रूपांतरीत केले जाऊ शकत नाही.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,विद्यमान व्यवहार गोदामे खातेवही रूपांतरीत केले जाऊ शकत नाही.
 DocType: Bank Reconciliation,Total Amount,एकूण रक्कम
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,इंटरनेट प्रकाशन
 DocType: Prescription Duration,Number,नंबर
@@ -1086,7 +1107,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,विक्री किंमत सूची
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","तपासले असल्यास, ग्राहक तयार केला जाईल, रुग्णांच्याकडे मॅप केला जाईल. या ग्राहकांविरुध्द रुग्ण बीजक तयार केले जातील. पेशंट तयार करताना आपण विद्यमान ग्राहक देखील निवडू शकता"
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,आयटम समक्रमित करण्यासाठी प्रकाशित
 DocType: Bank Reconciliation,Account Currency,खाते चलन
 DocType: Lab Test,Sample ID,नमुना आयडी
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,कंपनी मध्ये Round Off खाते उल्लेख करा
@@ -1095,11 +1115,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,कर्मचारी {0} सक्रिय नाही आहे किंवा अस्तित्वात नाही
 DocType: Fee Structure,Components,घटक
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},आयटम मध्ये मालमत्ता वर्ग प्रविष्ट करा {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,आयटम रूपे {0} सुधारित
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,आयटम रूपे {0} सुधारित
 DocType: Quality Inspection Reading,Reading 6,6 वाचन
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,नाही {0} {1} {2} कोणत्याही नकारात्मक थकबाकी चलन करू शकता
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","व्युत्पन्न करणे विलंबित असल्यास, आपल्याला यातील &quot;महिन्याचे पुनरावृत्ती&quot; फील्ड स्वहस्ते बदलावे लागेल"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,नाही {0} {1} {2} कोणत्याही नकारात्मक थकबाकी चलन करू शकता
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,चलन आगाऊ खरेदी
-DocType: Hub Settings,Sync Now,आता समक्रमण
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},रो {0}: क्रेडिट प्रवेश {1} सोबत  दुवा साधली  जाऊ शकत नाही
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,आर्थिक वर्षात अर्थसंकल्पात व्याख्या करा.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,मुलभूत बँक / रोख खाते आपोआप या मोडमध्ये निवडलेले असताना POS चलन अद्ययावत केले जाईल.
@@ -1111,13 +1132,13 @@
 DocType: Item,Is Purchase Item,खरेदी आयटम आहे
 DocType: Asset,Purchase Invoice,खरेदी चलन
 DocType: Stock Ledger Entry,Voucher Detail No,प्रमाणक तपशील नाही
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,नवीन विक्री चलन
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,नवीन विक्री चलन
 DocType: Stock Entry,Total Outgoing Value,एकूण जाणारे मूल्य
 DocType: Physician,Appointments,नेमणूक
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,उघडण्याची  तारीख आणि अखेरची दिनांक त्याच आर्थिक वर्षात  असावे
 DocType: Lead,Request for Information,माहिती विनंती
 ,LeaderBoard,LEADERBOARD
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,समक्रमण ऑफलाइन पावत्या
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,समक्रमण ऑफलाइन पावत्या
 DocType: Payment Request,Paid,पेड
 DocType: Program Fee,Program Fee,कार्यक्रम शुल्क
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1136,11 +1157,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,ऑर्डर आयटम खरेदी
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,अप्रत्यक्ष उत्पन्न
 DocType: Student Attendance Tool,Student Attendance Tool,विद्यार्थी उपस्थिती साधन
+DocType: Restaurant Menu,Price List (Auto created),किंमत सूची (स्वयं तयार)
 DocType: Cheque Print Template,Date Settings,तारीख सेटिंग्ज
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,फरक
 ,Company Name,कंपनी नाव
 DocType: SMS Center,Total Message(s),एकूण संदेशा  (चे)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,हस्तांतरणासाठी आयटम निवडा
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,हस्तांतरणासाठी आयटम निवडा
 DocType: Purchase Invoice,Additional Discount Percentage,अतिरिक्त सवलत टक्केवारी
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,मदत व्हिडिओ यादी पहा
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,जेथे चेक जमा होतात  ते  बँक प्रमुख खाते निवडा .
@@ -1158,6 +1180,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,मीटर
 DocType: Workstation,Electricity Cost,वीज खर्च
 DocType: HR Settings,Don't send Employee Birthday Reminders,कर्मचारी वाढदिवस स्मरणपत्रे पाठवू नका
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,सेटिंग्ज जतन
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,विनंती केलेले उत्पादने
 DocType: Item,Inspection Criteria,तपासणी निकष
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,हस्तांतरण
 DocType: BOM Website Item,BOM Website Item,BOM वेबसाइट बाबींचा
@@ -1175,11 +1199,11 @@
 DocType: Journal Entry,Total Amount in Words,शब्द एकूण रक्कम
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,एक त्रुटी होती . एक संभाव्य कारण तुम्ही  फॉर्म जतन केले नाहीत हे असू शकते. समस्या कायम राहिल्यास support@erpnext.com येथे संपर्क साधा.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,माझे टाका
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},ऑर्डर प्रकार {0} पैकी एक असणे आवश्यक आहे
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},ऑर्डर प्रकार {0} पैकी एक असणे आवश्यक आहे
 DocType: Lead,Next Contact Date,पुढील संपर्क तारीख
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Qty उघडणे
 DocType: Healthcare Settings,Appointment Reminder,नेमणूक स्मरणपत्र
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,रक्कम बदल खाते प्रविष्ट करा
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,रक्कम बदल खाते प्रविष्ट करा
 DocType: Student Batch Name,Student Batch Name,विद्यार्थी बॅच नाव
 DocType: Consultation,Doctor,डॉक्टर
 DocType: Holiday List,Holiday List Name,सुट्टी यादी नाव
@@ -1187,12 +1211,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,वेळापत्रक कोर्स
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,शेअर पर्याय
 DocType: Journal Entry Account,Expense Claim,खर्च दावा
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,आपण खरोखर या रद्द मालमत्ता परत करू इच्छिता?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},{0} साठी Qty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,आपण खरोखर या रद्द मालमत्ता परत करू इच्छिता?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},{0} साठी Qty
 DocType: Leave Application,Leave Application,रजेचा अर्ज
 DocType: Patient,Patient Relation,रुग्णांच्या संबंध
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,रजा वाटप साधन
+DocType: Item,Hub Category to Publish,हब श्रेणी प्रकाशित करण्यासाठी
 DocType: Leave Block List,Leave Block List Dates,रजा ब्लॉक यादी तारखा
+DocType: Sales Invoice,Billing Address GSTIN,बिलिंग पत्ता GSTIN
 DocType: Workstation,Net Hour Rate,नेट तास दर
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,स्थावर खर्च खरेदी पावती
 DocType: Company,Default Terms,मुलभूत अटी
@@ -1202,11 +1228,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},निर्दिष्ट करा एक {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,प्रमाणात किंवा मूल्यात बदल नसलेले   आयटम काढले    .
 DocType: Delivery Note,Delivery To,वितरण
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,विशेषता टेबल अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,विशेषता टेबल अनिवार्य आहे
 DocType: Production Planning Tool,Get Sales Orders,विक्री ऑर्डर मिळवा
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} नकारात्मक असू शकत नाही
 DocType: Training Event,Self-Study,स्वत: ची अभ्यास
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,सवलत
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,सवलत
 DocType: Asset,Total Number of Depreciations,Depreciations एकूण क्रमांक
 DocType: Sales Invoice Item,Rate With Margin,मार्जिन दर
 DocType: Sales Invoice Item,Rate With Margin,मार्जिन दर
@@ -1214,7 +1240,7 @@
 DocType: Task,Urgent,त्वरित
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},कृपया टेबल {1} मध्ये सलग {0}साठी  एक वैध रो ID निर्दिष्ट करा
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,व्हेरिएबल शोधण्यात अक्षम:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,कृपया नमपॅड मधून संपादित करण्यासाठी एक फील्ड निवडा
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,कृपया नमपॅड मधून संपादित करण्यासाठी एक फील्ड निवडा
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,डेस्कटॉप वर जा आणि ERPNext वापर सुरू करा
 DocType: Item,Manufacturer,निर्माता
 DocType: Landed Cost Item,Purchase Receipt Item,खरेदी पावती आयटम
@@ -1245,8 +1271,8 @@
 DocType: GL Entry,Against,विरुद्ध
 DocType: Item,Default Selling Cost Center,मुलभूत विक्री खर्च केंद्र
 DocType: Sales Partner,Implementation Partner,अंमलबजावणी भागीदार
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,पिनकोड
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},विक्री ऑर्डर {0} हे  {1}आहे
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,पिनकोड
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},विक्री ऑर्डर {0} हे  {1}आहे
 DocType: Opportunity,Contact Info,संपर्क माहिती
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,शेअर नोंदी करून देणे
 DocType: Packing Slip,Net Weight UOM,नेट वजन UOM
@@ -1257,6 +1283,7 @@
 DocType: Holiday List,Get Weekly Off Dates,साप्ताहिक बंद तारखा मिळवा
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,समाप्ती तारीख प्रारंभ तारखेच्या पेक्षा कमी असू शकत नाही
 DocType: Sales Person,Select company name first.,प्रथम  कंपनीचे नाव निवडा
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,कमी ते उच्च
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,अवतरणे पुरवठादारांकडून   प्राप्त झाली.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOM बदला आणि सर्व BOMs मध्ये नवीनतम किंमत अद्यतनित करा
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},करण्यासाठी {0} | {1} {2}
@@ -1277,7 +1304,7 @@
 DocType: Program Enrollment,Transportation,वाहतूक
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,अवैध विशेषता
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} सादर करणे आवश्यक आहे
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},प्रमाणात या पेक्षा कमी किंवा या समान असणे आवश्यक आहे {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},प्रमाणात या पेक्षा कमी किंवा या समान असणे आवश्यक आहे {0}
 DocType: SMS Center,Total Characters,एकूण वर्ण
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},कृपया आयटम {0} साठी BOM क्षेत्रात BOM निवडा
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,सी-फॉर्म चलन तपशील
@@ -1292,7 +1319,7 @@
 ,Ordered Items To Be Billed,आदेश दिलेले  आयटम बिल करायचे
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,श्रेणी पासून श्रेणी पर्यंत कमी असली पाहिजे
 DocType: Global Defaults,Global Defaults,ग्लोबल डीफॉल्ट
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,प्रकल्प सहयोग आमंत्रण
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,प्रकल्प सहयोग आमंत्रण
 DocType: Salary Slip,Deductions,वजावट
 DocType: Leave Allocation,LAL/,लाल /
 DocType: Setup Progress Action,Action Name,क्रिया नाव
@@ -1310,13 +1337,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,विक्री चलन आगाऊ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,काहीही विनंती करण्यासाठी
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},आणखी अर्थसंकल्पात रेकॉर्ड &#39;{0}&#39; आधीच विरुद्ध अस्तित्वात {1} &#39;{2}&#39; आर्थिक वर्षात आर्थिक {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','वास्तविक प्रारंभ तारीख' ही 'वास्तविक अंतिम तारीख' यापेक्षा जास्त असू शकत नाही
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','वास्तविक प्रारंभ तारीख' ही 'वास्तविक अंतिम तारीख' यापेक्षा जास्त असू शकत नाही
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,व्यवस्थापन
 DocType: Cheque Print Template,Payer Settings,देणारा सेटिंग्ज
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","हा  जिच्यामध्ये variant आयटम कोड आहे त्यासाठी जोडला  जाईल. उदाहरणार्थ जर आपला  संक्षेप ""SM"", आहे आणि , आयटम कोड ""टी-शर्ट"", ""टी-शर्ट-एम"" असेल जिच्यामध्ये variant आयटम कोड आहे"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,आपल्या  पगाराच्या स्लिप्स  एकदा जतन केल्यावर  निव्वळ वेतन ( शब्दांत ) दृश्यमान होईल.
 DocType: Purchase Invoice,Is Return,परत आहे
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,खबरदारी
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,खबरदारी
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,परत / डेबिट टीप
 DocType: Price List Country,Price List Country,किंमत यादी देश
 DocType: Item,UOMs,UOMs
@@ -1331,17 +1358,18 @@
 DocType: Account,Balance Sheet,ताळेबंद
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',खर्च केंद्र आयटम साठी  'आयटम कोड' बरोबर
 DocType: Fee Validity,Valid Till,पर्यंत वैध
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",भरणा मोड कॉन्फिगर केलेली नाही. खाते मोड ऑफ पेमेंट्स किंवा पीओएस प्रोफाइल वर सेट केली गेली आहे का ते कृपया तपासा.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",भरणा मोड कॉन्फिगर केलेली नाही. खाते मोड ऑफ पेमेंट्स किंवा पीओएस प्रोफाइल वर सेट केली गेली आहे का ते कृपया तपासा.
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,सारख्या आयटमचा एकाधिक वेळा प्रविष्ट करणे शक्य नाही.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","पुढील खाती गट अंतर्गत केले जाऊ शकते, पण नोंदी नॉन-गट  करू शकता"
 DocType: Lead,Lead,लीड
 DocType: Email Digest,Payables,देय
 DocType: Course,Course Intro,अर्थात परिचय
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,शेअर प्रवेश {0} तयार
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; क्रमांकिंग सीरिजद्वारे उपस्थिततेसाठी सेटिग नंबरिंग सिरीज
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,शेअर प्रवेश {0} तयार
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,रो # {0}: नाकारलेली Qty खरेदी परत मधे  प्रविष्ट करणे शक्य नाही
 ,Purchase Order Items To Be Billed,पर्चेस आयटम बिल करायचे
 DocType: Purchase Invoice Item,Net Rate,नेट दर
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,कृपया एक ग्राहक निवडा
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,कृपया एक ग्राहक निवडा
 DocType: Purchase Invoice Item,Purchase Invoice Item,चलन आयटम खरेदी
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,शेअर लेजर नोंदी आणि जी नोंदी निवडलेल्या खरेदी पावत्या साठी पुन्हा पोस्ट केले आहेत
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,आयटम 1
@@ -1362,7 +1390,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},डुप्लिकेट सलग {0} त्याच {1} सह
 ,Trial Balance,चाचणी शिल्लक
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,आर्थिक वर्ष {0} आढळले नाही
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,कर्मचारी सेट अप
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,कर्मचारी सेट अप
 DocType: Sales Order,SO-,SO-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,कृपया पहले उपसर्ग निवडा
 DocType: Employee,O-,O-
@@ -1374,12 +1402,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,लेजर पहा
 DocType: Grading Scale,Intervals,कालांतराने
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,लवकरात लवकर
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","आयटम त्याच नावाने अस्तित्वात  असेल , तर आयटम गट नाव बदल  किंवा आयटम पुनर्नामित करा"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","आयटम त्याच नावाने अस्तित्वात  असेल , तर आयटम गट नाव बदल  किंवा आयटम पुनर्नामित करा"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,विद्यार्थी भ्रमणध्वनी क्रमांक
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,उर्वरित जग
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,उर्वरित जग
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,आयटम {0} बॅच असू शकत नाही
 ,Budget Variance Report,अर्थसंकल्प फरक अहवाल
 DocType: Salary Slip,Gross Pay,एकूण वेतन
+DocType: Item,Is Item from Hub,आयटम हब पासून आहे
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,सलग {0}: क्रियाकलाप प्रकार आवश्यक आहे.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,लाभांश पेड
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,लेखा लेजर
@@ -1389,8 +1418,9 @@
 DocType: Vehicle Log,Service Detail,सेवा तपशील
 DocType: BOM,Item Description,आयटम वर्णन
 DocType: Student Sibling,Student Sibling,विद्यार्थी भावंड
-DocType: Purchase Invoice,Is Recurring,आवर्ती आहे
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,भरणा मोड
 DocType: Purchase Invoice,Supplied Items,पुरवठा आयटम
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},कृपया रेस्टॉरन्ट {0} साठी सक्रिय मेनू सेट करा
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,निर्मिती करण्यासाठी  Qty
 DocType: Email Digest,New Income,नवीन उत्पन्न
@@ -1401,6 +1431,7 @@
 ,Student and Guardian Contact Details,विद्यार्थी आणि पालक संपर्क तपशील
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,सलग {0}: पुरवठादार साठी {0} ईमेल पत्ता ईमेल पाठवा करणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,तात्पुरती उघडणे
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,पहा केंद्र
 ,Employee Leave Balance,कर्मचारी रजा शिल्लक
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},खाते साठी शिल्लक {0} नेहमी असणे आवश्यक आहे {1}
 DocType: Patient Appointment,More Info,अधिक माहिती
@@ -1420,13 +1451,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,विक्री ऑर्डर {0} वैध नाही
 DocType: Supplier Scorecard,Warn for new Request for Quotations,कोटेशनसाठी नवीन विनंतीसाठी चेतावणी द्या
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,खरेदी आदेश योजना मदत आणि आपल्या खरेदी पाठपुरावा
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","क्षमस्व, कंपन्या विलीन करणे शक्य नाही"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","क्षमस्व, कंपन्या विलीन करणे शक्य नाही"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,लॅब टेस्ट प्रिस्क्रिप्शन
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",एकूण अंक / हस्तांतरण प्रमाणात{0} साहित्य विनंती {1} मध्ये  \ विनंती प्रमाण {2} पेक्षा आयटम{3} साठी    जास्त असू शकत नाही
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,लहान
 DocType: Employee,Employee Number,कर्मचारी संख्या
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},प्रकरण क्रमांक (s) आधीपासून वापरात आहेत .  प्रकरण {0} पासून वापरून पहा
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},प्रकरण क्रमांक (s) आधीपासून वापरात आहेत .  प्रकरण {0} पासून वापरून पहा
 DocType: Project,% Completed,% पूर्ण
 ,Invoiced Amount (Exculsive Tax),Invoiced रक्कम (Exculsive कर)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,आयटम 2
@@ -1441,11 +1472,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,अप्रत्यक्ष खर्च
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,रो {0}: Qty अनिवार्य आहे
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,कृषी
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,समक्रमण मास्टर डेटा
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,समक्रमण मास्टर डेटा
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,आपली उत्पादने किंवा सेवा
 DocType: Special Test Items,Special Test Items,स्पेशल टेस्ट आयटम्स
 DocType: Mode of Payment,Mode of Payment,मोड ऑफ पेमेंट्स
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,वेबसाइट प्रतिमा सार्वजनिक फाइल किंवा वेबसाइट URL असावी
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,वेबसाइट प्रतिमा सार्वजनिक फाइल किंवा वेबसाइट URL असावी
 DocType: Student Applicant,AP,आंध्र प्रदेश
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,हा रूट आयटम गट आहे आणि संपादित केला जाऊ शकत नाही.
@@ -1453,9 +1484,9 @@
 DocType: Vehicle,Fuel UOM,इंधन UOM
 DocType: Warehouse,Warehouse Contact Info,वखार संपर्क माहिती
 DocType: Payment Entry,Write Off Difference Amount,फरक रक्कम बंद लिहा
-DocType: Purchase Invoice,Recurring Type,आवर्ती प्रकार
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: कर्मचारी ईमेल आढळले नाही, म्हणून पाठविले नाही ई-मेल"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: कर्मचारी ईमेल आढळले नाही, म्हणून पाठविले नाही ई-मेल"
 DocType: Item,Foreign Trade Details,विदेश व्यापार तपशील
+,Assessment Plan Status,मूल्यांकन योजना स्थिती
 DocType: Email Digest,Annual Income,वार्षिक उत्पन्न
 DocType: Serial No,Serial No Details,सिरियल क्रमांक तपशील
 DocType: Purchase Invoice Item,Item Tax Rate,आयटम कराचा दर
@@ -1463,15 +1494,14 @@
 DocType: Student Group Student,Group Roll Number,गट आसन क्रमांक
 DocType: Student Group Student,Group Roll Number,गट आसन क्रमांक
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, फक्त क्रेडिट खात्यांच्या दुसऱ्या नावे नोंद लिंक जाऊ शकते"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,सर्व कार्य वजन एकूण असू 1. त्यानुसार सर्व प्रकल्प कार्ये वजन समायोजित करा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,"डिलिव्हरी टीप {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,सर्व कार्य वजन एकूण असू 1. त्यानुसार सर्व प्रकल्प कार्ये वजन समायोजित करा
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,"डिलिव्हरी टीप {0} सबमिट केलेली नाही,"
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,आयटम {0} सब-करारबद्ध आयटम असणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,कॅपिटल उपकरणे
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","किंमत नियम 'रोजी लागू करा' field वर  आधारित पहिले निवडलेला आहे , जो आयटम, आयटम गट किंवा ब्रॅण्ड असू शकतो"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,कृपया प्रथम आयटम कोड सेट करा
-DocType: Hub Settings,Seller Website,विक्रेता वेबसाइट
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,कृपया प्रथम आयटम कोड सेट करा
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,विक्री संघ एकूण वाटप टक्केवारी 100 असावे
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,विक्री संघ एकूण वाटप टक्केवारी 100 असावे
 DocType: Sales Invoice Item,Edit Description,वर्णन संपादित करा
 DocType: Antibiotic,Antibiotic,प्रतिजैविक
 ,Team Updates,टीम सुधारणा
@@ -1492,12 +1522,12 @@
 DocType: Purchase Invoice,Total (Company Currency),एकूण (कंपनी चलन)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,अनुक्रमांक {0}  एकापेक्षा अधिक वेळा  enter केला आहे
 DocType: Depreciation Schedule,Journal Entry,जर्नल प्रवेश
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} प्रगतीपथावर आयटम
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} प्रगतीपथावर आयटम
 DocType: Workstation,Workstation Name,वर्कस्टेशन नाव
 DocType: Grading Scale Interval,Grade Code,ग्रेड कोड
 DocType: POS Item Group,POS Item Group,POS बाबींचा गट
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ई-मेल सारांश:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} आयटम संबंधित नाही {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} आयटम संबंधित नाही {1}
 DocType: Sales Partner,Target Distribution,लक्ष्य वितरण
 DocType: Salary Slip,Bank Account No.,बँक खाते क्रमांक
 DocType: Naming Series,This is the number of the last created transaction with this prefix,हा क्रमांक या प्रत्ययसह  गेल्या निर्माण केलेला  व्यवहार  आहे
@@ -1514,10 +1544,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,अवतरण पुरवठादार विनंती
 DocType: Healthcare Settings,Registration Message,नोंदणी संदेश
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,हार्डवेअर
-DocType: Sales Order,Recurring Upto,आवर्ती पर्यंत
 DocType: Prescription Dosage,Prescription Dosage,प्रिस्क्रिप्शन डोस
 DocType: Attendance,HR Manager,एचआर व्यवस्थापक
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,कृपया कंपनी निवडा
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,कृपया कंपनी निवडा
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,रजा
 DocType: Purchase Invoice,Supplier Invoice Date,पुरवठादार चलन तारीख
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,प्रति
@@ -1533,10 +1562,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,दरम्यान आढळलेल्या  आच्छादित अटी:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,जर्नल विरुद्ध प्रवेश {0} आधीच काही इतर व्हाउचर विरुद्ध सुस्थीत केले जाते
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,एकूण ऑर्डर मूल्य
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,अन्न
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,अन्न
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing श्रेणी 3
 DocType: Maintenance Schedule Item,No of Visits,भेटी क्रमांक
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},देखभाल वेळापत्रक {0} विरुद्ध अस्तित्वात {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,आपण हब वर आपले आयटम प्रकाशित करू इच्छिता?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,नोंदणी विद्यार्थी
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},बंद खात्याचे चलन {0} असणे आवश्यक आहे
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},सर्व goalsसाठी  गुणांची  सम 100 असावी.  हे  {0} आहे
@@ -1547,9 +1577,9 @@
 DocType: Authorization Rule,Average Discount,सरासरी सवलत
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,उपयुक्तता
-DocType: Purchase Invoice Item,Accounting,लेखा
+DocType: POS Profile,Accounting,लेखा
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,कृपया बॅच आयटम बॅच निवडा
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,कृपया बॅच आयटम बॅच निवडा
 DocType: Asset,Depreciation Schedules,घसारा वेळापत्रक
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,अर्ज काळ रजा वाटप कालावधी बाहेर असू शकत नाही
 DocType: Activity Cost,Projects,प्रकल्प
@@ -1565,7 +1595,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',मंजूरीची स्थिती &#39;मंजूर&#39; किंवा &#39;नाकारलेली&#39; करणे आवश्यक आहे
 DocType: Physician,Contacts and Address,संपर्क आणि पत्ता
 DocType: Purchase Invoice,Contact Person,संपर्क व्यक्ती
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','अपेक्षित प्रारंभ तारीख' ही 'अपेक्षित शेवटची तारीख' पेक्षा जास्त असू शकत नाही.
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','अपेक्षित प्रारंभ तारीख' ही 'अपेक्षित शेवटची तारीख' पेक्षा जास्त असू शकत नाही.
 DocType: Course Scheduling Tool,Course End Date,अर्थात अंतिम तारीख
 DocType: Holiday List,Holidays,सुट्ट्या
 DocType: Sales Order Item,Planned Quantity,नियोजनबद्ध प्रमाण
@@ -1573,10 +1603,11 @@
 DocType: Item,Maintain Stock,शेअर ठेवा
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,आधीच उत्पादन ऑर्डर तयार स्टॉक नोंदी
 DocType: Employee,Prefered Email,Prefered ईमेल
+DocType: Student Admission,Eligibility and Details,पात्रता आणि तपशील
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,मुदत मालमत्ता निव्वळ बदला
 DocType: Leave Control Panel,Leave blank if considered for all designations,सर्व पदांसाठी  विचारल्यास रिक्त सोडा
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार 'वास्तविक ' सलग शुल्क {0} आयटम रेट मधे  समाविष्ट केले जाऊ शकत नाही
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},कमाल: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},कमाल: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,DATETIME पासून
 DocType: Email Digest,For Company,कंपनी साठी
 apps/erpnext/erpnext/config/support.py +17,Communication log.,संवाद लॉग.
@@ -1584,19 +1615,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,पुरवठादार धावसंख्याकार्ड स्कोअरिंग व्हेरिएबल
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,खरेदी रक्कम
 DocType: Sales Invoice,Shipping Address Name,शिपिंग पत्ता नाव
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,लेखा चार्ट
 DocType: Material Request,Terms and Conditions Content,अटी आणि शर्ती सामग्री
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,पेक्षा जास्त 100 असू शकत नाही
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,{0} आयटम स्टॉक आयटम नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,{0} आयटम स्टॉक आयटम नाही
 DocType: Maintenance Visit,Unscheduled,Unscheduled
 DocType: Employee,Owned,मालकीचे
 DocType: Salary Detail,Depends on Leave Without Pay,वेतन न करता सोडा अवलंबून असते
 DocType: Pricing Rule,"Higher the number, higher the priority","उच्च संख्या, जास्त प्राधान्य"
 ,Purchase Invoice Trends,चलन  खरेदी ट्रेन्ड्स
 DocType: Employee,Better Prospects,उत्तम प्रॉस्पेक्ट
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","पंक्ती # {0}: बॅच {1} फक्त {2} प्रमाण आहे. कृपया {3} प्रमाण उपलब्ध आहे, जे आणखी एक बॅच निवडा किंवा अनेक बॅचेस पासून / वितरीत करण्यासाठी समस्या, अनेक पंक्ती मध्ये सलग विभाजन"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","पंक्ती # {0}: बॅच {1} फक्त {2} प्रमाण आहे. कृपया {3} प्रमाण उपलब्ध आहे, जे आणखी एक बॅच निवडा किंवा अनेक बॅचेस पासून / वितरीत करण्यासाठी समस्या, अनेक पंक्ती मध्ये सलग विभाजन"
 DocType: Vehicle,License Plate,परवाना प्लेट
 DocType: Appraisal,Goals,गोल
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,पीओएस प्रोफाइल निवडा
 DocType: Warranty Claim,Warranty / AMC Status,हमी / जेथे एएमसी स्थिती
 ,Accounts Browser,खाती ब्राउझर
 DocType: Payment Entry Reference,Payment Entry Reference,भरणा प्रवेश संदर्भ
@@ -1614,7 +1645,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,कर्मचारी स्वत: ला तक्रार करू शकत नाही.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","खाते गोठविले तर, नोंदी मर्यादित वापरकर्त्यांना परवानगी आहे."
 DocType: Email Digest,Bank Balance,बँक बॅलन्स
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Accounting प्रवेश  {0}: {1} साठी फक्त चलन {2} मधे केले जाऊ शकते
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Accounting प्रवेश  {0}: {1} साठी फक्त चलन {2} मधे केले जाऊ शकते
 DocType: Job Opening,"Job profile, qualifications required etc.","कामाचे, पात्रता आवश्यक इ"
 DocType: Journal Entry Account,Account Balance,खाते शिल्लक
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,व्यवहार कर नियम.
@@ -1623,8 +1654,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),एकूण कर आणि शुल्क (कंपनी चलन)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,बंद न केलेली आथिर्क वर्षात पी &amp; एल शिल्लक दर्शवा
 DocType: Lab Test Template,Collection Details,संकलन तपशील
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","cP.et_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date पासून टॅबसंनस्क्रिप्शन सीटी, `टॅब्लेट प्रिस्क्रिप्शन` सीपी जेथे ct.patient = &#39;{0}&#39; आणि cp.parent = ct निवडा. नाव आणि cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,शिपिंग खाते
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: खाते {2} निष्क्रिय आहे
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,विक्री आदेश आपण आपले कार्य योजना आणि मदत ऑन वेळ वितरीत करण्यासाठी करा
@@ -1641,7 +1670,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,पॅकिंग स्लिप्स
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,कार्यालय भाडे
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,सेटअप एसएमएस गेटवे सेटिंग
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,आयात अयशस्वी!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,आयात अयशस्वी!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,पत्ते  अद्याप जोडले नाहीत
 DocType: Workstation Working Hour,Workstation Working Hour,वर्कस्टेशन कार्यरत तास
 DocType: Vital Signs,Blood Pressure,रक्तदाब
@@ -1666,7 +1695,7 @@
 DocType: Sales Invoice,Source,स्रोत
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,बंद शो
 DocType: Leave Type,Is Leave Without Pay,पे न करता सोडू आहे
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,मालमत्ता वर्ग मुदत मालमत्ता आयटम अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,मालमत्ता वर्ग मुदत मालमत्ता आयटम अनिवार्य आहे
 DocType: Fee Validity,Fee Validity,फी वैधता
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,भरणा टेबल मधे रेकॉर्ड आढळले नाहीत
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},या {0} संघर्ष {1} साठी {2} {3}
@@ -1687,8 +1716,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,कार्यकारी शोध
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,निष्पन्न तयार करा
 DocType: Maintenance Schedule,Schedules,वेळापत्रक
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,पॉस-ऑफ-सेल वापरण्यासाठी POS प्रोफाईलची आवश्यकता आहे
 DocType: Purchase Invoice Item,Net Amount,निव्वळ रक्कम
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} कारवाई पूर्ण करणे शक्य नाही सबमिट केला गेला नाही
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} कारवाई पूर्ण करणे शक्य नाही सबमिट केला गेला नाही
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM तपशील नाही
 DocType: Landed Cost Voucher,Additional Charges,अतिरिक्त शुल्क
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),अतिरिक्त सवलत रक्कम (कंपनी चलन)
@@ -1697,7 +1727,7 @@
 ,Support Hour Distribution,सहाय्य तास वितरण
 DocType: Maintenance Visit,Maintenance Visit,देखभाल भेट द्या
 DocType: Student,Leaving Certificate Number,प्रमाणपत्र क्रमांक सोडून
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","अपॉइंटमेंट रद्द झालेली, कृपया पुनरावलोकन करा आणि चलन {0} रद्द करा"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","अपॉइंटमेंट रद्द झालेली, कृपया पुनरावलोकन करा आणि चलन {0} रद्द करा"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,वखार मधे उपलब्ध बॅच प्रमाण
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,प्रिंट स्वरूप सुधारणा
 DocType: Landed Cost Voucher,Landed Cost Help,स्थावर खर्च मदत
@@ -1720,8 +1750,8 @@
 DocType: Patient,Tobacco Past Use,तंबाखूच्या मागील वापरा
 DocType: Sales Invoice Item,Brand Name,ब्रँड नाव
 DocType: Purchase Receipt,Transporter Details,वाहतुक तपशील
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},वापरकर्ता {0} आधीपासूनच फिजिशियनला नियुक्त केले आहे {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,मुलभूत कोठार निवडलेले आयटम आवश्यक आहे
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},वापरकर्ता {0} आधीपासूनच फिजिशियनला नियुक्त केले आहे {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,मुलभूत कोठार निवडलेले आयटम आवश्यक आहे
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,बॉक्स
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,शक्य पुरवठादार
 DocType: Budget,Monthly Distribution,मासिक वितरण
@@ -1731,8 +1761,8 @@
 DocType: Sales Partner,Sales Partner Target,विक्री भागीदार लक्ष्य
 DocType: Loan Type,Maximum Loan Amount,कमाल कर्ज रक्कम
 DocType: Pricing Rule,Pricing Rule,किंमत नियम
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},विद्यार्थी रोल नंबर डुप्लिकेट {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},विद्यार्थी रोल नंबर डुप्लिकेट {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},विद्यार्थी रोल नंबर डुप्लिकेट {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},विद्यार्थी रोल नंबर डुप्लिकेट {0}
 DocType: Budget,Action if Annual Budget Exceeded,कृती वार्षिक अर्थसंकल्प ओलांडला तर
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,ऑर्डर खरेदी करण्यासाठी साहित्य विनंती
 DocType: Shopping Cart Settings,Payment Success URL,भरणा यशस्वी URL मध्ये
@@ -1749,7 +1779,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} केवळ एकदा दिसणे आवश्यक आहे
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},पर्चेस ओर्डर {2} विरुद्ध  {0} पेक्षा  {1} अधिक  transfer करण्याची परवानगी नाही
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},रजा यशस्वीरित्या  {0} साठी वाटप केली
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,पॅक करण्यासाठी आयटम नाहीत
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,पॅक करण्यासाठी आयटम नाहीत
 DocType: Shipping Rule Condition,From Value,मूल्य
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,उत्पादन प्रमाण अनिवार्य आहे
 DocType: Employee Loan,Repayment Method,परतफेड पद्धत
@@ -1763,6 +1793,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,शेअर दायित्व
 DocType: Purchase Invoice,Supplier Warehouse,पुरवठादार कोठार
 DocType: Opportunity,Contact Mobile No,संपर्क मोबाइल नाही
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,कंपनी निवडा
 ,Material Requests for which Supplier Quotations are not created,साहित्य विनंत्या  ज्यांच्यासाठी पुरवठादार अवतरणे तयार नाहीत
 DocType: Student Group,Set 0 for no limit,कोणतीही मर्यादा नाही सेट करा 0
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,आपण ज्या दिवशी रजेचे  अर्ज करत आहात  ते दिवस  सुटीचे  आहेत. आपण रजा अर्ज करण्याची गरज नाही.
@@ -1772,24 +1803,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,कोटेशन करा
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,इतर अहवाल
 DocType: Dependent Task,Dependent Task,अवलंबित कार्य
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},रूपांतरण घटक माप मुलभूत युनिट साठी सलग {0} मधे 1 असणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},रूपांतरण घटक माप मुलभूत युनिट साठी सलग {0} मधे 1 असणे आवश्यक आहे
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},{0} प्रकारच्या रजा  {1} पेक्षा  जास्त असू शकत नाही
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,आगाऊ एक्स दिवस ऑपरेशन नियोजन प्रयत्न करा.
 DocType: HR Settings,Stop Birthday Reminders,थांबवा वाढदिवस स्मरणपत्रे
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},कंपनी मध्ये डीफॉल्ट वेतनपट देय खाते सेट करा {0}
 DocType: SMS Center,Receiver List,स्वीकारण्याची  यादी
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,आयटम शोध
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,आयटम शोध
 DocType: Patient Appointment,Referring Physician,संदर्भित फिजिशियन
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,नाश रक्कम
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,रोख निव्वळ बदला
 DocType: Assessment Plan,Grading Scale,प्रतवारी स्केल
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,माप {0} युनिट रुपांतर फॅक्टर टेबलमधे  एका  पेक्षा अधिक प्रविष्ट केले गेले आहे
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,आधीच पूर्ण
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,माप {0} युनिट रुपांतर फॅक्टर टेबलमधे  एका  पेक्षा अधिक प्रविष्ट केले गेले आहे
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,आधीच पूर्ण
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,हातात शेअर
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},भरणा विनंती आधीपासूनच अस्तित्वात {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,जारी आयटम खर्च
 DocType: Physician,Hospital,रूग्णालय
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},प्रमाण {0} पेक्षा  जास्त असू शकत नाही
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},प्रमाण {0} पेक्षा  जास्त असू शकत नाही
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,मागील आर्थिक वर्ष बंद नाही
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),वय (दिवस)
 DocType: Quotation Item,Quotation Item,कोटेशन आयटम
@@ -1800,8 +1831,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,पुरवठादार प्रकार मास्टर.
 DocType: Purchase Order Item,Supplier Part Number,पुरवठादार भाग क्रमांक
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,रूपांतरण दर 0 किंवा 1 असू शकत नाही
-DocType: Sales Invoice,Reference Document,संदर्भ दस्तऐवज
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} हे रद्द किंवा बंद आहे
+DocType: Subscription,Reference Document,संदर्भ दस्तऐवज
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} हे रद्द किंवा बंद आहे
 DocType: Accounts Settings,Credit Controller,क्रेडिट कंट्रोलर
 DocType: Delivery Note,Vehicle Dispatch Date,वाहन खलिता तारीख
 DocType: Healthcare Settings,Default Medical Code Standard,डीफॉल्ट मेडिकल कोड मानक
@@ -1810,6 +1841,7 @@
 DocType: Company,Default Payable Account,मुलभूत देय खाते
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","जसे शिपिंग नियम, किंमत सूची इत्यादी ऑनलाइन शॉपिंग कार्ट सेटिंग्ज"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% बिल
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,किंमतानुसार क्रमवारी लावा ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,राखीव Qty
 DocType: Party Account,Party Account,पार्टी खाते
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,मानव संसाधन
@@ -1821,13 +1853,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,वितरण प्रवेश करा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,सलग  {0}: पुरवठादाराविरुद्ध  आगाऊ डेबिट करणे आवश्यक आहे
 DocType: Company,Default Values,मुलभूत मुल्य
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{वारंवारता} डायजेस्ट
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{वारंवारता} डायजेस्ट
 DocType: Expense Claim,Total Amount Reimbursed,एकूण रक्कम परत देऊन
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,हे या वाहन विरुद्ध नोंदी आधारित आहे. तपशीलासाठी खालील टाइमलाइन पाहू
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},पुरवठादार विरुद्ध चलन {0} दिनांक {1}
 DocType: Customer,Default Price List,मुलभूत दर सूची
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,मालमत्ता चळवळ रेकॉर्ड {0} तयार
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,आपण हटवू शकत नाही आर्थिक वर्ष {0}. आर्थिक वर्ष {0} वैश्विक सेटिंग्ज मध्ये डीफॉल्ट म्हणून सेट केले आहे
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,त्याच नावासह असलेले ग्राहक आधीपासून अस्तित्वात आहे
 DocType: Journal Entry,Entry Type,प्रवेश प्रकार
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,मूल्यांकन योजना या मूल्यांकन गट जोडले
 ,Customer Credit Balance,ग्राहक क्रेडिट शिल्लक
@@ -1838,7 +1871,7 @@
 DocType: Quotation,Term Details,मुदत तपशील
 DocType: Project,Total Sales Cost (via Sales Order),एकूण विक्री मूल्य (विक्री ऑर्डर द्वारे)
 DocType: Project,Total Sales Cost (via Sales Order),एकूण विक्री मूल्य (विक्री ऑर्डर द्वारे)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,{0} विद्यार्थी या विद्यार्थी गट जास्त नोंदणी करु शकत नाही.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,{0} विद्यार्थी या विद्यार्थी गट जास्त नोंदणी करु शकत नाही.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,लीड संख्या
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,लीड संख्या
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 पेक्षा जास्त असणे आवश्यक आहे
@@ -1856,9 +1889,11 @@
 DocType: Lab Test,Technician Name,तंत्रज्ञानाचे नाव
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,चलन रद्द देयक दुवा रद्द करा
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},प्रवेश चालू ओडोमीटर वाचन प्रारंभिक वाहन ओडोमीटर अधिक असावे {0}
+DocType: Restaurant Reservation,No Show,शो नाही
 DocType: Shipping Rule Country,Shipping Rule Country,शिपिंग नियम देश
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,सोडा आणि विधान परिषदेच्या
 DocType: Maintenance Visit,Partially Completed,अंशत: पूर्ण
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,मध्यम संवेदनाक्षमता
 DocType: Leave Type,Include holidays within leaves as leaves,leaves म्हणून leaves मध्ये सुट्ट्यांचा सामावेश करा
 DocType: Sales Invoice,Packed Items,पॅक केलेला आयटम
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,सिरियल क्रमांका  विरुद्ध हमी दावा
@@ -1875,13 +1910,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),पेड रक्कम (कंपनी चलन)
 DocType: Purchase Invoice,Additional Discount,अतिरिक्त सवलत
 DocType: Selling Settings,Selling Settings,सेटिंग्ज विक्री
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,अॅक्शनची पुष्टी करा
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ऑनलाइन लिलाव
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,कृपया प्रमाण किंवा मूल्यांकन दर किंवा दोन्ही निर्दिष्ट करा
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,पूर्ण
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,टाका पहा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,विपणन खर्च
 ,Item Shortage Report,आयटम कमतरता अहवाल
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","वजनाचा उल्लेख आहे \ n कृपया खूप ""वजन UOM"" उल्लेख करा"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","वजनाचा उल्लेख आहे \ n कृपया खूप ""वजन UOM"" उल्लेख करा"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,साहित्य विनंती या शेअर नोंद करण्यासाठी   वापरले
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,पुढील घसारा तारीख नवीन मालमत्ता अनिवार्य आहे
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,प्रत्येक बॅच स्वतंत्र अभ्यासक्रम आधारित गट
@@ -1894,12 +1930,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,प्रत्येक स्टॉक चळवळीसाठी  Accounting प्रवेश करा
 DocType: Leave Allocation,Total Leaves Allocated,एकूण रजा  वाटप
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},रो क्रमांक  {0} साठी  आवश्यक कोठार
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,वैध आर्थिक वर्ष प्रारंभ आणि समाप्त  तारखा प्रविष्ट करा
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,वैध आर्थिक वर्ष प्रारंभ आणि समाप्त  तारखा प्रविष्ट करा
 DocType: Employee,Date Of Retirement,निवृत्ती तारीख
 DocType: Upload Attendance,Get Template,साचा मिळवा
 DocType: Material Request,Transferred,हस्तांतरित
 DocType: Vehicle,Doors,दारे
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext सेटअप पूर्ण!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext सेटअप पूर्ण!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,रुग्णांच्या नोंदणीसाठी फी गोळा करणे
 DocType: Course Assessment Criteria,Weightage,वजन
 DocType: Purchase Invoice,Tax Breakup,कर चित्रपटाने
@@ -1918,37 +1954,37 @@
 DocType: Employee,AB+,अब्राहम +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","या आयटमला  रूपे आहेत, तर तो विक्री आदेश इ मध्ये निवडला जाऊ शकत नाही"
 DocType: Lead,Next Contact By,पुढील संपर्क
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},सलग  {1}  मधे आयटम {0}   साठी आवश्यक त्या प्रमाणात
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},सलग  {1}  मधे आयटम {0}   साठी आवश्यक त्या प्रमाणात
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},प्रमाण आयटम विद्यमान म्हणून कोठार {0} हटविले जाऊ शकत नाही {1}
 DocType: Quotation,Order Type,ऑर्डर प्रकार
-DocType: Purchase Invoice,Notification Email Address,सूचना ई-मेल पत्ता
 ,Item-wise Sales Register,आयटमनूसार विक्री नोंदणी
 DocType: Asset,Gross Purchase Amount,एकूण खरेदी रक्कम
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,उघडणे बाकी
 DocType: Asset,Depreciation Method,घसारा पद्धत
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,ऑफलाइन
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,ऑफलाइन
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,हा कर बेसिक रेट मध्ये समाविष्ट केला आहे का ?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,एकूण लक्ष्य
 DocType: Job Applicant,Applicant for a Job,नोकरी साठी अर्जदार
 DocType: Production Plan Material Request,Production Plan Material Request,उत्पादन योजना साहित्य विनंती
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,उत्पादन आदेश तयार केला नाही
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,उत्पादन आदेश तयार केला नाही
 DocType: Stock Reconciliation,Reconciliation JSON,मेळ JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,बरेच स्तंभ. अहवाल निर्यात करा आणि एक स्प्रेडशीट अनुप्रयोग वापरून मुद्रित करा.
 DocType: Purchase Invoice Item,Batch No,बॅच नाही
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},अवतरणासाठी विनंती: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,एक ग्राहक पर्चेस विरुद्ध अनेक विक्री आदशची परवानगी द्या
 DocType: Student Group Instructor,Student Group Instructor,विद्यार्थी गट प्रशिक्षक
 DocType: Student Group Instructor,Student Group Instructor,विद्यार्थी गट प्रशिक्षक
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 मोबाइल नं
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,मुख्य
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,मुख्य
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,जिच्यामध्ये variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,तुमचा व्यवहार वर मालिका संख्या सेट पूर्वपद
 DocType: Employee Attendance Tool,Employees HTML,कर्मचारी एचटीएमएल
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,मुलभूत BOM ({0}) या आयटम किंवा त्याच्या साचा सक्रिय असणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,मुलभूत BOM ({0}) या आयटम किंवा त्याच्या साचा सक्रिय असणे आवश्यक आहे
 DocType: Employee,Leave Encashed?,रजा  मिळविता?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,field पासून संधी अनिवार्य आहे
 DocType: Email Digest,Annual Expenses,वार्षिक खर्च
 DocType: Item,Variants,रूपे
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,खरेदी ऑर्डर करा
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,खरेदी ऑर्डर करा
 DocType: SMS Center,Send To,पाठवा
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},रजा प्रकार {0} साठी पुरेशी रजा शिल्लक नाही
 DocType: Payment Reconciliation Payment,Allocated amount,रक्कम
@@ -1966,6 +2002,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,विद्यार्थी गट शक्ती
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,जर्नल विरुद्ध प्रवेश {0} कोणत्याही न जुळणारी {1} नोंद नाही
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,त्यावेळच्या
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,प्रशिक्षण कार्यक्रम
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},आयटम  {0} साठी  डुप्लिकेट सिरियल क्रमांक प्रविष्ट केला नाही
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,एक शिपिंग नियम एक अट
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,प्रविष्ट करा
@@ -1975,7 +2012,7 @@
 DocType: Sales Order,To Deliver and Bill,वितरीत आणि बिल
 DocType: Student Group,Instructors,शिक्षक
 DocType: GL Entry,Credit Amount in Account Currency,खाते चलनातील  क्रेडिट रक्कम
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} सादर करणे आवश्यक आहे
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} सादर करणे आवश्यक आहे
 DocType: Authorization Control,Authorization Control,प्राधिकृत नियंत्रण
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},रो # {0}: नाकारलेले वखार नाकारले आयटम विरुद्ध अनिवार्य आहे {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,भरणा
@@ -1994,11 +2031,11 @@
 DocType: Quotation Item,Actual Qty,वास्तविक Qty
 DocType: Sales Invoice Item,References,संदर्भ
 DocType: Quality Inspection Reading,Reading 10,10 वाचन
-DocType: Hub Settings,Hub Node,हब नोड
+DocType: Hub Category,Hub Node,हब नोड
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,आपण ड्युप्लिकेट आयटम केला आहे. कृपया सरळ आणि पुन्हा प्रयत्न करा.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,सहकारी
 DocType: Asset Movement,Asset Movement,मालमत्ता चळवळ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,नवीन टाका
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,नवीन टाका
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} आयटम सिरीयलाइज आयटम नाही
 DocType: SMS Center,Create Receiver List,स्वीकारणारा यादी तयार करा
 DocType: Vehicle,Wheels,रणधुमाळी
@@ -2012,15 +2049,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,दूरसंचार
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),पॅकेज वितरण (फक्त मसुदा) एक भाग आहे असे दर्शवले
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,भरणा प्रवेश करा
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},आयटम  {0} साठी  प्रमाण  {1} पेक्षा कमी असणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},आयटम  {0} साठी  प्रमाण  {1} पेक्षा कमी असणे आवश्यक आहे
 ,Sales Invoice Trends,विक्री चलन ट्रेन्ड
 DocType: Leave Application,Apply / Approve Leaves,सुट्या  मंजूर / लागू करा
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,साठी
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,साठी
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total','मागील पंक्ती एकूण' किंवा 'मागील पंक्ती रकमेवर' शुल्क प्रकार असेल तर सलग पाहू  शकता
 DocType: Sales Order Item,Delivery Warehouse,डिलिव्हरी कोठार
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,आर्थिक खर्च केंद्रे Tree.
 DocType: Serial No,Delivery Document No,डिलिव्हरी दस्तऐवज क्रमांक
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},कंपनी मध्ये &#39;लाभ / तोटा लेखा मालमत्ता विल्हेवाट वर&#39; सेट करा {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},कंपनी मध्ये &#39;लाभ / तोटा लेखा मालमत्ता विल्हेवाट वर&#39; सेट करा {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,खरेदी पावत्यांचे आयटम मिळवा
 DocType: Serial No,Creation Date,तयार केल्याची तारीख
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},आयटम {0}  किंमत यादी  {1} मध्ये अनेक वेळा आढळतो
@@ -2031,12 +2068,13 @@
 DocType: Student,Student Mobile Number,विद्यार्थी मोबाइल क्रमांक
 DocType: Item,Has Variants,रूपे आहेत
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,प्रतिसाद अद्यतनित करा
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},आपण आधीच आयटम निवडले आहेत {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},आपण आधीच आयटम निवडले आहेत {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,मासिक वितरण नाव
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,बॅच आयडी आवश्यक आहे
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,बॅच आयडी आवश्यक आहे
 DocType: Sales Person,Parent Sales Person,पालक विक्री व्यक्ती
-DocType: Purchase Invoice,Recurring Invoice,आवर्ती चलन
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,उच्च ते कमी
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,प्रथम कार्यक्रम निवडा
 DocType: Patient Appointment,Patient Age,रुग्ण वय
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,प्रकल्प व्यवस्थापकीय
 DocType: Supplier,Supplier of Goods or Services.,वस्तू किंवा सेवा पुरवठादार.
@@ -2044,8 +2082,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,परामर्श शुल्क बुक करण्यासाठी रुग्णांमध्ये सेट न केल्यास डिफॉल्ट प्राप्य खाते.
 DocType: Vehicle Log,Fuel Price,इंधन किंमत
 DocType: Budget,Budget,अर्थसंकल्प
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,उघडा सेट करा
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,मुदत मालमत्ता आयटम नॉन-स्टॉक आयटम असणे आवश्यक आहे.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,उघडा सेट करा
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,मुदत मालमत्ता आयटम नॉन-स्टॉक आयटम असणे आवश्यक आहे.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",प्राप्तिकर किंवा खर्च खाते नाही म्हणून बजेट विरुद्ध {0} नियुक्त केले जाऊ शकत नाही
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,साध्य
 DocType: Student Admission,Application Form Route,अर्ज मार्ग
@@ -2059,12 +2097,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,आयटम {0} सिरियल क्रमांकासाठी  सेटअप नाही. आयटम मास्टर तपासा
 DocType: Maintenance Visit,Maintenance Time,देखभाल वेळ
 ,Amount to Deliver,रक्कम वितरीत करण्यासाठी
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},समान आयटम अनेक वेळा प्रविष्ट केले गेले आहे. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,मुदत प्रारंभ तारीख मुदत लिंक आहे शैक्षणिक वर्ष वर्ष प्रारंभ तारीख पूर्वी पेक्षा असू शकत नाही (शैक्षणिक वर्ष {}). तारखा दुरुस्त करा आणि पुन्हा प्रयत्न करा.
 DocType: Guardian,Guardian Interests,पालक छंद
 DocType: Naming Series,Current Value,वर्तमान मूल्य
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,अनेक आर्थिक वर्षांमध्ये तारीख {0} अस्तित्वात. आर्थिक वर्ष कंपनी सेट करा
 DocType: School Settings,Instructor Records to be created by,द्वारे तयार करण्यासाठी शिक्षक रेकॉर्ड
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} तयार
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} तयार
 DocType: Delivery Note Item,Against Sales Order,विक्री आदेशा
 ,Serial No Status,सिरियल क्रमांक स्थिती
 DocType: Payment Entry Reference,Outstanding,शिल्लक
@@ -2074,10 +2113,10 @@
 						must be greater than or equal to {2}","रो {0}: {1} periodicity सेट करण्यासाठी , पासून आणि पर्यंत  तारीख \ दरम्यानचा  फरक {2} पेक्षा मोठे किंवा समान असणे आवश्यक आहे"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,हा स्टॉक चळवळ आधारित आहे. पहा {0} तपशील
 DocType: Pricing Rule,Selling,विक्री
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},रक्कम {0} {1} विरुद्ध वजा {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},रक्कम {0} {1} विरुद्ध वजा {2}
 DocType: Employee,Salary Information,पगार माहिती
 DocType: Sales Person,Name and Employee ID,नाव आणि कर्मचारी आयडी
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,देय तारीख  पोस्ट करण्यापूर्वीची  तारीख असू शकत नाही
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,देय तारीख  पोस्ट करण्यापूर्वीची  तारीख असू शकत नाही
 DocType: Website Item Group,Website Item Group,वेबसाइट आयटम गट
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,कर आणि कर्तव्ये
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,संदर्भ तारीख प्रविष्ट करा
@@ -2103,7 +2142,7 @@
 DocType: Issue,Resolution Details,ठराव तपशील
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,वाटप
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,स्वीकृती निकष
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,वरील टेबलमधे  साहित्य विनंत्या प्रविष्ट करा
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,वरील टेबलमधे  साहित्य विनंत्या प्रविष्ट करा
 DocType: Item Attribute,Attribute Name,विशेषता नाव
 DocType: BOM,Show In Website,वेबसाइट मध्ये दर्शवा
 DocType: Shopping Cart Settings,Show Quantity in Website,वेबसाइट मध्ये प्रमाण दर्शवा
@@ -2112,7 +2151,7 @@
 DocType: Item Reorder,Check in (group),चेक इन (गट)
 ,Qty to Order,मागणी करण्यासाठी  Qty
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","दायित्व किंवा इक्विटी अंतर्गत खाते डोके, आणि नफा / तोटा गुन्हा दाखल होणार"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,सर्व कार्ये Gantt चार्ट.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,सर्व कार्ये Gantt चार्ट.
 DocType: Opportunity,Mins to First Response,प्रथम प्रतिसाद मि
 DocType: Pricing Rule,Margin Type,मार्जिन प्रकार
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} तास
@@ -2134,36 +2173,36 @@
 DocType: Patient,Surgical History,सर्जिकल इतिहास
 DocType: Employee,Resignation Letter Date,राजीनामा तारीख
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,किंमत नियमांना   पुढील प्रमाणावर आधारित फिल्टर आहेत.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},कर्मचारी सामील तारीख सेट करा {0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},कर्मचारी सामील तारीख सेट करा {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},कर्मचारी सामील तारीख सेट करा {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},कर्मचारी सामील तारीख सेट करा {0}
 DocType: Task,Total Billing Amount (via Time Sheet),एकूण बिलिंग रक्कम (वेळ पत्रक द्वारे)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ग्राहक महसूल पुन्हा करा
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) 'खर्च मंजूर' भूमिका असणे आवश्यक आहे
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,जोडी
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,उत्पादन BOM आणि प्रमाण निवडा
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,उत्पादन BOM आणि प्रमाण निवडा
 DocType: Asset,Depreciation Schedule,घसारा वेळापत्रक
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,विक्री भागीदार पत्ते आणि संपर्क
 DocType: Bank Reconciliation Detail,Against Account,खाते विरुद्ध
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,अर्धा दिवस तारीख पासून आणि तारिक करण्यासाठी दरम्यान असावे
 DocType: Maintenance Schedule Detail,Actual Date,वास्तविक तारीख
 DocType: Item,Has Batch No,बॅच नाही आहे
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},वार्षिक बिलिंग: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},वार्षिक बिलिंग: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),वस्तू आणि सेवा कर (जीएसटी भारत)
 DocType: Delivery Note,Excise Page Number,अबकारी पृष्ठ क्रमांक
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","कंपनी, तारीख पासून आणि तारिक करणे बंधनकारक आहे"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,सल्ला मधून मिळवा
 DocType: Asset,Purchase Date,खरेदी दिनांक
 DocType: Employee,Personal Details,वैयक्तिक माहिती
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},कंपनी मध्ये &#39;मालमत्ता घसारा खर्च केंद्र&#39; सेट करा {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},कंपनी मध्ये &#39;मालमत्ता घसारा खर्च केंद्र&#39; सेट करा {0}
 ,Maintenance Schedules,देखभाल वेळापत्रक
 DocType: Task,Actual End Date (via Time Sheet),प्रत्यक्ष समाप्ती तारीख (वेळ पत्रक द्वारे)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},रक्कम {0} {1} विरुद्ध {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},रक्कम {0} {1} विरुद्ध {2} {3}
 ,Quotation Trends,कोटेशन ट्रेन्ड
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},आयटम गट आयटम मास्त्रे साठी आयटम  {0} मधे  नमूद केलेला नाही
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,खात्यात डेबिट एक प्राप्तीयोग्य खाते असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,खात्यात डेबिट एक प्राप्तीयोग्य खाते असणे आवश्यक आहे
 DocType: Shipping Rule Condition,Shipping Amount,शिपिंग रक्कम
 DocType: Supplier Scorecard Period,Period Score,कालावधी स्कोअर
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,ग्राहक जोडा
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,ग्राहक जोडा
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,प्रलंबित रक्कम
 DocType: Lab Test Template,Special,विशेष
 DocType: Purchase Invoice Item,Conversion Factor,रूपांतरण फॅक्टर
@@ -2171,13 +2210,14 @@
 ,Vehicle Expenses,वाहन खर्च
 DocType: Serial No,Invoice Details,चलन तपशील
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},उपयुक्त जीवन नंतर अपेक्षित मूल्य पेक्षा मोठे किंवा समान असणे आवश्यक आहे {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,सुरु करा
+DocType: Hub Category,Hub Category,हब श्रेणी
 DocType: Purchase Invoice,SEZ,सेझ
 DocType: Purchase Receipt,Vehicle Number,वाहन क्रमांक
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,आवर्ती अशी यादी तयार करणे बंद होणार तारीख
 DocType: Employee Loan,Loan Amount,कर्ज रक्कम
 DocType: Program Enrollment,Self-Driving Vehicle,-ड्राव्हिंग वाहन
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,पुरवठादार धावसंख्याकार्ड उभे राहणे
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},पंक्ती {0}: सामग्रीचा बिल आयटम आढळले नाही {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},पंक्ती {0}: सामग्रीचा बिल आयटम आढळले नाही {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,एकूण वाटप पाने {0} कालावधीसाठी यापूर्वीच मान्यता देण्यात आलेल्या रजा{1} पेक्षा   कमी असू शकत नाही
 DocType: Journal Entry,Accounts Receivable,प्राप्तीयोग्य खाते
 ,Supplier-Wise Sales Analytics,पुरवठादार-नुसार  विक्री विश्लेषण
@@ -2189,7 +2229,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)",पालक कोर्स (रिक्त सोडा या पालक कोर्स भाग नाही तर)
 DocType: Leave Control Panel,Leave blank if considered for all employee types,सर्व कर्मचारी  प्रकारासाठी विचारले तर रिक्त सोडा
 DocType: Landed Cost Voucher,Distribute Charges Based On,वितरण शुल्क आधारित
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,एचआर सेटिंग्ज
 DocType: Salary Slip,net pay info,निव्वळ वेतन माहिती
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,हे मूल्य डीफॉल्ट विक्री किंमत सूचीमध्ये अद्यतनित केले आहे.
@@ -2200,7 +2240,7 @@
 DocType: Patient,B Positive,ब सकारात्मक
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","सलग # {0}: प्रमाण 1, आयटम निश्चित मालमत्ता आहे असणे आवश्यक आहे. कृपया एकाधिक प्रमाण स्वतंत्र सलग वापरा."
 DocType: Leave Block List Allow,Leave Block List Allow,रजा ब्लॉक यादी परवानगी द्या
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr रिक्त किंवा जागा असू शकत नाही
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr रिक्त किंवा जागा असू शकत नाही
 DocType: Patient Medical Record,Patient Medical Record,पेशंट मेडिकल रेकॉर्ड
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,गट  पासून नॉन-गट पर्यंत
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,क्रीडा
@@ -2217,9 +2257,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,विनिमय दर शोधण्यात अक्षम {0} करण्यासाठी {1} की तारीख {2}. स्वतः एक चलन विनिमय रेकॉर्ड तयार करा
 DocType: POS Profile,Price List,किंमत सूची
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} मुलभूत आर्थिक वर्ष आहे. बदल प्रभावाखाली येण्यासाठी आपल्या ब्राउझर रीफ्रेश करा.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,खर्च दावे
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,खर्च दावे
 DocType: Issue,Support,समर्थन
 ,BOM Search,BOM शोध
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",या गोदामात उपलब्ध स्टॉकवर आधारित &quot;स्टॉकमध्ये&quot; किंवा &quot;स्टॉक इन नॉन&quot; हबवर प्रकाशित करा.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),बंद (उघडत+ एकूण )
 DocType: Vehicle,Fuel Type,इंधन प्रकार
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,कृपया कंपनीतील  चलन निर्दिष्ट करा
@@ -2231,16 +2272,16 @@
 DocType: Healthcare Settings,Remind Before,आधी स्मरण द्या
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM रुपांतर घटक सलग  {0} मधे आवश्यक आहे
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","सलग # {0}: संदर्भ दस्तऐवज प्रकार विक्री ऑर्डर एक, विक्री चलन किंवा जर्नल प्रवेश असणे आवश्यक आहे"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","सलग # {0}: संदर्भ दस्तऐवज प्रकार विक्री ऑर्डर एक, विक्री चलन किंवा जर्नल प्रवेश असणे आवश्यक आहे"
 DocType: Salary Component,Deduction,कपात
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,सलग {0}: पासून वेळ आणि वेळ करणे बंधनकारक आहे.
 DocType: Stock Reconciliation Item,Amount Difference,रक्कम फरक
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},किंमत यादी  {1} मध्ये आयटम किंमत  {0} साठी जोडली आहे
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},किंमत यादी  {1} मध्ये आयटम किंमत  {0} साठी जोडली आहे
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,या विक्री व्यक्तीसाठी  कर्मचारी आयडी प्रविष्ट करा
 DocType: Territory,Classification of Customers by region,प्रदेशानुसार ग्राहक वर्गीकरण
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,फरक रक्कम शून्य असणे आवश्यक आहे
 DocType: Project,Gross Margin,एकूण मार्जिन
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,पहिले  उत्पादन आयटम प्रविष्ट करा
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,पहिले  उत्पादन आयटम प्रविष्ट करा
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,गणिती बँक स्टेटमेंट शिल्लक
 DocType: Normal Test Template,Normal Test Template,सामान्य टेस्ट टेम्पलेट
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,अक्षम वापरकर्ता
@@ -2250,21 +2291,22 @@
 DocType: Salary Slip,Total Deduction,एकूण कपात
 ,Production Analytics,उत्पादन विश्लेषण
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,हे या पेशंटच्या व्यवहारावर आधारित आहे. तपशीलासाठी खाली टाइमलाइन पहा
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,खर्च अद्यतनित
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,खर्च अद्यतनित
 DocType: Employee,Date of Birth,जन्म तारीख
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,आयटम {0} आधीच परत आला  आहे
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**आर्थिक वर्ष** एक आर्थिक वर्ष प्रस्तुत करते. सर्व लेखा नोंदणी व इतर प्रमुख व्यवहार **आर्थिक वर्ष** विरुद्ध नियंत्रीत केले जाते.
 DocType: Opportunity,Customer / Lead Address,ग्राहक / लीड पत्ता
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,पुरवठादार धावसंख्याकार्ड सेटअप
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},चेतावणी: जोड वर अवैध SSL प्रमाणपत्र {0}
-DocType: Student Admission,Eligibility,पात्रता
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,मूल्यांकन योजना नाव
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},चेतावणी: जोड वर अवैध SSL प्रमाणपत्र {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","निष्पन्न आपल्याला प्राप्त व्यवसाय, आपल्या निष्पन्न म्हणून सर्व आपले संपर्क जोडू शकता आणि अधिक मदत"
 DocType: Production Order Operation,Actual Operation Time,वास्तविक ऑपरेशन वेळ
 DocType: Authorization Rule,Applicable To (User),लागू करण्यासाठी (सदस्य)
 DocType: Purchase Taxes and Charges,Deduct,वजा
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,कामाचे वर्णन
 DocType: Student Applicant,Applied,लागू
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,पुन्हा उघडा
 DocType: Sales Invoice Item,Qty as per Stock UOM,Qty शेअर UOM नुसार
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 नाव
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","वगळता विशेष वर्ण &quot;-&quot; &quot;.&quot;, &quot;#&quot;, आणि &quot;/&quot; मालिका म्हणण्यापर्यंत परवानगी नाही"
@@ -2276,7 +2318,7 @@
 DocType: Request for Quotation,Manufacturing Manager,उत्पादन व्यवस्थापक
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},सिरियल क्रमांक {0} हा  {1} पर्यंत हमी अंतर्गत आहे
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,वितरण टीप  मधे संकुल मधे  Split करा .
-apps/erpnext/erpnext/hooks.py +98,Shipments,निर्यात
+apps/erpnext/erpnext/hooks.py +107,Shipments,निर्यात
 DocType: Payment Entry,Total Allocated Amount (Company Currency),एकूण रक्कम (कंपनी चलन)
 DocType: Purchase Order Item,To be delivered to customer,ग्राहकाला वितरित करणे
 DocType: BOM,Scrap Material Cost,स्क्रॅप साहित्य खर्च
@@ -2299,8 +2341,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,आयटम वेरिएंट सेटिंग्ज
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,कंपनी निवडा ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,सर्व विभागांसाठी विचारल्यास रिक्त सोडा
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","रोजगार प्रकार (कायम, करार, हद्दीच्या इ)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} हा आयटम {1} साठी अनिवार्य आहे
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","रोजगार प्रकार (कायम, करार, हद्दीच्या इ)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} हा आयटम {1} साठी अनिवार्य आहे
 DocType: Process Payroll,Fortnightly,पाक्षिक
 DocType: Currency Exchange,From Currency,चलन पासून
 DocType: Vital Signs,Weight (In Kilogram),वजन (किलोग्रॅममध्ये)
@@ -2325,7 +2367,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,वेळापत्रक प्राप्त करण्यासाठी &#39;व्युत्पन्न वेळापत्रक&#39; वर क्लिक करा
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,खालील वेळापत्रक हटवताना त्रुटी होत्या:
 DocType: Bin,Ordered Quantity,आदेश दिलेले प्रमाण
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","उदा ""बांधकाम व्यावसायिकांसाठी  बिल्ड साधने """
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","उदा ""बांधकाम व्यावसायिकांसाठी  बिल्ड साधने """
 DocType: Grading Scale,Grading Scale Intervals,प्रतवारी स्केल मध्यांतरे
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {2} एकट्या प्रवेशाचे फक्त चलनात केले जाऊ शकते: {3}
 DocType: Production Order,In Process,प्रक्रिया मध्ये
@@ -2349,11 +2391,10 @@
 DocType: Purchase Invoice,With Payment of Tax,कराचा भरणा सह
 DocType: Expense Claim Detail,Expense Claim Detail,खर्च हक्क तपशील
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,पुरवठादार साठी तिप्पट
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,कृपया  योग्य खाते निवडा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,कृपया  योग्य खाते निवडा
 DocType: Item,Weight UOM,वजन UOM
 DocType: Salary Structure Employee,Salary Structure Employee,पगार संरचना कर्मचारी
 DocType: Patient,Blood Group,रक्त गट
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,प्रलंबित
 DocType: Course,Course Name,अर्थातच नाव
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,जे वापरकर्ते विशिष्ट कर्मचारी सुट्टीच्या अनुप्रयोग मंजूर करू शकता
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,कार्यालय उपकरणे
@@ -2372,7 +2413,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,दर सूची सेट केले नसल्यास दर दर्शविली जाणार नाही
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,या शिपिंग नियमासाठी देश निर्दिष्ट करा किंवा जगभरातील शिपिंग तपासा
 DocType: Stock Entry,Total Incoming Value,एकूण येणारी  मूल्य
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,डेबिट करणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,डेबिट करणे आवश्यक आहे
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets आपला संघ केले activites साठी वेळ, खर्च आणि बिलिंग ट्रॅक ठेवण्यात मदत"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,खरेदी दर सूची
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,सप्लायर स्कोअरकार्ड व्हेरिएबल्सचे टेम्पलेट
@@ -2382,7 +2423,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,भरणा मेळ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,कृपया  पहिले प्रभारी व्यक्तीचे नाव निवडा
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,तंत्रज्ञान
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},एकूण न चुकता: {0}
+DocType: Hub Settings,Unregister from Hub,हबपासून नोंदणी रद्द करा
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},एकूण न चुकता: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM वेबसाइट ऑपरेशन
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,ऑफर पत्र
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,साहित्य विनंत्या (एमआरपी) आणि उत्पादन आदेश व्युत्पन्न.
@@ -2394,7 +2436,9 @@
 DocType: Physician Schedule Time Slot,To Time,वेळ
 DocType: Authorization Rule,Approving Role (above authorized value),(अधिकृत मूल्य वरील) भूमिका मंजूर
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,क्रेडिट खाते देय खाते असणे आवश्यक आहे
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} पालक किंवा मुलाला होऊ शकत नाही {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,कृपया विद्यार्थी प्रवेश निवडा जे सशुल्क विद्यार्थ्यासाठी अनिवार्य आहे
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} पालक किंवा मुलाला होऊ शकत नाही {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,किंमत प्रकाशित करण्यासाठी कृपया एक किंमत सूची निवडा
 DocType: Production Order Operation,Completed Qty,पूर्ण झालेली  Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","{0}, फक्त डेबिट खाती दुसरे क्रेडिट नोंदणी लिंक जाऊ शकते"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,किंमत सूची {0} अक्षम आहे
@@ -2407,39 +2451,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} सिरिअल क्रमांक हा आयटम {1} साठी आवश्यक आहे. आपल्याला {2} प्रदान केलेल्या आहेत
 DocType: Stock Reconciliation Item,Current Valuation Rate,वर्तमान मूल्यांकन दर
 DocType: Item,Customer Item Codes,ग्राहक आयटम कोड
+DocType: Training Event,Advance,प्रगती
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,पुन्हा आवर्ती करण्यासाठी
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,विनिमय लाभ / कमी होणे
 DocType: Opportunity,Lost Reason,कारण गमावले
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,नवीन पत्ता
 DocType: Quality Inspection,Sample Size,नमुना आकार
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,पावती दस्तऐवज प्रविष्ट करा
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,सर्व आयटम आधीच invoiced आहेत
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;प्रकरण क्रमांक पासून&#39; एक वैध निर्दिष्ट करा
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',&#39;प्रकरण क्रमांक पासून&#39; एक वैध निर्दिष्ट करा
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,पुढील खर्च केंद्रे गट अंतर्गत केले जाऊ शकते पण नोंदी नॉन-गट करू शकता
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,वापरकर्ते आणि परवानग्या
 DocType: Vehicle Log,VLOG.,व्हिलॉग.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},उत्पादन आदेश तयार केलेले: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},उत्पादन आदेश तयार केलेले: {0}
 DocType: Branch,Branch,शाखा
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,मुद्रण आणि ब्रांडिंग
 DocType: Company,Total Monthly Sales,एकूण मासिक विक्री
 DocType: Bin,Actual Quantity,वास्तविक प्रमाण
 DocType: Shipping Rule,example: Next Day Shipping,उदाहरण: पुढील दिवस शिपिंग
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,सिरियल क्रमांक {0} आढळला  नाही
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},सदस्यता {0} झाली आहे
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},सदस्यता {0} झाली आहे
 DocType: Fee Schedule Program,Fee Schedule Program,फी अनुसूची कार्यक्रम
 DocType: Fee Schedule Program,Student Batch,विद्यार्थी बॅच
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,* टॅब्लेट व्हॅल्यूशन्स &#39;मधून * निवडा जेथे रुग्ण =&#39; {0} &#39;क्रमाने संकेत_संख्या मर्यादा 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,विद्यार्थी करा
 DocType: Supplier Scorecard Scoring Standing,Min Grade,किमान ग्रेड
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},आपण प्रकल्प सहयोग करण्यासाठी आमंत्रित आहेत: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},चिकित्सक {0} वर उपलब्ध नाही
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},आपण प्रकल्प सहयोग करण्यासाठी आमंत्रित आहेत: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},चिकित्सक {0} वर उपलब्ध नाही
 DocType: Leave Block List Date,Block Date,ब्लॉक तारीख
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Doctype {0} मध्ये सानुकूल फील्ड सदस्यता आयडी जोडा
 DocType: Purchase Receipt,Supplier Delivery Note,पुरवठादार वितरण टीप
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,आता लागू
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,आता लागू
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},वास्तविक प्रमाण {0} / प्रतिक्षा प्रमाण {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},वास्तविक प्रमाण {0} / प्रतिक्षा प्रमाण {1}
 DocType: Purchase Invoice,E-commerce GSTIN,ई-कॉमर्स GSTIN
 DocType: Sales Order,Not Delivered,वितरित नाही
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,अपेक्षित तारीख व्यवहार तारीख आधी असू शकत नाही
 ,Bank Clearance Summary,बँक लाभ सारांश
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","दैनंदिन, साप्ताहिक आणि मासिक ईमेल digests तयार करा आणि व्यवस्थापित करा."
 DocType: Appraisal Goal,Appraisal Goal,मूल्यांकन लक्ष्य
@@ -2447,12 +2492,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,इमारती
 DocType: Fee Schedule,Fee Structure,फी
 DocType: Timesheet Detail,Costing Amount,भांडवलाच्या रक्कम
-DocType: Student Admission,Application Fee,अर्ज फी
+DocType: Student Admission Program,Application Fee,अर्ज फी
 DocType: Process Payroll,Submit Salary Slip,पगाराच्या स्लिप्स सादर करा
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,आयटम {0}  साठी Maxiumm सवलत  {1}% आहे
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,आयटम {0}  साठी Maxiumm सवलत  {1}% आहे
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,मोठ्या प्रमाणात आयात
 DocType: Sales Partner,Address & Contacts,पत्ता आणि संपर्क
 DocType: SMS Log,Sender Name,प्रेषकाचे नाव
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,मानदंडानुसार क्रमवारी लावा
 DocType: POS Profile,[Select],[निवडा]
 DocType: Vital Signs,Blood Pressure (diastolic),रक्तदाब (डायस्टोलिक)
 DocType: SMS Log,Sent To,करण्यासाठी पाठविले
@@ -2461,7 +2507,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,पुढील संपर्क तारीख भूतकाळातील असू शकत नाही
 DocType: Company,For Reference Only.,संदर्भ केवळ.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},{0} वर वैद्यक {0} उपलब्ध नाही
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,बॅच निवडा कोणत्याही
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,बॅच निवडा कोणत्याही
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},अवैध {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,संदर्भ INV
@@ -2477,15 +2523,15 @@
 DocType: Normal Test Items,Require Result Value,परिणाम मूल्य आवश्यक आहे
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,प्रकरण क्रमांक 0 असू शकत नाही
 DocType: Item,Show a slideshow at the top of the page,पृष्ठाच्या शीर्षस्थानी स्लाईड शो दर्शवा
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,स्टोअर्स
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,स्टोअर्स
 DocType: Project Type,Projects Manager,प्रकल्प व्यवस्थापक
 DocType: Serial No,Delivery Time,वितरण वेळ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,आधारित Ageing
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,भेटी रद्द
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,भेटी रद्द
 DocType: Item,End of Life,आयुष्याच्या शेवटी
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,प्रवास
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,दिले तारखा कर्मचारी {0} आढळले सक्रिय नाही किंवा मुलभूत तत्वे
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,प्रवास
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,दिले तारखा कर्मचारी {0} आढळले सक्रिय नाही किंवा मुलभूत तत्वे
 DocType: Leave Block List,Allow Users,वापरकर्त्यांना परवानगी द्या
 DocType: Purchase Order,Customer Mobile No,ग्राहक मोबाइल नं
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,आवर्ती
@@ -2494,12 +2540,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,अद्यतन खर्च
 DocType: Item Reorder,Item Reorder,आयटम पुनर्क्रमित
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,पगार शो स्लिप्स
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,ट्रान्सफर साहित्य
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,ट्रान्सफर साहित्य
 DocType: Fees,Send Payment Request,पैसे विनंती पाठवा
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ऑपरेशन, ऑपरेटिंग खर्च  आणि आपल्या ऑपरेशनसाठी    एक अद्वितीय ऑपरेशन क्रमांक निर्देशीत करा ."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,हा दस्तऐवज करून मर्यादेपेक्षा अधिक {0} {1} आयटम {4}. आपण करत आहेत दुसर्या {3} त्याच विरुद्ध {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,जतन केल्यानंतर आवर्ती सेट करा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,बदल निवडा रक्कम खाते
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,बदल निवडा रक्कम खाते
 DocType: Purchase Invoice,Price List Currency,किंमत सूची चलन
 DocType: Naming Series,User must always select,सदस्य नेहमी निवडणे आवश्यक आहे
 DocType: Stock Settings,Allow Negative Stock,नकारात्मक शेअर परवानगी द्या
@@ -2519,7 +2565,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,कर्मचारी
 DocType: Sample Collection,Collected Time,एकत्रित वेळ
 DocType: Company,Sales Monthly History,विक्री मासिक इतिहास
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,बॅच निवडा
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,बॅच निवडा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} पूर्णपणे बिल आहे
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,महत्वाच्या चिन्हे
 DocType: Training Event,End Time,समाप्त वेळ
@@ -2527,16 +2573,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,भरणा वजावट किंवा कमी होणे
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,विक्री किंवा खरेदी करीता मानक करार अटी.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,व्हाउचर गट
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,आपली खात्री आहे की आपण ही नियोजित भेट रद्द करू इच्छिता?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,विक्री पाईपलाईन
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},पगार घटक मुलभूत खाते सेट करा {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,रोजी आवश्यक
 DocType: Rename Tool,File to Rename,फाइल पुनर्नामित करा
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},कृपया सलग {0} मधे  आयटम साठी BOM निवडा
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},कृपया सलग {0} मधे  आयटम साठी BOM निवडा
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},खाते {0} खाते मोड मध्ये {1} कंपनी जुळत नाही: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},आयटम  {1} साठी निर्दिष्ट BOM {0} अस्तित्वात नाही
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,देखभाल वेळापत्रक {0} हि  विक्री ऑर्डर रद्द करण्याआधी रद्द करणे आवश्यक आहे
+DocType: POS Profile,Applicable for Users,वापरकर्त्यांसाठी लागू
 DocType: Notification Control,Expense Claim Approved,खर्च क्लेम मंजूर
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,कर्मचारी पगार स्लिप {0} आधीच या काळात निर्माण
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,कर्मचारी पगार स्लिप {0} आधीच या काळात निर्माण
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,फार्मास्युटिकल
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,खरेदी आयटम खर्च
 DocType: Selling Settings,Sales Order Required,विक्री ऑर्डर आवश्यक
@@ -2561,6 +2609,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,संघटना
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,संघटना
 DocType: BOM Update Tool,BOM Update Tool,BOM अद्यतन साधन
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","पार्टी खाते निर्दिष्ट नाही, कृपया कंपनीमध्ये डीफॉल्ट पार्टी खाते सेट करा"
 DocType: SG Creation Tool Course,Student Group Name,विद्यार्थी गट नाव
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,शुल्क तयार करणे
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,आपण खरोखर या कंपनीतील  सर्व व्यवहार हटवू इच्छिता याची खात्री करा. तुमचा master  data  आहे तसा राहील. ही क्रिया पूर्ववत केली जाऊ शकत नाही.
@@ -2569,29 +2618,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},उत्पादन ऑर्डर {3} मधे {0} ({1}) नियोजित प्रमाण पेक्षा जास्त असू शकत नाही ({2})
 DocType: Shipping Rule,Shipping Rule Label,शिपिंग नियम लेबल
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,वापरकर्ता मंच
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,कच्चा माल रिक्त असू शकत नाही.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","शेअर अद्यतनित करू शकत नाही, चलन ड्रॉप शिपिंग आयटम समाविष्टीत आहे."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,कच्चा माल रिक्त असू शकत नाही.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","शेअर अद्यतनित करू शकत नाही, चलन ड्रॉप शिपिंग आयटम समाविष्टीत आहे."
 DocType: Lab Test Sample,Lab Test Sample,लॅब चाचणी नमुना
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,जलद प्रवेश जर्नल
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM कोणत्याही आयटम agianst उल्लेख केला तर आपण दर बदलू शकत नाही
+DocType: Restaurant,Invoice Series Prefix,बीजक मालिका उपसर्ग
 DocType: Employee,Previous Work Experience,मागील कार्य अनुभव
 DocType: Stock Entry,For Quantity,प्रमाण साठी
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},सलग  आयटम {0} सलग{1} येथे साठी नियोजनबद्ध Qty प्रविष्ट करा
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},सलग  आयटम {0} सलग{1} येथे साठी नियोजनबद्ध Qty प्रविष्ट करा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,"{0} {1} हे सबमिट केलेली नाही,"
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,आयटम विनंती.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,स्वतंत्र उत्पादन करण्यासाठी प्रत्येक पूर्ण चांगला आयटम निर्माण केले जाईल.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} परत दस्तऐवज नकारात्मक असणे आवश्यक आहे
 ,Minutes to First Response for Issues,मुद्दे प्रथम प्रतिसाद मिनिटे
 DocType: Purchase Invoice,Terms and Conditions1,अटी आणि Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,संस्था नाव साठी आपण या प्रणाली सेट आहेत.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,संस्था नाव साठी आपण या प्रणाली सेट आहेत.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Accounting प्रवेश गोठविली लेखा नोंद, कोणीही करून  / सुधारुन खालील  निर्दिष्ट भूमिका वगळता नोंद संपादीत करताू शकतात ."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,देखभाल वेळापत्रक निर्मिती करण्यापूर्वी दस्तऐवज जतन करा
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,सर्व बीओएममध्ये अद्ययावत किंमत
 DocType: Fee Schedule,Successful,यशस्वी
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,प्रकल्प स्थिती
 DocType: UOM,Check this to disallow fractions. (for Nos),अपूर्णांक अनुमती रद्द करण्यासाठी हे तपासा. (क्रमांकासाठी)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,खालील उत्पादन आदेश तयार केले होते:
-DocType: Student Admission,Naming Series (for Student Applicant),मालिका नाव (विद्यार्थी अर्जदाराचे)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,खालील उत्पादन आदेश तयार केले होते:
+DocType: Student Admission Program,Naming Series (for Student Applicant),मालिका नाव (विद्यार्थी अर्जदाराचे)
 DocType: Delivery Note,Transporter Name,वाहतुक नाव
 DocType: Authorization Rule,Authorized Value,अधिकृत मूल्य
 DocType: BOM,Show Operations,ऑपरेशन्स शो
@@ -2615,7 +2665,7 @@
 ,Employees working on a holiday,सुट्टी काम कर्मचारी
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,मार्क सध्याची
 DocType: Project,% Complete Method,% पूर्ण पद्धत
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,औषध
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,औषध
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},सिरियल क्रमांक  {0}साठी देखभाल प्रारंभ तारीख माणे वितरणाच्या  तारीखेआधी असू शकत नाही
 DocType: Production Order,Actual End Date,वास्तविक अंतिम तारीख
 DocType: BOM,Operating Cost (Company Currency),ऑपरेटिंग खर्च (कंपनी चलन)
@@ -2633,13 +2683,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,सदस्य मंजूर नियम लागू आहे वापरकर्ता म्हणून समान असू शकत नाही
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),बेसिक रेट (शेअर UOM नुसार)
 DocType: SMS Log,No of Requested SMS,मागणी एसएमएस क्रमांक
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,वेतन न करता सोडू मंजूर रजा रेकॉर्ड जुळत नाही
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,वेतन न करता सोडू मंजूर रजा रेकॉर्ड जुळत नाही
 DocType: Campaign,Campaign-.####,मोहीम -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,पुढील पायऱ्या
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,शक्य तितका सर्वोत्कृष्ट दरात निर्दिष्ट आयटम पुरवठा करा
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,चलन करा
 DocType: Selling Settings,Auto close Opportunity after 15 days,त्यानंतर 15 दिवसांनी ऑटो संधी बंद
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} च्या स्कोअरकार्ड स्टँडिंगमुळे {0} साठी खरेदी ऑर्डरची अनुमती नाही
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} च्या स्कोअरकार्ड स्टँडिंगमुळे {0} साठी खरेदी ऑर्डरची अनुमती नाही
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,समाप्त वर्ष
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / लीड%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / लीड%
@@ -2647,6 +2697,7 @@
 DocType: Vital Signs,Nutrition Values,पोषण मूल्ये
 DocType: Lab Test Template,Is billable,बिल करण्यायोग्य आहे
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",&quot;फिजिशियन शेड्यूल&quot; आणि &quot;टाइम पिप अॅनॉइंसमेंट&quot; दोन्ही &quot;डॉ {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,तृतीय पक्ष वितरक / विक्रेता / दलाल / संलग्न / विक्रेते म्हणजे जो कमिशनसाठी कंपन्यांचे उत्पादन विकतो
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} पर्चेस विरुद्ध {1}
 DocType: Patient,Patient Demographics,रुग्ण डेमोग्राफिक्स
@@ -2676,7 +2727,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","सर्व खरेदी व्यवहार लागू केले जाऊ शकते मानक कर टेम्प्लेट. हा साचा इ #### आपण सर्व ** आयटम मानक कर दर असतील येथे परिभाषित कर दर टीप ""हाताळणी"", कर heads आणि ""शिपिंग"", ""इन्शुरन्स"" सारखे इतर खर्च heads यादी असू शकतात * *. विविध दर आहेत ** की ** आयटम नाहीत, तर ते ** आयटम  मास्टर** मधे  ** आयटम करात समाविष्ट करणे आवश्यक आहे **. #### स्तंभ वर्णन 1. गणना प्रकार: - हे (मूलभूत रक्कम बेरीज आहे) ** नेट एकूण ** वर असू शकते. - ** मागील पंक्ती एकूण / रक्कम ** रोजी (संचयी कर किंवा शुल्क साठी). तुम्ही हा पर्याय निवडत असाल, तर कर रक्कम एकूण (कर सारणी मध्ये) मागील सलग टक्केवारी म्हणून लागू केले जाईल. - ** ** वास्तविक (नमूद). 2. खाते प्रमुख: हा कर 3. खर्च केंद्र बुक केले जाईल ज्या अंतर्गत खाते खातेवही: कर / शुल्क (शिपिंग सारखे) एक उत्पन्न आहे किंवा खर्च तर ती खर्च केंद्र विरुद्ध गुन्हा दाखल करण्यात यावा करणे आवश्यक आहे. 4. वर्णन: कर वर्णन (की पावत्या / कोट छापले जाईल). 5. दर: कर दर. 6 रक्कम: कर रक्कम. 7. एकूण: या बिंदू संचयी एकूण. 8. रो प्रविष्ट करा: आधारित असेल, तर ""मागील पंक्ती एकूण"" जर तुम्ही या गणित एक बेस (मुलभूत मागील ओळीत आहे) म्हणून घेतले जाईल जे ओळीवर निवडू शकता. 9. कर किंवा शुल्क विचार करा: कर / शुल्क मूल्यांकन केवळ आहे (एकूण नाही एक भाग) किंवा (फक्त आयटम मूल्यवान नाही) एकूण किंवा दोन्ही असल्यावरच हा विभाग तुम्ही देखिल निर्देशीत करू शकता. 10. जोडा किंवा वजा: आपण जोडू किंवा कर वजा करायचे."
 DocType: Homepage,Homepage,मुख्यपृष्ठ
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,फिजिशियन निवडा ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',update tab कॉन्झलेशन सेट इनवॉइस = &#39;{0}&#39; जेथे नाव = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd प्रमाण
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},फी रेकॉर्ड तयार - {0}
 DocType: Asset Category Account,Asset Category Account,मालमत्ता वर्ग खाते
@@ -2688,7 +2738,7 @@
 DocType: Asset,Manual,मॅन्युअल
 DocType: Salary Component Account,Salary Component Account,पगार घटक खाते
 DocType: Global Defaults,Hide Currency Symbol,चलन प्रतीक लपवा
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","उदा बँक, रोख, क्रेडिट कार्ड"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","उदा बँक, रोख, क्रेडिट कार्ड"
 DocType: Lead Source,Source Name,स्रोत नाव
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","प्रौढांमध्ये साधारणतः आरामदायी रक्तदाब अंदाजे 120 एमएमएचजी सिस्टोलिक आणि 80 एमएमएचजी डायस्टोलिक असतो, संक्षिप्त &quot;120/80 मिमी एचजी&quot;"
 DocType: Journal Entry,Credit Note,क्रेडिट टीप
@@ -2707,16 +2757,16 @@
 DocType: Patient,Occupation,व्यवसाय
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,रो {0}: प्रारंभ तारीख अंतिम तारखेपूर्वी असणे आवश्यक आहे
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),एकूण (Qty)
-DocType: Sales Invoice,This Document,हा दस्तऐवज
 DocType: Installation Note Item,Installed Qty,स्थापित Qty
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,याचे कारण काही अवैध ईमेल पत्ते असू शकतात
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,आपण जोडले
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,प्रशिक्षण निकाल
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,प्रशिक्षण निकाल
 DocType: Purchase Invoice,Is Paid,सशुल्क आहे
 DocType: Salary Structure,Total Earning,एकूण कमाई
 DocType: Purchase Receipt,Time at which materials were received,"साहित्य प्राप्त झाले, ती  वेळ"
 DocType: Stock Ledger Entry,Outgoing Rate,जाणारे दर
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,संघटना शाखा मास्टर.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,संघटना शाखा मास्टर.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,किंवा
 DocType: Sales Order,Billing Status,बिलिंग स्थिती
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,समस्या नोंदवणे
@@ -2731,8 +2781,9 @@
 DocType: Notification Control,Sales Order Message,विक्री ऑर्डर संदेश
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","कंपनी, चलन, वर्तमान आर्थिक वर्ष इ  मुलभूत मुल्य  सेट करा"
 DocType: Payment Entry,Payment Type,भरणा प्रकार
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,कृपया आयटम एक बॅच निवडा {0}. ही गरज पूर्ण एकाच बॅच शोधण्यात अक्षम
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,कृपया आयटम एक बॅच निवडा {0}. ही गरज पूर्ण एकाच बॅच शोधण्यात अक्षम
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,कृपया आयटम एक बॅच निवडा {0}. ही गरज पूर्ण एकाच बॅच शोधण्यात अक्षम
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,कृपया आयटम एक बॅच निवडा {0}. ही गरज पूर्ण एकाच बॅच शोधण्यात अक्षम
+DocType: Hub Category,Parent Category,पालक वर्ग
 DocType: Process Payroll,Select Employees,निवडा कर्मचारी
 DocType: Opportunity,Potential Sales Deal,संभाव्य विक्री करार
 DocType: Complaint,Complaints,तक्रारी
@@ -2770,7 +2821,7 @@
 DocType: Bin,Reserved Quantity,राखीव प्रमाण
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,वैध ईमेल पत्ता प्रविष्ट करा
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,वैध ईमेल पत्ता प्रविष्ट करा
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,कार्टमध्ये एखादा आयटम निवडा
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,कार्टमध्ये एखादा आयटम निवडा
 DocType: Landed Cost Voucher,Purchase Receipt Items,खरेदी पावती आयटम
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,पसंतीचे अर्ज
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,थकबाकी
@@ -2780,15 +2831,15 @@
 DocType: Payment Request,Amount in customer's currency,ग्राहक चलनात रक्कम
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,डिलिव्हरी
 DocType: Stock Reconciliation Item,Current Qty,वर्तमान Qty
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,पुरवठादार जोडा
+DocType: Restaurant Menu,Restaurant Menu,रेस्टॉरन्ट मेनू
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,मागील
 DocType: Appraisal Goal,Key Responsibility Area,की जबाबदारी क्षेत्र
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","विद्यार्थी बॅचेस आपण उपस्थिती, विद्यार्थ्यांना आकलन आणि शुल्क ठेवण्यात मदत"
 DocType: Payment Entry,Total Allocated Amount,एकूण रक्कम
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,शाश्वत यादी मुलभूत यादी खाते सेट
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,शाश्वत यादी मुलभूत यादी खाते सेट
 DocType: Item Reorder,Material Request Type,साहित्य विनंती प्रकार
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},पासून {0} करण्यासाठी वेतन Accural जर्नल प्रवेश {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage पूर्ण आहे, जतन नाही"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage पूर्ण आहे, जतन नाही"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,रो {0}: UOM रुपांतर फॅक्टर अनिवार्य आहे
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,खोली क्षमता
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,संदर्भ
@@ -2827,16 +2878,18 @@
 DocType: Project,Task Completion,कार्य पूर्ण
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,स्टॉक मध्ये नाही
 DocType: Appraisal,HR User,एचआर सदस्य
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,पीओएस?
 DocType: Purchase Invoice,Taxes and Charges Deducted,कर आणि शुल्क वजा
-apps/erpnext/erpnext/hooks.py +129,Issues,मुद्दे
+apps/erpnext/erpnext/hooks.py +138,Issues,मुद्दे
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},{0} पैकी स्थिती एक असणे आवश्यक आहे
 DocType: Sales Invoice,Debit To,करण्यासाठी डेबिट
+DocType: Restaurant Menu Item,Restaurant Menu Item,रेस्टॉरन्ट मेनू आयटम
 DocType: Delivery Note,Required only for sample item.,फक्त नमुन्यासाठी  आवश्यक आयटम .
 DocType: Stock Ledger Entry,Actual Qty After Transaction,व्यवहार केल्यानंतर प्रत्यक्ष प्रमाण
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},पगारपत्रक दरम्यान आढळले नाही {0} आणि {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},पगारपत्रक दरम्यान आढळले नाही {0} आणि {1}
 ,Pending SO Items For Purchase Request,खरेदी विनंती म्हणून प्रलंबित आयटम
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,विद्यार्थी प्रवेश
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} अक्षम आहे
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,विद्यार्थी प्रवेश
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} अक्षम आहे
 DocType: Supplier,Billing Currency,बिलिंग चलन
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,अधिक मोठे
@@ -2859,6 +2912,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,आवश्यक भेटी क्रमांकाचा उल्लेख करा
 DocType: Stock Settings,Default Valuation Method,मुलभूत मूल्यांकन पद्धत
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,फी
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,अद्यतन प्रगतीपथावर यास थोडा वेळ लागू शकतो.
 DocType: Vehicle Log,Fuel Qty,इंधन प्रमाण
 DocType: Production Order Operation,Planned Start Time,नियोजनबद्ध प्रारंभ वेळ
 DocType: Course,Assessment,मूल्यांकन
@@ -2874,7 +2928,7 @@
 DocType: Price List,Price List Master,किंमत सूची मास्टर
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"सर्व विक्री व्यवहार अनेक ** विक्री व्यक्ती ** विरुद्ध टॅग केले जाऊ शकते यासाठी की, तुम्ही सेट आणि लक्ष्य निरीक्षण करू शकता"
 ,S.O. No.,S.O.  क्रमांक
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},लीडपासून  ग्राहक तयार करा {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},लीडपासून  ग्राहक तयार करा {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,रुग्ण निवडा
 DocType: Price List,Applicable for Countries,देशांसाठी  लागू
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,पॅरामीटर नाव
@@ -2906,27 +2960,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,खर्च / फरक खाते ({0}) एक &#39;नफा किंवा तोटा&#39; खाते असणे आवश्यक आहे
 DocType: Project,Copied From,कॉपी
 DocType: Project,Copied From,कॉपी
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},नाव त्रुटी: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,कमतरता
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},नाव त्रुटी: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,कमतरता
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} संबंधित नाही {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,कर्मचारी {0} हजेरी आधीच खूण आहे
 DocType: Packing Slip,If more than one package of the same type (for print),तर समान प्रकारच्या एकापेक्षा जास्त पॅकेज (मुद्रण)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,कृपया रेस्टॉरंट सेटिंग्जमध्ये डीफॉल्ट ग्राहक सेट करा
 ,Salary Register,पगार नोंदणी
 DocType: Warehouse,Parent Warehouse,पालक वखार
 DocType: C-Form Invoice Detail,Net Total,निव्वळ एकूण
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},डीफॉल्ट BOM आयटम आढळले नाही {0} आणि प्रकल्प {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},डीफॉल्ट BOM आयटम आढळले नाही {0} आणि प्रकल्प {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,विविध कर्ज प्रकार काय हे स्पष्ट करा
 DocType: Bin,FCFS Rate,FCFS दर
 DocType: Payment Reconciliation Invoice,Outstanding Amount,बाकी रक्कम
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),वेळ (मिनिटांनी)
 DocType: Project Task,Working,कार्यरत आहे
 DocType: Stock Ledger Entry,Stock Queue (FIFO),शेअर रांग (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,आर्थिक वर्ष
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,आर्थिक वर्ष
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} हा कंपनी {1} ला संबंधित नाही
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,{0} साठी निकष कार्यपद्धतीचे निराकरण करता आले नाही. सूत्र वैध असल्याची खात्री करा.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,म्हणून खर्च
 DocType: Healthcare Settings,Out Patient Settings,रुग्ण सेटिंग्ज बाहेर
 DocType: Account,Round Off,बंद फेरीत
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,प्रमाण सकारात्मक असणे आवश्यक आहे
 ,Requested Qty,विनंती Qty
 DocType: Tax Rule,Use for Shopping Cart,वापरासाठी हे खरेदी सूचीत टाका
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},मूल्य {0} विशेषता साठी {1} वैध आयटम यादी अस्तित्वात नाही आयटम विशेषता मूल्ये {2}
@@ -2935,7 +2991,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",शुल्क प्रमाणातील आपल्या  निवडीनुसार आयटम प्रमाण किंवा रक्कम आधारित वाटप केले जाणार आहे
 DocType: Maintenance Visit,Purposes,हेतू
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,किमान एक आयटम परत दस्तऐवज नकारात्मक प्रमाणात प्रवेश केला पाहिजे
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,अभ्यासक्रम जोडा
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ऑपरेशन {0} वर्कस्टेशन{1} मधे   कोणत्याही उपलब्ध काम तासांपेक्षा जास्त आहे , ऑपरेशन अनेक ऑपरेशन मध्ये  तोडा"
 ,Requested,विनंती
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,शेरा नाही
@@ -2947,6 +3002,8 @@
 DocType: Employee Loan,Repaid/Closed,परतफेड / बंद
 DocType: Item,Total Projected Qty,एकूण अंदाज प्रमाण
 DocType: Monthly Distribution,Distribution Name,वितरण नाव
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","आयटम {0} साठी मूल्यमापन दर सापडत नाही, ज्यासाठी {1} {2} साठी लेखा प्रविष्ट करणे आवश्यक आहे. आयटम {1} मध्ये शून्य मूल्यांकनातील दर आयटम म्हणून व्यवहार करत असल्यास, कृपया {1} आयटम सारणीमध्ये हे निर्दिष्ट करा. अन्यथा, कृपया आयटमसाठी येणारे स्टॉक ट्रान्झॅक्शन तयार करा किंवा आयटम रेकॉर्डमध्ये व्हॅल्यूशन रेट नमूद करा आणि नंतर ही नोंदणी सबमिट करण्याचा / रद्द करण्याचा प्रयत्न करा"
 DocType: Course,Course Code,अर्थात कोड
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},आयटम आवश्यक गुणवत्ता तपासणी {0}
 DocType: POS Settings,Use POS in Offline Mode,POS ऑफलाइन मोडमध्ये वापरा
@@ -2957,14 +3014,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,प्रदेश वृक्ष व्यवस्थापित करा.
 DocType: Journal Entry Account,Sales Invoice,विक्री चलन
 DocType: Journal Entry Account,Party Balance,पार्टी शिल्लक
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,कृपया सवलत लागू निवडा
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,कृपया सवलत लागू निवडा
 DocType: Company,Default Receivable Account,मुलभूत प्राप्तीयोग्य खाते
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,वर निवडलेल्या निकष देण्यासाठी अदा एकूण पगार बँक नोंद तयार करा
 DocType: Physician,Physician Schedule,फिजिशियन शेड्यूल
 DocType: Purchase Invoice,Deemed Export,डीम्ड एक्सपोर्ट
 DocType: Stock Entry,Material Transfer for Manufacture,उत्पादन साठी साहित्य ट्रान्सफर
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,सवलत टक्केवारी एका दर सूची विरुद्ध किंवा सर्व दर सूची एकतर लागू होऊ शकते.
-DocType: Purchase Invoice,Half-yearly,सहामाही
+DocType: Subscription,Half-yearly,सहामाही
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,शेअर एकट्या प्रवेश
 DocType: Lab Test,LabTest Approver,लॅबस्टेस्ट अॅपरॉव्हर
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,आपण मूल्यांकन निकष आधीच मूल्यमापन आहे {}.
@@ -2993,13 +3050,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,अतिरिक्त लहान
 DocType: Company,Standard Template,मानक साचा
 DocType: Training Event,Theory,सिद्धांत
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी:  मागणी साहित्य Qty किमान Qty पेक्षा कमी आहे
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी:  मागणी साहित्य Qty किमान Qty पेक्षा कमी आहे
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,खाते {0} गोठविले
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,कायदेशीर अस्तित्व / उपकंपनी स्वतंत्र लेखा चार्ट सह संघटनेला संबंधित करते
 DocType: Payment Request,Mute Email,निःशब्द ईमेल
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","अन्न, पेय आणि तंबाखू"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},फक्त बिल न केलेली विरुद्ध रक्कम करू शकता {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,आयोग दर 100 पेक्षा जास्त असू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},फक्त बिल न केलेली विरुद्ध रक्कम करू शकता {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,आयोग दर 100 पेक्षा जास्त असू शकत नाही
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,प्रथम {0} प्रविष्ट करा
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,पासून कोणतीही प्रत्युत्तरे
@@ -3017,10 +3074,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,रंग
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,मूल्यांकन योजना निकष
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,खरेदी ऑर्डर थांबवा
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,संवेदनशील
 DocType: Patient Appointment,Scheduled,अनुसूचित
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,अवतरण विनंती.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया मानव संसाधन&gt; एचआर सेटिंग्जमध्ये कर्मचारी नेमिंग सिस्टम सेट करा
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","कृपया असा आयटम निवडा जेथे ""शेअर आयटम आहे?""  ""नाही"" आहे  आणि ""विक्री आयटम आहे?"" ""होय "" आहे आणि  तेथे इतर उत्पादन बंडल नाही"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,ग्राहक निवडा
 DocType: Student Log,Academic,शैक्षणिक
 DocType: Patient,Personal and Social History,वैयक्तिक आणि सामाजिक इतिहास
 DocType: Fee Schedule,Fee Breakup for each student,प्रत्येक विद्यार्थ्यासाठी फी ब्रेकअप
@@ -3030,7 +3088,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,मूल्यांकन दर
 DocType: Stock Reconciliation,SR/,सचिन /
 DocType: Vehicle,Diesel,डिझेल
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,किंमत सूची चलन निवडलेले नाही
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,किंमत सूची चलन निवडलेले नाही
 apps/erpnext/erpnext/config/healthcare.py +46,Results,परिणाम
 ,Student Monthly Attendance Sheet,विद्यार्थी मासिक उपस्थिती पत्रक
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},कर्मचारी {0} आधीच अर्ज केला आहे {1} दरम्यान {2} आणि {3}
@@ -3046,7 +3104,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,विक्री भागीदार व्यवस्थापित करा.
 DocType: Quality Inspection,Inspection Type,तपासणी प्रकार
 DocType: Fee Validity,Visited yet,अद्याप भेट दिली
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,विद्यमान व्यवहार गोदामे गट रूपांतरीत केले जाऊ शकत नाही.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,विद्यमान व्यवहार गोदामे गट रूपांतरीत केले जाऊ शकत नाही.
 DocType: Assessment Result Tool,Result HTML,HTML निकाल
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,रोजी कालबाह्य
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,विद्यार्थी जोडा
@@ -3073,7 +3131,7 @@
 DocType: Healthcare Settings,Result Printed,परिणाम मुद्रित
 DocType: Asset Category Account,Depreciation Expense Account,इतर किरकोळ खर्च खाते
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,परीविक्षण कालावधी
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},{0} पहा
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},{0} पहा
 DocType: Customer Group,Only leaf nodes are allowed in transaction,फक्त पाने नोडस् व्यवहार अनुमत आहेत
 DocType: Expense Claim,Expense Approver,खर्च माफीचा साक्षीदार
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,रो {0}: ग्राहक विरुद्ध आगाऊ क्रेडिट असणे आवश्यक आहे
@@ -3085,7 +3143,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,DATETIME करण्यासाठी
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,अर्थात वेळापत्रक हटविला:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,एसएमएस स्थिती राखण्यासाठी नोंदी
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,विक्री लक्ष्य सेट करा
 DocType: Accounts Settings,Make Payment via Journal Entry,जर्नल प्रवेश द्वारे रक्कम
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,छापील रोजी
 DocType: Item,Inspection Required before Delivery,तपासणी वितरण आधी आवश्यक
@@ -3093,7 +3150,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,प्रलंबित उपक्रम
 DocType: Patient Appointment,Reminded,स्मरण करून दिले
 DocType: Patient,PID-,पीआयडी-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,आपले संघटना
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,आपले संघटना
 DocType: Fee Component,Fees Category,शुल्क वर्ग
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,relieving तारीख प्रविष्ट करा.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,रक्कम
@@ -3105,7 +3162,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,स्तर पुनर्क्रमित करा
 DocType: Company,Chart Of Accounts Template,खाती साचा चार्ट
 DocType: Attendance,Attendance Date,उपस्थिती दिनांक
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},आयटम किंमत {0} मध्ये दर सूची अद्ययावत {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},आयटम किंमत {0} मध्ये दर सूची अद्ययावत {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,कमावते आणि कपात आधारित पगार चित्रपटाने.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,child नोडस् सह खाते लेजर मधे रूपांतरीत केले जाऊ शकत नाही
 DocType: Purchase Invoice Item,Accepted Warehouse,स्वीकृत कोठार
@@ -3121,9 +3178,10 @@
 ,Employee Birthday,कर्मचारी वाढदिवस
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,विद्यार्थी बॅच विधान परिषदेच्या साधन
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,मर्यादा क्रॉस
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,अनुसूचित पर्यंत
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,व्हेंचर कॅपिटल
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,या &#39;शैक्षणिक वर्ष&#39; एक शैक्षणिक मुदत {0} आणि &#39;मुदत नाव&#39; {1} आधीच अस्तित्वात आहे. या नोंदी सुधारित आणि पुन्हा प्रयत्न करा.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","आयटम {0} विरुद्ध विद्यमान व्यवहार आहेत, तुम्ही मूल्य बदलू शकत नाही {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","आयटम {0} विरुद्ध विद्यमान व्यवहार आहेत, तुम्ही मूल्य बदलू शकत नाही {1}"
 DocType: UOM,Must be Whole Number,संपूर्ण क्रमांक असणे आवश्यक आहे
 DocType: Leave Control Panel,New Leaves Allocated (In Days),नवी पाने वाटप (दिवस मध्ये)
 DocType: Purchase Invoice,Invoice Copy,चलन कॉपी
@@ -3133,7 +3191,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,चलन क्रमांक
 DocType: Shopping Cart Settings,Orders,आदेश
 DocType: Employee Leave Approver,Leave Approver,माफीचा साक्षीदार सोडा
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,कृपया एक बॅच निवडा
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,कृपया एक बॅच निवडा
 DocType: Assessment Group,Assessment Group Name,मूल्यांकन गट नाव
 DocType: Manufacturing Settings,Material Transferred for Manufacture,साहित्य उत्पादन साठी हस्तांतरित
 DocType: Expense Claim,"A user with ""Expense Approver"" role",""" खर्च मंजूर "" भूमिका वापरकर्ता"
@@ -3148,7 +3206,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,कालावधी संवरण
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,विभाग निवडा ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,विद्यमान व्यवहार खर्चाच्या केंद्र गट रूपांतरीत केले जाऊ शकत नाही
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},रक्कम {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},रक्कम {0} {1} {2} {3}
 DocType: Account,Depreciation,घसारा
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),पुरवठादार (चे)
 DocType: Employee Attendance Tool,Employee Attendance Tool,कर्मचारी उपस्थिती साधन
@@ -3160,10 +3218,12 @@
 DocType: GL Entry,Voucher No,प्रमाणक नाही
 ,Lead Owner Efficiency,लीड मालक कार्यक्षमता
 ,Lead Owner Efficiency,लीड मालक कार्यक्षमता
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,सर्वात लोकप्रिय
 DocType: Leave Allocation,Leave Allocation,वाटप सोडा
 DocType: Payment Request,Recipient Message And Payment Details,प्राप्तकर्ता संदेश आणि देय तपशील
 DocType: Training Event,Trainer Email,प्रशिक्षक ईमेल
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,साहित्य विनंत्या {0} तयार
+DocType: Restaurant Reservation,No of People,लोक संख्या
 DocType: Production Planning Tool,Include sub-contracted raw materials,उप-करारबद्ध कच्चा माल समाविष्ट करा
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,अटी किंवा करार साचा.
 DocType: Purchase Invoice,Address and Contact,पत्ता आणि संपर्क
@@ -3172,10 +3232,11 @@
 DocType: Supplier,Last Day of the Next Month,पुढील महिन्याच्या शेवटच्या दिवशी
 DocType: Support Settings,Auto close Issue after 7 days,7 दिवस स्वयं अंक बंद
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","रजेचे  {0} च्या आधी वाटप जाऊ शकत नाही, कारण  रजा शिल्लक आधीच वाहून-अग्रेषित भविष्यात रजा वाटप रेकॉर्ड केले आहे {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),टीप: मुळे / संदर्भ तारीख {0} दिवसा परवानगी ग्राहक क्रेडिट दिवस पेक्षा जास्त (चे)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),टीप: मुळे / संदर्भ तारीख {0} दिवसा परवानगी ग्राहक क्रेडिट दिवस पेक्षा जास्त (चे)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,विद्यार्थी अर्जदाराचे
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,RECIPIENT मूळ
 DocType: Asset Category Account,Accumulated Depreciation Account,जमा घसारा खाते
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,हे ईमेल स्वयं-निर्मित आहे
 DocType: Stock Settings,Freeze Stock Entries,फ्रीझ शेअर नोंदी
 DocType: Program Enrollment,Boarding Student,बोर्डिंग विद्यार्थी
 DocType: Asset,Expected Value After Useful Life,अपेक्षित मूल्य उपयुक्त जीवन नंतर
@@ -3183,7 +3244,7 @@
 DocType: Activity Cost,Billing Rate,बिलिंग दर
 ,Qty to Deliver,वितरीत करण्यासाठी Qty
 ,Stock Analytics,शेअर Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,ऑपरेशन रिक्त सोडले जाऊ शकत नाही
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,ऑपरेशन रिक्त सोडले जाऊ शकत नाही
 DocType: Maintenance Visit Purpose,Against Document Detail No,दस्तऐवज तपशील विरुद्ध नाही
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,पक्ष प्रकार अनिवार्य आहे
 DocType: Quality Inspection,Outgoing,जाणारे
@@ -3206,7 +3267,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,क्रियाकलाप आधारित गट विद्यार्थ्यांना निवडा स्वतः
 DocType: Journal Entry,User Remark,सदस्य शेरा
 DocType: Lead,Market Segment,बाजार विभाग
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},अदा केलेली रक्कम एकूण नकारात्मक थकबाकी रक्कम पेक्षा जास्त असू शकत नाही {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},अदा केलेली रक्कम एकूण नकारात्मक थकबाकी रक्कम पेक्षा जास्त असू शकत नाही {0}
 DocType: Supplier Scorecard Period,Variables,व्हेरिएबल्स
 DocType: Employee Internal Work History,Employee Internal Work History,कर्मचारी अंतर्गत कार्य इतिहास
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),बंद (डॉ)
@@ -3236,21 +3297,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,अद्यतने मिळवा
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: खाते {2} कंपनी संबंधित नाही {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,साहित्य विनंती {0} रद्द किंवा बंद आहे
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,रजा व्यवस्थापन
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,रजा व्यवस्थापन
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,खाते गट
 DocType: Sales Order,Fully Delivered,पूर्णतः वितरित
 DocType: Lead,Lower Income,अल्प उत्पन्न
+DocType: Restaurant Order Entry,Current Order,वर्तमान ऑर्डर
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},स्त्रोत आणि लक्ष्य कोठार  {0} रांगेत समान असू शकत नाही
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","फरक खाते, एक मालमत्ता / दायित्व प्रकार खाते असणे आवश्यक आहे कारण  शेअर मेळ हे उदघाटन नोंद आहे"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},वितरित करण्यात आलेल्या रक्कम कर्ज रक्कम पेक्षा जास्त असू शकत नाही {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,प्रोग्रामवर जा
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},आयटम आवश्यक मागणीसाठी  क्रमांक खरेदी {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,उत्पादन ऑर्डर तयार नाही
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,उत्पादन ऑर्डर तयार नाही
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','तारीख पासून' नंतर 'तारखेपर्यंत' असणे आवश्यक आहे
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},विद्यार्थी म्हणून स्थिती बदलू शकत नाही {0} विद्यार्थी अर्ज लिंक आहे {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},विद्यार्थी म्हणून स्थिती बदलू शकत नाही {0} विद्यार्थी अर्ज लिंक आहे {1}
 DocType: Asset,Fully Depreciated,पूर्णपणे अवमूल्यन
 ,Stock Projected Qty,शेअर Qty अंदाज
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},ग्राहक {0}  प्रोजेक्ट {1} ला संबंधित नाही
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},ग्राहक {0}  प्रोजेक्ट {1} ला संबंधित नाही
 DocType: Employee Attendance Tool,Marked Attendance HTML,चिन्हांकित उपस्थिती एचटीएमएल
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","आंतरशालेय, प्रस्ताव आपण आपल्या ग्राहकांना पाठवले आहे बोली"
 DocType: Sales Order,Customer's Purchase Order,ग्राहकाच्या पर्चेस
@@ -3261,8 +3323,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Depreciations संख्या बुक सेट करा
 DocType: Supplier Scorecard Period,Calculations,गणना
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,मूल्य किंवा Qty
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,प्रॉडक्शन आदेश उठविले जाऊ शकत नाही:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,प्रॉडक्शन आदेश उठविले जाऊ शकत नाही:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,मिनिट
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,कृपया {0} साठी सेटअप&gt; सेटिंग्ज&gt; नाविक शृंखला मार्गे नेमिशन सीरीज सेट करा
 DocType: Purchase Invoice,Purchase Taxes and Charges,कर आणि शुल्क खरेदी
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,पुरवठादारांकडे जा
 ,Qty to Receive,प्राप्त करण्यासाठी Qty
@@ -3276,7 +3339,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,क्रेडिट खाते ताळेबंद खाते असणे आवश्यक आहे
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,सर्व पुरवठादार प्रकार
 DocType: Global Defaults,Disable In Words,शब्द मध्ये अक्षम
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,आयटम कोड बंधनकारक आहे कारण आयटम स्वयंचलितपणे गणती केलेला  नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,आयटम कोड बंधनकारक आहे कारण आयटम स्वयंचलितपणे गणती केलेला  नाही
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},कोटेशन {0}  प्रकारच्या {1} नाहीत
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,देखभाल वेळापत्रक आयटम
 DocType: Sales Order,%  Delivered,% वितरण
@@ -3298,22 +3361,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,शिल्लक इक्विटी उघडणे
 DocType: Lead,CRM,सी आर एम
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,सलोखा
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,उर्वरित
 DocType: Appraisal,Appraisal,मूल्यमापन
 DocType: Purchase Invoice,GST Details,जीएसटी तपशील
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},पुरवठादार वर ईमेल पाठविले {0}
+DocType: Item,Default Sales Unit of Measure,मोजणीचे डिफॉल्ट विक्री युनिट
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,तारीख पुनरावृत्ती आहे
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,अधिकृत स्वाक्षरीकर्ता
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},माफीचा साक्षीदार  {0} पैकी एक असणे आवश्यक आहे
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,फी तयार करा
-DocType: Hub Settings,Seller Email,विक्रेता ईमेल
 DocType: Project,Total Purchase Cost (via Purchase Invoice),एकूण खरेदी किंमत (खरेदी  चलन द्वारे)
 DocType: Training Event,Start Time,प्रारंभ वेळ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,प्रमाण निवडा
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,प्रमाण निवडा
 DocType: Customs Tariff Number,Customs Tariff Number,कस्टम दर क्रमांक
 DocType: Patient Appointment,Patient Appointment,रुग्ण नेमणूक
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,भूमिका मंजूर नियम लागू आहे भूमिका समान असू शकत नाही
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,या ईमेल डायजेस्ट पासून सदस्यता रद्द करा
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,या ईमेल डायजेस्ट पासून सदस्यता रद्द करा
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,द्वारे पुरवठादार मिळवा
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,अभ्यासक्रमांकडे जा
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,संदेश पाठवला
@@ -3327,11 +3392,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,साहित्य उत्पादन साठी हस्तांतरित
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,खाते {0} अस्तित्वात नाही
 DocType: Project,Project Type,प्रकल्प प्रकार
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,या कामासाठी बालकार्य अस्तित्वात आहे. आपण हे कार्य हटवू शकत नाही.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,एकतर लक्ष्य qty किंवा लक्ष्य रक्कम आवश्यक आहे.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,विविध उपक्रम खर्च
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,अधिक परिणाम नाहीत
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,विविध उपक्रम खर्च
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","इव्हेंट सेट {0}, विक्री व्यक्ती खाली संलग्न कर्मचारी पासून वापरकर्ता आयडी नाही {1}"
 DocType: Timesheet,Billing Details,बिलिंग तपशील
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,स्त्रोत आणि लक्ष्य कोठार भिन्न असणे आवश्यक आहे
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,स्त्रोत आणि लक्ष्य कोठार भिन्न असणे आवश्यक आहे
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},{0} पेक्षा जुने स्टॉक व्यवहार अद्ययावत करण्याची परवानगी नाही
 DocType: Purchase Invoice Item,PR Detail,जनसंपर्क(PR ) तपशील
 DocType: Sales Order,Fully Billed,पूर्णतः बिल
@@ -3358,7 +3425,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,वायर हस्तांतरण
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,सर्व चेक करा
 DocType: Vehicle Log,Invoice Ref,चलन संदर्भ
-DocType: Purchase Order,Recurring Order,आवर्ती ऑर्डर
 DocType: Company,Default Income Account,मुलभूत उत्पन्न खाते
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,ग्राहक गट / ग्राहक
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),बंद न केलेली आर्थिक वर्ष नफा / तोटा (क्रेडिट)
@@ -3372,9 +3438,9 @@
 DocType: Patient,A Negative,नकारात्मक
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,दर्शविण्यासाठी अधिक काहीही नाही.
 DocType: Lead,From Customer,ग्राहकासाठी
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,कॉल
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,कॉल
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,एक उत्पादन
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,बॅच
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,बॅच
 DocType: Project,Total Costing Amount (via Time Logs),एकूण भांडवलाची  रक्कम (वेळ नोंदी द्वारे)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,शुल्क वेळापत्रक तयार करा
 DocType: Purchase Order Item Supplied,Stock UOM,शेअर UOM
@@ -3399,7 +3465,7 @@
 DocType: School Settings,Current Academic Term,चालू शैक्षणिक मुदत
 DocType: School Settings,Current Academic Term,चालू शैक्षणिक मुदत
 DocType: Sales Order,Not Billed,बिल नाही
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,दोन्ही कोठार त्याच कंपनी संबंधित आवश्यक
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,दोन्ही कोठार त्याच कंपनी संबंधित आवश्यक
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,संपर्क अद्याप जोडले नाहीत
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,स्थावर खर्च व्हाउचर रक्कम
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,पुरवठादार उपस्थित बिल.
@@ -3408,7 +3474,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,सवलत रक्कम
 DocType: Purchase Invoice,Return Against Purchase Invoice,विरुद्ध खरेदी चलन परत
 DocType: Item,Warranty Period (in days),(दिवस मध्ये) वॉरंटी कालावधी
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',`टॅबचीट अॅनॉइंन्टमेंट` सेट विक्री_विनोद = &#39;{0}&#39; जेथे नाव = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Guardian1 संबंध
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,ऑपरेशन्स निव्वळ रोख
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,आयटम 4
@@ -3417,8 +3482,8 @@
 DocType: Journal Entry Account,Journal Entry Account,जर्नल प्रवेश खाते
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,विद्यार्थी गट
 DocType: Shopping Cart Settings,Quotation Series,कोटेशन मालिका
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","आयटम त्याच नावाने अस्तित्वात ( {0} ) असेल , तर आयटम गट नाव बदल  किंवा आयटम पुनर्नामित करा"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,कृपया ग्राहक निवडा
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","आयटम त्याच नावाने अस्तित्वात ( {0} ) असेल , तर आयटम गट नाव बदल  किंवा आयटम पुनर्नामित करा"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,कृपया ग्राहक निवडा
 DocType: C-Form,I,मी
 DocType: Company,Asset Depreciation Cost Center,मालमत्ता घसारा खर्च केंद्र
 DocType: Sales Order Item,Sales Order Date,विक्री ऑर्डर तारीख
@@ -3427,6 +3492,7 @@
 DocType: Assessment Plan,Assessment Plan,मूल्यांकन योजना
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,ग्राहक {0} तयार आहे.
 DocType: Stock Settings,Limit Percent,मर्यादा टक्के
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,सध्या कोणत्याही कोठारमध्ये कोणतीही स्टॉक उपलब्ध नाही
 ,Payment Period Based On Invoice Date,चलन तारखेला आधारित भरणा कालावधी
 DocType: Sample Collection,No. of print,प्रिंटची संख्या
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},चलन विनिमय दर {0} साठी  गहाळ
@@ -3482,13 +3548,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,एकूण पे - एकूण कापून - कर्जाची परतफेड
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,वर्तमान BOM आणि नवीन BOM समान असू शकत नाही
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,पगाराच्या स्लिप्स आयडी
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,पगाराच्या स्लिप्स आयडी
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,निवृत्ती तारीख प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,रोजी अभ्यासक्रम शेड्युल तर त्रुटी होत्या:
 DocType: Sales Invoice,Against Income Account,उत्पन्न खाते विरुद्ध
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% वितरण
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,आयटम {0}: क्रमांकित qty {1} किमान qty {2} (आयटम मध्ये परिभाषित) पेक्षा कमी असू शकत नाही.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,आयटम {0}: क्रमांकित qty {1} किमान qty {2} (आयटम मध्ये परिभाषित) पेक्षा कमी असू शकत नाही.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,मासिक वितरण टक्केवारी
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,कृपया दुसरे वापरकर्ता म्हणून लॉगिन करा.
 DocType: Territory,Territory Targets,प्रदेश लक्ष्य
 DocType: Delivery Note,Transporter Info,वाहतुक माहिती
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},कंपनी मध्ये डीफॉल्ट {0} सेट करा {1}
@@ -3496,13 +3563,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,त्याच पुरवठादार अनेक वेळा प्रविष्ट केले गेले आहे
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,निव्वळ नफा / तोटा
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,खरेदी ऑर्डर बाबींचा पुरवठा
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,कंपनी नाव कंपनी असू शकत नाही
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,कंपनी नाव कंपनी असू शकत नाही
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,प्रिंट टेम्पलेट साठी letter.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,प्रिंट टेम्पलेट साठी शोध शिर्षके फाईल नाव उदा. Proforma चलन
 DocType: Program Enrollment,Walking,चालणे
 DocType: Student Guardian,Student Guardian,विद्यार्थी पालक
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,मूल्यांकन प्रकार शुल्क समावेश म्हणून चिन्हांकित करू शकत नाही
 DocType: POS Profile,Update Stock,अद्यतन शेअर
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,सबस्क्रिप्शनमध्ये
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,आयटम साठी विविध UOM अयोग्य (एकूण) निव्वळ वजन मूल्य नेईल. प्रत्येक आयटम निव्वळ वजन समान UOM आहे याची खात्री करा.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM दर
 DocType: Asset,Journal Entry for Scrap,स्क्रॅप साठी जर्नल प्रवेश
@@ -3552,15 +3620,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","प्रणाली वापरकर्ता (लॉग-इन) आयडी. सेट केल्यास, हे सर्व एचआर फॉर्मसाठी  मुलभूत होईल."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: पासून {1}
 DocType: Task,depends_on,च्या वर अवलंबून असणे
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,सर्व बिल ऑफ मटेरिअममध्ये नवीनतम किंमत अद्यतनित करण्यासाठी रांगेत. यास काही मिनिटे लागतील.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,सर्व बिल ऑफ मटेरिअममध्ये नवीनतम किंमत अद्यतनित करण्यासाठी रांगेत. यास काही मिनिटे लागतील.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,नवीन खाते नाव. टीप: ग्राहक व पुरवठादार साठी खाती तयार करू नका
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,देशनिहाय मुलभूत पत्ता टेम्पलेट
 DocType: Sales Order Item,Supplier delivers to Customer,पुरवठादार ग्राहक वितरण
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# फॉर्म / आयटम / {0}) स्टॉक बाहेर आहे
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},मुळे / संदर्भ तारीख  {0} नंतर असू शकत नाही
+,Sales Payment Summary,विक्री देयक सारांश
+DocType: Restaurant,Restaurant,उपहारगृह
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},मुळे / संदर्भ तारीख  {0} नंतर असू शकत नाही
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,डेटा आयात आणि निर्यात
 DocType: Patient,Account Details,खाते तपशील
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,नाही विद्यार्थ्यांनी सापडले
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,नाही विद्यार्थ्यांनी सापडले
 DocType: Medical Department,Medical Department,वैद्यकीय विभाग
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,पुरवठादार धावसंख्याकार्ड स्कोअरिंग मापदंड
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,अशी यादी तयार करण्यासाठी   पोस्ट तारीख
@@ -3571,8 +3641,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,कृपया पार्टी निवड केली पोस्टिंग तारीख निवडा
 DocType: Program Enrollment,School House,शाळा हाऊस
 DocType: Serial No,Out of AMC,एएमसी पैकी
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,कृपया अवतरणे निवडा
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,कृपया अवतरणे निवडा
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,कृपया अवतरणे निवडा
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,कृपया अवतरणे निवडा
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,पूर्वनियोजित Depreciations संख्या Depreciations एकूण संख्या पेक्षा जास्त असू शकत नाही
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,देखभाल भेट करा
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,ज्या वापरकर्त्याची  विक्री मास्टर व्यवस्थापक {0} भूमिका आहे त्याला कृपया संपर्ग साधा
@@ -3580,7 +3650,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,कंपनी ( ग्राहक किंवा पुरवठादार नाही) मास्टर.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,हे या विद्यार्थी पोषाख आधारित आहे
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,नाही विद्यार्थी
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,अधिक आयटम किंवा ओपन पूर्ण फॉर्म जोडा
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,अधिक आयटम किंवा ओपन पूर्ण फॉर्म जोडा
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,डिलिव्हरी टिपा {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,वापरकर्त्यांकडे जा
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,पेड रक्कम + एकूण रक्कमेपेक्षा   पेक्षा जास्त असू शकत नाही बंद लिहा
@@ -3600,37 +3670,40 @@
 DocType: Fee Schedule,Fee Schedule,शुल्क वेळापत्रक
 DocType: Hub Settings,Publish Availability,उपलब्धता प्रकाशित
 DocType: Company,Create Chart Of Accounts Based On,लेखा आधारित चार्ट तयार करा
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,ते गटबद्ध करू शकत नाही बालकार्य अस्तित्वात आहेत.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,जन्म तारीख आज पेक्षा जास्त असू शकत नाही.
 ,Stock Ageing,शेअर Ageing
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},विद्यार्थी {0} विद्यार्थी अर्जदार विरुद्ध अस्तित्वात {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),गोलाकार समायोजन (कंपनी चलन)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,वेळ पत्रक
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,वेळ पत्रक
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} &#39;{1}&#39; अक्षम आहे
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,उघडा म्हणून सेट करा
 DocType: Cheque Print Template,Scanned Cheque,स्कॅन धनादेश
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,व्यवहार सादर केल्यावर   संपर्कांना  स्वयंचलित ईमेल पाठवा.
 DocType: Timesheet,Total Billable Amount,एकूण बिल रक्कम
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,आयटम 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,ऑर्डर नोंदवा
 DocType: Purchase Order,Customer Contact Email,ग्राहक संपर्क ईमेल
 DocType: Warranty Claim,Item and Warranty Details,आयटम आणि हमी तपशील
 DocType: Sales Team,Contribution (%),योगदान (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,टीप: भरणा प्रवेश पासून तयार केले जाणार नाहीत &#39;रोख किंवा बँक खाते&#39; निर्दिष्ट नाही
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,{0} प्रकल्प आधीच अस्तित्वात आहे
 DocType: Medical Department,Nursing User,नर्सिंग उपयोगकर्ता
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,जबाबदारी
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,या कोटेशनची वैधता संपली आहे.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,या कोटेशनची वैधता संपली आहे.
 DocType: Expense Claim Account,Expense Claim Account,खर्च दावा खाते
 DocType: Accounts Settings,Allow Stale Exchange Rates,लावलेल्या विनिमय दरांना परवानगी द्या
 DocType: Sales Person,Sales Person Name,विक्री व्यक्ती नाव
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,टेबल मध्ये किमान 1 चलन प्रविष्ट करा
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,वापरकर्ते जोडा
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,वापरकर्ते जोडा
 DocType: POS Item Group,Item Group,आयटम गट
 DocType: Item,Safety Stock,सुरक्षितता शेअर
 DocType: Healthcare Settings,Healthcare Settings,हेल्थकेअर सेटिंग्ज
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,कार्य प्रगतीपथावर% 100 पेक्षा जास्त असू शकत नाही.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,कार्य प्रगतीपथावर% 100 पेक्षा जास्त असू शकत नाही.
 DocType: Stock Reconciliation Item,Before reconciliation,समेट करण्यापूर्वी
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},करण्यासाठी {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),कर आणि शुल्क जोडले (कंपनी चलन)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,आयटम कर रो {0}  कर  किंवा उत्पन्न किंवा खर्चाचे किंवा भार प्रकारचे खाते असणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,आयटम कर रो {0}  कर  किंवा उत्पन्न किंवा खर्चाचे किंवा भार प्रकारचे खाते असणे आवश्यक आहे
 DocType: Sales Order,Partly Billed,अंशतः बिल आकारले
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,आयटम {0} मुदत मालमत्ता आयटम असणे आवश्यक आहे
 DocType: Item,Default BOM,मुलभूत BOM
@@ -3646,6 +3719,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,अस्थिर
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,डिलिव्हरी टीप पासून
 DocType: Student,Student Email Address,विद्यार्थी ई-मेल पत्ता
+DocType: Item,Hub Warehouse,हब वेअरहाऊस
 DocType: Physician Schedule Time Slot,From Time,वेळ पासून
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,स्टॉक मध्ये:
 DocType: Notification Control,Custom Message,सानुकूल संदेश
@@ -3654,9 +3728,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,विद्यार्थी पत्ता
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,विद्यार्थी पत्ता
 DocType: Purchase Invoice,Price List Exchange Rate,किंमत सूची विनिमय दर
+DocType: POS Profile,POS Profile Name,पीओएस प्रोफाइल नाव
 DocType: Purchase Invoice Item,Rate,दर
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,हद्दीच्या
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,पत्ता नाव
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,पत्ता नाव
 DocType: Stock Entry,From BOM,BOM पासून
 DocType: Assessment Code,Assessment Code,मूल्यांकन कोड
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,मूलभूत
@@ -3670,11 +3745,12 @@
 DocType: Salary Slip,Salary Structure,वेतन रचना
 DocType: Account,Bank,बँक
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,एयरलाईन
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,समस्या साहित्य
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,समस्या साहित्य
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,आवर्ती तयार करताना त्रुटी आली
 DocType: Material Request Item,For Warehouse,वखार साठी
 DocType: Employee,Offer Date,ऑफर तारीख
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,बोली
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,आपण ऑफलाइन मोड मध्ये आहोत. आपण नेटवर्क पर्यंत रीलोड सक्षम होणार नाही.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,आपण ऑफलाइन मोड मध्ये आहोत. आपण नेटवर्क पर्यंत रीलोड सक्षम होणार नाही.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,नाही विद्यार्थी गट निर्माण केले.
 DocType: Purchase Invoice Item,Serial No,सिरियल नाही
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,मासिक परतफेड रक्कम कर्ज रक्कम पेक्षा जास्त असू शकत नाही
@@ -3684,17 +3760,18 @@
 DocType: Salary Slip,Total Working Hours,एकूण कार्याचे तास
 DocType: Subscription,Next Schedule Date,पुढील वेळापत्रक तारीख
 DocType: Stock Entry,Including items for sub assemblies,उप विधानसभा आयटम समावेश
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,प्रविष्ट मूल्य सकारात्मक असणे आवश्यक आहे
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,सर्व प्रदेश
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,प्रविष्ट मूल्य सकारात्मक असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,सर्व प्रदेश
 DocType: Purchase Invoice,Items,आयटम
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,विद्यार्थी आधीच नोंदणी केली आहे.
 DocType: Fiscal Year,Year Name,वर्ष नाव
 DocType: Process Payroll,Process Payroll,प्रक्रिया वेतनपट
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,कामाच्या  दिवसापेक्षा अधिक सुट्ट्या  या महिन्यात आहेत.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,कामाच्या  दिवसापेक्षा अधिक सुट्ट्या  या महिन्यात आहेत.
 DocType: Product Bundle Item,Product Bundle Item,उत्पादन बंडल आयटम
 DocType: Sales Partner,Sales Partner Name,विक्री भागीदार नाव
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,अवतरणे विनंती
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,अवतरणे विनंती
 DocType: Payment Reconciliation,Maximum Invoice Amount,कमाल चलन रक्कम
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,हेमॅटोलॉजी
 DocType: Normal Test Items,Normal Test Items,सामान्य चाचणी आयटम
 DocType: Student Language,Student Language,विद्यार्थी भाषा
 apps/erpnext/erpnext/config/selling.py +23,Customers,ग्राहक
@@ -3706,10 +3783,11 @@
 DocType: Issue,Opening Time,उघडण्याची  वेळ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,पासून आणि  पर्यंत तारखा आवश्यक आहेत
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,सिक्युरिटीज अँड कमोडिटी
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"'{0}' प्रकार करीता माप मुलभूत युनिट साचा म्हणून समान असणे आवश्यक आहे, '{1}'"
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"'{0}' प्रकार करीता माप मुलभूत युनिट साचा म्हणून समान असणे आवश्यक आहे, '{1}'"
 DocType: Shipping Rule,Calculate Based On,आधारित असणे
 DocType: Delivery Note Item,From Warehouse,वखार पासून
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,कारखानदार सामग्रीचा बिल नाही आयटम
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,कारखानदार सामग्रीचा बिल नाही आयटम
+DocType: Restaurant,Default Customer,डीफॉल्ट ग्राहक
 DocType: Assessment Plan,Supervisor Name,पर्यवेक्षक नाव
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,त्याच दिवशी नियोजित भेटीची तयार झाल्याची पुष्टी करू नका
 DocType: Program Enrollment Course,Program Enrollment Course,कार्यक्रम नावनोंदणी कोर्स
@@ -3737,7 +3815,7 @@
 DocType: Payment Entry,Internal Transfer,अंतर्गत ट्रान्सफर
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,बाल खाते हे खाते विद्यमान आहे. आपण हे खाते हटवू शकत नाही.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,एकतर लक्ष्य qty किंवा लक्ष्य रक्कम अनिवार्य आहे
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},डीफॉल्ट BOM आयटम {0} साठी अस्तित्वात नाही
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},डीफॉल्ट BOM आयटम {0} साठी अस्तित्वात नाही
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,कृपया पहले पोस्टिंग तारीख निवडा
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,तारीख उघडण्याच्या तारीख बंद करण्यापूर्वी असावे
 DocType: Leave Control Panel,Carry Forward,कॅरी फॉरवर्ड
@@ -3773,6 +3851,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,एकूण उपस्थित
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,लेखा स्टेटमेन्ट
 DocType: Drug Prescription,Hour,तास
+DocType: Restaurant Order Entry,Last Sales Invoice,अंतिम विक्री चलन
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,नवीन सिरिअल क्रमांक कोठार असू  शकत नाही. कोठार शेअर नोंद किंवा खरेदी पावती सेट करणे आवश्यक आहे
 DocType: Lead,Lead Type,लीड प्रकार
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,आपल्याला ब्लॉक तारखेवर  पाने मंजूर करण्यासाठी अधिकृत नाही
@@ -3809,65 +3888,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,वापरकर्ते तयार करा
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,ग्राम
 DocType: Supplier Scorecard,Per Month,दर महिन्याला
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,उत्पादनासाठीचे  प्रमाण 0 पेक्षा जास्त असणे आवश्यक आहे.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,उत्पादनासाठीचे  प्रमाण 0 पेक्षा जास्त असणे आवश्यक आहे.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,देखभाल कॉल अहवाल भेट द्या.
 DocType: Stock Entry,Update Rate and Availability,रेट अद्यतनित करा आणि उपलब्धता
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"टक्केवारी तुम्हांला स्वीकारण्याची  किंवा आदेश दिलेल्या  प्रमाणा विरुद्ध अधिक वितरीत करण्याची परवानगी आहे. उदाहरणार्थ: जर तुम्ही 100 युनिट्स चा आदेश दिला  असेल, आणि आपला  भत्ता 10%  असेल तर तुम्हाला 110 units  प्राप्त करण्याची अनुमती आहे."
 DocType: POS Customer Group,Customer Group,ग्राहक गट
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),नवीन बॅच आयडी (पर्यायी)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),नवीन बॅच आयडी (पर्यायी)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),नवीन बॅच आयडी (पर्यायी)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),नवीन बॅच आयडी (पर्यायी)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},खर्च खाते आयटम  {0} साठी अनिवार्य आहे
 DocType: BOM,Website Description,वेबसाइट वर्णन
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,इक्विटी निव्वळ बदला
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,नवीनतम
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,चलन खरेदी {0} रद्द करा पहिला
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ई-मेल पत्ता, अद्वितीय असणे आवश्यक आहे आधीच अस्तित्वात आहे {0}"
 DocType: Serial No,AMC Expiry Date,एएमसी कालावधी समाप्ती तारीख
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,पावती
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,पावती
 ,Sales Register,विक्री नोंदणी
 DocType: Daily Work Summary Settings Company,Send Emails At,वेळी ई-मेल पाठवा
 DocType: Quotation,Quotation Lost Reason,कोटेशन हरवले कारण
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,आपल्या डोमेन निवडा
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',* टॅबपॅटाईलमधून * निवडा जेथे नाव = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},व्यवहार संदर्भ नाहीत {0} दिनांक {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},व्यवहार संदर्भ नाहीत {0} दिनांक {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,संपादित करण्यासाठी काहीही नाही.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,फॉर्म दृश्य
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,या महिन्यासाठी  आणि प्रलंबित उपक्रम सारांश
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,फॉर्म दृश्य
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,या महिन्यासाठी  आणि प्रलंबित उपक्रम सारांश
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.",आपल्या व्यतिरिक्त इतरांना आपल्या संस्थेत सामील करा
 DocType: Customer Group,Customer Group Name,ग्राहक गट नाव
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,अद्याप कोणत्याही ग्राहक!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,अद्याप कोणत्याही ग्राहक!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,रोख फ्लो स्टेटमेंट
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},कर्ज रक्कम कमाल कर्ज रक्कम जास्त असू शकत नाही {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,परवाना
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},सी-फॉर्म{1} मधून  चलन {0} काढून टाका
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},सी-फॉर्म{1} मधून  चलन {0} काढून टाका
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,आपण देखील मागील आर्थिक वर्षातील शिल्लक रजा या आर्थिक वर्षात समाविष्ट करू इच्छित असल्यास कृपया कॅरी फॉरवर्ड निवडा
 DocType: GL Entry,Against Voucher Type,व्हाउचर प्रकार विरुद्ध
 DocType: Physician,Phone (R),फोन (आर)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,टाइम स्लॉट जोडला
 DocType: Item,Attributes,विशेषता
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,टेम्पलेट सक्षम करा
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,कृपया {0} साठी सेटअप&gt; सेटिंग्ज&gt; नाविक शृंखला मार्गे नेमिशन सीरीज सेट करा
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Write Off खाते प्रविष्ट करा
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,गेल्या ऑर्डर तारीख
 DocType: Patient,B Negative,ब नकारात्मक
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},खाते {0} ला  कंपनी {1} मालकीचे नाही
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,{0} सलग मालिका संख्या डिलिव्हरी टीप जुळत नाही
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,{0} सलग मालिका संख्या डिलिव्हरी टीप जुळत नाही
 DocType: Student,Guardian Details,पालक तपशील
 DocType: C-Form,C-Form,सी-फॉर्म
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,अनेक कर्मचाऱ्यांना उपस्थिती चिन्ह
 DocType: Vehicle,Chassis No,चेसिस कोणत्याही
 DocType: Payment Request,Initiated,सुरू
 DocType: Production Order,Planned Start Date,नियोजनबद्ध प्रारंभ तारीख
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,कृपया एक BOM निवडा
 DocType: Serial No,Creation Document Type,निर्मिती दस्तऐवज क्रमांक
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,समाप्ती तारीख प्रारंभ तारखेपेक्षा मोठी असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,समाप्ती तारीख प्रारंभ तारखेपेक्षा मोठी असणे आवश्यक आहे
 DocType: Leave Type,Is Encash,रोख रकमेत बदलून आहे
 DocType: Leave Allocation,New Leaves Allocated,नवी पाने वाटप
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,प्रकल्प निहाय माहिती कोटेशन उपलब्ध नाही
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,चालू करा
 DocType: Project,Expected End Date,अपेक्षित शेवटची तारीख
 DocType: Budget Account,Budget Amount,बजेट रक्कम
 DocType: Appraisal Template,Appraisal Template Title,मूल्यांकन साचा शीर्षक
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},पासून तारीख {0} कर्मचारी {1} कर्मचारी सामील तारीख असू शकत नाही {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,व्यावसायिक
 DocType: Patient,Alcohol Current Use,मद्य चालू वापर
+DocType: Student Admission Program,Student Admission Program,विद्यार्थी प्रवेश कार्यक्रम
 DocType: Payment Entry,Account Paid To,खाते अदा
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,पालक आयटम {0} शेअर आयटम असू शकत नाही
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,सर्व उत्पादने किंवा सेवा.
@@ -3876,30 +3957,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} खाते अर्थसंकल्पात {1} विरुद्ध {2} {3} आहे {4}. तो टाकेल {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',सलग {0} # खाते प्रकार असणे आवश्यक आहे &#39;निश्चित मालमत्ता&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,आउट Qty
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,नियम विक्रीसाठी शिपिंग रक्कम गणना
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,आणि बंद न केलेले
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,मालिका अनिवार्य आहे
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,वित्तीय सेवा
 DocType: Student Sibling,Student ID,विद्यार्थी ओळखपत्र
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,वेळ नोंदी उपक्रम प्रकार
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,पुरवठादार ईमेल
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,वेळ नोंदी उपक्रम प्रकार
 DocType: Tax Rule,Sales,विक्री
 DocType: Stock Entry Detail,Basic Amount,मूलभूत रक्कम
 DocType: Training Event,Exam,परीक्षा
 DocType: Complaint,Complaint,तक्रार
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},स्टॉक आयटम  {0} साठी आवश्यक कोठार
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},स्टॉक आयटम  {0} साठी आवश्यक कोठार
 DocType: Leave Allocation,Unused leaves,न वापरलेल्या  रजा
 DocType: Patient,Alcohol Past Use,मद्याचा शेवटचा वापर
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,कोटी
 DocType: Tax Rule,Billing State,बिलिंग राज्य
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,ट्रान्सफर
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),(उप-मंडळ्यांना समावेश) स्फोट झाला BOM प्राप्त
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,ट्रान्सफर
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),(उप-मंडळ्यांना समावेश) स्फोट झाला BOM प्राप्त
 DocType: Authorization Rule,Applicable To (Employee),लागू करण्यासाठी (कर्मचारी)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,देय तारीख अनिवार्य आहे
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,देय तारीख अनिवार्य आहे
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,विशेषता साठी बढती {0} 0 असू शकत नाही
 DocType: Journal Entry,Pay To / Recd From,पासून / Recd अदा
 DocType: Naming Series,Setup Series,सेटअप मालिका
 DocType: Payment Reconciliation,To Invoice Date,तारीख चलन करण्यासाठी
 DocType: Supplier,Contact HTML,संपर्क HTML
 ,Inactive Customers,निष्क्रिय ग्राहक
+DocType: Student Admission Program,Maximum Age,कमाल वय
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,खरेदी पावती
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,कसे किंमत नियम लागू आहे?
@@ -3918,6 +4001,7 @@
 DocType: GL Entry,Remarks,शेरा
 DocType: Payment Entry,Account Paid From,पासून खाते सशुल्क
 DocType: Purchase Order Item Supplied,Raw Material Item Code,कच्चा माल आयटम कोड
+DocType: Task,Parent Task,पालक कार्य
 DocType: Journal Entry,Write Off Based On,आधारित Write Off
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,लीड करा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,प्रिंट आणि स्टेशनरी
@@ -3926,20 +4010,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",पगार दरम्यान {0} आणि {1} द्या अनुप्रयोग या कालावधीत तारीख श्रेणी दरम्यान असू शकत नाही कालावधीसाठी आधीपासून प्रक्रिया.
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,एक सिरियल क्रमांकासाठी  प्रतिष्ठापन रेकॉर्ड
 DocType: Guardian Interest,Guardian Interest,पालक व्याज
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,पीओएस इन्व्हॉइसेससाठी डिफॉल्ट व्हॅल्यू सेट करा
 apps/erpnext/erpnext/config/hr.py +177,Training,प्रशिक्षण
 DocType: Timesheet,Employee Detail,कर्मचारी तपशील
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ईमेल आयडी
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ईमेल आयडी
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,पुढील तारीख दिवस आणि पुन्हा महिन्याच्या दिवशी समान असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,पुढील तारीख दिवस आणि पुन्हा महिन्याच्या दिवशी समान असणे आवश्यक आहे
 DocType: Lab Prescription,Test Code,चाचणी कोड
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,वेबसाइट मुख्यपृष्ठ सेटिंग्ज
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},{1} च्या स्कोअरकार्ड स्टँडमुळे RFQs ला {0} अनुमती नाही
 DocType: Offer Letter,Awaiting Response,प्रतिसाद प्रतीक्षा करत आहे
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,वर
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},एकूण रक्कम {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},अवैध विशेषता {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},एकूण रक्कम {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},अवैध विशेषता {0} {1}
 DocType: Supplier,Mention if non-standard payable account,उल्लेख मानक-नसलेला देय खाते तर
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},सारख्या आयटमचा एकाधिक वेळा गेले. {यादी}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',कृपया &#39;सर्व मूल्यांकन गट&#39; ऐवजी मूल्यांकन गट निवडा
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},रो {0}: आयटम {1} साठी मूल्य केंद्र आवश्यक आहे
 DocType: Training Event Employee,Optional,पर्यायी
@@ -3964,11 +4048,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,उत्पादन बंडलचे आयटम मिळवा
 DocType: Asset,Straight Line,सरळ रेष
 DocType: Project User,Project User,प्रकल्प वापरकर्ता
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,स्प्लिट
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,स्प्लिट
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,स्प्लिट
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,स्प्लिट
 DocType: GL Entry,Is Advance,आगाऊ आहे
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,उपस्थिती पासून तारीख आणि उपस्थिती पर्यंत  तारीख अनिवार्य आहे
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,'Subcontracted आहे' होय किंवा नाही म्हणून प्रविष्ट करा
+DocType: Item,Default Purchase Unit of Measure,मापन डीफॉल्ट खरेदी एकक
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,गेल्या कम्युनिकेशन तारीख
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,गेल्या कम्युनिकेशन तारीख
 DocType: Sales Team,Contact No.,संपर्क क्रमांक
@@ -3977,7 +4062,6 @@
 DocType: Production Order,Check if material transfer entry is not required,साहित्य हस्तांतरण नोंद आवश्यक नाही आहे का ते तपासा
 DocType: Production Order,Check if material transfer entry is not required,साहित्य हस्तांतरण नोंद आवश्यक नाही आहे का ते तपासा
 DocType: Program Enrollment Tool,Get Students From,पासून विद्यार्थी मिळवा
-DocType: Hub Settings,Seller Country,विक्रेता देश
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,वेबसाइट वर प्रकाशित आयटम
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,बॅच मध्ये आपल्या विद्यार्थ्यांना गट
 DocType: Authorization Rule,Authorization Rule,प्राधिकृत नियम
@@ -3987,8 +4071,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,विक्री कर आणि शुल्क साचा
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),एकूण (क्रेडिट)
 DocType: Repayment Schedule,Payment Date,पगाराची तारीख
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,नवीन बॅच प्रमाण
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,नवीन बॅच प्रमाण
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,नवीन बॅच प्रमाण
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,नवीन बॅच प्रमाण
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,तयार कपडे आणि अॅक्सेसरीज
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,भारित केलेल्या स्कोअर कार्याचे निराकरण करता आले नाही सूत्र वैध असल्याची खात्री करा.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,ऑर्डर संख्या
@@ -4006,6 +4090,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","सलग # {0}: मालमत्ता {1} सादर केला जाऊ शकत नाही, तो आधीपासूनच आहे {2}"
 DocType: Tax Rule,Billing Country,बिलिंग देश
 DocType: Purchase Order Item,Expected Delivery Date,अपेक्षित वितरण तारीख
+DocType: Restaurant Order Entry,Restaurant Order Entry,रेस्टॉरंट ऑर्डर प्रविष्टी
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,डेबिट आणि क्रेडिट {0} # समान नाही {1}. फरक आहे {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,मनोरंजन खर्च
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,साहित्य विनंती करा
@@ -4018,9 +4103,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,विद्यमान व्यवहार खाते हटविले जाऊ शकत नाही
 DocType: Vehicle,Last Carbon Check,गेल्या कार्बन तपासा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,कायदेशीर खर्च
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,कृपया रांगेत प्रमाणात निवडा
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,कृपया रांगेत प्रमाणात निवडा
 DocType: Purchase Invoice,Posting Time,पोस्टिंग वेळ
 DocType: Timesheet,% Amount Billed,% रक्कम बिल
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;वेळ प्रति अपॉईंटमेंट&quot; डॉ साठी सेट केले गेले नाही {0}. ते फिजीशियन मास्टर मध्ये जोडा.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,टेलिफोन खर्च
 DocType: Sales Partner,Logo,लोगो
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"आपण जतन करण्यापूर्वी मालिका निवडा वापरकर्ता सक्ती करायचे असल्यास हे  तपासा. आपण या चेक केले, तर मुलभूत नसेल."
@@ -4031,6 +4117,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,नवीन ग्राहक महसूल
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,प्रवास खर्च
 DocType: Maintenance Visit,Breakdown,यंत्रातील बिघाड
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Doctype {0} मध्ये सानुकूल फील्ड सदस्यता जोडा
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,खाते: {0} चलन: {1} बरोबर  निवडले जाऊ शकत नाही
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","नवीनतम मूल्यांकन दर / किंमत सूची दर / कच्चा माल शेवटच्या खरेदी दर यावर आधारित, शेड्युलरद्वारे स्वयंचलितपणे BOM दर अद्यतनित करा."
 DocType: Bank Reconciliation Detail,Cheque Date,धनादेश तारीख
@@ -4055,7 +4142,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),एकूण बिलिंग रक्कम (वेळ नोंदी द्वारे)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,पुरवठादार आयडी
 DocType: Payment Request,Payment Gateway Details,पेमेंट गेटवे तपशील
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,प्रमाण 0 पेक्षा जास्त असणे आवश्यक आहे
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,प्रमाण 0 पेक्षा जास्त असणे आवश्यक आहे
 DocType: Journal Entry,Cash Entry,रोख प्रवेश
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,बाल नोडस् फक्त &#39;ग्रुप&#39; प्रकार नोडस् अंतर्गत तयार केले जाऊ शकते
 DocType: Leave Application,Half Day Date,अर्धा दिवस तारीख
@@ -4073,12 +4160,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,टीप: आयटम {0} अनेक वेळा प्रवेश केला
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,सर्व संपर्क.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,कंपनी Abbreviation
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,सदस्य {0} अस्तित्वात नाही
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,सदस्य {0} अस्तित्वात नाही
 DocType: Subscription,SUB-,उप-
 DocType: Item Attribute Value,Abbreviation,संक्षेप
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,भरणा प्रवेश आधिपासूनच अस्तित्वात आहे
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} ने मर्यादा ओलांडल्यापासून authroized नाही
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,वेतन टेम्प्लेट मास्टर.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,पॅथॉलॉजी
+DocType: Restaurant Order Entry,Restaurant Table,रेस्टॉरन्ट टेबल
 DocType: Leave Type,Max Days Leave Allowed,कमाल दिवस रजा परवानगी
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,हे खरेदी सूचीत टाका  कर नियम सेट करा .
 DocType: Purchase Invoice,Taxes and Charges Added,कर आणि शुल्क जोडले
@@ -4090,10 +4179,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,निष्पन्न किंवा ग्राहकांना कोट्स.
 DocType: Stock Settings,Role Allowed to edit frozen stock,भूमिका गोठविलेला  स्टॉक संपादित करण्याची परवानगी
 ,Territory Target Variance Item Group-Wise,प्रदेश लक्ष्य फरक आयटम गट निहाय
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,सर्व ग्राहक गट
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,सर्व ग्राहक गट
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,जमा मासिक
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} आवश्यक आहे. कदाचित चलन विनिमय रेकॉर्ड {1} {2} करण्यासाठी तयार केले नाही.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,कर साचा बंधनकारक आहे.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,कर साचा बंधनकारक आहे.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,खाते {0}: पालक खाते {1} अस्तित्वात नाही
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),किंमत सूची दर (कंपनी चलन)
 DocType: Products Settings,Products Settings,उत्पादने सेटिंग्ज
@@ -4119,13 +4208,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,आयटमनूसार  कर तपशील
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,संस्था संक्षेप
 ,Item-wise Price List Rate,आयटमनूसार  किंमत सूची दर
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,पुरवठादार कोटेशन
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,पुरवठादार कोटेशन
 DocType: Quotation,In Words will be visible once you save the Quotation.,तुम्ही अवतरण एकदा जतन केल्यावर  शब्दा मध्ये दृश्यमान होईल.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},प्रमाण ({0}) एकापाठोपाठ एक अपूर्णांक असू शकत नाही {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},प्रमाण ({0}) एकापाठोपाठ एक अपूर्णांक असू शकत नाही {1}
 DocType: Consultation,C-,सी-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},बारकोड {0} आधीच आयटम वापरले {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},बारकोड {0} आधीच आयटम वापरले {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,शिपिंग खर्च जोडून नियम.
 DocType: Item,Opening Stock,शेअर उघडत
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ग्राहक आवश्यक आहे
@@ -4143,9 +4232,8 @@
 DocType: Customer,From Lead,लीड पासून
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ऑर्डर उत्पादनासाठी  प्रकाशीत.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,आर्थिक वर्ष निवडा ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,पीओएस प्रोफाइल पीओएस नोंद करण्यासाठी  आवश्यक
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,पीओएस प्रोफाइल पीओएस नोंद करण्यासाठी  आवश्यक
 DocType: Program Enrollment Tool,Enroll Students,विद्यार्थी ची नोंदणी करा
-DocType: Hub Settings,Name Token,नाव टोकन
 DocType: Lab Test,Approved Date,मंजूर तारीख
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,मानक विक्री
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,किमान एक कोठार अनिवार्य आहे
@@ -4163,7 +4251,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,मानव संसाधन
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,भरणा सलोखा भरणा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,कर मालमत्ता
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},उत्पादन ऑर्डर केले आहे {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},उत्पादन ऑर्डर केले आहे {0}
 DocType: BOM Item,BOM No,BOM नाही
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,जर्नल प्रवेश {0} इतर व्हाउचर विरुद्ध {1} किंवा आधीच जुळणारे खाते नाही
@@ -4183,8 +4271,8 @@
 DocType: Currency Exchange,To Currency,चलन
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,खालील वापरकर्त्यांना ब्लॉक दिवस रजा अर्ज मंजूर करण्याची परवानगी द्या.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,खर्चाचे हक्काचा प्रकार.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},"विक्री आयटम दर {0} पेक्षा कमी आहे, त्याच्या {1}. विक्री दर असावे किमान {2}"
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},"विक्री आयटम दर {0} पेक्षा कमी आहे, त्याच्या {1}. विक्री दर असावे किमान {2}"
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},"विक्री आयटम दर {0} पेक्षा कमी आहे, त्याच्या {1}. विक्री दर असावे किमान {2}"
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},"विक्री आयटम दर {0} पेक्षा कमी आहे, त्याच्या {1}. विक्री दर असावे किमान {2}"
 DocType: Item,Taxes,कर
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,दिले आणि वितरित नाही
 DocType: Project,Default Cost Center,मुलभूत खर्च केंद्र
@@ -4198,15 +4286,15 @@
 DocType: Employee Loan,Fully Disbursed,पूर्णपणे वाटप
 DocType: Maintenance Visit,Customer Feedback,ग्राहक अभिप्राय
 DocType: Account,Expense,खर्च
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,धावसंख्या कमाल धावसंख्या पेक्षा जास्त असू शकत नाही
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,धावसंख्या कमाल धावसंख्या पेक्षा जास्त असू शकत नाही
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,ग्राहक आणि पुरवठादार
 DocType: Item Attribute,From Range,श्रेणी पासून
 DocType: BOM,Set rate of sub-assembly item based on BOM,BOM वर आधारित उप-विधानसभा वस्तू दर सेट करा
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},सूत्र किंवा स्थितीत वाक्यरचना त्रुटी: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},सूत्र किंवा स्थितीत वाक्यरचना त्रुटी: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,दररोज काम सारांश सेटिंग्ज कंपनी
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,आयटम {0} एक स्टॉक आयटम नसल्यामुळे  दुर्लक्षित केला आहे
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,पुढील प्रक्रियेसाठी  ही उत्पादन मागणी सबमिट करा.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,पुढील प्रक्रियेसाठी  ही उत्पादन मागणी सबमिट करा.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","एका विशिष्ट व्यवहारात  किंमत नियम लागू न करण्यासाठी, सर्व लागू किंमत नियम अक्षम करणे आवश्यक आहे."
 DocType: Assessment Group,Parent Assessment Group,पालक मूल्यांकन गट
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,नोकरी
@@ -4223,12 +4311,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',गट करून &#39;कंपनी&#39; आहे तर कंपनी रिक्त फिल्टर सेट करा
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,पोस्टिंग तारीख भविष्यातील तारीख असू शकत नाही
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},रो # {0}: सिरियल क्रमांक  {1} हा {2} {3}सोबत  जुळत नाही
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,आवर्ती निर्माण करण्यासाठी
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,प्रासंगिक रजा
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,प्रयोगशाळेत UOM
 DocType: Batch,Batch ID,बॅच आयडी
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},टीप: {0}
 ,Delivery Note Trends,डिलिव्हरी टीप ट्रेन्ड
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,या आठवड्यातील सारांश
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,या आठवड्यातील सारांश
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,शेअर प्रमाण मध्ये
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,खाते: {0} केवळ शेअर व्यवहार द्वारे अद्यतनित केले जाऊ शकतात
 DocType: Student Group Creation Tool,Get Courses,अभ्यासक्रम मिळवा
@@ -4242,7 +4331,6 @@
 DocType: Purchase Order,To Bill,बिल
 DocType: Material Request,% Ordered,% आदेश दिले
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","कोर्स आधारित विद्यार्थी गट, कार्यक्रम नावनोंदणी नोंदणी अभ्यासक्रम पासून प्रत्येक विद्यार्थ्यासाठी कोर्स तपासले जाईल."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","स्वल्पविरामाने विभक्त करुन प्रविष्ट करा ईमेल पत्ता, बीजक विशिष्ट दिवशी आपोआप मेल केले जाईल"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Piecework
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,सरासरी. खरेदी दर
 DocType: Task,Actual Time (in Hours),(तास) वास्तविक वेळ
@@ -4256,7 +4344,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,{0} आयटम सिरियल क्रमांकासाठी  सेटअप केलेला नाही. स्तंभ रिक्त असणे आवश्यक आहे
 DocType: Accounts Settings,Accounts Settings,खाती सेटिंग्ज
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,मंजूर
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,सबमिट करण्याचे कोणतेही परिणाम नाहीत
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,सबमिट करण्याचे कोणतेही परिणाम नाहीत
 DocType: Customer,Sales Partner and Commission,विक्री भागीदार व आयोगाच्या
 DocType: Employee Loan,Rate of Interest (%) / Year,व्याज (%) / वर्ष दर
 ,Project Quantity,प्रकल्प प्रमाण
@@ -4268,55 +4356,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,ब्लॅक
 DocType: BOM Explosion Item,BOM Explosion Item,BOM स्फोट आयटम
 DocType: Account,Auditor,लेखापरीक्षक
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} आयटम उत्पादन
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} आयटम उत्पादन
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,अधिक जाणून घ्या
 DocType: Cheque Print Template,Distance from top edge,शीर्ष किनार अंतर
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,दर सूची {0} अक्षम असल्यास किंवा अस्तित्वात नाही
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,दर सूची {0} अक्षम असल्यास किंवा अस्तित्वात नाही
 DocType: Purchase Invoice,Return,परत
 DocType: Production Order Operation,Production Order Operation,उत्पादन ऑर्डर ऑपरेशन
 DocType: Pricing Rule,Disable,अक्षम करा
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,भरण्याची पध्दत देयक आवश्यक आहे
 DocType: Project Task,Pending Review,प्रलंबित पुनरावलोकन
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,नेमणूक आणि सल्लामसलत
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} बॅच नोंदणी केलेली नाही आहे {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} बॅच नोंदणी केलेली नाही आहे {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","मालमत्ता {0} तो आधीपासूनच आहे म्हणून, रद्द जाऊ शकत नाही {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),(खर्च दावा द्वारे) एकूण खर्च दावा
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,मार्क अनुपिस्थत
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},सलग {0}: BOM # चलन {1} निवडले चलन समान असावी {2}
 DocType: Journal Entry Account,Exchange Rate,विनिमय दर
 DocType: Patient,Additional information regarding the patient,रुग्णाच्या बाबतीत अतिरिक्त माहिती
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,"विक्री ऑर्डर {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,"विक्री ऑर्डर {0} सबमिट केलेली नाही,"
 DocType: Homepage,Tag Line,टॅग लाइन
 DocType: Fee Component,Fee Component,शुल्क घटक
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,वेगवान व्यवस्थापन
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,आयटम जोडा
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,वेगवान व्यवस्थापन
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,आयटम जोडा
 DocType: Cheque Print Template,Regular,नियमित
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,सर्व मूल्यांकन निकष एकूण वजन 100% असणे आवश्यक आहे
-DocType: BOM,Last Purchase Rate,गेल्या खरेदी दर
+DocType: Purchase Order Item,Last Purchase Rate,गेल्या खरेदी दर
 DocType: Account,Asset,मालमत्ता
 DocType: Project Task,Task ID,कार्य आयडी
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,आयटम {0} साठी Stock अस्तित्वात असू शकत नाही कारण त्याला  variants आहेत
 DocType: Lab Test,Mobile,मोबाईल
 ,Sales Person-wise Transaction Summary,विक्री व्यक्ती-ज्ञानी व्यवहार सारांश
 DocType: Training Event,Contact Number,संपर्क क्रमांक
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,कोठार {0} अस्तित्वात नाही
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext हबसाठी  नोंदणी
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,कोठार {0} अस्तित्वात नाही
 DocType: Monthly Distribution,Monthly Distribution Percentages,मासिक वितरण टक्केवारी
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,निवडलेले आयटमला  बॅच असू शकत नाही
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","मूल्यांकन दर बाबींचा {0}, जे लेखा नोंदी करणे आवश्यक आहे आढळले नाही {1} {2}. आयटम एक नमुना आयटम म्हणून व्यवहार असेल, तर {1}, {1} बाबींचा टेबल की उल्लेख करा. अन्यथा, लेखाचे रेकॉर्ड आयटम किंवा त्याचा उल्लेख मूल्यांकन दर येणाऱ्या स्टॉक व्यवहार एक तयार करा, आणि नंतर / submiting प्रयत्न नोंद रद्द"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,साहित्याचे % या पोच पावती विरोधात वितरित केले आहे
+DocType: Training Event,Has Certificate,प्रमाणपत्र आहे
 DocType: Project,Customer Details,ग्राहक तपशील
 DocType: Employee,Reports to,अहवाल
 ,Unpaid Expense Claim,बाकी खर्च दावा
 DocType: Payment Entry,Paid Amount,पेड रक्कम
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,विक्री चक्र एक्सप्लोर करा
 DocType: Assessment Plan,Supervisor,पर्यवेक्षक
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,ऑनलाइन
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,ऑनलाइन
 ,Available Stock for Packing Items,पॅकिंग आयटम उपलब्ध शेअर
 DocType: Item Variant,Item Variant,आयटम व्हेरियंट
 DocType: Assessment Result Tool,Assessment Result Tool,मूल्यांकन निकाल साधन
 DocType: BOM Scrap Item,BOM Scrap Item,BOM स्क्रॅप बाबींचा
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,सबमिट आदेश हटविले जाऊ शकत नाही
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,सबमिट आदेश हटविले जाऊ शकत नाही
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","आधीच डेबिट मध्ये खाते शिल्लक आहे , आपल्याला ' क्रेडिट ' म्हणून ' शिल्लक असणे आवश्यक आहे ' सेट करण्याची परवानगी नाही"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,गुणवत्ता व्यवस्थापन
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,{0} आयटम अक्षम केले गेले आहे
@@ -4337,7 +4424,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,परवानगी द्या शून्य मूल्यांकन दर
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,परवानगी द्या शून्य मूल्यांकन दर
 DocType: Training Event Employee,Invited,आमंत्रित केले
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,एकाधिक सक्रिय पगार स्ट्रक्चर दिले तारखा कर्मचारी {0} आढळले
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,एकाधिक सक्रिय पगार स्ट्रक्चर दिले तारखा कर्मचारी {0} आढळले
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,सेटअप गेटवे खाती.
 DocType: Employee,Employment Type,रोजगार प्रकार
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,स्थिर मालमत्ता
@@ -4349,7 +4436,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,विद्यार्थी ईमेल आयडी
 DocType: Employee,Notice (days),सूचना (दिवस)
 DocType: Tax Rule,Sales Tax Template,विक्री कर साचा
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,अशी यादी तयार करणे जतन करण्यासाठी आयटम निवडा
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,अशी यादी तयार करणे जतन करण्यासाठी आयटम निवडा
 DocType: Employee,Encashment Date,एनकॅशमेंट तारीख
 DocType: Training Event,Internet,इंटरनेट
 DocType: Special Test Template,Special Test Template,विशेष टेस्ट टेम्पलेट
@@ -4359,7 +4446,7 @@
 DocType: Academic Term,Term Start Date,मुदत प्रारंभ तारीख
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,डॉ संख्या
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,डॉ संख्या
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},संलग्न {0} # {1} शोधा
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},संलग्न {0} # {1} शोधा
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,सामान्य लेजर नुसार बँक स्टेटमेंट शिल्लक
 DocType: Job Applicant,Applicant Name,अर्जदाराचे नाव
 DocType: Authorization Rule,Customer / Item Name,ग्राहक / आयटम नाव
@@ -4379,7 +4466,7 @@
 DocType: Guardian,Guardian Of ,पालकमंत्री
 DocType: Grading Scale Interval,Threshold,उंबरठा
 DocType: BOM Update Tool,Current BOM,वर्तमान BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,सिरियल नाही जोडा
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,सिरियल नाही जोडा
 DocType: Production Order Item,Available Qty at Source Warehouse,स्रोत वखार येथे उपलब्ध प्रमाण
 apps/erpnext/erpnext/config/support.py +22,Warranty,हमी
 DocType: Purchase Invoice,Debit Note Issued,डेबिट टीप जारी
@@ -4402,10 +4489,9 @@
 DocType: Account,Receivable,प्राप्त
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,रो # {0}: पर्चेस आधिपासूनच अस्तित्वात आहे म्हणून पुरवठादार बदलण्याची परवानगी नाही
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,भूमिका ज्याला सेट क्रेडिट मर्यादा ओलांडत व्यवहार सादर करण्याची परवानगी आहे .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,उत्पादन करण्यासाठी आयटम निवडा
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","मास्टर डेटा समक्रमित करणे, तो काही वेळ लागू शकतो"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,उत्पादन करण्यासाठी आयटम निवडा
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","मास्टर डेटा समक्रमित करणे, तो काही वेळ लागू शकतो"
 DocType: Item,Material Issue,साहित्य अंक
-DocType: Hub Settings,Seller Description,विक्रेता वर्णन
 DocType: Employee Education,Qualification,पात्रता
 DocType: Item Price,Item Price,आयटम किंमत
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,साबण आणि कपडे
@@ -4413,7 +4499,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,पासून वेळ पेक्षा जास्त असू शकत नाही.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,मोशन पिक्चर आणि व्हिडिओ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,आदेश दिले
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,पुन्हा सुरू करा
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,पुन्हा सुरू करा
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,जर सक्षम असेल तर सिस्टम टेम्प्लेटमधून विविधतांचे फील्ड अद्यतनित करणार नाही परंतु नवीन प्रकार बनवताना खाली नमूद केलेल्या फील्डचा डेटा कॉपी करेल.
 DocType: Salary Detail,Component,घटक
 DocType: Assessment Criteria,Assessment Criteria Group,मूल्यांकन निकष गट
 DocType: Healthcare Settings,Patient Name By,रुग्णांच्या नावाने
@@ -4423,7 +4510,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,भूमिका मंजूर किंवा सदस्य मंजूर प्रविष्ट करा
 DocType: Journal Entry,Write Off Entry,प्रवेश बंद लिहा
 DocType: BOM,Rate Of Materials Based On,दर साहित्य आधारित रोजी
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
+DocType: Item Variant Settings,Do not Update Variants,भिन्नता अद्ययावत करू नका
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,समर्थन Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,सर्व अनचेक करा
 DocType: POS Profile,Terms and Conditions,अटी आणि शर्ती
@@ -4432,7 +4519,7 @@
 DocType: Leave Block List,Applies to Company,कंपनीसाठी  लागू
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,सादर शेअर प्रवेश {0} अस्तित्वात असल्याने रद्द करू शकत नाही
 DocType: Employee Loan,Disbursement Date,खर्च तारीख
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;प्राप्तकर्ते&#39; निर्दिष्ट नाहीत
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;प्राप्तकर्ते&#39; निर्दिष्ट नाहीत
 DocType: BOM Update Tool,Update latest price in all BOMs,सर्व BOMs मध्ये नवीनतम किंमत अद्यतनित करा
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,वैद्यकीय रेकॉर्ड
 DocType: Vehicle,Vehicle,वाहन
@@ -4448,14 +4535,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,डॉ / लीड%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,मालमत्ता Depreciations आणि शिल्लक
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},रक्कम {0} {1} हस्तांतरित {2} करण्यासाठी {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},रक्कम {0} {1} हस्तांतरित {2} करण्यासाठी {3}
 DocType: Sales Invoice,Get Advances Received,सुधारण प्राप्त करा
 DocType: Email Digest,Add/Remove Recipients,प्राप्तकर्ते  जोडा / काढा
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},व्यवहार बंद उत्पादन विरुद्ध परवानगी नाही ऑर्डर {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","डीफॉल्ट म्हणून या आर्थिक वर्षात सेट करण्यासाठी, 'डीफॉल्ट म्हणून सेट करा' वर क्लिक करा"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,सामील व्हा
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,सामील व्हा
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,कमतरता Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,आयटम  variant {0} ज्याच्यामध्ये समान गुणधर्म अस्तित्वात आहेत
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,आयटम  variant {0} ज्याच्यामध्ये समान गुणधर्म अस्तित्वात आहेत
 DocType: Employee Loan,Repay from Salary,पगार पासून परत फेड करा
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},विरुद्ध पैसे विनंती {0} {1} रक्कम {2}
@@ -4468,7 +4555,7 @@
 DocType: Sales Invoice Item,Sales Order Item,विक्री ऑर्डर आयटम
 DocType: Salary Slip,Payment Days,भरणा दिवस
 DocType: Patient,Dormant,सुप्त
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,मुलाला नोडस् सह गोदामे लेजर रूपांतरीत केले जाऊ शकत नाही
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,मुलाला नोडस् सह गोदामे लेजर रूपांतरीत केले जाऊ शकत नाही
 DocType: BOM,Manage cost of operations,ऑपरेशन खर्च व्यवस्थापित करा
 DocType: Accounts Settings,Stale Days,जुने दिवस
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","जेव्हा तपासले व्यवहार कोणत्याही ""सबमिट"" जातात तेव्हा, एक ईमेल पॉप-अप आपोआप संलग्नक म्हणून व्यवहार, की व्यवहार संबंधित ""संपर्क"" एक ईमेल पाठवू उघडले. वापरकर्ता   ई-मेल पाठवतो किंवा पाठवू शकत नाही."
@@ -4482,10 +4569,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,सिरियल क्रमांक {0} आधीच प्राप्त झाला  आहे
 ,Requested Items To Be Transferred,विनंती आयटम हस्तांतरित करणे
 DocType: Expense Claim,Vehicle Log,वाहन लॉग
-DocType: Purchase Invoice,Recurring Id,आवर्ती आयडी
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),ताप येणे (temp&gt; 38.5 डिग्री से / 101.3 फूट किंवा निरंतर तापमान&gt; 38 ° से / 100.4 ° फॅ)
 DocType: Customer,Sales Team Details,विक्री कार्यसंघ तपशील
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,कायमचे हटवा?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,कायमचे हटवा?
 DocType: Expense Claim,Total Claimed Amount,एकूण हक्क सांगितला रक्कम
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,विक्री संभाव्य संधी.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},अवैध {0}
@@ -4495,7 +4581,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,विभाग स्टोअर्स
 ,Item Delivery Date,आयटम वितरण तारीख
 DocType: Warehouse,PIN,पिन
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,ERPNext आपल्या शाळा सेटअप
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,ERPNext आपल्या शाळा सेटअप
 DocType: Sales Invoice,Base Change Amount (Company Currency),बेस बदला रक्कम (कंपनी चलन)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,खालील गोदामांची लेखा नोंदी नाहीत
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,पहिला  दस्तऐवज जतन करा.
@@ -4507,13 +4593,12 @@
 DocType: Task,Is Milestone,मैलाचा दगड आहे
 DocType: Daily Work Summary,Email Sent To,ई-मेल पाठविले
 DocType: Budget,Warn,चेतावणी द्या
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,आपण नोंदणी रद्द करू इच्छित असल्याची आपल्याला खात्री आहे?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","इतर कोणताही अभिप्राय, रेकॉर्ड जावे की लक्षात घेण्याजोगा प्रयत्न."
 DocType: BOM,Manufacturing User,उत्पादन सदस्य
 DocType: Purchase Invoice,Raw Materials Supplied,कच्चा माल प्रदान
-DocType: Purchase Invoice,Recurring Print Format,आवर्ती प्रिंट स्वरूप
 DocType: C-Form,Series,मालिका
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},किंमत सूची {0} ची चलन {1} किंवा {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,उत्पादने जोडा
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},किंमत सूची {0} ची चलन {1} किंवा {2}
 DocType: Appraisal,Appraisal Template,मूल्यांकन साचा
 DocType: Item Group,Item Classification,आयटम वर्गीकरण
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,व्यवसाय विकास व्यवस्थापक
@@ -4527,7 +4612,7 @@
 DocType: Item Attribute Value,Attribute Value,मूल्य विशेषता
 ,Itemwise Recommended Reorder Level,Itemwise पुनर्क्रमित स्तर शिफारस
 DocType: Salary Detail,Salary Detail,पगार तपशील
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,कृपया प्रथम {0} निवडा
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,कृपया प्रथम {0} निवडा
 DocType: Appointment Type,Physician,फिजिशियन
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,आयटम बॅच {0} {1} कालबाह्य झाले आहे.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,सल्लामसलत
@@ -4538,7 +4623,7 @@
 DocType: Salary Detail,Default Amount,डीफॉल्ट रक्कम
 DocType: Lab Test Template,Descriptive,वर्णनात्मक
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,कोठार प्रणाली आढळली नाही
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,या  महिन्याचा  सारांश
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,या  महिन्याचा  सारांश
 DocType: Quality Inspection Reading,Quality Inspection Reading,गुणवत्ता तपासणी वाचन
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`फ्रीज स्टॉक जुने Than`% d दिवस कमी असणे आवश्यक आहे.
 DocType: Tax Rule,Purchase Tax Template,कर साचा खरेदी
@@ -4561,12 +4646,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,आगामी कार्यक्रम / परिणाम प्रशिक्षण
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,म्हणून घसारा जमा
 DocType: Sales Invoice,C-Form Applicable,सी-फॉर्म लागू
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},ऑपरेशन वेळ ऑपरेशन  {0} साठी 0 पेक्षा जास्त असणे आवश्यक आहे
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},ऑपरेशन वेळ ऑपरेशन  {0} साठी 0 पेक्षा जास्त असणे आवश्यक आहे
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,वखार अनिवार्य आहे
 DocType: Supplier,Address and Contacts,पत्ता आणि संपर्क
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM रुपांतर तपशील
 DocType: Program,Program Abbreviation,कार्यक्रम संक्षेप
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,उत्पादन ऑर्डर एक आयटम साचा निषेध जाऊ शकत नाही
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,उत्पादन ऑर्डर एक आयटम साचा निषेध जाऊ शकत नाही
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,शुल्क प्रत्येक आयटम विरुद्ध खरेदी पावती मध्ये अद्यतनित केले जातात
 DocType: Warranty Claim,Resolved By,ने  निराकरण
 DocType: Bank Guarantee,Start Date,प्रारंभ तारीख
@@ -4592,27 +4677,28 @@
 DocType: Employee,Educational Qualification,शैक्षणिक अर्हता
 DocType: Workstation,Operating Costs,खर्च
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,क्रिया जमा मासिक अंदाजपत्रक ओलांडला तर
-DocType: Purchase Invoice,Submit on creation,निर्माण केल्यावर सबमिट
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},चलन {0} असणे आवश्यक आहे {1}
+DocType: Subscription,Submit on creation,निर्माण केल्यावर सबमिट
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},चलन {0} असणे आवश्यक आहे {1}
 DocType: Asset,Disposal Date,विल्हेवाट दिनांक
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",ई-मेल ते सुट्टी नसेल तर दिले क्षणी कंपनी सर्व सक्रिय कर्मचारी पाठवला जाईल. प्रतिसादांचा सारांश मध्यरात्री पाठवला जाईल.
 DocType: Employee Leave Approver,Employee Leave Approver,कर्मचारी रजा मंजुरी
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},रो {0}: कोठार {1} साठी एक पुन्हा क्रमवारी लावा नोंद आधीच अस्तित्वात आहे
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","कोटेशन केले आहे कारण, म्हणून गमवलेले जाहीर करू शकत नाही."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,प्रशिक्षण अभिप्राय
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},रो {0}: कोठार {1} साठी एक पुन्हा क्रमवारी लावा नोंद आधीच अस्तित्वात आहे
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","कोटेशन केले आहे कारण, म्हणून गमवलेले जाहीर करू शकत नाही."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,प्रशिक्षण अभिप्राय
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,उत्पादन ऑर्डर {0} सादर करणे आवश्यक आहे
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,सप्लायर स्कोअरकार्ड मापदंड
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},कृपया आयटम   {0} साठी   प्रारंभ तारीख आणि अंतिम तारीख निवडा
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},अर्थात सलग आवश्यक आहे {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,तारीखे पर्यंत  तारखेपासूनच्या  आधी असू शकत नाही
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,/ संपादित करा किंमती जोडा
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,/ संपादित करा किंमती जोडा
 DocType: Batch,Parent Batch,पालक बॅच
 DocType: Batch,Parent Batch,पालक बॅच
 DocType: Cheque Print Template,Cheque Print Template,धनादेश प्रिंट साचा
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,कॉस्ट केंद्रे चार्ट
 DocType: Lab Test Template,Sample Collection,नमुना संकलन
 ,Requested Items To Be Ordered,विनंती आयटमची  मागणी करणे
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,माझ्या  ऑर्डर
 DocType: Price List,Price List Name,किंमत सूची नाव
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},दैनिक कार्य सारांश {0}
 DocType: Employee Loan,Totals,एकूण
@@ -4631,12 +4717,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1} आवश्यक {2} वर {3} {4} {5} हा व्यवहार पूर्ण करण्यासाठी साठी युनिट.
 DocType: Fee Schedule,Student Category,विद्यार्थी वर्ग
 DocType: Announcement,Student,विद्यार्थी
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,संस्था युनिट (विभाग) मास्टर.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,संस्था युनिट (विभाग) मास्टर.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,सर्व खोल्यांमध्ये जा
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,पाठविण्यापूर्वी कृपया संदेश प्रविष्ट करा
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,पुरवठादार डुप्लिकेट
 DocType: Email Digest,Pending Quotations,प्रलंबित अवतरणे
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,पॉइंट-ऑफ-सेल  प्रोफाइल
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,पॉइंट-ऑफ-सेल  प्रोफाइल
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,प्रयोगशाळा कॉन्फिगरेशन
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,बिनव्याजी कर्ज
 DocType: Cost Center,Cost Center Name,खर्च केंद्र नाव
@@ -4646,6 +4732,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,एकूण सशुल्क रक्कम
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 वर्ण या पेक्षा मोठे संदेश एकाधिक संदेशा मधे   विभागले  जातील
 DocType: Purchase Receipt Item,Received and Accepted,प्राप्त झालेले आहे आणि स्वीकारले आहे
+DocType: Hub Settings,Company and Seller Profile,कंपनी आणि विक्रेता प्रोफाइल
 ,GST Itemised Sales Register,&#39;जीएसटी&#39; क्रमवारी मांडणे विक्री नोंदणी
 ,Serial No Service Contract Expiry,सिरियल क्रमांक सेवा करार कालावधी समाप्ती
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,आपण जमा आणि एकाच वेळी एकच खाते डेबिट करू शकत नाही
@@ -4655,10 +4742,11 @@
 DocType: Item,Variant Based On,चल आधारित
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},एकूण नियुक्त वजन 100% असावे. हे  {0} आहे
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,आपले पुरवठादार
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,कृपया दुरूस्त करा
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,विक्री आदेश केली आहे म्हणून गमावले म्हणून सेट करू शकत नाही.
 DocType: Request for Quotation Item,Supplier Part No,पुरवठादार भाग नाही
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',गटात मूल्यांकन &#39;किंवा&#39; Vaulation आणि एकूण &#39;करिता वजा करू शकत नाही
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,पासून प्राप्त
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,पासून प्राप्त
 DocType: Lead,Converted,रूपांतरित
 DocType: Item,Has Serial No,सिरियल क्रमांक  आहे
 DocType: Employee,Date of Issue,समस्येच्या तारीख
@@ -4666,7 +4754,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","प्रति खरेदी सेटिंग्ज Reciept खरेदी आवश्यक == &#39;होय&#39;, नंतर चलन खरेदी तयार करण्यासाठी, वापरकर्ता आयटम प्रथम खरेदी पावती तयार करण्याची आवश्यकता असल्यास {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},रो # {0}: पुरवठादार {1} साठी  आयटम सेट करा
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,सलग {0}: तास मूल्य शून्य पेक्षा जास्त असणे आवश्यक आहे.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,आयटम {1} ला संलग्न वेबसाइट प्रतिमा {0} सापडू शकत नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,आयटम {1} ला संलग्न वेबसाइट प्रतिमा {0} सापडू शकत नाही
 DocType: Issue,Content Type,सामग्री प्रकार
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,संगणक
 DocType: Item,List this Item in multiple groups on the website.,वेबसाइट वर अनेक गट मधे हे  आयटम सूचीबद्ध .
@@ -4677,14 +4765,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled नोंदी मिळवा
 DocType: Payment Reconciliation,From Invoice Date,चलन तारखेपासून
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,आपल्याकडे सबमिट करण्याची परवानगी नाही
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,बिलिंग चलन एकतर मुलभूत comapany चलनात किंवा पक्ष खाते चलन समान असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,बिलिंग चलन एकतर मुलभूत comapany चलनात किंवा पक्ष खाते चलन समान असणे आवश्यक आहे
 DocType: Healthcare Settings,Laboratory Settings,प्रयोगशाळा सेटिंग्ज
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,एनकॅशमेंट द्या
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,ती काय करते?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,गुदाम
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,सर्व विद्यार्थी प्रवेश
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,ती काय करते?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,गुदाम
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,सर्व विद्यार्थी प्रवेश
 ,Average Commission Rate,सरासरी आयोग दर
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,'नॉन-स्टॉक आयटम 'साठी अनुक्रमांक 'होय' असू शकत नाही.
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,'नॉन-स्टॉक आयटम 'साठी अनुक्रमांक 'होय' असू शकत नाही.
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,स्थिती निवडा
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,उपस्थिती भविष्यात तारखा चिन्हांकित केला जाऊ शकत नाही
 DocType: Pricing Rule,Pricing Rule Help,किंमत नियम मदत
@@ -4702,41 +4790,41 @@
 DocType: Item,Customer Code,ग्राहक कोड
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},साठी जन्मदिवस अनुस्मरण {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,गेल्या ऑर्डर असल्याने दिवस
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,खाते करण्यासाठी डेबिट एक ताळेबंद खाते असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,खाते करण्यासाठी डेबिट एक ताळेबंद खाते असणे आवश्यक आहे
 DocType: Buying Settings,Naming Series,नामांकन मालिका
 DocType: Leave Block List,Leave Block List Name,रजा ब्लॉक यादी नाव
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,विमा प्रारंभ तारखेच्या विमा समाप्ती तारीख कमी असावे
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,कृपया शाळेतील प्रशासक नेमिंग सिस्टम सेट करा&gt; शाळा सेटिंग्ज
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,शेअर मालमत्ता
 DocType: Timesheet,Production Detail,उत्पादन तपशील
+DocType: Restaurant,Active Menu,सक्रिय मेनू
 DocType: Target Detail,Target Qty,लक्ष्य Qty
 DocType: Shopping Cart Settings,Checkout Settings,चेकआऊट सेटिंग्ज
 DocType: Attendance,Present,सादर
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,डिलिव्हरी टीप {0} सादर जाऊ नये
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,डिलिव्हरी टीप {0} सादर जाऊ नये
 DocType: Notification Control,Sales Invoice Message,विक्री चलन संदेश
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,खाते {0} बंद प्रकार दायित्व / इक्विटी असणे आवश्यक आहे
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},{0} वेळ पत्रक आधीपासूनच तयार कर्मचा पगाराच्या स्लिप्स {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},{0} वेळ पत्रक आधीपासूनच तयार कर्मचा पगाराच्या स्लिप्स {1}
 DocType: Vehicle Log,Odometer,ओडोमीटर
 DocType: Sales Order Item,Ordered Qty,आदेश दिलेली  Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,आयटम {0} अक्षम आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,आयटम {0} अक्षम आहे
 DocType: Stock Settings,Stock Frozen Upto,शेअर फ्रोजन पर्यंत
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM कोणत्याही शेअर आयटम असणे नाही
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,प्रकल्प क्रियाकलाप / कार्य.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM कोणत्याही शेअर आयटम असणे नाही
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,प्रकल्प क्रियाकलाप / कार्य.
 DocType: Vehicle Log,Refuelling Details,Refuelling तपशील
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,पगार Slips तयार  करा
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","पाञ म्हणून निवडले आहे, तर खरेदी, चेक करणे आवश्यक आहे {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,सवलत 100 पेक्षा कमी असणे आवश्यक आहे
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,गेल्या खरेदी दर आढळले नाही
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Write Off रक्कम (कंपनी चलन)
 DocType: Sales Invoice Timesheet,Billing Hours,बिलिंग तास
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,साठी {0} आढळले नाही मुलभूत BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,रो # {0}: पुनर्क्रमित प्रमाणात सेट करा
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,साठी {0} आढळले नाही मुलभूत BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,रो # {0}: पुनर्क्रमित प्रमाणात सेट करा
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,त्यांना येथे जोडण्यासाठी आयटम टॅप करा
 DocType: Fees,Program Enrollment,कार्यक्रम नावनोंदणी
 DocType: Landed Cost Voucher,Landed Cost Voucher,स्थावर खर्च व्हाउचर
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},{0} सेट करा
-DocType: Purchase Invoice,Repeat on Day of Month,महिन्याच्या  दिवशी पुन्हा करा
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} निष्क्रिय विद्यार्थी आहे
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} निष्क्रिय विद्यार्थी आहे
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} निष्क्रिय विद्यार्थी आहे
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} निष्क्रिय विद्यार्थी आहे
 DocType: Employee,Health Details,आरोग्य तपशील
 DocType: Offer Letter,Offer Letter Terms,पत्र अटी ऑफर
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,एक भरणा विनंती संदर्भ दस्तऐवज आवश्यक आहे तयार करण्यासाठी
@@ -4745,7 +4833,6 @@
 DocType: Employee External Work History,Salary,पगार
 DocType: Serial No,Delivery Document Type,डिलिव्हरी दस्तऐवज प्रकार
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,उपरोक्त  निकषा साठी  निवडलेल्या  सर्व पगार स्लिप सादर करा
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} आयटम समक्रमित
 DocType: Sales Order,Partly Delivered,अंशतः वितरण आकारले
 DocType: Email Digest,Receivables,Receivables
 DocType: Lead Source,Lead Source,आघाडी स्रोत
@@ -4766,9 +4853,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing श्रेणी 2
 DocType: SG Creation Tool Course,Max Strength,कमाल शक्ती
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM बदलले
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,वितरण तारीख वर आधारित आयटम निवडा
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,वितरण तारीख वर आधारित आयटम निवडा
 ,Sales Analytics,विक्री Analytics
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},उपलब्ध {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},उपलब्ध {0}
 ,Prospects Engaged But Not Converted,प्रॉस्पेक्ट व्यस्त पण रूपांतरित नाही
 ,Prospects Engaged But Not Converted,प्रॉस्पेक्ट व्यस्त पण रूपांतरित नाही
 DocType: Manufacturing Settings,Manufacturing Settings,उत्पादन सेटिंग्ज
@@ -4776,10 +4863,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 मोबाइल नं
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,कंपनी मास्टर मध्ये डीफॉल्ट चलन प्रविष्ट करा
 DocType: Stock Entry Detail,Stock Entry Detail,शेअर प्रवेश तपशील
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,दैनिक स्मरणपत्रे
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,दैनिक स्मरणपत्रे
 DocType: Products Settings,Home Page is Products,मुख्यपृष्ठ उत्पादने आहे
 ,Asset Depreciation Ledger,मालमत्ता घसारा पाणीकराचे खाते
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},कर नियम वाद {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},कर नियम वाद {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,नवीन खाते नाव
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,कच्चा माल प्रदान खर्च
 DocType: Selling Settings,Settings for Selling Module,विभाग विक्री साठी सेटिंग्ज
@@ -4793,8 +4880,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,आयटम {0} एक स्टॉक आयटम असणे आवश्यक आहे
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,प्रगती वखार मध्ये डीफॉल्ट कार्य
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,लेखा व्यवहारासाठी  मुलभूत सेटिंग्ज.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया मानव संसाधन&gt; एचआर सेटिंग्जमध्ये कर्मचारी नेमिंग सिस्टम सेट करा
 DocType: Maintenance Visit,MV,मार्क
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,अपेक्षित तारीख साहित्य विनंती तारखेच्या आधी असू शकत नाही
+DocType: Restaurant,Default Tax Template,डीफॉल्ट कर टेम्पलेट
 DocType: Fees,Student Details,विद्यार्थी तपशील
 DocType: Purchase Invoice Item,Stock Qty,शेअर प्रमाण
 DocType: Purchase Invoice Item,Stock Qty,शेअर प्रमाण
@@ -4813,8 +4901,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,आयटमवर जा
 DocType: Sales Partner,Partner Type,भागीदार प्रकार
 DocType: Purchase Taxes and Charges,Actual,वास्तविक
+DocType: Restaurant Menu,Restaurant Manager,रेस्टॉरन्ट व्यवस्थापक
 DocType: Authorization Rule,Customerwise Discount,Customerwise सवलत
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,कार्ये Timesheet.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,कार्ये Timesheet.
 DocType: Purchase Invoice,Against Expense Account,खर्चाचे खाते विरुद्ध
 DocType: Production Order,Production Order,उत्पादन ऑर्डर
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,प्रतिष्ठापन टीप {0} आधीच सादर केला गेला आहे
@@ -4822,7 +4911,6 @@
 DocType: Quotation Item,Against Docname,Docname विरुद्ध
 DocType: SMS Center,All Employee (Active),सर्व कर्मचारी (सक्रिय)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,आता पहा
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,अशी यादी तयार करणे आपोआप तयार होईल तेव्हा कालावधी निवडा
 DocType: BOM,Raw Material Cost,कच्चा माल खर्च
 DocType: Item Reorder,Re-Order Level,पुन्हा-क्रम स्तर
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,आपण उत्पादन आदेश वाढवण्याची किंवा विश्लेषण कच्चा माल डाउनलोड करू इच्छित असलेल्या आयटम आणि नियोजित प्रमाण प्रविष्ट करा.
@@ -4835,24 +4923,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,अहवाल प्रकार अनिवार्य आहे
 DocType: Item,Serial Number Series,अनुक्रमांक मालिका
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},कोठार सलग शेअर आयटम {0} अनिवार्य आहे {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,प्रोग्राम्स जोडा
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,रिटेल अॅण्ड घाऊक
 DocType: Issue,First Responded On,प्रथम रोजी प्रतिसाद
 DocType: Website Item Group,Cross Listing of Item in multiple groups,अनेक गटामध्ये आयटम च्या क्रॉस यादी
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},आर्थिक वर्ष प्रारंभ तारीख आणि आर्थिक वर्ष अंतिम तारीख आधीच आर्थिक वर्षात सेट केल्या आहेत {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,सुधारित मंजुरी दिनांक
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,स्प्लिट बॅच
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,स्प्लिट बॅच
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,स्प्लिट बॅच
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,स्प्लिट बॅच
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,यशस्वीरित्या समेट
 DocType: Request for Quotation Supplier,Download PDF,PDF डाउनलोड करा
 DocType: Production Order,Planned End Date,नियोजनबद्ध अंतिम तारीख
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,कृपया शेड्यूल तारीख प्रविष्ट करा
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,आयटम कोठे साठवले जातात.
 DocType: Request for Quotation,Supplier Detail,पुरवठादार तपशील
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},सूत्र किंवा अट त्रुटी: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},सूत्र किंवा अट त्रुटी: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Invoiced रक्कम
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,मापदंड वजन 100% पर्यंत जोडणे आवश्यक आहे
 DocType: Attendance,Attendance,विधान परिषदेच्या
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,शेअर आयटम
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,शेअर आयटम
 DocType: BOM,Materials,साहित्य
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","तपासले नाही, तर यादी तो लागू करण्यात आली आहे, जेथे प्रत्येक विभाग जोडले आहे."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,स्रोत आणि लक्ष्य वखार समान असू शकत नाही
@@ -4870,6 +4958,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,निव्वळ एकूण वर
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},{0} विशेषता मूल्य श्रेणी असणे आवश्यक आहे {1} करण्यासाठी {2} वाढ मध्ये {3} आयटम {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,सलग {0} मधील  लक्ष्य कोठार उत्पादन आदेश सारखाच असणे आवश्यक आहे
+DocType: Restaurant Reservation,Waitlisted,प्रतीक्षा यादी
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,काही इतर चलन वापरून नोंदी बनवून नंतर चलन बदलले जाऊ शकत नाही
 DocType: Vehicle Service,Clutch Plate,घट्ट पकड प्लेट
 DocType: Company,Round Off Account,खाते बंद फेरीत
@@ -4886,7 +4975,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,नवीन विक्री व्यक्ती नाव
 DocType: Packing Slip,Gross Weight UOM,एकूण वजन UOM
 DocType: Delivery Note Item,Against Sales Invoice,विक्री चलन विरुद्ध
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,सिरिअल क्रमांक सिरीयलाइज आयटम प्रविष्ट करा
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,सिरिअल क्रमांक सिरीयलाइज आयटम प्रविष्ट करा
 DocType: Bin,Reserved Qty for Production,उत्पादन प्रमाण राखीव
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,आपण अर्थातच आधारित गटांमध्ये करताना बॅच विचार करू इच्छित नाही तर अनचेक.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,आपण अर्थातच आधारित गटांमध्ये करताना बॅच विचार करू इच्छित नाही तर अनचेक.
@@ -4898,7 +4987,7 @@
 DocType: Lab Test,Test Group,चाचणी गट
 DocType: Payment Reconciliation,Receivable / Payable Account,प्राप्त / देय खाते
 DocType: Delivery Note Item,Against Sales Order Item,विक्री ऑर्डर आयटम विरुद्ध
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},कृपया विशेषता{0} साठी  विशेषतेसाठी मूल्य निर्दिष्ट करा
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},कृपया विशेषता{0} साठी  विशेषतेसाठी मूल्य निर्दिष्ट करा
 DocType: Item,Default Warehouse,मुलभूत कोठार
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},अर्थसंकल्प गट खाते विरुद्ध नियुक्त केला जाऊ शकत नाही {0}
 DocType: Healthcare Settings,Patient Registration,रुग्ण नोंदणी
@@ -4928,6 +5017,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,विक्री व्यक्ती
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,बजेट आणि खर्च केंद्र
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,पेमेंटचा एकाधिक डीफॉल्ट मोड अनुमत नाही
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,साठी
 ,Appointment Analytics,नेमणूक Analytics
 DocType: Vehicle Service,Half Yearly,सहामाही
 DocType: Lead,Blog Subscriber,ब्लॉग ग्राहक
@@ -4947,7 +5037,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,quot संख्या
 ,BOM Stock Report,BOM शेअर अहवाल
 DocType: Stock Reconciliation Item,Quantity Difference,प्रमाण फरक
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,प्रक्रिया वेतनपट
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,प्रक्रिया वेतनपट
 DocType: Opportunity Item,Basic Rate,बेसिक रेट
 DocType: GL Entry,Credit Amount,क्रेडिट रक्कम
 DocType: Cheque Print Template,Signatory Position,ना स्थिती
@@ -4961,12 +5051,12 @@
 DocType: Tax Rule,Tax Rule,कर नियम
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,विक्री सायकल मधे संपूर्ण समान दर ठेवणे
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,वर्कस्टेशन कार्य तासांनंतर वेळ नोंदी योजना.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,रांग ग्राहक
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,डॉ {0} मध्ये फिजिशियन शेड्यूल नाही. फिजीशियन मास्टर मध्ये जोडा
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,रांग ग्राहक
 DocType: Student,Nationality,राष्ट्रीयत्व
 ,Items To Be Requested,आयटम विनंती करण्यासाठी
-DocType: Purchase Order,Get Last Purchase Rate,गेल्या खरेदी दर मिळवा
 DocType: Company,Company Info,कंपनी माहिती
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,निवडा किंवा नवीन ग्राहक जोडणे
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,निवडा किंवा नवीन ग्राहक जोडणे
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,खर्च केंद्र खर्च दावा बुक करणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),निधी मालमत्ता (assets) अर्ज
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,हे या कर्मचा उपस्थिती आधारित आहे
@@ -4974,6 +5064,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,डेबिट खाते
 DocType: Fiscal Year,Year Start Date,वर्ष प्रारंभ तारीख
 DocType: Attendance,Employee Name,कर्मचारी नाव
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,रेस्टॉरंट ऑर्डर प्रविष्टी आयटम
 DocType: Sales Invoice,Rounded Total (Company Currency),गोळाबेरीज एकूण (कंपनी चलन)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,खाते प्रकार निवडले आहे कारण खाते प्रकार निवडले आहे.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} सुधारणा करण्यात आली आहे. रिफ्रेश करा.
@@ -4984,6 +5075,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,कर्मचारी फायदे
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},पॅक प्रमाणात सलग आयटम {0} ची  संख्या समान असणे आवश्यक आहे {1}
 DocType: Production Order,Manufactured Qty,उत्पादित Qty
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,बीजक तयार केले
 DocType: Purchase Receipt Item,Accepted Quantity,स्वीकृत प्रमाण
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},एक मुलभूत कर्मचारी सुट्टी यादी सेट करा {0} किंवा कंपनी {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} अस्तित्वात नाही
@@ -4993,18 +5085,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},रो नाही {0}: रक्कम खर्च दावा {1} विरुद्ध रक्कम प्रलंबित पेक्षा जास्त असू शकत नाही. प्रलंबित रक्कम  {2} आहे
 DocType: Maintenance Schedule,Schedule,वेळापत्रक
 DocType: Account,Parent Account,पालक खाते
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,उपलब्ध
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,उपलब्ध
 DocType: Quality Inspection Reading,Reading 3,3 वाचन
 ,Hub,हब
 DocType: GL Entry,Voucher Type,प्रमाणक प्रकार
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,किंमत सूची आढळली किंवा अकार्यान्वीत केलेली  नाही
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,किंमत सूची आढळली किंवा अकार्यान्वीत केलेली  नाही
 DocType: Lab Test,Approved,मंजूर
 DocType: Pricing Rule,Price,किंमत
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',{0} वर मुक्त केलेले कर्मचारी 'Left' म्हणून set करणे आवश्यक आहे
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',{0} वर मुक्त केलेले कर्मचारी 'Left' म्हणून set करणे आवश्यक आहे
+DocType: Hub Settings,Last Sync On,अंतिम सिंक चालू
 DocType: Guardian,Guardian,पालक
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,मूल्यमापन {0} {1} दिलेल्या तारखेपासून श्रेणीत कर्मचारी तयार
 DocType: Employee,Education,शिक्षण
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,देल
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,देल
 DocType: Selling Settings,Campaign Naming By,करून मोहीम नामांकन
 DocType: Employee,Current Address Is,सध्याचा पत्ता आहे
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,मासिक विक्री लक्ष्य (
@@ -5019,7 +5112,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,कोर्स कोड:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,खर्चाचे खाते प्रविष्ट करा
 DocType: Account,Stock,शेअर
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",सलग # {0}: संदर्भ दस्तऐवज प्रकार ऑर्डर खरेदी एक बीजक किंवा जर्नल प्रवेश खरेदी असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",सलग # {0}: संदर्भ दस्तऐवज प्रकार ऑर्डर खरेदी एक बीजक किंवा जर्नल प्रवेश खरेदी असणे आवश्यक आहे
 DocType: Employee,Current Address,सध्याचा पत्ता
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","आयटम आणखी एक नग प्रकार असेल  तर  वर्णन , प्रतिमा, किंमत, कर आदी टेम्पलेट निश्चित केली जाईल"
 DocType: Serial No,Purchase / Manufacture Details,खरेदी / उत्पादन तपशील
@@ -5050,7 +5143,7 @@
 DocType: Hub Settings,Hub Settings,हब सेटिंग्ज
 DocType: Project,Gross Margin %,एकूण मार्जिन%
 DocType: BOM,With Operations,ऑपरेशन
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,लेखा नोंदी आधीच चलन {0} मधे कंपनी {1} साठी केले गेले आहेत. कृपया चलन एक प्राप्त किंवा देय खाते निवडा {0} .
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,लेखा नोंदी आधीच चलन {0} मधे कंपनी {1} साठी केले गेले आहेत. कृपया चलन एक प्राप्त किंवा देय खाते निवडा {0} .
 DocType: Asset,Is Existing Asset,मालमत्ता अस्तित्वात आहे
 DocType: Salary Detail,Statistical Component,सांख्यिकी घटक
 DocType: Salary Detail,Statistical Component,सांख्यिकी घटक
@@ -5059,13 +5152,14 @@
 DocType: BOM Operation,BOM Operation,BOM ऑपरेशन
 DocType: Purchase Taxes and Charges,On Previous Row Amount,मागील पंक्ती रकमेवर
 DocType: Student,Home Address,घरचा पत्ता
+DocType: Item,Has Expiry Date,कालबाह्य तारीख आहे
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,आयटम वेरिएंट सेटिंग्ज
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,हस्तांतरण मालमत्ता
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,हस्तांतरण मालमत्ता
 DocType: POS Profile,POS Profile,पीओएस प्रोफाइल
 DocType: Training Event,Event Name,कार्यक्रम नाव
 DocType: Physician,Phone (Office),फोन (कार्यालय)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,प्रवेश
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},प्रवेश {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,प्रवेश
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},प्रवेश {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","सेट अर्थसंकल्प, लक्ष्य इ हंगामी"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,अस्थिर नाव
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","आयटम {0} एक टेम्प्लेट आहे, कृपया त्याची एखादी  रूपे  निवडा"
@@ -5074,7 +5168,7 @@
 DocType: Assessment Plan,Room,खोली
 DocType: Purchase Order,Advance Paid,आगाऊ अदा
 DocType: Item,Item Tax,आयटम कर
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,पुरवठादार साहित्य
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,पुरवठादार साहित्य
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,उत्पादन शुल्क चलन
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,थ्रेशोल्ड {0}% एकदा एकापेक्षा जास्त वेळा दिसून
 DocType: Expense Claim,Employees Email Id,कर्मचारी ई मेल आयडी
@@ -5085,32 +5179,30 @@
 DocType: Program,Program Name,कार्यक्रम नाव
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,कर किंवा शुल्क विचार करा
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,वास्तविक प्रमाण अनिवार्य आहे
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} येथे सध्याचे एक {1} पुरवठादार स्कोअरकार्ड उभे आहे आणि या पुरवठादारास खरेदी ऑर्डर देणे आवश्यक आहे.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} येथे सध्याचे एक {1} पुरवठादार स्कोअरकार्ड उभे आहे आणि या पुरवठादारास खरेदी ऑर्डर देणे आवश्यक आहे.
 DocType: Employee Loan,Loan Type,कर्ज प्रकार
 DocType: Scheduling Tool,Scheduling Tool,शेड्युलिंग साधन
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,क्रेडिट कार्ड
 DocType: BOM,Item to be manufactured or repacked,आयटम उत्पादित किंवा repacked करणे
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,स्टॉक व्यवहारासाठी  मुलभूत सेटिंग्ज.
-DocType: Purchase Invoice,Next Date,पुढील तारीख
 DocType: Employee Education,Major/Optional Subjects,मुख्य / पर्यायी विषय
 DocType: Sales Invoice Item,Drop Ship,ड्रॉप जहाज
+DocType: Hub Settings,Suspended,निलंबित
 DocType: Training Event,Attendees,उपस्थित
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","येथे आपण नाव आणि पालक, पती, पत्नी आणि मुले उद्योग जसे कुटुंब तपशील टिकवून ठेवू  शकता"
 DocType: Academic Term,Term End Date,मुदत समाप्ती तारीख
-DocType: Hub Settings,Seller Name,विक्रेता नाव
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),कर आणि शुल्क वजा (कंपनी चलन)
 DocType: Item Group,General Settings,सामान्य सेटिंग्ज
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,चलानापासून आणि  चलानापर्यंत  समान असू शकत नाही
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,प्रशिक्षक जोडा
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,आपण पुढे जाण्यापूर्वी फॉर्म जतन करणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,कृपया प्रथम कंपनी निवडा
 DocType: Item Attribute,Numeric Values,अंकीय मूल्यांना
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,लोगो संलग्न
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,शेअर स्तर
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,शेअर स्तर
 DocType: Customer,Commission Rate,आयोगाने दर
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,{1} साठी {0} स्कोअरकार्ड तयार केल्या:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,व्हेरियंट करा
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,व्हेरियंट करा
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,विभागाने ब्लॉक रजा अनुप्रयोग.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer",भरणा प्रकार मिळतील एक द्या आणि अंतर्गत ट्रान्सफर करणे आवश्यक आहे
 apps/erpnext/erpnext/config/selling.py +179,Analytics,विश्लेषण
@@ -5125,11 +5217,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,कॅपिटल शेअर
 DocType: Shopping Cart Settings,Show Public Attachments,सार्वजनिक संलग्नक दर्शवा
 DocType: Packing Slip,Package Weight Details,संकुल वजन तपशील
+DocType: Restaurant Reservation,Reservation Time,आरक्षण वेळ
 DocType: Payment Gateway Account,Payment Gateway Account,पेमेंट गेटवे खाते
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,पैसे पूर्ण भरल्यानंतर  वापरकर्ता निवडलेल्या पृष्ठला  पुनर्निर्देशित झाला पाहिजे
 DocType: Company,Existing Company,विद्यमान कंपनी
 DocType: Healthcare Settings,Result Emailed,परिणाम ईमेल ईमेल
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",कर वर्ग &quot;एकूण&quot; मध्ये बदलली गेली आहे सर्व आयटम नॉन-स्टॉक आयटम आहेत कारण
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,आयटम कोड&gt; आयटम गट&gt; ब्रँड
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,कृपया एक सी फाइल निवडा
 DocType: Student Leave Application,Mark as Present,सध्याची म्हणून चिन्हांकित करा
 DocType: Supplier Scorecard,Indicator Color,सूचक रंग
@@ -5154,11 +5248,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,विद्यार्थी बॅच करा
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,कॅरी फॉरवर्ड आहे
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,BOM चे आयटम मिळवा
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,BOM चे आयटम मिळवा
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,आघाडी  वेळ दिवस
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},सलग # {0}: पोस्ट दिनांक खरेदी तारीख एकच असणे आवश्यक आहे {1} मालमत्ता {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,विद्यार्थी संस्थेचे वसतिगृह येथे राहत आहे तर हे तपासा.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,वरील टेबलमधे  विक्री आदेश प्रविष्ट करा
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,वरील टेबलमधे  विक्री आदेश प्रविष्ट करा
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,सबमिट नाही पगार स्लिप
 ,Stock Summary,शेअर सारांश
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,एकमेकांना कोठार एक मालमत्ता हस्तांतरण
@@ -5174,5 +5268,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},रो {0}: नावे नोंद  {1} सोबत लिंक केले जाऊ शकत नाही
 DocType: Journal Entry,Subscription Section,सदस्यता विभाग
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,खाते {0} अस्तित्वात नाही
+DocType: Training Event,Training Program,प्रशिक्षण कार्यक्रम
 DocType: Account,Cash,रोख
 DocType: Employee,Short biography for website and other publications.,वेबसाइट आणि इतर प्रकाशनासठी  लहान चरित्र.
diff --git a/erpnext/translations/ms.csv b/erpnext/translations/ms.csv
index f8c591c..a606a52 100644
--- a/erpnext/translations/ms.csv
+++ b/erpnext/translations/ms.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Mod Gaji
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Daftar
 DocType: Patient,Divorced,Bercerai
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Item telah disegerakkan
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Benarkan Perkara yang akan ditambah beberapa kali dalam urus niaga
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Batal Bahan Melawat {0} sebelum membatalkan Waranti Tuntutan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produk Pengguna
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Tinggalkan Approvers
 DocType: Sales Partner,Dealer,Peniaga
 DocType: Consultation,Investigations,Siasatan
+DocType: Restaurant Order Entry,Click Enter To Add,Klik Masukkan Ke Tambah
 DocType: Employee,Rented,Disewa
 DocType: Purchase Order,PO-,po-
 DocType: POS Profile,Applicable for User,Digunakan untuk Pengguna
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Perintah Pengeluaran berhenti tidak boleh dibatalkan, Unstop terlebih dahulu untuk membatalkan"
 DocType: Vehicle Service,Mileage,Jarak tempuh
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Adakah anda benar-benar mahu menghapuskan aset ini?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Adakah anda benar-benar mahu menghapuskan aset ini?
 DocType: Drug Prescription,Update Schedule,Kemas kini Jadual
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Pilih Pembekal Lalai
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Mata wang diperlukan untuk Senarai Harga {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Semak ketersediaan
 DocType: Job Applicant,Job Applicant,Kerja Pemohon
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Ini adalah berdasarkan kepada urus niaga terhadap Pembekal ini. Lihat garis masa di bawah untuk maklumat
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Tiada lagi hasil.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Undang-undang
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Jenis cukai sebenar tidak boleh dimasukkan dalam kadar Perkara berturut-turut {0}
 DocType: Bank Guarantee,Customer,Pelanggan
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Kadar pertukaran mestilah sama dengan {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nama Pelanggan
 DocType: Vehicle,Natural Gas,Gas asli
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Akaun bank tidak boleh dinamakan sebagai {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Akaun bank tidak boleh dinamakan sebagai {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Kepala (atau kumpulan) terhadap yang Penyertaan Perakaunan dibuat dan baki dikekalkan.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Cemerlang untuk {0} tidak boleh kurang daripada sifar ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Tidak ada Slip Gaji yang dikemukakan untuk diproses.
 DocType: Manufacturing Settings,Default 10 mins,Default 10 minit
 DocType: Leave Type,Leave Type Name,Tinggalkan Nama Jenis
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Tunjukkan terbuka
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Ia perlu mengambil tindakan ini hari ini sendiri untuk berulang yang disebutkan di atas
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Siri Dikemaskini Berjaya
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Checkout
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural Journal Kemasukan Dihantar
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Item Pesanan Belian Akan Diterima
 DocType: SMS Center,All Supplier Contact,Semua Pembekal Contact
 DocType: Support Settings,Support Settings,Tetapan sokongan
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Tarikh Jangkaan Tamat tidak boleh kurang daripada yang dijangka Tarikh Mula
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Tarikh Jangkaan Tamat tidak boleh kurang daripada yang dijangka Tarikh Mula
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Kadar mestilah sama dengan {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Cuti Permohonan Baru
 ,Batch Item Expiry Status,Batch Perkara Status luput
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Bank Draf
 DocType: Mode of Payment Account,Mode of Payment Account,Cara Pembayaran Akaun
 DocType: Consultation,Consultation,Perundingan
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Jualan dan Pulangan
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Show Kelainan
 DocType: Academic Term,Academic Term,Jangka akademik
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,bahan
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Penjagaan Kesihatan
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Kelewatan dalam pembayaran (Hari)
 DocType: Lab Prescription,Lab Prescription,Preskripsi Lab
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Isih mengikut Harga
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Perbelanjaan perkhidmatan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Nombor siri: {0} sudah dirujuk dalam Sales Invoice: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Invois
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Nombor siri: {0} sudah dirujuk dalam Sales Invoice: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Invois
 DocType: Maintenance Schedule Item,Periodicity,Jangka masa
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Tahun fiskal {0} diperlukan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Pertahanan
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Jumlah Kos
 DocType: Delivery Note,Vehicle No,Kenderaan Tiada
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Sila pilih Senarai Harga
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Sila pilih Senarai Harga
 DocType: Accounts Settings,Currency Exchange Settings,Tetapan Pertukaran Mata Wang
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Row # {0}: Dokumen Bayaran diperlukan untuk melengkapkan trasaction yang
 DocType: Production Order Operation,Work In Progress,Kerja Dalam Kemajuan
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Sila pilih tarikh
 DocType: Employee,Holiday List,Senarai Holiday
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Sila persediaan Sistem Menamakan Pengajar di Sekolah&gt; Tetapan Sekolah
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Akauntan
+DocType: Hub Settings,Selling Price List,Senarai Harga Jualan
 DocType: Patient,Tobacco Current Use,Penggunaan Semasa Tembakau
 DocType: Cost Center,Stock User,Saham pengguna
 DocType: Company,Phone No,Telefon No
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Jadual Kursus dicipta:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},New {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},New {0}: # {1}
 ,Sales Partners Commission,Pasangan Jualan Suruhanjaya
 DocType: Purchase Invoice,Rounding Adjustment,Pelarasan Membulat
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Singkatan tidak boleh mempunyai lebih daripada 5 aksara
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Detail Ibu Bapa docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Rujukan: {0}, Kod Item: {1} dan Pelanggan: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kg
-DocType: Student Log,Log,Log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Membuka pekerjaan.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,Keputusan {0} diserahkan
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,Keputusan {0} diserahkan
 DocType: Item Attribute,Increment,Kenaikan
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Jangka masa
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Pilih Warehouse ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Berkahwin
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Tidak dibenarkan untuk {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Mendapatkan barangan dari
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Saham tidak boleh dikemaskini terhadap Penghantaran Nota {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Saham tidak boleh dikemaskini terhadap Penghantaran Nota {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produk {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Tiada perkara yang disenaraikan
 DocType: Payment Reconciliation,Reconcile,Mendamaikan
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Dana pencen
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Selepas Tarikh Susut nilai tidak boleh sebelum Tarikh Pembelian
 DocType: Consultation,Consultation Date,Tarikh Perundingan
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Penyenaraian produk dan penemuan untuk pengguna ERPNext
 DocType: SMS Center,All Sales Person,Semua Orang Jualan
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Pengagihan Bulanan ** membantu anda mengedarkan Bajet / sasaran seluruh bulan jika anda mempunyai bermusim dalam perniagaan anda.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Bukan perkakas yang terdapat
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Struktur Gaji Hilang
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Bukan perkakas yang terdapat
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Struktur Gaji Hilang
 DocType: Lead,Person Name,Nama Orang
 DocType: Sales Invoice Item,Sales Invoice Item,Perkara Invois Jualan
 DocType: Account,Credit,Kredit
 DocType: POS Profile,Write Off Cost Center,Tulis Off PTJ
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",contohnya &quot;Sekolah Rendah&quot; atau &quot;Universiti&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",contohnya &quot;Sekolah Rendah&quot; atau &quot;Universiti&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Laporan saham
 DocType: Warehouse,Warehouse Detail,Detail Gudang
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Had kredit telah menyeberang untuk pelanggan {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Tarikh Akhir Term tidak boleh lewat daripada Tarikh Akhir Tahun Akademik Tahun yang istilah ini dikaitkan (Akademik Tahun {}). Sila betulkan tarikh dan cuba lagi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Adakah Aset Tetap&quot; tidak boleh dibiarkan, kerana rekod aset wujud terhadap item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Adakah Aset Tetap&quot; tidak boleh dibiarkan, kerana rekod aset wujud terhadap item"
 DocType: Vehicle Service,Brake Oil,Brek Minyak
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
 DocType: Tax Rule,Tax Type,Jenis Cukai
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Amaun yang dikenakan cukai
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Anda tidak dibenarkan untuk menambah atau update entri sebelum {0}
 DocType: BOM,Item Image (if not slideshow),Perkara imej (jika tidak menayang)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Satu Pelanggan wujud dengan nama yang sama
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Kadar sejam / 60) * Masa Operasi Sebenar
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Baris # {0}: Jenis Dokumen Rujukan mestilah salah satu Tuntutan Perbelanjaan atau Kemasukan Jurnal
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Pilih BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Baris # {0}: Jenis Dokumen Rujukan mestilah salah satu Tuntutan Perbelanjaan atau Kemasukan Jurnal
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Pilih BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kos Item Dihantar
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Cuti pada {0} bukan antara Dari Tarikh dan To Date
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,Pinjaman pekerja
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Log Aktiviti:
 DocType: Fee Schedule,Send Payment Request Email,Hantar E-mel Permintaan Pembayaran
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Perkara {0} tidak wujud di dalam sistem atau telah tamat
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Perkara {0} tidak wujud di dalam sistem atau telah tamat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Harta Tanah
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Penyata Akaun
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
@@ -210,18 +213,23 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Import Log
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Tarik Bahan Permintaan jenis Pembuatan berdasarkan kriteria di atas
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Berhasil tidak berdaftar.
 DocType: Training Result Employee,Grade,gred
+DocType: Restaurant Table,No of Seats,Tiada tempat duduk
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Untuk menambah subjek dinamik, gunakan tag jinja seperti <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Dihantar Oleh Pembekal
 DocType: SMS Center,All Contact,Semua Contact
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Order Production telah dicipta untuk semua item dengan BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Order Production telah dicipta untuk semua item dengan BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Gaji Tahunan
 DocType: Daily Work Summary,Daily Work Summary,Ringkasan Kerja Harian
 DocType: Period Closing Voucher,Closing Fiscal Year,Penutup Tahun Anggaran
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} dibekukan
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Sila pilih Syarikat Sedia Ada untuk mewujudkan Carta Akaun
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} dibekukan
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Sila pilih Syarikat Sedia Ada untuk mewujudkan Carta Akaun
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Perbelanjaan saham
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Pilih Warehouse sasaran
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Pilih Warehouse sasaran
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Pilih Warehouse sasaran
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Pilih Warehouse sasaran
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Sila masukkan Preferred hubungan Email
 DocType: Program Enrollment,School Bus,Bas sekolah
 DocType: Journal Entry,Contra Entry,Contra Entry
@@ -238,9 +246,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Muat Template, isikan data yang sesuai dan melampirkan fail yang diubah suai. Semua tarikh dan pekerja gabungan dalam tempoh yang dipilih akan datang dalam template, dengan rekod kehadiran yang sedia ada"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Perkara {0} tidak aktif atau akhir hayat telah dicapai
+DocType: Student Admission Program,Minimum Age,Umur minimum
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Contoh: Matematik Asas
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Untuk memasukkan cukai berturut-turut {0} dalam kadar Perkara, cukai dalam baris {1} hendaklah juga disediakan"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Tetapan untuk HR Modul
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Tetapan untuk HR Modul
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Tukar Jumlah
 DocType: BOM Update Tool,New BOM,New BOM
@@ -250,7 +259,7 @@
 DocType: Lead,Request Type,Jenis Permintaan
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,membuat pekerja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Penyiaran
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Tambah Bilik
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Mod persediaan POS (Dalam Talian / Luar Talian)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Pelaksanaan
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Butiran operasi dijalankan.
 DocType: Serial No,Maintenance Status,Penyelenggaraan Status
@@ -273,6 +282,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Senarai Harga mesti pakai untuk Membeli atau Menjual
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Tarikh pemasangan tidak boleh sebelum tarikh penghantaran untuk Perkara {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Diskaun Senarai Harga Kadar (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Biokimia
 DocType: Offer Letter,Select Terms and Conditions,Pilih Terma dan Syarat
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,Nilai keluar
 DocType: Production Planning Tool,Sales Orders,Jualan Pesanan
@@ -307,15 +317,15 @@
 DocType: Sales Partner,Reseller,Penjual Semula
 DocType: Codification Table,Medical Code,Kod Perubatan
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Jika disemak, Akan termasuk barangan tanpa saham dalam Permintaan Bahan."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Sila masukkan Syarikat
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Sila masukkan Syarikat
 DocType: Delivery Note Item,Against Sales Invoice Item,Terhadap Jualan Invois Perkara
 ,Production Orders in Progress,Pesanan Pengeluaran di Kemajuan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Tunai bersih daripada Pembiayaan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage penuh, tidak menyelamatkan"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage penuh, tidak menyelamatkan"
 DocType: Lead,Address & Contact,Alamat
 DocType: Leave Allocation,Add unused leaves from previous allocations,Tambahkan daun yang tidak digunakan dari peruntukan sebelum
 DocType: Sales Partner,Partner website,laman web rakan kongsi
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Tambah Item
+DocType: Restaurant Order Entry,Add Item,Tambah Item
 DocType: Lab Test,Custom Result,Keputusan Tersuai
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Nama Kenalan
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kriteria Penilaian Kursus
@@ -328,7 +338,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Meminta untuk pembelian.
 DocType: Lab Test,Submitted Date,Tarikh Dihantar
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Ini adalah berdasarkan Lembaran Masa dicipta terhadap projek ini
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Pay bersih tidak boleh kurang daripada 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Pay bersih tidak boleh kurang daripada 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Untuk berhenti menghantar pemberitahuan ralat berulang dari sistem, kami telah memeriksa bidang Dinyahaktifkan dalam langganan"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Hanya Pelulus Cuti yang dipilih boleh mengemukakan Permohonan Cuti ini
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Tarikh melegakan mesti lebih besar daripada Tarikh Menyertai
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Meninggalkan setiap Tahun
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,Untung rugi
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Litre
 DocType: Task,Total Costing Amount (via Time Sheet),Jumlah Kos Jumlah (melalui Lembaran Time)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Sila persediaan Pelajar di bawah Kumpulan Pelajar
 DocType: Item Website Specification,Item Website Specification,Spesifikasi Item Laman Web
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Tinggalkan Disekat
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Perkara {0} telah mencapai penghujungnya kehidupan di {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Perkara {0} telah mencapai penghujungnya kehidupan di {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Bank Penyertaan
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Tahunan
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Saham Penyesuaian Perkara
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Kursus Kumpulan Pelajar Creation Tool
 DocType: Lead,Do Not Contact,Jangan Hubungi
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,Orang yang mengajar di organisasi anda
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Id unik untuk mengesan semua invois berulang. Ia dihasilkan di hantar.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Perisian Pemaju
 DocType: Item,Minimum Order Qty,Minimum Kuantiti Pesanan
 DocType: Pricing Rule,Supplier Type,Jenis Pembekal
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,Menyiarkan dalam Hab
 DocType: Student Admission,Student Admission,Kemasukan pelajar
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Perkara {0} dibatalkan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Permintaan bahan
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Perkara {0} dibatalkan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Permintaan bahan
 DocType: Bank Reconciliation,Update Clearance Date,Update Clearance Tarikh
 DocType: Item,Purchase Details,Butiran Pembelian
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Perkara {0} tidak dijumpai dalam &#39;Bahan Mentah Dibekalkan&#39; meja dalam Pesanan Belian {1}
 DocType: Patient Relation,Relation,Perhubungan
 DocType: Shipping Rule,Worldwide Shipping,Penghantaran di seluruh dunia
 DocType: Patient Relation,Mother,ibu
+DocType: Restaurant Reservation,Reservation End Time,Waktu Tamat Tempahan
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Pesanan disahkan dari Pelanggan.
 DocType: Purchase Receipt Item,Rejected Quantity,Ditolak Kuantiti
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Permintaan pembayaran {0} dibuat
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Permintaan pembayaran {0} dibuat
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Kepekaan Rendah
 DocType: Notification Control,Notification Control,Kawalan Pemberitahuan
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Sila sahkan setelah anda menyelesaikan latihan anda
 DocType: Lead,Suggestions,Cadangan
@@ -388,7 +401,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,slip e-mel gaji kepada pekerja berdasarkan e-mel pilihan yang dipilih di pekerja
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Yang pertama Pelulus Cuti dalam senarai akan ditetapkan sebagai lalai Cuti Pelulus yang
 DocType: Tax Rule,Shipping County,Penghantaran County
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Belajar
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Belajar
 DocType: Asset,Next Depreciation Date,Selepas Tarikh Susutnilai
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Kos aktiviti setiap Pekerja
 DocType: Accounts Settings,Settings for Accounts,Tetapan untuk Akaun
@@ -399,13 +412,13 @@
 DocType: Item,Synced With Hub,Segerakkan Dengan Hub
 DocType: Vehicle,Fleet Manager,Pengurus Fleet
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} tidak boleh negatif untuk item {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Salah Kata Laluan
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Salah Kata Laluan
 DocType: Item,Variant Of,Varian Daripada
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Siap Qty tidak boleh lebih besar daripada &#39;Kuantiti untuk Pengeluaran&#39;
 DocType: Period Closing Voucher,Closing Account Head,Penutup Kepala Akaun
 DocType: Employee,External Work History,Luar Sejarah Kerja
 DocType: Physician,Time per Appointment,Masa setiap Pelantikan
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Ralat Rujukan Pekeliling
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Ralat Rujukan Pekeliling
 DocType: Appointment Type,Is Inpatient,Adalah Pesakit Dalam
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Nama Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Dalam Perkataan (Eksport) akan dapat dilihat selepas anda menyimpan Nota Penghantaran.
@@ -414,19 +427,18 @@
 DocType: Lead,Industry,Industri
 DocType: Employee,Job Profile,Profil kerja
 DocType: BOM Item,Rate & Amount,Kadar &amp; Amaun
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Sila persediaan siri penomboran untuk Kehadiran melalui Persediaan&gt; Penomboran Siri
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Ini berdasarkan urusniaga terhadap Syarikat ini. Lihat garis masa di bawah untuk maklumat lanjut
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Memberitahu melalui e-mel pada penciptaan Permintaan Bahan automatik
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Tahan
 DocType: Journal Entry,Multi Currency,Mata Multi
 DocType: Payment Reconciliation Invoice,Invoice Type,Jenis invois
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Penghantaran Nota
 DocType: Consultation,Encounter Impression,Impresi Encounter
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Menubuhkan Cukai
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Kos Aset Dijual
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,Entry pembayaran telah diubah suai selepas anda ditarik. Sila tarik lagi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} dimasukkan dua kali dalam Cukai Perkara
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Ringkasan untuk minggu ini dan aktiviti-aktiviti yang belum selesai
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} dimasukkan dua kali dalam Cukai Perkara
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Ringkasan untuk minggu ini dan aktiviti-aktiviti yang belum selesai
 DocType: Student Applicant,Admitted,diterima Masuk
 DocType: Workstation,Rent Cost,Kos sewa
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Jumlah Selepas Susutnilai
@@ -441,36 +453,35 @@
 DocType: Shipping Rule,Valid for Countries,Sah untuk Negara
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Perkara ini adalah Template dan tidak boleh digunakan dalam urus niaga. Sifat-sifat perkara akan disalin ke atas ke dalam varian kecuali &#39;Tiada Salinan&#39; ditetapkan
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Jumlah Pesanan Dianggap
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Jawatan Pekerja (contohnya Ketua Pegawai Eksekutif, Pengarah dan lain-lain)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Jawatan Pekerja (contohnya Ketua Pegawai Eksekutif, Pengarah dan lain-lain)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Kadar di mana mata wang Pelanggan ditukar kepada mata wang asas pelanggan
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kursus Alat Penjadualan
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Invois Belian tidak boleh dibuat terhadap aset yang sedia ada {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,Ralat [Urgent] semasa membuat% s berulang untuk% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,Ralat [Urgent] semasa membuat% s berulang untuk% s
 DocType: Item Tax,Tax Rate,Kadar Cukai
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} telah diperuntukkan untuk pekerja {1} untuk tempoh {2} kepada {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Pilih Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Pilih Item
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Membeli Invois {0} telah dikemukakan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch No mestilah sama dengan {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Tukar ke Kumpulan bukan-
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Batch (banyak) dari Perkara yang.
 DocType: C-Form Invoice Detail,Invoice Date,Tarikh invois
 DocType: GL Entry,Debit Amount,Jumlah Debit
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Hanya akan ada 1 Akaun setiap Syarikat dalam {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Sila lihat lampiran
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Hanya akan ada 1 Akaun setiap Syarikat dalam {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Sila lihat lampiran
 DocType: Purchase Order,% Received,% Diterima
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Cipta Kumpulan Pelajar
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Persediaan Sudah Lengkap !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Persediaan Sudah Lengkap !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Jumlah kredit Nota
 DocType: Setup Progress Action,Action Document,Dokumen Tindakan
 ,Finished Goods,Barangan selesai
 DocType: Delivery Note,Instructions,Arahan
 DocType: Quality Inspection,Inspected By,Diperiksa oleh
 DocType: Maintenance Visit,Maintenance Type,Jenis Penyelenggaraan
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} tidak mendaftar di Kursus {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kod Item&gt; Kumpulan Item&gt; Jenama
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} tidak mendaftar di Kursus {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},No siri {0} bukan milik Penghantaran Nota {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Tambah Item
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Tambah Item
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Perkara Kualiti Pemeriksaan Parameter
 DocType: Leave Application,Leave Approver Name,Tinggalkan nama Pelulus
 DocType: Depreciation Schedule,Schedule Date,Jadual Tarikh
@@ -492,7 +503,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Waktu Bekerja
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Menukar nombor yang bermula / semasa urutan siri yang sedia ada.
 DocType: Dosage Strength,Strength,Kekuatan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Buat Pelanggan baru
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Buat Pelanggan baru
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Jika beberapa Peraturan Harga terus diguna pakai, pengguna diminta untuk menetapkan Keutamaan secara manual untuk menyelesaikan konflik."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Buat Pesanan Pembelian
 ,Purchase Register,Pembelian Daftar
@@ -511,7 +522,7 @@
 DocType: Lab Test Template,Single,Single
 DocType: Salary Slip,Total Loan Repayment,Jumlah Bayaran Balik Pinjaman
 DocType: Account,Cost of Goods Sold,Kos Barang Dijual
-DocType: Purchase Invoice,Yearly,Setiap tahun
+DocType: Subscription,Yearly,Setiap tahun
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Sila masukkan PTJ
 DocType: Drug Prescription,Dosage,Dos
 DocType: Journal Entry Account,Sales Order,Pesanan Jualan
@@ -542,7 +553,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Tetapan global untuk semua proses pembuatan.
 DocType: Accounts Settings,Accounts Frozen Upto,Akaun-akaun Dibekukan Sehingga
 DocType: SMS Log,Sent On,Dihantar Pada
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Sifat {0} dipilih beberapa kali dalam Atribut Jadual
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Sifat {0} dipilih beberapa kali dalam Atribut Jadual
 DocType: HR Settings,Employee record is created using selected field. ,Rekod pekerja dicipta menggunakan bidang dipilih.
 DocType: Sales Order,Not Applicable,Tidak Berkenaan
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Master bercuti.
@@ -568,13 +579,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Jumlah daun diperuntukkan adalah wajib
 DocType: Patient,AB Positive,AB Positif
 DocType: Job Opening,Description of a Job Opening,Keterangan yang Lowongan
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Sementara menunggu aktiviti untuk hari ini
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Sementara menunggu aktiviti untuk hari ini
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Rekod kehadiran.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Komponen gaji untuk gaji berdasarkan timesheet.
 DocType: Sales Order Item,Used for Production Plan,Digunakan untuk Rancangan Pengeluaran
 DocType: Employee Loan,Total Payment,Jumlah Bayaran
 DocType: Manufacturing Settings,Time Between Operations (in mins),Masa Antara Operasi (dalam minit)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} dibatalkan supaya tindakan itu tidak boleh diselesaikan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} dibatalkan supaya tindakan itu tidak boleh diselesaikan
 DocType: Customer,Buyer of Goods and Services.,Pembeli Barang dan Perkhidmatan.
 DocType: Journal Entry,Accounts Payable,Akaun-akaun Boleh diBayar
 DocType: Patient,Allergies,Alahan
@@ -586,23 +597,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Perhatian Pesanan Pembelian
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Senarai beberapa pelanggan anda. Mereka boleh menjadi organisasi atau individu.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Bahagian Cukup untuk Membina
+DocType: POS Profile User,POS Profile User,POS Profil Pengguna
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Pendapatan Langsung
 DocType: Patient Appointment,Date TIme,Masa tarikh
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Tidak boleh menapis di Akaun, jika dikumpulkan oleh Akaun"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Pegawai Tadbir
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Sila pilih Course
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Sila pilih Course
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Sila pilih Course
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Sila pilih Course
 DocType: Codification Table,Codification Table,Jadual Pengkodan
 DocType: Timesheet Detail,Hrs,Hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Sila pilih Syarikat
 DocType: Stock Entry Detail,Difference Account,Akaun perbezaan
 DocType: Purchase Invoice,Supplier GSTIN,GSTIN pembekal
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Tidak boleh tugas sedekat tugas takluknya {0} tidak ditutup.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,Sila masukkan Gudang yang mana Bahan Permintaan akan dibangkitkan
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Tidak boleh tugas sedekat tugas takluknya {0} tidak ditutup.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Sila masukkan Gudang yang mana Bahan Permintaan akan dibangkitkan
 DocType: Production Order,Additional Operating Cost,Tambahan Kos Operasi
 DocType: Lab Test Template,Lab Routine,Rutin Lab
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Untuk bergabung, sifat berikut mestilah sama bagi kedua-dua perkara"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Untuk bergabung, sifat berikut mestilah sama bagi kedua-dua perkara"
 DocType: Shipping Rule,Net Weight,Berat Bersih
 DocType: Employee,Emergency Phone,Telefon Kecemasan
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Beli
@@ -613,7 +625,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Sila menentukan gred bagi Ambang 0%
 DocType: Sales Order,To Deliver,Untuk Menyampaikan
 DocType: Purchase Invoice Item,Item,Perkara
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Serial tiada perkara tidak boleh menjadi sebahagian kecil
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Kepekaan Tinggi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Serial tiada perkara tidak boleh menjadi sebahagian kecil
 DocType: Journal Entry,Difference (Dr - Cr),Perbezaan (Dr - Cr)
 DocType: Account,Profit and Loss,Untung dan Rugi
 DocType: Patient,Risk Factors,Faktor-faktor risiko
@@ -622,7 +635,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Urusan subkontrak
 DocType: Vital Signs,Body Temperature,Suhu Badan
 DocType: Project,Project will be accessible on the website to these users,Projek akan boleh diakses di laman web untuk pengguna ini
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Tentukan jenis Projek.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Tentukan jenis Projek.
 DocType: Supplier Scorecard,Weighting Function,Fungsi Berat
 DocType: Physician,OP Consulting Charge,Caj Perundingan OP
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Persiapkan anda
@@ -636,7 +649,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Kenaikan tidak boleh 0
 DocType: Production Planning Tool,Material Requirement,Keperluan Bahan
 DocType: Company,Delete Company Transactions,Padam Transaksi Syarikat
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Rujukan dan Tarikh Rujukan adalah wajib untuk transaksi Bank
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Rujukan dan Tarikh Rujukan adalah wajib untuk transaksi Bank
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tambah / Edit Cukai dan Caj
 DocType: Payment Entry Reference,Supplier Invoice No,Pembekal Invois No
 DocType: Territory,For reference,Untuk rujukan
@@ -644,12 +657,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Tidak dapat memadam No Serial {0}, kerana ia digunakan dalam urus niaga saham"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Penutup (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Hello
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Move Perkara
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Move Perkara
 DocType: Serial No,Warranty Period (Days),Tempoh Waranti (Hari)
 DocType: Installation Note Item,Installation Note Item,Pemasangan Nota Perkara
 DocType: Production Plan Item,Pending Qty,Menunggu Kuantiti
 DocType: Budget,Ignore,Abaikan
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} tidak aktif
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} tidak aktif
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,dimensi Persediaan cek percetakan
 DocType: Salary Slip,Salary Slip Timesheet,Slip Gaji Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Pembekal Gudang mandatori bagi sub-kontrak Pembelian Resit
@@ -658,7 +671,7 @@
 DocType: Pricing Rule,Sales Partner,Rakan Jualan
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Semua kad skor Pembekal.
 DocType: Buying Settings,Purchase Receipt Required,Resit pembelian Diperlukan
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Kadar Penilaian adalah wajib jika Stok Awal memasuki
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,Kadar Penilaian adalah wajib jika Stok Awal memasuki
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Tiada rekod yang terdapat dalam jadual Invois yang
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Sila pilih Syarikat dan Parti Jenis pertama
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Tahun kewangan / perakaunan.
@@ -695,7 +708,7 @@
 DocType: Quotation,Quotation To,Sebutharga Untuk
 DocType: Lead,Middle Income,Pendapatan Tengah
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Pembukaan (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unit keingkaran Langkah untuk Perkara {0} tidak boleh diubah langsung kerana anda telah membuat beberapa transaksi (s) dengan UOM lain. Anda akan perlu untuk membuat item baru untuk menggunakan UOM Lalai yang berbeza.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unit keingkaran Langkah untuk Perkara {0} tidak boleh diubah langsung kerana anda telah membuat beberapa transaksi (s) dengan UOM lain. Anda akan perlu untuk membuat item baru untuk menggunakan UOM Lalai yang berbeza.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Jumlah yang diperuntukkan tidak boleh negatif
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Sila tetapkan Syarikat
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Sila tetapkan Syarikat
@@ -710,6 +723,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Pilih Akaun Pembayaran untuk membuat Bank Kemasukan
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Mencipta rekod pekerja untuk menguruskan daun, tuntutan perbelanjaan dan gaji"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Tempoh Preskripsi
+DocType: Restaurant Reservation,Restaurant Reservation,Tempahan Restoran
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Penulisan Cadangan
 DocType: Payment Entry Deduction,Payment Entry Deduction,Pembayaran Potongan Kemasukan
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Satu lagi Orang Jualan {0} wujud dengan id Pekerja yang sama
@@ -717,7 +731,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Sarjana
 DocType: Assessment Plan,Maximum Assessment Score,Maksimum Skor Penilaian
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Update Bank Tarikh Transaksi
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Tracking masa
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Tracking masa
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,PENDUA UNTUK TRANSPORTER
 DocType: Fiscal Year Company,Fiscal Year Company,Tahun Anggaran Syarikat
 DocType: Packing Slip Item,DN Detail,Detail DN
@@ -726,8 +740,9 @@
 DocType: Batch,Batch Description,Batch Penerangan
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Mewujudkan kumpulan pelajar
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Mewujudkan kumpulan pelajar
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Pembayaran Akaun Gateway tidak diciptakan, sila buat secara manual."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Pembayaran Akaun Gateway tidak diciptakan, sila buat secara manual."
 DocType: Supplier Scorecard,Per Year,Setiap tahun
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Tidak layak menerima kemasukan dalam program ini seperti DOB
 DocType: Sales Invoice,Sales Taxes and Charges,Jualan Cukai dan Caj
 DocType: Employee,Organization Profile,Organisasi Profil
 DocType: Vital Signs,Height (In Meter),Ketinggian (dalam meter)
@@ -763,7 +778,7 @@
 DocType: Student Batch Name,Batch Name,Batch Nama
 DocType: Fee Validity,Max number of visit,Bilangan lawatan maksimum
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet dicipta:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Sila tetapkan lalai Tunai atau akaun Bank dalam Mod Bayaran {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Sila tetapkan lalai Tunai atau akaun Bank dalam Mod Bayaran {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,mendaftar
 DocType: GST Settings,GST Settings,Tetapan GST
 DocType: Selling Settings,Customer Naming By,Menamakan Dengan Pelanggan
@@ -795,16 +810,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Cukai Tanah Kos dan Caj
 DocType: Production Order Operation,Actual Start Time,Masa Mula Sebenar
 DocType: BOM Operation,Operation Time,Masa Operasi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Selesai
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Selesai
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,base
 DocType: Timesheet,Total Billed Hours,Jumlah Jam Diiktiraf
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Tulis Off Jumlah
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Tulis Off Jumlah
 DocType: Leave Block List Allow,Allow User,Benarkan pengguna
 DocType: Journal Entry,Bill No,Rang Undang-Undang No
 DocType: Company,Gain/Loss Account on Asset Disposal,Akaun Keuntungan / Kerugian daripada Pelupusan Aset
 DocType: Vehicle Log,Service Details,Maklumat perkhidmatan
 DocType: Vehicle Log,Service Details,Maklumat perkhidmatan
-DocType: Purchase Invoice,Quarterly,Suku Tahunan
+DocType: Subscription,Quarterly,Suku Tahunan
 DocType: Lab Test Template,Grouped,Dikelompokkan
 DocType: Selling Settings,Delivery Note Required,Penghantaran Nota Diperlukan
 DocType: Bank Guarantee,Bank Guarantee Number,Bank Nombor Jaminan
@@ -814,12 +829,12 @@
 DocType: Student Attendance,Student Attendance,Kehadiran pelajar
 DocType: Sales Invoice Timesheet,Time Sheet,Lembaran masa
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Bahan Mentah Based On
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Sila masukkan butiran item
 DocType: Interest,Interest,Faedah
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Jualan pra
 DocType: Purchase Receipt,Other Details,Butiran lain
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,Templat Ujian
+DocType: Restaurant Order Entry Item,Served,Berkhidmat
 DocType: Account,Accounts,Akaun-akaun
 DocType: Vehicle,Odometer Value (Last),Nilai Odometer (Akhir)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Templat kriteria kad skor pembekal.
@@ -831,26 +846,28 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Preview Slip Gaji
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Akaun {0} telah dibuat beberapa kali
 DocType: Account,Expenses Included In Valuation,Perbelanjaan Termasuk Dalam Penilaian
-DocType: Hub Settings,Seller City,Penjual City
 ,Absent Student Report,Tidak hadir Laporan Pelajar
 DocType: Email Digest,Next email will be sent on:,E-mel seterusnya akan dihantar pada:
 DocType: Offer Letter Term,Offer Letter Term,Menawarkan Surat Jangka
 DocType: Supplier Scorecard,Per Week,Seminggu
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Perkara mempunyai varian.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Perkara mempunyai varian.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Jumlah Pelajar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Perkara {0} tidak dijumpai
 DocType: Bin,Stock Value,Nilai saham
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,"Rekod bayaran akan dibuat di latar belakang. Sekiranya terdapat sebarang kesilapan, mesej ralat akan dikemas kini dalam Jadual."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Syarikat {0} tidak wujud
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} mempunyai kesahan bayaran sehingga {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} mempunyai kesahan bayaran sehingga {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Tree Jenis
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Kuantiti Digunakan Seunit
 DocType: Serial No,Warranty Expiry Date,Waranti Tarikh Luput
 DocType: Material Request Item,Quantity and Warehouse,Kuantiti dan Gudang
+DocType: Hub Settings,Unregister,Tidak mendaftar
 DocType: Sales Invoice,Commission Rate (%),Kadar komisen (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Sila pilih Program
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Sila pilih Program
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Sila pilih Program
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Sila pilih Program
 DocType: Project,Estimated Cost,Anggaran kos
 DocType: Purchase Order,Link to material requests,Link kepada permintaan bahan
+DocType: Hub Settings,Publish,Menerbitkan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aeroangkasa
 DocType: Journal Entry,Credit Card Entry,Entry Kad Kredit
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Syarikat dan Akaun
@@ -861,13 +878,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Tutup Peluang Selepas Hari
 ,Reserved,Cipta Terpelihara
 DocType: Purchase Order,Supply Raw Materials,Bekalan Bahan Mentah
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Tarikh di mana invois akan dijana. Ia dihasilkan di hantar.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Aset Semasa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} bukan perkara stok
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',Sila maklumkan maklum balas anda ke latihan dengan mengklik &#39;Maklum Balas Latihan&#39; dan kemudian &#39;Baru&#39;
 DocType: Mode of Payment Account,Default Account,Akaun Default
 DocType: Payment Entry,Received Amount (Company Currency),Pendapatan daripada (Syarikat Mata Wang)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,Lead mesti ditetapkan jika Peluang diperbuat daripada Lead
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,Lead mesti ditetapkan jika Peluang diperbuat daripada Lead
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Sila pilih hari cuti mingguan
 DocType: Patient,O Negative,O Negatif
 DocType: Production Order Operation,Planned End Time,Dirancang Akhir Masa
@@ -883,10 +899,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Tenaga
 DocType: Opportunity,Opportunity From,Peluang Daripada
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Kenyataan gaji bulanan.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Tambah Syarikat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Baris {0}: {1} Nombor Siri diperlukan untuk Item {2}. Anda telah menyediakan {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Baris {0}: {1} Nombor Siri diperlukan untuk Item {2}. Anda telah menyediakan {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Sila pilih jadual
 DocType: BOM,Website Specifications,Laman Web Spesifikasi
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} adalah alamat e-mel yang tidak sah dalam &#39;Penerima&#39;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} adalah alamat e-mel yang tidak sah dalam &#39;Penerima&#39;
 DocType: Special Test Items,Particulars,Butiran
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiotik.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Dari {0} dari jenis {1}
@@ -894,11 +910,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Row {0}: Faktor penukaran adalah wajib
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Peraturan Harga pelbagai wujud dengan kriteria yang sama, sila menyelesaikan konflik dengan memberikan keutamaan. Peraturan Harga: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,Tidak boleh menyahaktifkan atau membatalkan BOM kerana ia dikaitkan dengan BOMs lain
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,Tidak boleh menyahaktifkan atau membatalkan BOM kerana ia dikaitkan dengan BOMs lain
 DocType: Opportunity,Maintenance,Penyelenggaraan
 DocType: Item Attribute Value,Item Attribute Value,Perkara Atribut Nilai
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Kempen jualan.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,membuat Timesheet
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,membuat Timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -936,12 +952,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Sila masukkan Perkara pertama
 DocType: Account,Liability,Liabiliti
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Amaun yang dibenarkan tidak boleh lebih besar daripada Tuntutan Jumlah dalam Row {0}.
+DocType: Salary Detail,Do not include in total,Tidak termasuk dalam jumlah
 DocType: Company,Default Cost of Goods Sold Account,Kos Default Akaun Barangan Dijual
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Senarai Harga tidak dipilih
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Senarai Harga tidak dipilih
 DocType: Employee,Family Background,Latar Belakang Keluarga
 DocType: Request for Quotation Supplier,Send Email,Hantar E-mel
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Amaran: Lampiran sah {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Tiada Kebenaran
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Amaran: Lampiran sah {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Tiada Kebenaran
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Tuntut Sebut
 DocType: Vital Signs,Heart Rate / Pulse,Kadar Jantung / Pulse
 DocType: Company,Default Bank Account,Akaun Bank Default
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Untuk menapis berdasarkan Parti, pilih Parti Taipkan pertama"
@@ -969,12 +987,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Perkara Row {IDX}: {DOCTYPE} {} DOCNAME tidak wujud dalam di atas &#39;{DOCTYPE}&#39; meja
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} sudah selesai atau dibatalkan
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Tiada tugasan
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Hari dalam bulan di mana invois automatik akan dijana contohnya 05, 28 dan lain-lain"
 DocType: Item Variant Settings,Copy Fields to Variant,Salin Medan ke Varians
 DocType: Asset,Opening Accumulated Depreciation,Membuka Susut Nilai Terkumpul
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Skor mesti kurang daripada atau sama dengan 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Pendaftaran Tool
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C-Borang rekod
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C-Borang rekod
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Pelanggan dan Pembekal
 DocType: Email Digest,Email Digest Settings,E-mel Tetapan Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Terima kasih atas urusan awak!
@@ -992,13 +1009,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Status Petikan
 DocType: Maintenance Visit,Completion Status,Siap Status
 DocType: HR Settings,Enter retirement age in years,Masukkan umur persaraan pada tahun-tahun
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Sasaran Gudang
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Sila pilih gudang
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Sasaran Gudang
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Sila pilih gudang
 DocType: Cheque Print Template,Starting location from left edge,Bermula lokasi dari tepi kiri
 DocType: Item,Allow over delivery or receipt upto this percent,Membolehkan lebih penghantaran atau penerimaan hamper peratus ini
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Import Kehadiran
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Semua Kumpulan Perkara
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Semua Kumpulan Perkara
 DocType: Process Payroll,Activity Log,Log Aktiviti
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Keuntungan bersih / Rugi
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Mengarang mesej secara automatik pada penyerahan transaksi.
@@ -1010,7 +1027,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Unjuran Qty
 DocType: Sales Invoice,Payment Due Date,Tarikh Pembayaran
 DocType: Drug Prescription,Interval UOM,Selang UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Perkara Variant {0} telah wujud dengan sifat-sifat yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Perkara Variant {0} telah wujud dengan sifat-sifat yang sama
+DocType: Item,Hub Publishing Details,Butiran Penerbitan Hab
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;Pembukaan&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Terbuka To Do
 DocType: Notification Control,Delivery Note Message,Penghantaran Nota Mesej
@@ -1030,10 +1048,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: Bahan mentah tidak boleh sama dengan Perkara utama
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Jumlah Caj Terpakai di Purchase meja Resit Item mesti sama dengan Jumlah Cukai dan Caj
 DocType: Sales Team,Incentives,Insentif
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Daftar untuk Hab
 DocType: SMS Log,Requested Numbers,Nombor diminta
 DocType: Production Planning Tool,Only Obtain Raw Materials,Hanya Dapatkan Bahan Mentah
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Penilaian prestasi.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Mendayakan &#39;Gunakan untuk Shopping Cart&#39;, kerana Troli didayakan dan perlu ada sekurang-kurangnya satu Peraturan cukai bagi Troli Membeli-belah"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Mendayakan &#39;Gunakan untuk Shopping Cart&#39;, kerana Troli didayakan dan perlu ada sekurang-kurangnya satu Peraturan cukai bagi Troli Membeli-belah"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Kemasukan Pembayaran {0} dikaitkan terhadap Perintah {1}, semak sama ada ia perlu ditarik sebagai pendahuluan dalam invois ini."
 DocType: Sales Invoice Item,Stock Details,Stok
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Nilai Projek
@@ -1052,12 +1071,14 @@
 DocType: Salary Slip,Working Days,Hari Bekerja
 DocType: Serial No,Incoming Rate,Kadar masuk
 DocType: Packing Slip,Gross Weight,Berat kasar
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,Nama syarikat anda yang mana anda menubuhkan sistem ini.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Dayakan Hab
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,Nama syarikat anda yang mana anda menubuhkan sistem ini.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Termasuk bercuti di Jumlah no. Hari Kerja
 DocType: Job Applicant,Hold,Pegang
 DocType: Employee,Date of Joining,Tarikh Menyertai
 DocType: Naming Series,Update Series,Update Siri
 DocType: Supplier Quotation,Is Subcontracted,Apakah Subkontrak
+DocType: Restaurant Table,Minimum Seating,Tempat Duduk Minimum
 DocType: Item Attribute,Item Attribute Values,Nilai Perkara Sifat
 DocType: Examination Result,Examination Result,Keputusan peperiksaan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Resit Pembelian
@@ -1068,13 +1089,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Tidak dapat mencari Slot Masa di akhirat {0} hari untuk Operasi {1}
 DocType: Production Order,Plan material for sub-assemblies,Bahan rancangan untuk sub-pemasangan
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Jualan rakan-rakan dan Wilayah
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} mesti aktif
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} mesti aktif
 DocType: Journal Entry,Depreciation Entry,Kemasukan susutnilai
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Sila pilih jenis dokumen pertama
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Batal Bahan Lawatan {0} sebelum membatalkan Lawatan Penyelenggaraan ini
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},No siri {0} bukan milik Perkara {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Diperlukan Qty
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Gudang dengan urus niaga yang sedia ada tidak boleh ditukar ke dalam lejar.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Gudang dengan urus niaga yang sedia ada tidak boleh ditukar ke dalam lejar.
 DocType: Bank Reconciliation,Total Amount,Jumlah
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Penerbitan Internet
 DocType: Prescription Duration,Number,Nombor
@@ -1085,7 +1106,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Senarai Harga Jualan
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Sekiranya disemak, pelanggan akan dibuat, dipetakan kepada Pesakit. Invois Pesakit akan dibuat terhadap Pelanggan ini. Anda juga boleh memilih Pelanggan sedia ada semasa membuat Pesakit."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publish untuk menyegerakkan item
 DocType: Bank Reconciliation,Account Currency,Mata Wang Akaun
 DocType: Lab Test,Sample ID,ID sampel
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Sila menyebut Akaun Off Pusingan dalam Syarikat
@@ -1094,11 +1114,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Pekerja {0} tidak aktif atau tidak wujud
 DocType: Fee Structure,Components,komponen
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Sila masukkan Kategori Asset dalam Perkara {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Perkara Kelainan {0} dikemaskini
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Perkara Kelainan {0} dikemaskini
 DocType: Quality Inspection Reading,Reading 6,Membaca 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Tidak boleh {0} {1} {2} tanpa sebarang invois tertunggak negatif
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","dijana. Jika ditangguhkan, anda perlu mengubah secara manual bidang &quot;Ulang Hari Hari&quot; ini"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Tidak boleh {0} {1} {2} tanpa sebarang invois tertunggak negatif
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Membeli Advance Invois
-DocType: Hub Settings,Sync Now,Sync Sekarang
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: kemasukan Kredit tidak boleh dikaitkan dengan {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Tentukan bajet untuk tahun kewangan.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Lalai akaun Bank / Tunai akan secara automatik dikemaskini dalam POS Invois apabila mod ini dipilih.
@@ -1110,13 +1131,13 @@
 DocType: Item,Is Purchase Item,Adalah Pembelian Item
 DocType: Asset,Purchase Invoice,Invois Belian
 DocType: Stock Ledger Entry,Voucher Detail No,Detail baucar Tiada
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,New Invois Jualan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,New Invois Jualan
 DocType: Stock Entry,Total Outgoing Value,Jumlah Nilai Keluar
 DocType: Physician,Appointments,Pelantikan
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Tarikh dan Tarikh Tutup merasmikan perlu berada dalam sama Tahun Anggaran
 DocType: Lead,Request for Information,Permintaan Maklumat
 ,LeaderBoard,Leaderboard
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Sync Offline Invois
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Sync Offline Invois
 DocType: Payment Request,Paid,Dibayar
 DocType: Program Fee,Program Fee,Yuran program
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1135,11 +1156,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Pesanan Pembelian Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Pendapatan tidak langsung
 DocType: Student Attendance Tool,Student Attendance Tool,Alat Kehadiran Pelajar
+DocType: Restaurant Menu,Price List (Auto created),Senarai harga (dicipta secara automatik)
 DocType: Cheque Print Template,Date Settings,tarikh Tetapan
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Varian
 ,Company Name,Nama Syarikat
 DocType: SMS Center,Total Message(s),Jumlah Mesej (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Pilih Item Pemindahan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Pilih Item Pemindahan
 DocType: Purchase Invoice,Additional Discount Percentage,Peratus Diskaun tambahan
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Lihat senarai semua video bantuan
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Pilih kepala akaun bank di mana cek didepositkan.
@@ -1157,6 +1179,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,meter
 DocType: Workstation,Electricity Cost,Kos Elektrik
 DocType: HR Settings,Don't send Employee Birthday Reminders,Jangan hantar Pekerja Hari Lahir Peringatan
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Simpan Tetapan
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Produk yang diminta
 DocType: Item,Inspection Criteria,Kriteria Pemeriksaan
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Dipindahkan
 DocType: BOM Website Item,BOM Website Item,BOM laman Perkara
@@ -1174,11 +1198,11 @@
 DocType: Journal Entry,Total Amount in Words,Jumlah Amaun dalam Perkataan
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Terdapat ralat. Yang berkemungkinan boleh bahawa anda belum menyimpan borang. Sila hubungi support@erpnext.com jika masalah berterusan.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Keranjang saya
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Perintah Jenis mestilah salah seorang daripada {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Perintah Jenis mestilah salah seorang daripada {0}
 DocType: Lead,Next Contact Date,Hubungi Seterusnya Tarikh
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Membuka Qty
 DocType: Healthcare Settings,Appointment Reminder,Peringatan Pelantikan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Sila masukkan Akaun untuk Perubahan Jumlah
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Sila masukkan Akaun untuk Perubahan Jumlah
 DocType: Student Batch Name,Student Batch Name,Pelajar Batch Nama
 DocType: Consultation,Doctor,Doktor
 DocType: Holiday List,Holiday List Name,Nama Senarai Holiday
@@ -1186,12 +1210,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Kursus jadual
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Pilihan Saham
 DocType: Journal Entry Account,Expense Claim,Perbelanjaan Tuntutan
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Adakah anda benar-benar mahu memulihkan aset dilupuskan ini?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Qty untuk {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Adakah anda benar-benar mahu memulihkan aset dilupuskan ini?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Qty untuk {0}
 DocType: Leave Application,Leave Application,Cuti Permohonan
 DocType: Patient,Patient Relation,Hubungan Pesakit
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Tinggalkan Alat Peruntukan
+DocType: Item,Hub Category to Publish,Kategori Hub untuk Terbitkan
 DocType: Leave Block List,Leave Block List Dates,Tinggalkan Tarikh Sekat Senarai
+DocType: Sales Invoice,Billing Address GSTIN,Alamat Bil GSTIN
 DocType: Workstation,Net Hour Rate,Kadar Hour bersih
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Kos mendarat Pembelian Resit
 DocType: Company,Default Terms,Terma Default
@@ -1201,11 +1227,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Sila nyatakan {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Barangan dikeluarkan dengan tiada perubahan dalam kuantiti atau nilai.
 DocType: Delivery Note,Delivery To,Penghantaran Untuk
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Jadual atribut adalah wajib
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Jadual atribut adalah wajib
 DocType: Production Planning Tool,Get Sales Orders,Dapatkan Perintah Jualan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} tidak boleh negatif
 DocType: Training Event,Self-Study,Belajar sendiri
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Diskaun
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Diskaun
 DocType: Asset,Total Number of Depreciations,Jumlah penurunan nilai
 DocType: Sales Invoice Item,Rate With Margin,Kadar Dengan Margin
 DocType: Sales Invoice Item,Rate With Margin,Kadar Dengan Margin
@@ -1213,7 +1239,7 @@
 DocType: Task,Urgent,Segera
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Sila nyatakan ID Row sah untuk barisan {0} dalam jadual {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Tidak dapat mencari variabel:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Sila pilih medan untuk mengedit dari numpad
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Sila pilih medan untuk mengedit dari numpad
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Pergi ke Desktop dan mula menggunakan ERPNext
 DocType: Item,Manufacturer,Pengeluar
 DocType: Landed Cost Item,Purchase Receipt Item,Pembelian Penerimaan Perkara
@@ -1244,8 +1270,8 @@
 DocType: GL Entry,Against,Terhadap
 DocType: Item,Default Selling Cost Center,Default Jualan Kos Pusat
 DocType: Sales Partner,Implementation Partner,Rakan Pelaksanaan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Poskod
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Pesanan Jualan {0} ialah {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Poskod
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Pesanan Jualan {0} ialah {1}
 DocType: Opportunity,Contact Info,Maklumat perhubungan
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Membuat Kemasukan Stok
 DocType: Packing Slip,Net Weight UOM,Berat UOM bersih
@@ -1256,6 +1282,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Dapatkan Mingguan Off Tarikh
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Tarikh akhir tidak boleh kurang daripada Tarikh Mula
 DocType: Sales Person,Select company name first.,Pilih nama syarikat pertama.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Rendah ke Tinggi
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Sebut Harga yang diterima daripada Pembekal.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Gantikan BOM dan kemaskini harga terbaru dalam semua BOM
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Untuk {0} | {1} {2}
@@ -1276,7 +1303,7 @@
 DocType: Program Enrollment,Transportation,Pengangkutan
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Sifat tidak sah
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} mestilah diserahkan
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Kuantiti mesti kurang daripada atau sama dengan {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Kuantiti mesti kurang daripada atau sama dengan {0}
 DocType: SMS Center,Total Characters,Jumlah Watak
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Sila pilih BOM dalam bidang BOM untuk Perkara {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Detail C-Borang Invois
@@ -1291,7 +1318,7 @@
 ,Ordered Items To Be Billed,Item Diperintah dibilkan
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Dari Range mempunyai kurang daripada Untuk Julat
 DocType: Global Defaults,Global Defaults,Lalai Global
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Projek Kerjasama Jemputan
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Projek Kerjasama Jemputan
 DocType: Salary Slip,Deductions,Potongan
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Nama Tindakan
@@ -1309,13 +1336,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Jualan Invois Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Tiada apa-apa untuk meminta
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Satu lagi rekod Bajet &#39;{0}&#39; sudah wujud daripada {1} &#39;{2} bagi tahun fiskal {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','Tarikh Asal Mula' tidak boleh lebih besar daripada 'Tarikh Asal Tamat'
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','Tarikh Asal Mula' tidak boleh lebih besar daripada 'Tarikh Asal Tamat'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Pengurusan
 DocType: Cheque Print Template,Payer Settings,Tetapan pembayar
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ini akan dilampirkan Kod Item bagi varian. Sebagai contoh, jika anda adalah singkatan &quot;SM&quot;, dan kod item adalah &quot;T-SHIRT&quot;, kod item varian akan &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Gaji bersih (dengan perkataan) akan dapat dilihat selepas anda menyimpan Slip Gaji.
 DocType: Purchase Invoice,Is Return,Tempat kembalinya
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Awas
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Awas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Pulangan / Nota Debit
 DocType: Price List Country,Price List Country,Senarai harga Negara
 DocType: Item,UOMs,UOMs
@@ -1330,17 +1357,18 @@
 DocType: Account,Balance Sheet,Kunci Kira-kira
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Pusat Kos Bagi Item Kod Item &#39;
 DocType: Fee Validity,Valid Till,Sah sehingga
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode bayaran tidak dikonfigurasikan. Sila semak, sama ada akaun ini tidak ditetapkan Mod Pembayaran atau POS Profil."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode bayaran tidak dikonfigurasikan. Sila semak, sama ada akaun ini tidak ditetapkan Mod Pembayaran atau POS Profil."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,item yang sama tidak boleh dimasukkan beberapa kali.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Akaun lanjut boleh dibuat di bawah Kumpulan, tetapi penyertaan boleh dibuat terhadap bukan Kumpulan"
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Pemiutang
 DocType: Course,Course Intro,kursus Pengenalan
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Kemasukan Stock {0} dicipta
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Sila persediaan siri penomboran untuk Kehadiran melalui Persediaan&gt; Penomboran Siri
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Kemasukan Stock {0} dicipta
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Ditolak Qty tidak boleh dimasukkan dalam Pembelian Pulangan
 ,Purchase Order Items To Be Billed,Item Pesanan Belian dikenakan caj
 DocType: Purchase Invoice Item,Net Rate,Kadar bersih
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Sila pilih pelanggan
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Sila pilih pelanggan
 DocType: Purchase Invoice Item,Purchase Invoice Item,Membeli Invois Perkara
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Saham Lejar Penyertaan dan GL Penyertaan diumumkan bagi Resit Pembelian dipilih
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Perkara 1
@@ -1361,7 +1389,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Salinan barisan {0} dengan sama {1}
 ,Trial Balance,Imbangan Duga
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Tahun Anggaran {0} tidak dijumpai
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Menubuhkan Pekerja
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Menubuhkan Pekerja
 DocType: Sales Order,SO-,demikian-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Sila pilih awalan pertama
 DocType: Employee,O-,O-
@@ -1373,12 +1401,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Lihat Lejar
 DocType: Grading Scale,Intervals,selang
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Terawal
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Satu Kumpulan Item wujud dengan nama yang sama, sila tukar nama item atau menamakan semula kumpulan item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Satu Kumpulan Item wujud dengan nama yang sama, sila tukar nama item atau menamakan semula kumpulan item"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Pelajar Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Rest Of The World
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Rest Of The World
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,The Perkara {0} tidak boleh mempunyai Batch
 ,Budget Variance Report,Belanjawan Laporan Varian
 DocType: Salary Slip,Gross Pay,Gaji kasar
+DocType: Item,Is Item from Hub,Adakah Item dari Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Row {0}: Jenis Aktiviti adalah wajib.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividen Dibayar
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Perakaunan Lejar
@@ -1388,8 +1417,9 @@
 DocType: Vehicle Log,Service Detail,Detail perkhidmatan
 DocType: BOM,Item Description,Perkara Penerangan
 DocType: Student Sibling,Student Sibling,Adik-beradik pelajar
-DocType: Purchase Invoice,Is Recurring,Adalah Berulang
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Cara Pembayaran
 DocType: Purchase Invoice,Supplied Items,Item dibekalkan
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Sila tetapkan menu aktif untuk Restoran {0}
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Qty Untuk Pembuatan
 DocType: Email Digest,New Income,Pendapatan New
@@ -1400,6 +1430,7 @@
 ,Student and Guardian Contact Details,Pelajar dan Guardian Butiran Hubungi
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Row {0}: Untuk pembekal {0} Alamat e-mel diperlukan untuk menghantar e-mel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Pembukaan sementara
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Lihat Hub
 ,Employee Leave Balance,Pekerja Cuti Baki
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Baki untuk Akaun {0} mesti sentiasa {1}
 DocType: Patient Appointment,More Info,Banyak Lagi Maklumat
@@ -1419,13 +1450,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Pesanan Jualan {0} tidak sah
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Amalkan Permintaan untuk Sebut Harga baru
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,pesanan pembelian membantu anda merancang dan mengambil tindakan susulan ke atas pembelian anda
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Maaf, syarikat tidak boleh digabungkan"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Maaf, syarikat tidak boleh digabungkan"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Preskripsi Ubat Lab
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Jumlah kuantiti Terbitan / Transfer {0} dalam Permintaan Bahan {1} \ tidak boleh lebih besar daripada kuantiti diminta {2} untuk item {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Kecil
 DocType: Employee,Employee Number,Bilangan pekerja
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Kes Tidak (s) telah digunakan. Cuba dari Case No {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Kes Tidak (s) telah digunakan. Cuba dari Case No {0}
 DocType: Project,% Completed,% Selesai
 ,Invoiced Amount (Exculsive Tax),Invois (Exculsive Cukai)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Perkara 2
@@ -1440,11 +1471,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Perbelanjaan tidak langsung
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Row {0}: Qty adalah wajib
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Pertanian
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Produk atau Perkhidmatan anda
 DocType: Special Test Items,Special Test Items,Item Ujian Khas
 DocType: Mode of Payment,Mode of Payment,Cara Pembayaran
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Laman web Image perlu fail awam atau URL laman web
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Laman web Image perlu fail awam atau URL laman web
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Ini adalah kumpulan item akar dan tidak boleh diedit.
@@ -1452,9 +1483,9 @@
 DocType: Vehicle,Fuel UOM,Fuel UOM
 DocType: Warehouse,Warehouse Contact Info,Gudang info
 DocType: Payment Entry,Write Off Difference Amount,Tulis Off Jumlah Perbezaan
-DocType: Purchase Invoice,Recurring Type,Jenis berulang
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: e-mel pekerja tidak dijumpai, maka e-mel tidak dihantar"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: e-mel pekerja tidak dijumpai, maka e-mel tidak dihantar"
 DocType: Item,Foreign Trade Details,Maklumat Perdagangan Luar Negeri
+,Assessment Plan Status,Status Pelan Penilaian
 DocType: Email Digest,Annual Income,Pendapatan tahunan
 DocType: Serial No,Serial No Details,Serial No Butiran
 DocType: Purchase Invoice Item,Item Tax Rate,Perkara Kadar Cukai
@@ -1462,15 +1493,14 @@
 DocType: Student Group Student,Group Roll Number,Kumpulan Nombor Roll
 DocType: Student Group Student,Group Roll Number,Kumpulan Nombor Roll
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Untuk {0}, hanya akaun kredit boleh dikaitkan terhadap kemasukan debit lain"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Jumlah semua berat tugas harus 1. Laraskan berat semua tugas Projek sewajarnya
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Penghantaran Nota {0} tidak dikemukakan
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Jumlah semua berat tugas harus 1. Laraskan berat semua tugas Projek sewajarnya
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Penghantaran Nota {0} tidak dikemukakan
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Perkara {0} mestilah Sub-kontrak Perkara
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Peralatan Modal
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Peraturan harga mula-mula dipilih berdasarkan &#39;Guna Mengenai&#39; bidang, yang boleh menjadi Perkara, Perkara Kumpulan atau Jenama."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Sila nyatakan Kod Item terlebih dahulu
-DocType: Hub Settings,Seller Website,Penjual Laman Web
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Sila nyatakan Kod Item terlebih dahulu
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Jumlah peratusan yang diperuntukkan bagi pasukan jualan harus 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Jumlah peratusan yang diperuntukkan bagi pasukan jualan harus 100
 DocType: Sales Invoice Item,Edit Description,Edit Penerangan
 DocType: Antibiotic,Antibiotic,Antibiotik
 ,Team Updates,Pasukan Terbaru
@@ -1491,12 +1521,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Jumlah (Syarikat mata wang)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Nombor siri {0} memasuki lebih daripada sekali
 DocType: Depreciation Schedule,Journal Entry,Jurnal Entry
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} item dalam kemajuan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} item dalam kemajuan
 DocType: Workstation,Workstation Name,Nama stesen kerja
 DocType: Grading Scale Interval,Grade Code,Kod gred
 DocType: POS Item Group,POS Item Group,POS Item Kumpulan
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mel Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} bukan milik Perkara {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} bukan milik Perkara {1}
 DocType: Sales Partner,Target Distribution,Pengagihan Sasaran
 DocType: Salary Slip,Bank Account No.,No. Akaun Bank
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Ini ialah bilangan transaksi terakhir yang dibuat dengan awalan ini
@@ -1513,10 +1543,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Sebut Harga Pembekal
 DocType: Healthcare Settings,Registration Message,Mesej Pendaftaran
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Perkakasan
-DocType: Sales Order,Recurring Upto,berulang Hamper
 DocType: Prescription Dosage,Prescription Dosage,Dosis Preskripsi
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Sila pilih sebuah Syarikat
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Sila pilih sebuah Syarikat
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Privilege Cuti
 DocType: Purchase Invoice,Supplier Invoice Date,Pembekal Invois Tarikh
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,setiap
@@ -1532,10 +1561,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Keadaan bertindih yang terdapat di antara:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Terhadap Journal Entry {0} telah diselaraskan dengan beberapa baucar lain
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Jumlah Nilai Pesanan
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Makanan
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Makanan
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Range Penuaan 3
 DocType: Maintenance Schedule Item,No of Visits,Jumlah Lawatan
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Jadual Penyelenggaraan {0} wujud daripada {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Adakah anda ingin menyiarkan Item anda ke Hub?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,pelajar yang mendaftar
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Mata Wang Akaun Penutupan mestilah {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Jumlah mata untuk semua matlamat harus 100. Ia adalah {0}
@@ -1546,9 +1576,9 @@
 DocType: Authorization Rule,Average Discount,Diskaun Purata
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Utiliti
-DocType: Purchase Invoice Item,Accounting,Perakaunan
+DocType: POS Profile,Accounting,Perakaunan
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Sila pilih kumpulan untuk item batched
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Sila pilih kumpulan untuk item batched
 DocType: Asset,Depreciation Schedules,Jadual susutnilai
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Tempoh permohonan tidak boleh cuti di luar tempoh peruntukan
 DocType: Activity Cost,Projects,Projek
@@ -1564,7 +1594,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',Kelulusan Status mesti &#39;diluluskan&#39; atau &#39;Ditolak&#39;
 DocType: Physician,Contacts and Address,Kenalan dan Alamat
 DocType: Purchase Invoice,Contact Person,Dihubungi
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Jangkaan Tarikh Bermula' tidak boleh menjadi lebih besar daripada 'Jangkaan Tarikh Tamat'
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','Jangkaan Tarikh Bermula' tidak boleh menjadi lebih besar daripada 'Jangkaan Tarikh Tamat'
 DocType: Course Scheduling Tool,Course End Date,Kursus Tarikh Akhir
 DocType: Holiday List,Holidays,Cuti
 DocType: Sales Order Item,Planned Quantity,Dirancang Kuantiti
@@ -1572,10 +1602,11 @@
 DocType: Item,Maintain Stock,Mengekalkan Stok
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Penyertaan Saham telah dicipta untuk Perintah Pengeluaran
 DocType: Employee,Prefered Email,diinginkan Email
+DocType: Student Admission,Eligibility and Details,Kelayakan dan Butiran
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Perubahan Bersih dalam Aset Tetap
 DocType: Leave Control Panel,Leave blank if considered for all designations,Tinggalkan kosong jika dipertimbangkan untuk semua jawatan
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Penjaga jenis &#39;sebenar&#39; di baris {0} tidak boleh dimasukkan dalam Kadar Perkara
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Dari datetime
 DocType: Email Digest,For Company,Bagi Syarikat
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log komunikasi.
@@ -1583,19 +1614,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Pembekal Skor Kad Pembekal Pembekal
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Membeli Jumlah
 DocType: Sales Invoice,Shipping Address Name,Alamat Penghantaran Nama
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Carta Akaun
 DocType: Material Request,Terms and Conditions Content,Terma dan Syarat Kandungan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,tidak boleh lebih besar daripada 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Perkara {0} bukan Item saham
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Perkara {0} bukan Item saham
 DocType: Maintenance Visit,Unscheduled,Tidak Berjadual
 DocType: Employee,Owned,Milik
 DocType: Salary Detail,Depends on Leave Without Pay,Bergantung kepada Cuti Tanpa Gaji
 DocType: Pricing Rule,"Higher the number, higher the priority","Lebih tinggi nombor tersebut, lebih tinggi keutamaan"
 ,Purchase Invoice Trends,Membeli Trend Invois
 DocType: Employee,Better Prospects,Prospek yang lebih baik
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Row # {0}: batch The {1} hanya {2} qty. Sila pilih satu lagi kumpulan yang mempunyai {3} qty ada atau berpecah baris ke dalam pelbagai baris, untuk menyampaikan / isu dari pelbagai kelompok"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Row # {0}: batch The {1} hanya {2} qty. Sila pilih satu lagi kumpulan yang mempunyai {3} qty ada atau berpecah baris ke dalam pelbagai baris, untuk menyampaikan / isu dari pelbagai kelompok"
 DocType: Vehicle,License Plate,Plate lesen
 DocType: Appraisal,Goals,Matlamat
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Pilih Profil POS
 DocType: Warranty Claim,Warranty / AMC Status,Waranti / AMC Status
 ,Accounts Browser,Pelayar Akaun-akaun
 DocType: Payment Entry Reference,Payment Entry Reference,Pembayaran Rujukan Kemasukan
@@ -1613,7 +1644,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Pekerja tidak boleh melaporkan kepada dirinya sendiri.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jika akaun dibekukan, entri dibenarkan pengguna terhad."
 DocType: Email Digest,Bank Balance,Baki Bank
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Kemasukan Perakaunan untuk {0}: {1} hanya boleh dibuat dalam mata wang: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Kemasukan Perakaunan untuk {0}: {1} hanya boleh dibuat dalam mata wang: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil kerja, kelayakan yang diperlukan dan lain-lain"
 DocType: Journal Entry Account,Account Balance,Baki Akaun
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Peraturan cukai bagi urus niaga.
@@ -1622,8 +1653,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Jumlah Cukai dan Caj (Mata Wang Syarikat)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Tunjukkan P &amp; baki L tahun fiskal unclosed ini
 DocType: Lab Test Template,Collection Details,Butiran Koleksi
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","pilih cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date dari tabConsultation ct, `Prescription tabLab cp &#39;dimana ct.patient =&#39; {0} &#39;dan cp.parent = ct. nama dan cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Akaun Penghantaran
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Akaun {2} tidak aktif
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Buat Jualan Pesanan untuk membantu anda merancang kerja anda dan menyampaikan pada masa
@@ -1640,7 +1669,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Slip pembungkusan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Pejabat Disewa
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Tetapan gateway Persediaan SMS
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import Gagal!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import Gagal!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Tiada alamat ditambah lagi.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Jam Kerja
 DocType: Vital Signs,Blood Pressure,Tekanan darah
@@ -1665,7 +1694,7 @@
 DocType: Sales Invoice,Source,Sumber
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Show ditutup
 DocType: Leave Type,Is Leave Without Pay,Apakah Tinggalkan Tanpa Gaji
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Kategori Asset adalah wajib bagi item Aset Tetap
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Kategori Asset adalah wajib bagi item Aset Tetap
 DocType: Fee Validity,Fee Validity,Kesahan Fee
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Tiada rekod yang terdapat dalam jadual Pembayaran
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ini {0} konflik dengan {1} untuk {2} {3}
@@ -1686,8 +1715,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Cari Eksekutif
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Buat Leads
 DocType: Maintenance Schedule,Schedules,Jadual
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,Profil POS dikehendaki menggunakan Point-of-Sale
 DocType: Purchase Invoice Item,Net Amount,Jumlah Bersih
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} belum dikemukakan supaya tindakan itu tidak boleh diselesaikan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} belum dikemukakan supaya tindakan itu tidak boleh diselesaikan
 DocType: Purchase Order Item Supplied,BOM Detail No,Detail BOM Tiada
 DocType: Landed Cost Voucher,Additional Charges,Caj tambahan
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Jumlah Diskaun tambahan (Mata Wang Syarikat)
@@ -1696,7 +1726,7 @@
 ,Support Hour Distribution,Pengagihan Jam Sokongan
 DocType: Maintenance Visit,Maintenance Visit,Penyelenggaraan Lawatan
 DocType: Student,Leaving Certificate Number,Meninggalkan Nombor Sijil
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Pelantikan dibatalkan, sila semak dan batalkan invois {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Pelantikan dibatalkan, sila semak dan batalkan invois {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Batch didapati Qty di Gudang
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Update Cetak Format
 DocType: Landed Cost Voucher,Landed Cost Help,Tanah Kos Bantuan
@@ -1719,8 +1749,8 @@
 DocType: Patient,Tobacco Past Use,Kegunaan Pasti Tembakau
 DocType: Sales Invoice Item,Brand Name,Nama jenama
 DocType: Purchase Receipt,Transporter Details,Butiran Transporter
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Pengguna {0} telah ditugaskan kepada Doktor {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,gudang lalai diperlukan untuk item yang dipilih
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Pengguna {0} telah ditugaskan kepada Doktor {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,gudang lalai diperlukan untuk item yang dipilih
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Box
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,Pembekal mungkin
 DocType: Budget,Monthly Distribution,Pengagihan Bulanan
@@ -1730,8 +1760,8 @@
 DocType: Sales Partner,Sales Partner Target,Jualan Rakan Sasaran
 DocType: Loan Type,Maximum Loan Amount,Jumlah Pinjaman maksimum
 DocType: Pricing Rule,Pricing Rule,Peraturan Harga
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},jumlah roll salinan untuk pelajar {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},jumlah roll salinan untuk pelajar {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},jumlah roll salinan untuk pelajar {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},jumlah roll salinan untuk pelajar {0}
 DocType: Budget,Action if Annual Budget Exceeded,Tindakan jika Bajet Tahunan Melebihi
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Permintaan bahan Membeli Pesanan
 DocType: Shopping Cart Settings,Payment Success URL,Pembayaran URL Kejayaan
@@ -1748,7 +1778,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} mesti muncul hanya sekali
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Tidak dibenarkan Pindahkan lebih {0} daripada {1} terhadap Perintah Pembelian {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Meninggalkan Diperuntukkan Berjaya untuk {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Tiada item untuk pek
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Tiada item untuk pek
 DocType: Shipping Rule Condition,From Value,Dari Nilai
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Pembuatan Kuantiti adalah wajib
 DocType: Employee Loan,Repayment Method,Kaedah Bayaran Balik
@@ -1762,6 +1792,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Liabiliti saham
 DocType: Purchase Invoice,Supplier Warehouse,Gudang Pembekal
 DocType: Opportunity,Contact Mobile No,Hubungi Mobile No
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Pilih Syarikat
 ,Material Requests for which Supplier Quotations are not created,Permintaan bahan yang mana Sebutharga Pembekal tidak dicipta
 DocType: Student Group,Set 0 for no limit,Hanya 0 untuk tiada had
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Hari (s) di mana anda memohon cuti adalah cuti. Anda tidak perlu memohon cuti.
@@ -1771,24 +1802,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Membuat Sebut Harga
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Laporan lain
 DocType: Dependent Task,Dependent Task,Petugas bergantung
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor penukaran Unit keingkaran Langkah mesti 1 berturut-turut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor penukaran Unit keingkaran Langkah mesti 1 berturut-turut {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Cuti jenis {0} tidak boleh lebih panjang daripada {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Cuba merancang operasi untuk hari X terlebih dahulu.
 DocType: HR Settings,Stop Birthday Reminders,Stop Hari Lahir Peringatan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Sila menetapkan Payroll Akaun Belum Bayar Lalai dalam Syarikat {0}
 DocType: SMS Center,Receiver List,Penerima Senarai
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Cari Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Cari Item
 DocType: Patient Appointment,Referring Physician,Pakar Merujuk
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Jumlah dimakan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Perubahan Bersih dalam Tunai
 DocType: Assessment Plan,Grading Scale,Skala penggredan
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unit Langkah {0} telah memasuki lebih daripada sekali dalam Factor Penukaran Jadual
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,sudah selesai
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unit Langkah {0} telah memasuki lebih daripada sekali dalam Factor Penukaran Jadual
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,sudah selesai
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock In Hand
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Permintaan Bayaran sudah wujud {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kos Item Dikeluarkan
 DocType: Physician,Hospital,Hospital
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Kuantiti mestilah tidak lebih daripada {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Kuantiti mestilah tidak lebih daripada {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Sebelum Tahun Kewangan tidak ditutup
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Umur (Hari)
 DocType: Quotation Item,Quotation Item,Sebut Harga Item
@@ -1799,8 +1830,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Jenis pembekal induk.
 DocType: Purchase Order Item,Supplier Part Number,Pembekal Bahagian Nombor
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Kadar Penukaran tidak boleh menjadi 0 atau 1
-DocType: Sales Invoice,Reference Document,Dokumen rujukan
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} dibatalkan atau dihentikan
+DocType: Subscription,Reference Document,Dokumen rujukan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} dibatalkan atau dihentikan
 DocType: Accounts Settings,Credit Controller,Pengawal Kredit
 DocType: Delivery Note,Vehicle Dispatch Date,Kenderaan Dispatch Tarikh
 DocType: Healthcare Settings,Default Medical Code Standard,Standard Kod Perubatan Default
@@ -1809,6 +1840,7 @@
 DocType: Company,Default Payable Account,Default Akaun Belum Bayar
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Tetapan untuk troli membeli-belah dalam talian seperti peraturan perkapalan, senarai harga dan lain-lain"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% dibilkan
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Isih mengikut Harga ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Terpelihara Qty
 DocType: Party Account,Party Account,Akaun Pihak
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Sumber Manusia
@@ -1820,13 +1852,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Membuat Pengeluaran Kemasukan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Advance terhadap Pembekal hendaklah mendebitkan
 DocType: Company,Default Values,Nilai lalai
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Kekerapan} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Kekerapan} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Jumlah dibayar balik
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ini adalah berdasarkan kepada balak terhadap kenderaan ini. Lihat garis masa di bawah untuk maklumat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Terhadap Pembekal Invois {0} bertarikh {1}
 DocType: Customer,Default Price List,Senarai Harga Default
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,rekod Pergerakan Aset {0} dicipta
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Anda tidak boleh memadam Tahun Anggaran {0}. Tahun Anggaran {0} ditetapkan sebagai piawai dalam Tetapan Global
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Seorang pelanggan dengan nama yang sama sudah ada
 DocType: Journal Entry,Entry Type,Jenis Kemasukan
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Tiada pelan penilaian dikaitkan dengan kumpulan penilaian ini
 ,Customer Credit Balance,Baki Pelanggan Kredit
@@ -1837,7 +1870,7 @@
 DocType: Quotation,Term Details,Butiran jangka
 DocType: Project,Total Sales Cost (via Sales Order),Jumlah Jualan Kos (melalui Pesanan Jualan)
 DocType: Project,Total Sales Cost (via Sales Order),Jumlah Jualan Kos (melalui Pesanan Jualan)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,tidak boleh mendaftar lebih daripada {0} pelajar bagi kumpulan pelajar ini.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,tidak boleh mendaftar lebih daripada {0} pelajar bagi kumpulan pelajar ini.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead Count
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead Count
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} mesti lebih besar daripada 0
@@ -1855,9 +1888,11 @@
 DocType: Lab Test,Technician Name,Nama juruteknik
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Nyahpaut Pembayaran Pembatalan Invois
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},bacaan Odometer Semasa memasuki harus lebih besar daripada awal Kenderaan Odometer {0}
+DocType: Restaurant Reservation,No Show,Tidak Tunjukkan
 DocType: Shipping Rule Country,Shipping Rule Country,Kaedah Penghantaran Negara
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Tinggalkan dan Kehadiran
 DocType: Maintenance Visit,Partially Completed,Sebahagiannya telah lengkap
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Kepekaan Moderat
 DocType: Leave Type,Include holidays within leaves as leaves,Termasuk cuti dalam daun daun
 DocType: Sales Invoice,Packed Items,Makan Item
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Jaminan Tuntutan terhadap No. Siri
@@ -1874,13 +1909,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Jumlah yang dibayar (Syarikat Mata Wang)
 DocType: Purchase Invoice,Additional Discount,Diskaun tambahan
 DocType: Selling Settings,Selling Settings,Menjual Tetapan
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Sahkan Tindakan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Lelong Online
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Sila nyatakan sama ada atau Kuantiti Kadar Nilaian atau kedua-duanya
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Fulfillment
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Lihat dalam Troli
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Perbelanjaan pemasaran
 ,Item Shortage Report,Perkara Kekurangan Laporan
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \ nSila menyebut &quot;Berat UOM&quot; terlalu"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \ nSila menyebut &quot;Berat UOM&quot; terlalu"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Permintaan bahan yang digunakan untuk membuat ini Entry Saham
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Selepas Tarikh Susutnilai adalah wajib bagi aset baru
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Berasingan Kumpulan berdasarkan kursus untuk setiap Batch
@@ -1893,12 +1929,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Buat Perakaunan Entry Untuk Setiap Pergerakan Saham
 DocType: Leave Allocation,Total Leaves Allocated,Jumlah Daun Diperuntukkan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Gudang diperlukan semasa Row Tiada {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Sila masukkan tahun kewangan yang sah Mula dan Tarikh Akhir
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Sila masukkan tahun kewangan yang sah Mula dan Tarikh Akhir
 DocType: Employee,Date Of Retirement,Tarikh Persaraan
 DocType: Upload Attendance,Get Template,Dapatkan Template
 DocType: Material Request,Transferred,dipindahkan
 DocType: Vehicle,Doors,Doors
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext Persediaan Selesai!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext Persediaan Selesai!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Kumpulkan Bayaran Pendaftaran Pesakit
 DocType: Course Assessment Criteria,Weightage,Wajaran
 DocType: Purchase Invoice,Tax Breakup,Breakup cukai
@@ -1917,37 +1953,37 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Jika perkara ini mempunyai varian, maka ia tidak boleh dipilih dalam pesanan jualan dan lain-lain"
 DocType: Lead,Next Contact By,Hubungi Seterusnya By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Kuantiti yang diperlukan untuk Perkara {0} berturut-turut {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Kuantiti yang diperlukan untuk Perkara {0} berturut-turut {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Gudang {0} tidak boleh dihapuskan sebagai kuantiti wujud untuk Perkara {1}
 DocType: Quotation,Order Type,Perintah Jenis
-DocType: Purchase Invoice,Notification Email Address,Pemberitahuan Alamat E-mel
 ,Item-wise Sales Register,Perkara-bijak Jualan Daftar
 DocType: Asset,Gross Purchase Amount,Jumlah Pembelian Kasar
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Baki Pembukaan
 DocType: Asset,Depreciation Method,Kaedah susut nilai
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,offline
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Cukai ini adalah termasuk dalam Kadar Asas?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Jumlah Sasaran
 DocType: Job Applicant,Applicant for a Job,Pemohon untuk pekerjaan yang
 DocType: Production Plan Material Request,Production Plan Material Request,Pengeluaran Pelan Bahan Permintaan
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Tiada Perintah Pengeluaran dicipta
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Tiada Perintah Pengeluaran dicipta
 DocType: Stock Reconciliation,Reconciliation JSON,Penyesuaian JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Terlalu banyak tiang. Mengeksport laporan dan mencetak penggunaan aplikasi spreadsheet.
 DocType: Purchase Invoice Item,Batch No,Batch No
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Permintaan untuk Sebut Harga: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Membenarkan pelbagai Pesanan Jualan terhadap Perintah Pembelian yang Pelanggan
 DocType: Student Group Instructor,Student Group Instructor,Pengajar Kumpulan Pelajar
 DocType: Student Group Instructor,Student Group Instructor,Pengajar Kumpulan Pelajar
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Bimbit
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Utama
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Utama
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Varian
 DocType: Naming Series,Set prefix for numbering series on your transactions,Terletak awalan untuk penomboran siri transaksi anda
 DocType: Employee Attendance Tool,Employees HTML,pekerja HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,BOM lalai ({0}) mesti aktif untuk item ini atau template yang
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,BOM lalai ({0}) mesti aktif untuk item ini atau template yang
 DocType: Employee,Leave Encashed?,Cuti ditunaikan?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Peluang Daripada bidang adalah wajib
 DocType: Email Digest,Annual Expenses,Perbelanjaan tahunan
 DocType: Item,Variants,Kelainan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Buat Pesanan Belian
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Buat Pesanan Belian
 DocType: SMS Center,Send To,Hantar Kepada
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Tidak ada baki cuti yang cukup untuk Cuti Jenis {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Jumlah yang diperuntukkan
@@ -1965,6 +2001,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Kekuatan Kumpulan Pelajar
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Terhadap Journal Entry {0} tidak mempunyai apa-apa yang tidak dapat ditandingi {1} masuk
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,penilaian
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Peristiwa Latihan
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Salinan No Serial masuk untuk Perkara {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Satu syarat untuk Peraturan Penghantaran
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Sila masukkan
@@ -1974,7 +2011,7 @@
 DocType: Sales Order,To Deliver and Bill,Untuk Menghantar dan Rang Undang-undang
 DocType: Student Group,Instructors,pengajar
 DocType: GL Entry,Credit Amount in Account Currency,Jumlah Kredit dalam Mata Wang Akaun
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} hendaklah dikemukakan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} hendaklah dikemukakan
 DocType: Authorization Control,Authorization Control,Kawalan Kuasa
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Warehouse Telah adalah wajib terhadap Perkara ditolak {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Pembayaran
@@ -1993,11 +2030,11 @@
 DocType: Quotation Item,Actual Qty,Kuantiti Sebenar
 DocType: Sales Invoice Item,References,Rujukan
 DocType: Quality Inspection Reading,Reading 10,Membaca 10
-DocType: Hub Settings,Hub Node,Hub Nod
+DocType: Hub Category,Hub Node,Hub Nod
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Anda telah memasukkan perkara yang sama. Sila membetulkan dan cuba lagi.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Madya
 DocType: Asset Movement,Asset Movement,Pergerakan aset
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,Troli baru
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,Troli baru
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Perkara {0} bukan Item bersiri
 DocType: SMS Center,Create Receiver List,Cipta Senarai Penerima
 DocType: Vehicle,Wheels,Wheels
@@ -2011,15 +2048,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikasi
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Menunjukkan bahawa pakej itu adalah sebahagian daripada penghantaran ini (Hanya Draf)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Buat Entry Pembayaran
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Kuantiti untuk Perkara {0} mesti kurang daripada {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Kuantiti untuk Perkara {0} mesti kurang daripada {1}
 ,Sales Invoice Trends,Sales Trend Invois
 DocType: Leave Application,Apply / Approve Leaves,Sapukan / Meluluskan Daun
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Untuk
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Untuk
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Boleh merujuk berturut-turut hanya jika jenis pertuduhan adalah &#39;Pada Row Jumlah Sebelumnya&#39; atau &#39;Sebelumnya Row Jumlah&#39;
 DocType: Sales Order Item,Delivery Warehouse,Gudang Penghantaran
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Tree of Centers Kos kewangan.
 DocType: Serial No,Delivery Document No,Penghantaran Dokumen No
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Sila menetapkan &#39;Akaun / Kerugian Keuntungan Pelupusan Aset&#39; dalam Syarikat {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Sila menetapkan &#39;Akaun / Kerugian Keuntungan Pelupusan Aset&#39; dalam Syarikat {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Dapatkan Item Dari Pembelian Terimaan
 DocType: Serial No,Creation Date,Tarikh penciptaan
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Perkara {0} muncul beberapa kali dalam Senarai Harga {1}
@@ -2030,12 +2067,13 @@
 DocType: Student,Student Mobile Number,Pelajar Nombor Telefon
 DocType: Item,Has Variants,Mempunyai Kelainan
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Kemas kini Semula
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Anda telah memilih barangan dari {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Anda telah memilih barangan dari {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nama Pembahagian Bulanan
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID adalah wajib
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID adalah wajib
 DocType: Sales Person,Parent Sales Person,Orang Ibu Bapa Jualan
-DocType: Purchase Invoice,Recurring Invoice,Invois berulang
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Tinggi ke Rendah
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Pilih program pertama
 DocType: Patient Appointment,Patient Age,Umur pesakit
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Menguruskan Projek
 DocType: Supplier,Supplier of Goods or Services.,Pembekal Barangan atau Perkhidmatan.
@@ -2043,8 +2081,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Akaun boleh terima ingkar akan digunakan jika tidak ditetapkan dalam Pesakit untuk memohon caj Perundingan.
 DocType: Vehicle Log,Fuel Price,Harga bahan api
 DocType: Budget,Budget,Bajet
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Tetapkan Terbuka
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Asset Item tetap perlu menjadi item tanpa saham.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Tetapkan Terbuka
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Asset Item tetap perlu menjadi item tanpa saham.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Bajet tidak boleh diberikan terhadap {0}, kerana ia bukan satu akaun Pendapatan atau Perbelanjaan"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Tercapai
 DocType: Student Admission,Application Form Route,Borang Permohonan Route
@@ -2058,12 +2096,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Perkara {0} tidak ditetapkan untuk Serial No. Semak Item induk
 DocType: Maintenance Visit,Maintenance Time,Masa penyelenggaraan
 ,Amount to Deliver,Jumlah untuk Menyampaikan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Item yang sama telah dimasukkan beberapa kali. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Permulaan Term Tarikh tidak boleh lebih awal daripada Tarikh Tahun Permulaan Tahun Akademik mana istilah ini dikaitkan (Akademik Tahun {}). Sila betulkan tarikh dan cuba lagi.
 DocType: Guardian,Guardian Interests,Guardian minat
 DocType: Naming Series,Current Value,Nilai semasa
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,tahun fiskal Pelbagai wujud untuk tarikh {0}. Sila menetapkan syarikat dalam Tahun Anggaran
 DocType: School Settings,Instructor Records to be created by,Rekod Pengajar akan diwujudkan oleh
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} dihasilkan
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} dihasilkan
 DocType: Delivery Note Item,Against Sales Order,Terhadap Perintah Jualan
 ,Serial No Status,Serial No Status
 DocType: Payment Entry Reference,Outstanding,cemerlang
@@ -2073,10 +2112,10 @@
 						must be greater than or equal to {2}","Row {0}: Untuk menetapkan {1} jangka masa, perbezaan antara dari dan ke tarikh \ mesti lebih besar daripada atau sama dengan {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Ini adalah berdasarkan kepada pergerakan saham. Lihat {0} untuk mendapatkan butiran
 DocType: Pricing Rule,Selling,Jualan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Jumlah {0} {1} ditolak daripada {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Jumlah {0} {1} ditolak daripada {2}
 DocType: Employee,Salary Information,Maklumat Gaji
 DocType: Sales Person,Name and Employee ID,Nama dan ID Pekerja
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Tarikh Akhir tidak boleh sebelum Tarikh Pos
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Tarikh Akhir tidak boleh sebelum Tarikh Pos
 DocType: Website Item Group,Website Item Group,Laman Web Perkara Kumpulan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Tugas dan Cukai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Sila masukkan tarikh Rujukan
@@ -2102,7 +2141,7 @@
 DocType: Issue,Resolution Details,Resolusi Butiran
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,peruntukan
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Kriteria Penerimaan
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Sila masukkan Permintaan bahan dalam jadual di atas
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Sila masukkan Permintaan bahan dalam jadual di atas
 DocType: Item Attribute,Attribute Name,Atribut Nama
 DocType: BOM,Show In Website,Show Dalam Laman Web
 DocType: Shopping Cart Settings,Show Quantity in Website,Tunjuk Kuantiti dalam Laman Web
@@ -2111,7 +2150,7 @@
 DocType: Item Reorder,Check in (group),Daftar-masuk (kumpulan)
 ,Qty to Order,Qty Aturan
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Ketua akaun di bawah Liabiliti atau Ekuiti, di mana Keuntungan / Kerugian akan ditempah"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Carta Gantt semua tugas.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Carta Gantt semua tugas.
 DocType: Opportunity,Mins to First Response,Mins untuk Response Pertama
 DocType: Pricing Rule,Margin Type,Jenis margin
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} jam
@@ -2133,36 +2172,36 @@
 DocType: Patient,Surgical History,Sejarah Pembedahan
 DocType: Employee,Resignation Letter Date,Peletakan jawatan Surat Tarikh
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Peraturan harga yang lagi ditapis berdasarkan kuantiti.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Sila menetapkan Tarikh Of Menyertai untuk pekerja {0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Sila menetapkan Tarikh Of Menyertai untuk pekerja {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Sila menetapkan Tarikh Of Menyertai untuk pekerja {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Sila menetapkan Tarikh Of Menyertai untuk pekerja {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Jumlah Bil (melalui Lembaran Time)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ulang Hasil Pelanggan
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) mesti mempunyai peranan 'Pelulus Perbelanjaan'
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Pasangan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Pilih BOM dan Kuantiti untuk Pengeluaran
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Pilih BOM dan Kuantiti untuk Pengeluaran
 DocType: Asset,Depreciation Schedule,Jadual susutnilai
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Alamat Partner Sales And Hubungi
 DocType: Bank Reconciliation Detail,Against Account,Terhadap Akaun
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Half Tarikh Hari harus antara Dari Tarikh dan To Date
 DocType: Maintenance Schedule Detail,Actual Date,Tarikh sebenar
 DocType: Item,Has Batch No,Mempunyai Batch No
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Billing Tahunan: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Billing Tahunan: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Cukai Barang dan Perkhidmatan (GST India)
 DocType: Delivery Note,Excise Page Number,Eksais Bilangan Halaman
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Syarikat, Dari Tarikh dan Untuk Tarikh adalah wajib"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Dapatkan dari Konsultasi
 DocType: Asset,Purchase Date,Tarikh pembelian
 DocType: Employee,Personal Details,Maklumat Peribadi
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Sila set &#39;Asset Susutnilai Kos Center&#39; dalam Syarikat {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Sila set &#39;Asset Susutnilai Kos Center&#39; dalam Syarikat {0}
 ,Maintenance Schedules,Jadual Penyelenggaraan
 DocType: Task,Actual End Date (via Time Sheet),Sebenar Tarikh Akhir (melalui Lembaran Time)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Jumlah {0} {1} daripada {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Jumlah {0} {1} daripada {2} {3}
 ,Quotation Trends,Trend Sebut Harga
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Perkara Kumpulan tidak dinyatakan dalam perkara induk untuk item {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Debit Untuk akaun mestilah akaun Belum Terima
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Debit Untuk akaun mestilah akaun Belum Terima
 DocType: Shipping Rule Condition,Shipping Amount,Penghantaran Jumlah
 DocType: Supplier Scorecard Period,Period Score,Markah Skor
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,menambah Pelanggan
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,menambah Pelanggan
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Sementara menunggu Jumlah
 DocType: Lab Test Template,Special,Khas
 DocType: Purchase Invoice Item,Conversion Factor,Faktor penukaran
@@ -2170,13 +2209,14 @@
 ,Vehicle Expenses,Perbelanjaan kenderaan
 DocType: Serial No,Invoice Details,Butiran invois
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Nilai jangkaan selepas hayat berguna mesti lebih besar daripada atau sama dengan {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Mulakan
+DocType: Hub Category,Hub Category,Kategori Hab
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Bilangan Kenderaan
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,Tarikh di mana invois berulang akan berhenti
 DocType: Employee Loan,Loan Amount,Jumlah pinjaman
 DocType: Program Enrollment,Self-Driving Vehicle,Self-Driving Kenderaan
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Pembekal kad skor pembekal
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Row {0}: Bill of Materials tidak dijumpai untuk Perkara {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Row {0}: Bill of Materials tidak dijumpai untuk Perkara {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Jumlah daun diperuntukkan {0} tidak boleh kurang daripada daun yang telah pun diluluskan {1} bagi tempoh
 DocType: Journal Entry,Accounts Receivable,Akaun-akaun boleh terima
 ,Supplier-Wise Sales Analytics,Pembekal Bijaksana Jualan Analytics
@@ -2188,7 +2228,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Kursus Ibu Bapa (Tinggalkan kosong, jika ini bukan sebahagian daripada ibu bapa Kursus)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Tinggalkan kosong jika dipertimbangkan untuk semua jenis pekerja
 DocType: Landed Cost Voucher,Distribute Charges Based On,Mengedarkan Caj Berasaskan
-apps/erpnext/erpnext/hooks.py +131,Timesheets,timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,timesheets
 DocType: HR Settings,HR Settings,Tetapan HR
 DocType: Salary Slip,net pay info,maklumat gaji bersih
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Nilai ini dikemas kini dalam Senarai Harga Jualan Lalai.
@@ -2199,7 +2239,7 @@
 DocType: Patient,B Positive,B Positif
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty mesti menjadi 1, sebagai item adalah aset tetap. Sila gunakan baris berasingan untuk berbilang qty."
 DocType: Leave Block List Allow,Leave Block List Allow,Tinggalkan Sekat Senarai Benarkan
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr tidak boleh kosong atau senggang
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr tidak boleh kosong atau senggang
 DocType: Patient Medical Record,Patient Medical Record,Rekod Perubatan Pesakit
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Kumpulan kepada Bukan Kumpulan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sukan
@@ -2216,9 +2256,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Tidak dapat mencari kadar pertukaran untuk {0} kepada {1} untuk tarikh kunci {2}. Sila buat rekod Penukaran Mata Wang secara manual
 DocType: POS Profile,Price List,Senarai Harga
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} kini Tahun Anggaran asalan. Sila muat semula browser anda untuk mengemaskini perubahan
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Tuntutan perbelanjaan
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Tuntutan perbelanjaan
 DocType: Issue,Support,Sokongan
 ,BOM Search,BOM Search
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Terbitkan &quot;Dalam Stok&quot; atau &quot;Tidak Ada Stok&quot; di Hab berdasarkan stok yang terdapat di gudang ini.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Penutup (Membuka Total +)
 DocType: Vehicle,Fuel Type,Jenis bahan api
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Sila nyatakan mata wang dalam Syarikat
@@ -2230,16 +2271,16 @@
 DocType: Healthcare Settings,Remind Before,Ingatkan Sebelum
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Faktor UOM Penukaran diperlukan berturut-turut {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Rujukan Dokumen Jenis mesti menjadi salah satu Perintah Jualan, Jualan Invois atau Kemasukan Journal"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Rujukan Dokumen Jenis mesti menjadi salah satu Perintah Jualan, Jualan Invois atau Kemasukan Journal"
 DocType: Salary Component,Deduction,Potongan
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Row {0}: Dari Masa dan Untuk Masa adalah wajib.
 DocType: Stock Reconciliation Item,Amount Difference,jumlah Perbezaan
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Perkara Harga ditambah untuk {0} dalam senarai harga {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Perkara Harga ditambah untuk {0} dalam senarai harga {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Sila masukkan ID Pekerja orang jualan ini
 DocType: Territory,Classification of Customers by region,Pengelasan Pelanggan mengikut wilayah
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Perbezaan Jumlah mestilah sifar
 DocType: Project,Gross Margin,Margin kasar
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Sila masukkan Pengeluaran Perkara pertama
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Sila masukkan Pengeluaran Perkara pertama
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Dikira-kira Penyata Bank
 DocType: Normal Test Template,Normal Test Template,Templat Ujian Normal
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,pengguna orang kurang upaya
@@ -2249,21 +2290,22 @@
 DocType: Salary Slip,Total Deduction,Jumlah Potongan
 ,Production Analytics,Analytics pengeluaran
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Ini berdasarkan urus niaga terhadap Pesakit ini. Lihat garis masa di bawah untuk maklumat lanjut
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Kos Dikemaskini
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Kos Dikemaskini
 DocType: Employee,Date of Birth,Tarikh Lahir
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Perkara {0} telah kembali
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Tahun Fiskal ** mewakili Tahun Kewangan. Semua kemasukan perakaunan dan transaksi utama yang lain dijejak terhadap Tahun Fiskal ** **.
 DocType: Opportunity,Customer / Lead Address,Pelanggan / Lead Alamat
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Persediaan Kad Scorecard Pembekal
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Amaran: Sijil SSL tidak sah pada lampiran {0}
-DocType: Student Admission,Eligibility,kelayakan
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Nama Pelan Penilaian
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Amaran: Sijil SSL tidak sah pada lampiran {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Leads membantu anda mendapatkan perniagaan, tambah semua kenalan anda dan lebih sebagai petunjuk anda"
 DocType: Production Order Operation,Actual Operation Time,Masa Sebenar Operasi
 DocType: Authorization Rule,Applicable To (User),Terpakai Untuk (pengguna)
 DocType: Purchase Taxes and Charges,Deduct,Memotong
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Penerangan mengenai Jawatan
 DocType: Student Applicant,Applied,Applied
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Buka semula
 DocType: Sales Invoice Item,Qty as per Stock UOM,Qty seperti Saham UOM
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Nama Guardian2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Watak khas kecuali &quot;-&quot; &quot;.&quot;, &quot;#&quot;, dan &quot;/&quot; tidak dibenarkan dalam menamakan siri"
@@ -2275,7 +2317,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Pembuatan Pengurus
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},No siri {0} adalah di bawah jaminan hamper {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Penghantaran Split Nota ke dalam pakej.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Penghantaran
+apps/erpnext/erpnext/hooks.py +107,Shipments,Penghantaran
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Jumlah Peruntukan (Syarikat Mata Wang)
 DocType: Purchase Order Item,To be delivered to customer,Yang akan dihantar kepada pelanggan
 DocType: BOM,Scrap Material Cost,Kos Scrap Material
@@ -2298,8 +2340,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Tetapan Variasi Item
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Pilih Syarikat ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Tinggalkan kosong jika dipertimbangkan untuk semua jabatan
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Jenis pekerjaan (tetap, kontrak, pelatih dan lain-lain)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} adalah wajib bagi Perkara {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Jenis pekerjaan (tetap, kontrak, pelatih dan lain-lain)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} adalah wajib bagi Perkara {1}
 DocType: Process Payroll,Fortnightly,setiap dua minggu
 DocType: Currency Exchange,From Currency,Dari Mata Wang
 DocType: Vital Signs,Weight (In Kilogram),Berat (Dalam Kilogram)
@@ -2324,7 +2366,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Sila klik pada &#39;Menjana Jadual&#39; untuk mendapatkan jadual
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Terdapat ralat semasa memadamkan jadual berikut:
 DocType: Bin,Ordered Quantity,Mengarahkan Kuantiti
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",contohnya &quot;Membina alat bagi pembina&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",contohnya &quot;Membina alat bagi pembina&quot;
 DocType: Grading Scale,Grading Scale Intervals,Selang Grading Skala
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Kemasukan Perakaunan untuk {2} hanya boleh dibuat dalam mata wang: {3}
 DocType: Production Order,In Process,Dalam Proses
@@ -2348,11 +2390,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Dengan Pembayaran Cukai
 DocType: Expense Claim Detail,Expense Claim Detail,Perbelanjaan Tuntutan Detail
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Tiga salinan BAGI PEMBEKAL
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Sila pilih akaun yang betul
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Sila pilih akaun yang betul
 DocType: Item,Weight UOM,Berat UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Struktur Gaji pekerja
 DocType: Patient,Blood Group,Kumpulan Darah
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Sementara menunggu
 DocType: Course,Course Name,Nama kursus
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Pengguna yang boleh meluluskan permohonan cuti kakitangan yang khusus
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Peralatan Pejabat
@@ -2371,7 +2412,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Harga tidak akan dipaparkan jika Senarai Harga tidak ditetapkan
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Sila nyatakan negara untuk Peraturan Penghantaran ini atau daftar Penghantaran di seluruh dunia
 DocType: Stock Entry,Total Incoming Value,Jumlah Nilai masuk
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Debit Untuk diperlukan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Debit Untuk diperlukan
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets membantu menjejaki masa, kos dan bil untuk kegiatan yang dilakukan oleh pasukan anda"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pembelian Senarai Harga
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Templat pemboleh ubah kad skor pembekal.
@@ -2381,7 +2422,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Penyesuaian bayaran
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Sila pilih nama memproses permohonan lesen Orang
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Jumlah belum dibayar: {0}
+DocType: Hub Settings,Unregister from Hub,Mendaftar daripada Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Jumlah belum dibayar: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Operasi laman web
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Menawarkan Surat
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Menjana Permintaan Bahan (MRP) dan Perintah Pengeluaran.
@@ -2393,7 +2435,9 @@
 DocType: Physician Schedule Time Slot,To Time,Untuk Masa
 DocType: Authorization Rule,Approving Role (above authorized value),Meluluskan Peranan (di atas nilai yang diberi kuasa)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Kredit Untuk akaun mestilah akaun Dibayar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM rekursi: {0} tidak boleh menjadi ibu bapa atau kanak-kanak {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Sila pilih Kemasukan Pelajar yang wajib bagi pemohon pelajar berbayar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM rekursi: {0} tidak boleh menjadi ibu bapa atau kanak-kanak {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Sila pilih Senarai Harga untuk menerbitkan harga
 DocType: Production Order Operation,Completed Qty,Siap Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Untuk {0}, akaun debit hanya boleh dikaitkan dengan kemasukan kredit lain"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Senarai Harga {0} adalah orang kurang upaya
@@ -2406,39 +2450,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} nombor siri yang diperlukan untuk item {1}. Anda telah menyediakan {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Kadar Penilaian semasa
 DocType: Item,Customer Item Codes,Kod Item Pelanggan
+DocType: Training Event,Advance,Advance
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,untuk membuat ulang berulang.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange Keuntungan / Kerugian
 DocType: Opportunity,Lost Reason,Hilang Akal
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Alamat Baru
 DocType: Quality Inspection,Sample Size,Saiz Sampel
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Sila masukkan Dokumen Resit
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Semua barang-barang telah diinvois
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Sila nyatakan yang sah Dari Perkara No. &#39;
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',Sila nyatakan yang sah Dari Perkara No. &#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Pusat kos lanjut boleh dibuat di bawah Kumpulan tetapi penyertaan boleh dibuat terhadap bukan Kumpulan
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Pengguna dan Kebenaran
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Pesanan Pengeluaran Ditubuhkan: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Pesanan Pengeluaran Ditubuhkan: {0}
 DocType: Branch,Branch,Cawangan
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Percetakan dan Penjenamaan
 DocType: Company,Total Monthly Sales,Jumlah Jualan Bulanan
 DocType: Bin,Actual Quantity,Kuantiti sebenar
 DocType: Shipping Rule,example: Next Day Shipping,contoh: Penghantaran Hari Seterusnya
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,No siri {0} tidak dijumpai
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Langganan telah {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Langganan telah {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Program Jadual Bayaran
 DocType: Fee Schedule Program,Student Batch,Batch pelajar
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,pilih * dari `tabVital Signs` di mana pesanan = &#39;{0}&#39; oleh batas tanda signddate 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Buat Pelajar
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Gred Min
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Anda telah dijemput untuk bekerjasama dalam projek: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Pakar tidak boleh didapati di {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Anda telah dijemput untuk bekerjasama dalam projek: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Pakar tidak boleh didapati di {0}
 DocType: Leave Block List Date,Block Date,Sekat Tarikh
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Tambah Id Langganan bidang tersuai dalam doctype {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Nota Penghantaran Pembekal
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Mohon sekarang
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Mohon sekarang
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Sebenar Qty {0} / Waiting Qty {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Sebenar Qty {0} / Waiting Qty {1}
 DocType: Purchase Invoice,E-commerce GSTIN,GSTIN E-dagang
 DocType: Sales Order,Not Delivered,Tidak Dihantar
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Tarikh yang dijangkakan tidak boleh sebelum Tarikh Transaksi
 ,Bank Clearance Summary,Bank Clearance Ringkasan
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Membuat dan menguruskan mencerna e-mel harian, mingguan dan bulanan."
 DocType: Appraisal Goal,Appraisal Goal,Penilaian Matlamat
@@ -2446,12 +2491,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,bangunan
 DocType: Fee Schedule,Fee Structure,Struktur Bayaran
 DocType: Timesheet Detail,Costing Amount,Jumlah berharga
-DocType: Student Admission,Application Fee,Bayaran permohonan
+DocType: Student Admission Program,Application Fee,Bayaran permohonan
 DocType: Process Payroll,Submit Salary Slip,Hantar Slip Gaji
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Diskaun Maxiumm untuk Perkara {0} adalah {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Diskaun Maxiumm untuk Perkara {0} adalah {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import di Bulk
 DocType: Sales Partner,Address & Contacts,Alamat Kenalan
 DocType: SMS Log,Sender Name,Nama Pengirim
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Isih mengikut Kriteria
 DocType: POS Profile,[Select],[Pilih]
 DocType: Vital Signs,Blood Pressure (diastolic),Tekanan Darah (diastolik)
 DocType: SMS Log,Sent To,Dihantar Kepada
@@ -2460,7 +2506,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Hubungi Selepas Tarikh tidak boleh pada masa lalu
 DocType: Company,For Reference Only.,Untuk Rujukan Sahaja.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Doktor {0} tidak boleh didapati di {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Pilih Batch No
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Pilih Batch No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Tidak sah {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,Rujuk Rujukan
@@ -2476,15 +2522,15 @@
 DocType: Normal Test Items,Require Result Value,Memerlukan Nilai Hasil
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Perkara No. tidak boleh 0
 DocType: Item,Show a slideshow at the top of the page,Menunjukkan tayangan slaid di bahagian atas halaman
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Kedai
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Kedai
 DocType: Project Type,Projects Manager,Projek Pengurus
 DocType: Serial No,Delivery Time,Masa penghantaran
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Penuaan Berasaskan
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Pelantikan dibatalkan
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Pelantikan dibatalkan
 DocType: Item,End of Life,Akhir Hayat
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Perjalanan
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Tiada Struktur aktif atau Gaji lalai dijumpai untuk pekerja {0} pada tarikh yang diberikan
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Perjalanan
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Tiada Struktur aktif atau Gaji lalai dijumpai untuk pekerja {0} pada tarikh yang diberikan
 DocType: Leave Block List,Allow Users,Benarkan Pengguna
 DocType: Purchase Order,Customer Mobile No,Pelanggan Bimbit
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Berulang
@@ -2493,12 +2539,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Update Kos
 DocType: Item Reorder,Item Reorder,Perkara Reorder
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Show Slip Gaji
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Pemindahan Bahan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Pemindahan Bahan
 DocType: Fees,Send Payment Request,Hantar Permintaan Bayaran
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Nyatakan operasi, kos operasi dan memberikan Operasi unik tidak kepada operasi anda."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dokumen ini melebihi had oleh {0} {1} untuk item {4}. Adakah anda membuat terhadap yang sama satu lagi {3} {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Sila menetapkan berulang selepas menyimpan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Pilih perubahan kira jumlah
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Pilih perubahan kira jumlah
 DocType: Purchase Invoice,Price List Currency,Senarai Harga Mata Wang
 DocType: Naming Series,User must always select,Pengguna perlu sentiasa pilih
 DocType: Stock Settings,Allow Negative Stock,Benarkan Saham Negatif
@@ -2518,7 +2564,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Pekerja
 DocType: Sample Collection,Collected Time,Masa Dikumpul
 DocType: Company,Sales Monthly History,Sejarah Bulanan Jualan
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Pilih Batch
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Pilih Batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} telah dibil sepenuhnya
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Tanda-tanda penting
 DocType: Training Event,End Time,Akhir Masa
@@ -2526,16 +2572,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Potongan bayaran atau Kehilangan
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Terma kontrak standard untuk Jualan atau Beli.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Kumpulan dengan Voucher
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Adakah anda pasti ingin membatalkan janji temu ini?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Pipeline jualan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Sila menetapkan akaun lalai dalam Komponen Gaji {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Diperlukan Pada
 DocType: Rename Tool,File to Rename,Fail untuk Namakan semula
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Sila pilih BOM untuk Item dalam Row {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Sila pilih BOM untuk Item dalam Row {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Akaun {0} tidak sepadan dengan Syarikat {1} dalam Kaedah akaun: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Dinyatakan BOM {0} tidak wujud untuk Perkara {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Jadual Penyelenggaraan {0} hendaklah dibatalkan sebelum membatalkan Perintah Jualan ini
+DocType: POS Profile,Applicable for Users,Berkenaan Pengguna
 DocType: Notification Control,Expense Claim Approved,Perbelanjaan Tuntutan Diluluskan
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Slip gaji pekerja {0} telah dicipta untuk tempoh ini
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Slip gaji pekerja {0} telah dicipta untuk tempoh ini
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Farmasi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kos Item Dibeli
 DocType: Selling Settings,Sales Order Required,Pesanan Jualan Diperlukan
@@ -2560,6 +2608,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,organisasi
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,organisasi
 DocType: BOM Update Tool,BOM Update Tool,Alat Kemaskini BOM
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Akaun pihak yang tidak ditentukan, sila tetapkan akaun pihak ke-piawai dalam syarikat"
 DocType: SG Creation Tool Course,Student Group Name,Nama Kumpulan Pelajar
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Membuat Bayaran
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Sila pastikan anda benar-benar ingin memadam semua urus niaga bagi syarikat ini. Data induk anda akan kekal kerana ia adalah. Tindakan ini tidak boleh dibuat asal.
@@ -2568,29 +2617,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) tidak boleh lebih besar dari kuantiti yang dirancang ({2}) dalam Pesanan Pengeluaran {3}
 DocType: Shipping Rule,Shipping Rule Label,Peraturan Penghantaran Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum pengguna
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Bahan mentah tidak boleh kosong.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Tidak dapat kemas kini saham, invois mengandungi drop item penghantaran."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Bahan mentah tidak boleh kosong.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Tidak dapat kemas kini saham, invois mengandungi drop item penghantaran."
 DocType: Lab Test Sample,Lab Test Sample,Sampel Ujian Makmal
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Pantas Journal Kemasukan
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Anda tidak boleh mengubah kadar jika BOM disebut agianst sebarang perkara
+DocType: Restaurant,Invoice Series Prefix,Awalan Siri Invois
 DocType: Employee,Previous Work Experience,Pengalaman Kerja Sebelumnya
 DocType: Stock Entry,For Quantity,Untuk Kuantiti
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Sila masukkan Dirancang Kuantiti untuk Perkara {0} di barisan {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Sila masukkan Dirancang Kuantiti untuk Perkara {0} di barisan {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} tidak diserahkan
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Permintaan untuk barang-barang.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Perintah pengeluaran berasingan akan diwujudkan bagi setiap item siap baik.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} mesti negatif dalam dokumen pulangan
 ,Minutes to First Response for Issues,Minit ke Response Pertama untuk Isu
 DocType: Purchase Invoice,Terms and Conditions1,Terma dan Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,Nama institut yang mana anda menyediakan sistem ini.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,Nama institut yang mana anda menyediakan sistem ini.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Catatan Perakaunan dibekukan sehingga tarikh ini, tiada siapa boleh melakukan / mengubah suai kemasukan kecuali yang berperanan seperti di bawah."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Sila simpan dokumen itu sebelum menjana jadual penyelenggaraan
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Harga terkini dikemas kini dalam semua BOM
 DocType: Fee Schedule,Successful,Berjaya
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status projek
 DocType: UOM,Check this to disallow fractions. (for Nos),Semak ini untuk tidak membenarkan pecahan. (Untuk Nos)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Perintah Pengeluaran berikut telah dibuat:
-DocType: Student Admission,Naming Series (for Student Applicant),Penamaan Series (untuk Pelajar Pemohon)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Perintah Pengeluaran berikut telah dibuat:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Penamaan Series (untuk Pelajar Pemohon)
 DocType: Delivery Note,Transporter Name,Nama Transporter
 DocType: Authorization Rule,Authorized Value,Nilai yang diberi kuasa
 DocType: BOM,Show Operations,Show Operasi
@@ -2614,7 +2664,7 @@
 ,Employees working on a holiday,Kakitangan yang bekerja pada hari cuti
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Hadir
 DocType: Project,% Complete Method,% Kaedah Lengkap
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Dadah
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Dadah
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Tarikh mula penyelenggaraan tidak boleh sebelum tarikh penghantaran untuk No Serial {0}
 DocType: Production Order,Actual End Date,Tarikh Akhir Sebenar
 DocType: BOM,Operating Cost (Company Currency),Kos operasi (Syarikat Mata Wang)
@@ -2632,13 +2682,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Meluluskan pengguna tidak boleh menjadi sama seperti pengguna peraturan adalah Terpakai Untuk
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Kadar asas (seperti Stock UOM)
 DocType: SMS Log,No of Requested SMS,Jumlah SMS yang diminta
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Cuti Tanpa Gaji tidak sepadan dengan rekod Cuti Permohonan diluluskan
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Cuti Tanpa Gaji tidak sepadan dengan rekod Cuti Permohonan diluluskan
 DocType: Campaign,Campaign-.####,Kempen -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Langkah seterusnya
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Sila membekalkan barangan tertentu pada kadar terbaik mungkin
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Buat Invois
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto Peluang dekat selepas 15 hari
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Pesanan Pembelian tidak dibenarkan untuk {0} disebabkan kedudukan kad skor {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Pesanan Pembelian tidak dibenarkan untuk {0} disebabkan kedudukan kad skor {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,akhir Tahun
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2646,6 +2696,7 @@
 DocType: Vital Signs,Nutrition Values,Nilai pemakanan
 DocType: Lab Test Template,Is billable,Boleh ditebus
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Kedua-dua &quot;Jadual Pakar&quot; dan Masa Per Mesyuarat &quot;mesti ditetapkan untuk Dr {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Seorang pengedar pihak ketiga / peniaga / ejen / kenalan / penjual semula yang menjual produk syarikat untuk komisen.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} terhadap Permintaan Pembelian {1}
 DocType: Patient,Patient Demographics,Demografi Pesakit
@@ -2675,7 +2726,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","Template cukai standard yang boleh diguna pakai untuk semua Transaksi Pembelian. Templat ini boleh mengandungi senarai kepala cukai dan juga kepala perbelanjaan lain seperti &quot;Penghantaran&quot;, &quot;Insurans&quot;, &quot;Pengendalian&quot; dan lain-lain #### Nota Kadar cukai anda tentukan di sini akan menjadi kadar cukai standard untuk semua ** Item * *. Jika terdapat Item ** ** yang mempunyai kadar yang berbeza, mereka perlu ditambah dalam ** Item Cukai ** meja dalam ** ** Item induk. #### Keterangan Kolum 1. Pengiraan Jenis: - Ini boleh menjadi pada ** ** Jumlah bersih (iaitu jumlah jumlah asas). - ** Pada Row Sebelumnya Jumlah / Jumlah ** (untuk cukai atau caj terkumpul). Jika anda memilih pilihan ini, cukai yang akan digunakan sebagai peratusan daripada baris sebelumnya (dalam jadual cukai) amaun atau jumlah. - ** ** Sebenar (seperti yang dinyatakan). 2. Ketua Akaun: The lejar Akaun di mana cukai ini akan ditempah 3. Kos Center: Jika cukai / caj adalah pendapatan (seperti penghantaran) atau perbelanjaan perlu ditempah terhadap PTJ. 4. Keterangan: Keterangan cukai (yang akan dicetak dalam invois / sebut harga). 5. Kadar: Kadar Cukai. 6. Jumlah: Jumlah Cukai. 7. Jumlah: Jumlah terkumpul sehingga hal ini. 8. Masukkan Row: Jika berdasarkan &quot;Row Sebelumnya Jumlah&quot; anda boleh pilih nombor barisan yang akan diambil sebagai asas untuk pengiraan ini (default adalah berturut-turut sebelumnya). 9. Pertimbangkan Cukai atau Caj: Dalam bahagian ini, anda boleh menentukan jika cukai / caj adalah hanya untuk penilaian (bukan sebahagian daripada jumlah) atau hanya untuk jumlah (tidak menambah nilai kepada item) atau kedua-duanya. 10. Tambah atau Tolak: Adakah anda ingin menambah atau memotong cukai."
 DocType: Homepage,Homepage,Homepage
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Pilih Pakar ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',kemas kini tabPilihan invois yang ditetapkan = &#39;{0}&#39; di mana nama = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd Kuantiti
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Rekod Bayaran Dibuat - {0}
 DocType: Asset Category Account,Asset Category Account,Akaun Kategori Asset
@@ -2687,7 +2737,7 @@
 DocType: Asset,Manual,manual
 DocType: Salary Component Account,Salary Component Account,Akaun Komponen Gaji
 DocType: Global Defaults,Hide Currency Symbol,Menyembunyikan Simbol mata wang
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","contohnya Bank, Tunai, Kad Kredit"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","contohnya Bank, Tunai, Kad Kredit"
 DocType: Lead Source,Source Name,Nama Source
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Tekanan darah normal pada orang dewasa adalah kira-kira 120 mmHg sistolik, dan 80 mmHg diastolik, disingkat &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Nota Kredit
@@ -2706,16 +2756,16 @@
 DocType: Patient,Occupation,Pekerjaan
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: Tarikh Mula mestilah sebelum Tarikh Akhir
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Jumlah (Kuantiti)
-DocType: Sales Invoice,This Document,Dokumen ini
 DocType: Installation Note Item,Installed Qty,Dipasang Qty
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Ini mungkin disebabkan oleh beberapa Alamat E-mel tidak sah di
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Anda tambah
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Keputusan latihan
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Keputusan latihan
 DocType: Purchase Invoice,Is Paid,Adakah dibayar
 DocType: Salary Structure,Total Earning,Jumlah Pendapatan
 DocType: Purchase Receipt,Time at which materials were received,Masa di mana bahan-bahan yang telah diterima
 DocType: Stock Ledger Entry,Outgoing Rate,Kadar keluar
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Master cawangan organisasi.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Master cawangan organisasi.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,atau
 DocType: Sales Order,Billing Status,Bil Status
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Laporkan Isu
@@ -2730,8 +2780,9 @@
 DocType: Notification Control,Sales Order Message,Pesanan Jualan Mesej
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Nilai Default Tetapkan seperti Syarikat, mata wang, fiskal semasa Tahun, dan lain-lain"
 DocType: Payment Entry,Payment Type,Jenis Pembayaran
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Sila pilih Batch untuk item {0}. Tidak dapat mencari kumpulan tunggal yang memenuhi keperluan ini
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Sila pilih Batch untuk item {0}. Tidak dapat mencari kumpulan tunggal yang memenuhi keperluan ini
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Sila pilih Batch untuk item {0}. Tidak dapat mencari kumpulan tunggal yang memenuhi keperluan ini
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Sila pilih Batch untuk item {0}. Tidak dapat mencari kumpulan tunggal yang memenuhi keperluan ini
+DocType: Hub Category,Parent Category,Kategori Ibu Bapa
 DocType: Process Payroll,Select Employees,Pilih Pekerja
 DocType: Opportunity,Potential Sales Deal,Deal Potensi Jualan
 DocType: Complaint,Complaints,Aduan
@@ -2769,7 +2820,7 @@
 DocType: Bin,Reserved Quantity,Cipta Terpelihara Kuantiti
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Sila masukkan alamat emel yang sah
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Sila masukkan alamat emel yang sah
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Sila pilih item dalam kereta
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Sila pilih item dalam kereta
 DocType: Landed Cost Voucher,Purchase Receipt Items,Item Resit Pembelian
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Borang menyesuaikan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,tunggakan
@@ -2779,15 +2830,15 @@
 DocType: Payment Request,Amount in customer's currency,Amaun dalam mata wang pelanggan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Penghantaran
 DocType: Stock Reconciliation Item,Current Qty,Kuantiti semasa
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Tambah Pembekal
+DocType: Restaurant Menu,Restaurant Menu,Menu Restoran
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,terdahulu
 DocType: Appraisal Goal,Key Responsibility Area,Kawasan Tanggungjawab Utama
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Kelompok pelajar membantu anda mengesan kehadiran, penilaian dan yuran untuk pelajar"
 DocType: Payment Entry,Total Allocated Amount,Jumlah Diperuntukkan
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Menetapkan akaun inventori lalai untuk inventori yang berterusan
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Menetapkan akaun inventori lalai untuk inventori yang berterusan
 DocType: Item Reorder,Material Request Type,Permintaan Jenis Bahan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural Kemasukan Journal bagi gaji dari {0} kepada {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage penuh, tidak menyelamatkan"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage penuh, tidak menyelamatkan"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Faktor Penukaran UOM adalah wajib
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Kapasiti Bilik
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref
@@ -2826,16 +2877,18 @@
 DocType: Project,Task Completion,Petugas Siap
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Tidak dalam Saham
 DocType: Appraisal,HR User,HR pengguna
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Cukai dan Caj Dipotong
-apps/erpnext/erpnext/hooks.py +129,Issues,Isu-isu
+apps/erpnext/erpnext/hooks.py +138,Issues,Isu-isu
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status mestilah salah seorang daripada {0}
 DocType: Sales Invoice,Debit To,Debit Untuk
+DocType: Restaurant Menu Item,Restaurant Menu Item,Menu Menu Restoran
 DocType: Delivery Note,Required only for sample item.,Diperlukan hanya untuk item sampel.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Kuantiti Sebenar Selepas Transaksi
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Tiada slip gaji mendapati antara {0} dan {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Tiada slip gaji mendapati antara {0} dan {1}
 ,Pending SO Items For Purchase Request,Sementara menunggu SO Item Untuk Pembelian Permintaan
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Kemasukan pelajar
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} dilumpuhkan
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Kemasukan pelajar
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} dilumpuhkan
 DocType: Supplier,Billing Currency,Bil Mata Wang
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Lebih Besar
@@ -2858,6 +2911,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Sila menyebut ada lawatan diperlukan
 DocType: Stock Settings,Default Valuation Method,Kaedah Penilaian Default
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,Bayaran
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Kemas kini sedang dijalankan. Ia mungkin mengambil sedikit masa.
 DocType: Vehicle Log,Fuel Qty,Fuel Qty
 DocType: Production Order Operation,Planned Start Time,Dirancang Mula Masa
 DocType: Course,Assessment,penilaian
@@ -2873,7 +2927,7 @@
 DocType: Price List,Price List Master,Senarai Harga Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Semua Transaksi Jualan boleh tagged terhadap pelbagai ** Jualan Orang ** supaya anda boleh menetapkan dan memantau sasaran.
 ,S.O. No.,PP No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Sila buat Pelanggan dari Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Sila buat Pelanggan dari Lead {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Pilih Pesakit
 DocType: Price List,Applicable for Countries,Digunakan untuk Negara
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Nama Parameter
@@ -2905,27 +2959,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Akaun perbelanjaan / Perbezaan ({0}) mestilah akaun &#39;Keuntungan atau Kerugian&#39;
 DocType: Project,Copied From,disalin Dari
 DocType: Project,Copied From,disalin Dari
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},ralat Nama: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,kekurangan
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},ralat Nama: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,kekurangan
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} tidak berkaitan dengan {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Kehadiran bagi pekerja {0} telah ditandakan
 DocType: Packing Slip,If more than one package of the same type (for print),Jika lebih daripada satu bungkusan dari jenis yang sama (untuk cetak)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Sila tetapkan pelanggan lalai dalam Tetapan Restoran
 ,Salary Register,gaji Daftar
 DocType: Warehouse,Parent Warehouse,Warehouse Ibu Bapa
 DocType: C-Form Invoice Detail,Net Total,Jumlah bersih
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Lalai BOM tidak dijumpai untuk Perkara {0} dan Projek {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Lalai BOM tidak dijumpai untuk Perkara {0} dan Projek {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Tentukan pelbagai jenis pinjaman
 DocType: Bin,FCFS Rate,Kadar FCFS
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Jumlah yang tertunggak
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Masa (dalam minit)
 DocType: Project Task,Working,Kerja
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Saham Queue (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Tahun kewangan
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Tahun kewangan
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} bukan milik Syarikat {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,Tidak dapat menyelesaikan fungsi markah kriteria untuk {0}. Pastikan formula itu sah.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Kos seperti pada
 DocType: Healthcare Settings,Out Patient Settings,Daripada Seting Pesakit
 DocType: Account,Round Off,Bundarkan
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Kuantiti mestilah positif
 ,Requested Qty,Diminta Qty
 DocType: Tax Rule,Use for Shopping Cart,Gunakan untuk Troli
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Nilai {0} untuk Sifat {1} tidak wujud dalam senarai item sah Atribut Nilai untuk item {2}
@@ -2934,7 +2990,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Caj akan diagihkan mengikut kadar berdasarkan item qty atau amaunnya, seperti pilihan anda"
 DocType: Maintenance Visit,Purposes,Tujuan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Atleast perkara seseorang itu perlu dimasukkan dengan kuantiti negatif dalam dokumen pulangan
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Tambah Kursus
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operasi {0} lebih lama daripada mana-mana waktu kerja yang terdapat di stesen kerja {1}, memecahkan operasi ke dalam pelbagai operasi"
 ,Requested,Diminta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Tidak Catatan
@@ -2946,6 +3001,8 @@
 DocType: Employee Loan,Repaid/Closed,Dibayar balik / Ditutup
 DocType: Item,Total Projected Qty,Jumlah unjuran Qty
 DocType: Monthly Distribution,Distribution Name,Nama pengedaran
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Pembekal&gt; Jenis Pembekal
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Kadar penilaian tidak dijumpai untuk Item {0}, yang diperlukan untuk melakukan penyertaan perakaunan untuk {1} {2}. Sekiranya item tersebut berurusniaga sebagai item kadar penilaian sifar dalam {1}, nyatakan di dalam jadual {1} Item. Jika tidak, sila buat urus niaga saham yang masuk untuk item tersebut atau sebutkan kadar penilaian dalam rekod Item, dan kemudian cuba menyerahkan / membatalkan entri ini"
 DocType: Course,Course Code,Kod kursus
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Pemeriksaan kualiti yang diperlukan untuk Perkara {0}
 DocType: POS Settings,Use POS in Offline Mode,Gunakan POS dalam Mod Luar Talian
@@ -2956,14 +3013,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Mengurus Wilayah Tree.
 DocType: Journal Entry Account,Sales Invoice,Invois jualan
 DocType: Journal Entry Account,Party Balance,Baki pihak
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,Sila pilih Memohon Diskaun Pada
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Sila pilih Memohon Diskaun Pada
 DocType: Company,Default Receivable Account,Default Akaun Belum Terima
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Buat Bank Entry untuk jumlah gaji yang dibayar bagi kriteria yang dipilih di atas
 DocType: Physician,Physician Schedule,Jadual Perubatan
 DocType: Purchase Invoice,Deemed Export,Dianggap Eksport
 DocType: Stock Entry,Material Transfer for Manufacture,Pemindahan Bahan untuk Pembuatan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Peratus diskaun boleh digunakan baik dengan menentang Senarai Harga atau untuk semua Senarai Harga.
-DocType: Purchase Invoice,Half-yearly,Setengah tahun
+DocType: Subscription,Half-yearly,Setengah tahun
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Catatan Perakaunan untuk Stok
 DocType: Lab Test,LabTest Approver,Penyertaan LabTest
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Anda telah pun dinilai untuk kriteria penilaian {}.
@@ -2992,13 +3049,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Tambahan Kecil
 DocType: Company,Standard Template,Template standard
 DocType: Training Event,Theory,teori
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Amaran: Bahan Kuantiti yang diminta adalah kurang daripada Minimum Kuantiti Pesanan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Amaran: Bahan Kuantiti yang diminta adalah kurang daripada Minimum Kuantiti Pesanan
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Akaun {0} dibekukan
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Undang-undang Entiti / Anak Syarikat dengan Carta berasingan Akaun milik Pertubuhan.
 DocType: Payment Request,Mute Email,Senyapkan E-mel
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Makanan, Minuman &amp; Tembakau"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Hanya boleh membuat pembayaran terhadap belum dibilkan {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Kadar Suruhanjaya tidak boleh lebih besar daripada 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Hanya boleh membuat pembayaran terhadap belum dibilkan {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Kadar Suruhanjaya tidak boleh lebih besar daripada 100
 DocType: Stock Entry,Subcontract,Subkontrak
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Sila masukkan {0} pertama
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Tiada jawapan daripada
@@ -3016,10 +3073,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Warna
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Kriteria Penilaian Pelan
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Cegah Pesanan Pembelian
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Mudah tersinggung
 DocType: Patient Appointment,Scheduled,Berjadual
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Permintaan untuk sebut harga.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Sila sediakan Sistem Penamaan Pekerja dalam Sumber Manusia&gt; Tetapan HR
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Sila pilih Item mana &quot;Apakah Saham Perkara&quot; adalah &quot;Tidak&quot; dan &quot;Adakah Item Jualan&quot; adalah &quot;Ya&quot; dan tidak ada Bundle Produk lain
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Pilih Pelanggan
 DocType: Student Log,Academic,akademik
 DocType: Patient,Personal and Social History,Sejarah Peribadi dan Sosial
 DocType: Fee Schedule,Fee Breakup for each student,Breakout Fee untuk setiap pelajar
@@ -3029,7 +3087,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Kadar penilaian
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,diesel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Senarai harga mata wang tidak dipilih
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Senarai harga mata wang tidak dipilih
 apps/erpnext/erpnext/config/healthcare.py +46,Results,keputusan
 ,Student Monthly Attendance Sheet,Pelajar Lembaran Kehadiran Bulanan
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Pekerja {0} telah memohon untuk {1} antara {2} dan {3}
@@ -3045,7 +3103,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Mengurus Jualan Partners.
 DocType: Quality Inspection,Inspection Type,Jenis Pemeriksaan
 DocType: Fee Validity,Visited yet,Dikunjungi lagi
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Gudang dengan urus niaga yang sedia ada tidak boleh ditukar kepada kumpulan.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Gudang dengan urus niaga yang sedia ada tidak boleh ditukar kepada kumpulan.
 DocType: Assessment Result Tool,Result HTML,keputusan HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Luput pada
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Tambahkan Pelajar
@@ -3072,7 +3130,7 @@
 DocType: Healthcare Settings,Result Printed,Hasil Dicetak
 DocType: Asset Category Account,Depreciation Expense Account,Akaun Susut Perbelanjaan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Tempoh Percubaan
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Lihat {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Lihat {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Hanya nod daun dibenarkan dalam urus niaga
 DocType: Expense Claim,Expense Approver,Perbelanjaan Pelulus
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Row {0}: Advance terhadap Pelanggan mesti kredit
@@ -3084,7 +3142,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Untuk datetime
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Jadual Kursus dipadam:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Log bagi mengekalkan status penghantaran sms
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Tetapkan Sasaran Jualan
 DocType: Accounts Settings,Make Payment via Journal Entry,Buat Pembayaran melalui Journal Kemasukan
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Printed On
 DocType: Item,Inspection Required before Delivery,Pemeriksaan yang diperlukan sebelum penghantaran
@@ -3092,7 +3149,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Sementara menunggu Aktiviti
 DocType: Patient Appointment,Reminded,Diingatkan
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Organisasi anda
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Organisasi anda
 DocType: Fee Component,Fees Category,yuran Kategori
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Sila masukkan tarikh melegakan.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
@@ -3104,7 +3161,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Pesanan semula Level
 DocType: Company,Chart Of Accounts Template,Carta Of Akaun Template
 DocType: Attendance,Attendance Date,Kehadiran Tarikh
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Item Harga dikemaskini untuk {0} dalam Senarai Harga {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Item Harga dikemaskini untuk {0} dalam Senarai Harga {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Perpecahan gaji berdasarkan Pendapatan dan Potongan.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Akaun dengan nod kanak-kanak tidak boleh ditukar ke lejar
 DocType: Purchase Invoice Item,Accepted Warehouse,Gudang Diterima
@@ -3120,9 +3177,10 @@
 ,Employee Birthday,Pekerja Hari Lahir
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Pelajar Tool Batch Kehadiran
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,had Crossed
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Upto Berjadual
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Modal Teroka
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Istilah akademik dengan ini &#39;Academic Year&#39; {0} dan &#39;Nama Term&#39; {1} telah wujud. Sila ubah suai entri ini dan cuba lagi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Oleh kerana terdapat urus niaga yang sedia ada terhadap item {0}, anda tidak boleh menukar nilai {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Oleh kerana terdapat urus niaga yang sedia ada terhadap item {0}, anda tidak boleh menukar nilai {1}"
 DocType: UOM,Must be Whole Number,Mesti Nombor Seluruh
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Daun baru Diperuntukkan (Dalam Hari)
 DocType: Purchase Invoice,Invoice Copy,invois Copy
@@ -3132,7 +3190,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Nombor invois
 DocType: Shopping Cart Settings,Orders,Pesanan
 DocType: Employee Leave Approver,Leave Approver,Tinggalkan Pelulus
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Sila pilih satu kelompok
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Sila pilih satu kelompok
 DocType: Assessment Group,Assessment Group Name,Nama Kumpulan Penilaian
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Bahan Dipindahkan untuk Pembuatan
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Pengguna dengan Peranan ""Pelulus Perbelanjaan"""
@@ -3147,7 +3205,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Kemasukan Tempoh Penutup
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Pilih Jabatan ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,PTJ dengan urus niaga yang sedia ada tidak boleh ditukar kepada kumpulan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Jumlah {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Jumlah {0} {1} {2} {3}
 DocType: Account,Depreciation,Susutnilai
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Pembekal (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Pekerja Tool Kehadiran
@@ -3159,10 +3217,12 @@
 DocType: GL Entry,Voucher No,Baucer Tiada
 ,Lead Owner Efficiency,Lead Owner Kecekapan
 ,Lead Owner Efficiency,Lead Owner Kecekapan
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Paling popular
 DocType: Leave Allocation,Leave Allocation,Tinggalkan Peruntukan
 DocType: Payment Request,Recipient Message And Payment Details,Penerima Mesej Dan Butiran Pembayaran
 DocType: Training Event,Trainer Email,Trainer Email
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Permintaan bahan {0} dicipta
+DocType: Restaurant Reservation,No of People,Tidak ada Orang
 DocType: Production Planning Tool,Include sub-contracted raw materials,Termasuk bahan-bahan mentah sub-kontrak
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Templat istilah atau kontrak.
 DocType: Purchase Invoice,Address and Contact,Alamat dan Perhubungan
@@ -3171,10 +3231,11 @@
 DocType: Supplier,Last Day of the Next Month,Hari terakhir Bulan Depan
 DocType: Support Settings,Auto close Issue after 7 days,Auto Issue dekat selepas 7 hari
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Cuti yang tidak boleh diperuntukkan sebelum {0}, sebagai baki cuti telah pun dibawa dikemukakan dalam rekod peruntukan cuti masa depan {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: Disebabkan Tarikh / Rujukan melebihi dibenarkan hari kredit pelanggan dengan {0} hari (s)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: Disebabkan Tarikh / Rujukan melebihi dibenarkan hari kredit pelanggan dengan {0} hari (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Pemohon pelajar
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL UNTUK RECIPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,Akaun Susut Nilai Terkumpul
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,E-mel ini autogenerated
 DocType: Stock Settings,Freeze Stock Entries,Freeze Saham Penyertaan
 DocType: Program Enrollment,Boarding Student,Boarding Pelajar
 DocType: Asset,Expected Value After Useful Life,Nilai dijangka After Life Berguna
@@ -3182,7 +3243,7 @@
 DocType: Activity Cost,Billing Rate,Kadar bil
 ,Qty to Deliver,Qty untuk Menyampaikan
 ,Stock Analytics,Saham Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Operasi tidak boleh dibiarkan kosong
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Operasi tidak boleh dibiarkan kosong
 DocType: Maintenance Visit Purpose,Against Document Detail No,Terhadap Detail Dokumen No
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Jenis Parti adalah wajib
 DocType: Quality Inspection,Outgoing,Keluar
@@ -3205,7 +3266,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Pilih pelajar secara manual untuk Aktiviti berasaskan Kumpulan
 DocType: Journal Entry,User Remark,Catatan pengguna
 DocType: Lead,Market Segment,Segmen pasaran
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Jumlah yang dibayar tidak boleh lebih besar daripada jumlah terkumpul negatif {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Jumlah yang dibayar tidak boleh lebih besar daripada jumlah terkumpul negatif {0}
 DocType: Supplier Scorecard Period,Variables,Pembolehubah
 DocType: Employee Internal Work History,Employee Internal Work History,Pekerja Dalam Sejarah Kerja
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Penutup (Dr)
@@ -3235,21 +3296,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Dapatkan Maklumat Terbaru
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Akaun {2} bukan milik Syarikat {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Permintaan bahan {0} dibatalkan atau dihentikan
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Tinggalkan Pengurusan
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Tinggalkan Pengurusan
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Kumpulan dengan Akaun
 DocType: Sales Order,Fully Delivered,Dihantar sepenuhnya
 DocType: Lead,Lower Income,Pendapatan yang lebih rendah
+DocType: Restaurant Order Entry,Current Order,Perintah Semasa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Sumber dan sasaran gudang tidak boleh sama berturut-turut untuk {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Akaun perbezaan mestilah akaun jenis Aset / Liabiliti, kerana ini adalah Penyesuaian Saham Masuk Pembukaan"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Amaun yang dikeluarkan tidak boleh lebih besar daripada Jumlah Pinjaman {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Pergi ke Program
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Membeli nombor Perintah diperlukan untuk Perkara {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Order Production tidak dicipta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Order Production tidak dicipta
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Dari Tarikh' mesti selepas 'Sehingga'
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},tidak boleh menukar status sebagai pelajar {0} dikaitkan dengan permohonan pelajar {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},tidak boleh menukar status sebagai pelajar {0} dikaitkan dengan permohonan pelajar {1}
 DocType: Asset,Fully Depreciated,disusutnilai sepenuhnya
 ,Stock Projected Qty,Saham Unjuran Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Pelanggan {0} bukan milik projek {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Pelanggan {0} bukan milik projek {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Kehadiran ketara HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Sebutharga cadangan, bida yang telah anda hantar kepada pelanggan anda"
 DocType: Sales Order,Customer's Purchase Order,Pesanan Pelanggan
@@ -3260,8 +3322,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Sila menetapkan Bilangan penurunan nilai Ditempah
 DocType: Supplier Scorecard Period,Calculations,Pengiraan
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Nilai atau Qty
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Pesanan Productions tidak boleh dibangkitkan untuk:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Pesanan Productions tidak boleh dibangkitkan untuk:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Saat
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Sila tetapkan Siri Penamaan untuk {0} melalui Persediaan&gt; Tetapan&gt; Penamaan Siri
 DocType: Purchase Invoice,Purchase Taxes and Charges,Membeli Cukai dan Caj
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Pergi ke Pembekal
 ,Qty to Receive,Qty untuk Menerima
@@ -3275,7 +3338,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Kredit Untuk akaun perlu menjadi akaun Kunci Kira-kira
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Semua Jenis Pembekal
 DocType: Global Defaults,Disable In Words,Matikan Dalam Perkataan
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,Kod Item adalah wajib kerana Perkara tidak bernombor secara automatik
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,Kod Item adalah wajib kerana Perkara tidak bernombor secara automatik
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Sebut Harga {0} bukan jenis {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Item Jadual Penyelenggaraan
 DocType: Sales Order,%  Delivered,% Dihantar
@@ -3297,23 +3360,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Pembukaan Ekuiti Baki
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Perdamaian
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,baki
 DocType: Appraisal,Appraisal,Penilaian
 DocType: Purchase Invoice,GST Details,Butiran GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},E-mel dihantar kepada pembekal {0}
+DocType: Item,Default Sales Unit of Measure,Unit Jualan Kesilapan
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Tarikh diulang
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Penandatangan yang diberi kuasa
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Tinggalkan Pelulus mestilah salah seorang daripada {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Buat Yuran
-DocType: Hub Settings,Seller Email,Penjual E-mel
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Jumlah Kos Pembelian (melalui Invois Belian)
 DocType: Training Event,Start Time,Waktu Mula
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Pilih Kuantiti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Pilih Kuantiti
 DocType: Customs Tariff Number,Customs Tariff Number,Kastam Nombor Tarif
 DocType: Patient Appointment,Patient Appointment,Pelantikan Pesakit
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Meluluskan Peranan tidak boleh sama dengan peranan peraturan adalah Terpakai Untuk
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Menghentikan langganan E-Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Menghentikan langganan E-Digest
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Dapatkan Pembekal Oleh
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} tidak dijumpai untuk Item {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Pergi ke Kursus
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mesej dihantar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Akaun dengan nod kanak-kanak tidak boleh ditetapkan sebagai lejar
@@ -3326,11 +3392,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Bahan Dipindahkan untuk Pembuatan
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Akaun {0} tidak wujud
 DocType: Project,Project Type,Jenis Projek
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Tugas Anak wujud untuk Tugas ini. Anda tidak boleh memadamkan Tugas ini.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Qty sasaran atau sasaran jumlah sama ada adalah wajib.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Kos pelbagai aktiviti
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Tiada hasil lagi
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Kos pelbagai aktiviti
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Menetapkan Peristiwa untuk {0}, kerana pekerja yang bertugas di bawah Persons Jualan tidak mempunyai ID Pengguna {1}"
 DocType: Timesheet,Billing Details,Billing Details
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Sumber dan sasaran gudang mestilah berbeza
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Sumber dan sasaran gudang mestilah berbeza
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Tidak dibenarkan untuk mengemaskini transaksi saham lebih tua daripada {0}
 DocType: Purchase Invoice Item,PR Detail,Detail PR
 DocType: Sales Order,Fully Billed,Membilkan sepenuhnya
@@ -3357,7 +3425,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Memeriksa semua
 DocType: Vehicle Log,Invoice Ref,invois Ref
-DocType: Purchase Order,Recurring Order,Pesanan berulang
 DocType: Company,Default Income Account,Akaun Pendapatan Default
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Kumpulan pelanggan / Pelanggan
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed fiskal Tahun Keuntungan / Kerugian (Kredit)
@@ -3371,9 +3438,9 @@
 DocType: Patient,A Negative,A Negatif
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Apa-apa untuk menunjukkan.
 DocType: Lead,From Customer,Daripada Pelanggan
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Panggilan
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Panggilan
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,A Produk
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,kelompok
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,kelompok
 DocType: Project,Total Costing Amount (via Time Logs),Jumlah Kos (melalui Time Log)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Buat Jadual Bayaran
 DocType: Purchase Order Item Supplied,Stock UOM,Saham UOM
@@ -3398,7 +3465,7 @@
 DocType: School Settings,Current Academic Term,Jangka Akademik Semasa
 DocType: School Settings,Current Academic Term,Jangka Akademik Semasa
 DocType: Sales Order,Not Billed,Tidak Membilkan
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Kedua-dua Gudang mestilah berada dalam Syarikat sama
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Kedua-dua Gudang mestilah berada dalam Syarikat sama
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Ada kenalan yang ditambahkan lagi.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Kos mendarat Baucer Jumlah
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Rang Undang-undang yang dibangkitkan oleh Pembekal.
@@ -3407,7 +3474,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Jumlah diskaun
 DocType: Purchase Invoice,Return Against Purchase Invoice,Kembali Terhadap Invois Belian
 DocType: Item,Warranty Period (in days),Tempoh jaminan (dalam hari)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',kemas kini `Pelantikan tabPatient` menetapkan sales_invoice = &#39;{0}&#39; where name = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Berhubung dengan Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Tunai bersih daripada Operasi
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Perkara 4
@@ -3416,8 +3482,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Akaun Entry jurnal
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Kumpulan pelajar
 DocType: Shopping Cart Settings,Quotation Series,Sebutharga Siri
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Item wujud dengan nama yang sama ({0}), sila tukar nama kumpulan item atau menamakan semula item"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Sila pilih pelanggan
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Item wujud dengan nama yang sama ({0}), sila tukar nama kumpulan item atau menamakan semula item"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Sila pilih pelanggan
 DocType: C-Form,I,Saya
 DocType: Company,Asset Depreciation Cost Center,Aset Pusat Susutnilai Kos
 DocType: Sales Order Item,Sales Order Date,Pesanan Jualan Tarikh
@@ -3426,6 +3492,7 @@
 DocType: Assessment Plan,Assessment Plan,Rancangan penilaian
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Pelanggan {0} dibuat.
 DocType: Stock Settings,Limit Percent,had Peratus
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Tidak ada stok sedia ada di mana-mana gudang
 ,Payment Period Based On Invoice Date,Tempoh Pembayaran Berasaskan Tarikh Invois
 DocType: Sample Collection,No. of print,Tidak ada cetak
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Hilang Mata Wang Kadar Pertukaran untuk {0}
@@ -3481,13 +3548,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pay kasar - Jumlah Potongan - Bayaran Balik Pinjaman
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,BOM semasa dan New BOM tidak boleh sama
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Slip Gaji ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Slip Gaji ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Tarikh Persaraan mesti lebih besar daripada Tarikh Menyertai
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Terdapat ralat semasa jadual kursus:
 DocType: Sales Invoice,Against Income Account,Terhadap Akaun Pendapatan
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Dihantar
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Perkara {0}: qty Mengarahkan {1} tidak boleh kurang daripada perintah qty minimum {2} (ditakrifkan dalam Perkara).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Perkara {0}: qty Mengarahkan {1} tidak boleh kurang daripada perintah qty minimum {2} (ditakrifkan dalam Perkara).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Taburan Peratus Bulanan
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Sila log masuk sebagai pengguna lain.
 DocType: Territory,Territory Targets,Sasaran Wilayah
 DocType: Delivery Note,Transporter Info,Maklumat Transporter
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Sila menetapkan lalai {0} dalam Syarikat {1}
@@ -3495,13 +3563,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,pembekal yang sama telah dibuat beberapa kali
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Keuntungan Kasar / Rugi
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Pesanan Pembelian Item Dibekalkan
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Nama syarikat tidak boleh menjadi syarikat
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Nama syarikat tidak boleh menjadi syarikat
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Ketua surat untuk template cetak.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Tajuk untuk template cetak seperti Proforma Invois.
 DocType: Program Enrollment,Walking,berjalan
 DocType: Student Guardian,Student Guardian,Guardian pelajar
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Caj jenis penilaian tidak boleh ditandakan sebagai Inclusive
 DocType: POS Profile,Update Stock,Update Saham
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,dalam langganan
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM berbeza untuk perkara akan membawa kepada tidak betul (Jumlah) Nilai Berat Bersih. Pastikan Berat bersih setiap item adalah dalam UOM yang sama.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Kadar BOM
 DocType: Asset,Journal Entry for Scrap,Kemasukan Jurnal untuk Scrap
@@ -3551,15 +3620,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Sistem Pengguna (log masuk) ID. Jika ditetapkan, ia akan menjadi lalai untuk semua bentuk HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Dari {1}
 DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Beratur untuk mengemaskini harga terkini dalam semua Rang Undang-Undang Bahan. Ia mungkin mengambil masa beberapa minit.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Beratur untuk mengemaskini harga terkini dalam semua Rang Undang-Undang Bahan. Ia mungkin mengambil masa beberapa minit.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nama Akaun baru. Nota: Sila jangan membuat akaun untuk Pelanggan dan Pembekal
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Negara lalai bijak Templat Alamat
 DocType: Sales Order Item,Supplier delivers to Customer,Pembekal menyampaikan kepada Pelanggan
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Borang / Item / {0}) kehabisan stok
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Oleh kerana / Rujukan Tarikh dan boleh dikenakan {0}
+,Sales Payment Summary,Ringkasan Pembayaran Jualan
+DocType: Restaurant,Restaurant,Restoran
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Oleh kerana / Rujukan Tarikh dan boleh dikenakan {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data Import dan Eksport
 DocType: Patient,Account Details,Butiran Akaun
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Tiada pelajar Terdapat
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Tiada pelajar Terdapat
 DocType: Medical Department,Medical Department,Jabatan Perubatan
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Kriteria Pencari Skor Pembekal
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Posting Invois Tarikh
@@ -3570,8 +3641,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Sila pilih Tarikh Pengeposan sebelum memilih Parti
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Daripada AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Sila pilih Sebutharga
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Sila pilih Sebutharga
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Sila pilih Sebutharga
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Sila pilih Sebutharga
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Jumlah penurunan nilai Ditempah tidak boleh lebih besar daripada Jumlah penurunan nilai
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Buat Penyelenggaraan Lawatan
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,Sila hubungi untuk pengguna yang mempunyai Master Pengurus Jualan {0} peranan
@@ -3579,7 +3650,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Syarikat (tidak Pelanggan atau Pembekal) induk.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Ini adalah berdasarkan kepada kehadiran Pelajar ini
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,No Pelajar dalam
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Tambah lagi item atau bentuk penuh terbuka
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Tambah lagi item atau bentuk penuh terbuka
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota Penghantaran {0} hendaklah dibatalkan sebelum membatalkan Perintah Jualan ini
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Pergi ke Pengguna
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Amaun yang dibayar + Tulis Off Jumlah tidak boleh lebih besar daripada Jumlah Besar
@@ -3599,37 +3670,40 @@
 DocType: Fee Schedule,Fee Schedule,Jadual Bayaran
 DocType: Hub Settings,Publish Availability,Terbitkan Ketersediaan
 DocType: Company,Create Chart Of Accounts Based On,Buat carta akaun Based On
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Tidak boleh menukarnya kepada bukan kumpulan. Tugas Kanak-kanak wujud.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Tarikh Lahir tidak boleh lebih besar daripada hari ini.
 ,Stock Ageing,Saham Penuaan
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Pelajar {0} wujud terhadap pemohon pelajar {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Pelarasan Membulat (Mata Wang Syarikat)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Timesheet
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Timesheet
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' dinyahupayakan
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ditetapkan sebagai Open
 DocType: Cheque Print Template,Scanned Cheque,diimbas Cek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Hantar e-mel automatik ke Kenalan ke atas urus niaga Mengemukakan.
 DocType: Timesheet,Total Billable Amount,Jumlah ditaksir
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Perkara 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Kemasukan Pesanan
 DocType: Purchase Order,Customer Contact Email,Pelanggan Hubungi E-mel
 DocType: Warranty Claim,Item and Warranty Details,Perkara dan Jaminan Maklumat
 DocType: Sales Team,Contribution (%),Sumbangan (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota: Entry Bayaran tidak akan diwujudkan sejak &#39;Tunai atau Akaun Bank tidak dinyatakan
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Projek {0} sudah wujud
 DocType: Medical Department,Nursing User,Pengguna Kejururawatan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Tanggungjawab
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Tempoh sah tempoh sebut harga ini telah berakhir.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Tempoh sah tempoh sebut harga ini telah berakhir.
 DocType: Expense Claim Account,Expense Claim Account,Akaun Perbelanjaan Tuntutan
 DocType: Accounts Settings,Allow Stale Exchange Rates,Benarkan Kadar Pertukaran Stale
 DocType: Sales Person,Sales Person Name,Orang Jualan Nama
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Sila masukkan atleast 1 invois dalam jadual di
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Tambah Pengguna
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Tambah Pengguna
 DocType: POS Item Group,Item Group,Perkara Kumpulan
 DocType: Item,Safety Stock,Saham keselamatan
 DocType: Healthcare Settings,Healthcare Settings,Tetapan Kesihatan
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Kemajuan% untuk tugas yang tidak boleh lebih daripada 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Kemajuan% untuk tugas yang tidak boleh lebih daripada 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Sebelum perdamaian
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Untuk {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Cukai dan Caj Ditambah (Syarikat mata wang)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Perkara Cukai {0} mesti mempunyai akaun Cukai jenis atau Pendapatan atau Perbelanjaan atau bercukai
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Perkara Cukai {0} mesti mempunyai akaun Cukai jenis atau Pendapatan atau Perbelanjaan atau bercukai
 DocType: Sales Order,Partly Billed,Sebahagiannya Membilkan
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Perkara {0} perlu menjadi Asset Perkara Tetap
 DocType: Item,Default BOM,BOM Default
@@ -3645,6 +3719,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,ubah
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Dari Penghantaran Nota
 DocType: Student,Student Email Address,Pelajar Alamat E-mel
+DocType: Item,Hub Warehouse,Gudang Hub
 DocType: Physician Schedule Time Slot,From Time,Dari Masa
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Dalam stok:
 DocType: Notification Control,Custom Message,Custom Mesej
@@ -3653,9 +3728,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Alamat pelajar
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Alamat pelajar
 DocType: Purchase Invoice,Price List Exchange Rate,Senarai Harga Kadar Pertukaran
+DocType: POS Profile,POS Profile Name,Nama Profil POS
 DocType: Purchase Invoice Item,Rate,Kadar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Pelatih
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,alamat Nama
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,alamat Nama
 DocType: Stock Entry,From BOM,Dari BOM
 DocType: Assessment Code,Assessment Code,Kod penilaian
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Asas
@@ -3669,11 +3745,12 @@
 DocType: Salary Slip,Salary Structure,Struktur gaji
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Syarikat Penerbangan
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Isu Bahan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Isu Bahan
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Ralat berlaku semasa membuat berulang
 DocType: Material Request Item,For Warehouse,Untuk Gudang
 DocType: Employee,Offer Date,Tawaran Tarikh
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Sebut Harga
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Anda berada di dalam mod luar talian. Anda tidak akan dapat untuk menambah nilai sehingga anda mempunyai rangkaian.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Anda berada di dalam mod luar talian. Anda tidak akan dapat untuk menambah nilai sehingga anda mempunyai rangkaian.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Tiada Kumpulan Pelajar diwujudkan.
 DocType: Purchase Invoice Item,Serial No,No siri
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Jumlah Pembayaran balik bulanan tidak boleh lebih besar daripada Jumlah Pinjaman
@@ -3683,17 +3760,18 @@
 DocType: Salary Slip,Total Working Hours,Jumlah Jam Kerja
 DocType: Subscription,Next Schedule Date,Tarikh Jadual Seterusnya
 DocType: Stock Entry,Including items for sub assemblies,Termasuk perkara untuk sub perhimpunan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Masukkan nilai mesti positif
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Semua Wilayah
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Masukkan nilai mesti positif
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Semua Wilayah
 DocType: Purchase Invoice,Items,Item
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Pelajar sudah mendaftar.
 DocType: Fiscal Year,Year Name,Nama Tahun
 DocType: Process Payroll,Process Payroll,Proses Gaji
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Terdapat lebih daripada cuti hari bekerja bulan ini.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Terdapat lebih daripada cuti hari bekerja bulan ini.
 DocType: Product Bundle Item,Product Bundle Item,Produk Bundle Item
 DocType: Sales Partner,Sales Partner Name,Nama Rakan Jualan
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Tawaran Sebut Harga
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Tawaran Sebut Harga
 DocType: Payment Reconciliation,Maximum Invoice Amount,Amaun Invois maksimum
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hematologi
 DocType: Normal Test Items,Normal Test Items,Item Ujian Normal
 DocType: Student Language,Student Language,Bahasa pelajar
 apps/erpnext/erpnext/config/selling.py +23,Customers,pelanggan
@@ -3705,10 +3783,11 @@
 DocType: Issue,Opening Time,Masa Pembukaan
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Dari dan kepada tarikh yang dikehendaki
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Sekuriti &amp; Bursa Komoditi
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unit keingkaran Langkah untuk Variant &#39;{0}&#39; hendaklah sama seperti dalam Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unit keingkaran Langkah untuk Variant &#39;{0}&#39; hendaklah sama seperti dalam Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Kira Based On
 DocType: Delivery Note Item,From Warehouse,Dari Gudang
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Tiada item dengan Bill Bahan untuk pembuatan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Tiada item dengan Bill Bahan untuk pembuatan
+DocType: Restaurant,Default Customer,Pelanggan Lalai
 DocType: Assessment Plan,Supervisor Name,Nama penyelia
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Jangan mengesahkan jika pelantikan dibuat untuk hari yang sama
 DocType: Program Enrollment Course,Program Enrollment Course,Kursus Program Pendaftaran
@@ -3736,7 +3815,7 @@
 DocType: Payment Entry,Internal Transfer,Pindahan dalaman
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Akaun kanak-kanak wujud untuk akaun ini. Anda tidak boleh memadam akaun ini.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Sama ada qty sasaran atau jumlah sasaran adalah wajib
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Tidak lalai BOM wujud untuk Perkara {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Tidak lalai BOM wujud untuk Perkara {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Sila pilih Penempatan Tarikh pertama
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Tarikh pembukaan perlu sebelum Tarikh Tutup
 DocType: Leave Control Panel,Carry Forward,Carry Forward
@@ -3772,6 +3851,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Jumlah Hadir
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,Penyata perakaunan
 DocType: Drug Prescription,Hour,Jam
+DocType: Restaurant Order Entry,Last Sales Invoice,Invois Jualan Terakhir
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,No Siri baru tidak boleh mempunyai Gudang. Gudang mesti digunakan Saham Masuk atau Resit Pembelian
 DocType: Lead,Lead Type,Jenis Lead
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Anda tiada kebenaran untuk meluluskan daun pada Tarikh Sekat
@@ -3808,65 +3888,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Buat Pengguna
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,Gram
 DocType: Supplier Scorecard,Per Month,Sebulan
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Kuantiti untuk pembuatan mesti lebih besar daripada 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Kuantiti untuk pembuatan mesti lebih besar daripada 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Lawati laporan untuk panggilan penyelenggaraan.
 DocType: Stock Entry,Update Rate and Availability,Kadar Update dan Ketersediaan
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Peratus anda dibenarkan untuk menerima atau menyampaikan lebih daripada kuantiti yang ditempah. Sebagai contoh: Jika anda telah menempah 100 unit. dan Elaun anda adalah 10% maka anda dibenarkan untuk menerima 110 unit.
 DocType: POS Customer Group,Customer Group,Kumpulan pelanggan
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),New Batch ID (Pilihan)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),New Batch ID (Pilihan)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),New Batch ID (Pilihan)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),New Batch ID (Pilihan)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Akaun perbelanjaan adalah wajib bagi item {0}
 DocType: BOM,Website Description,Laman Web Penerangan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Perubahan Bersih dalam Ekuiti
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Terbaru
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Sila membatalkan Invois Belian {0} pertama
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Alamat e-mel mesti menjadi unik, sudah wujud untuk {0}"
 DocType: Serial No,AMC Expiry Date,AMC Tarikh Tamat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,resit
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,resit
 ,Sales Register,Jualan Daftar
 DocType: Daily Work Summary Settings Company,Send Emails At,Menghantar e-mel di
 DocType: Quotation,Quotation Lost Reason,Sebut Harga Hilang Akal
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Pilih Domain anda
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',pilih * dari tabPatient di mana nama = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},rujukan transaksi tidak {0} bertarikh {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},rujukan transaksi tidak {0} bertarikh {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ada apa-apa untuk mengedit.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Lihat Borang
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Ringkasan untuk bulan ini dan aktiviti-aktiviti yang belum selesai
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Lihat Borang
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Ringkasan untuk bulan ini dan aktiviti-aktiviti yang belum selesai
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Tambah pengguna ke organisasi anda, selain diri anda."
 DocType: Customer Group,Customer Group Name,Nama Kumpulan Pelanggan
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,No Pelanggan lagi!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,No Pelanggan lagi!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Penyata aliran tunai
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Jumlah Pinjaman tidak boleh melebihi Jumlah Pinjaman maksimum {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,lesen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Sila mengeluarkan Invois ini {0} dari C-Borang {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Sila mengeluarkan Invois ini {0} dari C-Borang {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Sila pilih Carry Forward jika anda juga mahu termasuk baki tahun fiskal yang lalu daun untuk tahun fiskal ini
 DocType: GL Entry,Against Voucher Type,Terhadap Jenis Baucar
 DocType: Physician,Phone (R),Telefon (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Slot masa ditambah
 DocType: Item,Attributes,Sifat-sifat
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Dayakan Templat
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Sila tetapkan Siri Penamaan untuk {0} melalui Persediaan&gt; Tetapan&gt; Penamaan Siri
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Sila masukkan Tulis Off Akaun
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Lepas Tarikh Perintah
 DocType: Patient,B Negative,B Negatif
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Akaun {0} tidak dimiliki oleh syarikat {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Nombor siri berturut-turut {0} tidak sepadan dengan penghantaran Nota
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Nombor siri berturut-turut {0} tidak sepadan dengan penghantaran Nota
 DocType: Student,Guardian Details,Guardian Butiran
 DocType: C-Form,C-Form,C-Borang
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Kehadiran beberapa pekerja
 DocType: Vehicle,Chassis No,Chassis Tiada
 DocType: Payment Request,Initiated,Dimulakan
 DocType: Production Order,Planned Start Date,Dirancang Tarikh Mula
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Sila pilih BOM
 DocType: Serial No,Creation Document Type,Penciptaan Dokumen Jenis
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Tarikh akhir mestilah lebih besar dari tarikh mula
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Tarikh akhir mestilah lebih besar dari tarikh mula
 DocType: Leave Type,Is Encash,Adalah menunaikan
 DocType: Leave Allocation,New Leaves Allocated,Daun baru Diperuntukkan
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Data projek-bijak tidak tersedia untuk Sebutharga
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Akhirnya
 DocType: Project,Expected End Date,Tarikh Jangkaan Tamat
 DocType: Budget Account,Budget Amount,Amaun belanjawan
 DocType: Appraisal Template,Appraisal Template Title,Penilaian Templat Tajuk
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Dari Tarikh {0} untuk pekerja {1} tidak boleh sebelum menyertai Tarikh pekerja {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Perdagangan
 DocType: Patient,Alcohol Current Use,Penggunaan Semasa Alkohol
+DocType: Student Admission Program,Student Admission Program,Program Kemasukan Pelajar
 DocType: Payment Entry,Account Paid To,Akaun Dibayar Kepada
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Ibu Bapa Perkara {0} tidak perlu menjadi item Saham
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Semua Produk atau Perkhidmatan.
@@ -3875,30 +3957,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Bajet akaun {1} daripada {2} {3} adalah {4}. Ia akan melebihi oleh {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Akaun mestilah jenis &#39;Aset Tetap&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Keluar Qty
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Kaedah-kaedah untuk mengira jumlah penghantaran untuk jualan
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,dan Disabled yang tidak dicuba di
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Siri adalah wajib
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Perkhidmatan Kewangan
 DocType: Student Sibling,Student ID,ID pelajar
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Jenis aktiviti untuk Masa Balak
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,E-mel Pembekal
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Jenis aktiviti untuk Masa Balak
 DocType: Tax Rule,Sales,Jualan
 DocType: Stock Entry Detail,Basic Amount,Jumlah Asas
 DocType: Training Event,Exam,peperiksaan
 DocType: Complaint,Complaint,Aduan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Gudang diperlukan untuk saham Perkara {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Gudang diperlukan untuk saham Perkara {0}
 DocType: Leave Allocation,Unused leaves,Daun yang tidak digunakan
 DocType: Patient,Alcohol Past Use,Penggunaan Pasti Alkohol
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Negeri Bil
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Pemindahan
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Kutip BOM meletup (termasuk sub-pemasangan)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Pemindahan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Kutip BOM meletup (termasuk sub-pemasangan)
 DocType: Authorization Rule,Applicable To (Employee),Terpakai Untuk (Pekerja)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Tarikh Akhir adalah wajib
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Tarikh Akhir adalah wajib
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Kenaikan untuk Atribut {0} tidak boleh 0
 DocType: Journal Entry,Pay To / Recd From,Bayar Untuk / Recd Dari
 DocType: Naming Series,Setup Series,Persediaan Siri
 DocType: Payment Reconciliation,To Invoice Date,Untuk invois Tarikh
 DocType: Supplier,Contact HTML,Hubungi HTML
 ,Inactive Customers,Pelanggan aktif
+DocType: Student Admission Program,Maximum Age,Umur Maksimum
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Resit Pembelian
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Bagaimana Harga Peraturan digunakan?
@@ -3917,6 +4001,7 @@
 DocType: GL Entry,Remarks,Catatan
 DocType: Payment Entry,Account Paid From,Akaun Dibayar Dari
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Bahan mentah Item Code
+DocType: Task,Parent Task,Tugas Ibu Bapa
 DocType: Journal Entry,Write Off Based On,Tulis Off Based On
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,membuat Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Cetak dan Alat Tulis
@@ -3925,20 +4010,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Gaji sudah diproses untuk tempoh antara {0} dan {1}, Tinggalkan tempoh permohonan tidak boleh di antara julat tarikh ini."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Rekod pemasangan untuk No. Siri
 DocType: Guardian Interest,Guardian Interest,Guardian Faedah
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Tetapkan nilai lalai untuk Invois POS
 apps/erpnext/erpnext/config/hr.py +177,Training,Latihan
 DocType: Timesheet,Employee Detail,Detail pekerja
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ID E-mel
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ID E-mel
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,hari Tarikh depan dan Ulang pada Hari Bulan mestilah sama
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,hari Tarikh depan dan Ulang pada Hari Bulan mestilah sama
 DocType: Lab Prescription,Test Code,Kod Ujian
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Tetapan untuk laman web laman utama
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ tidak dibenarkan untuk {0} kerana kedudukan kad skor {1}
 DocType: Offer Letter,Awaiting Response,Menunggu Response
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Di atas
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Jumlah Jumlah {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},sifat yang tidak sah {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Jumlah Jumlah {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},sifat yang tidak sah {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Menyebut jika tidak standard akaun yang perlu dibayar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},item yang sama telah dimasukkan beberapa kali. {Senarai}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Sila pilih kumpulan penilaian selain daripada &#39;Semua Kumpulan Penilaian&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Baris {0}: Pusat kos diperlukan untuk item {1}
 DocType: Training Event Employee,Optional,Pilihan
@@ -3961,13 +4046,15 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Pusat Kos adalah wajib bagi Perkara {2}
 DocType: Vehicle,Policy No,Polisi Tiada
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Dapatkan Item daripada Fail Produk
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Oleh kerana stok wujud terhadap item {0}, anda tidak boleh mengaktifkan sifat variasi"
 DocType: Asset,Straight Line,Garis lurus
 DocType: Project User,Project User,projek Pengguna
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Split
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Split
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Split
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Split
 DocType: GL Entry,Is Advance,Adalah Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Kehadiran Dari Tarikh dan Kehadiran Untuk Tarikh adalah wajib
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,Sila masukkan &#39;Apakah Subkontrak&#39; seperti Ya atau Tidak
+DocType: Item,Default Purchase Unit of Measure,Unit Pembelian Lalai Ukuran
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Tarikh Komunikasi lalu
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Tarikh Komunikasi lalu
 DocType: Sales Team,Contact No.,Hubungi No.
@@ -3976,7 +4063,6 @@
 DocType: Production Order,Check if material transfer entry is not required,Periksa sama ada kemasukan pemindahan bahan tidak diperlukan
 DocType: Production Order,Check if material transfer entry is not required,Periksa sama ada kemasukan pemindahan bahan tidak diperlukan
 DocType: Program Enrollment Tool,Get Students From,Dapatkan Pelajar Dari
-DocType: Hub Settings,Seller Country,Penjual Negara
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Terbitkan Item dalam Laman Web
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Kumpulan pelajar anda dalam kelompok
 DocType: Authorization Rule,Authorization Rule,Peraturan kebenaran
@@ -3986,8 +4072,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Jualan Cukai dan Caj Template
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Jumlah: (Kredit)
 DocType: Repayment Schedule,Payment Date,Tarikh pembayaran
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Batch baru Qty
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Batch baru Qty
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Batch baru Qty
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Batch baru Qty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Pakaian &amp; Aksesori
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,Tidak dapat menyelesaikan fungsi skor berwajaran. Pastikan formula itu sah.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Bilangan Pesanan
@@ -4005,6 +4091,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} tidak boleh dikemukakan, ia sudah {2}"
 DocType: Tax Rule,Billing Country,Bil Negara
 DocType: Purchase Order Item,Expected Delivery Date,Jangkaan Tarikh Penghantaran
+DocType: Restaurant Order Entry,Restaurant Order Entry,Kemasukan Pesanan Restoran
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit dan Kredit tidak sama untuk {0} # {1}. Perbezaan adalah {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Perbelanjaan hiburan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Buat Permintaan Bahan
@@ -4017,9 +4104,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Akaun dengan urus niaga yang sedia ada tidak boleh dihapuskan
 DocType: Vehicle,Last Carbon Check,Carbon lalu Daftar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Perbelanjaan Undang-undang
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Sila pilih kuantiti hukuman
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Sila pilih kuantiti hukuman
 DocType: Purchase Invoice,Posting Time,Penempatan Masa
 DocType: Timesheet,% Amount Billed,% Jumlah Dibilkan
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Time Per Appointment&quot; belum ditetapkan untuk Dr {0}. Tambahnya dalam tuan Doktor.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Perbelanjaan Telefon
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Semak ini jika anda mahu untuk memaksa pengguna untuk memilih siri sebelum menyimpan. Tidak akan ada lalai jika anda mendaftar ini.
@@ -4030,6 +4118,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Hasil Pelanggan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Perbelanjaan Perjalanan
 DocType: Maintenance Visit,Breakdown,Pecahan
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Tambah Langganan bidang adat dalam doctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Akaun: {0} dengan mata wang: {1} tidak boleh dipilih
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Perbarui kos BOM secara automatik melalui Penjadual, berdasarkan kadar penilaian terkini / harga senarai harga / kadar pembelian terakhir bahan mentah."
 DocType: Bank Reconciliation Detail,Cheque Date,Cek Tarikh
@@ -4054,7 +4143,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Jumlah Bil (melalui Time Log)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Id Pembekal
 DocType: Payment Request,Payment Gateway Details,Pembayaran Gateway Butiran
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Kuantiti harus lebih besar daripada 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Kuantiti harus lebih besar daripada 0
 DocType: Journal Entry,Cash Entry,Entry Tunai
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,nod kanak-kanak hanya boleh diwujudkan di bawah nod jenis &#39;Kumpulan
 DocType: Leave Application,Half Day Date,Half Day Tarikh
@@ -4072,12 +4161,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Nota: Perkara {0} memasuki beberapa kali
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Semua Kenalan.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Singkatan Syarikat
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Pengguna {0} tidak wujud
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Pengguna {0} tidak wujud
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Singkatan
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Kemasukan bayaran yang sudah wujud
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Tidak authroized sejak {0} melebihi had
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Master template gaji.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Patologi
+DocType: Restaurant Order Entry,Restaurant Table,Jadual Restoran
 DocType: Leave Type,Max Days Leave Allowed,Max Hari Cuti dibenarkan
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Menetapkan Peraturan Cukai untuk troli membeli-belah
 DocType: Purchase Invoice,Taxes and Charges Added,Cukai dan Caj Tambahan
@@ -4089,10 +4180,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Petikan untuk Leads atau Pelanggan.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Peranan dibenarkan untuk mengedit saham beku
 ,Territory Target Variance Item Group-Wise,Wilayah Sasaran Varian Perkara Kumpulan Bijaksana
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Semua Kumpulan Pelanggan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Semua Kumpulan Pelanggan
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,terkumpul Bulanan
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} adalah wajib. Mungkin rekod Pertukaran Matawang tidak dihasilkan untuk {1} hingga {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Template cukai adalah wajib.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Template cukai adalah wajib.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Akaun {0}: akaun Induk {1} tidak wujud
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Senarai Harga Kadar (Syarikat mata wang)
 DocType: Products Settings,Products Settings,produk Tetapan
@@ -4118,13 +4209,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Perkara Bijaksana Cukai Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Institut Singkatan
 ,Item-wise Price List Rate,Senarai Harga Kadar Perkara-bijak
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Sebutharga Pembekal
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Sebutharga Pembekal
 DocType: Quotation,In Words will be visible once you save the Quotation.,Dalam Perkataan akan dapat dilihat selepas anda menyimpan Sebut Harga tersebut.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Kuantiti ({0}) tidak boleh menjadi sebahagian kecil berturut-turut {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Kuantiti ({0}) tidak boleh menjadi sebahagian kecil berturut-turut {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Barcode {0} telah digunakan dalam Perkara {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Barcode {0} telah digunakan dalam Perkara {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Peraturan untuk menambah kos penghantaran.
 DocType: Item,Opening Stock,Stok Awal
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Pelanggan dikehendaki
@@ -4142,9 +4233,8 @@
 DocType: Customer,From Lead,Dari Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Perintah dikeluarkan untuk pengeluaran.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Pilih Tahun Anggaran ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS Profil dikehendaki membuat POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS Profil dikehendaki membuat POS Entry
 DocType: Program Enrollment Tool,Enroll Students,Daftarkan Pelajar
-DocType: Hub Settings,Name Token,Nama Token
 DocType: Lab Test,Approved Date,Tarikh Diluluskan
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Jualan Standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Atleast satu gudang adalah wajib
@@ -4162,7 +4252,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Sumber Manusia
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Penyesuaian Pembayaran Pembayaran
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Aset Cukai
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Pengeluaran Pesanan itu telah {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Pengeluaran Pesanan itu telah {0}
 DocType: BOM Item,BOM No,BOM Tiada
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Jurnal Entry {0} tidak mempunyai akaun {1} atau sudah dipadankan dengan baucar lain
@@ -4182,8 +4272,8 @@
 DocType: Currency Exchange,To Currency,Untuk Mata Wang
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Membenarkan pengguna berikut untuk meluluskan Permohonan Cuti untuk hari blok.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Jenis-jenis Tuntutan Perbelanjaan.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Kadar untuk item menjual {0} adalah lebih rendah berbanding {1}. Kadar menjual harus atleast {2}
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Kadar untuk item menjual {0} adalah lebih rendah berbanding {1}. Kadar menjual harus atleast {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Kadar untuk item menjual {0} adalah lebih rendah berbanding {1}. Kadar menjual harus atleast {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Kadar untuk item menjual {0} adalah lebih rendah berbanding {1}. Kadar menjual harus atleast {2}
 DocType: Item,Taxes,Cukai
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Dibayar dan Tidak Dihantar
 DocType: Project,Default Cost Center,Kos Pusat Default
@@ -4197,15 +4287,15 @@
 DocType: Employee Loan,Fully Disbursed,Dikeluarkan sepenuhnya
 DocType: Maintenance Visit,Customer Feedback,Maklum Balas Pelanggan
 DocType: Account,Expense,Perbelanjaan
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Skor tidak boleh lebih besar daripada skor maksimum
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Skor tidak boleh lebih besar daripada skor maksimum
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Pelanggan dan Pembekal
 DocType: Item Attribute,From Range,Dari Range
 DocType: BOM,Set rate of sub-assembly item based on BOM,Tetapkan kadar item sub-assembly berdasarkan BOM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Ralat sintaks dalam formula atau keadaan: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Ralat sintaks dalam formula atau keadaan: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Daily Kerja Tetapan Ringkasan Syarikat
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,Perkara {0} diabaikan kerana ia bukan satu perkara saham
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Hantar Pesanan Pengeluaran ini untuk proses seterusnya.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Hantar Pesanan Pengeluaran ini untuk proses seterusnya.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Tidak memohon Peraturan Harga dalam transaksi tertentu, semua Peraturan Harga berkenaan perlu dimatikan."
 DocType: Assessment Group,Parent Assessment Group,Persatuan Ibu Bapa Penilaian
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Pekerjaan
@@ -4222,12 +4312,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Sila tetapkan Syarikat menapis kosong jika Group By adalah &#39;Syarikat&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Posting Tarikh tidak boleh tarikh masa depan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: No Siri {1} tidak sepadan dengan {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,untuk menjana berulang
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Cuti kasual
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Ujian Makmal UOM.
 DocType: Batch,Batch ID,ID Batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Nota: {0}
 ,Delivery Note Trends,Trend Penghantaran Nota
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Ringkasan Minggu Ini
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Ringkasan Minggu Ini
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Dalam Stok Kuantiti
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Akaun: {0} hanya boleh dikemaskini melalui Urusniaga Stok
 DocType: Student Group Creation Tool,Get Courses,Dapatkan Kursus
@@ -4241,7 +4332,6 @@
 DocType: Purchase Order,To Bill,Rang Undang-Undang
 DocType: Material Request,% Ordered,% Mengarahkan
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Untuk Kumpulan Pelajar berdasarkan, Kursus yang akan disahkan bagi tiap-tiap Pelajar daripada Kursus mendaftar dalam Program Pendaftaran."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Masukkan Alamat Email dipisahkan dengan tanda koma, invois akan dihantar secara automatik pada tarikh tertentu"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Piecework
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Purata. Kadar Membeli
 DocType: Task,Actual Time (in Hours),Masa sebenar (dalam jam)
@@ -4255,7 +4345,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Perkara {0} tidak ditetapkan untuk Serial No. Column boleh kosong
 DocType: Accounts Settings,Accounts Settings,Tetapan Akaun-akaun
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,Terima
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Tiada Keputusan untuk dihantar
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Tiada Keputusan untuk dihantar
 DocType: Customer,Sales Partner and Commission,Rakan Jualan dan Suruhanjaya
 DocType: Employee Loan,Rate of Interest (%) / Year,Kadar faedah (%) / Tahun
 ,Project Quantity,projek Kuantiti
@@ -4267,55 +4357,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Black
 DocType: BOM Explosion Item,BOM Explosion Item,Letupan BOM Perkara
 DocType: Account,Auditor,Audit
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} barangan yang dihasilkan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} barangan yang dihasilkan
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Ketahui lebih lanjut
 DocType: Cheque Print Template,Distance from top edge,Jarak dari tepi atas
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Senarai Harga {0} dilumpuhkan atau tidak wujud
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Senarai Harga {0} dilumpuhkan atau tidak wujud
 DocType: Purchase Invoice,Return,Pulangan
 DocType: Production Order Operation,Production Order Operation,Pengeluaran Operasi Pesanan
 DocType: Pricing Rule,Disable,Melumpuhkan
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Cara pembayaran adalah dikehendaki untuk membuat pembayaran
 DocType: Project Task,Pending Review,Sementara menunggu Review
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Pelantikan dan Perundingan
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} tidak mendaftar dalam Batch {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} tidak mendaftar dalam Batch {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} tidak boleh dimansuhkan, kerana ia sudah {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Jumlah Tuntutan Perbelanjaan (melalui Perbelanjaan Tuntutan)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Tidak Hadir
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Matawang BOM # {1} hendaklah sama dengan mata wang yang dipilih {2}
 DocType: Journal Entry Account,Exchange Rate,Kadar pertukaran
 DocType: Patient,Additional information regarding the patient,Maklumat tambahan mengenai pesakit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Sales Order {0} tidak dikemukakan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Sales Order {0} tidak dikemukakan
 DocType: Homepage,Tag Line,Line tag
 DocType: Fee Component,Fee Component,Komponen Bayaran
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Pengurusan Fleet
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Tambah item dari
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Pengurusan Fleet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Tambah item dari
 DocType: Cheque Print Template,Regular,biasa
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Jumlah Wajaran semua Kriteria Penilaian mesti 100%
-DocType: BOM,Last Purchase Rate,Kadar Pembelian lalu
+DocType: Purchase Order Item,Last Purchase Rate,Kadar Pembelian lalu
 DocType: Account,Asset,Aset
 DocType: Project Task,Task ID,Petugas ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Saham tidak boleh wujud untuk Perkara {0} kerana mempunyai varian
 DocType: Lab Test,Mobile,Mobile
 ,Sales Person-wise Transaction Summary,Jualan Orang-bijak Transaksi Ringkasan
 DocType: Training Event,Contact Number,Nombor telefon
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Gudang {0} tidak wujud
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Daftar Untuk ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Gudang {0} tidak wujud
 DocType: Monthly Distribution,Monthly Distribution Percentages,Peratusan Taburan Bulanan
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Item yang dipilih tidak boleh mempunyai Batch
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Kadar penilaian tidak dijumpai untuk Perkara {0}, yang diperlukan untuk melakukan catatan perakaunan untuk {1} {2}. Jika yang menjalankan transaksi sebagai item sampel dalam {1}, sila sebut bahawa dalam {1} meja Item. Jika tidak, sila buat transaksi stok masuk untuk item atau sebutan kadar penilaian dalam rekod Item, dan kemudian cuba submiting / membatalkan entri ini"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% bahan-bahan yang dihantar untuk Nota Penghantaran ini
+DocType: Training Event,Has Certificate,Mempunyai Sijil
 DocType: Project,Customer Details,Butiran Pelanggan
 DocType: Employee,Reports to,Laporan kepada
 ,Unpaid Expense Claim,Tidak dibayar Perbelanjaan Tuntutan
 DocType: Payment Entry,Paid Amount,Jumlah yang dibayar
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Terokai Kitaran Jualan
 DocType: Assessment Plan,Supervisor,penyelia
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,talian
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,talian
 ,Available Stock for Packing Items,Saham tersedia untuk Item Pembungkusan
 DocType: Item Variant,Item Variant,Perkara Varian
 DocType: Assessment Result Tool,Assessment Result Tool,Penilaian Keputusan Tool
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,penghantaran pesanan tidak boleh dihapuskan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,penghantaran pesanan tidak boleh dihapuskan
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Baki akaun sudah dalam Debit, anda tidak dibenarkan untuk menetapkan 'Baki Mestilah' sebagai 'Kredit'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Pengurusan Kualiti
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Perkara {0} telah dilumpuhkan
@@ -4336,7 +4425,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Benarkan Kadar Penilaian Zero
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Benarkan Kadar Penilaian Zero
 DocType: Training Event Employee,Invited,dijemput
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Pelbagai Struktur Gaji aktif dijumpai untuk pekerja {0} pada tarikh yang diberikan
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Pelbagai Struktur Gaji aktif dijumpai untuk pekerja {0} pada tarikh yang diberikan
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Persediaan akaun Gateway.
 DocType: Employee,Employment Type,Jenis pekerjaan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Aset Tetap
@@ -4348,7 +4437,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Pelajar Email ID
 DocType: Employee,Notice (days),Notis (hari)
 DocType: Tax Rule,Sales Tax Template,Template Cukai Jualan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Pilih item untuk menyelamatkan invois
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Pilih item untuk menyelamatkan invois
 DocType: Employee,Encashment Date,Penunaian Tarikh
 DocType: Training Event,Internet,Internet
 DocType: Special Test Template,Special Test Template,Templat Ujian Khas
@@ -4358,7 +4447,7 @@
 DocType: Academic Term,Term Start Date,Term Tarikh Mula
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Dilampirkan {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Dilampirkan {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Baki Penyata Bank seperti Lejar Am
 DocType: Job Applicant,Applicant Name,Nama pemohon
 DocType: Authorization Rule,Customer / Item Name,Pelanggan / Nama Item
@@ -4378,7 +4467,7 @@
 DocType: Guardian,Guardian Of ,Guardian Of
 DocType: Grading Scale Interval,Threshold,ambang
 DocType: BOM Update Tool,Current BOM,BOM semasa
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Tambah No Serial
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Tambah No Serial
 DocType: Production Order Item,Available Qty at Source Warehouse,Ada Qty di Source Warehouse
 apps/erpnext/erpnext/config/support.py +22,Warranty,jaminan
 DocType: Purchase Invoice,Debit Note Issued,Debit Nota Dikeluarkan
@@ -4401,10 +4490,9 @@
 DocType: Account,Receivable,Belum Terima
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Tidak dibenarkan untuk menukar pembekal sebagai Perintah Pembelian sudah wujud
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Peranan yang dibenarkan menghantar transaksi yang melebihi had kredit ditetapkan.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Pilih item untuk mengeluarkan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Master penyegerakan data, ia mungkin mengambil sedikit masa"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Pilih item untuk mengeluarkan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Master penyegerakan data, ia mungkin mengambil sedikit masa"
 DocType: Item,Material Issue,Isu Bahan
-DocType: Hub Settings,Seller Description,Penjual Penerangan
 DocType: Employee Education,Qualification,Kelayakan
 DocType: Item Price,Item Price,Perkara Harga
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sabun &amp; Detergen
@@ -4412,7 +4500,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Dari Masa tidak boleh lebih besar daripada ke semasa.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Mengarahkan
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Teruskan
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Teruskan
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,Jika didayakan maka sistem tidak akan mengemas kini medan varian daripada templat tetapi akan menyalin data bidang yang disebutkan di bawah ini semasa membuat varian baru
 DocType: Salary Detail,Component,komponen
 DocType: Assessment Criteria,Assessment Criteria Group,Kriteria Penilaian Kumpulan
 DocType: Healthcare Settings,Patient Name By,Nama Pesakit Mengikut
@@ -4422,7 +4511,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Sila masukkan Meluluskan Peranan atau Meluluskan pengguna
 DocType: Journal Entry,Write Off Entry,Tulis Off Entry
 DocType: BOM,Rate Of Materials Based On,Kadar Bahan Based On
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Pembekal&gt; Jenis Pembekal
+DocType: Item Variant Settings,Do not Update Variants,Jangan Kemas Kini Variasi
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Sokongan
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Nyahtanda semua
 DocType: POS Profile,Terms and Conditions,Terma dan Syarat
@@ -4431,7 +4520,7 @@
 DocType: Leave Block List,Applies to Company,Terpakai kepada Syarikat
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,Tidak boleh membatalkan kerana dikemukakan Saham Entry {0} wujud
 DocType: Employee Loan,Disbursement Date,Tarikh pembayaran
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;Penerima&#39; tidak ditentukan
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Penerima&#39; tidak ditentukan
 DocType: BOM Update Tool,Update latest price in all BOMs,Kemas kini harga terkini dalam semua BOM
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Rekod kesihatan
 DocType: Vehicle,Vehicle,kenderaan
@@ -4447,14 +4536,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,RRJP / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Penurunan nilai aset dan Baki
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Jumlah {0} {1} dipindahkan dari {2} kepada {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Jumlah {0} {1} dipindahkan dari {2} kepada {3}
 DocType: Sales Invoice,Get Advances Received,Mendapatkan Pendahuluan Diterima
 DocType: Email Digest,Add/Remove Recipients,Tambah / Buang Penerima
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Transaksi tidak dibenarkan terhadap Pengeluaran berhenti Perintah {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Untuk menetapkan Tahun Fiskal ini sebagai lalai, klik pada &#39;Tetapkan sebagai lalai&#39;"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Sertai
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Sertai
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Kekurangan Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Varian item {0} wujud dengan ciri yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Varian item {0} wujud dengan ciri yang sama
 DocType: Employee Loan,Repay from Salary,Membayar balik dari Gaji
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Meminta pembayaran daripada {0} {1} untuk jumlah {2}
@@ -4467,7 +4556,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Pesanan Jualan Perkara
 DocType: Salary Slip,Payment Days,Hari Pembayaran
 DocType: Patient,Dormant,Tidak aktif
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Gudang dengan nod kanak-kanak tidak boleh ditukar ke dalam lejar
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Gudang dengan nod kanak-kanak tidak boleh ditukar ke dalam lejar
 DocType: BOM,Manage cost of operations,Menguruskan kos operasi
 DocType: Accounts Settings,Stale Days,Hari Stale
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Apabila mana-mana urus niaga yang diperiksa adalah &quot;Dihantar&quot;, e-mel pop-up secara automatik dibuka untuk menghantar e-mel kepada yang berkaitan &quot;Hubungi&quot; dalam transaksi itu, dengan transaksi itu sebagai lampiran. Pengguna mungkin atau tidak menghantar e-mel."
@@ -4481,10 +4570,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,No siri {0} telah diterima
 ,Requested Items To Be Transferred,Item yang diminta Akan Dipindahkan
 DocType: Expense Claim,Vehicle Log,kenderaan Log
-DocType: Purchase Invoice,Recurring Id,Id berulang
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),Kehadiran demam (temp&gt; 38.5 ° C / 101.3 ° F atau temp tetap&gt; 38 ° C / 100.4 ° F)
 DocType: Customer,Sales Team Details,Butiran Pasukan Jualan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Padam selama-lamanya?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Padam selama-lamanya?
 DocType: Expense Claim,Total Claimed Amount,Jumlah Jumlah Tuntutan
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Peluang yang berpotensi untuk jualan.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Tidak sah {0}
@@ -4494,7 +4582,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Kedai Jabatan
 ,Item Delivery Date,Tarikh Penghantaran Item
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Persediaan Sekolah anda di ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Persediaan Sekolah anda di ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Tukar Jumlah Asas (Syarikat Mata Wang)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Tiada catatan perakaunan bagi gudang berikut
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Simpan dokumen pertama.
@@ -4506,13 +4594,12 @@
 DocType: Task,Is Milestone,adalah Milestone
 DocType: Daily Work Summary,Email Sent To,E-mel Dihantar Untuk
 DocType: Budget,Warn,Beri amaran
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Adakah anda pasti mahu mendaftarkan diri?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Sebarang kenyataan lain, usaha perlu diberi perhatian yang sepatutnya pergi dalam rekod."
 DocType: BOM,Manufacturing User,Pembuatan pengguna
 DocType: Purchase Invoice,Raw Materials Supplied,Bahan mentah yang dibekalkan
-DocType: Purchase Invoice,Recurring Print Format,Format Cetak berulang
 DocType: C-Form,Series,Siri
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Mata wang senarai harga {0} mestilah {1} atau {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Tambah Produk
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Mata wang senarai harga {0} mestilah {1} atau {2}
 DocType: Appraisal,Appraisal Template,Templat Penilaian
 DocType: Item Group,Item Classification,Item Klasifikasi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Pengurus Pembangunan Perniagaan
@@ -4526,7 +4613,7 @@
 DocType: Item Attribute Value,Attribute Value,Atribut Nilai
 ,Itemwise Recommended Reorder Level,Itemwise lawatan Reorder Level
 DocType: Salary Detail,Salary Detail,Detail gaji
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Sila pilih {0} pertama
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Sila pilih {0} pertama
 DocType: Appointment Type,Physician,Pakar Perubatan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Batch {0} Item {1} telah tamat.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Perundingan
@@ -4537,7 +4624,7 @@
 DocType: Salary Detail,Default Amount,Jumlah Default
 DocType: Lab Test Template,Descriptive,Deskriptif
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Gudang tidak dijumpai di dalam sistem
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Ringkasan ini Bulan ini
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Ringkasan ini Bulan ini
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kualiti Pemeriksaan Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Bekukan Stok Yang Lebih Lama Dari` hendaklah lebih kecil daripada %d hari.
 DocType: Tax Rule,Purchase Tax Template,Membeli Template Cukai
@@ -4560,12 +4647,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Latihan Events / Keputusan
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Susutnilai Terkumpul seperti pada
 DocType: Sales Invoice,C-Form Applicable,C-Borang Berkaitan
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Masa operasi mesti lebih besar daripada 0 untuk operasi {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Masa operasi mesti lebih besar daripada 0 untuk operasi {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Warehouse adalah wajib
 DocType: Supplier,Address and Contacts,Alamat dan Kenalan
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detail UOM Penukaran
 DocType: Program,Program Abbreviation,Singkatan program
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Perintah Pengeluaran tidak boleh dibangkitkan terhadap Templat Perkara
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Perintah Pengeluaran tidak boleh dibangkitkan terhadap Templat Perkara
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Caj akan dikemas kini di Resit Pembelian terhadap setiap item
 DocType: Warranty Claim,Resolved By,Diselesaikan oleh
 DocType: Bank Guarantee,Start Date,Tarikh Mula
@@ -4591,27 +4678,28 @@
 DocType: Employee,Educational Qualification,Kelayakan pendidikan
 DocType: Workstation,Operating Costs,Kos operasi
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Tindakan jika Terkumpul Anggaran Bulanan Melebihi
-DocType: Purchase Invoice,Submit on creation,Mengemukakan kepada penciptaan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Mata wang untuk {0} mesti {1}
+DocType: Subscription,Submit on creation,Mengemukakan kepada penciptaan
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Mata wang untuk {0} mesti {1}
 DocType: Asset,Disposal Date,Tarikh pelupusan
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-mel akan dihantar kepada semua Pekerja Active syarikat itu pada jam yang diberikan, jika mereka tidak mempunyai percutian. Ringkasan jawapan akan dihantar pada tengah malam."
 DocType: Employee Leave Approver,Employee Leave Approver,Pekerja Cuti Pelulus
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Suatu catatan Reorder telah wujud untuk gudang ini {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Tidak boleh mengaku sebagai hilang, kerana Sebutharga telah dibuat."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Maklum balas latihan
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Suatu catatan Reorder telah wujud untuk gudang ini {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Tidak boleh mengaku sebagai hilang, kerana Sebutharga telah dibuat."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Maklum balas latihan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Pengeluaran Pesanan {0} hendaklah dikemukakan
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Kriteria Kad Skor Pembekal
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Sila pilih Mula Tarikh dan Tarikh Akhir untuk Perkara {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Kursus adalah wajib berturut-turut {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Setakat ini tidak boleh sebelum dari tarikh
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Tambah / Edit Harga
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Tambah / Edit Harga
 DocType: Batch,Parent Batch,Batch ibubapa
 DocType: Batch,Parent Batch,Batch ibubapa
 DocType: Cheque Print Template,Cheque Print Template,Cek Cetak Template
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Carta Pusat Kos
 DocType: Lab Test Template,Sample Collection,Pengumpulan sampel
 ,Requested Items To Be Ordered,Item yang diminta Akan Mengarahkan
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Pesanan
 DocType: Price List,Price List Name,Senarai Harga Nama
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Ringkasan Kerja Harian untuk {0}
 DocType: Employee Loan,Totals,Jumlah
@@ -4630,12 +4718,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} unit {1} diperlukan dalam {2} pada {3} {4} untuk {5} untuk melengkapkan urus niaga ini.
 DocType: Fee Schedule,Student Category,Kategori pelajar
 DocType: Announcement,Student,pelajar
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Unit organisasi (jabatan) induk.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Unit organisasi (jabatan) induk.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Pergi ke Bilik
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Sila masukkan mesej sebelum menghantar
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,PENDUA BAGI PEMBEKAL
 DocType: Email Digest,Pending Quotations,Sementara menunggu Sebutharga
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Point-of-Sale Profil
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Point-of-Sale Profil
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Konfigurasi Ujian Lab.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Pinjaman tidak bercagar
 DocType: Cost Center,Cost Center Name,Kos Nama Pusat
@@ -4645,6 +4733,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Jumlah dibayar AMT
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Mesej yang lebih besar daripada 160 aksara akan berpecah kepada berbilang mesej
 DocType: Purchase Receipt Item,Received and Accepted,Diterima dan Diterima
+DocType: Hub Settings,Company and Seller Profile,Syarikat dan Profil Penjual
 ,GST Itemised Sales Register,GST Terperinci Sales Daftar
 ,Serial No Service Contract Expiry,Serial No Kontrak Perkhidmatan tamat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Anda tidak boleh kredit dan debit akaun sama pada masa yang sama
@@ -4654,10 +4743,11 @@
 DocType: Item,Variant Based On,Based On Variant
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Jumlah wajaran yang diberikan harus 100%. Ia adalah {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Pembekal anda
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Sila betulkan
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Tidak boleh ditetapkan sebagai Kalah sebagai Sales Order dibuat.
 DocType: Request for Quotation Item,Supplier Part No,Pembekal bahagian No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Tidak dapat menolak apabila kategori adalah untuk &#39;Penilaian&#39; atau &#39;Vaulation dan Jumlah&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Pemberian
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Pemberian
 DocType: Lead,Converted,Ditukar
 DocType: Item,Has Serial No,Mempunyai No Siri
 DocType: Employee,Date of Issue,Tarikh Keluaran
@@ -4665,7 +4755,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Sebagai satu Tetapan Membeli jika Pembelian penerimaannya Diperlukan == &#39;YA&#39;, maka untuk mewujudkan Invois Belian, pengguna perlu membuat Pembelian Resit pertama bagi item {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Row # {0}: Tetapkan Pembekal untuk item {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Row {0}: Nilai Waktu mesti lebih besar daripada sifar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Laman web Image {0} melekat Perkara {1} tidak boleh didapati
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Laman web Image {0} melekat Perkara {1} tidak boleh didapati
 DocType: Issue,Content Type,Jenis kandungan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Komputer
 DocType: Item,List this Item in multiple groups on the website.,Senarai Item ini dalam pelbagai kumpulan di laman web.
@@ -4676,14 +4766,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Dapatkan belum disatukan Penyertaan
 DocType: Payment Reconciliation,From Invoice Date,Dari Invois Tarikh
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Anda tidak mempunyai kebenaran untuk menghantar
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,mata wang bil mesti sama dengan mata wang atau akaun pihak mata wang sama ada lalai comapany ini
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,mata wang bil mesti sama dengan mata wang atau akaun pihak mata wang sama ada lalai comapany ini
 DocType: Healthcare Settings,Laboratory Settings,Tetapan Makmal
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,meninggalkan Penunaian
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Apa yang ia buat?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Untuk Gudang
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Semua Kemasukan Pelajar
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Apa yang ia buat?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Untuk Gudang
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Semua Kemasukan Pelajar
 ,Average Commission Rate,Purata Kadar Suruhanjaya
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,'Punyai Nombor Siri' tidak boleh 'Ya' untuk  benda bukan stok
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,'Punyai Nombor Siri' tidak boleh 'Ya' untuk  benda bukan stok
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Pilih Status
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Kehadiran tidak boleh ditandakan untuk masa hadapan
 DocType: Pricing Rule,Pricing Rule Help,Peraturan Harga Bantuan
@@ -4701,41 +4791,41 @@
 DocType: Item,Customer Code,Kod Pelanggan
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Peringatan hari jadi untuk {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Sejak hari Perintah lepas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Debit Untuk akaun perlu menjadi akaun Kunci Kira-kira
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Debit Untuk akaun perlu menjadi akaun Kunci Kira-kira
 DocType: Buying Settings,Naming Series,Menamakan Siri
 DocType: Leave Block List,Leave Block List Name,Tinggalkan Nama Sekat Senarai
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Insurance Mula Tarikh harus kurang daripada tarikh Insurance End
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Sila persediaan Sistem Menamakan Pengajar di Sekolah&gt; Tetapan Sekolah
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Aset saham
 DocType: Timesheet,Production Detail,Detail pengeluaran
+DocType: Restaurant,Active Menu,Menu Aktif
 DocType: Target Detail,Target Qty,Sasaran Qty
 DocType: Shopping Cart Settings,Checkout Settings,Tetapan Checkout
 DocType: Attendance,Present,Hadir
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Penghantaran Nota {0} tidak boleh dikemukakan
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Penghantaran Nota {0} tidak boleh dikemukakan
 DocType: Notification Control,Sales Invoice Message,Mesej Invois Jualan
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Penutupan Akaun {0} mestilah jenis Liabiliti / Ekuiti
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Slip Gaji pekerja {0} telah dicipta untuk lembaran masa {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Slip Gaji pekerja {0} telah dicipta untuk lembaran masa {1}
 DocType: Vehicle Log,Odometer,odometer
 DocType: Sales Order Item,Ordered Qty,Mengarahkan Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Perkara {0} dilumpuhkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Perkara {0} dilumpuhkan
 DocType: Stock Settings,Stock Frozen Upto,Saham beku Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM tidak mengandungi apa-apa butiran saham
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Aktiviti projek / tugasan.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM tidak mengandungi apa-apa butiran saham
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Aktiviti projek / tugasan.
 DocType: Vehicle Log,Refuelling Details,Refuelling Butiran
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Menjana Gaji Slip
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Membeli hendaklah disemak, jika Terpakai Untuk dipilih sebagai {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Diskaun mesti kurang daripada 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Kadar pembelian seluruh dunia: terdapat
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Tulis Off Jumlah (Syarikat Mata Wang)
 DocType: Sales Invoice Timesheet,Billing Hours,Waktu Billing
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,BOM lalai untuk {0} tidak dijumpai
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Row # {0}: Sila menetapkan kuantiti pesanan semula
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM lalai untuk {0} tidak dijumpai
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Row # {0}: Sila menetapkan kuantiti pesanan semula
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Ketik item untuk menambah mereka di sini
 DocType: Fees,Program Enrollment,program Pendaftaran
 DocType: Landed Cost Voucher,Landed Cost Voucher,Baucer Kos mendarat
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Sila set {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Ulangi pada hari Bulan
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} adalah pelajar aktif
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} adalah pelajar aktif
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} adalah pelajar aktif
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} adalah pelajar aktif
 DocType: Employee,Health Details,Kesihatan Butiran
 DocType: Offer Letter,Offer Letter Terms,Tawaran Terma Surat
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Untuk membuat Permintaan Pembayaran dokumen rujukan diperlukan
@@ -4744,7 +4834,6 @@
 DocType: Employee External Work History,Salary,Gaji
 DocType: Serial No,Delivery Document Type,Penghantaran Dokumen Jenis
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Hantar semua slip gaji bagi kriteria yang dipilih di atas
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} perkara-perkara telah diselaraskan
 DocType: Sales Order,Partly Delivered,Sebahagiannya Dihantar
 DocType: Email Digest,Receivables,Penghutang
 DocType: Lead Source,Lead Source,Lead Source
@@ -4765,9 +4854,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Range Penuaan 2
 DocType: SG Creation Tool Course,Max Strength,Max Kekuatan
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM digantikan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Pilih Item berdasarkan Tarikh Penghantaran
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Pilih Item berdasarkan Tarikh Penghantaran
 ,Sales Analytics,Jualan Analytics
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Terdapat {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Terdapat {0}
 ,Prospects Engaged But Not Converted,Prospek Terlibat Tetapi Tidak Ditukar
 ,Prospects Engaged But Not Converted,Prospek Terlibat Tetapi Tidak Ditukar
 DocType: Manufacturing Settings,Manufacturing Settings,Tetapan Pembuatan
@@ -4775,10 +4864,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Bimbit
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Sila masukkan mata wang lalai dalam Syarikat Induk
 DocType: Stock Entry Detail,Stock Entry Detail,Detail saham Entry
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Peringatan Harian
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Peringatan Harian
 DocType: Products Settings,Home Page is Products,Laman Utama Produk adalah
 ,Asset Depreciation Ledger,Asset Susutnilai Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Konflik Peraturan Cukai dengan {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Konflik Peraturan Cukai dengan {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nama Akaun Baru
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Kos Bahan mentah yang dibekalkan
 DocType: Selling Settings,Settings for Selling Module,Tetapan untuk Menjual Modul
@@ -4792,8 +4881,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Perkara {0} mestilah Perkara saham
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Kerja Lalai Dalam Kemajuan Warehouse
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Tetapan lalai untuk transaksi perakaunan.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Sila sediakan Sistem Penamaan Pekerja dalam Sumber Manusia&gt; Tetapan HR
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Jangkaan Tarikh tidak boleh sebelum Bahan Permintaan Tarikh
+DocType: Restaurant,Default Tax Template,Templat Cukai Lalai
 DocType: Fees,Student Details,Butiran Pelajar
 DocType: Purchase Invoice Item,Stock Qty,saham Qty
 DocType: Purchase Invoice Item,Stock Qty,saham Qty
@@ -4812,8 +4902,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Pergi ke Item
 DocType: Sales Partner,Partner Type,Rakan Jenis
 DocType: Purchase Taxes and Charges,Actual,Sebenar
+DocType: Restaurant Menu,Restaurant Manager,Pengurus restoran
 DocType: Authorization Rule,Customerwise Discount,Customerwise Diskaun
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Timesheet untuk tugas-tugas.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Timesheet untuk tugas-tugas.
 DocType: Purchase Invoice,Against Expense Account,Terhadap Akaun Perbelanjaan
 DocType: Production Order,Production Order,Perintah Pengeluaran
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Pemasangan Nota {0} telah diserahkan
@@ -4821,7 +4912,6 @@
 DocType: Quotation Item,Against Docname,Terhadap Docname
 DocType: SMS Center,All Employee (Active),Semua Pekerja (Aktif)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Lihat Sekarang
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Pilih tempoh apabila invois akan dijana secara automatik
 DocType: BOM,Raw Material Cost,Kos bahan mentah
 DocType: Item Reorder,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Masukkan item dan qty dirancang yang mana anda mahu untuk meningkatkan pesanan pengeluaran atau memuat turun bahan-bahan mentah untuk analisis.
@@ -4834,24 +4924,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Jenis Laporan adalah wajib
 DocType: Item,Serial Number Series,Nombor Siri Siri
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Gudang adalah wajib bagi saham Perkara {0} berturut-turut {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Tambah Program
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Runcit &amp; Borong
 DocType: Issue,First Responded On,Pertama Dijawab Pada
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Penyenaraian rentas Item dalam pelbagai kumpulan
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Tahun Anggaran Tarikh Mula dan Tahun Anggaran Tarikh Tamat sudah ditetapkan dalam Tahun Anggaran {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Clearance Tarikh update
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split Batch
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Berjaya didamaikan
 DocType: Request for Quotation Supplier,Download PDF,Download PDF
 DocType: Production Order,Planned End Date,Dirancang Tarikh Akhir
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Sila masukkan Tarikh Jadual
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Di mana item disimpan.
 DocType: Request for Quotation,Supplier Detail,Detail pembekal
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Ralat dalam formula atau keadaan: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Ralat dalam formula atau keadaan: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Invois
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kriteria berat mesti menambah sehingga 100%
 DocType: Attendance,Attendance,Kehadiran
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,Item saham
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,Item saham
 DocType: BOM,Materials,Bahan
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Jika tidak disemak, senarai itu perlu ditambah kepada setiap Jabatan di mana ia perlu digunakan."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Sumber dan sasaran Warehouse tidak boleh sama
@@ -4869,6 +4959,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,Di Net Jumlah
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Nilai untuk Sifat {0} mesti berada dalam lingkungan {1} kepada {2} dalam kenaikan {3} untuk item {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Gudang sasaran berturut-turut {0} mestilah sama dengan Perintah Pengeluaran
+DocType: Restaurant Reservation,Waitlisted,Ditandati
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Mata wang tidak boleh diubah selepas membuat masukan menggunakan beberapa mata wang lain
 DocType: Vehicle Service,Clutch Plate,Plate Clutch
 DocType: Company,Round Off Account,Bundarkan Akaun
@@ -4885,7 +4976,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nama New Orang Sales
 DocType: Packing Slip,Gross Weight UOM,Berat kasar UOM
 DocType: Delivery Note Item,Against Sales Invoice,Terhadap Invois Jualan
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Sila masukkan nombor siri untuk item bersiri
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Sila masukkan nombor siri untuk item bersiri
 DocType: Bin,Reserved Qty for Production,Cipta Terpelihara Kuantiti untuk Pengeluaran
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Biarkan tak bertanda jika anda tidak mahu mempertimbangkan kumpulan semasa membuat kumpulan kursus berasaskan.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Biarkan tak bertanda jika anda tidak mahu mempertimbangkan kumpulan semasa membuat kumpulan kursus berasaskan.
@@ -4897,7 +4988,7 @@
 DocType: Lab Test,Test Group,Kumpulan Ujian
 DocType: Payment Reconciliation,Receivable / Payable Account,Belum Terima / Akaun Belum Bayar
 DocType: Delivery Note Item,Against Sales Order Item,Terhadap Sales Order Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Sila nyatakan Atribut Nilai untuk atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Sila nyatakan Atribut Nilai untuk atribut {0}
 DocType: Item,Default Warehouse,Gudang Default
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Bajet tidak boleh diberikan terhadap Akaun Kumpulan {0}
 DocType: Healthcare Settings,Patient Registration,Pendaftaran Pesakit
@@ -4927,6 +5018,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Orang Jualan
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Belanjawan dan PTJ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Pelbagai mod lalai pembayaran tidak dibenarkan
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,untuk
 ,Appointment Analytics,Pelantikan Analitis
 DocType: Vehicle Service,Half Yearly,Setengah Tahunan
 DocType: Lead,Blog Subscriber,Blog Pelanggan
@@ -4946,7 +5038,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,quot Count
 ,BOM Stock Report,Laporan Stok BOM
 DocType: Stock Reconciliation Item,Quantity Difference,kuantiti Perbezaan
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Pemprosesan Payroll
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Pemprosesan Payroll
 DocType: Opportunity Item,Basic Rate,Kadar asas
 DocType: GL Entry,Credit Amount,Jumlah Kredit
 DocType: Cheque Print Template,Signatory Position,Jawatan penandatangan
@@ -4960,12 +5052,12 @@
 DocType: Tax Rule,Tax Rule,Peraturan Cukai
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Mengekalkan Kadar Sama Sepanjang Kitaran Jualan
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Rancang log masa di luar Waktu Workstation Kerja.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Pelanggan di Giliran
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} tidak mempunyai Jadual Doktor. Tambahnya dalam tuan Doktor
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Pelanggan di Giliran
 DocType: Student,Nationality,Warganegara
 ,Items To Be Requested,Item Akan Diminta
-DocType: Purchase Order,Get Last Purchase Rate,Dapatkan lepas Kadar Pembelian
 DocType: Company,Company Info,Maklumat Syarikat
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Pilih atau menambah pelanggan baru
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Pilih atau menambah pelanggan baru
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,pusat kos diperlukan untuk menempah tuntutan perbelanjaan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Permohonan Dana (Aset)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ini adalah berdasarkan kepada kehadiran pekerja ini
@@ -4973,6 +5065,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Akaun Debit
 DocType: Fiscal Year,Year Start Date,Tahun Tarikh Mula
 DocType: Attendance,Employee Name,Nama Pekerja
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Item Masuk Kemasukan Restoran
 DocType: Sales Invoice,Rounded Total (Company Currency),Bulat Jumlah (Syarikat mata wang)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Tidak boleh Covert kepada Kumpulan kerana Jenis Akaun dipilih.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} telah diubah suai. Sila muat semula.
@@ -4983,6 +5076,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Manfaat Pekerja
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Makan kuantiti mestilah sama dengan kuantiti untuk Perkara {0} berturut-turut {1}
 DocType: Production Order,Manufactured Qty,Dikilangkan Qty
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Invois Dicipta
 DocType: Purchase Receipt Item,Accepted Quantity,Kuantiti Diterima
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Sila menetapkan lalai Senarai Holiday untuk pekerja {0} atau Syarikat {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} tidak wujud
@@ -4992,18 +5086,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Tiada {0}: Jumlah tidak boleh lebih besar daripada Pending Jumlah Perbelanjaan terhadap Tuntutan {1}. Sementara menunggu Amaun adalah {2}
 DocType: Maintenance Schedule,Schedule,Jadual
 DocType: Account,Parent Account,Akaun Ibu Bapa
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Tersedia
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Tersedia
 DocType: Quality Inspection Reading,Reading 3,Membaca 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Baucer Jenis
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Senarai Harga tidak dijumpai atau orang kurang upaya
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Senarai Harga tidak dijumpai atau orang kurang upaya
 DocType: Lab Test,Approved,Diluluskan
 DocType: Pricing Rule,Price,Harga
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',Pekerja lega pada {0} mesti ditetapkan sebagai &#39;kiri&#39;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Pekerja lega pada {0} mesti ditetapkan sebagai &#39;kiri&#39;
+DocType: Hub Settings,Last Sync On,Penyegerakan Terakhir
 DocType: Guardian,Guardian,Guardian
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Penilaian {0} dicipta untuk Pekerja {1} dalam julat tarikh yang diberikan
 DocType: Employee,Education,Pendidikan
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,del
 DocType: Selling Settings,Campaign Naming By,Menamakan Kempen Dengan
 DocType: Employee,Current Address Is,Alamat semasa
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Sasaran Jualan Bulanan (
@@ -5018,7 +5113,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Kod Kursus:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Sila masukkan Akaun Perbelanjaan
 DocType: Account,Stock,Saham
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Rujukan Dokumen Jenis mesti menjadi salah satu Purchase Order, Invois Belian atau Kemasukan Journal"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Rujukan Dokumen Jenis mesti menjadi salah satu Purchase Order, Invois Belian atau Kemasukan Journal"
 DocType: Employee,Current Address,Alamat Semasa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Jika item adalah variasi yang lain item maka penerangan, gambar, harga, cukai dan lain-lain akan ditetapkan dari template melainkan jika dinyatakan secara jelas"
 DocType: Serial No,Purchase / Manufacture Details,Pembelian / Butiran Pembuatan
@@ -5049,7 +5144,7 @@
 DocType: Hub Settings,Hub Settings,Tetapan Hub
 DocType: Project,Gross Margin %,Margin kasar%
 DocType: BOM,With Operations,Dengan Operasi
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Entri perakaunan telah dibuat dalam mata wang {0} untuk syarikat {1}. Sila pilih belum terima atau yang kena dibayar dengan mata wang {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Entri perakaunan telah dibuat dalam mata wang {0} untuk syarikat {1}. Sila pilih belum terima atau yang kena dibayar dengan mata wang {0}.
 DocType: Asset,Is Existing Asset,Adakah Aset Sedia Ada
 DocType: Salary Detail,Statistical Component,Komponen statistik
 DocType: Salary Detail,Statistical Component,Komponen statistik
@@ -5058,13 +5153,14 @@
 DocType: BOM Operation,BOM Operation,BOM Operasi
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Pada Row Jumlah Sebelumnya
 DocType: Student,Home Address,Alamat rumah
+DocType: Item,Has Expiry Date,Telah Tarikh Luput
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Tetapan Variasi Item.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,pemindahan Aset
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,pemindahan Aset
 DocType: POS Profile,POS Profile,POS Profil
 DocType: Training Event,Event Name,Nama event
 DocType: Physician,Phone (Office),Telefon (Pejabat)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,kemasukan
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Kemasukan untuk {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,kemasukan
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Kemasukan untuk {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Bermusim untuk menetapkan belanjawan, sasaran dan lain-lain"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Nama Variabel
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Perkara {0} adalah template, sila pilih salah satu daripada variannya"
@@ -5073,7 +5169,7 @@
 DocType: Assessment Plan,Room,bilik
 DocType: Purchase Order,Advance Paid,Advance Dibayar
 DocType: Item,Item Tax,Perkara Cukai
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Bahan kepada Pembekal
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Bahan kepada Pembekal
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Cukai Invois
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Ambang {0}% muncul lebih daripada sekali
 DocType: Expense Claim,Employees Email Id,Id Pekerja E-mel
@@ -5084,32 +5180,30 @@
 DocType: Program,Program Name,Nama program
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Pertimbangkan Cukai atau Caj
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Kuantiti sebenar adalah wajib
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} pada masa ini mempunyai {1} Pembekal Kad Skor Pembekal, dan Pesanan Pembelian kepada pembekal ini perlu dikeluarkan dengan berhati-hati."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} pada masa ini mempunyai {1} Pembekal Kad Skor Pembekal, dan Pesanan Pembelian kepada pembekal ini perlu dikeluarkan dengan berhati-hati."
 DocType: Employee Loan,Loan Type,Jenis pinjaman
 DocType: Scheduling Tool,Scheduling Tool,Alat penjadualan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Kad Kredit
 DocType: BOM,Item to be manufactured or repacked,Perkara yang perlu dibuat atau dibungkus semula
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Tetapan lalai bagi urus niaga saham.
-DocType: Purchase Invoice,Next Date,Tarikh seterusnya
 DocType: Employee Education,Major/Optional Subjects,Subjek utama / Pilihan
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
+DocType: Hub Settings,Suspended,Digantung
 DocType: Training Event,Attendees,hadirin
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Di sini anda boleh mengekalkan butiran keluarga seperti nama dan pekerjaan ibu bapa, suami atau isteri dan anak-anak"
 DocType: Academic Term,Term End Date,Term Tarikh Tamat
-DocType: Hub Settings,Seller Name,Nama Penjual
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Cukai dan Caj Dipotong (Syarikat mata wang)
 DocType: Item Group,General Settings,Tetapan umum
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Dari Mata Wang dan Untuk mata wang tidak boleh sama
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Tambah Jurulatih
 DocType: Stock Entry,Repack,Membungkus semula
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Anda mesti Simpan bentuk sebelum meneruskan
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Sila pilih Syarikat terlebih dahulu
 DocType: Item Attribute,Numeric Values,Nilai-nilai berangka
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Lampirkan Logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Tahap saham
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Tahap saham
 DocType: Customer,Commission Rate,Kadar komisen
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Dicipta {0} kad skor untuk {1} antara:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Membuat Varian
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Membuat Varian
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Permohonan cuti blok oleh jabatan.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Jenis bayaran mesti menjadi salah satu Menerima, Bayar dan Pindahan Dalaman"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -5124,11 +5218,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Modal Saham
 DocType: Shopping Cart Settings,Show Public Attachments,Tunjuk Lampiran Awam
 DocType: Packing Slip,Package Weight Details,Pakej Berat Butiran
+DocType: Restaurant Reservation,Reservation Time,Masa Tempahan
 DocType: Payment Gateway Account,Payment Gateway Account,Akaun Gateway Pembayaran
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Setelah selesai pembayaran mengarahkan pengguna ke halaman yang dipilih.
 DocType: Company,Existing Company,Syarikat yang sedia ada
 DocType: Healthcare Settings,Result Emailed,Keputusan Dihantar
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",Kategori cukai telah ditukar kepada &quot;Jumlah&quot; kerana semua Item adalah barang-barang tanpa saham yang
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kod Item&gt; Kumpulan Item&gt; Jenama
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Sila pilih fail csv
 DocType: Student Leave Application,Mark as Present,Tanda sebagai Sekarang
 DocType: Supplier Scorecard,Indicator Color,Warna Petunjuk
@@ -5153,11 +5249,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Buat Batch Pelajar
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Apakah Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Dapatkan Item dari BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Dapatkan Item dari BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Membawa Hari Masa
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Pos Tarikh mesti sama dengan tarikh pembelian {1} aset {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Semak ini jika Pelajar itu yang menetap di Institut Hostel.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Sila masukkan Pesanan Jualan dalam jadual di atas
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Sila masukkan Pesanan Jualan dalam jadual di atas
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Belum Menghantar Gaji Slip
 ,Stock Summary,Ringkasan Stock
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Pemindahan aset dari satu gudang yang lain
@@ -5173,5 +5269,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debit kemasukan tidak boleh dikaitkan dengan {1}
 DocType: Journal Entry,Subscription Section,Seksyen Subskrip
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Akaun {0} tidak wujud
+DocType: Training Event,Training Program,Program Latihan
 DocType: Account,Cash,Tunai
 DocType: Employee,Short biography for website and other publications.,Biografi ringkas untuk laman web dan penerbitan lain.
diff --git a/erpnext/translations/my.csv b/erpnext/translations/my.csv
index f7b6d1f..296c531 100644
--- a/erpnext/translations/my.csv
+++ b/erpnext/translations/my.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,လစာ Mode ကို
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,စာရင်း
 DocType: Patient,Divorced,ကွာရှင်း
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,ပြီးသား Sync လုပ်ထား items
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,ပစ္စည်းတစ်ခုအရောင်းအဝယ်အတွက်အကြိမ်ပေါင်းများစွာကဆက်ပြောသည်ခံရဖို့ Allow
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,ဒီအာမခံပြောဆိုချက်ကိုပယ်ဖျက်မီပစ္စည်းခရီးစဉ် {0} Cancel
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,လူသုံးကုန်ထုတ်ကုန်ပစ္စည်းများ
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,ခွင့်ပြုချက် Leave
 DocType: Sales Partner,Dealer,အရောင်းကိုယ်စားလှယ်
 DocType: Consultation,Investigations,စုံစမ်းစစ်ဆေးမှုတွေ
+DocType: Restaurant Order Entry,Click Enter To Add,Add စေရန် Enter ကိုကလစ်နှိပ်ပါ
 DocType: Employee,Rented,ငှားရမ်းထားသော
 DocType: Purchase Order,PO-,ရည်ညွှန်း
 DocType: POS Profile,Applicable for User,အသုံးပြုသူများအတွက်သက်ဆိုင်သော
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",ထုတ်လုပ်မှုအမိန့်ကိုပယ်ဖျက်ဖို့ပထမဦးဆုံးက Unstop ဖျက်သိမ်းလိုက်ရမရနိုင်ပါရပ်တန့်
 DocType: Vehicle Service,Mileage,မိုင်အကွာအဝေး
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,သင်အမှန်တကယ်ဒီပိုင်ဆိုင်မှုဖျက်သိမ်းရန်ချင်ပါသလား
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,သင်အမှန်တကယ်ဒီပိုင်ဆိုင်မှုဖျက်သိမ်းရန်ချင်ပါသလား
 DocType: Drug Prescription,Update Schedule,Update ကိုဇယား
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,ပုံမှန်ပေးသွင်းကို Select လုပ်ပါ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},ငွေကြေးစျေးနှုန်းစာရင်း {0} သည်လိုအပ်သည်
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,check ရရှိနိုင်မှု
 DocType: Job Applicant,Job Applicant,ယောဘသည်လျှောက်ထားသူ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,ဒီပေးသွင်းဆန့်ကျင်ငွေကြေးလွှဲပြောင်းမှုမှာအပေါ်အခြေခံသည်။ အသေးစိတျအဘို့ကိုအောက်တွင်အချိန်ဇယားကိုကြည့်ပါ
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,နောက်ထပ်ရလဒ်များမရှိပါ။
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,ဥပဒေကြောင်းအရ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},အမှန်တကယ် type ကိုအခွန်အတန်း {0} အတွက် Item နှုန်းကတွင်ထည့်သွင်းမရနိုင်ပါ
 DocType: Bank Guarantee,Customer,ဝယ်သူ
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),ချိန်း Rate {1} {0} အဖြစ်အတူတူဖြစ်ရမည် ({2})
 DocType: Sales Invoice,Customer Name,ဖောက်သည်အမည်
 DocType: Vehicle,Natural Gas,သဘာဝဓာတ်ငွေ့
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},ဘဏ်အကောင့် {0} အဖြစ်အမည်ရှိသောမရနိုင်ပါ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},ဘဏ်အကောင့် {0} အဖြစ်အမည်ရှိသောမရနိုင်ပါ
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ဦးခေါင်း (သို့မဟုတ်အုပ်စုများ) စာရင်းကိုင် Entries စေကြနှင့်ချိန်ခွင်ထိန်းသိမ်းထားသည့်ဆန့်ကျင်။
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),ထူးချွန် {0} သုည ({1}) ထက်နည်းမဖြစ်နိုင်
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,လစာ process မှဆွဲထုတ်လိုက်တယ်တင်သွင်းမျှရှိနေပါသည်။
 DocType: Manufacturing Settings,Default 10 mins,10 မိနစ် default
 DocType: Leave Type,Leave Type Name,Type အမည် Leave
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,ပွင့်လင်းပြရန်
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,ထပ်တလဲလဲဖော်ပြထားသောအထက်တွင်ယနေ့ကိုယ်တိုင်ကဤ action ယူရန်လိုအပ်သောကြောင့်
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,စီးရီးအောင်မြင်စွာကျင်းပပြီးစီး Updated
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,ထွက်ခွာသည်
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Submitted တိကျစွာဂျာနယ် Entry &#39;
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,ရရှိထားသည့်ခံရဖို့အမိန့်ပစ္စည်းများဝယ်ယူရန်
 DocType: SMS Center,All Supplier Contact,အားလုံးသည်ပေးသွင်းဆက်သွယ်ရန်
 DocType: Support Settings,Support Settings,ပံ့ပိုးမှုက Settings
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,မျှော်လင့်ထားသည့်အဆုံးနေ့စွဲမျှော်မှန်း Start ကိုနေ့စွဲထက်လျော့နည်းမဖွစျနိုငျ
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,မျှော်လင့်ထားသည့်အဆုံးနေ့စွဲမျှော်မှန်း Start ကိုနေ့စွဲထက်လျော့နည်းမဖွစျနိုငျ
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,row # {0}: {2} ({3} / {4}): Rate {1} အဖြစ်အတူတူသာဖြစ်ရမည်
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,နယူးထွက်ခွာလျှောက်လွှာ
 ,Batch Item Expiry Status,အသုတ်ပစ္စည်းသက်တမ်းကုန်ဆုံးအခြေအနေ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,ဘဏ်မှမူကြမ်း
 DocType: Mode of Payment Account,Mode of Payment Account,ငွေပေးချေမှုရမည့်အကောင့်၏ Mode ကို
 DocType: Consultation,Consultation,တိုင်ပင်ဆွေးနွေး
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,အရောင်းနှင့် Returns
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Show ကို Variant
 DocType: Academic Term,Academic Term,ပညာရေးဆိုင်ရာ Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,ပစ္စည်း
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ကျန်းမာရေးစောင့်ရှောက်မှု
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ငွေပေးချေမှုအတွက်နှောင့်နှေး (နေ့ရက်များ)
 DocType: Lab Prescription,Lab Prescription,Lab ကညွှန်း
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,စျေးနှုန်းအားဖြင့်စီ
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ဝန်ဆောင်မှုကုန်ကျစရိတ်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Serial Number: {0} ပြီးသားအရောင်းပြေစာအတွက်ရည်ညွှန်းသည်: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,ဝယ်ကုန်စာရင်း
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Serial Number: {0} ပြီးသားအရောင်းပြေစာအတွက်ရည်ညွှန်းသည်: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,ဝယ်ကုန်စာရင်း
 DocType: Maintenance Schedule Item,Periodicity,ကာလ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} လိုအပ်သည်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ကာကွယ်မှု
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,row # {0}:
 DocType: Timesheet,Total Costing Amount,စုစုပေါင်းကုန်ကျငွေပမာဏ
 DocType: Delivery Note,Vehicle No,မော်တော်ယာဉ်မရှိပါ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,စျေးနှုန်း List ကို select လုပ်ပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,စျေးနှုန်း List ကို select လုပ်ပါ ကျေးဇူးပြု.
 DocType: Accounts Settings,Currency Exchange Settings,ငွေကြေးလဲလှယ်ရေး Settings များ
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,အတန်း # {0}: ငွေပေးချေမှုရမည့်စာရွက်စာတမ်း trasaction ဖြည့်စွက်ရန်လိုအပ်ပါသည်
 DocType: Production Order Operation,Work In Progress,တိုးတက်မှုများတွင်အလုပ်
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,ရက်စွဲကို select လုပ်ပါကျေးဇူးပြုပြီး
 DocType: Employee,Holiday List,အားလပ်ရက်များစာရင်း
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,setup ကိုနည်းပြ&gt; ကျောင်းအတွက်ကျောင်းချိန်ညှိမှုများ System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,စာရင်းကိုင်
+DocType: Hub Settings,Selling Price List,စျေးစာရင်းရောင်းချနေ
 DocType: Patient,Tobacco Current Use,ဆေးရွက်ကြီးလက်ရှိအသုံးပြုမှု
 DocType: Cost Center,Stock User,စတော့အိတ်အသုံးပြုသူတို့၏
 DocType: Company,Phone No,Phone များမရှိပါ
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,created သင်တန်းအချိန်ဇယားများ:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},နယူး {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},နယူး {0}: # {1}
 ,Sales Partners Commission,အရောင်း Partners ကော်မရှင်
 DocType: Purchase Invoice,Rounding Adjustment,ရှာနိုင်ပါတယ်ညှိယူ
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,အတိုကောက်ကျော်ကို 5 ဇာတ်ကောင်ရှိသည်မဟုတ်နိုင်
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,မိဘ Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","ကိုးကားစရာ: {0}, Item Code ကို: {1} နှင့်ဖောက်သည်: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,ကီလိုဂရမ်
-DocType: Student Log,Log,တုံး
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,တစ်ဦးယောဘသည်အဖွင့်။
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} ရလဒ်တင်ပြသူ
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} ရလဒ်တင်ပြသူ
 DocType: Item Attribute,Increment,increment
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Timespan
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,ဂိုဒေါင်ကိုရွေးပါ ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,အိမ်ထောင်သည်
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},{0} ဘို့ခွင့်မပြု
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,အထဲကပစ္စည်းတွေကို Get
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},စတော့အိတ် Delivery မှတ်ချက် {0} ဆန့်ကျင် updated မရနိုင်ပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},စတော့အိတ် Delivery မှတ်ချက် {0} ဆန့်ကျင် updated မရနိုင်ပါ
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ကုန်ပစ္စည်း {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,ဖော်ပြထားသောအရာများမရှိပါ
 DocType: Payment Reconciliation,Reconcile,ပြန်လည်သင့်မြတ်
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,ပင်စင်ရန်ပုံငွေ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Next ကိုတန်ဖိုးနေ့စွဲဝယ်ယူနေ့စွဲမတိုင်မီမဖွစျနိုငျ
 DocType: Consultation,Consultation Date,တိုင်ပင်ဆွေးနွေးနေ့စွဲ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNext အသုံးပြုသူများအတွက်ကုန်ပစ္စည်းစာရင်းနှင့်ရှာဖွေတွေ့ရှိမှု
 DocType: SMS Center,All Sales Person,အားလုံးသည်အရောင်းပုဂ္ဂိုလ်
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** လစဉ်ဖြန့်ဖြူး ** သင်သည်သင်၏စီးပွားရေးလုပ်ငန်းမှာရာသီအလိုက်ရှိပါကသင်သည်လအတွင်းဖြတ်ပြီးဘတ်ဂျက် / Target ကဖြန့်ဝေကူညီပေးသည်။
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,မတွေ့ရှိပစ္စည်းများ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,လစာဖွဲ့စည်းပုံပျောက်ဆုံး
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,မတွေ့ရှိပစ္စည်းများ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,လစာဖွဲ့စည်းပုံပျောက်ဆုံး
 DocType: Lead,Person Name,လူတစ်ဦးအမည်
 DocType: Sales Invoice Item,Sales Invoice Item,အရောင်းပြေစာ Item
 DocType: Account,Credit,အကြွေး
 DocType: POS Profile,Write Off Cost Center,ကုန်ကျစရိတ် Center ကပိတ်ရေးထား
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",ဥပမာ &quot;မူလတန်းကျောင်း&quot; သို့မဟုတ် &quot;တက္ကသိုလ်က&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",ဥပမာ &quot;မူလတန်းကျောင်း&quot; သို့မဟုတ် &quot;တက္ကသိုလ်က&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,စတော့အိတ်အစီရင်ခံစာများ
 DocType: Warehouse,Warehouse Detail,ဂိုဒေါင် Detail
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},ခရက်ဒစ်န့်သတ်ချက် {1} / {2} {0} ဖောက်သည်များအတွက်ကူးခဲ့
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,အဆိုပါ Term အဆုံးနေ့စွဲနောက်ပိုင်းတွင်သက်တမ်း (Academic တစ်နှစ်တာ {}) နှင့်ဆက်စပ်သောမှပညာရေးဆိုင်ရာတစ်နှစ်တာ၏တစ်နှစ်တာပြီးဆုံးရက်စွဲထက်မဖွစျနိုငျသညျ။ အရက်စွဲများပြင်ဆင်ရန်နှင့်ထပ်ကြိုးစားပါ။
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","ပိုင်ဆိုင်မှုစံချိန်ပစ္စည်းဆန့်ကျင်တည်ရှိအဖြစ်, ထိနျးခြုပျမဖွစျနိုငျ &quot;Fixed Asset ရှိ၏&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","ပိုင်ဆိုင်မှုစံချိန်ပစ္စည်းဆန့်ကျင်တည်ရှိအဖြစ်, ထိနျးခြုပျမဖွစျနိုငျ &quot;Fixed Asset ရှိ၏&quot;"
 DocType: Vehicle Service,Brake Oil,ဘရိတ်ရေနံ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ဖောက်သည်&gt; ဖောက်သည် Group မှ&gt; နယ်မြေတွေကို
 DocType: Tax Rule,Tax Type,အခွန် Type အမျိုးအစား
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Taxable ငွေပမာဏ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},သင် {0} ခင် entries တွေကို add သို့မဟုတ် update ကိုမှခွင့်ပြုမထား
 DocType: BOM,Item Image (if not slideshow),item ပုံရိပ် (Slideshow မလျှင်)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,တစ်ဦးဖုန်းဆက်သူအမည်တူနှင့်အတူတည်ရှိ
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(အချိန်နာရီနှုန်း / 60) * အမှန်တကယ်စစ်ဆင်ရေးအချိန်
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,အတန်း # {0}: ကိုးကားစရာစာရွက်စာတမ်းအမျိုးအစားသုံးစွဲမှုအရေးဆိုမှုသို့မဟုတ်ဂျာနယ် Entry &#39;တစ်ဦးဖြစ်ရပါမည်
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,BOM ကို Select လုပ်ပါ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,အတန်း # {0}: ကိုးကားစရာစာရွက်စာတမ်းအမျိုးအစားသုံးစွဲမှုအရေးဆိုမှုသို့မဟုတ်ဂျာနယ် Entry &#39;တစ်ဦးဖြစ်ရပါမည်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,BOM ကို Select လုပ်ပါ
 DocType: SMS Log,SMS Log,SMS ကိုအထဲ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,ကယ်နှုတ်တော်မူ၏ပစ္စည်းများ၏ကုန်ကျစရိတ်
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} အပေါ်အားလပ်ရက်နေ့စွဲ မှစ. နှင့်နေ့စွဲစေရန်အကြားမဖြစ်
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,ဝန်ထမ်းချေးငွေ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,လုပ်ဆောင်ချက်အထဲ:
 DocType: Fee Schedule,Send Payment Request Email,ငွေပေးချေမှုရမည့်တောင်းဆိုခြင်းအီးမေးလ်ပို့ပါ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,item {0} system ကိုအတွက်မတည်ရှိပါဘူးသို့မဟုတ်သက်တမ်း
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,item {0} system ကိုအတွက်မတည်ရှိပါဘူးသို့မဟုတ်သက်တမ်း
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,အိမ်ခြံမြေရောင်းဝယ်ရေးလုပ်ငန်း
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,အကောင့်၏ထုတ်ပြန်ကြေညာချက်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ဆေးဝါးများ
@@ -210,18 +213,23 @@
 DocType: Employee,B-,ပါဘူးရှငျ
 DocType: Upload Attendance,Import Log,သွင်းကုန်အထဲ
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,အထက်ပါသတ်မှတ်ချက်ပေါ်အခြေခံပြီးအမျိုးအစားထုတ်လုပ်ခြင်း၏ပစ္စည်းတောင်းဆိုမှု Pull
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,အောင်မြင်စွာမှတ်ပုံတင်မထားတဲ့။
 DocType: Training Result Employee,Grade,grade
+DocType: Restaurant Table,No of Seats,ထိုင်ခုံ၏အဘယ်သူမျှမ
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>",ပြောင်းလဲနေသောဘာသာရပ်ထည့်ရန်တူ jinja tags များကိုသုံးပါ <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>
 DocType: Sales Invoice Item,Delivered By Supplier,ပေးသွင်းခြင်းအားဖြင့်ကယ်နှုတ်တော်မူ၏
 DocType: SMS Center,All Contact,အားလုံးသည်ဆက်သွယ်ရန်
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,ပြီးသား BOM နှင့်အတူပစ္စည်းများအားလုံးဖန်တီးထုတ်လုပ်မှုအမိန့်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,ပြီးသား BOM နှင့်အတူပစ္စည်းများအားလုံးဖန်တီးထုတ်လုပ်မှုအမိန့်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,နှစ်ပတ်လည်လစာ
 DocType: Daily Work Summary,Daily Work Summary,Daily သတင်းစာလုပ်ငန်းခွင်အကျဉ်းချုပ်
 DocType: Period Closing Voucher,Closing Fiscal Year,နိဂုံးချုပ်ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} အေးစက်နေတဲ့ဖြစ်ပါသည်
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,ငွေစာရင်းဇယားအတွက်ဖြစ်တည်မှုကုမ္ပဏီကို select လုပ်ပါကျေးဇူးပြုပြီး
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} အေးစက်နေတဲ့ဖြစ်ပါသည်
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,ငွေစာရင်းဇယားအတွက်ဖြစ်တည်မှုကုမ္ပဏီကို select လုပ်ပါကျေးဇူးပြုပြီး
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,စတော့အိတ်အသုံးစရိတ်များ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ပစ်မှတ်ဂိုဒေါင်ကို Select လုပ်ပါ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ပစ်မှတ်ဂိုဒေါင်ကို Select လုပ်ပါ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,ပစ်မှတ်ဂိုဒေါင်ကို Select လုပ်ပါ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,ပစ်မှတ်ဂိုဒေါင်ကို Select လုပ်ပါ
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,ပိုမိုနှစ်သက်ဆက်သွယ်ရန်အီးမေးလ်ရိုက်ထည့်ပေးပါ
 DocType: Program Enrollment,School Bus,ကျောင်းကား
 DocType: Journal Entry,Contra Entry,Contra Entry &#39;
@@ -238,9 +246,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Template ကို Download, သင့်လျော်သောအချက်အလက်ဖြည့်စွက်ခြင်းနှင့်ပြုပြင်ထားသောဖိုင်ပူးတွဲ။ ရွေးချယ်ထားတဲ့ကာလအတွက်အားလုံးသည်ရက်စွဲများနှင့်ဝန်ထမ်းပေါင်းစပ်လက်ရှိတက်ရောက်သူမှတ်တမ်းများနှင့်တကွ, template မှာရောက်လိမ့်မည်"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,item {0} တက်ကြွသို့မဟုတ်အသက်၏အဆုံးသည်မဖြစ်သေးရောက်ရှိခဲ့သည်
+DocType: Student Admission Program,Minimum Age,နိမ့်ဆုံးအသက်အရွယ်
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,ဥပမာ: အခြေခံပညာသင်္ချာ
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","အခွန်ကိုထည့်သွင်းရန်အတန်းအတွက် {0} Item မှုနှုန်း, အတန်း {1} အတွက်အခွန်ကိုလည်းထည့်သွင်းရပါမည်"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,HR Module သည် Settings ကို
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,HR Module သည် Settings ကို
 DocType: SMS Center,SMS Center,SMS ကို Center က
 DocType: Sales Invoice,Change Amount,ပြောင်းလဲမှုပမာဏ
 DocType: BOM Update Tool,New BOM,နယူး BOM
@@ -250,7 +259,7 @@
 DocType: Lead,Request Type,တောင်းဆိုမှုကအမျိုးအစား
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,ထမ်း Make
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,အသံလွှင့်
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,အခန်း Add
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),POS ၏ setup mode ကို (အွန်လိုင်း / အော့ဖလိုင်း)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,သတ်ခြင်း
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ထိုစစ်ဆင်ရေး၏အသေးစိတျထုတျဆောင်သွားကြ၏။
 DocType: Serial No,Maintenance Status,ပြုပြင်ထိန်းသိမ်းမှုနဲ့ Status
@@ -273,6 +282,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,စျေးနှုန်း List ကိုဝယ်ယူသို့မဟုတ်ရောင်းချသည့်အဘို့အသက်ဆိုင်သောဖြစ်ရမည်
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Installation လုပ်တဲ့နေ့စွဲ Item {0} သည်ပို့ဆောင်မှုနေ့စွဲခင်မဖွစျနိုငျ
 DocType: Pricing Rule,Discount on Price List Rate (%),စျေးနှုန်း List ကို Rate (%) အပေါ်လျှော့စျေး
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,ဇီဝဓါတုဗေဒ
 DocType: Offer Letter,Select Terms and Conditions,စည်းကမ်းသတ်မှတ်ချက်များကိုရွေးပါ
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,Value တစ်ခုအထဲက
 DocType: Production Planning Tool,Sales Orders,အရောင်းအမှာ
@@ -307,15 +317,15 @@
 DocType: Sales Partner,Reseller,Reseller
 DocType: Codification Table,Medical Code,ဆေးဘက်ဆိုင်ရာကျင့်ထုံးဥပဒေ
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","check လုပ်ထားလျှင်, ပစ္စည်းတောင်းဆိုချက်များတွင် non-စတော့ရှယ်ယာပစ္စည်းများပါဝင်တော်မူမည်။"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,ကုမ္ပဏီရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,ကုမ္ပဏီရိုက်ထည့်ပေးပါ
 DocType: Delivery Note Item,Against Sales Invoice Item,အရောင်းပြေစာ Item ဆန့်ကျင်
 ,Production Orders in Progress,တိုးတက်မှုအတွက်ထုတ်လုပ်မှုကိုအမိန့်
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,ဘဏ္ဍာရေးကနေ Net ကငွေ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage ပြည့်ဝ၏, မကယ်တင်ခဲ့"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage ပြည့်ဝ၏, မကယ်တင်ခဲ့"
 DocType: Lead,Address & Contact,လိပ်စာ &amp; ဆက်သွယ်ရန်
 DocType: Leave Allocation,Add unused leaves from previous allocations,ယခင်ခွဲတမ်းအနေဖြင့်အသုံးမပြုတဲ့အရွက် Add
 DocType: Sales Partner,Partner website,မိတ်ဖက်ဝက်ဘ်ဆိုက်
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Item Add
+DocType: Restaurant Order Entry,Add Item,Item Add
 DocType: Lab Test,Custom Result,စိတ်တိုင်းကျရလဒ်
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,ဆက်သွယ်ရန်အမည်
 DocType: Course Assessment Criteria,Course Assessment Criteria,သင်တန်းအမှတ်စဥ်အကဲဖြတ်လိုအပ်ချက်
@@ -328,7 +338,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ဝယ်ယူတောင်းဆိုခြင်း။
 DocType: Lab Test,Submitted Date,Submitted နေ့စွဲ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,ဒီစီမံကိနျးကိုဆန့်ကျင်ဖန်တီးအချိန် Sheet များအပေါ်အခြေခံသည်
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Net က Pay ကို 0 င်ထက်လျော့နည်းမဖွစျနိုငျ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Net က Pay ကို 0 င်ထက်လျော့နည်းမဖွစျနိုငျ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",စနစ်ကနေထပ်တလဲလဲအမှားအကြောင်းကြားစာများပေးပို့ခြင်းရပ်တန့်ဖို့ကျနော်တို့ကြေးပေးသွင်းအတွက်မသန်စွမ်းလယ်ကို check လုပ်ထားကြပါပြီ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,ကိုသာရွေးချယ်ထားထွက်ခွာခွင့်ပြုချက်ဒီထွက်ခွာလျှောက်လွှာတင်သွင်းနိုင်
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,နေ့စွဲ Relieving အတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,တစ်နှစ်တာနှုန်းအရွက်
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,အမြတ်အစွန်း &amp; ဆုံးရှုံးမှု
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Litre
 DocType: Task,Total Costing Amount (via Time Sheet),(အချိန်စာရွက်မှတဆင့်) စုစုပေါင်းကုန်ကျငွေပမာဏ
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,ကျောင်းသားအဖွဲ့များအောက်တွင် ကျေးဇူးပြု. setup ကိုကျောင်းသားများ
 DocType: Item Website Specification,Item Website Specification,item ဝက်ဘ်ဆိုက် Specification
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Leave Blocked
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},item {0} {1} အပေါ်အသက်၏အဆုံးရောက်ရှိခဲ့သည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},item {0} {1} အပေါ်အသက်၏အဆုံးရောက်ရှိခဲ့သည်
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,ဘဏ်မှ Entries
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,နှစ်ပတ်လည်
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေး Item
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,ကျောင်းသားအုပ်စုဖန်ဆင်းခြင်း Tool ကိုသင်တန်းအမှတ်စဥ်
 DocType: Lead,Do Not Contact,ဆက်သွယ်ရန်မ
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,သင်၏အဖွဲ့အစည်းမှာသင်ပေးတဲ့သူကလူ
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,အားလုံးထပ်တလဲလဲကုန်ပို့လွှာ tracking များအတွက်ထူးခြားသော id ။ ဒါဟာတင်ပြရန်အပေါ် generated ဖြစ်ပါတယ်။
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Software ကို Developer
 DocType: Item,Minimum Order Qty,နိမ့်ဆုံးအမိန့် Qty
 DocType: Pricing Rule,Supplier Type,ပေးသွင်း Type
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,Hub အတွက်ထုတ်ဝေ
 DocType: Student Admission,Student Admission,ကျောင်းသားသမဂ္ဂင်ခွင့်
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,item {0} ဖျက်သိမ်းလိုက်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,material တောင်းဆိုခြင်း
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,item {0} ဖျက်သိမ်းလိုက်
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,material တောင်းဆိုခြင်း
 DocType: Bank Reconciliation,Update Clearance Date,Update ကိုရှင်းလင်းရေးနေ့စွဲ
 DocType: Item,Purchase Details,အသေးစိတ်ဝယ်ယူ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},item {0} ဝယ်ယူခြင်းအမိန့် {1} အတွက် &#39;&#39; ကုန်ကြမ်းထောက်ပံ့ &#39;&#39; table ထဲမှာမတှေ့
 DocType: Patient Relation,Relation,ဆှေမြိုး
 DocType: Shipping Rule,Worldwide Shipping,Worldwide မှသဘောင်္တင်ခ
 DocType: Patient Relation,Mother,မိခင်
+DocType: Restaurant Reservation,Reservation End Time,reservation အဆုံးအချိန်
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Customer များအနေဖြင့်အတည်ပြုပြောဆိုသည်အမိန့်။
 DocType: Purchase Receipt Item,Rejected Quantity,ပယ်ချပမာဏ
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,ငွေပေးချေမှုရမည့်တောင်းဆိုမှုကို {0} created
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,ငွေပေးချေမှုရမည့်တောင်းဆိုမှုကို {0} created
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,အနိမ့်ထိခိုက်လွယ်မှု
 DocType: Notification Control,Notification Control,အမိန့်ကြော်ငြာစာထိန်းချုပ်ရေး
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,သင်သည်သင်၏လေ့ကျင့်ရေးပြီးစီးခဲ့ပါပြီတစ်ကြိမ်အတည်ပြုပေးပါ
 DocType: Lead,Suggestions,အကြံပြုချက်များ
@@ -388,7 +401,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,ထမ်းရွေးချယ်နှစ်သက်သောအီးမေးလ်ကိုအပေါ်အခြေခံပြီးန်ထမ်းရန်အီးမေးလ်များကိုလစာစလစ်
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,စာရင်းထဲတွင်ပထမဦးဆုံးထွက်ခွာခွင့်ပြုချက်ကို default ထွက်ခွာခွင့်ပြုချက်အဖြစ်သတ်မှတ်ကြလိမ့်မည်
 DocType: Tax Rule,Shipping County,သဘောင်္တင်ခတီ
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Learn
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Learn
 DocType: Asset,Next Depreciation Date,Next ကိုတန်ဖိုးနေ့စွဲ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,ထမ်းနှုန်းဖြင့်လုပ်ဆောင်ချက်ကုန်ကျစရိတ်
 DocType: Accounts Settings,Settings for Accounts,ငွေစာရင်းသည် Settings ကို
@@ -399,13 +412,13 @@
 DocType: Item,Synced With Hub,Hub နှင့်အတူ Sync လုပ်ထား
 DocType: Vehicle,Fleet Manager,ရေယာဉ်စု Manager ကို
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},အတန်း # {0}: {1} ကို item {2} ဘို့အနုတ်လက္ခဏာမဖွစျနိုငျ
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,မှားယွင်းနေ Password ကို
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,မှားယွင်းနေ Password ကို
 DocType: Item,Variant Of,အမျိုးမျိုးမူကွဲ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',ပြီးစီး Qty &#39;&#39; Qty ထုတ်လုပ်ခြင်းမှ &#39;&#39; ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Period Closing Voucher,Closing Account Head,နိဂုံးချုပ်အကောင့်ဌာနမှူး
 DocType: Employee,External Work History,ပြင်ပလုပ်ငန်းခွင်သမိုင်း
 DocType: Physician,Time per Appointment,ခန့်အပ်တာဝန်ပေးခြင်းနှုန်းအချိန်
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,မြို့ပတ်ရထားကိုးကားစရာအမှား
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,မြို့ပတ်ရထားကိုးကားစရာအမှား
 DocType: Appointment Type,Is Inpatient,အတွင်းလူနာ Is
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 အမည်
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,သင် Delivery Note ကိုကယျတငျတျောမူပါတစ်ချိန်ကစကား (ပို့ကုန်) ခုနှစ်တွင်မြင်နိုင်ပါလိမ့်မည်။
@@ -414,19 +427,18 @@
 DocType: Lead,Industry,စက်မှုလုပ်ငန်း
 DocType: Employee,Job Profile,ယောဘ၏ကိုယ်ရေးအချက်အလက်များ profile
 DocType: BOM Item,Rate & Amount,rate &amp; ငွေပမာဏ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ကျေးဇူးပြု. Setup ကို&gt; နံပါတ်စီးရီးကနေတစ်ဆင့်တက်ရောက်ဘို့ setup ကိုစာရငျးစီးရီး
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,ဒီကုမ္ပဏီဆန့်ကျင်အရောင်းအပေါ်တွင်အခြေခံထားသည်။ အသေးစိတ်အချက်အလက်များကိုအောက်ပါအချိန်ဇယားကိုကြည့်ပါ
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,အော်တိုပစ္စည်းတောင်းဆိုမှု၏ဖန်တီးမှုအပေါ်အီးမေးလ်ကိုအကြောင်းကြား
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,ခံနိုင်ရည်
 DocType: Journal Entry,Multi Currency,multi ငွေကြေးစနစ်
 DocType: Payment Reconciliation Invoice,Invoice Type,ကုန်ပို့လွှာ Type
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ဖောက်သည်&gt; ဖောက်သည် Group မှ&gt; နယ်မြေတွေကို
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Delivery မှတ်ချက်
 DocType: Consultation,Encounter Impression,တှေ့ဆုံရလဒ်ပြသမှု
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,အခွန်ကိုတည်ဆောက်ခြင်း
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,ရောင်းချပိုင်ဆိုင်မှု၏ကုန်ကျစရိတ်
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,သင်ကထွက်ခွာသွားပြီးနောက်ငွေပေးချေမှုရမည့် Entry modified သိရသည်။ တဖန်ဆွဲပေးပါ။
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} Item ခွန်အတွက်နှစ်ကြိမ်သို့ဝင်
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,ယခုရက်သတ္တပတ်များနှင့် Pend လှုပ်ရှားမှုများအကျဉ်းချုပ်
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} Item ခွန်အတွက်နှစ်ကြိမ်သို့ဝင်
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,ယခုရက်သတ္တပတ်များနှင့် Pend လှုပ်ရှားမှုများအကျဉ်းချုပ်
 DocType: Student Applicant,Admitted,ဝန်ခံ
 DocType: Workstation,Rent Cost,ငှားရန်ကုန်ကျစရိတ်
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,တန်ဖိုးပြီးနောက်ပမာဏ
@@ -441,36 +453,35 @@
 DocType: Shipping Rule,Valid for Countries,နိုင်ငံများအဘို့သက်တမ်းရှိ
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ဒါဟာ Item တစ်ခု Template နှင့်ငွေကြေးလွှဲပြောင်းမှုမှာအသုံးပြုမရနိုင်ပါ။ &#39;မ Copy ကူး&#39; &#39;ကိုသတ်မှတ်ထားမဟုတ်လျှင် item ဂုဏ်တော်များကိုမျိုးကွဲသို့ကူးကူးယူလိမ့်မည်
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,စုစုပေါင်းအမိန့်သတ်မှတ်
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","ဝန်ထမ်းသတ်မှတ်ရေး (ဥပမာ CEO ဖြစ်သူ, ဒါရိုက်တာစသည်တို့) ။"
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","ဝန်ထမ်းသတ်မှတ်ရေး (ဥပမာ CEO ဖြစ်သူ, ဒါရိုက်တာစသည်တို့) ။"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,ဖောက်သည်ငွေကြေးဖောက်သည်ရဲ့အခြေစိုက်စခန်းငွေကြေးအဖြစ်ပြောင်းလဲသောအချိန်တွင် rate
 DocType: Course Scheduling Tool,Course Scheduling Tool,သင်တန်းစီစဉ်ခြင်း Tool ကို
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},အတန်း # {0}: အရစ်ကျငွေတောင်းခံလွှာရှိပြီးသားပိုင်ဆိုင်မှု {1} ဆန့်ကျင်ရာ၌မရနိုငျ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,ထပ်တလဲလဲကို% s% များအတွက် s ကိုဖန်တီးနေချိန်တွင် [အရေးပေါ်] မှားယွင်းနေသည်
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,ထပ်တလဲလဲကို% s% များအတွက် s ကိုဖန်တီးနေချိန်တွင် [အရေးပေါ်] မှားယွင်းနေသည်
 DocType: Item Tax,Tax Rate,အခွန်နှုန်း
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ပြီးသားကာလထမ်း {1} များအတွက်ခွဲဝေ {2} {3} မှ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Item ကိုရွေးပါ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Item ကိုရွေးပါ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,ဝယ်ယူခြင်းပြေစာ {0} ပြီးသားတင်သွင်းတာဖြစ်ပါတယ်
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},row # {0}: Batch မရှိပါ {1} {2} အဖြစ်အတူတူဖြစ်ရပါမည်
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Non-Group ကမှ convert
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,တစ်ဦး Item ၏ batch (အများကြီး) ။
 DocType: C-Form Invoice Detail,Invoice Date,ကုန်ပို့လွှာနေ့စွဲ
 DocType: GL Entry,Debit Amount,debit ပမာဏ
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},သာ {0} {1} အတွက် Company မှနှုန်းနဲ့ 1 အကောင့်ကိုအဲဒီမှာရှိနိုင်ပါသည်
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,ပူးတွဲဖိုင်ကြည့်ပေးပါ
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},သာ {0} {1} အတွက် Company မှနှုန်းနဲ့ 1 အကောင့်ကိုအဲဒီမှာရှိနိုင်ပါသည်
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,ပူးတွဲဖိုင်ကြည့်ပေးပါ
 DocType: Purchase Order,% Received,% ရရှိထားသည့်
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ကျောင်းသားအဖွဲ့များ Create
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,ယခုပင်လျှင် Complete Setup ကို !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,ယခုပင်လျှင် Complete Setup ကို !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,credit မှတ်ချက်ငွေပမာဏ
 DocType: Setup Progress Action,Action Document,လှုပ်ရှားမှုစာရွက်စာတမ်း
 ,Finished Goods,လက်စသတ်ကုန်စည်
 DocType: Delivery Note,Instructions,ညွှန်ကြားချက်များ
 DocType: Quality Inspection,Inspected By,အားဖြင့်ကြည့်ရှုစစ်ဆေးသည်
 DocType: Maintenance Visit,Maintenance Type,ပြုပြင်ထိန်းသိမ်းမှု Type
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} အဆိုပါသင်တန်း {2} စာရင်းသွင်းမဟုတ်ပါ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,item Code ကို&gt; item Group မှ&gt; အမှတ်တံဆိပ်
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} အဆိုပါသင်တန်း {2} စာရင်းသွင်းမဟုတ်ပါ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},serial No {0} Delivery မှတ်ချက် {1} ပိုင်ပါဘူး
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,ပစ္စည်းများ Add
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,ပစ္စည်းများ Add
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,item အရည်အသွေးစစ်ဆေးရေး Parameter
 DocType: Leave Application,Leave Approver Name,ခွင့်ပြုချက်အမည် Leave
 DocType: Depreciation Schedule,Schedule Date,ဇယားနေ့စွဲ
@@ -492,7 +503,7 @@
 DocType: Salary Slip Timesheet,Working Hours,အလုပ်လုပ်နာရီ
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ရှိပြီးသားစီးရီး၏စတင်ကာ / လက်ရှိ sequence number ကိုပြောင်းပါ။
 DocType: Dosage Strength,Strength,ခွန်အား
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,အသစ်တစ်ခုကိုဖောက်သည် Create
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,အသစ်တစ်ခုကိုဖောက်သည် Create
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","မျိုးစုံစျေးနှုန်းများနည်းဥပဒေများနိုင်မှတည်လျှင်, အသုံးပြုသူများပဋိပက္ခဖြေရှင်းရန်ကို manually ဦးစားပေးသတ်မှတ်ဖို့တောင်းနေကြသည်။"
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,အရစ်ကျမိန့် Create
 ,Purchase Register,မှတ်ပုံတင်မည်ဝယ်ယူ
@@ -511,7 +522,7 @@
 DocType: Lab Test Template,Single,တခုတည်းသော
 DocType: Salary Slip,Total Loan Repayment,စုစုပေါင်းချေးငွေပြန်ဆပ်
 DocType: Account,Cost of Goods Sold,ရောင်းချကုန်စည်၏ကုန်ကျစရိတ်
-DocType: Purchase Invoice,Yearly,နှစ်အလိုက်
+DocType: Subscription,Yearly,နှစ်အလိုက်
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,ကုန်ကျစရိတ် Center ကရိုက်ထည့်ပေးပါ
 DocType: Drug Prescription,Dosage,ဆေးတခါသောက်
 DocType: Journal Entry Account,Sales Order,အရောင်းအမှာစာ
@@ -542,7 +553,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,အားလုံးထုတ်လုပ်မှုလုပ်ငန်းစဉ်များသည်ကမ္ဘာလုံးဆိုင်ရာ setting ကို။
 DocType: Accounts Settings,Accounts Frozen Upto,Frozen ထိအကောင့်
 DocType: SMS Log,Sent On,တွင် Sent
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,attribute {0} Attribute တွေကစားပွဲတင်အတွက်အကြိမ်ပေါင်းများစွာကိုရှေးခယျြ
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,attribute {0} Attribute တွေကစားပွဲတင်အတွက်အကြိမ်ပေါင်းများစွာကိုရှေးခယျြ
 DocType: HR Settings,Employee record is created using selected field. ,ဝန်ထမ်းစံချိန်ရွေးချယ်ထားသောလယ်ကို အသုံးပြု. နေသူများကဖန်တီး။
 DocType: Sales Order,Not Applicable,မသက်ဆိုင်ပါ
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,အားလပ်ရက်မာစတာ။
@@ -568,13 +579,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ခွဲဝေ Total ကုမ္ပဏီအရွက်မဖြစ်မနေဖြစ်ပါသည်
 DocType: Patient,AB Positive,AB အပြုသဘောဆောင်သော
 DocType: Job Opening,Description of a Job Opening,တစ်ဦးယောဘဖွင့်ပွဲ၏ဖော်ပြချက်များ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,ယနေ့ဆိုင်းငံ့ထားလှုပ်ရှားမှုများ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,ယနေ့ဆိုင်းငံ့ထားလှုပ်ရှားမှုများ
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,တက်ရောက်သူစံချိန်တင်။
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet အခြေစိုက်လုပ်ခလစာများအတွက်လစာစိတျအပိုငျး။
 DocType: Sales Order Item,Used for Production Plan,ထုတ်လုပ်ရေးစီမံကိန်းအတွက်အသုံးပြု
 DocType: Employee Loan,Total Payment,စုစုပေါင်းငွေပေးချေမှုရမည့်
 DocType: Manufacturing Settings,Time Between Operations (in mins),(မိနစ်အတွက်) Operations အကြားတွင်အချိန်
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,လုပ်ဆောင်ချက်ပြီးစီးမရနိုင်ဒါကြောင့် {0} {1} ဖျက်သိမ်းနေသည်
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,လုပ်ဆောင်ချက်ပြီးစီးမရနိုင်ဒါကြောင့် {0} {1} ဖျက်သိမ်းနေသည်
 DocType: Customer,Buyer of Goods and Services.,ကုန်စည်နှင့်ဝန်ဆောင်မှုများ၏ဝယ်သောသူ။
 DocType: Journal Entry,Accounts Payable,ပေးရန်ရှိသောစာရင်း
 DocType: Patient,Allergies,အာရုံများကိုထိခိုက်လွယ်ခြင်း
@@ -586,23 +597,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,အရစ်ကျမိန့်သတိပေး
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,သင့်ရဲ့ဖောက်သည်၏အနည်းငယ်စာရင်း။ သူတို့ဟာအဖွဲ့အစည်းများသို့မဟုတ်လူပုဂ္ဂိုလ်တစ်ဦးချင်းဖြစ်နိုင်ပါတယ်။
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Build ဖို့လုံလောက်တဲ့အစိတ်အပိုင်းများ
+DocType: POS Profile User,POS Profile User,POS ကိုယ်ရေးဖိုင်အသုံးပြုသူ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,တိုက်ရိုက်ဝင်ငွေခွန်
 DocType: Patient Appointment,Date TIme,ရက်စွဲအချိန်
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","အကောင့်အားဖြင့်အုပ်စုဖွဲ့လျှင်, အကောင့်ပေါ်မှာအခြေခံပြီး filter နိုင်ဘူး"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,စီမံခန့်ခွဲရေးဆိုင်ရာအရာရှိချုပ်
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,သင်တန်းကို select ပေးပါ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,သင်တန်းကို select ပေးပါ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,သင်တန်းကို select ပေးပါ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,သင်တန်းကို select ပေးပါ
 DocType: Codification Table,Codification Table,Codification ဇယား
 DocType: Timesheet Detail,Hrs,နာရီ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,ကုမ္ပဏီကို select ကျေးဇူးပြု.
 DocType: Stock Entry Detail,Difference Account,ခြားနားချက်အကောင့်
 DocType: Purchase Invoice,Supplier GSTIN,ပေးသွင်း GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,၎င်း၏မှီခိုအလုပ်တစ်ခုကို {0} တံခါးပိတ်မဟုတ်ပါအဖြစ်အနီးကပ်အလုပ်တစ်ခုကိုမနိုင်သလား။
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,ဂိုဒေါင်ပစ္စည်းတောင်းဆိုမှုမွောကျလိမျ့မညျအရာအဘို့အရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,၎င်း၏မှီခိုအလုပ်တစ်ခုကို {0} တံခါးပိတ်မဟုတ်ပါအဖြစ်အနီးကပ်အလုပ်တစ်ခုကိုမနိုင်သလား။
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,ဂိုဒေါင်ပစ္စည်းတောင်းဆိုမှုမွောကျလိမျ့မညျအရာအဘို့အရိုက်ထည့်ပေးပါ
 DocType: Production Order,Additional Operating Cost,နောက်ထပ် Operating ကုန်ကျစရိတ်
 DocType: Lab Test Template,Lab Routine,Lab ကပုံမှန်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,အလှကုန်
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","ပေါင်းစည်းဖို့, အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးပစ္စည်းများသည်အတူတူပင်ဖြစ်ရပါမည်"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","ပေါင်းစည်းဖို့, အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးပစ္စည်းများသည်အတူတူပင်ဖြစ်ရပါမည်"
 DocType: Shipping Rule,Net Weight,အသားတင်အလေးချိန်
 DocType: Employee,Emergency Phone,အရေးပေါ်ဖုန်း
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,ယ်ယူရန်
@@ -613,7 +625,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Threshold 0% များအတွက်တန်းသတ်မှတ်ပေးပါ
 DocType: Sales Order,To Deliver,လှတျတျောမူရန်
 DocType: Purchase Invoice Item,Item,အချက်
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,serial မရှိ item ကိုတစ်အစိတ်အပိုင်းမဖွစျနိုငျ
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,high sensitivity
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,serial မရှိ item ကိုတစ်အစိတ်အပိုင်းမဖွစျနိုငျ
 DocType: Journal Entry,Difference (Dr - Cr),ခြားနားချက် (ဒေါက်တာ - Cr)
 DocType: Account,Profit and Loss,အမြတ်နှင့်အရှုံး
 DocType: Patient,Risk Factors,စွန့်စားမှုအချက်များ
@@ -622,7 +635,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,စီမံခန့်ခွဲ Subcontracting
 DocType: Vital Signs,Body Temperature,ခန္ဓာကိုယ်အပူချိန်
 DocType: Project,Project will be accessible on the website to these users,စီမံကိန်းကဤသည်အသုံးပြုသူများမှ website တွင်ဝင်ရောက်ဖြစ်လိမ့်မည်
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,စီမံကိန်းအမျိုးအစားသတ်မှတ်။
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,စီမံကိန်းအမျိုးအစားသတ်မှတ်။
 DocType: Supplier Scorecard,Weighting Function,တွက်ဆရာထူးအမည်
 DocType: Physician,OP Consulting Charge,OP အတိုင်ပင်ခံတာဝန်ခံ
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Setup ကိုသင့်ရဲ့
@@ -636,7 +649,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,increment 0 င်မဖွစျနိုငျ
 DocType: Production Planning Tool,Material Requirement,ပစ္စည်းလိုအပ်ချက်
 DocType: Company,Delete Company Transactions,ကုမ္ပဏီငွေကြေးကိစ္စရှင်းလင်းမှု Delete
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,ကိုးကားစရာအဘယ်သူမျှမနှင့်ကိုးကားစရာနေ့စွဲဘဏ်မှငွေပေးငွေယူဘို့မဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,ကိုးကားစရာအဘယ်သူမျှမနှင့်ကိုးကားစရာနေ့စွဲဘဏ်မှငွေပေးငွေယူဘို့မဖြစ်မနေဖြစ်ပါသည်
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ Edit ကိုအခွန်နှင့်စွပ်စွဲချက် Add
 DocType: Payment Entry Reference,Supplier Invoice No,ပေးသွင်းပြေစာမရှိ
 DocType: Territory,For reference,ကိုးကားနိုင်ရန်
@@ -644,12 +657,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","ဒါကြောင့်စတော့ရှယ်ယာငွေပေးငွေယူမှာအသုံးပြုတဲ့အတိုင်း, {0} Serial No မဖျက်နိုင်ပါ"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),(Cr) ပိတ်ပစ်
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,ဟလို
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Item Move
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Item Move
 DocType: Serial No,Warranty Period (Days),အာမခံကာလ (Days)
 DocType: Installation Note Item,Installation Note Item,Installation မှတ်ချက် Item
 DocType: Production Plan Item,Pending Qty,ဆိုင်းငံ့ထား Qty
 DocType: Budget,Ignore,ဂရုမပြု
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} တက်ကြွမဟုတ်ပါဘူး
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} တက်ကြွမဟုတ်ပါဘူး
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,ပုံနှိပ်ခြင်းအဘို့အ Setup ကိုစစ်ဆေးမှုများရှုထောင့်
 DocType: Salary Slip,Salary Slip Timesheet,လစာစလစ်ဖြတ်ပိုင်းပုံစံ Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,က sub-စာချုပ်ချုပ်ဆိုဝယ်ယူခြင်းပြေစာတွေအတွက်မဖြစ်မနေပေးသွင်းဂိုဒေါင်
@@ -658,7 +671,7 @@
 DocType: Pricing Rule,Sales Partner,အရောင်း Partner
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,အားလုံးပေးသွင်း scorecards ။
 DocType: Buying Settings,Purchase Receipt Required,ဝယ်ယူခြင်း Receipt လိုအပ်သော
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,ဖွင့်လှစ်စတော့အိတ်ဝသို့ဝင်လျှင်အဘိုးပြတ်နှုန်းမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,ဖွင့်လှစ်စတော့အိတ်ဝသို့ဝင်လျှင်အဘိုးပြတ်နှုန်းမဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,ထိုပြေစာ table ထဲမှာတွေ့ရှိမရှိပါမှတ်တမ်းများ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,ပထမဦးဆုံးကုမ္ပဏီနှင့်ပါတီ Type ကိုရွေးပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,ဘဏ္ဍာရေး / စာရင်းကိုင်တစ်နှစ်။
@@ -695,7 +708,7 @@
 DocType: Quotation,Quotation To,စျေးနှုန်းရန်
 DocType: Lead,Middle Income,အလယျပိုငျးဝင်ငွေခွန်
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),ဖွင့်ပွဲ (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,သင်ပြီးသားကိုအခြား UOM နှင့်အတူအချို့သောအရောင်းအဝယ် (s) ကိုရာ၌ခန့်ထားပြီဖြစ်သောကြောင့်ပစ္စည်းအဘို့အတိုင်း၏ default အနေနဲ့ယူနစ် {0} ကိုတိုက်ရိုက်ပြောင်းလဲသွားမရနိုင်ပါ။ သင်တစ်ဦးကွဲပြားခြားနားသောပုံမှန် UOM သုံးစွဲဖို့အသစ်တစ်ခုပစ္စည်းကိုဖန်တီးရန်လိုအပ်ပါလိမ့်မည်။
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,သင်ပြီးသားကိုအခြား UOM နှင့်အတူအချို့သောအရောင်းအဝယ် (s) ကိုရာ၌ခန့်ထားပြီဖြစ်သောကြောင့်ပစ္စည်းအဘို့အတိုင်း၏ default အနေနဲ့ယူနစ် {0} ကိုတိုက်ရိုက်ပြောင်းလဲသွားမရနိုင်ပါ။ သင်တစ်ဦးကွဲပြားခြားနားသောပုံမှန် UOM သုံးစွဲဖို့အသစ်တစ်ခုပစ္စည်းကိုဖန်တီးရန်လိုအပ်ပါလိမ့်မည်။
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,ခွဲဝေငွေပမာဏအနုတ်လက္ခဏာမဖြစ်နိုင်
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,ကုမ္ပဏီသတ်မှတ်ပေးပါ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,ကုမ္ပဏီသတ်မှတ်ပေးပါ
@@ -710,6 +723,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,ဘဏ်မှ Entry စေရန်ငွေပေးချေမှုရမည့်အကောင့်ကို Select လုပ်ပါ
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","အရွက်, စရိတ်တောင်းဆိုမှုများနှင့်လုပ်ခလစာကိုစီမံခန့်ခွဲဖို့ထမ်းမှတ်တမ်းများ Create"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,ဆေးညွှန်းကာလ
+DocType: Restaurant Reservation,Restaurant Reservation,စားသောက်ဆိုင် Reservation များ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,အဆိုပြုချက်ကို Writing
 DocType: Payment Entry Deduction,Payment Entry Deduction,ငွေပေးချေမှုရမည့် Entry ထုတ်ယူ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,နောက်ထပ်အရောင်းပုဂ္ဂိုလ် {0} တူညီသောန်ထမ်းက id နှင့်အတူတည်ရှိ
@@ -717,7 +731,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,မာစတာ
 DocType: Assessment Plan,Maximum Assessment Score,အများဆုံးအကဲဖြတ်ရမှတ်
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Update ကိုဘဏ်မှငွေသွင်းငွေထုတ်နေ့စွဲများ
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,အချိန်ခြေရာကောက်
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,အချိန်ခြေရာကောက်
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,သယ်ယူပို့ဆောင်ရေး Duplicate
 DocType: Fiscal Year Company,Fiscal Year Company,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာကုမ္ပဏီ
 DocType: Packing Slip Item,DN Detail,ဒန Detail
@@ -726,8 +740,9 @@
 DocType: Batch,Batch Description,batch ဖော်ပြချက်များ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Creating ကျောင်းသားအုပ်စုများ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Creating ကျောင်းသားအုပ်စုများ
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","ဖန်တီးမပေးချေမှု Gateway ရဲ့အကောင့်ကို, ကို manually တဦးတည်းဖန်တီးပါ။"
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","ဖန်တီးမပေးချေမှု Gateway ရဲ့အကောင့်ကို, ကို manually တဦးတည်းဖန်တီးပါ။"
 DocType: Supplier Scorecard,Per Year,တစ်နှစ်လျှင်
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,DOB နှုန်းအတိုင်းဤအစီအစဉ်ကိုအတွက်ဝန်ခံချက်များအတွက်သတ်မှတ်ချက်မပြည့်မီ
 DocType: Sales Invoice,Sales Taxes and Charges,အရောင်းအခွန်နှင့်စွပ်စွဲချက်
 DocType: Employee,Organization Profile,အစည်းအရုံးကိုယ်ရေးအချက်အလက်များ profile
 DocType: Vital Signs,Height (In Meter),(မီတာများတွင်) အမြင့်
@@ -763,7 +778,7 @@
 DocType: Student Batch Name,Batch Name,batch အမည်
 DocType: Fee Validity,Max number of visit,ခရီးစဉ်၏မက်စ်အရေအတွက်က
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet ကဖန်တီး:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},ငွေပေးချေမှုရမည့်၏ Mode ကို {0} အတွက် default အနေနဲ့ငွေသို့မဟုတ်ဘဏ်မှအကောင့်ကိုသတ်မှတ်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},ငွေပေးချေမှုရမည့်၏ Mode ကို {0} အတွက် default အနေနဲ့ငွေသို့မဟုတ်ဘဏ်မှအကောင့်ကိုသတ်မှတ်ပေးပါ
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,စာရင်းသွင်း
 DocType: GST Settings,GST Settings,GST က Settings
 DocType: Selling Settings,Customer Naming By,အားဖြင့်ဖောက်သည် Name
@@ -795,16 +810,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ကုန်ကျစရိတ်အခွန်နှင့်စွပ်စွဲချက်ဆင်းသက်
 DocType: Production Order Operation,Actual Start Time,အမှန်တကယ် Start ကိုအချိန်
 DocType: BOM Operation,Operation Time,စစ်ဆင်ရေးအချိန်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,အပြီးသတ်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,အပြီးသတ်
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,base
 DocType: Timesheet,Total Billed Hours,စုစုပေါင်းကောက်ခံခဲ့နာရီ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,ငွေပမာဏပိတ်ရေးထား
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,ငွေပမာဏပိတ်ရေးထား
 DocType: Leave Block List Allow,Allow User,အသုံးပြုသူ Allow
 DocType: Journal Entry,Bill No,ဘီလ်မရှိပါ
 DocType: Company,Gain/Loss Account on Asset Disposal,ပိုင်ဆိုင်မှုရှင်းအပေါ်အမြတ် / ပျောက်ဆုံးခြင်းအကောင့်
 DocType: Vehicle Log,Service Details,ဝန်ဆောင်မှုအသေးစိတ်
 DocType: Vehicle Log,Service Details,ဝန်ဆောင်မှုအသေးစိတ်
-DocType: Purchase Invoice,Quarterly,သုံးလတစ်ကြိမ်
+DocType: Subscription,Quarterly,သုံးလတစ်ကြိမ်
 DocType: Lab Test Template,Grouped,အုပ်စုဖွဲ့
 DocType: Selling Settings,Delivery Note Required,Delivery မှတ်ချက်လိုအပ်သော
 DocType: Bank Guarantee,Bank Guarantee Number,ဘဏ်အာမခံနံပါတ်
@@ -814,12 +829,12 @@
 DocType: Student Attendance,Student Attendance,ကျောင်းသားများကျောင်း
 DocType: Sales Invoice Timesheet,Time Sheet,အချိန်ဇယား
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush ကုန်ကြမ်းပစ္စည်းများအခြေပြုတွင်
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,ဆောင်းပါးတပုဒ်ကအသေးစိတ်ရိုက်ထည့်ပေးပါ
 DocType: Interest,Interest,စိတ်ဝင်စားမှု
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,အကြိုအရောင်း
 DocType: Purchase Receipt,Other Details,အခြားအသေးစိတ်
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,စမ်းသပ်ခြင်း Template ကို
+DocType: Restaurant Order Entry Item,Served,တာဝန်ထမ်းဆောင်
 DocType: Account,Accounts,ငွေစာရင်း
 DocType: Vehicle,Odometer Value (Last),Odometer Value ကို (နောက်ဆုံး)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,ကုန်ပစ္စည်းပေးသွင်း scorecard စံ၏ Templates ကို။
@@ -831,26 +846,28 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,ကို Preview လစာစလစ်ဖြတ်ပိုင်းပုံစံ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,အကောင့် {0} အကြိမ်ပေါင်းများစွာသို့ဝင်ခဲ့
 DocType: Account,Expenses Included In Valuation,အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်တွင်ထည့်သွင်းကုန်ကျစရိတ်
-DocType: Hub Settings,Seller City,ရောင်းချသူစီးတီး
 ,Absent Student Report,ပျက်ကွက်ကျောင်းသားအစီရင်ခံစာ
 DocType: Email Digest,Next email will be sent on:,Next ကိုအီးမေးလ်အပေါ်ကိုစလှေတျပါလိမ့်မည်:
 DocType: Offer Letter Term,Offer Letter Term,ပေးစာ Term ကိုပူဇော်
 DocType: Supplier Scorecard,Per Week,per အပတ်
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,item မျိုးကွဲရှိပါတယ်။
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,item မျိုးကွဲရှိပါတယ်။
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,စုစုပေါင်းကျောင်းသား
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,item {0} မတွေ့ရှိ
 DocType: Bin,Stock Value,စတော့အိတ် Value တစ်ခု
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,အခကြေးငွေမှတ်တမ်းများနောက်ခံနေသူများကဖန်တီးလိမ့်မည်။ မည်သည့်အမှား၏အမှု၌အ error message ကိုဇယားထဲမှာ updated လိမ့်မည်။
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,ကုမ္ပဏီ {0} မတည်ရှိပါဘူး
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} {1} မှီတိုင်အောင်အခကြေးငွေတရားဝင်မှုရှိပြီး
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} {1} မှီတိုင်အောင်အခကြေးငွေတရားဝင်မှုရှိပြီး
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,သစ်ပင်ကို Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,တစ်ယူနစ်ကိုလောင် Qty
 DocType: Serial No,Warranty Expiry Date,အာမခံသက်တမ်းကုန်ဆုံးသည့်ရက်စွဲ
 DocType: Material Request Item,Quantity and Warehouse,အရေအတွက်နှင့်ဂိုဒေါင်
+DocType: Hub Settings,Unregister,မှတ်ပုံတင်မထားသော
 DocType: Sales Invoice,Commission Rate (%),ကော်မရှင် Rate (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,အစီအစဉ်ကို select ပေးပါ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,အစီအစဉ်ကို select ပေးပါ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,အစီအစဉ်ကို select ပေးပါ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,အစီအစဉ်ကို select ပေးပါ
 DocType: Project,Estimated Cost,ခန့်မှန်းခြေကုန်ကျစရိတ်
 DocType: Purchase Order,Link to material requests,ပစ္စည်းတောင်းဆိုမှုများမှ Link ကို
+DocType: Hub Settings,Publish,ပုံနှိပ်ထုတ်ဝေ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
 DocType: Journal Entry,Credit Card Entry,Credit Card ကို Entry &#39;
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,ကုမ္ပဏီနှင့်ငွေစာရင်း
@@ -861,13 +878,12 @@
 DocType: Selling Settings,Close Opportunity After Days,နေ့ရက်များပြီးနောက်နီးကပ်အခွင့်အလမ်း
 ,Reserved,Reserved
 DocType: Purchase Order,Supply Raw Materials,supply ကုန်ကြမ်း
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,လာမယ့်ကုန်ပို့လွှာ generated လိမ့်မည်သည့်နေ့ရက်။ ဒါဟာတင်ပြရန်အပေါ် generated ဖြစ်ပါတယ်။
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,လက်ရှိပိုင်ဆိုင်မှုများ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',&#39;&#39; သင်တန်းတုံ့ပြန်ချက် &#39;&#39; ကိုနှိပ်ခြင်းအားဖြင့်လေ့ကျင့်ရေးမှသင့်ရဲ့တုံ့ပြန်ချက်ဝေမျှပြီးတော့ &#39;&#39; နယူး &#39;&#39; ကျေးဇူးပြု.
 DocType: Mode of Payment Account,Default Account,default အကောင့်
 DocType: Payment Entry,Received Amount (Company Currency),ရရှိထားသည့်ငွေပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,အခွင့်အလမ်းများခဲကနေလုပ်ပါကခဲသတ်မှတ်ရမည်
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,အခွင့်အလမ်းများခဲကနေလုပ်ပါကခဲသတ်မှတ်ရမည်
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,အပတ်စဉ်ထုတ်ပယ်သောနေ့ရက်ကိုရွေးပါ ကျေးဇူးပြု.
 DocType: Patient,O Negative,အိုအနုတ်
 DocType: Production Order Operation,Planned End Time,စီစဉ်ထားသည့်အဆုံးအချိန်
@@ -883,10 +899,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,စွမ်းအင်ဝန်ကြီးဌာန
 DocType: Opportunity,Opportunity From,မှစ. အခွင့်အလမ်း
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,လစဉ်လစာကြေငြာချက်။
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,ကုမ္ပဏီ Add
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,အတန်း {0}: {1} Serial နံပါတ်များကို Item {2} ဘို့လိုအပ်သည်။ သင် {3} ထောက်ပံ့ပေးခဲ့ကြသည်။
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,အတန်း {0}: {1} Serial နံပါတ်များကို Item {2} ဘို့လိုအပ်သည်။ သင် {3} ထောက်ပံ့ပေးခဲ့ကြသည်။
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,စားပွဲတစ်ခုကို select ပေးပါ
 DocType: BOM,Website Specifications,website သတ်မှတ်ချက်များ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} &#39;လက်ခံသူများ&#39; &#39;တစ်မမှန်ကန်တဲ့အီးမေးလ်လိပ်စာဖြစ်ပါသည်
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} &#39;လက်ခံသူများ&#39; &#39;တစ်မမှန်ကန်တဲ့အီးမေးလ်လိပ်စာဖြစ်ပါသည်
 DocType: Special Test Items,Particulars,အထူးသဖြင့်
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,ပဋိဇီဝဆေး။
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: {1} အမျိုးအစား {0} မှစ.
@@ -894,11 +910,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,row {0}: ကူးပြောင်းခြင်း Factor မသင်မနေရ
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","အကွိမျမြားစှာစျေးစည်းကမ်းများတူညီတဲ့စံနှင့်အတူတည်ရှိ, ဦးစားပေးတာဝန်ပေးဖို့ခြင်းဖြင့်ပဋိပက္ခဖြေရှင်းရန်ပါ။ စျေးစည်းကမ်းများ: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,ဒါကြောင့်အခြား BOMs နှင့်အတူဆက်စပ်အဖြစ် BOM ရပ်ဆိုင်းနိုင်သို့မဟုတ်ပယ်ဖျက်ခြင်းနိုင်ဘူး
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,ဒါကြောင့်အခြား BOMs နှင့်အတူဆက်စပ်အဖြစ် BOM ရပ်ဆိုင်းနိုင်သို့မဟုတ်ပယ်ဖျက်ခြင်းနိုင်ဘူး
 DocType: Opportunity,Maintenance,ပြုပြင်ထိန်းသိမ်းမှု
 DocType: Item Attribute Value,Item Attribute Value,item Attribute Value တစ်ခု
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,အရောင်းစည်းရုံးလှုံ့ဆော်မှုများ။
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Timesheet Make
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Timesheet Make
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -936,12 +952,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,ပထမဦးဆုံးပစ္စည်းကိုရိုက်ထည့်ပေးပါ
 DocType: Account,Liability,တာဝန်
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ပိတ်ဆို့ငွေပမာဏ Row {0} အတွက်တောင်းဆိုမှုများငွေပမာဏထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။
+DocType: Salary Detail,Do not include in total,စုစုပေါင်းမပါဝင်ပါနဲ့
 DocType: Company,Default Cost of Goods Sold Account,ကုန်စည်၏ default ကုန်ကျစရိတ်အကောင့်ရောင်းချ
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,စျေးနှုန်း List ကိုမရွေးချယ်
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,စျေးနှုန်း List ကိုမရွေးချယ်
 DocType: Employee,Family Background,မိသားစုနောက်ခံသမိုင်း
 DocType: Request for Quotation Supplier,Send Email,အီးမေးလ်ပို့ပါ
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},သတိပေးချက်: မမှန်ကန်ခြင်းနှောင်ကြိုး {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,အဘယ်သူမျှမခွင့်ပြုချက်
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},သတိပေးချက်: မမှန်ကန်ခြင်းနှောင်ကြိုး {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,အဘယ်သူမျှမခွင့်ပြုချက်
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,quote တောင်းဆိုထားသော
 DocType: Vital Signs,Heart Rate / Pulse,နှလုံးခုန်နှုန်း / Pulse
 DocType: Company,Default Bank Account,default ဘဏ်မှအကောင့်
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",ပါတီအပေါ်အခြေခံပြီး filter မှပထမဦးဆုံးပါတီ Type ကိုရွေးပါ
@@ -969,12 +987,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,item Row {idx}: {DOCTYPE} {DOCNAME} အထက် &#39;&#39; {DOCTYPE} &#39;&#39; table ထဲမှာမတည်ရှိပါဘူး
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} ပြီးသားပြီးစီးခဲ့သို့မဟုတ်ဖျက်သိမ်းလိုက်
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,အဘယ်သူမျှမတာဝန်များကို
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","အော်တိုကုန်ပို့လွှာ 05, 28 စသည်တို့ကိုဥပမာ generated လိမ့်မည်ဟူသောရက်နေ့တွင်လ၏နေ့"
 DocType: Item Variant Settings,Copy Fields to Variant,မူကွဲမှ Fields မိတ္တူ
 DocType: Asset,Opening Accumulated Depreciation,စုဆောင်းတန်ဖိုးဖွင့်လှစ်
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ရမှတ်ထက်လျော့နည်းသို့မဟုတ် 5 မှတန်းတူဖြစ်ရမည်
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program ကိုစာရငျးပေးသှငျး Tool ကို
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C-Form တွင်မှတ်တမ်းများ
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C-Form တွင်မှတ်တမ်းများ
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,ဖောက်သည်များနှင့်ပေးသွင်း
 DocType: Email Digest,Email Digest Settings,အီးမေးလ် Digest မဂ္ဂဇင်း Settings ကို
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,သင့်ရဲ့စီးပွားရေးလုပ်ငန်းများအတွက်ကျေးဇူးတင်ပါသည်
@@ -992,13 +1009,13 @@
 DocType: Request for Quotation Supplier,Quote Status,quote အခြေအနေ
 DocType: Maintenance Visit,Completion Status,ပြီးစီးနဲ့ Status
 DocType: HR Settings,Enter retirement age in years,နှစ်များတွင်အငြိမ်းစားအသက်အရွယ် Enter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target ကဂိုဒေါင်
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,ဂိုဒေါင်တစ်ခုကို select ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Target ကဂိုဒေါင်
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,ဂိုဒေါင်တစ်ခုကို select ပေးပါ
 DocType: Cheque Print Template,Starting location from left edge,ကျန်ရစ်အစွန်းကနေတည်နေရာစတင်ခြင်း
 DocType: Item,Allow over delivery or receipt upto this percent,ဒီရာခိုင်နှုန်းအထိပေးပို့သို့မဟုတ်လက်ခံရရှိကျော် Allow
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,သွင်းကုန်တက်ရောက်
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,All item အဖွဲ့များ
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,All item အဖွဲ့များ
 DocType: Process Payroll,Activity Log,လုပ်ဆောင်ချက်အထဲ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Net ကအမြတ်ခွန် / ပျောက်ဆုံးခြင်း
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,အလိုအလျှောက်ငွေကြေးလွှဲပြောင်းမှုမှာတင်သွင်းခဲ့တဲ့အပေါ်သတင်းစကား compose ။
@@ -1010,7 +1027,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,စီမံကိန်း Qty
 DocType: Sales Invoice,Payment Due Date,ငွေပေးချေမှုရမည့်ကြောင့်နေ့စွဲ
 DocType: Drug Prescription,Interval UOM,ကြားကာလ UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,item Variant {0} ပြီးသားအတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,item Variant {0} ပြီးသားအတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
+DocType: Item,Hub Publishing Details,hub ထုတ်ဝေရေးအသေးစိတ်
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;&#39; ဖွင့်ပွဲ &#39;&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,လုပ်ပါရန်ပွင့်လင်း
 DocType: Notification Control,Delivery Note Message,Delivery Note ကို Message
@@ -1030,10 +1048,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: ကုန်ကြမ်းအဓိကပစ္စည်းအဖြစ်အတူတူပင်မဖွစျနိုငျ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,အရစ်ကျငွေလက်ခံပြေစာပစ္စည်းများ table ထဲမှာစုစုပေါင်းသက်ဆိုင်သောစွပ်စွဲချက်စုစုပေါင်းအခွန်နှင့်စွပ်စွဲချက်အဖြစ်အတူတူပင်ဖြစ်ရပါမည်
 DocType: Sales Team,Incentives,မက်လုံးတွေပေးပြီး
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Hub များအတွက်မှတ်ပုံတင်မည်
 DocType: SMS Log,Requested Numbers,တောင်းဆိုထားသော Numbers
 DocType: Production Planning Tool,Only Obtain Raw Materials,ကုန်ကြမ်းကိုသာရယူ
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,စွမ်းဆောင်ရည်အကဲဖြတ်။
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","စျေးဝယ်လှည်း enabled အတိုင်း, &#39;&#39; စျေးဝယ်လှည်းများအတွက်သုံးပါ &#39;&#39; ကို Enable နှင့်စျေးဝယ်လှည်းဘို့အနည်းဆုံးအခွန်စည်းမျဉ်းရှိသင့်တယ်"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","စျေးဝယ်လှည်း enabled အတိုင်း, &#39;&#39; စျေးဝယ်လှည်းများအတွက်သုံးပါ &#39;&#39; ကို Enable နှင့်စျေးဝယ်လှည်းဘို့အနည်းဆုံးအခွန်စည်းမျဉ်းရှိသင့်တယ်"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ဒါကြောင့်ဒီငွေတောင်းခံလွှာအတွက်ကြိုတင်မဲအဖြစ်ဆွဲထုတ်ထားရမည်ဆိုပါကငွေပေးချေမှုရမည့် Entry &#39;{0} အမိန့် {1} ဆန့်ကျင်နှင့်ဆက်စပ်နေသည်, စစ်ဆေးပါ။"
 DocType: Sales Invoice Item,Stock Details,စတော့အိတ် Details ကို
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,စီမံကိန်း Value တစ်ခု
@@ -1052,12 +1071,14 @@
 DocType: Salary Slip,Working Days,အလုပ်လုပ် Days
 DocType: Serial No,Incoming Rate,incoming Rate
 DocType: Packing Slip,Gross Weight,စုစုပေါင်းအလေးချိန်
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,သင်သည်ဤစနစ်ကတည်ထောင်ထားသည့်အဘို့အသင့်ကုမ္ပဏီ၏နာမတော်။
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Hub Enable
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,သင်သည်ဤစနစ်ကတည်ထောင်ထားသည့်အဘို့အသင့်ကုမ္ပဏီ၏နာမတော်။
 DocType: HR Settings,Include holidays in Total no. of Working Days,အဘယ်သူမျှမစုစုပေါင်းအတွက်အားလပ်ရက်ပါဝင်သည်။ အလုပ်အဖွဲ့ Days ၏
 DocType: Job Applicant,Hold,ကိုင်
 DocType: Employee,Date of Joining,အတူနေ့စွဲ
 DocType: Naming Series,Update Series,Update ကိုစီးရီး
 DocType: Supplier Quotation,Is Subcontracted,Subcontracted ဖြစ်ပါတယ်
+DocType: Restaurant Table,Minimum Seating,နိမ့်ဆုံးလက်ခံ
 DocType: Item Attribute,Item Attribute Values,item Attribute တန်ဖိုးများ
 DocType: Examination Result,Examination Result,စာမေးပွဲရလဒ်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,ဝယ်ယူခြင်း Receipt
@@ -1068,13 +1089,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},စစ်ဆင်ရေး {1} သည်လာမည့် {0} လက်ထက်ကာလ၌အချိန်အပေါက်ရှာတွေ့ဖို့မအောင်မြင်ဘူး
 DocType: Production Order,Plan material for sub-assemblies,က sub-အသင်းတော်တို့အဘို့အစီအစဉ်ကိုပစ္စည်း
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,အရောင်းအပေါင်းအဖေါ်များနှင့်နယ်မြေတွေကို
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} တက်ကြွဖြစ်ရမည်
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} တက်ကြွဖြစ်ရမည်
 DocType: Journal Entry,Depreciation Entry,တန်ဖိုး Entry &#39;
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,ပထမဦးဆုံး Document အမျိုးအစားကိုရွေးချယ်ပါ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ဒီ Maintenance ခရီးစဉ်ပယ်ဖျက်မီပစ္စည်းလည်ပတ်သူ {0} Cancel
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},serial No {0} Item မှ {1} ပိုင်ပါဘူး
 DocType: Purchase Receipt Item Supplied,Required Qty,မရှိမဖြစ်တဲ့ Qty
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,လက်ရှိငွေပေးငွေယူနှင့်အတူသိုလှောင်ရုံလယ်ဂျာကူးပြောင်းမရနိုင်ပါ။
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,လက်ရှိငွေပေးငွေယူနှင့်အတူသိုလှောင်ရုံလယ်ဂျာကူးပြောင်းမရနိုင်ပါ။
 DocType: Bank Reconciliation,Total Amount,စုစုပေါင်းတန်ဘိုး
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,အင်တာနက်ထုတ်ဝေရေး
 DocType: Prescription Duration,Number,ဂဏန်း
@@ -1085,7 +1106,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,အရောင်းစျေးနှုန်းများစာရင်း
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","check လုပ်ထားပါက, ဖောက်သည်တစ်ဦးလူနာတစ်ခုသို့ဆက်စပ်, နေသူများကဖန်တီးလိမ့်မည်။ လူနာငွေတောင်းခံလွှာဒီဖောက်သည်ဆန့်ကျင်နေသူများကဖန်တီးလိမ့်မည်။ လူနာကိုစဉ်ကိုလည်းသင်ရှိပြီးသားဖောက်သည်ရွေးချယ်နိုင်ပါသည်။"
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,ပစ္စည်းများကိုတစ်ပြိုင်တည်းချိန်ကိုက်ရန် Publish
 DocType: Bank Reconciliation,Account Currency,အကောင့်ကိုငွေကြေးစနစ်
 DocType: Lab Test,Sample ID,နမူနာ ID ကို
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,ကုမ္ပဏီထဲမှာအကောင့်ပိတ် Round ကိုဖော်ပြရန် ကျေးဇူးပြု.
@@ -1094,11 +1114,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,ဝန်ထမ်း {0} တက်ကြွမဟုတ်ပါဘူးသို့မဟုတ်မတည်ရှိပါဘူး
 DocType: Fee Structure,Components,components
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Item {0} အတွက်ပိုင်ဆိုင်မှုအမျိုးအစားကိုရိုက်သွင်းပါ
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,item Variant {0} updated
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,item Variant {0} updated
 DocType: Quality Inspection Reading,Reading 6,6 Reading
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,နိုင်သလားမ {0} {1} {2} မည်သည့်အနှုတ်လက္ခဏာထူးချွန်ငွေတောင်းခံလွှာမပါဘဲ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","generated ခံရဖို့။ နှောင့်နှေးလျှင်, သင်ကိုယ်တိုင်ဒီ၏ &quot;Repeat လ၏နေ့တွင်&quot; လယ်ကိုပြောင်းလဲပစ်ရန်ရှိသည်လိမ့်မယ်"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,နိုင်သလားမ {0} {1} {2} မည်သည့်အနှုတ်လက္ခဏာထူးချွန်ငွေတောင်းခံလွှာမပါဘဲ
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ဝယ်ယူခြင်းပြေစာကြိုတင်ထုတ်
-DocType: Hub Settings,Sync Now,အခုတော့ Sync ကို
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},row {0}: Credit entry ကိုတစ် {1} နဲ့ဆက်စပ်မရနိုငျ
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,တစ်ဘဏ္ဍာရေးနှစ်အတွက်ဘတ်ဂျက် Define ။
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,ဒီ mode ကိုရွေးချယ်ထားသောအခါ default ဘဏ်မှ / ငွေအကောင့်ကိုအလိုအလျှောက် POS ပြေစာအတွက် updated လိမ့်မည်။
@@ -1110,13 +1131,13 @@
 DocType: Item,Is Purchase Item,ဝယ်ယူခြင်း Item ဖြစ်ပါတယ်
 DocType: Asset,Purchase Invoice,ဝယ်ယူခြင်းပြေစာ
 DocType: Stock Ledger Entry,Voucher Detail No,ဘောက်ချာ Detail မရှိပါ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,နယူးအရောင်းပြေစာ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,နယူးအရောင်းပြေစာ
 DocType: Stock Entry,Total Outgoing Value,စုစုပေါင်းအထွက် Value တစ်ခု
 DocType: Physician,Appointments,ချိန်း
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,နေ့စွဲနှင့်ပိတ်ရက်ဖွင့်လှစ်အတူတူဘဏ္ဍာရေးနှစ်တစ်နှစ်တာအတွင်းဖြစ်သင့်
 DocType: Lead,Request for Information,ပြန်ကြားရေးဝန်ကြီးဌာနတောင်းဆိုခြင်း
 ,LeaderBoard,LEADERBOARD
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Sync ကိုအော့ဖ်လိုင်းဖြင့်ငွေတောင်းခံလွှာ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Sync ကိုအော့ဖ်လိုင်းဖြင့်ငွေတောင်းခံလွှာ
 DocType: Payment Request,Paid,Paid
 DocType: Program Fee,Program Fee,Program ကိုလျှောက်လွှာကြေး
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1135,11 +1156,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,ဝယ်ယူခြင်းအမိန့် Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,သွယ်ဝိုက်ဝင်ငွေခွန်
 DocType: Student Attendance Tool,Student Attendance Tool,ကျောင်းသားများကျောင်း Tool ကို
+DocType: Restaurant Menu,Price List (Auto created),စျေးစာရင်း (အော်တို created)
 DocType: Cheque Print Template,Date Settings,နေ့စွဲက Settings
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,ကှဲလှဲ
 ,Company Name,ကုမ္ပဏီအမည်
 DocType: SMS Center,Total Message(s),စုစုပေါင်း Message (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,လွှဲပြောင်းသည် Item ကိုရွေးပါ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,လွှဲပြောင်းသည် Item ကိုရွေးပါ
 DocType: Purchase Invoice,Additional Discount Percentage,အပိုဆောင်းလျှော့ရာခိုင်နှုန်း
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,အားလုံးအကူအညီနဲ့ဗီဒီယိုစာရင်းကိုကြည့်ခြင်း
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,စစ်ဆေးမှုများအနည်ရာဘဏ်အကောင့်ဖွင့်ဦးခေါင်းကိုရွေးချယ်ပါ။
@@ -1157,6 +1179,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,မီတာ
 DocType: Workstation,Electricity Cost,လျှပ်စစ်မီးကုန်ကျစရိတ်
 DocType: HR Settings,Don't send Employee Birthday Reminders,န်ထမ်းမွေးနေသတိပေးချက်များမပို့ပါနဲ့
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,က Settings ကို Save
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,တောင်းဆိုထားသောထုတ်ကုန်များ
 DocType: Item,Inspection Criteria,စစ်ဆေးရေးလိုအပ်ချက်
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Transferable
 DocType: BOM Website Item,BOM Website Item,BOM ဝက်ဘ်ဆိုက် Item
@@ -1174,11 +1198,11 @@
 DocType: Journal Entry,Total Amount in Words,စကားအတွက်စုစုပေါင်းပမာဏ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,ဆိုတဲ့ error ရှိခဲ့သည်။ တစျခုဖြစ်နိုင်သည်ဟုအကြောင်းပြချက်ကိုသင်ပုံစံကယ်တင်ခြင်းသို့မရောက်ကြပြီဖြစ်နိုင်ပါတယ်။ ပြဿနာရှိနေသေးလျှင် support@erpnext.com ကိုဆက်သွယ်ပါ။
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,အကြှနျုပျ၏လှည်း
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},အမိန့် Type {0} တယောက်ဖြစ်ရပါမည်
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},အမိန့် Type {0} တယောက်ဖြစ်ရပါမည်
 DocType: Lead,Next Contact Date,Next ကိုဆက်သွယ်ရန်နေ့စွဲ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Qty ဖွင့်လှစ်
 DocType: Healthcare Settings,Appointment Reminder,ခန့်အပ်တာဝန်ပေးခြင်းသတိပေးချက်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,ပြောင်းလဲမှုပမာဏအဘို့အကောင့်ရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,ပြောင်းလဲမှုပမာဏအဘို့အကောင့်ရိုက်ထည့်ပေးပါ
 DocType: Student Batch Name,Student Batch Name,ကျောင်းသားအသုတ်လိုက်အမည်
 DocType: Consultation,Doctor,ဆရာဝန်
 DocType: Holiday List,Holiday List Name,အားလပ်ရက် List ကိုအမည်
@@ -1186,12 +1210,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,ဇယားသင်တန်းအမှတ်စဥ်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,စတော့အိတ် Options ကို
 DocType: Journal Entry Account,Expense Claim,စရိတ်တောင်းဆိုမှုများ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,သင်အမှန်တကယ်ဒီဖျက်သိမ်းပိုင်ဆိုင်မှု restore ချင်ပါသလား?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},{0} သည် Qty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,သင်အမှန်တကယ်ဒီဖျက်သိမ်းပိုင်ဆိုင်မှု restore ချင်ပါသလား?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},{0} သည် Qty
 DocType: Leave Application,Leave Application,လျှောက်လွှာ Leave
 DocType: Patient,Patient Relation,လူနာဆက်ဆံရေး
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,ဖြန့်ဝေ Tool ကို Leave
+DocType: Item,Hub Category to Publish,hub Category: Publish မှ
 DocType: Leave Block List,Leave Block List Dates,Block List ကိုနေ့ရက်များ Leave
+DocType: Sales Invoice,Billing Address GSTIN,ငွေတောင်းခံလိပ်စာ GSTIN
 DocType: Workstation,Net Hour Rate,Net ကအချိန်နာရီနှုန်း
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,ကုန်ကျစရိတ်ဝယ်ယူ Receipt ဆင်းသက်
 DocType: Company,Default Terms,default သက်မှတ်ချက်များ
@@ -1201,11 +1227,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},တစ် {0} ကိုသတ်မှတ်ပေးပါ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,အရေအတွက်သို့မဟုတ်တန်ဖိုးမျှပြောင်းလဲမှုနှင့်အတူပစ္စည်းများကိုဖယ်ရှားခဲ့သည်။
 DocType: Delivery Note,Delivery To,ရန် Delivery
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,attribute စားပွဲပေါ်မှာမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,attribute စားပွဲပေါ်မှာမဖြစ်မနေဖြစ်ပါသည်
 DocType: Production Planning Tool,Get Sales Orders,အရောင်းအမိန့် Get
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} အနုတ်လက္ခဏာမဖြစ်နိုင်
 DocType: Training Event,Self-Study,self-လေ့လာ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,လြှော့ခွငျး
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,လြှော့ခွငျး
 DocType: Asset,Total Number of Depreciations,တန်ဖိုးစုစုပေါင်းအရေအတွက်
 DocType: Sales Invoice Item,Rate With Margin,Margin အတူ rate
 DocType: Sales Invoice Item,Rate With Margin,Margin အတူ rate
@@ -1213,7 +1239,7 @@
 DocType: Task,Urgent,အမြန်လိုသော
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},{1} table ထဲမှာအတန်း {0} သည်မှန်ကန်သော Row ID ကိုသတ်မှတ်ပေးပါ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,variable ကိုရှာတွေ့ဖို့မအောင်မြင်ဘူး:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,နံပါတ်ကွက်ထဲကနေတည်းဖြတ်ရန်လယ်ကို select ပေးပါ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,နံပါတ်ကွက်ထဲကနေတည်းဖြတ်ရန်လယ်ကို select ပေးပါ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Desktop ပေါ်တွင် Go နှင့် ERPNext စတင်သုံးစွဲ
 DocType: Item,Manufacturer,လုပ်ငန်းရှင်
 DocType: Landed Cost Item,Purchase Receipt Item,ဝယ်ယူခြင်းပြေစာ Item
@@ -1244,8 +1270,8 @@
 DocType: GL Entry,Against,ဆန့်ကျင်
 DocType: Item,Default Selling Cost Center,default ရောင်းချသည့်ကုန်ကျစရိတ် Center က
 DocType: Sales Partner,Implementation Partner,အကောင်အထည်ဖော်ရေး Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,စာပို့သင်္ကေတ
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},အရောင်းအမှာစာ {0} {1} ဖြစ်ပါသည်
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,စာပို့သင်္ကေတ
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},အရောင်းအမှာစာ {0} {1} ဖြစ်ပါသည်
 DocType: Opportunity,Contact Info,Contact Info
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,စတော့အိတ် Entries ဖော်ဆောင်ရေး
 DocType: Packing Slip,Net Weight UOM,Net ကအလေးချိန် UOM
@@ -1256,6 +1282,7 @@
 DocType: Holiday List,Get Weekly Off Dates,အပတ်စဉ်ပိတ် Get နေ့ရက်များ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,အဆုံးနေ့စွဲ Start ကိုနေ့စွဲထက်လျော့နည်းမဖွစျနိုငျ
 DocType: Sales Person,Select company name first.,ပထမဦးဆုံးကုမ္ပဏီ၏နာမကိုရွေးချယ်ပါ။
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,အမြင့်မှအနိမ့်
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ကိုးကားချက်များပေးသွင်းထံမှလက်ခံရရှိခဲ့သည်။
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOM အစားထိုးမည်အပေါင်းတို့နှင့် BOMs အတွက်နောက်ဆုံးပေါ်စျေးနှုန်းကို update
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},{1} {2} | {0} မှ
@@ -1276,7 +1303,7 @@
 DocType: Program Enrollment,Transportation,သယ်ယူပို့ဆောင်ရေး
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,မှားနေသော Attribute
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} တင်သွင်းရဦးမည်
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},အရေအတွက်ထက်လျော့နည်းသို့မဟုတ် {0} တန်းတူဖြစ်ရပါမည်
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},အရေအတွက်ထက်လျော့နည်းသို့မဟုတ် {0} တန်းတူဖြစ်ရပါမည်
 DocType: SMS Center,Total Characters,စုစုပေါင်းဇာတ်ကောင်
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Item သည် BOM လယ်ပြင်၌ {0} BOM ကို select ကျေးဇူးပြု.
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form တွင်ပြေစာ Detail
@@ -1291,7 +1318,7 @@
 ,Ordered Items To Be Billed,ကြေညာတဲ့ခံရဖို့အမိန့်ထုတ်ပစ္စည်းများ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Range ထဲထဲကနေ A မျိုးမျိုးရန်ထက်လျော့နည်းဖြစ်ဖို့ရှိပါတယ်
 DocType: Global Defaults,Global Defaults,ဂလိုဘယ် Defaults ကို
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,စီမံကိန်းပူးပေါင်းဆောင်ရွက်ဖိတ်ကြားလွှာ
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,စီမံကိန်းပူးပေါင်းဆောင်ရွက်ဖိတ်ကြားလွှာ
 DocType: Salary Slip,Deductions,ဖြတ်ငွေများ
 DocType: Leave Allocation,LAL/,Lal /
 DocType: Setup Progress Action,Action Name,လှုပ်ရှားမှုအမည်
@@ -1309,13 +1336,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,အရောင်းပြေစာကြိုတင်ထုတ်
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,တောင်းဆိုရန်ဘယ်အရာမှ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},နောက်ထပ်ဘတ်ဂျက်စံချိန် &#39;&#39; {0} &#39;&#39; ပြီးသားဘဏ္ဍာရေးနှစ်များအတွက် &#39;&#39; {2} &#39;{1} ဆန့်ကျင်တည်ရှိ {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&#39;&#39; အမှန်တကယ် Start ကိုနေ့စွဲ &#39;&#39; အမှန်တကယ် End Date ကို &#39;&#39; ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&#39;&#39; အမှန်တကယ် Start ကိုနေ့စွဲ &#39;&#39; အမှန်တကယ် End Date ကို &#39;&#39; ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,စီမံခန့်ခွဲမှု
 DocType: Cheque Print Template,Payer Settings,အခွန်ထမ်းက Settings
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ဤသည်မူကွဲ၏ Item Code ကိုမှ appended လိမ့်မည်။ သင့်ရဲ့အတိုကောက် &quot;SM&quot; ဖြစ်ပြီး, ပစ္စည်း code ကို &quot;သည် T-shirt&quot; ဖြစ်ပါတယ်လျှင်ဥပမာ, ကိုမူကွဲ၏ပစ္စည်း code ကို &quot;သည် T-shirt-SM&quot; ဖြစ်လိမ့်မည်"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,သင်လစာစလစ်ဖြတ်ပိုင်းပုံစံကိုကယ်တင်တခါ (စကား) Net က Pay ကိုမြင်နိုင်ပါလိမ့်မည်။
 DocType: Purchase Invoice,Is Return,သို့ပြန်သွားသည်ဖြစ်ပါသည်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,သတိ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,သတိ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,ပြန်သွား / မြီစားမှတ်ချက်
 DocType: Price List Country,Price List Country,စျေးနှုန်းကိုစာရင်းနိုင်ငံ
 DocType: Item,UOMs,UOMs
@@ -1330,17 +1357,18 @@
 DocType: Account,Balance Sheet,ချိန်ခွင် Sheet
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Item Code ကိုအတူ Item သည်ကုန်ကျစရိတ် Center က &#39;&#39;
 DocType: Fee Validity,Valid Till,မှီတိုငျအောငျသက်တမ်းရှိ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ငွေပေးချေမှုရမည့် Mode ကို configured ကိုမရ။ အကောင့်ငွေပေးချေ၏ Mode ကိုအပေါ်သို့မဟုတ် POS Profile ကိုအပေါ်သတ်မှတ်ပြီးပါပြီဖြစ်စေ, စစ်ဆေးပါ။"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ငွေပေးချေမှုရမည့် Mode ကို configured ကိုမရ။ အကောင့်ငွေပေးချေ၏ Mode ကိုအပေါ်သို့မဟုတ် POS Profile ကိုအပေါ်သတ်မှတ်ပြီးပါပြီဖြစ်စေ, စစ်ဆေးပါ။"
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,တူညီသောပစ္စည်းကိုအကြိမ်ပေါင်းများစွာထဲသို့ဝင်ရနိုင်မှာမဟုတ်ဘူး။
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",နောက်ထပ်အကောင့်အဖွဲ့များအောက်မှာလုပ်နိုင်ပေမယ့် entries တွေကို Non-အဖွဲ့များဆန့်ကျင်စေနိုင်ပါတယ်
 DocType: Lead,Lead,ခဲ
 DocType: Email Digest,Payables,ပေးအပ်သော
 DocType: Course,Course Intro,သင်တန်းမိတ်ဆက်ခြင်း
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,စတော့အိတ် Entry &#39;{0} ကဖန်တီး
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ကျေးဇူးပြု. Setup ကို&gt; နံပါတ်စီးရီးကနေတစ်ဆင့်တက်ရောက်ဘို့ setup ကိုစာရငျးစီးရီး
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,စတော့အိတ် Entry &#39;{0} ကဖန်တီး
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,row # {0}: ငြင်းပယ် Qty ဝယ်ယူခြင်းသို့ပြန်သွားသည်ဝင်မသတ်နိုင်
 ,Purchase Order Items To Be Billed,ကြေညာတဲ့ခံရဖို့အမိန့်ပစ္စည်းများဝယ်ယူရန်
 DocType: Purchase Invoice Item,Net Rate,Net က Rate
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,ဖောက်သည်တစ်ဦးကို select ပေးပါ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,ဖောက်သည်တစ်ဦးကို select ပေးပါ
 DocType: Purchase Invoice Item,Purchase Invoice Item,ဝယ်ယူခြင်းပြေစာ Item
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,စတော့အိတ်လယ်ဂျာ Entries နှင့် GL Entries ရွေးချယ်ထားတဲ့ဝယ်ယူလက်ခံသည်ထပ်မံတင်ပို့နေကြသည်
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,item 1
@@ -1361,7 +1389,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},{1} တူညီနှင့်အတူအတန်း {0} Duplicate
 ,Trial Balance,ရုံးတင်စစ်ဆေး Balance
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} မတွေ့ရှိ
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,ဝန်ထမ်းများကိုတည်ဆောက်ခြင်း
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,ဝန်ထမ်းများကိုတည်ဆောက်ခြင်း
 DocType: Sales Order,SO-,SO-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,ပထမဦးဆုံးရှေ့ဆက်ကိုရွေးပါ ကျေးဇူးပြု.
 DocType: Employee,O-,O-
@@ -1373,12 +1401,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,view လယ်ဂျာ
 DocType: Grading Scale,Intervals,အကြား
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,အစောဆုံး
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","တစ်ဦး Item Group မှအမည်တူနှင့်အတူရှိနေတယ်, ပစ္စည်းအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းအုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","တစ်ဦး Item Group မှအမည်တူနှင့်အတူရှိနေတယ်, ပစ္စည်းအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းအုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,ကျောင်းသားသမဂ္ဂမိုဘိုင်းအမှတ်
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,ကမ္ဘာ့အရာကြွင်းလေ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,ကမ္ဘာ့အရာကြွင်းလေ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,အဆိုပါ Item {0} Batch ရှိသည်မဟုတ်နိုင်
 ,Budget Variance Report,ဘဏ္ဍာငွေအရအသုံးကှဲလှဲအစီရင်ခံစာ
 DocType: Salary Slip,Gross Pay,gross Pay ကို
+DocType: Item,Is Item from Hub,Hub ကနေပစ္စည်းဖြစ်ပါသည်
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,အတန်း {0}: Activity ကိုအမျိုးအစားမဖြစ်မနေဖြစ်ပါတယ်။
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Paid အမြတ်ဝေစု
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,လယ်ဂျာစာရင်းကိုင်
@@ -1388,8 +1417,9 @@
 DocType: Vehicle Log,Service Detail,ဝန်ဆောင်မှုအသေးစိတ်
 DocType: BOM,Item Description,item ဖော်ပြချက်များ
 DocType: Student Sibling,Student Sibling,ကျောင်းသားမောင်နှမ
-DocType: Purchase Invoice,Is Recurring,ထပ်တလဲလဲဖြစ်ပါတယ်
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,ငွေပေးချေမှုရမည့် Mode ကို
 DocType: Purchase Invoice,Supplied Items,ထောက်ပံ့ရေးပစ္စည်းများ
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},စားသောက်ဆိုင် {0} တစ်ခုတက်ကြွ menu ကိုသတ်မှတ်ပေးပါ
 DocType: Student,STUD.,လုံး။
 DocType: Production Order,Qty To Manufacture,ထုတ်လုပ်ခြင်းရန် Qty
 DocType: Email Digest,New Income,နယူးဝင်ငွေခွန်
@@ -1400,6 +1430,7 @@
 ,Student and Guardian Contact Details,ကျောင်းသားနှင့်ဂါးဒီးယန်းဆက်သွယ်ပါအသေးစိတ်
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,အတန်း {0}: ပေးသွင်းသည် {0} အီးမေးလ်လိပ်စာကအီးမေးလ်ပို့ပေးရန်လိုအပ်ပါသည်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,ယာယီဖွင့်ပွဲ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,ကြည့်ရန် Hub
 ,Employee Leave Balance,ဝန်ထမ်းထွက်ခွာ Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},အကောင့်သည်ချိန်ခွင် {0} အမြဲ {1} ဖြစ်ရမည်
 DocType: Patient Appointment,More Info,ပိုပြီး Info
@@ -1419,13 +1450,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,အရောင်းအမှာစာ {0} တရားဝင်မဟုတ်
 DocType: Supplier Scorecard,Warn for new Request for Quotations,ကိုးကားချက်များအသစ်တောင်းဆိုမှုအဘို့သတိပေး
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,အရစ်ကျအမိန့်သင်သည်သင်၏ဝယ်ယူမှုအပေါ်စီစဉ်ထားခြင်းနှင့်ဖွင့်အတိုင်းလိုက်နာကူညီ
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","စိတ်မကောင်းပါဘူး, ကုမ္ပဏီများပေါင်းစည်းမရနိုင်ပါ"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","စိတ်မကောင်းပါဘူး, ကုမ္ပဏီများပေါင်းစည်းမရနိုင်ပါ"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab ကစမ်းသပ်ဆေးညွှန်း
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",စုစုပေါင်းစာစောင် / လွှဲပြောင်းအရေအတွက် {0} ပစ္စည်းတောင်းဆိုမှုအတွက် {1} \ မေတ္တာရပ်ခံအရေအတွက် {2} Item {3} သည်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,သေးငယ်သော
 DocType: Employee,Employee Number,ဝန်ထမ်းအရေအတွက်
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},ပြီးသားအသုံးပြုမှုအတွက်အမှုအမှတ် (s) ။ Case မရှိပါ {0} ကနေကြိုးစား
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},ပြီးသားအသုံးပြုမှုအတွက်အမှုအမှတ် (s) ။ Case မရှိပါ {0} ကနေကြိုးစား
 DocType: Project,% Completed,% ပြီးစီး
 ,Invoiced Amount (Exculsive Tax),Invoiced ငွေပမာဏ (Exculsive ခွန်)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,item 2
@@ -1440,11 +1471,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,သွယ်ဝိုက်ကုန်ကျစရိတ်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,row {0}: Qty မသင်မနေရ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,လယ်ယာစိုက်ပျိုးရေး
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sync ကိုမာစတာ Data ကို
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sync ကိုမာစတာ Data ကို
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,သင့်ရဲ့ထုတ်ကုန်များသို့မဟုတ်န်ဆောင်မှုများ
 DocType: Special Test Items,Special Test Items,အထူးစမ်းသပ်ပစ္စည်းများ
 DocType: Mode of Payment,Mode of Payment,ငွေပေးချေမှုရမည့်၏ Mode ကို
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,website က Image ကိုအများသုံးတဲ့ဖိုင်သို့မဟုတ် website ကို URL ကိုဖြစ်သင့်
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,website က Image ကိုအများသုံးတဲ့ဖိုင်သို့မဟုတ် website ကို URL ကိုဖြစ်သင့်
 DocType: Student Applicant,AP,အေပီ
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,ဒါကအမြစ်ကို item အဖွဲ့နှင့်တည်းဖြတ်မရနိုင်ပါ။
@@ -1452,9 +1483,9 @@
 DocType: Vehicle,Fuel UOM,လောင်စာ UOM
 DocType: Warehouse,Warehouse Contact Info,ဂိုဒေါင် Contact Info
 DocType: Payment Entry,Write Off Difference Amount,Difference ငွေပမာဏဟာ Off ရေးထား
-DocType: Purchase Invoice,Recurring Type,ထပ်တလဲလဲ Type
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: ဤအရပ်အီးမေးလ်ပို့မပို့နိုင်မတွေ့ရှိထမ်းအီးမေးလ်,"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: ဤအရပ်အီးမေးလ်ပို့မပို့နိုင်မတွေ့ရှိထမ်းအီးမေးလ်,"
 DocType: Item,Foreign Trade Details,နိုင်ငံခြားကုန်သွယ်မှုဘဏ်အသေးစိတ်
+,Assessment Plan Status,အကဲဖြတ်အစီအစဉ်အဆင့်အတန်း
 DocType: Email Digest,Annual Income,နှစ်စဉ်ဝင်ငွေ
 DocType: Serial No,Serial No Details,serial No အသေးစိတ်ကို
 DocType: Purchase Invoice Item,Item Tax Rate,item အခွန်နှုန်း
@@ -1462,15 +1493,14 @@
 DocType: Student Group Student,Group Roll Number,Group မှ Roll နံပါတ်
 DocType: Student Group Student,Group Roll Number,Group မှ Roll နံပါတ်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} သည်ကိုသာအကြွေးအကောင့်အသစ်များ၏အခြား debit entry ကိုဆန့်ကျင်နှင့်ဆက်စပ်နိုင်
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,အားလုံး task ကိုအလေးစုစုပေါင်း 1. အညီအားလုံးစီမံကိန်းအလုပ်များကိုအလေးချိန်ညှိပေးပါရပါမည်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Delivery မှတ်ချက် {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,အားလုံး task ကိုအလေးစုစုပေါင်း 1. အညီအားလုံးစီမံကိန်းအလုပ်များကိုအလေးချိန်ညှိပေးပါရပါမည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Delivery မှတ်ချက် {0} တင်သွင်းသည်မဟုတ်
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,item {0} တစ် Sub-စာချုပ်ချုပ်ဆို Item ဖြစ်ရမည်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,မြို့တော်ပစ္စည်းများ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","စျေးနှုန်း Rule ပထမဦးဆုံး Item, Item အုပ်စုသို့မဟုတ်အမှတ်တံဆိပ်ဖြစ်နိုငျသောလယ်ပြင်၌, &#39;&#39; တွင် Apply &#39;&#39; အပေါ်အခြေခံပြီးရွေးချယ်ထားဖြစ်ပါတယ်။"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,ပထမဦးဆုံးပစ္စည်း Code ကိုသတ်မှတ်ပေးပါ
-DocType: Hub Settings,Seller Website,ရောင်းချသူဝက်ဘ်ဆိုက်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,ပထမဦးဆုံးပစ္စည်း Code ကိုသတ်မှတ်ပေးပါ
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,အရောင်းအဖွဲ့မှာသည်စုစုပေါင်းခွဲဝေရာခိုင်နှုန်းက 100 ဖြစ်သင့်
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,အရောင်းအဖွဲ့မှာသည်စုစုပေါင်းခွဲဝေရာခိုင်နှုန်းက 100 ဖြစ်သင့်
 DocType: Sales Invoice Item,Edit Description,Edit ကိုဖော်ပြချက်
 DocType: Antibiotic,Antibiotic,ရောဂါတိုက်ဖျက်ရေးဆေးဝါး
 ,Team Updates,အသင်းကိုအပ်ဒိတ်များ
@@ -1491,12 +1521,12 @@
 DocType: Purchase Invoice,Total (Company Currency),စုစုပေါင်း (ကုမ္ပဏီငွေကြေးစနစ်)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,serial number ကို {0} တစ်ကြိမ်ထက်ပိုပြီးဝသို့ဝင်
 DocType: Depreciation Schedule,Journal Entry,ဂျာနယ် Entry &#39;
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,တိုးတက်မှုအတွက် {0} ပစ္စည်းများ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,တိုးတက်မှုအတွက် {0} ပစ္စည်းများ
 DocType: Workstation,Workstation Name,Workstation နှင့်အမည်
 DocType: Grading Scale Interval,Grade Code,grade Code ကို
 DocType: POS Item Group,POS Item Group,POS ပစ္စည်းအုပ်စု
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,အီးမေးလ် Digest မဂ္ဂဇင်း:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} Item မှ {1} ပိုင်ပါဘူး
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} Item မှ {1} ပိုင်ပါဘူး
 DocType: Sales Partner,Target Distribution,Target ကဖြန့်ဖြူး
 DocType: Salary Slip,Bank Account No.,ဘဏ်မှအကောင့်အမှတ်
 DocType: Naming Series,This is the number of the last created transaction with this prefix,ဤရှေ့ဆက်အတူပြီးခဲ့သည့်နေသူများကဖန်တီးအရောင်းအဝယ်အရေအတွက်သည်
@@ -1513,10 +1543,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,စျေးနှုန်းပေးသွင်းဘို့တောင်းဆိုခြင်း
 DocType: Healthcare Settings,Registration Message,မှတ်ပုံတင်ခြင်းကို Message
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,hardware
-DocType: Sales Order,Recurring Upto,နူန်းကျော်ကျော်ထပ်တလဲလဲ
 DocType: Prescription Dosage,Prescription Dosage,ဆေးညွှန်းသောက်သုံးသော
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,တစ်ကုမ္ပဏီလီမိတက်ကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,တစ်ကုမ္ပဏီလီမိတက်ကို select ကျေးဇူးပြု.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,အခွင့်ထူးထွက်ခွာ
 DocType: Purchase Invoice,Supplier Invoice Date,ပေးသွင်းပြေစာနေ့စွဲ
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,နှုန်း
@@ -1532,10 +1561,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,အကြားတွေ့ရှိထပ်အခြေအနေများ:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,ဂျာနယ် Entry &#39;{0} ဆန့်ကျင်နေပြီအချို့သောအခြားဘောက်ချာဆန့်ကျင်ညှိယူဖြစ်ပါတယ်
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,စုစုပေါင်းအမိန့် Value တစ်ခု
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,အစာ
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,အစာ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing Range 3
 DocType: Maintenance Schedule Item,No of Visits,လည်ပတ်သူများမရှိပါ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},ကို Maintenance ဇယား {0} {1} ဆန့်ကျင်တည်ရှိ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,သငျသညျ Hub ရန်သင့်ပစ္စည်းများထုတ်ဝေရန်ချင်ပါသလား?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,စာရင်းသွင်းကျောင်းသား
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},အနီးကပ်အကောင့်ကို၏ငွေကြေး {0} ဖြစ်ရပါမည်
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},အားလုံးပန်းတိုင်သည်ရမှတ် sum 100 ဖြစ်သင့်သည်က {0} သည်
@@ -1546,9 +1576,9 @@
 DocType: Authorization Rule,Average Discount,ပျမ်းမျှအားလျှော့
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,အသုံးအဆောင်များ
-DocType: Purchase Invoice Item,Accounting,စာရင်းကိုင်
+DocType: POS Profile,Accounting,စာရင်းကိုင်
 DocType: Employee,EMP/,ဝင်းနိုင်ထွန်း /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,batch ကို item အဘို့အသုတ်ကို select ပေးပါ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,batch ကို item အဘို့အသုတ်ကို select ပေးပါ
 DocType: Asset,Depreciation Schedules,တန်ဖိုးအချိန်ဇယား
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,ပလီကေးရှင်းကာလအတွင်းပြင်ပမှာခွင့်ခွဲဝေကာလအတွင်းမဖွစျနိုငျ
 DocType: Activity Cost,Projects,စီမံကိန်းများ
@@ -1564,7 +1594,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',ခွင့်ပြုချက်နဲ့ Status &#39;&#39; Approved &#39;သို့မဟုတ်&#39; &#39;ငြင်းပယ်&#39; &#39;ရမည်
 DocType: Physician,Contacts and Address,ဆက်သွယ်ရန်နှင့်လိပ်စာ
 DocType: Purchase Invoice,Contact Person,ဆက်သွယ်ရမည့်သူ
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&#39;&#39; မျှော်မှန်း Start ကိုနေ့စွဲ &#39;&#39; မျှော်မှန်း End Date ကို &#39;&#39; ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&#39;&#39; မျှော်မှန်း Start ကိုနေ့စွဲ &#39;&#39; မျှော်မှန်း End Date ကို &#39;&#39; ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Course Scheduling Tool,Course End Date,သင်တန်းပြီးဆုံးရက်စွဲ
 DocType: Holiday List,Holidays,အားလပ်ရက်
 DocType: Sales Order Item,Planned Quantity,စီစဉ်ထားတဲ့ပမာဏ
@@ -1572,10 +1602,11 @@
 DocType: Item,Maintain Stock,စတော့အိတ်ထိန်းသိမ်းနည်း
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,ပြီးသားထုတ်လုပ်မှုအမိန့်ဖန်တီးစတော့အိတ် Entries
 DocType: Employee,Prefered Email,Preferences အီးမေးလ်
+DocType: Student Admission,Eligibility and Details,ထိုက်ခွင့်နှင့်အသေးစိတ်
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Fixed Asset အတွက်ပိုက်ကွန်ကိုပြောင်းရန်
 DocType: Leave Control Panel,Leave blank if considered for all designations,အားလုံးပုံစံတခုစဉ်းစားလျှင်အလွတ် Leave
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,&#39;&#39; အမှန်တကယ် &#39;&#39; အမျိုးအစားတာဝန်ခံအတန်းအတွက် {0} Item နှုန်းတွင်ထည့်သွင်းမရနိုင်ပါ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Datetime ကနေ
 DocType: Email Digest,For Company,ကုမ္ပဏီ
 apps/erpnext/erpnext/config/support.py +17,Communication log.,ဆက်သွယ်ရေးမှတ်တမ်း။
@@ -1583,19 +1614,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,ပေးသွင်း Scorecard အမှတ်ပေး Variable
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,ဝယ်ငွေပမာဏ
 DocType: Sales Invoice,Shipping Address Name,သဘောင်္တင်ခလိပ်စာအမည်
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,ငွေစာရင်း၏ဇယား
 DocType: Material Request,Terms and Conditions Content,စည်းကမ်းသတ်မှတ်ချက်များအကြောင်းအရာ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,100 ကိုထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
 DocType: Maintenance Visit,Unscheduled,Unscheduled
 DocType: Employee,Owned,ပိုင်ဆိုင်
 DocType: Salary Detail,Depends on Leave Without Pay,Pay ကိုမရှိရင်ထွက်ခွာအပေါ်မူတည်
 DocType: Pricing Rule,"Higher the number, higher the priority","ပိုမိုမြင့်မားသောအရေအတွက်, မြင့်ဦးစားပေး"
 ,Purchase Invoice Trends,ဝယ်ယူခြင်းပြေစာခေတ်ရေစီးကြောင်း
 DocType: Employee,Better Prospects,သာ. ကောင်း၏အလားအလာ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","အတန်း # {0}: အဆိုပါအသုတ် {1} ရှိသော {2} အရည်အတွက်ရှိပါတယ်။ ရရှိနိုင်ပါ {3} အရည်အတွက်ဟာအခြားအသုတ်ကိုရွေးချယ်ပါသို့မဟုတ်မျိုးစုံနေသည်ဟုသူများထံမှ / ကိစ္စကိုကယ်လွှတ်ခြင်းငှါ, မျိုးစုံတန်းသို့အတန်းခွဲ ကျေးဇူးပြု."
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","အတန်း # {0}: အဆိုပါအသုတ် {1} ရှိသော {2} အရည်အတွက်ရှိပါတယ်။ ရရှိနိုင်ပါ {3} အရည်အတွက်ဟာအခြားအသုတ်ကိုရွေးချယ်ပါသို့မဟုတ်မျိုးစုံနေသည်ဟုသူများထံမှ / ကိစ္စကိုကယ်လွှတ်ခြင်းငှါ, မျိုးစုံတန်းသို့အတန်းခွဲ ကျေးဇူးပြု."
 DocType: Vehicle,License Plate,လိုင်စင်ပြား
 DocType: Appraisal,Goals,ရည်မှန်းချက်များ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,POS ကိုယ်ရေးဖိုင်ကို Select လုပ်ပါ
 DocType: Warranty Claim,Warranty / AMC Status,အာမခံ / AMC နဲ့ Status
 ,Accounts Browser,Accounts ကို Browser ကို
 DocType: Payment Entry Reference,Payment Entry Reference,ငွေပေးချေမှုရမည့် Entry ကိုးကားစရာ
@@ -1613,7 +1644,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,ဝန်ထမ်းကိုယ်တော်တိုင်မှသတင်းပို့လို့မရပါဘူး။
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","အကောင့်အေးခဲသည်မှန်လျှင်, entries တွေကိုကန့်သတ်အသုံးပြုသူများမှခွင့်ပြုထားသည်။"
 DocType: Email Digest,Bank Balance,ဘဏ်ကို Balance ကို
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} များအတွက်စာရင်းကိုင် Entry: {1} သာငွေကြေးကိုအတွက်ဖန်ဆင်းနိုင်ပါသည်: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} များအတွက်စာရင်းကိုင် Entry: {1} သာငွေကြေးကိုအတွက်ဖန်ဆင်းနိုင်ပါသည်: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","ယောဘသည် profile ကို, အရည်အချင်းများနှင့်ပြည့်စသည်တို့မလိုအပ်"
 DocType: Journal Entry Account,Account Balance,အကောင့်ကို Balance
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,ငွေပေးငွေယူဘို့အခွန်နည်းဥပဒေ။
@@ -1622,8 +1653,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),စုစုပေါင်းအခွန်နှင့်စွပ်စွဲချက် (ကုမ္ပဏီငွေကြေးစနစ်)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,မပိတ်ထားသည့်ဘဏ္ဍာနှစ်ရဲ့ P &amp; L ကိုချိန်ခွင်ပြရန်
 DocType: Lab Test Template,Collection Details,ငွေကောက်ခံအသေးစိတ်
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, tabConsultation CT, ဘယ်မှာ ct.patient = `tabLab Prescription` cp &#39;&#39; {0} &#39;နှင့် cp.parent = CT ထံမှ ct.consultation_date ကိုရွေးပါ။ အမည်နှင့် cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,သဘောင်္တင်ခအကောင့်
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: အကောင့် {2} မလှုပ်မရှားဖြစ်ပါသည်
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,သင်သည်သင်၏အလုပ်စီစဉ်ကူညီအပေါ်အချိန်မကယ်မလွှတ်မှအရောင်းအမိန့် Make
@@ -1640,7 +1669,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,ထုပ်ပိုးစလစ်ဖြတ်ပိုင်းပုံစံ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Office ကိုငှား
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup ကို SMS ကို gateway ဟာ setting များ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,သွင်းကုန်မအောင်မြင်ပါ!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,သွင်းကုန်မအောင်မြင်ပါ!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,အဘယ်သူမျှမလိပ်စာသေးကဆက်ပြောသည်။
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation နှင့်အလုပ်အဖွဲ့ Hour
 DocType: Vital Signs,Blood Pressure,သွေးပေါင်ချိန်
@@ -1665,7 +1694,7 @@
 DocType: Sales Invoice,Source,အရင်းအမြစ်
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,show ကိုပိတ်ထား
 DocType: Leave Type,Is Leave Without Pay,Pay ကိုမရှိရင် Leave ဖြစ်ပါတယ်
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,ပိုင်ဆိုင်မှုအမျိုးအစား Fixed Asset ကို item များအတွက်မဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,ပိုင်ဆိုင်မှုအမျိုးအစား Fixed Asset ကို item များအတွက်မဖြစ်မနေဖြစ်ပါသည်
 DocType: Fee Validity,Fee Validity,အခကြေးငွေသက်တမ်း
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,ထိုငွေပေးချေမှုရမည့် table ထဲမှာတွေ့ရှိမရှိပါမှတ်တမ်းများ
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},ဒီ {2} {3} ဘို့ {1} နှင့်အတူ {0} ပဋိပက္ခများကို
@@ -1686,8 +1715,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,အလုပ်အမှုဆောင်ရှာရန်
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,ဦးဆောင်လမ်းပြ Create
 DocType: Maintenance Schedule,Schedules,အချိန်ဇယားများ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,POS ကိုယ်ရေးဖိုင် Point-of-Sale သုံးစွဲဖို့လိုအပ်
 DocType: Purchase Invoice Item,Net Amount,Net ကပမာဏ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,လုပ်ဆောင်ချက်ပြီးစီးမရနိုင်ဒါကြောင့် {0} {1} တင်သွင်းရသေး
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,လုပ်ဆောင်ချက်ပြီးစီးမရနိုင်ဒါကြောင့် {0} {1} တင်သွင်းရသေး
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail မရှိပါ
 DocType: Landed Cost Voucher,Additional Charges,အပိုဆောင်းစွပ်စွဲချက်
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),အပိုဆောင်းလျှော့ငွေပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
@@ -1696,7 +1726,7 @@
 ,Support Hour Distribution,ပံ့ပိုးမှုနာရီဖြန့်ဖြူး
 DocType: Maintenance Visit,Maintenance Visit,ပြုပြင်ထိန်းသိမ်းမှုခရီးစဉ်
 DocType: Student,Leaving Certificate Number,လက်မှတ်အရေအတွက်ထွက်ခွာ
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}",ခန့်အပ်တာဝန်ပေးခြင်းဖျက်သိမ်း {0} ငွေတောင်းခံလွှာကိုပြန်လည်သုံးသပ်နှင့် cancel ကျေးဇူးပြု.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}",ခန့်အပ်တာဝန်ပေးခြင်းဖျက်သိမ်း {0} ငွေတောင်းခံလွှာကိုပြန်လည်သုံးသပ်နှင့် cancel ကျေးဇူးပြု.
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,ဂိုဒေါင်ကနေရယူနိုင်ပါတယ် Batch Qty
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Update ကိုပါပုံနှိပ် Format ကို
 DocType: Landed Cost Voucher,Landed Cost Help,ကုန်ကျစရိတ်အကူအညီဆင်းသက်
@@ -1719,8 +1749,8 @@
 DocType: Patient,Tobacco Past Use,ဆေးရွက်ကြီးအတိတ်မှအသုံးပြုခြင်း
 DocType: Sales Invoice Item,Brand Name,ကုန်အမှတ်တံဆိပ်အမည်
 DocType: Purchase Receipt,Transporter Details,Transporter Details ကို
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},အသုံးပြုသူ {0} ပြီးသားဆရာဝန် {1} ဖို့တာဝန်ဖြစ်ပါတယ်
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,default ဂိုဒေါင်ရွေးချယ်ထားသောအရာအတွက်လိုအပ်သည်
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},အသုံးပြုသူ {0} ပြီးသားဆရာဝန် {1} ဖို့တာဝန်ဖြစ်ပါတယ်
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,default ဂိုဒေါင်ရွေးချယ်ထားသောအရာအတွက်လိုအပ်သည်
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,သေတ္တာ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,ဖြစ်နိုင်ပါ့မလားပေးသွင်း
 DocType: Budget,Monthly Distribution,လစဉ်ဖြန့်ဖြူး
@@ -1730,8 +1760,8 @@
 DocType: Sales Partner,Sales Partner Target,အရောင်း Partner Target က
 DocType: Loan Type,Maximum Loan Amount,အများဆုံးချေးငွေပမာဏ
 DocType: Pricing Rule,Pricing Rule,စျေးနှုန်း Rule
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},ကျောင်းသား {0} အဘို့အလိပ်အရေအတွက်က Duplicate
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},ကျောင်းသား {0} အဘို့အလိပ်အရေအတွက်က Duplicate
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},ကျောင်းသား {0} အဘို့အလိပ်အရေအတွက်က Duplicate
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},ကျောင်းသား {0} အဘို့အလိပ်အရေအတွက်က Duplicate
 DocType: Budget,Action if Annual Budget Exceeded,လှုပ်ရှားမှုနှစ်ပတ်လည်ဘတ်ဂျက်ကျော်သွားပါပြီလျှင်
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,အမိန့်ကိုဝယ်ယူအသုံးပြုမှ material တောင်းဆိုခြင်း
 DocType: Shopping Cart Settings,Payment Success URL,ငွေပေးချေမှုရမည့်အောင်မြင်မှု URL ကို
@@ -1748,7 +1778,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} တစ်ခါသာပေါ်လာရကြမည်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},ဝယ်ယူခြင်းအမိန့် {2} ဆန့်ကျင် {1} ထက် {0} ပိုပြီး tranfer ခွင့်မပြုခဲ့
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},{0} သည်အောင်မြင်စွာကျင်းပပြီးစီးခွဲဝေရွက်
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,သိမ်းဆည်းရန်ပစ္စည်းများမရှိပါ
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,သိမ်းဆည်းရန်ပစ္စည်းများမရှိပါ
 DocType: Shipping Rule Condition,From Value,Value တစ်ခုကနေ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,ကုန်ထုတ်လုပ်မှုပမာဏမသင်မနေရ
 DocType: Employee Loan,Repayment Method,ပြန်ဆပ် Method ကို
@@ -1762,6 +1792,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,စတော့အိတ်မှုစိစစ်
 DocType: Purchase Invoice,Supplier Warehouse,ပေးသွင်းဂိုဒေါင်
 DocType: Opportunity,Contact Mobile No,မိုဘိုင်းလ်မရှိဆက်သွယ်ရန်
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,ကုမ္ပဏီကိုရွေးချယ်ပါ
 ,Material Requests for which Supplier Quotations are not created,ပေးသွင်းကိုးကားချက်များကိုဖန်ဆင်းသည်မဟုတ်သော material တောင်းဆို
 DocType: Student Group,Set 0 for no limit,အဘယ်သူမျှမကန့်သတ်များအတွက် 0 င် Set
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,သငျသညျခွင့်များအတွက်လျှောက်ထားထားတဲ့နေ့ (သို့) အားလပ်ရက်ဖြစ်ကြ၏။ သငျသညျခွင့်လျှောက်ထားစရာမလိုပေ။
@@ -1771,24 +1802,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,စျေးနှုန်းလုပ်ပါ
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,အခြားအစီရင်ခံစာများ
 DocType: Dependent Task,Dependent Task,မှီခို Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},တိုင်း၏ default အနေနဲ့ယူနစ်သည်ကူးပြောင်းခြင်းအချက်အတန်းအတွက် 1 {0} ဖြစ်ရမည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},တိုင်း၏ default အနေနဲ့ယူနစ်သည်ကူးပြောင်းခြင်းအချက်အတန်းအတွက် 1 {0} ဖြစ်ရမည်
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},{0} တော့ဘူး {1} ထက်မဖွစျနိုငျအမျိုးအစား Leave
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ကြိုတင်မဲအတွက် X ကိုနေ့ရက်ကာလအဘို့စစ်ဆင်ရေးစီစဉ်ကြိုးစားပါ။
 DocType: HR Settings,Stop Birthday Reminders,မွေးနေသတိပေးချက်များကိုရပ်တန့်
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},ကုမ္ပဏီ {0} အတွက်ပုံမှန်လစာပေးချေအကောင့်ကိုသတ်မှတ်ပေးပါ
 DocType: SMS Center,Receiver List,receiver များစာရင်း
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,ရှာရန် Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,ရှာရန် Item
 DocType: Patient Appointment,Referring Physician,ရည်ညွှန်းပြီးသမား
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,စားသုံးသည့်ပမာဏ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,ငွေအတွက်ပိုက်ကွန်ကိုပြောင်းရန်
 DocType: Assessment Plan,Grading Scale,grade စကေး
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,တိုင်း {0} ၏ယူနစ်တခါကူးပြောင်းခြင်း Factor ဇယားအတွက်ထက်ပိုပြီးဝသို့ဝင်ခဲ့သည်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,ယခုပင်လျှင်ပြီးစီး
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,တိုင်း {0} ၏ယူနစ်တခါကူးပြောင်းခြင်း Factor ဇယားအတွက်ထက်ပိုပြီးဝသို့ဝင်ခဲ့သည်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,ယခုပင်လျှင်ပြီးစီး
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,လက်ခုနှစ်တွင်စတော့အိတ်
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},ငွေပေးချေမှုရမည့်တောင်းခံခြင်းပြီးသား {0} ရှိတယ်ဆိုတဲ့
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ထုတ်ပေးခြင်းပစ္စည်းများ၏ကုန်ကျစရိတ်
 DocType: Physician,Hospital,ဆေးရုံ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},အရေအတွက် {0} ထက်ပိုပြီးမဖြစ်ရပါမည်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},အရေအတွက် {0} ထက်ပိုပြီးမဖြစ်ရပါမည်
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,ယခင်ဘဏ္ဍာရေးတစ်နှစ်တာပိတ်လိုက်သည်မဟုတ်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),အသက်အရွယ် (နေ့ရက်များ)
 DocType: Quotation Item,Quotation Item,စျေးနှုန်း Item
@@ -1799,8 +1830,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,ပေးသွင်း Type မာစတာ။
 DocType: Purchase Order Item,Supplier Part Number,ပေးသွင်းအပိုင်းနံပါတ်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,ကူးပြောင်းခြင်းနှုန်းက 0 င်သို့မဟုတ် 1 မဖွစျနိုငျ
-DocType: Sales Invoice,Reference Document,ကိုးကားစရာစာရွက်စာတမ်း
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} ကိုဖျက်သိမ်းသို့မဟုတ်ရပ်တန့်နေသည်
+DocType: Subscription,Reference Document,ကိုးကားစရာစာရွက်စာတမ်း
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} ကိုဖျက်သိမ်းသို့မဟုတ်ရပ်တန့်နေသည်
 DocType: Accounts Settings,Credit Controller,ခရက်ဒစ် Controller
 DocType: Delivery Note,Vehicle Dispatch Date,မော်တော်ယာဉ် Dispatch နေ့စွဲ
 DocType: Healthcare Settings,Default Medical Code Standard,default ဆေးဘက်ဆိုင်ရာကျင့်ထုံးစံ
@@ -1809,6 +1840,7 @@
 DocType: Company,Default Payable Account,default ပေးဆောင်အကောင့်
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","ထိုကဲ့သို့သောစသည်တို့ရေကြောင်းစည်းမျဉ်းစည်းကမ်းများ, စျေးနှုန်းစာရင်းအဖြစ်အွန်လိုင်းစျေးဝယ်လှည်းသည် Settings ကို"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,ကြေညာတဲ့ {0}%
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,စျေးနှုန်းအားဖြင့်စီ ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserved Qty
 DocType: Party Account,Party Account,ပါတီအကောင့်
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,လူ့အင်အားအရင်းအမြစ်
@@ -1820,13 +1852,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,ငွေပေးချေ Entry &#39;Make
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,row {0}: ပေးသွင်းဆန့်ကျင်ကြိုတင်ငွေကြိုပေးရမညျ
 DocType: Company,Default Values,default တန်ဖိုးများ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{အကြိမ်ရေ} Digest မဂ္ဂဇင်း
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{အကြိမ်ရေ} Digest မဂ္ဂဇင်း
 DocType: Expense Claim,Total Amount Reimbursed,စုစုပေါင်းငွေပမာဏ Reimbursed
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,ဒီယာဉ်ဆန့်ကျင်ရာ Logs အပေါ်အခြေခံသည်။ အသေးစိတျအဘို့ကိုအောက်တွင်အချိန်ဇယားကိုကြည့်ပါ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},ပေးသွင်းပြေစာ {0} ဆန့်ကျင် {1} ရက်စွဲပါ
 DocType: Customer,Default Price List,default စျေးနှုန်းများစာရင်း
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,ပိုင်ဆိုင်မှုလပ်ြရြားမြစံချိန် {0} ကဖန်တီး
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,သငျသညျဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} မဖျက်နိုင်ပါ။ ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} ကမ္တာ့ချိန်ညှိအတွက် default အနေနဲ့အဖြစ်သတ်မှတ်
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,အမည်တူနှင့်အတူတစ်ဦးကဖောက်သည်ပြီးသားတည်ရှိ
 DocType: Journal Entry,Entry Type,entry Type အမျိုးအစား
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,ဒီအကဲဖြတ်အဖွဲ့နှင့်ဆက်နွယ်နေအဘယ်သူမျှမအကဲဖြတ်အစီအစဉ်
 ,Customer Credit Balance,customer Credit Balance
@@ -1837,7 +1870,7 @@
 DocType: Quotation,Term Details,သက်တမ်းအသေးစိတ်ကို
 DocType: Project,Total Sales Cost (via Sales Order),(အရောင်းအမိန့်မှတဆင့်) စုစုပေါင်းအရောင်းကုန်ကျစရိတ်
 DocType: Project,Total Sales Cost (via Sales Order),(အရောင်းအမိန့်မှတဆင့်) စုစုပေါင်းအရောင်းကုန်ကျစရိတ်
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,ဒီကျောင်းသားအုပ်စုအတွက် {0} ကျောင်းသားများကိုထက်ပိုစာရင်းသွင်းလို့မရပါ။
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,ဒီကျောင်းသားအုပ်စုအတွက် {0} ကျောင်းသားများကိုထက်ပိုစာရင်းသွင်းလို့မရပါ။
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ခဲအရေအတွက်
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ခဲအရေအတွက်
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်
@@ -1855,9 +1888,11 @@
 DocType: Lab Test,Technician Name,Technician အအမည်
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ငွေတောင်းခံလွှာ၏ Cancellation အပေါ်ငွေပေးချေမှုရမည့်လင့်ဖြုတ်ရန်
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},စာဖတ်ခြင်းသို့ဝင်လက်ရှိ Odometer ကနဦးယာဉ် Odometer {0} ထက် သာ. ကြီးမြတ်ဖြစ်သင့်
+DocType: Restaurant Reservation,No Show,အဘယ်သူမျှမပြသပါ
 DocType: Shipping Rule Country,Shipping Rule Country,သဘောင်္တင်ခနည်းဥပဒေနိုင်ငံ
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Leave နှင့်တက်ရောက်
 DocType: Maintenance Visit,Partially Completed,တစ်စိတ်တစ်ပိုင်း Completed
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,အလယ်အလတ်အာရုံ
 DocType: Leave Type,Include holidays within leaves as leaves,အရွက်အဖြစ်အရွက်အတွင်းအားလပ်ရက် Include
 DocType: Sales Invoice,Packed Items,ထုပ်ပိုးပစ္စည်းများ
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Serial နံပါတ်ဆန့်ကျင်အာမခံပြောဆိုချက်ကို
@@ -1874,13 +1909,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Paid ပမာဏ (Company မှငွေကြေးစနစ်)
 DocType: Purchase Invoice,Additional Discount,အပိုဆောင်းလျှော့
 DocType: Selling Settings,Selling Settings,Settings ကိုရောင်းချနေ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,လှုပ်ရှားမှုအားအတည်ပြု
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,အကြီးဆုံးအွန်လိုင်းအဘိဓါန်လေလံ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,ပမာဏသို့မဟုတ်အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် Rate သို့မဟုတ်နှစ်ဦးစလုံးဖြစ်စေသတ်မှတ် ကျေးဇူးပြု.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,ပွညျ့စုံ
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,လှည်းအတွက်ကြည့်ရန်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,marketing အသုံးစရိတ်များ
 ,Item Shortage Report,item ပြတ်လပ်အစီရင်ခံစာ
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","အလေးချိန်ဖော်ပြခဲ့သောဖြစ်ပါတယ်, \ nPlease လွန်း &quot;အလေးချိန် UOM&quot; ဖော်ပြထားခြင်း"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","အလေးချိန်ဖော်ပြခဲ့သောဖြစ်ပါတယ်, \ nPlease လွန်း &quot;အလေးချိန် UOM&quot; ဖော်ပြထားခြင်း"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ဒီစတော့အိတ် Entry &#39;ပါစေရန်အသုံးပြုပစ္စည်းတောင်းဆိုခြင်း
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Next ကိုတန်ဖိုးနေ့စွဲအသစ်ပိုင်ဆိုင်မှုများအတွက်မဖြစ်မနေဖြစ်ပါသည်
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,တိုင်းအသုတ်လိုက်အဘို့အုပ်စုအခြေစိုက်သီးခြားသင်တန်း
@@ -1893,12 +1929,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ကျွန်တော်စတော့အိတ်လပ်ြရြားမြသည်စာရင်းကိုင် Entry &#39;ပါစေ
 DocType: Leave Allocation,Total Leaves Allocated,ခွဲဝေစုစုပေါင်းရွက်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Row မရှိပါ {0} မှာလိုအပ်သည့်ဂိုဒေါင်
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,မမှန်ကန်ဘဏ္ဍာရေးတစ်နှစ်တာ Start ကိုနဲ့ End သက်ကရာဇျမဝင်ရ ကျေးဇူးပြု.
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,မမှန်ကန်ဘဏ္ဍာရေးတစ်နှစ်တာ Start ကိုနဲ့ End သက်ကရာဇျမဝင်ရ ကျေးဇူးပြု.
 DocType: Employee,Date Of Retirement,အငြိမ်းစားအမျိုးမျိုးနေ့စွဲ
 DocType: Upload Attendance,Get Template,Template: Get
 DocType: Material Request,Transferred,လွှဲပြောင်း
 DocType: Vehicle,Doors,တံခါးပေါက်
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,အပြီးအစီး ERPNext Setup ကို!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,အပြီးအစီး ERPNext Setup ကို!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,လူနာမှတ်ပုံတင်ခြင်းအဘို့အကြေးစုဆောင်း
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,အခွန်အဖွဲ့ဟာ
@@ -1917,37 +1953,37 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",ဒီအချက်ကိုမျိုးကွဲရှိပါတယ်လျှင်စသည်တို့အရောင်းအမိန့်အတွက်ရွေးချယ်ထားမပြနိုင်
 DocType: Lead,Next Contact By,Next ကိုဆက်သွယ်ရန်အားဖြင့်
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},အတန်းအတွက် Item {0} သည်လိုအပ်သောအရေအတွက် {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},အတန်းအတွက် Item {0} သည်လိုအပ်သောအရေအတွက် {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},အရေအတွက် Item {1} သည်တည်ရှိအဖြစ်ဂိုဒေါင် {0} ဖျက်ပြီးမရနိုင်ပါ
 DocType: Quotation,Order Type,အမိန့် Type
-DocType: Purchase Invoice,Notification Email Address,အမိန့်ကြော်ငြာစာအီးမေးလ်လိပ်စာ
 ,Item-wise Sales Register,item-ပညာရှိသအရောင်းမှတ်ပုံတင်မည်
 DocType: Asset,Gross Purchase Amount,စုစုပေါင်းအရစ်ကျငွေပမာဏ
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,ဖွင့်လှစ် balance
 DocType: Asset,Depreciation Method,တန်ဖိုး Method ကို
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,အော့ဖ်လိုင်း
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,အော့ဖ်လိုင်း
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,အခြေခံပညာနှုန်းတွင်ထည့်သွင်းဒီအခွန်ဖြစ်သနည်း
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,စုစုပေါင်း Target က
 DocType: Job Applicant,Applicant for a Job,တစ်ဦးယောဘသည်လျှောက်ထားသူ
 DocType: Production Plan Material Request,Production Plan Material Request,ထုတ်လုပ်မှုစီမံကိန်းပစ္စည်းတောင်းဆိုခြင်း
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,created မရှိပါထုတ်လုပ်မှုအမိန့်
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,created မရှိပါထုတ်လုပ်မှုအမိန့်
 DocType: Stock Reconciliation,Reconciliation JSON,ပြန်လည်သင့်မြတ်ရေး JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,အများကြီးစစ်ကြောင်းများ။ အစီရင်ခံစာတင်ပို့ပြီး spreadsheet ပလီကေးရှင်းကိုအသုံးပြုခြင်းက print ထုတ်။
 DocType: Purchase Invoice Item,Batch No,batch မရှိပါ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},စျေးနှုန်းအဘို့တောင်းဆိုခြင်း: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,တစ်ဖောက်သည်ရဲ့ဝယ်ယူမိန့်ဆန့်ကျင်မျိုးစုံအရောင်းအမိန့် Allow
 DocType: Student Group Instructor,Student Group Instructor,ကျောင်းသားအုပ်စုနည်းပြ
 DocType: Student Group Instructor,Student Group Instructor,ကျောင်းသားအုပ်စုနည်းပြ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 မိုဘိုင်းဘယ်သူမျှမက
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,အဓိက
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,အဓိက
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,မူကွဲ
 DocType: Naming Series,Set prefix for numbering series on your transactions,သင့်ရဲ့ငွေကြေးလွှဲပြောင်းအပေါ်စီးရီးဦးရေသည်ရှေ့ဆက် Set
 DocType: Employee Attendance Tool,Employees HTML,ဝန်ထမ်းများ HTML ကို
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,default BOM ({0}) ဒီအချက်ကိုသို့မဟုတ်ယင်း၏ template ကိုသည်တက်ကြွသောဖြစ်ရမည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,default BOM ({0}) ဒီအချက်ကိုသို့မဟုတ်ယင်း၏ template ကိုသည်တက်ကြွသောဖြစ်ရမည်
 DocType: Employee,Leave Encashed?,Encashed Leave?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,လယ်ပြင်၌ မှစ. အခွင့်အလမ်းမသင်မနေရ
 DocType: Email Digest,Annual Expenses,နှစ်ပတ်လည်ကုန်ကျစရိတ်
 DocType: Item,Variants,မျိုးကွဲ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,ဝယ်ယူခြင်းအမိန့်လုပ်ပါ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,ဝယ်ယူခြင်းအမိန့်လုပ်ပါ
 DocType: SMS Center,Send To,ရန် Send
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},ထွက်ခွာ Type {0} လုံလောက်ခွင့်ချိန်ခွင်မရှိ
 DocType: Payment Reconciliation Payment,Allocated amount,ခွဲဝေပမာဏ
@@ -1965,6 +2001,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,ကျောင်းသားအုပ်စုအစွမ်းသတ္တိ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,ဂျာနယ် Entry &#39;{0} ဆန့်ကျင်မည်သည့် unmatched {1} entry ကိုမရှိပါဘူး
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,တန်ဖိုးခြင်း
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,လေ့ကျင့်ရေးအဖွဲ့တွေ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Serial No Item {0} သည်သို့ဝင် Duplicate
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,တစ် Shipping Rule များအတွက်အခြေအနေ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,ကျေးဇူးပြု. ထည့်သွင်းပါ
@@ -1974,7 +2011,7 @@
 DocType: Sales Order,To Deliver and Bill,လှတျတျောမူနှင့်ဘီလ်မှ
 DocType: Student Group,Instructors,နည်းပြဆရာ
 DocType: GL Entry,Credit Amount in Account Currency,အကောင့်ကိုငွေကြေးစနစ်အတွက်အကြွေးပမာဏ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} တင်သွင်းရမည်
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} တင်သွင်းရမည်
 DocType: Authorization Control,Authorization Control,authorization ထိန်းချုပ်ရေး
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},row # {0}: ငြင်းပယ်ဂိုဒေါင်ပယ်ချခဲ့ Item {1} ဆန့်ကျင်မဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,ငွေပေးချေမှုရမည့်
@@ -1993,11 +2030,11 @@
 DocType: Quotation Item,Actual Qty,အမှန်တကယ် Qty
 DocType: Sales Invoice Item,References,ကိုးကား
 DocType: Quality Inspection Reading,Reading 10,10 Reading
-DocType: Hub Settings,Hub Node,hub Node
+DocType: Hub Category,Hub Node,hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,သင်ကထပ်နေပစ္စည်းများကိုသို့ဝင်ပါပြီ။ ဆန်းစစ်နှင့်ထပ်ကြိုးစားပါ။
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,အပေါင်းအဖေါ်
 DocType: Asset Movement,Asset Movement,ပိုင်ဆိုင်မှုလပ်ြရြားမြ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,နယူးလှည်း
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,နယူးလှည်း
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,item {0} တဲ့နံပါတ်စဉ်အလိုက် Item မဟုတ်ပါဘူး
 DocType: SMS Center,Create Receiver List,Receiver များစာရင်း Create
 DocType: Vehicle,Wheels,ရထားဘီး
@@ -2011,15 +2048,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,ဆက်သွယ်ရေးလုပ်ငန်း
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),(သာလျှင် Draft) ကို package ကိုဒီပို့ဆောင်မှု၏အစိတ်အပိုင်းတစ်ခုဖြစ်တယ်ဆိုတာဆိုတာကိုပြသ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,ငွေပေးချေမှုရမည့် Entry &#39;ပါစေ
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Item {0} သည်အရေအတွက် {1} ထက်နည်းရှိရမည်
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Item {0} သည်အရေအတွက် {1} ထက်နည်းရှိရမည်
 ,Sales Invoice Trends,အရောင်းပြေစာခေတ်ရေစီးကြောင်း
 DocType: Leave Application,Apply / Approve Leaves,Apply / ရွက်အတည်ပြု
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,"အကြောင်းမူကား,"
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,"အကြောင်းမူကား,"
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',သို့မဟုတ် &#39;&#39; ယခင် Row စုစုပေါင်း &#39;&#39; ယခင် Row ပမာဏတွင် &#39;&#39; ဟုတာဝန်ခံ type ကိုအသုံးပြုမှသာလျှင်အတန်းရည်ညွှန်းနိုင်ပါသည်
 DocType: Sales Order Item,Delivery Warehouse,Delivery ဂိုဒေါင်
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,ဘဏ္ဍာရေးကုန်ကျစရိတ်စင်တာများ၏ပင်လည်းရှိ၏။
 DocType: Serial No,Delivery Document No,Delivery Document ဖိုင်မရှိပါ
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},ကုမ္ပဏီ {0} ၌ &#39;ပိုင်ဆိုင်မှုရှင်းအပေါ် Gain / ပျောက်ဆုံးခြင်းအကောင့်&#39; &#39;set ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},ကုမ္ပဏီ {0} ၌ &#39;ပိုင်ဆိုင်မှုရှင်းအပေါ် Gain / ပျောက်ဆုံးခြင်းအကောင့်&#39; &#39;set ကျေးဇူးပြု.
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,ဝယ်ယူခြင်းလက်ခံရရှိသည့်ရက်မှပစ္စည်းများ Get
 DocType: Serial No,Creation Date,ဖန်ဆင်းခြင်းနေ့စွဲ
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},item {0} စျေးနှုန်းစာရင်း {1} အတွက်အကြိမ်ပေါင်းများစွာပုံပေါ်
@@ -2030,12 +2067,13 @@
 DocType: Student,Student Mobile Number,ကျောင်းသားသမဂ္ဂမိုဘိုင်းနံပါတ်
 DocType: Item,Has Variants,မူကွဲရှိပါတယ်
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,တုံ့ပြန်မှုကိုအပ်ဒိတ်လုပ်
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},သငျသညျပြီးသား {0} {1} ကနေပစ္စည်းကိုရှေးခယျြခဲ့ကြ
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},သငျသညျပြီးသား {0} {1} ကနေပစ္စည်းကိုရှေးခယျြခဲ့ကြ
 DocType: Monthly Distribution,Name of the Monthly Distribution,အဆိုပါလစဉ်ဖြန့်ဖြူးအမည်
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,batch ID ကိုမဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,batch ID ကိုမဖြစ်မနေဖြစ်ပါသည်
 DocType: Sales Person,Parent Sales Person,မိဘအရောင်းပုဂ္ဂိုလ်
-DocType: Purchase Invoice,Recurring Invoice,ထပ်တလဲလဲပြေစာ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,အနိမျ့မှအမြင့်
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,ပထမဦးဆုံးအစီအစဉ်ကို Select လုပ်ပါ
 DocType: Patient Appointment,Patient Age,လူနာအသက်
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,စီမံခန့်ခွဲမှုစီမံကိန်းများ
 DocType: Supplier,Supplier of Goods or Services.,ကုန်စည်သို့မဟုတ်န်ဆောင်မှုများ၏ပေးသွင်း။
@@ -2043,8 +2081,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,လူနာအတွက်မသတ်မှတ်လျှင်တိုင်ပင်စွဲချက်စာအုပ်ဆိုင်ဖို့အသုံးပြုခံရဖို့ default receiver အကောင့်အသစ်များ၏။
 DocType: Vehicle Log,Fuel Price,လောင်စာစျေးနှုန်း
 DocType: Budget,Budget,ဘတ်ဂျက်
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,ပွင့်လင်း Set
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,သတ်မှတ်ထားတဲ့ပိုင်ဆိုင်မှုပစ္စည်း non-စတော့ရှယ်ယာကို item ဖြစ်ရပါမည်။
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,ပွင့်လင်း Set
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,သတ်မှတ်ထားတဲ့ပိုင်ဆိုင်မှုပစ္စည်း non-စတော့ရှယ်ယာကို item ဖြစ်ရပါမည်။
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","ဒါကြောင့်တစ်ဦးဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုအကောင့်ကိုဖွင့်မရအဖြစ်ဘတ်ဂျက်, {0} ဆန့်ကျင်တာဝန်ပေးအပ်ရနိုင်မှာမဟုတ်ဘူး"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,အောင်မြင်
 DocType: Student Admission,Application Form Route,လျှောက်လွှာ Form ကိုလမ်းကြောင်း
@@ -2058,12 +2096,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,item {0} Serial အမှတ်သည် setup ကိုမဟုတ်ပါဘူး။ Item မာစတာ Check
 DocType: Maintenance Visit,Maintenance Time,ပြုပြင်ထိန်းသိမ်းမှုအချိန်
 ,Amount to Deliver,လှတျတျောမူရန်ငွေပမာဏ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},တူညီသောပစ္စည်းကိုအကြိမ်ပေါင်းများစွာထဲသို့ဝင်ခဲ့တာဖြစ်ပါတယ်။ {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,အဆိုပါ Term Start ကိုနေ့စွဲဟူသောဝေါဟာရ (Academic တစ်နှစ်တာ {}) နှင့်ဆက်စပ်သောမှပညာရေးဆိုင်ရာတစ်နှစ်တာ၏တစ်နှစ်တာ Start ကိုနေ့စွဲထက်အစောပိုင်းမှာမဖြစ်နိုင်ပါ။ အရက်စွဲများပြင်ဆင်ရန်နှင့်ထပ်ကြိုးစားပါ။
 DocType: Guardian,Guardian Interests,ဂါးဒီးယန်းစိတ်ဝင်စားမှုများ
 DocType: Naming Series,Current Value,လက်ရှိ Value တစ်ခု
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,အကွိမျမြားစှာဘဏ္ဍာရေးနှစ်အနှစ်ရက်စွဲ {0} အဘို့တည်ရှိတယ်။ ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာအတွက်ကုမ္ပဏီသတ်မှတ်ထားပေးပါ
 DocType: School Settings,Instructor Records to be created by,အသုံးပြုနေသူများကဖန်တီးခံရဖို့နည်းပြမှတ်တမ်း
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} နေသူများကဖန်တီး
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} နေသူများကဖန်တီး
 DocType: Delivery Note Item,Against Sales Order,အရောင်းအမိန့်ဆန့်ကျင်
 ,Serial No Status,serial မရှိပါနဲ့ Status
 DocType: Payment Entry Reference,Outstanding,ထူးချွန်
@@ -2073,10 +2112,10 @@
 						must be greater than or equal to {2}","row {0}: နေ့စွဲ \ ထဲကနေနှင့်မှအကြားခြားနားချက်ထက် သာ. ကြီးမြတ်သို့မဟုတ် {2} တန်းတူဖြစ်ရမည်, {1} ကာလကိုသတ်မှတ်ဖို့"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,ဒီစတော့ရှယ်ယာလှုပ်ရှားမှုအပေါ်အခြေခံသည်။ အသေးစိတျအဘို့ {0} ကိုကြည့်ပါ
 DocType: Pricing Rule,Selling,အရောင်းရဆုံး
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},ငွေပမာဏ {0} {1} {2} ဆန့်ကျင်နုတ်ယူ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},ငွေပမာဏ {0} {1} {2} ဆန့်ကျင်နုတ်ယူ
 DocType: Employee,Salary Information,လစာပြန်ကြားရေး
 DocType: Sales Person,Name and Employee ID,အမည်နှင့်ထမ်း ID ကို
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,ကြောင့်နေ့စွဲနေ့စွဲများသို့တင်ပြခြင်းမပြုမီမဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,ကြောင့်နေ့စွဲနေ့စွဲများသို့တင်ပြခြင်းမပြုမီမဖွစျနိုငျ
 DocType: Website Item Group,Website Item Group,website Item Group က
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,တာဝန်နှင့်အခွန်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,ကိုးကားစရာနေ့စွဲကိုရိုက်ထည့်ပေးပါ
@@ -2102,7 +2141,7 @@
 DocType: Issue,Resolution Details,resolution အသေးစိတ်ကို
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,နေရာချထားခြင်း
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,လက်ခံမှုကိုလိုအပ်ချက်
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,အထက်ပါဇယားတွင်ပစ္စည်းတောင်းဆိုမှုများကိုထည့်သွင်းပါ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,အထက်ပါဇယားတွင်ပစ္စည်းတောင်းဆိုမှုများကိုထည့်သွင်းပါ
 DocType: Item Attribute,Attribute Name,အမည် Attribute
 DocType: BOM,Show In Website,ဝက်ဘ်ဆိုက်များတွင် show
 DocType: Shopping Cart Settings,Show Quantity in Website,ဝက်ဘ်ဆိုက်များတွင် Show ကိုပမာဏ
@@ -2111,7 +2150,7 @@
 DocType: Item Reorder,Check in (group),(အုပ်စု) တွင် Check
 ,Qty to Order,ရမလဲမှ Qty
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","အမြတ် / ပျောက်ဆုံးခြင်းကြိုတင်ဘွတ်ကင်ပါလိမ့်မည်သည့်တာဝန်ဝတ္တရားသို့မဟုတ် Equity အောက်မှာအကောင့်ဦးခေါင်း,"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,အားလုံးအလုပ်များကို Gantt ဇယား။
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,အားလုံးအလုပ်များကို Gantt ဇယား။
 DocType: Opportunity,Mins to First Response,ပထမဦးစွာတုံ့ပြန်မှုမှမိနစ်
 DocType: Pricing Rule,Margin Type,margin အမျိုးအစား
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} နာရီ
@@ -2133,36 +2172,36 @@
 DocType: Patient,Surgical History,ခွဲစိတ်သမိုင်း
 DocType: Employee,Resignation Letter Date,နုတ်ထွက်ပေးစာနေ့စွဲ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,စျေးနှုန်းနည်းဥပဒေများနောက်ထပ်အရေအတွက်ပေါ် အခြေခံ. filtered နေကြပါတယ်။
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},ဝန်ထမ်း {0} အဘို့အချိတ်တွဲ၏နေ့စွဲသတ်မှတ်ပေးပါ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},ဝန်ထမ်း {0} အဘို့အချိတ်တွဲ၏နေ့စွဲသတ်မှတ်ပေးပါ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},ဝန်ထမ်း {0} အဘို့အချိတ်တွဲ၏နေ့စွဲသတ်မှတ်ပေးပါ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},ဝန်ထမ်း {0} အဘို့အချိတ်တွဲ၏နေ့စွဲသတ်မှတ်ပေးပါ
 DocType: Task,Total Billing Amount (via Time Sheet),(အချိန်စာရွက်မှတဆင့်) စုစုပေါင်းငွေတောင်းခံလွှာပမာဏ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,repeat ဖောက်သည်အခွန်ဝန်ကြီးဌာန
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) အခန်းကဏ္ဍ &#39;&#39; သုံးစွဲမှုအတည်ပြုချက် &#39;&#39; ရှိရမယ်
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,လင်မယား
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,ထုတ်လုပ်မှုများအတွက် BOM နှင့်အရည်အတွက်ကို Select လုပ်ပါ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,ထုတ်လုပ်မှုများအတွက် BOM နှင့်အရည်အတွက်ကို Select လုပ်ပါ
 DocType: Asset,Depreciation Schedule,တန်ဖိုးဇယား
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,အရောင်း Partner လိပ်စာနှင့်ဆက်သွယ်ရန်
 DocType: Bank Reconciliation Detail,Against Account,အကောင့်ဆန့်ကျင်
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,ဝက်နေ့နေ့စွဲနေ့စွဲ မှစ. နှင့်နေ့စွဲစေရန်အကြားဖြစ်သင့်တယ်
 DocType: Maintenance Schedule Detail,Actual Date,အမှန်တကယ်နေ့စွဲ
 DocType: Item,Has Batch No,Batch မရှိရှိပါတယ်
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},နှစ်ပတ်လည်ငွေတောင်းခံလွှာ: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},နှစ်ပတ်လည်ငွေတောင်းခံလွှာ: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),ကုန်ပစ္စည်းများနှင့်ဝန်ဆောင်မှုများကိုအခွန် (GST အိန္ဒိယ)
 DocType: Delivery Note,Excise Page Number,ယစ်မျိုးစာမျက်နှာနံပါတ်
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","ကုမ္ပဏီ, နေ့စွဲ မှစ. နှင့်နေ့စွဲရန်မဖြစ်မနေဖြစ်ပါသည်"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,တိုင်ပင်ဆွေးနွေးခြင်းကနေရယူလိုက်ပါ
 DocType: Asset,Purchase Date,အရစ်ကျနေ့စွဲ
 DocType: Employee,Personal Details,ပုဂ္ဂိုလ်ရေးအသေးစိတ်
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},ကုမ္ပဏီ {0} ၌ &#39;ပိုင်ဆိုင်မှုတန်ဖိုးကုန်ကျစရိတ်စင်တာ&#39; &#39;set ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},ကုမ္ပဏီ {0} ၌ &#39;ပိုင်ဆိုင်မှုတန်ဖိုးကုန်ကျစရိတ်စင်တာ&#39; &#39;set ကျေးဇူးပြု.
 ,Maintenance Schedules,ပြုပြင်ထိန်းသိမ်းမှုအချိန်ဇယား
 DocType: Task,Actual End Date (via Time Sheet),(အချိန်စာရွက်မှတဆင့်) အမှန်တကယ်ပြီးဆုံးရက်စွဲ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},ငွေပမာဏ {0} {1} {2} {3} ဆန့်ကျင်
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},ငွေပမာဏ {0} {1} {2} {3} ဆန့်ကျင်
 ,Quotation Trends,စျေးနှုန်းခေတ်ရေစီးကြောင်း
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},ကို item {0} သည်ကို item မာစတာတှငျဖျောပွမ item Group က
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,အကောင့်ဖွင့်ရန် debit တစ် receiver အကောင့်ကိုရှိရမည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,အကောင့်ဖွင့်ရန် debit တစ် receiver အကောင့်ကိုရှိရမည်
 DocType: Shipping Rule Condition,Shipping Amount,သဘောင်္တင်ခပမာဏ
 DocType: Supplier Scorecard Period,Period Score,ကာလရမှတ်
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Customer များ Add
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Customer များ Add
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,ဆိုင်းငံ့ထားသောငွေပမာဏ
 DocType: Lab Test Template,Special,အထူး
 DocType: Purchase Invoice Item,Conversion Factor,ကူးပြောင်းခြင်း Factor
@@ -2170,13 +2209,14 @@
 ,Vehicle Expenses,ယာဉ်ကုန်ကျစရိတ်
 DocType: Serial No,Invoice Details,ငွေတောင်းခံလွှာအသေးစိတ်
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},အသုံးဝင်သောဘဝပြီးနောက်မျှော်မှန်းတန်ဖိုးထက်ထက် သာ. ကြီးမြတ်သို့မဟုတ် {0} တန်းတူဖြစ်ရပါမည်
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,အပေါ် Start
+DocType: Hub Category,Hub Category,hub Category:
 DocType: Purchase Invoice,SEZ,အထူးစီးပွားရေးဇုန်
 DocType: Purchase Receipt,Vehicle Number,မော်တော်ယာဉ်နံပါတ်
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,ထပ်တလဲလဲကုန်ပို့လွှာရပ်တန့်ဖြစ်ရလိမ့်မည်သည့်နေ့ရက်
 DocType: Employee Loan,Loan Amount,ချေးငွေပမာဏ
 DocType: Program Enrollment,Self-Driving Vehicle,self-မောင်းနှင်ယာဉ်
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,ပေးသွင်း Scorecard အမြဲတမ်း
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},အတန်း {0}: ပစ္စည်းများ၏ဘီလ်ဟာအရာဝတ္ထု {1} ဘို့မတွေ့ရှိ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},အတန်း {0}: ပစ္စည်းများ၏ဘီလ်ဟာအရာဝတ္ထု {1} ဘို့မတွေ့ရှိ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Total ကုမ္ပဏီခွဲဝေအရွက် {0} ကာလအဘို့ပြီးသားအတည်ပြုပြီးအရွက် {1} ထက်လျော့နည်းမဖွစျနိုငျ
 DocType: Journal Entry,Accounts Receivable,ငွေစာရင်းရရန်ရှိသော
 ,Supplier-Wise Sales Analytics,ပေးသွင်း-ပညာရှိအရောင်း Analytics
@@ -2188,7 +2228,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","မိဘသင်တန်းအမှတ်စဥ် (ဒီမိဘသင်တန်း၏အစိတ်အပိုင်းမပါလျှင်, အလွတ် Leave)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,အားလုံးန်ထမ်းအမျိုးအစားစဉ်းစားလျှင်အလွတ် Leave
 DocType: Landed Cost Voucher,Distribute Charges Based On,တွင် အခြေခံ. စွပ်စွဲချက်ဖြန့်ဝေ
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,HR Settings ကို
 DocType: Salary Slip,net pay info,အသားတင်လစာအချက်အလက်
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,ဤသည်တန်ဖိုးပုံမှန်အရောင်းစျေးနှုန်းစာရင်းအတွက် updated ဖြစ်ပါတယ်။
@@ -2199,7 +2239,7 @@
 DocType: Patient,B Positive,B ကအပြုသဘောဆောင်သော
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","အတန်း # {0}: item ကိုသတ်မှတ်ထားတဲ့အရာတစ်ခုပါပဲအဖြစ်အရည်အတွက်, 1 ဖြစ်ရမည်။ မျိုးစုံအရည်အတွက်ကိုခွဲတန်းကိုသုံးပေးပါ။"
 DocType: Leave Block List Allow,Leave Block List Allow,Allow Block List ကို Leave
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr အလွတ်သို့မဟုတ်အာကာသမဖွစျနိုငျ
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr အလွတ်သို့မဟုတ်အာကာသမဖွစျနိုငျ
 DocType: Patient Medical Record,Patient Medical Record,လူနာဆေးဘက်ဆိုင်ရာမှတ်တမ်း
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,က Non-Group ကိုမှ Group က
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,အားကစား
@@ -2216,9 +2256,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,သော့ချက်နေ့စွဲ {2} များအတွက် {1} မှ {0} လဲလှယ်မှုနှုန်းကိုရှာဖွေမပေးနိုင်ပါ။ ကိုယ်တိုင်တစ်ငွေကြေးလဲလှယ်ရေးစံချိန်ဖန်တီး ကျေးဇူးပြု.
 DocType: POS Profile,Price List,စျေးနှုန်းများစာရင်း
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ယခုက default ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာဖြစ်ပါတယ်။ အကျိုးသက်ရောက်မှုယူမှအပြောင်းအလဲအတွက်သင့် browser refresh ပေးပါ။
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,စရိတ်စွပ်စွဲ
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,စရိတ်စွပ်စွဲ
 DocType: Issue,Support,ထောက်ပံ့
 ,BOM Search,BOM ရှာရန်
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",ဒီဂိုဒေါင်ထဲမှာရရှိနိုင်ပါစတော့ရှယ်ယာအပေါ်အခြေခံပြီး Hub ပေါ်တွင် &quot;စတော့အိတ်အတွက်မဟုတ်&quot; &quot;စတော့အိတ်များတွင်&quot; Publish သို့မဟုတ်။
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),(+ စုစုပေါင်းမှတ်တမ်းဖွင့်လှစ်) ပိတ်ပစ်
 DocType: Vehicle,Fuel Type,လောင်စာအမျိုးအစား
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,ကုမ္ပဏီအတွက်ငွေကြေးသတ်မှတ် ကျေးဇူးပြု.
@@ -2230,16 +2271,16 @@
 DocType: Healthcare Settings,Remind Before,မတိုင်မှီသတိပေး
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM ကူးပြောင်းခြင်းအချက်အတန်း {0} အတွက်လိုအပ်သည်
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",အတန်း # {0}: ကိုးကားစရာစာရွက်စာတမ်းအမျိုးအစားအရောင်းအမိန့်အရောင်းပြေစာသို့မဟုတ်ဂျာနယ် Entry တယောက်ဖြစ်ရပါမည်
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",အတန်း # {0}: ကိုးကားစရာစာရွက်စာတမ်းအမျိုးအစားအရောင်းအမိန့်အရောင်းပြေစာသို့မဟုတ်ဂျာနယ် Entry တယောက်ဖြစ်ရပါမည်
 DocType: Salary Component,Deduction,သဘောအယူအဆ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,အတန်း {0}: အချိန်နှင့်ရန်အချိန် မှစ. မဖြစ်မနေဖြစ်ပါတယ်။
 DocType: Stock Reconciliation Item,Amount Difference,ငွေပမာဏ Difference
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},item စျေးနှုန်းကိုစျေးနှုန်းကိုစာရင်း {1} အတွက် {0} များအတွက်ဖြည့်စွက်
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},item စျေးနှုန်းကိုစျေးနှုန်းကိုစာရင်း {1} အတွက် {0} များအတွက်ဖြည့်စွက်
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,ဒီအရောင်းလူတစ်ဦး၏န်ထမ်း Id ကိုရိုက်ထည့်ပေးပါ
 DocType: Territory,Classification of Customers by region,ဒေသအားဖြင့် Customer များ၏ခွဲခြား
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,ကွာခြားချက်ပမာဏသုညဖြစ်ရပါမည်
 DocType: Project,Gross Margin,gross Margin
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,ထုတ်လုပ်မှု Item ပထမဦးဆုံးရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,ထုတ်လုပ်မှု Item ပထမဦးဆုံးရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,တွက်ချက် Bank မှဖော်ပြချက်ချိန်ခွင်လျှာ
 DocType: Normal Test Template,Normal Test Template,ပုံမှန်စမ်းသပ်ခြင်း Template ကို
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,မသန်မစွမ်းအသုံးပြုသူ
@@ -2249,21 +2290,22 @@
 DocType: Salary Slip,Total Deduction,စုစုပေါင်းထုတ်ယူ
 ,Production Analytics,ထုတ်လုပ်မှု Analytics မှ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,ဒီလူနာဆန့်ကျင်အရောင်းအပေါ်တွင်အခြေခံထားသည်။ အသေးစိတ်အချက်အလက်များကိုအောက်ပါအချိန်ဇယားကိုကြည့်ပါ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,ကုန်ကျစရိတ် Updated
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,ကုန်ကျစရိတ် Updated
 DocType: Employee,Date of Birth,မွေးနေ့
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,item {0} ပြီးသားပြန်ထားပြီ
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ ** တစ်ဘဏ္ဍာရေးတစ်နှစ်တာကိုကိုယ်စားပြုပါတယ်။ အားလုံးသည်စာရင်းကိုင် posts များနှင့်အခြားသောအဓိကကျသည့်ကိစ္စများကို ** ** ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာဆန့်ကျင်ခြေရာခံထောက်လှမ်းနေကြပါတယ်။
 DocType: Opportunity,Customer / Lead Address,customer / ခဲလိပ်စာ
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,ပေးသွင်း Scorecard Setup ကို
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},သတိပေးချက်: attachment ကို {0} အပေါ်မမှန်ကန်ခြင်း SSL ကိုလက်မှတ်ကို
-DocType: Student Admission,Eligibility,အရည်အချင်းများ
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,အကဲဖြတ်အစီအစဉ်အမည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},သတိပေးချက်: attachment ကို {0} အပေါ်မမှန်ကန်ခြင်း SSL ကိုလက်မှတ်ကို
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","ဦးဆောင်လမ်းပြသင့်ရဲ့ဆောင်အဖြစ်အားလုံးသင့်ရဲ့အဆက်အသွယ်နဲ့ပိုပြီး add, သင်စီးပွားရေးလုပ်ငန်း get ကူညီ"
 DocType: Production Order Operation,Actual Operation Time,အမှန်တကယ်စစ်ဆင်ရေးအချိန်
 DocType: Authorization Rule,Applicable To (User),(အသုံးပြုသူ) ရန်သက်ဆိုင်သော
 DocType: Purchase Taxes and Charges,Deduct,နှုတ်ယူ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,လုပ်ငန်းတာဝန်သတ်မှတ်ချက်
 DocType: Student Applicant,Applied,အသုံးချ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Re-ပွင့်လင်း
 DocType: Sales Invoice Item,Qty as per Stock UOM,စတော့အိတ် UOM နှုန်းအဖြစ် Qty
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 အမည်
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","မှလွဲ. အထူးဇာတ်ကောင် &quot;-&quot;, &quot;#&quot;, &quot;။ &quot; နှင့် &quot;/&quot; စီးရီးအမည်အတွက်ခွင့်မပြု"
@@ -2275,7 +2317,7 @@
 DocType: Request for Quotation,Manufacturing Manager,ကုန်ထုတ်လုပ်မှု Manager က
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},serial No {0} {1} ထိအာမခံအောက်မှာဖြစ်ပါတယ်
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,packages များသို့ Delivery Note ကို Split ။
-apps/erpnext/erpnext/hooks.py +98,Shipments,တင်ပို့ရောင်းချမှု
+apps/erpnext/erpnext/hooks.py +107,Shipments,တင်ပို့ရောင်းချမှု
 DocType: Payment Entry,Total Allocated Amount (Company Currency),စုစုပေါင်းခွဲဝေငွေပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
 DocType: Purchase Order Item,To be delivered to customer,ဖောက်သည်မှကယ်နှုတ်တော်မူ၏ခံရဖို့
 DocType: BOM,Scrap Material Cost,အပိုင်းအစပစ္စည်းကုန်ကျစရိတ်
@@ -2298,8 +2340,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,item မူကွဲ Settings များ
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,ကုမ္ပဏီကိုရွေးချယ်ပါ ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,အားလုံးဌာနများစဉ်းစားလျှင်အလွတ် Leave
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","အလုပ်အကိုင်အခွင့်အအမျိုးအစားများ (ရာသက်ပန်, စာချုပ်, အလုပ်သင်ဆရာဝန်စသည်တို့) ။"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} Item {1} သည်မသင်မနေရ
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","အလုပ်အကိုင်အခွင့်အအမျိုးအစားများ (ရာသက်ပန်, စာချုပ်, အလုပ်သင်ဆရာဝန်စသည်တို့) ။"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} Item {1} သည်မသင်မနေရ
 DocType: Process Payroll,Fortnightly,နှစ်ပတ်တ
 DocType: Currency Exchange,From Currency,ငွေကြေးစနစ်ကနေ
 DocType: Vital Signs,Weight (In Kilogram),(ကီလိုဂရမ်ခုနှစ်တွင်) အလေးချိန်
@@ -2324,7 +2366,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,အချိန်ဇယားအရ &#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,အောက်ပါအချိန်ဇယားဖျက်နေစဉ်အမှားအယွင်းများရှိခဲ့သည်:
 DocType: Bin,Ordered Quantity,အမိန့်ပမာဏ
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",ဥပမာ &quot;လက်သမားသည် tools တွေကို Build&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",ဥပမာ &quot;လက်သမားသည် tools တွေကို Build&quot;
 DocType: Grading Scale,Grading Scale Intervals,ဂမ်စကေး Interval
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {3}: {2} ကိုသာငွေကြေးဖန်ဆင်းနိုင်ပါတယ်များအတွက်စာရင်းကိုင် Entry &#39;
 DocType: Production Order,In Process,Process ကိုအတွက်
@@ -2348,11 +2390,10 @@
 DocType: Purchase Invoice,With Payment of Tax,အခွန်၏ငွေပေးချေနှင့်အတူ
 DocType: Expense Claim Detail,Expense Claim Detail,စရိတ်တောင်းဆိုမှုများ Detail
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,ပေးသွင်းသူများအတွက် TRIPLICATE
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,မှန်ကန်သောအကောင့်ကို select လုပ်ပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,မှန်ကန်သောအကောင့်ကို select လုပ်ပါ ကျေးဇူးပြု.
 DocType: Item,Weight UOM,အလေးချိန် UOM
 DocType: Salary Structure Employee,Salary Structure Employee,လစာဖွဲ့စည်းပုံထမ်း
 DocType: Patient,Blood Group,လူအသွေး Group က
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,လာမည့်
 DocType: Course,Course Name,သင်တန်းအမည်
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,အတိအကျန်ထမ်းရဲ့ခွင့်ပလီကေးရှင်းကိုအတည်ပြုနိုင်သူသုံးစွဲသူများက
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Office ကိုပစ္စည်းများ
@@ -2371,7 +2412,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,စျေးစာရင်းမသတ်မှတ်လျှင်စျေးနှုန်းများပြလိမ့်မည်မဟုတ်
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,ဒီအသဘောင်္တင်စိုးမိုးရေးများအတွက်တိုင်းပြည် specify သို့မဟုတ် Worldwide မှသဘောင်္တင်စစ်ဆေးပါ
 DocType: Stock Entry,Total Incoming Value,စုစုပေါင်း Incoming Value တစ်ခု
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,debit ရန်လိုအပ်သည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,debit ရန်လိုအပ်သည်
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets သင့်ရဲ့အဖွဲ့ကအမှုကိုပြု Activite ဘို့အချိန်, ကုန်ကျစရိတ်နှင့်ငွေတောင်းခံခြေရာခံစောင့်ရှောက်ကူညီပေးရန်"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ဝယ်ယူစျေးနှုန်းများစာရင်း
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,ကုန်ပစ္စည်းပေးသွင်း scorecard variable တွေကို၏ Templates ကို။
@@ -2381,7 +2422,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,ငွေပေးချေမှုရမည့်ပြန်လည်ရင်ကြားစေ့ရေး
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Incharge ပုဂ္ဂိုလ်ရဲ့နာမညျကို select လုပ်ပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,နည်းပညာတက္ကသိုလ်
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},စုစုပေါင်းကြွေးကျန်: {0}
+DocType: Hub Settings,Unregister from Hub,Hub ကနေမှတ်ပုံတင်မှုဖျက်ရန်
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},စုစုပေါင်းကြွေးကျန်: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM ဝက်ဘ်ဆိုက်စစ်ဆင်ရေး
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,ကမ်းလှမ်းမှုကိုပေးစာ
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,ပစ္စည်းတောင်းဆို (MRP) နှင့်ထုတ်လုပ်မှုအမိန့် Generate ။
@@ -2393,7 +2435,9 @@
 DocType: Physician Schedule Time Slot,To Time,အချိန်မှ
 DocType: Authorization Rule,Approving Role (above authorized value),(ခွင့်ပြုချက် value ကိုအထက်) အတည်ပြုအခန်းက္ပ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,အကောင့်ဖွင့်ရန်အကြွေးတစ်ပေးဆောင်အကောင့်ကိုရှိရမည်
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} {2} ၏မိဘသို့မဟုတ်ကလေးမဖွစျနိုငျ
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,အဆိုပါပေးဆောင်ကျောင်းသားလျှောက်ထားသူများအတွက်မဖြစ်မနေဖြစ်သည့်ကျောင်းသားင်ခွင့်ကို select ပေးပါ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} {2} ၏မိဘသို့မဟုတ်ကလေးမဖွစျနိုငျ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,စျေးနှုန်းထုတ်ဝေနေတဲ့စျေးစာရင်းကို select ပေးပါ
 DocType: Production Order Operation,Completed Qty,ပြီးစီး Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","{0} အဘို့, သာ debit အကောင့်အသစ်များ၏အခြားအကြွေး entry ကိုဆန့်ကျင်နှင့်ဆက်စပ်နိုင်"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,စျေးနှုန်းစာရင်း {0} ပိတ်ထားတယ်
@@ -2406,39 +2450,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,Item {1} များအတွက်လိုအပ်သော {0} Serial Number ။ သငျသညျ {2} ထောက်ပံ့ကြပါပြီ။
 DocType: Stock Reconciliation Item,Current Valuation Rate,လက်ရှိအကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် Rate
 DocType: Item,Customer Item Codes,customer Item ကုဒ်တွေဟာ
+DocType: Training Event,Advance,ကြိုတင်မဲ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,နောက်တဖန်ထပ်တလဲလဲအောင်သည်။
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,ချိန်း Gain / ပျောက်ဆုံးခြင်း
 DocType: Opportunity,Lost Reason,ပျောက်ဆုံးသွားရသည့်အကြောင်းရင်း
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,နယူးလိပ်စာ
 DocType: Quality Inspection,Sample Size,နမူနာ Size အ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,ငွေလက်ခံပြေစာစာရွက်စာတမ်းရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,ပစ္စည်းများအားလုံးပြီးသား invoiced ပြီ
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;&#39; အမှုအမှတ် မှစ. &#39;&#39; တရားဝင်သတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',&#39;&#39; အမှုအမှတ် မှစ. &#39;&#39; တရားဝင်သတ်မှတ် ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,နောက်ထပ်ကုန်ကျစရိတ်စင်တာများအဖွဲ့များအောက်မှာလုပ်နိုင်ပေမယ့် entries တွေကို Non-အဖွဲ့များဆန့်ကျင်စေနိုင်ပါတယ်
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,အသုံးပြုသူများနှင့်ခွင့်ပြုချက်
 DocType: Vehicle Log,VLOG.,ရုပ်ရှင်ဘလော့ဂ်။
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Created ထုတ်လုပ်မှုအမိန့်: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Created ထုတ်လုပ်မှုအမိန့်: {0}
 DocType: Branch,Branch,အညွန့
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ပုံနှိပ်နှင့် Branding
 DocType: Company,Total Monthly Sales,စုစုပေါင်းလစဉ်အရောင်း
 DocType: Bin,Actual Quantity,အမှန်တကယ်ပမာဏ
 DocType: Shipping Rule,example: Next Day Shipping,ဥပမာအား: Next ကိုနေ့ Shipping
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,{0} မတွေ့ရှိ serial No
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},subscription {0} ခဲ့
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},subscription {0} ခဲ့
 DocType: Fee Schedule Program,Fee Schedule Program,အခကြေးငွေဇယားအစီအစဉ်
 DocType: Fee Schedule Program,Student Batch,ကျောင်းသားအသုတ်လိုက်
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,signs_date DESC န့်သတ်ချက် 1 `tabVital Signs` ရှိရာလူနာ = &#39;{0}&#39; &#39;အမိန့်ကနေ * ကိုရွေးပါ
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,ကျောင်းသား Make
 DocType: Supplier Scorecard Scoring Standing,Min Grade,min အဆင့်
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},သငျသညျစီမံကိန်းကိုအပေါ်ပူးပေါင်းဖို့ဖိတ်ခေါ်ခဲ့ကြ: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},{0} ပေါ်တွင်မရနိုင်ပါသမား
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},သငျသညျစီမံကိန်းကိုအပေါ်ပူးပေါင်းဖို့ဖိတ်ခေါ်ခဲ့ကြ: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},{0} ပေါ်တွင်မရနိုင်ပါသမား
 DocType: Leave Block List Date,Block Date,block နေ့စွဲ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},စိတ်ကြိုက်နယ်ပယ် Subscription Id သည့် DOCTYPE {0} အတွက် Add
 DocType: Purchase Receipt,Supplier Delivery Note,ပေးသွင်း Delivery မှတ်ချက်
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,အခုဆိုရင် Apply
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,အခုဆိုရင် Apply
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},အမှန်တကယ်အရည်အတွက် {0} / စောငျ့အရည်အတွက် {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},အမှန်တကယ်အရည်အတွက် {0} / စောငျ့အရည်အတွက် {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-commerce GSTIN
 DocType: Sales Order,Not Delivered,ကယ်နှုတ်တော်မူ၏မဟုတ်
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,မျှော်လင့်ထားသည့်နေ့စွဲငွေသွင်းငွေထုတ်နေ့စွဲမတိုင်မီမဖွစျနိုငျ
 ,Bank Clearance Summary,ဘဏ်မှရှင်းလင်းရေးအကျဉ်းချုပ်
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Create နှင့်နေ့စဉ်စီမံခန့်ခွဲ, အပတ်စဉ်ထုတ်နှင့်လစဉ်အီးမေးလ် digests ။"
 DocType: Appraisal Goal,Appraisal Goal,စိစစ်ရေးဂိုး
@@ -2446,12 +2491,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,အဆောက်အဦးများ
 DocType: Fee Schedule,Fee Structure,အခကြေးငွေဖွဲ့စည်းပုံ
 DocType: Timesheet Detail,Costing Amount,ငွေပမာဏကုန်ကျ
-DocType: Student Admission,Application Fee,လျှောက်လွှာကြေး
+DocType: Student Admission Program,Application Fee,လျှောက်လွှာကြေး
 DocType: Process Payroll,Submit Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံ Submit
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Item {0} သည် Maxiumm လျှော့စျေး {1}% ဖြစ်ပါသည်
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Item {0} သည် Maxiumm လျှော့စျေး {1}% ဖြစ်ပါသည်
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,ထုထည်ကြီးအတွက်သွင်းကုန်
 DocType: Sales Partner,Address & Contacts,လိပ်စာ &amp; ဆက်သွယ်ရန်
 DocType: SMS Log,Sender Name,ပေးပို့သူအမည်
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,လိုအပ်ချက်စီ
 DocType: POS Profile,[Select],[ရွေးပါ]
 DocType: Vital Signs,Blood Pressure (diastolic),သွေးဖိအား (diastolic)
 DocType: SMS Log,Sent To,ရန်ကိုစလှေတျ
@@ -2460,7 +2506,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Next ကိုဆက်သွယ်ပါနေ့စွဲအတိတ်ထဲမှာမဖွစျနိုငျ
 DocType: Company,For Reference Only.,သာလျှင်ကိုးကားစရာသည်။
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},ဆရာဝန် {1} အပေါ်ရရှိနိုင် {0} မဟုတ်
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,ကို Select လုပ်ပါအသုတ်လိုက်အဘယ်သူမျှမ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,ကို Select လုပ်ပါအသုတ်လိုက်အဘယ်သူမျှမ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},မမှန်ကန်ခြင်း {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,ကိုးကားစရာ Inv
@@ -2476,15 +2522,15 @@
 DocType: Normal Test Items,Require Result Value,ရလဒ် Value ကိုလိုအပ်
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,အမှုနံပါတ် 0 မဖြစ်နိုင်
 DocType: Item,Show a slideshow at the top of the page,စာမျက်နှာ၏ထိပ်မှာတစ်ဆလိုက်ရှိုးပြရန်
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,စတိုးဆိုင်များ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,စတိုးဆိုင်များ
 DocType: Project Type,Projects Manager,စီမံကိန်းများ Manager က
 DocType: Serial No,Delivery Time,ပို့ဆောင်ချိန်
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Ageing အခြေပြုတွင်
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,ခန့်အပ်တာဝန်ပေးခြင်းဖျက်သိမ်း
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,ခန့်အပ်တာဝန်ပေးခြင်းဖျက်သိမ်း
 DocType: Item,End of Life,အသက်တာ၏အဆုံး
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,ခရီးသွား
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,ပေးထားသောရက်စွဲများအတွက်ဝန်ထမ်း {0} ဘို့မျှမတွေ့တက်ကြွသို့မဟုတ် default အနေနဲ့လစာဖွဲ့စည်းပုံ
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,ခရီးသွား
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,ပေးထားသောရက်စွဲများအတွက်ဝန်ထမ်း {0} ဘို့မျှမတွေ့တက်ကြွသို့မဟုတ် default အနေနဲ့လစာဖွဲ့စည်းပုံ
 DocType: Leave Block List,Allow Users,Allow အသုံးပြုသူများ
 DocType: Purchase Order,Customer Mobile No,ဖောက်သည်ကို Mobile မရှိပါ
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,ထပ်တလဲလဲ
@@ -2493,12 +2539,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Update ကိုကုန်ကျစရိတ်
 DocType: Item Reorder,Item Reorder,item Reorder
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Show ကိုလစာစလစ်ဖြတ်ပိုင်းပုံစံ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,ပစ္စည်းလွှဲပြောင်း
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,ပစ္စည်းလွှဲပြောင်း
 DocType: Fees,Send Payment Request,ငွေပေးချေမှုရမည့်တောင်းဆိုခြင်း Send
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",အဆိုပါစစ်ဆင်ရေးကိုသတ်မှတ်မှာ operating ကုန်ကျစရိတ်နှင့်သင်တို့၏စစ်ဆင်ရေးမှတစ်မူထူးခြားစစ်ဆင်ရေးမျှမပေး။
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ဤစာရွက်စာတမ်းကို item {4} ဘို့ {0} {1} အားဖြင့်ကန့်သတ်ကျော်ပြီဖြစ်ပါသည်။ သငျသညျ {2} အတူတူဆန့်ကျင်သည်အခြား {3} လုပ်နေပါတယ်?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,ချွေပြီးနောက်ထပ်တလဲလဲသတ်မှတ်ထားပေးပါ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,ပြောင်းလဲမှုငွေပမာဏကိုအကောင့်ကို Select လုပ်ပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,ပြောင်းလဲမှုငွေပမာဏကိုအကောင့်ကို Select လုပ်ပါ
 DocType: Purchase Invoice,Price List Currency,စျေးနှုန်း List ကိုငွေကြေးစနစ်
 DocType: Naming Series,User must always select,အသုံးပြုသူအမြဲရွေးချယ်ရမည်
 DocType: Stock Settings,Allow Negative Stock,အပြုသဘောမဆောင်သောစတော့အိတ် Allow
@@ -2518,7 +2564,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,လုပ်သား
 DocType: Sample Collection,Collected Time,ကောက်ခံအချိန်
 DocType: Company,Sales Monthly History,အရောင်းလစဉ်သမိုင်း
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,ကို Select လုပ်ပါအသုတ်လိုက်
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,ကို Select လုပ်ပါအသုတ်လိုက်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} အပြည့်အဝကြေညာတာဖြစ်ပါတယ်
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,အရေးကြီးသောသင်္ကေတများ
 DocType: Training Event,End Time,အဆုံးအချိန်
@@ -2526,16 +2572,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,ငွေပေးချေမှုရမည့်ဖြတ်တောက်ခြင်းများကိုသို့မဟုတ်ပျောက်ဆုံးခြင်း
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,အရောင်းသို့မဟုတ်ဝယ်ယူခြင်းအဘို့အစံစာချုပ်ဝေါဟာရများ။
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,ဘောက်ချာအားဖြင့်အုပ်စု
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,သင်ဤချိန်းသင်ပယ်ဖျက်လိုတာသေချာလား?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,အရောင်းပိုက်လိုင်း
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},လစာစိတျအပိုငျး {0} အတွက် default အနေနဲ့အကောင့်သတ်မှတ်ထားပေးပါ
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,တွင်လိုအပ်သော
 DocType: Rename Tool,File to Rename,Rename မှ File
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Row {0} အတွက် Item ဘို့ BOM ကို select လုပ်ပါကျေးဇူးပြုပြီး
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Row {0} အတွက် Item ဘို့ BOM ကို select လုပ်ပါကျေးဇူးပြုပြီး
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},အကောင့် {0} အကောင့်၏ Mode တွင်ကုမ္ပဏီ {1} နှင့်အတူမကိုက်ညီ: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},သတ်မှတ်ထားသော BOM {0} Item {1} သည်မတည်ရှိပါဘူး
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ပြုပြင်ထိန်းသိမ်းမှုဇယား {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
+DocType: POS Profile,Applicable for Users,အသုံးပြုသူများအဘို့သက်ဆိုင်သော
 DocType: Notification Control,Expense Claim Approved,စရိတ်တောင်းဆိုမှုများ Approved
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,ဝန်ထမ်း၏လစာစလစ်ဖြတ်ပိုင်းပုံစံ {0} ပြီးသားဤကာလအဘို့ဖန်တီး
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,ဝန်ထမ်း၏လစာစလစ်ဖြတ်ပိုင်းပုံစံ {0} ပြီးသားဤကာလအဘို့ဖန်တီး
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,ဆေးဝါး
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ဝယ်ယူပစ္စည်းများ၏ကုန်ကျစရိတ်
 DocType: Selling Settings,Sales Order Required,အရောင်းအမိန့်လိုအပ်ပါသည်
@@ -2560,6 +2608,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,အဖှဲ့အစညျး
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,အဖှဲ့အစညျး
 DocType: BOM Update Tool,BOM Update Tool,BOM Update ကို Tool ကို
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","ပါတီကုမ္ပဏီအတွက်သတ်မှတ်ထားသောမဟုတ်, ကျေးဇူးပြု. setup ကို default အနေနဲ့ပါတီအကောင့်အကောင့်"
 DocType: SG Creation Tool Course,Student Group Name,ကျောင်းသားအုပ်စုအမည်
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Creating အခကြေးငွေများ
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,သင်အမှန်တကယ်ဒီကုမ္ပဏီပေါင်းသည်တလုံးငွေကြေးလွှဲပြောင်းပယ်ဖျက်လိုသေချာအောင်လေ့လာပါ။ ထိုသို့အဖြစ်သင်၏သခင်ဒေတာဖြစ်နေလိမ့်မယ်။ ဤ action ပြင်. မရပါ။
@@ -2568,29 +2617,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ထုတ်လုပ်မှုအမိန့် {3} အတွက်စီစဉ်ထား quanitity ({2}) ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Shipping Rule,Shipping Rule Label,သဘောင်္တင်ခ Rule Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,အသုံးပြုသူဖိုရမ်
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,ကုန်ကြမ်းပစ္စည်းများအလွတ်မဖြစ်နိုင်။
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","ငွေတောင်းခံလွှာတစ်စက်ရေကြောင်းကို item များပါရှိသည်, စတော့ရှယ်ယာကို update မရနိုင်ပါ။"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,ကုန်ကြမ်းပစ္စည်းများအလွတ်မဖြစ်နိုင်။
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","ငွေတောင်းခံလွှာတစ်စက်ရေကြောင်းကို item များပါရှိသည်, စတော့ရှယ်ယာကို update မရနိုင်ပါ။"
 DocType: Lab Test Sample,Lab Test Sample,Lab ကစမ်းသပ်နမူနာ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,လျင်မြန်စွာ Journal မှ Entry &#39;
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM ဆိုတဲ့ item agianst ဖော်ပြခဲ့သောဆိုရင်နှုန်းကိုမပြောင်းနိုင်ပါ
+DocType: Restaurant,Invoice Series Prefix,ငွေတောင်းခံလွှာစီးရီးရှေ့စာလုံး
 DocType: Employee,Previous Work Experience,ယခင်လုပ်ငန်းအတွေ့အကြုံ
 DocType: Stock Entry,For Quantity,ပမာဏများအတွက်
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},အတန်းမှာ Item {0} သည်စီစဉ်ထားသော Qty ကိုရိုက်သွင်းပါ {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},အတန်းမှာ Item {0} သည်စီစဉ်ထားသော Qty ကိုရိုက်သွင်းပါ {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} တင်သွင်းသည်မဟုတ်
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,ပစ္စည်းများသည်တောင်းဆိုမှုများ။
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,အသီးအသီးကောင်းဆောင်းပါးတပုဒ်ကိုလက်စသတ်သည်သီးခြားထုတ်လုပ်မှုအမိန့်ကိုဖန်တီးလိမ့်မည်။
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} ပြန်လာစာရွက်စာတမ်းအတွက်အနုတ်လက္ခဏာဖြစ်ရပါမည်
 ,Minutes to First Response for Issues,ကိစ္စများများအတွက်ပထမဦးဆုံးတုံ့ပြန်မှုမှမိနစ်
 DocType: Purchase Invoice,Terms and Conditions1,စည်းကမ်းချက်များနှင့် Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,သငျသညျဤစနစ်တည်ထောင်ထားတဲ့များအတွက်အဖွဲ့အစည်း၏နာမတော်။
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,သငျသညျဤစနစ်တည်ထောင်ထားတဲ့များအတွက်အဖွဲ့အစည်း၏နာမတော်။
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",ဒီ up to date ဖြစ်နေအေးခဲစာရင်းကိုင် entry ကိုဘယ်သူမှလုပ်နိုင် / အောက်တွင်သတ်မှတ်ထားသောအခန်းကဏ္ဍ မှလွဲ. entry ကို modify ။
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,ပြုပြင်ထိန်းသိမ်းမှုအချိန်ဇယားထုတ်လုပ်ဖို့ရှေ့တော်၌ထိုစာရွက်စာတမ်းကိုကယ်တင် ကျေးဇူးပြု.
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,နောက်ဆုံးရစျေးနှုန်းအားလုံး BOMs အတွက် updated
 DocType: Fee Schedule,Successful,အောင်မြင်သော
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,စီမံချက်လက်ရှိအခြေအနေ
 DocType: UOM,Check this to disallow fractions. (for Nos),အပိုငျးအမြစ်တားရန်ဤစစ်ဆေးပါ။ (အမှတ်အတွက်)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,အောက်ပါထုတ်လုပ်မှုအမိန့်ကိုဖန်ဆင်းခဲ့သည်:
-DocType: Student Admission,Naming Series (for Student Applicant),(ကျောင်းသားလျှောက်ထားသူအတွက်) စီးရီးအမည်ဖြင့်သမုတ်
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,အောက်ပါထုတ်လုပ်မှုအမိန့်ကိုဖန်ဆင်းခဲ့သည်:
+DocType: Student Admission Program,Naming Series (for Student Applicant),(ကျောင်းသားလျှောက်ထားသူအတွက်) စီးရီးအမည်ဖြင့်သမုတ်
 DocType: Delivery Note,Transporter Name,Transporter အမည်
 DocType: Authorization Rule,Authorized Value,Authorized Value ကို
 DocType: BOM,Show Operations,Show ကိုစစ်ဆင်ရေး
@@ -2614,7 +2664,7 @@
 ,Employees working on a holiday,တစ်အားလပ်ရက်တွင်လုပ်ကိုင်န်ထမ်းများ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,မာကုလက်ရှိ
 DocType: Project,% Complete Method,% အပြီးအစီး Method ကို
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,ဆေး
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,ဆေး
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},ပြုပြင်ထိန်းသိမ်းမှုစတင်နေ့စွဲ Serial No {0} သည်ပို့ဆောင်မှုနေ့စွဲခင်မဖွစျနိုငျ
 DocType: Production Order,Actual End Date,အမှန်တကယ် End Date ကို
 DocType: BOM,Operating Cost (Company Currency),operating ကုန်ကျစရိတ် (ကုမ္ပဏီငွေကြေးစနစ်)
@@ -2632,13 +2682,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,အသုံးပြုသူအတည်ပြုပေးသောစိုးမိုးရေးသက်ဆိုင်သည် user အဖြစ်အတူတူမဖွစျနိုငျ
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),(စတော့အိတ် UOM နှုန်းအတိုင်း) အခြေခံပညာနှုန်း
 DocType: SMS Log,No of Requested SMS,တောင်းဆိုထားသော SMS ၏မရှိပါ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Pay ကိုမရှိရင် Leave အတည်ပြုခွင့်လျှောက်လွှာမှတ်တမ်းများနှင့်အတူမကိုက်ညီ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Pay ကိုမရှိရင် Leave အတည်ပြုခွင့်လျှောက်လွှာမှတ်တမ်းများနှင့်အတူမကိုက်ညီ
 DocType: Campaign,Campaign-.####,ကင်ပိန်း - ။ ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Next ကိုခြေလှမ်းများ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,အကောငျးဆုံးနှုန်းထားများမှာသတ်မှတ်ထားသောပစ္စည်းများထောက်ပံ့ပေးပါ
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,ပြေစာလုပ်ပါ
 DocType: Selling Settings,Auto close Opportunity after 15 days,15 ရက်အကြာမှာအော်တိုနီးစပ်အခွင့်အလမ်း
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,အရစ်ကျအမိန့်ကြောင့် {1} တစ် scorecard ရပ်တည်မှုမှ {0} ဘို့ခွင့်ပြုမထားပေ။
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,အရစ်ကျအမိန့်ကြောင့် {1} တစ် scorecard ရပ်တည်မှုမှ {0} ဘို့ခွင့်ပြုမထားပေ။
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,အဆုံးတစ်နှစ်တာ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quote /% ကိုပို့ဆောငျ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quote /% ကိုပို့ဆောငျ
@@ -2646,6 +2696,7 @@
 DocType: Vital Signs,Nutrition Values,အာဟာရတန်ဖိုးများ
 DocType: Lab Test Template,Is billable,ဘီလ်ဆောင်ဖြစ်ပါသည်
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",&quot;ဆရာဝန်ဇယား&quot; နှင့်ခန့်အပ်တာဝန်ပေးခြင်း Per အချိန်နှစ်ဦးစလုံး &quot;ဟုဒေါက်တာ {0} များအတွက်သတ်မှတ်ရပါမည်
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,ကော်မရှင်များအတွက်ကုမ္ပဏီများကထုတ်ကုန်ရောင်းချတဲ့သူတစ်ဦးကိုတတိယပါတီဖြန့်ဖြူး / အရောင်း / ကော်မရှင်အေးဂျင့် / Affiliate / ပြန်လည်ရောင်းချသူ။
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} ဝယ်ယူခြင်းအမိန့် {1} ဆန့်ကျင်
 DocType: Patient,Patient Demographics,လူနာဒေသစစ်တမ်းများ
@@ -2675,7 +2726,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","အားလုံးဝယ်ယူခြင်းငွေကြေးကိစ္စရှင်းလင်းမှုမှလျှောက်ထားနိုင်ပါသည်က Standard အခွန် Simple template ။ * ဤ template ကိုအခွန်ဦးခေါင်းစာရင်းမဆံ့နိုင်ပြီးကိုလည်း &quot;Shipping&quot;, &quot;အာမခံ&quot; စသည်တို့ကို &quot;ကိုင်တွယ်ခြင်း&quot; #### ကဲ့သို့အခြားစရိတ်အကြီးအကဲများသင်ဒီမှာသတ်မှတ်အဆိုပါအခွန်နှုန်းထားကိုအားလုံး ** ပစ္စည်းများများအတွက်စံအခွန်နှုန်းကဖွစျလိမျ့မညျမှတ်ချက် * ။ ကွဲပြားခြားနားသောနှုန်းထားများရှိသည် ** ပစ္စည်းများ ** ရှိပါတယ် အကယ်. သူတို့ ** Item ခွန်အတွက်ကဆက်ပြောသည်ရမည် ** ဇယားသည် ** Item ** မာစတာအတွက်။ ဒါဟာ ** စုစုပေါင်း ** Net ပေါ်မှာဖြစ်နိုင် (ထိုအခြေခံပမာဏ၏ပေါင်းလဒ်သည်) -:-Columns 1. တွက်ချက် Type ၏ #### ဖော်ပြချက်။ - ** ယခင် Row တွင်စုစုပေါင်း / ငွေပမာဏ ** (တဖြည်းဖြည်းတိုးပွားလာအခွန်သို့မဟုတ်စွဲချက်တွေအတွက်) ။ သင်သည်ဤ option ကိုရွေးချယ်ပါလျှင်, အခွန်ယခင်အတန်း (အခွန် table ထဲမှာ) ပမာဏသို့မဟုတ်စုစုပေါင်းတစ်ရာခိုင်နှုန်းအဖြစ်လျှောက်ထားပါလိမ့်မည်။ - ** (ဖော်ပြခဲ့သောကဲ့သို့) ** အမှန်တကယ်။ 2. အကောင့်အကြီးအကဲ: အခွန် / အုပ် (ရေကြောင်းနှင့်တူ) အနေနဲ့ဝင်ငွေသည်သို့မဟုတ်ကကုန်ကျစရိတ် Center ကဆန့်ကျင်ဘွတ်ကင်ရန်လိုအပ်ပါသည် expense အကယ်. : ဤအခွန် 3 ကုန်ကျစရိတ် Center ကကြိုတင်ဘွတ်ကင်လိမ့်မည်ဟူသောလက်အောက်ရှိအကောင့်လယ်ဂျာ။ 4. Description: (ကုန်ပို့လွှာ / quote တွေအတွက်ပုံနှိပ်လိမ့်မည်ဟု) အခွန်၏ဖော်ပြချက်။ 5. Rate: အခွန်နှုန်းက။ 6. ငွေပမာဏ: အခွန်ပမာဏ။ 7. စုစုပေါင်း: ဤအချက်မှတဖြည်းဖြည်းတိုးပွားများပြားလာစုစုပေါင်း။ 8. Row Enter: &quot;ယခင် Row စုစုပေါင်း&quot; အပေါ်အခြေခံပြီး အကယ်. သင်သည်ဤတွက်ချက်မှုတစ်ခုအခြေစိုက်စခန်းအဖြစ်ယူကြလိမ့်မည်ဟူသောအတန်းအရေအတွက် (default အနေနဲ့ယခင်အတန်းသည်) ကို select လုပ်ပေးနိုင်ပါတယ်။ 9. တွေအတွက်အခွန်သို့မဟုတ်တာဝန်ခံဖို့စဉ်းစားပါ: အခွန် / အုပ်အဘိုးပြတ် (စုစုပေါင်း၏မအစိတ်အပိုင်း) သည်သို့မဟုတ်သာစုစုပေါင်း (ပစ္စည်းမှတန်ဖိုးကိုထည့်သွင်းမမ) သို့မဟုတ်နှစ်ဦးစလုံးသည်သာလျှင်ဤအပိုင်းကိုသင်သတ်မှတ်နိုင်ပါတယ်။ 10. Add သို့မဟုတ်ထုတ်ယူ: သင်အခွန် add သို့မဟုတ်နှိမ်ချင်ဖြစ်စေ။"
 DocType: Homepage,Homepage,ပင်မစာမျက်နှာ
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,ဆရာဝန်ကိုရွေးချယ်ပါ ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',= &#39;{0}&#39; &#39;ဘယ်မှာနာမကိုအမှီ =&#39; {1} &#39;tabConsultation set ကိုငွေတောင်းခံလွှာကို update
 DocType: Purchase Receipt Item,Recd Quantity,Recd ပမာဏ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Created ကြေး Records ကို - {0}
 DocType: Asset Category Account,Asset Category Account,ပိုင်ဆိုင်မှုအမျိုးအစားအကောင့်
@@ -2687,7 +2737,7 @@
 DocType: Asset,Manual,လက်စွဲ
 DocType: Salary Component Account,Salary Component Account,လစာစိတျအပိုငျးအကောင့်
 DocType: Global Defaults,Hide Currency Symbol,ငွေကြေးစနစ်သင်္ကေတဝှက်
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","ဥပမာဘဏ်, ငွေ, Credit Card ကို"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","ဥပမာဘဏ်, ငွေ, Credit Card ကို"
 DocType: Lead Source,Source Name,source အမည်
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","လူကြီးအတွက်ပုံမှန်ကျိန်းဝပ်သွေးဖိအားခန့်မှန်းခြေအားဖြင့် 120 mmHg နှလုံးကျုံ့ဖြစ်ပြီး, 80 mmHg diastolic, အတိုကောက် &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,ခရက်ဒစ်မှတ်ချက်
@@ -2706,16 +2756,16 @@
 DocType: Patient,Occupation,အလုပ်အကိုင်
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,row {0}: Start ကိုနေ့စွဲ End Date ကိုခင်ဖြစ်ရမည်
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),စုစုပေါင်း (Qty)
-DocType: Sales Invoice,This Document,ဒီစာရွက်စာတမ်း
 DocType: Installation Note Item,Installed Qty,Install လုပ်ရတဲ့ Qty
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,ဤသည်မှာအဘယ်ကြောင့်ဆိုသော်အချို့မမှန်ကန်တဲ့အီးမေးလ်လိပ်စာများဖြစ်နိုင်
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,သငျသညျကဆက်ပြောသည်
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,လေ့ကျင့်ရေးရလဒ်
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,လေ့ကျင့်ရေးရလဒ်
 DocType: Purchase Invoice,Is Paid,Paid ဖြစ်ပါတယ်
 DocType: Salary Structure,Total Earning,စုစုပေါင်းဝင်ငွေ
 DocType: Purchase Receipt,Time at which materials were received,ပစ္စည်းများလက်ခံရရှိခဲ့ကြသည်မှာအချိန်
 DocType: Stock Ledger Entry,Outgoing Rate,outgoing Rate
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,"အစည်းအရုံး, အခက်အလက်မာစတာ။"
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,"အစည်းအရုံး, အခက်အလက်မာစတာ။"
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,သို့မဟုတ်
 DocType: Sales Order,Billing Status,ငွေတောင်းခံနဲ့ Status
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,တစ်ဦး Issue သတင်းပို့
@@ -2730,8 +2780,9 @@
 DocType: Notification Control,Sales Order Message,အရောင်းအမှာစာ
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","ကုမ္ပဏီ, ငွေကြေးစနစ်, လက်ရှိဘဏ္ဍာရေးနှစ်တစ်နှစ်တာစသည်တို့ကိုတူ Set Default တန်ဖိုးများ"
 DocType: Payment Entry,Payment Type,ငွေပေးချေမှုရမည့် Type
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Item {0} များအတွက်အသုတ်လိုက်ရွေးပါ။ ဒီလိုအပ်ချက်ပြည့်တဲ့တစ်ခုတည်းသောအသုတ်ကိုရှာဖွေနိုင်ခြင်း
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Item {0} များအတွက်အသုတ်လိုက်ရွေးပါ။ ဒီလိုအပ်ချက်ပြည့်တဲ့တစ်ခုတည်းသောအသုတ်ကိုရှာဖွေနိုင်ခြင်း
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Item {0} များအတွက်အသုတ်လိုက်ရွေးပါ။ ဒီလိုအပ်ချက်ပြည့်တဲ့တစ်ခုတည်းသောအသုတ်ကိုရှာဖွေနိုင်ခြင်း
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Item {0} များအတွက်အသုတ်လိုက်ရွေးပါ။ ဒီလိုအပ်ချက်ပြည့်တဲ့တစ်ခုတည်းသောအသုတ်ကိုရှာဖွေနိုင်ခြင်း
+DocType: Hub Category,Parent Category,မိဘအမျိုးအစား
 DocType: Process Payroll,Select Employees,ဝန်ထမ်းများကိုရွေးပါ
 DocType: Opportunity,Potential Sales Deal,အလားအလာရှိသောအရောင်း Deal
 DocType: Complaint,Complaints,တိုင်ကြားမှုများ
@@ -2769,7 +2820,7 @@
 DocType: Bin,Reserved Quantity,Reserved ပမာဏ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,မှန်ကန်သော email address ကိုရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,မှန်ကန်သော email address ကိုရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,လှည်းတစ်ခုကို item ကို select ပေးပါ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,လှည်းတစ်ခုကို item ကို select ပေးပါ
 DocType: Landed Cost Voucher,Purchase Receipt Items,Receipt ပစ္စည်းများဝယ်ယူရန်
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,အထူးပြုလုပ်ခြင်း Form များ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,ပေးဆောငျရနျငှေကနျြ
@@ -2779,15 +2830,15 @@
 DocType: Payment Request,Amount in customer's currency,ဖောက်သည်ရဲ့ငွေကြေးပမာဏ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,delivery
 DocType: Stock Reconciliation Item,Current Qty,လက်ရှိ Qty
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,ပေးသွင်း Add
+DocType: Restaurant Menu,Restaurant Menu,စားသောက်ဆိုင်မီနူး
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,prev
 DocType: Appraisal Goal,Key Responsibility Area,Key ကိုတာဝန်သိမှုဧရိယာ
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","ကျောင်းသား batch သင်ကျောင်းသားများအတွက်တက်ရောက်သူ, အကဲဖြတ်ခြင်းနှင့်အဖိုးအခကိုခြေရာခံကိုကူညီ"
 DocType: Payment Entry,Total Allocated Amount,စုစုပေါင်းခွဲဝေပမာဏ
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,အစဉ်အမြဲစာရင်းမဘို့ရာခန့်က default စာရင်းအကောင့်
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,အစဉ်အမြဲစာရင်းမဘို့ရာခန့်က default စာရင်းအကောင့်
 DocType: Item Reorder,Material Request Type,material တောင်းဆိုမှုကအမျိုးအစား
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},{0} {1} မှလစာများအတွက်တိကျမှန်ကန်ဂျာနယ် Entry &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage အပြည့်အဝဖြစ်ပါသည်, မကယ်တင်ခဲ့ဘူး"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage အပြည့်အဝဖြစ်ပါသည်, မကယ်တင်ခဲ့ဘူး"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,row {0}: UOM ကူးပြောင်းခြင်း Factor နဲ့မဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,ROOM တွင်စွမ်းဆောင်ရည်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref
@@ -2826,16 +2877,18 @@
 DocType: Project,Task Completion,task ကိုပြီးမြောက်ခြင်း
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,မစတော့အိတ်အတွက်
 DocType: Appraisal,HR User,HR အသုံးပြုသူတို့၏
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,အခွန်နှင့်စွပ်စွဲချက်နုတ်ယူ
-apps/erpnext/erpnext/hooks.py +129,Issues,အရေးကိစ္စများ
+apps/erpnext/erpnext/hooks.py +138,Issues,အရေးကိစ္စများ
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},အဆင့်အတန်း {0} တယောက်ဖြစ်ရပါမည်
 DocType: Sales Invoice,Debit To,debit ရန်
+DocType: Restaurant Menu Item,Restaurant Menu Item,စားသောက်ဆိုင်မီနူး Item
 DocType: Delivery Note,Required only for sample item.,သာနမူနာကို item လိုအပ်သည်။
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Transaction ပြီးနောက်အမှန်တကယ် Qty
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},{0} နှင့် {1} အကြားမျှမတွေ့လစာစလစ်
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},{0} နှင့် {1} အကြားမျှမတွေ့လစာစလစ်
 ,Pending SO Items For Purchase Request,ဝယ်ယူခြင်းတောင်းဆိုခြင်းသည်ဆိုင်းငံ SO ပစ္စည်းများ
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,ကျောင်းသားသမဂ္ဂအဆင့်လက်ခံရေး
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} ကိုပိတ်ထားသည်
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,ကျောင်းသားသမဂ္ဂအဆင့်လက်ခံရေး
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} ကိုပိတ်ထားသည်
 DocType: Supplier,Billing Currency,ငွေတောင်းခံငွေကြေးစနစ်
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,အပိုအကြီးစား
@@ -2858,6 +2911,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,လိုအပ်သောလာရောက်လည်ပတ်သူမျှဖော်ပြထားခြင်း ကျေးဇူးပြု.
 DocType: Stock Settings,Default Valuation Method,default အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နည်းနိဿယ
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,ကြေး
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,တိုးတက်မှုအတွက် Update ကို။ ဒါဟာခဏတစ်ယူပေလိမ့်မည်။
 DocType: Vehicle Log,Fuel Qty,လောင်စာအရည်အတွက်
 DocType: Production Order Operation,Planned Start Time,စီစဉ်ထား Start ကိုအချိန်
 DocType: Course,Assessment,အကဲဖြတ်
@@ -2873,7 +2927,7 @@
 DocType: Price List,Price List Master,စျေးနှုန်း List ကိုမဟာ
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,အားလုံးသည်အရောင်းငွေကြေးကိစ္စရှင်းလင်းမှုမျိုးစုံ ** အရောင်း Persons ဆန့်ကျင် tagged နိုင်ပါတယ် ** သင်ပစ်မှတ် ထား. စောင့်ကြည့်နိုင်အောင်။
 ,S.O. No.,SO အမှတ်
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},ခဲထံမှ {0} ဖောက်သည်ဖန်တီး ကျေးဇူးပြု.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},ခဲထံမှ {0} ဖောက်သည်ဖန်တီး ကျေးဇူးပြု.
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,လူနာကို Select လုပ်ပါ
 DocType: Price List,Applicable for Countries,နိုင်ငံများအဘို့သက်ဆိုင်သော
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,parameter အမည်
@@ -2905,27 +2959,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,စရိတ် / Difference အကောင့်ကို ({0}) တစ်ဦး &#39;&#39; အကျိုးအမြတ်သို့မဟုတ်ပျောက်ဆုံးခြင်း &#39;&#39; အကောင့်ကိုရှိရမည်
 DocType: Project,Copied From,မှစ. ကူးယူ
 DocType: Project,Copied From,မှစ. ကူးယူ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},အမှားအမည်: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,ပြတ်လပ်မှု
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},အမှားအမည်: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,ပြတ်လပ်မှု
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} {2} {3} နှင့်ဆက်စပ်ပါဘူး
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ဝန်ထမ်း {0} သည်တက်ရောက်သူပြီးသားမှတ်သားသည်
 DocType: Packing Slip,If more than one package of the same type (for print),(ပုံနှိပ်သည်) တူညီသောအမျိုးအစားတစ်ခုထက် ပို. package ကို အကယ်.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,စားသောက်ဆိုင်က Settings ထဲမှာ default အနေနဲ့ဖောက်သည်သတ်မှတ်ပေးပါ
 ,Salary Register,လစာမှတ်ပုံတင်မည်
 DocType: Warehouse,Parent Warehouse,မိဘဂိုဒေါင်
 DocType: C-Form Invoice Detail,Net Total,Net ကစုစုပေါင်း
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},default Item {0} ဘို့မတွေ့ရှိ BOM နှင့်စီမံကိန်း {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},default Item {0} ဘို့မတွေ့ရှိ BOM နှင့်စီမံကိန်း {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,အမျိုးမျိုးသောချေးငွေအမျိုးအစားများကိုသတ်မှတ်
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,ထူးချွန်ငွေပမာဏ
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),(မိနစ်၌) အချိန်
 DocType: Project Task,Working,အလုပ်အဖွဲ့
 DocType: Stock Ledger Entry,Stock Queue (FIFO),စတော့အိတ်တန်းစီ (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,ဘဏ္ဍာရေးတစ်နှစ်တာ
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,ဘဏ္ဍာရေးတစ်နှစ်တာ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} ကုမ္ပဏီ {1} ပိုင်ပါဘူး
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,စံ {0} များအတွက် function ကိုဂိုးသွင်းဖြေရှင်းမပေးနိုင်ခဲ့ပါ။ ယင်းပုံသေနည်းတရားဝင်သည်သေချာအောင်လုပ်ပါ။
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,အဖြစ်အပေါ်ကုန်ကျ
 DocType: Healthcare Settings,Out Patient Settings,လူနာက Settings ထဲကကို
 DocType: Account,Round Off,ပိတ် round
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,အရေအတွက်အပြုသဘောဖြစ်ရမည်
 ,Requested Qty,တောင်းဆိုထားသော Qty
 DocType: Tax Rule,Use for Shopping Cart,စျေးဝယ်လှည်းအသုံးပြု
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Value ကို {0} Attribute ဘို့ {1} တရားဝင်ပစ္စည်းများ၏စာရင်းထဲတွင်မတည်ရှိပါဘူး Item {2} များအတွက်တန်ဖိုးများ Attribute
@@ -2934,7 +2990,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",စွဲချက်သင့်ရဲ့ရွေးချယ်မှုနှုန်းအဖြစ်ကို item qty သို့မဟုတ်ပမာဏအပေါ်အခြေခံပြီးအခြိုးအစားဖြန့်ဝေပါလိမ့်မည်
 DocType: Maintenance Visit,Purposes,ရည်ရွယ်ချက်
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Atleast တယောက်ကို item ပြန်လာစာရွက်စာတမ်းအတွက်အနုတ်လက္ခဏာအရေအတွက်နှင့်အတူသို့ဝင်သင့်ပါတယ်
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,သင်တန်းများ Add
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","စစ်ဆင်ရေး {0} ရှည်ကို Workstation {1} အတွက်မဆိုရရှိနိုင်အလုပ်လုပ်နာရီထက်, မျိုးစုံစစ်ဆင်ရေးသို့စစ်ဆင်ရေးဖြိုဖျက်"
 ,Requested,မေတ္တာရပ်ခံ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,အဘယ်သူမျှမမှတ်ချက်
@@ -2946,6 +3001,8 @@
 DocType: Employee Loan,Repaid/Closed,ဆပ် / ပိတ်သည်
 DocType: Item,Total Projected Qty,စုစုပေါင်းစီမံကိန်းအရည်အတွက်
 DocType: Monthly Distribution,Distribution Name,ဖြန့်ဖြူးအမည်
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,ပေးသွင်း&gt; ပေးသွင်းအမျိုးအစား
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","အဘိုးပြတ်မှုနှုန်း {1} {2} များအတွက်စာရင်းကိုင် entries တွေကိုလုပ်ဖို့လိုအပ်သောပစ္စည်း {0}, အဘို့ရှာမတွေ့ပါ။ ပစ္စည်းတစ်ခုသုညအဘိုးပြတ်မှုနှုန်းကို item အဖြစ်လုပ်ဆောင်လျက်ရှိသည်လျှင် {1}, ပု {1} Item table ထဲမှာကြောင်းဖော်ပြထားခြင်းပါ။ ဒီလိုမှမဟုတ်ရင်ပစ္စည်းတစ်ခုဝင်လာသောစတော့ရှယ်ယာအရောင်းအဝယ်အတွက်ဖန်တီးသို့မဟုတ်ဖော်ပြထားခြင်းအဘိုးပြတ်နှုန်း Item စံချိန်အတွက်, ပြီးတော့ဒီ entry ပယ်ဖျက် / submiting ကြိုးစားကြည့်ပါ"
 DocType: Course,Course Code,သင်တန်း Code ကို
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Item {0} သည်လိုအပ်သောအရည်အသွေးပြည့်စစ်ဆေးရေး
 DocType: POS Settings,Use POS in Offline Mode,အော့ဖ်လိုင်းဖြင့် Mode တွင် POS သုံးပါ
@@ -2956,14 +3013,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,နယ်မြေတွေကို Tree Manage ။
 DocType: Journal Entry Account,Sales Invoice,အရောင်းပြေစာ
 DocType: Journal Entry Account,Party Balance,ပါတီ Balance
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,လျှော့တွင် Apply ကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,လျှော့တွင် Apply ကို select ကျေးဇူးပြု.
 DocType: Company,Default Receivable Account,default receiver အကောင့်
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,အထက်ပါရွေးချယ်ထားသောသတ်မှတ်ချက်များသည်ပေးဆောင်စုစုပေါင်းလစာများအတွက်ဘဏ်မှ Entry Create
 DocType: Physician,Physician Schedule,ဆရာဝန်ဇယား
 DocType: Purchase Invoice,Deemed Export,ယူဆပါသည်ပို့ကုန်
 DocType: Stock Entry,Material Transfer for Manufacture,Manufacturing သည်ပစ္စည်းလွှဲပြောင်း
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,လျော့စျေးရာခိုင်နှုန်းတစ်စျေးနှုန်း List ကိုဆန့်ကျင်သို့မဟုတ်အားလုံးစျေးနှုန်းစာရင်းများအတွက်လည်းကောင်းလျှောက်ထားနိုင်ပါသည်။
-DocType: Purchase Invoice,Half-yearly,ဝက်နှစ်စဉ်
+DocType: Subscription,Half-yearly,ဝက်နှစ်စဉ်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,စတော့အိတ်သည်စာရင်းကိုင် Entry &#39;
 DocType: Lab Test,LabTest Approver,LabTest သဘောတူညီချက်ပေး
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,သငျသညျပြီးသား {} အဆိုပါအကဲဖြတ်သတ်မှတ်ချက်အဘို့အအကဲဖြတ်ပါပြီ။
@@ -2992,13 +3049,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,အပိုအသေးစား
 DocType: Company,Standard Template,စံ Template
 DocType: Training Event,Theory,သဘောတရား
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,သတိပေးချက်: Qty တောင်းဆိုထားသောပစ္စည်းအနည်းဆုံးအမိန့် Qty ထက်နည်းသော
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,သတိပေးချက်: Qty တောင်းဆိုထားသောပစ္စည်းအနည်းဆုံးအမိန့် Qty ထက်နည်းသော
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,အကောင့်ကို {0} အေးခဲသည်
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,အဖွဲ့ပိုင်ငွေစာရင်း၏သီးခြားဇယားနှင့်အတူဥပဒေကြောင်းအရ Entity / လုပ်ငန်းခွဲများ။
 DocType: Payment Request,Mute Email,အသံတိတ်အီးမေးလ်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","အစားအစာ, Beverage &amp; ဆေးရွက်ကြီး"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},သာ unbilled {0} ဆန့်ကျင်ငွေပေးချေမှုကိုဖြစ်စေနိုင်ပါတယ်
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,ကော်မရှင်နှုန်းက 100 မှာထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},သာ unbilled {0} ဆန့်ကျင်ငွေပေးချေမှုကိုဖြစ်စေနိုင်ပါတယ်
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,ကော်မရှင်နှုန်းက 100 မှာထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,ပထမဦးဆုံး {0} မဝင်ရ ကျေးဇူးပြု.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,မှအဘယ်သူမျှမဖြေကြားမှုများ
@@ -3016,10 +3073,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,အရောင်
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,အကဲဖြတ်အစီအစဉ်လိုအပ်ချက်
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,အရစ်ကျမိန့်တားဆီး
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,ဖြစ်ပေါ်နိုင်
 DocType: Patient Appointment,Scheduled,Scheduled
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,quotation အဘို့တောင်းဆိုခြင်း။
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,လူ့စွမ်းအားအရင်းအမြစ်အတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုထမ်း&gt; HR က Settings
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",&quot;စတော့အိတ် Item ရှိ၏&quot; ဘယ်မှာ Item ကို select &quot;No&quot; ဖြစ်ပါတယ်နှင့် &quot;အရောင်း Item ရှိ၏&quot; &quot;ဟုတ်တယ်&quot; ဖြစ်ပါတယ်မှတပါးအခြားသောကုန်ပစ္စည်း Bundle ကိုလည်းရှိ၏ ကျေးဇူးပြု.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,ဖောက်သည်ကို Select လုပ်ပါ
 DocType: Student Log,Academic,ပညာရပ်ဆိုင်ရာ
 DocType: Patient,Personal and Social History,ပုဂ္ဂိုလ်ရေးနှင့်လူမှုသမိုင်း
 DocType: Fee Schedule,Fee Breakup for each student,တစ်ခုချင်းစီကိုကျောင်းသားများအတွက်အခကြေးငွေအဖွဲ့ဟာ
@@ -3029,7 +3087,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,အဘိုးပြတ် Rate
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,ဒီဇယ်
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,စျေးနှုန်း List ကိုငွေကြေးစနစ်ကိုမရွေးချယ်
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,စျေးနှုန်း List ကိုငွေကြေးစနစ်ကိုမရွေးချယ်
 apps/erpnext/erpnext/config/healthcare.py +46,Results,ရလဒ်များ
 ,Student Monthly Attendance Sheet,ကျောင်းသားသမဂ္ဂလစဉ်တက်ရောက်စာရွက်
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},ဝန်ထမ်း {0} ပြီးသား {1} {2} နှင့် {3} အကြားလျှောက်ထားခဲ့သည်
@@ -3045,7 +3103,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,အရောင်း Partners Manage ။
 DocType: Quality Inspection,Inspection Type,စစ်ဆေးရေး Type
 DocType: Fee Validity,Visited yet,သေး Visited
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,လက်ရှိငွေပေးငွေယူနှင့်အတူဂိုဒေါင်အုပ်စုအဖြစ်ပြောင်းလဲမရနိုင်ပါ။
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,လက်ရှိငွေပေးငွေယူနှင့်အတူဂိုဒေါင်အုပ်စုအဖြစ်ပြောင်းလဲမရနိုင်ပါ။
 DocType: Assessment Result Tool,Result HTML,ရလဒ်က HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,တွင်သက်တမ်းကုန်ဆုံးမည်
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,ကျောင်းသားများ Add
@@ -3072,7 +3130,7 @@
 DocType: Healthcare Settings,Result Printed,ရလဒ်ပုံနှိပ်
 DocType: Asset Category Account,Depreciation Expense Account,တန်ဖိုးသုံးစွဲမှုအကောင့်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Probationary Period
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},ကြည့်ရန် {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},ကြည့်ရန် {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,သာအရွက်ဆုံမှတ်များအရောင်းအဝယ်အတွက်ခွင့်ပြု
 DocType: Expense Claim,Expense Approver,စရိတ်အတည်ပြုချက်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,row {0}: ဖောက်သည်ဆန့်ကျင်ကြိုတင်အကြွေးဖြစ်ရပါမည်
@@ -3084,7 +3142,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Datetime မှ
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,သင်တန်းအချိန်ဇယားကိုဖျက်လိုက်ပါ:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,SMS ပေးပို့အဆင့်အတန်းကိုထိန်းသိမ်းသည် logs
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,အရောင်းပစ်မှတ် Set
 DocType: Accounts Settings,Make Payment via Journal Entry,ဂျာနယ် Entry မှတဆင့်ငွေပေးချေမှုရမည့် Make
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,တွင်ပုံနှိပ်
 DocType: Item,Inspection Required before Delivery,ဖြန့်ဝေမီကတောင်းဆိုနေတဲ့စစ်ဆေးရေး
@@ -3092,7 +3149,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,ဆိုင်းငံ့ထားလှုပ်ရှားမှုများ
 DocType: Patient Appointment,Reminded,သတိပေး
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,သင့်ရဲ့အဖွဲ့
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,သင့်ရဲ့အဖွဲ့
 DocType: Fee Component,Fees Category,အဖိုးအခ Category:
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,နေ့စွဲ relieving ရိုက်ထည့်ပေးပါ။
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
@@ -3104,7 +3161,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reorder အဆင့်
 DocType: Company,Chart Of Accounts Template,Accounts ကို Template ၏ဇယား
 DocType: Attendance,Attendance Date,တက်ရောက်သူနေ့စွဲ
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},item စျေးစျေးစာရင်း {1} အတွက် {0} ဘို့ updated
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},item စျေးစျေးစာရင်း {1} အတွက် {0} ဘို့ updated
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ဝင်ငွေနဲ့ထုတ်ယူအပေါ်အခြေခံပြီးလစာအဖြစ်ခွဲထုတ်။
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,ကလေး nodes နဲ့အကောင့်ကိုလယ်ဂျာမှပြောင်းလဲမပြနိုင်
 DocType: Purchase Invoice Item,Accepted Warehouse,လက်ခံထားတဲ့ဂိုဒေါင်
@@ -3120,9 +3177,10 @@
 ,Employee Birthday,ဝန်ထမ်းမွေးနေ့
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,ကျောင်းသားအသုတ်လိုက်တက်ရောက် Tool ကို
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,ကန့်သတ်ဖြတ်ကူး
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,နူန်းကျော်ကျော် Scheduled
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,အကျိုးတူ Capital ကို
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,ဒီ &#39;&#39; ပညာရေးတစ်နှစ်တာ &#39;&#39; {0} နှင့် {1} ပြီးသားတည်ရှိ &#39;&#39; Term အမည် &#39;&#39; နှင့်အတူတစ်ဦးပညာသင်နှစ်သက်တမ်း။ ဤအ entries တွေကိုပြုပြင်မွမ်းမံခြင်းနှင့်ထပ်ကြိုးစားပါ။
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","ကို item {0} ဆန့်ကျင်တည်ဆဲအရောင်းအရှိဖြစ်သကဲ့သို့, သင်က {1} ၏တန်ဖိုးမပြောင်းနိုင်ပါ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","ကို item {0} ဆန့်ကျင်တည်ဆဲအရောင်းအရှိဖြစ်သကဲ့သို့, သင်က {1} ၏တန်ဖိုးမပြောင်းနိုင်ပါ"
 DocType: UOM,Must be Whole Number,လုံးနံပါတ်ဖြစ်ရမည်
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(Days ခုနှစ်တွင်) ခွဲဝေနယူးရွက်
 DocType: Purchase Invoice,Invoice Copy,ငွေတောင်းခံလွှာကိုကူးယူပြီး
@@ -3132,7 +3190,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,ကုန်ပို့လွှာနံပါတ်
 DocType: Shopping Cart Settings,Orders,အမိန့်
 DocType: Employee Leave Approver,Leave Approver,ခွင့်ပြုချက် Leave
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,တစ်သုတ်ကို select ပေးပါ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,တစ်သုတ်ကို select ပေးပါ
 DocType: Assessment Group,Assessment Group Name,အကဲဖြတ် Group မှအမည်
 DocType: Manufacturing Settings,Material Transferred for Manufacture,ထုတ်လုပ်ခြင်းများအတွက်သို့လွှဲပြောင်း material
 DocType: Expense Claim,"A user with ""Expense Approver"" role",&quot;သုံးစွဲမှုအတည်ပြုချက်&quot; အခန်းကဏ္ဍနှင့်အတူအသုံးပြုသူတစ်ဦး
@@ -3147,7 +3205,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,ကာလသင်တန်းဆင်းပွဲ Entry &#39;
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,ဦးစီးဌာနရွေးပါ ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,လက်ရှိအရောင်းအနှင့်အတူကုန်ကျစရိတ် Center ကအုပ်စုအဖြစ်ပြောင်းလဲမပြနိုင်
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},ငွေပမာဏ {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},ငွေပမာဏ {0} {1} {2} {3}
 DocType: Account,Depreciation,တန်ဖိုး
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ပေးသွင်းသူ (များ)
 DocType: Employee Attendance Tool,Employee Attendance Tool,ဝန်ထမ်းတက်ရောက် Tool ကို
@@ -3159,10 +3217,12 @@
 DocType: GL Entry,Voucher No,ဘောက်ချာမရှိ
 ,Lead Owner Efficiency,ခဲပိုင်ရှင်စွမ်းရည်
 ,Lead Owner Efficiency,ခဲပိုင်ရှင်စွမ်းရည်
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,လူကြိုက်အများဆုံး
 DocType: Leave Allocation,Leave Allocation,ဖြန့်ဝေ Leave
 DocType: Payment Request,Recipient Message And Payment Details,လက်ခံရရှိသူကို Message ထိုအငွေပေးချေမှုရမည့်အသေးစိတ်
 DocType: Training Event,Trainer Email,သင်တန်းပေးတဲ့အီးမေးလ်ဂ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,material တောင်းဆို {0} နေသူများကဖန်တီး
+DocType: Restaurant Reservation,No of People,ပြည်သူ့မျှ
 DocType: Production Planning Tool,Include sub-contracted raw materials,Sub-ကန်ထရိုက်ကုန်ကြမ်း Include
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,ဝေါဟာရသို့မဟုတ်ကန်ထရိုက်၏ template ။
 DocType: Purchase Invoice,Address and Contact,လိပ်စာနှင့်ဆက်သွယ်ရန်
@@ -3171,10 +3231,11 @@
 DocType: Supplier,Last Day of the Next Month,နောက်လ၏နောက်ဆုံးနေ့
 DocType: Support Settings,Auto close Issue after 7 days,7 ရက်အတွင်းအပြီးအော်တိုအနီးကပ်ပြဿနာ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ခွင့်ချိန်ခွင်လျှာထားပြီးအနာဂတ်ခွင့်ခွဲဝေစံချိန် {1} အတွက် PPP ဖြင့်ချဉ်းကပ်-forward နိုင်သည်သိရသည်အဖြစ် Leave, {0} မီကခွဲဝေမရနိုငျ"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),မှတ်ချက်: ကြောင့် / ကိုးကားစရာနေ့စွဲ {0} တနေ့ (များ) ကခွင့်ပြုဖောက်သည်အကြွေးရက်ပတ်လုံးထက်ကျော်လွန်
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),မှတ်ချက်: ကြောင့် / ကိုးကားစရာနေ့စွဲ {0} တနေ့ (များ) ကခွင့်ပြုဖောက်သည်အကြွေးရက်ပတ်လုံးထက်ကျော်လွန်
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,ကျောင်းသားသမဂ္ဂလျှောက်ထားသူ
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,RECIPIENT FOR ORIGINAL
 DocType: Asset Category Account,Accumulated Depreciation Account,စုဆောင်းတန်ဖိုးအကောင့်
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,ဤသည်ကိုအီးမေးလ် autogenerated ဖြစ်ပါတယ်
 DocType: Stock Settings,Freeze Stock Entries,အေးစတော့အိတ် Entries
 DocType: Program Enrollment,Boarding Student,boarding ကျောင်းသား
 DocType: Asset,Expected Value After Useful Life,အသုံးဝင်သောဘဝပြီးနောက်မျှော်လင့်ထား Value တစ်ခု
@@ -3182,7 +3243,7 @@
 DocType: Activity Cost,Billing Rate,ငွေတောင်းခံ Rate
 ,Qty to Deliver,လှတျတျောမူဖို့ Qty
 ,Stock Analytics,စတော့အိတ် Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,စစ်ဆင်ရေးအလွတ်ကျန်ရစ်မရနိုငျ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,စစ်ဆင်ရေးအလွတ်ကျန်ရစ်မရနိုငျ
 DocType: Maintenance Visit Purpose,Against Document Detail No,Document ဖိုင် Detail မရှိဆန့်ကျင်
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,ပါတီအမျိုးအစားမဖြစ်မနေဖြစ်ပါသည်
 DocType: Quality Inspection,Outgoing,outgoing
@@ -3205,7 +3266,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,ယင်းလုပ်ဆောင်ချက်ကိုအခြေခံပြီး Group မှအဘို့ကို manually ကျောင်းသားများကိုကို Select လုပ်ပါ
 DocType: Journal Entry,User Remark,အသုံးပြုသူမှတ်ချက်
 DocType: Lead,Market Segment,Market မှာအပိုင်း
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Paid ငွေပမာဏစုစုပေါင်းအနုတ်ထူးချွန်ငွေပမာဏ {0} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Paid ငွေပမာဏစုစုပေါင်းအနုတ်ထူးချွန်ငွေပမာဏ {0} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Supplier Scorecard Period,Variables,variables ကို
 DocType: Employee Internal Work History,Employee Internal Work History,ဝန်ထမ်းပြည်တွင်းလုပ်ငန်းခွင်သမိုင်း
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),(ဒေါက်တာ) ပိတ်ပွဲ
@@ -3235,21 +3296,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Updates ကိုရယူပါ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: အကောင့် {2} ကုမ္ပဏီ {3} ပိုင်ပါဘူး
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,material တောင်းဆိုမှု {0} ကိုပယ်ဖျက်သို့မဟုတ်ရပ်တန့်နေသည်
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,စီမံခန့်ခွဲမှု Leave
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,စီမံခန့်ခွဲမှု Leave
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,အကောင့်အားဖြင့်အုပ်စု
 DocType: Sales Order,Fully Delivered,အပြည့်အဝကိုကယ်နှုတ်
 DocType: Lead,Lower Income,lower ဝင်ငွေခွန်
+DocType: Restaurant Order Entry,Current Order,လက်ရှိအမိန့်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},အရင်းအမြစ်နှင့်ပစ်မှတ်ဂိုဒေါင်အတန်း {0} သည်အတူတူပင်ဖြစ်နိုင်သေး
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",ဒီစတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးတစ်ဦးဖွင့်ပွဲ Entry ဖြစ်ပါတယ်ကတည်းကခြားနားချက်အကောင့်တစ်ခု Asset / ဆိုက်အမျိုးအစားအကောင့်ကိုရှိရမည်
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ထုတ်ချေးငွေပမာဏချေးငွေပမာဏ {0} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Programs ကိုကိုသွားပါ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Item {0} လိုအပ်ဝယ်ယူခြင်းအမိန့်အရေအတွက်
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,ထုတ်လုပ်မှုအမိန့်နေသူများကဖန်တီးမပေး
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,ထုတ်လုပ်မှုအမိန့်နေသူများကဖန်တီးမပေး
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;&#39; နေ့စွဲ မှစ. &#39;&#39; နေ့စွဲရန် &#39;&#39; နောက်မှာဖြစ်ရပါမည်
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ကျောင်းသား {0} ကျောင်းသားလျှောက်လွှာ {1} နှင့်အတူဆက်စပ်အဖြစ်အဆင့်အတန်းမပြောင်းနိုင်သ
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},ကျောင်းသား {0} ကျောင်းသားလျှောက်လွှာ {1} နှင့်အတူဆက်စပ်အဖြစ်အဆင့်အတန်းမပြောင်းနိုင်သ
 DocType: Asset,Fully Depreciated,အပြည့်အဝတန်ဖိုးလျော့ကျ
 ,Stock Projected Qty,စတော့အိတ် Qty စီမံကိန်း
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},customer {0} {1} သည်စီမံကိန်းပိုင်ပါဘူး
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},customer {0} {1} သည်စီမံကိန်းပိုင်ပါဘူး
 DocType: Employee Attendance Tool,Marked Attendance HTML,တခုတ်တရတက်ရောက် HTML ကို
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","ကိုးကားအဆိုပြုချက်, သင်သည်သင်၏ဖောက်သည်များစေလွှတ်ပြီလေလံများမှာ"
 DocType: Sales Order,Customer's Purchase Order,customer ရဲ့အမိန့်ကိုဝယ်ယူ
@@ -3260,8 +3322,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,ကြိုတင်ဘွတ်ကင်တန်ဖိုးအရေအတွက်သတ်မှတ်ထားပေးပါ
 DocType: Supplier Scorecard Period,Calculations,တွက်ချက်မှုများ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Value တစ်ခုသို့မဟုတ် Qty
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Productions အမိန့်သည်အထမြောက်စေတော်မရနိုင်သည်
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Productions အမိန့်သည်အထမြောက်စေတော်မရနိုင်သည်
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,မိနစ်
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup ကို&gt; Setting&gt; အမည်ဖြင့်သမုတ်စီးရီးကနေတဆင့် {0} များအတွက်စီးရီးအမည်ဖြင့်သမုတ်သတ်မှတ်ထား ကျေးဇူးပြု.
 DocType: Purchase Invoice,Purchase Taxes and Charges,အခွန်နှင့်စွပ်စွဲချက်ယ်ယူ
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,ပေးသွင်းကိုသွားပါ
 ,Qty to Receive,လက်ခံမှ Qty
@@ -3275,7 +3338,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,အကောင့်ကိုရန်အကြွေးတစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,အားလုံးသည်ပေးသွင်းအမျိုးအစားများ
 DocType: Global Defaults,Disable In Words,စကားထဲမှာ disable
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,Item တွေကိုအလိုအလျောက်နံပါတ်အမကဘယ်ကြောင့်ဆိုသော် item Code ကိုမသင်မနေရ
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,Item တွေကိုအလိုအလျောက်နံပါတ်အမကဘယ်ကြောင့်ဆိုသော် item Code ကိုမသင်မနေရ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},{0} မဟုတ်အမျိုးအစားစျေးနှုန်း {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,ပြုပြင်ထိန်းသိမ်းမှုဇယား Item
 DocType: Sales Order,%  Delivered,% ကယ်နှုတ်တော်မူ၏
@@ -3297,23 +3360,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Balance Equity ဖွင့်လှစ်
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N ကို
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,ပြန်လည်သင့်မြတ်ရေး
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,ကျန်ရှိနေသေးသော
 DocType: Appraisal,Appraisal,တန်ဖိုးခြင်း
 DocType: Purchase Invoice,GST Details,GST အသေးစိတ်
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},ကုန်ပစ္စည်းပေးသွင်း {0} မှစလှေတျတျောအီးမေးလ်
+DocType: Item,Default Sales Unit of Measure,တိုင်း၏ default အရောင်းယူနစ်
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,နေ့စွဲထပ်ခါတလဲလဲဖြစ်ပါတယ်
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Authorized လက်မှတ်ရေးထိုးထားသော
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},{0} တယောက်ဖြစ်ရပါမည်အတည်ပြုချက် Leave
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,အခကြေးငွေ Create
-DocType: Hub Settings,Seller Email,ရောင်းချသူအီးမေးလ်
 DocType: Project,Total Purchase Cost (via Purchase Invoice),(ဝယ်ယူခြင်းပြေစာကနေတဆင့်) စုစုပေါင်းဝယ်ယူကုန်ကျစရိတ်
 DocType: Training Event,Start Time,Start ကိုအချိန်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,ပမာဏကိုရွေးပါ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,ပမာဏကိုရွေးပါ
 DocType: Customs Tariff Number,Customs Tariff Number,အကောက်ခွန် Tariff အရေအတွက်
 DocType: Patient Appointment,Patient Appointment,လူနာခန့်အပ်တာဝန်ပေးခြင်း
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,အခန်းက္ပအတည်ပြုပေးသောစိုးမိုးရေးသက်ဆိုင်သည်အခန်းကဏ္ဍအဖြစ်အတူတူမဖွစျနိုငျ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,ဒီအအီးမေးလ် Digest မဂ္ဂဇင်းထဲကနေနှုတ်ထွက်
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,ဒီအအီးမေးလ် Digest မဂ္ဂဇင်းထဲကနေနှုတ်ထွက်
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,အားဖြင့်ပေးသွင်း Get
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} Item {1} ဘို့မတွေ့ရှိ
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,သင်တန်းများသို့သွားရန်
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,message Sent
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,ကလေးသူငယ် node များနှင့်အတူအကောင့်ကိုလယ်ဂျာအဖြစ်သတ်မှတ်မရနိုငျ
@@ -3326,11 +3392,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,ကုန်ထုတ်လုပ်မှုသည်လွှဲပြောင်း material
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,အကောင့်ကို {0} တည်ရှိပါဘူး
 DocType: Project,Project Type,စီမံကိန်းကအမျိုးအစား
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,ကလေးသူငယ် Task ကိုဒီ Task ကိုများအတွက်တည်ရှိ။ သင်ဤ Task ကိုမဖျက်နိုင်ပါ။
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ပစ်မှတ် qty သို့မဟုတ်ပစ်မှတ်ပမာဏကိုဖြစ်စေမဖြစ်မနေဖြစ်ပါတယ်။
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,အမျိုးမျိုးသောလှုပ်ရှားမှုများကုန်ကျစရိတ်
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,နောက်ထပ်ရလဒ်များအဘယ်သူမျှမ
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,အမျိုးမျိုးသောလှုပ်ရှားမှုများကုန်ကျစရိတ်
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",အရောင်း Persons အောက်ကမှပူးတွဲထမ်းတစ်ဦးအသုံးပြုသူ ID {1} ရှိသည်ပါဘူးကတည်းက {0} မှပွဲများကိုပြင်ဆင်ခြင်း
 DocType: Timesheet,Billing Details,ငွေတောင်းခံအသေးစိတ်
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,အရင်းအမြစ်နှင့်ပစ်မှတ်ဂိုဒေါင်မတူညီတဲ့သူဖြစ်ရမည်
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,အရင်းအမြစ်နှင့်ပစ်မှတ်ဂိုဒေါင်မတူညီတဲ့သူဖြစ်ရမည်
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},{0} ထက်အသက်အရွယ်ကြီးစတော့ရှယ်ယာအရောင်းအ update လုပ်ဖို့ခွင့်မပြု
 DocType: Purchase Invoice Item,PR Detail,PR စနစ် Detail
 DocType: Sales Order,Fully Billed,အပြည့်အဝကြေညာ
@@ -3357,7 +3425,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,ငွေလွှဲခြင်း
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,အားလုံး Check
 DocType: Vehicle Log,Invoice Ref,ငွေတောင်းခံလွှာ Ref
-DocType: Purchase Order,Recurring Order,ထပ်တလဲလဲအမိန့်
 DocType: Company,Default Income Account,default ဝင်ငွေခွန်အကောင့်
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,ဖောက်သည်အုပ်စု / ဖောက်သည်
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),မပိတ်ထားသည့်ဘဏ္ဍာရေးနှစ်တွင်အမြတ် / ပျောက်ဆုံးခြင်းစဉ် (Credit)
@@ -3371,9 +3438,9 @@
 DocType: Patient,A Negative,တစ်ဦးကအနုတ်
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,ပြသနိုင်ဖို့ကိုပိုပြီးအဘယ်အရာကိုမျှ။
 DocType: Lead,From Customer,ဖောက်သည်ထံမှ
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,ဖုန်းခေါ်ဆိုမှု
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,ဖုန်းခေါ်ဆိုမှု
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,တစ်ဦးကကုန်ပစ္စည်း
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,batch
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,batch
 DocType: Project,Total Costing Amount (via Time Logs),(အချိန် Logs ကနေတဆင့်) စုစုပေါင်းကုန်ကျငွေပမာဏ
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,ကြေးဇယား Make
 DocType: Purchase Order Item Supplied,Stock UOM,စတော့အိတ် UOM
@@ -3398,7 +3465,7 @@
 DocType: School Settings,Current Academic Term,လက်ရှိပညာရေးဆိုင်ရာ Term
 DocType: School Settings,Current Academic Term,လက်ရှိပညာရေးဆိုင်ရာ Term
 DocType: Sales Order,Not Billed,ကြေညာတဲ့မ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,နှစ်ဦးစလုံးဂိုဒေါင်အတူတူကုမ္ပဏီပိုင်ရမယ်
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,နှစ်ဦးစလုံးဂိုဒေါင်အတူတူကုမ္ပဏီပိုင်ရမယ်
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,အဘယ်သူမျှမ contacts တွေကိုသေးကဆက်ပြောသည်။
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,ကုန်ကျစရိတ်ဘောက်ချာငွေပမာဏဆင်းသက်
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,ပေးသွင်းခြင်းဖြင့်ကြီးပြင်းဥပဒေကြမ်းများ။
@@ -3407,7 +3474,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,လျော့စျေးပမာဏ
 DocType: Purchase Invoice,Return Against Purchase Invoice,ဝယ်ယူခြင်းပြေစာဆန့်ကျင်သို့ပြန်သွားသည်
 DocType: Item,Warranty Period (in days),(ရက်) ကိုအာမခံကာလ
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',update ကို `tabPatient Appointment` = &#39;{0}&#39; &#39;ဘယ်မှာနာမကိုအမှီ =&#39; {1} &#39;sales_invoice သတ်မှတ်ထား
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Guardian1 နှင့်အတူ relation
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,စစ်ဆင်ရေးကနေ Net ကငွေ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,item 4
@@ -3416,8 +3482,8 @@
 DocType: Journal Entry Account,Journal Entry Account,ဂျာနယ် Entry အကောင့်
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,ကျောင်းသားအုပ်စု
 DocType: Shopping Cart Settings,Quotation Series,စျေးနှုန်းစီးရီး
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","တစ်ဦးကို item နာမည်တူ ({0}) နှင့်အတူရှိနေတယ်, ပစ္စည်းအုပ်စုအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းကိုအမည်ပြောင်းကျေးဇူးတင်ပါ"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,ဖောက်သည်ကို select လုပ်ပါကျေးဇူးပြုပြီး
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","တစ်ဦးကို item နာမည်တူ ({0}) နှင့်အတူရှိနေတယ်, ပစ္စည်းအုပ်စုအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းကိုအမည်ပြောင်းကျေးဇူးတင်ပါ"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,ဖောက်သည်ကို select လုပ်ပါကျေးဇူးပြုပြီး
 DocType: C-Form,I,ငါ
 DocType: Company,Asset Depreciation Cost Center,ပိုင်ဆိုင်မှုတန်ဖိုးကုန်ကျစရိတ်စင်တာ
 DocType: Sales Order Item,Sales Order Date,အရောင်းအမှာစာနေ့စွဲ
@@ -3426,6 +3492,7 @@
 DocType: Assessment Plan,Assessment Plan,အကဲဖြတ်အစီအစဉ်
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,ဖောက်သည် {0} နေသူများကဖန်တီး။
 DocType: Stock Settings,Limit Percent,ရာခိုင်နှုန်းကန့်သတ်ရန်
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,မည်သည့်ဂိုဒေါင်ထဲမှာရရှိနိုင်လောလောဆယ်အဘယ်သူမျှမစတော့ရှယ်ယာ
 ,Payment Period Based On Invoice Date,ပြေစာနေ့စွဲတွင် အခြေခံ. ငွေပေးချေမှုရမည့်ကာလ
 DocType: Sample Collection,No. of print,ပုံနှိပ်၏အမှတ်
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},{0} သည်ငွေကြေးစနစ်ငွေလဲနှုန်းဦးပျောက်ဆုံးနေ
@@ -3481,13 +3548,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,စုစုပေါင်း Pay ကို - စုစုပေါင်းထုတ်ယူ - ချေးငွေပြန်ဆပ်
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,လက်ရှိ BOM နှင့် New BOM အတူတူမဖွစျနိုငျ
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,လစာစလစ်ဖြတ်ပိုင်းပုံစံ ID ကို
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,လစာစလစ်ဖြတ်ပိုင်းပုံစံ ID ကို
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,အငြိမ်းစားအမျိုးမျိုးနေ့စွဲအတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,အပေါ်သင်တန်းအချိန်ဇယားဆွဲနေစဉ်အမှားအယွင်းများရှိခဲ့သည်:
 DocType: Sales Invoice,Against Income Account,ဝင်ငွေခွန်အကောင့်ဆန့်ကျင်
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,ကယ်နှုတ်တော်မူ၏ {0}%
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,item {0}: မိန့် qty {1} {2} (Item မှာသတ်မှတ်ထားတဲ့) နိမ့်ဆုံးအမိန့် qty ထက်နည်းမဖြစ်နိုင်။
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,item {0}: မိန့် qty {1} {2} (Item မှာသတ်မှတ်ထားတဲ့) နိမ့်ဆုံးအမိန့် qty ထက်နည်းမဖြစ်နိုင်။
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,လစဉ်ဖြန့်ဖြူးရာခိုင်နှုန်း
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,အခြားအသုံးပြုသူအဖြစ် login ပေးပါ။
 DocType: Territory,Territory Targets,နယ်မြေတွေကိုပစ်မှတ်များ
 DocType: Delivery Note,Transporter Info,Transporter Info
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},ကုမ္ပဏီ {1} အတွက် default အနေနဲ့ {0} သတ်မှတ်ထားပေးပါ
@@ -3495,13 +3563,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,တူညီတဲ့ကုန်ပစ္စည်းပေးသွင်းအကြိမ်ပေါင်းများစွာသို့ဝင်ခဲ့
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,စုစုပေါင်းအမြတ် / ပျောက်ဆုံးခြင်း
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,ဝယ်ယူခြင်းအမိန့် Item ထောက်ပံ့
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,ကုမ္ပဏီအမည် Company ကိုမဖွစျနိုငျ
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,ကုမ္ပဏီအမည် Company ကိုမဖွစျနိုငျ
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ပုံနှိပ်တင်းပလိတ်များအဘို့အပေးစာခေါင်းဆောင်များ။
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ပုံနှိပ်တင်းပလိတ်များသည်ခေါင်းစဉ်များငွေလွှဲစာတမ်းတန်ဖိုးပြေစာဥပမာ။
 DocType: Program Enrollment,Walking,လမ်းလျှောက်
 DocType: Student Guardian,Student Guardian,ကျောင်းသားသမဂ္ဂဂါးဒီးယန်း
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,အဘိုးပြတ်သည်အတိုင်း type ကိုစွဲချက် Inclusive အဖြစ်မှတ်သားမရပါဘူး
 DocType: POS Profile,Update Stock,စတော့အိတ် Update
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,စာရင်းသွင်းထားသောအတွက်
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,ပစ္စည်းများသည်ကွဲပြားခြားနားသော UOM မမှန်ကန် (Total) Net ကအလေးချိန်တန်ဖိုးကိုဆီသို့ဦးတည်ပါလိမ့်မယ်။ အသီးအသီးကို item ၏ Net ကအလေးချိန်တူညီ UOM အတွက်ကြောင်းသေချာပါစေ။
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,အပိုင်းအစအဘို့အဂျာနယ် Entry &#39;
@@ -3551,15 +3620,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System ကိုအသုံးပြုသူ (login လုပ်လို့ရပါတယ်) ID ကို။ ထားလျှင်, အားလုံး HR ပုံစံများသည် default အဖြစ်လိမ့်မည်။"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1} မှစ.
 DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,ပစ္စည်းများအပေါငျးတို့သဘီလ်အတွက်နောက်ဆုံးပေါ်စျေးနှုန်းကို update တန်းစီထားသည်။ ဒါဟာမိနစ်အနည်းငယ်ကြာနိုင်ပါသည်။
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,ပစ္စည်းများအပေါငျးတို့သဘီလ်အတွက်နောက်ဆုံးပေါ်စျေးနှုန်းကို update တန်းစီထားသည်။ ဒါဟာမိနစ်အနည်းငယ်ကြာနိုင်ပါသည်။
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,အသစ်သောအကောင့်အမည်ဖြစ်တယ်။ မှတ်ချက်: Customer နှင့်ပေးသွင်းများအတွက်အကောင့်တွေကိုဖန်တီးကြပါဘူးကျေးဇူးပြုပြီး
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,တိုင်းပြည်ပညာရှိသောသူကို default လိပ်စာ Templates
 DocType: Sales Order Item,Supplier delivers to Customer,ပေးသွင်းဖောက်သည်မှကယ်တင်
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form ကို / ပစ္စည်း / {0}) စတော့ရှယ်ယာထဲကဖြစ်ပါတယ်
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},ကြောင့် / ကိုးကားစရာနေ့စွဲ {0} ပြီးနောက်မဖွစျနိုငျ
+,Sales Payment Summary,အရောင်းငွေပေးချေမှုရမည့်အနှစ်ချုပ်
+DocType: Restaurant,Restaurant,စားသောက်ဆိုင်
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},ကြောင့် / ကိုးကားစရာနေ့စွဲ {0} ပြီးနောက်မဖွစျနိုငျ
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ဒေတာပို့ကုန်သွင်းကုန်
 DocType: Patient,Account Details,အကောင့်အသေးစိတ်
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,ကျောင်းသားများကို Found ဘယ်သူမျှမက
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,ကျောင်းသားများကို Found ဘယ်သူမျှမက
 DocType: Medical Department,Medical Department,ဆေးဘက်ဆိုင်ရာဦးစီးဌာန
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,ပေးသွင်း Scorecard အမှတ်ပေးလိုအပ်ချက်
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,ငွေတောင်းခံလွှာ Post date
@@ -3570,8 +3641,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,ပါတီမရွေးခင် Post date ကို select လုပ်ပါကျေးဇူးပြုပြီး
 DocType: Program Enrollment,School House,School တွင်အိမ်
 DocType: Serial No,Out of AMC,AMC ထဲက
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,ကိုးကားချက်များကို select ပေးပါ
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,ကိုးကားချက်များကို select ပေးပါ
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,ကိုးကားချက်များကို select ပေးပါ
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,ကိုးကားချက်များကို select ပေးပါ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ကြိုတင်ဘွတ်ကင်တန်ဖိုးအရေအတွက်တန်ဖိုးစုစုပေါင်းအရေအတွက်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Maintenance ကိုအလည်တစ်ခေါက်လုပ်ပါ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,အရောင်းမဟာ Manager က {0} အခန်းကဏ္ဍကိုသူအသုံးပြုသူမှဆက်သွယ်ပါ
@@ -3579,7 +3650,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,ကုမ္ပဏီ (မဖောက်သည်သို့မဟုတ်ပေးသွင်းသူ) သခင်သည်။
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ဒီကျောင်းသားသမဂ္ဂများ၏တက်ရောက်သူအပေါ်အခြေခံသည်
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,မကျောင်းသားများ
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,ပိုပြီးပစ္စည်းသို့မဟုတ်ဖွင့်အပြည့်အဝ form ကို Add
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,ပိုပြီးပစ္စည်းသို့မဟုတ်ဖွင့်အပြည့်အဝ form ကို Add
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Delivery မှတ်စုများ {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,အသုံးပြုသူများကိုသွားပါ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Paid ပမာဏ + ငွေပမာဏက Grand စုစုပေါင်းထက် သာ. ကြီးမြတ်မဖွစျနိုငျပိတ်ရေးထား
@@ -3599,37 +3670,40 @@
 DocType: Fee Schedule,Fee Schedule,အခကြေးငွေဇယား
 DocType: Hub Settings,Publish Availability,Available ထုတ်ဝေ
 DocType: Company,Create Chart Of Accounts Based On,Accounts ကိုအခြေပြုတွင်၏ဇယား Create
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Non-အုပ်စုတစ်ခုကိုပြောင်းလို့မရပါဘူး။ ကလေးသူငယ်လုပ်ငန်းများတည်ရှိ။
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,မွေးဖွားခြင်း၏နေ့စွဲယနေ့ထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။
 ,Stock Ageing,စတော့အိတ် Ageing
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},ကျောင်းသား {0} ကျောင်းသားလျှောက်ထား {1} ဆန့်ကျင်တည်ရှိ
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),ရှာနိုင်ပါတယ်ညှိယူ (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,အချိန်ဇယား
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,အချိန်ဇယား
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} {1} &#39;&#39; ပိတ်ထားတယ်
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ပွင့်လင်းအဖြစ် Set
 DocType: Cheque Print Template,Scanned Cheque,Scan Cheque တစ်စောင်လျှင်
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,မ့အရောင်းအပေါ်ဆက်သွယ်ရန်မှအလိုအလျှောက်အီးမေးလ်များကိုပေးပို့ပါ။
 DocType: Timesheet,Total Billable Amount,စုစုပေါင်းဘီလ်ဆောင်ပမာဏ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,item 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,အမိန့် Entry &#39;
 DocType: Purchase Order,Customer Contact Email,customer ဆက်သွယ်ရန်အီးမေးလ်
 DocType: Warranty Claim,Item and Warranty Details,item နှင့်အာမခံအသေးစိတ်
 DocType: Sales Team,Contribution (%),contribution (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,မှတ်ချက်: &#39;&#39; ငွေသို့မဟုတ်ဘဏ်မှအကောင့် &#39;&#39; သတ်မှတ်ထားသောမဟုတ်ခဲ့ကတည်းကငွေပေးချေမှုရမည့် Entry နေသူများကဖန်တီးမည်မဟုတ်
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,စီမံကိန်း {0} ပြီးသားတည်ရှိ
 DocType: Medical Department,Nursing User,သူနာပြုအသုံးပြုသူ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,တာဝန်ဝတ္တရားများ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,ဒီ quotation အများ၏တရားဝင်မှုကာလအဆုံးသတ်ခဲ့သည်။
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,ဒီ quotation အများ၏တရားဝင်မှုကာလအဆုံးသတ်ခဲ့သည်။
 DocType: Expense Claim Account,Expense Claim Account,စရိတ်တိုင်ကြားအကောင့်
 DocType: Accounts Settings,Allow Stale Exchange Rates,ဟောင်းနွမ်းငွေလဲနှုန်း Allow
 DocType: Sales Person,Sales Person Name,အရောင်းပုဂ္ဂိုလ်အမည်
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,table ထဲမှာ atleast 1 ငွေတောင်းခံလွှာကိုရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,အသုံးပြုသူများအ Add
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,အသုံးပြုသူများအ Add
 DocType: POS Item Group,Item Group,item Group က
 DocType: Item,Safety Stock,အန္တရာယ်ကင်းရှင်းရေးစတော့အိတ်
 DocType: Healthcare Settings,Healthcare Settings,ကျန်းမာရေးစောင့်ရှောက်မှုက Settings
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,တစ်ဦး task အတွက်တိုးတက်ရေးပါတီ% 100 ကျော်မဖြစ်နိုင်ပါ။
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,တစ်ဦး task အတွက်တိုးတက်ရေးပါတီ% 100 ကျော်မဖြစ်နိုင်ပါ။
 DocType: Stock Reconciliation Item,Before reconciliation,ပြန်လည်သင့်မြတ်ရေးမဖြစ်မီ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0} မှ
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Added အခွန်အခများနှင့်စွပ်စွဲချက် (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,item ခွန် Row {0} type ကိုခွန်သို့မဟုတ်ဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုသို့မဟုတ်နှော၏အကောင့်ကိုရှိရမယ်
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,item ခွန် Row {0} type ကိုခွန်သို့မဟုတ်ဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုသို့မဟုတ်နှော၏အကောင့်ကိုရှိရမယ်
 DocType: Sales Order,Partly Billed,တစ်စိတ်တစ်ပိုင်းကြေညာ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,item {0} တစ် Fixed Asset item ဖြစ်ရပါမည်
 DocType: Item,Default BOM,default BOM
@@ -3645,6 +3719,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,ပွောငျးလဲတတျသော
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Delivery မှတ်ချက်ထံမှ
 DocType: Student,Student Email Address,ကျောင်းသားအီးမေးလ်လိပ်စာ
+DocType: Item,Hub Warehouse,hub ဂိုဒေါင်
 DocType: Physician Schedule Time Slot,From Time,အချိန်ကနေ
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,ကုန်ပစ္စည်းလက်ဝယ်ရှိ:
 DocType: Notification Control,Custom Message,custom Message
@@ -3653,9 +3728,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,ကျောင်းသားလိပ်စာ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,ကျောင်းသားလိပ်စာ
 DocType: Purchase Invoice,Price List Exchange Rate,စျေးနှုန်း List ကိုချိန်း Rate
+DocType: POS Profile,POS Profile Name,POS ကိုယ်ရေးဖိုင်အမည်
 DocType: Purchase Invoice Item,Rate,rate
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,အလုပ်သင်ဆရာဝန်
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,လိပ်စာအမည်
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,လိပ်စာအမည်
 DocType: Stock Entry,From BOM,BOM ကနေ
 DocType: Assessment Code,Assessment Code,အကဲဖြတ် Code ကို
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,အခြေခံပညာ
@@ -3669,11 +3745,12 @@
 DocType: Salary Slip,Salary Structure,လစာဖွဲ့စည်းပုံ
 DocType: Account,Bank,ကမ်း
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,လကွောငျး
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,ပြဿနာပစ္စည်း
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,ပြဿနာပစ္စည်း
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,ထပ်တလဲလဲကိုစဉ်တွင်အမှားတစ်ခုဖြစ်ပေါ်နေပါသည်
 DocType: Material Request Item,For Warehouse,ဂိုဒေါင်အကြောင်းမူကား
 DocType: Employee,Offer Date,ကမ်းလှမ်းမှုကိုနေ့စွဲ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ကိုးကား
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,သငျသညျအော့ဖ်လိုင်း mode မှာရှိပါတယ်။ သငျသညျကှနျယရှိသည်သည်အထိသင်ပြန်ဖွင့်နိုင်ပါလိမ့်မည်မဟုတ်။
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,သငျသညျအော့ဖ်လိုင်း mode မှာရှိပါတယ်။ သငျသညျကှနျယရှိသည်သည်အထိသင်ပြန်ဖွင့်နိုင်ပါလိမ့်မည်မဟုတ်။
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,အဘယ်သူမျှမကျောင်းသားသမဂ္ဂအဖွဲ့များကိုဖန်တီးခဲ့တယ်။
 DocType: Purchase Invoice Item,Serial No,serial No
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,လစဉ်ပြန်ဆပ်ငွေပမာဏချေးငွေပမာဏထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
@@ -3683,17 +3760,18 @@
 DocType: Salary Slip,Total Working Hours,စုစုပေါင်းအလုပ်အဖွဲ့နာရီ
 DocType: Subscription,Next Schedule Date,Next ကိုဇယားနေ့စွဲ
 DocType: Stock Entry,Including items for sub assemblies,ခွဲများအသင်းတော်တို့အဘို့ပစ္စည်းများအပါအဝင်
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,တန်ဖိုးအားအပြုသဘောဆောင်သူဖြစ်ရမည် Enter
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,အားလုံးသည် Territories
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,တန်ဖိုးအားအပြုသဘောဆောင်သူဖြစ်ရမည် Enter
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,အားလုံးသည် Territories
 DocType: Purchase Invoice,Items,items
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,ကျောင်းသားသမဂ္ဂပြီးသားစာရင်းသွင်းသည်။
 DocType: Fiscal Year,Year Name,တစ်နှစ်တာအမည်
 DocType: Process Payroll,Process Payroll,Process ကိုလစာ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,ယခုလအလုပ်လုပ်ရက်ပတ်လုံးထက်ပိုပြီးအားလပ်ရက်ရှိပါသည်။
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,ယခုလအလုပ်လုပ်ရက်ပတ်လုံးထက်ပိုပြီးအားလပ်ရက်ရှိပါသည်။
 DocType: Product Bundle Item,Product Bundle Item,ထုတ်ကုန်ပစ္စည်း Bundle ကို Item
 DocType: Sales Partner,Sales Partner Name,အရောင်း Partner အမည်
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,ကိုးကားချက်များတောင်းခံ
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,ကိုးကားချက်များတောင်းခံ
 DocType: Payment Reconciliation,Maximum Invoice Amount,အမြင့်ဆုံးပမာဏပြေစာ
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,သွေး
 DocType: Normal Test Items,Normal Test Items,ပုံမှန်စမ်းသပ်ပစ္စည်းများ
 DocType: Student Language,Student Language,ကျောင်းသားဘာသာစကားများ
 apps/erpnext/erpnext/config/selling.py +23,Customers,Customer များ
@@ -3705,10 +3783,11 @@
 DocType: Issue,Opening Time,အချိန်ဖွင့်လှစ်
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,ကနေနှင့်လိုအပ်သည့်ရက်စွဲများရန်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities မှ &amp; ကုန်စည်ဒိုင်
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant များအတွက်တိုင်း၏ default အနေနဲ့ Unit မှ &#39;&#39; {0} &#39;&#39; Template: ထဲမှာရှိသကဲ့သို့တူညီသူဖြစ်ရမည် &#39;&#39; {1} &#39;&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant များအတွက်တိုင်း၏ default အနေနဲ့ Unit မှ &#39;&#39; {0} &#39;&#39; Template: ထဲမှာရှိသကဲ့သို့တူညီသူဖြစ်ရမည် &#39;&#39; {1} &#39;&#39;
 DocType: Shipping Rule,Calculate Based On,အခြေတွင်တွက်ချက်
 DocType: Delivery Note Item,From Warehouse,ဂိုဒေါင်ထဲကနေ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,ထုတ်လုပ်ခြင်းမှပစ္စည်းများ၏ဘီလ်နှင့်အတူပစ္စည်းများအဘယ်သူမျှမ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,ထုတ်လုပ်ခြင်းမှပစ္စည်းများ၏ဘီလ်နှင့်အတူပစ္စည်းများအဘယ်သူမျှမ
+DocType: Restaurant,Default Customer,default ဖောက်သည်
 DocType: Assessment Plan,Supervisor Name,ကြီးကြပ်ရေးမှူးအမည်
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,ချိန်းထိုနေ့အဘို့အနေသူများကဖန်တီးလျှင်အတည်ပြုမပြုပါ
 DocType: Program Enrollment Course,Program Enrollment Course,Program ကိုကျောင်းအပ်သင်တန်းအမှတ်စဥ်
@@ -3736,7 +3815,7 @@
 DocType: Payment Entry,Internal Transfer,ပြည်တွင်းလွှဲပြောင်း
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,ကလေးသူငယ်အကောင့်ကိုဒီအကောင့်ရှိနေပြီ။ သင်သည်ဤအကောင့်ကိုမဖျက်နိုင်ပါ။
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ပစ်မှတ် qty သို့မဟုတ်ပစ်မှတ်ပမာဏကိုဖြစ်စေမဖြစ်မနေဖြစ်ပါသည်
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},BOM Item {0} သည်တည်ရှိမရှိပါက default
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},BOM Item {0} သည်တည်ရှိမရှိပါက default
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Post date ပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,နေ့စွဲဖွင့်လှစ်နေ့စွဲပိတ်ပြီးမတိုင်မှီဖြစ်သင့်
 DocType: Leave Control Panel,Carry Forward,Forward သယ်
@@ -3772,6 +3851,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,စုစုပေါင်းလက်ရှိ
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,စာရင်းကိုင်ဖော်ပြချက်
 DocType: Drug Prescription,Hour,နာရီ
+DocType: Restaurant Order Entry,Last Sales Invoice,နောက်ဆုံးအရောင်းပြေစာ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,နယူး Serial No ဂိုဒေါင်ရှိသည်မဟုတ်နိုင်။ ဂိုဒေါင်စတော့အိတ် Entry &#39;သို့မဟုတ်ဝယ်ယူခြင်းပြေစာအားဖြင့်သတ်မှတ်ထားရမည်
 DocType: Lead,Lead Type,ခဲ Type
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,သငျသညျ Block ကိုနေ့အပေါ်အရွက်အတည်ပြုခွင့်ကြသည်မဟုတ်
@@ -3808,65 +3888,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,အသုံးပြုသူများ Create
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,ဂရမ်
 DocType: Supplier Scorecard,Per Month,တစ်လလျှင်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,ထုတ်လုပ်ခြင်းမှအရေအတွက်ပါ 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်။
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,ထုတ်လုပ်ခြင်းမှအရေအတွက်ပါ 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်။
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,ပြုပြင်ထိန်းသိမ်းမှုခေါ်ဆိုမှုအစီရင်ခံစာသွားရောက်ခဲ့ကြသည်။
 DocType: Stock Entry,Update Rate and Availability,နှုန်းနှင့် Available Update
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,ရာခိုင်နှုန်းသင်အမိန့်ကိုဆန့်ကျင်အရေအတွက်ပိုမိုလက်ခံရယူသို့မဟုတ်ကယ်လွှတ်ခြင်းငှါခွင့်ပြုထားပါသည်။ ဥပမာ: သင်က 100 ယူနစ်အမိန့်ရပြီဆိုပါက။ နှင့်သင်၏ Allow သင် 110 ယူနစ်ကိုခံယူခွင့်ရနေကြပြီးတော့ 10% ဖြစ်ပါတယ်။
 DocType: POS Customer Group,Customer Group,ဖောက်သည်အုပ်စု
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),နယူးသုတ်လိုက် ID ကို (Optional)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),နယူးသုတ်လိုက် ID ကို (Optional)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),နယူးသုတ်လိုက် ID ကို (Optional)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),နယူးသုတ်လိုက် ID ကို (Optional)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},စရိတ် account item ကို {0} သည်မသင်မနေရ
 DocType: BOM,Website Description,website ဖော်ပြချက်များ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Equity အတွက်ပိုက်ကွန်ကိုပြောင်းရန်
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,နောက်ဆုံးပေါ်
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,ပထမဦးဆုံးဝယ်ယူငွေတောင်းခံလွှာ {0} ဖျက်သိမ်းပေးပါ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Email လိပ်စာထူးခြားတဲ့သူဖြစ်ရမည်, ပြီးသား {0} များအတွက်တည်ရှိ"
 DocType: Serial No,AMC Expiry Date,AMC သက်တမ်းကုန်ဆုံးသည့်ရက်စွဲ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,ပွေစာ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,ပွေစာ
 ,Sales Register,အရောင်းမှတ်ပုံတင်မည်
 DocType: Daily Work Summary Settings Company,Send Emails At,မှာထားတဲ့အီးမေးလ်ပို့ပါ
 DocType: Quotation,Quotation Lost Reason,စျေးနှုန်းပျောက်ဆုံးသွားသောအကြောင်းရင်း
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,သင့်ရဲ့ဒိုမိန်းကို Select လုပ်ပါ
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',ဘယ်မှာနာမကိုအမှီ = &#39;{0}&#39; tabPatient ထံမှ * ကိုရွေးပါ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},ငွေသွင်းငွေထုတ်ရည်ညွှန်းမရှိ {0} {1} ရက်စွဲပါ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},ငွေသွင်းငွေထုတ်ရည်ညွှန်းမရှိ {0} {1} ရက်စွဲပါ
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,တည်းဖြတ်ရန်မရှိပါ။
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,form ကိုကြည့်ရန်
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,ဒီလအတှကျအကျဉ်းချုပ်နှင့် Pend လှုပ်ရှားမှုများ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,form ကိုကြည့်ရန်
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,ဒီလအတှကျအကျဉ်းချုပ်နှင့် Pend လှုပ်ရှားမှုများ
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","ကိုယ့်ကိုကိုယ်ထက်အခြား, သင့်အဖွဲ့အစည်းကမှအသုံးပြုသူများကိုထည့်ပါ။"
 DocType: Customer Group,Customer Group Name,ဖောက်သည်အုပ်စုအမည်
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,မရှိသေးပါဖောက်သည်!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,မရှိသေးပါဖောက်သည်!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,ငွေသား Flow ဖော်ပြချက်
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ချေးငွေပမာဏ {0} အများဆုံးချေးငွေပမာဏထက်မပိုနိုင်
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,လိုင်စင်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},C-Form တွင် {1} ကနေဒီပြေစာ {0} ကိုဖယ်ရှား ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},C-Form တွင် {1} ကနေဒီပြေစာ {0} ကိုဖယ်ရှား ကျေးဇူးပြု.
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,သင်တို့သည်လည်းယခင်ဘဏ္ဍာနှစ်ရဲ့ချိန်ခွင်လျှာဒီဘဏ္ဍာနှစ်မှပင်အရွက်ကိုထည့်သွင်းရန်လိုလျှင် Forward ပို့ကို select ကျေးဇူးပြု.
 DocType: GL Entry,Against Voucher Type,ဘောက်ချာ Type ဆန့်ကျင်
 DocType: Physician,Phone (R),ဖုန်း (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,အချိန် slot နှစ်ခုထည့်သွင်း
 DocType: Item,Attributes,Attribute တွေ
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Template: Enable
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup ကို&gt; Setting&gt; အမည်ဖြင့်သမုတ်စီးရီးကနေတဆင့် {0} များအတွက်စီးရီးအမည်ဖြင့်သမုတ်သတ်မှတ်ထား ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,အကောင့်ပိတ်ရေးထားရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,နောက်ဆုံးအမိန့်နေ့စွဲ
 DocType: Patient,B Negative,B ကအနုတ်
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},အကောင့်ကို {0} ကုမ္ပဏီ {1} ပိုင်ပါဘူး
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,အတန်းအတွက် serial နံပါတ် {0} Delivery မှတ်ချက်နှင့်အတူမကိုက်ညီ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,အတန်းအတွက် serial နံပါတ် {0} Delivery မှတ်ချက်နှင့်အတူမကိုက်ညီ
 DocType: Student,Guardian Details,ဂါးဒီးယန်းအသေးစိတ်
 DocType: C-Form,C-Form,C-Form တွင်
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,မျိုးစုံန်ထမ်းများအတွက်မာကုတက်ရောက်
 DocType: Vehicle,Chassis No,ကိုယ်ထည်အဘယ်သူမျှမ
 DocType: Payment Request,Initiated,စတင်ခဲ့သည်
 DocType: Production Order,Planned Start Date,စီစဉ်ထား Start ကိုနေ့စွဲ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,တစ်ဦး BOM ကို select ပေးပါ
 DocType: Serial No,Creation Document Type,ဖန်ဆင်းခြင်း Document ဖိုင် Type
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,ပြီးဆုံးရက်စွဲသည်စတင်နေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,ပြီးဆုံးရက်စွဲသည်စတင်နေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 DocType: Leave Type,Is Encash,Encash ဖြစ်ပါသည်
 DocType: Leave Allocation,New Leaves Allocated,ခွဲဝေနယူးရွက်
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Project သည်ပညာ data တွေကိုစျေးနှုန်းသည်မရရှိနိုင်ပါသည်
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,အပေါ်ရပ်တန့်
 DocType: Project,Expected End Date,မျှော်လင့်ထားသည့်အဆုံးနေ့စွဲ
 DocType: Budget Account,Budget Amount,ဘတ်ဂျက်ပမာဏ
 DocType: Appraisal Template,Appraisal Template Title,စိစစ်ရေး Template: ခေါင်းစဉ်မရှိ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},နေ့စွဲကနေ {0} ထမ်းများအတွက် {1} ဝန်ထမ်းရဲ့ပူးပေါင်းနေ့စွဲ {2} မတိုင်မီမဖွစျနိုငျ
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,ကုန်သွယ်လုပ်ငန်းခွန်
 DocType: Patient,Alcohol Current Use,အရက်လက်ရှိအသုံးပြုမှု
+DocType: Student Admission Program,Student Admission Program,ကျောင်းသားသမဂ္ဂများအဖွဲ့ချုပ်င်ခွင့်အစီအစဉ်
 DocType: Payment Entry,Account Paid To,ရန် Paid အကောင့်
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,မိဘတစ် Item {0} တစ်စတော့အိတ်ပစ္စည်းမဖြစ်ရပါမည်
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,အားလုံးသည်ထုတ်ကုန်များသို့မဟုတ်န်ဆောင်မှုများ။
@@ -3875,30 +3957,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} အကောင့်အတွက်ဘတ်ဂျက် {1} {2} {3} ဆန့်ကျင် {4} ဖြစ်ပါတယ်။ ဒါဟာ {5} အားဖြင့်ကျော်လွန်ပါလိမ့်မယ်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',အတန်း {0} # အကောင့်အမျိုးအစားဖြစ်ရပါမည် &#39;&#39; Fixed Asset &#39;&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Qty out
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,ရောင်းချမှုသည်ရေကြောင်းပမာဏကိုတွက်ချက်ရန်စည်းမျဉ်းများ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,ယင်းနှင့် unchcked မသန်စွမ်း
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,စီးရီးမသင်မနေရ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,ဘဏ္ဍာရေးန်ဆောင်မှုများ
 DocType: Student Sibling,Student ID,ကျောင်းသား ID ကို
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,အချိန်မှတ်တမ်းများအဘို့အလှုပ်ရှားမှုများအမျိုးအစားများ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,ပေးသွင်းအီးမေးလ်
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,အချိန်မှတ်တမ်းများအဘို့အလှုပ်ရှားမှုများအမျိုးအစားများ
 DocType: Tax Rule,Sales,အရောင်း
 DocType: Stock Entry Detail,Basic Amount,အခြေခံပညာပမာဏ
 DocType: Training Event,Exam,စာမေးပွဲ
 DocType: Complaint,Complaint,တိုင်ကြားစာ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},စတော့ရှယ်ယာ Item {0} လိုအပ်ဂိုဒေါင်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},စတော့ရှယ်ယာ Item {0} လိုအပ်ဂိုဒေါင်
 DocType: Leave Allocation,Unused leaves,အသုံးမပြုသောအရွက်
 DocType: Patient,Alcohol Past Use,အရက်အတိတ်မှအသုံးပြုခြင်း
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,ငွေတောင်းခံပြည်နယ်
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,လွှဲပြောင်း
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),(Sub-အသင်းတော်များအပါအဝင်) ပေါက်ကွဲခဲ့ BOM Fetch
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,လွှဲပြောင်း
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),(Sub-အသင်းတော်များအပါအဝင်) ပေါက်ကွဲခဲ့ BOM Fetch
 DocType: Authorization Rule,Applicable To (Employee),(န်ထမ်း) ရန်သက်ဆိုင်သော
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,ကြောင့်နေ့စွဲမသင်မနေရ
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,ကြောင့်နေ့စွဲမသင်မနေရ
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Attribute {0} ပါ 0 င်မဖွစျနိုငျဘို့ increment
 DocType: Journal Entry,Pay To / Recd From,From / Recd ရန်ပေးဆောင်
 DocType: Naming Series,Setup Series,Setup ကိုစီးရီး
 DocType: Payment Reconciliation,To Invoice Date,ပြေစာနေ့စွဲဖို့
 DocType: Supplier,Contact HTML,ဆက်သွယ်ရန် HTML ကို
 ,Inactive Customers,မလှုပ်မရှား Customer များ
+DocType: Student Admission Program,Maximum Age,အများဆုံးခေတ်
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,ဝယ်ယူလက်ခံ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,ဘယ်လိုစျေးနှုန်းများ Rule လျှောက်ထားသလဲ?
@@ -3917,6 +4001,7 @@
 DocType: GL Entry,Remarks,အမှာစကား
 DocType: Payment Entry,Account Paid From,ကနေ Paid အကောင့်
 DocType: Purchase Order Item Supplied,Raw Material Item Code,ကုန်ကြမ်းပစ္စည်း Code ကို
+DocType: Task,Parent Task,မိဘ Task ကို
 DocType: Journal Entry,Write Off Based On,အခြေတွင်ပိတ်ရေးထား
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,ခဲ Make
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,ပုံနှိပ်နှင့်စာရေးကိရိယာ
@@ -3925,20 +4010,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","လစာပြီးသားဤရက်စွဲအကွာအဝေးအကြားမဖွစျနိုငျ {0} အကြားကာလအတွက်လုပ်ငန်းများ၌နှင့် {1}, လျှောက်လွှာကာလချန်ထားပါ။"
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,တစ် Serial နံပါတ်ထည့်သွင်းခြင်းစံချိန်တင်
 DocType: Guardian Interest,Guardian Interest,ဂါးဒီးယန်းအကျိုးစီးပွား
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,POS ငွေတောင်းခံလွှာများအတွက် Setup ကို default အတန်ဖိုးများ
 apps/erpnext/erpnext/config/hr.py +177,Training,လေ့ကျင့်ရေး
 DocType: Timesheet,Employee Detail,ဝန်ထမ်း Detail
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 အီးမေးလ် ID ကို
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 အီးမေးလ် ID ကို
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,လ၏နေ့တွင် Next ကိုနေ့စွဲရဲ့နေ့နဲ့ထပ်တန်းတူဖြစ်ရပါမည်
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,လ၏နေ့တွင် Next ကိုနေ့စွဲရဲ့နေ့နဲ့ထပ်တန်းတူဖြစ်ရပါမည်
 DocType: Lab Prescription,Test Code,စမ်းသပ်ခြင်း Code ကို
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,ဝက်ဘ်ဆိုက်ပင်မစာမျက်နှာများအတွက်ချိန်ညှိမှုများ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQs ကြောင့် {1} တစ် scorecard ရပ်တည်မှုမှ {0} အဘို့အခွင့်ပြုခဲ့ကြသည်မဟုတ်
 DocType: Offer Letter,Awaiting Response,စောင့်ဆိုင်းတုန့်ပြန်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,အထက်
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},စုစုပေါင်းငွေပမာဏ {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},မှားနေသော attribute ကို {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},စုစုပေါင်းငွေပမာဏ {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},မှားနေသော attribute ကို {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Non-စံပေးဆောင်အကောင့်လျှင်ဖော်ပြထားခြင်း
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},တူညီသောပစ္စည်းကိုအကြိမ်ပေါင်းများစွာထဲသို့ဝင်ခဲ့တာဖြစ်ပါတယ်။ {စာရင်း}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',&#39;&#39; အားလုံးအကဲဖြတ်အဖွဲ့များ &#39;&#39; ထက်အခြားအကဲဖြတ်အဖွဲ့ကို select လုပ်ပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},အတန်း {0}: ကုန်ကျစရိတ်စင်တာတစ်ခုကို item {1} ဘို့လိုအပ်ပါသည်
 DocType: Training Event Employee,Optional,optional
@@ -3961,13 +4046,15 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ကုန်ကျစရိတ် Center က Item {2} သည်မသင်မနေရ
 DocType: Vehicle,Policy No,ပေါ်လစီအဘယ်သူမျှမ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကိုထံမှပစ္စည်းများ Get
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","စတော့ရှယ်ယာတစ်ခုကို item {0} ဆန့်ကျင်တည်ရှိသကဲ့သို့, သငျသညျမဖွင့်လို့ရပါတယ်ရှိပါတယ်ပိုင်ဆိုင်မှု variants"
 DocType: Asset,Straight Line,မျဥ်းဖြောင့်
 DocType: Project User,Project User,Project မှအသုံးပြုသူတို့၏
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,ကွဲ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,ကွဲ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,ကွဲ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,ကွဲ
 DocType: GL Entry,Is Advance,ကြိုတင်ထုတ်သည်
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,နေ့စွဲရန်နေ့စွဲနှင့်တက်ရောက် မှစ. တက်ရောက်သူမသင်မနေရ
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,ရိုက်ထည့်ပေးပါဟုတ်ကဲ့သို့မဟုတ်မရှိပါအဖြစ် &#39;&#39; Subcontracted သည် &#39;&#39;
+DocType: Item,Default Purchase Unit of Measure,တိုင်း၏ default ဝယ်ယူယူနစ်
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,နောက်ဆုံးဆက်သွယ်ရေးနေ့စွဲ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,နောက်ဆုံးဆက်သွယ်ရေးနေ့စွဲ
 DocType: Sales Team,Contact No.,ဆက်သွယ်ရန်အမှတ်
@@ -3976,7 +4063,6 @@
 DocType: Production Order,Check if material transfer entry is not required,ပစ္စည်းလွှဲပြောင်း entry ကိုမလိုအပ်လျှင် Check
 DocType: Production Order,Check if material transfer entry is not required,ပစ္စည်းလွှဲပြောင်း entry ကိုမလိုအပ်လျှင် Check
 DocType: Program Enrollment Tool,Get Students From,ကနေကျောင်းသားများ Get
-DocType: Hub Settings,Seller Country,ရောင်းချသူနိုင်ငံ
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,ဝက်ဘ်ဆိုက်ပေါ်တွင်ပစ္စည်းများ Publish
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,သုတ်ထဲမှာ Group မှသင့်ရဲ့ကျောင်းသားများအတွက်
 DocType: Authorization Rule,Authorization Rule,authorization Rule
@@ -3986,8 +4072,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,အရောင်းအခွန်နှင့်စွပ်စွဲချက် Template:
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),စုစုပေါင်း (Credit)
 DocType: Repayment Schedule,Payment Date,ငွေပေးချေသည့်နေ့ရက်
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,နယူးသုတ်လိုက်အရည်အတွက်
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,နယူးသုတ်လိုက်အရည်အတွက်
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,နယူးသုတ်လိုက်အရည်အတွက်
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,နယူးသုတ်လိုက်အရည်အတွက်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,အဝတ်အထည်နှင့်ဆက်စပ်ပစ္စည်းများ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,ချိန်ရမှတ် function ကိုဖြေရှင်းမပေးနိုင်ခဲ့ပါ။ ယင်းပုံသေနည်းတရားဝင်သည်သေချာအောင်လုပ်ပါ။
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,အမိန့်အရေအတွက်
@@ -4005,6 +4091,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","အတန်း # {0}: ပိုင်ဆိုင်မှု {1} တင်သွင်းမရနိုငျ, က {2} ပြီးသားဖြစ်ပါတယ်"
 DocType: Tax Rule,Billing Country,ငွေတောင်းခံနိုင်ငံ
 DocType: Purchase Order Item,Expected Delivery Date,မျှော်လင့်ထားသည့် Delivery Date ကို
+DocType: Restaurant Order Entry,Restaurant Order Entry,စားသောက်ဆိုင်အမိန့် Entry &#39;
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,{0} # {1} တန်းတူမ debit နှင့် Credit ။ ခြားနားချက် {2} ဖြစ်ပါတယ်။
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Entertainment ကအသုံးစရိတ်များ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,ပစ္စည်းတောင်းဆိုခြင်း Make
@@ -4017,9 +4104,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,လက်ရှိငွေပေးငွေယူနှင့်အတူအကောင့်ကိုဖျက်ပစ်မရနိုင်ပါ
 DocType: Vehicle,Last Carbon Check,ပြီးခဲ့သည့်ကာဗွန်စစ်ဆေးမှု
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,ဥပဒေရေးရာအသုံးစရိတ်များ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,အတန်းအပေါ်အရေအတွက်ကို select ပေးပါ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,အတန်းအပေါ်အရေအတွက်ကို select ပေးပါ
 DocType: Purchase Invoice,Posting Time,posting အချိန်
 DocType: Timesheet,% Amount Billed,ကြေညာတဲ့% ပမာဏ
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;ခန့်အပ်တာဝန်ပေးခြင်း Per အချိန်&quot; &quot;ဟုဒေါက်တာ {0} ဘို့ရာခန့်ထားသောခဲ့ T hasn ။ ဆရာဝန်မာစတာထဲမှာထည့်ပါ။
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,တယ်လီဖုန်းအသုံးစရိတ်များ
 DocType: Sales Partner,Logo,logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,သင်ချွေတာရှေ့တော်၌စီးရီးကိုရွေးဖို့ user ကိုတွန်းအားပေးချင်တယ်ဆိုရင်ဒီစစ်ဆေးပါ။ သင်သည်ဤစစ်ဆေးလျှင်အဘယ်သူမျှမက default ရှိပါတယ်ဖြစ်လိမ့်မည်။
@@ -4030,6 +4118,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,နယူးဖောက်သည်အခွန်ဝန်ကြီးဌာန
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,ခရီးသွားအသုံးစရိတ်များ
 DocType: Maintenance Visit,Breakdown,ပျက်သည်
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},အဆိုပါ DOCTYPE {0} အတွက်ထုံးစံကိုလယ်စာရင်းပေးသွင်းမှု Add
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,အကောင့်ဖွင်: {0} ငွေကြေးနှင့်အတူ: {1} ကိုရှေးခယျြမရနိုငျ
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Update ကို BOM နောက်ဆုံးပေါ်အဘိုးပြတ်မှုနှုန်း / စျေးနှုန်းစာရင်းနှုန်းသည် / ကုန်ကြမ်း၏နောက်ဆုံးဝယ်ယူမှုနှုန်းအပေါ်အခြေခံပြီး, Scheduler ကိုမှတဆင့်အလိုအလျှောက်ကုန်ကျခဲ့ပါတယ်။"
 DocType: Bank Reconciliation Detail,Cheque Date,Cheques နေ့စွဲ
@@ -4054,7 +4143,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),(အချိန် Logs ကနေတဆင့်) စုစုပေါင်း Billing ငွေပမာဏ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,ပေးသွင်း Id
 DocType: Payment Request,Payment Gateway Details,ငွေပေးချေမှုရမည့် Gateway မှာအသေးစိတ်
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,အရေအတွက်ပါ 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်သင့်
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,အရေအတွက်ပါ 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်သင့်
 DocType: Journal Entry,Cash Entry,ငွေသား Entry &#39;
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,ကလေး node များသာ &#39;&#39; Group မှ &#39;&#39; type ကို node များအောက်တွင်ဖန်တီးနိုင်ပါတယ်
 DocType: Leave Application,Half Day Date,ဝက်နေ့နေ့စွဲ
@@ -4072,12 +4161,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,မှတ်စု: Item {0} အကြိမ်ပေါင်းများစွာသို့ဝင်
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,အားလုံးသည်ဆက်သွယ်ရန်။
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,ကုမ္ပဏီအတိုကောက်
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,အသုံးပြုသူ {0} မတည်ရှိပါဘူး
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,အသုံးပြုသူ {0} မတည်ရှိပါဘူး
 DocType: Subscription,SUB-,ခွဲများ
 DocType: Item Attribute Value,Abbreviation,အကျဉ်း
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,ငွေပေးချေမှုရမည့် Entry ပြီးသားတည်ရှိ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} ကန့်သတ်ထက်ကျော်လွန်ပြီးကတည်းက authroized မဟုတ်
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,လစာ template ကိုမာစတာ။
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,ရောဂါဗေဒ
+DocType: Restaurant Order Entry,Restaurant Table,စားသောက်ဆိုင်ဇယား
 DocType: Leave Type,Max Days Leave Allowed,max Days ထွက်ခွာခွင့်ပြု
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,စျေးဝယ်လှည်းများအတွက်အခွန်နည်းဥပဒေ Set
 DocType: Purchase Invoice,Taxes and Charges Added,အခွန်နှင့်စွပ်စွဲချက် Added
@@ -4089,10 +4180,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ခဲသို့မဟုတ် Customer များ quotes ။
 DocType: Stock Settings,Role Allowed to edit frozen stock,အေးခဲစတော့ရှယ်ယာတည်းဖြတ်ရန် Allowed အခန်းကဏ္ဍ
 ,Territory Target Variance Item Group-Wise,နယ်မြေတွေကို Target ကကှဲလှဲ Item Group မှ-ပညာရှိ
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,အားလုံးသည်ဖောက်သည်အဖွဲ့များ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,အားလုံးသည်ဖောက်သည်အဖွဲ့များ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,လစဉ်စုဆောင်း
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} မဖြစ်မနေဖြစ်ပါတယ်။ ဖြစ်ရင်ငွေကြေးစနစ်ချိန်းစံချိန် {1} {2} မှဖန်တီးသည်မဟုတ်။
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,အခွန် Template ကိုမဖြစ်မနေဖြစ်ပါတယ်။
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,အခွန် Template ကိုမဖြစ်မနေဖြစ်ပါတယ်။
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,အကောင့်ကို {0}: မိဘအကောင့်ကို {1} မတည်ရှိပါဘူး
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),စျေးနှုန်း List ကို Rate (ကုမ္ပဏီငွေကြေးစနစ်)
 DocType: Products Settings,Products Settings,ထုတ်ကုန်များချိန်ညှိ
@@ -4118,13 +4209,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,item ပညာရှိခွန် Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Institute မှအတိုကောက်
 ,Item-wise Price List Rate,item ပညာစျေးနှုန်း List ကို Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,ပေးသွင်းစျေးနှုန်း
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,ပေးသွင်းစျေးနှုန်း
 DocType: Quotation,In Words will be visible once you save the Quotation.,သင်စျေးနှုန်းကိုကယ်တင်တစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},အရေအတွက် ({0}) တန်း {1} အတွက်အစိတ်အပိုင်းမဖွစျနိုငျ
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},အရေအတွက် ({0}) တန်း {1} အတွက်အစိတ်အပိုင်းမဖွစျနိုငျ
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Barcode {0} ပြီးသား Item {1} များတွင်အသုံးပြု
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Barcode {0} ပြီးသား Item {1} များတွင်အသုံးပြု
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,သင်္ဘောစရိတ်ပေါင်းထည့်သည်နည်းဥပဒေများ။
 DocType: Item,Opening Stock,စတော့အိတ်ဖွင့်လှစ်
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,customer လိုအပ်သည်
@@ -4142,9 +4233,8 @@
 DocType: Customer,From Lead,ခဲကနေ
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ထုတ်လုပ်မှုပြန်လွှတ်ပေးခဲ့အမိန့်။
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာကိုရွေးပါ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS Entry &#39;ပါစေရန်လိုအပ်သည် POS ကိုယ်ရေးအချက်အလက်များ profile
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS Entry &#39;ပါစေရန်လိုအပ်သည် POS ကိုယ်ရေးအချက်အလက်များ profile
 DocType: Program Enrollment Tool,Enroll Students,ကျောင်းသားများကျောင်းအပ်
-DocType: Hub Settings,Name Token,Token အမည်
 DocType: Lab Test,Approved Date,approved နေ့စွဲ
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,စံရောင်းချသည့်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Atleast တယောက်ဂိုဒေါင်မသင်မနေရ
@@ -4162,7 +4252,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,လူ့စွမ်းအားအရင်းအမြစ်
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,ငွေပေးချေမှုရမည့်ပြန်လည်ရင်ကြားစေ့ရေးငွေပေးချေမှုရမည့်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,အခွန်ပိုင်ဆိုင်မှုများ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},ထုတ်လုပ်မှုအမိန့် {0} ခဲ့
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},ထုတ်လုပ်မှုအမိန့် {0} ခဲ့
 DocType: BOM Item,BOM No,BOM မရှိပါ
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,ဂျာနယ် Entry &#39;{0} အကောင့်ကို {1} များသို့မဟုတ်ပြီးသားအခြားဘောက်ချာဆန့်ကျင်လိုက်ဖက်ပါဘူး
@@ -4182,8 +4272,8 @@
 DocType: Currency Exchange,To Currency,ငွေကြေးစနစ်မှ
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,အောက်ပါအသုံးပြုသူများလုပ်ကွက်နေ့ရက်ကာလအဘို့ထွက်ခွာ Applications ကိုအတည်ပြုခွင့်ပြုပါ။
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,သုံးစွဲမှုပြောဆိုချက်ကိုအမျိုးအစားများ။
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ကို item {0} အဘို့အမှုနှုန်းရောင်းချနေသည်၎င်း၏ {1} ထက်နိမ့်သည်။ ရောင်းမှုနှုန်း atleast {2} ဖြစ်သင့်
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ကို item {0} အဘို့အမှုနှုန်းရောင်းချနေသည်၎င်း၏ {1} ထက်နိမ့်သည်။ ရောင်းမှုနှုန်း atleast {2} ဖြစ်သင့်
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ကို item {0} အဘို့အမှုနှုန်းရောင်းချနေသည်၎င်း၏ {1} ထက်နိမ့်သည်။ ရောင်းမှုနှုန်း atleast {2} ဖြစ်သင့်
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ကို item {0} အဘို့အမှုနှုန်းရောင်းချနေသည်၎င်း၏ {1} ထက်နိမ့်သည်။ ရောင်းမှုနှုန်း atleast {2} ဖြစ်သင့်
 DocType: Item,Taxes,အခွန်
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Paid နှင့်မကယ်မနှုတ်
 DocType: Project,Default Cost Center,default ကုန်ကျစရိတ် Center က
@@ -4197,15 +4287,15 @@
 DocType: Employee Loan,Fully Disbursed,အပြည့်အဝထုတ်ချေး
 DocType: Maintenance Visit,Customer Feedback,customer တုံ့ပြန်ချက်
 DocType: Account,Expense,သုံးငှေ
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,ရမှတ်အများဆုံးရမှတ်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,ရမှတ်အများဆုံးရမှတ်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Customer နှင့်ပေးသွင်း
 DocType: Item Attribute,From Range,Range ထဲထဲကနေ
 DocType: BOM,Set rate of sub-assembly item based on BOM,BOM အပေါ်အခြေခံပြီးခွဲစည်းဝေးပွဲကိုကို item ၏ set မှုနှုန်း
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},ဖော်မြူလာသို့မဟုတ်အခြေအနေ syntax အမှား: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},ဖော်မြူလာသို့မဟုတ်အခြေအနေ syntax အမှား: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Daily သတင်းစာလုပ်ငန်းခွင်အနှစ်ချုပ်က Settings ကုမ္ပဏီ
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,ကစတော့ရှယ်ယာကို item မဟုတ်ပါဘူးကတည်းက item {0} လျစ်လျူရှု
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,နောက်ထပ် processing အဘို့ဤထုတ်လုပ်မှုအမိန့် Submit ။
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,နောက်ထပ် processing အဘို့ဤထုတ်လုပ်မှုအမိန့် Submit ။
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","တစ်ဦးအထူးသဖြင့်အရောင်းအဝယ်အတွက်စျေးနှုန်းများ Rule လျှောက်ထားမ, ရှိသမျှသက်ဆိုင်သောစျေးနှုန်းများနည်းဥပဒေများကိုပိတ်ထားသင့်ပါတယ်။"
 DocType: Assessment Group,Parent Assessment Group,မိဘအကဲဖြတ် Group မှ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,ဂျော့ဘ်
@@ -4222,12 +4312,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',အုပ်စုအားဖြင့် &#39;&#39; ကုမ္ပဏီ &#39;&#39; လျှင်အလွတ် filter ကုမ္ပဏီသတ်မှတ်ပေးပါ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Post date အနာဂတ်နေ့စွဲမဖွစျနိုငျ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},row # {0}: Serial မရှိပါ {1} {2} {3} နှင့်ကိုက်ညီမပါဘူး
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,အဆိုပါထပ်တလဲလဲထုတ်လုပ်ဘို့
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,ကျပန်းထွက်ခွာ
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Lab ကစမ်းသပ် UOM ။
 DocType: Batch,Batch ID,batch ID ကို
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},မှတ်စု: {0}
 ,Delivery Note Trends,Delivery မှတ်ချက်ခေတ်ရေစီးကြောင်း
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,This Week ရဲ့အကျဉ်းချုပ်
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,This Week ရဲ့အကျဉ်းချုပ်
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,စတော့အိတ်အရည်အတွက်ခုနှစ်တွင်
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,အကောင့်ဖွ: {0} သာစတော့အိတ်ငွေကြေးကိစ္စရှင်းလင်းမှုကနေတဆင့် updated နိုင်ပါတယ်
 DocType: Student Group Creation Tool,Get Courses,သင်တန်းများ get
@@ -4241,7 +4332,6 @@
 DocType: Purchase Order,To Bill,ဘီလ်မှ
 DocType: Material Request,% Ordered,% မိန့်ထုတ်
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","သင်တန်းများအတွက်အခြေစိုက်ကျောင်းသားအုပ်စု, ထိုသင်တန်းအစီအစဉ်ကျောင်းအပ်အတွက်စာရင်းသွင်းသင်တန်းများအနေဖြင့်တိုင်းကျောင်းသားများအတွက်အတည်ပြုလိမ့်မည်။"
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date",ကော်မာကွဲကွာ Email လိပ်စာရိုက်ထည့်ငွေတောင်းခံလွှာကိုအထူးသနေ့စွဲအပေါ်အလိုအလျှောက်ပို့ပါလိမ့်မည်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Piecework
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,AVG ။ ဝယ်ယူ Rate
 DocType: Task,Actual Time (in Hours),(နာရီအတွက်) အမှန်တကယ်အချိန်
@@ -4255,7 +4345,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,item {0} Serial အမှတ်သည် setup ကိုမဟုတ်ပါဘူး။ စစ်ကြောင်းအလွတ်ရှိရမည်
 DocType: Accounts Settings,Accounts Settings,Settings ကိုအကောင့်
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,အတည်ပြု
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,တင်ပြခြင်းမရှိပါရလဒ်
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,တင်ပြခြင်းမရှိပါရလဒ်
 DocType: Customer,Sales Partner and Commission,အရောင်း partner နှင့်ကော်မရှင်မှ
 DocType: Employee Loan,Rate of Interest (%) / Year,အကျိုးစီးပွား၏နှုန်းမှာ (%) / တစ်နှစ်တာ
 ,Project Quantity,စီမံကိန်းအရေအတွက်
@@ -4267,55 +4357,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,black
 DocType: BOM Explosion Item,BOM Explosion Item,BOM ပေါက်ကွဲမှုဖြစ် Item
 DocType: Account,Auditor,စာရင်းစစ်ချုပ်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,ထုတ်လုပ် {0} ပစ္စည်းများ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,ထုတ်လုပ် {0} ပစ္စည်းများ
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,ပိုမိုသိရှိရန်
 DocType: Cheque Print Template,Distance from top edge,ထိပ်ဆုံးအစွန်ကနေအဝေးသင်
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,စျေးစာရင်း {0} ကိုပိတ်ထားသည်သို့မဟုတ်မတည်ရှိပါဘူး
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,စျေးစာရင်း {0} ကိုပိတ်ထားသည်သို့မဟုတ်မတည်ရှိပါဘူး
 DocType: Purchase Invoice,Return,ပြန်လာ
 DocType: Production Order Operation,Production Order Operation,ထုတ်လုပ်မှုအမိန့်စစ်ဆင်ရေး
 DocType: Pricing Rule,Disable,ကို disable
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,ငွေပေးချေမှု၏ Mode ကိုငွေပေးချေရန်လိုအပ်ပါသည်
 DocType: Project Task,Pending Review,ဆိုင်းငံ့ထားပြန်လည်ဆန်းစစ်ခြင်း
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,ချိန်းနှင့်တိုင်ပင်ညှိနှိုင်းမှုများ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ဟာအသုတ်လိုက် {2} စာရင်းသွင်းမဟုတ်ပါ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ဟာအသုတ်လိုက် {2} စာရင်းသွင်းမဟုတ်ပါ
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","ဒါကြောင့် {1} ပြီးသားဖြစ်သကဲ့သို့ပိုင်ဆိုင်မှု {0}, ဖျက်သိမ်းမရနိုငျ"
 DocType: Task,Total Expense Claim (via Expense Claim),(ကုန်ကျစရိတ်တောင်းဆိုမှုများကနေတဆင့်) စုစုပေါင်းကုန်ကျစရိတ်တောင်းဆိုမှုများ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,မာကုဒူးယောင်
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},အတန်း {0}: အ BOM # ၏ငွေကြေး {1} ရွေးချယ်ထားတဲ့ငွေကြေး {2} တန်းတူဖြစ်သင့်
 DocType: Journal Entry Account,Exchange Rate,ငွေလဲလှယ်နှုန်း
 DocType: Patient,Additional information regarding the patient,လူနာနှင့်ပတ်သက်သည့်အပိုဆောင်းသတင်းအချက်အလက်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,အရောင်းအမှာစာ {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,အရောင်းအမှာစာ {0} တင်သွင်းသည်မဟုတ်
 DocType: Homepage,Tag Line,tag ကိုလိုင်း
 DocType: Fee Component,Fee Component,အခကြေးငွေစိတျအပိုငျး
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,ရေယာဉ်စုစီမံခန့်ခွဲမှု
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,အထဲကပစ္စည်းတွေကို Add
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,ရေယာဉ်စုစီမံခန့်ခွဲမှု
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,အထဲကပစ္စည်းတွေကို Add
 DocType: Cheque Print Template,Regular,ပုံမှန်အစည်းအဝေး
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,အားလုံးအကဲဖြတ်လိုအပ်ချက်စုစုပေါင်း Weightage 100% ရှိရပါမည်
-DocType: BOM,Last Purchase Rate,နောက်ဆုံးဝယ်ယူ Rate
+DocType: Purchase Order Item,Last Purchase Rate,နောက်ဆုံးဝယ်ယူ Rate
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Task ID ကို
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,မျိုးကွဲရှိပါတယ်ကတည်းကစတော့အိတ် Item {0} သည်မတည်ရှိနိုင်
 DocType: Lab Test,Mobile,မိုဘိုင်း
 ,Sales Person-wise Transaction Summary,အရောင်းပုဂ္ဂိုလ်ပညာ Transaction အကျဉ်းချုပ်
 DocType: Training Event,Contact Number,ဆက်သွယ်ရန်ဖုန်းနံပါတ်
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,ဂိုဒေါင် {0} မတည်ရှိပါဘူး
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext Hub သည် Register
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,ဂိုဒေါင် {0} မတည်ရှိပါဘူး
 DocType: Monthly Distribution,Monthly Distribution Percentages,လစဉ်ဖြန့်ဖြူးရာခိုင်နှုန်း
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,ရွေးချယ်ထားတဲ့ item Batch ရှိသည်မဟုတ်နိုင်
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","အဘိုးပြတ်မှုနှုန်း {1} {2} များအတွက်စာရင်းကိုင် entries တွေကိုလုပ်ဖို့လိုအပ်သောပစ္စည်း {0}, အဘို့ရှာမတွေ့ပါ။ ပစ္စည်းကတော့ {1} အတွက်နမူနာကို item အဖြစ်လုပ်ဆောင်လျှင်, {1} Item table ထဲမှာကြောင်းဖော်ပြထားခြင်းပါ။ ဒီလိုမှမဟုတ်ရင်ပစ္စည်းတစ်ခုဝင်လာသောစတော့ရှယ်ယာအရောင်းအဝယ်အတွက်ဖန်တီးသို့မဟုတ်ဖော်ပြထားခြင်းအဘိုးပြတ်နှုန်း Item စံချိန်အတွက်, ပြီးတော့ဒီ entry ပယ်ဖျက် / submiting ကြိုးစားကြည့်ပါ"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,ဒီ Delivery Note ကိုဆန့်ကျင်ကယ်နှုတ်တော်မူ၏ပစ္စည်း%
+DocType: Training Event,Has Certificate,လက်မှတ်ရှိပါတယ်
 DocType: Project,Customer Details,customer အသေးစိတ်ကို
 DocType: Employee,Reports to,အစီရင်ခံစာများမှ
 ,Unpaid Expense Claim,မရတဲ့သုံးစွဲမှုဆိုနေ
 DocType: Payment Entry,Paid Amount,Paid ငွေပမာဏ
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,အရောင်း Cycle Explore
 DocType: Assessment Plan,Supervisor,ကြီးကြပ်သူ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,အွန်လိုင်း
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,အွန်လိုင်း
 ,Available Stock for Packing Items,ပစ္စည်းများထုပ်ပိုးရရှိနိုင်ပါသည်စတော့အိတ်
 DocType: Item Variant,Item Variant,item Variant
 DocType: Assessment Result Tool,Assessment Result Tool,အကဲဖြတ်ရလဒ် Tool ကို
 DocType: BOM Scrap Item,BOM Scrap Item,BOM အပိုင်းအစ Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Submitted အမိန့်ပယ်ဖျက်မရပါ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Submitted အမိန့်ပယ်ဖျက်မရပါ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Debit ထဲမှာရှိပြီးသားအကောင့်ကိုချိန်ခွင်ကိုသင် &#39;&#39; Credit &#39;အဖြစ်&#39; &#39;Balance ဖြစ်ရမည်&#39; &#39;တင်ထားရန်ခွင့်ပြုမနေကြ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,အရည်အသွေးအစီမံခန့်ခွဲမှု
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,item {0} ကိုပိတ်ထားသည်
@@ -4336,7 +4425,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,သုညအကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နှုန်း Allow
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,သုညအကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နှုန်း Allow
 DocType: Training Event Employee,Invited,ဖိတ်ကြားခဲ့
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,ပေးထားသောရက်စွဲများအတွက်ဝန်ထမ်း {0} တွေ့ရှိအကွိမျမြားစှာတက်ကြွလစာ structures များ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,ပေးထားသောရက်စွဲများအတွက်ဝန်ထမ်း {0} တွေ့ရှိအကွိမျမြားစှာတက်ကြွလစာ structures များ
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Setup ကို Gateway ရဲ့အကောင့်။
 DocType: Employee,Employment Type,အလုပ်အကိုင်အခွင့်အကအမျိုးအစား
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Fixed ပိုင်ဆိုင်မှုများ
@@ -4348,7 +4437,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,ကျောင်းသားသမဂ္ဂအီးမေးလ် ID ကို
 DocType: Employee,Notice (days),အသိပေးစာ (ရက်)
 DocType: Tax Rule,Sales Tax Template,အရောင်းခွန် Template ကို
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,ငွေတောင်းခံလွှာကိုကယ်တင်ပစ္စည်းများကို Select လုပ်ပါ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,ငွေတောင်းခံလွှာကိုကယ်တင်ပစ္စည်းများကို Select လုပ်ပါ
 DocType: Employee,Encashment Date,Encashment နေ့စွဲ
 DocType: Training Event,Internet,အင်တာနက်ကို
 DocType: Special Test Template,Special Test Template,အထူးစမ်းသပ် Template ကို
@@ -4358,7 +4447,7 @@
 DocType: Academic Term,Term Start Date,သက်တမ်း Start ကိုနေ့စွဲ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp အရေအတွက်
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp အရေအတွက်
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},{0} # {1} တွဲကိုတွေ့ ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},{0} # {1} တွဲကိုတွေ့ ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,အထွေထွေလယ်ဂျာနှုန်းအဖြစ် Bank မှဖော်ပြချက်ချိန်ခွင်လျှာ
 DocType: Job Applicant,Applicant Name,လျှောက်ထားသူအမည်
 DocType: Authorization Rule,Customer / Item Name,customer / Item အမည်
@@ -4378,7 +4467,7 @@
 DocType: Guardian,Guardian Of ,၏ဂါးဒီးယန်း
 DocType: Grading Scale Interval,Threshold,တံခါးဝ
 DocType: BOM Update Tool,Current BOM,လက်ရှိ BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Serial No Add
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Serial No Add
 DocType: Production Order Item,Available Qty at Source Warehouse,အရင်းအမြစ်ဂိုဒေါင်မှာမရရှိနိုင်အရည်အတွက်
 apps/erpnext/erpnext/config/support.py +22,Warranty,အာမခံချက်
 DocType: Purchase Invoice,Debit Note Issued,debit မှတ်ချက်ထုတ်ပေး
@@ -4401,10 +4490,9 @@
 DocType: Account,Receivable,receiver
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,row # {0}: ဝယ်ယူအမိန့်ရှိနှင့်ပြီးသားအဖြစ်ပေးသွင်းပြောင်းလဲပစ်ရန်ခွင့်ပြုခဲ့မဟုတ်
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,ထားချေးငွေကန့်သတ်ထက်ကျော်လွန်ကြောင်းကိစ္စများကိုတင်ပြခွင့်ပြုခဲ့ကြောင်းအခန်းကဏ္ဍကို။
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,ထုတ်လုပ်ခြင်းမှပစ္စည်းများကို Select လုပ်ပါ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","မဟာဒေတာထပ်တူပြုခြင်း, ကအချို့သောအချိန်ယူစေခြင်းငှါ,"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,ထုတ်လုပ်ခြင်းမှပစ္စည်းများကို Select လုပ်ပါ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","မဟာဒေတာထပ်တူပြုခြင်း, ကအချို့သောအချိန်ယူစေခြင်းငှါ,"
 DocType: Item,Material Issue,material Issue
-DocType: Hub Settings,Seller Description,ရောင်းချသူဖော်ပြချက်များ
 DocType: Employee Education,Qualification,အရည်အချင်း
 DocType: Item Price,Item Price,item စျေးနှုန်း
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,ဆပ်ပြာ &amp; ဆပ်ပြာ
@@ -4412,7 +4500,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,အခြိနျမှနျမှထက် သာ. ကြီးမြတ်မဖြစ်နိုင်ပါ။
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; ဗီဒီယို
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,အမိန့်ထုတ်
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,ပြန်စသည်
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,ပြန်စသည်
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,enabled လျှင်စနစ် template ကိုကနေမျိုးကွဲများ၏လယ်ကွက်ကို update မည်မဟုတ်ပေမယ့်သစ်ကိုမူကွဲအောင်စဉ်ကိုအောက်တွင်ဖော်ပြခဲ့တဲ့လယ်ကွင်းများ၏ဒေတာကိုကော်ပီကူးပါလိမ့်မယ်
 DocType: Salary Detail,Component,component
 DocType: Assessment Criteria,Assessment Criteria Group,အကဲဖြတ်လိုအပ်ချက် Group မှ
 DocType: Healthcare Settings,Patient Name By,အားဖြင့်လူနာအမည်
@@ -4422,7 +4511,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,အခန်းက္ပအတည်ပြုပေးသောသို့မဟုတ်အသုံးပြုသူအတည်ပြုပေးသောရိုက်ထည့်ပေးပါ
 DocType: Journal Entry,Write Off Entry,Entry ပိတ်ရေးထား
 DocType: BOM,Rate Of Materials Based On,ပစ္စည်းများအခြေတွင်အမျိုးမျိုး rate
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,ပေးသွင်း&gt; ပေးသွင်းအမျိုးအစား
+DocType: Item Variant Settings,Do not Update Variants,မူကွဲကိုအပ်ဒိတ်လုပ်မနေပါနဲ့
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,ပံ့ပိုးမှု Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,အားလုံးကို uncheck လုပ်
 DocType: POS Profile,Terms and Conditions,စည်းကမ်းနှင့်သတ်မှတ်ချက်များ
@@ -4431,7 +4520,7 @@
 DocType: Leave Block List,Applies to Company,ကုမ္ပဏီသက်ဆိုင်
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,"တင်သွင်းစတော့အိတ် Entry &#39;{0} တည်ရှိသောကြောင့်, ဖျက်သိမ်းနိုင်ဘူး"
 DocType: Employee Loan,Disbursement Date,ငွေပေးချေနေ့စွဲ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;&#39; လက်ခံသူများ &#39;&#39; မသတ်မှတ်ရသေးပါ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;&#39; လက်ခံသူများ &#39;&#39; မသတ်မှတ်ရသေးပါ
 DocType: BOM Update Tool,Update latest price in all BOMs,အားလုံး BOMs အတွက်နောက်ဆုံးပေါ်စျေးနှုန်းကိုအပ်ဒိတ်လုပ်
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,ဆေးဘက်ဆိုင်ရာမှတ်တမ်း
 DocType: Vehicle,Vehicle,ယာဉ်
@@ -4447,14 +4536,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / ခဲ%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,ပိုင်ဆိုင်မှုတန်ဖိုးနှင့် Balance
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},ငွေပမာဏ {0} {1} {3} မှ {2} ကနေလွှဲပြောင်း
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},ငွေပမာဏ {0} {1} {3} မှ {2} ကနေလွှဲပြောင်း
 DocType: Sales Invoice,Get Advances Received,ကြိုတင်ငွေရရှိထားသည့် Get
 DocType: Email Digest,Add/Remove Recipients,Add / Remove လက်ခံရယူ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},transaction ရပ်တန့်ထုတ်လုပ်ရေးအမိန့် {0} ဆန့်ကျင်ခွင့်မပြု
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Default အဖြစ်ဒီဘဏ္ဍာရေးနှစ်တစ်နှစ်တာတင်ထားရန်, &#39;&#39; Default အဖြစ်သတ်မှတ်ပါ &#39;&#39; ကို click လုပ်ပါ"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,ပူးပေါင်း
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,ပူးပေါင်း
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,ပြတ်လပ်မှု Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,item မူကွဲ {0} အတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,item မူကွဲ {0} အတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
 DocType: Employee Loan,Repay from Salary,လစာထဲကနေပြန်ဆပ်
 DocType: Leave Application,LAP/,ရင်ခွင် /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},ငွေပမာဏများအတွက် {0} {1} ဆန့်ကျင်ငွေပေးချေမှုတောင်းခံ {2}
@@ -4467,7 +4556,7 @@
 DocType: Sales Invoice Item,Sales Order Item,အရောင်းအမှာစာ Item
 DocType: Salary Slip,Payment Days,ငွေပေးချေမှုရမည့်ကာလသ
 DocType: Patient,Dormant,မြုံ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,ကလေး node များနှင့်အတူသိုလှောင်ရုံလယ်ဂျာကူးပြောင်းမရနိုငျ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,ကလေး node များနှင့်အတူသိုလှောင်ရုံလယ်ဂျာကူးပြောင်းမရနိုငျ
 DocType: BOM,Manage cost of operations,စစ်ဆင်ရေး၏ကုန်ကျစရိတ် Manage
 DocType: Accounts Settings,Stale Days,ဟောင်းနွမ်းနေ့ရက်များ
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","ထို checked ကိစ္စများကိုမဆို &quot;Submitted&quot; အခါ, အီးမေးလ် pop-up တခုအလိုအလျှောက်ပူးတွဲမှုအဖြစ်အရောင်းအဝယ်နှင့်အတူကြောင့်အရောင်းအဝယ်အတွက်ဆက်စပ် &quot;ဆက်သွယ်ရန်&quot; ရန်အီးမေးလ်ပေးပို့ဖို့ဖွင့်လှစ်ခဲ့။ အသုံးပြုသူသို့မဟုတ်မပြုစေခြင်းငှါအီးမေးလ်ပို့ပါလိမ့်မည်။"
@@ -4481,10 +4570,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,serial No {0} ပြီးသားကိုလက်ခံရရှိခဲ့ပြီး
 ,Requested Items To Be Transferred,လွှဲပြောင်းရန်မေတ္တာရပ်ခံပစ္စည်းများ
 DocType: Expense Claim,Vehicle Log,ယာဉ် Log in ဝင်ရန်
-DocType: Purchase Invoice,Recurring Id,ထပ်တလဲလဲ Id
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"တစ်အဖျား (အပူချိန်&gt; 38.5 ° C / 101,3 ° F ကိုသို့မဟုတ်စဉ်ဆက်မပြတ်အပူချိန်&gt; 38 ဒီဂရီစင်တီဂရိတ် / 100,4 ° F) ၏ရောက်ရှိခြင်း"
 DocType: Customer,Sales Team Details,အရောင်းရေးအဖွဲ့အသေးစိတ်ကို
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,အမြဲတမ်းပယ်ဖျက်?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,အမြဲတမ်းပယ်ဖျက်?
 DocType: Expense Claim,Total Claimed Amount,စုစုပေါင်းအခိုင်အမာငွေပမာဏ
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,ရောင်းချခြင်းသည်အလားအလာရှိသောအခွင့်အလမ်း။
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},မမှန်ကန်ခြင်း {0}
@@ -4494,7 +4582,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ဦးစီးဌာနအရောင်းဆိုင်များ
 ,Item Delivery Date,item Delivery နေ့စွဲ
 DocType: Warehouse,PIN,PIN ကို
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Setup ကို ERPNext ၌သင်တို့၏ကျောင်း
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Setup ကို ERPNext ၌သင်တို့၏ကျောင်း
 DocType: Sales Invoice,Base Change Amount (Company Currency),base ပြောင်းလဲမှုပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,အောက်ပါသိုလှောင်ရုံမရှိပါစာရင်းကိုင် posts များ
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,ပထမဦးဆုံးစာရွက်စာတမ်း Save လိုက်ပါ။
@@ -4506,13 +4594,12 @@
 DocType: Task,Is Milestone,မှတ်တိုင်ဖြစ်ပါသည်
 DocType: Daily Work Summary,Email Sent To,ရန် Sent အီးမေးလ်
 DocType: Budget,Warn,အသိပေး
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,သငျသညျမှတ်ပုံတင်မှုဖျက်ရန်ချင်သင်သေချာပါသလား?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","အခြားမည်သည့်သဘောထားမှတ်ချက်, မှတ်တမ်းများအတွက်သွားသင့်ကြောင်းမှတ်သားဖွယ်အားထုတ်မှု။"
 DocType: BOM,Manufacturing User,ကုန်ထုတ်လုပ်မှုအသုံးပြုသူတို့၏
 DocType: Purchase Invoice,Raw Materials Supplied,ပေးထားသည့်ကုန်ကြမ်းပစ္စည်းများ
-DocType: Purchase Invoice,Recurring Print Format,ထပ်တလဲလဲပုံနှိပ်စီစဉ်ဖွဲ့စည်းမှုပုံစံ
 DocType: C-Form,Series,စီးရီး
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},စျေးနှုန်းစာရင်း၏ငွေကြေးစနစ် {0} {1} သို့မဟုတ် {2} ရှိရမည်
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,ကုန်ပစ္စည်းများ Add
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},စျေးနှုန်းစာရင်း၏ငွေကြေးစနစ် {0} {1} သို့မဟုတ် {2} ရှိရမည်
 DocType: Appraisal,Appraisal Template,စိစစ်ရေး Template:
 DocType: Item Group,Item Classification,item ခွဲခြား
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,စီးပွားရေးဖွံ့ဖြိုးတိုးတက်ရေးမန်နေဂျာ
@@ -4526,7 +4613,7 @@
 DocType: Item Attribute Value,Attribute Value,attribute Value တစ်ခု
 ,Itemwise Recommended Reorder Level,Itemwise Reorder အဆင့်အကြံပြုထား
 DocType: Salary Detail,Salary Detail,လစာ Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,ပထမဦးဆုံး {0} ကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,ပထမဦးဆုံး {0} ကို select ကျေးဇူးပြု.
 DocType: Appointment Type,Physician,ဆရာဝန်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,batch {0} Item ၏ {1} သက်တမ်းကုန်ဆုံးခဲ့သည်။
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,ဆွေးနွေးညှိနှိုင်း
@@ -4537,7 +4624,7 @@
 DocType: Salary Detail,Default Amount,default ငွေပမာဏ
 DocType: Lab Test Template,Descriptive,ဖော်ပြရန်
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,ဂိုဒေါင်ကို system ထဲမှာမတှေ့
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,ဒီလရဲ့အကျဉ်းချုပ်
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,ဒီလရဲ့အကျဉ်းချုပ်
 DocType: Quality Inspection Reading,Quality Inspection Reading,အရည်အသွေးအစစ်ဆေးရေးစာဖတ်ခြင်း
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze စတော့စျေးကွက် Older Than`%d ရက်ထက်နည်းသင့်သည်။
 DocType: Tax Rule,Purchase Tax Template,ဝယ်ယူခွန် Template ကို
@@ -4560,12 +4647,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,လေ့ကျင့်ရေးအဖွဲ့တွေ / ရလဒ်များ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,အပေါ်အဖြစ်စုဆောင်းတန်ဖိုး
 DocType: Sales Invoice,C-Form Applicable,သက်ဆိုင်သည့် C-Form တွင်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},စစ်ဆင်ရေးအချိန်ကစစ်ဆင်ရေး {0} များအတွက် 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},စစ်ဆင်ရေးအချိန်ကစစ်ဆင်ရေး {0} များအတွက် 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,ဂိုဒေါင်မဖြစ်မနေဖြစ်ပါသည်
 DocType: Supplier,Address and Contacts,လိပ်စာနှင့်ဆက်သွယ်ရန်
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM ကူးပြောင်းခြင်း Detail
 DocType: Program,Program Abbreviation,Program ကိုအတိုကောက်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,ထုတ်လုပ်မှုအမိန့်တစ်ခု Item Template ဆန့်ကျင်ထမွောကျနိုငျမညျမဟု
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,ထုတ်လုပ်မှုအမိန့်တစ်ခု Item Template ဆန့်ကျင်ထမွောကျနိုငျမညျမဟု
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,စွဲချက်အသီးအသီးကို item ဆန့်ကျင်ဝယ်ယူခြင်းပြေစာ Update လုပ်ပေး
 DocType: Warranty Claim,Resolved By,အားဖြင့်ပြေလည်
 DocType: Bank Guarantee,Start Date,စတင်သည့်ရက်စွဲ
@@ -4591,27 +4678,28 @@
 DocType: Employee,Educational Qualification,ပညာရေးဆိုင်ရာအရည်အချင်း
 DocType: Workstation,Operating Costs,operating ကုန်ကျစရိတ်
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,စုဆောင်းမိလစဉ်ဘတ်ဂျက်လျှင်လှုပ်ရှားမှုကျော်သွားပါပြီ
-DocType: Purchase Invoice,Submit on creation,ဖန်ဆင်းခြင်းအပေါ် Submit
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},{0} {1} ရှိရမည်များအတွက်ငွေကြေး
+DocType: Subscription,Submit on creation,ဖန်ဆင်းခြင်းအပေါ် Submit
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},{0} {1} ရှိရမည်များအတွက်ငွေကြေး
 DocType: Asset,Disposal Date,စွန့်ပစ်နေ့စွဲ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","သူတို့အားလပ်ရက်ရှိသည်မဟုတ်ကြဘူးလျှင်အီးမေးလ်များ, ပေးထားသောနာရီမှာကုမ္ပဏီအပေါငျးတို့သ Active ကိုဝန်ထမ်းများထံသို့စေလွှတ်လိမ့်မည်။ တုံ့ပြန်မှု၏အကျဉ်းချုပ်သန်းခေါင်မှာကိုစလှေတျပါလိမ့်မည်။"
 DocType: Employee Leave Approver,Employee Leave Approver,ဝန်ထမ်းထွက်ခွာခွင့်ပြုချက်
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},row {0}: An Reorder entry ကိုပြီးသားဒီကိုဂိုဒေါင် {1} သည်တည်ရှိ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","ဆုံးရှုံးအဖြစ်စျေးနှုန်းကိုဖန်ဆင်းခဲ့ပြီးကြောင့်, ကြေညာလို့မရပါဘူး။"
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,လေ့ကျင့်ရေးတုံ့ပြန်ချက်
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},row {0}: An Reorder entry ကိုပြီးသားဒီကိုဂိုဒေါင် {1} သည်တည်ရှိ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","ဆုံးရှုံးအဖြစ်စျေးနှုန်းကိုဖန်ဆင်းခဲ့ပြီးကြောင့်, ကြေညာလို့မရပါဘူး။"
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,လေ့ကျင့်ရေးတုံ့ပြန်ချက်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,ထုတ်လုပ်မှုအမိန့် {0} တင်သွင်းရမည်
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,ပေးသွင်း Scorecard လိုအပ်ချက်
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Item {0} သည် Start ကိုနေ့စွဲနဲ့ End Date ကို select လုပ်ပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},သင်တန်းအတန်း {0} အတွက်မဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ယနေ့အထိသည့်နေ့ရက်မှခင်မဖွစျနိုငျ
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Edit ကိုဈေးနှုန်းများ Add /
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Edit ကိုဈေးနှုန်းများ Add /
 DocType: Batch,Parent Batch,မိဘအသုတ်လိုက်
 DocType: Batch,Parent Batch,မိဘအသုတ်လိုက်
 DocType: Cheque Print Template,Cheque Print Template,Cheque တစ်စောင်လျှင်ပရင့်ထုတ်ရန် Template
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,ကုန်ကျစရိတ်စင်တာများ၏ဇယား
 DocType: Lab Test Template,Sample Collection,နမူနာစုစည်းမှု
 ,Requested Items To Be Ordered,အမိန့်ခံရဖို့မေတ္တာရပ်ခံပစ္စည်းများ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,ငါ့အမိန့်
 DocType: Price List,Price List Name,စျေးနှုန်းစာရင်းအမည်
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},{0} နေ့စဉ်လုပ်ငန်းခွင်အကျဉ်းချုပ်
 DocType: Employee Loan,Totals,စုစုပေါင်း
@@ -4630,12 +4718,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {3} {4} {5} ဒီအရောင်းအဝယ်ဖြည့်စွက်ရန်အဘို့အပေါ် {2} လိုသေး {1} ၏ယူနစ်။
 DocType: Fee Schedule,Student Category,ကျောင်းသားသမဂ္ဂ Category:
 DocType: Announcement,Student,ကြောငျးသား
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,အစည်းအရုံးယူနစ် (ဌာန၏) သခင်သည်။
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,အစည်းအရုံးယူနစ် (ဌာန၏) သခင်သည်။
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,အခန်းကိုသွားပါ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,ပေးပို့ခြင်းမပြုမီသတင်းစကားကိုရိုက်ထည့်ပေးပါ
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,ပေးသွင်းသူများအတွက် Duplicate
 DocType: Email Digest,Pending Quotations,ဆိုင်းငံ့ကိုးကားချက်များ
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,point-of-Sale ကိုယ်ရေးအချက်အလက်များ profile
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,point-of-Sale ကိုယ်ရေးအချက်အလက်များ profile
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Lab ကစမ်းသပ် Configuration ။
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,မလုံခြုံချေးငွေ
 DocType: Cost Center,Cost Center Name,ကုန်ကျ Center ကအမည်
@@ -4645,6 +4733,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,စုစုပေါင်း Paid Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 ဇာတ်ကောင်ထက် သာ. ကြီးမြတ် messages အများအပြားသတင်းစကားများသို့ခွဲထွက်လိမ့်မည်
 DocType: Purchase Receipt Item,Received and Accepted,ရရှိထားသည့်နှင့်လက်ခံရရှိပါသည်
+DocType: Hub Settings,Company and Seller Profile,ကုမ္ပဏီနှင့်ရောင်းချသူကိုယ်ရေးဖိုင်
 ,GST Itemised Sales Register,GST Item အရောင်းမှတ်ပုံတင်မည်
 ,Serial No Service Contract Expiry,serial No Service ကိုစာချုပ်သက်တမ်းကုန်ဆုံး
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,သင်တစ်ချိန်တည်းမှာအတူတူအကောင့်ကိုချေးငွေနှင့်ငွေကြိုမပေးနိုငျ
@@ -4654,10 +4743,11 @@
 DocType: Item,Variant Based On,မူကွဲအခြေပြုတွင်
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},တာဝန်ပေးစုစုပေါင်း weightage 100% ဖြစ်သင့်သည်။ ဒါဟာ {0} သည်
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,သင့်ရဲ့ပေးသွင်း
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,အဆိုပါပြင်ပေးပါ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,အရောင်းအမိန့်ကိုဖန်ဆင်းသည်အဖြစ်ပျောက်ဆုံးသွားသောအဖြစ်သတ်မှတ်လို့မရပါဘူး။
 DocType: Request for Quotation Item,Supplier Part No,ပေးသွင်းအပိုင်းဘယ်သူမျှမက
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',အမျိုးအစား &#39;&#39; အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် &#39;သို့မဟုတ်&#39; &#39;Vaulation နှင့်စုစုပေါင်း&#39; &#39;အဘို့ဖြစ်၏ရသောအခါနုတ်မနိုင်
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,မှစ. ရရှိထားသည့်
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,မှစ. ရရှိထားသည့်
 DocType: Lead,Converted,ပွောငျး
 DocType: Item,Has Serial No,Serial No ရှိပါတယ်
 DocType: Employee,Date of Issue,ထုတ်ဝေသည့်ရက်စွဲ
@@ -4665,7 +4755,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","အဆိုပါဝယ်ချိန်ညှိမှုများနှုန်းအဖြစ်ဝယ်ယူ Reciept လိုအပ်ပါသည် == &#39;&#39; ဟုတ်ကဲ့ &#39;&#39;, ထို့နောက်အရစ်ကျငွေတောင်းခံလွှာအတွက်, အသုံးပြုသူကို item {0} များအတွက်ပထမဦးဆုံးဝယ်ယူငွေလက်ခံပြေစာကိုဖန်တီးရန်လိုအပ်တယ်ဆိုရင်"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},row # {0}: ကို item များအတွက် Set ပေးသွင်း {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,အတန်း {0}: နာရီတန်ဖိုးကိုသုညထက်ကြီးမြတ်ဖြစ်ရပါမည်။
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,website က Image ကို {0} ပစ္စည်းမှပူးတွဲပါ {1} မတွေ့ရှိနိုင်
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,website က Image ကို {0} ပစ္စည်းမှပူးတွဲပါ {1} မတွေ့ရှိနိုင်
 DocType: Issue,Content Type,content Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,ကွန်ပျူတာ
 DocType: Item,List this Item in multiple groups on the website.,Website တွင်အများအပြားအုပ်စုများ၌ဤ Item စာရင်း။
@@ -4676,14 +4766,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled Entries Get
 DocType: Payment Reconciliation,From Invoice Date,ပြေစာနေ့စွဲထဲကနေ
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,သငျသညျတင်သွင်းခွင့်ပြုချက်မရှိပါ
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,ငွေတောင်းခံငွေကြေးသော်လည်းကောင်း default အနေနဲ့ comapany ရဲ့ငွေကြေးသို့မဟုတ်ပါတီအကောင့်ငွေကြေးတန်းတူဖြစ်ရပါမည်
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,ငွေတောင်းခံငွေကြေးသော်လည်းကောင်း default အနေနဲ့ comapany ရဲ့ငွေကြေးသို့မဟုတ်ပါတီအကောင့်ငွေကြေးတန်းတူဖြစ်ရပါမည်
 DocType: Healthcare Settings,Laboratory Settings,ဓာတ်ခွဲခန်းက Settings
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Encashment Leave
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,ဒါကြောင့်အဘယ်သို့ပြုရပါသနည်း?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,ဂိုဒေါင်မှ
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,အားလုံးကျောင်းသားသမဂ္ဂအဆင့်လက်ခံရေး
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,ဒါကြောင့်အဘယ်သို့ပြုရပါသနည်း?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,ဂိုဒေါင်မှ
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,အားလုံးကျောင်းသားသမဂ္ဂအဆင့်လက်ခံရေး
 ,Average Commission Rate,ပျမ်းမျှအားဖြင့်ကော်မရှင် Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,&#39;&#39; ဟုတ်ကဲ့ &#39;&#39; Non-စတော့ရှယ်ယာကို item သည်မဖွစျနိုငျ &#39;&#39; Serial No ရှိခြင်း &#39;&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,&#39;&#39; ဟုတ်ကဲ့ &#39;&#39; Non-စတော့ရှယ်ယာကို item သည်မဖွစျနိုငျ &#39;&#39; Serial No ရှိခြင်း &#39;&#39;
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,အဆင့်အတန်းကို Select လုပ်ပါ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,တက်ရောက်သူအနာဂတ်ရက်စွဲများကိုချောင်းမြောင်းမရနိုင်ပါ
 DocType: Pricing Rule,Pricing Rule Help,စျေးနှုန်း Rule အကူအညီ
@@ -4701,41 +4791,41 @@
 DocType: Item,Customer Code,customer Code ကို
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},{0} သည်မွေးနေသတိပေး
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ပြီးခဲ့သည့်အမိန့် ခုနှစ်မှစ. ရက်ပတ်လုံး
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,အကောင့်ကိုရန် debit တစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,အကောင့်ကိုရန် debit တစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
 DocType: Buying Settings,Naming Series,စီးရီးအမည်
 DocType: Leave Block List,Leave Block List Name,Block List ကိုအမည် Leave
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,အာမခံ Start ကိုရက်စွဲအာမခံအဆုံးနေ့စွဲထက်လျော့နည်းဖြစ်သင့်
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,setup ကိုနည်းပြ&gt; ကျောင်းအတွက်ကျောင်းချိန်ညှိမှုများ System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,စတော့အိတ်ပိုင်ဆိုင်မှုများ
 DocType: Timesheet,Production Detail,ထုတ်လုပ်မှု Detail
+DocType: Restaurant,Active Menu,တက်ကြွ Menu ကို
 DocType: Target Detail,Target Qty,Target က Qty
 DocType: Shopping Cart Settings,Checkout Settings,Checkout ချိန်ညှိ
 DocType: Attendance,Present,လက်ဆောင်
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Delivery မှတ်ချက် {0} တင်သွင်းရမည်မဟုတ်ရပါ
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Delivery မှတ်ချက် {0} တင်သွင်းရမည်မဟုတ်ရပါ
 DocType: Notification Control,Sales Invoice Message,အရောင်းပြေစာ Message
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,အကောင့်ကို {0} ပိတ်ပြီး type ကိုတာဝန်ဝတ္တရား / Equity ၏ဖြစ်ရပါမည်
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},ဝန်ထမ်း၏လစာစလစ်ဖြတ်ပိုင်းပုံစံ {0} ပြီးသားအချိန်စာရွက် {1} ဖန်တီး
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},ဝန်ထမ်း၏လစာစလစ်ဖြတ်ပိုင်းပုံစံ {0} ပြီးသားအချိန်စာရွက် {1} ဖန်တီး
 DocType: Vehicle Log,Odometer,Odometer
 DocType: Sales Order Item,Ordered Qty,အမိန့် Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,item {0} ပိတ်ထားတယ်
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,item {0} ပိတ်ထားတယ်
 DocType: Stock Settings,Stock Frozen Upto,စတော့အိတ် Frozen အထိ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM ဆိုစတော့ရှယ်ယာကို item ဆံ့မပါဘူး
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,စီမံကိန်းလှုပ်ရှားမှု / အလုပ်တစ်ခုကို။
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM ဆိုစတော့ရှယ်ယာကို item ဆံ့မပါဘူး
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,စီမံကိန်းလှုပ်ရှားမှု / အလုပ်တစ်ခုကို။
 DocType: Vehicle Log,Refuelling Details,ဆီဖြည့အသေးစိတ်
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,လစာစလစ် Generate
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","application များအတွက် {0} အဖြစ်ရွေးချယ်မယ်ဆိုရင်ဝယ်, checked ရမည်"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,လျော့စျေးက 100 ထက်လျော့နည်းဖြစ်ရမည်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,ပြီးခဲ့သည့်ဝယ်ယူနှုန်းကိုမတွေ့ရှိ
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ဟာ Off ရေးဖို့ပမာဏ (Company မှငွေကြေးစနစ်)
 DocType: Sales Invoice Timesheet,Billing Hours,ငွေတောင်းခံနာရီ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,{0} မတွေ့ရှိများအတွက် default BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,row # {0}: set ကျေးဇူးပြု. reorder အအရေအတွက်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,{0} မတွေ့ရှိများအတွက် default BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,row # {0}: set ကျေးဇူးပြု. reorder အအရေအတွက်
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,ဒီနေရာမှာသူတို့ကိုထည့်သွင်းဖို့ပစ္စည်းများကိုအသာပုတ်
 DocType: Fees,Program Enrollment,Program ကိုကျောင်းအပ်
 DocType: Landed Cost Voucher,Landed Cost Voucher,ကုန်ကျစရိတ်ဘောက်ချာဆင်းသက်
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},{0} set ကျေးဇူးပြု.
-DocType: Purchase Invoice,Repeat on Day of Month,Month ရဲ့နေ့တွင် Repeat
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} မလှုပ်မရှားကျောင်းသားဖြစ်ပါသည်
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} မလှုပ်မရှားကျောင်းသားဖြစ်ပါသည်
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} မလှုပ်မရှားကျောင်းသားဖြစ်ပါသည်
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} မလှုပ်မရှားကျောင်းသားဖြစ်ပါသည်
 DocType: Employee,Health Details,ကနျြးမာရေးအသေးစိတ်ကို
 DocType: Offer Letter,Offer Letter Terms,ကမ်းလှမ်းမှုကိုပေးစာသက်မှတ်ချက်များ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,ရည်ညွှန်းစာရွက်စာတမ်းလိုအပ်ပါသည်တစ်ဦးငွေပေးချေမှုရမည့်တောင်းဆိုခြင်းကိုဖန်တီးရန်
@@ -4744,7 +4834,6 @@
 DocType: Employee External Work History,Salary,လခ
 DocType: Serial No,Delivery Document Type,Delivery Document ဖိုင် Type
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,အထက်ပါရွေးချယ်ထားသောသတ်မှတ်ချက်များပေါင်းသည်တလုံးလစာတနိုင်ငံအညွန့ Submit
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,Sync လုပ်ထား {0} ပစ္စည်းများ
 DocType: Sales Order,Partly Delivered,တစ်စိတ်တစ်ပိုင်းကယ်နှုတ်တော်မူ၏
 DocType: Email Digest,Receivables,receiver
 DocType: Lead Source,Lead Source,ခဲရင်းမြစ်
@@ -4765,9 +4854,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
 DocType: SG Creation Tool Course,Max Strength,မက်စ်အစွမ်းသတ္တိ
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM အစားထိုး
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Delivery နေ့စွဲအပေါ်အခြေခံပြီးပစ္စည်းများကို Select လုပ်ပါ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Delivery နေ့စွဲအပေါ်အခြေခံပြီးပစ္စည်းများကို Select လုပ်ပါ
 ,Sales Analytics,အရောင်း Analytics
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},ရရှိနိုင် {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},ရရှိနိုင် {0}
 ,Prospects Engaged But Not Converted,အလားအလာ Engaged သို့သော်ပြောင်းမ
 ,Prospects Engaged But Not Converted,အလားအလာ Engaged သို့သော်ပြောင်းမ
 DocType: Manufacturing Settings,Manufacturing Settings,ကုန်ထုတ်လုပ်မှု Settings ကို
@@ -4775,10 +4864,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 မိုဘိုင်းဘယ်သူမျှမက
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,ကုမ္ပဏီနှင့် Master အတွက် default အနေနဲ့ငွေကြေးရိုက်ထည့်ပေးပါ
 DocType: Stock Entry Detail,Stock Entry Detail,စတော့အိတ် Entry Detail
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Daily သတင်းစာသတိပေးချက်များ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Daily သတင်းစာသတိပေးချက်များ
 DocType: Products Settings,Home Page is Products,Home Page ထုတ်ကုန်များဖြစ်ပါသည်
 ,Asset Depreciation Ledger,ပိုင်ဆိုင်မှုတန်ဖိုး Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},{0} နှင့်အတူအခွန်နည်းဥပဒေပဋိပက္ခ
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},{0} နှင့်အတူအခွန်နည်းဥပဒေပဋိပက္ခ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,နယူးအကောင့်အမည်
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,ကုန်ကြမ်းပစ္စည်းများကုန်ကျစရိတ်ထောက်ပံ့
 DocType: Selling Settings,Settings for Selling Module,ရောင်းချသည့် Module သည် Settings ကို
@@ -4792,8 +4881,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item ဖြစ်ရမည်
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,တိုးတက်ရေးပါတီဂိုဒေါင်ခုနှစ်တွင် Default အနေနဲ့သူ Work
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,စာရင်းကိုင်လုပ်ငန်းတွေအတွက် default setting များ။
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,လူ့စွမ်းအားအရင်းအမြစ်အတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုထမ်း&gt; HR က Settings
 DocType: Maintenance Visit,MV,သင်္ဘော MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,မျှော်လင့်ထားသည့်ရက်စွဲပစ္စည်းတောင်းဆိုမှုနေ့စွဲခင်မဖွစျနိုငျ
+DocType: Restaurant,Default Tax Template,default အခွန် Template ကို
 DocType: Fees,Student Details,ကျောင်းသားအသေးစိတ်
 DocType: Purchase Invoice Item,Stock Qty,စတော့အိတ်အရည်အတွက်
 DocType: Purchase Invoice Item,Stock Qty,စတော့အိတ်အရည်အတွက်
@@ -4812,8 +4902,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,ပစ္စည်းများကိုသွားပါ
 DocType: Sales Partner,Partner Type,partner ကအမျိုးအစား
 DocType: Purchase Taxes and Charges,Actual,အမှန်တကယ်
+DocType: Restaurant Menu,Restaurant Manager,စားသောက်ဆိုင် Manager ကို
 DocType: Authorization Rule,Customerwise Discount,Customerwise လျှော့
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,တာဝန်များကိုဘို့ Timesheet ။
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,တာဝန်များကိုဘို့ Timesheet ။
 DocType: Purchase Invoice,Against Expense Account,အသုံးအကောင့်ဆန့်ကျင်
 DocType: Production Order,Production Order,ထုတ်လုပ်မှုအမိန့်
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Installation မှတ်ချက် {0} ပြီးသားတင်သွင်းခဲ့
@@ -4821,7 +4912,6 @@
 DocType: Quotation Item,Against Docname,Docname ဆန့်ကျင်
 DocType: SMS Center,All Employee (Active),အားလုံးသည်န်ထမ်း (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,အခုတော့ကြည့်ရန်
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,ထိုကုန်ပို့လွှာကိုအလိုအလျောက် generated လိမ့်မည်သည့်အခါကာလကိုရွေးချယ်ပါ
 DocType: BOM,Raw Material Cost,ကုန်ကြမ်းပစ္စည်းကုန်ကျစရိတ်
 DocType: Item Reorder,Re-Order Level,Re-Order အဆင့်
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,ပစ္စည်းများကို Enter နှင့်သင်ထုတ်လုပ်မှုအမိန့်မြှင်သို့မဟုတ်ခွဲခြမ်းစိတ်ဖြာများအတွက်ကုန်ကြမ်းကို download လုပ်လိုသည့်အဘို့အ qty စီစဉ်ခဲ့ပါတယ်။
@@ -4834,24 +4924,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,အစီရင်ခံစာ Type မသင်မနေရ
 DocType: Item,Serial Number Series,serial နံပါတ်စီးရီး
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},ဂိုဒေါင်တန်းအတွက်စတော့ရှယ်ယာ Item {0} သည်မသင်မနေရ {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Programs ကို Add
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,လက်လီလက်ကားအရောင်းဆိုင် &amp;
 DocType: Issue,First Responded On,ပထမဦးဆုံးတွင်တုန့်ပြန်
 DocType: Website Item Group,Cross Listing of Item in multiple groups,မျိုးစုံအုပ်စုများအတွက် Item ၏လက်ဝါးကပ်တိုင်အိမ်ခန်းနှင့်
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ Start ကိုနေ့စွဲနှင့်ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ End Date ကိုပြီးသားဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} အတွက်သတ်မှတ်ကြသည်
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,ရှင်းလင်းရေးနေ့စွဲ updated
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split ကိုအသုတ်လိုက်
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split ကိုအသုတ်လိုက်
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split ကိုအသုတ်လိုက်
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split ကိုအသုတ်လိုက်
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,အောင်မြင်စွာ ပြန်.
 DocType: Request for Quotation Supplier,Download PDF,ဒေါင်းလုပ် PDF ဖိုင်ရယူရန်
 DocType: Production Order,Planned End Date,စီစဉ်ထားတဲ့အဆုံးနေ့စွဲ
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,ဇယားနေ့စွဲကိုရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,အဘယ်မှာရှိပစ္စည်းများကိုသိမ်းဆည်းထားသည်။
 DocType: Request for Quotation,Supplier Detail,ပေးသွင်း Detail
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},ဖော်မြူလာသို့မဟုတ်အခြေအနေအမှား: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},ဖော်မြူလာသို့မဟုတ်အခြေအနေအမှား: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Invoiced ငွေပမာဏ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,လိုအပ်ချက်အလေး 100% မှတက် add ရပါမည်
 DocType: Attendance,Attendance,သွားရောက်ရှိနေခြင်း
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,စတော့အိတ်ပစ္စည်းများ
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,စတော့အိတ်ပစ္စည်းများ
 DocType: BOM,Materials,ပစ္စည်းများ
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","checked မလျှင်, စာရင်းကလျှောက်ထားခံရဖို့ရှိပါတယ်ရှိရာတစ်ဦးစီဦးစီးဌာနမှထည့်သွင်းရပါလိမ့်မယ်။"
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,အရင်းအမြစ်နှင့်ပစ်မှတ်ဂိုဒေါင်အတူတူမဖွစျနိုငျ
@@ -4869,6 +4959,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,Net ကစုစုပေါင်းတွင်
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},{0} Item {4} ဘို့ {1} {3} ၏နှစ်တိုးအတွက် {2} မှများ၏အကွာအဝေးအတွင်းရှိရမည် Attribute ဘို့ Value တစ်ခု
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,အတန်းအတွက်ပစ်မှတ်ဂိုဒေါင် {0} ထုတ်လုပ်မှုအမိန့်အဖြစ်အတူတူသာဖြစ်ရမည်
+DocType: Restaurant Reservation,Waitlisted,စောင့်နေစာရင်းထဲက
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,ငွေကြေးအချို့သောအခြားငွေကြေးသုံးပြီး entries တွေကိုချမှတ်ပြီးနောက်ပြောင်းလဲသွားမရနိုငျ
 DocType: Vehicle Service,Clutch Plate,clutch ပြား
 DocType: Company,Round Off Account,အကောင့်ပိတ် round
@@ -4885,7 +4976,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,နယူးအရောင်းပုဂ္ဂိုလ်အမည်
 DocType: Packing Slip,Gross Weight UOM,gross အလေးချိန် UOM
 DocType: Delivery Note Item,Against Sales Invoice,အရောင်းပြေစာဆန့်ကျင်
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Serial ကို item များအတွက်အမှတ်စဉ်နံပါတ်များကိုရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Serial ကို item များအတွက်အမှတ်စဉ်နံပါတ်များကိုရိုက်ထည့်ပေးပါ
 DocType: Bin,Reserved Qty for Production,ထုတ်လုပ်မှုများအတွက် Reserved အရည်အတွက်
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,သငျသညျသင်တန်းအခြေစိုက်အုပ်စုများအောင်နေချိန်တွင်အသုတ်စဉ်းစားရန်မလိုကြပါလျှင်အမှတ်ကိုဖြုတ်လိုက်ပါချန်ထားပါ။
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,သငျသညျသင်တန်းအခြေစိုက်အုပ်စုများအောင်နေချိန်တွင်အသုတ်စဉ်းစားရန်မလိုကြပါလျှင်အမှတ်ကိုဖြုတ်လိုက်ပါချန်ထားပါ။
@@ -4897,7 +4988,7 @@
 DocType: Lab Test,Test Group,စမ်းသပ်ခြင်း Group မှ
 DocType: Payment Reconciliation,Receivable / Payable Account,receiver / ပေးဆောင်အကောင့်
 DocType: Delivery Note Item,Against Sales Order Item,အရောင်းအမိန့် Item ဆန့်ကျင်
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},attribute က {0} များအတွက် Value ကို Attribute ကိုသတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},attribute က {0} များအတွက် Value ကို Attribute ကိုသတ်မှတ် ကျေးဇူးပြု.
 DocType: Item,Default Warehouse,default ဂိုဒေါင်
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},ဘဏ္ဍာငွေအရအသုံး Group မှအကောင့် {0} ဆန့်ကျင်တာဝန်ပေးမရနိုင်ပါ
 DocType: Healthcare Settings,Patient Registration,လူနာမှတ်ပုံတင်ခြင်း
@@ -4927,6 +5018,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,အရောင်းပုဂ္ဂိုလ်
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,ဘတ်ဂျက်နှင့်ကုန်ကျစရိတ်စင်တာ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,ငွေပေးချေမှု၏အကွိမျမြားစှာက default mode ကိုခွင့်မပြုပါ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,အတွက်
 ,Appointment Analytics,ခန့်အပ်တာဝန်ပေးခြင်း Analytics မှ
 DocType: Vehicle Service,Half Yearly,တစ်ဝက်နှစ်အလိုက်
 DocType: Lead,Blog Subscriber,ဘလော့ Subscriber
@@ -4946,7 +5038,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,quote အရေအတွက်
 ,BOM Stock Report,BOM စတော့အိတ်အစီရင်ခံစာ
 DocType: Stock Reconciliation Item,Quantity Difference,အရေအတွက် Difference
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,အပြောင်းအလဲနဲ့လစာ
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,အပြောင်းအလဲနဲ့လစာ
 DocType: Opportunity Item,Basic Rate,အခြေခံပညာ Rate
 DocType: GL Entry,Credit Amount,အကြွေးပမာဏ
 DocType: Cheque Print Template,Signatory Position,လက်မှတ်ရေးထိုးရာထူး
@@ -4960,12 +5052,12 @@
 DocType: Tax Rule,Tax Rule,အခွန်စည်းမျဉ်း
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,အရောင်း Cycle တစ်လျှောက်လုံးအတူတူပါပဲ Rate ထိန်းသိမ်းနည်း
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Workstation နှင့်အလုပ်အဖွဲ့နာရီပြင်ပတွင်အချိန်မှတ်တမ်းများကြိုတင်စီစဉ်ထားပါ။
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,တန်းစီအတွက်ဖောက်သည်များ
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,ဒေါက်တာ {0} တစ်ဦးချင်းဆေးသမားဇယားမရှိပါ။ ဆရာဝန်မာစတာထဲမှာ Add
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,တန်းစီအတွက်ဖောက်သည်များ
 DocType: Student,Nationality,အမျိုးသား
 ,Items To Be Requested,တောင်းဆိုထားသောခံရဖို့ items
-DocType: Purchase Order,Get Last Purchase Rate,ပြီးခဲ့သည့်ဝယ်ယူ Rate Get
 DocType: Company,Company Info,ကုမ္ပဏီ Info
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,အသစ်ဖောက်သည်ကို Select လုပ်ပါသို့မဟုတ် add
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,အသစ်ဖောက်သည်ကို Select လုပ်ပါသို့မဟုတ် add
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,ကုန်ကျစရိတ်စင်တာတစ်ခုစရိတ်ပြောဆိုချက်ကိုစာအုပ်ဆိုင်လိုအပ်ပါသည်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ရန်ပုံငွေ၏လျှောက်လွှာ (ပိုင်ဆိုင်မှုများ)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ဒီထမ်းများ၏တက်ရောက်သူအပေါ်အခြေခံသည်
@@ -4973,6 +5065,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,debit အကောင့်ကို
 DocType: Fiscal Year,Year Start Date,တစ်နှစ်တာ Start ကိုနေ့စွဲ
 DocType: Attendance,Employee Name,ဝန်ထမ်းအမည်
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,စားသောက်ဆိုင်အမိန့် Entry Item
 DocType: Sales Invoice,Rounded Total (Company Currency),rounded စုစုပေါင်း (ကုမ္ပဏီငွေကြေးစနစ်)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Account Type ကိုရွေးချယ်သောကွောငျ့ Group ကမှရောက်မှလုံခြုံနိုင်ဘူး။
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} modified သိရသည်။ refresh ပေးပါ။
@@ -4983,6 +5076,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,ဝန်ထမ်းအကျိုးကျေးဇူးများ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},ထုပ်ပိုးအရေအတွက်အတန်း {1} အတွက် Item {0} သည်အရေအတွက်တူညီရမယ်
 DocType: Production Order,Manufactured Qty,ထုတ်လုပ်သော Qty
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,ငွေတောင်းခံလွှာ Created
 DocType: Purchase Receipt Item,Accepted Quantity,လက်ခံခဲ့သည်ပမာဏ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},{1} ထမ်း {0} သို့မဟုတ်ကုမ္ပဏီတစ်ခုက default အားလပ်ရက် List ကိုသတ်မှတ်ထားပေးပါ
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} တည်ရှိပါဘူး
@@ -4992,18 +5086,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},အတန်းမရှိ {0}: ပမာဏသုံးစွဲမှုတောင်းဆိုမှုများ {1} ဆန့်ကျင်ငွေပမာဏဆိုင်းငံ့ထားထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။ ဆိုင်းငံ့ထားသောငွေပမာဏ {2} သည်
 DocType: Maintenance Schedule,Schedule,ဇယား
 DocType: Account,Parent Account,မိဘအကောင့်
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,ရရှိနိုင်
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,ရရှိနိုင်
 DocType: Quality Inspection Reading,Reading 3,3 Reading
 ,Hub,hub
 DocType: GL Entry,Voucher Type,ဘောက်ချာကအမျိုးအစား
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,စျေးနှုန်း List ကိုတွေ့ရှိသို့မဟုတ်မသန်မစွမ်းမဟုတ်
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,စျေးနှုန်း List ကိုတွေ့ရှိသို့မဟုတ်မသန်မစွမ်းမဟုတ်
 DocType: Lab Test,Approved,Approved
 DocType: Pricing Rule,Price,စျေးနှုန်း
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',{0} &#39;&#39; လက်ဝဲ &#39;အဖြစ်သတ်မှတ်ရမည်အပေါ်စိတ်သက်သာရာန်ထမ်း
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',{0} &#39;&#39; လက်ဝဲ &#39;အဖြစ်သတ်မှတ်ရမည်အပေါ်စိတ်သက်သာရာန်ထမ်း
+DocType: Hub Settings,Last Sync On,နောက်ဆုံး Sync ကိုတွင်
 DocType: Guardian,Guardian,ဂေါကလူကြီး
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,စိစစ်ရေး {0} ပေးထားသောနေ့စွဲအကွာအဝေးအတွက်န်ထမ်း {1} ဖန်တီး
 DocType: Employee,Education,ပညာရေး
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,del
 DocType: Selling Settings,Campaign Naming By,အားဖြင့်အမည်ကင်ပိန်း
 DocType: Employee,Current Address Is,လက်ရှိလိပ်စာ Is
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,လစဉ်အရောင်းအဆိုပါ နှစ်မှစ. (အဆိုပါနှစ်ထက်လည်း
@@ -5018,7 +5113,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,သင်တန်းအမှတ်စဥ် Code ကို:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,အသုံးအကောင့်ကိုရိုက်ထည့်ပေးပါ
 DocType: Account,Stock,စတော့အိတ်
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","အတန်း # {0}: ကိုးကားစရာစာရွက်စာတမ်းအမျိုးအစားအရစ်ကျအမိန့်, အရစ်ကျငွေတောင်းခံလွှာသို့မဟုတ်ဂျာနယ် Entry တယောက်ဖြစ်ရပါမည်"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","အတန်း # {0}: ကိုးကားစရာစာရွက်စာတမ်းအမျိုးအစားအရစ်ကျအမိန့်, အရစ်ကျငွေတောင်းခံလွှာသို့မဟုတ်ဂျာနယ် Entry တယောက်ဖြစ်ရပါမည်"
 DocType: Employee,Current Address,လက်ရှိလိပ်စာ
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ကို item အခြားတဲ့ item တစ်ခုမူကွဲဖြစ်ပါတယ် အကယ်. အတိအလင်းသတ်မှတ်လိုက်သောမဟုတ်လျှင်ထို့နောက်ဖော်ပြချက်, ပုံရိပ်, စျေးနှုန်း, အခွန်စသည်တို့အတွက် template ကိုကနေသတ်မှတ်ကြလိမ့်မည်"
 DocType: Serial No,Purchase / Manufacture Details,ဝယ်ယူခြင်း / ထုတ်လုပ်ခြင်းလုပ်ငန်းအသေးစိတ်ကို
@@ -5049,7 +5144,7 @@
 DocType: Hub Settings,Hub Settings,hub Settings ကို
 DocType: Project,Gross Margin %,gross Margin%
 DocType: BOM,With Operations,စစ်ဆင်ရေးနှင့်အတူ
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,စာရင်းကိုင် entries တွေကိုပြီးသားကုမ္ပဏီတစ်ခု {1} များအတွက်ငွေကြေး {0} အတွက်ဖန်ဆင်းခဲ့ကြ။ ငွေကြေး {0} နှင့်အတူ receiver သို့မဟုတ်ပေးဆောင်အကောင့်ကို select လုပ်ပါကိုကျေးဇူးတင်ပါ။
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,စာရင်းကိုင် entries တွေကိုပြီးသားကုမ္ပဏီတစ်ခု {1} များအတွက်ငွေကြေး {0} အတွက်ဖန်ဆင်းခဲ့ကြ။ ငွေကြေး {0} နှင့်အတူ receiver သို့မဟုတ်ပေးဆောင်အကောင့်ကို select လုပ်ပါကိုကျေးဇူးတင်ပါ။
 DocType: Asset,Is Existing Asset,လက်ရှိပိုင်ဆိုင်မှုဖြစ်ပါသည်
 DocType: Salary Detail,Statistical Component,စာရင်းအင်းစိတျအပိုငျး
 DocType: Salary Detail,Statistical Component,စာရင်းအင်းစိတျအပိုငျး
@@ -5058,13 +5153,14 @@
 DocType: BOM Operation,BOM Operation,BOM စစ်ဆင်ရေး
 DocType: Purchase Taxes and Charges,On Previous Row Amount,ယခင် Row ပမာဏတွင်
 DocType: Student,Home Address,အိမ်လိပ်စာ
+DocType: Item,Has Expiry Date,သက်တမ်းကုန်ဆုံးနေ့စွဲရှိပါတယ်
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,item မူကွဲ Settings များ။
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,ပိုင်ဆိုင်မှုလွှဲပြောင်း
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,ပိုင်ဆိုင်မှုလွှဲပြောင်း
 DocType: POS Profile,POS Profile,POS ကိုယ်ရေးအချက်အလက်များ profile
 DocType: Training Event,Event Name,အဖြစ်အပျက်အမည်
 DocType: Physician,Phone (Office),ဖုန်း (ရုံး)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,ဝင်ခွင့်ပေးခြင်း
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},{0} များအတွက်အဆင့်လက်ခံရေး
+apps/erpnext/erpnext/hooks.py +147,Admission,ဝင်ခွင့်ပေးခြင်း
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},{0} များအတွက်အဆင့်လက်ခံရေး
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","ဘတ်ဂျက် setting သည်ရာသီ, ပစ်မှတ်စသည်တို့"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,variable အမည်
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",item {0} တဲ့ template ကိုသည်၎င်း၏မျိုးကွဲတွေထဲကရွေးချယ်ရန်
@@ -5073,7 +5169,7 @@
 DocType: Assessment Plan,Room,အခန်းတခန်း
 DocType: Purchase Order,Advance Paid,ကြိုတင်မဲ Paid
 DocType: Item,Item Tax,item ခွန်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,ပေးသွင်းဖို့ material
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,ပေးသွင်းဖို့ material
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,ယစ်မျိုးပြေစာ
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% တစ်ကြိမ်ထက်ပိုပြီးပုံပေါ်
 DocType: Expense Claim,Employees Email Id,န်ထမ်းအီးမေးလ် Id
@@ -5084,32 +5180,30 @@
 DocType: Program,Program Name,Program ကိုအမည်
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,သည်အခွန်သို့မဟုတ်တာဝန်ခံဖို့စဉ်းစားပါ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,အမှန်တကယ် Qty မသင်မနေရ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} လက်ရှိ {1} ပေးသွင်း Scorecard ရပ်တည်မှုရှိပါတယ်, ဤကုန်ပစ္စည်းပေးသွင်းဖို့အမိန့်ဝယ်ရန်သတိနဲ့ထုတ်ပေးရပါမည်။"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} လက်ရှိ {1} ပေးသွင်း Scorecard ရပ်တည်မှုရှိပါတယ်, ဤကုန်ပစ္စည်းပေးသွင်းဖို့အမိန့်ဝယ်ရန်သတိနဲ့ထုတ်ပေးရပါမည်။"
 DocType: Employee Loan,Loan Type,ချေးငွေအမျိုးအစား
 DocType: Scheduling Tool,Scheduling Tool,စီစဉ်ခြင်း Tool ကို
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,အကြွေးဝယ်ကဒ်
 DocType: BOM,Item to be manufactured or repacked,item ထုတ်လုပ်သောသို့မဟုတ် repacked ခံရဖို့
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,စတော့ရှယ်ယာအရောင်းအများအတွက် default setting များ။
-DocType: Purchase Invoice,Next Date,Next ကိုနေ့စွဲ
 DocType: Employee Education,Major/Optional Subjects,ဗိုလ်မှူး / မလုပ်မဖြစ်ကျအောကျခံ
 DocType: Sales Invoice Item,Drop Ship,drop သင်္ဘော
+DocType: Hub Settings,Suspended,ဆိုင်းငံ့
 DocType: Training Event,Attendees,တက်ရောက်
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","ဒီနေရာတွင်မိဘ, အိမ်ထောင်ဖက်နှင့်ကလေးများ၏အမည်နှင့်အလုပ်အကိုင်တူမိသားစုကအသေးစိတ်ထိနျးသိမျးထားနိုငျ"
 DocType: Academic Term,Term End Date,သက်တမ်းအဆုံးနေ့စွဲ
-DocType: Hub Settings,Seller Name,ရောင်းချသူအမည်
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),နုတ်ယူအခွန်အခများနှင့်စွပ်စွဲချက် (ကုမ္ပဏီငွေကြေးစနစ်)
 DocType: Item Group,General Settings,General Settings
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,ငွေကြေးစနစ်နှင့်ငွေကြေးစနစ်နိုင်ရန်တူညီသောမဖွစျနိုငျ
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,သင်တန်းပို့ချ Add
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,သင်ကအမှုတွဲရှေ့တော်၌ထိုပုံစံကို Save ရမယ်
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,ကုမ္ပဏီပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
 DocType: Item Attribute,Numeric Values,numeric တန်ဖိုးများ
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Logo ကို Attach
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,စတော့အိတ် Levels
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,စတော့အိတ် Levels
 DocType: Customer,Commission Rate,ကော်မရှင် Rate
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,: {1} အကြားအဘို့အ Created {0} scorecards
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Variant Make
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Variant Make
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,ဦးစီးဌာနကခွင့် applications များပိတ်ဆို့။
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","ငွေပေးချေမှုရမည့်အမျိုးအစား, လက်ခံတယောက်ဖြစ် Pay နှင့်ပြည်တွင်းလွှဲပြောင်းရမယ်"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analytics
@@ -5124,11 +5218,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,မြို့တော်စတော့အိတ်
 DocType: Shopping Cart Settings,Show Public Attachments,ပြည်သူ့ပူးတွဲပါပြရန်
 DocType: Packing Slip,Package Weight Details,package အလေးချိန်အသေးစိတ်ကို
+DocType: Restaurant Reservation,Reservation Time,reservation အချိန်
 DocType: Payment Gateway Account,Payment Gateway Account,ငွေပေးချေမှုရမည့် Gateway ရဲ့အကောင့်ကို
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,ငွေပေးချေမှုပြီးစီးပြီးနောက်ရွေးချယ်ထားသည့်စာမျက်နှာအသုံးပြုသူ redirect ။
 DocType: Company,Existing Company,လက်ရှိကုမ္ပဏီ
 DocType: Healthcare Settings,Result Emailed,ရလဒ်မေးလ်ပို့ပေး
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",လူအပေါင်းတို့သည်ပစ္စည်းများ Non-စတော့ရှယ်ယာပစ္စည်းများကြောင့်အခွန်အမျိုးအစား &quot;စုစုပေါင်း&quot; ကိုပြောင်းလဲခဲ့ပြီးပြီ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,item Code ကို&gt; item Group မှ&gt; အမှတ်တံဆိပ်
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,တစ် CSV ဖိုင်ကိုရွေးပေးပါ
 DocType: Student Leave Application,Mark as Present,"လက်ရှိအဖြစ်, Mark"
 DocType: Supplier Scorecard,Indicator Color,indicator အရောင်
@@ -5153,11 +5249,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,ကျောင်းသားအသုတ်လိုက် Make
 DocType: Fee Schedule,FRQ.,FRQ ။
 DocType: Leave Type,Is Carry Forward,Forward ယူသွားတာဖြစ်ပါတယ်
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,BOM ထံမှပစ္စည်းများ Get
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,BOM ထံမှပစ္စည်းများ Get
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ခဲအချိန် Days
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ပိုင်ဆိုင်မှု၏ CV ကိုနေ့စွဲဝယ်ယူနေ့စွဲအဖြစ်အတူတူပင်ဖြစ်ရပါမည် {1} {2}: row # {0}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,ကျောင်းသားသမဂ္ဂဟာအင်စတီကျုရဲ့ဘော်ဒါဆောင်မှာနေထိုင်လျှင်ဒီစစ်ဆေးပါ။
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,အထက်ပါဇယားတွင်အရောင်းအမိန့်ကိုထည့်သွင်းပါ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,အထက်ပါဇယားတွင်အရောင်းအမိန့်ကိုထည့်သွင်းပါ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,လစာစလစ် Submitted မဟုတ်
 ,Stock Summary,စတော့အိတ်အကျဉ်းချုပ်
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,တယောက်ကိုတယောက်ဂိုဒေါင်တစ်ဦးထံမှပစ္စည်းလွှဲပြောင်း
@@ -5173,5 +5269,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},row {0}: Debit entry ကိုတစ် {1} နဲ့ဆက်စပ်မရနိုငျ
 DocType: Journal Entry,Subscription Section,subscription ပုဒ်မ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,အကောင့်ကို {0} မတည်ရှိပါဘူး
+DocType: Training Event,Training Program,လေ့ကျင့်ရေးအစီအစဉ်
 DocType: Account,Cash,ငွေသား
 DocType: Employee,Short biography for website and other publications.,website နှင့်အခြားပုံနှိပ်ထုတ်ဝေအတိုကောက်အတ္ထုပ္ပတ္တိ။
diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv
index 08bdf1e..c5b8b35 100644
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Salaris Modus
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Registreren
 DocType: Patient,Divorced,Gescheiden
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Artikelen reeds gesynchroniseerd
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Toestaan Item om meerdere keren in een transactie worden toegevoegd
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Annuleren Materiaal Bezoek {0} voor het annuleren van deze Garantie Claim
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumentenproducten
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Verlof goedkeurders
 DocType: Sales Partner,Dealer,Dealer
 DocType: Consultation,Investigations,onderzoeken
+DocType: Restaurant Order Entry,Click Enter To Add,Klik op Enter om toe te voegen
 DocType: Employee,Rented,Verhuurd
 DocType: Purchase Order,PO-,PO
 DocType: POS Profile,Applicable for User,Toepasselijk voor gebruiker
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Gestopt productieorder kan niet worden geannuleerd, opendraaien het eerst te annuleren"
 DocType: Vehicle Service,Mileage,Mileage
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Wilt u dit actief echt schrappen?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Wilt u dit actief echt schrappen?
 DocType: Drug Prescription,Update Schedule,Update Schema
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Selecteer Standaard Leverancier
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Munt is nodig voor prijslijst {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Beschikbaarheid controleren
 DocType: Job Applicant,Job Applicant,Sollicitant
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Dit is gebaseerd op transacties tegen deze leverancier. Zie tijdlijn hieronder voor meer informatie
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Geen andere resultaten.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Wettelijk
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Werkelijke soort belasting kan niet worden opgenomen in post tarief in rij {0}
 DocType: Bank Guarantee,Customer,Klant
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Wisselkoers moet hetzelfde zijn als zijn {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Klantnaam
 DocType: Vehicle,Natural Gas,Natuurlijk gas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Bankrekening kan niet worden genoemd als {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Bankrekening kan niet worden genoemd als {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Hoofden (of groepen) waartegen de boekingen worden gemaakt en saldi worden gehandhaafd.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Openstaand bedrag voor {0} mag niet kleiner zijn dan nul ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Er zijn geen loonslips ingediend om te verwerken.
 DocType: Manufacturing Settings,Default 10 mins,Standaard 10 min
 DocType: Leave Type,Leave Type Name,Verlof Type Naam
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Toon geopend
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Het is noodzakelijk om deze actie vandaag zelf te nemen voor bovengenoemde herhalende
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Reeks succesvol bijgewerkt
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Uitchecken
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural Journal Entry Submitted
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Inkooporder Artikelen nog te ontvangen
 DocType: SMS Center,All Supplier Contact,Alle Leverancier Contact
 DocType: Support Settings,Support Settings,ondersteuning Instellingen
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Verwachte Einddatum kan niet minder dan verwacht Startdatum zijn
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Verwachte Einddatum kan niet minder dan verwacht Startdatum zijn
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Rij # {0}: Beoordeel moet hetzelfde zijn als zijn {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Nieuwe Verlofaanvraag
 ,Batch Item Expiry Status,Batch Item Vervaldatum Status
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Bankcheque
 DocType: Mode of Payment Account,Mode of Payment Account,Modus van Betaalrekening
 DocType: Consultation,Consultation,Overleg
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Verkoop en retourneren
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Toon Varianten
 DocType: Academic Term,Academic Term,Academisch semester
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiaal
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Gezondheidszorg
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Vertraging in de betaling (Dagen)
 DocType: Lab Prescription,Lab Prescription,Lab Prescription
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Sorteer op prijs
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,dienst Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} is reeds verwezen in de verkoopfactuur: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Factuur
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} is reeds verwezen in de verkoopfactuur: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Factuur
 DocType: Maintenance Schedule Item,Periodicity,Periodiciteit
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Boekjaar {0} is vereist
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensie
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Rij # {0}:
 DocType: Timesheet,Total Costing Amount,Totaal bedrag Costing
 DocType: Delivery Note,Vehicle No,Voertuig nr.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Selecteer Prijslijst
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Selecteer Prijslijst
 DocType: Accounts Settings,Currency Exchange Settings,Valutaveursinstellingen
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Row # {0}: Betaling document is vereist om de trasaction voltooien
 DocType: Production Order Operation,Work In Progress,Onderhanden Werk
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Kies een datum
 DocType: Employee,Holiday List,Holiday Lijst
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Gelieve op te stellen Instructeur Naam Systeem in School&gt; School Instellingen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Accountant
+DocType: Hub Settings,Selling Price List,Verkoopprijslijst
 DocType: Patient,Tobacco Current Use,Tabaksgebruik
 DocType: Cost Center,Stock User,Aandeel Gebruiker
 DocType: Company,Phone No,Telefoonnummer
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Cursus Roosters gemaakt:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Nieuwe {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Nieuwe {0}: # {1}
 ,Sales Partners Commission,Verkoop Partners Commissie
 DocType: Purchase Invoice,Rounding Adjustment,Afrondingsaanpassing
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Afkorting kan niet meer dan 5 tekens lang zijn
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Bovenliggende Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referentie: {0}, Artikelcode: {1} en klant: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,kg
-DocType: Student Log,Log,Log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Vacature voor een baan.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Resultaat ingediend
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Resultaat ingediend
 DocType: Item Attribute,Increment,Aanwas
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Tijdspanne
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Kies Warehouse ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Getrouwd
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Niet toegestaan voor {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Krijgen items uit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Voorraad kan niet worden bijgewerkt obv Vrachtbrief {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Voorraad kan niet worden bijgewerkt obv Vrachtbrief {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Product {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Geen artikelen vermeld
 DocType: Payment Reconciliation,Reconcile,Afletteren
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,pensioenfondsen
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Volgende afschrijvingen datum kan niet vóór Aankoopdatum
 DocType: Consultation,Consultation Date,Raadplegingsdatum
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Productvermelding en ontdekking voor ERPNext-gebruikers
 DocType: SMS Center,All Sales Person,Alle Sales Person
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Maandelijkse Distributie ** helpt u om de begroting / Target verdelen over maanden als u de seizoensgebondenheid in uw bedrijf.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Niet artikelen gevonden
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Salarisstructuur Missing
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Niet artikelen gevonden
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Salarisstructuur Missing
 DocType: Lead,Person Name,Persoon Naam
 DocType: Sales Invoice Item,Sales Invoice Item,Verkoopfactuur Artikel
 DocType: Account,Credit,Krediet
 DocType: POS Profile,Write Off Cost Center,Afschrijvingen kostenplaats
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",bijvoorbeeld &quot;Primary School&quot; of &quot;University&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",bijvoorbeeld &quot;Primary School&quot; of &quot;University&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Stock Reports
 DocType: Warehouse,Warehouse Detail,Magazijn Detail
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Kredietlimiet is overschreden voor de klant {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,De Term Einddatum kan niet later dan het jaar Einddatum van het studiejaar waarop de term wordt gekoppeld zijn (Academisch Jaar {}). Corrigeer de data en probeer het opnieuw.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Is vaste activa"" kan niet worden uitgeschakeld, als Asset record bestaat voor dit item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Is vaste activa"" kan niet worden uitgeschakeld, als Asset record bestaat voor dit item"
 DocType: Vehicle Service,Brake Oil,remolie
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klant&gt; Klantengroep&gt; Gebied
 DocType: Tax Rule,Tax Type,Belasting Type
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Belastbaar bedrag
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},U bent niet bevoegd om items toe te voegen of bij te werken voor {0}
 DocType: BOM,Item Image (if not slideshow),Artikel Afbeelding (indien niet diashow)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Een klant bestaat met dezelfde naam
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Uurtarief / 60) * Werkelijk Gepresteerde Tijd
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Rij # {0}: Referentiedocumenttype moet één van de kostenrekening of het journaalboekje zijn
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Select BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Rij # {0}: Referentiedocumenttype moet één van de kostenrekening of het journaalboekje zijn
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Select BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kosten van geleverde zaken
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,De vakantie op {0} is niet tussen Van Datum en To Date
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,werknemer Loan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Activiteitenlogboek:
 DocType: Fee Schedule,Send Payment Request Email,Stuur een e-mail voor betalingsverzoek
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Artikel {0} bestaat niet in het systeem of is verlopen
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Artikel {0} bestaat niet in het systeem of is verlopen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Vastgoed
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Rekeningafschrift
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmacie
@@ -210,18 +213,23 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Importeren Log
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Trek Material Verzoek van het type Productie op basis van bovenstaande criteria
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Succesvol afgemeld.
 DocType: Training Result Employee,Grade,Rang
+DocType: Restaurant Table,No of Seats,Aantal zitplaatsen
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Om dynamisch onderwerp toe te voegen, gebruik jinja tags zoals <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Geleverd door Leverancier
 DocType: SMS Center,All Contact,Alle Contact
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Productieorder al gemaakt voor alle items met BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Productieorder al gemaakt voor alle items met BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Jaarsalaris
 DocType: Daily Work Summary,Daily Work Summary,Dagelijks Werk Samenvatting
 DocType: Period Closing Voucher,Closing Fiscal Year,Het sluiten van het fiscale jaar
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} is bevroren
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Kies een bestaand bedrijf voor het maken van Rekeningschema
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} is bevroren
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Kies een bestaand bedrijf voor het maken van Rekeningschema
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Voorraadkosten
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Selecteer Target Warehouse
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Selecteer Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Selecteer Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Selecteer Target Warehouse
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Vul Preferred Contact E-mail
 DocType: Program Enrollment,School Bus,Schoolbus
 DocType: Journal Entry,Contra Entry,Contra Entry
@@ -238,9 +246,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Download de Template, vul de juiste gegevens in en voeg het gewijzigde bestand bij. Alle data en toegewezen werknemer in de geselecteerde periode zullen in de sjabloon komen, met bestaande presentielijsten"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,ARtikel {0} is niet actief of heeft einde levensduur bereikt
+DocType: Student Admission Program,Minimum Age,Minimum leeftijd
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Voorbeeld: Basiswiskunde
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om Belastingen op te nemen in het Artikeltarief in rij {0}, moeten de belastingen in rijen {1} ook worden opgenomen"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Instellingen voor HR Module
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Instellingen voor HR Module
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Change Bedrag
 DocType: BOM Update Tool,New BOM,Nieuwe Eenheid
@@ -250,7 +259,7 @@
 DocType: Lead,Request Type,Aanvraag type
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,maak Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Uitzenden
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Voeg kamers toe
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Setup-modus van POS (online / offline)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Uitvoering
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Details van de uitgevoerde handelingen.
 DocType: Serial No,Maintenance Status,Onderhoud Status
@@ -273,6 +282,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prijslijst moet van toepassing zijn op Inkoop of Verkoop
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},De installatie mag niet vóór leveringsdatum voor post {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Korting op de prijslijst Rate (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Biochemie
 DocType: Offer Letter,Select Terms and Conditions,Select Voorwaarden
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,out Value
 DocType: Production Planning Tool,Sales Orders,Verkooporders
@@ -307,15 +317,15 @@
 DocType: Sales Partner,Reseller,Reseller
 DocType: Codification Table,Medical Code,Medisch code
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Indien aangevinkt, zullen ook niet-voorraad artikelen op het materiaal aanvragen."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Vul Bedrijf in
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Vul Bedrijf in
 DocType: Delivery Note Item,Against Sales Invoice Item,Tegen Sales Invoice Item
 ,Production Orders in Progress,Productieorders in behandeling
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,De netto kasstroom uit financieringsactiviteiten
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage vol is, niet te redden"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage vol is, niet te redden"
 DocType: Lead,Address & Contact,Adres &amp; Contact
 DocType: Leave Allocation,Add unused leaves from previous allocations,Voeg ongebruikte bladeren van de vorige toewijzingen
 DocType: Sales Partner,Partner website,partner website
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Item toevoegen
+DocType: Restaurant Order Entry,Add Item,Item toevoegen
 DocType: Lab Test,Custom Result,Aangepast resultaat
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Contact Naam
 DocType: Course Assessment Criteria,Course Assessment Criteria,Cursus Beoordelingscriteria
@@ -328,7 +338,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Inkoopaanvraag
 DocType: Lab Test,Submitted Date,Datum indienen
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Dit is gebaseerd op de Time Sheets gemaakt tegen dit project
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Nettoloon kan niet lager zijn dan 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Nettoloon kan niet lager zijn dan 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Om te stoppen met het verzenden van herhaalde foutmeldingen van het systeem, hebben we het veld Uitgeschakeld in het abonnement gecontroleerd"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Alleen de geselecteerde Verlof Goedkeurder kan deze verlofaanvraag indienen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Ontslagdatum moet groter zijn dan datum van indiensttreding
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Verlaat per jaar
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,Verlies
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,liter
 DocType: Task,Total Costing Amount (via Time Sheet),Totaal bedrag Costing (via Urenregistratie)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Stel de studenten onder Student Groups in
 DocType: Item Website Specification,Item Website Specification,Artikel Website Specificatie
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Verlof Geblokkeerd
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Artikel {0} heeft het einde van zijn levensduur bereikt op {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Artikel {0} heeft het einde van zijn levensduur bereikt op {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Bank Gegevens
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,jaar-
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Voorraad Afletteren Artikel
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Creation Tool Course
 DocType: Lead,Do Not Contact,Neem geen contact op
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,Mensen die lesgeven op uw organisatie
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,De unieke ID voor het bijhouden van alle terugkerende facturen. Het wordt gegenereerd bij het indienen.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Software Ontwikkelaar
 DocType: Item,Minimum Order Qty,Minimum bestel aantal
 DocType: Pricing Rule,Supplier Type,Leverancier Type
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,Publiceren in Hub
 DocType: Student Admission,Student Admission,student Toelating
 ,Terretory,Regio
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Artikel {0} is geannuleerd
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Materiaal Aanvraag
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Artikel {0} is geannuleerd
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Materiaal Aanvraag
 DocType: Bank Reconciliation,Update Clearance Date,Werk Clearance Datum bij
 DocType: Item,Purchase Details,Inkoop Details
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} niet gevonden in &#39;Raw Materials geleverd&#39; tafel in Purchase Order {1}
 DocType: Patient Relation,Relation,Relatie
 DocType: Shipping Rule,Worldwide Shipping,Wereldwijde verzending
 DocType: Patient Relation,Mother,Moeder
+DocType: Restaurant Reservation,Reservation End Time,Eindtijd van reservering
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Bevestigde orders van klanten.
 DocType: Purchase Receipt Item,Rejected Quantity,Afgewezen Aantal
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Betalingsverzoek {0} gemaakt
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Betalingsverzoek {0} gemaakt
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Lage gevoeligheid
 DocType: Notification Control,Notification Control,Notificatie Beheer
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Bevestig alstublieft nadat u uw opleiding hebt voltooid
 DocType: Lead,Suggestions,Suggesties
@@ -388,7 +401,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Emails loonstrook van medewerkers op basis van de voorkeur e-mail geselecteerd in Employee
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,De eerste Verlofgoedkeurder in de lijst wordt als de standaard Verlofgoedkeurder ingesteld
 DocType: Tax Rule,Shipping County,verzending County
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Leren
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Leren
 DocType: Asset,Next Depreciation Date,Volgende Afschrijvingen Date
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Activiteitskosten per werknemer
 DocType: Accounts Settings,Settings for Accounts,Instellingen voor accounts
@@ -399,13 +412,13 @@
 DocType: Item,Synced With Hub,Gesynchroniseerd met Hub
 DocType: Vehicle,Fleet Manager,Fleet Manager
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} kan niet negatief voor producten van post {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Verkeerd Wachtwoord
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Verkeerd Wachtwoord
 DocType: Item,Variant Of,Variant van
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Voltooid aantal mag niet groter zijn dan 'Aantal te produceren'
 DocType: Period Closing Voucher,Closing Account Head,Sluiten Account Hoofd
 DocType: Employee,External Work History,Externe Werk Geschiedenis
 DocType: Physician,Time per Appointment,Tijd per afspraak
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Kringverwijzing Error
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Kringverwijzing Error
 DocType: Appointment Type,Is Inpatient,Is een patiënt
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 Naam
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,In woorden (Export) wordt zichtbaar zodra u de vrachtbrief opslaat.
@@ -414,19 +427,18 @@
 DocType: Lead,Industry,Industrie
 DocType: Employee,Job Profile,Functieprofiel
 DocType: BOM Item,Rate & Amount,Tarief en Bedrag
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Gelieve op te stellen nummeringsreeks voor bijwonen via Setup&gt; Nummerreeks
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Dit is gebaseerd op transacties tegen dit bedrijf. Zie de tijdlijn hieronder voor details
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificeer per e-mail bij automatisch aanmaken van Materiaal Aanvraag
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Resistant
 DocType: Journal Entry,Multi Currency,Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Factuur Type
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klant&gt; Klantengroep&gt; Territorium
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Vrachtbrief
 DocType: Consultation,Encounter Impression,Encounter Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Het opzetten van Belastingen
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Kosten van Verkochte Asset
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,Betaling Bericht is gewijzigd nadat u het getrokken. Neem dan trekt het weer.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} twee keer opgenomen in Artikel BTW
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Samenvatting voor deze week en in afwachting van activiteiten
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} twee keer opgenomen in Artikel BTW
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Samenvatting voor deze week en in afwachting van activiteiten
 DocType: Student Applicant,Admitted,toegelaten
 DocType: Workstation,Rent Cost,Huurkosten
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Bedrag na afschrijvingen
@@ -441,36 +453,35 @@
 DocType: Shipping Rule,Valid for Countries,Geldig voor Landen
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Dit artikel is een sjabloon en kunnen niet worden gebruikt bij transacties. Item attributen zal worden gekopieerd naar de varianten tenzij 'No Copy' is ingesteld
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Totaal Bestel Beschouwd
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Werknemer aanduiding ( bijv. CEO , directeur enz. ) ."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Werknemer aanduiding ( bijv. CEO , directeur enz. ) ."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Koers waarmee de Klant Valuta wordt omgerekend naar de basisvaluta van de klant.
 DocType: Course Scheduling Tool,Course Scheduling Tool,Course Scheduling Tool
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rij # {0}: Aankoop factuur kan niet worden ingediend tegen een bestaand actief {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Urgent] Fout bij het maken van terugkerende% s voor% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Urgent] Fout bij het maken van terugkerende% s voor% s
 DocType: Item Tax,Tax Rate,Belastingtarief
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} reeds toegewezen voor Employee {1} voor periode {2} te {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Selecteer Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Selecteer Item
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Inkoopfactuur {0} is al ingediend
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Rij # {0}: Batch Geen moet hetzelfde zijn als zijn {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Converteren naar non-Group
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Partij van een artikel.
 DocType: C-Form Invoice Detail,Invoice Date,Factuurdatum
 DocType: GL Entry,Debit Amount,Debet Bedrag
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Er kan slechts 1 account per Bedrijf in zijn {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Zie bijlage
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Er kan slechts 1 account per Bedrijf in zijn {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Zie bijlage
 DocType: Purchase Order,% Received,% Ontvangen
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Maak Student Groepen
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Installatie al voltooid !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Installatie al voltooid !
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Credit Note Bedrag
 DocType: Setup Progress Action,Action Document,Actie Document
 ,Finished Goods,Gereed Product
 DocType: Delivery Note,Instructions,Instructies
 DocType: Quality Inspection,Inspected By,Geïnspecteerd door
 DocType: Maintenance Visit,Maintenance Type,Onderhoud Type
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} is niet ingeschreven in de cursus {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Itemgroep&gt; Merk
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} is niet ingeschreven in de cursus {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serienummer {0} behoort niet tot Vrachtbrief {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Items toevoegen
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Items toevoegen
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Artikel Kwaliteitsinspectie Parameter
 DocType: Leave Application,Leave Approver Name,Verlaat Goedkeurder Naam
 DocType: Depreciation Schedule,Schedule Date,Plan datum
@@ -490,7 +501,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Werkuren
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Wijzig het start-/ huidige volgnummer van een bestaande serie.
 DocType: Dosage Strength,Strength,Kracht
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Maak een nieuwe klant
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Maak een nieuwe klant
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Als er meerdere prijzen Regels blijven die gelden, worden gebruikers gevraagd om Prioriteit handmatig instellen om conflicten op te lossen."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Maak Bestellingen
 ,Purchase Register,Inkoop Register
@@ -509,7 +520,7 @@
 DocType: Lab Test Template,Single,Enkele
 DocType: Salary Slip,Total Loan Repayment,Totaal aflossing van de lening
 DocType: Account,Cost of Goods Sold,Kostprijs verkochte goederen
-DocType: Purchase Invoice,Yearly,Jaarlijks
+DocType: Subscription,Yearly,Jaarlijks
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Vul kostenplaats in
 DocType: Drug Prescription,Dosage,Dosering
 DocType: Journal Entry Account,Sales Order,Verkooporder
@@ -540,7 +551,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Algemene instellingen voor alle productieprocessen.
 DocType: Accounts Settings,Accounts Frozen Upto,Rekeningen bevroren tot
 DocType: SMS Log,Sent On,Verzonden op
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Kenmerk {0} meerdere keren geselecteerd in Attributes Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Kenmerk {0} meerdere keren geselecteerd in Attributes Tabel
 DocType: HR Settings,Employee record is created using selected field. ,Werknemer regel wordt gemaakt met behulp van geselecteerd veld.
 DocType: Sales Order,Not Applicable,Niet van toepassing
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Vakantie meester .
@@ -566,13 +577,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Totaal bladeren toegewezen is verplicht
 DocType: Patient,AB Positive,AB Positief
 DocType: Job Opening,Description of a Job Opening,Omschrijving van een Vacature
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Afwachting van activiteiten voor vandaag
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Afwachting van activiteiten voor vandaag
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Aanwezigheid record.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Salaris Component voor rooster gebaseerde payroll.
 DocType: Sales Order Item,Used for Production Plan,Gebruikt voor Productie Plan
 DocType: Employee Loan,Total Payment,Totale betaling
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (in minuten)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} is geannuleerd dus de actie kan niet voltooid worden
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} is geannuleerd dus de actie kan niet voltooid worden
 DocType: Customer,Buyer of Goods and Services.,Koper van goederen en diensten.
 DocType: Journal Entry,Accounts Payable,Crediteuren
 DocType: Patient,Allergies,allergieën
@@ -584,23 +595,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Waarschuwing Aankooporders
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Lijst een paar van uw klanten. Ze kunnen organisaties of personen .
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Genoeg Parts te bouwen
+DocType: POS Profile User,POS Profile User,POS-profielgebruiker
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Directe Inkomsten
 DocType: Patient Appointment,Date TIme,Datum Tijd
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Kan niet filteren op basis van Rekening, indien gegroepeerd op Rekening"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Boekhouder
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Selecteer de cursus
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Selecteer de cursus
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Selecteer de cursus
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Selecteer de cursus
 DocType: Codification Table,Codification Table,Codificatie Tabel
 DocType: Timesheet Detail,Hrs,hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Selecteer Company
 DocType: Stock Entry Detail,Difference Account,Verschillenrekening
 DocType: Purchase Invoice,Supplier GSTIN,Leverancier GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Kan taak niet afsluiten als haar afhankelijke taak {0} niet is afgesloten.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,Vul magazijn in waarvoor Materiaal Aanvragen zullen worden ingediend.
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Kan taak niet afsluiten als haar afhankelijke taak {0} niet is afgesloten.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Vul magazijn in waarvoor Materiaal Aanvragen zullen worden ingediend.
 DocType: Production Order,Additional Operating Cost,Additionele Operationele Kosten
 DocType: Lab Test Template,Lab Routine,Lab Routine
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosmetica
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Om samen te voegen, moeten de volgende eigenschappen hetzelfde zijn voor beide artikelen"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Om samen te voegen, moeten de volgende eigenschappen hetzelfde zijn voor beide artikelen"
 DocType: Shipping Rule,Net Weight,Netto Gewicht
 DocType: Employee,Emergency Phone,Noodgeval Telefoonnummer
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Kopen
@@ -611,7 +623,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Gelieve te definiëren cijfer voor drempel 0%
 DocType: Sales Order,To Deliver,Bezorgen
 DocType: Purchase Invoice Item,Item,Artikel
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Serial geen item kan niet een fractie te zijn
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Hoge gevoeligheid
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Serial geen item kan niet een fractie te zijn
 DocType: Journal Entry,Difference (Dr - Cr),Verschil (Db - Cr)
 DocType: Account,Profit and Loss,Winst en Verlies
 DocType: Patient,Risk Factors,Risicofactoren
@@ -620,7 +633,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Managing Subcontracting
 DocType: Vital Signs,Body Temperature,Lichaamstemperatuur
 DocType: Project,Project will be accessible on the website to these users,Project zal toegankelijk op de website van deze gebruikers
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Definieer projecttype.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Definieer projecttype.
 DocType: Supplier Scorecard,Weighting Function,Gewicht Functie
 DocType: Physician,OP Consulting Charge,OP Consulting Charge
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Setup uw
@@ -634,7 +647,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Toename kan niet worden 0
 DocType: Production Planning Tool,Material Requirement,Material Requirement
 DocType: Company,Delete Company Transactions,Verwijder Company Transactions
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Referentienummer en Reference Data is verplicht voor Bank transactie
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Referentienummer en Reference Data is verplicht voor Bank transactie
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Toevoegen / Bewerken Belastingen en Heffingen
 DocType: Payment Entry Reference,Supplier Invoice No,Factuurnr. Leverancier
 DocType: Territory,For reference,Ter referentie
@@ -642,12 +655,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan Serienummer {0} niet verwijderen, omdat het wordt gebruikt in voorraadtransacties"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Sluiten (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Hallo
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Item verplaatsen
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Item verplaatsen
 DocType: Serial No,Warranty Period (Days),Garantieperiode (dagen)
 DocType: Installation Note Item,Installation Note Item,Installatie Opmerking Item
 DocType: Production Plan Item,Pending Qty,In afwachting Aantal
 DocType: Budget,Ignore,Negeren
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} is niet actief
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} is niet actief
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Setup check afmetingen voor afdrukken
 DocType: Salary Slip,Salary Slip Timesheet,Loonstrook Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverancier Magazijn verplicht voor uitbesteedde Ontvangstbewijs
@@ -656,7 +669,7 @@
 DocType: Pricing Rule,Sales Partner,Verkoop Partner
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Alle leveranciers scorecards.
 DocType: Buying Settings,Purchase Receipt Required,Ontvangstbevestiging Verplicht
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Valuation Rate is verplicht als Opening Stock ingevoerd
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,Valuation Rate is verplicht als Opening Stock ingevoerd
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Geen records gevonden in de factuur tabel
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Selecteer Company en Party Type eerste
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Financiële / boekjaar .
@@ -693,7 +706,7 @@
 DocType: Quotation,Quotation To,Offerte Voor
 DocType: Lead,Middle Income,Modaal Inkomen
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Opening ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Standaard maateenheid voor post {0} kan niet direct worden gewijzigd, omdat je al enkele transactie (s) met een andere UOM hebben gemaakt. U moet een nieuwe post naar een andere Standaard UOM gebruik maken."
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Standaard maateenheid voor post {0} kan niet direct worden gewijzigd, omdat je al enkele transactie (s) met een andere UOM hebben gemaakt. U moet een nieuwe post naar een andere Standaard UOM gebruik maken."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Toegekende bedrag kan niet negatief zijn
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Stel het bedrijf alstublieft in
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Stel het bedrijf alstublieft in
@@ -708,6 +721,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Selecteer Betaalrekening aan Bank Entry maken
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Maak Employee records bladeren, declaraties en salarisadministratie beheren"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Voorschotperiode
+DocType: Restaurant Reservation,Restaurant Reservation,Restaurant reservering
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Voorstel Schrijven
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betaling Entry Aftrek
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Een andere Sales Person {0} bestaat met dezelfde werknemer id
@@ -715,7 +729,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Stamdata
 DocType: Assessment Plan,Maximum Assessment Score,Maximum Assessment Score
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Update Bank transactiedata
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,tijdregistratie
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,tijdregistratie
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,DUPLICATE VOOR TRANSPORTOR
 DocType: Fiscal Year Company,Fiscal Year Company,Fiscale Jaar Company
 DocType: Packing Slip Item,DN Detail,DN Detail
@@ -724,8 +738,9 @@
 DocType: Batch,Batch Description,Batch Beschrijving
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Leergroepen creëren
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Leergroepen creëren
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Payment Gateway-account aangemaakt, dan kunt u een handmatig maken."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Payment Gateway-account aangemaakt, dan kunt u een handmatig maken."
 DocType: Supplier Scorecard,Per Year,Per jaar
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Komt niet in aanmerking voor de toelating in dit programma volgens DOB
 DocType: Sales Invoice,Sales Taxes and Charges,Verkoop Belasting en Toeslagen
 DocType: Employee,Organization Profile,organisatie Profiel
 DocType: Vital Signs,Height (In Meter),Hoogte (in meter)
@@ -761,7 +776,7 @@
 DocType: Student Batch Name,Batch Name,batch Naam
 DocType: Fee Validity,Max number of visit,Max. Aantal bezoeken
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Rooster gemaakt:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Stel een standaard Kas- of Bankrekening in bij Betaalwijze {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Stel een standaard Kas- of Bankrekening in bij Betaalwijze {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,Inschrijven
 DocType: GST Settings,GST Settings,GST instellingen
 DocType: Selling Settings,Customer Naming By,Klant Naming Door
@@ -793,15 +808,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Vrachtkosten belastingen en toeslagen
 DocType: Production Order Operation,Actual Start Time,Werkelijke Starttijd
 DocType: BOM Operation,Operation Time,Operatie Tijd
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Afwerking
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Afwerking
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Baseren
 DocType: Timesheet,Total Billed Hours,Totaal gefactureerd Hours
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Afschrijvingsbedrag
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Afschrijvingsbedrag
 DocType: Leave Block List Allow,Allow User,Door gebruiker toestaan
 DocType: Journal Entry,Bill No,Factuur nr
 DocType: Company,Gain/Loss Account on Asset Disposal,Winst / verliesrekening op de verkoop van activa
 DocType: Vehicle Log,Service Details,Service Details
-DocType: Purchase Invoice,Quarterly,Kwartaal
+DocType: Subscription,Quarterly,Kwartaal
 DocType: Lab Test Template,Grouped,gegroepeerd
 DocType: Selling Settings,Delivery Note Required,Vrachtbrief Verplicht
 DocType: Bank Guarantee,Bank Guarantee Number,Bankgarantie Nummer
@@ -811,12 +826,12 @@
 DocType: Student Attendance,Student Attendance,student Attendance
 DocType: Sales Invoice Timesheet,Time Sheet,Urenregistratie
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Grondstoffen afgeboekt op basis van
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Vul artikeldetails in
 DocType: Interest,Interest,Interesseren
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Voorverkoop
 DocType: Purchase Receipt,Other Details,Andere Details
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Lab Test,Test Template,Test sjabloon
+DocType: Restaurant Order Entry Item,Served,geserveerd
 DocType: Account,Accounts,Rekeningen
 DocType: Vehicle,Odometer Value (Last),Kilometerstand (Laatste)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Templates van leveranciers scorecard criteria.
@@ -828,26 +843,28 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Voorbeschouwing loonstrook
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Account {0} is meerdere keren ingevoerd
 DocType: Account,Expenses Included In Valuation,Kosten inbegrepen in waardering
-DocType: Hub Settings,Seller City,Verkoper Stad
 ,Absent Student Report,Studenten afwezigheidsrapport
 DocType: Email Digest,Next email will be sent on:,Volgende e-mail wordt verzonden op:
 DocType: Offer Letter Term,Offer Letter Term,Aanbod Letter Term
 DocType: Supplier Scorecard,Per Week,Per week
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Item heeft varianten.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Item heeft varianten.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Totaal student
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Artikel {0} niet gevonden
 DocType: Bin,Stock Value,Voorraad Waarde
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,Fee-records worden op de achtergrond gemaakt. In geval van een fout wordt de foutmelding bijgewerkt in het Schema.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Company {0} bestaat niet
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} heeft geldigheid tot {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} heeft geldigheid tot {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Boom Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Aantal verbruikt per eenheid
 DocType: Serial No,Warranty Expiry Date,Garantie Vervaldatum
 DocType: Material Request Item,Quantity and Warehouse,Hoeveelheid en magazijn
+DocType: Hub Settings,Unregister,Afmelden
 DocType: Sales Invoice,Commission Rate (%),Commissie Rate (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Selecteer alsjeblieft Programma
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Selecteer alsjeblieft Programma
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Selecteer alsjeblieft Programma
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Selecteer alsjeblieft Programma
 DocType: Project,Estimated Cost,Geschatte kosten
 DocType: Purchase Order,Link to material requests,Koppeling naar materiaal aanvragen
+DocType: Hub Settings,Publish,Publiceren
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Ruimtevaart
 DocType: Journal Entry,Credit Card Entry,Kredietkaart invoer
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Bedrijf en Accounts
@@ -858,13 +875,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Sluiten Opportunity Na Days
 ,Reserved,gereserveerd
 DocType: Purchase Order,Supply Raw Materials,Supply Grondstoffen
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,De datum waarop de volgende factuur wordt gegenereerd. Het wordt gegenereerd op te leggen.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Vlottende Activa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} is geen voorraad artikel
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',Deel alstublieft uw feedback aan de training door op &#39;Training Feedback&#39; te klikken en vervolgens &#39;New&#39;
 DocType: Mode of Payment Account,Default Account,Standaardrekening
 DocType: Payment Entry,Received Amount (Company Currency),Ontvangen bedrag (Company Munt)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,Lead moet worden ingesteld als de opportuniteit is gemaakt obv een lead
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,Lead moet worden ingesteld als de opportuniteit is gemaakt obv een lead
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Selecteer wekelijkse vrije dag
 DocType: Patient,O Negative,O Negatief
 DocType: Production Order Operation,Planned End Time,Geplande Eindtijd
@@ -880,10 +896,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Opportuniteit Van
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Maandsalaris overzicht.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Voeg Bedrijf toe
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rij {0}: {1} Serienummers vereist voor item {2}. U heeft {3} verstrekt.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rij {0}: {1} Serienummers vereist voor item {2}. U heeft {3} verstrekt.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Selecteer een tafel
 DocType: BOM,Website Specifications,Website Specificaties
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} is een ongeldig e-mailadres in &#39;Ontvangers&#39;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} is een ongeldig e-mailadres in &#39;Ontvangers&#39;
 DocType: Special Test Items,Particulars,bijzonderheden
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibioticum.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Van {0} van type {1}
@@ -891,11 +907,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Rij {0}: Conversie Factor is verplicht
 DocType: Employee,A+,A+
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Meerdere Prijs Regels bestaat met dezelfde criteria, dan kunt u conflicten op te lossen door het toekennen van prioriteit. Prijs Regels: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,Kan stuklijst niet deactiveren of annuleren aangezien het is gelinkt met andere stuklijsten.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,Kan stuklijst niet deactiveren of annuleren aangezien het is gelinkt met andere stuklijsten.
 DocType: Opportunity,Maintenance,Onderhoud
 DocType: Item Attribute Value,Item Attribute Value,Item Atribuutwaarde
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Verkoop campagnes
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,maak Timesheet
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,maak Timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -952,12 +968,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Vul eerst artikel in
 DocType: Account,Liability,Verplichting
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Gesanctioneerde bedrag kan niet groter zijn dan Claim Bedrag in Row {0}.
+DocType: Salary Detail,Do not include in total,Neem niet alles mee
 DocType: Company,Default Cost of Goods Sold Account,Standaard kosten van verkochte goederen Account
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Prijslijst niet geselecteerd
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Prijslijst niet geselecteerd
 DocType: Employee,Family Background,Familie Achtergrond
 DocType: Request for Quotation Supplier,Send Email,E-mail verzenden
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Waarschuwing: Invalid Attachment {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Geen toestemming
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Waarschuwing: Invalid Attachment {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Geen toestemming
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Offerte aangevraagd
 DocType: Vital Signs,Heart Rate / Pulse,Hartslag / Pulse
 DocType: Company,Default Bank Account,Standaard bankrekening
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Om te filteren op basis van Party, selecteer Party Typ eerst"
@@ -984,12 +1002,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Item Row {IDX}: {doctype} {DocName} bestaat niet in bovenstaande &#39;{} doctype&#39; table
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} is al voltooid of geannuleerd
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,geen taken
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","De dag van de maand waarop de automatische factuur zal bijvoorbeeld 05, 28 etc worden gegenereerd"
 DocType: Item Variant Settings,Copy Fields to Variant,Kopieer velden naar variant
 DocType: Asset,Opening Accumulated Depreciation,Het openen van de cumulatieve afschrijvingen
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score moet lager dan of gelijk aan 5 zijn
 DocType: Program Enrollment Tool,Program Enrollment Tool,Programma Inschrijving Tool
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C -Form records
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C -Form records
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Klant en leverancier
 DocType: Email Digest,Email Digest Settings,E-mail Digest Instellingen
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Bedankt voor uw zaken!
@@ -1007,13 +1024,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Offerte Status
 DocType: Maintenance Visit,Completion Status,Voltooiingsstatus
 DocType: HR Settings,Enter retirement age in years,Voer de pensioengerechtigde leeftijd in jaren
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Doel Magazijn
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Selecteer een magazijn
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Doel Magazijn
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Selecteer een magazijn
 DocType: Cheque Print Template,Starting location from left edge,Startlocatie van linkerrand
 DocType: Item,Allow over delivery or receipt upto this percent,Laat dan levering of ontvangst upto deze procent
 DocType: Stock Entry,STE-,STEREO
 DocType: Upload Attendance,Import Attendance,Import Toeschouwers
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Alle Artikel Groepen
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Alle Artikel Groepen
 DocType: Process Payroll,Activity Log,Activiteitenlogboek
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Netto winst / verlies
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Bericht automatisch samenstellen overlegging van transacties .
@@ -1025,7 +1042,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Verwachte Aantal
 DocType: Sales Invoice,Payment Due Date,Betaling Vervaldatum
 DocType: Drug Prescription,Interval UOM,Interval UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Artikel Variant {0} bestaat al met dezelfde kenmerken
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Artikel Variant {0} bestaat al met dezelfde kenmerken
+DocType: Item,Hub Publishing Details,Hub publicatie details
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;Opening&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Open To Do
 DocType: Notification Control,Delivery Note Message,Vrachtbrief Bericht
@@ -1045,10 +1063,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: Ruw materiaal kan niet hetzelfde zijn als hoofdartikel
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Totaal van toepassing zijnde kosten in Kwitantie Items tabel moet hetzelfde zijn als de totale belastingen en heffingen
 DocType: Sales Team,Incentives,Incentives
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Registreer voor Hub
 DocType: SMS Log,Requested Numbers,Gevraagde Numbers
 DocType: Production Planning Tool,Only Obtain Raw Materials,Alleen verkrijgen Grondstoffen
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Beoordeling van de prestaties.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Inschakelen &quot;Gebruik voor Winkelwagen &#39;, zoals Winkelwagen is ingeschakeld en er moet minstens één Tax Rule voor Winkelwagen zijn"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Inschakelen &quot;Gebruik voor Winkelwagen &#39;, zoals Winkelwagen is ingeschakeld en er moet minstens één Tax Rule voor Winkelwagen zijn"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Betaling Entry {0} is verbonden met de Orde {1}, controleer dan of het als tevoren in deze factuur moet worden getrokken."
 DocType: Sales Invoice Item,Stock Details,Voorraad Details
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Project Waarde
@@ -1067,12 +1086,14 @@
 DocType: Salary Slip,Working Days,Werkdagen
 DocType: Serial No,Incoming Rate,Inkomende Rate
 DocType: Packing Slip,Gross Weight,Bruto Gewicht
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,De naam van uw bedrijf waar u het systeem voor op zet.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Hub inschakelen
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,De naam van uw bedrijf waar u het systeem voor op zet.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Feestdagen opnemen in totaal aantal werkdagen.
 DocType: Job Applicant,Hold,Houden
 DocType: Employee,Date of Joining,Datum van indiensttreding
 DocType: Naming Series,Update Series,Reeksen bijwerken
 DocType: Supplier Quotation,Is Subcontracted,Wordt uitbesteed
+DocType: Restaurant Table,Minimum Seating,Minimum aantal zitplaatsen
 DocType: Item Attribute,Item Attribute Values,Item Attribuutwaarden
 DocType: Examination Result,Examination Result,examenresultaat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Ontvangstbevestiging
@@ -1083,13 +1104,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Kan Time Slot in de volgende {0} dagen voor Operatie vinden {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materiaal voor onderdelen
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Sales Partners en Territory
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,Stuklijst {0} moet actief zijn
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,Stuklijst {0} moet actief zijn
 DocType: Journal Entry,Depreciation Entry,afschrijvingen Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Selecteer eerst het documenttype
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Annuleren Materiaal Bezoeken {0} voor het annuleren van deze Maintenance Visit
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serienummer {0} behoort niet tot Artikel {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Benodigde hoeveelheid
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Warehouses met bestaande transactie kan niet worden geconverteerd naar grootboek.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Warehouses met bestaande transactie kan niet worden geconverteerd naar grootboek.
 DocType: Bank Reconciliation,Total Amount,Totaal bedrag
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,internet Publishing
 DocType: Prescription Duration,Number,Aantal
@@ -1100,7 +1121,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Sales Prijslijst
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Als gecontroleerd, wordt een klant aangemaakt, aangepast aan Patiënt. Patiëntfacturen worden aangemaakt tegen deze klant. U kunt ook de bestaande klant selecteren bij het maken van een patiënt."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publiceren naar onderdelen wilt synchroniseren
 DocType: Bank Reconciliation,Account Currency,Account Valuta
 DocType: Lab Test,Sample ID,Voorbeeld ID
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Vermeld Ronde Off Account in Company
@@ -1109,11 +1129,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Werknemer {0} is niet actief of bestaat niet
 DocType: Fee Structure,Components,Components
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Vul Asset Categorie op post {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Item Varianten {0} bijgewerkt
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Item Varianten {0} bijgewerkt
 DocType: Quality Inspection Reading,Reading 6,Meting 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Kan niet {0} {1} {2} zonder negatieve openstaande factuur
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","gegenereerd worden. Als u vertraagd bent, moet u het veld &#39;Herhalen op dag van maand&#39; handmatig wijzigen"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Kan niet {0} {1} {2} zonder negatieve openstaande factuur
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Inkoopfactuur Voorschot
-DocType: Hub Settings,Sync Now,Nu synchroniseren
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Rij {0}: kan creditering niet worden gekoppeld met een {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Definieer budget voor een boekjaar.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Standaard Kas-/Bankrekening wordt automatisch bijgewerkt in POS Factuur als deze modus is geselecteerd.
@@ -1125,13 +1146,13 @@
 DocType: Item,Is Purchase Item,Is inkoopartikel
 DocType: Asset,Purchase Invoice,Inkoopfactuur
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail nr
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Nieuwe Sales Invoice
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Nieuwe Sales Invoice
 DocType: Stock Entry,Total Outgoing Value,Totaal uitgaande waardeoverdrachten
 DocType: Physician,Appointments,afspraken
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Openingsdatum en de uiterste datum moet binnen dezelfde fiscale jaar
 DocType: Lead,Request for Information,Informatieaanvraag
 ,LeaderBoard,Scorebord
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Sync Offline Facturen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Sync Offline Facturen
 DocType: Payment Request,Paid,Betaald
 DocType: Program Fee,Program Fee,programma Fee
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1150,11 +1171,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Inkooporder Artikel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Indirecte Inkomsten
 DocType: Student Attendance Tool,Student Attendance Tool,Student Attendance Tool
+DocType: Restaurant Menu,Price List (Auto created),Prijslijst (automatisch aangemaakt)
 DocType: Cheque Print Template,Date Settings,date Settings
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variantie
 ,Company Name,Bedrijfsnaam
 DocType: SMS Center,Total Message(s),Totaal Bericht(en)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Kies Punt voor Overdracht
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Kies Punt voor Overdracht
 DocType: Purchase Invoice,Additional Discount Percentage,Extra Korting Procent
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Bekijk een overzicht van alle hulp video&#39;s
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Selecteer hoofdrekening van de bank waar cheque werd gedeponeerd.
@@ -1172,6 +1194,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Meter
 DocType: Workstation,Electricity Cost,elektriciteitskosten
 DocType: HR Settings,Don't send Employee Birthday Reminders,Stuur geen Werknemer verjaardagsherinneringen
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Instellingen opslaan
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Gevraagde producten
 DocType: Item,Inspection Criteria,Inspectie Criteria
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Overgebrachte
 DocType: BOM Website Item,BOM Website Item,BOM Website Item
@@ -1189,11 +1213,11 @@
 DocType: Journal Entry,Total Amount in Words,Totaal bedrag in woorden
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Er is een fout opgetreden . Een mogelijke reden zou kunnen zijn dat u het formulier niet hebt opgeslagen. Neem contact op met Support als het probleem aanhoudt .
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Mijn winkelwagen
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Order Type moet één van {0} zijn
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Order Type moet één van {0} zijn
 DocType: Lead,Next Contact Date,Volgende Contact Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Opening Aantal
 DocType: Healthcare Settings,Appointment Reminder,Benoemingsherinnering
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Vul Account for Change Bedrag
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Vul Account for Change Bedrag
 DocType: Student Batch Name,Student Batch Name,Student batchnaam
 DocType: Consultation,Doctor,dokter
 DocType: Holiday List,Holiday List Name,Holiday Lijst Naam
@@ -1201,12 +1225,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Schedule Course
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Aandelenopties
 DocType: Journal Entry Account,Expense Claim,Kostendeclaratie
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Wilt u deze schrapte activa echt herstellen?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Aantal voor {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Wilt u deze schrapte activa echt herstellen?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Aantal voor {0}
 DocType: Leave Application,Leave Application,Verlofaanvraag
 DocType: Patient,Patient Relation,Patiëntrelatie
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Verlof Toewijzing Tool
+DocType: Item,Hub Category to Publish,Hubcategorie om te publiceren
 DocType: Leave Block List,Leave Block List Dates,Laat Block List Data
+DocType: Sales Invoice,Billing Address GSTIN,Factuuradres GSTIN
 DocType: Workstation,Net Hour Rate,Netto uurtarief
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Vrachtkosten Inkoop Ontvangstbewijs
 DocType: Company,Default Terms,Default Voorwaarden
@@ -1216,18 +1242,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Geef een {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Verwijderde items met geen verandering in de hoeveelheid of waarde.
 DocType: Delivery Note,Delivery To,Leveren Aan
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Attributentabel is verplicht
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Attributentabel is verplicht
 DocType: Production Planning Tool,Get Sales Orders,Get Verkooporders
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} kan niet negatief zijn
 DocType: Training Event,Self-Study,Zelfstudie
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Korting
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Korting
 DocType: Asset,Total Number of Depreciations,Totaal aantal Afschrijvingen
 DocType: Sales Invoice Item,Rate With Margin,Beoordeel met marges
 DocType: Workstation,Wages,Loon
 DocType: Task,Urgent,Dringend
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Geef een geldige rij-ID voor rij {0} in tabel {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Kan variabele niet vinden:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Selecteer alstublieft een veld om van numpad te bewerken
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Selecteer alstublieft een veld om van numpad te bewerken
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Ga naar het bureaublad om aan de slag te gaan met ERPNext
 DocType: Item,Manufacturer,Fabrikant
 DocType: Landed Cost Item,Purchase Receipt Item,Ontvangstbevestiging Artikel
@@ -1258,8 +1284,8 @@
 DocType: GL Entry,Against,Tegen
 DocType: Item,Default Selling Cost Center,Standaard Verkoop kostenplaats
 DocType: Sales Partner,Implementation Partner,Implementatie Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Postcode
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Sales Order {0} is {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Postcode
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Sales Order {0} is {1}
 DocType: Opportunity,Contact Info,Contact Info
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Maken Stock Inzendingen
 DocType: Packing Slip,Net Weight UOM,Netto Gewicht Eenheid
@@ -1270,6 +1296,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Ontvang wekelijkse Uit Data
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Einddatum kan niet vroeger zijn dan startdatum
 DocType: Sales Person,Select company name first.,Kies eerst een bedrijfsnaam.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Laag naar hoog
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Offertes ontvangen van leveranciers.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Vervang BOM en update de laatste prijs in alle BOM&#39;s
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Naar {0} | {1} {2}
@@ -1289,7 +1316,7 @@
 DocType: Program Enrollment,Transportation,Vervoer
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,ongeldige attribuut
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} moet worden ingediend
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Hoeveelheid moet kleiner dan of gelijk aan {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Hoeveelheid moet kleiner dan of gelijk aan {0}
 DocType: SMS Center,Total Characters,Totaal Tekens
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Selecteer BOM in BOM veld voor post {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Factuurspecificatie
@@ -1304,7 +1331,7 @@
 ,Ordered Items To Be Billed,Bestelde artikelen te factureren
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Van Range moet kleiner zijn dan om het bereik
 DocType: Global Defaults,Global Defaults,Global Standaardwaarden
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Project Uitnodiging Collaboration
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Project Uitnodiging Collaboration
 DocType: Salary Slip,Deductions,Inhoudingen
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Actie Naam
@@ -1322,13 +1349,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Verkoopfactuur Voorschot
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Niets aan te vragen
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Een andere Budget plaat &#39;{0}&#39; bestaat al tegen {1} {2} &#39;voor het fiscale jaar {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','Werkelijke Startdatum' kan niet groter zijn dan 'Werkelijke Einddatum'
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','Werkelijke Startdatum' kan niet groter zijn dan 'Werkelijke Einddatum'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Beheer
 DocType: Cheque Print Template,Payer Settings,Payer Instellingen
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dit zal worden toegevoegd aan de Code van het punt van de variant. Bijvoorbeeld, als je de afkorting is ""SM"", en de artikelcode is ""T-SHIRT"", de artikelcode van de variant zal worden ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettoloon (in woorden) zal zichtbaar zijn zodra de Salarisstrook wordt opgeslagen.
 DocType: Purchase Invoice,Is Return,Is Return
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Voorzichtigheid
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Voorzichtigheid
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Return / betaalkaart Note
 DocType: Price List Country,Price List Country,Prijslijst Land
 DocType: Item,UOMs,UOMs
@@ -1343,17 +1370,18 @@
 DocType: Account,Balance Sheet,Balans
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Kostenplaats Item met Item Code '
 DocType: Fee Validity,Valid Till,Geldig tot
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betaling Mode is niet geconfigureerd. Controleer, of rekening is ingesteld op de wijze van betalingen of op POS Profile."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betaling Mode is niet geconfigureerd. Controleer, of rekening is ingesteld op de wijze van betalingen of op POS Profile."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Hetzelfde item kan niet meerdere keren worden ingevoerd.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Verdere accounts kan worden gemaakt onder groepen, maar items kunnen worden gemaakt tegen niet-Groepen"
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Schulden
 DocType: Course,Course Intro,cursus Intro
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Stock Entry {0} aangemaakt
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Stel nummeringsreeksen in voor Aanwezigheid via Setup&gt; Nummeringserie
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Stock Entry {0} aangemaakt
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Rij # {0}: Afgekeurd Aantal niet in Purchase Return kunnen worden ingevoerd
 ,Purchase Order Items To Be Billed,Inkooporder Artikelen nog te factureren
 DocType: Purchase Invoice Item,Net Rate,Net Rate
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Selecteer een klant alsjeblieft
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Selecteer een klant alsjeblieft
 DocType: Purchase Invoice Item,Purchase Invoice Item,Inkoopfactuur Artikel
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Voorraad boekingen en Journaalposten worden opnieuw geboekt voor de geselecteerde Ontvangstbewijzen
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Punt 1
@@ -1374,7 +1402,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Dubbele rij {0} met dezelfde {1}
 ,Trial Balance,Proefbalans
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Boekjaar {0} niet gevonden
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Het opzetten van Werknemers
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Het opzetten van Werknemers
 DocType: Sales Order,SO-,ZO-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Selecteer eerst een voorvoegsel
 DocType: Employee,O-,O-
@@ -1386,12 +1414,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Bekijk Grootboek
 DocType: Grading Scale,Intervals,intervallen
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Vroegst
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Een artikel Group bestaat met dezelfde naam , moet u de naam van het item of de naam van de artikelgroep"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Een artikel Group bestaat met dezelfde naam , moet u de naam van het item of de naam van de artikelgroep"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Rest van de Wereld
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Rest van de Wereld
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,De Punt {0} kan niet Batch hebben
 ,Budget Variance Report,Budget Variantie Rapport
 DocType: Salary Slip,Gross Pay,Brutoloon
+DocType: Item,Is Item from Hub,Is item van Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Rij {0}: Activiteit Type is verplicht.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividenden betaald
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Boekhoudboek
@@ -1401,8 +1430,9 @@
 DocType: Vehicle Log,Service Detail,dienst Detail
 DocType: BOM,Item Description,Artikelomschrijving
 DocType: Student Sibling,Student Sibling,student Sibling
-DocType: Purchase Invoice,Is Recurring,Is Terugkerende
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Betaling Mode
 DocType: Purchase Invoice,Supplied Items,Geleverde Artikelen
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Stel een actief menu in voor Restaurant {0}
 DocType: Student,STUD.,Stud.
 DocType: Production Order,Qty To Manufacture,Aantal te produceren
 DocType: Email Digest,New Income,nieuwe Inkomen
@@ -1413,6 +1443,7 @@
 ,Student and Guardian Contact Details,Student and Guardian Contactgegevens
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Rij {0}: Voor leveranciers {0} e-mailadres is vereist om e-mail te sturen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Tijdelijke Opening
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Hub bekijken
 ,Employee Leave Balance,Werknemer Verlof Balans
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Saldo van rekening {0} moet altijd {1} zijn
 DocType: Patient Appointment,More Info,Meer info
@@ -1432,13 +1463,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Verkooporder {0} is niet geldig
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Waarschuw voor nieuw verzoek om offertes
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Inkooporders helpen bij het plannen en opvolgen van uw aankopen
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Prescriptions
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",De totale Issue / Transfer hoeveelheid {0} in Materiaal Request {1} \ kan niet groter zijn dan de gevraagde hoeveelheid {2} voor post zijn {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Klein
 DocType: Employee,Employee Number,Werknemer Nummer
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Zaak nr. ( s ) al in gebruik. Probeer uit Zaak nr. {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Zaak nr. ( s ) al in gebruik. Probeer uit Zaak nr. {0}
 DocType: Project,% Completed,% Voltooid
 ,Invoiced Amount (Exculsive Tax),Factuurbedrag (excl BTW)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Punt 2
@@ -1453,11 +1484,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Indirecte Kosten
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Rij {0}: Aantal is verplicht
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,landbouw
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Uw producten of diensten
 DocType: Special Test Items,Special Test Items,Speciale testartikelen
 DocType: Mode of Payment,Mode of Payment,Wijze van betaling
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Website Afbeelding moet een openbaar bestand of website URL zijn
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Website Afbeelding moet een openbaar bestand of website URL zijn
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Dit is een basis artikelgroep en kan niet worden bewerkt .
@@ -1465,9 +1496,9 @@
 DocType: Vehicle,Fuel UOM,Fuel UOM
 DocType: Warehouse,Warehouse Contact Info,Magazijn Contact Info
 DocType: Payment Entry,Write Off Difference Amount,Schrijf Off Verschil Bedrag
-DocType: Purchase Invoice,Recurring Type,Terugkerende Type
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: Employee e-mail niet gevonden, dus geen e-mail verzonden"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: Employee e-mail niet gevonden, dus geen e-mail verzonden"
 DocType: Item,Foreign Trade Details,Buitenlandse Handel Details
+,Assessment Plan Status,Beoordelingsplan Status
 DocType: Email Digest,Annual Income,Jaarlijks inkomen
 DocType: Serial No,Serial No Details,Serienummer Details
 DocType: Purchase Invoice Item,Item Tax Rate,Artikel BTW-tarief
@@ -1475,15 +1506,14 @@
 DocType: Student Group Student,Group Roll Number,Groepsrolnummer
 DocType: Student Group Student,Group Roll Number,Groepsrolnummer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Voor {0}, kan alleen credit accounts worden gekoppeld tegen een andere debetboeking"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totaal van alle taak gewichten moeten 1. Pas gewichten van alle Project taken dienovereenkomstig
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Vrachtbrief {0} is niet ingediend
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totaal van alle taak gewichten moeten 1. Pas gewichten van alle Project taken dienovereenkomstig
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Vrachtbrief {0} is niet ingediend
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Artikel {0} moet een uitbesteed artikel zijn
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapitaalgoederen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prijsbepalingsregel wordt eerst geselecteerd op basis van 'Toepassen op' veld, dat kan zijn artikel, artikelgroep of merk."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Stel eerst de productcode in
-DocType: Hub Settings,Seller Website,Verkoper Website
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Stel eerst de productcode in
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Totaal toegewezen percentage voor verkoopteam moet 100 zijn
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Totaal toegewezen percentage voor verkoopteam moet 100 zijn
 DocType: Sales Invoice Item,Edit Description,Bewerken Beschrijving
 DocType: Antibiotic,Antibiotic,Antibioticum
 ,Team Updates,team updates
@@ -1504,12 +1534,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Totaal (Company valuta)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Serienummer {0} meer dan eens ingevoerd
 DocType: Depreciation Schedule,Journal Entry,Journaalpost
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} items in progress
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} items in progress
 DocType: Workstation,Workstation Name,Naam van werkstation
 DocType: Grading Scale Interval,Grade Code,Grade Code
 DocType: POS Item Group,POS Item Group,POS Item Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},Stuklijst {0} behoort niet tot Artikel {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},Stuklijst {0} behoort niet tot Artikel {1}
 DocType: Sales Partner,Target Distribution,Doel Distributie
 DocType: Salary Slip,Bank Account No.,Bankrekeningnummer
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Dit is het nummer van de laatst gemaakte transactie met dit voorvoegsel
@@ -1525,10 +1555,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Offerte Supplier
 DocType: Healthcare Settings,Registration Message,Registratie Bericht
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,hardware
-DocType: Sales Order,Recurring Upto,terugkerende Tot
 DocType: Prescription Dosage,Prescription Dosage,Voorschrift Dosering
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Selecteer aub een andere vennootschap
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Selecteer aub een andere vennootschap
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Bijzonder Verlof
 DocType: Purchase Invoice,Supplier Invoice Date,Factuurdatum Leverancier
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,per
@@ -1544,10 +1573,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Overlappende voorwaarden gevonden tussen :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Tegen Journal Entry {0} is al aangepast tegen enkele andere voucher
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Totale orderwaarde
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Voeding
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Voeding
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Vergrijzing Range 3
 DocType: Maintenance Schedule Item,No of Visits,Aantal bezoeken
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Onderhoudsplan {0} bestaat tegen {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Wilt u uw items publiceren op Hub?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,student die zich inschrijft
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta van de Closing rekening moet worden {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Som van de punten voor alle doelen moeten zijn 100. Het is {0}
@@ -1558,9 +1588,9 @@
 DocType: Authorization Rule,Average Discount,Gemiddelde korting
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Utilities
-DocType: Purchase Invoice Item,Accounting,Boekhouding
+DocType: POS Profile,Accounting,Boekhouding
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Selecteer batches voor batched item
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Selecteer batches voor batched item
 DocType: Asset,Depreciation Schedules,afschrijvingen Roosters
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Aanvraagperiode kan buiten verlof toewijzingsperiode niet
 DocType: Activity Cost,Projects,Projecten
@@ -1576,7 +1606,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',Goedkeuring Status moet worden ' goedgekeurd ' of ' Afgewezen '
 DocType: Physician,Contacts and Address,Contacten en adres
 DocType: Purchase Invoice,Contact Person,Contactpersoon
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Verwacht Startdatum' kan niet groter zijn dan 'Verwachte Einddatum'
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','Verwacht Startdatum' kan niet groter zijn dan 'Verwachte Einddatum'
 DocType: Course Scheduling Tool,Course End Date,Cursus Einddatum
 DocType: Holiday List,Holidays,Feestdagen
 DocType: Sales Order Item,Planned Quantity,Gepland Aantal
@@ -1584,10 +1614,11 @@
 DocType: Item,Maintain Stock,Handhaaf Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Stock Entries al gemaakt voor de productieorder
 DocType: Employee,Prefered Email,Prefered Email
+DocType: Student Admission,Eligibility and Details,Geschiktheid en details
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Netto wijziging in vaste activa
 DocType: Leave Control Panel,Leave blank if considered for all designations,Laat leeg indien overwogen voor alle aanduidingen
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge van het type ' Actual ' in rij {0} kan niet worden opgenomen in Item Rate
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Van Datetime
 DocType: Email Digest,For Company,Voor Bedrijf
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Communicatie log.
@@ -1595,19 +1626,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Leverancier Scorecard Scorevariabele
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Aankoop Bedrag
 DocType: Sales Invoice,Shipping Address Name,Verzenden Adres Naam
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Rekeningschema
 DocType: Material Request,Terms and Conditions Content,Algemene Voorwaarden Inhoud
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,mag niet groter zijn dan 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Artikel {0} is geen voorraadartikel
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Artikel {0} is geen voorraadartikel
 DocType: Maintenance Visit,Unscheduled,Ongeplande
 DocType: Employee,Owned,Eigendom
 DocType: Salary Detail,Depends on Leave Without Pay,Afhankelijk van onbetaald verlof
 DocType: Pricing Rule,"Higher the number, higher the priority","Hoe hoger het getal, hoe hoger de prioriteit"
 ,Purchase Invoice Trends,Inkoopfactuur Trends
 DocType: Employee,Better Prospects,Betere vooruitzichten
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Rij # {0}: De partij {1} heeft slechts {2} aantal. Selecteer alstublieft een andere partij die {3} beschikbaar heeft of verdeel de rij in meerdere rijen, om te leveren / uit te voeren vanuit meerdere batches"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Rij # {0}: De partij {1} heeft slechts {2} aantal. Selecteer alstublieft een andere partij die {3} beschikbaar heeft of verdeel de rij in meerdere rijen, om te leveren / uit te voeren vanuit meerdere batches"
 DocType: Vehicle,License Plate,Nummerplaat
 DocType: Appraisal,Goals,Doelen
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Selecteer POS-profiel
 DocType: Warranty Claim,Warranty / AMC Status,Garantie / AMC Status
 ,Accounts Browser,Rekeningen Verkenner
 DocType: Payment Entry Reference,Payment Entry Reference,Betaling Entry Reference
@@ -1626,7 +1657,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Werknemer kan niet rapporteren aan zichzelf.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Als de rekening is bevroren, kunnen boekingen alleen door daartoe bevoegde gebruikers gedaan worden."
 DocType: Email Digest,Bank Balance,Banksaldo
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Rekening ingave voor {0}: {1} kan alleen worden gedaan in valuta: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Rekening ingave voor {0}: {1} kan alleen worden gedaan in valuta: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Functieprofiel, benodigde kwalificaties enz."
 DocType: Journal Entry Account,Account Balance,Rekeningbalans
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Fiscale Regel voor transacties.
@@ -1635,8 +1666,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Totaal belastingen en toeslagen (Bedrijfsvaluta)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Toon ongesloten fiscale jaar P &amp; L saldi
 DocType: Lab Test Template,Collection Details,Collectie Details
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","selecteer cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date van tabConsultation ct, `tabLab Prescription` cp waar ct.patient = &#39;{0}&#39; en cp.parent = ct. naam en cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Verzending Rekening
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} is niet actief
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Maak verkooporders om u te helpen uw werk en leveren op tijd
@@ -1653,7 +1682,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Pakbon
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Kantoorhuur
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Instellingen SMS gateway
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importeren mislukt!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Importeren mislukt!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Nog geen adres toegevoegd.
 DocType: Workstation Working Hour,Workstation Working Hour,Werkstation Werkuur
 DocType: Vital Signs,Blood Pressure,Bloeddruk
@@ -1678,7 +1707,7 @@
 DocType: Sales Invoice,Source,Bron
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Toon gesloten
 DocType: Leave Type,Is Leave Without Pay,Is onbetaald verlof
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Asset Categorie is verplicht voor post der vaste activa
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Asset Categorie is verplicht voor post der vaste activa
 DocType: Fee Validity,Fee Validity,Geldigheidsgeldigheid
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Geen records gevonden in de betaling tabel
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Deze {0} in strijd is met {1} voor {2} {3}
@@ -1699,8 +1728,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Maak Leads
 DocType: Maintenance Schedule,Schedules,Schema
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,POS-profiel is vereist om Point-of-Sale te gebruiken
 DocType: Purchase Invoice Item,Net Amount,Netto Bedrag
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} is niet ingediend dus de actie kan niet voltooid worden
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} is niet ingediend dus de actie kan niet voltooid worden
 DocType: Purchase Order Item Supplied,BOM Detail No,Stuklijst Detail nr.
 DocType: Landed Cost Voucher,Additional Charges,Extra kosten
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Extra korting Bedrag (Company valuta)
@@ -1709,7 +1739,7 @@
 ,Support Hour Distribution,Support Hour Distribution
 DocType: Maintenance Visit,Maintenance Visit,Onderhoud Bezoek
 DocType: Student,Leaving Certificate Number,Leaving Certificate Number
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Afspraak geannuleerd, Controleer en annuleer de factuur {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Afspraak geannuleerd, Controleer en annuleer de factuur {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Verkrijgbaar Aantal Batch bij Warehouse
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Bijwerken Print Format
 DocType: Landed Cost Voucher,Landed Cost Help,Vrachtkosten Help
@@ -1732,8 +1762,8 @@
 DocType: Patient,Tobacco Past Use,Gebruik van tabak achteraf
 DocType: Sales Invoice Item,Brand Name,Merknaam
 DocType: Purchase Receipt,Transporter Details,Transporter Details
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Gebruiker {0} is al toegewezen aan Arts {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Standaard magazijn is nodig voor geselecteerde punt
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Gebruiker {0} is al toegewezen aan Arts {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Standaard magazijn is nodig voor geselecteerde punt
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Doos
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,mogelijke Leverancier
 DocType: Budget,Monthly Distribution,Maandelijkse Verdeling
@@ -1743,8 +1773,8 @@
 DocType: Sales Partner,Sales Partner Target,Verkoop Partner Doel
 DocType: Loan Type,Maximum Loan Amount,Maximum Leningen
 DocType: Pricing Rule,Pricing Rule,Prijsbepalingsregel
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Dubbele rolnummer voor student {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Dubbele rolnummer voor student {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Dubbele rolnummer voor student {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Dubbele rolnummer voor student {0}
 DocType: Budget,Action if Annual Budget Exceeded,Actie als jaarlijkse begroting overschreden
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Materiaal aanvragen tot Purchase Order
 DocType: Shopping Cart Settings,Payment Success URL,Betaling Succes URL
@@ -1761,7 +1791,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} mag slechts eenmaal voorkomen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Niet toegestaan om meer tranfer {0} dan {1} tegen Purchase Order {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Verlof succesvol toegewezen aan {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Geen Artikelen om te verpakken
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Geen Artikelen om te verpakken
 DocType: Shipping Rule Condition,From Value,Van Waarde
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Productie Aantal is verplicht
 DocType: Employee Loan,Repayment Method,terugbetaling Method
@@ -1775,6 +1805,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Voorraad Verplichtingen
 DocType: Purchase Invoice,Supplier Warehouse,Leverancier Magazijn
 DocType: Opportunity,Contact Mobile No,Contact Mobiele nummer
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Selecteer Bedrijf
 ,Material Requests for which Supplier Quotations are not created,Materiaal Aanvragen waarvoor Leverancier Offertes niet zijn gemaakt
 DocType: Student Group,Set 0 for no limit,Stel 0 voor geen limiet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,De dag (en) waarop je solliciteert verlof zijn vakantie. U hoeft niet voor verlof.
@@ -1784,24 +1815,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Maak Offerte
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,andere rapporten
 DocType: Dependent Task,Dependent Task,Afhankelijke taak
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Conversiefactor voor Standaard meeteenheid moet 1 zijn in rij {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Conversiefactor voor Standaard meeteenheid moet 1 zijn in rij {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Verlof van type {0} kan niet langer zijn dan {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Probeer plan operaties voor X dagen van tevoren.
 DocType: HR Settings,Stop Birthday Reminders,Stop verjaardagsherinneringen
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Stel Default Payroll Payable account in Company {0}
 DocType: SMS Center,Receiver List,Ontvanger Lijst
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Zoekitem
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Zoekitem
 DocType: Patient Appointment,Referring Physician,Verwijzende arts
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Verbruikte hoeveelheid
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Netto wijziging in cash
 DocType: Assessment Plan,Grading Scale,Grading Scale
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Eenheid {0} is meer dan eens ingevoerd in Conversie Factor Tabel
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,Reeds voltooid
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Eenheid {0} is meer dan eens ingevoerd in Conversie Factor Tabel
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,Reeds voltooid
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Voorraad in de hand
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Betalingsverzoek bestaat al {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kosten van Items Afgegeven
 DocType: Physician,Hospital,Ziekenhuis
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Hoeveelheid mag niet meer zijn dan {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Hoeveelheid mag niet meer zijn dan {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Vorig boekjaar is niet gesloten
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Leeftijd (dagen)
 DocType: Quotation Item,Quotation Item,Offerte Artikel
@@ -1812,8 +1843,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Leverancier Type stam.
 DocType: Purchase Order Item,Supplier Part Number,Leverancier Onderdeelnummer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Succespercentage kan niet 0 of 1 zijn
-DocType: Sales Invoice,Reference Document,Referentie document
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} is geannuleerd of gestopt
+DocType: Subscription,Reference Document,Referentie document
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} is geannuleerd of gestopt
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Voertuig Vertrekdatum
 DocType: Healthcare Settings,Default Medical Code Standard,Standaard Medische Code Standaard
@@ -1822,6 +1853,7 @@
 DocType: Company,Default Payable Account,Standaard Payable Account
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Instellingen voor online winkelwagentje zoals scheepvaart regels, prijslijst enz."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% gefactureerd
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Sorteer op prijs ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Gereserveerde Hoeveelheid
 DocType: Party Account,Party Account,Party Account
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Human Resources
@@ -1833,13 +1865,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Maak uitbetaling Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Rij {0}: Advance tegen Leverancier worden debiteren
 DocType: Company,Default Values,Standaard Waarden
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequentie} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Frequentie} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Totaal bedrag terug!
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Dit is gebaseerd op stammen tegen dit voertuig. Zie tijdlijn hieronder voor meer informatie
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Tegen Leverancier Factuur {0} gedateerd {1}
 DocType: Customer,Default Price List,Standaard Prijslijst
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Asset bewegingsartikel {0} aangemaakt
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Je kunt niet verwijderen boekjaar {0}. Boekjaar {0} is ingesteld als standaard in Global Settings
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Er bestaat al een klant met dezelfde naam
 DocType: Journal Entry,Entry Type,Entry Type
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Geen beoordelingsplan gekoppeld aan deze beoordelingsgroep
 ,Customer Credit Balance,Klant Kredietsaldo
@@ -1850,7 +1883,7 @@
 DocType: Quotation,Term Details,Voorwaarde Details
 DocType: Project,Total Sales Cost (via Sales Order),Totale verkoopskosten (via verkooporder)
 DocType: Project,Total Sales Cost (via Sales Order),Totale verkoopskosten (via verkooporder)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Kan niet meer dan {0} studenten voor deze groep studenten inschrijven.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Kan niet meer dan {0} studenten voor deze groep studenten inschrijven.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Loodtelling
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Loodtelling
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} moet groter zijn dan 0
@@ -1868,9 +1901,11 @@
 DocType: Lab Test,Technician Name,Technicus Naam
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Ontkoppelen Betaling bij annulering van de factuur
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Huidige kilometerstand ingevoerd moet groter zijn dan de initiële kilometerstand van het voertuig zijn {0}
+DocType: Restaurant Reservation,No Show,Geen voorstelling
 DocType: Shipping Rule Country,Shipping Rule Country,Verzenden Regel Land
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Verlaat en Aanwezigheid
 DocType: Maintenance Visit,Partially Completed,Gedeeltelijk afgesloten
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Gematigde gevoeligheid
 DocType: Leave Type,Include holidays within leaves as leaves,Inclusief vakantie binnen bladeren als bladeren
 DocType: Sales Invoice,Packed Items,Verpakt Items
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garantie Claim tegen Serienummer
@@ -1887,13 +1922,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Betaald bedrag (Bedrijfsvaluta)
 DocType: Purchase Invoice,Additional Discount,EXTRA KORTING
 DocType: Selling Settings,Selling Settings,Verkoop Instellingen
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Bevestig actie
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,online Veilingen
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Specificeer ofwel Hoeveelheid of Waarderingstarief of beide
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Vervulling
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Bekijk in winkelwagen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Marketingkosten
 ,Item Shortage Report,Artikel Tekort Rapport
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Het gewicht wordt vermeld, \n Vermeld ""Gewicht UOM"" te"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Het gewicht wordt vermeld, \n Vermeld ""Gewicht UOM"" te"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiaal Aanvraag is gebruikt om deze Voorraad  Entry te maken
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Volgende Afschrijvingen Date is verplicht voor nieuwe aanwinst
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Afzonderlijke cursusgroep voor elke partij
@@ -1906,12 +1942,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Maak boekhoudkundige afschrijving voor elke Stock Movement
 DocType: Leave Allocation,Total Leaves Allocated,Totaal Verlofdagen Toegewezen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Warehouse vereist bij Row Geen {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Voer geldige boekjaar begin- en einddatum
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Voer geldige boekjaar begin- en einddatum
 DocType: Employee,Date Of Retirement,Pensioneringsdatum
 DocType: Upload Attendance,Get Template,Get Sjabloon
 DocType: Material Request,Transferred,overgedragen
 DocType: Vehicle,Doors,deuren
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext Setup is voltooid!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext Setup is voltooid!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Verzamelkosten voor patiëntregistratie
 DocType: Course Assessment Criteria,Weightage,Weging
 DocType: Purchase Invoice,Tax Breakup,Belastingverdeling
@@ -1930,37 +1966,37 @@
 DocType: Employee,AB+,AB+
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Als dit item heeft varianten, dan kan het niet worden geselecteerd in verkooporders etc."
 DocType: Lead,Next Contact By,Volgende Contact Door
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Benodigde hoeveelheid voor item {0} in rij {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Benodigde hoeveelheid voor item {0} in rij {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Magazijn {0} kan niet worden verwijderd als er voorraad is voor artikel {1}
 DocType: Quotation,Order Type,Order Type
-DocType: Purchase Invoice,Notification Email Address,Notificatie e-mailadres
 ,Item-wise Sales Register,Artikelgebaseerde Verkoop Register
 DocType: Asset,Gross Purchase Amount,Gross Aankoopbedrag
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Opening Saldi
 DocType: Asset,Depreciation Method,afschrijvingsmethode
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,offline
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Is dit inbegrepen in de Basic Rate?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Totaal Doel
 DocType: Job Applicant,Applicant for a Job,Aanvrager van een baan
 DocType: Production Plan Material Request,Production Plan Material Request,Productie Plan Materiaal aanvragen
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Geen productieorders aangemaakt
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Geen productieorders aangemaakt
 DocType: Stock Reconciliation,Reconciliation JSON,Aflettering JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Teveel kolommen. Exporteer het rapport en druk het af via een Spreadsheet programma.
 DocType: Purchase Invoice Item,Batch No,Partij nr.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Verzoek om offerte: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Kunnen meerdere verkooporders tegen een klant bestelling
 DocType: Student Group Instructor,Student Group Instructor,Student Groep Instructeur
 DocType: Student Group Instructor,Student Group Instructor,Student Groep Instructeur
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Hoofd
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Hoofd
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Instellen voorvoegsel voor nummerreeksen voor uw transacties
 DocType: Employee Attendance Tool,Employees HTML,medewerkers HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) moet actief voor dit artikel of zijn template
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) moet actief voor dit artikel of zijn template
 DocType: Employee,Leave Encashed?,Verlof verzilverd?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"""Opportuniteit Van"" veld is verplicht"
 DocType: Email Digest,Annual Expenses,jaarlijkse kosten
 DocType: Item,Variants,Varianten
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Maak inkooporder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Maak inkooporder
 DocType: SMS Center,Send To,Verzenden naar
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Er is niet genoeg verlofsaldo voor Verlof type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Toegewezen bedrag
@@ -1978,6 +2014,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Studentengroep Sterkte
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Tegen Journal Entry {0} heeft geen ongeëvenaarde {1} binnenkomst hebben
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,taxaties
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Trainingsevenementen
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Dubbel Serienummer ingevoerd voor Artikel {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Een voorwaarde voor een Verzendregel
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Kom binnen alstublieft
@@ -1987,7 +2024,7 @@
 DocType: Sales Order,To Deliver and Bill,Te leveren en Bill
 DocType: Student Group,Instructors,instructeurs
 DocType: GL Entry,Credit Amount in Account Currency,Credit Bedrag in account Valuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,Stuklijst {0} moet worden ingediend
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,Stuklijst {0} moet worden ingediend
 DocType: Authorization Control,Authorization Control,Autorisatie controle
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Rij # {0}: Afgekeurd Warehouse is verplicht tegen verworpen Item {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Betaling
@@ -2006,11 +2043,11 @@
 DocType: Quotation Item,Actual Qty,Werkelijk aantal
 DocType: Sales Invoice Item,References,Referenties
 DocType: Quality Inspection Reading,Reading 10,Meting 10
-DocType: Hub Settings,Hub Node,Hub Node
+DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,U hebt dubbele artikelen ingevoerd. Aub aanpassen en opnieuw proberen.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,associëren
 DocType: Asset Movement,Asset Movement,Asset Movement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,nieuwe winkelwagen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,nieuwe winkelwagen
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Artikel {0} is geen seriegebonden artikel
 DocType: SMS Center,Create Receiver List,Maak Ontvanger Lijst
 DocType: Vehicle,Wheels,Wheels
@@ -2024,15 +2061,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,telecommunicatie
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Geeft aan dat het pakket een onderdeel is van deze levering (alleen ontwerp)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Betalen Entry
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Hoeveelheid voor artikel {0} moet kleiner zijn dan {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Hoeveelheid voor artikel {0} moet kleiner zijn dan {1}
 ,Sales Invoice Trends,Verkoopfactuur Trends
 DocType: Leave Application,Apply / Approve Leaves,Toepassing / Goedkeuren Leaves
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Voor
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Voor
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Kan de rij enkel verwijzen bij het aanrekeningstype 'Hoeveelheid vorige rij' of 'Totaal vorige rij'
 DocType: Sales Order Item,Delivery Warehouse,Levering magazijn
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Boom van de financiële Cost Centers.
 DocType: Serial No,Delivery Document No,Leveringsdocument nr.
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Stel &#39;winst / verliesrekening op de verkoop van activa in Company {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Stel &#39;winst / verliesrekening op de verkoop van activa in Company {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Krijg items uit Aankoopfacturen
 DocType: Serial No,Creation Date,Aanmaakdatum
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Artikel {0} verschijnt meerdere keren in prijslijst {1}
@@ -2043,12 +2080,13 @@
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Heeft Varianten
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Update reactie
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},U heeft reeds geselecteerde items uit {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},U heeft reeds geselecteerde items uit {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naam van de verdeling per maand
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID is verplicht
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID is verplicht
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
-DocType: Purchase Invoice,Recurring Invoice,Terugkerende Factuur
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Hoog naar laag
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Selecteer eerst het programma
 DocType: Patient Appointment,Patient Age,Patiënt leeftijd
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Managing Projects
 DocType: Supplier,Supplier of Goods or Services.,Leverancier van goederen of diensten.
@@ -2056,8 +2094,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Standaard debiteurenrekening die gebruikt moet worden indien niet in Patiënt ingesteld om te reserveren.
 DocType: Vehicle Log,Fuel Price,Fuel Price
 DocType: Budget,Budget,Begroting
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Stel Open
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Fixed Asset punt moet een niet-voorraad artikel zijn.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Stel Open
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Fixed Asset punt moet een niet-voorraad artikel zijn.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget kan niet worden toegewezen tegen {0}, want het is geen baten of lasten rekening"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Bereikt
 DocType: Student Admission,Application Form Route,Aanvraagformulier Route
@@ -2071,12 +2109,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Artikel {0} is niet ingesteld voor serienummers. Controleer Artikelstam
 DocType: Maintenance Visit,Maintenance Time,Onderhoud Tijd
 ,Amount to Deliver,Bedrag te leveren
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Hetzelfde item is meerdere keren ingevoerd. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,De Term Start datum kan niet eerder dan het jaar startdatum van het studiejaar waarop de term wordt gekoppeld zijn (Academisch Jaar {}). Corrigeer de data en probeer het opnieuw.
 DocType: Guardian,Guardian Interests,Guardian Interesses
 DocType: Naming Series,Current Value,Huidige waarde
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Meerdere fiscale jaar bestaan voor de datum {0}. Stel onderneming in het fiscale jaar
 DocType: School Settings,Instructor Records to be created by,Instructor Records te creëren door
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} aangemaakt
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} aangemaakt
 DocType: Delivery Note Item,Against Sales Order,Tegen klantorder
 ,Serial No Status,Serienummer Status
 DocType: Payment Entry Reference,Outstanding,uitstekend
@@ -2087,10 +2126,10 @@
  groter dan of gelijk aan {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Dit is gebaseerd op voorraad beweging. Zie {0} voor meer informatie
 DocType: Pricing Rule,Selling,Verkoop
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Bedrag {0} {1} in mindering gebracht tegen {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Bedrag {0} {1} in mindering gebracht tegen {2}
 DocType: Employee,Salary Information,Salaris Informatie
 DocType: Sales Person,Name and Employee ID,Naam en Werknemer ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Vervaldatum mag niet voor de boekingsdatum zijn
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Vervaldatum mag niet voor de boekingsdatum zijn
 DocType: Website Item Group,Website Item Group,Website Artikel Groep
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Invoerrechten en Belastingen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Vul Peildatum in
@@ -2116,7 +2155,7 @@
 DocType: Issue,Resolution Details,Oplossing Details
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Toekenningen
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Acceptatiecriteria
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Vul Materiaal Verzoeken in de bovenstaande tabel
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Vul Materiaal Verzoeken in de bovenstaande tabel
 DocType: Item Attribute,Attribute Name,Attribuutnaam
 DocType: BOM,Show In Website,Toon in Website
 DocType: Shopping Cart Settings,Show Quantity in Website,Toon Hoeveelheid in Website
@@ -2125,7 +2164,7 @@
 DocType: Item Reorder,Check in (group),Check-in (groeps)
 ,Qty to Order,Aantal te bestellen
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","De rekening hoofd onder Aansprakelijkheid of Equity, waarbij winst / verlies zal worden geboekt"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Gantt-diagram van alle taken.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Gantt-diagram van alle taken.
 DocType: Opportunity,Mins to First Response,Minuten naar First Response
 DocType: Pricing Rule,Margin Type,marge Type
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} uren
@@ -2146,36 +2185,36 @@
 DocType: Patient,Surgical History,Chirurgische Geschiedenis
 DocType: Employee,Resignation Letter Date,Ontslagbrief Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Prijsbepalingsregels worden verder gefilterd op basis van aantal.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Stel de datum van aansluiting in voor werknemer {0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Stel de datum van aansluiting in voor werknemer {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Stel de datum van aansluiting in voor werknemer {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Stel de datum van aansluiting in voor werknemer {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Totaal Billing Bedrag (via Urenregistratie)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Terugkerende klanten Opbrengsten
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) moet de rol 'Onkosten Goedkeurder' hebben
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,paar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Selecteer BOM en Aantal voor productie
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Selecteer BOM en Aantal voor productie
 DocType: Asset,Depreciation Schedule,afschrijving Schedule
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Verkooppartneradressen en contactpersonen
 DocType: Bank Reconciliation Detail,Against Account,Tegen Rekening
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Halve dag datum moet zijn tussen Van Datum en To Date
 DocType: Maintenance Schedule Detail,Actual Date,Werkelijke Datum
 DocType: Item,Has Batch No,Heeft Batch nr.
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Jaarlijkse Billing: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Jaarlijkse Billing: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Goederen en Diensten Belasting (GST India)
 DocType: Delivery Note,Excise Page Number,Accijnzen Paginanummer
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Company, Van Datum en tot op heden is verplicht"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Krijg van raadpleging
 DocType: Asset,Purchase Date,aankoopdatum
 DocType: Employee,Personal Details,Persoonlijke Gegevens
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Stel &#39;Asset Afschrijvingen Cost Center&#39; in Company {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Stel &#39;Asset Afschrijvingen Cost Center&#39; in Company {0}
 ,Maintenance Schedules,Onderhoudsschema&#39;s
 DocType: Task,Actual End Date (via Time Sheet),Werkelijke Einddatum (via Urenregistratie)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Bedrag {0} {1} tegen {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Bedrag {0} {1} tegen {2} {3}
 ,Quotation Trends,Offerte Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Artikelgroep niet genoemd in Artikelstam voor Artikel {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Debet Om rekening moet een vordering-account
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Debet Om rekening moet een vordering-account
 DocType: Shipping Rule Condition,Shipping Amount,Verzendbedrag
 DocType: Supplier Scorecard Period,Period Score,Periode Score
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Voeg klanten toe
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Voeg klanten toe
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,In afwachting van Bedrag
 DocType: Lab Test Template,Special,speciaal
 DocType: Purchase Invoice Item,Conversion Factor,Conversiefactor
@@ -2183,13 +2222,14 @@
 ,Vehicle Expenses,Voertuig kosten
 DocType: Serial No,Invoice Details,Factuurgegevens
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Verwachtingswaarde na levensduur groter dan of gelijk aan {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Begin maar
+DocType: Hub Category,Hub Category,Hubcategorie
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Voertuig Aantal
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,De datum waarop terugkerende factuur stopt
 DocType: Employee Loan,Loan Amount,Leenbedrag
 DocType: Program Enrollment,Self-Driving Vehicle,Zelfrijdend voertuig
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Leverancier Scorecard Standing
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Rij {0}: Bill of Materials niet gevonden voor het artikel {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Rij {0}: Bill of Materials niet gevonden voor het artikel {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Totaal toegewezen bladeren {0} kan niet lager zijn dan die reeds zijn goedgekeurd bladeren {1} voor de periode
 DocType: Journal Entry,Accounts Receivable,Debiteuren
 ,Supplier-Wise Sales Analytics,Leverancier-gebaseerde Verkoop Analyse
@@ -2201,7 +2241,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Ouderlijke cursus (laat leeg, als dit niet deel uitmaakt van de ouderopleiding)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Laat leeg indien overwogen voor alle werknemer soorten
 DocType: Landed Cost Voucher,Distribute Charges Based On,Verdeel Toeslagen op basis van
-apps/erpnext/erpnext/hooks.py +131,Timesheets,timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,timesheets
 DocType: HR Settings,HR Settings,HR-instellingen
 DocType: Salary Slip,net pay info,nettoloon info
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Deze waarde is bijgewerkt in de standaard verkoopprijslijst.
@@ -2212,7 +2252,7 @@
 DocType: Patient,B Positive,B positief
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",Rij # {0}: Aantal moet 1 als item is een vaste activa. Gebruik aparte rij voor meerdere aantal.
 DocType: Leave Block List Allow,Leave Block List Allow,Laat Block List Laat
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr kan niet leeg of ruimte
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr kan niet leeg of ruimte
 DocType: Patient Medical Record,Patient Medical Record,Patient Medical Record
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Groep om Non-groep
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
@@ -2229,9 +2269,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Kan wisselkoers voor {0} tot {1} niet vinden voor de sleuteldatum {2}. Creëer alsjeblieft een valuta-wisselrecord
 DocType: POS Profile,Price List,Prijslijst
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} is nu het standaard Boekjaar. Ververs uw browser om de wijziging door te voeren .
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Declaraties
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Declaraties
 DocType: Issue,Support,Support
 ,BOM Search,BOM Zoeken
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Publiceer &#39;In voorraad&#39; of &#39;Niet op voorraad&#39; op Hub op basis van de voorraad die beschikbaar is in dit magazijn.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Sluiting (openen + Totalen)
 DocType: Vehicle,Fuel Type,Brandstoftype
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Omschrijf valuta Company
@@ -2243,16 +2284,16 @@
 DocType: Healthcare Settings,Remind Before,Herinner je alvast
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Eenheid Omrekeningsfactor is vereist in rij {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rij # {0}: Reference document moet een van Sales Order, verkoopfactuur of Inboeken zijn"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rij # {0}: Reference document moet een van Sales Order, verkoopfactuur of Inboeken zijn"
 DocType: Salary Component,Deduction,Aftrek
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Rij {0}: Van tijd en binnen Tijd is verplicht.
 DocType: Stock Reconciliation Item,Amount Difference,bedrag Verschil
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Item Prijs toegevoegd {0} in de prijslijst {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Item Prijs toegevoegd {0} in de prijslijst {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Vul Employee Id van deze verkoper
 DocType: Territory,Classification of Customers by region,Indeling van de klanten per regio
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Verschil Bedrag moet nul zijn
 DocType: Project,Gross Margin,Bruto Marge
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Vul eerst Productie Artikel in
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Vul eerst Productie Artikel in
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Berekende bankafschrift balans
 DocType: Normal Test Template,Normal Test Template,Normaal Testsjabloon
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Uitgeschakelde gebruiker
@@ -2262,21 +2303,22 @@
 DocType: Salary Slip,Total Deduction,Totaal Aftrek
 ,Production Analytics,Production Analytics
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Dit is gebaseerd op transacties tegen deze patiënt. Zie de tijdlijn hieronder voor details
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Kosten Bijgewerkt
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Kosten Bijgewerkt
 DocType: Employee,Date of Birth,Geboortedatum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Artikel {0} is al geretourneerd
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Boekjaar** staat voor een financieel jaar. Alle boekingen en andere belangrijke transacties worden bijgehouden in **boekjaar**.
 DocType: Opportunity,Customer / Lead Address,Klant / Lead Adres
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Leveranciers Scorecard Setup
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Waarschuwing: Ongeldig SSL certificaat op attachment {0}
-DocType: Student Admission,Eligibility,verkiesbaarheid
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Beoordeling plannaam
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Waarschuwing: Ongeldig SSL certificaat op attachment {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Leads u helpen om zaken, voeg al uw contacten en nog veel meer als uw leads"
 DocType: Production Order Operation,Actual Operation Time,Werkelijke Operatie Duur
 DocType: Authorization Rule,Applicable To (User),Van toepassing zijn op (Gebruiker)
 DocType: Purchase Taxes and Charges,Deduct,Aftrekken
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Functiebeschrijving
 DocType: Student Applicant,Applied,Toegepast
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Heropenen
 DocType: Sales Invoice Item,Qty as per Stock UOM,Aantal per Voorraad eenheid
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 Naam
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciale tekens behalve ""-"" ""."", ""#"", en ""/"" niet toegestaan in de reeks"
@@ -2288,7 +2330,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Productie Manager
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serienummer {0} is onder garantie tot {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Splits Vrachtbrief in pakketten.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Zendingen
+apps/erpnext/erpnext/hooks.py +107,Shipments,Zendingen
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Totaal toegewezen bedrag (Company Munt)
 DocType: Purchase Order Item,To be delivered to customer,Om de klant te leveren
 DocType: BOM,Scrap Material Cost,Scrap Materiaal Cost
@@ -2310,8 +2352,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Item Variant Settings
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Selecteer Bedrijf ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Laat leeg indien dit voor alle afdelingen is
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Vormen van dienstverband (permanent, contract, stage, etc. ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} is verplicht voor Artikel {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Vormen van dienstverband (permanent, contract, stage, etc. ) ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} is verplicht voor Artikel {1}
 DocType: Process Payroll,Fortnightly,van twee weken
 DocType: Currency Exchange,From Currency,Van Valuta
 DocType: Vital Signs,Weight (In Kilogram),Gewicht (in kilogram)
@@ -2336,7 +2378,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Klik op 'Genereer Planning' om planning te krijgen
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Er zijn fouten opgetreden tijdens het verwijderen van volgende schema:
 DocType: Bin,Ordered Quantity,Bestelde hoeveelheid
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","bijv. ""Bouwgereedschap voor bouwers """
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","bijv. ""Bouwgereedschap voor bouwers """
 DocType: Grading Scale,Grading Scale Intervals,Grading afleeseenheden
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Accounting Entry voor {2} kan alleen worden gemaakt in valuta: {3}
 DocType: Production Order,In Process,In Process
@@ -2360,11 +2402,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Met betaling van de belasting
 DocType: Expense Claim Detail,Expense Claim Detail,Kostendeclaratie Detail
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICATE VOOR LEVERANCIER
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Selecteer juiste account
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Selecteer juiste account
 DocType: Item,Weight UOM,Gewicht Eenheid
 DocType: Salary Structure Employee,Salary Structure Employee,Salarisstructuur Employee
 DocType: Patient,Blood Group,Bloedgroep
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,In afwachting van
 DocType: Course,Course Name,Cursus naam
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Gebruikers die verlofaanvragen een bepaalde werknemer kan goedkeuren
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Kantoor Apparatuur
@@ -2383,7 +2424,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,De prijzen zullen niet worden weergegeven als prijslijst niet is ingesteld
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Geef aub een land dat voor deze verzending Rule of kijk Wereldwijde verzending
 DocType: Stock Entry,Total Incoming Value,Totaal Inkomende Waarde
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Debet Om vereist
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Debet Om vereist
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets helpen bijhouden van de tijd, kosten en facturering voor activiteiten gedaan door uw team"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Purchase Price List
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Sjablonen van leveranciers scorecard variabelen.
@@ -2393,7 +2434,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Afletteren
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Selecteer de naam van de Verantwoordelijk Persoon
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,technologie
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Totaal Onbetaalde: {0}
+DocType: Hub Settings,Unregister from Hub,Afmelden bij Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Totaal Onbetaalde: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Website Operation
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Aanbod Letter
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Genereer Materiaal Aanvragen (MRP) en Productieorders.
@@ -2405,7 +2447,9 @@
 DocType: Physician Schedule Time Slot,To Time,Tot Tijd
 DocType: Authorization Rule,Approving Role (above authorized value),Goedkeuren Rol (boven de toegestane waarde)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Credit Om rekening moet een betalend account zijn
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},Stuklijst recursie: {0} mag niet ouder of kind zijn van {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Selecteer een studententoelating die verplicht is voor de betaalde student-aanvrager
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},Stuklijst recursie: {0} mag niet ouder of kind zijn van {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Selecteer een prijslijst om prijzen te publiceren
 DocType: Production Order Operation,Completed Qty,Voltooid aantal
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Voor {0}, kan alleen debet accounts worden gekoppeld tegen een andere creditering"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Prijslijst {0} is uitgeschakeld
@@ -2418,39 +2462,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serienummers vereist voor post {1}. U hebt verstrekt {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Huidige Valuation Rate
 DocType: Item,Customer Item Codes,Customer Item Codes
+DocType: Training Event,Advance,Van te voren
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,om weer terug te keren.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange winst / verlies
 DocType: Opportunity,Lost Reason,Reden van verlies
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nieuw adres
 DocType: Quality Inspection,Sample Size,Monster grootte
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Vul Ontvangst Document
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Alle items zijn reeds gefactureerde
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Geef een geldig 'Van Zaaknummer'
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',Geef een geldig 'Van Zaaknummer'
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Verdere kostenplaatsen kan in groepen worden gemaakt, maar items kunnen worden gemaakt tegen niet-Groepen"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Gebruikers en machtigingen
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Productieorders Gemaakt: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Productieorders Gemaakt: {0}
 DocType: Branch,Branch,Tak
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Printen en Branding
 DocType: Company,Total Monthly Sales,Totale maandelijkse omzet
 DocType: Bin,Actual Quantity,Werkelijke hoeveelheid
 DocType: Shipping Rule,example: Next Day Shipping,Bijvoorbeeld: Next Day Shipping
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serienummer {0} niet gevonden
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Abonnement is {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Abonnement is {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Fee Schedule Programma
 DocType: Fee Schedule Program,Student Batch,student Batch
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,selecteer * van `tabVital Signs` waar patiënt = &#39;{0}&#39; bestellen door signs_date desc limit 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,maak Student
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Min Grade
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},U bent uitgenodigd om mee te werken aan het project: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Arts niet beschikbaar op {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},U bent uitgenodigd om mee te werken aan het project: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Arts niet beschikbaar op {0}
 DocType: Leave Block List Date,Block Date,Blokeer Datum
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Voeg aangepaste veld-abonnement-id toe in de doctype {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Leveranciersleveringsnota
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Nu toepassen
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Nu toepassen
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Werkelijk Aantal {0} / Aantal Wachten {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Werkelijk Aantal {0} / Aantal Wachten {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-commerce GSTIN
 DocType: Sales Order,Not Delivered,Niet geleverd
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Verwachte datum kan niet vóór Transactiedatum zijn
 ,Bank Clearance Summary,Bankbewaring samenvatting
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Aanmaken en beheren van dagelijkse, wekelijkse en maandelijkse e-mail samenvattingen."
 DocType: Appraisal Goal,Appraisal Goal,Beoordeling Doel
@@ -2458,12 +2503,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Gebouwen
 DocType: Fee Schedule,Fee Structure,fee Structuur
 DocType: Timesheet Detail,Costing Amount,Costing Bedrag
-DocType: Student Admission,Application Fee,Aanvraagkosten
+DocType: Student Admission Program,Application Fee,Aanvraagkosten
 DocType: Process Payroll,Submit Salary Slip,Indienen salarisstrook
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maximum korting voor artikel {0} is {1} %
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Maximum korting voor artikel {0} is {1} %
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import in bulk
 DocType: Sales Partner,Address & Contacts,Adres & Contacten
 DocType: SMS Log,Sender Name,Naam afzender
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Sorteren op criteria
 DocType: POS Profile,[Select],[Selecteer]
 DocType: Vital Signs,Blood Pressure (diastolic),Bloeddruk (diastolische)
 DocType: SMS Log,Sent To,Verzenden Naar
@@ -2472,7 +2518,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Volgende Contact datum kan niet in het verleden
 DocType: Company,For Reference Only.,Alleen voor referentie.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Arts {0} niet beschikbaar op {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Selecteer batchnummer
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Selecteer batchnummer
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ongeldige {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-terugwerkende
 DocType: Fee Validity,Reference Inv,Referentie Inv
@@ -2488,15 +2534,15 @@
 DocType: Normal Test Items,Require Result Value,Vereiste resultaatwaarde
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Zaak nr. mag geen 0
 DocType: Item,Show a slideshow at the top of the page,Laat een diavoorstelling zien aan de bovenkant van de pagina
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Winkels
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Winkels
 DocType: Project Type,Projects Manager,Projecten Manager
 DocType: Serial No,Delivery Time,Levertijd
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Vergrijzing Based On
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Benoeming geannuleerd
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Benoeming geannuleerd
 DocType: Item,End of Life,End of Life
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,reizen
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Geen actieve of default salarisstructuur gevonden voor werknemer {0} de uitgekozen datum
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,reizen
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Geen actieve of default salarisstructuur gevonden voor werknemer {0} de uitgekozen datum
 DocType: Leave Block List,Allow Users,Gebruikers toestaan
 DocType: Purchase Order,Customer Mobile No,Klant Mobile Geen
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Terugkerende
@@ -2505,12 +2551,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Kosten bijwerken
 DocType: Item Reorder,Item Reorder,Artikel opnieuw ordenen
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Show loonstrook
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Verplaats Materiaal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Verplaats Materiaal
 DocType: Fees,Send Payment Request,Verzend betalingsverzoek
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Geef de operaties, operationele kosten en geef een unieke operatienummer aan uw activiteiten ."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dit document is dan limiet van {0} {1} voor punt {4}. Bent u het maken van een andere {3} tegen dezelfde {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Stel terugkerende na het opslaan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Selecteer verandering bedrag rekening
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Selecteer verandering bedrag rekening
 DocType: Purchase Invoice,Price List Currency,Prijslijst Valuta
 DocType: Naming Series,User must always select,Gebruiker moet altijd kiezen
 DocType: Stock Settings,Allow Negative Stock,Laat Negatieve voorraad
@@ -2530,7 +2576,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Werknemer
 DocType: Sample Collection,Collected Time,Verzamelde tijd
 DocType: Company,Sales Monthly History,Verkoop Maandelijkse Geschiedenis
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Selecteer batch
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Selecteer batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} is volledig gefactureerd
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Vital Signs
 DocType: Training Event,End Time,Eindtijd
@@ -2538,16 +2584,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Betaling Aftrek of verlies
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standaard contractvoorwaarden voor Verkoop of Inkoop .
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Groep volgens Voucher
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Weet je zeker dat je deze afspraak wilt annuleren?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Sales Pipeline
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Stel standaard account aan Salaris Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Vereist op
 DocType: Rename Tool,File to Rename,Bestand naar hernoemen
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Selecteer BOM voor post in rij {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Selecteer BOM voor post in rij {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Rekening {0} komt niet overeen met Bedrijf {1} in Rekeningmodus: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Gespecificeerde Stuklijst {0} bestaat niet voor Artikel {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Onderhoudsschema {0} moet worden geannuleerd voordat het annuleren van deze verkooporder
+DocType: POS Profile,Applicable for Users,Toepasbaar voor gebruikers
 DocType: Notification Control,Expense Claim Approved,Kostendeclaratie Goedgekeurd
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Loonstrook van de werknemer {0} al gemaakt voor deze periode
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Loonstrook van de werknemer {0} al gemaakt voor deze periode
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Farmaceutisch
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kosten van gekochte artikelen
 DocType: Selling Settings,Sales Order Required,Verkooporder Vereist
@@ -2571,6 +2619,7 @@
 DocType: Offer Letter,Accepted,Geaccepteerd
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Organisatie
 DocType: BOM Update Tool,BOM Update Tool,BOM Update Tool
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Partyaccount niet opgegeven, stel het standaard partyaccount in het bedrijf in"
 DocType: SG Creation Tool Course,Student Group Name,Student Group Name
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Fees creëren
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Zorg ervoor dat u echt wilt alle transacties voor dit bedrijf te verwijderen. Uw stamgegevens zal blijven zoals het is. Deze actie kan niet ongedaan gemaakt worden.
@@ -2579,29 +2628,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kan niet groter zijn dan geplande hoeveelheid ({2}) in productieorders {3}
 DocType: Shipping Rule,Shipping Rule Label,Verzendregel Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Gebruikers Forum
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Grondstoffen kan niet leeg zijn.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Kon niet bijwerken voorraad, factuur bevat daling van de scheepvaart punt."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Grondstoffen kan niet leeg zijn.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Kon niet bijwerken voorraad, factuur bevat daling van de scheepvaart punt."
 DocType: Lab Test Sample,Lab Test Sample,Lab Test Sample
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,U kunt het tarief niet veranderen als een artikel Stuklijst-gerelateerd is.
+DocType: Restaurant,Invoice Series Prefix,Prefix voor factuurreeks
 DocType: Employee,Previous Work Experience,Vorige Werkervaring
 DocType: Stock Entry,For Quantity,Voor Aantal
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Vul Gepland Aantal in voor artikel {0} op rij {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Vul Gepland Aantal in voor artikel {0} op rij {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} is niet ingediend
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Artikelaanvragen
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Een aparte Productie Order zal worden aangemaakt voor elk gereed product artikel
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} moet negatief zijn in teruggave document
 ,Minutes to First Response for Issues,Minuten naar First Response voor problemen
 DocType: Purchase Invoice,Terms and Conditions1,Algemene Voorwaarden1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,De naam van het instituut waarvoor u het opzetten van dit systeem.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,De naam van het instituut waarvoor u het opzetten van dit systeem.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Boekingen bevroren tot deze datum, niemand kan / de boeking wijzigen behalve de hieronder gespecificeerde rol."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Sla het document op voordat u het onderhoudsschema genereert
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Laatste prijs bijgewerkt in alle BOM&#39;s
 DocType: Fee Schedule,Successful,geslaagd
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Project Status
 DocType: UOM,Check this to disallow fractions. (for Nos),Aanvinken om delingen te verbieden.
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,De volgende productieorders zijn gemaakt:
-DocType: Student Admission,Naming Series (for Student Applicant),Naming Series (voor Student Aanvrager)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,De volgende productieorders zijn gemaakt:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Naming Series (voor Student Aanvrager)
 DocType: Delivery Note,Transporter Name,Vervoerder Naam
 DocType: Authorization Rule,Authorized Value,Authorized Value
 DocType: BOM,Show Operations,Toon Operations
@@ -2625,7 +2675,7 @@
 ,Employees working on a holiday,Werknemers die op vakantie
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Present
 DocType: Project,% Complete Method,% Voltooid Methode
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,drug
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,drug
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Onderhoud startdatum kan niet voor de leveringsdatum voor Serienummer {0}
 DocType: Production Order,Actual End Date,Werkelijke Einddatum
 DocType: BOM,Operating Cost (Company Currency),Bedrijfskosten (Company Munt)
@@ -2643,13 +2693,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Goedkeuring van Gebruiker kan niet hetzelfde zijn als gebruiker de regel is van toepassing op
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basistarief (per eenheid)
 DocType: SMS Log,No of Requested SMS,Aantal gevraagde SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Onbetaald verlof komt niet overeen met de goedgekeurde verlofaanvraag verslagen
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Onbetaald verlof komt niet overeen met de goedgekeurde verlofaanvraag verslagen
 DocType: Campaign,Campaign-.####,Campagne-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Volgende stappen
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Gelieve de opgegeven items aan de best mogelijke prijzen
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Maak Factuur
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto dicht Opportunity na 15 dagen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Aankooporders zijn niet toegestaan voor {0} door een scorecard van {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Aankooporders zijn niet toegestaan voor {0} door een scorecard van {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Eindjaar
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2657,6 +2707,7 @@
 DocType: Vital Signs,Nutrition Values,Voedingswaarden
 DocType: Lab Test Template,Is billable,Is facturabel
 DocType: Delivery Note,DN-,DN
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Zowel &quot;Physician Schedule&quot; als Time Per Appointment &quot;moeten zijn ingesteld voor Dr. {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Een derde partij distributeur / dealer / commissionair / affiliate / reseller die uw producten voor een commissie verkoopt.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} tegen Inkooporder {1}
 DocType: Patient,Patient Demographics,Patient Demographics
@@ -2706,7 +2757,6 @@
  10. Toe te voegen of Trek: Of u wilt toevoegen of aftrekken van de belasting."
 DocType: Homepage,Homepage,Startpagina
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Selecteer arts ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',update tabConsultation set factuur = &#39;{0}&#39; waar naam = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Benodigde hoeveelheid
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Fee Records Gemaakt - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Categorie Account
@@ -2718,7 +2768,7 @@
 DocType: Asset,Manual,handboek
 DocType: Salary Component Account,Salary Component Account,Salaris Component Account
 DocType: Global Defaults,Hide Currency Symbol,Verberg Valutasymbool
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","bijv. Bank, Kas, Credit Card"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","bijv. Bank, Kas, Credit Card"
 DocType: Lead Source,Source Name,Bron naam
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Normale rustende bloeddruk bij een volwassene is ongeveer 120 mmHg systolisch en 80 mmHg diastolisch, afgekort &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Creditnota
@@ -2737,16 +2787,16 @@
 DocType: Patient,Occupation,Bezetting
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Rij {0} : Start Datum moet voor Einddatum zijn
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Totaal (Aantal)
-DocType: Sales Invoice,This Document,Dit document
 DocType: Installation Note Item,Installed Qty,Aantal geïnstalleerd
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Dit kan zijn door sommige ongeldige e-mailadressen in de
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Jij voegde toe
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,training Resultaat
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,training Resultaat
 DocType: Purchase Invoice,Is Paid,Is betaald
 DocType: Salary Structure,Total Earning,Totale Winst
 DocType: Purchase Receipt,Time at which materials were received,Tijdstip waarop materialen zijn ontvangen
 DocType: Stock Ledger Entry,Outgoing Rate,Uitgaande Rate
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Organisatie tak meester .
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Organisatie tak meester .
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,of
 DocType: Sales Order,Billing Status,Factuurstatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Issue melden?
@@ -2761,7 +2811,8 @@
 DocType: Notification Control,Sales Order Message,Verkooporder Bericht
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Instellen Standaardwaarden zoals Bedrijf , Valuta , huidige boekjaar , etc."
 DocType: Payment Entry,Payment Type,Betaling Type
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selecteer een partij voor item {0}. Kan geen enkele batch vinden die aan deze eis voldoet
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selecteer een partij voor item {0}. Kan geen enkele batch vinden die aan deze eis voldoet
+DocType: Hub Category,Parent Category,Bovenliggende categorie
 DocType: Process Payroll,Select Employees,Selecteer Medewerkers
 DocType: Opportunity,Potential Sales Deal,Potentiële Sales Deal
 DocType: Complaint,Complaints,klachten
@@ -2799,7 +2850,7 @@
 DocType: Bin,Reserved Quantity,Gereserveerde Hoeveelheid
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Vul alstublieft een geldig e-mailadres in
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Vul alstublieft een geldig e-mailadres in
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Selecteer een item in de winkelwagen
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Selecteer een item in de winkelwagen
 DocType: Landed Cost Voucher,Purchase Receipt Items,Ontvangstbevestiging Artikelen
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Aanpassen Formulieren
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,achterstand
@@ -2809,15 +2860,15 @@
 DocType: Payment Request,Amount in customer's currency,Bedrag in de valuta van de klant
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Levering
 DocType: Stock Reconciliation Item,Current Qty,Huidige Aantal
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Leveranciers toevoegen
+DocType: Restaurant Menu,Restaurant Menu,Restaurant Menu
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Vorige
 DocType: Appraisal Goal,Key Responsibility Area,Key verantwoordelijkheid Area
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Student Batches helpen bijhouden opkomst, evaluaties en kosten voor studenten"
 DocType: Payment Entry,Total Allocated Amount,Totaal toegewezen bedrag
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Stel standaard inventaris rekening voor permanente inventaris
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Stel standaard inventaris rekening voor permanente inventaris
 DocType: Item Reorder,Material Request Type,Materiaal Aanvraag Type
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural Journal Entry voor de salarissen van {0} tot {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage vol is, niet te redden"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage vol is, niet te redden"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Rij {0}: Verpakking Conversie Factor is verplicht
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Kamer capaciteit
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref
@@ -2856,16 +2907,18 @@
 DocType: Project,Task Completion,Task Completion
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Niet op voorraad
 DocType: Appraisal,HR User,HR Gebruiker
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Belastingen en Toeslagen Afgetrokken
-apps/erpnext/erpnext/hooks.py +129,Issues,Kwesties
+apps/erpnext/erpnext/hooks.py +138,Issues,Kwesties
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status moet één zijn van {0}
 DocType: Sales Invoice,Debit To,Debitering van
+DocType: Restaurant Menu Item,Restaurant Menu Item,Restaurant Menu-item
 DocType: Delivery Note,Required only for sample item.,Alleen benodigd voor Artikelmonster.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Werkelijke Aantal Na Transactie
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Geen loonstrook gevonden tussen {0} en {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Geen loonstrook gevonden tussen {0} en {1}
 ,Pending SO Items For Purchase Request,In afwachting van Verkoop Artikelen voor Inkoopaanvraag
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,studentenadministratie
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} is uitgeschakeld
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,studentenadministratie
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} is uitgeschakeld
 DocType: Supplier,Billing Currency,Valuta
 DocType: Sales Invoice,SINV-RET-,SINV-terugwerkende
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Extra Groot
@@ -2888,6 +2941,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Vermeld het benodigde aantal bezoeken
 DocType: Stock Settings,Default Valuation Method,Standaard Waarderingsmethode
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,honorarium
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Update wordt uitgevoerd. Het kan even duren.
 DocType: Vehicle Log,Fuel Qty,brandstof Aantal
 DocType: Production Order Operation,Planned Start Time,Geplande Starttijd
 DocType: Course,Assessment,Beoordeling
@@ -2903,7 +2957,7 @@
 DocType: Price List,Price List Master,Prijslijst Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alle Verkoop Transacties kunnen worden gelabeld tegen meerdere ** Sales Personen **, zodat u kunt instellen en controleren doelen."
 ,S.O. No.,VO nr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Maak Klant van Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Maak Klant van Lead {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Selecteer Patiënt
 DocType: Price List,Applicable for Countries,Toepasselijk voor Landen
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Parameter Naam
@@ -2947,27 +3001,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Kosten- / Verschillenrekening ({0}) moet een 'Winst of Verlies' rekening zijn.
 DocType: Project,Copied From,Gekopieerd van
 DocType: Project,Copied From,Gekopieerd van
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Naam fout: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Tekort
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Naam fout: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,Tekort
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} niet gekoppeld aan {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Aanwezigheid voor werknemer {0} is al gemarkeerd
 DocType: Packing Slip,If more than one package of the same type (for print),Als er meer dan een pakket van hetzelfde type (voor afdrukken)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Stel de standaardklant in in restaurantinstellingen
 ,Salary Register,salaris Register
 DocType: Warehouse,Parent Warehouse,Parent Warehouse
 DocType: C-Form Invoice Detail,Net Total,Netto Totaal
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Standaard BOM niet gevonden voor Item {0} en Project {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Standaard BOM niet gevonden voor Item {0} en Project {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Definieer verschillende soorten lening
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Openstaand Bedrag
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Tijd (in minuten)
 DocType: Project Task,Working,Werkzaam
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Voorraad rij (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Financieel jaar
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Financieel jaar
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} behoort niet tot Bedrijf {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,Kan de criteria score functie voor {0} niet oplossen. Zorg ervoor dat de formule geldig is.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Kosten Op
 DocType: Healthcare Settings,Out Patient Settings,Out Patient Settings
 DocType: Account,Round Off,Afronden
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,De hoeveelheid moet positief zijn
 ,Requested Qty,Aangevraagde Hoeveelheid
 DocType: Tax Rule,Use for Shopping Cart,Gebruik voor de Winkelwagen
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Waarde {0} voor Attribute {1} bestaat niet in de lijst van geldige Punt Attribute Values voor post {2}
@@ -2976,7 +3032,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Kosten zullen worden proportioneel gedistribueerd op basis van punt aantal of de hoeveelheid, als per uw selectie"
 DocType: Maintenance Visit,Purposes,Doeleinden
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Minstens één punt moet in ruil document worden ingevoerd met een negatieve hoeveelheid
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Cursussen toevoegen
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} langer dan alle beschikbare werktijd in werkstation {1}, breken de operatie in meerdere operaties"
 ,Requested,Aangevraagd
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Geen Opmerkingen
@@ -2988,6 +3043,8 @@
 DocType: Employee Loan,Repaid/Closed,Afgelost / Gesloten
 DocType: Item,Total Projected Qty,Totale geraamde Aantal
 DocType: Monthly Distribution,Distribution Name,Distributie Naam
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Leverancier&gt; leverancier type
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Waarderingspercentage niet gevonden voor het item {0}, die vereist is om boekhoudkundige vermeldingen voor {1} {2} te doen. Als het item als een nulwaarderingspercentage in de {1} wordt verwerkt, vermeld dan dat in de {1} Item tabel. Anders kunt u een inkomende voorraadtransactie voor het item maken of een waarderingspercentage vermelden in het Item-record, en probeer dan deze invoer te verzenden / annuleren"
 DocType: Course,Course Code,cursus Code
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Kwaliteitscontrole vereist voor Artikel {0}
 DocType: POS Settings,Use POS in Offline Mode,Gebruik POS in de offline modus
@@ -2998,14 +3055,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Beheer Grondgebied Boom.
 DocType: Journal Entry Account,Sales Invoice,Verkoopfactuur
 DocType: Journal Entry Account,Party Balance,Partij Balans
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,Selecteer Apply Korting op
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Selecteer Apply Korting op
 DocType: Company,Default Receivable Account,Standaard Vordering Account
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Maak Bank Entry voor het totale salaris betaald voor de hierboven geselecteerde criteria
 DocType: Physician,Physician Schedule,Arts schema
 DocType: Purchase Invoice,Deemed Export,Geachte export
 DocType: Stock Entry,Material Transfer for Manufacture,Materiaal Verplaatsing voor Productie
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Kortingspercentage kan worden toegepast tegen een prijslijst of voor alle prijslijsten.
-DocType: Purchase Invoice,Half-yearly,Halfjaarlijks
+DocType: Subscription,Half-yearly,Halfjaarlijks
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Boekingen voor Voorraad
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,U heeft al beoordeeld op de beoordelingscriteria {}.
@@ -3034,13 +3091,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Extra Small
 DocType: Company,Standard Template,Standard Template
 DocType: Training Event,Theory,Theorie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Waarschuwing: Materiaal Aanvraag Aantal is minder dan Minimum Bestelhoeveelheid
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Waarschuwing: Materiaal Aanvraag Aantal is minder dan Minimum Bestelhoeveelheid
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Rekening {0} is bevroren
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Rechtspersoon / Dochteronderneming met een aparte Rekeningschema behoren tot de Organisatie.
 DocType: Payment Request,Mute Email,Mute-mail
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Voeding, Drank en Tabak"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Kan alleen betaling uitvoeren voor ongefactureerde {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Commissietarief kan niet groter zijn dan 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Kan alleen betaling uitvoeren voor ongefactureerde {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Commissietarief kan niet groter zijn dan 100
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Voer {0} eerste
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Geen antwoorden van
@@ -3058,10 +3115,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Kleur
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Assessment Plan Criteria
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Voorkom aankopen
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,vatbaar
 DocType: Patient Appointment,Scheduled,Geplande
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Aanvraag voor een offerte.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Installeer alsjeblieft het personeelsbestemmingssysteem in het menselijk hulpmiddel&gt; HR-instellingen
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Selecteer Item, waar &quot;Is Stock Item&quot; is &quot;Nee&quot; en &quot;Is Sales Item&quot; is &quot;Ja&quot; en er is geen enkel ander product Bundle"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Selecteer klant
 DocType: Student Log,Academic,Academisch
 DocType: Patient,Personal and Social History,Persoonlijke en sociale geschiedenis
 DocType: Fee Schedule,Fee Breakup for each student,Fee Breakup voor elke student
@@ -3071,7 +3129,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Waardering Tarief
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Prijslijst Valuta nog niet geselecteerd
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Prijslijst Valuta nog niet geselecteerd
 apps/erpnext/erpnext/config/healthcare.py +46,Results,resultaten
 ,Student Monthly Attendance Sheet,Student Maandelijkse presentielijst
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Werknemer {0} heeft reeds gesolliciteerd voor {1} tussen {2} en {3}
@@ -3087,7 +3145,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Beheer Verkoop Partners.
 DocType: Quality Inspection,Inspection Type,Inspectie Type
 DocType: Fee Validity,Visited yet,Nog bezocht
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Warehouses met bestaande transactie kan niet worden geconverteerd naar groep.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Warehouses met bestaande transactie kan niet worden geconverteerd naar groep.
 DocType: Assessment Result Tool,Result HTML,resultaat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Verloopt op
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Studenten toevoegen
@@ -3114,7 +3172,7 @@
 DocType: Healthcare Settings,Result Printed,Resultaat afgedrukt
 DocType: Asset Category Account,Depreciation Expense Account,Afschrijvingen Account
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Proeftijd
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Bekijk {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Bekijk {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Alleen leaf nodes zijn toegestaan in transactie
 DocType: Expense Claim,Expense Approver,Onkosten Goedkeurder
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Rij {0}: Advance tegen Klant moet krediet
@@ -3126,7 +3184,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Om Datetime
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Cursus Roosters geschrapt:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Logs voor het behoud van sms afleverstatus
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Stel verkoop doel in
 DocType: Accounts Settings,Make Payment via Journal Entry,Betalen via Journal Entry
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Gedrukt op
 DocType: Item,Inspection Required before Delivery,Inspectie vereist voordat Delivery
@@ -3134,7 +3191,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Afwachting Activiteiten
 DocType: Patient Appointment,Reminded,herinnerd
 DocType: Patient,PID-,PID
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Uw organisatie
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Uw organisatie
 DocType: Fee Component,Fees Category,vergoedingen Categorie
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Vul het verlichten datum .
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
@@ -3146,7 +3203,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Bestelniveau
 DocType: Company,Chart Of Accounts Template,Rekeningschema Template
 DocType: Attendance,Attendance Date,Aanwezigheid Datum
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Item Prijs bijgewerkt voor {0} in prijslijst {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Item Prijs bijgewerkt voor {0} in prijslijst {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Salaris verbreken op basis Verdienen en Aftrek.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Rekening met onderliggende nodes kunnen niet worden omgezet naar grootboek
 DocType: Purchase Invoice Item,Accepted Warehouse,Geaccepteerd Magazijn
@@ -3162,9 +3219,10 @@
 ,Employee Birthday,Werknemer Verjaardag
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Batch Attendance Tool
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,Limit Crossed
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Geplande Tot
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Een wetenschappelijke term met deze &#39;Academisch Jaar&#39; {0} en &#39;Term Name&#39; {1} bestaat al. Wijzig deze ingangen en probeer het opnieuw.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Als er bestaande transacties tegen punt {0}, kunt u de waarde van het niet veranderen {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Als er bestaande transacties tegen punt {0}, kunt u de waarde van het niet veranderen {1}"
 DocType: UOM,Must be Whole Number,Moet heel getal zijn
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nieuwe Verloven Toegewezen (in dagen)
 DocType: Purchase Invoice,Invoice Copy,Factuurkopie
@@ -3174,7 +3232,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Factuurnummer
 DocType: Shopping Cart Settings,Orders,Bestellingen
 DocType: Employee Leave Approver,Leave Approver,Verlof goedkeurder
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Selecteer een batch alsjeblieft
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Selecteer een batch alsjeblieft
 DocType: Assessment Group,Assessment Group Name,Assessment Group Name
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Overgedragen materiaal voor vervaardiging
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Een gebruiker met ""Onkosten Goedkeurder"" rol"
@@ -3189,7 +3247,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Periode sluitpost
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Selecteer afdeling ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Kostenplaats met bestaande transacties kan niet worden omgezet in groep
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Bedrag {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Bedrag {0} {1} {2} {3}
 DocType: Account,Depreciation,Afschrijvingskosten
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverancier(s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Employee Attendance Tool
@@ -3201,10 +3259,12 @@
 DocType: GL Entry,Voucher No,Voucher nr.
 ,Lead Owner Efficiency,Leideneigenaar Efficiency
 ,Lead Owner Efficiency,Leideneigenaar Efficiency
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Meest populair
 DocType: Leave Allocation,Leave Allocation,Verlof Toewijzing
 DocType: Payment Request,Recipient Message And Payment Details,Ontvanger Bericht en betalingsgegevens
 DocType: Training Event,Trainer Email,trainer Email
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Materiaal Aanvragen {0} aangemaakt
+DocType: Restaurant Reservation,No of People,Nee van mensen
 DocType: Production Planning Tool,Include sub-contracted raw materials,Inclusief uitbesteed grondstoffen
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Sjabloon voor contractvoorwaarden
 DocType: Purchase Invoice,Address and Contact,Adres en contactgegevens
@@ -3213,10 +3273,11 @@
 DocType: Supplier,Last Day of the Next Month,Laatste dag van de volgende maand
 DocType: Support Settings,Auto close Issue after 7 days,Auto dicht Issue na 7 dagen
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Verlof kan niet eerder worden toegewezen {0}, als verlof balans al-carry doorgestuurd in de toekomst toewijzing verlof record is {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Opmerking: Vanwege / Reference Data overschrijdt toegestaan klantenkrediet dagen door {0} dag (en)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Opmerking: Vanwege / Reference Data overschrijdt toegestaan klantenkrediet dagen door {0} dag (en)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,student Aanvrager
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINEEL VOOR RECEPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,Cumulatieve afschrijvingen Rekening
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Deze email is autogenerated
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
 DocType: Program Enrollment,Boarding Student,Boarding Student
 DocType: Asset,Expected Value After Useful Life,Verwachte waarde Na Nuttig Life
@@ -3224,7 +3285,7 @@
 DocType: Activity Cost,Billing Rate,Billing Rate
 ,Qty to Deliver,Aantal te leveren
 ,Stock Analytics,Voorraad Analyses
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Operations kan niet leeg zijn
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Operations kan niet leeg zijn
 DocType: Maintenance Visit Purpose,Against Document Detail No,Tegen Document Detail nr
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Party Type is verplicht
 DocType: Quality Inspection,Outgoing,Uitgaande
@@ -3247,7 +3308,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Selecteer studenten handmatig voor de activiteit gebaseerde groep
 DocType: Journal Entry,User Remark,Gebruiker Opmerking
 DocType: Lead,Market Segment,Marktsegment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Betaalde bedrag kan niet groter zijn dan de totale negatieve openstaande bedrag {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Betaalde bedrag kan niet groter zijn dan de totale negatieve openstaande bedrag {0}
 DocType: Supplier Scorecard Period,Variables,Variabelen
 DocType: Employee Internal Work History,Employee Internal Work History,Werknemer Interne Werk Geschiedenis
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Sluiten (Db)
@@ -3276,21 +3337,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Blijf op de hoogte
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} behoort niet tot Company {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Materiaal Aanvraag {0} is geannuleerd of gestopt
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Laat management
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Laat management
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Groeperen volgens Rekening
 DocType: Sales Order,Fully Delivered,Volledig geleverd
 DocType: Lead,Lower Income,Lager inkomen
+DocType: Restaurant Order Entry,Current Order,Huidige bestelling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Bron- en doelmagazijn kan niet hetzelfde zijn voor de rij {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Verschil moet Account een type Asset / Liability rekening zijn, aangezien dit Stock Verzoening is een opening Entry"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Uitbetaalde bedrag kan niet groter zijn dan Leningen zijn {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Ga naar Programma&#39;s
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Inkoopordernummer nodig voor Artikel {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Productieorder niet gemaakt
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Productieorder niet gemaakt
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Van Datum' moet na 'Tot Datum' zijn
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Kan niet status als student te veranderen {0} is gekoppeld aan student toepassing {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Kan niet status als student te veranderen {0} is gekoppeld aan student toepassing {1}
 DocType: Asset,Fully Depreciated,volledig is afgeschreven
 ,Stock Projected Qty,Verwachte voorraad hoeveelheid
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Klant {0} behoort niet tot project {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Klant {0} behoort niet tot project {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Marked Attendance HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Offertes zijn voorstellen, biedingen u uw klanten hebben gestuurd"
 DocType: Sales Order,Customer's Purchase Order,Klant Bestelling
@@ -3301,8 +3363,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Stel Aantal geboekte afschrijvingen
 DocType: Supplier Scorecard Period,Calculations,berekeningen
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Waarde of Aantal
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Productions Bestellingen kunnen niet worden verhoogd voor:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Productions Bestellingen kunnen niet worden verhoogd voor:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,minuut
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel Naming Series in voor {0} via Setup&gt; Instellingen&gt; Serie benoemen
 DocType: Purchase Invoice,Purchase Taxes and Charges,Inkoop Belastingen en Toeslagen
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Ga naar leveranciers
 ,Qty to Receive,Aantal te ontvangen
@@ -3316,7 +3379,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Credit Om rekening moet een balansrekening zijn
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Alle Leverancier Types
 DocType: Global Defaults,Disable In Words,Uitschakelen In Woorden
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,Artikelcode is verplicht omdat Artikel niet automatisch is genummerd
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,Artikelcode is verplicht omdat Artikel niet automatisch is genummerd
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Offerte {0} niet van het type {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Onderhoudsschema Item
 DocType: Sales Order,%  Delivered,% Geleverd
@@ -3338,23 +3401,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Opening Balance Equity
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Verzoening
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,resterende
 DocType: Appraisal,Appraisal,Beoordeling
 DocType: Purchase Invoice,GST Details,GST Details
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},E-mail verzonden naar leverancier {0}
+DocType: Item,Default Sales Unit of Measure,Standaard Verkoopeenheid van Maatregel
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum wordt herhaald
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Geautoriseerd ondertekenaar
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Verlof goedkeurder moet een zijn van {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Fees maken
-DocType: Hub Settings,Seller Email,Verkoper Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Totale aanschafkosten (via Purchase Invoice)
 DocType: Training Event,Start Time,Starttijd
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Kies aantal
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Kies aantal
 DocType: Customs Tariff Number,Customs Tariff Number,Douanetariefnummer
 DocType: Patient Appointment,Patient Appointment,Patient Benoeming
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Goedkeuring Rol kan niet hetzelfde zijn als de rol van de regel is van toepassing op
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Afmelden bij dit e-mailoverzicht
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Afmelden bij dit e-mailoverzicht
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Ontvang leveranciers door
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} niet gevonden voor item {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Ga naar cursussen
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,bericht verzonden
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Rekening met de onderliggende knooppunten kan niet worden ingesteld als grootboek
@@ -3367,11 +3433,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Materiaal Overgedragen voor Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Rekening {0} bestaat niet
 DocType: Project,Project Type,Project Type
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Child Task bestaat voor deze taak. U kunt deze taak niet verwijderen.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Ofwel doelwit aantal of streefbedrag is verplicht.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Kosten van verschillende activiteiten
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Geen resultaten meer
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Kosten van verschillende activiteiten
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Instellen Events naar {0}, omdat de werknemer die aan de onderstaande Sales Personen die niet beschikt over een gebruikers-ID {1}"
 DocType: Timesheet,Billing Details,Billing Details
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Bron en doel magazijn moet verschillen
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Bron en doel magazijn moet verschillen
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Niet toegestaan om voorraadtransacties ouder dan  {0} bij te werken
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Volledig gefactureerd
@@ -3398,7 +3466,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,overboeking
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Alles aanvinken
 DocType: Vehicle Log,Invoice Ref,factuur Ref
-DocType: Purchase Order,Recurring Order,Terugkerende Bestel
 DocType: Company,Default Income Account,Standaard Inkomstenrekening
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Klantengroep / Klant
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed Boekjaren winst / verlies (Credit)
@@ -3412,9 +3479,9 @@
 DocType: Patient,A Negative,Een negatief
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Niets meer te zien.
 DocType: Lead,From Customer,Van Klant
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Oproepen
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Oproepen
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Een product
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,batches
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,batches
 DocType: Project,Total Costing Amount (via Time Logs),Totaal Costing bedrag (via Time Logs)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Maak een kostenplan
 DocType: Purchase Order Item Supplied,Stock UOM,Voorraad Eenheid
@@ -3439,7 +3506,7 @@
 DocType: School Settings,Current Academic Term,Huidige academische term
 DocType: School Settings,Current Academic Term,Huidige academische term
 DocType: Sales Order,Not Billed,Niet in rekening gebracht
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Beide magazijnen moeten tot hetzelfde bedrijf behoren
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Beide magazijnen moeten tot hetzelfde bedrijf behoren
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Nog geen contacten toegevoegd.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Vrachtkosten Voucher Bedrag
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Facturen van leveranciers.
@@ -3448,7 +3515,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Korting Bedrag
 DocType: Purchase Invoice,Return Against Purchase Invoice,Terug Tegen Purchase Invoice
 DocType: Item,Warranty Period (in days),Garantieperiode (in dagen)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',update `tabPatient Appointment` set sales_invoice = &#39;{0}&#39; waar naam = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Relatie met Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,De netto kasstroom uit operationele activiteiten
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punt 4
@@ -3457,8 +3523,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Dagboek rekening
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,student Group
 DocType: Shopping Cart Settings,Quotation Series,Offerte Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Een item bestaat met dezelfde naam ( {0} ) , wijzigt u de naam van het item groep of hernoem het item"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Maak een keuze van de klant
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Een item bestaat met dezelfde naam ( {0} ) , wijzigt u de naam van het item groep of hernoem het item"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Maak een keuze van de klant
 DocType: C-Form,I,ik
 DocType: Company,Asset Depreciation Cost Center,Asset Afschrijvingen kostenplaats
 DocType: Sales Order Item,Sales Order Date,Verkooporder Datum
@@ -3467,6 +3533,7 @@
 DocType: Assessment Plan,Assessment Plan,assessment Plan
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Klant {0} is gemaakt.
 DocType: Stock Settings,Limit Percent,Limit Procent
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Momenteel geen voorraad beschikbaar in een magazijn
 ,Payment Period Based On Invoice Date,Betaling Periode gebaseerd op factuurdatum
 DocType: Sample Collection,No. of print,Aantal afdrukken
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Ontbrekende Wisselkoersen voor {0}
@@ -3522,13 +3589,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Brutoloon - Total Aftrek - aflossing van de lening
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,Huidige Stuklijst en Nieuwe Stuklijst kunnen niet hetzelfde zijn
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Loonstrook ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Loonstrook ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Pensioneringsdatum moet groter zijn dan datum van indiensttreding
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Er waren fouten bij het plannen cursus over:
 DocType: Sales Invoice,Against Income Account,Tegen Inkomstenrekening
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Geleverd
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Bestelde aantal {1} kan niet kleiner dan de minimale afname {2} (gedefinieerd in punt) zijn.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Bestelde aantal {1} kan niet kleiner dan de minimale afname {2} (gedefinieerd in punt) zijn.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Maandelijkse Verdeling Percentage
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Meld u aan als een andere gebruiker.
 DocType: Territory,Territory Targets,Regio Doelen
 DocType: Delivery Note,Transporter Info,Vervoerder Info
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Stel default {0} in Company {1}
@@ -3536,13 +3604,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Dezelfde leverancier is meerdere keren ingevoerd
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Bruto winst / verlies
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Inkooporder Artikel geleverd
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Bedrijfsnaam kan niet bedrijf zijn
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Bedrijfsnaam kan niet bedrijf zijn
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Briefhoofden voor print sjablonen.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titels voor print sjablonen bijv. Proforma Factuur.
 DocType: Program Enrollment,Walking,wandelen
 DocType: Student Guardian,Student Guardian,student Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Soort waardering kosten kunnen niet zo Inclusive gemarkeerd
 DocType: POS Profile,Update Stock,Voorraad bijwerken
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,in het abonnement
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Verschillende eenheden voor artikelen zal leiden tot een onjuiste (Totaal) Netto gewicht. Zorg ervoor dat Netto gewicht van elk artikel in dezelfde eenheid is.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Stuklijst tarief
 DocType: Asset,Journal Entry for Scrap,Dagboek voor Productieverlies
@@ -3592,15 +3661,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Systeemgebruiker (login) ID. Indien ingesteld, zal het de standaard worden voor alle HR-formulieren."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Van {1}
 DocType: Task,depends_on,hangt af van
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,In afwachting van het bijwerken van de laatste prijs in alle Materialen. Het kan enkele minuten duren.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,In afwachting van het bijwerken van de laatste prijs in alle Materialen. Het kan enkele minuten duren.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,De naam van de nieuwe account. Let op: Gelieve niet goed voor klanten en leveranciers te creëren
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Landgebaseerde standaard adressjablonen
 DocType: Sales Order Item,Supplier delivers to Customer,Leverancier levert aan de Klant
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Vorm / Item / {0}) is niet op voorraad
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Verval- / Referentiedatum kan niet na {0} zijn
+,Sales Payment Summary,Samenvatting verkoopbetaling
+DocType: Restaurant,Restaurant,Restaurant
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Verval- / Referentiedatum kan niet na {0} zijn
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Gegevens importeren en exporteren
 DocType: Patient,Account Details,Account Details
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Geen studenten gevonden
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Geen studenten gevonden
 DocType: Medical Department,Medical Department,Medische Afdeling
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Scorecard Scoringscriteria voor leveranciers
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Factuur Boekingsdatum
@@ -3611,8 +3682,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Selecteer Boekingsdatum voordat Party selecteren
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Uit AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Selecteer alsjeblieft Offerte
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Selecteer alsjeblieft Offerte
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Selecteer alsjeblieft Offerte
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Selecteer alsjeblieft Offerte
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Aantal afschrijvingen geboekt kan niet groter zijn dan het totale aantal van de afschrijvingen zijn
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Maak Maintenance Visit
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,Neem dan contact op met de gebruiker die hebben Sales Master Manager {0} rol
@@ -3620,7 +3691,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Bedrijf ( geen klant of leverancier ) meester.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Dit is gebaseerd op de aanwezigheid van de Student
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Geen studenten in
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Voeg meer items of geopend volledige vorm
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Voeg meer items of geopend volledige vorm
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Vrachtbrief {0} moet worden geannuleerd voordat het annuleren van deze Verkooporder
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Ga naar gebruikers
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Betaald bedrag + Afgeschreven bedrag kan niet groter zijn dan Eindtotaal
@@ -3640,37 +3711,40 @@
 DocType: Fee Schedule,Fee Schedule,fee Schedule
 DocType: Hub Settings,Publish Availability,Publiceer Beschikbaarheid
 DocType: Company,Create Chart Of Accounts Based On,Maak rekeningschema op basis van
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Kan het niet omzetten naar een niet-groep. Kindertaken bestaan.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Geboortedatum mag niet groter zijn dan vandaag.
 ,Stock Ageing,Voorraad Veroudering
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Student {0} bestaat tegen student aanvrager {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Afronding aanpassing (bedrijfsmunt)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Rooster
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Rooster
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}'is uitgeschakeld
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Instellen als Open
 DocType: Cheque Print Template,Scanned Cheque,gescande Cheque
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Stuur automatische e-mails naar Contactpersonen op Indienen transacties.
 DocType: Timesheet,Total Billable Amount,Totaal bedrag Factureerbare
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punt 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Orderinvoer
 DocType: Purchase Order,Customer Contact Email,E-mail Contactpersoon Klant
 DocType: Warranty Claim,Item and Warranty Details,Item en garantie Details
 DocType: Sales Team,Contribution (%),Bijdrage (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Opmerking: De betaling wordt niet aangemaakt, aangezien de 'Kas- of Bankrekening' niet gespecificeerd is."
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Project {0} bestaat al
 DocType: Medical Department,Nursing User,Verpleegkundige gebruiker
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Verantwoordelijkheden
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Geldigheidsduur van deze offerte is beëindigd.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Geldigheidsduur van deze offerte is beëindigd.
 DocType: Expense Claim Account,Expense Claim Account,Declaratie Account
 DocType: Accounts Settings,Allow Stale Exchange Rates,Staale wisselkoersen toestaan
 DocType: Sales Person,Sales Person Name,Verkoper Naam
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Vul tenminste 1 factuur in in de tabel
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Gebruikers toevoegen
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Gebruikers toevoegen
 DocType: POS Item Group,Item Group,Artikelgroep
 DocType: Item,Safety Stock,Veiligheidsvoorraad
 DocType: Healthcare Settings,Healthcare Settings,Gezondheidszorginstellingen
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Voortgang% voor een taak kan niet meer dan 100 zijn.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Voortgang% voor een taak kan niet meer dan 100 zijn.
 DocType: Stock Reconciliation Item,Before reconciliation,Voordat verzoening
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Naar {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Belastingen en Toeslagen toegevoegd (Bedrijfsvaluta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Tax Rij {0} moet rekening houden met het type belasting of inkomsten of uitgaven of Chargeable
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Tax Rij {0} moet rekening houden met het type belasting of inkomsten of uitgaven of Chargeable
 DocType: Sales Order,Partly Billed,Deels Gefactureerd
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Item {0} moet een post der vaste activa zijn
 DocType: Item,Default BOM,Standaard Stuklijst
@@ -3686,6 +3760,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,Variabele
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Van Vrachtbrief
 DocType: Student,Student Email Address,Student e-mailadres
+DocType: Item,Hub Warehouse,Hub Warehouse
 DocType: Physician Schedule Time Slot,From Time,Van Tijd
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Op voorraad:
 DocType: Notification Control,Custom Message,Aangepast bericht
@@ -3694,9 +3769,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Studentenadres
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Studentenadres
 DocType: Purchase Invoice,Price List Exchange Rate,Prijslijst Wisselkoers
+DocType: POS Profile,POS Profile Name,POS-profielnaam
 DocType: Purchase Invoice Item,Rate,Tarief
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Adres naam
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Adres naam
 DocType: Stock Entry,From BOM,Van BOM
 DocType: Assessment Code,Assessment Code,assessment Code
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Basis
@@ -3710,11 +3786,12 @@
 DocType: Salary Slip,Salary Structure,Salarisstructuur
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,vliegmaatschappij
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Materiaal uitgeven
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Materiaal uitgeven
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Er is een fout opgetreden tijdens het maken van terugkerende
 DocType: Material Request Item,For Warehouse,Voor Magazijn
 DocType: Employee,Offer Date,Aanbieding datum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citaten
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Je bent in de offline modus. Je zult niet in staat om te herladen tot je opnieuw verbonden bent met het netwerk.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Je bent in de offline modus. Je zult niet in staat om te herladen tot je opnieuw verbonden bent met het netwerk.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Geen groepen studenten gecreëerd.
 DocType: Purchase Invoice Item,Serial No,Serienummer
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Maandelijks te betalen bedrag kan niet groter zijn dan Leningen zijn
@@ -3724,17 +3801,18 @@
 DocType: Salary Slip,Total Working Hours,Totaal aantal Werkuren
 DocType: Subscription,Next Schedule Date,Volgende schema datum
 DocType: Stock Entry,Including items for sub assemblies,Inclusief items voor sub assemblies
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Voer waarde moet positief zijn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Alle gebieden
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Voer waarde moet positief zijn
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Alle gebieden
 DocType: Purchase Invoice,Items,Artikelen
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student is reeds ingeschreven.
 DocType: Fiscal Year,Year Name,Jaar Naam
 DocType: Process Payroll,Process Payroll,Verwerk Salarisadministratie
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Er zijn meer vakanties dan werkdagen deze maand .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Er zijn meer vakanties dan werkdagen deze maand .
 DocType: Product Bundle Item,Product Bundle Item,Product Bundle Item
 DocType: Sales Partner,Sales Partner Name,Verkoop Partner Naam
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Verzoek om Offertes
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Verzoek om Offertes
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maximumfactuur Bedrag
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hematologie
 DocType: Normal Test Items,Normal Test Items,Normale Test Items
 DocType: Student Language,Student Language,student Taal
 apps/erpnext/erpnext/config/selling.py +23,Customers,Klanten
@@ -3746,10 +3824,11 @@
 DocType: Issue,Opening Time,Opening Tijd
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Van en naar data vereist
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & Commodity Exchanges
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standaard maateenheid voor Variant &#39;{0}&#39; moet hetzelfde zijn als in zijn Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standaard maateenheid voor Variant &#39;{0}&#39; moet hetzelfde zijn als in zijn Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Berekenen gebaseerd op
 DocType: Delivery Note Item,From Warehouse,Van Warehouse
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Geen Items met Bill of Materials voor fabricage
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Geen Items met Bill of Materials voor fabricage
+DocType: Restaurant,Default Customer,Standaard klant
 DocType: Assessment Plan,Supervisor Name,supervisor Naam
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Bevestig niet of afspraak voor dezelfde dag is gemaakt
 DocType: Program Enrollment Course,Program Enrollment Course,Programma Inschrijvingscursus
@@ -3777,7 +3856,7 @@
 DocType: Payment Entry,Internal Transfer,Interne overplaatsing
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Onderliggende rekening bestaat voor deze rekening. U kunt deze niet verwijderen .
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Ofwel doelwit aantal of streefbedrag is verplicht
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Er bestaat geen standaard Stuklijst voor Artikel {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Er bestaat geen standaard Stuklijst voor Artikel {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Selecteer Boekingsdatum eerste
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Openingsdatum moeten vóór Sluitingsdatum
 DocType: Leave Control Panel,Carry Forward,Carry Forward
@@ -3813,6 +3892,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Totaal Present
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,Boekhouding Jaarrekening
 DocType: Drug Prescription,Hour,uur
+DocType: Restaurant Order Entry,Last Sales Invoice,Laatste verkoopfactuur
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nieuw Serienummer kan geen Magazijn krijgen. Magazijn moet via Voorraad Invoer of Ontvangst worden ingesteld.
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,U bent niet bevoegd om afwezigheid goed te keuren op Block Dates
@@ -3849,65 +3929,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Gebruikers maken
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,Gram
 DocType: Supplier Scorecard,Per Month,Per maand
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Hoeveelheid voor fabricage moet groter dan 0 zijn.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Hoeveelheid voor fabricage moet groter dan 0 zijn.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Bezoek rapport voor onderhoud gesprek.
 DocType: Stock Entry,Update Rate and Availability,Update snelheid en beschikbaarheid
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Percentage dat u meer mag ontvangen of leveren dan de bestelde hoeveelheid. Bijvoorbeeld: Als u  100 eenheden heeft besteld en uw bandbreedte is 10% dan mag u 110 eenheden ontvangen.
 DocType: POS Customer Group,Customer Group,Klantengroep
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Nieuw batch-id (optioneel)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Nieuw batch-id (optioneel)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Nieuw batch-id (optioneel)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Nieuw batch-id (optioneel)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Kostenrekening is verplicht voor artikel {0}
 DocType: BOM,Website Description,Website Beschrijving
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Netto wijziging in het eigen vermogen
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Nieuwste
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Annuleer Purchase Invoice {0} eerste
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mailadres moet uniek zijn, bestaat al voor {0}"
 DocType: Serial No,AMC Expiry Date,AMC Vervaldatum
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,Ontvangst
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,Ontvangst
 ,Sales Register,Verkoopregister
 DocType: Daily Work Summary Settings Company,Send Emails At,Stuur e-mails
 DocType: Quotation,Quotation Lost Reason,Reden verlies van Offerte
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Kies uw domeinnaam
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',selecteer * van tabPatient waar naam = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Transactiereferentie geen {0} van {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Transactiereferentie geen {0} van {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Er is niets om te bewerken .
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Formulierweergave
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Samenvatting voor deze maand en in afwachting van activiteiten
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Formulierweergave
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Samenvatting voor deze maand en in afwachting van activiteiten
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Voeg gebruikers toe aan uw organisatie, behalve uzelf."
 DocType: Customer Group,Customer Group Name,Klant Groepsnaam
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Nog geen klanten!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Nog geen klanten!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Kasstroomoverzicht
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Geleende bedrag kan niet hoger zijn dan maximaal bedrag van de lening van {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licentie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Verwijder dit Invoice {0} van C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Verwijder dit Invoice {0} van C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Selecteer Carry Forward als u ook wilt opnemen vorige boekjaar uit balans laat dit fiscale jaar
 DocType: GL Entry,Against Voucher Type,Tegen Voucher Type
 DocType: Physician,Phone (R),Telefoon (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Tijdslots toegevoegd
 DocType: Item,Attributes,Attributen
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Sjabloon inschakelen
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel Naming Series in voor {0} via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Voer Afschrijvingenrekening in
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Laatste Bestel Date
 DocType: Patient,B Negative,B Negatief
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Account {0} behoort niet tot bedrijf {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Serienummers in rij {0} komt niet overeen met bezorgingsnota
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Serienummers in rij {0} komt niet overeen met bezorgingsnota
 DocType: Student,Guardian Details,Guardian Details
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Attendance voor meerdere medewerkers
 DocType: Vehicle,Chassis No,chassis Geen
 DocType: Payment Request,Initiated,Geïnitieerd
 DocType: Production Order,Planned Start Date,Geplande Startdatum
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Selecteer een stuklijst
 DocType: Serial No,Creation Document Type,Aanmaken Document type
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Einddatum moet groter zijn dan startdatum
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Einddatum moet groter zijn dan startdatum
 DocType: Leave Type,Is Encash,Is incasseren
 DocType: Leave Allocation,New Leaves Allocated,Nieuwe Verloven Toegewezen
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projectgegevens zijn niet beschikbaar voor Offertes
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Eindigt op
 DocType: Project,Expected End Date,Verwachte einddatum
 DocType: Budget Account,Budget Amount,budget Bedrag
 DocType: Appraisal Template,Appraisal Template Title,Beoordeling Template titel
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Van Date {0} Werknemersverzekeringen {1} kan niet vóór de toetreding tot Date werknemer {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,commercieel
 DocType: Patient,Alcohol Current Use,Alcohol Huidig Gebruik
+DocType: Student Admission Program,Student Admission Program,Studenten toelating programma
 DocType: Payment Entry,Account Paid To,Rekening betaald aan
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Ouder Item {0} moet een Stock Item niet
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Alle producten of diensten.
@@ -3916,30 +3998,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Budget voor Account {1} tegen {2} {3} is {4}. Het zal overschrijden tegen {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Rij {0} # Account moet van het type zijn &#39;Vaste Activa&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,out Aantal
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Regels om verzendkosten te berekenen voor een verkooptransactie
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,en unchcked Uitgeschakeld in de
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Reeks is verplicht
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financiële Dienstverlening
 DocType: Student Sibling,Student ID,student ID
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Soorten activiteiten voor Time Logs
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Leverancier Email
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Soorten activiteiten voor Time Logs
 DocType: Tax Rule,Sales,Verkoop
 DocType: Stock Entry Detail,Basic Amount,Basisbedrag
 DocType: Training Event,Exam,tentamen
 DocType: Complaint,Complaint,Klacht
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Magazijn nodig voor voorraad Artikel {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Magazijn nodig voor voorraad Artikel {0}
 DocType: Leave Allocation,Unused leaves,Ongebruikte afwezigheden
 DocType: Patient,Alcohol Past Use,Alcohol voorbij gebruik
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Billing State
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Verplaatsen
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Haal uitgeklapte Stuklijst op (inclusief onderdelen)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Verplaatsen
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Haal uitgeklapte Stuklijst op (inclusief onderdelen)
 DocType: Authorization Rule,Applicable To (Employee),Van toepassing zijn op (Werknemer)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Vervaldatum is verplicht
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Vervaldatum is verplicht
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Toename voor Attribute {0} kan niet worden 0
 DocType: Journal Entry,Pay To / Recd From,Betaal aan / Ontv van
 DocType: Naming Series,Setup Series,Instellen Reeksen
 DocType: Payment Reconciliation,To Invoice Date,Om factuurdatum
 DocType: Supplier,Contact HTML,Contact HTML
 ,Inactive Customers,inactieve klanten
+DocType: Student Admission Program,Maximum Age,Maximum leeftijd
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Aankoopfacturen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Hoe wordt de Prijsregel toegepast?
@@ -3958,6 +4042,7 @@
 DocType: GL Entry,Remarks,Opmerkingen
 DocType: Payment Entry,Account Paid From,Account betaald uit
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Grondstof Artikelcode
+DocType: Task,Parent Task,Oudertaak
 DocType: Journal Entry,Write Off Based On,Afschrijving gebaseerd op
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,maak Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Print en stationaire
@@ -3966,20 +4051,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salaris al verwerkt voor de periode tussen {0} en {1}, Laat aanvraagperiode kan niet tussen deze periode."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Installatie record voor een Serienummer
 DocType: Guardian Interest,Guardian Interest,Guardian Interest
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Stel standaardwaarden in voor POS-facturen
 apps/erpnext/erpnext/config/hr.py +177,Training,Opleiding
 DocType: Timesheet,Employee Detail,werknemer Detail
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Email ID
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Email ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,dag Volgende Date&#39;s en Herhalen op dag van de maand moet gelijk zijn
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,dag Volgende Date&#39;s en Herhalen op dag van de maand moet gelijk zijn
 DocType: Lab Prescription,Test Code,Testcode
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Instellingen voor website homepage
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ&#39;s zijn niet toegestaan voor {0} door een scorecard van {1}
 DocType: Offer Letter,Awaiting Response,Wachten op antwoord
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Boven
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Totaalbedrag {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Ongeldige eigenschap {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Totaalbedrag {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Ongeldige eigenschap {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Noem als niet-standaard betaalbaar account
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Hetzelfde item is meerdere keren ingevoerd. {lijst}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Selecteer de beoordelingsgroep anders dan &#39;Alle beoordelingsgroepen&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Rij {0}: Kostencentrum is vereist voor een item {1}
 DocType: Training Event Employee,Optional,facultatief
@@ -4002,13 +4087,15 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: kostenplaats is verplicht voor Artikel {2}
 DocType: Vehicle,Policy No,beleid Geen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Krijg Items uit Product Bundle
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Aangezien de voorraad bestaat voor een item {0}, kunt u de eigenschap has varianten niet inschakelen"
 DocType: Asset,Straight Line,Rechte lijn
 DocType: Project User,Project User,project Gebruiker
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,spleet
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,spleet
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,spleet
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,spleet
 DocType: GL Entry,Is Advance,Is voorschot
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Aanwezigheid Van Datum en Aanwezigheid Tot Datum zijn verplicht.
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,Vul 'Is Uitbesteed' in als Ja of Nee
+DocType: Item,Default Purchase Unit of Measure,Standaard aankoopeenheid van maatregel
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Laatste Communicatie Datum
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Laatste Communicatie Datum
 DocType: Sales Team,Contact No.,Contact Nr
@@ -4017,7 +4104,6 @@
 DocType: Production Order,Check if material transfer entry is not required,Controleer of de invoer van materiaaloverdracht niet vereist is
 DocType: Production Order,Check if material transfer entry is not required,Controleer of de invoer van materiaaloverdracht niet vereist is
 DocType: Program Enrollment Tool,Get Students From,Krijgen studenten uit
-DocType: Hub Settings,Seller Country,Verkoper Land
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Artikelen publiceren op de website
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Groep uw leerlingen in batches
 DocType: Authorization Rule,Authorization Rule,Autorisatie Rule
@@ -4027,8 +4113,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Sales en -heffingen Template
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Totaal (Credit)
 DocType: Repayment Schedule,Payment Date,Betaaldatum
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nieuw aantal batches
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nieuw aantal batches
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Nieuw aantal batches
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Nieuw aantal batches
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Kleding & Toebehoren
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,Kan de gewogen score functie niet oplossen. Zorg ervoor dat de formule geldig is.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Aantal Bestel
@@ -4046,6 +4132,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rij # {0}: Asset {1} kan niet worden ingediend, is het al {2}"
 DocType: Tax Rule,Billing Country,Land
 DocType: Purchase Order Item,Expected Delivery Date,Verwachte leverdatum
+DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurantbestelling
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet en Credit niet gelijk voor {0} # {1}. Verschil {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Representatiekosten
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Maak Material Request
@@ -4058,9 +4145,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Rekening met bestaande transactie kan niet worden verwijderd
 DocType: Vehicle,Last Carbon Check,Laatste Carbon controleren
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Juridische Kosten
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Selecteer alstublieft de hoeveelheid op rij
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Selecteer alstublieft de hoeveelheid op rij
 DocType: Purchase Invoice,Posting Time,Plaatsing Time
 DocType: Timesheet,% Amount Billed,% Gefactureerd Bedrag
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Tijd per afspraak&quot; is niet ingesteld voor Dr {0}. Voeg het toe aan arts-master.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefoonkosten
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Controleer dit als u wilt dwingen de gebruiker om een reeks voor het opslaan te selecteren. Er zal geen standaard zijn als je dit controleren.
@@ -4071,6 +4159,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nieuwe klant Revenue
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Reiskosten
 DocType: Maintenance Visit,Breakdown,Storing
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Voeg een aangepast veld toe Abonnement in het doctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Account: {0} met valuta: {1} kan niet worden geselecteerd
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Update BOM kosten automatisch via Scheduler, op basis van de laatste waarderingssnelheid / prijslijst koers / laatste aankoophoeveelheid grondstoffen."
 DocType: Bank Reconciliation Detail,Cheque Date,Cheque Datum
@@ -4095,7 +4184,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Totaal factuurbedrag (via Time Logs)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Leverancier Id
 DocType: Payment Request,Payment Gateway Details,Payment Gateway Details
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Hoeveelheid moet groter zijn dan 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Hoeveelheid moet groter zijn dan 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Child nodes kunnen alleen worden gemaakt op grond van het type nodes &#39;Groep&#39;
 DocType: Leave Application,Half Day Date,Halve dag datum
@@ -4113,12 +4202,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Opmerking : Artikel {0} meerdere keren ingevoerd
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Alle contactpersonen.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Bedrijf afkorting
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Gebruiker {0} bestaat niet
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Gebruiker {0} bestaat niet
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Afkorting
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Betaling Entry bestaat al
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Niet toegestaan aangezien {0} grenzen overschrijdt
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Salaris sjabloon stam .
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Pathologie
+DocType: Restaurant Order Entry,Restaurant Table,Restaurant tafel
 DocType: Leave Type,Max Days Leave Allowed,Max Dagen Verlof toegestaan
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Stel Tax Regel voor winkelmandje
 DocType: Purchase Invoice,Taxes and Charges Added,Belastingen en Toeslagen toegevoegd
@@ -4130,10 +4221,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Offertes naar leads of klanten.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rol toegestaan om bevroren voorraden bewerken
 ,Territory Target Variance Item Group-Wise,Regio Doel Variance Artikel Groepsgewijs
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Alle Doelgroepen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Alle Doelgroepen
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Maandelijks geaccumuleerd
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} is verplicht. Misschien is Valuta Koers record niet gemaakt voor {1} naar {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Belasting Template is verplicht.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Belasting Template is verplicht.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Rekening {0}: Bovenliggende rekening {1} bestaat niet
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prijslijst Tarief (Bedrijfsvaluta)
 DocType: Products Settings,Products Settings,producten Instellingen
@@ -4159,13 +4250,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Artikelgebaseerde BTW Details
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Instituut Afkorting
 ,Item-wise Price List Rate,Artikelgebaseerde Prijslijst Tarief
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Leverancier Offerte
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Leverancier Offerte
 DocType: Quotation,In Words will be visible once you save the Quotation.,In Woorden zijn zichtbaar zodra u de Offerte opslaat.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Hoeveelheid ({0}) kan geen fractie in rij {1} zijn
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Hoeveelheid ({0}) kan geen fractie in rij {1} zijn
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Barcode {0} is al gebruikt in het Item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Barcode {0} is al gebruikt in het Item {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Regels voor het toevoegen van verzendkosten.
 DocType: Item,Opening Stock,Opening Stock
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Klant is verplicht
@@ -4184,9 +4275,8 @@
 DocType: Customer,From Lead,Van Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Orders vrijgegeven voor productie.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Selecteer boekjaar ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS profiel nodig om POS Entry maken
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS profiel nodig om POS Entry maken
 DocType: Program Enrollment Tool,Enroll Students,inschrijven Studenten
-DocType: Hub Settings,Name Token,Naam Token
 DocType: Lab Test,Approved Date,Goedgekeurde Datum
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standaard Verkoop
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Tenminste een magazijn is verplicht
@@ -4204,7 +4294,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Human Resource
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Afletteren Betaling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Belastingvorderingen
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Productieorder is {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Productieorder is {0}
 DocType: BOM Item,BOM No,Stuklijst nr.
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} heeft geen rekening {1} of al vergeleken met andere voucher
@@ -4224,8 +4314,8 @@
 DocType: Currency Exchange,To Currency,Naar Valuta
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Laat de volgende gebruikers te keuren Verlof Aanvragen voor blok dagen.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Typen Onkostendeclaraties.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Verkoopprijs voor item {0} is lager dan de {1}. Verkoopprijs moet ten minste {2} zijn
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Verkoopprijs voor item {0} is lager dan de {1}. Verkoopprijs moet ten minste {2} zijn
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Verkoopprijs voor item {0} is lager dan de {1}. Verkoopprijs moet ten minste {2} zijn
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Verkoopprijs voor item {0} is lager dan de {1}. Verkoopprijs moet ten minste {2} zijn
 DocType: Item,Taxes,Belastingen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Betaald en niet geleverd
 DocType: Project,Default Cost Center,Standaard Kostenplaats
@@ -4239,15 +4329,15 @@
 DocType: Employee Loan,Fully Disbursed,volledig uitbetaald
 DocType: Maintenance Visit,Customer Feedback,Klantenfeedback
 DocType: Account,Expense,Kosten
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Score kan niet groter zijn dan de maximale score te zijn
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Score kan niet groter zijn dan de maximale score te zijn
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Klanten en leveranciers
 DocType: Item Attribute,From Range,Van Range
 DocType: BOM,Set rate of sub-assembly item based on BOM,Set percentage van sub-assembly item op basis van BOM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Syntaxisfout in formule of aandoening: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Syntaxisfout in formule of aandoening: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Dagelijks Werk Samenvatting Instellingen Company
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,Artikel {0} genegeerd omdat het niet een voorraadartikel is
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Dien deze productieorder in voor verdere verwerking .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Dien deze productieorder in voor verdere verwerking .
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Om de prijsbepalingsregel in een specifieke transactie niet toe te passen, moeten alle toepasbare prijsbepalingsregels worden uitgeschakeld."
 DocType: Assessment Group,Parent Assessment Group,Parent Assessment Group
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Jobs
@@ -4264,12 +4354,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Stel alsjeblieft Bedrijfsfilter leeg als Group By is &#39;Company&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Posting datum kan niet de toekomst datum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Rij # {0}: Serienummer {1} komt niet overeen met {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,voor het genereren van de terugkerende
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Casual Leave
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Lab Test UOM.
 DocType: Batch,Batch ID,Partij ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Opmerking : {0}
 ,Delivery Note Trends,Vrachtbrief Trends
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Samenvatting van deze week
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Samenvatting van deze week
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Op voorraad Aantal
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Account: {0} kan alleen worden bijgewerkt via Voorraad Transacties
 DocType: Student Group Creation Tool,Get Courses,krijg Cursussen
@@ -4283,7 +4374,6 @@
 DocType: Purchase Order,To Bill,Bill
 DocType: Material Request,% Ordered,% Besteld
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Voor cursusgerichte studentengroep wordt de cursus voor elke student gevalideerd van de ingeschreven cursussen in de inschrijving van het programma.
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","E-mailadres invoeren gescheiden door komma&#39;s, zal de factuur automatisch worden gemaild op bepaalde datum"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,stukwerk
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Gem. Buying Rate
 DocType: Task,Actual Time (in Hours),Werkelijke tijd (in uren)
@@ -4297,7 +4387,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Artikel {0} is niet ingesteld voor serienummers. Kolom moet leeg zijn
 DocType: Accounts Settings,Accounts Settings,Rekeningen Instellingen
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,Goedkeuren
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Geen resultaat om in te dienen
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Geen resultaat om in te dienen
 DocType: Customer,Sales Partner and Commission,Sales Partner en de Commissie
 DocType: Employee Loan,Rate of Interest (%) / Year,Rate of Interest (%) / Jaar
 ,Project Quantity,project Hoeveelheid
@@ -4309,55 +4399,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Zwart
 DocType: BOM Explosion Item,BOM Explosion Item,Stuklijst Uitklap Artikel
 DocType: Account,Auditor,Revisor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} items geproduceerd
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} items geproduceerd
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Kom meer te weten
 DocType: Cheque Print Template,Distance from top edge,Afstand van bovenrand
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Prijslijst {0} is uitgeschakeld of bestaat niet
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Prijslijst {0} is uitgeschakeld of bestaat niet
 DocType: Purchase Invoice,Return,Terugkeer
 DocType: Production Order Operation,Production Order Operation,Productie Order Operatie
 DocType: Pricing Rule,Disable,Uitschakelen
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Wijze van betaling is vereist om een betaling te doen
 DocType: Project Task,Pending Review,In afwachting van Beoordeling
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Afspraken en overleg
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} is niet ingeschreven in de partij {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} is niet ingeschreven in de partij {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} kan niet worden gesloopt, want het is al {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense Claim (via Expense Claim)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Afwezig
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rij {0}: Munt van de BOM # {1} moet gelijk zijn aan de geselecteerde valuta zijn {2}
 DocType: Journal Entry Account,Exchange Rate,Wisselkoers
 DocType: Patient,Additional information regarding the patient,Aanvullende informatie over de patiënt
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Verkooporder {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Verkooporder {0} is niet ingediend
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,fee Component
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Vloot beheer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Items uit voegen
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Vloot beheer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Items uit voegen
 DocType: Cheque Print Template,Regular,regelmatig
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Totaal weightage van alle beoordelingscriteria moet 100% zijn
-DocType: BOM,Last Purchase Rate,Laatste inkooptarief
+DocType: Purchase Order Item,Last Purchase Rate,Laatste inkooptarief
 DocType: Account,Asset,aanwinst
 DocType: Project Task,Task ID,Task ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Voorraad kan niet bestaan voor Artikel {0} omdat het varianten heeft.
 DocType: Lab Test,Mobile,mobiel
 ,Sales Person-wise Transaction Summary,Verkopergebaseerd Transactie Overzicht
 DocType: Training Event,Contact Number,Contact nummer
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Magazijn {0} bestaat niet
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Inschrijven Voor ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Magazijn {0} bestaat niet
 DocType: Monthly Distribution,Monthly Distribution Percentages,Maandelijkse Verdeling Percentages
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Het geselecteerde item kan niet Batch hebben
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Waardering tarief niet gevonden voor het artikel {0}, die nodig is om boekingen te doen {1} {2}. Als het item wordt transacties als een monster punt in de {1}, gelieve dat in de {1} Item tafel. Zo niet, maak dan een inkomend aandelen transactie voor het item of de vermelding waardering tarief in de Item record, en dan proberen submiting / annuleren van dit item"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% van de geleverde materialen voor deze Vrachtbrief
+DocType: Training Event,Has Certificate,Heeft certificaat
 DocType: Project,Customer Details,Klant Details
 DocType: Employee,Reports to,Rapporteert aan
 ,Unpaid Expense Claim,Onbetaalde Onkostenvergoeding
 DocType: Payment Entry,Paid Amount,Betaald Bedrag
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Verken de verkoopcyclus
 DocType: Assessment Plan,Supervisor,opzichter
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,Online
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,Online
 ,Available Stock for Packing Items,Beschikbaar voor Verpakking Items
 DocType: Item Variant,Item Variant,Artikel Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Assessment Result Tool
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Ingezonden bestellingen kunnen niet worden verwijderd
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Ingezonden bestellingen kunnen niet worden verwijderd
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Accountbalans reeds in Debet, 'Balans moet zijn' mag niet als 'Credit' worden ingesteld"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Quality Management
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Item {0} is uitgeschakeld
@@ -4378,7 +4467,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Zero waarderingspercentage toestaan
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Zero waarderingspercentage toestaan
 DocType: Training Event Employee,Invited,Uitgenodigd
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Meerdere actieve Salaris Structuren gevonden voor werknemer {0} de uitgekozen datum
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Meerdere actieve Salaris Structuren gevonden voor werknemer {0} de uitgekozen datum
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Setup Gateway accounts.
 DocType: Employee,Employment Type,Dienstverband Type
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Vaste Activa
@@ -4390,7 +4479,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Kennisgeving ( dagen )
 DocType: Tax Rule,Sales Tax Template,Sales Tax Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Selecteer items om de factuur te slaan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Selecteer items om de factuur te slaan
 DocType: Employee,Encashment Date,Betalingsdatum
 DocType: Training Event,Internet,internet
 DocType: Special Test Template,Special Test Template,Special Test Template
@@ -4400,7 +4489,7 @@
 DocType: Academic Term,Term Start Date,Term Startdatum
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},In bijlage vindt u {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},In bijlage vindt u {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bankafschrift saldo per General Ledger
 DocType: Job Applicant,Applicant Name,Aanvrager Naam
 DocType: Authorization Rule,Customer / Item Name,Klant / Naam van het punt
@@ -4420,7 +4509,7 @@
 DocType: Guardian,Guardian Of ,Beschermer van
 DocType: Grading Scale Interval,Threshold,Drempel
 DocType: BOM Update Tool,Current BOM,Huidige Stuklijst
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Voeg Serienummer toe
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Voeg Serienummer toe
 DocType: Production Order Item,Available Qty at Source Warehouse,Beschikbaar Aantal bij Source Warehouse
 apps/erpnext/erpnext/config/support.py +22,Warranty,Garantie
 DocType: Purchase Invoice,Debit Note Issued,Debetnota
@@ -4443,10 +4532,9 @@
 DocType: Account,Receivable,Vordering
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Rij # {0}: Niet toegestaan om van leverancier te veranderen als bestelling al bestaat
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol welke is toegestaan om transacties in te dienen die gestelde kredietlimieten overschrijden .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Selecteer Items voor fabricage
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Master data synchronisatie, kan het enige tijd duren"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Selecteer Items voor fabricage
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Master data synchronisatie, kan het enige tijd duren"
 DocType: Item,Material Issue,Materiaal uitgifte
-DocType: Hub Settings,Seller Description,Verkoper Beschrijving
 DocType: Employee Education,Qualification,Kwalificatie
 DocType: Item Price,Item Price,Artikelprijs
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Zeep & Wasmiddel
@@ -4454,7 +4542,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Van tijd kan niet groter zijn dan tot tijd.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Besteld
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Hervat
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Hervat
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Indien ingeschakeld, zal het systeem de variantenvelden niet bijwerken vanuit de sjabloon, maar de gegevens van onderstaande velden kopiëren terwijl een nieuwe variant wordt gemaakt"
 DocType: Salary Detail,Component,bestanddeel
 DocType: Assessment Criteria,Assessment Criteria Group,Beoordelingscriteria Group
 DocType: Healthcare Settings,Patient Name By,Patiëntnaam By
@@ -4464,7 +4553,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Vul de Goedkeurders Rol of Goedkeurende Gebruiker in
 DocType: Journal Entry,Write Off Entry,Invoer afschrijving
 DocType: BOM,Rate Of Materials Based On,Prijs van materialen op basis van
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Leverancier&gt; Type leverancier
+DocType: Item Variant Settings,Do not Update Variants,Varianten niet bijwerken
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Support Analyse
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Verwijder het vinkje bij alle
 DocType: POS Profile,Terms and Conditions,Algemene Voorwaarden
@@ -4473,7 +4562,7 @@
 DocType: Leave Block List,Applies to Company,Geldt voor Bedrijf
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,Kan niet annuleren omdat ingediende Voorraad Invoer {0} bestaat
 DocType: Employee Loan,Disbursement Date,uitbetaling Date
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;Ontvangers&#39; niet gespecificeerd
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Ontvangers&#39; niet gespecificeerd
 DocType: BOM Update Tool,Update latest price in all BOMs,Update de laatste prijs in alle BOM&#39;s
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Medisch dossier
 DocType: Vehicle,Vehicle,Voertuig
@@ -4488,14 +4577,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Afschrijvingen en Weegschalen
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Bedrag {0} {1} overgebracht van {2} naar {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Bedrag {0} {1} overgebracht van {2} naar {3}
 DocType: Sales Invoice,Get Advances Received,Get ontvangen voorschotten
 DocType: Email Digest,Add/Remove Recipients,Toevoegen / verwijderen Ontvangers
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Transactie niet toegestaan met gestopte productieorder {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Om dit boekjaar in te stellen als standaard, klik op 'Als standaard instellen'"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Indiensttreding
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Indiensttreding
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Tekort Aantal
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Artikel variant {0} bestaat met dezelfde kenmerken
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Artikel variant {0} bestaat met dezelfde kenmerken
 DocType: Employee Loan,Repay from Salary,Terugbetalen van Loon
 DocType: Leave Application,LAP/,RONDE/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Betalingsverzoeken tegen {0} {1} van {2} bedrag
@@ -4508,7 +4597,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Verkooporder Artikel
 DocType: Salary Slip,Payment Days,Betaling Dagen
 DocType: Patient,Dormant,Slapend
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Warehouses met kind nodes kunnen niet worden geconverteerd naar grootboek
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Warehouses met kind nodes kunnen niet worden geconverteerd naar grootboek
 DocType: BOM,Manage cost of operations,Beheer kosten van de operaties
 DocType: Accounts Settings,Stale Days,Stale Days
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Als de aangevinkte transacties worden ""Ingediend"", wordt een e-mail pop-up automatisch geopend om een e-mail te sturen naar de bijbehorende ""Contact"" in deze transactie, met de transactie als bijlage. De gebruiker heeft vervolgens de optie om de e-mail wel of niet te verzenden."
@@ -4522,10 +4611,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serienummer {0} is reeds ontvangen
 ,Requested Items To Be Transferred,Aangevraagde Artikelen te Verplaatsen
 DocType: Expense Claim,Vehicle Log,Voertuig log
-DocType: Purchase Invoice,Recurring Id,Terugkerende Id
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Aanwezigheid van een koorts (temp&gt; 38,5 ° C of bijgehouden temperatuur&gt; 38 ° C / 100,4 ° F)"
 DocType: Customer,Sales Team Details,Verkoop Team Details
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Permanent verwijderen?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Permanent verwijderen?
 DocType: Expense Claim,Total Claimed Amount,Totaal gedeclareerd bedrag
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potentiële mogelijkheden voor verkoop.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Ongeldige {0}
@@ -4535,7 +4623,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Warenhuizen
 ,Item Delivery Date,Item Leveringsdatum
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Stel uw School in ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Stel uw School in ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Change Bedrag (Company Munt)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Geen boekingen voor de volgende magazijnen
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Sla het document eerst.
@@ -4547,13 +4635,12 @@
 DocType: Task,Is Milestone,Is Milestone
 DocType: Daily Work Summary,Email Sent To,Email verzonden naar
 DocType: Budget,Warn,Waarschuwen
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Weet je zeker dat je je wilt uitschrijven?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Eventuele andere opmerkingen, noemenswaardig voor in de boekhouding,"
 DocType: BOM,Manufacturing User,Productie Gebruiker
 DocType: Purchase Invoice,Raw Materials Supplied,Grondstoffen Geleverd
-DocType: Purchase Invoice,Recurring Print Format,Terugkerende Print Format
 DocType: C-Form,Series,Reeksen
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Valuta van de prijslijst {0} moet {1} of {2} zijn
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Voeg producten toe
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Valuta van de prijslijst {0} moet {1} of {2} zijn
 DocType: Appraisal,Appraisal Template,Beoordeling Sjabloon
 DocType: Item Group,Item Classification,Item Classificatie
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Business Development Manager
@@ -4567,7 +4654,7 @@
 DocType: Item Attribute Value,Attribute Value,Eigenschap Waarde
 ,Itemwise Recommended Reorder Level,Artikelgebaseerde Aanbevolen Bestelniveau
 DocType: Salary Detail,Salary Detail,salaris Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Selecteer eerst {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Selecteer eerst {0}
 DocType: Appointment Type,Physician,Arts
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Batch {0} van Item {1} is verlopen.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,overleg
@@ -4578,7 +4665,7 @@
 DocType: Salary Detail,Default Amount,Standaard Bedrag
 DocType: Lab Test Template,Descriptive,Beschrijvend
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Magazijn niet gevonden in het systeem
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Samenvatting van deze maand
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Samenvatting van deze maand
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kwaliteitscontrole Meting
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,'Bevries Voorraden Ouder dan' moet minder dan %d dagen zijn.
 DocType: Tax Rule,Purchase Tax Template,Kopen Tax Template
@@ -4601,12 +4688,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Trainingsgebeurtenissen / resultaten
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Cumulatieve afschrijvingen per
 DocType: Sales Invoice,C-Form Applicable,C-Form Toepasselijk
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Operatie tijd moet groter zijn dan 0 voor de operatie zijn {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Operatie tijd moet groter zijn dan 0 voor de operatie zijn {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Magazijn is verplicht
 DocType: Supplier,Address and Contacts,Adres en Contacten
 DocType: UOM Conversion Detail,UOM Conversion Detail,Eenheid Omrekeningsfactor Detail
 DocType: Program,Program Abbreviation,programma Afkorting
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Productie bestelling kan niet tegen een Item Template worden verhoogd
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Productie bestelling kan niet tegen een Item Template worden verhoogd
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Kosten worden bijgewerkt in Kwitantie tegen elk item
 DocType: Warranty Claim,Resolved By,Opgelost door
 DocType: Bank Guarantee,Start Date,Startdatum
@@ -4632,27 +4719,28 @@
 DocType: Employee,Educational Qualification,Educatieve Kwalificatie
 DocType: Workstation,Operating Costs,Bedrijfskosten
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Actie als gezamenlijke maandelijkse budget overschreden
-DocType: Purchase Invoice,Submit on creation,Toevoegen aan de creatie
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Munt voor {0} moet {1}
+DocType: Subscription,Submit on creation,Toevoegen aan de creatie
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Munt voor {0} moet {1}
 DocType: Asset,Disposal Date,verwijdering Date
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Emails worden meegedeeld aan alle actieve werknemers van het bedrijf worden verzonden op het opgegeven uur, als ze geen vakantie. Samenvatting van de reacties zal worden verzonden om middernacht."
 DocType: Employee Leave Approver,Employee Leave Approver,Werknemer Verlof Fiatteur
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Rij {0}: Er bestaat al een nabestelling voor dit magazijn {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Kan niet als verloren instellen, omdat offerte is gemaakt."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,training Terugkoppeling
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Rij {0}: Er bestaat al een nabestelling voor dit magazijn {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Kan niet als verloren instellen, omdat offerte is gemaakt."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,training Terugkoppeling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Productie Order {0} moet worden ingediend
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Leveranciers Scorecard Criteria
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Selecteer Start- en Einddatum voor Artikel {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Natuurlijk is verplicht in de rij {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Tot Datum kan niet eerder zijn dan Van Datum
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Toevoegen / bewerken Prijzen
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Toevoegen / bewerken Prijzen
 DocType: Batch,Parent Batch,Ouderlijk Batch
 DocType: Batch,Parent Batch,Ouderlijk Batch
 DocType: Cheque Print Template,Cheque Print Template,Cheque Print Template
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Kostenplaatsenschema
 DocType: Lab Test Template,Sample Collection,Sample Collection
 ,Requested Items To Be Ordered,Aangevraagde Artikelen in te kopen
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Mijn Bestellingen
 DocType: Price List,Price List Name,Prijslijst Naam
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Dagelijks werk Samenvatting van {0}
 DocType: Employee Loan,Totals,Totalen
@@ -4671,12 +4759,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} eenheden van {1} die nodig zijn in {2} op {3} {4} te {5} om deze transactie te voltooien.
 DocType: Fee Schedule,Student Category,student Categorie
 DocType: Announcement,Student,Student
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Organisatie -eenheid (departement) meester.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Organisatie -eenheid (departement) meester.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Ga naar kamers
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Vul bericht in alvorens te verzenden
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,DUPLICATE VOOR LEVERANCIER
 DocType: Email Digest,Pending Quotations,In afwachting van Citaten
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Point-of-Sale Profile
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Point-of-Sale Profile
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Lab Test Configuraties.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Leningen zonder onderpand
 DocType: Cost Center,Cost Center Name,Kostenplaats Naam
@@ -4686,6 +4774,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Totale betaalde Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Bericht van meer dan 160 tekens worden opgesplitst in meerdere berichten
 DocType: Purchase Receipt Item,Received and Accepted,Ontvangen en geaccepteerd
+DocType: Hub Settings,Company and Seller Profile,Bedrijf en verkoperprofiel
 ,GST Itemised Sales Register,GST Itemized Sales Register
 ,Serial No Service Contract Expiry,Serienummer Service Contract Afloop
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,U kunt niet hetzelfde bedrag crediteren en debiteren op hetzelfde moment
@@ -4695,10 +4784,11 @@
 DocType: Item,Variant Based On,Variant gebaseerd op
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Totaal toegewezen gewicht moet 100% zijn. Het is {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Uw Leveranciers
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Corrigeer alstublieft de
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,"Kan niet als verloren instellen, omdat er al een verkooporder is gemaakt."
 DocType: Request for Quotation Item,Supplier Part No,Leverancier Part No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan niet aftrekken als categorie is voor &#39;Valuation&#39; of &#39;Vaulation en Total&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Gekregen van
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Gekregen van
 DocType: Lead,Converted,Omgezet
 DocType: Item,Has Serial No,Heeft Serienummer
 DocType: Employee,Date of Issue,Datum van afgifte
@@ -4706,7 +4796,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Conform de Aankoop Instellingen indien Aankoopbon Vereist == 'JA', dient de gebruiker eerst een Aankoopbon voor item {0} aan te maken om een Aankoop Factuur aan te kunnen maken"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Rij # {0}: Stel Leverancier voor punt {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Rij {0}: Aantal uren moet groter zijn dan nul.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Website Afbeelding {0} verbonden aan Item {1} kan niet worden gevonden
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Website Afbeelding {0} verbonden aan Item {1} kan niet worden gevonden
 DocType: Issue,Content Type,Content Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computer
 DocType: Item,List this Item in multiple groups on the website.,Lijst deze post in meerdere groepen op de website.
@@ -4717,14 +4807,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Haal onafgeletterde transacties op
 DocType: Payment Reconciliation,From Invoice Date,Na factuurdatum
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,U heeft geen toestemming om in te dienen
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,Billing munt moet gelijk zijn aan valuta of partij rekening valuta ofwel default comapany&#39;s zijn
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Billing munt moet gelijk zijn aan valuta of partij rekening valuta ofwel default comapany&#39;s zijn
 DocType: Healthcare Settings,Laboratory Settings,Laboratoriuminstellingen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Laat Inning
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Wat doet het?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Tot Magazijn
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Alle studentenadministratie
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Wat doet het?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Tot Magazijn
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Alle studentenadministratie
 ,Average Commission Rate,Gemiddelde Commissie Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,'Heeft Serienummer' kan niet 'ja' zijn voor niet- voorraad artikel
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,'Heeft Serienummer' kan niet 'ja' zijn voor niet- voorraad artikel
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Selecteer Status
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Aanwezigheid kan niet aangemerkt worden voor toekomstige data
 DocType: Pricing Rule,Pricing Rule Help,Prijsbepalingsregel Help
@@ -4742,41 +4832,41 @@
 DocType: Item,Customer Code,Klantcode
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Verjaardagsherinnering voor {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dagen sinds laatste Order
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Debitering van rekening moet een balansrekening zijn
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Debitering van rekening moet een balansrekening zijn
 DocType: Buying Settings,Naming Series,Benoemen Series
 DocType: Leave Block List,Leave Block List Name,Laat Block List Name
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Insurance Startdatum moet kleiner zijn dan de verzekering einddatum
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Stel het systeem voor instructeursbenaming in op School&gt; Schoolinstellingen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Voorraad Activa
 DocType: Timesheet,Production Detail,productie Detail
+DocType: Restaurant,Active Menu,Actief menu
 DocType: Target Detail,Target Qty,Doel Aantal
 DocType: Shopping Cart Settings,Checkout Settings,Afrekenen Instellingen
 DocType: Attendance,Present,Presenteer
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Vrachtbrief {0} mag niet worden ingediend
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Vrachtbrief {0} mag niet worden ingediend
 DocType: Notification Control,Sales Invoice Message,Verkoopfactuur bericht
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Sluiten account {0} moet van het type aansprakelijkheid / Equity zijn
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Loonstrook van de werknemer {0} al gemaakt voor urenregistratie {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Loonstrook van de werknemer {0} al gemaakt voor urenregistratie {1}
 DocType: Vehicle Log,Odometer,Kilometerteller
 DocType: Sales Order Item,Ordered Qty,Besteld Aantal
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Punt {0} is uitgeschakeld
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Punt {0} is uitgeschakeld
 DocType: Stock Settings,Stock Frozen Upto,Voorraad Bevroren Tot
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM geen voorraad artikel bevatten
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Project activiteit / taak.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM geen voorraad artikel bevatten
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Project activiteit / taak.
 DocType: Vehicle Log,Refuelling Details,Tanken Details
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Genereer Salarisstroken
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Aankopen moeten worden gecontroleerd, indien ""VAN TOEPASSING VOOR"" is geselecteerd als {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Korting moet minder dan 100 zijn
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Laatste aankoop tarief niet gevonden
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Af te schrijven bedrag (Bedrijfsvaluta)
 DocType: Sales Invoice Timesheet,Billing Hours,Billing Hours
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,Standaard BOM voor {0} niet gevonden
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Rij # {0}: Stel nabestelling hoeveelheid
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Standaard BOM voor {0} niet gevonden
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Rij # {0}: Stel nabestelling hoeveelheid
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Tik op items om ze hier toe te voegen
 DocType: Fees,Program Enrollment,programma Inschrijving
 DocType: Landed Cost Voucher,Landed Cost Voucher,Vrachtkosten Voucher
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Stel {0} in
-DocType: Purchase Invoice,Repeat on Day of Month,Herhaal dit op dag van de maand
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} is inactieve student
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} is inactieve student
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} is inactieve student
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} is inactieve student
 DocType: Employee,Health Details,Gezondheid Details
 DocType: Offer Letter,Offer Letter Terms,Aanbod Letter Voorwaarden
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Om een betalingsaanvraag te maken is referentie document vereist
@@ -4785,7 +4875,6 @@
 DocType: Employee External Work History,Salary,Salaris
 DocType: Serial No,Delivery Document Type,Levering Soort document
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Dien alle salarisstroken in voor de bovenstaande geselecteerde criteria
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} items gesynchroniseerd
 DocType: Sales Order,Partly Delivered,Deels geleverd
 DocType: Email Digest,Receivables,Debiteuren
 DocType: Lead Source,Lead Source,Lead Bron
@@ -4806,9 +4895,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Vergrijzing Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Strength
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,Stuklijst vervangen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Selecteer items op basis van leveringsdatum
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Selecteer items op basis van leveringsdatum
 ,Sales Analytics,Verkoop analyse
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Beschikbaar {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Beschikbaar {0}
 ,Prospects Engaged But Not Converted,Vooruitzichten betrokken maar niet omgezet
 ,Prospects Engaged But Not Converted,Vooruitzichten betrokken maar niet omgezet
 DocType: Manufacturing Settings,Manufacturing Settings,Productie Instellingen
@@ -4816,10 +4905,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Mobile No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Vul de standaard valuta in in Bedrijfsstam
 DocType: Stock Entry Detail,Stock Entry Detail,Voorraadtransactie Detail
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Dagelijkse herinneringen
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Dagelijkse herinneringen
 DocType: Products Settings,Home Page is Products,Startpagina is Producten
 ,Asset Depreciation Ledger,Asset Afschrijvingen Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Belasting Regel Conflicten met {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Belasting Regel Conflicten met {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nieuwe Rekening Naam
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Grondstoffen Leveringskosten
 DocType: Selling Settings,Settings for Selling Module,Instellingen voor het verkopen van Module
@@ -4833,8 +4922,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Artikel {0} moet een voorraadartikel zijn
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standaard Work In Progress Warehouse
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Standaardinstellingen voor boekhoudkundige transacties.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Stel Employee Naming System in Human Resource&gt; HR-instellingen in
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Verwachte datum kan niet voor de Material Aanvraagdatum
+DocType: Restaurant,Default Tax Template,Standaard belasting sjabloon
 DocType: Fees,Student Details,Student Details
 DocType: Purchase Invoice Item,Stock Qty,Aantal voorraad
 DocType: Employee Loan,Repayment Period in Months,Terugbetaling Periode in maanden
@@ -4852,8 +4942,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Ga naar Items
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Werkelijk
+DocType: Restaurant Menu,Restaurant Manager,Restaurant manager
 DocType: Authorization Rule,Customerwise Discount,Klantgebaseerde Korting
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Timesheet voor taken.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Timesheet voor taken.
 DocType: Purchase Invoice,Against Expense Account,Tegen Kostenrekening
 DocType: Production Order,Production Order,Productieorder
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Installatie Opmerking {0} is al ingediend
@@ -4861,7 +4952,6 @@
 DocType: Quotation Item,Against Docname,Tegen Docname
 DocType: SMS Center,All Employee (Active),Alle medewerkers (Actief)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Bekijk nu
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Selecteer de periode waarin de factuur  automatisch wordt gegenereerd
 DocType: BOM,Raw Material Cost,Grondstofprijzen
 DocType: Item Reorder,Re-Order Level,Re-order Niveau
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Voer de artikelen en geplande aantallen in waarvoor u productieorders wilt aanmaken, of grondstoffen voor analyse wilt downloaden."
@@ -4874,24 +4964,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Rapport type is verplicht
 DocType: Item,Serial Number Series,Serienummer Reeksen
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Magazijn is verplicht voor voorraadartikel {0} in rij {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Programma&#39;s toevoegen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Groothandel
 DocType: Issue,First Responded On,Eerst gereageerd op
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kruis Notering van Punt in meerdere groepen
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Boekjaar Startdatum en Boekjaar Einddatum zijn al ingesteld voor het fiscale jaar {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Ontruiming Geactualiseerd
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split Batch
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Succesvol Afgeletterd
 DocType: Request for Quotation Supplier,Download PDF,Download PDF
 DocType: Production Order,Planned End Date,Geplande Einddatum
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Voer de planningsdatum in
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Waar artikelen worden opgeslagen.
 DocType: Request for Quotation,Supplier Detail,Leverancier Detail
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Fout in formule of aandoening: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Fout in formule of aandoening: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Factuurbedrag
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Criteriumgewichten moeten maximaal 100%
 DocType: Attendance,Attendance,Aanwezigheid
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,Stock items
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,Stock items
 DocType: BOM,Materials,Materialen
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Indien niet gecontroleerd, wordt de lijst worden toegevoegd aan elk Department waar het moet worden toegepast."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Bron en Target Warehouse kan niet hetzelfde zijn
@@ -4909,6 +4999,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,Op Netto Totaal
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Waarde voor kenmerk {0} moet binnen het bereik van {1} tot {2} in de stappen van {3} voor post {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Doel magazijn in rij {0} moet hetzelfde zijn als productieorder
+DocType: Restaurant Reservation,Waitlisted,wachtlijst
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Valuta kan niet na het maken van data met behulp van een andere valuta worden veranderd
 DocType: Vehicle Service,Clutch Plate,clutch Plate
 DocType: Company,Round Off Account,Afronden Account
@@ -4925,7 +5016,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nieuwe Sales Person Naam
 DocType: Packing Slip,Gross Weight UOM,Bruto Gewicht Eenheid
 DocType: Delivery Note Item,Against Sales Invoice,Tegen Sales Invoice
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Voer alstublieft de serienummers in voor het serienummer
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Voer alstublieft de serienummers in voor het serienummer
 DocType: Bin,Reserved Qty for Production,Aantal voorbehouden voor productie
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Verlaat het vinkje als u geen batch wilt overwegen tijdens het maken van cursussen op basis van cursussen.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Verlaat het vinkje als u geen batch wilt overwegen tijdens het maken van cursussen op basis van cursussen.
@@ -4937,7 +5028,7 @@
 DocType: Lab Test,Test Group,Testgroep
 DocType: Payment Reconciliation,Receivable / Payable Account,Vorderingen / Crediteuren Account
 DocType: Delivery Note Item,Against Sales Order Item,Tegen Sales Order Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Geef aub attribuut Waarde voor kenmerk {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Geef aub attribuut Waarde voor kenmerk {0}
 DocType: Item,Default Warehouse,Standaard Magazijn
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budget kan niet tegen Group rekening worden toegewezen {0}
 DocType: Healthcare Settings,Patient Registration,Patiëntregistratie
@@ -4967,6 +5058,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Verkoper
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Begroting en Cost Center
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Meerdere standaard betalingswijze is niet toegestaan
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,voor de
 ,Appointment Analytics,Benoemingsanalyse
 DocType: Vehicle Service,Half Yearly,Halfjaarlijkse
 DocType: Lead,Blog Subscriber,Blog Abonnee
@@ -4986,7 +5078,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Quot Count
 ,BOM Stock Report,BOM Stock Report
 DocType: Stock Reconciliation Item,Quantity Difference,Aantal Verschil
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Processing Payroll
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Processing Payroll
 DocType: Opportunity Item,Basic Rate,Basis Tarief
 DocType: GL Entry,Credit Amount,Credit Bedrag
 DocType: Cheque Print Template,Signatory Position,ondertekenaar Position
@@ -5000,12 +5092,12 @@
 DocType: Tax Rule,Tax Rule,Belasting Regel
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Handhaaf zelfde tarief gedurende verkoopcyclus
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Plan tijd logs buiten Workstation Arbeidstijdenwet.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Klanten in de wachtrij
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr. {0} heeft geen Physician Schedule. Voeg het toe in Physician-master
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Klanten in de wachtrij
 DocType: Student,Nationality,Nationaliteit
 ,Items To Be Requested,Aan te vragen artikelen
-DocType: Purchase Order,Get Last Purchase Rate,Get Laatst Purchase Rate
 DocType: Company,Company Info,Bedrijfsinformatie
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Selecteer of voeg nieuwe klant
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Selecteer of voeg nieuwe klant
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Kostenplaats nodig is om een declaratie te boeken
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Toepassing van kapitaal (Activa)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Dit is gebaseerd op de aanwezigheid van deze werknemer
@@ -5013,6 +5105,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Debetrekening
 DocType: Fiscal Year,Year Start Date,Jaar Startdatum
 DocType: Attendance,Employee Name,Werknemer Naam
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restaurantbestelling Item invoeren
 DocType: Sales Invoice,Rounded Total (Company Currency),Afgerond Totaal (Bedrijfsvaluta)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Kan niet omzetten naar groep omdat accounttype is geselecteerd.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} is gewijzigd. Vernieuw aub.
@@ -5023,6 +5116,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Employee Benefits
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Verpakt hoeveelheid moet hoeveelheid die gelijk is voor post {0} in rij {1}
 DocType: Production Order,Manufactured Qty,Geproduceerd Aantal
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Invoice Created
 DocType: Purchase Receipt Item,Accepted Quantity,Geaccepteerd Aantal
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Stel een standaard Holiday-lijst voor Employee {0} of Company {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} bestaat niet
@@ -5032,18 +5126,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rij Geen {0}: Bedrag kan niet groter zijn dan afwachting Bedrag tegen Expense conclusie {1} zijn. In afwachting van Bedrag is {2}
 DocType: Maintenance Schedule,Schedule,Plan
 DocType: Account,Parent Account,Bovenliggende rekening
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,beschikbaar
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,beschikbaar
 DocType: Quality Inspection Reading,Reading 3,Meting 3
 ,Hub,Naaf
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Prijslijst niet gevonden of uitgeschakeld
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Prijslijst niet gevonden of uitgeschakeld
 DocType: Lab Test,Approved,Aangenomen
 DocType: Pricing Rule,Price,prijs
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',Werknemer ontslagen op {0} moet worden ingesteld als 'Verlaten'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Werknemer ontslagen op {0} moet worden ingesteld als 'Verlaten'
+DocType: Hub Settings,Last Sync On,Last Sync On
 DocType: Guardian,Guardian,Voogd
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Beoordeling {0} gemaakt voor Employee {1} in de bepaalde periode
 DocType: Employee,Education,Onderwijs
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,del
 DocType: Selling Settings,Campaign Naming By,Campagnenaam gegeven door
 DocType: Employee,Current Address Is,Huidige adres is
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Maandelijks verkoopdoel (
@@ -5058,7 +5153,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Cursuscode:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Vul Kostenrekening in
 DocType: Account,Stock,Voorraad
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rij # {0}: Reference document moet een van Purchase Order, Purchase Invoice of Inboeken zijn"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rij # {0}: Reference document moet een van Purchase Order, Purchase Invoice of Inboeken zijn"
 DocType: Employee,Current Address,Huidige adres
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Als artikel is een variant van een ander item dan beschrijving, afbeelding, prijzen, belastingen etc zal worden ingesteld van de sjabloon, tenzij expliciet vermeld"
 DocType: Serial No,Purchase / Manufacture Details,Inkoop / Productie Details
@@ -5089,7 +5184,7 @@
 DocType: Hub Settings,Hub Settings,Hub Instellingen
 DocType: Project,Gross Margin %,Bruto marge %
 DocType: BOM,With Operations,Met Operations
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Boekingen zijn reeds geboekt in valuta {0} voor bedrijf {1}. Selecteer een vordering of te betalen rekening met valuta {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Boekingen zijn reeds geboekt in valuta {0} voor bedrijf {1}. Selecteer een vordering of te betalen rekening met valuta {0}.
 DocType: Asset,Is Existing Asset,Is Bestaande Asset
 DocType: Salary Detail,Statistical Component,Statistische Component
 DocType: Salary Detail,Statistical Component,Statistische Component
@@ -5098,13 +5193,14 @@
 DocType: BOM Operation,BOM Operation,Stuklijst Operatie
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Aantal van vorige rij
 DocType: Student,Home Address,Thuisadres
+DocType: Item,Has Expiry Date,Heeft vervaldatum
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Item Variant Settings.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transfer Asset
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,Transfer Asset
 DocType: POS Profile,POS Profile,POS Profiel
 DocType: Training Event,Event Name,Evenement naam
 DocType: Physician,Phone (Office),Telefoon (kantoor)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,Toelating
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Opnames voor {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,Toelating
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Opnames voor {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Seizoensgebondenheid voor het vaststellen van budgetten, doelstellingen etc."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Variabele naam
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Item {0} is een sjabloon, selecteert u één van de varianten"
@@ -5113,7 +5209,7 @@
 DocType: Assessment Plan,Room,Kamer
 DocType: Purchase Order,Advance Paid,Voorschot Betaald
 DocType: Item,Item Tax,Artikel Belasting
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Materiaal aan Leverancier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Materiaal aan Leverancier
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Accijnzen Factuur
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% meer dan eens
 DocType: Expense Claim,Employees Email Id,Medewerkers E-mail ID
@@ -5124,32 +5220,30 @@
 DocType: Program,Program Name,Programma naam
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Overweeg belasting of heffing voor
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Werkelijke aantal is verplicht
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} heeft momenteel een {1} Leveranciers Scorecard, en er worden voorzichtige waarborgen uitgegeven bij inkooporders."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} heeft momenteel een {1} Leveranciers Scorecard, en er worden voorzichtige waarborgen uitgegeven bij inkooporders."
 DocType: Employee Loan,Loan Type,Loan Type
 DocType: Scheduling Tool,Scheduling Tool,scheduling Tool
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Kredietkaart
 DocType: BOM,Item to be manufactured or repacked,Artikel te vervaardigen of herverpakken
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Standaardinstellingen voor Voorraadtransacties .
-DocType: Purchase Invoice,Next Date,Volgende datum
 DocType: Employee Education,Major/Optional Subjects,Major / keuzevakken
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
+DocType: Hub Settings,Suspended,Geschorst
 DocType: Training Event,Attendees,Deelnemers
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Hier kunt u onderhouden familie gegevens zoals naam en beroep van de ouder, echtgenoot en kinderen"
 DocType: Academic Term,Term End Date,Term Einddatum
-DocType: Hub Settings,Seller Name,Verkoper Naam
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Belastingen en Toeslagen afgetrokken (Bedrijfsvaluta)
 DocType: Item Group,General Settings,Algemene Instellingen
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Van Valuta en naar Valuta kan niet hetzelfde zijn
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Voeg instructeurs toe
 DocType: Stock Entry,Repack,Herverpakken
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,U moet het formulier opslaan voordat u verder gaat
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Selecteer eerst het bedrijf
 DocType: Item Attribute,Numeric Values,Numerieke waarden
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Bevestig Logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Stock Levels
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Stock Levels
 DocType: Customer,Commission Rate,Commissie Rate
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Gecreëerd {0} scorecards voor {1} tussen:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Maak Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Maak Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blokkeer verlofaanvragen per afdeling.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Betaling Type moet een van te ontvangen, betalen en Internal Transfer"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analytics
@@ -5164,11 +5258,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Kapitaal Stock
 DocType: Shopping Cart Settings,Show Public Attachments,Publieke bijlagen tonen
 DocType: Packing Slip,Package Weight Details,Pakket gewicht details
+DocType: Restaurant Reservation,Reservation Time,Reservatietijd
 DocType: Payment Gateway Account,Payment Gateway Account,Payment Gateway Account
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Na betaling voltooiing omleiden gebruiker geselecteerde pagina.
 DocType: Company,Existing Company,bestaande Company
 DocType: Healthcare Settings,Result Emailed,Resultaat Emailed
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",Belastingcategorie is gewijzigd in &quot;Totaal&quot; omdat alle items niet-voorraad items zijn
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Artikelgroep&gt; Merk
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Selecteer een CSV-bestand
 DocType: Student Leave Application,Mark as Present,Mark als Cadeau
 DocType: Supplier Scorecard,Indicator Color,Indicator Kleur
@@ -5193,11 +5289,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Maak Student Batch
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Is Forward Carry
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Artikelen ophalen van Stuklijst
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Artikelen ophalen van Stuklijst
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time Dagen
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rij # {0}: Plaatsingsdatum moet hetzelfde zijn als aankoopdatum {1} van de activa {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Controleer dit als de student in het hostel van het Instituut verblijft.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Vul verkooporders in de bovenstaande tabel
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Vul verkooporders in de bovenstaande tabel
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Not Submitted loonbrieven
 ,Stock Summary,Stock Samenvatting
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Transfer een troef van het ene magazijn naar het andere
@@ -5213,5 +5309,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Rij {0}: debitering niet kan worden verbonden met een {1}
 DocType: Journal Entry,Subscription Section,Abonnementsafdeling
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Rekening {0} bestaat niet
+DocType: Training Event,Training Program,Oefenprogramma
 DocType: Account,Cash,Contant
 DocType: Employee,Short biography for website and other publications.,Korte biografie voor website en andere publicaties.
diff --git a/erpnext/translations/no.csv b/erpnext/translations/no.csv
index 9fd40bf..b672d8b 100644
--- a/erpnext/translations/no.csv
+++ b/erpnext/translations/no.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Lønn Mode
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Registrere
 DocType: Patient,Divorced,Skilt
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Elementer allerede synkronisert
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Tillat Element som skal legges flere ganger i en transaksjon
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Avbryt Material Besøk {0} før den avbryter denne garantikrav
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Forbrukerprodukter
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,La godkjennere
 DocType: Sales Partner,Dealer,Dealer
 DocType: Consultation,Investigations,undersøkelser
+DocType: Restaurant Order Entry,Click Enter To Add,Klikk på Enter for å legge til
 DocType: Employee,Rented,Leide
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Gjelder for User
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Stoppet produksjonsordre kan ikke avbestilles, Døves det første å avbryte"
 DocType: Vehicle Service,Mileage,Kilometer
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Har du virkelig ønsker å hugge denne eiendelen?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Har du virkelig ønsker å hugge denne eiendelen?
 DocType: Drug Prescription,Update Schedule,Oppdater plan
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Velg Standard Leverandør
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Valuta er nødvendig for Prisliste {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Sjekk tilgjengelighet
 DocType: Job Applicant,Job Applicant,Jobbsøker
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Dette er basert på transaksjoner mot denne leverandøren. Se tidslinjen nedenfor for detaljer
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ingen flere resultater.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Juridisk
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Faktiske typen skatt kan ikke inkluderes i Element rente i rad {0}
 DocType: Bank Guarantee,Customer,Kunde
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Exchange Rate må være samme som {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Kundenavn
 DocType: Vehicle,Natural Gas,Naturgass
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Bankkonto kan ikke bli navngitt som {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Bankkonto kan ikke bli navngitt som {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Hoder (eller grupper) mot hvilke regnskapspostene er laget og balanserer opprettholdes.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Enestående for {0} kan ikke være mindre enn null ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Det er ingen innsendte lønnslister å behandle.
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 minutter
 DocType: Leave Type,Leave Type Name,La Type Navn
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Vis åpen
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Det er nødvendig å ta denne handlingen i dag selv for ovennevnte tilbakevendende
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Serien er oppdatert
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Sjekk ut
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural Journal Entry Sendt inn
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Purchase Order Elementer som skal mottas
 DocType: SMS Center,All Supplier Contact,All Leverandør Kontakt
 DocType: Support Settings,Support Settings,støtte~~POS=TRUNC Innstillinger
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Forventet Sluttdato kan ikke være mindre enn Tiltredelse
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Forventet Sluttdato kan ikke være mindre enn Tiltredelse
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Pris må være samme som {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,New La Application
 ,Batch Item Expiry Status,Batch Element Utløps Status
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Bank Draft
 DocType: Mode of Payment Account,Mode of Payment Account,Modus for betaling konto
 DocType: Consultation,Consultation,Konsultasjon
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Salg og retur
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Vis Varianter
 DocType: Academic Term,Academic Term,semester
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiale
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Helsevesen
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Forsinket betaling (dager)
 DocType: Lab Prescription,Lab Prescription,Lab Prescription
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Sorter etter pris
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,tjenesten Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} er allerede referert i salgsfaktura: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Faktura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} er allerede referert i salgsfaktura: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodisitet
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Regnskapsår {0} er nødvendig
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Forsvars
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Total koster Beløp
 DocType: Delivery Note,Vehicle No,Vehicle Nei
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Vennligst velg Prisliste
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Vennligst velg Prisliste
 DocType: Accounts Settings,Currency Exchange Settings,Valutavekslingsinnstillinger
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Row # {0}: Betaling dokumentet er nødvendig for å fullføre trasaction
 DocType: Production Order Operation,Work In Progress,Arbeid På Går
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Vennligst velg dato
 DocType: Employee,Holiday List,Holiday List
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Vennligst oppsett Instruktør Navngivningssystem i skolen&gt; Skoleinnstillinger
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Accountant
+DocType: Hub Settings,Selling Price List,Selge prisliste
 DocType: Patient,Tobacco Current Use,Nåværende bruk av tobakk
 DocType: Cost Center,Stock User,Stock User
 DocType: Company,Phone No,Telefonnr
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Kursrutetider opprettet:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},New {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},New {0} # {1}
 ,Sales Partners Commission,Sales Partners Commission
 DocType: Purchase Invoice,Rounding Adjustment,Avrundingsjustering
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Forkortelse kan ikke ha mer enn fem tegn
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Henvisning: {0}, Varenummer: {1} og kunde: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kg
-DocType: Student Log,Log,Logg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Åpning for en jobb.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Resultat sendt
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Resultat sendt
 DocType: Item Attribute,Increment,Tilvekst
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Tidsrom
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Velg Warehouse ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Gift
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Ikke tillatt for {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Få elementer fra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Stock kan ikke oppdateres mot følgeseddel {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Stock kan ikke oppdateres mot følgeseddel {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Ingen elementer oppført
 DocType: Payment Reconciliation,Reconcile,Forsone
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensjonsfondene
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Neste Avskrivninger Datoen kan ikke være før Kjøpsdato
 DocType: Consultation,Consultation Date,Høringsdato
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Produktoppføring og oppdagelse for ERPNext-brukere
 DocType: SMS Center,All Sales Person,All Sales Person
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Månedlig Distribusjon ** hjelper deg distribuere Budsjett / Target over måneder hvis du har sesongvariasjoner i din virksomhet.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Ikke elementer funnet
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Lønn Struktur Missing
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Ikke elementer funnet
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Lønn Struktur Missing
 DocType: Lead,Person Name,Person Name
 DocType: Sales Invoice Item,Sales Invoice Item,Salg Faktura Element
 DocType: Account,Credit,Credit
 DocType: POS Profile,Write Off Cost Center,Skriv Av kostnadssted
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",for eksempel &quot;Primary School&quot; eller &quot;University&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",for eksempel &quot;Primary School&quot; eller &quot;University&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,lager rapporter
 DocType: Warehouse,Warehouse Detail,Warehouse Detalj
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Kredittgrense er krysset for kunde {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Begrepet Sluttdato kan ikke være senere enn året sluttdato av studieåret som begrepet er knyttet (studieåret {}). Korriger datoene, og prøv igjen."
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Er Fixed Asset&quot; ikke kan være ukontrollert, som Asset post eksisterer mot elementet"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Er Fixed Asset&quot; ikke kan være ukontrollert, som Asset post eksisterer mot elementet"
 DocType: Vehicle Service,Brake Oil,bremse~~POS=TRUNC Oil
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 DocType: Tax Rule,Tax Type,Skatt Type
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Skattepliktig beløp
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Du er ikke autorisert til å legge til eller oppdatere bloggen før {0}
 DocType: BOM,Item Image (if not slideshow),Sak Image (hvis ikke show)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,En Customer eksisterer med samme navn
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Timepris / 60) * Faktisk Operation Tid
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Referansedokumenttype må være en av kostnadskrav eller journaloppføring
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Velg BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Referansedokumenttype må være en av kostnadskrav eller journaloppføring
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Velg BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kostnad for leverte varer
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Ferien på {0} er ikke mellom Fra dato og Til dato
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,Medarbeider Loan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Aktivitetsloggen:
 DocType: Fee Schedule,Send Payment Request Email,Send betalingsanmodning e-post
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Element {0} finnes ikke i systemet eller er utløpt
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Element {0} finnes ikke i systemet eller er utløpt
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Eiendom
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Kontoutskrift
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmasi
@@ -210,18 +213,23 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Import Logg
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Trekk Material Request av typen Produksjon basert på de ovennevnte kriteriene
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Helt uregistrert.
 DocType: Training Result Employee,Grade,grade
+DocType: Restaurant Table,No of Seats,Antall plasser
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","For å legge til dynamisk emne, bruk jinja-koder som <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Levert av Leverandør
 DocType: SMS Center,All Contact,All kontakt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Produksjonsordre allerede opprettet for alle varer med BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Produksjonsordre allerede opprettet for alle varer med BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Årslønn
 DocType: Daily Work Summary,Daily Work Summary,Daglig arbeid Oppsummering
 DocType: Period Closing Voucher,Closing Fiscal Year,Lukke regnskapsår
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} er frosset
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Velg eksisterende selskap for å skape Konto
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} er frosset
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Velg eksisterende selskap for å skape Konto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Aksje Utgifter
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Velg Target Warehouse
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Velg Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Velg Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Velg Target Warehouse
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Fyll inn foretrukne e-
 DocType: Program Enrollment,School Bus,Skolebuss
 DocType: Journal Entry,Contra Entry,Contra Entry
@@ -238,9 +246,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Last ned mal, fyll riktige data og fest den endrede filen. Alle datoer og ansatt kombinasjon i den valgte perioden vil komme i malen, med eksisterende møteprotokoller"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Element {0} er ikke aktiv eller slutten av livet er nådd
+DocType: Student Admission Program,Minimum Age,Minimumsalder
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Eksempel: Grunnleggende matematikk
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","For å inkludere skatt i rad {0} i Element rente, skatt i rader {1} må også inkluderes"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Innstillinger for HR Module
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Innstillinger for HR Module
 DocType: SMS Center,SMS Center,SMS-senter
 DocType: Sales Invoice,Change Amount,endring Beløp
 DocType: BOM Update Tool,New BOM,New BOM
@@ -250,7 +259,7 @@
 DocType: Lead,Request Type,Forespørsel Type
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Gjør Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Kringkasting
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Legg til rom
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Oppsettmodus for POS (Online / Offline)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Execution
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detaljene for operasjonen utføres.
 DocType: Serial No,Maintenance Status,Vedlikehold Status
@@ -273,6 +282,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prisliste må være aktuelt for å kjøpe eller selge
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Installasjonsdato kan ikke være før leveringsdato for Element {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Rabatt på Prisliste Rate (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,biokjemi
 DocType: Offer Letter,Select Terms and Conditions,Velg Vilkår
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,ut Verdi
 DocType: Production Planning Tool,Sales Orders,Salgsordrer
@@ -307,15 +317,15 @@
 DocType: Sales Partner,Reseller,Reseller
 DocType: Codification Table,Medical Code,Medisinsk kode
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Hvis det er merket, vil omfatte ikke-lager i materialet forespørsler."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Skriv inn Firma
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Skriv inn Firma
 DocType: Delivery Note Item,Against Sales Invoice Item,Mot Salg Faktura Element
 ,Production Orders in Progress,Produksjonsordrer i Progress
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Netto kontantstrøm fra finansierings
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","Localstorage er full, ikke spare"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","Localstorage er full, ikke spare"
 DocType: Lead,Address & Contact,Adresse og kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Legg ubrukte blader fra tidligere bevilgninger
 DocType: Sales Partner,Partner website,partner nettstedet
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Legg til element
+DocType: Restaurant Order Entry,Add Item,Legg til element
 DocType: Lab Test,Custom Result,Tilpasset resultat
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Kontakt Navn
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kursvurderingskriteriene
@@ -328,7 +338,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Be for kjøp.
 DocType: Lab Test,Submitted Date,Innleveringsdato
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Dette er basert på timelister som er opprettet mot dette prosjektet
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Nettolønn kan ikke være mindre enn 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Nettolønn kan ikke være mindre enn 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","For å slutte å sende gjentatte feilmeldinger fra systemet, har vi sjekket deaktivert felt i abonnementet"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Bare den valgte La Godkjenner kan sende dette La Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Lindrende Dato må være større enn tidspunktet for inntreden
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Later per år
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,Profitt tap
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,liter
 DocType: Task,Total Costing Amount (via Time Sheet),Total Costing Beløp (via Timeregistrering)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Vennligst oppsett Studentene under Student Grupper
 DocType: Item Website Specification,Item Website Specification,Sak Nettsted Spesifikasjon
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,La Blokkert
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Element {0} har nådd slutten av livet på {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Element {0} har nådd slutten av livet på {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Bank Entries
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Årlig
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Avstemming Element
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Gruppe Creation Tool Course
 DocType: Lead,Do Not Contact,Ikke kontakt
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,Folk som underviser i organisasjonen
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Den unike id for sporing av alle løpende fakturaer. Det genereres på send.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Programvareutvikler
 DocType: Item,Minimum Order Qty,Minimum Antall
 DocType: Pricing Rule,Supplier Type,Leverandør Type
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,Publisere i Hub
 DocType: Student Admission,Student Admission,student Entre
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Element {0} er kansellert
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Materialet Request
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Element {0} er kansellert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Materialet Request
 DocType: Bank Reconciliation,Update Clearance Date,Oppdater Lagersalg Dato
 DocType: Item,Purchase Details,Kjøps Detaljer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Element {0} ble ikke funnet i &#39;Råvare Leveres&#39; bord i innkjøpsordre {1}
 DocType: Patient Relation,Relation,Relasjon
 DocType: Shipping Rule,Worldwide Shipping,Worldwide Shipping
 DocType: Patient Relation,Mother,Mor
+DocType: Restaurant Reservation,Reservation End Time,Reservasjons sluttid
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Bekreftede bestillinger fra kunder.
 DocType: Purchase Receipt Item,Rejected Quantity,Avvist Antall
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Betalingsforespørsel {0} opprettet
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Betalingsforespørsel {0} opprettet
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Lav følsomhet
 DocType: Notification Control,Notification Control,Varsling kontroll
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Vennligst bekreft når du har fullført treningen
 DocType: Lead,Suggestions,Forslag
@@ -388,7 +401,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,E-poster lønn slip til ansatte basert på foretrukne e-post valgt i Employee
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Den første La Godkjenner i listen vil bli definert som standard La Godkjenner
 DocType: Tax Rule,Shipping County,Shipping fylke
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Lære
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Lære
 DocType: Asset,Next Depreciation Date,Neste Avskrivninger Dato
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivitet Kostnad per Employee
 DocType: Accounts Settings,Settings for Accounts,Innstillinger for kontoer
@@ -399,13 +412,13 @@
 DocType: Item,Synced With Hub,Synkronisert Med Hub
 DocType: Vehicle,Fleet Manager,Flåtesjef
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Rad # {0}: {1} ikke kan være negativ for elementet {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Feil Passord
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Feil Passord
 DocType: Item,Variant Of,Variant av
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Fullført Antall kan ikke være større enn &quot;Antall å Manufacture &#39;
 DocType: Period Closing Voucher,Closing Account Head,Lukke konto Leder
 DocType: Employee,External Work History,Ekstern Work History
 DocType: Physician,Time per Appointment,Tid per avtale
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Rundskriv Reference Error
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Rundskriv Reference Error
 DocType: Appointment Type,Is Inpatient,Er pasient
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 Name
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,I Words (eksport) vil være synlig når du lagrer følgeseddel.
@@ -414,19 +427,18 @@
 DocType: Lead,Industry,Industry
 DocType: Employee,Job Profile,Job Profile
 DocType: BOM Item,Rate & Amount,Pris og beløp
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vennligst oppsett nummereringsserie for Tilstedeværelse via Oppsett&gt; Nummereringsserie
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Dette er basert på transaksjoner mot dette selskapet. Se tidslinjen nedenfor for detaljer
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Varsle på e-post om opprettelse av automatisk Material Request
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Resistant
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Faktura Type
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Levering Note
 DocType: Consultation,Encounter Impression,Encounter Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Sette opp skatter
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Cost of Selges Asset
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,Betaling Entry har blitt endret etter at du trakk den. Kan trekke det igjen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} registrert to ganger i pkt Skatte
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Oppsummering for denne uken og ventende aktiviteter
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} registrert to ganger i pkt Skatte
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Oppsummering for denne uken og ventende aktiviteter
 DocType: Student Applicant,Admitted,innrømmet
 DocType: Workstation,Rent Cost,Rent Cost
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Mengde etter avskrivninger
@@ -441,36 +453,35 @@
 DocType: Shipping Rule,Valid for Countries,Gyldig for Land
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Denne varen er en mal, og kan ikke brukes i transaksjoner. Element attributter vil bli kopiert over i varianter med mindre &#39;No Copy&#39; er satt"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total Bestill Regnes
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Ansatt betegnelse (f.eks CEO, direktør etc.)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Ansatt betegnelse (f.eks CEO, direktør etc.)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Hastigheten som Kunden Valuta omdannes til kundens basisvaluta
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kurs Planlegging Tool
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Kjøp Faktura kan ikke gjøres mot en eksisterende eiendel {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Urgent] Feil mens du oppretter tilbakevendende% s for% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Urgent] Feil mens du oppretter tilbakevendende% s for% s
 DocType: Item Tax,Tax Rate,Skattesats
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} allerede bevilget for Employee {1} for perioden {2} til {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Velg element
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Velg element
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Fakturaen {0} er allerede sendt
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch No må være samme som {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Konverter til ikke-konsernet
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Batch (mye) av et element.
 DocType: C-Form Invoice Detail,Invoice Date,Fakturadato
 DocType: GL Entry,Debit Amount,Debet Beløp
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Det kan bare være en konto per Company i {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Vennligst se vedlegg
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Det kan bare være en konto per Company i {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Vennligst se vedlegg
 DocType: Purchase Order,% Received,% Mottatt
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Opprett studentgrupper
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Oppsett Allerede Komplett !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Oppsett Allerede Komplett !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Kreditt Note Beløp
 DocType: Setup Progress Action,Action Document,Handlingsdokument
 ,Finished Goods,Ferdigvarer
 DocType: Delivery Note,Instructions,Bruksanvisning
 DocType: Quality Inspection,Inspected By,Inspisert av
 DocType: Maintenance Visit,Maintenance Type,Vedlikehold Type
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} er ikke påmeldt kurset {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Varenummer&gt; Varegruppe&gt; Varemerke
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} er ikke påmeldt kurset {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial No {0} tilhører ikke følgeseddel {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Legg varer
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Legg varer
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Sak Quality Inspection Parameter
 DocType: Leave Application,Leave Approver Name,La Godkjenner Name
 DocType: Depreciation Schedule,Schedule Date,Schedule Date
@@ -492,7 +503,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Arbeidstid
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Endre start / strøm sekvensnummer av en eksisterende serie.
 DocType: Dosage Strength,Strength,Styrke
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Opprett en ny kunde
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Opprett en ny kunde
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Hvis flere Pris Regler fortsette å råde, blir brukerne bedt om å sette Priority manuelt for å løse konflikten."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Opprette innkjøpsordrer
 ,Purchase Register,Kjøp Register
@@ -511,7 +522,7 @@
 DocType: Lab Test Template,Single,Enslig
 DocType: Salary Slip,Total Loan Repayment,Total Loan Nedbetaling
 DocType: Account,Cost of Goods Sold,Varekostnad
-DocType: Purchase Invoice,Yearly,Årlig
+DocType: Subscription,Yearly,Årlig
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Skriv inn kostnadssted
 DocType: Drug Prescription,Dosage,Dosering
 DocType: Journal Entry Account,Sales Order,Salgsordre
@@ -542,7 +553,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globale innstillinger for alle produksjonsprosesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Regnskap Frozen Opp
 DocType: SMS Log,Sent On,Sendte På
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Attributtet {0} valgt flere ganger i attributter Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Attributtet {0} valgt flere ganger i attributter Table
 DocType: HR Settings,Employee record is created using selected field. ,Ansatt posten er opprettet ved hjelp av valgte feltet.
 DocType: Sales Order,Not Applicable,Gjelder ikke
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday mester.
@@ -568,13 +579,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Totalt blader tildelte er obligatorisk
 DocType: Patient,AB Positive,AB Positiv
 DocType: Job Opening,Description of a Job Opening,Beskrivelse av en ledig jobb
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Ventende aktiviteter for i dag
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Ventende aktiviteter for i dag
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Tilskuerrekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Lønn Component for timebasert lønn.
 DocType: Sales Order Item,Used for Production Plan,Brukes for Produksjonsplan
 DocType: Employee Loan,Total Payment,totalt betaling
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (i minutter)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,"{0} {1} er kansellert, slik at handlingen ikke kan fullføres"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,"{0} {1} er kansellert, slik at handlingen ikke kan fullføres"
 DocType: Customer,Buyer of Goods and Services.,Kjøper av varer og tjenester.
 DocType: Journal Entry,Accounts Payable,Leverandørgjeld
 DocType: Patient,Allergies,allergi
@@ -586,23 +597,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Varsle innkjøpsordrer
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Liste noen av kundene dine. De kan være organisasjoner eller enkeltpersoner.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Nok Deler bygge
+DocType: POS Profile User,POS Profile User,POS Profil Bruker
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Direkte Inntekt
 DocType: Patient Appointment,Date TIme,Dato tid
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Kan ikke filtrere basert på konto, hvis gruppert etter konto"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Administrative Officer
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Vennligst velg Kurs
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Vennligst velg Kurs
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Vennligst velg Kurs
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Vennligst velg Kurs
 DocType: Codification Table,Codification Table,Kodifiseringstabell
 DocType: Timesheet Detail,Hrs,timer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Vennligst velg selskapet
 DocType: Stock Entry Detail,Difference Account,Forskjellen konto
 DocType: Purchase Invoice,Supplier GSTIN,Leverandør GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Kan ikke lukke oppgaven som sin avhengige oppgave {0} er ikke lukket.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,Skriv inn Warehouse hvor Material Request vil bli hevet
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Kan ikke lukke oppgaven som sin avhengige oppgave {0} er ikke lukket.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Skriv inn Warehouse hvor Material Request vil bli hevet
 DocType: Production Order,Additional Operating Cost,Ekstra driftskostnader
 DocType: Lab Test Template,Lab Routine,Lab Rutine
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetikk
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Å fusjonere, må følgende egenskaper være lik for begge elementene"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Å fusjonere, må følgende egenskaper være lik for begge elementene"
 DocType: Shipping Rule,Net Weight,Netto Vekt
 DocType: Employee,Emergency Phone,Emergency Phone
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Kjøpe
@@ -613,7 +625,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Vennligst definer karakter for Terskel 0%
 DocType: Sales Order,To Deliver,Å Levere
 DocType: Purchase Invoice Item,Item,Sak
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Serie ingen element kan ikke være en brøkdel
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Høy følsomhet
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Serie ingen element kan ikke være en brøkdel
 DocType: Journal Entry,Difference (Dr - Cr),Forskjellen (Dr - Cr)
 DocType: Account,Profit and Loss,Gevinst og tap
 DocType: Patient,Risk Factors,Risikofaktorer
@@ -622,7 +635,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Administrerende Underleverandører
 DocType: Vital Signs,Body Temperature,Kroppstemperatur
 DocType: Project,Project will be accessible on the website to these users,Prosjektet vil være tilgjengelig på nettstedet til disse brukerne
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Definer Prosjekttype.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Definer Prosjekttype.
 DocType: Supplier Scorecard,Weighting Function,Vekting Funksjon
 DocType: Physician,OP Consulting Charge,OP-konsulentkostnad
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Oppsett din
@@ -636,7 +649,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Tilveksten kan ikke være 0
 DocType: Production Planning Tool,Material Requirement,Material Requirement
 DocType: Company,Delete Company Transactions,Slett transaksjoner
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Referansenummer og Reference Date er obligatorisk for Bank transaksjon
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Referansenummer og Reference Date er obligatorisk for Bank transaksjon
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Legg til / Rediger skatter og avgifter
 DocType: Payment Entry Reference,Supplier Invoice No,Leverandør Faktura Nei
 DocType: Territory,For reference,For referanse
@@ -644,12 +657,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan ikke slette Serial No {0}, slik det brukes i aksjetransaksjoner"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Lukking (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Hallo
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Flytt element
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Flytt element
 DocType: Serial No,Warranty Period (Days),Garantiperioden (dager)
 DocType: Installation Note Item,Installation Note Item,Installasjon Merk Element
 DocType: Production Plan Item,Pending Qty,Venter Stk
 DocType: Budget,Ignore,Ignorer
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} er ikke aktiv
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} er ikke aktiv
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Oppsett sjekk dimensjoner for utskrift
 DocType: Salary Slip,Salary Slip Timesheet,Lønn Slip Timeregistrering
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverandør Warehouse obligatorisk for underleverandør Kjøpskvittering
@@ -658,7 +671,7 @@
 DocType: Pricing Rule,Sales Partner,Sales Partner
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Alle leverandørens scorecards.
 DocType: Buying Settings,Purchase Receipt Required,Kvitteringen Påkrevd
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Verdsettelse Rate er obligatorisk hvis Åpning Stock oppgitt
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,Verdsettelse Rate er obligatorisk hvis Åpning Stock oppgitt
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Ingen poster ble funnet i Faktura tabellen
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Vennligst velg først selskapet og Party Type
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Finansiell / regnskap år.
@@ -695,7 +708,7 @@
 DocType: Quotation,Quotation To,Sitat Å
 DocType: Lead,Middle Income,Middle Income
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Åpning (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standard Enhet for Element {0} kan ikke endres direkte fordi du allerede har gjort noen transaksjon (er) med en annen målenheter. Du må opprette et nytt element for å bruke et annet standardmålenheter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standard Enhet for Element {0} kan ikke endres direkte fordi du allerede har gjort noen transaksjon (er) med en annen målenheter. Du må opprette et nytt element for å bruke et annet standardmålenheter.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Bevilget beløpet kan ikke være negativ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Vennligst sett selskapet
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Vennligst sett selskapet
@@ -710,6 +723,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Velg betalingskonto å lage Bank Entry
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Lag personalregistre for å håndtere blader, refusjonskrav og lønn"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Reseptperiode
+DocType: Restaurant Reservation,Restaurant Reservation,Restaurantreservasjon
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Forslaget Writing
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betaling Entry Fradrag
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,En annen Sales Person {0} finnes med samme Employee id
@@ -717,7 +731,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Masters
 DocType: Assessment Plan,Maximum Assessment Score,Maksimal Assessment Score
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Oppdater Banktransaksjons Datoer
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Time Tracking
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Time Tracking
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,DUPLIKERER FOR TRANSPORTER
 DocType: Fiscal Year Company,Fiscal Year Company,Regnskapsåret selskapet
 DocType: Packing Slip Item,DN Detail,DN Detalj
@@ -726,8 +740,9 @@
 DocType: Batch,Batch Description,Batch Beskrivelse
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Opprette studentgrupper
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Opprette studentgrupper
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Betaling Gateway konto ikke opprettet, kan du opprette en manuelt."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Betaling Gateway konto ikke opprettet, kan du opprette en manuelt."
 DocType: Supplier Scorecard,Per Year,Per år
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Ikke kvalifisert for opptak i dette programmet i henhold til DOB
 DocType: Sales Invoice,Sales Taxes and Charges,Salgs Skatter og avgifter
 DocType: Employee,Organization Profile,Organisasjonsprofil
 DocType: Vital Signs,Height (In Meter),Høyde (i meter)
@@ -763,7 +778,7 @@
 DocType: Student Batch Name,Batch Name,batch Name
 DocType: Fee Validity,Max number of visit,Maks antall besøk
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timeregistrering opprettet:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Vennligst angi standard kontanter eller bankkontoen i modus for betaling {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Vennligst angi standard kontanter eller bankkontoen i modus for betaling {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,Registrere
 DocType: GST Settings,GST Settings,GST-innstillinger
 DocType: Selling Settings,Customer Naming By,Kunden Naming Av
@@ -795,16 +810,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landed Cost skatter og avgifter
 DocType: Production Order Operation,Actual Start Time,Faktisk Starttid
 DocType: BOM Operation,Operation Time,Operation Tid
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Bli ferdig
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Bli ferdig
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Utgangspunkt
 DocType: Timesheet,Total Billed Hours,Totalt fakturert timer
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Skriv Off Beløp
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Skriv Off Beløp
 DocType: Leave Block List Allow,Allow User,Tillat User
 DocType: Journal Entry,Bill No,Bill Nei
 DocType: Company,Gain/Loss Account on Asset Disposal,Gevinst / tap-konto på Asset Avhending
 DocType: Vehicle Log,Service Details,Servicedetaljer
 DocType: Vehicle Log,Service Details,Servicedetaljer
-DocType: Purchase Invoice,Quarterly,Quarterly
+DocType: Subscription,Quarterly,Quarterly
 DocType: Lab Test Template,Grouped,gruppert
 DocType: Selling Settings,Delivery Note Required,Levering Note Påkrevd
 DocType: Bank Guarantee,Bank Guarantee Number,Bankgaranti nummer
@@ -814,12 +829,12 @@
 DocType: Student Attendance,Student Attendance,student Oppmøte
 DocType: Sales Invoice Timesheet,Time Sheet,Tids skjema
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Spylings Råvare basert på
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Skriv inn elementdetaljer
 DocType: Interest,Interest,Renter
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Før salg
 DocType: Purchase Receipt,Other Details,Andre detaljer
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Lab Test,Test Template,Testmal
+DocType: Restaurant Order Entry Item,Served,serveres
 DocType: Account,Accounts,Kontoer
 DocType: Vehicle,Odometer Value (Last),Kilometerstand (Siste)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Maler med leverandørpoengkriterier.
@@ -831,26 +846,28 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Forhåndsvisning Lønn Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Konto {0} er angitt flere ganger
 DocType: Account,Expenses Included In Valuation,Kostnader som inngår i verdivurderings
-DocType: Hub Settings,Seller City,Selger by
 ,Absent Student Report,Fraværende Student Rapporter
 DocType: Email Digest,Next email will be sent on:,Neste post vil bli sendt på:
 DocType: Offer Letter Term,Offer Letter Term,Tilby Letter Term
 DocType: Supplier Scorecard,Per Week,Per uke
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Elementet har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Elementet har varianter.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Totalt Student
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Element {0} ikke funnet
 DocType: Bin,Stock Value,Stock Verdi
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,Avgiftsposter vil bli opprettet i bakgrunnen. Ved feil vil feilmeldingen bli oppdatert i Schedule.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Selskapet {0} finnes ikke
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} har gebyrgyldighet til {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} har gebyrgyldighet til {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Tre Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Antall som forbrukes per enhet
 DocType: Serial No,Warranty Expiry Date,Garantiutløpsdato
 DocType: Material Request Item,Quantity and Warehouse,Kvantitet og Warehouse
+DocType: Hub Settings,Unregister,Avregistrer
 DocType: Sales Invoice,Commission Rate (%),Kommisjonen Rate (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Vennligst velg Program
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Vennligst velg Program
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Vennligst velg Program
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Vennligst velg Program
 DocType: Project,Estimated Cost,anslått pris
 DocType: Purchase Order,Link to material requests,Lenke til materiale forespørsler
+DocType: Hub Settings,Publish,publisere
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
 DocType: Journal Entry,Credit Card Entry,Kredittkort Entry
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Selskapet og regnskap
@@ -861,13 +878,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Lukk mulighet da Days
 ,Reserved,Reservert
 DocType: Purchase Order,Supply Raw Materials,Leverer råvare
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Datoen da neste faktura vil bli generert. Det genereres på send.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Omløpsmidler
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} er ikke en lagervare
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',Vennligst del din tilbakemelding til treningen ved å klikke på &#39;Trenings tilbakemelding&#39; og deretter &#39;Ny&#39;
 DocType: Mode of Payment Account,Default Account,Standard konto
 DocType: Payment Entry,Received Amount (Company Currency),Mottatt beløp (Selskap Valuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,Lead må stilles inn hvis Opportunity er laget av Lead
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,Lead må stilles inn hvis Opportunity er laget av Lead
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Vennligst velg ukentlig off dag
 DocType: Patient,O Negative,O Negativ
 DocType: Production Order Operation,Planned End Time,Planlagt Sluttid
@@ -883,10 +899,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energy
 DocType: Opportunity,Opportunity From,Opportunity Fra
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Månedslønn uttalelse.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Legg til firma
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Serienummer som kreves for element {2}. Du har oppgitt {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Serienummer som kreves for element {2}. Du har oppgitt {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Vennligst velg en tabell
 DocType: BOM,Website Specifications,Nettstedet Spesifikasjoner
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} er en ugyldig e-postadresse i &quot;Mottakere&quot;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} er en ugyldig e-postadresse i &quot;Mottakere&quot;
 DocType: Special Test Items,Particulars,opplysninger
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiotika.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Fra {0} av typen {1}
@@ -894,11 +910,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Rad {0}: Omregningsfaktor er obligatorisk
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Flere Pris regler eksisterer med samme kriteriene, kan du løse konflikten ved å prioritere. Pris Regler: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,Kan ikke deaktivere eller kansellere BOM som det er forbundet med andre stykklister
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,Kan ikke deaktivere eller kansellere BOM som det er forbundet med andre stykklister
 DocType: Opportunity,Maintenance,Vedlikehold
 DocType: Item Attribute Value,Item Attribute Value,Sak data Verdi
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Salgskampanjer.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Gjør Timeregistrering
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Gjør Timeregistrering
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -936,12 +952,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Skriv inn Sak først
 DocType: Account,Liability,Ansvar
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanksjonert Beløpet kan ikke være større enn krav Beløp i Rad {0}.
+DocType: Salary Detail,Do not include in total,Ikke inkluder i alt
 DocType: Company,Default Cost of Goods Sold Account,Standard varekostnader konto
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Prisliste ikke valgt
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Prisliste ikke valgt
 DocType: Employee,Family Background,Familiebakgrunn
 DocType: Request for Quotation Supplier,Send Email,Send E-Post
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Advarsel: Ugyldig Vedlegg {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Ingen tillatelse
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Advarsel: Ugyldig Vedlegg {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Ingen tillatelse
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Sitat forespurt
 DocType: Vital Signs,Heart Rate / Pulse,Hjertefrekvens / puls
 DocType: Company,Default Bank Account,Standard Bank Account
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Hvis du vil filtrere basert på partiet, velger partiet Skriv inn først"
@@ -969,12 +987,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Sak Row {idx}: {doctype} {DOCNAME} finnes ikke i oven {doctype} tabellen
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timeregistrering {0} er allerede gjennomført eller kansellert
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ingen oppgaver
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dagen i måneden som auto faktura vil bli generert for eksempel 05, 28 osv"
 DocType: Item Variant Settings,Copy Fields to Variant,Kopier felt til variant
 DocType: Asset,Opening Accumulated Depreciation,Åpning akkumulerte avskrivninger
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score må være mindre enn eller lik 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Påmelding Tool
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C-Form poster
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C-Form poster
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Kunde og leverandør
 DocType: Email Digest,Email Digest Settings,E-post Digest Innstillinger
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Takk for handelen!
@@ -992,13 +1009,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Sitatstatus
 DocType: Maintenance Visit,Completion Status,Completion Status
 DocType: HR Settings,Enter retirement age in years,Skriv inn pensjonsalder i år
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Warehouse
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Vennligst velg et lager
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Target Warehouse
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Vennligst velg et lager
 DocType: Cheque Print Template,Starting location from left edge,Starter plassering fra venstre kant
 DocType: Item,Allow over delivery or receipt upto this percent,Tillat løpet levering eller mottak opp denne prosent
 DocType: Stock Entry,STE-,an- drogene
 DocType: Upload Attendance,Import Attendance,Import Oppmøte
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Alle varegrupper
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Alle varegrupper
 DocType: Process Payroll,Activity Log,Aktivitetsloggen
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Netto gevinst / tap
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Skriv melding automatisk ved innlevering av transaksjoner.
@@ -1010,7 +1027,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Anslått Antall
 DocType: Sales Invoice,Payment Due Date,Betalingsfrist
 DocType: Drug Prescription,Interval UOM,Intervall UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Sak Variant {0} finnes allerede med samme attributtene
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Sak Variant {0} finnes allerede med samme attributtene
+DocType: Item,Hub Publishing Details,Hub Publishing Detaljer
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&quot;Opening&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Åpne for å gjøre
 DocType: Notification Control,Delivery Note Message,Levering Note Message
@@ -1030,10 +1048,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: Råmateriale kan ikke være det samme som hovedelementet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Totalt gjeldende avgifter i kvitteringen Elementer tabellen må være det samme som total skatter og avgifter
 DocType: Sales Team,Incentives,Motivasjon
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Registrer deg for Hub
 DocType: SMS Log,Requested Numbers,Etterspør Numbers
 DocType: Production Planning Tool,Only Obtain Raw Materials,Bare Skaffe råstoffer
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Medarbeidersamtaler.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Aktivering av «Bruk for handlekurven&quot;, som Handlevogn er aktivert, og det bør være minst en skatteregel for Handlekurv"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Aktivering av «Bruk for handlekurven&quot;, som Handlevogn er aktivert, og det bør være minst en skatteregel for Handlekurv"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Betaling Entry {0} er knyttet mot Bestill {1}, sjekk om det bør trekkes som forskudd i denne fakturaen."
 DocType: Sales Invoice Item,Stock Details,Stock Detaljer
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Prosjektet Verdi
@@ -1052,12 +1071,14 @@
 DocType: Salary Slip,Working Days,Arbeidsdager
 DocType: Serial No,Incoming Rate,Innkommende Rate
 DocType: Packing Slip,Gross Weight,Bruttovekt
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,Navnet på firmaet som du setter opp dette systemet.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Aktiver nav
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,Navnet på firmaet som du setter opp dette systemet.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Inkluder ferier i Total no. arbeidsdager
 DocType: Job Applicant,Hold,Hold
 DocType: Employee,Date of Joining,Dato for Delta
 DocType: Naming Series,Update Series,Update-serien
 DocType: Supplier Quotation,Is Subcontracted,Er underleverandør
+DocType: Restaurant Table,Minimum Seating,Minimum sitteplasser
 DocType: Item Attribute,Item Attribute Values,Sak attributtverdier
 DocType: Examination Result,Examination Result,Sensur
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Kvitteringen
@@ -1068,13 +1089,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Å finne tidsluke i de neste {0} dager for Operation klarer {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materiale for sub-assemblies
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Salgs Partnere og Territory
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} må være aktiv
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} må være aktiv
 DocType: Journal Entry,Depreciation Entry,avskrivninger Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Velg dokumenttypen først
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Avbryt Material Besøk {0} før den sletter denne Maintenance Visit
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial No {0} tilhører ikke Element {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Påkrevd antall
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Næringslokaler med eksisterende transaksjon kan ikke konverteres til hovedbok.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Næringslokaler med eksisterende transaksjon kan ikke konverteres til hovedbok.
 DocType: Bank Reconciliation,Total Amount,Totalbeløp
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internett Publisering
 DocType: Prescription Duration,Number,Antall
@@ -1085,7 +1106,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Salg Prisliste
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Hvis det er merket, vil en kunde bli opprettet, kartlagt til Pasient. Pasientfakturaer vil bli opprettet mot denne kunden. Du kan også velge eksisterende kunde mens du oppretter pasient."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publisere synkronisere elementer
 DocType: Bank Reconciliation,Account Currency,Account Valuta
 DocType: Lab Test,Sample ID,Eksempel ID
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Vennligst oppgi Round Off-konto i selskapet
@@ -1094,11 +1114,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Ansatt {0} er ikke aktiv eller ikke eksisterer
 DocType: Fee Structure,Components,komponenter
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Fyll inn Asset kategori i Element {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Sak Varianter {0} oppdatert
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Sak Varianter {0} oppdatert
 DocType: Quality Inspection Reading,Reading 6,Reading 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Kan ikke {0} {1} {2} uten noen negativ utestående faktura
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","å bli generert. Hvis forsinket, må du manuelt endre feltet Repeter på dag i måneden av dette"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Kan ikke {0} {1} {2} uten noen negativ utestående faktura
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Fakturaen Advance
-DocType: Hub Settings,Sync Now,Synkroniser nå
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Rad {0}: Credit oppføring kan ikke være knyttet til en {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Definer budsjett for et regnskapsår.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Standard Bank / minibank konto vil automatisk bli oppdatert i POS faktura når denne modusen er valgt.
@@ -1110,13 +1131,13 @@
 DocType: Item,Is Purchase Item,Er Purchase Element
 DocType: Asset,Purchase Invoice,Fakturaen
 DocType: Stock Ledger Entry,Voucher Detail No,Kupong Detail Ingen
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Ny salgsfaktura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Ny salgsfaktura
 DocType: Stock Entry,Total Outgoing Value,Total Utgående verdi
 DocType: Physician,Appointments,avtaler
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Åpningsdato og sluttdato skal være innenfor samme regnskapsår
 DocType: Lead,Request for Information,Spør etter informasjon
 ,LeaderBoard,Leaderboard
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Synkroniser Offline Fakturaer
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Synkroniser Offline Fakturaer
 DocType: Payment Request,Paid,Betalt
 DocType: Program Fee,Program Fee,program Fee
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1135,11 +1156,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Innkjøpsordre Element
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Indirekte inntekt
 DocType: Student Attendance Tool,Student Attendance Tool,Student Oppmøte Tool
+DocType: Restaurant Menu,Price List (Auto created),Prisliste (automatisk opprettet)
 DocType: Cheque Print Template,Date Settings,Dato Innstillinger
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Varians
 ,Company Name,Selskapsnavn
 DocType: SMS Center,Total Message(s),Total melding (er)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Velg elementet for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Velg elementet for Transfer
 DocType: Purchase Invoice,Additional Discount Percentage,Ekstra rabatt Prosent
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Vis en liste over alle hjelpevideoer
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Velg kontoen leder av banken der sjekken ble avsatt.
@@ -1157,6 +1179,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Måler
 DocType: Workstation,Electricity Cost,Elektrisitet Cost
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ikke send Employee bursdagspåminnelser
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Lagre innstillinger
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Ønskede produkter
 DocType: Item,Inspection Criteria,Inspeksjon Kriterier
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Overført
 DocType: BOM Website Item,BOM Website Item,BOM Nettstedet Element
@@ -1174,11 +1198,11 @@
 DocType: Journal Entry,Total Amount in Words,Totalbeløp i Words
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Det var en feil. En mulig årsak kan være at du ikke har lagret skjemaet. Ta kontakt support@erpnext.com hvis problemet vedvarer.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Handlekurv
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Ordretype må være en av {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Ordretype må være en av {0}
 DocType: Lead,Next Contact Date,Neste Kontakt Dato
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Antall åpne
 DocType: Healthcare Settings,Appointment Reminder,Avtale påminnelse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Vennligst oppgi konto for Change Beløp
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Vennligst oppgi konto for Change Beløp
 DocType: Student Batch Name,Student Batch Name,Student Batch Name
 DocType: Consultation,Doctor,Doktor
 DocType: Holiday List,Holiday List Name,Holiday Listenavn
@@ -1186,12 +1210,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Schedule Course
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Aksjeopsjoner
 DocType: Journal Entry Account,Expense Claim,Expense krav
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Har du virkelig ønsker å gjenopprette dette skrotet ressurs?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Antall for {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Har du virkelig ønsker å gjenopprette dette skrotet ressurs?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Antall for {0}
 DocType: Leave Application,Leave Application,La Application
 DocType: Patient,Patient Relation,Pasientrelasjon
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,La Allocation Tool
+DocType: Item,Hub Category to Publish,Hub kategori for publisering
 DocType: Leave Block List,Leave Block List Dates,La Block List Datoer
+DocType: Sales Invoice,Billing Address GSTIN,Faktureringsadresse GSTIN
 DocType: Workstation,Net Hour Rate,Netto timepris
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost Kjøpskvittering
 DocType: Company,Default Terms,Standard Terms
@@ -1201,11 +1227,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Vennligst oppgi en {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Fjernet elementer med ingen endring i mengde eller verdi.
 DocType: Delivery Note,Delivery To,Levering Å
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Attributt tabellen er obligatorisk
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Attributt tabellen er obligatorisk
 DocType: Production Planning Tool,Get Sales Orders,Få salgsordrer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} kan ikke være negativ
 DocType: Training Event,Self-Study,Selvstudium
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Rabatt
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Rabatt
 DocType: Asset,Total Number of Depreciations,Totalt antall Avskrivninger
 DocType: Sales Invoice Item,Rate With Margin,Vurder med margin
 DocType: Sales Invoice Item,Rate With Margin,Vurder med margin
@@ -1213,7 +1239,7 @@
 DocType: Task,Urgent,Haster
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Vennligst oppgi en gyldig Row ID for rad {0} i tabellen {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Kan ikke finne variabel:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Vennligst velg et felt for å redigere fra numpad
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Vennligst velg et felt for å redigere fra numpad
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Gå til skrivebordet og begynne å bruke ERPNext
 DocType: Item,Manufacturer,Produsent
 DocType: Landed Cost Item,Purchase Receipt Item,Kvitteringen Element
@@ -1244,8 +1270,8 @@
 DocType: GL Entry,Against,Against
 DocType: Item,Default Selling Cost Center,Standard Selling kostnadssted
 DocType: Sales Partner,Implementation Partner,Gjennomføring Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Post kode
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Salgsordre {0} er {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Post kode
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Salgsordre {0} er {1}
 DocType: Opportunity,Contact Info,Kontaktinfo
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Making Stock Entries
 DocType: Packing Slip,Net Weight UOM,Vekt målenheter
@@ -1256,6 +1282,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Få Ukentlig Off Datoer
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Sluttdato kan ikke være mindre enn startdato
 DocType: Sales Person,Select company name first.,Velg firmanavn først.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Lav til høy
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Sitater mottatt fra leverandører.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Erstatt BOM og oppdater siste pris i alle BOMs
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Til {0} | {1} {2}
@@ -1276,7 +1303,7 @@
 DocType: Program Enrollment,Transportation,Transport
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Ugyldig Egenskap
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} må sendes
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Antall må være mindre enn eller lik {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Antall må være mindre enn eller lik {0}
 DocType: SMS Center,Total Characters,Totalt tegn
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Vennligst velg BOM i BOM felt for Element {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Faktura Detalj
@@ -1291,7 +1318,7 @@
 ,Ordered Items To Be Billed,Bestilte varer til å bli fakturert
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Fra Range må være mindre enn til kolleksjonen
 DocType: Global Defaults,Global Defaults,Global Defaults
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Prosjekt Samarbeid Invitasjon
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Prosjekt Samarbeid Invitasjon
 DocType: Salary Slip,Deductions,Fradrag
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Handlingsnavn
@@ -1309,13 +1336,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Salg Faktura Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Ingenting å be om
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},En annen Budsjett record &#39;{0} finnes allerede mot {1} {2} for regnskapsåret {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&#39;Faktisk startdato&#39; ikke kan være større enn &quot;Actual End Date &#39;
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&#39;Faktisk startdato&#39; ikke kan være større enn &quot;Actual End Date &#39;
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Ledelse
 DocType: Cheque Print Template,Payer Settings,Payer Innstillinger
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dette vil bli lagt til Element Code of varianten. For eksempel, hvis din forkortelsen er &quot;SM&quot;, og elementet kode er &quot;T-SHIRT&quot;, elementet koden til variant vil være &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettolønn (i ord) vil være synlig når du lagrer Lønn Slip.
 DocType: Purchase Invoice,Is Return,Er Return
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Forsiktighet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Forsiktighet
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Retur / debitnota
 DocType: Price List Country,Price List Country,Prisliste Land
 DocType: Item,UOMs,UOMs
@@ -1330,17 +1357,18 @@
 DocType: Account,Balance Sheet,Balanse
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Koste Center For Element med Element kode &#39;
 DocType: Fee Validity,Valid Till,Gyldig til
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betaling Mode er ikke konfigurert. Kontroller, om kontoen er satt på modus for betalinger eller på POS-profil."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betaling Mode er ikke konfigurert. Kontroller, om kontoen er satt på modus for betalinger eller på POS-profil."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Samme elementet kan ikke legges inn flere ganger.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ytterligere kontoer kan gjøres under grupper, men oppføringene kan gjøres mot ikke-grupper"
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Gjeld
 DocType: Course,Course Intro,kurs Intro
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Stock Entry {0} er opprettet
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vennligst oppsett nummereringsserie for Tilstedeværelse via Oppsett&gt; Nummereringsserie
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Stock Entry {0} er opprettet
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Avvist Antall kan ikke legges inn i innkjøpsliste
 ,Purchase Order Items To Be Billed,Purchase Order Elementer som skal faktureres
 DocType: Purchase Invoice Item,Net Rate,Net Rate
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Vennligst velg en kunde
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Vennligst velg en kunde
 DocType: Purchase Invoice Item,Purchase Invoice Item,Fakturaen Element
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Arkiv Ledger Oppføringer og GL Oppføringer repostes for de valgte Kjøps Receipts
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Sak 1
@@ -1361,7 +1389,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Duplicate rad {0} med samme {1}
 ,Trial Balance,Balanse Trial
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Regnskapsåret {0} ikke funnet
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Sette opp ansatte
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Sette opp ansatte
 DocType: Sales Order,SO-,SÅ-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Vennligst velg først prefiks
 DocType: Employee,O-,O-
@@ -1373,12 +1401,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Vis Ledger
 DocType: Grading Scale,Intervals,intervaller
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","En varegruppe eksisterer med samme navn, må du endre elementnavnet eller endre navn varegruppen"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","En varegruppe eksisterer med samme navn, må du endre elementnavnet eller endre navn varegruppen"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Resten Av Verden
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Resten Av Verden
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Element {0} kan ikke ha Batch
 ,Budget Variance Report,Budsjett Avvik Rapporter
 DocType: Salary Slip,Gross Pay,Brutto Lønn
+DocType: Item,Is Item from Hub,Er element fra nav
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Rad {0}: Aktivitetstype er obligatorisk.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Utbytte betalt
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Regnskap Ledger
@@ -1388,8 +1417,9 @@
 DocType: Vehicle Log,Service Detail,tjenesten Detalj
 DocType: BOM,Item Description,Element Beskrivelse
 DocType: Student Sibling,Student Sibling,student Søsken
-DocType: Purchase Invoice,Is Recurring,Er Recurring
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Betaling Mode
 DocType: Purchase Invoice,Supplied Items,Leveringen
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Vennligst sett inn en aktiv meny for Restaurant {0}
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Antall å produsere
 DocType: Email Digest,New Income,New Inntekt
@@ -1400,6 +1430,7 @@
 ,Student and Guardian Contact Details,Student og Guardian Kontaktdetaljer
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Rad {0}: For Leverandøren pålegges {0} e-postadresse for å sende e-post
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Midlertidig Åpning
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Se Hub
 ,Employee Leave Balance,Ansatt La Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Balanse for konto {0} må alltid være {1}
 DocType: Patient Appointment,More Info,Mer Info
@@ -1419,13 +1450,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Salgsordre {0} er ikke gyldig
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Varsle om ny forespørsel om tilbud
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Innkjøpsordrer hjelpe deg å planlegge og følge opp kjøpene
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Sorry, kan selskapene ikke fusjoneres"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Sorry, kan selskapene ikke fusjoneres"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Prescriptions
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Den totale Issue / Transfer mengde {0} i Material Request {1} \ kan ikke være større enn ønsket antall {2} for Element {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Liten
 DocType: Employee,Employee Number,Ansatt Number
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Tilfellet Nei (e) allerede er i bruk. Prøv fra sak nr {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Tilfellet Nei (e) allerede er i bruk. Prøv fra sak nr {0}
 DocType: Project,% Completed,% Fullført
 ,Invoiced Amount (Exculsive Tax),Fakturert beløp (exculsive Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Sak 2
@@ -1440,11 +1471,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Indirekte kostnader
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Rad {0}: Antall er obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Landbruk
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Dine produkter eller tjenester
 DocType: Special Test Items,Special Test Items,Spesielle testelementer
 DocType: Mode of Payment,Mode of Payment,Modus for betaling
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Website Bilde bør være en offentlig fil eller nettside URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Website Bilde bør være en offentlig fil eller nettside URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Dette er en rot varegruppe og kan ikke redigeres.
@@ -1452,9 +1483,9 @@
 DocType: Vehicle,Fuel UOM,drivstoff målenheter
 DocType: Warehouse,Warehouse Contact Info,Warehouse Kontaktinfo
 DocType: Payment Entry,Write Off Difference Amount,Skriv Off differansebeløpet
-DocType: Purchase Invoice,Recurring Type,Gjentakende Type
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: Ansattes e-post ikke funnet, derav e-posten ikke sendt"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: Ansattes e-post ikke funnet, derav e-posten ikke sendt"
 DocType: Item,Foreign Trade Details,Foreign Trade Detaljer
+,Assessment Plan Status,Evalueringsplan Status
 DocType: Email Digest,Annual Income,Årsinntekt
 DocType: Serial No,Serial No Details,Serie ingen opplysninger
 DocType: Purchase Invoice Item,Item Tax Rate,Sak Skattesats
@@ -1462,15 +1493,14 @@
 DocType: Student Group Student,Group Roll Number,Gruppe-nummer
 DocType: Student Group Student,Group Roll Number,Gruppe-nummer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan bare kredittkontoer kobles mot en annen belastning oppføring
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Summen av alle oppgave vekter bør være 1. Juster vekter av alle prosjektoppgaver tilsvar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Levering Note {0} er ikke innsendt
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Summen av alle oppgave vekter bør være 1. Juster vekter av alle prosjektoppgaver tilsvar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Levering Note {0} er ikke innsendt
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Elementet {0} må være en underleverandør Element
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Capital Equipments
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prising Rule først valgt basert på &quot;Apply On-feltet, som kan være varen, varegruppe eller Brand."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Vennligst sett inn varenummeret først
-DocType: Hub Settings,Seller Website,Selger Hjemmeside
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Vennligst sett inn varenummeret først
 DocType: Item,ITEM-,PUNKT-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Totalt bevilget prosent for salgsteam skal være 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Totalt bevilget prosent for salgsteam skal være 100
 DocType: Sales Invoice Item,Edit Description,Rediger Beskrivelse
 DocType: Antibiotic,Antibiotic,Antibiotika
 ,Team Updates,laget Oppdateringer
@@ -1491,12 +1521,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Total (Company Valuta)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Serienummer {0} angitt mer enn én gang
 DocType: Depreciation Schedule,Journal Entry,Journal Entry
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} elementer i fremgang
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} elementer i fremgang
 DocType: Workstation,Workstation Name,Arbeidsstasjon Name
 DocType: Grading Scale Interval,Grade Code,grade Kode
 DocType: POS Item Group,POS Item Group,POS Varegruppe
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-post Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} tilhører ikke Element {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} tilhører ikke Element {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Salary Slip,Bank Account No.,Bank Account No.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Dette er nummeret på den siste laget transaksjonen med dette prefikset
@@ -1513,10 +1543,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Forespørsel om prisanslag Leverandør
 DocType: Healthcare Settings,Registration Message,Registreringsmelding
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Hardware
-DocType: Sales Order,Recurring Upto,Tilbakevendende Opp
 DocType: Prescription Dosage,Prescription Dosage,Reseptdosering
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Vennligst velg et selskap
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Vennligst velg et selskap
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Privilege La
 DocType: Purchase Invoice,Supplier Invoice Date,Leverandør Fakturadato
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,per
@@ -1532,10 +1561,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Overlappende vilkår funnet mellom:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Mot Journal Entry {0} er allerede justert mot en annen kupong
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Total ordreverdi
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Mat
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Mat
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Aldring Range 3
 DocType: Maintenance Schedule Item,No of Visits,Ingen av besøk
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Vedlikeholdsplan {0} eksisterer mot {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Vil du publisere Elementene dine til Hub?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,påmelding student
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta ifølge kursen konto må være {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Summen av poeng for alle mål bør være 100. Det er {0}
@@ -1546,9 +1576,9 @@
 DocType: Authorization Rule,Average Discount,Gjennomsnittlig Rabatt
 DocType: Purchase Invoice Item,UOM,målenheter
 DocType: Rename Tool,Utilities,Verktøy
-DocType: Purchase Invoice Item,Accounting,Regnskap
+DocType: POS Profile,Accounting,Regnskap
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Vennligst velg batch for batched item
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Vennligst velg batch for batched item
 DocType: Asset,Depreciation Schedules,avskrivninger tidsplaner
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Tegningsperioden kan ikke være utenfor permisjon tildeling periode
 DocType: Activity Cost,Projects,Prosjekter
@@ -1564,7 +1594,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',Godkjenningsstatus må være &quot;Godkjent&quot; eller &quot;Avvist&quot;
 DocType: Physician,Contacts and Address,Kontakter og adresse
 DocType: Purchase Invoice,Contact Person,Kontaktperson
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&#39;Tiltredelse&#39; ikke kan være større enn &quot;Forventet sluttdato
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&#39;Tiltredelse&#39; ikke kan være større enn &quot;Forventet sluttdato
 DocType: Course Scheduling Tool,Course End Date,Kurs Sluttdato
 DocType: Holiday List,Holidays,Ferier
 DocType: Sales Order Item,Planned Quantity,Planlagt Antall
@@ -1572,10 +1602,11 @@
 DocType: Item,Maintain Stock,Oppretthold Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Arkiv Innlegg allerede opprettet for produksjonsordre
 DocType: Employee,Prefered Email,foretrukne e-post
+DocType: Student Admission,Eligibility and Details,Kvalifisering og detaljer
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Netto endring i Fixed Asset
 DocType: Leave Control Panel,Leave blank if considered for all designations,La stå tom hvis vurderes for alle betegnelser
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge of type &#39;Actual&#39; i rad {0} kan ikke inkluderes i Element Ranger
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Fra Datetime
 DocType: Email Digest,For Company,For selskapet
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikasjonsloggen.
@@ -1583,19 +1614,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Leverandør Scorecard Scoring Variable
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Kjøpe Beløp
 DocType: Sales Invoice,Shipping Address Name,Leveringsadresse Navn
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Konto
 DocType: Material Request,Terms and Conditions Content,Betingelser innhold
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,kan ikke være større enn 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Element {0} er ikke en lagervare
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Element {0} er ikke en lagervare
 DocType: Maintenance Visit,Unscheduled,Ikke planlagt
 DocType: Employee,Owned,Eies
 DocType: Salary Detail,Depends on Leave Without Pay,Avhenger La Uten Pay
 DocType: Pricing Rule,"Higher the number, higher the priority","Høyere tallet er, høyere prioritet"
 ,Purchase Invoice Trends,Fakturaen Trender
 DocType: Employee,Better Prospects,Bedre utsikter
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",Row # {0}: Batch {1} har bare {2} antall. Vennligst velg en annen batch som har {3} antall tilgjengelig eller del opp raden i flere rader for å levere / utføre fra flere batcher
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",Row # {0}: Batch {1} har bare {2} antall. Vennligst velg en annen batch som har {3} antall tilgjengelig eller del opp raden i flere rader for å levere / utføre fra flere batcher
 DocType: Vehicle,License Plate,Bilskilt
 DocType: Appraisal,Goals,Mål
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Velg POS-profil
 DocType: Warranty Claim,Warranty / AMC Status,Garanti / AMC Status
 ,Accounts Browser,Kontoer Browser
 DocType: Payment Entry Reference,Payment Entry Reference,Betaling Entry Reference
@@ -1613,7 +1644,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Arbeidstaker kan ikke rapportere til seg selv.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hvis kontoen er fryst, er oppføringer lov til begrensede brukere."
 DocType: Email Digest,Bank Balance,Bank Balanse
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Regnskap Entry for {0}: {1} kan bare gjøres i valuta: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Regnskap Entry for {0}: {1} kan bare gjøres i valuta: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Jobb profil, kvalifikasjoner som kreves etc."
 DocType: Journal Entry Account,Account Balance,Saldo
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Skatteregel for transaksjoner.
@@ -1622,8 +1653,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Totale skatter og avgifter (Selskapet valuta)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Vis unclosed regnskapsårets P &amp; L balanserer
 DocType: Lab Test Template,Collection Details,Samlingsdetaljer
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","velg cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date fra tabConsultation ct, `tabLab Prescription` cp hvor ct.patient = &#39;{0}&#39; og cp.parent = ct. navn og cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Shipping konto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} er inaktiv
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Gjør salgsordrer for å hjelpe deg med å planlegge arbeidet ditt og levere i tide
@@ -1640,7 +1669,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Pakkseddel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Kontor Leie
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Oppsett SMS gateway-innstillinger
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import mislyktes!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import mislyktes!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Ingen adresse er lagt til ennå.
 DocType: Workstation Working Hour,Workstation Working Hour,Arbeidsstasjon Working Hour
 DocType: Vital Signs,Blood Pressure,Blodtrykk
@@ -1665,7 +1694,7 @@
 DocType: Sales Invoice,Source,Source
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Vis stengt
 DocType: Leave Type,Is Leave Without Pay,Er permisjon uten Pay
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Asset Kategori er obligatorisk for Fixed Asset element
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Asset Kategori er obligatorisk for Fixed Asset element
 DocType: Fee Validity,Fee Validity,Avgift Gyldighet
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Ingen poster ble funnet i Payment tabellen
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Denne {0} konflikter med {1} for {2} {3}
@@ -1686,8 +1715,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Lag Leads
 DocType: Maintenance Schedule,Schedules,Rutetider
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,POS-profilen kreves for å bruke Point-of-Sale
 DocType: Purchase Invoice Item,Net Amount,Nettobeløp
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} er ikke sendt, så handlingen kan ikke fullføres"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} er ikke sendt, så handlingen kan ikke fullføres"
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nei
 DocType: Landed Cost Voucher,Additional Charges,Ekstra kostnader
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Ekstra rabatt Beløp (Selskap Valuta)
@@ -1696,7 +1726,7 @@
 ,Support Hour Distribution,Support Time Distribution
 DocType: Maintenance Visit,Maintenance Visit,Vedlikehold Visit
 DocType: Student,Leaving Certificate Number,Leaving Certificate Number
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Avtale avbrutt, vennligst kontroller og avbryt fakturaen {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Avtale avbrutt, vennligst kontroller og avbryt fakturaen {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Tilgjengelig Batch Antall på Warehouse
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Oppdater Print Format
 DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Hjelp
@@ -1719,8 +1749,8 @@
 DocType: Patient,Tobacco Past Use,Tidligere bruk av tobakk
 DocType: Sales Invoice Item,Brand Name,Merkenavn
 DocType: Purchase Receipt,Transporter Details,Transporter Detaljer
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Bruker {0} er allerede tilordnet Legen {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Standardlager er nødvendig til den valgte artikkelen
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Bruker {0} er allerede tilordnet Legen {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Standardlager er nødvendig til den valgte artikkelen
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Eske
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,mulig Leverandør
 DocType: Budget,Monthly Distribution,Månedlig Distribution
@@ -1730,8 +1760,8 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 DocType: Loan Type,Maximum Loan Amount,Maksimal Lånebeløp
 DocType: Pricing Rule,Pricing Rule,Prising Rule
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Dupliseringsnummer for student {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Dupliseringsnummer for student {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Dupliseringsnummer for student {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Dupliseringsnummer for student {0}
 DocType: Budget,Action if Annual Budget Exceeded,Tiltak hvis Årlig budsjett Skredet
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Materialet Request til innkjøpsordre
 DocType: Shopping Cart Settings,Payment Success URL,Betaling Suksess URL
@@ -1748,7 +1778,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} må vises bare en gang
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ikke lov til å overfør mer {0} enn {1} mot innkjøpsordre {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Etterlater Avsatt Vellykket for {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Ingenting å pakke
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Ingenting å pakke
 DocType: Shipping Rule Condition,From Value,Fra Verdi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Manufacturing Antall er obligatorisk
 DocType: Employee Loan,Repayment Method,tilbakebetaling Method
@@ -1762,6 +1792,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Aksje Gjeld
 DocType: Purchase Invoice,Supplier Warehouse,Leverandør Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt Mobile No
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Velg firma
 ,Material Requests for which Supplier Quotations are not created,Materielle Forespørsler som Leverandør Sitater ikke er opprettet
 DocType: Student Group,Set 0 for no limit,Sett 0 for ingen begrensning
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dagen (e) der du søker om permisjon er helligdager. Du trenger ikke søke om permisjon.
@@ -1771,24 +1802,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Gjør sitat
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,andre rapporter
 DocType: Dependent Task,Dependent Task,Avhengig Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Enhet må være en i rad {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Enhet må være en i rad {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Permisjon av typen {0} kan ikke være lengre enn {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prøv å planlegge operasjoner for X dager i forveien.
 DocType: HR Settings,Stop Birthday Reminders,Stop bursdagspåminnelser
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Vennligst sette Standard Lønn betales konto i selskapet {0}
 DocType: SMS Center,Receiver List,Mottaker List
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Søk Element
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Søk Element
 DocType: Patient Appointment,Referring Physician,Refererende lege
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Forbrukes Beløp
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Netto endring i kontanter
 DocType: Assessment Plan,Grading Scale,Grading Scale
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Enhet {0} har blitt lagt inn mer enn én gang i omregningsfaktor tabell
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,allerede fullført
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Enhet {0} har blitt lagt inn mer enn én gang i omregningsfaktor tabell
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,allerede fullført
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Lager i hånd
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Betaling Request allerede eksisterer {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost of Utstedte Items
 DocType: Physician,Hospital,Sykehus
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Antall må ikke være mer enn {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Antall må ikke være mer enn {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Foregående regnskapsår er ikke stengt
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Alder (dager)
 DocType: Quotation Item,Quotation Item,Sitat Element
@@ -1799,8 +1830,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Leverandør Type mester.
 DocType: Purchase Order Item,Supplier Part Number,Leverandør delenummer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Konverteringsfrekvens kan ikke være 0 eller 1
-DocType: Sales Invoice,Reference Document,Reference Document
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} avbrytes eller stoppes
+DocType: Subscription,Reference Document,Reference Document
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} avbrytes eller stoppes
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Vehicle Publiseringsdato
 DocType: Healthcare Settings,Default Medical Code Standard,Standard medisinsk kode Standard
@@ -1809,6 +1840,7 @@
 DocType: Company,Default Payable Account,Standard Betales konto
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Innstillinger for online shopping cart som skipsregler, prisliste etc."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Fakturert
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Sorter etter pris ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reservert Antall
 DocType: Party Account,Party Account,Partiet konto
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Menneskelige Ressurser
@@ -1820,13 +1852,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Gjør Utbetaling Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Rad {0}: Advance mot Leverandøren skal belaste
 DocType: Company,Default Values,Standardverdier
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequency} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Frequency} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Totalbeløp Refusjon
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Dette er basert på loggene mot denne bilen. Se tidslinjen nedenfor for detaljer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Mot Leverandør Faktura {0} datert {1}
 DocType: Customer,Default Price List,Standard Prisliste
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Asset Movement rekord {0} er opprettet
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Du kan ikke slette regnskapsår {0}. Regnskapsåret {0} er satt som standard i Globale innstillinger
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,En kunde med samme navn eksisterer allerede
 DocType: Journal Entry,Entry Type,Entry Type
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Ingen vurderingsplan knyttet til denne vurderingsgruppen
 ,Customer Credit Balance,Customer Credit Balance
@@ -1836,7 +1869,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Priser
 DocType: Quotation,Term Details,Term Detaljer
 DocType: Project,Total Sales Cost (via Sales Order),Total salgspris (via salgsordre)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Kan ikke registrere mer enn {0} studentene på denne studentgruppen.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Kan ikke registrere mer enn {0} studentene på denne studentgruppen.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead Count
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead Count
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} må være større enn 0
@@ -1853,9 +1886,11 @@
 DocType: Lab Test,Technician Name,Tekniker Navn
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Oppheve koblingen Betaling ved kansellering av faktura
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Nåværende Kilometerstand inngått bør være større enn første Vehicle Teller {0}
+DocType: Restaurant Reservation,No Show,Uteblivelse
 DocType: Shipping Rule Country,Shipping Rule Country,Shipping Rule Land
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,La og oppmøte
 DocType: Maintenance Visit,Partially Completed,Delvis Fullført
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Moderat følsomhet
 DocType: Leave Type,Include holidays within leaves as leaves,Inkluder hellig innen blader som løv
 DocType: Sales Invoice,Packed Items,Lunsj Items
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garantikrav mot Serial No.
@@ -1872,13 +1907,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Innbetalt beløp (Company Valuta)
 DocType: Purchase Invoice,Additional Discount,Ekstra rabatt
 DocType: Selling Settings,Selling Settings,Selge Innstillinger
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Bekreft handling
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online auksjoner
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Vennligst oppgi enten Mengde eller Verdivurdering Rate eller begge deler
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Oppfyllelse
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Vis i handlekurven
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Markedsføringskostnader
 ,Item Shortage Report,Sak Mangel Rapporter
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vekt er nevnt, \ nVennligst nevne &quot;Weight målenheter&quot; også"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vekt er nevnt, \ nVennligst nevne &quot;Weight målenheter&quot; også"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materialet Request brukes til å gjøre dette lager Entry
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Neste Avskrivninger dato er obligatorisk for ny aktiva
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Separat kursbasert gruppe for hver batch
@@ -1891,12 +1927,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Gjør regnskap Entry For Hver Stock Movement
 DocType: Leave Allocation,Total Leaves Allocated,Totalt Leaves Avsatt
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Warehouse kreves ved Row Nei {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Fyll inn gyldig Regnskapsår start- og sluttdato
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Fyll inn gyldig Regnskapsår start- og sluttdato
 DocType: Employee,Date Of Retirement,Pensjoneringstidspunktet
 DocType: Upload Attendance,Get Template,Få Mal
 DocType: Material Request,Transferred,overført
 DocType: Vehicle,Doors,dører
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext Setup Complete!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Samle avgift for pasientregistrering
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,Skatteavbrudd
@@ -1915,36 +1951,36 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Hvis dette elementet har varianter, så det kan ikke velges i salgsordrer etc."
 DocType: Lead,Next Contact By,Neste Kontakt Av
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Mengden som kreves for Element {0} i rad {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Mengden som kreves for Element {0} i rad {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Warehouse {0} kan ikke slettes som kvantitet finnes for Element {1}
 DocType: Quotation,Order Type,Ordretype
-DocType: Purchase Invoice,Notification Email Address,Varsling e-postadresse
 ,Item-wise Sales Register,Element-messig Sales Register
 DocType: Asset,Gross Purchase Amount,Bruttobeløpet
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Åpningsbalanser
 DocType: Asset,Depreciation Method,avskrivningsmetode
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,offline
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Er dette inklusiv i Basic Rate?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Total Target
 DocType: Job Applicant,Applicant for a Job,Kandidat til en jobb
 DocType: Production Plan Material Request,Production Plan Material Request,Produksjonsplan Material Request
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Ingen produksjonsordrer som er opprettet
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Ingen produksjonsordrer som er opprettet
 DocType: Stock Reconciliation,Reconciliation JSON,Avstemming JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,For mange kolonner. Eksportere rapporten og skrive den ut ved hjelp av et regnearkprogram.
 DocType: Purchase Invoice Item,Batch No,Batch No
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Forespørsel om tilbud: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Tillat flere salgsordrer mot kundens innkjøpsordre
 DocType: Student Group Instructor,Student Group Instructor,Studentgruppeinstruktør
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Hoved
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Hoved
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Still prefiks for nummerering serien på dine transaksjoner
 DocType: Employee Attendance Tool,Employees HTML,ansatte HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) må være aktiv for denne varen eller dens mal
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) må være aktiv for denne varen eller dens mal
 DocType: Employee,Leave Encashed?,Permisjon encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Fra-feltet er obligatorisk
 DocType: Email Digest,Annual Expenses,årlige utgifter
 DocType: Item,Variants,Varianter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Gjør innkjøpsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Gjør innkjøpsordre
 DocType: SMS Center,Send To,Send Til
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Det er ikke nok permisjon balanse for La Type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Bevilget beløp
@@ -1960,6 +1996,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Studentgruppestyrke
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Mot Journal Entry {0} har ikke noen enestående {1} oppføring
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,medarbeidersamtaler
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Treningsarrangementer
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Duplisere serie Ingen kom inn for Element {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,En forutsetning for en Shipping Rule
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Vennligst skriv inn
@@ -1969,7 +2006,7 @@
 DocType: Sales Order,To Deliver and Bill,Å levere og Bill
 DocType: Student Group,Instructors,instruktører
 DocType: GL Entry,Credit Amount in Account Currency,Credit beløp på kontoen Valuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} må sendes
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} må sendes
 DocType: Authorization Control,Authorization Control,Autorisasjon kontroll
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Avvist Warehouse er obligatorisk mot avvist Element {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Betaling
@@ -1988,11 +2025,11 @@
 DocType: Quotation Item,Actual Qty,Selve Antall
 DocType: Sales Invoice Item,References,Referanser
 DocType: Quality Inspection Reading,Reading 10,Lese 10
-DocType: Hub Settings,Hub Node,Hub Node
+DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Du har skrevet inn like elementer. Vennligst utbedre og prøv igjen.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Forbinder
 DocType: Asset Movement,Asset Movement,Asset Movement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,New Handlekurv
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,New Handlekurv
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Element {0} er ikke en serie Element
 DocType: SMS Center,Create Receiver List,Lag Receiver List
 DocType: Vehicle,Wheels,hjul
@@ -2006,15 +2043,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekommunikasjon
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indikerer at pakken er en del av denne leveransen (Kun Draft)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Utfør betaling Entry
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Kvantum for Element {0} må være mindre enn {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Kvantum for Element {0} må være mindre enn {1}
 ,Sales Invoice Trends,Salgsfaktura Trender
 DocType: Leave Application,Apply / Approve Leaves,Påfør / Godkjenn Løv
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Til
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Til
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Kan referere rad bare hvis belastningen typen er &#39;On Forrige Row beløp &quot;eller&quot; Forrige Row Totals
 DocType: Sales Order Item,Delivery Warehouse,Levering Warehouse
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Tre av finansielle kostnadssteder.
 DocType: Serial No,Delivery Document No,Levering Dokument nr
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Vennligst sett &#39;Gevinst / tap-konto på Asset Deponering &quot;i selskapet {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Vennligst sett &#39;Gevinst / tap-konto på Asset Deponering &quot;i selskapet {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Få elementer fra innkjøps Receipts
 DocType: Serial No,Creation Date,Dato opprettet
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Element {0} forekommer flere ganger i Prisliste {1}
@@ -2025,12 +2062,13 @@
 DocType: Student,Student Mobile Number,Student Mobilnummer
 DocType: Item,Has Variants,Har Varianter
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Oppdater svar
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Du har allerede valgt elementer fra {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Du har allerede valgt elementer fra {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Navn på Monthly Distribution
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch-ID er obligatorisk
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch-ID er obligatorisk
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
-DocType: Purchase Invoice,Recurring Invoice,Tilbakevendende Faktura
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Høy til lav
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Velg programmet først
 DocType: Patient Appointment,Patient Age,Pasientalder
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Managing Projects
 DocType: Supplier,Supplier of Goods or Services.,Leverandør av varer eller tjenester.
@@ -2038,8 +2076,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Standardfordelbare kontoer som skal brukes hvis ikke satt inn i pasienten for å bestille konsultasjonsgebyrer.
 DocType: Vehicle Log,Fuel Price,Fuel Pris
 DocType: Budget,Budget,Budsjett
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Sett inn
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Fast Asset varen må være et ikke-lagervare.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Sett inn
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Fast Asset varen må være et ikke-lagervare.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budsjettet kan ikke overdras mot {0}, som det er ikke en inntekt eller kostnad konto"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Oppnås
 DocType: Student Admission,Application Form Route,Søknadsskjema Rute
@@ -2053,12 +2091,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Element {0} er ikke oppsett for Serial Nos. Sjekk Element mester
 DocType: Maintenance Visit,Maintenance Time,Vedlikehold Tid
 ,Amount to Deliver,Beløp å levere
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Samme gjenstand er oppgitt flere ganger. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Begrepet Startdato kan ikke være tidligere enn året startdato av studieåret som begrepet er knyttet (studieåret {}). Korriger datoene, og prøv igjen."
 DocType: Guardian,Guardian Interests,Guardian Interesser
 DocType: Naming Series,Current Value,Nåværende Verdi
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Flere regnskapsårene finnes for datoen {0}. Vennligst satt selskapet i regnskapsåret
 DocType: School Settings,Instructor Records to be created by,Instruktørposter som skal opprettes av
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} opprettet
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} opprettet
 DocType: Delivery Note Item,Against Sales Order,Mot Salgsordre
 ,Serial No Status,Serial No Status
 DocType: Payment Entry Reference,Outstanding,Utestående
@@ -2068,10 +2107,10 @@
 						must be greater than or equal to {2}","Rad {0}: Slik stiller {1} periodisitet, forskjellen mellom fra og til dato \ må være større enn eller lik {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Dette er basert på lagerbevegelse. Se {0} for detaljer
 DocType: Pricing Rule,Selling,Selling
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Mengden {0} {1} trukket mot {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Mengden {0} {1} trukket mot {2}
 DocType: Employee,Salary Information,Lønn Informasjon
 DocType: Sales Person,Name and Employee ID,Navn og Employee ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Due Date kan ikke være før konteringsdato
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Due Date kan ikke være før konteringsdato
 DocType: Website Item Group,Website Item Group,Website varegruppe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Skatter og avgifter
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Skriv inn Reference dato
@@ -2097,7 +2136,7 @@
 DocType: Issue,Resolution Details,Oppløsning Detaljer
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Avsetninger
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Akseptkriterier
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Fyll inn Material forespørsler i tabellen over
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Fyll inn Material forespørsler i tabellen over
 DocType: Item Attribute,Attribute Name,Attributt navn
 DocType: BOM,Show In Website,Show I Website
 DocType: Shopping Cart Settings,Show Quantity in Website,Vis Antall i Website
@@ -2106,7 +2145,7 @@
 DocType: Item Reorder,Check in (group),Sjekk inn (gruppe)
 ,Qty to Order,Antall å bestille
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Kontoen hodet etter forpliktelse eller et egenkapital, der gevinst / tap vil bli bokført"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Gantt diagram av alle oppgaver.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Gantt diagram av alle oppgaver.
 DocType: Opportunity,Mins to First Response,Minutter til First Response
 DocType: Pricing Rule,Margin Type,margin Type
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} timer
@@ -2128,36 +2167,36 @@
 DocType: Patient,Surgical History,Kirurgisk historie
 DocType: Employee,Resignation Letter Date,Resignasjon Letter Dato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Prising Reglene er videre filtreres basert på kvantitet.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Vennligst sett datoen for å bli med på ansatt {0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Vennligst sett datoen for å bli med på ansatt {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Vennligst sett datoen for å bli med på ansatt {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Vennligst sett datoen for å bli med på ansatt {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Total Billing Beløp (via Timeregistrering)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Gjenta kunden Revenue
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) må ha rollen &#39;Expense Godkjenner&#39;
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Par
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Velg BOM og Stk for produksjon
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Velg BOM og Stk for produksjon
 DocType: Asset,Depreciation Schedule,avskrivninger Schedule
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Salgspartneradresser og kontakter
 DocType: Bank Reconciliation Detail,Against Account,Mot konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Half Day Date bør være mellom Fra dato og Til dato
 DocType: Maintenance Schedule Detail,Actual Date,Selve Dato
 DocType: Item,Has Batch No,Har Batch No
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Årlig Billing: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Årlig Billing: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Varer og tjenester skatt (GST India)
 DocType: Delivery Note,Excise Page Number,Vesenet Page Number
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Company, Fra dato og Til dato er obligatorisk"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Få fra konsultasjon
 DocType: Asset,Purchase Date,Kjøpsdato
 DocType: Employee,Personal Details,Personlig Informasjon
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Vennligst sett &#39;Asset Avskrivninger kostnadssted &quot;i selskapet {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Vennligst sett &#39;Asset Avskrivninger kostnadssted &quot;i selskapet {0}
 ,Maintenance Schedules,Vedlikeholdsplaner
 DocType: Task,Actual End Date (via Time Sheet),Faktisk Sluttdato (via Timeregistrering)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Mengden {0} {1} mot {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Mengden {0} {1} mot {2} {3}
 ,Quotation Trends,Anførsels Trender
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Varegruppe ikke nevnt i punkt master for elementet {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Uttak fra kontoen må være en fordring konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Uttak fra kontoen må være en fordring konto
 DocType: Shipping Rule Condition,Shipping Amount,Fraktbeløp
 DocType: Supplier Scorecard Period,Period Score,Periodepoeng
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Legg til kunder
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Legg til kunder
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Avventer Beløp
 DocType: Lab Test Template,Special,Spesiell
 DocType: Purchase Invoice Item,Conversion Factor,Omregningsfaktor
@@ -2165,13 +2204,14 @@
 ,Vehicle Expenses,Vehicle Utgifter
 DocType: Serial No,Invoice Details,Fakturadetaljer
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Forventet verdi etter levetid må være større enn eller lik {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Start på
+DocType: Hub Category,Hub Category,Hub kategori
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Vehicle Number
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,Datoen som tilbakevendende faktura vil bli stoppe
 DocType: Employee Loan,Loan Amount,Lånebeløp
 DocType: Program Enrollment,Self-Driving Vehicle,Selvkjørende kjøretøy
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Leverandør Scorecard Standing
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},P {0}: stykk ikke funnet med Element {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},P {0}: stykk ikke funnet med Element {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Totalt bevilget blader {0} kan ikke være mindre enn allerede godkjente blader {1} for perioden
 DocType: Journal Entry,Accounts Receivable,Kundefordringer
 ,Supplier-Wise Sales Analytics,Leverandør-Wise Salgs Analytics
@@ -2183,7 +2223,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Foreldrekurs (Foreløpig, hvis dette ikke er en del av foreldrenes kurs)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,La stå tom hvis vurderes for alle typer medarbeider
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuere Kostnader Based On
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Timelister
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Timelister
 DocType: HR Settings,HR Settings,HR-innstillinger
 DocType: Salary Slip,net pay info,nettolønn info
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Denne verdien er oppdatert i standard salgsprislisten.
@@ -2194,7 +2234,7 @@
 DocType: Patient,B Positive,B Positiv
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",Row # {0}: Antall må være en som elementet er et anleggsmiddel. Bruk egen rad for flere stk.
 DocType: Leave Block List Allow,Leave Block List Allow,La Block List Tillat
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr kan ikke være tomt eller plass
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr kan ikke være tomt eller plass
 DocType: Patient Medical Record,Patient Medical Record,Patient Medical Record
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Gruppe til Non-gruppe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
@@ -2211,9 +2251,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Kan ikke finne valutakurs for {0} til {1} for nøkkeldato {2}. Vennligst opprett en valutautvekslingsrekord manuelt
 DocType: POS Profile,Price List,Pris Liste
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} er nå standard regnskapsåret. Vennligst oppdater nettleser for at endringen skal tre i kraft.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Regninger
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Regninger
 DocType: Issue,Support,Support
 ,BOM Search,BOM Søk
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Publiser &quot;På lager&quot; eller &quot;Ikke på lager&quot; på Hub basert på lager tilgjengelig i dette varehuset.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Lukking (Åpning + Totals)
 DocType: Vehicle,Fuel Type,drivstoff
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Vennligst oppgi valuta i selskapet
@@ -2225,16 +2266,16 @@
 DocType: Healthcare Settings,Remind Before,Påminn før
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Målenheter Omregningsfaktor er nødvendig i rad {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Document Type må være en av salgsordre, salgsfaktura eller bilagsregistrering"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Document Type må være en av salgsordre, salgsfaktura eller bilagsregistrering"
 DocType: Salary Component,Deduction,Fradrag
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Rad {0}: Fra tid og Tid er obligatorisk.
 DocType: Stock Reconciliation Item,Amount Difference,beløp Difference
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Varen Pris lagt for {0} i Prisliste {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Varen Pris lagt for {0} i Prisliste {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Skriv inn Employee Id av denne salgs person
 DocType: Territory,Classification of Customers by region,Klassifisering av kunder etter region
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Forskjellen Beløpet må være null
 DocType: Project,Gross Margin,Bruttomargin
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Skriv inn Produksjon varen først
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Skriv inn Produksjon varen først
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Beregnet kontoutskrift balanse
 DocType: Normal Test Template,Normal Test Template,Normal testmal
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,deaktivert bruker
@@ -2244,21 +2285,22 @@
 DocType: Salary Slip,Total Deduction,Total Fradrag
 ,Production Analytics,produksjons~~POS=TRUNC Analytics
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Dette er basert på transaksjoner mot denne pasienten. Se tidslinjen nedenfor for detaljer
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Kostnad Oppdatert
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Kostnad Oppdatert
 DocType: Employee,Date of Birth,Fødselsdato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Element {0} er allerede returnert
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Regnskapsår ** representerer et regnskapsår. Alle regnskapspostene og andre store transaksjoner spores mot ** regnskapsår **.
 DocType: Opportunity,Customer / Lead Address,Kunde / Lead Adresse
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Leverandør Scorecard Setup
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL-sertifikat på vedlegg {0}
-DocType: Student Admission,Eligibility,kvalifikasjon
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Evalueringsplan Navn
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL-sertifikat på vedlegg {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Leads hjelpe deg å få virksomheten, legge til alle dine kontakter og mer som dine potensielle kunder"
 DocType: Production Order Operation,Actual Operation Time,Selve Operasjon Tid
 DocType: Authorization Rule,Applicable To (User),Gjelder til (User)
 DocType: Purchase Taxes and Charges,Deduct,Trekke
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Stillingsbeskrivelse
 DocType: Student Applicant,Applied,Tatt i bruk
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Re-open
 DocType: Sales Invoice Item,Qty as per Stock UOM,Antall pr Stock målenheter
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 Name
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Spesialtegn unntatt &quot;-&quot; &quot;.&quot;, &quot;#&quot;, og &quot;/&quot; ikke tillatt i navngi serie"
@@ -2270,7 +2312,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Produksjonssjef
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} er under garanti opptil {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Split følgeseddel i pakker.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Forsendelser
+apps/erpnext/erpnext/hooks.py +107,Shipments,Forsendelser
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Totalt tildelte beløp (Selskap Valuta)
 DocType: Purchase Order Item,To be delivered to customer,Som skal leveres til kunde
 DocType: BOM,Scrap Material Cost,Skrap Material Cost
@@ -2293,8 +2335,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Variantinnstillinger
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Velg Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,La stå tom hvis vurderes for alle avdelinger
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Typer arbeid (fast, kontrakt, lærling etc.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} er obligatorisk for Element {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Typer arbeid (fast, kontrakt, lærling etc.)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} er obligatorisk for Element {1}
 DocType: Process Payroll,Fortnightly,hver fjortende dag
 DocType: Currency Exchange,From Currency,Fra Valuta
 DocType: Vital Signs,Weight (In Kilogram),Vekt (i kilogram)
@@ -2319,7 +2361,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Vennligst klikk på &quot;Generer Schedule &#39;for å få timeplanen
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Det var feil under sletting av følgende planer:
 DocType: Bin,Ordered Quantity,Bestilte Antall
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",f.eks &quot;Bygg verktøy for utbyggere&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",f.eks &quot;Bygg verktøy for utbyggere&quot;
 DocType: Grading Scale,Grading Scale Intervals,Karakterskalaen Intervaller
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Regnskap Entry for {2} kan bare gjøres i valuta: {3}
 DocType: Production Order,In Process,Igang
@@ -2343,11 +2385,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Med betaling av skatt
 DocType: Expense Claim Detail,Expense Claim Detail,Expense krav Detalj
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLIKAT FOR LEVERANDØR
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Velg riktig konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Velg riktig konto
 DocType: Item,Weight UOM,Vekt målenheter
 DocType: Salary Structure Employee,Salary Structure Employee,Lønn Struktur Employee
 DocType: Patient,Blood Group,Blodgruppe
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Avventer
 DocType: Course,Course Name,Course Name
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Brukere som kan godkjenne en bestemt ansattes permisjon applikasjoner
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Kontor utstyr
@@ -2366,7 +2407,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Prisene vil ikke bli vist hvis prislisten er ikke satt
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Vennligst oppgi et land for denne Shipping Regel eller sjekk Worldwide Shipping
 DocType: Stock Entry,Total Incoming Value,Total Innkommende Verdi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Debet Å kreves
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Debet Å kreves
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timelister bidra til å holde styr på tid, kostnader og fakturering for aktiviteter gjort av teamet ditt"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kjøp Prisliste
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Maler av leverandørens scorecard-variabler.
@@ -2376,7 +2417,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Betaling Avstemming
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Vennligst velg Incharge persons navn
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Total Ubetalte: {0}
+DocType: Hub Settings,Unregister from Hub,Avregistrer fra Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Total Ubetalte: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Nettstedet Operasjon
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Tilbudsbrev
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generere Material Requests (MRP) og produksjonsordrer.
@@ -2388,7 +2430,9 @@
 DocType: Physician Schedule Time Slot,To Time,Til Time
 DocType: Authorization Rule,Approving Role (above authorized value),Godkjenne Role (ovenfor autorisert verdi)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Kreditt til kontoen må være en Betales konto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM rekursjon: {0} kan ikke være forelder eller barn av {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Vennligst velg Student Admission, som er obligatorisk for den betalte student søkeren"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM rekursjon: {0} kan ikke være forelder eller barn av {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Vennligst velg en prisliste for å publisere priser
 DocType: Production Order Operation,Completed Qty,Fullført Antall
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",For {0} kan bare belastning kontoer knyttes opp mot en annen kreditt oppføring
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Prisliste {0} er deaktivert
@@ -2401,39 +2445,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serienumre som kreves for Element {1}. Du har gitt {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Nåværende Verdivurdering Rate
 DocType: Item,Customer Item Codes,Kunden element Codes
+DocType: Training Event,Advance,Avansere
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,for å gjenta igjen.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Valutagevinst / tap
 DocType: Opportunity,Lost Reason,Mistet Reason
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Ny adresse
 DocType: Quality Inspection,Sample Size,Sample Size
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Fyll inn Kvittering Document
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Alle elementene er allerede blitt fakturert
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Vennligst oppgi en gyldig &quot;Fra sak nr &#39;
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',Vennligst oppgi en gyldig &quot;Fra sak nr &#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Ytterligere kostnadsbærere kan gjøres under Grupper men oppføringene kan gjøres mot ikke-grupper
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Brukere og tillatelser
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Produksjonsordrer Laget: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Produksjonsordrer Laget: {0}
 DocType: Branch,Branch,Branch
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Trykking og merkevarebygging
 DocType: Company,Total Monthly Sales,Totalt månedlig salg
 DocType: Bin,Actual Quantity,Selve Antall
 DocType: Shipping Rule,example: Next Day Shipping,Eksempel: Neste Day Shipping
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} ikke funnet
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Abonnementet har vært {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Abonnementet har vært {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Avgift Schedule Program
 DocType: Fee Schedule Program,Student Batch,student Batch
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,velg * fra `tabVital Signs` hvor pasient = &#39;{0}&#39; rekkefølge ved signs_date desc limit 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Gjør Student
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Min karakter
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Du har blitt invitert til å samarbeide om prosjektet: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Legen ikke tilgjengelig på {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Du har blitt invitert til å samarbeide om prosjektet: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Legen ikke tilgjengelig på {0}
 DocType: Leave Block List Date,Block Date,Block Dato
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Legg til egendefinert felt Abonnements-ID i doktypen {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Leverandørleverans Note
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Søk nå
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Søk nå
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Faktisk antall {0} / Venter antall {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Faktisk antall {0} / Venter antall {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-handel GSTIN
 DocType: Sales Order,Not Delivered,Ikke levert
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Forventet dato kan ikke være før transaksjonsdato
 ,Bank Clearance Summary,Bank Lagersalg Summary
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Opprette og administrere daglige, ukentlige og månedlige e-postfordøyer."
 DocType: Appraisal Goal,Appraisal Goal,Appraisal Goal
@@ -2441,12 +2486,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,bygninger
 DocType: Fee Schedule,Fee Structure,Avgiftsstruktur struktur~~POS=HEADCOMP
 DocType: Timesheet Detail,Costing Amount,Costing Beløp
-DocType: Student Admission,Application Fee,Påmeldingsavgift
+DocType: Student Admission Program,Application Fee,Påmeldingsavgift
 DocType: Process Payroll,Submit Salary Slip,Send Lønn Slip
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maxiumm rabatt for Element {0} er {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Maxiumm rabatt for Element {0} er {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import i Bulk
 DocType: Sales Partner,Address & Contacts,Adresse og Kontakt
 DocType: SMS Log,Sender Name,Avsender Navn
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Sorter etter kriterier
 DocType: POS Profile,[Select],[Velg]
 DocType: Vital Signs,Blood Pressure (diastolic),Blodtrykk (diastolisk)
 DocType: SMS Log,Sent To,Sendt til
@@ -2455,7 +2501,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Neste Kontakt Datoen kan ikke være i fortiden
 DocType: Company,For Reference Only.,For referanse.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Lege {0} ikke tilgjengelig på {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Velg batchnummer
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Velg batchnummer
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ugyldig {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,Referanse Inv
@@ -2471,15 +2517,15 @@
 DocType: Normal Test Items,Require Result Value,Krever resultatverdi
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Sak nr kan ikke være 0
 DocType: Item,Show a slideshow at the top of the page,Vis en lysbildeserie på toppen av siden
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Butikker
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Butikker
 DocType: Project Type,Projects Manager,Prosjekter manager
 DocType: Serial No,Delivery Time,Leveringstid
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Aldring Based On
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Avtale kansellert
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Avtale kansellert
 DocType: Item,End of Life,Slutten av livet
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Reise
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Ingen aktive eller standard Lønn Struktur funnet for arbeidstaker {0} for den gitte datoer
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Reise
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Ingen aktive eller standard Lønn Struktur funnet for arbeidstaker {0} for den gitte datoer
 DocType: Leave Block List,Allow Users,Gi brukere
 DocType: Purchase Order,Customer Mobile No,Kunden Mobile No
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Gjentakende
@@ -2488,12 +2534,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Oppdater Cost
 DocType: Item Reorder,Item Reorder,Sak Omgjøre
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Vis Lønn Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Transfer Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Transfer Material
 DocType: Fees,Send Payment Request,Send betalingsforespørsel
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Spesifiser drift, driftskostnadene og gi en unik Operation nei til driften."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dette dokumentet er over grensen av {0} {1} for elementet {4}. Er du gjør en annen {3} mot samme {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Vennligst sett gjentakende etter lagring
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Velg endring mengde konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Velg endring mengde konto
 DocType: Purchase Invoice,Price List Currency,Prisliste Valuta
 DocType: Naming Series,User must always select,Brukeren må alltid velge
 DocType: Stock Settings,Allow Negative Stock,Tillat Negative Stock
@@ -2513,7 +2559,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Ansatt
 DocType: Sample Collection,Collected Time,Samlet tid
 DocType: Company,Sales Monthly History,Salg Månedlig historie
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Velg Batch
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Velg Batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} er fullt fakturert
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Livstegn
 DocType: Training Event,End Time,Sluttid
@@ -2521,16 +2567,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Betalings fradrag eller tap
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standard kontraktsvilkår for salg eller kjøp.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Grupper etter Voucher
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Er du sikker på at du vil avbryte denne avtalen?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,salgs~~POS=TRUNC
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Vennligst angi standardkonto i Lønn Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nødvendig På
 DocType: Rename Tool,File to Rename,Filen til Rename
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Vennligst velg BOM for Element i Rad {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Vennligst velg BOM for Element i Rad {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Konto {0} stemmer ikke overens med Selskapet {1} i Konto modus: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Spesifisert BOM {0} finnes ikke for Element {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Vedlikeholdsplan {0} må avbestilles før den avbryter denne salgsordre
+DocType: POS Profile,Applicable for Users,Gjelder for brukere
 DocType: Notification Control,Expense Claim Approved,Expense krav Godkjent
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Lønn Slip av ansattes {0} som allerede er opprettet for denne perioden
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Lønn Slip av ansattes {0} som allerede er opprettet for denne perioden
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Pharmaceutical
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kostnad for kjøpte varer
 DocType: Selling Settings,Sales Order Required,Salgsordre Påkrevd
@@ -2554,6 +2602,7 @@
 DocType: Offer Letter,Accepted,Akseptert
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Organisasjon
 DocType: BOM Update Tool,BOM Update Tool,BOM Update Tool
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Festkonto ikke spesifisert, vennligst sett opp standard partikkonto i firmaet"
 DocType: SG Creation Tool Course,Student Group Name,Student Gruppenavn
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Opprette avgifter
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Sørg for at du virkelig ønsker å slette alle transaksjoner for dette selskapet. Dine stamdata vil forbli som det er. Denne handlingen kan ikke angres.
@@ -2562,29 +2611,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kan ikke være større enn planlagt quanitity ({2}) i produksjonsordre {3}
 DocType: Shipping Rule,Shipping Rule Label,Shipping Rule Etikett
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,bruker~~POS=TRUNC
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Råvare kan ikke være blank.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Kunne ikke oppdatere lager, inneholder faktura slippe frakt element."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Råvare kan ikke være blank.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Kunne ikke oppdatere lager, inneholder faktura slippe frakt element."
 DocType: Lab Test Sample,Lab Test Sample,Lab Test prøve
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Hurtig Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Du kan ikke endre prisen dersom BOM nevnt agianst ethvert element
+DocType: Restaurant,Invoice Series Prefix,Faktura Serie Prefiks
 DocType: Employee,Previous Work Experience,Tidligere arbeidserfaring
 DocType: Stock Entry,For Quantity,For Antall
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Skriv inn Planned Antall for Element {0} på rad {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Skriv inn Planned Antall for Element {0} på rad {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} ikke er sendt
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Forespørsler om elementer.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Separat produksjonsordre vil bli opprettet for hvert ferdige godt element.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} må være negativ i retur dokument
 ,Minutes to First Response for Issues,Minutter til First Response for Issues
 DocType: Purchase Invoice,Terms and Conditions1,Vilkår og forhold 1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,Navnet på institutt for som du setter opp dette systemet.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,Navnet på institutt for som du setter opp dette systemet.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Regnskap oppføring frosset opp til denne datoen, kan ingen gjøre / endre oppføring unntatt rolle angitt nedenfor."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Vennligst lagre dokumentet før du genererer vedlikeholdsplan
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Siste pris oppdatert i alle BOMs
 DocType: Fee Schedule,Successful,Vellykket
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Prosjekt Status
 DocType: UOM,Check this to disallow fractions. (for Nos),Sjekk dette for å forby fraksjoner. (For Nos)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Følgende produksjonsordrer ble opprettet:
-DocType: Student Admission,Naming Series (for Student Applicant),Naming Series (Student søkeren)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Følgende produksjonsordrer ble opprettet:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Naming Series (Student søkeren)
 DocType: Delivery Note,Transporter Name,Transporter Name
 DocType: Authorization Rule,Authorized Value,Autorisert Verdi
 DocType: BOM,Show Operations,Vis Operations
@@ -2608,7 +2658,7 @@
 ,Employees working on a holiday,Arbeidstakere som arbeider på ferie
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Present
 DocType: Project,% Complete Method,% Komplett Method
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Legemiddel
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Legemiddel
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Vedlikehold startdato kan ikke være før leveringsdato for Serial No {0}
 DocType: Production Order,Actual End Date,Selve sluttdato
 DocType: BOM,Operating Cost (Company Currency),Driftskostnader (Selskap Valuta)
@@ -2626,13 +2676,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Godkjenne Brukeren kan ikke være det samme som bruker regelen gjelder for
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (som per Stock målenheter)
 DocType: SMS Log,No of Requested SMS,Ingen av Spurt SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,La Uten Pay ikke samsvarer med godkjente La Søknad poster
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,La Uten Pay ikke samsvarer med godkjente La Søknad poster
 DocType: Campaign,Campaign-.####,Kampanje -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Neste skritt
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Vennligst oppgi de angitte elementene på de best mulige priser
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Gjør Faktura
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto nær mulighet etter 15 dager
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Innkjøpsordrer er ikke tillatt for {0} på grunn av et scorecard som står på {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Innkjøpsordrer er ikke tillatt for {0} på grunn av et scorecard som står på {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,slutt År
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2640,6 +2690,7 @@
 DocType: Vital Signs,Nutrition Values,Ernæringsverdier
 DocType: Lab Test Template,Is billable,Er fakturerbart
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Både &quot;Physician Schedule&quot; og Time Per Appointment &quot;må settes til Dr {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,En tredjepart distributør / forhandler / kommisjonær / agent / forhandler som selger selskaper produkter for en kommisjon.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} mot innkjøpsordre {1}
 DocType: Patient,Patient Demographics,Pasientdemografi
@@ -2669,7 +2720,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","Standard skatt mal som kan brukes på alle kjøpstransaksjoner. Denne malen kan inneholde liste over skatte hoder og også andre utgifter hoder som &quot;Shipping&quot;, &quot;Forsikring&quot;, &quot;Håndtering&quot; osv #### Note Skattesatsen du definerer her vil være standard skattesats for alle ** Items * *. Hvis det er ** Elementer ** som har forskjellige priser, må de legges i ** Sak Skatt ** bord i ** Sak ** mester. #### Beskrivelse av kolonner 1. Beregning Type: - Dette kan være på ** Net Total ** (som er summen av grunnbeløpet). - ** På Forrige Row Total / Beløp ** (for kumulative skatter eller avgifter). Hvis du velger dette alternativet, vil skatten bli brukt som en prosentandel av forrige rad (i skattetabellen) eller en total. - ** Faktisk ** (som nevnt). 2. Account Head: Konto hovedbok der denne skatten vil bli bokført 3. Cost Center: Hvis skatt / avgift er en inntekt (som frakt) eller utgifter det må bestilles mot et kostnadssted. 4. Beskrivelse: Beskrivelse av skatt (som vil bli skrevet ut i fakturaer / sitater). 5. Ranger: skattesats. 6. Beløp: Skatt beløp. 7. Totalt: Akkumulert total til dette punktet. 8. Angi Row: Dersom basert på &quot;Forrige Row Total&quot; du kan velge radnummeret som vil bli tatt som en base for denne beregningen (standard er den forrige rad). 9. Vurdere Skatte eller Charge for: I denne delen kan du angi om skatt / avgift er kun for verdivurdering (ikke en del av total) eller bare for total (ikke tilføre verdi til elementet) eller for begge. 10. legge til eller trekke: Enten du ønsker å legge til eller trekke skatt."
 DocType: Homepage,Homepage,hjemmeside
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Velg lege ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',Oppdater tabConsultation sett faktura = &#39;{0}&#39; hvor navn = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd Antall
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Fee Records Laget - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Kategori konto
@@ -2681,7 +2731,7 @@
 DocType: Asset,Manual,Håndbok
 DocType: Salary Component Account,Salary Component Account,Lønn Component konto
 DocType: Global Defaults,Hide Currency Symbol,Skjule Valutasymbol
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","f.eks Bank, Cash, Kredittkort"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","f.eks Bank, Cash, Kredittkort"
 DocType: Lead Source,Source Name,Source Name
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Normal hvilende blodtrykk hos en voksen er ca. 120 mmHg systolisk og 80 mmHg diastolisk, forkortet &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Kreditnota
@@ -2700,16 +2750,16 @@
 DocType: Patient,Occupation,Okkupasjon
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Rad {0}: Startdato må være før sluttdato
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Stk)
-DocType: Sales Invoice,This Document,dette dokumentet
 DocType: Installation Note Item,Installed Qty,Installert antall
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Dette kan skyldes noen ugyldige e-postadresser i
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Du har lagt til
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,trening Resultat
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,trening Resultat
 DocType: Purchase Invoice,Is Paid,er betalt
 DocType: Salary Structure,Total Earning,Total Tjene
 DocType: Purchase Receipt,Time at which materials were received,Tidspunktet for når materialene ble mottatt
 DocType: Stock Ledger Entry,Outgoing Rate,Utgående Rate
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Organisering gren mester.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Organisering gren mester.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,eller
 DocType: Sales Order,Billing Status,Billing Status
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Melde om et problem
@@ -2724,8 +2774,9 @@
 DocType: Notification Control,Sales Order Message,Salgsordre Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Sett standardverdier som Company, Valuta, værende regnskapsår, etc."
 DocType: Payment Entry,Payment Type,Betalings Type
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vennligst velg en batch for element {0}. Kunne ikke finne en enkelt batch som oppfyller dette kravet
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vennligst velg en batch for element {0}. Kunne ikke finne en enkelt batch som oppfyller dette kravet
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vennligst velg en batch for element {0}. Kunne ikke finne en enkelt batch som oppfyller dette kravet
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vennligst velg en batch for element {0}. Kunne ikke finne en enkelt batch som oppfyller dette kravet
+DocType: Hub Category,Parent Category,Foreldrekategori
 DocType: Process Payroll,Select Employees,Velg Medarbeidere
 DocType: Opportunity,Potential Sales Deal,Potensielle Sales Deal
 DocType: Complaint,Complaints,klager
@@ -2763,7 +2814,7 @@
 DocType: Bin,Reserved Quantity,Reservert Antall
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Vennligst skriv inn gyldig e-postadresse
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Vennligst skriv inn gyldig e-postadresse
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Vennligst velg et element i handlekurven
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Vennligst velg et element i handlekurven
 DocType: Landed Cost Voucher,Purchase Receipt Items,Kvitteringen Items
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Tilpasse Forms
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,etterskudd
@@ -2773,15 +2824,15 @@
 DocType: Payment Request,Amount in customer's currency,Beløp i kundens valuta
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Levering
 DocType: Stock Reconciliation Item,Current Qty,Nåværende Antall
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Legg til leverandører
+DocType: Restaurant Menu,Restaurant Menu,Restaurantmeny
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,prev
 DocType: Appraisal Goal,Key Responsibility Area,Key Ansvar Område
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Student batcher hjelpe deg med å spore oppmøte, vurderinger og avgifter for studenter"
 DocType: Payment Entry,Total Allocated Amount,Totalt tildelte beløp
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Angi standard beholdningskonto for evigvarende beholdning
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Angi standard beholdningskonto for evigvarende beholdning
 DocType: Item Reorder,Material Request Type,Materialet Request Type
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural dagboken til lønninger fra {0} i {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","Localstorage er full, ikke redde"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","Localstorage er full, ikke redde"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Rad {0}: målenheter omregningsfaktor er obligatorisk
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Romkapasitet
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref
@@ -2820,16 +2871,18 @@
 DocType: Project,Task Completion,Task Fullføring
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Ikke på lager
 DocType: Appraisal,HR User,HR User
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Skatter og avgifter fratrukket
-apps/erpnext/erpnext/hooks.py +129,Issues,Problemer
+apps/erpnext/erpnext/hooks.py +138,Issues,Problemer
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status må være en av {0}
 DocType: Sales Invoice,Debit To,Debet Å
+DocType: Restaurant Menu Item,Restaurant Menu Item,Restaurant menyelement
 DocType: Delivery Note,Required only for sample item.,Kreves bare for prøve element.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Selve Antall Etter Transaksjons
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Ingen lønn slip funnet mellom {0} og {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Ingen lønn slip funnet mellom {0} og {1}
 ,Pending SO Items For Purchase Request,Avventer SO varer for kjøp Request
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,student Opptak
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} er deaktivert
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,student Opptak
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} er deaktivert
 DocType: Supplier,Billing Currency,Faktureringsvaluta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Extra large
@@ -2852,6 +2905,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Vennligst oppgi ingen av besøk som kreves
 DocType: Stock Settings,Default Valuation Method,Standard verdsettelsesmetode
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,Avgift
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Oppdatering pågår. Det kan ta en stund.
 DocType: Vehicle Log,Fuel Qty,drivstoff Antall
 DocType: Production Order Operation,Planned Start Time,Planlagt Starttid
 DocType: Course,Assessment,Assessment
@@ -2867,7 +2921,7 @@
 DocType: Price List,Price List Master,Prisliste Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Alle salgstransaksjoner kan være merket mot flere ** Salgs Personer ** slik at du kan stille inn og overvåke mål.
 ,S.O. No.,SO No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Opprett Customer fra Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Opprett Customer fra Lead {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Velg Pasient
 DocType: Price List,Applicable for Countries,Gjelder for Land
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Parameternavn
@@ -2899,27 +2953,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Expense / Difference konto ({0}) må være en &quot;resultatet&quot; konto
 DocType: Project,Copied From,Kopiert fra
 DocType: Project,Copied From,Kopiert fra
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Navn feil: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Mangel
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Navn feil: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,Mangel
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} ikke er knyttet til {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Oppmøte for arbeidstaker {0} er allerede merket
 DocType: Packing Slip,If more than one package of the same type (for print),Hvis mer enn en pakke av samme type (for print)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Vennligst sett standardkunden i Restaurantinnstillinger
 ,Salary Register,lønn Register
 DocType: Warehouse,Parent Warehouse,Parent Warehouse
 DocType: C-Form Invoice Detail,Net Total,Net Total
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Standard BOM ikke funnet for element {0} og prosjekt {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Standard BOM ikke funnet for element {0} og prosjekt {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Definere ulike typer lån
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Utestående Beløp
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Tid (i minutter)
 DocType: Project Task,Working,Arbeids
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock Queue (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Regnskapsår
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Regnskapsår
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} ikke tilhører selskapet {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,Kunne ikke løse kriterier score funksjon for {0}. Pass på at formelen er gyldig.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Koste så på
 DocType: Healthcare Settings,Out Patient Settings,Ut pasientinnstillinger
 DocType: Account,Round Off,Avrunde
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Mengden må være positiv
 ,Requested Qty,Spurt Antall
 DocType: Tax Rule,Use for Shopping Cart,Brukes til handlekurv
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Verdi {0} for Egenskap {1} finnes ikke i listen over gyldige elementattributtet Verdier for Element {2}
@@ -2928,7 +2984,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Kostnader vil bli fordelt forholdsmessig basert på element stk eller beløp, som per ditt valg"
 DocType: Maintenance Visit,Purposes,Formål
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Atleast ett element bør legges inn med negativt antall i retur dokument
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Legg til kurs
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} lenger enn noen tilgjengelige arbeidstimer i arbeidsstasjonen {1}, bryte ned driften i flere operasjoner"
 ,Requested,Spurt
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Nei Anmerkninger
@@ -2940,6 +2995,8 @@
 DocType: Employee Loan,Repaid/Closed,Tilbakebetalt / Stengt
 DocType: Item,Total Projected Qty,Samlet forventet Antall
 DocType: Monthly Distribution,Distribution Name,Distribusjon Name
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Verdsettelsesraten ikke funnet for elementet {0}, som er nødvendig for å gjøre regnskapsposter for {1} {2}. Hvis varen er transaksjon som nullverdieringsgrad i {1}, må du nevne det i {1} elementtabellen. Ellers kan du opprette en inntektsaksjonstransaksjon for varen eller nevne verdsettelsesraten i vareoppføringen, og prøv deretter å sende inn / avbryte denne oppføringen"
 DocType: Course,Course Code,Kurskode
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Quality Inspection nødvendig for Element {0}
 DocType: POS Settings,Use POS in Offline Mode,Bruk POS i frakoblet modus
@@ -2950,14 +3007,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Administrer Territory treet.
 DocType: Journal Entry Account,Sales Invoice,Salg Faktura
 DocType: Journal Entry Account,Party Balance,Fest Balance
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,Vennligst velg Bruk rabatt på
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Vennligst velg Bruk rabatt på
 DocType: Company,Default Receivable Account,Standard fordringer konto
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Lag Bank Entry for den totale lønn for de ovenfor valgte kriterier
 DocType: Physician,Physician Schedule,Legerplan
 DocType: Purchase Invoice,Deemed Export,Gjeldende eksport
 DocType: Stock Entry,Material Transfer for Manufacture,Material Transfer for Produksjon
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Rabattprosenten kan brukes enten mot en prisliste eller for alle Prisliste.
-DocType: Purchase Invoice,Half-yearly,Halvårs
+DocType: Subscription,Half-yearly,Halvårs
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Regnskap Entry for Stock
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Du har allerede vurdert for vurderingskriteriene {}.
@@ -2986,13 +3043,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Extra Small
 DocType: Company,Standard Template,standard Template
 DocType: Training Event,Theory,Teori
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Material Requested Antall er mindre enn Minimum Antall
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Material Requested Antall er mindre enn Minimum Antall
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Konto {0} er frosset
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Legal Entity / Datterselskap med en egen konto tilhørighet til organisasjonen.
 DocType: Payment Request,Mute Email,Demp Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Mat, drikke og tobakk"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Kan bare gjøre betaling mot fakturert {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Kommisjon kan ikke være større enn 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Kan bare gjøre betaling mot fakturert {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Kommisjon kan ikke være større enn 100
 DocType: Stock Entry,Subcontract,Underentrepriser
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Fyll inn {0} først
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Ingen svar fra
@@ -3010,10 +3067,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Farge
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Assessment Plan Kriterier
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Forhindre innkjøpsordrer
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,utsatt
 DocType: Patient Appointment,Scheduled,Planlagt
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Forespørsel om kostnadsoverslag.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vennligst oppsett Medarbeiders navngivningssystem i menneskelig ressurs&gt; HR-innstillinger
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Vennligst velg Element der &quot;Er Stock Item&quot; er &quot;Nei&quot; og &quot;Er Sales Item&quot; er &quot;Ja&quot;, og det er ingen andre Product Bundle"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Velg kunde
 DocType: Student Log,Academic,akademisk
 DocType: Patient,Personal and Social History,Personlig og sosial historie
 DocType: Fee Schedule,Fee Breakup for each student,Fee Breakup for hver student
@@ -3023,7 +3081,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Verdivurdering Rate
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,diesel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Prisliste Valuta ikke valgt
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Prisliste Valuta ikke valgt
 apps/erpnext/erpnext/config/healthcare.py +46,Results,resultater
 ,Student Monthly Attendance Sheet,Student Månedlig Oppmøte Sheet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Ansatt {0} har allerede søkt om {1} mellom {2} og {3}
@@ -3039,7 +3097,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Administrer Salgs Partners.
 DocType: Quality Inspection,Inspection Type,Inspeksjon Type
 DocType: Fee Validity,Visited yet,Besøkt ennå
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Næringslokaler med eksisterende transaksjon kan ikke konverteres til gruppen.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Næringslokaler med eksisterende transaksjon kan ikke konverteres til gruppen.
 DocType: Assessment Result Tool,Result HTML,resultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Går ut på dato den
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Legg Studenter
@@ -3066,7 +3124,7 @@
 DocType: Healthcare Settings,Result Printed,Resultat Trykt
 DocType: Asset Category Account,Depreciation Expense Account,Avskrivninger konto
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Prøvetid
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Se {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Se {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Bare bladnoder er tillatt i transaksjonen
 DocType: Expense Claim,Expense Approver,Expense Godkjenner
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Rad {0}: Advance mot Kunden må være kreditt
@@ -3078,7 +3136,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Til Datetime
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Kurstider slettet:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Logger for å opprettholde sms leveringsstatus
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Angi salgsmål
 DocType: Accounts Settings,Make Payment via Journal Entry,Utfør betaling via bilagsregistrering
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Trykt på
 DocType: Item,Inspection Required before Delivery,Inspeksjon Påkrevd før Levering
@@ -3086,7 +3143,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Ventende Aktiviteter
 DocType: Patient Appointment,Reminded,minnet
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Din organisasjon
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Din organisasjon
 DocType: Fee Component,Fees Category,avgifter Kategori
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Skriv inn lindrende dato.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
@@ -3098,7 +3155,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Omgjøre nivå
 DocType: Company,Chart Of Accounts Template,Konto Mal
 DocType: Attendance,Attendance Date,Oppmøte Dato
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Sak Pris oppdateres for {0} i prislisten {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Sak Pris oppdateres for {0} i prislisten {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Lønn breakup basert på opptjening og fradrag.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Konto med barnet noder kan ikke konverteres til Ledger
 DocType: Purchase Invoice Item,Accepted Warehouse,Akseptert Warehouse
@@ -3114,9 +3171,10 @@
 ,Employee Birthday,Ansatt Bursdag
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Batch Oppmøte Tool
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,Limit Krysset
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Planlagt Upto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Et semester med denne &#39;Academic Year&#39; {0} og &quot;Term Name {1} finnes allerede. Vennligst endre disse oppføringene og prøv igjen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Ettersom det er eksisterende transaksjoner mot item {0}, kan du ikke endre verdien av {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Ettersom det er eksisterende transaksjoner mot item {0}, kan du ikke endre verdien av {1}"
 DocType: UOM,Must be Whole Number,Må være hele tall
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nye Løv Tildelte (i dager)
 DocType: Purchase Invoice,Invoice Copy,Faktura kopi
@@ -3126,7 +3184,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
 DocType: Shopping Cart Settings,Orders,Bestillinger
 DocType: Employee Leave Approver,Leave Approver,La Godkjenner
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Vennligst velg en batch
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Vennligst velg en batch
 DocType: Assessment Group,Assessment Group Name,Assessment Gruppenavn
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materialet Overført for Produksjon
 DocType: Expense Claim,"A user with ""Expense Approver"" role",En bruker med &quot;Expense Godkjenner&quot; rolle
@@ -3141,7 +3199,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Periode Closing Entry
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Velg avdeling ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Kostnadssted med eksisterende transaksjoner kan ikke konverteres til gruppen
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Mengden {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Mengden {0} {1} {2} {3}
 DocType: Account,Depreciation,Avskrivninger
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverandør (er)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Employee Oppmøte Tool
@@ -3153,10 +3211,12 @@
 DocType: GL Entry,Voucher No,Kupong Ingen
 ,Lead Owner Efficiency,Leder Eier Effektivitet
 ,Lead Owner Efficiency,Leder Eier Effektivitet
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Mest populær
 DocType: Leave Allocation,Leave Allocation,La Allocation
 DocType: Payment Request,Recipient Message And Payment Details,Mottakers Message og betalingsinformasjon
 DocType: Training Event,Trainer Email,trener E-post
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Materielle Forespørsler {0} er opprettet
+DocType: Restaurant Reservation,No of People,Ingen av mennesker
 DocType: Production Planning Tool,Include sub-contracted raw materials,Inkluder underleverandør råvarer
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Mal av begreper eller kontrakt.
 DocType: Purchase Invoice,Address and Contact,Adresse og Kontakt
@@ -3165,10 +3225,11 @@
 DocType: Supplier,Last Day of the Next Month,Siste dag av neste måned
 DocType: Support Settings,Auto close Issue after 7 days,Auto nær Issue etter 7 dager
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Permisjon kan ikke tildeles før {0}, som permisjon balanse har allerede vært carry-sendt i fremtiden permisjon tildeling posten {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Merk: På grunn / Reference Date stiger tillatt kunde kreditt dager med {0} dag (er)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Merk: På grunn / Reference Date stiger tillatt kunde kreditt dager med {0} dag (er)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,student Søker
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL FOR RECIPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,Akkumulerte avskrivninger konto
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Denne e-posten er autogenerert
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
 DocType: Program Enrollment,Boarding Student,Studerende Student
 DocType: Asset,Expected Value After Useful Life,Forventet verdi Etter Levetid
@@ -3176,7 +3237,7 @@
 DocType: Activity Cost,Billing Rate,Billing Rate
 ,Qty to Deliver,Antall å levere
 ,Stock Analytics,Aksje Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Operasjoner kan ikke være tomt
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Operasjoner kan ikke være tomt
 DocType: Maintenance Visit Purpose,Against Document Detail No,Mot Document Detail Nei
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Partiet Type er obligatorisk
 DocType: Quality Inspection,Outgoing,Utgående
@@ -3198,7 +3259,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Velg studenter manuelt for aktivitetsbasert gruppe
 DocType: Journal Entry,User Remark,Bruker Remark
 DocType: Lead,Market Segment,Markedssegment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Betalt Beløpet kan ikke være større enn total negativ utestående beløp {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Betalt Beløpet kan ikke være større enn total negativ utestående beløp {0}
 DocType: Supplier Scorecard Period,Variables,variabler
 DocType: Employee Internal Work History,Employee Internal Work History,Ansatt Intern Work History
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Lukking (Dr)
@@ -3228,21 +3289,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Få oppdateringer
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} ikke tilhører selskapet {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Materialet Request {0} blir kansellert eller stoppet
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,La Ledelse
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,La Ledelse
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Grupper etter Account
 DocType: Sales Order,Fully Delivered,Fullt Leveres
 DocType: Lead,Lower Income,Lavere inntekt
+DocType: Restaurant Order Entry,Current Order,Nåværende ordre
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Kilden og målet lageret kan ikke være det samme for rad {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskjellen konto må være en eiendel / forpliktelse type konto, siden dette Stock Forsoning er en åpning Entry"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Utbetalt Mengde kan ikke være større enn låne beløpet {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Gå til Programmer
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Innkjøpsordrenummeret som kreves for Element {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Produksjonsordre ikke opprettet
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Produksjonsordre ikke opprettet
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Fra dato&quot; må være etter &#39;To Date&#39;
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Kan ikke endre status som student {0} er knyttet til studentens søknad {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Kan ikke endre status som student {0} er knyttet til studentens søknad {1}
 DocType: Asset,Fully Depreciated,fullt avskrevet
 ,Stock Projected Qty,Lager Antall projiserte
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Kunden {0} ikke hører til prosjektet {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Kunden {0} ikke hører til prosjektet {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Merket Oppmøte HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Sitater er forslag, bud du har sendt til dine kunder"
 DocType: Sales Order,Customer's Purchase Order,Kundens innkjøpsordre
@@ -3253,8 +3315,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Vennligst sett Antall Avskrivninger bestilt
 DocType: Supplier Scorecard Period,Calculations,beregninger
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Verdi eller Stk
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Productions Bestillinger kan ikke heves for:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Productions Bestillinger kan ikke heves for:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Minutt
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vennligst still inn navngivningsserien for {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Invoice,Purchase Taxes and Charges,Kjøpe skatter og avgifter
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Gå til Leverandører
 ,Qty to Receive,Antall å motta
@@ -3267,7 +3330,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Kreditt til kontoen må være en balansekonto
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Alle Leverandør Typer
 DocType: Global Defaults,Disable In Words,Deaktiver I Ord
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,Elementkode er obligatorisk fordi varen ikke blir automatisk nummerert
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,Elementkode er obligatorisk fordi varen ikke blir automatisk nummerert
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Sitat {0} ikke av typen {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vedlikeholdsplan Sak
 DocType: Sales Order,%  Delivered,% Leveres
@@ -3289,23 +3352,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Åpningsbalanse Equity
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Forsoning
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Gjenværende værende~~POS=HEADCOMP
 DocType: Appraisal,Appraisal,Appraisal
 DocType: Purchase Invoice,GST Details,GST-detaljer
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},E-post sendt til leverandøren {0}
+DocType: Item,Default Sales Unit of Measure,Standard salgsmengde av mål
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Dato gjentas
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Autorisert signatur
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},La godkjenner må være en av {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Opprett gebyrer
-DocType: Hub Settings,Seller Email,Selger Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total anskaffelseskost (via fakturaen)
 DocType: Training Event,Start Time,Starttid
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Velg Antall
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Velg Antall
 DocType: Customs Tariff Number,Customs Tariff Number,Tolltariffen nummer
 DocType: Patient Appointment,Patient Appointment,Pasientavtale
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Godkjenne Role kan ikke være det samme som rollen regelen gjelder for
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Melde deg ut av denne e-post Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Melde deg ut av denne e-post Digest
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Få leverandører av
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} ikke funnet for element {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Gå til kurs
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Melding Sendt
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Konto med barnet noder kan ikke settes som hovedbok
@@ -3318,11 +3384,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Materialet Overført for Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Konto {0} ikke eksisterer
 DocType: Project,Project Type,Prosjekttype
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Barneoppgave eksisterer for denne oppgaven. Du kan ikke slette denne oppgaven.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Enten målet stk eller mål beløpet er obligatorisk.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Kostnad for ulike aktiviteter
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Ikke flere resultater
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Kostnad for ulike aktiviteter
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Innstilling Hendelser til {0}, siden den ansatte knyttet til under selgerne ikke har en bruker-ID {1}"
 DocType: Timesheet,Billing Details,Fakturadetaljer
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Kilde og mål lageret må være annerledes
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Kilde og mål lageret må være annerledes
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Ikke lov til å oppdatere lagertransaksjoner eldre enn {0}
 DocType: Purchase Invoice Item,PR Detail,PR Detalj
 DocType: Sales Order,Fully Billed,Fullt Fakturert
@@ -3349,7 +3417,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Sjekk alt
 DocType: Vehicle Log,Invoice Ref,faktura~~POS=TRUNC Ref
-DocType: Purchase Order,Recurring Order,Gjentakende Bestill
 DocType: Company,Default Income Account,Standard Inntekt konto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Kunden Group / Kunde
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed regnskapsårene Profit / Loss (Credit)
@@ -3363,9 +3430,9 @@
 DocType: Patient,A Negative,En negativ
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Ingenting mer å vise.
 DocType: Lead,From Customer,Fra Customer
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Samtaler
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Samtaler
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Et produkt
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,batcher
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,batcher
 DocType: Project,Total Costing Amount (via Time Logs),Total koster Beløp (via Time Logger)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Lag avgiftsplan
 DocType: Purchase Order Item Supplied,Stock UOM,Stock målenheter
@@ -3390,7 +3457,7 @@
 DocType: School Settings,Current Academic Term,Nåværende faglig term
 DocType: School Settings,Current Academic Term,Nåværende faglig term
 DocType: Sales Order,Not Billed,Ikke Fakturert
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Både Warehouse må tilhøre samme selskapet
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Både Warehouse må tilhøre samme selskapet
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Ingen kontakter er lagt til ennå.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Landed Cost Voucher Beløp
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Regninger oppdratt av leverandører.
@@ -3399,7 +3466,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Rabattbeløp
 DocType: Purchase Invoice,Return Against Purchase Invoice,Tilbake mot fakturaen
 DocType: Item,Warranty Period (in days),Garantiperioden (i dager)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',oppdatere `tabPatient Appointment` sett sales_invoice = &#39;{0}&#39; hvor navn = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Relasjon med Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Netto kontantstrøm fra driften
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Sak 4
@@ -3408,8 +3474,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry konto
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,student Gruppe
 DocType: Shopping Cart Settings,Quotation Series,Sitat Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Et element eksisterer med samme navn ({0}), må du endre navn varegruppen eller endre navn på elementet"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Velg kunde
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Et element eksisterer med samme navn ({0}), må du endre navn varegruppen eller endre navn på elementet"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Velg kunde
 DocType: C-Form,I,Jeg
 DocType: Company,Asset Depreciation Cost Center,Asset Avskrivninger kostnadssted
 DocType: Sales Order Item,Sales Order Date,Salgsordre Dato
@@ -3418,6 +3484,7 @@
 DocType: Assessment Plan,Assessment Plan,Assessment Plan
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Kunden {0} er opprettet.
 DocType: Stock Settings,Limit Percent,grense Prosent
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Foreløpig ingen lager tilgjengelig i varehus
 ,Payment Period Based On Invoice Date,Betaling perioden basert på Fakturadato
 DocType: Sample Collection,No. of print,Antall utskrifter
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Mangler valutakurser for {0}
@@ -3473,13 +3540,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Brutto lønn - Totalt Fradrag - Loan Nedbetaling
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,Nåværende BOM og New BOM kan ikke være det samme
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Lønn Slip ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Lønn Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Pensjoneringstidspunktet må være større enn tidspunktet for inntreden
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Det var feil mens scheduling kurs på:
 DocType: Sales Invoice,Against Income Account,Mot Inntekt konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Leveres
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Element {0}: Bestilte qty {1} kan ikke være mindre enn minimum ordreantall {2} (definert i punkt).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Element {0}: Bestilte qty {1} kan ikke være mindre enn minimum ordreantall {2} (definert i punkt).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månedlig Distribution Prosent
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Vennligst logg inn som en annen bruker.
 DocType: Territory,Territory Targets,Terri Targets
 DocType: Delivery Note,Transporter Info,Transporter Info
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Vennligst sett standard {0} i selskapet {1}
@@ -3487,13 +3555,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Samme leverandør er angitt flere ganger
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Brutto gevinst / tap
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Innkjøpsordre Sak Leveres
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Firmanavn kan ikke være selskap
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Firmanavn kan ikke være selskap
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Brevark for utskriftsmaler.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titler for utskriftsmaler f.eks Proforma Faktura.
 DocType: Program Enrollment,Walking,walking
 DocType: Student Guardian,Student Guardian,student Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Verdsettelse typen kostnader kan ikke merket som Inclusive
 DocType: POS Profile,Update Stock,Oppdater Stock
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,i abonnementet
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Ulik målenheter for elementer vil føre til feil (Total) Netto vekt verdi. Sørg for at nettovekt av hvert element er i samme målenheter.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,Bilagsregistrering for Scrap
@@ -3543,15 +3612,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Systemet bruker (innlogging) ID. Hvis satt, vil det bli standard for alle HR-skjemaer."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Fra {1}
 DocType: Task,depends_on,kommer an på
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,I kø for å oppdatere siste pris i alle Materialebevis. Det kan ta noen minutter.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,I kø for å oppdatere siste pris i alle Materialebevis. Det kan ta noen minutter.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Navn på ny konto. Merk: Vennligst ikke opprette kontoer for kunder og leverandører
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Country klok standardadresse Maler
 DocType: Sales Order Item,Supplier delivers to Customer,Leverandør leverer til kunden
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / post / {0}) er utsolgt
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Due / Reference Datoen kan ikke være etter {0}
+,Sales Payment Summary,Salgsbetalingssammendrag
+DocType: Restaurant,Restaurant,Restaurant
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Due / Reference Datoen kan ikke være etter {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data import og eksport
 DocType: Patient,Account Details,kontodetaljer
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Ingen studenter Funnet
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Ingen studenter Funnet
 DocType: Medical Department,Medical Department,Medisinsk avdeling
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Leverandør Scorecard Scoring Criteria
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Faktura Publiseringsdato
@@ -3562,7 +3633,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Vennligst velg Publiseringsdato før du velger Partiet
 DocType: Program Enrollment,School House,school House
 DocType: Serial No,Out of AMC,Ut av AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Vennligst velg tilbud
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Vennligst velg tilbud
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antall Avskrivninger reservert kan ikke være større enn Totalt antall Avskrivninger
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Gjør Vedlikehold Visit
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,Ta kontakt for brukeren som har salgs Master manager {0} rolle
@@ -3570,7 +3641,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) mester.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Dette er basert på tilstedeværelse av denne Student
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Ingen studenter i
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Legg til flere elementer eller åpne full form
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Legg til flere elementer eller åpne full form
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Levering Merknader {0} må avbestilles før den avbryter denne salgsordre
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Gå til Brukere
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Innbetalt beløp + avskrive Beløpet kan ikke være større enn Totalsum
@@ -3590,37 +3661,40 @@
 DocType: Fee Schedule,Fee Schedule,Prisliste
 DocType: Hub Settings,Publish Availability,Publiser Tilgjengelighet
 DocType: Company,Create Chart Of Accounts Based On,Opprett kontoplan basert på
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Kan ikke konvertere det til ikke-gruppe. Barnoppgaver eksisterer.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Fødselsdato kan ikke være større enn i dag.
 ,Stock Ageing,Stock Ageing
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Student {0} eksistere mot student Søkeren {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Avrundingsjustering (Bedriftsvaluta)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Tids skjema
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Tids skjema
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} {1} er deaktivert
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Sett som Åpen
 DocType: Cheque Print Template,Scanned Cheque,skannede Cheque
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Send automatisk e-poster til Kontakter på Sende transaksjoner.
 DocType: Timesheet,Total Billable Amount,Total Fakturerbart Beløp
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Sak 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Bestillingsinngang
 DocType: Purchase Order,Customer Contact Email,Kundekontakt E-post
 DocType: Warranty Claim,Item and Warranty Details,Element og Garanti Detaljer
 DocType: Sales Team,Contribution (%),Bidrag (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Merk: Betaling Entry vil ikke bli laget siden &quot;Cash eller bankkontoen ble ikke spesifisert
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Prosjektet {0} eksisterer allerede
 DocType: Medical Department,Nursing User,Sykepleier Bruker
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Ansvarsområder
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Gyldighetsperioden for dette sitatet er avsluttet.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Gyldighetsperioden for dette sitatet er avsluttet.
 DocType: Expense Claim Account,Expense Claim Account,Expense krav konto
 DocType: Accounts Settings,Allow Stale Exchange Rates,Tillat uaktuelle valutakurser
 DocType: Sales Person,Sales Person Name,Sales Person Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Skriv inn atleast en faktura i tabellen
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Legg til brukere
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Legg til brukere
 DocType: POS Item Group,Item Group,Varegruppe
 DocType: Item,Safety Stock,Safety Stock
 DocType: Healthcare Settings,Healthcare Settings,Helseinstitusjoner
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Progress% for en oppgave kan ikke være mer enn 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Progress% for en oppgave kan ikke være mer enn 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Før avstemming
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Til {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skatter og avgifter legges (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Sak Skatte Rad {0} må ha konto for type skatt eller inntekt eller kostnad eller Charge
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Sak Skatte Rad {0} må ha konto for type skatt eller inntekt eller kostnad eller Charge
 DocType: Sales Order,Partly Billed,Delvis Fakturert
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Element {0} må være et driftsmiddel element
 DocType: Item,Default BOM,Standard BOM
@@ -3636,6 +3710,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,variabel
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Fra følgeseddel
 DocType: Student,Student Email Address,Student e-postadresse
+DocType: Item,Hub Warehouse,Hub lager
 DocType: Physician Schedule Time Slot,From Time,Fra Time
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,På lager:
 DocType: Notification Control,Custom Message,Standard melding
@@ -3644,9 +3719,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Studentadresse
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Studentadresse
 DocType: Purchase Invoice,Price List Exchange Rate,Prisliste Exchange Rate
+DocType: POS Profile,POS Profile Name,POS profilnavn
 DocType: Purchase Invoice Item,Rate,Rate
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Adressenavn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Adressenavn
 DocType: Stock Entry,From BOM,Fra BOM
 DocType: Assessment Code,Assessment Code,Assessment Kode
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Grunnleggende
@@ -3660,11 +3736,12 @@
 DocType: Salary Slip,Salary Structure,Lønn Struktur
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Flyselskap
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Issue Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Issue Material
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Det oppstod en feil under oppretting
 DocType: Material Request Item,For Warehouse,For Warehouse
 DocType: Employee,Offer Date,Tilbudet Dato
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Sitater
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Du er i frakoblet modus. Du vil ikke være i stand til å laste før du har nettverk.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Du er i frakoblet modus. Du vil ikke være i stand til å laste før du har nettverk.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Ingen studentgrupper opprettet.
 DocType: Purchase Invoice Item,Serial No,Serial No
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Månedlig nedbetaling beløpet kan ikke være større enn Lånebeløp
@@ -3674,17 +3751,18 @@
 DocType: Salary Slip,Total Working Hours,Samlet arbeidstid
 DocType: Subscription,Next Schedule Date,Neste planleggingsdato
 DocType: Stock Entry,Including items for sub assemblies,Inkludert elementer for sub samlinger
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Oppgi verdien skal være positiv
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Alle Territories
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Oppgi verdien skal være positiv
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Alle Territories
 DocType: Purchase Invoice,Items,Elementer
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student er allerede registrert.
 DocType: Fiscal Year,Year Name,År Navn
 DocType: Process Payroll,Process Payroll,Process Lønn
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Det er mer ferie enn virkedager denne måneden.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Det er mer ferie enn virkedager denne måneden.
 DocType: Product Bundle Item,Product Bundle Item,Produktet Bundle Element
 DocType: Sales Partner,Sales Partner Name,Sales Partner Name
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Forespørsel om Sitater
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Forespørsel om Sitater
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimal Fakturert beløp
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,hematologi
 DocType: Normal Test Items,Normal Test Items,Normale testelementer
 DocType: Student Language,Student Language,student Språk
 apps/erpnext/erpnext/config/selling.py +23,Customers,kunder
@@ -3696,10 +3774,11 @@
 DocType: Issue,Opening Time,Åpning Tid
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Fra og Til dato kreves
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Verdipapirer og råvarebørser
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard Enhet for Variant {0} må være samme som i malen {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard Enhet for Variant {0} må være samme som i malen {1}
 DocType: Shipping Rule,Calculate Based On,Beregn basert på
 DocType: Delivery Note Item,From Warehouse,Fra Warehouse
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Ingen elementer med Bill of Materials til Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Ingen elementer med Bill of Materials til Manufacture
+DocType: Restaurant,Default Customer,Standardkund
 DocType: Assessment Plan,Supervisor Name,Supervisor Name
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Bekreft ikke om avtalen er opprettet for samme dag
 DocType: Program Enrollment Course,Program Enrollment Course,Programopptakskurs
@@ -3727,7 +3806,7 @@
 DocType: Payment Entry,Internal Transfer,Internal Transfer
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Barnekonto som finnes for denne kontoen. Du kan ikke slette denne kontoen.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Enten målet stk eller mål beløpet er obligatorisk
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Ingen standard BOM finnes for Element {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Ingen standard BOM finnes for Element {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Vennligst velg Publiseringsdato først
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Åpningsdato bør være før påmeldingsfristens utløp
 DocType: Leave Control Panel,Carry Forward,Fremføring
@@ -3763,6 +3842,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Total Present
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,regnskaps~~POS=TRUNC Uttalelser
 DocType: Drug Prescription,Hour,Time
+DocType: Restaurant Order Entry,Last Sales Invoice,Siste salgsfaktura
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,New Serial No kan ikke ha Warehouse. Warehouse må settes av Stock Entry eller Kjøpskvittering
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Du er ikke autorisert til å godkjenne blader på Block Datoer
@@ -3799,65 +3879,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Lag brukere
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,Gram
 DocType: Supplier Scorecard,Per Month,Per måned
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Antall å Manufacture må være større enn 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Antall å Manufacture må være større enn 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Besøk rapport for vedlikehold samtale.
 DocType: Stock Entry,Update Rate and Availability,Oppdateringsfrekvens og tilgjengelighet
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Prosentvis du har lov til å motta eller levere mer mot antall bestilte produkter. For eksempel: Hvis du har bestilt 100 enheter. og din Fradrag er 10% så du har lov til å motta 110 enheter.
 DocType: POS Customer Group,Customer Group,Kundegruppe
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Ny batch-ID (valgfritt)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Ny batch-ID (valgfritt)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Ny batch-ID (valgfritt)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Ny batch-ID (valgfritt)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Utgiftskonto er obligatorisk for elementet {0}
 DocType: BOM,Website Description,Website Beskrivelse
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Netto endring i egenkapital
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Nyeste
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Vennligst avbryte fakturaen {0} først
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-post adresse må være unikt, allerede eksisterer for {0}"
 DocType: Serial No,AMC Expiry Date,AMC Utløpsdato
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,Kvittering
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,Kvittering
 ,Sales Register,Salg Register
 DocType: Daily Work Summary Settings Company,Send Emails At,Send e-post til
 DocType: Quotation,Quotation Lost Reason,Sitat av Lost Reason
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Velg Domene
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',velg * fra tabPatient hvor navn = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Transaksjonsreferanse ikke {0} datert {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Transaksjonsreferanse ikke {0} datert {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Det er ingenting å redigere.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Formvisning
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Oppsummering for denne måneden og ventende aktiviteter
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Formvisning
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Oppsummering for denne måneden og ventende aktiviteter
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Legg til brukere i organisasjonen din, bortsett fra deg selv."
 DocType: Customer Group,Customer Group Name,Kundegruppenavn
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Ingen kunder ennå!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Ingen kunder ennå!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Kontantstrømoppstilling
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeløp kan ikke overstige maksimalt lånebeløp på {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Tillatelse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Vennligst fjern denne Faktura {0} fra C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Vennligst fjern denne Faktura {0} fra C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vennligst velg bære frem hvis du også vil ha med forrige regnskapsår balanse later til dette regnskapsåret
 DocType: GL Entry,Against Voucher Type,Mot Voucher Type
 DocType: Physician,Phone (R),Telefon (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Tidsluker lagt til
 DocType: Item,Attributes,Egenskaper
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Aktiver mal
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vennligst still inn navngivningsserien for {0} via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Skriv inn avskrive konto
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Siste Order Date
 DocType: Patient,B Negative,B Negativ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konto {0} ikke tilhører selskapet {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Serienumre i rad {0} stemmer ikke overens med leveringsnotat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Serienumre i rad {0} stemmer ikke overens med leveringsnotat
 DocType: Student,Guardian Details,Guardian Detaljer
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Oppmøte for flere ansatte
 DocType: Vehicle,Chassis No,chassis Nei
 DocType: Payment Request,Initiated,Initiert
 DocType: Production Order,Planned Start Date,Planlagt startdato
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Vennligst velg en BOM
 DocType: Serial No,Creation Document Type,Creation dokumenttype
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Sluttdato må være større enn startdato
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Sluttdato må være større enn startdato
 DocType: Leave Type,Is Encash,Er encash
 DocType: Leave Allocation,New Leaves Allocated,Nye Leaves Avsatt
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Prosjekt-messig data er ikke tilgjengelig for prisanslag
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Slutt på
 DocType: Project,Expected End Date,Forventet sluttdato
 DocType: Budget Account,Budget Amount,budsjett~~POS=TRUNC
 DocType: Appraisal Template,Appraisal Template Title,Appraisal Mal Tittel
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Fra Dato {0} for Employee {1} kan ikke være før arbeidstakers begynte Dato {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Commercial
 DocType: Patient,Alcohol Current Use,Alkoholstrømbruk
+DocType: Student Admission Program,Student Admission Program,Studentopptaksprogram
 DocType: Payment Entry,Account Paid To,Konto Betalt for å
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent Element {0} må ikke være en lagervare
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Alle produkter eller tjenester.
@@ -3866,30 +3948,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budsjettet for kontoen {1} mot {2} {3} er {4}. Det vil overstige ved {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Rad {0} # konto må være av typen &quot;Fixed Asset &#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Ut Antall
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Regler for å beregne frakt beløp for et salg
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,og unchcked Disabled in the
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Serien er obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansielle Tjenester
 DocType: Student Sibling,Student ID,Student ID
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Typer aktiviteter for Tid Logger
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Leverandør Email
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Typer aktiviteter for Tid Logger
 DocType: Tax Rule,Sales,Salgs
 DocType: Stock Entry Detail,Basic Amount,Grunnbeløp
 DocType: Training Event,Exam,Eksamen
 DocType: Complaint,Complaint,Klage
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Warehouse nødvendig for lager Element {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Warehouse nødvendig for lager Element {0}
 DocType: Leave Allocation,Unused leaves,Ubrukte blader
 DocType: Patient,Alcohol Past Use,Alkohol Tidligere Bruk
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Billing State
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Hente eksploderte BOM (inkludert underenheter)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Hente eksploderte BOM (inkludert underenheter)
 DocType: Authorization Rule,Applicable To (Employee),Gjelder til (Employee)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Due Date er obligatorisk
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Due Date er obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Økning for Egenskap {0} kan ikke være 0
 DocType: Journal Entry,Pay To / Recd From,Betal Til / recd From
 DocType: Naming Series,Setup Series,Oppsett Series
 DocType: Payment Reconciliation,To Invoice Date,Å Fakturadato
 DocType: Supplier,Contact HTML,Kontakt HTML
 ,Inactive Customers,inaktive kunder
+DocType: Student Admission Program,Maximum Age,Maksimal alder
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Kjøps Kvitteringer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Hvordan Pricing Rule er brukt?
@@ -3908,6 +3992,7 @@
 DocType: GL Entry,Remarks,Bemerkninger
 DocType: Payment Entry,Account Paid From,Konto betalt fra
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Elementkode
+DocType: Task,Parent Task,Foreldreoppgave
 DocType: Journal Entry,Write Off Based On,Skriv Off basert på
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Gjør Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Skriv ut og Saker
@@ -3916,20 +4001,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Lønn allerede behandlet for perioden mellom {0} og {1}, La søknadsperioden kan ikke være mellom denne datoperioden."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Installasjon rekord for en Serial No.
 DocType: Guardian Interest,Guardian Interest,Guardian Rente
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Oppsett standardverdier for POS-fakturaer
 apps/erpnext/erpnext/config/hr.py +177,Training,Opplæring
 DocType: Timesheet,Employee Detail,Medarbeider Detalj
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Email ID
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Email ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,Neste Date dag og gjenta på dag i måneden må være lik
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Neste Date dag og gjenta på dag i måneden må være lik
 DocType: Lab Prescription,Test Code,Testkode
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Innstillinger for nettstedet hjemmeside
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ er ikke tillatt for {0} på grunn av et resultatkort som står for {1}
 DocType: Offer Letter,Awaiting Response,Venter på svar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Fremfor
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Totalt beløp {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Ugyldig egenskap {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Totalt beløp {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Ugyldig egenskap {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Nevn hvis ikke-standard betalingskonto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Samme gjenstand er oppgitt flere ganger. {liste}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Vennligst velg vurderingsgruppen annet enn &#39;Alle vurderingsgrupper&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Row {0}: Kostnadsstedet kreves for et element {1}
 DocType: Training Event Employee,Optional,Valgfri
@@ -3952,13 +4037,15 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostnadssted er obligatorisk for Element {2}
 DocType: Vehicle,Policy No,Regler Nei
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Få Elementer fra Produkt Bundle
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Som lager eksisterer mot en vare {0}, kan du ikke aktivere har varianter eiendom"
 DocType: Asset,Straight Line,Rett linje
 DocType: Project User,Project User,prosjekt Bruker
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Dele
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Dele
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Dele
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Dele
 DocType: GL Entry,Is Advance,Er Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Oppmøte Fra Dato og oppmøte To Date er obligatorisk
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,Skriv inn &#39;Er underleverandør&#39; som Ja eller Nei
+DocType: Item,Default Purchase Unit of Measure,Standard innkjøpsenhet for mål
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Siste kommunikasjonsdato
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Siste kommunikasjonsdato
 DocType: Sales Team,Contact No.,Kontaktnummer.
@@ -3967,7 +4054,6 @@
 DocType: Production Order,Check if material transfer entry is not required,Sjekk om materialoverføring ikke er nødvendig
 DocType: Production Order,Check if material transfer entry is not required,Sjekk om materialoverføring ikke er nødvendig
 DocType: Program Enrollment Tool,Get Students From,Få studenter fra
-DocType: Hub Settings,Seller Country,Selger Land
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publiser Elementer på nettstedet
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Gruppe elevene i grupper
 DocType: Authorization Rule,Authorization Rule,Autorisasjon Rule
@@ -3977,8 +4063,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Salgs skatter og avgifter Mal
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Total (Credit)
 DocType: Repayment Schedule,Payment Date,Betalingsdato
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Ny batch Antall
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Ny batch Antall
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Ny batch Antall
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Ny batch Antall
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Klær og tilbehør
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,Kunne ikke løse vektet poengsumfunksjon. Pass på at formelen er gyldig.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Antall Bestill
@@ -3996,6 +4082,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} kan ikke sendes inn, er det allerede {2}"
 DocType: Tax Rule,Billing Country,Fakturering Land
 DocType: Purchase Order Item,Expected Delivery Date,Forventet Leveringsdato
+DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurant Bestillingsinngang
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet- og kredittkort ikke lik for {0} # {1}. Forskjellen er {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Underholdning Utgifter
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Gjør Material Request
@@ -4008,9 +4095,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Konto med eksisterende transaksjon kan ikke slettes
 DocType: Vehicle,Last Carbon Check,Siste Carbon Sjekk
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Rettshjelp
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Vennligst velg antall på rad
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Vennligst velg antall på rad
 DocType: Purchase Invoice,Posting Time,Postering Tid
 DocType: Timesheet,% Amount Billed,% Mengde Fakturert
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Tid per ansettelse&quot; har ikke blitt satt til Dr {0}. Legg det i Leger mester.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefon Utgifter
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Sjekk dette hvis du vil tvinge brukeren til å velge en serie før du lagrer. Det blir ingen standard hvis du sjekke dette.
@@ -4021,6 +4109,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ny kunde Revenue
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Reiseutgifter
 DocType: Maintenance Visit,Breakdown,Sammenbrudd
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Legg til egendefinert felt Abonnement i doktypen {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: {1} kan ikke velges
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Oppdater BOM kostnad automatisk via Scheduler, basert på siste verdivurdering / prisliste rate / siste kjøpshastighet av råvarer."
 DocType: Bank Reconciliation Detail,Cheque Date,Sjekk Dato
@@ -4045,7 +4134,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Total Billing Beløp (via Time Logger)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Leverandør Id
 DocType: Payment Request,Payment Gateway Details,Betaling Gateway Detaljer
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Mengden skal være større enn 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Mengden skal være større enn 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Ordnede noder kan bare opprettes under &#39;Gruppe&#39; type noder
 DocType: Leave Application,Half Day Date,Half Day Date
@@ -4063,12 +4152,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Merk: Element {0} inngått flere ganger
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Alle kontakter.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Firma Forkortelse
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Bruker {0} finnes ikke
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Bruker {0} finnes ikke
 DocType: Subscription,SUB-,UNDER-
 DocType: Item Attribute Value,Abbreviation,Forkortelse
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Betaling Entry finnes allerede
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ikke authroized siden {0} overskrider grensene
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Lønn mal mester.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Patologi
+DocType: Restaurant Order Entry,Restaurant Table,Restaurantbord
 DocType: Leave Type,Max Days Leave Allowed,Max Dager La tillatt
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Still skatteregel for shopping cart
 DocType: Purchase Invoice,Taxes and Charges Added,Skatter og avgifter legges
@@ -4080,10 +4171,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Sitater for å Leads eller kunder.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle tillatt å redigere frossen lager
 ,Territory Target Variance Item Group-Wise,Territorium Target Avviks varegruppe-Wise
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Alle kundegrupper
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Alle kundegrupper
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,akkumulert pr måned
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Kanskje Valutaveksling posten ikke er skapt for {1} til {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Skatt Mal er obligatorisk.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Skatt Mal er obligatorisk.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Konto {0}: Parent konto {1} finnes ikke
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prisliste Rate (Selskap Valuta)
 DocType: Products Settings,Products Settings,Produkter Innstillinger
@@ -4109,13 +4200,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Sak Wise Skatt Detalj
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Institute forkortelse
 ,Item-wise Price List Rate,Element-messig Prisliste Ranger
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Leverandør sitat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Leverandør sitat
 DocType: Quotation,In Words will be visible once you save the Quotation.,I Ord vil være synlig når du lagrer Tilbud.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Antall ({0}) kan ikke være en brøkdel i rad {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Antall ({0}) kan ikke være en brøkdel i rad {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Barcode {0} allerede brukt i Element {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Barcode {0} allerede brukt i Element {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Regler for å legge til fraktkostnader.
 DocType: Item,Opening Stock,åpning Stock
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kunden må
@@ -4133,9 +4224,8 @@
 DocType: Customer,From Lead,Fra Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Bestillinger frigitt for produksjon.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Velg regnskapsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS Profile nødvendig å foreta POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS Profile nødvendig å foreta POS Entry
 DocType: Program Enrollment Tool,Enroll Students,Meld Studenter
-DocType: Hub Settings,Name Token,Navn Token
 DocType: Lab Test,Approved Date,Godkjent dato
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Minst én lageret er obligatorisk
@@ -4153,7 +4243,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Menneskelig Resurs
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Betaling Avstemming Betaling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Skattefordel
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Produksjonsordre har vært {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Produksjonsordre har vært {0}
 DocType: BOM Item,BOM No,BOM Nei
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} ikke har konto {1} eller allerede matchet mot andre verdikupong
@@ -4173,7 +4263,7 @@
 DocType: Currency Exchange,To Currency,Å Valuta
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Tillat følgende brukere å godkjenne La Applications for blokk dager.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Typer av Expense krav.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Selgingsfrekvensen for elementet {0} er lavere enn dens {1}. Salgsprisen bør være minst {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Selgingsfrekvensen for elementet {0} er lavere enn dens {1}. Salgsprisen bør være minst {2}
 DocType: Item,Taxes,Skatter
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Betalt og ikke levert
 DocType: Project,Default Cost Center,Standard kostnadssted
@@ -4187,15 +4277,15 @@
 DocType: Employee Loan,Fully Disbursed,fullt utbetalt
 DocType: Maintenance Visit,Customer Feedback,Customer Feedback
 DocType: Account,Expense,Expense
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Score kan ikke være større enn Maksimal poengsum
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Score kan ikke være større enn Maksimal poengsum
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Kunder og leverandører
 DocType: Item Attribute,From Range,Fra Range
 DocType: BOM,Set rate of sub-assembly item based on BOM,Angi hastighet på underenhetens element basert på BOM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Syntaksfeil i formelen eller tilstand: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Syntaksfeil i formelen eller tilstand: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Daglig arbeid Oppsummering Innstillinger selskapet
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,Element {0} ignorert siden det ikke er en lagervare
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Send dette produksjonsordre for videre behandling.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Send dette produksjonsordre for videre behandling.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Hvis du ikke vil bruke Prissetting regel i en bestemt transaksjon, bør alle gjeldende reglene for prissetting deaktiveres."
 DocType: Assessment Group,Parent Assessment Group,Parent Assessment Group
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Jobs
@@ -4212,12 +4302,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Vennligst sett Company filter blank hvis Group By er &#39;Company&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Publiseringsdato kan ikke være fremtidig dato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} samsvarer ikke med {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,for å generere de tilbakevendende
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Casual La
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Lab Test UOM.
 DocType: Batch,Batch ID,Batch ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Merk: {0}
 ,Delivery Note Trends,Levering Note Trender
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Denne ukens oppsummering
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Denne ukens oppsummering
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,På lager Antall
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan bare oppdateres via lagertransaksjoner
 DocType: Student Group Creation Tool,Get Courses,Få Kurs
@@ -4231,7 +4322,6 @@
 DocType: Purchase Order,To Bill,Til Bill
 DocType: Material Request,% Ordered,% Bestilt
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",For kursbasert studentgruppe vil kurset bli validert for hver student fra de innmeldte kursene i programopptaket.
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Skriv inn e-postadresse atskilt med komma, vil fakturaen bli sendt automatisk på bestemt dato"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Akkord
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Avg. Kjøpe Rate
 DocType: Task,Actual Time (in Hours),Virkelig tid (i timer)
@@ -4245,7 +4335,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Element {0} er ikke oppsett for Serial Nos. Kolonne må være tomt
 DocType: Accounts Settings,Accounts Settings,Regnskap Innstillinger
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,Vedta
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Ingen resultat å sende inn
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Ingen resultat å sende inn
 DocType: Customer,Sales Partner and Commission,Sales Partner og Kommisjonen
 DocType: Employee Loan,Rate of Interest (%) / Year,Rente (%) / År
 ,Project Quantity,prosjekt Antall
@@ -4257,55 +4347,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Svart
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Element
 DocType: Account,Auditor,Revisor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} elementer produsert
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} elementer produsert
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Lære mer
 DocType: Cheque Print Template,Distance from top edge,Avstand fra øvre kant
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Prisliste {0} er deaktivert eller eksisterer ikke
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Prisliste {0} er deaktivert eller eksisterer ikke
 DocType: Purchase Invoice,Return,Return
 DocType: Production Order Operation,Production Order Operation,Produksjon Bestill Operation
 DocType: Pricing Rule,Disable,Deaktiver
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Modus for betaling er nødvendig å foreta en betaling
 DocType: Project Task,Pending Review,Avventer omtale
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Utnevnelser og konsultasjoner
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} er ikke påmeldt i batch {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} er ikke påmeldt i batch {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} kan ikke bli vraket, som det er allerede {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense krav (via Expense krav)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Fraværende
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rad {0}: valuta BOM # {1} bør være lik den valgte valutaen {2}
 DocType: Journal Entry Account,Exchange Rate,Vekslingskurs
 DocType: Patient,Additional information regarding the patient,Ytterligere informasjon om pasienten
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Salgsordre {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Salgsordre {0} er ikke innsendt
 DocType: Homepage,Tag Line,tag Linje
 DocType: Fee Component,Fee Component,Fee Component
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Flåtestyring
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Legg elementer fra
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Flåtestyring
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Legg elementer fra
 DocType: Cheque Print Template,Regular,Regelmessig
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Totalt weightage av alle vurderingskriteriene må være 100%
-DocType: BOM,Last Purchase Rate,Siste Purchase Rate
+DocType: Purchase Order Item,Last Purchase Rate,Siste Purchase Rate
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Task ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock kan ikke eksistere for Element {0} siden har varianter
 DocType: Lab Test,Mobile,Mobil
 ,Sales Person-wise Transaction Summary,Transaksjons Oppsummering Sales Person-messig
 DocType: Training Event,Contact Number,Kontakt nummer
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Warehouse {0} finnes ikke
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrer For ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Warehouse {0} finnes ikke
 DocType: Monthly Distribution,Monthly Distribution Percentages,Månedlig Distribusjonsprosent
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Den valgte elementet kan ikke ha Batch
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Verdsettelse hastighet ikke funnet med Element {0}, som er nødvendig for å gjøre regnskap oppføringer for {1} {2}. Hvis elementet er transacting som en prøve element i {1}, kan nevnes at i {1} Element tabell. Ellers må du opprette en innkommende lager transaksjon for varen eller omtale verdivurdering hastighet i element posten, og deretter prøve submiting / avbryter denne oppføringen"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Av materialer leveres mot denne følgeseddel
+DocType: Training Event,Has Certificate,Har sertifikat
 DocType: Project,Customer Details,Kunde Detaljer
 DocType: Employee,Reports to,Rapporter til
 ,Unpaid Expense Claim,Ubetalte Expense krav
 DocType: Payment Entry,Paid Amount,Innbetalt beløp
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Utforsk salgssyklusen
 DocType: Assessment Plan,Supervisor,Supervisor
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,på nett
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,på nett
 ,Available Stock for Packing Items,Tilgjengelig på lager for pakk gjenstander
 DocType: Item Variant,Item Variant,Sak Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Assessment Resultat Tool
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Element
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Innsendte bestillinger kan ikke slettes
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Innsendte bestillinger kan ikke slettes
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo allerede i debet, har du ikke lov til å sette &quot;Balance må være &#39;som&#39; Credit &#39;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Kvalitetsstyring
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Element {0} har blitt deaktivert
@@ -4325,7 +4414,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: timings konflikter med rad {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Tillat null verdivurdering
 DocType: Training Event Employee,Invited,invitert
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Flere aktive Lønn Structures funnet for arbeidstaker {0} for den gitte datoer
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Flere aktive Lønn Structures funnet for arbeidstaker {0} for den gitte datoer
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Oppsett Gateway kontoer.
 DocType: Employee,Employment Type,Type stilling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Anleggsmidler
@@ -4337,7 +4426,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Varsel (dager)
 DocType: Tax Rule,Sales Tax Template,Merverdiavgift Mal
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Velg elementer for å lagre fakturaen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Velg elementer for å lagre fakturaen
 DocType: Employee,Encashment Date,Encashment Dato
 DocType: Training Event,Internet,Internett
 DocType: Special Test Template,Special Test Template,Spesiell testmal
@@ -4346,7 +4435,7 @@
 DocType: Production Order,Planned Operating Cost,Planlagt driftskostnader
 DocType: Academic Term,Term Start Date,Term Startdato
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opptelling
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Vedlagt {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Vedlagt {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Kontoutskrift balanse pr hovedbok
 DocType: Job Applicant,Applicant Name,Søkerens navn
 DocType: Authorization Rule,Customer / Item Name,Kunde / Navn
@@ -4366,7 +4455,7 @@
 DocType: Guardian,Guardian Of ,Guardian Av
 DocType: Grading Scale Interval,Threshold,Terskel
 DocType: BOM Update Tool,Current BOM,Nåværende BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Legg Serial No
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Legg Serial No
 DocType: Production Order Item,Available Qty at Source Warehouse,Tilgjengelig antall på Source Warehouse
 apps/erpnext/erpnext/config/support.py +22,Warranty,Garanti
 DocType: Purchase Invoice,Debit Note Issued,Debitnota Utstedt
@@ -4389,10 +4478,9 @@
 DocType: Account,Receivable,Fordring
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Ikke lov til å endre Leverandør som innkjøpsordre allerede eksisterer
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rollen som får lov til å sende transaksjoner som overstiger kredittgrenser fastsatt.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Velg delbetaling Produksjon
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Master data synkronisering, kan det ta litt tid"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Velg delbetaling Produksjon
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Master data synkronisering, kan det ta litt tid"
 DocType: Item,Material Issue,Material Issue
-DocType: Hub Settings,Seller Description,Selger Beskrivelse
 DocType: Employee Education,Qualification,Kvalifisering
 DocType: Item Price,Item Price,Sak Pris
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Såpe og vaskemiddel
@@ -4400,7 +4488,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Fra tid kan ikke være større enn til annen.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestilt
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Gjenoppta
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Gjenoppta
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Hvis aktivert, vil systemet ikke oppdatere feltene for varianter fra malen, men vil kopiere dataene til de nevnte feltene mens du lager ny variant"
 DocType: Salary Detail,Component,Komponent
 DocType: Assessment Criteria,Assessment Criteria Group,Vurderingskriterier Gruppe
 DocType: Healthcare Settings,Patient Name By,Pasientnavn Av
@@ -4410,7 +4499,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Skriv inn Godkjenne Rolle eller Godkjenne User
 DocType: Journal Entry,Write Off Entry,Skriv Off Entry
 DocType: BOM,Rate Of Materials Based On,Valuta materialer basert på
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
+DocType: Item Variant Settings,Do not Update Variants,Ikke oppdatere varianter
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Støtte Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Fjern haken ved alle
 DocType: POS Profile,Terms and Conditions,Vilkår og betingelser
@@ -4419,7 +4508,7 @@
 DocType: Leave Block List,Applies to Company,Gjelder Selskapet
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,Kan ikke avbryte fordi innsendt Stock Entry {0} finnes
 DocType: Employee Loan,Disbursement Date,Innbetalingsdato
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;Mottakere&#39; ikke spesifisert
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Mottakere&#39; ikke spesifisert
 DocType: BOM Update Tool,Update latest price in all BOMs,Oppdater siste pris i alle BOMs
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Pasientjournal
 DocType: Vehicle,Vehicle,Kjøretøy
@@ -4434,14 +4523,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Avskrivninger og Balanserer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Mengden {0} {1} overført fra {2} til {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Mengden {0} {1} overført fra {2} til {3}
 DocType: Sales Invoice,Get Advances Received,Få Fremskritt mottatt
 DocType: Email Digest,Add/Remove Recipients,Legg til / fjern Mottakere
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Transaksjonen ikke lov mot stoppet Produksjonsordre {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","For å sette dette regnskapsåret som standard, klikk på &quot;Angi som standard &#39;"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Bli med
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Bli med
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Mangel Antall
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
 DocType: Employee Loan,Repay from Salary,Smelle fra Lønn
 DocType: Leave Application,LAP/,RUNDE/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Ber om betaling mot {0} {1} for mengden {2}
@@ -4454,7 +4543,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Salgsordre Element
 DocType: Salary Slip,Payment Days,Betalings Days
 DocType: Patient,Dormant,Sovende
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Næringslokaler med barn noder kan ikke konverteres til Ledger
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Næringslokaler med barn noder kan ikke konverteres til Ledger
 DocType: BOM,Manage cost of operations,Administrer driftskostnader
 DocType: Accounts Settings,Stale Days,Foreldede dager
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Når noen av de merkede transaksjonene &quot;Skrevet&quot;, en e-pop-up automatisk åpnet for å sende en e-post til den tilhørende &quot;Kontakt&quot; i at transaksjonen med transaksjonen som et vedlegg. Brukeren kan eller ikke kan sende e-posten."
@@ -4468,10 +4557,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serial No {0} er allerede mottatt
 ,Requested Items To Be Transferred,Etterspør elementene som skal overføres
 DocType: Expense Claim,Vehicle Log,Vehicle Log
-DocType: Purchase Invoice,Recurring Id,Gjentakende Id
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Tilstedeværelse av feber (temp&gt; 38,5 ° C eller vedvarende temp&gt; 38 ° C / 100,4 ° F)"
 DocType: Customer,Sales Team Details,Salgsteam Detaljer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Slett permanent?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Slett permanent?
 DocType: Expense Claim,Total Claimed Amount,Total Hevdet Beløp
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potensielle muligheter for å selge.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Ugyldig {0}
@@ -4481,7 +4569,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Varehus
 ,Item Delivery Date,Leveringsdato for vare
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Oppsettet ditt School i ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Oppsettet ditt School i ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Endre Beløp (Selskap Valuta)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Ingen regnskapspostene for følgende varehus
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Lagre dokumentet først.
@@ -4493,13 +4581,12 @@
 DocType: Task,Is Milestone,Er Milestone
 DocType: Daily Work Summary,Email Sent To,E-post sendt Å
 DocType: Budget,Warn,Advare
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Er du sikker på at du vil avregistrere?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Eventuelle andre bemerkninger, bemerkelsesverdig innsats som bør gå i postene."
 DocType: BOM,Manufacturing User,Manufacturing User
 DocType: Purchase Invoice,Raw Materials Supplied,Råvare Leveres
-DocType: Purchase Invoice,Recurring Print Format,Gjentakende Print Format
 DocType: C-Form,Series,Series
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Valuta på prislisten {0} må være {1} eller {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Legg til produkter
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Valuta på prislisten {0} må være {1} eller {2}
 DocType: Appraisal,Appraisal Template,Appraisal Mal
 DocType: Item Group,Item Classification,Sak Klassifisering
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Business Development Manager
@@ -4513,7 +4600,7 @@
 DocType: Item Attribute Value,Attribute Value,Attributtverdi
 ,Itemwise Recommended Reorder Level,Itemwise Anbefalt Omgjøre nivå
 DocType: Salary Detail,Salary Detail,lønn Detalj
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Vennligst velg {0} først
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Vennligst velg {0} først
 DocType: Appointment Type,Physician,lege
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Batch {0} av Element {1} er utløpt.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,konsultasjoner
@@ -4524,7 +4611,7 @@
 DocType: Salary Detail,Default Amount,Standard Beløp
 DocType: Lab Test Template,Descriptive,beskrivende
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Warehouse ikke funnet i systemet
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Denne måneden Oppsummering
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Denne måneden Oppsummering
 DocType: Quality Inspection Reading,Quality Inspection Reading,Quality Inspection Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Aksjer Eldre Than` bør være mindre enn% d dager.
 DocType: Tax Rule,Purchase Tax Template,Kjøpe Tax Mal
@@ -4547,12 +4634,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Treningsarrangementer / resultater
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Akkumulerte avskrivninger som på
 DocType: Sales Invoice,C-Form Applicable,C-Form Gjelder
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Operation Tid må være større enn 0 for operasjon {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Operation Tid må være større enn 0 for operasjon {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Warehouse er obligatorisk
 DocType: Supplier,Address and Contacts,Adresse og Kontakt
 DocType: UOM Conversion Detail,UOM Conversion Detail,Målenheter Conversion Detalj
 DocType: Program,Program Abbreviation,program forkortelse
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Produksjonsordre kan ikke heves mot et elementmal
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Produksjonsordre kan ikke heves mot et elementmal
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Kostnader er oppdatert i Purchase Mottak mot hvert element
 DocType: Warranty Claim,Resolved By,Løst Av
 DocType: Bank Guarantee,Start Date,Startdato
@@ -4578,26 +4665,27 @@
 DocType: Employee,Educational Qualification,Pedagogiske Kvalifikasjoner
 DocType: Workstation,Operating Costs,Driftskostnader
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Tiltak hvis Snø Månedlig budsjett Skredet
-DocType: Purchase Invoice,Submit on creation,Send inn på skapelse
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Valuta for {0} må være {1}
+DocType: Subscription,Submit on creation,Send inn på skapelse
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Valuta for {0} må være {1}
 DocType: Asset,Disposal Date,Deponering Dato
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-post vil bli sendt til alle aktive ansatte i selskapet ved den gitte timen, hvis de ikke har ferie. Oppsummering av svarene vil bli sendt ved midnatt."
 DocType: Employee Leave Approver,Employee Leave Approver,Ansatt La Godkjenner
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Rad {0}: En Omgjøre oppføring finnes allerede for dette lageret {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklære som tapt, fordi tilbudet er gjort."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,trening Tilbakemelding
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Rad {0}: En Omgjøre oppføring finnes allerede for dette lageret {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklære som tapt, fordi tilbudet er gjort."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,trening Tilbakemelding
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Produksjonsordre {0} må sendes
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Leverandør Scorecard Kriterier
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Vennligst velg startdato og sluttdato for Element {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Kurset er obligatorisk i rad {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Til dags dato kan ikke være før fra dato
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Legg til / Rediger priser
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Legg til / Rediger priser
 DocType: Batch,Parent Batch,Parent Batch
 DocType: Cheque Print Template,Cheque Print Template,Sjekk ut Mal
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Plan Kostnadssteder
 DocType: Lab Test Template,Sample Collection,Eksempel Innsamling
 ,Requested Items To Be Ordered,Etterspør Elementer bestilles
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Mine bestillinger
 DocType: Price List,Price List Name,Prisliste Name
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Daglig arbeid Summary for {0}
 DocType: Employee Loan,Totals,Totals
@@ -4616,12 +4704,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} enheter av {1} trengs i {2} på {3} {4} for {5} for å fullføre denne transaksjonen.
 DocType: Fee Schedule,Student Category,student Kategori
 DocType: Announcement,Student,Student
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Organisasjonsenhet (departement) mester.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Organisasjonsenhet (departement) mester.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Gå til rom
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Skriv inn meldingen før du sender
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,DUPLIKATE FOR LEVERANDØR
 DocType: Email Digest,Pending Quotations,Avventer Sitater
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Point-of-Sale Profile
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Point-of-Sale Profile
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Lab Test Configurations.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Usikret lån
 DocType: Cost Center,Cost Center Name,Kostnadssteds Name
@@ -4631,6 +4719,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Sum innskutt Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Meldinger som er større enn 160 tegn vil bli delt inn i flere meldinger
 DocType: Purchase Receipt Item,Received and Accepted,Mottatt og akseptert
+DocType: Hub Settings,Company and Seller Profile,Bedrift og selgerprofil
 ,GST Itemised Sales Register,GST Artized Sales Register
 ,Serial No Service Contract Expiry,Serial No Service kontraktsutløp
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Du kan ikke kreditt- og debet samme konto samtidig
@@ -4640,10 +4729,11 @@
 DocType: Item,Variant Based On,Variant basert på
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Total weightage tilordnet skal være 100%. Det er {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Dine Leverandører
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Vennligst korrigér
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Kan ikke settes som tapt som Salgsordre er gjort.
 DocType: Request for Quotation Item,Supplier Part No,Leverandør varenummer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan ikke trekke når kategorien er for verdsetting &#39;eller&#39; Vaulation og Total &#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Mottatt fra
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Mottatt fra
 DocType: Lead,Converted,Omregnet
 DocType: Item,Has Serial No,Har Serial No
 DocType: Employee,Date of Issue,Utstedelsesdato
@@ -4651,7 +4741,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","I henhold til kjøpsinnstillingene hvis kjøp tilbakekjøpt er nødvendig == &#39;JA&#39; og deretter for å opprette kjøpfaktura, må brukeren opprette kjøpsmottak først for element {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Row # {0}: Sett Leverandør for elementet {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Rad {0}: Timer verdien må være større enn null.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Website Bilde {0} festet til Element {1} kan ikke finnes
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Website Bilde {0} festet til Element {1} kan ikke finnes
 DocType: Issue,Content Type,Innholdstype
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Datamaskin
 DocType: Item,List this Item in multiple groups on the website.,Liste denne vare i flere grupper på nettstedet.
@@ -4662,14 +4752,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Få avstemte Entries
 DocType: Payment Reconciliation,From Invoice Date,Fra Fakturadato
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Du har ikke tillatelse til å sende inn
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,Fakturering valuta må være lik enten standard comapany valuta eller fremmed regning av valuta
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Fakturering valuta må være lik enten standard comapany valuta eller fremmed regning av valuta
 DocType: Healthcare Settings,Laboratory Settings,Laboratorieinnstillinger
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,La Encashment
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Hva gjør det?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Til Warehouse
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Alle Student Opptak
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Hva gjør det?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Til Warehouse
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Alle Student Opptak
 ,Average Commission Rate,Gjennomsnittlig kommisjon
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,«Har Serial No &#39;kan ikke være&#39; Ja &#39;for ikke-lagervare
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,«Har Serial No &#39;kan ikke være&#39; Ja &#39;for ikke-lagervare
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Velg Status
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Oppmøte kan ikke merkes for fremtidige datoer
 DocType: Pricing Rule,Pricing Rule Help,Prising Rule Hjelp
@@ -4687,41 +4777,41 @@
 DocType: Item,Customer Code,Kunden Kode
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Bursdag Påminnelse for {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dager siden siste Bestill
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Uttak fra kontoen må være en balansekonto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Uttak fra kontoen må være en balansekonto
 DocType: Buying Settings,Naming Series,Navngi Series
 DocType: Leave Block List,Leave Block List Name,La Block List Name
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Forsikring Startdatoen må være mindre enn Forsikring Sluttdato
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Vennligst oppsett Instruktør Navngivningssystem i skolen&gt; Skoleinnstillinger
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Aksje Eiendeler
 DocType: Timesheet,Production Detail,produksjon Detail
+DocType: Restaurant,Active Menu,Aktiv meny
 DocType: Target Detail,Target Qty,Target Antall
 DocType: Shopping Cart Settings,Checkout Settings,Kasse Innstillinger
 DocType: Attendance,Present,Present
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Levering Note {0} må ikke sendes inn
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Levering Note {0} må ikke sendes inn
 DocType: Notification Control,Sales Invoice Message,Salgsfaktura Message
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Lukke konto {0} må være av typen Ansvar / Egenkapital
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Lønn Slip av ansattes {0} allerede opprettet for timeregistrering {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Lønn Slip av ansattes {0} allerede opprettet for timeregistrering {1}
 DocType: Vehicle Log,Odometer,Kilometerteller
 DocType: Sales Order Item,Ordered Qty,Bestilte Antall
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Element {0} er deaktivert
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Element {0} er deaktivert
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Opp
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM inneholder ikke lagervare
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Prosjektet aktivitet / oppgave.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM inneholder ikke lagervare
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Prosjektet aktivitet / oppgave.
 DocType: Vehicle Log,Refuelling Details,Fylle drivstoff Detaljer
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generere lønnsslipper
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Kjøper må sjekkes, hvis dette gjelder for er valgt som {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabatt må være mindre enn 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Siste kjøp sats ikke funnet
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skriv Off Beløp (Selskap Valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,fakturerings~~POS=TRUNC Timer
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,Standard BOM for {0} ikke funnet
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Row # {0}: Vennligst sett omgjøring kvantitet
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Standard BOM for {0} ikke funnet
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Row # {0}: Vennligst sett omgjøring kvantitet
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Trykk på elementer for å legge dem til her
 DocType: Fees,Program Enrollment,program Påmelding
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Cost Voucher
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Vennligst sett {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Gjenta på dag i måneden
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} er inaktiv student
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} er inaktiv student
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} er inaktiv student
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} er inaktiv student
 DocType: Employee,Health Details,Helse Detaljer
 DocType: Offer Letter,Offer Letter Terms,Tilby Letter Vilkår
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,For å opprette en betalingsforespørsel kreves referansedokument
@@ -4730,7 +4820,6 @@
 DocType: Employee External Work History,Salary,Lønn
 DocType: Serial No,Delivery Document Type,Levering dokumenttype
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Send inn alle lønnsslipper for de ovenfor valgte kriterier
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} elementer synkronisert
 DocType: Sales Order,Partly Delivered,Delvis Leveres
 DocType: Email Digest,Receivables,Fordringer
 DocType: Lead Source,Lead Source,Lead Source
@@ -4751,9 +4840,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Aldring Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Strength
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM erstattet
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Velg elementer basert på leveringsdato
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Velg elementer basert på leveringsdato
 ,Sales Analytics,Salgs Analytics
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Tilgjengelig {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Tilgjengelig {0}
 ,Prospects Engaged But Not Converted,"Utsikter engasjert, men ikke konvertert"
 ,Prospects Engaged But Not Converted,"Utsikter engasjert, men ikke konvertert"
 DocType: Manufacturing Settings,Manufacturing Settings,Produksjons Innstillinger
@@ -4761,10 +4850,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Mobile No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Skriv inn standardvaluta i selskapet Master
 DocType: Stock Entry Detail,Stock Entry Detail,Stock Entry Detail
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Daglige påminnelser
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Daglige påminnelser
 DocType: Products Settings,Home Page is Products,Hjemme side er produkter
 ,Asset Depreciation Ledger,Asset Avskrivninger Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Skatteregel Konflikter med {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Skatteregel Konflikter med {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,New Account Name
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Råvare Leveres Cost
 DocType: Selling Settings,Settings for Selling Module,Innstillinger for å selge Module
@@ -4778,8 +4867,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Elementet {0} må være en lagervare
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard Work In Progress Warehouse
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Standardinnstillingene for regnskapsmessige transaksjoner.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vennligst oppsett Medarbeiders navngivningssystem i menneskelig ressurs&gt; HR-innstillinger
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Forventet Datoen kan ikke være før Material Request Dato
+DocType: Restaurant,Default Tax Template,Standardskattemall
 DocType: Fees,Student Details,Studentdetaljer
 DocType: Purchase Invoice Item,Stock Qty,Varenummer
 DocType: Employee Loan,Repayment Period in Months,Nedbetalingstid i måneder
@@ -4797,8 +4887,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Gå til elementer
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Faktiske
+DocType: Restaurant Menu,Restaurant Manager,Restaurantsjef
 DocType: Authorization Rule,Customerwise Discount,Customerwise Rabatt
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Timeregistrering for oppgaver.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Timeregistrering for oppgaver.
 DocType: Purchase Invoice,Against Expense Account,Mot regning
 DocType: Production Order,Production Order,Produksjon Bestill
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Installasjon Merk {0} har allerede blitt sendt
@@ -4806,7 +4897,6 @@
 DocType: Quotation Item,Against Docname,Mot Docname
 DocType: SMS Center,All Employee (Active),All Employee (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Vis nå
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Velg perioden når fakturaen blir generert automatisk
 DocType: BOM,Raw Material Cost,Raw Material Cost
 DocType: Item Reorder,Re-Order Level,Re-Order nivå
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Skriv inn elementer og planlagt stk som du ønsker å heve produksjonsordrer eller laste råvarer for analyse.
@@ -4819,24 +4909,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Rapporter Type er obligatorisk
 DocType: Item,Serial Number Series,Serienummer Series
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Warehouse er obligatorisk for lager Element {0} i rad {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Legg til programmer
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail &amp; Wholesale
 DocType: Issue,First Responded On,Først Svarte På
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Notering av varen i flere grupper
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Regnskapsår Startdato og regnskapsår sluttdato er allerede satt i regnskapsåret {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Lagersalg oppdatert
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split Batch
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Vellykket Forsonet
 DocType: Request for Quotation Supplier,Download PDF,Last ned PDF
 DocType: Production Order,Planned End Date,Planlagt sluttdato
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Vennligst skriv inn planlagt dato
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Hvor varene er lagret.
 DocType: Request for Quotation,Supplier Detail,Leverandør Detalj
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Feil i formel eller betingelse: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Feil i formel eller betingelse: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Fakturert beløp
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kriterievekter må legge opp til 100%
 DocType: Attendance,Attendance,Oppmøte
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,lager~~POS=TRUNC
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,lager~~POS=TRUNC
 DocType: BOM,Materials,Materialer
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Hvis ikke sjekket, vil listen må legges til hver avdeling hvor det må brukes."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Kilde og Target Warehouse kan ikke være det samme
@@ -4854,6 +4944,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,On Net Total
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Verdi for Egenskap {0} må være innenfor området {1} til {2} i trinn på {3} for Element {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Target lager i rad {0} må være samme som produksjonsordre
+DocType: Restaurant Reservation,Waitlisted,ventelisten
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Valuta kan ikke endres etter at oppføringer ved hjelp av en annen valuta
 DocType: Vehicle Service,Clutch Plate,clutch Plate
 DocType: Company,Round Off Account,Rund av konto
@@ -4870,7 +4961,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,New Sales Person navn
 DocType: Packing Slip,Gross Weight UOM,Bruttovekt målenheter
 DocType: Delivery Note Item,Against Sales Invoice,Mot Salg Faktura
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Vennligst skriv inn serienumre for serialisert element
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Vennligst skriv inn serienumre for serialisert element
 DocType: Bin,Reserved Qty for Production,Reservert Antall for produksjon
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,La være ukontrollert hvis du ikke vil vurdere batch mens du lager kursbaserte grupper.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,La være ukontrollert hvis du ikke vil vurdere batch mens du lager kursbaserte grupper.
@@ -4882,7 +4973,7 @@
 DocType: Lab Test,Test Group,Testgruppe
 DocType: Payment Reconciliation,Receivable / Payable Account,Fordringer / gjeld konto
 DocType: Delivery Note Item,Against Sales Order Item,Mot kundeordreposisjon
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Vennligst oppgi data Verdi for attributtet {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Vennligst oppgi data Verdi for attributtet {0}
 DocType: Item,Default Warehouse,Standard Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budsjettet kan ikke overdras mot gruppekonto {0}
 DocType: Healthcare Settings,Patient Registration,Pasientregistrering
@@ -4912,6 +5003,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Sales Person
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Budsjett og kostnadssted
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Flere standard betalingsmåter er ikke tillatt
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,for
 ,Appointment Analytics,Avtale Analytics
 DocType: Vehicle Service,Half Yearly,Halvårlig
 DocType: Lead,Blog Subscriber,Blogg Subscriber
@@ -4931,7 +5023,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Sitatall
 ,BOM Stock Report,BOM aksjerapport
 DocType: Stock Reconciliation Item,Quantity Difference,Antall Difference
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Processing Lønn
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Processing Lønn
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Credit Beløp
 DocType: Cheque Print Template,Signatory Position,Signataren plassering
@@ -4945,12 +5037,12 @@
 DocType: Tax Rule,Tax Rule,Skatt Rule
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Opprettholde samme hastighet Gjennom Salgssyklus
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planlegg tids logger utenfor arbeidsstasjon arbeidstid.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Kunder i kø
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} har ikke en legeplan. Legg det i lege master
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Kunder i kø
 DocType: Student,Nationality,Nasjonalitet
 ,Items To Be Requested,Elementer å bli forespurt
-DocType: Purchase Order,Get Last Purchase Rate,Få siste kjøp Ranger
 DocType: Company,Company Info,Selskap Info
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Velg eller legg til ny kunde
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Velg eller legg til ny kunde
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Kostnadssted er nødvendig å bestille en utgift krav
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse av midler (aktiva)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Dette er basert på tilstedeværelse av denne Employee
@@ -4958,6 +5050,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Debet konto
 DocType: Fiscal Year,Year Start Date,År Startdato
 DocType: Attendance,Employee Name,Ansattes Navn
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restaurant Bestillingsinngang
 DocType: Sales Invoice,Rounded Total (Company Currency),Avrundet Total (Selskap Valuta)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Kan ikke covert til konsernet fordi Kontotype er valgt.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} har blitt endret. Vennligst oppdater.
@@ -4968,6 +5061,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Ytelser til ansatte
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Pakket mengde må være lik mengde for Element {0} i rad {1}
 DocType: Production Order,Manufactured Qty,Produsert Antall
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Faktura er opprettet
 DocType: Purchase Receipt Item,Accepted Quantity,Akseptert Antall
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Vennligst angi en standard Holiday Liste for Employee {0} eller selskapet {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} ikke eksisterer
@@ -4977,18 +5071,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nei {0}: Beløpet kan ikke være større enn utestående beløpet mot Expense krav {1}. Avventer Beløp er {2}
 DocType: Maintenance Schedule,Schedule,Tidsplan
 DocType: Account,Parent Account,Parent konto
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Tilgjengelig
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Tilgjengelig
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Kupong Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Prisliste ikke funnet eller deaktivert
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Prisliste ikke funnet eller deaktivert
 DocType: Lab Test,Approved,Godkjent
 DocType: Pricing Rule,Price,Pris
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',Ansatt lettet på {0} må være angitt som &quot;venstre&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Ansatt lettet på {0} må være angitt som &quot;venstre&quot;
+DocType: Hub Settings,Last Sync On,Sist synk på
 DocType: Guardian,Guardian,Guardian
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Appraisal {0} skapt for Employee {1} i den gitte datointervall
 DocType: Employee,Education,Utdanning
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,del
 DocType: Selling Settings,Campaign Naming By,Kampanje Naming Av
 DocType: Employee,Current Address Is,Gjeldende adresse Er
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Månedlig salgsmål (
@@ -5003,7 +5098,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Bankkode:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Skriv inn Expense konto
 DocType: Account,Stock,Lager
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Document Type må være en av innkjøpsordre, faktura eller bilagsregistrering"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Document Type må være en av innkjøpsordre, faktura eller bilagsregistrering"
 DocType: Employee,Current Address,Nåværende Adresse
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Hvis elementet er en variant av et annet element da beskrivelse, image, priser, avgifter osv vil bli satt fra malen uten eksplisitt spesifisert"
 DocType: Serial No,Purchase / Manufacture Details,Kjøp / Produksjon Detaljer
@@ -5034,7 +5129,7 @@
 DocType: Hub Settings,Hub Settings,Hub-innstillinger
 DocType: Project,Gross Margin %,Bruttomargin%
 DocType: BOM,With Operations,Med Operations
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Regnskapspostene har allerede blitt gjort i valuta {0} for selskap {1}. Vennligst velg en fordring eller betales konto med valuta {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Regnskapspostene har allerede blitt gjort i valuta {0} for selskap {1}. Vennligst velg en fordring eller betales konto med valuta {0}.
 DocType: Asset,Is Existing Asset,Er Eksisterende Asset
 DocType: Salary Detail,Statistical Component,Statistisk komponent
 DocType: Salary Detail,Statistical Component,Statistisk komponent
@@ -5043,13 +5138,14 @@
 DocType: BOM Operation,BOM Operation,BOM Operation
 DocType: Purchase Taxes and Charges,On Previous Row Amount,På Forrige Row Beløp
 DocType: Student,Home Address,Hjemmeadresse
+DocType: Item,Has Expiry Date,Har utløpsdato
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Variantinnstillinger.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transfer Asset
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,Transfer Asset
 DocType: POS Profile,POS Profile,POS Profile
 DocType: Training Event,Event Name,Aktivitetsnavn
 DocType: Physician,Phone (Office),Telefon (kontor)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,Adgang
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Innleggelser for {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,Adgang
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Innleggelser for {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Sesong for å sette budsjetter, mål etc."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Variabelt navn
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Element {0} er en mal, kan du velge en av variantene"
@@ -5058,7 +5154,7 @@
 DocType: Assessment Plan,Room,Rom
 DocType: Purchase Order,Advance Paid,Advance Betalt
 DocType: Item,Item Tax,Sak Skatte
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Materiale til Leverandør
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Materiale til Leverandør
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Vesenet Faktura
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% kommer mer enn én gang
 DocType: Expense Claim,Employees Email Id,Ansatte Email Id
@@ -5069,32 +5165,30 @@
 DocType: Program,Program Name,Programnavn
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Tenk Skatte eller Charge for
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Selve Antall er obligatorisk
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} har for øyeblikket en {1} leverandør scorecard, og innkjøpsordre til denne leverandøren skal utstedes med forsiktighet."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} har for øyeblikket en {1} leverandør scorecard, og innkjøpsordre til denne leverandøren skal utstedes med forsiktighet."
 DocType: Employee Loan,Loan Type,låne~~POS=TRUNC
 DocType: Scheduling Tool,Scheduling Tool,planlegging Tool
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Kredittkort
 DocType: BOM,Item to be manufactured or repacked,Elementet som skal produseres eller pakkes
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Standardinnstillingene for aksjetransaksjoner.
-DocType: Purchase Invoice,Next Date,Neste dato
 DocType: Employee Education,Major/Optional Subjects,Store / valgfrie emner
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
+DocType: Hub Settings,Suspended,suspendert
 DocType: Training Event,Attendees,Deltakere
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Her kan du opprettholde familie informasjon som navn og okkupasjon av foreldre, ektefelle og barn"
 DocType: Academic Term,Term End Date,Term Sluttdato
-DocType: Hub Settings,Seller Name,Selger Navn
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Skatter og avgifter fratrukket (Company Valuta)
 DocType: Item Group,General Settings,Generelle Innstillinger
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Fra Valuta og til valuta kan ikke være det samme
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Legg til instruktører
 DocType: Stock Entry,Repack,Pakk
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Du må Lagre skjemaet før du fortsetter
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Vennligst velg selskapet først
 DocType: Item Attribute,Numeric Values,Numeriske verdier
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Fest Logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,lagernivåer
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,lagernivåer
 DocType: Customer,Commission Rate,Kommisjon
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Lagde {0} scorecards for {1} mellom:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Gjør Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Gjør Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Block permisjon applikasjoner ved avdelingen.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Betalingstype må være en av Motta, Lønn og Internal Transfer"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -5109,11 +5203,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Kapitalbeholdningen
 DocType: Shopping Cart Settings,Show Public Attachments,Vis offentlige vedlegg
 DocType: Packing Slip,Package Weight Details,Pakken vektdetaljer
+DocType: Restaurant Reservation,Reservation Time,Reservasjonstid
 DocType: Payment Gateway Account,Payment Gateway Account,Betaling Gateway konto
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Etter betaling ferdigstillelse omdirigere brukeren til valgt side.
 DocType: Company,Existing Company,eksisterende selskapet
 DocType: Healthcare Settings,Result Emailed,Resultat sendt
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",Skattekategori har blitt endret til &quot;Totalt&quot; fordi alle elementene er ikke-varelager
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Varenummer&gt; Varegruppe&gt; Varemerke
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Vennligst velg en csv-fil
 DocType: Student Leave Application,Mark as Present,Merk som Present
 DocType: Supplier Scorecard,Indicator Color,Indikatorfarge
@@ -5138,11 +5234,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Gjør Student Batch
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Er fremføring
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Få Elementer fra BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Få Elementer fra BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Ledetid Days
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: konteringsdato må være det samme som kjøpsdato {1} av eiendelen {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Sjekk dette hvis studenten er bosatt ved instituttets Hostel.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Fyll inn salgsordrer i tabellen ovenfor
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Fyll inn salgsordrer i tabellen ovenfor
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Ikke Sendt inn lønnsslipper
 ,Stock Summary,Stock oppsummering
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Overfør en eiendel fra en lagerbygning til en annen
@@ -5158,5 +5254,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Rad {0}: Debet oppføring kan ikke være knyttet til en {1}
 DocType: Journal Entry,Subscription Section,Abonnementsseksjon
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Konto {0} finnes ikke
+DocType: Training Event,Training Program,Treningsprogram
 DocType: Account,Cash,Kontanter
 DocType: Employee,Short biography for website and other publications.,Kort biografi for hjemmeside og andre publikasjoner.
diff --git a/erpnext/translations/pl.csv b/erpnext/translations/pl.csv
index 98b2f20..60d93ce 100644
--- a/erpnext/translations/pl.csv
+++ b/erpnext/translations/pl.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Moduł Wynagrodzenia
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Zarejestrować
 DocType: Patient,Divorced,Rozwiedziony
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Pozycje już synchronizowane
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Zezwoli na dodał wiele razy w transakcji
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Anuluj Materiał Odwiedź {0} zanim anuluje to roszczenia z tytułu gwarancji
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produkty konsumenckie
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Osoby Zatwierdzające Urlop
 DocType: Sales Partner,Dealer,Diler
 DocType: Consultation,Investigations,Dochodzenia
+DocType: Restaurant Order Entry,Click Enter To Add,Kliknij Enter To Add
 DocType: Employee,Rented,Wynajęty
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Zastosowanie dla użytkownika
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zatrzymany Zamówienie produkcji nie mogą być anulowane, odetkać najpierw anulować"
 DocType: Vehicle Service,Mileage,Przebieg
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Czy naprawdę chcemy zlikwidować ten atut?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Czy naprawdę chcemy zlikwidować ten atut?
 DocType: Drug Prescription,Update Schedule,Zaktualizuj harmonogram
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Wybierz Domyślne Dostawca
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Waluta jest wymagana dla Cenniku {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Sprawdź dostępność
 DocType: Job Applicant,Job Applicant,Aplikujący o pracę
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Jest to oparte na operacjach przeciwko tym Dostawcę. Zobacz harmonogram poniżej w szczegółach
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Brak już następnych wyników.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Legalnie
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Rzeczywista Podatek typu nie mogą być wliczone w cenę towaru w wierszu {0}
 DocType: Bank Guarantee,Customer,Klient
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),"Kurs wymiany muszą być takie same, jak {0} {1} ({2})"
 DocType: Sales Invoice,Customer Name,Nazwa klienta
 DocType: Vehicle,Natural Gas,Gazu ziemnego
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Rachunku bankowego nie może być uznany za {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Rachunku bankowego nie może być nazwany {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (lub grupy), przeciwko którym zapisy księgowe są i sald są utrzymywane."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Zaległość za {0} nie może być mniejsza niż ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Nie ma zadnych Slipów Wynagrodzenia do przetworzenia.
 DocType: Manufacturing Settings,Default 10 mins,Domyślnie 10 minut
 DocType: Leave Type,Leave Type Name,Nazwa typu urlopu
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Pokaż otwarta
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Konieczne jest samo podjęcie tej akcji w odniesieniu do wyżej wspomnianego powtarzania
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Seria zaktualizowana
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Sprawdzić
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural Journal Entry Zgłoszony
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Przedmioty oczekujące na potwierdzenie odbioru Zamówienia Kupna
 DocType: SMS Center,All Supplier Contact,Dane wszystkich dostawców
 DocType: Support Settings,Support Settings,Ustawienia wsparcia
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Spodziewana data końcowa nie może być mniejsza od spodziewanej daty startowej
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Spodziewana data końcowa nie może być mniejsza od spodziewanej daty startowej
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Wiersz # {0}: Cena musi być taki sam, jak {1}: {2} ({3} / {4})"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Druk Nowego Zwolnienia
 ,Batch Item Expiry Status,Batch Przedmiot status ważności
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Przekaz bankowy
 DocType: Mode of Payment Account,Mode of Payment Account,Konto księgowe dla tego rodzaju płatności
 DocType: Consultation,Consultation,Konsultacja
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Sprzedaż i zwroty
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Pokaż Warianty
 DocType: Academic Term,Academic Term,semestr
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiał
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Opieka zdrowotna
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Opóźnienie w płatności (dni)
 DocType: Lab Prescription,Lab Prescription,Lekarz na receptę
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Sortuj według ceny
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Koszty usługi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Numer seryjny: {0} znajduje się już w fakturze sprzedaży: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Faktura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Numer seryjny: {0} znajduje się już w fakturze sprzedaży: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Okresowość
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Rok fiskalny {0} jest wymagane
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrona
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Wiersz # {0}:
 DocType: Timesheet,Total Costing Amount,Łączna kwota Costing
 DocType: Delivery Note,Vehicle No,Nr pojazdu
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Wybierz Cennik
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Wybierz Cennik
 DocType: Accounts Settings,Currency Exchange Settings,Ustawienia wymiany walut
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Wiersz # {0}: dokument płatności jest wymagane do ukończenia trasaction
 DocType: Production Order Operation,Work In Progress,Produkty w toku
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Proszę wybrać datę
 DocType: Employee,Holiday List,Lista świąt
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Proszę ustawić instrukcję Naming System w School&gt; School Settings
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Księgowy
+DocType: Hub Settings,Selling Price List,Cennik sprzedaży
 DocType: Patient,Tobacco Current Use,Obecne użycie tytoniu
 DocType: Cost Center,Stock User,Użytkownik magazynu
 DocType: Company,Phone No,Nr telefonu
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,tworzone harmonogramy zajęć:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Nowy {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Nowy {0}: # {1}
 ,Sales Partners Commission,Prowizja Partnera Sprzedaży
 DocType: Purchase Invoice,Rounding Adjustment,Dopasowanie zaokrąglania
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Skrót nie może posiadać więcej niż 5 znaków
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Nazwa dokumentu ze szczegółami nadrzędnego rodzica
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Odniesienie: {0}, Kod pozycji: {1} i klient: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,kg
-DocType: Student Log,Log,Log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Ogłoszenie o pracę
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Wynik został przesłany
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Wynik złożony
 DocType: Item Attribute,Increment,Przyrost
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Okres czasu
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Wybierz Magazyn ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Żonaty / Zamężna
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Nie dopuszczony do {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Pobierz zawartość z
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Brak elementów na liście
 DocType: Payment Reconciliation,Reconcile,Wyrównywać
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fundusze Emerytalne
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Następny Amortyzacja Data nie może być wcześniejsza Data zakupu
 DocType: Consultation,Consultation Date,Data konsultacji
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Lista produktów i odkrycie dla użytkowników ERPNext
 DocType: SMS Center,All Sales Person,Wszyscy Sprzedawcy
-DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Miesięczny Dystrybucja ** pomaga rozprowadzić Budget / target całej miesięcy, jeśli masz sezonowości w firmie."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Nie znaleziono przedmiotów
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Struktura Wynagrodzenie Brakujący
+DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Miesięczna Dystrybucja ** pomaga rozłożyć budżet/cel w miesiącach, jeśli masz okresowość w firmie."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Nie znaleziono przedmiotów
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Struktura Wynagrodzenie Brakujący
 DocType: Lead,Person Name,Imię i nazwisko osoby
 DocType: Sales Invoice Item,Sales Invoice Item,Przedmiot Faktury Sprzedaży
 DocType: Account,Credit,
 DocType: POS Profile,Write Off Cost Center,Centrum Kosztów Odpisu
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",np &quot;Szkoła Podstawowa&quot; lub &quot;Uniwersytet&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",np &quot;Szkoła Podstawowa&quot; lub &quot;Uniwersytet&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Raporty seryjne
 DocType: Warehouse,Warehouse Detail,Szczegóły magazynu
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Limit kredytowy został przekroczony dla klienta {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Termin Data zakończenia nie może być późniejsza niż data zakończenia roku na rok akademicki, którego termin jest związany (Academic Year {}). Popraw daty i spróbuj ponownie."
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Jest Środkiem Trwałym"" nie może być odznaczone, jeśli istnieją pozycje z takim ustawieniem"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Jest Środkiem Trwałym"" nie może być odznaczone, jeśli istnieją pozycje z takim ustawieniem"
 DocType: Vehicle Service,Brake Oil,Olej hamulcowy
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klient&gt; Grupa klientów&gt; Terytorium
 DocType: Tax Rule,Tax Type,Rodzaj podatku
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Kwota podlegająca opodatkowaniu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Nie masz uprawnień aby zmieniać lub dodawać elementy przed {0}
 DocType: BOM,Item Image (if not slideshow),Element Obrazek (jeśli nie slideshow)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Istnieje Klient o tej samej nazwie
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Godzina Kursy / 60) * Rzeczywista Czas pracy
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Wiersz # {0}: Typ dokumentu referencyjnego musi być jednym z wydatków roszczenia lub wpisu do dziennika
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Wybierz BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Wiersz # {0}: Typ dokumentu referencyjnego musi być jednym z wydatków roszczenia lub wpisu do dziennika
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Wybierz BOM
 DocType: SMS Log,SMS Log,Dziennik zdarzeń SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Koszt dostarczonych przedmiotów
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Święto w dniu {0} nie jest pomiędzy Od Data i do tej pory
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,pracownik Kredyt
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Dziennik aktywności:
 DocType: Fee Schedule,Send Payment Request Email,Wyślij e-mail z zapytaniem o płatność
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Element {0} nie istnieje w systemie lub wygasł
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Element {0} nie istnieje w systemie lub wygasł
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nieruchomości
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Wyciąg z rachunku
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutyczne
@@ -210,18 +213,23 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Log operacji importu
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Pull Tworzywo żądanie typu produktu na podstawie powyższych kryteriów
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Pomyślnie wyrejestrowana.
 DocType: Training Result Employee,Grade,Stopień
+DocType: Restaurant Table,No of Seats,Liczba miejsc
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Aby dodać temat dynamiczny, użyj tagów jinja, takich jak <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Dostarczane przez Dostawcę
 DocType: SMS Center,All Contact,Wszystkie dane Kontaktu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Produkcja Zamów już stworzony dla wszystkich elementów z BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Produkcja Zamów już stworzony dla wszystkich elementów z BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Roczne Wynagrodzenie
 DocType: Daily Work Summary,Daily Work Summary,Dziennie Podsumowanie zawodowe
 DocType: Period Closing Voucher,Closing Fiscal Year,Zamknięcie roku fiskalnego
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} jest zamrożone
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Wybierz istniejącą spółkę do tworzenia planu kont
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} jest zamrożone
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Wybierz istniejącą spółkę do tworzenia planu kont
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Wydatki magazynowe
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Wybierz Magazyn docelowy
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Wybierz Magazyn docelowy
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Wybierz Magazyn docelowy
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Wybierz Magazyn docelowy
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Proszę wpisać Preferowany Kontakt Email
 DocType: Program Enrollment,School Bus,Autobus szkolny
 DocType: Journal Entry,Contra Entry,Contra Entry (Zapis przeciwstawny)
@@ -239,9 +247,10 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Pobierz szablon, wypełnić odpowiednie dane i dołączyć zmodyfikowanego pliku.
  Wszystko daty i pracownik połączenie w wybranym okresie przyjdzie w szablonie, z istniejącymi rekordy frekwencji"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,"Element {0} nie jest aktywny, lub osiągnął datę przydatności"
+DocType: Student Admission Program,Minimum Age,Minimalny wiek
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Przykład: Podstawowe Matematyka
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Ustawienia dla modułu HR
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Ustawienia dla modułu HR
 DocType: SMS Center,SMS Center,Centrum SMS
 DocType: Sales Invoice,Change Amount,Zmień Kwota
 DocType: BOM Update Tool,New BOM,Nowe zestawienie materiałowe
@@ -251,7 +260,7 @@
 DocType: Lead,Request Type,Typ zapytania
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Bądź pracownika
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Transmitowanie
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Dodaj pokoje
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Tryb konfiguracji POS (Online / Offline)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Wykonanie
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Szczegóły dotyczące przeprowadzonych operacji.
 DocType: Serial No,Maintenance Status,Status Konserwacji
@@ -274,6 +283,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cennik musi być przyporządkowany do kupna albo sprzedaży
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Data instalacji nie może być wcześniejsza niż data dostawy dla pozycji {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Zniżka Cennik Oceń (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Biochemia
 DocType: Offer Letter,Select Terms and Conditions,Wybierz Regulamin
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,Brak Wartości
 DocType: Production Planning Tool,Sales Orders,Zlecenia sprzedaży
@@ -308,15 +318,15 @@
 DocType: Sales Partner,Reseller,Dystrybutor
 DocType: Codification Table,Medical Code,Kodeks Medyczny
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Jeśli zaznaczone, będzie zawierać elementy non-stock w materiale żądań."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Proszę wpisać Firmę
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Proszę wpisać Firmę
 DocType: Delivery Note Item,Against Sales Invoice Item,Na podstawie pozycji faktury sprzedaży
 ,Production Orders in Progress,Zamówienia Produkcji w toku
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Przepływy pieniężne netto z finansowania
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage jest pełna, nie zapisać"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage jest pełna, nie zapisać"
 DocType: Lead,Address & Contact,Adres i kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj niewykorzystane urlopy z poprzednich alokacji
 DocType: Sales Partner,Partner website,strona Partner
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Dodaj Przedmiot
+DocType: Restaurant Order Entry,Add Item,Dodaj Przedmiot
 DocType: Lab Test,Custom Result,Wynik niestandardowy
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Nazwa kontaktu
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kryteria oceny kursu
@@ -329,7 +339,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Prośba o zakup
 DocType: Lab Test,Submitted Date,Zaakceptowana Data
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Jest to oparte na kartach czasu pracy stworzonych wobec tego projektu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Wynagrodzenie netto nie może być mniejsza niż 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Wynagrodzenie netto nie może być mniejsza niż 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Aby zatrzymać wysyłanie powtarzających się powiadomień o błędach z systemu, sprawdziliśmy pole Wyłączone w subskrypcji"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Tylko wybrana osoba zatwierdzająca nieobecności może wprowadzić wniosek o urlop
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Data zwolnienia musi być większa od Daty Wstąpienia
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Urlopy na Rok
@@ -338,9 +349,10 @@
 DocType: Email Digest,Profit & Loss,Rachunek zysków i strat
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Litr
 DocType: Task,Total Costing Amount (via Time Sheet),Całkowita kwota Costing (przez czas arkuszu)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Proszę ustawić Studentów w grupach studenckich
 DocType: Item Website Specification,Item Website Specification,Element Specyfikacja Strony
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Urlop Zablokowany
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Element {0} osiągnął kres przydatności {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Element {0} osiągnął kres przydatności {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Operacje bankowe
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Roczny
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Uzgodnienia Stanu Pozycja
@@ -349,7 +361,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Kurs grupy studentów Stworzenie narzędzia
 DocType: Lead,Do Not Contact,Nie Kontaktuj
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,"Ludzie, którzy uczą w organizacji"
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Unikalny identyfikator do śledzenia wszystkich powtarzających się faktur. Jest on generowany przy potwierdzeniu.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Programista
 DocType: Item,Minimum Order Qty,Minimalna wartość zamówienia
 DocType: Pricing Rule,Supplier Type,Typ dostawcy
@@ -359,17 +370,19 @@
 DocType: Item,Publish in Hub,Publikowanie w Hub
 DocType: Student Admission,Student Admission,Wstęp Student
 ,Terretory,Obszar
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Element {0} jest anulowany
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Zamówienie produktu
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Element {0} jest anulowany
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Zamówienie produktu
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizacja daty rozliczenia
 DocType: Item,Purchase Details,Szczegóły zakupu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Element {0} nie znajdują się w &quot;materiały dostarczane&quot; tabeli w Zamówieniu {1}
 DocType: Patient Relation,Relation,Relacja
 DocType: Shipping Rule,Worldwide Shipping,Wysyłka na całym świecie
 DocType: Patient Relation,Mother,Mama
+DocType: Restaurant Reservation,Reservation End Time,Rezerwacja Koniec czasu
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Potwierdzone zamówienia od klientów
 DocType: Purchase Receipt Item,Rejected Quantity,Odrzucona Ilość
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Żądanie zapłaty {0} zostało utworzone
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Żądanie zapłaty {0} zostało utworzone
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Mała czułość
 DocType: Notification Control,Notification Control,Kontrola Wypowiedzenia
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Potwierdź po zakończeniu szkolenia
 DocType: Lead,Suggestions,Sugestie
@@ -389,7 +402,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Emaile wynagrodzenia poślizgu pracownikowi na podstawie wybranego w korzystnej email Pracownika
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,
 DocType: Tax Rule,Shipping County,Dostawa County
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Samouczek
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Samouczek
 DocType: Asset,Next Depreciation Date,Następny Amortyzacja Data
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Koszt aktywność na pracownika
 DocType: Accounts Settings,Settings for Accounts,Ustawienia Konta
@@ -400,13 +413,13 @@
 DocType: Item,Synced With Hub,Synchronizowane z Hub
 DocType: Vehicle,Fleet Manager,Menadżer floty
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Wiersz # {0}: {1} nie może być negatywne dla pozycji {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Niepoprawne hasło
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Niepoprawne hasło
 DocType: Item,Variant Of,Wariant
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"Zakończono Ilość nie może być większa niż ""Ilość w produkcji"""
 DocType: Period Closing Voucher,Closing Account Head,
 DocType: Employee,External Work History,Historia Zewnętrzna Pracy
 DocType: Physician,Time per Appointment,Czas na spotkanie
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Circular Error Referencje
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Circular Error Referencje
 DocType: Appointment Type,Is Inpatient,Jest hospitalizowany
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Nazwa Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,
@@ -415,19 +428,18 @@
 DocType: Lead,Industry,Przedsiębiorstwo
 DocType: Employee,Job Profile,Profil stanowiska Pracy
 DocType: BOM Item,Rate & Amount,Stawka i kwota
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Proszę skonfigurować numeryczną serię dla uczestnictwa w programie Setup&gt; Numbering Series
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,"Opiera się to na transakcjach przeciwko tej firmie. Zobacz poniżej linię czasu, aby uzyskać szczegółowe informacje"
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Informuj za pomocą Maila (automatyczne)
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Odporny
 DocType: Journal Entry,Multi Currency,Wielowalutowy
 DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktury
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klient&gt; Grupa klienta&gt; Terytorium
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Dowód dostawy
 DocType: Consultation,Encounter Impression,Encounter Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Konfigurowanie podatki
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Koszt sprzedanych aktywów
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,Wpis płatności został zmodyfikowany po ściągnięciu. Proszę ściągnąć ponownie.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} dwa razy wprowadzone w podatku produktu
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Podsumowanie na ten tydzień i działań toczących
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} dwa razy wprowadzone w podatku produktu
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Podsumowanie na ten tydzień i działań toczących
 DocType: Student Applicant,Admitted,Przyznał
 DocType: Workstation,Rent Cost,Koszt Wynajmu
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Kwota po amortyzacji
@@ -442,36 +454,35 @@
 DocType: Shipping Rule,Valid for Countries,Ważny dla krajów
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Pozycja ta jest szablon i nie mogą być wykorzystywane w transakcjach. Atrybuty pozycji zostaną skopiowane nad do wariantów chyba ""Nie Kopiuj"" jest ustawiony"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Zamówienie razem Uważany
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Stanowisko pracownika (np. Dyrektor Generalny, Dyrektor)"
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Stanowisko pracownika (np. Dyrektor Generalny, Dyrektor)"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Stawka przy użyciu której Waluta Klienta jest konwertowana do podstawowej waluty klienta
 DocType: Course Scheduling Tool,Course Scheduling Tool,Oczywiście Narzędzie Scheduling
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Wiersz # {0}: Zakup Faktura nie może być dokonywane wobec istniejącego zasobu {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Pilny] Błąd podczas tworzenia cyklicznych% s dla% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[PILNE] Błąd podczas tworzenia cyklicznych %s dla %s
 DocType: Item Tax,Tax Rate,Stawka podatku
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} już przydzielone Pracodawcy {1} dla okresu {2} do {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Wybierz produkt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Wybierz produkt
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Faktura zakupu {0} została już wysłana
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"Wiersz # {0}: Batch Nie musi być taki sam, jak {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Przekształć w nie-Grupę
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Partia (pakiet) produktu.
 DocType: C-Form Invoice Detail,Invoice Date,Data faktury
 DocType: GL Entry,Debit Amount,Kwota Debit
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Nie może być tylko jedno konto na Spółkę w {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Proszę przejrzeć załącznik
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Nie może być tylko jedno konto na Spółkę w {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Proszę przejrzeć załącznik
 DocType: Purchase Order,% Received,% Otrzymanych
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Tworzenie grup studenckich
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Konfiguracja właśnie zakończyła się!!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Konfiguracja właśnie zakończyła się!!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Kwota kredytu
 DocType: Setup Progress Action,Action Document,Dokument roboczy
 ,Finished Goods,Ukończone dobra
 DocType: Delivery Note,Instructions,Instrukcje
 DocType: Quality Inspection,Inspected By,Skontrolowane przez
 DocType: Maintenance Visit,Maintenance Type,Typ Konserwacji
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} nie jest zapisany do kursu {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kod pozycji&gt; Grupa pozycji&gt; Marka
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} nie jest zapisany do kursu {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Nr seryjny {0} nie należy do żadnego potwierdzenia dostawy {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Dodaj produkty
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Dodaj produkty
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Element Parametr Inspekcja Jakości
 DocType: Leave Application,Leave Approver Name,Imię Zatwierdzającego Urlop
 DocType: Depreciation Schedule,Schedule Date,Planowana Data
@@ -493,7 +504,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Godziny pracy
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Zmień początkowy / obecny numer seryjny istniejącej serii.
 DocType: Dosage Strength,Strength,Wytrzymałość
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Tworzenie nowego klienta
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Tworzenie nowego klienta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Jeśli wiele Zasady ustalania cen nadal dominować, użytkownicy proszeni są o ustawienie Priorytet ręcznie rozwiązać konflikt."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Stwórz zamówienie zakupu
 ,Purchase Register,Rejestracja Zakupu
@@ -512,7 +523,7 @@
 DocType: Lab Test Template,Single,Pojedynczy
 DocType: Salary Slip,Total Loan Repayment,Suma spłaty kredytu
 DocType: Account,Cost of Goods Sold,Wartość sprzedanych pozycji w cenie nabycia
-DocType: Purchase Invoice,Yearly,Rocznie
+DocType: Subscription,Yearly,Rocznie
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Wprowadź Centrum Kosztów
 DocType: Drug Prescription,Dosage,Dawkowanie
 DocType: Journal Entry Account,Sales Order,Zlecenie sprzedaży
@@ -543,7 +554,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globalne ustawienia dla wszystkich procesów produkcyjnych.
 DocType: Accounts Settings,Accounts Frozen Upto,Konta zamrożone do
 DocType: SMS Log,Sent On,Wysłano w
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Atrybut {0} wybrane atrybuty kilka razy w tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Atrybut {0} wybrane atrybuty kilka razy w tabeli
 DocType: HR Settings,Employee record is created using selected field. ,Rekord pracownika tworzony jest przy użyciu zaznaczonego pola.
 DocType: Sales Order,Not Applicable,Nie dotyczy
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,
@@ -569,13 +580,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Wszystkich liście przeznaczone jest obowiązkowe
 DocType: Patient,AB Positive,AB Pozytywne
 DocType: Job Opening,Description of a Job Opening,Opis Ogłoszenia o Pracę
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Działania oczekujące na dziś
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Działania oczekujące na dziś
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Wpis Obecności
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Składnik wynagrodzenia za płac opartego grafik.
 DocType: Sales Order Item,Used for Production Plan,Używane do Planu Produkcji
 DocType: Employee Loan,Total Payment,Całkowita płatność
 DocType: Manufacturing Settings,Time Between Operations (in mins),Czas między operacjami (w min)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,"{0} {1} jest anulowany, więc działanie nie może zostać zakończone"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,"{0} {1} jest anulowany, więc działanie nie może zostać zakończone"
 DocType: Customer,Buyer of Goods and Services.,Nabywca towarów i usług.
 DocType: Journal Entry,Accounts Payable,Zobowiązania
 DocType: Patient,Allergies,Alergie
@@ -587,23 +598,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Ostrzegaj Zamówienia Zakupu
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Krótka lista Twoich klientów. Mogą to być firmy lub osoby fizyczne.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Wystarczające elementy do budowy
+DocType: POS Profile User,POS Profile User,Użytkownik profilu POS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Przychody bezpośrednie
 DocType: Patient Appointment,Date TIme,Data TIm
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Nie można przefiltrować na podstawie Konta, jeśli pogrupowano z użuciem konta"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Urzędnik administracyjny
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Proszę wybrać Kurs
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Proszę wybrać Kurs
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Proszę wybrać Kurs
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Proszę wybrać Kurs
 DocType: Codification Table,Codification Table,Tabela kodyfikacji
 DocType: Timesheet Detail,Hrs,godziny
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Proszę wybrać firmę
 DocType: Stock Entry Detail,Difference Account,Konto Różnic
 DocType: Purchase Invoice,Supplier GSTIN,Dostawca GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Nie można zamknąć zadanie, jak jego zależne zadaniem {0} nie jest zamknięta."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Nie można zamknąć zadanie, jak jego zależne zadaniem {0} nie jest zamknięta."
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,
 DocType: Production Order,Additional Operating Cost,Dodatkowy koszt operacyjny
 DocType: Lab Test Template,Lab Routine,Lab Rutyna
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetyki
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Aby scalić, poniższe właściwości muszą być takie same dla obu przedmiotów"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Aby scalić, poniższe właściwości muszą być takie same dla obu przedmiotów"
 DocType: Shipping Rule,Net Weight,Waga netto
 DocType: Employee,Emergency Phone,Telefon bezpieczeństwa
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Kupować
@@ -614,7 +626,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Proszę określić stopień dla progu 0%
 DocType: Sales Order,To Deliver,Dostarczyć
 DocType: Purchase Invoice Item,Item,Asortyment
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Nr seryjny element nie może być ułamkiem
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Wysoka czułość
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Nr seryjny element nie może być ułamkiem
 DocType: Journal Entry,Difference (Dr - Cr),Różnica (Dr - Cr)
 DocType: Account,Profit and Loss,Zyski i Straty
 DocType: Patient,Risk Factors,Czynniki ryzyka
@@ -623,7 +636,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Zarządzanie Podwykonawstwo
 DocType: Vital Signs,Body Temperature,Temperatura ciała
 DocType: Project,Project will be accessible on the website to these users,Projekt będzie dostępny na stronie internetowej dla tych użytkowników
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Zdefiniuj typ projektu.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Zdefiniuj typ projektu.
 DocType: Supplier Scorecard,Weighting Function,Funkcja ważenia
 DocType: Physician,OP Consulting Charge,OP Consulting Charge
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Skonfiguruj swój
@@ -637,7 +650,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Przyrost nie może być 0
 DocType: Production Planning Tool,Material Requirement,Wymagania odnośnie materiału
 DocType: Company,Delete Company Transactions,Usuń Transakcje Spółki
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Numer referencyjny i data jest obowiązkowe dla transakcji Banku
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Numer referencyjny i data jest obowiązkowe dla transakcji Banku
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,
 DocType: Payment Entry Reference,Supplier Invoice No,Nr faktury dostawcy
 DocType: Territory,For reference,Dla referencji
@@ -645,12 +658,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Nie można usunąć nr seryjnego {0}, ponieważ jest wykorzystywany w transakcjach magazynowych"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Zamknięcie (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,cześć
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Move Item
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Move Item
 DocType: Serial No,Warranty Period (Days),Okres gwarancji (dni)
 DocType: Installation Note Item,Installation Note Item,
 DocType: Production Plan Item,Pending Qty,Oczekuje szt
 DocType: Budget,Ignore,Ignoruj
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} jest nieaktywny
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} jest nieaktywny
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Wymiary Sprawdź konfigurację do druku
 DocType: Salary Slip,Salary Slip Timesheet,Slip Wynagrodzenie grafiku
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,
@@ -659,7 +672,7 @@
 DocType: Pricing Rule,Sales Partner,Partner Sprzedaży
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Wszystkie karty oceny dostawcy.
 DocType: Buying Settings,Purchase Receipt Required,Wymagane Potwierdzenie Zakupu
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Wycena Cena jest obowiązkowe, jeżeli wprowadzone Otwarcie Zdjęcie"
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,"Wycena Cena jest obowiązkowe, jeżeli wprowadzone Otwarcie Zdjęcie"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nie znaleziono w tabeli faktury rekordy
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Najpierw wybierz typ firmy, a Party"
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Rok finansowy / księgowy.
@@ -696,7 +709,7 @@
 DocType: Quotation,Quotation To,Wycena dla
 DocType: Lead,Middle Income,Średni Dochód
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Otwarcie (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Domyślnie Jednostka miary dla pozycji {0} nie może być zmieniana bezpośrednio, ponieważ masz już jakąś transakcję (y) z innym UOM. Musisz utworzyć nowy obiekt, aby użyć innego domyślnego UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Domyślnie Jednostka miary dla pozycji {0} nie może być zmieniana bezpośrednio, ponieważ masz już jakąś transakcję (y) z innym UOM. Musisz utworzyć nowy obiekt, aby użyć innego domyślnego UOM."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Przydzielona kwota nie może być ujemna
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Proszę ustawić firmę
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Proszę ustawić firmę
@@ -711,6 +724,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Wybierz Konto Płatność aby bankowego Entry
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Tworzenie rekordów pracownika do zarządzania liście, roszczenia o wydatkach i płac"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Okres na receptę
+DocType: Restaurant Reservation,Restaurant Reservation,Rezerwacja restauracji
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Pisanie Wniosku
 DocType: Payment Entry Deduction,Payment Entry Deduction,Płatność Wejście Odliczenie
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Inna osoba Sprzedaż {0} istnieje w tym samym identyfikator pracownika
@@ -718,7 +732,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,
 DocType: Assessment Plan,Maximum Assessment Score,Maksymalny wynik oceny
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Aktualizacja bankowe dni transakcji
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,time Tracking
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,time Tracking
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,ZGŁOSZENIE DLA TRANSPORTERA
 DocType: Fiscal Year Company,Fiscal Year Company,Rok podatkowy firmy
 DocType: Packing Slip Item,DN Detail,
@@ -727,8 +741,9 @@
 DocType: Batch,Batch Description,Opis partii
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Tworzenie grup studentów
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Tworzenie grup studentów
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Payment Gateway konta nie jest tworzony, należy utworzyć ręcznie."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Payment Gateway konta nie jest tworzony, należy utworzyć ręcznie."
 DocType: Supplier Scorecard,Per Year,Na rok
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Nie kwalifikuje się do przyjęcia w tym programie zgodnie z DOB
 DocType: Sales Invoice,Sales Taxes and Charges,Podatki i Opłaty od Sprzedaży
 DocType: Employee,Organization Profile,Profil organizacji
 DocType: Vital Signs,Height (In Meter),Wysokość (w metrze)
@@ -764,7 +779,7 @@
 DocType: Student Batch Name,Batch Name,Batch Nazwa
 DocType: Fee Validity,Max number of visit,Maksymalna liczba wizyt
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Grafiku stworzył:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Proszę ustawić domyślne konto Gotówka lub Bank dla płatności typu {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Proszę ustawić domyślne konto Gotówka lub Bank dla płatności typu {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,Zapisać
 DocType: GST Settings,GST Settings,Ustawienia GST
 DocType: Selling Settings,Customer Naming By,
@@ -796,16 +811,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Koszt podatków i opłat
 DocType: Production Order Operation,Actual Start Time,Rzeczywisty Czas Rozpoczęcia
 DocType: BOM Operation,Operation Time,Czas operacji
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,koniec
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,koniec
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Baza
 DocType: Timesheet,Total Billed Hours,Wszystkich Zafakturowane Godziny
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Wartość Odpisu
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Wartość Odpisu
 DocType: Leave Block List Allow,Allow User,Zezwól Użytkownikowi
 DocType: Journal Entry,Bill No,Numer Rachunku
 DocType: Company,Gain/Loss Account on Asset Disposal,Konto Zysk / Strata na Aktywów pozbywaniu
 DocType: Vehicle Log,Service Details,Szczegóły usługi
 DocType: Vehicle Log,Service Details,Szczegóły usługi
-DocType: Purchase Invoice,Quarterly,Kwartalnie
+DocType: Subscription,Quarterly,Kwartalnie
 DocType: Lab Test Template,Grouped,Zgrupowane
 DocType: Selling Settings,Delivery Note Required,Dowód dostawy jest wymagany
 DocType: Bank Guarantee,Bank Guarantee Number,Numer Gwarancji Bankowej
@@ -815,12 +830,12 @@
 DocType: Student Attendance,Student Attendance,Obecność Studenta
 DocType: Sales Invoice Timesheet,Time Sheet,Czas Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Płukanie surowce na podstawie
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Proszę wpisać Szczegóły Przedmiotu
 DocType: Interest,Interest,Zainteresowanie
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Przedsprzedaż
 DocType: Purchase Receipt,Other Details,Pozostałe szczegóły
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Lab Test,Test Template,Szablon testu
+DocType: Restaurant Order Entry Item,Served,Serwowane
 DocType: Account,Accounts,Księgowość
 DocType: Vehicle,Odometer Value (Last),Drogomierz Wartość (Ostatni)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Szablony kryteriów oceny dostawców.
@@ -830,28 +845,30 @@
 DocType: Purchase Receipt Item Supplied,Current Stock,Bieżący asortyment
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} does not linked to Item {2},Wiersz # {0}: {1} aktywami nie związane w pozycji {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Podgląd Zarobki Slip
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Konto {0} została wprowadzona wielokrotnie
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Konto {0} zostało wprowadzone wielokrotnie
 DocType: Account,Expenses Included In Valuation,Zaksięgowane wydatki w wycenie
-DocType: Hub Settings,Seller City,Sprzedawca Miasto
-,Absent Student Report,Raport nieobecny student
+,Absent Student Report,Raport nieobecności studenta
 DocType: Email Digest,Next email will be sent on:,Kolejny e-mali zostanie wysłany w dniu:
 DocType: Offer Letter Term,Offer Letter Term,Oferta List Term
 DocType: Supplier Scorecard,Per Week,Na tydzień
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Pozycja ma warianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Pozycja ma warianty.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Total Student
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Element {0} nie został znaleziony
 DocType: Bin,Stock Value,Wartość zapasów
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,Rekordy opłat będą tworzone w tle. W przypadku błędu komunikat o błędzie zostanie zaktualizowany w Harmonogramie.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Firma {0} nie istnieje
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} ma ważność do {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} ważność opłaty do {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Typ drzewa
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Ilość skonsumowana na Jednostkę
 DocType: Serial No,Warranty Expiry Date,Data upływu gwarancji
 DocType: Material Request Item,Quantity and Warehouse,Ilość i magazyn
+DocType: Hub Settings,Unregister,Wyrejestruj
 DocType: Sales Invoice,Commission Rate (%),Wartość prowizji (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Proszę wybrać Program
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Proszę wybrać Program
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Proszę wybrać Program
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Proszę wybrać Program
 DocType: Project,Estimated Cost,Szacowany koszt
 DocType: Purchase Order,Link to material requests,Link do żądań materialnych
+DocType: Hub Settings,Publish,Publikować
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Lotnictwo
 DocType: Journal Entry,Credit Card Entry,Karta kredytowa
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Ustawienia księgowości jednostki
@@ -862,13 +879,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Po blisko Szansa Dni
 ,Reserved,Zarezerwowany
 DocType: Purchase Order,Supply Raw Materials,Zaopatrzenia w surowce
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Dzień, w którym będą generowane następne faktury. Generowanie wykonywane jest na żądanie."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Aktywa finansowe
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} nie jest przechowywany na magazynie
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',"Podziel się swoją opinią na szkolenie, klikając link &quot;Szkolenia zwrotne&quot;, a następnie &quot;Nowy&quot;"
 DocType: Mode of Payment Account,Default Account,Domyślne konto
 DocType: Payment Entry,Received Amount (Company Currency),Otrzymaną kwotą (Spółka waluty)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Wybierz tygodniowe dni wolne
 DocType: Patient,O Negative,O negatywne
 DocType: Production Order Operation,Planned End Time,Planowany czas zakończenia
@@ -884,10 +900,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Szansa od
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Miesięczny wyciąg do wynagrodzeń.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Dodaj firmę
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Wiersz {0}: {1} wymagane numery seryjne dla elementu {2}. Podałeś {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Wiersz {0}: {1} wymagane numery seryjne dla elementu {2}. Podałeś {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Proszę wybrać tabelę
 DocType: BOM,Website Specifications,Specyfikacja strony WWW
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',"{0} jest nieprawidłowym adresem e-mail w polu ""Odbiorcy"""
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',"{0} jest nieprawidłowym adresem e-mail w polu ""Odbiorcy"""
 DocType: Special Test Items,Particulars,Szczegóły
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antybiotyk.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: od {0} typu {1}
@@ -895,11 +911,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Wiersz {0}: Współczynnik konwersji jest obowiązkowe
 DocType: Employee,A+,A+
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",Wiele Zasad Cen istnieje w tych samych kryteriach proszę rozwiązywania konflikty poprzez przypisanie priorytetu. Zasady Cen: {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nie można wyłączyć lub anulować LM jak to jest połączone z innymi LM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nie można wyłączyć lub anulować LM jak to jest połączone z innymi LM
 DocType: Opportunity,Maintenance,Konserwacja
 DocType: Item Attribute Value,Item Attribute Value,Pozycja wartość atrybutu
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Kampanie sprzedażowe
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Bądź grafiku
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Bądź grafiku
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -956,12 +972,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Proszę najpierw wprowadzić Przedmiot
 DocType: Account,Liability,Zobowiązania
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Usankcjonowane Kwota nie może być większa niż ilość roszczenia w wierszu {0}.
+DocType: Salary Detail,Do not include in total,Nie obejmują łącznie
 DocType: Company,Default Cost of Goods Sold Account,Domyślne Konto Wartości Dóbr Sprzedanych
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Cennik nie wybrany
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Cennik nie wybrany
 DocType: Employee,Family Background,Tło rodzinne
 DocType: Request for Quotation Supplier,Send Email,Wyślij E-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Warning: Invalid Załącznik {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Brak uprawnień
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Warning: Invalid Załącznik {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Brak uprawnień
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Zapytanie o wycenę
 DocType: Vital Signs,Heart Rate / Pulse,Częstość tętna / impuls
 DocType: Company,Default Bank Account,Domyślne konto bankowe
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Aby filtrować na podstawie partii, wybierz Party Wpisz pierwsze"
@@ -989,12 +1007,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Przedmiot Row {idx} {} {doctype DOCNAME} nie istnieje w wyżej &#39;{doctype}&#39; Stół
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Grafiku {0} jest już zakończone lub anulowane
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Brak zadań
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dzień miesiąca, w którym auto faktury będą generowane na przykład 05, 28 itd"
 DocType: Item Variant Settings,Copy Fields to Variant,Skopiuj pola do wariantu
 DocType: Asset,Opening Accumulated Depreciation,Otwarcie Skumulowana amortyzacja
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Wynik musi być niższy lub równy 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Rejestracja w programie Narzędzie
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Klient i Dostawca
 DocType: Email Digest,Email Digest Settings,ustawienia przetwarzania maila
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Dziękuję dla Twojej firmy!
@@ -1012,13 +1029,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Status statusu
 DocType: Maintenance Visit,Completion Status,Status ukończenia
 DocType: HR Settings,Enter retirement age in years,Podaj wiek emerytalny w latach
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Magazyn docelowy
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Proszę wybrać magazyn
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Magazyn docelowy
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Proszę wybrać magazyn
 DocType: Cheque Print Template,Starting location from left edge,Zaczynając od lewej krawędzi lokalizację
 DocType: Item,Allow over delivery or receipt upto this percent,Pozostawić na dostawę lub odbiór zapisu do tego procent
 DocType: Stock Entry,STE-,STEMI
 DocType: Upload Attendance,Import Attendance,Importuj Frekwencję
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Wszystkie grupy produktów
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Wszystkie grupy produktów
 DocType: Process Payroll,Activity Log,Dziennik aktywności
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Zysk / strata netto
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatyczna wiadomość o założeniu transakcji
@@ -1030,7 +1047,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Prognozowana ilość
 DocType: Sales Invoice,Payment Due Date,Termin Płatności
 DocType: Drug Prescription,Interval UOM,Interwał UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Pozycja Wersja {0} istnieje już z samymi atrybutami
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Pozycja Wersja {0} istnieje już z samymi atrybutami
+DocType: Item,Hub Publishing Details,Szczegóły publikacji wydawnictwa Hub
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&quot;Otwarcie&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Otwarty na uwagi
 DocType: Notification Control,Delivery Note Message,Wiadomość z Dowodu Dostawy
@@ -1050,10 +1068,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,"BOM # {0}: Surowiec nie może być taki sam, jak główna pozycja"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Wszystkich obowiązujących opłat w ZAKUPU Elementy tabeli muszą być takie same jak Wszystkich podatkach i opłatach
 DocType: Sales Team,Incentives,
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Zarejestruj się w Hub
 DocType: SMS Log,Requested Numbers,Wymagane numery
 DocType: Production Planning Tool,Only Obtain Raw Materials,Uzyskanie wyłącznie materiały
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Szacowanie osiągów
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Włączenie &quot;użycie do koszyka&quot;, ponieważ koszyk jest włączony i nie powinno być co najmniej jedna zasada podatkowa w koszyku"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Włączenie &quot;użycie do koszyka&quot;, ponieważ koszyk jest włączony i nie powinno być co najmniej jedna zasada podatkowa w koszyku"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Płatność Wejście {0} jest związana na zamówienie {1}, sprawdź, czy powinien on być wyciągnięty jak wcześniej w tej fakturze."
 DocType: Sales Invoice Item,Stock Details,Zdjęcie Szczegóły
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Wartość projektu
@@ -1072,12 +1091,14 @@
 DocType: Salary Slip,Working Days,Dni robocze
 DocType: Serial No,Incoming Rate,
 DocType: Packing Slip,Gross Weight,Waga brutto
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,Nazwa firmy / organizacji dla której uruchamiasz niniejszy system.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Włącz koncentrator
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,Nazwa firmy / organizacji dla której uruchamiasz niniejszy system.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Dolicz święta do całkowitej liczby dni pracujących
 DocType: Job Applicant,Hold,Trzymaj
 DocType: Employee,Date of Joining,Data Wstąpienia
 DocType: Naming Series,Update Series,Zaktualizuj Serię
 DocType: Supplier Quotation,Is Subcontracted,Czy zlecony
+DocType: Restaurant Table,Minimum Seating,Minimalne miejsce siedzące
 DocType: Item Attribute,Item Attribute Values,Wartości atrybutu elementu
 DocType: Examination Result,Examination Result,badanie Wynik
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Potwierdzenia Zakupu
@@ -1088,13 +1109,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Nie udało się znaleźć wolnego przedziału czasu w najbliższych {0} dniach do pracy {1}
 DocType: Production Order,Plan material for sub-assemblies,Materiał plan podzespołów
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Partnerzy handlowi i terytorium
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} musi być aktywny
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} musi być aktywny
 DocType: Journal Entry,Depreciation Entry,Amortyzacja
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Najpierw wybierz typ dokumentu
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Anuluj Fizyczne Wizyty {0} zanim anulujesz Wizytę Pośrednią
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Nr seryjny {0} nie należy do żadnej rzeczy {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Wymagana ilość
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Magazyny z istniejącymi transakcji nie mogą być konwertowane do księgi głównej.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Magazyny z istniejącymi transakcji nie mogą być konwertowane do księgi głównej.
 DocType: Bank Reconciliation,Total Amount,Wartość całkowita
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Wydawnictwa internetowe
 DocType: Prescription Duration,Number,Numer
@@ -1105,7 +1126,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista cena sprzedaży
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Jeśli zostanie zaznaczone, zostanie utworzony klient, który będzie mapowany na pacjenta. Dla tego klienta powstanie faktury pacjenta. Można również wybrać istniejącego klienta podczas tworzenia pacjenta."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publikowanie synchronizować elementy
 DocType: Bank Reconciliation,Account Currency,Waluta konta
 DocType: Lab Test,Sample ID,Identyfikator wzorcowy
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Proszę określić konto do zaokrągleń kwot w firmie
@@ -1114,11 +1134,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Pracownik {0} jest nieaktywny lub nie istnieje
 DocType: Fee Structure,Components,składniki
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Proszę podać kategorię aktywów w pozycji {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Pozycja Warianty {0} zaktualizowane
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Pozycja Warianty {0} zaktualizowane
 DocType: Quality Inspection Reading,Reading 6,Odczyt 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Nie można {0} {1} {2} bez negatywnego wybitne faktury
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","do wygenerowania. Jeśli zostanie opóźnione, musisz ręcznie zmienić pole &quot;Powtarzaj na ten dzień&quot;"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Nie można {0} {1} {2} bez negatywnego wybitne faktury
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Wyślij Fakturę Zaliczkową / Proformę
-DocType: Hub Settings,Sync Now,Synchronizuj teraz
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Wiersz {0}: wejście kredytowe nie mogą być powiązane z {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Definiowanie budżetu za dany rok budżetowy.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Domyślne Konto Bank / Gotówka będzie automatycznie aktualizowane za fakturą POS, gdy ten tryb zostanie wybrany."
@@ -1130,13 +1151,13 @@
 DocType: Item,Is Purchase Item,Jest pozycją kupowalną
 DocType: Asset,Purchase Invoice,Faktura zakupu
 DocType: Stock Ledger Entry,Voucher Detail No,Nr Szczegółu Bonu
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Nowa faktura sprzedaży
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Nowa faktura sprzedaży
 DocType: Stock Entry,Total Outgoing Value,Całkowita wartość wychodząca
 DocType: Physician,Appointments,Terminy
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Otwarcie Data i termin powinien być w obrębie samego roku podatkowego
 DocType: Lead,Request for Information,Prośba o informację
 ,LeaderBoard,Leaderboard
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Synchronizacja Offline Faktury
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Synchronizacja Offline Faktury
 DocType: Payment Request,Paid,Zapłacono
 DocType: Program Fee,Program Fee,Opłata Program
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1155,11 +1176,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Przedmiot Zamówienia Kupna
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Przychody pośrednie
 DocType: Student Attendance Tool,Student Attendance Tool,Obecność Student Narzędzie
+DocType: Restaurant Menu,Price List (Auto created),Cennik (utworzony automatycznie)
 DocType: Cheque Print Template,Date Settings,Data Ustawienia
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Zmienność
 ,Company Name,Nazwa firmy
 DocType: SMS Center,Total Message(s),Razem ilość wiadomości
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Wybierz produkt Transferu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Wybierz produkt Transferu
 DocType: Purchase Invoice,Additional Discount Percentage,Dodatkowy rabat procentowy
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Zobacz listę wszystkich filmów pomocy
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,
@@ -1177,6 +1199,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Metr
 DocType: Workstation,Electricity Cost,Koszt energii elekrycznej
 DocType: HR Settings,Don't send Employee Birthday Reminders,Nie wysyłaj przypomnień o urodzinach Pracowników
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Zapisz ustawienia
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Żądane produkty
 DocType: Item,Inspection Criteria,Kryteria kontrolne
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Przeniesione
 DocType: BOM Website Item,BOM Website Item,BOM Website Element
@@ -1194,11 +1218,11 @@
 DocType: Journal Entry,Total Amount in Words,Wartość całkowita słownie
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Wystąpił błąd. Przypuszczalnie zostało to spowodowane niezapisaniem formularza. Proszę skontaktować się z support@erpnext.com jeżeli problem będzie nadal występował.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Mój koszyk
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Rodzaj zlecenia musi być jednym z {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Rodzaj zlecenia musi być jednym z {0}
 DocType: Lead,Next Contact Date,Data Następnego Kontaktu
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Ilość Otwarcia
 DocType: Healthcare Settings,Appointment Reminder,Przypomnienie o spotkaniu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Proszę wpisać uwagę do zmiany kwoty
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Proszę wpisać uwagę do zmiany kwoty
 DocType: Student Batch Name,Student Batch Name,Student Batch Nazwa
 DocType: Consultation,Doctor,Lekarz
 DocType: Holiday List,Holiday List Name,Lista imion na wakacje
@@ -1206,12 +1230,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Plan zajęć
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Opcje magazynu
 DocType: Journal Entry Account,Expense Claim,Zwrot Kosztów
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Czy na pewno chcesz przywrócić złomowane atut?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Ilość dla {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Czy na pewno chcesz przywrócić złomowane atut?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Ilość dla {0}
 DocType: Leave Application,Leave Application,Wniosek o Urlop
 DocType: Patient,Patient Relation,Relacja pacjenta
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Narzędzie do przydziału urlopu
+DocType: Item,Hub Category to Publish,Kategoria ośrodka do opublikowania
 DocType: Leave Block List,Leave Block List Dates,Opuść Zablokowaną Listę Dat
+DocType: Sales Invoice,Billing Address GSTIN,Adres rozliczeniowy GSTIN
 DocType: Workstation,Net Hour Rate,Stawka godzinowa Netto
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Koszt kupionego przedmiotu
 DocType: Company,Default Terms,Regulamin domyślne
@@ -1221,11 +1247,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Proszę podać {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Usunięte pozycje bez zmian w ilości lub wartości.
 DocType: Delivery Note,Delivery To,Dostawa do
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Stół atrybut jest obowiązkowy
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Stół atrybut jest obowiązkowy
 DocType: Production Planning Tool,Get Sales Orders,Pobierz zamówienia sprzedaży
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} nie może być ujemna
 DocType: Training Event,Self-Study,Samokształcenie
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Zniżka (rabat)
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Zniżka (rabat)
 DocType: Asset,Total Number of Depreciations,Całkowita liczba amortyzacją
 DocType: Sales Invoice Item,Rate With Margin,Rate With Margin
 DocType: Sales Invoice Item,Rate With Margin,Rate With Margin
@@ -1233,7 +1259,7 @@
 DocType: Task,Urgent,Pilne
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Proszę podać poprawny identyfikator wiersz dla rzędu {0} w tabeli {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Nie można znaleźć zmiennej:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Proszę wybrać pole do edycji z numpadu
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Proszę wybrać pole do edycji z numpadu
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Przejdź do pulpitu i rozpocząć korzystanie ERPNext
 DocType: Item,Manufacturer,Producent
 DocType: Landed Cost Item,Purchase Receipt Item,Przedmiot Potwierdzenia Zakupu
@@ -1264,8 +1290,8 @@
 DocType: GL Entry,Against,Wyklucza
 DocType: Item,Default Selling Cost Center,Domyśle Centrum Kosztów Sprzedaży
 DocType: Sales Partner,Implementation Partner,Partner Wdrożeniowy
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Kod pocztowy
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Zamówienie sprzedaży jest {0} {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Kod pocztowy
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Zamówienie sprzedaży jest {0} {1}
 DocType: Opportunity,Contact Info,Dane kontaktowe
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Dokonywanie stockowe Wpisy
 DocType: Packing Slip,Net Weight UOM,Jednostka miary wagi netto
@@ -1276,6 +1302,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Pobierz Tygodniowe zestawienie dat
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,"Data zakończenia nie może być wcześniejsza, niż data rozpoczęcia"
 DocType: Sales Person,Select company name first.,Wybierz najpierw nazwę firmy
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Od niskiego do wysokiego
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Wyceny otrzymane od dostawców
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Zastąp BOM i zaktualizuj ostatnią cenę we wszystkich materiałach
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Do {0} | {1} {2}
@@ -1295,7 +1322,7 @@
 DocType: Program Enrollment,Transportation,Transport
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Nieprawidłowy Atrybut
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} musi zostać wysłane
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Ilość musi być mniejsze niż lub równe {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Ilość musi być mniejsze niż lub równe {0}
 DocType: SMS Center,Total Characters,Wszystkich Postacie
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Proszę wybrać LM w dziedzinie BOM dla pozycji {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,
@@ -1310,7 +1337,7 @@
 ,Ordered Items To Be Billed,Zamówione produkty do rozliczenia
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Od Zakres musi być mniejsza niż do zakresu
 DocType: Global Defaults,Global Defaults,Globalne wartości domyślne
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Projekt zaproszenie Współpraca
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Projekt zaproszenie Współpraca
 DocType: Salary Slip,Deductions,Odliczenia
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Nazwa działania
@@ -1328,13 +1355,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Faktura Zaliczkowa
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Brak żądań
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Kolejny rekord budżetu &#39;{0}&#39; już istnieje przeciwko {1} {2} &#39;za rok obrotowy {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Zarząd
 DocType: Cheque Print Template,Payer Settings,Ustawienia płatnik
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To będzie dołączany do Kodeksu poz wariantu. Na przykład, jeśli skrót to ""SM"", a kod element jest ""T-SHIRT"" Kod poz wariantu będzie ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Wynagrodzenie netto (słownie) będzie widoczna po zapisaniu na Liście Płac.
 DocType: Purchase Invoice,Is Return,Czy Wróć
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Uwaga
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Uwaga
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Powrót / noty obciążeniowej
 DocType: Price List Country,Price List Country,Cena Kraj
 DocType: Item,UOMs,Jednostki miary
@@ -1349,17 +1376,18 @@
 DocType: Account,Balance Sheet,Arkusz Bilansu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Centrum kosztów dla Przedmiotu z Kodem Przedmiotu '
 DocType: Fee Validity,Valid Till,Obowiązuje do
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Tryb płatność nie jest skonfigurowana. Proszę sprawdzić, czy konto zostało ustawione na tryb płatności lub na POS Profilu."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Tryb płatność nie jest skonfigurowana. Proszę sprawdzić, czy konto zostało ustawione na tryb płatności lub na POS Profilu."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Sama pozycja nie może być wprowadzone wiele razy.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Dalsze relacje mogą być wykonane w ramach grup, ale wpisy mogą być wykonane przed spoza grup"
 DocType: Lead,Lead,Potencjalny klient
 DocType: Email Digest,Payables,Zobowiązania
 DocType: Course,Course Intro,Kurs Intro
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Wpis {0} w Magazynie został utworzony
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Proszę ustawić serię numerów dla Obecności za pośrednictwem Setup&gt; Numbering Series
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Wpis {0} w Magazynie został utworzony
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Wiersz # {0}: Odrzucone Ilość nie może być wprowadzone w Purchase Powrót
 ,Purchase Order Items To Be Billed,Przedmioty oczekujące na rachunkowość Zamówienia Kupna
 DocType: Purchase Invoice Item,Net Rate,Cena netto
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Proszę wybrać klienta
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Proszę wybrać klienta
 DocType: Purchase Invoice Item,Purchase Invoice Item,Przedmiot Faktury Zakupu
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Zapisy księgi zapasów oraz księgi głównej są odświeżone dla wybranego dokumentu zakupu
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Pozycja 1
@@ -1380,7 +1408,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Wiersz zduplikowany {0} z tym samym {1}
 ,Trial Balance,Zestawienie obrotów i sald
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Rok fiskalny {0} Nie znaleziono
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Konfigurowanie Pracownicy
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Konfigurowanie Pracownicy
 DocType: Sales Order,SO-,WIĘC-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Wybierz prefix
 DocType: Employee,O-,O-
@@ -1392,12 +1420,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Podgląd księgi
 DocType: Grading Scale,Intervals,przedziały
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najwcześniejszy
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group",Istnieje element Grupy o takiej nazwie. Zmień nazwę elementu lub tamtej Grupy.
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group",Istnieje element Grupy o takiej nazwie. Zmień nazwę elementu lub tamtej Grupy.
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Nie Student Komórka
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Reszta świata
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Reszta świata
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Element {0} nie może mieć Batch
 ,Budget Variance Report,Raport z weryfikacji budżetu
 DocType: Salary Slip,Gross Pay,Płaca brutto
+DocType: Item,Is Item from Hub,Jest Przedmiot z Hubu
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Wiersz {0}: Typ aktywny jest obowiązkowe.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dywidendy wypłacone
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Księgi rachunkowe
@@ -1407,8 +1436,9 @@
 DocType: Vehicle Log,Service Detail,Szczegóły usługi
 DocType: BOM,Item Description,Opis produktu
 DocType: Student Sibling,Student Sibling,Student Rodzeństwo
-DocType: Purchase Invoice,Is Recurring,Czy cykliczne
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Tryb Płatności
 DocType: Purchase Invoice,Supplied Items,Dostarczone przedmioty
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Ustaw aktywne menu restauracji {0}
 DocType: Student,STUD.,STADNINA.
 DocType: Production Order,Qty To Manufacture,Ilość do wyprodukowania
 DocType: Email Digest,New Income,Nowy dochodowy
@@ -1419,6 +1449,7 @@
 ,Student and Guardian Contact Details,Uczeń i opiekun Dane kontaktowe
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Wiersz {0}: Dla dostawcy {0} adres email jest wymagany do wysyłania wiadomości e-mail
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Tymczasowe otwarcia
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Wyświetl centrum
 ,Employee Leave Balance,Bilans zwolnień pracownika
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Bilans dla Konta {0} zawsze powinien wynosić {1}
 DocType: Patient Appointment,More Info,Więcej informacji
@@ -1438,13 +1469,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Zlecenie Sprzedaży {0} jest niepoprawne
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Ostrzegaj przed nowym żądaniem ofert
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Zamówienia pomoże Ci zaplanować i śledzić na zakupy
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged",Przepraszamy ale firmy nie mogą zostać połaczone
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged",Przepraszamy ale firmy nie mogą zostać połaczone
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Zasady badań laboratoryjnych
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Całkowita ilość Issue / Przelew {0} w dziale Zamówienie {1} \ nie może być większa od ilości wnioskowanej dla {2} {3} Przedmiot
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Mały
 DocType: Employee,Employee Number,Numer pracownika
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Numer(y) sprawy w użytku. Proszę spróbować Numer Sprawy {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Numer(y) sprawy w użytku. Proszę spróbować Numer Sprawy {0}
 DocType: Project,% Completed,% ukończone
 ,Invoiced Amount (Exculsive Tax),Zafakturowana kwota netto
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Pozycja 2
@@ -1459,11 +1490,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Wydatki pośrednie
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Wiersz {0}: Ilość jest obowiązkowe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Rolnictwo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Twoje Produkty lub Usługi
 DocType: Special Test Items,Special Test Items,Specjalne przedmioty testowe
 DocType: Mode of Payment,Mode of Payment,Rodzaj płatności
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Strona Obraz powinien być plik publiczny lub adres witryny
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Strona Obraz powinien być plik publiczny lub adres witryny
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,To jest grupa przedmiotów root i nie mogą być edytowane.
@@ -1471,9 +1502,9 @@
 DocType: Vehicle,Fuel UOM,Jednostka miary paliwa
 DocType: Warehouse,Warehouse Contact Info,Dane kontaktowe dla magazynu
 DocType: Payment Entry,Write Off Difference Amount,Różnica Kwota odpisuje
-DocType: Purchase Invoice,Recurring Type,Powtarzający się typ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: Email pracownika nie został znaleziony, dlatego wiadomość nie będzie wysłana"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: Email pracownika nie został znaleziony, dlatego wiadomość nie będzie wysłana"
 DocType: Item,Foreign Trade Details,Handlu Zagranicznego Szczegóły
+,Assessment Plan Status,Status planu oceny
 DocType: Email Digest,Annual Income,Roczny dochód
 DocType: Serial No,Serial No Details,Szczegóły numeru seryjnego
 DocType: Purchase Invoice Item,Item Tax Rate,Stawka podatku dla tej pozycji
@@ -1481,15 +1512,14 @@
 DocType: Student Group Student,Group Roll Number,Numer grupy
 DocType: Student Group Student,Group Roll Number,Numer grupy
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Dla {0}, tylko Kredytowane konta mogą być połączone z innym zapisem po stronie debetowej"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Suma wszystkich wagach zadanie powinno być 1. Proszę ustawić wagi wszystkich zadań projektowych odpowiednio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Dowód dostawy {0} nie został wysłany
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Suma wszystkich wagach zadanie powinno być 1. Proszę ustawić wagi wszystkich zadań projektowych odpowiednio
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Dowód dostawy {0} nie został wysłany
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Wycena Zasada jest najpierw wybiera się na podstawie ""Zastosuj Na"" polu, które może być pozycja, poz Grupa lub Marka."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Proszę najpierw ustawić kod pozycji
-DocType: Hub Settings,Seller Website,Sprzedawca WWW
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Proszę najpierw ustawić kod pozycji
 DocType: Item,ITEM-,POZYCJA-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Łącznie przydzielony procent sprzedaży dla zespołu powinien wynosić 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Łącznie przydzielony procent sprzedaży dla zespołu powinien wynosić 100
 DocType: Sales Invoice Item,Edit Description,Edytuj opis
 DocType: Antibiotic,Antibiotic,Antybiotyk
 ,Team Updates,Aktualizacje zespół
@@ -1510,12 +1540,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Razem (Spółka Waluta)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Nr seryjny {0} wprowadzony jest więcej niż jeden raz
 DocType: Depreciation Schedule,Journal Entry,Zapis księgowy
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} pozycji w przygotowaniu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} pozycji w przygotowaniu
 DocType: Workstation,Workstation Name,Nazwa stacji roboczej
 DocType: Grading Scale Interval,Grade Code,Kod klasy
 DocType: POS Item Group,POS Item Group,POS Pozycja Grupy
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,przetwarzanie maila
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} nie należy do pozycji {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} nie należy do pozycji {1}
 DocType: Sales Partner,Target Distribution,Dystrybucja docelowa
 DocType: Salary Slip,Bank Account No.,Nr konta bankowego
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Jest to numer ostatniej transakcji utworzonego z tym prefix
@@ -1532,10 +1562,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Zapytanie ofertowe Dostawcę
 DocType: Healthcare Settings,Registration Message,Wiadomość rejestracyjna
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Sprzęt komputerowy
-DocType: Sales Order,Recurring Upto,Cyklicznie upto
 DocType: Prescription Dosage,Prescription Dosage,Dawka leku na receptę
 DocType: Attendance,HR Manager,
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Wybierz firmę
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Wybierz firmę
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,
 DocType: Purchase Invoice,Supplier Invoice Date,Data faktury dostawcy
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,za
@@ -1551,10 +1580,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Nakładające warunki pomiędzy:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Zapis {0} jest już powiązany z innym dowodem księgowym
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Łączna wartość zamówienia
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Żywność
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Żywność
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Starzenie Zakres 3
 DocType: Maintenance Schedule Item,No of Visits,Numer wizyt
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Harmonogram konserwacji {0} istnieje przeciwko {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Czy chcesz opublikować swoje produkty w centrum?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,Zapis uczeń
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Waluta Rachunku Zamknięcie musi być {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma punktów dla wszystkich celów powinno być 100. {0}
@@ -1565,9 +1595,9 @@
 DocType: Authorization Rule,Average Discount,Średni rabat
 DocType: Purchase Invoice Item,UOM,Jednostka miary
 DocType: Rename Tool,Utilities,Usługi komunalne
-DocType: Purchase Invoice Item,Accounting,Księgowość
+DocType: POS Profile,Accounting,Księgowość
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Wybierz partie dla partii
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Wybierz partie dla partii
 DocType: Asset,Depreciation Schedules,Rozkłady amortyzacyjne
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Okres aplikacja nie może być okres alokacji urlopu poza
 DocType: Activity Cost,Projects,Projekty
@@ -1583,7 +1613,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',Status Zatwierdzenia musi być 'Zatwierdzono' albo 'Odrzucono'
 DocType: Physician,Contacts and Address,Kontakty i adres
 DocType: Purchase Invoice,Contact Person,Osoba kontaktowa
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Przewidywana data rozpoczęcia' nie może nastąpić później niż 'Przewidywana data zakończenia'
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','Przewidywana data rozpoczęcia' nie może nastąpić później niż 'Przewidywana data zakończenia'
 DocType: Course Scheduling Tool,Course End Date,Data zakończenia kursu
 DocType: Holiday List,Holidays,Wakacje
 DocType: Sales Order Item,Planned Quantity,Planowana ilość
@@ -1591,10 +1621,11 @@
 DocType: Item,Maintain Stock,Utrzymanie Zapasów
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Wpisy dla zasobów już utworzone na podst. Zlecenia Produkcji
 DocType: Employee,Prefered Email,Zalecany email
+DocType: Student Admission,Eligibility and Details,Kwalifikowalność i szczegóły
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Zmiana netto stanu trwałego
 DocType: Leave Control Panel,Leave blank if considered for all designations,Zostaw puste jeśli jest to rozważane dla wszystkich nominacji
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Od DateTime
 DocType: Email Digest,For Company,Dla firmy
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Rejestr komunikacji
@@ -1602,19 +1633,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Dostawca Scorecard Zmienna scoringowa
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Kwota zakupu
 DocType: Sales Invoice,Shipping Address Name,Adres do wysyłki Nazwa
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Plan Kont
 DocType: Material Request,Terms and Conditions Content,Zawartość regulaminu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,nie może być większa niż 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Element {0} nie jest w magazynie
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Element {0} nie jest w magazynie
 DocType: Maintenance Visit,Unscheduled,Nieplanowany
 DocType: Employee,Owned,Zawłaszczony
 DocType: Salary Detail,Depends on Leave Without Pay,Zależy od urlopu bezpłatnego
 DocType: Pricing Rule,"Higher the number, higher the priority","Im wyższa liczba, wyższy priorytet"
 ,Purchase Invoice Trends,Trendy Faktur Zakupów
 DocType: Employee,Better Prospects,Lepsze Alternatywy
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Wiersz # {0}: partia {1} ma tylko {2} qty. Wybierz inną partię, która ma {3} qty dostępną lub podzielisz wiersz na wiele wierszy, aby dostarczyć / wydać z wielu partii"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Wiersz # {0}: partia {1} ma tylko {2} qty. Wybierz inną partię, która ma {3} qty dostępną lub podzielisz wiersz na wiele wierszy, aby dostarczyć / wydać z wielu partii"
 DocType: Vehicle,License Plate,Tablica rejestracyjna
 DocType: Appraisal,Goals,Cele
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Wybierz profil POS
 DocType: Warranty Claim,Warranty / AMC Status,Gwarancja / AMC Status
 ,Accounts Browser,Przeglądarka kont
 DocType: Payment Entry Reference,Payment Entry Reference,Wejście Płatność referencyjny
@@ -1633,7 +1664,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Pracownik nie może odpowiadać do samego siebie.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jeśli konto jest zamrożone, zapisy mogą wykonywać tylko wyznaczone osoby."
 DocType: Email Digest,Bank Balance,Saldo bankowe
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Wprowadzenia danych księgowych dla {0}: {1} może być dokonywane wyłącznie w walucie: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Wprowadzenia danych księgowych dla {0}: {1} może być dokonywane wyłącznie w walucie: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil stanowiska pracy, wymagane kwalifikacje itp."
 DocType: Journal Entry Account,Account Balance,Bilans konta
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Reguła podatkowa dla transakcji.
@@ -1642,8 +1673,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Łączna kwota podatków i opłat (wg Firmy)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Pokaż niezamkniętych rok obrotowy za P &amp; L sald
 DocType: Lab Test Template,Collection Details,Szczegóły kolekcji
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","wybierz cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date z tabConsultation ct, `tabLab Prescription` cp gdzie ct.patient = &#39;{0}&#39; i cp.parent = ct. nazwa i cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Konto dostawy
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Rachunek {2} jest nieaktywny
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,"Dokonać zamówienia sprzedaży, które pomogą Ci zaplanować swoją pracę i dostarczyć na czas"
@@ -1660,7 +1689,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,List przewozowy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Wydatki na wynajem
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Konfiguracja ustawień bramki SMS
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import nie powiódł się!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import nie powiódł się!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Nie dodano jeszcze adresu.
 DocType: Workstation Working Hour,Workstation Working Hour,Godziny robocze Stacji Roboczej
 DocType: Vital Signs,Blood Pressure,Ciśnienie krwi
@@ -1685,7 +1714,7 @@
 DocType: Sales Invoice,Source,Źródło
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Pokaż closed
 DocType: Leave Type,Is Leave Without Pay,Czy urlopu bezpłatnego
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Kategoria atutem jest obowiązkowe dla Fixed pozycja aktywów
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Kategoria atutem jest obowiązkowe dla Fixed pozycja aktywów
 DocType: Fee Validity,Fee Validity,Ważność opłaty
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nie znaleziono rekordów w tabeli płatności
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ten {0} konflikty z {1} do {2} {3}
@@ -1706,8 +1735,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Szukanie wykonawcze
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Tworzenie Leads
 DocType: Maintenance Schedule,Schedules,Harmonogramy
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,Profil POS jest wymagany do korzystania z Point-of-Sale
 DocType: Purchase Invoice Item,Net Amount,Kwota netto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} nie został złożony, więc działanie nie może zostać zakończone"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} nie został złożony, więc działanie nie może zostać zakończone"
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Numer
 DocType: Landed Cost Voucher,Additional Charges,Dodatkowe koszty
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatkowa kwota rabatu (waluta firmy)
@@ -1716,7 +1746,7 @@
 ,Support Hour Distribution,Dystrybucja godzin wsparcia
 DocType: Maintenance Visit,Maintenance Visit,Wizyta Konserwacji
 DocType: Student,Leaving Certificate Number,Pozostawiając numer certyfikatu
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Powołanie zostało anulowane, przejrzyj i anuluj fakturę {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Powołanie zostało anulowane, przejrzyj i anuluj fakturę {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Dostępne w Warehouse partii Ilość
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Aktualizacja Format wydruku
 DocType: Landed Cost Voucher,Landed Cost Help,Ugruntowany Koszt Pomocy
@@ -1739,8 +1769,8 @@
 DocType: Patient,Tobacco Past Use,Tytoniu w przeszłości
 DocType: Sales Invoice Item,Brand Name,Nazwa marki
 DocType: Purchase Receipt,Transporter Details,Szczegóły transportu
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Użytkownik {0} jest już przydzielony do lekarza {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Domyślny magazyn jest wymagana dla wybranego elementu
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Użytkownik {0} jest już przydzielony do lekarza {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Domyślny magazyn jest wymagana dla wybranego elementu
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Pudło
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,Dostawca możliwe
 DocType: Budget,Monthly Distribution,Miesięczny Dystrybucja
@@ -1750,8 +1780,8 @@
 DocType: Sales Partner,Sales Partner Target,Cel Partnera Sprzedaży
 DocType: Loan Type,Maximum Loan Amount,Maksymalna kwota kredytu
 DocType: Pricing Rule,Pricing Rule,Reguła cenowa
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Duplikat numeru rolki dla ucznia {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Duplikat numeru rolki dla ucznia {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Duplikat numeru rolki dla ucznia {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Duplikat numeru rolki dla ucznia {0}
 DocType: Budget,Action if Annual Budget Exceeded,"Akcja, jeśli roczny budżet Przekroczono"
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Twoje zamówienie jest w realizacji
 DocType: Shopping Cart Settings,Payment Success URL,Płatność Sukces URL
@@ -1768,7 +1798,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} musi pojawić się tylko raz
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nie wolno przesyłaj więcej niż {0} {1} przeciwko Zamówienia {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Urlop przedzielony z powodzeniem dla {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Brak Przedmiotów do pakowania
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Brak Przedmiotów do pakowania
 DocType: Shipping Rule Condition,From Value,Od wartości
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Ilość wyprodukowanych jest obowiązkowa
 DocType: Employee Loan,Repayment Method,Sposób spłaty
@@ -1782,6 +1812,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Zadłużenie zapasów
 DocType: Purchase Invoice,Supplier Warehouse,Magazyn dostawcy
 DocType: Opportunity,Contact Mobile No,Numer komórkowy kontaktu
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Wybierz firmę
 ,Material Requests for which Supplier Quotations are not created,
 DocType: Student Group,Set 0 for no limit,Ustaw 0 oznacza brak limitu
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Dzień (s), w którym starasz się o urlop jest święta. Nie musisz ubiegać się o urlop."
@@ -1791,24 +1822,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Dodać Oferta
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Inne raporty
 DocType: Dependent Task,Dependent Task,Zadanie zależne
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Współczynnikiem konwersji dla domyślnej Jednostki Pomiaru musi być 1 w rzędzie {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Współczynnikiem konwersji dla domyślnej Jednostki Pomiaru musi być 1 w rzędzie {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Urlop typu {0} nie może być dłuższy niż {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Spróbuj planowania operacji dla X dni wcześniej.
 DocType: HR Settings,Stop Birthday Reminders,Zatrzymaj przypomnienia o urodzinach
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Proszę ustawić domyślny Payroll konto płatne w Spółce {0}
 DocType: SMS Center,Receiver List,Lista odbiorców
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Szukaj przedmiotu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Szukaj przedmiotu
 DocType: Patient Appointment,Referring Physician,Polecany lekarz
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Skonsumowana wartość
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Zmiana netto stanu środków pieniężnych
 DocType: Assessment Plan,Grading Scale,Skala ocen
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jednostka miary {0} została wprowadzona więcej niż raz w Tabelce Współczynnika Konwersji
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,Zakończone
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jednostka miary {0} została wprowadzona więcej niż raz w Tabelce Współczynnika Konwersji
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,Zakończone
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,W Parze
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Płatność Zapytanie już istnieje {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Koszt Emitowanych Przedmiotów
 DocType: Physician,Hospital,Szpital
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Ilość nie może być większa niż {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Ilość nie może być większa niż {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Poprzedni rok finansowy nie jest zamknięta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Wiek (dni)
 DocType: Quotation Item,Quotation Item,Przedmiot Wyceny
@@ -1819,8 +1850,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,
 DocType: Purchase Order Item,Supplier Part Number,Numer katalogowy dostawcy
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Wartością konwersji nie może być 0 ani 1
-DocType: Sales Invoice,Reference Document,Dokument referencyjny
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} jest anulowane lub wstrzymane
+DocType: Subscription,Reference Document,Dokument referencyjny
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} jest anulowane lub wstrzymane
 DocType: Accounts Settings,Credit Controller,
 DocType: Delivery Note,Vehicle Dispatch Date,Data wysłania pojazdu
 DocType: Healthcare Settings,Default Medical Code Standard,Domyślny standard kodu medycznego
@@ -1829,6 +1860,7 @@
 DocType: Company,Default Payable Account,Domyślne konto Rozrachunki z dostawcami
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Ustawienia dla internetowego koszyka, takie jak zasady żeglugi, cennika itp"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% rozliczono
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Sortuj według ceny ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Zarezerwowana ilość
 DocType: Party Account,Party Account,Konto Grupy
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Kadry
@@ -1840,13 +1872,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Dokonaj wydatkowania Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Wiersz {0}: Advance przed Dostawcę należy obciążyć
 DocType: Company,Default Values,Domyślne Wartości
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequency} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Frequency} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Całkowitej kwoty zwrotów
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Opiera się to na dzienniki przeciwko tego pojazdu. Zobacz harmonogram poniżej w szczegółach
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Przeciwko Dostawcę faktury {0} {1} dnia
 DocType: Customer,Default Price List,Domyślna List Cen
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Rekord Ruch atutem {0} tworzone
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nie można usunąć Fiscal Year {0}. Rok fiskalny {0} jest ustawiona jako domyślna w Ustawienia globalne
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Klient o tej samej nazwie już istnieje
 DocType: Journal Entry,Entry Type,Rodzaj wpisu
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Brak planu oceny związanego z tą grupą oceny
 ,Customer Credit Balance,Saldo kredytowe klienta
@@ -1856,7 +1889,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,cennik
 DocType: Quotation,Term Details,Szczegóły warunków
 DocType: Project,Total Sales Cost (via Sales Order),Całkowite koszty sprzedaży (poprzez zlecenie sprzedaży)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Nie można zapisać więcej niż {0} studentów dla tej grupy studentów.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Nie można zapisać więcej niż {0} studentów dla tej grupy studentów.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Liczba potencjalnych klientów
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} musi być większy niż 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planowanie zdolności Do (dni)
@@ -1873,9 +1906,11 @@
 DocType: Lab Test,Technician Name,Nazwa technika
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Odłączanie Przedpłata na Anulowanie faktury
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Aktualny stan licznika kilometrów wszedł powinien być większy niż początkowy stan licznika kilometrów {0}
+DocType: Restaurant Reservation,No Show,Brak pokazu
 DocType: Shipping Rule Country,Shipping Rule Country,Zasada Wysyłka Kraj
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Leave a frekwencja
 DocType: Maintenance Visit,Partially Completed,Częściowo Ukończony
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Średnia czułość
 DocType: Leave Type,Include holidays within leaves as leaves,Dołączaj święta w ciągu urlopu
 DocType: Sales Invoice,Packed Items,Przedmioty pakowane
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Roszczenie gwarancyjne z numerem seryjnym
@@ -1892,13 +1927,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Zapłacona kwota (waluta firmy)
 DocType: Purchase Invoice,Additional Discount,Dodatkowe zniżki
 DocType: Selling Settings,Selling Settings,Ustawienia Sprzedaży
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Potwierdź działanie
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Aukcje Online
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Podaj dokładnie Ilość lub Stawkę lub obie
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Spełnienie
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Zobacz Koszyk
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Wydatki marketingowe
 ,Item Shortage Report,Element Zgłoś Niedobór
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Waga jest określona, \n Ustaw także ""Wagę jednostkową"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Waga jest określona, \n Ustaw także ""Wagę jednostkową"""
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Następny Amortyzacja Data jest obowiązkowe dla nowych aktywów
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Oddzielna grupa kursów dla każdej partii
@@ -1911,12 +1947,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Tworzenie Zapisów Księgowych dla każdej zmiany stanu Magazynu
 DocType: Leave Allocation,Total Leaves Allocated,Całkowita ilość przyznanych dni zwolnienia od pracy
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Magazyn wymagany w wierszu nr {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Proszę wpisać poprawny rok obrotowy od daty rozpoczęcia i zakończenia
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Proszę wpisać poprawny rok obrotowy od daty rozpoczęcia i zakończenia
 DocType: Employee,Date Of Retirement,Data przejścia na emeryturę
 DocType: Upload Attendance,Get Template,Pobierz szablon
 DocType: Material Request,Transferred,Przeniesiony
 DocType: Vehicle,Doors,drzwi
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,Konfiguracja ERPNext zakończona!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,Konfiguracja ERPNext zakończona!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Zbierz opłatę za rejestrację pacjenta
 DocType: Course Assessment Criteria,Weightage,Waga/wiek
 DocType: Purchase Invoice,Tax Breakup,Podział podatków
@@ -1935,37 +1971,37 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Jeśli ten element ma warianty, to nie może być wybrany w zleceniach sprzedaży itp"
 DocType: Lead,Next Contact By,Następny Kontakt Po
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Ilość wymagana dla Przedmiotu {0} w rzędzie {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Ilość wymagana dla Przedmiotu {0} w rzędzie {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Magazyn {0} nie może zostać usunięty ponieważ istnieje wartość dla przedmiotu {1}
 DocType: Quotation,Order Type,Typ zamówienia
-DocType: Purchase Invoice,Notification Email Address,Powiadomienie adres e-mail
 ,Item-wise Sales Register,
 DocType: Asset,Gross Purchase Amount,Zakup Kwota brutto
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Saldo otwarcia
 DocType: Asset,Depreciation Method,Metoda amortyzacji
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Offline
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Czy podatek wliczony jest w opłaty?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Łączna docelowa
 DocType: Job Applicant,Applicant for a Job,Aplikant do Pracy
 DocType: Production Plan Material Request,Production Plan Material Request,Produkcja Plan Materiał Zapytanie
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Nie ma Zamówienia Produkcji
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Nie ma Zamówienia Produkcji
 DocType: Stock Reconciliation,Reconciliation JSON,Wyrównywanie JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Zbyt wiele kolumn. Wyeksportować raport i wydrukować go za pomocą arkusza kalkulacyjnego.
 DocType: Purchase Invoice Item,Batch No,Nr Partii
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Prośba o ofertę: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Zezwalaj na wiele zleceń sprzedaży wobec Klienta Zamówienia
 DocType: Student Group Instructor,Student Group Instructor,Instruktor grupy studentów
 DocType: Student Group Instructor,Student Group Instructor,Instruktor grupy studentów
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Komórka Nie
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Główny
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Główny
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Wariant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Ustaw prefiks dla numeracji serii na swoich transakcji
 DocType: Employee Attendance Tool,Employees HTML,Pracownicy HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Domyślnie Wykaz Materiałów ({0}) musi być aktywny dla tej pozycji lub jej szablonu
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Domyślnie Wykaz Materiałów ({0}) musi być aktywny dla tej pozycji lub jej szablonu
 DocType: Employee,Leave Encashed?,"Jesteś pewien, że chcesz wyjść z Wykupinych?"
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Szansa Od pola jest obowiązkowe
 DocType: Email Digest,Annual Expenses,roczne koszty
 DocType: Item,Variants,Warianty
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Wprowadź Zamówienie
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Wprowadź Zamówienie
 DocType: SMS Center,Send To,Wyślij do
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},
 DocType: Payment Reconciliation Payment,Allocated amount,Przyznana kwota
@@ -1983,6 +2019,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Siła grupy studentów
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Przeciwko Urzędowym Wejście {0} nie ma niezrównaną pozycję {1}
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,wyceny
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Wydarzenia szkoleniowe
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Zduplikowany Nr Seryjny wprowadzony dla przedmiotu {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Warunki wysyłki
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Podaj
@@ -1992,7 +2029,7 @@
 DocType: Sales Order,To Deliver and Bill,Do dostarczenia i Bill
 DocType: Student Group,Instructors,instruktorzy
 DocType: GL Entry,Credit Amount in Account Currency,Kwota kredytu w walucie rachunku
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} musi być złożony
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} musi być złożony
 DocType: Authorization Control,Authorization Control,Kontrola Autoryzacji
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Wiersz # {0}: Odrzucone Magazyn jest obowiązkowe przed odrzucony poz {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Płatność
@@ -2011,11 +2048,11 @@
 DocType: Quotation Item,Actual Qty,Rzeczywista Ilość
 DocType: Sales Invoice Item,References,Referencje
 DocType: Quality Inspection Reading,Reading 10,Odczyt 10
-DocType: Hub Settings,Hub Node,Hub Węzeł
+DocType: Hub Category,Hub Node,Hub Węzeł
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Wprowadziłeś duplikat istniejących rzeczy. Sprawdź i spróbuj ponownie
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Współpracownik
 DocType: Asset Movement,Asset Movement,Zaleta Ruch
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,Nowy Koszyk
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,Nowy Koszyk
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,
 DocType: SMS Center,Create Receiver List,Stwórz listę odbiorców
 DocType: Vehicle,Wheels,Koła
@@ -2029,15 +2066,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikacja
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Wskazuje, że pakiet jest częścią tej dostawy (Tylko projektu)"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Wprowadź wpływ płatności
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Ilość dla Przedmiotu {0} musi być mniejsza niż {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Ilość dla Przedmiotu {0} musi być mniejsza niż {1}
 ,Sales Invoice Trends,
 DocType: Leave Application,Apply / Approve Leaves,Zastosuj / Zatwierdź liście
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Dla
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Dla
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Może odnosić się do wierdza tylko wtedy, gdy typ opłata jest ""Poprzedniej Wartości Wiersza Suma"" lub ""poprzedniego wiersza Razem"""
 DocType: Sales Order Item,Delivery Warehouse,Magazyn Dostawa
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Drzewo MPK finansowych.
 DocType: Serial No,Delivery Document No,Nr dokumentu dostawy
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Proszę ustaw &#39;wpływ konto / strata na aktywach Spółki w unieszkodliwianie &quot;{0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Proszę ustaw &#39;wpływ konto / strata na aktywach Spółki w unieszkodliwianie &quot;{0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Uzyskaj pozycje z potwierdzeń zakupu.
 DocType: Serial No,Creation Date,Data utworzenia
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Element {0} pojawia się wielokrotnie w Cenniku {1}
@@ -2048,12 +2085,13 @@
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Ma Warianty
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Zaktualizuj odpowiedź
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Już wybrane pozycje z {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Już wybrane pozycje z {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nazwa dystrybucji miesięcznej
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Identyfikator zbiorczy jest obowiązkowy
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Identyfikator zbiorczy jest obowiązkowy
 DocType: Sales Person,Parent Sales Person,Nadrzędny Przedstawiciel Handlowy
-DocType: Purchase Invoice,Recurring Invoice,Powtarzająca się faktura
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Wysoki na niski
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Najpierw wybierz program
 DocType: Patient Appointment,Patient Age,Wiek pacjenta
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Zarządzanie projektami
 DocType: Supplier,Supplier of Goods or Services.,Dostawca towarów lub usług.
@@ -2061,8 +2099,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Domyślne konta należności, które mają być wykorzystane, jeśli nie zostały ustawione w Księdze Pacjenta, aby zarezerwować opłaty Konsultacyjne."
 DocType: Vehicle Log,Fuel Price,Cena paliwa
 DocType: Budget,Budget,Budżet
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Ustaw Otwórz
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Trwałego Rzecz musi być element non-stock.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Ustaw Otwórz
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Trwałego Rzecz musi być element non-stock.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budżet nie może być przypisany przed {0}, ponieważ nie jest to konto przychodów lub kosztów"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Osiągnięte
 DocType: Student Admission,Application Form Route,Formularz zgłoszeniowy Route
@@ -2076,12 +2114,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Element {0} nie jest ustawiony na nr seryjny. Sprawdź mastera tego elementu
 DocType: Maintenance Visit,Maintenance Time,Czas Konserwacji
 ,Amount to Deliver,Kwota do Deliver
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Ten sam element został wprowadzony wielokrotnie. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Termin Data rozpoczęcia nie może być krótszy niż rok od daty rozpoczęcia roku akademickiego, w jakim termin ten jest powiązany (Academic Year {}). Popraw daty i spróbuj ponownie."
 DocType: Guardian,Guardian Interests,opiekun Zainteresowania
 DocType: Naming Series,Current Value,Bieżąca Wartość
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Wiele lat podatkowych istnieją na dzień {0}. Proszę ustawić firmy w roku finansowym
 DocType: School Settings,Instructor Records to be created by,"Rekord instruktorski, który zostanie utworzony przez"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} utworzone
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} utworzone
 DocType: Delivery Note Item,Against Sales Order,Na podstawie zamówienia sprzedaży
 ,Serial No Status,Status nr seryjnego
 DocType: Payment Entry Reference,Outstanding,Wybitny
@@ -2092,10 +2131,10 @@
  musi być większa niż lub równe {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Jest to oparte na ruchu zapasów. Zobacz {0} o szczegóły
 DocType: Pricing Rule,Selling,Sprzedaż
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Kwota {0} {1} odliczone przed {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Kwota {0} {1} odliczone przed {2}
 DocType: Employee,Salary Information,Informacja na temat wynagrodzenia
 DocType: Sales Person,Name and Employee ID,Imię i Identyfikator Pracownika
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Termin nie może być po Dacie Umieszczenia
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Termin nie może być po Dacie Umieszczenia
 DocType: Website Item Group,Website Item Group,Grupa przedmiotów strony WWW
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Podatki i cła
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,
@@ -2110,7 +2149,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Proszę kliknąć na ""Generowanie Harmonogramu"", aby sprowadzić nr seryjny dodany do pozycji {0}"
 DocType: Account,Frozen,Zamrożony
 ,Open Production Orders,Otwórz zamówienia produkcji
-DocType: Sales Invoice Payment,Base Amount (Company Currency),Kwota bazowa (Spółka waluty)
+DocType: Sales Invoice Payment,Base Amount (Company Currency),Kwota bazowa (Waluta firmy)
 DocType: Payment Reconciliation Payment,Reference Row,Odniesienie Row
 DocType: Installation Note,Installation Time,Czas instalacji
 DocType: Sales Invoice,Accounting Details,Dane księgowe
@@ -2121,7 +2160,7 @@
 DocType: Issue,Resolution Details,Szczegóły Rozstrzygnięcia
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,przydziały
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Kryteria akceptacji
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Prośbę materiału w powyższej tabeli
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Prośbę materiału w powyższej tabeli
 DocType: Item Attribute,Attribute Name,Nazwa atrybutu
 DocType: BOM,Show In Website,Pokaż na stronie internetowej
 DocType: Shopping Cart Settings,Show Quantity in Website,Pokaż ilość w Serwisie
@@ -2130,7 +2169,7 @@
 DocType: Item Reorder,Check in (group),Przyjazd (grupa)
 ,Qty to Order,Ilość do zamówienia
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Głowica konto ramach odpowiedzialności lub kapitałowe, w których zysk / strata będzie zarezerwowane"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Wykres Gantta dla wszystkich zadań.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Wykres Gantta dla wszystkich zadań.
 DocType: Opportunity,Mins to First Response,Min do pierwszej odpowiedzi
 DocType: Pricing Rule,Margin Type,margines Rodzaj
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} godzin
@@ -2152,36 +2191,36 @@
 DocType: Patient,Surgical History,Historia chirurgiczna
 DocType: Employee,Resignation Letter Date,Data wypowiedzenia
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Zasady ustalania cen są dalej filtrowane na podstawie ilości.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Proszę ustawić datę dołączenia do pracownika {0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Proszę ustawić datę dołączenia do pracownika {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Proszę ustawić datę dołączenia do pracownika {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Proszę ustawić datę dołączenia do pracownika {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Całkowita kwota płatności (poprzez Czas Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Powtórz Przychody klienta
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) musi mieć rolę 'Zatwierdzający Koszty
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Para
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Wybierz BOM i ilosc Produkcji
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Wybierz BOM i ilosc Produkcji
 DocType: Asset,Depreciation Schedule,amortyzacja Harmonogram
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Adresy partnerów handlowych i kontakty
 DocType: Bank Reconciliation Detail,Against Account,Konto korespondujące
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Pół Dzień Data powinna być pomiędzy Od Data i do tej pory
 DocType: Maintenance Schedule Detail,Actual Date,Rzeczywista Data
 DocType: Item,Has Batch No,Posada numer partii (batch)
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Roczne rozliczeniowy: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Roczne rozliczeniowy: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Podatek od towarów i usług (GST India)
 DocType: Delivery Note,Excise Page Number,Akcyza numeru strony
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory",Spółka Od Data i do tej pory jest obowiązkowe
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Uzyskać od konsultacji
 DocType: Asset,Purchase Date,Data zakupu
 DocType: Employee,Personal Details,Dane Osobowe
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Proszę ustawić &quot;aktywa Amortyzacja Cost Center&quot; w towarzystwie {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Proszę ustawić &quot;aktywa Amortyzacja Cost Center&quot; w towarzystwie {0}
 ,Maintenance Schedules,Plany Konserwacji
 DocType: Task,Actual End Date (via Time Sheet),Faktyczna data zakończenia (przez czas arkuszu)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Kwota {0} {1} przeciwko {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Kwota {0} {1} przeciwko {2} {3}
 ,Quotation Trends,Trendy Wyceny
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Pozycja Grupa nie wymienione w pozycji do pozycji mistrza {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Debetowane Konto musi być kontem typu Należności
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Debetowane Konto musi być kontem typu Należności
 DocType: Shipping Rule Condition,Shipping Amount,Ilość dostawy
 DocType: Supplier Scorecard Period,Period Score,Wynik okresu
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Dodaj klientów
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Dodaj klientów
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Kwota Oczekiwana
 DocType: Lab Test Template,Special,Specjalny
 DocType: Purchase Invoice Item,Conversion Factor,Współczynnik konwersji
@@ -2189,13 +2228,14 @@
 ,Vehicle Expenses,Wydatki Samochodowe
 DocType: Serial No,Invoice Details,Dane do faktury
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Oczekiwana wartość po okresie użytkowania musi być większe niż lub równe {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Zaczynaj na
+DocType: Hub Category,Hub Category,Kategoria koncentratora
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Numer pojazdu
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,
 DocType: Employee Loan,Loan Amount,Kwota kredytu
 DocType: Program Enrollment,Self-Driving Vehicle,Samochód osobowy
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Dostawca Scorecard Standing
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Wiersz {0}: Bill of Materials nie znaleziono Item {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Wiersz {0}: Bill of Materials nie znaleziono Item {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Liczba przyznanych zwolnień od pracy {0} nie może być mniejsza niż już zatwierdzonych zwolnień{1} w okresie
 DocType: Journal Entry,Accounts Receivable,Należności
 ,Supplier-Wise Sales Analytics,
@@ -2206,7 +2246,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Kurs dla rodziców (pozostaw puste, jeśli nie jest to część kursu)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Zostaw puste jeśli jest to rozważane dla wszystkich typów pracowników
 DocType: Landed Cost Voucher,Distribute Charges Based On,Rozpowszechnianie opłat na podstawie
-apps/erpnext/erpnext/hooks.py +131,Timesheets,ewidencja czasu pracy
+apps/erpnext/erpnext/hooks.py +140,Timesheets,ewidencja czasu pracy
 DocType: HR Settings,HR Settings,Ustawienia HR
 DocType: Salary Slip,net pay info,Informacje o wynagrodzeniu netto
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Ta wartość jest aktualizowana w Domyślnym Cenniku Sprzedaży.
@@ -2214,10 +2254,10 @@
 DocType: Email Digest,New Expenses,Nowe wydatki
 DocType: Purchase Invoice,Additional Discount Amount,Kwota dodatkowego rabatu
 DocType: Consultation,Patient Details,Szczegóły pacjenta
-DocType: Patient,B Positive,B dodatnia
+DocType: Patient,B Positive,B dodatni
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Wiersz # {0}: Ilość musi być jeden, a element jest trwałego. Proszę używać osobny wiersz dla stwardnienia st."
 DocType: Leave Block List Allow,Leave Block List Allow,Możesz opuścić Blok Zablokowanych List
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Skrót nie może być pusty lub być spacją
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Skrót nie może być pusty lub być spacją
 DocType: Patient Medical Record,Patient Medical Record,Medyczny dokument medyczny pacjenta
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Grupa do Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sporty
@@ -2233,9 +2273,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Nie można znaleźć kursu wymiany dla {0} do {1} dla daty klucza {2}. Proszę utworzyć ręcznie rekord wymiany walut
 DocType: POS Profile,Price List,Cennik
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} jest teraz domyślnym rokiem finansowym. Odśwież swoją przeglądarkę aby zmiana weszła w życie
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Roszczenia wydatków
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Roszczenia wydatków
 DocType: Issue,Support,Wsparcie
 ,BOM Search,BOM Szukaj
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Opublikuj &quot;W magazynie&quot; lub &quot;Nie w magazynie&quot; w Hub na podstawie zapasów dostępnych w tym magazynie.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Zamknięcie (otwarcie + suma)
 DocType: Vehicle,Fuel Type,Typ paliwa
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Proszę określić walutę w Spółce
@@ -2247,16 +2288,16 @@
 DocType: Healthcare Settings,Remind Before,Przypomnij wcześniej
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Współczynnik konwersji jednostki miary jest wymagany w rzędzie {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Wiersz # {0}: Reference Document Type musi być jednym zlecenia sprzedaży, sprzedaży lub faktury Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Wiersz # {0}: Reference Document Type musi być jednym zlecenia sprzedaży, sprzedaży lub faktury Journal Entry"
 DocType: Salary Component,Deduction,Odliczenie
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Wiersz {0}: od czasu do czasu i jest obowiązkowe.
 DocType: Stock Reconciliation Item,Amount Difference,kwota różnicy
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Pozycja Cena dodany do {0} w Cenniku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Pozycja Cena dodany do {0} w Cenniku {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Proszę podać ID pracownika tej osoby ze sprzedaży
 DocType: Territory,Classification of Customers by region,Klasyfikacja Klientów od regionu
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Różnica Kwota musi wynosić zero
 DocType: Project,Gross Margin,Marża brutto
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Wprowadź jako pierwszą Produkowaną Rzecz
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Wprowadź jako pierwszą Produkowaną Rzecz
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Obliczony bilans wyciągu bankowego
 DocType: Normal Test Template,Normal Test Template,Normalny szablon testu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Wyłączony użytkownik
@@ -2266,21 +2307,22 @@
 DocType: Salary Slip,Total Deduction,Całkowita kwota odliczenia
 ,Production Analytics,Analizy produkcyjne
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,"Opiera się to na transakcjach przeciwko temu pacjentowi. Zobacz poniżej linię czasu, aby uzyskać szczegółowe informacje"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Koszt Zaktualizowano
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Koszt Zaktualizowano
 DocType: Employee,Date of Birth,Data urodzenia
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Element {0} został zwrócony
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Rok finansowy** reprezentuje rok finansowy. Wszystkie zapisy księgowe oraz inne znaczące transakcje są śledzone przed ** roku podatkowego **.
 DocType: Opportunity,Customer / Lead Address,Adres Klienta / Tropu
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Dostawca Scorecard Setup
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Ostrzeżenie: Nieprawidłowy certyfikat SSL w załączniku {0}
-DocType: Student Admission,Eligibility,Wybieralność
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Nazwa planu oceny
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Ostrzeżenie: Nieprawidłowy certyfikat SSL w załączniku {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Przewody pomóc biznesu, dodać wszystkie kontakty i więcej jak swoich klientów"
 DocType: Production Order Operation,Actual Operation Time,Rzeczywisty Czas pracy
 DocType: Authorization Rule,Applicable To (User),Stosowne dla (Użytkownik)
 DocType: Purchase Taxes and Charges,Deduct,Odlicz
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Opis stanowiska Pracy
 DocType: Student Applicant,Applied,Stosowany
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Otwórz ponownie
 DocType: Sales Invoice Item,Qty as per Stock UOM,Ilość wg. Jednostki Miary
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Nazwa Guardian2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Znaki specjalne z wyjątkiem ""-"", ""."", ""#"", i ""/"" nie jest dozwolona w serii nazywania"
@@ -2292,7 +2334,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Kierownik Produkcji
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Nr seryjny {0} w ramach gwarancji do {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Przypisz dokumenty dostawy do paczek.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Przesyłki
+apps/erpnext/erpnext/hooks.py +107,Shipments,Przesyłki
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Łączna kwota przyznanego wsparcia (Spółka waluty)
 DocType: Purchase Order Item,To be delivered to customer,Być dostarczone do klienta
 DocType: BOM,Scrap Material Cost,Złom Materiał Koszt
@@ -2315,8 +2357,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Ustawienia wariantu pozycji
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Wybierz firmą ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Zostaw puste jeśli jest to rozważane dla wszystkich departamentów
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Rodzaje zatrudnienia (umowa o pracę, zlecenie, praktyka zawodowa itd.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} jest obowiązkowe dla elementu {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Rodzaje zatrudnienia (umowa o pracę, zlecenie, praktyka zawodowa itd.)"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} jest obowiązkowe dla elementu {1}
 DocType: Process Payroll,Fortnightly,Dwutygodniowy
 DocType: Currency Exchange,From Currency,Od Waluty
 DocType: Vital Signs,Weight (In Kilogram),Waga (w kilogramach)
@@ -2341,7 +2383,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Kliknij na ""Generuj Harmonogram"" aby otrzymać harmonogram"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Wystąpiły błędy podczas usuwania następujących harmonogramów:
 DocType: Bin,Ordered Quantity,Zamówiona Ilość
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","np. ""Buduj narzędzia dla budowniczych"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","np. ""Buduj narzędzia dla budowniczych"""
 DocType: Grading Scale,Grading Scale Intervals,Odstępy Skala ocen
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Wejście księgowe dla {2} mogą być dokonywane wyłącznie w walucie: {3}
 DocType: Production Order,In Process,W trakcie
@@ -2365,11 +2407,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Z zapłatą podatku
 DocType: Expense Claim Detail,Expense Claim Detail,Szczegóły o zwrotach kosztów
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLIKAT DLA DOSTAWCY
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Proszę wybrać prawidłową konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Proszę wybrać prawidłową konto
 DocType: Item,Weight UOM,Waga jednostkowa
 DocType: Salary Structure Employee,Salary Structure Employee,Struktura Wynagrodzenie pracownicze
 DocType: Patient,Blood Group,Grupa Krwi
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,W toku
 DocType: Course,Course Name,Nazwa przedmiotu
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Użytkownicy którzy mogą zatwierdzić wnioski o urlop konkretnych użytkowników
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Urządzenie Biura
@@ -2388,7 +2429,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Ceny nie będą wyświetlane, jeśli Cennik nie jest ustawiony"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Proszę podać kraj, w tym wysyłka Reguły lub sprawdź wysyłka na cały świat"
 DocType: Stock Entry,Total Incoming Value,Całkowita wartość przychodów
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Debetowane Konto jest wymagane
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Debetowane Konto jest wymagane
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Ewidencja czasu pomaga śledzić czasu, kosztów i rozliczeń dla aktywnosci przeprowadzonych przez zespół"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Cennik zakupowy
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Szablony dostawców zmiennych.
@@ -2398,7 +2439,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Uzgodnienie płatności
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Wybierz nazwisko Osoby Zarządzającej
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technologia
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Razem Niepłatny: {0}
+DocType: Hub Settings,Unregister from Hub,Wyrejestruj się z Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Razem Niepłatny: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Operacja WWW
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Oferta List
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Utwórz Zamówienia Materiałowe (MRP) i Zamówienia Produkcji.
@@ -2410,7 +2452,9 @@
 DocType: Physician Schedule Time Slot,To Time,Do czasu
 DocType: Authorization Rule,Approving Role (above authorized value),Zatwierdzanie rolę (powyżej dopuszczonego wartości)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Kredytowane Konto powinno być kontem typu Zobowiązania
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Wybierz Wstęp studenta, który jest obowiązkowy dla płatnego studenta"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,"Wybierz cennik, aby opublikować wycenę"
 DocType: Production Order Operation,Completed Qty,Ukończona wartość
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Dla {0}, tylko rachunki płatnicze mogą być połączone z innym wejściem kredytową"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Cennik {0} jest wyłączony
@@ -2423,39 +2467,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numery seryjne wymagane dla pozycji {1}. Podałeś {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktualny Wycena Cena
 DocType: Item,Customer Item Codes,Kody Pozycja klienta
+DocType: Training Event,Advance,Postęp
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,do powtórnego powtarzania.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Wymiana Zysk / Strata
 DocType: Opportunity,Lost Reason,Powód straty
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nowy adres
 DocType: Quality Inspection,Sample Size,Wielkość próby
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Proszę podać Otrzymanie dokumentu
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Wszystkie pozycje zostały już zafakturowane
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Kolejne centra kosztów mogą być wykonane w ramach grup, ale wpisy mogą być wykonane przed spoza grup"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Użytkownicy i uprawnienia
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Zlecenia produkcyjne Utworzono: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Zlecenia produkcyjne Utworzono: {0}
 DocType: Branch,Branch,Odddział
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Drukowanie i firmowanie
 DocType: Company,Total Monthly Sales,Łączna miesięczna sprzedaż
 DocType: Bin,Actual Quantity,Rzeczywista Ilość
 DocType: Shipping Rule,example: Next Day Shipping,przykład: Wysyłka następnego dnia
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Nr seryjny {0} nie znaleziono
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Subskrypcja została {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Subskrypcja została {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Program planu opłat
 DocType: Fee Schedule Program,Student Batch,Batch Student
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,"wybierz * z `tabVital Signs`, gdzie pacjent = &#39;{0}&#39; porządkiem sign_date desc limit 1"
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Dokonaj Studenta
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Min Grade
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Zostałeś zaproszony do współpracy przy projekcie: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Lekarz nie jest dostępny w {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Zostałeś zaproszony do współpracy przy projekcie: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Lekarz nie jest dostępny w {0}
 DocType: Leave Block List Date,Block Date,Zablokowana Data
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Dodaj identyfikator subskrypcji pola niestandardowego w dokumencie {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Dostawa dostawcy Uwaga
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Aplikuj teraz
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Aplikuj teraz
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Rzeczywista ilość {0} / liczba oczekujących {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Rzeczywista ilość {0} / liczba oczekujących {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-commerce GSTIN
 DocType: Sales Order,Not Delivered,Nie dostarczony
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Data oczekiwana nie może być wcześniejsza niż data transakcji
 ,Bank Clearance Summary,Rozliczenia bankowe
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",
 DocType: Appraisal Goal,Appraisal Goal,Cel oceny
@@ -2463,12 +2508,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Budynki
 DocType: Fee Schedule,Fee Structure,Struktura opłat
 DocType: Timesheet Detail,Costing Amount,Kwota zestawienia kosztów
-DocType: Student Admission,Application Fee,Opłata za zgłoszenie
+DocType: Student Admission Program,Application Fee,Opłata za zgłoszenie
 DocType: Process Payroll,Submit Salary Slip,Zatwierdź potrącenie z pensji
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maksymalny rabat dla produktu {0} to {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Maksymalny rabat dla produktu {0} to {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Masowego importu
 DocType: Sales Partner,Address & Contacts,Adresy i kontakty
 DocType: SMS Log,Sender Name,Nazwa Nadawcy
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Sortuj według kryteriów
 DocType: POS Profile,[Select],[Wybierz]
 DocType: Vital Signs,Blood Pressure (diastolic),Ciśnienie krwi (rozkurczowe)
 DocType: SMS Log,Sent To,Wysłane Do
@@ -2477,7 +2523,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Następnie Kontakt Data nie może być w przeszłości
 DocType: Company,For Reference Only.,Wyłącznie w celach informacyjnych.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Lekarz {0} niedostępny w {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Wybierz numer partii
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Wybierz numer partii
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Nieprawidłowy {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET
 DocType: Fee Validity,Reference Inv,Referencja Inv
@@ -2493,15 +2539,15 @@
 DocType: Normal Test Items,Require Result Value,Wymagaj wartości
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Numer sprawy nie może wynosić 0
 DocType: Item,Show a slideshow at the top of the page,Pokazuj slideshow na górze strony
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,LM
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Sklepy
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,LM
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Sklepy
 DocType: Project Type,Projects Manager,Kierownik Projektów
 DocType: Serial No,Delivery Time,Czas dostawy
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Powtarzono odwołanie
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Powtarzono odwołanie
 DocType: Item,End of Life,Zakończenie okresu eksploatacji
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Podróż
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Brak aktywnego czy ustawiona Wynagrodzenie Struktura znalezionych dla pracownika {0} dla podanych dat
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Podróż
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Brak aktywnego czy ustawiona Wynagrodzenie Struktura znalezionych dla pracownika {0} dla podanych dat
 DocType: Leave Block List,Allow Users,Zezwól Użytkownikom
 DocType: Purchase Order,Customer Mobile No,Komórka klienta Nie
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Powtarzający się
@@ -2510,12 +2556,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Zaktualizuj Koszt
 DocType: Item Reorder,Item Reorder,Element Zamów ponownie
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Slip Pokaż Wynagrodzenie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Transfer materiału
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Transfer materiału
 DocType: Fees,Send Payment Request,Wyślij żądanie płatności
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Niniejszy dokument ma na granicy przez {0} {1} dla pozycji {4}. Robisz kolejny {3} przeciwko samo {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Proszę ustawić cykliczne po zapisaniu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Wybierz opcję Zmień konto kwotę
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Wybierz opcję Zmień konto kwotę
 DocType: Purchase Invoice,Price List Currency,Waluta cennika
 DocType: Naming Series,User must always select,Użytkownik musi zawsze zaznaczyć
 DocType: Stock Settings,Allow Negative Stock,Dozwolony ujemny stan
@@ -2535,7 +2581,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Pracownik
 DocType: Sample Collection,Collected Time,Zbierz czas
 DocType: Company,Sales Monthly History,Historia miesięczna sprzedaży
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Wybierz opcję Batch
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Wybierz opcję Batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} jest w pełni rozliczone
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Oznaki życia
 DocType: Training Event,End Time,Czas zakończenia
@@ -2543,16 +2589,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Odliczenia płatności lub strata
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardowe warunki umowy sprzedaży lub kupna.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Grupuj według Podstawy księgowania
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Czy na pewno chcesz anulować to spotkanie?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Pipeline sprzedaży
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Proszę ustawić domyślne konto wynagrodzenia komponentu {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Wymagane na
 DocType: Rename Tool,File to Rename,Plik to zmiany nazwy
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Proszę wybrać LM dla pozycji w wierszu {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Proszę wybrać LM dla pozycji w wierszu {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Konto {0} nie jest zgodne z firmą {1} w trybie konta: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Określone BOM {0} nie istnieje dla pozycji {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plan Konserwacji {0} musi być anulowany przed usunięciem tego zamówienia
+DocType: POS Profile,Applicable for Users,Dotyczy użytkowników
 DocType: Notification Control,Expense Claim Approved,Zwrot Kosztów zatwierdzony
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Wynagrodzenie Slip pracownika {0} już stworzony dla tego okresu
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Wynagrodzenie Slip pracownika {0} już stworzony dla tego okresu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Farmaceutyczny
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Koszt zakupionych towarów
 DocType: Selling Settings,Sales Order Required,Wymagane Zamówienie Sprzedaży
@@ -2577,6 +2625,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Organizacja
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Organizacja
 DocType: BOM Update Tool,BOM Update Tool,Narzędzie aktualizacji BOM
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Konto partyjne nie zostało określone, ustaw domyślne konto party w firmie"
 DocType: SG Creation Tool Course,Student Group Name,Nazwa grupy studentów
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Tworzenie opłat
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Upewnij się, że na pewno chcesz usunąć wszystkie transakcje dla tej firmy. Twoje dane podstawowe pozostanie tak jak jest. Ta akcja nie można cofnąć."
@@ -2585,29 +2634,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) nie może być większa niż zaplanowana ilość ({2}) w Zleceniu Produkcyjnym {3}
 DocType: Shipping Rule,Shipping Rule Label,Etykieta z zasadami wysyłki i transportu
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum użytkowników
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Surowce nie może być puste.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Nie można zaktualizować stanu - faktura zawiera pozycję, której proces wysyłki scedowano na dostawcę."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Surowce nie może być puste.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Nie można zaktualizować stanu - faktura zawiera pozycję, której proces wysyłki scedowano na dostawcę."
 DocType: Lab Test Sample,Lab Test Sample,Próbka do badań laboratoryjnych
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Szybkie Księgowanie
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Nie możesz zmienić danych jeśli BOM jest przeciw jakiejkolwiek rzeczy
+DocType: Restaurant,Invoice Series Prefix,Prefiks serii faktur
 DocType: Employee,Previous Work Experience,Poprzednie doświadczenie zawodowe
 DocType: Stock Entry,For Quantity,Dla Ilości
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Proszę podać Planowane Ilości dla pozycji {0} w wierszu {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Proszę podać Planowane Ilości dla pozycji {0} w wierszu {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} nie zostało dodane
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Zamówienia produktów.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,"Oddzielne zamówienie produkcji będzie tworzone dla każdej ukończonej, dobrej rzeczy"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} musi być ujemna w dokumencie zwrotnym
 ,Minutes to First Response for Issues,Minutes to pierwsza odpowiedź do Spraw
 DocType: Purchase Invoice,Terms and Conditions1,Warunki1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,"Nazwa instytutu, dla którego jest utworzenie tego systemu."
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,"Nazwa instytutu, dla którego jest utworzenie tego systemu."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Zapisywanie kont zostało zamrożone do tej daty, nikt  nie może tworzyć / modyfikować zapisów poza uprawnionymi użytkownikami wymienionymi poniżej."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Zapisz dokument przed wygenerowaniem harmonogram konserwacji
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Aktualna cena została zaktualizowana we wszystkich biuletynach
 DocType: Fee Schedule,Successful,Udany
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status projektu
 DocType: UOM,Check this to disallow fractions. (for Nos),Zaznacz to by zakazać ułamków (dla liczby jednostek)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Poniższe Zlecenia produkcyjne powstały:
-DocType: Student Admission,Naming Series (for Student Applicant),Naming Series (dla Studenta Wnioskodawcy)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Poniższe Zlecenia produkcyjne powstały:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Naming Series (dla Studenta Wnioskodawcy)
 DocType: Delivery Note,Transporter Name,Nazwa przewoźnika
 DocType: Authorization Rule,Authorized Value,Autoryzowany Wartość
 DocType: BOM,Show Operations,Pokaż Operations
@@ -2631,7 +2681,7 @@
 ,Employees working on a holiday,Pracownicy zatrudnieni na wakacje
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Present
 DocType: Project,% Complete Method,Kompletna Metoda%
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Narkotyk
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Narkotyk
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Początek daty konserwacji nie może być wcześniejszy od daty numeru seryjnego {0}
 DocType: Production Order,Actual End Date,Rzeczywista Data Zakończenia
 DocType: BOM,Operating Cost (Company Currency),Koszty operacyjne (Spółka waluty)
@@ -2649,13 +2699,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,"Zatwierdzający Użytkownik nie może być taki sam, jak użytkownik którego zatwierdza"
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Stawki podstawowej (zgodnie Stock UOM)
 DocType: SMS Log,No of Requested SMS,Numer wymaganego SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Urlopu bezpłatnego nie jest zgodny z zatwierdzonymi zapisów Leave aplikacji
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Urlopu bezpłatnego nie jest zgodny z zatwierdzonymi zapisów Leave aplikacji
 DocType: Campaign,Campaign-.####,Kampania-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Następne kroki
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Proszę dostarczyć określone przedmioty w najlepszych możliwych cenach
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Stwórz Fakturę
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto blisko Szansa po 15 dniach
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Zlecenia zakupu nie są dozwolone w {0} z powodu karty wyników {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Zlecenia zakupu nie są dozwolone w {0} z powodu karty wyników {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,koniec roku
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Kwota / kwota procentowa
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Kwota / kwota procentowa
@@ -2663,6 +2713,7 @@
 DocType: Vital Signs,Nutrition Values,Wartości odżywcze
 DocType: Lab Test Template,Is billable,Jest rozliczalny
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}","Zarówno &quot;Harmonogram lekarski&quot;, jak i czas przypominania &quot;muszą być ustawione dla Dr {0}"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Dystrybutor strona trzecia / handlowiec / prowizji agenta / partner / sprzedawcę, który sprzedaje produkty firm z tytułu prowizji."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} przed Zamówieniem Zakupu  {1}
 DocType: Patient,Patient Demographics,Dane demograficzne pacjenta
@@ -2712,19 +2763,18 @@
  10. Dodać lub odjąć: Czy chcesz dodać lub odjąć podatek."
 DocType: Homepage,Homepage,Strona główna
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Wybierz lekarza ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',zaktualizuj tabConsultation set invoice = &#39;{0}&#39; gdzie name = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Zapisana Ilość
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Utworzono Records Fee - {0}
 DocType: Asset Category Account,Asset Category Account,Konto Aktywów Kategoria
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +117,Cannot produce more Item {0} than Sales Order quantity {1},Nie można wyprodukować więcej przedmiotów {0} niż wartość {1} na Zamówieniu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Zdjęcie Wejście {0} nie jest składany
-DocType: Payment Reconciliation,Bank / Cash Account,Konto Bank / Gotówka
+DocType: Payment Reconciliation,Bank / Cash Account,Rachunek Bankowy/Kasowy
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Następnie Kontakt By nie może być taki sam jak adres e-mail Wiodącego
 DocType: Tax Rule,Billing City,Rozliczenia Miasto
 DocType: Asset,Manual,podręcznik
 DocType: Salary Component Account,Salary Component Account,Konto Wynagrodzenie Komponent
 DocType: Global Defaults,Hide Currency Symbol,Ukryj symbol walutowy
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","np. Bank, Gotówka, Karta kredytowa"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","np. Bank, Gotówka, Karta kredytowa"
 DocType: Lead Source,Source Name,Źródło Nazwa
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Normalne spoczynkowe ciśnienie krwi u dorosłych wynosi około 120 mmHg skurczowe, a rozkurczowe 80 mmHg, skrócone &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,
@@ -2743,16 +2793,16 @@
 DocType: Patient,Occupation,Zawód
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Wiersz {0}: Data Początku musi być przed Datą Końca
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Razem (szt)
-DocType: Sales Invoice,This Document,Ten dokument
 DocType: Installation Note Item,Installed Qty,Liczba instalacji
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Może to być spowodowane nieprawidłowymi adresami e-mail w folderze
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Ty dodałeś
 DocType: Purchase Taxes and Charges,Parenttype,Typ Nadrzędności
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Wynik treningowe
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Wynik treningowe
 DocType: Purchase Invoice,Is Paid,Zapłacone
 DocType: Salary Structure,Total Earning,Całkowita kwota zarobku
 DocType: Purchase Receipt,Time at which materials were received,Czas doręczenia materiałów
 DocType: Stock Ledger Entry,Outgoing Rate,Wychodzące Cena
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Szef oddziału Organizacji
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Szef oddziału Organizacji
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,lub
 DocType: Sales Order,Billing Status,Status Faktury
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Zgłoś problem
@@ -2767,8 +2817,9 @@
 DocType: Notification Control,Sales Order Message,Informacje Zlecenia Sprzedaży
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Ustaw wartości domyślne jak firma, waluta, bieżący rok rozliczeniowy, itd."
 DocType: Payment Entry,Payment Type,Typ płatności
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Wybierz partię dla elementu {0}. Nie można znaleźć pojedynczej partii, która spełnia ten wymóg"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Wybierz partię dla elementu {0}. Nie można znaleźć pojedynczej partii, która spełnia ten wymóg"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Wybierz partię dla elementu {0}. Nie można znaleźć pojedynczej partii, która spełnia ten wymóg"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Wybierz partię dla elementu {0}. Nie można znaleźć pojedynczej partii, która spełnia ten wymóg"
+DocType: Hub Category,Parent Category,Kategoria nadrzędna
 DocType: Process Payroll,Select Employees,Wybierz Pracownicy
 DocType: Opportunity,Potential Sales Deal,Szczegóły potencjalnych sprzedaży
 DocType: Complaint,Complaints,Uskarżanie się
@@ -2806,7 +2857,7 @@
 DocType: Bin,Reserved Quantity,Zarezerwowana ilość
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Proszę wprowadzić poprawny adres email
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Proszę wprowadzić poprawny adres email
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Wybierz element w koszyku
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Wybierz element w koszyku
 DocType: Landed Cost Voucher,Purchase Receipt Items,Przedmioty Potwierdzenia Zakupu
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Dostosowywanie formularzy
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,Zaległość
@@ -2816,15 +2867,15 @@
 DocType: Payment Request,Amount in customer's currency,Kwota w walucie klienta
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Dostarczanie
 DocType: Stock Reconciliation Item,Current Qty,Obecna ilość
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Dodaj dostawców
+DocType: Restaurant Menu,Restaurant Menu,Menu restauracji
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Poprzedni
 DocType: Appraisal Goal,Key Responsibility Area,Kluczowy obszar obowiązków
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Partie studenckich pomóc śledzenie obecności, oceny i opłat dla studentów"
 DocType: Payment Entry,Total Allocated Amount,Łączna kwota przyznanego wsparcia
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Ustaw domyślne konto zapasów dla zasobów reklamowych wieczystych
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Ustaw domyślne konto zapasów dla zasobów reklamowych wieczystych
 DocType: Item Reorder,Material Request Type,Typ zamówienia produktu
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural Journal Entry na wynagrodzenia z {0} {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage jest pełna, nie oszczędzać"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage jest pełna, nie oszczędzać"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Wiersz {0}: JM Współczynnik konwersji jest obowiązkowe
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Pojemność pokoju
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref
@@ -2851,7 +2902,7 @@
 DocType: Company,Stock Settings,Ustawienia magazynu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +199,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Połączenie jest możliwe tylko wtedy, gdy następujące właściwości są takie same w obu płyt. Czy Grupa Root Typ, Firma"
 DocType: Vehicle,Electric,Elektryczny
-DocType: Task,% Progress,% postępu
+DocType: Task,% Progress,% postęp
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Zysk / Strata na Aktywów pozbywaniu
 DocType: Task,Depends on Tasks,Zależy Zadania
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Zarządzaj drzewem grupy klientów
@@ -2863,16 +2914,18 @@
 DocType: Project,Task Completion,zadanie Zakończenie
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Brak na stanie
 DocType: Appraisal,HR User,Kadry - użytkownik
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Podatki i opłaty potrącenia
-apps/erpnext/erpnext/hooks.py +129,Issues,Zagadnienia
+apps/erpnext/erpnext/hooks.py +138,Issues,Zagadnienia
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status musi być jednym z {0}
 DocType: Sales Invoice,Debit To,Debetowane Konto (Winien)
+DocType: Restaurant Menu Item,Restaurant Menu Item,Menu restauracji
 DocType: Delivery Note,Required only for sample item.,
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Rzeczywista Ilość Po Transakcji
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Nie znaleziono wynagrodzenie poślizg między {0} i {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Nie znaleziono wynagrodzenie poślizg między {0} i {1}
 ,Pending SO Items For Purchase Request,Oczekiwane elementy Zamówień Sprzedaży na Prośbę Zakupu
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Rekrutacja dla studentów
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} jest wyłączony
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Rekrutacja dla studentów
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} jest wyłączony
 DocType: Supplier,Billing Currency,Waluta Rozliczenia
 DocType: Sales Invoice,SINV-RET-,SINV-RET
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Bardzo Duży
@@ -2895,6 +2948,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,
 DocType: Stock Settings,Default Valuation Method,Domyślna metoda wyceny
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,Opłata
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Aktualizacja w toku. To może trochę potrwać.
 DocType: Vehicle Log,Fuel Qty,Ilość paliwa
 DocType: Production Order Operation,Planned Start Time,Planowany czas rozpoczęcia
 DocType: Course,Assessment,Oszacowanie
@@ -2910,7 +2964,7 @@
 DocType: Price List,Price List Master,Ustawienia Cennika
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Wszystkie transakcje sprzedaży mogą być oznaczone przed wieloma ** Osoby sprzedaży **, dzięki czemu można ustawić i monitorować cele."
 ,S.O. No.,
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Proszę utworzyć Klienta z {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Proszę utworzyć Klienta z {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Wybierz pacjenta
 DocType: Price List,Applicable for Countries,Zastosowanie dla krajów
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Nazwa parametru
@@ -2954,27 +3008,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Konto koszty / Różnica ({0}) musi być kontem ""rachunek zysków i strat"""
 DocType: Project,Copied From,Skopiowano z
 DocType: Project,Copied From,Skopiowano z
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Błąd Nazwa: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Niedobór
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Błąd Nazwa: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,Niedobór
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} nie jest skojarzony z {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Frekwencja pracownika {0} jest już zaznaczona
 DocType: Packing Slip,If more than one package of the same type (for print),Jeśli więcej niż jedna paczka tego samego typu (do druku)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Ustaw domyślnego klienta w Ustawieniach restauracji
 ,Salary Register,wynagrodzenie Rejestracja
 DocType: Warehouse,Parent Warehouse,Dominująca Magazyn
 DocType: C-Form Invoice Detail,Net Total,Łączna wartość netto
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Domyślnie nie znaleziono elementu BOM dla elementu {0} i projektu {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Domyślnie nie znaleziono elementu BOM dla elementu {0} i projektu {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Definiować różne rodzaje kredytów
 DocType: Bin,FCFS Rate,Pierwsza rata
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Zaległa Ilość
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Czas (w minutach)
 DocType: Project Task,Working,Pracuje
 DocType: Stock Ledger Entry,Stock Queue (FIFO),
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Rok budżetowy
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Rok budżetowy
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} nie należy do firmy {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,"Nie można rozwiązać funkcji punktacji kryterium dla {0}. Upewnij się, że formuła jest prawidłowa."
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Kosztować od
 DocType: Healthcare Settings,Out Patient Settings,Out Ustawienia pacjenta
 DocType: Account,Round Off,Zaokrąglenia
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Ilość musi być dodatnia
 ,Requested Qty,
 DocType: Tax Rule,Use for Shopping Cart,Służy do koszyka
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Wartość {0} atrybutu {1} nie istnieje w liście ważnej pozycji wartości atrybutów dla pozycji {2}
@@ -2983,7 +3039,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Koszty zostaną rozdzielone proporcjonalnie na podstawie Ilość pozycji lub kwoty, jak na swój wybór"
 DocType: Maintenance Visit,Purposes,Cele
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Conajmniej jedna pozycja powinna być wpisana w ilości negatywnej w dokumencie powrotnej
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Dodaj kursy
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacja {0} dłużej niż wszelkie dostępne w godzinach pracy stacji roboczej {1}, rozbić na kilka operacji operacji"
 ,Requested,Zamówiony
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Brak Uwag
@@ -2995,6 +3050,8 @@
 DocType: Employee Loan,Repaid/Closed,Spłacone / Zamknięte
 DocType: Item,Total Projected Qty,Łącznej prognozowanej szt
 DocType: Monthly Distribution,Distribution Name,Nazwa Dystrybucji
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dostawca&gt; Dostawca Typ
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Nie ustalono stawki za element {0}, który jest wymagany do wpisów księgowych dla {1} {2}. Jeśli transakcja jest transakcją jako element zerowej stawki wyceny w {1}, wspomnij, że w tabeli {1} pozycji. W przeciwnym razie należy utworzyć transakcję przychodzącą na akcje dla elementu lub wymienić wskaźnik wyceny w rekordzie Element, a następnie spróbować poddać lub anulować ten wpis"
 DocType: Course,Course Code,Kod kursu
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Kontrola jakości wymagana dla przedmiotu {0}
 DocType: POS Settings,Use POS in Offline Mode,Użyj POS w trybie offline
@@ -3005,14 +3062,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Zarządzaj drzewem terytorium
 DocType: Journal Entry Account,Sales Invoice,Faktura sprzedaży
 DocType: Journal Entry Account,Party Balance,Bilans Grupy
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,Proszę wybrać Zastosuj RABAT
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Proszę wybrać Zastosuj RABAT
 DocType: Company,Default Receivable Account,Domyślnie konto Rozrachunki z odbiorcami
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Utwórz zapis bankowy dla sumy wynagrodzenia dla wybranych wyżej kryteriów
 DocType: Physician,Physician Schedule,Harmonogram lekarza
 DocType: Purchase Invoice,Deemed Export,Uważa się na eksport
 DocType: Stock Entry,Material Transfer for Manufacture,Materiał transferu dla Produkcja
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Rabat procentowy może być stosowany zarówno przed cenniku dla wszystkich Cenniku.
-DocType: Purchase Invoice,Half-yearly,Półroczny
+DocType: Subscription,Half-yearly,Półroczny
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Zapis księgowy dla zapasów
 DocType: Lab Test,LabTest Approver,Przybliżenie LabTest
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Oceniałeś już kryteria oceny {}.
@@ -3041,13 +3098,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Extra Small
 DocType: Company,Standard Template,Szablon Standardowy
 DocType: Training Event,Theory,Teoria
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Ostrzeżenie: Ilość Zapotrzebowanego Materiału jest mniejsza niż minimalna ilość na zamówieniu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Ostrzeżenie: Ilość Zapotrzebowanego Materiału jest mniejsza niż minimalna ilość na zamówieniu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Konto {0} jest zamrożone
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Osobowość prawna / Filia w oddzielny planu kont należących do Organizacji.
 DocType: Payment Request,Mute Email,Wyciszenie email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Żywność, Trunki i Tytoń"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Mogą jedynie wpłaty przed Unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Wartość prowizji nie może być większa niż 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Mogą jedynie wpłaty przed Unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Wartość prowizji nie może być większa niż 100
 DocType: Stock Entry,Subcontract,Zlecenie
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Podaj {0} pierwszy
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Brak odpowiedzi ze strony
@@ -3065,10 +3122,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Kolor
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Kryteria oceny planu
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Zapobiegaj zamówieniom zakupu
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Podatny
 DocType: Patient Appointment,Scheduled,Zaplanowane
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Zapytanie ofertowe.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Proszę skonfigurować system nazwisk pracowników w zasobach ludzkich&gt; ustawienia HR
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Proszę wybrać produkt, gdzie &quot;Czy Pozycja Zdjęcie&quot; brzmi &quot;Nie&quot; i &quot;Czy Sales Item&quot; brzmi &quot;Tak&quot;, a nie ma innego Bundle wyrobów"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Wybierz klienta
 DocType: Student Log,Academic,Akademicki
 DocType: Patient,Personal and Social History,Historia osobista i społeczna
 DocType: Fee Schedule,Fee Breakup for each student,Podział wynagrodzenia dla każdego ucznia
@@ -3078,7 +3136,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Wskaźnik wyceny
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Nie wybrano Cennika w Walucie
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Nie wybrano Cennika w Walucie
 apps/erpnext/erpnext/config/healthcare.py +46,Results,wyniki
 ,Student Monthly Attendance Sheet,Student miesięczny Obecność Sheet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Pracownik {0} już się ubiegał o {1} między {2} a {3}
@@ -3094,7 +3152,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Zarządzaj Partnerami Sprzedaży.
 DocType: Quality Inspection,Inspection Type,Typ kontroli
 DocType: Fee Validity,Visited yet,Jeszcze odwiedziłem
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Magazyny z istniejącymi transakcji nie mogą być zamieniane na grupy.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Magazyny z istniejącymi transakcji nie mogą być zamieniane na grupy.
 DocType: Assessment Result Tool,Result HTML,wynik HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Upływa w dniu
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Dodaj uczniów
@@ -3121,7 +3179,7 @@
 DocType: Healthcare Settings,Result Printed,Wynik wydrukowany
 DocType: Asset Category Account,Depreciation Expense Account,Konto amortyzacji wydatków
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Okres próbny
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Wyświetl {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Wyświetl {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,
 DocType: Expense Claim,Expense Approver,Osoba zatwierdzająca wydatki
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Wiersz {0}: Advance wobec Klienta musi być kredytowej
@@ -3133,7 +3191,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Aby DateTime
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Rozkłady zajęć usunięte:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Logi do utrzymania sms stan przesyłki
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Ustaw docelową sprzedaż
 DocType: Accounts Settings,Make Payment via Journal Entry,Wykonywanie płatności za pośrednictwem Zapisów Księgowych dziennika
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,wydrukowane na
 DocType: Item,Inspection Required before Delivery,Wymagane Kontrola przed dostawą
@@ -3141,7 +3198,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Oczekujące Inne
 DocType: Patient Appointment,Reminded,Przypomnij
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Twoja organizacja
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Twoja organizacja
 DocType: Fee Component,Fees Category,Opłaty Kategoria
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
@@ -3153,7 +3210,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Poziom Uporządkowania
 DocType: Company,Chart Of Accounts Template,Szablon planu kont
 DocType: Attendance,Attendance Date,Data usługi
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Pozycja Cena aktualizowana {0} w Cenniku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Pozycja Cena aktualizowana {0} w Cenniku {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Średnie wynagrodzenie w oparciu o zarobki i odliczenia
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Konto grupujące inne konta nie może być konwertowane
 DocType: Purchase Invoice Item,Accepted Warehouse,Przyjęty magazyn
@@ -3169,9 +3226,10 @@
 ,Employee Birthday,Data urodzenia pracownika
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Batch Obecność narzędzia
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,Limit Crossed
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Zaplanowane Upto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Kapitał wysokiego ryzyka
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Semestr z tym &quot;Roku Akademickiego&quot; {0} i &#39;Nazwa Termin&#39; {1} już istnieje. Proszę zmodyfikować te dane i spróbuj jeszcze raz.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Ponieważ istnieje istniejące transakcje przeciwko elementu {0}, nie można zmienić wartość {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Ponieważ istnieje istniejące transakcje przeciwko elementu {0}, nie można zmienić wartość {1}"
 DocType: UOM,Must be Whole Number,Musi być liczbą całkowitą
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nowe Zwolnienie Przypisano (W Dniach)
 DocType: Purchase Invoice,Invoice Copy,Kopia faktury
@@ -3181,7 +3239,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Numer faktury
 DocType: Shopping Cart Settings,Orders,Zamówienia
 DocType: Employee Leave Approver,Leave Approver,Zatwierdzający Urlop
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Wybierz partię
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Wybierz partię
 DocType: Assessment Group,Assessment Group Name,Nazwa grupy Assessment
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materiał Przeniesiony do Produkcji
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Użytkownik z ""Koszty zatwierdzająca"" rolą"
@@ -3196,7 +3254,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Wpis Kończący Okres
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Wybierz dział ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Centrum Kosztów z istniejącą transakcją nie może być przekształcone w grupę
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Kwota {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Kwota {0} {1} {2} {3}
 DocType: Account,Depreciation,Amortyzacja
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dostawca(y)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Narzędzie Frekwencji
@@ -3208,10 +3266,12 @@
 DocType: GL Entry,Voucher No,Nr Podstawy księgowania
 ,Lead Owner Efficiency,Skuteczność właściciela wiodącego
 ,Lead Owner Efficiency,Skuteczność właściciela wiodącego
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Najbardziej popularny
 DocType: Leave Allocation,Leave Allocation,
 DocType: Payment Request,Recipient Message And Payment Details,Odbiorca wiadomości i szczegóły płatności
 DocType: Training Event,Trainer Email,Trener email
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,
+DocType: Restaurant Reservation,No of People,Liczba osób
 DocType: Production Planning Tool,Include sub-contracted raw materials,Obejmują surowce podwykonawstwa
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Szablon z warunkami lub umową.
 DocType: Purchase Invoice,Address and Contact,Adres i Kontakt
@@ -3220,10 +3280,11 @@
 DocType: Supplier,Last Day of the Next Month,Ostatni dzień następnego miesiąca
 DocType: Support Settings,Auto close Issue after 7 days,Auto blisko Issue po 7 dniach
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Urlopu nie może być przyznane przed {0}, a bilans urlopu zostało już przeniesionych przekazywane w przyszłości rekordu alokacji urlopu {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Uwaga: Ze względu / Data odniesienia przekracza dozwolony dzień kredytowej klienta przez {0} dni (s)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Uwaga: Ze względu / Data odniesienia przekracza dozwolony dzień kredytowej klienta przez {0} dni (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Wnioskodawca
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORYGINAŁ DO ODBIORU
 DocType: Asset Category Account,Accumulated Depreciation Account,Skumulowana konta Amortyzacja
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Ten e-mail jest autotrenerowany
 DocType: Stock Settings,Freeze Stock Entries,Zamroź Wpisy do Asortymentu
 DocType: Program Enrollment,Boarding Student,Student Wyżywienia
 DocType: Asset,Expected Value After Useful Life,Przewidywany okres użytkowania wartości po
@@ -3231,7 +3292,7 @@
 DocType: Activity Cost,Billing Rate,Kursy rozliczeniowe
 ,Qty to Deliver,Ilość do dostarczenia
 ,Stock Analytics,Analityka magazynu
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Operacje nie może być puste
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Operacje nie może być puste
 DocType: Maintenance Visit Purpose,Against Document Detail No,
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Rodzaj Partia jest obowiązkowe
 DocType: Quality Inspection,Outgoing,Wychodzący
@@ -3254,7 +3315,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Wybierz uczniów ręcznie dla grupy działań
 DocType: Journal Entry,User Remark,Nota Użytkownika
 DocType: Lead,Market Segment,Segment rynku
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Wpłaconej kwoty nie może być większa od całkowitej ujemnej kwoty należności {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Wpłaconej kwoty nie może być większa od całkowitej ujemnej kwoty należności {0}
 DocType: Supplier Scorecard Period,Variables,Zmienne
 DocType: Employee Internal Work History,Employee Internal Work History,Historia zatrudnienia pracownika w firmie
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Zamknięcie (Dr)
@@ -3284,21 +3345,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Informuj o aktualizacjach
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Rachunek {2} nie należy do firmy {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Zamówienie produktu {0} jest anulowane lub wstrzymane
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Zarządzanie urlopami
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Zarządzanie urlopami
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Grupuj według konta
 DocType: Sales Order,Fully Delivered,Całkowicie dostarczono
 DocType: Lead,Lower Income,Niższy przychód
+DocType: Restaurant Order Entry,Current Order,Aktualne zamówienie
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Źródło i magazyn docelowy nie mogą być takie sama dla wiersza {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Konto różnica musi być kontem typu aktywami / pasywami, ponieważ Zdjęcie Pojednanie jest Wejście otwarcia"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Wypłacona kwota nie może być wyższa niż Kwota kredytu {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Przejdź do Programów
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Numer Zamówienia Kupna wymagany do {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Produkcja Zamówienie nie stworzył
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Produkcja Zamówienie nie stworzył
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',Pole 'Od daty' musi następować później niż 'Do daty'
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Nie można zmienić status studenta {0} jest powiązany z aplikacją studentów {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Nie można zmienić status studenta {0} jest powiązany z aplikacją studentów {1}
 DocType: Asset,Fully Depreciated,pełni zamortyzowanych
 ,Stock Projected Qty,Przewidywana ilość zapasów
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Klient {0} nie należy do projektu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Klient {0} nie należy do projektu {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Zaznaczona Obecność HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Notowania są propozycje, oferty Wysłane do klientów"
 DocType: Sales Order,Customer's Purchase Order,Klienta Zamówienia
@@ -3309,8 +3371,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Proszę ustawić ilość amortyzacji zarezerwowano
 DocType: Supplier Scorecard Period,Calculations,Obliczenia
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Wartość albo Ilość
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Produkcje Zamówienia nie mogą być podnoszone przez:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Produkcje Zamówienia nie mogą być podnoszone przez:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Minuta
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ustaw Serię Nazewnictwa na {0} za pomocą Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Invoice,Purchase Taxes and Charges,Podatki i opłaty kupna
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Przejdź do Dostawców
 ,Qty to Receive,Ilość do otrzymania
@@ -3324,7 +3387,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Kredytowane konto powinno być kontem bilansowym
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Typy wszystkich dostawców
 DocType: Global Defaults,Disable In Words,Wyłącz w słowach
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Kod elementu jest obowiązkowy, ponieważ pozycja ta nie jest automatycznie numerowana"
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,"Kod elementu jest obowiązkowy, ponieważ pozycja ta nie jest automatycznie numerowana"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Wycena {0} nie jest typem {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Przedmiot Planu Konserwacji
 DocType: Sales Order,%  Delivered,% dostarczono
@@ -3346,23 +3409,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Bilans otwarcia Kapitału własnego
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Pojednanie
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Pozostały
 DocType: Appraisal,Appraisal,Ocena
 DocType: Purchase Invoice,GST Details,Szczegóły GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},E-mail wysłany do dostawcy {0}
+DocType: Item,Default Sales Unit of Measure,Domyślna jednostka sprzedaży środka
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data jest powtórzona
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Upoważniony sygnatariusz
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Zatwierdzający urlop musi być jednym z {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Utwórz opłaty
-DocType: Hub Settings,Seller Email,Sprzedawca email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Całkowity koszt zakupu (faktura zakupu za pośrednictwem)
 DocType: Training Event,Start Time,Czas rozpoczęcia
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Wybierz ilość
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Wybierz ilość
 DocType: Customs Tariff Number,Customs Tariff Number,Numer taryfy celnej
 DocType: Patient Appointment,Patient Appointment,Powtarzanie Pacjenta
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Rola Zatwierdzająca nie może być taka sama jak rola którą zatwierdza
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Wypisać się z tej Email Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Wypisać się z tej Email Digest
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Dostaj Dostawców przez
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},Nie znaleziono {0} dla elementu {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Przejdź do Kursów
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Wiadomość wysłana
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Konto z węzłów podrzędnych nie może być ustawiony jako księgi
@@ -3375,11 +3441,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Materiał Przeniesiony do Produkowania
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Konto {0} nie istnieje
 DocType: Project,Project Type,Typ projektu
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Dla tego zadania istnieje zadanie podrzędne. Nie możesz usunąć tego zadania.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Wymagana jest ilość lub kwota docelowa
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Koszt różnych działań
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Koniec z wynikami
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Koszt różnych działań
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Ustawianie zdarzenia do {0}, ponieważ urzędnik dołączone do sprzedaży poniżej osób nie posiada identyfikator użytkownika {1}"
 DocType: Timesheet,Billing Details,Szczegóły płatności
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Źródło i magazyn docelowy musi być inna
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Źródło i magazyn docelowy musi być inna
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Niedozwolona jest modyfikacja transakcji zapasów starszych niż {0}
 DocType: Purchase Invoice Item,PR Detail,
 DocType: Sales Order,Fully Billed,Całkowicie Rozliczone
@@ -3405,7 +3473,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Przelew
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Zaznacz wszystkie
 DocType: Vehicle Log,Invoice Ref,faktura Ref
-DocType: Purchase Order,Recurring Order,Powtarzające się Zamówienie
 DocType: Company,Default Income Account,Domyślne konto przychodów
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Grupa Klientów / Klient
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed fiskalna Lata Zysk / Strata (Credit)
@@ -3419,9 +3486,9 @@
 DocType: Patient,A Negative,Negatywny
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Nic więcej do pokazania.
 DocType: Lead,From Customer,Od klienta
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Połączenia
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Połączenia
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Produkt
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,Partie
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,Partie
 DocType: Project,Total Costing Amount (via Time Logs),Całkowita ilość Costing (przez Time Logs)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Opracuj harmonogram opłat
 DocType: Purchase Order Item Supplied,Stock UOM,Jednostka
@@ -3446,7 +3513,7 @@
 DocType: School Settings,Current Academic Term,Obecny termin akademicki
 DocType: School Settings,Current Academic Term,Obecny termin akademicki
 DocType: Sales Order,Not Billed,Nie zaksięgowany
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Obydwa Magazyny muszą należeć do tej samej firmy
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Obydwa Magazyny muszą należeć do tej samej firmy
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Nie dodano jeszcze żadnego kontaktu.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Kwota Kosztu Voucheru
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Rachunki od dostawców.
@@ -3455,7 +3522,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Wartość zniżki
 DocType: Purchase Invoice,Return Against Purchase Invoice,Powrót Against dowodu zakupu
 DocType: Item,Warranty Period (in days),Okres gwarancji (w dniach)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',update `tabPatient Appointment` set sales_invoice = &#39;{0}&#39; gdzie nazwa = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Relacja z Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Środki pieniężne netto z działalności operacyjnej
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Pozycja 4
@@ -3464,8 +3530,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Konto zapisu
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupa Student
 DocType: Shopping Cart Settings,Quotation Series,Serie Wyeceny
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",Istnieje element  o takiej nazwie. Zmień nazwę Grupy lub tego elementu.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Wybierz klienta
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item",Istnieje element  o takiej nazwie. Zmień nazwę Grupy lub tego elementu.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Wybierz klienta
 DocType: C-Form,I,ja
 DocType: Company,Asset Depreciation Cost Center,Zaleta Centrum Amortyzacja kosztów
 DocType: Sales Order Item,Sales Order Date,Data Zlecenia
@@ -3474,6 +3540,7 @@
 DocType: Assessment Plan,Assessment Plan,Plan oceny
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Utworzono klienta {0}.
 DocType: Stock Settings,Limit Percent,Limit Procent
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Obecnie brak dostępnych zapasów w żadnym magazynie
 ,Payment Period Based On Invoice Date,Termin Płatności oparty na dacie faktury
 DocType: Sample Collection,No. of print,Liczba wydruków
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Brakujące Wymiana walut stawki dla {0}
@@ -3529,13 +3596,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Razem Odliczenie - Spłata kredytu
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Wynagrodzenie Slip ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Wynagrodzenie Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Data przejścia na emeryturę musi być większa niż Data wstąpienia
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Wystąpiły błędy podczas harmonogramowanie kurs na:
 DocType: Sales Invoice,Against Income Account,Konto przychodów
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% dostarczono
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Element {0}: Zamówione szt {1} nie może być mniejsza niż minimalna Ilość zamówień {2} (określonego w pkt).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Element {0}: Zamówione szt {1} nie może być mniejsza niż minimalna Ilość zamówień {2} (określonego w pkt).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Miesięczny rozkład procentowy
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Zaloguj się jako inny użytkownik.
 DocType: Territory,Territory Targets,Cele Regionalne
 DocType: Delivery Note,Transporter Info,Informacje dotyczące przewoźnika
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Proszę ustawić domyślny {0} w towarzystwie {1}
@@ -3543,13 +3611,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,"Tego samego dostawcy, który został wpisany wielokrotnie"
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Zysk / Strata
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Zamówienie Kupna Zaopatrzenia
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Nazwa firmy nie może być firma
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Nazwa firmy nie może być firma
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Nagłówki to wzorów druku
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Tytuł szablonu wydruku np.: Faktura Proforma
 DocType: Program Enrollment,Walking,Pieszy
 DocType: Student Guardian,Student Guardian,Student Stróża
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Opłaty typu Wycena nie oznaczone jako Inclusive
 DocType: POS Profile,Update Stock,Aktualizuj Stan
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,w subskrypcji
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Kursy
 DocType: Asset,Journal Entry for Scrap,Księgowanie na złom
@@ -3599,15 +3668,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Użytkownik systemu (login) ID. Jeśli ustawiono, stanie się on domyślnym dla wszystkich formularzy HR"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1} od
 DocType: Task,depends_on,zależy_od
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Usługa kolejkowania aktualizacji najnowszej ceny we wszystkich materiałach. Może potrwać kilka minut.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Usługa kolejkowania aktualizacji najnowszej ceny we wszystkich materiałach. Może potrwać kilka minut.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nazwa nowego konta. Uwaga: Proszę nie tworzyć konta dla odbiorców i dostawców
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Szablony Adresów na dany kraj
 DocType: Sales Order Item,Supplier delivers to Customer,Dostawca dostarcza Klientowi
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Postać / poz / {0}) jest niedostępne
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Data referencyjne / Termin nie może być po {0}
+,Sales Payment Summary,Podsumowanie płatności za sprzedaż
+DocType: Restaurant,Restaurant,Restauracja
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Data referencyjne / Termin nie może być po {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Import i eksport danych
 DocType: Patient,Account Details,Szczegóły konta
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Nie znaleziono studentów
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Nie znaleziono studentów
 DocType: Medical Department,Medical Department,Wydział Lekarski
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Kryteria oceny scoringowej dostawcy
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Faktura Data zamieszczenia
@@ -3618,8 +3689,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Proszę wybrać Data księgowania przed wybraniem Stronę
 DocType: Program Enrollment,School House,school House
 DocType: Serial No,Out of AMC,
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Proszę wybrać cytaty
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Proszę wybrać cytaty
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Proszę wybrać cytaty
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Proszę wybrać cytaty
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Ilość amortyzacją Zarezerwowane nie może być większa od ogólnej liczby amortyzacją
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Stwórz Wizytę Konserwacji
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,Proszę się skontaktować z użytkownikiem pełniącym rolę Główny Menadżer Sprzedaży {0}
@@ -3627,7 +3698,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Informacje o własnej firmie.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Jest to oparte na obecności tego Studenta
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Brak uczniów w Poznaniu
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Dodać więcej rzeczy lub otworzyć pełną formę
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Dodać więcej rzeczy lub otworzyć pełną formę
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dowody Dostawy {0} muszą być anulowane przed anulowanie Zamówienia Sprzedaży
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Przejdź do Użytkownicy
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Wartość zapłaty + Wartość odliczenia nie może być większa niż Cała Kwota
@@ -3647,37 +3718,40 @@
 DocType: Fee Schedule,Fee Schedule,Harmonogram opłat
 DocType: Hub Settings,Publish Availability,Publikowanie dostępność
 DocType: Company,Create Chart Of Accounts Based On,Tworzenie planu kont w oparciu o
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Nie można przekonwertować go na grupę inną niż grupa. Zadania dla dzieci istnieją.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Data urodzenia nie może być większa niż data dzisiejsza.
 ,Stock Ageing,Starzenie się zapasów
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Student {0} istnieć przed studenta wnioskodawcy {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Korekta zaokrąglenia (waluta firmy)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Lista obecności
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Lista obecności
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' jest wyłączony
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ustaw jako Otwarty
 DocType: Cheque Print Template,Scanned Cheque,zeskanowanych Czek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Automatycznie wysyłać e-maile do kontaktów z transakcji Zgłaszanie.
 DocType: Timesheet,Total Billable Amount,Całkowita kwota podlegająca rozliczeniom
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Pozycja 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Wprowadzanie zamówień
 DocType: Purchase Order,Customer Contact Email,Kontakt z klientem e-mail
 DocType: Warranty Claim,Item and Warranty Details,Przedmiot i gwarancji Szczegóły
 DocType: Sales Team,Contribution (%),Udział (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Uwaga: Płatność nie zostanie utworzona, gdyż nie określono konta 'Gotówka lub Bank'"
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Projekt {0} już istnieje
 DocType: Medical Department,Nursing User,Pielęgniarka
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Obowiązki
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Okres ważności tego notowania zakończył się.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Okres ważności tego notowania zakończył się.
 DocType: Expense Claim Account,Expense Claim Account,Konto Koszty Roszczenie
 DocType: Accounts Settings,Allow Stale Exchange Rates,Zezwalaj na Stałe Kursy walut
 DocType: Sales Person,Sales Person Name,Imię Sprzedawcy
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Wprowadź co najmniej jedną fakturę do tabelki
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Dodaj użytkowników
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Dodaj użytkowników
 DocType: POS Item Group,Item Group,Kategoria
 DocType: Item,Safety Stock,Bezpieczeństwo Zdjęcie
 DocType: Healthcare Settings,Healthcare Settings,Ustawienia opieki zdrowotnej
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Postęp% dla zadania nie może zawierać więcej niż 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Postęp% dla zadania nie może zawierać więcej niż 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Przed pojednania
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Do {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Dodano podatki i opłaty (Firmowe)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,
 DocType: Sales Order,Partly Billed,Częściowo Zapłacono
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Element {0} musi być trwałego przedmiotu
 DocType: Item,Default BOM,Domyślne Zestawienie Materiałów
@@ -3693,6 +3767,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,Zmienna
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Od dowodu dostawy
 DocType: Student,Student Email Address,Student adres email
+DocType: Item,Hub Warehouse,Magazyn Hub
 DocType: Physician Schedule Time Slot,From Time,Od czasu
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,W magazynie:
 DocType: Notification Control,Custom Message,Niestandardowa wiadomość
@@ -3701,9 +3776,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Adres studenta
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Adres studenta
 DocType: Purchase Invoice,Price List Exchange Rate,Cennik Kursowy
+DocType: POS Profile,POS Profile Name,Nazwa profilu POS
 DocType: Purchase Invoice Item,Rate,Stawka
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Stażysta
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Adres
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Adres
 DocType: Stock Entry,From BOM,Od BOM
 DocType: Assessment Code,Assessment Code,Kod Assessment
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Podstawowy
@@ -3717,11 +3793,12 @@
 DocType: Salary Slip,Salary Structure,Struktura Wynagrodzenia
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Linia lotnicza
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Wydanie Materiał
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Wydanie Materiał
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Wystąpił błąd podczas tworzenia cyklicznego
 DocType: Material Request Item,For Warehouse,Dla magazynu
 DocType: Employee,Offer Date,Data oferty
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Notowania
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Jesteś w trybie offline. Nie będzie mógł przeładować dopóki masz sieć.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Jesteś w trybie offline. Nie będzie mógł przeładować dopóki masz sieć.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Brak grup studenckich utworzony.
 DocType: Purchase Invoice Item,Serial No,Nr seryjny
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Miesięczna kwota spłaty nie może być większa niż Kwota kredytu
@@ -3731,17 +3808,18 @@
 DocType: Salary Slip,Total Working Hours,Całkowita liczba godzin pracy
 DocType: Subscription,Next Schedule Date,Następny dzień harmonogramu
 DocType: Stock Entry,Including items for sub assemblies,W tym elementów dla zespołów sub
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Wprowadź wartość musi być dodatnia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Wszystkie obszary
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Wprowadź wartość musi być dodatnia
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Wszystkie obszary
 DocType: Purchase Invoice,Items,Produkty
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student jest już zarejestrowany.
 DocType: Fiscal Year,Year Name,Nazwa roku
 DocType: Process Payroll,Process Payroll,Lista Płac
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Jest więcej świąt niż dni pracujących
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Jest więcej świąt niż dni pracujących
 DocType: Product Bundle Item,Product Bundle Item,Pakiet produktów Artykuł
 DocType: Sales Partner,Sales Partner Name,Imię Partnera Sprzedaży
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Zapytanie o cenę
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Zapytanie o cenę
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksymalna kwota faktury
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hematologia
 DocType: Normal Test Items,Normal Test Items,Normalne elementy testowe
 DocType: Student Language,Student Language,Student Język
 apps/erpnext/erpnext/config/selling.py +23,Customers,Klienci
@@ -3753,10 +3831,11 @@
 DocType: Issue,Opening Time,Czas Otwarcia
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Daty Od i Do są wymagane
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Papiery i Notowania Giełdowe
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Domyślne jednostki miary dla wariantu &quot;{0}&quot; musi być taki sam, jak w szablonie &#39;{1}&#39;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Domyślne jednostki miary dla wariantu &quot;{0}&quot; musi być taki sam, jak w szablonie &#39;{1}&#39;"
 DocType: Shipping Rule,Calculate Based On,Obliczone na podstawie
 DocType: Delivery Note Item,From Warehouse,Z magazynu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Brak przedmioty z Bill of Materials do produkcji
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Brak przedmioty z Bill of Materials do produkcji
+DocType: Restaurant,Default Customer,Domyślny klient
 DocType: Assessment Plan,Supervisor Name,Nazwa Supervisor
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Nie potwierdzaj, czy spotkanie zostanie utworzone na ten sam dzień"
 DocType: Program Enrollment Course,Program Enrollment Course,Kurs rejestracyjny programu
@@ -3784,7 +3863,7 @@
 DocType: Payment Entry,Internal Transfer,Transfer wewnętrzny
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,To konto zawiera konta podrzędne. Nie można usunąć takiego konta.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Wymagana jest ilość lub kwota docelowa
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Brak standardowego BOM dla produktu {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Brak standardowego BOM dla produktu {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Najpierw wybierz zamieszczenia Data
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Data otwarcia powinien być przed Dniem Zamknięcia
 DocType: Leave Control Panel,Carry Forward,Przeniesienie
@@ -3820,6 +3899,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Razem Present
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,Raporty księgowe
 DocType: Drug Prescription,Hour,Godzina
+DocType: Restaurant Order Entry,Last Sales Invoice,Ostatnia sprzedaż faktury
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nowy nr seryjny nie może mieć Magazynu. Magazyn musi być ustawiona przez Zasoby lub  na podstawie Paragonu Zakupu
 DocType: Lead,Lead Type,Typ Tropu
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Nie masz uprawnień do zatwierdzania tych urlopów
@@ -3856,65 +3936,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Tworzenie użytkowników
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,Gram
 DocType: Supplier Scorecard,Per Month,Na miesiąc
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Ilość do produkcji musi być większy niż 0 ° C.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Ilość do produkcji musi być większy niż 0 ° C.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Raport wizyty dla wezwania konserwacji.
 DocType: Stock Entry,Update Rate and Availability,Aktualizuj cenę i dostępność
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procent który wolno Ci otrzymać lub dostarczyć ponad zamówioną ilość. Na przykład: jeśli zamówiłeś 100 jednostek i Twój procent wynosi 10% oznacza to, że możesz otrzymać 110 jednostek"
 DocType: POS Customer Group,Customer Group,Grupa Klientów
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Nowy identyfikator partii (opcjonalnie)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Nowy identyfikator partii (opcjonalnie)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Nowy identyfikator partii (opcjonalnie)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Nowy identyfikator partii (opcjonalnie)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Konto wydatków jest obowiązkowe dla przedmiotu {0}
 DocType: BOM,Website Description,Opis strony WWW
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Zmiana netto w kapitale własnym
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Najnowszy
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Anuluj faktura zakupu {0} Pierwszy
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adres e-mail musi być unikalny, istnieje już dla {0}"
 DocType: Serial No,AMC Expiry Date,AMC Data Ważności
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,Paragon
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,Paragon
 ,Sales Register,Rejestracja Sprzedaży
 DocType: Daily Work Summary Settings Company,Send Emails At,Wyślij pocztę elektroniczną w
 DocType: Quotation,Quotation Lost Reason,Utracony Powód Wyceny
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Wybierz swoją domenę
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',wybierz * z tabPatient gdzie name = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Transakcja ma odniesienia {0} z {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Transakcja ma odniesienia {0} z {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nie ma nic do edycji
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Widok formularza
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Podsumowanie dla tego miesiąca i działań toczących
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Widok formularza
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Podsumowanie dla tego miesiąca i działań toczących
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Dodaj użytkowników do organizacji, innych niż Ty."
 DocType: Customer Group,Customer Group Name,Nazwa Grupy Klientów
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Brak klientów!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Brak klientów!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Raport kasowy
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kwota kredytu nie może przekroczyć maksymalna kwota kredytu o {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licencja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Proszę usunąć tę fakturę {0} z C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Proszę usunąć tę fakturę {0} z C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Proszę wybrać Przeniesienie jeżeli chcesz uwzględnić balans poprzedniego roku rozliczeniowego do tego roku rozliczeniowego
 DocType: GL Entry,Against Voucher Type,Rodzaj dowodu
 DocType: Physician,Phone (R),Telefon (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Dodano gniazda czasowe
 DocType: Item,Attributes,Atrybuty
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Włącz szablon
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Proszę ustawić Serie nazw dla {0} przez Konfiguracja&gt; Ustawienia&gt; Serie nazw
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Proszę zdefiniować konto odpisów
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Data Ostatniego Zamówienia
 DocType: Patient,B Negative,B Negatywne
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konto {0} nie należy do firmy {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Numery seryjne w wierszu {0} nie pasują do opisu dostawy
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Numery seryjne w wierszu {0} nie pasują do opisu dostawy
 DocType: Student,Guardian Details,Szczegóły Stróża
 DocType: C-Form,C-Form,
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Zaznacz Obecność dla wielu pracowników
 DocType: Vehicle,Chassis No,Podwozie Nie
 DocType: Payment Request,Initiated,Zapoczątkowany
 DocType: Production Order,Planned Start Date,Planowana data rozpoczęcia
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Wybierz zestawienie materiałów
 DocType: Serial No,Creation Document Type,
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Data zakończenia musi być większa niż data rozpoczęcia
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Data zakończenia musi być większa niż data rozpoczęcia
 DocType: Leave Type,Is Encash,
 DocType: Leave Allocation,New Leaves Allocated,Nowe Zwolnienie Przypisano
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Podłużnie
 DocType: Project,Expected End Date,Spodziewana data końcowa
 DocType: Budget Account,Budget Amount,budżet Kwota
 DocType: Appraisal Template,Appraisal Template Title,Tytuł szablonu oceny
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Od Data {0} dla Employee {1} nie może być wcześniejsza niż data łączącej pracownika {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Komercyjny
 DocType: Patient,Alcohol Current Use,Obecne stosowanie alkoholu
+DocType: Student Admission Program,Student Admission Program,Studencki program przyjęć
 DocType: Payment Entry,Account Paid To,Rachunek na rzecz
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Dominująca pozycja {0} nie może być pozycja Zdjęcie
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Wszystkie produkty i usługi.
@@ -3923,30 +4005,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Budżet dla rachunku {1} w stosunku do {2} {3} wynosi {4}. Będzie przekraczać o {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Wiersz {0} # Konto musi być typu &quot;trwałego&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Brak Ilości
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Zasady obliczeń kwot przesyłki przy sprzedaży
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,i unchcked Wyłączone w
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Serie jest obowiązkowa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Usługi finansowe
 DocType: Student Sibling,Student ID,legitymacja studencka
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Rodzaje działalności za czas Logi
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Adres e-mail dostawcy
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Rodzaje działalności za czas Logi
 DocType: Tax Rule,Sales,Sprzedaż
 DocType: Stock Entry Detail,Basic Amount,Kwota podstawowa
 DocType: Training Event,Exam,Egzamin
 DocType: Complaint,Complaint,Skarga
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Magazyn wymagany dla przedmiotu {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Magazyn wymagany dla przedmiotu {0}
 DocType: Leave Allocation,Unused leaves,Niewykorzystane urlopy
 DocType: Patient,Alcohol Past Use,Alkohol w przeszłości
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Kr
 DocType: Tax Rule,Billing State,Stan Billing
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),
 DocType: Authorization Rule,Applicable To (Employee),Stosowne dla (Pracownik)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Due Date jest obowiązkowe
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Due Date jest obowiązkowe
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Przyrost dla atrybutu {0} nie może być 0
 DocType: Journal Entry,Pay To / Recd From,Zapłać / Rachunek od
 DocType: Naming Series,Setup Series,Konfigurowanie serii
 DocType: Payment Reconciliation,To Invoice Date,Aby Data faktury
 DocType: Supplier,Contact HTML,HTML kontaktu
 ,Inactive Customers,Nieaktywne Klienci
+DocType: Student Admission Program,Maximum Age,Maksymalny wiek
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Potwierdzenia Zakupu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Jak reguła jest stosowana Wycena?
@@ -3961,10 +4045,11 @@
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Szablon Podatków i Opłat kupna
 DocType: Upload Attendance,Download Template,Ściągnij Szablon
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: albo debetowej lub kwota kredytu wymagana jest {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Kwota kredytowa lub debetowa jest wymagana dla {2}
 DocType: GL Entry,Remarks,Uwagi
 DocType: Payment Entry,Account Paid From,Konto Płatny Z
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Kod surowca
+DocType: Task,Parent Task,Zadanie rodzica
 DocType: Journal Entry,Write Off Based On,Odpis bazowano na
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Dokonaj Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Druk i papiernicze
@@ -3973,20 +4058,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",Wynagrodzenie już przetwarzane w okresie od {0} i {1} Zostaw okresu stosowania nie może być pomiędzy tym zakresie dat.
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Numer instalacyjny dla numeru seryjnego
 DocType: Guardian Interest,Guardian Interest,Strażnik Odsetki
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Ustaw wartości domyślne dla faktur POS
 apps/erpnext/erpnext/config/hr.py +177,Training,Trening
 DocType: Timesheet,Employee Detail,Szczegóły urzędnik
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Identyfikator e-maila Guardian1
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Identyfikator e-maila Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,dnia następnego terminu i powtórzyć na dzień miesiąca musi być równa
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,dnia następnego terminu i powtórzyć na dzień miesiąca musi być równa
 DocType: Lab Prescription,Test Code,Kod testowy
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Ustawienia strony głównej
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},Zlecenia RFQ nie są dozwolone w {0} z powodu karty wyników {1}
 DocType: Offer Letter,Awaiting Response,Oczekuje na Odpowiedź
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Powyżej
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Łączna kwota {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Nieprawidłowy atrybut {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Łączna kwota {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Nieprawidłowy atrybut {0} {1}
 DocType: Supplier,Mention if non-standard payable account,"Wspomnij, jeśli nietypowe konto płatne"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Ten sam element został wprowadzony wielokrotnie. {lista}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Proszę wybrać grupę oceniającą inną niż &quot;Wszystkie grupy oceny&quot;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Wiersz {0}: wymagany jest koszt centrum dla elementu {1}
 DocType: Training Event Employee,Optional,Opcjonalny
@@ -4009,13 +4094,15 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: MPK jest obowiązkowe dla pozycji {2}
 DocType: Vehicle,Policy No,Polityka nr
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Elementy z Bundle produktu
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Ponieważ zapas istnieje dla pozycji {0}, nie można włączyć właściwości ma warianty"
 DocType: Asset,Straight Line,Linia prosta
 DocType: Project User,Project User,Użytkownik projektu
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Rozdzielać
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Rozdzielać
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Rozdzielać
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Rozdzielać
 DocType: GL Entry,Is Advance,Zaawansowany proces
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Obecnośc od i do Daty są obowiązkowe
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,"Proszę wprowadź ""Zlecona"" jako Tak lub Nie"
+DocType: Item,Default Purchase Unit of Measure,Domyślny zakup jednostki miary
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Ostatni dzień komunikacji
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Ostatni dzień komunikacji
 DocType: Sales Team,Contact No.,Numer Kontaktu
@@ -4024,7 +4111,6 @@
 DocType: Production Order,Check if material transfer entry is not required,"Sprawdź, czy nie ma konieczności wczytywania materiału"
 DocType: Production Order,Check if material transfer entry is not required,"Sprawdź, czy nie ma konieczności wczytywania materiału"
 DocType: Program Enrollment Tool,Get Students From,Uzyskaj studentów z
-DocType: Hub Settings,Seller Country,Sprzedawca Kraj
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publikowanie przedmioty na stronie internetowej
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Grupa uczniowie w partiach
 DocType: Authorization Rule,Authorization Rule,Reguła autoryzacji
@@ -4034,8 +4120,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Podatki od sprzedaży i opłaty Szablon
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Razem (Credit)
 DocType: Repayment Schedule,Payment Date,Data płatności
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nowa partia
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nowa partia
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Nowa partia
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Nowa partia
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Odzież i akcesoria
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,"Nie udało się rozwiązać funkcji ważonych punktów. Upewnij się, że formuła jest prawidłowa."
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Numer zlecenia
@@ -4053,6 +4139,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Wiersz # {0}: {1} aktywami nie mogą być składane, jest już {2}"
 DocType: Tax Rule,Billing Country,Kraj fakturowania
 DocType: Purchase Order Item,Expected Delivery Date,Spodziewana data odbioru przesyłki
+DocType: Restaurant Order Entry,Restaurant Order Entry,Wprowadzanie do restauracji
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetowe i kredytowe nie równe dla {0} # {1}. Różnica jest {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Wydatki na reprezentację
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Materiał uczynić żądanie
@@ -4065,9 +4152,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Konto z istniejącymi zapisami nie może być usunięte
 DocType: Vehicle,Last Carbon Check,Ostatni Carbon Sprawdź
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Wydatki na obsługę prawną
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Wybierz ilość w wierszu
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Wybierz ilość w wierszu
 DocType: Purchase Invoice,Posting Time,Czas publikacji
 DocType: Timesheet,% Amount Billed,% wartości rozliczonej
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Czas na spotkanie&quot; nie został ustawiony dla dr. {0} Dodaj go do lekarza głównego.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Wydatki telefoniczne
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,
@@ -4078,6 +4166,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nowy Przychody klienta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Wydatki na podróże
 DocType: Maintenance Visit,Breakdown,Rozkład
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Dodaj niestandardowe pole Subskrypcja w typie dokumentu {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Konto: {0} z waluty: nie można wybrać {1}
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Zaktualizuj koszt BOM automatycznie za pomocą harmonogramu, w oparciu o ostatnią wycenę / kurs cen / ostatni kurs zakupu surowców."
 DocType: Bank Reconciliation Detail,Cheque Date,Data czeku
@@ -4102,7 +4191,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Łączna kwota płatności (przez Time Logs)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,ID Dostawcy
 DocType: Payment Request,Payment Gateway Details,Payment Gateway Szczegóły
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Ilość powinna być większa niż 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Ilość powinna być większa niż 0
 DocType: Journal Entry,Cash Entry,Wpis gotówkowy
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,węzły potomne mogą być tworzone tylko w węzłach typu &quot;grupa&quot;
 DocType: Leave Application,Half Day Date,Pół Dzień Data
@@ -4120,12 +4209,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Uwaga: Element {0} wpisano kilka razy
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Wszystkie kontakty.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Nazwa skrótowa firmy
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Użytkownik {0} nie istnieje
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Użytkownik {0} nie istnieje
 DocType: Subscription,SUB-,POD-
 DocType: Item Attribute Value,Abbreviation,Skrót
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Zapis takiej Płatności już istnieje
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Brak autoryzacji od {0} przekroczono granice
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Szablon wynagrodzenia
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Patologia
+DocType: Restaurant Order Entry,Restaurant Table,Stolik Restauracyjny
 DocType: Leave Type,Max Days Leave Allowed,Udzielono maksymalna ilość dni zwolnienia
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Ustaw regułę podatkowa do koszyka
 DocType: Purchase Invoice,Taxes and Charges Added,Dodano podatki i opłaty
@@ -4137,10 +4228,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Wycena dla Tropów albo Klientów
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rola Zezwala na edycję zamrożonych zasobów
 ,Territory Target Variance Item Group-Wise,
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Wszystkie grupy klientów
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Wszystkie grupy klientów
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,skumulowana miesięczna
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} jest obowiązkowe. Możliwe, że rekord Wymiana walut nie jest utworzony dla {1} do {2}."
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Szablon podatkowa jest obowiązkowe.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Szablon podatkowa jest obowiązkowe.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Konto {0}: Konto nadrzędne {1} nie istnieje
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Wartość w cenniku (waluta firmy)
 DocType: Products Settings,Products Settings,produkty Ustawienia
@@ -4166,13 +4257,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Instytut Skrót
 ,Item-wise Price List Rate,
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Wyznaczony dostawca
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Wyznaczony dostawca
 DocType: Quotation,In Words will be visible once you save the Quotation.,
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Liczba ({0}) nie może być ułamkiem w rzędzie {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Liczba ({0}) nie może być ułamkiem w rzędzie {1}
 DocType: Consultation,C-,DO-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Kod kreskowy {0} jest już używana dla przedmiotu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Kod kreskowy {0} jest już używany dla przedmiotu {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Zasady naliczania kosztów transportu.
 DocType: Item,Opening Stock,Otwarcie Zdjęcie
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Klient jest wymagany
@@ -4191,9 +4282,8 @@
 DocType: Customer,From Lead,Od śladu
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Zamówienia puszczone do produkcji.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Wybierz rok finansowy ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,Profil POS wymagany do tworzenia wpisu z POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,Profil POS wymagany do tworzenia wpisu z POS
 DocType: Program Enrollment Tool,Enroll Students,zapisać studentów
-DocType: Hub Settings,Name Token,Nazwa jest już w użyciu
 DocType: Lab Test,Approved Date,Zatwierdzona data
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard sprzedaży
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Co najmniej jeden magazyn jest wymagany
@@ -4211,7 +4301,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Zasoby Ludzkie
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Płatność Wyrównawcza Płatności
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Podatek należny (zwrot)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Zlecenie produkcyjne zostało {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Zlecenie produkcyjne zostało {0}
 DocType: BOM Item,BOM No,Nr zestawienia materiałowego
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Księgowanie {0} nie masz konta {1} lub już porównywane inne bon
@@ -4231,8 +4321,8 @@
 DocType: Currency Exchange,To Currency,Do przewalutowania
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Rodzaje roszczeń.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Współczynnik sprzedaży dla elementu {0} jest niższy niż {1}. Procent sprzedaży powinien wynosić co najmniej {2}
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Współczynnik sprzedaży dla elementu {0} jest niższy niż {1}. Prędkość sprzedaży powinna wynosić co najmniej {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Współczynnik sprzedaży dla elementu {0} jest niższy niż {1}. Procent sprzedaży powinien wynosić co najmniej {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Współczynnik sprzedaży dla elementu {0} jest niższy niż {1}. Prędkość sprzedaży powinna wynosić co najmniej {2}
 DocType: Item,Taxes,Podatki
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Płatny i niedostarczone
 DocType: Project,Default Cost Center,Domyślne Centrum Kosztów
@@ -4246,15 +4336,15 @@
 DocType: Employee Loan,Fully Disbursed,w pełni wydatkowane
 DocType: Maintenance Visit,Customer Feedback,Informacja zwrotna Klienta
 DocType: Account,Expense,Koszt
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Wynik nie może być większa niż maksymalna liczba punktów
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Wynik nie może być większa niż maksymalna liczba punktów
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Klienci i dostawcy
 DocType: Item Attribute,From Range,Od zakresu
 DocType: BOM,Set rate of sub-assembly item based on BOM,Ustaw stawkę pozycji podzakresu na podstawie BOM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Błąd składni we wzorze lub stanu: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Błąd składni we wzorze lub stanu: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Codzienna praca podsumowanie Ustawienia firmy
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,"Element {0} jest ignorowany od momentu, kiedy nie ma go w magazynie"
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Zgłoś zamówienie produkcji dla dalszego przetwarzania.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Zgłoś zamówienie produkcji dla dalszego przetwarzania.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Cennik nie stosuje regułę w danej transakcji, wszystkie obowiązujące przepisy dotyczące cen powinny być wyłączone."
 DocType: Assessment Group,Parent Assessment Group,Rodzic Assesment Group
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Oferty pracy
@@ -4271,12 +4361,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Proszę wyłączyć filtr firmy, jeśli Group By jest &quot;Company&quot;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Data publikacji nie może być datą przyszłą
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Wiersz # {0}: Numer seryjny: {1} nie jest zgodny z {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,do generowania powtarzających się
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Urlop okolicznościowy
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Lab Test UOM.
 DocType: Batch,Batch ID,Identyfikator Partii
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Uwaga: {0}
 ,Delivery Note Trends,Trendy Dowodów Dostawy
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Podsumowanie W tym tygodniu
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Podsumowanie W tym tygodniu
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Ilość w magazynie
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Konto: {0} może być aktualizowana tylko przez operacje magazynowe
 DocType: Student Group Creation Tool,Get Courses,Uzyskaj kursy
@@ -4290,7 +4381,6 @@
 DocType: Purchase Order,To Bill,Wystaw rachunek
 DocType: Material Request,% Ordered,% Zamówione
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Dla Grupy Studenckiej na Kursie kurs zostanie sprawdzony dla każdego Uczestnika z zapisanych kursów w ramach Rejestracji Programu.
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Wpisz adres e-mail oddzielone przecinkami, faktura zostanie wysłany automatycznie na określonym dniu"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Praca akordowa
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Średnia. Kupno Cena
 DocType: Task,Actual Time (in Hours),Rzeczywisty czas (w godzinach)
@@ -4304,7 +4394,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Element {0} nie jest ustawiony na nr seryjny. Kolumny powinny być puste
 DocType: Accounts Settings,Accounts Settings,Ustawienia Kont
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,Zatwierdzać
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Brak wyniku
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Brak wyniku
 DocType: Customer,Sales Partner and Commission,Partner sprzedaży i Prowizja
 DocType: Employee Loan,Rate of Interest (%) / Year,Stopa procentowa (% / rok)
 ,Project Quantity,Ilość projektów
@@ -4316,55 +4406,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Czarny
 DocType: BOM Explosion Item,BOM Explosion Item,
 DocType: Account,Auditor,Audytor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} pozycji wyprodukowanych
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} pozycji wyprodukowanych
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Ucz się więcej
 DocType: Cheque Print Template,Distance from top edge,Odległość od górnej krawędzi
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Cennik {0} jest wyłączona lub nie istnieje
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Cennik {0} jest wyłączona lub nie istnieje
 DocType: Purchase Invoice,Return,Powrót
 DocType: Production Order Operation,Production Order Operation,Produkcja Zamówienie Praca
 DocType: Pricing Rule,Disable,Wyłącz
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,"Sposób płatności jest wymagane, aby dokonać płatności"
 DocType: Project Task,Pending Review,Czekający na rewizję
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Terminy i konsultacje
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nie jest zapisany do grupy {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nie jest powiązana z transakcją{2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Składnik {0} nie może zostać wycofane, jak to jest już {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Razem zwrot kosztów (przez zwrot kosztów)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Oznacz Nieobecna
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Wiersz {0}: Waluta BOM # {1} powinna być równa wybranej walucie {2}
 DocType: Journal Entry Account,Exchange Rate,Kurs wymiany
 DocType: Patient,Additional information regarding the patient,Dodatkowe informacje dotyczące pacjenta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Zlecenie Sprzedaży {0} nie jest jeszcze złożone
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Zlecenie Sprzedaży {0} nie jest jeszcze złożone
 DocType: Homepage,Tag Line,tag Linia
 DocType: Fee Component,Fee Component,opłata Komponent
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Fleet Management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Dodaj elementy z
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Fleet Management
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Dodaj elementy z
 DocType: Cheque Print Template,Regular,Regularny
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Razem weightage wszystkich kryteriów oceny muszą być w 100%
-DocType: BOM,Last Purchase Rate,Data Ostatniego Zakupu
+DocType: Purchase Order Item,Last Purchase Rate,Data Ostatniego Zakupu
 DocType: Account,Asset,Składnik aktywów
 DocType: Project Task,Task ID,Identyfikator zadania
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Zdjęcie nie może istnieć dla pozycji {0}, ponieważ ma warianty"
 DocType: Lab Test,Mobile,mobilny
 ,Sales Person-wise Transaction Summary,
 DocType: Training Event,Contact Number,Numer kontaktowy
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Magazyn {0} nie istnieje
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Zarejestruj Dla Hubu ERPNext
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Magazyn {0} nie istnieje
 DocType: Monthly Distribution,Monthly Distribution Percentages,Miesięczne Procenty Dystrybucja
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Wybrany element nie może mieć Batch
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Stopa wycena nie znaleziono Item {0}, który jest zobowiązany do zapisów księgowych dla {1} {2}. Jeśli pozycja jest transakcje jako elementu próbki w {1}, należy wspomnieć, że w {1} tabeli poz. W przeciwnym razie, należy utworzyć połączenie przychodzące transakcję akcji na artykuł lub wzmianka kursu wyceny w rekordzie element, a następnie spróbuj wysłaniem / anulowanie tego wpisu"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% materiałów dostarczonych w stosunku do dowodu dostawy
+DocType: Training Event,Has Certificate,Ma certyfikat
 DocType: Project,Customer Details,Dane Klienta
 DocType: Employee,Reports to,Raporty do
 ,Unpaid Expense Claim,Niepłatny Koszty Zastrzeżenie
 DocType: Payment Entry,Paid Amount,Zapłacona kwota
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Zbadaj cykl sprzedaży
 DocType: Assessment Plan,Supervisor,Kierownik
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,online
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,online
 ,Available Stock for Packing Items,Dostępne ilości dla materiałów opakunkowych
 DocType: Item Variant,Item Variant,Pozycja Wersja
 DocType: Assessment Result Tool,Assessment Result Tool,Wynik oceny Narzędzie
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Złom Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Złożone zlecenia nie mogą zostać usunięte
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Złożone zlecenia nie mogą zostać usunięte
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konto jest na minusie, nie możesz ustawić wymagań jako kredyt."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Zarządzanie jakością
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Element {0} została wyłączona
@@ -4385,7 +4474,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Zezwalaj na zerową wartość wyceny
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Zezwalaj na zerową wartość wyceny
 DocType: Training Event Employee,Invited,Zaproszony
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Wiele aktywnych Struktury wynagrodzeń znalezionych dla pracownika {0} dla podanych dat
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Wiele aktywnych Struktury wynagrodzeń znalezionych dla pracownika {0} dla podanych dat
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Rachunki konfiguracji bramy.
 DocType: Employee,Employment Type,Typ zatrudnienia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Środki trwałe
@@ -4397,7 +4486,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Student ID email
 DocType: Employee,Notice (days),Wymówienie (dni)
 DocType: Tax Rule,Sales Tax Template,Szablon Podatek od sprzedaży
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,"Wybierz elementy, aby zapisać fakturę"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,"Wybierz elementy, aby zapisać fakturę"
 DocType: Employee,Encashment Date,Data Inkaso
 DocType: Training Event,Internet,Internet
 DocType: Special Test Template,Special Test Template,Specjalny szablon testu
@@ -4407,7 +4496,7 @@
 DocType: Academic Term,Term Start Date,Termin Data rozpoczęcia
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Załączeniu {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Załączeniu {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bilans wyciągów bankowych wedle Księgi Głównej
 DocType: Job Applicant,Applicant Name,Imię Aplikanta
 DocType: Authorization Rule,Customer / Item Name,Klient / Nazwa Przedmiotu
@@ -4427,7 +4516,7 @@
 DocType: Guardian,Guardian Of ,Strażnik
 DocType: Grading Scale Interval,Threshold,Próg
 DocType: BOM Update Tool,Current BOM,Obecny BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Dodaj nr seryjny
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Dodaj nr seryjny
 DocType: Production Order Item,Available Qty at Source Warehouse,Dostępne ilości w magazynie źródłowym
 apps/erpnext/erpnext/config/support.py +22,Warranty,Gwarancja
 DocType: Purchase Invoice,Debit Note Issued,Nocie debetowej
@@ -4450,10 +4539,9 @@
 DocType: Account,Receivable,Należności
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Wiersz # {0}: Nie wolno zmienić dostawcę, jak już istnieje Zamówienie"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rola pozwala na zatwierdzenie transakcji, których kwoty przekraczają ustalone limity kredytowe."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Wybierz produkty do Manufacture
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Mistrz synchronizacja danych, może to zająć trochę czasu"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Wybierz produkty do Manufacture
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Mistrz synchronizacja danych, może to zająć trochę czasu"
 DocType: Item,Material Issue,Wydanie materiałów
-DocType: Hub Settings,Seller Description,Sprzedawca Opis
 DocType: Employee Education,Qualification,Kwalifikacja
 DocType: Item Price,Item Price,Cena
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Środki czystości i Detergenty
@@ -4461,7 +4549,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Od czasu nie może być większa niż do czasu.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Ruchomy Obraz i Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Zamówione
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Wznawianie
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Wznawianie
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Jeśli opcja jest włączona, system nie zaktualizuje pól wariantów z szablonu, ale skopiuje dane z poniższych pól podczas tworzenia nowego wariantu"
 DocType: Salary Detail,Component,Składnik
 DocType: Assessment Criteria,Assessment Criteria Group,Kryteria oceny grupowej
 DocType: Healthcare Settings,Patient Name By,Nazwisko pacjenta
@@ -4471,7 +4560,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Proszę wprowadzić Rolę osoby zatwierdzającej dla użytkownika zatwierdzającego
 DocType: Journal Entry,Write Off Entry,Odpis
 DocType: BOM,Rate Of Materials Based On,Stawka Materiałów Wzorowana na
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dostawca&gt; Typ dostawcy
+DocType: Item Variant Settings,Do not Update Variants,Nie aktualizuj wariantów
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Wsparcie techniczne
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Odznacz wszystkie
 DocType: POS Profile,Terms and Conditions,Regulamin
@@ -4480,12 +4569,12 @@
 DocType: Leave Block List,Applies to Company,Dotyczy Firmy
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,"Nie można anulować, ponieważ wskazane Wprowadzenie na magazyn {0} istnieje"
 DocType: Employee Loan,Disbursement Date,wypłata Data
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&quot;Odbiorcy&quot; nie podano
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&quot;Odbiorcy&quot; nie podano
 DocType: BOM Update Tool,Update latest price in all BOMs,Zaktualizuj ostatnią cenę we wszystkich biuletynach
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Historia choroby
 DocType: Vehicle,Vehicle,Pojazd
 DocType: Purchase Invoice,In Words,Słownie
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} musi zostać wysłany
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} musi zostać złożony
 DocType: POS Profile,Item Groups,Pozycja Grupy
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Dziś jest {0} 'urodziny!
 DocType: Production Planning Tool,Material Request For Warehouse,Zamówienie produktu dla Magazynu
@@ -4496,14 +4585,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / ołów%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Aktywów Amortyzacja i salda
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},"Kwota {0} {1} przeniesione z {2} {3}, aby"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},"Kwota {0} {1} przeniesione z {2} {3}, aby"
 DocType: Sales Invoice,Get Advances Received,Uzyskaj otrzymane zaliczki
 DocType: Email Digest,Add/Remove Recipients,Dodaj / Usuń odbiorców
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Aby ustawić ten rok finansowy jako domyślny, kliknij przycisk ""Ustaw jako domyślne"""
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,łączyć
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,łączyć
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Niedobór szt
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Pozycja wariant {0} istnieje z samymi atrybutami
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Pozycja wariant {0} istnieje z samymi atrybutami
 DocType: Employee Loan,Repay from Salary,Spłaty z pensji
 DocType: Leave Application,LAP/,LAP/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Żądanie zapłatę przed {0} {1} w ilości {2}
@@ -4516,7 +4605,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Pozycja Zlecenia Sprzedaży
 DocType: Salary Slip,Payment Days,Dni Płatności
 DocType: Patient,Dormant,Drzemiący
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Magazyny z węzłów potomnych nie mogą być zamieniane na Ledger
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Magazyny z węzłów potomnych nie mogą być zamieniane na Ledger
 DocType: BOM,Manage cost of operations,Zarządzaj kosztami działań
 DocType: Accounts Settings,Stale Days,Stale Dni
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Jeżeli którakolwiek z zaznaczonych transakcji ""Wysłane"", e-mail pop-up otwierany automatycznie, aby wysłać e-mail do powiązanego ""Kontakt"" w tej transakcji z transakcją jako załącznik. Użytkownik może lub nie może wysłać e-mail."
@@ -4530,10 +4619,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Nr seryjny {0} otrzymano
 ,Requested Items To Be Transferred,Proszę o Przetranferowanie Przedmiotów
 DocType: Expense Claim,Vehicle Log,pojazd Log
-DocType: Purchase Invoice,Recurring Id,Powtarzające się ID
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Obecność gorączki (temp.&gt; 38,5 ° C / 101,3 ° F lub trwała temperatura&gt; 38 ° C / 100,4 ° F)"
 DocType: Customer,Sales Team Details,Szczegóły dotyczące Teamu Sprzedażowego
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Usuń na stałe?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Usuń na stałe?
 DocType: Expense Claim,Total Claimed Amount,Całkowita kwota roszczeń
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potencjalne szanse na sprzedaż.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Nieprawidłowy {0}
@@ -4543,7 +4631,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,
 ,Item Delivery Date,Data dostarczenia przesyłki
 DocType: Warehouse,PIN,KOŁEK
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Konfiguracja swoją szkołę w ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Konfiguracja swoją szkołę w ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Kwota bazowa Change (Spółka waluty)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Brak zapisów księgowych dla następujących magazynów
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Zapisz dokument jako pierwszy.
@@ -4555,13 +4643,12 @@
 DocType: Task,Is Milestone,Jest Milestone
 DocType: Daily Work Summary,Email Sent To,Email wysłany do
 DocType: Budget,Warn,Ostrzeż
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Czy na pewno chcesz się wyrejestrować?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Wszelkie inne uwagi, zauważyć, że powinien iść nakładu w ewidencji."
 DocType: BOM,Manufacturing User,Produkcja użytkownika
 DocType: Purchase Invoice,Raw Materials Supplied,Dostarczone surowce
-DocType: Purchase Invoice,Recurring Print Format,Format wydruku cykliczne
 DocType: C-Form,Series,Seria
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Waluta listy cen {0} musi wynosić {1} lub {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Dodaj produkty
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Waluta listy cen {0} musi wynosić {1} lub {2}
 DocType: Appraisal,Appraisal Template,Szablon oceny
 DocType: Item Group,Item Classification,Pozycja Klasyfikacja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Business Development Manager
@@ -4575,7 +4662,7 @@
 DocType: Item Attribute Value,Attribute Value,Wartość atrybutu
 ,Itemwise Recommended Reorder Level,Pozycja Zalecany poziom powtórnego zamówienia
 DocType: Salary Detail,Salary Detail,Wynagrodzenie Szczegóły
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Proszę najpierw wybrać {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Proszę najpierw wybrać {0}
 DocType: Appointment Type,Physician,Lekarz
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Batch {0} pozycji {1} wygasł.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Konsultacje
@@ -4586,7 +4673,7 @@
 DocType: Salary Detail,Default Amount,Domyślnie Kwota
 DocType: Lab Test Template,Descriptive,Opisowy
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Magazyn nie został znaleziony w systemie
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Podsumowanie tego miesiąca
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Podsumowanie tego miesiąca
 DocType: Quality Inspection Reading,Quality Inspection Reading,Odczyt kontroli jakości
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,Zapasy starsze niż' powinny być starczyć na %d dni
 DocType: Tax Rule,Purchase Tax Template,Szablon podatkowy zakupów
@@ -4609,12 +4696,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Szkolenia Wydarzenia / Wyniki
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Skumulowana amortyzacja jak na
 DocType: Sales Invoice,C-Form Applicable,
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Czas działania musi być większy niż 0 do operacji {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Czas działania musi być większy niż 0 do operacji {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Magazyn jest obowiązkowe
 DocType: Supplier,Address and Contacts,Adres i Kontakt
 DocType: UOM Conversion Detail,UOM Conversion Detail,Szczegóły konwersji jednostki miary
 DocType: Program,Program Abbreviation,Skrót programu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Produkcja Zamówienie nie może zostać podniesiona przed Szablon Element
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Produkcja Zamówienie nie może zostać podniesiona przed Szablon Element
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Opłaty są aktualizowane w ZAKUPU każdej pozycji
 DocType: Warranty Claim,Resolved By,Rozstrzygnięte przez
 DocType: Bank Guarantee,Start Date,Data startu
@@ -4640,27 +4727,28 @@
 DocType: Employee,Educational Qualification,Kwalifikacje edukacyjne
 DocType: Workstation,Operating Costs,Koszty operacyjne
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Działanie w przypadku nagromadzonych miesięcznego budżetu Przekroczono
-DocType: Purchase Invoice,Submit on creation,Prześlij na tworzeniu
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Waluta dla {0} musi być {1}
+DocType: Subscription,Submit on creation,Prześlij na tworzeniu
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Waluta dla {0} musi być {1}
 DocType: Asset,Disposal Date,Utylizacja Data
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Emaile zostaną wysłane do wszystkich aktywnych pracowników Spółki w danej godzinie, jeśli nie mają wakacji. Streszczenie odpowiedzi będą wysyłane na północy."
 DocType: Employee Leave Approver,Employee Leave Approver,Zgoda na zwolnienie dla pracownika
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},"Wiersz {0}: Zapis ponownego zamawiania dla tego magazynu, {1}"
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.",Nie można zadeklarować jako zagubiony z powodu utworzenia kwotacji
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Szkolenie Zgłoszenie
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},"Wiersz {0}: Zapis ponownego zamawiania dla tego magazynu, {1}"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.",Nie można zadeklarować jako zagubiony z powodu utworzenia kwotacji
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Szkolenie Zgłoszenie
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Zamówienie Produkcji {0} musi być zgłoszone
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Kryteria oceny dostawcy Dostawcy
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Wybierz Datę Startu i Zakończenia dla elementu {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Kurs jest obowiązkowy w wierszu {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,"""Do daty"" nie może być terminem przed ""od daty"""
 DocType: Supplier Quotation Item,Prevdoc DocType,Typ dokumentu dla poprzedniego dokumentu
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Dodaj / Edytuj ceny
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Dodaj / Edytuj ceny
 DocType: Batch,Parent Batch,Nadrzędna partia
 DocType: Batch,Parent Batch,Nadrzędna partia
 DocType: Cheque Print Template,Cheque Print Template,Czek Szablon Drukuj
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Struktura kosztów (MPK)
 DocType: Lab Test Template,Sample Collection,Kolekcja Próbek
 ,Requested Items To Be Ordered,Proszę o Zamówienie Przedmiotów
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Moje Zamówienia
 DocType: Price List,Price List Name,Nazwa cennika
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Dziennie Podsumowanie Praca dla {0}
 DocType: Employee Loan,Totals,Sumy całkowite
@@ -4679,12 +4767,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} jednostki {1} potrzebne w {2} na {3} {4} {5} w celu zrealizowania tej transakcji.
 DocType: Fee Schedule,Student Category,Student Kategoria
 DocType: Announcement,Student,Student
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Szef departamentu organizacji
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Szef departamentu organizacji
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Idź do Pokoje
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Proszę wpisać wiadomość przed wysłaniem
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,SKLEP DO DOSTAWCY
 DocType: Email Digest,Pending Quotations,W oczekiwaniu Notowania
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Point-of-Sale profil
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Point-of-Sale profil
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Konfiguracje testów laboratoryjnych.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Pożyczki bez pokrycia
 DocType: Cost Center,Cost Center Name,Nazwa Centrum Kosztów
@@ -4694,6 +4782,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Łączna wypłacona Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Wiadomości dłuższe niż 160 znaków zostaną podzielone na kilka wiadomości
 DocType: Purchase Receipt Item,Received and Accepted,Otrzymano i zaakceptowano
+DocType: Hub Settings,Company and Seller Profile,Firma i profil sprzedawcy
 ,GST Itemised Sales Register,Wykaz numerów sprzedaży produktów GST
 ,Serial No Service Contract Expiry,Umowa serwisowa o nr seryjnym wygasa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Nie można wykonywać zapisów po stronie debetowej oraz kredytowej tego samego konta w jednym czasie
@@ -4703,10 +4792,11 @@
 DocType: Item,Variant Based On,Wariant na podstawie
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Całkowita przypisana waga powinna wynosić 100%. Jest {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Twoi Dostawcy
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Proszę poprawić
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Nie można ustawić jako Utracone Zamówienia Sprzedaży
 DocType: Request for Quotation Item,Supplier Part No,Dostawca Część nr
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nie można odliczyć, gdy kategoria jest dla &#39;Wycena&#39; lub &#39;Vaulation i Total&#39;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Otrzymane od
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Otrzymane od
 DocType: Lead,Converted,Przekształcono
 DocType: Item,Has Serial No,Posiada numer seryjny
 DocType: Employee,Date of Issue,Data wydania
@@ -4714,7 +4804,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Zgodnie z ustawieniami zakupów, jeśli wymagany jest zakup recieptu == &#39;YES&#39;, to w celu utworzenia faktury zakupu użytkownik musi najpierw utworzyć pokwitowanie zakupu dla elementu {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Wiersz # {0}: Ustaw Dostawca dla pozycji {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Wiersz {0}: Godziny wartość musi być większa od zera.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Strona Obraz {0} dołączone do pozycji {1} nie można znaleźć
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Strona Obraz {0} dołączone do pozycji {1} nie można znaleźć
 DocType: Issue,Content Type,Typ zawartości
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Komputer
 DocType: Item,List this Item in multiple groups on the website.,Pokaż ten produkt w wielu grupach na stronie internetowej.
@@ -4725,14 +4815,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Pobierz Wpisy nieuzgodnione
 DocType: Payment Reconciliation,From Invoice Date,Od daty faktury
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Nie masz zgody na złożenie
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,Walutą Rozliczenia musi być równa lub rachunku walutowego waluty dowolnej ze stron domyślnego comapany za
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Walutą Rozliczenia musi być równa lub rachunku walutowego waluty dowolnej ze stron domyślnego comapany za
 DocType: Healthcare Settings,Laboratory Settings,Ustawienia laboratoryjne
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Zostawić Inkaso
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Czym się zajmuje?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Do magazynu
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Wszystkie Przyjęć studenckie
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Czym się zajmuje?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Do magazynu
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Wszystkie Przyjęć studenckie
 ,Average Commission Rate,Średnia prowizja
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,Numer seryjny nie jest dostępny dla pozycji niemagazynowych
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,Numer seryjny nie jest dostępny dla pozycji niemagazynowych
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Wybierz Status
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Obecność nie może być oznaczana na przyszłość
 DocType: Pricing Rule,Pricing Rule Help,Wycena Zasada Pomoc
@@ -4750,41 +4840,41 @@
 DocType: Item,Customer Code,Kod Klienta
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Przypomnienie o Urodzinach dla {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dni od ostatniego zamówienia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Debetowane konto musi być kontem bilansowym
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Debetowane konto musi być kontem bilansowym
 DocType: Buying Settings,Naming Series,Seria nazw
 DocType: Leave Block List,Leave Block List Name,Opuść Zablokowaną Listę Nazw
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Data rozpoczęcia ubezpieczenia powinna być mniejsza niż data zakończenia ubezpieczenia
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Proszę ustawić System Nauczania Instruktora w Szkole&gt; Ustawienia szkoły
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Kapitał zasobów
 DocType: Timesheet,Production Detail,Szczegóły produkcji
+DocType: Restaurant,Active Menu,Aktywne menu
 DocType: Target Detail,Target Qty,Ilość docelowa
 DocType: Shopping Cart Settings,Checkout Settings,Zamówienie Ustawienia
 DocType: Attendance,Present,Obecny
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Dowód dostawy {0} nie może być wysłany
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Dowód dostawy {0} nie może być wysłany
 DocType: Notification Control,Sales Invoice Message,Wiadomość Faktury Sprzedaży
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Zamknięcie konta {0} musi być typu odpowiedzialności / Equity
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Slip Wynagrodzenie pracownika {0} już stworzony dla arkusza czasu {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Slip Wynagrodzenie pracownika {0} już stworzony dla arkusza czasu {1}
 DocType: Vehicle Log,Odometer,Drogomierz
 DocType: Sales Order Item,Ordered Qty,Ilość Zamówiona
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Element {0} jest wyłączony
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Element {0} jest wyłączony
 DocType: Stock Settings,Stock Frozen Upto,Zamroź zapasy do
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM nie zawiera żadnego elementu akcji
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Czynność / zadanie projektu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM nie zawiera żadnego elementu akcji
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Czynność / zadanie projektu
 DocType: Vehicle Log,Refuelling Details,Szczegóły tankowania
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Utwórz Paski Wypłaty
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Zakup musi być sprawdzona, jeśli dotyczy wybrano jako {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Zniżka musi wynosić mniej niż 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Ostatni kurs kupna nie został znaleziony
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Kwota Odpisu (Waluta Firmy)
 DocType: Sales Invoice Timesheet,Billing Hours,Godziny billingowe
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,Domyślnie BOM dla {0} Nie znaleziono
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Wiersz # {0}: Proszę ustawić ilość zmienić kolejność
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Domyślnie BOM dla {0} Nie znaleziono
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Wiersz # {0}: Proszę ustawić ilość zmienić kolejność
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,"Dotknij elementów, aby je dodać tutaj"
 DocType: Fees,Program Enrollment,Rejestracja w programie
 DocType: Landed Cost Voucher,Landed Cost Voucher,Koszt kuponu
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Ustaw {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Powtórz w Dniu Miesiąca
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} to nieaktywny student
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} to nieaktywny student
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} to nieaktywny student
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} to nieaktywny student
 DocType: Employee,Health Details,Szczegóły Zdrowia
 DocType: Offer Letter,Offer Letter Terms,Oferta Letter Warunki
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,"Aby utworzyć dokument referencyjny żądania zapłaty, wymagane jest"
@@ -4793,7 +4883,6 @@
 DocType: Employee External Work History,Salary,Wynagrodzenia
 DocType: Serial No,Delivery Document Type,Typ dokumentu dostawy
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Zatwierdź Paski Wypłaty dla wskazanych wyżej kryteriów.
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} elementów zostało zsynchronizowane
 DocType: Sales Order,Partly Delivered,Częściowo Dostarczono
 DocType: Email Digest,Receivables,Należności
 DocType: Lead Source,Lead Source,
@@ -4815,9 +4904,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Starzenie Zakres 2
 DocType: SG Creation Tool Course,Max Strength,Maksymalna siła
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Wybierz pozycje w oparciu o datę dostarczenia
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Wybierz pozycje w oparciu o datę dostarczenia
 ,Sales Analytics,Analityka sprzedaży
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Dostępne {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Dostępne {0}
 ,Prospects Engaged But Not Converted,"Perspektywy zaręczone, ale nie przekształcone"
 ,Prospects Engaged But Not Converted,"Perspektywy zaręczone, ale nie przekształcone"
 DocType: Manufacturing Settings,Manufacturing Settings,Ustawienia produkcyjne
@@ -4825,10 +4914,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Komórka Nie
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Proszę dodać domyślną walutę w Głównych Ustawieniach Firmy
 DocType: Stock Entry Detail,Stock Entry Detail,Szczególy zapisu magazynowego
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Codzienne Przypomnienia
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Codzienne Przypomnienia
 DocType: Products Settings,Home Page is Products,Strona internetowa firmy jest produktem
 ,Asset Depreciation Ledger,Księga amortyzacji
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Konflikty przepisu podatkowego z {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Konflikty przepisu podatkowego z {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nowa nazwa konta
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Koszt dostarczonych surowców
 DocType: Selling Settings,Settings for Selling Module,Ustawienia modułu sprzedaży
@@ -4842,8 +4931,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Item {0} musi być dostępna w magazynie
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Domyślnie Work In Progress Warehouse
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Domyślne ustawienia dla transakcji księgowych
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Proszę ustawić system nazewnictwa pracownika w dziale Zasoby ludzkie&gt; Ustawienia HR
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Spodziewana data nie może być wcześniejsza od daty prośby o materiał
+DocType: Restaurant,Default Tax Template,Domyślny szablon podatkowy
 DocType: Fees,Student Details,Szczegóły Uczniów
 DocType: Purchase Invoice Item,Stock Qty,Ilość zapasów
 DocType: Purchase Invoice Item,Stock Qty,Ilość zapasów
@@ -4851,7 +4941,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Błąd: Nie ważne id?
 DocType: Naming Series,Update Series Number,Zaktualizuj Numer Serii
 DocType: Account,Equity,Kapitał własny
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +78,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;zysków i strat&quot; typ konta {2} niedozwolone w otwór wejściowy
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +78,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,"{0} {1}: konto ""zysków i strat"" {2} jest niedozwolone w otwierającym wejściu"
 DocType: Sales Order,Printing Details,Szczegóły Wydruku
 DocType: Task,Closing Date,Data zamknięcia
 DocType: Sales Order Item,Produced Quantity,Wyprodukowana ilość
@@ -4862,8 +4952,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Przejdź do elementów
 DocType: Sales Partner,Partner Type,Typ Partnera
 DocType: Purchase Taxes and Charges,Actual,Właściwy
+DocType: Restaurant Menu,Restaurant Manager,Menadżer restauracji
 DocType: Authorization Rule,Customerwise Discount,Zniżka dla klienta
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Grafiku zadań.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Grafiku zadań.
 DocType: Purchase Invoice,Against Expense Account,Konto wydatków
 DocType: Production Order,Production Order,Zamówinie produkcji
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Notka instalacyjna {0} została już dodana
@@ -4871,7 +4962,6 @@
 DocType: Quotation Item,Against Docname,
 DocType: SMS Center,All Employee (Active),Wszyscy pracownicy (aktywni)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Zobacz teraz
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Wybierz okres kiedy faktury będą generowane automatycznie
 DocType: BOM,Raw Material Cost,Koszt surowców
 DocType: Item Reorder,Re-Order Level,Próg ponowienia zamówienia
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Wpisz nazwy przedmiotów i planowaną ilość dla której chcesz zwiększyć produkcję zamówień lub ściągnąć surowe elementy dla analizy.
@@ -4884,24 +4974,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Typ raportu jest wymagany
 DocType: Item,Serial Number Series,Seria nr seryjnego
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Magazyn jest obowiązkowy dla Przedmiotu {0} w rzędzie {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Dodaj programy
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Hurt i Detal
 DocType: Issue,First Responded On,Data pierwszej odpowiedzi
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Krzyż Notowania pozycji w wielu grupach
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Rok obrotowy Data rozpoczęcia i Data zakończenia roku obrotowego są już ustawione w roku podatkowym {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Rozliczenie Data aktualizacji
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Podział partii
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Podział partii
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Podział partii
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Podział partii
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Pomyślnie uzgodnione
 DocType: Request for Quotation Supplier,Download PDF,Pobierz PDF
 DocType: Production Order,Planned End Date,Planowana data zakończenia
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Wprowadź datę harmonogramu
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Gdzie produkty są przechowywane.
 DocType: Request for Quotation,Supplier Detail,Dostawca Szczegóły
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Błąd wzoru lub stanu {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Błąd wzoru lub stanu {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Kwota zafakturowana
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kryteria wag muszą dodać do 100%
 DocType: Attendance,Attendance,Obecność
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,produkty seryjne
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,produkty seryjne
 DocType: BOM,Materials,Materiały
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Jeśli nie jest zaznaczone, lista będzie musiała być dodana do każdego działu, w którym ma zostać zastosowany."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Źródło i Cel Magazyn nie może być taki sam
@@ -4919,6 +5009,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,Na podstawie Kwoty Netto
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Wartość atrybutu {0} musi mieścić się w przedziale {1} z {2} w przyrostach {3} {4} Przedmiot
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Cel dla magazynu w wierszu {0} musi być taki sam jak produkcja na zamówienie
+DocType: Restaurant Reservation,Waitlisted,Waitlisted
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Waluta nie może być zmieniony po dokonaniu wpisów używając innej walucie
 DocType: Vehicle Service,Clutch Plate,sprzęgło
 DocType: Company,Round Off Account,Konto kwot zaokrągleń
@@ -4935,7 +5026,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nazwa nowej osoby Sprzedaży
 DocType: Packing Slip,Gross Weight UOM,Waga brutto Jednostka miary
 DocType: Delivery Note Item,Against Sales Invoice,Na podstawie faktury sprzedaży
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Wprowadź numery seryjne dla kolejnego elementu
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Wprowadź numery seryjne dla kolejnego elementu
 DocType: Bin,Reserved Qty for Production,Reserved Ilość Produkcji
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Opuść zaznaczenie, jeśli nie chcesz rozważyć partii przy jednoczesnym tworzeniu grup kursów."
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Opuść zaznaczenie, jeśli nie chcesz rozważyć partii przy jednoczesnym tworzeniu grup kursów."
@@ -4947,7 +5038,7 @@
 DocType: Lab Test,Test Group,Grupa testowa
 DocType: Payment Reconciliation,Receivable / Payable Account,Konto Należności / Zobowiązań
 DocType: Delivery Note Item,Against Sales Order Item,Na podstawie pozycji zamówienia sprzedaży
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Proszę podać wartość atrybutu dla atrybutu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Proszę podać wartość atrybutu dla atrybutu {0}
 DocType: Item,Default Warehouse,Domyślny magazyn
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budżet nie może być przypisany do rachunku grupy {0}
 DocType: Healthcare Settings,Patient Registration,Rejestracja pacjenta
@@ -4977,6 +5068,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Sprzedawca
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Budżet i MPK
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Wielokrotny domyślny tryb płatności nie jest dozwolony
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,dla
 ,Appointment Analytics,Analytics analityków
 DocType: Vehicle Service,Half Yearly,Pół Roku
 DocType: Lead,Blog Subscriber,Subskrybent Bloga
@@ -4996,7 +5088,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Quot Count
 ,BOM Stock Report,BOM Zdjęcie Zgłoś
 DocType: Stock Reconciliation Item,Quantity Difference,Ilość Różnica
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Tworzenie listy płac
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Tworzenie listy płac
 DocType: Opportunity Item,Basic Rate,Podstawowy wskaźnik
 DocType: GL Entry,Credit Amount,Kwota kredytu
 DocType: Cheque Print Template,Signatory Position,Sygnatariusz Pozycja
@@ -5010,12 +5102,12 @@
 DocType: Tax Rule,Tax Rule,Reguła podatkowa
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Utrzymanie tej samej stawki przez cały cykl sprzedaży
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Zaplanuj dzienniki poza godzinami Pracy Workstation.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Klienci w kolejce
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} nie ma harmonogramu lekarskiego. Dodaj go do lekarza lekarza
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Klienci w kolejce
 DocType: Student,Nationality,Narodowość
 ,Items To Be Requested,
-DocType: Purchase Order,Get Last Purchase Rate,Uzyskaj stawkę z ostatniego zakupu
 DocType: Company,Company Info,Informacje o firmie
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Wybierz lub dodaj nowego klienta
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Wybierz lub dodaj nowego klienta
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,centrum kosztów jest zobowiązany do zwrotu kosztów rezerwacji
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aktywa
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Jest to oparte na obecności pracownika
@@ -5023,6 +5115,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Konto debetowe
 DocType: Fiscal Year,Year Start Date,Data początku roku
 DocType: Attendance,Employee Name,Nazwisko pracownika
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restauracja Order Entry Pozycja
 DocType: Sales Invoice,Rounded Total (Company Currency),Końcowa zaokrąglona kwota (waluta firmy)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Nie można konwertowanie do grupy, ponieważ jest wybrany rodzaj konta."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} został zmodyfikowany. Proszę odświeżyć.
@@ -5033,6 +5126,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Świadczenia pracownicze
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Wartość spakowana musi równać się ilości dla przedmiotu {0} w rzędzie {1}
 DocType: Production Order,Manufactured Qty,Ilość wyprodukowanych
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Utworzono fakturę
 DocType: Purchase Receipt Item,Accepted Quantity,Przyjęta Ilość
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Proszę ustawić domyślnej listy wypoczynkowe dla pracowników {0} lub {1} firmy
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} nie istnieje
@@ -5042,18 +5136,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Wiersz nr {0}: Kwota nie może być większa niż oczekiwaniu Kwota wobec Kosztów zastrzeżenia {1}. W oczekiwaniu Kwota jest {2}
 DocType: Maintenance Schedule,Schedule,Harmonogram
 DocType: Account,Parent Account,Nadrzędne konto
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Dostępny
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Dostępny
 DocType: Quality Inspection Reading,Reading 3,Odczyt 3
 ,Hub,Piasta
 DocType: GL Entry,Voucher Type,Typ Podstawy
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Cennik nie został znaleziony lub wyłączone
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Cennik nie został znaleziony lub wyłączone
 DocType: Lab Test,Approved,Zatwierdzono
 DocType: Pricing Rule,Price,Cena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',pracownik zwalnia się na {0} musi być ustawiony jako 'opuścił'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',pracownik zwalnia się na {0} musi być ustawiony jako 'opuścił'
+DocType: Hub Settings,Last Sync On,Ostatnia synchronizacja
 DocType: Guardian,Guardian,Opiekun
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Ocena {0} utworzona dla Pracownika {1} w datach od-do
 DocType: Employee,Education,Edukacja
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,Del
 DocType: Selling Settings,Campaign Naming By,Nazwa Kampanii Przez
 DocType: Employee,Current Address Is,Obecny adres to
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Miesięczny cel sprzedaży (
@@ -5068,7 +5163,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Kod kursu:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Wprowadź konto Wydatków
 DocType: Account,Stock,Magazyn
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Wiersz # {0}: Reference Document Type musi być jednym z Zamówieniem, faktura zakupu lub Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Wiersz # {0}: Reference Document Type musi być jednym z Zamówieniem, faktura zakupu lub Journal Entry"
 DocType: Employee,Current Address,Obecny adres
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Jeśli pozycja jest wariant innego elementu, a następnie opis, zdjęcia, ceny, podatki itp zostanie ustalony z szablonu, o ile nie określono wyraźnie"
 DocType: Serial No,Purchase / Manufacture Details,Szczegóły Zakupu / Produkcji
@@ -5099,7 +5194,7 @@
 DocType: Hub Settings,Hub Settings,Ustawienia Hub
 DocType: Project,Gross Margin %,Marża brutto %
 DocType: BOM,With Operations,Wraz z działaniami
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Zapisy księgowe zostały już dokonane w walucie {0} dla firmy {1}. Proszę wybrać należności lub zobowiązania konto w walucie {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Zapisy księgowe zostały już dokonane w walucie {0} dla firmy {1}. Proszę wybrać należności lub zobowiązania konto w walucie {0}.
 DocType: Asset,Is Existing Asset,Czy istniejącego środka trwałego
 DocType: Salary Detail,Statistical Component,Składnik statystyczny
 DocType: Salary Detail,Statistical Component,Składnik statystyczny
@@ -5108,13 +5203,14 @@
 DocType: BOM Operation,BOM Operation,
 DocType: Purchase Taxes and Charges,On Previous Row Amount,
 DocType: Student,Home Address,Adres domowy
+DocType: Item,Has Expiry Date,Ma datę wygaśnięcia
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Ustawienia wariantu pozycji.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Przeniesienie aktywów
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,Przeniesienie aktywów
 DocType: POS Profile,POS Profile,POS profilu
 DocType: Training Event,Event Name,Nazwa wydarzenia
 DocType: Physician,Phone (Office),Telefon (Biuro)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,Wstęp
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Rekrutacja dla {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,Wstęp
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Rekrutacja dla {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Sezonowość ustalania budżetów, cele itd."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Nazwa zmiennej
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Element {0} jest szablon, należy wybrać jedną z jego odmian"
@@ -5123,7 +5219,7 @@
 DocType: Assessment Plan,Room,Pokój
 DocType: Purchase Order,Advance Paid,Zaliczka
 DocType: Item,Item Tax,Podatek dla tej pozycji
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Materiał do Dostawcy
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Materiał do Dostawcy
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Akcyza Faktura
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Próg {0}% występuje więcej niż jeden raz
 DocType: Expense Claim,Employees Email Id,Email ID pracownika
@@ -5134,32 +5230,30 @@
 DocType: Program,Program Name,Nazwa programu
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Rozwać Podatek albo Opłatę za
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Rzeczywista Ilość jest obowiązkowa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} aktualnie posiada pozycję {1} Scorecard dostawcy, a zlecenia kupna dostawcy powinny być wydawane z ostrożnością."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} aktualnie posiada pozycję {1} Karty wyników dostawcy, a zlecenia kupna dostawcy powinny być wydawane z ostrożnością."
 DocType: Employee Loan,Loan Type,Rodzaj kredytu
 DocType: Scheduling Tool,Scheduling Tool,Narzędzie Scheduling
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,
 DocType: BOM,Item to be manufactured or repacked,"Produkt, który ma zostać wyprodukowany lub przepakowany"
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Domyślne ustawienia dla transakcji asortymentu
-DocType: Purchase Invoice,Next Date,Następna Data
 DocType: Employee Education,Major/Optional Subjects,Główne/Opcjonalne Tematy
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
+DocType: Hub Settings,Suspended,Zawieszony
 DocType: Training Event,Attendees,Uczestnicy
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",
 DocType: Academic Term,Term End Date,Term Data zakończenia
-DocType: Hub Settings,Seller Name,Sprzedawca Nazwa
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Podatki i opłaty potrącone (Firmowe)
 DocType: Item Group,General Settings,Ustawienia ogólne
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Od Waluty i Do Waluty nie mogą być te same
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Dodaj instruktorów
 DocType: Stock Entry,Repack,Przepakowanie
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Zapisz formularz aby kontynuować
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Najpierw wybierz firmę
 DocType: Item Attribute,Numeric Values,Wartości liczbowe
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Załącz Logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Poziom zapasów
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Poziom zapasów
 DocType: Customer,Commission Rate,Wartość prowizji
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Utworzono {0} karty wyników dla {1} między:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Bądź Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Bądź Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Zablokuj wnioski urlopowe według departamentów
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer",Typ płatności musi być jednym z Odbierz Pay and przelew wewnętrzny
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analityka
@@ -5174,11 +5268,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Kapitał zakładowy
 DocType: Shopping Cart Settings,Show Public Attachments,Pokaż załączniki publiczne
 DocType: Packing Slip,Package Weight Details,Informacje o wadze paczki
+DocType: Restaurant Reservation,Reservation Time,Czas rezerwacji
 DocType: Payment Gateway Account,Payment Gateway Account,Płatność konto Brama
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Po dokonaniu płatności przekierować użytkownika do wybranej strony.
 DocType: Company,Existing Company,istniejące firmy
 DocType: Healthcare Settings,Result Emailed,Wynik wysłany pocztą elektroniczną
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","Kategoria podatkowa została zmieniona na &quot;Razem&quot;, ponieważ wszystkie elementy są towarami nieruchoma"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kod towaru&gt; Grupa produktów&gt; Marka
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Proszę wybrać plik .csv
 DocType: Student Leave Application,Mark as Present,Oznacz jako Present
 DocType: Supplier Scorecard,Indicator Color,Kolor wskaźnika
@@ -5203,11 +5299,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Bądź Batch Studenta
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Weź produkty z zestawienia materiałowego
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Weź produkty z zestawienia materiałowego
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Czas realizacji (dni)
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Wiersz # {0}: Data księgowania musi być taka sama jak data zakupu {1} z {2} aktywów
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Sprawdź, czy Student mieszka w Hostelu Instytutu."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Proszę podać zleceń sprzedaży w powyższej tabeli
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Proszę podać zleceń sprzedaży w powyższej tabeli
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Krótkometrażowy Zarobki Poślizgnięcia
 ,Stock Summary,Podsumowanie Zdjęcie
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Przeniesienie aktywów z jednego magazynu do drugiego
@@ -5223,5 +5319,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Wiersz {0}: Debit wpis nie może być związana z {1}
 DocType: Journal Entry,Subscription Section,Sekcja subskrypcji
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Konto {0} nie istnieje
+DocType: Training Event,Training Program,Program treningowy
 DocType: Account,Cash,Gotówka
 DocType: Employee,Short biography for website and other publications.,Krótka notka na stronę i do innych publikacji
diff --git a/erpnext/translations/ps.csv b/erpnext/translations/ps.csv
index f863793..a241c75 100644
--- a/erpnext/translations/ps.csv
+++ b/erpnext/translations/ps.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,معاش په اکر کې
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,راجستر
 DocType: Patient,Divorced,طلاق
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,توکي لا دفارسی
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,اجازه د قالب چې په یوه معامله څو ځله زياته شي
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,د موادو {0} سفر مخکې له دې ګرنټی ادعا بندول لغوه کړه
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,د استهلاکي تولیداتو
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,تصویبونکي ووځي
 DocType: Sales Partner,Dealer,مشتری
 DocType: Consultation,Investigations,تحقیقات
+DocType: Restaurant Order Entry,Click Enter To Add,د اضافو لپاره داخل کړه ټک وکړئ
 DocType: Employee,Rented,د کشت
 DocType: Purchase Order,PO-,تبديليږي
 DocType: POS Profile,Applicable for User,د کارن د تطبيق وړ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",ودرول تولید نظم نه لغوه شي کولای، نو دا د لومړي Unstop لغوه
 DocType: Vehicle Service,Mileage,ګټه
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,آيا تاسو په رښتيا غواړئ چې دا شتمني راټولوي؟
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,آيا تاسو په رښتيا غواړئ چې دا شتمني راټولوي؟
 DocType: Drug Prescription,Update Schedule,د مهال ویش تازه کول
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,انتخاب Default عرضه
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},د اسعارو د بیې په لېست کې د اړتیا {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,د لاسرسي کتنه
 DocType: Job Applicant,Job Applicant,دنده متقاضي
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,دا په دې عرضه په وړاندې د معاملو پر بنسټ. د تفصیلاتو لپاره په لاندی مهال ویش وګورئ
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,نه زيات د پايلو.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,د حقوقي
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},واقعي ډول د ماليې په قطار د قالب بیه نه وي شامل شي کولای {0}
 DocType: Bank Guarantee,Customer,پيرودونکو
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),د بدلولو نرخ باید په توګه ورته وي {0} د {1} ({2})
 DocType: Sales Invoice,Customer Name,پیریدونکي نوم
 DocType: Vehicle,Natural Gas,طبیعی ګاز
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},بانکي حساب په توګه نه ونومول شي کولای {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},بانکي حساب په توګه نه ونومول شي کولای {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,سرونه (یا ډلو) په وړاندې چې د محاسبې توکي دي او انډول وساتل شي.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),بيالنس د {0} کولای شي او نه د صفر څخه کم ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,د پروسې لپاره د معاشونو نشتوالی شتون نلري.
 DocType: Manufacturing Settings,Default 10 mins,افتراضي 10 دقیقه
 DocType: Leave Type,Leave Type Name,پريږدئ ډول نوم
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,وښایاست خلاص
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,دا اړینه ده چې دا عمل خپل ځان ته د پورته ذکر شوي تکرار لپاره ونیسو
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,لړۍ Updated په بریالیتوب
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,بشپړ ی وګوره
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural ژورنال انفاذ ته وسپارل
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,د اخستلو امر توکي ترلاسه شي
 DocType: SMS Center,All Supplier Contact,ټول عرضه سره اړيکي
 DocType: Support Settings,Support Settings,د ملاتړ امستنې
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,د تمی د پای نیټه نه شي کولای په پرتله د تمی د پیل نیټه کمه وي
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,د تمی د پای نیټه نه شي کولای په پرتله د تمی د پیل نیټه کمه وي
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,د کتارونو تر # {0}: کچه باید په توګه ورته وي {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,نوي اجازه کاریال
 ,Batch Item Expiry Status,دسته شمیره د پای حالت
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,بانک مسوده
 DocType: Mode of Payment Account,Mode of Payment Account,د تادیاتو حساب اکر
 DocType: Consultation,Consultation,مشورې
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,خرڅلاو او راستنیدنه
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,انکړپټه ښودل تانبه
 DocType: Academic Term,Academic Term,علمي مهاله
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,د مادي
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,روغتیایی پاملرنه
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),د ځنډ په پیسو (ورځې)
 DocType: Lab Prescription,Lab Prescription,د لابراتوار نسخه
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,د قیمت په اساس ترتیب کړئ
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,خدمتونو د اخراجاتو
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},مسلسله شمېره: {0} د مخکې نه په خرڅلاو صورتحساب ماخذ: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,صورتحساب
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},مسلسله شمېره: {0} د مخکې نه په خرڅلاو صورتحساب ماخذ: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,صورتحساب
 DocType: Maintenance Schedule Item,Periodicity,Periodicity
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,مالي کال د {0} ته اړتیا لیدل کیږي
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,د دفاع
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,د کتارونو تر # {0}:
 DocType: Timesheet,Total Costing Amount,Total لګښت مقدار
 DocType: Delivery Note,Vehicle No,موټر نه
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,مهرباني غوره بیې لېست
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,مهرباني غوره بیې لېست
 DocType: Accounts Settings,Currency Exchange Settings,د بدلولو تبادله
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,د کتارونو تر # {0}: د تادیاتو سند ته اړتيا ده چې د trasaction بشپړ
 DocType: Production Order Operation,Work In Progress,کار په جریان کښی
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,مهرباني غوره نیټه
 DocType: Employee,Holiday List,رخصتي بشپړفهرست
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,مهرباني وکړئ په ښوونځي کې د ښوونکي د نومونې سیسټم جوړ کړئ&gt; د ښوونځي ترتیبات
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,محاسب
+DocType: Hub Settings,Selling Price List,د نرخ پلور لیست
 DocType: Patient,Tobacco Current Use,تمباکو اوسنی کارول
 DocType: Cost Center,Stock User,دحمل کارن
 DocType: Company,Phone No,تيليفون نه
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,کورس ویش جوړ:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},نوي {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},نوي {0}: # {1}
 ,Sales Partners Commission,خرڅلاو همکاران کمیسیون
 DocType: Purchase Invoice,Rounding Adjustment,د سمون تکرار
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,اختصاري نه شي کولای 5 څخه زیات وي
@@ -124,7 +127,6 @@
 DocType: Packed Item,Parent Detail docname,Parent تفصیلي docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",ماخذ: {0}، شمیره کوډ: {1} او پيرودونکو: {2}
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,کيلوګرام
-DocType: Student Log,Log,يادښت
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,د دنده پرانيستل.
 DocType: Item Attribute,Increment,بهرمن
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,د وخت موده
@@ -134,7 +136,7 @@
 DocType: Patient,Married,واده
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},لپاره نه اجازه {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,له توکي ترلاسه کړئ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},دحمل د سپارنې يادونه په وړاندې د تازه نه شي {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},دحمل د سپارنې يادونه په وړاندې د تازه نه شي {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},د محصول د {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,هیڅ توکي لست
 DocType: Payment Reconciliation,Reconcile,پخلا
@@ -144,29 +146,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,د تقاعد د بسپنو
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,بل د استهالک نېټه مخکې رانيول نېټه نه شي
 DocType: Consultation,Consultation Date,د مشورې نیټه
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,د محصول لیست او د ERPNext کاروونکو لپاره پلټنه
 DocType: SMS Center,All Sales Person,ټول خرڅلاو شخص
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** میاشتنی ویش ** تاسو سره مرسته کوي که تاسو د خپل کاروبار د موسمي لري د بودجې د / د هدف په ټول مياشتو وویشي.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,نه توکي موندل
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,معاش جوړښت ورک
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,نه توکي موندل
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,معاش جوړښت ورک
 DocType: Lead,Person Name,کس نوم
 DocType: Sales Invoice Item,Sales Invoice Item,خرڅلاو صورتحساب د قالب
 DocType: Account,Credit,د اعتبار
 DocType: POS Profile,Write Off Cost Center,ولیکئ پړاو لګښت مرکز
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",د بيلګې په توګه: &quot;لومړنی ښوونځی&quot; یا &quot;پوهنتون&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",د بيلګې په توګه: &quot;لومړنی ښوونځی&quot; یا &quot;پوهنتون&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,دحمل راپورونه
 DocType: Warehouse,Warehouse Detail,ګدام تفصیلي
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},پورونو د حد لپاره د مشتريانو د اوښتي دي {0} د {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,د دورې د پای نیټه نه وروسته د کال د پای د تعليمي کال د نېټه چې د اصطلاح ده سره تړاو لري په پرتله وي (تعليمي کال د {}). لطفا د خرما د اصلاح او بیا کوښښ وکړه.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",&quot;آیا ثابته شتمني&quot; کولای وناکتل نه وي، ځکه چې د توکي په وړاندې د شتمنیو د ثبت شتون لري
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",&quot;آیا ثابته شتمني&quot; کولای وناکتل نه وي، ځکه چې د توکي په وړاندې د شتمنیو د ثبت شتون لري
 DocType: Vehicle Service,Brake Oil,لنت ترمز د تیلو
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,پېرودونکي&gt; پیرودونکي ګروپ&gt; ساحه
 DocType: Tax Rule,Tax Type,د مالياتو ډول
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,د ماليې وړ مقدار
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},تاسو اختيار نه لري چې مخکې ثبت کرښې زیاتولی او یا تازه {0}
 DocType: BOM,Item Image (if not slideshow),د قالب د انځور (که سلاید نه)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,د پيرودونکو سره په همدې نوم شتون لري
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(قيامت Rate / 60) * د عملیاتو د وخت
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: د حوالې سند ډول باید د لګښتونو یا ژورنال ننوتلو څخه یو وي
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,انتخاب هیښ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: د حوالې سند ډول باید د لګښتونو یا ژورنال ننوتلو څخه یو وي
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,انتخاب هیښ
 DocType: SMS Log,SMS Log,SMS ننوتنه
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,د تحویلوونکی سامان لګښت
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,د {0} د رخصتۍ له تاريخ او د تاريخ تر منځ نه ده
@@ -194,7 +197,7 @@
 DocType: Journal Entry Account,Employee Loan,د کارګر د پور
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,فعالیت ننوتنه:
 DocType: Fee Schedule,Send Payment Request Email,د بریښناليک غوښتن لیک استول
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,{0} د قالب په سيستم شتون نه لري يا وخت تېر شوی دی
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,{0} د قالب په سيستم شتون نه لري يا وخت تېر شوی دی
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,املاک
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,د حساب اعلامیه
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,د درملو د
@@ -209,18 +212,23 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,د وارداتو ننوتنه
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,د ډول د جوړون توکو غوښتنه پر بنسټ د پورته معیارونو پر وباسي
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,په بریالیتوب سره ندی ثبت شوی.
 DocType: Training Result Employee,Grade,ټولګي
+DocType: Restaurant Table,No of Seats,د څوکیو شمیر
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","د متحرک موضوع اضافه کولو لپاره، د جینج ټګګ په څیر کاروئ <div style=""""><pre style=""""> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,تحویلوونکی By عرضه
 DocType: SMS Center,All Contact,ټول سره اړيکي
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,تولید نظم لا سره د هیښ ټول توکي جوړ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,تولید نظم لا سره د هیښ ټول توکي جوړ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,کلنی معاش
 DocType: Daily Work Summary,Daily Work Summary,هره ورځ د کار لنډیز
 DocType: Period Closing Voucher,Closing Fiscal Year,مالي کال تړل
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} د {1} ده کنګل
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,لورينه وکړئ د د حسابونو چارټ جوړولو موجوده شرکت وټاکئ
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} د {1} ده کنګل
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,لورينه وکړئ د د حسابونو چارټ جوړولو موجوده شرکت وټاکئ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,دحمل داخراجاتو
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,وټاکئ هدف ګدام
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,وټاکئ هدف ګدام
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,وټاکئ هدف ګدام
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,وټاکئ هدف ګدام
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,لطفا غوره تماس بريښناليک
 DocType: Program Enrollment,School Bus,د ښوونځي بس
 DocType: Journal Entry,Contra Entry,Contra انفاذ
@@ -237,9 +245,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",دانلود د کينډۍ، د مناسبو معلوماتو د ډکولو او د دوتنه کې ضمیمه کړي. د ټاکل شوې مودې په ټولو نیټې او کارمند ترکیب به په کېنډۍ کې راغلي، د موجوده حاضري سوابق
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,{0} د قالب فعاله نه وي او يا د ژوند د پای ته رسیدلی دی شوی
+DocType: Student Admission Program,Minimum Age,لږ تر لږه عمر
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,بېلګه: د اساسي ریاضیاتو
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",په قطار {0} په قالب کچه د ماليې شامل دي، چې په قطارونو ماليه {1} هم باید شامل شي
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,د بشري حقونو د څانګې ماډل امستنې
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,د بشري حقونو د څانګې ماډل امستنې
 DocType: SMS Center,SMS Center,SMS مرکز
 DocType: Sales Invoice,Change Amount,د بدلون لپاره د مقدار
 DocType: BOM Update Tool,New BOM,نوي هیښ
@@ -249,7 +258,7 @@
 DocType: Lead,Request Type,غوښتنه ډول
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,د کارګر د کمکیانو لپاره
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,broadcasting
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,خونه شامل کړئ
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),د POS د سیٹ اپ طریقه (آنلاین / آف لائن)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,د اجرا
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,د عملیاتو په بشپړه توګه کتل ترسره.
 DocType: Serial No,Maintenance Status,د ساتنې حالت
@@ -272,6 +281,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,د بیې په لېست باید د شځينه يا خرڅول د تطبيق وړ وي
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},نصب او نېټې لپاره د قالب د سپارلو نېټې مخکې نه شي {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),تخفیف پر بیې لېست کچه)٪ (
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,بایو کیمیا
 DocType: Offer Letter,Select Terms and Conditions,منتخب اصطلاحات او شرایط
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,له جملې څخه د ارزښت
 DocType: Production Planning Tool,Sales Orders,خرڅلاو امر
@@ -306,15 +316,15 @@
 DocType: Sales Partner,Reseller,د پلورنې
 DocType: Codification Table,Medical Code,روغتیایی کود
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.",که وکتل، به په مادي غوښتنې غیر سټاک توکي شامل دي.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,مهرباني وکړئ د شرکت ته ننوځي
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,مهرباني وکړئ د شرکت ته ننوځي
 DocType: Delivery Note Item,Against Sales Invoice Item,په وړاندې د خرڅلاو صورتحساب د قالب
 ,Production Orders in Progress,په پرمختګ تولید امر
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,له مالي خالص د نغدو
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save",LocalStorage ډک شي، نه د ژغورلو نه
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save",LocalStorage ډک شي، نه د ژغورلو نه
 DocType: Lead,Address & Contact,پته تماس
 DocType: Leave Allocation,Add unused leaves from previous allocations,د تیرو تخصیص ناکارول پاڼي ورزیات کړئ
 DocType: Sales Partner,Partner website,همکار ویب پاڼه
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Add د قالب
+DocType: Restaurant Order Entry,Add Item,Add د قالب
 DocType: Lab Test,Custom Result,د ګمرکي پایلې
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,تماس نوم
 DocType: Course Assessment Criteria,Course Assessment Criteria,کورس د ارزونې معیارونه
@@ -327,7 +337,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,لپاره د اخیستلو غوښتنه وکړي.
 DocType: Lab Test,Submitted Date,سپارل شوی نیټه
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,دا کار د وخت د سکيچ جوړ د دې پروژې پر وړاندې پر بنسټ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,خالص د معاشونو نه شي کولای 0 څخه کم وي
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,خالص د معاشونو نه شي کولای 0 څخه کم وي
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",د سیسټم څخه د تکرار غلطی خبرتیاوو لیږلو مخه نیولو لپاره، موږ په ګډون کې د معلولینو ساحه وګورئ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,یوازې د ټاکل اجازه Approver دا اجازه او د غوښتنليک وسپاري
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,کرارولو نېټه بايد په پرتله په یوځای کېدو نېټه ډيره وي
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,روان شو هر کال
@@ -336,9 +347,10 @@
 DocType: Email Digest,Profit & Loss,ګټه او زیان
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,ني
 DocType: Task,Total Costing Amount (via Time Sheet),Total لګښت مقدار (د وخت پاڼه له لارې)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,لطفا د زده کونکو د شاګردانو له ډلې څخه فارغ کړئ
 DocType: Item Website Specification,Item Website Specification,د قالب د ځانګړتیاوو وېب پاڼه
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,د وتو بنديز لګېدلی
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},{0} د قالب په خپلو د ژوند پای ته ورسېدئ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},{0} د قالب په خپلو د ژوند پای ته ورسېدئ {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,بانک توکي
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,کلنی
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,دحمل پخلاينې د قالب
@@ -347,7 +359,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,د زده کونکو د ګروپ خلقت اسباب کورس
 DocType: Lead,Do Not Contact,نه د اړيکې
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,هغه خلک چې په خپل سازمان د درس
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,د ټولو تکراري رسیدونه تعقیب بې سارې پېژند. دا کار په وړاندې تولید دی.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,د پوستکالي د پراختیا
 DocType: Item,Minimum Order Qty,لږ تر لږه نظم Qty
 DocType: Pricing Rule,Supplier Type,عرضه ډول
@@ -357,17 +368,19 @@
 DocType: Item,Publish in Hub,په مرکز د خپرېدو
 DocType: Student Admission,Student Admission,د زده کونکو د شاملیدو
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,{0} د قالب دی لغوه
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,د موادو غوښتنه
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,{0} د قالب دی لغوه
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,د موادو غوښتنه
 DocType: Bank Reconciliation,Update Clearance Date,تازه چاڼېزو نېټه
 DocType: Item,Purchase Details,رانيول نورولوله
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},د قالب {0} په خام مواد &#39;جدول په اخستلو امر ونه موندل {1}
 DocType: Patient Relation,Relation,د خپلوي
 DocType: Shipping Rule,Worldwide Shipping,د نړۍ په نقل
 DocType: Patient Relation,Mother,مور
+DocType: Restaurant Reservation,Reservation End Time,د خوندیتوب پای وخت
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,له پېرودونکي تاييد امر.
 DocType: Purchase Receipt Item,Rejected Quantity,رد مقدار
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,د پیسو غوښتنه {0} جوړه شوې
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,د پیسو غوښتنه {0} جوړه شوې
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,لږ حساسیت
 DocType: Notification Control,Notification Control,خبرتیا د کنټرول
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,مهرباني وکړئ یوځل بیا تایید کړئ کله چې تاسو خپل زده کړې بشپړې کړې
 DocType: Lead,Suggestions,وړانديزونه
@@ -387,7 +400,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,د کارکوونکو د برېښناليک معاش ټوټه پر بنسټ د خوښې ایمیل کې د کارګر ټاکل
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,په لست کې د اجازه لومړی Approver به د تلواله اجازه Approver په توګه جوړ شي
 DocType: Tax Rule,Shipping County,انتقال County
-apps/erpnext/erpnext/config/desktop.py +158,Learn,وکړئ
+apps/erpnext/erpnext/config/desktop.py +159,Learn,وکړئ
 DocType: Asset,Next Depreciation Date,بل د استهالک نېټه
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,فعالیت لګښت په سلو کې د کارګر
 DocType: Accounts Settings,Settings for Accounts,لپاره حسابونه امستنې
@@ -398,13 +411,13 @@
 DocType: Item,Synced With Hub,دفارسی د مرکزي
 DocType: Vehicle,Fleet Manager,د بیړیو د مدير
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},د کتارونو تر # {0}: {1} نه شي لپاره توکی منفي وي {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,غلط شفر
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,غلط شفر
 DocType: Item,Variant Of,د variant
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',بشپړ Qty نه شي کولای په پرتله &#39;Qty تولید&#39; وي
 DocType: Period Closing Voucher,Closing Account Head,حساب مشر تړل
 DocType: Employee,External Work History,بهرني کار تاریخ
 DocType: Physician,Time per Appointment,د تقاعد وخت
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,متحدالمال ماخذ کې تېروتنه
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,متحدالمال ماخذ کې تېروتنه
 DocType: Appointment Type,Is Inpatient,په داخل کښی دی
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 نوم
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,په وييکي (صادراتو) به د لیدو وړ وي يو ځل تاسو تسلیمی يادونه وژغوري.
@@ -413,19 +426,18 @@
 DocType: Lead,Industry,صنعت
 DocType: Employee,Job Profile,دنده پېژندنه
 DocType: BOM Item,Rate & Amount,اندازه او مقدار
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,مهرباني وکړئ د سیٹ اپ&gt; شمېره لړۍ له لارې د حاضریدو لړۍ سیسټم
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,دا د دې شرکت په وړاندې د راکړې ورکړې پر بنسټ دی. د جزیاتو لپاره لاندې مهال ویش وګورئ
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,د اتومات د موادو غوښتنه رامنځته کېدو له امله دبرېښنا ليک خبر
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,مقاومت
 DocType: Journal Entry,Multi Currency,څو د اسعارو
 DocType: Payment Reconciliation Invoice,Invoice Type,صورتحساب ډول
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,پېرودونکي&gt; پیرودونکي ګروپ&gt; ساحه
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,د سپارنې پرمهال یادونه
 DocType: Consultation,Encounter Impression,اغیزه اغیزه
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,مالیات ترتیبول
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,د شتمنيو د دلال لګښت
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,د پیسو د داخلولو بدل شوی دی وروسته کش تاسو دا. دا بیا لطفا وباسي.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} په قالب د مالياتو د دوه ځله ننوتل
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,لنډيز دې اوونۍ او په تمه د فعالیتونو لپاره
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} په قالب د مالياتو د دوه ځله ننوتل
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,لنډيز دې اوونۍ او په تمه د فعالیتونو لپاره
 DocType: Student Applicant,Admitted,اعتراف وکړ
 DocType: Workstation,Rent Cost,د کرايې لګښت
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,اندازه د استهالک وروسته
@@ -440,36 +452,35 @@
 DocType: Shipping Rule,Valid for Countries,لپاره د اعتبار وړ هیوادونه
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,دا د قالب يو کينډۍ ده او په معاملو کې نه شي کارېدلی. د قالب صفاتو به د بېرغونو کې کاپي شي، مګر نه کاپي &#39;ټاکل شوې ده
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total نظم نیول کیږی
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",د کارګر ونومول شي (لکه د اجرايي، رييس او داسې نور).
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).",د کارګر ونومول شي (لکه د اجرايي، رييس او داسې نور).
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,په ميزان کي پيرودونکو د اسعارو له دی چې د مشتريانو د اډې اسعارو بدل
 DocType: Course Scheduling Tool,Course Scheduling Tool,کورس اوقات اوزار
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},د کتارونو تر # {0}: رانيول صورتحساب د شته شتمنیو په وړاندې نه شي کولای شي د {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[متوجه] د بیاکتنې لپاره د٪ s لپاره تېروتنه
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[متوجه] د بیاکتنې لپاره د٪ s لپاره تېروتنه
 DocType: Item Tax,Tax Rate,د مالياتو د Rate
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} لپاره د کارګر لا ځانګړې {1} لپاره موده {2} د {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,انتخاب د قالب
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,انتخاب د قالب
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,پیري صورتحساب {0} لا وسپارل
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},د کتارونو تر # {0}: دسته نه باید ورته وي {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,د غیر ګروپ ته واړوئ
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,دسته (ډېر) د یو قالب.
 DocType: C-Form Invoice Detail,Invoice Date,صورتحساب نېټه
 DocType: GL Entry,Debit Amount,ډیبیټ مقدار
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},هلته يوازې کولای شي په هر شرکت 1 حساب وي {0} د {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,مهرباني مل وګورئ
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},هلته يوازې کولای شي په هر شرکت 1 حساب وي {0} د {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,مهرباني مل وګورئ
 DocType: Purchase Order,% Received,٪ د ترلاسه
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,د زده کونکو د ډلو جوړول
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Setup د مخه بشپړ !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Setup د مخه بشپړ !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,اعتبار يادونه مقدار
 DocType: Setup Progress Action,Action Document,د عمل سند
 ,Finished Goods,پای ته سامانونه
 DocType: Delivery Note,Instructions,لارښوونه:
 DocType: Quality Inspection,Inspected By,تفتیش By
 DocType: Maintenance Visit,Maintenance Type,د ساتنې ډول
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} په کورس کې شامل نه {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,د توکو کود&gt; توکي ګروپ&gt; برنامه
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} په کورس کې شامل نه {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},شعبه {0} نه د سپارنې يادونه سره تړاو نه لري {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext قالب
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,سامان ورزیات کړئ
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,سامان ورزیات کړئ
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,د قالب د کیفیت د تفتیش د پاراميټر
 DocType: Leave Application,Leave Approver Name,پريږدئ Approver نوم
 DocType: Depreciation Schedule,Schedule Date,مهال ويش نېټه
@@ -491,7 +502,7 @@
 DocType: Salary Slip Timesheet,Working Hours,کار ساعتونه
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,د پیل / اوسني تسلسل کې د شته لړ شمېر کې بدلون راولي.
 DocType: Dosage Strength,Strength,ځواک
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,یو نوی پيرودونکو جوړول
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,یو نوی پيرودونکو جوړول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",که څو د بیو د اصولو دوام پراخیدل، د کاروونکو څخه پوښتنه کيږي چي د لومړیتوب ټاکل لاسي د شخړې حل کړي.
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,رانيول امر جوړول
 ,Purchase Register,رانيول د نوم ثبتول
@@ -510,7 +521,7 @@
 DocType: Lab Test Template,Single,مجرد
 DocType: Salary Slip,Total Loan Repayment,ټول پور بيرته ورکول
 DocType: Account,Cost of Goods Sold,د اجناسو د لګښت پلورل
-DocType: Purchase Invoice,Yearly,کلنی
+DocType: Subscription,Yearly,کلنی
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,لطفا لګښت مرکز ته ننوځي
 DocType: Drug Prescription,Dosage,ډوډۍ
 DocType: Journal Entry Account,Sales Order,خرڅلاو نظم
@@ -541,7 +552,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,د ټولو د توليد د پروسې Global امستنې.
 DocType: Accounts Settings,Accounts Frozen Upto,جوړوي ګنګل ترمړوندونو پورې
 DocType: SMS Log,Sent On,ته وليږدول د
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,ځانتیا د {0} په صفات جدول څو ځلې غوره
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,ځانتیا د {0} په صفات جدول څو ځلې غوره
 DocType: HR Settings,Employee record is created using selected field. ,د کارګر ریکارډ انتخاب ډګر په کارولو سره جوړ.
 DocType: Sales Order,Not Applicable,کاروړی نه دی
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,د رخصتۍ د بادار.
@@ -566,13 +577,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Total پاڼي تخصيص الزامی دی
 DocType: Patient,AB Positive,AB مثبت دی
 DocType: Job Opening,Description of a Job Opening,د دنده تفصيل پرانیستل
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,د نن په تمه فعالیتونو
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,د نن په تمه فعالیتونو
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,د حاضرۍ ریکارډ.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,د timesheet پر بنسټ د معاشونو د معاش برخه.
 DocType: Sales Order Item,Used for Production Plan,د تولید پلان لپاره کارول کيږي
 DocType: Employee Loan,Total Payment,ټول تاديه
 DocType: Manufacturing Settings,Time Between Operations (in mins),د وخت عملیاتو تر منځ (په دقیقه)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} د {1} ده لغوه نو د عمل نه بشپړ شي
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} د {1} ده لغوه نو د عمل نه بشپړ شي
 DocType: Customer,Buyer of Goods and Services.,د توکو او خدماتو د اخستونکو لپاره.
 DocType: Journal Entry,Accounts Payable,ورکړې وړ حسابونه
 DocType: Patient,Allergies,الندي
@@ -584,23 +595,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,د پیرودونکو لارښوونه وڅېړئ
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,لست د خپل پېرېدونکي يو څو. هغوی کولی شي، سازمانونو یا وګړو.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,بس برخي د جوړولو
+DocType: POS Profile User,POS Profile User,د پی ایس پی پی ایل کارن
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,مستقيم عايداتو
 DocType: Patient Appointment,Date TIme,نیټه او وخت
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",نه په حساب پر بنسټ کولای شي Filter، که د حساب ګروپ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,اداري مامور
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,لطفا کورس انتخاب
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,لطفا کورس انتخاب
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,لطفا کورس انتخاب
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,لطفا کورس انتخاب
 DocType: Codification Table,Codification Table,د کوډیزشن جدول
 DocType: Timesheet Detail,Hrs,بجو
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,مهرباني وکړئ د شرکت وټاکئ
 DocType: Stock Entry Detail,Difference Account,توپير اکانټ
 DocType: Purchase Invoice,Supplier GSTIN,عرضه GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,نږدې دنده په توګه خپل دنده پورې تړلې {0} تړلي نه ده نه شي کولای.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,لطفا د ګدام د کوم لپاره چې د موادو غوښتنه به راپورته شي ننوځي
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,نږدې دنده په توګه خپل دنده پورې تړلې {0} تړلي نه ده نه شي کولای.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,لطفا د ګدام د کوم لپاره چې د موادو غوښتنه به راپورته شي ننوځي
 DocType: Production Order,Additional Operating Cost,اضافي عملياتي لګښت
 DocType: Lab Test Template,Lab Routine,لابراتوار
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,د سينګار
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items",ته لېږدونه، لاندې شتمنۍ باید د دواړو توکي ورته وي
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items",ته لېږدونه، لاندې شتمنۍ باید د دواړو توکي ورته وي
 DocType: Shipping Rule,Net Weight,خالص وزن
 DocType: Employee,Emergency Phone,بيړنۍ تيليفون
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,کشاورزی
@@ -611,7 +623,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,لطفا لپاره قدمه 0٪ ټولګي تعریف
 DocType: Sales Order,To Deliver,ته تحویل
 DocType: Purchase Invoice Item,Item,د قالب
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,سریال نه توکی نه شي کولای یوه برخه وي
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,لوړ حساسیت
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,سریال نه توکی نه شي کولای یوه برخه وي
 DocType: Journal Entry,Difference (Dr - Cr),توپير (ډاکټر - CR)
 DocType: Account,Profit and Loss,ګټه او زیان
 DocType: Patient,Risk Factors,د خطر فکتورونه
@@ -620,7 +633,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,د اداره کولو په ټیکه
 DocType: Vital Signs,Body Temperature,د بدن درجه
 DocType: Project,Project will be accessible on the website to these users,پروژه به د دغو کاروونکو په ویب پاڼه د السرسي وړ وي
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,د پروژې ډول تعریف کړئ.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,د پروژې ډول تعریف کړئ.
 DocType: Supplier Scorecard,Weighting Function,د وزن کولو دنده
 DocType: Physician,OP Consulting Charge,د OP مشاورت چارج
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,خپل جوړ کړئ
@@ -634,7 +647,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,بهرمن نه شي کولای 0 وي
 DocType: Production Planning Tool,Material Requirement,مادي غوښتنې
 DocType: Company,Delete Company Transactions,شرکت معاملې ړنګول
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,ماخذ نه او ماخذ نېټه د بانک د راکړې ورکړې الزامی دی
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,ماخذ نه او ماخذ نېټه د بانک د راکړې ورکړې الزامی دی
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Add / سمول مالیات او په تور
 DocType: Payment Entry Reference,Supplier Invoice No,عرضه صورتحساب نه
 DocType: Territory,For reference,د ماخذ
@@ -642,12 +655,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions",ړنګ نه شي کولای شعبه {0}، لکه څنګه چې په سټاک معاملو کارول
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),تړل د (سي آر)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,سلام
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,خوځول د قالب
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,خوځول د قالب
 DocType: Serial No,Warranty Period (Days),ګرنټی د دورې (ورځې)
 DocType: Installation Note Item,Installation Note Item,نصب او يادونه د قالب
 DocType: Production Plan Item,Pending Qty,تصویبه Qty
 DocType: Budget,Ignore,له پامه
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} د {1} فعاله نه وي
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} د {1} فعاله نه وي
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,د چاپ Setup چک ابعادو
 DocType: Salary Slip,Salary Slip Timesheet,معاش ټوټه Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,عرضه ګدام د فرعي قرارداد رانيول رسيد اجباري
@@ -656,7 +669,7 @@
 DocType: Pricing Rule,Sales Partner,خرڅلاو همکار
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,د ټولو سپلویر کټګورډونه.
 DocType: Buying Settings,Purchase Receipt Required,رانيول رسيد اړین
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,سنجي Rate فرض ده که پرانيستل دحمل ته ننوتل
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,سنجي Rate فرض ده که پرانيستل دحمل ته ننوتل
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,هیڅ ډول ثبتونې په صورتحساب جدول کې وموندل
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,لطفا د شرکت او د ګوند ډول لومړی انتخاب
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,د مالي / جوړوي کال.
@@ -693,7 +706,7 @@
 DocType: Quotation,Quotation To,د داوطلبۍ
 DocType: Lead,Middle Income,د منځني عايداتو
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),د پرانستلو په (آر)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,د قالب اندازه Default اداره {0} نه شي په مستقيمه شي ځکه بدل مو چې ځينې راکړې ورکړې (ص) سره د یو بل UOM لا کړې. تاسو به اړ یو نوی د قالب د بل Default UOM ګټه رامنځ ته کړي.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,د قالب اندازه Default اداره {0} نه شي په مستقيمه شي ځکه بدل مو چې ځينې راکړې ورکړې (ص) سره د یو بل UOM لا کړې. تاسو به اړ یو نوی د قالب د بل Default UOM ګټه رامنځ ته کړي.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,ځانګړې اندازه نه کېدای شي منفي وي
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,مهرباني وکړئ د شرکت جوړ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,مهرباني وکړئ د شرکت جوړ
@@ -708,6 +721,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,انتخاب د پیسو حساب ته د بانک د داخلولو لپاره
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll",د پاڼو، لګښت د ادعاوو او د معاشونو د اداره کارکوونکی د اسنادو جوړول
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,د نسخه دوره
+DocType: Restaurant Reservation,Restaurant Reservation,د رستورانت ساتنه
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,د پروپوزل ليکلو
 DocType: Payment Entry Deduction,Payment Entry Deduction,د پیسو د داخلولو Deduction
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,بل خرڅلاو کس {0} د همدې کارکوونکی پېژند شتون لري
@@ -715,7 +729,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,بادارانو
 DocType: Assessment Plan,Maximum Assessment Score,اعظمي ارزونه نمره
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,تازه بانک د راکړې ورکړې نیټی
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,د وخت د معلومولو
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,د وخت د معلومولو
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,دوه ګونو لپاره لېږدول
 DocType: Fiscal Year Company,Fiscal Year Company,مالي کال د شرکت
 DocType: Packing Slip Item,DN Detail,DN تفصیلي
@@ -724,8 +738,9 @@
 DocType: Batch,Batch Description,دسته Description
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,د زده کوونکو د ډلو جوړول
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,د زده کوونکو د ډلو جوړول
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.",د پیسو ليدونکی حساب نه جوړ، لطفا په لاسي يوه د جوړولو.
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.",د پیسو ليدونکی حساب نه جوړ، لطفا په لاسي يوه د جوړولو.
 DocType: Supplier Scorecard,Per Year,په کال کې
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,په دې پروګرام کې د داخلیدو لپاره د DOB مطابق
 DocType: Sales Invoice,Sales Taxes and Charges,خرڅلاو مالیات او په تور
 DocType: Employee,Organization Profile,اداره پېژندنه
 DocType: Vital Signs,Height (In Meter),لوړې کچې (په مترۍ کې)
@@ -761,7 +776,7 @@
 DocType: Student Batch Name,Batch Name,دسته نوم
 DocType: Fee Validity,Max number of visit,د کتنې ډیره برخه
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet جوړ:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},لطفا د تادیاتو په اکر کې default د نغدي او يا بانک حساب جوړ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},لطفا د تادیاتو په اکر کې default د نغدي او يا بانک حساب جوړ {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,کې شامل کړي
 DocType: GST Settings,GST Settings,GST امستنې
 DocType: Selling Settings,Customer Naming By,پيرودونکو نوم By
@@ -793,16 +808,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,تيرماښام لګښت مالیات او په تور
 DocType: Production Order Operation,Actual Start Time,واقعي د پیل وخت
 DocType: BOM Operation,Operation Time,د وخت د عملياتو
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,فنلند
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,فنلند
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,اډه
 DocType: Timesheet,Total Billed Hours,Total محاسبې ته ساعتونه
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,مقدار ولیکئ پړاو
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,مقدار ولیکئ پړاو
 DocType: Leave Block List Allow,Allow User,کارن اجازه
 DocType: Journal Entry,Bill No,بیل نه
 DocType: Company,Gain/Loss Account on Asset Disposal,د شتمنيو د برطرف ګټې / زیان اکانټ
 DocType: Vehicle Log,Service Details,خدمتونو نورولوله
 DocType: Vehicle Log,Service Details,خدمتونو نورولوله
-DocType: Purchase Invoice,Quarterly,درې میاشتنی
+DocType: Subscription,Quarterly,درې میاشتنی
 DocType: Lab Test Template,Grouped,ګروپ شوی
 DocType: Selling Settings,Delivery Note Required,د سپارنې پرمهال يادونه اړينه ده
 DocType: Bank Guarantee,Bank Guarantee Number,بانکي تضمین شمیره
@@ -812,12 +827,12 @@
 DocType: Student Attendance,Student Attendance,د زده کوونکو د حاضرۍ
 DocType: Sales Invoice Timesheet,Time Sheet,د وخت پاڼه
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush خام مواد پر بنسټ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,لطفا توکی جزئيات داخل
 DocType: Interest,Interest,په زړه پوري
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,مخکې خرڅلاو
 DocType: Purchase Receipt,Other Details,نور جزئيات
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,ټسټ ټکي
+DocType: Restaurant Order Entry Item,Served,خدمت شوی
 DocType: Account,Accounts,حسابونه
 DocType: Vehicle,Odometer Value (Last),Odometer ارزښت (په تېره)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,د عرضه کوونکي د سکورډ معیار معیارونه.
@@ -829,26 +844,28 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,د مخکتنې معاش ټوټه
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,ګڼون {0} په څو ځله داخل شوي دي
 DocType: Account,Expenses Included In Valuation,لګښتونه شامل په ارزښت
-DocType: Hub Settings,Seller City,پلورونکی ښار
 ,Absent Student Report,غیر حاضر زده کوونکو راپور
 DocType: Email Digest,Next email will be sent on:,بل برېښليک به واستول شي په:
 DocType: Offer Letter Term,Offer Letter Term,وړاندې لیک مهاله
 DocType: Supplier Scorecard,Per Week,په اونۍ کې
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,د قالب د بېرغونو لري.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,د قالب د بېرغونو لري.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,ټول زده کونکي
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,د قالب {0} ونه موندل شو
 DocType: Bin,Stock Value,دحمل ارزښت
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,د فیس ریکارډ به په پس منظر کې رامنځته شي. د کومې غلطۍ په صورت کې د تېروتنې پیغام به د شیشې په وخت کې نوي شي.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,شرکت {0} نه شته
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} د اعتبار اعتبار لري {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} د اعتبار اعتبار لري {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,د ونې ډول
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Qty مصرف د هر واحد
 DocType: Serial No,Warranty Expiry Date,ګرنټی د پای نېټه
 DocType: Material Request Item,Quantity and Warehouse,کمیت او ګدام
+DocType: Hub Settings,Unregister,ندی راجستر
 DocType: Sales Invoice,Commission Rate (%),کمیسیون کچه)٪ (
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,مهرباني غوره پروګرام
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,مهرباني غوره پروګرام
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,مهرباني غوره پروګرام
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,مهرباني غوره پروګرام
 DocType: Project,Estimated Cost,اټکل شوی لګښت
 DocType: Purchase Order,Link to material requests,مخونه چې د مادي غوښتنو
+DocType: Hub Settings,Publish,خپرول
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,فضایي
 DocType: Journal Entry,Credit Card Entry,کریډیټ کارټ انفاذ
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,شرکت او حسابونه
@@ -859,13 +876,12 @@
 DocType: Selling Settings,Close Opportunity After Days,بندول فرصت ورځې وروسته
 ,Reserved,خوندي دي
 DocType: Purchase Order,Supply Raw Materials,رسولو لپاره خام مواد
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,د نېټې په اړه چې د راتلونکو صورتحساب به تولید شي. دا کار په وړاندې تولید دی.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,اوسني شتمني
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} يو سټاک د قالب نه دی
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',مهرباني وکړئ خپل روزنې ته د روزنې ځوابونه او بیا وروسته &#39;نوی&#39; په واسطه ټریننګ سره شریک کړئ.
 DocType: Mode of Payment Account,Default Account,default اکانټ
 DocType: Payment Entry,Received Amount (Company Currency),د مبلغ (شرکت د اسعارو)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,اداره کوونکۍ باید جوړ شي که فرصت څخه په غاړه کړې
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,اداره کوونکۍ باید جوړ شي که فرصت څخه په غاړه کړې
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,لطفا اونیز پړاو ورځ وټاکئ
 DocType: Patient,O Negative,اې منفي
 DocType: Production Order Operation,Planned End Time,پلان د پاي وخت
@@ -881,8 +897,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,د انرژۍ د
 DocType: Opportunity,Opportunity From,فرصت له
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,میاشتنی معاش خبرپاڼه.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,شرکت زیاته کړئ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,د {0}: {1} سیریل شمېره د 2 {2} لپاره اړین ده. تاسو {3} چمتو کړی.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,د {0}: {1} سیریل شمېره د 2 {2} لپاره اړین ده. تاسو {3} چمتو کړی.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,مهرباني وکړئ یو میز انتخاب کړئ
 DocType: BOM,Website Specifications,وېب پاڼه ځانګړتیاو
 DocType: Special Test Items,Particulars,درسونه
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,انټي بيوټيټ
@@ -891,11 +907,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,د کتارونو تر {0}: د تغیر فکتور الزامی دی
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",څو د بیو د اصول سره ورته معیارونه شتون، لطفا له خوا لومړیتوب وګومارل شخړې حل کړي. بيه اصول: {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,نه خنثی کولای شي او یا هیښ لغوه په توګه دا ده چې له نورو BOMs سره تړاو لري
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,نه خنثی کولای شي او یا هیښ لغوه په توګه دا ده چې له نورو BOMs سره تړاو لري
 DocType: Opportunity,Maintenance,د ساتنې او
 DocType: Item Attribute Value,Item Attribute Value,د قالب ځانتیا ارزښت
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,خرڅلاو مبارزو.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Timesheet د کمکیانو لپاره
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Timesheet د کمکیانو لپاره
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -933,12 +949,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,مهرباني وکړئ لومړی د قالب ته ننوځي
 DocType: Account,Liability,Liability
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,تحریم مقدار نه شي کولای په کتارونو ادعا مقدار څخه ډيره وي {0}.
+DocType: Salary Detail,Do not include in total,په مجموع کې شامل نه کړئ
 DocType: Company,Default Cost of Goods Sold Account,د حساب د پلورل شوو اجناسو Default لګښت
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,بیې په لېست کې نه ټاکل
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,بیې په لېست کې نه ټاکل
 DocType: Employee,Family Background,د کورنۍ مخينه
 DocType: Request for Quotation Supplier,Send Email,برېښنا لیک ولېږه
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},خبرداری: ناسم ضميمه {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,نه د اجازې د
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},خبرداری: ناسم ضميمه {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,نه د اجازې د
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,غوښتل شوی غوښتنه
 DocType: Vital Signs,Heart Rate / Pulse,د زړه درجه / پلس
 DocType: Company,Default Bank Account,Default بانک حساب
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",پر بنسټ د ګوند چاڼ، غوره ګوند د لومړي ډول
@@ -966,12 +984,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,د قالب د کتارونو تر {idx}: {doctype} {docname} په پورته نه شته &#39;{doctype}&#39; جدول
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} لا د مخه د بشپړې او يا لغوه
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,نه دندو
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",د مياشتې په ورځ چې د موټرو د صورتحساب به د مثال په 05، 28 او نور تولید شي
 DocType: Item Variant Settings,Copy Fields to Variant,د ویډیو لپاره کاپی ډګرونه
 DocType: Asset,Opening Accumulated Depreciation,د استهلاک د پرانيستلو
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,نمره باید لږ تر لږه 5 يا ور سره برابر وي
 DocType: Program Enrollment Tool,Program Enrollment Tool,پروګرام شمولیت اوزار
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C-فورمه سوابق
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C-فورمه سوابق
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,پيرودونکو او عرضه
 DocType: Email Digest,Email Digest Settings,Email Digest امستنې
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,تاسو د خپلې سوداګرۍ لپاره مننه!
@@ -989,13 +1006,13 @@
 DocType: Request for Quotation Supplier,Quote Status,د حالت حالت
 DocType: Maintenance Visit,Completion Status,تکميل حالت
 DocType: HR Settings,Enter retirement age in years,په کلونو کې د تقاعد د عمر وليکئ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,هدف ګدام
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,لطفا یو ګودام انتخاب
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,هدف ګدام
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,لطفا یو ګودام انتخاب
 DocType: Cheque Print Template,Starting location from left edge,کيڼې څنډې څخه پیل ځای
 DocType: Item,Allow over delivery or receipt upto this percent,د وړاندې کولو یا رسید ترمړوندونو پورې دې په سلو کې اجازه باندې
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,د وارداتو د حاضرۍ
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,ټول د قالب ډلې
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,ټول د قالب ډلې
 DocType: Process Payroll,Activity Log,فعالیت ننوتنه
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,خالصه ګټه / له لاسه ورکول
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,په اتوماتيک ډول د معاملو د سپارلو پېغام کمپوز.
@@ -1007,7 +1024,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,وړاندوینی Qty
 DocType: Sales Invoice,Payment Due Date,د پیسو له امله نېټه
 DocType: Drug Prescription,Interval UOM,د UOM منځګړیتوب
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,د قالب variant {0} لا د همدې صفتونو شتون لري
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,د قالب variant {0} لا د همدې صفتونو شتون لري
+DocType: Item,Hub Publishing Details,د هوب د خپرولو توضیحات
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;پرانیستل&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,د پرانستې ته ایا
 DocType: Notification Control,Delivery Note Message,د سپارنې پرمهال يادونه پيغام
@@ -1027,10 +1045,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: خام مواد د اصلي توکو په څیر نه وي
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,په رانيول رسيد توکي جدول ټولې د تطبیق په تور باید په توګه ټول ماليات او په تور ورته وي
 DocType: Sales Team,Incentives,هڅوونکي
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,د هب لپاره راجستر کول
 DocType: SMS Log,Requested Numbers,غوښتنه شميرې
 DocType: Production Planning Tool,Only Obtain Raw Materials,یوازې خام مواد په لاس راوړئ
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,د اجرآتو ارزونه.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",توانمنوونکې &#39;کولر په ګاډۍ څخه استفاده وکړئ، په توګه، کولر په ګاډۍ دی فعال شوی او هلته بايد کولر په ګاډۍ لږ تر لږه يو د مالياتو د حاکمیت وي
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",توانمنوونکې &#39;کولر په ګاډۍ څخه استفاده وکړئ، په توګه، کولر په ګاډۍ دی فعال شوی او هلته بايد کولر په ګاډۍ لږ تر لږه يو د مالياتو د حاکمیت وي
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",د پیسو د داخلولو {0} دی تړاو نظم {1}، وګورئ که دا بايد په توګه په دې صورتحساب مخکې کش شي په وړاندې.
 DocType: Sales Invoice Item,Stock Details,دحمل په بشپړه توګه کتل
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,د پروژې د ارزښت
@@ -1049,12 +1068,14 @@
 DocType: Salary Slip,Working Days,کاري ورځې
 DocType: Serial No,Incoming Rate,راتلونکي Rate
 DocType: Packing Slip,Gross Weight,ناخالصه وزن
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,د خپل شرکت نوم د کوم لپاره چې تاسو دا سيستم د جوړولو.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,حب فعال کړئ
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,د خپل شرکت نوم د کوم لپاره چې تاسو دا سيستم د جوړولو.
 DocType: HR Settings,Include holidays in Total no. of Working Days,په Total رخصتي شامل نه. د کاري ورځې
 DocType: Job Applicant,Hold,ونیسئ
 DocType: Employee,Date of Joining,د داخلیدل نېټه
 DocType: Naming Series,Update Series,تازه لړۍ
 DocType: Supplier Quotation,Is Subcontracted,د دې لپاره قرارداد
+DocType: Restaurant Table,Minimum Seating,لږ تر لږه څوکۍ
 DocType: Item Attribute,Item Attribute Values,د قالب ځانتیا ارزښتونه
 DocType: Examination Result,Examination Result,د ازموینې د پایلو د
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,رانيول رسيد
@@ -1065,13 +1086,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},ته د وخت د عملياتو په راتلونکو {0} ورځو کې د څوکۍ د موندلو توان نلري {1}
 DocType: Production Order,Plan material for sub-assemblies,فرعي شوراګانو لپاره پلان مواد
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,خرڅلاو همکارانو او خاوره
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,هیښ {0} بايد فعال وي
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,هیښ {0} بايد فعال وي
 DocType: Journal Entry,Depreciation Entry,د استهالک د داخلولو
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,مهرباني وکړئ لومړی انتخاب سند ډول
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,لغوه مواد ليدنه {0} بندول د دې د ساتنې سفر مخکې
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},شعبه {0} نه د قالب سره تړاو نه لري {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,مطلوب Qty
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,د موجوده معامله ګودامونو ته د پنډو بدل نه شي.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,د موجوده معامله ګودامونو ته د پنډو بدل نه شي.
 DocType: Bank Reconciliation,Total Amount,جمله پیسی
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,د انټرنېټ Publishing
 DocType: Prescription Duration,Number,شمېره
@@ -1082,7 +1103,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,د پلورنې د بیې لېست
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.",که چیرته چک شوی وي، یو پېرودونکی به جوړ شي، ناروغ ته نقشه شوی. د دې پیرود په وړاندې به د ناروغۍ انوګانې جوړ شي. تاسو کولی شئ د ناروغ پیدا کولو پر مهال موجوده پیرود هم وټاکئ.
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,ته توکي پرانیځئ د خپرېدو
 DocType: Bank Reconciliation,Account Currency,حساب د اسعارو
 DocType: Lab Test,Sample ID,نمونه ایډیټ
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,لطفا په شرکت ذکر پړاو پړاو په حساب
@@ -1091,11 +1111,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,د کارګر {0} فعاله نه وي او یا موجود ندی
 DocType: Fee Structure,Components,د اجزاو
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},لطفا په قالب د شتمنیو کټه ګورۍ ته ننوځي {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,د قالب تانبه {0} تازه
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,د قالب تانبه {0} تازه
 DocType: Quality Inspection Reading,Reading 6,لوستلو 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,نه شی کولای د {0} د {1} {2} کومه منفي بيالنس صورتحساب پرته
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this",تولید شي. که ځنډ کیږي، تاسو باید په دستي توګه د &quot;میاشتې په ورځ تکرار&quot; بدل کړئ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,نه شی کولای د {0} د {1} {2} کومه منفي بيالنس صورتحساب پرته
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,پیري صورتحساب پرمختللی
-DocType: Hub Settings,Sync Now,پرانیځئ اوس
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},د کتارونو تر {0}: پورونو د ننوتلو سره د نه تړاو شي کولای {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,لپاره د مالي کال د بودجې تعریف کړي.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Default بانک / د نقدو پیسو حساب به په POS صورتحساب په اتوماتيک ډول پرلیکه شي کله چې دا اکر انتخاب.
@@ -1107,13 +1128,13 @@
 DocType: Item,Is Purchase Item,آیا د رانيول د قالب
 DocType: Asset,Purchase Invoice,رانيول صورتحساب
 DocType: Stock Ledger Entry,Voucher Detail No,ګټمنو تفصیلي نه
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,نوي خرڅلاو صورتحساب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,نوي خرڅلاو صورتحساب
 DocType: Stock Entry,Total Outgoing Value,Total باورلیک ارزښت
 DocType: Physician,Appointments,ټاکنې
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,پرانيستل نېټه او د بندولو نېټه باید ورته مالي کال په چوکاټ کې وي
 DocType: Lead,Request for Information,معلومات د غوښتنې لپاره
 ,LeaderBoard,LeaderBoard
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,پرانیځئ نالیکی صورتحساب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,پرانیځئ نالیکی صورتحساب
 DocType: Payment Request,Paid,ورکړل
 DocType: Program Fee,Program Fee,پروګرام فیس
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1132,11 +1153,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,نظم د قالب پیري
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,نامستقیم عايداتو
 DocType: Student Attendance Tool,Student Attendance Tool,د زده کوونکو د حاضرۍ اوزار
+DocType: Restaurant Menu,Price List (Auto created),د بیې لیست (آٹو جوړ شوی)
 DocType: Cheque Print Template,Date Settings,نېټه امستنې
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,متفرقه
 ,Company Name,دکمپنی نوم
 DocType: SMS Center,Total Message(s),Total پيغام (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,د انتقال انتخاب د قالب
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,د انتقال انتخاب د قالب
 DocType: Purchase Invoice,Additional Discount Percentage,اضافي کمښت سلنه
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,ښکاره د په مرسته د ټولو ویډیوګانو يو لست
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,د بانک انتخاب حساب مشر هلته پوستې شو امانت.
@@ -1154,6 +1176,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,متره
 DocType: Workstation,Electricity Cost,د بريښنا د لګښت
 DocType: HR Settings,Don't send Employee Birthday Reminders,آيا د کارګر کالیزې په دوراني ډول نه استوي
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,ترتیبونه ساتل
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,غوښتل شوي محصولات
 DocType: Item,Inspection Criteria,تفتیش معیارونه
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,وليږدول
 DocType: BOM Website Item,BOM Website Item,هیښ وېب پاڼه شمیره
@@ -1171,11 +1195,11 @@
 DocType: Journal Entry,Total Amount in Words,په وييکي Total مقدار
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,یوه تېروتنه وه. يو احتمالي لامل کیدای شي چې تاسو په بڼه نه وژغوره. لطفا تماس support@erpnext.com که ستونزه دوام ولري.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,زما په ګاډۍ
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},نظم ډول باید د یو وي {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},نظم ډول باید د یو وي {0}
 DocType: Lead,Next Contact Date,بل د تماس نېټه
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,پرانيستل Qty
 DocType: Healthcare Settings,Appointment Reminder,د استیناف یادونې
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,مهرباني وکړئ د بدلون لپاره د مقدار حساب ته ننوځي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,مهرباني وکړئ د بدلون لپاره د مقدار حساب ته ننوځي
 DocType: Student Batch Name,Student Batch Name,د زده کونکو د دسته نوم
 DocType: Consultation,Doctor,ډاکټر
 DocType: Holiday List,Holiday List Name,رخصتي بشپړفهرست نوم
@@ -1183,12 +1207,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,مهال ويش کورس
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,دحمل غوراوي
 DocType: Journal Entry Account,Expense Claim,اخراجاتو ادعا
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,آيا تاسو په رښتيا غواړئ چې د دې پرزه د شتمنیو بيازېرمل؟
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},د Qty {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,آيا تاسو په رښتيا غواړئ چې د دې پرزه د شتمنیو بيازېرمل؟
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},د Qty {0}
 DocType: Leave Application,Leave Application,رخصت کاریال
 DocType: Patient,Patient Relation,د ناروغ اړیکه
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,پريږدئ تخصيص اوزار
+DocType: Item,Hub Category to Publish,د خپرېدو نېټه:
 DocType: Leave Block List,Leave Block List Dates,بالک بشپړفهرست نیټی څخه ووځي
+DocType: Sales Invoice,Billing Address GSTIN,د بلنگ پته GSTIN
 DocType: Workstation,Net Hour Rate,خالص قيامت Rate
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,تيرماښام لګښت رانيول رسيد
 DocType: Company,Default Terms,default اصطلاح
@@ -1198,11 +1224,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},مهرباني وکړئ مشخص یو {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,په اندازه او ارزښت نه بدلون لرې توکي.
 DocType: Delivery Note,Delivery To,ته د وړاندې کولو
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,ځانتیا جدول الزامی دی
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,ځانتیا جدول الزامی دی
 DocType: Production Planning Tool,Get Sales Orders,خرڅلاو امر ترلاسه کړئ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} کېدای شي منفي نه وي
 DocType: Training Event,Self-Study,د ځان سره مطالعه
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,تخفیف
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,تخفیف
 DocType: Asset,Total Number of Depreciations,Total د Depreciations شمېر
 DocType: Sales Invoice Item,Rate With Margin,کچه د څنډی څخه
 DocType: Sales Invoice Item,Rate With Margin,کچه د څنډی څخه
@@ -1210,7 +1236,7 @@
 DocType: Task,Urgent,Urgent
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},مهرباني وکړئ مشخص لپاره چي په کتارونو {0} په جدول کې یو باوري د کتارونو تر تذکرو د {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,د متغیر موندلو توان نلري:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,مهرباني وکړئ د نمپاد څخه د سمون لپاره یو ډګر وټاکئ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,مهرباني وکړئ د نمپاد څخه د سمون لپاره یو ډګر وټاکئ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,د سرپاڼې ته لاړ شئ او ERPNext په کارولو پيل کوي
 DocType: Item,Manufacturer,جوړوونکی
 DocType: Landed Cost Item,Purchase Receipt Item,رانيول رسيد د قالب
@@ -1241,8 +1267,8 @@
 DocType: GL Entry,Against,په وړاندې
 DocType: Item,Default Selling Cost Center,Default پلورل لګښت مرکز
 DocType: Sales Partner,Implementation Partner,د تطبیق همکار
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,زیپ کوډ
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},خرڅلاو نظم {0} دی {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,زیپ کوډ
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},خرڅلاو نظم {0} دی {1}
 DocType: Opportunity,Contact Info,تماس پيژندنه
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,جوړول دحمل توکي
 DocType: Packing Slip,Net Weight UOM,خالص وزن UOM
@@ -1253,6 +1279,7 @@
 DocType: Holiday List,Get Weekly Off Dates,د اونۍ پړاو نیټی ترلاسه کړئ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,د پای نیټه نه شي کولای په پرتله د پیل نیټه کمه وي
 DocType: Sales Person,Select company name first.,انتخاب شرکت نوم د لومړي.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,ټيټ لوړ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,د داوطلبۍ څخه عرضه ترلاسه کړ.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOM بدله کړئ او په ټولو BOMs کې وروستي قیمت تازه کړئ
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},د {0} | {1} {2}
@@ -1273,7 +1300,7 @@
 DocType: Program Enrollment,Transportation,د ترانسپورت
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,ناباوره ځانتیا
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} د {1} بايد وسپارل شي
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},مقدار باید د لږ-تر یا مساوي وي {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},مقدار باید د لږ-تر یا مساوي وي {0}
 DocType: SMS Center,Total Characters,Total خویونه
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},لطفا هیښ لپاره د قالب په هیښ برخه کې غوره {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-فورمه صورتحساب تفصیلي
@@ -1288,7 +1315,7 @@
 ,Ordered Items To Be Billed,امر توکي چې د محاسبې ته شي
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,له Range لري چې کم وي په پرتله د Range
 DocType: Global Defaults,Global Defaults,Global افتراضیو
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,د پروژې د مرستې په جلب
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,د پروژې د مرستې په جلب
 DocType: Salary Slip,Deductions,د مجرايي
 DocType: Leave Allocation,LAL/,لعل /
 DocType: Setup Progress Action,Action Name,د عمل نوم
@@ -1306,13 +1333,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,خرڅلاو صورتحساب پرمختللی
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,هېڅ غوښتنه
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},بل د بودجې د ریکارډ &#39;{0}&#39; لا د وړاندې موجود {1} &#39;{2}&#39; مالي کال لپاره د {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','واقعي د پیل نیټه ' نه شي پورته له 'واقعي د پای نیټه' څخه
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','واقعي د پیل نیټه ' نه شي پورته له 'واقعي د پای نیټه' څخه
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,مدیریت
 DocType: Cheque Print Template,Payer Settings,د ورکوونکي امستنې
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",دا به د د variant د قالب کوډ appended شي. د بیلګې په توګه، که ستا اختصاري دی &quot;SM&quot;، او د توکي کوډ دی &quot;T-کميس&quot;، د variant توکی کوډ به &quot;T-کميس-SM&quot;
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,خالص د معاشونو (په لفظ) به د ليدو وړ وي. هر کله چې تاسو د معاش ټوټه وژغوري.
 DocType: Purchase Invoice,Is Return,آیا بیرته
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,احتیاط
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,احتیاط
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,بیرته / ګزارې يادونه
 DocType: Price List Country,Price List Country,بیې په لېست کې د هېواد
 DocType: Item,UOMs,UOMs
@@ -1327,17 +1354,18 @@
 DocType: Account,Balance Sheet,توازن پاڼه
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',لګښت لپاره مرکز سره د قالب کوډ &#39;د قالب
 DocType: Fee Validity,Valid Till,دقیقه
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",د پیسو په اکر کې نده شکل بندي شوې ده. مهرباني وکړئ وګورئ، چې آيا حساب په د تادياتو د اکر یا د POS پېژندنه ټاکل شوي دي.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",د پیسو په اکر کې نده شکل بندي شوې ده. مهرباني وکړئ وګورئ، چې آيا حساب په د تادياتو د اکر یا د POS پېژندنه ټاکل شوي دي.
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,ورته توکی نه شي کولای شي د څو ځله ننوتل.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",لا حسابونو شي ډلو لاندې کړې، خو د زياتونې شي غیر ډلو په وړاندې د
 DocType: Lead,Lead,سرب د
 DocType: Email Digest,Payables,Payables
 DocType: Course,Course Intro,کورس سریزه
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,دحمل انفاذ {0} جوړ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,مهرباني وکړئ د سیٹ اپ&gt; شمېره لړۍ له لارې د حاضریدو لړۍ سیسټم
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,دحمل انفاذ {0} جوړ
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,د کتارونو تر # {0}: رد Qty په رانيول بیرته نه داخل شي
 ,Purchase Order Items To Be Billed,د اخستلو امر توکي چې د محاسبې ته شي
 DocType: Purchase Invoice Item,Net Rate,خالص Rate
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,مهرباني وکړئ یو پیرود غوره کړئ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,مهرباني وکړئ یو پیرود غوره کړئ
 DocType: Purchase Invoice Item,Purchase Invoice Item,صورتحساب د قالب پیري
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,دحمل د پنډو توکي او GL توکي د ټاکل رانيول معاملو لپاره reposted دي
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,د قالب 1
@@ -1357,7 +1385,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},{0} دوه ګونو قطار سره ورته {1}
 ,Trial Balance,د محاکمې بیلانس
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,مالي کال د {0} ونه موندل شو
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,مامورین ترتیبول
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,مامورین ترتیبول
 DocType: Sales Order,SO-,اصطالح
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,مهرباني وکړئ لومړی مختاړی وټاکئ
 DocType: Employee,O-,فرنګ
@@ -1369,12 +1397,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,محتویات پنډو
 DocType: Grading Scale,Intervals,انټروال
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ژر
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group",د قالب ګروپ سره په همدې نوم شتون لري، لطفا توکی نوم بدل کړي او يا د توکي ډلې نوم
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group",د قالب ګروپ سره په همدې نوم شتون لري، لطفا توکی نوم بدل کړي او يا د توکي ډلې نوم
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,د زده کوونکو د موبايل په شمیره
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,د نړۍ پاتې
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,د نړۍ پاتې
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,د قالب {0} نه شي کولای دسته لري
 ,Budget Variance Report,د بودجې د توپیر راپور
 DocType: Salary Slip,Gross Pay,Gross د معاشونو
+DocType: Item,Is Item from Hub,د هب څخه توکي دي
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,د کتارونو تر {0}: فعالیت ډول فرض ده.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,د سهم ورکړل
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,د محاسبې د پنډو
@@ -1384,7 +1413,7 @@
 DocType: Vehicle Log,Service Detail,د خدماتو تفصیلي
 DocType: BOM,Item Description,د قالب Description
 DocType: Student Sibling,Student Sibling,د زده کونکو د ورونړه
-DocType: Purchase Invoice,Is Recurring,آیا بیا راګرځېدل
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,د تادیې موډل
 DocType: Purchase Invoice,Supplied Items,تهيه سامان
 DocType: Student,STUD.,خپلو پټيو کې.
 DocType: Production Order,Qty To Manufacture,Qty تولید
@@ -1396,6 +1425,7 @@
 ,Student and Guardian Contact Details,د زده کوونکو او د ګارډین د اړیکې جزئیات
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,د کتارونو تر {0}: د عرضه {0} دبرېښنا ليک پته ته اړتيا ده چې د برېښناليک واستوي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,لنډمهاله پرانیستل
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,حب وګوره
 ,Employee Leave Balance,د کارګر اجازه بیلانس
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},د حساب انډول {0} بايد تل وي {1}
 DocType: Patient Appointment,More Info,نور معلومات
@@ -1415,13 +1445,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,خرڅلاو نظم {0} د اعتبار وړ نه دی
 DocType: Supplier Scorecard,Warn for new Request for Quotations,د کوډونو لپاره د نوی غوښتنه لپاره خبردارۍ
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,رانيول امر تاسو سره مرسته پلان او ستاسو د اخیستلو تعقيب
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged",بښنه غواړو، شرکتونو نه مدغم شي
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged",بښنه غواړو، شرکتونو نه مدغم شي
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,د لابراتوار ازموینه
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",په مادي غوښتنه د Issue / انتقال مجموعي مقدار {0} د {1} \ نه غوښتنه کمیت لپاره د قالب {2} څخه ډيره وي {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,د کوچنیو
 DocType: Employee,Employee Number,د کارګر شمېر
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Case (ونه) نشته د مخه په استعمال. له Case هیڅ هڅه {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Case (ونه) نشته د مخه په استعمال. له Case هیڅ هڅه {0}
 DocType: Project,% Completed,٪ بشپړ شوي
 ,Invoiced Amount (Exculsive Tax),د رسیدونو مقدار (Exculsive د مالياتو)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,د قالب 2
@@ -1436,11 +1466,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,غیر مستقیم مصارف
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,د کتارونو تر {0}: Qty الزامی دی
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,د کرنې
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,پرانیځئ ماسټر معلوماتو
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,پرانیځئ ماسټر معلوماتو
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,ستاسو د تولیداتو يا خدمتونو
 DocType: Special Test Items,Special Test Items,د ځانګړي ازموینې توکي
 DocType: Mode of Payment,Mode of Payment,د تادیاتو اکر
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,وېب پاڼه د انځور بايد د عامه دوتنه يا ويب URL وي
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,وېب پاڼه د انځور بايد د عامه دوتنه يا ويب URL وي
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,هیښ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,دا یو د ريښي توکی ډلې او نه تصحيح شي.
@@ -1448,9 +1478,9 @@
 DocType: Vehicle,Fuel UOM,د تیلو د UOM
 DocType: Warehouse,Warehouse Contact Info,ګدام تماس پيژندنه
 DocType: Payment Entry,Write Off Difference Amount,ولیکئ پړاو بدلون مقدار
-DocType: Purchase Invoice,Recurring Type,راګرځېدل ډول
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent",{0}: د کارګر ایمیل ونه موندل، نو برېښناليک نه استول
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent",{0}: د کارګر ایمیل ونه موندل، نو برېښناليک نه استول
 DocType: Item,Foreign Trade Details,د بهرنیو چارو د سوداګرۍ نورولوله
+,Assessment Plan Status,د ارزونې پلان حالت
 DocType: Email Digest,Annual Income,د کلني عايداتو
 DocType: Serial No,Serial No Details,شعبه نورولوله
 DocType: Purchase Invoice Item,Item Tax Rate,د قالب د مالياتو Rate
@@ -1458,15 +1488,14 @@
 DocType: Student Group Student,Group Roll Number,ګروپ رول شمیره
 DocType: Student Group Student,Group Roll Number,ګروپ رول شمیره
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",د {0}، يوازې د پور حسابونو بل ډیبیټ د ننوتلو په وړاندې سره وتړل شي
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,د ټولو دنده وزن Total باید 1. مهرباني وکړی د ټولو د پروژې د دندو وزن سره سم عیار
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,د سپارنې پرمهال يادونه {0} نه سپارل
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,د ټولو دنده وزن Total باید 1. مهرباني وکړی د ټولو د پروژې د دندو وزن سره سم عیار
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,د سپارنې پرمهال يادونه {0} نه سپارل
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,د قالب {0} باید یو فرعي قرارداد د قالب وي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,پلازمیینه تجهیزاتو
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",د بیې د حاکمیت لومړی پر بنسټ ټاکل &#39;Apply د&#39; ډګر، چې کولای شي د قالب، د قالب ګروپ یا نښې وي.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,مهرباني وکړئ لومړی د کوډ کوډ ولیکئ
-DocType: Hub Settings,Seller Website,پلورونکی وېب پاڼه
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,مهرباني وکړئ لومړی د کوډ کوډ ولیکئ
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,د خرڅلاو ټيم ټولې سلنه بايد 100 وي
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,د خرڅلاو ټيم ټولې سلنه بايد 100 وي
 DocType: Sales Invoice Item,Edit Description,سمول Description
 DocType: Antibiotic,Antibiotic,انټي بيوټيټ
 ,Team Updates,ټيم اوسمهالونه
@@ -1487,12 +1516,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Total (شرکت د اسعارو)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,سریال {0} ننوتل څخه یو ځل بیا
 DocType: Depreciation Schedule,Journal Entry,په ورځپانه کی ثبت شوی مطلب
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} په پرمختګ توکي
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} په پرمختګ توکي
 DocType: Workstation,Workstation Name,Workstation نوم
 DocType: Grading Scale Interval,Grade Code,ټولګي کوډ
 DocType: POS Item Group,POS Item Group,POS د قالب ګروپ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ولېږئ Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},هیښ {0} نه د قالب سره تړاو نه لري {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},هیښ {0} نه د قالب سره تړاو نه لري {1}
 DocType: Sales Partner,Target Distribution,د هدف د ویش
 DocType: Salary Slip,Bank Account No.,بانکي حساب شمیره
 DocType: Naming Series,This is the number of the last created transaction with this prefix,دا په دې مختاړی د تېرو جوړ معامله شمیر
@@ -1509,10 +1538,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,لپاره د داوطلبۍ عرضه غوښتنه
 DocType: Healthcare Settings,Registration Message,د نوم ليکنې پیغام
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,هډوتري
-DocType: Sales Order,Recurring Upto,راګرځېدل ترمړوندونو پورې
 DocType: Prescription Dosage,Prescription Dosage,نسخه ډوز
 DocType: Attendance,HR Manager,د بشري حقونو څانګې د مدير
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,لطفا یو شرکت غوره
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,لطفا یو شرکت غوره
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,امتیاز څخه ځي
 DocType: Purchase Invoice,Supplier Invoice Date,عرضه صورتحساب نېټه
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,په هر
@@ -1528,10 +1556,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,د تداخل حالاتو تر منځ وموندل:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,ژورنال په وړاندې د انفاذ {0} لا د مخه د يو شمېر نورو کوپون په وړاندې د تعدیل
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Total نظم ارزښت
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,د خوړو د
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,د خوړو د
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing Range 3
 DocType: Maintenance Schedule Item,No of Visits,نه د ليدنې
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},د ساتنې او ویش {0} په وړاندې د شته {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,ایا غواړئ خپل توکي د هب ته خپور کړئ؟
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,شمولیت محصل
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},د تړل د حساب اسعارو باید د {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},د ټولو موخو ټکي مبلغ بايد 100. وي دا د {0}
@@ -1542,9 +1571,9 @@
 DocType: Authorization Rule,Average Discount,په اوسط ډول کمښت
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,ګټورتوب
-DocType: Purchase Invoice Item,Accounting,د محاسبې
+DocType: POS Profile,Accounting,د محاسبې
 DocType: Employee,EMP/,د چاپېريال د /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,لطفا د يووړل توکی دستو انتخاب
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,لطفا د يووړل توکی دستو انتخاب
 DocType: Asset,Depreciation Schedules,د استهالک ویش
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,کاریال موده نه شي بهر رخصت تخصيص موده وي
 DocType: Activity Cost,Projects,د پروژو
@@ -1560,7 +1589,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',تصویب حالت بايد د تصویب &#39;يا&#39; رد &#39;
 DocType: Physician,Contacts and Address,اړیکې او پته
 DocType: Purchase Invoice,Contact Person,د اړیکې نفر
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&#39;د تمی د پیل نیټه د&#39; نه وي زیات &#39;د تمی د پای نیټه&#39;
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&#39;د تمی د پیل نیټه د&#39; نه وي زیات &#39;د تمی د پای نیټه&#39;
 DocType: Course Scheduling Tool,Course End Date,د کورس د پای نیټه
 DocType: Holiday List,Holidays,رخصتۍ
 DocType: Sales Order Item,Planned Quantity,پلان شوي مقدار
@@ -1568,10 +1597,11 @@
 DocType: Item,Maintain Stock,دحمل ساتل
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,دحمل توکي لا د تولید لپاره د نظم رامنځته
 DocType: Employee,Prefered Email,prefered دبرېښنا ليک
+DocType: Student Admission,Eligibility and Details,وړتیا او تفصیلات
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,په ثابته شتمني خالص د بدلون
 DocType: Leave Control Panel,Leave blank if considered for all designations,خالي پريږدئ که د ټولو هغو کارونو په پام کې
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,د ډول &#39;واقعي په قطار چارج په قالب Rate نه {0} شامل شي
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},اعظمي: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},اعظمي: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,له Datetime
 DocType: Email Digest,For Company,د شرکت
 apps/erpnext/erpnext/config/support.py +17,Communication log.,د مخابراتو يادښت.
@@ -1579,19 +1609,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,د سپریري کرایه کارونې متغیر سکریټ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,د خريداري مقدار
 DocType: Sales Invoice,Shipping Address Name,استونې پته نوم
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,د حسابونو چارټ
 DocType: Material Request,Terms and Conditions Content,د قرارداد شرايط منځپانګه
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,نه شي کولای په پرتله 100 وي
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,{0} د قالب يو سټاک د قالب نه دی
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,{0} د قالب يو سټاک د قالب نه دی
 DocType: Maintenance Visit,Unscheduled,ناپلان شوې
 DocType: Employee,Owned,د دولتي
 DocType: Salary Detail,Depends on Leave Without Pay,په پرته د معاشونو اذن سره تړلی دی
 DocType: Pricing Rule,"Higher the number, higher the priority",د شمېر د لوړو، لوړو لومړیتوب
 ,Purchase Invoice Trends,پیري صورتحساب رجحانات
 DocType: Employee,Better Prospects,ته ښه زمينه
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",د کتارونو تر # {0}: د د ستې {1} لري یوازې {2} qty. لطفا بل batch چې {3} qty موجود ټاکلو او یا د څو کتارونو د قطار ویشل، د موضوع له څو دستو ورسوي /
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",د کتارونو تر # {0}: د د ستې {1} لري یوازې {2} qty. لطفا بل batch چې {3} qty موجود ټاکلو او یا د څو کتارونو د قطار ویشل، د موضوع له څو دستو ورسوي /
 DocType: Vehicle,License Plate,منښتليک ذريعه
 DocType: Appraisal,Goals,موخې
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,د POS پېژندګلوی غوره کړه
 DocType: Warranty Claim,Warranty / AMC Status,ګرنټی / AMC حالت
 ,Accounts Browser,حسابونه د لټووني
 DocType: Payment Entry Reference,Payment Entry Reference,د پیسو د داخلولو ماخذ
@@ -1609,7 +1639,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,کارکوونکی کولای شي چې د ځان راپور نه ورکوي.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",که په پام کې ده کنګل، زياتونې پورې محدود کاروونکو اجازه لري.
 DocType: Email Digest,Bank Balance,بانک دبیلانس
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},د محاسبې د داخلولو لپاره د {0}: {1} ولري يوازې په اسعارو کړې: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},د محاسبې د داخلولو لپاره د {0}: {1} ولري يوازې په اسعارو کړې: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.",دنده پېژنڅېر، وړتوبونه اړتیا او داسې نور
 DocType: Journal Entry Account,Account Balance,موجوده حساب
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,د معاملو د ماليې حاکمیت.
@@ -1618,8 +1648,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total مالیات او په تور (شرکت د اسعارو)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,وښایاست ناتړل مالي کال د P &amp; L توازن
 DocType: Lab Test Template,Collection Details,د راټولولو تفصیلات
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0",د cp.name، cp.test_code غوره کول، cp.parent، cp.invoice، ct.physician، ct.consultation_date د tab سنسنیشن CT څخه، د tabLab نسخه cp چېرې ct.patient = &#39;{0}&#39; او cp.parent = ct. نوم او cp.test_created = 0
 DocType: Shipping Rule,Shipping Account,انتقال حساب
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} د {1}: Account {2} ده ناچارنده
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,د کمکیانو لپاره د خرڅلاو امر تاسو ته د خپل کاري پلان کې مرسته وکړي او پر وخت ورسوي
@@ -1636,7 +1664,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,بسته بنديو ټوټه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,دفتر کرایې
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS ورننوتلو امستنې
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,د وارداتو کې ناکام شو!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,د وارداتو کې ناکام شو!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,کومه پته نه زياته کړه تر اوسه.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation کاري قيامت
 DocType: Vital Signs,Blood Pressure,د وينې فشار
@@ -1661,7 +1689,7 @@
 DocType: Sales Invoice,Source,سرچینه
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,انکړپټه ښودل تړل
 DocType: Leave Type,Is Leave Without Pay,ده پرته د معاشونو د وتو
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,د شتمنیو کټه ګورۍ لپاره شتمن توکی الزامی دی
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,د شتمنیو کټه ګورۍ لپاره شتمن توکی الزامی دی
 DocType: Fee Validity,Fee Validity,د فیس اعتبار
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,هیڅ ډول ثبتونې په قطعا د جدول کې وموندل
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},دا {0} د شخړو د {1} د {2} {3}
@@ -1682,8 +1710,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,اجرايي پلټنه
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,لامل جوړول
 DocType: Maintenance Schedule,Schedules,مهال ويش
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,د پیسو پروفیسر د پوائنټ خرڅلاو کارولو لپاره اړین دی
 DocType: Purchase Invoice Item,Net Amount,خالص مقدار
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} د {1} شوی نه دی سپارل نو د عمل نه بشپړ شي
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} د {1} شوی نه دی سپارل نو د عمل نه بشپړ شي
 DocType: Purchase Order Item Supplied,BOM Detail No,هیښ تفصیلي نه
 DocType: Landed Cost Voucher,Additional Charges,اضافي تور
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),اضافي کمښت مقدار (شرکت د اسعارو)
@@ -1692,7 +1721,7 @@
 ,Support Hour Distribution,د ملاتړ وخت تقسیمول
 DocType: Maintenance Visit,Maintenance Visit,د ساتنې او سفر
 DocType: Student,Leaving Certificate Number,پریښودل سند شمیره
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}",اپارتمان فسخه شوی، مهرباني وکړئ د انوائس بیاکتنه او فسخه کول {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}",اپارتمان فسخه شوی، مهرباني وکړئ د انوائس بیاکتنه او فسخه کول {0}
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,موجود دسته Qty په ګدام
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,تازه چاپ شکل
 DocType: Landed Cost Voucher,Landed Cost Help,تيرماښام لګښت مرسته
@@ -1715,7 +1744,7 @@
 DocType: Patient,Tobacco Past Use,د تمباکو پخوانی کارول
 DocType: Sales Invoice Item,Brand Name,دتوليد نوم
 DocType: Purchase Receipt,Transporter Details,ته لېږدول، په بشپړه توګه کتل
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Default ګودام لپاره غوره توکی اړتیا
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Default ګودام لپاره غوره توکی اړتیا
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,بکس
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,ممکنه عرضه
 DocType: Budget,Monthly Distribution,میاشتنی ویش
@@ -1725,8 +1754,8 @@
 DocType: Sales Partner,Sales Partner Target,خرڅلاو همکار هدف
 DocType: Loan Type,Maximum Loan Amount,اعظمي پور مقدار
 DocType: Pricing Rule,Pricing Rule,د بیې د حاکمیت
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},د زده کوونکو د دوه ګونو رول شمېر {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},د زده کوونکو د دوه ګونو رول شمېر {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},د زده کوونکو د دوه ګونو رول شمېر {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},د زده کوونکو د دوه ګونو رول شمېر {0}
 DocType: Budget,Action if Annual Budget Exceeded,که کړنه کلنۍ بودیجه زیات شو
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,د نظم پیري موادو غوښتنه
 DocType: Shopping Cart Settings,Payment Success URL,د پیسو د برياليتوب په حافظی
@@ -1743,7 +1772,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} بايد يوازې يو ځل داسې ښکاري
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},نه ډیر اجازه tranfer {0} په پرتله {1} د اخستلو د امر په وړاندې د {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},د پاڼو په بریالیتوب سره ځانګړې {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,نه سامان ته واچوئ
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,نه سامان ته واچوئ
 DocType: Shipping Rule Condition,From Value,له ارزښت
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,دفابريکي مقدار الزامی دی
 DocType: Employee Loan,Repayment Method,دبيرته طريقه
@@ -1757,6 +1786,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,دحمل مسؤلیتونه
 DocType: Purchase Invoice,Supplier Warehouse,عرضه ګدام
 DocType: Opportunity,Contact Mobile No,د تماس د موبايل په هيڅ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,د شرکت غوره کول
 ,Material Requests for which Supplier Quotations are not created,مادي غوښتنې د کوم لپاره چې عرضه Quotations دي جوړ نه
 DocType: Student Group,Set 0 for no limit,جوړ 0 لپاره پرته، حدود نه
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,په هغه ورځ (s) چې تاسو د رخصتۍ درخواست دي رخصتي. تاسو ته اړتيا نه لري د درخواست.
@@ -1766,24 +1796,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,د داوطلبۍ د کمکیانو لپاره د
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,نور راپورونه
 DocType: Dependent Task,Dependent Task,اتکا کاري
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},لپاره د اندازه کولو واحد default تغیر فکتور باید 1 په قطار وي {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},لپاره د اندازه کولو واحد default تغیر فکتور باید 1 په قطار وي {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},د ډول رخصت {0} په پرتله نور نه شي {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,له مخکې پلان لپاره د X ورځو عملیاتو کوښښ وکړئ.
 DocType: HR Settings,Stop Birthday Reminders,Stop کالیزې په دوراني ډول
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},لطفا په شرکت Default د معاشاتو د راتلوونکې حساب جوړ {0}
 DocType: SMS Center,Receiver List,د اخيستونکي بشپړفهرست
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,د لټون د قالب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,د لټون د قالب
 DocType: Patient Appointment,Referring Physician,ډاکټر ته حواله کول
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,په مصرف مقدار
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,په نغدو خالص د بدلون
 DocType: Assessment Plan,Grading Scale,د رتبو او مقياس
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,د {0} اندازه واحد په د تغیر فکتور جدول څخه يو ځل داخل شوي دي
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,لا د بشپړ
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,د {0} اندازه واحد په د تغیر فکتور جدول څخه يو ځل داخل شوي دي
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,لا د بشپړ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,دحمل په لاس کې
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},د پیسو غوښتنه د مخکې نه شتون {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,د خپریدلو سامان لګښت
 DocType: Physician,Hospital,روغتون
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},اندازه بايد زيات نه وي {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},اندازه بايد زيات نه وي {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,مخکینی مالي کال تړل نه دی
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),عمر (ورځې)
 DocType: Quotation Item,Quotation Item,د داوطلبۍ د قالب
@@ -1794,8 +1824,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,عرضه ډول بادار.
 DocType: Purchase Order Item,Supplier Part Number,عرضه برخه شمېر
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,conversion کچه نه شي کولای 0 يا 1 وي
-DocType: Sales Invoice,Reference Document,ماخذ لاسوند
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} د {1} ده لغوه یا ودرول
+DocType: Subscription,Reference Document,ماخذ لاسوند
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} د {1} ده لغوه یا ودرول
 DocType: Accounts Settings,Credit Controller,اعتبار کنټرولر
 DocType: Delivery Note,Vehicle Dispatch Date,چلاونه د موټرو نېټه
 DocType: Healthcare Settings,Default Medical Code Standard,اصلي طبی کوډ معياري
@@ -1804,6 +1834,7 @@
 DocType: Company,Default Payable Account,Default د راتلوونکې اکانټ
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",د انلاین سودا کراچۍ امستنې لکه د لېږد د اصولو، د نرخونو لست نور
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}٪ محاسبې ته
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,د قیمت په اساس ترتیب کړئ ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,خوندي دي Qty
 DocType: Party Account,Party Account,ګوند حساب
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,بشري منابع
@@ -1815,13 +1846,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,د تادياتو د داخلولو د کمکیانو لپاره د
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,د کتارونو تر {0}: عرضه په وړاندې پرمختللی باید ډیبیټ شي
 DocType: Company,Default Values,تلواله ارزښتونو ته
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{} د فریکونسي Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{} د فریکونسي Digest
 DocType: Expense Claim,Total Amount Reimbursed,Total مقدار بیرته
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,دا په دې د موټرو پر وړاندې د يادښتونه پر بنسټ. د تفصیلاتو لپاره په لاندی مهال ویش وګورئ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},په وړاندې د عرضه صورتحساب {0} د میاشتې په {1}
 DocType: Customer,Default Price List,Default د بیې په لېست
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,د شتمنیو د غورځنګ ریکارډ {0} جوړ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,تاسې کولای شی نه ړنګول مالي کال {0}. مالي {0} کال په توګه په نړیوال امستنې default ټاکل
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,یو ورته پیرود چې ورته نوم یې شتون لري لا دمخه لا شتون لري
 DocType: Journal Entry,Entry Type,د ننوتلو ډول
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,نه د ارزونې پلان سره تړاو لري له دې ارزونې ډله
 ,Customer Credit Balance,پيرودونکو پور بیلانس
@@ -1832,7 +1864,7 @@
 DocType: Quotation,Term Details,اصطلاح په بشپړه توګه کتل
 DocType: Project,Total Sales Cost (via Sales Order),د پلورنې مجموعه لګښت (له لارې د خرڅلاو نظم)
 DocType: Project,Total Sales Cost (via Sales Order),د پلورنې مجموعه لګښت (له لارې د خرڅلاو نظم)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,په پرتله {0} د زده کوونکو لپاره له دغه زده ډلې نور شامل نه شي.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,په پرتله {0} د زده کوونکو لپاره له دغه زده ډلې نور شامل نه شي.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,اداره کوونکۍ سازمان د شمېرنې
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,اداره کوونکۍ سازمان د شمېرنې
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} بايد په پرتله ډيره وي 0
@@ -1850,9 +1882,11 @@
 DocType: Lab Test,Technician Name,د تخنیک نوم
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,د صورتحساب د فسخ کولو د پیسو Unlink
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},اوسني Odometer لوستلو ته ننوتل بايد لومړنۍ د موټرو Odometer څخه ډيره وي {0}
+DocType: Restaurant Reservation,No Show,نه ښکاره ول
 DocType: Shipping Rule Country,Shipping Rule Country,انتقال د حاکمیت د هېواد
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,پريږدئ او د حاضرۍ
 DocType: Maintenance Visit,Partially Completed,تر یوه بریده بشپړ شوي
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,منځنی حساسیت
 DocType: Leave Type,Include holidays within leaves as leaves,دننه د پاڼو په توګه پاڼي رخصتي شامل دي
 DocType: Sales Invoice,Packed Items,ډک توکی
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,سریال نمبر په وړاندې تضمین ادعا
@@ -1869,13 +1903,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),ورکړل مقدار (شرکت د اسعارو)
 DocType: Purchase Invoice,Additional Discount,اضافي کمښت
 DocType: Selling Settings,Selling Settings,خرڅول امستنې
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,عمل تایید کړئ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,په آنلاین توګه لیلام
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,لطفا يا مقدار يا ارزښت Rate یا دواړه مشخص
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,تحقق
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,محتویات یی په ګاډۍ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,بازار موندنه داخراجاتو
 ,Item Shortage Report,د قالب په کمښت کې راپور
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",د وزن دی، \ n لطفا ذکر &quot;وزن UOM&quot; هم
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",د وزن دی، \ n لطفا ذکر &quot;وزن UOM&quot; هم
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,د موادو غوښتنه د دې دحمل د داخلولو لپاره په کار وړل
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,بل د استهالک نېټه د نوي شتمنیو الزامی دی
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,جلا کورس د هر دسته بنسټ ګروپ
@@ -1888,12 +1923,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,د هر دحمل ونقل د محاسبې د داخلولو د کمکیانو لپاره
 DocType: Leave Allocation,Total Leaves Allocated,ټولې پاڼې د تخصيص
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},ګدام په کتارونو هیڅ اړتیا {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,لطفا د اعتبار وړ مالي کال د پیل او پای نیټی
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,لطفا د اعتبار وړ مالي کال د پیل او پای نیټی
 DocType: Employee,Date Of Retirement,نېټه د تقاعد
 DocType: Upload Attendance,Get Template,ترلاسه کينډۍ
 DocType: Material Request,Transferred,سپارل
 DocType: Vehicle,Doors,دروازو
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext Setup بشپړ!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext Setup بشپړ!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,د ناروغ د ثبت لپاره فیس راټول کړئ
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,د مالياتو د تګلاردا
@@ -1912,36 +1947,36 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",که د دې توکي د بېرغونو لري، نو دا په خرڅلاو امر او نور نه ټاکل شي
 DocType: Lead,Next Contact By,بل د تماس By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},مقدار په قطار د {0} د قالب اړتیا {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},مقدار په قطار د {0} د قالب اړتیا {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},ګدام {0} په توګه د قالب اندازه موجود نه ړنګ شي {1}
 DocType: Quotation,Order Type,نظم ډول
-DocType: Purchase Invoice,Notification Email Address,خبرتیا دبرېښنا ليک پته
 ,Item-wise Sales Register,د قالب-هوښيار خرڅلاو د نوم ثبتول
 DocType: Asset,Gross Purchase Amount,Gross رانيول مقدار
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,د توازن خلاصول
 DocType: Asset,Depreciation Method,د استهالک Method
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,د نالیکي
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,د نالیکي
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,آیا دا د مالياتو په اساسي Rate شامل دي؟
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Total هدف
 DocType: Job Applicant,Applicant for a Job,د دنده متقاضي
 DocType: Production Plan Material Request,Production Plan Material Request,تولید پلان د موادو غوښتنه
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,نه تولید امر جوړ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,نه تولید امر جوړ
 DocType: Stock Reconciliation,Reconciliation JSON,پخلاینې JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ډېر زيات ستنې. په راپور کې د صادرولو او د چاپولو لپاره دا وېړې پاڼې د درخواست په کارولو.
 DocType: Purchase Invoice Item,Batch No,دسته نه
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},د کوټو لپاره غوښتنه: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,د مراجعينو د اخستلو امر په وړاندې د څو خرڅلاو فرمانونو په اجازه
 DocType: Student Group Instructor,Student Group Instructor,د زده کوونکو د ډلې د لارښوونکي
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 د موبايل په هيڅ
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,اصلي
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,اصلي
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,چې د خپلې راکړې ورکړې شمیر لړ جوړ مختاړی
 DocType: Employee Attendance Tool,Employees HTML,د کارکوونکو د HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Default هیښ ({0}) باید د دې توکي او يا د هغې کېنډۍ فعاله وي
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Default هیښ ({0}) باید د دې توکي او يا د هغې کېنډۍ فعاله وي
 DocType: Employee,Leave Encashed?,ووځي Encashed؟
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,فرصت له ډګر الزامی دی
 DocType: Email Digest,Annual Expenses,د کلني لګښتونو
 DocType: Item,Variants,تانبه
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,د کمکیانو لپاره د اخستلو امر
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,د کمکیانو لپاره د اخستلو امر
 DocType: SMS Center,Send To,لېږل
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},لپاره اجازه او ډول په کافي اندازه رخصت توازن نه شته {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ځانګړې اندازه
@@ -1959,6 +1994,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,د زده کوونکو د ډلې پياوړتيا
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,ژورنال په وړاندې د انفاذ {0} نه کوم السوري {1} د ننوتلو لري
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,ارزونه
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,د روزنې پیښې
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},دوه شعبه لپاره د قالب ته ننوتل {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,لپاره يو نقل د حاکمیت شرط
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,ولیکۍ
@@ -1968,7 +2004,7 @@
 DocType: Sales Order,To Deliver and Bill,ته کول او د بیل
 DocType: Student Group,Instructors,د ښوونکو
 DocType: GL Entry,Credit Amount in Account Currency,په حساب د اسعارو د پورونو مقدار
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,هیښ {0} بايد وسپارل شي
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,هیښ {0} بايد وسپارل شي
 DocType: Authorization Control,Authorization Control,د واک ورکولو د کنټرول
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},د کتارونو تر # {0}: رد ګدام رد د قالب په وړاندې د الزامی دی {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,د پیسو
@@ -1987,11 +2023,11 @@
 DocType: Quotation Item,Actual Qty,واقعي Qty
 DocType: Sales Invoice Item,References,ماخذونه
 DocType: Quality Inspection Reading,Reading 10,لوستلو 10
-DocType: Hub Settings,Hub Node,مرکزي غوټه
+DocType: Hub Category,Hub Node,مرکزي غوټه
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,تا د دوه ګونو توکو ته ننوتل. لطفا د سمولو او بیا کوښښ وکړه.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,ملګري
 DocType: Asset Movement,Asset Movement,د شتمنیو غورځنګ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,د نوي په ګاډۍ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,د نوي په ګاډۍ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} د قالب يو serialized توکی نه دی
 DocType: SMS Center,Create Receiver List,جوړول د اخيستونکي بشپړفهرست
 DocType: Vehicle,Wheels,په عرابو
@@ -2005,15 +2041,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,د مخابراتو
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),ښيي چې د کڅوړه ده د دې د وړاندې کولو (یوازې مسوده) یوه برخه
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,د پیسو د داخلولو د کمکیانو لپاره
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},لپاره د قالب مقدار {0} بايد په پرتله کمه وي {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},لپاره د قالب مقدار {0} بايد په پرتله کمه وي {1}
 ,Sales Invoice Trends,خرڅلاو صورتحساب رجحانات
 DocType: Leave Application,Apply / Approve Leaves,Apply / پاڼي منظور کړل
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,د
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,د
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',آيا د قطار ته مراجعه يوازې که د تور د ډول دی په تیره د کتارونو تر مقدار &#39;یا د&#39; مخکینی کتارونو تر Total &#39;
 DocType: Sales Order Item,Delivery Warehouse,د سپارنې پرمهال ګدام
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,د مالي لګښت په مرکزونو کې ونه ده.
 DocType: Serial No,Delivery Document No,د سپارنې سند نه
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},لطفا په شرکت لاسته راغلې ګټه پر شتمنیو برطرف / زیان حساب &#39;جوړ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},لطفا په شرکت لاسته راغلې ګټه پر شتمنیو برطرف / زیان حساب &#39;جوړ {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,سامان له معاملو رانيول ترلاسه کړئ
 DocType: Serial No,Creation Date,جوړېدنې نېټه
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},{0} د قالب کې د بیې په لېست کې څو ځلې ښکاري {1}
@@ -2024,12 +2060,13 @@
 DocType: Student,Student Mobile Number,د زده کوونکو د موبايل په شمېر
 DocType: Item,Has Variants,لري تانبه
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,تازه ځواب
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},تاسو وخته ټاکل څخه توکي {0} د {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},تاسو وخته ټاکل څخه توکي {0} د {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,د میاشتنی ویش نوم
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,دسته تذکرو الزامی دی
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,دسته تذکرو الزامی دی
 DocType: Sales Person,Parent Sales Person,Parent خرڅلاو شخص
-DocType: Purchase Invoice,Recurring Invoice,راګرځېدل صورتحساب
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,لوړ لوړوالی
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,لومړی پروګرام غوره کړئ
 DocType: Patient Appointment,Patient Age,د ناروغۍ عمر
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,د پروژو د اداره کولو
 DocType: Supplier,Supplier of Goods or Services.,د اجناسو يا خدمتونو د عرضه.
@@ -2037,8 +2074,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,د رسیدونکي اصلي رسیدونکي حسابونه باید وکارول شي که چیرې ناروغانو ته د مشورې ورکولو تورونه ونه سپارل شي.
 DocType: Vehicle Log,Fuel Price,د ګازو د بیو
 DocType: Budget,Budget,د بودجې د
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,پرانيستی
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,د ثابت د شتمنیو د قالب باید یو غیر سټاک وي.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,پرانيستی
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,د ثابت د شتمنیو د قالب باید یو غیر سټاک وي.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",د بودجې د {0} په وړاندې د ګمارل نه شي، ځکه چې نه يو عايد يا اخراجاتو حساب
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,السته
 DocType: Student Admission,Application Form Route,د غوښتنليک فورمه لار
@@ -2052,12 +2089,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,{0} د قالب د سریال ترانسفارمرونو د تشکیلاتو نه ده. د قالب د بادار د وګورئ
 DocType: Maintenance Visit,Maintenance Time,د ساتنې او د وخت
 ,Amount to Deliver,اندازه کول
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},ورته سامان څو ځله ننوتل شوی. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,د دورې د پیل نیټه نه شي کولای د کال د پیل د تعليمي کال د نېټه چې د اصطلاح ده سره تړاو لري په پرتله مخکې وي (تعليمي کال د {}). لطفا د خرما د اصلاح او بیا کوښښ وکړه.
 DocType: Guardian,Guardian Interests,ګارډین علاقه
 DocType: Naming Series,Current Value,اوسنی ارزښت
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,لپاره د نېټې {0} څو مالي کلونو کې شتون لري. لطفا د مالي کال په شرکت جوړ
 DocType: School Settings,Instructor Records to be created by,د روزونکي ریکارډونه باید جوړ شي
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} جوړ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} جوړ
 DocType: Delivery Note Item,Against Sales Order,په وړاندې د خرڅلاو د ترتیب پر اساس
 ,Serial No Status,شعبه حالت
 DocType: Payment Entry Reference,Outstanding,بيالنس
@@ -2067,10 +2105,10 @@
 						must be greater than or equal to {2}",د کتارونو تر {0}: د ټاکل {1} Periodicity، له او تر اوسه پورې \ تر منځ توپیر باید په پرتله لویه یا د مساوي وي {2}
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,دا په دحمل پر بنسټ. وګورئ: {0} تفصيل لپاره د
 DocType: Pricing Rule,Selling,پلورل
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},مقدار د {0} د {1} مجرايي په وړاندې د {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},مقدار د {0} د {1} مجرايي په وړاندې د {2}
 DocType: Employee,Salary Information,معاش معلومات
 DocType: Sales Person,Name and Employee ID,نوم او د کارګر ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,له امله نېټه پست کوي نېټه مخکې نه شي
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,له امله نېټه پست کوي نېټه مخکې نه شي
 DocType: Website Item Group,Website Item Group,وېب پاڼه د قالب ګروپ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,دندې او مالیات
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,لطفا ماخذ نېټې ته ننوځي
@@ -2096,7 +2134,7 @@
 DocType: Issue,Resolution Details,د حل په بشپړه توګه کتل
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,تخصیصونه
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,د منلو وړ ټکي
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,مهرباني وکړی په پورته جدول د موادو غوښتنې ته ننوځي
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,مهرباني وکړی په پورته جدول د موادو غوښتنې ته ننوځي
 DocType: Item Attribute,Attribute Name,نوم منسوب
 DocType: BOM,Show In Website,خپرونه په وېب پاڼه
 DocType: Shopping Cart Settings,Show Quantity in Website,په ویب پاڼه مقدار وښایاست
@@ -2105,7 +2143,7 @@
 DocType: Item Reorder,Check in (group),په چک (ډله)
 ,Qty to Order,Qty ته اخلي.
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked",د حساب Liability یا مساوات لاندې مشر، په کوم کې ګټه / له لاسه ورکول به بک شي
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,د ټولو دندو Gantt چارت.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,د ټولو دندو Gantt چارت.
 DocType: Opportunity,Mins to First Response,ته لومړی غبرګون دقیقه
 DocType: Pricing Rule,Margin Type,څنډی ډول
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} ساعتونو
@@ -2127,36 +2165,36 @@
 DocType: Patient,Surgical History,جراحي تاریخ
 DocType: Employee,Resignation Letter Date,د استعفا ليک نېټه
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,د بیې اصول دي لا فلتر پر بنسټ اندازه.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},لطفا د ټولګې لپاره د کارمند په یوځای کېدو د نېټه {0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},لطفا د ټولګې لپاره د کارمند په یوځای کېدو د نېټه {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},لطفا د ټولګې لپاره د کارمند په یوځای کېدو د نېټه {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},لطفا د ټولګې لپاره د کارمند په یوځای کېدو د نېټه {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Total اولګښت مقدار (د وخت پاڼه له لارې)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,تکرار پيرودونکو د عوایدو
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) باید رول &#39;اخراجاتو Approver&#39; لري
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,جوړه
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,د تولید لپاره د هیښ او Qty وټاکئ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,د تولید لپاره د هیښ او Qty وټاکئ
 DocType: Asset,Depreciation Schedule,د استهالک ويش
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,خرڅلاو همکار پتې او د اړيکو
 DocType: Bank Reconciliation Detail,Against Account,په وړاندې حساب
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,نيمه ورځ نېټه بايد د تاريخ او تر اوسه پورې تر منځ وي
 DocType: Maintenance Schedule Detail,Actual Date,واقعي نېټه
 DocType: Item,Has Batch No,لري دسته نه
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},کلنی اولګښت: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},کلنی اولګښت: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),اجناسو او خدماتو د مالياتو د (GST هند)
 DocType: Delivery Note,Excise Page Number,وسیله Page شمېر
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory",شرکت، له تاريخ او د نېټه الزامی دی
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,مشوره ترلاسه کړئ
 DocType: Asset,Purchase Date,رانيول نېټه
 DocType: Employee,Personal Details,د شخصي نورولوله
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},مهرباني وکړئ ټاکل په شرکت د شتمنيو د استهالک لګښت مرکز &#39;{0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},مهرباني وکړئ ټاکل په شرکت د شتمنيو د استهالک لګښت مرکز &#39;{0}
 ,Maintenance Schedules,د ساتنې او ویش
 DocType: Task,Actual End Date (via Time Sheet),واقعي د پای نیټه (د وخت پاڼه له لارې)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},مقدار د {0} د {1} په وړاندې د {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},مقدار د {0} د {1} په وړاندې د {2} {3}
 ,Quotation Trends,د داوطلبۍ رجحانات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},د قالب ګروپ نه د توکی په توکی بادار ذکر {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,د حساب ډیبیټ باید یو ترلاسه حساب وي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,د حساب ډیبیټ باید یو ترلاسه حساب وي
 DocType: Shipping Rule Condition,Shipping Amount,انتقال مقدار
 DocType: Supplier Scorecard Period,Period Score,د دورې کچه
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,پېرېدونکي ورزیات کړئ
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,پېرېدونکي ورزیات کړئ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,انتظار مقدار
 DocType: Lab Test Template,Special,ځانګړې
 DocType: Purchase Invoice Item,Conversion Factor,د تغیر فکتور
@@ -2164,13 +2202,14 @@
 ,Vehicle Expenses,موټر داخراجاتو
 DocType: Serial No,Invoice Details,صورتحساب نورولوله
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},ګټور ژوند وروسته د ارزښت د تمې باید په پرتله لویه یا د مساوي وي {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,پېل کول
+DocType: Hub Category,Hub Category,حب کټګوري
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,موټر شمېر
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,د نېټې په اړه چې د تکراري صورتحساب به بند شي
 DocType: Employee Loan,Loan Amount,د پور مقدار
 DocType: Program Enrollment,Self-Driving Vehicle,د ځان د چلونې د وسایطو د
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,د کټګورۍ د رایو کارډونه
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},د کتارونو تر {0}: د مواد بیل نه د سامان موندل {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},د کتارونو تر {0}: د مواد بیل نه د سامان موندل {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,ټولې پاڼي {0} نه لږ وي لا تصویب پاڼي {1} مودې لپاره په پرتله
 DocType: Journal Entry,Accounts Receivable,حسابونه ترلاسه
 ,Supplier-Wise Sales Analytics,عرضه تدبيراومصلحت خرڅلاو Analytics
@@ -2182,7 +2221,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)",د موروپلار کورس (پرېږدئ خالي، که دا د موروپلار کورس برخه نه ده)
 DocType: Leave Control Panel,Leave blank if considered for all employee types,خالي پريږدئ که د کارمند ټول ډولونه په پام کې
 DocType: Landed Cost Voucher,Distribute Charges Based On,په تور د وېشلو پر بنسټ
-apps/erpnext/erpnext/hooks.py +131,Timesheets,دحاضري
+apps/erpnext/erpnext/hooks.py +140,Timesheets,دحاضري
 DocType: HR Settings,HR Settings,د بشري حقونو څانګې امستنې
 DocType: Salary Slip,net pay info,خالص د معاشونو پيژندنه
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,دا ارزښت د اصلي خرڅلاو نرخ لیست کې تازه شوی دی.
@@ -2193,7 +2232,7 @@
 DocType: Patient,B Positive,B مثبت
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",د کتارونو تر # {0}: Qty باید 1، لکه توکی يوه ثابته شتمني ده. لورينه وکړئ د څو qty جلا قطار وکاروي.
 DocType: Leave Block List Allow,Leave Block List Allow,پريږدئ بالک بشپړفهرست اجازه
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr نه شي خالي يا ځای وي
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr نه شي خالي يا ځای وي
 DocType: Patient Medical Record,Patient Medical Record,د ناروغ درملنه
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,د غیر ګروپ ګروپ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,لوبې
@@ -2210,9 +2249,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,لپاره د تبادلې نرخ د موندلو توان نلري {0} د {1} د مهمو نېټه {2}. مهرباني وکړئ د پیسو د بدلولو ریکارډ په لاسي جوړ کړي
 DocType: POS Profile,Price List,د بیې په لېست
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} اوس د مالي کال تلواله. لطفا خپل د کتنمل تازه لپاره د بدلون د اغېز لپاره.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,اخراجاتو د ادعا
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,اخراجاتو د ادعا
 DocType: Issue,Support,د ملاتړ
 ,BOM Search,هیښ پلټنه
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",په هوب کې &quot;په اسٹاک کې&quot; یا &quot;نه په ذخیره&quot; کې خپور کړئ په دې ګودام کې موجود زیرمې پورې اړه لري.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),تړل د (+ تول پرانيستل)
 DocType: Vehicle,Fuel Type,د تیلو د ډول
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,لطفا په شرکت اسعارو مشخص
@@ -2224,16 +2264,16 @@
 DocType: Healthcare Settings,Remind Before,مخکې یادونه وکړئ
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},په قطار UOM تغیر فکتور ته اړتيا ده {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",د کتارونو تر # {0}: ماخذ لاسوند ډول باید د خرڅلاو نظم یو، خرڅلاو صورتحساب یا ژورنال انفاذ وي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",د کتارونو تر # {0}: ماخذ لاسوند ډول باید د خرڅلاو نظم یو، خرڅلاو صورتحساب یا ژورنال انفاذ وي
 DocType: Salary Component,Deduction,مجرايي
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,د کتارونو تر {0}: له وخت او د وخت فرض ده.
 DocType: Stock Reconciliation Item,Amount Difference,اندازه بدلون
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},د قالب بیه لپاره زياته کړه {0} په بیې په لېست کې د {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},د قالب بیه لپاره زياته کړه {0} په بیې په لېست کې د {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,مهرباني وکړئ او دې د پلورنې کس ته ننوځي د کارګر Id
 DocType: Territory,Classification of Customers by region,له خوا د سيمې د پېرېدونکي طبقه
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,توپیر رقم بايد صفر وي
 DocType: Project,Gross Margin,Gross څنډی
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,مهرباني وکړئ لومړی تولید د قالب ته ننوځي
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,مهرباني وکړئ لومړی تولید د قالب ته ننوځي
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,محاسبه شوې بانک اعلامیه توازن
 DocType: Normal Test Template,Normal Test Template,د عادي امتحان ټکي
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,معيوبينو د کارونکي عکس
@@ -2243,21 +2283,22 @@
 DocType: Salary Slip,Total Deduction,Total Deduction
 ,Production Analytics,تولید کړي.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,دا د دې ناروغۍ په وړاندې د راکړې ورکړې پر بنسټ والړ دی. د جزیاتو لپاره لاندې مهال ویش وګورئ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,لګښت Updated
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,لګښت Updated
 DocType: Employee,Date of Birth,د زیږون نیټه
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,{0} د قالب لا ته راوړل شوي دي
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** مالي کال ** د مالي کال استازيتوب کوي. ټول د محاسبې زياتونې او نورو لويو معاملو ** مالي کال په وړاندې تعقیبیږي **.
 DocType: Opportunity,Customer / Lead Address,پيرودونکو / سوق پته
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,د سپریري کرایډ کارټ Setup
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},خبرداری: په ضمیمه کی ناسم ایس ایس د سند د {0}
-DocType: Student Admission,Eligibility,وړتيا
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,د ارزونې پلان نوم
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},خبرداری: په ضمیمه کی ناسم ایس ایس د سند د {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads",لامل تاسو سره مرسته ترلاسه سوداګرۍ، ټولې خپلې اړيکې او نور ستاسو د لامل اضافه
 DocType: Production Order Operation,Actual Operation Time,واقعي عملياتو د وخت
 DocType: Authorization Rule,Applicable To (User),د تطبیق وړ د (کارن)
 DocType: Purchase Taxes and Charges,Deduct,وضع
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Job Description
 DocType: Student Applicant,Applied,تطبیقی
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Re علني
 DocType: Sales Invoice Item,Qty as per Stock UOM,Qty هر دحمل UOM په توګه
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 نوم
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",ځانګړي خویونه پرته &quot;-&quot; &quot;.&quot;، &quot;#&quot;، او &quot;/&quot; نه په نوم لړ اجازه
@@ -2269,7 +2310,7 @@
 DocType: Request for Quotation,Manufacturing Manager,دفابريکي مدير
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},شعبه {0} لاندې ترمړوندونو تضمین دی {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,بیلتون د سپارنې يادونه په چمدان.
-apps/erpnext/erpnext/hooks.py +98,Shipments,مالونو
+apps/erpnext/erpnext/hooks.py +107,Shipments,مالونو
 DocType: Payment Entry,Total Allocated Amount (Company Currency),ټولې مقدار (شرکت د اسعارو)
 DocType: Purchase Order Item,To be delivered to customer,د دې لپاره چې د پېرېدونکو ته وسپارل شي
 DocType: BOM,Scrap Material Cost,د اوسپنې د موادو لګښت
@@ -2292,8 +2333,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,د توکو ډول ډولونه
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,وټاکئ شرکت ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,خالي پريږدئ که د ټولو څانګو په پام کې
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",د کار ډولونه (د دایمي، قرارداد، intern او داسې نور).
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} لپاره د قالب الزامی دی {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).",د کار ډولونه (د دایمي، قرارداد، intern او داسې نور).
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} لپاره د قالب الزامی دی {1}
 DocType: Process Payroll,Fortnightly,جلالت
 DocType: Currency Exchange,From Currency,څخه د پیسو د
 DocType: Vital Signs,Weight (In Kilogram),وزن (کلوگرام)
@@ -2318,7 +2359,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,لطفا د مهال ویش به په &#39;تولید مهال ویش&#39; کیکاږۍ
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,غلطيو په داسې حال کې دا الندې جدول ړنګول وو:
 DocType: Bin,Ordered Quantity,امر مقدار
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",د بیلګې په توګه &quot;د جوړوونکي وسایلو جوړولو&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",د بیلګې په توګه &quot;د جوړوونکي وسایلو جوړولو&quot;
 DocType: Grading Scale,Grading Scale Intervals,د رتبو مقیاس انټروالونه
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} د {1}: د {2} د محاسبې انفاذ کولای شي يوازې په اسعارو کړې: {3}
 DocType: Production Order,In Process,په بهیر کې
@@ -2342,11 +2383,10 @@
 DocType: Purchase Invoice,With Payment of Tax,د مالیې تادیه کولو سره
 DocType: Expense Claim Detail,Expense Claim Detail,اخراجاتو ادعا تفصیلي
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,د عرضه TRIPLICATE
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,لطفا صحيح حساب وټاکئ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,لطفا صحيح حساب وټاکئ
 DocType: Item,Weight UOM,وزن UOM
 DocType: Salary Structure Employee,Salary Structure Employee,معاش جوړښت د کارګر
 DocType: Patient,Blood Group,د وينې ګروپ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,په تمه
 DocType: Course,Course Name,کورس نوم
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,هغه کارنان چې کولای شي یو ځانګړي کارکوونکي د رخصتۍ غوښتنلیکونه تصویب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,دفتر او تجهیزاتو
@@ -2365,7 +2405,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,بيې به که بیې په لېست کې نه دی جوړ نه ښودل شي
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,لطفا د دې نقل حاکمیت يو هېواد مشخص او يا د نړۍ په نقل وګورئ
 DocType: Stock Entry,Total Incoming Value,Total راتلونکي ارزښت
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,ډیبیټ ته اړتيا ده
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,ډیبیټ ته اړتيا ده
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",ویشونو لپاره activites ستاسو د ډلې له خوا تر سره د وخت، لګښت او د بلونو د تګلورې کې مرسته وکړي
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,رانيول بیې لېست
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,د عرضه کونکي سکورټ کارډ متغیرات.
@@ -2375,7 +2415,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,قطعا د پخلاينې
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,مهرباني غوره قی کس نوم
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,تکنالوژي
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Total معاش: {0}
+DocType: Hub Settings,Unregister from Hub,د هب څخه ناباوره کول
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Total معاش: {0}
 DocType: BOM Website Operation,BOM Website Operation,هیښ وېب پاڼه د عملياتو
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,وړاندیزلیک
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,مادي غوښتنې (MRP) او د تولید امر کړي.
@@ -2387,7 +2428,9 @@
 DocType: Physician Schedule Time Slot,To Time,ته د وخت
 DocType: Authorization Rule,Approving Role (above authorized value),رول (اجازه ارزښت پورته) تصویب
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,د حساب د پور باید یو د راتلوونکې حساب وي
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},هیښ مخنیوی دی: {0} نه شي مور او يا ماشوم وي {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,مهرباني وکړئ د زده کونکي داخلي انتخاب وټاکئ کوم چې د ورکړل شوې زده کونکي غوښتونکي لپاره ضروري دی
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},هیښ مخنیوی دی: {0} نه شي مور او يا ماشوم وي {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,مهرباني وکړئ د قیمتونو د خپریدو لپاره د قیمت لیست غوره کړئ
 DocType: Production Order Operation,Completed Qty,بشپړ Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",د {0}، يوازې ډیبیټ حسابونو کولای شي د پور بل د ننوتلو په وړاندې سره وتړل شي
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,د بیې په لېست {0} معلول دی
@@ -2400,39 +2443,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} پرلپسې لپاره د قالب اړتیا {1}. تاسي چمتو {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,اوسنی ارزښت Rate
 DocType: Item,Customer Item Codes,پيرودونکو د قالب کودونه
+DocType: Training Event,Advance,پرمختګ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,د بیا ځل بیا کولو لپاره.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,په بدل کې لاسته راغلې ګټه / له لاسه ورکول
 DocType: Opportunity,Lost Reason,له لاسه دلیل
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,نوې پته
 DocType: Quality Inspection,Sample Size,نمونه اندازه
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,لطفا د رسيد سند ته ننوځي
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,ټول توکي لا له وړاندې د رسیدونو شوي
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',لطفا &#39;له Case شمیره&#39; مشخص معتبر
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',لطفا &#39;له Case شمیره&#39; مشخص معتبر
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,لا لګښت مرکزونه کولای شي ډلو لاندې کړې خو زياتونې شي غیر ډلو په وړاندې د
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,کارنان او حلال
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},تولید امر ايجاد شده: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},تولید امر ايجاد شده: {0}
 DocType: Branch,Branch,څانګه
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,د چاپونې او د عالمه
 DocType: Company,Total Monthly Sales,ټول میاشتنۍ پلورنه
 DocType: Bin,Actual Quantity,واقعي اندازه
 DocType: Shipping Rule,example: Next Day Shipping,مثال په توګه: بل د ورځې په نقل
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,شعبه {0} ونه موندل شو
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},سبسایپشن {0} دی
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},سبسایپشن {0} دی
 DocType: Fee Schedule Program,Fee Schedule Program,د فیس شیډی پروګرام
 DocType: Fee Schedule Program,Student Batch,د زده کونکو د دسته
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,* د ټبیوي امتیازونو څخه وټاکئ چېرته چې ناروغ = &#39;{0}&#39; له لارې د نښه نښه. د حد حد 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,د زده کوونکو د کمکیانو لپاره د
 DocType: Supplier Scorecard Scoring Standing,Min Grade,د ماین درجه
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},تاسو ته په دغه پروژه کې همکاري بلل شوي دي: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},طبيب نشته په {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},تاسو ته په دغه پروژه کې همکاري بلل شوي دي: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},طبيب نشته په {0}
 DocType: Leave Block List Date,Block Date,د بنديز نېټه
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},په doctype کې د دود ساحه د ګډون لیک شامل کړئ {0}
 DocType: Purchase Receipt,Supplier Delivery Note,د عرضه کولو وړاندې کول یادښت
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,اوس غوښتنه وکړه
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,اوس غوښتنه وکړه
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},واقعي Qty {0} / انتظار Qty {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},واقعي Qty {0} / انتظار Qty {1}
 DocType: Purchase Invoice,E-commerce GSTIN,ای کامرس GSTIN
 DocType: Sales Order,Not Delivered,نه تحویلوونکی
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,د تمه شوې نیټه د لیږد نیټه مخکې نشي کیدی
 ,Bank Clearance Summary,بانک چاڼېزو لنډيز
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",جوړول او هره ورځ، هفته وار او ماهوار ایمیل digests اداره کړي.
 DocType: Appraisal Goal,Appraisal Goal,د ارزونې موخه
@@ -2440,12 +2484,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,ودانۍ
 DocType: Fee Schedule,Fee Structure,د فیس جوړښت
 DocType: Timesheet Detail,Costing Amount,لګښت مقدار
-DocType: Student Admission,Application Fee,د غوښتنلیک فیس
+DocType: Student Admission Program,Application Fee,د غوښتنلیک فیس
 DocType: Process Payroll,Submit Salary Slip,سپارل معاش ټوټه
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,لپاره د قالب {0} د {1}٪ ده Maxiumm تخفیف
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,لپاره د قالب {0} د {1}٪ ده Maxiumm تخفیف
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,په حجم د وارداتو
 DocType: Sales Partner,Address & Contacts,پته او د اړيکې
 DocType: SMS Log,Sender Name,استوونکی نوم
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,د معیارونو له مخې ترتیب کړئ
 DocType: POS Profile,[Select],[انتخاب]
 DocType: Vital Signs,Blood Pressure (diastolic),د وینی فشار
 DocType: SMS Log,Sent To,لیږل شوی ورته
@@ -2453,7 +2498,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,دکمپیوتر
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,بل د تماس نېټه نه شي کولای د پخوا په وي
 DocType: Company,For Reference Only.,د ماخذ یوازې.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,انتخاب دسته نه
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,انتخاب دسته نه
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},باطلې {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,حواله انو
@@ -2469,15 +2514,15 @@
 DocType: Normal Test Items,Require Result Value,د مطلوب پایلې ارزښت
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case شمیره نه شي کولای 0 وي
 DocType: Item,Show a slideshow at the top of the page,د پاڼې په سر کې یو سلاید وښایاست
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,دوکانونه
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,دوکانونه
 DocType: Project Type,Projects Manager,د پروژې مدیر
 DocType: Serial No,Delivery Time,د لېږدون وخت
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Ageing پر بنسټ
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,اختطاف فسخه شوی
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,اختطاف فسخه شوی
 DocType: Item,End of Life,د ژوند تر پايه
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,travel
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,نه د فعال یا default معاش جوړښت وموندل لپاره کارمند {0} د ورکړل شوې خرما
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,travel
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,نه د فعال یا default معاش جوړښت وموندل لپاره کارمند {0} د ورکړل شوې خرما
 DocType: Leave Block List,Allow Users,کارنان پرېښودل
 DocType: Purchase Order,Customer Mobile No,پيرودونکو د موبايل په هيڅ
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,بیا راګرځېدل
@@ -2486,12 +2531,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,تازه لګښت
 DocType: Item Reorder,Item Reorder,د قالب ترمیمي
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,انکړپټه ښودل معاش ټوټه
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,د انتقال د موادو
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,د انتقال د موادو
 DocType: Fees,Send Payment Request,د تادیاتو غوښتنه واستوئ
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",د عملیاتو، د عملیاتي مصارفو ليکئ او نه ستاسو په عملیاتو یو بې ساری عملياتو ورکړي.
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,دغه سند له خوا حد دی {0} د {1} لپاره توکی {4}. آیا تاسو د ورته په وړاندې د بل {3} {2}؟
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,لطفا جوړ ژغورلو وروسته تکراري
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,انتخاب بدلون اندازه حساب
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,انتخاب بدلون اندازه حساب
 DocType: Purchase Invoice,Price List Currency,د اسعارو بیې لېست
 DocType: Naming Series,User must always select,کارن بايد تل انتخاب
 DocType: Stock Settings,Allow Negative Stock,د منفی دحمل اجازه
@@ -2511,7 +2556,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,د کارګر
 DocType: Sample Collection,Collected Time,راغونډ شوی وخت
 DocType: Company,Sales Monthly History,د پلور میاشتني تاریخ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,انتخاب دسته
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,انتخاب دسته
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} د {1} په بشپړه توګه بیل
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,مهم علامات
 DocType: Training Event,End Time,د پاي وخت
@@ -2519,16 +2564,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,د پیسو وضع او يا له لاسه ورکول
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,د پلورنې يا رانيول کره د قرارداد د شرطونو.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,له خوا د ګټمنو ګروپ
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,ایا تاسو ډاډه یاست چې تاسو دا ټاکل رد کړئ؟
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,خرڅلاو نل
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},لطفا په معاش برخه default ګڼون جوړ {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,اړتیا ده
 DocType: Rename Tool,File to Rename,د نوم بدلول د دوتنې
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},لطفا په کتارونو لپاره د قالب هیښ غوره {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},لطفا په کتارونو لپاره د قالب هیښ غوره {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},حساب {0} سره د شرکت د {1} کې د حساب اکر سره سمون نه خوري: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},مشخص هیښ {0} لپاره د قالب نه شته {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,د ساتنې او ویش {0} بايد بندول د دې خرڅلاو نظم مخکې لغوه شي
+DocType: POS Profile,Applicable for Users,د کاروونکو لپاره کارول
 DocType: Notification Control,Expense Claim Approved,اخراجاتو ادعا تصویب
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,د کارکوونکي معاش ټوټه {0} لا په دې موده کې جوړ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,د کارکوونکي معاش ټوټه {0} لا په دې موده کې جوړ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Pharmaceutical
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,د رانیولې سامان لګښت
 DocType: Selling Settings,Sales Order Required,خرڅلاو نظم مطلوب
@@ -2553,6 +2600,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,سازمان د
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,سازمان د
 DocType: BOM Update Tool,BOM Update Tool,د بوم تازه ډاټا
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company",د ګوند حساب ندی مشخص شوی، مهرباني وکړئ په کمپنۍ کې د ډیزاین ډیزاین حساب ترتیب کړئ
 DocType: SG Creation Tool Course,Student Group Name,د زده کونکو د ډلې نوم
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,د فیس جوړول
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,لطفا باوري تاسو په رښتيا غواړئ چې د دې شرکت د ټولو معاملو کې د ړنګولو. ستاسو بادار ارقام به پاتې شي دا. دا عمل ناکړل نه شي.
@@ -2561,29 +2609,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) د نه په پام کې quanitity څخه ډيره وي ({2}) په تولید نظم {3}
 DocType: Shipping Rule,Shipping Rule Label,انتقال حاکمیت نښه د
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,کارن فورم
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,خام مواد نه شي خالي وي.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.",کیدای شي سټاک د اوسمهالولو لپاره نه، صورتحساب لرونکی د څاڅکی انتقال توکی.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,خام مواد نه شي خالي وي.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.",کیدای شي سټاک د اوسمهالولو لپاره نه، صورتحساب لرونکی د څاڅکی انتقال توکی.
 DocType: Lab Test Sample,Lab Test Sample,د لابراتوار ازموینه
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,د چټک ژورنال انفاذ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,تاسو نه شي کولای کچه بدلون که هیښ agianst مواد یاد
+DocType: Restaurant,Invoice Series Prefix,د انوائس سایډ پریفسکس
 DocType: Employee,Previous Work Experience,مخکینی کاری تجربه
 DocType: Stock Entry,For Quantity,د مقدار
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},لطفا د قطار د {0} د قالب ته ننوځي پلان Qty {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},لطفا د قطار د {0} د قالب ته ننوځي پلان Qty {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} د {1} نه سپارل
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,لپاره شیان غوښتنې.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,جلا د توليد په موخه به د هر بشپړ ښه توکی جوړ شي.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} بايد په بدل کې سند منفي وي
 ,Minutes to First Response for Issues,د مسایل لومړی غبرګون دقيقو
 DocType: Purchase Invoice,Terms and Conditions1,اصطلاحات او Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,د انستیتوت نوم د کوم لپاره چې تاسو دا سيستم د جوړولو.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,د انستیتوت نوم د کوم لپاره چې تاسو دا سيستم د جوړولو.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",د محاسبې د ننوتلو د دې نېټې کنګل کړي، څوک کولای شي / رول د لاندې ټاکل شوي پرته د ننوتلو لپاره تعديلوي.
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,لطفا د توليد ساتنې مهال ویش مخکې د سند د ژغورلو
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,په ټولو بومونو کې تازه قیمت تازه شوی
 DocType: Fee Schedule,Successful,بریالی
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,د پروژې د حالت
 DocType: UOM,Check this to disallow fractions. (for Nos),وګورئ دا ښیی disallow. (د وځيري)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,دغه لانديني تولید امر جوړ شو:
-DocType: Student Admission,Naming Series (for Student Applicant),نوم لړۍ (لپاره د زده کونکو د متقاضي)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,دغه لانديني تولید امر جوړ شو:
+DocType: Student Admission Program,Naming Series (for Student Applicant),نوم لړۍ (لپاره د زده کونکو د متقاضي)
 DocType: Delivery Note,Transporter Name,لېږدول نوم
 DocType: Authorization Rule,Authorized Value,اجازه ارزښت
 DocType: BOM,Show Operations,خپرونه عملیاتو په
@@ -2607,7 +2656,7 @@
 ,Employees working on a holiday,د کارکوونکو په رخصتۍ کار کوي
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,مارک حاضر
 DocType: Project,% Complete Method,٪ بشپړ Method
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,نشه يي توکي
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,نشه يي توکي
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},د ساتنې د پيل نيټه د شعبه د سپارلو نېټې مخکې نه شي {0}
 DocType: Production Order,Actual End Date,واقعي د پای نیټه
 DocType: BOM,Operating Cost (Company Currency),عادي لګښت (شرکت د اسعارو)
@@ -2625,13 +2674,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,تصویب کارن نه شي کولای په همدې توګه د کارونکي د واکمنۍ ته د تطبیق وړ وي
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),اساسي کچه (په سلو کې دحمل UOM په توګه)
 DocType: SMS Log,No of Requested SMS,نه د غوښتل پیغامونه
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,پرته د معاشونو د وتو سره تصويب اجازه کاریال اسنادو سمون نه خوري
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,پرته د معاشونو د وتو سره تصويب اجازه کاریال اسنادو سمون نه خوري
 DocType: Campaign,Campaign-.####,کمپاين - ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,نور ګامونه
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,لطفا په ښه کچه د مشخص توکو د رسولو
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,انوائس جوړ کړئ
 DocType: Selling Settings,Auto close Opportunity after 15 days,د موټرونو په 15 ورځو وروسته نږدې فرصت
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,د پیرود کارډونه د {1} د سایټ کارډ ولاړ کیدو له امله {0} ته اجازه نه لري.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,د پیرود کارډونه د {1} د سایټ کارډ ولاړ کیدو له امله {0} ته اجازه نه لري.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,د پای کال
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / مشري٪
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / مشري٪
@@ -2639,6 +2688,7 @@
 DocType: Vital Signs,Nutrition Values,د تغذيې ارزښتونه
 DocType: Lab Test Template,Is billable,د اعتبار وړ دی
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",دواړه &quot;د معالج مهال ویش&quot; او د تقاعد وخت &quot;باید د ډاکټر {0} لپاره وټاکل شي.
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,د دریمې ډلې د ویشونکی- / پلورونکي / کمیسیون اجنټ / غړيتوب لری / د پلورنې لپاره د يو کميسون د شرکتونو توليدات پلوري.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} د اخستلو د امر په وړاندې د {1}
 DocType: Patient,Patient Demographics,د ناروغۍ ډیموکراسي
@@ -2679,7 +2729,7 @@
 DocType: Asset,Manual,لارښود
 DocType: Salary Component Account,Salary Component Account,معاش برخه اکانټ
 DocType: Global Defaults,Hide Currency Symbol,پټول د اسعارو سمبول
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card",د بيلګې په توګه بانک، د نقدو پیسو، کریډیټ کارټ
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card",د بيلګې په توګه بانک، د نقدو پیسو، کریډیټ کارټ
 DocType: Lead Source,Source Name,سرچینه نوم
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""",په بالغ کې د عادي آرام فشار فشار تقریبا 120 ملی ګرامه هګسټولیک دی، او 80 mmHg ډیسولیک، لنډیز &quot;120/80 mmHg&quot;
 DocType: Journal Entry,Credit Note,اعتبار يادونه
@@ -2698,16 +2748,16 @@
 DocType: Patient,Occupation,وظيفه
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,د کتارونو تر {0}: بیا نېټه دمخه بايد د پای نیټه وي
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qty)
-DocType: Sales Invoice,This Document,دا لاسوند
 DocType: Installation Note Item,Installed Qty,نصب Qty
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,دا کېدی شي د ځینو ناسمو بریښنالیک پته په دې کې وي
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,تاسو اضافه کړه
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,د روزنې د پايلو
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,د روزنې د پايلو
 DocType: Purchase Invoice,Is Paid,ده ورکړل شوې
 DocType: Salary Structure,Total Earning,Total وټې
 DocType: Purchase Receipt,Time at which materials were received,د وخت په کوم توکي ترلاسه کړ
 DocType: Stock Ledger Entry,Outgoing Rate,د تېرې Rate
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,سازمان د څانګې د بادار.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,سازمان د څانګې د بادار.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,او یا
 DocType: Sales Order,Billing Status,د بیلونو په حالت
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,یو Issue راپور
@@ -2722,8 +2772,9 @@
 DocType: Notification Control,Sales Order Message,خرڅلاو نظم پيغام
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",د ټاکلو په تلواله ارزښتونو شرکت، د اسعارو، روان مالي کال، او داسې نور په شان
 DocType: Payment Entry,Payment Type,د پیسو ډول
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,لطفا لپاره توکي داځکه غوره {0}. ته د یو واحد داځکه چې دا اړتیا پوره کوي د موندلو توان نلري
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,لطفا لپاره توکي داځکه غوره {0}. ته د یو واحد داځکه چې دا اړتیا پوره کوي د موندلو توان نلري
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,لطفا لپاره توکي داځکه غوره {0}. ته د یو واحد داځکه چې دا اړتیا پوره کوي د موندلو توان نلري
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,لطفا لپاره توکي داځکه غوره {0}. ته د یو واحد داځکه چې دا اړتیا پوره کوي د موندلو توان نلري
+DocType: Hub Category,Parent Category,د والدین کټګوري
 DocType: Process Payroll,Select Employees,انتخاب مامورین
 DocType: Opportunity,Potential Sales Deal,احتمالي خرڅلاو تړون
 DocType: Complaint,Complaints,شکایتونه
@@ -2761,7 +2812,7 @@
 DocType: Bin,Reserved Quantity,خوندي دي مقدار
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,لطفا د اعتبار وړ ایمیل ادرس ولیکۍ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,لطفا د اعتبار وړ ایمیل ادرس ولیکۍ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,مهرباني وکړئ په موټر کې یو توکي غوره کړئ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,مهرباني وکړئ په موټر کې یو توکي غوره کړئ
 DocType: Landed Cost Voucher,Purchase Receipt Items,رانيول رسيد سامان
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Customizing فورمې
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,Arrear
@@ -2771,15 +2822,15 @@
 DocType: Payment Request,Amount in customer's currency,په مشتري د پيسو اندازه
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,د سپارنې پرمهال
 DocType: Stock Reconciliation Item,Current Qty,اوسني Qty
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,سپلائر زیات کړئ
+DocType: Restaurant Menu,Restaurant Menu,د رستورانت ماین
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,قبلی
 DocType: Appraisal Goal,Key Responsibility Area,مهم مسوولیت په سیمه
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",د زده کوونکو دستو مرسته وکړي چې تاسو د زده کوونکو لپاره د حاضرۍ، د ارزونو او د فيس تعقیب کړي
 DocType: Payment Entry,Total Allocated Amount,ټولې پیسې د
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,جوړ تلوالیزه لپاره د دايمي انبار انبار حساب
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,جوړ تلوالیزه لپاره د دايمي انبار انبار حساب
 DocType: Item Reorder,Material Request Type,د موادو غوښتنه ډول
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},څخه د {0} ته د معاشونو Accural ژورنال دکانکورازموينه {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save",LocalStorage دی پوره، خو د ژغورلو نه
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save",LocalStorage دی پوره، خو د ژغورلو نه
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,د کتارونو تر {0}: UOM د تغیر فکتور الزامی دی
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,د خونې ظرفیت
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,دسرچینی یادونه
@@ -2818,16 +2869,18 @@
 DocType: Project,Task Completion,کاري پوره کول
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,نه په سټاک
 DocType: Appraisal,HR User,د بشري حقونو څانګې د کارن
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS؟
 DocType: Purchase Invoice,Taxes and Charges Deducted,مالیه او په تور مجرايي
-apps/erpnext/erpnext/hooks.py +129,Issues,مسایل
+apps/erpnext/erpnext/hooks.py +138,Issues,مسایل
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},وضعیت باید د یو وي {0}
 DocType: Sales Invoice,Debit To,د ډیبیټ
+DocType: Restaurant Menu Item,Restaurant Menu Item,د رستورانت د مینځلو توکي
 DocType: Delivery Note,Required only for sample item.,يوازې د نمونه توکی ته اړتيا لري.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,واقعي Qty د راکړې ورکړې وروسته
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},نه معاش ټوټه تر منځ موندل {0} او {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},نه معاش ټوټه تر منځ موندل {0} او {1}
 ,Pending SO Items For Purchase Request,SO سامان د اخستلو غوښتنه په تمه
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,د زده کوونکو د شمولیت
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} د {1} معلول دی
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,د زده کوونکو د شمولیت
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} د {1} معلول دی
 DocType: Supplier,Billing Currency,د بیلونو د اسعارو
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,ډېر لوی
@@ -2850,6 +2903,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,لورينه وکړئ د اړتيا کتنو نه یادونه
 DocType: Stock Settings,Default Valuation Method,تلواله ارزښت Method
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,فیس
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,اوسمهال په پرمختګ کې دی. دا ممکن یو څه وخت ونیسي.
 DocType: Vehicle Log,Fuel Qty,د تیلو د Qty
 DocType: Production Order Operation,Planned Start Time,پلان د پیل وخت
 DocType: Course,Assessment,ارزونه
@@ -2865,7 +2919,7 @@
 DocType: Price List,Price List Master,د بیې په لېست ماسټر
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ټول خرڅلاو معاملې کولی شی څو ** خرڅلاو اشخاص ** په وړاندې د سکس شي تر څو چې تاسو کولای شي او د اهدافو څخه څارنه وکړي.
 ,S.O. No.,SO شمیره
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},لطفآ د سرب د پيرودونکو رامنځته {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},لطفآ د سرب د پيرودونکو رامنځته {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,ناروغ
 DocType: Price List,Applicable for Countries,لپاره هیوادونه د تطبيق وړ
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,د پیرس نوم
@@ -2897,27 +2951,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,اخراجاتو / بدلون حساب ({0}) باید یو &#39;ګټه یا زیان&#39; حساب وي
 DocType: Project,Copied From,کاپي له
 DocType: Project,Copied From,کاپي له
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},نوم تېروتنه: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,په کمښت کې
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},نوم تېروتنه: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,په کمښت کې
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} د {1} سره تړاو نه {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,د {0} کارمند په ګډون لا د مخه په نښه
 DocType: Packing Slip,If more than one package of the same type (for print),که د همدې ډول له يوه څخه زيات بسته (د چاپي)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,مهرباني وکړئ د رستورانت ترتیباتو کې ډیزاین پیرود کړئ
 ,Salary Register,معاش د نوم ثبتول
 DocType: Warehouse,Parent Warehouse,Parent ګدام
 DocType: C-Form Invoice Detail,Net Total,خالص Total
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Default هیښ لپاره توکی ونه موندل {0} او د پروژې د {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Default هیښ لپاره توکی ونه موندل {0} او د پروژې د {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,د پور د مختلفو ډولونو تعریف
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,بيالنس مقدار
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),د وخت (په دقیقه)
 DocType: Project Task,Working,کاري
 DocType: Stock Ledger Entry,Stock Queue (FIFO),دحمل د کتار (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,مالي کال
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,مالي کال
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} کوي چې د دې شرکت سره تړاو نه لري {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,د معیارونو د سکور فعالیتونه د {0} لپاره ندی حل کولی. ډاډ ترلاسه کړئ چې فارمول اعتبار لري.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,په توګه د لګښت
 DocType: Healthcare Settings,Out Patient Settings,د ناروغۍ ترتیبات
 DocType: Account,Round Off,پړاو
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,مقدار باید مثبت وي
 ,Requested Qty,غوښتنه Qty
 DocType: Tax Rule,Use for Shopping Cart,کولر په ګاډۍ استفاده
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},ارزښت {0} د خاصې لپاره {1} نه د اعتبار د قالب په لست کې شته لپاره د قالب ارزښتونه ځانتیا {2}
@@ -2926,7 +2982,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",په تور به د خپرولو په متناسب ډول پر توکی qty يا اندازه وي، ستاسو د انتخاب په هر توګه
 DocType: Maintenance Visit,Purposes,په موخه
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,تيروخت د یوه جنس بايد په بدل کې سند سره منفي کمیت ته داخل شي
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,کورسونه اضافه کړئ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",د عملياتو {0} په پرتله په workstation هر موجود کار ساعتونو نور {1}، په څو عملیاتو کې د عملياتو تجزيه
 ,Requested,غوښتنه
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,نه څرګندونې
@@ -2938,6 +2993,8 @@
 DocType: Employee Loan,Repaid/Closed,بیرته / تړل
 DocType: Item,Total Projected Qty,ټول پيشبيني Qty
 DocType: Monthly Distribution,Distribution Name,ویش نوم
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,عرضه کوونکي&gt; د عرضه کوونکي ډول
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",د تادیاتو کچه د {0} لپاره نده موندل شوې، کوم چې د {1} {2} لپاره د حساب ورکونې اندیښنو ته اړتیا لري. که چیرې توکي په {1} کې د صفر ارزښت د اندازې په توګه لیږدول کیږي، لطفا دا د {1} توکي میز کې یادونه وکړئ. که نه نو، مهرباني وکړئ د توکو لپاره د زیرمې راتلونکی لیږد رامنځته کړئ یا د توکو ریکارډ کې د ارزښت اندازه وشمیرئ، او بیا د دې داخلي ثبت کولو / فسخ کولو هڅه وکړئ
 DocType: Course,Course Code,کورس کوډ
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},د کیفیت د تفتیش لپاره د قالب اړتیا {0}
 DocType: POS Settings,Use POS in Offline Mode,د پی ایس کارول په نالیکي اکر کې
@@ -2948,14 +3005,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Manage خاوره د ونو.
 DocType: Journal Entry Account,Sales Invoice,خرڅلاو صورتحساب
 DocType: Journal Entry Account,Party Balance,ګوند بیلانس
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,مهرباني غوره Apply کمښت د
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,مهرباني غوره Apply کمښت د
 DocType: Company,Default Receivable Account,Default ترلاسه اکانټ
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,مجموعي معاش لپاره د پورته انتخاب معیارونه ورکول د بانک د انفاذ جوړول
 DocType: Physician,Physician Schedule,د ډاکټرانو مهال ویش
 DocType: Purchase Invoice,Deemed Export,د صادراتو وضعیت
 DocType: Stock Entry,Material Transfer for Manufacture,د جوړون د توکو لېږدونه د
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,تخفیف سلنه يا په وړاندې د بیې په لېست کې او یا د ټولو د بیې په لېست کارول کيداي شي.
-DocType: Purchase Invoice,Half-yearly,Half-کلنی
+DocType: Subscription,Half-yearly,Half-کلنی
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,لپاره دحمل محاسبې انفاذ
 DocType: Lab Test,LabTest Approver,د لابراتوار تګلاره
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,تاسو مخکې د ارزونې معیارونه ارزول {}.
@@ -2984,13 +3041,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,اضافي واړه
 DocType: Company,Standard Template,معياري کينډۍ
 DocType: Training Event,Theory,تیوری
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,خبرداری: مادي غوښتل Qty دی لږ تر لږه نظم Qty څخه کم
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,خبرداری: مادي غوښتل Qty دی لږ تر لږه نظم Qty څخه کم
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,ګڼون {0} ده کنګل
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,قانوني نهاد / مستقلې سره د حسابونه د يو جلا چارت د سازمان پورې.
 DocType: Payment Request,Mute Email,ګونګ دبرېښنا ليک
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",د خوړو، او نوشابه &amp; تنباکو
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},يوازې په وړاندې پیسې unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,کمیسیون کچه نه شي کولای په پرتله 100 وي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},يوازې په وړاندې پیسې unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,کمیسیون کچه نه شي کولای په پرتله 100 وي
 DocType: Stock Entry,Subcontract,فرعي
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,لطفا {0} په لومړي
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,څخه د نه ځواب
@@ -3008,10 +3065,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,رنګ
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,د ارزونې معیارونه پلان
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,د پیرودونکو مخنیوی مخه ونیسئ
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,د منلو وړ
 DocType: Patient Appointment,Scheduled,ټاکل شوې
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,لپاره د آفرونو غوښتنه وکړي.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,مهرباني وکړئ د بشري منابعو&gt; بشري سیسټمونو کې د کارمندانو نومونې سیستم ترتیب کړئ
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",لطفا د قالب غوره هلته &quot;د دې لپاره دحمل د قالب&quot; ده &quot;نه&quot; او &quot;آیا د پلورنې د قالب&quot; د &quot;هو&quot; او نورو د محصول د بنډل نه شته
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,پیرودونکی انتخاب کړئ
 DocType: Student Log,Academic,علمي
 DocType: Patient,Personal and Social History,شخصي او ټولنیز تاریخ
 DocType: Fee Schedule,Fee Breakup for each student,د هر زده کوونکی لپاره د فیس ماتونکی
@@ -3021,7 +3079,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,سنجي Rate
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,دیزل
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,د اسعارو بیې په لېست کې نه ټاکل
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,د اسعارو بیې په لېست کې نه ټاکل
 apps/erpnext/erpnext/config/healthcare.py +46,Results,پایلې
 ,Student Monthly Attendance Sheet,د زده کوونکو میاشتنی حاضرۍ پاڼه
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},د کارګر {0} لا د پلي {1} تر منځ د {2} او {3}
@@ -3037,7 +3095,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Manage خرڅلاو همکاران.
 DocType: Quality Inspection,Inspection Type,تفتیش ډول
 DocType: Fee Validity,Visited yet,لا تر اوسه لیدل شوی
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,د موجوده د راکړې ورکړې د ګدامونو د ډلې بدل نه شي.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,د موجوده د راکړې ورکړې د ګدامونو د ډلې بدل نه شي.
 DocType: Assessment Result Tool,Result HTML,د پایلو د HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,په ختمېږي
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,زده کوونکي ورزیات کړئ
@@ -3063,7 +3121,7 @@
 DocType: Healthcare Settings,Result Printed,پایلې چاپ شوی
 DocType: Asset Category Account,Depreciation Expense Account,د استهالک اخراجاتو اکانټ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,امتحاني دوره
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},وګورئ {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},وګورئ {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,يوازې د پاڼی غوټو کې د راکړې ورکړې اجازه لري
 DocType: Expense Claim,Expense Approver,اخراجاتو Approver
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,د کتارونو تر {0}: پيرودونکو په وړاندې پرمختللی بايد پور وي
@@ -3075,7 +3133,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,ته Datetime
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,کورس ویش ړنګ:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,د SMS د وړاندې کولو او مقام د ساتلو يادښتونه
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,د خرڅلاو هدف ټاکئ
 DocType: Accounts Settings,Make Payment via Journal Entry,ژورنال انفاذ له لارې د پیسو د کمکیانو لپاره
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,چاپ شوی
 DocType: Item,Inspection Required before Delivery,د سپارنې مخکې د تفتیش د غوښتل شوي
@@ -3083,7 +3140,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,انتظار فعالیتونه
 DocType: Patient Appointment,Reminded,یادونه
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,ستاسو د سازمان
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,ستاسو د سازمان
 DocType: Fee Component,Fees Category,فیس کټه ګورۍ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,لطفا کرارولو نیټه.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,نننیو
@@ -3095,7 +3152,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,ترمیمي د ليول
 DocType: Company,Chart Of Accounts Template,د حسابونو کينډۍ چارت
 DocType: Attendance,Attendance Date,د حاضرۍ نېټه
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},د قالب د بیې د {0} په بیې په لېست کې تازه {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},د قالب د بیې د {0} په بیې په لېست کې تازه {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,معاش سترواکې بنسټ د ګټې وټې او Deduction.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,سره د ماشومانو د غوټو حساب بدل نه شي چې د پنډو
 DocType: Purchase Invoice Item,Accepted Warehouse,منل ګدام
@@ -3111,9 +3168,10 @@
 ,Employee Birthday,د کارګر کالیزې
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,د زده کوونکو د حاضرۍ دسته اوزار
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,حد اوښتي
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,ټاکل شوی
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,تصدي پلازمیینه
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,سره د دې د تعليمي کال د &#39;يوه علمي اصطلاح {0} او مهاله نوم&#39; {1} مخکې نه شتون لري. لطفا د دې زياتونې کې بدلون او بیا کوښښ وکړه.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}",لکه {0} توکی په وړاندې د موجودو معاملو شته دي، تاسو نه شي کولای د ارزښت د بدلون {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}",لکه {0} توکی په وړاندې د موجودو معاملو شته دي، تاسو نه شي کولای د ارزښت د بدلون {1}
 DocType: UOM,Must be Whole Number,باید ټول شمېر وي
 DocType: Leave Control Panel,New Leaves Allocated (In Days),نوې پاڼې د تخصيص (په ورځې)
 DocType: Purchase Invoice,Invoice Copy,صورتحساب کاپي
@@ -3123,7 +3181,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,صورتحساب شمېر
 DocType: Shopping Cart Settings,Orders,امر کړی
 DocType: Employee Leave Approver,Leave Approver,Approver ووځي
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,مهرباني وکړئ داځکه انتخاب
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,مهرباني وکړئ داځکه انتخاب
 DocType: Assessment Group,Assessment Group Name,د ارزونې ډلې نوم
 DocType: Manufacturing Settings,Material Transferred for Manufacture,د جوړون مواد سپارل
 DocType: Expense Claim,"A user with ""Expense Approver"" role",A د &quot;اخراجاتو Approver&quot; رول د کارونکي عکس
@@ -3138,7 +3196,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,د دورې په تړلو انفاذ
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,څانګه غوره کړئ ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,د موجوده معاملو لګښت مرکز ته ډلې بدل نه شي
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},مقدار د {0} د {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},مقدار د {0} د {1} {2} {3}
 DocType: Account,Depreciation,د استهالک
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),عرضه (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,د کارګر د حاضرۍ اوزار
@@ -3150,10 +3208,12 @@
 DocType: GL Entry,Voucher No,کوپون نه
 ,Lead Owner Efficiency,مشري خاوند موثريت
 ,Lead Owner Efficiency,مشري خاوند موثريت
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,ډیر مشهور
 DocType: Leave Allocation,Leave Allocation,تخصیص څخه ووځي
 DocType: Payment Request,Recipient Message And Payment Details,دترلاسه کوونکي پيغام او د پیسو په بشپړه توګه کتل
 DocType: Training Event,Trainer Email,د روزونکي دبرېښنا ليک
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,مادي غوښتنې {0} جوړ
+DocType: Restaurant Reservation,No of People,د خلکو شمیر
 DocType: Production Planning Tool,Include sub-contracted raw materials,فرعي قرارداد خام مواد شامل دي
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,د شرایطو یا د قرارداد په کينډۍ.
 DocType: Purchase Invoice,Address and Contact,پته او تماس
@@ -3162,10 +3222,11 @@
 DocType: Supplier,Last Day of the Next Month,د د راتلونکې میاشتې په وروستۍ ورځ
 DocType: Support Settings,Auto close Issue after 7 days,د موټرونو 7 ورځې وروسته له نږدې Issue
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",تر وتلو وړاندې نه شي کولای ځانګړي شي {0} په توګه رخصت انډول لا شوي دي انتقال-استولې چې په راتلونکي کې رخصت تخصيص ریکارډ {1}
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نوټ: له کبله / ماخذ نېټه له خوا د {0} په ورځ اجازه مشتريانو د پورونو ورځو څخه زيات (s)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نوټ: له کبله / ماخذ نېټه له خوا د {0} په ورځ اجازه مشتريانو د پورونو ورځو څخه زيات (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,د زده کوونکو د غوښتنليک
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,اصلي لپاره د دترلاسه
 DocType: Asset Category Account,Accumulated Depreciation Account,د استهلاک د حساب
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,دا بریښنالیک تایید شوی
 DocType: Stock Settings,Freeze Stock Entries,د يخبندان دحمل توکي
 DocType: Program Enrollment,Boarding Student,دمېړه د زده کوونکو
 DocType: Asset,Expected Value After Useful Life,د تمی وړ ارزښت ګټور ژوند وروسته
@@ -3173,7 +3234,7 @@
 DocType: Activity Cost,Billing Rate,د بیلونو په کچه
 ,Qty to Deliver,Qty ته تحویل
 ,Stock Analytics,دحمل Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,عملیاتو په خالي نه شي پاتې کېدای
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,عملیاتو په خالي نه شي پاتې کېدای
 DocType: Maintenance Visit Purpose,Against Document Detail No,په وړاندې د سند جزییات نشته
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,ګوند ډول فرض ده
 DocType: Quality Inspection,Outgoing,د تېرې
@@ -3196,7 +3257,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,د فعالیت پر بنسټ د ګروپ لپاره د انتخاب کوونکو لاسي
 DocType: Journal Entry,User Remark,کارن تبصره
 DocType: Lead,Market Segment,بازار برخه
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},ورکړل مقدار نه شي کولای ټولو منفي بيالنس مقدار څخه ډيره وي {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},ورکړل مقدار نه شي کولای ټولو منفي بيالنس مقدار څخه ډيره وي {0}
 DocType: Supplier Scorecard Period,Variables,ډولونه
 DocType: Employee Internal Work History,Employee Internal Work History,د کارګر کورني کار تاریخ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),تړل د (ډاکټر)
@@ -3226,21 +3287,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ترلاسه تازه خبرونه
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} د {1}: Account {2} کوي چې د دې شرکت سره تړاو نه لري {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,د موادو غوښتنه {0} دی لغوه یا ودرول
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,د مدیریت څخه ووځي
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,د مدیریت څخه ووځي
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,له خوا د حساب ګروپ
 DocType: Sales Order,Fully Delivered,په بشپړه توګه وسپارل شول
 DocType: Lead,Lower Income,ولسي عايداتو
+DocType: Restaurant Order Entry,Current Order,اوسنۍ امر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},سرچینه او هدف ګودام نه شي لپاره چي په کتارونو ورته وي {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",توپير حساب باید یو د شتمنیو / Liability ډول په پام کې وي، ځکه په دې کې دحمل پخلاينې يو پرانیستل انفاذ دی
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ورکړل شوي مقدار نه شي کولای د پور مقدار زیات وي {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,پروګرامونو ته لاړ شئ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},نظم لپاره د قالب اړتیا پیري {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,تولید نظم نه جوړ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,تولید نظم نه جوړ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;له نېټه باید وروسته&#39; ته د نېټه وي
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},آیا په توګه د زده کوونکو حالت بدل نه {0} کې د زده کوونکو د غوښتنلیک سره تړاو دی {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},آیا په توګه د زده کوونکو حالت بدل نه {0} کې د زده کوونکو د غوښتنلیک سره تړاو دی {1}
 DocType: Asset,Fully Depreciated,په بشپړه توګه راکم شو
 ,Stock Projected Qty,دحمل وړاندوینی Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},پيرودونکو {0} نه تړاو نه لري د پروژې د {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},پيرودونکو {0} نه تړاو نه لري د پروژې د {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,د پام وړ د حاضرۍ د HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",د داوطلبۍ دي وړانديزونه، د داوطلبۍ د خپل مشتريان تاسو ته ليږلي دي
 DocType: Sales Order,Customer's Purchase Order,پيرودونکو د اخستلو امر
@@ -3251,8 +3313,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,مهرباني وکړئ ټاکل د Depreciations شمېر بک
 DocType: Supplier Scorecard Period,Calculations,حسابونه
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,ارزښت او يا د Qty
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Productions امر لپاره نه شي مطرح شي:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Productions امر لپاره نه شي مطرح شي:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,دقیقه
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,مهرباني وکړئ د سایټ نوم نومول د Setup&gt; ترتیباتو له لارې {0} لپاره د نومونې لړۍ وټاکئ
 DocType: Purchase Invoice,Purchase Taxes and Charges,مالیات او په تور پیري
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,سپلائر ته لاړ شئ
 ,Qty to Receive,Qty له لاسه
@@ -3266,7 +3329,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,د حساب د پور باید د موازنې د پاڼه په پام کې وي
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,ټول عرضه ډولونه
 DocType: Global Defaults,Disable In Words,نافعال په وييکي
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,د قالب کوډ لازمي ده، ځکه د قالب په اتوماتيک ډول شمېر نه
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,د قالب کوډ لازمي ده، ځکه د قالب په اتوماتيک ډول شمېر نه
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},د داوطلبۍ {0} نه د ډول {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,د ساتنې او مهال ویش د قالب
 DocType: Sales Order,%  Delivered,٪ تحویلوونکی
@@ -3288,23 +3351,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,د پرانستلو په انډول مساوات
 DocType: Lead,CRM,دمراسمو
 DocType: Purchase Invoice,N,ن
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,پخلاینه
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,پاتې
 DocType: Appraisal,Appraisal,قيمت
 DocType: Purchase Invoice,GST Details,د GST تفصیلات
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},ليک ته د عرضه کوونکي ته استول {0}
+DocType: Item,Default Sales Unit of Measure,د اندازه کولو اصلي سیسټم
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,نېټه تکرار
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,اجازه لاسليک
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},approver ووځي باید د یو وي {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,فیسونه جوړ کړئ
-DocType: Hub Settings,Seller Email,پلورونکی دبرېښنا ليک
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total رانيول لګښت (له لارې رانيول صورتحساب)
 DocType: Training Event,Start Time,د پيل وخت
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,انتخاب مقدار
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,انتخاب مقدار
 DocType: Customs Tariff Number,Customs Tariff Number,د ګمرکي تعرفې شمیره
 DocType: Patient Appointment,Patient Appointment,د ناروغ ټاکنه
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,رول تصویب نه شي کولای ورته په توګه رول د واکمنۍ ته د تطبیق وړ وي
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,له دې ليک Digest وباسو
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,له دې ليک Digest وباسو
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,عرضه کونکي ترلاسه کړئ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{1} د توکي {1} لپاره ندی موندلی
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,کورسونو ته لاړ شئ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,پيغام ته وليږدول شوه
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,سره د ماشومانو د غوټو حساب نه په توګه د پنډو جوړ شي
@@ -3317,11 +3383,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,د دفابريکي مواد سپارل
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,ګڼون {0} نه شتون
 DocType: Project,Project Type,د پروژې ډول
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,د دې دندې لپاره د ماشوم دندې شتون لري. تاسو دا کار نشي کولی.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,يا هدف qty يا هدف اندازه فرض ده.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,د بیالبیلو فعالیتونو لګښت
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,نور پایلې نشته
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,د بیالبیلو فعالیتونو لګښت
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",د خوښو ته پیښی {0}، ځکه چې د کارګر ته لاندې خرڅلاو هغه اشخاص چې د وصل يو کارن تذکرو نه لري {1}
 DocType: Timesheet,Billing Details,د بیلونو په بشپړه توګه کتل
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,سرچینه او هدف ګدام بايد توپير ولري
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,سرچینه او هدف ګدام بايد توپير ولري
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},اجازه نه سټاک معاملو د اوسمهالولو په پرتله د زړو {0}
 DocType: Purchase Invoice Item,PR Detail,PR تفصیلي
 DocType: Sales Order,Fully Billed,په بشپړ ډول محاسبې ته
@@ -3348,7 +3416,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,تار بدلول
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,ټول وګوره
 DocType: Vehicle Log,Invoice Ref,صورتحساب ګروف
-DocType: Purchase Order,Recurring Order,راګرځېدل نظم
 DocType: Company,Default Income Account,Default د عوايدو د حساب
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,پيرودونکو ډله / پيرودونکو
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),ناتړل مالي کلونو ګټه / زیان (اعتبار)
@@ -3362,9 +3429,9 @@
 DocType: Patient,A Negative,منفي
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,هیڅ مطلب ته وښيي.
 DocType: Lead,From Customer,له پيرودونکو
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,غږ
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,غږ
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,یو محصول
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,دستو
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,دستو
 DocType: Project,Total Costing Amount (via Time Logs),Total لګښت مقدار (له لارې د وخت کندي)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,د فیس مهال ویش جوړ کړئ
 DocType: Purchase Order Item Supplied,Stock UOM,دحمل UOM
@@ -3389,7 +3456,7 @@
 DocType: School Settings,Current Academic Term,اوسنۍ علمي مهاله
 DocType: School Settings,Current Academic Term,اوسنۍ علمي مهاله
 DocType: Sales Order,Not Billed,نه محاسبې ته
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,دواړه ګدام بايد د همدې شرکت پورې اړه لري
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,دواړه ګدام بايد د همدې شرکت پورې اړه لري
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,نه تماسونه زياته کړه تر اوسه.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,تيرماښام لګښت ګټمنو مقدار
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,بلونه له خوا عرضه راپورته کړې.
@@ -3398,7 +3465,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,تخفیف مقدار
 DocType: Purchase Invoice,Return Against Purchase Invoice,بېرته پر وړاندې رانيول صورتحساب
 DocType: Item,Warranty Period (in days),ګرنټی د دورې (په ورځو)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',د تاییدونکي تقاعد` نوي کول sales_invoice = &#39;{0}&#39; په کوم ځای کې نوم &#39;&#39; {1} &#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,سره د اړیکو Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,له عملیاتو خالص د نغدو
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,د قالب 4
@@ -3407,8 +3473,8 @@
 DocType: Journal Entry Account,Journal Entry Account,ژورنال انفاذ اکانټ
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,د زده کونکو د ګروپ
 DocType: Shopping Cart Settings,Quotation Series,د داوطلبۍ لړۍ
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",توکی سره د ورته نوم شتون لري ({0})، لطفا د توکي ډلې نوم بدل کړي او يا د جنس نوم بدلولی شی
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,لطفا د مشتريانو د ټاکلو
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item",توکی سره د ورته نوم شتون لري ({0})، لطفا د توکي ډلې نوم بدل کړي او يا د جنس نوم بدلولی شی
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,لطفا د مشتريانو د ټاکلو
 DocType: C-Form,I,زه
 DocType: Company,Asset Depreciation Cost Center,د شتمنيو د استهالک لګښت مرکز
 DocType: Sales Order Item,Sales Order Date,خرڅلاو نظم نېټه
@@ -3417,6 +3483,7 @@
 DocType: Assessment Plan,Assessment Plan,د ارزونې پلان
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,پیرودونکی {0} جوړ شوی.
 DocType: Stock Settings,Limit Percent,حد سلنه
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,اوس مهال په کوم ګودام کې هیڅ ذخیره شتون نلري
 ,Payment Period Based On Invoice Date,د پیسو د دورې پر بنسټ د صورتحساب نېټه
 DocType: Sample Collection,No. of print,د چاپ شمیره
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},د ورکو پیسو د بدلولو د نرخونو او {0}
@@ -3472,13 +3539,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,ناخالص معاشونو - ټول Deduction - پور بيرته ورکول
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,اوسني هیښ او نوي هیښ نه شي کولای ورته وي
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,معاش ټوټه ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,معاش ټوټه ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,نېټه د تقاعد باید په پرتله د داخلیدل نېټه ډيره وي
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,غلطيو پر پلانونه جوړوي په داسې حال کې د کورس موجود وو:
 DocType: Sales Invoice,Against Income Account,په وړاندې پر عايداتو باندې حساب
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}٪ تحویلوونکی
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,د قالب {0}: د سپارښتنې qty {1} نه نظم لږ تر لږه qty {2} (په قالب تعریف) په پرتله کمه وي.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,د قالب {0}: د سپارښتنې qty {1} نه نظم لږ تر لږه qty {2} (په قالب تعریف) په پرتله کمه وي.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,میاشتنی ویش سلنه
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,لطفا د بل کاروونکي په توګه ننوتل
 DocType: Territory,Territory Targets,خاوره موخې
 DocType: Delivery Note,Transporter Info,لېږدول پيژندنه
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},لطفا په شرکت default {0} جوړ {1}
@@ -3486,13 +3554,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,ورته عرضه کړې څو ځلې داخل شوي دي
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,د ناخالصه ګټه / له لاسه ورکول
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,پیري نظم قالب برابر شوي
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,د شرکت نوم نه شي کولای د شرکت وي
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,د شرکت نوم نه شي کولای د شرکت وي
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,د چاپي کينډۍ لیک مشرانو.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,د چاپي کينډۍ عنوانونه لکه فورمه صورتحساب.
 DocType: Program Enrollment,Walking,ګرځي
 DocType: Student Guardian,Student Guardian,د زده کونکو د ګارډین
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,سنجي ډول تورونه نه په توګه د ټوليزې په نښه کولای شي
 DocType: POS Profile,Update Stock,تازه دحمل
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,په ګډون کې
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,لپاره شیان ډول UOM به د ناسم (Total) خالص وزن ارزښت لامل شي. ډاډه کړئ چې د هر توکی خالص وزن په همدې UOM ده.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,هیښ Rate
 DocType: Asset,Journal Entry for Scrap,د Scrap ژورنال انفاذ
@@ -3542,15 +3611,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",سيستم کارن (د ننوتو) پېژند. که ټاکل شوی، دا به د ټولو د بشري حقونو څانګې د فورمو default شي.
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: له {1}
 DocType: Task,depends_on,اړه لري پر
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,د ټولو موادو په وروستیو کې د وروستي قیمت نوي کولو لپاره قطع شوي. دا کیدای شي څو دقیقو وخت ونیسي.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,د ټولو موادو په وروستیو کې د وروستي قیمت نوي کولو لپاره قطع شوي. دا کیدای شي څو دقیقو وخت ونیسي.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,د نوو حساب نوم. یادونه: لطفا لپاره پېرودونکي او عرضه کوونکي حسابونو نه رامنځته کوي
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,د هیواد په تلواله پته نمونې
 DocType: Sales Order Item,Supplier delivers to Customer,عرضه کوونکي ته پيرودونکو برابروی
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# فورمه / د قالب / {0}) د ونډې څخه ده
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},له امله / ماخذ نېټه وروسته نه شي {0}
+,Sales Payment Summary,د پلور تادیات لنډیز
+DocType: Restaurant,Restaurant,رستورانت
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},له امله / ماخذ نېټه وروسته نه شي {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,په معلوماتو کې د وارداتو او صادراتو د
 DocType: Patient,Account Details,د حساب توضیحات
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,نه زده کوونکي موندل
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,نه زده کوونکي موندل
 DocType: Medical Department,Medical Department,طبی څانګه
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,د سپرایټ شمیره د کرایه کولو معیارونه
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,صورتحساب نوکرې نېټه
@@ -3561,8 +3632,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,لطفا د ګوند په ټاکلو مخکې نوکرې نېټه وټاکئ
 DocType: Program Enrollment,School House,د ښوونځي ماڼۍ
 DocType: Serial No,Out of AMC,د AMC له جملې څخه
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,لطفا د داوطلبۍ انتخاب
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,لطفا د داوطلبۍ انتخاب
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,لطفا د داوطلبۍ انتخاب
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,لطفا د داوطلبۍ انتخاب
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,د Depreciations بک شمېر نه شي کولای ټول د Depreciations شمېر څخه ډيره وي
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,د کمکیانو لپاره د ساتنې او سفر
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,لطفا د کارونکي چې د خرڅلاو ماسټر مدير {0} رول سره اړیکه
@@ -3570,7 +3641,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,شرکت (نه پيرودونکو يا عرضه) بادار.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,دا د دې د زده کوونکو د ګډون پر بنسټ
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,په هيڅ ډول زده کوونکي
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,نور توکي یا علني بشپړه فورمه ورزیات کړئ
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,نور توکي یا علني بشپړه فورمه ورزیات کړئ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,د سپارنې پرمهال یاداښتونه {0} بايد بندول د دې خرڅلاو نظم مخکې لغوه شي
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,کاروونکو ته لاړ شه
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,ورکړل اندازه + ولیکئ پړاو مقدار نه شي کولای په پرتله Grand Total ډيره وي
@@ -3590,37 +3661,39 @@
 DocType: Fee Schedule,Fee Schedule,فیس مهال ويش
 DocType: Hub Settings,Publish Availability,پیدايښت د خپرېدو
 DocType: Company,Create Chart Of Accounts Based On,د حسابونو پر بنسټ چارت جوړول
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,نشي کولای چې په غیر ګروپ بدل شي. د ماشوم دندې شتون لري.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,د زېږېدو نېټه نه شي نن څخه ډيره وي.
 ,Stock Ageing,دحمل Ageing
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},د زده کونکو د {0} زده کوونکو د درخواست په وړاندې د شته {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),د سمبالولو رژیم (د شرکت پیسو)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Timesheet
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Timesheet
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} &#39;{1}&#39; معلول دی
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,د ټاکل شويو Open
 DocType: Cheque Print Template,Scanned Cheque,سکن آرډر
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,اتومات بریښنالیکونو ته سپارل معاملو د اړيکې وليږئ.
 DocType: Timesheet,Total Billable Amount,Total Billable مقدار
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,د قالب 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,د امان داخله
 DocType: Purchase Order,Customer Contact Email,پيرودونکو سره اړيکي دبرېښنا ليک
 DocType: Warranty Claim,Item and Warranty Details,د قالب او ګرنټی نورولوله
 DocType: Sales Team,Contribution (%),بسپنه)٪ (
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,يادونه: د پیسو د داخلولو به راهیسې جوړ نه شي &#39;د نغدي او يا بانک حساب ته&#39; نه مشخص
 DocType: Medical Department,Nursing User,د نرس کولو کارن
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,مسؤليتونه
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,د دې نرخ د اعتبار موده پای ته رسیدلې ده.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,د دې نرخ د اعتبار موده پای ته رسیدلې ده.
 DocType: Expense Claim Account,Expense Claim Account,اخراجاتو ادعا اکانټ
 DocType: Accounts Settings,Allow Stale Exchange Rates,د سټلایټ تبادلې نرخونو ته اجازه ورکړئ
 DocType: Sales Person,Sales Person Name,خرڅلاو شخص نوم
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,مهرباني وکړی په جدول تيروخت 1 صورتحساب ته ننوځي
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,کارنان ورزیات کړئ
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,کارنان ورزیات کړئ
 DocType: POS Item Group,Item Group,د قالب ګروپ
 DocType: Item,Safety Stock,د خونديتوب دحمل
 DocType: Healthcare Settings,Healthcare Settings,د روغتیا پاملرنې ترتیبونه
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,لپاره د کاري پرمختګ٪ نه شي کولای 100 څخه زيات وي.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,لپاره د کاري پرمختګ٪ نه شي کولای 100 څخه زيات وي.
 DocType: Stock Reconciliation Item,Before reconciliation,مخکې له پخلاینې
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},د {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),مالیه او په تور د ورزیاتولو (شرکت د اسعارو)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,د قالب د مالياتو د کتارونو تر {0} بايد د ډول د مالياتو او يا د عايداتو او يا اخراجاتو یا Chargeable ګڼون لری
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,د قالب د مالياتو د کتارونو تر {0} بايد د ډول د مالياتو او يا د عايداتو او يا اخراجاتو یا Chargeable ګڼون لری
 DocType: Sales Order,Partly Billed,خفيف د محاسبې
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,د قالب {0} بايد يوه ثابته شتمني د قالب وي
 DocType: Item,Default BOM,default هیښ
@@ -3636,6 +3709,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,variable
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,څخه د سپارنې يادونه
 DocType: Student,Student Email Address,د زده کوونکو دبرېښنا ليک پته:
+DocType: Item,Hub Warehouse,هب ګودام
 DocType: Physician Schedule Time Slot,From Time,له وخت
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,په ګدام کښي:
 DocType: Notification Control,Custom Message,د ګمرکونو پيغام
@@ -3644,9 +3718,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,د زده کوونکو پته
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,د زده کوونکو پته
 DocType: Purchase Invoice,Price List Exchange Rate,د بیې په لېست د بدلولو نرخ
+DocType: POS Profile,POS Profile Name,د پی ایس پی ایل نوم
 DocType: Purchase Invoice Item,Rate,Rate
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,پته نوم
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,پته نوم
 DocType: Stock Entry,From BOM,له هیښ
 DocType: Assessment Code,Assessment Code,ارزونه کوډ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,د اساسي
@@ -3660,11 +3735,12 @@
 DocType: Salary Slip,Salary Structure,معاش جوړښت
 DocType: Account,Bank,بانک د
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,هوايي شرکت
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Issue مواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Issue مواد
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,د بیا ځلې کولو په وخت کې یوه تېروتنه رامنځته شوه
 DocType: Material Request Item,For Warehouse,د ګدام
 DocType: Employee,Offer Date,وړاندیز نېټه
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Quotations
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,تاسو په نالیکي اکر کې دي. تاسو به ونه کړای شي تر هغه وخته چې د شبکې لري بيا راولېښئ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,تاسو په نالیکي اکر کې دي. تاسو به ونه کړای شي تر هغه وخته چې د شبکې لري بيا راولېښئ.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,نه د زده کوونکو ډلو جوړ.
 DocType: Purchase Invoice Item,Serial No,پر له پسې ګڼه
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,میاشتنی پور بيرته مقدار نه شي کولای د پور مقدار زیات شي
@@ -3674,17 +3750,18 @@
 DocType: Salary Slip,Total Working Hours,Total کاري ساعتونه
 DocType: Subscription,Next Schedule Date,د بل شیدو نیټه
 DocType: Stock Entry,Including items for sub assemblies,په شمول د فرعي شوراګانو لپاره شیان
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,وليکئ ارزښت باید مثبتې وي
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,ټول سیمې
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,وليکئ ارزښت باید مثبتې وي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,ټول سیمې
 DocType: Purchase Invoice,Items,توکي
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,د زده کوونکو د مخکې شامل.
 DocType: Fiscal Year,Year Name,کال نوم
 DocType: Process Payroll,Process Payroll,د بهیر د معاشاتو
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,په دې مياشت کاري ورځو څخه زيات د رخصتيو په شتون لري.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,په دې مياشت کاري ورځو څخه زيات د رخصتيو په شتون لري.
 DocType: Product Bundle Item,Product Bundle Item,د محصول د بنډل په قالب
 DocType: Sales Partner,Sales Partner Name,خرڅلاو همکار نوم
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,د داوطلبۍ غوښتنه
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,د داوطلبۍ غوښتنه
 DocType: Payment Reconciliation,Maximum Invoice Amount,اعظمي صورتحساب مقدار
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,هانټولوژی
 DocType: Normal Test Items,Normal Test Items,د عادي ازموینې توکي
 DocType: Student Language,Student Language,د زده کوونکو ژبه
 apps/erpnext/erpnext/config/selling.py +23,Customers,پېرودونکي
@@ -3696,10 +3773,11 @@
 DocType: Issue,Opening Time,د پرانستلو په وخت
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,څخه او د خرما اړتیا
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,امنيت &amp; Commodity exchanges
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',د variant اندازه Default واحد &#39;{0}&#39; باید په کينډۍ ورته وي &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',د variant اندازه Default واحد &#39;{0}&#39; باید په کينډۍ ورته وي &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,محاسبه په اساس
 DocType: Delivery Note Item,From Warehouse,له ګدام
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,سره د توکو بیل نه توکي تولید
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,سره د توکو بیل نه توکي تولید
+DocType: Restaurant,Default Customer,اصلي پیرودونکی
 DocType: Assessment Plan,Supervisor Name,څارونکي نوم
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,دا تایید نه کړئ که چیرې د ورته ورځې لپاره ټاکنې جوړې شي
 DocType: Program Enrollment Course,Program Enrollment Course,پروګرام شمولیت کورس
@@ -3727,7 +3805,7 @@
 DocType: Payment Entry,Internal Transfer,کورني انتقال
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,د دې په پام کې د ماشومانو د حساب موجود دی. تاسو نه شي کولای دغه بانکی حساب د ړنګولو.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,يا هدف qty يا هدف اندازه فرض ده
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},نه default هیښ لپاره د قالب موجود {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},نه default هیښ لپاره د قالب موجود {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,مهرباني وکړئ لومړی انتخاب نوکرې نېټه
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,پرانيستل نېټه بايد تړل د نیټې څخه مخکې وي
 DocType: Leave Control Panel,Carry Forward,مخ په وړاندې ترسره کړي
@@ -3763,6 +3841,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Total حاضر
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,د محاسبې څرګندونې
 DocType: Drug Prescription,Hour,ساعت
+DocType: Restaurant Order Entry,Last Sales Invoice,د پلورنې وروستنی تیلیفون
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,نوی شعبه نه شي ګدام لري. ګدام باید د سټاک انفاذ يا رانيول رسيد جوړ شي
 DocType: Lead,Lead Type,سرب د ډول
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,تاسو اختيار نه لري چې پر بالک نیټی پاڼو تصویب
@@ -3799,65 +3878,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,کارنان جوړول
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,ګرام
 DocType: Supplier Scorecard,Per Month,په میاشت کې
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,مقدار تولید باید په پرتله 0 ډيره وي.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,مقدار تولید باید په پرتله 0 ډيره وي.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,د ساتنې غوښتنې ته راپور ته سفر وکړي.
 DocType: Stock Entry,Update Rate and Availability,تازه Rate او پیدايښت
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,سلنه تاسو اجازه لري چې د تر لاسه او یا د کمیت امر په وړاندې د زيات ورسوي. د مثال په توګه: که تاسو د 100 واحدونو ته امر وکړ. او ستاسو امتياز٪ 10 نو بيا تاسو ته اجازه لري چې 110 واحدونه ترلاسه ده.
 DocType: POS Customer Group,Customer Group,پيرودونکو ګروپ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),نوي دسته تذکرو (اختیاري)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),نوي دسته تذکرو (اختیاري)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),نوي دسته تذکرو (اختیاري)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),نوي دسته تذکرو (اختیاري)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},اخراجاتو حساب لپاره توکی الزامی دی {0}
 DocType: BOM,Website Description,وېب پاڼه Description
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,په مساوات خالص د بدلون
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,نوي
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,لطفا لغوه رانيول صورتحساب {0} په لومړي
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",دبرېښنا ليک پته بايد د بې سارې وي، له مخکې د شتون {0}
 DocType: Serial No,AMC Expiry Date,AMC د پای نېټه
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,رسيد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,رسيد
 ,Sales Register,خرڅلاو د نوم ثبتول
 DocType: Daily Work Summary Settings Company,Send Emails At,برېښناليک وليږئ کې
 DocType: Quotation,Quotation Lost Reason,د داوطلبۍ ورک دلیل
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,ستاسو د Domain وټاکئ
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',* د ټیب څخه وټاکئ چیرې چې نوم = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},د راکړې ورکړې اشاره نه {0} د میاشتې په {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},د راکړې ورکړې اشاره نه {0} د میاشتې په {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,هيڅ د سمولو لپاره شتون لري.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,د فارم لید
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,لنډيز لپاره د دې مياشتې او په تمه فعالیتونو
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,د فارم لید
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,لنډيز لپاره د دې مياشتې او په تمه فعالیتونو
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.",کاروونکي د خپل ځان پرته بل سازمان ته اضافه کړئ.
 DocType: Customer Group,Customer Group Name,پيرودونکو ډلې نوم
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,نه پېرېدونکي تر اوسه!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,نه پېرېدونکي تر اوسه!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,نقدو پیسو د جریان اعلامیه
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},د پور مقدار نه شي کولای د اعظمي پور مقدار زیات {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,منښتليک
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},لطفا لرې دې صورتحساب {0} څخه C-فورمه {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},لطفا لرې دې صورتحساب {0} څخه C-فورمه {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,مهرباني غوره مخ په وړاندې ترسره کړي که تاسو هم غواړي چې عبارت دي د تېر مالي کال د توازن د دې مالي کال ته روان شو
 DocType: GL Entry,Against Voucher Type,په وړاندې د ګټمنو ډول
 DocType: Physician,Phone (R),تلیفون (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,د وخت وختونه شامل دي
 DocType: Item,Attributes,صفات
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,کينډۍ فعالول
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,مهرباني وکړئ د سایټ نوم نومول د Setup&gt; ترتیباتو له لارې {0} لپاره د نومونې لړۍ وټاکئ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,لطفا حساب ولیکئ پړاو
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,تېره نظم نېټه
 DocType: Patient,B Negative,B منفي
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ګڼون {0} کوي شرکت ته نه پورې {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,په قطار {0} سریال شمیرې سره د سپارلو يادونه سره سمون نه خوري
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,په قطار {0} سریال شمیرې سره د سپارلو يادونه سره سمون نه خوري
 DocType: Student,Guardian Details,د ګارډین په بشپړه توګه کتل
 DocType: C-Form,C-Form,C-فورمه
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,د څو کارکوونکي مارک حاضريدل
 DocType: Vehicle,Chassis No,Chassis نه
 DocType: Payment Request,Initiated,پیل
 DocType: Production Order,Planned Start Date,پلان د پیل نیټه
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,مهرباني وکړئ BOM غوره کړئ
 DocType: Serial No,Creation Document Type,د خلقت د سند ډول
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,د پای نیټه باید د پیل نیټې څخه ډیره وي
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,د پای نیټه باید د پیل نیټې څخه ډیره وي
 DocType: Leave Type,Is Encash,ده Encash
 DocType: Leave Allocation,New Leaves Allocated,نوې پاڼې د تخصيص
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,د پروژې-هوښيار معلوماتو لپاره د داوطلبۍ شتون نه لري
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,په پای کې
 DocType: Project,Expected End Date,د تمی د پای نیټه
 DocType: Budget Account,Budget Amount,د بودجې د مقدار
 DocType: Appraisal Template,Appraisal Template Title,ارزونې کينډۍ عنوان
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},له نېټه {0} د کارکوونکی د {1} مخکې د کارکوونکي د یوځای نېټه نه وي {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,سوداګریز
 DocType: Patient,Alcohol Current Use,شرابو اوسنۍ استعمال
+DocType: Student Admission Program,Student Admission Program,د زده کوونکو د داخلیدو پروګرام
 DocType: Payment Entry,Account Paid To,حساب ته تحویلیږي.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,{0} د موروپلار د قالب باید یو دحمل د قالب نه وي
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,ټول محصولات او یا خدمتونه.
@@ -3866,30 +3947,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} لپاره د حساب د بودجې د {1} په وړاندې د {2} {3} دی {4}. دا به د زیات {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',د کتارونو تر {0} # حساب بايد د ډول وي شتمن &#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,له جملې څخه Qty
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,اصول د يو خرڅلاو لپاره انتقال د مقدار دمحاسبې
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,او په معلول معلولیت لرونکی
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,لړۍ الزامی دی
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,مالي خدمتونه
 DocType: Student Sibling,Student ID,زده کوونکي د پیژندنې
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,لپاره د وخت کندي د فعالیتونو ډولونه
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,د پیرودونکي برېښلیک
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,لپاره د وخت کندي د فعالیتونو ډولونه
 DocType: Tax Rule,Sales,خرڅلاو
 DocType: Stock Entry Detail,Basic Amount,اساسي مقدار
 DocType: Training Event,Exam,ازموينه
 DocType: Complaint,Complaint,شکایت
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},ګدام لپاره سټاک د قالب اړتیا {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},ګدام لپاره سټاک د قالب اړتیا {0}
 DocType: Leave Allocation,Unused leaves,ناکارېدلې پاڼي
 DocType: Patient,Alcohol Past Use,الکولي پخوانی کارول
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,CR
 DocType: Tax Rule,Billing State,د بیلونو د بهرنیو چارو
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,د انتقال د
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),چاودنه هیښ (فرعي شوراګانو په ګډون) د راوړلو
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,د انتقال د
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),چاودنه هیښ (فرعي شوراګانو په ګډون) د راوړلو
 DocType: Authorization Rule,Applicable To (Employee),د تطبیق وړ د (کارکوونکی)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,له امله نېټه الزامی دی
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,له امله نېټه الزامی دی
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,د خاصې لپاره بهرمن {0} 0 نه شي
 DocType: Journal Entry,Pay To / Recd From,د / Recd له ورکړي
 DocType: Naming Series,Setup Series,Setup لړۍ
 DocType: Payment Reconciliation,To Invoice Date,ته صورتحساب نېټه
 DocType: Supplier,Contact HTML,د تماس د HTML
 ,Inactive Customers,ناچارنده پېرودونکي
+DocType: Student Admission Program,Maximum Age,لوړ عمر
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,معاملو رانيول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,څنګه د بیې د حاکمیت د اجرا وړ ده؟
@@ -3908,6 +3991,7 @@
 DocType: GL Entry,Remarks,څرګندونې
 DocType: Payment Entry,Account Paid From,حساب ورکړل له
 DocType: Purchase Order Item Supplied,Raw Material Item Code,لومړنیو توکو د قالب کوډ
+DocType: Task,Parent Task,د والدین دندې
 DocType: Journal Entry,Write Off Based On,ولیکئ پړاو پر بنسټ
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,د کمکیانو لپاره د مشرتابه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,چاپ او قرطاسيه
@@ -3916,20 +4000,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",معاش لا د تر منځ د {0} او {1}، پريږدئ درخواست موده دې نېټې لړ تر منځ نه وي موده پروسس.
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,لپاره د سریال شمیره نصب ریکارډ
 DocType: Guardian Interest,Guardian Interest,د ګارډین په زړه پوري
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,د پیسو د انوز لپاره د بیالبیلو ارزښتونو ترتیبول
 apps/erpnext/erpnext/config/hr.py +177,Training,د روزنې
 DocType: Timesheet,Employee Detail,د کارګر تفصیلي
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 بريښناليک ID
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 بريښناليک ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,بل نېټه د ورځې او د مياشتې په ورځ تکرار بايد مساوي وي
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,بل نېټه د ورځې او د مياشتې په ورځ تکرار بايد مساوي وي
 DocType: Lab Prescription,Test Code,د ازموینې کود
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,د ویب پاڼه امستنې
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},RFJs د {1} لپاره د سکډورډ کارډ له امله اجازه نه لري {1}
 DocType: Offer Letter,Awaiting Response,په تمه غبرګون
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,پورته
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},ټوله شمیره {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},ناباوره ځانتیا د {0} د {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},ټوله شمیره {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},ناباوره ځانتیا د {0} د {1}
 DocType: Supplier,Mention if non-standard payable account,یادونه که غیر معیاري د تادیې وړ حساب
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},ورته توکی دی څو ځله داخل شوي دي. {لست}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',لطفا د ارزونې په پرتله &#39;ټول ارزونه ډلو د نورو ګروپ غوره
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Row {0}: د توکو لپاره د لګښت مرکز ته اړتیا ده {1}
 DocType: Training Event Employee,Optional,اختیاري
@@ -3954,11 +4038,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,څخه د محصول د بنډل توکي ترلاسه کړئ
 DocType: Asset,Straight Line,سیده کرښه
 DocType: Project User,Project User,د پروژې د کارن
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,وېشل شوى
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,وېشل شوى
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,وېشل شوى
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,وېشل شوى
 DocType: GL Entry,Is Advance,ده پرمختللی
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,د حاضرۍ له تاريخ او د حاضرۍ ته د نېټه الزامی دی
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,لطفا &#39;د دې لپاره قرارداد&#39; په توګه هو یا نه
+DocType: Item,Default Purchase Unit of Measure,د ماین پاکي د اصلي پیرود څانګه
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,تېر مخابراتو نېټه
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,تېر مخابراتو نېټه
 DocType: Sales Team,Contact No.,د تماس شمیره
@@ -3967,7 +4052,6 @@
 DocType: Production Order,Check if material transfer entry is not required,وګورئ که د موادو د ليږدونې د ننوتلو ته اړتيا نه ده
 DocType: Production Order,Check if material transfer entry is not required,وګورئ که د موادو د ليږدونې د ننوتلو ته اړتيا نه ده
 DocType: Program Enrollment Tool,Get Students From,زده کونکي له ترلاسه کړئ
-DocType: Hub Settings,Seller Country,پلورونکی هېواد
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,په وېب پاڼه د خپرېدو لپاره توکي
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,ګروپ په دستو ستاسو د زده کوونکو
 DocType: Authorization Rule,Authorization Rule,د واک ورکولو د حاکمیت
@@ -3977,8 +4061,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,خرڅلاو مالیات او په تور کينډۍ
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Total (اعتبار)
 DocType: Repayment Schedule,Payment Date,د تادیاتو نېټه
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,نوي دسته Qty
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,نوي دسته Qty
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,نوي دسته Qty
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,نوي دسته Qty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,پوښاک تلسکوپی
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,نشي کولی د وزن شوي سکور فعالیتونه حل کړي. ډاډ ترلاسه کړئ چې فارمول اعتبار لري.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,د نظم شمېر
@@ -3996,6 +4080,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",د کتارونو تر # {0}: د شتمنیو د {1} نه شي وړاندې شي، دا لا دی {2}
 DocType: Tax Rule,Billing Country,د بیلونو د هېواد
 DocType: Purchase Order Item,Expected Delivery Date,د تمی د سپارلو نېټه
+DocType: Restaurant Order Entry,Restaurant Order Entry,د رستورانت امر
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ډیبیټ او اعتبار د {0} # مساوي نه {1}. توپير دی {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,ساعتېري داخراجاتو
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,د موادو غوښتنه د کمکیانو لپاره د
@@ -4008,7 +4093,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,سره د موجوده د راکړې ورکړې حساب نه ړنګ شي
 DocType: Vehicle,Last Carbon Check,تېره کاربن Check
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,قانوني داخراجاتو
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,لطفا د قطار په کمیت وټاکي
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,لطفا د قطار په کمیت وټاکي
 DocType: Purchase Invoice,Posting Time,نوکرې وخت
 DocType: Timesheet,% Amount Billed,٪ بیل د
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telephone داخراجاتو
@@ -4021,6 +4106,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,نوي پېرېدونکي د عوایدو
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,د سفر لګښت
 DocType: Maintenance Visit,Breakdown,د ماشین یا د ګاډي ناڅاپه خرابېدل
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},په doctype کې د ګمرک ساحه ګډون کړئ {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,ګڼون: {0} سره اسعارو: {1} غوره نه شي
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",د BOM تازه معلومات د مهال ویش له لارې لګښت کوي، د قیمت د قیمت د نرخ / د نرخونو نرخ / د خامو موادو اخیستل شوي نرخ پر اساس.
 DocType: Bank Reconciliation Detail,Cheque Date,آرډر نېټه
@@ -4045,7 +4131,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Total اولګښت مقدار (له لارې د وخت کندي)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,عرضه Id
 DocType: Payment Request,Payment Gateway Details,د پیسو ليدونکی نورولوله
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,مقدار باید په پرتله ډيره وي 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,مقدار باید په پرتله ډيره وي 0
 DocType: Journal Entry,Cash Entry,د نغدو پیسو د داخلولو
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,د ماشومانو د غوټو يوازې ډله &#39;ډول غوټو لاندې جوړ شي
 DocType: Leave Application,Half Day Date,نيمه ورځ نېټه
@@ -4063,12 +4149,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,يادونه: د قالب {0} څو ځلې ننوتل
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,ټول د اړيکې.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,شرکت Abbreviation
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,کارن {0} نه شته
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,کارن {0} نه شته
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,لنډیزونه
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,د پیسو د داخلولو د مخکې نه شتون
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,نه authroized راهیسې {0} حدودو څخه تجاوز
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,معاش کېنډۍ د بادار.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,پیژندولو
+DocType: Restaurant Order Entry,Restaurant Table,د رستورانت میز
 DocType: Leave Type,Max Days Leave Allowed,Max ورځې د وتلو اجازه ورکړي
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,د سودا کراچۍ جوړ د مالياتو د حاکمیت
 DocType: Purchase Invoice,Taxes and Charges Added,مالیه او په تور د ورزیاتولو
@@ -4080,10 +4168,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ته د ياه یا پېرېدونکي له قوله.
 DocType: Stock Settings,Role Allowed to edit frozen stock,رول اجازه کنګل سټاک د سمولو
 ,Territory Target Variance Item Group-Wise,خاوره د هدف وړ توپیر د قالب ګروپ تدبيراومصلحت
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,ټول پيرودونکو ډلې
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,ټول پيرودونکو ډلې
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,جمع میاشتنی
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} الزامی دی. ښايي د پیسو د بدلولو ریکارډ نه د {1} د {2} جوړ.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,د مالياتو د کينډۍ الزامی دی.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,د مالياتو د کينډۍ الزامی دی.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,ګڼون {0}: Parent حساب {1} نه شته
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),د بیې په لېست کچه (د شرکت د اسعارو)
 DocType: Products Settings,Products Settings,محصوالت امستنې
@@ -4109,13 +4197,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,د قالب تدبيراومصلحت سره د مالياتو د تفصیلي
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,انستیتوت Abbreviation
 ,Item-wise Price List Rate,د قالب-هوښيار بیې په لېست کې و ارزوئ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,عرضه کوونکي د داوطلبۍ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,عرضه کوونکي د داوطلبۍ
 DocType: Quotation,In Words will be visible once you save the Quotation.,په کلیمو کې به د ليدو وړ وي. هر کله چې تاسو د داوطلبۍ وژغوري.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},مقدار ({0}) نه په قطار یوه برخه وي {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},مقدار ({0}) نه په قطار یوه برخه وي {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Barcode {0} د مخه په قالب کارول {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Barcode {0} د مخه په قالب کارول {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,د زياته کړه لېږد لګښتونه اصول.
 DocType: Item,Opening Stock,پرانيستل دحمل
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,پيرودونکو ته اړتيا ده
@@ -4133,9 +4221,8 @@
 DocType: Customer,From Lead,له کوونکۍ
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,امر د تولید لپاره د خوشې شول.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,مالي کال لپاره وټاکه ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS د پېژندنې اړتيا ته POS انفاذ لپاره
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS د پېژندنې اړتيا ته POS انفاذ لپاره
 DocType: Program Enrollment Tool,Enroll Students,زده کوونکي شامل کړي
-DocType: Hub Settings,Name Token,نوم د نښې
 DocType: Lab Test,Approved Date,منظور شوی نیټه
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,معياري پلورل
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,تيروخت يو ګودام الزامی دی
@@ -4153,7 +4240,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,د بشري منابعو
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,قطعا د پخلاينې د پیسو
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,د مالياتو د جايدادونو د
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},د تولید د ترتیب شوی دی {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},د تولید د ترتیب شوی دی {0}
 DocType: BOM Item,BOM No,هیښ نه
 DocType: Instructor,INS/,ISP د /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,ژورنال انفاذ {0} نه په پام کې نه لري د {1} يا لا نه خوری نورو کوپون پر وړاندې د
@@ -4173,8 +4260,8 @@
 DocType: Currency Exchange,To Currency,د پیسو د
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,اجازه لاندې کاروونکو لپاره د بنديز ورځو اجازه غوښتنلیکونه تصویب کړي.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,د اخراجاتو ادعا ډولونه.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},د پلورلو لپاره د توکی کچه {0} کمه ده چې د خپلو {1}. خرڅول کچه باید تيروخت {2}
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},د پلورلو لپاره د توکی کچه {0} کمه ده چې د خپلو {1}. خرڅول کچه باید تيروخت {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},د پلورلو لپاره د توکی کچه {0} کمه ده چې د خپلو {1}. خرڅول کچه باید تيروخت {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},د پلورلو لپاره د توکی کچه {0} کمه ده چې د خپلو {1}. خرڅول کچه باید تيروخت {2}
 DocType: Item,Taxes,مالیات
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,ورکړل او نه تحویلوونکی
 DocType: Project,Default Cost Center,Default لګښت مرکز
@@ -4188,15 +4275,15 @@
 DocType: Employee Loan,Fully Disbursed,په بشپړه توګه مصرف
 DocType: Maintenance Visit,Customer Feedback,پيرودونکو Feedback
 DocType: Account,Expense,اخراجاتو
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,نمره نه شي کولای اعظمې نمره په پرتله زیات وي
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,نمره نه شي کولای اعظمې نمره په پرتله زیات وي
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,پیرودونکي او سپلونکي
 DocType: Item Attribute,From Range,له Range
 DocType: BOM,Set rate of sub-assembly item based on BOM,د BOM پر بنسټ د فرعي شورا توکي ټاکئ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},په فورمول يا حالت العروض تېروتنه: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},په فورمول يا حالت العروض تېروتنه: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,هره ورځ د کار لنډیز امستنې شرکت
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,د قالب {0} ځکه چې له پامه غورځول يوه سټاک توکی نه دی
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,د نور د پروسس د دې تولید نظم ته وړاندې کړي.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,د نور د پروسس د دې تولید نظم ته وړاندې کړي.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",ته په یوه ځانګړی د راکړې ورکړې د بیو د حاکمیت د پلي کېدو وړ نه، ټولو تطبيقېدونکو د بیې اصول بايد نافعال شي.
 DocType: Assessment Group,Parent Assessment Group,د موروپلار د ارزونې ګروپ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,دندې
@@ -4213,12 +4300,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',لطفا جوړ شرکت چاڼ خالي که ډله په دی شرکت
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,نوکرې نېټه نه شي کولای راتلونکې نیټه وي.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},د کتارونو تر # {0}: شعبه {1} سره سمون نه خوري {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,د بیا تکرارولو لپاره
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,واله ته لاړل
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,د لابراتوار ازموینه.
 DocType: Batch,Batch ID,دسته ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},یادونه: {0}
 ,Delivery Note Trends,د سپارنې پرمهال يادونه رجحانات
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,دا اونۍ د لنډيز
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,دا اونۍ د لنډيز
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,په سټاک Qty
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,ګڼون: {0} يوازې دحمل معاملې له لارې تازه شي
 DocType: Student Group Creation Tool,Get Courses,کورسونه ترلاسه کړئ
@@ -4232,7 +4320,6 @@
 DocType: Purchase Order,To Bill,ته بیل
 DocType: Material Request,% Ordered,٪ د سپارښتنې
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",د کورس پر بنسټ د زده کوونکو د ډلې، د کورس لپاره به په پروګرام شموليت شامل کورسونه هر زده کوونکو اعتبار ورکړ شي.
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date",وليکئ دبرېښنا ليک پته جلا له خوا commas، صورتحساب به په ځانګړې توګه نېټه په اتوماتيک ډول واستول شي
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Piecework
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Avg. د خريداري Rate
 DocType: Task,Actual Time (in Hours),واقعي وخت (په ساعتونه)
@@ -4246,7 +4333,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,{0} د قالب د سریال ترانسفارمرونو د تشکیلاتو نه ده. کالم بايد خالي وي
 DocType: Accounts Settings,Accounts Settings,جوړوي امستنې
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,منظور کړل
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,د سپارلو لپاره هیڅ نتیجه نشته
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,د سپارلو لپاره هیڅ نتیجه نشته
 DocType: Customer,Sales Partner and Commission,خرڅلاو همکار او کميسيون
 DocType: Employee Loan,Rate of Interest (%) / Year,د په زړه پوری (٪) / کال کچه
 ,Project Quantity,د پروژې د مقدار
@@ -4258,55 +4345,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,تور
 DocType: BOM Explosion Item,BOM Explosion Item,هیښ چاودنه د قالب
 DocType: Account,Auditor,پلټونکي
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} توکو توليد
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} توکو توليد
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,نور زده کړئ
 DocType: Cheque Print Template,Distance from top edge,له پورتنی څنډې فاصله
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,د بیې په لېست {0} معلول دی او یا موجود ندی
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,د بیې په لېست {0} معلول دی او یا موجود ندی
 DocType: Purchase Invoice,Return,بیرته راتګ
 DocType: Production Order Operation,Production Order Operation,تولید نظم عمليات
 DocType: Pricing Rule,Disable,نافعال
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,د پیسو اکر ته اړتيا ده چې د پیسو لپاره
 DocType: Project Task,Pending Review,انتظار کتنه
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,ټاکنې او مشورې
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} په دسته کې د ده شامل نه {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} په دسته کې د ده شامل نه {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",د شتمنیو د {0} نه پرزه شي، لکه څنګه چې د مخه د {1}
 DocType: Task,Total Expense Claim (via Expense Claim),Total اخراجاتو ادعا (اخراجاتو ادعا له لارې)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,مارک حاضر
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},د کتارونو تر {0}: د هیښ # د اسعارو د {1} بايد مساوي د ټاکل اسعارو وي {2}
 DocType: Journal Entry Account,Exchange Rate,د بدلولو نرخ
 DocType: Patient,Additional information regarding the patient,د ناروغ په اړه اضافي معلومات
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,خرڅلاو نظم {0} نه سپارل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,خرڅلاو نظم {0} نه سپارل
 DocType: Homepage,Tag Line,Tag کرښې
 DocType: Fee Component,Fee Component,فیس برخه
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,د بیړیو د مدیریت
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Add له توکي
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,د بیړیو د مدیریت
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Add له توکي
 DocType: Cheque Print Template,Regular,منظم
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,د ټولو د ارزونې معیارونه ټول Weightage باید 100٪ شي
-DocType: BOM,Last Purchase Rate,تېره رانيول Rate
+DocType: Purchase Order Item,Last Purchase Rate,تېره رانيول Rate
 DocType: Account,Asset,د شتمنیو
 DocType: Project Task,Task ID,کاري ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,سټاک لپاره د قالب نه شته کولای {0} راهیسې د بېرغونو لري
 DocType: Lab Test,Mobile,ګرځنده
 ,Sales Person-wise Transaction Summary,خرڅلاو شخص-هوښيار معامالتو لنډيز
 DocType: Training Event,Contact Number,د اړیکې شمیره
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,ګدام {0} نه شته
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,راجستر سيستم د ERPNext مرکز
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,ګدام {0} نه شته
 DocType: Monthly Distribution,Monthly Distribution Percentages,میاشتنی ویش فيصدۍ
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,د ټاکل شوي توکي نه شي کولای دسته لري
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",سنجي کچه د {0} د توکي، چې اړتيا ده چې د محاسبې د زياتونې نه موندل {1} {2}. که توکی په توګه په یوه نمونه توکی transacting د {1}، لطفا یادونه چې په {1} شمیره جدول. که نه نو، لطفا لپاره په سامان ریکارډ د توکی یا ذکر د ارزښت په کچه راتلونکي سټاک معامله جوړ کړي، او بیا هڅه submiting / دا ننوت فسخه
 DocType: Delivery Note,% of materials delivered against this Delivery Note,٪ د توکو د دې سپارنې يادونه وړاندې کولو
+DocType: Training Event,Has Certificate,سند لري
 DocType: Project,Customer Details,پيرودونکو په بشپړه توګه کتل
 DocType: Employee,Reports to,د راپورونو له
 ,Unpaid Expense Claim,معاش اخراجاتو ادعا
 DocType: Payment Entry,Paid Amount,ورکړل مقدار
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,د پلور سایټ وپلټئ
 DocType: Assessment Plan,Supervisor,څارونکي
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,په آنلاین توګه
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,په آنلاین توګه
 ,Available Stock for Packing Items,د ت توکي موجود دحمل
 DocType: Item Variant,Item Variant,د قالب variant
 DocType: Assessment Result Tool,Assessment Result Tool,د ارزونې د پایلو د اوزار
 DocType: BOM Scrap Item,BOM Scrap Item,هیښ Scrap د قالب
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,ته وسپارل امر نه ړنګ شي
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,ته وسپارل امر نه ړنګ شي
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",ګڼون بیلانس د مخه په ګزارې، تاسو ته د ټاکل &#39;بیلانس باید&#39; په توګه اعتبار &#39;اجازه نه
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,د کیفیت د مدیریت
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,{0} د قالب نافعال شوی دی
@@ -4327,7 +4413,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,اجازه صفر ارزښت Rate
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,اجازه صفر ارزښت Rate
 DocType: Training Event Employee,Invited,بلنه
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,څو فعال معاش جوړښت لپاره د ورکړل شوي خرما د {0} کارمند وموندل شول
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,څو فعال معاش جوړښت لپاره د ورکړل شوي خرما د {0} کارمند وموندل شول
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Setup ليدونکی حسابونو.
 DocType: Employee,Employment Type,وظيفي نوع
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,ثابته شتمني
@@ -4339,7 +4425,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,د زده کونکو د ليک ID
 DocType: Employee,Notice (days),خبرتیا (ورځې)
 DocType: Tax Rule,Sales Tax Template,خرڅلاو د مالياتو د کينډۍ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,توکي چې د صورتحساب د ژغورلو وټاکئ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,توکي چې د صورتحساب د ژغورلو وټاکئ
 DocType: Employee,Encashment Date,د ورکړې نېټه
 DocType: Training Event,Internet,د انټرنېټ
 DocType: Special Test Template,Special Test Template,د ځانګړې ځانګړې ټکي
@@ -4349,7 +4435,7 @@
 DocType: Academic Term,Term Start Date,اصطلاح د پیل نیټه
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,د کارموندنۍ شمېرنې
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,د کارموندنۍ شمېرنې
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},لطفا پیدا ضميمه {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},لطفا پیدا ضميمه {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,بانک اعلامیه سلنه له بلونو په توګه انډول
 DocType: Job Applicant,Applicant Name,متقاضي نوم
 DocType: Authorization Rule,Customer / Item Name,پيرودونکو / د قالب نوم
@@ -4369,7 +4455,7 @@
 DocType: Guardian,Guardian Of ,ګارډین د
 DocType: Grading Scale Interval,Threshold,حد
 DocType: BOM Update Tool,Current BOM,اوسني هیښ
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Add شعبه
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Add شعبه
 DocType: Production Order Item,Available Qty at Source Warehouse,موجود Qty په سرچینه ګدام
 apps/erpnext/erpnext/config/support.py +22,Warranty,ګرنټی
 DocType: Purchase Invoice,Debit Note Issued,ډیبیټ يادونه خپور شوی
@@ -4392,10 +4478,9 @@
 DocType: Account,Receivable,ترلاسه
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,د کتارونو تر # {0}: نه، اجازه لري چې عرضه بدلون په توګه د اخستلو د امر د مخکې نه شتون
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,رول چې اجازه راکړه ورکړه چې د پور د حدودو ټاکل تجاوز ته وړاندې کړي.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,وړانديزونه وټاکئ جوړون
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time",د بادار د معلوماتو syncing، دا به يو څه وخت ونيسي
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,وړانديزونه وټاکئ جوړون
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time",د بادار د معلوماتو syncing، دا به يو څه وخت ونيسي
 DocType: Item,Material Issue,مادي Issue
-DocType: Hub Settings,Seller Description,پلورونکی Description
 DocType: Employee Education,Qualification,وړتوب
 DocType: Item Price,Item Price,د قالب بیه
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap &amp; پاکونکو
@@ -4403,7 +4488,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,له وخت نه شي کولای د وخت څخه ډيره وي.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,حرکت انځوريز &amp; ویډیو
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,امر وکړ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,بیا پیل کول
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,بیا پیل کول
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,که چیرې فعال شي نو سیسټم به د بېلابېلو برخو بیلابیل ټیمونه نوي نه کړي خو د لاندې ذکر شویو ساحو معلومات به کله چې نوې بڼه جوړوي
 DocType: Salary Detail,Component,برخه
 DocType: Assessment Criteria,Assessment Criteria Group,د ارزونې معیارونه ګروپ
 DocType: Healthcare Settings,Patient Name By,د ناروغ نوم
@@ -4413,7 +4499,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,لطفا رول تصويب يا تصويب کارن
 DocType: Journal Entry,Write Off Entry,ولیکئ پړاو په انفاذ
 DocType: BOM,Rate Of Materials Based On,کچه د موادو پر بنسټ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,عرضه کوونکي&gt; د عرضه کوونکي ډول
+DocType: Item Variant Settings,Do not Update Variants,متغیرات نه تازه کړئ
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,د ملاتړ Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,څلورڅنډی په ټولو
 DocType: POS Profile,Terms and Conditions,د قرارداد شرايط
@@ -4422,7 +4508,7 @@
 DocType: Leave Block List,Applies to Company,د دې شرکت د تطبيق وړ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,لغوه نه شي کولای، ځکه وړاندې دحمل انفاذ {0} شتون لري
 DocType: Employee Loan,Disbursement Date,دویشلو نېټه
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;اخیستونکي&#39; مشخص شوي ندي
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;اخیستونکي&#39; مشخص شوي ندي
 DocType: BOM Update Tool,Update latest price in all BOMs,په ټولو بومونو کې وروستي قیمت تازه کړئ
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,طبي ریکارډ
 DocType: Vehicle,Vehicle,موټر
@@ -4437,14 +4523,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,د کارموندنۍ / مشري٪
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,د شتمنیو Depreciations او انډول.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},مقدار د {0} د {1} څخه انتقال {2} د {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},مقدار د {0} د {1} څخه انتقال {2} د {3}
 DocType: Sales Invoice,Get Advances Received,ترلاسه کړئ پرمختګونه تر لاسه کړي
 DocType: Email Digest,Add/Remove Recipients,Add / اخیستونکو کړئ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},د راکړې ورکړې ودرول تولید په وړاندې د نه اجازه نظم {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",د دې مالي کال په توګه (Default) جوړ، په &#39;د ټاکلو په توګه Default&#39; کیکاږۍ
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,سره یو ځای شول
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,سره یو ځای شول
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,په کمښت کې Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,د قالب variant {0} سره ورته صفاتو شتون
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,د قالب variant {0} سره ورته صفاتو شتون
 DocType: Employee Loan,Repay from Salary,له معاش ورکول
 DocType: Leave Application,LAP/,دورو /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},د غوښتنې په وړاندې د پیسو {0} د {1} لپاره د اندازه {2}
@@ -4457,7 +4543,7 @@
 DocType: Sales Invoice Item,Sales Order Item,خرڅلاو نظم قالب
 DocType: Salary Slip,Payment Days,د پیسو ورځې
 DocType: Patient,Dormant,د استراحت په
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,سره د ماشومانو د غوټو ګودامونه بدل نه شي چې د پنډو
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,سره د ماشومانو د غوټو ګودامونه بدل نه شي چې د پنډو
 DocType: BOM,Manage cost of operations,اداره د عملیاتو لګښت
 DocType: Accounts Settings,Stale Days,ستوري ورځ
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",کله چې د چک معاملو کوم &quot;ته وسپارل&quot;، يو بريښناليک Pop-up په اتوماتيک ډول پرانستل شو تر څو چې د راکړې ورکړې د تړاو &quot;تماس&quot; په بريښنالیک کې واستوي، سره د مل په توګه د راکړې ورکړې. د کارونکي وی ممکن د برېښليک نه واستوي.
@@ -4471,10 +4557,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,شعبه {0} لا ترلاسه شوي دي
 ,Requested Items To Be Transferred,غوښتنه سامان ته انتقال شي
 DocType: Expense Claim,Vehicle Log,موټر ننوتنه
-DocType: Purchase Invoice,Recurring Id,راګرځېدل Id
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),د تبه شتون (temp&gt; 38.5 ° C / 101.3 ° F یا دوام لرونکی طنز&gt; 38 ° C / 100.4 ° F)
 DocType: Customer,Sales Team Details,خرڅلاو ټيم په بشپړه توګه کتل
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,د تل لپاره ړنګ کړئ؟
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,د تل لپاره ړنګ کړئ؟
 DocType: Expense Claim,Total Claimed Amount,Total ادعا مقدار
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,د پلورلو د بالقوه فرصتونو.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},باطلې {0}
@@ -4484,7 +4569,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,مغازو
 ,Item Delivery Date,د توکي سپارلو نیټه
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Setup په ERPNext ستاسو په ښوونځي
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Setup په ERPNext ستاسو په ښوونځي
 DocType: Sales Invoice,Base Change Amount (Company Currency),اډه د بدلون مقدار (شرکت د اسعارو)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,د لاندې زېرمتونونه د محاسبې نه زياتونې
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,لومړی سند وژغورۍ.
@@ -4496,12 +4581,11 @@
 DocType: Task,Is Milestone,آیا د معیار
 DocType: Daily Work Summary,Email Sent To,د برېښناليک لېږلو
 DocType: Budget,Warn,خبرداری
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,ایا ته باوري یې چې غیر راجستر کول غواړئ؟
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",کوم بل څرګندونې، د یادولو وړ هڅې چې بايد په اسنادو ته ولاړ شي.
 DocType: BOM,Manufacturing User,دفابريکي کارن
 DocType: Purchase Invoice,Raw Materials Supplied,خام مواد
-DocType: Purchase Invoice,Recurring Print Format,راګرځېدل چاپ شکل
 DocType: C-Form,Series,لړۍ
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,تولیدات زیات کړئ
 DocType: Appraisal,Appraisal Template,ارزونې کينډۍ
 DocType: Item Group,Item Classification,د قالب طبقه
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,کاروبار انکشاف مدير
@@ -4515,7 +4599,7 @@
 DocType: Item Attribute Value,Attribute Value,منسوب ارزښت
 ,Itemwise Recommended Reorder Level,نورتسهیالت وړانديز شوي ترمیمي د ليول
 DocType: Salary Detail,Salary Detail,معاش تفصیلي
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,مهرباني غوره {0} په لومړي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,مهرباني غوره {0} په لومړي
 DocType: Appointment Type,Physician,ډاکټر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,دسته {0} د قالب {1} تېر شوی دی.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,مشورې
@@ -4526,7 +4610,7 @@
 DocType: Salary Detail,Default Amount,default مقدار
 DocType: Lab Test Template,Descriptive,تشریحات
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,ګدام په سيستم کې ونه موندل شو
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,دا مياشت د لنډيز
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,دا مياشت د لنډيز
 DocType: Quality Inspection Reading,Quality Inspection Reading,د کیفیت د تفتیش د لوستلو
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`د يخبندان په ډیپو کې د زړو Than` بايد٪ d ورځو په پرتله کوچنی وي.
 DocType: Tax Rule,Purchase Tax Template,پیري د مالياتو د کينډۍ
@@ -4549,12 +4633,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,د روزنې فعاليتونه / پایلې
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,جمع د استهالک په توګه د
 DocType: Sales Invoice,C-Form Applicable,C-فورمه د تطبیق وړ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},د وخت عمليات بايد د عملياتو 0 څخه ډيره وي {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},د وخت عمليات بايد د عملياتو 0 څخه ډيره وي {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,ګدام الزامی دی
 DocType: Supplier,Address and Contacts,پته او اړیکې
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM اړونه تفصیلي
 DocType: Program,Program Abbreviation,پروګرام Abbreviation
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,يو قالب کينډۍ پر وړاندې د تولید نظم نه راپورته شي
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,يو قالب کينډۍ پر وړاندې د تولید نظم نه راپورته شي
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,په تور د هري برخي په وړاندې په رانيول رسيد تازه دي
 DocType: Warranty Claim,Resolved By,حل د
 DocType: Bank Guarantee,Start Date,پیل نېټه
@@ -4580,27 +4664,28 @@
 DocType: Employee,Educational Qualification,د زده کړې شرایط
 DocType: Workstation,Operating Costs,د عملیاتي لګښتونو
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,که کړنه جمع میاشتنی بودجې زیات شو
-DocType: Purchase Invoice,Submit on creation,پر رامنځته سپارل
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},د اسعارو د {0} بايد د {1}
+DocType: Subscription,Submit on creation,پر رامنځته سپارل
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},د اسعارو د {0} بايد د {1}
 DocType: Asset,Disposal Date,برطرف نېټه
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",برېښناليک به د ورکړل ساعت چې د شرکت د ټولو فعاله کارمندان واستول شي، که رخصتي نه لرو. د ځوابونو لنډیز به په نيمه شپه ته واستول شي.
 DocType: Employee Leave Approver,Employee Leave Approver,د کارګر اجازه Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},د کتارونو تر {0}: د نورو ترمیمي د ننوتلو مخکې د دې ګودام شتون {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.",په توګه له لاسه نه اعلان کولای، ځکه د داوطلبۍ شوی دی.
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,د زده کړې Feedback
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},د کتارونو تر {0}: د نورو ترمیمي د ننوتلو مخکې د دې ګودام شتون {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.",په توګه له لاسه نه اعلان کولای، ځکه د داوطلبۍ شوی دی.
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,د زده کړې Feedback
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,تولید نظم {0} بايد وسپارل شي
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,د سپلویزیون د کارډ معیارونه
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},مهرباني غوره لپاره د قالب د پیل نیټه او پای نیټه {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},د کورس په قطار الزامی دی {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,تر اوسه پورې ونه شي کولای له نېټې څخه مخکې وي
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Add / سمول نرخونه
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Add / سمول نرخونه
 DocType: Batch,Parent Batch,د موروپلار دسته
 DocType: Batch,Parent Batch,د موروپلار دسته
 DocType: Cheque Print Template,Cheque Print Template,آرډر چاپ کينډۍ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,د لګښت د مرکزونو چارت
 DocType: Lab Test Template,Sample Collection,نمونه راغونډول
 ,Requested Items To Be Ordered,غوښتل توکي چې د سپارښتنې شي
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,زما امرونه
 DocType: Price List,Price List Name,د بیې په لېست نوم
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},هره ورځ د کار لنډیز د {0}
 DocType: Employee Loan,Totals,مجموعه
@@ -4619,12 +4704,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} د {1} په اړتيا {2} د {3} {4} د {5} د دې معاملې د بشپړولو لپاره واحدونو.
 DocType: Fee Schedule,Student Category,د زده کوونکو کټه ګورۍ
 DocType: Announcement,Student,د زده کوونکو
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,اداره واحد (رياست) بادار.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,اداره واحد (رياست) بادار.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,خونو ته لاړ شه
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,لطفا د استولو مخکې پیغام ته ننوځي
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,دوه ګونو لپاره د عرضه
 DocType: Email Digest,Pending Quotations,انتظار Quotations
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Point-of-خرڅول پېژندنه
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Point-of-خرڅول پېژندنه
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,د لابراتوټ ازموینې ترتیب.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,ضمانته پور
 DocType: Cost Center,Cost Center Name,لګښت مرکز نوم
@@ -4634,6 +4719,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,ټولې ورکړل نننیو
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Messages په پرتله 160 تورو هماغه اندازه به په څو پېغامونه ویشل شي
 DocType: Purchase Receipt Item,Received and Accepted,تر لاسه کړي او منل
+DocType: Hub Settings,Company and Seller Profile,د شرکت او پلورونکي پیژندنه
 ,GST Itemised Sales Register,GST مشخص کړل خرڅلاو د نوم ثبتول
 ,Serial No Service Contract Expiry,شعبه خدمتونو د قرارداد د پای
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,تاسې کولای شی نه اعتبار او په ورته وخت کې په همدې حساب ډیبیټ
@@ -4643,10 +4729,11 @@
 DocType: Item,Variant Based On,variant پر بنسټ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Total weightage ګمارل باید 100٪ شي. دا د {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,ستاسو د عرضه کوونکي
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,مهرباني وکړئ سم کړئ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,نه شي په توګه له السه په توګه خرڅلاو نظم جوړ شوی دی.
 DocType: Request for Quotation Item,Supplier Part No,عرضه برخه نه
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',وضع نه شي کله چې وېشنيزه کې د &#39;ارزښت&#39; یا د &#39;Vaulation او Total&#39; دی
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,ترلاسه له
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,ترلاسه له
 DocType: Lead,Converted,بدلوی
 DocType: Item,Has Serial No,لري شعبه
 DocType: Employee,Date of Issue,د صدور نېټه
@@ -4654,7 +4741,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",لکه څنګه چې هر د خريداري امستنې که رانيول Reciept مطلوب ==: هو، بیا د رانيول صورتحساب د رامنځته کولو، د کارونکي باید رانيول رسيد لومړي لپاره توکی جوړ {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},د کتارونو تر # {0}: د جنس د ټاکلو په عرضه {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,د کتارونو تر {0}: ساعتونه ارزښت باید له صفر څخه زیات وي.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,وېب پاڼه Image {0} چې په قالب {1} وصل ونه موندل شي
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,وېب پاڼه Image {0} چې په قالب {1} وصل ونه موندل شي
 DocType: Issue,Content Type,منځپانګه ډول
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,کمپيوټر
 DocType: Item,List this Item in multiple groups on the website.,په د ويب پاڼې د څو ډلو د دې توکي لست کړئ.
@@ -4665,14 +4752,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,تطبیق توکي ترلاسه کړئ
 DocType: Payment Reconciliation,From Invoice Date,له صورتحساب نېټه
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,تاسو ته د سپارلو اجازه نلرئ
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,د بلونو د اسعارو بايد مساوي يا default comapany د پيسو او يا د ګوند حساب اسعارو وي
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,د بلونو د اسعارو بايد مساوي يا default comapany د پيسو او يا د ګوند حساب اسعارو وي
 DocType: Healthcare Settings,Laboratory Settings,د لابراتواري امستنې
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,په نقطو څخه ووځي
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,دا څه کوي؟
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,ته ګدام
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,ټول د زده کوونکو د شمولیت
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,دا څه کوي؟
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,ته ګدام
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,ټول د زده کوونکو د شمولیت
 ,Average Commission Rate,په اوسط ډول د کمیسیون Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,&#39;لري شعبه&#39; د غیر سټاک توکی نه وي &#39;هو&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,&#39;لري شعبه&#39; د غیر سټاک توکی نه وي &#39;هو&#39;
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,حالت وټاکئ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,د حاضرۍ د راتلونکي لپاره د خرما نه په نښه شي
 DocType: Pricing Rule,Pricing Rule Help,د بیې د حاکمیت مرسته
@@ -4690,41 +4777,41 @@
 DocType: Item,Customer Code,پيرودونکو کوډ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},د کالیزې په ياد راولي {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ورځو راهیسې تېر نظم
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,د حساب ډیبیټ باید د موازنې د پاڼه په پام کې وي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,د حساب ډیبیټ باید د موازنې د پاڼه په پام کې وي
 DocType: Buying Settings,Naming Series,نوم لړۍ
 DocType: Leave Block List,Leave Block List Name,پريږدئ بالک بشپړفهرست نوم
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,د بيمې د پیل نیټه بايد د بيمې د پای نیټه په پرتله کمه وي
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,مهرباني وکړئ په ښوونځي کې د ښوونکي د نومونې سیسټم جوړ کړئ&gt; د ښوونځي ترتیبات
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,دحمل شتمني
 DocType: Timesheet,Production Detail,تولید تفصیلي
+DocType: Restaurant,Active Menu,فعالې غورنۍ
 DocType: Target Detail,Target Qty,هدف Qty
 DocType: Shopping Cart Settings,Checkout Settings,رایستل امستنې
 DocType: Attendance,Present,اوسنی
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,د سپارنې پرمهال يادونه {0} بايد وړاندې نه شي
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,د سپارنې پرمهال يادونه {0} بايد وړاندې نه شي
 DocType: Notification Control,Sales Invoice Message,خرڅلاو صورتحساب پيغام
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,تړل د حساب {0} بايد د ډول Liability / مساوات وي
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},د کارکوونکي معاش ټوټه {0} د مخه د وخت په پاڼه کې جوړ {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},د کارکوونکي معاش ټوټه {0} د مخه د وخت په پاڼه کې جوړ {1}
 DocType: Vehicle Log,Odometer,Odometer
 DocType: Sales Order Item,Ordered Qty,امر Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,د قالب {0} معلول دی
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,د قالب {0} معلول دی
 DocType: Stock Settings,Stock Frozen Upto,دحمل ګنګل ترمړوندونو پورې
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,هیښ کوم سټاک توکی نه لري
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,د پروژې د فعاليت / دنده.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,هیښ کوم سټاک توکی نه لري
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,د پروژې د فعاليت / دنده.
 DocType: Vehicle Log,Refuelling Details,Refuelling نورولوله
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,معاش ټوټه تولید
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}",د خريداري باید وکتل شي، که د تطبیق لپاره د ده په توګه وټاکل {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,تخفیف باید څخه کم 100 وي
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,تېره اخیستلو کچه ونه موندل شو
 DocType: Purchase Invoice,Write Off Amount (Company Currency),مقدار ولیکئ پړاو (د شرکت د اسعارو)
 DocType: Sales Invoice Timesheet,Billing Hours,بلونو ساعتونه
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,د {0} ونه موندل Default هیښ
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,د کتارونو تر # {0}: مهرباني وکړئ ټاکل ترمیمي کمیت
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,د {0} ونه موندل Default هیښ
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,د کتارونو تر # {0}: مهرباني وکړئ ټاکل ترمیمي کمیت
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,دلته يې اضافه توکي tap
 DocType: Fees,Program Enrollment,پروګرام شمولیت
 DocType: Landed Cost Voucher,Landed Cost Voucher,تيرماښام لګښت ګټمنو
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},لطفا جوړ {0}
-DocType: Purchase Invoice,Repeat on Day of Month,د مياشتې په ورځ تکرار
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} دی فعال محصل
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} دی فعال محصل
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} دی فعال محصل
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} دی فعال محصل
 DocType: Employee,Health Details,د روغتیا په بشپړه توګه کتل
 DocType: Offer Letter,Offer Letter Terms,لیک شرطونه وړاندې کوي
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,د پیسو غوښتنه مرجع سند ته اړتيا ده پيدا
@@ -4733,7 +4820,6 @@
 DocType: Employee External Work History,Salary,معاش
 DocType: Serial No,Delivery Document Type,د سپارنې پرمهال د سند ډول
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,د پورته انتخاب معیارونه ټول معاش ټوټه سپارل
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} سامان دفارسی
 DocType: Sales Order,Partly Delivered,خفيف د تحویلوونکی
 DocType: Email Digest,Receivables,پورونه
 DocType: Lead Source,Lead Source,سرب د سرچینه
@@ -4754,9 +4840,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
 DocType: SG Creation Tool Course,Max Strength,Max پياوړتيا
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,هیښ بدل
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,د سپارلو نیټه پر بنسټ د توکو توکي وټاکئ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,د سپارلو نیټه پر بنسټ د توکو توکي وټاکئ
 ,Sales Analytics,خرڅلاو Analytics
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},موجود {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},موجود {0}
 ,Prospects Engaged But Not Converted,د پانګې لپاره ليوالتيا کوژدن خو نه، ډمتوب
 ,Prospects Engaged But Not Converted,د پانګې لپاره ليوالتيا کوژدن خو نه، ډمتوب
 DocType: Manufacturing Settings,Manufacturing Settings,دفابريکي امستنې
@@ -4764,10 +4850,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 د موبايل په هيڅ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,لطفا په شرکت ماسټر default اسعارو ته ننوځي
 DocType: Stock Entry Detail,Stock Entry Detail,دحمل انفاذ تفصیلي
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,هره ورځ په دوراني ډول
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,هره ورځ په دوراني ډول
 DocType: Products Settings,Home Page is Products,لمړی مخ ده محصوالت
 ,Asset Depreciation Ledger,د شتمنيو د استهالک د پنډو
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},سره د مالياتو د حاکمیت شخړو {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},سره د مالياتو د حاکمیت شخړو {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,نوی ګڼون نوم
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,خام مواد لګښت
 DocType: Selling Settings,Settings for Selling Module,لپاره خرڅول ماډل امستنې
@@ -4781,8 +4867,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,د قالب {0} باید یو سټاک د قالب وي
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Default د کار په پرمختګ ګدام
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,د محاسبې معاملو تلواله امستنو.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,مهرباني وکړئ د بشري منابعو&gt; بشري سیسټمونو کې د کارمندانو نومونې سیستم ترتیب کړئ
 DocType: Maintenance Visit,MV,ترځمکې
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,تمه نېټه مخکې د موادو غوښتنه نېټه نه شي
+DocType: Restaurant,Default Tax Template,اصلي مالی ټکي
 DocType: Fees,Student Details,د زده کونکو توضیحات
 DocType: Purchase Invoice Item,Stock Qty,سټاک Qty
 DocType: Employee Loan,Repayment Period in Months,په میاشتو کې بیرته ورکړې دوره
@@ -4800,8 +4887,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,توکي ته لاړ شه
 DocType: Sales Partner,Partner Type,همکار ډول
 DocType: Purchase Taxes and Charges,Actual,واقعي
+DocType: Restaurant Menu,Restaurant Manager,د رستورانت مدیر
 DocType: Authorization Rule,Customerwise Discount,Customerwise کمښت
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,د دندو Timesheet.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,د دندو Timesheet.
 DocType: Purchase Invoice,Against Expense Account,په وړاندې د اخراجاتو اکانټ
 DocType: Production Order,Production Order,د توليد د ترتیب پر اساس
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,نصب او يادونه {0} د مخکې نه سپارل
@@ -4809,7 +4897,6 @@
 DocType: Quotation Item,Against Docname,Docname پر وړاندې د
 DocType: SMS Center,All Employee (Active),ټول کارکوونکی (فعال)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,ښکاره اوس
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,موده وټاکئ کله چې د صورتحساب به په اتوماتيک ډول شي
 DocType: BOM,Raw Material Cost,لومړنیو توکو لګښت
 DocType: Item Reorder,Re-Order Level,Re-نظم د ليول
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,توکي او پالن qty د کوم لپاره چې تاسو غواړئ چې د توليد امر کړي او يا يې د تحليل او د خامو موادو د نیولو لپاره وليکئ.
@@ -4822,24 +4909,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,راپور ډول فرض ده
 DocType: Item,Serial Number Series,پرلپسې لړۍ
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},ګدام لپاره سټاک د قالب {0} په قطار الزامی دی {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,پروګرامونه اضافه کړئ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,د پرچون او عمده
 DocType: Issue,First Responded On,لومړی ځواب د
 DocType: Website Item Group,Cross Listing of Item in multiple groups,په څو ډلو د قالب صلیب داعلاناتو
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},مالي کال د پیل نیټه او د مالي کال د پای نیټه لا پخوا د مالي کال کې جوړ {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,تازه چاڼېزو نېټه
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,ویش په دسته
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,ویش په دسته
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,ویش په دسته
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,ویش په دسته
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,په بریالیتوب سره راوړې
 DocType: Request for Quotation Supplier,Download PDF,دانلود PDF
 DocType: Production Order,Planned End Date,پلان د پای نیټه
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,مهرباني وکړئ د مهال ویش نیټه درج کړئ
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,هلته توکو زیرمه شوي دي.
 DocType: Request for Quotation,Supplier Detail,عرضه تفصیلي
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},په فورمول يا حالت تېروتنه: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},په فورمول يا حالت تېروتنه: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,رسیدونو د مقدار
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,د معیارونو وزن باید 100٪ ته ورسیږي
 DocType: Attendance,Attendance,د حاضرۍ
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,سټاک توکی
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,سټاک توکی
 DocType: BOM,Materials,د توکو
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",که چک، په لست کې به ته د هر ریاست چې دا لري چې کارول کيږي زياته شي.
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,سرچینه او د هدف ګدام نه شي کولای ورته وي
@@ -4857,6 +4944,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,د افغان بېسیم ټول
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},د خاصې لپاره {0} ارزښت باید د لړ کې وي {1} د {2} د زیاتوالی {3} لپاره د قالب {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,په قطار {0} د هدف ګدام بايد په توګه تولید نظم ورته وي
+DocType: Restaurant Reservation,Waitlisted,انتظار شوی
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,د اسعارو نه شي د ارقامو د يو شمېر نورو اسعارو په کارولو وروسته بدل شي
 DocType: Vehicle Service,Clutch Plate,د کلچ ذريعه
 DocType: Company,Round Off Account,حساب پړاو
@@ -4873,7 +4961,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,نوي خرڅلاو شخص نوم
 DocType: Packing Slip,Gross Weight UOM,Gross وزن UOM
 DocType: Delivery Note Item,Against Sales Invoice,په وړاندې د خرڅلاو صورتحساب
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,لطفا د serialized توکی سريال عدد وليکئ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,لطفا د serialized توکی سريال عدد وليکئ
 DocType: Bin,Reserved Qty for Production,د تولید خوندي دي Qty
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,وناکتل پريږدئ که تاسو نه غواړي چې په داسې حال کې د کورس پر بنسټ ډلو جوړولو داځکه پام کې ونیسي.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,وناکتل پريږدئ که تاسو نه غواړي چې په داسې حال کې د کورس پر بنسټ ډلو جوړولو داځکه پام کې ونیسي.
@@ -4885,7 +4973,7 @@
 DocType: Lab Test,Test Group,ټسټ ګروپ
 DocType: Payment Reconciliation,Receivable / Payable Account,ترلاسه / د راتلوونکې اکانټ
 DocType: Delivery Note Item,Against Sales Order Item,په وړاندې د خرڅلاو نظم قالب
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},مهرباني وکړئ مشخص د خاصې لپاره ارزښت ځانتیا {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},مهرباني وکړئ مشخص د خاصې لپاره ارزښت ځانتیا {0}
 DocType: Item,Default Warehouse,default ګدام
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},د بودجې د ګروپ د حساب په وړاندې نه شي کولای {0}
 DocType: Healthcare Settings,Patient Registration,د ناروغۍ ثبت
@@ -4915,6 +5003,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,خرڅلاو شخص
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,د بودجې او لګښتونو مرکز
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,د پیسو ډیری ډیزاین موډل اجازه نه لري
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,لپاره
 ,Appointment Analytics,د استوګنې انټرنېټونه
 DocType: Vehicle Service,Half Yearly,نيمايي د اکتوبر
 DocType: Lead,Blog Subscriber,Blog د ګډون
@@ -4934,7 +5023,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Quot شمېرنې
 ,BOM Stock Report,هیښ سټاک راپور
 DocType: Stock Reconciliation Item,Quantity Difference,مقدار بدلون
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,د پروسس د معاشاتو
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,د پروسس د معاشاتو
 DocType: Opportunity Item,Basic Rate,اساسي Rate
 DocType: GL Entry,Credit Amount,اعتبار مقدار
 DocType: Cheque Print Template,Signatory Position,لاسليک مقام
@@ -4948,12 +5037,11 @@
 DocType: Tax Rule,Tax Rule,د مالياتو د حاکمیت
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,د خرڅلاو دوره ورته کچه وساتي
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Workstation کاري ساعتونه بهر وخت يادښتونه پلان جوړ کړي.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,په کتار پېرېدونکي
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,په کتار پېرېدونکي
 DocType: Student,Nationality,تابعیت
 ,Items To Be Requested,د ليکنو ته غوښتنه وشي
-DocType: Purchase Order,Get Last Purchase Rate,ترلاسه تېره رانيول Rate
 DocType: Company,Company Info,پيژندنه
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,وټاکئ او يا د نوي مشتريانو د اضافه
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,وټاکئ او يا د نوي مشتريانو د اضافه
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,لګښت مرکز ته اړتيا ده چې د لګښت ادعا کتاب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),د بسپنو (شتمني) کاریال
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,دا د دې د کارکونکو د راتګ پر بنسټ
@@ -4961,6 +5049,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,ډیبیټ اکانټ
 DocType: Fiscal Year,Year Start Date,کال د پیل نیټه
 DocType: Attendance,Employee Name,د کارګر نوم
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,د رستورانت امر د ننوت توکي
 DocType: Sales Invoice,Rounded Total (Company Currency),غونډ مونډ Total (شرکت د اسعارو)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,آيا له ګروپ د پټو نه ځکه حساب ډول انتخاب.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} د {1} بدل شوی دی. لطفا تازه.
@@ -4971,6 +5060,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,د کارګر ګټې
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},ډک اندازه بايد په قطار د {0} د قالب اندازه برابر {1}
 DocType: Production Order,Manufactured Qty,جوړيږي Qty
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,انوائس جوړ شو
 DocType: Purchase Receipt Item,Accepted Quantity,منل مقدار
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},لطفا یو default رخصتي بشپړفهرست لپاره د کارګر جوړ {0} یا د شرکت د {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} نه شتون
@@ -4980,18 +5070,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},د قطار نه {0}: مقدار نه شي اخراجاتو ادعا {1} په وړاندې د مقدار د انتظار څخه ډيره وي. انتظار مقدار دی {2}
 DocType: Maintenance Schedule,Schedule,مهال ويش
 DocType: Account,Parent Account,Parent اکانټ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,شته
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,شته
 DocType: Quality Inspection Reading,Reading 3,لوستلو 3
 ,Hub,مرکز
 DocType: GL Entry,Voucher Type,ګټمنو ډول
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,بیې په لېست کې ونه موندل او يا معيوب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,بیې په لېست کې ونه موندل او يا معيوب
 DocType: Lab Test,Approved,تصویب شوې
 DocType: Pricing Rule,Price,د بیې
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',د کارګر د کرارۍ د {0} بايد جوړ شي د &quot;کيڼ &#39;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',د کارګر د کرارۍ د {0} بايد جوړ شي د &quot;کيڼ &#39;
+DocType: Hub Settings,Last Sync On,وروستنۍ هممهال
 DocType: Guardian,Guardian,ګارډین
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ارزونې {0} په ټاکلې نیټه لړ {1} لپاره د کارګر جوړ
 DocType: Employee,Education,ښوونه
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,دل
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,دل
 DocType: Selling Settings,Campaign Naming By,د کمپاین نوم By
 DocType: Employee,Current Address Is,اوسني پته ده
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,د میاشتنۍ پلورنې هدف)
@@ -5006,7 +5097,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,د کورس کود:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,لطفا اخراجاتو حساب ته ننوځي
 DocType: Account,Stock,سټاک
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",د کتارونو تر # {0}: ماخذ لاسوند ډول باید د اخستلو امر يو، رانيول صورتحساب یا ژورنال انفاذ وي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",د کتارونو تر # {0}: ماخذ لاسوند ډول باید د اخستلو امر يو، رانيول صورتحساب یا ژورنال انفاذ وي
 DocType: Employee,Current Address,اوسني پته
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",که جنس د بل جنس بيا توضيحات، انځور، د قيمتونو، ماليه او نور به د کېنډۍ څخه جوړ شي يو variant دی، مګر په واضح ډول مشخص
 DocType: Serial No,Purchase / Manufacture Details,رانيول / جوړون نورولوله
@@ -5037,7 +5128,7 @@
 DocType: Hub Settings,Hub Settings,مرکزي امستنې
 DocType: Project,Gross Margin %,د ناخالصه عايد٪
 DocType: BOM,With Operations,سره د عملیاتو په
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,په اسعارو د محاسبې زياتونې لا شوي دي {0} د شرکت {1}. لطفا د کرنسۍ ته د ترلاسه يا د ورکړې وړ حساب غوره {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,په اسعارو د محاسبې زياتونې لا شوي دي {0} د شرکت {1}. لطفا د کرنسۍ ته د ترلاسه يا د ورکړې وړ حساب غوره {0}.
 DocType: Asset,Is Existing Asset,آیا موجوده د شتمنیو
 DocType: Salary Detail,Statistical Component,د احصایې برخه
 DocType: Salary Detail,Statistical Component,د احصایې برخه
@@ -5046,13 +5137,14 @@
 DocType: BOM Operation,BOM Operation,هیښ عمليات
 DocType: Purchase Taxes and Charges,On Previous Row Amount,په تیره د کتارونو تر مقدار
 DocType: Student,Home Address,کور پته
+DocType: Item,Has Expiry Date,د پای نیټه نیټه لري
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,د توکو ډول ډولونه.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,د انتقال د شتمنیو
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,د انتقال د شتمنیو
 DocType: POS Profile,POS Profile,POS پېژندنه
 DocType: Training Event,Event Name,دکمپاینونو نوم
 DocType: Physician,Phone (Office),تلیفون (دفتر)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,د شاملیدو
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},لپاره د شمولیت {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,د شاملیدو
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},لپاره د شمولیت {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.",د ټاکلو لپاره د بودجې، نښې او نور موسمي
 DocType: Supplier Scorecard Scoring Variable,Variable Name,متغیر نوم
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",{0} د قالب دی کېنډۍ، لطفا د خپلو بېرغونو وټاکئ
@@ -5061,7 +5153,7 @@
 DocType: Assessment Plan,Room,کوټه
 DocType: Purchase Order,Advance Paid,پرمختللی ورکړل
 DocType: Item,Item Tax,د قالب د مالياتو
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,ته عرضه مواد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,ته عرضه مواد
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,وسیله صورتحساب
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}٪ ښکاري څخه یو ځل بیا
 DocType: Expense Claim,Employees Email Id,د کارکوونکو دبرېښنا ليک Id
@@ -5072,31 +5164,29 @@
 DocType: Program,Program Name,د پروګرام نوم
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,لپاره د مالياتو او يا چارج په پام کې
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,واقعي Qty الزامی دی
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} په اوسني وخت کې {1} د سپارل شوي کارت کارت لري، او د دې عرضه کوونکي لپاره د پیرودونکي سپارښتنې باید احتیاط سره خپور شي.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} په اوسني وخت کې {1} د سپارل شوي کارت کارت لري، او د دې عرضه کوونکي لپاره د پیرودونکي سپارښتنې باید احتیاط سره خپور شي.
 DocType: Employee Loan,Loan Type,د پور ډول
 DocType: Scheduling Tool,Scheduling Tool,مهال ويش له اوزار
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,باور كارت
 DocType: BOM,Item to be manufactured or repacked,د قالب توليد شي او يا repacked
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,د سټاک معاملو تلواله امستنو.
-DocType: Purchase Invoice,Next Date,بل نېټه
 DocType: Employee Education,Major/Optional Subjects,جګړن / اختیاري مضمونونه
 DocType: Sales Invoice Item,Drop Ship,څاڅکی کښتۍ
+DocType: Hub Settings,Suspended,معطل شوی
 DocType: Training Event,Attendees,دې سمینار کې
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",دلته تاسو په شان د نوم او د مور او پلار، ښځه او ماشومان اشغال کورنۍ جزئيات وساتي
 DocType: Academic Term,Term End Date,اصطلاح د پای نیټه
-DocType: Hub Settings,Seller Name,پلورونکی نوم
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),مالیه او په تور مجرايي (شرکت د اسعارو)
 DocType: Item Group,General Settings,جنرال امستنې
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,څخه د اسعارو او د پیسو د نه شي کولای ورته وي
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,ښوونکي شامل کړئ
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,تاسو باید د محاکمې د مخه فورمه Save
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,مهرباني وکړئ لومړی شرکت غوره کړئ
 DocType: Item Attribute,Numeric Values,شمېريزو ارزښتونه
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Logo ضمیمه
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,سټاک کچه
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,سټاک کچه
 DocType: Customer,Commission Rate,کمیسیون Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,د کمکیانو لپاره د variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,د کمکیانو لپاره د variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,له خوا د رياست د بنديز رخصت غوښتنلیکونه.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer",د پیسو ډول بايد د تر لاسه شي، د تنخاوو او کورني انتقال
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -5111,11 +5201,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,پلازمیینه دحمل
 DocType: Shopping Cart Settings,Show Public Attachments,د عامې ضم وښایاست
 DocType: Packing Slip,Package Weight Details,بستې وزن نورولوله
+DocType: Restaurant Reservation,Reservation Time,د خوندیتوب وخت
 DocType: Payment Gateway Account,Payment Gateway Account,د پیسو ليدونکی اکانټ
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,د پیسو له بشپړېدو وروسته ټاکل مخ ته د کارونکي عکس د تاوولو.
 DocType: Company,Existing Company,موجوده شرکت
 DocType: Healthcare Settings,Result Emailed,پایلې ای میل شوي
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",د مالياتو د کټه دی چې د &quot;ټول&quot; ته بدل شوي ځکه چې ټول سامان د غیر سټاک توکي دي
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,د توکو کود&gt; توکي ګروپ&gt; برنامه
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,لطفا یو csv دوتنه انتخاب
 DocType: Student Leave Application,Mark as Present,مارک په توګه د وړاندې
 DocType: Supplier Scorecard,Indicator Color,د شاخص رنګ
@@ -5140,11 +5232,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,د کمکیانو لپاره د زده کونکو د دسته
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,مخ په وړاندې د دې لپاره ترسره کړي
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,له هیښ توکي ترلاسه کړئ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,له هیښ توکي ترلاسه کړئ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,د وخت ورځې سوق
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},د کتارونو تر # {0}: پست کوي نېټه بايد په توګه د اخیستلو نېټې ورته وي {1} د شتمنیو د {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,وګورئ دا که د زده کوونکو د ده په انستیتیوت په ليليه درلوده.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,مهرباني وکړی په پورته جدول خرڅلاو امر ته ننوځي
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,مهرباني وکړی په پورته جدول خرڅلاو امر ته ننوځي
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,معاش رسید ونه لېږل
 ,Stock Summary,دحمل لنډيز
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,له يوه ګودام څخه بل د شتمنیو ته سپاري
@@ -5160,5 +5252,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},د کتارونو تر {0}: ډیبیټ د ننوتلو سره د نه تړاو شي کولای {1}
 DocType: Journal Entry,Subscription Section,د ګډون برخې
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,ګڼون {0} نه شته
+DocType: Training Event,Training Program,د روزنې پروګرام
 DocType: Account,Cash,د نغدو پيسو
 DocType: Employee,Short biography for website and other publications.,د ويب سايټ او نورو خپرونو لنډ ژوندلیک.
diff --git a/erpnext/translations/pt-BR.csv b/erpnext/translations/pt-BR.csv
index 5af23f9..83288e0 100644
--- a/erpnext/translations/pt-BR.csv
+++ b/erpnext/translations/pt-BR.csv
@@ -1,8 +1,8 @@
 DocType: Employee,Salary Mode,Modo de Salário
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Itens já sincronizado
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permitir item a ser adicionado várias vezes em uma transação
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Anular Material de Visita {0} antes de cancelar esta solicitação de garantia
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produtos para o Consumidor
+DocType: Purchase Receipt,Subscription Detail,Detalhe da inscrição
 DocType: Item,Customer Items,Itens de clientes
 DocType: Project,Costing and Billing,Custos e Faturamento
 apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Conta {0}: A Conta Superior {1} não pode ser um livro-razão
@@ -13,7 +13,7 @@
 DocType: Purchase Order,PO-,PC-
 DocType: POS Profile,Applicable for User,Aplicável para o usuário
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Parou ordem de produção não pode ser cancelado, desentupir-lo primeiro para cancelar"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Você realmente quer se desfazer deste ativo?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Você realmente quer se desfazer deste ativo?
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},É necessário informar a Moeda na Lista de Preço {0}
 DocType: Job Applicant,Job Applicant,Candidato à Vaga
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Isto é baseado nas transações envolvendo este Fornecedor. Veja a linha do tempo abaixo para maiores detalhes
@@ -23,7 +23,7 @@
 DocType: Delivery Note,Return Against Delivery Note,Devolução contra Guia de Remessa
 DocType: Purchase Order,% Billed,Faturado %
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Taxa de câmbio deve ser o mesmo que {0} {1} ({2})
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},A conta bancária não pode ser nomeada como {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},A conta bancária não pode ser nomeada como {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Heads (ou grupos) contra o qual as entradas de Contabilidade são feitas e os saldos são mantidos.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Excelente para {0} não pode ser inferior a zero ( {1})
 DocType: Manufacturing Settings,Default 10 mins,Padrão 10 minutos
@@ -36,7 +36,7 @@
 ,Purchase Order Items To Be Received,"Itens Comprados, mas não Recebidos"
 DocType: SMS Center,All Supplier Contact,Todos os Contatos de Fornecedor
 DocType: Support Settings,Support Settings,Configurações do Pós Vendas
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,A Data Prevista de Término não pode ser menor que a Data Prevista de Início
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,A Data Prevista de Término não pode ser menor que a Data Prevista de Início
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Linha # {0}: O Valor deve ser o mesmo da {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Aplicação deixar Nova
 ,Batch Item Expiry Status,Status do Vencimento do Item do Lote
@@ -51,15 +51,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Plano de Saúde
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Atraso no Pagamento (Dias)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Despesa com Manutenção de Veículos
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Nota Fiscal
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Nota Fiscal
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Ano Fiscal {0} é necessário
 DocType: Appraisal Goal,Score (0-5),Pontuação (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Linha {0}: {1} {2} não corresponde com {3}
 DocType: Delivery Note,Vehicle No,Placa do Veículo
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,"Por favor, selecione Lista de Preço"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,"Por favor, selecione Lista de Preço"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Contador
 DocType: Cost Center,Stock User,Usuário de Estoque
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Nova {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Nova {0}: # {1}
 ,Sales Partners Commission,Comissão dos Parceiros de Vendas
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Abreviatura não pode ter mais de 5 caracteres
 DocType: Payment Request,Payment Request,Pedido de Pagamento
@@ -77,21 +77,20 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Mesma empresa está inscrita mais de uma vez
 DocType: Patient,Married,Casado
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Não permitido para {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra nota de entrega {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra nota de entrega {0}
 DocType: Process Payroll,Make Bank Entry,Fazer Lançamento Bancário
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Estrutura salarial ausente
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Estrutura salarial ausente
 DocType: Sales Invoice Item,Sales Invoice Item,Item da Nota Fiscal de Venda
 DocType: POS Profile,Write Off Cost Center,Centro de custo do abatimento
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Relatórios de Estoque
 DocType: Warehouse,Warehouse Detail,Detalhes do Armazén
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},O limite de crédito foi analisado para o cliente {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""É Ativo Fixo"" não pode ser desmarcado se já existe um registro de Ativo relacionado ao item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""É Ativo Fixo"" não pode ser desmarcado se já existe um registro de Ativo relacionado ao item"
 DocType: Vehicle Service,Brake Oil,Óleo de Freio
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Você não está autorizado para adicionar ou atualizar entradas antes de {0}
 DocType: BOM,Item Image (if not slideshow),Imagem do Item (se não for slideshow)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Existe um cliente com o mesmo nome
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Valor por Hora / 60) * Tempo de operação real
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Selecionar LDM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Selecionar LDM
 DocType: SMS Log,SMS Log,Log de SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Custo de Produtos Entregues
 DocType: Student Log,Student Log,Log do Aluno
@@ -111,7 +110,7 @@
 DocType: BOM,Total Cost,Custo total
 DocType: Journal Entry Account,Employee Loan,Empréstimo para Colaboradores
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Log de Atividade:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Item {0} não existe no sistema ou expirou
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Item {0} não existe no sistema ou expirou
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Extrato da conta
 DocType: Purchase Invoice Item,Is Fixed Asset,É Ativo Imobilizado
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +234,"Available qty is {0}, you need {1}","A qtde disponível é {0}, você necessita de {1}"
@@ -122,11 +121,11 @@
 DocType: Training Result Employee,Grade,Nota de Avaliação
 DocType: Sales Invoice Item,Delivered By Supplier,Proferido por Fornecedor
 DocType: SMS Center,All Contact,Todo o Contato
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Ordens de produção já criadas para todos os itens com LDM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Ordens de produção já criadas para todos os itens com LDM
 DocType: Daily Work Summary,Daily Work Summary,Resumo de Trabalho Diário
 DocType: Period Closing Voucher,Closing Fiscal Year,Encerramento do Exercício Fiscal
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} está congelado
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,"Por favor, selecione empresa já existente para a criação de Plano de Contas"
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} está congelado
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,"Por favor, selecione empresa já existente para a criação de Plano de Contas"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Despesas com Estoque
 DocType: Journal Entry,Contra Entry,Contrapartida de Entrada
 DocType: Journal Entry Account,Credit in Company Currency,Crédito em moeda da empresa
@@ -139,7 +138,7 @@
  Todas as datas, os colaboradores e suas combinações para o período selecionado virão com o modelo, incluindo os registros já existentes."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Item {0} não está ativo ou fim de vida útil foi atingido
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos em linhas {1} também deve ser incluída"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Configurações para o Módulo de RH
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Configurações para o Módulo de RH
 DocType: Sales Invoice,Change Amount,Troco
 DocType: Depreciation Schedule,Make Depreciation Entry,Fazer Lançamento de Depreciação
 DocType: Appraisal Template Goal,KRA,APR
@@ -180,7 +179,7 @@
 DocType: Customer Group,Mention if non-standard receivable account applicable,Mencione se a conta a receber aplicável não for a conta padrão
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,For Warehouse is required before Submit,Armazén de destino necessário antes de enviar
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Recebeu em
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,"Por favor, indique Empresa"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,"Por favor, indique Empresa"
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra Vendas Nota Fiscal do Item
 ,Production Orders in Progress,Ordens em Produção
 DocType: Lead,Address & Contact,Endereço e Contato
@@ -201,22 +200,21 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Custo Total (via Registro de Tempo)
 DocType: Item Website Specification,Item Website Specification,Especificação do Site do Item
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Licenças Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Lançamentos do Banco
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Item da Conciliação de Estoque
 DocType: Stock Entry,Sales Invoice No,Nº da Nota Fiscal de Venda
 DocType: Material Request Item,Min Order Qty,Pedido Mínimo
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Ferramenta de Criação de Grupo de Alunos
 DocType: Lead,Do Not Contact,Não entre em contato
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,ID exclusiva para acompanhar todas as notas fiscais recorrentes. Ela é gerada ao enviar.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Pedido Mínimo
 ,Student Batch-Wise Attendance,Controle de Frequência por Série de Alunos
 DocType: POS Profile,Allow user to edit Rate,Permitir que o usuário altere o preço
 DocType: Item,Publish in Hub,Publicar no Hub
 DocType: Student Admission,Student Admission,Admissão do Aluno
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Item {0} é cancelada
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Requisição de Material
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Item {0} é cancelada
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Requisição de Material
 DocType: Bank Reconciliation,Update Clearance Date,Atualizar Data Liquidação
 DocType: Item,Purchase Details,Detalhes de Compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Item {0} não encontrado em 'matérias-primas fornecidas"" na tabela Pedido de Compra {1}"
@@ -253,30 +251,31 @@
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de Nota Fiscal
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Configurando Impostos
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,"Entrada de pagamento foi modificado depois que você puxou-o. Por favor, puxe-o novamente."
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} entrou duas vezes no Imposto do Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} entrou duas vezes no Imposto do Item
 DocType: Workstation,Rent Cost,Custo do Aluguel
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Próximos Eventos do Calendário
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +85,Please select month and year,Selecione mês e ano
 DocType: GL Entry,Debit Amount in Account Currency,Débito em moeda da conta
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Este artigo é um modelo e não podem ser usados em transações. Atributos item será copiado para as variantes a menos 'No Copy' é definido
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total considerado em pedidos
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Designação do colaborador (por exemplo, CEO, Diretor, etc.)"
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Designação do colaborador (por exemplo, CEO, Diretor, etc.)"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Taxa na qual a moeda do cliente é convertida para a moeda base do cliente
 DocType: Course Scheduling Tool,Course Scheduling Tool,Ferramenta de Agendamento de Cursos
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Linha #{0}: Não pode ser criada uma Nota Fiscal de Compra para um ativo existente {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Urgente] Ocorreu um erro ao criar %s recorrentes para %s
 DocType: Item Tax,Tax Rate,Alíquota do Imposto
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} já está alocado para o Colaborador {1} para o período de {2} até {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Selecionar item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Selecionar item
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,A Nota Fiscal de Compra  {0} já foi enviada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Linha # {0}: Nº do Lote deve ser o mesmo que {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Converter para Não-Grupo
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Lote de um item.
 DocType: C-Form Invoice Detail,Invoice Date,Data do Faturamento
 DocType: GL Entry,Debit Amount,Total do Débito
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Pode haver apenas uma conta por empresa em {0} {1}
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Pode haver apenas uma conta por empresa em {0} {1}
 DocType: Purchase Order,% Received,Recebido %
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Criar Grupos de Alunos
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Instalação já está concluída!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Instalação já está concluída!
 DocType: Quality Inspection,Inspected By,Inspecionado por
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial Não {0} não pertence a entrega Nota {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,Demo do ERPNext
@@ -293,7 +292,7 @@
 DocType: Request for Quotation,Request for Quotation,Solicitação de Orçamento
 DocType: Salary Slip Timesheet,Working Hours,Horas de trabalho
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Alterar o número sequencial de início/atual de uma série existente.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Criar novo Cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Criar novo Cliente
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Se várias regras de preços continuam a prevalecer, os usuários são convidados a definir a prioridade manualmente para resolver o conflito."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Criar Pedidos de Compra
 ,Purchase Register,Registro de Compras
@@ -321,7 +320,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,As configurações globais para todos os processos de fabricação.
 DocType: Accounts Settings,Accounts Frozen Upto,Contas congeladas até
 DocType: SMS Log,Sent On,Enviado em
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Atributo {0} selecionada várias vezes na tabela de atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Atributo {0} selecionada várias vezes na tabela de atributos
 DocType: HR Settings,Employee record is created using selected field. ,O registro do colaborador é criado usando o campo selecionado.
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Cadastro de feriados.
 DocType: Request for Quotation Item,Required Date,Para o Dia
@@ -343,8 +342,9 @@
 DocType: Sales Order Item,Used for Production Plan,Usado para o Plano de Produção
 DocType: Employee Loan,Total Payment,Pagamento Total
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tempo entre operações (em minutos)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} é cancelado então a ação não pode ser concluída
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} é cancelado então a ação não pode ser concluída
 DocType: Pricing Rule,Valid Upto,Válido até
+DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Avisar em Pedidos de Compra
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Lista de alguns de seus clientes. Eles podem ser empresas ou pessoas físicas.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Peças suficientes para construir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Receita Direta
@@ -352,10 +352,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Escritório Administrativo
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,"Por favor, selecione Empresa"
 DocType: Stock Entry Detail,Difference Account,Conta Diferença
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Não pode fechar tarefa como sua tarefa dependente {0} não está fechado.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,"Por favor, indique Armazén para as quais as Requisições de Material serão levantadas"
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Não pode fechar tarefa como sua tarefa dependente {0} não está fechado.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Por favor, indique Armazén para as quais as Requisições de Material serão levantadas"
 DocType: Production Order,Additional Operating Cost,Custo Operacional Adicional
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Para mesclar , seguintes propriedades devem ser os mesmos para ambos os itens"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Para mesclar , seguintes propriedades devem ser os mesmos para ambos os itens"
 ,Serial No Warranty Expiry,Vencimento da Garantia com Nº de Série
 DocType: Sales Invoice,Offline POS Name,Nome do POS Offline
 DocType: Sales Order,To Deliver,Para Entregar
@@ -363,7 +363,7 @@
 DocType: Account,Profit and Loss,Lucro e Perdas
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Gerenciando Subcontratação
 DocType: Project,Project will be accessible on the website to these users,Projeto estará acessível no site para os usuários
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Defina tipo de projeto.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Defina tipo de projeto.
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Taxa na qual a moeda da lista de preços é convertida para a moeda base da empresa
 apps/erpnext/erpnext/setup/doctype/company/company.py +62,Account {0} does not belong to company: {1},A Conta {0} não pertence à Empresa: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +51,Abbreviation already used for another company,Abreviatura já utilizado para outra empresa
@@ -379,7 +379,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Fechamento (Cr)
 DocType: Installation Note Item,Installation Note Item,Item da Nota de Instalação
 DocType: Production Plan Item,Pending Qty,Pendente Qtde
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} não está ativo
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} não está ativo
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Configurar dimensões do cheque para impressão
 DocType: Salary Slip,Salary Slip Timesheet,Controle de Tempo do Demonstrativo de Pagamento
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Fornecedor Armazém obrigatório para sub- contratados Recibo de compra
@@ -390,6 +390,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Por favor, selecione a Empresa e Tipo de Sujeito primeiro"
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Ano Financeiro / Exercício.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Desculpe, os números de ordem não podem ser mescladas"
+DocType: Supplier,Prevent RFQs,Evitar Orçamentos
 ,Lead Id,Cliente em Potencial ID
 DocType: Timesheet,Payslip,Holerite
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +38,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Ano Fiscal Data de início não deve ser maior do que o Fiscal Year End Date
@@ -406,7 +407,7 @@
 DocType: Quotation,Quotation To,Orçamento para
 DocType: Lead,Middle Income,Média Renda
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Abertura (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unidade de medida padrão para item {0} não pode ser alterado diretamente porque você já fez alguma transação (s) com outra Unidade de Medida. Você precisará criar um novo item para usar uma Unidade de Medida padrão diferente.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unidade de medida padrão para item {0} não pode ser alterado diretamente porque você já fez alguma transação (s) com outra Unidade de Medida. Você precisará criar um novo item para usar uma Unidade de Medida padrão diferente.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Total alocado não pode ser negativo
 DocType: Purchase Order Item,Billed Amt,Valor Faturado
 DocType: Training Result Employee,Training Result Employee,Resultado do Treinamento do Colaborador
@@ -421,7 +422,7 @@
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Se for selecionado, as matérias-primas para os itens sub-contratados serão incluídas nas Requisições de Material"
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Cadastros
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Conciliação Bancária
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Controle de Tempo
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Controle de Tempo
 DocType: Fiscal Year Company,Fiscal Year Company,Ano Fiscal Empresa
 DocType: Packing Slip Item,DN Detail,Detalhe DN
 DocType: Sales Invoice,Sales Taxes and Charges,Impostos e Taxas sobre Vendas
@@ -447,7 +448,7 @@
 DocType: Production Order Operation,In minutes,Em Minutos
 DocType: Issue,Resolution Date,Data da Solução
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Registro de Tempo criado:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Defina Caixa padrão ou conta bancária no Modo de pagamento {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Defina Caixa padrão ou conta bancária no Modo de pagamento {0}
 DocType: Selling Settings,Customer Naming By,Nomeação de Cliente por
 DocType: Depreciation Schedule,Depreciation Amount,Valor de Depreciação
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Converter em Grupo
@@ -466,18 +467,17 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Impostos e Encargos sobre custos de desembarque
 DocType: Production Order Operation,Actual Start Time,Hora Real de Início
 DocType: BOM Operation,Operation Time,Tempo da Operação
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Finalizar
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Valor do abatimento
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Finalizar
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Valor do abatimento
 DocType: Leave Block List Allow,Allow User,Permitir que o usuário
 DocType: Journal Entry,Bill No,Nota nº
 DocType: Company,Gain/Loss Account on Asset Disposal,Conta de Ganho / Perda com Descarte de Ativos
-DocType: Purchase Invoice,Quarterly,Trimestralmente
+DocType: Subscription,Quarterly,Trimestralmente
 DocType: Selling Settings,Delivery Note Required,Guia de Remessa Obrigatória
 DocType: BOM Item,Basic Rate (Company Currency),Valor Base (moeda da empresa)
 DocType: Student Attendance,Student Attendance,Frequência do Aluno
 DocType: Sales Invoice Timesheet,Time Sheet,Registro de Tempo
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Confirmação de matérias-primas baseada em
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Por favor insira os detalhes do item
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pré Venda
 DocType: Purchase Receipt,Other Details,Outros detalhes
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Fornecedor
@@ -490,7 +490,7 @@
 ,Absent Student Report,Relatório de Frequência do Aluno
 DocType: Email Digest,Next email will be sent on:,Próximo email será enviado em:
 DocType: Offer Letter Term,Offer Letter Term,Termos da Carta de Oferta
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Item tem variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Item tem variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Item {0} não foi encontrado
 DocType: Bin,Stock Value,Valor do Estoque
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Tipo de árvore
@@ -504,11 +504,10 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +58,In Value,Valor Entrada
 DocType: Selling Settings,Close Opportunity After Days,Fechar Oportunidade Após Dias
 DocType: Purchase Order,Supply Raw Materials,Abastecimento de Matérias-primas
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,A data na qual a próxima nota fiscal será gerada. Ela é gerada ao enviar.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Ativo Circulante
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} não é um item de estoque
 DocType: Payment Entry,Received Amount (Company Currency),Total recebido (moeda da empresa)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,O Cliente em Potencial deve ser informado se a Oportunidade foi feita para um Cliente em Potencial.
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,O Cliente em Potencial deve ser informado se a Oportunidade foi feita para um Cliente em Potencial.
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Por favor selecione dia de folga semanal
 DocType: Production Order Operation,Planned End Time,Horário Planejado de Término
 ,Sales Person Target Variance Item Group-Wise,Variação de Público do Vendedor por Grupo de Item
@@ -523,10 +522,10 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: A partir de {0} do tipo {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Linha {0}: Fator de Conversão é obrigatório
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Várias regras de preços existe com os mesmos critérios, por favor, resolver o conflito através da atribuição de prioridade. Regras Preço: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,Não é possível desativar ou cancelar BOM vez que está associada com outras BOMs
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,Não é possível desativar ou cancelar BOM vez que está associada com outras BOMs
 DocType: Item Attribute Value,Item Attribute Value,Item Atributo Valor
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Campanhas de vendas .
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Fazer Registro de Tempo
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Fazer Registro de Tempo
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -576,9 +575,9 @@
 DocType: Account,Liability,Passivo
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Montante Sanctioned não pode ser maior do que na Reivindicação Montante Fila {0}.
 DocType: Company,Default Cost of Goods Sold Account,Conta de Custo Padrão de Mercadorias Vendidas
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Lista de Preço não selecionado
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Lista de Preço não selecionado
 DocType: Employee,Family Background,Antecedentes familiares
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Nenhuma permissão
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Nenhuma permissão
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Para filtrar baseado em Sujeito, selecione o Tipo de Sujeito primeiro"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Atualização do Estoque 'não pode ser verificado porque os itens não são entregues via {0}"
 DocType: Vehicle,Acquisition Date,Data da Aquisição
@@ -597,9 +596,8 @@
 DocType: Item,Website Warehouse,Armazém do Site
 DocType: Payment Reconciliation,Minimum Invoice Amount,Valor Mínimo da Fatura
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,O Registro de Tempo {0} está finalizado ou cancelado
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","O dia do mês em que auto factura será gerado por exemplo, 05, 28, etc"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Pontuação deve ser inferior ou igual a 5
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,Registros C -Form
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,Registros C -Form
 DocType: Email Digest,Email Digest Settings,Configurações do Resumo por Email
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Obrigado pela compra!
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Suporte às perguntas de clientes.
@@ -610,10 +608,10 @@
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Agenda do Curso
 DocType: Maintenance Visit,Completion Status,Status de Conclusão
 DocType: HR Settings,Enter retirement age in years,Insira a idade da aposentadoria em anos
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Armazén de Destino
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Armazén de Destino
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir entrega ou recebimento adicional até este percentual
 DocType: Upload Attendance,Import Attendance,Importação de Ponto
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Todos os grupos de itens
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Todos os grupos de itens
 DocType: Process Payroll,Activity Log,Log de Atividade
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Compor automaticamente mensagem no envio de transações.
 DocType: Production Order,Item To Manufacture,Item para Fabricação
@@ -622,7 +620,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Pedido de Compra para Pagamento
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Qtde Projetada
 DocType: Sales Invoice,Payment Due Date,Data de Vencimento
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Variant item {0} já existe com mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Variant item {0} já existe com mesmos atributos
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening','Abrindo'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Atribuições em aberto
 DocType: Notification Control,Delivery Note Message,Mensagem da Guia de Remessa
@@ -649,7 +647,7 @@
 DocType: Purchase Invoice Item,Rejected Qty,Qtde Rejeitada
 DocType: Salary Slip,Working Days,Dias úteis
 DocType: Serial No,Incoming Rate,Valor de Entrada
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,O nome da sua empresa para a qual você está configurando o sistema.
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,O nome da sua empresa para a qual você está configurando o sistema.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Incluir feriados no total de dias de trabalho
 DocType: Job Applicant,Hold,Segurar
 DocType: Employee,Date of Joining,Data da Contratação
@@ -659,7 +657,7 @@
 apps/erpnext/erpnext/config/accounts.py +311,Currency exchange rate master.,Cadastro de Taxa de Câmbio
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar entalhe Tempo nos próximos {0} dias para a Operação {1}
 DocType: Production Order,Plan material for sub-assemblies,Material de Plano de sub-conjuntos
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,LDM {0} deve ser ativa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,LDM {0} deve ser ativa
 DocType: Journal Entry,Depreciation Entry,Lançamento de Depreciação
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Por favor, selecione o tipo de documento primeiro"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancelar Materiais Visitas {0} antes de cancelar este Manutenção Visita
@@ -672,10 +670,9 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,"Por favor, mencione completam Conta in Company"
 DocType: Purchase Receipt,Range,Alcance
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Colaborador {0} não está ativo ou não existe
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Variante(s) do Item {0} atualizada(s)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Não é possível {0} {1} {2} sem qualquer fatura pendente
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Variante(s) do Item {0} atualizada(s)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Não é possível {0} {1} {2} sem qualquer fatura pendente
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Adiantamento da Nota Fiscal de Compra
-DocType: Hub Settings,Sync Now,Sincronizar agora
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Linha {0}: Lançamento de crédito não pode ser relacionado a uma {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Defina orçamento para um ano fiscal.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Conta do Banco/Caixa padrão será atualizada automaticamente na nota fiscal do PDV quando este modo for selecionado.
@@ -685,10 +682,10 @@
 DocType: Item,Is Purchase Item,É item de compra
 DocType: Asset,Purchase Invoice,Nota Fiscal de Compra
 DocType: Stock Ledger Entry,Voucher Detail No,Nº do Detalhe do Comprovante
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Nova Nota Fiscal de Venda
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Nova Nota Fiscal de Venda
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Abertura Data e Data de Fechamento deve estar dentro mesmo ano fiscal
 DocType: Lead,Request for Information,Solicitação de Informação
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Sincronizar Faturas Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Sincronizar Faturas Offline
 DocType: Program Fee,Program Fee,Taxa do Programa
 DocType: Material Request Item,Lead Time Date,Prazo de Entrega
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, is mandatory. Maybe Currency Exchange record is not created for ,é obrigatório. Talvez o registro de taxas de câmbios não está criado para
@@ -723,7 +720,7 @@
 DocType: Journal Entry,Total Amount in Words,Valor total por extenso
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Houve um erro . Uma razão provável pode ser que você não tenha salvo o formulário. Entre em contato com support@erpnext.com se o problema persistir .
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Meu carrinho
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Tipo de Ordem deve ser uma das {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Tipo de Ordem deve ser uma das {0}
 DocType: Lead,Next Contact Date,Data do Próximo Contato
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Qtde Abertura
 DocType: Student Batch Name,Student Batch Name,Nome da Série de Alunos
@@ -731,8 +728,8 @@
 DocType: Repayment Schedule,Balance Loan Amount,Saldo do Empréstimo
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Opções de Compra
 DocType: Journal Entry Account,Expense Claim,Pedido de Reembolso de Despesas
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Você realmente deseja restaurar este ativo descartado?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Qtde para {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Você realmente deseja restaurar este ativo descartado?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Qtde para {0}
 DocType: Leave Application,Leave Application,Solicitação de Licenças
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Ferramenta de Alocação de Licenças
 DocType: Leave Block List,Leave Block List Dates,Deixe as datas Lista de Bloqueios
@@ -741,7 +738,7 @@
 DocType: Packing Slip Item,Packing Slip Item,Item da Guia de Remessa
 DocType: Purchase Invoice,Cash/Bank Account,Conta do Caixa/Banco
 DocType: Delivery Note,Delivery To,Entregar Para
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,A tabela de atributos é obrigatório
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,A tabela de atributos é obrigatório
 DocType: Production Planning Tool,Get Sales Orders,Obter Pedidos de Venda
 DocType: Asset,Total Number of Depreciations,Número Total de Depreciações
 DocType: Workstation,Wages,Salário
@@ -763,8 +760,8 @@
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Centro de Custo Padrão de Vendas
 DocType: Sales Partner,Implementation Partner,Parceiro de implementação
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,CEP
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Pedido de Venda {0} é {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,CEP
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Pedido de Venda {0} é {1}
 DocType: Opportunity,Contact Info,Informações para Contato
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Fazendo Lançamentos no Estoque
 DocType: Packing Slip,Net Weight UOM,Unidade de Medida do Peso Líquido
@@ -794,7 +791,7 @@
 ,Ordered Items To Be Billed,"Itens Vendidos, mas não Faturados"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,De Gama tem de ser inferior à gama
 DocType: Global Defaults,Global Defaults,Padrões Globais
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Convite para Colaboração em Projeto
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Convite para Colaboração em Projeto
 DocType: Purchase Invoice,Start date of current invoice's period,Data de início do período de fatura atual
 DocType: Salary Slip,Leave Without Pay,Licença não remunerada
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Erro de Planejamento de Capacidade
@@ -804,7 +801,7 @@
 apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Saldo de Abertura da Conta
 DocType: Sales Invoice Advance,Sales Invoice Advance,Adiantamento da Nota Fiscal de Venda
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Nada para pedir
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',A 'Data de Início Real' não pode ser maior que a 'Data Final Real'
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',A 'Data de Início Real' não pode ser maior que a 'Data Final Real'
 DocType: Cheque Print Template,Payer Settings,Configurações do Pagador
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Isso vai ser anexado ao Código do item da variante. Por exemplo, se a sua abreviatura é ""SM"", e o código do item é ""t-shirt"", o código do item da variante será ""T-shirt-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pagamento líquido (por extenso) será visível quando você salvar a folha de pagamento.
@@ -822,7 +819,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Outras contas podem ser feitas em Grupos, mas as entradas podem ser feitas contra os Não-Grupos"
 DocType: Lead,Lead,Cliente em Potencial
 DocType: Email Digest,Payables,Contas a Pagar
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Lançamento de Estoque {0} criado
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Lançamento de Estoque {0} criado
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Linha # {0}: Qtde rejeitada não pode ser lançada na devolução da compra
 ,Purchase Order Items To Be Billed,"Itens Comprados, mas não Faturados"
 DocType: Purchase Invoice Item,Purchase Invoice Item,Item da Nota Fiscal de Compra
@@ -835,7 +832,7 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Detalhes do Pagamento não Conciliado
 DocType: Global Defaults,Disable Rounded Total,Desativar total arredondado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,'Entradas' não pode estar vazio
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Configurando Colaboradores
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Configurando Colaboradores
 DocType: Sales Order,SO-,OV-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Por favor selecione o prefixo primeiro
 DocType: Maintenance Visit Purpose,Work Done,Trabalho Feito
@@ -843,16 +840,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Item {0} deve ser um item não inventariado
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Ver Livro Razão
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Mais antigas
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Um grupo de itens existe com o mesmo nome, por favor, mude o nome do item ou mude o nome do grupo de itens"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Um grupo de itens existe com o mesmo nome, por favor, mude o nome do item ou mude o nome do grupo de itens"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Celular do Aluno
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Celular do Aluno
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Resto do Mundo
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Resto do Mundo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,O item {0} não pode ter Batch
 ,Budget Variance Report,Relatório de Variação de Orçamento
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Registro Contábil
 DocType: Stock Reconciliation,Difference Amount,Total da diferença
 DocType: Vehicle Log,Service Detail,Detalhes da Manutenção do Veículo
 DocType: Student Sibling,Student Sibling,Irmão do Aluno
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Forma de Pagamento
 DocType: Purchase Invoice,Supplied Items,Itens fornecidos
 DocType: Student,STUD.,ALUN.
 DocType: Production Order,Qty To Manufacture,Qtde para Fabricar
@@ -872,11 +870,12 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Não autorizado para editar conta congelada {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obter notas pendentes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Pedido de Venda {0} não é válido
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Desculpe , as empresas não podem ser mescladas"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+DocType: Supplier Scorecard,Warn for new Request for Quotations,Avisar ao criar novas solicitações de orçamentos
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Desculpe , as empresas não podem ser mescladas"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",A quantidade total Saída / Transferir {0} na Requisição de Material {1} \ não pode ser maior do que a quantidade solicitada {2} para o Item {3}
 DocType: Employee,Employee Number,Número do Colaborador
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Processo n º (s) já está em uso . Tente de Processo n {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Processo n º (s) já está em uso . Tente de Processo n {0}
 ,Invoiced Amount (Exculsive Tax),Valor Faturado (Sem Impostos)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Número 2
 DocType: Training Event,Training Event,Evento de Treinamento
@@ -886,17 +885,16 @@
 DocType: Email Digest,Add Quote,Adicionar Citar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +869,UOM coversion factor required for UOM: {0} in Item: {1},Fator de Conversão de Unidade de Medida é necessário para Unidade de Medida: {0} no Item: {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Linha {0}: Qtde é obrigatória
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sincronizar com o Servidor
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sincronizar com o Servidor
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Seus Produtos ou Serviços
 DocType: Mode of Payment,Mode of Payment,Forma de Pagamento
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Site de imagem deve ser um arquivo público ou URL do site
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Site de imagem deve ser um arquivo público ou URL do site
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Este é um grupo de itens de raiz e não pode ser editada.
 DocType: Journal Entry Account,Purchase Order,Pedido de Compra
 DocType: Vehicle,Fuel UOM,UDM do Combustível
 DocType: Warehouse,Warehouse Contact Info,Informações de Contato do Armazén
 DocType: Payment Entry,Write Off Difference Amount,Valor da diferença do abatimento
-DocType: Purchase Invoice,Recurring Type,Tipo de recorrência
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: Email do colaborador não encontrado, portanto o email não foi enviado"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: Email do colaborador não encontrado, portanto o email não foi enviado"
 DocType: Email Digest,Annual Income,Receita Anual
 DocType: Serial No,Serial No Details,Detalhes do Nº de Série
 DocType: Purchase Invoice Item,Item Tax Rate,Alíquota do Imposto do Item
@@ -904,8 +902,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Item {0} deve ser um item do sub- contratados
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Bens de Capital
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regra de Preços é o primeiro selecionado com base em ""Aplicar On 'campo, que pode ser Item, item de grupo ou Marca."
-DocType: Hub Settings,Seller Website,Site do Vendedor
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Porcentagem total alocado para a equipe de vendas deve ser de 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Porcentagem total alocado para a equipe de vendas deve ser de 100
 ,Team Updates,Updates da Equipe
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +885,For Supplier,Para Fornecedor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Definir o Tipo de Conta ajuda na seleção desta Conta nas transações.
@@ -917,20 +914,20 @@
 DocType: Purchase Invoice,Total (Company Currency),Total (moeda da empresa)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Número de série {0} entrou mais de uma vez
 DocType: Depreciation Schedule,Journal Entry,Lançamento no Livro Diário
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} itens em andamento
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} itens em andamento
 DocType: Workstation,Workstation Name,Nome da Estação de Trabalho
 DocType: Grading Scale Interval,Grade Code,Código de Nota de Avaliação
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Resumo por Email:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},A LDM {0} não pertencem ao Item {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},A LDM {0} não pertencem ao Item {1}
 DocType: Sales Partner,Target Distribution,Distribuição de metas
 DocType: Salary Slip,Bank Account No.,Nº Conta Bancária
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Este é o número da última transação criada com este prefixo
+DocType: Accounts Settings,Book Asset Depreciation Entry Automatically,Lançar de Depreciação de Ativos no Livro Automaticamente
 DocType: BOM Operation,Workstation,Estação de Trabalho
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Solicitação de Orçamento para Fornecedor
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Ferramentas
-DocType: Sales Order,Recurring Upto,recorrente Upto
 DocType: Attendance,HR Manager,Gerente de RH
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,"Por favor, selecione uma empresa"
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,"Por favor, selecione uma empresa"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Privilege Deixar
 DocType: Purchase Invoice,Supplier Invoice Date,Data de emissão da nota fiscal
 DocType: Appraisal Template Goal,Appraisal Template Goal,Meta do Modelo de Avaliação
@@ -940,7 +937,7 @@
 DocType: Purchase Taxes and Charges,Add or Deduct,Adicionar ou Reduzir
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Condições sobreposição encontradas entre :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Contra Journal Entry {0} já é ajustado contra algum outro comprovante
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Alimentos
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Alimentos
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Faixa de Envelhecimento 3
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Moeda da Conta de encerramento deve ser {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Soma de pontos para todos os objetivos deve inteirar 100. (valor atual: {0})
@@ -959,7 +956,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Média Diária de Saída
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',"Status de Aprovação deve ser ""Aprovado"" ou ""Rejeitado"""
 DocType: Purchase Invoice,Contact Person,Pessoa de Contato
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Data de Início Esperada' não pode ser maior que 'Data Final Esperada'
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','Data de Início Esperada' não pode ser maior que 'Data Final Esperada'
 DocType: Holiday List,Holidays,Feriados
 DocType: Sales Order Item,Planned Quantity,Quantidade Planejada
 DocType: Purchase Invoice Item,Item Tax Amount,Valor do Imposto do Item
@@ -968,13 +965,13 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Variação Líquida do Ativo Imobilizado
 DocType: Leave Control Panel,Leave blank if considered for all designations,Deixe em branco se considerado para todas as designações
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge do tipo ' real ' na linha {0} não pode ser incluído no item Taxa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,A partir da data e hora
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log de Comunicação.
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Valor de Compra
 DocType: Sales Invoice,Shipping Address Name,Endereço de Entrega
 DocType: Material Request,Terms and Conditions Content,Conteúdo dos Termos e Condições
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Item {0} não é um item de estoque
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Item {0} não é um item de estoque
 DocType: Maintenance Visit,Unscheduled,Sem Agendamento
 DocType: Salary Detail,Depends on Leave Without Pay,Depende de licença sem vencimento
 ,Purchase Invoice Trends,Tendência de Notas Fiscais de Compra
@@ -991,7 +988,7 @@
 Used for Taxes and Charges",Detalhe da tabela de imposto obtido a partir do cadastro do item como texto e armazenado neste campo. Usado para Tributos e Encargos
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Colaborador não pode denunciar a si mesmo.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Se a conta for congelada, os lançamentos só serão permitidos aos usuários restritos."
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilidade de entrada para {0}: {1} só pode ser feito em moeda: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilidade de entrada para {0}: {1} só pode ser feito em moeda: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil da vaga, qualificações exigidas, etc."
 DocType: Journal Entry Account,Account Balance,Saldo da conta
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Regra de imposto para transações.
@@ -1007,7 +1004,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Guia de Remessa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Aluguel do Escritório
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Configurações de gateway SMS Setup
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Falha na Importação!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Falha na Importação!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Nenhum endereço adicionado ainda.
 DocType: Workstation Working Hour,Workstation Working Hour,Hora de Trabalho da Estação de Trabalho
 DocType: Item,Sales Details,Detalhes de Vendas
@@ -1029,10 +1026,11 @@
 DocType: Item Group,Item Group Name,Nome do Grupo de Itens
 DocType: Pricing Rule,For Price List,Para Lista de Preço
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} não foi enviado então a ação não pode ser concluída
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} não foi enviado então a ação não pode ser concluída
 DocType: Purchase Order Item Supplied,BOM Detail No,Nº do detalhe da LDM
 DocType: Landed Cost Voucher,Additional Charges,Encargos Adicionais
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Total do desconto adicional (moeda da empresa)
+DocType: Supplier Scorecard,Supplier Scorecard,Scorecard do Fornecedor
 apps/erpnext/erpnext/accounts/doctype/account/account.js +21,Please create new account from Chart of Accounts.,"Por favor, crie uma nova conta de Plano de Contas ."
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Qtde Disponível do Lote no Armazén
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Atualizar Formato de Impressão
@@ -1051,6 +1049,7 @@
 DocType: Purchase Receipt,Transporter Details,Detalhes da Transportadora
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,Possível Fornecedor
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Lista Receiver está vazio. Por favor, crie Lista Receiver"
+apps/erpnext/erpnext/public/js/setup_wizard.js +29,Healthcare (beta),Serviço de Saúde (beta)
 DocType: Production Plan Sales Order,Production Plan Sales Order,Pedido de Venda do Plano de Produção
 DocType: Sales Partner,Sales Partner Target,Metas do Parceiro de Vendas
 DocType: Loan Type,Maximum Loan Amount,Valor Máximo de Empréstimo
@@ -1066,7 +1065,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} deve aparecer apenas uma vez
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Não é permitido o tranferir mais do que {0} {1} no Pedido de Compra {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Folhas atribuídos com sucesso para {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nenhum item para embalar
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Nenhum item para embalar
 DocType: Shipping Rule Condition,From Value,De Valor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Manufacturing Quantidade é obrigatório
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Se for selecionado, a Página Inicial será o Grupo de Itens padrão do site"
@@ -1080,7 +1079,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Reenviar email de pagamento
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nova Tarefa
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Relatórios Adicionais
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Fator de conversão de unidade de medida padrão deve ser 1 na linha {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Fator de conversão de unidade de medida padrão deve ser 1 na linha {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Deixar do tipo {0} não pode ser maior que {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Tente planejar operações para X dias de antecedência.
 DocType: HR Settings,Stop Birthday Reminders,Interromper lembretes de aniversários
@@ -1088,18 +1087,18 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantidade Consumida
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Variação Líquida em Dinheiro
 DocType: Assessment Plan,Grading Scale,Escala de avaliação
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidade de Medida {0} foi inserida mais de uma vez na Tabela de Conversão de Fator
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,Já concluído
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidade de Medida {0} foi inserida mais de uma vez na Tabela de Conversão de Fator
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,Já concluído
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Pedido de Pagamento já existe {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Custo dos Produtos Enviados
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Quantidade não deve ser mais do que {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Quantidade não deve ser mais do que {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,O Ano Financeiro Anterior não está fechado
 DocType: Quotation Item,Quotation Item,Item do Orçamento
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,A partir de data não pode ser maior que a Data
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Serial Não {0} {1} quantidade não pode ser uma fração
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Cadastro de Tipo de Fornecedor
 DocType: Purchase Order Item,Supplier Part Number,Número da Peça do Fornecedor
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} está cancelado ou parado
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} está cancelado ou parado
 DocType: Accounts Settings,Credit Controller,Controlador de crédito
 DocType: Delivery Note,Vehicle Dispatch Date,Data da Expedição
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +234,Purchase Receipt {0} is not submitted,Recibo de compra {0} não é enviado
@@ -1120,7 +1119,7 @@
 apps/erpnext/erpnext/config/accounts.py +148,Update bank payment dates with journals.,Atualizar datas de pagamento bancário com livro Diário.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Precificação
 DocType: Quotation,Term Details,Detalhes dos Termos
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Não é possível inscrever mais de {0} alunos neste grupo de alunos.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Não é possível inscrever mais de {0} alunos neste grupo de alunos.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} deve ser maior que 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planejamento de capacidade para (Dias)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Cotação
@@ -1148,7 +1147,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Realização
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Despesas com Marketing
 ,Item Shortage Report,Relatório de Escassez de Itens
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Peso é mencionado, \n Também mencione ""Unidade de Medida de Peso"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Peso é mencionado, \n Também mencione ""Unidade de Medida de Peso"""
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Requisição de Material usada para fazer esta Entrada de Material
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Unidade única de um item.
 DocType: Fee Category,Fee Category,Categoria de Taxas
@@ -1156,9 +1155,9 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Fazer lançamento contábil para cada movimento de estoque
 DocType: Leave Allocation,Total Leaves Allocated,Total de licenças alocadas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Armazén necessário na Linha nº {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,"Por favor, indique datas inicial e final válidas do Ano Financeiro"
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,"Por favor, indique datas inicial e final válidas do Ano Financeiro"
 DocType: Employee,Date Of Retirement,Data da aposentadoria
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,Configuração do ERPNext Concluída!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,Configuração do ERPNext Concluída!
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,"{0} {1}: Centro de Custo é necessário para a conta de ""Lucros e Perdas"" {2}. Por favor, crie um Centro de Custo padrão para a Empresa."
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +118,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe um grupo de clientes com o mesmo nome, por favor modifique o nome do cliente ou renomeie o grupo de clientes"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +37,New Contact,Novo Contato
@@ -1166,26 +1165,26 @@
 DocType: Stock Entry,Material Receipt,Entrada de Material
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Se este item tem variantes, então ele não pode ser selecionado em pedidos de venda etc."
 DocType: Lead,Next Contact By,Próximo Contato Por
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Quantidade necessária para item {0} na linha {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Quantidade necessária para item {0} na linha {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Armazém {0} não pode ser excluído pois existe quantidade para item {1}
-DocType: Purchase Invoice,Notification Email Address,Endereço de email de notificação
 ,Item-wise Sales Register,Registro de Vendas por Item
 DocType: Asset,Gross Purchase Amount,Valor Bruto de Compra
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Offline
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Este Imposto Está Incluído na Base de Cálculo?
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Meta Total
 DocType: Job Applicant,Applicant for a Job,Candidato à uma Vaga
 DocType: Production Plan Material Request,Production Plan Material Request,Requisição de Material do Planejamento de Produção
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Não há ordens de produção criadas
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Não há ordens de produção criadas
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliação JSON
 DocType: Purchase Invoice Item,Batch No,Nº do Lote
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permitir vários Pedidos de Venda relacionados ao Pedido de Compra do Cliente
 DocType: Naming Series,Set prefix for numbering series on your transactions,Definir prefixo para séries de numeração em suas transações
 DocType: Employee Attendance Tool,Employees HTML,Colaboradores HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,LDM Padrão ({0}) precisa estar ativo para este item ou o seu modelo
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,LDM Padrão ({0}) precisa estar ativo para este item ou o seu modelo
 DocType: Employee,Leave Encashed?,Licenças Cobradas?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"O campo ""Oportunidade de"" é obrigatório"
 DocType: Email Digest,Annual Expenses,Despesas Anuais
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Criar Pedido de Compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Criar Pedido de Compra
 DocType: Payment Reconciliation Payment,Allocated amount,Quantidade atribuída
 DocType: Stock Reconciliation,Stock Reconciliation,Conciliação de Estoque
 DocType: Territory,Territory Name,Nome do Território
@@ -1199,7 +1198,7 @@
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),O peso líquido do pacote. (Calculado automaticamente como soma do peso líquido dos itens)
 DocType: Sales Order,To Deliver and Bill,Para Entregar e Faturar
 DocType: GL Entry,Credit Amount in Account Currency,Crédito em moeda da conta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,LDM {0} deve ser enviada
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,LDM {0} deve ser enviada
 DocType: Authorization Control,Authorization Control,Controle de autorização
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Linha # {0}: Armazén Rejeitado é obrigatório para o item rejeitado {1}
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Gerir seus pedidos
@@ -1211,11 +1210,11 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Activo não podem ser canceladas, como já é {0}"
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Empacotar itens no momento da venda.
 DocType: Quotation Item,Actual Qty,Qtde Real
-DocType: Hub Settings,Hub Node,Hub Node
+DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Você digitou itens duplicados . Por favor, corrigir e tentar novamente."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Associado
 DocType: Asset Movement,Asset Movement,Movimentação de Ativos
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,Novo Carrinho
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,Novo Carrinho
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Item {0} não é um item serializado
 DocType: SMS Center,Create Receiver List,Criar Lista de Receptor
 DocType: Packing Slip,To Package No.,Até nº do pacote
@@ -1225,7 +1224,7 @@
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Qtde Consumida
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que o pacote é uma parte desta entrega (Só Rascunho)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Criar Entrada de Pagamento
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Quantidade de item {0} deve ser inferior a {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Quantidade de item {0} deve ser inferior a {1}
 ,Sales Invoice Trends,Tendência de Faturamento de Vendas
 DocType: Leave Application,Apply / Approve Leaves,Aplicar / Aprovar Leaves
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Pode se referir linha apenas se o tipo de acusação é 'On Anterior Valor Row ' ou ' Previous Row Total'
@@ -1240,11 +1239,11 @@
 DocType: Student,Student Mobile Number,Número de Celular do Aluno
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nome da distribuição mensal
 DocType: Sales Person,Parent Sales Person,Vendedor pai
-DocType: Purchase Invoice,Recurring Invoice,Nota Fiscal Recorrente
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Gerenciamento de Projetos
 DocType: Supplier,Supplier of Goods or Services.,Fornecedor de bens ou serviços.
 DocType: Budget,Fiscal Year,Exercício Fiscal
 DocType: Vehicle Log,Fuel Price,Preço do Combustível
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Definir como Aberto
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Orçamento não pode ser atribuído contra {0}, pois não é uma conta de renda ou despesa"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Linha {0}: Valor alocado {1} deve ser menor ou igual ao saldo devedor {2} da nota
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Por extenso será visível quando você salvar a Nota Fiscal de Venda.
@@ -1255,10 +1254,11 @@
 ,Amount to Deliver,Total à Entregar
 DocType: Guardian,Guardian Interests,Interesses do Responsável
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Vários anos fiscais existem para a data {0}. Por favor, defina empresa no ano fiscal"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} criou
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} criou
 DocType: Delivery Note Item,Against Sales Order,Relacionado ao Pedido de Venda
 ,Serial No Status,Status do Nº de Série
 DocType: Payment Entry Reference,Outstanding,Saldo devedor
+DocType: Supplier,Warn POs,Avisar em Pedidos de Compra
 ,Daily Timesheet Summary,Resumo Diário dos Registros de Tempo
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Fila {0}: Para definir {1} periodicidade, diferença entre a data de \
@@ -1266,7 +1266,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Isto é baseado no movimento de estoque. Veja o {0} para maiores detalhes
 DocType: Employee,Salary Information,Informação Salarial
 DocType: Sales Person,Name and Employee ID,Nome e ID do Colaborador
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,A data de vencimento não pode ser anterior à data de postagem
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,A data de vencimento não pode ser anterior à data de postagem
 DocType: Website Item Group,Website Item Group,Grupo de Itens do Site
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Impostos e Contribuições
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Por favor, indique data de referência"
@@ -1286,7 +1286,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Linha # {0}: Operação {1} não está completa para {2} qtde de produtos acabados na ordem de produção # {3}. Por favor, atualize o status da operação via Registros de Tempo"
 DocType: Issue,Resolution Details,Detalhes da Solução
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alocações
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Por favor insira as Requisições de Material na tabela acima
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Por favor insira as Requisições de Material na tabela acima
 DocType: Item Attribute,Attribute Name,Nome do atributo
 DocType: BOM,Show In Website,Mostrar no Site
 DocType: Employee Loan Application,Total Payable Amount,Total a Pagar
@@ -1294,7 +1294,7 @@
 DocType: Item Reorder,Check in (group),Entrada (grupo)
 ,Qty to Order,Qtde para Encomendar
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Conta sob Passivo ou Capital Próprio, no qual o Lucro / Prejuízo será escrito"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Gráfico de Gantt de todas as tarefas.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Gráfico de Gantt de todas as tarefas.
 DocType: Opportunity,Mins to First Response,Minutos para Primeira Resposta
 DocType: Pricing Rule,Margin Type,Tipo da Margem
 DocType: Course,Default Grading Scale,Escala de avaliação padrão
@@ -1309,39 +1309,39 @@
 DocType: Task,Total Billing Amount (via Time Sheet),Total Faturado (via Registro de Tempo)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Receita Clientes Repetidos
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) deve ter o papel 'Aprovador de Despesas'
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Selecionar LDM e quantidade para produção
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Selecionar LDM e quantidade para produção
 DocType: Asset,Depreciation Schedule,Tabela de Depreciação
 DocType: Bank Reconciliation Detail,Against Account,Contra à Conta
 DocType: Item,Has Batch No,Tem nº de Lote
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Faturamento Anual: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Faturamento Anual: {0}
 DocType: Delivery Note,Excise Page Number,Número de página do imposto
 DocType: Asset,Purchase Date,Data da Compra
 DocType: Employee,Personal Details,Detalhes pessoais
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},"Por favor, defina &quot;de ativos Centro de Custo Depreciação &#39;in Company {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},"Por favor, defina &quot;de ativos Centro de Custo Depreciação &#39;in Company {0}"
 ,Maintenance Schedules,Horários de Manutenção
 DocType: Task,Actual End Date (via Time Sheet),Data Final Real (via Registro de Tempo)
 ,Quotation Trends,Tendência de Orçamentos
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Grupo item não mencionado no mestre de item para item {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,De débito em conta deve ser uma conta a receber
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,De débito em conta deve ser uma conta a receber
 DocType: Shipping Rule Condition,Shipping Amount,Valor do Transporte
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Total pendente
 ,Vehicle Expenses,Despesas com Veículos
 DocType: Purchase Receipt,Vehicle Number,Placa do Veículo
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,A data em que fatura recorrente será interrompida
 DocType: Employee Loan,Loan Amount,Valor do Empréstimo
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Linha {0}: Lista de MAteriais não encontrada para o item {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Total de licenças alocadas {0} não pode ser menor do que as licenças já aprovadas {1} para o período
 DocType: Salary Structure,Select employees for current Salary Structure,Selecionar colaboradores para Estrutura Salário atual
 DocType: Production Order,Use Multi-Level BOM,Utilize LDM Multinível
 DocType: Bank Reconciliation,Include Reconciled Entries,Incluir entradas reconciliadas
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Deixe em branco se considerado para todos os tipos de colaboradores
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir encargos baseado em
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Registros de Tempo
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Registros de Tempo
 DocType: HR Settings,HR Settings,Configurações de RH
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,Expense Claim is pending approval. Only the Expense Approver can update status.,O pedido de reembolso de despesas está pendente de aprovação. Somente o aprovador de despesas pode atualizar o status.
 DocType: Purchase Invoice,Additional Discount Amount,Total do Desconto Adicional
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Linha #{0}: A qtde deve ser 1, pois o item é um ativo imobilizado. Por favor, utilize uma linha separada para múltiplas qtdes."
 DocType: Leave Block List Allow,Leave Block List Allow,Deixe Lista de Bloqueios Permitir
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Grupo para Não-Grupo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Esportes
 DocType: Loan Type,Loan Name,Nome do Empréstimo
@@ -1351,7 +1351,7 @@
 ,Customer Acquisition and Loyalty,Aquisição de Clientes e Fidelização
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Armazén onde você está mantendo estoque de itens rejeitados
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} é agora o Ano Fiscal padrão. Por favor, atualize seu navegador para que a alteração tenha efeito."
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Relatórios de Despesas
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Relatórios de Despesas
 DocType: Issue,Support,Pós-Vendas
 ,BOM Search,Pesquisar LDM
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Fechamento (Abertura + Totais)
@@ -1364,13 +1364,13 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +279,Account {0} is invalid. Account Currency must be {1},Conta {0} é inválido. Conta de moeda deve ser {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Fator de Conversão da Unidade de Medida é necessário na linha {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Linha #{0}: O Tipo de Documento de Referência deve ser um Pedido de Venda, uma Nota Fiscal de Venda ou um Lançamento Contábil"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Linha #{0}: O Tipo de Documento de Referência deve ser um Pedido de Venda, uma Nota Fiscal de Venda ou um Lançamento Contábil"
 DocType: Stock Reconciliation Item,Amount Difference,Valor da Diferença
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Item Preço adicionada para {0} na lista de preços {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Item Preço adicionada para {0} na lista de preços {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Digite o ID de Colaborador deste Vendedor
 DocType: Territory,Classification of Customers by region,Classificação dos clientes por região
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,O Valor da Diferença deve ser zero
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,"Por favor, indique item Produção primeiro"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,"Por favor, indique item Produção primeiro"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Saldo calculado do extrato bancário
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,usuário desativado
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +764,Quotation,Orçamento
@@ -1379,10 +1379,11 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Item {0} já foi devolvido
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,O **Ano Fiscal** representa um exercício financeiro. Todos os lançamentos contábeis e outras transações principais são rastreadas contra o **Ano Fiscal**.
 DocType: Opportunity,Customer / Lead Address,Endereço do Cliente/Cliente em Potencial
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Aviso: certificado SSL inválido no anexo {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Aviso: certificado SSL inválido no anexo {0}
 DocType: Production Order Operation,Actual Operation Time,Tempo Real da Operação
 DocType: Authorization Rule,Applicable To (User),Aplicável Para (Usuário)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Descrição do Trabalho
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Abrir Novamente
 DocType: Sales Invoice Item,Qty as per Stock UOM,Qtde por UDM do Estoque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caracteres especiais, exceto ""-"" ""."", ""#"", e ""/"", não são permitidos em nomeação em série"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mantenha o controle de campanhas de vendas. Mantenha o controle de Clientes em Potencial, Orçamentos, Pedidos de Venda, de Campanhas e etc, para medir retorno sobre o investimento."
@@ -1391,7 +1392,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Gerente de Fabricação
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Nº de Série {0} está na garantia até {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Dividir Guia de Remessa em pacotes.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Entregas
+apps/erpnext/erpnext/hooks.py +107,Shipments,Entregas
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Total alocado (moeda da empresa)
 DocType: Purchase Order Item,To be delivered to customer,Para ser entregue ao cliente
 DocType: BOM,Scrap Material Cost,Custo do Material Sucateado
@@ -1403,8 +1404,8 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,Observação: Emails não serão enviado para usuários desabilitados
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Selecione a Empresa...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Deixe em branco se considerado para todos os departamentos
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tipos de emprego (permanente , contrato, estagiário, etc.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} é obrigatório para o item {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Tipos de emprego (permanente , contrato, estagiário, etc.)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} é obrigatório para o item {1}
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor, selecione montante atribuído, tipo de fatura e número da fatura em pelo menos uma fileira"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Custo da Nova Compra
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +97,Sales Order required for Item {0},Pedido de Venda necessário para o item {0}
@@ -1420,7 +1421,7 @@
 DocType: Bank Guarantee,Bank Guarantee,Garantia Bancária
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Por favor, clique em ""Gerar Agenda"" para obter cronograma"
 DocType: Bin,Ordered Quantity,Quantidade Encomendada
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","ex: ""Desenvolve ferramentas para construtores """
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","ex: ""Desenvolve ferramentas para construtores """
 DocType: Grading Scale,Grading Scale Intervals,Intervalos da escala de avaliação
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Entradas contabeis para {2} só pode ser feito em moeda: {3}
 DocType: Production Order,In Process,Em Processo
@@ -1436,7 +1437,7 @@
 DocType: Quotation Item,Stock Balance,Balanço de Estoque
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Pedido de Venda para Pagamento
 DocType: Expense Claim Detail,Expense Claim Detail,Detalhe do Pedido de Reembolso de Despesas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,"Por favor, selecione conta correta"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,"Por favor, selecione conta correta"
 DocType: Item,Weight UOM,UDM de Peso
 DocType: Salary Structure Employee,Salary Structure Employee,Colaborador da Estrutura Salário
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Usuários que podem aprovar pedidos de licença de um colaborador específico
@@ -1451,21 +1452,22 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Os preços não serão mostrados se a lista de preços não estiver configurada
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Por favor, especifique um país para esta regra de envio ou verifique Transporte mundial"
 DocType: Stock Entry,Total Incoming Value,Valor Total Recebido
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Para Débito é necessária
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Para Débito é necessária
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Preço de Compra Lista
 DocType: Offer Letter Term,Offer Term,Termos da Oferta
 DocType: Quality Inspection,Quality Manager,Gerente de Qualidade
 DocType: Job Applicant,Job Opening,Vaga de Trabalho
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Por favor, selecione a pessoa responsável"
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Total a Pagar: {0}
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Total a Pagar: {0}
 DocType: BOM Website Operation,BOM Website Operation,LDM da Operação do Site
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Carta de Ofeta
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Gerar Requisições de Material (MRP) e Ordens de Produção.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +76,Total Invoiced Amt,Valor Total Faturado
+DocType: Supplier,Warn RFQs,Alertar em Solicitações de Orçamentos
 DocType: Physician Schedule Time Slot,To Time,Até o Horário
 DocType: Authorization Rule,Approving Role (above authorized value),Função de Aprovador (para autorização de valor excedente)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,A conta de Crédito deve ser uma conta do Contas à Pagar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},LDM recursão: {0} não pode ser pai ou filho de {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},LDM recursão: {0} não pode ser pai ou filho de {2}
 DocType: Production Order Operation,Completed Qty,Qtde Concluída
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Por {0}, apenas as contas de débito pode ser ligado contra outra entrada crédito"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Preço de {0} está desativado
@@ -1479,17 +1481,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Ganho/Perda com Câmbio
 DocType: Opportunity,Lost Reason,Motivo da Perda
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Por favor insira o Documento de Recibo
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique um válido &#39;De Caso No.&#39;"
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',"Por favor, especifique um válido &#39;De Caso No.&#39;"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Mais centros de custo podem ser feitos em grupos, mas as entradas podem ser feitas contra os Não-Grupos"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Usuários e Permissões
 DocType: Branch,Branch,Ramo
 DocType: Bin,Actual Quantity,Quantidade Real
 DocType: Shipping Rule,example: Next Day Shipping,exemplo: envio no dia seguinte
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} não foi encontrado
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},A inscrição foi {0}
 DocType: Fee Schedule Program,Student Batch,Série de Alunos
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Fazer Aluno
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Você foi convidado para colaborar com o projeto: {0}
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Aplique agora
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Você foi convidado para colaborar com o projeto: {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Aplique agora
 ,Bank Clearance Summary,Resumo da Liquidação Bancária
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Cria e configura as regras de recebimento de emails, como diário, semanal ou mensal."
 DocType: Appraisal Goal,Appraisal Goal,Meta de Avaliação
@@ -1497,7 +1500,7 @@
 DocType: Fee Schedule,Fee Structure,Estrutura da Taxa
 DocType: Timesheet Detail,Costing Amount,Valor de Custo
 DocType: Process Payroll,Submit Salary Slip,Enviar Folha de Pagamentos
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Desconto máximo para o item {0} {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Desconto máximo para o item {0} {1}%
 DocType: Sales Partner,Address & Contacts,Endereços e Contatos
 DocType: POS Profile,[Select],[ Selecionar]
 DocType: Payment Request,Make Sales Invoice,Fazer Nota Fiscal de Venda
@@ -1510,11 +1513,11 @@
 apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Barcode {0},Nenhum artigo com código de barras {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Caso n não pode ser 0
 DocType: Item,Show a slideshow at the top of the page,Mostrar uma apresentação de slides no topo da página
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,LDMs
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,LDMs
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Envelhecimento Baseado em
 DocType: Item,End of Life,Validade
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Viagem
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Não foi encontrada nenhuma Estrutura Salarial padrão ativa para o colaborador {0} ou para as datas indicadas
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Viagem
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Não foi encontrada nenhuma Estrutura Salarial padrão ativa para o colaborador {0} ou para as datas indicadas
 DocType: Leave Block List,Allow Users,Permitir que os usuários
 DocType: Purchase Order,Customer Mobile No,Celular do Cliente
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Acompanhe resultados separada e despesa para verticais de produtos ou divisões.
@@ -1525,7 +1528,7 @@
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especificar as operações, custos operacionais e dar um número único de operação às suas operações."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Este documento está fora do limite {0} {1} para o item {4}. Você está fazendo outro(a) {3} relacionado(a) a(o) mesmo(a) {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,"Por favor, defina recorrentes depois de salvar"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Selecione a conta de troco
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Selecione a conta de troco
 DocType: Naming Series,User must always select,O Usuário deve sempre selecionar
 DocType: Stock Settings,Allow Negative Stock,Permitir Estoque Negativo
 DocType: Topic,Topic,Tópico
@@ -1545,16 +1548,17 @@
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Pipeline de Vendas
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Obrigatório On
 DocType: Rename Tool,File to Rename,Arquivo para Renomear
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Por favor, selecione LDM para o Item na linha {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Por favor, selecione LDM para o Item na linha {0}"
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},A LDM {0} especificada não existe para o Item {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programação de Manutenção {0} deve ser cancelada antes de cancelar este Pedido de Venda
 DocType: Notification Control,Expense Claim Approved,Pedido de Reembolso de Despesas Aprovado
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Contracheque do colaborador {0} já criado para este período
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Contracheque do colaborador {0} já criado para este período
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Custo de Produtos Comprados
 DocType: Selling Settings,Sales Order Required,Pedido de Venda Obrigatório
 DocType: Purchase Invoice,Credit To,Crédito para
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Leads ativo / Clientes
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Leads ativos / Clientes
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Detalhe da Programação da Manutenção
+DocType: Supplier Scorecard,Warn for new Purchase Orders,Avisar em Novos Pedidos de Compra
 DocType: Buying Settings,Buying Settings,Configurações de Compras
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Nº da LDM para um Item Bom Acabado
 DocType: Upload Attendance,Attendance To Date,Data Final de Comparecimento
@@ -1562,19 +1566,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +880,Please specify Company to proceed,"Por favor, especifique Empresa proceder"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Compensatory Off,compensatória Off
 DocType: Offer Letter,Accepted,Aceito
+DocType: BOM Update Tool,BOM Update Tool,Ferramenta de atualização da Lista de Materiais
 DocType: SG Creation Tool Course,Student Group Name,Nome do Grupo de Alunos
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Por favor, certifique-se de que você realmente quer apagar todas as operações para esta empresa. Os seus dados mestre vai permanecer como está. Essa ação não pode ser desfeita."
 DocType: Room,Room Number,Número da Sala
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) não pode ser maior do que a quantidade planejada ({2}) na ordem de produção {3}
 DocType: Shipping Rule,Shipping Rule Label,Rótudo da Regra de Envio
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Fórum de Usuários
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar estoque, fatura contém gota artigo do transporte."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar estoque, fatura contém gota artigo do transporte."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Lançamento no Livro Diário Rápido
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Você não pode alterar a taxa se a LDM é mencionada em algum item
 DocType: Employee,Previous Work Experience,Experiência anterior de trabalho
 DocType: Stock Entry,For Quantity,Para Quantidade
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Por favor, indique a qtde planejada para o item {0} na linha {1}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},"Por favor, indique a qtde planejada para o item {0} na linha {1}"
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Os pedidos de itens.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Uma Ordem de Produção separada será criada para cada item acabado.
 ,Minutes to First Response for Issues,Minutos para Primeira Resposta em Incidentes
@@ -1584,8 +1589,8 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Preço mais recente atualizado em todas as LDMs
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status do Projeto
 DocType: UOM,Check this to disallow fractions. (for Nos),Marque esta opção para não permitir frações. (Para n)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,As ordens de produção seguintes foram criadas:
-DocType: Student Admission,Naming Series (for Student Applicant),Código dos Documentos (para condidato à vaga de estudo)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,As ordens de produção seguintes foram criadas:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Código dos Documentos (para condidato à vaga de estudo)
 ,Minutes to First Response for Opportunity,Minutos para Primeira Resposta em Oportunidades
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Absent,Total de faltas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +794,Item or Warehouse for row {0} does not match Material Request,Item ou Armazén na linha {0} não corresponde à Requisição de Material
@@ -1687,10 +1692,10 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qtde)
 DocType: Installation Note Item,Installed Qty,Qtde Instalada
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Resultado do Treinamento
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Resultado do Treinamento
 DocType: Salary Structure,Total Earning,Total de ganhos
 DocType: Purchase Receipt,Time at which materials were received,Horário em que os materiais foram recebidos
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Branch master da organização.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Branch master da organização.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,ou
 DocType: Sales Order,Billing Status,Status do Faturamento
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Despesas com Serviços Públicos
@@ -1707,7 +1712,7 @@
 DocType: Bank Reconciliation Detail,Payment Entry,Pagamentos
 ,sales-browser,navegador de vendas
 apps/erpnext/erpnext/accounts/doctype/account/account.js +73,Ledger,Livro Razão
-DocType: Target Detail,Target  Amount,Valor da meta
+DocType: Target Detail,Target  Amount,Valor da Meta
 DocType: Shopping Cart Settings,Shopping Cart Settings,Configurações do Carrinho de Compras
 DocType: Journal Entry,Accounting Entries,Lançamentos contábeis
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},"Duplicar entrada . Por favor, verifique Regra de Autorização {0}"
@@ -1757,12 +1762,12 @@
 DocType: Leave Control Panel,Leave Control Panel,Painel de Controle de Licenças
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Esgotado
 DocType: Appraisal,HR User,Usuário do RH
-apps/erpnext/erpnext/hooks.py +129,Issues,Incidentes
+apps/erpnext/erpnext/hooks.py +138,Issues,Incidentes
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status deve ser um dos {0}
 DocType: Delivery Note,Required only for sample item.,Necessário apenas para o item de amostra.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qtde Real Após a Transação
 ,Pending SO Items For Purchase Request,Itens Pendentes da Ordem de Venda por Solicitação de Compra
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Admissões de Alunos
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Admissões de Alunos
 DocType: Supplier,Billing Currency,Moeda de Faturamento
 DocType: Sales Invoice,SINV-RET-,NFV-DEV-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Extra Grande
@@ -1785,7 +1790,7 @@
 DocType: Price List,Price List Master,Cadastro da Lista de Preços
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Todas as transações de vendas pode ser marcado contra várias pessoas das vendas ** ** para que você pode definir e monitorar as metas.
 ,S.O. No.,Número da Ordem de Venda
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},"Por favor, crie um Cliente apartir do Cliente em Potencial {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},"Por favor, crie um Cliente apartir do Cliente em Potencial {0}"
 DocType: Price List,Applicable for Countries,Aplicável para os Países
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"Somente pedidos de licença com o status ""Aprovado"" ou ""Rejeitado"" podem ser enviados"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Nome do Grupo de Alunos é obrigatório na linha {0}
@@ -1850,7 +1855,7 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Gerenciar territórios
 DocType: Journal Entry Account,Sales Invoice,Nota Fiscal de Venda
 DocType: Journal Entry Account,Party Balance,Saldo do Sujeito
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,"Por favor, selecione Aplicar Discount On"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,"Por favor, selecione Aplicar Discount On"
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Criar registro bancário para o total pago de salários pelos critérios acima selecionados
 DocType: Stock Entry,Material Transfer for Manufacture,Transferência de Material para Fabricação
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Percentual de desconto pode ser aplicado contra uma lista de preços ou para todos Lista de Preços.
@@ -1873,19 +1878,22 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +380,Add Employees,Adicionar Colaboradores
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Muito Pequeno
 DocType: Company,Standard Template,Template Padrão
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Aviso: A quantidade de material solicitado é menor do que o Pedido Mínimo
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Aviso: A quantidade de material solicitado é menor do que o Pedido Mínimo
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,A Conta {0} está congelada
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidade Legal / Subsidiária com um gráfico separado de Contas pertencente à Organização.
 DocType: Payment Request,Mute Email,Mudo Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, Bebidas e Fumo"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Só pode fazer o pagamento contra a faturar {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Percentual de comissão não pode ser maior do que 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Só pode fazer o pagamento contra a faturar {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Percentual de comissão não pode ser maior do que 100
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,"Por favor, indique {0} primeiro"
 DocType: Production Order Operation,Actual End Time,Tempo Final Real
 DocType: Production Planning Tool,Download Materials Required,Baixar Materiais Necessários
 DocType: Item,Manufacturer Part Number,Número de Peça do Fabricante
 DocType: Production Order Operation,Estimated Time and Cost,Tempo estimado e Custo
 DocType: SMS Log,No of Sent SMS,Nº de SMS enviados
+DocType: Antibiotic,Healthcare Administrator,Administrador de Serviço de Saúde
+apps/erpnext/erpnext/utilities/user_progress.py +44,Set a Target,Definir uma Meta
+DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Evitar Pedidos de Compra
 DocType: Patient Appointment,Scheduled,Agendado
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Solicitação de orçamento.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Por favor, selecione o item em que &quot;é o estoque item&quot; é &quot;Não&quot; e &quot;é o item Vendas&quot; é &quot;Sim&quot; e não há nenhum outro pacote de produtos"
@@ -1893,7 +1901,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +476,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avanço total ({0}) contra Pedido {1} não pode ser maior do que o total geral ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selecione distribuição mensal para distribuir desigualmente metas nos meses.
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Lista de Preço Moeda não selecionado
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Lista de Preço Moeda não selecionado
 ,Student Monthly Attendance Sheet,Folha de Presença Mensal do Aluno
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Colaborador {0} já solicitou {1} entre {2} e {3}
 DocType: Rename Tool,Rename Log,Renomear Log
@@ -1910,6 +1918,7 @@
 DocType: Purchase Order Item,Returned Qty,Qtde Devolvida
 DocType: Employee,Exit,Saída
 apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Tipo de Raiz é obrigatório
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} já possui um {1} Scorecard de Fornecedor em aberto, portanto, as Cotações para este fornecedor devem ser emitidas com cautela."
 DocType: BOM,Total Cost(Company Currency),Custo total (moeda da empresa)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +315,Serial No {0} created,Nº de Série {0} criado
 DocType: Homepage,Company Description for website homepage,A Descrição da Empresa para a página inicial do site
@@ -1940,7 +1949,7 @@
 DocType: Bank Reconciliation Detail,Posting Date,Data da Postagem
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Marcar Meio Período
 DocType: Sales Invoice,Sales Team,Equipe de Vendas
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Duplicar entrada
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Duplicar lançamento
 DocType: Program Enrollment Tool,Get Students,Obter Alunos
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Por extenso será visível quando você salvar o Pedido de Venda.
 ,Employee Birthday,Aniversário dos Colaboradores
@@ -1955,12 +1964,13 @@
 DocType: Landed Cost Item,Receipt Document Type,Tipo de Documento de Recibo
 DocType: Daily Work Summary Settings,Select Companies,Selecione Empresas
 ,Issued Items Against Production Order,Itens Produzidos vs. Ordens de Produção
+DocType: Antibiotic,Healthcare,Serviço de Saúde
 DocType: Target Detail,Target Detail,Detalhe da meta
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,Todos as Tarefas
 DocType: Sales Order,% of materials billed against this Sales Order,% do material faturado deste Pedido de Venda
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Lançamento de Encerramento do Período
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Centro de custo com as operações existentes não podem ser convertidos em grupo
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Total {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Total {0} {1} {2} {3}
 DocType: Employee Attendance Tool,Employee Attendance Tool,Ferramenta para Lançamento de Ponto
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,Os Registos de Pagamento {0} não estão relacionados
 DocType: GL Entry,Voucher No,Nº do Comprovante
@@ -1972,7 +1982,7 @@
 DocType: Supplier,Last Day of the Next Month,Último dia do mês seguinte
 DocType: Support Settings,Auto close Issue after 7 days,Fechar atuomaticamente o incidente após 7 dias
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixe não pode ser alocado antes {0}, como saldo licença já tenha sido no futuro recorde alocação licença encaminhadas-carry {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Observação: Devido /  Data de referência excede dias de crédito de cliente permitido por {0} dia(s)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Observação: Devido /  Data de referência excede dias de crédito de cliente permitido por {0} dia(s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Inscrição do Aluno
 DocType: Stock Settings,Freeze Stock Entries,Congelar Lançamentos no Estoque
 DocType: Asset,Expected Value After Useful Life,Valor Esperado Após Sua Vida Útil
@@ -1995,7 +2005,7 @@
 DocType: Serial No,Warranty / AMC Details,Garantia / Detalhes do CAM
 DocType: Journal Entry,User Remark,Observação do Usuário
 DocType: Lead,Market Segment,Segmento de Renda
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},O valor pago não pode ser superior ao saldo devedor {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},O valor pago não pode ser superior ao saldo devedor {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Histórico de Trabalho Interno do Colaborador
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Fechamento (Dr)
 DocType: Cheque Print Template,Cheque Size,Tamanho da Folha de Cheque
@@ -2022,15 +2032,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Conta diferença deve ser uma conta de tipo ativo / passivo, uma vez que este da reconciliação é uma entrada de Abertura"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Número do Pedido de Compra necessário para o item {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',A 'Data Final' deve ser posterior a 'Data Inicial'
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Não é possível alterar o status pois o aluno {0} está relacionado à candidatura à vaga de estudo {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Não é possível alterar o status pois o aluno {0} está relacionado à candidatura à vaga de estudo {1}
 DocType: Asset,Fully Depreciated,Depreciados Totalmente
 ,Stock Projected Qty,Projeção de Estoque
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Presença marcante HTML
 DocType: Sales Order,Customer's Purchase Order,Pedido de Compra do Cliente
 apps/erpnext/erpnext/config/stock.py +117,Serial No and Batch,Número de Série e Lote
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Valor ou Qtde
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Ordens de produção não puderam ser geradas para:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Ordens de produção não puderam ser geradas para:
 DocType: Purchase Invoice,Purchase Taxes and Charges,Impostos e Encargos sobre Compras
 ,Qty to Receive,Qtde para Receber
 DocType: Leave Block List,Leave Block List Allowed,Deixe Lista de Bloqueios admitidos
@@ -2039,7 +2049,7 @@
 DocType: Sales Partner,Retailer,Varejista
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Para crédito de conta deve ser uma conta de Balanço
 DocType: Global Defaults,Disable In Words,Desativar por extenso
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,Código do item é obrigatório porque Item não é numerada automaticamente
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,Código do item é obrigatório porque Item não é numerada automaticamente
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},O Orçamento {0} não é do tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Ítem da Programação da Manutenção
 DocType: Production Order,PRO-,OP-
@@ -2048,14 +2058,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Navegar LDM
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Por favor, defina as contas relacionadas com depreciação de ativos em Categoria {0} ou Empresa {1}"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Saldo de Abertura do Patrimônio Líquido
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Remanescente
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data é repetida
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Signatário autorizado
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Aprovador de Licenças deve ser um dos {0}
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Custo Total de Compra (via Nota Fiscal de Compra)
 DocType: Training Event,Start Time,Horário de Início
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Select Quantidade
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Select Quantidade
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Perfil Aprovandor não pode ser o mesmo Perfil da regra é aplicável a
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Cancelar a inscrição neste Resumo por Email
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Cancelar a inscrição neste Resumo por Email
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mensagem enviada
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Conta com nós filho não pode ser definido como contabilidade
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Taxa na qual a moeda da lista de preços é convertida para a moeda base do cliente
@@ -2065,9 +2076,10 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Outra entrada no Período de Encerramento {0} foi feita após {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material Transferido para Fabricação
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Conta {0} não existe
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Ou qty alvo ou valor alvo é obrigatória.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Custo das diferentes actividades
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Meta de qtde ou valor da meta são obrigatórios.
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Custo das diferentes actividades
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Configurando eventos para {0}, uma vez que o colaborador relacionado aos vendedores abaixo não tem um ID do usuário {1}"
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,O armazén de origem e o armazém de destino devem ser diferentes um do outro
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Não é permitido atualizar transações com ações mais velho do que {0}
 DocType: Purchase Invoice Item,PR Detail,Detalhe PR
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Dinheiro na Mão
@@ -2094,7 +2106,7 @@
 apps/erpnext/erpnext/config/accounts.py +142,Banking and Payments,Bancos e Pagamentos
 ,Welcome to ERPNext,Bem vindo ao ERPNext
 apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Fazer um Orçamento
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,chamadas
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,chamadas
 DocType: Project,Total Costing Amount (via Time Logs),Valor do Custo Total (via Registros de Tempo)
 DocType: Purchase Order Item Supplied,Stock UOM,Unidade de Medida do Estoque
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +230,Purchase Order {0} is not submitted,Pedido de Compra {0} não é enviado
@@ -2104,7 +2116,7 @@
 DocType: Notification Control,Quotation Message,Mensagem do Orçamento
 DocType: Employee Loan,Employee Loan Application,Pedido de Emprestimo de Colaborador
 DocType: Purchase Receipt Item,Rate and Amount,Preço e Total
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Ambos Armazéns devem pertencer a mesma empresa
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Ambos Armazéns devem pertencer a mesma empresa
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Nenhum contato adicionado ainda.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Comprovante de Custo do Desembarque
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Faturas emitidas por Fornecedores.
@@ -2116,8 +2128,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Conta de Lançamento no Livro Diário
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupo de Alunos
 DocType: Shopping Cart Settings,Quotation Series,Séries de Orçamento
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Um item existe com o mesmo nome ( {0}) , por favor, altere o nome do grupo de itens ou renomeie o item"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Selecione o cliente
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Um item existe com o mesmo nome ( {0}) , por favor, altere o nome do grupo de itens ou renomeie o item"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Selecione o cliente
 DocType: Company,Asset Depreciation Cost Center,Centro de Custo do Ativo Depreciado
 DocType: Sales Order Item,Sales Order Date,Data do Pedido de Venda
 DocType: Sales Invoice Item,Delivered Qty,Qtde Entregue
@@ -2146,10 +2158,10 @@
 DocType: Stock Settings,Auto Material Request,Requisição de Material Automática
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Qtde Disponível do Lote no Armazém
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,A LDM Atual e a Nova LDM não podem ser as mesmas
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,ID da folha de pagamento
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,ID da folha de pagamento
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Data da aposentadoria deve ser maior que Data de Contratação
 DocType: Sales Invoice,Against Income Account,Contra a Conta de Recebimentos
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Qtde pedida {1} não pode ser inferior a qtde mínima de pedido {2} (definido no cadastro do Item).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Qtde pedida {1} não pode ser inferior a qtde mínima de pedido {2} (definido no cadastro do Item).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Distribuição percentual mensal
 DocType: Territory,Territory Targets,Metas do Território
 DocType: Delivery Note,Transporter Info,Informações da Transportadora
@@ -2157,12 +2169,13 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Mesmo fornecedor foi inserido várias vezes
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Lucro / Prejuízo Bruto
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Item Fornecido do Pedido de Compra
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Nome da empresa não pode ser empresa
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Nome da empresa não pode ser empresa
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Cabeçalhos para modelos de impressão.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títulos para modelos de impressão , por exemplo, Proforma Invoice ."
 DocType: Student Guardian,Student Guardian,Responsável pelo Aluno
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Encargos tipo de avaliação não pode marcado como Inclusive
 DocType: POS Profile,Update Stock,Atualizar Estoque
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,na inscrição
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UDM diferente para itens gerará um Peso Líquido (Total ) incorreto. Certifique-se de que o peso líquido de cada item está na mesma UDM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Valor na LDM
 DocType: Asset,Journal Entry for Scrap,Lançamento no Livro Diário para Sucata
@@ -2204,10 +2217,10 @@
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Modelos de Endereços Padronizados por País
 DocType: Sales Order Item,Supplier delivers to Customer,O fornecedor entrega diretamente ao cliente
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,Não há [{0}] ({0}) em estoque.
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Vencimento / Data de Referência não pode ser depois de {0}
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Vencimento / Data de Referência não pode ser depois de {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importação e Exportação de Dados
 DocType: Patient,Account Details,Detalhes da Conta
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Nenhum Aluno Encontrado
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Nenhum Aluno Encontrado
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Data do Lançamento da Fatura
 DocType: Product Bundle,List items that form the package.,Lista de itens que compõem o pacote.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentual de alocação deve ser igual a 100%
@@ -2230,7 +2243,7 @@
 DocType: Company,Create Chart Of Accounts Based On,Criar plano de contas baseado em
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Data de nascimento não pode ser maior do que hoje.
 ,Stock Ageing,Envelhecimento do Estoque
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Registro de Tempo
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Registro de Tempo
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' está desativado
 DocType: Cheque Print Template,Scanned Cheque,Cheque Escaneado
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar emails automáticos para Contatos sobre transações de enviar.
@@ -2239,11 +2252,12 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota: Entrada pagamento não será criado desde 'Cash ou conta bancária ' não foi especificado
 DocType: Sales Person,Sales Person Name,Nome do Vendedor
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Por favor, indique pelo menos uma fatura na tabela"
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Adicionar Usuários
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Adicionar Usuários
 DocType: POS Item Group,Item Group,Grupo de Itens
 DocType: Item,Safety Stock,Estoque de Segurança
+DocType: Healthcare Settings,Healthcare Settings,Configurações de Serviço de Saúde
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impostos e taxas acrescidos (moeda da empresa)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Imposto Row {0} deve ter em conta tipo de imposto ou de renda ou de despesa ou carregável
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Imposto Row {0} deve ter em conta tipo de imposto ou de renda ou de despesa ou carregável
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Please re-type company name to confirm,"Por favor, digite novamente o nome da empresa para confirmar"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +79,Total Outstanding Amt,Total devido
 DocType: Journal Entry,Printing Settings,Configurações de impressão
@@ -2262,11 +2276,11 @@
 apps/erpnext/erpnext/config/stock.py +195,"e.g. Kg, Unit, Nos, m","ex: Kg, Unidade, nº, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Referência Não é obrigatório se você entrou Data de Referência
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Data de Contratação deve ser maior do que a Data de Nascimento
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Saída de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Saída de Material
 DocType: Material Request Item,For Warehouse,Para Armazén
 DocType: Employee,Offer Date,Data da Oferta
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Orçamentos
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Você está em modo offline. Você não será capaz de recarregar até ter conexão.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Você está em modo offline. Você não será capaz de recarregar até ter conexão.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Não foi criado nenhum grupo de alunos.
 DocType: Purchase Invoice Item,Serial No,Nº de Série
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,"Por favor, indique Maintaince Detalhes primeiro"
@@ -2274,18 +2288,18 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Aluno já está inscrito.
 DocType: Fiscal Year,Year Name,Nome do ano
 DocType: Process Payroll,Process Payroll,Processar a Folha de Pagamento
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Há mais feriados do que dias úteis do mês.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Há mais feriados do que dias úteis do mês.
 DocType: Product Bundle Item,Product Bundle Item,Item do Pacote de Produtos
 DocType: Sales Partner,Sales Partner Name,Nome do Parceiro de Vendas
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Solicitação de Orçamento
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Solicitação de Orçamento
 DocType: Payment Reconciliation,Maximum Invoice Amount,Valor Máximo da Fatura
 DocType: Asset,Partially Depreciated,parcialmente depreciados
 DocType: Issue,Opening Time,Horário de Abertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,De e datas necessárias
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',A unidade de medida padrão para a variante '{0}' deve ser o mesmo que no modelo '{1}'
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',A unidade de medida padrão para a variante '{0}' deve ser o mesmo que no modelo '{1}'
 DocType: Shipping Rule,Calculate Based On,Calcule Baseado em
 DocType: Delivery Note Item,From Warehouse,Armazén de Origem
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Não há itens com Lista de Materiais para Fabricação
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Não há itens com Lista de Materiais para Fabricação
 DocType: Assessment Plan,Supervisor Name,Nome do supervisor
 DocType: Purchase Taxes and Charges,Valuation and Total,Valorização e Total
 DocType: Notification Control,Customize the Notification,Personalizar a Notificação
@@ -2299,8 +2313,8 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total de Impostos Depois Montante do Desconto
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Configurações do Resumo de Trabalho Diário
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Existe uma conta inferior para esta conta. Você não pode excluir esta conta.
-apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Ou qty alvo ou valor alvo é obrigatório
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Não existe LDM padrão para o item {0}
+apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Meta de qtde ou valor da meta são obrigatórios
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Não existe LDM padrão para o item {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,"Por favor, selecione Data de lançamento primeiro"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Data de Abertura deve ser antes da Data de Fechamento
 DocType: Leave Control Panel,Carry Forward,Encaminhar
@@ -2315,6 +2329,7 @@
 DocType: Journal Entry,Bank Entry,Lançamento Bancário
 DocType: Authorization Rule,Applicable To (Designation),Aplicável Para (Designação)
 ,Profitability Analysis,Análise de Lucratividade
+DocType: Supplier,Prevent POs,Evitar Pedidos de Compra
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Agrupar por
 apps/erpnext/erpnext/config/accounts.py +306,Enable / disable currencies.,Ativar / Desativar moedas.
 DocType: Production Planning Tool,Get Material Request,Obter Requisições de Material
@@ -2328,6 +2343,7 @@
 DocType: Lead,Lead Type,Tipo de Cliente em Potencial
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Você não está autorizado a aprovar folhas em datas Bloco
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +383,All these items have already been invoiced,Todos esses itens já foram faturados
+DocType: Company,Monthly Sales Target,Meta de Vendas Mensais
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Pode ser aprovado pelo {0}
 DocType: Item,Default Material Request Type,Tipo de Requisição de Material Padrão
 DocType: Shipping Rule,Shipping Rule Conditions,Regra Condições de envio
@@ -2341,7 +2357,7 @@
 DocType: Job Opening,Job Title,Cargo
 DocType: Manufacturing Settings,Update BOM Cost Automatically,Atualize automaticamente o preço da lista de materiais
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Criar Usuários
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Quantidade de Fabricação deve ser maior que 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Quantidade de Fabricação deve ser maior que 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Relatório da visita da chamada de manutenção.
 DocType: Stock Entry,Update Rate and Availability,Atualizar Valor e Disponibilidade
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Percentagem que estão autorizados a receber ou entregar mais contra a quantidade encomendada. Por exemplo: Se você encomendou 100 unidades. e seu subsídio é de 10%, então você está autorizada a receber 110 unidades."
@@ -2354,10 +2370,10 @@
 DocType: Daily Work Summary Settings Company,Send Emails At,Enviar Emails em
 DocType: Quotation,Quotation Lost Reason,Motivo da perda do Orçamento
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Selecione o seu Domínio
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Referência da transação nº {0} em {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Referência da transação nº {0} em {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Não há nada a ser editado.
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Demonstrativo de Fluxo de Caixa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Invoice {0} a partir de C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Invoice {0} a partir de C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Por favor selecione Encaminhar se você também quer incluir o saldo de licenças do ano fiscal anterior neste ano fiscal
 DocType: GL Entry,Against Voucher Type,Contra o Tipo de Comprovante
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,"Por favor, indique a conta de abatimento"
@@ -2380,17 +2396,16 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Orçamento para a Conta {1} contra o {2} {3} é {4}. Ele irá exceder em {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',"Linha {0} # A conta deve ser do tipo ""Ativo Imobilizado"""
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Qtde Saída
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Regras para calcular valor de frete para uma venda
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Série é obrigatório
 DocType: Student Sibling,Student ID,ID do Aluno
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Tipos de Atividades para Registros de Tempo
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Tipos de Atividades para Registros de Tempo
 DocType: Stock Entry Detail,Basic Amount,Valor Base
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Armazém necessário para o ítem do estoque {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Armazém necessário para o ítem do estoque {0}
 DocType: Leave Allocation,Unused leaves,Folhas não utilizadas
 DocType: Tax Rule,Billing State,Estado de Faturamento
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Buscar LDM explodida (incluindo sub-conjuntos )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Buscar LDM explodida (incluindo sub-conjuntos )
 DocType: Authorization Rule,Applicable To (Employee),Aplicável para (Colaborador)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Due Date é obrigatória
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Due Date é obrigatória
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Atributo incremento para {0} não pode ser 0
 DocType: Journal Entry,Pay To / Recd From,Pagar Para / Recebido De
 DocType: Naming Series,Setup Series,Configuração de Séries
@@ -2412,7 +2427,7 @@
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Registro de instalação de um nº de série
 apps/erpnext/erpnext/config/hr.py +177,Training,Treinamento
 DocType: Timesheet,Employee Detail,Detalhes do Colaborador
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,No dia seguinte de Data e Repetir no dia do mês deve ser igual
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,No dia seguinte de Data e Repetir no dia do mês deve ser igual
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Configurações para página inicial do site
 DocType: Offer Letter,Awaiting Response,Aguardando Resposta
 DocType: Salary Slip,Earning & Deduction,Ganho &amp; Dedução
@@ -2486,7 +2501,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Planning,Planejamento
 DocType: Project,Total Billing Amount (via Time Logs),Valor Total do Faturamento (via Time Logs)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,ID do Fornecedor
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Quantidade deve ser maior do que 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Quantidade deve ser maior do que 0
 DocType: Journal Entry,Cash Entry,Entrada de Caixa
 DocType: Sales Partner,Contact Desc,Descrição do Contato
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tipo de licenças como casual, doença, etc."
@@ -2498,7 +2513,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Observação: O Item {0} foi inserido mais de uma vez
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Todos os Contatos.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Sigla da Empresa
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Usuário {0} não existe
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Usuário {0} não existe
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Pagamento já existe
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Não authroized desde {0} excede os limites
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Modelo de cadastro de salário.
@@ -2510,9 +2525,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Cotações para Clientes em Potencial ou Clientes.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Papel permissão para editar estoque congelado
 ,Territory Target Variance Item Group-Wise,Variação Territorial de Público por Grupo de Item
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Todos os grupos de clientes
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Todos os grupos de clientes
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez o valor de câmbio não exista de {1} para {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Modelo de impostos é obrigatório.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Modelo de impostos é obrigatório.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Conta {0}: A Conta Superior {1} não existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Preço da Lista de Preços (moeda da empresa)
 DocType: Products Settings,Products Settings,Configurações de Produtos
@@ -2527,9 +2542,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No is mandatory,Linha # {0}: O número de série é obrigatório
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detalhes do Imposto Vinculados ao Item
 ,Item-wise Price List Rate,Lista de Preços por Item
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Orçamento de Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Orçamento de Fornecedor
 DocType: Quotation,In Words will be visible once you save the Quotation.,Por extenso será visível quando você salvar o orçamento.
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Código de barras {0} já utilizado em item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Código de barras {0} já utilizado em item {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Regras para adicionar os custos de envio .
 DocType: Item,Opening Stock,Abertura de Estoque
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,O Cliente é obrigatório
@@ -2546,9 +2561,8 @@
 DocType: Customer,From Lead,Do Cliente em Potencial
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Ordens liberadas para produção.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Selecione o Ano Fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,Perfil do PDV necessário para fazer entrada no PDV
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,Perfil do PDV necessário para fazer entrada no PDV
 DocType: Program Enrollment Tool,Enroll Students,Matricular Alunos
-DocType: Hub Settings,Name Token,Nome do token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Venda padrão
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Pelo menos um armazém é obrigatório
 DocType: Serial No,Out of Warranty,Fora de Garantia
@@ -2582,7 +2596,7 @@
 DocType: BOM,Set rate of sub-assembly item based on BOM,Taxa ajustada do item de subconjunto com base na lista de materiais
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Configurações Resumo de Trabalho Diário da Empresa
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,Item {0} ignorado uma vez que não é um item de estoque
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Enviar esta ordem de produção para posterior processamento.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Enviar esta ordem de produção para posterior processamento.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Para não aplicar regra de preços em uma transação particular, todas as regras de preços aplicáveis devem ser desativados."
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Tarefas
 ,Sales Order Trends,Tendência de Pedidos de Venda
@@ -2619,25 +2633,25 @@
 DocType: Loan Type,Rate of Interest (%) Yearly,Taxa de Juros (%) Anual
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Contas Temporárias
 DocType: BOM Explosion Item,BOM Explosion Item,Item da Explosão da LDM
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Lista de Preços {0} está desativada ou não existe
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Lista de Preços {0} está desativada ou não existe
 DocType: Purchase Invoice,Return,Devolução
 DocType: Production Order Operation,Production Order Operation,Ordem de produção Operation
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} não está inscrito no Lote {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} não está inscrito no Lote {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Activo {0} não pode ser descartado, uma vez que já é {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Reivindicação Despesa Total (via Despesa Claim)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Marcar Ausente
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Linha {0}: Moeda da LDM # {1} deve ser igual à moeda selecionada {2}
 DocType: Journal Entry Account,Exchange Rate,Taxa de Câmbio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Pedido de Venda {0} não foi enviado
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Pedido de Venda {0} não foi enviado
 DocType: Homepage,Tag Line,Slogan
 DocType: Fee Component,Fee Component,Componente da Taxa
-DocType: BOM,Last Purchase Rate,Valor da Última Compra
+apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,O peso total de todos os Critérios de Avaliação deve ser 100%
+DocType: Purchase Order Item,Last Purchase Rate,Valor da Última Compra
 DocType: Project Task,Task ID,ID Tarefa
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock não pode existir por item {0} já que tem variantes
 ,Sales Person-wise Transaction Summary,Resumo de Vendas por Vendedor
 DocType: Training Event,Contact Number,Telefone para Contato
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Armazém {0} não existe
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Cadastre-se no ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Armazém {0} não existe
 DocType: Monthly Distribution,Monthly Distribution Percentages,Percentagens distribuição mensal
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,O item selecionado não pode ter Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% do material entregue contra esta Guia de Remessa
@@ -2657,7 +2671,7 @@
 DocType: Item Group,Parent Item Group,Grupo de item pai
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Taxa na qual a moeda do fornecedor é convertida para a moeda base da empresa
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: conflitos Timings com linha {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Várias estruturas salariais ativas encontradas para o colaboador {0} para as datas indicadas
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Várias estruturas salariais ativas encontradas para o colaboador {0} para as datas indicadas
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Configuração contas Gateway.
 DocType: Employee,Employment Type,Tipo de Emprego
 DocType: Payment Entry,Set Exchange Gain / Loss,Definir Perda/Ganho com Câmbio
@@ -2666,13 +2680,13 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Email do Aluno
 DocType: Employee,Notice (days),Aviso Prévio ( dias)
 DocType: Tax Rule,Sales Tax Template,Modelo de Impostos sobre Vendas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Selecione os itens para salvar a nota
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Selecione os itens para salvar a nota
 DocType: Employee,Encashment Date,Data da cobrança
 DocType: Account,Stock Adjustment,Ajuste do estoque
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existe Atividade Custo Padrão para o Tipo de Atividade - {0}
 DocType: Production Order,Planned Operating Cost,Custo Operacional Planejado
 DocType: Academic Term,Term Start Date,Data de Início do Ano Letivo
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Segue em anexo {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Segue em anexo {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Extrato bancário de acordo com o livro razão
 DocType: Authorization Rule,Customer / Item Name,Nome do Cliente/Produto
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -2690,7 +2704,7 @@
 DocType: Guardian,Guardian Of ,Responsável por
 DocType: Grading Scale Interval,Threshold,Média
 DocType: BOM Update Tool,Current BOM,LDM atual
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Adicionar Serial No
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Adicionar Serial No
 DocType: Production Order Item,Available Qty at Source Warehouse,Qtd disponível no Armazén de Origem
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} ativo não pode ser transferido
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Requisições
@@ -2699,8 +2713,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +73,Max discount allowed for item: {0} is {1}%,Max desconto permitido para o item: {0} é {1}%
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Linha # {0}: Não é permitido mudar de fornecedor quando o Pedido de Compra já existe
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Papel que é permitido submeter transações que excedam os limites de crédito estabelecidos.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Selecionar Itens para Produzir
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Os dados estão sendo sincronizados, isto pode demorar algum tempo"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Selecionar Itens para Produzir
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Os dados estão sendo sincronizados, isto pode demorar algum tempo"
 DocType: Item Price,Item Price,Preço do Item
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap & detergente
 DocType: BOM,Show Items,Mostrar Itens
@@ -2716,7 +2730,7 @@
 DocType: Leave Block List,Applies to Company,Aplica-se a Empresa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,Não pode cancelar por causa da entrada submetido {0} existe
 DocType: Employee Loan,Disbursement Date,Data do Desembolso
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,'Recipientes' não especificado
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,'Destinatários' não especificado
 DocType: BOM Update Tool,Update latest price in all BOMs,Atualize o preço mais recente em todas as LDMs
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,{0} faz aniversário hoje!
 DocType: Production Planning Tool,Material Request For Warehouse,Requisição de Material para Armazém
@@ -2727,9 +2741,9 @@
 DocType: Email Digest,Add/Remove Recipients,Adicionar / Remover Destinatários
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},A transação não é permitida relacionada à Ordem de produção {0} parada
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Para definir esse Ano Fiscal como padrão , clique em ' Definir como padrão '"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Junte-se
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Junte-se
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Escassez Qtde
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
 DocType: Leave Application,LAP/,SDL/
 DocType: Salary Slip,Salary Slip,Contracheque
 DocType: Pricing Rule,Margin Rate or Amount,Percentual ou Valor de Margem
@@ -2746,9 +2760,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Nº de Série {0} já foi recebido
 ,Requested Items To Be Transferred,"Items Solicitados, mas não Transferidos"
 DocType: Expense Claim,Vehicle Log,Log do Veículo
-DocType: Purchase Invoice,Recurring Id,Id recorrente
 DocType: Customer,Sales Team Details,Detalhes da Equipe de Vendas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Apagar de forma permanente?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Apagar de forma permanente?
 DocType: Expense Claim,Total Claimed Amount,Quantia Total Reivindicada
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Oportunidades potenciais para a venda.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Sick Leave,Licença Médica
@@ -2774,12 +2787,12 @@
 DocType: Item Attribute Value,Attribute Value,Atributo Valor
 ,Itemwise Recommended Reorder Level,Níves de Reposição Recomendados por Item
 DocType: Salary Detail,Salary Detail,Detalhes de Salário
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Por favor selecione {0} primeiro
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Por favor selecione {0} primeiro
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Lote {0} de {1} item expirou.
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Registro de Tempo para fabricação
 DocType: Salary Detail,Default Amount,Quantidade Padrão
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Armazén não foi encontrado no sistema
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Resumo deste mês
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Resumo deste mês
 DocType: Quality Inspection Reading,Quality Inspection Reading,Leitura da Inspeção de Qualidade
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,'Congelar Estoque anterior a' deve ser menor que %d dias .
 DocType: Tax Rule,Purchase Tax Template,Modelo de Impostos sobre a compra
@@ -2794,11 +2807,11 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Root não pode ter um centro de custos pai
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Depreciação acumulada como em
 DocType: Sales Invoice,C-Form Applicable,Formulário-C Aplicável
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Tempo de Operação deve ser maior que 0 para a operação {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Tempo de Operação deve ser maior que 0 para a operação {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Armazém é obrigatório
 DocType: Supplier,Address and Contacts,Endereços e Contatos
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detalhe da Conversão de Unidade de Medida
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Ordem de produção não pode ser levantada contra um modelo de item
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Ordem de produção não pode ser levantada contra um modelo de item
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Encargos são atualizados em Recibo de compra para cada item
 DocType: Warranty Claim,Resolved By,Resolvido por
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Alocar licenças por um período.
@@ -2814,16 +2827,16 @@
 apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Orçamentos:
 DocType: Workstation,Operating Costs,Custos Operacionais
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Ação se o Acumulado Mensal Exceder o Orçamento
-DocType: Purchase Invoice,Submit on creation,Enviar ao criar
+DocType: Subscription,Submit on creation,Enviar ao criar
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Os e-mails serão enviados para todos os colaboradores ativos da empresa na hora informada, caso não estejam de férias. O resumo das respostas serão enviadas à meia-noite."
 DocType: Employee Leave Approver,Employee Leave Approver,Licença do Colaborador Aprovada
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Linha {0}: Uma entrada de reposição já existe para este armazém {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Não se pode declarar como perdido , porque foi realizado um Orçamento."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Feedback do Treinamento
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Linha {0}: Uma entrada de reposição já existe para este armazém {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Não se pode declarar como perdido , porque foi realizado um Orçamento."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Feedback do Treinamento
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Ordem de produção {0} deve ser enviado
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Por favor selecione a Data de início e a Data de Término do Item {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Até o momento não pode ser antes a partir da data
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Adicionar / Editar preços
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Adicionar / Editar preços
 DocType: Cheque Print Template,Cheque Print Template,Template para Impressão de Cheques
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Plano de Centros de Custo
 ,Requested Items To Be Ordered,"Itens Solicitados, mas não Comprados"
@@ -2839,10 +2852,10 @@
 DocType: Purchase Invoice Item,Amount (Company Currency),Total (moeda da empresa)
 DocType: Fee Schedule,Student Category,Categoria do Aluno
 DocType: Announcement,Student,Aluno
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Unidade (departamento) mestre da organização.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Unidade (departamento) mestre da organização.
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Por favor introduza a mensagem antes de enviá-
 DocType: Email Digest,Pending Quotations,Orçamentos Pendentes
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Perfil do Ponto de Vendas
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Perfil do Ponto de Vendas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Empréstimos não Garantidos
 DocType: Maintenance Schedule Detail,Scheduled Date,Data Agendada
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Quantia total paga
@@ -2855,24 +2868,24 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Peso total atribuído deve ser de 100%. É {0}
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Não é possível definir como Perdido uma vez que foi feito um Pedido de Venda
 DocType: Request for Quotation Item,Supplier Part No,Nº da Peça no Fornecedor
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Recebido de
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Recebido de
 DocType: Item,Has Serial No,Tem nº de Série
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +24,{0}: From {0} for {1},{0}: A partir de {0} para {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Linha # {0}: Defina o fornecedor para o item {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Linha {0}: Horas deve ser um valor maior que zero
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Site Imagem {0} anexada ao Item {1} não pode ser encontrado
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Site Imagem {0} anexada ao Item {1} não pode ser encontrado
 DocType: Item,List this Item in multiple groups on the website.,Listar este item em vários grupos no site.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +323,Please check Multi Currency option to allow accounts with other currency,"Por favor, verifique multi opção de moeda para permitir que contas com outra moeda"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +85,Item: {0} does not exist in the system,Item: {0} não existe no sistema
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Você não está autorizado para definir o valor congelado
 DocType: Payment Reconciliation,Get Unreconciled Entries,Obter Lançamentos não Conciliados
 DocType: Payment Reconciliation,From Invoice Date,A Partir da Data de Faturamento
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,A moeda de faturamento deve ser igual à moeda padrão da empresa ou à moeda padrão da conta da outra parte
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,O que isto faz ?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Para o Armazén
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Todas Admissões de Alunos
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,A moeda de faturamento deve ser igual à moeda padrão da empresa ou à moeda padrão da conta da outra parte
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,O que isto faz ?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Para o Armazén
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Todas Admissões de Alunos
 ,Average Commission Rate,Percentual de Comissão Médio
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,'Tem Número Serial' não pode ser confirmado para itens sem controle de estoque
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,'Tem Número Serial' não pode ser confirmado para itens sem controle de estoque
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Comparecimento não pode ser marcado para datas futuras
 DocType: Pricing Rule,Pricing Rule Help,Regra Preços Ajuda
 DocType: Purchase Taxes and Charges,Account Head,Conta
@@ -2886,7 +2899,7 @@
 DocType: Item,Customer Code,Código do Cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Lembrete de aniversário para {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dias desde a última compra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Débito em conta deve ser uma conta de Balanço
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Débito em conta deve ser uma conta de Balanço
 DocType: Buying Settings,Naming Series,Código dos Documentos
 DocType: Leave Block List,Leave Block List Name,Deixe o nome Lista de Bloqueios
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,A data de início da cobertura do seguro deve ser inferior a data de término da cobertura
@@ -2896,26 +2909,24 @@
 DocType: Shopping Cart Settings,Checkout Settings,Configurações de Vendas
 DocType: Notification Control,Sales Invoice Message,Mensagem da Nota Fiscal de Venda
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Fechando Conta {0} deve ser do tipo de responsabilidade / Patrimônio Líquido
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Contracheque do colaborador {0} já criado para o registro de tempo {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Contracheque do colaborador {0} já criado para o registro de tempo {1}
 DocType: Vehicle Log,Odometer,Odômetro
 DocType: Sales Order Item,Ordered Qty,Qtde Encomendada
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Item {0} está desativado
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Item {0} está desativado
 DocType: Stock Settings,Stock Frozen Upto,Estoque congelado até
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,LDM não contém nenhum item de estoque
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,LDM não contém nenhum item de estoque
 DocType: Vehicle Log,Refuelling Details,Detalhes de Abastecimento
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Gerar contracheques
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Compra deve ser verificada, se for caso disso nos items selecionados como {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Desconto deve ser inferior a 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Último valor de compra não encontrado
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Valor abatido (moeda da empresa)
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,"Linha # {0}: Por favor, defina a quantidade de reposição"
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,"Linha # {0}: Por favor, defina a quantidade de reposição"
 DocType: Landed Cost Voucher,Landed Cost Voucher,Comprovante de Custos de Desembarque
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Defina {0}
 DocType: Employee,Health Details,Detalhes sobre a Saúde
 DocType: Offer Letter,Offer Letter Terms,Termos da Carta de Oferta
 DocType: Serial No,Delivery Document Type,Tipo do Documento de Entrega
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Enviar folha de pagamento relativa aos critérios selecionados
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Iten(s) sincronizado(s)
 DocType: Email Digest,Receivables,Recebíveis
 DocType: Lead Source,Lead Source,Origem do Cliente em Potencial
 DocType: Customer,Additional information regarding the customer.,Informações adicionais sobre o cliente.
@@ -2937,7 +2948,7 @@
 DocType: Stock Entry Detail,Stock Entry Detail,Detalhe do Lançamento no Estoque
 DocType: Products Settings,Home Page is Products,Página Inicial é Produtos
 ,Asset Depreciation Ledger,Livro Razão de Depreciação de Ativos
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Conflitos regra fiscal com {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Conflitos regra fiscal com {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nome da Nova Conta
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Custo de fornecimento de Matérias-primas
 DocType: Selling Settings,Settings for Selling Module,Configurações do Módulo de Vendas
@@ -2949,7 +2960,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Item {0} deve ser um item de estoque
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Armazén Padrão de Trabalho em Andamento
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,As configurações padrão para as transações contábeis.
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Data prevista de entrega não pode ser antes da data da Requisição de Material
 DocType: Purchase Invoice Item,Stock Qty,Quantidade em estoque
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Erro: Não é um ID válido?
 DocType: Naming Series,Update Series Number,Atualizar Números de Séries
@@ -2959,13 +2969,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Item Code required at Row No {0},Código do item exigido na Linha Nº {0}
 DocType: Sales Partner,Partner Type,Tipo de parceiro
 DocType: Authorization Rule,Customerwise Discount,Desconto referente ao Cliente
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Registros de Tempo para tarefas.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Registros de Tempo para tarefas.
 DocType: Purchase Invoice,Against Expense Account,Contra a Conta de Despesas
 DocType: Bank Reconciliation,Get Payment Entries,Obter Lançamentos de Pagamentos
 DocType: Quotation Item,Against Docname,Contra o Docname
 DocType: SMS Center,All Employee (Active),Todos os Colaboradores (Ativos)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Ver Agora
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Selecione o período em que a fatura será gerada automaticamente
 DocType: BOM,Raw Material Cost,Custo de Matéria-prima
 DocType: Item Reorder,Re-Order Level,Nível de Reposição
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Digite itens e qtde planejada para o qual você quer levantar ordens de produção ou fazer o download de matérias-primas para a análise.
@@ -2983,18 +2992,20 @@
 DocType: Request for Quotation,Supplier Detail,Detalhe do Fornecedor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Valor Faturado
 DocType: Attendance,Attendance,Comparecimento
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,Itens de estoque
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,Itens de estoque
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Se não for controlada, a lista deverá ser adicionado a cada departamento onde tem de ser aplicado."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +535,Posting date and posting time is mandatory,Data e horário da postagem são obrigatórios
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Por extenso será visível quando você salvar o Pedido de Compra.
 DocType: Period Closing Voucher,Period Closing Voucher,Comprovante de Encerramento do Período
 apps/erpnext/erpnext/config/selling.py +67,Price List master.,Cadastro da Lista de Preços.
 DocType: Task,Review Date,Data da Revisão
+DocType: Company,Series for Asset Depreciation Entry (Journal Entry),Série para lançamento de Depreciação de Ativos (Lançamento no Livro Diário)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Warehouse de destino na linha {0} deve ser o mesmo que ordem de produção
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Moeda não pode ser alterada depois de fazer entradas usando alguma outra moeda
 DocType: Vehicle Service,Clutch Plate,Disco de Embreagem
 DocType: Company,Round Off Account,Conta de Arredondamento
 DocType: Customer Group,Parent Customer Group,Grupo de Clientes pai
+DocType: Journal Entry,Subscription,Inscrição
 DocType: Purchase Invoice,Contact Email,Email do Contato
 DocType: Appraisal Goal,Score Earned,Pontuação Obtida
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +229,Notice Period,Período de Aviso Prévio
@@ -3011,7 +3022,7 @@
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantidade do item obtido após a fabricação / reembalagem a partir de determinadas quantidades de matéria-prima
 DocType: Payment Reconciliation,Receivable / Payable Account,Conta de Recebimento/Pagamento
 DocType: Delivery Note Item,Against Sales Order Item,Relacionado ao Item do Pedido de Venda
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Orçamento não pode ser atribuído contra a conta de grupo {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Por favor entre o centro de custo pai
 DocType: Delivery Note,Print Without Amount,Imprimir sem valores
@@ -3019,7 +3030,7 @@
 DocType: Issue,Support Team,Equipe de Pós-Vendas
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),Vencimento (em dias)
 DocType: Appraisal,Total Score (Out of 5),Pontuação Total (nota máxima 5)
-apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Equilíbrio
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Balanço
 DocType: Room,Seating Capacity,Número de Assentos
 DocType: Issue,ISS-,INC-
 DocType: Project,Total Expense Claim (via Expense Claims),Reivindicação de Despesa Total (via relatórios de despesas)
@@ -3035,7 +3046,7 @@
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Se marcado, o total de dias de trabalho vai incluir férias, e isso vai reduzir o valor de salário por dia"
 DocType: Purchase Invoice,Total Advance,Total Pago Adiantado
 ,BOM Stock Report,Relatório de Estoque por LDM
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Processamento de Folha de Pagamento
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Processamento de Folha de Pagamento
 DocType: GL Entry,Credit Amount,Total de crédito
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Definir como Perdido
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,O pagamento Recibo Nota
@@ -3045,8 +3056,7 @@
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Manter o mesmo preço durante todo o ciclo de vendas
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planejar Registros de Tempo fora do horário de trabalho da estação de trabalho.
 ,Items To Be Requested,Itens para Requisitar
-DocType: Purchase Order,Get Last Purchase Rate,Obter Valor da Última Compra
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Selecione ou adicione um novo cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Selecione ou adicione um novo cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicação de Recursos (Ativos)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Isto é baseado na frequência deste Colaborador
 DocType: Fiscal Year,Year Start Date,Data do início do ano
@@ -3070,11 +3080,12 @@
 DocType: Account,Parent Account,Conta Superior
 ,Hub,Cubo
 DocType: GL Entry,Voucher Type,Tipo de Comprovante
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Preço de tabela não encontrado ou deficientes
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',Colaborador dispensado em {0} deve ser definido como 'Desligamento'
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Preço de tabela não encontrado ou deficientes
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Colaborador dispensado em {0} deve ser definido como 'Desligamento'
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Avaliação {0} criada para o Colaborador {1} no intervalo de datas informado
 DocType: Selling Settings,Campaign Naming By,Nomeação de Campanha por
 DocType: Employee,Current Address Is,Endereço atual é
+apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Meta de Vendas Mensais (
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +41,"Optional. Sets company's default currency, if not specified.","Opcional. Define moeda padrão da empresa, se não for especificado."
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Lançamentos no livro Diário.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Qtde disponível no armazén de origem
@@ -3083,7 +3094,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Linha {0}: Sujeito / Conta não coincidem com {1} / {2} em {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Por favor insira Conta Despesa
 DocType: Account,Stock,Estoque
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Linha #{0}: O Tipo de Documento de Referência deve ser um Pedido de Compra, uma Nota Fiscal de Compra ou um Lançamento Contábil"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Linha #{0}: O Tipo de Documento de Referência deve ser um Pedido de Compra, uma Nota Fiscal de Compra ou um Lançamento Contábil"
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Se o item é uma variante de outro item, em seguida, descrição, imagem, preços, impostos etc será definido a partir do modelo, a menos que explicitamente especificado"
 DocType: Serial No,Purchase / Manufacture Details,Detalhes Compra / Fabricação
 apps/erpnext/erpnext/config/stock.py +325,Batch Inventory,Inventário por Lote
@@ -3103,7 +3114,7 @@
 DocType: Sales Order,% of materials delivered against this Sales Order,% do material entregue deste Pedido de Venda
 apps/erpnext/erpnext/config/stock.py +12,Record item movement.,Gravar o movimento item.
 DocType: Hub Settings,Hub Settings,Configurações Hub
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Lançamentos contábeis já foram feitas em moeda {0} para {1} empresa. Por favor, selecione uma conta a receber ou a pagar com a moeda {0}."
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Lançamentos contábeis já foram feitas em moeda {0} para {1} empresa. Por favor, selecione uma conta a receber ou a pagar com a moeda {0}."
 DocType: Asset,Is Existing Asset,É Ativo Existente
 DocType: Warranty Claim,If different than customer address,Se diferente do endereço do cliente
 DocType: BOM Operation,BOM Operation,Operação da LDM
@@ -3113,16 +3124,16 @@
 DocType: Asset,Asset Category,Categoria de Ativos
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Salário líquido não pode ser negativo
 DocType: Assessment Plan,Room,Sala
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Material a Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Material a Fornecedor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Guia de Recolhimento de Tributos
 DocType: Expense Claim,Employees Email Id,Endereços de Email dos Colaboradores
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Passivo Circulante
 apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Enviar SMS em massa para seus contatos
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considere Imposto ou Encargo para
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Qtde Real é obrigatória
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} já possui um {1} Scorecard de Fornecedor em aberto, portanto, os Pedidos de Compra para este fornecedor devem ser emitidos com cautela."
 DocType: Employee Loan,Loan Type,Tipo de Empréstimo
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,As configurações padrão para transações com ações .
-DocType: Purchase Invoice,Next Date,Próxima data
 DocType: Employee Education,Major/Optional Subjects,Assuntos Principais / Opcionais
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aqui você pode manter detalhes familiares como o nome e ocupação do cônjuge, pai e filhos"
@@ -3132,7 +3143,7 @@
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,De Moeda e Para Moeda não pode ser o mesmo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Você deve salvar o formulário antes de continuar
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Anexar Logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Níveis de Estoque
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Níveis de Estoque
 DocType: Customer,Commission Rate,Percentual de Comissão
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquear licenças por departamento.
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Seu carrinho está vazio
@@ -3159,7 +3170,7 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Faça uma Série de Alunos
 DocType: Leave Type,Is Carry Forward,É encaminhado
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Prazo de Entrega (em dias)
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Por favor, indique os pedidos de venda na tabela acima"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Por favor, indique os pedidos de venda na tabela acima"
 ,Stock Summary,Resumo do Estoque
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Linha {0}: Tipo de Sujeito e Sujeito são necessários para receber / pagar contas {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Data
@@ -3169,6 +3180,7 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Valor Sancionado
 DocType: GL Entry,Is Opening,É Abertura
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Linha {0}: Lançamento de débito não pode ser relacionado a uma {1}
+DocType: Journal Entry,Subscription Section,Seção de Inscrição
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,A Conta {0} não existe
 DocType: Account,Cash,Dinheiro
 DocType: Employee,Short biography for website and other publications.,Breve biografia para o site e outras publicações.
diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv
index 03ad5db..aa2b3c6 100644
--- a/erpnext/translations/pt.csv
+++ b/erpnext/translations/pt.csv
@@ -1,10 +1,10 @@
 DocType: Employee,Salary Mode,Modalidade de Salário
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,registo
 DocType: Patient,Divorced,Divorciado
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Artigos já sincronizados
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permitir que o item a seja adicionado várias vezes em uma transação
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancele a Visita Material {0} antes de cancelar esta Solicitação de Garantia
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Bens de Consumo
-DocType: Purchase Receipt,Subscription Detail,Detalhe da assinatura
+DocType: Purchase Receipt,Subscription Detail,Detalhe da subscrição
 DocType: Supplier Scorecard,Notify Supplier,Notificar fornecedor
 DocType: Item,Customer Items,Artigos do Cliente
 DocType: Project,Costing and Billing,Custos e Faturação
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Autorizadores de Baixa
 DocType: Sales Partner,Dealer,Revendedor
 DocType: Consultation,Investigations,Investigações
+DocType: Restaurant Order Entry,Click Enter To Add,Clique em Enter To Add
 DocType: Employee,Rented,Alugado
 DocType: Purchase Order,PO-,OC-
 DocType: POS Profile,Applicable for User,Aplicável para o utilizador
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","A Ordem de Produção parada não pode ser cancelada, continue com mesma antes para depois cancelar"
 DocType: Vehicle Service,Mileage,Quilometragem
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Você realmente quer descartar esse ativo?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Você realmente quer descartar esse ativo?
 DocType: Drug Prescription,Update Schedule,Programação de atualização
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Selecione o Fornecedor Padrão
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Moeda é necessária para a Lista de Preços {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Verificar disponibilidade
 DocType: Job Applicant,Job Applicant,Candidato a Emprego
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Isto é baseado em operações com este fornecedor. Veja o cronograma abaixo para obter detalhes
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Não há mais resultados.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Jurídico
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Tipo de imposto efetivo não pode ser incluído no preço do artigo na linha {0}
 DocType: Bank Guarantee,Customer,Cliente
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Taxa de Câmbio deve ser a mesma que {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nome do Cliente
 DocType: Vehicle,Natural Gas,Gás Natural
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Conta bancária não pode ser nomeada como {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Conta bancária não pode ser nomeada como {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Elementos (ou grupos) dos quais os Lançamentos Contabilísticos são feitas e os saldos são mantidos.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Pendente para {0} não pode ser menor que zero ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Não há rascunhos salariais enviados para processar.
 DocType: Manufacturing Settings,Default 10 mins,Padrão de 10 min
 DocType: Leave Type,Leave Type Name,Nome do Tipo de Baixa
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Mostrar aberto
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,É necessário tomar essa ação hoje em dia para o mencionado anteriormente
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Série Atualizada com Sucesso
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Check-out
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural Journal Entry Submetido
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Artigos da Ordem de Compra a serem recebidos
 DocType: SMS Center,All Supplier Contact,Todos os Contactos do Fornecedor
 DocType: Support Settings,Support Settings,Definições de suporte
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Data de Término não pode ser inferior a Data de Início
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Data de Término não pode ser inferior a Data de Início
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Linha #{0}: A taxa deve ser a mesma que {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Novo Pedido de Licença
 ,Batch Item Expiry Status,Batch item de status de validade
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Depósito Bancário
 DocType: Mode of Payment Account,Mode of Payment Account,Modo da Conta de Pagamento
 DocType: Consultation,Consultation,Consulta
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Vendas e Devoluções
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Mostrar Variantes
 DocType: Academic Term,Academic Term,Período Letivo
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Material
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Assistência Médica
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Atraso no pagamento (Dias)
 DocType: Lab Prescription,Lab Prescription,Prescrição de laboratório
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Classificar por Preço
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Despesa de Serviço
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de série: {0} já está referenciado na fatura de vendas: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Fatura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de série: {0} já está referenciado na fatura de vendas: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Fatura
 DocType: Maintenance Schedule Item,Periodicity,Periodicidade
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,O Ano Fiscal {0} é obrigatório
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defesa
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Linha # {0}:
 DocType: Timesheet,Total Costing Amount,Valor Total dos Custos
 DocType: Delivery Note,Vehicle No,Nº do Veículo
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,"Por favor, selecione a Lista de Preços"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,"Por favor, selecione a Lista de Preços"
 DocType: Accounts Settings,Currency Exchange Settings,Configurações de câmbio
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Row # {0}: documento de pagamento é necessário para concluir o trasaction
 DocType: Production Order Operation,Work In Progress,Trabalho em Andamento
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Por favor selecione a data
 DocType: Employee,Holiday List,Lista de Feriados
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Configura o sistema de nomeação do instrutor na escola&gt; Configurações escolares
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Contabilista
+DocType: Hub Settings,Selling Price List,Lista de preços de venda
 DocType: Patient,Tobacco Current Use,Uso atual do tabaco
 DocType: Cost Center,Stock User,Utilizador de Stock
 DocType: Company,Phone No,Nº de Telefone
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Cronogramas de Curso criados:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Novo {0}: #{1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Novo {0}: #{1}
 ,Sales Partners Commission,Comissão de Parceiros de Vendas
 DocType: Purchase Invoice,Rounding Adjustment,Ajuste de arredondamento
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,A abreviatura não pode ter mais de 5 caracteres
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Dados Principais de docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referência: {0}, Código do Item: {1} e Cliente: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kg
-DocType: Student Log,Log,Registo
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Vaga para um Emprego.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Resultado enviado
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Resultado enviado
 DocType: Item Attribute,Increment,Aumento
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Intervalo de tempo
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Selecionar Armazém...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Casado/a
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Não tem permissão para {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Obter itens de
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},O Stock não pode ser atualizado nesta Guia de Remessa {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},O Stock não pode ser atualizado nesta Guia de Remessa {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produto {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nenhum item listado
 DocType: Payment Reconciliation,Reconcile,Conciliar
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fundos de Pensão
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Próxima Depreciação A data não pode ser antes Data da compra
 DocType: Consultation,Consultation Date,Data de consulta
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Listagem de produtos e descoberta para usuários ERPNext
 DocType: SMS Center,All Sales Person,Todos os Vendedores
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"A **Distribuição Mensal** ajuda-o a distribuir o Orçamento/Meta por vários meses, caso o seu negócio seja sazonal."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Não itens encontrados
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Falta a Estrutura Salarial
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Não itens encontrados
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Falta a Estrutura Salarial
 DocType: Lead,Person Name,Nome da Pessoa
 DocType: Sales Invoice Item,Sales Invoice Item,Item de Fatura de Vendas
 DocType: Account,Credit,Crédito
 DocType: POS Profile,Write Off Cost Center,Liquidar Centro de Custos
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""","ex: ""Escola Primária"" ou ""Universidade"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""","ex: ""Escola Primária"" ou ""Universidade"""
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Relatórios de Stock
 DocType: Warehouse,Warehouse Detail,Detalhe Armazém
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},O cliente {0} {1}/{2} ultrapassou o limite de crédito
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"O Prazo de Data de Término não pode ser posterior à Data de Término de Ano do Ano Letivo, com a qual está relacionado o termo (Ano Lectivo {}). Por favor, corrija as datas e tente novamente."
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""É um Ativo Imobilizado"" não pode ser desmarcado, pois existe um registo de ativos desse item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""É um Ativo Imobilizado"" não pode ser desmarcado, pois existe um registo de ativos desse item"
 DocType: Vehicle Service,Brake Oil,Óleo dos Travões
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de Clientes&gt; Território
 DocType: Tax Rule,Tax Type,Tipo de imposto
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Valor taxado
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Não está autorizado a adicionar ou atualizar registos antes de {0}
 DocType: BOM,Item Image (if not slideshow),Imagem do Item (se não for diapositivo de imagens)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Existe um Cliente com o mesmo nome
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Valor por Hora / 60) * Tempo Real Operacional
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Linha # {0}: O tipo de documento de referência deve ser um pedido de despesa ou entrada de diário
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Selecionar BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Linha # {0}: O tipo de documento de referência deve ser um pedido de despesa ou entrada de diário
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Selecionar BOM
 DocType: SMS Log,SMS Log,Registo de SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Custo de Itens Entregues
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,O feriado em {0} não é entre De Data e To Date
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,Empréstimo a funcionário
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Registo de Atividade:
 DocType: Fee Schedule,Send Payment Request Email,Enviar e-mail de pedido de pagamento
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,O Item {0} não existe no sistema ou já expirou
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,O Item {0} não existe no sistema ou já expirou
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Imóveis
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Extrato de Conta
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmacêuticos
@@ -210,18 +213,23 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Importar Registo
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Retirar as Solicitações de Material do tipo de Fabrico com base nos critérios acima
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Exitosamente não registrado.
 DocType: Training Result Employee,Grade,Classe
+DocType: Restaurant Table,No of Seats,No of Seats
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Para adicionar assunto dinâmico, use jinja tags como <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Entregue Pelo Fornecedor
 DocType: SMS Center,All Contact,Todos os Contactos
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Ordem de produção já criado para todos os artigos com BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Ordem de produção já criado para todos os artigos com BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Salário Anual
 DocType: Daily Work Summary,Daily Work Summary,Resumo do Trabalho Diário
 DocType: Period Closing Voucher,Closing Fiscal Year,A Encerrar Ano Fiscal
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} foi suspenso
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,"Por favor, seleccione uma Empresa Existente para a criação do Plano de Contas"
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} foi suspenso
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,"Por favor, seleccione uma Empresa Existente para a criação do Plano de Contas"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Despesas de Stock
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Selecionar depósito de destino
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Selecionar depósito de destino
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Selecionar depósito de destino
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Selecionar depósito de destino
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Por favor, indique contato preferencial Email"
 DocType: Program Enrollment,School Bus,Ônibus escolar
 DocType: Journal Entry,Contra Entry,Contrapartida
@@ -239,9 +247,10 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Transfira o Modelo, preencha os dados apropriados e anexe o ficheiro modificado.
  Todas as datas e combinação de funcionários no período selecionado aparecerão no modelo, com os registos de assiduidade existentes"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,O Item {0} não está ativo ou expirou
+DocType: Student Admission Program,Minimum Age,Idade minima
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Exemplo: Fundamentos de Matemática
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos nas linhas {1} também deverão ser incluídos"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Definições para o Módulo RH
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Definições para o Módulo RH
 DocType: SMS Center,SMS Center,Centro de SMS
 DocType: Sales Invoice,Change Amount,Alterar Montante
 DocType: BOM Update Tool,New BOM,Nova LDM
@@ -251,7 +260,7 @@
 DocType: Lead,Request Type,Tipo de Solicitação
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Tornar Funcionário
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Transmissão
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Adicionar quartos
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Modo de Configuração do POS (Online / Offline)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Execução
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Os dados das operações realizadas.
 DocType: Serial No,Maintenance Status,Estado de Manutenção
@@ -274,6 +283,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,A Lista de Preços deve ser aplicável a Comprar ou Vender
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},A data de instalação não pode ser anterior à data de entrega do Item {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Desconto na Taxa de Lista de Preços (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Bioquímica
 DocType: Offer Letter,Select Terms and Conditions,Selecione os Termos e Condições
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,Valor de Saída
 DocType: Production Planning Tool,Sales Orders,Ordens de Vendas
@@ -308,15 +318,15 @@
 DocType: Sales Partner,Reseller,Revendedor
 DocType: Codification Table,Medical Code,Código médico
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Se for selecionado, Incluirá itens não armazenáveis nos Pedidos de Material."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,"Por favor, insira a Empresa"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,"Por favor, insira a Empresa"
 DocType: Delivery Note Item,Against Sales Invoice Item,Na Nota Fiscal de Venda do Item
 ,Production Orders in Progress,Pedidos de Produção em Progresso
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Caixa Líquido de Financiamento
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","O Armazenamento Local está cheio, não foi guardado"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","O Armazenamento Local está cheio, não foi guardado"
 DocType: Lead,Address & Contact,Endereço e Contacto
 DocType: Leave Allocation,Add unused leaves from previous allocations,Adicionar licenças não utilizadas através de atribuições anteriores
 DocType: Sales Partner,Partner website,Website parceiro
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Adicionar Item
+DocType: Restaurant Order Entry,Add Item,Adicionar Item
 DocType: Lab Test,Custom Result,Resultado personalizado
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Nome de Contacto
 DocType: Course Assessment Criteria,Course Assessment Criteria,Critérios de Avaliação do Curso
@@ -329,7 +339,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Pedido de compra.
 DocType: Lab Test,Submitted Date,Data enviada
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Isto baseia-se nas Folhas de Serviço criadas neste projecto
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,A Remuneração Líquida não pode ser inferior a 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,A Remuneração Líquida não pode ser inferior a 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Para parar de enviar notificações de erro repetitivo do sistema, verificamos o campo Desativado na subscrição"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Só o Aprovador de Licenças selecionado é que pode enviar esta Solicitação de Licença
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,A Data de Dispensa deve ser mais recente que a Data de Adesão
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Licenças por Ano
@@ -338,9 +349,10 @@
 DocType: Email Digest,Profit & Loss,Lucros e Perdas
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Litro
 DocType: Task,Total Costing Amount (via Time Sheet),Quantia de Custo Total (através da Folha de Serviço)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,"Por favor, configure alunos sob grupos de estudantes"
 DocType: Item Website Specification,Item Website Specification,Especificação de Website do Item
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Licença Bloqueada
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},O Item {0} expirou em {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},O Item {0} expirou em {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Registos Bancários
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Item de Reconciliação de Stock
@@ -349,7 +361,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Curso de Ferramenta de Criação de Grupo de Estudantes
 DocType: Lead,Do Not Contact,Não Contactar
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,Pessoas que ensinam na sua organização
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,A id exclusiva para acompanhar todas as faturas recorrentes. Ela é gerada ao enviar.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Desenvolvedor de Software
 DocType: Item,Minimum Order Qty,Qtd de Pedido Mínima
 DocType: Pricing Rule,Supplier Type,Tipo de Fornecedor
@@ -359,17 +370,19 @@
 DocType: Item,Publish in Hub,Publicar na Plataforma
 DocType: Student Admission,Student Admission,Admissão de Estudante
 ,Terretory,Território
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,O Item {0} foi cancelado
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Solicitação de Material
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,O Item {0} foi cancelado
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Solicitação de Material
 DocType: Bank Reconciliation,Update Clearance Date,Atualizar Data de Liquidação
 DocType: Item,Purchase Details,Dados de Compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},O Item {0} não foi encontrado na tabela das 'Matérias-primas Fornecidas' na Ordens de Compra {1}
 DocType: Patient Relation,Relation,Relação
 DocType: Shipping Rule,Worldwide Shipping,Envio Internacional
 DocType: Patient Relation,Mother,Mãe
+DocType: Restaurant Reservation,Reservation End Time,Hora de término da reserva
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Ordens de Clientes confirmadas.
 DocType: Purchase Receipt Item,Rejected Quantity,Quantidade Rejeitada
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Pedido de pagamento {0} criado
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Pedido de pagamento {0} criado
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Baixa sensibilidade
 DocType: Notification Control,Notification Control,Controlo de Notificação
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Confirme uma vez que você tenha completado seu treinamento
 DocType: Lead,Suggestions,Sugestões
@@ -389,7 +402,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Envia as folhas de vencimento por email com baxe no email preferido selecionado em Funcionário
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,O primeiroAprovador de Licenças na lista será definido como o Aprovador de Licenças padrão
 DocType: Tax Rule,Shipping County,Condado de Envio
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Aprender
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Aprender
 DocType: Asset,Next Depreciation Date,Próxima Data de Depreciação
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Custo de Atividade por Funcionário
 DocType: Accounts Settings,Settings for Accounts,Definições de Contas
@@ -400,13 +413,13 @@
 DocType: Item,Synced With Hub,Sincronizado com a Plataforma
 DocType: Vehicle,Fleet Manager,Gestor de Frotas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} não pode ser negativo para o item {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Senha Incorreta
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Senha Incorreta
 DocType: Item,Variant Of,Variante de
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"A Qtd Concluída não pode ser superior à ""Qtd de Fabrico"""
 DocType: Period Closing Voucher,Closing Account Head,A Fechar Título de Contas
 DocType: Employee,External Work History,Histórico Profissional Externo
 DocType: Physician,Time per Appointment,Tempo por nomeação
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Erro de Referência Circular
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Erro de Referência Circular
 DocType: Appointment Type,Is Inpatient,É paciente internado
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Nome Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Por Extenso (Exportar) será visível assim que guardar a Guia de Remessa.
@@ -415,19 +428,18 @@
 DocType: Lead,Industry,Setor
 DocType: Employee,Job Profile,Perfil de Emprego
 DocType: BOM Item,Rate & Amount,Taxa e Valor
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Por favor, configure as séries de numeração para Atendimento via Configuração&gt; Série de numeração"
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Isso é baseado em transações contra esta empresa. Veja a linha abaixo para detalhes
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificar por Email na criação de Solicitações de Material automáticas
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Resistente
 DocType: Journal Entry,Multi Currency,Múltiplas Moedas
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de Fatura
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de Clientes&gt; Território
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Guia de Remessa
 DocType: Consultation,Encounter Impression,Encounter Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,A Configurar Impostos
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Custo do Ativo Vendido
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,"O Registo de Pagamento foi alterado após o ter retirado. Por favor, retire-o novamente."
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} entrou duas vezes na Taxa de Item
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Resumo para esta semana e atividades pendentes
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} entrou duas vezes na Taxa de Item
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Resumo para esta semana e atividades pendentes
 DocType: Student Applicant,Admitted,Admitido/a
 DocType: Workstation,Rent Cost,Custo de Aluguer
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Montante Após Depreciação
@@ -442,36 +454,35 @@
 DocType: Shipping Rule,Valid for Countries,Válido para Países
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Este Item é um Modelo e não pode ser utilizado nas transações. Os atributos doItem serão copiados para as variantes a menos que defina ""Não Copiar"""
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,PedidoTotal Considerado
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Categoria profissional do funcionário (por exemplo, Presidente Executivo , Diretor , etc.)"
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Categoria profissional do funcionário (por exemplo, Presidente Executivo , Diretor , etc.)"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Taxa a que a Moeda do Cliente é convertida para a moeda principal do cliente
 DocType: Course Scheduling Tool,Course Scheduling Tool,Ferramenta de Agendamento de Curso
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Linha #{0}: Não pode ser efetuada uma Fatura de Compra para o ativo existente {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,Erro [Urgente] ao criar% s recorrentes para% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,Erro [Urgente] ao criar% s recorrentes para% s
 DocType: Item Tax,Tax Rate,Taxa de Imposto
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} já foi alocado para o Funcionário {1} para o período de {2} a {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Selecionar Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Selecionar Item
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,A Fatura de Compra {0} já foi enviada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Linha # {0}: O Nº de Lote deve ser igual a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Converter a Fora do Grupo
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Lote de um Item.
 DocType: C-Form Invoice Detail,Invoice Date,Data da Fatura
 DocType: GL Entry,Debit Amount,Montante de Débito
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Só pode haver 1 Conta por Empresa em {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,"Por favor, veja o anexo"
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Só pode haver 1 Conta por Empresa em {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,"Por favor, veja o anexo"
 DocType: Purchase Order,% Received,% Recebida
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Criar Grupos de Estudantes
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,A Instalação Já Está Concluída!!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,A Instalação Já Está Concluída!!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Valor da Nota de Crédito
 DocType: Setup Progress Action,Action Document,Documento de ação
 ,Finished Goods,Produtos Acabados
 DocType: Delivery Note,Instructions,Instruções
 DocType: Quality Inspection,Inspected By,Inspecionado Por
 DocType: Maintenance Visit,Maintenance Type,Tipo de Manutenção
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} não está inscrito no Curso {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Código do Item&gt; Item Group&gt; Brand
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} não está inscrito no Curso {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},O Nr. de Série {0} não pertence à Guia de Remessa {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demonstração
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Adicionar Itens
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Adicionar Itens
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parâmetro de Inspeção de Qualidade do Item
 DocType: Leave Application,Leave Approver Name,Nome do Aprovador da Licença
 DocType: Depreciation Schedule,Schedule Date,Data Marcada
@@ -493,7 +504,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Horas de Trabalho
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Altera o número de sequência inicial / atual duma série existente.
 DocType: Dosage Strength,Strength,Força
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Criar um novo cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Criar um novo cliente
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Se várias Regras de Fixação de Preços continuarem a prevalecer, será pedido aos utilizadores que definam a Prioridade manualmente para que este conflito seja resolvido."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Criar ordens de compra
 ,Purchase Register,Registo de Compra
@@ -512,7 +523,7 @@
 DocType: Lab Test Template,Single,Solteiro/a
 DocType: Salary Slip,Total Loan Repayment,O reembolso total do empréstimo
 DocType: Account,Cost of Goods Sold,Custo dos Produtos Vendidos
-DocType: Purchase Invoice,Yearly,Anual
+DocType: Subscription,Yearly,Anual
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,"Por favor, insira o Centro de Custos"
 DocType: Drug Prescription,Dosage,Dosagem
 DocType: Journal Entry Account,Sales Order,Ordem de Venda
@@ -543,7 +554,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,As definições gerais para todos os processos de fabrico.
 DocType: Accounts Settings,Accounts Frozen Upto,Contas Congeladas Até
 DocType: SMS Log,Sent On,Enviado Em
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,O Atributo {0} foi selecionado várias vezes na Tabela de Atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,O Atributo {0} foi selecionado várias vezes na Tabela de Atributos
 DocType: HR Settings,Employee record is created using selected field. ,O registo de funcionário é criado ao utilizar o campo selecionado.
 DocType: Sales Order,Not Applicable,Não Aplicável
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Definidor de Feriados.
@@ -569,13 +580,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,É obrigatório o total de licenças alocadas
 DocType: Patient,AB Positive,AB Positivo
 DocType: Job Opening,Description of a Job Opening,Descrição de uma Vaga de Emprego
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Atividades pendentes para hoje
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Atividades pendentes para hoje
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Registo de assiduidade.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Componente Salarial para a folha de presença com base no pagamento.
 DocType: Sales Order Item,Used for Production Plan,Utilizado para o Plano de Produção
 DocType: Employee Loan,Total Payment,Pagamento total
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tempo Entre Operações (em minutos)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} é cancelado para que a ação não possa ser concluída
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} é cancelado para que a ação não possa ser concluída
 DocType: Customer,Buyer of Goods and Services.,Comprador de Produtos e Serviços.
 DocType: Journal Entry,Accounts Payable,Contas a Pagar
 DocType: Patient,Allergies,Alergias
@@ -587,23 +598,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Avisar ordens de compra
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Insira alguns dos seus clientes. Podem ser organizações ou indivíduos.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Peças suficiente para construir
+DocType: POS Profile User,POS Profile User,Usuário do perfil POS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Rendimento Direto
 DocType: Patient Appointment,Date TIme,Data hora
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Não é possivel filtrar com base na Conta, se estiver agrupado por Conta"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Funcionário Administrativo
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Por favor selecione Curso
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Por favor selecione Curso
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Por favor selecione Curso
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Por favor selecione Curso
 DocType: Codification Table,Codification Table,Tabela de codificação
 DocType: Timesheet Detail,Hrs,Hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,"Por favor, selecione a Empresa"
 DocType: Stock Entry Detail,Difference Account,Conta de Diferenças
 DocType: Purchase Invoice,Supplier GSTIN,Fornecedor GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Não pode encerrar a tarefa pois a sua tarefa dependente {0} não está encerrada.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,"Por favor, insira o Armazém em que será levantanda a Solicitação de Material"
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Não pode encerrar a tarefa pois a sua tarefa dependente {0} não está encerrada.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Por favor, insira o Armazém em que será levantanda a Solicitação de Material"
 DocType: Production Order,Additional Operating Cost,Custos Operacionais Adicionais
 DocType: Lab Test Template,Lab Routine,Rotina de laboratório
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosméticos
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Para unir, as seguintes propriedades devem ser iguais para ambos items"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Para unir, as seguintes propriedades devem ser iguais para ambos items"
 DocType: Shipping Rule,Net Weight,Peso Líquido
 DocType: Employee,Emergency Phone,Telefone de Emergência
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Comprar
@@ -614,7 +626,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Por favor defina o grau para o Limiar 0%
 DocType: Sales Order,To Deliver,A Entregar
 DocType: Purchase Invoice Item,Item,Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,O nr. de série do item não pode ser uma fração
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Alta sensibilidade
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,O nr. de série do item não pode ser uma fração
 DocType: Journal Entry,Difference (Dr - Cr),Diferença (Db - Cr)
 DocType: Account,Profit and Loss,Lucros e Perdas
 DocType: Patient,Risk Factors,Fatores de risco
@@ -623,7 +636,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Gestão de Subcontratação
 DocType: Vital Signs,Body Temperature,Temperatura corporal
 DocType: Project,Project will be accessible on the website to these users,O projeto estará acessível no website para estes utilizadores
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Definir tipo de projeto.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Definir tipo de projeto.
 DocType: Supplier Scorecard,Weighting Function,Função de ponderação
 DocType: Physician,OP Consulting Charge,OP Consulting Charge
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Configure seu
@@ -637,7 +650,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,O Aumento não pode ser 0
 DocType: Production Planning Tool,Material Requirement,Requisito de Material
 DocType: Company,Delete Company Transactions,Eliminar Transações da Empresa
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,É obrigatório colocar o Nº de Referência e a Data de Referência para as transações bancárias
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,É obrigatório colocar o Nº de Referência e a Data de Referência para as transações bancárias
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adicionar / Editar Impostos e Taxas
 DocType: Payment Entry Reference,Supplier Invoice No,Nr. de Fatura de Fornecedor
 DocType: Territory,For reference,Para referência
@@ -645,12 +658,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Não é possível eliminar o Nº de Série {0}, pois está a ser utilizado em transações de stock"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),A Fechar (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Olá
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Mover Item
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Mover Item
 DocType: Serial No,Warranty Period (Days),Período de Garantia (Dias)
 DocType: Installation Note Item,Installation Note Item,Nota de Instalação de Item
 DocType: Production Plan Item,Pending Qty,Qtd Pendente
 DocType: Budget,Ignore,Ignorar
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} não é activa
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} não é activa
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Defina as dimensões do cheque para impressão
 DocType: Salary Slip,Salary Slip Timesheet,Folhas de Vencimento de Registo de Horas
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,É obrigatório colocar o Fornecedor de Armazém no Recibo de compra de subcontratados
@@ -659,7 +672,7 @@
 DocType: Pricing Rule,Sales Partner,Parceiro de Vendas
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Todos os scorecards do fornecedor.
 DocType: Buying Settings,Purchase Receipt Required,É Obrigatório o Recibo de Compra
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,É obrigatório colocar a Taxa de Avaliação se foi introduzido o Stock de Abertura
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,É obrigatório colocar a Taxa de Avaliação se foi introduzido o Stock de Abertura
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Não foram encontrados nenhuns registos na tabela da Fatura
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Por favor, selecione primeiro a Empresa e o Tipo de Parte"
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Ano fiscal / financeiro.
@@ -696,7 +709,7 @@
 DocType: Quotation,Quotation To,Orçamento Para
 DocType: Lead,Middle Income,Rendimento Médio
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Inicial (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,A Unidade de Medida Padrão do Item {0} não pode ser alterada diretamente porque já efetuou alguma/s transação/transações com outra UNID. Irá precisar criar um novo Item para poder utilizar uma UNID Padrão diferente.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,A Unidade de Medida Padrão do Item {0} não pode ser alterada diretamente porque já efetuou alguma/s transação/transações com outra UNID. Irá precisar criar um novo Item para poder utilizar uma UNID Padrão diferente.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,O montante atribuído não pode ser negativo
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Defina a Empresa
 DocType: Purchase Order Item,Billed Amt,Qtd Faturada
@@ -710,6 +723,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Selecione a Conta de Pagamento para efetuar um Registo Bancário
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Criar registos de funcionários para gerir faltas, declarações de despesas e folha de salários"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Período de prescrição
+DocType: Restaurant Reservation,Restaurant Reservation,Reserva de restaurante
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Elaboração de Proposta
 DocType: Payment Entry Deduction,Payment Entry Deduction,Dedução de Registo de Pagamento
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Já existe outro Vendedor {0} com a mesma id de Funcionário
@@ -717,7 +731,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Definidores
 DocType: Assessment Plan,Maximum Assessment Score,Pontuação máxima Assessment
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Atualizar as Datas de Transações Bancárias
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Monitorização de Tempo
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Monitorização de Tempo
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,DUPLICADO PARA O TRANSPORTE
 DocType: Fiscal Year Company,Fiscal Year Company,Ano Fiscal da Empresa
 DocType: Packing Slip Item,DN Detail,Dados de NE
@@ -725,8 +739,9 @@
 DocType: Timesheet,Billed,Faturado
 DocType: Batch,Batch Description,Descrição do Lote
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Criando grupos de alunos
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Não foi criada uma Conta do Portal de Pagamento, por favor, crie uma manualmente."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Não foi criada uma Conta do Portal de Pagamento, por favor, crie uma manualmente."
 DocType: Supplier Scorecard,Per Year,Por ano
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Não é elegível para a admissão neste programa conforme DBA
 DocType: Sales Invoice,Sales Taxes and Charges,Impostos e Taxas de Vendas
 DocType: Employee,Organization Profile,Perfil da Organização
 DocType: Vital Signs,Height (In Meter),Altura (em metros)
@@ -762,7 +777,7 @@
 DocType: Student Batch Name,Batch Name,Nome de Lote
 DocType: Fee Validity,Max number of visit,Número máximo de visitas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Registo de Horas criado:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Por favor defina o Dinheiro ou Conta Bancária padrão no Modo de Pagamento {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Por favor defina o Dinheiro ou Conta Bancária padrão no Modo de Pagamento {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,Matricular
 DocType: GST Settings,GST Settings,Configurações de GST
 DocType: Selling Settings,Customer Naming By,Nome de Cliente Por
@@ -794,15 +809,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Impostos e Taxas de Custo de Entrega
 DocType: Production Order Operation,Actual Start Time,Hora de Início Efetiva
 DocType: BOM Operation,Operation Time,Tempo de Operação
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Terminar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Terminar
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Base
 DocType: Timesheet,Total Billed Hours,Horas Totais Faturadas
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Liquidar Quantidade
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Liquidar Quantidade
 DocType: Leave Block List Allow,Allow User,Permitir Utilizador
 DocType: Journal Entry,Bill No,Nr. de Conta
 DocType: Company,Gain/Loss Account on Asset Disposal,Conta de Ganhos/Perdas de Eliminação de Ativos
 DocType: Vehicle Log,Service Details,Detalhes do serviço
-DocType: Purchase Invoice,Quarterly,Trimestral
+DocType: Subscription,Quarterly,Trimestral
 DocType: Lab Test Template,Grouped,Agrupados
 DocType: Selling Settings,Delivery Note Required,Guia de Remessa Necessária
 DocType: Bank Guarantee,Bank Guarantee Number,Número de Garantia Bancária
@@ -811,12 +826,12 @@
 DocType: Student Attendance,Student Attendance,Assiduidade de Estudante
 DocType: Sales Invoice Timesheet,Time Sheet,Folha de Presença
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Confirmar Matérias-Primas com Base Em
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,"Por favor, insira os dados do item"
 DocType: Interest,Interest,Juros
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pré-vendas
 DocType: Purchase Receipt,Other Details,Outros Dados
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Lab Test,Test Template,Modelo de teste
+DocType: Restaurant Order Entry Item,Served,Servido
 DocType: Account,Accounts,Contas
 DocType: Vehicle,Odometer Value (Last),Valor do Conta-quilómetros (Último)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Modelos de critérios de scorecard do fornecedor.
@@ -828,25 +843,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Pré-visualizar Folha de Pagamento
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,A Conta {0} foi inserida várias vezes
 DocType: Account,Expenses Included In Valuation,Despesas Incluídas na Estimativa
-DocType: Hub Settings,Seller City,Cidade do Vendedor
 ,Absent Student Report,Relatório de Faltas de Estudante
 DocType: Email Digest,Next email will be sent on:,O próximo email será enviado em:
 DocType: Offer Letter Term,Offer Letter Term,Termo de Carta de Oferta
 DocType: Supplier Scorecard,Per Week,Por semana
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,O Item tem variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,O Item tem variantes.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Estudante total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Não foi encontrado o Item {0}
 DocType: Bin,Stock Value,Valor do Stock
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,"Os registros de taxas serão criados em segundo plano. Em caso de erro, a mensagem de erro será atualizada na programação."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,A Empresa {0} não existe
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} tem validade de taxa até {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} tem validade de taxa até {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Tipo de Esquema
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Qtd Consumida Por Unidade
 DocType: Serial No,Warranty Expiry Date,Data de Validade da Garantia
 DocType: Material Request Item,Quantity and Warehouse,Quantidade e Armazém
+DocType: Hub Settings,Unregister,Cancelar o registro
 DocType: Sales Invoice,Commission Rate (%),Taxa de Comissão (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Selecione o programa
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Selecione o programa
 DocType: Project,Estimated Cost,Custo Estimado
 DocType: Purchase Order,Link to material requests,Link para pedidos de material
+DocType: Hub Settings,Publish,Publicar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Espaço Aéreo
 DocType: Journal Entry,Credit Card Entry,Registo de Cartão de Crédito
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Empresa e Contas
@@ -857,13 +874,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Fechar Oportunidade Depois Dias
 ,Reserved,Reservado
 DocType: Purchase Order,Supply Raw Materials,Abastecimento de Matérias-Primas
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,A data na qual a próxima fatura será gerada. Ela é gerada ao enviar.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Ativos Atuais
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} não é um item de stock
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',"Por favor, compartilhe seus comentários para o treinamento clicando em &#39;Feedback de Treinamento&#39; e depois &#39;Novo&#39;"
 DocType: Mode of Payment Account,Default Account,Conta Padrão
 DocType: Payment Entry,Received Amount (Company Currency),Montante Recebido (Moeda da Empresa)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,O Potencial Cliente deve ser definido se for efetuada uma Oportunidade para um Potencial Cliente
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,O Potencial Cliente deve ser definido se for efetuada uma Oportunidade para um Potencial Cliente
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Por favor, seleccione os dias de folga semanal"
 DocType: Patient,O Negative,O Negativo
 DocType: Production Order Operation,Planned End Time,Tempo de Término Planeado
@@ -879,10 +895,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Oportunidade De
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Declaração salarial mensal.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Adicionar empresa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Linha {0}: {1} Números de série necessários para o Item {2}. Você forneceu {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Linha {0}: {1} Números de série necessários para o Item {2}. Você forneceu {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Selecione uma tabela
 DocType: BOM,Website Specifications,Especificações do Website
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} é um endereço de e-mail inválido em &#39;Destinatários&#39;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} é um endereço de e-mail inválido em &#39;Destinatários&#39;
 DocType: Special Test Items,Particulars,Informações
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiótico.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: De {0} do tipo {1}
@@ -890,11 +906,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Linha {0}: É obrigatório colocar o Fator de Conversão
 DocType: Employee,A+,A+
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Existem Várias Regras de Preços com os mesmos critérios, por favor, resolva o conflito através da atribuição de prioridades. Regras de Preços: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,Não é possível desativar ou cancelar a LDM pois está associada a outras LDM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,Não é possível desativar ou cancelar a LDM pois está associada a outras LDM
 DocType: Opportunity,Maintenance,Manutenção
 DocType: Item Attribute Value,Item Attribute Value,Valor do Atributo do Item
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Campanhas de vendas.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Criar Registo de Horas
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Criar Registo de Horas
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -951,12 +967,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,"Por favor, insira o Item primeiro"
 DocType: Account,Liability,Responsabilidade
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,O Montante Sancionado não pode ser maior do que o Montante de Reembolso na Fila {0}.
+DocType: Salary Detail,Do not include in total,Não inclua no total
 DocType: Company,Default Cost of Goods Sold Account,Custo Padrão de Conta de Produtos Vendidos
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,A Lista de Preços não foi selecionada
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,A Lista de Preços não foi selecionada
 DocType: Employee,Family Background,Antecedentes Familiares
 DocType: Request for Quotation Supplier,Send Email,Enviar Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Aviso: Anexo inválido {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Sem Permissão
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Aviso: Anexo inválido {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Sem Permissão
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Citação solicitada
 DocType: Vital Signs,Heart Rate / Pulse,Frequência cardíaca / pulso
 DocType: Company,Default Bank Account,Conta Bancária Padrão
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Para filtrar com base nas Partes, selecione o Tipo de Parte primeiro"
@@ -983,12 +1001,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,A Linha do Item {idx}: {doctype} {docname}  não existe na tabela '{doctype}'
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,O Registo de Horas {0} já está concluído ou foi cancelado
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,não há tarefas
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","O dia do mês em que a fatura automática será gerada. Por exemplo, 05, 28, etc."
 DocType: Item Variant Settings,Copy Fields to Variant,Copiar campos para variante
 DocType: Asset,Opening Accumulated Depreciation,Depreciação Acumulada Inicial
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,A classificação deve ser menor ou igual a 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Ferramenta de Inscrição no Programa
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,Registos de Form-C
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,Registos de Form-C
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Clientes e Fornecedores
 DocType: Email Digest,Email Digest Settings,Definições de Resumo de Email
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Agradeço pelos seus serviços!
@@ -1006,13 +1023,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Status da Cotação
 DocType: Maintenance Visit,Completion Status,Estado de Conclusão
 DocType: HR Settings,Enter retirement age in years,Insira a idade da reforma em anos
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Armazém Alvo
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Selecione um armazém
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Armazém Alvo
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Selecione um armazém
 DocType: Cheque Print Template,Starting location from left edge,Localização inicial a partir do lado esquerdo
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir  entrega ou receção em excesso até esta percentagem
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Importar Assiduidade
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Todos os Grupos de Itens
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Todos os Grupos de Itens
 DocType: Process Payroll,Activity Log,Registo de Atividade
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Lucro / Prejuízo Líquido
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Criar mensagem automática no envio de transações.
@@ -1024,7 +1041,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Qtd Projetada
 DocType: Sales Invoice,Payment Due Date,Data Limite de Pagamento
 DocType: Drug Prescription,Interval UOM,UOM Intervalo
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,A Variante do Item {0} já existe com mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,A Variante do Item {0} já existe com mesmos atributos
+DocType: Item,Hub Publishing Details,Detalhes da publicação do hub
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening','Abertura'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Tarefas Abertas
 DocType: Notification Control,Delivery Note Message,Mensagem de Guia de Remessa
@@ -1044,10 +1062,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: A matéria-prima não pode ser igual ao item principal
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total de encargos aplicáveis em Purchase mesa Itens recibo deve ser o mesmo que o total Tributos e Encargos
 DocType: Sales Team,Incentives,Incentivos
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Registre-se para Hub
 DocType: SMS Log,Requested Numbers,Números Solicitados
 DocType: Production Planning Tool,Only Obtain Raw Materials,Só Obter as Matérias-primas
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Avaliação de desempenho.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Ao ativar a ""Utilização para Carrinho de Compras"", o Carrinho de Compras ficará ativado e deverá haver pelo menos uma Regra de Impostos para o Carrinho de Compras"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Ao ativar a ""Utilização para Carrinho de Compras"", o Carrinho de Compras ficará ativado e deverá haver pelo menos uma Regra de Impostos para o Carrinho de Compras"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","O Registo de Pagamento {0} está ligado ao Pedido {1}, por favor verifique se o mesmo deve ser retirado como adiantamento da presente fatura."
 DocType: Sales Invoice Item,Stock Details,Dados de Stock
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor do Projeto
@@ -1066,12 +1085,14 @@
 DocType: Salary Slip,Working Days,Dias Úteis
 DocType: Serial No,Incoming Rate,Taxa de Entrada
 DocType: Packing Slip,Gross Weight,Peso Bruto
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,O nome da empresa para a qual está a configurar este sistema.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Enable Hub
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,O nome da empresa para a qual está a configurar este sistema.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Incluir férias no Nr. Total de Dias Úteis
 DocType: Job Applicant,Hold,Manter
 DocType: Employee,Date of Joining,Data de Admissão
 DocType: Naming Series,Update Series,Atualizar Séries
 DocType: Supplier Quotation,Is Subcontracted,É Subcontratado
+DocType: Restaurant Table,Minimum Seating,Assentos mínimos
 DocType: Item Attribute,Item Attribute Values,Valores do Atributo do Item
 DocType: Examination Result,Examination Result,Resultado do Exame
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Recibo de Compra
@@ -1082,13 +1103,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar o Horário nos próximos {0} dias para a Operação {1}
 DocType: Production Order,Plan material for sub-assemblies,Planear material para subconjuntos
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Parceiros de Vendas e Território
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,A LDM {0} deve estar ativa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,A LDM {0} deve estar ativa
 DocType: Journal Entry,Depreciation Entry,Registo de Depreciação
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Por favor, selecione primeiro o tipo de documento"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancelar Visitas Materiais {0} antes de cancelar esta Visita de Manutenção
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},O Nr. de Série {0} não pertence ao Item {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Qtd Necessária
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Os Armazéns com transação existente não podem ser convertidos em razão.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Os Armazéns com transação existente não podem ser convertidos em razão.
 DocType: Bank Reconciliation,Total Amount,Valor Total
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publicações na Internet
 DocType: Prescription Duration,Number,Número
@@ -1099,7 +1120,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista de Preço de Venda
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Se marcado, um cliente será criado, mapeado para Paciente. As faturas do paciente serão criadas contra este Cliente. Você também pode selecionar o Cliente existente ao criar o Paciente."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicar para sincronizar itens
 DocType: Bank Reconciliation,Account Currency,Moeda da Conta
 DocType: Lab Test,Sample ID,Identificação da amostra
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,"Por favor, mencione a Conta de Arredondamentos na Empresa"
@@ -1108,11 +1128,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,O(A) Funcionário(a) {0} não está ativo(a) ou não existe
 DocType: Fee Structure,Components,Componentes
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},"Por favor, insira a Categoria de Ativo no Item {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Variantes do Item {0} atualizadas
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Variantes do Item {0} atualizadas
 DocType: Quality Inspection Reading,Reading 6,Leitura 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Não é possível {0} {1} {2} sem qualquer fatura pendente negativa
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","a ser gerado. Se atrasado, você precisará alterar manualmente o campo &quot;Repetir no dia do mês&quot; deste"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Não é possível {0} {1} {2} sem qualquer fatura pendente negativa
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Avanço de Fatura de Compra
-DocType: Hub Settings,Sync Now,Sincronizar Agora
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Linha {0}: O registo de crédito não pode ser ligado a {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Definir orçamento para um ano fiscal.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,A Conta Bancária / Dinheiro padrão será automaticamente atualizada na fatura POS quando este modo for selecionado.
@@ -1124,13 +1145,13 @@
 DocType: Item,Is Purchase Item,É o Item de Compra
 DocType: Asset,Purchase Invoice,Fatura de Compra
 DocType: Stock Ledger Entry,Voucher Detail No,Dado de Voucher Nr.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Nova Fatura de Venda
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Nova Fatura de Venda
 DocType: Stock Entry,Total Outgoing Value,Valor Total de Saída
 DocType: Physician,Appointments,Compromissos
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,A Data de Abertura e a Data de Término devem estar dentro do mesmo Ano Fiscal
 DocType: Lead,Request for Information,Pedido de Informação
 ,LeaderBoard,Entre os melhores
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Sincronização de Facturas Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Sincronização de Facturas Offline
 DocType: Payment Request,Paid,Pago
 DocType: Program Fee,Program Fee,Proprina do Programa
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1149,11 +1170,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Item da Ordem de Compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Rendimento Indireto
 DocType: Student Attendance Tool,Student Attendance Tool,Ferramenta de Assiduidade dos Alunos
+DocType: Restaurant Menu,Price List (Auto created),Lista de preços (criada automaticamente)
 DocType: Cheque Print Template,Date Settings,Definições de Data
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variação
 ,Company Name,Nome da Empresa
 DocType: SMS Center,Total Message(s),Mensagens Totais
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Selecionar Item para Transferência
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Selecionar Item para Transferência
 DocType: Purchase Invoice,Additional Discount Percentage,Percentagem de Desconto Adicional
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Veja uma lista de todos os vídeos de ajuda
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Selecione o título de conta do banco onde cheque foi depositado.
@@ -1171,6 +1193,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Metro
 DocType: Workstation,Electricity Cost,Custo de Eletricidade
 DocType: HR Settings,Don't send Employee Birthday Reminders,Não enviar Lembretes de Aniversário de Funcionários
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Salvar configurações
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Produtos solicitados
 DocType: Item,Inspection Criteria,Critérios de Inspeção
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Transferido
 DocType: BOM Website Item,BOM Website Item,BOM Site item
@@ -1188,11 +1212,11 @@
 DocType: Journal Entry,Total Amount in Words,Valor Total por Extenso
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Houve um erro. Um dos motivos prováveis para isto ter ocorrido, poderá ser por ainda não ter guardado o formulário. Se o problema persistir, por favor contacte support@erpnext.com."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Meu Carrinho
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},O Tipo de Pedido deve pertencer a {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},O Tipo de Pedido deve pertencer a {0}
 DocType: Lead,Next Contact Date,Data do Próximo Contacto
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Qtd Inicial
 DocType: Healthcare Settings,Appointment Reminder,Lembrete de compromisso
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,"Por favor, insira a Conta para o Montante de Alterações"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,"Por favor, insira a Conta para o Montante de Alterações"
 DocType: Student Batch Name,Student Batch Name,Nome de Classe de Estudantes
 DocType: Consultation,Doctor,Médico
 DocType: Holiday List,Holiday List Name,Lista de Nomes de Feriados
@@ -1200,12 +1224,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Calendário de Cursos
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Opções de Stock
 DocType: Journal Entry Account,Expense Claim,Relatório de Despesas
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Deseja realmente restaurar este ativo descartado?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Qtd para {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Deseja realmente restaurar este ativo descartado?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Qtd para {0}
 DocType: Leave Application,Leave Application,Pedido de Licença
 DocType: Patient,Patient Relation,Relação com o paciente
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Ferramenta de Atribuição de Licenças
+DocType: Item,Hub Category to Publish,Categoria Hub para Publicar
 DocType: Leave Block List,Leave Block List Dates,Datas de Lista de Bloqueio de Licenças
+DocType: Sales Invoice,Billing Address GSTIN,Endereço de cobrança GSTIN
 DocType: Workstation,Net Hour Rate,Taxa Líquida por Hora
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Recibo de Compra de Custo de Entrega
 DocType: Company,Default Terms,Termos Padrão
@@ -1215,11 +1241,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Por favor especificar um {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Itens removidos sem nenhuma alteração na quantidade ou valor.
 DocType: Delivery Note,Delivery To,Entregue A
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,É obrigatório colocar a tabela do atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,É obrigatório colocar a tabela do atributos
 DocType: Production Planning Tool,Get Sales Orders,Obter Ordens de Venda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} não pode ser negativo
 DocType: Training Event,Self-Study,Auto estudo
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Desconto
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Desconto
 DocType: Asset,Total Number of Depreciations,Número total de Depreciações
 DocType: Sales Invoice Item,Rate With Margin,Taxa com margem
 DocType: Sales Invoice Item,Rate With Margin,Taxa com margem
@@ -1227,7 +1253,7 @@
 DocType: Task,Urgent,Urgente
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},"Por favor, especifique uma ID de Linha válida para a linha {0} na tabela {1}"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Não foi possível encontrar a variável:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Selecione um campo para editar a partir do numpad
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Selecione um campo para editar a partir do numpad
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Vá para o Ambiente de Trabalho e comece a utilizar ERPNext
 DocType: Item,Manufacturer,Fabricante
 DocType: Landed Cost Item,Purchase Receipt Item,Item de Recibo de Compra
@@ -1258,8 +1284,8 @@
 DocType: GL Entry,Against,Em
 DocType: Item,Default Selling Cost Center,Centro de Custo de Venda Padrão
 DocType: Sales Partner,Implementation Partner,Parceiro de Implementação
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Código Postal
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},A Ordem de Venda {0} é {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Código Postal
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},A Ordem de Venda {0} é {1}
 DocType: Opportunity,Contact Info,Informações de Contacto
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Efetuar Registos de Stock
 DocType: Packing Slip,Net Weight UOM,Peso Líquido de UNID
@@ -1270,6 +1296,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Obter Datas de Folgas Semanais
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,A Data de Término não pode ser mais recente que a Data de Início
 DocType: Sales Person,Select company name first.,Selecione o nome da empresa primeiro.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Baixo para alto
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Cotações recebidas de Fornecedores.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Substitua a Lista de BOM e atualize o preço mais recente em todas as BOMs
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Para {0} | {1} {2}
@@ -1290,7 +1317,7 @@
 DocType: Program Enrollment,Transportation,Transporte
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Atributo Inválido
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} deve ser enviado
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},A quantidade deve ser inferior ou igual a {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},A quantidade deve ser inferior ou igual a {0}
 DocType: SMS Center,Total Characters,Total de Caracteres
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},"Por favor, selecione a LDM no campo LDM para o Item {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Dados de Fatura Form-C
@@ -1305,7 +1332,7 @@
 ,Ordered Items To Be Billed,Itens Pedidos A Serem Faturados
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,A Faixa De tem de ser inferior à Faixa Para
 DocType: Global Defaults,Global Defaults,Padrões Gerais
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Convite de Colaboração no Projeto
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Convite de Colaboração no Projeto
 DocType: Salary Slip,Deductions,Deduções
 DocType: Leave Allocation,LAL/,LAL/
 DocType: Setup Progress Action,Action Name,Nome da Ação
@@ -1323,13 +1350,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Avanço de Fatura de Vendas
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Nada a requesitar
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Já existe outro registo '{0}' em {1} '{2}' para o ano fiscal {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',A 'Data de Início Efetiva' não pode ser mais recente que a 'Data de Término Efetiva'
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',A 'Data de Início Efetiva' não pode ser mais recente que a 'Data de Término Efetiva'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Gestão
 DocType: Cheque Print Template,Payer Settings,Definições de Pagador
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Isto será anexado ao Código do Item da variante. Por exemplo, se a sua abreviatura for ""SM"", e o código do item é ""T-SHIRT"", o código do item da variante será ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,A Remuneração Líquida (por extenso) será visível assim que guardar a Folha de Vencimento.
 DocType: Purchase Invoice,Is Return,É um Retorno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Cuidado
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Cuidado
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Retorno / Nota de Débito
 DocType: Price List Country,Price List Country,País da Lista de Preços
 DocType: Item,UOMs,UNIDs
@@ -1344,17 +1371,18 @@
 DocType: Account,Balance Sheet,Balanço
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',O Centro de Custo Para o Item com o Código de Item '
 DocType: Fee Validity,Valid Till,Válida até
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","O Modo de Pagamento não está configurado. Por favor, verifique se conta foi definida no Modo de Pagamentos ou no Perfil POS."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","O Modo de Pagamento não está configurado. Por favor, verifique se conta foi definida no Modo de Pagamentos ou no Perfil POS."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Mesmo item não pode ser inserido várias vezes.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Podem ser realizadas outras contas nos Grupos, e os registos podem ser efetuados em Fora do Grupo"
 DocType: Lead,Lead,Potenciais Clientes
 DocType: Email Digest,Payables,A Pagar
 DocType: Course,Course Intro,Introdução do Curso
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Registo de Stock {0} criado
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Por favor, configure as séries de numeração para Atendimento via Configuração&gt; Série de numeração"
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Registo de Stock {0} criado
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Linha #{0}: A Qtd Rejeitada não pode ser inserida na Devolução de Compra
 ,Purchase Order Items To Be Billed,Itens da Ordem de Compra a faturar
 DocType: Purchase Invoice Item,Net Rate,Taxa Líquida
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Selecione um cliente
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Selecione um cliente
 DocType: Purchase Invoice Item,Purchase Invoice Item,Item de Fatura de Compra
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Os Registos do Livro de Stock e Registos GL são reenviados para os Recibos de Compra selecionados
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Artigo 1
@@ -1373,7 +1401,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Linha duplicada {0} com o mesmo {1}
 ,Trial Balance,Balancete
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,O Ano Fiscal de {0} não foi encontrado
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,A Configurar Funcionários
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,A Configurar Funcionários
 DocType: Sales Order,SO-,SO-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,"Por favor, seleccione o prefixo primeiro"
 DocType: Employee,O-,O-
@@ -1385,12 +1413,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Ver Livro
 DocType: Grading Scale,Intervals,intervalos
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Mais Cedo
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Já existe um Grupo de Itens com o mesmo nome, Por favor, altere o nome desse grupo de itens ou modifique o nome deste grupo de itens"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Já existe um Grupo de Itens com o mesmo nome, Por favor, altere o nome desse grupo de itens ou modifique o nome deste grupo de itens"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Nr. de Telemóvel de Estudante
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Resto Do Mundo
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Resto Do Mundo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,O Item {0} não pode ter um Lote
 ,Budget Variance Report,Relatório de Desvios de Orçamento
 DocType: Salary Slip,Gross Pay,Salário Bruto
+DocType: Item,Is Item from Hub,É Item do Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Linha {0}: É obrigatório colocar o Tipo de Atividade.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividendos Pagos
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Livro Contabilístico
@@ -1400,8 +1429,9 @@
 DocType: Vehicle Log,Service Detail,Dados de Serviço
 DocType: BOM,Item Description,Descrição do Item
 DocType: Student Sibling,Student Sibling,Irmão/Irmã do Estudante
-DocType: Purchase Invoice,Is Recurring,É Recorrente
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,O modo de pagamento
 DocType: Purchase Invoice,Supplied Items,Itens Fornecidos
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Defina um menu ativo para o Restaurante {0}
 DocType: Student,STUD.,ESTUD.
 DocType: Production Order,Qty To Manufacture,Qtd Para Fabrico
 DocType: Email Digest,New Income,Novo Rendimento
@@ -1412,6 +1442,7 @@
 ,Student and Guardian Contact Details,Student and Guardian Detalhes de Contato
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Linha {0}: É necessário o Endereço de Email para o fornecedor {0} para poder enviar o email
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Abertura Temporária
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Ver Hub
 ,Employee Leave Balance,Balanço de Licenças do Funcionário
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},O Saldo da Conta {0} deve ser sempre {1}
 DocType: Patient Appointment,More Info,Mais informações
@@ -1431,13 +1462,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,A Ordem de Vendas {0} não é válida
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Avise o novo pedido de citações
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,As ordens de compra ajudá-lo a planejar e acompanhar suas compras
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Desculpe, mas as empresas não podem ser unidas"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Desculpe, mas as empresas não podem ser unidas"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Prescrições de teste de laboratório
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",A quantidade total da Emissão / Transferência {0} no Pedido de Material {1} \ não pode ser maior do que a quantidade pedida {2} para o Item {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Pequeno
 DocType: Employee,Employee Number,Número de Funcionário/a
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},O Processo Nr. (s) já está a ser utilizado. Tente a partir do Processo Nr. {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},O Processo Nr. (s) já está a ser utilizado. Tente a partir do Processo Nr. {0}
 DocType: Project,% Completed,% Concluído
 ,Invoiced Amount (Exculsive Tax),Montante Faturado (Taxa Exclusiva)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Item 2
@@ -1452,11 +1483,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Despesas Indiretas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Linha {0}: É obrigatório colocar a qtd
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sincronização de Def. de Dados
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sincronização de Def. de Dados
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Os seus Produtos ou Serviços
 DocType: Special Test Items,Special Test Items,Itens de teste especiais
 DocType: Mode of Payment,Mode of Payment,Modo de Pagamento
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,O Website de Imagem deve ser um ficheiro público ou um URL de website
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,O Website de Imagem deve ser um ficheiro público ou um URL de website
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,LDM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Este é um item principal e não pode ser editado.
@@ -1464,24 +1495,23 @@
 DocType: Vehicle,Fuel UOM,UNID de Combust.
 DocType: Warehouse,Warehouse Contact Info,Informações de Contacto do Armazém
 DocType: Payment Entry,Write Off Difference Amount,Liquidar Montante de Diferença
-DocType: Purchase Invoice,Recurring Type,Tipo Recorrente
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: Não foi encontrado o email do funcionário, portanto, o email  não será enviado"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: Não foi encontrado o email do funcionário, portanto, o email  não será enviado"
 DocType: Item,Foreign Trade Details,Detalhes Comércio Exterior
+,Assessment Plan Status,Status do plano de avaliação
 DocType: Email Digest,Annual Income,Rendimento Anual
 DocType: Serial No,Serial No Details,Dados de Nr. de Série
 DocType: Purchase Invoice Item,Item Tax Rate,Taxa Fiscal do Item
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,Selecione Médico e Data
 DocType: Student Group Student,Group Roll Number,Número de rolo de grupo
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Para {0}, só podem ser ligadas contas de crédito noutro registo de débito"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,O total de todos os pesos da tarefa deve ser 1. Por favor ajuste os pesos de todas as tarefas do Projeto em conformidade
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,A Guia de Remessa {0} não foi enviada
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,O total de todos os pesos da tarefa deve ser 1. Por favor ajuste os pesos de todas as tarefas do Projeto em conformidade
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,A Guia de Remessa {0} não foi enviada
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,O Item {0} deve ser um Item Subcontratado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Bens de Equipamentos
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","A Regra de Fixação de Preços é selecionada primeiro com base no campo ""Aplicar Em"", que pode ser um Item, Grupo de Itens ou Marca."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Defina primeiro o código do item
-DocType: Hub Settings,Seller Website,Website do Vendedor
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Defina primeiro o código do item
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,A percentagem total atribuída à equipa de vendas deve ser de 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,A percentagem total atribuída à equipa de vendas deve ser de 100
 DocType: Sales Invoice Item,Edit Description,Editar Descrição
 DocType: Antibiotic,Antibiotic,Antibiótico
 ,Team Updates,equipe Updates
@@ -1502,12 +1532,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Total (Moeda da Empresa)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,O número de série {0} foi introduzido mais do que uma vez
 DocType: Depreciation Schedule,Journal Entry,Lançamento Contabilístico
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} itens em progresso
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} itens em progresso
 DocType: Workstation,Workstation Name,Nome do Posto de Trabalho
 DocType: Grading Scale Interval,Grade Code,Classe de Código
 DocType: POS Item Group,POS Item Group,Grupo de Itens POS
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email de Resumo:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},A LDM {0} não pertence ao Item {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},A LDM {0} não pertence ao Item {1}
 DocType: Sales Partner,Target Distribution,Objetivo de Distribuição
 DocType: Salary Slip,Bank Account No.,Conta Bancária Nr.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Este é o número da última transacção criada com este prefixo
@@ -1524,10 +1554,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Solicitação de Cotação de Fornecedor
 DocType: Healthcare Settings,Registration Message,Mensagem de registro
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Hardware
-DocType: Sales Order,Recurring Upto,Recorrente Até
 DocType: Prescription Dosage,Prescription Dosage,Dosagem de Prescrição
 DocType: Attendance,HR Manager,Gestor de RH
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,"Por favor, selecione uma Empresa"
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,"Por favor, selecione uma Empresa"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Licença Especial
 DocType: Purchase Invoice,Supplier Invoice Date,Data de Fatura de Fornecedor
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,por
@@ -1543,10 +1572,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Foram encontradas condições sobrepostas entre:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,O Lançamento Contabilístico {0} já está relacionado com outro voucher
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Valor Total do Pedido
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Comida
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Comida
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Faixa de Idade 3
 DocType: Maintenance Schedule Item,No of Visits,Nº de Visitas
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},O Cronograma de Manutenção {0} existe contra {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Deseja publicar seus itens no Hub?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,estudante de inscrição
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},A Moeda da Conta de Encerramento deve ser {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},A soma dos pontos para todos os objetivos deve ser 100. É {0}
@@ -1557,9 +1587,9 @@
 DocType: Authorization Rule,Average Discount,Desconto Médio
 DocType: Purchase Invoice Item,UOM,UNID
 DocType: Rename Tool,Utilities,Utilitários
-DocType: Purchase Invoice Item,Accounting,Contabilidade
+DocType: POS Profile,Accounting,Contabilidade
 DocType: Employee,EMP/,EMP/
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Selecione lotes para itens em lotes
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Selecione lotes para itens em lotes
 DocType: Asset,Depreciation Schedules,Cronogramas de Depreciação
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,O período do pedido não pode estar fora do período de atribuição de licença
 DocType: Activity Cost,Projects,Projetos
@@ -1575,7 +1605,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',"O Estado de Aprovação deve ser ""Aprovado"" ou ""Rejeitado"""
 DocType: Physician,Contacts and Address,Contatos e endereço
 DocType: Purchase Invoice,Contact Person,Contactar Pessoa
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"A ""Data de Início Esperada"" não pode ser mais recente que a ""Data de Término Esperada"""
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"A ""Data de Início Esperada"" não pode ser mais recente que a ""Data de Término Esperada"""
 DocType: Course Scheduling Tool,Course End Date,Data de Término do Curso
 DocType: Holiday List,Holidays,Férias
 DocType: Sales Order Item,Planned Quantity,Quantidade Planeada
@@ -1583,10 +1613,11 @@
 DocType: Item,Maintain Stock,Manter Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,O Registo de Stock já foi criado para o Pedido de Produção
 DocType: Employee,Prefered Email,Email Preferido
+DocType: Student Admission,Eligibility and Details,Elegibilidade e detalhes
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Variação Líquida no Ativo Imobilizado
 DocType: Leave Control Panel,Leave blank if considered for all designations,Deixe em branco se for para todas as designações
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"A cobrança do tipo ""Real"" na linha {0} não pode ser incluída no preço do Item"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Máx.: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Máx.: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Data e Hora De
 DocType: Email Digest,For Company,Para a Empresa
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Registo de comunicação.
@@ -1594,19 +1625,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Variável de pontuação do Scorecard do fornecedor
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Montante de Compra
 DocType: Sales Invoice,Shipping Address Name,Nome de Endereço de Envio
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Plano de Contas
 DocType: Material Request,Terms and Conditions Content,Conteúdo de Termos e Condições
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,não pode ser maior do que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,O Item {0} não é um item de stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,O Item {0} não é um item de stock
 DocType: Maintenance Visit,Unscheduled,Sem Marcação
 DocType: Employee,Owned,Pertencente
 DocType: Salary Detail,Depends on Leave Without Pay,Depende da Licença Sem Vencimento
 DocType: Pricing Rule,"Higher the number, higher the priority","Quanto maior o número, maior a prioridade"
 ,Purchase Invoice Trends,Tendências de Fatura de Compra
 DocType: Employee,Better Prospects,Melhores Perspetivas
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Linha # {0}: O lote {1} tem apenas {2} qty. Selecione outro lote com {3} qty disponível ou dividido a linha em várias linhas, para entregar / emitir de vários lotes"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Linha # {0}: O lote {1} tem apenas {2} qty. Selecione outro lote com {3} qty disponível ou dividido a linha em várias linhas, para entregar / emitir de vários lotes"
 DocType: Vehicle,License Plate,Matrícula
 DocType: Appraisal,Goals,Objetivos
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Selecione o perfil POS
 DocType: Warranty Claim,Warranty / AMC Status,Garantia / Estado CMA
 ,Accounts Browser,Navegador de Contas
 DocType: Payment Entry Reference,Payment Entry Reference,Referência de Registo de Pagamento
@@ -1625,7 +1656,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,O Funcionário não pode reportar-se a si mesmo.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Se a conta está congelada, só são permitidos registos a utilizadores restritos."
 DocType: Email Digest,Bank Balance,Saldo Bancário
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},O Lançamento Contabilístico para {0}: {1} só pode ser criado na moeda: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},O Lançamento Contabilístico para {0}: {1} só pode ser criado na moeda: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil de emprego, qualificações exigidas, etc."
 DocType: Journal Entry Account,Account Balance,Saldo da Conta
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Regra de Impostos para transações.
@@ -1634,8 +1665,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total de Impostos e Taxas (Moeda da Empresa)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Mostrar saldos P&L de ano fiscal não encerrado
 DocType: Lab Test Template,Collection Details,Detalhes da coleção
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","selecione cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct, `tabLab Prescription` cp onde ct.patient = &#39;{0}&#39; e cp.parent = ct. nome e cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Conta de Envio
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: A Conta {2} está inativa
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Faça Ordens de vendas para ajudar a planear o seu trabalho e entregar dentro do prazo
@@ -1652,7 +1681,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Nota Fiscal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Alugar Escritório
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Configurar definições de portal de SMS
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Falha ao Importar!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Falha ao Importar!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Ainda não foi adicionado nenhum endereço.
 DocType: Workstation Working Hour,Workstation Working Hour,Horário de Posto de Trabalho
 DocType: Vital Signs,Blood Pressure,Pressão sanguínea
@@ -1677,7 +1706,7 @@
 DocType: Sales Invoice,Source,Fonte
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mostrar encerrado
 DocType: Leave Type,Is Leave Without Pay,É uma Licença Sem Vencimento
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,É obrigatório colocar a Categoria Ativo para um item de Ativo Imobilizado
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,É obrigatório colocar a Categoria Ativo para um item de Ativo Imobilizado
 DocType: Fee Validity,Fee Validity,Validade da tarifa
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Não foram encontrados nenhuns registos na tabela Pagamento
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Este/a {0} entra em conflito com {1} por {2} {3}
@@ -1698,8 +1727,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Recrutamento de Executivos
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Criar Leads
 DocType: Maintenance Schedule,Schedules,Horários
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,Perfil de POS é necessário para usar o ponto de venda
 DocType: Purchase Invoice Item,Net Amount,Valor Líquido
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} não foi enviado para que a ação não possa ser concluída
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} não foi enviado para que a ação não possa ser concluída
 DocType: Purchase Order Item Supplied,BOM Detail No,Nº de Dados da LDM
 DocType: Landed Cost Voucher,Additional Charges,Despesas adicionais
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Quantia de Desconto Adicional (Moeda da Empresa)
@@ -1708,7 +1738,7 @@
 ,Support Hour Distribution,Distribuição de horas de suporte
 DocType: Maintenance Visit,Maintenance Visit,Visita de Manutenção
 DocType: Student,Leaving Certificate Number,Deixando Número do Certificado
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Compromisso cancelado, reveja e cancele a fatura {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Compromisso cancelado, reveja e cancele a fatura {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Qtd de Lote Disponível no Armazém
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Atualização do Formato de Impressão
 DocType: Landed Cost Voucher,Landed Cost Help,Ajuda do Custo de Entrega
@@ -1731,8 +1761,8 @@
 DocType: Patient,Tobacco Past Use,Uso passado do tabaco
 DocType: Sales Invoice Item,Brand Name,Nome da Marca
 DocType: Purchase Receipt,Transporter Details,Dados da Transportadora
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},O usuário {0} já foi atribuído ao médico {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,É necessário colocar o armazém padrão para o item selecionado
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},O usuário {0} já foi atribuído ao médico {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,É necessário colocar o armazém padrão para o item selecionado
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Caixa
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,Fornecedor possível
 DocType: Budget,Monthly Distribution,Distribuição Mensal
@@ -1742,8 +1772,8 @@
 DocType: Sales Partner,Sales Partner Target,Objetivo de Parceiro de Vendas
 DocType: Loan Type,Maximum Loan Amount,Montante máximo do empréstimo
 DocType: Pricing Rule,Pricing Rule,Regra de Fixação de Preços
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Número de rolo duplicado para o estudante {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Número de rolo duplicado para o estudante {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Número de rolo duplicado para o estudante {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Número de rolo duplicado para o estudante {0}
 DocType: Budget,Action if Annual Budget Exceeded,Medidas caso o Orçamento Anual seja Excedido
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Pedido de Material para Ordem de Compra
 DocType: Shopping Cart Settings,Payment Success URL,URL de Sucesso de Pagamento
@@ -1760,7 +1790,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} só deve aparecer uma vez
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Não é permitido transferir mais {0} que {1} para a Ordem de Compra {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Licenças Atribuídas Com Sucesso para {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Sem Itens para embalar
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Sem Itens para embalar
 DocType: Shipping Rule Condition,From Value,Valor De
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,É obrigatório colocar a Quantidade de Fabrico
 DocType: Employee Loan,Repayment Method,Método de reembolso
@@ -1774,6 +1804,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Responsabilidades de Stock
 DocType: Purchase Invoice,Supplier Warehouse,Armazém Fornecedor
 DocType: Opportunity,Contact Mobile No,Nº de Telemóvel de Contacto
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Selecione Empresa
 ,Material Requests for which Supplier Quotations are not created,As Solicitações de Material cujas Cotações de Fornecedor não foram criadas
 DocType: Student Group,Set 0 for no limit,Defina 0 para sem limite
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,O(s) dia(s) em que está a solicitar a licença são feriados. Não necessita solicitar uma licença.
@@ -1783,24 +1814,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Faça Cotação
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Outros Relatórios
 DocType: Dependent Task,Dependent Task,Tarefa Dependente
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},O fator de conversão da unidade de medida padrão deve ser 1 na linha {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},O fator de conversão da unidade de medida padrão deve ser 1 na linha {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},A licença do tipo {0} não pode ser mais longa do que {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Tente planear operações para X dias de antecedência.
 DocType: HR Settings,Stop Birthday Reminders,Parar Lembretes de Aniversário
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Por favor definir Payroll Conta a Pagar padrão in Company {0}
 DocType: SMS Center,Receiver List,Lista de Destinatários
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Pesquisar Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Pesquisar Item
 DocType: Patient Appointment,Referring Physician,Médico referente
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Montante Consumido
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Variação Líquida na Caixa
 DocType: Assessment Plan,Grading Scale,Escala de classificação
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,A Unidade de Medida {0} foi inserido mais do que uma vez na Tabela de Conversão de Fatores
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,Já foi concluído
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,A Unidade de Medida {0} foi inserido mais do que uma vez na Tabela de Conversão de Fatores
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,Já foi concluído
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Estoque na mão
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},A Solicitação de Pagamento {0} já existe
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Custo dos Itens Emitidos
 DocType: Physician,Hospital,Hospital
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},A quantidade não deve ser superior a {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},A quantidade não deve ser superior a {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,O Ano Fiscal Anterior não está encerrado
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Idade (Dias)
 DocType: Quotation Item,Quotation Item,Item de Cotação
@@ -1811,8 +1842,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Definidor de Tipo de Fornecedor.
 DocType: Purchase Order Item,Supplier Part Number,Número de Peça de Fornecedor
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,A taxa de conversão não pode ser 0 ou 1
-DocType: Sales Invoice,Reference Document,Documento de Referência
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} foi cancelado ou interrompido
+DocType: Subscription,Reference Document,Documento de Referência
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} foi cancelado ou interrompido
 DocType: Accounts Settings,Credit Controller,Controlador de Crédito
 DocType: Delivery Note,Vehicle Dispatch Date,Datade Expedição do Veículo
 DocType: Healthcare Settings,Default Medical Code Standard,Padrão do Código Médico Padrão
@@ -1821,6 +1852,7 @@
 DocType: Company,Default Payable Account,Conta a Pagar Padrão
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","As definições para carrinho de compras online, tais como as regras de navegação, lista de preços, etc."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Faturado
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Classificar por Preço ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Qtd Reservada
 DocType: Party Account,Party Account,Conta da Parte
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Recursos Humanos
@@ -1832,13 +1864,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Faça Desembolso Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Linha {0}: O Avanço do Fornecedor deve ser um débito
 DocType: Company,Default Values,Valores Padrão
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequency} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Frequency} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Montante Total Reembolsado
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Isto é baseado em registos deste veículo. Veja o cronograma abaixo para obter mais detalhes
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Na Fatura de Fornecedor {0} datada de {1}
 DocType: Customer,Default Price List,Lista de Preços Padrão
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Foi criado o registo do Movimento do Ativo {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Não pode eliminar o Ano Fiscal de {0}. O Ano Fiscal de {0} está definido como padrão nas Definições Gerais
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Um cliente com o mesmo nome já existe
 DocType: Journal Entry,Entry Type,Tipo de Registo
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Nenhum plano de avaliação vinculado a este grupo de avaliação
 ,Customer Credit Balance,Saldo de Crédito de Cliente
@@ -1849,7 +1882,7 @@
 DocType: Quotation,Term Details,Dados de Término
 DocType: Project,Total Sales Cost (via Sales Order),Custo total de vendas (via ordem do cliente)
 DocType: Project,Total Sales Cost (via Sales Order),Custo total de vendas (via ordem do cliente)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Não pode inscrever mais de {0} estudantes neste grupo de alunos.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Não pode inscrever mais de {0} estudantes neste grupo de alunos.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Contagem de leads
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Contagem de leads
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} tem de ser maior do que 0
@@ -1867,9 +1900,11 @@
 DocType: Lab Test,Technician Name,Nome do Técnico
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Desvincular Pagamento no Cancelamento da Fatura
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},A leitura do Conta-quilómetros atual deve ser superior à leitura inicial do Conta-quilómetros {0}
+DocType: Restaurant Reservation,No Show,No Show
 DocType: Shipping Rule Country,Shipping Rule Country,País de Regra de Envio
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Licenças e Assiduidade
 DocType: Maintenance Visit,Partially Completed,Parcialmente Concluído
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Sensibilidade moderada
 DocType: Leave Type,Include holidays within leaves as leaves,Incluir as férias nas licenças como licenças
 DocType: Sales Invoice,Packed Items,Itens Embalados
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Reclamação de Garantia em Nr. de Série.
@@ -1886,13 +1921,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Montante Pago (Moeda da Empresa)
 DocType: Purchase Invoice,Additional Discount,Desconto Adicional
 DocType: Selling Settings,Selling Settings,Definições de Vendas
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Confirmar ação
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Leilões Online
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Por favor, especifique a Quantidade e/ou Taxa de Valorização"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Cumprimento
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Ver Carrinho
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Despesas de Marketing
 ,Item Shortage Report,Comunicação de Falta de Item
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Foi mencionado um Peso,\n Por favor, mencione também a ""UNID de Peso"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Foi mencionado um Peso,\n Por favor, mencione também a ""UNID de Peso"""
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,A Solicitação de Material utilizada para efetuar este Registo de Stock
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,É obrigatório colocar a Próxima Data de Depreciação em novos ativos
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Grupo separado baseado em cursos para cada lote
@@ -1905,12 +1941,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Efetue um Registo Contabilístico Para Cada Movimento de Stock
 DocType: Leave Allocation,Total Leaves Allocated,Licenças Totais Atribuídas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},É necessário colocar o Armazém na Linha Nr. {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,"Por favor, insira as datas de Início e Término do Ano Fiscal"
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,"Por favor, insira as datas de Início e Término do Ano Fiscal"
 DocType: Employee,Date Of Retirement,Data de Reforma
 DocType: Upload Attendance,Get Template,Obter Modelo
 DocType: Material Request,Transferred,Transferido
 DocType: Vehicle,Doors,Portas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,Instalação de ERPNext Concluída!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,Instalação de ERPNext Concluída!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Taxa de Recolha para Registro de Pacientes
 DocType: Course Assessment Criteria,Weightage,Peso
 DocType: Purchase Invoice,Tax Breakup,Desagregação de impostos
@@ -1929,37 +1965,37 @@
 DocType: Employee,AB+,AB+
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Se este item tem variantes, então ele não pode ser selecionado nas Ordens de venda etc."
 DocType: Lead,Next Contact By,Próximo Contacto Por
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},A quantidade necessária para o item {0} na linha {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},A quantidade necessária para o item {0} na linha {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Armazém {0} não pode ser excluído como existe quantidade para item {1}
 DocType: Quotation,Order Type,Tipo de Pedido
-DocType: Purchase Invoice,Notification Email Address,Endereço de Email de Notificação
 ,Item-wise Sales Register,Registo de Vendas de Item Inteligente
 DocType: Asset,Gross Purchase Amount,Montante de Compra Bruto
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Balanços de abertura
 DocType: Asset,Depreciation Method,Método de Depreciação
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Off-line
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Off-line
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Esta Taxa está incluída na Taxa Básica?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Alvo total
 DocType: Job Applicant,Applicant for a Job,Candidato a um Emprego
 DocType: Production Plan Material Request,Production Plan Material Request,Solicitação de Material de Plano de Produção
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Não foram criadas Ordens de Produção
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Não foram criadas Ordens de Produção
 DocType: Stock Reconciliation,Reconciliation JSON,Conciliação JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Muitas colunas. Exportar o relatório e imprimi-lo usando um aplicativo de planilha.
 DocType: Purchase Invoice Item,Batch No,Nº de Lote
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Pedido de cotação: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permitir várias Ordens de Venda relacionadas a mesma Ordem de Compra do Cliente
 DocType: Student Group Instructor,Student Group Instructor,Instrutor de Grupo de Estudantes
 DocType: Student Group Instructor,Student Group Instructor,Instrutor de Grupo de Estudantes
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 móvel Não
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Principal
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Definir prefixo para numeração de série em suas transações
 DocType: Employee Attendance Tool,Employees HTML,HTML de Funcionários
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,A LDM Padrão ({0}) deve estar ativa para este item ou para o seu modelo
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,A LDM Padrão ({0}) deve estar ativa para este item ou para o seu modelo
 DocType: Employee,Leave Encashed?,Sair de Pagos?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,É obrigatório colocar o campo Oportunidade De
 DocType: Email Digest,Annual Expenses,Despesas anuais
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Criar Ordem de Compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Criar Ordem de Compra
 DocType: SMS Center,Send To,Enviar para
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Não há o suficiente equilíbrio pela licença Tipo {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Montante alocado
@@ -1977,6 +2013,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Grupo de Estudantes Força
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,No Lançamento Contábil {0} não possui qualquer registo {1} ímpar
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Avaliações
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Eventos de treinamento
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Foi inserido um Nº de Série em duplicado para o Item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Uma condição para uma Regra de Envio
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,"Por favor, insira"
@@ -1986,7 +2023,7 @@
 DocType: Sales Order,To Deliver and Bill,Para Entregar e Cobrar
 DocType: Student Group,Instructors,instrutores
 DocType: GL Entry,Credit Amount in Account Currency,Montante de Crédito na Moeda da Conta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,A LDM {0} deve ser enviada
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,A LDM {0} deve ser enviada
 DocType: Authorization Control,Authorization Control,Controlo de Autorização
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Linha #{0}:  É obrigatório colocar o Armazém Rejeitado no Item Rejeitado {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Pagamento
@@ -2005,11 +2042,11 @@
 DocType: Quotation Item,Actual Qty,Qtd Efetiva
 DocType: Sales Invoice Item,References,Referências
 DocType: Quality Inspection Reading,Reading 10,Leitura 10
-DocType: Hub Settings,Hub Node,Nó da Plataforma
+DocType: Hub Category,Hub Node,Nó da Plataforma
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Inseriu itens duplicados. Por favor retifique esta situação, e tente novamente."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Sócio
 DocType: Asset Movement,Asset Movement,Movimento de Ativo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,New Cart
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,New Cart
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,O Item {0} não é um item de série
 DocType: SMS Center,Create Receiver List,Criar Lista de Destinatários
 DocType: Vehicle,Wheels,Rodas
@@ -2023,15 +2060,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicações
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que o pacote é uma parte desta entrega (Só no Rascunho)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Efetuar Registo de Pagamento
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},A Quantidade do Item {0} deve ser inferior a {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},A Quantidade do Item {0} deve ser inferior a {1}
 ,Sales Invoice Trends,Tendências de Fatura de Vendas
 DocType: Leave Application,Apply / Approve Leaves,Aplicar / Aprovar Licenças
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Para
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Para
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Só pode referir a linha se o tipo de cobrança for ""No Montante da Linha Anterior"" ou ""Total de Linha Anterior"""
 DocType: Sales Order Item,Delivery Warehouse,Armazém de Entrega
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Esquema de Centros de Custo financeiro.
 DocType: Serial No,Delivery Document No,Nr. de Documento de Entrega
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},"Por favor, defina a ""Conta de Ganhos/Perdas na Eliminação de Ativos"" na Empresa {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},"Por favor, defina a ""Conta de Ganhos/Perdas na Eliminação de Ativos"" na Empresa {0}"
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Obter Itens de Recibos de Compra
 DocType: Serial No,Creation Date,Data de Criação
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},O Item {0} aparece várias vezes na Lista de Preços {1}
@@ -2042,12 +2079,13 @@
 DocType: Student,Student Mobile Number,Número de telemóvel do Estudante
 DocType: Item,Has Variants,Tem Variantes
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Atualizar Resposta
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Já selecionou itens de {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Já selecionou itens de {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nome da Distribuição Mensal
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,O ID do lote é obrigatório
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,O ID do lote é obrigatório
 DocType: Sales Person,Parent Sales Person,Vendedor Principal
-DocType: Purchase Invoice,Recurring Invoice,Fatura Recorrente
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Decrescente
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Selecione primeiro o programa
 DocType: Patient Appointment,Patient Age,Idade do Paciente
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Gestão de Projetos
 DocType: Supplier,Supplier of Goods or Services.,Fornecedor de Bens ou Serviços.
@@ -2055,8 +2093,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Contas de recebimento por defeito a serem usadas se não estiver configurada no Paciente para reservar taxas de Consulta.
 DocType: Vehicle Log,Fuel Price,Preço de Combustível
 DocType: Budget,Budget,Orçamento
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Set Open
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,O Item Ativo Imobilizado deve ser um item não inventariado.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Set Open
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,O Item Ativo Imobilizado deve ser um item não inventariado.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","O Orçamento não pode ser atribuído a {0}, pois não é uma conta de Rendimentos ou Despesas"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Alcançados
 DocType: Student Admission,Application Form Route,Percurso de Formulário de Candidatura
@@ -2070,12 +2108,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,O Item {0} não está configurado para os Nrs. de série. Verifique o definidor de Item
 DocType: Maintenance Visit,Maintenance Time,Tempo de Manutenção
 ,Amount to Deliver,Montante a Entregar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},O mesmo item foi inserido várias vezes. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"O Prazo da Data de Início não pode ser antes da Data de Início do Ano Letivo com o qual o termo está vinculado (Ano Lectivo {}). Por favor, corrija as datas e tente novamente."
 DocType: Guardian,Guardian Interests,guardião Interesses
 DocType: Naming Series,Current Value,Valor Atual
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Existem diversos anos fiscais para a data {0}. Por favor, defina a empresa nesse Ano Fiscal"
 DocType: School Settings,Instructor Records to be created by,Registros de instrutor a serem criados por
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} criado
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} criado
 DocType: Delivery Note Item,Against Sales Order,Na Ordem de Venda
 ,Serial No Status,Estado do Nr. de Série
 DocType: Payment Entry Reference,Outstanding,Excelente
@@ -2086,10 +2125,10 @@
  e a data para deve superior ou igual a {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Esta baseia-se no movimento de stock. Veja {0} para obter mais detalhes
 DocType: Pricing Rule,Selling,Vendas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Montante {0} {1} deduzido em {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Montante {0} {1} deduzido em {2}
 DocType: Employee,Salary Information,Informação salarial
 DocType: Sales Person,Name and Employee ID,Nome e ID do Funcionário
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,A Data de Vencimento não pode ser anterior à Data de Lançamento
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,A Data de Vencimento não pode ser anterior à Data de Lançamento
 DocType: Website Item Group,Website Item Group,Website de Grupo de Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Impostos e Taxas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Por favor, insira a Data de referência"
@@ -2115,7 +2154,7 @@
 DocType: Issue,Resolution Details,Dados de Resolução
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Atribuições
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Critérios de Aceitação
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Por favor, insira as Solicitações de Materiais na tabela acima"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,"Por favor, insira as Solicitações de Materiais na tabela acima"
 DocType: Item Attribute,Attribute Name,Nome do Atributo
 DocType: BOM,Show In Website,Mostrar No Website
 DocType: Shopping Cart Settings,Show Quantity in Website,Mostrar Quantidade em site
@@ -2124,7 +2163,7 @@
 DocType: Item Reorder,Check in (group),Check-in (grupo)
 ,Qty to Order,Qtd a Encomendar
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","O título de conta sob Passivo ou Capital Próprio, no qual o Lucro / Prejuízo será escrito"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Gantt de todas as tarefas.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Gantt de todas as tarefas.
 DocType: Opportunity,Mins to First Response,Minutos para a Primeira Resposta
 DocType: Pricing Rule,Margin Type,Tipo de Margem
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} horas
@@ -2146,36 +2185,36 @@
 DocType: Patient,Surgical History,História cirúrgica
 DocType: Employee,Resignation Letter Date,Data de Carta de Demissão
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,As Regras de Fixação de Preços são filtradas adicionalmente com base na quantidade.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Defina a data de início da sessão para o empregado {0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Defina a data de início da sessão para o empregado {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Defina a data de início da sessão para o empregado {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Defina a data de início da sessão para o empregado {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Montante de Faturação Total (através da Folha de Presenças)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Rendimento de Cliente Fiel
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) deve ter a função de 'Aprovador de Despesas'
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Par
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Selecione BOM e Qtde de Produção
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Selecione BOM e Qtde de Produção
 DocType: Asset,Depreciation Schedule,Cronograma de Depreciação
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Endereços e contatos do parceiro de vendas
 DocType: Bank Reconciliation Detail,Against Account,Na Conta
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Metade Data Day deve estar entre De Data e To Date
 DocType: Maintenance Schedule Detail,Actual Date,Data Real
 DocType: Item,Has Batch No,Tem Nr. de Lote
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Faturação Anual: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Faturação Anual: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Imposto sobre bens e serviços (GST Índia)
 DocType: Delivery Note,Excise Page Number,Número de Página de Imposto Especial
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","É obrigatória a Empresa, da Data De à Data Para"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Obter da Consulta
 DocType: Asset,Purchase Date,Data de Compra
 DocType: Employee,Personal Details,Dados Pessoais
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},"Por favor, defina o ""Centro de Custos de Depreciação de Ativos"" na Empresa {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},"Por favor, defina o ""Centro de Custos de Depreciação de Ativos"" na Empresa {0}"
 ,Maintenance Schedules,Cronogramas de Manutenção
 DocType: Task,Actual End Date (via Time Sheet),Data de Término Efetiva (através da Folha de Presenças)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Quantidade {0} {1} em {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Quantidade {0} {1} em {2} {3}
 ,Quotation Trends,Tendências de Cotação
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},O Grupo do Item não foi mencionado no definidor de item para o item {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,A conta de Débito Para deve ser uma conta A Receber
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,A conta de Débito Para deve ser uma conta A Receber
 DocType: Shipping Rule Condition,Shipping Amount,Montante de Envio
 DocType: Supplier Scorecard Period,Period Score,Pontuação do período
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Adicionar clientes
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Adicionar clientes
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Montante Pendente
 DocType: Lab Test Template,Special,Especial
 DocType: Purchase Invoice Item,Conversion Factor,Fator de Conversão
@@ -2183,13 +2222,14 @@
 ,Vehicle Expenses,Despesas de Veículos
 DocType: Serial No,Invoice Details,Detalhes da fatura
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},O valor previsto após a vida útil deve ser maior ou igual a {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Comece em
+DocType: Hub Category,Hub Category,Categoria Hub
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Número de Veículos
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,A data em que fatura recorrente parará
 DocType: Employee Loan,Loan Amount,Montante do empréstimo
 DocType: Program Enrollment,Self-Driving Vehicle,Veículo de auto-condução
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Scorecard do fornecedor em pé
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Row {0}: Bill of Materials não encontrado para o item {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Row {0}: Bill of Materials não encontrado para o item {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,O total de licenças atribuídas {0} não pode ser menor do que as licenças já aprovados {1} para o período
 DocType: Journal Entry,Accounts Receivable,Contas a Receber
 ,Supplier-Wise Sales Analytics,Análise de Vendas por Fornecedor
@@ -2201,7 +2241,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Curso para Pais (Deixe em branco, se este não é parte do Curso para Pais)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Deixe em branco se for para todos os tipos de funcionários
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir Cobranças com Base Em
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Registo de Horas
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Registo de Horas
 DocType: HR Settings,HR Settings,Definições de RH
 DocType: Salary Slip,net pay info,Informações net pay
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Esse valor é atualizado na Lista de Preços de Vendas Padrão.
@@ -2212,7 +2252,7 @@
 DocType: Patient,B Positive,B Positivo
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Linha #{0}: A qtd deve ser 1, pois o item é um ativo imobilizado. Por favor, utilize uma linha separada para diversas qtds."
 DocType: Leave Block List Allow,Leave Block List Allow,Permissão de Lista de Bloqueio de Licenças
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,A Abr. não pode estar em branco ou conter espaços em branco
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,A Abr. não pode estar em branco ou conter espaços em branco
 DocType: Patient Medical Record,Patient Medical Record,Registro Médico do Paciente
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Grupo a Fora do Grupo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Desportos
@@ -2229,9 +2269,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Não é possível encontrar a taxa de câmbio para {0} a {1} para a data-chave {2}. Crie um registro de troca de moeda manualmente
 DocType: POS Profile,Price List,Lista de Preços
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} é agora o Ano Fiscal padrão. Por favor, atualize o seu navegador para a alteração poder ser efetuada."
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Reembolsos de Despesas
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Reembolsos de Despesas
 DocType: Issue,Support,Apoiar
 ,BOM Search,Pesquisa da LDM
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Publicar &quot;Em estoque&quot; ou &quot;Não disponível&quot; no Hub com base nas ações disponíveis neste armazém.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),A Fechar (Abertura + Totais)
 DocType: Vehicle,Fuel Type,Tipo de Comb.
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Por favor, especifique a moeda na Empresa"
@@ -2243,16 +2284,16 @@
 DocType: Healthcare Settings,Remind Before,Lembre-se antes
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},É necessário colocar o fator de Conversão de UNID na linha {0}
 DocType: Production Plan Item,material_request_item,item_de_solicitação_de_material
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Linha #{0}: O tipo de documento referênciado deve ser umas Ordem de Venda, uma Fatura de Venda ou um Lançamento Contabilístico"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Linha #{0}: O tipo de documento referênciado deve ser umas Ordem de Venda, uma Fatura de Venda ou um Lançamento Contabilístico"
 DocType: Salary Component,Deduction,Dedução
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Linha {0}: É obrigatório colocar a Periodicidade.
 DocType: Stock Reconciliation Item,Amount Difference,Diferença de Montante
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},O Preço de Item foi adicionada a {0} na Lista de Preços {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},O Preço de Item foi adicionada a {0} na Lista de Preços {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Por favor, insira a ID de Funcionário deste(a) vendedor(a)"
 DocType: Territory,Classification of Customers by region,Classificação dos Clientes por Região
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,O Montante de Diferença deve ser zero
 DocType: Project,Gross Margin,Margem Bruta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,"Por favor, insira primeiro o Item de Produção"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,"Por favor, insira primeiro o Item de Produção"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Saldo de de Extrato Bancário calculado
 DocType: Normal Test Template,Normal Test Template,Modelo de teste normal
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,utilizador desativado
@@ -2262,21 +2303,22 @@
 DocType: Salary Slip,Total Deduction,Total de Reduções
 ,Production Analytics,Analytics produção
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Isso é baseado em transações contra este Paciente. Veja a linha de tempo abaixo para detalhes
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Custo Atualizado
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Custo Atualizado
 DocType: Employee,Date of Birth,Data de Nascimento
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,O Item {0} já foi devolvido
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,O **Ano Fiscal** representa um Ano de Exercício Financeiro. Todos os lançamentos contabilísticos e outras transações principais são controladas no **Ano Fiscal**.
 DocType: Opportunity,Customer / Lead Address,Endereço de Cliente / Potencial Cliente
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Configuração do Scorecard Fornecedor
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Aviso: Certificado SSL inválido no anexo {0}
-DocType: Student Admission,Eligibility,Elegibilidade
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Nome do Plano de Avaliação
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Aviso: Certificado SSL inválido no anexo {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Leads ajudá-lo a começar o negócio, adicione todos os seus contatos e mais como suas ligações"
 DocType: Production Order Operation,Actual Operation Time,Tempo Operacional Efetivo
 DocType: Authorization Rule,Applicable To (User),Aplicável Ao/À (Utilizador/a)
 DocType: Purchase Taxes and Charges,Deduct,Deduzir
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Descrição do Emprego
 DocType: Student Applicant,Applied,Aplicado
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Novamento aberto
 DocType: Sales Invoice Item,Qty as per Stock UOM,Qtd como UNID de Stock
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Nome Guardian2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Não são permitido Caracteres especiais na série de atribuição de nomes, exceto ""-"" ""."", ""#"", e ""/"""
@@ -2288,7 +2330,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Gestor de Fabrico
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},O Nr. de Série {0} está na garantia até {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Dividir a Guia de Remessa em pacotes.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Envios
+apps/erpnext/erpnext/hooks.py +107,Shipments,Envios
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Montante Alocado Total (Moeda da Empresa)
 DocType: Purchase Order Item,To be delivered to customer,A ser entregue ao cliente
 DocType: BOM,Scrap Material Cost,Custo de Material de Sucata
@@ -2311,8 +2353,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Configurações da Variante de Item
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Selecionar Empresa...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Deixe em branco se for para todos os departamentos
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tipos de emprego (permanente, a contrato, estagiário, etc.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} é obrigatório para o Item {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Tipos de emprego (permanente, a contrato, estagiário, etc.)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} é obrigatório para o Item {1}
 DocType: Process Payroll,Fortnightly,Quinzenal
 DocType: Currency Exchange,From Currency,De Moeda
 DocType: Vital Signs,Weight (In Kilogram),Peso (em quilograma)
@@ -2337,7 +2379,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Por favor, clique em 'Gerar Cronograma' para obter o cronograma"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Ocorreram erros durante a exclusão seguintes horários:
 DocType: Bin,Ordered Quantity,Quantidade Pedida
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","ex: ""Ferramentas de construção para construtores"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","ex: ""Ferramentas de construção para construtores"""
 DocType: Grading Scale,Grading Scale Intervals,Intervalos de classificação na grelha
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: O Registo Contabilístico para {2} só pode ser efetuado na moeda: {3}
 DocType: Production Order,In Process,A Decorrer
@@ -2361,11 +2403,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Com Pagamento de Imposto
 DocType: Expense Claim Detail,Expense Claim Detail,Dados de Reembolso de Despesas
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICADO PARA FORNECEDOR
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,"Por favor, selecione a conta correta"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,"Por favor, selecione a conta correta"
 DocType: Item,Weight UOM,UNID de Peso
 DocType: Salary Structure Employee,Salary Structure Employee,Estrutura Salarial de Funcionários
 DocType: Patient,Blood Group,Grupo Sanguíneo
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Pendente
 DocType: Course,Course Name,Nome do Curso
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Utilizadores que podem aprovar pedidos de licença de um determinado funcionário
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Equipamentos de Escritório
@@ -2384,7 +2425,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Os preços não será mostrado se Preço de tabela não está definido
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Por favor, especifique um país para esta Regra de Envio ou verifique o Envio Mundial"
 DocType: Stock Entry,Total Incoming Value,Valor Total de Entrada
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,É necessário colocar o Débito Para
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,É necessário colocar o Débito Para
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","O Registo de Horas ajudar a manter o controlo do tempo, custo e faturação para atividades feitas pela sua equipa"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Lista de Preços de Compra
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Modelos de variáveis do scorecard do fornecedor.
@@ -2394,7 +2435,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Conciliação de Pagamento
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Por favor, selecione o nome da Pessoa Responsável"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tecnologia
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Total Por Pagar: {0}
+DocType: Hub Settings,Unregister from Hub,Cancelar o registro do Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Total Por Pagar: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Operação Site
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Carta de Oferta
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Gerar Pedido de Materiais (PRM) e Ordens de Produção.
@@ -2406,7 +2448,9 @@
 DocType: Physician Schedule Time Slot,To Time,Para Tempo
 DocType: Authorization Rule,Approving Role (above authorized value),Aprovar Função (acima do valor autorizado)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,O Crédito Para a conta deve ser uma conta A Pagar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},Recursividade da LDM: {0} não pode ser o grupo de origem ou o subgrupo de {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Selecione a Admissão de Estudante que é obrigatória para o estudante pago.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},Recursividade da LDM: {0} não pode ser o grupo de origem ou o subgrupo de {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Selecione uma lista de preços para publicar preços
 DocType: Production Order Operation,Completed Qty,Qtd Concluída
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",Só podem ser vinculadas contas de dédito noutro registo de crébito para {0}
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,A Lista de Preços {0} está desativada
@@ -2419,39 +2463,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,São necessários {0} Nrs. de Série para o Item {1}. Forneceu {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Avaliação Atual da Taxa
 DocType: Item,Customer Item Codes,Códigos de Item de Cliente
+DocType: Training Event,Advance,Avançar
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,para se repetir de novo.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Ganhos / Perdas de Câmbio
 DocType: Opportunity,Lost Reason,Motivo de Perda
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Novo Endereço
 DocType: Quality Inspection,Sample Size,Tamanho da Amostra
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,"Por favor, insira o Documento de Recepção"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Todos os itens já foram faturados
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique um ""De Nr. de Processo"" válido"
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',"Por favor, especifique um ""De Nr. de Processo"" válido"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Podem ser criados outros centros de custo nos Grupos, e os registos podem ser criados em Fora do Grupo"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Utilizadores e Permissões
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Ordens de produção Criado: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Ordens de produção Criado: {0}
 DocType: Branch,Branch,Filial
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Impressão e Branding
 DocType: Company,Total Monthly Sales,Total de vendas mensais
 DocType: Bin,Actual Quantity,Quantidade Efetiva
 DocType: Shipping Rule,example: Next Day Shipping,exemplo: Envio no Dia Seguinte
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Nr. de Série {0} não foi encontrado
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},A assinatura foi {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},A subscrição foi {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Programa de Programação de Taxas
 DocType: Fee Schedule Program,Student Batch,Classe de Estudantes
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,selecione * de `tabVital Signs` onde patient = &#39;{0}&#39; order by signs_date desc limit 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Faça Student
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Min Grade
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Foi convidado para colaborar com o projeto: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},O médico não está disponível no {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Foi convidado para colaborar com o projeto: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},O médico não está disponível no {0}
 DocType: Leave Block List Date,Block Date,Bloquear Data
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Adicionar campo personalizado ID de assinatura no doctype {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Nota de entrega do fornecedor
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Candidatar-me Já
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Candidatar-me Já
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Qtd real {0} / Qtd de espera {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Qtd real {0} / Qtd de espera {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-commerce GSTIN
 DocType: Sales Order,Not Delivered,Não Entregue
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,A data prevista não pode ser anterior à data da transação
 ,Bank Clearance Summary,Resumo de Liquidações Bancárias
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Criar e gerir resumos de email diários, semanais e mensais."
 DocType: Appraisal Goal,Appraisal Goal,Objetivo da Avaliação
@@ -2459,12 +2504,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Prédios
 DocType: Fee Schedule,Fee Structure,Estrutura de Propinas
 DocType: Timesheet Detail,Costing Amount,Montante de Cálculo dos Custos
-DocType: Student Admission,Application Fee,Taxa de Inscrição
+DocType: Student Admission Program,Application Fee,Taxa de Inscrição
 DocType: Process Payroll,Submit Salary Slip,Enviar Folha de Vencimento
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,O desconto Máximo para o Item {0} é de {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,O desconto Máximo para o Item {0} é de {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importação em Massa
 DocType: Sales Partner,Address & Contacts,Endereço e Contactos
 DocType: SMS Log,Sender Name,Nome do Remetente
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Classificar por Critérios
 DocType: POS Profile,[Select],[Selecionar]
 DocType: Vital Signs,Blood Pressure (diastolic),Pressão sanguínea (diastólica)
 DocType: SMS Log,Sent To,Enviado Para
@@ -2473,7 +2519,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,A Próxima Data de Contacto não pode ocorrer no passado
 DocType: Company,For Reference Only.,Só para Referência.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Médico {0} não disponível no {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Selecione lote não
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Selecione lote não
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Inválido {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,FPAG-DEV-
 DocType: Fee Validity,Reference Inv,Referência Inv
@@ -2489,15 +2535,15 @@
 DocType: Normal Test Items,Require Result Value,Exigir o valor do resultado
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,O Nr. de Processo não pode ser 0
 DocType: Item,Show a slideshow at the top of the page,Ver uma apresentação de slides no topo da página
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Lojas
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Lojas
 DocType: Project Type,Projects Manager,Gerente de Projetos
 DocType: Serial No,Delivery Time,Prazo de Entrega
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Idade Baseada em
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Compromisso cancelado
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Compromisso cancelado
 DocType: Item,End of Life,Expiração
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Viagens
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Não foi encontrada nenhuma Estrutura Salarial padrão ativa para o funcionário {0} ou para as datas indicadas
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Viagens
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Não foi encontrada nenhuma Estrutura Salarial padrão ativa para o funcionário {0} ou para as datas indicadas
 DocType: Leave Block List,Allow Users,Permitir Utilizadores
 DocType: Purchase Order,Customer Mobile No,Nr. de Telemóvel de Cliente
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Recorrente
@@ -2506,12 +2552,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Atualizar Custo
 DocType: Item Reorder,Item Reorder,Reencomenda do Item
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Mostrar Folha de Vencimento
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Transferência de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Transferência de Material
 DocType: Fees,Send Payment Request,Enviar pedido de pagamento
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especificar as operações, custo operacional e dar um só Nr. Operação às suas operações."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Este documento está acima do limite por {0} {1} para o item {4}. Está a fazer outra {3} no/a mesmo/a {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,"Por favor, defina como recorrente depois de guardar"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Selecionar alterar montante de conta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Selecionar alterar montante de conta
 DocType: Purchase Invoice,Price List Currency,Moeda da Lista de Preços
 DocType: Naming Series,User must always select,O utilizador tem sempre que escolher
 DocType: Stock Settings,Allow Negative Stock,Permitir Stock Negativo
@@ -2531,7 +2577,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Funcionário
 DocType: Sample Collection,Collected Time,Tempo coletado
 DocType: Company,Sales Monthly History,Histórico mensal de vendas
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Selecione lote
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Selecione lote
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} está totalmente faturado
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Sinais vitais
 DocType: Training Event,End Time,Data de Término
@@ -2539,16 +2585,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Deduções ou Perdas de Pagamento
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Termos do contrato padrão para Vendas ou Compra.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Agrupar por Voucher
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Tem certeza de que deseja cancelar esse compromisso?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Canal de Vendas
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},"Por favor, defina conta padrão no Componente Salarial {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Necessário Em
 DocType: Rename Tool,File to Rename,Ficheiro para Alterar Nome
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Por favor, selecione uma LDM para o Item na Linha {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Por favor, selecione uma LDM para o Item na Linha {0}"
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},A conta {0} não coincide com a Empresa {1} no Modo de Conta: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},A LDM especificada {0} não existe para o Item {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,O Cronograma de Manutenção {0} deve ser cancelado antes de cancelar esta Ordem de Venda
+DocType: POS Profile,Applicable for Users,Aplicável para usuários
 DocType: Notification Control,Expense Claim Approved,Reembolso de Despesas Aprovado
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Já foi criada a Folha de Vencimento do funcionário {0} para este período
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Já foi criada a Folha de Vencimento do funcionário {0} para este período
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Farmacêutico
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Custo dos Itens Adquiridos
 DocType: Selling Settings,Sales Order Required,Ordem de Venda necessária
@@ -2572,6 +2620,7 @@
 DocType: Offer Letter,Accepted,Aceite
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Organização
 DocType: BOM Update Tool,BOM Update Tool,Ferramenta de atualização da lista técnica
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Conta de festa não especificada, configure a conta do partido padrão na empresa"
 DocType: SG Creation Tool Course,Student Group Name,Nome do Grupo de Estudantes
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Criando Taxas
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Por favor, certifique-se de que realmente deseja apagar todas as transações para esta empresa. Os seus dados principais permanecerão como estão. Esta ação não pode ser anulada."
@@ -2580,29 +2629,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) não pode ser maior do que a quantidade planeada ({2}) no Pedido de Produção {3}
 DocType: Shipping Rule,Shipping Rule Label,Regra Rotulação de Envio
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Fórum de Utilizadores
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,As Matérias-primas não podem ficar em branco.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar o stock, a fatura contém um item de envio direto."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,As Matérias-primas não podem ficar em branco.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar o stock, a fatura contém um item de envio direto."
 DocType: Lab Test Sample,Lab Test Sample,Amostra de teste de laboratório
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Lançamento Contabilístico Rápido
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Não pode alterar a taxa se a LDM for mencionada nalgum item
+DocType: Restaurant,Invoice Series Prefix,Prefixo da série de fatura
 DocType: Employee,Previous Work Experience,Experiência Laboral Anterior
 DocType: Stock Entry,For Quantity,Para a Quantidade
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Por favor, indique a Qtd Planeada para o Item {0} na linha {1}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},"Por favor, indique a Qtd Planeada para o Item {0} na linha {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} não foi enviado
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Solicitações de itens.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Será criado um Pedido de produção separado para cada item acabado.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} deve ser negativo no documento de devolução
 ,Minutes to First Response for Issues,Minutos para a Primeira Resposta a Incidentes
 DocType: Purchase Invoice,Terms and Conditions1,Termos e Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,O nome do instituto para o qual está a instalar este sistema.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,O nome do instituto para o qual está a instalar este sistema.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","O lançamento contabilístico está congelado até à presente data, ninguém pode efetuar / alterar o registo exceto alguém com as funções especificadas abaixo."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Por favor, guarde o documento antes de gerar o cronograma de manutenção"
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Preço mais recente atualizado em todas as BOMs
 DocType: Fee Schedule,Successful,Bem sucedido
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Estado do Projeto
 DocType: UOM,Check this to disallow fractions. (for Nos),Selecione esta opção para não permitir frações. (Para Nrs.)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Foram criados os seguintes Pedidos de Produção:
-DocType: Student Admission,Naming Series (for Student Applicant),Séries de Atribuição de Nomes (para Estudantes Candidatos)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Foram criados os seguintes Pedidos de Produção:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Séries de Atribuição de Nomes (para Estudantes Candidatos)
 DocType: Delivery Note,Transporter Name,Nome da Transportadora
 DocType: Authorization Rule,Authorized Value,Valor Autorizado
 DocType: BOM,Show Operations,Mostrar Operações
@@ -2626,7 +2676,7 @@
 ,Employees working on a holiday,Os funcionários que trabalham num feriado
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Marcar Presença
 DocType: Project,% Complete Method,% de Método Completa
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Droga
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Droga
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},A data de início da manutenção não pode ser anterior à data de entrega do Nr. de Série {0}
 DocType: Production Order,Actual End Date,Data de Término Efetiva
 DocType: BOM,Operating Cost (Company Currency),Custo Operacional (Moeda da Empresa)
@@ -2644,13 +2694,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,O Utilizador Aprovador não pode o mesmo que o da regra Aplicável A
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Preço Unitário (de acordo com a UDM de Stock)
 DocType: SMS Log,No of Requested SMS,Nr. de SMS Solicitados
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,A Licença Sem Vencimento não coincide com os registos de Pedido de Licença aprovados
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,A Licença Sem Vencimento não coincide com os registos de Pedido de Licença aprovados
 DocType: Campaign,Campaign-.####,Campanha-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Próximos Passos
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,"Por favor, forneça os itens especificados com as melhores taxas possíveis"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Maak Factuur
 DocType: Selling Settings,Auto close Opportunity after 15 days,perto Opportunity Auto após 15 dias
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,As ordens de compra não são permitidas para {0} devido a um ponto de avaliação de {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,As ordens de compra não são permitidas para {0} devido a um ponto de avaliação de {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Fim do Ano
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2658,6 +2708,7 @@
 DocType: Vital Signs,Nutrition Values,Valores nutricionais
 DocType: Lab Test Template,Is billable,É faturável
 DocType: Delivery Note,DN-,NE-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Tanto o &quot;Horário do Médico&quot; quanto o Tempo por Nomeação &quot;devem ser definidos para Dr {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Um distribuidor de terceiros / negociante / agente à comissão / filial / revendedor que vende os produtos das empresas por uma comissão.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} no Ordem de Compra {1}
 DocType: Patient,Patient Demographics,Demografia do paciente
@@ -2707,7 +2758,6 @@
  10. Adicionar ou Deduzir: Se quer adicionar ou deduzir o imposto."
 DocType: Homepage,Homepage,Página Inicial
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Médico selecionado ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',update tabConsultation set invoice = &#39;{0}&#39; onde name = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Qtd Recebida
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Registos de Propinas Criados - {0}
 DocType: Asset Category Account,Asset Category Account,Categoria de Conta de Ativo
@@ -2719,7 +2769,7 @@
 DocType: Asset,Manual,Manual
 DocType: Salary Component Account,Salary Component Account,Conta Componente Salarial
 DocType: Global Defaults,Hide Currency Symbol,Ocultar Símbolo de Moeda
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","ex: Banco, Dinheiro, Cartão de Crédito"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","ex: Banco, Dinheiro, Cartão de Crédito"
 DocType: Lead Source,Source Name,Nome da Fonte
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","A pressão arterial normal em repouso em um adulto é de aproximadamente 120 mmHg sistólica e 80 mmHg diastólica, abreviada &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Nota de Crédito
@@ -2738,16 +2788,16 @@
 DocType: Patient,Occupation,Ocupação
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Linha {0}: A Data de Início deve ser anterior à Data de Término
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qtd)
-DocType: Sales Invoice,This Document,Este Documento
 DocType: Installation Note Item,Installed Qty,Qtd Instalada
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Isso pode ser devido a alguns endereços de e-mail inválidos no
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Tu adicionaste
 DocType: Purchase Taxes and Charges,Parenttype,Tipoprincipal
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Resultado de Formação
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Resultado de Formação
 DocType: Purchase Invoice,Is Paid,Está Pago
 DocType: Salary Structure,Total Earning,Ganhos Totais
 DocType: Purchase Receipt,Time at which materials were received,Momento em que os materiais foram recebidos
 DocType: Stock Ledger Entry,Outgoing Rate,Taxa de Saída
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Definidor da filial da organização.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Definidor da filial da organização.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,ou
 DocType: Sales Order,Billing Status,Estado do Faturação
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Relatar um Incidente
@@ -2762,8 +2812,9 @@
 DocType: Notification Control,Sales Order Message,Mensagem da Ordem de Venda
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Definir Valores Padrão, como a Empresa, Moeda, Ano Fiscal Atual, etc."
 DocType: Payment Entry,Payment Type,Tipo de Pagamento
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selecione um lote para o item {0}. Não é possível encontrar um único lote que preenche este requisito
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selecione um lote para o item {0}. Não é possível encontrar um único lote que preenche este requisito
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selecione um lote para o item {0}. Não é possível encontrar um único lote que preenche este requisito
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selecione um lote para o item {0}. Não é possível encontrar um único lote que preenche este requisito
+DocType: Hub Category,Parent Category,Categoria Parental
 DocType: Process Payroll,Select Employees,Selecionar Funcionários
 DocType: Opportunity,Potential Sales Deal,Potenciais Negócios de Vendas
 DocType: Complaint,Complaints,Reclamações
@@ -2801,7 +2852,7 @@
 DocType: Bin,Reserved Quantity,Quantidade Reservada
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Por favor insira o endereço de e-mail válido
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Por favor insira o endereço de e-mail válido
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Selecione um item no carrinho
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Selecione um item no carrinho
 DocType: Landed Cost Voucher,Purchase Receipt Items,Compra de Itens de Entrada
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Personalização de Formulários
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,atraso
@@ -2811,15 +2862,15 @@
 DocType: Payment Request,Amount in customer's currency,Montante na moeda do cliente
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Entrega
 DocType: Stock Reconciliation Item,Current Qty,Qtd Atual
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Adicionar Fornecedores
+DocType: Restaurant Menu,Restaurant Menu,Menu do restaurante
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Anterior
 DocType: Appraisal Goal,Key Responsibility Area,Área de Responsabilidade Fundamental
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Os lotes de estudante ajudar a controlar assiduidade, avaliação e taxas para estudantes"
 DocType: Payment Entry,Total Allocated Amount,Valor Total Atribuído
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Defina a conta de inventário padrão para o inventário perpétuo
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Defina a conta de inventário padrão para o inventário perpétuo
 DocType: Item Reorder,Material Request Type,Tipo de Solicitação de Material
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural entrada de diário para salários de {0} para {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage está cheio, não salvou"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage está cheio, não salvou"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Linha {0}: É obrigatório colocar o Fator de Conversão de UNID
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Capacidade do quarto
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref.
@@ -2858,16 +2909,18 @@
 DocType: Project,Task Completion,Conclusão da Tarefa
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Não há no Stock
 DocType: Appraisal,HR User,Utilizador de RH
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Impostos e Encargos Deduzidos
-apps/erpnext/erpnext/hooks.py +129,Issues,Problemas
+apps/erpnext/erpnext/hooks.py +138,Issues,Problemas
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},O estado deve ser um dos {0}
 DocType: Sales Invoice,Debit To,Débito Para
+DocType: Restaurant Menu Item,Restaurant Menu Item,Item do menu do restaurante
 DocType: Delivery Note,Required only for sample item.,Só é necessário para o item de amostra.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qtd Efetiva Após Transação
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Sem folha de salário encontrada entre {0} e {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Sem folha de salário encontrada entre {0} e {1}
 ,Pending SO Items For Purchase Request,Itens Pendentes PV para Solicitação de Compra
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Admissão de Estudantes
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} está desativado
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Admissão de Estudantes
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} está desativado
 DocType: Supplier,Billing Currency,Moeda de Faturação
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Extra-Grande
@@ -2890,6 +2943,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Por favor, mencione o nr. de visitas necessárias"
 DocType: Stock Settings,Default Valuation Method,Método de Estimativa Padrão
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,Taxa
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Atualização em andamento. Pode demorar um pouco.
 DocType: Vehicle Log,Fuel Qty,Qtd de Comb.
 DocType: Production Order Operation,Planned Start Time,Tempo de Início Planeado
 DocType: Course,Assessment,Avaliação
@@ -2905,7 +2959,7 @@
 DocType: Price List,Price List Master,Definidor de Lista de Preços
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Todas as Transações de Vendas podem ser assinaladas em vários **Vendedores** para que possa definir e monitorizar as metas.
 ,S.O. No.,Nr. de P.E.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},"Por favor, crie um Cliente a partir dum Potencial Cliente {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},"Por favor, crie um Cliente a partir dum Potencial Cliente {0}"
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Selecione Paciente
 DocType: Price List,Applicable for Countries,Aplicável aos Países
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Nome do parâmetro
@@ -2949,27 +3003,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"A conta de Despesas / Diferenças ({0}) deve ser uma conta de ""Lucros e Perdas"""
 DocType: Project,Copied From,Copiado de
 DocType: Project,Copied From,Copiado de
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Nome de erro: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Escassez
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Nome de erro: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,Escassez
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} não está associado a {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Já foi registada a presença do funcionário {0}
 DocType: Packing Slip,If more than one package of the same type (for print),Se houver mais do que um pacote do mesmo tipo (por impressão)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Defina o cliente padrão em Configurações do restaurante
 ,Salary Register,salário Register
 DocType: Warehouse,Parent Warehouse,Armazém Principal
 DocType: C-Form Invoice Detail,Net Total,Total Líquido
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Lista de materiais padrão não encontrada para Item {0} e Projeto {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Lista de materiais padrão não encontrada para Item {0} e Projeto {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Definir vários tipos de empréstimo
 DocType: Bin,FCFS Rate,Preço FCFS
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Montante em Dívida
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Tempo (em minutos)
 DocType: Project Task,Working,A Trabalhar
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Fila de Stock (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Ano financeiro
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Ano financeiro
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} não pertence à Empresa {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,Não foi possível resolver a função de pontuação dos critérios para {0}. Verifique se a fórmula é válida.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Custo como em
 DocType: Healthcare Settings,Out Patient Settings,Configurações do paciente
 DocType: Account,Round Off,Arredondar
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,A quantidade deve ser positiva
 ,Requested Qty,Qtd Solicitada
 DocType: Tax Rule,Use for Shopping Cart,Utilizar para o Carrinho de Compras
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Não existe o Valor {0} para o Atributo {1} na lista Valores de Atributos de Item válidos para o Item {2}
@@ -2978,7 +3034,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Os custos serão distribuídos proporcionalmente com base na qtd ou montante, conforme tiver selecionado"
 DocType: Maintenance Visit,Purposes,Objetivos
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Para devolver um documento deve ser inserido pelo menos um item com quantidade negativa
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Adicionar Cursos
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","A Operação {0} maior do que as horas de trabalho disponíveis no posto de trabalho {1}, quebra a operação em várias operações"
 ,Requested,Solicitado
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Sem Observações
@@ -2990,6 +3045,8 @@
 DocType: Employee Loan,Repaid/Closed,Reembolsado / Fechado
 DocType: Item,Total Projected Qty,Qtd Projetada Total
 DocType: Monthly Distribution,Distribution Name,Nome de Distribuição
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Fornecedor&gt; Tipo de Fornecedor
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Taxa de avaliação não encontrada para o Item {0}, que é necessário para fazer as entradas contábeis para {1} {2}. Se o item estiver sendo negociado como item de taxa de avaliação zero no {1}, mencione que na tabela {1} Item. Caso contrário, crie uma transação de estoque recebida para o item ou mencione a taxa de avaliação no registro do item e tente enviar / cancelar esta entrada"
 DocType: Course,Course Code,Código de Curso
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Inspeção de Qualidade necessária para o item {0}
 DocType: POS Settings,Use POS in Offline Mode,Use POS no modo off-line
@@ -3000,14 +3057,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Gerir Esquema de Território.
 DocType: Journal Entry Account,Sales Invoice,Fatura de Vendas
 DocType: Journal Entry Account,Party Balance,Saldo da Parte
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,"Por favor, selecione Aplicar Desconto Em"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,"Por favor, selecione Aplicar Desconto Em"
 DocType: Company,Default Receivable Account,Contas a Receber Padrão
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,"Criar Registo Bancário  para o salário total pago, para os critérios acima selecionados"
 DocType: Physician,Physician Schedule,Horário do médico
 DocType: Purchase Invoice,Deemed Export,Exceção de exportação
 DocType: Stock Entry,Material Transfer for Manufacture,Transferência de Material para Fabrico
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,A Percentagem de Desconto pode ser aplicada numa Lista de Preços ou em todas as Listas de Preços.
-DocType: Purchase Invoice,Half-yearly,Semestral
+DocType: Subscription,Half-yearly,Semestral
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Registo Contabilístico de Stock
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Você já avaliou os critérios de avaliação {}.
@@ -3036,13 +3093,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Extra-pequeno
 DocType: Company,Standard Template,Modelo Padrão
 DocType: Training Event,Theory,Teoria
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Aviso: A Qtd do Material requisitado é menor que a Qtd de Pedido Mínima
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Aviso: A Qtd do Material requisitado é menor que a Qtd de Pedido Mínima
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,A conta {0} está congelada
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidade Legal / Subsidiária com um Gráfico de Contas separado pertencente à Organização.
 DocType: Payment Request,Mute Email,Email Sem Som
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Comida, Bebidas e Tabaco"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Só pode efetuar o pagamento no {0} não faturado
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,A taxa de comissão não pode ser superior a 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Só pode efetuar o pagamento no {0} não faturado
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,A taxa de comissão não pode ser superior a 100
 DocType: Stock Entry,Subcontract,Subcontratar
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,"Por favor, insira {0} primeiro"
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Sem respostas de
@@ -3060,10 +3117,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Cor
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Critérios plano de avaliação
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Prevenir ordens de compra
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Susceptível
 DocType: Patient Appointment,Scheduled,Programado
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Solicitação de cotação.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configure o Sistema de Nomeação de Empregados em Recursos Humanos&gt; Configurações de RH
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Por favor, selecione o item onde o ""O Stock de Item"" é ""Não"" e o ""Item de Vendas"" é ""Sim"" e se não há nenhum outro Pacote de Produtos"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Selecione o Cliente
 DocType: Student Log,Academic,Académico
 DocType: Patient,Personal and Social History,História pessoal e social
 DocType: Fee Schedule,Fee Breakup for each student,Fee Breakup para cada aluno
@@ -3073,7 +3131,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Taxa de Avaliação
 DocType: Stock Reconciliation,SR/,SR/
 DocType: Vehicle,Diesel,Gasóleo
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Não foi selecionada uma Moeda para a Lista de Preços
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Não foi selecionada uma Moeda para a Lista de Preços
 apps/erpnext/erpnext/config/healthcare.py +46,Results,Resultados
 ,Student Monthly Attendance Sheet,Folha de Assiduidade Mensal de Estudante
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},O(A) funcionário(a) {0} já solicitou {1} entre {2} e {3}
@@ -3089,7 +3147,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Gerir Parceiros de Vendas.
 DocType: Quality Inspection,Inspection Type,Tipo de Inspeção
 DocType: Fee Validity,Visited yet,Visitou ainda
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Os Armazéns com a transação existente não podem ser convertidos num grupo.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Os Armazéns com a transação existente não podem ser convertidos num grupo.
 DocType: Assessment Result Tool,Result HTML,resultado HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Expira em
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Adicionar alunos
@@ -3116,7 +3174,7 @@
 DocType: Healthcare Settings,Result Printed,Resultado impresso
 DocType: Asset Category Account,Depreciation Expense Account,Conta de Depreciação de Despesas
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Período de Experiência
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Ver {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Ver {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Só são permitidos nós de folha numa transação
 DocType: Expense Claim,Expense Approver,Aprovador de Despesas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Linha {0}: O Avanço do Cliente deve ser creditado
@@ -3128,7 +3186,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Para Data e Hora
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Cronogramas de Curso eliminados:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Registo para a manutenção do estado de entrega de sms
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Definir o alvo de vendas
 DocType: Accounts Settings,Make Payment via Journal Entry,Fazer o pagamento através do Lançamento Contabilístico
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Impresso Em
 DocType: Item,Inspection Required before Delivery,Inspeção Requerida antes da Entrega
@@ -3136,7 +3193,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Atividades Pendentes
 DocType: Patient Appointment,Reminded,Lembrado
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Sua organização
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Sua organização
 DocType: Fee Component,Fees Category,Categoria de Propinas
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,"Por favor, insira a data de saída."
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Mtt
@@ -3148,7 +3205,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reordenar Nível
 DocType: Company,Chart Of Accounts Template,Modelo de Plano de Contas
 DocType: Attendance,Attendance Date,Data de Presença
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},O Preço do Item foi atualizado para {0} na Lista de Preços {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},O Preço do Item foi atualizado para {0} na Lista de Preços {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Separação Salarial com base nas Remunerações e Reduções.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Uma conta com subgrupos não pode ser convertida num livro
 DocType: Purchase Invoice Item,Accepted Warehouse,Armazém Aceite
@@ -3164,9 +3221,10 @@
 ,Employee Birthday,Aniversário do Funcionário
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Ferramenta de Assiduidade de Classe de Estudantes
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,Limite Ultrapassado
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Programado até
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital de Risco
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Já existe um prazo académico com este""Ano Lectivo"" {0} e ""Nome do Prazo"" {1}. Por favor, altere estes registos e tente novamente."
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Como existem transações existentes contra item de {0}, você não pode alterar o valor de {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Como existem transações existentes contra item de {0}, você não pode alterar o valor de {1}"
 DocType: UOM,Must be Whole Number,Deve ser Número Inteiro
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Novas Licenças Alocadas (Em Dias)
 DocType: Purchase Invoice,Invoice Copy,Cópia de fatura
@@ -3176,7 +3234,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Número da Fatura
 DocType: Shopping Cart Settings,Orders,Pedidos
 DocType: Employee Leave Approver,Leave Approver,Aprovador de Licenças
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Selecione um lote
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Selecione um lote
 DocType: Assessment Group,Assessment Group Name,Nome do Grupo de Avaliação
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material Transferido para Fabrico
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Um utilizador com a função de ""Aprovador de Despesas"""
@@ -3191,7 +3249,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Registo de Término de Período
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Selecione Departamento ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,O Centro de Custo com as operações existentes não pode ser convertido em grupo
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Montante {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Montante {0} {1} {2} {3}
 DocType: Account,Depreciation,Depreciação
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fornecedor(es)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Ferramenta de Assiduidade do Funcionário
@@ -3203,10 +3261,12 @@
 DocType: GL Entry,Voucher No,Voucher Nr.
 ,Lead Owner Efficiency,Eficiência do proprietário principal
 ,Lead Owner Efficiency,Eficiência do proprietário principal
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Mais popular
 DocType: Leave Allocation,Leave Allocation,Atribuição de Licenças
 DocType: Payment Request,Recipient Message And Payment Details,Mensagem E Dados De Pagamento Do Destinatário
 DocType: Training Event,Trainer Email,Email do Formador
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Foram criadas as Solicitações de Material {0}
+DocType: Restaurant Reservation,No of People,Não há pessoas
 DocType: Production Planning Tool,Include sub-contracted raw materials,Incluir matérias-primas subcontratadas
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Modelo de termos ou contratos.
 DocType: Purchase Invoice,Address and Contact,Endereço e Contacto
@@ -3215,10 +3275,11 @@
 DocType: Supplier,Last Day of the Next Month,Último Dia do Mês Seguinte
 DocType: Support Settings,Auto close Issue after 7 days,Fechar automáticamente incidentes após 7 dias
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","A licença não pode ser atribuída antes de {0}, pois o saldo de licenças já foi carregado no registo de atribuição de licenças {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: A Data de Vencimento / Referência excede os dias de crédito permitidos por cliente em {0} dia(s)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: A Data de Vencimento / Referência excede os dias de crédito permitidos por cliente em {0} dia(s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Candidatura de Estudante
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL PARA RECEPTOR
 DocType: Asset Category Account,Accumulated Depreciation Account,Conta de Depreciação Acumulada
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Este e-mail é gerado automaticamente
 DocType: Stock Settings,Freeze Stock Entries,Suspender Registos de Stock
 DocType: Program Enrollment,Boarding Student,Estudante de embarque
 DocType: Asset,Expected Value After Useful Life,Valor Previsto Após Vida Útil
@@ -3226,7 +3287,7 @@
 DocType: Activity Cost,Billing Rate,Preço de faturação padrão
 ,Qty to Deliver,Qtd a Entregar
 ,Stock Analytics,Análise de Stock
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,As operações não podem ser deixadas em branco
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,As operações não podem ser deixadas em branco
 DocType: Maintenance Visit Purpose,Against Document Detail No,No Nr. de Dados de Documento
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,É obrigatório colocar o Tipo de Parte
 DocType: Quality Inspection,Outgoing,Saída
@@ -3248,7 +3309,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Selecionar os alunos manualmente para o grupo baseado em atividade
 DocType: Journal Entry,User Remark,Observação de Utiliz.
 DocType: Lead,Market Segment,Segmento de Mercado
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},O Montante Pago não pode ser superior ao montante em dívida total negativo {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},O Montante Pago não pode ser superior ao montante em dívida total negativo {0}
 DocType: Supplier Scorecard Period,Variables,Variáveis
 DocType: Employee Internal Work History,Employee Internal Work History,Historial de Trabalho Interno do Funcionário
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),A Fechar (Db)
@@ -3278,21 +3339,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obter Atualizações
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: A Conta {2} não pertence à Empresa {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,A Solicitação de Material {0} foi cancelada ou interrompida
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Gestão de Licenças
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Gestão de Licenças
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Agrupar por Conta
 DocType: Sales Order,Fully Delivered,Totalmente Entregue
 DocType: Lead,Lower Income,Rendimento Mais Baixo
+DocType: Restaurant Order Entry,Current Order,Ordem atual
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Fonte e armazém de destino não pode ser o mesmo para a linha {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","A Conta de Diferenças deve ser uma conta do tipo Ativo/Passivo, pois esta Conciliação de Stock é um Registo de Abertura"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Desembolso Valor não pode ser maior do que o valor do empréstimo {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Ir para Programas
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Nº da Ordem de Compra necessário para o Item {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Ordem de produção não foi criado
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Ordem de produção não foi criado
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"A ""Data De"" deve ser depois da ""Data Para"""
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Não é possível alterar o estado pois o estudante {0} está ligado à candidatura de estudante {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Não é possível alterar o estado pois o estudante {0} está ligado à candidatura de estudante {1}
 DocType: Asset,Fully Depreciated,Totalmente Depreciados
 ,Stock Projected Qty,Qtd Projetada de Stock
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},O Cliente {0} não pertence ao projeto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},O Cliente {0} não pertence ao projeto {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,HTML de Presenças Marcadas
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Citações são propostas, as propostas que enviou aos seus clientes"
 DocType: Sales Order,Customer's Purchase Order,Ordem de Compra do Cliente
@@ -3303,8 +3365,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Por favor, defina o Número de Depreciações Marcado"
 DocType: Supplier Scorecard Period,Calculations,Cálculos
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Valor ou Qtd
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Não podem ser criados Pedidos de Produção para:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Não podem ser criados Pedidos de Produção para:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Minuto
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Defina Naming Series para {0} via Setup&gt; Configurações&gt; Naming Series
 DocType: Purchase Invoice,Purchase Taxes and Charges,Impostos e Taxas de Compra
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Ir para Fornecedores
 ,Qty to Receive,Qtd a Receber
@@ -3318,7 +3381,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,A conta de Crédito Para deve ser uma conta de Balanço
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Todos os Tipos de Fornecedores
 DocType: Global Defaults,Disable In Words,Desativar Por Extenso
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,É obrigatório colocar o Código do Item  porque o Item não é automaticamente numerado
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,É obrigatório colocar o Código do Item  porque o Item não é automaticamente numerado
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},A Cotação {0} não é do tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Item do Cronograma de Manutenção
 DocType: Sales Order,%  Delivered,% Entregue
@@ -3340,23 +3403,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Equidade de Saldo Inicial
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Reconciliação
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Restante
 DocType: Appraisal,Appraisal,Avaliação
 DocType: Purchase Invoice,GST Details,GST Detalhes
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},Email enviado ao fornecedor {0}
+DocType: Item,Default Sales Unit of Measure,Unidade de medida de vendas padrão
 DocType: Opportunity,OPTY-,OPTD-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,A data está repetida
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Signatário Autorizado
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},O aprovador de licença deve pertencer a/ao {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Criar Taxas
-DocType: Hub Settings,Seller Email,Email do Vendedor
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Custo total de compra (através da Fatura de Compra)
 DocType: Training Event,Start Time,Hora de início
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Selecionar Quantidade
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Selecionar Quantidade
 DocType: Customs Tariff Number,Customs Tariff Number,Número de tarifa alfandegária
 DocType: Patient Appointment,Patient Appointment,Nomeação do paciente
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,A Função Aprovada não pode ser igual à da regra Aplicável A
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Cancelar a Inscrição neste Resumo de Email
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Cancelar a Inscrição neste Resumo de Email
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Obter provedores por
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} não encontrado para Item {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Ir para Cursos
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mensagem Enviada
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Uma conta com subgrupos não pode ser definida como um livro
@@ -3369,11 +3435,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Material Transferido para Fabrico
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,A Conta {0} não existe
 DocType: Project,Project Type,Tipo de Projeto
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Tarefa infantil existe para esta Tarefa. Você não pode excluir esta Tarefa.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,É obrigatório colocar a qtd prevista ou o montante previsto.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Custo de diversas atividades
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Não há mais resultados
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Custo de diversas atividades
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","A Configurar Eventos para {0}, uma vez que o Funcionário vinculado ao Vendedor abaixo não possui uma ID de Utilizador {1}"
 DocType: Timesheet,Billing Details,Dados de Faturação
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,A fonte e o armazém de destino devem ser diferentes um do outro
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,A fonte e o armazém de destino devem ser diferentes um do outro
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Não é permitido atualizar transações com ações mais antigas que {0}
 DocType: Purchase Invoice Item,PR Detail,Dados de RC
 DocType: Sales Order,Fully Billed,Totalmente Faturado
@@ -3400,7 +3468,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Transferência Bancária
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Verificar tudo
 DocType: Vehicle Log,Invoice Ref,Ref. de Fatura
-DocType: Purchase Order,Recurring Order,Ordem Recorrente
 DocType: Company,Default Income Account,Conta de Rendimentos Padrão
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Grupo de Clientes / Cliente
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Lucro / Perdas (Crédito) de Anos Fiscais Não Encerrados
@@ -3414,9 +3481,9 @@
 DocType: Patient,A Negative,Um negativo
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Nada mais para mostrar.
 DocType: Lead,From Customer,Do Cliente
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Chamadas
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Chamadas
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Um produto
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,Lotes
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,Lotes
 DocType: Project,Total Costing Amount (via Time Logs),Montante de Orçamento Total (através de Registos de Tempo)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Faça o horário das taxas
 DocType: Purchase Order Item Supplied,Stock UOM,UNID de Stock
@@ -3441,7 +3508,7 @@
 DocType: School Settings,Current Academic Term,Termo acadêmico atual
 DocType: School Settings,Current Academic Term,Termo acadêmico atual
 DocType: Sales Order,Not Billed,Não Faturado
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Ambos Armazéns devem pertencer à mesma Empresa
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Ambos Armazéns devem pertencer à mesma Empresa
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Ainda não foi adicionado nenhum contacto.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Montante do Voucher de Custo de Entrega
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Contas criadas por Fornecedores.
@@ -3450,7 +3517,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Montante do Desconto
 DocType: Purchase Invoice,Return Against Purchase Invoice,Devolver Na Fatura de Compra
 DocType: Item,Warranty Period (in days),Período de Garantia (em dias)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',atualize `tabPatient Appointment` configure sales_invoice = &#39;{0}&#39; onde name = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Relação com Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Caixa Líquido de Operações
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Item 4
@@ -3459,8 +3525,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Conta para Lançamento Contabilístico
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupo Estudantil
 DocType: Shopping Cart Settings,Quotation Series,Série de Cotação
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Já existe um item com o mesmo nome ({0}), por favor, altere o nome deste item ou altere o nome deste item"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,"Por favor, selecione o cliente"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Já existe um item com o mesmo nome ({0}), por favor, altere o nome deste item ou altere o nome deste item"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,"Por favor, selecione o cliente"
 DocType: C-Form,I,I
 DocType: Company,Asset Depreciation Cost Center,Centro de Custo de Depreciação de Ativo
 DocType: Sales Order Item,Sales Order Date,Data da Ordem de Venda
@@ -3469,6 +3535,7 @@
 DocType: Assessment Plan,Assessment Plan,Plano de avaliação
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,O cliente {0} é criado.
 DocType: Stock Settings,Limit Percent,limite Percent
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Atualmente não há estoque disponível em qualquer armazém
 ,Payment Period Based On Invoice Date,Período De Pagamento Baseado Na Data Da Fatura
 DocType: Sample Collection,No. of print,Número de impressão
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Faltam as Taxas de Câmbio de {0}
@@ -3524,13 +3591,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pagamento Bruto - Dedução Total - reembolso do empréstimo
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,A LDM Atual e a Nova LDN não podem ser iguais
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,ID de Folha de Vencimento
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,ID de Folha de Vencimento
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,A Data De Saída deve ser posterior à Data de Admissão
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Houve erros durante a programação do curso em:
 DocType: Sales Invoice,Against Income Account,Na Conta de Rendimentos
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Entregue
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: A Qtd Pedida {1} não pode ser inferior à qtd mínima pedida {2} (definida no Item).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: A Qtd Pedida {1} não pode ser inferior à qtd mínima pedida {2} (definida no Item).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Percentagem de Distribuição Mensal
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Faça o login como outro usuário.
 DocType: Territory,Territory Targets,Metas de Território
 DocType: Delivery Note,Transporter Info,Informações do Transportador
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},"Por favor, defina o padrão {0} na Empresa {1}"
@@ -3538,13 +3606,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,O mesmo fornecedor foi inserido várias vezes
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Lucro / Perdas Brutos
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Item Fornecido da Ordem de Compra
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,O Nome da Empresa não pode ser a Empresa
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,O Nome da Empresa não pode ser a Empresa
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Os Cabeçalhos de Carta para modelos de impressão.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títulos para modelos de impressão, por exemplo, Fatura Proforma."
 DocType: Program Enrollment,Walking,Caminhando
 DocType: Student Guardian,Student Guardian,Responsável do Estudante
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Os encargos do tipo de avaliação não podem ser marcados como Inclusivos
 DocType: POS Profile,Update Stock,Actualizar Stock
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,na subscrição
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Uma UNID diferente para os itens levará a um Valor de Peso Líquido (Total) incorreto. Certifique-se de que o Peso Líquido de cada item está na mesma UNID.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Preço na LDM
 DocType: Asset,Journal Entry for Scrap,Lançamento Contabilístico para Sucata
@@ -3594,15 +3663,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Sistema de ID do Utilizador (login). Se for definido, ele vai ser o padrão para todas as formas de RH."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: De {1}
 DocType: Task,depends_on,depende_de
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Em fila para atualizar o preço mais recente em todas as Marcas de materiais. Pode demorar alguns minutos.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Em fila para atualizar o preço mais recente em todas as Marcas de materiais. Pode demorar alguns minutos.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Nome da nova Conta. Nota: Por favor, não crie contas para Clientes e Fornecedores"
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Modelos de Endereço por País
 DocType: Sales Order Item,Supplier delivers to Customer,Entregas de Fornecedor ao Cliente
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,Não há stock de [{0}](#Formulário/Item/{0})
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},A Data de Vencimento / Referência não pode ser após {0}
+,Sales Payment Summary,Resumo de pagamento de vendas
+DocType: Restaurant,Restaurant,Restaurante
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},A Data de Vencimento / Referência não pode ser após {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Dados de Importação e Exportação
 DocType: Patient,Account Details,Detalhes da conta
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Não foi Encontrado nenhum aluno
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Não foi Encontrado nenhum aluno
 DocType: Medical Department,Medical Department,Departamento Medico
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Critérios de pontuação do Scorecard do Fornecedor
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Data de Lançamento da Fatura
@@ -3613,7 +3684,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,"Por favor, selecione a Data de Lançamento antes de selecionar a Parte"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Sem CMA
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Selecione Citações
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Selecione Citações
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,O Número de Depreciações Reservadas não pode ser maior do que o Número Total de Depreciações
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Efetuar Visita de Manutenção
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,"Por favor, contacte o utilizador com a função de Gestor Definidor de Vendas {0}"
@@ -3621,7 +3692,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Definidor da Empresa (não Cliente ou Fornecedor).
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Isto baseia-se na assiduidade deste Estudante
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Não alunos em
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Adicionar mais itens ou abrir formulário inteiro
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Adicionar mais itens ou abrir formulário inteiro
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Deverá cancelar as Guias de Remessa {0} antes de cancelar esta Ordem de Venda
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Ir aos usuários
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,O Montante Pago + Montante Liquidado não pode ser superior ao Total Geral
@@ -3641,37 +3712,40 @@
 DocType: Fee Schedule,Fee Schedule,Cronograma de Propinas
 DocType: Hub Settings,Publish Availability,Publicar Disponibilidade
 DocType: Company,Create Chart Of Accounts Based On,Criar Plano de Contas Baseado Em
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Não é possível convertê-lo em não-grupo. Tarefas infantis existem.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,A Data de Nascimento não pode ser após hoje.
 ,Stock Ageing,Envelhecimento de Stock
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},O aluno {0} existe contra candidato a estudante {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Ajuste de arredondamento (Moeda da empresa)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Registo de Horas
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Registo de Horas
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' está desativada
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Definir como Aberto
 DocType: Cheque Print Template,Scanned Cheque,Cheque Digitalizado
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar emails automáticos para Contactos nas transações A Enviar.
 DocType: Timesheet,Total Billable Amount,Valor Total Faturável
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Item 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Entrada de pedido
 DocType: Purchase Order,Customer Contact Email,Email de Contacto de Cliente
 DocType: Warranty Claim,Item and Warranty Details,Itens e Dados de Garantia
 DocType: Sales Team,Contribution (%),Contribuição (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Nota: Não será criado nenhum Registo de Pagamento, pois não foi especificado se era a ""Dinheiro ou por Conta Bancária"""
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,O projeto {0} já existe
 DocType: Medical Department,Nursing User,Usuário de enfermagem
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Responsabilidades
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,O período de validade desta citação terminou.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,O período de validade desta citação terminou.
 DocType: Expense Claim Account,Expense Claim Account,Conta de Reembolso de Despesas
 DocType: Accounts Settings,Allow Stale Exchange Rates,Permitir taxas de câmbio fechadas
 DocType: Sales Person,Sales Person Name,Nome de Vendedor/a
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Por favor, insira pelo menos 1 fatura na tabela"
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Adicionar Utilizadores
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Adicionar Utilizadores
 DocType: POS Item Group,Item Group,Grupo do Item
 DocType: Item,Safety Stock,Stock de Segurança
 DocType: Healthcare Settings,Healthcare Settings,Configurações de cuidados de saúde
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,A % de Progresso para uma tarefa não pode ser superior a 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,A % de Progresso para uma tarefa não pode ser superior a 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Antes da conciliação
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impostos e Taxas Adicionados (Moeda da Empresa)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,A linha de Taxa do Item {0} deve ter em conta o tipo de Taxa ou de Rendimento ou de Despesa ou de Cobrança
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,A linha de Taxa do Item {0} deve ter em conta o tipo de Taxa ou de Rendimento ou de Despesa ou de Cobrança
 DocType: Sales Order,Partly Billed,Parcialmente Faturado
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,O Item {0} deve ser um Item de Ativo Imobilizado
 DocType: Item,Default BOM,LDM Padrão
@@ -3687,6 +3761,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,Variável
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Da Guia de Remessa
 DocType: Student,Student Email Address,Endereço de Email do Estudante
+DocType: Item,Hub Warehouse,Hub Warehouse
 DocType: Physician Schedule Time Slot,From Time,Hora De
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Em stock:
 DocType: Notification Control,Custom Message,Mensagem Personalizada
@@ -3695,9 +3770,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Endereço do estudante
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Endereço do estudante
 DocType: Purchase Invoice,Price List Exchange Rate,Taxa de Câmbio da Lista de Preços
+DocType: POS Profile,POS Profile Name,Nome do perfil POS
 DocType: Purchase Invoice Item,Rate,Valor
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Estagiário
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Nome endereço
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Nome endereço
 DocType: Stock Entry,From BOM,Da LDM
 DocType: Assessment Code,Assessment Code,Código de Avaliação
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Básico
@@ -3711,11 +3787,12 @@
 DocType: Salary Slip,Salary Structure,Estrutura Salarial
 DocType: Account,Bank,Banco
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Companhia Aérea
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Enviar Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Enviar Material
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Ocorreu um erro ao criar uma repetição
 DocType: Material Request Item,For Warehouse,Para o Armazém
 DocType: Employee,Offer Date,Data de Oferta
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Cotações
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Está em modo offline. Não poderá recarregar até ter rede.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Está em modo offline. Não poderá recarregar até ter rede.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Não foi criado nenhum Grupo de Estudantes.
 DocType: Purchase Invoice Item,Serial No,Nr. de Série
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Mensal Reembolso Valor não pode ser maior do que o valor do empréstimo
@@ -3725,17 +3802,18 @@
 DocType: Salary Slip,Total Working Hours,Total de Horas de Trabalho
 DocType: Subscription,Next Schedule Date,Próximo horário Data
 DocType: Stock Entry,Including items for sub assemblies,A incluir itens para subconjuntos
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,O valor introduzido deve ser positivo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Todos os Territórios
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,O valor introduzido deve ser positivo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Todos os Territórios
 DocType: Purchase Invoice,Items,Itens
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,O Estudante já está inscrito.
 DocType: Fiscal Year,Year Name,Nome do Ano
 DocType: Process Payroll,Process Payroll,Processamento de Salários
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Há mais feriados do que dias úteis neste mês.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Há mais feriados do que dias úteis neste mês.
 DocType: Product Bundle Item,Product Bundle Item,Item de Pacote de Produtos
 DocType: Sales Partner,Sales Partner Name,Nome de Parceiro de Vendas
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Solicitação de Cotações
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Solicitação de Cotações
 DocType: Payment Reconciliation,Maximum Invoice Amount,Montante de Fatura Máximo
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hematologia
 DocType: Normal Test Items,Normal Test Items,Itens de teste normais
 DocType: Student Language,Student Language,Student Idioma
 apps/erpnext/erpnext/config/selling.py +23,Customers,Clientes
@@ -3747,10 +3825,11 @@
 DocType: Issue,Opening Time,Tempo de Abertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,São necessárias as datas De e A
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Valores Mobiliários e Bolsas de Mercadorias
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',A Unidade de Medida Padrão para a Variante '{0}' deve ser igual à do Modelo '{1}'
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',A Unidade de Medida Padrão para a Variante '{0}' deve ser igual à do Modelo '{1}'
 DocType: Shipping Rule,Calculate Based On,Calcular com Base Em
 DocType: Delivery Note Item,From Warehouse,Armazém De
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Não há itens com Bill of Materials para Fabricação
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Não há itens com Bill of Materials para Fabricação
+DocType: Restaurant,Default Customer,Cliente padrão
 DocType: Assessment Plan,Supervisor Name,Nome do Supervisor
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Não confirme se o compromisso foi criado no mesmo dia
 DocType: Program Enrollment Course,Program Enrollment Course,Curso de inscrição no programa
@@ -3778,7 +3857,7 @@
 DocType: Payment Entry,Internal Transfer,Transferência Interna
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Existe uma subconta para esta conta. Não pode eliminar esta conta.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,É obrigatório colocar a qtd prevista ou o montante previsto
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Não existe nenhuma LDM padrão para o Item {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Não existe nenhuma LDM padrão para o Item {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,"Por favor, selecione a Data de Postagem primeiro"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,A Data de Abertura deve ser antes da Data de Término
 DocType: Leave Control Panel,Carry Forward,Continuar
@@ -3814,6 +3893,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Total Atual
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,Demonstrações Contabilísticas
 DocType: Drug Prescription,Hour,Hora
+DocType: Restaurant Order Entry,Last Sales Invoice,Última fatura de vendas
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,O Novo Nr. de Série não pode ter um Armazém. O Armazém deve ser definido no Registo de Compra ou no Recibo de Compra
 DocType: Lead,Lead Type,Tipo Potencial Cliente
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Não está autorizado a aprovar licenças em Datas Bloqueadas
@@ -3850,64 +3930,66 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Criar utilizadores
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,Gramas
 DocType: Supplier Scorecard,Per Month,Por mês
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,A Quantidade de Fabrico deve ser superior a 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,A Quantidade de Fabrico deve ser superior a 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Relatório de visita para a chamada de manutenção.
 DocType: Stock Entry,Update Rate and Availability,Atualizar Taxa e Disponibilidade
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"A percentagem que está autorizado a receber ou entregar da quantidade pedida. Por ex: Se encomendou 100 unidades e a sua Ajuda de Custo é de 10%, então está autorizado a receber 110 unidades."
 DocType: POS Customer Group,Customer Group,Grupo de Clientes
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Novo ID do lote (opcional)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Novo ID do lote (opcional)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},É obrigatório ter uma conta de despesas para o item {0}
 DocType: BOM,Website Description,Descrição do Website
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Variação Líquida na Equidade
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,O mais novo
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,"Por favor, cancele a Fatura de Compra {0} primeiro"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","O ID de Email deve ser único, já existe para {0}"
 DocType: Serial No,AMC Expiry Date,Data de Validade do CMA
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,Recibo
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,Recibo
 ,Sales Register,Registo de Vendas
 DocType: Daily Work Summary Settings Company,Send Emails At,Enviar Emails Em
 DocType: Quotation,Quotation Lost Reason,Motivo de Perda de Cotação
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Escolha o seu Domínio
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',selecione * de tabPatient onde name = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Transação de referência nr. {0} datada de {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Transação de referência nr. {0} datada de {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Não há nada para editar.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Vista de formulário
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Resumo para este mês e atividades pendentes
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Vista de formulário
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Resumo para este mês e atividades pendentes
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Adicione usuários à sua organização, além de você."
 DocType: Customer Group,Customer Group Name,Nome do Grupo de Clientes
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Nenhum cliente ainda!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Nenhum cliente ainda!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Demonstração dos Fluxos de Caixa
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Valor do Empréstimo não pode exceder Máximo Valor do Empréstimo de {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licença
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Fatura {0} do Form-C {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Fatura {0} do Form-C {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Por favor selecione Continuar se também deseja incluir o saldo de licenças do ano fiscal anterior neste ano fiscal
 DocType: GL Entry,Against Voucher Type,No Tipo de Voucher
 DocType: Physician,Phone (R),Telefone (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Slots de tempo adicionados
 DocType: Item,Attributes,Atributos
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Habilitar modelo
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Defina Naming Series para {0} via Setup&gt; Configurações&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,"Por favor, insira a Conta de Liquidação"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Data do Último Pedido
 DocType: Patient,B Negative,B Negativo
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},A conta {0} não pertence à empresa {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Os números de série na linha {0} não correspondem à nota de entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Os números de série na linha {0} não correspondem à nota de entrega
 DocType: Student,Guardian Details,Dados de Responsável
 DocType: C-Form,C-Form,Form-C
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Marcar Presença em vários funcionários
 DocType: Vehicle,Chassis No,Nr. de Chassis
 DocType: Payment Request,Initiated,Iniciado
 DocType: Production Order,Planned Start Date,Data de Início Planeada
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Selecione uma lista de materiais
 DocType: Serial No,Creation Document Type,Tipo de Criação de Documento
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,A data de término deve ser superior à data de início
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,A data de término deve ser superior à data de início
 DocType: Leave Type,Is Encash,Está Liquidado
 DocType: Leave Allocation,New Leaves Allocated,Novas Licenças Atribuídas
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Não estão disponíveis dados por projecto para a Cotação
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Fim
 DocType: Project,Expected End Date,Data de Término Prevista
 DocType: Budget Account,Budget Amount,Montante do Orçamento
 DocType: Appraisal Template,Appraisal Template Title,Título do Modelo de Avaliação
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},A partir da data {0} para Employee {1} não pode ser antes do funcionário Data juntar {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Comercial
 DocType: Patient,Alcohol Current Use,Uso atual de álcool
+DocType: Student Admission Program,Student Admission Program,Programa de admissão de estudantes
 DocType: Payment Entry,Account Paid To,Conta Paga A
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,O Item Principal {0} não deve ser um Item do Stock
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Todos os Produtos ou Serviços.
@@ -3916,30 +3998,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},O Orçamento {0} para a conta {1} em {2} {3} é de {4}. Ele irá exceder em {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',"Linha {0}# A conta deve ser do tipo ""Ativo Fixo"""
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Qtd de Saída
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,As regras para calcular o montante de envio duma venda
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,e desativado desativado no
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,É obrigatório colocar a Série
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Serviços Financeiros
 DocType: Student Sibling,Student ID,Identidade estudantil
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Tipos de atividades para Registos de Tempo
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,E-mail do fornecedor
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Tipos de atividades para Registos de Tempo
 DocType: Tax Rule,Sales,Vendas
 DocType: Stock Entry Detail,Basic Amount,Montante de Base
 DocType: Training Event,Exam,Exame
 DocType: Complaint,Complaint,Queixa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Armazém necessário para o Item {0} do stock
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Armazém necessário para o Item {0} do stock
 DocType: Leave Allocation,Unused leaves,Licensas não utilizadas
 DocType: Patient,Alcohol Past Use,Uso passado do álcool
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Estado de Faturação
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transferir
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Trazer LDM expandida (incluindo os subconjuntos)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Transferir
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Trazer LDM expandida (incluindo os subconjuntos)
 DocType: Authorization Rule,Applicable To (Employee),Aplicável Ao/À (Funcionário/a)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,É obrigatório colocar a Data de Vencimento
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,É obrigatório colocar a Data de Vencimento
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,O Aumento do Atributo {0} não pode ser 0
 DocType: Journal Entry,Pay To / Recd From,Pagar A / Recb De
 DocType: Naming Series,Setup Series,Série de Instalação
 DocType: Payment Reconciliation,To Invoice Date,Para Data da Fatura
 DocType: Supplier,Contact HTML,HTML de Contacto
 ,Inactive Customers,Clientes Inativos
+DocType: Student Admission Program,Maximum Age,Máxima idade
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Recibos de Compra
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Como que a Regra de Fixação de Preços é aplicada?
@@ -3958,6 +4042,7 @@
 DocType: GL Entry,Remarks,Observações
 DocType: Payment Entry,Account Paid From,Conta Paga De
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Código de Item de Matéria-prima
+DocType: Task,Parent Task,Tarefa dos pais
 DocType: Journal Entry,Write Off Based On,Liquidação Baseada Em
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Crie um Potencial Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Impressão e artigos de papelaria
@@ -3966,20 +4051,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","O salário já foi processado para período entre {0} e {1}, o período de aplicação da Licença não pode estar entre este intervalo de datas."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Registo de Instalação para um Nr. de Série
 DocType: Guardian Interest,Guardian Interest,Interesse do Responsável
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Configurar valores padrão para faturas de PDV
 apps/erpnext/erpnext/config/hr.py +177,Training,Formação
 DocType: Timesheet,Employee Detail,Dados do Funcionário
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ID de e-mail
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ID de e-mail
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,A Próxima Data e Repetir no Dia do Mês Seguinte devem ser iguais
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,A Próxima Data e Repetir no Dia do Mês Seguinte devem ser iguais
 DocType: Lab Prescription,Test Code,Código de Teste
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Definições para página inicial do website
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQs não são permitidos para {0} devido a um ponto de avaliação de {1}
 DocType: Offer Letter,Awaiting Response,A aguardar Resposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Acima
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Quantidade total {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Atributo inválido {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Quantidade total {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Atributo inválido {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Mencionar se a conta a pagar não padrão
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},O mesmo item foi inserido várias vezes. {Lista}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Selecione o grupo de avaliação diferente de &quot;Todos os grupos de avaliação&quot;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Linha {0}: o centro de custo é necessário para um item {1}
 DocType: Training Event Employee,Optional,Opcional
@@ -4002,13 +4087,15 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: O Centro de Custo é obrigatório para o Item {2}
 DocType: Vehicle,Policy No,Nr. de Política
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Obter Itens de Pacote de Produtos
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Como o estoque existe contra um item {0}, você não pode habilitar a propriedade das variantes"
 DocType: Asset,Straight Line,Linha Reta
 DocType: Project User,Project User,Utilizador do Projecto
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Dividido
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Dividido
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Dividido
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Dividido
 DocType: GL Entry,Is Advance,É o Avanço
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,É obrigatória a Presença Da Data À Data
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,"Por favor, responda Sim ou Não a ""É Subcontratado"""
+DocType: Item,Default Purchase Unit of Measure,Unidade de medida de compra padrão
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Data da última comunicação
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Data da última comunicação
 DocType: Sales Team,Contact No.,Nr. de Contacto
@@ -4017,7 +4104,6 @@
 DocType: Production Order,Check if material transfer entry is not required,Verifique se a entrada de transferência de material não é necessária
 DocType: Production Order,Check if material transfer entry is not required,Verifique se a entrada de transferência de material não é necessária
 DocType: Program Enrollment Tool,Get Students From,Obter Estudantes De
-DocType: Hub Settings,Seller Country,País do Vendedor
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publicar Itens no Website
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Grupo seus alunos em lotes
 DocType: Authorization Rule,Authorization Rule,Regra de Autorização
@@ -4027,8 +4113,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Impostos de Vendas e Modelo de Encargos
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Total (Crédito)
 DocType: Repayment Schedule,Payment Date,Data de pagamento
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nova quantidade de lote
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nova quantidade de lote
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Nova quantidade de lote
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Nova quantidade de lote
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Vestuário e Acessórios
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,Não foi possível resolver a função de pontuação ponderada. Verifique se a fórmula é válida.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Número do Pedido
@@ -4046,6 +4132,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Linha #{0}: O Ativo {1} não pode ser enviado, já é {2}"
 DocType: Tax Rule,Billing Country,País de Faturação
 DocType: Purchase Order Item,Expected Delivery Date,Data de Entrega Prevista
+DocType: Restaurant Order Entry,Restaurant Order Entry,Entrada de pedido de restaurante
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,O Débito e o Crédito não são iguais para {0} #{1}. A diferença é de {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Despesas de Entretenimento
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Fazer Pedido de Material
@@ -4058,9 +4145,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Não pode eliminar a conta com a transação existente
 DocType: Vehicle,Last Carbon Check,Último Duplicado de Cheque
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Despesas Legais
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Selecione a quantidade na linha
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Selecione a quantidade na linha
 DocType: Purchase Invoice,Posting Time,Hora de Postagem
 DocType: Timesheet,% Amount Billed,% Valor Faturado
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",O &quot;Tempo por nomeação&quot; não foi definido para o Dr. {0}. Adicione-o no Mestre do Médico.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Despesas Telefónicas
 DocType: Sales Partner,Logo,Logótipo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Selecione esta opção se deseja forçar o utilizador a selecionar uma série antes de guardar. Não haverá nenhum padrão caso selecione esta opção.
@@ -4071,6 +4159,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Novo Rendimento de Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Despesas de Viagem
 DocType: Maintenance Visit,Breakdown,Decomposição
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Adicionar campo personalizado Subscrição no doctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Não é possível selecionar a conta: {0} com a moeda: {1}
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Atualize o custo da lista técnica automaticamente através do Agendador, com base na taxa de avaliação / taxa de preços mais recente / última taxa de compra de matérias-primas."
 DocType: Bank Reconciliation Detail,Cheque Date,Data do Cheque
@@ -4095,7 +4184,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Valor Total de Faturação (através do Registo do Tempo)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Id de Fornecedor
 DocType: Payment Request,Payment Gateway Details,Dados do Portal de Pagamento
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,A quantidade deve ser superior a 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,A quantidade deve ser superior a 0
 DocType: Journal Entry,Cash Entry,Registo de Caixa
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,"Os Subgrupos só podem ser criados sob os ramos do tipo ""Grupo"""
 DocType: Leave Application,Half Day Date,Meio Dia Data
@@ -4113,12 +4202,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Nota: O item {0} já for introduzido diversas vezes
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Todos os Contactos.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Abreviatura da Empresa
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Utilizador {0} não existe
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Utilizador {0} não existe
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Abreviatura
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,O Registo de Pagamento já existe
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Não está autorizado pois {0} excede os limites
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Definidor de modelo de salário.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Patologia
+DocType: Restaurant Order Entry,Restaurant Table,Mesa de restaurante
 DocType: Leave Type,Max Days Leave Allowed,Máx. de Dias de Licença Permitidos
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Estabelecer Regras de Impostos para o carrinho de compras
 DocType: Purchase Invoice,Taxes and Charges Added,Impostos e Encargos Adicionados
@@ -4130,10 +4221,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Cotações para Potenciais Clientes ou Clientes.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Função Com Permissão para editar o stock congelado
 ,Territory Target Variance Item Group-Wise,Variação de Item de Alvo Territorial por Grupo
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Todos os Grupos de Clientes
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Todos os Grupos de Clientes
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Acumulada Mensalmente
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez o registo de Câmbio não tenha sido criado para {1} a {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,É obrigatório inserir o Modelo de Impostos.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,É obrigatório inserir o Modelo de Impostos.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,A Conta {0}: Conta principal {1} não existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Taxa de Lista de Preços (Moeda da Empresa)
 DocType: Products Settings,Products Settings,Definições de Produtos
@@ -4159,13 +4250,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Dados de Taxa por Item
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Abreviação do Instituto
 ,Item-wise Price List Rate,Taxa de Lista de Preço por Item
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Cotação do Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Cotação do Fornecedor
 DocType: Quotation,In Words will be visible once you save the Quotation.,Por extenso será visível assim que guardar o Orçamento.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Quantidade ({0}) não pode ser uma fração na linha {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Quantidade ({0}) não pode ser uma fração na linha {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},O Código de Barras {0} já foi utilizado no Item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},O Código de Barras {0} já foi utilizado no Item {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,As regras para adicionar os custos de envio.
 DocType: Item,Opening Stock,Stock Inicial
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,É necessário colocar o cliente
@@ -4184,9 +4275,8 @@
 DocType: Customer,From Lead,Do Potencial Cliente
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Pedidos lançados para a produção.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Selecione o Ano Fiscal...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,É necessário colocar o Perfil POS para efetuar um Registo POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,É necessário colocar o Perfil POS para efetuar um Registo POS
 DocType: Program Enrollment Tool,Enroll Students,Matricular Estudantes
-DocType: Hub Settings,Name Token,Nome do Token
 DocType: Lab Test,Approved Date,Data aprovada
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Venda Padrão
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,É obrigatório colocar pelo menos um armazém
@@ -4204,7 +4294,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Recursos Humanos
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pagamento de Conciliação de Pagamento
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Ativo Fiscal
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},A ordem de produção foi {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},A ordem de produção foi {0}
 DocType: BOM Item,BOM No,Nr. da LDM
 DocType: Instructor,INS/,INS/
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,O Lançamento Contabilístico {0} não tem conta {1} ou já foi vinculado a outro voucher
@@ -4224,8 +4314,8 @@
 DocType: Currency Exchange,To Currency,A Moeda
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Permitir que os seguintes utilizadores aprovem Pedidos de Licenças para dias bloqueados.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Tipos de Reembolso de Despesas.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},A taxa de venda do item {0} é menor que a {1}. A taxa de venda deve ser pelo menos {2}
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},A taxa de venda do item {0} é menor que a {1}. A taxa de venda deve ser pelo menos {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},A taxa de venda do item {0} é menor que a {1}. A taxa de venda deve ser pelo menos {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},A taxa de venda do item {0} é menor que a {1}. A taxa de venda deve ser pelo menos {2}
 DocType: Item,Taxes,Impostos
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Pago e Não Entregue
 DocType: Project,Default Cost Center,Centro de Custo Padrão
@@ -4239,15 +4329,15 @@
 DocType: Employee Loan,Fully Disbursed,totalmente Desembolso
 DocType: Maintenance Visit,Customer Feedback,Feedback dos Clientes
 DocType: Account,Expense,Despesa
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Pontuação não pode ser maior do que pontuação máxima
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Pontuação não pode ser maior do que pontuação máxima
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Clientes e Fornecedores
 DocType: Item Attribute,From Range,Faixa De
 DocType: BOM,Set rate of sub-assembly item based on BOM,Taxa ajustada do item de subconjunto com base na lista técnica
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Erro de sintaxe na fórmula ou condição: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Erro de sintaxe na fórmula ou condição: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Definições do Resumo de Diário Trabalho da Empresa
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,O Item {0} foi ignorado pois não é um item de stock
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Submeta este Pedido de Produção para posterior processamento.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Submeta este Pedido de Produção para posterior processamento.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Para não aplicar regra de preços numa determinada transação, todas as regras de preços aplicáveis devem ser desativadas."
 DocType: Assessment Group,Parent Assessment Group,Grupo de Avaliação pai
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Empregos
@@ -4264,12 +4354,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Defina o filtro de empresa em branco se Group By for &#39;Company&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,A Data de Postagem não pode ser uma data futura
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Linha # {0}: O Nr. de Série {1} não corresponde a {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,para gerar o recorrente
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Licença Ocasional
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Teste de laboratório UOM.
 DocType: Batch,Batch ID,ID do Lote
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Nota: {0}
 ,Delivery Note Trends,Tendências das Guias de Remessa
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Resumo da Semana
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Resumo da Semana
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Quantidade em stock
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,A Conta: {0} só pode ser atualizada através das Transações de Stock
 DocType: Student Group Creation Tool,Get Courses,Obter Cursos
@@ -4283,7 +4374,6 @@
 DocType: Purchase Order,To Bill,Para Faturação
 DocType: Material Request,% Ordered,% Pedida
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Para o Grupo de Estudantes com Curso, o Curso será validado para cada Estudante dos Cursos Inscritos em Inscrição no Programa."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date",Insira o Endereço de Email separado por vírgulas. A fatura será enviada automaticamente numa determinada data
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Trabalho à Peça
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Preço de compra médio
 DocType: Task,Actual Time (in Hours),Tempo Real (em Horas)
@@ -4297,7 +4387,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,"O Item {0} não está configurado para os Nrs. de Série, a coluna deve estar em branco"
 DocType: Accounts Settings,Accounts Settings,Definições de Contas
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,Aprovar
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Nenhum resultado para enviar
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Nenhum resultado para enviar
 DocType: Customer,Sales Partner and Commission,Parceiro e Comissão de Vendas
 DocType: Employee Loan,Rate of Interest (%) / Year,Taxa de juro (%) / Ano
 ,Project Quantity,Quantidade de Projeto
@@ -4309,55 +4399,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Preto
 DocType: BOM Explosion Item,BOM Explosion Item,Expansão de Item da LDM
 DocType: Account,Auditor,Auditor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} itens produzidos
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} itens produzidos
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Saber mais
 DocType: Cheque Print Template,Distance from top edge,Distância da margem superior
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Preço de tabela {0} está desativado ou não existe
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Preço de tabela {0} está desativado ou não existe
 DocType: Purchase Invoice,Return,Devolver
 DocType: Production Order Operation,Production Order Operation,Operação de Pedido de Produção
 DocType: Pricing Rule,Disable,Desativar
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Modo de pagamento é necessário para fazer um pagamento
 DocType: Project Task,Pending Review,Revisão Pendente
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Nomeações e Consultas
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} não está inscrito no lote {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} não está inscrito no lote {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","O ativo {0} não pode ser eliminado, uma vez que já é um/a {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Reivindicação de Despesa Total (através de Reembolso de Despesas)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Marcar Ausência
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Linha {0}: A Moeda da LDM # {1} deve ser igual à moeda selecionada {2}
 DocType: Journal Entry Account,Exchange Rate,Valor de Câmbio
 DocType: Patient,Additional information regarding the patient,Informações adicionais sobre o paciente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,A Ordem de Vendas {0} não foi enviada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,A Ordem de Vendas {0} não foi enviada
 DocType: Homepage,Tag Line,Linha de tag
 DocType: Fee Component,Fee Component,Componente de Propina
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Gestão de Frotas
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Adicionar itens de
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Gestão de Frotas
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Adicionar itens de
 DocType: Cheque Print Template,Regular,Regular
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Weightage total de todos os Critérios de Avaliação deve ser 100%
-DocType: BOM,Last Purchase Rate,Taxa da Última Compra
+DocType: Purchase Order Item,Last Purchase Rate,Taxa da Última Compra
 DocType: Account,Asset,Ativo
 DocType: Project Task,Task ID,ID da Tarefa
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"O Stock não pode existir para o Item {0}, pois já possui variantes"
 DocType: Lab Test,Mobile,Móvel
 ,Sales Person-wise Transaction Summary,Resumo da Transação por Vendedor
 DocType: Training Event,Contact Number,Número de Contacto
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,O Armazém {0} não existe
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Inscreva-se na Plataforma ERPNext
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,O Armazém {0} não existe
 DocType: Monthly Distribution,Monthly Distribution Percentages,Percentagens de Distribuição Mensal
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,O item selecionado não pode ter um Lote
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","taxa de valorização não encontrado para o item {0}, que é necessário para fazer lançamentos contábeis para {1} {2}. Se o item for negociado como um item de amostra no {1}, por favor mencione que na tabela do item do {1}. Caso contrário, crie uma transação de ações de entrada para a taxa de valorização item ou menção no registro de item e, em seguida, tentar submeter / cancelar esta entrada"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% de materiais entregues desta Guia de Remessa
+DocType: Training Event,Has Certificate,Tem certificado
 DocType: Project,Customer Details,Dados do Cliente
 DocType: Employee,Reports to,Relatórios para
 ,Unpaid Expense Claim,De Despesas não remunerado
 DocType: Payment Entry,Paid Amount,Montante Pago
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Explore o ciclo de vendas
 DocType: Assessment Plan,Supervisor,Supervisor
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,Online
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,Online
 ,Available Stock for Packing Items,Stock Disponível para Items Embalados
 DocType: Item Variant,Item Variant,Variante do Item
 DocType: Assessment Result Tool,Assessment Result Tool,Avaliação Resultado Ferramenta
 DocType: BOM Scrap Item,BOM Scrap Item,Item de Sucata da LDM
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,ordens enviadas não pode ser excluído
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,ordens enviadas não pode ser excluído
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","O saldo da conta já está em débito, não tem permissão para definir o ""Saldo Deve Ser"" como ""Crédito"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Gestão da Qualidade
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,O Item {0} foi desativado
@@ -4378,7 +4467,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Permitir taxa de avaliação zero
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Permitir taxa de avaliação zero
 DocType: Training Event Employee,Invited,Convidado
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Foram encontrados Várias Estruturas Salariais ativas para o funcionário {0} para as datas indicadas
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Foram encontrados Várias Estruturas Salariais ativas para o funcionário {0} para as datas indicadas
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Configuração de contas do Portal.
 DocType: Employee,Employment Type,Tipo de Contratação
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Ativos Imobilizados
@@ -4390,7 +4479,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Student E-mail ID
 DocType: Employee,Notice (days),Aviso (dias)
 DocType: Tax Rule,Sales Tax Template,Modelo do Imposto sobre Vendas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Selecione os itens para guardar a fatura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Selecione os itens para guardar a fatura
 DocType: Employee,Encashment Date,Data de Pagamento
 DocType: Training Event,Internet,Internet
 DocType: Special Test Template,Special Test Template,Modelo de teste especial
@@ -4400,7 +4489,7 @@
 DocType: Academic Term,Term Start Date,Prazo Data de Início
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},"Por favor, encontre no anexo {0} #{1}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},"Por favor, encontre no anexo {0} #{1}"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Declaração Bancária de Saldo de acordo com a Razão Geral
 DocType: Job Applicant,Applicant Name,Nome do Candidato
 DocType: Authorization Rule,Customer / Item Name,Cliente / Nome do Item
@@ -4426,7 +4515,7 @@
 DocType: Guardian,Guardian Of ,guardião
 DocType: Grading Scale Interval,Threshold,Limite
 DocType: BOM Update Tool,Current BOM,LDM Atual
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Adicionar Nr. de Série
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Adicionar Nr. de Série
 DocType: Production Order Item,Available Qty at Source Warehouse,Qtd disponível no Source Warehouse
 apps/erpnext/erpnext/config/support.py +22,Warranty,Garantia
 DocType: Purchase Invoice,Debit Note Issued,Nota de Débito Emitida
@@ -4449,10 +4538,9 @@
 DocType: Account,Receivable,A receber
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Linha {0}: Não é permitido alterar o Fornecedor pois já existe uma Ordem de Compra
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,A função para a qual é permitida enviar transações que excedam os limites de crédito estabelecidos.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Selecione os itens para Fabricação
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Os dados do definidor estão a sincronizar, isto pode demorar algum tempo"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Selecione os itens para Fabricação
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Os dados do definidor estão a sincronizar, isto pode demorar algum tempo"
 DocType: Item,Material Issue,Saída de Material
-DocType: Hub Settings,Seller Description,Descrição do Vendedor
 DocType: Employee Education,Qualification,Qualificação
 DocType: Item Price,Item Price,Preço de Item
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sabão e Detergentes
@@ -4460,7 +4548,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,O Tempo De não pode ser após o Tempo Para.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Filmes e Vídeos
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Pedido
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Currículo
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Currículo
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Se ativado, o sistema não atualizará os campos das variantes do modelo, mas copiará os dados dos campos abaixo mencionados ao fazer uma nova variante"
 DocType: Salary Detail,Component,Componente
 DocType: Assessment Criteria,Assessment Criteria Group,Critérios de Avaliação Grupo
 DocType: Healthcare Settings,Patient Name By,Nome do paciente por
@@ -4470,7 +4559,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Por favor, insira a Função Aprovadora ou o Utilizador Aprovador"
 DocType: Journal Entry,Write Off Entry,Registo de Liquidação
 DocType: BOM,Rate Of Materials Based On,Taxa de Materiais Baseada Em
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Fornecedor&gt; Tipo de Fornecedor
+DocType: Item Variant Settings,Do not Update Variants,Não atualize variantes
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Apoio Analítico
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Desmarcar todos
 DocType: POS Profile,Terms and Conditions,Termos e Condições
@@ -4479,7 +4568,7 @@
 DocType: Leave Block List,Applies to Company,Aplica-se à Empresa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,Não pode cancelar porque o Registo de Stock {0} existe
 DocType: Employee Loan,Disbursement Date,Data de desembolso
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;Recipientes&#39; não especificados
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Recipientes&#39; não especificados
 DocType: BOM Update Tool,Update latest price in all BOMs,Atualize o preço mais recente em todas as BOMs
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Registo médico
 DocType: Vehicle,Vehicle,Veículo
@@ -4495,14 +4584,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,SOLMAT-
 ,Asset Depreciations and Balances,Depreciações e Saldos de Ativo
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Montante {0} {1} transferido de {2} para {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Montante {0} {1} transferido de {2} para {3}
 DocType: Sales Invoice,Get Advances Received,Obter Adiantamentos Recebidos
 DocType: Email Digest,Add/Remove Recipients,Adicionar/Remover Destinatários
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Transação não permitida na Ordem de Produção {0} parada
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Para definir este Ano Fiscal como Padrão, clique em ""Definir como Padrão"""
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Inscrição
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Inscrição
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Qtd de Escassez
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,A variante do Item {0} já existe com mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,A variante do Item {0} já existe com mesmos atributos
 DocType: Employee Loan,Repay from Salary,Reembolsar a partir de Salário
 DocType: Leave Application,LAP/,APL/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Solicitando o pagamento contra {0} {1} para montante {2}
@@ -4515,7 +4604,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Item da Ordem de Venda
 DocType: Salary Slip,Payment Days,Dias de Pagamento
 DocType: Patient,Dormant,Inativo
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Os armazéns com subgrupos não podem ser convertido em livro
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Os armazéns com subgrupos não podem ser convertido em livro
 DocType: BOM,Manage cost of operations,Gerir custo das operações
 DocType: Accounts Settings,Stale Days,Dias fechados
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Quando qualquer uma das operações verificadas foi ""Enviado&quot"", abre-se um email pop-up automaticamente para enviar um email para o ""Contacto"" associado nessa transação, com a transação como anexo. O utilizador pode ou não enviar o email."
@@ -4529,10 +4618,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,O Nr. de Série {0} já foi recebido
 ,Requested Items To Be Transferred,Itens Solicitados A Serem Transferidos
 DocType: Expense Claim,Vehicle Log,Registo de Veículo
-DocType: Purchase Invoice,Recurring Id,ID Recorrente
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Presença de febre (temperatura&gt; 38,5 ° C / 101,3 ° F ou temperatura sustentada&gt; 38 ° C / 100,4 ° F)"
 DocType: Customer,Sales Team Details,Dados de Equipa de Vendas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Eliminar permanentemente?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Eliminar permanentemente?
 DocType: Expense Claim,Total Claimed Amount,Montante Reclamado Total
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potenciais oportunidades de venda.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Inválido {0}
@@ -4542,7 +4630,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Lojas do Departamento
 ,Item Delivery Date,Data de entrega do item
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Setup sua escola em ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Setup sua escola em ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Montante de Modificação Base (Moeda da Empresa)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Não foram encontrados registos contabilísticos para os seguintes armazéns
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Guarde o documento pela primeira vez.
@@ -4554,13 +4642,12 @@
 DocType: Task,Is Milestone,É Milestone
 DocType: Daily Work Summary,Email Sent To,Email Enviado Para
 DocType: Budget,Warn,Aviso
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Tem certeza de que deseja cancelar o registro?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Quaisquer outras observações, dignas de serem mencionadas, que devem ir para os registos."
 DocType: BOM,Manufacturing User,Utilizador de Fabrico
 DocType: Purchase Invoice,Raw Materials Supplied,Matérias-primas Fornecidas
-DocType: Purchase Invoice,Recurring Print Format,Formato de Impressão Recorrente
 DocType: C-Form,Series,Série
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Moeda da lista de preços {0} deve ser {1} ou {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Adicionar produtos
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Moeda da lista de preços {0} deve ser {1} ou {2}
 DocType: Appraisal,Appraisal Template,Modelo de Avaliação
 DocType: Item Group,Item Classification,Classificação do Item
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Gestor de Desenvolvimento de Negócios
@@ -4574,7 +4661,7 @@
 DocType: Item Attribute Value,Attribute Value,Valor do Atributo
 ,Itemwise Recommended Reorder Level,Nível de Reposição Recomendada por Item
 DocType: Salary Detail,Salary Detail,Dados Salariais
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,"Por favor, seleccione primeiro {0}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,"Por favor, seleccione primeiro {0}"
 DocType: Appointment Type,Physician,Médico
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,O Lote {0} do Item {1} expirou.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Consultas
@@ -4585,7 +4672,7 @@
 DocType: Salary Detail,Default Amount,Montante Padrão
 DocType: Lab Test Template,Descriptive,Descritivo
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,O armazém não foi encontrado no sistema
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Resumo Deste Mês
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Resumo Deste Mês
 DocType: Quality Inspection Reading,Quality Inspection Reading,Leitura de Inspeção de Qualidade
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,"""Congelar Stocks Mais Antigos Que"" deve ser menor que %d dias."
 DocType: Tax Rule,Purchase Tax Template,Modelo de Taxa de Compra
@@ -4608,12 +4695,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Eventos de treinamento / resultados
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Depreciação Acumulada como em
 DocType: Sales Invoice,C-Form Applicable,Aplicável ao Form-C
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},O Tempo de Operação deve ser superior a 0 para a Operação {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},O Tempo de Operação deve ser superior a 0 para a Operação {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,É obrigatório colocar o Armazém
 DocType: Supplier,Address and Contacts,Endereços e Contactos
 DocType: UOM Conversion Detail,UOM Conversion Detail,Dados de Conversão de UNID
 DocType: Program,Program Abbreviation,Abreviação do Programa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Não pode ser criado uma Ordem de Produção para um Item Modelo
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Não pode ser criado uma Ordem de Produção para um Item Modelo
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Os custos de cada item são atualizados no Recibo de Compra
 DocType: Warranty Claim,Resolved By,Resolvido Por
 DocType: Bank Guarantee,Start Date,Data de Início
@@ -4639,27 +4726,28 @@
 DocType: Employee,Educational Qualification,Qualificação Educacional
 DocType: Workstation,Operating Costs,Custos de Funcionamento
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Ação se o Orçamento Mensal Acumulado for Excedido
-DocType: Purchase Invoice,Submit on creation,Enviar na criação
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},A moeda para {0} deve ser {1}
+DocType: Subscription,Submit on creation,Enviar na criação
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},A moeda para {0} deve ser {1}
 DocType: Asset,Disposal Date,Data de Eliminação
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Os emails serão enviados para todos os funcionários ativos da empresa na hora estabelecida, se não estiverem de férias. O resumo das respostas será enviado à meia-noite."
 DocType: Employee Leave Approver,Employee Leave Approver,Autorizador de Licenças do Funcionário
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Linha{0}: Já existe um registo de Reencomenda para este armazém {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Não pode declarar como perdido, porque foi efetuada uma Cotação."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Feedback de Formação
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Linha{0}: Já existe um registo de Reencomenda para este armazém {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Não pode declarar como perdido, porque foi efetuada uma Cotação."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Feedback de Formação
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,A Ordem de Produção {0} deve ser enviado
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Critérios do Scorecard do Fornecedor
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},"Por favor, seleccione a Data de Início e a Data de Término do Item {0}"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},O Curso é obrigatório na linha {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,A data a não pode ser anterior à data de
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Adicionar / Editar Preços
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Adicionar / Editar Preços
 DocType: Batch,Parent Batch,Lote pai
 DocType: Batch,Parent Batch,Lote pai
 DocType: Cheque Print Template,Cheque Print Template,Modelo de Impressão de Cheque
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Gráfico de Centros de Custo
 DocType: Lab Test Template,Sample Collection,Coleção de amostras
 ,Requested Items To Be Ordered,Itens solicitados para encomendar
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Meus pedidos
 DocType: Price List,Price List Name,Nome da Lista de Preços
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Resumo do Trabalho Diário para {0}
 DocType: Employee Loan,Totals,Totais
@@ -4678,12 +4766,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,São necessárias {0} unidades de {1} em {2} em {3} {4} para {5} para concluir esta transação.
 DocType: Fee Schedule,Student Category,Categoria de Estudante
 DocType: Announcement,Student,Estudante
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Definidor da unidade organizacional (departamento).
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Definidor da unidade organizacional (departamento).
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Ir para os Quartos
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Por favor, insira a mensagem antes de enviá-la"
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,DUPLICADO PARA FORNECEDOR
 DocType: Email Digest,Pending Quotations,Cotações Pendentes
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Perfil de Ponto de Venda
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Perfil de Ponto de Venda
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Configurações de teste de laboratório.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Empréstimos Não Garantidos
 DocType: Cost Center,Cost Center Name,Nome do Centro de Custo
@@ -4693,6 +4781,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Qtd Total Paga
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,As mensagens maiores do que 160 caracteres vão ser divididas em múltiplas mensagens
 DocType: Purchase Receipt Item,Received and Accepted,Recebido e Aceite
+DocType: Hub Settings,Company and Seller Profile,Perfil da empresa e do vendedor
 ,GST Itemised Sales Register,Registro de vendas detalhado GST
 ,Serial No Service Contract Expiry,Vencimento de Contrato de Serviço de Nr. de Série
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Não pode creditar e debitar na mesma conta ao mesmo tempo
@@ -4702,10 +4791,11 @@
 DocType: Item,Variant Based On,Variant Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},O peso total atribuído deve ser de 100 %. É {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Seus Fornecedores
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Corrija o
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Não pode definir como Oportunidade Perdida pois a Ordem de Venda já foi criado.
 DocType: Request for Quotation Item,Supplier Part No,Peça de Fornecedor Nr.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Não pode deduzir quando a categoria é para ""Estimativa"" ou ""Estimativa e Total"""
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Recebido De
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Recebido De
 DocType: Lead,Converted,Convertido
 DocType: Item,Has Serial No,Tem Nr. de Série
 DocType: Employee,Date of Issue,Data de Emissão
@@ -4713,7 +4803,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","De acordo com as Configurações de compra, se o Recibo Obtido Obrigatório == &#39;SIM&#39;, então, para criar a Fatura de Compra, o usuário precisa criar o Recibo de Compra primeiro para o item {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Linha #{0}: Definir Fornecedor para o item {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Linha {0}: O valor por hora deve ser maior que zero.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Não foi possível encontrar a Imagem do Website {0} anexada ao Item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Não foi possível encontrar a Imagem do Website {0} anexada ao Item {1}
 DocType: Issue,Content Type,Tipo de Conteúdo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computador
 DocType: Item,List this Item in multiple groups on the website.,Listar este item em vários grupos do website.
@@ -4724,14 +4814,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Obter Registos Não Conciliados
 DocType: Payment Reconciliation,From Invoice Date,Data de Fatura De
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Você não tem permissão para enviar
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,A moeda de Faturação deve ser igual à moeda padrão da empresa ou à moeda padrão da conta da outra parte
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,A moeda de Faturação deve ser igual à moeda padrão da empresa ou à moeda padrão da conta da outra parte
 DocType: Healthcare Settings,Laboratory Settings,Configurações de Laboratório
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,deixar Cobrança
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,O que faz?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Armazém Para
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Todas as Admissão de Estudantes
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,O que faz?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Armazém Para
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Todas as Admissão de Estudantes
 ,Average Commission Rate,Taxa de Comissão Média
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,"""Tem um Nr. de Série"" não pode ser ""Sim"" para um item sem gestão de stock"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,"""Tem um Nr. de Série"" não pode ser ""Sim"" para um item sem gestão de stock"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Selecionar status
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,A presença não pode ser registada em datas futuras
 DocType: Pricing Rule,Pricing Rule Help,Ajuda da Regra Fixação de Preços
@@ -4749,41 +4839,41 @@
 DocType: Item,Customer Code,Código de Cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Lembrete de Aniversário para o/a {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dias Desde a última Ordem
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,A conta de Débito Para deve ser uma conta de Balanço
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,A conta de Débito Para deve ser uma conta de Balanço
 DocType: Buying Settings,Naming Series,Série de Atrib. de Nomes
 DocType: Leave Block List,Leave Block List Name,Nome de Lista de Bloqueio de Licenças
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,A data de Início do Seguro deve ser anterior à data de Término do Seguro
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Configura o sistema de nomeação do instrutor na escola&gt; Configurações escolares
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Ativos de Stock
 DocType: Timesheet,Production Detail,Dados de Produção
+DocType: Restaurant,Active Menu,Menu Ativo
 DocType: Target Detail,Target Qty,Qtd Alvo
 DocType: Shopping Cart Settings,Checkout Settings,Definições de Saída
 DocType: Attendance,Present,Presente
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,A Guia de Remessa {0} não deve ser enviada
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,A Guia de Remessa {0} não deve ser enviada
 DocType: Notification Control,Sales Invoice Message,Mensagem de Fatura de Vendas
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,A Conta de Encerramento {0} deve ser do tipo de Responsabilidade / Equidade
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},A Folha de Vencimento do funcionário {0} já foi criada para folha de vencimento {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},A Folha de Vencimento do funcionário {0} já foi criada para folha de vencimento {1}
 DocType: Vehicle Log,Odometer,Conta-km
 DocType: Sales Order Item,Ordered Qty,Qtd Pedida
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,O Item {0} está desativado
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,O Item {0} está desativado
 DocType: Stock Settings,Stock Frozen Upto,Stock Congelado Até
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,A LDM não contém nenhum item em stock
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Atividade / tarefa do projeto.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,A LDM não contém nenhum item em stock
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Atividade / tarefa do projeto.
 DocType: Vehicle Log,Refuelling Details,Dados de Reabastecimento
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Gerar Folhas de Vencimento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","A compra deve ser verificada, se Aplicável Para for selecionado como {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,O Desconto deve ser inferior a 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Não foi encontrada a taxa da última compra
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Montante de Liquidação (Moeda da Empresa)
 DocType: Sales Invoice Timesheet,Billing Hours,Horas de Faturação
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,Não foi encontrado a LDM Padrão para {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,"Linha #{0}: Por favor, defina a quantidade de reencomenda"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Não foi encontrado a LDM Padrão para {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,"Linha #{0}: Por favor, defina a quantidade de reencomenda"
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Toque em itens para adicioná-los aqui
 DocType: Fees,Program Enrollment,Inscrição no Programa
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher de Custo de Entrega
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Por favor, defina {0}"
-DocType: Purchase Invoice,Repeat on Day of Month,Repetir no Dia do Mês
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} é estudante inativo
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} é estudante inativo
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} é estudante inativo
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} é estudante inativo
 DocType: Employee,Health Details,Dados Médicos
 DocType: Offer Letter,Offer Letter Terms,Termos de Carta de Oferta
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Para criar um documento de referência de Pedido de pagamento é necessário
@@ -4792,7 +4882,6 @@
 DocType: Employee External Work History,Salary,Salário
 DocType: Serial No,Delivery Document Type,Tipo de Documento de Entrega
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Submeter todas as folhas de vencimento para os critérios selecionados acima
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Itens sincronizados
 DocType: Sales Order,Partly Delivered,Parcialmente Entregue
 DocType: Email Digest,Receivables,A Receber
 DocType: Lead Source,Lead Source,Fonte de Potencial Cliente
@@ -4813,9 +4902,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Faixa Etária 2
 DocType: SG Creation Tool Course,Max Strength,Força Máx.
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,LDM substituída
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Selecione itens com base na data de entrega
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Selecione itens com base na data de entrega
 ,Sales Analytics,Análise de Vendas
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Disponível {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Disponível {0}
 ,Prospects Engaged But Not Converted,"Perspectivas contratadas, mas não convertidas"
 ,Prospects Engaged But Not Converted,"Perspectivas contratadas, mas não convertidas"
 DocType: Manufacturing Settings,Manufacturing Settings,Definições de Fabrico
@@ -4823,10 +4912,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 móvel Não
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,"Por favor, indique a moeda padrão no Definidor da Empresa"
 DocType: Stock Entry Detail,Stock Entry Detail,Dado de Registo de Stock
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Lembretes Diários
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Lembretes Diários
 DocType: Products Settings,Home Page is Products,A Página Principal são os Produtos
 ,Asset Depreciation Ledger,Livro de Depreciação de Ativo
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},A Regra Fiscal está em Conflito com {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},A Regra Fiscal está em Conflito com {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Novo Nome de Conta
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Custo de Matérias-primas Fornecidas
 DocType: Selling Settings,Settings for Selling Module,Definições para Vender Módulo
@@ -4840,8 +4929,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,O Item {0} deve ser um Item de stock
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Armazém de Trabalho em Progresso Padrão
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,As definições padrão para as transações contabilísticas.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configure o Sistema de Nomeação de Empregados em Recursos Humanos&gt; Configurações de RH
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,A Data Prevista não pode ser anterior à Data de Solicitação de Materiais
+DocType: Restaurant,Default Tax Template,Modelo de imposto padrão
 DocType: Fees,Student Details,Detalhes do aluno
 DocType: Purchase Invoice Item,Stock Qty,Quantidade de stock
 DocType: Purchase Invoice Item,Stock Qty,Quantidade de Stock
@@ -4860,8 +4950,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Ir para Itens
 DocType: Sales Partner,Partner Type,Tipo de Parceiro
 DocType: Purchase Taxes and Charges,Actual,Atual
+DocType: Restaurant Menu,Restaurant Manager,Gerente de restaurante
 DocType: Authorization Rule,Customerwise Discount,Desconto por Cliente
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Registo de Horas para as tarefas.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Registo de Horas para as tarefas.
 DocType: Purchase Invoice,Against Expense Account,Na Conta de Despesas
 DocType: Production Order,Production Order,Ordem de Produção
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,A Nota de Instalação {0} já foi enviada
@@ -4869,7 +4960,6 @@
 DocType: Quotation Item,Against Docname,No Nomedoc
 DocType: SMS Center,All Employee (Active),Todos os Funcionários (Ativos)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Ver Já
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Selecione o período em que a factura será gerada automaticamente
 DocType: BOM,Raw Material Cost,Custo de Matéria-Prima
 DocType: Item Reorder,Re-Order Level,Nível de Reencomenda
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Insira os itens e a qtd planeada para os pedidos de produção que deseja fazer ou efetue o download de matérias-primas para a análise.
@@ -4882,24 +4972,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,É obrigatório colocar o Tipo de Relatório
 DocType: Item,Serial Number Series,Série de Número em Série
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},É obrigatório colocar o armazém para o item em stock {0} na linha {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Adicionar Programas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retalho e Grosso
 DocType: Issue,First Responded On,Primeira Resposta Em
 DocType: Website Item Group,Cross Listing of Item in multiple groups,A Lista Cruzada do Item em vários grupos
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},A Data de Início do Ano Fiscal e a Data de Término do Ano Fiscal já está definida no Ano Fiscal de {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Data de Liquidação atualizada
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Lote dividido
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Lote dividido
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Lote dividido
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Lote dividido
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Reconciliados Com Sucesso
 DocType: Request for Quotation Supplier,Download PDF,Transferir PDF
 DocType: Production Order,Planned End Date,Data de Término Planeada
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Digite Schedule Date
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Onde os itens são armazenados.
 DocType: Request for Quotation,Supplier Detail,Dados de Fornecedor
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Erro na fórmula ou condição: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Erro na fórmula ou condição: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Montante Faturado
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Os pesos dos critérios devem somar até 100%
 DocType: Attendance,Attendance,Assiduidade
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,Itens de Stock
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,Itens de Stock
 DocType: BOM,Materials,Materiais
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Se não for selecionada, a lista deverá ser adicionada a cada Departamento onde tem de ser aplicada."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,O Armazém de Origem e Destino não pode ser o mesmo
@@ -4917,13 +5007,14 @@
 DocType: Purchase Taxes and Charges,On Net Total,No Total Líquido
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},O Valor para o Atributo {0} deve estar dentro do intervalo de {1} a {2} nos acréscimos de {3} para o Item {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,O Armazém de destino na linha {0} deve ser o mesmo que o Pedido de Produção
+DocType: Restaurant Reservation,Waitlisted,Espera de espera
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,A moeda não pode ser alterada depois de efetuar registos utilizando alguma outra moeda
 DocType: Vehicle Service,Clutch Plate,Embraiagem
 DocType: Company,Round Off Account,Arredondar Conta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Despesas Administrativas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consultoria
 DocType: Customer Group,Parent Customer Group,Grupo de Clientes Principal
-DocType: Journal Entry,Subscription,Inscrição
+DocType: Journal Entry,Subscription,Subscrição
 DocType: Purchase Invoice,Contact Email,Email de Contacto
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Criação de taxa pendente
 DocType: Appraisal Goal,Score Earned,Classificação Ganha
@@ -4933,7 +5024,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Novo Nome de Vendedor
 DocType: Packing Slip,Gross Weight UOM,Peso Bruto da UNID
 DocType: Delivery Note Item,Against Sales Invoice,Na Fatura de Venda
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Digite números de série para o item serializado
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Digite números de série para o item serializado
 DocType: Bin,Reserved Qty for Production,Qtd Reservada para a Produção
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Deixe desmarcada se você não quiser considerar lote ao fazer cursos com base grupos.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Deixe desmarcada se você não quiser considerar lote ao fazer cursos com base grupos.
@@ -4945,7 +5036,7 @@
 DocType: Lab Test,Test Group,Grupo de teste
 DocType: Payment Reconciliation,Receivable / Payable Account,Conta A Receber / A Pagar
 DocType: Delivery Note Item,Against Sales Order Item,No Item da Ordem de Venda
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},"Por favor, especifique um Valor de Atributo para o atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},"Por favor, especifique um Valor de Atributo para o atributo {0}"
 DocType: Item,Default Warehouse,Armazém Padrão
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},O Orçamento não pode ser atribuído à Conta de Grupo {0}
 DocType: Healthcare Settings,Patient Registration,Registro de Paciente
@@ -4974,6 +5065,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Vendedor/a
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Orçamento e Centro de Custo
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,O modo de pagamento padrão múltiplo não é permitido
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,para o
 ,Appointment Analytics,Análise de nomeação
 DocType: Vehicle Service,Half Yearly,Semestrais
 DocType: Lead,Blog Subscriber,Assinante do Blog
@@ -4992,7 +5084,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Contagem de quot
 ,BOM Stock Report,Relatório de stock da LDM
 DocType: Stock Reconciliation Item,Quantity Difference,Diferença de Quantidade
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,A Processar Salários
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,A Processar Salários
 DocType: Opportunity Item,Basic Rate,Taxa Básica
 DocType: GL Entry,Credit Amount,Montante de Crédito
 DocType: Cheque Print Template,Signatory Position,Posição do Signatário
@@ -5006,12 +5098,12 @@
 DocType: Tax Rule,Tax Rule,Regra Fiscal
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Manter a Mesma Taxa em Todo o Ciclo de Vendas
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planear o registo de tempo fora do Horário de Trabalho do Posto de Trabalho.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Os clientes na fila
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} não possui um horário de médicos. Adicione-o em Médico mestre
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Os clientes na fila
 DocType: Student,Nationality,Nacionalidade
 ,Items To Be Requested,Items a Serem Solicitados
-DocType: Purchase Order,Get Last Purchase Rate,Obter Última Taxa de Compra
 DocType: Company,Company Info,Informações da Empresa
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Selecionar ou adicionar novo cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Selecionar ou adicionar novo cliente
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,centro de custo é necessário reservar uma reivindicação de despesa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicação de Fundos (Ativos)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Esta baseia-se na assiduidade deste Funcionário
@@ -5019,6 +5111,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Conta de Débito
 DocType: Fiscal Year,Year Start Date,Data de Início do Ano
 DocType: Attendance,Employee Name,Nome do Funcionário
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Item de entrada de pedido de restaurante
 DocType: Sales Invoice,Rounded Total (Company Currency),Total Arredondado (Moeda da Empresa)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Não é possível converter para o Grupo, pois o Tipo de Conta está selecionado."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,"{0} {1} foi alterado. Por favor, faça uma atualização."
@@ -5029,6 +5122,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Benefícios do Funcionário
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},A quantidade embalada deve ser igual à quantidade do Item {0} na linha {1}
 DocType: Production Order,Manufactured Qty,Qtd Fabricada
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Fatura criada
 DocType: Purchase Receipt Item,Accepted Quantity,Quantidade Aceite
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},"Por favor, defina uma Lista de Feriados padrão para o(a) Funcionário(a) {0} ou para a Empresa {1}"
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} não existe
@@ -5038,18 +5132,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Linha Nr. {0}: O valor não pode ser superior ao Montante Pendente no Reembolso de Despesas {1}. O Montante Pendente é {2}
 DocType: Maintenance Schedule,Schedule,Programar
 DocType: Account,Parent Account,Conta Principal
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Disponível
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Disponível
 DocType: Quality Inspection Reading,Reading 3,Leitura 3
 ,Hub,Plataforma
 DocType: GL Entry,Voucher Type,Tipo de Voucher
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Lista de Preços não encontrada ou desativada
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Lista de Preços não encontrada ou desativada
 DocType: Lab Test,Approved,Aprovado
 DocType: Pricing Rule,Price,Preço
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',"O Funcionário dispensado em {0} deve ser definido como ""Saiu"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',"O Funcionário dispensado em {0} deve ser definido como ""Saiu"""
+DocType: Hub Settings,Last Sync On,Última sincronização em
 DocType: Guardian,Guardian,Responsável
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Foi criada a Avaliação {0} para o Funcionário{1} no intervalo de datas determinado
 DocType: Employee,Education,Educação
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,Del
 DocType: Selling Settings,Campaign Naming By,Nome da Campanha Dado Por
 DocType: Employee,Current Address Is,O Endereço Atual É
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Alvo de Vendas Mensais (
@@ -5064,7 +5159,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Código do curso:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,"Por favor, insira a Conta de Despesas"
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Linha {0}: O tipo de documento referênciado deve ser uma Ordem de Compra, uma Fatura de Compra ou um Lançamento Contabilístico"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Linha {0}: O tipo de documento referênciado deve ser uma Ordem de Compra, uma Fatura de Compra ou um Lançamento Contabilístico"
 DocType: Employee,Current Address,Endereço Atual
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Se o item for uma variante doutro item, então, a descrição, a imagem, os preços, as taxas, etc. serão definidos a partir do modelo, a menos que seja explicitamente especificado o contrário"
 DocType: Serial No,Purchase / Manufacture Details,Dados de Compra / Fabrico
@@ -5095,7 +5190,7 @@
 DocType: Hub Settings,Hub Settings,Definições da Plataforma
 DocType: Project,Gross Margin %,Margem Bruta %
 DocType: BOM,With Operations,Com Operações
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Já foram efetuados lançamentos contabilísticos na moeda {0} para a empresa {1}. Por favor, selecione uma conta a receber ou a pagar com a moeda {0}."
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Já foram efetuados lançamentos contabilísticos na moeda {0} para a empresa {1}. Por favor, selecione uma conta a receber ou a pagar com a moeda {0}."
 DocType: Asset,Is Existing Asset,É um Ativo Existente
 DocType: Salary Detail,Statistical Component,Componente estatística
 DocType: Salary Detail,Statistical Component,Componente estatística
@@ -5104,13 +5199,14 @@
 DocType: BOM Operation,BOM Operation,Funcionamento da LDM
 DocType: Purchase Taxes and Charges,On Previous Row Amount,No Montante da Linha Anterior
 DocType: Student,Home Address,Endereço Residencial
+DocType: Item,Has Expiry Date,Tem data de expiração
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Configurações da Variante de Item.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transferência de Ativos
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,Transferência de Ativos
 DocType: POS Profile,POS Profile,Perfil POS
 DocType: Training Event,Event Name,Nome do Evento
 DocType: Physician,Phone (Office),Telefone (Escritório)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,Admissão
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Admissões para {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,Admissão
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Admissões para {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Sazonalidade para definição de orçamentos, metas etc."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Nome variável
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","O Item {0} é um modelo, por favor, selecione uma das suas variantes"
@@ -5119,7 +5215,7 @@
 DocType: Assessment Plan,Room,Quarto
 DocType: Purchase Order,Advance Paid,Adiantamento Pago
 DocType: Item,Item Tax,Imposto do Item
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Material para o Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Material para o Fornecedor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Fatura de Imposto Especial
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% aparece mais de uma vez
 DocType: Expense Claim,Employees Email Id,ID de Email de Funcionários
@@ -5130,32 +5226,30 @@
 DocType: Program,Program Name,Nome do Programa
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considerar Imposto ou Encargo para
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,É obrigatório colocar a Qtd Efetiva
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} atualmente tem um {1} Guia de Scorecard do Fornecedor e as Ordens de Compra para este fornecedor devem ser emitidas com cautela.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} atualmente tem um {1} Guia de Scorecard do Fornecedor e as Ordens de Compra para este fornecedor devem ser emitidas com cautela.
 DocType: Employee Loan,Loan Type,Tipo de empréstimo
 DocType: Scheduling Tool,Scheduling Tool,Ferramenta de Agendamento
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Cartão de Crédito
 DocType: BOM,Item to be manufactured or repacked,Item a ser fabricado ou reembalado
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,As definições padrão para as transações de stock.
-DocType: Purchase Invoice,Next Date,Próxima Data
 DocType: Employee Education,Major/Optional Subjects,Assuntos Principais/Opcionais
 DocType: Sales Invoice Item,Drop Ship,Envio Direto
+DocType: Hub Settings,Suspended,Suspenso
 DocType: Training Event,Attendees,Participantes
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aqui pode manter dados como o nome e ocupação dos pais, cônjugue e filhos"
 DocType: Academic Term,Term End Date,Prazo de Data de Término
-DocType: Hub Settings,Seller Name,Nome do Vendedor
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impostos e Taxas Deduzidos (Moeda da Empresa)
 DocType: Item Group,General Settings,Definições Gerais
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,A Moeda De e Para não pode ser igual
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Adicionar instrutores
 DocType: Stock Entry,Repack,Reembalar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Deve Guardar o formulário antes de continuar
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Selecione a empresa primeiro
 DocType: Item Attribute,Numeric Values,Valores Numéricos
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Anexar Logótipo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Níveis de stock
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Níveis de stock
 DocType: Customer,Commission Rate,Taxa de Comissão
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Criou {0} scorecards para {1} entre:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Criar Variante
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Criar Variante
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquear pedidos de licença por departamento.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","O Tipo de Pagamento deve ser Receber, Pagar ou Transferência Interna"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Análise
@@ -5170,11 +5264,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Capital Social
 DocType: Shopping Cart Settings,Show Public Attachments,Mostrar anexos públicos
 DocType: Packing Slip,Package Weight Details,Dados de Peso do Pacote
+DocType: Restaurant Reservation,Reservation Time,Tempo de Reserva
 DocType: Payment Gateway Account,Payment Gateway Account,Conta de Portal de Pagamento
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,"Após o pagamento ter sido efetuado, redireciona o utilizador para a página selecionada."
 DocType: Company,Existing Company,Companhia Existente
 DocType: Healthcare Settings,Result Emailed,Resultado enviado por e-mail
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",Categoria de imposto foi alterada para &quot;Total&quot; porque todos os itens são itens sem estoque
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Código do Item&gt; Item Group&gt; Brand
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,"Por favor, selecione um ficheiro csv"
 DocType: Student Leave Application,Mark as Present,Mark como presente
 DocType: Supplier Scorecard,Indicator Color,Cor do indicador
@@ -5199,11 +5295,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Criar Classe de Estudantes
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,É para Continuar
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Obter itens da LDM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Obter itens da LDM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Dias para Chegar ao Armazém
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Linha #{0}: A Data de Postagem deve ser igual à data de compra {1} do ativo {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Verifique se o estudante reside no albergue do Instituto.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Insira as Ordens de Venda na tabela acima
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Insira as Ordens de Venda na tabela acima
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Não foi Submetido Salário deslizamentos
 ,Stock Summary,Resumo de Stock
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Transferir um ativo de um armazém para outro
@@ -5217,7 +5313,8 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Quantidade Sancionada
 DocType: GL Entry,Is Opening,Está a Abrir
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Linha {0}: Um registo de débito não pode ser vinculado a {1}
-DocType: Journal Entry,Subscription Section,Seção de Subscrição
+DocType: Journal Entry,Subscription Section,Secção de Subscrição
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,A conta {0} não existe
+DocType: Training Event,Training Program,Programa de treinamento
 DocType: Account,Cash,Numerário
 DocType: Employee,Short biography for website and other publications.,Breve biografia para o website e outras publicações.
diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv
index 1bb2146..d468597 100644
--- a/erpnext/translations/ro.csv
+++ b/erpnext/translations/ro.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Mod de salariu
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Inregistreaza-te
 DocType: Patient,Divorced,Divorțat/a
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Articole deja sincronizate
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permiteți Element care trebuie adăugate mai multe ori într-o tranzacție
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Anulează Stivuitoare Vizitați {0} înainte de a anula acest revendicarea Garanție
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produse consumator
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Aprobatori Concediu
 DocType: Sales Partner,Dealer,Comerciant
 DocType: Consultation,Investigations,Investigații
+DocType: Restaurant Order Entry,Click Enter To Add,Faceți clic pe Enter to Add
 DocType: Employee,Rented,Închiriate
 DocType: Purchase Order,PO-,po-
 DocType: POS Profile,Applicable for User,Aplicabil pentru utilizator
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Oprit comandă de producție nu poate fi anulat, acesta unstop întâi pentru a anula"
 DocType: Vehicle Service,Mileage,distanță parcursă
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Chiar vrei să resturi acest activ?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Chiar vrei să resturi acest activ?
 DocType: Drug Prescription,Update Schedule,Actualizați programul
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Selectați Furnizor implicit
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Moneda este necesară pentru lista de prețuri {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Verifică disponibilitatea
 DocType: Job Applicant,Job Applicant,Solicitant loc de muncă
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Aceasta se bazează pe tranzacțiile împotriva acestui furnizor. A se vedea calendarul de mai jos pentru detalii
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nu mai multe rezultate.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Juridic
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Taxa efectivă de tip nu poate fi inclusă în tariful articolului din rândul {0}
 DocType: Bank Guarantee,Customer,Client
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Rata de schimb trebuie să fie aceeași ca și {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nume client
 DocType: Vehicle,Natural Gas,Gaz natural
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Contul bancar nu poate fi numit ca {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Contul bancar nu poate fi numit ca {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Heads (sau grupuri) față de care înregistrările contabile sunt făcute și soldurile sunt menținute.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Restante pentru {0} nu poate fi mai mică decât zero ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Nu există nicio plată a Salariilor care să fie procesată.
 DocType: Manufacturing Settings,Default 10 mins,Implicit 10 minute
 DocType: Leave Type,Leave Type Name,Denumire Tip Concediu
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Afișați deschis
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Este necesar să luăm această acțiune astăzi pentru recidiva menționată mai sus
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Seria Actualizat cu succes
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Verifică
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural Jurnal de intrare Introdus
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Achiziția comandă elementele de încasat
 DocType: SMS Center,All Supplier Contact,Toate contactele furnizorului
 DocType: Support Settings,Support Settings,Setări de sprijin
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Așteptat Data de încheiere nu poate fi mai mică de Data de începere așteptată
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Așteptat Data de încheiere nu poate fi mai mică de Data de începere așteptată
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Rata trebuie să fie aceeași ca și {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Noua cerere de concediu
 ,Batch Item Expiry Status,Lot Articol Stare de expirare
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Ciorna bancară
 DocType: Mode of Payment Account,Mode of Payment Account,Modul de cont de plăți
 DocType: Consultation,Consultation,Consultare
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Vânzări și returnări
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Arată Variante
 DocType: Academic Term,Academic Term,termen academic
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Material
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Servicii de Sanatate
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Întârziere de plată (zile)
 DocType: Lab Prescription,Lab Prescription,Lab prescription
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Sortați după Preț
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Cheltuieli de serviciu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Numărul de serie: {0} este deja menționat în factura de vânzare: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Factură
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Numărul de serie: {0} este deja menționat în factura de vânzare: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Factură
 DocType: Maintenance Schedule Item,Periodicity,Periodicitate
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Anul fiscal {0} este necesară
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Apărare
@@ -91,20 +94,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,
 DocType: Timesheet,Total Costing Amount,Suma totală Costing
 DocType: Delivery Note,Vehicle No,Vehicul Nici
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Vă rugăm să selectați lista de prețuri
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Vă rugăm să selectați lista de prețuri
 DocType: Accounts Settings,Currency Exchange Settings,Setările de schimb valutar
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Row # {0}: Document de plată este necesară pentru a finaliza trasaction
 DocType: Production Order Operation,Work In Progress,Lucrări în curs
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Vă rugăm să selectați data
 DocType: Employee,Holiday List,Lista de Vacanță
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Vă rugăm să configurați Sistemul de denumire a instructorilor în școală&gt; Setări școlare
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Contabil
+DocType: Hub Settings,Selling Price List,Lista de prețuri de vânzare
 DocType: Patient,Tobacco Current Use,Utilizarea curentă a tutunului
 DocType: Cost Center,Stock User,Stoc de utilizare
 DocType: Company,Phone No,Nu telefon
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Orarele de curs creat:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Nou {0}: # {1}
-,Sales Partners Commission,Agent vânzări al Comisiei
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Nou {0}: # {1}
+,Sales Partners Commission,Comision Agenţi Vânzări
 DocType: Purchase Invoice,Rounding Adjustment,Rotunjire ajustare
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Prescurtarea nu poate contine mai mult de 5 caractere
 DocType: Physician Schedule Time Slot,Physician Schedule Time Slot,Medic Timpul de programare
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Părinte Detaliu docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referință: {0}, Cod articol: {1} și Client: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kg
-DocType: Student Log,Log,Buturuga
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Deschidere pentru un loc de muncă.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Rezultatul trimis
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Rezultatul trimis
 DocType: Item Attribute,Increment,Creștere
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Interval de timp
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Selectați Depozit ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Căsătorit
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Nu este permisă {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Obține elemente din
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Stock nu poate fi actualizat împotriva livrare Nota {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Stock nu poate fi actualizat împotriva livrare Nota {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produs {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nu sunt enumerate elemente
 DocType: Payment Reconciliation,Reconcile,Reconcilierea
@@ -143,31 +145,32 @@
 DocType: Quality Inspection Reading,Reading 1,Reading 1
 DocType: Process Payroll,Make Bank Entry,Asigurați-Bank intrare
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondurile de pensii
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,În continuare Amortizarea Data nu poate fi înainte Data achiziției
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Data următoarei amortizări nu poate fi înainte de Data achiziției
 DocType: Consultation,Consultation Date,Data consultării
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Catalog de produse și descoperire pentru utilizatorii ERPNext
 DocType: SMS Center,All Sales Person,Toate persoanele de vânzăril
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Lunar Distribuție ** vă ajută să distribuie bugetul / Target peste luni dacă aveți sezonier în afacerea dumneavoastră.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Nu au fost găsite articole
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Structura de salarizare lipsă
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Nu au fost găsite articole
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Structura de salarizare lipsă
 DocType: Lead,Person Name,Nume persoană
 DocType: Sales Invoice Item,Sales Invoice Item,Factură de vânzări Postul
 DocType: Account,Credit,Credit
 DocType: POS Profile,Write Off Cost Center,Scrie Off cost Center
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""","de exemplu, &quot;Școala primară&quot; sau &quot;Universitatea&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""","de exemplu, &quot;Școala primară&quot; sau &quot;Universitatea&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Rapoarte de stoc
 DocType: Warehouse,Warehouse Detail,Depozit Detaliu
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Limita de credit a fost trecut de client {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Pe termen Data de încheiere nu poate fi mai târziu de Anul Data de încheiere a anului universitar la care este legat termenul (anului universitar {}). Vă rugăm să corectați datele și încercați din nou.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Este activ fix"" nu poate fi debifată deoarece există informații împotriva produsului"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Este activ fix"" nu poate fi debifată deoarece există informații împotriva produsului"
 DocType: Vehicle Service,Brake Oil,Ulei de frână
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clienți&gt; Teritoriu
 DocType: Tax Rule,Tax Type,Tipul de impozitare
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Sumă impozabilă
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Nu sunteți autorizat să adăugați sau să actualizați intrări înainte de {0}
 DocType: BOM,Item Image (if not slideshow),Imagine Articol (dacă nu exista prezentare)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Există un client cu același nume
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarif orar / 60) * Timp efectiv de operare
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Rândul # {0}: Tipul de document de referință trebuie să fie una dintre revendicările de cheltuieli sau intrări în jurnal
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Selectați BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Rândul # {0}: Tipul de document de referință trebuie să fie una dintre revendicările de cheltuieli sau intrări în jurnal
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Selectați BOM
 DocType: SMS Log,SMS Log,SMS Conectare
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Costul de articole livrate
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Vacanta pe {0} nu este între De la data si pana in prezent
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,angajat de împrumut
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Jurnal Activitati:
 DocType: Fee Schedule,Send Payment Request Email,Trimiteți e-mail de solicitare de plată
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Articolul {0} nu există în sistem sau a expirat
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Articolul {0} nu există în sistem sau a expirat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Imobiliare
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Extras de cont
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Produse farmaceutice
@@ -210,18 +213,23 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Import Conectare
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Pull Material Cerere de tip Fabricare pe baza criteriilor de mai sus
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Neînregistrați cu succes.
 DocType: Training Result Employee,Grade,calitate
+DocType: Restaurant Table,No of Seats,Numărul de scaune
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Pentru a adăuga subiect dinamic, utilizați etichete de tip jinja <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Livrate de Furnizor
 DocType: SMS Center,All Contact,Toate contactele
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Comanda de producție deja creat pentru toate elementele cu BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Comanda de producție deja creat pentru toate elementele cu BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Salariu anual
 DocType: Daily Work Summary,Daily Work Summary,Sumar zilnic de lucru
 DocType: Period Closing Voucher,Closing Fiscal Year,Închiderea Anului Fiscal
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} este blocat
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Vă rugăm să selectați Companie pentru crearea Existent Plan de conturi
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} este blocat
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Vă rugăm să selectați Companie pentru crearea Existent Plan de conturi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Cheltuieli stoc
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Selectați Target Warehouse
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Selectați Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Selectați Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Selectați Target Warehouse
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Vă rugăm să introduceți preferate Contact E-mail
 DocType: Program Enrollment,School Bus,Autobuz scolar
 DocType: Journal Entry,Contra Entry,Contra intrare
@@ -239,9 +247,10 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Descărcați șablonul, umple de date corespunzătoare și atașați fișierul modificat.
  Toate datele și angajat combinație în perioada selectata va veni în șablon, cu înregistrări nervi existente"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Articolul {0} nu este activ sau sfarsitul ciclului sau de viata a fost atins
+DocType: Student Admission Program,Minimum Age,Varsta minima
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Exemplu: matematică de bază
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Pentru a include taxa în rândul {0} în rata articol, impozitele în rânduri {1} trebuie de asemenea să fie incluse"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Setările pentru modul HR
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Setările pentru modul HR
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Sumă schimbare
 DocType: BOM Update Tool,New BOM,Nou BOM
@@ -251,7 +260,7 @@
 DocType: Lead,Request Type,Cerere tip
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Asigurați-angajat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Transminiune
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Adăugați camere
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Modul de configurare a POS (online / offline)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Executie
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detalii privind operațiunile efectuate.
 DocType: Serial No,Maintenance Status,Stare Mentenanta
@@ -266,7 +275,7 @@
 DocType: Employee Loan Application,Loan Info,Creditul Info
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Planul de de vizite de întreținere.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Perioada de evaluare a furnizorului
-DocType: POS Profile,Customer Groups,grupurile de clienti
+DocType: POS Profile,Customer Groups,Grupuri de clienți
 apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Situațiile financiare
 DocType: Guardian,Students,Elevi
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Normele de aplicare de stabilire a prețurilor și de scont.
@@ -274,6 +283,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Lista de prețuri trebuie să fie aplicabilă pentru cumpărarea sau vânzarea de
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Data de instalare nu poate fi înainte de data de livrare pentru postul {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Reducere la Lista de preturi Rate (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Biochimie
 DocType: Offer Letter,Select Terms and Conditions,Selectați Termeni și condiții
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,Valoarea afară
 DocType: Production Planning Tool,Sales Orders,Comenzi de vânzări
@@ -308,20 +318,20 @@
 DocType: Sales Partner,Reseller,Reseller
 DocType: Codification Table,Medical Code,Codul medical
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Dacă este bifată, va include și non-stoc produse în cererile de materiale."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Va rugam sa introduceti de companie
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Va rugam sa introduceti de companie
 DocType: Delivery Note Item,Against Sales Invoice Item,Comparativ articolului facturii de vânzări
 ,Production Orders in Progress,Comenzile de producție în curs de desfășurare
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Numerar net din Finantare
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage este plin, nu a salvat"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage este plin, nu a salvat"
 DocType: Lead,Address & Contact,Adresă și contact
 DocType: Leave Allocation,Add unused leaves from previous allocations,Adauga frunze neutilizate de alocări anterioare
 DocType: Sales Partner,Partner website,site-ul partenerului
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Adaugare element
+DocType: Restaurant Order Entry,Add Item,Adaugare element
 DocType: Lab Test,Custom Result,Rezultate personalizate
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Nume Persoana de Contact
 DocType: Course Assessment Criteria,Course Assessment Criteria,Criterii de evaluare a cursului
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Creare fluturas de salariu pentru criteriile mentionate mai sus.
-DocType: POS Customer Group,POS Customer Group,POS Clienți Grupul
+DocType: POS Customer Group,POS Customer Group,Grup Clienți POS
 DocType: Cheque Print Template,Line spacing for amount in words,distanța dintre rânduri pentru suma în cuvinte
 DocType: Vehicle,Additional Details,detalii suplimentare
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Assessment Plan: ,Plan de evaluare:
@@ -329,7 +339,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Cere pentru cumpărare.
 DocType: Lab Test,Submitted Date,Data transmisă
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Aceasta se bazează pe fișele de pontaj create împotriva acestui proiect
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Plata netă nu poate fi mai mică decât 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Plata netă nu poate fi mai mică decât 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Pentru a nu mai trimite notificări de eroare repetitive din sistem, am bifat câmpul Dezactivat în abonament"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Numai selectat concediu aprobator poate înainta această aplicație Leave
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Alinarea Data trebuie să fie mai mare decât Data aderării
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Frunze pe an
@@ -338,9 +349,10 @@
 DocType: Email Digest,Profit & Loss,Pierderea profitului
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Litru
 DocType: Task,Total Costing Amount (via Time Sheet),Suma totală de calculație a costurilor (prin timp Sheet)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Configurați elevii din grupurile de studenți
 DocType: Item Website Specification,Item Website Specification,Specificație Site Articol
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Concediu Blocat
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Articolul {0} a ajuns la sfârșitul cliclului sau de viață in {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Articolul {0} a ajuns la sfârșitul cliclului sau de viață in {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Intrările bancare
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock reconciliere Articol
@@ -349,7 +361,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Curs de grup studențesc instrument de creare
 DocType: Lead,Do Not Contact,Nu contactati
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,Oameni care predau la organizația dumneavoastră
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Id-ul unic pentru urmărirea toate facturile recurente. Acesta este generat pe prezinte.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Comanda minima Cantitate
 DocType: Pricing Rule,Supplier Type,Furnizor Tip
@@ -359,17 +370,19 @@
 DocType: Item,Publish in Hub,Publica in Hub
 DocType: Student Admission,Student Admission,Admiterea studenților
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Articolul {0} este anulat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Cerere de material
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Articolul {0} este anulat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Cerere de material
 DocType: Bank Reconciliation,Update Clearance Date,Actualizare Clearance Data
 DocType: Item,Purchase Details,Detalii de cumpărare
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Postul {0} nu a fost găsit în &quot;Materii prime furnizate&quot; masă în Comandă {1}
 DocType: Patient Relation,Relation,Relație
 DocType: Shipping Rule,Worldwide Shipping,Expediere
 DocType: Patient Relation,Mother,Mamă
+DocType: Restaurant Reservation,Reservation End Time,Timp de terminare a rezervării
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Comenzi confirmate de la clienți.
 DocType: Purchase Receipt Item,Rejected Quantity,Respins Cantitate
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Solicitarea de plată {0} a fost creată
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Solicitarea de plată {0} a fost creată
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Sensibilitate scăzută
 DocType: Notification Control,Notification Control,Controlul notificare
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Vă rugăm să confirmați după ce ați terminat pregătirea
 DocType: Lead,Suggestions,Sugestii
@@ -389,8 +402,8 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,alunecare email-uri salariul angajatului în funcție de e-mail preferat selectat în Angajat
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Primul Aprobatorul Lăsați în lista va fi setat ca implicit concediu aprobator
 DocType: Tax Rule,Shipping County,County transport maritim
-apps/erpnext/erpnext/config/desktop.py +158,Learn,A invata
-DocType: Asset,Next Depreciation Date,Amortizarea următor Data
+apps/erpnext/erpnext/config/desktop.py +159,Learn,A invata
+DocType: Asset,Next Depreciation Date,Data următoarei amortizări
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Activitatea de Cost per angajat
 DocType: Accounts Settings,Settings for Accounts,Setări pentru conturi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +663,Supplier Invoice No exists in Purchase Invoice {0},Furnizor Factura nr există în factură Purchase {0}
@@ -400,13 +413,13 @@
 DocType: Item,Synced With Hub,Sincronizat cu Hub
 DocType: Vehicle,Fleet Manager,Manager de flotă
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} nu poate fi negativ pentru elementul {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Parola Gresita
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Parola Gresita
 DocType: Item,Variant Of,Varianta de
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"Finalizat Cantitate nu poate fi mai mare decât ""Cantitate de Fabricare"""
 DocType: Period Closing Voucher,Closing Account Head,Închidere Cont Principal
 DocType: Employee,External Work History,Istoricul lucrului externă
 DocType: Physician,Time per Appointment,Ora pe orar
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Eroare de referință Circular
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Eroare de referință Circular
 DocType: Appointment Type,Is Inpatient,Este internat
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Nume Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,În cuvinte (de export) va fi vizibil după ce a salva de livrare Nota.
@@ -415,19 +428,18 @@
 DocType: Lead,Industry,Industrie
 DocType: Employee,Job Profile,Profilul postului
 DocType: BOM Item,Rate & Amount,Rata și suma
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vă rugăm să configurați seria de numerotare pentru Participare prin Configurare&gt; Serie de numerotare
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Aceasta se bazează pe tranzacții împotriva acestei companii. Consultați linia temporală de mai jos pentru detalii
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notifica prin e-mail la crearea de cerere automată Material
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Rezistent
 DocType: Journal Entry,Multi Currency,Multi valutar
 DocType: Payment Reconciliation Invoice,Invoice Type,Factura Tip
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clienți&gt; Teritoriu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Nota de Livrare
 DocType: Consultation,Encounter Impression,Întâlniți impresiile
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Configurarea Impozite
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Costul de active vândute
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,Plata intrare a fost modificat după ce-l tras. Vă rugăm să trage din nou.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} a fost introdus de două ori în taxa articolului
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Rezumat pentru această săptămână și a activităților în curs
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} a fost introdus de două ori în taxa articolului
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Rezumat pentru această săptămână și a activităților în curs
 DocType: Student Applicant,Admitted,A recunoscut că
 DocType: Workstation,Rent Cost,Chirie Cost
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Suma după amortizare
@@ -442,36 +454,35 @@
 DocType: Shipping Rule,Valid for Countries,Valabil pentru țările
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Acest post este un șablon și nu pot fi folosite în tranzacții. Atribute articol vor fi copiate pe în variantele cu excepția cazului în este setat ""Nu Copy"""
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Comanda total Considerat
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Desemnare angajat (de exemplu, CEO, director, etc)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Desemnare angajat (de exemplu, CEO, director, etc)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Rata la care Clientul valuta este convertită în valuta de bază a clientului
 DocType: Course Scheduling Tool,Course Scheduling Tool,Instrument curs de programare
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rând # {0}: Achiziția Factura nu poate fi făcută împotriva unui activ existent {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Urgent] Eroare la crearea% s recurente pentru% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Urgent] Eroare la crearea% s recurente pentru% s
 DocType: Item Tax,Tax Rate,Cota de impozitare
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} deja alocate pentru Angajat {1} pentru perioada {2} {3} pentru a
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Selectați articol
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Selectați articol
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Factura de cumpărare {0} este deja depusă
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Lot nr trebuie să fie aceeași ca și {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Converti la non-Group
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Lotul (lot) unui articol.
 DocType: C-Form Invoice Detail,Invoice Date,Data facturii
 DocType: GL Entry,Debit Amount,Suma debit
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Nu poate fi doar un cont per companie în {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Vă rugăm să consultați atașament
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Nu poate fi doar un cont per companie în {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Vă rugăm să consultați atașament
 DocType: Purchase Order,% Received,% Primit
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Creați Grupurile de studenți
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Setup deja complet!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Setup deja complet!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Nota de credit Notă
 DocType: Setup Progress Action,Action Document,Document de acțiune
 ,Finished Goods,Produse Finite
 DocType: Delivery Note,Instructions,Instrucţiuni
 DocType: Quality Inspection,Inspected By,Inspectat de
 DocType: Maintenance Visit,Maintenance Type,Tip Mentenanta
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} nu este înscris la curs {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Codul elementului&gt; Element Grup&gt; Brand
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} nu este înscris la curs {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial No {0} nu aparține de livrare Nota {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Adăugarea de elemente
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Adăugarea de elemente
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parametru Inspecție de Calitate Articol
 DocType: Leave Application,Leave Approver Name,Lăsați Nume aprobator
 DocType: Depreciation Schedule,Schedule Date,Program Data
@@ -493,7 +504,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Ore de lucru
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Schimbați secventa de numar de inceput / curent a unei serii existente.
 DocType: Dosage Strength,Strength,Putere
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Creați un nou client
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Creați un nou client
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","În cazul în care mai multe reguli de stabilire a prețurilor continuă să prevaleze, utilizatorii sunt rugați să setați manual prioritate pentru a rezolva conflictul."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Creare comenzi de aprovizionare
 ,Purchase Register,Cumpărare Inregistrare
@@ -512,7 +523,7 @@
 DocType: Lab Test Template,Single,Celibatar
 DocType: Salary Slip,Total Loan Repayment,Rambursarea totală a creditului
 DocType: Account,Cost of Goods Sold,Cost Bunuri Vândute
-DocType: Purchase Invoice,Yearly,Anual
+DocType: Subscription,Yearly,Anual
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Va rugam sa introduceti Cost Center
 DocType: Drug Prescription,Dosage,Dozare
 DocType: Journal Entry Account,Sales Order,Comandă de vânzări
@@ -543,7 +554,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Setările globale pentru toate procesele de producție.
 DocType: Accounts Settings,Accounts Frozen Upto,Conturile sunt Blocate Până la
 DocType: SMS Log,Sent On,A trimis pe
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Atribut {0} selectat de mai multe ori în tabelul Atribute
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Atribut {0} selectat de mai multe ori în tabelul Atribute
 DocType: HR Settings,Employee record is created using selected field. ,Inregistrarea angajatului este realizata prin utilizarea campului selectat.
 DocType: Sales Order,Not Applicable,Nu se aplică
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Maestru de vacanta.
@@ -569,13 +580,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Total frunze alocate este obligatorie
 DocType: Patient,AB Positive,AB pozitiv
 DocType: Job Opening,Description of a Job Opening,Descrierea unei slujbe
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Activități în așteptare pentru ziua de azi
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Activități în așteptare pentru ziua de azi
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Record de prezenţă.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Componenta de salarizare pentru salarizare bazate pe timesheet.
 DocType: Sales Order Item,Used for Production Plan,Folosit pentru Planul de producție
 DocType: Employee Loan,Total Payment,Plată totală
 DocType: Manufacturing Settings,Time Between Operations (in mins),Timp între operațiuni (în minute)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,"{0} {1} este anulată, astfel încât acțiunea nu poate fi terminată"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,"{0} {1} este anulată, astfel încât acțiunea nu poate fi terminată"
 DocType: Customer,Buyer of Goods and Services.,Cumpărător de produse și servicii.
 DocType: Journal Entry,Accounts Payable,Conturi de plată
 DocType: Patient,Allergies,alergii
@@ -587,23 +598,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Avertizați comenzile de cumpărare
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Listeaza cativa din clienții dvs. Ei ar putea fi organizații sau persoane fizice.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Piese de schimb suficient pentru a construi
+DocType: POS Profile User,POS Profile User,Utilizator de profil POS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Venituri Directe
 DocType: Patient Appointment,Date TIme,Data TIme
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Nu se poate filtra pe baza de cont, în cazul gruparii in functie de Cont"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Ofițer administrativ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Selectați cursul
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Selectați cursul
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Selectați cursul
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Selectați cursul
 DocType: Codification Table,Codification Table,Tabelul de codificare
 DocType: Timesheet Detail,Hrs,ore
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Vă rugăm să selectați Company
 DocType: Stock Entry Detail,Difference Account,Diferența de Cont
 DocType: Purchase Invoice,Supplier GSTIN,Furnizor GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Nu poate sarcină aproape ca misiune dependente {0} nu este închis.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,Va rugam sa introduceti Depozit pentru care va fi ridicat Material Cerere
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Nu poate sarcină aproape ca misiune dependente {0} nu este închis.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Va rugam sa introduceti Depozit pentru care va fi ridicat Material Cerere
 DocType: Production Order,Additional Operating Cost,Costuri de operare adiţionale
 DocType: Lab Test Template,Lab Routine,Laboratorul de rutină
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosmetică
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Pentru a îmbina, următoarele proprietăți trebuie să fie aceeași pentru ambele elemente"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Pentru a îmbina, următoarele proprietăți trebuie să fie aceeași pentru ambele elemente"
 DocType: Shipping Rule,Net Weight,Greutate netă
 DocType: Employee,Emergency Phone,Telefon de Urgență
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,A cumpara
@@ -614,7 +626,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Vă rugăm să definiți gradul pentru pragul 0%
 DocType: Sales Order,To Deliver,A Livra
 DocType: Purchase Invoice Item,Item,Obiect
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Serial nici un articol nu poate fi o fracție
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Sensibilitate crescută
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Serial nici un articol nu poate fi o fracție
 DocType: Journal Entry,Difference (Dr - Cr),Diferența (Dr - Cr)
 DocType: Account,Profit and Loss,Profit și pierdere
 DocType: Patient,Risk Factors,Factori de risc
@@ -623,21 +636,21 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Gestionarea Subcontracte
 DocType: Vital Signs,Body Temperature,Temperatura corpului
 DocType: Project,Project will be accessible on the website to these users,Proiectul va fi accesibil pe site-ul acestor utilizatori
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Definiți tipul de proiect.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Definiți tipul de proiect.
 DocType: Supplier Scorecard,Weighting Function,Funcție de ponderare
 DocType: Physician,OP Consulting Charge,OP Taxă de consultanță
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Configurați-vă
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Rata la care lista de prețuri moneda este convertit în moneda de bază a companiei
 apps/erpnext/erpnext/setup/doctype/company/company.py +62,Account {0} does not belong to company: {1},Contul {0} nu apartine companiei: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +51,Abbreviation already used for another company,Abreviere deja folosit pentru o altă companie
-DocType: Selling Settings,Default Customer Group,Group Client Implicit
+DocType: Selling Settings,Default Customer Group,Grup Clienți Implicit
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Dacă este dezactivat, câmpul 'Total Rotunjit' nu va fi vizibil in nici o tranzacție"
 DocType: BOM,Operating Cost,Costul de operare
 DocType: Sales Order Item,Gross Profit,Profit brut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Creștere nu poate fi 0
 DocType: Production Planning Tool,Material Requirement,Cerința de material
 DocType: Company,Delete Company Transactions,Ștergeți Tranzacții de Firma
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,De referință nr și de referință Data este obligatorie pentru tranzacție bancară
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,De referință nr și de referință Data este obligatorie pentru tranzacție bancară
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adaugaţi / editaţi taxe și cheltuieli
 DocType: Payment Entry Reference,Supplier Invoice No,Furnizor Factura Nu
 DocType: Territory,For reference,Pentru referință
@@ -645,12 +658,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Nu se poate șterge de serie nr {0}, așa cum este utilizat în tranzacțiile bursiere"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),De închidere (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,buna
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Postul mutare
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Postul mutare
 DocType: Serial No,Warranty Period (Days),Perioada de garanție (zile)
 DocType: Installation Note Item,Installation Note Item,Instalare Notă Postul
 DocType: Production Plan Item,Pending Qty,Așteptare Cantitate
 DocType: Budget,Ignore,Ignora
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} nu este activ
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} nu este activ
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Dimensiunile de instalare pentru imprimare de verificare
 DocType: Salary Slip,Salary Slip Timesheet,Salariu alunecare Pontaj
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Furnizor Depozit obligatoriu pentru contractate sub-cumparare Primirea
@@ -659,7 +672,7 @@
 DocType: Pricing Rule,Sales Partner,Partener de vânzări
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Toate cardurile de evaluare ale furnizorilor.
 DocType: Buying Settings,Purchase Receipt Required,Cumpărare de primire Obligatoriu
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Evaluarea Rata este obligatorie în cazul în care a intrat Deschiderea stoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,Evaluarea Rata este obligatorie în cazul în care a intrat Deschiderea stoc
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nu sunt găsite în tabelul de factură înregistrări
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Vă rugăm să selectați Company și Partidul Tip primul
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,An financiar / contabil.
@@ -696,7 +709,7 @@
 DocType: Quotation,Quotation To,Citat Pentru a
 DocType: Lead,Middle Income,Venituri medii
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Deschidere (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Unitatea de măsură implicită pentru postul {0} nu poate fi schimbat direct, deoarece aveti si voi deja unele tranzacții (i) cu un alt UOM. Veți avea nevoie pentru a crea un nou element pentru a utiliza un alt implicit UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Unitatea de măsură implicită pentru postul {0} nu poate fi schimbat direct, deoarece aveti si voi deja unele tranzacții (i) cu un alt UOM. Veți avea nevoie pentru a crea un nou element pentru a utiliza un alt implicit UOM."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Suma alocată nu poate fi negativă
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Stabiliți compania
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Stabiliți compania
@@ -711,6 +724,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Selectați Cont de plăți pentru a face Banca de intrare
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Crearea de înregistrări angajaților pentru a gestiona frunze, cheltuieli și salarizare creanțe"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Perioada de prescripție
+DocType: Restaurant Reservation,Restaurant Reservation,Rezervare restaurant
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Propunere de scriere
 DocType: Payment Entry Deduction,Payment Entry Deduction,Plată Deducerea intrare
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Un alt Sales Person {0} există cu același ID Angajat
@@ -718,7 +732,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Masterat
 DocType: Assessment Plan,Maximum Assessment Score,Scor maxim de evaluare
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Perioada tranzacție de actualizare Bank
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Urmărirea timpului
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Urmărirea timpului
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,DUPLICAT PENTRU TRANSPORTATOR
 DocType: Fiscal Year Company,Fiscal Year Company,Anul fiscal companie
 DocType: Packing Slip Item,DN Detail,Detaliu DN
@@ -727,8 +741,9 @@
 DocType: Batch,Batch Description,Descriere lot
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Crearea grupurilor de studenți
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Crearea grupurilor de studenți
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Plata Gateway Cont nu a fost creată, vă rugăm să creați manual unul."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Plata Gateway Cont nu a fost creată, vă rugăm să creați manual unul."
 DocType: Supplier Scorecard,Per Year,Pe an
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Nu este eligibil pentru admiterea în acest program ca pe DOB
 DocType: Sales Invoice,Sales Taxes and Charges,Taxele de vânzări și Taxe
 DocType: Employee,Organization Profile,Organizație de profil
 DocType: Vital Signs,Height (In Meter),Înălțime (în metri)
@@ -764,13 +779,13 @@
 DocType: Student Batch Name,Batch Name,Nume lot
 DocType: Fee Validity,Max number of visit,Numărul maxim de vizite
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Pontajul creat:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Vă rugăm să setați Cash implicit sau cont bancar în modul de plată {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Vă rugăm să setați Cash implicit sau cont bancar în modul de plată {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,A se inscrie
 DocType: GST Settings,GST Settings,Setări GST
 DocType: Selling Settings,Customer Naming By,Numire Client de catre
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Va arăta studentului așa cum sunt prezente Student Raport lunar de prezență
 DocType: Depreciation Schedule,Depreciation Amount,Sumă de amortizare
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Transforma in grup
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Transformă în grup
 DocType: Activity Cost,Activity Type,Tip Activitate
 DocType: Request for Quotation,For individual supplier,Pentru furnizor individual
 DocType: BOM Operation,Base Hour Rate(Company Currency),Rata de bază ore (companie Moneda)
@@ -781,7 +796,7 @@
 DocType: Sales Invoice,Packing List,Lista de ambalare
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,A achiziționa ordine de date Furnizori.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Editare
-DocType: Activity Cost,Projects User,Proiecte de utilizare
+DocType: Activity Cost,Projects User,Utilizator Proiecte
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumat
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +157,{0}: {1} not found in Invoice Details table,{0}: {1} nu a fost găsit în tabelul detalii factură
 DocType: Company,Round Off Cost Center,Rotunji cost Center
@@ -796,16 +811,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Impozite cost debarcate și Taxe
 DocType: Production Order Operation,Actual Start Time,Timpul efectiv de începere
 DocType: BOM Operation,Operation Time,Funcționare Ora
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,finalizarea
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,finalizarea
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Baza
 DocType: Timesheet,Total Billed Hours,Numărul total de ore facturate
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Scrie Off Suma
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Scrie Off Suma
 DocType: Leave Block List Allow,Allow User,Permiteţi utilizator
 DocType: Journal Entry,Bill No,Factură nr.
 DocType: Company,Gain/Loss Account on Asset Disposal,Cont câștig / Pierdere de eliminare a activelor
 DocType: Vehicle Log,Service Details,Detalii de serviciu
 DocType: Vehicle Log,Service Details,Detalii de serviciu
-DocType: Purchase Invoice,Quarterly,Trimestrial
+DocType: Subscription,Quarterly,Trimestrial
 DocType: Lab Test Template,Grouped,grupate
 DocType: Selling Settings,Delivery Note Required,Nota de Livrare Necesara
 DocType: Bank Guarantee,Bank Guarantee Number,Numărul de garanție bancară
@@ -815,12 +830,12 @@
 DocType: Student Attendance,Student Attendance,Participarea studenților
 DocType: Sales Invoice Timesheet,Time Sheet,Fișa de timp
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Materii Prime bazat pe
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Va rugam sa introduceti detalii element
 DocType: Interest,Interest,Interes
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Vânzări pre
 DocType: Purchase Receipt,Other Details,Alte detalii
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,furnizo
 DocType: Lab Test,Test Template,Șablon de testare
+DocType: Restaurant Order Entry Item,Served,servit
 DocType: Account,Accounts,Conturi
 DocType: Vehicle,Odometer Value (Last),Valoarea contorului de parcurs (Ultimul)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Șabloane ale criteriilor privind tabloul de bord al furnizorului.
@@ -832,25 +847,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Previzualizare Salariu alunecare
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Contul {0} a fost introdus de mai multe ori
 DocType: Account,Expenses Included In Valuation,Cheltuieli Incluse în Evaluare
-DocType: Hub Settings,Seller City,Vânzător oraș
 ,Absent Student Report,Raport de student absent
-DocType: Email Digest,Next email will be sent on:,E-mail viitor va fi trimis la:
+DocType: Email Digest,Next email will be sent on:,Următorul email va fi trimis la:
 DocType: Offer Letter Term,Offer Letter Term,Oferta Scrisoare Termen
 DocType: Supplier Scorecard,Per Week,Pe saptamana
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Element are variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Element are variante.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Student total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Articolul {0} nu a fost găsit
 DocType: Bin,Stock Value,Valoare stoc
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,"Înregistrările de taxe vor fi create în fundal. În caz de eroare, mesajul de eroare va fi actualizat în Program."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Firma {0} nu există
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} are valabilitate până la data de {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} are valabilitate până la data de {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Arbore Tip
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Cantitate consumata pe unitatea
 DocType: Serial No,Warranty Expiry Date,Garanție Data expirării
 DocType: Material Request Item,Quantity and Warehouse,Cantitatea și Warehouse
+DocType: Hub Settings,Unregister,Anulați înregistrarea
 DocType: Sales Invoice,Commission Rate (%),Rata de Comision (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Selectați Program
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Selectați Program
 DocType: Project,Estimated Cost,Cost estimat
 DocType: Purchase Order,Link to material requests,Link la cererile de materiale
+DocType: Hub Settings,Publish,Publica
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Spaţiul aerian
 DocType: Journal Entry,Credit Card Entry,Card de credit intrare
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Și evidența contabilă
@@ -861,13 +878,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Închide oportunitate După zile
 ,Reserved,Rezervat
 DocType: Purchase Order,Supply Raw Materials,Aprovizionarea cu materii prime
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Data la care va fi generat următoarea factură. Acesta este generată pe prezinte.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Active Curente
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} nu este un articol de stoc
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',Vă rugăm să împărtășiți feedback-ul dvs. la antrenament făcând clic pe &quot;Feedback Training&quot; și apoi pe &quot;New&quot;
 DocType: Mode of Payment Account,Default Account,Cont Implicit
 DocType: Payment Entry,Received Amount (Company Currency),Suma primită (companie Moneda)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,Conducerea trebuie să fie setata dacă Oportunitatea este creata din Conducere
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,Conducerea trebuie să fie setata dacă Oportunitatea este creata din Conducere
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Vă rugăm să selectați zi liberă pe săptămână
 DocType: Patient,O Negative,O Negativ
 DocType: Production Order Operation,Planned End Time,Planificate End Time
@@ -883,10 +899,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Oportunitate de la
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Declarația salariu lunar.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Adăugați o companie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rând {0}: {1} Numerele de serie necesare pentru articolul {2}. Ați oferit {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rând {0}: {1} Numerele de serie necesare pentru articolul {2}. Ați oferit {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Selectați un tabel
 DocType: BOM,Website Specifications,Site-ul Specificații
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} este o adresă de e-mail nevalidă în secțiunea &quot;Destinatari&quot;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} este o adresă de e-mail nevalidă în secțiunea &quot;Destinatari&quot;
 DocType: Special Test Items,Particulars,Particularități
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiotic.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: de la {0} de tipul {1}
@@ -894,11 +910,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Rând {0}: Factorul de conversie este obligatorie
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Reguli de preturi multiple există cu aceleași criterii, vă rugăm să rezolve conflictul prin atribuirea de prioritate. Reguli de preț: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nu se poate deactiva sau anula FDM, deoarece este conectat cu alte FDM-uri"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nu se poate deactiva sau anula FDM, deoarece este conectat cu alte FDM-uri"
 DocType: Opportunity,Maintenance,Mentenanţă
 DocType: Item Attribute Value,Item Attribute Value,Postul caracteristicii Valoarea
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Campanii de vanzari.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,asiguraţi-Pontaj
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,asiguraţi-Pontaj
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -939,7 +955,7 @@
  8. Introduceți Row: Dacă bazat pe ""Înapoi Row Total"", puteți selecta numărul rând care vor fi luate ca bază pentru acest calcul (implicit este rândul precedent).
  9. Este Brut inclus în rata de bază ?: Dacă verifica acest lucru, înseamnă că acest impozit nu va fi arătată tabelul de mai jos articol, dar vor fi incluse în rata de bază din tabelul punctul principal. Acest lucru este util în cazul în care doriți dau un preț plat (cu toate taxele incluse) preț pentru clienți."
 DocType: Employee,Bank A/C No.,Bancă A/C nr.
-DocType: Bank Guarantee,Project,Proiecte
+DocType: Bank Guarantee,Project,Proiect
 DocType: Quality Inspection Reading,Reading 7,Lectură 7
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,Comandat parțial
 DocType: Lab Test,Lab Test,Test de laborator
@@ -955,12 +971,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Va rugam sa introduceti Articol primul
 DocType: Account,Liability,Răspundere
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sancționat Suma nu poate fi mai mare decât revendicarea Suma în rândul {0}.
+DocType: Salary Detail,Do not include in total,Nu includeți în total
 DocType: Company,Default Cost of Goods Sold Account,Implicit Costul cont bunuri vândute
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Lista de prețuri nu selectat
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Lista de prețuri nu selectat
 DocType: Employee,Family Background,Context familial
 DocType: Request for Quotation Supplier,Send Email,Trimiteți-ne email
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Atenție: Attachment invalid {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Nici o permisiune
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Atenție: Attachment invalid {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Nici o permisiune
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Citat Solicitat
 DocType: Vital Signs,Heart Rate / Pulse,Ritm cardiac / puls
 DocType: Company,Default Bank Account,Cont Bancar Implicit
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Pentru a filtra pe baza Party, selectați Party Tip primul"
@@ -986,14 +1004,13 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Cost Center {2} nu aparține Companiei {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Cont {2} nu poate fi un grup
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Postul rând {IDX}: {DOCTYPE} {DOCNAME} nu există în sus &quot;{DOCTYPE} &#39;masă
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Pontajul {0} este deja finalizată sau anulată
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Pontajul {0} este deja finalizat sau anulat
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Nu există nicio sarcină
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",
 DocType: Item Variant Settings,Copy Fields to Variant,Copiați câmpurile în varianta
 DocType: Asset,Opening Accumulated Depreciation,Deschidere Amortizarea Acumulate
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Scorul trebuie să fie mai mică sau egală cu 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Programul Instrumentul de înscriere
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,Înregistrări formular-C
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,Înregistrări formular-C
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Client și furnizor
 DocType: Email Digest,Email Digest Settings,Setari Email Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Vă mulțumesc pentru afacerea dvs!
@@ -1011,13 +1028,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Citat Stare
 DocType: Maintenance Visit,Completion Status,Stare Finalizare
 DocType: HR Settings,Enter retirement age in years,Introdu o vârsta de pensionare în anii
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Țintă Warehouse
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Selectați un depozit
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Țintă Warehouse
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Selectați un depozit
 DocType: Cheque Print Template,Starting location from left edge,Punctul de plecare de la marginea din stânga
 DocType: Item,Allow over delivery or receipt upto this percent,Permiteți peste livrare sau primire pana la acest procent
 DocType: Stock Entry,STE-,sterilizabile
 DocType: Upload Attendance,Import Attendance,Import Spectatori
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Toate grupurile articolului
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Toate grupurile articolului
 DocType: Process Payroll,Activity Log,Jurnal Activitate
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Profit / pierdere net
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Compune în mod automat un mesaj la introducere de tranzacții.
@@ -1029,7 +1046,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Proiectat Cantitate
 DocType: Sales Invoice,Payment Due Date,Data scadentă de plată
 DocType: Drug Prescription,Interval UOM,Interval UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Postul Varianta {0} există deja cu aceleași atribute
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Postul Varianta {0} există deja cu aceleași atribute
+DocType: Item,Hub Publishing Details,Detalii privind publicarea Hubului
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&quot;Deschiderea&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Deschideți To Do
 DocType: Notification Control,Delivery Note Message,Nota de Livrare Mesaj
@@ -1049,10 +1067,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: Materia primă nu poate fi identică cu elementul principal
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Taxe totale aplicabile în tabelul de achiziție Chitanță Elementele trebuie să fie la fel ca total impozite și taxe
 DocType: Sales Team,Incentives,Stimulente
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Înregistrați-vă pentru Hub
 DocType: SMS Log,Requested Numbers,Numere solicitate
 DocType: Production Planning Tool,Only Obtain Raw Materials,Se obține numai Materii prime
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,De evaluare a performantei.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Dacă activați opțiunea &quot;Utilizare pentru Cos de cumparaturi &#39;, ca Cosul de cumparaturi este activat și trebuie să existe cel puțin o regulă fiscală pentru Cos de cumparaturi"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Dacă activați opțiunea &quot;Utilizare pentru Cos de cumparaturi &#39;, ca Cosul de cumparaturi este activat și trebuie să existe cel puțin o regulă fiscală pentru Cos de cumparaturi"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Intrarea plată {0} este legată de comanda {1}, verificați dacă acesta ar trebui să fie tras ca avans în această factură."
 DocType: Sales Invoice Item,Stock Details,Stoc Detalii
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valoare proiect
@@ -1071,12 +1090,14 @@
 DocType: Salary Slip,Working Days,Zile lucratoare
 DocType: Serial No,Incoming Rate,Rate de intrare
 DocType: Packing Slip,Gross Weight,Greutate brută
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,Numele companiei dumneavoastră pentru care vă sunt configurarea acestui sistem.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Activați Hub
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,Numele companiei dumneavoastră pentru care vă sunt configurarea acestui sistem.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Includ vacanțe în total nr. de zile lucrătoare
 DocType: Job Applicant,Hold,Păstrarea / Ţinerea / Deţinerea
 DocType: Employee,Date of Joining,Data Aderării
 DocType: Naming Series,Update Series,Actualizare Series
 DocType: Supplier Quotation,Is Subcontracted,Este subcontractată
+DocType: Restaurant Table,Minimum Seating,Scaunele minime
 DocType: Item Attribute,Item Attribute Values,Valori Postul Atribut
 DocType: Examination Result,Examination Result,examinarea Rezultat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Primirea de cumpărare
@@ -1087,13 +1108,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Imposibilitatea de a găsi timp Slot în următorii {0} zile pentru Operațiunea {1}
 DocType: Production Order,Plan material for sub-assemblies,Material Plan de subansambluri
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Parteneri de vânzări și teritoriu
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} trebuie să fie activ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} trebuie să fie activ
 DocType: Journal Entry,Depreciation Entry,amortizare intrare
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Vă rugăm să selectați tipul de document primul
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Anuleaza Vizite Material {0} înainte de a anula această Vizita de întreținere
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial Nu {0} nu aparține postul {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Necesar Cantitate
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Depozite de tranzacții existente nu pot fi convertite în contabilitate.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Depozite de tranzacții existente nu pot fi convertite în contabilitate.
 DocType: Bank Reconciliation,Total Amount,Suma totală
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Editura Internet
 DocType: Prescription Duration,Number,Număr
@@ -1104,7 +1125,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista de prețuri de vânzare
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Dacă este bifată, va fi creat un client, cartografiat pacientului. Facturile de pacienți vor fi create împotriva acestui Client. De asemenea, puteți selecta Clientul existent în timp ce creați pacientul."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publica pentru a sincroniza articole
 DocType: Bank Reconciliation,Account Currency,Moneda cont
 DocType: Lab Test,Sample ID,ID-ul probelor
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Vă rugăm să menționați rotunji contul în companie
@@ -1113,11 +1133,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Angajatul {0} nu este activ sau nu există
 DocType: Fee Structure,Components,Componente
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Vă rugăm să introduceți activ Categorie la postul {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Postul variante {0} actualizat
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Postul variante {0} actualizat
 DocType: Quality Inspection Reading,Reading 6,Reading 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Can not {0} {1} {2} fără nici o factură negativă restante
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","pentru a fi generat. Dacă este întârziată, va trebui să schimbați manual câmpul &quot;Repetați pe Ziua lunii&quot;"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Can not {0} {1} {2} fără nici o factură negativă restante
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de cumpărare în avans
-DocType: Hub Settings,Sync Now,Sincronizare acum
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Rând {0}: intrare de credit nu poate fi legat de o {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Definiți bugetul pentru un exercițiu financiar.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Contul Bancar / de Numerar implicit va fi actualizat automat în Factura POS atunci când acest mod este selectat.
@@ -1129,13 +1150,13 @@
 DocType: Item,Is Purchase Item,Este de cumparare Articol
 DocType: Asset,Purchase Invoice,Factura de cumpărare
 DocType: Stock Ledger Entry,Voucher Detail No,Detaliu voucher Nu
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Noua factură de vânzări
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Noua factură de vânzări
 DocType: Stock Entry,Total Outgoing Value,Valoarea totală de ieșire
 DocType: Physician,Appointments,Numiri
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Deschiderea și data inchiderii ar trebui să fie în același an fiscal
 DocType: Lead,Request for Information,Cerere de informații
 ,LeaderBoard,LEADERBOARD
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Sincronizare offline Facturile
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Sincronizare offline Facturile
 DocType: Payment Request,Paid,Plătit
 DocType: Program Fee,Program Fee,Taxa de program
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1154,11 +1175,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Comandă de aprovizionare Articol
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Venituri indirecte
 DocType: Student Attendance Tool,Student Attendance Tool,Instrumentul de student Participarea
+DocType: Restaurant Menu,Price List (Auto created),Lista de prețuri (creată automat)
 DocType: Cheque Print Template,Date Settings,dată Setări
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variație
 ,Company Name,Denumire Furnizor
 DocType: SMS Center,Total Message(s),Total mesaj(e)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Selectați Element de Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Selectați Element de Transfer
 DocType: Purchase Invoice,Additional Discount Percentage,Procentul discount suplimentar
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Vizualizați o listă cu toate filmele de ajutor
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Selectați contul șef al băncii, unde de verificare a fost depus."
@@ -1176,12 +1198,14 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Metru
 DocType: Workstation,Electricity Cost,Cost energie electrică
 DocType: HR Settings,Don't send Employee Birthday Reminders,Nu trimiteți Memento pentru Zi de Nastere Angajat
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Salvează setările
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Produse solicitate
 DocType: Item,Inspection Criteria,Criteriile de inspecție
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Transferat
 DocType: BOM Website Item,BOM Website Item,Site-ul BOM Articol
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,Upload your letter head and logo. (you can edit them later).,Încărcați capul scrisoare și logo-ul. (Le puteți edita mai târziu).
 DocType: Timesheet Detail,Bill,Factură
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,În continuare Amortizarea Data este introdusă ca dată rămas singur
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Data următoarei amortizări este introdusă ca dată trecută
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +204,White,Alb
 DocType: SMS Center,All Lead (Open),Toate articolele de top (deschise)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rândul {0}: Cant nu este disponibil pentru {4} în depozit {1} în postarea momentul înscrierii ({2} {3})
@@ -1193,11 +1217,11 @@
 DocType: Journal Entry,Total Amount in Words,Suma totală în cuvinte
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,A aparut o eroare. Un motiv probabil ar putea fi că nu ați salvat formularul. Vă rugăm să contactați iulianolaru@ollala.ro dacă problema persistă.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Cosul meu
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Pentru Tipul trebuie să fie una dintre {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Pentru Tipul trebuie să fie una dintre {0}
 DocType: Lead,Next Contact Date,Următor Contact Data
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Deschiderea Cantitate
 DocType: Healthcare Settings,Appointment Reminder,Memento pentru numire
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Vă rugăm să introduceți cont pentru Schimbare Sumă
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Vă rugăm să introduceți cont pentru Schimbare Sumă
 DocType: Student Batch Name,Student Batch Name,Nume elev Lot
 DocType: Consultation,Doctor,Doctor
 DocType: Holiday List,Holiday List Name,Denumire Lista de Vacanță
@@ -1205,12 +1229,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Curs orar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Opțiuni pe acțiuni
 DocType: Journal Entry Account,Expense Claim,Revendicare Cheltuieli
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Sigur doriți să restabiliți acest activ casate?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Cantitate pentru {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Sigur doriți să restabiliți acest activ casate?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Cantitate pentru {0}
 DocType: Leave Application,Leave Application,Aplicatie pentru Concediu
 DocType: Patient,Patient Relation,Relația pacientului
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Mijloc pentru Alocare Concediu
+DocType: Item,Hub Category to Publish,Categorie Hub pentru publicare
 DocType: Leave Block List,Leave Block List Dates,Date Lista Concedii Blocate
+DocType: Sales Invoice,Billing Address GSTIN,Adresa de facturare GSTIN
 DocType: Workstation,Net Hour Rate,Net Rata de ore
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Chitanta de Cumparare aferent Costului Final
 DocType: Company,Default Terms,Termeni implicite
@@ -1220,11 +1246,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Vă rugăm să specificați un {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Articole eliminate cu nici o schimbare în cantitate sau de valoare.
 DocType: Delivery Note,Delivery To,De Livrare la
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Tabelul atribut este obligatoriu
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Tabelul atribut este obligatoriu
 DocType: Production Planning Tool,Get Sales Orders,Obține comenzile de vânzări
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} nu poate fi negativ
 DocType: Training Event,Self-Study,Studiu individual
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Reducere
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Reducere
 DocType: Asset,Total Number of Depreciations,Număr total de Deprecieri
 DocType: Sales Invoice Item,Rate With Margin,Rate cu marjă
 DocType: Sales Invoice Item,Rate With Margin,Rate cu marjă
@@ -1232,7 +1258,7 @@
 DocType: Task,Urgent,De urgență
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Vă rugăm să specificați un ID rând valabil pentru rând {0} în tabelul {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Imposibil de găsit variabila:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Selectați un câmp de editat din numpad
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Selectați un câmp de editat din numpad
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Du-te la desktop și începe să utilizați ERPNext
 DocType: Item,Manufacturer,Producător
 DocType: Landed Cost Item,Purchase Receipt Item,Primirea de cumpărare Postul
@@ -1263,8 +1289,8 @@
 DocType: GL Entry,Against,Comparativ
 DocType: Item,Default Selling Cost Center,Centru de Cost Vanzare Implicit
 DocType: Sales Partner,Implementation Partner,Partener de punere în aplicare
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Cod postal
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Comandă de vânzări {0} este {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Cod postal
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Comandă de vânzări {0} este {1}
 DocType: Opportunity,Contact Info,Informaţii Persoana de Contact
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Efectuarea de stoc Entries
 DocType: Packing Slip,Net Weight UOM,Greutate neta UOM
@@ -1275,6 +1301,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Obtine Perioada Libera Saptamanala
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Data de Incheiere nu poate fi anterioara Datei de Incepere
 DocType: Sales Person,Select company name first.,Selectați numele companiei în primul rând.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Scazut la mare
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Cotatiilor primite de la furnizori.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Înlocuiți BOM și actualizați prețul cel mai recent în toate BOM-urile
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Pentru a {0} | {1} {2}
@@ -1294,7 +1321,7 @@
 DocType: Program Enrollment,Transportation,Transport
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Atribut nevalid
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} trebuie să fie introdus
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Cantitatea trebuie sa fie mai mic sau egal cu {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Cantitatea trebuie sa fie mai mic sau egal cu {0}
 DocType: SMS Center,Total Characters,Total de caractere
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Vă rugăm să selectați BOM BOM în domeniu pentru postul {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Detaliu factură formular-C
@@ -1309,7 +1336,7 @@
 ,Ordered Items To Be Billed,Comandat de Articole Pentru a fi facturat
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Din Gama trebuie să fie mai mică de la gama
 DocType: Global Defaults,Global Defaults,Valori Implicite Globale
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Colaborare proiect Invitație
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Colaborare proiect Invitație
 DocType: Salary Slip,Deductions,Deduceri
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Numele acțiunii
@@ -1327,13 +1354,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura Vanzare Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Nimic de a solicita
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Un alt record buget &#39;{0} &quot;există deja împotriva {1}&#39; {2} &#39;pentru anul fiscal {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','Data efectivă de începere' nu poate fi după  'Data efectivă de sfârșit'
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','Data efectivă de începere' nu poate fi după  'Data efectivă de sfârșit'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Management
 DocType: Cheque Print Template,Payer Settings,Setări plătitorilor
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Acest lucru va fi adăugat la Codul punctul de varianta. De exemplu, în cazul în care abrevierea este ""SM"", iar codul produs face ""T-SHIRT"", codul punctul de varianta va fi ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pay net (în cuvinte) vor fi vizibile după ce salvați fluturasul de salariu.
 DocType: Purchase Invoice,Is Return,Este de returnare
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Prudență
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Prudență
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Returnare / debit Notă
 DocType: Price List Country,Price List Country,Lista de preturi Țară
 DocType: Item,UOMs,UOMs
@@ -1348,17 +1375,18 @@
 DocType: Account,Balance Sheet,Bilant
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Centrul de cost pentru postul cu codul Postul '
 DocType: Fee Validity,Valid Till,Valabil până la
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modul de plată nu este configurat. Vă rugăm să verificați, dacă contul a fost setat pe modul de plăți sau la POS Profil."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modul de plată nu este configurat. Vă rugăm să verificați, dacă contul a fost setat pe modul de plăți sau la POS Profil."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Același articol nu poate fi introdus de mai multe ori.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Conturile suplimentare pot fi făcute sub Groups, dar intrările pot fi făcute împotriva non-Grupuri"
 DocType: Lead,Lead,Conducere
 DocType: Email Digest,Payables,Datorii
 DocType: Course,Course Intro,Intro curs de
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Arhivă de intrare {0} creat
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vă rugăm să configurați seria de numerotare pentru Participare prin Configurare&gt; Serie de numerotare
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Arhivă de intrare {0} creat
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Respins Cantitate nu pot fi introduse în Purchase Întoarcere
 ,Purchase Order Items To Be Billed,Cumparare Ordine Articole Pentru a fi facturat
 DocType: Purchase Invoice Item,Net Rate,Rata netă
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Selectați un client
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Selectați un client
 DocType: Purchase Invoice Item,Purchase Invoice Item,Factura de cumpărare Postul
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stocul Ledger Înscrieri și GL intrările sunt postate pentru selectate Veniturile achiziție
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Postul 1
@@ -1379,7 +1407,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Inregistrare {0} este duplicata cu aceeași {1}
 ,Trial Balance,Balanta
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Anul fiscal {0} nu a fost găsit
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Configurarea angajati
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Configurarea angajati
 DocType: Sales Order,SO-,ASA DE-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Vă rugăm să selectați prefix întâi
 DocType: Employee,O-,O-
@@ -1391,12 +1419,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Vezi Ledger
 DocType: Grading Scale,Intervals,intervale
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Cel mai devreme
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Există un grup de articole cu aceeaşi denumire, vă rugăm să schimbați denumirea articolului sau să redenumiţi grupul articolului"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Există un grup de articole cu aceeaşi denumire, vă rugăm să schimbați denumirea articolului sau să redenumiţi grupul articolului"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Elev mobil Nr
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Restul lumii
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Restul lumii
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Postul {0} nu poate avea Lot
 ,Budget Variance Report,Raport de variaţie buget
 DocType: Salary Slip,Gross Pay,Plata Bruta
+DocType: Item,Is Item from Hub,Este element din Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Rândul {0}: Activitatea de tip este obligatorie.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividendele plătite
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Registru Jurnal
@@ -1406,8 +1435,9 @@
 DocType: Vehicle Log,Service Detail,Detaliu serviciu
 DocType: BOM,Item Description,Descriere Articol
 DocType: Student Sibling,Student Sibling,elev Sibling
-DocType: Purchase Invoice,Is Recurring,Este recurent
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Modul de plată
 DocType: Purchase Invoice,Supplied Items,Articole furnizate
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Vă rugăm să setați un meniu activ pentru Restaurant {0}
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Cantitate pentru fabricare
 DocType: Email Digest,New Income,noul venit
@@ -1417,6 +1447,7 @@
 ,Student and Guardian Contact Details,Student și Guardian Detalii de contact
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Rândul {0}: furnizor {0} Adresa de e-mail este necesară pentru a trimite e-mail
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Deschiderea temporară
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Vizualizați centrul
 ,Employee Leave Balance,Bilant Concediu Angajat
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Bilanţă pentru contul {0} trebuie să fie întotdeauna {1}
 DocType: Patient Appointment,More Info,Mai multe informatii
@@ -1431,20 +1462,20 @@
 DocType: Supplier Quotation Item,Lead Time in days,Timp de plumb în zile
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Rezumat conturi pentru plăți
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +337,Payment of salary from {0} to {1},Plata salariului de la {0} la {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Nu este autorizat pentru a edita contul congelate {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Nu este autorizat pentru a edita Contul {0} blocat
 DocType: Journal Entry,Get Outstanding Invoices,Obtine Facturi Neachitate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Comandă de vânzări {0} nu este valid
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Avertizare pentru o nouă solicitare de ofertă
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Comenzile de aprovizionare vă ajuta să planificați și să urmați pe achizițiile dvs.
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Ne pare rău, companiile nu se pot uni"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Ne pare rău, companiile nu se pot uni"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Cerințe privind testarea la laborator
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Cantitatea totală de emisie / transfer {0} din solicitarea materialului {1} nu poate fi mai mare decât cantitatea cerută {2} pentru articolul {3}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Cantitatea totală de emisie / transfer {0} în solicitarea materialului {1} nu poate fi mai mare decât cantitatea cerută {2} pentru articolul {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Mic
 DocType: Employee,Employee Number,Numar angajat
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Cazul nr. (s) este deja utilizat. Încercați din cazul nr. {s}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Cazul nr. (s) este deja utilizat. Încercați din cazul nr. {s}
 DocType: Project,% Completed,% Finalizat
 ,Invoiced Amount (Exculsive Tax),Facturate Suma (Exculsive Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Punctul 2
@@ -1459,11 +1490,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Cheltuieli indirecte
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Rând {0}: Cant este obligatorie
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultură
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sincronizare Date
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sincronizare Date
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Produsele sau serviciile dvs.
 DocType: Special Test Items,Special Test Items,Elemente speciale de testare
 DocType: Mode of Payment,Mode of Payment,Mod de plata
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Site-ul Image ar trebui să fie un fișier public sau site-ul URL-ul
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Site-ul Image ar trebui să fie un fișier public sau site-ul URL-ul
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Acesta este un grup element rădăcină și nu pot fi editate.
@@ -1471,24 +1502,23 @@
 DocType: Vehicle,Fuel UOM,combustibil UOM
 DocType: Warehouse,Warehouse Contact Info,Date de contact depozit
 DocType: Payment Entry,Write Off Difference Amount,Diferență Sumă Piertdute
-DocType: Purchase Invoice,Recurring Type,Tip recurent
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: e-mail angajat nu a fost găsit, prin urmare, nu a fost trimis mail"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: e-mail angajat nu a fost găsit, prin urmare, nu a fost trimis mail"
 DocType: Item,Foreign Trade Details,Detalii Comerț Exterior
+,Assessment Plan Status,Starea planului de evaluare
 DocType: Email Digest,Annual Income,Venit anual
 DocType: Serial No,Serial No Details,Serial Nu Detalii
 DocType: Purchase Invoice Item,Item Tax Rate,Rata de Impozitare Articol
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,Selectați Medic și data
 DocType: Student Group Student,Group Roll Number,Numărul rolurilor de grup
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Pentru {0}, numai conturi de credit poate fi legat de o altă intrare în debit"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totală a tuturor greutăților sarcinii trebuie să fie 1. Ajustați greutățile tuturor sarcinilor de proiect în consecință
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Nota de Livrare {0} nu este introdusa
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totală a tuturor greutăților sarcinii trebuie să fie 1. Ajustați greutățile tuturor sarcinilor de proiect în consecință
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Nota de Livrare {0} nu este introdusa
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Articolul {0} trebuie să fie un Articol Sub-contractat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Echipamente de Capital
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regula de stabilire a prețurilor este selectat în primul rând bazat pe ""Aplicați pe"" teren, care poate fi produs, Grupa de articole sau de brand."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Vă rugăm să setați mai întâi Codul elementului
-DocType: Hub Settings,Seller Website,Vânzător Site-ul
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Vă rugăm să setați mai întâi Codul elementului
 DocType: Item,ITEM-,ARTICOL-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Procentul total alocat pentru echipa de vânzări ar trebui să fie de 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Procentul total alocat pentru echipa de vânzări ar trebui să fie de 100
 DocType: Sales Invoice Item,Edit Description,Edit Descriere
 DocType: Antibiotic,Antibiotic,Antibiotic
 ,Team Updates,echipa Actualizări
@@ -1509,12 +1539,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Total (Company valutar)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Număr de serie {0} a intrat de mai multe ori
 DocType: Depreciation Schedule,Journal Entry,Intrare în jurnal
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} elemente în curs
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} elemente în curs
 DocType: Workstation,Workstation Name,Stație de lucru Nume
 DocType: Grading Scale Interval,Grade Code,Cod grad
 DocType: POS Item Group,POS Item Group,POS Articol Grupa
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} nu aparţine articolului {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} nu aparţine articolului {1}
 DocType: Sales Partner,Target Distribution,Țintă Distribuție
 DocType: Salary Slip,Bank Account No.,Cont bancar nr.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Acesta este numărul ultimei tranzacții create cu acest prefix
@@ -1531,10 +1561,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Cerere de ofertă Furnizor
 DocType: Healthcare Settings,Registration Message,Mesaj de înregistrare
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Hardware
-DocType: Sales Order,Recurring Upto,recurente upto
 DocType: Prescription Dosage,Prescription Dosage,Dozaj de prescripție
 DocType: Attendance,HR Manager,Manager Resurse Umane
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Vă rugăm să selectați o companie
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Vă rugăm să selectați o companie
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Privilege concediu
 DocType: Purchase Invoice,Supplier Invoice Date,Furnizor Data facturii
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,pe
@@ -1550,10 +1579,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Condiții se suprapun găsite între:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Comparativ intrării {0} în jurnal este deja ajustată comparativ altui voucher
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Valoarea totală Comanda
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Produse Alimentare
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Produse Alimentare
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Clasă de uzură 3
 DocType: Maintenance Schedule Item,No of Visits,Nu de vizite
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Planul de întreținere {0} există împotriva {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Doriți să publicați articolele dvs. în Hub?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,student inregistrat
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta contului de închidere trebuie să fie {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma de puncte pentru toate obiectivele ar trebui să fie 100. este {0}
@@ -1564,9 +1594,9 @@
 DocType: Authorization Rule,Average Discount,Discount mediiu
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Utilitați
-DocType: Purchase Invoice Item,Accounting,Contabilitate
+DocType: POS Profile,Accounting,Contabilitate
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Selectați loturile pentru elementul vărsat
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Selectați loturile pentru elementul vărsat
 DocType: Asset,Depreciation Schedules,Orarele de amortizare
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Perioada de aplicare nu poate fi perioadă de alocare concediu în afara
 DocType: Activity Cost,Projects,Proiecte
@@ -1582,18 +1612,19 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',"Statusul aprobării trebuie să fie ""Aprobat"" sau ""Respins"""
 DocType: Physician,Contacts and Address,Contacte și adresă
 DocType: Purchase Invoice,Contact Person,Persoană de contact
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Data de început preconizatã' nu poate fi dupa data 'Data de sfârșit anticipatã'
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','Data de început preconizatã' nu poate fi dupa data 'Data de sfârșit anticipatã'
 DocType: Course Scheduling Tool,Course End Date,Desigur Data de încheiere
 DocType: Holiday List,Holidays,Concedii
 DocType: Sales Order Item,Planned Quantity,Planificate Cantitate
 DocType: Purchase Invoice Item,Item Tax Amount,Suma Taxa Articol
-DocType: Item,Maintain Stock,Menținere de Stock
+DocType: Item,Maintain Stock,Articol stocabil
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,
 DocType: Employee,Prefered Email,E-mail Preferam
+DocType: Student Admission,Eligibility and Details,Eligibilitate și detalii
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Schimbarea net în active fixe
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lăsați necompletat dacă se consideră pentru toate denumirile
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Taxa de tip 'Efectiv' în inregistrarea {0} nu poate fi inclus în Rata Articol"""
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,De la Datetime
 DocType: Email Digest,For Company,Pentru Companie
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log comunicare.
@@ -1601,19 +1632,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Scorul variabil al scorului de performanță al furnizorului
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Suma de Cumpărare
 DocType: Sales Invoice,Shipping Address Name,Transport Adresa Nume
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Grafic Conturi
 DocType: Material Request,Terms and Conditions Content,Termeni și condiții de conținut
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,nu poate fi mai mare de 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Articolul{0} nu este un element de stoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Articolul{0} nu este un element de stoc
 DocType: Maintenance Visit,Unscheduled,Neprogramat
 DocType: Employee,Owned,Deținut
 DocType: Salary Detail,Depends on Leave Without Pay,Depinde de concediu fără plată
 DocType: Pricing Rule,"Higher the number, higher the priority","Este mai mare numărul, mai mare prioritate"
 ,Purchase Invoice Trends,Cumpărare Tendințe factură
 DocType: Employee,Better Prospects,Perspective îmbunătăţite
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Rândul # {0}: lotul {1} are doar {2} qty. Selectați un alt lot care are {3} qty disponibil sau împărți rândul în mai multe rânduri, pentru a livra / emite din mai multe loturi"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Rândul # {0}: lotul {1} are doar {2} qty. Selectați un alt lot care are {3} qty disponibil sau împărți rândul în mai multe rânduri, pentru a livra / emite din mai multe loturi"
 DocType: Vehicle,License Plate,Înmatriculare
 DocType: Appraisal,Goals,Obiective
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Selectați POS Profile
 DocType: Warranty Claim,Warranty / AMC Status,Garanție / AMC Starea
 ,Accounts Browser,Navigator Conturi
 DocType: Payment Entry Reference,Payment Entry Reference,Plată intrare de referință
@@ -1632,7 +1663,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Angajat nu pot raporta la sine.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","În cazul în care contul este blocat, intrările sunt permite utilizatorilor restricționati."
 DocType: Email Digest,Bank Balance,Banca Balance
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilitate de intrare pentru {0}: {1} se poate face numai în valută: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilitate de intrare pentru {0}: {1} se poate face numai în valută: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profilul postului, calificări necesare, etc"
 DocType: Journal Entry Account,Account Balance,Soldul contului
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Regula de impozit pentru tranzacțiile.
@@ -1641,8 +1672,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Impozite si Taxe (Compania valutar)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Afișați soldurile L P &amp; anul fiscal unclosed lui
 DocType: Lab Test Template,Collection Details,Detaliile colecției
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","selectați cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date din tabConsultation ct, `tabLab Prescription` cp unde ct.patient = &#39;{0}&#39; și cp.parent = ct. nume și cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Contul de transport maritim
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Cont {2} este inactiv
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Asigurați-vă Comenzi de vânzări pentru a vă ajuta să planificați munca și să livreze la timp
@@ -1659,8 +1688,8 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Slip de ambalare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Birou inchiriat
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setări de configurare SMS gateway-ul
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import a eșuat!
-apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Nici adresa adăugat încă.
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import a eșuat!
+apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Nici o adresă adăugată încă.
 DocType: Workstation Working Hour,Workstation Working Hour,Statie de lucru de ore de lucru
 DocType: Vital Signs,Blood Pressure,Tensiune arteriala
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +121,Analyst,Analist
@@ -1684,7 +1713,7 @@
 DocType: Sales Invoice,Source,Sursă
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Afișează închis
 DocType: Leave Type,Is Leave Without Pay,Este concediu fără plată
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Categoria activ este obligatorie pentru postul de activ fix
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Categoria activ este obligatorie pentru postul de activ fix
 DocType: Fee Validity,Fee Validity,Valabilitate taxă
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nu sunt găsite în tabelul de plăți înregistrări
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Acest {0} conflicte cu {1} pentru {2} {3}
@@ -1692,7 +1721,7 @@
 DocType: POS Profile,Apply Discount,Aplicați o reducere
 DocType: GST HSN Code,GST HSN Code,Codul GST HSN
 DocType: Employee External Work History,Total Experience,Experiența totală
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Proiecte deschise
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Deschide Proiecte
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,Packing Slip(s) cancelled,Slip de ambalare (e) anulate
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Cash Flow de la Investiții
 DocType: Program Course,Program Course,Curs Program
@@ -1705,8 +1734,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Cautare Executiva
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Creați Oportunitati
 DocType: Maintenance Schedule,Schedules,Orarele
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,Profilul POS este necesar pentru a utiliza Punctul de vânzare
 DocType: Purchase Invoice Item,Net Amount,Cantitate netă
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} nu a fost trimis, astfel încât acțiunea nu poate fi finalizată"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} nu a fost trimis, astfel încât acțiunea nu poate fi finalizată"
 DocType: Purchase Order Item Supplied,BOM Detail No,Detaliu BOM nr.
 DocType: Landed Cost Voucher,Additional Charges,Costuri suplimentare
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Discount suplimentar Suma (companie de valuta)
@@ -1715,7 +1745,7 @@
 ,Support Hour Distribution,Distribuția orelor de distribuție
 DocType: Maintenance Visit,Maintenance Visit,Vizita Mentenanta
 DocType: Student,Leaving Certificate Number,Părăsirea Număr certificat
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Numirea anulată, consultați și anulați factura {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Numirea anulată, consultați și anulați factura {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Cantitate lot disponibilă în depozit
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Actualizare Format Print
 DocType: Landed Cost Voucher,Landed Cost Help,Costul Ajutor Landed
@@ -1738,8 +1768,8 @@
 DocType: Patient,Tobacco Past Use,Consumul de tutun din trecut
 DocType: Sales Invoice Item,Brand Name,Denumire marcă
 DocType: Purchase Receipt,Transporter Details,Detalii Transporter
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Utilizatorul {0} este deja alocat medicului {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,depozitul implicit este necesar pentru elementul selectat
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Utilizatorul {0} este deja alocat medicului {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,depozitul implicit este necesar pentru elementul selectat
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Cutie
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,posibil furnizor
 DocType: Budget,Monthly Distribution,Distributie lunar
@@ -1749,8 +1779,8 @@
 DocType: Sales Partner,Sales Partner Target,Vânzări Partner țintă
 DocType: Loan Type,Maximum Loan Amount,Suma maximă a împrumutului
 DocType: Pricing Rule,Pricing Rule,Regula de stabilire a prețurilor
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Numărul de rolă duplicat pentru student {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Numărul de rolă duplicat pentru student {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Numărul de rolă duplicat pentru student {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Numărul de rolă duplicat pentru student {0}
 DocType: Budget,Action if Annual Budget Exceeded,Acțiune în cazul în care anual Buget Depășit
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Cerere de material de cumpărare Ordine
 DocType: Shopping Cart Settings,Payment Success URL,Plată de succes URL
@@ -1768,7 +1798,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} trebuie să apară doar o singură dată
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nu este permis să transferam mai {0} {1} decât împotriva Comandă {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Concedii alocate cu succes pentru {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nu sunt produse în ambalaj
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Nu sunt produse în ambalaj
 DocType: Shipping Rule Condition,From Value,Din Valoare
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Cantitatea de fabricație este obligatorie
 DocType: Employee Loan,Repayment Method,Metoda de rambursare
@@ -1782,6 +1812,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Pasive stoc
 DocType: Purchase Invoice,Supplier Warehouse,Furnizor Warehouse
 DocType: Opportunity,Contact Mobile No,Nr. Mobil Persoana de Contact
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Selectați Companie
 ,Material Requests for which Supplier Quotations are not created,Cererile de materiale pentru care nu sunt create Cotațiile Furnizor
 DocType: Student Group,Set 0 for no limit,0 pentru a seta nici o limită
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,A doua zi (e) pe care se aplica pentru concediu sunt sărbători. Nu trebuie să se aplice pentru concediu.
@@ -1789,26 +1820,26 @@
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Sarcina noua
 DocType: Consultation,Appointment,Programare
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Face ofertă
-apps/erpnext/erpnext/config/selling.py +216,Other Reports,alte rapoarte
+apps/erpnext/erpnext/config/selling.py +216,Other Reports,Alte rapoarte
 DocType: Dependent Task,Dependent Task,Sarcina dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de Conversie pentru Unitatea de Măsură implicita trebuie să fie 1 pentru inregistrarea {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de Conversie pentru Unitatea de Măsură implicita trebuie să fie 1 pentru inregistrarea {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Concediul de tip {0} nu poate dura mai mare de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Încercați planificarea operațiunilor de X zile în avans.
 DocType: HR Settings,Stop Birthday Reminders,De oprire de naștere Memento
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Vă rugăm să setați Cont Cheltuieli suplimentare salarizare implicit în companie {0}
 DocType: SMS Center,Receiver List,Receptor Lista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,căutare articol
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,căutare articol
 DocType: Patient Appointment,Referring Physician,Medicul de referință
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Consumat Suma
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Schimbarea net în numerar
 DocType: Assessment Plan,Grading Scale,Scala de notare
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unitate de măsură {0} a fost introdus mai mult de o dată în Factor de conversie Tabelul
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,deja finalizat
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unitate de măsură {0} a fost introdus mai mult de o dată în Factor de conversie Tabelul
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,deja finalizat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stoc în mână
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Cerere de plată există deja {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costul de articole emise
 DocType: Physician,Hospital,Spital
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Cantitatea nu trebuie să fie mai mare de {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Cantitatea nu trebuie să fie mai mare de {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Exercițiul financiar precedent nu este închis
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Vârstă (zile)
 DocType: Quotation Item,Quotation Item,Citat Articol
@@ -1819,8 +1850,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Furnizor de tip maestru.
 DocType: Purchase Order Item,Supplier Part Number,Furnizor Număr
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Rata de conversie nu poate fi 0 sau 1
-DocType: Sales Invoice,Reference Document,Documentul de referință
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} este anulată sau oprită
+DocType: Subscription,Reference Document,Documentul de referință
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} este anulată sau oprită
 DocType: Accounts Settings,Credit Controller,Controler de Credit
 DocType: Delivery Note,Vehicle Dispatch Date,Dispeceratul vehicul Data
 DocType: Healthcare Settings,Default Medical Code Standard,Standardul medical standard standard
@@ -1829,6 +1860,7 @@
 DocType: Company,Default Payable Account,Implicit cont furnizori
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Setări pentru cosul de cumparaturi on-line, cum ar fi normele de transport maritim, lista de preturi, etc."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Facturat
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Sortați după Preț ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Rezervate Cantitate
 DocType: Party Account,Party Account,Party Account
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Resurse umane
@@ -1840,13 +1872,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Asigurați-debursare de intrare
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Advance împotriva Furnizor trebuie să fie de debit
 DocType: Company,Default Values,Valori implicite
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequency} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Frequency} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Total suma rambursată
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Aceasta se bazează pe bușteni împotriva acestui vehicul. A se vedea calendarul de mai jos pentru detalii
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Comparativ facturii furnizorului {0} din data {1}
 DocType: Customer,Default Price List,Lista de Prețuri Implicita
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Mișcarea de înregistrare a activelor {0} creat
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nu puteți șterge Anul fiscal {0}. Anul fiscal {0} este setat ca implicit în Setări globale
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Un client cu același nume există deja
 DocType: Journal Entry,Entry Type,Tipul de intrare
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Nu există niciun plan de evaluare legat de acest grup de evaluare
 ,Customer Credit Balance,Balanța Clienți credit
@@ -1857,7 +1890,7 @@
 DocType: Quotation,Term Details,Detalii pe termen
 DocType: Project,Total Sales Cost (via Sales Order),Costul total al vânzărilor (prin comandă de vânzări)
 DocType: Project,Total Sales Cost (via Sales Order),Costul total al vânzărilor (prin comandă de vânzări)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Nu se poate inscrie mai mult de {0} studenți pentru acest grup de studenți.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Nu se poate inscrie mai mult de {0} studenți pentru acest grup de studenți.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Conducerea contabilă
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Conducerea contabilă
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} trebuie să fie mai mare decât 0
@@ -1875,9 +1908,11 @@
 DocType: Lab Test,Technician Name,Numele tehnicianului
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Plata unlink privind anularea facturii
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Kilometrajul curentă introdusă trebuie să fie mai mare decât inițială a vehiculului odometru {0}
+DocType: Restaurant Reservation,No Show,Neprezentare
 DocType: Shipping Rule Country,Shipping Rule Country,Regula de transport maritim Tara
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Plece și prezență
 DocType: Maintenance Visit,Partially Completed,Parțial finalizate
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Sensibilitate moderată
 DocType: Leave Type,Include holidays within leaves as leaves,Includ zilele de sărbătoare în frunze ca frunze
 DocType: Sales Invoice,Packed Items,Articole pachet
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garantie revendicarea împotriva Serial No.
@@ -1894,15 +1929,16 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Plătit Suma (Compania de valuta)
 DocType: Purchase Invoice,Additional Discount,Discount suplimentar
 DocType: Selling Settings,Selling Settings,Vanzarea Setări
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Confirmați acțiunea
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Licitatii Online
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Vă rugăm să specificați fie Cantitate sau Evaluează evaluare sau ambele
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Împlinire
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Vizualizare Coș
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Cheltuieli de marketing
 ,Item Shortage Report,Raport Articole Lipsa
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Cerere de material utilizat pentru a face acest stoc de intrare
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,În continuare Amortizarea Data este obligatoriu pentru nou activ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Data următoarei amortizări este obligatorie pentru nou activ
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Separați un grup bazat pe cursuri pentru fiecare lot
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Separați un grup bazat pe cursuri pentru fiecare lot
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Unitate unică a unui articol.
@@ -1913,12 +1949,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Realizeaza Intrare de Contabilitate Pentru Fiecare Modificare a Stocului
 DocType: Leave Allocation,Total Leaves Allocated,Totalul Frunze alocate
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Depozit necesar la Row Nu {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Va rugam sa introduceti valabil financiare Anul începe și a termina Perioada
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Va rugam sa introduceti valabil financiare Anul începe și a termina Perioada
 DocType: Employee,Date Of Retirement,Data Pensionare
 DocType: Upload Attendance,Get Template,Obține șablon
 DocType: Material Request,Transferred,transferat
 DocType: Vehicle,Doors,Usi
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext Setup Complete!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Colectați taxa pentru înregistrarea pacientului
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,Descărcarea de impozite
@@ -1937,37 +1973,37 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Dacă acest element are variante, atunci nu poate fi selectat în comenzile de vânzări, etc."
 DocType: Lead,Next Contact By,Următor Contact Prin
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Cantitatea necesară pentru postul {0} în rândul {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Cantitatea necesară pentru postul {0} în rândul {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Depozit {0} nu poate fi ștearsă ca exista cantitate pentru postul {1}
 DocType: Quotation,Order Type,Tip comandă
-DocType: Purchase Invoice,Notification Email Address,Notificarea Adresa de e-mail
 ,Item-wise Sales Register,Registru Vanzari Articol-Avizat
 DocType: Asset,Gross Purchase Amount,Sumă brută Cumpărare
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Solduri de deschidere
 DocType: Asset,Depreciation Method,Metoda de amortizare
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Deconectat
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Deconectat
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Este acest fiscală inclusă în rata de bază?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Raport țintă
 DocType: Job Applicant,Applicant for a Job,Solicitant pentru un loc de muncă
 DocType: Production Plan Material Request,Production Plan Material Request,Producția Plan de material Cerere
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Nu sunt comenzile de producție create
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Nu sunt comenzile de producție create
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliere JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Prea multe coloane. Exporta raportul și imprima utilizând o aplicație de calcul tabelar.
 DocType: Purchase Invoice Item,Batch No,Lot nr.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Cerere de ofertă: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permite mai multor comenzi de vânzări împotriva Ordinului de Procurare unui client
 DocType: Student Group Instructor,Student Group Instructor,Student Grup Instructor
 DocType: Student Group Instructor,Student Group Instructor,Student Grup Instructor
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 mobil nr
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Principal
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variantă
 DocType: Naming Series,Set prefix for numbering series on your transactions,Set prefix pentru seria de numerotare pe tranzacțiile dvs.
 DocType: Employee Attendance Tool,Employees HTML,Angajații HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Implicit BOM ({0}) trebuie să fie activ pentru acest element sau șablon de
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Implicit BOM ({0}) trebuie să fie activ pentru acest element sau șablon de
 DocType: Employee,Leave Encashed?,Concediu Incasat ?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Oportunitatea de la câmp este obligatoriu
 DocType: Email Digest,Annual Expenses,Cheltuielile anuale
 DocType: Item,Variants,Variante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Realizeaza Comanda de Cumparare
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Realizeaza Comanda de Cumparare
 DocType: SMS Center,Send To,Trimite la
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Nu există echilibru concediu suficient pentru concediul de tip {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Suma alocată
@@ -1985,6 +2021,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Grupul Forței Studenților
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Comparativ intrării {0} în jurnal nu are nici o intrare nepotrivită {1}
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Cotatie
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Evenimente de instruire
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Nr. Serial introdus pentru articolul {0} este duplicat
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,O condiție pentru o normă de transport
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Te rog intra
@@ -1994,7 +2031,7 @@
 DocType: Sales Order,To Deliver and Bill,Pentru a livra și Bill
 DocType: Student Group,Instructors,instructorii
 DocType: GL Entry,Credit Amount in Account Currency,Suma de credit în cont valutar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} trebuie să fie introdus
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} trebuie să fie introdus
 DocType: Authorization Control,Authorization Control,Control de autorizare
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Respins Warehouse este obligatorie împotriva postul respins {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Plată
@@ -2013,11 +2050,11 @@
 DocType: Quotation Item,Actual Qty,Cant efectivă
 DocType: Sales Invoice Item,References,Referințe
 DocType: Quality Inspection Reading,Reading 10,Reading 10
-DocType: Hub Settings,Hub Node,Hub Node
+DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Ați introdus elemente cu dubluri. Vă rugăm să rectifice și să încercați din nou.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Asociaţi
 DocType: Asset Movement,Asset Movement,Mișcarea activelor
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,nou Coș
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,Coș nou
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Articolul {0} nu este un articol serializat
 DocType: SMS Center,Create Receiver List,Creare Lista Recipienti
 DocType: Vehicle,Wheels,roţi
@@ -2026,20 +2063,20 @@
 DocType: Production Planning Tool,Material Requests,Cereri de materiale
 DocType: Warranty Claim,Issue Date,Data emiterii
 DocType: Activity Cost,Activity Cost,Cost activitate
-DocType: Sales Invoice Timesheet,Timesheet Detail,Detalii pontajul
+DocType: Sales Invoice Timesheet,Timesheet Detail,Detalii pontaj
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Cantitate Consumata
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicații
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indică faptul că pachetul este o parte din această livrare (Proiect de numai)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Realizeaza Intrare de Plati
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Cantitatea pentru postul {0} trebuie să fie mai mică de {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Cantitatea pentru postul {0} trebuie să fie mai mică de {1}
 ,Sales Invoice Trends,Vânzări Tendințe factură
 DocType: Leave Application,Apply / Approve Leaves,Aplicați / aprobaţi concedii
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Pentru
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Pentru
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Se poate face referire la inregistrare numai dacă tipul de taxa este 'Suma inregistrare precedenta' sau 'Total inregistrare precedenta'
 DocType: Sales Order Item,Delivery Warehouse,Depozit de livrare
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Tree of centre de cost financiare.
 DocType: Serial No,Delivery Document No,Nr. de document de Livrare
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Vă rugăm să setați &#39;Gain / Pierdere de cont privind Eliminarea activelor &quot;în companie {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Vă rugăm să setați &#39;Gain / Pierdere de cont privind Eliminarea activelor &quot;în companie {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Obține elemente din achiziție Încasări
 DocType: Serial No,Creation Date,Data creării
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Articolul {0} apare de mai multe ori în Lista de Prețuri {1}
@@ -2050,12 +2087,13 @@
 DocType: Student,Student Mobile Number,Elev Număr mobil
 DocType: Item,Has Variants,Are variante
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Actualizați răspunsul
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Ați selectat deja un produs de la {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Ați selectat deja un produs de la {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Numele de Distributie lunar
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ID-ul lotului este obligatoriu
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ID-ul lotului este obligatoriu
 DocType: Sales Person,Parent Sales Person,Mamă Sales Person
-DocType: Purchase Invoice,Recurring Invoice,Factura recurent
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Ridicat până la scăzut
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Selectați mai întâi programul
 DocType: Patient Appointment,Patient Age,Vârsta pacientului
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Managementul Proiectelor
 DocType: Supplier,Supplier of Goods or Services.,Furnizor de bunuri sau servicii.
@@ -2063,8 +2101,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Conturi implicite de încasat pentru a fi utilizate dacă nu sunt stabilite în pacient pentru a rezerva taxele de consultare.
 DocType: Vehicle Log,Fuel Price,Preț de combustibil
 DocType: Budget,Budget,Buget
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Setați Deschideți
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Fix elementul de activ trebuie să fie un element de bază non-stoc.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Setați Deschideți
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Fix elementul de activ trebuie să fie un element de bază non-stoc.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Bugetul nu pot fi atribuite în {0}, deoarece nu este un cont venituri sau cheltuieli"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Realizat
 DocType: Student Admission,Application Form Route,Forma de aplicare Calea
@@ -2078,12 +2116,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Articolul {0} nu este configurat pentru Numerotare Seriala. Verificati Articolul Principal.
 DocType: Maintenance Visit,Maintenance Time,Timp Mentenanta
 ,Amount to Deliver,Sumă pentru livrare
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Același element a fost introdus de mai multe ori. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Start Termen Data nu poate fi mai devreme decât data Anul de începere a anului universitar la care este legat termenul (anului universitar {}). Vă rugăm să corectați datele și încercați din nou.
 DocType: Guardian,Guardian Interests,Guardian Interese
 DocType: Naming Series,Current Value,Valoare curenta
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ani fiscali multiple exista in data de {0}. Vă rugăm să setați companie în anul fiscal
 DocType: School Settings,Instructor Records to be created by,Instructor de înregistrări care urmează să fie create de către
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} creat
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} creat
 DocType: Delivery Note Item,Against Sales Order,Comparativ comenzii de vânzări
 ,Serial No Status,Serial Nu Statut
 DocType: Payment Entry Reference,Outstanding,remarcabil
@@ -2093,10 +2132,10 @@
 						must be greater than or equal to {2}","Rând {0}: Pentru a stabili {1} periodicitate, diferența între de la și până în prezent \ trebuie să fie mai mare sau egal cu {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Aceasta se bazează pe mișcare stoc. A se vedea {0} pentru detalii
 DocType: Pricing Rule,Selling,De vânzare
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Suma {0} {1} dedusă împotriva {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Suma {0} {1} dedusă împotriva {2}
 DocType: Employee,Salary Information,Informațiile de salarizare
 DocType: Sales Person,Name and Employee ID,Nume și ID angajat
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Data Limita nu poate fi anterioara Datei de POstare
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Data Limita nu poate fi anterioara Datei de POstare
 DocType: Website Item Group,Website Item Group,Site-ul Grupa de articole
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Impozite și taxe
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Vă rugăm să introduceți data de referință
@@ -2109,8 +2148,8 @@
 DocType: Asset,Sold,Vândut
 ,Item-wise Purchase History,Istoric Achizitii Articol-Avizat
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Vă rugăm să faceți clic pe ""Generate Program"", pentru a aduce ordine adăugat pentru postul {0}"
-DocType: Account,Frozen,Congelat
-,Open Production Orders,Comenzi deschis de producție
+DocType: Account,Frozen,Blocat
+,Open Production Orders,Deschide Comenzi de Producție
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Suma de bază (Companie Moneda)
 DocType: Payment Reconciliation Payment,Reference Row,rândul de referință
 DocType: Installation Note,Installation Time,Timp de instalare
@@ -2122,7 +2161,7 @@
 DocType: Issue,Resolution Details,Rezoluția Detalii
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alocări
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Criteriile de receptie
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Vă rugăm să introduceți Cererile materiale din tabelul de mai sus
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Vă rugăm să introduceți Cererile materiale din tabelul de mai sus
 DocType: Item Attribute,Attribute Name,Denumire atribut
 DocType: BOM,Show In Website,Arata pe site-ul
 DocType: Shopping Cart Settings,Show Quantity in Website,Arată Cantitatea în site-ul
@@ -2131,7 +2170,7 @@
 DocType: Item Reorder,Check in (group),Check-in (grup)
 ,Qty to Order,Cantitate pentru comandă
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Capul de cont sub răspunderea sau a capitalului propriu, în care Profit / Pierdere vor fi rezervate"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Diagrama Gantt a tuturor sarcinilor.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Diagrama Gantt a tuturor sarcinilor.
 DocType: Opportunity,Mins to First Response,Mins la First Response
 DocType: Pricing Rule,Margin Type,Tipul de marjă
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} ore
@@ -2153,36 +2192,36 @@
 DocType: Patient,Surgical History,Istorie chirurgicală
 DocType: Employee,Resignation Letter Date,Scrisoare de demisie Data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Regulile de stabilire a prețurilor sunt filtrate în continuare în funcție de cantitate.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Vă rugăm să setați data de îmbarcare pentru angajat {0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Vă rugăm să setați data de îmbarcare pentru angajat {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Vă rugăm să setați data de îmbarcare pentru angajat {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Vă rugăm să setați data de îmbarcare pentru angajat {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Suma totală de facturare (prin timp Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repetați Venituri Clienți
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) trebuie să dețină rolul de ""aprobator cheltuieli"""
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Pereche
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Selectați BOM și Cant pentru producție
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Selectați BOM și Cant pentru producție
 DocType: Asset,Depreciation Schedule,Program de amortizare
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Adrese de parteneri de vânzări și contacte
 DocType: Bank Reconciliation Detail,Against Account,Comparativ contului
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Jumătate Data zi ar trebui să fie între De la data si pana in prezent
 DocType: Maintenance Schedule Detail,Actual Date,Data efectiva
 DocType: Item,Has Batch No,Are nr. de Lot
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Facturare anuală: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Facturare anuală: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Mărfuri și servicii fiscale (GST India)
 DocType: Delivery Note,Excise Page Number,Numărul paginii accize
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Firma, De la data și până în prezent este obligatorie"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Obțineți consultări
 DocType: Asset,Purchase Date,Data cumpărării
 DocType: Employee,Personal Details,Detalii personale
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Vă rugăm să setați &quot;Activ Center Amortizarea Cost&quot; în companie {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Vă rugăm să setați &quot;Activ Center Amortizarea Cost&quot; în companie {0}
 ,Maintenance Schedules,Program de Mentenanta
 DocType: Task,Actual End Date (via Time Sheet),Data de încheiere efectivă (prin Ora Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Suma {0} {1} împotriva {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Suma {0} {1} împotriva {2} {3}
 ,Quotation Trends,Cotație Tendințe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Grupa de articole care nu sunt menționate la punctul de master pentru element {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Debit cont trebuie să fie un cont de creanțe
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Debit cont trebuie să fie un cont de creanțe
 DocType: Shipping Rule Condition,Shipping Amount,Suma de transport maritim
 DocType: Supplier Scorecard Period,Period Score,Scorul perioadei
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Adăugați clienți
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Adăugați clienți
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,În așteptarea Suma
 DocType: Lab Test Template,Special,Special
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversie
@@ -2190,13 +2229,14 @@
 ,Vehicle Expenses,Cheltuielile pentru vehicule
 DocType: Serial No,Invoice Details,Detaliile facturii
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Valoarea așteptată după viață utilă trebuie să fie mai mare sau egal cu {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Începe
+DocType: Hub Category,Hub Category,Categorie Hub
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Numărul de vehicule
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,La data la care factura recurente vor fi opri
 DocType: Employee Loan,Loan Amount,Sumă împrumutată
 DocType: Program Enrollment,Self-Driving Vehicle,Vehicul cu autovehicul
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Graficul Scorecard pentru furnizori
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Rândul {0}: Lista de materiale nu a fost găsit pentru elementul {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Rândul {0}: Lista de materiale nu a fost găsit pentru elementul {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Total frunze alocate {0} nu poate fi mai mic de frunze deja aprobate {1} pentru perioada
 DocType: Journal Entry,Accounts Receivable,Conturi de Incasare
 ,Supplier-Wise Sales Analytics,Furnizor înțelept Vânzări Analytics
@@ -2208,7 +2248,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Curs pentru părinți (lăsați necompletat, dacă acest lucru nu face parte din cursul părinte)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Lăsați necompletat dacă se consideră pentru toate tipurile de angajați
 DocType: Landed Cost Voucher,Distribute Charges Based On,Împărțiți taxelor pe baza
-apps/erpnext/erpnext/hooks.py +131,Timesheets,pontaje
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Pontaje
 DocType: HR Settings,HR Settings,Setări Resurse Umane
 DocType: Salary Slip,net pay info,info net pay
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Această valoare este actualizată în lista prestabilită a prețurilor de vânzare.
@@ -2219,7 +2259,7 @@
 DocType: Patient,B Positive,B pozitiv
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rând # {0}: Cant trebuie să fie 1, ca element este un activ fix. Vă rugăm să folosiți rând separat pentru cantitati multiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Permite Lista Concedii Blocate
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr nu poate fi gol sau spațiu
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr nu poate fi gol sau spațiu
 DocType: Patient Medical Record,Patient Medical Record,Dosarul medical al pacientului
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Grup non-grup
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
@@ -2236,9 +2276,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Imposibil de găsit rata de schimb pentru {0} până la {1} pentru data cheie {2}. Creați manual un registru de schimb valutar
 DocType: POS Profile,Price List,Lista de prețuri
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} este acum anul fiscal implicit. Vă rugăm să reîmprospătați browser-ul dvs. pentru ca modificarea să aibă efect.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Creanțe cheltuieli
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Creanțe cheltuieli
 DocType: Issue,Support,Suport
 ,BOM Search,BOM Căutare
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.","Publicați &quot;În stoc&quot; sau &quot;Nu este în stoc&quot; pe Hub, pe baza stocurilor disponibile în acest depozit."
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Închiderea (deschidere + Totaluri)
 DocType: Vehicle,Fuel Type,Tipul combustibilului
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Vă rugăm să specificați în valută companie
@@ -2250,16 +2291,16 @@
 DocType: Healthcare Settings,Remind Before,Amintește-te înainte
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Factor UOM de conversie este necesară în rândul {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rând # {0}: Tip document de referință trebuie să fie una din comandă de vânzări, vânzări factură sau Jurnal de intrare"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rând # {0}: Tip document de referință trebuie să fie una din comandă de vânzări, vânzări factură sau Jurnal de intrare"
 DocType: Salary Component,Deduction,Deducere
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Rândul {0}: De la timp și de Ora este obligatorie.
 DocType: Stock Reconciliation Item,Amount Difference,suma diferenţă
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Articol Preț adăugată pentru {0} în lista de prețuri {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Articol Preț adăugată pentru {0} în lista de prețuri {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Vă rugăm să introduceți ID-ul de angajat al acestei persoane de vânzări
 DocType: Territory,Classification of Customers by region,Clasificarea clienți în funcție de regiune
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Diferența Suma trebuie să fie zero
 DocType: Project,Gross Margin,Marja Brută
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Va rugam sa introduceti de producție Articol întâi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Va rugam sa introduceti de producție Articol întâi
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Calculat Bank echilibru Declaratie
 DocType: Normal Test Template,Normal Test Template,Șablonul de test normal
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,utilizator dezactivat
@@ -2269,21 +2310,22 @@
 DocType: Salary Slip,Total Deduction,Total de deducere
 ,Production Analytics,Google Analytics de producție
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Aceasta se bazează pe tranzacțiile împotriva acestui pacient. Consultați linia temporală de mai jos pentru detalii
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Cost actualizat
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Cost actualizat
 DocType: Employee,Date of Birth,Data Nașterii
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Articolul {0} a fost deja returnat
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Anul fiscal** reprezintă un an financiar. Toate intrările contabile și alte tranzacții majore sunt monitorizate comparativ cu ** Anul fiscal **.
 DocType: Opportunity,Customer / Lead Address,Client / Adresa principala
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Setarea Scorecard pentru furnizori
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Atenție: certificat SSL invalid pe atașament {0}
-DocType: Student Admission,Eligibility,Eligibilitate
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Numele planului de evaluare
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Atenție: certificat SSL invalid pe atașament {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Oportunitati de afaceri ajuta să obțineți, adăugați toate contactele și mai mult ca dvs. conduce"
 DocType: Production Order Operation,Actual Operation Time,Timp efectiv de funcționare
 DocType: Authorization Rule,Applicable To (User),Aplicabil pentru (utilizator)
 DocType: Purchase Taxes and Charges,Deduct,Deduce
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Descrierea postului
 DocType: Student Applicant,Applied,Aplicat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Re-deschide
 DocType: Sales Invoice Item,Qty as per Stock UOM,Cantitate conform Stock UOM
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Nume Guardian2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caractere speciale in afara ""-"" ""."", ""#"", și ""/"" nu este permis în denumirea serie"
@@ -2295,7 +2337,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Manufacturing Manager de
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial Nu {0} este în garanție pana {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Împărțit de livrare Notă în pachete.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Transporturile
+apps/erpnext/erpnext/hooks.py +107,Shipments,Transporturile
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Suma totală alocată (Companie Moneda)
 DocType: Purchase Order Item,To be delivered to customer,Pentru a fi livrat clientului
 DocType: BOM,Scrap Material Cost,Cost resturi de materiale
@@ -2317,8 +2359,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Setări pentru variantele de articol
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Selectați compania ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Lăsați necompletat dacă se consideră pentru toate departamentele
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tipuri de locuri de muncă (permanent, contractul, intern etc)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} este obligatoriu pentru articolul {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Tipuri de locuri de muncă (permanent, contractul, intern etc)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} este obligatoriu pentru articolul {1}
 DocType: Process Payroll,Fortnightly,bilunară
 DocType: Currency Exchange,From Currency,Din moneda
 DocType: Vital Signs,Weight (In Kilogram),Greutate (în kilograme)
@@ -2343,7 +2385,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Vă rugăm să faceți clic pe ""Generate Program"", pentru a obține programul"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Au existat erori în timpul ștergerii următoarele programe:
 DocType: Bin,Ordered Quantity,Ordonat Cantitate
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","de exemplu ""Construi instrumente de constructori """
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","de exemplu ""Construi instrumente de constructori """
 DocType: Grading Scale,Grading Scale Intervals,Intervale de notare Scala
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Intrarea contabila {2} poate fi făcută numai în moneda: {3}
 DocType: Production Order,In Process,În procesul de
@@ -2352,7 +2394,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} comparativ cu comanda de vânzări {1}
 DocType: Account,Fixed Asset,Activ Fix
 apps/erpnext/erpnext/config/stock.py +320,Serialized Inventory,Inventarul serializat
-DocType: Employee Loan,Account Info,Informatii cont
+DocType: Employee Loan,Account Info,Informaţii cont
 DocType: Activity Type,Default Billing Rate,Rata de facturare implicit
 DocType: Fees,Include Payment,Includeți plata
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Grupurile de studenți au fost create.
@@ -2367,11 +2409,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Cu plata impozitului
 DocType: Expense Claim Detail,Expense Claim Detail,Detaliu Revendicare Cheltuieli
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICATE PENTRU FURNIZOR
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Vă rugăm să selectați contul corect
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Vă rugăm să selectați contul corect
 DocType: Item,Weight UOM,Greutate UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Structura de salarizare Angajat
 DocType: Patient,Blood Group,Grupă de sânge
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,În așteptarea
 DocType: Course,Course Name,Numele cursului
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Utilizatorii care poate aproba cererile de concediu o anumită angajatilor
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Echipamente de birou
@@ -2390,7 +2431,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Prețurile nu vor fi afișate în cazul în care Prețul de listă nu este setat
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Vă rugăm să specificați o țară pentru această regulă Transport sau verificați Expediere
 DocType: Stock Entry,Total Incoming Value,Valoarea totală a sosi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Pentru debit este necesar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Pentru debit este necesar
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Pontaje ajuta să urmăriți timp, costuri și de facturare pentru activitati efectuate de echipa ta"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Cumparare Lista de preturi
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Șabloane ale variabilelor pentru scorurile pentru furnizori.
@@ -2400,7 +2441,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Reconcilierea plată
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Vă rugăm să selectați numele Incharge Persoana
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tehnologia nou-aparuta
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Neremunerat totală: {0}
+DocType: Hub Settings,Unregister from Hub,Anulați înregistrarea de la Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Neremunerat totală: {0}
 DocType: BOM Website Operation,BOM Website Operation,Site-ul BOM Funcționare
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Oferta Scrisoare
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Genereaza Cereri de Material (MRP) și Comenzi de Producție.
@@ -2412,7 +2454,9 @@
 DocType: Physician Schedule Time Slot,To Time,La timp
 DocType: Authorization Rule,Approving Role (above authorized value),Aprobarea Rol (mai mare decât valoarea autorizată)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Credit Pentru cont trebuie să fie un cont de plati
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},Recursivitate FDM: {0} nu poate fi parinte sau copil lui {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Selectați admiterea studenților care este obligatorie pentru solicitantul studenților plătiți
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},Recursivitate FDM: {0} nu poate fi parinte sau copil lui {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Selectați o listă de prețuri pentru a publica prețurile
 DocType: Production Order Operation,Completed Qty,Cantitate Finalizata
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Pentru {0}, numai conturi de debit poate fi legat de o altă intrare în credit"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Lista de prețuri {0} este dezactivat
@@ -2425,39 +2469,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} numere de serie necesare pentru postul {1}. Ați furnizat {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Rata de evaluare curentă
 DocType: Item,Customer Item Codes,Coduri client Postul
+DocType: Training Event,Advance,Avans
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,pentru a face din nou recurente.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Schimb de câștig / Pierdere
 DocType: Opportunity,Lost Reason,Motiv Pierdere
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Adresa noua
 DocType: Quality Inspection,Sample Size,Eșantionul de dimensiune
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Vă rugăm să introduceți Document Primirea
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Toate articolele au fost deja facturate
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Vă rugăm să specificați un valabil ""Din cauza nr"""
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',"Vă rugăm să specificați un valabil ""Din cauza nr"""
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Centre de costuri pot fi realizate în grupuri, dar intrările pot fi făcute împotriva non-Grupuri"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Utilizatori și permisiuni
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Comenzi de producție Creat: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Comenzi de producție Creat: {0}
 DocType: Branch,Branch,Ramură
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Imprimarea și Branding
 DocType: Company,Total Monthly Sales,Vânzări totale lunare
 DocType: Bin,Actual Quantity,Cantitate Efectivă
 DocType: Shipping Rule,example: Next Day Shipping,exemplu: Next Day Shipping
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial nr {0} nu a fost găsit
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Abonamentul a fost {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Abonamentul a fost {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Programul programului de plăți
 DocType: Fee Schedule Program,Student Batch,Lot de student
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,selectați * din &quot;tabVital Signs&quot; unde patient = &#39;{0}&#39; comanda după signs_date desc limit 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Asigurați-Student
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Gradul minim
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Ați fost invitat să colaboreze la proiect: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Medicul nu este disponibil la {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Ați fost invitat să colaboreze la proiect: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Medicul nu este disponibil la {0}
 DocType: Leave Block List Date,Block Date,Dată blocare
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Adăugați Id de abonament în câmpul personalizat în doctype {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Nota de livrare a furnizorului
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Aplica acum
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Aplica acum
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Cantitatea reală {0} / Cantitatea de așteptare {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Cantitatea reală {0} / Cantitatea de așteptare {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-commerce GSTIN
 DocType: Sales Order,Not Delivered,Nu Pronunțată
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Data așteptată nu poate fi înainte de Data tranzacției
 ,Bank Clearance Summary,Sumar aprobare bancă
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Creare și gestionare rezumate e-mail zilnice, săptămânale și lunare."
 DocType: Appraisal Goal,Appraisal Goal,Obiectiv expertiză
@@ -2465,12 +2510,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Corpuri
 DocType: Fee Schedule,Fee Structure,Structura Taxa de
 DocType: Timesheet Detail,Costing Amount,Costing Suma
-DocType: Student Admission,Application Fee,Taxă de aplicare
+DocType: Student Admission Program,Application Fee,Taxă de aplicare
 DocType: Process Payroll,Submit Salary Slip,Prezenta Salariul Slip
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Reducere Maxiumm pentru postul {0} este {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Reducere Maxiumm pentru postul {0} este {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importare în masă
 DocType: Sales Partner,Address & Contacts,Adresă şi contacte
 DocType: SMS Log,Sender Name,Sender Name
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Sortați după criterii
 DocType: POS Profile,[Select],[Selectati]
 DocType: Vital Signs,Blood Pressure (diastolic),Tensiunea arterială (diastolică)
 DocType: SMS Log,Sent To,Trimis La
@@ -2479,7 +2525,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,În continuare Contact Data nu poate fi în trecut
 DocType: Company,For Reference Only.,Numai Pentru referință.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Medic {0} nu este disponibil la {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Selectați numărul lotului
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Selectați numărul lotului
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Invalid {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,Referință Inv
@@ -2495,15 +2541,15 @@
 DocType: Normal Test Items,Require Result Value,Solicitați valoarea rezultatelor
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Cazul Nr. nu poate fi 0
 DocType: Item,Show a slideshow at the top of the page,Arata un slideshow din partea de sus a paginii
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Magazine
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Magazine
 DocType: Project Type,Projects Manager,Manager Proiecte
 DocType: Serial No,Delivery Time,Timp de Livrare
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Uzură bazată pe
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Numirea anulată
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Numirea anulată
 DocType: Item,End of Life,Sfârsitul vieții
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Călători
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Nr Structură activă sau Salariul implicit găsite pentru angajat al {0} pentru datele indicate
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Călători
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Nr Structură activă sau Salariul implicit găsite pentru angajat al {0} pentru datele indicate
 DocType: Leave Block List,Allow Users,Permiteți utilizatori
 DocType: Purchase Order,Customer Mobile No,Client Mobile Nu
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Recurent
@@ -2512,12 +2558,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Actualizare Cost
 DocType: Item Reorder,Item Reorder,Reordonare Articol
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Afișează Salariu alunecare
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Material de transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Material de transfer
 DocType: Fees,Send Payment Request,Trimiteți Cerere de Plată
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Specifica operațiunilor, costurile de exploatare și să dea o operațiune unică nu pentru operațiunile dumneavoastră."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Acest document este peste limita de {0} {1} pentru elementul {4}. Faci un alt {3} împotriva aceleași {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Vă rugăm să setați recurente după salvare
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,cont Selectați suma schimbare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,cont Selectați suma schimbare
 DocType: Purchase Invoice,Price List Currency,Lista de pret Valuta
 DocType: Naming Series,User must always select,Utilizatorul trebuie să selecteze întotdeauna
 DocType: Stock Settings,Allow Negative Stock,Permiteţi stoc negativ
@@ -2537,7 +2583,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Angajat
 DocType: Sample Collection,Collected Time,Timpul colectat
 DocType: Company,Sales Monthly History,Istoric lunar de vânzări
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Selectați lotul
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Selectați lotul
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} este complet facturat
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Semnele vitale
 DocType: Training Event,End Time,End Time
@@ -2545,16 +2591,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Deducerile de plată sau pierdere
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Clauzele contractuale standard pentru vânzări sau de cumpărare.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Grup in functie de Voucher
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Sigur doriți să anulați această întâlnire?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,conducte de vânzări
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Vă rugăm să setați contul implicit în Salariu Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Obligatoriu pe
 DocType: Rename Tool,File to Rename,Fișier de Redenumiți
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Vă rugăm să selectați BOM pentru postul în rândul {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Vă rugăm să selectați BOM pentru postul în rândul {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Contul {0} nu se potrivește cu Compania {1} în modul de cont: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},BOM specificată {0} nu există pentru postul {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programul de Mentenanta {0} trebuie anulat înainte de a anula aceasta Comandă de Vânzări
+DocType: POS Profile,Applicable for Users,Aplicabil pentru utilizatori
 DocType: Notification Control,Expense Claim Approved,Revendicare Cheltuieli Aprobata
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Platā angajatului {0} deja creat pentru această perioadă
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Platā angajatului {0} deja creat pentru această perioadă
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Farmaceutic
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Costul de produsele cumparate
 DocType: Selling Settings,Sales Order Required,Comandă de vânzări obligatorii
@@ -2578,6 +2626,7 @@
 DocType: Offer Letter,Accepted,Acceptat
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Organizare
 DocType: BOM Update Tool,BOM Update Tool,BOM Update Tool
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Contul de Party nu este specificat, vă rugăm să configurați contul de partid implicit în companie"
 DocType: SG Creation Tool Course,Student Group Name,Numele grupului studențesc
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Crearea de taxe
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Vă rugăm să asigurați-vă că într-adevăr să ștergeți toate tranzacțiile pentru această companie. Datele dvs. de bază vor rămâne așa cum este. Această acțiune nu poate fi anulată.
@@ -2586,29 +2635,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) nu poate fi mai mare decât cantitatea planificată ({2}) aferent comenzii de producție {3}
 DocType: Shipping Rule,Shipping Rule Label,Regula de transport maritim Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum utilizator
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Materii prime nu poate fi gol.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Nu a putut fi actualizat stoc, factura conține drop de transport maritim."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Materii prime nu poate fi gol.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Nu a putut fi actualizat stoc, factura conține drop de transport maritim."
 DocType: Lab Test Sample,Lab Test Sample,Test de laborator
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Quick Jurnal de intrare
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Nu puteți schimba rata dacă BOM menționat agianst orice element
+DocType: Restaurant,Invoice Series Prefix,Prefixul seriei de facturi
 DocType: Employee,Previous Work Experience,Anterior Work Experience
 DocType: Stock Entry,For Quantity,Pentru Cantitate
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Va rugam sa introduceti planificate Cantitate pentru postul {0} la rândul {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Va rugam sa introduceti planificate Cantitate pentru postul {0} la rândul {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} nu este introdus
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Cererile de elemente.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Pentru producerea separată va fi creat pentru fiecare articol bun finit.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} trebuie să fie negativ în documentul de retur
 ,Minutes to First Response for Issues,Minute la First Response pentru Probleme
 DocType: Purchase Invoice,Terms and Conditions1,Termeni și Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,Numele institutului pentru care configurați acest sistem.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,Numele institutului pentru care configurați acest sistem.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Intrare contabilitate blocată până la această dată, nimeni nu poate crea / modifica intrarea cu excepția rolului specificat mai jos."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Vă rugăm să salvați documentul înainte de a genera programul de întreținere
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Ultimul preț actualizat în toate BOM-urile
 DocType: Fee Schedule,Successful,De succes
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status Proiect
 DocType: UOM,Check this to disallow fractions. (for Nos),Bifati pentru a nu permite fracțiuni. (Pentru Nos)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Au fost create următoarele comenzi de producție:
-DocType: Student Admission,Naming Series (for Student Applicant),Seria de denumire (pentru Student Solicitant)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Au fost create următoarele comenzi de producție:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Seria de denumire (pentru Student Solicitant)
 DocType: Delivery Note,Transporter Name,Transporter Nume
 DocType: Authorization Rule,Authorized Value,Valoarea autorizată
 DocType: BOM,Show Operations,Afișați Operații
@@ -2632,7 +2682,7 @@
 ,Employees working on a holiday,Numar de angajati care lucreaza in vacanta
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Prezent
 DocType: Project,% Complete Method,% Metoda completă
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Medicament
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Medicament
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Data de Incepere a Mentenantei nu poate fi anterioara datei de livrare aferent de Nr. de Serie {0}
 DocType: Production Order,Actual End Date,Data efectiva de finalizare
 DocType: BOM,Operating Cost (Company Currency),Costul de operare (Companie Moneda)
@@ -2650,19 +2700,20 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Aprobarea unui utilizator nu poate fi aceeași cu utilizatorul. Regula este aplicabilă pentru
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Rata de bază (conform Stock UOM)
 DocType: SMS Log,No of Requested SMS,Nu de SMS solicitat
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Concediu fără plată nu se potrivește cu înregistrările privind concediul de aplicare aprobat
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Concediu fără plată nu se potrivește cu înregistrările privind concediul de aplicare aprobat
 DocType: Campaign,Campaign-.####,Campanie-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Pasii urmatori
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Vă rugăm să furnizeze elementele specificate la cele mai bune tarife posibile
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Realizare Factura
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto închidere oportunitate după 15 zile
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Comenzile de cumpărare nu sunt permise pentru {0} datorită unui punctaj din {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Comenzile de cumpărare nu sunt permise pentru {0} datorită unui punctaj din {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Anul de încheiere
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Cota / Plumb%
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Data de Incheiere Contract trebuie să fie ulterioara Datei Aderării
 DocType: Vital Signs,Nutrition Values,Valorile nutriției
 DocType: Lab Test Template,Is billable,Este facturabil
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}","Atât programul &quot;Medic Physician&quot;, cât și timpul pentru programare &quot;trebuie să fie setat pentru Dr {0}"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un distribuitor terță parte / dealer / agent comision / afiliat / reseller care vinde produsele companiilor pentru un comision.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} comparativ cu comanda de cumpărare {1}
 DocType: Patient,Patient Demographics,Demografia pacientului
@@ -2712,7 +2763,6 @@
  10. Adăugați sau deduce: Fie că doriți să adăugați sau deduce taxa."
 DocType: Homepage,Homepage,Pagina principala
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Selectați medicul ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',actualizare tabConsultation set invoice = &#39;{0}&#39; unde name = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd Cantitate
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Taxa de inregistrare Creat - {0}
 DocType: Asset Category Account,Asset Category Account,Cont activ Categorie
@@ -2724,7 +2774,7 @@
 DocType: Asset,Manual,Manual
 DocType: Salary Component Account,Salary Component Account,Contul de salariu Componentă
 DocType: Global Defaults,Hide Currency Symbol,Ascunde simbol moneda
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","de exemplu, bancar, Cash, Card de credit"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","de exemplu, bancar, Cash, Card de credit"
 DocType: Lead Source,Source Name,sursa Nume
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Tensiunea arterială normală de repaus la un adult este de aproximativ 120 mmHg sistolică și 80 mmHg diastolică, abreviată &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Nota de Credit
@@ -2743,16 +2793,16 @@
 DocType: Patient,Occupation,Ocupaţie
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Rând {0}: Data începerii trebuie să fie înainte de Data de încheiere
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Cantitate)
-DocType: Sales Invoice,This Document,Acest document de
 DocType: Installation Note Item,Installed Qty,Instalat Cantitate
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Acest lucru se poate datora unor adrese de e-mail nevalide din
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Ați adăugat
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Rezultatul de formare
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Rezultatul de formare
 DocType: Purchase Invoice,Is Paid,Este platit
 DocType: Salary Structure,Total Earning,Câștigul salarial total de
 DocType: Purchase Receipt,Time at which materials were received,Timp în care s-au primit materiale
 DocType: Stock Ledger Entry,Outgoing Rate,Rata de ieșire
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Ramură organizație maestru.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Ramură organizație maestru.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,sau
 DocType: Sales Order,Billing Status,Stare facturare
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Raportați o problemă
@@ -2767,15 +2817,16 @@
 DocType: Notification Control,Sales Order Message,Comandă de vânzări Mesaj
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Seta valorile implicite, cum ar fi Compania, valutar, Current Anul fiscal, etc"
 DocType: Payment Entry,Payment Type,Tip de plată
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selectați un lot pentru articolul {0}. Nu se poate găsi un singur lot care să îndeplinească această cerință
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selectați un lot pentru articolul {0}. Nu se poate găsi un singur lot care să îndeplinească această cerință
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selectați un lot pentru articolul {0}. Nu se poate găsi un singur lot care să îndeplinească această cerință
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selectați un lot pentru articolul {0}. Nu se poate găsi un singur lot care să îndeplinească această cerință
+DocType: Hub Category,Parent Category,Categorie părinte
 DocType: Process Payroll,Select Employees,Selectați angajati
 DocType: Opportunity,Potential Sales Deal,Oferta potențiale Vânzări
 DocType: Complaint,Complaints,Reclamații
 DocType: Payment Entry,Cheque/Reference Date,Cecul / Data de referință
 DocType: Purchase Invoice,Total Taxes and Charges,Total Impozite și Taxe
 DocType: Employee,Emergency Contact,Contact de Urgență
-DocType: Bank Reconciliation Detail,Payment Entry,Intrarea de plată
+DocType: Bank Reconciliation Detail,Payment Entry,Intrare plăţi
 DocType: Item,Quality Parameters,Parametri de calitate
 ,sales-browser,vânzări browser
 apps/erpnext/erpnext/accounts/doctype/account/account.js +73,Ledger,Carte mare
@@ -2806,9 +2857,9 @@
 DocType: Bin,Reserved Quantity,Rezervat Cantitate
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Introduceți adresa de e-mail validă
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Introduceți adresa de e-mail validă
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Selectați un element din coș
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Selectați un element din coș
 DocType: Landed Cost Voucher,Purchase Receipt Items,Primirea de cumpărare Articole
-apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formulare Personalizarea
+apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Personalizare Formulare
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,restanță
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Suma de amortizare în timpul perioadei
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,șablon cu handicap nu trebuie să fie șablon implicit
@@ -2816,15 +2867,15 @@
 DocType: Payment Request,Amount in customer's currency,Suma în moneda clientului
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Livrare
 DocType: Stock Reconciliation Item,Current Qty,Cantitate curentă
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Adăugați furnizori
+DocType: Restaurant Menu,Restaurant Menu,Restaurantul Meniu
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Anterior
 DocType: Appraisal Goal,Key Responsibility Area,Domeni de Responsabilitate Cheie
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Student Sarjele ajută să urmăriți prezență, evaluările și taxele pentru studenți"
 DocType: Payment Entry,Total Allocated Amount,Suma totală alocată
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Setați contul inventarului implicit pentru inventarul perpetuu
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Setați contul inventarului implicit pentru inventarul perpetuu
 DocType: Item Reorder,Material Request Type,Material Cerere tip
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural Jurnal de intrare pentru salarii din {0} la {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage este plin, nu a salvat"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage este plin, nu a salvat"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Factorul de conversie UOM este obligatorie
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Capacitatea camerei
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Re
@@ -2863,16 +2914,18 @@
 DocType: Project,Task Completion,sarcina Finalizarea
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Nu este în stoc
 DocType: Appraisal,HR User,Utilizator HR
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Impozite și Taxe dedus
-apps/erpnext/erpnext/hooks.py +129,Issues,Probleme
+apps/erpnext/erpnext/hooks.py +138,Issues,Probleme
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Statusul trebuie să fie unul din {0}
 DocType: Sales Invoice,Debit To,Debit Pentru
+DocType: Restaurant Menu Item,Restaurant Menu Item,Elementul meniului restaurantului
 DocType: Delivery Note,Required only for sample item.,Necesar numai pentru element de probă.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Cant efectivă după tranzacție
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Nu slip salariu gasit între {0} și {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Nu slip salariu gasit între {0} și {1}
 ,Pending SO Items For Purchase Request,Până la SO articole pentru cerere de oferta
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Admitere Student
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} este dezactivat
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Admitere Student
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} este dezactivat
 DocType: Supplier,Billing Currency,Moneda de facturare
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Extra mare
@@ -2895,6 +2948,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Vă rugăm să menționați nici de vizite necesare
 DocType: Stock Settings,Default Valuation Method,Metoda de Evaluare Implicită
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,taxă
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Actualizare în curs. Ar putea dura ceva timp.
 DocType: Vehicle Log,Fuel Qty,combustibil Cantitate
 DocType: Production Order Operation,Planned Start Time,Planificate Ora de începere
 DocType: Course,Assessment,Evaluare
@@ -2910,7 +2964,7 @@
 DocType: Price List,Price List Master,Lista de preturi Masterat
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Toate tranzacțiile de vânzări pot fi etichetate comparativ mai multor **Persoane de vânzări** pentru ca dvs. sa puteţi configura și monitoriza obiective.
 ,S.O. No.,SO No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Vă rugăm să creați client de plumb {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Vă rugăm să creați client de plumb {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Selectați pacientul
 DocType: Price List,Applicable for Countries,Aplicabile pentru țările
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Nume parametru
@@ -2954,27 +3008,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Cheltuială cont / Diferența ({0}) trebuie să fie un cont de ""profit sau pierdere"""
 DocType: Project,Copied From,Copiat de la
 DocType: Project,Copied From,Copiat de la
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Numele de eroare: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Deficit
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Numele de eroare: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,Deficit
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} nu asociat cu {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Prezenţa pentru angajatul {0} este deja consemnată
 DocType: Packing Slip,If more than one package of the same type (for print),În cazul în care mai mult de un pachet de același tip (pentru imprimare)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Alegeți clientul implicit în Setări restaurant
 ,Salary Register,Salariu Înregistrare
 DocType: Warehouse,Parent Warehouse,Depozit-mamă
 DocType: C-Form Invoice Detail,Net Total,Total net
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Implicit BOM nu a fost găsit pentru articolele {0} și proiectul {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Implicit BOM nu a fost găsit pentru articolele {0} și proiectul {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Definirea diferitelor tipuri de împrumut
 DocType: Bin,FCFS Rate,Rata FCFS
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Remarcabil Suma
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Timp (în min)
 DocType: Project Task,Working,De lucru
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Stoc Queue (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,An financiar
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,An financiar
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} nu aparține companiei {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,Nu s-a putut rezolva funcția de evaluare a criteriilor pentru {0}. Asigurați-vă că formula este validă.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Cost cu o schimbare ca pe
 DocType: Healthcare Settings,Out Patient Settings,Setări pentru pacient
 DocType: Account,Round Off,Rotunji
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Cantitatea trebuie să fie pozitivă
 ,Requested Qty,A solicitat Cantitate
 DocType: Tax Rule,Use for Shopping Cart,Utilizați pentru Cos de cumparaturi
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Valoarea {0} pentru atributul {1} nu există în lista Item valabile Valorile atributelor pentru postul {2}
@@ -2983,7 +3039,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Taxele vor fi distribuite proporțional în funcție de produs Cantitate sau valoarea, ca pe dvs. de selecție"
 DocType: Maintenance Visit,Purposes,Scopuri
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Cel puțin un element ar trebui să fie introduse cu cantitate negativa în documentul de returnare
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Adăugați cursuri
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operațiunea {0} mai mult decât orice ore de lucru disponibile în stație de lucru {1}, descompun operațiunea în mai multe operațiuni"
 ,Requested,Solicitată
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Nu Observații
@@ -2995,6 +3050,8 @@
 DocType: Employee Loan,Repaid/Closed,Nerambursate / Închis
 DocType: Item,Total Projected Qty,Cantitate totală prevăzută
 DocType: Monthly Distribution,Distribution Name,Denumire Distribuție
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Furnizor&gt; Tipul furnizorului
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Rata de evaluare nu a fost găsită pentru articolul {0}, care trebuie să facă înregistrări contabile pentru {1} {2}. Dacă elementul tranzacționează ca element cu rată zero de evaluare în {1}, vă rugăm să menționați acest lucru în tabelul {1} Item. În caz contrar, vă rugăm să creați o tranzacție de stoc de intrare pentru elementul respectiv sau să menționați rata de evaluare în înregistrarea elementului și apoi încercați să trimiteți / anulați această intrare"
 DocType: Course,Course Code,Codul cursului
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Inspecție de calitate necesare pentru postul {0}
 DocType: POS Settings,Use POS in Offline Mode,Utilizați POS în modul offline
@@ -3005,14 +3062,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Gestioneaza Ramificatiile Teritoriule.
 DocType: Journal Entry Account,Sales Invoice,Factură de vânzări
 DocType: Journal Entry Account,Party Balance,Balanța Party
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,Vă rugăm să selectați Aplicați Discount On
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Vă rugăm să selectați Aplicați Discount On
 DocType: Company,Default Receivable Account,Implicit cont de încasat
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Creați Banca intrare pentru salariul totală plătită pentru criteriile de mai sus selectate
 DocType: Physician,Physician Schedule,Programul medicului
 DocType: Purchase Invoice,Deemed Export,Considerat export
 DocType: Stock Entry,Material Transfer for Manufacture,Transfer de materii pentru fabricarea
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Procentul de reducere se poate aplica fie pe o listă de prețuri sau pentru toate lista de prețuri.
-DocType: Purchase Invoice,Half-yearly,Semestrial
+DocType: Subscription,Half-yearly,Semestrial
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Intrare contabilitate pentru stoc
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Ați evaluat deja criteriile de evaluare {}.
@@ -3041,13 +3098,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Extra Small
 DocType: Company,Standard Template,Format standard
 DocType: Training Event,Theory,Teorie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Atenție: Materialul solicitat Cant este mai mică decât minima pentru comanda Cantitate
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Atenție: Materialul solicitat Cant este mai mică decât minima pentru comanda Cantitate
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Contul {0} este Blocat
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entitate juridică / Filiala cu o Grafic separat de conturi aparținând Organizației.
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Produse Alimentare, Bauturi si Tutun"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Poate face doar plata împotriva facturată {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Rata de comision nu poate fi mai mare decat 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Poate face doar plata împotriva facturată {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Rata de comision nu poate fi mai mare decat 100
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Va rugam sa introduceti {0} primul
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Nu există răspunsuri de la
@@ -3065,10 +3122,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Culoare
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Criterii Plan de evaluare
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Împiedicați comenzile de achiziție
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Susceptibil
 DocType: Patient Appointment,Scheduled,Programat
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Cerere de ofertă.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configurați sistemul de numire a angajaților în Resurse umane&gt; Setări HR
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Vă rugăm să selectați postul unde &quot;Este Piesa&quot; este &quot;nu&quot; și &quot;Este punctul de vânzare&quot; este &quot;da&quot; și nu este nici un alt produs Bundle
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Selectați Client
 DocType: Student Log,Academic,Academic
 DocType: Patient,Personal and Social History,Istoria personală și socială
 DocType: Fee Schedule,Fee Breakup for each student,Taxă pentru fiecare student
@@ -3078,7 +3136,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Rata de evaluare
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Lista de pret Valuta nu selectat
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Lista de pret Valuta nu selectat
 apps/erpnext/erpnext/config/healthcare.py +46,Results,rezultate obținute
 ,Student Monthly Attendance Sheet,Elev foaia de prezență lunară
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Angajatul {0} a aplicat deja pentru {1} între {2} și {3}
@@ -3094,7 +3152,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Gestiona vânzările Partners.
 DocType: Quality Inspection,Inspection Type,Inspecție Tip
 DocType: Fee Validity,Visited yet,Vizitată încă
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Depozite tranzacție existente nu pot fi convertite în grup.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Depozite tranzacție existente nu pot fi convertite în grup.
 DocType: Assessment Result Tool,Result HTML,rezultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Expira la
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Adăugați studenți
@@ -3115,13 +3173,13 @@
 DocType: Homepage,Company Description for website homepage,Descriere companie pentru pagina de start site
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pentru comoditatea clienților, aceste coduri pot fi utilizate în formate de imprimare cum ar fi Facturi și Note de Livrare"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Nume furnizo
-apps/erpnext/erpnext/accounts/report/financial_statements.py +152,Could not retrieve information for {0}.,Nu s-a putut obține informații pentru {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +152,Could not retrieve information for {0}.,Nu s-au putut obține informații pentru {0}.
 DocType: Sales Invoice,Time Sheet List,Listă de timp Sheet
 DocType: Employee,You can enter any date manually,Puteți introduce manual orice dată
 DocType: Healthcare Settings,Result Printed,Rezultatul imprimat
 DocType: Asset Category Account,Depreciation Expense Account,Contul de amortizare de cheltuieli
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Perioadă De Probă
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Vizualizați {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Vizualizați {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Numai noduri frunze sunt permise în tranzacție
 DocType: Expense Claim,Expense Approver,Cheltuieli aprobator
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Row {0}: avans Clientul trebuie să fie de credit
@@ -3133,7 +3191,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Pentru a Datetime
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Orarele curs de șters:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Busteni pentru menținerea statutului de livrare sms
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Setați ținta de vânzări
 DocType: Accounts Settings,Make Payment via Journal Entry,Efectuați o plată prin Jurnalul de intrare
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,imprimat pe
 DocType: Item,Inspection Required before Delivery,Necesar de inspecție înainte de livrare
@@ -3141,7 +3198,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Activități în curs
 DocType: Patient Appointment,Reminded,Reamintit
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Organizația dumneavoastră
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Organizația dumneavoastră
 DocType: Fee Component,Fees Category,Taxele de Categoria
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Vă rugăm să introduceți data alinarea.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
@@ -3153,7 +3210,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reordonare nivel
 DocType: Company,Chart Of Accounts Template,Diagrama de conturi de șabloane
 DocType: Attendance,Attendance Date,Dată prezenţă
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Articol Preț actualizat pentru {0} în lista de prețuri {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Articol Preț actualizat pentru {0} în lista de prețuri {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Salariul despartire bazat privind câștigul salarial și deducere.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Un cont cu noduri copil nu poate fi transformat în registru contabil
 DocType: Purchase Invoice Item,Accepted Warehouse,Depozit Acceptat
@@ -3169,9 +3226,10 @@
 ,Employee Birthday,Zi de naștere angajat
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Instrumentul de student Lot de prezență
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,limita Traversat
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Programată până
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital de Risc
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Un termen academic cu acest &quot;An universitar&quot; {0} și &quot;Numele Termenul&quot; {1} există deja. Vă rugăm să modificați aceste intrări și încercați din nou.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Deoarece există tranzacții existente la postul {0}, nu puteți modifica valoarea {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Deoarece există tranzacții existente la postul {0}, nu puteți modifica valoarea {1}"
 DocType: UOM,Must be Whole Number,Trebuie să fie Număr întreg
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Cereri noi de concediu alocate (în zile)
 DocType: Purchase Invoice,Invoice Copy,Copie factură
@@ -3181,7 +3239,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Numar factura
 DocType: Shopping Cart Settings,Orders,Comenzi
 DocType: Employee Leave Approver,Leave Approver,Aprobator Concediu
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Selectați un lot
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Selectați un lot
 DocType: Assessment Group,Assessment Group Name,Numele grupului de evaluare
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material Transferat pentru fabricarea
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Un utilizator cu rol de ""aprobator cheltuieli"""
@@ -3196,7 +3254,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Intrarea Perioada de închidere
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Selectați Departamentul ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Centrul de Cost cu tranzacții existente nu poate fi transformat în grup
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Suma {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Suma {0} {1} {2} {3}
 DocType: Account,Depreciation,Depreciere
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Furnizor (e)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Instrumentul Participarea angajat
@@ -3208,10 +3266,12 @@
 DocType: GL Entry,Voucher No,Voletul nr
 ,Lead Owner Efficiency,Lead Efficiency Owner
 ,Lead Owner Efficiency,Lead Efficiency Owner
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Cel mai popular
 DocType: Leave Allocation,Leave Allocation,Alocare Concediu
 DocType: Payment Request,Recipient Message And Payment Details,Mesaj destinatar și Detalii de plată
 DocType: Training Event,Trainer Email,trainer e-mail
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Cererile de materiale {0} a creat
+DocType: Restaurant Reservation,No of People,Nr de oameni
 DocType: Production Planning Tool,Include sub-contracted raw materials,Includ materii prime contractate sub-
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Șablon de termeni sau contractului.
 DocType: Purchase Invoice,Address and Contact,Adresa si Contact
@@ -3220,10 +3280,11 @@
 DocType: Supplier,Last Day of the Next Month,Ultima zi a lunii următoare
 DocType: Support Settings,Auto close Issue after 7 days,Auto închidere Problemă după 7 zile
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Concediu nu poate fi repartizat înainte {0}, ca echilibru concediu a fost deja carry transmise în viitor înregistrarea alocare concediu {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Notă: Datorită / Reference Data depășește de companie zile de credit client de {0} zi (le)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Notă: Datorită / Reference Data depășește de companie zile de credit client de {0} zi (le)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Solicitantul elev
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL PENTRU RECIPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,Cont Amortizarea cumulată
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Acest e-mail este generat automat
 DocType: Stock Settings,Freeze Stock Entries,Blocheaza Intrarile in Stoc
 DocType: Program Enrollment,Boarding Student,Student de internare
 DocType: Asset,Expected Value After Useful Life,Valoarea așteptată după viață utilă
@@ -3231,7 +3292,7 @@
 DocType: Activity Cost,Billing Rate,Rata de facturare
 ,Qty to Deliver,Cantitate pentru a oferi
 ,Stock Analytics,Analytics stoc
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Operații nu poate fi lăsat necompletat
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Operații nu poate fi lăsat necompletat
 DocType: Maintenance Visit Purpose,Against Document Detail No,Comparativ detaliilor documentului nr.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Tipul de partid este obligatorie
 DocType: Quality Inspection,Outgoing,Trimise
@@ -3253,7 +3314,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Selectați manual elevii pentru grupul bazat pe activități
 DocType: Journal Entry,User Remark,Observație utilizator
 DocType: Lead,Market Segment,Segmentul de piață
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Suma plătită nu poate fi mai mare decât suma totală negativă restante {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Suma plătită nu poate fi mai mare decât suma totală negativă restante {0}
 DocType: Supplier Scorecard Period,Variables,variabile
 DocType: Employee Internal Work History,Employee Internal Work History,Istoric Intern Locuri de Munca Angajat
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),De închidere (Dr)
@@ -3283,21 +3344,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obțineți actualizări
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Cont {2} nu aparține Companiei {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Cerere de material {0} este anulată sau oprită
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Lasă Managementul
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Lasă Managementul
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Grup in functie de Cont
 DocType: Sales Order,Fully Delivered,Livrat complet
 DocType: Lead,Lower Income,Micsoreaza Venit
+DocType: Restaurant Order Entry,Current Order,Comanda actuală
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Sursă și depozit țintă nu poate fi același pentru rând {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Diferența cont trebuie să fie un cont de tip activ / pasiv, deoarece acest stoc Reconcilierea este un intrare de deschidere"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Suma debursate nu poate fi mai mare decât Suma creditului {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Accesați Programe
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Număr de comandă de aprovizionare necesare pentru postul {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Comanda de producție nu a fost creat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Comanda de producție nu a fost creat
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Din Data' trebuie să fie dupã 'Până în Data'
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Nu se poate schimba statutul de student ca {0} este legat cu aplicația de student {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Nu se poate schimba statutul de student ca {0} este legat cu aplicația de student {1}
 DocType: Asset,Fully Depreciated,Depreciata pe deplin
 ,Stock Projected Qty,Stoc proiectată Cantitate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Clientul {0} nu apartine proiectului {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Clientul {0} nu apartine proiectului {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Participarea marcat HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Cotațiile sunt propuneri, sumele licitate le-ați trimis clienților dvs."
 DocType: Sales Order,Customer's Purchase Order,Comandă clientului
@@ -3308,8 +3370,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Vă rugăm să setați Numărul de Deprecieri rezervat
 DocType: Supplier Scorecard Period,Calculations,calculele
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Valoare sau Cantitate
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Comenzile Productions nu pot fi ridicate pentru:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Comenzile Productions nu pot fi ridicate pentru:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Minut
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setați seria de numire pentru {0} prin Configurare&gt; Setări&gt; Serii de numire
 DocType: Purchase Invoice,Purchase Taxes and Charges,Taxele de cumpărare și Taxe
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Mergeți la furnizori
 ,Qty to Receive,Cantitate de a primi
@@ -3323,7 +3386,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Credit în contul trebuie să fie un cont de bilanț
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Toate tipurile de furnizor
 DocType: Global Defaults,Disable In Words,Nu fi de acord în cuvinte
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Cod articol este obligatorie, deoarece postul nu este numerotat automat"
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,"Cod articol este obligatorie, deoarece postul nu este numerotat automat"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Citat {0} nu de tip {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Articol Program Mentenanta
 DocType: Sales Order,%  Delivered,% Livrat
@@ -3345,23 +3408,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Sold Equity
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Reconciliere
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Rămas
 DocType: Appraisal,Appraisal,Expertiză
 DocType: Purchase Invoice,GST Details,Detalii GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},E-mail trimis la furnizorul {0}
+DocType: Item,Default Sales Unit of Measure,Unitatea de vânzare standard de măsură
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data se repetă
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Semnatar autorizat
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Aprobator Concediu trebuie să fie unul din {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Creați taxe
-DocType: Hub Settings,Seller Email,Vânzător de e-mail
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Cost total de achiziție (prin cumparare factură)
 DocType: Training Event,Start Time,Ora de începere
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Selectați Cantitate
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Selectați Cantitate
 DocType: Customs Tariff Number,Customs Tariff Number,Tariful vamal Număr
 DocType: Patient Appointment,Patient Appointment,Numirea pacientului
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Aprobarea unui rol nu poate fi aceeaşi cu rolul. Regula este aplicabilă pentru
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Dezabona de la acest e-mail Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Dezabona de la acest e-mail Digest
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Obțineți furnizori prin
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} nu a fost găsit pentru articolul {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Mergeți la Cursuri
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mesajul a fost trimis
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Cont cu noduri copil nu poate fi setat ca Ledger
@@ -3374,11 +3440,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Materii Transferate pentru fabricarea
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Contul {0} nu există
 DocType: Project,Project Type,Tip de proiect
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Sarcina pentru copii există pentru această sarcină. Nu puteți șterge această activitate.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Cantitatea țintă sau valoarea țintă este obligatorie.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Costul diverse activități
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Nu mai există rezultate
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Costul diverse activități
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Setarea Evenimente la {0}, deoarece angajatul atașat la mai jos de vânzare Persoanele care nu are un ID de utilizator {1}"
 DocType: Timesheet,Billing Details,detalii de facturare
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Sursa și depozitul țintă trebuie să fie diferit
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Sursa și depozitul țintă trebuie să fie diferit
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Nu este permis să actualizeze tranzacțiile bursiere mai vechi de {0}
 DocType: Purchase Invoice Item,PR Detail,PR Detaliu
 DocType: Sales Order,Fully Billed,Complet Taxat
@@ -3405,7 +3473,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Selectați toate
 DocType: Vehicle Log,Invoice Ref,factură Ref
-DocType: Purchase Order,Recurring Order,Comanda recurent
 DocType: Company,Default Income Account,Contul Venituri Implicit
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Grup Client / Client
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed fiscal Ani de Profit / Pierdere (credit)
@@ -3419,9 +3486,9 @@
 DocType: Patient,A Negative,Un negativ
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Nimic mai mult pentru a arăta.
 DocType: Lead,From Customer,De la Client
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Apeluri
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Apeluri
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Un produs
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,Sarjele
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,Sarjele
 DocType: Project,Total Costing Amount (via Time Logs),Suma totală Costing (prin timp Busteni)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Faceți programarea taxelor
 DocType: Purchase Order Item Supplied,Stock UOM,Stoc UOM
@@ -3446,7 +3513,7 @@
 DocType: School Settings,Current Academic Term,Termen academic actual
 DocType: School Settings,Current Academic Term,Termen academic actual
 DocType: Sales Order,Not Billed,Nu Taxat
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Ambele depozite trebuie să aparțină aceleiași companii
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Ambele depozite trebuie să aparțină aceleiași companii
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Nu contact adăugat încă.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Costul Landed Voucher Suma
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Facturi cu valoarea ridicată de către furnizori.
@@ -3455,7 +3522,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Reducere Suma
 DocType: Purchase Invoice,Return Against Purchase Invoice,Reveni Împotriva cumparare factură
 DocType: Item,Warranty Period (in days),Perioada de garanție (în zile)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',actualizați tabPatient Appointment set sales_invoice = &#39;{0}&#39; unde name = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Relația cu Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Numerar net din operațiuni
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punctul 4
@@ -3464,8 +3530,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Jurnal de cont intrare
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupul studențesc
 DocType: Shopping Cart Settings,Quotation Series,Ofertă Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Există un articol cu aceeaşi denumire ({0}), vă rugăm să schimbați denumirea grupului articolului sau să redenumiţi articolul"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Vă rugăm să selectați Clienți
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Există un articol cu aceeaşi denumire ({0}), vă rugăm să schimbați denumirea grupului articolului sau să redenumiţi articolul"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Vă rugăm să selectați Clienți
 DocType: C-Form,I,eu
 DocType: Company,Asset Depreciation Cost Center,Amortizarea activului Centru de cost
 DocType: Sales Order Item,Sales Order Date,Comandă de vânzări Data
@@ -3474,6 +3540,7 @@
 DocType: Assessment Plan,Assessment Plan,Plan de evaluare
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Clientul {0} este creat.
 DocType: Stock Settings,Limit Percent,Limita procentuală
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,În prezent nu există stoc disponibil în orice depozit
 ,Payment Period Based On Invoice Date,Perioada de plată Bazat pe Data facturii
 DocType: Sample Collection,No. of print,Nr. De imprimare
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Lipsește Schimb valutar prețul pentru {0}
@@ -3529,13 +3596,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Plata brută - Deducerea totală - rambursare a creditului
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,FDM-ul curent și FDM-ul nou nu pot fi identici
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,ID-ul de salarizare alunecare
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,ID-ul de salarizare alunecare
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Data Pensionare trebuie să fie ulterioara Datei Aderării
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Au existat erori în timp ce programarea curs de:
 DocType: Sales Invoice,Against Income Account,Comparativ contului de venit
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Livrat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Postul {0}: Cantitate comandat {1} nu poate fi mai mică de cantitate minimă de comandă {2} (definită la punctul).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Postul {0}: Cantitate comandat {1} nu poate fi mai mică de cantitate minimă de comandă {2} (definită la punctul).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Lunar Procentaj Distribuție
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Conectați-vă ca un alt utilizator.
 DocType: Territory,Territory Targets,Obiective Territory
 DocType: Delivery Note,Transporter Info,Info Transporter
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Vă rugăm să setați implicit {0} în {1} companie
@@ -3543,13 +3611,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Același furnizor a fost introdus de mai multe ori
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Profit brut / Pierdere
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Comandă de aprovizionare Articol Livrat
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Numele companiei nu poate fi companie
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Numele companiei nu poate fi companie
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Antete de Scrisoare de Sabloane de Imprimare.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Titluri de șabloane de imprimare, de exemplu proforma Factura."
 DocType: Program Enrollment,Walking,mers
 DocType: Student Guardian,Student Guardian,student la Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Taxele de tip evaluare nu poate marcate ca Inclusive
 DocType: POS Profile,Update Stock,Actualizare stock
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,în abonament
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Un UOM diferit pentru articole va conduce la o valoare incorecta pentru Greutate Neta (Total). Asigurați-vă că Greutatea Netă a fiecărui articol este în același UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Rată BOM
 DocType: Asset,Journal Entry for Scrap,Jurnal de intrare pentru deseuri
@@ -3599,15 +3668,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Utilizator de sistem (login) de identitate. Dacă este setat, el va deveni implicit pentru toate formele de resurse umane."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: de la {1}
 DocType: Task,depends_on,depinde de
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,A intrat în așteptare pentru actualizarea ultimului preț în toate materialele. Ar putea dura câteva minute.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,A intrat în așteptare pentru actualizarea ultimului preț în toate materialele. Ar putea dura câteva minute.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Numele de cont nou. Notă: Vă rugăm să nu creați conturi pentru clienți și furnizori
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Șabloanele țară înțelept adresa implicită
 DocType: Sales Order Item,Supplier delivers to Customer,Furnizor livrează la client
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Forma / Postul / {0}) este din stoc
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Datorită / Reference Data nu poate fi după {0}
+,Sales Payment Summary,Rezumatul plăților pentru vânzări
+DocType: Restaurant,Restaurant,Restaurant
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Datorită / Reference Data nu poate fi după {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Datele de import și export
 DocType: Patient,Account Details,Detalii cont
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Nu există elevi găsit
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Nu există elevi găsit
 DocType: Medical Department,Medical Department,Departamentul medical
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Criteriile de evaluare a Scorecard-ului furnizorului
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Postarea factură Data
@@ -3618,8 +3689,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Vă rugăm să selectați Dată postare înainte de a selecta Parte
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Din AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Selectați Cotațiile
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Selectați Cotațiile
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Selectați Cotațiile
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Selectați Cotațiile
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numărul de Deprecieri Booked nu poate fi mai mare decât Număr total de Deprecieri
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Realizeaza Vizita de Mentenanta
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,Vă rugăm să contactați pentru utilizatorul care au Sales Maestru de Management {0} rol
@@ -3627,7 +3698,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Directorul Companiei(nu al Clientului sau al Furnizorui).
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Aceasta se bazează pe prezența acestui student
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Nu există studenți în
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Adăugați mai multe elemente sau sub formă deschis complet
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Adăugați mai multe elemente sau sub formă deschis complet
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota de Livrare {0} trebuie sa fie anulată înainte de a anula aceasta Comandă de Vânzări
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Accesați Utilizatori
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Suma plătită + Scrie Off Suma nu poate fi mai mare decât Grand total
@@ -3647,37 +3718,40 @@
 DocType: Fee Schedule,Fee Schedule,Taxa de Program
 DocType: Hub Settings,Publish Availability,Publica Disponibilitate
 DocType: Company,Create Chart Of Accounts Based On,"Creează Plan de conturi, bazate pe"
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Nu se poate converti în non-grup. Sarcini pentru copii există.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Data nașterii nu poate fi mai mare decât în prezent.
 ,Stock Ageing,Stoc Îmbătrânirea
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Student {0} există împotriva solicitantului de student {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Rotunjire ajustare (moneda companiei)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,pontajul
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Pontaj
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' este dezactivat
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Setați ca Deschis
 DocType: Cheque Print Template,Scanned Cheque,scanate cecului
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Trimite prin email automate de contact pe tranzacțiile Depunerea.
 DocType: Timesheet,Total Billable Amount,Suma totală Taxabil
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punctul 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Intrare comandă
 DocType: Purchase Order,Customer Contact Email,Contact Email client
 DocType: Warranty Claim,Item and Warranty Details,Postul și garanție Detalii
 DocType: Sales Team,Contribution (%),Contribuție (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Notă: Plata de intrare nu va fi creat deoarece ""Cash sau cont bancar"" nu a fost specificat"
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Proiectul {0} există deja
 DocType: Medical Department,Nursing User,Utilizator Nursing
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Responsabilitati
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Perioada de valabilitate a acestui citat sa încheiat.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Perioada de valabilitate a acestui citat sa încheiat.
 DocType: Expense Claim Account,Expense Claim Account,Cont de cheltuieli de revendicare
 DocType: Accounts Settings,Allow Stale Exchange Rates,Permiteți rate de schimb stale
 DocType: Sales Person,Sales Person Name,Sales Person Nume
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Va rugam sa introduceti cel putin 1 factura în tabelul
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Adauga utilizatori
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Adauga utilizatori
 DocType: POS Item Group,Item Group,Grup Articol
 DocType: Item,Safety Stock,Stoc de siguranta
 DocType: Healthcare Settings,Healthcare Settings,Setări de asistență medicală
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Progres% pentru o sarcină care nu poate fi mai mare de 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Progres% pentru o sarcină care nu poate fi mai mare de 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Premergător reconcilierii
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Pentru a {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impozite și Taxe adăugate (Compania de valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Taxa Articol pentru inregistrarea {0} trebuie sa detina un cont de tip Fiscal sau De Venituri sau De Cheltuieli sau Taxabil
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Taxa Articol pentru inregistrarea {0} trebuie sa detina un cont de tip Fiscal sau De Venituri sau De Cheltuieli sau Taxabil
 DocType: Sales Order,Partly Billed,Parțial Taxat
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Postul {0} trebuie să fie un element activ fix
 DocType: Item,Default BOM,FDM Implicit
@@ -3693,6 +3767,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,Variabil
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Din Nota de Livrare
 DocType: Student,Student Email Address,Adresa de e-mail Student
+DocType: Item,Hub Warehouse,Hub Depozit
 DocType: Physician Schedule Time Slot,From Time,Din Time
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,In stoc:
 DocType: Notification Control,Custom Message,Mesaj Personalizat
@@ -3701,9 +3776,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Adresa studenților
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Adresa studenților
 DocType: Purchase Invoice,Price List Exchange Rate,Lista de prețuri Cursul de schimb
+DocType: POS Profile,POS Profile Name,Numele profilului POS
 DocType: Purchase Invoice Item,Rate,
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Interna
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Numele adresei
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Numele adresei
 DocType: Stock Entry,From BOM,De la BOM
 DocType: Assessment Code,Assessment Code,Codul de evaluare
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Elementar
@@ -3717,11 +3793,12 @@
 DocType: Salary Slip,Salary Structure,Structura salariu
 DocType: Account,Bank,Bancă
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Linie aeriană
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Eliberarea Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Eliberarea Material
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,A apărut o eroare la crearea unei recurențe
 DocType: Material Request Item,For Warehouse,Pentru Depozit
 DocType: Employee,Offer Date,Oferta Date
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Cotațiile
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Sunteți în modul offline. Tu nu va fi capabil să reîncărcați până când nu aveți de rețea.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Sunteți în modul offline. Tu nu va fi capabil să reîncărcați până când nu aveți de rețea.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Nu există grupuri create de studenți.
 DocType: Purchase Invoice Item,Serial No,Nr. serie
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Rambursarea lunară Suma nu poate fi mai mare decât Suma creditului
@@ -3731,17 +3808,18 @@
 DocType: Salary Slip,Total Working Hours,Numărul total de ore de lucru
 DocType: Subscription,Next Schedule Date,Data următoare a programării
 DocType: Stock Entry,Including items for sub assemblies,Inclusiv articole pentru subansambluri
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Introduceți valoarea trebuie să fie pozitiv
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Toate teritoriile
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Introduceți valoarea trebuie să fie pozitiv
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Toate teritoriile
 DocType: Purchase Invoice,Items,Articole
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student este deja înscris.
 DocType: Fiscal Year,Year Name,An Denumire
 DocType: Process Payroll,Process Payroll,Salarizare proces
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Există mai multe sărbători decât de zile de lucru în această lună.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Există mai multe sărbători decât de zile de lucru în această lună.
 DocType: Product Bundle Item,Product Bundle Item,Produs Bundle Postul
 DocType: Sales Partner,Sales Partner Name,Numele Partner Sales
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Cerere de Cotațiile
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Cerere de Cotațiile
 DocType: Payment Reconciliation,Maximum Invoice Amount,Factură maxim Suma
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hematologie
 DocType: Normal Test Items,Normal Test Items,Elemente de test normale
 DocType: Student Language,Student Language,Limba Student
 apps/erpnext/erpnext/config/selling.py +23,Customers,clienţii care
@@ -3753,10 +3831,11 @@
 DocType: Issue,Opening Time,Timp de deschidere
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Datele De La și Pana La necesare
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,A Valorilor Mobiliare și Burselor de Mărfuri
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitatea implicit de măsură pentru Variant &#39;{0} &quot;trebuie să fie la fel ca în Template&quot; {1} &quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitatea implicit de măsură pentru Variant &#39;{0} &quot;trebuie să fie la fel ca în Template&quot; {1} &quot;
 DocType: Shipping Rule,Calculate Based On,Calculaţi pe baza
 DocType: Delivery Note Item,From Warehouse,Din depozitul
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Nu există niciun articol cu Lista de materiale pentru fabricarea
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Nu există niciun articol cu Lista de materiale pentru fabricarea
+DocType: Restaurant,Default Customer,Clientul implicit
 DocType: Assessment Plan,Supervisor Name,Nume supervizor
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Nu confirmați dacă se creează o întâlnire pentru aceeași zi
 DocType: Program Enrollment Course,Program Enrollment Course,Curs de înscriere la curs
@@ -3784,7 +3863,7 @@
 DocType: Payment Entry,Internal Transfer,Transfer intern
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Contul copil există pentru acest cont. Nu puteți șterge acest cont.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Cantitatea țintă sau valoarea țintă este obligatorie
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Nu există implicit BOM pentru postul {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Nu există implicit BOM pentru postul {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Vă rugăm să selectați postarea Data primei
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,"Deschiderea Data ar trebui să fie, înainte de Data inchiderii"
 DocType: Leave Control Panel,Carry Forward,Transmite Inainte
@@ -3820,6 +3899,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Raport Prezent
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,Declarațiile contabile
 DocType: Drug Prescription,Hour,Oră
+DocType: Restaurant Order Entry,Last Sales Invoice,Ultima factură de vânzare
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Noua ordine nu pot avea Warehouse. Depozit trebuie să fie stabilite de către Bursa de intrare sau de primire de cumparare
 DocType: Lead,Lead Type,Tip Conducere
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Tu nu sunt autorizate să aprobe frunze pe bloc Perioada
@@ -3856,65 +3936,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Creați Utilizatori
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,Gram
 DocType: Supplier Scorecard,Per Month,Pe luna
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Cantitatea să Fabricare trebuie sa fie mai mare decât 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Cantitatea să Fabricare trebuie sa fie mai mare decât 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Vizitați raport de apel de întreținere.
 DocType: Stock Entry,Update Rate and Availability,Actualizarea Rata și disponibilitatea
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procentul vi se permite de a primi sau livra mai mult față de cantitatea comandata. De exemplu: Dacă ați comandat 100 de unități. și alocația este de 10%, atunci vi se permite să primească 110 de unități."
-DocType: POS Customer Group,Customer Group,Grup Client
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),ID-ul lotului nou (opțional)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),ID-ul lotului nou (opțional)
+DocType: POS Customer Group,Customer Group,Grup Clienți
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),ID-ul lotului nou (opțional)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),ID-ul lotului nou (opțional)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Cont de cheltuieli este obligatoriu pentru articolul {0}
 DocType: BOM,Website Description,Site-ul Descriere
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Schimbarea net în capitaluri proprii
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Cele mai noi
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Vă rugăm să anulați Achiziționarea factură {0} mai întâi
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adresa de e-mail trebuie să fie unic, există deja pentru {0}"
 DocType: Serial No,AMC Expiry Date,Dată expirare AMC
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,primire
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,primire
 ,Sales Register,Vânzări Inregistrare
 DocType: Daily Work Summary Settings Company,Send Emails At,Trimite email-uri La
 DocType: Quotation,Quotation Lost Reason,Citat pierdut rațiunea
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Selectați domeniul
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',selectați * din tabPatient unde name = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},de referință al tranzacției nu {0} {1} din
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},de referință al tranzacției nu {0} {1} din
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nu este nimic pentru a edita.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Vizualizare formular
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Rezumat pentru această lună și activități în așteptarea
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Vizualizare formular
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Rezumat pentru această lună și activități în așteptarea
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Adăugați utilizatori în organizația dvs., în afară de dvs."
 DocType: Customer Group,Customer Group Name,Nume Group Client
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Nu există clienți încă!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Nu există clienți încă!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Situația fluxurilor de trezorerie
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Suma creditului nu poate depăși valoarea maximă a împrumutului de {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licență
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Vă rugăm să eliminați acest factură {0} de la C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Vă rugăm să eliminați acest factură {0} de la C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vă rugăm să selectați reporta dacă doriți și să includă echilibrul de anul precedent fiscal lasă în acest an fiscal
 DocType: GL Entry,Against Voucher Type,Comparativ tipului de voucher
 DocType: Physician,Phone (R),Telefon (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Au fost adăugate sloturi de timp
 DocType: Item,Attributes,Atribute
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Activați șablonul
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setați seria de numire pentru {0} prin Configurare&gt; Setări&gt; Serii de numire
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Va rugam sa introduceti Scrie Off cont
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Ultima comandă Data
 DocType: Patient,B Negative,B Negativ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Contul {0} nu aparține companiei {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Numerele de serie din rândul {0} nu se potrivesc cu Nota de livrare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Numerele de serie din rândul {0} nu se potrivesc cu Nota de livrare
 DocType: Student,Guardian Details,Detalii tutore
 DocType: C-Form,C-Form,Formular-C
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Marcă Participarea pentru mai mulți angajați
 DocType: Vehicle,Chassis No,Număr șasiu
 DocType: Payment Request,Initiated,Iniţiat
 DocType: Production Order,Planned Start Date,Start data planificată
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Selectați un BOM
 DocType: Serial No,Creation Document Type,Tip de document creație
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Data de încheiere trebuie să fie mai mare decât data de începere
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Data de încheiere trebuie să fie mai mare decât data de începere
 DocType: Leave Type,Is Encash,Este încasa
 DocType: Leave Allocation,New Leaves Allocated,Cereri noi de concediu alocate
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Date proiect-înțelept nu este disponibilă pentru ofertă
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Terminați
 DocType: Project,Expected End Date,Data de Incheiere Preconizata
 DocType: Budget Account,Budget Amount,Buget Sumă
 DocType: Appraisal Template,Appraisal Template Title,Titlu model expertivă
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},De la data {0} pentru angajat {1} nu poate fi înainte de data aderării angajatului {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Comercial
 DocType: Patient,Alcohol Current Use,Utilizarea curentă a alcoolului
+DocType: Student Admission Program,Student Admission Program,Programul de Admitere în Studenți
 DocType: Payment Entry,Account Paid To,Contul Plătite
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Postul părinte {0} nu trebuie să fie un articol stoc
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Toate produsele sau serviciile.
@@ -3923,30 +4005,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} buget pentru contul {1} fata de {2} {3} este {4}. Acesta este depasit  de {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Rândul {0} # cont trebuie să fie de tip &quot;Activ fix&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Out Cantitate
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Reguli pentru a calcula suma de transport maritim pentru o vânzare
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,și dezactivat Dezactivat în
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Seria este obligatorie
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Servicii financiare
 DocType: Student Sibling,Student ID,Carnet de student
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Tipuri de activități pentru busteni Timp
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Email furnizor
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Tipuri de activități pentru busteni Timp
 DocType: Tax Rule,Sales,Vânzări
 DocType: Stock Entry Detail,Basic Amount,Suma de bază
 DocType: Training Event,Exam,Examen
 DocType: Complaint,Complaint,Plângere
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Depozit necesar pentru stocul de postul {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Depozit necesar pentru stocul de postul {0}
 DocType: Leave Allocation,Unused leaves,Frunze neutilizate
 DocType: Patient,Alcohol Past Use,Utilizarea anterioară a alcoolului
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Stat de facturare
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Obtine FDM expandat (inclusiv subansamblurile)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Obtine FDM expandat (inclusiv subansamblurile)
 DocType: Authorization Rule,Applicable To (Employee),Aplicabil pentru (angajat)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Due Date este obligatorie
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Due Date este obligatorie
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Creștere pentru Atribut {0} nu poate fi 0
 DocType: Journal Entry,Pay To / Recd From,Pentru a plăti / Recd de la
 DocType: Naming Series,Setup Series,Seria de configurare
 DocType: Payment Reconciliation,To Invoice Date,Pentru a facturii Data
 DocType: Supplier,Contact HTML,HTML Persoana de Contact
 ,Inactive Customers,Clienții inactive
+DocType: Student Admission Program,Maximum Age,Vârsta maximă
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Încasări de cumparare
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Cum se aplică regula pret?
@@ -3965,6 +4049,7 @@
 DocType: GL Entry,Remarks,Remarci
 DocType: Payment Entry,Account Paid From,Contul plătit De la
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Material brut Articol Cod
+DocType: Task,Parent Task,Activitatea părintească
 DocType: Journal Entry,Write Off Based On,Scrie Off bazat pe
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Asigurați-vă de plumb
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Imprimare și articole de papetărie
@@ -3973,20 +4058,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salariu au fost deja procesate pentru perioada între {0} și {1}, Lăsați perioada de aplicare nu poate fi între acest interval de date."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Înregistrare de instalare pentru un nr de serie
 DocType: Guardian Interest,Guardian Interest,Interes tutore
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Configurați valorile implicite pentru facturile POS
 apps/erpnext/erpnext/config/hr.py +177,Training,Pregătire
 DocType: Timesheet,Employee Detail,Detaliu angajat
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Codul de e-mail al Guardian1
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Codul de e-mail al Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,În ziua următoare Data și repetă în ziua de luni trebuie să fie egală
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,În ziua următoare Data și repetă în ziua de luni trebuie să fie egală
 DocType: Lab Prescription,Test Code,Cod de test
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Setările pentru pagina de start site-ul web
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},CV-urile nu sunt permise pentru {0} datorită unui punctaj din {1}
 DocType: Offer Letter,Awaiting Response,Se aşteaptă răspuns
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Sus
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Sumă totală {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},atribut nevalid {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Sumă totală {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},atribut nevalid {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Menționați dacă contul de plată non-standard
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Același element a fost introdus de mai multe ori. {listă}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Selectați alt grup de evaluare decât &quot;Toate grupurile de evaluare&quot;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Rând {0}: este necesar un centru de cost pentru un element {1}
 DocType: Training Event Employee,Optional,facultativ
@@ -4009,13 +4094,15 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: 아이템 {2} 는 Cost Center가  필수임
 DocType: Vehicle,Policy No,Politica nr
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Obține elemente din Bundle produse
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Deoarece stocul există față de un element {0}, nu puteți activa proprietățile variantelor"
 DocType: Asset,Straight Line,Linie dreapta
 DocType: Project User,Project User,utilizator proiect
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Despică
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Despică
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Despică
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Despică
 DocType: GL Entry,Is Advance,Este Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Prezenţa de la data și prezența până la data sunt obligatorii
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,"Va rugam sa introduceti ""este subcontractată"" ca Da sau Nu"
+DocType: Item,Default Purchase Unit of Measure,Unitatea de măsură prestabilită a măsurii
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Ultima comunicare
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Ultima comunicare
 DocType: Sales Team,Contact No.,Nr. Persoana de Contact
@@ -4024,7 +4111,6 @@
 DocType: Production Order,Check if material transfer entry is not required,Verificați dacă nu este necesară introducerea transferului de materiale
 DocType: Production Order,Check if material transfer entry is not required,Verificați dacă nu este necesară introducerea transferului de materiale
 DocType: Program Enrollment Tool,Get Students From,Elevii de la a lua
-DocType: Hub Settings,Seller Country,Vânzător Țară
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publica Articole pe site-ul
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Grupa elevii în loturi
 DocType: Authorization Rule,Authorization Rule,Regulă de autorizare
@@ -4034,8 +4120,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Impozite vânzări și șabloane Taxe
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Total (Credit)
 DocType: Repayment Schedule,Payment Date,Data de plată
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Numărul nou de loturi
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Numărul nou de loturi
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Numărul nou de loturi
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Numărul nou de loturi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Îmbrăcăminte și accesorii
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,Nu s-a putut rezolva funcția de scor ponderat. Asigurați-vă că formula este validă.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Numărul de comandă
@@ -4053,6 +4139,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rând # {0}: {1} activ nu poate fi prezentat, este deja {2}"
 DocType: Tax Rule,Billing Country,Țara facturării
 DocType: Purchase Order Item,Expected Delivery Date,Data de Livrare Preconizata
+DocType: Restaurant Order Entry,Restaurant Order Entry,Intrare comandă de restaurant
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit și credit nu este egal pentru {0} # {1}. Diferența este {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Cheltuieli de Divertisment
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Asigurați-vă Material Cerere
@@ -4065,9 +4152,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Un cont cu tranzacții existente nu poate fi șters
 DocType: Vehicle,Last Carbon Check,Ultima Verificare carbon
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Cheltuieli Juridice
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Selectați cantitatea pe rând
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Selectați cantitatea pe rând
 DocType: Purchase Invoice,Posting Time,Postarea de timp
 DocType: Timesheet,% Amount Billed,% Suma facturata
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Timp pe întâlnire&quot; nu a fost setat pentru Dr {0}. Adăugați-l la medic.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Cheltuieli de telefon
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Bifati dacă doriți sa fortati utilizatorul să selecteze o serie înainte de a salva. Nu va exista nici o valoare implicita dacă se bifeaza aici."""
@@ -4078,6 +4166,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Noi surse de venit pentru clienți
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Cheltuieli de călătorie
 DocType: Maintenance Visit,Breakdown,Avarie
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Adăugați abonarea câmpului personalizat în doctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Contul: {0} cu moneda: {1} nu poate fi selectat
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Actualizați costul BOM în mod automat prin programator, bazat pe cea mai recentă rată de evaluare / rata de prețuri / ultima rată de achiziție a materiilor prime."
 DocType: Bank Reconciliation Detail,Cheque Date,Data Cec
@@ -4102,7 +4191,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Suma totală de facturare (prin timp Busteni)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Furnizor Id
 DocType: Payment Request,Payment Gateway Details,Plata Gateway Detalii
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Cantitatea trebuie sa fie mai mare decât 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Cantitatea trebuie sa fie mai mare decât 0
 DocType: Journal Entry,Cash Entry,Cash intrare
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,noduri pentru copii pot fi create numai în noduri de tip &quot;grup&quot;
 DocType: Leave Application,Half Day Date,Jumatate de zi Data
@@ -4120,12 +4209,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Notă: Articolul {0} a intrat de mai multe ori
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Toate contactele.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Abreviere Companie
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Utilizatorul {0} nu există
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Utilizatorul {0} nu există
 DocType: Subscription,SUB-,SUB
 DocType: Item Attribute Value,Abbreviation,Abreviere
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Există deja intrare plată
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Nu authroized din {0} depășește limitele
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Maestru șablon salariu.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Patologie
+DocType: Restaurant Order Entry,Restaurant Table,Restaurant Table
 DocType: Leave Type,Max Days Leave Allowed,Max zile de concediu de companie
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Set Regula fiscală pentru coșul de cumpărături
 DocType: Purchase Invoice,Taxes and Charges Added,Impozite și Taxe Added
@@ -4137,10 +4228,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Citate la Oportunitati sau clienți.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rol permise pentru a edita stoc congelate
 ,Territory Target Variance Item Group-Wise,Teritoriul țintă Variance Articol Grupa Înțelept
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Toate grupurile de clienți
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Toate grupurile de clienți
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,lunar acumulat
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} este obligatoriu. Este posibil ca înregistrarea schimbului valutar nu este creată pentru {1} până la {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Format de impozitare este obligatorie.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Format de impozitare este obligatorie.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Contul {0}: cont părinte {1} nu există
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Lista de prețuri Rate (Compania de valuta)
 DocType: Products Settings,Products Settings,produse Setări
@@ -4166,13 +4257,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detaliu Taxa Avizata Articol
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Institutul Abreviere
 ,Item-wise Price List Rate,Rata Lista de Pret Articol-Avizat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Furnizor ofertă
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Furnizor ofertă
 DocType: Quotation,In Words will be visible once you save the Quotation.,În cuvinte va fi vizibil după ce salvați citat.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Cantitatea ({0}) nu poate fi o fracțiune în rândul {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Cantitatea ({0}) nu poate fi o fracțiune în rândul {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Cod de bare {0} deja folosit pentru articolul {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Cod de bare {0} deja folosit pentru articolul {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Reguli pentru a adăuga costurile de transport maritim.
 DocType: Item,Opening Stock,deschidere stoc
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Clientul este necesar
@@ -4191,9 +4282,8 @@
 DocType: Customer,From Lead,Din Conducere
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Comenzi lansat pentru producție.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Selectați anul fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS Profil necesare pentru a face POS intrare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS Profil necesare pentru a face POS intrare
 DocType: Program Enrollment Tool,Enroll Students,Studenți Enroll
-DocType: Hub Settings,Name Token,Numele Token
 DocType: Lab Test,Approved Date,Data aprobată
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Vanzarea Standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Cel puţin un depozit este obligatoriu
@@ -4211,7 +4301,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Resurse Umane
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Reconciliere de plata
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Active fiscale
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Ordinul de producție a fost {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Ordinul de producție a fost {0}
 DocType: BOM Item,BOM No,Nr. BOM
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Jurnal de intrare {0} nu are cont {1} sau deja comparate cu alte voucher
@@ -4231,8 +4321,8 @@
 DocType: Currency Exchange,To Currency,Pentru a valutar
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Permiteţi următorilor utilizatori să aprobe cereri de concediu pentru zile blocate.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Tipuri de cheltuieli de revendicare.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Rata de vânzare pentru articolul {0} este mai mică decât {1}. Rata de vânzare trebuie să fie atinsă {2}
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Rata de vânzare pentru articolul {0} este mai mică decât {1}. Rata de vânzare trebuie să fie atinsă {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Rata de vânzare pentru articolul {0} este mai mică decât {1}. Rata de vânzare trebuie să fie atinsă {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Rata de vânzare pentru articolul {0} este mai mică decât {1}. Rata de vânzare trebuie să fie atinsă {2}
 DocType: Item,Taxes,Impozite
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Plătite și nu sunt livrate
 DocType: Project,Default Cost Center,Cost Center Implicit
@@ -4246,15 +4336,15 @@
 DocType: Employee Loan,Fully Disbursed,deblocată în întregime
 DocType: Maintenance Visit,Customer Feedback,Feedback Client
 DocType: Account,Expense,Cheltuială
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Scorul nu poate fi mai mare decât scorul maxim
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Scorul nu poate fi mai mare decât scorul maxim
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Clienții și furnizorii
 DocType: Item Attribute,From Range,Din gama
 DocType: BOM,Set rate of sub-assembly item based on BOM,Viteza setată a elementului subansamblu bazat pe BOM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Eroare de sintaxă în formulă sau stare: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Eroare de sintaxă în formulă sau stare: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,De zi cu zi de lucru Companie Rezumat Setări
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,"Element {0} ignorat, deoarece nu este un element de stoc"
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Trimiteți acest comandă de producție pentru prelucrarea ulterioară.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Trimiteți acest comandă de producție pentru prelucrarea ulterioară.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","De a nu aplica regula Preturi într-o anumită tranzacție, ar trebui să fie dezactivat toate regulile de tarifare aplicabile."
 DocType: Assessment Group,Parent Assessment Group,Grup părinte de evaluare
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Locuri de munca
@@ -4271,16 +4361,17 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Filtru filtru de companie gol dacă grupul de grup este &quot;companie&quot;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Dată postare nu poate fi data viitoare
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} nu se potrivește cu {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,pentru generarea recurentei
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Concediu Aleator
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Laboratorul de testare UOM.
 DocType: Batch,Batch ID,ID-ul lotului
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Notă: {0}
 ,Delivery Note Trends,Tendințe Nota de Livrare
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Rezumat această săptămână
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Rezumat această săptămână
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,În stoc Cantitate
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Contul: {0} poate fi actualizat doar prin Tranzacții stoc
 DocType: Student Group Creation Tool,Get Courses,Cursuri de a lua
-DocType: GL Entry,Party,Grup
+DocType: GL Entry,Party,Partener
 DocType: Healthcare Settings,Patient Name,Numele pacientului
 DocType: Variant Field,Variant Field,Varianta câmpului
 DocType: Sales Order,Delivery Date,Data de Livrare
@@ -4290,7 +4381,6 @@
 DocType: Purchase Order,To Bill,Pentru a Bill
 DocType: Material Request,% Ordered,% Comandat
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Pentru grupul de studenți bazat pe cursuri, cursul va fi validat pentru fiecare student din cursurile înscrise în înscrierea în program."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Introdu adresa de e-mail separate prin virgule, factura va fi trimis prin poștă în mod automat la anumită dată"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Muncă în acord
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Rată de cumparare medie
 DocType: Task,Actual Time (in Hours),Timpul efectiv (în ore)
@@ -4304,7 +4394,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Articolul {0} nu este configurat pentru Numerotare Seriala. Coloana trebuie să fie vida
 DocType: Accounts Settings,Accounts Settings,Setări Conturi
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,Aproba
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Niciun rezultat nu trebuie trimis
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Niciun rezultat nu trebuie trimis
 DocType: Customer,Sales Partner and Commission,Partener de vânzări și a Comisiei
 DocType: Employee Loan,Rate of Interest (%) / Year,Rata dobânzii (%) / An
 ,Project Quantity,proiectul Cantitatea
@@ -4316,55 +4406,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Negru
 DocType: BOM Explosion Item,BOM Explosion Item,Explozie articol BOM
 DocType: Account,Auditor,Auditor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} articole produse
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} articole produse
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Află mai multe
 DocType: Cheque Print Template,Distance from top edge,Distanța de la marginea de sus
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Listă de prețuri {0} este dezactivat sau nu există
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Listă de prețuri {0} este dezactivat sau nu există
 DocType: Purchase Invoice,Return,Întoarcere
 DocType: Production Order Operation,Production Order Operation,Producția Comanda Funcționare
 DocType: Pricing Rule,Disable,Dezactivati
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Modul de plată este necesară pentru a efectua o plată
 DocType: Project Task,Pending Review,Revizuirea în curs
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Numiri și consultări
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nu este înscris în lotul {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nu este înscris în lotul {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Activ {0} nu poate fi scoase din uz, deoarece este deja {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Revendicarea Total cheltuieli (prin cheltuieli revendicarea)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rând {0}: Moneda de BOM # {1} ar trebui să fie egal cu moneda selectată {2}
 DocType: Journal Entry Account,Exchange Rate,Rata de schimb
 DocType: Patient,Additional information regarding the patient,Informații suplimentare privind pacientul
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Comandă de vânzări {0} nu este prezentat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Comandă de vânzări {0} nu este prezentat
 DocType: Homepage,Tag Line,Eticheta linie
 DocType: Fee Component,Fee Component,Taxa de Component
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Conducerea flotei
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Adauga articole din
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Conducerea flotei
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Adauga articole din
 DocType: Cheque Print Template,Regular,Regulat
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Weightage totală a tuturor criteriilor de evaluare trebuie să fie 100%
-DocType: BOM,Last Purchase Rate,Ultima Rate de Cumparare
+DocType: Purchase Order Item,Last Purchase Rate,Ultima Rate de Cumparare
 DocType: Account,Asset,Valoare
 DocType: Project Task,Task ID,Sarcina ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock nu poate exista pentru postul {0} deoarece are variante
 DocType: Lab Test,Mobile,Mobil
 ,Sales Person-wise Transaction Summary,Persoana de vânzări-înțelept Rezumat Transaction
 DocType: Training Event,Contact Number,Numar de contact
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Depozitul {0} nu există
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Inregistreaza-te pentru ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Depozitul {0} nu există
 DocType: Monthly Distribution,Monthly Distribution Percentages,Procente de distribuție lunare
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Elementul selectat nu poate avea Lot
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Rata de evaluare nu a fost găsit pentru elementul {0}, care trebuie să facă înregistrări contabile pentru {1} {2}. În cazul în care elementul este ca un element transacting probă în {1}, vă rugăm să menționați că în {1} tabel element. În caz contrar, vă rugăm să creați o tranzacție stoc de intrare pentru element sau menționează rata de evaluare în înregistrarea element și apoi încercați submiting / anulare această intrare"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% de materiale livrate versus notele livrarii
+DocType: Training Event,Has Certificate,Are certificat
 DocType: Project,Customer Details,Detalii Client
 DocType: Employee,Reports to,Rapoarte
 ,Unpaid Expense Claim,Revendicarea de cheltuieli neplătit
 DocType: Payment Entry,Paid Amount,Suma plătită
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Explorați ciclul vânzărilor
 DocType: Assessment Plan,Supervisor,supraveghetor
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,Pe net
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,Pe net
 ,Available Stock for Packing Items,Stoc disponibil pentru articole destinate împachetării
 DocType: Item Variant,Item Variant,Postul Varianta
 DocType: Assessment Result Tool,Assessment Result Tool,Instrumentul de evaluare Rezultat
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Resturi Postul
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,comenzile trimise nu pot fi șterse
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,comenzile trimise nu pot fi șterse
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Soldul contului este deja în credit, nu vă este permis să setați ""Balanța trebuie să fie"" drept ""Credit""."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Managementul calității
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Postul {0} a fost dezactivat
@@ -4385,7 +4474,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Permiteți ratei de evaluare zero
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Permiteți ratei de evaluare zero
 DocType: Training Event Employee,Invited,invitați
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,"Mai multe structuri salariale active, găsite pentru angajat al {0} pentru datele indicate"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,"Mai multe structuri salariale active, găsite pentru angajat al {0} pentru datele indicate"
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Setup conturi Gateway.
 DocType: Employee,Employment Type,Tip angajare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Active Fixe
@@ -4397,7 +4486,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,ID-ul de student e-mail
 DocType: Employee,Notice (days),Preaviz (zile)
 DocType: Tax Rule,Sales Tax Template,Format impozitul pe vânzări
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Selectați elemente pentru a salva factura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Selectați elemente pentru a salva factura
 DocType: Employee,Encashment Date,Data plata in Numerar
 DocType: Training Event,Internet,Internet
 DocType: Special Test Template,Special Test Template,Șablon de testare special
@@ -4406,7 +4495,7 @@
 DocType: Production Order,Planned Operating Cost,Planificate cost de operare
 DocType: Academic Term,Term Start Date,Termenul Data de începere
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Vă rugăm să găsiți atașat {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Vă rugăm să găsiți atașat {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Banca echilibru Declarație pe General Ledger
 DocType: Job Applicant,Applicant Name,Nume solicitant
 DocType: Authorization Rule,Customer / Item Name,Client / Denumire articol
@@ -4426,7 +4515,7 @@
 DocType: Guardian,Guardian Of ,Guardian Of
 DocType: Grading Scale Interval,Threshold,Prag
 DocType: BOM Update Tool,Current BOM,FDM curent
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Adăugaţi Nr. de Serie
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Adăugaţi Nr. de Serie
 DocType: Production Order Item,Available Qty at Source Warehouse,Cantitate disponibilă la Warehouse sursă
 apps/erpnext/erpnext/config/support.py +22,Warranty,garanţie
 DocType: Purchase Invoice,Debit Note Issued,Debit Notă Eliberat
@@ -4449,10 +4538,9 @@
 DocType: Account,Receivable,De încasat
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Nu este permis să schimbe furnizorul ca Comandă există deja
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol care i se permite să prezinte tranzacțiile care depășesc limitele de credit stabilite.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Selectați elementele de Fabricare
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","datele de bază de sincronizare, ar putea dura ceva timp"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Selectați elementele de Fabricare
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","datele de bază de sincronizare, ar putea dura ceva timp"
 DocType: Item,Material Issue,Problema de material
-DocType: Hub Settings,Seller Description,Descriere vânzător
 DocType: Employee Education,Qualification,Calificare
 DocType: Item Price,Item Price,Pret Articol
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap & Detergent
@@ -4460,7 +4548,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Din Timpul nu poate fi mai mare decât în timp.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordonat
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Relua
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Relua
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Dacă este activată, sistemul nu va actualiza câmpurile de variante din șablon, ci va copia datele din câmpurile de mai jos în timp ce realizează o nouă variantă"
 DocType: Salary Detail,Component,component
 DocType: Assessment Criteria,Assessment Criteria Group,Criterii de evaluare de grup
 DocType: Healthcare Settings,Patient Name By,Nume pacient
@@ -4470,7 +4559,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Vă rugăm să introduceți Aprobarea Rolul sau aprobarea de utilizare
 DocType: Journal Entry,Write Off Entry,Amortizare intrare
 DocType: BOM,Rate Of Materials Based On,Rate de materiale bazate pe
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Furnizor&gt; Tipul furnizorului
+DocType: Item Variant Settings,Do not Update Variants,Nu actualizați variantele
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Suport
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Deselecteaza tot
 DocType: POS Profile,Terms and Conditions,Termeni şi condiţii
@@ -4479,7 +4568,7 @@
 DocType: Leave Block List,Applies to Company,Se aplică companiei
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,"Nu pot anula, deoarece a prezentat Bursa de intrare {0} există"
 DocType: Employee Loan,Disbursement Date,debursare
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&quot;Destinatari&quot; nu sunt specificați
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&quot;Destinatari&quot; nu sunt specificați
 DocType: BOM Update Tool,Update latest price in all BOMs,Actualizați cel mai recent preț în toate BOM-urile
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Fișă medicală
 DocType: Vehicle,Vehicle,Vehicul
@@ -4495,14 +4584,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Plumb%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Deprecieri active și echilibrări
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Suma {0} {1} transferat de la {2} la {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Suma {0} {1} transferat de la {2} la {3}
 DocType: Sales Invoice,Get Advances Received,Obtine Avansurile Primite
 DocType: Email Digest,Add/Remove Recipients,Adăugaţi/Stergeţi Destinatari
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Tranzacție nu este permis împotriva oprit comandă de producție {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Pentru a seta acest an fiscal ca implicit, faceți clic pe ""Set as Default"""
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,A adera
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,A adera
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Lipsă Cantitate
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Postul varianta {0} există cu aceleași atribute
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Postul varianta {0} există cu aceleași atribute
 DocType: Employee Loan,Repay from Salary,Rambursa din salariu
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Solicitarea de plată contra {0} {1} pentru suma {2}
@@ -4515,7 +4604,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Comandă de vânzări Postul
 DocType: Salary Slip,Payment Days,Zile de plată
 DocType: Patient,Dormant,Inactiv
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Depozite cu noduri copil nu pot fi convertite în Cartea Mare
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Depozite cu noduri copil nu pot fi convertite în Cartea Mare
 DocType: BOM,Manage cost of operations,Gestioneaza costul operațiunilor
 DocType: Accounts Settings,Stale Days,Zilele stale
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Atunci când oricare dintre tranzacțiile verificate sunt ""Trimis"", un e-mail de tip pop-up a deschis în mod automat pentru a trimite un e-mail la ""Contact"", asociat în această operațiune, cu tranzacția ca un atașament. Utilizatorul poate sau nu poate trimite e-mail."
@@ -4529,10 +4618,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serial Nu {0} a fost deja primit
 ,Requested Items To Be Transferred,Elemente solicitate să fie transferată
 DocType: Expense Claim,Vehicle Log,vehicul Log
-DocType: Purchase Invoice,Recurring Id,Recurent Id
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Prezența febrei (temperatură&gt; 38,5 ° C sau temperatură susținută&gt; 38 ° C / 100,4 ° F)"
 DocType: Customer,Sales Team Details,Detalii de vânzări Echipa
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Șterge definitiv?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Șterge definitiv?
 DocType: Expense Claim,Total Claimed Amount,Total suma pretinsă
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potențiale oportunități de vânzare.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Invalid {0}
@@ -4542,7 +4630,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Magazine Departament
 ,Item Delivery Date,Data livrării articolului
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Setup Școala în ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Setup Școala în ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),De schimbare a bazei Suma (Companie Moneda)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Nici o intrare contabile pentru următoarele depozite
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Salvați documentul primul.
@@ -4554,13 +4642,12 @@
 DocType: Task,Is Milestone,Este Milestone
 DocType: Daily Work Summary,Email Sent To,Email trimis catre
 DocType: Budget,Warn,Avertiza
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Sunteți sigur că doriți să vă înregistrați?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Orice alte observații, efort remarcabil care ar trebui înregistrate."
 DocType: BOM,Manufacturing User,Producție de utilizare
 DocType: Purchase Invoice,Raw Materials Supplied,Materii prime furnizate
-DocType: Purchase Invoice,Recurring Print Format,Recurente Print Format
 DocType: C-Form,Series,Serii
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Moneda din lista de prețuri {0} trebuie să fie {1} sau {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Adăugați produse
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Moneda din lista de prețuri {0} trebuie să fie {1} sau {2}
 DocType: Appraisal,Appraisal Template,Model expertiză
 DocType: Item Group,Item Classification,Postul Clasificare
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Manager pentru Dezvoltarea Afacerilor
@@ -4575,7 +4662,7 @@
 DocType: Item Attribute Value,Attribute Value,Valoare Atribut
 ,Itemwise Recommended Reorder Level,Nivel de Reordonare Recomandat al Articolului-Awesome
 DocType: Salary Detail,Salary Detail,Detalii salariu
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Vă rugăm selectați 0} {întâi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Vă rugăm selectați 0} {întâi
 DocType: Appointment Type,Physician,Medic
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Lot {0} din {1} Postul a expirat.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,consultări
@@ -4586,7 +4673,7 @@
 DocType: Salary Detail,Default Amount,Implicit Suma
 DocType: Lab Test Template,Descriptive,Descriptiv
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Depozit nu a fost găsit în sistemul
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Rezumat această lună
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Rezumat această lună
 DocType: Quality Inspection Reading,Quality Inspection Reading,Inspecție de calitate Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,'Blochează stocuri mai vechi decât' ar trebui să fie mai mic de %d zile.
 DocType: Tax Rule,Purchase Tax Template,Achiziționa Format fiscală
@@ -4609,12 +4696,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Evenimente de instruire / rezultate
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Amortizarea ca pe acumulat
 DocType: Sales Invoice,C-Form Applicable,Formular-C aplicabil
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Funcționarea timp trebuie să fie mai mare decât 0 pentru funcționare {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Funcționarea timp trebuie să fie mai mare decât 0 pentru funcționare {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Warehouse este obligatorie
 DocType: Supplier,Address and Contacts,Adresa si contact
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detaliu UOM de conversie
 DocType: Program,Program Abbreviation,Abreviere de program
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Producția Comanda nu poate fi ridicată pe un șablon Postul
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Producția Comanda nu poate fi ridicată pe un șablon Postul
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Tarifele sunt actualizate în Primirea cumparare pentru fiecare articol
 DocType: Warranty Claim,Resolved By,Rezolvat prin
 DocType: Bank Guarantee,Start Date,Data începerii
@@ -4640,31 +4727,32 @@
 DocType: Employee,Educational Qualification,Detalii Calificare de Învățământ
 DocType: Workstation,Operating Costs,Costuri de operare
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Acțiune în cazul în care Acumulate Buget lunar depășit
-DocType: Purchase Invoice,Submit on creation,Publica cu privire la crearea
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Moneda pentru {0} trebuie să fie {1}
+DocType: Subscription,Submit on creation,Publica cu privire la crearea
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Moneda pentru {0} trebuie să fie {1}
 DocType: Asset,Disposal Date,eliminare Data
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-mailuri vor fi trimise tuturor angajaților activi ai companiei la ora dat, în cazul în care nu au vacanță. Rezumatul răspunsurilor vor fi trimise la miezul nopții."
 DocType: Employee Leave Approver,Employee Leave Approver,Aprobator Concediu Angajat
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Rând {0}: O intrare de Comandă există deja pentru acest depozit {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Nu se poate declara pierdut, pentru că Oferta a fost realizata."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Feedback formare
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Rând {0}: O intrare de Comandă există deja pentru acest depozit {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Nu se poate declara pierdut, pentru că Oferta a fost realizata."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Feedback formare
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Producția de Ordine {0} trebuie să fie prezentate
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Criteriile Scorecard pentru furnizori
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Vă rugăm să selectați data de început și Data de final pentru postul {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},"Desigur, este obligatorie în rândul {0}"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Până în prezent nu poate fi înainte de data
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc Doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Adăugați / editați preturi
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Adăugați / editați preturi
 DocType: Batch,Parent Batch,Lotul părinte
 DocType: Batch,Parent Batch,Lotul părinte
-DocType: Cheque Print Template,Cheque Print Template,Format Print cecului
+DocType: Cheque Print Template,Cheque Print Template,Format Imprimare Cec
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Grafic Centre de Cost
 DocType: Lab Test Template,Sample Collection,Colectie de mostre
 ,Requested Items To Be Ordered,Elemente solicitate să fie comandate
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Comenzile mele
 DocType: Price List,Price List Name,Lista de prețuri Nume
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Sumar zilnic de lucru pentru {0}
 DocType: Employee Loan,Totals,Totaluri
-DocType: BOM,Manufacturing,De fabricație
+DocType: BOM,Manufacturing,Producţie
 ,Ordered Items To Be Delivered,Comandat de elemente pentru a fi livrate
 DocType: Account,Income,Venit
 DocType: Industry Type,Industry Type,Industrie Tip
@@ -4679,12 +4767,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} unități de {1} necesare în {2} pe {3} {4} pentru {5} pentru a finaliza această tranzacție.
 DocType: Fee Schedule,Student Category,Categoria de student
 DocType: Announcement,Student,Student
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Unitate de organizare (departament) maestru.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Unitate de organizare (departament) maestru.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Mergeți la Camere
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Vă rugăm să introduceți mesajul înainte de trimitere
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,DUPLICATE PENTRU FURNIZOR
 DocType: Email Digest,Pending Quotations,în așteptare Cotațiile
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Punctul de vânzare profil
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Punctul de vânzare profil
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Configurații de testare la laborator.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Creditele negarantate
 DocType: Cost Center,Cost Center Name,Nume Centrul de Cost
@@ -4694,6 +4782,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Total plătit Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Mesaje mai mari de 160 de caractere vor fi împărțite în mai multe mesaje
 DocType: Purchase Receipt Item,Received and Accepted,Primite și acceptate
+DocType: Hub Settings,Company and Seller Profile,Profilul companiei și al vânzătorului
 ,GST Itemised Sales Register,Registrul de vânzări detaliat GST
 ,Serial No Service Contract Expiry,Serial Nu Service Contract de expirare
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,"Nu puteți credit și de debit același cont, în același timp,"
@@ -4703,10 +4792,11 @@
 DocType: Item,Variant Based On,Varianta Bazat pe
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Weightage total alocat este de 100%. Este {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Furnizorii dumneavoastră
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Corectați
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Nu se poate seta pierdut deoarece se intocmeste comandă de vânzări.
 DocType: Request for Quotation Item,Supplier Part No,Furnizor de piesa
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Nu se poate deduce atunci când este categoria de &quot;evaluare&quot; sau &quot;Vaulation și Total&quot;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Primit de la
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Primit de la
 DocType: Lead,Converted,Transformat
 DocType: Item,Has Serial No,Are nr. de serie
 DocType: Employee,Date of Issue,Data Problemei
@@ -4714,7 +4804,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","În conformitate cu Setările de cumpărare, dacă este necesară achiziția == &#39;YES&#39;, atunci pentru a crea factura de cumpărare, utilizatorul trebuie să creeze primul chitanță pentru elementul {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Row # {0}: Set Furnizor de produs {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Rândul {0}: Valoarea ore trebuie să fie mai mare decât zero.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Site-ul Image {0} atașat la postul {1} nu poate fi găsit
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Site-ul Image {0} atașat la postul {1} nu poate fi găsit
 DocType: Issue,Content Type,Tip Conținut
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computer
 DocType: Item,List this Item in multiple groups on the website.,Listeaza acest articol in grupuri multiple de pe site-ul.\
@@ -4725,14 +4815,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Ia nereconciliate Entries
 DocType: Payment Reconciliation,From Invoice Date,De la data facturii
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Nu aveți permisiunea de a trimite
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,"monedă de facturare trebuie să fie egală cu moneda sau contul de partid valută, fie implicit comapany lui"
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,"monedă de facturare trebuie să fie egală cu moneda sau contul de partid valută, fie implicit comapany lui"
 DocType: Healthcare Settings,Laboratory Settings,Setări de laborator
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Lasă încasări
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Ce face?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Pentru Warehouse
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Toate Admitere Student
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Ce face?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Pentru Warehouse
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Toate Admitere Student
 ,Average Commission Rate,Rată de comision medie
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,'Are numãr de serie' nu poate fi 'Da' pentru articolele care nu au stoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,'Are numãr de serie' nu poate fi 'Da' pentru articolele care nu au stoc
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Selectați Stare
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Prezenţa nu poate fi consemnată pentru date viitoare
 DocType: Pricing Rule,Pricing Rule Help,Regula de stabilire a prețurilor de ajutor
@@ -4750,41 +4840,41 @@
 DocType: Item,Customer Code,Cod client
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Memento dată naştere pentru {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Zile de la ultima comandă
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Debit la contul trebuie să fie un cont de bilanț
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Debit la contul trebuie să fie un cont de bilanț
 DocType: Buying Settings,Naming Series,Naming Series
 DocType: Leave Block List,Leave Block List Name,Denumire Lista Concedii Blocate
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Asigurare Data de pornire ar trebui să fie mai mică de asigurare Data terminării
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Vă rugăm să configurați Sistemul de denumire a instructorilor în școală&gt; Setări școlare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Active stoc
 DocType: Timesheet,Production Detail,Detaliu de producție
+DocType: Restaurant,Active Menu,Meniul activ
 DocType: Target Detail,Target Qty,Țintă Cantitate
 DocType: Shopping Cart Settings,Checkout Settings,setările checkout pentru
 DocType: Attendance,Present,Prezenta
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Nota de Livrare {0} nu trebuie sa fie introdusa
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Nota de Livrare {0} nu trebuie sa fie introdusa
 DocType: Notification Control,Sales Invoice Message,Factură de vânzări Mesaj
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Contul {0} de închidere trebuie să fie de tip răspunderii / capitaluri proprii
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Salariu de alunecare angajat al {0} deja creat pentru foaie de timp {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Salariu de alunecare angajat al {0} deja creat pentru foaie de timp {1}
 DocType: Vehicle Log,Odometer,Contorul de kilometraj
 DocType: Sales Order Item,Ordered Qty,Ordonat Cantitate
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Postul {0} este dezactivat
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Postul {0} este dezactivat
 DocType: Stock Settings,Stock Frozen Upto,Stoc Frozen Până la
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM nu conține nici un element de stoc
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Activitatea de proiect / sarcină.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM nu conține nici un element de stoc
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Activitatea de proiect / sarcină.
 DocType: Vehicle Log,Refuelling Details,Detalii de realimentare
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generează fluturașe de salariu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Destinat Cumpărării trebuie să fie bifat, dacă Se Aplica Pentru este selectat ca şi {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Reducerea trebuie să fie mai mică de 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Rata Ultima achiziție nu a fost găsit
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Scrie Off Suma (Compania de valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Ore de facturare
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,BOM implicit pentru {0} nu a fost găsit
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Row # {0}: Va rugam sa seta cantitatea reordona
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM implicit pentru {0} nu a fost găsit
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Row # {0}: Va rugam sa seta cantitatea reordona
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Atingeți elementele pentru a le adăuga aici
 DocType: Fees,Program Enrollment,programul de înscriere
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher Cost Landed
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Vă rugăm să setați {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Repetați în ziua de Luna
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} este student inactiv
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} este student inactiv
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} este student inactiv
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} este student inactiv
 DocType: Employee,Health Details,Detalii Sănătate
 DocType: Offer Letter,Offer Letter Terms,Oferta Scrisoare Termeni
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Pentru a crea un document de referință privind solicitarea de plată este necesar
@@ -4793,7 +4883,6 @@
 DocType: Employee External Work History,Salary,Salariu
 DocType: Serial No,Delivery Document Type,Tipul documentului de Livrare
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Să prezinte toate fișele de salariu pentru criteriile selectate de mai sus
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} articole sincronizate
 DocType: Sales Order,Partly Delivered,Parțial livrate
 DocType: Email Digest,Receivables,Creanțe
 DocType: Lead Source,Lead Source,Sursa de plumb
@@ -4815,9 +4904,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Clasă de uzură 2
 DocType: SG Creation Tool Course,Max Strength,Putere max
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM înlocuit
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Selectați elementele bazate pe data livrării
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Selectați elementele bazate pe data livrării
 ,Sales Analytics,Analitice de vânzare
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Disponibile {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Disponibile {0}
 ,Prospects Engaged But Not Converted,Perspective implicate dar nu convertite
 ,Prospects Engaged But Not Converted,Perspective implicate dar nu convertite
 DocType: Manufacturing Settings,Manufacturing Settings,Setări de fabricație
@@ -4825,10 +4914,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 mobil nr
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Va rugam sa introduceti moneda implicit în Compania de Master
 DocType: Stock Entry Detail,Stock Entry Detail,Stoc de intrare Detaliu
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Memento de zi cu zi
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Memento de zi cu zi
 DocType: Products Settings,Home Page is Products,Pagina este Produse
 ,Asset Depreciation Ledger,Amortizarea activelor Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Conflicte normă fiscală cu {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Conflicte normă fiscală cu {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nume nou cont
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Costul materiilor prime livrate
 DocType: Selling Settings,Settings for Selling Module,Setări pentru vânzare Modulul
@@ -4842,8 +4931,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Articolul {0} trebuie să fie un Articol de Stoc
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Implicit Lucrări în depozit Progress
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Setări implicite pentru tranzacțiile de contabilitate.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configurați sistemul de numire a angajaților în Resurse umane&gt; Setări HR
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Data Preconizata nu poate fi anterioara Datei Cererii de Materiale
+DocType: Restaurant,Default Tax Template,Implicit Template fiscal
 DocType: Fees,Student Details,Detalii studențești
 DocType: Purchase Invoice Item,Stock Qty,Cota stocului
 DocType: Purchase Invoice Item,Stock Qty,Cota stocului
@@ -4862,8 +4952,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Accesați articolele
 DocType: Sales Partner,Partner Type,Tip partener
 DocType: Purchase Taxes and Charges,Actual,Efectiv
+DocType: Restaurant Menu,Restaurant Manager,Manager de restaurant
 DocType: Authorization Rule,Customerwise Discount,Reducere Client
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Timesheet pentru sarcini.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Timesheet pentru sarcini.
 DocType: Purchase Invoice,Against Expense Account,Comparativ contului de cheltuieli
 DocType: Production Order,Production Order,Număr Comandă Producţie:
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Instalarea Nota {0} a fost deja prezentat
@@ -4871,7 +4962,6 @@
 DocType: Quotation Item,Against Docname,Comparativ denumirii documentului
 DocType: SMS Center,All Employee (Active),Toți angajații (activi)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Vizualizează acum
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Selectați perioada în care factura va fi generat automat
 DocType: BOM,Raw Material Cost,Materie primă Cost
 DocType: Item Reorder,Re-Order Level,Nivelul de re-comandă
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Introduceti articole și cant planificată pentru care doriți să intocmiti ordine de producție sau sa descărcati materii prime pentru analiză.
@@ -4884,23 +4974,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Tip de raport este obligatorie
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Depozit este obligatorie pentru stocul de postul {0} în rândul {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Adăugați programe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Wholesale
 DocType: Issue,First Responded On,Primul Răspuns la
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Crucea Listarea de punctul în mai multe grupuri
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Data începerii anului fiscal și se termină anul fiscal la data sunt deja stabilite în anul fiscal {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Clearance-ul Data actualizat
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Lot
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split Lot
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Împăcați cu succes
 DocType: Request for Quotation Supplier,Download PDF,descarcă PDF
 DocType: Production Order,Planned End Date,Planificate Data de încheiere
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Introduceți Data planificării
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,În cazul în care elementele sunt stocate.
 DocType: Request for Quotation,Supplier Detail,Detalii furnizor
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Eroare în formulă sau o condiție: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Eroare în formulă sau o condiție: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Suma facturată
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Criteriile de greutate trebuie să adauge până la 100%
 DocType: Attendance,Attendance,Prezență
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,stoc
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,stoc
 DocType: BOM,Materials,Materiale
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","In cazul in care este debifat, lista va trebui să fie adăugata fiecarui Departament unde trebuie sa fie aplicată."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Sursa si Target Warehouse nu poate fi aceeași
@@ -4918,12 +5008,13 @@
 DocType: Purchase Taxes and Charges,On Net Total,Pe net total
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Valoare pentru atributul {0} trebuie să fie în intervalul de {1} la {2} în trepte de {3} pentru postul {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Depozit țintă în rândul {0} trebuie să fie același ca și de producție de comandă
+DocType: Restaurant Reservation,Waitlisted,waitlisted
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Moneda nu poate fi schimbat după efectuarea înregistrări folosind un altă valută
 DocType: Vehicle Service,Clutch Plate,Placă de ambreiaj
 DocType: Company,Round Off Account,Rotunji cont
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Cheltuieli administrative
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consilia
-DocType: Customer Group,Parent Customer Group,Părinte Client Group
+DocType: Customer Group,Parent Customer Group,Părinte Grup Clienți
 DocType: Journal Entry,Subscription,Abonament
 DocType: Purchase Invoice,Contact Email,Email Persoana de Contact
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Crearea taxelor în așteptare
@@ -4934,7 +5025,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nume nou Agent de vânzări
 DocType: Packing Slip,Gross Weight UOM,Greutate Brută UOM
 DocType: Delivery Note Item,Against Sales Invoice,Comparativ facturii de vânzări
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Introduceți numere de serie pentru articolul serializat
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Introduceți numere de serie pentru articolul serializat
 DocType: Bin,Reserved Qty for Production,Rezervat Cantitate pentru producție
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Lăsați necontrolabil dacă nu doriți să luați în considerare lotul în timp ce faceți grupuri bazate pe curs.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Lăsați necontrolabil dacă nu doriți să luați în considerare lotul în timp ce faceți grupuri bazate pe curs.
@@ -4946,7 +5037,7 @@
 DocType: Lab Test,Test Group,Grupul de testare
 DocType: Payment Reconciliation,Receivable / Payable Account,De încasat de cont / de plătit
 DocType: Delivery Note Item,Against Sales Order Item,Comparativ articolului comenzii de vânzări
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Vă rugăm să specificați Atribut Valoare pentru atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Vă rugăm să specificați Atribut Valoare pentru atribut {0}
 DocType: Item,Default Warehouse,Depozit Implicit
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Buget nu pot fi atribuite în Grupa Contul {0}
 DocType: Healthcare Settings,Patient Registration,Inregistrarea pacientului
@@ -4976,6 +5067,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Persoana de vânzări
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Buget și centru de cost
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Modul implicit de plată multiple nu este permis
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,pentru
 ,Appointment Analytics,Analiza programării
 DocType: Vehicle Service,Half Yearly,Semestrial
 DocType: Lead,Blog Subscriber,Abonat blog
@@ -4994,7 +5086,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Contele de numere
 ,BOM Stock Report,BOM Raport stoc
 DocType: Stock Reconciliation Item,Quantity Difference,cantitate diferenţă
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Prelucrare de salarizare
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Prelucrare de salarizare
 DocType: Opportunity Item,Basic Rate,Rată elementară
 DocType: GL Entry,Credit Amount,Suma de credit
 DocType: Cheque Print Template,Signatory Position,Poziție semnatar
@@ -5008,12 +5100,12 @@
 DocType: Tax Rule,Tax Rule,Regula de impozitare
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Menține Aceeași Rată in Cursul Ciclului de Vânzări
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planificați busteni de timp în afara orelor de lucru de lucru.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Clienții din Coadă
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Doctorul {0} nu are program de medic. Adăugați-l la medicul comandant
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Clienții din Coadă
 DocType: Student,Nationality,Naţionalitate
 ,Items To Be Requested,Articole care vor fi solicitate
-DocType: Purchase Order,Get Last Purchase Rate,Obtine Ultima Rate de Cumparare
-DocType: Company,Company Info,Informatii Companie
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Selectați sau adăugați client nou
+DocType: Company,Company Info,Informaţii Companie
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Selectați sau adăugați client nou
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,centru de cost este necesar pentru a rezerva o cerere de cheltuieli
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicţie a fondurilor (active)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Aceasta se bazează pe prezența a acestui angajat
@@ -5021,6 +5113,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Contul debit
 DocType: Fiscal Year,Year Start Date,An Data începerii
 DocType: Attendance,Employee Name,Nume angajat
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Articol de intrare pentru comandă pentru restaurant
 DocType: Sales Invoice,Rounded Total (Company Currency),Rotunjite total (Compania de valuta)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Nu se poate sub acoperire la Grupul pentru că este selectată Tip cont.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} a fost modificat. Vă rugăm să reîmprospătați.
@@ -5031,6 +5124,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Beneficiile angajatului
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Cantitate ambalate trebuie să fie egală cantitate pentru postul {0} în rândul {1}
 DocType: Production Order,Manufactured Qty,Produs Cantitate
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Factura creată
 DocType: Purchase Receipt Item,Accepted Quantity,Cantitatea Acceptata
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Vă rugăm să setați o valoare implicită Lista de vacanță pentru angajat {0} sau companie {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} nu există
@@ -5040,18 +5134,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rândul nr {0}: Suma nu poate fi mai mare decât așteptarea Suma împotriva revendicării cheltuieli {1}. În așteptarea Suma este {2}
 DocType: Maintenance Schedule,Schedule,Program
 DocType: Account,Parent Account,Contul părinte
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Disponibil
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Disponibil
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Butuc
 DocType: GL Entry,Voucher Type,Tip Voucher
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Lista de preturi nu a fost găsit sau cu handicap
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Lista de preturi nu a fost găsit sau cu handicap
 DocType: Lab Test,Approved,Aprobat
 DocType: Pricing Rule,Price,Preț
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',Angajat eliberat din finctie pe {0} trebuie să fie setat ca 'Plecat'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Angajat eliberat din finctie pe {0} trebuie să fie setat ca 'Plecat'
+DocType: Hub Settings,Last Sync On,Ultima sincronizare activată
 DocType: Guardian,Guardian,gardian
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Expertiza {0} creată pentru angajatul {1} în intervalul de timp dat
 DocType: Employee,Education,Educație
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,del
 DocType: Selling Settings,Campaign Naming By,Campanie denumita de
 DocType: Employee,Current Address Is,Adresa Actuală Este
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Vânzări lunare (
@@ -5066,7 +5161,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Codul cursului:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Va rugam sa introduceti cont de cheltuieli
 DocType: Account,Stock,Stoc
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rând # {0}: Tip document de referință trebuie să fie unul dintre comandă cumparare, factură sau Jurnal de intrare"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rând # {0}: Tip document de referință trebuie să fie unul dintre comandă cumparare, factură sau Jurnal de intrare"
 DocType: Employee,Current Address,Adresa actuală
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Dacă elementul este o variantă de un alt element atunci descriere, imagine, de stabilire a prețurilor, impozite etc vor fi stabilite de șablon dacă nu se specifică în mod explicit"
 DocType: Serial No,Purchase / Manufacture Details,Detalii de cumpărare / Fabricarea
@@ -5097,7 +5192,7 @@
 DocType: Hub Settings,Hub Settings,Setări Hub
 DocType: Project,Gross Margin %,Marja Bruta%
 DocType: BOM,With Operations,Cu Operațiuni
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Înregistrări contabile au fost deja efectuate în valută {0} pentru compania {1}. Vă rugăm să selectați un cont de primit sau de plătit cu moneda {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Înregistrări contabile au fost deja efectuate în valută {0} pentru compania {1}. Vă rugăm să selectați un cont de primit sau de plătit cu moneda {0}.
 DocType: Asset,Is Existing Asset,Este activ existent
 DocType: Salary Detail,Statistical Component,Componenta statistică
 DocType: Salary Detail,Statistical Component,Componenta statistică
@@ -5106,13 +5201,14 @@
 DocType: BOM Operation,BOM Operation,Operațiune BOM
 DocType: Purchase Taxes and Charges,On Previous Row Amount,La rândul precedent Suma
 DocType: Student,Home Address,Adresa de acasa
+DocType: Item,Has Expiry Date,Are data de expirare
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Setări pentru variantele de articol.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,activ de transfer
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,activ de transfer
 DocType: POS Profile,POS Profile,POS Profil
 DocType: Training Event,Event Name,Numele evenimentului
 DocType: Physician,Phone (Office),Telefon (Office)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,Admitere
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Admitere pentru {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,Admitere
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Admitere pentru {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Sezonalitatea pentru stabilirea bugetelor, obiective etc."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Numele variabil
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Postul {0} este un șablon, vă rugăm să selectați unul dintre variantele sale"
@@ -5121,7 +5217,7 @@
 DocType: Assessment Plan,Room,Cameră
 DocType: Purchase Order,Advance Paid,Avans plătit
 DocType: Item,Item Tax,Taxa Articol
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Material de Furnizor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Material de Furnizor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Accize factură
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% apare mai mult decât o dată
 DocType: Expense Claim,Employees Email Id,Id Email Angajat
@@ -5132,32 +5228,30 @@
 DocType: Program,Program Name,Numele programului
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considerare Taxa sau Cost pentru
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Cantitatea efectivă este obligatorie
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} are în prezent o {1} Scorecard pentru furnizori, iar comenzile de achiziție pentru acest furnizor ar trebui emise cu prudență."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} are în prezent o {1} Scorecard pentru furnizori, iar comenzile de achiziție pentru acest furnizor ar trebui emise cu prudență."
 DocType: Employee Loan,Loan Type,Tip credit
 DocType: Scheduling Tool,Scheduling Tool,Instrumentul de programare
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Card de Credit
 DocType: BOM,Item to be manufactured or repacked,Articol care urmează să fie fabricat sau reambalat
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Setări implicite pentru tranzacțiile bursiere.
-DocType: Purchase Invoice,Next Date,Data viitoare
 DocType: Employee Education,Major/Optional Subjects,Subiecte Majore / Opționale
 DocType: Sales Invoice Item,Drop Ship,Drop navelor
+DocType: Hub Settings,Suspended,Suspendat
 DocType: Training Event,Attendees,Printre participanți
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aici puteți stoca detalii despre familie, cum ar fi numele și ocupația parintelui, sotului/sotiei și copiilor"
 DocType: Academic Term,Term End Date,Termenul Data de încheiere
-DocType: Hub Settings,Seller Name,Nume vânzător
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impozite și taxe deduse (Compania de valuta)
 DocType: Item Group,General Settings,Setări generale
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Din Valuta și In Valuta nu pot fi identice
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Adăugați instructori
 DocType: Stock Entry,Repack,Reambalați
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Trebuie să salvați formularul înainte de a începe
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Selectați mai întâi Compania
 DocType: Item Attribute,Numeric Values,Valori numerice
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Atașați logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Niveluri stoc
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Niveluri stoc
 DocType: Customer,Commission Rate,Rata de Comision
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,A creat {0} cărți de scor pentru {1} între:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Face Varianta
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Face Varianta
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blocaţi cereri de concediu pe departamente.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Tipul de plată trebuie să fie unul dintre Primire, Pay și de transfer intern"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Google Analytics
@@ -5172,11 +5266,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Capital Stock
 DocType: Shopping Cart Settings,Show Public Attachments,Afișați atașamentele publice
 DocType: Packing Slip,Package Weight Details,Pachetul Greutate Detalii
+DocType: Restaurant Reservation,Reservation Time,Timp de rezervare
 DocType: Payment Gateway Account,Payment Gateway Account,Plata cont Gateway
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,După finalizarea plății de redirecționare utilizator la pagina selectată.
 DocType: Company,Existing Company,companie existentă
 DocType: Healthcare Settings,Result Emailed,Rezultatul a fost trimis prin e-mail
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",Categoria de taxe a fost modificată la &quot;Total&quot; deoarece toate elementele nu sunt elemente stoc
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Codul elementului&gt; Element Grup&gt; Brand
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Vă rugăm să selectați un fișier csv
 DocType: Student Leave Application,Mark as Present,Marcați ca prezent
 DocType: Supplier Scorecard,Indicator Color,Indicator Culoare
@@ -5201,16 +5297,16 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Asigurați-Lot Student
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Este Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Obține articole din FDM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Obține articole din FDM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Timpul in Zile Conducere
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rând # {0}: Detașarea Data trebuie să fie aceeași ca dată de achiziție {1} din activ {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Verificați dacă studentul este rezident la Hostelul Institutului.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Vă rugăm să introduceți comenzile de vânzări în tabelul de mai sus
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Vă rugăm să introduceți comenzile de vânzări în tabelul de mai sus
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Netrimisă salariale Alunecările
 ,Stock Summary,Rezumat de stoc
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Se transferă un activ de la un depozit la altul
 DocType: Vehicle,Petrol,Benzină
-apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Proiect de lege de materiale
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Reţete de Producţie
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Partidul Tipul și Partidul este necesar pentru creanțe / cont plateste {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Motiv pentru Lăsând
@@ -5221,5 +5317,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Rând {0}: debit de intrare nu poate fi legat de o {1}
 DocType: Journal Entry,Subscription Section,Secțiunea de abonamente
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Contul {0} nu există
+DocType: Training Event,Training Program,Program de antrenament
 DocType: Account,Cash,Numerar
 DocType: Employee,Short biography for website and other publications.,Scurta biografie pentru site-ul web și alte publicații.
diff --git a/erpnext/translations/ru.csv b/erpnext/translations/ru.csv
index 7ef4b40..0ac06a0 100644
--- a/erpnext/translations/ru.csv
+++ b/erpnext/translations/ru.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Режим Зарплата
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,регистр
 DocType: Patient,Divorced,Разведенный
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Продукты уже синхронизированы
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Разрешить добавлять продукт несколько раз в сделке
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Отменить Материал Визит {0} до отмены этой претензии по гарантийным обязательствам
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Потребительские товары
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Оставьте Утверждающие
 DocType: Sales Partner,Dealer,Дилер
 DocType: Consultation,Investigations,исследования
+DocType: Restaurant Order Entry,Click Enter To Add,Нажмите «Ввод для добавления».
 DocType: Employee,Rented,Арендованный
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Применимо для пользователя
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Остановился производственного заказа не может быть отменено, откупоривать сначала отменить"
 DocType: Vehicle Service,Mileage,пробег
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Вы действительно хотите отказаться от этого актива?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Вы действительно хотите отказаться от этого актива?
 DocType: Drug Prescription,Update Schedule,Расписание обновлений
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Выберите По умолчанию Поставщик
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Валюта необходима для Прейскурантом {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Проверить наличие свободных мест
 DocType: Job Applicant,Job Applicant,Соискатель работы
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Это основано на операциях против этого поставщика. См график ниже для получения подробной информации
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Нет больше результатов.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Легальный
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Фактический тип налога не может быть включён в стоимость продукта в строке {0}
 DocType: Bank Guarantee,Customer,Клиент
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),"Курс должен быть таким же, как {0} {1} ({2})"
 DocType: Sales Invoice,Customer Name,Наименование заказчика
 DocType: Vehicle,Natural Gas,Природный газ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Банковский счет не может быть назван {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Банковский счет не может быть назван {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (или группы), против которого бухгалтерских проводок производится и остатки сохраняются."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Выдающийся для {0} не может быть меньше нуля ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Для обработки не поступает заявка на зарплату.
 DocType: Manufacturing Settings,Default 10 mins,По умолчанию 10 минут
 DocType: Leave Type,Leave Type Name,Оставьте Тип Название
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Показать открыт
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Сегодня необходимо принять это действие для вышеупомянутого повторяющегося
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Серия Обновлено Успешно
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,"Проверять, выписываться"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural Запись в журнале Опубликовано
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,"Покупка Заказ позиции, которые будут получены"
 DocType: SMS Center,All Supplier Contact,Все контакты поставщиков
 DocType: Support Settings,Support Settings,Настройки поддержки
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,"Ожидаемая Дата окончания не может быть меньше, чем ожидалось Дата начала"
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,"Ожидаемая Дата окончания не может быть меньше, чем ожидалось Дата начала"
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Ряд # {0}: цена должна быть такой же, как {1}: {2} ({3} / {4})"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Новый Оставить заявку
 ,Batch Item Expiry Status,Статус срока годности партии продукта
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Банковский счет
 DocType: Mode of Payment Account,Mode of Payment Account,Форма оплаты счета
 DocType: Consultation,Consultation,Консультация
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Продажи и возврат
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Показать варианты
 DocType: Academic Term,Academic Term,Семестр
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,материал
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Здравоохранение
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Задержка в оплате (дни)
 DocType: Lab Prescription,Lab Prescription,Лабораторный рецепт
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Сортировать по цене
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Услуги Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Серийный номер: {0} уже указан в счете продаж: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Счет
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Серийный номер: {0} уже указан в счете продаж: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Счет
 DocType: Maintenance Schedule Item,Periodicity,Периодичность
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Финансовый год {0} требуется
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Оборона
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Ряд # {0}:
 DocType: Timesheet,Total Costing Amount,Общая сумма Стоимостью
 DocType: Delivery Note,Vehicle No,Автомобиль №
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,"Пожалуйста, выберите прайс-лист"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,"Пожалуйста, выберите прайс-лист"
 DocType: Accounts Settings,Currency Exchange Settings,Настройки обмена валюты
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Строка # {0}: Платежный документ требуется для завершения операций Устанавливаются
 DocType: Production Order Operation,Work In Progress,Работа продолжается
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,"Пожалуйста, выберите даты"
 DocType: Employee,Holiday List,Список праздников
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,"Пожалуйста, настройте систему именования инструкторов в школе&gt; Настройки школы"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Бухгалтер
+DocType: Hub Settings,Selling Price List,Продажа прайс-листа
 DocType: Patient,Tobacco Current Use,Текущее потребление табака
 DocType: Cost Center,Stock User,Пользователь склада
 DocType: Company,Phone No,Номер телефона
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Расписание курсов создано:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Новый {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Новый {0}: # {1}
 ,Sales Partners Commission,Комиссионные Партнеров по продажам
 DocType: Purchase Invoice,Rounding Adjustment,Коррекция округления
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Аббревиатура не может иметь более 5 символов
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Родитель Деталь DOCNAME
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Ссылка: {0}, Код товара: {1} и Заказчик: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,кг
-DocType: Student Log,Log,Журнал
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Открытие на работу.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Результат отправлен
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Результат отправлен
 DocType: Item Attribute,Increment,Приращение
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Промежуток времени
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Выберите Склад ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Замужем
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Не допускается для {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Получить продукты от
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Продукт {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Нет списка продуктов
 DocType: Payment Reconciliation,Reconcile,Согласовать
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пенсионные фонды
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Следующая амортизация Дата не может быть перед покупкой Даты
 DocType: Consultation,Consultation Date,Дата консультации
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Список продуктов и открытие для пользователей ERPNext
 DocType: SMS Center,All Sales Person,Все менеджеры по продажам
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,«Распределение по месяцам» позволяет распределить бюджет/цель по месяцам при наличии сезонности в вашем бизнесе.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Не нашли товар
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Структура заработной платы Отсутствующий
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Не нашли товар
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Структура заработной платы Отсутствующий
 DocType: Lead,Person Name,Имя лица
 DocType: Sales Invoice Item,Sales Invoice Item,Счет продаж товара
 DocType: Account,Credit,Кредит
 DocType: POS Profile,Write Off Cost Center,Списание МВЗ
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""","например, &quot;Начальная школа&quot; или &quot;Университет&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""","например, &quot;Начальная школа&quot; или &quot;Университет&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Отчеты по Запасам
 DocType: Warehouse,Warehouse Detail,Подробности склада
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Кредитный лимит был перейден для клиента {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Срок Дата окончания не может быть позднее, чем за год Дата окончания учебного года, к которому этот термин связан (учебный год {}). Пожалуйста, исправьте дату и попробуйте еще раз."
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","Нельзя отменить выбор ""Является основным средством"", поскольку по данному пункту имеется запись по активам"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","Нельзя отменить выбор ""Является основным средством"", поскольку по данному пункту имеется запись по активам"
 DocType: Vehicle Service,Brake Oil,Тормозные масла
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Группа клиентов&gt; Территория
 DocType: Tax Rule,Tax Type,Налоги Тип
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Налогооблагаемая сумма
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},"Вы не авторизованы, чтобы добавлять или обновлять записи ранее {0}"
 DocType: BOM,Item Image (if not slideshow),Изображение продукта (не для слайд-шоу)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Существует клиентов с одноименным названием
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(часовая ставка ÷ 60) × фактическое время работы
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Строка # {0}: Тип ссылочного документа должен быть одним из заголовка расхода или записи журнала
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Выберите BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Строка # {0}: Тип ссылочного документа должен быть одним из заголовка расхода или записи журнала
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Выберите BOM
 DocType: SMS Log,SMS Log,СМС-журнал
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Стоимость доставленных изделий
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Праздник на {0} не между From Date и To Date
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,Сотрудник займа
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Журнал активности:
 DocType: Fee Schedule,Send Payment Request Email,Отправить адрес электронной почты
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,"Пункт {0} не существует в системе, или истек"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,"Пункт {0} не существует в системе, или истек"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Недвижимость
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Выписка по счету
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Фармацевтика
@@ -210,18 +213,23 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Лог импорта
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Потянуть Материал запроса типа Производство на основе вышеуказанных критериев
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Успешно незарегистрированный.
 DocType: Training Result Employee,Grade,класс
+DocType: Restaurant Table,No of Seats,Количество мест
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Чтобы добавить динамический объект, используйте теги jinja, например <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Поставленные Поставщиком
 DocType: SMS Center,All Contact,Все Связаться
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Производственный заказ уже создан для всех продуктов с ВМ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Производственный заказ уже создан для всех продуктов с ВМ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Годовой оклад
 DocType: Daily Work Summary,Daily Work Summary,Ежедневно Резюме Работа
 DocType: Period Closing Voucher,Closing Fiscal Year,Закрытие финансового года
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} заморожен
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,"Пожалуйста, выберите существующую компанию для создания плана счетов"
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} заморожен
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,"Пожалуйста, выберите существующую компанию для создания плана счетов"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Расходы по Запасам
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Выберите целевое хранилище
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Выберите целевое хранилище
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Выберите целевое хранилище
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Выберите целевое хранилище
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Пожалуйста, введите Preferred Контакт E-mail"
 DocType: Program Enrollment,School Bus,Школьный автобус
 DocType: Journal Entry,Contra Entry,Contra запись
@@ -239,9 +247,10 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Скачать шаблон, заполнить соответствующие данные и приложить измененный файл.
  Все даты и сотрудник сочетание в выбранный период придет в шаблоне, с существующими посещаемости"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Пункт {0} не является активным или конец жизни был достигнут
+DocType: Student Admission Program,Minimum Age,Минимальный возраст
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Пример: Математика
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item, налоги в строках должны быть также включены {1}"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Настройки для модуля HR
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Настройки для модуля HR
 DocType: SMS Center,SMS Center,СМС-центр
 DocType: Sales Invoice,Change Amount,Изменение Сумма
 DocType: BOM Update Tool,New BOM,Новая ВМ
@@ -251,7 +260,7 @@
 DocType: Lead,Request Type,Тип запроса
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Сделать Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Вещание
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Добавить комнаты
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Режим настройки POS (Online / Offline)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Реализация
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Информация о выполненных операциях.
 DocType: Serial No,Maintenance Status,Техническое обслуживание Статус
@@ -274,6 +283,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Прайс-лист должен быть применим для покупки или продажи
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Дата установки не может быть до даты доставки для Пункт {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Скидка на Прайс-лист ставка (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,биохимия
 DocType: Offer Letter,Select Terms and Conditions,Выберите Сроки и условия
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,аута
 DocType: Production Planning Tool,Sales Orders,Заказы клиентов
@@ -308,15 +318,15 @@
 DocType: Sales Partner,Reseller,Торговый посредник
 DocType: Codification Table,Medical Code,Медицинский кодекс
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Если флажок установлен, в запрос на материалы будут добавлены нескладируемые продукты"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,"Пожалуйста, введите название Компании"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,"Пожалуйста, введите название Компании"
 DocType: Delivery Note Item,Against Sales Invoice Item,На накладная Пункт
 ,Production Orders in Progress,Производственные заказы в Прогресс
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Чистые денежные средства от финансовой деятельности
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage полон, не спасло"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage полон, не спасло"
 DocType: Lead,Address & Contact,Адрес и контакт
 DocType: Leave Allocation,Add unused leaves from previous allocations,Добавить неиспользованные отпуска с прошлых периодов
 DocType: Sales Partner,Partner website,сайт партнера
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Добавить продукт
+DocType: Restaurant Order Entry,Add Item,Добавить продукт
 DocType: Lab Test,Custom Result,Пользовательский результат
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Имя Контакта
 DocType: Course Assessment Criteria,Course Assessment Criteria,Критерии оценки курса
@@ -329,7 +339,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Запрос на покупку.
 DocType: Lab Test,Submitted Date,Дата отправки
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,"Это основано на табелей учета рабочего времени, созданных против этого проекта"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,"Net Pay не может быть меньше, чем 0"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,"Net Pay не может быть меньше, чем 0"
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Чтобы остановить отправку повторяющихся уведомлений об ошибках из системы, мы отметили поле «Отключено» в подписке"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Только выбранный Согласующий отпуска может провести это Заявление на отпуск
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Освобождение Дата должна быть больше даты присоединения
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Листья в год
@@ -338,9 +349,10 @@
 DocType: Email Digest,Profit & Loss,Потеря прибыли
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Литр
 DocType: Task,Total Costing Amount (via Time Sheet),Общая калькуляция Сумма (с помощью Time Sheet)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,"Пожалуйста, настройте учащихся по студенческим группам"
 DocType: Item Website Specification,Item Website Specification,Описание продукта для сайта
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Оставьте Заблокированные
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Банковские записи
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,За год
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Товар с Сверки Запасов
@@ -349,7 +361,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Курс Студенческая группа Инструмент создания
 DocType: Lead,Do Not Contact,Не обращайтесь
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,"Люди, которые преподают в вашей организации"
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Уникальный идентификатор для отслеживания все повторяющиеся счетов-фактур. Он создается на представить.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Разработчик Программного обеспечения
 DocType: Item,Minimum Order Qty,Минимальное количество заказа
 DocType: Pricing Rule,Supplier Type,Тип поставщика
@@ -359,17 +370,19 @@
 DocType: Item,Publish in Hub,Опубликовать в Hub
 DocType: Student Admission,Student Admission,приёму студентов
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Пункт {0} отменяется
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Заказ материалов
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Пункт {0} отменяется
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Заказ материалов
 DocType: Bank Reconciliation,Update Clearance Date,Обновление просвет Дата
 DocType: Item,Purchase Details,Покупка Подробности
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Пункт {0} не найден в &quot;давальческое сырье&quot; таблицы в Заказе {1}
 DocType: Patient Relation,Relation,Отношение
 DocType: Shipping Rule,Worldwide Shipping,Доставка по всему миру
 DocType: Patient Relation,Mother,Мама
+DocType: Restaurant Reservation,Reservation End Time,Время окончания бронирования
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Подтвержденные заказы от клиентов.
 DocType: Purchase Receipt Item,Rejected Quantity,Отклонен Количество
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Запрос платежа {0} создан
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Запрос платежа {0} создан
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Низкая чувствительность
 DocType: Notification Control,Notification Control,Контроль Уведомлений
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,"Пожалуйста, подтвердите, как только вы закончили обучение"
 DocType: Lead,Suggestions,Предложения
@@ -389,7 +402,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,"Электронные письма зарплаты скольжения сотруднику на основе предпочтительного электронной почты, выбранного в Employee"
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Оставить утверждающий в списке будет установлен по умолчанию Оставить утверждающего
 DocType: Tax Rule,Shipping County,графство Доставка
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Обучение
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Обучение
 DocType: Asset,Next Depreciation Date,Следующий Износ Дата
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Деятельность Стоимость одного работника
 DocType: Accounts Settings,Settings for Accounts,Настройки для счетов
@@ -400,13 +413,13 @@
 DocType: Item,Synced With Hub,Синхронизированные со ступицей
 DocType: Vehicle,Fleet Manager,Менеджер автопарка
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Строка # {0}: {1} не может быть отрицательным по пункту {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Неправильный Пароль
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Неправильный Пароль
 DocType: Item,Variant Of,Вариант
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"Завершен Кол-во не может быть больше, чем ""Кол-во для изготовления"""
 DocType: Period Closing Voucher,Closing Account Head,Закрытие счета руководитель
 DocType: Employee,External Work History,Внешний Работа История
 DocType: Physician,Time per Appointment,Время на встречу
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Циклическая ссылка Ошибка
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Циклическая ссылка Ошибка
 DocType: Appointment Type,Is Inpatient,Является стационарным
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Имя Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,В Слов (Экспорт) будут видны только вы сохраните накладной.
@@ -415,19 +428,18 @@
 DocType: Lead,Industry,Индустрия
 DocType: Employee,Job Profile,Профиль работы
 DocType: BOM Item,Rate & Amount,Стоимость и сумма
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Пожалуйста, установите серию нумерации для участия через Setup&gt; Numbering Series"
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Это основано на сделках с этой Компанией. См. Ниже подробное описание
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Сообщите по электронной почте по созданию автоматической запрос материалов
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,резистентный
 DocType: Journal Entry,Multi Currency,Мультивалютность
 DocType: Payment Reconciliation Invoice,Invoice Type,Тип счета
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Группа клиентов&gt; Территория
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Документы  Отгрузки
 DocType: Consultation,Encounter Impression,Впечатление от Encounter
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Настройка Налоги
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Себестоимость проданных активов
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,"Оплата запись была изменена после того, как вытащил его. Пожалуйста, вытащить его снова."
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} введен дважды в налог продукта
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Резюме на этой неделе и в ожидании деятельности
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} введен дважды в налог продукта
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Резюме на этой неделе и в ожидании деятельности
 DocType: Student Applicant,Admitted,Признался
 DocType: Workstation,Rent Cost,Стоимость аренды
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Сумма после амортизации
@@ -442,36 +454,35 @@
 DocType: Shipping Rule,Valid for Countries,Действительно для странам
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Этот пункт является шаблоном и не могут быть использованы в операциях. Атрибуты Деталь будет копироваться в вариантах, если ""не копировать"" не установлен"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Итоговый заказ считается
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Сотрудник обозначение (например, генеральный директор, директор и т.д.)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Сотрудник обозначение (например, генеральный директор, директор и т.д.)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Курс по которому валюта Покупателя конвертируется в базовую валюту покупателя
 DocType: Course Scheduling Tool,Course Scheduling Tool,Курс планирования Инструмент
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Строка # {0}: Покупка Счет-фактура не может быть сделано в отношении существующего актива {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Срочно] Ошибка при создании повторяющихся% s для% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Срочно] Ошибка при создании повторяющихся% s для% s
 DocType: Item Tax,Tax Rate,Размер налога
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} уже выделено сотруднику  {1} на период с {2} по {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Выбрать пункт
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Выбрать пункт
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Счет на закупку {0} уже проведен
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"Ряд # {0}: Пакетное Нет должно быть таким же, как {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Преобразовать в негрупповой
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Партия  продукта.
 DocType: C-Form Invoice Detail,Invoice Date,Дата Счета
 DocType: GL Entry,Debit Amount,Дебет Сумма
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Там может быть только 1 аккаунт на компанию в {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,"Пожалуйста, см. приложение"
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Там может быть только 1 аккаунт на компанию в {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,"Пожалуйста, см. приложение"
 DocType: Purchase Order,% Received,% Получено
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Создание студенческих групп
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Настройка Уже завершена!!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Настройка Уже завершена!!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Сумма кредитной записи
 DocType: Setup Progress Action,Action Document,Документ действия
 ,Finished Goods,Готовая продукция
 DocType: Delivery Note,Instructions,Инструкции
 DocType: Quality Inspection,Inspected By,Проверено
 DocType: Maintenance Visit,Maintenance Type,Тип технического обслуживания
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} не зачислен в курс {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код товара&gt; Группа товаров&gt; Марка
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} не зачислен в курс {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Серийный номер {0} не принадлежит накладной {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Добавить продукты
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Добавить продукты
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Параметр контроля качества продукта
 DocType: Leave Application,Leave Approver Name,Оставить Имя утверждающего
 DocType: Depreciation Schedule,Schedule Date,Дата планирования
@@ -493,7 +504,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Часы работы
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Изменение начального / текущий порядковый номер существующей серии.
 DocType: Dosage Strength,Strength,Прочность
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Создание нового клиента
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Создание нового клиента
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Если несколько правил ценообразования продолжают преобладать, пользователям предлагается установить приоритет вручную разрешить конфликт."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Создание заказов на поставку
 ,Purchase Register,Покупка Становиться на учет
@@ -512,7 +523,7 @@
 DocType: Lab Test Template,Single,Единственный
 DocType: Salary Slip,Total Loan Repayment,Общая сумма погашения кредита
 DocType: Account,Cost of Goods Sold,Себестоимость проданного товара
-DocType: Purchase Invoice,Yearly,Ежегодно
+DocType: Subscription,Yearly,Ежегодно
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,"Пожалуйста, введите МВЗ"
 DocType: Drug Prescription,Dosage,дозировка
 DocType: Journal Entry Account,Sales Order,Заказ клиента
@@ -543,7 +554,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобальные настройки для всех производственных процессов.
 DocType: Accounts Settings,Accounts Frozen Upto,Счета заморожены до
 DocType: SMS Log,Sent On,Направлено на
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} выбран несколько раз в Таблице Атрибутов
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} выбран несколько раз в Таблице Атрибутов
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,Не применяется
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Мастер выходных.
@@ -569,13 +580,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,"Всего листья, выделенные является обязательным"
 DocType: Patient,AB Positive,АВ положительная
 DocType: Job Opening,Description of a Job Opening,Описание работу Открытие
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,В ожидании деятельность на сегодняшний день
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,В ожидании деятельность на сегодняшний день
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Информация о посещаемости.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Заработная плата Компонент для расчета заработной платы на основе расписания.
 DocType: Sales Order Item,Used for Production Plan,Используется для производственного плана
 DocType: Employee Loan,Total Payment,Всего к оплате
 DocType: Manufacturing Settings,Time Between Operations (in mins),Время между операциями (в мин)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,"{0} {1} отменяется, поэтому действие не может быть завершено"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,"{0} {1} отменяется, поэтому действие не может быть завершено"
 DocType: Customer,Buyer of Goods and Services.,Покупатель товаров и услуг.
 DocType: Journal Entry,Accounts Payable,Счета к оплате
 DocType: Patient,Allergies,аллергии
@@ -587,23 +598,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Предупреждать заказы на поставку
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Перечислите несколько ваших клиентов. Это могут быть как организации так и частные лица.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Достаточно части для сборки
+DocType: POS Profile User,POS Profile User,Пользователь профиля POS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Прямая прибыль
 DocType: Patient Appointment,Date TIme,Дата и время
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Не можете фильтровать на основе счета, если сгруппированы по Счет"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Администратор
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Выберите курс
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Выберите курс
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Выберите курс
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Выберите курс
 DocType: Codification Table,Codification Table,Таблица кодирования
 DocType: Timesheet Detail,Hrs,часов
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,"Пожалуйста, выберите компанию"
 DocType: Stock Entry Detail,Difference Account,Счет разницы
 DocType: Purchase Invoice,Supplier GSTIN,Поставщик GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Невозможно закрыть задача, как ее зависит задача {0} не закрыт."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,"Пожалуйста, введите Склад для которых Материал Запрос будет поднят"
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Невозможно закрыть задача, как ее зависит задача {0} не закрыт."
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Пожалуйста, введите Склад для которых Материал Запрос будет поднят"
 DocType: Production Order,Additional Operating Cost,Дополнительные Эксплуатационные расходы
 DocType: Lab Test Template,Lab Routine,Лабораторная работа
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Косметика
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Чтобы объединить, следующие свойства должны быть одинаковыми для обоих пунктов"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Чтобы объединить, следующие свойства должны быть одинаковыми для обоих пунктов"
 DocType: Shipping Rule,Net Weight,Вес нетто
 DocType: Employee,Emergency Phone,В случае чрезвычайных ситуаций
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,купить
@@ -614,7 +626,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,"Пожалуйста, определите оценку для Threshold 0%"
 DocType: Sales Order,To Deliver,Для доставки
 DocType: Purchase Invoice Item,Item,Продукт
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Серийный номер продукта не может быть дробным
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Высокая чувствительность
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Серийный номер продукта не может быть дробным
 DocType: Journal Entry,Difference (Dr - Cr),Отличия (д-р - Cr)
 DocType: Account,Profit and Loss,Прибыль и убытки
 DocType: Patient,Risk Factors,Факторы риска
@@ -623,7 +636,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Управление субподряда
 DocType: Vital Signs,Body Temperature,Температура тела
 DocType: Project,Project will be accessible on the website to these users,Проект будет доступен на веб-сайте для этих пользователей
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Определить тип проекта.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Определить тип проекта.
 DocType: Supplier Scorecard,Weighting Function,Весовая функция
 DocType: Physician,OP Consulting Charge,OP Consulting Charge
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Установите свой
@@ -637,7 +650,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Прирост не может быть 0
 DocType: Production Planning Tool,Material Requirement,Потребности в материалах
 DocType: Company,Delete Company Transactions,Удалить Сделки Компания
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Ссылка № и дата Reference является обязательным для операции банка
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Ссылка № и дата Reference является обязательным для операции банка
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Добавить или изменить налоги и сборы
 DocType: Payment Entry Reference,Supplier Invoice No,Поставщик Счет №
 DocType: Territory,For reference,Для справки
@@ -645,12 +658,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Не удается удалить Серийный номер {0}, так как он используется в операции перемещения по складу."
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Закрытие (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Здравствуйте
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Переместить продукт
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Переместить продукт
 DocType: Serial No,Warranty Period (Days),Гарантийный срок (дней)
 DocType: Installation Note Item,Installation Note Item,Установка Примечание Пункт
 DocType: Production Plan Item,Pending Qty,В ожидании Кол-во
 DocType: Budget,Ignore,Игнорировать
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} не активен
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} не активен
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Размеры Проверьте настройки для печати
 DocType: Salary Slip,Salary Slip Timesheet,Зарплата скольжению Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Поставщик Склад обязательным для субподрядчиком ТОВАРНЫЙ ЧЕК
@@ -659,7 +672,7 @@
 DocType: Pricing Rule,Sales Partner,Партнер по продажам
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Все оценочные карточки поставщиков.
 DocType: Buying Settings,Purchase Receipt Required,Покупка Получение необходимое
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Оценка Оцените является обязательным, если введен Открытие изображения"
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,"Оценка Оцените является обязательным, если введен Открытие изображения"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Не записи не найдено в таблице счетов
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Пожалуйста, выберите компании и партийных первого типа"
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Финансовый / отчетный год.
@@ -696,7 +709,7 @@
 DocType: Quotation,Quotation To,Цитата Для
 DocType: Lead,Middle Income,Средний доход
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Начальное сальдо (кредит)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"По умолчанию Единица измерения для п {0} не может быть изменен непосредственно, потому что вы уже сделали некоторые сделки (сделок) с другим UOM. Вам нужно будет создать новый пункт для использования другого умолчанию единица измерения."
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"По умолчанию Единица измерения для п {0} не может быть изменен непосредственно, потому что вы уже сделали некоторые сделки (сделок) с другим UOM. Вам нужно будет создать новый пункт для использования другого умолчанию единица измерения."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Выделенные сумма не может быть отрицательным
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Укажите компанию
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Укажите компанию
@@ -711,6 +724,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Выберите Учетная запись Оплата сделать Банк Стажер
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Создание записей сотрудников для управления листьев, расходов и заработной платы претензий"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Период рецепта
+DocType: Restaurant Reservation,Restaurant Reservation,Бронирование ресторанов
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Предложение Написание
 DocType: Payment Entry Deduction,Payment Entry Deduction,Оплата запись Вычет
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Другой человек Продажи {0} существует с тем же идентификатором Сотрудника
@@ -718,7 +732,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Мастеры
 DocType: Assessment Plan,Maximum Assessment Score,Максимальный балл оценки
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Обновление банка транзакций Даты
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Отслеживание времени
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Отслеживание времени
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,ДУБЛИКАТ ДЛЯ ТРАНСПОРТА
 DocType: Fiscal Year Company,Fiscal Year Company,Финансовый год компании
 DocType: Packing Slip Item,DN Detail,DN Деталь
@@ -727,8 +741,9 @@
 DocType: Batch,Batch Description,Описание партии
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Создание групп студентов
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Создание групп студентов
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Payment Gateway Account не создан, создайте его вручную."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Payment Gateway Account не создан, создайте его вручную."
 DocType: Supplier Scorecard,Per Year,В год
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Не допускается вход в эту программу в соответствии с DOB
 DocType: Sales Invoice,Sales Taxes and Charges,Налоги и сборы с продаж
 DocType: Employee,Organization Profile,Профиль организации
 DocType: Vital Signs,Height (In Meter),Высота (в метрах)
@@ -764,7 +779,7 @@
 DocType: Student Batch Name,Batch Name,Наименование партии
 DocType: Fee Validity,Max number of visit,Максимальное количество посещений
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Табель создан:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,зачислять
 DocType: GST Settings,GST Settings,Настройки GST
 DocType: Selling Settings,Customer Naming By,Именование клиентов По
@@ -796,16 +811,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landed Стоимость Налоги и сборы
 DocType: Production Order Operation,Actual Start Time,Фактическое начало Время
 DocType: BOM Operation,Operation Time,Время работы
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Завершить
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Завершить
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,База
 DocType: Timesheet,Total Billed Hours,Всего Оплачиваемые Часы
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Списание Количество
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Списание Количество
 DocType: Leave Block List Allow,Allow User,Разрешить пользователю
 DocType: Journal Entry,Bill No,Номер накладной
 DocType: Company,Gain/Loss Account on Asset Disposal,Счет отражения прибыли / убытка от выбытия основных средств
 DocType: Vehicle Log,Service Details,Сведения о службе
 DocType: Vehicle Log,Service Details,Сведения о службе
-DocType: Purchase Invoice,Quarterly,Ежеквартально
+DocType: Subscription,Quarterly,Ежеквартально
 DocType: Lab Test Template,Grouped,Сгруппировано
 DocType: Selling Settings,Delivery Note Required,Необходим Документы  Отгрузки
 DocType: Bank Guarantee,Bank Guarantee Number,Номер банковской гарантии
@@ -814,12 +829,12 @@
 DocType: Student Attendance,Student Attendance,Student Участники
 DocType: Sales Invoice Timesheet,Time Sheet,Время Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,На основе обратного отнесения затрат на сырье и материалы
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,"Пожалуйста, введите детали деталя"
 DocType: Interest,Interest,Интерес
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Предпродажа
 DocType: Purchase Receipt,Other Details,Другие детали
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Поставщик
 DocType: Lab Test,Test Template,Шаблон тестирования
+DocType: Restaurant Order Entry Item,Served,Подается
 DocType: Account,Accounts,Счета
 DocType: Vehicle,Odometer Value (Last),Значение одометра (последнее)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Шаблоны критериев оценки поставщиков.
@@ -831,26 +846,28 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Просмотр Зарплата скольжению
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Счёт {0} был введен несколько раз
 DocType: Account,Expenses Included In Valuation,"Затрат, включаемых в оценке"
-DocType: Hub Settings,Seller City,Продавец Город
 ,Absent Student Report,Отчёт об отсутствии студентов
 DocType: Email Digest,Next email will be sent on:,Следующее письмо будет отправлено на:
 DocType: Offer Letter Term,Offer Letter Term,Условие письма с предложением
 DocType: Supplier Scorecard,Per Week,В неделю
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Продукт имеет варианты.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Продукт имеет варианты.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Всего учеников
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Пункт {0} не найден
 DocType: Bin,Stock Value,Стоимость акций
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,Платежные записи будут создаваться в фоновом режиме. В случае возникновения ошибки сообщение об ошибке будет обновлено в Приложении.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Компания {0} не существует
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} действует до {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} действует до {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Дерево Тип
 DocType: BOM Explosion Item,Qty Consumed Per Unit,"Кол-во,  потребляемое за единицу"
 DocType: Serial No,Warranty Expiry Date,Срок действия гарантии
 DocType: Material Request Item,Quantity and Warehouse,Количество и Склад
+DocType: Hub Settings,Unregister,Разрегистрировать
 DocType: Sales Invoice,Commission Rate (%),Комиссия ставка (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Выберите программу
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Выберите программу
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Выберите программу
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Выберите программу
 DocType: Project,Estimated Cost,Ориентировочная стоимость
 DocType: Purchase Order,Link to material requests,Ссылка на материал запросов
+DocType: Hub Settings,Publish,Публиковать
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Авиационно-космический
 DocType: Journal Entry,Credit Card Entry,Вступление Кредитная карта
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Компания и счетам
@@ -861,13 +878,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Закрыть Opportunity После дней
 ,Reserved,Зарезервировано
 DocType: Purchase Order,Supply Raw Materials,Поставка сырья
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Дата, на которую будет генерироваться следующий счет-фактура. Он создается на форму."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Оборотные активы
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} нескладируемый продукт
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',"Пожалуйста, поделитесь своими отзывами о тренинге, нажав «Обратная связь с обучением», а затем «Новый»,"
 DocType: Mode of Payment Account,Default Account,По умолчанию учетная запись
 DocType: Payment Entry,Received Amount (Company Currency),Полученная сумма (валюта компании)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,"Если возможность появилась от лида, он должен быть указан"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,"Если возможность появилась от лида, он должен быть указан"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Пожалуйста, выберите в неделю выходной"
 DocType: Patient,O Negative,O Отрицательный
 DocType: Production Order Operation,Planned End Time,Планируемые Время окончания
@@ -883,10 +899,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Энергоэффективность
 DocType: Opportunity,Opportunity From,Возможность От
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Ежемесячная выписка зарплата.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Добавить компанию
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Строка {0}: {1} Необходимы серийные номера продукта {2}. Вы предоставили {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Строка {0}: {1} Необходимы серийные номера продукта {2}. Вы предоставили {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Выберите таблицу
 DocType: BOM,Website Specifications,Сайт характеристики
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} - неверный адрес электронной почты в поле «Получатели»
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} - неверный адрес электронной почты в поле «Получатели»
 DocType: Special Test Items,Particulars,Частности
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Антибиотик.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: От {0} типа {1}
@@ -894,11 +910,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коэффициент преобразования является обязательным
 DocType: Employee,A+,A+
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Несколько Цена Правила существует с теми же критериями, пожалуйста разрешить конфликт путем присвоения приоритета. Цена Правила: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете отключить или отменить спецификации, как она связана с другими спецификациями"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете отключить или отменить спецификации, как она связана с другими спецификациями"
 DocType: Opportunity,Maintenance,Обслуживание
 DocType: Item Attribute Value,Item Attribute Value,Пункт Значение атрибута
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Кампании по продажам.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Создать табель
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Создать табель
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -955,12 +971,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,"Пожалуйста, введите пункт первый"
 DocType: Account,Liability,Ответственность сторон
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Санкционированный сумма не может быть больше, чем претензии Сумма в строке {0}."
+DocType: Salary Detail,Do not include in total,Не включать в общей сложности
 DocType: Company,Default Cost of Goods Sold Account,По умолчанию Себестоимость проданных товаров счет
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Прайс-лист не выбран
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Прайс-лист не выбран
 DocType: Employee,Family Background,Семья Фон
 DocType: Request for Quotation Supplier,Send Email,Отправить e-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Внимание: Неверное приложение {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Нет разрешения
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Внимание: Неверное приложение {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Нет разрешения
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Ответить Цитировать
 DocType: Vital Signs,Heart Rate / Pulse,Частота сердечных сокращений / пульс
 DocType: Company,Default Bank Account,По умолчанию Банковский счет
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Чтобы отфильтровать на основе партии, выберите партия первого типа"
@@ -988,12 +1006,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Пункт Строка {IDX}: {доктайп} {DOCNAME} не существует в выше &#39;{доктайп}&#39; таблица
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} уже завершен или отменен
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Нет задач
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","День месяца, в который автоматически счет-фактура будет создан, например, 05, 28 и т.д."
 DocType: Item Variant Settings,Copy Fields to Variant,Копировать поля в вариант
 DocType: Asset,Opening Accumulated Depreciation,Начальная Накопленная амортизация
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Оценка должна быть меньше или равна 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Программа Зачисление Tool
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,С-форма записи
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,С-форма записи
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Заказчик и Поставщик
 DocType: Email Digest,Email Digest Settings,Email Дайджест Настройки
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Благодарим Вас за сотрудничество!
@@ -1011,13 +1028,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Статус цитаты
 DocType: Maintenance Visit,Completion Status,Статус завершения
 DocType: HR Settings,Enter retirement age in years,Введите возраст выхода на пенсию в ближайшие годы
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Целевая Склад
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Выберите склад
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Целевая Склад
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Выберите склад
 DocType: Cheque Print Template,Starting location from left edge,Начиная расположение от левого края
 DocType: Item,Allow over delivery or receipt upto this percent,Разрешить доставку на получение или Шифрование до этого процента
 DocType: Stock Entry,STE-,стереотипами
 DocType: Upload Attendance,Import Attendance,Импорт Посещаемость
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Все группы продуктов
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Все группы продуктов
 DocType: Process Payroll,Activity Log,Журнал активности
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Чистая прибыль / убытки
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Автоматически создавать сообщение о подаче сделок.
@@ -1029,7 +1046,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Прогнозируемый Количество
 DocType: Sales Invoice,Payment Due Date,Дата платежа
 DocType: Drug Prescription,Interval UOM,Интервал UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Вариант продукта {0} уже существует с теми же атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Вариант продукта {0} уже существует с теми же атрибутами
+DocType: Item,Hub Publishing Details,Сведения о публикации концентратора
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',«Открывается»
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Открыть список дел
 DocType: Notification Control,Delivery Note Message,Доставка Примечание сообщение
@@ -1049,10 +1067,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,"BOM # {0}: Сырье не может быть таким же, как основной элемент"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Всего Применимые сборы в таблице Purchase квитанций Элементов должны быть такими же, как все налоги и сборы"
 DocType: Sales Team,Incentives,Стимулы
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Регистрация для концентратора
 DocType: SMS Log,Requested Numbers,Требуемые Номера
 DocType: Production Planning Tool,Only Obtain Raw Materials,Получить только сырье
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Служебная аттестация.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Включение &quot;Использовать для Корзине», как Корзина включена и должно быть по крайней мере один налог Правило Корзина"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Включение &quot;Использовать для Корзине», как Корзина включена и должно быть по крайней мере один налог Правило Корзина"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Оплата запись {0} связан с Орденом {1}, проверить, если он должен быть подтянут, как шаг вперед в этом счете-фактуре."
 DocType: Sales Invoice Item,Stock Details,Подробности Запасов
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Значимость проекта
@@ -1071,12 +1090,14 @@
 DocType: Salary Slip,Working Days,В рабочие дни
 DocType: Serial No,Incoming Rate,Входящий Оценить
 DocType: Packing Slip,Gross Weight,Вес брутто
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,"Название вашей компании, для которой вы настраиваете эту систему."
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Включить концентратор
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,"Название вашей компании, для которой вы настраиваете эту систему."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Включите праздники в общей сложности не. рабочих дней
 DocType: Job Applicant,Hold,Удержание
 DocType: Employee,Date of Joining,Дата вступления
 DocType: Naming Series,Update Series,Обновление серий
 DocType: Supplier Quotation,Is Subcontracted,Является субподряду
+DocType: Restaurant Table,Minimum Seating,Минимальное размещение
 DocType: Item Attribute,Item Attribute Values,Пункт значений атрибутов
 DocType: Examination Result,Examination Result,Экспертиза Результат
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Покупка Получение
@@ -1087,13 +1108,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Не удается найти временной интервал в ближайшие {0} дней для работы {1}
 DocType: Production Order,Plan material for sub-assemblies,План материал для Субсборки
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Партнеры по сбыту и территории
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,ВМ {0} должен быть активным
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,ВМ {0} должен быть активным
 DocType: Journal Entry,Depreciation Entry,Износ Вход
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Пожалуйста, выберите тип документа сначала"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Отменить Материал просмотров {0} до отмены этого обслуживания визит
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Серийный номер {0} не принадлежит Пункт {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Обязательные Кол-во
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Склады с существующей транзакции не могут быть преобразованы в бухгалтерской книге.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Склады с существующей транзакции не могут быть преобразованы в бухгалтерской книге.
 DocType: Bank Reconciliation,Total Amount,Общая сумма
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Интернет издания
 DocType: Prescription Duration,Number,Число
@@ -1104,7 +1125,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Прайс-лист продаж
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Если этот флажок установлен, клиент будет создан, привязанный к пациенту. С этого клиента будет создан счет-фактура пациента. Вы также можете выбрать существующего клиента при создании Пациента."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Опубликовать для синхронизации продуктов
 DocType: Bank Reconciliation,Account Currency,Валюта счета
 DocType: Lab Test,Sample ID,Образец
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,"Пожалуйста, укажите округлить счет в компании"
@@ -1113,11 +1133,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Сотрудник {0} не активен или не существует
 DocType: Fee Structure,Components,Компоненты
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},"Пожалуйста, введите Asset Категория в пункте {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Пункт Варианты {0} обновляются
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Пункт Варианты {0} обновляются
 DocType: Quality Inspection Reading,Reading 6,Чтение 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Может не {0} {1} {2} без какого-либо отрицательного выдающийся счет-фактура
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","для генерации. Если вы задерживаетесь, вам придется вручную изменить поле «Повторить в день месяца» этого"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Может не {0} {1} {2} без какого-либо отрицательного выдающийся счет-фактура
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Счета-фактуры Advance
-DocType: Hub Settings,Sync Now,Синхронизировать сейчас
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Ряд {0}: Кредитная запись не может быть связан с {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Определить бюджет на финансовый год.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,По умолчанию Счет в банке / Наличные будут автоматически обновляться в POS фактуре когда выбран этот режим.
@@ -1129,13 +1150,13 @@
 DocType: Item,Is Purchase Item,Является Покупка товара
 DocType: Asset,Purchase Invoice,Покупка Счет
 DocType: Stock Ledger Entry,Voucher Detail No,Подробности ваучера №
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Новый счет-фактуру
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Новый счет-фактуру
 DocType: Stock Entry,Total Outgoing Value,Всего исходящее значение
 DocType: Physician,Appointments,Назначения
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Дата открытия и Дата закрытия должны быть внутри одного финансового года
 DocType: Lead,Request for Information,Запрос на предоставление информации
 ,LeaderBoard,Доска почёта
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Синхронизация Offline счетов-фактур
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Синхронизация Offline счетов-фактур
 DocType: Payment Request,Paid,Оплачено
 DocType: Program Fee,Program Fee,Стоимость программы
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1154,11 +1175,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Заказ товара
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Косвенная прибыль
 DocType: Student Attendance Tool,Student Attendance Tool,Student Участники Инструмент
+DocType: Restaurant Menu,Price List (Auto created),Прейскурант (автоматически создан)
 DocType: Cheque Print Template,Date Settings,Настройки даты
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Дисперсия
 ,Company Name,Название компании
 DocType: SMS Center,Total Message(s),Всего сообщений
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Выбрать пункт трансфера
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Выбрать пункт трансфера
 DocType: Purchase Invoice,Additional Discount Percentage,Дополнительная скидка в процентах
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Просмотреть список всех справочных видео
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Выберите учетную запись глава банка, в котором проверка была размещена."
@@ -1176,6 +1198,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,метр
 DocType: Workstation,Electricity Cost,Стоимость электроэнергии
 DocType: HR Settings,Don't send Employee Birthday Reminders,Не отправляйте Employee рождения Напоминания
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Сохранить настройки
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Запрошенные продукты
 DocType: Item,Inspection Criteria,Осмотр Критерии
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Все передаваемые
 DocType: BOM Website Item,BOM Website Item,BOM Сайт товара
@@ -1193,11 +1217,11 @@
 DocType: Journal Entry,Total Amount in Words,Общая сумма в словах
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Был ошибка. Один вероятной причиной может быть то, что вы не сохранили форму. Пожалуйста, свяжитесь с support@erpnext.com если проблема не устранена."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Моя корзина
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Тип заказа должен быть одним из {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Тип заказа должен быть одним из {0}
 DocType: Lead,Next Contact Date,Дата следующего контакта
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Начальное количество
 DocType: Healthcare Settings,Appointment Reminder,Напоминание о назначении
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,"Пожалуйста, введите счет для изменения высоты"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,"Пожалуйста, введите счет для изменения высоты"
 DocType: Student Batch Name,Student Batch Name,Student Пакетное Имя
 DocType: Consultation,Doctor,Доктор
 DocType: Holiday List,Holiday List Name,Название списка выходных
@@ -1205,12 +1229,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Расписание курса
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Опционы
 DocType: Journal Entry Account,Expense Claim,Авансовый Отчет
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Вы действительно хотите восстановить этот актив на слом?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Кол-во для {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Вы действительно хотите восстановить этот актив на слом?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Кол-во для {0}
 DocType: Leave Application,Leave Application,Оставить заявку
 DocType: Patient,Patient Relation,Отношение пациентов
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Оставьте Allocation Tool
+DocType: Item,Hub Category to Publish,Категория концентратора для публикации
 DocType: Leave Block List,Leave Block List Dates,Оставьте черных списков Даты
+DocType: Sales Invoice,Billing Address GSTIN,Адрес выставления счета GSTIN
 DocType: Workstation,Net Hour Rate,Чистая стоимость часа
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Посадка стоимости покупки Квитанция
 DocType: Company,Default Terms,По умолчанию Условия
@@ -1220,11 +1246,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Введите {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Удалены пункты без изменения в количестве или стоимости.
 DocType: Delivery Note,Delivery To,Доставка Для
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Таблица атрибутов является обязательной
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Таблица атрибутов является обязательной
 DocType: Production Planning Tool,Get Sales Orders,Получить заказ клиента
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} не может быть отрицательным
 DocType: Training Event,Self-Study,Самообучения
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Скидка
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Скидка
 DocType: Asset,Total Number of Depreciations,Общее количество отчислений на амортизацию
 DocType: Sales Invoice Item,Rate With Margin,Оценить с маржой
 DocType: Sales Invoice Item,Rate With Margin,Оценить с маржой
@@ -1232,7 +1258,7 @@
 DocType: Task,Urgent,Важно
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},"Пожалуйста, укажите действительный идентификатор строки для строки {0} в таблице {1}"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Не удалось найти переменную:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Выберите поле для редактирования из numpad
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Выберите поле для редактирования из numpad
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Перейдите на рабочий стол и начать использовать ERPNext
 DocType: Item,Manufacturer,Производитель
 DocType: Landed Cost Item,Purchase Receipt Item,Покупка Получение товара
@@ -1263,8 +1289,8 @@
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,По умолчанию Продажа Стоимость центр
 DocType: Sales Partner,Implementation Partner,Реализация Партнер
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Почтовый индекс
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Заказ клиента {0} {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Почтовый индекс
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Заказ клиента {0} {1}
 DocType: Opportunity,Contact Info,Контактная информация
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Создание складской проводки
 DocType: Packing Slip,Net Weight UOM,Вес нетто единица измерения
@@ -1275,6 +1301,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Получить Weekly Выкл Даты
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,"Дата окончания не может быть меньше, чем Дата начала"
 DocType: Sales Person,Select company name first.,Выберите название компании в первую очередь.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Снизу вверх
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Котировки полученных от поставщиков.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Заменить спецификацию и обновить последнюю цену во всех спецификациях
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Для {0} | {1} {2}
@@ -1293,7 +1320,7 @@
 DocType: Program Enrollment,Transportation,Перевозки
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Неправильный атрибут
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} должен быть проведен
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Количество должно быть меньше или равно {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Количество должно быть меньше или равно {0}
 DocType: SMS Center,Total Characters,Всего символов
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},"Пожалуйста, выберите спецификации в спецификации поля для пункта {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-образный Счет Подробно
@@ -1308,7 +1335,7 @@
 ,Ordered Items To Be Billed,"Заказал пунктов, которые будут Объявленный"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,"С Диапазон должен быть меньше, чем диапазон"
 DocType: Global Defaults,Global Defaults,Глобальные вводные по умолчанию
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Сотрудничество Приглашение проекта
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Сотрудничество Приглашение проекта
 DocType: Salary Slip,Deductions,Отчисления
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Название действия
@@ -1326,13 +1353,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Счет Продажи предварительный
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Ничего просить
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Еще один рекорд Бюджет &#39;{0}&#39; уже существует против {1} {2} &#39;для финансового года {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"""Фактическая Дата начала"" не может быть больше, чем ""Фактическая Дата завершения"""
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"""Фактическая Дата начала"" не может быть больше, чем ""Фактическая Дата завершения"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Управление
 DocType: Cheque Print Template,Payer Settings,Настройки плательщика
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Это будет добавлена в Кодекс пункта варианте. Например, если ваш аббревиатура ""SM"", и код деталь ""Футболка"", код товара из вариантов будет ""T-Shirt-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Чистая Платное (прописью) будут видны, как только вы сохраните Зарплата Слип."
 DocType: Purchase Invoice,Is Return,Является Вернуться
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,предосторожность
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,предосторожность
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Возврат / дебетовые Примечание
 DocType: Price List Country,Price List Country,Цены Страна
 DocType: Item,UOMs,UOMs
@@ -1347,17 +1374,18 @@
 DocType: Account,Balance Sheet,Балансовый отчет
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Центр Стоимость для элемента данных с Код товара '
 DocType: Fee Validity,Valid Till,Годен до
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режим оплаты не настроен. Пожалуйста, проверьте, имеет ли учетная запись была установлена на режим платежей или на POS Profile."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режим оплаты не настроен. Пожалуйста, проверьте, имеет ли учетная запись была установлена на режим платежей или на POS Profile."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Один продукт нельзя вводить несколько раз.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Дальнейшие счета могут быть сделаны в соответствии с группами, но Вы можете быть против не-групп"
 DocType: Lead,Lead,Лид
 DocType: Email Digest,Payables,Кредиторская задолженность
 DocType: Course,Course Intro,курс Введение
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Создана складская запись {0}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Пожалуйста, установите серию нумерации для участия через Setup&gt; Numbering Series"
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Создана складская запись {0}
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ряд # {0}: Отклонено Кол-во не может быть введен в приобретении Вернуться
 ,Purchase Order Items To Be Billed,Покупка Заказ позиции быть выставлен счет
 DocType: Purchase Invoice Item,Net Rate,Нетто-ставка
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Выберите клиента
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Выберите клиента
 DocType: Purchase Invoice Item,Purchase Invoice Item,Покупка Счет Пункт
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Сток-Ledger Записи и GL Записи повторно отправил для выбранных Покупка расписок
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Пункт 1
@@ -1377,7 +1405,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Дубликат строка {0} с же {1}
 ,Trial Balance,Пробный баланс
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Финансовый год {0} не найден
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Настройка сотрудников
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Настройка сотрудников
 DocType: Sales Order,SO-,ТАК-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,"Пожалуйста, выберите префикс первым"
 DocType: Employee,O-,О-
@@ -1389,12 +1417,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Посмотреть Леджер
 DocType: Grading Scale,Intervals,Интервалы
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Старейшие
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Уже существует группа продукта с тем же именем, пожалуйста, измените название продукта или переименуйте группу продукта"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Уже существует группа продукта с тем же именем, пожалуйста, измените название продукта или переименуйте группу продукта"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Остальной мир
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Остальной мир
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Продукт {0} не может быть пртией
 ,Budget Variance Report,Бюджет Разница Сообщить
 DocType: Salary Slip,Gross Pay,Зарплата до вычетов
+DocType: Item,Is Item from Hub,Элемент из концентратора
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Строка {0}: Вид деятельности является обязательным.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Оплачено дивидендов
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Главная книга
@@ -1404,8 +1433,9 @@
 DocType: Vehicle Log,Service Detail,Деталь обслуживания
 DocType: BOM,Item Description,Описание продукта
 DocType: Student Sibling,Student Sibling,Студент Sibling
-DocType: Purchase Invoice,Is Recurring,Повторяется
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Режим компенсации
 DocType: Purchase Invoice,Supplied Items,Поставляемые продукты
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Установите активное меню для ресторана {0}
 DocType: Student,STUD.,Винтовое.
 DocType: Production Order,Qty To Manufacture,Кол-во для производства
 DocType: Email Digest,New Income,Новые поступления
@@ -1416,6 +1446,7 @@
 ,Student and Guardian Contact Details,Студент и радетель Контактная информация
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Строка {0}: Для поставщика {0} Адрес электронной почты необходимо отправить по электронной почте
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Временное открытие
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Посмотреть профиль
 ,Employee Leave Balance,Сотрудник Оставить Баланс
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Весы для счета {0} должен быть всегда {1}
 DocType: Patient Appointment,More Info,Подробнее
@@ -1435,13 +1466,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Предупреждать о новом запросе котировок
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Заказы помогут вам планировать и следить за ваши покупки
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","К сожалению, компании не могут быть объединены"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","К сожалению, компании не могут быть объединены"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Лабораторные тесты
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Общее количество выпуска / передачи {0} в Material Request {1} \ не может быть больше требуемого количества {2} для п {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Небольшой
 DocType: Employee,Employee Number,Общее число сотрудников
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Случай Нет (ы) уже используется. Попробуйте из дела № {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Случай Нет (ы) уже используется. Попробуйте из дела № {0}
 DocType: Project,% Completed,% Завершено
 ,Invoiced Amount (Exculsive Tax),Сумма по счетам (Exculsive стоимость)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Пункт 2
@@ -1456,11 +1487,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Косвенные расходы
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Ряд {0}: Кол-во является обязательным
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Сельское хозяйство
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Синхронизация Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Синхронизация Master Data
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Ваши продукты или услуги
 DocType: Special Test Items,Special Test Items,Специальные тестовые элементы
 DocType: Mode of Payment,Mode of Payment,Способ оплаты
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Сайт изображение должно быть общественное файл или адрес веб-сайта
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Сайт изображение должно быть общественное файл или адрес веб-сайта
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,ВМ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Это корень группу товаров и не могут быть изменены.
@@ -1468,9 +1499,9 @@
 DocType: Vehicle,Fuel UOM,Топливо UOM
 DocType: Warehouse,Warehouse Contact Info,Контактная информация склада
 DocType: Payment Entry,Write Off Difference Amount,Списание разница в
-DocType: Purchase Invoice,Recurring Type,Периодическое Тип
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: Адрес электронной почты сотрудника не найден, поэтому письмо не отправлено"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: Адрес электронной почты сотрудника не найден, поэтому письмо не отправлено"
 DocType: Item,Foreign Trade Details,Внешнеторговая Подробнее
+,Assessment Plan Status,Статус плана оценки
 DocType: Email Digest,Annual Income,Годовой доход
 DocType: Serial No,Serial No Details,Серийный номер подробнее
 DocType: Purchase Invoice Item,Item Tax Rate,Налоговая ставка продукта
@@ -1478,15 +1509,14 @@
 DocType: Student Group Student,Group Roll Number,Номер рулона группы
 DocType: Student Group Student,Group Roll Number,Номер рулона группы
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, только кредитные счета могут быть связаны с дебетовой записью"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Сумма всех весов задача должна быть 1. Пожалуйста, измените веса всех задач проекта, соответственно,"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Уведомление о доставке {0} не проведено
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Сумма всех весов задача должна быть 1. Пожалуйста, измените веса всех задач проекта, соответственно,"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Уведомление о доставке {0} не проведено
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Пункт {0} должен быть Субдоговорная Пункт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Капитальные оборудование
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Цены Правило сначала выбирается на основе ""Применить На"" поле, которое может быть Пункт, Пункт Группа или Марка."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Сначала укажите код товара
-DocType: Hub Settings,Seller Website,Этого продавца
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Сначала укажите код товара
 DocType: Item,ITEM-,ПУНКТ-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Всего выделено процент для отдела продаж должен быть 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Всего выделено процент для отдела продаж должен быть 100
 DocType: Sales Invoice Item,Edit Description,Редактировать описание
 DocType: Antibiotic,Antibiotic,Антибиотик
 ,Team Updates,Команда обновления
@@ -1507,12 +1537,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Всего (Компания валют)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Серийный номер {0} вошли более одного раза
 DocType: Depreciation Schedule,Journal Entry,Запись в дневнике
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} продуктов в работе
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} продуктов в работе
 DocType: Workstation,Workstation Name,Имя рабочей станции
 DocType: Grading Scale Interval,Grade Code,Код класса
 DocType: POS Item Group,POS Item Group,POS Item Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Электронная почта Дайджест:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},ВМ {0} не относится к продукту {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},ВМ {0} не относится к продукту {1}
 DocType: Sales Partner,Target Distribution,Целевая Распределение
 DocType: Salary Slip,Bank Account No.,Счет №
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Это число последнего созданного сделки с этим префиксом
@@ -1529,10 +1559,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Запрос на коммерческое предложение Поставщика
 DocType: Healthcare Settings,Registration Message,Регистрация сообщения
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Оборудование
-DocType: Sales Order,Recurring Upto,Повторяющиеся Upto
 DocType: Prescription Dosage,Prescription Dosage,Дозировка по рецепту
 DocType: Attendance,HR Manager,Менеджер отдела кадров
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,"Пожалуйста, выберите компанию"
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,"Пожалуйста, выберите компанию"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Привилегированный Оставить
 DocType: Purchase Invoice,Supplier Invoice Date,Дата выставления счета поставщиком
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,в
@@ -1548,10 +1577,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Перекрытие условия найдено между:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Против Запись в журнале {0} уже настроен против какой-либо другой ваучер
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Общая стоимость заказа
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Продукты питания
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Продукты питания
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Старение Диапазон 3
 DocType: Maintenance Schedule Item,No of Visits,Кол-во посещений
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},График обслуживания {0} существует против {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Вы хотите опубликовать свои товары в Hub?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,поступив студент
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валюта закрытии счета должны быть {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Сумма баллов за все цели должны быть 100. Это {0}
@@ -1562,9 +1592,9 @@
 DocType: Authorization Rule,Average Discount,Средняя скидка
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Инженерное оборудование
-DocType: Purchase Invoice Item,Accounting,Бухгалтерия
+DocType: POS Profile,Accounting,Бухгалтерия
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Выберите партии для партии товара
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Выберите партии для партии товара
 DocType: Asset,Depreciation Schedules,Амортизационные Расписания
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Срок подачи заявлений не может быть период распределения пределами отпуск
 DocType: Activity Cost,Projects,Проекты
@@ -1580,7 +1610,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',"Состояние утверждения должны быть ""Одобрено"" или ""Отклонено"""
 DocType: Physician,Contacts and Address,Контакты и адрес
 DocType: Purchase Invoice,Contact Person,Контактное Лицо
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"""Ожидаемая Дата начала"" не может быть больше, чем ""Ожидаемая Дата окончания"""
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""Ожидаемая Дата начала"" не может быть больше, чем ""Ожидаемая Дата окончания"""
 DocType: Course Scheduling Tool,Course End Date,Курс Дата окончания
 DocType: Holiday List,Holidays,Праздники
 DocType: Sales Order Item,Planned Quantity,Планируемый Количество
@@ -1588,10 +1618,11 @@
 DocType: Item,Maintain Stock,Поддержание складе
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Сток записи уже созданные для производственного заказа
 DocType: Employee,Prefered Email,Предпочитаемый E-mail
+DocType: Student Admission,Eligibility and Details,Приемлемость и подробная информация
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Чистое изменение в основных фондов
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Оставьте пустым, если рассматривать для всех обозначений"
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные 'в строке {0} не могут быть включены в пункт Оценить
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,С DateTime
 DocType: Email Digest,For Company,Для Компании
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Журнал соединений.
@@ -1599,19 +1630,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Переменная переменной Scorecard поставщика
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Сумма покупки
 DocType: Sales Invoice,Shipping Address Name,Адрес доставки Имя
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,План счетов
 DocType: Material Request,Terms and Conditions Content,Условия Содержимое
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,"не может быть больше, чем 100"
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
 DocType: Maintenance Visit,Unscheduled,Незапланированный
 DocType: Employee,Owned,Присвоено
 DocType: Salary Detail,Depends on Leave Without Pay,Зависит от отпуска без сохранения заработной платы
 DocType: Pricing Rule,"Higher the number, higher the priority","Чем выше число, тем выше приоритет"
 ,Purchase Invoice Trends,Счета-фактуры Тенденции
 DocType: Employee,Better Prospects,Потенциальные покупатели
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Строка # {0}: партия {1} имеет только {2} qty. Выберите другой пакет, в котором имеется {3} qty, или разбейте строку на несколько строк, чтобы доставлять / выпускать из нескольких партий"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Строка # {0}: партия {1} имеет только {2} qty. Выберите другой пакет, в котором имеется {3} qty, или разбейте строку на несколько строк, чтобы доставлять / выпускать из нескольких партий"
 DocType: Vehicle,License Plate,Номерной знак
 DocType: Appraisal,Goals,Цели
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Выберите профиль POS
 DocType: Warranty Claim,Warranty / AMC Status,Гарантия / АМК Статус
 ,Accounts Browser,Обзор счетов
 DocType: Payment Entry Reference,Payment Entry Reference,Оплата запись Ссылка
@@ -1630,7 +1661,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Сотрудник не может сообщить себе.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Если счет замораживается, записи разрешается ограниченных пользователей."
 DocType: Email Digest,Bank Balance,Банковский баланс
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Бухгалтерская Проводка для {0}: {1} может быть сделана только в валюте: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Бухгалтерская Проводка для {0}: {1} может быть сделана только в валюте: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Профиль работы, необходимая квалификация и т.д."
 DocType: Journal Entry Account,Account Balance,Остаток на счете
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Налоговый Правило для сделок.
@@ -1639,8 +1670,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Всего Налоги и сборы (Компания Валюты)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Показать P &amp; L сальдо Unclosed финансовый год
 DocType: Lab Test Template,Collection Details,Сведения о собрании
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","выберите cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date из tabConsultation ct, `tabLab Prescription` cp, где ct.patient = &#39;{0}&#39; и cp.parent = ct. name и cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Доставка счета
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Счет {2} неактивен
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,"Сделать заказы клиентов, чтобы помочь вам спланировать работу и поставить на время"
@@ -1657,7 +1686,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Упаковочный лист
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Аренда площади для офиса
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Указать настройки СМС-шлюза
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Ошибка при импортировании!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Ошибка при импортировании!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Адресов пока нет.
 DocType: Workstation Working Hour,Workstation Working Hour,Рабочая станция Рабочие часы
 DocType: Vital Signs,Blood Pressure,Кровяное давление
@@ -1682,7 +1711,7 @@
 DocType: Sales Invoice,Source,Источник
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Показать закрыто
 DocType: Leave Type,Is Leave Without Pay,Является отпуск без
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Категория активов является обязательным для фиксированного элемента активов
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Категория активов является обязательным для фиксированного элемента активов
 DocType: Fee Validity,Fee Validity,Вознаграждение за действительность
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Не записи не найдено в таблице оплаты
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Это {0} конфликты с {1} для {2} {3}
@@ -1703,8 +1732,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Создать лидов
 DocType: Maintenance Schedule,Schedules,Расписание
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,Профиль POS необходим для использования Point-of-Sale
 DocType: Purchase Invoice Item,Net Amount,Чистая сумма
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} не отправлено, поэтому действие не может быть завершено"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} не отправлено, поэтому действие не может быть завершено"
 DocType: Purchase Order Item Supplied,BOM Detail No,ВМ детали №
 DocType: Landed Cost Voucher,Additional Charges,Дополнительные расходы
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Дополнительная скидка Сумма (валюта компании)
@@ -1713,7 +1743,7 @@
 ,Support Hour Distribution,Распределение поддержки
 DocType: Maintenance Visit,Maintenance Visit,Техническое обслуживание Посетить
 DocType: Student,Leaving Certificate Number,Оставив номер сертификата
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Назначение отменено, проверьте и отмените счет-фактуру {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Назначение отменено, проверьте и отмените счет-фактуру {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Доступные Пакетная Кол-во на складе
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Обновление Формат печати
 DocType: Landed Cost Voucher,Landed Cost Help,Земельные Стоимость Помощь
@@ -1736,8 +1766,8 @@
 DocType: Patient,Tobacco Past Use,Предыдущее использование табака
 DocType: Sales Invoice Item,Brand Name,Имя Бренда
 DocType: Purchase Receipt,Transporter Details,Transporter Детали
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Пользователь {0} уже назначен врачу {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Требуется основной склад для выбранного продукта
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Пользователь {0} уже назначен врачу {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Требуется основной склад для выбранного продукта
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Рамка
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,Возможный поставщик
 DocType: Budget,Monthly Distribution,Ежемесячно дистрибуция
@@ -1747,7 +1777,7 @@
 DocType: Sales Partner,Sales Partner Target,Цели Партнера по продажам
 DocType: Loan Type,Maximum Loan Amount,Максимальная сумма кредита
 DocType: Pricing Rule,Pricing Rule,Цены Правило
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Повторяющийся номер ролика для ученика {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Повторяющийся номер ролика для ученика {0}
 DocType: Budget,Action if Annual Budget Exceeded,"Действие, если годовой бюджет превышено"
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Материал Заказать орденом
 DocType: Shopping Cart Settings,Payment Success URL,Успех Оплата URL
@@ -1764,7 +1794,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} должен появиться только один раз
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Не разрешается Tranfer более {0}, чем {1} против Заказа {2}"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Отпуск успешно распределен для {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Нет объектов для упаковки
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Нет объектов для упаковки
 DocType: Shipping Rule Condition,From Value,От стоимости
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Производство Количество является обязательным
 DocType: Employee Loan,Repayment Method,Способ погашения
@@ -1778,6 +1808,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Обязательства по запасам
 DocType: Purchase Invoice,Supplier Warehouse,Склад поставщика
 DocType: Opportunity,Contact Mobile No,Связаться Мобильный Нет
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Выберите компанию
 ,Material Requests for which Supplier Quotations are not created,"Материал Запросы, для которых Поставщик Котировки не создаются"
 DocType: Student Group,Set 0 for no limit,Установите 0 для каких-либо ограничений
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"На следующий день (с), на которой вы подаете заявление на отпуск праздники. Вам не нужно обратиться за разрешением."
@@ -1787,24 +1818,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Создать запрос на поставку
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Другие отчеты
 DocType: Dependent Task,Dependent Task,Зависит Задача
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Попробуйте планировании операций для X дней.
 DocType: HR Settings,Stop Birthday Reminders,Стоп День рождения Напоминания
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},"Пожалуйста, установите по умолчанию Payroll расчётный счёт в компании {0}"
 DocType: SMS Center,Receiver List,Список получателей
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Поиск товара
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Поиск товара
 DocType: Patient Appointment,Referring Physician,Справляющий врач
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Израсходованное количество
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Чистое изменение денежных средств
 DocType: Assessment Plan,Grading Scale,Оценочная шкала
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,Уже закончено
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,Уже закончено
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Запасы в руке
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Оплата Запрос уже существует {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Стоимость эмиссионных пунктов
 DocType: Physician,Hospital,больница
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Количество должно быть не более {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Количество должно быть не более {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Предыдущий финансовый год не закрыт
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Возраст (дней)
 DocType: Quotation Item,Quotation Item,Цитата Пункт
@@ -1815,8 +1846,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Мастер типа поставщика.
 DocType: Purchase Order Item,Supplier Part Number,Номер детали поставщика
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Коэффициент конверсии не может быть 0 или 1
-DocType: Sales Invoice,Reference Document,Справочный документ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} отменён или остановлен
+DocType: Subscription,Reference Document,Справочный документ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} отменён или остановлен
 DocType: Accounts Settings,Credit Controller,Кредитная контроллер
 DocType: Delivery Note,Vehicle Dispatch Date,Автомобиль Отправка Дата
 DocType: Healthcare Settings,Default Medical Code Standard,Стандарт медицинского стандарта по умолчанию
@@ -1825,6 +1856,7 @@
 DocType: Company,Default Payable Account,По умолчанию оплачивается аккаунт
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Настройки для онлайн корзины, такие как правилами перевозок, прайс-лист и т.д."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0} % оплачено
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Сортировать по цене ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Зарезервированное кол-во
 DocType: Party Account,Party Account,Партия аккаунт
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Кадры
@@ -1836,13 +1868,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Сделать запись выплат
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Ряд {0}: Предварительная против Поставщика должны быть дебет
 DocType: Company,Default Values,Значения По Умолчанию
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{frequency} Дайджест
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{frequency} Дайджест
 DocType: Expense Claim,Total Amount Reimbursed,Общая сумма возмещаются
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Это основано на бревнах против этого транспортного средства. См график ниже для получения подробной информации
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Против поставщика счет-фактура {0} от {1}
 DocType: Customer,Default Price List,По умолчанию Прайс-лист
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,запись Движение активов {0} создано
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Нельзя удалить {0} финансовый год. Финансовый год {0} установлен  основным в глобальных параметрах
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Клиент с тем же именем уже существует
 DocType: Journal Entry,Entry Type,Тип записи
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,"Нет плана оценки, связанного с этой группой оценки"
 ,Customer Credit Balance,Заказчик Кредитный Баланс
@@ -1853,7 +1886,7 @@
 DocType: Quotation,Term Details,Срочные Подробнее
 DocType: Project,Total Sales Cost (via Sales Order),Общая стоимость продаж (через заказ клиента)
 DocType: Project,Total Sales Cost (via Sales Order),Общая стоимость продаж (через заказ клиента)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Не удается зарегистрировать более {0} студентов для этой группы студентов.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Не удается зарегистрировать более {0} студентов для этой группы студентов.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Счетчик лида
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Счетчик лида
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} должно быть больше 0
@@ -1871,9 +1904,11 @@
 DocType: Lab Test,Technician Name,Имя техника
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Unlink Оплата об аннулировании счета-фактуры
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},"Текущее показание одометра вошли должно быть больше, чем начальный одометр автомобиля {0}"
+DocType: Restaurant Reservation,No Show,Нет шоу
 DocType: Shipping Rule Country,Shipping Rule Country,Правило Доставка Страна
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Оставить и посещаемость
 DocType: Maintenance Visit,Partially Completed,Частично Завершено
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Умеренная чувствительность
 DocType: Leave Type,Include holidays within leaves as leaves,Включить праздники в отпуска как отпускные дни
 DocType: Sales Invoice,Packed Items,Упакованные продукты
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Претензия по гарантии по серийному номеру
@@ -1890,13 +1925,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Оплаченная сумма (в валюте компании)
 DocType: Purchase Invoice,Additional Discount,Дополнительная скидка
 DocType: Selling Settings,Selling Settings,Продажа Настройки
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Подтвердить действие
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Аукционы в Интернете
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Пожалуйста, сформулируйте либо Количество или оценка Оценить или оба"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,свершение
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Смотрите в корзину
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Маркетинговые расходы
 ,Item Shortage Report,Пункт Нехватка Сообщить
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вес упоминается, \n Пожалуйста, укажите ""Вес Единица измерения"" слишком"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вес упоминается, \n Пожалуйста, укажите ""Вес Единица измерения"" слишком"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,"Материал Запрос используется, чтобы сделать эту Stock запись"
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Следующий Износ Дата является обязательным для нового актива
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Отдельная группа на основе курса для каждой партии
@@ -1909,12 +1945,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Создавать бухгалтерские проводки при каждом перемещении запасов
 DocType: Leave Allocation,Total Leaves Allocated,Всего Листья Выделенные
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Склад требуется в строке Нет {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,"Пожалуйста, введите действительный финансовый год даты начала и окончания"
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,"Пожалуйста, введите действительный финансовый год даты начала и окончания"
 DocType: Employee,Date Of Retirement,Дата выбытия
 DocType: Upload Attendance,Get Template,Получить шаблон
 DocType: Material Request,Transferred,Переданы
 DocType: Vehicle,Doors,двери
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,Настройка ERPNext завершена!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,Настройка ERPNext завершена!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Сбор платы за регистрацию пациентов
 DocType: Course Assessment Criteria,Weightage,Взвешивание
 DocType: Purchase Invoice,Tax Breakup,Распределение налогов
@@ -1933,37 +1969,37 @@
 DocType: Employee,AB+,AB+
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Если этот пункт имеет варианты, то она не может быть выбран в заказах и т.д."
 DocType: Lead,Next Contact By,Следующий контакт через
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Кол-во для Пункт {0} в строке {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Кол-во для Пункт {0} в строке {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Склад {0} не может быть удален как существует количество для Пункт {1}
 DocType: Quotation,Order Type,Тип заказа
-DocType: Purchase Invoice,Notification Email Address,E-mail адрес для уведомлений
 ,Item-wise Sales Register,Пункт мудрый Продажи Зарегистрироваться
 DocType: Asset,Gross Purchase Amount,Валовая сумма покупки
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Открытые балансы
 DocType: Asset,Depreciation Method,метод начисления износа
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Не в сети
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Не в сети
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Этот налог Входит ли в базовой ставки?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Всего Target
 DocType: Job Applicant,Applicant for a Job,Заявитель на вакансию
 DocType: Production Plan Material Request,Production Plan Material Request,Производство План Материал Запрос
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,"Нет Производственные заказы, созданные"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,"Нет Производственные заказы, созданные"
 DocType: Stock Reconciliation,Reconciliation JSON,Примирение JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Слишком много столбцов. Экспортируйте отчет и распечатайте его с помощью приложения для электронных таблиц.
 DocType: Purchase Invoice Item,Batch No,№ партии
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Запрос котировки: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Разрешить несколько заказов на продажу от Заказа Клиента
 DocType: Student Group Instructor,Student Group Instructor,Инструктор по студенческим группам
 DocType: Student Group Instructor,Student Group Instructor,Инструктор по студенческим группам
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Нет
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Основные
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Основные
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Вариант
 DocType: Naming Series,Set prefix for numbering series on your transactions,Установить префикс для нумерации серии на ваших сделок
 DocType: Employee Attendance Tool,Employees HTML,Сотрудники HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,По умолчанию ВМ ({0}) должна быть активной для данного продукта или в шаблоне
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,По умолчанию ВМ ({0}) должна быть активной для данного продукта или в шаблоне
 DocType: Employee,Leave Encashed?,Оставьте инкассированы?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Возможность поле От обязательна
 DocType: Email Digest,Annual Expenses,годовые расходы
 DocType: Item,Variants,Варианты
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Создать заказ на поставку
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Создать заказ на поставку
 DocType: SMS Center,Send To,Отправить
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Выделенная сумма
@@ -1981,6 +2017,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Сила студенческой группы
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Против Запись в журнале {0} не имеет никакого непревзойденную {1} запись
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Аттестации
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Учебные мероприятия
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Дубликат Серийный номер вводится для Пункт {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Условие доставки
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Пожалуйста входите
@@ -1990,7 +2027,7 @@
 DocType: Sales Order,To Deliver and Bill,Для доставки и оплаты
 DocType: Student Group,Instructors,Инструкторы
 DocType: GL Entry,Credit Amount in Account Currency,Сумма кредита в валюте счета
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,ВМ {0} должен быть проведён
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,ВМ {0} должен быть проведён
 DocType: Authorization Control,Authorization Control,Авторизация управления
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ряд # {0}: Отклонено Склад является обязательным в отношении отклонил Пункт {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Оплата
@@ -2009,11 +2046,11 @@
 DocType: Quotation Item,Actual Qty,Факт. кол-во
 DocType: Sales Invoice Item,References,Рекомендации
 DocType: Quality Inspection Reading,Reading 10,Чтение 10
-DocType: Hub Settings,Hub Node,Узел хаба
+DocType: Hub Category,Hub Node,Узел хаба
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Вы ввели дублирующиеся продукты. Пожалуйста, исправьте и попробуйте снова."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Помощник
 DocType: Asset Movement,Asset Movement,Движение активов
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,Новая корзина
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,Новая корзина
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Пункт {0} не сериализованным Пункт
 DocType: SMS Center,Create Receiver List,Создать список получателей
 DocType: Vehicle,Wheels,Колеса
@@ -2027,15 +2064,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Телекоммуникации
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Указывает, что пакет является частью этой поставки (только проект)"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Произвести оплату запись
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Количество по пункту {0} должно быть меньше {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Количество по пункту {0} должно быть меньше {1}
 ,Sales Invoice Trends,Расходная накладная тенденции
 DocType: Leave Application,Apply / Approve Leaves,Применить / Утвердить отпуска
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Для
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Для
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Можете обратиться строку, только если тип заряда «О Предыдущая сумма Row» или «Предыдущая Row Всего"""
 DocType: Sales Order Item,Delivery Warehouse,Доставка Склад
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Дерево центров финансовых затрат.
 DocType: Serial No,Delivery Document No,Документы  Отгрузки №
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},"Пожалуйста, установите &quot;прибыль / убыток Счет по обращению с отходами актива в компании {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},"Пожалуйста, установите &quot;прибыль / убыток Счет по обращению с отходами актива в компании {0}"
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Получить товары от покупки расписок
 DocType: Serial No,Creation Date,Дата создания
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Пункт {0} несколько раз появляется в прайс-лист {1}
@@ -2046,12 +2083,13 @@
 DocType: Student,Student Mobile Number,Студент Мобильный телефон
 DocType: Item,Has Variants,Имеет варианты
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Обновить ответ
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Вы уже выбрали продукты из {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Вы уже выбрали продукты из {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Название ежемесячное распределение
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Идентификатор партии является обязательным
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Идентификатор партии является обязательным
 DocType: Sales Person,Parent Sales Person,Лицо Родительские продаж
-DocType: Purchase Invoice,Recurring Invoice,Периодический Счет
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,От низкого до низкого
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Сначала выберите программу
 DocType: Patient Appointment,Patient Age,Возраст пациента
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Управление проектами
 DocType: Supplier,Supplier of Goods or Services.,Поставщик товаров или услуг.
@@ -2059,8 +2097,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Дебиторские счета по умолчанию, которые будут использоваться, если не установлены в Пациенте, чтобы заказать плату за консультацию."
 DocType: Vehicle Log,Fuel Price,Топливо Цена
 DocType: Budget,Budget,Бюджет
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Открыть
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Элемент основных средств не может быть элементом запасов.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Открыть
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Элемент основных средств не может быть элементом запасов.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Бюджет не может быть назначен на {0}, так как это не доход или расход счета"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Достигнутый
 DocType: Student Admission,Application Form Route,Заявка на маршрут
@@ -2074,12 +2112,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Пункт {0} не установка для мастера серийные номера Проверить товара
 DocType: Maintenance Visit,Maintenance Time,Техническое обслуживание Время
 ,Amount to Deliver,Сумма Доставка
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Один и тот же элемент был введен несколько раз. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Срок Дата начала не может быть раньше, чем год Дата начала учебного года, к которому этот термин связан (учебный год {}). Пожалуйста, исправьте дату и попробуйте еще раз."
 DocType: Guardian,Guardian Interests,хранители Интересы
 DocType: Naming Series,Current Value,Текущее значение
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Несколько финансовых лет существуют на дату {0}. Пожалуйста, установите компанию в финансовый год"
 DocType: School Settings,Instructor Records to be created by,Записи инструкторов должны быть созданы
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,Создано {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,Создано {0}
 DocType: Delivery Note Item,Against Sales Order,Против заказ клиента
 ,Serial No Status,Серийный номер статус
 DocType: Payment Entry Reference,Outstanding,выдающийся
@@ -2090,10 +2129,10 @@
  должно быть больше или равно {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Это основано на фондовом движении. См {0} для получения более подробной
 DocType: Pricing Rule,Selling,Продажа
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Сумма {0} {1} вычтены {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Сумма {0} {1} вычтены {2}
 DocType: Employee,Salary Information,Информация о зарплате
 DocType: Sales Person,Name and Employee ID,Имя и ID сотрудника
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,"Впритык не может быть, прежде чем отправлять Дата"
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,"Впритык не может быть, прежде чем отправлять Дата"
 DocType: Website Item Group,Website Item Group,Сайт Пункт Группа
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Пошлины и налоги
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
@@ -2119,7 +2158,7 @@
 DocType: Issue,Resolution Details,Разрешение Подробнее
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ассигнования
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Критерий приемлемости
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Пожалуйста, введите Материал запросов в приведенной выше таблице"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,"Пожалуйста, введите Материал запросов в приведенной выше таблице"
 DocType: Item Attribute,Attribute Name,Имя атрибута
 DocType: BOM,Show In Website,Показать на сайте
 DocType: Shopping Cart Settings,Show Quantity in Website,Показать Количество в веб-сайт
@@ -2128,7 +2167,7 @@
 DocType: Item Reorder,Check in (group),Заезд (группа)
 ,Qty to Order,Кол-во в заказ
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Глава счета под обязательство или долевой, в котором прибыль / убыток будет забронирован"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Диаграмма Ганта всех задач.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Диаграмма Ганта всех задач.
 DocType: Opportunity,Mins to First Response,Mins к First Response
 DocType: Pricing Rule,Margin Type,Тип маржа
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} час.
@@ -2150,36 +2189,36 @@
 DocType: Patient,Surgical History,Хирургическая история
 DocType: Employee,Resignation Letter Date,Отставка Письмо Дата
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Цены Правила дополнительно фильтруются на основе количества.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Укажите дату присоединения для сотрудника {0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Укажите дату присоединения для сотрудника {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Укажите дату присоединения для сотрудника {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Укажите дату присоединения для сотрудника {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Общая сумма Billing (через табель)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Повторите Выручка клиентов
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) должен иметь роль ""Согласующего Расходы"""
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Носите
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Выберите BOM и Кол-во для производства
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Выберите BOM и Кол-во для производства
 DocType: Asset,Depreciation Schedule,Амортизация Расписание
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Адреса и партнеры торговых партнеров
 DocType: Bank Reconciliation Detail,Against Account,Против Счет
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Поаяся Дата должна быть в пределах от даты и до настоящего времени
 DocType: Maintenance Schedule Detail,Actual Date,Фактическая дата
 DocType: Item,Has Batch No,Имеет номер партии
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Годовой Billing: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Годовой Billing: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Налог на товары и услуги (GST India)
 DocType: Delivery Note,Excise Page Number,Количество Акцизный Страница
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Компания, Дата начала и до настоящего времени является обязательным"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Получить консультацию
 DocType: Asset,Purchase Date,Дата покупки
 DocType: Employee,Personal Details,Личные Данные
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},"Пожалуйста, установите &quot;активов Амортизация затрат по МВЗ&quot; в компании {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},"Пожалуйста, установите &quot;активов Амортизация затрат по МВЗ&quot; в компании {0}"
 ,Maintenance Schedules,Графики технического обслуживания
 DocType: Task,Actual End Date (via Time Sheet),Фактическая дата окончания (с помощью табеля рабочего времени)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Сумма {0} {1} против {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Сумма {0} {1} против {2} {3}
 ,Quotation Trends,Котировочные тенденции
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Пункт Группа не упоминается в мастера пункт по пункту {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Дебету счета должны быть задолженность счет
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Дебету счета должны быть задолженность счет
 DocType: Shipping Rule Condition,Shipping Amount,Доставка Количество
 DocType: Supplier Scorecard Period,Period Score,Период
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Добавить клиентов
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Добавить клиентов
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,В ожидании Сумма
 DocType: Lab Test Template,Special,Особый
 DocType: Purchase Invoice Item,Conversion Factor,Коэффициент преобразования
@@ -2187,13 +2226,14 @@
 ,Vehicle Expenses,Расходы транспортных средств
 DocType: Serial No,Invoice Details,Сведения о счете
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},"Ожидаемое значение после того, как срок полезного использования должно быть больше или равно {0}"
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Начать
+DocType: Hub Category,Hub Category,Категория концентратора
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Количество транспортных средств
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Дата, на которую повторяющихся счет будет остановить"
 DocType: Employee Loan,Loan Amount,Сумма кредита
 DocType: Program Enrollment,Self-Driving Vehicle,Самоходное транспортное средство
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Постоянный счет поставщика
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Строка {0}: Для продукта {1} не найдена ведомость материалов
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Строка {0}: Для продукта {1} не найдена ведомость материалов
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,"Всего выделенные листья {0} не может быть меньше, чем уже утвержденных листьев {1} за период"
 DocType: Journal Entry,Accounts Receivable,Дебиторская задолженность
 ,Supplier-Wise Sales Analytics,Аналитика продаж в разрезе поставщиков
@@ -2205,7 +2245,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Родительский курс (оставьте поле пустым, если это не является частью родительского курса)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Оставьте пустым, если считать для всех типов сотрудников"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Распределите плату на основе
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,Настройки HR
 DocType: Salary Slip,net pay info,Чистая информация платить
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Это значение обновляется в прейскуранте продаж по умолчанию.
@@ -2216,7 +2256,7 @@
 DocType: Patient,B Positive,В позитивный
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Строка # {0}: Кол-во должно быть 1, а элемент является фиксированным активом. Пожалуйста, используйте отдельную строку для нескольких Упак."
 DocType: Leave Block List Allow,Leave Block List Allow,Оставьте Черный список Разрешить
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Аббревиатура не может быть пустой или пробелом
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Аббревиатура не может быть пустой или пробелом
 DocType: Patient Medical Record,Patient Medical Record,Медицинская запись пациента
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Группа не-группы
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спорт
@@ -2233,9 +2273,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Невозможно найти обменный курс {0} до {1} за контрольную дату {2}. Создайте запись обмена валюты вручную.
 DocType: POS Profile,Price List,Прайс-лист
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} теперь используется как основной Фискальный Год. Пожалуйста, обновите страницу в браузере, чтобы изменения вступили в силу."
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Авансовые Отчеты
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Авансовые Отчеты
 DocType: Issue,Support,Поддержка
 ,BOM Search,Спецификация Поиск
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Опубликуйте «На складе» или «Нет на складе» на концентраторе на основе имеющихся в наличии на складе.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Закрытие (открытие + Итоги)
 DocType: Vehicle,Fuel Type,Тип топлива
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Пожалуйста, сформулируйте валюту в обществе"
@@ -2247,16 +2288,16 @@
 DocType: Healthcare Settings,Remind Before,Напомнить
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Фактор Единица измерения преобразования требуется в строке {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Строка # {0}: Ссылка Тип документа должен быть одним из заказа клиента, счет-фактура или продаже журнал Вход"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Строка # {0}: Ссылка Тип документа должен быть одним из заказа клиента, счет-фактура или продаже журнал Вход"
 DocType: Salary Component,Deduction,Вычет
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Строка {0}: От времени и времени является обязательным.
 DocType: Stock Reconciliation Item,Amount Difference,Сумма разница
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Цена продукта {0} добавлена в прайс лист {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Цена продукта {0} добавлена в прайс лист {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Пожалуйста, введите Employee Id этого менеджера по продажам"
 DocType: Territory,Classification of Customers by region,Классификация клиентов по регионам
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Разница Сумма должна быть равна нулю
 DocType: Project,Gross Margin,Валовая прибыль
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,"Пожалуйста, введите выпуска изделия сначала"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,"Пожалуйста, введите выпуска изделия сначала"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Расчетный банк себе баланс
 DocType: Normal Test Template,Normal Test Template,Шаблон нормального теста
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,отключенный пользователь
@@ -2266,21 +2307,22 @@
 DocType: Salary Slip,Total Deduction,Всего Вычет
 ,Production Analytics,Производственная аналитика
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Это основано на транзакциях против этого пациента. См. Ниже подробное описание
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Стоимость Обновлено
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Стоимость Обновлено
 DocType: Employee,Date of Birth,Дата рождения
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Пункт {0} уже вернулся
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Фискальный год** представляет собой финансовый год. Все бухгалтерские записи и другие крупные сделки отслеживаются по **Фискальному году**.
 DocType: Opportunity,Customer / Lead Address,"Адрес лида, клиента"
 DocType: Patient,DOB,дата рождения
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Поставщик Scorecard Setup
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Внимание: Неверный сертификат SSL в приложении {0}
-DocType: Student Admission,Eligibility,приемлемость
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Название плана оценки
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Внимание: Неверный сертификат SSL в приложении {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Лиды помогут делать дело. Внесите все свои контакты, идеи развития или продаж в лиды."
 DocType: Production Order Operation,Actual Operation Time,Фактическая Время работы
 DocType: Authorization Rule,Applicable To (User),Применимо к (Пользователь)
 DocType: Purchase Taxes and Charges,Deduct,Вычеты €
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Описание работы
 DocType: Student Applicant,Applied,прикладная
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Снова откройте
 DocType: Sales Invoice Item,Qty as per Stock UOM,Кол-во в соответствии со UOM
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Имя Guardian2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специальные символы, кроме ""-"" ""."", ""#"", и ""/"" не пускают в серию имен"
@@ -2292,7 +2334,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Менеджер производства
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Серийный номер {0} находится на гарантии ДО {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Сплит Delivery Note в пакеты.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Поставки
+apps/erpnext/erpnext/hooks.py +107,Shipments,Поставки
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Общая Выделенная сумма (Компания Валюта)
 DocType: Purchase Order Item,To be delivered to customer,Для поставляться заказчику
 DocType: BOM,Scrap Material Cost,Лом Материал Стоимость
@@ -2315,8 +2357,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Параметры варианта товара
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Выберите компанию ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Оставьте пустым, если рассматривать для всех отделов"
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Виды занятости (постоянная, контракт, стажер и т.д.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} является обязательным для продукта {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Виды занятости (постоянная, контракт, стажер и т.д.)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} является обязательным для продукта {1}
 DocType: Process Payroll,Fortnightly,раз в две недели
 DocType: Currency Exchange,From Currency,Из валюты
 DocType: Vital Signs,Weight (In Kilogram),Вес (в килограммах)
@@ -2341,7 +2383,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Пожалуйста, нажмите на кнопку ""Generate Расписание"", чтобы получить график"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Были ошибки во время удаления следующие графики:
 DocType: Bin,Ordered Quantity,Заказанное количество
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","например ""Построить инструменты для строителей """
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","например ""Построить инструменты для строителей """
 DocType: Grading Scale,Grading Scale Intervals,Интервалы Оценочная шкала
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Бухгалтерская запись для {2} может быть сделана только в валюте: {3}
 DocType: Production Order,In Process,В процессе
@@ -2365,11 +2407,10 @@
 DocType: Purchase Invoice,With Payment of Tax,С уплатой налога
 DocType: Expense Claim Detail,Expense Claim Detail,Детали Авансового Отчета
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,ТРИПЛИКАЦИЯ ДЛЯ ПОСТАВЩИКА
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,"Пожалуйста, выберите правильный счет"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,"Пожалуйста, выберите правильный счет"
 DocType: Item,Weight UOM,Вес Единица измерения
 DocType: Salary Structure Employee,Salary Structure Employee,Зарплата Структура сотрудников
 DocType: Patient,Blood Group,Группа крови
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,В ожидании
 DocType: Course,Course Name,Название курса
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Пользователи, которые могут утвердить отпуска приложения конкретного работника"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Оборудование офиса
@@ -2388,7 +2429,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Цены не будут показаны, если прайс-лист не установлен"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Пожалуйста, укажите страну этом правиле судоходства или проверить Доставка по всему миру"
 DocType: Stock Entry,Total Incoming Value,Всего входное значение
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Дебет требуется
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Дебет требуется
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets поможет отслеживать время, стоимость и выставление счетов для Активности сделанной вашей команды"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Покупка Прайс-лист
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Шаблоны переменных показателей поставщика.
@@ -2398,7 +2439,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Оплата Примирение
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Пожалуйста, выберите имя InCharge Лица"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Технология
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Общая сумма невыплаченных: {0}
+DocType: Hub Settings,Unregister from Hub,Отменить регистрацию с Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Общая сумма невыплаченных: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Операция Сайт
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Письмо с предложением
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Создать запросы Материал (ППМ) и производственных заказов.
@@ -2410,7 +2452,9 @@
 DocType: Physician Schedule Time Slot,To Time,Чтобы время
 DocType: Authorization Rule,Approving Role (above authorized value),Утверждении роль (выше уставного стоимости)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Кредит на счету должно быть оплачивается счет
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия: {0} не может быть родитель или ребенок {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Пожалуйста, выберите Вход для студентов, который является обязательным для оплачиваемого студента"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия: {0} не может быть родитель или ребенок {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,"Пожалуйста, выберите Прейскурант, чтобы опубликовать цены."
 DocType: Production Order Operation,Completed Qty,Завершено Кол-во
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Для {0}, только дебетовые счета могут быть связаны с кредитной записью"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Прайс-лист {0} отключена
@@ -2423,39 +2467,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Серийные номера необходимы для продукта {1}. Вы предоставили {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Текущая оценка Оценить
 DocType: Item,Customer Item Codes,Заказчик Предмет коды
+DocType: Training Event,Advance,авансировать
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,для повторного повторения.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Обмен Прибыль / убыток
 DocType: Opportunity,Lost Reason,Забыли Причина
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Новый адрес
 DocType: Quality Inspection,Sample Size,Размер выборки
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,"Пожалуйста, введите Квитанция документ"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,На все продукты уже выписаны счета
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Пожалуйста, сформулируйте действительный 'От делу №'"
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',"Пожалуйста, сформулируйте действительный 'От делу №'"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Дальнейшие МВЗ можно сделать под групп, но записи могут быть сделаны в отношении не-групп"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Пользователи и разрешения
 DocType: Vehicle Log,VLOG.,Видеоблога.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Производственные заказы Создано: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Производственные заказы Создано: {0}
 DocType: Branch,Branch,Ветвь
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Печать и брендинг
 DocType: Company,Total Monthly Sales,Всего ежемесячных продаж
 DocType: Bin,Actual Quantity,Фактическое количество
 DocType: Shipping Rule,example: Next Day Shipping,пример: Следующий день доставка
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Серийный номер {0} не найден
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Подписка была {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Подписка была {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Планирование программы
 DocType: Fee Schedule Program,Student Batch,Student Batch
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,"выберите * из `tabVital Signs`, где patient = &#39;{0}&#39; order by signs_date desc limit 1"
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Создать студента
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Min Grade
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Вы были приглашены для совместной работы над проектом: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Врач недоступен в {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Вы были приглашены для совместной работы над проектом: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Врач недоступен в {0}
 DocType: Leave Block List Date,Block Date,Блок Дата
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Добавить пользовательское поле Идентификатор подписки в doctype {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Уведомление о доставке поставщика
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Применить сейчас
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Применить сейчас
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Фактическое количество {0} / количество ожидающих {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Фактическое количество {0} / количество ожидающих {1}
 DocType: Purchase Invoice,E-commerce GSTIN,Электронная коммерция GSTIN
 DocType: Sales Order,Not Delivered,Не доставлен
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Ожидаемая дата не может быть до даты транзакции
 ,Bank Clearance Summary,Банк уплата по счетам итого
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Создание и управление ежедневные, еженедельные и ежемесячные дайджесты новостей."
 DocType: Appraisal Goal,Appraisal Goal,Оценка Гол
@@ -2463,12 +2508,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,здания
 DocType: Fee Schedule,Fee Structure,Структура оплаты
 DocType: Timesheet Detail,Costing Amount,Калькуляция Сумма
-DocType: Student Admission,Application Fee,Регистрационный взнос
+DocType: Student Admission Program,Application Fee,Регистрационный взнос
 DocType: Process Payroll,Submit Salary Slip,Провести Зарплатную ведомость
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maxiumm скидка на Пункт {0} {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Maxiumm скидка на Пункт {0} {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Импорт наливом
 DocType: Sales Partner,Address & Contacts,Адрес и контакты
 DocType: SMS Log,Sender Name,Имя отправителя
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Сортировать по критериям
 DocType: POS Profile,[Select],[Выберите]
 DocType: Vital Signs,Blood Pressure (diastolic),артериальное давление (диастолическое)
 DocType: SMS Log,Sent To,Отправить
@@ -2477,7 +2523,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Дата следующего контакта не может быть в прошлом
 DocType: Company,For Reference Only.,Только для справки.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Врач {0} недоступен в {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Выберите номер партии
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Выберите номер партии
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Неверный {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,Ссылка Inv
@@ -2493,15 +2539,15 @@
 DocType: Normal Test Items,Require Result Value,Требовать значение результата
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Дело № не может быть 0
 DocType: Item,Show a slideshow at the top of the page,Показ слайдов в верхней части страницы
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Магазины
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Магазины
 DocType: Project Type,Projects Manager,Менеджер проектов
 DocType: Serial No,Delivery Time,Время доставки
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,"Проблемам старения, на основе"
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Назначение отменено
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Назначение отменено
 DocType: Item,End of Life,Конец срока службы
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Путешествия
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Нет активной или по умолчанию Зарплата Структура найдено для сотрудника {0} для указанных дат
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Путешествия
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Нет активной или по умолчанию Зарплата Структура найдено для сотрудника {0} для указанных дат
 DocType: Leave Block List,Allow Users,Разрешить пользователям
 DocType: Purchase Order,Customer Mobile No,Заказчик Мобильная Нет
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Периодическая
@@ -2510,12 +2556,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Обновление Стоимость
 DocType: Item Reorder,Item Reorder,Пункт Переупоряд
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Показать Зарплата скольжению
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,О передаче материала
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,О передаче материала
 DocType: Fees,Send Payment Request,Отправить запрос на оплату
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","не Укажите операции, эксплуатационные расходы и дать уникальную операцию не в вашей деятельности."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Этот документ находится над пределом {0} {1} для элемента {4}. Вы делаете другой {3} против того же {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,"Пожалуйста, установите повторяющиеся после сохранения"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Сумма счета Выберите изменения
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Сумма счета Выберите изменения
 DocType: Purchase Invoice,Price List Currency,Прайс-лист валют
 DocType: Naming Series,User must always select,Пользователь всегда должен выбирать
 DocType: Stock Settings,Allow Negative Stock,Разрешить негативных складе
@@ -2535,7 +2581,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Сотрудник
 DocType: Sample Collection,Collected Time,Время сбора
 DocType: Company,Sales Monthly History,История продаж в месяц
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Выбрать пакет
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Выбрать пакет
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} полностью выставлен
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Жизненно важные признаки
 DocType: Training Event,End Time,Время окончания
@@ -2543,16 +2589,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Отчисления оплаты или убыток
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Стандартные условия договора для продажи или покупки.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Группа по ваучером
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Вы действительно хотите отменить эту встречу?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Воронка продаж
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},"Пожалуйста, установите учетную запись по умолчанию в компоненте Зарплатный {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Обязательно На
 DocType: Rename Tool,File to Rename,Файл Переименовать
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Пожалуйста, выберите BOM для пункта в строке {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Пожалуйста, выберите BOM для пункта в строке {0}"
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Учетная запись {0} не совпадает с компанией {1} в Способе учетной записи: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Указанная ВМ {0} для продукта {1} не существует
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График обслуживания {0} должно быть отменено до отмены этого заказ клиента
+DocType: POS Profile,Applicable for Users,Применимо для пользователей
 DocType: Notification Control,Expense Claim Approved,Авансовый Отчет Одобрен
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Зарплата Скольжение работника {0} уже создано за этот период
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Зарплата Скольжение работника {0} уже создано за этот период
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Фармацевтический
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Стоимость купленных изделий
 DocType: Selling Settings,Sales Order Required,Требования Заказа клиента
@@ -2576,6 +2624,7 @@
 DocType: Offer Letter,Accepted,Принято
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Организация
 DocType: BOM Update Tool,BOM Update Tool,Инструмент обновления спецификации
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Учетная запись участника не указана, настройте учетную запись по умолчанию в компании"
 DocType: SG Creation Tool Course,Student Group Name,Имя Студенческая группа
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Создание сборов
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Пожалуйста, убедитесь, что вы действительно хотите удалить все транзакции для компании. Ваши основные данные останется, как есть. Это действие не может быть отменено."
@@ -2584,29 +2633,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) не может быть больше, чем запланированное количество ({2}) в Производственном Заказе {3}"
 DocType: Shipping Rule,Shipping Rule Label,Правило ярлыке
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Форум пользователей
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Сырьё не может быть пустым.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Не удалось обновить запас, счет-фактура содержит падение пункт доставки."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Сырьё не может быть пустым.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Не удалось обновить запас, счет-фактура содержит падение пункт доставки."
 DocType: Lab Test Sample,Lab Test Sample,Лабораторный пробный образец
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Быстрый журнал запись
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Вы не можете изменить рейтинг, если ВМ упоминается agianst любого продукта"
+DocType: Restaurant,Invoice Series Prefix,Префикс серии Invoice
 DocType: Employee,Previous Work Experience,Предыдущий опыт работы
 DocType: Stock Entry,For Quantity,Для Количество
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Пожалуйста, введите Запланированное Количество по пункту {0} в строке {1}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},"Пожалуйста, введите Запланированное Количество по пункту {0} в строке {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} не проведен
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Запросы на предметы.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Отдельный производственный заказ будет создан для каждого готового хорошего пункта.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} должен быть отрицательным в обратном документе
 ,Minutes to First Response for Issues,Протокол к First Response по делам
 DocType: Purchase Invoice,Terms and Conditions1,Сроки и условиях1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,"Название института, для которого вы устанавливаете эту систему."
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,"Название института, для которого вы устанавливаете эту систему."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Бухгалтерская запись заморожена до этой даты, никто не может сделать / изменить запись, кроме роли, указанной ниже."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Пожалуйста, сохраните документ перед генерацией график технического обслуживания"
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Последняя цена обновлена во всех спецификациях
 DocType: Fee Schedule,Successful,успешный
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Статус проекта
 DocType: UOM,Check this to disallow fractions. (for Nos),"Проверьте это, чтобы запретить фракции. (Для №)"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Были созданы следующие Производственные заказы:
-DocType: Student Admission,Naming Series (for Student Applicant),Именование Series (для студентов Заявителем)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Были созданы следующие Производственные заказы:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Именование Series (для студентов Заявителем)
 DocType: Delivery Note,Transporter Name,Transporter Имя
 DocType: Authorization Rule,Authorized Value,Уставный Значение
 DocType: BOM,Show Operations,Показать операции
@@ -2630,7 +2680,7 @@
 ,Employees working on a holiday,"Сотрудники, работающие на празднике"
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Марк Присутствует
 DocType: Project,% Complete Method,% Полный метод
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Лекарство
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Лекарство
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Техническое обслуживание дата не может быть до даты доставки для Serial No {0}
 DocType: Production Order,Actual End Date,Факт. дата окончания
 DocType: BOM,Operating Cost (Company Currency),Эксплуатационные расходы (Компания Валюта)
@@ -2648,19 +2698,20 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,"Утвержденный Пользователь не может быть тем же пользователем, к которому применимо правило"
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (как в фондовой UOM)
 DocType: SMS Log,No of Requested SMS,Кол-во запрошенных СМС
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Оставьте без оплаты не совпадает с утвержденными записями Оставить заявку
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Оставьте без оплаты не совпадает с утвержденными записями Оставить заявку
 DocType: Campaign,Campaign-.####,Кампания-.# # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следующие шаги
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,"Пожалуйста, предоставьте указанные пункты в наилучших возможных ставок"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Создать счет-фактуру
 DocType: Selling Settings,Auto close Opportunity after 15 days,Авто близко Возможность через 15 дней
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,"Заказы на поставку не допускаются для {0} из-за того, что система показателей имеет значение {1}."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,"Заказы на поставку не допускаются для {0} из-за того, что система показателей имеет значение {1}."
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Конец года
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Предл/Лид %
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,"Конец контракта Дата должна быть больше, чем дата вступления"
 DocType: Vital Signs,Nutrition Values,Значения питания
 DocType: Lab Test Template,Is billable,Является платным
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}","Для Dr {0} необходимо установить как «Расписание врача», так и «Время на встречу»)"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Сторонний дистрибьютер, дилер, агент, филиал или реселлер, который продаёт продукты компании за комиссионное вознаграждение."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} против Заказа {1}
 DocType: Patient,Patient Demographics,Демографические данные пациентов
@@ -2710,7 +2761,6 @@
  10. Добавить или вычесть: Если вы хотите, чтобы добавить или вычесть налог."
 DocType: Homepage,Homepage,Главная страница
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Выберите врача ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',update tabConsultation set invoice = &#39;{0}&#39; где name = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Получ. кол-во
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Создано записей платы - {0}
 DocType: Asset Category Account,Asset Category Account,Категория активов Счет
@@ -2722,7 +2772,7 @@
 DocType: Asset,Manual,Руководство
 DocType: Salary Component Account,Salary Component Account,Зарплатный Компонент
 DocType: Global Defaults,Hide Currency Symbol,Скрыть символ валюты
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","например банк, наличные, кредитная карта"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","например банк, наличные, кредитная карта"
 DocType: Lead Source,Source Name,Имя источника
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Нормальное покоящееся кровяное давление у взрослого человека составляет приблизительно 120 мм рт.ст. систолическое и 80 мм рт.ст. диастолическое, сокращенно «120/80 мм рт.ст.»,"
 DocType: Journal Entry,Credit Note,Кредит-нота
@@ -2741,16 +2791,16 @@
 DocType: Patient,Occupation,Род занятий
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Ряд {0}: Дата начала должна быть раньше даты окончания
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Всего (кол-во)
-DocType: Sales Invoice,This Document,Этот документ
 DocType: Installation Note Item,Installed Qty,Установленная Кол-во
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Это может быть связано с некоторыми недействительными адресами электронной почты в
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Вы добавили
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Обучение Результат
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Обучение Результат
 DocType: Purchase Invoice,Is Paid,Оплачено
 DocType: Salary Structure,Total Earning,Всего Заработок
 DocType: Purchase Receipt,Time at which materials were received,"Момент, в который были получены материалы"
 DocType: Stock Ledger Entry,Outgoing Rate,Исходящие Оценить
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Организация филиал мастер.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Организация филиал мастер.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,или
 DocType: Sales Order,Billing Status,Статус Биллинг
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Сообщить о проблеме
@@ -2765,7 +2815,8 @@
 DocType: Notification Control,Sales Order Message,Заказ клиента Сообщение
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Установить значения по умолчанию, как Болгарии, Валюта, текущий финансовый год и т.д."
 DocType: Payment Entry,Payment Type,Вид оплаты
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Выберите партию для продукта {0}. Не удалось найти такую, которая удовлетворяет этому требованию."
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Выберите партию для продукта {0}. Не удалось найти такую, которая удовлетворяет этому требованию."
+DocType: Hub Category,Parent Category,родительская категория
 DocType: Process Payroll,Select Employees,Выберите Сотрудников
 DocType: Opportunity,Potential Sales Deal,Сделка потенциальных продаж
 DocType: Complaint,Complaints,жалобы
@@ -2803,7 +2854,7 @@
 DocType: Bin,Reserved Quantity,Зарезервировано Количество
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,"Пожалуйста, введите действующий адрес электронной почты"
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,"Пожалуйста, введите действующий адрес электронной почты"
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Выберите товар в корзине
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Выберите товар в корзине
 DocType: Landed Cost Voucher,Purchase Receipt Items,Покупка чеков товары
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Настройка формы
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,задолженность
@@ -2813,15 +2864,15 @@
 DocType: Payment Request,Amount in customer's currency,Сумма в валюте клиента
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Доставка
 DocType: Stock Reconciliation Item,Current Qty,Текущий Кол-во
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Добавить поставщиков
+DocType: Restaurant Menu,Restaurant Menu,Меню ресторана
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Предыдущая
 DocType: Appraisal Goal,Key Responsibility Area,Ключ Ответственность Площадь
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Студенческие Порции помогают отслеживать посещаемость, оценки и сборы для студентов"
 DocType: Payment Entry,Total Allocated Amount,Общая сумма Обозначенная
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Установить учетную запись по умолчанию для вечной инвентаризации
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Установить учетную запись по умолчанию для вечной инвентаризации
 DocType: Item Reorder,Material Request Type,Материал Тип запроса
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural журнал запись на зарплату от {0} до {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage полна, не спасло"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage полна, не спасло"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Ряд {0}: Коэффициент преобразования Единица измерения является обязательным
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Вместимость номера
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ссылка
@@ -2860,16 +2911,18 @@
 DocType: Project,Task Completion,Завершение задачи
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Нет в наличии
 DocType: Appraisal,HR User,Сотрудник отдела кадров
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,"Налоги, которые вычитаются"
-apps/erpnext/erpnext/hooks.py +129,Issues,Вопросов
+apps/erpnext/erpnext/hooks.py +138,Issues,Вопросов
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Статус должен быть одним из {0}
 DocType: Sales Invoice,Debit To,Дебет Для
+DocType: Restaurant Menu Item,Restaurant Menu Item,Пункт меню ресторана
 DocType: Delivery Note,Required only for sample item.,Требуется только для образца пункта.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Остаток после проведения
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Нет зарплаты скольжения находится между {0} и {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Нет зарплаты скольжения находится между {0} и {1}
 ,Pending SO Items For Purchase Request,В ожидании SO предметы для покупки запрос
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,зачисляемых студентов
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} отключен
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,зачисляемых студентов
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} отключен
 DocType: Supplier,Billing Currency,Платежная валюта
 DocType: Sales Invoice,SINV-RET-,СИНВ-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Очень Большой
@@ -2892,6 +2945,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Пожалуйста, укажите кол-во посещений, необходимых"
 DocType: Stock Settings,Default Valuation Method,Метод по умолчанию Оценка
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,плата
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Производится обновление. Это может занять некоторое время.
 DocType: Vehicle Log,Fuel Qty,Топливо Кол-во
 DocType: Production Order Operation,Planned Start Time,Планируемые Время
 DocType: Course,Assessment,оценка
@@ -2907,7 +2961,7 @@
 DocType: Price List,Price List Master,Прайс-лист Мастер
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Все сделок купли-продажи могут быть помечены против нескольких ** продавцы ** так что вы можете устанавливать и контролировать цели.
 ,S.O. No.,КО №
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},"Пожалуйста, создайте клиента из лида {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},"Пожалуйста, создайте клиента из лида {0}"
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Выберите пациента
 DocType: Price List,Applicable for Countries,Применимо для стран
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Имя параметра
@@ -2951,27 +3005,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Расходов / Разница счет ({0}) должен быть ""прибыль или убыток» счета"
 DocType: Project,Copied From,Скопировано из
 DocType: Project,Copied From,Скопировано из
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Ошибка Имя: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,недобор
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Ошибка Имя: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,недобор
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} не связан с {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Посещаемость за работника {0} уже отмечен
 DocType: Packing Slip,If more than one package of the same type (for print),Если более чем один пакет того же типа (для печати)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Укажите клиента по умолчанию в настройках ресторана
 ,Salary Register,Доход Регистрация
 DocType: Warehouse,Parent Warehouse,родитель Склад
 DocType: C-Form Invoice Detail,Net Total,Чистая Всего
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},ВМ (спецификация) по умолчанию для продукта {0} и проекта {1} не найдена
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},ВМ (спецификация) по умолчанию для продукта {0} и проекта {1} не найдена
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Определение различных видов кредита
 DocType: Bin,FCFS Rate,Уровень FCFS
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Непогашенная сумма
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Время (в мин)
 DocType: Project Task,Working,Работающий
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Фото со Очередь (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Финансовый год
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Финансовый год
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} не принадлежит Компании {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,"Не удалось решить функцию оценки критериев для {0}. Убедитесь, что формула действительна."
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,"Стоимость, как на"
 DocType: Healthcare Settings,Out Patient Settings,Настройки пациента
 DocType: Account,Round Off,Округлять
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Количество должно быть положительным
 ,Requested Qty,Запрашиваемые Кол-во
 DocType: Tax Rule,Use for Shopping Cart,Используйте корзину для
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Значение {0} для атрибута {1} не существует в списке действительного пункта значений атрибутов для пункта {2}
@@ -2980,7 +3036,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Расходы будут распределены пропорционально на основе Поз или суммы, по Вашему выбору"
 DocType: Maintenance Visit,Purposes,Цели
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Как минимум один товар должен быть введен с отрицательным количеством в возвратном документе
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Добавить курсы
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операция {0} больше, чем каких-либо имеющихся рабочих часов в рабочей станции {1}, сломать операции в несколько операций"
 ,Requested,Запрошено
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Нет Замечания
@@ -2992,6 +3047,8 @@
 DocType: Employee Loan,Repaid/Closed,Возвращенный / Closed
 DocType: Item,Total Projected Qty,Общая запланированная Кол-во
 DocType: Monthly Distribution,Distribution Name,Распределение Имя
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Поставщик&gt; Тип поставщика
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Показатель оценки не найден для элемента {0}, который требуется для учета записей для {1} {2}. Если элемент совершает транзакцию в качестве элемента оценки нулевой оценки в {1}, укажите это в таблице {1}. В противном случае, пожалуйста, создайте транзакцию входящего запаса для данного элемента или укажите показатель оценки в записи позиции, а затем попробуйте отправить или отменить эту запись"
 DocType: Course,Course Code,Код курса
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},"Контроль качества, необходимые для Пункт {0}"
 DocType: POS Settings,Use POS in Offline Mode,Использовать POS в автономном режиме
@@ -3002,14 +3059,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Управление деревом территорий.
 DocType: Journal Entry Account,Sales Invoice,Счет Продажи
 DocType: Journal Entry Account,Party Balance,Баланс партия
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,"Пожалуйста, выберите Применить скидки на"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,"Пожалуйста, выберите Применить скидки на"
 DocType: Company,Default Receivable Account,По умолчанию задолженность аккаунт
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,"Создать банк запись на общую заработной платы, выплачиваемой за над выбранными критериями"
 DocType: Physician,Physician Schedule,Расписание врачей
 DocType: Purchase Invoice,Deemed Export,Рассмотренный экспорт
 DocType: Stock Entry,Material Transfer for Manufacture,Материал Передача для производства
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Скидка в процентах можно применять либо против прайс-листа или для всех прайс-листа.
-DocType: Purchase Invoice,Half-yearly,Раз в полгода
+DocType: Subscription,Half-yearly,Раз в полгода
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Бухгалтерская Проводка по Запасам
 DocType: Lab Test,LabTest Approver,Подтверждение LabTest
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Вы уже оценили критерии оценки {}.
@@ -3038,13 +3095,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Очень Маленький
 DocType: Company,Standard Template,Стандартный шаблон
 DocType: Training Event,Theory,теория
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Кол-во в запросе на материалы меньше минимального количества для заказа
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Кол-во в запросе на материалы меньше минимального количества для заказа
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Счет {0} заморожен
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Юридическое лицо / Вспомогательный с отдельным Планом счетов бухгалтерского учета, принадлежащего Организации."
 DocType: Payment Request,Mute Email,Отключение E-mail
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Продукты питания, напитки и табак"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Могу только осуществить платеж против нефактурированных {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,"Скорость Комиссия не может быть больше, чем 100"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Могу только осуществить платеж против нефактурированных {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,"Скорость Комиссия не может быть больше, чем 100"
 DocType: Stock Entry,Subcontract,Субподряд
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,"Пожалуйста, введите {0} в первую очередь"
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Нет ответов от
@@ -3062,10 +3119,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Цвет
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Критерии оценки плана
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Запретить заказы на поставку
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,восприимчивый
 DocType: Patient Appointment,Scheduled,Запланированно
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Запрос котировок.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Пожалуйста, настройте систему имен пользователей в человеческих ресурсах&gt; Настройки персонажа"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Пожалуйста, выберите продукт, где ""Складируемый продукт"" ""Нет"" и ""Продаваемый продукт"" ""Да"", и нет никакой другой связки продуктов"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Выбрать клиента
 DocType: Student Log,Academic,Образование
 DocType: Patient,Personal and Social History,Личная и социальная история
 DocType: Fee Schedule,Fee Breakup for each student,Расплата за каждого студента
@@ -3075,7 +3133,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Оценка Оцените
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,дизель
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Прайс-лист Обмен не выбран
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Прайс-лист Обмен не выбран
 apps/erpnext/erpnext/config/healthcare.py +46,Results,Результаты
 ,Student Monthly Attendance Sheet,Student Ежемесячная посещаемость Sheet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Сотрудник {0} уже подало заявку на {1} между {2} и {3}
@@ -3091,7 +3149,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Управление партнерами по сбыту.
 DocType: Quality Inspection,Inspection Type,Инспекция Тип
 DocType: Fee Validity,Visited yet,Посетил еще
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Склады с существующей транзакции не может быть преобразована в группу.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Склады с существующей транзакции не может быть преобразована в группу.
 DocType: Assessment Result Tool,Result HTML,Результат HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Годен до
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Добавить студентов
@@ -3118,7 +3176,7 @@
 DocType: Healthcare Settings,Result Printed,Результат напечатан
 DocType: Asset Category Account,Depreciation Expense Account,Износ счет расходов
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Испытательный Срок
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Просмотреть {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Просмотреть {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Только листовые узлы допускаются в сделке
 DocType: Expense Claim,Expense Approver,Подтверждающий расходы
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Ряд {0}: Предварительная отношении Клиента должен быть кредит
@@ -3130,7 +3188,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Для DateTime
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Расписание курсов удалены:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Журналы для просмотра статуса доставки СМС
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Установить цель продаж
 DocType: Accounts Settings,Make Payment via Journal Entry,Платежи через журнал Вход
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Отпечатано на
 DocType: Item,Inspection Required before Delivery,Осмотр Обязательный перед поставкой
@@ -3138,7 +3195,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,В ожидании Деятельность
 DocType: Patient Appointment,Reminded,напомнил
 DocType: Patient,PID-,PId-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Ваша организация
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Ваша организация
 DocType: Fee Component,Fees Category,Категория плат
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,"Пожалуйста, введите даты снятия."
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
@@ -3150,7 +3207,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Изменить порядок Уровень
 DocType: Company,Chart Of Accounts Template,План счетов бухгалтерского учета шаблона
 DocType: Attendance,Attendance Date,Посещаемость Дата
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Цена продукта {0} обновлена в прайс листе {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Цена продукта {0} обновлена в прайс листе {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Зарплата распада на основе Заработок и дедукции.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,"Счет, имеющий субсчета не может быть преобразован в регистр"
 DocType: Purchase Invoice Item,Accepted Warehouse,Принимающий склад
@@ -3166,9 +3223,10 @@
 ,Employee Birthday,Сотрудник День рождения
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Пакетное посещаемость Инструмент
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,предел Скрещенные
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Запланированный Upto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Инвестиции
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Академический термин с этим &quot;Академический год&quot; {0} и &#39;Term Name&#39; {1} уже существует. Пожалуйста, измените эти записи и повторите попытку."
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Как есть существующие операции против пункта {0}, вы не можете изменить значение {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Как есть существующие операции против пункта {0}, вы не можете изменить значение {1}"
 DocType: UOM,Must be Whole Number,Должно быть целое число
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Новые листья Выделенные (в днях)
 DocType: Purchase Invoice,Invoice Copy,Копия счета
@@ -3178,7 +3236,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Номер Счета
 DocType: Shopping Cart Settings,Orders,Заказы
 DocType: Employee Leave Approver,Leave Approver,Подтверждение отпусков
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Выберите пакет
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Выберите пакет
 DocType: Assessment Group,Assessment Group Name,Название группы по оценке
 DocType: Manufacturing Settings,Material Transferred for Manufacture,"Материал, переданный для производства"
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Пользователь с ролью ""Утверждающий расходы"""
@@ -3193,7 +3251,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Период закрытия входа
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Выберите раздел ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,МВЗ с существующими сделок не могут быть преобразованы в группе
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Сумма {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Сумма {0} {1} {2} {3}
 DocType: Account,Depreciation,Амортизация
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Поставщик (и)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Сотрудник посещаемости Инструмент
@@ -3205,10 +3263,12 @@
 DocType: GL Entry,Voucher No,Ваучер №
 ,Lead Owner Efficiency,Эффективность владельца лида
 ,Lead Owner Efficiency,Эффективность владельца лида
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Самый популярный
 DocType: Leave Allocation,Leave Allocation,Оставьте Распределение
 DocType: Payment Request,Recipient Message And Payment Details,Получатель сообщения и платежные реквизиты
 DocType: Training Event,Trainer Email,Тренер Email
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Запросы Материал {0} создан
+DocType: Restaurant Reservation,No of People,Нет людей
 DocType: Production Planning Tool,Include sub-contracted raw materials,Включите Субдоговорная сырья
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Шаблон терминов или договором.
 DocType: Purchase Invoice,Address and Contact,Адрес и контакт
@@ -3217,10 +3277,11 @@
 DocType: Supplier,Last Day of the Next Month,Последний день следующего месяца
 DocType: Support Settings,Auto close Issue after 7 days,Авто близко Issue через 7 дней
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Оставить не могут быть выделены, прежде чем {0}, а отпуск баланс уже переноса направляются в будущем записи распределения отпуска {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примечание: Из-за / Reference Дата превышает разрешенный лимит клиент дня на {0} сутки (ы)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примечание: Из-за / Reference Дата превышает разрешенный лимит клиент дня на {0} сутки (ы)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Студент Абитуриент
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ОРИГИНАЛ ДЛЯ ПОЛУЧАТЕЛЯ
 DocType: Asset Category Account,Accumulated Depreciation Account,Начисленной амортизации Счет
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Это письмо автогенерировано
 DocType: Stock Settings,Freeze Stock Entries,Замораживание акций Записи
 DocType: Program Enrollment,Boarding Student,Студент-интернат
 DocType: Asset,Expected Value After Useful Life,Ожидаемое значение после срока полезного использования
@@ -3228,7 +3289,7 @@
 DocType: Activity Cost,Billing Rate,Платежная Оценить
 ,Qty to Deliver,Кол-во для доставки
 ,Stock Analytics,Анализ запасов
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,"Операции, не может быть оставлено пустым"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,"Операции, не может быть оставлено пустым"
 DocType: Maintenance Visit Purpose,Against Document Detail No,Против деталях документа Нет
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Тип партии является обязательным
 DocType: Quality Inspection,Outgoing,Исходящий
@@ -3251,7 +3312,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Выберите учащихся вручную для группы на основе действий
 DocType: Journal Entry,User Remark,Примечание Пользователь
 DocType: Lead,Market Segment,Сегмент рынка
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Уплаченная сумма не может быть больше суммарного отрицательного непогашенной {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Уплаченная сумма не может быть больше суммарного отрицательного непогашенной {0}
 DocType: Supplier Scorecard Period,Variables,переменные
 DocType: Employee Internal Work History,Employee Internal Work History,Сотрудник внутреннего Работа История
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Закрытие (д-р)
@@ -3281,21 +3342,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Получить обновления
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Счет {2} не принадлежит Компании {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Материал Запрос {0} отменяется или остановлен
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Оставить управления
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Оставить управления
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Группа по Счет
 DocType: Sales Order,Fully Delivered,Полностью Поставляются
 DocType: Lead,Lower Income,Низкий доход
+DocType: Restaurant Order Entry,Current Order,Текущий заказ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Источник и цель склад не может быть одинаковым для ряда {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разница аккаунт должен быть тип счета активов / пассивов, так как это со Примирение запись Открытие"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},"Освоено Сумма не может быть больше, чем сумма займа {0}"
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Перейти в Программы
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Производственный заказ не создан
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Производственный заказ не создан
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Поле ""С даты"" должно быть после ""До даты"""
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Невозможно изменить статус студента {0} связан с приложением студента {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Невозможно изменить статус студента {0} связан с приложением студента {1}
 DocType: Asset,Fully Depreciated,Полностью Амортизируется
 ,Stock Projected Qty,Прогнозируемое Кол-во Запасов
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Выраженное Посещаемость HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Котировки являются предложениями, предложениями отправленных к своим клиентам"
 DocType: Sales Order,Customer's Purchase Order,Заказ клиента
@@ -3306,8 +3368,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Пожалуйста, установите Количество отчислений на амортизацию бронирования"
 DocType: Supplier Scorecard Period,Calculations,вычисления
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Значение или Кол-во
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Продукции Заказы не могут быть подняты для:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Продукции Заказы не могут быть подняты для:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Минута
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Пожалуйста, установите Naming Series для {0} через Setup&gt; Settings&gt; Naming Series"
 DocType: Purchase Invoice,Purchase Taxes and Charges,Покупка Налоги и сборы
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Перейти к поставщикам
 ,Qty to Receive,Кол-во на получение
@@ -3320,7 +3383,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Кредит на счету должен быть баланс счета
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Все типы поставщиков
 DocType: Global Defaults,Disable In Words,Отключить в словах
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Код товара является обязательным, поскольку Деталь не автоматически нумеруются"
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,"Код товара является обязательным, поскольку Деталь не автоматически нумеруются"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Цитата {0} не типа {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,График обслуживания позиции
 DocType: Sales Order,%  Delivered,% Доставлен
@@ -3342,23 +3405,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Начальная Балансовая стоимость собственных средств
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,сверка
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,осталось
 DocType: Appraisal,Appraisal,Оценка
 DocType: Purchase Invoice,GST Details,Детали GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},Электронная почта отправляется поставщику {0}
+DocType: Item,Default Sales Unit of Measure,Единица измерения продаж по умолчанию
 DocType: Opportunity,OPTY-,ВЗМЖ-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Дата повторяется
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Право подписи
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Оставьте утверждающий должен быть одним из {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Создать сборы
-DocType: Hub Settings,Seller Email,Продавец Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Общая стоимость покупки (через счет покупки)
 DocType: Training Event,Start Time,Время
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Выберите Количество
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Выберите Количество
 DocType: Customs Tariff Number,Customs Tariff Number,Номер таможенного тарифа
 DocType: Patient Appointment,Patient Appointment,Назначение пациента
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"Утверждении роль не может быть такой же, как роль правило применимо к"
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Отказаться от этой Email Дайджест
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Отказаться от этой Email Дайджест
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Получить поставщиков по
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} не найден для элемента {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Перейти на курсы
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Сообщение отправлено
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,"Счет с дочерних узлов, не может быть установлен как книгу"
@@ -3371,11 +3437,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Материал переведен на Производство
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Счет {0} не существует
 DocType: Project,Project Type,Тип проекта
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Для этой задачи существует дочерняя задача. Вы не можете удалить эту задачу.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Либо целевой Количество или целевое количество является обязательным.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Стоимость различных видов деятельности
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Больше никаких результатов
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Стоимость различных видов деятельности
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Настройка событий для {0}, так как работник прилагается к ниже продавцы не имеют идентификатор пользователя {1}"
 DocType: Timesheet,Billing Details,Платежные реквизиты
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Исходный и целевой склад должны быть разными
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Исходный и целевой склад должны быть разными
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},"Не допускается обновление операций перемещений по складу, старше чем {0}"
 DocType: Purchase Invoice Item,PR Detail,PR Подробно
 DocType: Sales Order,Fully Billed,Полностью Объявленный
@@ -3402,7 +3470,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Банковский перевод
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Отметить все
 DocType: Vehicle Log,Invoice Ref,Счет-фактура Ссылка
-DocType: Purchase Order,Recurring Order,Периодический Заказ
 DocType: Company,Default Income Account,По умолчанию Счет Доходы
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Группа клиентов / клиентов
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed финансовых лет Прибыль / убыток (Кредит)
@@ -3416,9 +3483,9 @@
 DocType: Patient,A Negative,А отрицательная
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Ничего больше не показывать.
 DocType: Lead,From Customer,От клиента
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Звонки
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Звонки
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Продукт
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,Порции
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,Порции
 DocType: Project,Total Costing Amount (via Time Logs),Всего Калькуляция Сумма (с помощью журналов Time)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Сделать расписание
 DocType: Purchase Order Item Supplied,Stock UOM,Ед. изм.  Запасов
@@ -3443,7 +3510,7 @@
 DocType: School Settings,Current Academic Term,Текущий академический семестр
 DocType: School Settings,Current Academic Term,Текущий академический семестр
 DocType: Sales Order,Not Billed,Не Объявленный
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Оба Склад должены принадлежать одной Компании
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Оба Склад должены принадлежать одной Компании
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Нет контактов Пока еще не добавлено.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Земельные стоимости путевки сумма
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Платежи Поставщикам
@@ -3452,7 +3519,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Сумма скидки
 DocType: Purchase Invoice,Return Against Purchase Invoice,Вернуться против счет покупки
 DocType: Item,Warranty Period (in days),Гарантийный срок (в днях)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',update `tabPatient Appointment` set sales_invoice = &#39;{0}&#39; где name = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Связь с Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Чистые денежные средства от операционной
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Пункт 4
@@ -3461,8 +3527,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Запись в журнале аккаунт
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Студенческая группа
 DocType: Shopping Cart Settings,Quotation Series,Цитата серии
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Продукт с тем же именем ({0}) существует. Пожалуйста, измените название группы или переименуйте продукт"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,"Пожалуйста, выберите клиента"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Продукт с тем же именем ({0}) существует. Пожалуйста, измените название группы или переименуйте продукт"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,"Пожалуйста, выберите клиента"
 DocType: C-Form,I,Я
 DocType: Company,Asset Depreciation Cost Center,Центр Амортизация Стоимость активов
 DocType: Sales Order Item,Sales Order Date,Дата Заказа клиента
@@ -3471,6 +3537,7 @@
 DocType: Assessment Plan,Assessment Plan,План оценки
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Клиент {0} создан.
 DocType: Stock Settings,Limit Percent,Предельное Процент
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,В настоящее время нет склада на любом складе
 ,Payment Period Based On Invoice Date,Оплата период на основе Накладная Дата
 DocType: Sample Collection,No. of print,Номер печати
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Пропавших без вести Курсы валют на {0}
@@ -3526,13 +3593,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Итого Вычет - Погашение кредита
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,"Текущий спецификации и Нью-BOM не может быть таким же,"
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Зарплата скольжения ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Зарплата скольжения ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Дата выхода на пенсию должен быть больше даты присоединения
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Были ошибки При планировании курса по:
 DocType: Sales Invoice,Against Income Account,Против ДОХОДОВ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% доставлено
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Пункт {0}: Заказал Кол-во {1} не может быть меньше минимального заказа Кол-во {2} (определенной в пункте).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Пункт {0}: Заказал Кол-во {1} не может быть меньше минимального заказа Кол-во {2} (определенной в пункте).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Ежемесячный Процентное распределение
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Войдите в систему как другой пользователь.
 DocType: Territory,Territory Targets,Территория Цели
 DocType: Delivery Note,Transporter Info,Transporter информация
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},"Пожалуйста, установите значение по умолчанию {0} в компании {1}"
@@ -3540,13 +3608,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,То же поставщик был введен несколько раз
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Валовая прибыль / убыток
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Заказ товара Поставляется
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Название компании не может быть компания
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Название компании не может быть компания
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Письмо главы для шаблонов печати.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Титулы для шаблонов печати, например, счет-проформа."
 DocType: Program Enrollment,Walking,Гулять пешком
 DocType: Student Guardian,Student Guardian,Студент-хранитель
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Обвинения типа Оценка не может отмечен как включено
 DocType: POS Profile,Update Stock,Обновление стока
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,в подписке
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Различные единицы измерения (ЕИ) продуктов приведут к некорректному (общему) значению массы нетто. Убедитесь, что вес нетто каждого продукта находится в одной ЕИ."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Оценить
 DocType: Asset,Journal Entry for Scrap,Запись в журнале для лома
@@ -3596,15 +3665,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Система Пользователь (Войти) ID. Если установлено, то это станет по умолчанию для всех форм HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: От {1}
 DocType: Task,depends_on,зависит от
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Очередь для обновления последней цены во всех Биллях материалов. Это может занять несколько минут.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Очередь для обновления последней цены во всех Биллях материалов. Это может занять несколько минут.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Название нового счёта. Примечание: Пожалуйста, не создавайте счета для клиентов и поставщиков"
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Шаблоны Страна мудрый адрес по умолчанию
 DocType: Sales Order Item,Supplier delivers to Customer,Поставщик поставляет Покупателю
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/Item/{0}) нет в наличии
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Из-за / Reference Дата не может быть в течение {0}
+,Sales Payment Summary,Сводка по продажам
+DocType: Restaurant,Restaurant,Ресторан
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Из-за / Reference Дата не может быть в течение {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Импорт и экспорт данных
 DocType: Patient,Account Details,Подробности аккаунта
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Нет студентов не найдено
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Нет студентов не найдено
 DocType: Medical Department,Medical Department,Медицинский отдел
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Критерии оценки поставщика
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Счет Дата размещения
@@ -3615,8 +3686,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,"Пожалуйста, выберите Дата публикации, прежде чем выбрать партию"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Из КУА
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Выберите Котировки
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Выберите Котировки
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Выберите Котировки
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Выберите Котировки
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Количество не Забронированный отчислений на амортизацию может быть больше, чем Общее количество отчислений на амортизацию"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Сделать ОБСЛУЖИВАНИЕ Посетите
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,"Свяжитесь с нами для пользователя, который имеет в продаже Master Менеджер {0} роль"
@@ -3624,7 +3695,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Компания (не клиента или поставщика) хозяин.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Это основано на посещаемости этого студента
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Нет учеников в
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Добавить ещё продукты или открыть полную форму
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Добавить ещё продукты или открыть полную форму
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Перейти к Пользователям
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Оплаченная сумма + сумма списания не могут быть больше общего итога
@@ -3644,37 +3715,40 @@
 DocType: Fee Schedule,Fee Schedule,График оплат
 DocType: Hub Settings,Publish Availability,Опубликовать Наличие
 DocType: Company,Create Chart Of Accounts Based On,"Создание плана счетов бухгалтерского учета, основанные на"
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Невозможно преобразовать его в не-группу. Существуют детские задачи.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,"Дата рождения не может быть больше, чем сегодня."
 ,Stock Ageing,Старение запасов
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Student {0} существует против студента заявителя {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Коррекция округления (валюта компании)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,табель
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,табель
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' отключен
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Установить как Open
 DocType: Cheque Print Template,Scanned Cheque,Сканированные чеками
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Отправлять автоматические  электронные письма Контактам по проводимым операциям.
 DocType: Timesheet,Total Billable Amount,Общая сумма Выплачиваемый
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Пункт 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Порядок въезда
 DocType: Purchase Order,Customer Contact Email,Контакты с клиентами E-mail
 DocType: Warranty Claim,Item and Warranty Details,Описание гарантии и продукта
 DocType: Sales Team,Contribution (%),Вклад (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана, так как ""Наличные или Банковский счет"" не был указан"
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Проект {0} уже существует
 DocType: Medical Department,Nursing User,Уход за больным
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Обязанности
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Срок действия этой цитаты закончился.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Срок действия этой цитаты закончился.
 DocType: Expense Claim Account,Expense Claim Account,Счет Авансового Отчета
 DocType: Accounts Settings,Allow Stale Exchange Rates,Разрешить статичные обменные курсы
 DocType: Sales Person,Sales Person Name,Имя продавца
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Пожалуйста, введите не менее чем 1-фактуру в таблице"
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Добавить пользователей
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Добавить пользователей
 DocType: POS Item Group,Item Group,Группа продукта
 DocType: Item,Safety Stock,Страховой запас
 DocType: Healthcare Settings,Healthcare Settings,Настройки здравоохранения
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,"Прогресс% для задачи не может быть больше, чем 100."
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,"Прогресс% для задачи не может быть больше, чем 100."
 DocType: Stock Reconciliation Item,Before reconciliation,Перед примирения
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Для {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Налоги и сборы Добавил (Компания Валюта)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Налоговый ряд {0} должен иметь учетную запись типа налога или доходов или расходов или платная
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Налоговый ряд {0} должен иметь учетную запись типа налога или доходов или расходов или платная
 DocType: Sales Order,Partly Billed,Небольшая Объявленный
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Пункт {0} должен быть Fixed Asset Item
 DocType: Item,Default BOM,По умолчанию BOM
@@ -3690,6 +3764,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,переменная
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Из накладной
 DocType: Student,Student Email Address,Студент E-mail адрес
+DocType: Item,Hub Warehouse,Склад хабов
 DocType: Physician Schedule Time Slot,From Time,От времени
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,В наличии:
 DocType: Notification Control,Custom Message,Текст сообщения
@@ -3697,9 +3772,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,Наличными или банковский счет является обязательным для внесения записи платежей
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Адрес студента
 DocType: Purchase Invoice,Price List Exchange Rate,Прайс-лист валютный курс
+DocType: POS Profile,POS Profile Name,Название профиля POS
 DocType: Purchase Invoice Item,Rate,Оценить
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Стажер
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Адрес
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Адрес
 DocType: Stock Entry,From BOM,Из спецификации
 DocType: Assessment Code,Assessment Code,Код оценки
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Основной
@@ -3713,11 +3789,12 @@
 DocType: Salary Slip,Salary Structure,Зарплата Структура
 DocType: Account,Bank,Банк:
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авиалиния
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Материал Выпуск
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Материал Выпуск
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Произошла ошибка при создании повторяющихся
 DocType: Material Request Item,For Warehouse,Для Склада
 DocType: Employee,Offer Date,Дата предложения
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Цитаты
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Вы находитесь в автономном режиме. Вы не сможете обновить без подключения к сети.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Вы находитесь в автономном режиме. Вы не сможете обновить без подключения к сети.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Ни один студент группы не создано.
 DocType: Purchase Invoice Item,Serial No,Серийный номер
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,"Ежемесячное погашение Сумма не может быть больше, чем сумма займа"
@@ -3727,17 +3804,18 @@
 DocType: Salary Slip,Total Working Hours,Всего часов работы
 DocType: Subscription,Next Schedule Date,Следующая дата расписания
 DocType: Stock Entry,Including items for sub assemblies,В том числе предметы для суб собраний
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Введите значение должно быть положительным
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Все Территории
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Введите значение должно быть положительным
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Все Территории
 DocType: Purchase Invoice,Items,Продукты
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Студент уже поступил.
 DocType: Fiscal Year,Year Name,Год
 DocType: Process Payroll,Process Payroll,Процесс расчета заработной платы
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,"Есть больше праздников, чем рабочих дней в этом месяце."
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,"Есть больше праздников, чем рабочих дней в этом месяце."
 DocType: Product Bundle Item,Product Bundle Item,Продукт Связка товара
 DocType: Sales Partner,Sales Partner Name,Имя Партнера по продажам
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Запрос на предоставление предложений
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Запрос на предоставление предложений
 DocType: Payment Reconciliation,Maximum Invoice Amount,Максимальная Сумма счета
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,гематология
 DocType: Normal Test Items,Normal Test Items,Обычные тестовые элементы
 DocType: Student Language,Student Language,Student Язык
 apps/erpnext/erpnext/config/selling.py +23,Customers,Клиенты
@@ -3749,10 +3827,11 @@
 DocType: Issue,Opening Time,Открытие Время
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"От и До даты, необходимых"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Фондовые и товарные биржи
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"По умолчанию Единица измерения для варианта &#39;{0}&#39; должно быть такой же, как в шаблоне &#39;{1}&#39;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"По умолчанию Единица измерения для варианта &#39;{0}&#39; должно быть такой же, как в шаблоне &#39;{1}&#39;"
 DocType: Shipping Rule,Calculate Based On,Рассчитать на основе
 DocType: Delivery Note Item,From Warehouse,От Склад
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Нет предметов с Биллом материалов не Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Нет предметов с Биллом материалов не Manufacture
+DocType: Restaurant,Default Customer,Клиент по умолчанию
 DocType: Assessment Plan,Supervisor Name,Имя супервизора
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Не подтверждайте, назначено ли назначение на тот же день"
 DocType: Program Enrollment Course,Program Enrollment Course,Курсы по зачислению в программу
@@ -3780,7 +3859,7 @@
 DocType: Payment Entry,Internal Transfer,Внутренний трансфер
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Детский учетная запись существует для этой учетной записи. Вы не можете удалить этот аккаунт.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Либо целевой Количество или целевое количество является обязательным
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,"Пожалуйста, выберите проводки Дата первого"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Дата открытия должна быть ранее Даты закрытия
 DocType: Leave Control Panel,Carry Forward,Переносить
@@ -3816,6 +3895,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Итого Текущая
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,Бухгалтерская отчетность
 DocType: Drug Prescription,Hour,Час
+DocType: Restaurant Order Entry,Last Sales Invoice,Последний счет продаж
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Новый Серийный номер не может быть Склад. Склад должен быть установлен на фондовой Вступил или приобрести получении
 DocType: Lead,Lead Type,Тип лида
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Вы не уполномочен утверждать листья на Блок Сроки
@@ -3852,65 +3932,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Создание пользователей
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,грамм
 DocType: Supplier Scorecard,Per Month,В месяц
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,"Количество, Изготовление должны быть больше, чем 0."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,"Количество, Изготовление должны быть больше, чем 0."
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Посетите отчет за призыв обслуживания.
 DocType: Stock Entry,Update Rate and Availability,Частота обновления и доступность
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Процент вы имеете право принимать или сдавать более против заказанного количества. Например: Если Вы заказали 100 единиц. и ваш Пособие 10%, то вы имеете право на получение 110 единиц."
 DocType: POS Customer Group,Customer Group,Группа клиентов
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Новый идентификатор партии (необязательно)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Новый идентификатор партии (необязательно)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Новый идентификатор партии (необязательно)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Новый идентификатор партии (необязательно)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Расходов счета является обязательным для пункта {0}
 DocType: BOM,Website Description,Описание
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Чистое изменение в капитале
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,новейший
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,"Пожалуйста, отменить счета покупки {0} первым"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Адрес электронной почты должен быть уникальным, уже существует для {0}"
 DocType: Serial No,AMC Expiry Date,КУА срок действия
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,Квитанция
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,Квитанция
 ,Sales Register,Книга продаж
 DocType: Daily Work Summary Settings Company,Send Emails At,Отправить по электронной почте на
 DocType: Quotation,Quotation Lost Reason,Цитата Забыли Причина
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Выберите домен
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',"выберите * from tabPatient, где name = &#39;{0}&#39;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Референция сделка не {0} от {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Референция сделка не {0} от {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,"Там нет ничего, чтобы изменить."
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Просмотр формы
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Резюме для этого месяца и в ожидании деятельности
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Просмотр формы
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Резюме для этого месяца и в ожидании деятельности
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Добавьте пользователей в свою организацию, кроме вас."
 DocType: Customer Group,Customer Group Name,Группа Имя клиента
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Клиентов еще нет!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Клиентов еще нет!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,О движении денежных средств
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Сумма кредита не может превышать максимальный Сумма кредита {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Лицензия
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},"Пожалуйста, удалите этот счет {0} из C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},"Пожалуйста, удалите этот счет {0} из C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Пожалуйста, выберите переносить, если вы также хотите включить баланс предыдущего финансового года оставляет в этом финансовом году"
 DocType: GL Entry,Against Voucher Type,Против Сертификаты Тип
 DocType: Physician,Phone (R),Телефон (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Добавлены временные интервалы
 DocType: Item,Attributes,Атрибуты
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Включить шаблон
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Пожалуйста, установите Naming Series для {0} через Setup&gt; Settings&gt; Naming Series"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,"Пожалуйста, введите списать счет"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Последняя дата заказа
 DocType: Patient,B Negative,В негативный
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Счет {0} не принадлежит компании {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Серийные номера в строке {0} не совпадают с полем «Поставка»
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Серийные номера в строке {0} не совпадают с полем «Поставка»
 DocType: Student,Guardian Details,Подробнее Гардиан
 DocType: C-Form,C-Form,C-образный
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Марк посещаемости для нескольких сотрудников
 DocType: Vehicle,Chassis No,Шасси Нет
 DocType: Payment Request,Initiated,По инициативе
 DocType: Production Order,Planned Start Date,Планируемая дата начала
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Выберите спецификацию
 DocType: Serial No,Creation Document Type,Создание типа документа
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,"Дата окончания должна быть больше, чем дата начала"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,"Дата окончания должна быть больше, чем дата начала"
 DocType: Leave Type,Is Encash,Является Обналичивание
 DocType: Leave Allocation,New Leaves Allocated,Новые листья Выделенные
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Проект мудрый данные не доступны для коммерческого предложения
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Заканчивается
 DocType: Project,Expected End Date,Ожидаемая дата завершения
 DocType: Budget Account,Budget Amount,Сумма бюджета
 DocType: Appraisal Template,Appraisal Template Title,Оценка шаблона Название
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},С даты {0} для сотрудников {1} не может быть еще до вступления Дата работника {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Коммерческий сектор
 DocType: Patient,Alcohol Current Use,Использование алкоголя
+DocType: Student Admission Program,Student Admission Program,Программа приема студентов
 DocType: Payment Entry,Account Paid To,Счет оплачены до
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Родитель товара {0} не должны быть со пункт
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Все продукты или услуги.
@@ -3919,30 +4001,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Бюджет по Счету {1} для {2} {3} составляет {4}. Он будет израсходован к {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Строка {0} # Счет должен быть типа &quot;Fixed Asset&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Из Кол-во
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Правила для расчета количества груза для продажи
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,и unchcked Отключено в
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Серия является обязательным
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Финансовые услуги
 DocType: Student Sibling,Student ID,Студенческий билет
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Виды деятельности для Время Журналы
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Электронная почта поставщика
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Виды деятельности для Время Журналы
 DocType: Tax Rule,Sales,Продажи
 DocType: Stock Entry Detail,Basic Amount,Основное количество
 DocType: Training Event,Exam,Экзамен
 DocType: Complaint,Complaint,жалоба
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Требуется Склад для Запаса {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Требуется Склад для Запаса {0}
 DocType: Leave Allocation,Unused leaves,Неиспользованные листья
 DocType: Patient,Alcohol Past Use,Использование алкоголя в прошлом
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Государственный счетов
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Переложить
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Fetch разобранном BOM (в том числе узлов)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Переложить
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Fetch разобранном BOM (в том числе узлов)
 DocType: Authorization Rule,Applicable To (Employee),Применимо к (Сотрудник)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Благодаря Дата является обязательным
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Благодаря Дата является обязательным
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Прирост за атрибут {0} не может быть 0
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD С
 DocType: Naming Series,Setup Series,Серия установки
 DocType: Payment Reconciliation,To Invoice Date,Счета-фактуры Дата
 DocType: Supplier,Contact HTML,Связаться с HTML
 ,Inactive Customers,Неактивные клиенты
+DocType: Student Admission Program,Maximum Age,Максимальный возраст
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Покупка Поступления
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Как Ценообразование Правило применяется?
@@ -3961,6 +4045,7 @@
 DocType: GL Entry,Remarks,Примечания
 DocType: Payment Entry,Account Paid From,Счет Оплачено из
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Код сырьевой  позиции
+DocType: Task,Parent Task,Родительская задача
 DocType: Journal Entry,Write Off Based On,Списание на основе
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Создать лид
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Печать и канцелярские
@@ -3969,20 +4054,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Зарплата уже обработали за период между {0} и {1}, Оставьте период применения не может быть в пределах этого диапазона дат."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Установка рекорд для серийный номер
 DocType: Guardian Interest,Guardian Interest,Опекун Проценты
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Настройка значений по умолчанию для счетов-фактур POS
 apps/erpnext/erpnext/config/hr.py +177,Training,Обучение
 DocType: Timesheet,Employee Detail,Сотрудник Деталь
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Идентификатор электронной почты Guardian1
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Идентификатор электронной почты Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,день Дата следующего и повторить на День месяца должен быть равен
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,день Дата следующего и повторить на День месяца должен быть равен
 DocType: Lab Prescription,Test Code,Тестовый код
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Настройки для сайта домашнюю страницу
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},"Запросы не допускаются для {0} из-за того, что значение показателя {1}"
 DocType: Offer Letter,Awaiting Response,В ожидании ответа
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Выше
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Общая сумма {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Недопустимый атрибут {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Общая сумма {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Недопустимый атрибут {0} {1}
 DocType: Supplier,Mention if non-standard payable account,"Упомяните, если нестандартный подлежащий оплате счет"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Один и тот же продукт был введён несколько раз. {list}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',"Выберите группу оценки, отличную от «Все группы оценки»,"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Строка {0}: МВЗ требуется для элемента {1}
 DocType: Training Event Employee,Optional,Необязательный
@@ -4005,12 +4090,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: МВЗ является обязательным для позиции {2}
 DocType: Vehicle,Policy No,Политика Нет
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Получить продукты из комплекта продукта
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Поскольку существует запас против элемента {0}, вы не можете включить свойство вариантов"
 DocType: Asset,Straight Line,Прямая линия
 DocType: Project User,Project User,Проект Пользователь
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Трещина
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Трещина
 DocType: GL Entry,Is Advance,Является Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Посещаемость С Дата и посещаемости на сегодняшний день является обязательным
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,"Пожалуйста, введите 'Является субподряду "", как Да или Нет"
+DocType: Item,Default Purchase Unit of Measure,Единица измерения по умолчанию
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Дата последнего общения
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Дата последнего общения
 DocType: Sales Team,Contact No.,Контактный номер
@@ -4019,7 +4106,6 @@
 DocType: Production Order,Check if material transfer entry is not required,"Проверьте, не требуется ли запись материала"
 DocType: Production Order,Check if material transfer entry is not required,"Проверьте, не требуется ли запись материала"
 DocType: Program Enrollment Tool,Get Students From,Получить студентов из
-DocType: Hub Settings,Seller Country,Продавец Страна
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Опубликовать товары на сайте
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Группа ваших студентов в партиях
 DocType: Authorization Rule,Authorization Rule,Правило Авторизации
@@ -4029,8 +4115,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Продажи Налоги и сборы шаблона
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Итого (кредит)
 DocType: Repayment Schedule,Payment Date,Дата оплаты
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Новое количество партий
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Новое количество партий
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Новое количество партий
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Новое количество партий
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Одежда и аксессуары
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,"Не удалось решить функцию взвешенного балла. Убедитесь, что формула действительна."
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Номер заказа
@@ -4048,6 +4134,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Строка # {0}: Актив {1} не может быть проведен, он уже {2}"
 DocType: Tax Rule,Billing Country,Страна плательщика
 DocType: Purchase Order Item,Expected Delivery Date,Ожидаемая дата поставки
+DocType: Restaurant Order Entry,Restaurant Order Entry,Ввод заказа ресторана
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебет и Кредит не равны для {0} # {1}. Разница {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Представительские расходы
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Создать запрос на материал
@@ -4060,9 +4147,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Счет с существующими проводками не может быть удален
 DocType: Vehicle,Last Carbon Check,Последний Carbon Проверить
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Судебные издержки
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Выберите количество в строке
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Выберите количество в строке
 DocType: Purchase Invoice,Posting Time,Средняя Время
 DocType: Timesheet,% Amount Billed,% Сумма счета
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",«Время в назначении» не установлено для Dr {0}. Добавьте его в мастер-терапевт.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Телефон Расходы
 DocType: Sales Partner,Logo,Логотип
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Проверьте это, если вы хотите, чтобы заставить пользователя выбрать серию перед сохранением. Там не будет по умолчанию, если вы проверить это."
@@ -4073,6 +4161,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Новый Выручка клиентов
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Командировочные Pасходы
 DocType: Maintenance Visit,Breakdown,Разбивка
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Добавить пользовательское поле Подписки в doctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Счет: {0} с валютой: {1} не может быть выбран
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Автоматически обновлять стоимость спецификации через Планировщик, исходя из последней оценки / курса прейскуранта / последней покупки сырья."
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Дата
@@ -4097,7 +4186,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Всего счетов Сумма (с помощью журналов Time)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Id поставщика
 DocType: Payment Request,Payment Gateway Details,Компенсация Детали шлюза
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,"Количество должно быть больше, чем 0"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,"Количество должно быть больше, чем 0"
 DocType: Journal Entry,Cash Entry,Денежные запись
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Дочерние узлы могут быть созданы только в узлах типа &quot;Группа&quot;
 DocType: Leave Application,Half Day Date,Полдня Дата
@@ -4115,12 +4204,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Примечание: Пункт {0} имеет несколько вхождений
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Все контакты.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Аббревиатура компании
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Пользователь {0} не существует
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Пользователь {0} не существует
 DocType: Subscription,SUB-,СУБПОДРЯДЧИКА
 DocType: Item Attribute Value,Abbreviation,Аббревиатура
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Оплата запись уже существует
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Не Authroized с {0} превышает пределы
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Шаблоном Зарплата.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,патология
+DocType: Restaurant Order Entry,Restaurant Table,Стол для ресторанов
 DocType: Leave Type,Max Days Leave Allowed,Максимальное количество дней отпуска разрешены
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Установите Налоговый Правило корзине
 DocType: Purchase Invoice,Taxes and Charges Added,Налоги и сборы Добавил
@@ -4132,10 +4223,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Предложения лидам или клиентам.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Роль разрешено редактировать Замороженный исходный
 ,Territory Target Variance Item Group-Wise,Территория Целевая Разница Пункт Группа Мудрого
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Все Группы клиентов
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Все Группы клиентов
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Накопленный в месяц
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} является обязательным. Может быть, запись Обмен валюты не создана для {1} по {2}."
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Налоговый шаблона является обязательным.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Налоговый шаблона является обязательным.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Счет {0}: Родитель счета {1} не существует
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Прайс-лист Тариф (Компания Валюта)
 DocType: Products Settings,Products Settings,Настройки Продукты
@@ -4161,13 +4252,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Пункт Мудрый Налоговый Подробно
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,институт Аббревиатура
 ,Item-wise Price List Rate,Пункт мудрый Прайс-лист Оценить
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Ценовое предложение поставщика
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Ценовое предложение поставщика
 DocType: Quotation,In Words will be visible once you save the Quotation.,По словам будет виден только вы сохраните цитаты.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Количество ({0}) не может быть дробью в строке {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Количество ({0}) не может быть дробью в строке {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,попыт-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Штрихкод {0} уже используется для продукта {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Штрихкод {0} уже используется для продукта {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Правила для добавления стоимости доставки.
 DocType: Item,Opening Stock,Начальный запас
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Требуется клиентов
@@ -4186,9 +4277,8 @@
 DocType: Customer,From Lead,От лида
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,"Заказы, выпущенные для производства."
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Выберите финансовый год ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,"POS-профиля требуется, чтобы сделать запись POS"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,"POS-профиля требуется, чтобы сделать запись POS"
 DocType: Program Enrollment Tool,Enroll Students,зачислить студентов
-DocType: Hub Settings,Name Token,Имя маркера
 DocType: Lab Test,Approved Date,Утвержденная дата
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Стандартный Продажа
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,"По крайней мере, один склад является обязательным"
@@ -4206,7 +4296,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Кадры
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Оплата Примирение Оплата
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Налоговые активы
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Производственный заказ был {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Производственный заказ был {0}
 DocType: BOM Item,BOM No,ВМ №
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Запись в журнале {0} не имеете учет {1} или уже сравнивается с другой ваучер
@@ -4226,8 +4316,8 @@
 DocType: Currency Exchange,To Currency,В валюту
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Разрешить следующие пользователи утвердить Leave приложений для блочных дней.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Тип Авансового Отчета.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Продажная ставка для продукта {0} ниже его {1}. Продажная ставка должна быть не менее {2}
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Продажная ставка для продукта {0} ниже его {1}. Продажная ставка должна быть не менее {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Продажная ставка для продукта {0} ниже его {1}. Продажная ставка должна быть не менее {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Продажная ставка для продукта {0} ниже его {1}. Продажная ставка должна быть не менее {2}
 DocType: Item,Taxes,Налоги
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Оплаченные и не доставленные
 DocType: Project,Default Cost Center,По умолчанию Центр Стоимость
@@ -4241,15 +4331,15 @@
 DocType: Employee Loan,Fully Disbursed,Полностью Освоено
 DocType: Maintenance Visit,Customer Feedback,Обратная связь с клиентами
 DocType: Account,Expense,Расходы
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,"Оценка не может быть больше, чем максимальный балл"
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,"Оценка не может быть больше, чем максимальный балл"
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Клиенты и поставщики
 DocType: Item Attribute,From Range,От хребта
 DocType: BOM,Set rate of sub-assembly item based on BOM,Установить скорость элемента подзаголовки на основе спецификации
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Синтаксическая ошибка в формуле или условие: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Синтаксическая ошибка в формуле или условие: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Ежедневная работа Резюме Настройки компании
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,"Пункт {0} игнорируется, так как это не складские позиции"
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Подтвердить этот производственный заказ для дальнейшей обработки.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Подтвердить этот производственный заказ для дальнейшей обработки.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Чтобы не применяются Цены правило в конкретной сделки, все применимые правила ценообразования должны быть отключены."
 DocType: Assessment Group,Parent Assessment Group,Родитель группа по оценке
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,работы
@@ -4266,12 +4356,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Пожалуйста, установите фильтр компании blank, если Group By является «Company»"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Дата размещения не может быть будущая дата
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},"Ряд # {0}: Серийный номер {1}, не соответствует {2} {3}"
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,для генерации повторяющихся
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Повседневная Оставить
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Лабораторная проверка UOM.
 DocType: Batch,Batch ID,ID партии
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Примечание: {0}
 ,Delivery Note Trends,Доставка Примечание тенденции
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Резюме этой недели
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Резюме этой недели
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,В наличии Кол-во
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Счет: {0} можно обновить только через  перемещение по складу
 DocType: Student Group Creation Tool,Get Courses,Получить курсы
@@ -4285,7 +4376,6 @@
 DocType: Purchase Order,To Bill,Для Билла
 DocType: Material Request,% Ordered,% заказано
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Для студенческой группы, основанной на курсах, курс будет подтвержден для каждого студента с зачисленных курсов по зачислению в программу."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Введите адрес электронной почты, разделенных запятыми, счет-фактура будет отправлен автоматически на конкретную дату"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Сдельная работа
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Средняя Цена Покупки
 DocType: Task,Actual Time (in Hours),Фактическое время (в часах)
@@ -4299,7 +4389,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Пункт {0} не установка для серийные номера колонке должно быть пустым
 DocType: Accounts Settings,Accounts Settings,Настройки аккаунта
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,Одобрить
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Нет результатов для отправки
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Нет результатов для отправки
 DocType: Customer,Sales Partner and Commission,Партнеры по продажам и комиссия
 DocType: Employee Loan,Rate of Interest (%) / Year,Процентная ставка (%) / год
 ,Project Quantity,Проект Количество
@@ -4311,55 +4401,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Черный
 DocType: BOM Explosion Item,BOM Explosion Item,Дерево ВМ продукта
 DocType: Account,Auditor,Аудитор
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} продуктов произведено
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} продуктов произведено
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Выучить больше
 DocType: Cheque Print Template,Distance from top edge,Расстояние от верхнего края
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Прайс-лист {0} отключен или не существует
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Прайс-лист {0} отключен или не существует
 DocType: Purchase Invoice,Return,Возвращение
 DocType: Production Order Operation,Production Order Operation,Производство Порядок работы
 DocType: Pricing Rule,Disable,Отключить
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Способ оплаты требуется произвести оплату
 DocType: Project Task,Pending Review,В ожидании отзыв
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Назначения и консультации
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} не зарегистрирован в пакете {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} не зарегистрирован в пакете {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} не может быть утилизированы, как это уже {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Итоговая сумма аванса (через Авансовый Отчет)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Отметка отсутствует
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Строка {0}: Валюта BOM # {1} должен быть равен выбранной валюте {2}
 DocType: Journal Entry Account,Exchange Rate,Курс обмена
 DocType: Patient,Additional information regarding the patient,Дополнительная информация о пациенте
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Заказ на продажу {0} не проведен
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Заказ на продажу {0} не проведен
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,Компонент платы
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Управление флотом
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Добавить продукты из
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Управление флотом
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Добавить продукты из
 DocType: Cheque Print Template,Regular,регулярное
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Всего Weightage всех критериев оценки должны быть 100%
-DocType: BOM,Last Purchase Rate,Последняя цена покупки
+DocType: Purchase Order Item,Last Purchase Rate,Последняя цена покупки
 DocType: Account,Asset,Актив
 DocType: Project Task,Task ID,Задача ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Запасов продукта {0} не существует с момента появления вариантов
 DocType: Lab Test,Mobile,Мобильный
 ,Sales Person-wise Transaction Summary,Человек мудрый продаж Общая информация по сделкам
 DocType: Training Event,Contact Number,Контактный номер
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Склад {0} не существует
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Зарегистрироваться на Hub ERPNext
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Склад {0} не существует
 DocType: Monthly Distribution,Monthly Distribution Percentages,Ежемесячные Проценты распределения
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Выбранный продукт не может иметь партию
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Скорость оценки не найдено для пункта {0}, которое требуется делать бухгалтерские записи для {1} {2}. Если элемент сделок как элемент образца в {1}, пожалуйста, отметить, что в {1} таблицы Item. В противном случае, пожалуйста, создать входящие акции сделку по ст или упоминания ставки оценки в записи товара, а затем попытаться завершением заполнения / отменой этой записи"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% материалов доставлено по данной Накладной
+DocType: Training Event,Has Certificate,Имеет сертификат
 DocType: Project,Customer Details,Данные клиента
 DocType: Employee,Reports to,Доклады
 ,Unpaid Expense Claim,Неоплаченные Авансовые Отчеты
 DocType: Payment Entry,Paid Amount,Оплаченная сумма
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Исследуйте цикл продаж
 DocType: Assessment Plan,Supervisor,Руководитель
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,В сети
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,В сети
 ,Available Stock for Packing Items,Доступные Stock для упаковки товаров
 DocType: Item Variant,Item Variant,Вариант продукта
 DocType: Assessment Result Tool,Assessment Result Tool,Оценка результата инструмент
 DocType: BOM Scrap Item,BOM Scrap Item,ВМ отходов продукта
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Отправил заказы не могут быть удалены
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Отправил заказы не могут быть удалены
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс счета в Дебете, запрещена установка 'Баланс должен быть' как 'Кредит'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Управление качеством
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Пункт {0} отключена
@@ -4380,7 +4469,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Разрешить нулевой курс оценки
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Разрешить нулевой курс оценки
 DocType: Training Event Employee,Invited,приглашенный
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,"Несколько активных Зарплатные структуры, найденные для работника {0} для указанных дат"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,"Несколько активных Зарплатные структуры, найденные для работника {0} для указанных дат"
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Настройка шлюза счета.
 DocType: Employee,Employment Type,Вид занятости
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Основные средства
@@ -4392,7 +4481,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Уведомление (дней)
 DocType: Tax Rule,Sales Tax Template,Шаблон Налога с продаж
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Выберите продукты для сохранения счёта
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Выберите продукты для сохранения счёта
 DocType: Employee,Encashment Date,Инкассация Дата
 DocType: Training Event,Internet,интернет
 DocType: Special Test Template,Special Test Template,Специальный тестовый шаблон
@@ -4402,7 +4491,7 @@
 DocType: Academic Term,Term Start Date,Срок дата начала
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Счетчик Opp
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Счетчик Opp
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Прилагается {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Прилагается {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Банк балансовый отчет за Главную книгу
 DocType: Job Applicant,Applicant Name,Имя заявителя
 DocType: Authorization Rule,Customer / Item Name,Заказчик / Название продукта
@@ -4422,7 +4511,7 @@
 DocType: Guardian,Guardian Of ,Хранитель
 DocType: Grading Scale Interval,Threshold,порог
 DocType: BOM Update Tool,Current BOM,Текущий BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Добавить серийный номер
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Добавить серийный номер
 DocType: Production Order Item,Available Qty at Source Warehouse,Доступное количество в исходном хранилище
 apps/erpnext/erpnext/config/support.py +22,Warranty,Гарантия
 DocType: Purchase Invoice,Debit Note Issued,Дебет Примечание Выпущенный
@@ -4445,10 +4534,9 @@
 DocType: Account,Receivable,Дебиторская задолженность
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ряд # {0}: Не разрешено изменять Поставщик как уже существует заказа
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Роль, позволяющая проводить операции, превышающие кредитный лимит, установлена."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Выберите продукты для производства
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Мастер синхронизации данных, это может занять некоторое время"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Выберите продукты для производства
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Мастер синхронизации данных, это может занять некоторое время"
 DocType: Item,Material Issue,Материал выпуск
-DocType: Hub Settings,Seller Description,Продавец Описание
 DocType: Employee Education,Qualification,Квалификаци
 DocType: Item Price,Item Price,Цена продукта
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Моющие средства
@@ -4456,7 +4544,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,От времени не может быть больше времени.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Кино- и видеостудия
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,В обработке
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Продолжить
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Продолжить
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Если включено, система не будет обновлять поля вариантов из шаблона, но скопирует данные ниже указанных полей при создании нового варианта"
 DocType: Salary Detail,Component,Компонент
 DocType: Assessment Criteria,Assessment Criteria Group,Критерии оценки Группа
 DocType: Healthcare Settings,Patient Name By,Имя пациента
@@ -4466,7 +4555,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Пожалуйста, введите утверждении роли или утверждении Пользователь"
 DocType: Journal Entry,Write Off Entry,Списание запись
 DocType: BOM,Rate Of Materials Based On,Оценить материалов на основе
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Поставщик&gt; Тип поставщика
+DocType: Item Variant Settings,Do not Update Variants,Не обновлять варианты
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Поддержка Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Снять все
 DocType: POS Profile,Terms and Conditions,Правила и условия
@@ -4475,7 +4564,7 @@
 DocType: Leave Block List,Applies to Company,Относится к компании
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,"Нельзя отменить, так как проведена учетная запись по Запасам {0}"
 DocType: Employee Loan,Disbursement Date,Расходование Дата
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,«Получатели» не указаны
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,«Получатели» не указаны
 DocType: BOM Update Tool,Update latest price in all BOMs,Обновление последней цены во всех спецификациях
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Медицинская запись
 DocType: Vehicle,Vehicle,Средство передвижения
@@ -4491,14 +4580,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Возм/Лид %
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Активов Амортизация и противовесов
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Сумма {0} {1} переведен из {2} до {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Сумма {0} {1} переведен из {2} до {3}
 DocType: Sales Invoice,Get Advances Received,Получить авансы полученные
 DocType: Email Digest,Add/Remove Recipients,Добавить / Удалить получателей
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Сделка не допускается в отношении остановил производство ордена {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Для установки в этом финансовом году, как по умолчанию, нажмите на кнопку ""Установить по умолчанию"""
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Присоединиться
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Присоединиться
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Нехватка Кол-во
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Вариант продукта {0} существует с теми же атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Вариант продукта {0} существует с теми же атрибутами
 DocType: Employee Loan,Repay from Salary,Погашать из заработной платы
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Запрос платеж против {0} {1} на сумму {2}
@@ -4511,7 +4600,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Позиция в Заказе клиента
 DocType: Salary Slip,Payment Days,Платежные дней
 DocType: Patient,Dormant,бездействующий
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Склады с дочерними узлами не могут быть преобразованы в бухгалтерской книге
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Склады с дочерними узлами не могут быть преобразованы в бухгалтерской книге
 DocType: BOM,Manage cost of operations,Управление стоимостью операций
 DocType: Accounts Settings,Stale Days,Прошлые дни
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Когда любой из проверенных операций ""Представленные"", по электронной почте всплывающее автоматически открывается, чтобы отправить письмо в соответствующий «Контакт» в этой транзакции, с транзакцией в качестве вложения. Пользователь может или не может отправить по электронной почте."
@@ -4525,10 +4614,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Серийный номер {0} уже существует
 ,Requested Items To Be Transferred,Требуемые товары должны быть переданы
 DocType: Expense Claim,Vehicle Log,Автомобиль Вход
-DocType: Purchase Invoice,Recurring Id,Периодическое Id
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Наличие лихорадки (темп&gt; 38,5 ° C / 101,3 ° F или постоянная температура&gt; 38 ° C / 100,4 ° F)"
 DocType: Customer,Sales Team Details,Описание отдела продаж
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Удалить навсегда?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Удалить навсегда?
 DocType: Expense Claim,Total Claimed Amount,Всего заявленной суммы
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Потенциальные возможности для продажи.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Неверный {0}
@@ -4538,7 +4626,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Универмаги
 ,Item Delivery Date,Пункт Дата поставки
 DocType: Warehouse,PIN,ШТЫРЬ
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Настройка вашей школы в ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Настройка вашей школы в ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Базовая Изменение Сумма (Компания Валюта)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Нет учетной записи для следующих складов
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Сохранить документ в первую очередь.
@@ -4550,13 +4638,12 @@
 DocType: Task,Is Milestone,Это этап
 DocType: Daily Work Summary,Email Sent To,Е-мейл отправлен
 DocType: Budget,Warn,Важно
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Вы действительно хотите отменить регистрацию?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Любые другие замечания, отметить усилия, которые должны идти в записях."
 DocType: BOM,Manufacturing User,Сотрудник производства
 DocType: Purchase Invoice,Raw Materials Supplied,Поставленное сырьё
-DocType: Purchase Invoice,Recurring Print Format,Периодическая Формат печати
 DocType: C-Form,Series,Серии значений
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Валюта прейскуранта {0} должна быть {1} или {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Добавить продукты
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Валюта прейскуранта {0} должна быть {1} или {2}
 DocType: Appraisal,Appraisal Template,Оценка шаблона
 DocType: Item Group,Item Classification,Пункт Классификация
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Менеджер по развитию бизнеса
@@ -4570,7 +4657,7 @@
 DocType: Item Attribute Value,Attribute Value,Значение атрибута
 ,Itemwise Recommended Reorder Level,Itemwise Рекомендуем изменить порядок Уровень
 DocType: Salary Detail,Salary Detail,Заработная плата: Подробности
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,"Пожалуйста, выберите {0} первый"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,"Пожалуйста, выберите {0} первый"
 DocType: Appointment Type,Physician,врач
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Партия {0} продукта {1} просрочена
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,консультации
@@ -4581,7 +4668,7 @@
 DocType: Salary Detail,Default Amount,По умолчанию количество
 DocType: Lab Test Template,Descriptive,Описательный
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Склад не найден в системе
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Резюме этого месяца
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Резюме этого месяца
 DocType: Quality Inspection Reading,Quality Inspection Reading,Контроль качества Чтение
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,"""Заморозить остатки старше чем"" должны быть меньше %d дней."
 DocType: Tax Rule,Purchase Tax Template,Налог на покупку шаблон
@@ -4604,12 +4691,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Тренировочные мероприятия / результаты
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Накопленная амортизация на
 DocType: Sales Invoice,C-Form Applicable,C-образный Применимо
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},"Время работы должно быть больше, чем 0 для операции {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},"Время работы должно быть больше, чем 0 для операции {0}"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Склад является обязательным
 DocType: Supplier,Address and Contacts,Адрес и контакты
 DocType: UOM Conversion Detail,UOM Conversion Detail,Единица измерения Преобразование Подробно
 DocType: Program,Program Abbreviation,Программа Аббревиатура
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Производственный заказ не может быть поднят против Item Шаблон
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Производственный заказ не может быть поднят против Item Шаблон
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Расходы обновляются в приобретении получение против каждого пункта
 DocType: Warranty Claim,Resolved By,Решили По
 DocType: Bank Guarantee,Start Date,Дата Начала
@@ -4635,26 +4722,27 @@
 DocType: Employee,Educational Qualification,Образовательный ценз
 DocType: Workstation,Operating Costs,Операционные расходы
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Действие, если накопилось Превышен Ежемесячный бюджет"
-DocType: Purchase Invoice,Submit on creation,Провести по создании
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Валюта для {0} должно быть {1}
+DocType: Subscription,Submit on creation,Провести по создании
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Валюта для {0} должно быть {1}
 DocType: Asset,Disposal Date,Утилизация Дата
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Электронные письма будут отправлены во все активные работники компании на данный час, если у них нет отпуска. Резюме ответов будет отправлен в полночь."
 DocType: Employee Leave Approver,Employee Leave Approver,Сотрудник Оставить утверждающий
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: запись Изменить порядок уже существует для этого склада {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Не можете объявить как потерял, потому что цитаты было сделано."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Обучение Обратная связь
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: запись Изменить порядок уже существует для этого склада {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Не можете объявить как потерял, потому что цитаты было сделано."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Обучение Обратная связь
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Производственный заказ {0} должен быть проведен
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Критерии оценки поставщиков
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},"Пожалуйста, выберите дату начала и дату окончания Пункт {0}"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Курс является обязательным в строке {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,На сегодняшний день не может быть раньше от даты
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Добавить / Изменить цены
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Добавить / Изменить цены
 DocType: Batch,Parent Batch,Родительская партия
 DocType: Cheque Print Template,Cheque Print Template,Чеками печати шаблона
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,План МВЗ
 DocType: Lab Test Template,Sample Collection,Сбор образцов
 ,Requested Items To Be Ordered,Требуемые товары заказываются
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Мои Заказы
 DocType: Price List,Price List Name,Цена Имя
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Ежедневно Резюме Работа для {0}
 DocType: Employee Loan,Totals,Всего:
@@ -4673,12 +4761,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} единиц {1} требуется в {2} на {3} {4} для {5} чтобы завершить эту транзакцию.
 DocType: Fee Schedule,Student Category,Студент Категория
 DocType: Announcement,Student,Ученик
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Название подразделения (департамент) хозяин.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Название подразделения (департамент) хозяин.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Перейти в Комнат
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Пожалуйста, введите сообщение перед отправкой"
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,DUPLICATE ДЛЯ ПОСТАВЩИКА
 DocType: Email Digest,Pending Quotations,До Котировки
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Точка-в-продажи профиля
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Точка-в-продажи профиля
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Конфигурации лабораторных тестов.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Необеспеченных кредитов
 DocType: Cost Center,Cost Center Name,Название учетного отдела
@@ -4688,6 +4776,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Всего выплачено Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,"Сообщения с более, чем 160 символами, будут разделены на несколько"
 DocType: Purchase Receipt Item,Received and Accepted,Получил и принял
+DocType: Hub Settings,Company and Seller Profile,Профиль компании и продавца
 ,GST Itemised Sales Register,Регистр продаж GST
 ,Serial No Service Contract Expiry,Серийный номер Сервисный контракт Срок
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Нельзя кредитовать и дебетовать один счёт за один раз
@@ -4697,10 +4786,11 @@
 DocType: Item,Variant Based On,Вариант Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Всего Weightage назначен должна быть 100%. Это {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Ваши Поставщики
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,"Пожалуйста, исправьте"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,"Невозможно установить, как Остаться в живых, как заказ клиента производится."
 DocType: Request for Quotation Item,Supplier Part No,Деталь поставщика №
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Не можете вычесть, когда категория для &quot;Оценка&quot; или &quot;Vaulation и Total &#39;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Получено от
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Получено от
 DocType: Lead,Converted,Переделанный
 DocType: Item,Has Serial No,Имеет серийный №
 DocType: Employee,Date of Issue,Дата выдачи
@@ -4708,7 +4798,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","В соответствии с настройками покупки, если требуется Приобретение покупки == «ДА», затем для создания счета-фактуры для покупки пользователю необходимо сначала создать покупку для элемента {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Ряд # {0}: Установить Поставщик по пункту {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Строка {0}: значение часов должно быть больше нуля.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,"Изображение {0} на сайте, прикреплённое к продукту {1}, не найдено"
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,"Изображение {0} на сайте, прикреплённое к продукту {1}, не найдено"
 DocType: Issue,Content Type,Тип контента
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Компьютер
 DocType: Item,List this Item in multiple groups on the website.,Перечислите этот пункт в нескольких группах на веб-сайте.
@@ -4719,14 +4809,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Получить несверенные записи
 DocType: Payment Reconciliation,From Invoice Date,От Дата Счета
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,У Вас нет прав для подтверждения
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,Платежная валюта должна быть равна либо по умолчанию comapany в валюте или партии валюты счета
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Платежная валюта должна быть равна либо по умолчанию comapany в валюте или партии валюты счета
 DocType: Healthcare Settings,Laboratory Settings,Настройки лаборатории
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Оставьте Инкассацию
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Что оно делает?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Для Склад
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Все Поступающим Student
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Что оно делает?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Для Склад
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Все Поступающим Student
 ,Average Commission Rate,Средний Уровень Комиссии
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,«Имеет серийный номер» не может быть «Да» для нескладируемого продукта
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,«Имеет серийный номер» не может быть «Да» для нескладируемого продукта
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Выберите статус
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Посещаемость не могут быть отмечены для будущих дат
 DocType: Pricing Rule,Pricing Rule Help,Цены Правило Помощь
@@ -4744,41 +4834,41 @@
 DocType: Item,Customer Code,Код клиента
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Напоминание о дне рождения для {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дни с последнего Заказать
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Дебету счета должны быть баланс счета
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Дебету счета должны быть баланс счета
 DocType: Buying Settings,Naming Series,Наименование серии
 DocType: Leave Block List,Leave Block List Name,Оставьте Имя Блок-лист
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,"Дата страхование начала должна быть меньше, чем дата страхование End"
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,"Пожалуйста, настройте систему именования инструкторов в школе&gt; Настройки школы"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Капитал запасов
 DocType: Timesheet,Production Detail,Производство Деталь
+DocType: Restaurant,Active Menu,Активное меню
 DocType: Target Detail,Target Qty,Целевая Кол-во
 DocType: Shopping Cart Settings,Checkout Settings,Checkout Настройки
 DocType: Attendance,Present,Настоящее.
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Уведомление о доставке {0} не должно быть проведено
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Уведомление о доставке {0} не должно быть проведено
 DocType: Notification Control,Sales Invoice Message,Счет по продажам Написать письмо
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Закрытие счета {0} должен быть типа ответственностью / собственный капитал
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Зарплата Скольжение работника {0} уже создан для табеля {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Зарплата Скольжение работника {0} уже создан для табеля {1}
 DocType: Vehicle Log,Odometer,одометр
 DocType: Sales Order Item,Ordered Qty,Заказал Кол-во
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Пункт {0} отключена
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Пункт {0} отключена
 DocType: Stock Settings,Stock Frozen Upto,Фото Замороженные До
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,ВМ не содержит какой-либо складируемый продукт
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Проектная деятельность / задачи.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,ВМ не содержит какой-либо складируемый продукт
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Проектная деятельность / задачи.
 DocType: Vehicle Log,Refuelling Details,Заправочные Подробнее
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Создать зарплат Slips
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Покупка должна быть проверена, если выбран Применимо для как {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Скидка должна быть меньше 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Последний курс покупки не найден
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Списание Сумма (Компания валют)
 DocType: Sales Invoice Timesheet,Billing Hours,Платежная часы
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,По умолчанию BOM для {0} не найден
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,"Ряд # {0}: Пожалуйста, установите количество тональный"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,По умолчанию BOM для {0} не найден
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,"Ряд # {0}: Пожалуйста, установите количество тональный"
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,"Щёлкните продукты, чтобы добавить их сюда."
 DocType: Fees,Program Enrollment,Программа подачи заявок
 DocType: Landed Cost Voucher,Landed Cost Voucher,Земельные стоимости путевки
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Пожалуйста, установите {0}"
-DocType: Purchase Invoice,Repeat on Day of Month,Повторите с Днем Ежемесячно
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} - неактивный ученик
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} - неактивный ученик
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} - неактивный ученик
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} - неактивный ученик
 DocType: Employee,Health Details,Подробности здоровья
 DocType: Offer Letter,Offer Letter Terms,Условия письма с предложением
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Для создания ссылочного документа запроса платежа требуется
@@ -4787,7 +4877,6 @@
 DocType: Employee External Work History,Salary,Зарплата
 DocType: Serial No,Delivery Document Type,Тип Документа  Отгрузки
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Провести все зарплатные ведомости согласно выбранным выше критериям
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} продуктов синхронизировано
 DocType: Sales Order,Partly Delivered,Небольшая Поставляются
 DocType: Email Digest,Receivables,Дебиторская задолженность
 DocType: Lead Source,Lead Source,Источник лида
@@ -4809,9 +4898,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Старение Диапазон 2
 DocType: SG Creation Tool Course,Max Strength,Максимальная прочность
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM заменить
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Выбрать товары на основе даты поставки
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Выбрать товары на основе даты поставки
 ,Sales Analytics,Аналитика продаж
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Доступно {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Доступно {0}
 ,Prospects Engaged But Not Converted,"Перспективные, но не работающие"
 ,Prospects Engaged But Not Converted,"Перспективные, но не работающие"
 DocType: Manufacturing Settings,Manufacturing Settings,Настройки Производство
@@ -4819,10 +4908,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Mobile Нет
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,"Пожалуйста, введите валюту по умолчанию в компании Master"
 DocType: Stock Entry Detail,Stock Entry Detail,Подробности Складского Акта
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Ежедневные напоминания
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Ежедневные напоминания
 DocType: Products Settings,Home Page is Products,Главная — Продукты
 ,Asset Depreciation Ledger,Износ Леджер активов
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Налоговый Правило конфликты с {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Налоговый Правило конфликты с {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Новое название счёта
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Стоимость поставленного сырья
 DocType: Selling Settings,Settings for Selling Module,Настройки по продаже модуля
@@ -4836,8 +4925,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Пункт {0} должен быть запас товара
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,По умолчанию работы на складе Прогресс
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Настройки по умолчанию для бухгалтерских операций.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Пожалуйста, настройте систему имен пользователей в человеческих ресурсах&gt; Настройки персонажа"
 DocType: Maintenance Visit,MV,М.В.
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Ожидаемая дата не может быть до Материал Дата заказа
+DocType: Restaurant,Default Tax Template,Шаблон налога по умолчанию
 DocType: Fees,Student Details,Сведения о студенте
 DocType: Purchase Invoice Item,Stock Qty,Кол-во в запасе
 DocType: Purchase Invoice Item,Stock Qty,Кол-во в запасе
@@ -4856,8 +4946,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Перейти к элементам
 DocType: Sales Partner,Partner Type,Тип Партнер
 DocType: Purchase Taxes and Charges,Actual,Фактически
+DocType: Restaurant Menu,Restaurant Manager,Менеджер ресторана
 DocType: Authorization Rule,Customerwise Discount,Customerwise Скидка
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Timesheet для выполнения задач.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Timesheet для выполнения задач.
 DocType: Purchase Invoice,Against Expense Account,Против Expense Счет
 DocType: Production Order,Production Order,Производственный заказ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Установка Примечание {0} уже представлен
@@ -4865,7 +4956,6 @@
 DocType: Quotation Item,Against Docname,Против DOCNAME
 DocType: SMS Center,All Employee (Active),Все Сотрудник (Активный)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Просмотр сейчас
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Выберите период, когда счет-фактура будет сгенерирован автоматически"
 DocType: BOM,Raw Material Cost,Стоимость сырья
 DocType: Item Reorder,Re-Order Level,Уровень перезаказа
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Введите предметы и плановый Количество, для которых необходимо повысить производственные заказы или скачать сырье для анализа."
@@ -4878,24 +4968,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Тип отчета является обязательным
 DocType: Item,Serial Number Series,Серийный Номер серии
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Склад является обязательным для Запаса {0} в строке {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Добавить программы
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Розничная и оптовая торговля
 DocType: Issue,First Responded On,Впервые ответил
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Крест Листинг пункта в нескольких группах
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Дата начала и Дата окончания Финансового года уже установлены в финансовом году {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Зазор Дата обновления
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Сплит-пакет
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Сплит-пакет
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Сплит-пакет
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Сплит-пакет
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Успешно Примирение
 DocType: Request for Quotation Supplier,Download PDF,Скачать PDF
 DocType: Production Order,Planned End Date,Планируемая Дата завершения
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Укажите дату расписания
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Где продукты хранятся.
 DocType: Request for Quotation,Supplier Detail,Подробнее о поставщике
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Ошибка в формуле или условие: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Ошибка в формуле или условие: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Сумма по счетам
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Критерии веса должны составлять до 100%
 DocType: Attendance,Attendance,Посещаемость
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,Складские продукты
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,Складские продукты
 DocType: BOM,Materials,Материалы
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Если не установлен, то список нужно будет добавлен в каждом департаменте, где он должен быть применен."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,"Исходный и целевой склад не может быть таким же,"
@@ -4913,6 +5003,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,On Net Всего
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Значение атрибута {0} должно быть в диапазоне от {1} до {2} в приращений {3} для п {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,"Целевая склад в строке {0} должно быть таким же, как производственного заказа"
+DocType: Restaurant Reservation,Waitlisted,лист ожидания
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,"Валюта не может быть изменена после внесения записи, используя другой валюты"
 DocType: Vehicle Service,Clutch Plate,Диск сцепления
 DocType: Company,Round Off Account,Округление аккаунт
@@ -4929,7 +5020,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Имя нового менеджера по продажам
 DocType: Packing Slip,Gross Weight UOM,Вес брутто Единица измерения
 DocType: Delivery Note Item,Against Sales Invoice,Против продаж счета-фактуры
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Введите серийные номера для серийных продуктов
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Введите серийные номера для серийных продуктов
 DocType: Bin,Reserved Qty for Production,Reserved Кол-во для производства
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Оставьте непроверенным, если вы не хотите рассматривать пакет, создавая группы на основе курса."
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Оставьте непроверенным, если вы не хотите рассматривать пакет, создавая группы на основе курса."
@@ -4941,7 +5032,7 @@
 DocType: Lab Test,Test Group,Группа испытаний
 DocType: Payment Reconciliation,Receivable / Payable Account,Счет Дебиторской / Кредиторской задолженности
 DocType: Delivery Note Item,Against Sales Order Item,На Sales Order Пункт
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},"Пожалуйста, сформулируйте Значение атрибута для атрибута {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},"Пожалуйста, сформулируйте Значение атрибута для атрибута {0}"
 DocType: Item,Default Warehouse,По умолчанию Склад
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Бюджет не может быть назначен на учетную запись группы {0}
 DocType: Healthcare Settings,Patient Registration,Регистрация пациентов
@@ -4971,6 +5062,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Продавец
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Бюджет и МВЗ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Множественный режим оплаты по умолчанию не разрешен
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,для
 ,Appointment Analytics,Аналитика встреч
 DocType: Vehicle Service,Half Yearly,Половина года
 DocType: Lead,Blog Subscriber,Подписчик блога
@@ -4989,7 +5081,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Количество котировок
 ,BOM Stock Report,BOM Stock Report
 DocType: Stock Reconciliation Item,Quantity Difference,Количество Разница
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Расчета заработной платы
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Расчета заработной платы
 DocType: Opportunity Item,Basic Rate,Основная ставка
 DocType: GL Entry,Credit Amount,Сумма кредита
 DocType: Cheque Print Template,Signatory Position,подписавшая Позиция
@@ -5003,12 +5095,12 @@
 DocType: Tax Rule,Tax Rule,Налоговое положение
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Поддержание же скоростью протяжении цикла продаж
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Планировать время журналы за пределами рабочего времени рабочих станций.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Клиенты в очереди
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,У доктора {0} нет расписания врачей. Добавьте его в мастер-терапевт
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Клиенты в очереди
 DocType: Student,Nationality,Национальность
 ,Items To Be Requested,Запрашиваемые продукты
-DocType: Purchase Order,Get Last Purchase Rate,Получить последнюю покупку Оценить
 DocType: Company,Company Info,Информация о компании
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Выберите или добавить новый клиент
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Выберите или добавить новый клиент
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,МВЗ требуется заказать требование о расходах
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Применение средств (активов)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Это основано на посещаемости этого сотрудника
@@ -5016,6 +5108,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Дебетовый счет
 DocType: Fiscal Year,Year Start Date,Дата начала года
 DocType: Attendance,Employee Name,Имя Сотрудника
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Номер заказа заказа ресторана
 DocType: Sales Invoice,Rounded Total (Company Currency),Округлые Всего (Компания Валюта)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Не можете скрытой в группу, потому что выбран Тип аккаунта."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,"{0} {1} был изменен. Пожалуйста, обновите."
@@ -5026,6 +5119,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Вознаграждения работникам
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Упакованное количество должно соответствовать количеству  продукта  {0} в строке {1}
 DocType: Production Order,Manufactured Qty,Изготовлено Кол-во
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Создан счет-фактура
 DocType: Purchase Receipt Item,Accepted Quantity,Принято Количество
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},"Пожалуйста, установите по умолчанию список праздников для Employee {0} или Компания {1}"
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} не существует
@@ -5035,18 +5129,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Ряд № {0}: Сумма не может быть больше, чем указанная в Авансовом Отчете {1}. Указанная сумма {2}"
 DocType: Maintenance Schedule,Schedule,Расписание
 DocType: Account,Parent Account,Родитель счета
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,имеется
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,имеется
 DocType: Quality Inspection Reading,Reading 3,Чтение 3
 ,Hub,Хаб
 DocType: GL Entry,Voucher Type,Ваучер Тип
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Прайс-лист не найден или отключен
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Прайс-лист не найден или отключен
 DocType: Lab Test,Approved,Утверждено
 DocType: Pricing Rule,Price,Цена
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как ""левые"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как ""левые"""
+DocType: Hub Settings,Last Sync On,Последняя синхронизация
 DocType: Guardian,Guardian,блюститель
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Оценка {0} создан Требуются {1} в указанный диапазон дат
 DocType: Employee,Education,Образование
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,Del
 DocType: Selling Settings,Campaign Naming By,Кампания Именование По
 DocType: Employee,Current Address Is,Текущий адрес
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Ежемесячная цель продаж (
@@ -5061,7 +5156,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Код курса:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,"Пожалуйста, введите Expense счет"
 DocType: Account,Stock,Склад
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Строка # {0}: Ссылка Тип документа должен быть одним из заказа на поставку, счета-фактуры Покупка или журнал запись"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Строка # {0}: Ссылка Тип документа должен быть одним из заказа на поставку, счета-фактуры Покупка или журнал запись"
 DocType: Employee,Current Address,Текущий адрес
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Если продукт — вариант другого продукта, то описание, изображение, цена, налоги и т. д., будут установлены из шаблона, если не указано другое"
 DocType: Serial No,Purchase / Manufacture Details,Покупка / Производство Подробнее
@@ -5092,7 +5187,7 @@
 DocType: Hub Settings,Hub Settings,Настройки хаба
 DocType: Project,Gross Margin %,Валовая маржа %
 DocType: BOM,With Operations,С операций
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Бухгалтерские проводки для компании {1}, уже были сделаны в валюте {0} . Пожалуйста, выберите счет дебиторской или кредиторской задолженности в валютой {0}."
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Бухгалтерские проводки для компании {1}, уже были сделаны в валюте {0} . Пожалуйста, выберите счет дебиторской или кредиторской задолженности в валютой {0}."
 DocType: Asset,Is Existing Asset,Является ли существующего актива
 DocType: Salary Detail,Statistical Component,Статистический компонент
 DocType: Salary Detail,Statistical Component,Статистический компонент
@@ -5101,13 +5196,14 @@
 DocType: BOM Operation,BOM Operation,ВМ Операция
 DocType: Purchase Taxes and Charges,On Previous Row Amount,На Сумму предыдущей строки
 DocType: Student,Home Address,Адрес главной
+DocType: Item,Has Expiry Date,Имеет дату истечения срока действия
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Параметры вариантов товара.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Передача активов
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,Передача активов
 DocType: POS Profile,POS Profile,POS-профиля
 DocType: Training Event,Event Name,Название события
 DocType: Physician,Phone (Office),Телефон(офисный)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,вход
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Поступающим для {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,вход
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Поступающим для {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Сезонность для установки бюджеты, целевые и т.п."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Имя переменной
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Пункт {0} шаблона, выберите один из его вариантов"
@@ -5116,7 +5212,7 @@
 DocType: Assessment Plan,Room,Комната
 DocType: Purchase Order,Advance Paid,Авансовая выплата
 DocType: Item,Item Tax,Налоги продукта
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Материал Поставщику
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Материал Поставщику
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Акцизный Счет
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% появляется более одного раза
 DocType: Expense Claim,Employees Email Id,Сотрудники Email ID
@@ -5127,32 +5223,30 @@
 DocType: Program,Program Name,Название программы
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Рассмотрим налога или сбора для
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Фактическая Кол-во обязательно
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} в настоящее время имеет {1} систему показателей поставщика, и Заказы на поставку этому поставщику должны выдаваться с осторожностью."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} в настоящее время имеет {1} систему показателей поставщика, и Заказы на поставку этому поставщику должны выдаваться с осторожностью."
 DocType: Employee Loan,Loan Type,Тип кредита
 DocType: Scheduling Tool,Scheduling Tool,Планирование Инструмент
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Кредитная карта
 DocType: BOM,Item to be manufactured or repacked,Пункт должен быть изготовлен или перепакован
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Настройки по умолчанию для операций перемещения по складу
-DocType: Purchase Invoice,Next Date,Следующая дата
 DocType: Employee Education,Major/Optional Subjects,Основные / факультативных предметов
 DocType: Sales Invoice Item,Drop Ship,Корабль падения
+DocType: Hub Settings,Suspended,подвешенный
 DocType: Training Event,Attendees,Присутствующие
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Здесь Вы можете сохранить описание семьи — имя и профессия родителей, супруга и детей"
 DocType: Academic Term,Term End Date,Срок Дата окончания
-DocType: Hub Settings,Seller Name,Продавец Имя
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),"Налоги, которые вычитаются (Компания Валюта)"
 DocType: Item Group,General Settings,Основные настройки
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,"Из валюты и В валюту не может быть таким же,"
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Добавить инструкторов
 DocType: Stock Entry,Repack,Перепаковать
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,"Вы должны сохраните форму, чтобы продолжить"
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Сначала выберите компанию
 DocType: Item Attribute,Numeric Values,Числовые значения
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Прикрепить логотип
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Сток Уровни
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Сток Уровни
 DocType: Customer,Commission Rate,Комиссия
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Созданы {0} оценочные карточки для {1} между:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Создать вариант
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Создать вариант
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Блок отпуска приложений отделом.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Тип оплаты должен быть одним из Присылать, Pay и внутренний перевод"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Аналитик
@@ -5167,11 +5261,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Капитал
 DocType: Shopping Cart Settings,Show Public Attachments,Показать общедоступные приложения
 DocType: Packing Slip,Package Weight Details,Подробности о весе упаковки
+DocType: Restaurant Reservation,Reservation Time,Время резервирования
 DocType: Payment Gateway Account,Payment Gateway Account,Платежный шлюз аккаунт
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,После завершения оплаты перенаправить пользователя на выбранную страницу.
 DocType: Company,Existing Company,Существующие компании
 DocType: Healthcare Settings,Result Emailed,Результат Отправлено по электронной почте
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","Налоговая категория была изменена на «Итого», потому что все элементы не являются складскими запасами"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код товара&gt; Группа товаров&gt; Марка
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Выберите файл CSV
 DocType: Student Leave Application,Mark as Present,Отметить как Present
 DocType: Supplier Scorecard,Indicator Color,Цвет индикатора
@@ -5196,11 +5292,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Make Student Batch
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Является ли переносить
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Получить продукты из ВМ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Получить продукты из ВМ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Время и дни лида
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"Строка # {0}: Дата размещения должна быть такой же, как даты покупки {1} актива {2}"
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Проверьте это, если Студент проживает в Хостеле Института."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Пожалуйста, введите Заказы в приведенной выше таблице"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Пожалуйста, введите Заказы в приведенной выше таблице"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Не Опубликовано Зарплатные Slips
 ,Stock Summary,Суммарный сток
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Передача актива с одного склада на другой
@@ -5216,5 +5312,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Ряд {0}: Дебет запись не может быть связан с {1}
 DocType: Journal Entry,Subscription Section,Раздел подписки
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Аккаунт {0} не существует
+DocType: Training Event,Training Program,Программа обучения
 DocType: Account,Cash,Наличные
 DocType: Employee,Short biography for website and other publications.,Краткая биография для веб-сайта и других изданий.
diff --git a/erpnext/translations/si.csv b/erpnext/translations/si.csv
index 9350908..a98f839 100644
--- a/erpnext/translations/si.csv
+++ b/erpnext/translations/si.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,වැටුප් ක්රමය
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,ලියාපදිංචි වන්න
 DocType: Patient,Divorced,දික්කසාද
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,දැනටමත් සමමුහුර්ත අයිතම
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,විෂය ගනුදෙනුවකින් කිහිපවතාවක් එකතු කිරීමට ඉඩ දෙන්න
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,මෙම Warranty හිමිකම් අවලංගු කිරීම පෙර ද්රව්ය සංචාරය {0} අවලංගු කරන්න
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,පාරිභෝගික භාණ්ඩ
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Approvers තබන්න
 DocType: Sales Partner,Dealer,අලෙවි නියෝජිත
 DocType: Consultation,Investigations,විමර්ශන
+DocType: Restaurant Order Entry,Click Enter To Add,එකතු කිරීමට Enter ක්ලික් කරන්න
 DocType: Employee,Rented,කුලියට ගත්
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,සඳහා පරිශීලක අදාළ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","නතර අවලංගු කිරීමට ප්රථම එය Unstop නිෂ්පාදන සාමය, අවලංගු කල නොහැක"
 DocType: Vehicle Service,Mileage,ධාවනය කර ඇති දුර
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,ඔබට නිසැකවම මෙම වත්කම් ඡන්ද දායකයා කිරීමට අවශ්යද?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,ඔබට නිසැකවම මෙම වත්කම් ඡන්ද දායකයා කිරීමට අවශ්යද?
 DocType: Drug Prescription,Update Schedule,යාවත්කාල උපලේඛනය
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,පෙරනිමි සැපයුම්කරු තෝරන්න
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},ව්යවහාර මුදල් මිල ලැයිස්තුව {0} සඳහා අවශ්ය
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,ලබා ගන්න
 DocType: Job Applicant,Job Applicant,රැකියා අයදුම්කරු
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,මෙය මේ සැපයුම්කරු එරෙහිව ගනුදෙනු මත පදනම් වේ. විස්තර සඳහා පහත කාල සටහනකට බලන්න
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,තවත් ප්රතිඵල නැත.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,නීතිමය
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},සැබෑ වර්ගය බදු පේළිය {0} තුළ අයිතමය ශ්රේණිගත ඇතුළත් කළ නොහැකි
 DocType: Bank Guarantee,Customer,පාරිභෝගික
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),විනිමය අනුපාතය {0} ලෙස {1} සමාන විය යුතු ය ({2})
 DocType: Sales Invoice,Customer Name,පාරිභෝගිකයාගේ නම
 DocType: Vehicle,Natural Gas,ස්වාභාවික ගෑස්
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},බැංකු ගිණුමක් {0} ලෙස නම් කළ නොහැකි
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},බැංකු ගිණුමක් {0} ලෙස නම් කළ නොහැකි
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ප්රධානීන් (හෝ කණ්ඩායම්) ගිණුම්කරණය අයැදුම්පත් ඉදිරිපත් කර ඇති අතර තුලනය නඩත්තු කරගෙන යනු ලබන එරෙහිව.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),{0} ශුන්ය ({1}) ට වඩා අඩු විය නොහැක විශිෂ්ට සඳහා
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,ක්රියාවලිය සඳහා වැටුප් නොලැබී තිබේ.
 DocType: Manufacturing Settings,Default 10 mins,මිනිත්තු 10 Default
 DocType: Leave Type,Leave Type Name,"අවසරය, වර්ගය නම"
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,විවෘත පෙන්වන්න
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,ඉහත සඳහන් පුනරාවර්තනය සඳහා අද මෙම පියවර ගැනීම අවශ්ය වේ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,මාලාවක් සාර්ථකව යාවත්කාලීන කිරීම
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,පරීක්ෂාකාරී වන්න
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,ඉදිරිපත් Accural ජර්නල් සටහන්
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,මිලදී ගැනීමේ නියෝගයක් අයිතම ලැබිය යුතු
 DocType: SMS Center,All Supplier Contact,සියලු සැපයුම්කරු අමතන්න
 DocType: Support Settings,Support Settings,සහාය සැකසුම්
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,අපේක්ෂිත අවසානය දිනය අපේක්ෂා ඇරඹුම් දිනය ඊට වඩා අඩු විය නොහැක
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,අපේක්ෂිත අවසානය දිනය අපේක්ෂා ඇරඹුම් දිනය ඊට වඩා අඩු විය නොහැක
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ෙරෝ # {0}: {2} ({3} / {4}): අනුපාත {1} ලෙස සමාන විය යුතුයි
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,නව නිවාඩු ඉල්ලුම්
 ,Batch Item Expiry Status,කණ්ඩායම අයිතමය කල් ඉකුත් වීමේ තත්ත්වය
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,බැංකු අණකරයකින් ෙගවිය
 DocType: Mode of Payment Account,Mode of Payment Account,ගෙවීම් ගිණුම වන ආකාරය
 DocType: Consultation,Consultation,උපදේශනය
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,විකුණුම් සහ ප්රතිලාභ
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,ප්රභේද පෙන්වන්න
 DocType: Academic Term,Academic Term,අධ්යයන කාලීන
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,ද්රව්ය
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,සෞඛ්ය සත්කාර
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ෙගවීම පමාද (දින)
 DocType: Lab Prescription,Lab Prescription,වෛද්ය නිර්දේශය
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,මිල අනුව වර්ග කරන්න
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,සේවා වියදම්
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},අනුක්රමික අංකය: {0} දැනටමත් විකුණුම් ඉන්වොයිසිය දී නමෙන්ම ඇත: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,ඉන්වොයිසිය
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},අනුක්රමික අංකය: {0} දැනටමත් විකුණුම් ඉන්වොයිසිය දී නමෙන්ම ඇත: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,ඉන්වොයිසිය
 DocType: Maintenance Schedule Item,Periodicity,ආවර්තයක්
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,මුදල් වර්ෂය {0} අවශ්ය වේ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ආරක්ෂක
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,ෙරෝ # {0}:
 DocType: Timesheet,Total Costing Amount,මුළු සැඳුම්ලත් මුදල
 DocType: Delivery Note,Vehicle No,වාහන අංක
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,කරුණාකර මිල ලැයිස්තුව තෝරා
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,කරුණාකර මිල ලැයිස්තුව තෝරා
 DocType: Accounts Settings,Currency Exchange Settings,මුදල් හුවමාරු සැකසුම්
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,පේළියේ # {0}: ගෙවීම් දත්තගොනුව trasaction සම්පූර්ණ කිරීම සඳහා අවශ්ය වේ
 DocType: Production Order Operation,Work In Progress,වර්ක් ඉන් ප්රෝග්රස්
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,කරුණාකර දිනය තෝරන්න
 DocType: Employee,Holiday List,නිවාඩු ලැයිස්තුව
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,කරුණාකර පාසල්&gt; පාසල් සැකසීම් තුළ උපදේශක නාමකරණය සැකසීම
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,ගණකාධිකාරී
+DocType: Hub Settings,Selling Price List,විකුණුම් මිල ලැයිස්තුව
 DocType: Patient,Tobacco Current Use,දුම්කොළ භාවිතය
 DocType: Cost Center,Stock User,කොටස් පරිශීලක
 DocType: Company,Phone No,දුරකතන අංකය
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,නිර්මාණය පාඨමාලා කාලසටහන:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},නව {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},නව {0}: # {1}
 ,Sales Partners Commission,විකුණුම් හවුල්කරුවන් කොමිසම
 DocType: Purchase Invoice,Rounding Adjustment,වටලා සකස් කිරීම
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,කෙටි යෙදුම් චරිත 5 කට වඩා තිබිය නොහැක
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,මව් විස්තර docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","මූලාශ්ර: {0}, අයිතමය සංකේතය: {1} සහ පාරිභෝගික: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kg
-DocType: Student Log,Log,ලඝු
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,රැකියාවක් සඳහා විවෘත.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} ප්රතිඵල යවා ඇත
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} ප්රතිඵල යවා ඇත
 DocType: Item Attribute,Increment,වර්ධකය
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,ටයිපේpan
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,ගබඩා තෝරන්න ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,විවාහක
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},{0} සඳහා අවසර නැත
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,සිට භාණ්ඩ ලබා ගන්න
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},කොටස් බෙදීම සටහන {0} එරෙහිව යාවත්කාලීන කල නොහැක
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},කොටස් බෙදීම සටහන {0} එරෙහිව යාවත්කාලීන කල නොහැක
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},නිෂ්පාදන {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,ලැයිස්තුගත අයිතමයන් කිසිවක් නොමැත
 DocType: Payment Reconciliation,Reconcile,සංහිඳියාවකට
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,විශ්රාම වැටුප් අරමුදල්
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,ඊළඟ ක්ෂය වීම දිනය මිල දී ගත් දිනය පෙර විය නොහැකි
 DocType: Consultation,Consultation Date,උපදේශන දිනය
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNext පරිශීලකයින් සඳහා නිෂ්පාදන ලැයිස්තුගත කිරීම සහ සොයා ගැනීම
 DocType: SMS Center,All Sales Person,සියලු විකුණුම් පුද්ගලයෙක්
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** මාසික බෙදාහැරීම් ** ඔබගේ ව්යාපාරය තුළ යමක සෘතුමය බලපෑම ඇති නම්, ඔබ මාස හරහා අයවැය / ඉලක්ක, බෙදා හැරීමට උපකාරී වේ."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,හමු වූ භාණ්ඩ නොවේ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,වැටුප් ව්යුහය අතුරුදන්
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,හමු වූ භාණ්ඩ නොවේ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,වැටුප් ව්යුහය අතුරුදන්
 DocType: Lead,Person Name,පුද්ගලයා නම
 DocType: Sales Invoice Item,Sales Invoice Item,විකුණුම් ඉන්වොයිසිය අයිතමය
 DocType: Account,Credit,ණය
 DocType: POS Profile,Write Off Cost Center,පිරිවැය මධ්යස්ථානය Off ලියන්න
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",උදා: &quot;ප්රාථමික පාසල්&quot; හෝ &quot;&quot; විශ්වවිද්යාල
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",උදා: &quot;ප්රාථමික පාසල්&quot; හෝ &quot;&quot; විශ්වවිද්යාල
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,කොටස් වාර්තා
 DocType: Warehouse,Warehouse Detail,පොත් ගබඩාව විස්තර
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},ණය සීමාව {0} සඳහා ගනුදෙනුකරුවන්ගේ එතෙර කර ඇත {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,හදුන්වන අවසානය දිනය පසුව කාලීන සම්බන්ධකම් කිරීමට (අධ්යයන වර්ෂය {}) අධ්යයන වසරේ වසර අවසාන දිනය වඩා විය නොහැකිය. දින වකවානු නිවැරදි කර නැවත උත්සාහ කරන්න.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ස්ථාවර වත්කම් ද&quot; වත්කම් වාර්තාවක් අයිතමය එරෙහිව පවතී ලෙස, අපරීක්ෂා විය නොහැකි"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ස්ථාවර වත්කම් ද&quot; වත්කම් වාර්තාවක් අයිතමය එරෙහිව පවතී ලෙස, අපරීක්ෂා විය නොහැකි"
 DocType: Vehicle Service,Brake Oil,බ්රේක් ඔයිල්
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ගණුදෙනුකරු&gt; පාරිභෝගික කණ්ඩායම්&gt; ප්රදේශය
 DocType: Tax Rule,Tax Type,බදු වර්ගය
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,බදු අයකල හැකි ප්රමාණය
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},ඔබ {0} පෙර සටහන් ඇතුළත් කිරීම් එකතු කිරීම හෝ යාවත්කාලීන කිරීම කිරීමට තමන්ට අවසර නොමැති
 DocType: BOM,Item Image (if not slideshow),අයිතමය අනුරුව (Slideshow නොවේ නම්)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ක පාරිභෝගික එකම නමින් පවතී
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(පැය අනුපාතිකය / 60) * සත මෙහෙයුම කාල
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,පේළිය # {0}: ආශ්රේය ලේඛන වර්ගය Expense Claim හෝ Journal Entry වලින් එකක් විය යුතුය
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,ද්රව්ය ලේඛණය තෝරන්න
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,පේළිය # {0}: ආශ්රේය ලේඛන වර්ගය Expense Claim හෝ Journal Entry වලින් එකක් විය යුතුය
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,ද්රව්ය ලේඛණය තෝරන්න
 DocType: SMS Log,SMS Log,කෙටි පණිවුඩ ලොග්
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,භාර අයිතම පිරිවැය
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} මත වන නිවාඩු අතර දිනය සිට මේ දක්වා නැත
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,සේවක ණය
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,ක්රියාකාරකම් ලොග්:
 DocType: Fee Schedule,Send Payment Request Email,ගෙවීම් ඉල්ලීම් ඊ-තැපෑල යවන්න
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,{0} අයිතමය පද්ධතිය තුළ නොපවතියි හෝ කල් ඉකුත් වී ඇත
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,{0} අයිතමය පද්ධතිය තුළ නොපවතියි හෝ කල් ඉකුත් වී ඇත
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,දේපළ වෙළදාම්
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,ගිණුම් ප්රකාශයක්
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ඖෂධ
@@ -210,18 +213,23 @@
 DocType: Employee,B-,බී-
 DocType: Upload Attendance,Import Log,ආනයන ලොග්
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,එම නිර්ණායක මත පදනම් වර්ගය නිෂ්පාදනය ද්රව්ය ඉල්ලීම් අදින්න
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,සාර්ථකව ලියාපදිංචි නොවූ.
 DocType: Training Result Employee,Grade,ශ්රේණියේ
+DocType: Restaurant Table,No of Seats,ආසන ගණන
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","ගතික විෂය එකතු කිරීම සඳහා, ජින්ජාඩ් ටැග් භාවිතා කරන්න <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,සැපයුම්කරු විසින් ඉදිරිපත්
 DocType: SMS Center,All Contact,සියලු විමසීම්
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,ද්රව්ය ලේඛණය සමග සියලු භාණ්ඩ සඳහා දැනටමත් නිර්මාණය නිෂ්පාදනය සාමය
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,ද්රව්ය ලේඛණය සමග සියලු භාණ්ඩ සඳහා දැනටමත් නිර්මාණය නිෂ්පාදනය සාමය
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,වාර්ෂික වැටුප
 DocType: Daily Work Summary,Daily Work Summary,ඩේලි වැඩ සාරාංශය
 DocType: Period Closing Voucher,Closing Fiscal Year,වසා මුදල් වර්ෂය
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,"{0} {1}, ශීත කළ ය"
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,කරුණාකර ගිණුම් සටහන නිර්මාණය කිරීම සඳහා පවතින සමාගම තෝරා
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,"{0} {1}, ශීත කළ ය"
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,කරුණාකර ගිණුම් සටහන නිර්මාණය කිරීම සඳහා පවතින සමාගම තෝරා
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,කොටස් වෙළඳ වියදම්
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ඉලක්ක ගබඩාව තෝරා
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ඉලක්ක ගබඩාව තෝරා
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,ඉලක්ක ගබඩාව තෝරා
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,ඉලක්ක ගබඩාව තෝරා
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,කැමති අමතන්න විද්යුත් ඇතුලත් කරන්න
 DocType: Program Enrollment,School Bus,පාසැල් බසය
 DocType: Journal Entry,Contra Entry,කොන්ට්රා සටහන්
@@ -238,9 +246,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","මෙම සැකිල්ල බාගත නිසි දත්ත පුරවා විකරිත ගොනුව අමුණන්න. තෝරාගත් කාලය තුළ සියලු දිනයන් හා සේවක එකතුවක් පවත්නා පැමිණීම වාර්තා සමග, සැකිල්ල පැමිණ ඇත"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,අයිතමය {0} සකිය ෙහෝ ජීවිතයේ අවසානය නොවේ ළඟා වී
+DocType: Student Admission Program,Minimum Age,අවම වයස
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,උදාහරණය: මූලික ගණිතය
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","බදු ඇතුළත් කිරීමට පේළියේ {0} අයිතමය අනුපාතය, පේළි {1} බදු ද ඇතුළත් විය යුතු අතර"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,මානව සම්පත් මොඩියුලය සඳහා සැකසුම්
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,මානව සම්පත් මොඩියුලය සඳහා සැකසුම්
 DocType: SMS Center,SMS Center,කෙටි පණිවුඩ මධ්යස්ථානය
 DocType: Sales Invoice,Change Amount,මුදල වෙනස්
 DocType: BOM Update Tool,New BOM,නව ද්රව්ය ලේඛණය
@@ -250,7 +259,7 @@
 DocType: Lead,Request Type,ඉල්ලීම වර්ගය
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,සේවක කරන්න
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ගුවන් විදුලි
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,කාමර එකතු කරන්න
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),POS සැකසුම (ඔන්ලයින් / අන්තේ)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,ක්රියාකරවීම
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,මෙහෙයුම් පිළිබඳ විස්තර සිදු කරන ලදී.
 DocType: Serial No,Maintenance Status,නඩත්තු කිරීම තත්වය
@@ -273,6 +282,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,මිල ලැයිස්තුව මිලදී ගැනීම හෝ විකිණීම සඳහා අදාළ විය යුතුය
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},ස්ථාපනය දිනය අයිතමය {0} සඳහා බෙදාහැරීමේ දිනට පෙර විය නොහැකි
 DocType: Pricing Rule,Discount on Price List Rate (%),මිල ලැයිස්තුව අනුපාතිකය (%) වට්ටමක්
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,ජෛව රසායනය
 DocType: Offer Letter,Select Terms and Conditions,නියමයන් හා කොන්දේසි තෝරන්න
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,අගය පෙන්වා
 DocType: Production Planning Tool,Sales Orders,විකුණුම් නියෝග
@@ -307,15 +317,15 @@
 DocType: Sales Partner,Reseller,දේශීය වෙළඳ සහකරුවන්
 DocType: Codification Table,Medical Code,වෛද්ය සංග්රහය
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","පරීක්ෂා නම්, ද්රව්ය ඉල්ලීම් නොවන වස්තු භාණ්ඩ ඇතුළත් වේ."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,සමාගම ඇතුලත් කරන්න
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,සමාගම ඇතුලත් කරන්න
 DocType: Delivery Note Item,Against Sales Invoice Item,විකුණුම් ඉන්වොයිසිය අයිතමය එරෙහිව
 ,Production Orders in Progress,ප්රගති නිෂ්පාදනය නියෝග
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,මූල්ය පහසුකම් ශුද්ධ මුදල්
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage පිරී ඇත, ඉතිරි වුණේ නැහැ"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage පිරී ඇත, ඉතිරි වුණේ නැහැ"
 DocType: Lead,Address & Contact,ලිපිනය සහ ඇමතුම්
 DocType: Leave Allocation,Add unused leaves from previous allocations,පෙර ප්රතිපාදනවලින් භාවිතා නොකරන කොළ එකතු කරන්න
 DocType: Sales Partner,Partner website,සහකරු වෙබ් අඩවිය
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,විෂය එකතු කරන්න
+DocType: Restaurant Order Entry,Add Item,විෂය එකතු කරන්න
 DocType: Lab Test,Custom Result,අභිරුචි ප්රතිඵල
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,අප අමතන්න නම
 DocType: Course Assessment Criteria,Course Assessment Criteria,පාඨමාලා තක්සේරු නිර්ණායක
@@ -328,7 +338,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,මිලදී ගැනීම සඳහා ඉල්ලීම.
 DocType: Lab Test,Submitted Date,ඉදිරිපත් කළ දිනය
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,මෙම මෙම ව්යාපෘතිය එරෙහිව නිර්මාණය කරන ලද කාලය පත්ර මත පදනම් වේ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,"ශුද්ධ වැටුප්, 0 ට වඩා අඩු විය නොහැක"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,"ශුද්ධ වැටුප්, 0 ට වඩා අඩු විය නොහැක"
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","පද්ධතියෙන් පුනරාවර්තී දෝෂ දැනුම් දීම් නැවැත්වීම නැවැත්වීමට, දායකත්වය තුල අබල කළ ක්ෂේත්රය පරික්ෂා කර ඇත"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,පමණක් තෝරා නිවාඩු Approver මෙම නිවාඩු ඉල්ලුම් ඉදිරිපත් කළ හැකි
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,දිනය ලිහිල් සමඟ සම්බන්ධවීම දිනය වඩා වැඩි විය යුතුය
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,වසරකට කොළ
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,ලාභය සහ අඞු කිරීමට
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,ලීටරයකට
 DocType: Task,Total Costing Amount (via Time Sheet),(කාල පත්රය හරහා) මුළු සැඳුම්ලත් මුදල
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,ශිෂ්ය කණ්ඩායම් යටතේ සිසුන් හදන්න
 DocType: Item Website Specification,Item Website Specification,අයිතමය වෙබ් අඩවිය පිරිවිතර
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,අවසරය ඇහිරීම
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},අයිතමය {0} {1} මත ජීවය එහි අවසානය කරා එළඹ ඇති
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},අයිතමය {0} {1} මත ජීවය එහි අවසානය කරා එළඹ ඇති
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,බැංකු අයැදුම්පත්
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,වාර්ෂික
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,කොටස් ප්රතිසන්ධාන අයිතමය
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,ශිෂ්ය කණ්ඩායම් නිර්මාණය මෙවලම පාඨමාලා
 DocType: Lead,Do Not Contact,අමතන්න එපා
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,ඔබගේ සංවිධානය ට උගන්වන්න අය
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,සියලු නැවත නැවත ඉන්වොයිස් පත්ර සොයා ගැනීම සඳහා අනුපම ID. මෙය ඉදිරිපත් කළ මත ජනනය කරනු ලැබේ.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,මෘදුකාංග සංවර්ධකයා
 DocType: Item,Minimum Order Qty,අවම සාමය යවන ලද
 DocType: Pricing Rule,Supplier Type,සැපයුම්කරු වර්ගය
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,Hub දී ප්රකාශයට පත් කරනු ලබයි
 DocType: Student Admission,Student Admission,ශිෂ්ය ඇතුළත් කිරීම
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,අයිතමය {0} අවලංගුයි
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,"ද්රව්ය, ඉල්ලීම්"
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,අයිතමය {0} අවලංගුයි
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,"ද්රව්ය, ඉල්ලීම්"
 DocType: Bank Reconciliation,Update Clearance Date,යාවත්කාලීන නිශ්කාශනෙය් දිනය
 DocType: Item,Purchase Details,මිලදී විස්තර
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"අයිතමය {0} මිලදී ගැනීමේ නියෝගයක් {1} තුළ &#39;, අමු ද්රව්ය සැපයූ&#39; වගුව තුල සොයාගත නොහැකි"
 DocType: Patient Relation,Relation,සම්බන්ධතා
 DocType: Shipping Rule,Worldwide Shipping,ලොව පුරා නැව්
 DocType: Patient Relation,Mother,මව
+DocType: Restaurant Reservation,Reservation End Time,වෙන් කිරීම අවසාන කාලය
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,ගනුදෙනුකරුවන් තහවුරු නියෝග.
 DocType: Purchase Receipt Item,Rejected Quantity,ප්රතික්ෂේප ප්රමාණ
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,ගෙවීම් ඉල්ලීම {0} නිර්මාණය කරන ලදි
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,ගෙවීම් ඉල්ලීම {0} නිර්මාණය කරන ලදි
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,අඩු සංවේදීතාව
 DocType: Notification Control,Notification Control,නිවේදනය පාලන
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,ඔබ ඔබේ පුහුණුව අවසන් කළ පසු තහවුරු කරන්න
 DocType: Lead,Suggestions,යෝජනා
@@ -388,7 +401,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,සේවක තෝරාගත් කැමති ඊ-තැපැල් මත පදනම් සේවකයාට විද්යුත් තැපැල් පණිවුඩ වැටුප් ස්ලිප්
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,ලැයිස්තුවේ ඇති පළමු නිවාඩු Approver පෙරනිමි නිවාඩු Approver ලෙස ස්ථාපනය කරනු ලබන
 DocType: Tax Rule,Shipping County,නැව් කවුන්ටි
-apps/erpnext/erpnext/config/desktop.py +158,Learn,ඉගෙන ගන්න
+apps/erpnext/erpnext/config/desktop.py +159,Learn,ඉගෙන ගන්න
 DocType: Asset,Next Depreciation Date,ඊළඟ ක්ෂය දිනය
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,සේවක අනුව ලද වියදම
 DocType: Accounts Settings,Settings for Accounts,ගිණුම් සඳහා සැකසුම්
@@ -399,13 +412,13 @@
 DocType: Item,Synced With Hub,Hub සමඟ සමමුහුර්ත
 DocType: Vehicle,Fleet Manager,ඇණිය කළමනාකරු
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},පේළියේ # {0}: {1} අයිතමය {2} සඳහා සෘණ විය නොහැකි
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,වැරදි මුරපදය
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,වැරදි මුරපදය
 DocType: Item,Variant Of,අතරින් ප්රභේද්යයක්
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',අවසන් යවන ලද &#39;යවන ලද නිෂ්පාදනය සඳහා&#39; ට වඩා වැඩි විය නොහැක
 DocType: Period Closing Voucher,Closing Account Head,වසා ගිණුම ප්රධානී
 DocType: Employee,External Work History,විදේශ රැකියා ඉතිහාසය
 DocType: Physician,Time per Appointment,පත්වීම සඳහා ගතවන කාලය
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,වටරවුම් විමර්ශන දෝෂ
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,වටරවුම් විමර්ශන දෝෂ
 DocType: Appointment Type,Is Inpatient,රෝගී
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 නම
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,ඔබ සැපයුම් සටහන බේරා වරක් වචන (අපනයන) දෘශ්යමාන වනු ඇත.
@@ -414,19 +427,18 @@
 DocType: Lead,Industry,කර්මාන්ත
 DocType: Employee,Job Profile,රැකියා පැතිකඩ
 DocType: BOM Item,Rate & Amount,අනුපාතිකය සහ මුදල
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,කරුණාකර Setup&gt; Numbering Series හරහා පැමිණීමේදී සංඛ්යාලේඛන මාලාවක් සකසන්න
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,මෙම සමාගමට එරෙහිව ගනු ලබන ගනුදෙනු මත පදනම් වේ. විස්තර සඳහා පහත කාල රේඛා බලන්න
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ස්වයංක්රීය ද්රව්ය ඉල්ලීම් නිර්මානය කිරීම මත ඊ-මේල් මගින් දැනුම් දෙන්න
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,ප්රතිරෝධය
 DocType: Journal Entry,Multi Currency,බහු ව්යවහාර මුදල්
 DocType: Payment Reconciliation Invoice,Invoice Type,ඉන්වොයිසිය වර්ගය
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ගණුදෙනුකරු&gt; පාරිභෝගික කණ්ඩායම&gt; ප්රදේශය
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,සැපයුම් සටහන
 DocType: Consultation,Encounter Impression,පෙනෙන්නට ඇත
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,බදු සකස් කිරීම
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,අලෙවි වත්කම් පිරිවැය
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,ඔබ එය ඇද පසු ගෙවීම් සටහන් වෙනස් කර ඇත. කරුණාකර එය නැවත නැවත අදින්න.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} අයිතමය බදු දී දෙවරක් ඇතුළත්
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,මේ සතියේ හා ෙ කටයුතු සඳහා සාරාංශය
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} අයිතමය බදු දී දෙවරක් ඇතුළත්
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,මේ සතියේ හා ෙ කටයුතු සඳහා සාරාංශය
 DocType: Student Applicant,Admitted,ඇතුළත්
 DocType: Workstation,Rent Cost,කුලියට වියදම
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,ක්ෂය පසු ප්රමාණය
@@ -441,36 +453,35 @@
 DocType: Shipping Rule,Valid for Countries,රටවල් සඳහා වලංගු
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,මෙම අයිතමය මඟින් සැකිල්ල වන අතර ගනුදෙනු භාවිතා කළ නොහැකි වනු ඇත. &#39;කිසිම පිටපත්&#39; නියම නොකරන්නේ නම් අයිතමය ගුණාංග එම ප්රභේද තුලට පිටපත් කරනු ඇත
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,මුළු සාමය සලකා බලන
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","සේවක තනතුර (උදා: ප්රධාන විධායක නිලධාරී, අධ්යක්ෂ ආදිය)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","සේවක තනතුර (උදා: ප්රධාන විධායක නිලධාරී, අධ්යක්ෂ ආදිය)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,පාරිභෝගික ව්යවහාර මුදල් පාරිභෝගික පදනම මුදල් බවට පරිවර්තනය වන අවස්ථාවේ අනුපාතය
 DocType: Course Scheduling Tool,Course Scheduling Tool,පාඨමාලා අවස මෙවලම
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ෙරෝ # {0}: ගැනුම් දැනට පවතින වත්කම් {1} එරෙහිව කළ නොහැකි
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[හදිසි විය හැකි]% s සඳහා පුනරාවර්තනය වන විටදී දෝශයක්
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[හදිසි විය හැකි]% s සඳහා පුනරාවර්තනය වන විටදී දෝශයක්
 DocType: Item Tax,Tax Rate,බදු අනුපාතය
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} කාලයක් සඳහා සේවක {1} සඳහා වන විටත් වෙන් {2} {3} වෙත
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,විෂය තෝරා
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,විෂය තෝරා
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,මිලදී ගැනීම ඉන්වොයිසිය {0} දැනටමත් ඉදිරිපත්
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},ෙරෝ # {0}: කණ්ඩායම කිසිදු {1} {2} ලෙස සමාන විය යුතුයි
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,නොවන සමූහ පරිවර්තනය
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,කණ්ඩායම (ගොඩක්) යනු විෂය ය.
 DocType: C-Form Invoice Detail,Invoice Date,ඉන්වොයිසිය දිනය
 DocType: GL Entry,Debit Amount,ඩෙබිට් මුදල
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},එහි එකම {0} {1} තුළ සමාගම අනුව 1 ගිණුම විය හැක
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,කරුණාකර ඇමුණුම බලන්න
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},එහි එකම {0} {1} තුළ සමාගම අනුව 1 ගිණුම විය හැක
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,කරුණාකර ඇමුණුම බලන්න
 DocType: Purchase Order,% Received,% ලැබී
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ශිෂ්ය කණ්ඩායම් නිර්මාණය කරන්න
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,මේ වන විටත් සම්පූර්ණ setup !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,මේ වන විටත් සම්පූර්ණ setup !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,ණය සටහන මුදල
 DocType: Setup Progress Action,Action Document,ක්රියාකාරී ලේඛනය
 ,Finished Goods,නිමි භාණ්ඩ
 DocType: Delivery Note,Instructions,උපදෙස්
 DocType: Quality Inspection,Inspected By,පරීක්ෂා කරන ලද්දේ
 DocType: Maintenance Visit,Maintenance Type,නඩත්තු වර්ගය
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} පාඨමාලා {2} ලියාපදිංචි වී නොමැති
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,අයිතම කේතය&gt; අයිතමය කාණ්ඩ&gt; වෙළඳ නාමය
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} පාඨමාලා {2} ලියාපදිංචි වී නොමැති
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},අනු අංකය {0} සැපයුම් සටහන {1} අයත් නොවේ
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,අයිතම එකතු කරන්න
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,අයිතම එකතු කරන්න
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,අයිතමය තත්ත්ව පරීක්ෂක පරාමිති
 DocType: Leave Application,Leave Approver Name,අවසරය Approver නම
 DocType: Depreciation Schedule,Schedule Date,උපෙල්ඛනෙය් දිනය
@@ -492,7 +503,7 @@
 DocType: Salary Slip Timesheet,Working Hours,වැඩ කරන පැය
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,දැනට පවතින මාලාවේ ආරම්භක / වත්මන් අනුක්රමය අංකය වෙනස් කරන්න.
 DocType: Dosage Strength,Strength,ශක්තිය
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,නව පාරිභෝගික නිර්මාණය
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,නව පාරිභෝගික නිර්මාණය
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","බහු මිල නියම රීති පවතින දිගටම සිදු වන්නේ නම්, පරිශීලකයන් ගැටුම විසඳීමට අතින් ප්රමුඛ සකස් කරන ලෙස ඉල්ලා ඇත."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,මිලදී ගැනීම නියෝග නිර්මාණය
 ,Purchase Register,මිලදී රෙජිස්ටර්
@@ -511,7 +522,7 @@
 DocType: Lab Test Template,Single,තනි
 DocType: Salary Slip,Total Loan Repayment,මුළු ණය ආපසු ගෙවීමේ
 DocType: Account,Cost of Goods Sold,විකුණුම් පිරිවැය
-DocType: Purchase Invoice,Yearly,වාර්ෂිකව
+DocType: Subscription,Yearly,වාර්ෂිකව
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,පිරිවැය මධ්යස්ථානය ඇතුලත් කරන්න
 DocType: Drug Prescription,Dosage,ආහාරය
 DocType: Journal Entry Account,Sales Order,විකුණුම් න්යාය
@@ -542,7 +553,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,සියලු නිෂ්පාදන ක්රියාවලීන් සඳහා වන ගෝලීය සැකසුම්.
 DocType: Accounts Settings,Accounts Frozen Upto,ගිණුම් ශීත කළ තුරුත්
 DocType: SMS Log,Sent On,දා යවන
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,ගති ලක්ෂණය {0} දන්ත ධාතුන් වගුව කිහිපවතාවක් තෝරාගත්
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,ගති ලක්ෂණය {0} දන්ත ධාතුන් වගුව කිහිපවතාවක් තෝරාගත්
 DocType: HR Settings,Employee record is created using selected field. ,සේවක වාර්තාවක් තෝරාගත් ක්ෂේත්ර භාවිතා කිරීමෙන්ය.
 DocType: Sales Order,Not Applicable,අදාළ නොවේ
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,නිවාඩු ස්වාමියා.
@@ -567,13 +578,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,වෙන් මුළු කොළ අනිවාර්ය වේ
 DocType: Patient,AB Positive,AB ධනාත්මක
 DocType: Job Opening,Description of a Job Opening,රැකියාවක් ආරම්භ කිරීම පිළිබඳ විස්තරය
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,අද විභාග කටයුතු
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,අද විභාග කටයුතු
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,පැමිනීමේ වාර්තාව.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet පදනම් වැටුප් වැටුප් සංරචක.
 DocType: Sales Order Item,Used for Production Plan,නිශ්පාදන සැළැස්ම සඳහා භාවිතා
 DocType: Employee Loan,Total Payment,මුළු ගෙවීම්
 DocType: Manufacturing Settings,Time Between Operations (in mins),මෙහෙයුම් අතර කාලය (මිනිත්තු දී)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} පියවර අවසන් කළ නොහැකි නිසා අවලංගු
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} පියවර අවසන් කළ නොහැකි නිසා අවලංගු
 DocType: Customer,Buyer of Goods and Services.,භාණ්ඩ හා සේවා මිලදී ගන්නාගේ.
 DocType: Journal Entry,Accounts Payable,ගෙවිය යුතු ගිණුම්
 DocType: Patient,Allergies,අසාත්මිකතා
@@ -585,23 +596,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,අනතුරු ඇඟවීම් මිලදී ගැනීමේ ඇණවුම්
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,ඔබේ ගනුදෙනුකරුවන් කිහිපයක් සඳහන් කරන්න. ඔවුන් සංවිධාන හෝ පුද්ගලයින් විය හැකි ය.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,ගොඩනගනු කිරීමට තරම් අමතර කොටස්
+DocType: POS Profile User,POS Profile User,POS පැතිකඩ පරිශීලක
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,සෘජු ආදායම්
 DocType: Patient Appointment,Date TIme,දිනය වෙලාව
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","ගිණුම් වර්ගීකරණය නම්, ගිණුම් මත පදනම් පෙරීමට නොහැකි"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,පරිපාලන නිලධාරී
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,තෝරා පාඨමාලාව කරුණාකර
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,තෝරා පාඨමාලාව කරුණාකර
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,තෝරා පාඨමාලාව කරුණාකර
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,තෝරා පාඨමාලාව කරුණාකර
 DocType: Codification Table,Codification Table,සංගහ වගුව
 DocType: Timesheet Detail,Hrs,ට
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,කරුණාකර සමාගම තෝරා
 DocType: Stock Entry Detail,Difference Account,වෙනස ගිණුම
 DocType: Purchase Invoice,Supplier GSTIN,සැපයුම්කරු GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,එහි රඳා කාර්ය {0} වසා නොවේ ලෙස සමීප කාර්ය කළ නොහැකි ය.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,ද්රව්ය ඉල්ලීම් උත්ථාන කරනු ලබන සඳහා ගබඩා ඇතුලත් කරන්න
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,එහි රඳා කාර්ය {0} වසා නොවේ ලෙස සමීප කාර්ය කළ නොහැකි ය.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,ද්රව්ය ඉල්ලීම් උත්ථාන කරනු ලබන සඳහා ගබඩා ඇතුලත් කරන්න
 DocType: Production Order,Additional Operating Cost,අතිරේක මෙහෙයුම් පිරිවැය
 DocType: Lab Test Template,Lab Routine,Lab Routine
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,අලංකාර ආලේපන
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","ඒකාබද්ධ කිරීමට, පහත සඳහන් ලක්ෂණ භාණ්ඩ යන දෙකම සඳහා එකම විය යුතු"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","ඒකාබද්ධ කිරීමට, පහත සඳහන් ලක්ෂණ භාණ්ඩ යන දෙකම සඳහා එකම විය යුතු"
 DocType: Shipping Rule,Net Weight,ශුද්ධ බර
 DocType: Employee,Emergency Phone,හදිසි දුරකථන
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,මිලට ගන්න
@@ -612,7 +624,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,සීමකය 0% සඳහා ශ්රේණියේ නිර්වචනය කරන්න
 DocType: Sales Order,To Deliver,ගලවාගනියි
 DocType: Purchase Invoice Item,Item,අයිතමය
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,අනු කිසිදු අයිතමය අල්පයක් විය නොහැකි
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,ඉහළ සංවේදීතාව
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,අනු කිසිදු අයිතමය අල්පයක් විය නොහැකි
 DocType: Journal Entry,Difference (Dr - Cr),වෙනස (ආචාර්ය - Cr)
 DocType: Account,Profit and Loss,ලාභ සහ අලාභ
 DocType: Patient,Risk Factors,අවදානම් සාධක
@@ -621,7 +634,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,කළමනාකාර උප කොන්ත්රාත්
 DocType: Vital Signs,Body Temperature,ශරීරය උෂ්ණත්වය
 DocType: Project,Project will be accessible on the website to these users,ව්යාපෘති මේ පරිශීලකයන්ට එම වෙබ් අඩවිය පිවිසිය හැකි වනු ඇත
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,ව ාපෘති වර්ගය නිර්වචනය කරන්න.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,ව ාපෘති වර්ගය නිර්වචනය කරන්න.
 DocType: Supplier Scorecard,Weighting Function,බර කිරිමේ කාර්යය
 DocType: Physician,OP Consulting Charge,OP උපදේශන ගාස්තු
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,ඔබේ සැකසුම
@@ -635,7 +648,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,වර්ධකය 0 වෙන්න බෑ
 DocType: Production Planning Tool,Material Requirement,ද්රව්ය අවශ්යතාවලින් බැහැර වන
 DocType: Company,Delete Company Transactions,සමාගම ගනුදෙනු Delete
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,ෙයොමු අංකය හා විමර්ශන දිනය බැංකුවේ ගනුදෙනුව සඳහා අනිවාර්ය වේ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,ෙයොමු අංකය හා විමර්ශන දිනය බැංකුවේ ගනුදෙනුව සඳහා අනිවාර්ය වේ
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ සංස්කරණය කරන්න බදු හා ගාස්තු එකතු කරන්න
 DocType: Payment Entry Reference,Supplier Invoice No,සැපයුම්කරු ගෙවීම් නොමැත
 DocType: Territory,For reference,පරිශීලනය සඳහා
@@ -643,12 +656,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","අනු අංකය මකා දැමිය නොහැකි {0}, එය කොටස් ගනුදෙනු සඳහා භාවිතා වන පරිදි"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),වැසීම (බැර)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,හෙලෝ
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,විෂය ගෙන යන්න
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,විෂය ගෙන යන්න
 DocType: Serial No,Warranty Period (Days),වගකීම් කාලය (දින)
 DocType: Installation Note Item,Installation Note Item,ස්ථාපන සටහන අයිතමය
 DocType: Production Plan Item,Pending Qty,විභාග යවන ලද
 DocType: Budget,Ignore,නොසලකා හරිනවා
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} සක්රීය නොවන
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} සක්රීය නොවන
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,මුද්රණය සඳහා පිහිටුවීම් චෙක්පත මාන
 DocType: Salary Slip,Salary Slip Timesheet,වැටුප් පුරවා Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,උප කොන්ත්රාත් මිලදී ගැනීම රිසිට්පත අනිවාර්ය සැපයුම්කරු ගබඩාව
@@ -657,7 +670,7 @@
 DocType: Pricing Rule,Sales Partner,විකුණුම් සහයෝගිතාකරු
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,සියලු සැපයුම්කරුවන්ගේ ලකුණු දර්ශක.
 DocType: Buying Settings,Purchase Receipt Required,මිලදී ගැනීම කුවිතාන්සිය අවශ්ය
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"ආරම්භක තොගය තිබේ නම්, තක්සේරු අනුපාත අනිවාර්ය වේ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,"ආරම්භක තොගය තිබේ නම්, තක්සේරු අනුපාත අනිවාර්ය වේ"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,වාර්තා ඉන්ෙවොයිසිය වගුව සොයාගැනීමට නොමැත
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,කරුණාකර ප්රථම සමාගම හා පක්ෂ වර්ගය තෝරා
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,මූල්ය / ගිණුම් වර්ෂය.
@@ -694,7 +707,7 @@
 DocType: Quotation,Quotation To,උද්ධෘත කිරීම
 DocType: Lead,Middle Income,මැදි ආදායම්
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),විවෘත කිරීමේ (බැර)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ඔබ මේ වන විටත් තවත් UOM සමග සමහර ගනුදෙනු (ව) කර ඇති නිසා අයිතමය සඳහා නු පෙරනිමි ඒකකය {0} සෘජුවම වෙනස් කළ නොහැක. ඔබ වෙනස් පෙරනිමි UOM භාවිතා කිරීම සඳහා නව විෂය නිර්මාණය කිරීමට අවශ්ය වනු ඇත.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ඔබ මේ වන විටත් තවත් UOM සමග සමහර ගනුදෙනු (ව) කර ඇති නිසා අයිතමය සඳහා නු පෙරනිමි ඒකකය {0} සෘජුවම වෙනස් කළ නොහැක. ඔබ වෙනස් පෙරනිමි UOM භාවිතා කිරීම සඳහා නව විෂය නිර්මාණය කිරීමට අවශ්ය වනු ඇත.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,වෙන් කල මුදල සෘණ විය නොහැකි
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,සමාගම සකස් කරන්න
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,සමාගම සකස් කරන්න
@@ -709,6 +722,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,බැංකුව සටහන් කිරීමට ගෙවීම් ගිණුම තෝරන්න
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","කොළ, වියදම් හිමිකම් සහ වැටුප් කළමනාකරණය සේවක වාර්තා නිර්මාණය"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,කාලපරිච්ඡේදය
+DocType: Restaurant Reservation,Restaurant Reservation,ආපන ශාලා
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,යෝජනාව ලේඛන
 DocType: Payment Entry Deduction,Payment Entry Deduction,ගෙවීම් සටහන් අඩු
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,තවත් විකුණුම් පුද්ගලයෙක් {0} එම සේවක අංකය සහිත පවතී
@@ -716,7 +730,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,ශාස්ත්රපති
 DocType: Assessment Plan,Maximum Assessment Score,උපරිම තක්සේරු ලකුණු
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,යාවත්කාලීන බැංකුවේ ගනුදෙනු දිනයන්
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,කාලය ට්රැකින්
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,කාලය ට්රැකින්
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,ප්රවාහනය සඳහා අනුපිටපත්
 DocType: Fiscal Year Company,Fiscal Year Company,මුදල් වර්ෂය සමාගම
 DocType: Packing Slip Item,DN Detail,ඩී.එන් විස්තර
@@ -724,8 +738,9 @@
 DocType: Timesheet,Billed,අසූහත
 DocType: Batch,Batch Description,කණ්ඩායම විස්තරය
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,නිර්මාණය ශිෂ්ය කණ්ඩායම්
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","තනා නැති ගෙවීම් ගේට්වේ ගිණුම, අතින් එකක් නිර්මාණය කරන්න."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","තනා නැති ගෙවීම් ගේට්වේ ගිණුම, අතින් එකක් නිර්මාණය කරන්න."
 DocType: Supplier Scorecard,Per Year,වසරකට
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,DOB අනුව අනුව මෙම වැඩසටහනට ඇතුළත්වීම සුදුසු නැත
 DocType: Sales Invoice,Sales Taxes and Charges,විකුණුම් බදු හා ගාස්තු
 DocType: Employee,Organization Profile,සංවිධානය නරඹන්න
 DocType: Vital Signs,Height (In Meter),උස (මීටරයේ)
@@ -761,7 +776,7 @@
 DocType: Student Batch Name,Batch Name,කණ්ඩායම නම
 DocType: Fee Validity,Max number of visit,සංචාරය කරන ලද උපරිම සංඛ්යාව
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet නිර්මාණය:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},ගෙවීම් ප්රකාරය {0} පැහැර මුදල් හෝ බැංකු ගිණුම් සකස් කරන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},ගෙවීම් ප්රකාරය {0} පැහැර මුදල් හෝ බැංකු ගිණුම් සකස් කරන්න
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,ලියාපදිංචි
 DocType: GST Settings,GST Settings,GST සැකසුම්
 DocType: Selling Settings,Customer Naming By,පාරිභෝගික නම් කිරීම මගින්
@@ -793,16 +808,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,වියදම බදු හා ගාස්තු ගොඩ බස්වන ලදී
 DocType: Production Order Operation,Actual Start Time,සැබෑ ආරම්භය කාල
 DocType: BOM Operation,Operation Time,මෙහෙයුම කාල
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,අවසානයි
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,අවසානයි
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,පදනම
 DocType: Timesheet,Total Billed Hours,මුළු අසූහත පැය
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,මුදල කපා
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,මුදල කපා
 DocType: Leave Block List Allow,Allow User,පරිශීලක ඉඩ දෙන්න
 DocType: Journal Entry,Bill No,පනත් කෙටුම්පත මෙයට
 DocType: Company,Gain/Loss Account on Asset Disposal,වත්කම් බැහැර මත ලාභ / අලාභ ගිණුම්
 DocType: Vehicle Log,Service Details,සේවා තොරතුරු
 DocType: Vehicle Log,Service Details,සේවා තොරතුරු
-DocType: Purchase Invoice,Quarterly,කාර්තුමය
+DocType: Subscription,Quarterly,කාර්තුමය
 DocType: Lab Test Template,Grouped,සමූහගත කර ඇත
 DocType: Selling Settings,Delivery Note Required,සැපයුම් සටහන අවශ්ය
 DocType: Bank Guarantee,Bank Guarantee Number,බැංකු ඇපකරයක් අංකය
@@ -812,12 +827,12 @@
 DocType: Student Attendance,Student Attendance,ශිෂ්ය පැමිණීම
 DocType: Sales Invoice Timesheet,Time Sheet,කාලය පත්රය
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,"Backflush, අමු ද්රව්ය මත පදනම් වන දින"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,අයිතමය විස්තර ඇතුලත් කරන්න
 DocType: Interest,Interest,පොලී
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,පෙර විකුණුම්
 DocType: Purchase Receipt,Other Details,වෙනත් විස්තර
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,ටෙස්ටින් සැකිල්ල
+DocType: Restaurant Order Entry Item,Served,සේවය කළේය
 DocType: Account,Accounts,ගිණුම්
 DocType: Vehicle,Odometer Value (Last),Odometer අගය (අවසන්)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,සැපයුම්කරුවන්ගේ ලකුණුකරුවන්ගේ නිර්ණායක
@@ -829,26 +844,28 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,පෙරදසුන වැටුප කුවිතාන්සියක්
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,ගිණුම {0} වාර කිහිපයක් ඇතුලත් කර ඇත
 DocType: Account,Expenses Included In Valuation,ඇතුලත් තක්සේරු දී වියදම්
-DocType: Hub Settings,Seller City,විකුණන්නා සිටි
 ,Absent Student Report,නැති කල ශිෂ්ය වාර්තාව
 DocType: Email Digest,Next email will be sent on:,ඊළඟ ඊ-තැපැල් යවා වනු ඇත:
 DocType: Offer Letter Term,Offer Letter Term,ලිපිය කාලීන ඉදිරිපත්
 DocType: Supplier Scorecard,Per Week,සතියකට
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,අයිතමය ප්රභේද ඇත.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,අයිතමය ප්රභේද ඇත.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,සම්පූර්ණ ශිෂ්යයා
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,අයිතමය {0} සොයාගත නොහැකි
 DocType: Bin,Stock Value,කොටස් අගය
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,"පසුබිම් වාර්තා තුළ පසුබිම් තුළ නිර්මාණය වනු ඇත. කිසියම් දෝෂයක් ඇත්නම්, උපලේඛනයේ දෝශ පණිවිඩය යාවත්කාලීන කරනු ඇත."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,සමාගම {0} නොපවතියි
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} දක්වා කාලය වලංගු වේ {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} දක්වා කාලය වලංගු වේ {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,රුක් වර්ගය
 DocType: BOM Explosion Item,Qty Consumed Per Unit,ඒකකය එක් පරිභෝජනය යවන ලද
 DocType: Serial No,Warranty Expiry Date,"වගකීම්, කල් ඉකුත්වන දිනය,"
 DocType: Material Request Item,Quantity and Warehouse,ප්රමාණය හා ගබඩා
+DocType: Hub Settings,Unregister,ලියාපදිංචිය
 DocType: Sales Invoice,Commission Rate (%),කොමිසම අනුපාතිකය (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,කරුණාකර වැඩසටහන තෝරා
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,කරුණාකර වැඩසටහන තෝරා
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,කරුණාකර වැඩසටහන තෝරා
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,කරුණාකර වැඩසටහන තෝරා
 DocType: Project,Estimated Cost,තක්සේරු කළ පිරිවැය
 DocType: Purchase Order,Link to material requests,ද්රව්ය ඉල්ලීම් වෙත සබැඳෙන පිටු
+DocType: Hub Settings,Publish,පළ කරන්න
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,ගගන
 DocType: Journal Entry,Credit Card Entry,ක්රෙඩිට් කාඩ් සටහන්
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,සමාගම හා ගිණුම්
@@ -859,13 +876,12 @@
 DocType: Selling Settings,Close Opportunity After Days,අවස්ථා දින පසු සමීප
 ,Reserved,ඇවිරිණි
 DocType: Purchase Order,Supply Raw Materials,"සම්පාදන, අමු ද්රව්ය"
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,ඊළඟ ඉන්වොයිස් ජනනය කරනු ලබන දිනය. මෙය ඉදිරිපත් කළ මත ජනනය කරනු ලැබේ.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,ජංගම වත්කම්
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} කොටස් අයිතමය නොවේ
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',"පුහුණුවීම් සඳහා ක්ලික් කිරීමෙන් ඔබේ ප්රතිපෝෂණය බෙදාගන්න, පසුව &#39;නව&#39;"
 DocType: Mode of Payment Account,Default Account,පෙරනිමි ගිණුම
 DocType: Payment Entry,Received Amount (Company Currency),ලැබී ප්රමාණය (සමාගම ව්යවහාර මුදල්)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,"අවස්ථා පෙරමුණ සිදු කෙරේ නම්, ඊයම් තබා ගත යුතුය"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,"අවස්ථා පෙරමුණ සිදු කෙරේ නම්, ඊයම් තබා ගත යුතුය"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,කරුණාකර සතිපතා ලකුණු දින තෝරා
 DocType: Patient,O Negative,සෘණාත්මකව
 DocType: Production Order Operation,Planned End Time,සැලසුම්ගත අවසන් වන වේලාව
@@ -881,10 +897,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,බලශක්ති
 DocType: Opportunity,Opportunity From,සිට අවස්ථාව
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,මාසික වැටුප ප්රකාශයක්.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,සමාගම එකතු කරන්න
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,පේළිය {0}: {1} අයිතමය සඳහා අවශ්ය වන අනුක්රමික අංකයන් {2}. ඔබ සපයා ඇත්තේ {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,පේළිය {0}: {1} අයිතමය සඳහා අවශ්ය වන අනුක්රමික අංකයන් {2}. ඔබ සපයා ඇත්තේ {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,කරුණාකර වගුවක් තෝරන්න
 DocType: BOM,Website Specifications,වෙබ් අඩවිය පිරිවිතර
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',&#39;ලබන්නන්&#39; තුළ {0} වලංගු නොවන ඊ-තැපැල් ලිපිනයකි.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',&#39;ලබන්නන්&#39; තුළ {0} වලංගු නොවන ඊ-තැපැල් ලිපිනයකි.
 DocType: Special Test Items,Particulars,විස්තර
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,ප්රතිජීවක ඖෂධ.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: {0} වර්ගයේ {1} සිට
@@ -892,11 +908,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,ෙරෝ {0}: පරිවර්තන සාධකය අනිවාර්ය වේ
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","බහු මිල රීති එම නිර්ණායක සමග පවතී, ප්රමුඛත්වය යොමු කිරීම මගින් ගැටුම විසඳීමට කරන්න. මිල රීති: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,එය අනෙක් BOMs සම්බන්ධ වන ලෙස ද ෙව් විසන්ධි කිරීම හෝ අවලංගු කිරීම කළ නොහැකි
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,එය අනෙක් BOMs සම්බන්ධ වන ලෙස ද ෙව් විසන්ධි කිරීම හෝ අවලංගු කිරීම කළ නොහැකි
 DocType: Opportunity,Maintenance,නඩත්තු
 DocType: Item Attribute Value,Item Attribute Value,අයිතමය Attribute අගය
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,විකුණුම් ව්යාපාර.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Timesheet කරන්න
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Timesheet කරන්න
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -934,12 +950,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,පළමු අයිතමය ඇතුලත් කරන්න
 DocType: Account,Liability,වගකීම්
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,අනුමැතිය ලත් මුදල ෙරෝ {0} තුළ හිමිකම් ප්රමාණය ට වඩා වැඩි විය නොහැක.
+DocType: Salary Detail,Do not include in total,මුලුමනින්ම ඇතුළත් නොකරන්න
 DocType: Company,Default Cost of Goods Sold Account,විදුලි උපකරණ පැහැර වියදම ගිණුම අලෙවි
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,මිල ලැයිස්තුව තෝරා ගෙන නොමැති
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,මිල ලැයිස්තුව තෝරා ගෙන නොමැති
 DocType: Employee,Family Background,පවුල් පසුබිම
 DocType: Request for Quotation Supplier,Send Email,යවන්න විද්යුත්
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},අවවාදයයි: වලංගු නොවන ඇමුණුම් {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,කිසිදු අවසරය
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},අවවාදයයි: වලංගු නොවන ඇමුණුම් {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,කිසිදු අවසරය
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,ඉල්ලූම් කරන ලද ඉල්ලීම
 DocType: Vital Signs,Heart Rate / Pulse,හෘද ස්පන්දනය / ස්පන්දනය
 DocType: Company,Default Bank Account,පෙරනිමි බැංකු ගිණුම්
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","පක්ෂය මත පදනම් පෙරහන් කිරීමට ප්රථම, පක්ෂය වර්ගය තෝරා"
@@ -967,12 +985,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,අයිතමය ෙරෝ {idx}: {doctype} {docname} ඉහත &#39;{doctype}&#39; වගුවේ නොපවතියි
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} වන විට අවසන් කර හෝ අවලංගු වේ
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,කිසිදු කාර්යයන්
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","මෝටර් රථ ඉන්වොයිස් 05, 28 ආදී උදා ජනනය කරන මාසික දවස"
 DocType: Item Variant Settings,Copy Fields to Variant,ප්රභේදයට පිටපත් කරන්න
 DocType: Asset,Opening Accumulated Depreciation,සමුච්චිත ක්ෂය විවෘත
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ලකුණු අඩු හෝ 5 දක්වා සමාන විය යුතුයි
 DocType: Program Enrollment Tool,Program Enrollment Tool,වැඩසටහන ඇතුළත් මෙවලම
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C-ආකෘතිය වාර්තා
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C-ආකෘතිය වාර්තා
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,පාරිභෝගික සහ සැපයුම්කරුවන්
 DocType: Email Digest,Email Digest Settings,විද්යුත් Digest සැකසුම්
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,ඔබේ ව්යාපාරය සඳහා ඔබට ස්තුතියි!
@@ -990,13 +1007,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Quote තත්වය
 DocType: Maintenance Visit,Completion Status,අවසන් වූ තත්ත්වය
 DocType: HR Settings,Enter retirement age in years,වසර විශ්රාම ගන්නා වයස අවුරුදු ඇතුලත් කරන්න
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,ඉලක්ක ගබඩාව
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,කරුණාකර ගබඩා තෝරා
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,ඉලක්ක ගබඩාව
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,කරුණාකර ගබඩා තෝරා
 DocType: Cheque Print Template,Starting location from left edge,ඉතිරි අද්දර සිට ස්ථානය ආරම්භ
 DocType: Item,Allow over delivery or receipt upto this percent,මෙම සියයට දක්වා බෙදා හැරීමේ හෝ රිසිට් කට ඉඩ දෙන්න
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,ආනයන පැමිණීම
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,සියලු විෂයාංක කණ්ඩායම්
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,සියලු විෂයාංක කණ්ඩායම්
 DocType: Process Payroll,Activity Log,ක්රියාකාරකම් ලොග්
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,ශුද්ධ ලාභය / අඞු කිරීමට
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,ස්වයංක්රීයව ගනුදෙනු ඉදිරිපත් කරන පණිවිඩය රචනා.
@@ -1008,7 +1025,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,ප්රක්ෂේපිත යවන ලද
 DocType: Sales Invoice,Payment Due Date,ගෙවීම් නියමිත දිනය
 DocType: Drug Prescription,Interval UOM,UOM හි වේගය
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,අයිතමය ප්රභේද්යයක් {0} දැනටමත් එම ලක්ෂණ සහිත පවතී
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,අයිතමය ප්රභේද්යයක් {0} දැනටමත් එම ලක්ෂණ සහිත පවතී
+DocType: Item,Hub Publishing Details,තොරතුරු මධ්යස්ථානය තොරතුරු විස්තර
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;විවෘත&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,විවෘත එක්කෙනාගේ
 DocType: Notification Control,Delivery Note Message,සැපයුම් සටහන පණිවුඩය
@@ -1028,10 +1046,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: අමුද්රව්ය මුලික අයිතමයට සමාන විය නොහැක
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,මිලදී ගැනීම රිසිට්පත අයිතම වගුවේ මුළු අදාළ ගාස්තු මුළු බදු හා ගාස්තු ලෙස එම විය යුතුය
 DocType: Sales Team,Incentives,සහන
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Hub සඳහා ලියාපදිංචි වන්න
 DocType: SMS Log,Requested Numbers,ඉල්ලන ගණන්
 DocType: Production Planning Tool,Only Obtain Raw Materials,", අමු ද්රව්ය පමණක් ලබා"
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,කාර්ය සාධන ඇගයීම්.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","සාප්පු සවාරි කරත්ත සක්රීය වේ පරිදි, &#39;&#39; කරත්තයක් සඳහා භාවිතා කරන්න &#39;සක්රීය කිරීම හා ෂොපිං කරත්ත සඳහා අවම වශයෙන් එක් බදු පාලනය කිරීමට හැකි විය යුතුය"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","සාප්පු සවාරි කරත්ත සක්රීය වේ පරිදි, &#39;&#39; කරත්තයක් සඳහා භාවිතා කරන්න &#39;සක්රීය කිරීම හා ෂොපිං කරත්ත සඳහා අවම වශයෙන් එක් බදු පාලනය කිරීමට හැකි විය යුතුය"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","එය මේ කුවිතාන්සියේ අත්තිකාරම් වශයෙන් ඇද ගත යුතු නම්, ගෙවීම් සටහන් {0} සාමය {1} හා සම්බන්ධ කර තිබේ, පරීක්ෂා කරන්න."
 DocType: Sales Invoice Item,Stock Details,කොටස් විස්තර
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,ව්යාපෘති අගය
@@ -1050,12 +1069,14 @@
 DocType: Salary Slip,Working Days,වැඩ කරන දවස්
 DocType: Serial No,Incoming Rate,ලැබෙන අනුපාත
 DocType: Packing Slip,Gross Weight,දළ බර
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,ඔබ මෙම පද්ධතිය සකස්කර සඳහා ඔබේ සමාගම සඳහා වන නම.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Hub සක්රීය කරන්න
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,ඔබ මෙම පද්ධතිය සකස්කර සඳහා ඔබේ සමාගම සඳහා වන නම.
 DocType: HR Settings,Include holidays in Total no. of Working Days,කිසිදු මුළු නිවාඩු දින ඇතුලත් වේ. වැඩ කරන දින වල
 DocType: Job Applicant,Hold,පැවැත්වීමට
 DocType: Employee,Date of Joining,සමඟ සම්බන්ධවීම දිනය
 DocType: Naming Series,Update Series,යාවත්කාලීන ශ්රේණි
 DocType: Supplier Quotation,Is Subcontracted,උප කොන්ත්රාත්තුවක් ඇත
+DocType: Restaurant Table,Minimum Seating,අවම ආසන
 DocType: Item Attribute,Item Attribute Values,අයිතමය Attribute වටිනාකම්
 DocType: Examination Result,Examination Result,විභාග ප්රතිඵල
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,මිලදී ගැනීම කුවිතාන්සිය
@@ -1066,13 +1087,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},මෙහෙයුම {1} සඳහා ඉදිරි {0} දින තුළ කාල Slot සොයා ගැනීමට නොහැකි
 DocType: Production Order,Plan material for sub-assemblies,උප-එකලස්කිරීම් සඳහා සැලසුම් ද්රව්ය
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,විකුණුම් හවුල්කරුවන් සහ ප්රාට්රද්ීයය
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,ද්රව්ය ලේඛණය {0} ක්රියාකාරී විය යුතුය
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,ද්රව්ය ලේඛණය {0} ක්රියාකාරී විය යුතුය
 DocType: Journal Entry,Depreciation Entry,ක්ෂය සටහන්
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,කරුණාකර පළමු ලිපි වර්ගය තෝරා
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,මෙම නඩත්තු සංචාරය අවලංගු කර පෙර ද්රව්ය සංචාර {0} අවලංගු කරන්න
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},අනු අංකය {0} අයිතමය අයිති නැත {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,අවශ්ය යවන ලද
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,පවත්නා ගනුදෙනුව සමග බඞු ගබඞාව ලෙජර් පරිවර්තනය කළ නොහැක.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,පවත්නා ගනුදෙනුව සමග බඞු ගබඞාව ලෙජර් පරිවර්තනය කළ නොහැක.
 DocType: Bank Reconciliation,Total Amount,මුලු වටිනාකම
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,අන්තර්ජාල ප්රකාශන
 DocType: Prescription Duration,Number,අංකය
@@ -1083,7 +1104,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,විකුණුම් මිල ලැයිස්තුව
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","පරික්ෂා කර ඇත්නම්, පාරිභෝගිකයා නිර්මාණය කරනු ලබන අතර, රෝගියා වෙත සිතියම්කරණය කර ඇත. මෙම ගණුදෙනුකරුට රෝගියාගේ ඉන්වොයිස මතුවනු ඇත. Patient නිර්මාණය කිරීමේදී ඔබට පවතින පාරිභෝගිකයා තෝරා ගත හැකිය."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,භාණ්ඩ සමමුහුර්ත කිරීමට ප්රකාශයට පත් කරනු ලබයි
 DocType: Bank Reconciliation,Account Currency,ගිණුම ව්යවහාර මුදල්
 DocType: Lab Test,Sample ID,සාම්පල අංකය
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,සමාගම ගිණුම අක්රිය වටය සඳහන් කරන්න
@@ -1092,11 +1112,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,සේවක {0} සක්රීය නොවන නැත්නම් ස්ථානීකව නොපවතියි
 DocType: Fee Structure,Components,සංරචක
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},විෂය {0} තුළ වත්කම් ප්රවර්ගය ඇතුලත් කරන්න
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,අයිතමය ප්රභේද {0} යාවත්කාලීන
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,අයිතමය ප්රභේද {0} යාවත්කාලීන
 DocType: Quality Inspection Reading,Reading 6,කියවීම 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,{0} නොහැකි {1} {2} සෘණාත්මක කැපී පෙනෙන ඉන්වොයිස් තොරව
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","උත්පාදනය කළ යුතුය. ප්රමාද වී ඇත්නම්, ඔබ මෙය &quot;මාසයේ නැවත දින&quot; ක්ෂේත්රයේ අතින් වෙනස් කිරීමට සිදුවනු ඇත"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,{0} නොහැකි {1} {2} සෘණාත්මක කැපී පෙනෙන ඉන්වොයිස් තොරව
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,මිලදී ගැනීම ඉන්වොයිසිය අත්තිකාරම්
-DocType: Hub Settings,Sync Now,දැන් සමමුහුර්ත කරන්න
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},ෙරෝ {0}: ක්රෙඩිට් විසයක් {1} සමග සම්බන්ධ විය නොහැකි
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,මූල්ය වර්ෂය සඳහා අයවැය අර්ථ දක්වන්න.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,මෙම ප්රකාරයේදී තෝරාගත් විට ප්රකෘති බැංකුව / මුදල් ගිණුම ස්වංක්රීයව POS ඉන්වොයිසිය ගැන යාවත්කාලීන කිරීම ද සිදු කරනු ලැබේ.
@@ -1108,13 +1129,13 @@
 DocType: Item,Is Purchase Item,මිලදී ගැනීම අයිතමය වේ
 DocType: Asset,Purchase Invoice,මිලදී ගැනීම ඉන්වොයිසිය
 DocType: Stock Ledger Entry,Voucher Detail No,වවුචරය විස්තර නොමැත
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,නව විකුණුම් ඉන්වොයිසිය
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,නව විකුණුම් ඉන්වොයිසිය
 DocType: Stock Entry,Total Outgoing Value,මුළු ඇමතුම් අගය
 DocType: Physician,Appointments,පත්වීම්
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,දිනය හා අවසාන දිනය විවෘත එම මුදල් වර්ෂය තුළ විය යුතු
 DocType: Lead,Request for Information,තොරතුරු සඳහා වන ඉල්ලීම
 ,LeaderBoard,ප්රමුඛ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,සමමුහුර්ත කරන්න Offline දින ඉන්වොයිසි
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,සමමුහුර්ත කරන්න Offline දින ඉන්වොයිසි
 DocType: Payment Request,Paid,ගෙවුම්
 DocType: Program Fee,Program Fee,වැඩසටහන ගාස්තු
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1133,11 +1154,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,මිලදී ගැනීමේ නියෝගයක් අයිතමය
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,වක්ර ආදායම්
 DocType: Student Attendance Tool,Student Attendance Tool,ශිෂ්ය පැමිණීම මෙවලම
+DocType: Restaurant Menu,Price List (Auto created),මිල ලැයිස්තුව (ස්වයංක්රීයව සාදා ඇති)
 DocType: Cheque Print Template,Date Settings,දිනය සැකසුම්
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,විචලතාව
 ,Company Name,සමාගම් නාමය
 DocType: SMS Center,Total Message(s),මුළු පණිවුඩය (ව)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,හුවමාරුව සඳහා විෂය තෝරා
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,හුවමාරුව සඳහා විෂය තෝරා
 DocType: Purchase Invoice,Additional Discount Percentage,අතිරේක වට්ටම් ප්රතිශතය
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,සියළු උපකාර වීඩියෝ ලැයිස්තුවක් බලන්න
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,චෙක්පත තැන්පත් කර එහිදී බැංකුවේ ගිණුමක් හිස තෝරන්න.
@@ -1155,6 +1177,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,මීටර්
 DocType: Workstation,Electricity Cost,විදුලිබල වියදම
 DocType: HR Settings,Don't send Employee Birthday Reminders,සේවක උපන්දින මතක් යවන්න එපා
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,සැකසුම් සුරකින්න
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,ඉල්ලූම් කරන නිෂ්පාදන
 DocType: Item,Inspection Criteria,පරීක්ෂණ නිර්ණායක
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,යැවීමට
 DocType: BOM Website Item,BOM Website Item,ද්රව්ය ලේඛණය වෙබ් අඩවිය අයිතමය
@@ -1172,11 +1196,11 @@
 DocType: Journal Entry,Total Amount in Words,වචන මුළු මුදල
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"දෝශයක් ඇති විය. එක් අනුමාන හේතුව ඔබ එම ආකෘති පත්රය සුරක්ෂිත නොවන බව විය හැක. ගැටලුව පවතී නම්, support@erpnext.com අමතන්න."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,මගේ කරත්ත
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},සාමය වර්ගය {0} එකක් විය යුතුය
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},සාමය වර්ගය {0} එකක් විය යුතුය
 DocType: Lead,Next Contact Date,ඊළඟට අප අමතන්න දිනය
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,විවෘත යවන ලද
 DocType: Healthcare Settings,Appointment Reminder,හමුවීම සිහිගැන්වීම
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,වෙනස් මුදල සඳහා ගිණුම් ඇතුලත් කරන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,වෙනස් මුදල සඳහා ගිණුම් ඇතුලත් කරන්න
 DocType: Student Batch Name,Student Batch Name,ශිෂ්ය කණ්ඩායම නම
 DocType: Consultation,Doctor,වෛද්යවරයා
 DocType: Holiday List,Holiday List Name,නිවාඩු ලැයිස්තු නම
@@ -1184,12 +1208,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,උපෙල්ඛනෙය් පාඨමාලා
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,කොටස් විකල්ප
 DocType: Journal Entry Account,Expense Claim,වියදම් හිමිකම්
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,ඔබ ඇත්තටම කටුගා දමා වත්කම් නැවත කිරීමට අවශ්යද?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},{0} සඳහා යවන ලද
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,ඔබ ඇත්තටම කටුගා දමා වත්කම් නැවත කිරීමට අවශ්යද?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},{0} සඳහා යවන ලද
 DocType: Leave Application,Leave Application,අයදුම් තබන්න
 DocType: Patient,Patient Relation,රෝගියාගේ සම්බන්ධතාවය
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,වෙන් කිරීම මෙවලම Leave
+DocType: Item,Hub Category to Publish,හබ් කාණ්ඩයේ පළ කිරීම
 DocType: Leave Block List,Leave Block List Dates,වාරණ ලැයිස්තුව දිනයන් නිවාඩු
+DocType: Sales Invoice,Billing Address GSTIN,බිල්පත් ලිපිනය GSTIN
 DocType: Workstation,Net Hour Rate,ශුද්ධ හෝරාව අනුපාතිකය
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,වියදම මිලදී ගැනීම රිසිට්පත ගොඩ බස්වන ලදී
 DocType: Company,Default Terms,පෙරනිමි කොන්දේසි
@@ -1199,11 +1225,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},ඇති {0} කරුණාකර සඳහන් කරන්න
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,ප්රමාණය සහ වටිනාකම කිසිදු වෙනසක් සමග භාණ්ඩ ඉවත් කර ඇත.
 DocType: Delivery Note,Delivery To,වෙත බෙදා හැරීමේ
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,ගති ලක්ෂණය වගුව අනිවාර්ය වේ
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,ගති ලක්ෂණය වගුව අනිවාර්ය වේ
 DocType: Production Planning Tool,Get Sales Orders,විකුණුම් නියෝග ලබා ගන්න
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} සෘණ විය නොහැකි
 DocType: Training Event,Self-Study,ස්වයං අධ්යයනය
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,වට්ටමක්
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,වට්ටමක්
 DocType: Asset,Total Number of Depreciations,අගය පහත මුළු සංඛ්යාව
 DocType: Sales Invoice Item,Rate With Margin,ආන්තිකය සමග අනුපාතය
 DocType: Sales Invoice Item,Rate With Margin,ආන්තිකය සමග අනුපාතය
@@ -1211,7 +1237,7 @@
 DocType: Task,Urgent,හදිසි
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},පේළියක {0} සඳහා වලංගු ෙරෝ හැඳුනුම්පත සඳහන් කරන්න {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,විචල්යය සොයා ගත නොහැක:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,කරුණාකර numpad වෙතින් සංස්කරණය කිරීමට ක්ෂේත්රයක් තෝරන්න
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,කරුණාකර numpad වෙතින් සංස්කරණය කිරීමට ක්ෂේත්රයක් තෝරන්න
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,මෙම පරිගණක වෙත ගොස් ERPNext භාවිතා ආරම්භ
 DocType: Item,Manufacturer,නිෂ්පාදක
 DocType: Landed Cost Item,Purchase Receipt Item,මිලදී ගැනීම රිසිට්පත අයිතමය
@@ -1242,8 +1268,8 @@
 DocType: GL Entry,Against,එරෙහි
 DocType: Item,Default Selling Cost Center,පෙරනිමි විකිණීම පිරිවැය මධ්යස්ථානය
 DocType: Sales Partner,Implementation Partner,ක්රියාත්මක කිරීම සහකරු
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,කලාප කේතය
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},විකුණුම් සාමය {0} වේ {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,කලාප කේතය
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},විකුණුම් සාමය {0} වේ {1}
 DocType: Opportunity,Contact Info,සම්බන්ධ වීම
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,කොටස් අයැදුම්පත් කිරීම
 DocType: Packing Slip,Net Weight UOM,ශුද්ධ බර UOM
@@ -1254,6 +1280,7 @@
 DocType: Holiday List,Get Weekly Off Dates,සතිපතා Off ලබා ගන්න දිනයන්
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,අවසන් දිනය ඇරඹුම් දිනය ඊට වඩා අඩු විය නොහැක
 DocType: Sales Person,Select company name first.,පළමු සමාගම නම තෝරන්න.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,පහත් මට්ටම දක්වා
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,සැපයුම්කරුවන් ලැබෙන මිල ගණන්.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOM ආකෘති වෙනුවට නවීනතම අළුත් යාවත්කාලීන කිරීම
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},{0} වෙත | {1} {2}
@@ -1273,7 +1300,7 @@
 DocType: Program Enrollment,Transportation,ප්රවාහන
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,වලංගු නොවන Attribute
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} ඉදිරිපත් කළ යුතුය
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},ප්රමාණය අඩු හෝ {0} වෙත සමාන විය යුතුයි
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},ප්රමාණය අඩු හෝ {0} වෙත සමාන විය යුතුයි
 DocType: SMS Center,Total Characters,මුළු අක්ෂර
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},කරුණාකර විෂය සඳහා ද ෙව් ක්ෂේත්රයේ ද්රව්ය ලේඛණය තෝරා {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-ආකෘතිය ඉන්වොයිසිය විස්තර
@@ -1288,7 +1315,7 @@
 ,Ordered Items To Be Billed,නියෝග අයිතම බිල්පතක්
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,රංගේ සිට රංගේ කිරීම වඩා අඩු විය යුතුය
 DocType: Global Defaults,Global Defaults,ගෝලීය Defaults
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,ව්යාපෘති ඒකාබද්ධතාවයක් ආරාධනයයි
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,ව්යාපෘති ඒකාබද්ධතාවයක් ආරාධනයයි
 DocType: Salary Slip,Deductions,අඩු කිරීම්
 DocType: Leave Allocation,LAL/,ලාල් /
 DocType: Setup Progress Action,Action Name,ක්රියාකාරී නම
@@ -1306,13 +1333,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,විකුණුම් ඉන්වොයිසිය අත්තිකාරම්
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,ඉල්ලා කිසිවක්
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},තවත් අයවැය වාර්තාව &#39;{0}&#39; දැනටමත් මූල්ය වර්ෂය සඳහා {1} එරෙහිව පවතී &#39;{2}&#39; {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&#39;සත ඇරඹුම් දිනය&#39; &#39;සත අවසානය දිනය&#39; ට වඩා වැඩි විය නොහැක
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&#39;සත ඇරඹුම් දිනය&#39; &#39;සත අවසානය දිනය&#39; ට වඩා වැඩි විය නොහැක
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,කළමනාකරණ
 DocType: Cheque Print Template,Payer Settings,ගෙවන්නා සැකසුම්
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","මෙය ප්රභේද්යයක් යන විෂය සංග්රහයේ ඇත්තා වූ ද, ඇත. උදාහරණයක් ලෙස, ඔබේ වචන සහ &quot;එස් එම්&quot; වන අතර, අයිතමය කේතය &quot;T-shirt&quot; වේ නම්, ප්රභේද්යයක් ක අයිතමය කේතය &quot;T-shirt-එස්.එම්&quot; වනු"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,ඔබ වැටුප් පුරවා ඉතිරි වරක් (වචන) ශුද්ධ වැටුප් දෘශ්යමාන වනු ඇත.
 DocType: Purchase Invoice,Is Return,ප්රතිලාභ වේ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,අවවාදයයි
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,අවවාදයයි
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,ආපසු / ඩෙබිට් සටහන
 DocType: Price List Country,Price List Country,මිල ලැයිස්තුව රට
 DocType: Item,UOMs,UOMs
@@ -1327,17 +1354,18 @@
 DocType: Account,Balance Sheet,ශේෂ පත්රය
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',විෂය සංග්රහයේ සමග අයිතමය සඳහා පිරිවැය මධ්යස්ථානය
 DocType: Fee Validity,Valid Till,වලංගු ටී
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ගෙවීම් ක්රමය වින්යාස කර නොමැත. ගිණුමක් ගෙවීම් වන ආකාරය මත හෝ POS නරඹන්න තබා තිබේද, කරුණාකර පරීක්ෂා කරන්න."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ගෙවීම් ක්රමය වින්යාස කර නොමැත. ගිණුමක් ගෙවීම් වන ආකාරය මත හෝ POS නරඹන්න තබා තිබේද, කරුණාකර පරීක්ෂා කරන්න."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,එම අයිතමය වාර කිහිපයක් ඇතුළත් කළ නොහැක.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","කණ්ඩායම් යටතේ තව දුරටත් ගිණුම් කළ හැකි නමුත්, ඇතුළත් කිරීම්-කණ්ඩායම් නොවන එරෙහිව කළ හැකි"
 DocType: Lead,Lead,ඊයම්
 DocType: Email Digest,Payables,ගෙවිය යුතු
 DocType: Course,Course Intro,පාඨමාලා හැදින්වීමේ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,කොටස් Entry {0} නිර්මාණය
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,කරුණාකර Setup&gt; Numbering Series හරහා පැමිණීමේදී සංඛ්යාලේඛන මාලාවක් සකසන්න
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,කොටස් Entry {0} නිර්මාණය
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,ෙරෝ # {0}: ප්රතික්ෂේප යවන ලද මිලදී ගැනීම ප්රතිලාභ ඇතුළත් කළ නොහැකි
 ,Purchase Order Items To Be Billed,මිලදී ගැනීමේ නියෝගයක් අයිතම බිල්පතක්
 DocType: Purchase Invoice Item,Net Rate,ශුද්ධ ෙපොලී අනුපාතිකය
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,කරුණාකර පාරිභෝගිකයා තෝරා ගන්න
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,කරුණාකර පාරිභෝගිකයා තෝරා ගන්න
 DocType: Purchase Invoice Item,Purchase Invoice Item,මිලදී ගැනීම ඉන්වොයිසිය අයිතමය
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,කොටස් ලේජර අයැදුම්පත් සහ ජී.එල් අයැදුම්පත් තෝරාගත් මිලදී ගැනීම ලැබීම් සඳහා reposted ඇත
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,අයිතම අංක 1
@@ -1358,7 +1386,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},එම {1} සමග පේළිය {0} අනුපිටපත්
 ,Trial Balance,මාසික බැංකු සැසඳුම්
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,මුදල් වර්ෂය {0} සොයාගත නොහැකි
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,සේවක සකස් කිරීම
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,සේවක සකස් කිරීම
 DocType: Sales Order,SO-,ඒ නිසා-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,කරුණාකර පළමු උපසර්ගය තෝරා
 DocType: Employee,O-,O-
@@ -1370,12 +1398,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,දැක්ම ලේජර
 DocType: Grading Scale,Intervals,කාල අන්තරයන්
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ආදිතම
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","ක අයිතමය සමූහ එකම නමින් පවතී, අයිතමය නම වෙනස් කිරීම හෝ අයිතමය පිරිසක් නැවත නම් කරුණාකර"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","ක අයිතමය සමූහ එකම නමින් පවතී, අයිතමය නම වෙනස් කිරීම හෝ අයිතමය පිරිසක් නැවත නම් කරුණාකර"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,ශිෂ්ය ජංගම අංක
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,ලෝකයේ සෙසු
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,ලෝකයේ සෙසු
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,අයිතමය {0} කණ්ඩායම ලබා ගත නොහැකි
 ,Budget Variance Report,අයවැය විචලතාව වාර්තාව
 DocType: Salary Slip,Gross Pay,දළ වැටුප්
+DocType: Item,Is Item from Hub,අයිතමයේ සිට අයිතමය දක්වා ඇත
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,ෙරෝ {0}: ක්රියාකාරකම් වර්ගය අනිවාර්ය වේ.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,ගෙවුම් ලාභාංශ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,ගිණුම් කරණය ලේජර
@@ -1385,8 +1414,9 @@
 DocType: Vehicle Log,Service Detail,සේවා විස්තර
 DocType: BOM,Item Description,අයිතම විවහතරය
 DocType: Student Sibling,Student Sibling,ශිෂ්ය සහෝදර
-DocType: Purchase Invoice,Is Recurring,නැවත නැවත කරනු
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,ගෙවීමේ ක්රමය
 DocType: Purchase Invoice,Supplied Items,සැපයූ අයිතම
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},කරුණාකර {0} අවන්හල සඳහා ක්රියාකාරී මෙනුව සකසන්න
 DocType: Student,STUD.,ඇණ.
 DocType: Production Order,Qty To Manufacture,යවන ලද නිෂ්පාදනය කිරීම සඳහා
 DocType: Email Digest,New Income,නව ආදායම්
@@ -1397,6 +1427,7 @@
 ,Student and Guardian Contact Details,ශිෂ්ය හා ගාඩියන් ඇමතුම් විස්තර
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,පේළියේ {0}: සැපයුම්කරු සඳහා {0} විද්යුත් තැපැල් ලිපිනය ඊ-තැපැල් යැවීමට අවශ්ය වේ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,තාවකාලික විවෘත
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,හබල් බලන්න
 ,Employee Leave Balance,සේවක නිවාඩු ශේෂ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},ගිණුම සඳහා ශේෂ {0} සැමවිටම විය යුතුය {1}
 DocType: Patient Appointment,More Info,තවත් තොරතුරු
@@ -1416,13 +1447,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,විකුණුම් සාමය {0} වලංගු නොවේ
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Quotations සඳහා නව ඉල්ලීම සඳහා අවවාද කරන්න
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,මිලදී ගැනීමේ නියෝග ඔබ ඔබේ මිලදී ගැනීම සැලසුම් සහ පසුවිපරම් උදව්
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","සමාවන්න, සමාගම් ඒකාබද්ධ කළ නොහැකි"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","සමාවන්න, සමාගම් ඒකාබද්ධ කළ නොහැකි"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,පරීක්ෂණ පරීක්ෂණ නිර්දේශ කිරීම
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",මුළු නිකුත් / ස්ථාන මාරු ප්රමාණය {0} ද්රව්ය ඉල්ලීම ගැන {1} \ ඉල්ලා ප්රමාණය {2} අයිතමය {3} සඳහා වඩා වැඩි විය නොහැකි
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,කුඩා
 DocType: Employee,Employee Number,සේවක සංඛ්යාව
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},නඩු අංක (ය) දැනටමත් භාවිත වේ. නඩු අංක {0} සිට උත්සාහ කරන්න
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},නඩු අංක (ය) දැනටමත් භාවිත වේ. නඩු අංක {0} සිට උත්සාහ කරන්න
 DocType: Project,% Completed,% සම්පූර්ණ
 ,Invoiced Amount (Exculsive Tax),ඉන්වොයිස් ප්රමාණය (Exculsive බදු)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,අංක 2
@@ -1437,11 +1468,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,වක්ර වියදම්
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,ෙරෝ {0}: යවන ලද අනිවාර්ය වේ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,කෘෂිකර්ම
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,සමමුහුර්ත කරන්න මාස්ටර් දත්ත
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,සමමුහුර්ත කරන්න මාස්ටර් දත්ත
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,ඔබගේ නිෂ්පාදන හෝ සේවා
 DocType: Special Test Items,Special Test Items,විශේෂ පරීක්ෂණ අයිතම
 DocType: Mode of Payment,Mode of Payment,ගෙවීම් ක්රමය
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,වෙබ් අඩවිය රූප ප්රසිද්ධ ගොනුව හෝ වෙබ් අඩවි URL විය යුතුය
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,වෙබ් අඩවිය රූප ප්රසිද්ධ ගොනුව හෝ වෙබ් අඩවි URL විය යුතුය
 DocType: Student Applicant,AP,පුද්ගල නාශක
 DocType: Purchase Invoice Item,BOM,ද්රව්ය ලේඛණය
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,"මෙය මූල අයිතමය පිරිසක් වන අතර, සංස්කරණය කළ නොහැක."
@@ -1449,9 +1480,9 @@
 DocType: Vehicle,Fuel UOM,ඉන්ධන UOM
 DocType: Warehouse,Warehouse Contact Info,පොත් ගබඩාව සම්බන්ධ වීම
 DocType: Payment Entry,Write Off Difference Amount,වෙනස මුදල කපා
-DocType: Purchase Invoice,Recurring Type,පුනරාවර්තනය වර්ගය
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: සේවක ඊ-තැපැල් සොයාගත නොහැකි, ඒ නිසා ඊ-තැපැල් යවා නැත"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: සේවක ඊ-තැපැල් සොයාගත නොහැකි, ඒ නිසා ඊ-තැපැල් යවා නැත"
 DocType: Item,Foreign Trade Details,විදේශ වෙළෙඳ විස්තර
+,Assessment Plan Status,තක්සේරු සැලැස්ම තත්වය
 DocType: Email Digest,Annual Income,වාර්ෂික ආදායම
 DocType: Serial No,Serial No Details,අනු අංකය විස්තර
 DocType: Purchase Invoice Item,Item Tax Rate,අයිතමය බදු අනුපාත
@@ -1459,15 +1490,14 @@
 DocType: Student Group Student,Group Roll Number,සමූහ Roll අංකය
 DocType: Student Group Student,Group Roll Number,සමූහ Roll අංකය
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} සඳහා පමණක් ණය ගිණුම් තවත් හර සටහන හා සම්බන්ධ කර ගත හැකි
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,සියලු කාර්ය බර මුළු 1. ඒ අනුව සියලු ව්යාපෘති කාර්යයන් ෙහොන්ඩර වෙනස් කළ යුතු කරුණාකර
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,සැපයුම් සටහන {0} ඉදිරිපත් කර නැත
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,සියලු කාර්ය බර මුළු 1. ඒ අනුව සියලු ව්යාපෘති කාර්යයන් ෙහොන්ඩර වෙනස් කළ යුතු කරුණාකර
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,සැපයුම් සටහන {0} ඉදිරිපත් කර නැත
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,අයිතමය {0} උප කොන්ත්රාත් අයිතමය විය යුතුය
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,ප්රාග්ධන උපකරණ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","මිල ගණන් පාලනය පළමු අයිතමය, විෂය සමූහය හෝ වෙළඳ නාමය විය හැකි ක්ෂේත්ර, &#39;මත යොමු කරන්න&#39; මත පදනම් වූ තෝරා ගනු ලැබේ."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,කරුණාකර අයිතම කේතය මුලින්ම සකසන්න
-DocType: Hub Settings,Seller Website,විකුණන්නා වෙබ් අඩවිය
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,කරුණාකර අයිතම කේතය මුලින්ම සකසන්න
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,විකුණුම් කණ්ඩායමේ මුළු වෙන් ප්රතිශතය 100 විය යුතුයි
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,විකුණුම් කණ්ඩායමේ මුළු වෙන් ප්රතිශතය 100 විය යුතුයි
 DocType: Sales Invoice Item,Edit Description,සංස්කරණය කරන්න විස්තරය
 DocType: Antibiotic,Antibiotic,ප්රතිජීවක ඖෂධ
 ,Team Updates,කණ්ඩායම යාවත්කාලීන
@@ -1488,12 +1518,12 @@
 DocType: Purchase Invoice,Total (Company Currency),එකතුව (සමාගම ව්යවහාර මුදල්)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,අනුක්රමික අංකය {0} වරකට වඩා ඇතුල්
 DocType: Depreciation Schedule,Journal Entry,ජර්නල් සටහන්
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} ප්රගතිය භාණ්ඩ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} ප්රගතිය භාණ්ඩ
 DocType: Workstation,Workstation Name,සේවා පරිගණකයක් නම
 DocType: Grading Scale Interval,Grade Code,ශ්රේණියේ සංග්රහයේ
 DocType: POS Item Group,POS Item Group,POS අයිතමය සමූහ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,විද්යුත් Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},ද්රව්ය ලේඛණය {0} අයිතමය අයිති නැත {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},ද්රව්ය ලේඛණය {0} අයිතමය අයිති නැත {1}
 DocType: Sales Partner,Target Distribution,ඉලක්ක බෙදාහැරීම්
 DocType: Salary Slip,Bank Account No.,බැංකු ගිණුම් අංක
 DocType: Naming Series,This is the number of the last created transaction with this prefix,මෙය මේ උපසර්ගය සහිත පසුගිය නිර්මාණය ගනුදෙනුව සංඛ්යාව වේ
@@ -1510,10 +1540,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,උද්ධෘත සැපයුම්කරු සඳහා වන ඉල්ලීම
 DocType: Healthcare Settings,Registration Message,ලියාපදිංචි වීමේ පණිවිඩය
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,දෘඩාංග
-DocType: Sales Order,Recurring Upto,තුරුත් නැවත නැවත
 DocType: Prescription Dosage,Prescription Dosage,බෙහෙත් වට්ටෝරුව
 DocType: Attendance,HR Manager,මානව සම්පත් කළමනාකාර
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,කරුණාකර සමාගම තෝරා
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,කරුණාකර සමාගම තෝරා
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,වරප්රසාද සහිත
 DocType: Purchase Invoice,Supplier Invoice Date,සැපයුම්කරු ගෙවීම් දිනය
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,එක්
@@ -1529,10 +1558,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,අතර සොයා අතිච්ඡාදනය කොන්දේසි යටතේ:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,ජර්නල් සටහන් {0} එරෙහිව මේ වන විටත් තවත් වවුචරය එරෙහිව ගැලපූ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,මුළු සාමය අගය
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,ආහාර
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,ආහාර
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,වයස්ගතවීම රංගේ 3
 DocType: Maintenance Schedule Item,No of Visits,සංචාර අංක
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},{1} එරෙහිව නඩත්තු උපෙල්ඛනෙය් {0} පවතී
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,ඔබගේ අයිතම හබල් කිරීමට ඔබට අවශ්යද?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,ඇතුළත් ශිෂ්ය
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},සමාප්ති ගිණුම ව්යවහාර මුදල් විය යුතුය {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},සියලු අරමුණු සඳහා ලකුණු මුදල 100. විය යුතුය එය {0} වේ
@@ -1543,9 +1573,9 @@
 DocType: Authorization Rule,Average Discount,සාමාන්ය වට්ටම්
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,යටිතළ පහසුකම්
-DocType: Purchase Invoice Item,Accounting,ගිණුම්කරණය
+DocType: POS Profile,Accounting,ගිණුම්කරණය
 DocType: Employee,EMP/,දන්නේ නෑ නේද /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,batched අයිතමය සඳහා කාණ්ඩ තෝරන්න
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,batched අයිතමය සඳහා කාණ්ඩ තෝරන්න
 DocType: Asset,Depreciation Schedules,ක්ෂය කාලසටහන
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,අයදුම් කාලය පිටත නිවාඩු වෙන් කාලය විය නොහැකි
 DocType: Activity Cost,Projects,ව්යාපෘති
@@ -1561,7 +1591,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',අනුමැතිය තත්ත්වය &#39;අනුමත&#39; කළ යුතුය හෝ &#39;ප්රතික්ෂේප&#39;
 DocType: Physician,Contacts and Address,ඇමතුම් සහ ලිපිනය
 DocType: Purchase Invoice,Contact Person,අදාළ පුද්ගලයා
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&#39;අපේක්ෂිත ඇරඹුම් දිනය&#39; &#39;අපේක්ෂිත අවසානය දිනය&#39; ට වඩා වැඩි විය නොහැක
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&#39;අපේක්ෂිත ඇරඹුම් දිනය&#39; &#39;අපේක්ෂිත අවසානය දිනය&#39; ට වඩා වැඩි විය නොහැක
 DocType: Course Scheduling Tool,Course End Date,පාඨමාලා අවසානය දිනය
 DocType: Holiday List,Holidays,නිවාඩු දින
 DocType: Sales Order Item,Planned Quantity,සැලසුම් ප්රමාණ
@@ -1569,10 +1599,11 @@
 DocType: Item,Maintain Stock,කොටස් වෙළඳ පවත්වා
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,නිෂ්පාදන සාමය සඳහා දැනටමත් නිර්මාණය කොටස් අයැදුම්පත්
 DocType: Employee,Prefered Email,Prefered විද්යුත්
+DocType: Student Admission,Eligibility and Details,සුදුසුකම් සහ විස්තර
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,ස්ථාවර වත්කම් ශුද්ධ වෙනස්
 DocType: Leave Control Panel,Leave blank if considered for all designations,සියලු තනතුරු සඳහා සලකා නම් හිස්ව තබන්න
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,වර්ගය භාර &#39;සත&#39; පේළිය {0} අයිතමය ශ්රේණිගත ඇතුළත් කළ නොහැකි
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},මැක්ස්: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},මැක්ස්: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,දිනයවේලාව සිට
 DocType: Email Digest,For Company,සමාගම වෙනුවෙන්
 apps/erpnext/erpnext/config/support.py +17,Communication log.,සන්නිවේදන ලඝු-සටහන.
@@ -1580,19 +1611,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,සැපයුම්කරුවන් ලකුණු Scorecard ලකුණු කිරීම විචල්යය
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,මිලදී ගැනීමේ ප්රමාණය
 DocType: Sales Invoice,Shipping Address Name,නැව් ලිපිනය නම
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,ගිණුම් සටහන
 DocType: Material Request,Terms and Conditions Content,නියමයන් හා කොන්දේසි අන්තර්ගත
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,100 ට වඩා වැඩි විය නොහැක
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,අයිතමය {0} කොටස් අයිතමය නොවේ
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,අයිතමය {0} කොටස් අයිතමය නොවේ
 DocType: Maintenance Visit,Unscheduled,කලින් නොදන්වා
 DocType: Employee,Owned,අයත්
 DocType: Salary Detail,Depends on Leave Without Pay,වැටුප් නැතිව නිවාඩු මත රඳා පවතී
 DocType: Pricing Rule,"Higher the number, higher the priority",උසස් සංඛ්යාව ඉහළ ප්රමුඛත්වය
 ,Purchase Invoice Trends,මිලදී ගැනීම ඉන්වොයිසිය ප්රවණතා
 DocType: Employee,Better Prospects,වඩා හොඳ අපේක්ෂා
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","පේළියේ # {0}: මෙම කණ්ඩායම {1} පමණක් {2} යවන ලද ඇත. කරුණාකර {3} ලබා ගත යවන ලද ඇති තවත් කණ්ඩායම තෝරා ගැනීමට හෝ බහු කාණ්ඩ සිට / ප්රශ්නය ඉදිරිපත් කිරීමට, බහු පේළි බවට පේළිය බෙදී"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","පේළියේ # {0}: මෙම කණ්ඩායම {1} පමණක් {2} යවන ලද ඇත. කරුණාකර {3} ලබා ගත යවන ලද ඇති තවත් කණ්ඩායම තෝරා ගැනීමට හෝ බහු කාණ්ඩ සිට / ප්රශ්නය ඉදිරිපත් කිරීමට, බහු පේළි බවට පේළිය බෙදී"
 DocType: Vehicle,License Plate,බලපත්ර පළඟ
 DocType: Appraisal,Goals,ඉලක්ක
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,POS පැතිකඩ තෝරන්න
 DocType: Warranty Claim,Warranty / AMC Status,වගකීම් / විදේශ මුදල් හුවමාරු කරන්නන් තත්ත්වය
 ,Accounts Browser,ගිණුම් බ්රව්සරය
 DocType: Payment Entry Reference,Payment Entry Reference,ගෙවීම් සටහන් විමර්ශන
@@ -1610,7 +1641,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,සේවක තමා වෙත වාර්තා කළ නොහැක.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","ගිණුම කැටි නම්, ඇතුළත් කිරීම් සීමා පරිශීලකයන්ට ඉඩ දෙනු ලැබේ."
 DocType: Email Digest,Bank Balance,බැංකු ශේෂ
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} සඳහා මුල්ය සටහන්: {1} පමණක් මුදල් කළ හැකි: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} සඳහා මුල්ය සටහන්: {1} පමණක් මුදල් කළ හැකි: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","රැකියා පැතිකඩ, සුදුසුකම් අවශ්ය ආදිය"
 DocType: Journal Entry Account,Account Balance,ගිණුම් ශේෂය
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,ගනුදෙනු සඳහා බදු පාලනය.
@@ -1619,8 +1650,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),මුළු බදු හා ගාස්තු (සමාගම ව්යවහාර මුදල්)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,unclosed රාජ්ය මූල්ය වසරේ P &amp; L ශේෂයන් පෙන්වන්න
 DocType: Lab Test Template,Collection Details,එකතුව තොරතුරු
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date tabConsultation ct, `tabLab Prescription` cp මෙහි ct.patient = &#39;{0}&#39; සහ cp.parent = ct. නම සහ cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,නැව් ගිණුම
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: ගිණුම් {2} අක්රීය
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,ඔබ ඔබේ වැඩ කටයුතු සැලසුම් උදව් සහ නිසි වේලාවට ලබාදීමට විකුණුම් නියෝග කරන්න
@@ -1637,7 +1666,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,ඇසුරුම් කුවිතාන්සියක්
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,කාර්යාලය කුලියට
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup කෙටි පණ්වුඩ සැකසුම්
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,ආනයන අසාර්ථක විය!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,ආනයන අසාර්ථක විය!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,කිසිදු ලිපිනය තවමත් වැඩිදුරටත් සඳහන් කළේය.
 DocType: Workstation Working Hour,Workstation Working Hour,සේවා පරිගණකයක් කෘත්යාධිකාරී හෝරාව
 DocType: Vital Signs,Blood Pressure,රුධිර පීඩනය
@@ -1662,7 +1691,7 @@
 DocType: Sales Invoice,Source,මූලාශ්රය
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,පෙන්වන්න වසා
 DocType: Leave Type,Is Leave Without Pay,වැටුප් නැතිව නිවාඩු
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,වත්කම් ප්රවර්ගය ස්ථාවර වත්කම් භාණ්ඩයක් සඳහා අනිවාර්ය වේ
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,වත්කම් ප්රවර්ගය ස්ථාවර වත්කම් භාණ්ඩයක් සඳහා අනිවාර්ය වේ
 DocType: Fee Validity,Fee Validity,ගාස්තු වලංගු
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,වාර්තා ගෙවීම් වගුව සොයාගැනීමට නොමැත
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},මෙම {0} {2} {3} සඳහා {1} සමග ගැටුම්
@@ -1683,8 +1712,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,විධායක පිරික්සුම්
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,ආදර්ශ නිර්මාණය
 DocType: Maintenance Schedule,Schedules,කාලසටහන්
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,POS නිපැයුමක් භාවිතා කිරීම සඳහා භාවිතා කිරීම අවශ්ය වේ
 DocType: Purchase Invoice Item,Net Amount,ශුද්ධ මුදල
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} පියවර අවසන් කළ නොහැකි නිසා ඉදිරිපත් කර නොමැත
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} පියවර අවසන් කළ නොහැකි නිසා ඉදිරිපත් කර නොමැත
 DocType: Purchase Order Item Supplied,BOM Detail No,ද්රව්ය ලේඛණය විස්තර නොමැත
 DocType: Landed Cost Voucher,Additional Charges,අමතර ගාස්තු
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),අතිරේක වට්ටම් මුදල (සමාගම ව්යවහාර මුදල්)
@@ -1693,7 +1723,7 @@
 ,Support Hour Distribution,අමතර පැය බෙදාහැරීම
 DocType: Maintenance Visit,Maintenance Visit,නඩත්තු සංචාරය
 DocType: Student,Leaving Certificate Number,සහතික අංකය පිටත්
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","පත්වීම් අවලංගු කිරීම, කරුණාකර ඉන්වොයිසිය සමාලෝචනය කරන්න සහ අවලංගු කරන්න {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","පත්වීම් අවලංගු කිරීම, කරුණාකර ඉන්වොයිසිය සමාලෝචනය කරන්න සහ අවලංගු කරන්න {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,ලබා ගත හැකි කණ්ඩායම යවන ලද ගබඩා දී
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,යාවත්කාලීන මුද්රණය ආකෘතිය
 DocType: Landed Cost Voucher,Landed Cost Help,වියදම උදවු ගොඩ බස්වන ලදී
@@ -1716,8 +1746,8 @@
 DocType: Patient,Tobacco Past Use,දුම්කොළ අතීත පරිහරණය
 DocType: Sales Invoice Item,Brand Name,වෙළඳ නාමය නම
 DocType: Purchase Receipt,Transporter Details,ප්රවාහනය විස්තර
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},පරිශීලක {0} දැනටමත් වෛද්යවරයා වෙත පවරා ඇත. {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,පෙරනිමි ගබඩා සංකීර්ණය තෝරාගත් අයිතමය සඳහා අවශ්ය වේ
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},පරිශීලක {0} දැනටමත් වෛද්යවරයා වෙත පවරා ඇත. {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,පෙරනිමි ගබඩා සංකීර්ණය තෝරාගත් අයිතමය සඳහා අවශ්ය වේ
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,කොටුව
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,හැකි සැපයුම්කරු
 DocType: Budget,Monthly Distribution,මාසික බෙදාහැරීම්
@@ -1727,8 +1757,8 @@
 DocType: Sales Partner,Sales Partner Target,විකුණුම් සහකරු ඉලක්ක
 DocType: Loan Type,Maximum Loan Amount,උපරිම ණය මුදල
 DocType: Pricing Rule,Pricing Rule,මිල ගණන් පාලනය
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},ශිෂ්ය {0} සඳහා රෝල් අංකය අනුපිටපත්
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},ශිෂ්ය {0} සඳහා රෝල් අංකය අනුපිටපත්
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},ශිෂ්ය {0} සඳහා රෝල් අංකය අනුපිටපත්
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},ශිෂ්ය {0} සඳහා රෝල් අංකය අනුපිටපත්
 DocType: Budget,Action if Annual Budget Exceeded,ක්රියාකාරී වාර්ෂික අයවැය ඉක්මවා නම්
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,සාමය ලබා දීමට ද්රව්ය ඉල්ලීම්
 DocType: Shopping Cart Settings,Payment Success URL,ගෙවීම් සාර්ථකත්වය URL එක
@@ -1745,7 +1775,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} එක් වරක් පමණක් පෙනී සිටිය යුතුයි
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},මිලදී ගැනීමේ නියෝගයක් {2} එරෙහිව {1} වඩා වැඩි {0} පැවරීමේ කිරීමට ඉඩ දෙනු නොලැබේ
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},{0} සඳහා සාර්ථකව වෙන් කොළ
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,පැක් කරගන්න අයිතම කිසිදු
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,පැක් කරගන්න අයිතම කිසිදු
 DocType: Shipping Rule Condition,From Value,අගය
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,නිෂ්පාදන ප්රමාණය අනිවාර්ය වේ
 DocType: Employee Loan,Repayment Method,ණය ආපසු ගෙවීමේ ක්රමය
@@ -1759,6 +1789,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,කොටස් වගකීම්
 DocType: Purchase Invoice,Supplier Warehouse,සැපයුම්කරු ගබඩාව
 DocType: Opportunity,Contact Mobile No,අමතන්න ජංගම නොමැත
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,සමාගම තෝරන්න
 ,Material Requests for which Supplier Quotations are not created,සැපයුම්කරු මිල ගණන් නිර්මාණය නොවන සඳහා ද්රව්ය ඉල්ලීම්
 DocType: Student Group,Set 0 for no limit,සීමාවක් සඳහා 0 සකසන්න
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ඔබ නිවාඩු සඳහා අයදුම් කරන්නේ කරන දින (ව) නිවාඩු දින වේ. ඔබ නිවාඩු සඳහා අයදුම් අවශ්ය නැහැ.
@@ -1768,24 +1799,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,උද්ධෘත කරන්න
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,වෙනත් වාර්තා
 DocType: Dependent Task,Dependent Task,රඳා කාර්ය සාධක
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},නු පෙරනිමි ඒකකය සඳහා පරිවර්තන සාධකය පේළිය 1 {0} විය යුතුය
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},නු පෙරනිමි ඒකකය සඳහා පරිවර්තන සාධකය පේළිය 1 {0} විය යුතුය
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},"වර්ගයේ අවසරය, {0} තවදුරටත් {1} වඩා කෙටි විය හැකි"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,කල්තියා X දින සඳහා මෙහෙයුම් සැලසුම් උත්සාහ කරන්න.
 DocType: HR Settings,Stop Birthday Reminders,උපන්දින මතක් නතර
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},සමාගම {0} හි පෙරනිමි වැටුප් ගෙවිය යුතු ගිණුම් සකස් කරන්න
 DocType: SMS Center,Receiver List,ලබන්නා ලැයිස්තුව
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,සොයන්න අයිතමය
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,සොයන්න අයිතමය
 DocType: Patient Appointment,Referring Physician,වෛද්යවරයෙකු අමතන්න
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,පරිභෝජනය ප්රමාණය
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,මුදල් ශුද්ධ වෙනස්
 DocType: Assessment Plan,Grading Scale,ශ්රේණිගත පරිමාණ
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,නු {0} ඒකකය වරක් පරිවර්තන සාධකය වගුව වඩා ඇතුලත් කර ඇත
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,මේ වන විටත් අවසන්
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,නු {0} ඒකකය වරක් පරිවර්තන සාධකය වගුව වඩා ඇතුලත් කර ඇත
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,මේ වන විටත් අවසන්
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,අතේ කොටස්
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},ගෙවීම් ඉල්ලීම් මේ වන විටත් {0} පවතී
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,නිකුත් කර ඇත්තේ අයිතම පිරිවැය
 DocType: Physician,Hospital,රෝහල
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},ප්රමාණ {0} වඩා වැඩි නොවිය යුතුය
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},ප්රමාණ {0} වඩා වැඩි නොවිය යුතුය
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,පසුගිය මුල්ය වර්ෂය වසා නැත
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),වයස (දින)
 DocType: Quotation Item,Quotation Item,උද්ධෘත අයිතමය
@@ -1796,8 +1827,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,සැපයුම්කරු වර්ගය ස්වාමියා.
 DocType: Purchase Order Item,Supplier Part Number,සැපයුම්කරු අඩ අංකය
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,බවට පරිවර්තනය කිරීමේ අනුපාතිකය 0 හෝ 1 විය නොහැකි
-DocType: Sales Invoice,Reference Document,විමර්ශන ලේඛන
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} අවලංගු කර හෝ නතර
+DocType: Subscription,Reference Document,විමර්ශන ලේඛන
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} අවලංගු කර හෝ නතර
 DocType: Accounts Settings,Credit Controller,ක්රෙඩිට් පාලක
 DocType: Delivery Note,Vehicle Dispatch Date,වාහන යැවීම දිනය
 DocType: Healthcare Settings,Default Medical Code Standard,සම්මත වෛද්ය කේත ප්රමිතිය
@@ -1806,6 +1837,7 @@
 DocType: Company,Default Payable Account,පෙරනිමි ගෙවිය යුතු ගිණුම්
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","එවැනි නාවික නීතිය, මිල ලැයිස්තුව ආදිය සමඟ අමුත්තන් කරත්තයක් සඳහා සැකසුම්"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% අසූහත
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,මිලෙන් සුපර්ස් ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,ඇවිරිනි යවන ලද
 DocType: Party Account,Party Account,පක්ෂය ගිණුම
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,මානව සම්පත්
@@ -1817,13 +1849,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,ටහිර සටහන් කරන්න
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,ෙරෝ {0}: සැපයුම්කරු එරෙහිව උසස් හර කළ යුතුය
 DocType: Company,Default Values,පෙරනිමි අගයන්
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{සංඛ්යාත} ඩයිජස්ට්
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{සංඛ්යාත} ඩයිජස්ට්
 DocType: Expense Claim,Total Amount Reimbursed,මුළු මුදල පතිපූරණය
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,මෙය මේ වාහන එරෙහිව ලඝු-සටහන් මත පදනම් වේ. විස්තර සඳහා පහත කාල සටහනකට බලන්න
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},සැපයුම්කරු ඉන්වොයිසිය {0} එරෙහිව දිනැති {1}
 DocType: Customer,Default Price List,පෙරනිමි මිල ලැයිස්තුව
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,වත්කම් ව්යාපාරය වාර්තා {0} නිර්මාණය
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,ඔබ මුදල් වර්ෂය {0} මකා දැමිය නොහැකි. මුදල් වර්ෂය {0} ගෝලීය සැකසුම් සුපුරුදු ලෙස සකසා ඇත
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,එකම නමක් සහිත පාරිභෝගිකයෙක් දැනටමත් පවතී
 DocType: Journal Entry,Entry Type,ප්රවේශය වර්ගය
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,මෙම තක්සේරුව පිරිසක් සමග සම්බන්ධ කිසිදු ඇගයීමේ සැලසුමක්
 ,Customer Credit Balance,පාරිභෝගික ණය ශේෂ
@@ -1834,7 +1867,7 @@
 DocType: Quotation,Term Details,කාලීන තොරතුරු
 DocType: Project,Total Sales Cost (via Sales Order),(විකුණුම් ඇණවුම් හරහා) මුළු විකුණුම් පිරිවැය
 DocType: Project,Total Sales Cost (via Sales Order),(විකුණුම් ඇණවුම් හරහා) මුළු විකුණුම් පිරිවැය
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,{0} මෙම ශිෂ්ය කන්ඩායමක් සඳහා සිසුන් වඩා ලියාපදිංචි කල නොහැක.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,{0} මෙම ශිෂ්ය කන්ඩායමක් සඳහා සිසුන් වඩා ලියාපදිංචි කල නොහැක.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ඊයම් ගණන්
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,"{0}, 0 ට වඩා වැඩි විය යුතුය"
 DocType: Manufacturing Settings,Capacity Planning For (Days),(දින) සඳහා ධාරිතා සැලසුම්
@@ -1851,9 +1884,11 @@
 DocType: Lab Test,Technician Name,කාර්මික ශිල්පී නම
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ඉන්වොයිසිය අවලංගු මත ගෙවීම් විසන්ධි කරන්න
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},කියවීම ඇතුළු වත්මන් Odometer මූලික වාහන Odometer {0} වඩා වැඩි විය යුතුය
+DocType: Restaurant Reservation,No Show,පෙන්වන්නෙ නැහැ
 DocType: Shipping Rule Country,Shipping Rule Country,නැව් පාලනය රට
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,නිවාඩු හා පැමිණීම
 DocType: Maintenance Visit,Partially Completed,අර්ධ වශයෙන් නිම කරන
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,මධ්යස්ථ සංවේදීතාව
 DocType: Leave Type,Include holidays within leaves as leaves,කොළ ලෙස කොළ තුළ නිවාඩු දින ඇතුළත්
 DocType: Sales Invoice,Packed Items,හැකිළු අයිතම
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,අනු අංකය එරෙහිව වගකීම් හිමිකම්
@@ -1870,13 +1905,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),ගෙවුම් ප්රමාණය (සමාගම ව්යවහාර මුදල්)
 DocType: Purchase Invoice,Additional Discount,අතිරේක වට්ටම්
 DocType: Selling Settings,Selling Settings,සැකසුම් විකිණීම
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,ක්රියාකාරීත්වය තහවුරු කරන්න
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ඔන්ලයින් තේ වෙන්දේසියේදී
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,ප්රමාණ හෝ තක්සේරු අනුපාත හෝ දෙකම සඳහන් කරන්න
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,ඉටු වීම
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,කරත්ත තුළ බලන්න
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,අලෙවි වියදම්
 ,Item Shortage Report,අයිතමය හිඟය වාර්තාව
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","සිරුරේ බර සඳහන් වන්නේ, \ n කරුණාකර &quot;සිරුරේ බර UOM&quot; ගැන සඳහන් ද"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","සිරුරේ බර සඳහන් වන්නේ, \ n කරුණාකර &quot;සිරුරේ බර UOM&quot; ගැන සඳහන් ද"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,මෙම කොටස් සටහන් කිරීමට භාවිතා කෙරෙන ද්රව්ය ඉල්ලීම්
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,ඊළඟ ක්ෂය දිනය නව වත්කම් සඳහා අනිවාර්ය වේ
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,සෑම කණ්ඩායම සඳහා පදනම් සමූහ වෙනම පාඨමාලාව
@@ -1889,12 +1925,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,සඳහා සෑම කොටස් ව්යාපාරය මුල්ය සටහන් කරන්න
 DocType: Leave Allocation,Total Leaves Allocated,වෙන් මුළු පත්ර
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},ෙරෝ නැත {0} හි අවශ්ය පොත් ගබඩාව
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,වලංගු මුදල් වර්ෂය ආරම්භය හා අවසානය දිනයන් ඇතුලත් කරන්න
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,වලංගු මුදල් වර්ෂය ආරම්භය හා අවසානය දිනයන් ඇතුලත් කරන්න
 DocType: Employee,Date Of Retirement,විශ්රාම ගිය දිනය
 DocType: Upload Attendance,Get Template,සැකිල්ල ලබා ගන්න
 DocType: Material Request,Transferred,මාරු
 DocType: Vehicle,Doors,දොරවල්
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,සම්පූර්ණ ERPNext Setup!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,සම්පූර්ණ ERPNext Setup!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,රෝගියා ලියාපදිංචි කිරීමේ ගාස්තුව අයකර ගැනීම
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,"බදු බිඳ වැටීම,"
@@ -1913,37 +1949,37 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","මෙම අයිතමය ප්රභේද තිබේ නම්, එය අලෙවි නියෝග ආදිය තෝරාගත් කළ නොහැකි"
 DocType: Lead,Next Contact By,ඊළඟට අප අමතන්න කිරීම
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},විෂය {0} සඳහා අවශ්ය ප්රමාණය පේළියේ {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},විෂය {0} සඳහා අවශ්ය ප්රමාණය පේළියේ {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},පොත් ගබඩාව {0} ප්රමාණය අයිතමය {1} සඳහා පවතින අයුරිනි ඉවත් කල නොහැක
 DocType: Quotation,Order Type,සාමය වර්ගය
-DocType: Purchase Invoice,Notification Email Address,නිවේදනය විද්යුත් තැපැල් ලිපිනය
 ,Item-wise Sales Register,අයිතමය ප්රඥාවන්ත විකුණුම් රෙජිස්ටර්
 DocType: Asset,Gross Purchase Amount,දළ මිලදී ගැනීම මුදල
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,ආරම්භක ශේෂයන්
 DocType: Asset,Depreciation Method,ක්ෂය ක්රමය
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,නොබැඳි
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,නොබැඳි
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,මූලික අනුපාත ඇතුළත් මෙම බදු ද?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,මුළු ඉලක්ක
 DocType: Job Applicant,Applicant for a Job,රැකියාවක් සඳහා අයදුම්කරු
 DocType: Production Plan Material Request,Production Plan Material Request,"නිෂ්පාදන සැලැස්ම, භාණ්ඩ ඉල්ලීම"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,නිර්මාණය නිෂ්පාදන නියෝග අංක
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,නිර්මාණය නිෂ්පාදන නියෝග අංක
 DocType: Stock Reconciliation,Reconciliation JSON,ප්රතිසන්ධාන JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,බොහෝ තීරු. එම වාර්තාව අපනයනය සහ පැතුරුම්පත් උපයෝගයක් භාවිතා කරමින් එය මුද්රණය කරන්න.
 DocType: Purchase Invoice Item,Batch No,කණ්ඩායම කිසිදු
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},ඉල්ලීම සඳහා ඉල්ලීම: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,හැකි පාරිභෝගික ගේ මිලදී ගැනීමේ නියෝගයක් එරෙහිව බහු විකුණුම් නියෝග ඉඩ දෙන්න
 DocType: Student Group Instructor,Student Group Instructor,ශිෂ්ය කණ්ඩායම් උපදේශක
 DocType: Student Group Instructor,Student Group Instructor,ශිෂ්ය කණ්ඩායම් උපදේශක
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 ජංගම නොමැත
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,ප්රධාන
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,ප්රධාන
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,ප්රභේද්යයක්
 DocType: Naming Series,Set prefix for numbering series on your transactions,ඔබගේ ගනුදෙනු මාලාවක් සංඛ්යාවක් සඳහා උපසර්ගය සකසන්න
 DocType: Employee Attendance Tool,Employees HTML,සේවක HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,පෙරනිමි ද්රව්ය ලේඛණය ({0}) මෙම අයිතමය ශ්රේණිගත කරන්න හෝ එහි සැකිල්ල සඳහා ක්රියාකාරී විය යුතුය
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,පෙරනිමි ද්රව්ය ලේඛණය ({0}) මෙම අයිතමය ශ්රේණිගත කරන්න හෝ එහි සැකිල්ල සඳහා ක්රියාකාරී විය යුතුය
 DocType: Employee,Leave Encashed?,Encashed ගියාද?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ක්ෂේත්රයේ සිට අවස්ථාව අනිවාර්ය වේ
 DocType: Email Digest,Annual Expenses,වාර්ෂික වියදම්
 DocType: Item,Variants,ප්රභේද
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,මිලදී ගැනීමේ නියෝගයක් කරන්න
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,මිලදී ගැනීමේ නියෝගයක් කරන්න
 DocType: SMS Center,Send To,කිරීම යවන්න
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},නිවාඩු වර්ගය {0} සඳහා ප්රමාණවත් නිවාඩු ශේෂ එහි නොවන
 DocType: Payment Reconciliation Payment,Allocated amount,වෙන් කල මුදල
@@ -1961,6 +1997,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,ශිෂ්ය කණ්ඩායම් ශක්තිය
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,ජර්නල් සටහන් {0} එරෙහිව කිසිදු අසමසම {1} ප්රවේශය නොමැති
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,ඇගයීම්
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,පුහුණු සිදුවීම්
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},අනු අංකය අයිතමය {0} සඳහා ඇතුල් අනුපිටපත්
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,"එය නාවික, නීතියේ ආධිපත්යය සඳහා වන තත්ත්වය"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,කරුණාකර ඇතුලත් කරන්න
@@ -1970,7 +2007,7 @@
 DocType: Sales Order,To Deliver and Bill,බේරාගන්න සහ පනත් කෙටුම්පත
 DocType: Student Group,Instructors,උපදේශක
 DocType: GL Entry,Credit Amount in Account Currency,"ගිණුම ව්යවහාර මුදල්, නය මුදල"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,ද්රව්ය ලේඛණය {0} ඉදිරිපත් කළ යුතුය
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,ද්රව්ය ලේඛණය {0} ඉදිරිපත් කළ යුතුය
 DocType: Authorization Control,Authorization Control,බලය පැවරීමේ පාලන
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ෙරෝ # {0}: ප්රතික්ෂේප ගබඩාව ප්රතික්ෂේප අයිතමය {1} එරෙහිව අනිවාර්ය වේ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,ගෙවීම
@@ -1989,11 +2026,11 @@
 DocType: Quotation Item,Actual Qty,සැබෑ යවන ලද
 DocType: Sales Invoice Item,References,ආශ්රිත
 DocType: Quality Inspection Reading,Reading 10,කියවීම 10
-DocType: Hub Settings,Hub Node,මධ්යස්ථානයක් node එකක් මතම ඊට අදාල
+DocType: Hub Category,Hub Node,මධ්යස්ථානයක් node එකක් මතම ඊට අදාල
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,ඔබ අනුපිටපත් භාණ්ඩ ඇතුළු වී තිබේ. නිවැරදි කර නැවත උත්සාහ කරන්න.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,ආශ්රිත
 DocType: Asset Movement,Asset Movement,වත්කම් ව්යාපාරය
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,නව කරත්ත
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,නව කරත්ත
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,අයිතමය {0} ක් serialized අයිතමය නොවේ
 DocType: SMS Center,Create Receiver List,Receiver ලැයිස්තුව නිර්මාණය
 DocType: Vehicle,Wheels,රෝද
@@ -2007,15 +2044,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,විදුලි සංදේශ
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"මෙම පැකේජය මෙම බෙදාහැරීමේ කොටසක් බව පෙන්නුම් කරයි (පමණක් කෙටුම්පත),"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,ගෙවීම් සටහන් කරන්න
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},විෂය {0} සඳහා ප්රමාණ {1} වඩා අඩු විය යුතුය
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},විෂය {0} සඳහා ප්රමාණ {1} වඩා අඩු විය යුතුය
 ,Sales Invoice Trends,විකුණුම් ඉන්වොයිසිය ප්රවණතා
 DocType: Leave Application,Apply / Approve Leaves,අදාළ / පත්ර අනුමත
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,සදහා
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,සදහා
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',හෝ &#39;පෙර ෙරෝ මුළු&#39; &#39;පෙර ෙරෝ මුදල මත&#39; යන චෝදනාව වර්ගය නම් පමණයි පේළිය යොමු වේ
 DocType: Sales Order Item,Delivery Warehouse,සැපයුම් ගබඩාව
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,මූල්ය පිරිවැය මධ්යස්ථාන රුක්.
 DocType: Serial No,Delivery Document No,සැපයුම් ලේඛන නොමැත
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},සමාගම {0} තුළ &#39;වත්කම් බැහැර මත ලාභ / අලාභ ගිණුම්&#39; සකස් කරන්න
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},සමාගම {0} තුළ &#39;වත්කම් බැහැර මත ලාභ / අලාභ ගිණුම්&#39; සකස් කරන්න
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,අයිතම මිලදී ගැනීම ලැබීම් සිට ලබා ගන්න
 DocType: Serial No,Creation Date,නිර්මාණ දිනය
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},අයිතමය {0} මිල ලැයිස්තුව {1} තුළ කිහිපවතාවක් පෙනී
@@ -2026,12 +2063,13 @@
 DocType: Student,Student Mobile Number,ශිෂ්ය ජංගම දුරකතන අංකය
 DocType: Item,Has Variants,ප්රභේද ඇත
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,ප්රතිචාර යාවත්කාලීන කරන්න
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},ඔබ මේ වන විටත් {0} {1} සිට භාණ්ඩ තෝරාගෙන ඇති
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},ඔබ මේ වන විටත් {0} {1} සිට භාණ්ඩ තෝරාගෙන ඇති
 DocType: Monthly Distribution,Name of the Monthly Distribution,මාසික බෙදාහැරීම් නම
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,කණ්ඩායම හැඳුනුම්පත අනිවාර්ය වේ
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,කණ්ඩායම හැඳුනුම්පත අනිවාර්ය වේ
 DocType: Sales Person,Parent Sales Person,මව් විකුණුම් පුද්ගලයෙක්
-DocType: Purchase Invoice,Recurring Invoice,පුනරාවර්තනය ඉන්වොයිසිය
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,ඉහළ සිට පහළට
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,මුලින්ම වැඩසටහන තෝරන්න
 DocType: Patient Appointment,Patient Age,රෝගීන්ගේ වයස
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,කළමනාකාර ව්යාපෘති
 DocType: Supplier,Supplier of Goods or Services.,භාණ්ඩ ෙහෝ ෙසේවා සැපයුම්කරු.
@@ -2039,8 +2077,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,උපදේශක ගාස්තු සඳහා රෝගියාට නියම නොකළහොත් භාවිතා කළ යුතු නොගෙවන ලද ගෙවීම්.
 DocType: Vehicle Log,Fuel Price,ඉන්ධන මිල
 DocType: Budget,Budget,අයවැය
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,විවෘත කරන්න
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,ස්ථාවර වත්කම් අයිතමය නොවන කොටස් අයිතමය විය යුතුය.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,විවෘත කරන්න
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,ස්ථාවර වත්කම් අයිතමය නොවන කොටස් අයිතමය විය යුතුය.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","එය ආදායම් හෝ වියදම් ගිණුම නෑ ලෙස අයවැය, {0} එරෙහිව පවරා ගත නොහැකි"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,අත්පත් කර
 DocType: Student Admission,Application Form Route,ඉල්ලූම්පත් ආකෘතිය මාර්ගය
@@ -2054,12 +2092,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,අයිතමය {0} අනු අංක සඳහා පිහිටුවීම් නොවේ. අයිතමය ස්වාමියා පරීක්ෂා කරන්න
 DocType: Maintenance Visit,Maintenance Time,නඩත්තු කාල
 ,Amount to Deliver,බේරාගන්න මුදල
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},එකම අයිතමය කිහිප වතාවක් ඇතුළත් කර ඇත. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,හදුන්වන අරඹන්න දිනය කාලීන සම්බන්ධකම් කිරීමට (අධ්යයන වර්ෂය {}) අධ්යයන වසරේ වසරේ ආරම්භය දිනය වඩා කලින් විය නොහැක. දින වකවානු නිවැරදි කර නැවත උත්සාහ කරන්න.
 DocType: Guardian,Guardian Interests,ගාඩියන් උනන්දුව දක්වන ක්ෂෙත්ර:
 DocType: Naming Series,Current Value,වත්මන් වටිනාකම
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,දිනය {0} සඳහා බහු පිස්කල් අවුරුදු පවතී. රාජ්ය මූල්ය වර්ෂය තුළ දී සමාගමේ සකස් කරන්න
 DocType: School Settings,Instructor Records to be created by,විසින් නිර්මාණය කළ උපදේශක වාර්තා
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} නිර්මාණය
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} නිර්මාණය
 DocType: Delivery Note Item,Against Sales Order,විකුණුම් සාමය එරෙහිව
 ,Serial No Status,අනු අංකය තත්ත්වය
 DocType: Payment Entry Reference,Outstanding,විශිෂ්ට
@@ -2069,10 +2108,10 @@
 						must be greater than or equal to {2}",ෙරෝ {0}: {1} ආවර්තයක් සකස් කිරීම දිනය \ හා ත් අතර වෙනස වඩා වැඩි හෝ {2} සමාන විය යුතුයි
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,මෙම කොටස් ව්යාපාරය මත පදනම් වේ. බලන්න {0} විස්තර සඳහා
 DocType: Pricing Rule,Selling,විකිණීම
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},මුදල {0} {1} {2} එරෙහිව අඩු
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},මුදල {0} {1} {2} එරෙහිව අඩු
 DocType: Employee,Salary Information,වැටුප් තොරතුරු
 DocType: Sales Person,Name and Employee ID,නම සහ සේවක හැඳුනුම්පත
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,"නියමිත දිනය දිනය ගිය තැන, ශ්රී ලංකා තැපෑල පෙර විය නොහැකි"
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,"නියමිත දිනය දිනය ගිය තැන, ශ්රී ලංකා තැපෑල පෙර විය නොහැකි"
 DocType: Website Item Group,Website Item Group,වෙබ් අඩවිය අයිතමය සමූහ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,තීරු බදු හා බදු
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,විමර්ශන දිනය ඇතුලත් කරන්න
@@ -2098,7 +2137,7 @@
 DocType: Issue,Resolution Details,යෝජනාව විස්තර
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ප්රතිපාදන
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,පිළිගැනීම නිර්ණායක
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,ඉහත වගුවේ ද්රව්ය ඉල්ලීම් ඇතුලත් කරන්න
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,ඉහත වගුවේ ද්රව්ය ඉල්ලීම් ඇතුලත් කරන්න
 DocType: Item Attribute,Attribute Name,ආරෝපණය නම
 DocType: BOM,Show In Website,වෙබ් අඩවිය ගැන පෙන්වන්න
 DocType: Shopping Cart Settings,Show Quantity in Website,වෙබ් අඩවිය ප්රමාණ පෙන්වන්න
@@ -2107,7 +2146,7 @@
 DocType: Item Reorder,Check in (group),(කණ්ඩායම්) දී පරීක්ෂා
 ,Qty to Order,ඇණවුම් යවන ලද
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","ලාභය / අලාභය වෙන් කරනු ලබන වගකීම් හෝ කොටස් යටතේ ගිණුම, හිස,"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,සියලු කාර්යයන් Gantt සටහන.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,සියලු කාර්යයන් Gantt සටහන.
 DocType: Opportunity,Mins to First Response,පළමු ප්රතිචාර සඳහා මිනිත්තු
 DocType: Pricing Rule,Margin Type,ආන්තිකය වර්ගය
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,පැය {0}
@@ -2129,36 +2168,36 @@
 DocType: Patient,Surgical History,ශල්ය ඉතිහාසය
 DocType: Employee,Resignation Letter Date,ඉල්ලා අස්වීමේ ලිපිය දිනය
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,ප්රමාණය මත පදනම් මිල ගණන් රීති තවදුරටත් පෙරනු ලබයි.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},සේවක {0} සඳහා එක්වීමට දිනය සකස් කරන්න
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},සේවක {0} සඳහා එක්වීමට දිනය සකස් කරන්න
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},සේවක {0} සඳහා එක්වීමට දිනය සකස් කරන්න
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},සේවක {0} සඳහා එක්වීමට දිනය සකස් කරන්න
 DocType: Task,Total Billing Amount (via Time Sheet),(කාල පත්රය හරහා) මුළු බිල්පත් ප්රමාණය
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,නැවත පාරිභෝගික ආදායම්
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) භූමිකාව &#39;වියදම් Approver&#39; තිබිය යුතුය
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Pair
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,නිෂ්පාදන සඳහා ද ෙව් හා යවන ලද තෝරන්න
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,නිෂ්පාදන සඳහා ද ෙව් හා යවන ලද තෝරන්න
 DocType: Asset,Depreciation Schedule,ක්ෂය උපෙල්ඛනෙය්
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,"විකුණුම් සහකරු, ලිපින හා සම්බන්ධ වන්න"
 DocType: Bank Reconciliation Detail,Against Account,ගිණුම එරෙහිව
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,අර්ධ දින දිනය දිනය සිට මේ දක්වා අතර විය යුතුය
 DocType: Maintenance Schedule Detail,Actual Date,සැබෑ දිනය
 DocType: Item,Has Batch No,ඇත කණ්ඩායම කිසිදු
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},වාර්ෂික ගෙවීම්: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},වාර්ෂික ගෙවීම්: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),භාණ්ඩ හා සේවා බදු (GST ඉන්දියාව)
 DocType: Delivery Note,Excise Page Number,සුරාබදු පිටු අංකය
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","සමාගම, දිනය සිට මේ දක්වා අනිවාර්ය වේ"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,උපදේශනය ලබා ගන්න
 DocType: Asset,Purchase Date,මිලදීගත් දිනය
 DocType: Employee,Personal Details,පුද්ගලික තොරතුරු
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},සමාගම {0} තුළ &#39;වත්කම් ක්ෂය පිරිවැය මධ්යස්ථානය පිහිටුවා කරුණාකර
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},සමාගම {0} තුළ &#39;වත්කම් ක්ෂය පිරිවැය මධ්යස්ථානය පිහිටුවා කරුණාකර
 ,Maintenance Schedules,නඩත්තු කාලසටහන
 DocType: Task,Actual End Date (via Time Sheet),(කාල පත්රය හරහා) සැබෑ අවසානය දිනය
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},මුදල {0} {1} {2} {3} එරෙහිව
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},මුදල {0} {1} {2} {3} එරෙහිව
 ,Quotation Trends,උද්ධෘත ප්රවණතා
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},අයිතමය {0} සඳහා අයිතමය ස්වාමියා සඳහන් කර නැත අයිතමය සමූහ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,ගිණුමක් සඳහා ඩෙබිට් වූ ලැබිය යුතු ගිණුම් විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,ගිණුමක් සඳහා ඩෙබිට් වූ ලැබිය යුතු ගිණුම් විය යුතුය
 DocType: Shipping Rule Condition,Shipping Amount,නැව් ප්රමාණය
 DocType: Supplier Scorecard Period,Period Score,කාල පරතරය
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,ගනුදෙනුකරුවන් එකතු
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,ගනුදෙනුකරුවන් එකතු
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,විභාග මුදල
 DocType: Lab Test Template,Special,විශේෂ
 DocType: Purchase Invoice Item,Conversion Factor,පරිවර්තන සාධකය
@@ -2166,13 +2205,14 @@
 ,Vehicle Expenses,වාහන වියදම්
 DocType: Serial No,Invoice Details,ඉන්වොයිසිය විස්තර
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},ප්රයෝජනවත් ආයු පසු අපේක්ෂිත අගයට වඩා විශාල හෝ {0} වෙත සමාන විය යුතුයි
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,පටන් ගන්න
+DocType: Hub Category,Hub Category,ප්රවර්ග කේන්ද්රස්ථානය
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,වාහන අංක
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,පුනරාවර්තනය ඉන්වොයිස් මත නැවතුම් වනු ඇත දිනය
 DocType: Employee Loan,Loan Amount,ණය මුදල
 DocType: Program Enrollment,Self-Driving Vehicle,ස්වයං-රියදුරු වාහන
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,සැපයුම් සිතුවම් ස්ථාවර
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},පේළියේ {0}: ද්රව්ය පනත් කෙටුම්පත අයිතමය {1} සඳහා සොයාගත නොහැකි
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},පේළියේ {0}: ද්රව්ය පනත් කෙටුම්පත අයිතමය {1} සඳහා සොයාගත නොහැකි
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,මුළු වෙන් කොළ {0} කාලය සඳහා දැනටමත් අනුමැතිය කොළ {1} ට වඩා අඩු විය නොහැක
 DocType: Journal Entry,Accounts Receivable,ලැබිය යුතු ගිණුම්
 ,Supplier-Wise Sales Analytics,සැපයුම්කරු ප්රාඥ විකුණුම් විශ්ලේෂණ
@@ -2184,7 +2224,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","මව් පාඨමාලාව (මෙම මව් පාඨමාලාව කොටසක් නොවේ නම්, හිස්ව තබන්න)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,සියලු සේවක වර්ග සඳහා සලකා නම් හිස්ව තබන්න
 DocType: Landed Cost Voucher,Distribute Charges Based On,"මත පදනම් ගාස්තු, බෙදා හැරීමට"
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,මානව සම්පත් සැකසුම්
 DocType: Salary Slip,net pay info,ශුද්ධ වැටුප් තොරතුරු
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,මෙම අගය පෙරනිමි විකුණුම් මිල ලැයිස්තුවෙහි යාවත්කාලීන වේ.
@@ -2195,7 +2235,7 @@
 DocType: Patient,B Positive,B ධනාත්මකයි
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ෙරෝ # {0}: යවන ලද 1, අයිතමය ස්ථාවර වත්කම්වල පරිදි විය යුතුය. බහු යවන ලද සඳහා වෙනම පේළි භාවිතා කරන්න."
 DocType: Leave Block List Allow,Leave Block List Allow,වාරණ ලැයිස්තුව තබන්න ඉඩ දෙන්න
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr හිස් හෝ ඉඩක් බව අප වටහා ගත නො හැකි
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr හිස් හෝ ඉඩක් බව අප වටහා ගත නො හැකි
 DocType: Patient Medical Record,Patient Medical Record,රෝගියා වෛද්ය වාර්තාව
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,නොවන සමූහ සමූහ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ක්රීඩා
@@ -2211,9 +2251,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,"ප්රධාන දිනය {2} සඳහා {1} කර ගැනීම සඳහා, {0} සඳහා විනිමය අනුපාතය සොයා ගැනීමට නොහැකි විය. මුදල් හුවමාරු වාර්තා අතින් නිර්මාණය කරන්න"
 DocType: POS Profile,Price List,මිල දර්ශකය
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} දැන් ප්රකෘති මුදල් වර්ෂය වේ. බලපැවැත් වීමට වෙනසක් සඳහා ඔබේ බ්රවුසරය නැවුම් කරන්න.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,වියදම් හිමිකම්
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,වියදම් හිමිකම්
 DocType: Issue,Support,සහාය
 ,BOM Search,ද්රව්ය ලේඛණය සොයන්න
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",මෙම ගබඩාවේ ඇති කොටස් පදනම් කරගත් &quot;පදනම් කරගත්&quot; හෝ &quot;නොකරන ලද කොටස්&quot; ප්රකාශයට පත් කරන්න.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),වැසීම (+ එකතූන් විවෘත)
 DocType: Vehicle,Fuel Type,ඉන්ධන වර්ගය
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,සමාගම මුදල් නියම කරන්න
@@ -2225,16 +2266,16 @@
 DocType: Healthcare Settings,Remind Before,කලින් මතක් කරන්න
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM පරිවර්තනය සාධකය පේළිය {0} අවශ්ය කරන්නේ
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ෙරෝ # {0}: විමර්ශන ලේඛන වර්ගය විකුණුම් සාමය, විකුණුම් ඉන්වොයිසිය හෝ ජර්නල් Entry එකක් විය යුතුය"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ෙරෝ # {0}: විමර්ශන ලේඛන වර්ගය විකුණුම් සාමය, විකුණුම් ඉන්වොයිසිය හෝ ජර්නල් Entry එකක් විය යුතුය"
 DocType: Salary Component,Deduction,අඩු කිරීම්
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,ෙරෝ {0}: කාලය හා කලට අනිවාර්ය වේ.
 DocType: Stock Reconciliation Item,Amount Difference,මුදල වෙනස
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},අයිතමය මිල මිල ලැයිස්තුව {1} තුළ {0} වෙනුවෙන් එකතු
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},අයිතමය මිල මිල ලැයිස්තුව {1} තුළ {0} වෙනුවෙන් එකතු
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,මෙම අලෙවි පුද්ගලයා සේවක අංකය ඇතුල් කරන්න
 DocType: Territory,Classification of Customers by region,කලාපය අනුව ගනුදෙනුකරුවන් වර්ගීකරණය
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,වෙනස ප්රමාණය ශුන්ය විය යුතුය
 DocType: Project,Gross Margin,දළ ආන්තිකය
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,නිෂ්පාදන අයිතමය පළමු ඇතුලත් කරන්න
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,නිෂ්පාදන අයිතමය පළමු ඇතුලත් කරන්න
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,ගණනය බැංකු ප්රකාශය ඉතිරි
 DocType: Normal Test Template,Normal Test Template,සාමාන්ය ටෙම්ප්ලේටරයක්
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ආබාධිත පරිශීලක
@@ -2244,21 +2285,22 @@
 DocType: Salary Slip,Total Deduction,මුළු අඩු
 ,Production Analytics,නිෂ්පාදනය විශ්ලේෂණ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,මෙය මෙම රෝගියාට එරෙහි ගනුදෙනු මත පදනම් වේ. විස්තර සඳහා පහත කාල සටහන බලන්න
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,පිරිවැය යාවත්කාලීන කිරීම
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,පිරිවැය යාවත්කාලීන කිරීම
 DocType: Employee,Date of Birth,උපන්දිනය
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,අයිතමය {0} දැනටමත් ආපසු යවා ඇත
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** මුදල් වර්ෂය ** මූල්ය වර්ෂය නියෝජනය කරයි. ** ** මුදල් වර්ෂය එරෙහි සියලු ගිණුම් සටහන් ඇතුළත් කිරීම් සහ අනෙකුත් ප්රධාන ගනුදෙනු දම්වැල් මත ධාවනය වන ඇත.
 DocType: Opportunity,Customer / Lead Address,ගණුදෙනුකරු / ඊයම් ලිපිනය
 DocType: Patient,DOB,ඩොබ්
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,සැපයුම් සිතුවම් සැකසුම
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},අවවාදයයි: ඇමුණුමක් {0} මත වලංගු නොවන SSL සහතිකය
-DocType: Student Admission,Eligibility,සුදුසුකම්
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,තක්සේරු සැලැස්ම නම
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},අවවාදයයි: ඇමුණුමක් {0} මත වලංගු නොවන SSL සහතිකය
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","ආදර්ශ ඔබේ නායකත්වය ලෙස ඔබගේ සියලු සම්බන්ධතා සහ තවත් එකතු කරන්න, ඔබ ව්යාපාරය ලබා ගැනීමට උදව්"
 DocType: Production Order Operation,Actual Operation Time,සැබෑ මෙහෙයුම කාල
 DocType: Authorization Rule,Applicable To (User),(පරිශීලක) අදාළ
 DocType: Purchase Taxes and Charges,Deduct,අඩු
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,රැකියා විස්තරය
 DocType: Student Applicant,Applied,ව්යවහාරික
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,නැවත විවෘත
 DocType: Sales Invoice Item,Qty as per Stock UOM,කොටස් UOM අනුව යවන ලද
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 නම
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","හැර විශේෂ අක්ෂර &quot;-&quot;, &quot;#&quot;, &quot;.&quot; සහ &quot;/&quot; මාලාවක් නම් කිරීමට ඉඩ නොදෙන"
@@ -2270,7 +2312,7 @@
 DocType: Request for Quotation,Manufacturing Manager,නිෂ්පාදන කළමනාකරු
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},අනු අංකය {0} {1} දක්වා වගකීමක් යටතේ
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,ඇසුරුම් සැපයුම් සටහන බෙදී ගියේ ය.
-apps/erpnext/erpnext/hooks.py +98,Shipments,භාණ්ඩ නිකුත් කිරීම්
+apps/erpnext/erpnext/hooks.py +107,Shipments,භාණ්ඩ නිකුත් කිරීම්
 DocType: Payment Entry,Total Allocated Amount (Company Currency),මුළු වෙන් කළ මුදල (සමාගම ව්යවහාර මුදල්)
 DocType: Purchase Order Item,To be delivered to customer,පාරිභෝගිකයා වෙත බාර දීමට
 DocType: BOM,Scrap Material Cost,පරණ ද්රව්ය පිරිවැය
@@ -2292,8 +2334,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,අයිතම විකල්ප සැකසුම්
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,සමාගම තෝරන්න ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,සියළුම දෙපාර්තමේන්තු සඳහා සලකා නම් හිස්ව තබන්න
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","රැකියා ආකාර (ස්ථිර, කොන්ත්රාත්, සීමාවාසික ආදිය)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} අයිතමය {1} සඳහා අනිවාර්ය වේ
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","රැකියා ආකාර (ස්ථිර, කොන්ත්රාත්, සීමාවාසික ආදිය)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} අයිතමය {1} සඳහා අනිවාර්ය වේ
 DocType: Process Payroll,Fortnightly,දෙසතියකට වරක්
 DocType: Currency Exchange,From Currency,ව්යවහාර මුදල් වලින්
 DocType: Vital Signs,Weight (In Kilogram),සිරුරේ බර (කිලෝවක)
@@ -2318,7 +2360,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,කාලසටහන ලබා ගැනීම සඳහා &#39;උත්පාදනය උපෙල්ඛනෙය්&#39; මත ක්ලික් කරන්න
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,පහත සඳහන් කාලසටහන් මකාදැමීමේ දෝෂ ඇතිවිය:
 DocType: Bin,Ordered Quantity,නියෝග ප්රමාණ
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",උදා: &quot;ඉදි කරන්නන් සඳහා වන මෙවලම් බිල්ඩ්&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",උදා: &quot;ඉදි කරන්නන් සඳහා වන මෙවලම් බිල්ඩ්&quot;
 DocType: Grading Scale,Grading Scale Intervals,ශ්රේණිගත පරිමාණ ප්රාන්තර
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {3}: {2} පමණක් මුදල් කළ හැකි සඳහා මුල්ය සටහන්
 DocType: Production Order,In Process,ක්රියාවලිය
@@ -2342,11 +2384,10 @@
 DocType: Purchase Invoice,With Payment of Tax,බදු ගෙවීමෙන්
 DocType: Expense Claim Detail,Expense Claim Detail,වියදම් හිමිකම් විස්තර
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,සැපයුම්කරු සඳහා පිටපත් තුනකින්
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,කරුණාකර නිවැරදි ගිණුම තෝරා
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,කරුණාකර නිවැරදි ගිණුම තෝරා
 DocType: Item,Weight UOM,සිරුරේ බර UOM
 DocType: Salary Structure Employee,Salary Structure Employee,වැටුප් ව්යුහය සේවක
 DocType: Patient,Blood Group,ලේ වර්ගය
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,විභාග
 DocType: Course,Course Name,පාඨමාලා නම
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"නිශ්චිත සේවක නිවාඩු අයදුම්පත් අනුමත කළ හැකි ද කරන භාවිතා කරන්නන්,"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,කාර්යාල උපකරණ
@@ -2365,7 +2406,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,මිල ලැයිස්තුව සකස් වී නොමැති නම් මිල ගණන් පෙන්වා ඇත කළ නොහැකි වනු ඇත
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"මෙම නැව්, නීතියේ ආධිපත්යය සඳහා වන රට සඳහන් හෝ ලෝක ව්යාප්ත නැව් කරුණාකර පරීක්ෂා කරන්න"
 DocType: Stock Entry,Total Incoming Value,මුළු එන අගය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,ඩෙබිට් කිරීම අවශ්ය වේ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,ඩෙබිට් කිරීම අවශ්ය වේ
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ඔබගේ කණ්ඩායම විසින් සිදු කළ කටයුතුවලදී සඳහා කාලය, පිරිවැය සහ බිල්පත් පිළිබඳ වාර්තාවක් තබා ගැනීමට උදව්"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,මිලදී ගැනීම මිල ලැයිස්තුව
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,සැපයුම්කරුවන් ලකුණු දර්ශක විචල්යයන්හි තේමාවන්.
@@ -2375,7 +2416,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,ගෙවීම් ප්රතිසන්ධාන
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,කරුණාකර අංශය භාර පුද්ගලයා නම තෝරා
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,තාක්ෂණ
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},මුළු නොගෙවූ: {0}
+DocType: Hub Settings,Unregister from Hub,Hub වෙතින් ඉවත් කරන්න
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},මුළු නොගෙවූ: {0}
 DocType: BOM Website Operation,BOM Website Operation,ද්රව්ය ලේඛණය වෙබ් අඩවිය මෙහෙයුම
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,ඉල්ලුමට ලිපිය
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,ද්රව්ය ඉල්ලීම් (භා.අ.සැ.) සහ නිෂ්පාදන නියෝග උත්පාදනය.
@@ -2387,7 +2429,9 @@
 DocType: Physician Schedule Time Slot,To Time,වේලාව
 DocType: Authorization Rule,Approving Role (above authorized value),අනුමත කාර්ය භාරය (බලය ලත් අගය ඉහළ)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,ගිණුමක් සඳහා ක්රෙඩිට් ගෙවිය යුතු ගිණුම් විය යුතුය
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},ද්රව්ය ලේඛණය සහානුයාත: {0} {2} මව් හෝ ළමා විය නොහැකි
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,ගෙවන ලද ශිෂ්ය අයදුම්කරුට අනිවාර්යයෙන්ම ඇතුළත් වන ශිෂ්ය හැඳුනුම්පත තෝරා ගන්න
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},ද්රව්ය ලේඛණය සහානුයාත: {0} {2} මව් හෝ ළමා විය නොහැකි
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,මිල ගණන් ප්රකාශයට පත් කරන්න
 DocType: Production Order Operation,Completed Qty,අවසන් යවන ලද
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","{0} සඳහා, ඩෙබිට් ගිණුම් වලට පමණක් තවත් ණය ප්රවේශය හා සම්බන්ධ කර ගත හැකි"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,මිල ලැයිස්තුව {0} අක්රීය කර ඇත
@@ -2399,39 +2443,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} අයිතමය {1} සඳහා අවශ්ය අනු ගණන්. ඔබ {2} විසින් ජනතාවට ලබා දී ඇත.
 DocType: Stock Reconciliation Item,Current Valuation Rate,වත්මන් තක්සේරු අනුපාත
 DocType: Item,Customer Item Codes,පාරිභෝගික අයිතමය කේත
+DocType: Training Event,Advance,අත්තිකාරම්
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,නැවත නැවත උත්පාදනය කිරීම සඳහා.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,විනිමය ලාභ / අඞු කිරීමට
 DocType: Opportunity,Lost Reason,අහිමි හේතුව
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,නව ලිපිනය
 DocType: Quality Inspection,Sample Size,නියැදියේ ප්රමාණය
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,රිසිට්පත ලේඛන ඇතුලත් කරන්න
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,සියලු අයිතම දැනටමත් ඉන්වොයිස් කර ඇත
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;නඩු අංක සිට&#39; වලංගු සඳහන් කරන්න
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',&#39;නඩු අංක සිට&#39; වලංගු සඳහන් කරන්න
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,තව දුරටත් වියදම් මධ්යස්ථාන කණ්ඩායම් යටතේ ඉදිරිපත් කළ හැකි නමුත් සටහන් ඇතුළත් කිරීම්-කණ්ඩායම් නොවන එරෙහිව කළ හැකි
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,පරිශීලකයන් හා අවසර
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},නිර්මාණය කරන ලද්දේ නිෂ්පාදනය නියෝග: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},නිර්මාණය කරන ලද්දේ නිෂ්පාදනය නියෝග: {0}
 DocType: Branch,Branch,ශාඛාව
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,මුද්රණ හා ෙවළඳ නාමකරණ
 DocType: Company,Total Monthly Sales,මුළු මාසික විකුණුම්
 DocType: Bin,Actual Quantity,සැබෑ ප්රමාණය
 DocType: Shipping Rule,example: Next Day Shipping,උදාහරණයක් ලෙස: ඊළඟ දින නැව්
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,{0} සොයාගත නොහැකි අනු අංකය
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},දායකත්වය {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},දායකත්වය {0}
 DocType: Fee Schedule Program,Fee Schedule Program,ගාස්තු වැඩ සටහන
 DocType: Fee Schedule Program,Student Batch,ශිෂ්ය කණ්ඩායම
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,&#39;tabVital Signs&#39; වෙතින් තෝරා ගන්න. රෝගියා = &#39;{0}&#39; signs_date desc limit by 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,ශිෂ්ය කරන්න
 DocType: Supplier Scorecard Scoring Standing,Min Grade,අවම ශ්රේණිය
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},ඔබ මෙම ව්යාපෘතිය පිළිබඳව සහයෝගයෙන් කටයුතු කිරීමට ආරාධනා කර ඇත: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},වෛද්යවරයා {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},ඔබ මෙම ව්යාපෘතිය පිළිබඳව සහයෝගයෙන් කටයුතු කිරීමට ආරාධනා කර ඇත: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},වෛද්යවරයා {0}
 DocType: Leave Block List Date,Block Date,වාරණ දිනය
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},මාතෘකාවට අනුකූල ක්ෂේත්රයේ දායකත්ව අංකය එකතු කරන්න doctype {0}
 DocType: Purchase Receipt,Supplier Delivery Note,සැපයුම් සැපයුම් සටහන
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,දැන් ඉල්ලුම් කරන්න
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,දැන් ඉල්ලුම් කරන්න
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},සැබෑ යවන ලද {0} / බලා සිටීමේ යවන ලද {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},සැබෑ යවන ලද {0} / බලා සිටීමේ යවන ලද {1}
 DocType: Purchase Invoice,E-commerce GSTIN,ඊ-වාණිජ්යය GSTIN
 DocType: Sales Order,Not Delivered,භාර නොවන
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,අපේක්ෂිත දිනය ගණුදෙනු දිනයකට පෙර විය නොහැක
 ,Bank Clearance Summary,බැංකු නිෂ්කාශන සාරාංශය
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","නිර්මාණය හා දෛනික, කළමනාකරණය කිරීම, සතිපතා හා මාසික ඊ-තැපැල් digests."
 DocType: Appraisal Goal,Appraisal Goal,ඇගයීෙම් අරමුණ
@@ -2439,12 +2484,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,ගොඩනැගිලි
 DocType: Fee Schedule,Fee Structure,ගාස්තු ව්යුහය
 DocType: Timesheet Detail,Costing Amount,මුදල ක වියදමින්
-DocType: Student Admission,Application Fee,අයදුම් කිරීමේ ගාස්තුව
+DocType: Student Admission Program,Application Fee,අයදුම් කිරීමේ ගාස්තුව
 DocType: Process Payroll,Submit Salary Slip,වැටුප පුරවා ඉදිරිපත්
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,විෂය {0} සඳහා Maxiumm වට්ටමක් {1}% ක්
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,විෂය {0} සඳහා Maxiumm වට්ටමක් {1}% ක්
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,තොග ආනයන
 DocType: Sales Partner,Address & Contacts,ලිපිනය සහ අප අමතන්න
 DocType: SMS Log,Sender Name,යවන්නාගේ නම
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,නිර්ණායක අනුව වර්ග කරන්න
 DocType: POS Profile,[Select],[තෝරන්න]
 DocType: Vital Signs,Blood Pressure (diastolic),රුධිර පීඩනය (දූරකථන)
 DocType: SMS Log,Sent To,කිරීම සඳහා යවා
@@ -2453,7 +2499,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,ඊළඟට අප අමතන්න දිනය අතීතයේ දී කළ නොහැකි
 DocType: Company,For Reference Only.,විමර්ශන පමණක් සඳහා.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},වෛද්යවරයා {0} {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,කණ්ඩායම තේරීම් නොමැත
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,කණ්ඩායම තේරීම් නොමැත
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},වලංගු නොවන {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,ආශ්රිත Inv
@@ -2469,15 +2515,15 @@
 DocType: Normal Test Items,Require Result Value,ප්රතිඵල වටිනාකම
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,නඩු අංක 0 වෙන්න බෑ
 DocType: Item,Show a slideshow at the top of the page,පිටුවේ ඉහළ ඇති වූ අතිබහුතරයකගේ පෙන්වන්න
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,ස්ටෝර්ස්
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,ස්ටෝර්ස්
 DocType: Project Type,Projects Manager,ව්යාපෘති කළමනාකරු
 DocType: Serial No,Delivery Time,භාරදීමේ වේලාව
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,වයස්ගතවීම ආශ්රිත දා
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,පත්වීම අවලංගු වේ
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,පත්වීම අවලංගු වේ
 DocType: Item,End of Life,ජීවිතයේ අවසානය
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,ගමන්
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,ලබා දී දින සඳහා සේවක {0} සඳහා සොයා ගත නොහැකි විය සකිය ෙහෝ පෙරනිමි වැටුප් ව්යුහය
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,ගමන්
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,ලබා දී දින සඳහා සේවක {0} සඳහා සොයා ගත නොහැකි විය සකිය ෙහෝ පෙරනිමි වැටුප් ව්යුහය
 DocType: Leave Block List,Allow Users,පරිශීලකයන් ඉඩ දෙන්න
 DocType: Purchase Order,Customer Mobile No,පාරිභෝගික ජංගම නොමැත
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,පුනරාවර්තනය
@@ -2486,12 +2532,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,යාවත්කාලීන වියදම
 DocType: Item Reorder,Item Reorder,අයිතමය සීරුමාරු කිරීමේ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,වැටුප පුරවා පෙන්වන්න
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,ද්රව්ය මාරු
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,ද්රව්ය මාරු
 DocType: Fees,Send Payment Request,ගෙවීම් ඉල්ලුම යවන්න
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",", මෙහෙයුම් විශේෂයෙන් සඳහන් මෙහෙයුම් පිරිවැය සහ අද්විතීය මෙහෙයුම ඔබේ ක්රියාකාරිත්වය සඳහා කිසිදු දෙන්න."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,මෙම ලේඛනය අයිතමය {4} සඳහා {0} {1} විසින් සීමාව ඉක්මවා ඇත. ඔබ එකම {2} එරෙහිව තවත් {3} ගන්නවාද?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,ඉතිරි පසු නැවත නැවත සකස් කරන්න
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,වෙනස් මුදල ගිණුම තෝරන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,වෙනස් මුදල ගිණුම තෝරන්න
 DocType: Purchase Invoice,Price List Currency,මිල ලැයිස්තුව ව්යවහාර මුදල්
 DocType: Naming Series,User must always select,පරිශීලක සෑම විටම තෝරාගත යුතුය
 DocType: Stock Settings,Allow Negative Stock,ඍණ කොටස් ඉඩ දෙන්න
@@ -2511,7 +2557,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,සේවක
 DocType: Sample Collection,Collected Time,එකතු කළ කාලය
 DocType: Company,Sales Monthly History,විකුණුම් මාසික ඉතිහාසය
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,කණ්ඩායම තේරීම්
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,කණ්ඩායම තේරීම්
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} සම්පූර්ණයෙන්ම ගෙවිය යුතුය
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,වැදගත් සංඥා
 DocType: Training Event,End Time,අවසන් කාල
@@ -2519,16 +2565,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,ගෙවීම් අඩු කිරීම් හෝ අඞු කිරීමට
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,විකුණුම් හෝ මිළදී සඳහා සම්මත කොන්ත්රාත් කොන්දේසි.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,වවුචරයක් විසින් සමූහ
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,මෙම හමුවීම අවලංගු කිරීමට අවශ්ය බව ඔබට විශ්වාසද?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,විකුණුම් නල
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},වැටුප සංරචක {0} පැහැර ගිණුමක් සකස් කරන්න
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,දා අවශ්ය
 DocType: Rename Tool,File to Rename,නැවත නම් කරන්න කිරීමට ගොනු
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},කරුණාකර ෙරෝ {0} තුළ අයිතමය සඳහා ද ෙව් තෝරා
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},කරුණාකර ෙරෝ {0} තුළ අයිතමය සඳහා ද ෙව් තෝරා
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},ගිණුමක් {0} ගිණුම ප්රකාරය සමාගම {1} සමග නොගැලපේ: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},නිශ්චිතව දක්වා ඇති ද්රව්ය ලේඛණය {0} අයිතමය {1} සඳහා නොපවතියි
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,මෙම වෙළෙඳ න්යාය අවලංගු කිරීම පෙර නඩත්තු උපෙල්ඛනෙය් {0} අවලංගු කළ යුතුය
+DocType: POS Profile,Applicable for Users,පරිශීලකයින් සඳහා අදාළ වේ
 DocType: Notification Control,Expense Claim Approved,වියදම් හිමිකම් අනුමත
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,සේවක වැටුප් පුරවා {0} දැනටමත් මෙම කාල සීමාව සඳහා නිර්මාණය
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,සේවක වැටුප් පුරවා {0} දැනටමත් මෙම කාල සීමාව සඳහා නිර්මාණය
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,ඖෂධ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,මිලදී ගත් අයිතම පිරිවැය
 DocType: Selling Settings,Sales Order Required,විකුණුම් සාමය අවශ්ය
@@ -2553,6 +2601,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,ආයතනය
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,ආයතනය
 DocType: BOM Update Tool,BOM Update Tool,BOM යාවත්කාලීන මෙවලම
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","පාර්ශව ගිණුමක් විශේෂයෙන් සඳහන් කර නැත, කරුණාකර සමාගම තුළ පෙරනිමි පාර්ශවීය ගිණුමක් සකසා ගන්න"
 DocType: SG Creation Tool Course,Student Group Name,ශිෂ්ය කණ්ඩායම් නම
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,ගාස්තු සැකසීම
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,ඔබට නිසැකවම මෙම සමාගම සඳහා වන සියළුම ගනුදෙනු මැකීමට අවශ්ය බවට තහවුරු කරගන්න. එය ඔබගේ ස්වාමියා දත්ත පවතිනු ඇත. මෙම ක්රියාව නැති කළ නොහැක.
@@ -2561,29 +2610,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) නිෂ්පාදන න්යාය {3} සැලසුම් quanitity ({2}) ට වඩා වැඩි විය නොහැක
 DocType: Shipping Rule,Shipping Rule Label,නැව් පාලනය ලේබල්
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,පරිශීලක සංසදය
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,", අමු ද්රව්ය, හිස් විය නොහැක."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.",", කොටස් යාවත්කාලීන නොවන ඉන්වොයිස් පහත නාවික අයිතමය අඩංගු විය."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,", අමු ද්රව්ය, හිස් විය නොහැක."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.",", කොටස් යාවත්කාලීන නොවන ඉන්වොයිස් පහත නාවික අයිතමය අඩංගු විය."
 DocType: Lab Test Sample,Lab Test Sample,පරීක්ෂණ පරීක්ෂණ නියැදිය
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,ඉක්මන් ජර්නල් සටහන්
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,ඔබ අනුපාතය වෙනස් කළ නොහැක ද්රව්ය ලේඛණය යම් භාණ්ඩයක agianst සඳහන් නම්
+DocType: Restaurant,Invoice Series Prefix,ඉන්වොයිසි ශ්රේණියේ Prefix
 DocType: Employee,Previous Work Experience,පසුගිය සේවා පළපුරුද්ද
 DocType: Stock Entry,For Quantity,ප්රමාණ සඳහා
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},පේළියේ දී අයිතමය {0} සඳහා සැලසුම් යවන ලද ඇතුලත් කරන්න {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},පේළියේ දී අයිතමය {0} සඳහා සැලසුම් යවන ලද ඇතුලත් කරන්න {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} ඉදිරිපත් කර නැත
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,භාණ්ඩ සඳහා වන ඉල්ලීම්.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,එක් එක් හොඳ අයිතමය අවසන් සඳහා වෙනම නිෂ්පාදනය සඳහා නිර්මාණය කරනු ඇත.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} ආපසු ලියවිල්ල තුල සෘණාත්මක විය යුතුය
 ,Minutes to First Response for Issues,ගැටළු සඳහා පළමු ප්රතිචාර සඳහා විනාඩි
 DocType: Purchase Invoice,Terms and Conditions1,නියමයන් හා Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,ඔබ මෙම පද්ධතිය සකස්කර සඳහා ආයතනයේ නම.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,ඔබ මෙම පද්ධතිය සකස්කර සඳහා ආයතනයේ නම.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","මෙම දිනය දක්වා කැටි මුල්ය ප්රවේශය, කිසිවෙක් කරන්න පුළුවන් / පහත සඳහන් නියමිත කාර්යභාරය හැර ප්රවේශය වෙනස් කරගත හැක."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,නඩත්තු කාලසටහන ජනනය පෙර ලිපිය සුරැකීම කරුණාකර
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,සියලුම BOMs වල නවතම මිල යාවත්කාලීන කිරීම
 DocType: Fee Schedule,Successful,සාර්ථක
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,ව්යාපෘති තත්ත්වය
 DocType: UOM,Check this to disallow fractions. (for Nos),භාග බලය පැවරෙන මෙම පරීක්ෂා කරන්න. (අංක සඳහා)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,පහත සඳහන් නිෂ්පාදන නියෝග නිර්මාණය කරන ලදී:
-DocType: Student Admission,Naming Series (for Student Applicant),(ශිෂ්ය අයදුම්කරු සඳහා) ශ්රේණි අනුප්රාප්තිකයා නම් කිරීම
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,පහත සඳහන් නිෂ්පාදන නියෝග නිර්මාණය කරන ලදී:
+DocType: Student Admission Program,Naming Series (for Student Applicant),(ශිෂ්ය අයදුම්කරු සඳහා) ශ්රේණි අනුප්රාප්තිකයා නම් කිරීම
 DocType: Delivery Note,Transporter Name,ප්රවාහනය නම
 DocType: Authorization Rule,Authorized Value,බලයලත් අගය
 DocType: BOM,Show Operations,මෙහෙයුම් පෙන්වන්න
@@ -2607,7 +2657,7 @@
 ,Employees working on a holiday,නිවාඩු මත සේවය කරන සේවක
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,මාක් වර්තමාන
 DocType: Project,% Complete Method,% සම්පූර්ණ ක්රමය
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,මත්ද්රව්ය
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,මත්ද්රව්ය
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},නඩත්තු ආරම්භක දිනය අනු අංකය {0} සඳහා බෙදාහැරීමේ දිනට පෙර විය නොහැකි
 DocType: Production Order,Actual End Date,සැබෑ අවසානය දිනය
 DocType: BOM,Operating Cost (Company Currency),මෙහෙයුම් වියදම (සමාගම ව්යවහාර මුදල්)
@@ -2625,13 +2675,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,පරිශීලක අනුමත පාලනය කිරීම සඳහා අදාළ වේ පරිශීලක ලෙස සමාන විය නොහැකි
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),මූලික අනුපාතිකය (කොටස් UOM අනුව)
 DocType: SMS Log,No of Requested SMS,ඉල්ලන කෙටි පණිවුඩ අංක
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,වැටුප් නැතිව නිවාඩු අනුමත නිවාඩු ඉල්ලුම් වාර්තා සමග නොගැලපේ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,වැටුප් නැතිව නිවාඩු අනුමත නිවාඩු ඉල්ලුම් වාර්තා සමග නොගැලපේ
 DocType: Campaign,Campaign-.####,ව්යාපාරය -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ඊළඟ පියවර
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,හැකි හොඳම මිලකට නිශ්චිතව දක්වා ඇති අයිතම සැපයීමට කරුණාකර
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,ඉන්වොයිසියක් සාදන්න
 DocType: Selling Settings,Auto close Opportunity after 15 days,දින 15 කට පසු වාහන සමීප අවස්ථා
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} ලකුණු මට්ටමක් නිසා {0} මිලදී ගැනීමේ ඇණවුම්වලට අවසර නැත.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} ලකුණු මට්ටමක් නිසා {0} මිලදී ගැනීමේ ඇණවුම්වලට අවසර නැත.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,අවසන් වසර
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2639,6 +2689,7 @@
 DocType: Vital Signs,Nutrition Values,පෝෂණ ගුණයන්
 DocType: Lab Test Template,Is billable,බිලිය හැකිද?
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",&quot;වෛද්ය&quot; උපලේඛන හා පත්වීම් කාලය &quot;යන දෙකම Dr {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,තුන්වන පක්ෂය බෙදාහැරීමේ / අලෙවි නියෝජිත / කොමිස් සඳහා සමාගම් නිෂ්පාදන අලෙවි කරන කොමිෂන් නියෝජිතයා / අනුබද්ධ / දේශීය වෙළඳ සහකරුවන්.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} මිලදී ගැනීමේ නියෝගයක් {1} එරෙහිව
 DocType: Patient,Patient Demographics,රෝගීන්ගේ ජන විකසනය
@@ -2668,7 +2719,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","සියලු මිලදී ගැනීම ගනුදෙනු සඳහා ඉල්ලුම් කළ හැකි බව සම්මත බදු ආකෘතියකි. මෙම සැකිල්ල, බදු ප්රධානීන් ලැයිස්තුව අඩංගු වන අතර &quot;නැව්&quot;, &quot;රක්ෂණ&quot;, &quot;හැසිරවීම සම්බන්ධ&quot; ආදිය #### වැනි අනෙකුත් වියදම් ප්රධානීන් ඔබ මෙහි අර්ථ බදු අනුපාතය සියලු ** අයිතම සඳහා සම්මත බදු අනුපාතය වනු ඇත සටහන හැක * . * ගාස්තු වෙනස් ඇති බව ** අයිතම ** තිබේ නම්, ඔවුන් ** අයිතමය බදු එකතු කළ යුතු ** වගුව ** අයිතමය ** ස්වාමියා. (එම මූලික මුදල එකතුව වෙයි) මෙම ** ශුද්ධ එකතුව ** මත විය හැකිය -: #### තීර 1. ගණනය වර්ගය විස්තරය. - ** පසුගිය ෙරෝ දා මුළු / ප්රමාණය ** (සමුච්චිත බදු හෝ චෝදනා සඳහා). ඔබ මෙම විකල්පය තෝරාගන්නේ නම්, බදු පෙර පේළිය (බදු වගුවේ) මුදල හෝ මුළු ප්රතිශතයක් ලෙස යොදවනු ඇත. - ** (සඳහන් කර ඇති පරිදි) සත **. 2. ගිණුම් අංශ ප්රධානියා: ගිණුම් ලෙජරය යටතේ මෙම බදු වෙන් කරවා ගත වනු ඇත 3. වියදම මධ්යස්ථානය: බදු / ගාස්තු (නාවික වැනි) ආදායමක් හෝ එය පිරිවැය මධ්යස්ථානය එරෙහිව වෙන් කිරීමට නියමිතය අවශ්ය වියදම් ගලා නම්. 4. විස්තරය: (ඉන්වොයිස් පත්ර / මිල කැඳවීම් මුද්රණය කරන බව) බදු විස්තරය. 5. අනුපාතය: බදු අනුපාතය. 6. ප්රමාණය: බදු ප්රමාණය. 7. මුළු: මේ දක්වා සමුච්චිත මුළු. 8. ෙරෝ ඇතුළත් කරන්න: &quot;පසුගිය ෙරෝ මුළු&quot; මත පදනම් වී ඇත්නම්, මෙම ගණනය කිරීම සඳහා පදනමක් ලෙස කටයුතු කරන පේළිය අංකය (පෙරනිමි පෙර පේළිය) තෝරා ගත හැකිය. 9. සඳහා බදු හෝ භාර සලකා බලන්න: මෙම කොටසේදී බදු / ගාස්තු තක්සේරු (සමස්ත කොටසක් නොවේ අ) හෝ මුළු සඳහා පමණක් (අයිතමය සඳහා අගය එකතු කිරීමට නොවේ) හෝ දෙකම සඳහා එකම නම් සඳහන් කළ හැකිය. 10. එක් කරන්න හෝ අඩු: ඔබ බදු එකතු කිරීම හෝ අඩු කර ගැනීමට අවශ්ය වග."
 DocType: Homepage,Homepage,මුල් පිටුව
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,වෛද්යවරයෙක් තෝරන්න ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',යාවත්කාලීන වගුව උපදේශන සකසන්න ඉන්වොයිස = &#39;{0}&#39; නම් නම = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd ප්රමාණ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},නිර්මාණය කරන ලද්දේ ගාස්තු වාර්තා - {0}
 DocType: Asset Category Account,Asset Category Account,වත්කම් ප්රවර්ගය ගිණුම්
@@ -2680,7 +2730,7 @@
 DocType: Asset,Manual,අත්පොත
 DocType: Salary Component Account,Salary Component Account,වැටුප් සංරචක ගිණුම
 DocType: Global Defaults,Hide Currency Symbol,ව්යවහාර මුදල් සංකේතය සඟවන්න
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","උදා: බැංකුව, මුදල්, ක්රෙඩිට් කාඩ්"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","උදා: බැංකුව, මුදල්, ක්රෙඩිට් කාඩ්"
 DocType: Lead Source,Source Name,මූලාශ්රය නම
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","වැඩිහිටියෙකුගේ සාමාන්ය පියයුරු රුධිර පීඩනය ආසන්න වශයෙන් 120 mmHg systolic සහ 80 mmHg diastolic, abbreviated &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,ක්රෙඩිට් සටහන
@@ -2699,16 +2749,16 @@
 DocType: Patient,Occupation,රැකියාව
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,ෙරෝ {0}: ඇරඹුම් දිනය අවසානය දිනය පෙර විය යුතුය
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),එකතුව (යවන ලද)
-DocType: Sales Invoice,This Document,මෙම ලේඛන
 DocType: Installation Note Item,Installed Qty,ස්ථාපනය යවන ලද
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,මෙය වලංගු නොවන ඊ-තැපැල් ලිපිනයන් නිසා විය හැක
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,ඔබ එකතු කළා
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,පුහුණු ප්රතිඵල
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,පුහුණු ප්රතිඵල
 DocType: Purchase Invoice,Is Paid,ගෙවුම් ඇත
 DocType: Salary Structure,Total Earning,මුළු උපයන
 DocType: Purchase Receipt,Time at which materials were received,කවෙර්ද ද්රව්ය ලැබුණු කාලය
 DocType: Stock Ledger Entry,Outgoing Rate,පිටතට යන අනුපාතය
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,සංවිධානය ශාඛා ස්වාමියා.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,සංවිධානය ශාඛා ස්වාමියා.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,හෝ
 DocType: Sales Order,Billing Status,බිල්පත් තත්ත්වය
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ක නිකුත් වාර්තා
@@ -2723,8 +2773,9 @@
 DocType: Notification Control,Sales Order Message,විකුණුම් සාමය පණිවුඩය
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","සමාගම, මුදල්, මුදල් වර්ෂය ආදිය සකස් පෙරනිමි අගයන්"
 DocType: Payment Entry,Payment Type,ගෙවීම් වර්ගය
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,කරුණාකර අයිතමය {0} සඳහා කණ්ඩායම තෝරන්න. මෙම අවශ්යතාව ඉටු කරන බව එක් කණ්ඩායම සොයා ගත නොහැකි විය
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,කරුණාකර අයිතමය {0} සඳහා කණ්ඩායම තෝරන්න. මෙම අවශ්යතාව ඉටු කරන බව එක් කණ්ඩායම සොයා ගත නොහැකි විය
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,කරුණාකර අයිතමය {0} සඳහා කණ්ඩායම තෝරන්න. මෙම අවශ්යතාව ඉටු කරන බව එක් කණ්ඩායම සොයා ගත නොහැකි විය
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,කරුණාකර අයිතමය {0} සඳහා කණ්ඩායම තෝරන්න. මෙම අවශ්යතාව ඉටු කරන බව එක් කණ්ඩායම සොයා ගත නොහැකි විය
+DocType: Hub Category,Parent Category,ෙදමාපිය කාණ්ඩෙය්
 DocType: Process Payroll,Select Employees,සේවක තෝරන්න
 DocType: Opportunity,Potential Sales Deal,අනාගත විකුණුම් ගනුදෙනුව
 DocType: Complaint,Complaints,පැමිණිලි
@@ -2762,7 +2813,7 @@
 DocType: Bin,Reserved Quantity,ඇවිරිණි ප්රමාණ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,වලංගු ඊ-තැපැල් ලිපිනයක් ඇතුලත් කරන්න
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,වලංගු ඊ-තැපැල් ලිපිනයක් ඇතුලත් කරන්න
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,කරත්තයේ අයිතමයක් තෝරන්න
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,කරත්තයේ අයිතමයක් තෝරන්න
 DocType: Landed Cost Voucher,Purchase Receipt Items,මිලදී රිසිට්පත අයිතම
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,අභිමත ආකෘති පත්ර
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,Arrear
@@ -2772,15 +2823,15 @@
 DocType: Payment Request,Amount in customer's currency,පාරිභෝගික මුදල් ප්රමාණය
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,සැපයුම්
 DocType: Stock Reconciliation Item,Current Qty,වත්මන් යවන ලද
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,සැපයුම්කරුවන් එකතු කරන්න
+DocType: Restaurant Menu,Restaurant Menu,ආපන ශාලා මෙනුව
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,පෙර
 DocType: Appraisal Goal,Key Responsibility Area,ප්රධාන වගකීම් ප්රදේශය
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","ශිෂ්ය කාණ්ඩ ඔබ සිසුන් සඳහා පැමිණීම, ඇගයීම හා ගාස්තු නිරීක්ෂණය උදව්"
 DocType: Payment Entry,Total Allocated Amount,මුළු වෙන් කළ මුදල
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,භාණ්ඩ තොගය සඳහා සකසන්න පෙරනිමි බඩු තොග ගිණුමක්
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,භාණ්ඩ තොගය සඳහා සකසන්න පෙරනිමි බඩු තොග ගිණුමක්
 DocType: Item Reorder,Material Request Type,ද්රව්ය ඉල්ලීම් වර්ගය
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},{0} {1} දක්වා වැටුප් සඳහා Accural ජර්නල් සටහන්
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage පිරී ඇත, ඉතිරි වුණේ නැහැ"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage පිරී ඇත, ඉතිරි වුණේ නැහැ"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,ෙරෝ {0}: UOM පරිවර්තන සාධකය අනිවාර්ය වේ
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,කාමරයේ ධාරිතාව
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,ref
@@ -2819,16 +2870,18 @@
 DocType: Project,Task Completion,කාර්ය සාධක සම්පූර්ණ කර
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,නැහැ දී කොටස්
 DocType: Appraisal,HR User,මානව සම්පත් පරිශීලක
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,බදු හා බදු ගාස්තු අඩු කිරීමේ
-apps/erpnext/erpnext/hooks.py +129,Issues,ගැටලු
+apps/erpnext/erpnext/hooks.py +138,Issues,ගැටලු
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},තත්ත්වය {0} එකක් විය යුතුය
 DocType: Sales Invoice,Debit To,ඩෙබිට් කිරීම
+DocType: Restaurant Menu Item,Restaurant Menu Item,ආපන ශාලා මෙනු අයිතම
 DocType: Delivery Note,Required only for sample item.,නියැදි අයිතමය සඳහා පමණක් අවශ්ය විය.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ගනුදෙනු කිරීමෙන් පසු සැබෑ යවන ලද
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},{0} සහ {1} අතර සොයා කිසිම වැටුප් ස්ලිප්
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},{0} සහ {1} අතර සොයා කිසිම වැටුප් ස්ලිප්
 ,Pending SO Items For Purchase Request,විභාග SO අයිතම මිලදී ගැනීම ඉල්ලීම් සඳහා
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,ශිෂ්ය ප්රවේශ
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} අක්රීය
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,ශිෂ්ය ප්රවේශ
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} අක්රීය
 DocType: Supplier,Billing Currency,බිල්පත් ව්යවහාර මුදල්
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,මහා පරිමාණ
@@ -2851,6 +2904,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,අවශ්ය සංචාර ගැන කිසිදු සඳහනක් කරන්න
 DocType: Stock Settings,Default Valuation Method,පෙරනිමි තක්සේරු ක්රමය
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,ගාස්තු
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,යාවත්කාලීන කරමින් පවතී. ටික කාලයක් ගත විය හැකියි.
 DocType: Vehicle Log,Fuel Qty,ඉන්ධන යවන ලද
 DocType: Production Order Operation,Planned Start Time,සැලසුම් අරඹන්න කාල
 DocType: Course,Assessment,තක්සේරු
@@ -2866,7 +2920,7 @@
 DocType: Price List,Price List Master,මිල ලැයිස්තුව මාස්ටර්
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,සියලු විකුණුම් ගනුදෙනු බහු ** විකුණුම් පුද්ගලයින් එරෙහිව tagged කළ හැකි ** ඔබ ඉලක්ක තබා නිරීක්ෂණය කළ හැකි බව එසේ.
 ,S.O. No.,SO අංක
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},ඊයම් සිට පාරිභෝගික {0} නිර්මාණය කරන්න
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},ඊයම් සිට පාරිභෝගික {0} නිර්මාණය කරන්න
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Patient තෝරන්න
 DocType: Price List,Applicable for Countries,රටවල් සඳහා අදාළ වන
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,පරාමිති නාමය
@@ -2898,27 +2952,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,වියදම් / වෙනස ගිණුම ({0}) වන &#39;ලාභය හෝ අලාභය&#39; ගිණුම් විය යුතුය
 DocType: Project,Copied From,සිට පිටපත්
 DocType: Project,Copied From,සිට පිටපත්
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},නම දෝෂය: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,හිඟයක්
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},නම දෝෂය: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,හිඟයක්
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} {2} {3} සමග සම්බන්ධ නැති
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,සේවක {0} සඳහා සහභාගි වන විටත් ලකුණු කර ඇත
 DocType: Packing Slip,If more than one package of the same type (for print),එකම වර්ගයේ (මුද්රිත) එකකට වඩා වැඩි පැකේජය නම්
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,රෙස්ටුරන්ට් සැකසීම් තුළ ප්රකෘති පාරිභෝගිකයා සකසන්න
 ,Salary Register,වැටුප් රෙජිස්ටර්
 DocType: Warehouse,Parent Warehouse,මව් ගබඩාව
 DocType: C-Form Invoice Detail,Net Total,ශුද්ධ මුළු
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},පෙරනිමි ද්රව්ය ලේඛණය අයිතමය {0} සඳහා සොයාගත නොහැකි හා ව්යාපෘති {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},පෙරනිමි ද්රව්ය ලේඛණය අයිතමය {0} සඳහා සොයාගත නොහැකි හා ව්යාපෘති {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,විවිධ ණය වර්ග නිර්වචනය
 DocType: Bin,FCFS Rate,FCFS අනුපාතිකය
 DocType: Payment Reconciliation Invoice,Outstanding Amount,හිඟ මුදල
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),කාලය (මිනිත්තු දී)
 DocType: Project Task,Working,කම්කරු
 DocType: Stock Ledger Entry,Stock Queue (FIFO),කොටස් පෝලිමේ (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,මූල්ය වර්ෂය
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,මූල්ය වර්ෂය
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} සමාගම {1} අයත් නොවේ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,{0} සඳහා නිර්ණායක ලකුණු කාර්යය විසදිය නොහැකි විය. සූත්රය වලංගු වේ.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,ලෙස මත වියදම
 DocType: Healthcare Settings,Out Patient Settings,රෝගියාගේ සැකැස්ම
 DocType: Account,Round Off,වටයේ Off
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,ප්රමාණය ධනාත්මක විය යුතුය
 ,Requested Qty,ඉල්ලන යවන ලද
 DocType: Tax Rule,Use for Shopping Cart,සාප්පු සවාරි කරත්ත සඳහා භාවිතා
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},අගය {0} උපලක්ෂණ සඳහා {1} වලංගු අයිතමය ලැයිස්තුවේ නොපවතියි අයිතමය {2} සඳහා වටිනාකම් ආරෝපණය
@@ -2927,7 +2983,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","ගාස්තු ඔබේ තෝරාගැනීම අනුව, අයිතමය යවන ලද හෝ මුදල මත පදනම් වන අතර සමානුපාතික බෙදා දීමට නියමිතය"
 DocType: Maintenance Visit,Purposes,අරමුණු
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,හිතුව එක් භාණ්ඩයක් ආපසු ලියවිල්ල තුල සෘණාත්මක ප්රමාණය සමඟ ඇතුළත් කළ යුතුය
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,පාඨමාලා එකතු කරන්න
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","මෙහෙයුම {0} තවදුරටත් පරිගණකය තුල {1} ඕනෑම ලබා ගත හැකි වැඩ කරන පැය වඩා, බහු මෙහෙයුම් බවට මෙහෙයුම බිඳ"
 ,Requested,ඉල්ලා
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,කිසිදු සටහන්
@@ -2939,6 +2994,8 @@
 DocType: Employee Loan,Repaid/Closed,ආපසු ගෙවන / වසා
 DocType: Item,Total Projected Qty,මුලූ ව්යාපෘතිමය යවන ලද
 DocType: Monthly Distribution,Distribution Name,බෙදා හැරීම නම
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,සැපයුම්කරු&gt; සැපයුම් වර්ගය
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","{1} {2} සඳහා ගිණුම් සටහන් සඳහා අවශ්ය වන අයිතමය {0} සඳහා සොයාගත නොහැක. අයිතමය {1} හි ශුන්ය තක්සේරු අනුපාත අයිතමයක් ලෙස ගණනය කරන්නේ නම්, කරුණාකර {1} අයිතම වගුවෙහි සඳහන් කරන්න. එසේ නොමැතිනම් අයිතමයට පැමිණෙන කොටස් ගනුදෙනු හෝ අයිතම අයිතමයේ අගය තක්සේරු අනුපාතය සඳහන් කරන්න, පසුව මෙම සටහන ඉදිරිපත් කිරීම / අවලංගු කිරීමට උත්සාහ කරන්න."
 DocType: Course,Course Code,පාඨමාලා කේතය
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},විෂය {0} සඳහා අවශ්ය තත්ත්ව පරීක්ෂක
 DocType: POS Settings,Use POS in Offline Mode,නොබැඳි ආකාරයේ POS භාවිතා කරන්න
@@ -2949,14 +3006,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,දේශසීමාවේ රුක් කළමනාකරණය කරන්න.
 DocType: Journal Entry Account,Sales Invoice,විකුණුම් ඉන්වොයිසිය
 DocType: Journal Entry Account,Party Balance,පක්ෂය ශේෂ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,වට්ටම් මත ඉල්ලුම් කරන්න තෝරා
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,වට්ටම් මත ඉල්ලුම් කරන්න තෝරා
 DocType: Company,Default Receivable Account,පෙරනිමි ලැබිය ගිණුම
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ඉහත තෝරාගත් නිර්ණායකයන් සඳහා ගෙවා ඇති මුළු වැටුප් සඳහා බැංකු සටහන් නිර්මාණය
 DocType: Physician,Physician Schedule,වෛද්යවරුන්ගේ උපලේඛනය
 DocType: Purchase Invoice,Deemed Export,සළකා අපනයන
 DocType: Stock Entry,Material Transfer for Manufacture,නිෂ්පාදනය සඳහා ද්රව්ය හුවමාරු
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,වට්ටමක් ප්රතිශතය ඉතා මිල ලැයිස්තුව එරෙහිව හෝ සියලුම මිල ලැයිස්තුව සඳහා එක්කෝ ඉල්ලුම් කළ හැක.
-DocType: Purchase Invoice,Half-yearly,අර්ධ වාර්ෂික
+DocType: Subscription,Half-yearly,අර්ධ වාර්ෂික
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,කොටස් සඳහා මුල්ය සටහන්
 DocType: Lab Test,LabTest Approver,LabTest අනුමැතිය
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,තක්සේරු නිර්ණායක {} සඳහා ඔබ දැනටමත් තක්සේරු කර ඇත.
@@ -2985,13 +3042,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,අමතර කුඩා
 DocType: Company,Standard Template,සම්මත සැකිල්ල
 DocType: Training Event,Theory,න්යාය
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,අවවාදයයි: යවන ලද ඉල්ලන ද්රව්ය අවම සාමය යවන ලද වඩා අඩු වේ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,අවවාදයයි: යවන ලද ඉල්ලන ද්රව්ය අවම සාමය යවන ලද වඩා අඩු වේ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,ගිණුම {0} කැටි වේ
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,සංවිධානය සතු ගිණුම් වෙනම සටහන සමග නීතිමය ආයතනයක් / පාලිත.
 DocType: Payment Request,Mute Email,ගොළු විද්යුත්
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","ආහාර, බීම වර්ග සහ දුම්කොළ"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},එකම unbilled {0} එරෙහිව ගෙවීම් කරන්න පුළුවන්
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,කොමිසම අනුපාතය 100 ට වඩා වැඩි විය නොහැක
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},එකම unbilled {0} එරෙහිව ගෙවීම් කරන්න පුළුවන්
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,කොමිසම අනුපාතය 100 ට වඩා වැඩි විය නොහැක
 DocType: Stock Entry,Subcontract,උප කොන්ත්රාත්තුව
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,{0} ඇතුලත් කරන්න පළමු
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,පිළිතුරු ලබා නැත
@@ -3009,10 +3066,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,වර්ණ
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,තක්සේරු සැලැස්ම නිර්ණායක
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,මිලදී ගැනීමේ නියෝග වැළැක්වීම
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,සංවේදීයි
 DocType: Patient Appointment,Scheduled,නියමිත
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,උද්ධෘත සඳහා ඉල්ලීම.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,කරුණාකර මානව සම්පත්&gt; HR සැකසුම් තුළ සේවක නාමකරණය කිරීමේ පද්ධතිය සැකසීම කරන්න
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",කරුණාකර &quot;කොටස් අයිතමය ද&quot; අයිතමය තෝරා ඇත &quot;නෑ&quot; හා &quot;විකුණුම් අයිතමය ද&quot; &quot;ඔව්&quot; වන අතර වෙනත් කිසිදු නිෂ්පාදන පැකේජය පවතී
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,පාරිභෝගිකයා තෝරා ගන්න
 DocType: Student Log,Academic,අධ්යයන
 DocType: Patient,Personal and Social History,පෞද්ගලික සහ සමාජ ඉතිහාසය
 DocType: Fee Schedule,Fee Breakup for each student,එක් සිසුවෙකු සඳහා ගාස්තු වෙන් කිරීම
@@ -3022,7 +3080,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,තක්සේරු අනුපාත
 DocType: Stock Reconciliation,SR/,සස /
 DocType: Vehicle,Diesel,ඩීසල්
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,මිල ලැයිස්තුව ව්යවහාර මුදල් තෝරා ගෙන නොමැති
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,මිල ලැයිස්තුව ව්යවහාර මුදල් තෝරා ගෙන නොමැති
 apps/erpnext/erpnext/config/healthcare.py +46,Results,ප්රතිපල
 ,Student Monthly Attendance Sheet,ශිෂ්ය මාසික පැමිණීම පත්රය
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},සේවක {0} දැනටමත් {1} {2} සහ {3} අතර සඳහා ඉල්ලුම් කර තිබේ
@@ -3038,7 +3096,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,විකුණුම් හවුල්කරුවන් කළමනාකරණය කරන්න.
 DocType: Quality Inspection,Inspection Type,පරීක්ෂා වර්ගය
 DocType: Fee Validity,Visited yet,තවම බලන්න
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,පවත්නා ගනුදෙනුව සමග බඞු ගබඞාව පිරිසක් බවට පරිවර්තනය කළ නොහැක.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,පවත්නා ගනුදෙනුව සමග බඞු ගබඞාව පිරිසක් බවට පරිවර්තනය කළ නොහැක.
 DocType: Assessment Result Tool,Result HTML,ප්රතිඵල සඳහා HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,දින අවසන් වීමට නියමිතය
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,සිසුන් එක් කරන්න
@@ -3065,7 +3123,7 @@
 DocType: Healthcare Settings,Result Printed,ප්රතිඵල මුද්රණය
 DocType: Asset Category Account,Depreciation Expense Account,ක්ෂය ගෙවීමේ ගිණුම්
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,පරිවාස කාලය
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},බලන්න {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},බලන්න {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,පමණක් කොළ මංසල ගනුදෙනුව කිරීමට ඉඩ ඇත
 DocType: Expense Claim,Expense Approver,වියදම් Approver
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,ෙරෝ {0}: පාරිභෝගික එරෙහිව උසස් ගෞරවය දිය යුතුයි
@@ -3077,7 +3135,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,දිනයවේලාව කිරීමට
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,පාඨමාලා කාලසටහන මකා:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,කෙටි පණිවිඩ බෙදා හැරීමේ තත්වය පවත්වා ගෙන යාම සඳහා ලඝු-සටහන්
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,විකුණුම් ඉලක්කය කරන්න
 DocType: Accounts Settings,Make Payment via Journal Entry,ජර්නල් සටහන් හරහා ගෙවීම් කරන්න
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,මුද්රණය
 DocType: Item,Inspection Required before Delivery,පරීක්ෂණ සැපයුම් පෙර අවශ්ය
@@ -3085,7 +3142,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,විභාග කටයුතු
 DocType: Patient Appointment,Reminded,සිහිපත් කරන්න
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,ඔබේ සංවිධානය
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,ඔබේ සංවිධානය
 DocType: Fee Component,Fees Category,ගාස්තු ප්රවර්ගය
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,ලිහිල් දිනය ඇතුලත් කරන්න.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,ඒඑම්ටී
@@ -3097,7 +3154,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,සීරුමාරු කිරීමේ පෙළ
 DocType: Company,Chart Of Accounts Template,ගිණුම් සැකිල්ල සටහන
 DocType: Attendance,Attendance Date,පැමිණීම දිනය
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},අයිතමය මිල මිල ලැයිස්තුව {1} තුළ {0} සඳහා නවීකරණය
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},අයිතමය මිල මිල ලැයිස්තුව {1} තුළ {0} සඳහා නවීකරණය
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,"උපයන සහ අඩු කිරීම් මත පදනම් වූ වැටුප් බිඳ වැටීම,."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,ළමා ශීර්ෂයන් සමඟ ගිණුම් ලෙජරය බවට පරිවර්තනය කළ නොහැකි
 DocType: Purchase Invoice Item,Accepted Warehouse,පිළිගත් ගබඩා
@@ -3113,9 +3170,10 @@
 ,Employee Birthday,සේවක ජන්ම දිනය
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,ශිෂ්ය කණ්ඩායම පැමිණීම මෙවලම
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,සීමාව ඉක්මවා ගොස්
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,උපලේඛනගත කිරීම
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ෙවන්චර් කැපිටල්
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,මෙම &#39;අධ්යයන වර්ෂය&#39; {0} සහ {1} දැනටමත් පවතී &#39;කාලීන නම&#39; සමග ශාස්ත්රීය පදය. මෙම ඇතුළත් කිරීම් වෙනස් කර නැවත උත්සාහ කරන්න.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","අයිතමය {0} එරෙහිව දැනට පවතින ගනුදෙනු ඇත ලෙස, ඔබ {1} වටිනාකම වෙනස් කළ නොහැක"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","අයිතමය {0} එරෙහිව දැනට පවතින ගනුදෙනු ඇත ලෙස, ඔබ {1} වටිනාකම වෙනස් කළ නොහැක"
 DocType: UOM,Must be Whole Number,මුළු අංකය විය යුතුය
 DocType: Leave Control Panel,New Leaves Allocated (In Days),වෙන් අලුත් කොළ (දින දී)
 DocType: Purchase Invoice,Invoice Copy,ඉන්වොයිසිය පිටපත්
@@ -3125,7 +3183,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,ඉන්වොයිසිය අංකය
 DocType: Shopping Cart Settings,Orders,නියෝග
 DocType: Employee Leave Approver,Leave Approver,Approver තබන්න
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,කරුණාකර කණ්ඩායම තෝරා
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,කරුණාකර කණ්ඩායම තෝරා
 DocType: Assessment Group,Assessment Group Name,තක්සේරු කණ්ඩායම නම
 DocType: Manufacturing Settings,Material Transferred for Manufacture,නිෂ්පාදනය සඳහා ස්ථාන මාරුවී ද්රව්ය
 DocType: Expense Claim,"A user with ""Expense Approver"" role",&quot;වියදම් Approver&quot; භූමිකාව සමග පරිශීලක
@@ -3140,7 +3198,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,කාලය අවසාන සටහන්
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,දෙපාර්තමේන්තුව තෝරන්න ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,පවත්නා ගනුදෙනු වියදම මධ්යස්ථානය පිරිසක් බවට පරිවර්තනය කළ නොහැකි
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},මුදල {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},මුදල {0} {1} {2} {3}
 DocType: Account,Depreciation,ක්ෂය
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),සැපයුම්කරුවන් (ව)
 DocType: Employee Attendance Tool,Employee Attendance Tool,සේවක පැමිණීම මෙවලම
@@ -3152,10 +3210,12 @@
 DocType: GL Entry,Voucher No,වවුචරය නොමැත
 ,Lead Owner Efficiency,ඊයම් හිමිකරු කාර්යක්ෂමතා
 ,Lead Owner Efficiency,ඊයම් හිමිකරු කාර්යක්ෂමතා
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,බොහෝ ජනප්රිය
 DocType: Leave Allocation,Leave Allocation,වෙන් කිරීම Leave
 DocType: Payment Request,Recipient Message And Payment Details,පලමු වරට පිරිනැමු පණිවුඩය හා ගෙවීම් විස්තර
 DocType: Training Event,Trainer Email,පුහුණුකරු විද්යුත්
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,ද්රව්ය ඉල්ලීම් {0} නිර්මාණය
+DocType: Restaurant Reservation,No of People,මිනිසුන් ගණන
 DocType: Production Planning Tool,Include sub-contracted raw materials,උප කොන්ත්රාත් අමුද්රව්ය ඇතුළත්
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,කොන්දේසි හෝ කොන්ත්රාත්තුව සැකිල්ල.
 DocType: Purchase Invoice,Address and Contact,ලිපිනය සහ ඇමතුම්
@@ -3164,10 +3224,11 @@
 DocType: Supplier,Last Day of the Next Month,ඊළඟ මාසය අවසන් දිනය
 DocType: Support Settings,Auto close Issue after 7 days,7 දින පසු වාහන සමීප නිකුත්
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","නිවාඩු ඉතිරි දැනටමත් අනාගත නිවාඩු වෙන් වාර්තා {1} තුළ රැගෙන යන ඉදිරිපත් කර ඇති පරිදි අවසරය, {0} පෙර වෙන් කළ නොහැකි"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),සටහන: හේතුවෙන් / යොමුව දිනය {0} දවස (s) අවසර පාරිභෝගික ණය දින ඉක්මවා
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),සටහන: හේතුවෙන් / යොමුව දිනය {0} දවස (s) අවසර පාරිභෝගික ණය දින ඉක්මවා
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,ශිෂ්ය අයදුම්කරු
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ලබන්නන් සඳහා ORIGINAL
 DocType: Asset Category Account,Accumulated Depreciation Account,සමුච්චිත ක්ෂය ගිණුම
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,මෙම ඊමේල් ස්වයංක්රීයව නිර්මාණය වේ
 DocType: Stock Settings,Freeze Stock Entries,කැටි කොටස් අයැදුම්පත්
 DocType: Program Enrollment,Boarding Student,බෝඩිං ශිෂ්ය
 DocType: Asset,Expected Value After Useful Life,ප්රයෝජනවත් ලයිෆ් පසු අපේක්ෂිත අගය
@@ -3175,7 +3236,7 @@
 DocType: Activity Cost,Billing Rate,බිල්පත් අනුපාතය
 ,Qty to Deliver,ගලවාගනියි යවන ලද
 ,Stock Analytics,කොටස් විශ්ලේෂණ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,මෙහෙයුම් හිස්ව තැබිය නොහැක
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,මෙහෙයුම් හිස්ව තැබිය නොහැක
 DocType: Maintenance Visit Purpose,Against Document Detail No,මත ලේඛන විස්තර නොමැත
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,පක්ෂය වර්ගය අනිවාර්ය වේ
 DocType: Quality Inspection,Outgoing,ධූරයෙන් ඉවත්ව යන
@@ -3198,7 +3259,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,සිසුන් ක්රියාකාරකම් පදනම් කණ්ඩායම සඳහා තෝරා
 DocType: Journal Entry,User Remark,පරිශීලක අදහස් දැක්වීම්
 DocType: Lead,Market Segment,වෙළෙඳපොළ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},ු ර් මුළු සෘණ හිඟ මුදල {0} වඩා වැඩි විය නොහැකි
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},ු ර් මුළු සෘණ හිඟ මුදල {0} වඩා වැඩි විය නොහැකි
 DocType: Supplier Scorecard Period,Variables,විචල්යයන්
 DocType: Employee Internal Work History,Employee Internal Work History,සේවක අභ්යන්තර රැකියා ඉතිහාසය
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),වැසීම (ආචාර්ය)
@@ -3228,21 +3289,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,යාවත්කාලීන ලබා ගන්න
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: ගිණුම් {2} සමාගම {3} අයත් නොවේ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,ද්රව්ය ඉල්ලීම් {0} අවලංගු කර හෝ නතර
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,කළමනාකරණ තබන්න
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,කළමනාකරණ තබන්න
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,ගිණුම් විසින් සමූහ
 DocType: Sales Order,Fully Delivered,සම්පූර්ණයෙන්ම භාර
 DocType: Lead,Lower Income,අඩු ආදායම්
+DocType: Restaurant Order Entry,Current Order,වත්මන් ඇණවුම
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},මූලාශ්රය සහ ඉලක්කය ගබඩා සංකීර්ණය පේළිය {0} සඳහා සමාන විය නොහැකි
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","මෙම කොටස් ප්රතිසන්ධාන ක විවෘත කිරීම සටහන් වන බැවින්, වෙනසක් ගිණුම, එය වත්කම් / වගකීම් වර්ගය ගිණුමක් විය යුතුය"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},උපෙයෝජන ණය මුදල {0} ට වඩා වැඩි විය නොහැක
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,වැඩසටහන් වෙත යන්න
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},විෂය {0} සඳහා අවශ්ය මිලදී ගැනීමේ නියෝගයක් අංකය
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,නිෂ්පාදනය සාමය නිර්මාණය නොවන
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,නිෂ්පාදනය සාමය නිර්මාණය නොවන
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;දිනය සිට&#39; &#39;මේ දක්වා&#39; &#39;පසුව විය යුතුය
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ශිෂ්ය {0} ශිෂ්ය අයදුම් {1} සම්බන්ධ වන ලෙස තත්ත්වය වෙනස් කළ නොහැක
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},ශිෂ්ය {0} ශිෂ්ය අයදුම් {1} සම්බන්ධ වන ලෙස තත්ත්වය වෙනස් කළ නොහැක
 DocType: Asset,Fully Depreciated,සම්පූර්ණෙයන් ක්ෂය
 ,Stock Projected Qty,කොටස් යවන ලද ප්රක්ෂේපිත
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},පාරිභෝගික {0} ව්යාපෘති {1} අයිති නැති
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},පාරිභෝගික {0} ව්යාපෘති {1} අයිති නැති
 DocType: Employee Attendance Tool,Marked Attendance HTML,කැපී පෙනෙන පැමිණීම HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","මිල ගණන් යෝජනා, ඔබගේ පාරිභෝගිකයන් වෙත යවා ඇති ලංසු"
 DocType: Sales Order,Customer's Purchase Order,පාරිභෝගික මිලදී ගැනීමේ නියෝගයක්
@@ -3253,8 +3315,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,වෙන් කරවා අගය පහත සංඛ්යාව සකස් කරන්න
 DocType: Supplier Scorecard Period,Calculations,ගණනය කිරීම්
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,හෝ වටිනාකම යවන ලද
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,නිෂ්පාදන නියෝග මතු කල නොහැකි ය:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,නිෂ්පාදන නියෝග මතු කල නොහැකි ය:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,ව්යවස්ථාව
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,කරුණාකර Setup&gt; Settings&gt; Naming Series මගින් {0} සඳහා නම් කිරීමේ මාලාවක් සකසන්න
 DocType: Purchase Invoice,Purchase Taxes and Charges,මිලදී බදු හා ගාස්තු
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,සැපයුම්කරුවන් වෙත යන්න
 ,Qty to Receive,ලබා ගැනීමට යවන ලද
@@ -3268,7 +3331,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,ගිණුමක් සඳහා ක්රෙඩිට් ශේෂ පත්රය ගිණුමක් විය යුතුය
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,සියලු සැපයුම්කරු වර්ග
 DocType: Global Defaults,Disable In Words,වචන දී අක්රීය
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,අයිතමය සංග්රහයේ අනිවාර්ය වේ අයිතමය ස්වයංක්රීයව අංකනය නැති නිසා
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,අයිතමය සංග්රහයේ අනිවාර්ය වේ අයිතමය ස්වයංක්රීයව අංකනය නැති නිසා
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},උද්ධෘත {0} නොවේ වර්ගයේ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,නඩත්තු උපෙල්ඛනෙය් විෂය
 DocType: Sales Order,%  Delivered,% භාර
@@ -3290,23 +3353,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,ශේෂ කොටස් විවෘත
 DocType: Lead,CRM,සී.ආර්.එම්
 DocType: Purchase Invoice,N,එම්
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,ප්රතිසන්ධානය
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,ඉතිරි
 DocType: Appraisal,Appraisal,ඇගයීෙම්
 DocType: Purchase Invoice,GST Details,GST විස්තර
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},සැපයුම්කරු {0} වෙත යවන විද්යුත්
+DocType: Item,Default Sales Unit of Measure,මිනුම් ප්රමිතිගත විකුණුම් ඒකකය
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,දිනය නැවත නැවත
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,බලයලත් අත්සන්
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},"approver අවසරය, {0} එකක් විය යුතුය"
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,ගාස්තු නිර්මාණය කරන්න
-DocType: Hub Settings,Seller Email,විකුණන්නා විද්යුත්
 DocType: Project,Total Purchase Cost (via Purchase Invoice),(මිලදී ගැනීමේ ඉන්වොයිසිය හරහා) මුළු මිලදී ගැනීම පිරිවැය
 DocType: Training Event,Start Time,ආරම්භක වේලාව
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,ප්රමාණ තෝරා
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,ප්රමාණ තෝරා
 DocType: Customs Tariff Number,Customs Tariff Number,රේගු ගාස්තු අංකය
 DocType: Patient Appointment,Patient Appointment,රෝගීන් පත්කිරීම
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"කාර්යභාරය අනුමත පාලනය කිරීම සඳහා අදාළ වේ භූමිකාව, සමාන විය නොහැකි"
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,"මෙම විද්යුත් Digest සිට වනවාද,"
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,"මෙම විද්යුත් Digest සිට වනවාද,"
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,සැපයුම්කරුවන් ලබා ගන්න
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} අයිතමයට {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,පාඨමාලා වෙත යන්න
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,පණිවිඩය යැව්වා
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,ළමා ශීර්ෂයන් සමඟ ගිණුම් ලෙජරය ලෙස සැකසීම කළ නොහැකි
@@ -3319,11 +3385,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,නිෂ්පාදන කම්කරුවන් සඳහා වන ස්ථාන මාරුවී ද්රව්ය
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,ගිණුම {0} පවතින්නේ නැත
 DocType: Project,Project Type,ව්යාපෘති වර්ගය
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,මෙම කාර්යය සඳහා ළමා කාර්යය පවතියි. මෙම කාර්යය මකා දැමිය නොහැක.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ඉලක්කය යවන ලද හෝ ඉලක්කය ප්රමාණය එක්කෝ අනිවාර්ය වේ.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,විවිධ ක්රියාකාරකම් පිරිවැය
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,තව ප්රතිඵල නැහැ
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,විවිධ ක්රියාකාරකම් පිරිවැය
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",", {0} වෙත සිදුවීම් කිරීම විකුණුම් පුද්ගලයන් පහත අනුයුක්ත සේවක වූ පරිශීලක අනන්යාංකය {1} සිදු නොවන බැවිනි"
 DocType: Timesheet,Billing Details,බිල්ගත විස්තර
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,මූලාශ්රය සහ ඉලක්කය ගබඩා සංකීර්ණය වෙනස් විය යුතුය
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,මූලාශ්රය සහ ඉලක්කය ගබඩා සංකීර්ණය වෙනස් විය යුතුය
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},{0} කට වඩා පැරණි කොටස් ගනුදෙනු යාවත්කාලීන කිරීමට අවසර නැත
 DocType: Purchase Invoice Item,PR Detail,මහජන සම්බන්ධතා විස්තර
 DocType: Sales Order,Fully Billed,පූර්ණ අසූහත
@@ -3350,7 +3418,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,වයර් ට්රාන්ෆර්
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,සියල්ල පරීක්ෂා කරන්න
 DocType: Vehicle Log,Invoice Ref,ඉන්වොයිසිය අංකය
-DocType: Purchase Order,Recurring Order,පුනරාවර්තනය න්යාය
 DocType: Company,Default Income Account,පෙරනිමි ආදායම් ගිණුම
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,පාරිභෝගික කණ්ඩායම් / පාරිභෝගික
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed රාජ්ය මූල්ය වසර ලාභය / අලාභය (ක්රෙඩිට්)
@@ -3364,9 +3431,9 @@
 DocType: Patient,A Negative,සෘණාත්මක
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,පෙන්වන්න ඊට වැඩි දෙයක් නැහැ.
 DocType: Lead,From Customer,පාරිභෝගික සිට
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,ඇමතුම්
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,ඇමතුම්
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,නිෂ්පාදනයක්
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,කාණ්ඩ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,කාණ්ඩ
 DocType: Project,Total Costing Amount (via Time Logs),(කාල ලඝු-සටහන් හරහා) මුළු සැඳුම්ලත් මුදල
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,ගාස්තුවක් අය කරන්න
 DocType: Purchase Order Item Supplied,Stock UOM,කොටස් UOM
@@ -3391,7 +3458,7 @@
 DocType: School Settings,Current Academic Term,වත්මන් අධ්යයන කාලීන
 DocType: School Settings,Current Academic Term,වත්මන් අධ්යයන කාලීන
 DocType: Sales Order,Not Billed,අසූහත නෑ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,දෙකම ගබඩාව එම සමාගමට අයිති විය යුතුය
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,දෙකම ගබඩාව එම සමාගමට අයිති විය යුතුය
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,කිසිදු සබඳතා තවමත් වැඩිදුරටත් සඳහන් කළේය.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,වියදම වවුචරයක් මුදල ගොඩ බස්වන ලදී
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,සැපයුම්කරුවන් විසින් මතු බිල්පත්.
@@ -3400,7 +3467,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,වට්ටමක් මුදල
 DocType: Purchase Invoice,Return Against Purchase Invoice,මිලදී ගැනීම ඉන්වොයිසිය එරෙහි නැවත
 DocType: Item,Warranty Period (in days),වගකීම් කාලය (දින තුළ)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',update tab යාවත්කාලීන කිරීමක් set_invoice = &#39;{0}&#39; නම් නම = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Guardian1 සමඟ සම්බන්ධය
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,මෙහෙයුම් වලින් ශුද්ධ මුදල්
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,අයිතමය 4
@@ -3409,8 +3475,8 @@
 DocType: Journal Entry Account,Journal Entry Account,ජර්නල් සටහන් ගිණුම
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,ශිෂ්ය සමූහය
 DocType: Shopping Cart Settings,Quotation Series,උද්ධෘත ශ්රේණි
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","අයිතමයක් ම නම ({0}) සමග පවතී, අයිතමය කණ්ඩායමේ නම වෙනස් කිරීම හෝ අයිතමය නැවත නම් කරුණාකර"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,කරුණාකර පාරිභෝගික තෝරා
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","අයිතමයක් ම නම ({0}) සමග පවතී, අයිතමය කණ්ඩායමේ නම වෙනස් කිරීම හෝ අයිතමය නැවත නම් කරුණාකර"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,කරුණාකර පාරිභෝගික තෝරා
 DocType: C-Form,I,මම
 DocType: Company,Asset Depreciation Cost Center,වත්කම් ක්ෂය පිරිවැය මධ්යස්ථානය
 DocType: Sales Order Item,Sales Order Date,විකුණුම් සාමය දිනය
@@ -3419,6 +3485,7 @@
 DocType: Assessment Plan,Assessment Plan,තක්සේරු සැලැස්ම
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,පාරිභෝගිකයා {0} නිර්මාණය වේ.
 DocType: Stock Settings,Limit Percent,සියයට සීමා
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,දැනට කිසිදු ගබඩාවක් නොමැත
 ,Payment Period Based On Invoice Date,ගෙවීම් කාලය ඉන්වොයිසිය දිනය පදනම්
 DocType: Sample Collection,No. of print,මුද්රිත ගණන
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},{0} සඳහා ව්යවහාර මුදල් විනිමය අනුපාත අතුරුදහන්
@@ -3474,13 +3541,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,දළ වැටුප් - මුළු අඩු - ණය ආපසු ගෙවීමේ
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,වත්මන් ද්රව්ය ලේඛණය හා නව ද්රව්ය ලේඛණය සමාන විය නොහැකි
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,වැටුප් පුරවා හැඳුනුම්පත
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,වැටුප් පුරවා හැඳුනුම්පත
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,විශ්රාම ගිය දිනය සමඟ සම්බන්ධවීම දිනය වඩා වැඩි විය යුතුය
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,පාඨමාලාව අවස අතර දෝෂ ඇතිවිය:
 DocType: Sales Invoice,Against Income Account,ආදායම් ගිණුම එරෙහිව
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% භාර
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,අයිතමය {0}: අනුපිළිවලින් යවන ලද {1} {2} (විෂයාංක අර්ථ දක්වා) අවම පිණිස යවන ලද ට වඩා අඩු විය නොහැක.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,අයිතමය {0}: අනුපිළිවලින් යවන ලද {1} {2} (විෂයාංක අර්ථ දක්වා) අවම පිණිස යවන ලද ට වඩා අඩු විය නොහැක.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,මාසික බෙදාහැරීම් ප්රතිශතය
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,කරුණාකර වෙනත් පරිශීලකයෙකු ලෙස පුරනය වන්න.
 DocType: Territory,Territory Targets,භූමි ප්රදේශය ඉලක්ක
 DocType: Delivery Note,Transporter Info,ප්රවාහනය තොරතුරු
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},සමාගම {1} පැහැර {0} සකස් කරන්න
@@ -3488,13 +3556,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,අදාළ සැපයුම්කරු කිහිපවතාවක් ඇතුලත් කර ඇත
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,දළ ලාභය / අලාභය
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,මිලදී ගැනීමේ නියෝගයක් අයිතමය සපයා
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,සමාගම් නම සමාගම විය නොහැකි
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,සමාගම් නම සමාගම විය නොහැකි
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,මුද්රණය සැකිලි සඳහා ලිපිය ධා.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,මුද්රණය සැකිලි සඳහා මාතෘකා Proforma ඉන්වොයිසිය වර්ග උදා.
 DocType: Program Enrollment,Walking,ඇවිදීම
 DocType: Student Guardian,Student Guardian,ශිෂ්ය ගාඩියන්
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,තක්සේරු වර්ගය චෝදනා සියල්ල ඇතුළත් ලෙස සලකුණු නොහැකි
 DocType: POS Profile,Update Stock,කොටස් යාවත්කාලීන
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,දායකත්වයේ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,භාණ්ඩ සඳහා විවිධ UOM වැරදි (මුළු) ශුද්ධ බර අගය කිරීමට හේතු වනු ඇත. එක් එක් භාණ්ඩය ශුද්ධ බර එම UOM ඇති බව තහවුරු කර ගන්න.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,ද්රව්ය ලේඛණය අනුපාතිකය
 DocType: Asset,Journal Entry for Scrap,ලාංකික සඳහා ජර්නල් සටහන්
@@ -3544,15 +3613,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","ධ (ලොගින් වන්න) හැඳුනුම්. සකස් නම්, එය සියලු මානව සම්පත් ආකෘති සඳහා පෙරනිමි බවට පත් වනු ඇත."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1} සිට
 DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,සියලු බිල්පත් ද්රව්යවල නවතම මිල යාවත්කාලීන කිරීම සඳහා පේළිය. විනාඩි කිහිපයක් ගත විය හැකිය.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,සියලු බිල්පත් ද්රව්යවල නවතම මිල යාවත්කාලීන කිරීම සඳහා පේළිය. විනාඩි කිහිපයක් ගත විය හැකිය.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,නව ගිණුම් නම. සටහන: පාරිභෝගිකයින් සහ සැපයුම්කරුවන් සඳහා ගිණුම් නිර්මාණය කරන්න එපා
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,රටේ බුද්ධිමත් පෙරනිමි ලිපිනය ආකෘති පත්ර
 DocType: Sales Order Item,Supplier delivers to Customer,සැපයුම්කරු පාරිභෝගික බාර
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ආකෘතිය / අයිතමය / {0}) කොටස් ඉවත් වේ
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},නිසා / යොමුව දිනය {0} පසු විය නොහැකි
+,Sales Payment Summary,විකුණුම් ගෙවීම් සාරාංශය
+DocType: Restaurant,Restaurant,අවන්හල
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},නිසා / යොමුව දිනය {0} පසු විය නොහැකි
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,දත්ත ආනයන හා අපනයන
 DocType: Patient,Account Details,ගිණුම් විස්තර
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,සිසුන් හමු කිසිදු
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,සිසුන් හමු කිසිදු
 DocType: Medical Department,Medical Department,වෛද්ය දෙපාර්තමේන්තුව
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,සැපයුම්කරුවන් ලකුණු කරත්ත ලකුණු
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,"ඉන්වොයිසිය ගිය තැන, දිනය"
@@ -3563,8 +3634,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,"කරුණාකර පක්ෂය තෝරා ගැනීමට පෙර ගිය තැන, දිනය තෝරා"
 DocType: Program Enrollment,School House,ස්කූල් හවුස්
 DocType: Serial No,Out of AMC,විදේශ මුදල් හුවමාරු කරන්නන් අතරින්
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,මිල ගණන් තෝරන්න
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,මිල ගණන් තෝරන්න
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,මිල ගණන් තෝරන්න
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,මිල ගණන් තෝරන්න
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,වෙන් කරවා අගය පහත සංඛ්යාව අගය පහත සමස්ත සංඛ්යාව ට වඩා වැඩි විය නොහැක
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,නඩත්තු සංචාරය කරන්න
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,විකුණුම් මාස්ටර් කළමනාකරු {0} කාර්යභාරයක් ඇති කරන පරිශීලකයා වෙත සම්බන්ධ වන්න
@@ -3572,7 +3643,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,සමාගම (නැති පාරිභෝගික හෝ සැපයුම්කරු) ස්වාමියා.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,මෙය මේ ශිෂ්ය ඊට සහභාගී මත පදනම් වේ
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,කිසිදු ශිෂ්ය
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,වැඩිපුර භාණ්ඩ ෙහෝ විවෘත පූර්ණ ආකෘති පත්රය එක් කරන්න
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,වැඩිපුර භාණ්ඩ ෙහෝ විවෘත පූර්ණ ආකෘති පත්රය එක් කරන්න
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,සැපයුම් සටහන් {0} මෙම වෙළෙඳ න්යාය අවලංගු කිරීම පෙර අවලංගු කළ යුතුය
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,පරිශීලකයින් වෙත යන්න
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,ගෙවනු ලබන මුදල + ප්රමාණය මුළු එකතුව වඩා වැඩි විය නොහැකි Off ලියන්න
@@ -3592,37 +3663,40 @@
 DocType: Fee Schedule,Fee Schedule,ගාස්තු උපෙල්ඛනෙය්
 DocType: Hub Settings,Publish Availability,ලැබිය හැකි ප්රකාශයට පත් කරනු ලබයි
 DocType: Company,Create Chart Of Accounts Based On,ගිණුම් පදනම් කරගත් මත සටහන නිර්මාණය
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,කණ්ඩායම් නොවන අයට එය පරිවර්තනය කළ නොහැක. ළමා කර්තව්යයන් පවතී.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,උපන් දිනය අද ට වඩා වැඩි විය නොහැක.
 ,Stock Ageing,කොටස් වයස්ගතවීම
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},ශිෂ්ය {0} ශිෂ්ය අයදුම්කරු {1} එරෙහිව පවතින
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),වටය ගැලපුම්කරණය (සමාගම් ව්යවහාර මුදල්)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Timesheet
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Timesheet
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} &#39;{1}&#39; අක්රීය
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,විවෘත ලෙස සකසන්න
 DocType: Cheque Print Template,Scanned Cheque,ස්කෑන් චෙක්පත්
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ගනුදෙනු ඉදිරිපත් මත සම්බන්ධතා වෙත ස්වයංක්රීය ඊමේල් යවන්න.
 DocType: Timesheet,Total Billable Amount,මුළු බිල්ගත කළ හැකි මුදල
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,අයිතමය 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,ඇණවුම
 DocType: Purchase Order,Customer Contact Email,පාරිභෝගික ඇමතුම් විද්යුත්
 DocType: Warranty Claim,Item and Warranty Details,භාණ්ඩය හා Warranty විස්තර
 DocType: Sales Team,Contribution (%),දායකත්වය (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,සටහන: &#39;මුදල් හෝ බැංකු ගිණුම්&#39; දක්වන නොවීම නිසා ගෙවීම් සටහන් නිර්මාණය කළ නොහැකි වනු ඇත
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,ව්යාපෘතිය {0} දැනටමත් පවතී
 DocType: Medical Department,Nursing User,හෙද පරිශීලකයා
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,වගකීම්
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,මෙම උපලේඛනයේ වලංගු කාලය අවසන් වී ඇත.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,මෙම උපලේඛනයේ වලංගු කාලය අවසන් වී ඇත.
 DocType: Expense Claim Account,Expense Claim Account,වියදම් හිමිකම් ගිණුම
 DocType: Accounts Settings,Allow Stale Exchange Rates,ස්ට්රේල් විනිමය අනුපාතිකයන්ට ඉඩ දෙන්න
 DocType: Sales Person,Sales Person Name,විකුණුම් පුද්ගලයා නම
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,වගුවේ බෙ 1 ඉන්වොයිස් ඇතුලත් කරන්න
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,පරිශීලකයන් එකතු කරන්න
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,පරිශීලකයන් එකතු කරන්න
 DocType: POS Item Group,Item Group,අයිතමය සමූහ
 DocType: Item,Safety Stock,ආරක්ෂාව කොටස්
 DocType: Healthcare Settings,Healthcare Settings,සෞඛ්ය ආරක්ෂණ සැකසුම්
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,කාර්ය සාධක ප්රගති% 100 කට වඩා වැඩි විය නොහැක.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,කාර්ය සාධක ප්රගති% 100 කට වඩා වැඩි විය නොහැක.
 DocType: Stock Reconciliation Item,Before reconciliation,සංහිඳියාව පෙර
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0} වෙත
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),එකතු කරන බදු හා ගාස්තු (සමාගම ව්යවහාර මුදල්)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"අයිතමය බදු ෙරෝ {0} වර්ගය බදු හෝ ආදායම් හෝ වියදම් හෝ අයකරනු ලබන ගාස්තු, ක ගිණුමක් තිබිය යුතු"
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"අයිතමය බදු ෙරෝ {0} වර්ගය බදු හෝ ආදායම් හෝ වියදම් හෝ අයකරනු ලබන ගාස්තු, ක ගිණුමක් තිබිය යුතු"
 DocType: Sales Order,Partly Billed,අර්ධ වශයෙන් අසූහත
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,අයිතමය {0} ස්ථාවර වත්කම් අයිතමය විය යුතුය
 DocType: Item,Default BOM,පෙරනිමි ද්රව්ය ලේඛණය
@@ -3638,6 +3712,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,විචල්ය
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,සැපයුම් සටහන
 DocType: Student,Student Email Address,ශිෂ්ය විද්යුත් තැපැල් ලිපිනය
+DocType: Item,Hub Warehouse,හබ් ගබඩාව
 DocType: Physician Schedule Time Slot,From Time,වේලාව සිට
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,ගබඩාවේ ඇත:
 DocType: Notification Control,Custom Message,රේගු පණිවුඩය
@@ -3646,9 +3721,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,ශිෂ්ය ලිපිනය
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,ශිෂ්ය ලිපිනය
 DocType: Purchase Invoice,Price List Exchange Rate,මිල ලැයිස්තුව විනිමය අනුපාත
+DocType: POS Profile,POS Profile Name,POS පැතිකඩ නම
 DocType: Purchase Invoice Item,Rate,අනුපාතය
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,ආධුනිකයා
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,ලිපිනය නම
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,ලිපිනය නම
 DocType: Stock Entry,From BOM,ද්රව්ය ලේඛණය සිට
 DocType: Assessment Code,Assessment Code,තක්සේරු සංග්රහයේ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,මූලික
@@ -3662,11 +3738,12 @@
 DocType: Salary Slip,Salary Structure,වැටුප් ව්යුහය
 DocType: Account,Bank,බැංකුව
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ගුවන්
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,නිකුත් ද්රව්ය
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,නිකුත් ද්රව්ය
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,පුනරාවර්තනය කිරීමේදී දෝශයක් ඇති විය
 DocType: Material Request Item,For Warehouse,ගබඩා සඳහා
 DocType: Employee,Offer Date,ඉල්ලුමට දිනය
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,උපුටා දැක්වීම්
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,ඔබ නොබැඳිව වේ. ඔබ ජාලයක් තියෙනවා තෙක් ඔබට රීලෝඩ් කිරීමට නොහැකි වනු ඇත.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,ඔබ නොබැඳිව වේ. ඔබ ජාලයක් තියෙනවා තෙක් ඔබට රීලෝඩ් කිරීමට නොහැකි වනු ඇත.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,කිසිදු ශිෂ්ය කණ්ඩායම් නිර්මාණය.
 DocType: Purchase Invoice Item,Serial No,අනුක්රමික අංකය
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,මාසික නැවත ගෙවීමේ ප්රමාණය ණය මුදල වඩා වැඩි විය නොහැකි
@@ -3676,17 +3753,18 @@
 DocType: Salary Slip,Total Working Hours,මුළු වැඩ කරන වේලාවන්
 DocType: Subscription,Next Schedule Date,ඊළඟ උපලේඛන දිනය
 DocType: Stock Entry,Including items for sub assemblies,උප එකලස්කිරීම් සඳහා ද්රව්ය ඇතුළු
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,අගය ධනාත්මක විය යුතුය ඇතුලත් කරන්න
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,සියලු ප්රදේශ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,අගය ධනාත්මක විය යුතුය ඇතුලත් කරන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,සියලු ප්රදේශ
 DocType: Purchase Invoice,Items,අයිතම
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,ශිෂ්ය දැනටමත් ලියාපදිංචි කර ඇත.
 DocType: Fiscal Year,Year Name,වසරේ නම
 DocType: Process Payroll,Process Payroll,ක්රියාවලිය වැටුප්
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,වැඩ කරන දින වැඩි නිවාඩු දින මෙම මාසය ඇත.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,වැඩ කරන දින වැඩි නිවාඩු දින මෙම මාසය ඇත.
 DocType: Product Bundle Item,Product Bundle Item,නිෂ්පාදන පැකේජය අයිතමය
 DocType: Sales Partner,Sales Partner Name,විකුණුම් සහකරු නම
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,මිල කැඳවීම ඉල්ලීම
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,මිල කැඳවීම ඉල්ලීම
 DocType: Payment Reconciliation,Maximum Invoice Amount,උපරිම ඉන්වොයිසි මුදල
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,හෙපටයිටිස්
 DocType: Normal Test Items,Normal Test Items,සාමාන්ය පරීක්ෂණ අයිතම
 DocType: Student Language,Student Language,ශිෂ්ය භාෂා
 apps/erpnext/erpnext/config/selling.py +23,Customers,පාරිභෝගිකයන්
@@ -3698,10 +3776,11 @@
 DocType: Issue,Opening Time,විවෘත වේලාව
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,හා අවශ්ය දිනයන් සඳහා
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,සුරැකුම්පත් සහ වෙළඳ භාණ්ඩ විනිමය
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ප්රභේද්යයක් සඳහා නු පෙරනිමි ඒකකය &#39;{0}&#39; සැකිල්ල මෙන් ම විය යුතුයි &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ප්රභේද්යයක් සඳහා නු පෙරනිමි ඒකකය &#39;{0}&#39; සැකිල්ල මෙන් ම විය යුතුයි &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,පදනම් කරගත් දින ගණනය
 DocType: Delivery Note Item,From Warehouse,ගබඩාව සිට
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,නිෂ්පාදනය කිරීමට ද්රව්ය පනත් ෙකටුම්පත අයිතම කිසිදු
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,නිෂ්පාදනය කිරීමට ද්රව්ය පනත් ෙකටුම්පත අයිතම කිසිදු
+DocType: Restaurant,Default Customer,පාරිබෝගිකයා
 DocType: Assessment Plan,Supervisor Name,සුපරීක්ෂක නම
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,එදිනම හමුවීම සඳහා නිර්මාණය කර ඇත්දැයි තහවුරු නොකරන්න
 DocType: Program Enrollment Course,Program Enrollment Course,වැඩසටහන ඇතුලත් පාඨමාලා
@@ -3729,7 +3808,7 @@
 DocType: Payment Entry,Internal Transfer,අභ තර ස්ථ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,ළමා ගිණුම මෙම ගිණුම සඳහා පවතී. ඔබ මෙම ගිණුම මකා දැමීම කළ නොහැක.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ඉලක්කය යවන ලද හෝ ඉලක්කය ප්රමාණය එක්කෝ අනිවාර්ය වේ
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},ද්රව්ය ලේඛණය අයිතමය {0} සඳහා පවතී පෙරනිමි කිසිදු
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},ද්රව්ය ලේඛණය අයිතමය {0} සඳහා පවතී පෙරනිමි කිසිදු
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,"කරුණාකර ගිය තැන, දිනය පළමු තෝරා"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,විවෘත දිනය දිනය අවසන් පෙර විය යුතුය
 DocType: Leave Control Panel,Carry Forward,ඉදිරියට ගෙන
@@ -3765,6 +3844,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,මුළු වර්තමාන
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,මුල්ය ප්රකාශන
 DocType: Drug Prescription,Hour,පැය
+DocType: Restaurant Order Entry,Last Sales Invoice,අවසාන විකුණුම් ඉන්වොයිසිය
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,නව අනු අංකය ගබඩා තිබිය නොහැකිය. පොත් ගබඩාව කොටස් සටහන් හෝ මිළදී රිසිට්පත විසින් තබා ගත යුතු
 DocType: Lead,Lead Type,ඊයම් වර්ගය
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,ඔබ කලාප දිනයන් මත කොළ අනුමත කිරීමට අවසර නැත
@@ -3801,65 +3881,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,පරිශීලකයන් නිර්මාණය
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,ඇට
 DocType: Supplier Scorecard,Per Month,මසකට
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,නිෂ්පාදනය කිරීමට ප්රමාණය 0 ට වඩා වැඩි විය යුතුය.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,නිෂ්පාදනය කිරීමට ප්රමාණය 0 ට වඩා වැඩි විය යුතුය.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,නඩත්තු ඇමතුම් සඳහා වාර්තාව පිවිසෙන්න.
 DocType: Stock Entry,Update Rate and Availability,වේගය හා උපකාර ලැබිය හැකි යාවත්කාලීන
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,ප්රතිශතයක් ඔබට අණ ප්රමාණය වැඩි වැඩියෙන් ලබා හෝ ඉදිරිපත් කිරීමට අවසර ඇත. උදාහරණයක් ලෙස: ඔබට ඒකක 100 නියෝග කර තිබේ නම්. ඔබේ දීමනාව 10% ක් නම් ඔබ ඒකක 110 ලබා ගැනීමට අවසර ලැබේ වේ.
 DocType: POS Customer Group,Customer Group,කස්ටමර් සමූහයේ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),නව කණ්ඩායම හැඳුනුම්පත (විකල්ප)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),නව කණ්ඩායම හැඳුනුම්පත (විකල්ප)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),නව කණ්ඩායම හැඳුනුම්පත (විකල්ප)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),නව කණ්ඩායම හැඳුනුම්පත (විකල්ප)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},වියදම් ගිණුම අයිතමය {0} සඳහා අනිවාර්ය වේ
 DocType: BOM,Website Description,වෙබ් අඩවිය විස්තරය
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,කොටස් ශුද්ධ වෙනස්
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,නවතම
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,මිලදී ගැනීම ඉන්වොයිසිය {0} පළමු අවලංගු කරන්න
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","විද්යුත් තැපැල් ලිපිනය අනන්ය විය යුතුය, දැනටමත් {0} සඳහා පවතී"
 DocType: Serial No,AMC Expiry Date,"විදේශ මුදල් හුවමාරු කරන්නන්, කල් ඉකුත්වන දිනය,"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,රිසිට්පත
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,රිසිට්පත
 ,Sales Register,විකුණුම් රෙජිස්ටර්
 DocType: Daily Work Summary Settings Company,Send Emails At,දී විද්යුත් තැපැල් පණිවුඩ යවන්න
 DocType: Quotation,Quotation Lost Reason,උද්ධෘත ලොස්ට් හේතුව
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,ඔබගේ වසම් තෝරා
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',tab එකෙන් තෝරන්න * නම = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},ගනුදෙනු සඳහනක් වත් {0} දිනැති {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},ගනුදෙනු සඳහනක් වත් {0} දිනැති {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,සංස්කරණය කරන්න කිසිම දෙයක් නැහැ.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Form View
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,මේ මාසය සඳහා සාරාංශය හා ෙ කටයුතු
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Form View
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,මේ මාසය සඳහා සාරාංශය හා ෙ කටයුතු
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.",ඔබගේ ආයතනයට අමතරව පරිශීලකයන්ට එකතු කරන්න.
 DocType: Customer Group,Customer Group Name,කස්ටමර් සමූහයේ නම
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,තවමත් ගනුදෙනුකරුවන් නැත!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,තවමත් ගනුදෙනුකරුවන් නැත!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,මුදල් ප්රවාහ ප්රකාශය
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ණය මුදල {0} උපරිම ණය මුදල ඉක්මවා නො හැකි
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,බලපත්රය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},C-ආකෘතිය {1} සිට මෙම ඉන්වොයිසිය {0} ඉවත් කරන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},C-ආකෘතිය {1} සිට මෙම ඉන්වොයිසිය {0} ඉවත් කරන්න
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,ඔබ ද පෙර මූල්ය වර්ෂය ශේෂ මෙම මුදල් වසරේදී පිටත්ව ඇතුළත් කිරීමට අවශ්ය නම් ඉදිරියට ගෙන කරුණාකර තෝරා
 DocType: GL Entry,Against Voucher Type,වවුචරයක් වර්ගය එරෙහිව
 DocType: Physician,Phone (R),දුරකථන (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,කාල අවකාශ එකතු
 DocType: Item,Attributes,දන්ත ධාතුන්
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,ආකෘතිය සක්රිය කරන්න
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,කරුණාකර Setup&gt; Settings&gt; Naming Series මගින් {0} සඳහා නම් කිරීමේ මාලාවක් සකසන්න
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,ගිණුම අක්රිය ලියන්න ඇතුලත් කරන්න
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,පසුගිය සාමය දිනය
 DocType: Patient,B Negative,B සෘණාත්මක
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ගිණුම {0} සමාගම {1} අයත් නොවේ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,පිට පිට අනු ගණන් {0} සැපයුම් සටහන සමග නොගැලපේ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,පිට පිට අනු ගණන් {0} සැපයුම් සටහන සමග නොගැලපේ
 DocType: Student,Guardian Details,ගාඩියන් විස්තර
 DocType: C-Form,C-Form,C-ආකෘතිය
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,බහු සේවකයන් සඳහා ලකුණ පැමිණීම
 DocType: Vehicle,Chassis No,චැසි අංක
 DocType: Payment Request,Initiated,ආරම්භ
 DocType: Production Order,Planned Start Date,සැලසුම් ඇරඹුම් දිනය
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,කරුණාකර BOM එකක් තෝරන්න
 DocType: Serial No,Creation Document Type,නිර්මාණය ලේඛන වර්ගය
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,අවසාන දිනය ආරම්භක දිනයට වඩා වැඩි විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,අවසාන දිනය ආරම්භක දිනයට වඩා වැඩි විය යුතුය
 DocType: Leave Type,Is Encash,මාරු වේ
 DocType: Leave Allocation,New Leaves Allocated,වෙන් අලුත් කොළ
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,ව්යාපෘති ප්රඥාවන්ත දත්ත උපුටා දක්වමිනි සඳහා ගත නොහැකි ය
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,අවසානය
 DocType: Project,Expected End Date,අපේක්ෂිත අවසානය දිනය
 DocType: Budget Account,Budget Amount,අයවැය මුදල
 DocType: Appraisal Template,Appraisal Template Title,ඇගයීෙම් සැකිල්ල හිමිකම්
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},දිනය සිට {0} සේවක සඳහා {1} සේවක එක්වීමට දිනය {2} පෙර විය නොහැකි
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,වාණිජ
 DocType: Patient,Alcohol Current Use,මත්පැන් භාවිතය
+DocType: Student Admission Program,Student Admission Program,ශිෂ්ය ප්රවේශ වැඩසටහන
 DocType: Payment Entry,Account Paid To,කිරීම ගෙවුම් ගිණුම
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,මව් අයිතමය {0} යනු කොටස් අයිතමය නොවිය යුතුයි
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,සියලු නිෂ්පාදන හෝ සේවා.
@@ -3868,30 +3950,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} ගිණුම සඳහා වූ අයවැය {1} {2} {3} එරෙහිව {4} වේ. එය {5} විසින් ඉක්මවා ඇත
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',ෙරෝ {0} # ගිණුම් වර්ගය විය යුතුයි &#39;ස්ථාවර වත්කම්&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,යවන ලද අතරින්
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,විකිණීම සඳහා නාවික මුදල ගණනය කිරීමට නීති රීති
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,සහ අස්ථීර වූ ආබාධිතයන්
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,මාලාවක් අනිවාර්ය වේ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,මූල්යමය සේවා
 DocType: Student Sibling,Student ID,ශිෂ්ය හැඳුනුම්පතක්
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,වේලාව ලඝු-සටහන් සඳහා ක්රියාකාරකම් වර්ග
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,සැපයුම්කරුගේ විද්යුත් ලිපිනය
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,වේලාව ලඝු-සටහන් සඳහා ක්රියාකාරකම් වර්ග
 DocType: Tax Rule,Sales,විකුණුම්
 DocType: Stock Entry Detail,Basic Amount,මූලික මුදල
 DocType: Training Event,Exam,විභාග
 DocType: Complaint,Complaint,පැමිණිල්ලක්
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},කොටස් අයිතමය {0} සඳහා අවශ්ය පොත් ගබඩාව
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},කොටස් අයිතමය {0} සඳහා අවශ්ය පොත් ගබඩාව
 DocType: Leave Allocation,Unused leaves,භාවිතයට නොගත් කොළ
 DocType: Patient,Alcohol Past Use,මත්පැන් අතීත භාවිතය
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,බිල්පත් රාජ්ය
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,මාරු
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),(උප-එකලස්කිරීම් ඇතුළුව) පුපුරා ද්රව්ය ලේඛණය බෝගයන්ගේ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,මාරු
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),(උප-එකලස්කිරීම් ඇතුළුව) පුපුරා ද්රව්ය ලේඛණය බෝගයන්ගේ
 DocType: Authorization Rule,Applicable To (Employee),(සේවක) කිරීම සඳහා අදාළ
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,නියමිත දිනය අනිවාර්ය වේ
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,නියමිත දිනය අනිවාර්ය වේ
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Attribute {0} 0 වෙන්න බෑ සඳහා වර්ධකය
 DocType: Journal Entry,Pay To / Recd From,සිට / Recd වැටුප්
 DocType: Naming Series,Setup Series,setup ශ්රේණි
 DocType: Payment Reconciliation,To Invoice Date,ඉන්වොයිසිය දිනය කිරීමට
 DocType: Supplier,Contact HTML,අප අමතන්න HTML
 ,Inactive Customers,අක්රීය ගනුදෙනුකරුවන්
+DocType: Student Admission Program,Maximum Age,උපරිම වයස්
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,මිලදී ගැනීම ලැබීම්
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,කොහොමද මිල නියම පාලනය ආලේප කරයි?
@@ -3910,6 +3994,7 @@
 DocType: GL Entry,Remarks,සටහන්
 DocType: Payment Entry,Account Paid From,සිට ගෙවුම් ගිණුම
 DocType: Purchase Order Item Supplied,Raw Material Item Code,අමු ද්රව්ය අයිතමය සංග්රහයේ
+DocType: Task,Parent Task,මාපිය කාර්යය
 DocType: Journal Entry,Write Off Based On,පදනම් කරගත් දින Off ලියන්න
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,ඊයම් කරන්න
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,මුද්රිත හා ලිපි ද්රව්ය
@@ -3918,20 +4003,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","වැටුප් දැනටමත් {0} අතර කාල සීමාව සඳහා සකස් සහ {1}, අයදුම්පත් කාලය Leave මෙම දින පරාසයක් අතර විය නොහැක."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,එය අනු අංකය සඳහා ස්ථාපන සටහන්
 DocType: Guardian Interest,Guardian Interest,ගාඩියන් පොලී
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,POS ඉන්වොයිසි සඳහා පෙරනිමි අගයන් සැකසීම
 apps/erpnext/erpnext/config/hr.py +177,Training,පුහුණුව
 DocType: Timesheet,Employee Detail,සේවක විස්තර
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 විද්යුත් හැඳුනුම්පත
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 විද්යුත් හැඳුනුම්පත
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,මාසික දින ඊළඟට දිනය දවසේ හා නැවත සමාන විය යුතුයි
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,මාසික දින ඊළඟට දිනය දවසේ හා නැවත සමාන විය යුතුයි
 DocType: Lab Prescription,Test Code,ටෙස්ට් සංග්රහය
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,වෙබ් අඩවිය මුල්පිටුව සඳහා සැකසුම්
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},{0} සඳහා ලකුණු ලබා දීම සඳහා අවසර ලබා දී නොමැත {1}
 DocType: Offer Letter,Awaiting Response,බලා සිටින ප්රතිචාර
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,ඉහත
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},මුළු මුදල {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},වලංගු නොවන විශේෂණය {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},මුළු මුදල {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},වලංගු නොවන විශේෂණය {0} {1}
 DocType: Supplier,Mention if non-standard payable account,සම්මත නොවන ගෙවිය යුතු ගිණුම් නම් සඳහන්
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},එම අයිතමය වාර කිහිපයක් ඇතුළු කර ඇත. {ලැයිස්තුව}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',කරුණාකර &#39;සියලුම තක්සේරු කණ්ඩායම්&#39; හැර වෙනත් තක්සේරු කණ්ඩායම තෝරන්න
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},පේළිය {0}: භාණ්ඩයක් සඳහා පිරිවැය මධ්යස්ථානය අවශ්ය වේ {1}
 DocType: Training Event Employee,Optional,විකල්පයකි
@@ -3954,13 +4039,15 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: පිරිවැය මධ්යස්ථානය අයිතමය {2} සඳහා අනිවාර්ය වේ
 DocType: Vehicle,Policy No,ප්රතිපත්ති නැත
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,නිෂ්පාදන පැකේජය සිට අයිතම ලබා ගන්න
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","අයිතමයක {0} අයිතමයකට එරෙහිව පවතින බැවින්, ඔබට දේපල ප්රභේද තිබිය හැක"
 DocType: Asset,Straight Line,සරල රේඛාව
 DocType: Project User,Project User,ව්යාපෘති පරිශීලක
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,බෙදුණු
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,බෙදුණු
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,බෙදුණු
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,බෙදුණු
 DocType: GL Entry,Is Advance,උසස් වේ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,දිනය සඳහා දිනය හා පැමිණීමේ සිට පැමිණීම අනිවාර්ය වේ
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,ඇතුලත් කරන්න ඔව් හෝ නැත ලෙස &#39;උප කොන්ත්රාත්තු වෙයි&#39;
+DocType: Item,Default Purchase Unit of Measure,නිසි මිළ ගැනිමේ ඒකකයක්
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,පසුගිය සන්නිවේදන දිනය
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,පසුගිය සන්නිවේදන දිනය
 DocType: Sales Team,Contact No.,අප අමතන්න අංක
@@ -3969,7 +4056,6 @@
 DocType: Production Order,Check if material transfer entry is not required,"ද්රව්ය හුවමාරු ප්රවේශය අවශ්ය නොවේ නම්, පරීක්ෂා"
 DocType: Production Order,Check if material transfer entry is not required,"ද්රව්ය හුවමාරු ප්රවේශය අවශ්ය නොවේ නම්, පරීක්ෂා"
 DocType: Program Enrollment Tool,Get Students From,සිට ශිෂ්ය ලබා ගන්න
-DocType: Hub Settings,Seller Country,විකුණන්නා රට
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,වෙබ් අඩවිය මත අයිතම ප්රකාශයට පත් කරනු ලබයි
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,කාණ්ඩ සමූහය ඔබේ සිසුන්
 DocType: Authorization Rule,Authorization Rule,බලය පැවරීමේ පාලනය
@@ -3979,8 +4065,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,විකුණුම් බදු හා ගාස්තු සැකිල්ල
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),එකතුව (ක්රෙඩිට්)
 DocType: Repayment Schedule,Payment Date,ගෙවීමේ දිනය
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,නව කණ්ඩායම යවන ලද
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,නව කණ්ඩායම යවන ලද
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,නව කණ්ඩායම යවන ලද
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,නව කණ්ඩායම යවන ලද
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,ඇඟලුම් සහ උපකරණ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,බර ලකුණු ගණනය කළ නොහැක. සූත්රය වලංගු වේ.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,සාමය පිළිබඳ අංකය
@@ -3998,6 +4084,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ෙරෝ # {0}: වත්කම් {1} ඉදිරිපත් කළ නොහැකි, එය දැනටමත් {2}"
 DocType: Tax Rule,Billing Country,බිල්පත් රට
 DocType: Purchase Order Item,Expected Delivery Date,අපේක්ෂිත භාර දීම දිනය
+DocType: Restaurant Order Entry,Restaurant Order Entry,ආපන ශාලා ප්රවේශය
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,හර සහ බැර {0} # {1} සඳහා සමාන නැත. වෙනස {2} වේ.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,විනෝදාස්වාදය වියදම්
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,ද්රව්ය ඉල්ලීම් කරන්න
@@ -4010,9 +4097,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,පවත්නා ගනුදෙනුව ගිණුමක් මකා දැමිය නොහැක
 DocType: Vehicle,Last Carbon Check,පසුගිය කාබන් පරීක්ෂා කරන්න
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,නීතිමය වියදම්
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,කරුණාකර දණ්ඩනය ප්රමාණය තෝරා
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,කරුණාකර දණ්ඩනය ප්රමාණය තෝරා
 DocType: Purchase Invoice,Posting Time,"ගිය තැන, වේලාව"
 DocType: Timesheet,% Amount Billed,% මුදල අසූහත
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;පත්වීම සඳහා වේලාව&quot; &quot;Dr {0} සඳහා සකසා නැති අතර එය වෛද්යවරයෙකුට එකතු කරන්න.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,දුරකථන අංකය වියදම්
 DocType: Sales Partner,Logo,ලාංඡනය
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"ඔබ &#39;සුරැකුමට පෙර, මාලාවක් තෝරාගැනීමට පරිශීලක බල කිරීම සඳහා අවශ්ය නම් මෙම පරීක්ෂා කරන්න. ඔබ මෙම පරීක්ෂා නම් කිසිඳු පෙරනිමි වනු ඇත."
@@ -4023,6 +4111,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,නව පාරිභෝගික ආදායම්
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,ගමන් වියදම්
 DocType: Maintenance Visit,Breakdown,බිඳ වැටීම
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},අභිමත ක්ෂේත්රය අනුපිළිවෙලට එකතු කරන්න doctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,ගිණුම: {0} මුදල් සමග: {1} තෝරා ගත නොහැකි
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",නවතම තක්සේරු අනුපාතය / මිල ලැයිස්තුවේ අනුපාතය / අමු ද්රව්යයේ අවසන් මිලදී ගැනීමේ අනුපාතය මත පදනම්ව Scheduler හරහා ස්වයංක්රීයව BOM පිරිවැය යාවත්කාලීන කරන්න.
 DocType: Bank Reconciliation Detail,Cheque Date,"එම ගාස්තුව මුදලින්, ෙචක්පතකින් දිනය"
@@ -4047,7 +4136,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),(කාල ලඝු-සටහන් හරහා) මුළු බිල්පත් ප්රමාණය
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,සැපයුම්කරු අංකය
 DocType: Payment Request,Payment Gateway Details,ගෙවීම් ගේට්වේ විස්තර
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,"ප්රමාණය, 0 ට වඩා වැඩි විය යුතුය"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,"ප්රමාණය, 0 ට වඩා වැඩි විය යුතුය"
 DocType: Journal Entry,Cash Entry,මුදල් සටහන්
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,ළමා මංසල පමණි &#39;සමූහය වර්ගය මංසල යටතේ නිර්මාණය කිරීම ද කළ හැක
 DocType: Leave Application,Half Day Date,අර්ධ දින දිනය
@@ -4065,12 +4154,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,සටහන: අයිතමය {0} වාර කිහිපයක් ඇතුළු
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,සියළු සබඳතා.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,සමාගම කෙටි යෙදුම්
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,පරිශීලක {0} නොපවතියි
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,පරිශීලක {0} නොපවතියි
 DocType: Subscription,SUB-,උප-
 DocType: Item Attribute Value,Abbreviation,කෙටි යෙදුම්
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,ගෙවීම් සටහන් දැනටමත් පවතී
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,authroized නොහැකි නිසා {0} සීමාවන් ඉක්මවා
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,වැටුප් සැකිල්ල ස්වාමියා.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,රෝග විද්යාව
+DocType: Restaurant Order Entry,Restaurant Table,ආපනශාලා වගුව
 DocType: Leave Type,Max Days Leave Allowed,මැක්ස් දින නිවාඩු අනුමත
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,කරත්තයක් සඳහා බදු පාලනය සකසන්න
 DocType: Purchase Invoice,Taxes and Charges Added,බදු හා බදු ගාස්තු එකතු
@@ -4082,10 +4173,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ආදර්ශ හෝ ගනුදෙනුකරුවන් වෙත උපුටා දක්වයි.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ශීත කළ කොටස් සංස්කරණය කිරීමට අවසර කාර්යභාරය
 ,Territory Target Variance Item Group-Wise,භූමි ප්රදේශය ඉලක්ක විචලතාව අයිතමය සමූහ ප්රාඥ
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,සියලු පාරිභෝගික කණ්ඩායම්
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,සියලු පාරිභෝගික කණ්ඩායම්
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,මාසික සමුච්චිත
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} අනිවාර්ය වේ. සමහර විට විනිමය හුවමාරු වාර්තා {1} {2} සඳහා නිර්මාණය කර නැත.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,බදු සැකිල්ල අනිවාර්ය වේ.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,බදු සැකිල්ල අනිවාර්ය වේ.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,ගිණුම {0}: මාපිය ගිණුමක් {1} නොපවතියි
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),මිල ලැයිස්තුව අනුපාතිකය (සමාගම ව්යවහාර මුදල්)
 DocType: Products Settings,Products Settings,නිෂ්පාදන සැකසුම්
@@ -4111,13 +4202,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,අයිතමය ප්රඥාවන්ත බදු විස්තර
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,ආයතනය කෙටි යෙදුම්
 ,Item-wise Price List Rate,අයිතමය ප්රඥාවන්ත මිල ලැයිස්තුව අනුපාතිකය
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,සැපයුම්කරු උද්ධෘත
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,සැපයුම්කරු උද්ධෘත
 DocType: Quotation,In Words will be visible once you save the Quotation.,ඔබ උද්ධෘත බේරා වරක් වචන දෘශ්යමාන වනු ඇත.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},ප්රමාණය ({0}) පේළියේ {1} තුළ භාගය විය නොහැකි
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},ප්රමාණය ({0}) පේළියේ {1} තුළ භාගය විය නොහැකි
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Barcode {0} දැනටමත් අයිතමය {1} භාවිතා
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Barcode {0} දැනටමත් අයිතමය {1} භාවිතා
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,නාවික වියදම් එකතු කිරීම සඳහා වන නීති.
 DocType: Item,Opening Stock,ආරම්භක තොගය
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,පාරිභෝගික අවශ්ය වේ
@@ -4135,9 +4226,8 @@
 DocType: Customer,From Lead,ඊයම් සිට
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,නිෂ්පාදනය සඳහා නිකුත් නියෝග.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,රාජ්ය මූල්ය වර්ෂය තෝරන්න ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS සටහන් කිරීමට අවශ්ය POS නරඹන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS සටහන් කිරීමට අවශ්ය POS නරඹන්න
 DocType: Program Enrollment Tool,Enroll Students,ශිෂ්ය ලියාපදිංචි
-DocType: Hub Settings,Name Token,නම ටෝකනය
 DocType: Lab Test,Approved Date,අනුමත දිනය
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,සම්මත විකිණීම
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,හිතුව එක තේ ගබඩාවක් අනිවාර්ය වේ
@@ -4155,7 +4245,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,මානව සම්පත්
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,ගෙවීම් ප්රතිසන්ධාන ගෙවීම්
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,බදු වත්කම්
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},නිෂ්පාදනය සාමය {0} වී ඇත
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},නිෂ්පාදනය සාමය {0} වී ඇත
 DocType: BOM Item,BOM No,ද්රව්ය ලේඛණය නොමැත
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,ජර්නල් සටහන් {0} ගිණුම {1} නැති හෝ වෙනත් වවුචරය එරෙහිව මේ වන විටත් අදාල කරගත කරන්නේ
@@ -4175,8 +4265,8 @@
 DocType: Currency Exchange,To Currency,ව්යවහාර මුදල් සඳහා
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,පහත සඳහන් භාවිතා කරන්නන් අවහිර දින නිවාඩු ඉල්ලුම් අනුමත කිරීමට ඉඩ දෙන්න.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,වියදම් හිමිකම් වර්ග.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},අයිතමය {0} සඳහා අනුපාතය අලෙවි එහි {1} වඩා අඩු ය. අලෙවි අනුපාතය කටවත් {2} විය යුතු
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},අයිතමය {0} සඳහා අනුපාතය අලෙවි එහි {1} වඩා අඩු ය. අලෙවි අනුපාතය කටවත් {2} විය යුතු
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},අයිතමය {0} සඳහා අනුපාතය අලෙවි එහි {1} වඩා අඩු ය. අලෙවි අනුපාතය කටවත් {2} විය යුතු
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},අයිතමය {0} සඳහා අනුපාතය අලෙවි එහි {1} වඩා අඩු ය. අලෙවි අනුපාතය කටවත් {2} විය යුතු
 DocType: Item,Taxes,බදු
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,ගෙවුම් හා නොවේ භාර
 DocType: Project,Default Cost Center,පෙරනිමි පිරිවැය මධ්යස්ථානය
@@ -4190,15 +4280,15 @@
 DocType: Employee Loan,Fully Disbursed,පූර්ණ මුදාහැරේ
 DocType: Maintenance Visit,Customer Feedback,පාරිභෝගික සේවාව ඇගයීම
 DocType: Account,Expense,වියදම්
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,ලකුණු උපරිම ලකුණු ට වඩා වැඩි විය නොහැක
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,ලකුණු උපරිම ලකුණු ට වඩා වැඩි විය නොහැක
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,පාරිභෝගිකයින් සහ සැපයුම්කරුවන්
 DocType: Item Attribute,From Range,රංගේ සිට
 DocType: BOM,Set rate of sub-assembly item based on BOM,BOM මත පදනම්ව උප-එකලං අයිතමයක අනුපාතය සකසන්න
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},සූත්රයක් හෝ තත්ත්වය කාරක රීති දෝෂය: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},සූත්රයක් හෝ තත්ත්වය කාරක රීති දෝෂය: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,ඩේලි වැඩ සාරාංශය සැකසුම් සමාගම
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,අයිතමය {0} නොසලකා එය කොටස් භාණ්ඩයක් නොවන නිසා
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,වැඩිදුර සැකසීම සදහා මෙම නිෂ්පාදන න්යාය ඉදිරිපත් කරන්න.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,වැඩිදුර සැකසීම සදහා මෙම නිෂ්පාදන න්යාය ඉදිරිපත් කරන්න.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","යම් ගනුදෙනුවක දී, මිල නියම කිරීම පාලනය අදාළ නොවේ කිරීම සඳහා, සියලු අදාල මිල ගණන් රීති අක්රිය කළ යුතුය."
 DocType: Assessment Group,Parent Assessment Group,මව් තක්සේරු කණ්ඩායම
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,රැකියා
@@ -4215,12 +4305,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',පිරිසක් විසින් &#39;සමාගම&#39; නම් හිස් පෙරීමට සමාගම සකස් කරන්න
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,"ගිය තැන, දිනය අනාගත දිනයක් විය නොහැකි"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},ෙරෝ # {0}: අනු අංකය {1} {2} {3} සමග නොගැලපේ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,පුනරාවර්තනය වීම සඳහා
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,අනියම් නිවාඩු
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,ලේසර් ටෙස්ට් යූඕම්.
 DocType: Batch,Batch ID,කණ්ඩායම හැඳුනුම්පත
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},සටහන: {0}
 ,Delivery Note Trends,සැපයුම් සටහන ප්රවණතා
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,මෙම සතියේ සාරාංශය
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,මෙම සතියේ සාරාංශය
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,කොටස් යවන ලද තුළ
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,ගිණුම: {0} පමණක් කොටස් ගනුදෙනු හරහා යාවත්කාලීන කළ හැකි
 DocType: Student Group Creation Tool,Get Courses,පාඨමාලා ලබා ගන්න
@@ -4234,7 +4325,6 @@
 DocType: Purchase Order,To Bill,පනත් කෙටුම්පත
 DocType: Material Request,% Ordered,% අනුපිළිවලින්
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","පාඨමාලාව සඳහා පදනම් ශිෂ්ය සමූහය, පාඨමාලා වැඩසටහන ඇතුලත් දී ලියාපදිංචි පාඨමාලා සෑම ශිෂ්ය සඳහා වලංගු වනු ඇත."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","කොමාවකින් වෙන් විද්යුත් තැපැල් ලිපිනය ඇතුලත් කරන්න, ඉන්වොයිසි විශේෂයෙන් දිනය ස්වයංක්රීයව තැපැල් කරනු ඇත"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Piecework
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,සාමාන්යය. මිලට ගැනීම අනුපාත
 DocType: Task,Actual Time (in Hours),සැබෑ කාලය (පැය දී)
@@ -4248,7 +4338,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,අයිතමය {0} අනු අංක සඳහා පිහිටුවීම් නොවේ තීරුව හිස්ව තිබිය යුතුයි.
 DocType: Accounts Settings,Accounts Settings,ගිණුම් සැකසුම්
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,අනුමත
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,ඉදිරිපත් කිරීමට නොහැකි ප්රතිඵල
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,ඉදිරිපත් කිරීමට නොහැකි ප්රතිඵල
 DocType: Customer,Sales Partner and Commission,විකුණුම් සහකරු හා කොමිෂන් සභාව
 DocType: Employee Loan,Rate of Interest (%) / Year,පොලී අනුපාතය (%) / අවුරුද්ද
 ,Project Quantity,ව්යාපෘති ප්රමාණය
@@ -4260,55 +4350,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,කලු
 DocType: BOM Explosion Item,BOM Explosion Item,ද්රව්ය ලේඛණය පිපිරීගිය අයිතමය
 DocType: Account,Auditor,විගණකාධිපති
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} ඉදිරිපත් භාණ්ඩ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} ඉදිරිපත් භාණ්ඩ
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,වැඩිදුර ඉගෙන ගන්න
 DocType: Cheque Print Template,Distance from top edge,ඉහළ දාරය සිට දුර
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,මිල ලැයිස්තුව {0} අක්රීය කර ඇත නැත්නම් ස්ථානීකව නොපවතියි
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,මිල ලැයිස්තුව {0} අක්රීය කර ඇත නැත්නම් ස්ථානීකව නොපවතියි
 DocType: Purchase Invoice,Return,ආපසු
 DocType: Production Order Operation,Production Order Operation,නිෂ්පාදන න්යාය මෙහෙයුම
 DocType: Pricing Rule,Disable,අක්රීය
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,ගෙවීම් ක්රමය ගෙවීම් කිරීමට අවශ්ය වේ
 DocType: Project Task,Pending Review,විභාග සමාලෝචන
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,පත් කිරීම් හා උපදේශනයන්
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} මෙම කණ්ඩායම {2} ලියාපදිංචි වී නොමැති
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} මෙම කණ්ඩායම {2} ලියාපදිංචි වී නොමැති
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","එය දැනටමත් {1} පරිදි වත්කම්, {0} කටුගා දමා ගත නොහැකි"
 DocType: Task,Total Expense Claim (via Expense Claim),(වියදම් හිමිකම් හරහා) මුළු වියදම් හිමිකම්
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,මාක් නැති කල
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ෙරෝ {0}: සිටිමට # ව්යවහාර මුදල් {1} තෝරාගත් මුදල් {2} සමාන විය යුතුයි
 DocType: Journal Entry Account,Exchange Rate,විනිමය අනුපාතය
 DocType: Patient,Additional information regarding the patient,රෝගියා පිළිබඳව අමතර තොරතුරු
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,විකුණුම් සාමය {0} ඉදිරිපත් කර නැත
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,විකුණුම් සාමය {0} ඉදිරිපත් කර නැත
 DocType: Homepage,Tag Line,ටැග ලයින්
 DocType: Fee Component,Fee Component,ගාස්තු සංරචක
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,රථ වාහන කළමනාකරණය
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,සිට අයිතම එකතු කරන්න
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,රථ වාහන කළමනාකරණය
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,සිට අයිතම එකතු කරන්න
 DocType: Cheque Print Template,Regular,සාමාන්ය
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,සියලු තක්සේරු නිර්ණායක මුළු Weightage 100% ක් විය යුතුය
-DocType: BOM,Last Purchase Rate,පසුගිය මිලදී ගැනීම අනුපාත
+DocType: Purchase Order Item,Last Purchase Rate,පසුගිය මිලදී ගැනීම අනුපාත
 DocType: Account,Asset,වත්කම
 DocType: Project Task,Task ID,කාර්ය සාධක හැඳුනුම්පත
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,කොටස් අයිතමය {0} සඳහා පැවතිය නොහැකි ප්රභේද පවතින බැවින්
 DocType: Lab Test,Mobile,ජංගම
 ,Sales Person-wise Transaction Summary,විකුණුම් පුද්ගලයා ප්රඥාවෙන් ගනුදෙනු සාරාංශය
 DocType: Training Event,Contact Number,ඇමතුම් අංකය
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,පොත් ගබඩාව {0} නොපවතියි
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext Hub සඳහා ලියාපදිංචි
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,පොත් ගබඩාව {0} නොපවතියි
 DocType: Monthly Distribution,Monthly Distribution Percentages,මාසික බෙදාහැරීම් ප්රතිශත
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,තෝරාගත් අයිතමය කණ්ඩායම ලබා ගත නොහැකි
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","{1} {2} සඳහා ගිණුම් සටහන් කරන්න අවශ අයිතමය {0}, තක්සේරු අනුපාතය සොයාගත නොහැකි විය. මෙම අයිතමය {1} නිදසුන් අයිතමයක් ලෙස ගනුදෙනු කරන්නේ නම්, එම {1} අයිතමය වගුවේ බව සඳහන් කරන්න. එසේ නැත්නම්, අයිතමය වාර්තාගත තක්සේරු අනුපාතය අයිතමය සඳහා ලැබෙන කොටස් ගනුදෙනුව නිර්මාණය කරන්න හෝ සඳහන්, පසුව submiting / මෙම ප්රවේශය අවලංගු කරන්න"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,මෙම බෙදීම සටහන එරෙහිව පවත්වන ද්රව්ය%
+DocType: Training Event,Has Certificate,සහතිකයක් ඇත
 DocType: Project,Customer Details,පාරිභෝගික විස්තර
 DocType: Employee,Reports to,වාර්තා කිරීමට
 ,Unpaid Expense Claim,නොගෙවූ වියදම් හිමිකම්
 DocType: Payment Entry,Paid Amount,ු ර්
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,විකුණුම් චක්රය
 DocType: Assessment Plan,Supervisor,සුපරීක්ෂක
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,සමඟ අමුත්තන්
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,සමඟ අමුත්තන්
 ,Available Stock for Packing Items,ඇසුරුම් අයිතම සඳහා ලබා ගත හැකි කොටස්
 DocType: Item Variant,Item Variant,අයිතමය ප්රභේද්යයක්
 DocType: Assessment Result Tool,Assessment Result Tool,තක්සේරු ප්රතිඵල මෙවලම
 DocType: BOM Scrap Item,BOM Scrap Item,ද්රව්ය ලේඛණය ලාංකික අයිතමය
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,ඉදිරිපත් නියෝග ඉවත් කල නොහැක
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,ඉදිරිපත් නියෝග ඉවත් කල නොහැක
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ඩෙබිට් දැනටමත් ගිණුම් ශේෂය, ඔබ &#39;ක්රෙඩිට්&#39; ලෙස &#39;ශේෂ විය යුතුයි&#39; නියම කිරීමට අවසර නැත"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,තත්ත්ව කළමනාකරණ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,අයිතමය {0} අක්රීය කොට ඇත
@@ -4329,7 +4418,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,"Zero, තක්සේරු අනුපාත ඉඩ"
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,"Zero, තක්සේරු අනුපාත ඉඩ"
 DocType: Training Event Employee,Invited,ආරාධනා
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,ලබා දී දින සඳහා සේවක {0} සඳහා සොයා බහු ක්රියාකාරී වැටුප් තල
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,ලබා දී දින සඳහා සේවක {0} සඳහා සොයා බහු ක්රියාකාරී වැටුප් තල
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Setup ගේට්වේ කියයි.
 DocType: Employee,Employment Type,රැකියා වර්ගය
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,ස්ථාවර වත්කම්
@@ -4341,7 +4430,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,ශිෂ්ය විද්යුත් හැඳුනුම්පත
 DocType: Employee,Notice (days),නිවේදනය (දින)
 DocType: Tax Rule,Sales Tax Template,විකුණුම් බදු සැකිල්ල
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,ඉන්වොයිස් බේරා ගැනීමට භාණ්ඩ තෝරන්න
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,ඉන්වොයිස් බේරා ගැනීමට භාණ්ඩ තෝරන්න
 DocType: Employee,Encashment Date,හැකි ඥාතීන් නොවන දිනය
 DocType: Training Event,Internet,අන්තර්ජාල
 DocType: Special Test Template,Special Test Template,විශේෂ ටෙස්ට් ආකෘතිය
@@ -4351,7 +4440,7 @@
 DocType: Academic Term,Term Start Date,කාලීන ඇරඹුම් දිනය
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,විපක්ෂ ගණන්
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,විපක්ෂ ගණන්
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},{0} # {1} ඇමුණුම බලන්න
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},{0} # {1} ඇමුණුම බලන්න
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,පොදු ලෙජරය අනුව බැංකු ප්රකාශය ඉතිරි
 DocType: Job Applicant,Applicant Name,අයදුම්කරු නම
 DocType: Authorization Rule,Customer / Item Name,පාරිභෝගික / අයිතම නම
@@ -4371,7 +4460,7 @@
 DocType: Guardian,Guardian Of ,ආරක්ෂකයා
 DocType: Grading Scale Interval,Threshold,සීමකය
 DocType: BOM Update Tool,Current BOM,වත්මන් ද්රව්ය ලේඛණය
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,අනු අංකය එකතු කරන්න
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,අනු අංකය එකතු කරන්න
 DocType: Production Order Item,Available Qty at Source Warehouse,මූලාශ්රය ගබඩා ලබා ගත හැක යවන ලද
 apps/erpnext/erpnext/config/support.py +22,Warranty,වගකීම්
 DocType: Purchase Invoice,Debit Note Issued,ඩෙබිට් සටහන නිකුත් කර ඇත්තේ
@@ -4394,10 +4483,9 @@
 DocType: Account,Receivable,ලැබිය යුතු
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ෙරෝ # {0}: මිලදී ගැනීමේ නියෝගයක් දැනටමත් පවතී ලෙස සැපයුම්කරුවන් වෙනස් කිරීමට අවසර නැත
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,සකස් ණය සීමා ඉක්මවා යන ගනුදෙනු ඉදිරිපත් කිරීමට අවසර තිබේ එම භූමිකාව.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,නිෂ්පාදනය කිරීමට අයිතම තෝරන්න
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","මාස්ටර් දත්ත සමමුහුර්ත, එය යම් කාලයක් ගත විය හැකියි"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,නිෂ්පාදනය කිරීමට අයිතම තෝරන්න
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","මාස්ටර් දත්ත සමමුහුර්ත, එය යම් කාලයක් ගත විය හැකියි"
 DocType: Item,Material Issue,ද්රව්ය නිකුත්
-DocType: Hub Settings,Seller Description,විකුණන්නා විස්තරය
 DocType: Employee Education,Qualification,සුදුසුකම්
 DocType: Item Price,Item Price,අයිතමය මිල
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,සබන් සහ ඩිටර්ජන්ට්
@@ -4405,7 +4493,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,වරින් වර ට වඩා වැඩි විය නොහැක.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,චලන පින්තූර සහ වීඩියෝ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,නියෝග
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,අරඹන්න
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,අරඹන්න
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,සක්රීය කළහොත් පද්ධතිය අකෘතියේ ප්රභේදයන් යාවත්කාලීන නොකරන නමුත් නව ප්රභේදයක් තැනීමේදී පහත ක්ෂේත්රවල දත්ත පිටපත් කරනු ඇත
 DocType: Salary Detail,Component,සංරචකය
 DocType: Assessment Criteria,Assessment Criteria Group,තක්සේරු නිර්ණායක සමූහ
 DocType: Healthcare Settings,Patient Name By,රෝගියාගේ නම
@@ -4415,7 +4504,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,කාර්යභාරය අනුමත හෝ පරිශීලක අනුමත ඇතුලත් කරන්න
 DocType: Journal Entry,Write Off Entry,පිවිසුම් Off ලියන්න
 DocType: BOM,Rate Of Materials Based On,ද්රව්ය මත පදනම් මත අනුපාතය
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,සැපයුම්කරු&gt; සැපයුම් වර්ගය
+DocType: Item Variant Settings,Do not Update Variants,ප්රභවයන් යාවත්කාලීන කරන්න එපා
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,සහයෝගය Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,සියලු නොතේරූ නිසාවෙන්
 DocType: POS Profile,Terms and Conditions,නියම සහ කොන්දේසි
@@ -4424,7 +4513,7 @@
 DocType: Leave Block List,Applies to Company,සමාගම සඳහා අදාළ ෙව්
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,අවලංගු කළ නොහැකි ඉදිරිපත් කොටස් Entry {0} පවතින බැවිනි
 DocType: Employee Loan,Disbursement Date,ටහිර දිනය
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;ලබන්නන්&#39; නිශ්චිතව දක්වා නැත
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;ලබන්නන්&#39; නිශ්චිතව දක්වා නැත
 DocType: BOM Update Tool,Update latest price in all BOMs,සියලුම BOM හි නවතම මිල යාවත්කාලීන කරන්න
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,වෛද්ය වාර්තාව
 DocType: Vehicle,Vehicle,වාහන
@@ -4440,14 +4529,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,විපක්ෂ / ඊයම්%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,වත්කම් අගය පහත හා තුලනය
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},"මුදල {0} {1} {3} කර ගැනීම සඳහා, {2} මාරු"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},"මුදල {0} {1} {3} කර ගැනීම සඳහා, {2} මාරු"
 DocType: Sales Invoice,Get Advances Received,අත්තිකාරම් ලද කරන්න
 DocType: Email Digest,Add/Remove Recipients,එකතු කරන්න / ලබන්නන් ඉවත් කරන්න
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},නතර නිෂ්පාදන න්යාය {0} එරෙහිව ගනුදෙනු අවසර නැත
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","මෙම මුදල් වර්ෂය පෙරනිමි ලෙස සැකසීම සඳහා, &#39;&#39; පෙරනිමි ලෙස සකසන්න &#39;මත ක්ලික් කරන්න"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,එක්වන්න
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,එක්වන්න
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,හිඟය යවන ලද
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,අයිතමය ප්රභේද්යයක් {0} එම ලක්ෂණ සහිත පවතී
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,අයිතමය ප්රභේද්යයක් {0} එම ලක්ෂණ සහිත පවතී
 DocType: Employee Loan,Repay from Salary,වැටුප් සිට ආපසු ගෙවීම
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},මුදල සඳහා {0} {1} එරෙහිව ගෙවීම් ඉල්ලා {2}
@@ -4460,7 +4549,7 @@
 DocType: Sales Invoice Item,Sales Order Item,විකුණුම් සාමය අයිතමය
 DocType: Salary Slip,Payment Days,ගෙවීම් දින
 DocType: Patient,Dormant,උදාසීනව
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,ළමා ශීර්ෂයන් සමඟ බඞු ගබඞාව ලෙජර් බවට පරිවර්තනය කළ නොහැකි
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,ළමා ශීර්ෂයන් සමඟ බඞු ගබඞාව ලෙජර් බවට පරිවර්තනය කළ නොහැකි
 DocType: BOM,Manage cost of operations,මෙහෙයුම් පිරිවැය කළමනාකරණය
 DocType: Accounts Settings,Stale Days,ස්ටේට් ඩේව්
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","පරික්ෂා කර බැලූ ගනුදෙනු යම් &quot;ඉදිරිපත්&quot; කරන විට, ඊ-මේල්, උත්පතන ස්වයංක්රීයව ඇමුණුමක් ලෙස ගනුදෙනුව සමග, එම ගණුදෙනුවේ සම්බන්ධ &quot;අමතන්න&quot; වෙත ඊමේල් යැවීමට විවෘත කරන ලදී. පරිශීලකයාගේ හෝ ඊ-තැපැල් යැවීමට නොහැකි විය හැක."
@@ -4474,10 +4563,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,අනු අංකය {0} දැනටමත් ලැබී ඇත
 ,Requested Items To Be Transferred,ඉල්ලන අයිතම මාරු කර
 DocType: Expense Claim,Vehicle Log,වාහන ලොග්
-DocType: Purchase Invoice,Recurring Id,පුනරාවර්තනය අංකය
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),උණ (තාප&gt; 38.5 ° C / 101.3 ° F හෝ අඛණ්ඩ තාපය&gt; 38 ° C / 100.4 ° F)
 DocType: Customer,Sales Team Details,විකුණුම් කණ්ඩායම විස්තර
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,ස්ථිර මකන්නද?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,ස්ථිර මකන්නද?
 DocType: Expense Claim,Total Claimed Amount,මුළු හිමිකම් කියන අය මුදල
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,විකිණීම සඳහා ලබාදිය හැකි අවස්ථා.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},වලංගු නොවන {0}
@@ -4487,7 +4575,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,වෙළෙඳ දෙපාර්තමේන්තු අටකින්
 ,Item Delivery Date,අයිතම සැපයුම් දිනය
 DocType: Warehouse,PIN,PIN අංකය
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,සැකසුම ERPNext ඔබේ පාසල්
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,සැකසුම ERPNext ඔබේ පාසල්
 DocType: Sales Invoice,Base Change Amount (Company Currency),මූලික වෙනස් ප්රමාණය (සමාගම ව්යවහාර මුදල්)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,පහත සඳහන් ගබඩා වෙනුවෙන් කිසිදු වගකීමක් සටහන් ඇතුළත් කිරීම්
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,පළමු ලිපිය සුරැකීම.
@@ -4499,13 +4587,12 @@
 DocType: Task,Is Milestone,සංධිස්ථානයක් වන
 DocType: Daily Work Summary,Email Sent To,ඊ-තැපැල් වෙත යවන
 DocType: Budget,Warn,බිය ගන්වා අනතුරු අඟවනු
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,ඔබ ලියාපංදිචි වීමට අවශ්යද?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","වෙනත් ඕනෑම ප්රකාශ, වාර්තාවන් යා යුතු බව විශේෂයෙන් සඳහන් කළ යුතු උත්සාහයක්."
 DocType: BOM,Manufacturing User,නිෂ්පාදන පරිශීලක
 DocType: Purchase Invoice,Raw Materials Supplied,"සපයා, අමු ද්රව්ය"
-DocType: Purchase Invoice,Recurring Print Format,පුනරාවර්තනය මුද්රණය ආකෘතිය
 DocType: C-Form,Series,මාලාවක්
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},මිල ලැයිස්තුවේ මුදල් {0} විය යුතුය {1} හෝ {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,නිෂ්පාදන එකතු කරන්න
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},මිල ලැයිස්තුවේ මුදල් {0} විය යුතුය {1} හෝ {2}
 DocType: Appraisal,Appraisal Template,ඇගයීෙම් සැකිල්ල
 DocType: Item Group,Item Classification,අයිතමය වර්ගීකරණය
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,ව්යාපාර සංවර්ධන කළමණාකරු
@@ -4519,7 +4606,7 @@
 DocType: Item Attribute Value,Attribute Value,ගති ලක්ෂණය අගය
 ,Itemwise Recommended Reorder Level,Itemwise සීරුමාරු කිරීමේ පෙළ නිර්දේශිත
 DocType: Salary Detail,Salary Detail,වැටුප් විස්තර
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,කරුණාකර පළමු {0} තෝරා
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,කරුණාකර පළමු {0} තෝරා
 DocType: Appointment Type,Physician,වෛද්යවරයෙක්
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,කණ්ඩායම {0} අයිතමය ක {1} කල් ඉකුත් වී ඇත.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,උපදේශන
@@ -4530,7 +4617,7 @@
 DocType: Salary Detail,Default Amount,පෙරනිමි මුදල
 DocType: Lab Test Template,Descriptive,විස්තරාත්මක
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,පද්ධතිය තුළ ගබඩා සංකීර්ණය සොයාගත නොහැකි
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,මෙම මාසික ගේ සාරාංශය
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,මෙම මාසික ගේ සාරාංශය
 DocType: Quality Inspection Reading,Quality Inspection Reading,තත්ත්ව පරීක්ෂක වර කියවීම
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,&#39;&#39; කණ්ඩරාව කොටස් පැරණි Than` දින% d ට වඩා කුඩා විය යුතුය.
 DocType: Tax Rule,Purchase Tax Template,මිලදී ගැනීම බදු සැකිල්ල
@@ -4553,12 +4640,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,පුහුණු සිදුවීම් / ප්රතිඵල
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,මත ලෙස සමුච්චිත ක්ෂය
 DocType: Sales Invoice,C-Form Applicable,C-ආකෘතිය අදාල
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},"වේලාව මෙහෙයුම මෙහෙයුම {0} සඳහා, 0 ට වඩා වැඩි විය යුතුය"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},"වේලාව මෙහෙයුම මෙහෙයුම {0} සඳහා, 0 ට වඩා වැඩි විය යුතුය"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,පොත් ගබඩාව අනිවාර්ය වේ
 DocType: Supplier,Address and Contacts,ලිපිනය සහ අප අමතන්න
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM පරිවර්තනය විස්තර
 DocType: Program,Program Abbreviation,වැඩසටහන කෙටි යෙදුම්
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,නිෂ්පාදන සාමය සඳහා අයිතමය සැකිල්ල එරෙහිව මතු කළ හැකි නොවේ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,නිෂ්පාදන සාමය සඳහා අයිතමය සැකිල්ල එරෙහිව මතු කළ හැකි නොවේ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,ගාස්තු එක් එක් අයිතමය එරෙහිව මිලදී ගැනීම රිසිට්පත යාවත්කාලීන වේ
 DocType: Warranty Claim,Resolved By,විසින් විසඳා
 DocType: Bank Guarantee,Start Date,ආරම්භක දිනය
@@ -4584,27 +4671,28 @@
 DocType: Employee,Educational Qualification,අධ්යාපන සුදුසුකම්
 DocType: Workstation,Operating Costs,මෙහෙයුම් පිරිවැය
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,සමුච්චිත මාසික අයවැය කටයුතු කර ඉක්මවා
-DocType: Purchase Invoice,Submit on creation,නිර්මානය කිරීම මත ඉදිරිපත්
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},{0} {1} විය යුතුය සඳහා ව්යවහාර මුදල්
+DocType: Subscription,Submit on creation,නිර්මානය කිරීම මත ඉදිරිපත්
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},{0} {1} විය යුතුය සඳහා ව්යවහාර මුදල්
 DocType: Asset,Disposal Date,බැහැර කිරීමේ දිනය
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","විද්යුත් තැපැල් පණිවුඩ ඔවුන් නිවාඩු නැති නම්, ලබා දී ඇති පැයක දී සමාගමේ සියළු ක්රියාකාරී සේවක වෙත යවනු ලැබේ. ප්රතිචාර සාරාංශය මධ්යම රාත්රියේ යවනු ඇත."
 DocType: Employee Leave Approver,Employee Leave Approver,සේවක නිවාඩු Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},ෙරෝ {0}: ඇන් සීරුමාරු කිරීමේ ප්රවේශය දැනටමත් මෙම ගබඩා සංකීර්ණය {1} සඳහා පවතී
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","උද්ධෘත කර ඇති නිසා, අහිමි ලෙස ප්රකාශයට පත් කළ නොහැක."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,පුහුණු ඔබෙන් ලැබෙන ප්රයෝජනාත්මක ප්රතිචාරය
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},ෙරෝ {0}: ඇන් සීරුමාරු කිරීමේ ප්රවේශය දැනටමත් මෙම ගබඩා සංකීර්ණය {1} සඳහා පවතී
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","උද්ධෘත කර ඇති නිසා, අහිමි ලෙස ප්රකාශයට පත් කළ නොහැක."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,පුහුණු ඔබෙන් ලැබෙන ප්රයෝජනාත්මක ප්රතිචාරය
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,නිෂ්පාදන න්යාය {0} ඉදිරිපත් කළ යුතුය
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,සැපයුම්කරුවන් ලකුණු ලකුණු නිර්ණායක
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},කරුණාකර විෂය {0} සඳහා ආරම්භය දිනය හා අවසාන දිනය තෝරා
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},පාඨමාලා පේළිය {0} අනිවාර්ය වේ
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,මේ දක්වා දින සිට පෙර විය නොහැකි
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,/ එක් කරන්න සංස්කරණය කරන්න මිල ගණන්
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,/ එක් කරන්න සංස්කරණය කරන්න මිල ගණන්
 DocType: Batch,Parent Batch,මව් කණ්ඩායම
 DocType: Batch,Parent Batch,මව් කණ්ඩායම
 DocType: Cheque Print Template,Cheque Print Template,"එම ගාස්තුව මුදලින්, ෙචක්පතකින් මුද්රණය සැකිල්ල"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,පිරිවැය මධ්යස්ථාන සටහන
 DocType: Lab Test Template,Sample Collection,සාම්පල එකතුව
 ,Requested Items To Be Ordered,ඉල්ලන අයිතම ඇණවුම් කළ යුතු
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,මගේ නියෝග
 DocType: Price List,Price List Name,මිල ලැයිස්තුව නම
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},{0} සඳහා දෛනික වැඩ සාරාංශය
 DocType: Employee Loan,Totals,එකතූන්
@@ -4623,12 +4711,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {3} {4} {5} මෙම ගනුදෙනුව සම්පූර්ණ කිරීමට සඳහා මත {2} අවශ්ය {1} ඒකක.
 DocType: Fee Schedule,Student Category,ශිෂ්ය ප්රවර්ගය
 DocType: Announcement,Student,ශිෂ්ය
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,සංවිධානය ඒකකය (අංශය) ස්වාමියා.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,සංවිධානය ඒකකය (අංශය) ස්වාමියා.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,කාමරවලට යන්න
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,යැවීමට පෙර පණිවිඩය ඇතුලත් කරන්න
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,සැපයුම්කරු සඳහා අනුපිටපත්
 DocType: Email Digest,Pending Quotations,විභාග මිල ගණන්
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,පේදුරු-of-Sale විකිණීමට නරඹන්න
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,පේදුරු-of-Sale විකිණීමට නරඹන්න
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,පරීක්ෂණ පරීක්ෂණ මානකරනය.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,අනාරක්ෂිත ණය
 DocType: Cost Center,Cost Center Name,වියදම මධ්යස්ථානය නම
@@ -4638,6 +4726,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,මුළු ගෙවුම් ඒඑම්ටී
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,අකුරු 160 ට වඩා වැඩි පණිවිඩ කිහිපයක් පණිවුඩ බෙදී ඇත
 DocType: Purchase Receipt Item,Received and Accepted,ලැබුණු හා පිළිගත්
+DocType: Hub Settings,Company and Seller Profile,සමාගම සහ විකුණුම්කරුගේ පැතිකඩ
 ,GST Itemised Sales Register,GST අයිතමගත විකුණුම් රෙජිස්ටර්
 ,Serial No Service Contract Expiry,අනු අංකය සේවය කොන්ත්රාත්තුව කල් ඉකුත්
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,ඔබ එම ගිණුම එම අවස්ථාවේ දී ක්රෙඩිට් හා ඩෙබිට් නොහැකි
@@ -4647,10 +4736,11 @@
 DocType: Item,Variant Based On,ප්රභේද්යයක් පදනම් මත
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},පවරා මුළු weightage 100% ක් විය යුතුය. එය {0} වේ
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,ඔබේ සැපයුම්කරුවන්
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,නිවැරදි කරන්න
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,විකුණුම් සාමය සෑදී ලෙස ලොස්ට් ලෙස සිටුවම් කල නොහැක.
 DocType: Request for Quotation Item,Supplier Part No,සැපයුම්කරු අඩ නොමැත
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',කාණ්ඩය තක්සේරු &#39;හෝ&#39; Vaulation හා පූර්ණ &#39;සඳහා වන විට අඩු කර නොහැකි
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,සිට ලැබුණු
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,සිට ලැබුණු
 DocType: Lead,Converted,පරිවර්තනය කරන
 DocType: Item,Has Serial No,අනු අංකය ඇත
 DocType: Employee,Date of Issue,නිකුත් කරන දිනය
@@ -4658,7 +4748,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","අර Buy සැකසුම් අනුව මිලදී ගැනීම Reciept අවශ්ය == &#39;ඔව්&#39; නම් ගැනුම් නිර්මාණය කිරීම සඳහා, පරිශීලක අයිතමය {0} සඳහා පළමු මිලදී ගැනීම රිසිට්පත නිර්මාණය කිරීමට අවශ්ය නම්"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},ෙරෝ # {0}: අයිතමය සඳහා සැපයුම්කරු සකසන්න {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,ෙරෝ {0}: පැය අගය බිංදුවට වඩා වැඩි විය යුතුය.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,වෙබ් අඩවිය රූප {0} අයිතමය අනුයුක්ත {1} සොයාගත නොහැකි
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,වෙබ් අඩවිය රූප {0} අයිතමය අනුයුක්ත {1} සොයාගත නොහැකි
 DocType: Issue,Content Type,අන්තර්ගතයේ වර්ගය
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,පරිගණක
 DocType: Item,List this Item in multiple groups on the website.,එම වෙබ් අඩවිය බහු කණ්ඩායම් ෙමම අයිතමය ලැයිස්තුගත කරන්න.
@@ -4669,14 +4759,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled අයැදුම්පත් ලබා ගන්න
 DocType: Payment Reconciliation,From Invoice Date,ඉන්වොයිසිය දිනය
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,ඔබට ඉදිරිපත් කිරීමට අවසර නැත
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,බිල්පත් මුදල් එක්කෝ පෙරනිමි comapany ගේ මුදල් පක්ෂයක් හෝ ගිණුමක් මුදල සමාන විය යුතුයි
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,බිල්පත් මුදල් එක්කෝ පෙරනිමි comapany ගේ මුදල් පක්ෂයක් හෝ ගිණුමක් මුදල සමාන විය යුතුයි
 DocType: Healthcare Settings,Laboratory Settings,රසායනාගාර සැකසුම්
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,හැකි ඥාතීන් නොවන තබන්න
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,එය කරන්නේ කුමක්ද?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,ගබඩා කිරීමට
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,සියලු ශිෂ්ය ප්රවේශ
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,එය කරන්නේ කුමක්ද?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,ගබඩා කිරීමට
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,සියලු ශිෂ්ය ප්රවේශ
 ,Average Commission Rate,සාමාන්ය කොමිසම අනුපාතිකය
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,&#39;තිබෙනවාද අනු අංකය&#39; නොවන කොටස් අයිතමය සඳහා &#39;ඔව්&#39; විය නොහැකිය
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,&#39;තිබෙනවාද අනු අංකය&#39; නොවන කොටස් අයිතමය සඳහා &#39;ඔව්&#39; විය නොහැකිය
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,තත්ත්වය තෝරන්න
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,පැමිණීම අනාගත දිනයන් සඳහා සලකුණු කල නොහැක
 DocType: Pricing Rule,Pricing Rule Help,මිල ගණන් පාලනය උදවු
@@ -4694,41 +4784,41 @@
 DocType: Item,Customer Code,පාරිභෝගික සංග්රහයේ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},{0} සඳහා උපන් දිනය මතක්
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,පසුගිය සාමය නිසා දින
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,ගිණුමක් සඳහා ඩෙබිට් වූ ශේෂ පත්රය ගිණුමක් විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,ගිණුමක් සඳහා ඩෙබිට් වූ ශේෂ පත්රය ගිණුමක් විය යුතුය
 DocType: Buying Settings,Naming Series,ශ්රේණි අනුප්රාප්තිකයා නම් කිරීම
 DocType: Leave Block List,Leave Block List Name,"අවසරය, වාරණ ලැයිස්තුව නම"
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,රක්ෂණ අරඹන්න දිනය රක්ෂණ අවසාන දිනය වඩා අඩු විය යුතුය
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,කරුණාකර පාසල්&gt; පාසල් සැකසීම් තුළ උපදේශක නාමකරණය සැකසීම
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,කොටස් වත්කම්
 DocType: Timesheet,Production Detail,නිෂ්පාදන විස්තර
+DocType: Restaurant,Active Menu,ක්රියාකාරී මෙනුව
 DocType: Target Detail,Target Qty,ඉලක්ක යවන ලද
 DocType: Shopping Cart Settings,Checkout Settings,ලොව පුරාවටම සැකසුම්
 DocType: Attendance,Present,වර්තමාන
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,සැපයුම් සටහන {0} ඉදිරිපත් නොකළ යුතුය
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,සැපයුම් සටහන {0} ඉදිරිපත් නොකළ යුතුය
 DocType: Notification Control,Sales Invoice Message,විකුණුම් ඉන්වොයිසිය පණිවුඩය
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,ගිණුම {0} වසා වර්ගය වගකීම් / කොටස් ගනුදෙනු විය යුතුය
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},සේවක වැටුප් පුරවා {0} දැනටමත් කාල පත්රය {1} සඳහා නිර්මාණය
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},සේවක වැටුප් පුරවා {0} දැනටමත් කාල පත්රය {1} සඳහා නිර්මාණය
 DocType: Vehicle Log,Odometer,Odometer
 DocType: Sales Order Item,Ordered Qty,නියෝග යවන ලද
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,අයිතමය {0} අක්රීය කර ඇත
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,අයිතමය {0} අක්රීය කර ඇත
 DocType: Stock Settings,Stock Frozen Upto,කොටස් ශීත කළ තුරුත්
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,ද්රව්ය ලේඛණය ඕනෑම කොටස් අයිතමය අඩංගු නොවේ
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,ව්යාපෘති ක්රියාකාරකම් / කටයුත්තක්.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,ද්රව්ය ලේඛණය ඕනෑම කොටස් අයිතමය අඩංගු නොවේ
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,ව්යාපෘති ක්රියාකාරකම් / කටයුත්තක්.
 DocType: Vehicle Log,Refuelling Details,Refuelling විස්තර
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,වැටුප ලංකා අන්තර් බැංකු ගෙවීම් පද්ධතිය උත්පාදනය
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","අදාළ සඳහා {0} ලෙස තෝරා ගන්නේ නම් මිලට ගැනීම, පරීක්ෂා කළ යුතු"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,වට්ටමක් 100 කට වඩා අඩු විය යුතු
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,පසුගිය මිලදී අනුපාතය සොයාගත නොහැකි
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Off ලියන්න ප්රමාණය (සමාගම ව්යවහාර මුදල්)
 DocType: Sales Invoice Timesheet,Billing Hours,බිල්පත් පැය
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,{0} සොයාගත නොහැකි සඳහා පෙරනිමි ද්රව්ය ලේඛණය
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,ෙරෝ # {0}: කරුණාකර සකස් මොහොත ප්රමාණය
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,{0} සොයාගත නොහැකි සඳහා පෙරනිමි ද්රව්ය ලේඛණය
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,ෙරෝ # {0}: කරුණාකර සකස් මොහොත ප්රමාණය
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,භාණ්ඩ ඒවා මෙහි එකතු කරන්න තට්ටු කරන්න
 DocType: Fees,Program Enrollment,වැඩසටහන ඇතුළත්
 DocType: Landed Cost Voucher,Landed Cost Voucher,වියදම වවුචරයක් ගොඩ බස්වන ලදී
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},කරුණාකර {0} සකස්
-DocType: Purchase Invoice,Repeat on Day of Month,මාසික දිනය දා නැවත නැවත
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} අක්රීය ශිෂ්යාවක්
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} අක්රීය ශිෂ්යාවක්
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} අක්රීය ශිෂ්යාවක්
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} අක්රීය ශිෂ්යාවක්
 DocType: Employee,Health Details,සෞඛ්ය තොරතුරු
 DocType: Offer Letter,Offer Letter Terms,ඉල්ලුමට ලිපිය කොන්දේසි
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,ගෙවීම් ඉල්ලීම් යොමු ලියවිල්ලක් අවශ්ය නිර්මාණය කිරීමට
@@ -4737,7 +4827,6 @@
 DocType: Employee External Work History,Salary,වැටුප
 DocType: Serial No,Delivery Document Type,සැපයුම් ලේඛන වර්ගය
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,ඉහත තෝරාගත් නිර්ණායක සඳහා සියලු වැටුප් ස්ලිප් ඉදිරිපත්
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} අයිතම සමමුහුර්ත
 DocType: Sales Order,Partly Delivered,අර්ධ වශයෙන් භාර
 DocType: Email Digest,Receivables,මුදල් ලැබිය
 DocType: Lead Source,Lead Source,ඊයම් ප්රභවය
@@ -4758,9 +4847,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,වයස්ගතවීම රංගේ 2
 DocType: SG Creation Tool Course,Max Strength,මැක්ස් ශක්තිය
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,ද්රව්ය ලේඛණය වෙනුවට
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Delivery Date මත පදනම් අයිතම තෝරන්න
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Delivery Date මත පදනම් අයිතම තෝරන්න
 ,Sales Analytics,විකුණුම් විශ්ලේෂණ
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},ලබා ගත හැකි {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},ලබා ගත හැකි {0}
 ,Prospects Engaged But Not Converted,බලාපොරොත්තු නියැලෙන එහෙත් පරිවර්තනය නොවේ
 ,Prospects Engaged But Not Converted,බලාපොරොත්තු නියැලෙන එහෙත් පරිවර්තනය නොවේ
 DocType: Manufacturing Settings,Manufacturing Settings,නිෂ්පාදන සැකසුම්
@@ -4768,10 +4857,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 ජංගම නොමැත
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,සමාගම මාස්ටර් පෙරනිමි මුදල් ඇතුලත් කරන්න
 DocType: Stock Entry Detail,Stock Entry Detail,කොටස් Entry විස්තර
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,ඩේලි සිහිගැන්වීම්
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,ඩේලි සිහිගැන්වීම්
 DocType: Products Settings,Home Page is Products,මුල් පිටුව නිෂ්පාදන වේ
 ,Asset Depreciation Ledger,වත්කම් ක්ෂය ලේජර
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},{0} සහිත බදු පාලනය ගැටුම්
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},{0} සහිත බදු පාලනය ගැටුම්
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,නව ගිණුම නම
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,", අමු ද්රව්ය පිරිවැය සපයා"
 DocType: Selling Settings,Settings for Selling Module,විකිණීම මොඩියුලය සඳහා සැකසුම්
@@ -4785,8 +4874,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,අයිතමය {0} කොටස් අයිතමය විය යුතුය
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,ප්රගති ගබඩා දී පෙරනිමි වැඩ
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,ගිණුම්කරණ ගනුදෙනු සඳහා පෙරනිමි සැකසුම්.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,කරුණාකර මානව සම්පත්&gt; HR සැකසුම් තුළ සේවක නාමකරණය කිරීමේ පද්ධතිය සැකසීම කරන්න
 DocType: Maintenance Visit,MV,මහා විද්යාලය
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,අපේක්ෂිත දිනය ද්රව්ය ඉල්ලීම දිනය පෙර විය නොහැකි
+DocType: Restaurant,Default Tax Template,පෙරනිමි බදු ආකෘතිය
 DocType: Fees,Student Details,ශිෂ්ය විස්තර
 DocType: Purchase Invoice Item,Stock Qty,කොටස් යවන ලද
 DocType: Employee Loan,Repayment Period in Months,මාස තුළ ආපසු ගෙවීමේ කාලය
@@ -4804,8 +4894,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,අයිතම වෙත යන්න
 DocType: Sales Partner,Partner Type,සහකරු වර්ගය
 DocType: Purchase Taxes and Charges,Actual,සැබෑ
+DocType: Restaurant Menu,Restaurant Manager,ආපනශාලා කළමනාකරු
 DocType: Authorization Rule,Customerwise Discount,Customerwise වට්ටම්
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,කාර්යයන් සඳහා Timesheet.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,කාර්යයන් සඳහා Timesheet.
 DocType: Purchase Invoice,Against Expense Account,ගෙවීමේ ගිණුම් එරෙහිව
 DocType: Production Order,Production Order,නිෂ්පාදන න්යාය
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,ස්ථාපන සටහන {0} දැනටමත් ඉදිරිපත් කර ඇති
@@ -4813,7 +4904,6 @@
 DocType: Quotation Item,Against Docname,Docname එරෙහිව
 DocType: SMS Center,All Employee (Active),සියලු සේවක (ක්රියාකාරී)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,දැන් දැක්ම
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,ඉන්වොයිස් ස්වයංක්රීයව නිර්මානය වනු ඇත විට කාලය තෝරන්න
 DocType: BOM,Raw Material Cost,අමු ද්රව්ය පිරිවැය
 DocType: Item Reorder,Re-Order Level,නැවත සාමය පෙළ
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,භාණ්ඩ ඇතුලත් කරන්න සහ ඔබ නිෂ්පාදන ඇනවුම් මතු හෝ විශ්ලේෂණ සඳහා අමුද්රව්ය බාගත කිරීම සඳහා අවශ්ය සඳහා යවන ලද සැලසුම් කළා.
@@ -4826,24 +4916,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,වර්ගය වාර්තාව අනිවාර්ය වේ
 DocType: Item,Serial Number Series,අනු අංකය ශ්රේණි
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},පොත් ගබඩාව පේළිය කොටස් අයිතමය {0} සඳහා අනිවාර්ය වේ {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,වැඩසටහන් එකතු කරන්න
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,සිල්ලර සහ ෙතොග ෙවළඳ
 DocType: Issue,First Responded On,පළමු වන දින ලෙස ප්රතිචාර දක්වන
 DocType: Website Item Group,Cross Listing of Item in multiple groups,බහු කණ්ඩායම් අයිතමය හරස් ලැයිස්තුගත
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},"මුදල් වර්ෂය ආරම්භය දිනය හා රාජ්ය මූල්ය, වසර අවසාන දිනය වන විටත් මුදල් වර්ෂය {0} තුළ සකසා ඇත"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,යාවත්කාලීන නිශ්කාශනෙය් දිනය
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,භේදය කණ්ඩායම
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,භේදය කණ්ඩායම
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,භේදය කණ්ඩායම
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,භේදය කණ්ඩායම
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,සාර්ථකව සමගි
 DocType: Request for Quotation Supplier,Download PDF,බාගත PDF
 DocType: Production Order,Planned End Date,සැලසුම් අවසානය දිනය
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,කරුණාකර උපලේඛන දිනය ඇතුළත් කරන්න
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,කොහෙද භාණ්ඩ ගබඩා කර ඇත.
 DocType: Request for Quotation,Supplier Detail,සැපයුම්කරු විස්තර
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},සූත්රය හෝ තත්ත්වය දෝෂය: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},සූත්රය හෝ තත්ත්වය දෝෂය: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,ඉන්වොයිස් මුදල
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,මිනුම් දණ්ඩ 100%
 DocType: Attendance,Attendance,පැමිණීම
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,කොටස් අයිතම
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,කොටස් අයිතම
 DocType: BOM,Materials,ද්රව්ය
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","සලකුණු කර නැත නම්, ලැයිස්තුව ඉල්ලුම් කළ යුතු වේ එහිදී එක් එක් දෙපාර්තමේන්තුව වෙත එකතු කිරීමට සිදු වනු ඇත."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,මූලාශ්රය සහ ඉලක්ක ගබඩාව සමාන විය නොහැකි
@@ -4861,6 +4951,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,ශුද්ධ මුළු මත
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Attribute {0} අයිතමය {4} සඳහා {1} {3} යන වැටුප් වර්ධක තුළ {2} දක්වා පරාසය තුළ විය යුතුය වටිනාකමක්
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,පේළියේ ඉලක්ක ගබඩා සංකීර්ණය {0} නිෂ්පාදන න්යාය ලෙස සමාන විය යුතුයි
+DocType: Restaurant Reservation,Waitlisted,බලාගෙන ඉන්න
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,ව්යවහාර මුදල් ෙවනත් මුදල් භාවිතා සටහන් කිරීමෙන් පසුව එය වෙනස් කළ නොහැක
 DocType: Vehicle Service,Clutch Plate,ක්ලච් ප්ලේට්
 DocType: Company,Round Off Account,වටයේ ගිණුම අක්රිය
@@ -4877,7 +4968,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,නව විකුණුම් පුද්ගලයා නම
 DocType: Packing Slip,Gross Weight UOM,දළ බර UOM
 DocType: Delivery Note Item,Against Sales Invoice,විකුණුම් ඉන්වොයිසිය එරෙහිව
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,serialized අයිතමය සඳහා අනුක්රමික අංක ඇතුලත් කරන්න
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,serialized අයිතමය සඳහා අනුක්රමික අංක ඇතුලත් කරන්න
 DocType: Bin,Reserved Qty for Production,නිෂ්පාදන සඳහා ඇවිරිනි යවන ලද
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ඔබ මත පාඨමාලා කණ්ඩායම් ඇති කරමින් කණ්ඩායම සලකා බැලීමට අවශ්ය නැති නම් පරීක්ෂාවෙන් තොරව තබන්න.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ඔබ මත පාඨමාලා කණ්ඩායම් ඇති කරමින් කණ්ඩායම සලකා බැලීමට අවශ්ය නැති නම් පරීක්ෂාවෙන් තොරව තබන්න.
@@ -4889,7 +4980,7 @@
 DocType: Lab Test,Test Group,ටෙස්ට් සමූහය
 DocType: Payment Reconciliation,Receivable / Payable Account,ලැබිය යුතු / ගෙවිය යුතු ගිණුම්
 DocType: Delivery Note Item,Against Sales Order Item,විකුණුම් සාමය අයිතමය එරෙහිව
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},විශේෂණය {0} සඳහා අගය ආරෝපණය සඳහන් කරන්න
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},විශේෂණය {0} සඳහා අගය ආරෝපණය සඳහන් කරන්න
 DocType: Item,Default Warehouse,පෙරනිමි ගබඩාව
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},අයවැය සමූහ ගිණුම {0} එරෙහිව පවරා ගත නොහැකි
 DocType: Healthcare Settings,Patient Registration,රෝගියා ලියාපදිංචිය
@@ -4919,6 +5010,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,විකුණුම් පුද්ගලයෙක්
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,අයවැය සහ වියදම මධ්යස්ථානය
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,ගෙවීමේදී බහුතරයේ පෙරනිමි ආකාරයේ ගෙවීම් කිරීමට අවසර නැත
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,සඳහා
 ,Appointment Analytics,පත්වීම් විශ්ලේෂණය
 DocType: Vehicle Service,Half Yearly,අර්ධ වාර්ෂිකව
 DocType: Lead,Blog Subscriber,බ්ලොග් ග්රාහකයා
@@ -4938,7 +5030,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,quot ගණන්
 ,BOM Stock Report,ද්රව්ය ලේඛණය කොටස් වාර්තාව
 DocType: Stock Reconciliation Item,Quantity Difference,ප්රමාණ වෙනස
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,සැකසුම් වැටුප්
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,සැකසුම් වැටුප්
 DocType: Opportunity Item,Basic Rate,මූලික අනුපාත
 DocType: GL Entry,Credit Amount,ක්රෙඩිට් මුදල
 DocType: Cheque Print Template,Signatory Position,අත්සන් තත්ත්වය
@@ -4952,12 +5044,12 @@
 DocType: Tax Rule,Tax Rule,බදු පාලනය
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,විකුණුම් පාපැදි පුරාම එකම අනුපාත පවත්වා
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,වර්ක්ස්ටේෂන් වැඩ කරන වේලාවන් පිටත කාලය ලඝු-සටහන් සඳහා සැලසුම් කරන්න.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,පෝලිමේ පාරිභෝගිකයන්
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,වෛද්ය {0} වෛද්යවරයාගේ උපලේඛන නොමැත. ශල්ය වෛද්යවරයා එය එකතු කරන්න
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,පෝලිමේ පාරිභෝගිකයන්
 DocType: Student,Nationality,ජාතිය
 ,Items To Be Requested,අයිතම ඉල්ලන කිරීමට
-DocType: Purchase Order,Get Last Purchase Rate,ලබා ගන්න අවසන් මිලදී ගැනීම අනුපාත
 DocType: Company,Company Info,සමාගම තොරතුරු
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,නව පාරිභෝගික තෝරා ගැනීමට හෝ එකතු
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,නව පාරිභෝගික තෝරා ගැනීමට හෝ එකතු
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,වියදම් මධ්යස්ථානය ක වියදමක් ප්රකාශය වෙන්කර ගැනීමට අවශ්ය වේ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),අරමුදල් ඉල්ලුම් පත්රය (වත්කම්)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,මෙය මේ සේවක පැමිණීම මත පදනම් වේ
@@ -4965,6 +5057,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,ඩෙබිට් ගිණුම
 DocType: Fiscal Year,Year Start Date,වසරේ ආරම්භක දිනය
 DocType: Attendance,Employee Name,සේවක නම
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,ආපනශාලා ඇණවුම් සටහන
 DocType: Sales Invoice,Rounded Total (Company Currency),වටකුරු එකතුව (සමාගම ව්යවහාර මුදල්)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,ගිණුම් වර්ගය තෝරා නිසා සමූහ සමාගම සැරසේ නොහැක.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} වෙනස් කර ඇත. නැවුම් කරන්න.
@@ -4975,6 +5068,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,සේවක ප්රතිලාභ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},හැකිළු ප්රමාණය පේළිය {1} තුළ අයිතමය {0} සඳහා ප්රමාණය සමාන විය යුතුය
 DocType: Production Order,Manufactured Qty,නිෂ්පාදනය යවන ලද
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,ඉන්වොයිසිය Created
 DocType: Purchase Receipt Item,Accepted Quantity,පිළිගත් ප්රමාණ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},සේවක {0} හෝ සමාගම සඳහා පෙරනිමි නිවාඩු ලැයිස්තු සකස් කරුණාකර {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} පවතී නැත
@@ -4984,18 +5078,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ෙරෝ නැත {0}: ප්රමාණය වියදම් හිමිකම් {1} එරෙහිව මුදල තෙක් ට වඩා වැඩි විය නොහැක. විභාග මුදල වේ {2}
 DocType: Maintenance Schedule,Schedule,උපෙල්ඛනෙය්
 DocType: Account,Parent Account,මව් ගිණුම
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,ඇත
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,ඇත
 DocType: Quality Inspection Reading,Reading 3,කියවීම 3
 ,Hub,මධ්යස්ථානයක්
 DocType: GL Entry,Voucher Type,වවුචරය වර්ගය
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,මිල ලැයිස්තුව සොයා හෝ ආබාධිත නොවන
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,මිල ලැයිස්තුව සොයා හෝ ආබාධිත නොවන
 DocType: Lab Test,Approved,අනුමත
 DocType: Pricing Rule,Price,මිල
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',{0} &#39;වමේ&#39; ලෙස සකස් කළ යුතු ය මත මුදා සේවක
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',{0} &#39;වමේ&#39; ලෙස සකස් කළ යුතු ය මත මුදා සේවක
+DocType: Hub Settings,Last Sync On,අවසාන සමමුහුර්ත කිරීම
 DocType: Guardian,Guardian,ගාඩියන්
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ඇගයීෙම් {0} ලබා දී දින පරාසයක් තුළ සේවක {1} සඳහා නිර්මාණය
 DocType: Employee,Education,අධ්යාපන
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,ඩෙල්
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,ඩෙල්
 DocType: Selling Settings,Campaign Naming By,ව්යාපාරය විසින් නම් කිරීම
 DocType: Employee,Current Address Is,දැනට පදිංචි ලිපිනය
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,මාසික විකුණුම් ඉලක්කය (
@@ -5010,7 +5105,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,පාඨමාලා කේතය:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,ගෙවීමේ ගිණුම් ඇතුලත් කරන්න
 DocType: Account,Stock,කොටස්
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ෙරෝ # {0}: විමර්ශන ලේඛන වර්ගය මිලදී ගැනීමේ නියෝගයක්, මිලදී ගැනීම ඉන්වොයිසිය හෝ ජර්නල් Entry එකක් විය යුතුය"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ෙරෝ # {0}: විමර්ශන ලේඛන වර්ගය මිලදී ගැනීමේ නියෝගයක්, මිලදී ගැනීම ඉන්වොයිසිය හෝ ජර්නල් Entry එකක් විය යුතුය"
 DocType: Employee,Current Address,වර්තමාන ලිපිනය
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","නිශ්චිත ලෙස නම් අයිතමය තවත් අයිතමය ක ප්රභේද්යයක් කරනවා නම් විස්තර, ප්රතිරූපය, මිල ගණන්, බදු ආදිය සැකිල්ල සිට ස්ථාපනය කරනු ලබන"
 DocType: Serial No,Purchase / Manufacture Details,මිලදී ගැනීම / නිෂ්පාදනය විස්තර
@@ -5041,7 +5136,7 @@
 DocType: Hub Settings,Hub Settings,මධ්යස්ථානයක් සැකසුම්
 DocType: Project,Gross Margin %,දළ ආන්තිකය%
 DocType: BOM,With Operations,මෙහෙයුම් සමග
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,මුල්ය සටහන් ඇතුළත් කිරීම් මේ වන විටත් සමාගම {1} සඳහා මුදල් {0} තුළ සිදු කර ඇත. මුදල් {0} සමග කරුණාකර ලැබිය හෝ ගෙවිය යුතු ගිණුම් තෝරන්න.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,මුල්ය සටහන් ඇතුළත් කිරීම් මේ වන විටත් සමාගම {1} සඳහා මුදල් {0} තුළ සිදු කර ඇත. මුදල් {0} සමග කරුණාකර ලැබිය හෝ ගෙවිය යුතු ගිණුම් තෝරන්න.
 DocType: Asset,Is Existing Asset,දැනට පවතින වත්කම් වේ
 DocType: Salary Detail,Statistical Component,සංඛ්යාන සංරචක
 DocType: Salary Detail,Statistical Component,සංඛ්යාන සංරචක
@@ -5050,13 +5145,14 @@
 DocType: BOM Operation,BOM Operation,ද්රව්ය ලේඛණය මෙහෙයුම
 DocType: Purchase Taxes and Charges,On Previous Row Amount,පසුගිය ෙරෝ මුදල මත
 DocType: Student,Home Address,නිවසේ ලිපිනය
+DocType: Item,Has Expiry Date,කල් ඉකුත්වන දිනය
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,අයිතම විකල්ප සැකසුම්.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,වත්කම් මාරු
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,වත්කම් මාරු
 DocType: POS Profile,POS Profile,POS නරඹන්න
 DocType: Training Event,Event Name,අවස්ථාවට නම
 DocType: Physician,Phone (Office),දුරකථන (කාර්යාල)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,ඇතුළත් කර
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},{0} සඳහා ප්රවේශ
+apps/erpnext/erpnext/hooks.py +147,Admission,ඇතුළත් කර
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},{0} සඳහා ප්රවේශ
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","අයවැය සැකසීම සඳහා යමක සෘතුමය බලපෑම, ඉලක්ක ආදිය"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,විචල්ය නම
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","අයිතමය {0} සැකිලි වේ, කරුණාකර එහි විවිධ එකක් තෝරන්න"
@@ -5065,7 +5161,7 @@
 DocType: Assessment Plan,Room,කාමරය
 DocType: Purchase Order,Advance Paid,උසස් ගෙවුම්
 DocType: Item,Item Tax,අයිතමය බදු
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,සැපයුම්කරු ද්රව්යමය
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,සැපයුම්කරු ද්රව්යමය
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,සුරාබදු ඉන්වොයිසිය
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% වරකට වඩා පෙනී
 DocType: Expense Claim,Employees Email Id,සේවක විද්යුත් අංකය
@@ -5076,32 +5172,30 @@
 DocType: Program,Program Name,වැඩසටහන නම
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,සඳහා බදු හෝ භාර සලකා බලන්න
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,සැබෑ යවන ලද අනිවාර්ය වේ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} වර්තමානයේ {1} සැපයුම් කරුවෙකුගේ කාඩ්පතක් තිබෙන අතර, මෙම සැපයුම්කරුට මිලදී ගැනීමේ ඇණවුම් ගැන සැලකිලිමත් විය යුතුය."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} වර්තමානයේ {1} සැපයුම් කරුවෙකුගේ කාඩ්පතක් තිබෙන අතර, මෙම සැපයුම්කරුට මිලදී ගැනීමේ ඇණවුම් ගැන සැලකිලිමත් විය යුතුය."
 DocType: Employee Loan,Loan Type,ණය වර්ගය
 DocType: Scheduling Tool,Scheduling Tool,අවස මෙවලම
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,ණයවර පත
 DocType: BOM,Item to be manufactured or repacked,අයිතමය නිෂ්පාදිත හෝ repacked කිරීමට
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,කොටස් ගනුදෙනු සඳහා පෙරනිමි සැකසුම්.
-DocType: Purchase Invoice,Next Date,ඊළඟ දිනය
 DocType: Employee Education,Major/Optional Subjects,විශාල / විකල්ප විෂයයන්
 DocType: Sales Invoice Item,Drop Ship,පහත නෞකාව
+DocType: Hub Settings,Suspended,අත්හිටුවන ලදි
 DocType: Training Event,Attendees,සහභාගී
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","මෙහිදී ඔබට මව්, කලත්රයා හා දරුවන් නම හා මිලිටරි වාඩි ලා ගැනීම වැනි පවුලේ තොරතුරු පවත්වා ගැනීමට නොහැකි"
 DocType: Academic Term,Term End Date,කාලීන අවසානය දිනය
-DocType: Hub Settings,Seller Name,විකුණන්නා නම
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),අඩු කිරීමේ බදු හා ගාස්තු (සමාගම ව්යවහාර මුදල්)
 DocType: Item Group,General Settings,සාමාන්ය සැකසුම්
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,ව්යවහාර මුදල් හා ව්යවහාර මුදල් සඳහා සමාන විය නොහැකි
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,උපදේශකයන් එකතු කරන්න
 DocType: Stock Entry,Repack,අනූපම
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,ඔබ ඉදිරියට යෑමට පෙර ස්වරූපයෙන් සුරකින්න යුතුය
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,කරුණාකර මුලින්ම සමාගම තෝරා ගන්න
 DocType: Item Attribute,Numeric Values,සංඛ්යාත්මක අගයන්
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,ලාංඡනය අමුණන්න
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,කොටස් පෙළ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,කොටස් පෙළ
 DocType: Customer,Commission Rate,කොමිසම අනුපාතිකය
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,{1} අතර {0} සඳහා සාධක කාඩ්පත් නිර්මාණය කරන ලදි:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,ප්රභේද්යයක් කරන්න
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,ප්රභේද්යයක් කරන්න
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,දෙපාර්තමේන්තුව විසින් නිවාඩු අයදුම්පත් අවහිර කරයි.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","ගෙවීම් වර්ගය පිළිගන්න එකක් විය යුතුය, වැටුප් හා අභ තර ස්ථ"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,විශ්ලේෂණ
@@ -5116,11 +5210,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,කැපිටල් කොටස්
 DocType: Shopping Cart Settings,Show Public Attachments,රාජ්ය ඇමුණුම් පෙන්වන්න
 DocType: Packing Slip,Package Weight Details,පැකේජය සිරුරේ බර විස්තර
+DocType: Restaurant Reservation,Reservation Time,වෙන් කර ගත හැකි කාලය
 DocType: Payment Gateway Account,Payment Gateway Account,ගෙවීම් ගේට්වේ ගිණුම
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,ගෙවීම් අවසන් කිරීමෙන් පසු තෝරාගත් පිටුවට පරිශීලක වි.
 DocType: Company,Existing Company,දැනට පවතින සමාගම
 DocType: Healthcare Settings,Result Emailed,ප්රතිඵල යවන ලදි
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",සියලු අයිතම-කොටස් නොවන භාණ්ඩ නිසා බදු ප්රවර්ගය &quot;මුළු&quot; ලෙස වෙනස් කර ඇත
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,අයිතම කේතය&gt; අයිතමය කාණ්ඩ&gt; වෙළඳ නාමය
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,කරුණාකර CSV ගොනුවක් තෝරා
 DocType: Student Leave Application,Mark as Present,වර්තමාන ලෙස ලකුණ
 DocType: Supplier Scorecard,Indicator Color,දර්ශක වර්ණය
@@ -5145,11 +5241,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,ශිෂ්ය කණ්ඩායම කරන්න
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,ඉදිරියට ගෙන ඇත
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,ද්රව්ය ලේඛණය සිට අයිතම ලබා ගන්න
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,ද්රව්ය ලේඛණය සිට අයිතම ලබා ගන්න
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ඉදිරියට ඇති කාලය දින
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"ෙරෝ # {0}: ගිය තැන, ශ්රී ලංකා තැපෑල දිනය මිලදී දිනය ලෙස සමාන විය යුතුය {1} වත්කම් {2}"
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"ශිෂ්ය ආයතනයේ නේවාසිකාගාරය පදිංචි, නම් මෙම පරීක්ෂා කරන්න."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,ඉහත වගුවේ විකුණුම් නියෝග ඇතුලත් කරන්න
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,ඉහත වගුවේ විකුණුම් නියෝග ඇතුලත් කරන්න
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,වැටුප් ශ්රී ලංකා අන්තර් බැංකු ගෙවීම් පද්ධතිය ඉදිරිපත් නොවන
 ,Stock Summary,කොටස් සාරාංශය
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,එක් ගබඩාවක් තවත් සම්පතක් මාරු
@@ -5165,5 +5261,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ෙරෝ {0}: හර සටහන ඇති {1} සමග සම්බන්ධ විය නොහැකි
 DocType: Journal Entry,Subscription Section,දායකත්ව අංශය
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,ගිණුම {0} නොපවතියි
+DocType: Training Event,Training Program,පුහුණු වැඩසටහන
 DocType: Account,Cash,මුදල්
 DocType: Employee,Short biography for website and other publications.,වෙබ් අඩවිය සහ අනෙකුත් ප්රකාශන සඳහා කෙටි චරිතාපදානය.
diff --git a/erpnext/translations/sk.csv b/erpnext/translations/sk.csv
index fd1eafb..2e4a0b2 100644
--- a/erpnext/translations/sk.csv
+++ b/erpnext/translations/sk.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Mode Plat
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Registrovať
 DocType: Patient,Divorced,Rozvedený
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Položky již synchronizovat
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Povoliť položky, ktoré sa pridávajú viackrát v transakcii"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Materiál Navštivte {0} před zrušením této záruční reklamaci Zrušit
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Zákaznícke produkty
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Schvaľovatelia priepustiek
 DocType: Sales Partner,Dealer,Dealer
 DocType: Consultation,Investigations,vyšetrovania
+DocType: Restaurant Order Entry,Click Enter To Add,Kliknite na položku Zadat &#39;na pridanie
 DocType: Employee,Rented,Pronajato
 DocType: Purchase Order,PO-,NO-
 DocType: POS Profile,Applicable for User,Použiteľné pre Užívateľa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zastavil výrobu Objednať nemožno zrušiť, uvoľniť ho najprv zrušiť"
 DocType: Vehicle Service,Mileage,Najazdené
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Naozaj chcete zrušiť túto pohľadávku?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Naozaj chcete zrušiť túto pohľadávku?
 DocType: Drug Prescription,Update Schedule,Aktualizovať plán
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Vybrať Predvolené Dodávateľ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Měna je vyžadováno pro Ceníku {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Skontrolovať dostupnosť
 DocType: Job Applicant,Job Applicant,Job Žadatel
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,To je založené na transakciách proti tomuto dodávateľovi. Pozri časovú os nižšie podrobnosti
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Žádné další výsledky.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Právne
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Aktuálny typ daň nemôže byť zahrnutý v cene Položka v riadku {0}
 DocType: Bank Guarantee,Customer,Zákazník
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Exchange Rate musí byť rovnaká ako {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Meno zákazníka
 DocType: Vehicle,Natural Gas,Zemný plyn
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Bankový účet nemôže byť pomenovaný {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Bankový účet nemôže byť pomenovaný {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (nebo skupiny), proti nimž účetní zápisy jsou vyrobeny a stav je veden."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Vynikající pro {0} nemůže být nižší než nula ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Neexistujú žiadne predložené platobné klacky na spracovanie.
 DocType: Manufacturing Settings,Default 10 mins,Predvolené 10 min
 DocType: Leave Type,Leave Type Name,Nechte Typ Jméno
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,ukázať otvorené
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,"Je nevyhnutné, aby sa toto opatrenie vykonalo už dnes samo osebe v súvislosti s vyššie uvedeným opakovaním"
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Řada Aktualizováno Úspěšně
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Odhlásiť sa
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural Journal Entry Vložené
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Neprijaté položky odoslanej objednávky
 DocType: SMS Center,All Supplier Contact,Vše Dodavatel Kontakt
 DocType: Support Settings,Support Settings,nastavenie podporných
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,"Očakávané Dátum ukončenia nemôže byť nižšia, než sa očakávalo dáta začatia"
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,"Očakávané Dátum ukončenia nemôže byť nižšia, než sa očakávalo dáta začatia"
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Riadok # {0}: Cena musí byť rovnaké, ako {1}: {2} ({3} / {4})"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,New Leave Application
 ,Batch Item Expiry Status,Batch Item Zánik Status
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Bank Návrh
 DocType: Mode of Payment Account,Mode of Payment Account,Způsob platby účtu
 DocType: Consultation,Consultation,Konzultácia
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Predaj a vrátenie
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Zobraziť Varianty
 DocType: Academic Term,Academic Term,akademický Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiál
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Péče o zdraví
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Oneskorenie s platbou (dni)
 DocType: Lab Prescription,Lab Prescription,Lab Prescription
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Zoradiť podľa ceny
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,service Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Sériové číslo: {0} už je uvedené vo faktúre predaja: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Faktúra
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Sériové číslo: {0} už je uvedené vo faktúre predaja: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Faktúra
 DocType: Maintenance Schedule Item,Periodicity,Periodicita
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiškálny rok {0} je vyžadovaná
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrana
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Řádek # {0}:
 DocType: Timesheet,Total Costing Amount,Celková kalkulácie Čiastka
 DocType: Delivery Note,Vehicle No,Vozidle
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,"Prosím, vyberte cenník"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,"Prosím, vyberte cenník"
 DocType: Accounts Settings,Currency Exchange Settings,Nastavenia výmeny meny
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Riadok # {0}: Platba dokument je potrebné na dokončenie trasaction
 DocType: Production Order Operation,Work In Progress,Work in Progress
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,"Prosím, vyberte dátum"
 DocType: Employee,Holiday List,Dovolená Seznam
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,"Prosím, nastavte názov inštruktora v škole&gt; Školské nastavenia"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Účtovník
+DocType: Hub Settings,Selling Price List,Cenník predaja
 DocType: Patient,Tobacco Current Use,Súčasné používanie tabaku
 DocType: Cost Center,Stock User,Používateľ skladu
 DocType: Company,Phone No,Telefónne číslo
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Plány kurzu vytvoril:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Nový {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Nový {0}: # {1}
 ,Sales Partners Commission,Obchodní partneři Komise
 DocType: Purchase Invoice,Rounding Adjustment,Nastavenie zaokrúhľovania
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Skratka nesmie mať viac ako 5 znakov
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Odkaz: {0}, Kód položky: {1} a zákazník: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kg
-DocType: Student Log,Log,log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Otevření o zaměstnání.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Výsledok bol odoslaný
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Výsledok bol odoslaný
 DocType: Item Attribute,Increment,Prírastok
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Časové rozpätie
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Vyberte sklad ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Ženatý
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Nepovolené pre {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Získať predmety z
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nie sú uvedené žiadne položky
 DocType: Payment Reconciliation,Reconcile,Srovnat
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Penzijní fondy
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Vedľa Odpisy dátum nemôže byť pred nákupom Dátum
 DocType: Consultation,Consultation Date,Dátum konzultácie
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Zoznam produktov a objavovanie pre používateľov ERPNext
 DocType: SMS Center,All Sales Person,Všichni obchodní zástupci
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Mesačný Distribúcia ** umožňuje distribuovať Rozpočet / Target celé mesiace, ak máte sezónnosti vo vašej firme."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,nenájdený položiek
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Plat Štruktúra Chýbajúce
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,nenájdený položiek
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Plat Štruktúra Chýbajúce
 DocType: Lead,Person Name,Osoba Meno
 DocType: Sales Invoice Item,Sales Invoice Item,Prodejní faktuře položka
 DocType: Account,Credit,Úvěr
 DocType: POS Profile,Write Off Cost Center,Odepsat nákladové středisko
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",napríklad &quot;Základná škola&quot; alebo &quot;univerzita&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",napríklad &quot;Základná škola&quot; alebo &quot;univerzita&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Reporty o zásobách
 DocType: Warehouse,Warehouse Detail,Sklad Detail
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Úvěrový limit byla překročena o zákazníka {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Termínovaný Dátum ukončenia nemôže byť neskôr ako v roku Dátum ukončenia akademického roka, ku ktorému termín je spojená (akademický rok {}). Opravte dáta a skúste to znova."
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Je Fixed Asset&quot; nemôže byť bez povšimnutia, pretože existuje Asset záznam proti položke"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Je Fixed Asset&quot; nemôže byť bez povšimnutia, pretože existuje Asset záznam proti položke"
 DocType: Vehicle Service,Brake Oil,Brake Oil
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Zákaznícka skupina&gt; Územie
 DocType: Tax Rule,Tax Type,Typ dane
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Zdaniteľná čiastka
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Nejste oprávněni přidávat nebo aktualizovat údaje před {0}
 DocType: BOM,Item Image (if not slideshow),Item Image (ne-li slideshow)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Zákazník existuje se stejným názvem
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hodina Rate / 60) * Skutočná Prevádzková doba
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Riadok # {0}: Typ referenčného dokumentu musí byť jeden z nárokov na výdaj alebo denníka
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,select BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Riadok # {0}: Typ referenčného dokumentu musí byť jeden z nárokov na výdaj alebo denníka
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,select BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Náklady na dodávaných výrobků
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Dovolenka na {0} nie je medzi Dátum od a do dnešného dňa
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,Pôžička zamestnanca
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Aktivita Log:
 DocType: Fee Schedule,Send Payment Request Email,Poslať e-mail s požiadavkou na platbu
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Bod {0} neexistuje v systému nebo vypršela
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Bod {0} neexistuje v systému nebo vypršela
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nemovitost
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Výpis z účtu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutické
@@ -210,18 +213,23 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Záznam importu
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Vytiahnite Materiál Žiadosť typu Výroba na základe vyššie uvedených kritérií
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Úspešné zrušenie registrácie.
 DocType: Training Result Employee,Grade,stupeň
+DocType: Restaurant Table,No of Seats,Počet sedadiel
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Ak chcete pridať dynamický objekt, použite značky ako napríklad <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Dodáva sa podľa dodávateľa
 DocType: SMS Center,All Contact,Vše Kontakt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Zákazková výroba už vytvorili u všetkých položiek s BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Zákazková výroba už vytvorili u všetkých položiek s BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Ročné Plat
 DocType: Daily Work Summary,Daily Work Summary,Denná práca Súhrn
 DocType: Period Closing Voucher,Closing Fiscal Year,Uzavření fiskálního roku
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} je zmrazený
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Vyberte existujúci spoločnosti pre vytváranie účtový rozvrh
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} je zmrazený
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Vyberte existujúci spoločnosti pre vytváranie účtový rozvrh
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Náklady na skladovanie
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Vyberte položku Target Warehouse
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Vyberte položku Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Vyberte položku Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Vyberte položku Target Warehouse
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Prosím, zadajte Preferred Kontaktný e-mail"
 DocType: Program Enrollment,School Bus,Školský autobus
 DocType: Journal Entry,Contra Entry,Contra Entry
@@ -239,9 +247,10 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Stáhněte si šablony, vyplňte potřebné údaje a přiložte upravený soubor.
  Všechny termíny a zaměstnanec kombinaci ve zvoleném období přijde v šabloně, se stávajícími evidence docházky"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,"Bod {0} není aktivní, nebo byl dosažen konec života"
+DocType: Student Admission Program,Minimum Age,Minimálny vek
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Príklad: Základné Mathematics
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Nastavenie modulu HR
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Nastavenie modulu HR
 DocType: SMS Center,SMS Center,SMS centrum
 DocType: Sales Invoice,Change Amount,zmena Suma
 DocType: BOM Update Tool,New BOM,New BOM
@@ -251,7 +260,7 @@
 DocType: Lead,Request Type,Typ požadavku
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Vytvoriť zamestnanca
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Vysílání
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Pridať izby
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Nastavovací režim POS (Online / Offline)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Provedení
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Podrobnosti o prováděných operací.
 DocType: Serial No,Maintenance Status,Status Maintenance
@@ -274,6 +283,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Ceník musí být použitelný pro nákup nebo prodej
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Datum Instalace nemůže být před datem dodání pro bod {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Zľava z cenníkovej ceny (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,biochémie
 DocType: Offer Letter,Select Terms and Conditions,Vyberte Podmienky
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,limitu
 DocType: Production Planning Tool,Sales Orders,Predajné objednávky
@@ -308,15 +318,15 @@
 DocType: Sales Partner,Reseller,Reseller
 DocType: Codification Table,Medical Code,Zdravotný zákonník
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Ak je zaškrtnuté, bude zahŕňať non-skladových položiek v materiáli požiadavky."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,"Prosím, zadajte spoločnosť"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,"Prosím, zadajte spoločnosť"
 DocType: Delivery Note Item,Against Sales Invoice Item,Proti položce vydané faktury
 ,Production Orders in Progress,Zakázka na výrobu v Progress
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Čistý peňažný tok z financovania
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","Miestne úložisko je plná, nezachránil"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","Miestne úložisko je plná, nezachránil"
 DocType: Lead,Address & Contact,Adresa a kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Pridať nevyužité listy z predchádzajúcich prídelov
 DocType: Sales Partner,Partner website,webové stránky Partner
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Pridať položku
+DocType: Restaurant Order Entry,Add Item,Pridať položku
 DocType: Lab Test,Custom Result,Vlastný výsledok
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Meno kontaktu
 DocType: Course Assessment Criteria,Course Assessment Criteria,Hodnotiace kritériá kurz
@@ -329,7 +339,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Žádost o koupi.
 DocType: Lab Test,Submitted Date,Dátum odoslania
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,To je založené na časových výkazov vytvorených proti tomuto projektu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Čistý Pay nemôže byť nižšia ako 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Čistý Pay nemôže byť nižšia ako 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Ak chcete zastaviť odosielanie upozornení na opakované chyby zo systému, v odberu sme skontrolovali pole Zakázané"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Pouze vybraný Leave schvalovač může podat této dovolené aplikaci
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Uvolnění Datum musí být větší než Datum spojování
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Listy za rok
@@ -338,9 +349,10 @@
 DocType: Email Digest,Profit & Loss,Zisk & Strata
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,liter
 DocType: Task,Total Costing Amount (via Time Sheet),Celková kalkulácie Čiastka (cez Time Sheet)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Nastavte prosím študentov pod študentskými skupinami
 DocType: Item Website Specification,Item Website Specification,Položka webových stránek Specifikace
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Nechte Blokováno
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,bankový Príspevky
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Roční
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Inventúrna položka
@@ -349,7 +361,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Študent Group Creation Tool ihrisko
 DocType: Lead,Do Not Contact,Nekontaktujte
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,"Ľudia, ktorí vyučujú vo vašej organizácii"
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Unikátní ID pro sledování všech opakující faktury. To je generován na odeslat.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimální objednávka Množství
 DocType: Pricing Rule,Supplier Type,Dodavatel Type
@@ -359,17 +370,19 @@
 DocType: Item,Publish in Hub,Publikovat v Hub
 DocType: Student Admission,Student Admission,študent Vstupné
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Položka {0} je zrušená
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Požiadavka na materiál
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Položka {0} je zrušená
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Požiadavka na materiál
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizace Výprodej Datum
 DocType: Item,Purchase Details,Nákupné podrobnosti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Položka {0} nebol nájdený v &quot;suroviny dodanej&quot; tabuľky v objednávke {1}
 DocType: Patient Relation,Relation,Vztah
 DocType: Shipping Rule,Worldwide Shipping,Celosvetovo doprava
 DocType: Patient Relation,Mother,matka
+DocType: Restaurant Reservation,Reservation End Time,Čas ukončenia rezervácie
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Potvrzené objednávky od zákazníků.
 DocType: Purchase Receipt Item,Rejected Quantity,Zamítnuto Množství
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Žiadosť o platbu {0} bola vytvorená
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Žiadosť o platbu {0} bola vytvorená
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Nízka citlivosť
 DocType: Notification Control,Notification Control,Oznámení Control
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,"Potvrďte, prosím, po dokončení školenia"
 DocType: Lead,Suggestions,Návrhy
@@ -389,7 +402,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,"E-maily výplatnej páske, aby zamestnanci na základe prednostného e-mailu vybraného v zamestnaneckých"
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,První Leave schvalovač v seznamu bude nastaven jako výchozí Leave schvalujícího
 DocType: Tax Rule,Shipping County,Okres dodania
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Učenie
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Učenie
 DocType: Asset,Next Depreciation Date,Vedľa Odpisy Dátum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Náklady na činnosť na jedného zamestnanca
 DocType: Accounts Settings,Settings for Accounts,Nastavenie Účtovníctva
@@ -400,13 +413,13 @@
 DocType: Item,Synced With Hub,Synchronizovány Hub
 DocType: Vehicle,Fleet Manager,fleet manager
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Riadok # {0}: {1} nemôže byť negatívne na {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Zlé Heslo
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Zlé Heslo
 DocType: Item,Variant Of,Varianta
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"Dokončené množství nemůže být větší než ""Množství do výroby"""
 DocType: Period Closing Voucher,Closing Account Head,Závěrečný účet hlava
 DocType: Employee,External Work History,Vnější práce History
 DocType: Physician,Time per Appointment,Čas za schôdzku
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Kruhové Referenčné Chyba
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Kruhové Referenčné Chyba
 DocType: Appointment Type,Is Inpatient,Je hospitalizovaný
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Meno Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Ve slovech (export) budou viditelné, jakmile uložíte doručení poznámku."
@@ -415,19 +428,18 @@
 DocType: Lead,Industry,Průmysl
 DocType: Employee,Job Profile,Job Profile
 DocType: BOM Item,Rate & Amount,Sadzba a čiastka
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosím, nastavte číselnú sériu pre účasť v programe Setup&gt; Numbering Series"
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Toto je založené na transakciách s touto spoločnosťou. Viac informácií nájdete v časovej osi nižšie
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Upozornit e-mailem na tvorbu automatických Materiál Poptávka
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,odolný
 DocType: Journal Entry,Multi Currency,Viac mien
 DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktúry
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Zákaznícka skupina&gt; Územie
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Dodací list
 DocType: Consultation,Encounter Impression,Zaznamenajte zobrazenie
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Nastavenie Dane
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Náklady predaných aktív
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,"Vstup Platba byla změněna poté, co ji vytáhl. Prosím, vytáhněte ji znovu."
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} vložené dvakrát v Daňovej Položke
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Zhrnutie pre tento týždeň a prebiehajúcim činnostiam
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} vložené dvakrát v Daňovej Položke
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Zhrnutie pre tento týždeň a prebiehajúcim činnostiam
 DocType: Student Applicant,Admitted,"pripustil,"
 DocType: Workstation,Rent Cost,Rent Cost
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Suma po odpisoch
@@ -442,36 +454,35 @@
 DocType: Shipping Rule,Valid for Countries,"Platí pre krajiny,"
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Tento bod je šablona a nemůže být použit v transakcích. Atributy položky budou zkopírovány do variant, pokud je nastaveno ""No Copy"""
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Celková objednávka Zvážil
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Označení zaměstnanců (např CEO, ředitel atd.)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Označení zaměstnanců (např CEO, ředitel atd.)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Sazba, za kterou je zákazník měny převeden na zákazníka základní měny"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Samozrejme Plánovanie Tool
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Riadok # {0}: faktúry nemožno vykonať voči existujúcemu aktívu {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Urgentné] Chyba pri vytváraní opakujúcich sa% s pre% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Urgentné] Chyba pri vytváraní opakujúcich sa% s pre% s
 DocType: Item Tax,Tax Rate,Sadzba dane
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} už pridelené pre zamestnancov {1} na dobu {2} až {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Vyberte položku
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Vyberte položku
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"Row # {0}: Batch No musí byť rovnaké, ako {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Previesť na non-Group
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Batch (lot) položky.
 DocType: C-Form Invoice Detail,Invoice Date,Dátum fakturácie
 DocType: GL Entry,Debit Amount,Debetné Suma
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Tam môže byť len 1 účet na spoločnosti v {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,"Prosím, viz příloha"
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Tam môže byť len 1 účet na spoločnosti v {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,"Prosím, viz příloha"
 DocType: Purchase Order,% Received,% Prijaté
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Vytvorenie skupiny študentov
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Nastavenie programu je už dokončené !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Nastavenie programu je už dokončené !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Výška úverovej poznámky
 DocType: Setup Progress Action,Action Document,Akčný dokument
 ,Finished Goods,Hotové zboží
 DocType: Delivery Note,Instructions,Instrukce
 DocType: Quality Inspection,Inspected By,Zkontrolován
 DocType: Maintenance Visit,Maintenance Type,Typ Maintenance
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} nie je zapísaný do kurzu {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položiek&gt; Značka
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} nie je zapísaný do kurzu {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Pořadové číslo {0} není součástí dodávky Poznámka: {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Pridať položky
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Pridať položky
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Položka Kontrola jakosti Parametr
 DocType: Leave Application,Leave Approver Name,Meno schvaľovateľa priepustky
 DocType: Depreciation Schedule,Schedule Date,Plán Datum
@@ -493,7 +504,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Pracovní doba
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Změnit výchozí / aktuální pořadové číslo existujícího série.
 DocType: Dosage Strength,Strength,pevnosť
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Vytvoriť nový zákazník
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Vytvoriť nový zákazník
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Je-li více pravidla pro tvorbu cen i nadále přednost, jsou uživatelé vyzváni k nastavení priority pro vyřešení konfliktu."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,vytvorenie objednávok
 ,Purchase Register,Nákup Register
@@ -512,7 +523,7 @@
 DocType: Lab Test Template,Single,Slobodný/á
 DocType: Salary Slip,Total Loan Repayment,celkové splátky
 DocType: Account,Cost of Goods Sold,Náklady na prodej zboží
-DocType: Purchase Invoice,Yearly,Ročne
+DocType: Subscription,Yearly,Ročne
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,"Prosím, zadajte nákladové stredisko"
 DocType: Drug Prescription,Dosage,dávkovanie
 DocType: Journal Entry Account,Sales Order,Predajné objednávky
@@ -543,7 +554,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globální nastavení pro všechny výrobní procesy.
 DocType: Accounts Settings,Accounts Frozen Upto,Účty Frozen aľ
 DocType: SMS Log,Sent On,Poslané na
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Atribút {0} vybraný niekoľkokrát v atribútoch tabuľke
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Atribút {0} vybraný niekoľkokrát v atribútoch tabuľke
 DocType: HR Settings,Employee record is created using selected field. ,Zamestnanecký záznam sa vytvorí použitím vybraného poľa
 DocType: Sales Order,Not Applicable,Nehodí se
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday master.
@@ -569,13 +580,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Celkom listy pridelené je povinné
 DocType: Patient,AB Positive,AB Pozitívny
 DocType: Job Opening,Description of a Job Opening,Popis jednoho volných pozic
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Nevybavené aktivity pre dnešok
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Nevybavené aktivity pre dnešok
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Účast rekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Plat komponentov pre mzdy časového rozvrhu.
 DocType: Sales Order Item,Used for Production Plan,Používá se pro výrobní plán
 DocType: Employee Loan,Total Payment,celkové platby
 DocType: Manufacturing Settings,Time Between Operations (in mins),Doba medzi operáciou (v min)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,"{0} {1} je zrušená, takže akciu nemožno dokončiť"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,"{0} {1} je zrušená, takže akciu nemožno dokončiť"
 DocType: Customer,Buyer of Goods and Services.,Kupující zboží a služeb.
 DocType: Journal Entry,Accounts Payable,Účty za úplatu
 DocType: Patient,Allergies,alergie
@@ -587,23 +598,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Upozornenie na nákupné objednávky
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,"Vypíšte zopár svojich zákazníkov. Môžu to byť organizácie, ale aj jednotlivci."
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Dosť Časti vybudovať
+DocType: POS Profile User,POS Profile User,Používateľ profilu POS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Přímý příjmů
 DocType: Patient Appointment,Date TIme,Dátum Čas
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Nelze filtrovat na základě účtu, pokud seskupeny podle účtu"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Správní ředitel
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Vyberte možnosť Kurz
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Vyberte možnosť Kurz
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Vyberte možnosť Kurz
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Vyberte možnosť Kurz
 DocType: Codification Table,Codification Table,Kodifikačná tabuľka
 DocType: Timesheet Detail,Hrs,hod
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,"Prosím, vyberte spoločnosť"
 DocType: Stock Entry Detail,Difference Account,Rozdíl účtu
 DocType: Purchase Invoice,Supplier GSTIN,Dodávateľ GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Nedá zatvoriť úloha, ako jeho závislý úloha {0} nie je uzavretý."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,"Prosím, zadejte sklad, který bude materiál žádosti předložené"
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Nedá zatvoriť úloha, ako jeho závislý úloha {0} nie je uzavretý."
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Prosím, zadejte sklad, který bude materiál žádosti předložené"
 DocType: Production Order,Additional Operating Cost,Další provozní náklady
 DocType: Lab Test Template,Lab Routine,Lab Rutine
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
 DocType: Shipping Rule,Net Weight,Hmotnost
 DocType: Employee,Emergency Phone,Nouzový telefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,kúpiť
@@ -614,7 +626,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Definujte stupeň pre prah 0%
 DocType: Sales Order,To Deliver,Dodať
 DocType: Purchase Invoice Item,Item,Položka
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Sériovej žiadna položka nemôže byť zlomkom
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Vysoká citlivosť
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Sériovej žiadna položka nemôže byť zlomkom
 DocType: Journal Entry,Difference (Dr - Cr),Rozdíl (Dr - Cr)
 DocType: Account,Profit and Loss,Zisk a strata
 DocType: Patient,Risk Factors,Rizikové faktory
@@ -623,7 +636,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Správa Subdodávky
 DocType: Vital Signs,Body Temperature,Teplota tela
 DocType: Project,Project will be accessible on the website to these users,Projekt bude k dispozícii na webových stránkach k týmto užívateľom
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Definujte typ projektu.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Definujte typ projektu.
 DocType: Supplier Scorecard,Weighting Function,Funkcia váženia
 DocType: Physician,OP Consulting Charge,OP Poradenstvo Charge
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Nastavte svoje
@@ -637,7 +650,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Prírastok nemôže byť 0
 DocType: Production Planning Tool,Material Requirement,Materiál Požadavek
 DocType: Company,Delete Company Transactions,Zmazať transakcie spoločnosti
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Referenčné číslo a referenčný dátum je povinný pre bankové transakcie
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Referenčné číslo a referenčný dátum je povinný pre bankové transakcie
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Přidat / Upravit daní a poplatků
 DocType: Payment Entry Reference,Supplier Invoice No,Dodávateľská faktúra č
 DocType: Territory,For reference,Pro srovnání
@@ -645,12 +658,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Nemožno odstrániť Poradové číslo {0}, ktorý sa používa na sklade transakciách"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Uzavření (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Ahoj
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Posunúť položku
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Posunúť položku
 DocType: Serial No,Warranty Period (Days),Záruční doba (dny)
 DocType: Installation Note Item,Installation Note Item,Poznámka k instalaci bod
 DocType: Production Plan Item,Pending Qty,Čakajúci Množstvo
 DocType: Budget,Ignore,Ignorovat
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} nie je aktívny
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} nie je aktívny
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Skontrolujte nastavenie rozmery pre tlač
 DocType: Salary Slip,Salary Slip Timesheet,Plat Slip časový rozvrh
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dodavatel Warehouse povinné pro subdodavatelskou doklad o zakoupení
@@ -659,7 +672,7 @@
 DocType: Pricing Rule,Sales Partner,Partner predaja
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Všetky hodnotiace karty dodávateľa.
 DocType: Buying Settings,Purchase Receipt Required,Příjmka je vyžadována
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Ocenenie Rate je povinné, ak zadaná počiatočným stavom zásob"
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,"Ocenenie Rate je povinné, ak zadaná počiatočným stavom zásob"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nalezené v tabulce faktury Žádné záznamy
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Vyberte první společnost a Party Typ
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Finanční / Účetní rok.
@@ -696,7 +709,7 @@
 DocType: Quotation,Quotation To,Ponuka k
 DocType: Lead,Middle Income,Středními příjmy
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Otvor (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Východzí merná jednotka bodu {0} nemôže byť zmenená priamo, pretože ste už nejaké transakcie (y) s iným nerozpustených. Budete musieť vytvoriť novú položku použiť iný predvolený UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Východzí merná jednotka bodu {0} nemôže byť zmenená priamo, pretože ste už nejaké transakcie (y) s iným nerozpustených. Budete musieť vytvoriť novú položku použiť iný predvolený UOM."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Přidělená částka nemůže být záporná
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Nastavte spoločnosť
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Nastavte spoločnosť
@@ -711,6 +724,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,"Vybrať Platobný účet, aby Bank Entry"
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Vytvoriť Zamestnanecké záznamy pre správu listy, vyhlásenia o výdavkoch a miezd"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Predpísané obdobie
+DocType: Restaurant Reservation,Restaurant Reservation,Rezervácia reštaurácie
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Návrh Psaní
 DocType: Payment Entry Deduction,Payment Entry Deduction,Platba Vstup dedukcie
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Ďalšia predaja osoba {0} existuje s rovnakým id zamestnanca
@@ -718,7 +732,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Masters
 DocType: Assessment Plan,Maximum Assessment Score,Maximálne skóre Assessment
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Transakčné Data aktualizácie Bank
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Time Tracking
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Time Tracking
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,DUPLIKÁT PRE TRANSPORTER
 DocType: Fiscal Year Company,Fiscal Year Company,Spoločnosť pre fiškálny rok
 DocType: Packing Slip Item,DN Detail,DN Detail
@@ -727,8 +741,9 @@
 DocType: Batch,Batch Description,Popis Šarže
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Vytváranie študentských skupín
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Vytváranie študentských skupín
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Platobná brána účet nevytvorili, prosím, vytvorte ručne."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Platobná brána účet nevytvorili, prosím, vytvorte ručne."
 DocType: Supplier Scorecard,Per Year,Za rok
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Nie je oprávnený na prijatie do tohto programu podľa DOB
 DocType: Sales Invoice,Sales Taxes and Charges,Dane z predaja a poplatky
 DocType: Employee,Organization Profile,Profil organizace
 DocType: Vital Signs,Height (In Meter),Výška (v metre)
@@ -764,7 +779,7 @@
 DocType: Student Batch Name,Batch Name,Názov šarže
 DocType: Fee Validity,Max number of visit,Maximálny počet návštev
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Harmonogramu vytvorenia:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,zapísať
 DocType: GST Settings,GST Settings,Nastavenia GST
 DocType: Selling Settings,Customer Naming By,Zákazník Pojmenování By
@@ -796,16 +811,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Přistál nákladů daně a poplatky
 DocType: Production Order Operation,Actual Start Time,Skutečný čas začátku
 DocType: BOM Operation,Operation Time,Provozní doba
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Skončiť
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Skončiť
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Základ
 DocType: Timesheet,Total Billed Hours,Celkom Predpísané Hodiny
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Odepsat Částka
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Odepsat Částka
 DocType: Leave Block List Allow,Allow User,Umožňuje uživateli
 DocType: Journal Entry,Bill No,Bill No
 DocType: Company,Gain/Loss Account on Asset Disposal,Zisk / straty na majetku likvidáciu
 DocType: Vehicle Log,Service Details,Podrobnosti o službe
 DocType: Vehicle Log,Service Details,Podrobnosti o službe
-DocType: Purchase Invoice,Quarterly,Čtvrtletně
+DocType: Subscription,Quarterly,Čtvrtletně
 DocType: Lab Test Template,Grouped,zoskupené
 DocType: Selling Settings,Delivery Note Required,Dodací list povinný
 DocType: Bank Guarantee,Bank Guarantee Number,Číslo bankovej záruky
@@ -815,12 +830,12 @@
 DocType: Student Attendance,Student Attendance,študent Účasť
 DocType: Sales Invoice Timesheet,Time Sheet,Časový rozvrh
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,So spätným suroviny na základe
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,"Prosím, zadejte podrobnosti položky"
 DocType: Interest,Interest,záujem
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Predpredaj
 DocType: Purchase Receipt,Other Details,Ďalšie podrobnosti
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Dodávateľ
 DocType: Lab Test,Test Template,Šablóna testu
+DocType: Restaurant Order Entry Item,Served,slúžil
 DocType: Account,Accounts,Účty
 DocType: Vehicle,Odometer Value (Last),Hodnota počítadla kilometrov (Last)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Šablóny kritérií kritérií pre dodávateľa.
@@ -832,25 +847,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Preview výplatnej páske
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Účet {0} bol zadaný viackrát
 DocType: Account,Expenses Included In Valuation,Náklady ceně oceňování
-DocType: Hub Settings,Seller City,Prodejce City
 ,Absent Student Report,Absent Študent Report
 DocType: Email Digest,Next email will be sent on:,Další e-mail bude odeslán dne:
 DocType: Offer Letter Term,Offer Letter Term,Ponuka Letter Term
 DocType: Supplier Scorecard,Per Week,Za týždeň
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Položka má varianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Položka má varianty.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Celkový počet študentov
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Položka {0} nebyl nalezen
 DocType: Bin,Stock Value,Hodnota na zásobách
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,Záznamy poplatkov budú vytvorené na pozadí. V prípade akýchkoľvek chýb sa chybové hlásenie aktualizuje v Plán.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Spoločnosť {0} neexistuje
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} má platnosť do {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} má platnosť do {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Tree Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Množství spotřebované na jednotku
 DocType: Serial No,Warranty Expiry Date,Záruka Datum vypršení platnosti
 DocType: Material Request Item,Quantity and Warehouse,Množstvo a sklad
+DocType: Hub Settings,Unregister,odregistrovať
 DocType: Sales Invoice,Commission Rate (%),Výška provízie (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Vyberte program
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Vyberte program
 DocType: Project,Estimated Cost,odhadované náklady
 DocType: Purchase Order,Link to material requests,Odkaz na materiálnych požiadaviek
+DocType: Hub Settings,Publish,publikovať
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
 DocType: Journal Entry,Credit Card Entry,Vstup Kreditní karta
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Spoločnosť a účty
@@ -861,13 +878,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Close Opportunity po niekoľkých dňoch
 ,Reserved,Rezervováno
 DocType: Purchase Order,Supply Raw Materials,Dodávok surovín
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Datum, kdy bude vygenerován příští faktury. To je generován na odeslat."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Oběžná aktiva
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} nie je skladová položka
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',Zdieľajte svoje pripomienky k tréningu kliknutím na &quot;Odborná pripomienka&quot; a potom na &quot;Nové&quot;
 DocType: Mode of Payment Account,Default Account,Výchozí účet
 DocType: Payment Entry,Received Amount (Company Currency),Prijaté Suma (Company mena)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,Iniciatíva musí byť nastavená ak je Príležitosť vytváraná z Iniciatívy
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,Iniciatíva musí byť nastavená ak je Príležitosť vytváraná z Iniciatívy
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Prosím, vyberte týdenní off den"
 DocType: Patient,O Negative,O Negatívny
 DocType: Production Order Operation,Planned End Time,Plánované End Time
@@ -883,10 +899,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Příležitost Z
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Měsíční plat prohlášení.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Pridať spoločnosť
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Riadok {0}: {1} Sériové čísla vyžadované pre položku {2}. Poskytli ste {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Riadok {0}: {1} Sériové čísla vyžadované pre položku {2}. Poskytli ste {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Vyberte tabuľku
 DocType: BOM,Website Specifications,Webových stránek Specifikace
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} je neplatná e-mailová adresa v priečinku &quot;Príjemcovia&quot;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} je neplatná e-mailová adresa v priečinku &quot;Príjemcovia&quot;
 DocType: Special Test Items,Particulars,podrobnosti
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiotikum.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Od {0} typu {1}
@@ -894,11 +910,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Viac Cena pravidlá existuje u rovnakých kritérií, prosím vyriešiť konflikt tým, že priradí prioritu. Cena Pravidlá: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nelze deaktivovat nebo zrušit BOM, jak to souvisí s ostatními kusovníky"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nelze deaktivovat nebo zrušit BOM, jak to souvisí s ostatními kusovníky"
 DocType: Opportunity,Maintenance,Údržba
 DocType: Item Attribute Value,Item Attribute Value,Položka Hodnota atributu
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Predajné kampane
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,urobiť timesheet
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,urobiť timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -955,12 +971,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,"Prosím, najprv zadajte položku"
 DocType: Account,Liability,Odpovědnost
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionovaná Čiastka nemôže byť väčšia ako reklamácia Suma v riadku {0}.
+DocType: Salary Detail,Do not include in total,Nezaradenie celkom
 DocType: Company,Default Cost of Goods Sold Account,Východiskové Náklady na predaný tovar účte
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Nie je zvolený cenník
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Nie je zvolený cenník
 DocType: Employee,Family Background,Rodinné poměry
 DocType: Request for Quotation Supplier,Send Email,Odoslať email
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Varovanie: Neplatná Príloha {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Nemáte oprávnenie
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Varovanie: Neplatná Príloha {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Nemáte oprávnenie
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Požadovaná citácia
 DocType: Vital Signs,Heart Rate / Pulse,Srdcová frekvencia / pulz
 DocType: Company,Default Bank Account,Prednastavený Bankový účet
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Ak chcete filtrovať na základe Party, vyberte typ Party prvý"
@@ -988,12 +1006,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Položka Row {idx}: {typ_dokumentu} {} DOCNAME neexistuje v predchádzajúcom &#39;{typ_dokumentu}&#39; tabuľka
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Harmonogramu {0} je už dokončená alebo zrušená
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,žiadne úlohy
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den měsíce, ve kterém auto faktura bude generován například 05, 28 atd"
 DocType: Item Variant Settings,Copy Fields to Variant,Kopírovať polia na variant
 DocType: Asset,Opening Accumulated Depreciation,otvorenie Oprávky
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Skóre musí být menší než nebo rovna 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Tool zápis
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C-Form záznamy
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C-Form záznamy
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Zákazník a Dodávateľ
 DocType: Email Digest,Email Digest Settings,Nastavení e-mailu Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Ďakujeme vám za vašu firmu!
@@ -1011,13 +1028,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Citácia Stav
 DocType: Maintenance Visit,Completion Status,Dokončení Status
 DocType: HR Settings,Enter retirement age in years,Zadajte vek odchodu do dôchodku v rokoch
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Warehouse
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Vyberte si sklad
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Target Warehouse
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Vyberte si sklad
 DocType: Cheque Print Template,Starting location from left edge,Počnúc umiestnenie od ľavého okraja
 DocType: Item,Allow over delivery or receipt upto this percent,Nechajte cez dodávku alebo príjem aľ tohto percenta
 DocType: Stock Entry,STE-,ste-
 DocType: Upload Attendance,Import Attendance,Importovat Docházku
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Všechny skupiny položek
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Všechny skupiny položek
 DocType: Process Payroll,Activity Log,Aktivita Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Čistý zisk / strata
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automaticky napsat vzkaz na předkládání transakcí.
@@ -1029,7 +1046,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Předpokládané množství
 DocType: Sales Invoice,Payment Due Date,Splatné dňa
 DocType: Drug Prescription,Interval UOM,Interval UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Variant Položky {0} už existuje s rovnakými vlastnosťami
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Variant Položky {0} už existuje s rovnakými vlastnosťami
+DocType: Item,Hub Publishing Details,Podrobnosti o publikovaní Hubu
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',"""Otváranie"""
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,otvorená robiť
 DocType: Notification Control,Delivery Note Message,Delivery Note Message
@@ -1049,10 +1067,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: Surovina nemôže byť rovnaká ako hlavná položka
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Celkom Použiteľné Poplatky v doklade o kúpe tovaru, ktorý tabuľky musí byť rovnaká ako celkom daní a poplatkov"
 DocType: Sales Team,Incentives,Pobídky
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Zaregistrujte sa do centra
 DocType: SMS Log,Requested Numbers,Požadované Čísla
 DocType: Production Planning Tool,Only Obtain Raw Materials,Získať iba suroviny
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Hodnocení výkonu.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Povolenie &quot;použitia na nákupného košíka&quot;, ako je povolené Nákupný košík a tam by mala byť aspoň jedna daňové pravidlá pre Košík"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Povolenie &quot;použitia na nákupného košíka&quot;, ako je povolené Nákupný košík a tam by mala byť aspoň jedna daňové pravidlá pre Košík"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Platba Vstup {0} je prepojený na objednávku {1}, skontrolujte, či by mal byť ťahaný za pokrok v tejto faktúre."
 DocType: Sales Invoice Item,Stock Details,Detaily zásob
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Hodnota projektu
@@ -1071,12 +1090,14 @@
 DocType: Salary Slip,Working Days,Pracovní dny
 DocType: Serial No,Incoming Rate,Příchozí Rate
 DocType: Packing Slip,Gross Weight,Hrubá hmotnost
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,"Názov spoločnosti, pre ktorú nastavujete tento systém"
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Povoliť Hub
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,"Názov spoločnosti, pre ktorú nastavujete tento systém"
 DocType: HR Settings,Include holidays in Total no. of Working Days,Zahrnout dovolenou v celkovém. pracovních dní
 DocType: Job Applicant,Hold,Držet
 DocType: Employee,Date of Joining,Datum přistoupení
 DocType: Naming Series,Update Series,Řada Aktualizace
 DocType: Supplier Quotation,Is Subcontracted,Subdodavatelům
+DocType: Restaurant Table,Minimum Seating,Minimálne sedenie
 DocType: Item Attribute,Item Attribute Values,Položka Hodnoty atributů
 DocType: Examination Result,Examination Result,vyšetrenie Výsledok
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Příjemka
@@ -1087,13 +1108,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Nemožno nájsť časový úsek v najbližších {0} dní na prevádzku {1}
 DocType: Production Order,Plan material for sub-assemblies,Plán materiál pro podsestavy
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Obchodní partneri a teritória
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} musí být aktivní
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} musí být aktivní
 DocType: Journal Entry,Depreciation Entry,odpisy Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Najprv vyberte typ dokumentu
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Zrušit Materiál Návštěvy {0} před zrušením tohoto návštěv údržby
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Pořadové číslo {0} nepatří k bodu {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Požadované množství
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Sklady s existujúcimi transakcie nemožno previesť na knihy.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Sklady s existujúcimi transakcie nemožno previesť na knihy.
 DocType: Bank Reconciliation,Total Amount,Celková částka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Prescription Duration,Number,číslo
@@ -1104,7 +1125,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Predajný cenník
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Ak je začiarknuté, vytvorí sa zákazník, zmapovaný na pacienta. Faktúry pacienta budú vytvorené voči tomuto zákazníkovi. Môžete tiež vybrať existujúceho zákazníka pri vytváraní pacienta."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publikování synchronizovat položky
 DocType: Bank Reconciliation,Account Currency,Mena účtu
 DocType: Lab Test,Sample ID,ID vzorky
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,"Prosím, uveďte zaokrúhliť účet v spoločnosti"
@@ -1113,11 +1133,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Zamestnanec {0} nie je aktívny alebo neexistuje
 DocType: Fee Structure,Components,komponenty
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},"Prosím, zadajte Kategória majetku v položke {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Varianty Položky {0} aktualizované
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Varianty Položky {0} aktualizované
 DocType: Quality Inspection Reading,Reading 6,Čtení 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Nemožno {0} {1} {2} bez negatívnych vynikajúce faktúra
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this",ktoré sa majú generovať. Pri oneskorení budete musieť ručne zmeniť pole &quot;Opakovať v deň dňa&quot;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Nemožno {0} {1} {2} bez negatívnych vynikajúce faktúra
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Záloha přijaté faktury
-DocType: Hub Settings,Sync Now,Sync teď
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit záznam nemůže být spojována s {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Definovať rozpočet pre finančný rok.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Výchozí účet Bank / Cash budou automaticky aktualizovány v POS faktury, pokud je zvolen tento režim."
@@ -1129,13 +1150,13 @@
 DocType: Item,Is Purchase Item,je Nákupní Položka
 DocType: Asset,Purchase Invoice,Prijatá faktúra
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail No
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Nová predajná faktúra
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Nová predajná faktúra
 DocType: Stock Entry,Total Outgoing Value,Celková hodnota Odchozí
 DocType: Physician,Appointments,schôdzky
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Dátum začatia a dátumom ukončenia by malo byť v rámci rovnakého fiškálny rok
 DocType: Lead,Request for Information,Žádost o informace
 ,LeaderBoard,Nástenka lídrov
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Sync Offline Faktúry
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Sync Offline Faktúry
 DocType: Payment Request,Paid,Zaplatené
 DocType: Program Fee,Program Fee,program Fee
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1154,11 +1175,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Položka nákupnej objednávky
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Nepřímé příjmy
 DocType: Student Attendance Tool,Student Attendance Tool,Študent Účasť Tool
+DocType: Restaurant Menu,Price List (Auto created),Cenník (vytvorený automaticky)
 DocType: Cheque Print Template,Date Settings,dátum Nastavenie
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Odchylka
 ,Company Name,Názov spoločnosti
 DocType: SMS Center,Total Message(s),Celkem zpráv (y)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Vybrať položku pre prevod
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Vybrať položku pre prevod
 DocType: Purchase Invoice,Additional Discount Percentage,Ďalšie zľavy Percento
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Zobraziť zoznam všetkých videí nápovedy
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vyberte účet šéf banky, kde byla uložena kontrola."
@@ -1176,6 +1198,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,meter
 DocType: Workstation,Electricity Cost,Cena elektřiny
 DocType: HR Settings,Don't send Employee Birthday Reminders,Neposílejte zaměstnance připomenutí narozenin
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Uložiť nastavenia
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Požadované produkty
 DocType: Item,Inspection Criteria,Inšpekčné kritéria
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Prevedené
 DocType: BOM Website Item,BOM Website Item,BOM Website Item
@@ -1192,11 +1216,11 @@
 DocType: Journal Entry,Total Amount in Words,Celková částka slovy
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Došlo k chybě. Jedním z důvodů by mohlo být pravděpodobné, že jste uložili formulář. Obraťte se prosím na support@erpnext.com Pokud problém přetrvává."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Môj košík
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Typ objednávky musí být jedním z {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Typ objednávky musí být jedním z {0}
 DocType: Lead,Next Contact Date,Další Kontakt Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Otevření POČET
 DocType: Healthcare Settings,Appointment Reminder,Pripomienka na menovanie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,"Prosím, zadajte účet pre zmenu Suma"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,"Prosím, zadajte účet pre zmenu Suma"
 DocType: Student Batch Name,Student Batch Name,Študent Batch Name
 DocType: Consultation,Doctor,lekár
 DocType: Holiday List,Holiday List Name,Názov zoznamu sviatkov
@@ -1204,12 +1228,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,rozvrh
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Možnosti zásob
 DocType: Journal Entry Account,Expense Claim,Hrazení nákladů
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Naozaj chcete obnoviť tento vyradený aktívum?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Množství pro {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Naozaj chcete obnoviť tento vyradený aktívum?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Množství pro {0}
 DocType: Leave Application,Leave Application,Aplikácia na priepustky
 DocType: Patient,Patient Relation,Vzťah pacientov
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Nástroj na pridelenie voľna
+DocType: Item,Hub Category to Publish,Kategória Hubu na publikovanie
 DocType: Leave Block List,Leave Block List Dates,Nechte Block List termíny
+DocType: Sales Invoice,Billing Address GSTIN,Fakturačná adresa GSTIN
 DocType: Workstation,Net Hour Rate,Net Hour Rate
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Přistál Náklady doklad o koupi
 DocType: Company,Default Terms,Východiskové podmienky
@@ -1219,11 +1245,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Zadajte {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Odstránené položky bez zmeny množstva alebo hodnoty.
 DocType: Delivery Note,Delivery To,Doručení do
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Atribút tabuľka je povinné
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Atribút tabuľka je povinné
 DocType: Production Planning Tool,Get Sales Orders,Získat Prodejní objednávky
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} nemôže byť záporné
 DocType: Training Event,Self-Study,Samoštúdium
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Sleva
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Sleva
 DocType: Asset,Total Number of Depreciations,Celkový počet Odpisy
 DocType: Sales Invoice Item,Rate With Margin,Sadzba s maržou
 DocType: Sales Invoice Item,Rate With Margin,Sadzba s maržou
@@ -1231,7 +1257,7 @@
 DocType: Task,Urgent,Naléhavý
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Zadajte platný riadok ID riadku tabuľky {0} {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Nepodarilo sa nájsť premennú:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,"Vyberte pole, ktoré chcete upraviť z čísla"
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,"Vyberte pole, ktoré chcete upraviť z čísla"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Prejdite na plochu a začnite používať ERPNext
 DocType: Item,Manufacturer,Výrobca
 DocType: Landed Cost Item,Purchase Receipt Item,Položka příjemky
@@ -1262,8 +1288,8 @@
 DocType: GL Entry,Against,Proti
 DocType: Item,Default Selling Cost Center,Výchozí Center Prodejní cena
 DocType: Sales Partner,Implementation Partner,Implementačního partnera
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,PSČ
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Predajné objednávky {0} {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,PSČ
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Predajné objednávky {0} {1}
 DocType: Opportunity,Contact Info,Kontaktní informace
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Tvorba prírastkov zásob
 DocType: Packing Slip,Net Weight UOM,Čistá hmotnosť MJ
@@ -1274,6 +1300,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Získejte týdenní Off termíny
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Datum ukončení nesmí být menší než data zahájení
 DocType: Sales Person,Select company name first.,"Prosím, vyberte najprv názov spoločnosti"
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Nízka až vysoká
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ponuky od Dodávateľov.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Nahraďte kusovník a aktualizujte najnovšiu cenu vo všetkých kusovníkoch
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Chcete-li {0} | {1} {2}
@@ -1294,7 +1321,7 @@
 DocType: Program Enrollment,Transportation,Doprava
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,neplatný Atribút
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} musí být odeslaný
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Množstvo musí byť menší ako alebo rovný {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Množstvo musí byť menší ako alebo rovný {0}
 DocType: SMS Center,Total Characters,Celkový počet znaků
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Vyberte kusovník Bom oblasti k bodu {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Faktura Detail
@@ -1309,7 +1336,7 @@
 ,Ordered Items To Be Billed,Objednané zboží fakturovaných
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,"Z rozsahu, musí byť nižšia ako na Range"
 DocType: Global Defaults,Global Defaults,Globální Výchozí
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Projekt spolupráce Pozvánka
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Projekt spolupráce Pozvánka
 DocType: Salary Slip,Deductions,Odpočty
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Názov akcie
@@ -1327,13 +1354,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Prodejní faktury Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Nic požadovat
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Ďalšie rekord Rozpočet &#39;{0}&#39; už existuje proti {1} &#39;{2}&#39; za fiškálny rok {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"""Aktuálny datum začiatku"" nemôže byť väčší ako ""Aktuálny dátum ukončenia"""
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"""Aktuálny datum začiatku"" nemôže byť väčší ako ""Aktuálny dátum ukončenia"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Manažment
 DocType: Cheque Print Template,Payer Settings,nastavenie platcu
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To bude připojen na položku zákoníku varianty. Například, pokud vaše zkratka je ""SM"", a položka je kód ""T-SHIRT"", položka kód varianty bude ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Čistá Pay (slovy) budou viditelné, jakmile uložíte výplatní pásce."
 DocType: Purchase Invoice,Is Return,Je Return
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,pozor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,pozor
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Return / ťarchopis
 DocType: Price List Country,Price List Country,Cenník Krajina
 DocType: Item,UOMs,Merné Jednotky
@@ -1348,17 +1375,18 @@
 DocType: Account,Balance Sheet,Rozvaha
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',"Nákladové středisko u položky s Kód položky """
 DocType: Fee Validity,Valid Till,Platný do
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Režim platba nie je nakonfigurovaný. Prosím skontrolujte, či je účet bol nastavený na režim platieb alebo na POS Profilu."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Režim platba nie je nakonfigurovaný. Prosím skontrolujte, či je účet bol nastavený na režim platieb alebo na POS Profilu."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Rovnakú položku nemožno zadávať viackrát.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ďalšie účty môžu byť vyrobené v rámci skupiny, ale údaje je možné proti non-skupín"
 DocType: Lead,Lead,Obchodná iniciatíva
 DocType: Email Digest,Payables,Závazky
 DocType: Course,Course Intro,samozrejme Intro
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Sklad Vstup {0} vytvoril
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosím, nastavte číselnú sériu pre účasť v programe Setup&gt; Numbering Series"
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Sklad Vstup {0} vytvoril
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Riadok # {0}: zamietnutie Množstvo nemôže byť zapísaný do kúpnej Návrat
 ,Purchase Order Items To Be Billed,Položky vydané objednávky k fakturaci
 DocType: Purchase Invoice Item,Net Rate,Čistá miera
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Vyberte zákazníka
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Vyberte zákazníka
 DocType: Purchase Invoice Item,Purchase Invoice Item,Položka přijaté faktury
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Sériové Ledger Přihlášky a GL položky jsou zveřejňována pro vybrané Nákupní Příjmy
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Položka 1
@@ -1379,7 +1407,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Duplicitný riadok {0} s rovnakým {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Fiškálny rok {0} nebol nájdený
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Nastavenia pre modul Zamestnanci
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Nastavenia pre modul Zamestnanci
 DocType: Sales Order,SO-,PO-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,"Prosím, vyberte první prefix"
 DocType: Employee,O-,O-
@@ -1391,12 +1419,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,View Ledger
 DocType: Grading Scale,Intervals,intervaly
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najstarší
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Položka Group existuje se stejným názvem, prosím, změnit název položky nebo přejmenovat skupinu položek"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Položka Group existuje se stejným názvem, prosím, změnit název položky nebo přejmenovat skupinu položek"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Študent Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Zbytek světa
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Zbytek světa
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Položka {0} nemůže mít dávku
 ,Budget Variance Report,Rozpočet Odchylka Report
 DocType: Salary Slip,Gross Pay,Hrubé mzdy
+DocType: Item,Is Item from Hub,Je položka z Hubu
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Riadok {0}: typ činnosti je povinná.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividendy platené
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Účtovné Ledger
@@ -1406,8 +1435,9 @@
 DocType: Vehicle Log,Service Detail,servis Detail
 DocType: BOM,Item Description,Položka Popis
 DocType: Student Sibling,Student Sibling,študent Súrodenec
-DocType: Purchase Invoice,Is Recurring,Je opakujúce sa
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Způsob platby
 DocType: Purchase Invoice,Supplied Items,Dodávané položky
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Nastavte prosím aktívnu ponuku reštaurácie {0}
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Množství K výrobě
 DocType: Email Digest,New Income,new príjmov
@@ -1418,6 +1448,7 @@
 ,Student and Guardian Contact Details,Študent a Guardian Kontaktné údaje
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Riadok {0}: Pre dodávateľov je potrebná {0} E-mailová adresa pre odoslanie e-mailu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Dočasné Otvorenie
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Zobraziť Hub
 ,Employee Leave Balance,Zostatok voľna pre zamestnanca
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Zostatok na účte {0} musí byť vždy {1}
 DocType: Patient Appointment,More Info,Více informací
@@ -1437,13 +1468,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Upozornenie na novú žiadosť o ponuku
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Objednávky pomôžu pri plánovaní a sledovaní na vaše nákupy
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Predpisy pre laboratórne testy
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Celkové emisie / prenosu množstvo {0} v hmotnej Request {1} \ nemôže byť väčšie než množstvo {2} pre položku {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Malý
 DocType: Employee,Employee Number,Počet zaměstnanců
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Případ číslo (čísla) již v provozu. Zkuste se věc č {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Případ číslo (čísla) již v provozu. Zkuste se věc č {0}
 DocType: Project,% Completed,% Dokončených
 ,Invoiced Amount (Exculsive Tax),Fakturovaná částka (bez daně)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Položka 2
@@ -1458,11 +1489,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Nepřímé náklady
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Row {0}: Množství je povinný
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Poľnohospodárstvo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Vaše Produkty alebo Služby
 DocType: Special Test Items,Special Test Items,Špeciálne testovacie položky
 DocType: Mode of Payment,Mode of Payment,Způsob platby
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Webové stránky Image by mala byť verejná súboru alebo webovej stránky URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Webové stránky Image by mala byť verejná súboru alebo webovej stránky URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Jedná se o skupinu kořen položky a nelze upravovat.
@@ -1470,9 +1501,9 @@
 DocType: Vehicle,Fuel UOM,palivo UOM
 DocType: Warehouse,Warehouse Contact Info,Sklad Kontaktní informace
 DocType: Payment Entry,Write Off Difference Amount,Odpísať Difference Suma
-DocType: Purchase Invoice,Recurring Type,Typ opakujúceho sa
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: e-mail zamestnanec nebol nájdený, a preto je pošta neposlal"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: e-mail zamestnanec nebol nájdený, a preto je pošta neposlal"
 DocType: Item,Foreign Trade Details,Zahraničný obchod Podrobnosti
+,Assessment Plan Status,Stav plánu hodnotenia
 DocType: Email Digest,Annual Income,Ročný príjem
 DocType: Serial No,Serial No Details,Podrodnosti k sériovému číslu
 DocType: Purchase Invoice Item,Item Tax Rate,Sazba daně položky
@@ -1480,15 +1511,14 @@
 DocType: Student Group Student,Group Roll Number,Číslo skupiny rollov
 DocType: Student Group Student,Group Roll Number,Číslo skupiny rollov
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Pro {0}, tak úvěrové účty mohou být propojeny na jinou položku debetní"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Súčet všetkých váh úloha by mal byť 1. Upravte váhy všetkých úloh projektu v súlade
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Súčet všetkých váh úloha by mal byť 1. Upravte váhy všetkých úloh projektu v súlade
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Položka {0} musí být Subdodavatelské Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapitálové Vybavení
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ceny Pravidlo je nejprve vybrána na základě ""Použít na"" oblasti, které mohou být položky, položky skupiny nebo značky."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Najprv nastavte kód položky
-DocType: Hub Settings,Seller Website,Prodejce Website
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Najprv nastavte kód položky
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Celkové přidělené procento prodejní tým by měl být 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Celkové přidělené procento prodejní tým by měl být 100
 DocType: Sales Invoice Item,Edit Description,Upraviť popis
 DocType: Antibiotic,Antibiotic,antibiotikum
 ,Team Updates,tím Updates
@@ -1509,12 +1539,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Total (Company meny)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Výrobní číslo {0} přihlášeno více než jednou
 DocType: Depreciation Schedule,Journal Entry,Zápis do deníku
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} položky v prebiehajúcej
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} položky v prebiehajúcej
 DocType: Workstation,Workstation Name,Meno pracovnej stanice
 DocType: Grading Scale Interval,Grade Code,grade Code
 DocType: POS Item Group,POS Item Group,POS položky Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Salary Slip,Bank Account No.,Číslo bankového účtu
 DocType: Naming Series,This is the number of the last created transaction with this prefix,To je číslo poslední vytvořené transakci s tímto prefixem
@@ -1531,10 +1561,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Žiadosť o cenovú ponuku dodávateľa
 DocType: Healthcare Settings,Registration Message,Registrácia Správa
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Technické vybavení
-DocType: Sales Order,Recurring Upto,Opakujúce sa do
 DocType: Prescription Dosage,Prescription Dosage,Dávkovanie na predpis
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Vyberte spoločnosť
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Vyberte spoločnosť
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Dátum dodávateľskej faktúry
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,za
@@ -1550,10 +1579,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Překrývající podmínky nalezeno mezi:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Proti věstníku Entry {0} je již nastavena proti jiným poukaz
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Celková hodnota objednávky
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Jídlo
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Jídlo
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Stárnutí Rozsah 3
 DocType: Maintenance Schedule Item,No of Visits,Počet návštěv
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Plán údržby {0} existuje v porovnaní s {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Chcete publikovať svoje položky na Hub?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,učiaci študenta
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},"Mena záverečného účtu, musí byť {0}"
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Súčet bodov za všetkých cieľov by malo byť 100. Je {0}
@@ -1564,9 +1594,9 @@
 DocType: Authorization Rule,Average Discount,Průměrná sleva
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Utilities
-DocType: Purchase Invoice Item,Accounting,Účtovníctvo
+DocType: POS Profile,Accounting,Účtovníctvo
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Vyberte dávky pre doručenú položku
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Vyberte dávky pre doručenú položku
 DocType: Asset,Depreciation Schedules,odpisy Plány
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Obdobie podávania žiadostí nemôže byť alokačné obdobie vonku voľno
 DocType: Activity Cost,Projects,Projekty
@@ -1582,7 +1612,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',"Stav schválení musí být ""schváleno"" nebo ""Zamítnuto"""
 DocType: Physician,Contacts and Address,Kontakty a adresa
 DocType: Purchase Invoice,Contact Person,Kontaktná osoba
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"""Očakávaný Dátum Začiatku"" nemôže byť väčší ako ""Očakávaný Dátum Ukončenia"""
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""Očakávaný Dátum Začiatku"" nemôže byť väčší ako ""Očakávaný Dátum Ukončenia"""
 DocType: Course Scheduling Tool,Course End Date,Koniec Samozrejme Dátum
 DocType: Holiday List,Holidays,Prázdniny
 DocType: Sales Order Item,Planned Quantity,Plánované Množstvo
@@ -1590,10 +1620,11 @@
 DocType: Item,Maintain Stock,Udržiavať Zásoby
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Fotky Položky již vytvořené pro výrobní zakázku
 DocType: Employee,Prefered Email,preferovaný Email
+DocType: Student Admission,Eligibility and Details,Oprávnenosť a podrobnosti
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Čistá zmena v stálych aktív
 DocType: Leave Control Panel,Leave blank if considered for all designations,Nechajte prázdne ak má platiť pre všetky zadelenia
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Od datetime
 DocType: Email Digest,For Company,Pre spoločnosť
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Komunikační protokol.
@@ -1601,19 +1632,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Hodnota ukazovateľa skóre skóre dodávateľa
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Nákup Částka
 DocType: Sales Invoice,Shipping Address Name,Názov dodacej adresy
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Diagram účtů
 DocType: Material Request,Terms and Conditions Content,Podmínky Content
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,nemôže byť väčšie ako 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Položka {0} není skladem
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Položka {0} není skladem
 DocType: Maintenance Visit,Unscheduled,Neplánovaná
 DocType: Employee,Owned,Vlastník
 DocType: Salary Detail,Depends on Leave Without Pay,Závisí na dovolenke bez nároku na mzdu
 DocType: Pricing Rule,"Higher the number, higher the priority","Vyšší číslo, vyšší priorita"
 ,Purchase Invoice Trends,Trendy přijatách faktur
 DocType: Employee,Better Prospects,Lepší vyhlídky
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Riadok # {0}: Dávka {1} má iba {2} qty. Vyberte inú dávku, ktorá má {3} k dispozícii, alebo rozdeľte riadok do viacerých riadkov a doručte / vydávajte z viacerých šarží"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Riadok # {0}: Dávka {1} má iba {2} qty. Vyberte inú dávku, ktorá má {3} k dispozícii, alebo rozdeľte riadok do viacerých riadkov a doručte / vydávajte z viacerých šarží"
 DocType: Vehicle,License Plate,Poznávacia značka
 DocType: Appraisal,Goals,Ciele
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Zvoľte POS profil
 DocType: Warranty Claim,Warranty / AMC Status,Záruka / AMC Status
 ,Accounts Browser,Účty Browser
 DocType: Payment Entry Reference,Payment Entry Reference,Platba Vstup referencie
@@ -1632,7 +1663,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Zamestnanec nemôže reportovať sám sebe.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","V případě, že účet je zamrzlý, položky mohou omezeným uživatelům."
 DocType: Email Digest,Bank Balance,Bankový zostatok
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Účtovný záznam pre {0}: {1} môžu vykonávať len v mene: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Účtovný záznam pre {0}: {1} môžu vykonávať len v mene: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil Job, požadované kvalifikace atd."
 DocType: Journal Entry Account,Account Balance,Zůstatek na účtu
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Daňové Pravidlo pre transakcie.
@@ -1641,8 +1672,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Spolu dane a poplatky (v peňažnej mene firmy)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Ukázať P &amp; L zostatky neuzavretý fiškálny rok je
 DocType: Lab Test Template,Collection Details,Podrobnosti zbierky
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","zvoľte cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date zo tabConsultation ct, `tabLab Prescription` cp kde ct.patient = &#39;{0}&#39; a cp.parent = ct. názov a cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Dodací účet
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Účet {2} je neaktívny
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,"Urobiť Predajné objednávky, ktoré vám pomôžu plánovať svoju prácu a doručiť na čas"
@@ -1659,7 +1688,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,List k balíku
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Pronájem kanceláře
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Nastavenie SMS brány
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import se nezdařil!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import se nezdařil!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Žádná adresa přidán dosud.
 DocType: Workstation Working Hour,Workstation Working Hour,Pracovní stanice Pracovní Hour
 DocType: Vital Signs,Blood Pressure,Krvný tlak
@@ -1684,7 +1713,7 @@
 DocType: Sales Invoice,Source,Zdroj
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Zobraziť uzatvorené
 DocType: Leave Type,Is Leave Without Pay,Je odísť bez Pay
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Asset kategória je povinný pre položku investičného majetku
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Asset kategória je povinný pre položku investičného majetku
 DocType: Fee Validity,Fee Validity,Platnosť poplatku
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nalezené v tabulce platby Žádné záznamy
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Táto {0} je v rozpore s {1} o {2} {3}
@@ -1705,8 +1734,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Vytvoriť vedie
 DocType: Maintenance Schedule,Schedules,Plány
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,Profil POS je potrebný na použitie predajného miesta
 DocType: Purchase Invoice Item,Net Amount,Čistá suma
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} nebola odoslaná, takže akciu nemožno dokončiť"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} nebola odoslaná, takže akciu nemožno dokončiť"
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail No
 DocType: Landed Cost Voucher,Additional Charges,dodatočné poplatky
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatočná zľava Suma (Mena Company)
@@ -1715,7 +1745,7 @@
 ,Support Hour Distribution,Distribúcia hodín podpory
 DocType: Maintenance Visit,Maintenance Visit,Maintenance Visit
 DocType: Student,Leaving Certificate Number,maturita číslo
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Schôdza bola zrušená, skontrolujte a zrušte faktúru {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Schôdza bola zrušená, skontrolujte a zrušte faktúru {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,K dispozícii dávky Množstvo v sklade
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Aktualizácia Print Format
 DocType: Landed Cost Voucher,Landed Cost Help,Přistálo Náklady Help
@@ -1738,8 +1768,8 @@
 DocType: Patient,Tobacco Past Use,Použitie tabaku v minulosti
 DocType: Sales Invoice Item,Brand Name,Jméno značky
 DocType: Purchase Receipt,Transporter Details,Transporter Podrobnosti
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Používateľ {0} je už pridelený lekárovi {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Predvolené sklad je vyžadované pre vybraná položka
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Používateľ {0} je už pridelený lekárovi {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Predvolené sklad je vyžadované pre vybraná položka
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Krabica
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,možné Dodávateľ
 DocType: Budget,Monthly Distribution,Měsíční Distribution
@@ -1749,8 +1779,8 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 DocType: Loan Type,Maximum Loan Amount,Maximálna výška úveru
 DocType: Pricing Rule,Pricing Rule,Cenové pravidlo
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Duplicitné číslo rolky pre študenta {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Duplicitné číslo rolky pre študentov {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Duplicitné číslo rolky pre študenta {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Duplicitné číslo rolky pre študentov {0}
 DocType: Budget,Action if Annual Budget Exceeded,Akčný Pokiaľ ide o ročný rozpočet prekročený
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Materiál Žiadosť o príkaze k nákupu
 DocType: Shopping Cart Settings,Payment Success URL,Platba Úspech URL
@@ -1767,7 +1797,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} môže byť uvedené iba raz
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Nie je povolené, aby transfer viac {0} ako {1} proti objednanie {2}"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Listy Přidělené úspěšně za {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Žádné položky k balení
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Žádné položky k balení
 DocType: Shipping Rule Condition,From Value,Od hodnoty
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Výrobné množstvo je povinné
 DocType: Employee Loan,Repayment Method,splácanie Method
@@ -1781,6 +1811,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Zásoby Pasíva
 DocType: Purchase Invoice,Supplier Warehouse,Dodavatel Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt Mobil
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Vyberte spoločnosť
 ,Material Requests for which Supplier Quotations are not created,Materiál Žádosti o které Dodavatel citace nejsou vytvořeny
 DocType: Student Group,Set 0 for no limit,Nastavte 0 pre žiadny limit
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"V deň, keď (y), na ktoré žiadate o povolenie sú prázdniny. Nemusíte požiadať o voľno."
@@ -1790,24 +1821,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Vytvoriť ponuku
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Ostatné správy
 DocType: Dependent Task,Dependent Task,Závislý Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Leave typu {0} nemůže být delší než {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Skúste plánovanie operácií pre X dní vopred.
 DocType: HR Settings,Stop Birthday Reminders,Zastaviť pripomenutie narodenín
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},"Prosím nastaviť predvolený účet mzdy, splatnú v spoločnosti {0}"
 DocType: SMS Center,Receiver List,Přijímač Seznam
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,hľadanie položky
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,hľadanie položky
 DocType: Patient Appointment,Referring Physician,Odporúčajúci lekár
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Spotřebovaném množství
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Čistá zmena v hotovosti
 DocType: Assessment Plan,Grading Scale,stupnica
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,už boli dokončené
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,už boli dokončené
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Skladom v ruke
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Platba Dopyt už existuje {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Náklady na vydaných položek
 DocType: Physician,Hospital,Nemocnica
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Množství nesmí být větší než {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Množství nesmí být větší než {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Predchádzajúci finančný rok nie je uzavretý
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Staroba (dni)
 DocType: Quotation Item,Quotation Item,Položka ponuky
@@ -1818,8 +1849,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Dodavatel Type master.
 DocType: Purchase Order Item,Supplier Part Number,Dodavatel Číslo dílu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Míra konverze nemůže být 0 nebo 1
-DocType: Sales Invoice,Reference Document,referenčný dokument
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} je zrušená alebo zastavená
+DocType: Subscription,Reference Document,referenčný dokument
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} je zrušená alebo zastavená
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Vozidlo Dispatch Datum
 DocType: Healthcare Settings,Default Medical Code Standard,Predvolený štandard medicínskeho kódu
@@ -1828,6 +1859,7 @@
 DocType: Company,Default Payable Account,Výchozí Splatnost účtu
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Nastavení pro on-line nákupního košíku, jako jsou pravidla dopravu, ceník atd"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% fakturované
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Zoradiť podľa Cena ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserved Množství
 DocType: Party Account,Party Account,Party účtu
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Lidské zdroje
@@ -1839,13 +1871,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Urobiť vyplácanie Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Riadok {0}: Advance proti dodávateľom musí byť odpísať
 DocType: Company,Default Values,Predvolené hodnoty
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frekvencia} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Frekvencia} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Celkovej sumy vyplatenej
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,To je založené na protokoloch proti tomuto vozidlu. Pozri časovú os nižšie podrobnosti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Proti faktuře dodavatele {0} ze dne {1}
 DocType: Customer,Default Price List,Výchozí Ceník
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Záznam Asset Pohyb {0} vytvoril
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nemožno odstrániť fiškálny rok {0}. Fiškálny rok {0} je nastavený ako predvolený v globálnom nastavení
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Zákazník s rovnakým názvom už existuje
 DocType: Journal Entry,Entry Type,Entry Type
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Žiaden plán hodnotenia nesúvisí s touto skupinou
 ,Customer Credit Balance,Zákazník Credit Balance
@@ -1856,7 +1889,7 @@
 DocType: Quotation,Term Details,Termín Podrobnosti
 DocType: Project,Total Sales Cost (via Sales Order),Celkové predajné náklady (prostredníctvom objednávky predaja)
 DocType: Project,Total Sales Cost (via Sales Order),Celkové predajné náklady (prostredníctvom objednávky predaja)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Nemôže prihlásiť viac ako {0} študentov na tejto študentské skupiny.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Nemôže prihlásiť viac ako {0} študentov na tejto študentské skupiny.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Počet iniciatív
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Počet iniciatív
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} musí byť väčšia ako 0
@@ -1874,9 +1907,11 @@
 DocType: Lab Test,Technician Name,Názov technikov
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Odpojiť Platba o zrušení faktúry
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Aktuálny stav km vstúpil by mala byť väčšia ako počiatočný stav kilometrov {0}
+DocType: Restaurant Reservation,No Show,Žiadne zobrazenie
 DocType: Shipping Rule Country,Shipping Rule Country,Prepravné Pravidlo Krajina
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Priepustky a dochádzky
 DocType: Maintenance Visit,Partially Completed,Částečně Dokončeno
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Stredná citlivosť
 DocType: Leave Type,Include holidays within leaves as leaves,Zahrnúť dovolenku v listoch sú listy
 DocType: Sales Invoice,Packed Items,Zabalené položky
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Reklamační proti sériového čísla
@@ -1893,13 +1928,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Zaplatená suma (Company meny)
 DocType: Purchase Invoice,Additional Discount,Ďalšie zľavy
 DocType: Selling Settings,Selling Settings,Nastavenia pre Predaj
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Potvrďte akciu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Aukce online
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Uveďte prosím buď Množstvo alebo Pomer ocenenia, alebo obidve."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,splnenie
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Zobraziť Košík
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Marketingové náklady
 ,Item Shortage Report,Položka Nedostatek Report
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnosť je uvedená, \n uveďte prosím aj ""váhu MJ"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnosť je uvedená, \n uveďte prosím aj ""váhu MJ"""
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiál Žádost používá k výrobě této populace Entry
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Vedľa Odpisy Dátum je povinné pre nové aktívum
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Samostatná skupina kurzov pre každú dávku
@@ -1912,12 +1948,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Ujistěte se účetní položka pro každý pohyb zásob
 DocType: Leave Allocation,Total Leaves Allocated,Celkem Leaves Přidělené
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Warehouse vyžadované pri Row No {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Zadajte platné dátumy začiatku a konca finančného roka
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Zadajte platné dátumy začiatku a konca finančného roka
 DocType: Employee,Date Of Retirement,Datum odchodu do důchodu
 DocType: Upload Attendance,Get Template,Získat šablonu
 DocType: Material Request,Transferred,prevedená
 DocType: Vehicle,Doors,dvere
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,Nastavenie ERPNext dokončené!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,Nastavenie ERPNext dokončené!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Získať poplatok za registráciu pacienta
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,Daňové rozdelenie
@@ -1936,37 +1972,37 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ak je táto položka má varianty, potom to nemôže byť vybraná v predajných objednávok atď"
 DocType: Lead,Next Contact By,Další Kontakt By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Množství požadované pro bodě {0} v řadě {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Množství požadované pro bodě {0} v řadě {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},"Sklad {0} nelze smazat, protože existuje množství k položce {1}"
 DocType: Quotation,Order Type,Typ objednávky
-DocType: Purchase Invoice,Notification Email Address,Oznámení e-mailová adresa
 ,Item-wise Sales Register,Item-moudrý Sales Register
 DocType: Asset,Gross Purchase Amount,Gross Suma nákupu
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Otváracie zostatky
 DocType: Asset,Depreciation Method,odpisy Metóda
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,offline
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je to poplatek v ceně základní sazbě?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Celkem Target
 DocType: Job Applicant,Applicant for a Job,Žadatel o zaměstnání
 DocType: Production Plan Material Request,Production Plan Material Request,Výroba Dopyt Plán Materiál
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Žádné výrobní zakázky vytvořené
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Žádné výrobní zakázky vytvořené
 DocType: Stock Reconciliation,Reconciliation JSON,Odsouhlasení JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Příliš mnoho sloupců. Export zprávu a vytiskněte jej pomocí aplikace tabulky.
 DocType: Purchase Invoice Item,Batch No,Č. šarže
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Žiadosť o ponuku: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Povoliť viac Predajné objednávky proti Zákazníka Objednávky
 DocType: Student Group Instructor,Student Group Instructor,Inštruktor skupiny študentov
 DocType: Student Group Instructor,Student Group Instructor,Inštruktor skupiny študentov
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Žiadne
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Hlavné
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Hlavné
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Varianta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavit prefix pro číslování série na vašich transakcí
 DocType: Employee Attendance Tool,Employees HTML,Zamestnanci HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Predvolené BOM ({0}) musí byť aktívna pre túto položku alebo jeho šablóny
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Predvolené BOM ({0}) musí byť aktívna pre túto položku alebo jeho šablóny
 DocType: Employee,Leave Encashed?,Ponechte zpeněžení?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Ze hřiště je povinné
 DocType: Email Digest,Annual Expenses,ročné náklady
 DocType: Item,Variants,Varianty
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Vytvoriť odoslanú objednávku
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Vytvoriť odoslanú objednávku
 DocType: SMS Center,Send To,Odoslať na
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Není dost bilance dovolenou na vstup typ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Přidělené sumy
@@ -1984,6 +2020,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Sila študentskej skupiny
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Proti věstníku Vstup {0} nemá bezkonkurenční {1} vstupu
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,ocenenie
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Školenia
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Duplicitní Pořadové číslo vstoupil k bodu {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Podmínka pro pravidla dopravy
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Prosím zadajte
@@ -1993,7 +2030,7 @@
 DocType: Sales Order,To Deliver and Bill,Dodať a Bill
 DocType: Student Group,Instructors,inštruktori
 DocType: GL Entry,Credit Amount in Account Currency,Kreditné Čiastka v mene účtu
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} musí být předloženy
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} musí být předloženy
 DocType: Authorization Control,Authorization Control,Autorizace Control
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Riadok # {0}: zamietnutie Warehouse je povinná proti zamietnutej bodu {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Splátka
@@ -2012,11 +2049,11 @@
 DocType: Quotation Item,Actual Qty,Skutečné Množství
 DocType: Sales Invoice Item,References,Referencie
 DocType: Quality Inspection Reading,Reading 10,Čtení 10
-DocType: Hub Settings,Hub Node,Hub Node
+DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Zadali jste duplicitní položky. Prosím, opravu a zkuste to znovu."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Spolupracovník
 DocType: Asset Movement,Asset Movement,asset Movement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,new košík
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,new košík
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Položka {0} není serializovat položky
 DocType: SMS Center,Create Receiver List,Vytvořit přijímače seznam
 DocType: Vehicle,Wheels,kolesá
@@ -2030,15 +2067,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikace
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Označuje, že balíček je součástí této dodávky (Pouze návrhu)"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Učinit vstup platby
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Množství k bodu {0} musí být menší než {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Množství k bodu {0} musí být menší než {1}
 ,Sales Invoice Trends,Prodejní faktury Trendy
 DocType: Leave Application,Apply / Approve Leaves,Použít / Schválit listy
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Pre
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Pre
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Se může vztahovat řádku, pouze pokud typ poplatku je ""On předchozí řady Částka"" nebo ""předchozí řady Total"""
 DocType: Sales Order Item,Delivery Warehouse,Dodávka Warehouse
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Strom Nákl.stredisko finančných.
 DocType: Serial No,Delivery Document No,Dodávka dokument č
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Prosím nastavte &quot;/ STRATY zisk z aktív odstraňovaním&quot; vo firme {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Prosím nastavte &quot;/ STRATY zisk z aktív odstraňovaním&quot; vo firme {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Získat položky z Příjmového listu
 DocType: Serial No,Creation Date,Datum vytvoření
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Položka {0} se objeví několikrát v Ceníku {1}
@@ -2049,12 +2086,13 @@
 DocType: Student,Student Mobile Number,Študent Číslo mobilného telefónu
 DocType: Item,Has Variants,Má varianty
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Aktualizácia odpovede
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Už ste vybrané položky z {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Už ste vybrané položky z {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Název měsíční výplatou
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Číslo šarže je povinné
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Číslo šarže je povinné
 DocType: Sales Person,Parent Sales Person,Parent obchodník
-DocType: Purchase Invoice,Recurring Invoice,Opakujúca sa faktúra
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Vysoká až nízka
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Najprv vyberte program
 DocType: Patient Appointment,Patient Age,Vek pacienta
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Správa projektov
 DocType: Supplier,Supplier of Goods or Services.,Dodavatel zboží nebo služeb.
@@ -2062,8 +2100,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Predvolené pohľadávky, ktoré sa majú použiť, ak nie sú stanovené v pacientovi, aby si rezervovali poplatky za konzultácie."
 DocType: Vehicle Log,Fuel Price,palivo Cena
 DocType: Budget,Budget,Rozpočet
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Otvorte Otvoriť
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Fixed Asset položky musia byť non-skladová položka.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Otvorte Otvoriť
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Fixed Asset položky musia byť non-skladová položka.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Rozpočet nemožno priradiť proti {0}, pretože to nie je výnos alebo náklad účet"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Dosažená
 DocType: Student Admission,Application Form Route,prihláška Trasa
@@ -2077,12 +2115,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Položka {0} není nastavení pro Serial č. Zkontrolujte, zda master položku"
 DocType: Maintenance Visit,Maintenance Time,Údržba Time
 ,Amount to Deliver,"Suma, ktorá má dodávať"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Rovnaká položka bola zadaná viackrát. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Termínovaný Dátum začatia nemôže byť skôr ako v roku dátum začiatku akademického roka, ku ktorému termín je spojená (akademický rok {}). Opravte dáta a skúste to znova."
 DocType: Guardian,Guardian Interests,Guardian záujmy
 DocType: Naming Series,Current Value,Current Value
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Niekoľko fiškálnych rokov existujú pre dáta {0}. Prosím nastavte spoločnosť vo fiškálnom roku
 DocType: School Settings,Instructor Records to be created by,"Záznamy inštruktorov, ktoré vytvorí"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} vytvoril
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} vytvoril
 DocType: Delivery Note Item,Against Sales Order,Proti přijaté objednávce
 ,Serial No Status,Serial No Status
 DocType: Payment Entry Reference,Outstanding,vynikajúci
@@ -2093,10 +2132,10 @@
  musí být větší než nebo rovno {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,To je založené na akciovom pohybu. Pozri {0} Podrobnosti
 DocType: Pricing Rule,Selling,Predaj
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Množstvo {0} {1} odpočítať proti {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Množstvo {0} {1} odpočítať proti {2}
 DocType: Employee,Salary Information,Vyjednávání o platu
 DocType: Sales Person,Name and Employee ID,Meno a ID zamestnanca
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
 DocType: Website Item Group,Website Item Group,Website Item Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Odvody a dane
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Prosím, zadejte Referenční den"
@@ -2122,7 +2161,7 @@
 DocType: Issue,Resolution Details,Rozlišení Podrobnosti
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alokácie
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Kritéria přijetí
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Prosím, zadajte Žiadosti materiál vo vyššie uvedenej tabuľke"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,"Prosím, zadajte Žiadosti materiál vo vyššie uvedenej tabuľke"
 DocType: Item Attribute,Attribute Name,Názov atribútu
 DocType: BOM,Show In Website,Zobraziť na webstránke
 DocType: Shopping Cart Settings,Show Quantity in Website,Vykazujú množstvo webových stránok
@@ -2131,7 +2170,7 @@
 DocType: Item Reorder,Check in (group),Check in (skupina)
 ,Qty to Order,Množství k objednávce
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Účet hlavu pod záväzkom alebo vlastným imaním, v ktorom budú Zisk / strata rezervovať"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Ganttův diagram všech zadaných úkolů.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Ganttův diagram všech zadaných úkolů.
 DocType: Opportunity,Mins to First Response,Min First Response
 DocType: Pricing Rule,Margin Type,margin Type
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} hodín
@@ -2153,36 +2192,36 @@
 DocType: Patient,Surgical History,Chirurgická história
 DocType: Employee,Resignation Letter Date,Rezignace Letter Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Pravidla pro stanovení sazeb jsou dále filtrována na základě množství.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Nastavte dátum založenia pre zamestnanca {0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Nastavte dátum založenia pre zamestnanca {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Nastavte dátum založenia pre zamestnanca {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Nastavte dátum založenia pre zamestnanca {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Celková suma Billing (cez Time Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repeat Customer Příjmy
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), musí mať úlohu ""Schvalovateľ výdajov"""
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Pár
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Vyberte BOM a Množstvo na výrobu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Vyberte BOM a Množstvo na výrobu
 DocType: Asset,Depreciation Schedule,plán odpisy
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Adresy predajných partnerov a kontakty
 DocType: Bank Reconciliation Detail,Against Account,Proti účet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Half Day Date by mala byť v rozmedzí od dátumu a do dnešného dňa
 DocType: Maintenance Schedule Detail,Actual Date,Skutečné datum
 DocType: Item,Has Batch No,Má číslo šarže
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Ročný Billing: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Ročný Billing: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Daň z tovarov a služieb (GST India)
 DocType: Delivery Note,Excise Page Number,Spotřební Číslo stránky
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Firma, Dátum od a do dnešného dňa je povinná"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Získajte z konzultácií
 DocType: Asset,Purchase Date,Dátum nákupu
 DocType: Employee,Personal Details,Osobné údaje
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Prosím nastavte &quot;odpisy majetku nákladové stredisko&quot; vo firme {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Prosím nastavte &quot;odpisy majetku nákladové stredisko&quot; vo firme {0}
 ,Maintenance Schedules,Plány údržby
 DocType: Task,Actual End Date (via Time Sheet),Skutočný dátum ukončenia (cez Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Množstvo {0} {1} na {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Množstvo {0} {1} na {2} {3}
 ,Quotation Trends,Vývoje ponúk
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Položka Group není uvedeno v položce mistra na položku {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
 DocType: Shipping Rule Condition,Shipping Amount,Prepravovaná čiastka
 DocType: Supplier Scorecard Period,Period Score,Skóre obdobia
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Pridať zákazníkov
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Pridať zákazníkov
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Čeká Částka
 DocType: Lab Test Template,Special,špeciálna
 DocType: Purchase Invoice Item,Conversion Factor,Konverzní faktor
@@ -2190,13 +2229,14 @@
 ,Vehicle Expenses,Náklady pre autá
 DocType: Serial No,Invoice Details,Podrobnosti faktúry
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},"Očakávané hodnoty po celú dobu životnosti, musí byť väčšia ako alebo rovná {0}"
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Začnite zapnuté
+DocType: Hub Category,Hub Category,Kategória Hubu
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Číslo vozidla
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Dátum, kedy bude opakujúca sa faktúra zastavená"
 DocType: Employee Loan,Loan Amount,Výška pôžičky
 DocType: Program Enrollment,Self-Driving Vehicle,Samohybné vozidlo
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Hodnota karty dodávateľa je stála
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Riadok {0}: Nomenklatúra nebol nájdený pre výtlačku {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Riadok {0}: Nomenklatúra nebol nájdený pre výtlačku {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Celkové pridelené listy {0} nemôže byť nižšia ako už schválených listy {1} pre obdobie
 DocType: Journal Entry,Accounts Receivable,Pohledávky
 ,Supplier-Wise Sales Analytics,Dodavatel-Wise Prodej Analytics
@@ -2208,7 +2248,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Rodičovský kurz (nechajte prázdne, ak toto nie je súčasťou materského kurzu)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Nechajte prázdne ak má platiť pre všetky typy zamestnancov
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuovat poplatků na základě
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,Nastavení HR
 DocType: Salary Slip,net pay info,Čistá mzda info
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Táto hodnota sa aktualizuje v Predvolenom zozname cien predaja.
@@ -2219,7 +2259,7 @@
 DocType: Patient,B Positive,B Pozitívne
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Riadok # {0}: Množstvo musí byť 1, keď je položka investičného majetku. Prosím použiť samostatný riadok pre viacnásobné Mn."
 DocType: Leave Block List Allow,Leave Block List Allow,Nechte Block List Povolit
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Skrátená nemôže byť prázdne alebo priestor
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Skrátená nemôže byť prázdne alebo priestor
 DocType: Patient Medical Record,Patient Medical Record,Záznam pacienta
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Skupina na Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportovní
@@ -2236,9 +2276,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Nepodarilo sa nájsť kurz {0} až {1} pre kľúčový dátum {2}. Ručne vytvorte záznam o menovej karte
 DocType: POS Profile,Price List,Cenník
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} je teraz predvolený Fiškálny rok. Prosím aktualizujte svoj prehliadač, aby sa prejavili zmeny."
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Nákladové Pohľadávky
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Nákladové Pohľadávky
 DocType: Issue,Support,Podpora
 ,BOM Search,BOM Search
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Zverejnite na sklade &quot;Na sklade&quot; alebo &quot;Nie je na sklade&quot; na základe dostupných zásob v tomto sklade.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Uzavretie (Otvorenie + súčty)
 DocType: Vehicle,Fuel Type,Druh paliva
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Uveďte prosím měnu, ve společnosti"
@@ -2250,16 +2291,16 @@
 DocType: Healthcare Settings,Remind Before,Pripomenúť predtým
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM Konverzní faktor je nutné v řadě {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Riadok # {0}: Reference Document Type musí byť jedným zo zákazky odberateľa, predajné faktúry alebo Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Riadok # {0}: Reference Document Type musí byť jedným zo zákazky odberateľa, predajné faktúry alebo Journal Entry"
 DocType: Salary Component,Deduction,Dedukce
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Riadok {0}: From Time a na čas je povinná.
 DocType: Stock Reconciliation Item,Amount Difference,vyššie Rozdiel
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Položka Cena pridaný pre {0} v Cenníku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Položka Cena pridaný pre {0} v Cenníku {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Prosím, zadajte ID zamestnanca z tohto predaja osoby"
 DocType: Territory,Classification of Customers by region,Rozdělení zákazníků podle krajů
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Rozdiel Suma musí byť nula
 DocType: Project,Gross Margin,Hrubá marža
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,"Prosím, zadejte první výrobní položku"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,"Prosím, zadejte první výrobní položku"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Vypočítaná výpis z bankového účtu zostatok
 DocType: Normal Test Template,Normal Test Template,Normálna šablóna testu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,zakázané uživatelské
@@ -2269,21 +2310,22 @@
 DocType: Salary Slip,Total Deduction,Celkem Odpočet
 ,Production Analytics,Analýza výroby
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Toto je založené na transakciách proti tomuto pacientovi. Viac informácií nájdete v nasledujúcej časovej osi
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Náklady Aktualizované
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Náklady Aktualizované
 DocType: Employee,Date of Birth,Datum narození
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Bod {0} již byla vrácena
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiškálny rok ** predstavuje finančný rok. Všetky účtovné záznamy a ďalšie významné transakcie sú sledované pod ** Fiškálny rok **.
 DocType: Opportunity,Customer / Lead Address,Adresa zákazníka/obchodnej iniciatívy
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Nastavenie tabuľky dodávateľov
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Varovanie: Neplatný certifikát SSL na prílohu {0}
-DocType: Student Admission,Eligibility,spôsobilosť
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Názov plánu hodnotenia
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Varovanie: Neplatný certifikát SSL na prílohu {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Obchodné iniciatívy vám pomôžu získať zákazku, zaevidovať všetky vaše kontakty"
 DocType: Production Order Operation,Actual Operation Time,Aktuální Provozní doba
 DocType: Authorization Rule,Applicable To (User),Vztahující se na (Uživatel)
 DocType: Purchase Taxes and Charges,Deduct,Odečíst
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Popis Práca
 DocType: Student Applicant,Applied,aplikovaný
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Znovu otevřít
 DocType: Sales Invoice Item,Qty as per Stock UOM,Množstvo podľa skladovej MJ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Meno Guardian2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Špeciálne znaky okrem ""-"". """", ""#"", a ""/"" nie sú povolené v číselnej rade"
@@ -2295,7 +2337,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Výrobný riaditeľ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Pořadové číslo {0} je v záruce aľ {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Rozdělit dodací list do balíčků.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Zásielky
+apps/erpnext/erpnext/hooks.py +107,Shipments,Zásielky
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Celková alokovaná suma (Company mena)
 DocType: Purchase Order Item,To be delivered to customer,Ak chcete byť doručený zákazníkovi
 DocType: BOM,Scrap Material Cost,Šrot Material Cost
@@ -2318,8 +2360,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Nastavenia Variantu položky
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Vyberte spoločnost ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Nechajte prázdne ak má platiť pre všetky oddelenia
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Druhy pracovního poměru (trvalý, smluv, stážista atd.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} je povinná k položke {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Druhy pracovního poměru (trvalý, smluv, stážista atd.)"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} je povinná k položke {1}
 DocType: Process Payroll,Fortnightly,dvojtýždňové
 DocType: Currency Exchange,From Currency,Od Měny
 DocType: Vital Signs,Weight (In Kilogram),Hmotnosť (v kilogramoch)
@@ -2344,7 +2386,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Prosím, klikněte na ""Generovat Schedule"", aby se plán"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Došlo k chybám počas odstraňovania tejto schémy:
 DocType: Bin,Ordered Quantity,Objednané množstvo
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","napríklad ""Nástroje pre stavbárov """
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","napríklad ""Nástroje pre stavbárov """
 DocType: Grading Scale,Grading Scale Intervals,Triedenie dielikov
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Účtovné Vstup pre {2} môžu vykonávať len v mene: {3}
 DocType: Production Order,In Process,V procesu
@@ -2368,11 +2410,10 @@
 DocType: Purchase Invoice,With Payment of Tax,S platbou dane
 DocType: Expense Claim Detail,Expense Claim Detail,Detail úhrady výdajů
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLIKÁT PRE DODÁVATEĽA
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,"Prosím, vyberte správny účet"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,"Prosím, vyberte správny účet"
 DocType: Item,Weight UOM,Hmotnostná MJ
 DocType: Salary Structure Employee,Salary Structure Employee,Plat štruktúra zamestnancov
 DocType: Patient,Blood Group,Krevní Skupina
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Čakajúce
 DocType: Course,Course Name,Názov kurzu
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Uživatelé, kteří si vyhoví žádosti konkrétního zaměstnance volno"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Kancelářské Vybavení
@@ -2391,7 +2432,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Ceny sa nebudú zobrazovať, pokiaľ Cenník nie je nastavený"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Uveďte prosím krajinu, k tomuto Shipping pravidlá alebo skontrolovať Celosvetová doprava"
 DocType: Stock Entry,Total Incoming Value,Celková hodnota Příchozí
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Debetné K je vyžadované
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Debetné K je vyžadované
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomôže udržať prehľad o času, nákladov a účtovania pre aktivít hotový svojho tímu"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Nákupní Ceník
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Šablóny premenných ukazovateľa skóre dodávateľa.
@@ -2401,7 +2442,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Platba Odsouhlasení
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Prosím, vyberte incharge jméno osoby"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technologie
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Celkové nezaplatené: {0}
+DocType: Hub Settings,Unregister from Hub,Zrušiť registráciu zo služby Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Celkové nezaplatené: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Website Operation
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Ponuka Letter
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generování materiálu Požadavky (MRP) a výrobní zakázky.
@@ -2413,7 +2455,9 @@
 DocType: Physician Schedule Time Slot,To Time,Chcete-li čas
 DocType: Authorization Rule,Approving Role (above authorized value),Schválenie role (nad oprávnenej hodnoty)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Připsat na účet musí být Splatnost účet
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM rekurze: {0} nemůže být rodič nebo dítě {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Vyberte Študentské prijatie, ktoré je povinné pre platených študentov"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM rekurze: {0} nemůže být rodič nebo dítě {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Vyberte cenník a zverejnite ceny
 DocType: Production Order Operation,Completed Qty,Dokončené Množství
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Pro {0}, tak debetní účty mohou být spojeny proti jinému připsání"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Cenník {0} je vypnutý
@@ -2426,39 +2470,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Sériové čísla požadované pre položku {1}. Poskytli ste {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuálne ocenenie Rate
 DocType: Item,Customer Item Codes,Zákazník Položka Kódy
+DocType: Training Event,Advance,záloha
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,pre opätovné opakovanie.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange zisk / strata
 DocType: Opportunity,Lost Reason,Ztracené Důvod
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nová adresa
 DocType: Quality Inspection,Sample Size,Veľkosť vzorky
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,"Prosím, zadajte prevzatia dokumentu"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Všechny položky již byly fakturovány
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Uveďte prosím platný ""Od věci č '"
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',"Uveďte prosím platný ""Od věci č '"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Ďalšie nákladové strediská môžu byť vyrobené v rámci skupiny, ale položky môžu byť vykonané proti non-skupín"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Uživatelé a oprávnění
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Výrobné zákazky Vytvorené: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Výrobné zákazky Vytvorené: {0}
 DocType: Branch,Branch,Větev
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tisk a identita
 DocType: Company,Total Monthly Sales,Celkový mesačný predaj
 DocType: Bin,Actual Quantity,Skutočné Množstvo
 DocType: Shipping Rule,example: Next Day Shipping,Příklad: Next Day Shipping
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Pořadové číslo {0} nebyl nalezen
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Predplatné bolo {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Predplatné bolo {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Program rozpisu poplatkov
 DocType: Fee Schedule Program,Student Batch,študent Batch
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,"zvoľte * z &quot;tabVital Signs&quot;, kde patient = &#39;{0}&#39; objednajte podľa signs_date desc limit 1"
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Vytvoriť študenta
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Min Grade
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Boli ste pozvaní k spolupráci na projekte: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Lekár nie je k dispozícii na {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Boli ste pozvaní k spolupráci na projekte: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Lekár nie je k dispozícii na {0}
 DocType: Leave Block List Date,Block Date,Block Datum
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Pridajte vlastné ID odberu poľa v dokumente {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Dodacie oznámenie dodávateľa
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Nainštalovať teraz
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Nainštalovať teraz
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Aktuálny počet {0} / Čakajúci počet {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Aktuálny počet {0} / Čakajúci počet {1}
 DocType: Purchase Invoice,E-commerce GSTIN,Elektronický obchod GSTIN
 DocType: Sales Order,Not Delivered,Nedodané
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Predpokladaný dátum nemôže byť pred dátumom transakcie
 ,Bank Clearance Summary,Súhrn bankového zúčtovania
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Vytvářet a spravovat denní, týdenní a měsíční e-mailové digest."
 DocType: Appraisal Goal,Appraisal Goal,Posouzení Goal
@@ -2466,12 +2511,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,budovy
 DocType: Fee Schedule,Fee Structure,štruktúra poplatkov
 DocType: Timesheet Detail,Costing Amount,Kalkulácie Čiastka
-DocType: Student Admission,Application Fee,Poplatok za prihlášku
+DocType: Student Admission Program,Application Fee,Poplatok za prihlášku
 DocType: Process Payroll,Submit Salary Slip,Odeslat výplatní pásce
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maxiumm sleva na položky {0} {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Maxiumm sleva na položky {0} {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Dovoz hromadnú
 DocType: Sales Partner,Address & Contacts,Adresa a kontakty
 DocType: SMS Log,Sender Name,Meno odosielateľa
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Zoradiť podľa kritérií
 DocType: POS Profile,[Select],[Vybrať]
 DocType: Vital Signs,Blood Pressure (diastolic),Krvný tlak (diastolický)
 DocType: SMS Log,Sent To,Odoslané na
@@ -2480,7 +2526,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Nasledujúce Kontakt dátum nemôže byť v minulosti
 DocType: Company,For Reference Only.,Pouze orientační.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Lekár {0} nie je k dispozícii v {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Vyberte položku šarže
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Vyberte položku šarže
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Neplatný {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PInv-RET-
 DocType: Fee Validity,Reference Inv,Odkaz Inv
@@ -2496,15 +2542,15 @@
 DocType: Normal Test Items,Require Result Value,Vyžadovať výslednú hodnotu
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Případ č nemůže být 0
 DocType: Item,Show a slideshow at the top of the page,Ukazují prezentaci v horní části stránky
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,kusovníky
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Obchody
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,kusovníky
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Obchody
 DocType: Project Type,Projects Manager,Správce projektů
 DocType: Serial No,Delivery Time,Dodací lhůta
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Stárnutí dle
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Menovanie zrušené
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Menovanie zrušené
 DocType: Item,End of Life,Konec životnosti
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Cestování
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Žiadny aktívny alebo implicitné Plat Štruktúra nájdených pre zamestnancov {0} pre dané termíny
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Cestování
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Žiadny aktívny alebo implicitné Plat Štruktúra nájdených pre zamestnancov {0} pre dané termíny
 DocType: Leave Block List,Allow Users,Povolit uživatele
 DocType: Purchase Order,Customer Mobile No,Zákazník Mobile Žiadne
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Opakujúce sa
@@ -2513,12 +2559,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Aktualizace Cost
 DocType: Item Reorder,Item Reorder,Položka Reorder
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Show výplatnej páske
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Přenos materiálu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Přenos materiálu
 DocType: Fees,Send Payment Request,Odoslať žiadosť o platbu
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Zadejte operací, provozní náklady a dávají jedinečnou operaci ne své operace."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Tento dokument je nad hranicou {0} {1} pre položku {4}. Robíte si iný {3} proti rovnakej {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Prosím nastavte opakovanie po uložení
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Vybrať zmena výšky účet
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Vybrať zmena výšky účet
 DocType: Purchase Invoice,Price List Currency,Mena cenníka
 DocType: Naming Series,User must always select,Uživatel musí vždy vybrat
 DocType: Stock Settings,Allow Negative Stock,Povolit Negativní Sklad
@@ -2538,7 +2584,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Zamestnanec
 DocType: Sample Collection,Collected Time,Zhromaždený čas
 DocType: Company,Sales Monthly History,Mesačná história predaja
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Vyberte možnosť Dávka
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Vyberte možnosť Dávka
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} je úplne fakturované
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Živé znamenia
 DocType: Training Event,End Time,End Time
@@ -2546,16 +2592,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Platobné zrážky alebo strata
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardní smluvní podmínky pro prodej nebo koupi.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Seskupit podle Poukazu
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Naozaj chcete zrušiť túto schôdzku?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,predajné Pipeline
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Prosím nastaviť predvolený účet platu Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Povinné On
 DocType: Rename Tool,File to Rename,Súbor premenovať
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Prosím, vyberte BOM pre položku v riadku {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Prosím, vyberte BOM pre položku v riadku {0}"
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Účet {0} sa nezhoduje so spoločnosťou {1} v režime účtov: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Stanovená BOM {0} neexistuje k bodu {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plán údržby {0} musí být zrušena před zrušením této prodejní objednávky
+DocType: POS Profile,Applicable for Users,Platí pre používateľov
 DocType: Notification Control,Expense Claim Approved,Uhrazení výdajů schváleno
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Výplatnej páske zamestnanca {0} už vytvorili pre toto obdobie
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Výplatnej páske zamestnanca {0} už vytvorili pre toto obdobie
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Farmaceutické
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Náklady na zakoupené zboží
 DocType: Selling Settings,Sales Order Required,Je potrebná predajná objednávka
@@ -2580,6 +2628,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,organizácie
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,organizácie
 DocType: BOM Update Tool,BOM Update Tool,Nástroj na aktualizáciu kusovníka
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Zmluvný účet nie je uvedený, prosím, nastavte štandardný účet v spoločnosti"
 DocType: SG Creation Tool Course,Student Group Name,Meno Študent Group
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Vytváranie poplatkov
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Uistite sa, že naozaj chcete vymazať všetky transakcie pre túto spoločnosť. Vaše kmeňové dáta zostanú, ako to je. Túto akciu nie je možné vrátiť späť."
@@ -2588,29 +2637,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) nemôže byť väčšie, ako plánované množstvo ({2}), vo Výrobnej Objednávke {3}"
 DocType: Shipping Rule,Shipping Rule Label,Přepravní Pravidlo Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,user Forum
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Nie je možné aktualizovať zásob, faktúra obsahuje pokles lodnej dopravy tovaru."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Nie je možné aktualizovať zásob, faktúra obsahuje pokles lodnej dopravy tovaru."
 DocType: Lab Test Sample,Lab Test Sample,Laboratórna vzorka
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Rýchly vstup Journal
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Nemůžete změnit sazbu, kdyby BOM zmínil agianst libovolné položky"
+DocType: Restaurant,Invoice Series Prefix,Prefix radu faktúr
 DocType: Employee,Previous Work Experience,Předchozí pracovní zkušenosti
 DocType: Stock Entry,For Quantity,Pre Množstvo
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Prosím, zadejte Plánované Množství k bodu {0} na řádku {1}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},"Prosím, zadejte Plánované Množství k bodu {0} na řádku {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} nie je odoslané
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Žádosti o položky.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Samostatná výroba objednávka bude vytvořena pro každého hotového dobrou položku.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} musí byť negatívny vo vratnom dokumente
 ,Minutes to First Response for Issues,Zápisy do prvej reakcie na otázky
 DocType: Purchase Invoice,Terms and Conditions1,Podmínky a podmínek1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,Názov inštitútu pre ktorý nastavujete tento systém.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,Názov inštitútu pre ktorý nastavujete tento systém.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Účetní záznam zmrazeny až do tohoto data, nikdo nemůže dělat / upravit položku kromě role uvedeno níže."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Prosím, uložit dokument před generováním plán údržby"
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Posledná cena bola aktualizovaná vo všetkých kusovníkoch
 DocType: Fee Schedule,Successful,Úspešný
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Stav projektu
 DocType: UOM,Check this to disallow fractions. (for Nos),"Zkontrolujte, zda to zakázat frakce. (U č)"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Nasledujúce Výrobné zákazky boli vytvorené:
-DocType: Student Admission,Naming Series (for Student Applicant),Pomenovanie Series (pre študentské prihlasovateľ)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Nasledujúce Výrobné zákazky boli vytvorené:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Pomenovanie Series (pre študentské prihlasovateľ)
 DocType: Delivery Note,Transporter Name,Přepravce Název
 DocType: Authorization Rule,Authorized Value,Autorizovaný Hodnota
 DocType: BOM,Show Operations,ukázať Operations
@@ -2634,7 +2684,7 @@
 ,Employees working on a holiday,Zamestnanci pracujúci na dovolenku
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,mark Present
 DocType: Project,% Complete Method,Dokončené% Method
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,liek
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,liek
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Datum zahájení údržby nemůže být před datem dodání pro pořadové číslo {0}
 DocType: Production Order,Actual End Date,Skutečné datum ukončení
 DocType: BOM,Operating Cost (Company Currency),Prevádzkové náklady (Company mena)
@@ -2652,13 +2702,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Schválení Uživatel nemůže být stejná jako uživatel pravidlo se vztahuje na
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Základná sadzba (podľa skladovej MJ)
 DocType: SMS Log,No of Requested SMS,Počet žádaným SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Nechať bez nároku na odmenu nesúhlasí so schválenými záznamov nechať aplikáciu
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Nechať bez nároku na odmenu nesúhlasí so schválenými záznamov nechať aplikáciu
 DocType: Campaign,Campaign-.####,Kampaň-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Ďalšie kroky
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Prosím dodávať uvedené položky na najlepšie možné ceny
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Proveďte faktury
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto zavrieť Opportunity po 15 dňoch
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Objednávky nie sú povolené {0} kvôli postaveniu skóre {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Objednávky nie sú povolené {0} kvôli postaveniu skóre {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,koniec roka
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Olovo%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Olovo%
@@ -2715,7 +2765,6 @@
  10. Přidat nebo odečítat: Ať už chcete přidat nebo odečíst daň."
 DocType: Homepage,Homepage,Úvodné
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Vyberte lekára ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',karta aktualizácieConsultácia nastavená faktúra = &#39;{0}&#39; kde name = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd Množství
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Fee Records Vytvoril - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Kategórie Account
@@ -2727,7 +2776,7 @@
 DocType: Asset,Manual,Manuálny
 DocType: Salary Component Account,Salary Component Account,Účet plat Component
 DocType: Global Defaults,Hide Currency Symbol,Skrýt symbol měny
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","napríkklad banka, hotovosť, kreditné karty"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","napríkklad banka, hotovosť, kreditné karty"
 DocType: Lead Source,Source Name,Názov zdroja
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Normálny pokojový krvný tlak u dospelého pacienta je približne 120 mmHg systolický a diastolický 80 mmHg, skrátený &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Dobropis
@@ -2746,16 +2795,16 @@
 DocType: Patient,Occupation,povolania
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,"Row {0}: datum zahájení, musí být před koncem roku Datum"
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (ks)
-DocType: Sales Invoice,This Document,tento dokument
 DocType: Installation Note Item,Installed Qty,Instalované množství
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Môže to byť spôsobené niektorými neplatnými e-mailovými adresami v priečinku
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Pridali ste
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,tréning Výsledok
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,tréning Výsledok
 DocType: Purchase Invoice,Is Paid,sa vypláca
 DocType: Salary Structure,Total Earning,Celkem Zisk
 DocType: Purchase Receipt,Time at which materials were received,"Čas, kdy bylo přijato materiály"
 DocType: Stock Ledger Entry,Outgoing Rate,Odchádzajúce Rate
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Organizace větev master.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Organizace větev master.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,alebo
 DocType: Sales Order,Billing Status,Stav fakturácie
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Nahlásiť problém
@@ -2770,8 +2819,9 @@
 DocType: Notification Control,Sales Order Message,Poznámka predajnej objednávky
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Nastavit jako výchozí hodnoty, jako je společnost, měna, aktuálním fiskálním roce, atd"
 DocType: Payment Entry,Payment Type,Typ platby
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vyberte položku Dávka pre položku {0}. Nie je možné nájsť jednu dávku, ktorá spĺňa túto požiadavku"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vyberte položku Dávka pre položku {0}. Nie je možné nájsť jednu dávku, ktorá spĺňa túto požiadavku"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vyberte položku Dávka pre položku {0}. Nie je možné nájsť jednu dávku, ktorá spĺňa túto požiadavku"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vyberte položku Dávka pre položku {0}. Nie je možné nájsť jednu dávku, ktorá spĺňa túto požiadavku"
+DocType: Hub Category,Parent Category,Rodičová kategória
 DocType: Process Payroll,Select Employees,Vybrať Zamestnanci
 DocType: Opportunity,Potential Sales Deal,Potenciální prodej
 DocType: Complaint,Complaints,sťažnosti
@@ -2808,7 +2858,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikace balíčku pro dodávky (pro tisk)
 DocType: Bin,Reserved Quantity,Vyhrazeno Množství
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Zadajte platnú e-mailovú adresu
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Vyberte prosím položku v košíku
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Vyberte prosím položku v košíku
 DocType: Landed Cost Voucher,Purchase Receipt Items,Položky příjemky
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Prispôsobenie Formuláre
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,nedoplatok
@@ -2818,15 +2868,15 @@
 DocType: Payment Request,Amount in customer's currency,Čiastka v mene zákazníka
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Dodávka
 DocType: Stock Reconciliation Item,Current Qty,Aktuálne Množstvo
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Pridať dodávateľov
+DocType: Restaurant Menu,Restaurant Menu,Reštaurácia
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Predchádzajúce
 DocType: Appraisal Goal,Key Responsibility Area,Key Odpovědnost Area
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Študent Šarže pomôže sledovať dochádzku, hodnotenia a poplatky pre študentov"
 DocType: Payment Entry,Total Allocated Amount,Celková alokovaná suma
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Nastavte predvolený inventárny účet pre trvalý inventár
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Nastavte predvolený inventárny účet pre trvalý inventár
 DocType: Item Reorder,Material Request Type,Materiál Typ požadavku
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural Journal vstup na platy z {0} až {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","Miestne úložisko je plné, nezachránil"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","Miestne úložisko je plné, nezachránil"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Riadok {0}: Konverzný faktor MJ je povinný
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Kapacita miestnosti
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref
@@ -2865,16 +2915,18 @@
 DocType: Project,Task Completion,úloha Dokončenie
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,nie je na sklade
 DocType: Appraisal,HR User,HR User
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Daně a odečtené
-apps/erpnext/erpnext/hooks.py +129,Issues,Problémy
+apps/erpnext/erpnext/hooks.py +138,Issues,Problémy
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Stav musí být jedním z {0}
 DocType: Sales Invoice,Debit To,Debetní K
+DocType: Restaurant Menu Item,Restaurant Menu Item,Položka ponuky Reštaurácia
 DocType: Delivery Note,Required only for sample item.,Požadováno pouze pro položku vzorku.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Skutečné Množství Po transakci
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Č plat sklzu nájdený medzi {0} a {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Č plat sklzu nájdený medzi {0} a {1}
 ,Pending SO Items For Purchase Request,"Do doby, než SO položky k nákupu Poptávka"
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,študent Prijímacie
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} je zakázaný
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,študent Prijímacie
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} je zakázaný
 DocType: Supplier,Billing Currency,Mena fakturácie
 DocType: Sales Invoice,SINV-RET-,Sinv-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Extra Veľké
@@ -2897,6 +2949,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Prosím, uveďte počet požadovaných návštěv"
 DocType: Stock Settings,Default Valuation Method,Výchozí metoda ocenění
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,poplatok
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Prebieha aktualizácia. Môže to chvíľu trvať.
 DocType: Vehicle Log,Fuel Qty,palivo Množstvo
 DocType: Production Order Operation,Planned Start Time,Plánované Start Time
 DocType: Course,Assessment,posúdenie
@@ -2912,7 +2965,7 @@
 DocType: Price List,Price List Master,Ceník Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Všechny prodejní transakce mohou být označeny proti více ** prodejcům **, takže si můžete nastavit a sledovat cíle."
 ,S.O. No.,SO Ne.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Prosím vytvorte Zákazníka z Obchodnej iniciatívy {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Prosím vytvorte Zákazníka z Obchodnej iniciatívy {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Vyberte pacienta
 DocType: Price List,Applicable for Countries,Pre krajiny
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Názov parametra
@@ -2956,27 +3009,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Náklady / Rozdíl účtu ({0}), musí být ""zisk nebo ztráta"" účet"
 DocType: Project,Copied From,Skopírované z
 DocType: Project,Copied From,Skopírované z
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Názov chyba: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,nedostatok
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Názov chyba: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,nedostatok
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} nie je spojené s {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Účast na zaměstnance {0} je již označen
 DocType: Packing Slip,If more than one package of the same type (for print),Pokud je více než jeden balík stejného typu (pro tisk)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Nastavte štandardný zákazník v nastaveniach reštaurácie
 ,Salary Register,plat Register
 DocType: Warehouse,Parent Warehouse,Parent Warehouse
 DocType: C-Form Invoice Detail,Net Total,Netto Spolu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Predvolený kusovník sa nenašiel pre položku {0} a projekt {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Predvolený kusovník sa nenašiel pre položku {0} a projekt {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Definovať rôzne typy úverov
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Dlužné částky
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Čas (v min)
 DocType: Project Task,Working,Pracovní
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Skladové karty (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Finančný rok
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Finančný rok
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} nepatrí do Spoločnosti {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,"Nie je možné vyriešiť funkciu skóre skóre {0}. Skontrolujte, či je vzorec platný."
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Štát ako na
 DocType: Healthcare Settings,Out Patient Settings,Nastavenia pre pacienta
 DocType: Account,Round Off,Zaokrúhliť
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Množstvo musí byť pozitívne
 ,Requested Qty,Požadované množství
 DocType: Tax Rule,Use for Shopping Cart,Použitie pre Košík
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Hodnota {0} atribútu {1} neexistuje v zozname platného bodu Hodnoty atribútov pre položky {2}
@@ -2985,7 +3040,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Poplatky budou rozděleny úměrně na základě položky Množství nebo částkou, dle Vašeho výběru"
 DocType: Maintenance Visit,Purposes,Cíle
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Aspoň jedna položka by mala byť zadaná s negatívnym množstvom vo vratnom dokumente
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Pridať kurzy
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Prevádzka {0} dlhšie, než všetkých dostupných pracovných hodín v pracovnej stanici {1}, rozložiť prevádzku do niekoľkých operácií"
 ,Requested,Požadované
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Žiadne poznámky
@@ -2997,6 +3051,8 @@
 DocType: Employee Loan,Repaid/Closed,Splatená / Zatvorené
 DocType: Item,Total Projected Qty,Celková predpokladaná Množstvo
 DocType: Monthly Distribution,Distribution Name,Názov distribúcie
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dodávateľ&gt; Typ dodávateľa
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Miera zhodnotenia sa nezistila pre položku {0}, ktorá je povinná robiť účtovné položky pre {1} {2}. Ak položka transakcia prebieha ako položku s nulovou hodnotou v {1}, uveďte ju v tabuľke {1} položky. V opačnom prípade prosím vytvorte pre túto položku transakciu s akciami alebo zmienku o oceňovaní v položke záznamu a skúste odoslať / zrušiť túto položku"
 DocType: Course,Course Code,kód predmetu
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Kontrola kvality potřebný k bodu {0}
 DocType: POS Settings,Use POS in Offline Mode,Používajte POS v režime offline
@@ -3007,14 +3063,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Správa Territory strom.
 DocType: Journal Entry Account,Sales Invoice,Predajná faktúra
 DocType: Journal Entry Account,Party Balance,Balance Party
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,"Prosím, vyberte Použiť Zľava na"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,"Prosím, vyberte Použiť Zľava na"
 DocType: Company,Default Receivable Account,Výchozí pohledávek účtu
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Vytvoření bankovní položka pro celkové vyplacené mzdy za výše zvolených kritérií
 DocType: Physician,Physician Schedule,Plán lekára
 DocType: Purchase Invoice,Deemed Export,Považovaný export
 DocType: Stock Entry,Material Transfer for Manufacture,Materiál Přenos: Výroba
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Sleva v procentech lze použít buď proti Ceníku nebo pro všechny Ceníku.
-DocType: Purchase Invoice,Half-yearly,Pololetní
+DocType: Subscription,Half-yearly,Pololetní
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Účetní položka na skladě
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Vyhodnotili ste kritériá hodnotenia {}.
@@ -3043,13 +3099,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Extra Malé
 DocType: Company,Standard Template,štandardná šablóna
 DocType: Training Event,Theory,teória
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Upozornění: Materiál Požadované množství je menší než minimální objednávka Množství
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Upozornění: Materiál Požadované množství je menší než minimální objednávka Množství
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Účet {0} je zmrazen
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Právní subjekt / dceřiná společnost s oddělenou Graf účtů, které patří do organizace."
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Potraviny, nápoje a tabák"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Možno vykonať len platbu proti nevyfakturované {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Rychlost Komise nemůže být větší než 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Možno vykonať len platbu proti nevyfakturované {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Rychlost Komise nemůže být větší než 100
 DocType: Stock Entry,Subcontract,Subdodávka
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,"Prosím, najprv zadajte {0}"
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Žiadne odpovede od
@@ -3067,10 +3123,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Farebné
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Plan Assessment Criteria
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Zabráňte nákupným objednávkam
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,vnímavý
 DocType: Patient Appointment,Scheduled,Plánované
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Žiadosť o cenovú ponuku.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosím, nastavte systém pomenovania zamestnancov v oblasti ľudských zdrojov&gt; Nastavenia personálu"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Prosím, vyberte položku, kde &quot;Je skladom,&quot; je &quot;Nie&quot; a &quot;je Sales Item&quot; &quot;Áno&quot; a nie je tam žiadny iný produkt Bundle"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Vyberte zákazníka
 DocType: Student Log,Academic,akademický
 DocType: Patient,Personal and Social History,Osobná a sociálna história
 DocType: Fee Schedule,Fee Breakup for each student,Poplatok za každý študent
@@ -3080,7 +3137,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Ocenění Rate
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,motorová nafta
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Mena pre cenník nie je vybratá
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Mena pre cenník nie je vybratá
 apps/erpnext/erpnext/config/healthcare.py +46,Results,výsledky
 ,Student Monthly Attendance Sheet,Študent mesačná návštevnosť Sheet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Zamestnanec {0} už požiadal o {1} mezi {2} a {3}
@@ -3096,7 +3153,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Správa prodejních partnerů.
 DocType: Quality Inspection,Inspection Type,Kontrola Type
 DocType: Fee Validity,Visited yet,Navštívené
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Sklady s existujúcimi transakcie nemožno previesť na skupinu.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Sklady s existujúcimi transakcie nemožno previesť na skupinu.
 DocType: Assessment Result Tool,Result HTML,výsledok HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Vyprší
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Pridajte študentov
@@ -3123,7 +3180,7 @@
 DocType: Healthcare Settings,Result Printed,Výsledok vytlačený
 DocType: Asset Category Account,Depreciation Expense Account,Odpisy Náklady účtu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Skúšobná doba
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Zobraziť {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Zobraziť {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Pouze koncové uzly jsou povoleny v transakci
 DocType: Expense Claim,Expense Approver,Schvalovatel výdajů
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Riadok {0}: Advance proti zákazník musí byť úver
@@ -3135,7 +3192,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Chcete-li datetime
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Plány kurzu ruší:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Protokoly pre udržanie stavu doručenia sms
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Nastavte cieľ predaja
 DocType: Accounts Settings,Make Payment via Journal Entry,Vykonať platbu cez Journal Entry
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Vytlačené na
 DocType: Item,Inspection Required before Delivery,Inšpekcia Požadované pred pôrodom
@@ -3143,7 +3199,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Nevybavené Aktivity
 DocType: Patient Appointment,Reminded,pripomenul
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Vaša organizácia
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Vaša organizácia
 DocType: Fee Component,Fees Category,kategórie poplatky
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Zadejte zmírnění datum.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
@@ -3155,7 +3211,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Změna pořadí Level
 DocType: Company,Chart Of Accounts Template,Účtový rozvrh šablóny
 DocType: Attendance,Attendance Date,Účast Datum
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Položka Cena aktualizovaný pre {0} v Cenníku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Položka Cena aktualizovaný pre {0} v Cenníku {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plat rozpad na základě Zisk a dedukce.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Účet s podřízenými uzly nelze převést na hlavní účetní knihu
 DocType: Purchase Invoice Item,Accepted Warehouse,Schválené Sklad
@@ -3171,9 +3227,10 @@
 ,Employee Birthday,Narozeniny zaměstnance
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Študent Batch Účasť Tool
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,limit skríženými
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Plánované až
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Akademický termín s týmto &quot;akademický rok &#39;{0} a&quot; Meno Termín&#39; {1} už existuje. Upravte tieto položky a skúste to znova.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}",Pretože existujú nejaké transakcie voči položke {0} nemožno zmeniť hodnotu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}",Pretože existujú nejaké transakcie voči položke {0} nemožno zmeniť hodnotu {1}
 DocType: UOM,Must be Whole Number,Musí být celé číslo
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nové Listy Přidělené (ve dnech)
 DocType: Purchase Invoice,Invoice Copy,Kopírovanie faktúry
@@ -3183,7 +3240,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Číslo faktúry
 DocType: Shopping Cart Settings,Orders,Objednávky
 DocType: Employee Leave Approver,Leave Approver,Schvaľovateľ voľna
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Vyberte dávku
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Vyberte dávku
 DocType: Assessment Group,Assessment Group Name,Názov skupiny Assessment
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Prevádza jadrový materiál pre Výroba
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Uživatel s rolí ""Schvalovatel výdajů"""
@@ -3198,7 +3255,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Období Uzávěrka Entry
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Vyberte oddelenie ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Nákladové středisko se stávajícími transakcemi nelze převést do skupiny
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Množstvo {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Množstvo {0} {1} {2} {3}
 DocType: Account,Depreciation,Znehodnocení
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dodavatel (é)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Účasť zamestnancov Tool
@@ -3210,10 +3267,12 @@
 DocType: GL Entry,Voucher No,Voucher No
 ,Lead Owner Efficiency,Efektívnosť vlastníka iniciatívy
 ,Lead Owner Efficiency,Efektívnosť vlastníka iniciatívy
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Najpopulárnejší
 DocType: Leave Allocation,Leave Allocation,Nechte Allocation
 DocType: Payment Request,Recipient Message And Payment Details,Príjemca správy a platobných informácií
 DocType: Training Event,Trainer Email,tréner Email
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Materiál Žádosti {0} vytvořené
+DocType: Restaurant Reservation,No of People,Počet ľudí
 DocType: Production Planning Tool,Include sub-contracted raw materials,Zahrnúť sub-zmluvné suroviny
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Šablona podmínek nebo smlouvy.
 DocType: Purchase Invoice,Address and Contact,Adresa a Kontakt
@@ -3222,10 +3281,11 @@
 DocType: Supplier,Last Day of the Next Month,Posledný deň nasledujúceho mesiaca
 DocType: Support Settings,Auto close Issue after 7 days,Auto zavrieť Issue po 7 dňoch
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Dovolenka nemôže byť pridelené pred {0}, pretože rovnováha dovolenky už bolo carry-odovzdávané v budúcej pridelenie dovolenku záznamu {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Poznámka: Z důvodu / Referenční datum překračuje povolené zákazníků úvěrové dní od {0} den (s)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Poznámka: Z důvodu / Referenční datum překračuje povolené zákazníků úvěrové dní od {0} den (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,študent Žiadateľ
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINÁL PRE PRÍJEMCU
 DocType: Asset Category Account,Accumulated Depreciation Account,účet oprávok
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Tento e-mail je automaticky generovaný
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Příspěvky
 DocType: Program Enrollment,Boarding Student,Stravovanie Študent
 DocType: Asset,Expected Value After Useful Life,Očakávaná hodnota po celú dobu životnosti
@@ -3233,7 +3293,7 @@
 DocType: Activity Cost,Billing Rate,Fakturačná cena
 ,Qty to Deliver,Množství k dodání
 ,Stock Analytics,Analýza zásob
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Operácia nemôže byť prázdne
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Operácia nemôže byť prázdne
 DocType: Maintenance Visit Purpose,Against Document Detail No,Proti Detail dokumentu č
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Typ strana je povinná
 DocType: Quality Inspection,Outgoing,Vycházející
@@ -3256,7 +3316,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Vyberte manuálne študentov pre skupinu založenú na aktivitách
 DocType: Journal Entry,User Remark,Uživatel Poznámka
 DocType: Lead,Market Segment,Segment trhu
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Zaplatená suma nemôže byť vyšší ako celkový negatívny dlžnej čiastky {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Zaplatená suma nemôže byť vyšší ako celkový negatívny dlžnej čiastky {0}
 DocType: Supplier Scorecard Period,Variables,Premenné
 DocType: Employee Internal Work History,Employee Internal Work History,Interní historie práce zaměstnance
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Uzavření (Dr)
@@ -3286,21 +3346,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Získať aktualizácie
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Účet {2} nepatrí do spoločnosti {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Materiál Request {0} je zrušena nebo zastavena
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Správa priepustiek
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Správa priepustiek
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Seskupit podle účtu
 DocType: Sales Order,Fully Delivered,Plně Dodáno
 DocType: Lead,Lower Income,S nižšími příjmy
+DocType: Restaurant Order Entry,Current Order,Aktuálna objednávka
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Zdroj a cíl sklad nemůže být stejná pro řádek {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Rozdiel účet musí byť typu aktív / Zodpovednosť účet, pretože to Reklamná Zmierenie je Entry Otvorenie"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Zaplatené čiastky nemôže byť väčšia ako Výška úveru {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Prejdite na položku Programy
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Zákazková výroba nevytvorili
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Zákazková výroba nevytvorili
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Dátum DO"" musí byť po ""Dátum OD"""
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Nemôže zmeniť štatút študenta {0} je prepojený s aplikáciou študentské {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Nemôže zmeniť štatút študenta {0} je prepojený s aplikáciou študentské {1}
 DocType: Asset,Fully Depreciated,plne odpísaný
 ,Stock Projected Qty,Naprojektovaná úroveň zásob
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Výrazná Účasť HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Ponuky sú návrhy, ponuky zaslané vašim zákazníkom"
 DocType: Sales Order,Customer's Purchase Order,Zákazníka Objednávka
@@ -3311,8 +3372,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Prosím nastavte Počet Odpisy rezervované
 DocType: Supplier Scorecard Period,Calculations,výpočty
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Hodnota nebo Množství
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Productions Objednávky nemôže byť zvýšená pre:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Productions Objednávky nemôže byť zvýšená pre:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Minúta
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte pomenovanie série {0} cez Nastavenie&gt; Nastavenia&gt; Pomenovanie série
 DocType: Purchase Invoice,Purchase Taxes and Charges,Nákup Daně a poplatky
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Prejdite na dodávateľov
 ,Qty to Receive,Množství pro příjem
@@ -3326,7 +3388,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Pripísať na účet musí byť účtu Súvaha
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Všechny typy Dodavatele
 DocType: Global Defaults,Disable In Words,Zakázať v slovách
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Kód položky je povinné, protože položka není automaticky číslovány"
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,"Kód položky je povinné, protože položka není automaticky číslovány"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Ponuka {0} nie je typu {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Plán údržby Item
 DocType: Sales Order,%  Delivered,% Dodaných
@@ -3348,23 +3410,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Počiatočný stav Equity
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,zmierenie
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,zostávajúce
 DocType: Appraisal,Appraisal,Ocenění
 DocType: Purchase Invoice,GST Details,Podrobnosti GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},E-mailu zaslaného na dodávateľa {0}
+DocType: Item,Default Sales Unit of Measure,Predvolená predajná jednotka merania
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum se opakuje
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Prokurista
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Schvaľujúci musí byť jeden z {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Vytvorte poplatky
-DocType: Hub Settings,Seller Email,Prodávající E-mail
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Celkové obstarávacie náklady (cez nákupné faktúry)
 DocType: Training Event,Start Time,Start Time
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Zvoľte množstvo
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Zvoľte množstvo
 DocType: Customs Tariff Number,Customs Tariff Number,colného sadzobníka
 DocType: Patient Appointment,Patient Appointment,Menovanie pacienta
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Schválení role nemůže být stejná jako role pravidlo se vztahuje na
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Odhlásiť sa z tohto Email Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Odhlásiť sa z tohto Email Digest
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Získajte dodávateľov od
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} sa nenašiel pre položku {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Prejdite na Kurzy
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Správa bola odoslaná
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Účet s podriadené uzly nie je možné nastaviť ako hlavnej knihy
@@ -3377,11 +3442,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Materiál Prenesená pre výrobu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Účet {0} neexistuje
 DocType: Project,Project Type,Typ projektu
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Detská úloha existuje pre túto úlohu. Túto úlohu nemôžete odstrániť.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Buď cílové množství nebo cílová částka je povinná.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Náklady na rôznych aktivít
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Žiadne ďalšie výsledky
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Náklady na rôznych aktivít
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Nastavenie udalostí do {0}, pretože zamestnanec pripojená k nižšie predajcom nemá ID užívateľa {1}"
 DocType: Timesheet,Billing Details,fakturačné údaje
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Zdrojové a cieľové sklad sa musí líšiť
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Zdrojové a cieľové sklad sa musí líšiť
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Není dovoleno měnit obchodů s akciemi starší než {0}
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Plně Fakturovaný
@@ -3408,7 +3475,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Bankovní převod
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,"skontrolujte, či všetky"
 DocType: Vehicle Log,Invoice Ref,faktúra Ref
-DocType: Purchase Order,Recurring Order,Opakujúca se objednávka
 DocType: Company,Default Income Account,Účet Default příjmů
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Zákazník Group / Customer
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Neuzavretý fiškálnych rokov Zisk / strata (Credit)
@@ -3422,9 +3488,9 @@
 DocType: Patient,A Negative,Negatívny
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,To je všetko
 DocType: Lead,From Customer,Od Zákazníka
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Volá
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Volá
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,A produkt
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,Šarže
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,Šarže
 DocType: Project,Total Costing Amount (via Time Logs),Celková kalkulácie Čiastka (cez Time Záznamy)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Uskutočniť rozpis poplatkov
 DocType: Purchase Order Item Supplied,Stock UOM,Skladová MJ
@@ -3449,7 +3515,7 @@
 DocType: School Settings,Current Academic Term,Aktuálny akademický výraz
 DocType: School Settings,Current Academic Term,Aktuálny akademický výraz
 DocType: Sales Order,Not Billed,Nevyúčtované
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Oba Sklady musí patřit do stejné společnosti
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Oba Sklady musí patřit do stejné společnosti
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Žádné kontakty přidán dosud.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Přistál Náklady Voucher Částka
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Faktúry od dodávateľov
@@ -3458,7 +3524,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Částka slevy
 DocType: Purchase Invoice,Return Against Purchase Invoice,Návrat proti nákupnej faktúry
 DocType: Item,Warranty Period (in days),Záruční doba (ve dnech)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',aktualizovať tabPatient Appointment nastaviť sales_invoice = &#39;{0}&#39; kde name = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Súvislosť s Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Čistý peňažný tok z prevádzkovej
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Bod 4
@@ -3467,8 +3532,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Zápis do deníku Účet
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,študent Group
 DocType: Shopping Cart Settings,Quotation Series,Číselná rada ponúk
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Položka s rovnakým názvom už existuje ({0}), prosím, zmente názov skupiny položiek alebo premenujte položku"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,vyberte zákazníka
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Položka s rovnakým názvom už existuje ({0}), prosím, zmente názov skupiny položiek alebo premenujte položku"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,vyberte zákazníka
 DocType: C-Form,I,ja
 DocType: Company,Asset Depreciation Cost Center,Asset Odpisy nákladového strediska
 DocType: Sales Order Item,Sales Order Date,Dátum predajnej objednávky
@@ -3477,6 +3542,7 @@
 DocType: Assessment Plan,Assessment Plan,Plan Assessment
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Zákazník {0} je vytvorený.
 DocType: Stock Settings,Limit Percent,limit Percento
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Momentálne nie je k dispozícii žiadny sklad v žiadnom sklade
 ,Payment Period Based On Invoice Date,Platební období na základě data vystavení faktury
 DocType: Sample Collection,No. of print,Počet potlače
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Chybí Směnárna Kurzy pro {0}
@@ -3532,13 +3598,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Total dedukcie - splátky
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,Aktuální BOM a New BOM nemůže být stejné
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Plat Slip ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Plat Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,"Datum odchodu do důchodu, musí být větší než Datum spojování"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,"Došlo k chybám, zatiaľ čo rozvrhovanie kurz na:"
 DocType: Sales Invoice,Against Income Account,Proti účet příjmů
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% dodané
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Položka {0}: Objednané množstvo {1} nemôže byť nižšia ako minimálna Objednané množstvo {2} (definovanej v bode).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Položka {0}: Objednané množstvo {1} nemôže byť nižšia ako minimálna Objednané množstvo {2} (definovanej v bode).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Měsíční Distribution Procento
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Prihláste sa ako iný používateľ.
 DocType: Territory,Territory Targets,Území Cíle
 DocType: Delivery Note,Transporter Info,Transporter Info
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Prosím nastaviť predvolený {0} vo firme {1}
@@ -3546,13 +3613,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Rovnaký dodávateľ bol zadaný viackrát
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Hrubý zisk / strata
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Dodané položky vydané objednávky
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Názov spoločnosti nemôže byť Company
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Názov spoločnosti nemôže byť Company
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Dopis hlavy na tiskových šablon.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Tituly na tiskových šablon, např zálohové faktury."
 DocType: Program Enrollment,Walking,chôdza
 DocType: Student Guardian,Student Guardian,študent Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Poplatky typu ocenenie môže nie je označený ako Inclusive
 DocType: POS Profile,Update Stock,Aktualizace skladem
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,v predplatnom
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Různé UOM položky povede k nesprávné (celkem) Čistá hmotnost hodnoty. Ujistěte se, že čistá hmotnost každé položky je ve stejném nerozpuštěných."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,Zápis do denníka do šrotu
@@ -3602,15 +3670,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System User (login) ID. Pokud je nastaveno, stane se výchozí pro všechny formy HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Z {1}
 DocType: Task,depends_on,záleží na
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Naliehavá aktualizácia najnovšej ceny vo všetkých účtovných dokladoch. Môže to trvať niekoľko minút.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Naliehavá aktualizácia najnovšej ceny vo všetkých účtovných dokladoch. Môže to trvať niekoľko minút.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Názov nového účtu. Poznámka: Prosím, vytvárať účty pre zákazníkov a dodávateľmi"
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Země moudrý výchozí adresa Templates
 DocType: Sales Order Item,Supplier delivers to Customer,Dodávateľ doručí zákazníkovi
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Položka / {0}) nie je na sklade
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Vzhledem / Referenční datum nemůže být po {0}
+,Sales Payment Summary,Prehľad platieb z predaja
+DocType: Restaurant,Restaurant,reštaurácie
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Vzhledem / Referenční datum nemůže být po {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Import dát a export
 DocType: Patient,Account Details,Údaje o účtu
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Žiadni študenti Nájdené
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Žiadni študenti Nájdené
 DocType: Medical Department,Medical Department,Lekárske oddelenie
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Hodnotiace kritériá pre dodávateľa Scorecard
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Faktúra Dátum zverejnenia
@@ -3621,8 +3691,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,"Prosím, vyberte Dátum zverejnenia pred výberom Party"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Vyberte prosím ponuky
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Vyberte prosím ponuky
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Vyberte prosím ponuky
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Vyberte prosím ponuky
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Počet Odpisy rezervované nemôže byť väčšia ako celkový počet Odpisy
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Proveďte návštěv údržby
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,"Prosím, kontaktujte pro uživatele, kteří mají obchodní manažer ve skupině Master {0} roli"
@@ -3630,7 +3700,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Company (nikoliv zákazník nebo dodavatel) master.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,To je založené na účasti tohto študenta
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Žiadni študenti v
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Pridať ďalšie položky alebo otvorené plnej forme
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Pridať ďalšie položky alebo otvorené plnej forme
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dodací listy {0} musí být zrušena před zrušením této prodejní objednávky
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Prejdite na položku Používatelia
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Placená částka + odepsat Částka nesmí být větší než Grand Total
@@ -3650,37 +3720,40 @@
 DocType: Fee Schedule,Fee Schedule,poplatok Plán
 DocType: Hub Settings,Publish Availability,Publikování Dostupnost
 DocType: Company,Create Chart Of Accounts Based On,Vytvorte účtový rozvrh založený na
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Nemožno ju previesť na inú skupinu. Detské úlohy existujú.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Dátum narodenia nemôže byť väčšia ako dnes.
 ,Stock Ageing,Starnutie zásob
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Existujú Študent {0} proti uchádzač študent {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Úprava zaokrúhľovania (mena spoločnosti)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,pracovný výkaz
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,pracovný výkaz
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' je vypnuté
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nastaviť ako Otvorené
 DocType: Cheque Print Template,Scanned Cheque,skenovaných Šek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Posílat automatické e-maily na Kontakty na předložení transakcí.
 DocType: Timesheet,Total Billable Amount,Celková suma Fakturovateľná
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Položka 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Zadanie objednávky
 DocType: Purchase Order,Customer Contact Email,Zákazník Kontaktný e-mail
 DocType: Warranty Claim,Item and Warranty Details,Položka a Záruka Podrobnosti
 DocType: Sales Team,Contribution (%),Příspěvek (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Poznámka: Položka Platba nebude vytvořili, protože ""v hotovosti nebo bankovním účtu"" nebyl zadán"
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Projekt {0} už existuje
 DocType: Medical Department,Nursing User,Ošetrujúci používateľ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Zodpovednosť
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Platnosť tejto ponuky sa skončila.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Platnosť tejto ponuky sa skončila.
 DocType: Expense Claim Account,Expense Claim Account,Náklady na poistné Account
 DocType: Accounts Settings,Allow Stale Exchange Rates,Povoliť stale kurzy výmeny
 DocType: Sales Person,Sales Person Name,Meno predajcu
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Zadejte prosím aspoň 1 fakturu v tabulce
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Pridať používateľa
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Pridať používateľa
 DocType: POS Item Group,Item Group,Položka Group
 DocType: Item,Safety Stock,bezpečnostné Sklad
 DocType: Healthcare Settings,Healthcare Settings,Nastavenia zdravotnej starostlivosti
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Pokrok% za úlohu nemôže byť viac ako 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Pokrok% za úlohu nemôže byť viac ako 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Pred odsúhlasením
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Chcete-li {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Daně a poplatky Přidal (Company měna)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Položka Tax Row {0} musí mít účet typu daní či výnosů nebo nákladů, nebo Vyměřovací"
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Položka Tax Row {0} musí mít účet typu daní či výnosů nebo nákladů, nebo Vyměřovací"
 DocType: Sales Order,Partly Billed,Částečně Účtovaný
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Item {0} musí byť dlhodobý majetok položka
 DocType: Item,Default BOM,Výchozí BOM
@@ -3696,6 +3769,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,premenlivý
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Z Dodacího Listu
 DocType: Student,Student Email Address,Študent E-mailová adresa
+DocType: Item,Hub Warehouse,Hub Warehouse
 DocType: Physician Schedule Time Slot,From Time,Času od
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Na sklade:
 DocType: Notification Control,Custom Message,Custom Message
@@ -3704,9 +3778,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Adresa študenta
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Adresa študenta
 DocType: Purchase Invoice,Price List Exchange Rate,Katalogová cena Exchange Rate
+DocType: POS Profile,POS Profile Name,Názov profilu POS
 DocType: Purchase Invoice Item,Rate,Sadzba
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Internovat
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Meno adresy
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Meno adresy
 DocType: Stock Entry,From BOM,Od BOM
 DocType: Assessment Code,Assessment Code,kód Assessment
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Základné
@@ -3720,11 +3795,12 @@
 DocType: Salary Slip,Salary Structure,Plat struktura
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Letecká linka
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Vydání Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Vydání Material
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Vyskytla sa chyba pri vytváraní opakovania
 DocType: Material Request Item,For Warehouse,Pro Sklad
 DocType: Employee,Offer Date,Dátum Ponuky
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Ponuky
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,"Ste v režime offline. Nebudete môcť znovu, kým nebudete mať sieť."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,"Ste v režime offline. Nebudete môcť znovu, kým nebudete mať sieť."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Žiadne študentské skupiny vytvorený.
 DocType: Purchase Invoice Item,Serial No,Výrobní číslo
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Mesačné splátky suma nemôže byť vyššia ako suma úveru
@@ -3734,17 +3810,18 @@
 DocType: Salary Slip,Total Working Hours,Celkovej pracovnej doby
 DocType: Subscription,Next Schedule Date,Nasledujúci dátum plánovania
 DocType: Stock Entry,Including items for sub assemblies,Vrátane položiek pre montážnych podskupín
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Zadajte hodnota musí byť kladná
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Všetky územia
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Zadajte hodnota musí byť kladná
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Všetky územia
 DocType: Purchase Invoice,Items,Položky
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Študent je už zapísané.
 DocType: Fiscal Year,Year Name,Meno roku
 DocType: Process Payroll,Process Payroll,Proces Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Existují další svátky než pracovních dnů tento měsíc.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Existují další svátky než pracovních dnů tento měsíc.
 DocType: Product Bundle Item,Product Bundle Item,Položka produktového balíčka
 DocType: Sales Partner,Sales Partner Name,Meno predajného partnera
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Žiadosť o citátov
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Žiadosť o citátov
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maximálna suma faktúry
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,hematológie
 DocType: Normal Test Items,Normal Test Items,Normálne testované položky
 DocType: Student Language,Student Language,študent Language
 apps/erpnext/erpnext/config/selling.py +23,Customers,Zákazníci
@@ -3756,10 +3833,11 @@
 DocType: Issue,Opening Time,Otevírací doba
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Data OD a DO jsou vyžadována
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Cenné papíry a komoditních burzách
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Východzí merná jednotka varianty &#39;{0}&#39; musí byť rovnaký ako v Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Východzí merná jednotka varianty &#39;{0}&#39; musí byť rovnaký ako v Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Vypočítať na základe
 DocType: Delivery Note Item,From Warehouse,Zo skladu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Žiadne položky s Bill of Materials Výroba
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Žiadne položky s Bill of Materials Výroba
+DocType: Restaurant,Default Customer,Predvolený zákazník
 DocType: Assessment Plan,Supervisor Name,Meno Supervisor
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Nepotvrdzujú, či sa schôdzka vytvorí v ten istý deň"
 DocType: Program Enrollment Course,Program Enrollment Course,Program na zápis do programu
@@ -3787,7 +3865,7 @@
 DocType: Payment Entry,Internal Transfer,vnútorné Prevod
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Dětské konto existuje pro tento účet. Nemůžete smazat tento účet.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Buď cílové množství nebo cílová částka je povinná
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,"Prosím, vyberte najprv Dátum zverejnenia"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Dátum začatia by mala byť pred uzávierky
 DocType: Leave Control Panel,Carry Forward,Převádět
@@ -3823,6 +3901,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Celkem Present
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,účtovná závierka
 DocType: Drug Prescription,Hour,Hodina
+DocType: Restaurant Order Entry,Last Sales Invoice,Posledná faktúra predaja
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"New Pořadové číslo nemůže mít Warehouse. Warehouse musí být nastaveny Stock vstupním nebo doklad o koupi,"
 DocType: Lead,Lead Type,Typ Iniciatívy
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Nie ste oprávnení schvaľovať lístie na bloku Termíny
@@ -3859,65 +3938,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,vytvoriť užívateľa
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,gram
 DocType: Supplier Scorecard,Per Month,Za mesiac
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,"Množstvo, ktoré má výroba musí byť väčšia ako 0 ° C."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,"Množstvo, ktoré má výroba musí byť väčšia ako 0 ° C."
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Navštivte zprávu pro volání údržby.
 DocType: Stock Entry,Update Rate and Availability,Obnovovaciu rýchlosť a dostupnosť
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Percento, ktoré máte možnosť prijať alebo dodať naviac oproti objednanému množstvu. Napríklad: Keď ste si objednali 100 kusov a váša tolerancia je 10%, tak máte možnosť prijať 110 kusov."
 DocType: POS Customer Group,Customer Group,Zákazník Group
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Nové číslo dávky (voliteľné)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Nové číslo dávky (voliteľné)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Nové číslo dávky (voliteľné)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Nové číslo dávky (voliteľné)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Účtet nákladů je povinný pro položku {0}
 DocType: BOM,Website Description,Popis webu
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Čistá zmena vo vlastnom imaní
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Najnovšie
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Zrušte faktúre {0} prvý
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mailová adresa musí byť jedinečná, už existuje pre {0}"
 DocType: Serial No,AMC Expiry Date,AMC Datum vypršení platnosti
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,príjem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,príjem
 ,Sales Register,Sales Register
 DocType: Daily Work Summary Settings Company,Send Emails At,Posielať e-maily At
 DocType: Quotation,Quotation Lost Reason,Dôvod neúspešnej ponuky
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Vyberte si doménu
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',zvoľte * z tabPatient kde name = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Referenčné transakcie no {0} z {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Referenčné transakcie no {0} z {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Není nic upravovat.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Zobrazenie formulára
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Zhrnutie pre tento mesiac a prebiehajúcim činnostiam
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Zobrazenie formulára
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Zhrnutie pre tento mesiac a prebiehajúcim činnostiam
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.",Pridajte používateľov do svojej organizácie okrem vás.
 DocType: Customer Group,Customer Group Name,Zákazník Group Name
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Zatiaľ žiadni zákazníci!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Zatiaľ žiadni zákazníci!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Prehľad o peňažných tokoch
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Výška úveru nesmie prekročiť maximálnu úveru Suma {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,licencie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Prosím, vyberte převádět pokud chcete také zahrnout uplynulý fiskální rok bilance listy tohoto fiskálního roku"
 DocType: GL Entry,Against Voucher Type,Proti poukazu typu
 DocType: Physician,Phone (R),Telefón (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Pridané časové úseky
 DocType: Item,Attributes,Atribúty
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Povoliť šablónu
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte pomenovanie série {0} cez Nastavenie&gt; Nastavenia&gt; Pomenovanie série
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,"Prosím, zadejte odepsat účet"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Posledná Dátum objednávky
 DocType: Patient,B Negative,B Negatívny
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Účet {0} nie je patria spoločnosti {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Sériové čísla v riadku {0} sa nezhodujú s dodacím listom
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Sériové čísla v riadku {0} sa nezhodujú s dodacím listom
 DocType: Student,Guardian Details,Guardian Podrobnosti
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark dochádzky pre viac zamestnancov
 DocType: Vehicle,Chassis No,podvozok Žiadne
 DocType: Payment Request,Initiated,Zahájil
 DocType: Production Order,Planned Start Date,Plánované datum zahájení
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Vyberte kusovník
 DocType: Serial No,Creation Document Type,Tvorba Typ dokumentu
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Dátum ukončenia musí byť väčší ako dátum začatia
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Dátum ukončenia musí byť väčší ako dátum začatia
 DocType: Leave Type,Is Encash,Je inkasovat
 DocType: Leave Allocation,New Leaves Allocated,Nové Listy Přidělené
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Data dle projektu nejsou k dispozici pro nabídku
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Ukončiť
 DocType: Project,Expected End Date,Očekávané datum ukončení
 DocType: Budget Account,Budget Amount,rozpočet Suma
 DocType: Appraisal Template,Appraisal Template Title,Posouzení Template Název
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Od dátumu {0} pre zamestnancov {1} nemôže byť ešte pred vstupom Dátum zamestnanca {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Obchodní
 DocType: Patient,Alcohol Current Use,Alkohol Súčasné použitie
+DocType: Student Admission Program,Student Admission Program,Prijímací program pre študentov
 DocType: Payment Entry,Account Paid To,účet Venovaná
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent Item {0} nesmie byť skladom
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Všechny výrobky nebo služby.
@@ -3926,30 +4007,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Rozpočet na účet {1} proti {2} {3} je {4}. To bude presahovať o {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Riadok {0} # účet musí byť typu &quot;Fixed Asset&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Out Množství
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Pravidla pro výpočet výše přepravní na prodej
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,a zrušené Vypnuté v priečinku
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Série je povinné
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finanční služby
 DocType: Student Sibling,Student ID,Študentská karta
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Typy činností pre Time Záznamy
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,E-mail dodávateľa
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Typy činností pre Time Záznamy
 DocType: Tax Rule,Sales,Predaj
 DocType: Stock Entry Detail,Basic Amount,Základná čiastka
 DocType: Training Event,Exam,skúška
 DocType: Complaint,Complaint,sťažnosť
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
 DocType: Leave Allocation,Unused leaves,Nepoužité listy
 DocType: Patient,Alcohol Past Use,Použitie alkoholu v minulosti
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Fakturačný štát
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Převod
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Převod
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
 DocType: Authorization Rule,Applicable To (Employee),Vztahující se na (Employee)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Dátum splatnosti je povinný
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Dátum splatnosti je povinný
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Prírastok pre atribút {0} nemôže byť 0
 DocType: Journal Entry,Pay To / Recd From,Platit K / Recd Z
 DocType: Naming Series,Setup Series,Řada Setup
 DocType: Payment Reconciliation,To Invoice Date,Ak chcete dátumu vystavenia faktúry
 DocType: Supplier,Contact HTML,Kontakt HTML
 ,Inactive Customers,Neaktívni zákazníci
+DocType: Student Admission Program,Maximum Age,Maximálny vek
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Příjmky
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Jak Ceny pravidlo platí?
@@ -3968,6 +4051,7 @@
 DocType: GL Entry,Remarks,Poznámky
 DocType: Payment Entry,Account Paid From,Účet sú platení z prostriedkov
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Surovina Kód položky
+DocType: Task,Parent Task,Rodičovská úloha
 DocType: Journal Entry,Write Off Based On,Odepsat založené na
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,urobiť Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Tlač a papiernictva
@@ -3976,20 +4060,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Plat už spracované pre obdobie medzi {0} a {1}, ponechajte dobu použiteľnosti nemôže byť medzi tomto časovom období."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Instalace rekord pro sériové číslo
 DocType: Guardian Interest,Guardian Interest,Guardian Záujem
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Nastavte predvolené hodnoty POS faktúr
 apps/erpnext/erpnext/config/hr.py +177,Training,výcvik
 DocType: Timesheet,Employee Detail,Detail zamestnanca
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ID e-mailu Guardian1
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ID e-mailu Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,deň nasledujúcemu dňu a Opakujte na deň v mesiaci sa musí rovnať
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,deň nasledujúcemu dňu a Opakujte na deň v mesiaci sa musí rovnať
 DocType: Lab Prescription,Test Code,Testovací kód
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Nastavenie titulnej stránky webu
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ nie sú povolené pre {0} kvôli postaveniu skóre {1}
 DocType: Offer Letter,Awaiting Response,Čaká odpoveď
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Vyššie
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Celková čiastka {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Neplatný atribút {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Celková čiastka {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Neplatný atribút {0} {1}
 DocType: Supplier,Mention if non-standard payable account,"Uveďte, či je neštandardný splatný účet"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Rovnaká položka bola zadaná viackrát. {List}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Vyberte inú hodnotiacu skupinu ako &quot;Všetky hodnotiace skupiny&quot;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Riadok {0}: Pre položku {1} sa vyžaduje nákladové centrum.
 DocType: Training Event Employee,Optional,voliteľný
@@ -4012,13 +4096,15 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Nákladové stredisko je povinné pre položku {2}
 DocType: Vehicle,Policy No,nie politika
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Získať predmety z Bundle Product
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Ak existuje zásoba proti položke {0}, nemôžete povoliť vlastnosti variantov"
 DocType: Asset,Straight Line,Priamka
 DocType: Project User,Project User,projekt Užívateľ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Rozdeliť
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Rozdeliť
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Rozdeliť
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Rozdeliť
 DocType: GL Entry,Is Advance,Je Zálohová
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Účast Datum od a docházky do dnešního dne je povinná
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,"Prosím, zadejte ""subdodavatelům"" jako Ano nebo Ne"
+DocType: Item,Default Purchase Unit of Measure,Predvolená nákupná jednotka merania
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Dátum poslednej komunikácie
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Dátum poslednej komunikácie
 DocType: Sales Team,Contact No.,Kontakt Číslo
@@ -4027,7 +4113,6 @@
 DocType: Production Order,Check if material transfer entry is not required,"Skontrolujte, či sa nepožaduje zadávanie materiálu"
 DocType: Production Order,Check if material transfer entry is not required,"Skontrolujte, či sa nepožaduje zadávanie materiálu"
 DocType: Program Enrollment Tool,Get Students From,Získať študentov z
-DocType: Hub Settings,Seller Country,Prodejce Country
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publikovať položky na webových stránkach
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Skupina vaši študenti v dávkach
 DocType: Authorization Rule,Authorization Rule,Autorizační pravidlo
@@ -4037,7 +4122,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Predaj Dane a poplatky šablóny
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Celkový (Credit)
 DocType: Repayment Schedule,Payment Date,Dátum platby
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nová dávková dávka
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Nová dávková dávka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Oblečení a doplňky
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,"Funkciu váženého skóre sa nepodarilo vyriešiť. Skontrolujte, či je vzorec platný."
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Číslo objednávky
@@ -4055,6 +4140,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Riadok # {0}: Asset {1} nemôže byť predložený, je už {2}"
 DocType: Tax Rule,Billing Country,Fakturačná krajina
 DocType: Purchase Order Item,Expected Delivery Date,Očekávané datum dodání
+DocType: Restaurant Order Entry,Restaurant Order Entry,Vstup do objednávky reštaurácie
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetné a kreditné nerovná za {0} # {1}. Rozdiel je v tom {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Výdaje na reprezentaci
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Vytvoriť žiadosť na materiál
@@ -4067,9 +4153,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Účet s transakcemi nemůže být smazán
 DocType: Vehicle,Last Carbon Check,Posledné Carbon Check
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Výdavky na právne služby
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Vyberte prosím množstvo na riadku
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Vyberte prosím množstvo na riadku
 DocType: Purchase Invoice,Posting Time,Čas zadání
 DocType: Timesheet,% Amount Billed,% Fakturovanej čiastky
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Čas na stretnutie&quot; nebol nastavený pre Dr {0}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefonní Náklady
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Zaškrtněte, pokud chcete, aby uživateli vybrat sérii před uložením. Tam bude žádná výchozí nastavení, pokud jste zkontrolovat."
@@ -4080,6 +4167,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nový zákazník Příjmy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Cestovní výdaje
 DocType: Maintenance Visit,Breakdown,Rozbor
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Pridajte vlastné pole Subscription do doctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Účet: {0} s menou: {1} nemožno vybrať
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",Aktualizujte náklady na BOM automaticky prostredníctvom Plánovača na základe najnovšej sadzby ocenenia / cien / posledného nákupu surovín.
 DocType: Bank Reconciliation Detail,Cheque Date,Šek Datum
@@ -4104,7 +4192,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Celkom Billing Suma (cez Time Záznamy)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Dodavatel Id
 DocType: Payment Request,Payment Gateway Details,Platobná brána Podrobnosti
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Množstvo by mala byť väčšia ako 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Množstvo by mala byť väčšia ako 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Podriadené uzly môžu byť vytvorené len na základe typu uzly &quot;skupina&quot;
 DocType: Leave Application,Half Day Date,Half Day Date
@@ -4122,12 +4210,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Poznámka: Položka {0} vstoupil vícekrát
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Všechny kontakty.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Skratka názvu spoločnosti
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Uživatel: {0} neexistuje
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Uživatel: {0} neexistuje
 DocType: Subscription,SUB-,pod-
 DocType: Item Attribute Value,Abbreviation,Zkratka
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Platba Entry už existuje
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Není authroized od {0} překročí limity
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Plat master šablona.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,patológie
+DocType: Restaurant Order Entry,Restaurant Table,Reštaurácia Tabuľka
 DocType: Leave Type,Max Days Leave Allowed,Max Days Leave povolena
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Sada Daňové Pravidlo pre nákupného košíka
 DocType: Purchase Invoice,Taxes and Charges Added,Daně a poplatky přidané
@@ -4139,10 +4229,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Ponuka z Obchodnej Iniciatívy alebo pre Zákazníka
 DocType: Stock Settings,Role Allowed to edit frozen stock,Role povoleno upravovat zmrazené zásoby
 ,Territory Target Variance Item Group-Wise,Území Cílová Odchylka Item Group-Wise
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Všechny skupiny zákazníků
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Všechny skupiny zákazníků
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,nahromadené za mesiac
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možno nie je vytvorený záznam Zmeny meny pre {1} až {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Daňová šablóna je povinné.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Daňová šablóna je povinné.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Účet {0}: Nadřazený účet {1} neexistuje
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cenníková cena (mena firmy)
 DocType: Products Settings,Products Settings,nastavenie Produkty
@@ -4168,13 +4258,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Položka Wise Tax Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,inštitút Skratka
 ,Item-wise Price List Rate,Item-moudrý Ceník Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Dodávateľská ponuka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Dodávateľská ponuka
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Ve slovech budou viditelné, jakmile uložíte nabídku."
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Množstvo ({0}) nemôže byť zlomkom v riadku {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Množstvo ({0}) nemôže byť zlomkom v riadku {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Pravidla pro přidávání náklady na dopravu.
 DocType: Item,Opening Stock,otvorenie Sklad
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Je nutná zákazník
@@ -4193,9 +4283,8 @@
 DocType: Customer,From Lead,Od Obchodnej iniciatívy
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Objednávky uvolněna pro výrobu.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Vyberte fiškálny rok ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,"POS Profile požadované, aby POS Vstup"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,"POS Profile požadované, aby POS Vstup"
 DocType: Program Enrollment Tool,Enroll Students,zapísať študenti
-DocType: Hub Settings,Name Token,Názov Tokenu
 DocType: Lab Test,Approved Date,Schválený dátum
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Štandardný predaj
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Alespoň jeden sklad je povinný
@@ -4213,7 +4302,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Ľudské Zdroje
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Platba Odsouhlasení Platba
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Daňové Aktiva
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Výrobná zákazka bola {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Výrobná zákazka bola {0}
 DocType: BOM Item,BOM No,BOM No
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Zápis do deníku {0} nemá účet {1} nebo již uzavřeno proti ostatním poukaz
@@ -4233,8 +4322,8 @@
 DocType: Currency Exchange,To Currency,Chcete-li měny
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Nechte následující uživatelé schválit Žádost o dovolenou.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Druhy výdajů nároku.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Miera predaja pre položku {0} je nižšia ako {1}. Miera predaja by mala byť najmenej {2}
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Miera predaja pre položku {0} je nižšia ako {1}. Miera predaja by mala byť najmenej {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Miera predaja pre položku {0} je nižšia ako {1}. Miera predaja by mala byť najmenej {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Miera predaja pre položku {0} je nižšia ako {1}. Miera predaja by mala byť najmenej {2}
 DocType: Item,Taxes,Daně
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Platená a nie je doručenie
 DocType: Project,Default Cost Center,Výchozí Center Náklady
@@ -4248,15 +4337,15 @@
 DocType: Employee Loan,Fully Disbursed,úplne vyčerpaný
 DocType: Maintenance Visit,Customer Feedback,Zpětná vazba od zákazníků
 DocType: Account,Expense,Výdaj
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Skóre nemôže byť väčšia ako maximum bodov
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Skóre nemôže byť väčšia ako maximum bodov
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Zákazníci a dodávatelia
 DocType: Item Attribute,From Range,Od Rozsah
 DocType: BOM,Set rate of sub-assembly item based on BOM,Nastavte rýchlosť položky podsúboru na základe kusovníka
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},syntaktická chyba vo vzorci alebo stave: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},syntaktická chyba vo vzorci alebo stave: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Každodennú prácu Súhrnné Nastavenie Company
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,"Položka {0} ignorována, protože to není skladem"
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Odeslat tento výrobní zakázka pro další zpracování.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Odeslat tento výrobní zakázka pro další zpracování.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Nechcete-li použít Ceník článek v dané transakce, by měly být všechny platné pravidla pro tvorbu cen zakázáno."
 DocType: Assessment Group,Parent Assessment Group,Materská skupina Assessment
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,jobs
@@ -4273,12 +4362,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Filtrovanie spoločnosti nastavte prázdne, ak je položka Skupina pod skupinou &quot;Spoločnosť&quot;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Vysielanie dátum nemôže byť budúci dátum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Riadok # {0}: Výrobné číslo {1} nezodpovedá {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,na generovanie opakujúcich sa
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Casual Leave
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Laboratórne testovanie UOM.
 DocType: Batch,Batch ID,Šarže ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Poznámka: {0}
 ,Delivery Note Trends,Dodací list Trendy
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Tento týždeň Zhrnutie
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Tento týždeň Zhrnutie
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Na sklade Množstvo
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Účet: {0} lze aktualizovat pouze prostřednictvím Skladových Transakcí
 DocType: Student Group Creation Tool,Get Courses,získať kurzy
@@ -4292,7 +4382,6 @@
 DocType: Purchase Order,To Bill,Billa
 DocType: Material Request,% Ordered,% Objednané
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",V prípade kurzov študentskej skupiny bude kurz potvrdený pre každého študenta z prihlásených kurzov pri zaradení do programu.
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Zadajte e-mailovú adresu od seba oddelené čiarkou, faktúra bude automaticky zaslaný na určitý dátum"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Úkolová práce
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Avg. Nákup Rate
 DocType: Task,Actual Time (in Hours),Skutočná doba (v hodinách)
@@ -4306,7 +4395,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Položka {0} není nastavení pro Serial č. Sloupec musí být prázdný
 DocType: Accounts Settings,Accounts Settings,Nastavenie účtu
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,schvaľovať
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Žiadny výsledok na odoslanie
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Žiadny výsledok na odoslanie
 DocType: Customer,Sales Partner and Commission,Partner predaja a provízia
 DocType: Employee Loan,Rate of Interest (%) / Year,Úroková sadzba (%) / rok
 ,Project Quantity,projekt Množstvo
@@ -4318,55 +4407,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Čierna
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Item
 DocType: Account,Auditor,Auditor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} predmety vyrobené
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} predmety vyrobené
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Uč sa viac
 DocType: Cheque Print Template,Distance from top edge,Vzdialenosť od horného okraja
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Cenníková cena {0} je zakázaná alebo neexistuje
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Cenníková cena {0} je zakázaná alebo neexistuje
 DocType: Purchase Invoice,Return,Spiatočná
 DocType: Production Order Operation,Production Order Operation,Výrobní zakázka Operace
 DocType: Pricing Rule,Disable,Zakázat
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Spôsob platby je povinný vykonať platbu
 DocType: Project Task,Pending Review,Čeká Review
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Menovania a konzultácie
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nie je zapísaná v dávke {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nie je zapísaná v dávke {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Aktíva {0} nemôže byť vyhodený, ako je to už {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense Claim (via Expense nároku)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Označiť ako neprítomný
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Riadok {0}: Mena BOM # {1} by sa mala rovnať vybranej mene {2}
 DocType: Journal Entry Account,Exchange Rate,Výmenný kurz
 DocType: Patient,Additional information regarding the patient,Ďalšie informácie týkajúce sa pacienta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
 DocType: Homepage,Tag Line,tag linka
 DocType: Fee Component,Fee Component,poplatok Component
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,fleet management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Pridať položky z
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,fleet management
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Pridať položky z
 DocType: Cheque Print Template,Regular,pravidelný
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Celkový weightage všetkých hodnotiacich kritérií musí byť 100%
-DocType: BOM,Last Purchase Rate,Posledná nákupná cena
+DocType: Purchase Order Item,Last Purchase Rate,Posledná nákupná cena
 DocType: Account,Asset,Majetek
 DocType: Project Task,Task ID,Task ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Sklad nemůže existovat k bodu {0}, protože má varianty"
 DocType: Lab Test,Mobile,Mobilné
 ,Sales Person-wise Transaction Summary,Prodej Person-moudrý Shrnutí transakce
 DocType: Training Event,Contact Number,Kontaktné číslo
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Sklad {0} neexistuje
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrace pro ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Sklad {0} neexistuje
 DocType: Monthly Distribution,Monthly Distribution Percentages,Měsíční Distribuční Procenta
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Vybraná položka nemůže mít dávku
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Ocenenie rýchlosť nebola nájdená pre výtlačku {0}, ktorý je na to účtovné položky pre požadované {1} {2}. Ak je položka vybavovať ako položka vzorky v {1}, prosím spomenúť, že v {1} tabuľky položky. V opačnom prípade vytvorte prichádzajúce legálne transakciu za položku alebo zmienka rýchlosťou ocenenie v zázname položky a skúste odovzdanie / zrušenie tejto položky"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% materiálov dodaných proti tomuto dodaciemu listu
+DocType: Training Event,Has Certificate,Má certifikát
 DocType: Project,Customer Details,Podrobnosti zákazníků
 DocType: Employee,Reports to,Zprávy
 ,Unpaid Expense Claim,Neplatené Náklady nárok
 DocType: Payment Entry,Paid Amount,Uhrazené částky
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Preskúmajte predajný cyklus
 DocType: Assessment Plan,Supervisor,Nadriadený
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,online
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,online
 ,Available Stock for Packing Items,K dispozici skladem pro balení položek
 DocType: Item Variant,Item Variant,Variant Položky
 DocType: Assessment Result Tool,Assessment Result Tool,Assessment Tool Výsledok
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Predložené objednávky nemožno zmazať
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Predložené objednávky nemožno zmazať
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Zůstatek na účtu již v inkasa, není dovoleno stanovit ""Balance musí být"" jako ""úvěru"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Řízení kvality
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Item {0} bol zakázaný
@@ -4387,7 +4475,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Povoliť sadzbu nulového oceňovania
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Povoliť sadzbu nulového oceňovania
 DocType: Training Event Employee,Invited,pozvaný
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Viac aktívny Plat Structures nájdených pre zamestnancov {0} pre dané termíny
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Viac aktívny Plat Structures nájdených pre zamestnancov {0} pre dané termíny
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Nastavenia brány účty.
 DocType: Employee,Employment Type,Typ zaměstnání
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Dlouhodobý majetek
@@ -4399,7 +4487,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Študent ID e-mailu
 DocType: Employee,Notice (days),Oznámenie (dni)
 DocType: Tax Rule,Sales Tax Template,Daň z predaja Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,"Vyberte položky, ktoré chcete uložiť faktúru"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,"Vyberte položky, ktoré chcete uložiť faktúru"
 DocType: Employee,Encashment Date,Inkaso Datum
 DocType: Training Event,Internet,internet
 DocType: Special Test Template,Special Test Template,Špeciálna šablóna testu
@@ -4409,7 +4497,7 @@
 DocType: Academic Term,Term Start Date,Termín Dátum začatia
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},V příloze naleznete {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},V příloze naleznete {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bankový zostatok podľa hlavnej knihy
 DocType: Job Applicant,Applicant Name,Žadatel Název
 DocType: Authorization Rule,Customer / Item Name,Zákazník / Název zboží
@@ -4429,7 +4517,7 @@
 DocType: Guardian,Guardian Of ,Guardian Of
 DocType: Grading Scale Interval,Threshold,Prah
 DocType: BOM Update Tool,Current BOM,Aktuální BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Přidat Sériové číslo
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Přidat Sériové číslo
 DocType: Production Order Item,Available Qty at Source Warehouse,Dostupné množstvo v zdrojovom sklade
 apps/erpnext/erpnext/config/support.py +22,Warranty,záruka
 DocType: Purchase Invoice,Debit Note Issued,vydanie dlhopisu
@@ -4452,10 +4540,9 @@
 DocType: Account,Receivable,Pohledávky
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Riadok # {0}: Nie je povolené meniť dodávateľa, objednávky už existuje"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Role, která se nechá podat transakcí, které přesahují úvěrové limity."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Vyberte položky do výroby
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Kmeňové dáta synchronizácia, môže to trvať nejaký čas"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Vyberte položky do výroby
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Kmeňové dáta synchronizácia, môže to trvať nejaký čas"
 DocType: Item,Material Issue,Material Issue
-DocType: Hub Settings,Seller Description,Prodejce Popis
 DocType: Employee Education,Qualification,Kvalifikace
 DocType: Item Price,Item Price,Položka Cena
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap & Detergent
@@ -4463,7 +4550,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Od doby nemôže byť väčšia ako na čas.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Objednáno
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Pokračovať
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Pokračovať
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Ak je povolený, systém nebude aktualizovať polia variantov zo šablóny, ale bude kopírovať údaje z nižšie uvedených polí pri vytváraní nových variantov"
 DocType: Salary Detail,Component,komponentov
 DocType: Assessment Criteria,Assessment Criteria Group,Hodnotiace kritériá Group
 DocType: Healthcare Settings,Patient Name By,Názov pacienta
@@ -4473,7 +4561,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Zadejte Schvalování role nebo Schvalování Uživatel
 DocType: Journal Entry,Write Off Entry,Odepsat Vstup
 DocType: BOM,Rate Of Materials Based On,Hodnotit materiálů na bázi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dodávateľ&gt; Typ dodávateľa
+DocType: Item Variant Settings,Do not Update Variants,Neaktualizujte varianty
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Podpora Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Zrušte zaškrtnutie políčka všetko
 DocType: POS Profile,Terms and Conditions,Podmínky
@@ -4482,7 +4570,7 @@
 DocType: Leave Block List,Applies to Company,Platí pre firmu
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,"Nelze zrušit, protože předložena Reklamní Entry {0} existuje"
 DocType: Employee Loan,Disbursement Date,vyplatenie Date
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&quot;Príjemcovia&quot; nie sú špecifikované
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&quot;Príjemcovia&quot; nie sú špecifikované
 DocType: BOM Update Tool,Update latest price in all BOMs,Aktualizujte najnovšiu cenu vo všetkých kusovníkoch
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Zdravotný záznam
 DocType: Vehicle,Vehicle,vozidlo
@@ -4498,14 +4586,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Olovo%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Odpisy a zostatkov
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Množstvo {0} {1} prevedená z {2} na {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Množstvo {0} {1} prevedená z {2} na {3}
 DocType: Sales Invoice,Get Advances Received,Získat přijaté zálohy
 DocType: Email Digest,Add/Remove Recipients,Přidat / Odebrat příjemce
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Transakce není povoleno proti zastavila výrobu Objednat {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Chcete-li nastavit tento fiskální rok jako výchozí, klikněte na tlačítko ""Nastavit jako výchozí"""
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,pripojiť
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,pripojiť
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Nedostatek Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Variant Položky {0} existuje s rovnakými vlastnosťami
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Variant Položky {0} existuje s rovnakými vlastnosťami
 DocType: Employee Loan,Repay from Salary,Splatiť z platu
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Požiadavka na platbu proti {0} {1} na sumu {2}
@@ -4518,7 +4606,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Položka predajnej objednávky
 DocType: Salary Slip,Payment Days,Platební dny
 DocType: Patient,Dormant,spiace
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Sklady s podriadené uzlami nemožno previesť do hlavnej účtovnej knihy
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Sklady s podriadené uzlami nemožno previesť do hlavnej účtovnej knihy
 DocType: BOM,Manage cost of operations,Správa nákladů na provoz
 DocType: Accounts Settings,Stale Days,Stale dni
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Když některý z kontrolovaných operací je ""Odesláno"", email pop-up automaticky otevřeny poslat e-mail na přidružené ""Kontakt"" v této transakci, s transakcí jako přílohu. Uživatel může, ale nemusí odeslat e-mail."
@@ -4532,10 +4620,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Pořadové číslo {0} již obdržel
 ,Requested Items To Be Transferred,Požadované položky mají být převedeny
 DocType: Expense Claim,Vehicle Log,jázd
-DocType: Purchase Invoice,Recurring Id,Id opakujúceho sa
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Prítomnosť horúčky (teplota&gt; 38,5 ° C alebo udržiavaná teplota&gt; 38 ° C / 100,4 ° F)"
 DocType: Customer,Sales Team Details,Podrobnosti prodejní tým
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Zmazať trvalo?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Zmazať trvalo?
 DocType: Expense Claim,Total Claimed Amount,Celkem žalované částky
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potenciální příležitosti pro prodej.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Neplatný {0}
@@ -4545,7 +4632,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Obchodní domy
 ,Item Delivery Date,Dátum dodania položky
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Nastavte si škola v ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Nastavte si škola v ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Základňa Zmena Suma (Company mena)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Žádné účetní záznamy pro následující sklady
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Uložte dokument ako prvý.
@@ -4557,13 +4644,12 @@
 DocType: Task,Is Milestone,Je míľnikom
 DocType: Daily Work Summary,Email Sent To,E-mailom odoslaným
 DocType: Budget,Warn,Varovat
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Naozaj chcete zrušiť registráciu?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Akékoľvek iné poznámky, pozoruhodné úsilie, ktoré by mali ísť v záznamoch."
 DocType: BOM,Manufacturing User,Používateľ výroby
 DocType: Purchase Invoice,Raw Materials Supplied,Dodává suroviny
-DocType: Purchase Invoice,Recurring Print Format,Opakujúce Print Format
 DocType: C-Form,Series,Série
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Mena cenníka {0} musí byť {1} alebo {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Pridať produkty
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Mena cenníka {0} musí byť {1} alebo {2}
 DocType: Appraisal,Appraisal Template,Posouzení Template
 DocType: Item Group,Item Classification,Položka Klasifikace
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Business Development Manager
@@ -4577,7 +4663,7 @@
 DocType: Item Attribute Value,Attribute Value,Hodnota atributu
 ,Itemwise Recommended Reorder Level,Itemwise Doporučené Změna pořadí Level
 DocType: Salary Detail,Salary Detail,plat Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,"Prosím, najprv vyberte {0}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,"Prosím, najprv vyberte {0}"
 DocType: Appointment Type,Physician,lekár
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Batch {0} z {1} bodu vypršala.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,konzultácie
@@ -4588,7 +4674,7 @@
 DocType: Salary Detail,Default Amount,Výchozí částka
 DocType: Lab Test Template,Descriptive,opisný
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Sklad nebyl nalezen v systému
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Tento mesiac je zhrnutie
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Tento mesiac je zhrnutie
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalita Kontrola Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Zmraziť zásoby staršie ako` malo by byť menšie než %d dní.
 DocType: Tax Rule,Purchase Tax Template,Spotrebná daň šablóny
@@ -4611,12 +4697,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Tréningové udalosti / výsledky
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Oprávky aj na
 DocType: Sales Invoice,C-Form Applicable,C-Form Použitelné
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Prevádzková doba musí byť väčšia ako 0 pre prevádzku {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Prevádzková doba musí byť väčšia ako 0 pre prevádzku {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Sklad je povinné
 DocType: Supplier,Address and Contacts,Adresa a kontakty
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detail konverzie MJ
 DocType: Program,Program Abbreviation,program Skratka
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Výrobná zákazka nemôže byť vznesená proti šablóny položky
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Výrobná zákazka nemôže byť vznesená proti šablóny položky
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Poplatky jsou aktualizovány v dokladu o koupi na každou položku
 DocType: Warranty Claim,Resolved By,Vyřešena
 DocType: Bank Guarantee,Start Date,Dátum začiatku
@@ -4642,27 +4728,28 @@
 DocType: Employee,Educational Qualification,Vzdělávací Kvalifikace
 DocType: Workstation,Operating Costs,Provozní náklady
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Akčný ak súhrnné mesačný rozpočet prekročený
-DocType: Purchase Invoice,Submit on creation,Potvrdiť pri vytvorení
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Mena pre {0} musí byť {1}
+DocType: Subscription,Submit on creation,Potvrdiť pri vytvorení
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Mena pre {0} musí byť {1}
 DocType: Asset,Disposal Date,Likvidácia Dátum
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-maily budú zaslané všetkým aktívnym zamestnancom spoločnosti v danú hodinu, ak nemajú dovolenku. Zhrnutie odpovedí budú zaslané do polnoci."
 DocType: Employee Leave Approver,Employee Leave Approver,Schvalujúci priepustiek zamestnanca
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Nelze prohlásit za ztracený, protože citace byla provedena."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,tréning Feedback
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Nelze prohlásit za ztracený, protože citace byla provedena."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,tréning Feedback
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Výrobní zakázka {0} musí být předloženy
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Kritériá hodnotiacej tabuľky dodávateľa
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},"Prosím, vyberte Počáteční datum a koncové datum pro položku {0}"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Samozrejme je povinné v rade {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,K dnešnímu dni nemůže být dříve od data
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Pridať / Upraviť ceny
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Pridať / Upraviť ceny
 DocType: Batch,Parent Batch,Rodičovská dávka
 DocType: Batch,Parent Batch,Rodičovská dávka
 DocType: Cheque Print Template,Cheque Print Template,Šek šablóny tlače
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Diagram nákladových středisek
 DocType: Lab Test Template,Sample Collection,Zbierka vzoriek
 ,Requested Items To Be Ordered,Požadované položky je třeba objednat
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Moje objednávky
 DocType: Price List,Price List Name,Názov cenníka
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Každodennú prácu Zhrnutie pre {0}
 DocType: Employee Loan,Totals,Súčty
@@ -4681,12 +4768,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} jednotiek {1} potrebná {2} o {3} {4} na {5} pre dokončenie tejto transakcie.
 DocType: Fee Schedule,Student Category,študent Kategórie
 DocType: Announcement,Student,študent
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Organizace jednotka (departement) master.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Organizace jednotka (departement) master.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Prejdite na Izby
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Prosím, zadejte zprávu před odesláním"
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,DUPLIKÁT PRE DODÁVATEĽA
 DocType: Email Digest,Pending Quotations,Čakajúce ponuky
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Point-of-Sale Profil
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Point-of-Sale Profil
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Konfigurácie laboratórnych testov.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Nezajištěných úvěrů
 DocType: Cost Center,Cost Center Name,Meno nákladového strediska
@@ -4696,6 +4783,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Celkem uhrazeno Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Zprávy větší než 160 znaků bude rozdělena do více zpráv
 DocType: Purchase Receipt Item,Received and Accepted,Přijaté a Přijato
+DocType: Hub Settings,Company and Seller Profile,Profil spoločnosti a predajcu
 ,GST Itemised Sales Register,GST Podrobný predajný register
 ,Serial No Service Contract Expiry,Pořadové číslo Servisní smlouva vypršení platnosti
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Nemůžete dělat kreditní a debetní záznam na stejný účet ve stejnou dobu.
@@ -4705,10 +4793,11 @@
 DocType: Item,Variant Based On,Variant založená na
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Celková weightage přiřazen by měla být 100%. Je {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Vaši Dodávatelia
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Prosím opravte
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,"Nelze nastavit jako Ztraceno, protože je přijata objednávka."
 DocType: Request for Quotation Item,Supplier Part No,Žiadny dodávateľ Part
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nemôže odpočítať, ak kategória je pre &quot;ocenenie&quot; alebo &quot;Vaulation a Total&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Prijaté Od
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Prijaté Od
 DocType: Lead,Converted,Převedené
 DocType: Item,Has Serial No,Má Sériové číslo
 DocType: Employee,Date of Issue,Datum vydání
@@ -4716,7 +4805,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Podľa Nákupných nastavení, ak je potrebná nákupná požiadavka == &#39;ÁNO&#39;, potom pre vytvorenie nákupnej faktúry musí používateľ najskôr vytvoriť potvrdenie nákupu pre položku {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Riadok # {0}: Nastavte Dodávateľ pre položku {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Riadok {0}: doba hodnota musí byť väčšia ako nula.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Webové stránky Image {0} pripája k bodu {1} nemožno nájsť
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Webové stránky Image {0} pripája k bodu {1} nemožno nájsť
 DocType: Issue,Content Type,Typ obsahu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Počítač
 DocType: Item,List this Item in multiple groups on the website.,Seznam tuto položku ve více skupinách na internetových stránkách.
@@ -4727,14 +4816,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Získat smířit záznamů
 DocType: Payment Reconciliation,From Invoice Date,Z faktúry Dátum
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Nemáte povolenie na odoslanie
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,Fakturačná mena sa musí rovnať meny alebo účtu strana peňazí buď predvoleného comapany je
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Fakturačná mena sa musí rovnať meny alebo účtu strana peňazí buď predvoleného comapany je
 DocType: Healthcare Settings,Laboratory Settings,Laboratórne nastavenia
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,nechať inkasa
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Čím sa zaoberá?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Do skladu
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Všetky Študent Prijímacie
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Čím sa zaoberá?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Do skladu
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Všetky Študent Prijímacie
 ,Average Commission Rate,Průměrná cena Komise
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemôže byť ""áno"" pre neskladový tovar"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemôže byť ""áno"" pre neskladový tovar"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Vyberte položku Stav
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Účast nemůže být označen pro budoucí data
 DocType: Pricing Rule,Pricing Rule Help,Ceny Pravidlo Help
@@ -4752,41 +4841,41 @@
 DocType: Item,Customer Code,Code zákazníků
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Narozeninová připomínka pro {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Počet dnů od poslední objednávky
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Debetné Na účet musí byť účtu Súvaha
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Debetné Na účet musí byť účtu Súvaha
 DocType: Buying Settings,Naming Series,Číselné rady
 DocType: Leave Block List,Leave Block List Name,Nechte Jméno Block List
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Dátum poistenie štarte by mala byť menšia ako poistenie koncovým dátumom
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,"Prosím, nastavte názov inštruktora v škole&gt; Školské nastavenia"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Aktiva
 DocType: Timesheet,Production Detail,výroba Detail
+DocType: Restaurant,Active Menu,Aktívna ponuka
 DocType: Target Detail,Target Qty,Target Množství
 DocType: Shopping Cart Settings,Checkout Settings,pokladňa Nastavenie
 DocType: Attendance,Present,Současnost
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Delivery Note {0} nesmí být předloženy
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Delivery Note {0} nesmí být předloženy
 DocType: Notification Control,Sales Invoice Message,Prodejní faktury Message
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Záverečný účet {0} musí byť typu zodpovednosti / Equity
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Výplatnej páske zamestnanca {0} už vytvorili pre časové list {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Výplatnej páske zamestnanca {0} už vytvorili pre časové list {1}
 DocType: Vehicle Log,Odometer,Počítadlo najazdených kilometrov
 DocType: Sales Order Item,Ordered Qty,Objednáno Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Položka {0} je zakázaná
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Položka {0} je zakázaná
 DocType: Stock Settings,Stock Frozen Upto,Reklamní Frozen aľ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM neobsahuje žiadnu skladovú položku
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Projektová činnost / úkol.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM neobsahuje žiadnu skladovú položku
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Projektová činnost / úkol.
 DocType: Vehicle Log,Refuelling Details,tankovacie Podrobnosti
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generování výplatních páskách
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Nákup musí být zkontrolováno, v případě potřeby pro vybrán jako {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Sleva musí být menší než 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Posledná nákupná  cena nenájdená
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Odpísať Suma (Company meny)
 DocType: Sales Invoice Timesheet,Billing Hours,billing Hodiny
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,Predvolené BOM pre {0} nebol nájdený
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Riadok # {0}: Prosím nastavte množstvo objednávacie
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Predvolené BOM pre {0} nebol nájdený
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Riadok # {0}: Prosím nastavte množstvo objednávacie
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Poklepte na položky a pridajte ich sem
 DocType: Fees,Program Enrollment,Registrácia do programu
 DocType: Landed Cost Voucher,Landed Cost Voucher,Přistálo Náklady Voucher
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Prosím nastavte {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Opakujte na den v měsíci
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} je neaktívnym študentom
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} je neaktívnym študentom
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} je neaktívnym študentom
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} je neaktívnym študentom
 DocType: Employee,Health Details,Zdravotní Podrobnosti
 DocType: Offer Letter,Offer Letter Terms,Ponuka Letter Podmienky
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Vyžaduje sa vytvorenie referenčného dokumentu žiadosti o platbu
@@ -4795,7 +4884,6 @@
 DocType: Employee External Work History,Salary,Plat
 DocType: Serial No,Delivery Document Type,Dodávka Typ dokumentu
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Odeslat všechny výplatní pásky pro výše zvolených kritérií
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} položky synchronizované
 DocType: Sales Order,Partly Delivered,Částečně vyhlášeno
 DocType: Email Digest,Receivables,Pohledávky
 DocType: Lead Source,Lead Source,Zdroj Iniciatívy
@@ -4817,9 +4905,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Stárnutí rozsah 2
 DocType: SG Creation Tool Course,Max Strength,Max Sila
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM nahradil
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Vyberte položku podľa dátumu doručenia
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Vyberte položku podľa dátumu doručenia
 ,Sales Analytics,Analýza predaja
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},K dispozícii {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},K dispozícii {0}
 ,Prospects Engaged But Not Converted,"Perspektívy zapojené, ale nekonvertované"
 ,Prospects Engaged But Not Converted,"Perspektívy zapojené, ale nekonvertované"
 DocType: Manufacturing Settings,Manufacturing Settings,Nastavenia Výroby
@@ -4827,10 +4915,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Mobile Žiadne
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Zadejte prosím výchozí měnu v podniku Mistr
 DocType: Stock Entry Detail,Stock Entry Detail,Detail pohybu zásob
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Denná Upomienky
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Denná Upomienky
 DocType: Products Settings,Home Page is Products,Domovskou stránkou je stránka Produkty.
 ,Asset Depreciation Ledger,Asset Odpisy Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Daňové Pravidlo Konflikty s {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Daňové Pravidlo Konflikty s {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nový názov účtu
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Dodává se nákladů na suroviny
 DocType: Selling Settings,Settings for Selling Module,Nastavenie modulu Predaj
@@ -4844,8 +4932,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Položka {0} musí být skladem
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Východiskové prácu v sklade Progress
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Výchozí nastavení účetních transakcí.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosím, nastavte systém pomenovania zamestnancov v oblasti ľudských zdrojov&gt; Nastavenia personálu"
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Očekávané datum nemůže být před Materiál Poptávka Datum
+DocType: Restaurant,Default Tax Template,Štandardná daňová šablóna
 DocType: Fees,Student Details,Podrobnosti študenta
 DocType: Purchase Invoice Item,Stock Qty,Množstvo zásob
 DocType: Purchase Invoice Item,Stock Qty,Množstvo zásob
@@ -4864,8 +4953,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Prejdite na Položky
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Aktuální
+DocType: Restaurant Menu,Restaurant Manager,Manažér reštaurácie
 DocType: Authorization Rule,Customerwise Discount,Sleva podle zákazníka
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Časového rozvrhu pre úlohy.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Časového rozvrhu pre úlohy.
 DocType: Purchase Invoice,Against Expense Account,Proti výdajového účtu
 DocType: Production Order,Production Order,Výrobná Objednávka
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Poznámka k instalaci {0} již byla odeslána
@@ -4873,7 +4963,6 @@
 DocType: Quotation Item,Against Docname,Proti Docname
 DocType: SMS Center,All Employee (Active),Všichni zaměstnanci (Aktivní)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Zobrazit nyní
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Vyberte období, kdy faktura budou generovány automaticky"
 DocType: BOM,Raw Material Cost,Cena surovin
 DocType: Item Reorder,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Zadejte položky a plánované ks, pro které chcete získat zakázky na výrobu, nebo stáhnout suroviny pro analýzu."
@@ -4886,24 +4975,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Report Type je povinné
 DocType: Item,Serial Number Series,Sériové číslo Series
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Sklad je povinný pro skladovou položku {0} na řádku {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Pridať programy
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Maloobchod a velkoobchod
 DocType: Issue,First Responded On,Prvně odpovězeno dne
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Výpis zboží v několika skupinách
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Datum zahájení a  Datum ukončení Fiskálního roku jsou již stanoveny ve fiskálním roce {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Svetlá Dátum aktualizované
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split Batch
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Úspešne zinventarizované
 DocType: Request for Quotation Supplier,Download PDF,Stiahnuť PDF
 DocType: Production Order,Planned End Date,Plánované datum ukončení
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Zadajte dátum plánovania
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,"Tam, kde jsou uloženy předměty."
 DocType: Request for Quotation,Supplier Detail,Detail dodávateľa
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Chyba vo vzorci alebo stave: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Chyba vo vzorci alebo stave: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Fakturovaná čiastka
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kritériové váhy musia pripočítať až 100%
 DocType: Attendance,Attendance,Účast
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,Položky zásob
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,Položky zásob
 DocType: BOM,Materials,Materiály
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Pokud není zatrženo, seznam bude muset být přidány ke každé oddělení, kde má být použit."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Zdrojové a cieľové skladov nemôžu byť rovnaké
@@ -4921,6 +5010,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,On Net Celkem
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Hodnota atribútu {0} musí byť v rozmedzí od {1} až {2} v krokoch po {3} pre item {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Target sklad v řádku {0} musí být stejná jako výrobní zakázky
+DocType: Restaurant Reservation,Waitlisted,poradovníka
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Mena nemôže byť zmenený po vykonaní položky pomocou inej mene
 DocType: Vehicle Service,Clutch Plate,kotúč spojky
 DocType: Company,Round Off Account,Zaokrúhliť účet
@@ -4937,7 +5027,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Meno Nová Sales Osoba
 DocType: Packing Slip,Gross Weight UOM,Hrubá Hmotnosť MJ
 DocType: Delivery Note Item,Against Sales Invoice,Proti prodejní faktuře
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Zadajte sériové čísla pre sériovú položku
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Zadajte sériové čísla pre sériovú položku
 DocType: Bin,Reserved Qty for Production,Vyhradené Množstvo pre výrobu
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Ponechajte nezačiarknuté, ak nechcete zohľadňovať dávku pri zaradení do skupín."
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Ponechajte nezačiarknuté, ak nechcete zohľadňovať dávku pri zaradení do skupín."
@@ -4949,7 +5039,7 @@
 DocType: Lab Test,Test Group,Testovacia skupina
 DocType: Payment Reconciliation,Receivable / Payable Account,Pohledávky / závazky účet
 DocType: Delivery Note Item,Against Sales Order Item,Proti položce přijaté objednávky
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Uveďte atribútu Hodnota atribútu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Uveďte atribútu Hodnota atribútu {0}
 DocType: Item,Default Warehouse,Výchozí Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Rozpočet nemôže byť priradená na skupinový účet {0}
 DocType: Healthcare Settings,Patient Registration,Registrácia pacienta
@@ -4978,6 +5068,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Predajca
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Rozpočet a nákladového strediska
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Nie je povolený viacnásobný predvolený spôsob platby
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,pre
 ,Appointment Analytics,Aplikácia Analytics
 DocType: Vehicle Service,Half Yearly,Polročne
 DocType: Lead,Blog Subscriber,Blog Subscriber
@@ -4997,7 +5088,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Počet kvót
 ,BOM Stock Report,BOM Reklamné Report
 DocType: Stock Reconciliation Item,Quantity Difference,Množstvo Rozdiel
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Spracovanie miezd
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Spracovanie miezd
 DocType: Opportunity Item,Basic Rate,Základná sadzba
 DocType: GL Entry,Credit Amount,Výška úveru
 DocType: Cheque Print Template,Signatory Position,signatár Position
@@ -5011,12 +5102,12 @@
 DocType: Tax Rule,Tax Rule,Daňové Pravidlo
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Udržovat stejná sazba po celou dobu prodejního cyklu
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Naplánujte čas protokoly mimo Workstation pracovných hodín.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Zákazníci vo fronte
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} nemá plán pre lekárov. Pridajte ho do kapitána lekára
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Zákazníci vo fronte
 DocType: Student,Nationality,národnosť
 ,Items To Be Requested,Položky se budou vyžadovat
-DocType: Purchase Order,Get Last Purchase Rate,Získejte posledního nákupu Cena
 DocType: Company,Company Info,Informácie o spoločnosti
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Vyberte alebo pridajte nového zákazníka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Vyberte alebo pridajte nového zákazníka
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Nákladové stredisko je nutné rezervovať výdavkov nárok
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplikace fondů (aktiv)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,To je založené na účasti základu tohto zamestnanca
@@ -5024,6 +5115,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Debetné účet
 DocType: Fiscal Year,Year Start Date,Dátom začiatku roka
 DocType: Attendance,Employee Name,Meno zamestnanca
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Položka objednávky reštaurácie
 DocType: Sales Invoice,Rounded Total (Company Currency),Zaoblený Total (Company Měna)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Nelze skryté do skupiny, protože je požadovaný typ účtu."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} bol zmenený. Prosím aktualizujte.
@@ -5034,6 +5126,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Zamestnanecké benefity
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Balené množstvo se musí rovnať množstvu pre položku {0} v riadku {1}
 DocType: Production Order,Manufactured Qty,Vyrobeno Množství
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Vytvorená faktúra
 DocType: Purchase Receipt Item,Accepted Quantity,Schválené Množstvo
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Prosím nastaviť predvolené Holiday List pre zamestnancov {0} alebo {1} Company
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} neexistuje
@@ -5043,18 +5136,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Riadok č {0}: Čiastka nemôže byť väčšia ako Čakajúci Suma proti Expense nároku {1}. Do doby, než množstvo je {2}"
 DocType: Maintenance Schedule,Schedule,Plán
 DocType: Account,Parent Account,Nadřazený účet
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,K dispozici
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,K dispozici
 DocType: Quality Inspection Reading,Reading 3,Čtení 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
 DocType: Lab Test,Approved,Schválený
 DocType: Pricing Rule,Price,Cena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',"Zamestnanec uvoľnený na {0} musí byť nastavený ako ""Opustil"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',"Zamestnanec uvoľnený na {0} musí byť nastavený ako ""Opustil"""
+DocType: Hub Settings,Last Sync On,Posledná synchronizácia zapnutá
 DocType: Guardian,Guardian,poručník
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Posouzení {0} vytvořil pro zaměstnance {1} v daném časovém období
 DocType: Employee,Education,Vzdelanie
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,del
 DocType: Selling Settings,Campaign Naming By,Kampaň Pojmenování By
 DocType: Employee,Current Address Is,Aktuálna adresa je
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Mesačný cieľ predaja (
@@ -5069,7 +5163,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Kód kurzu:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,"Prosím, zadejte výdajového účtu"
 DocType: Account,Stock,Sklad
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Riadok # {0}: Reference Document Type musí byť jedným z objednávky, faktúry alebo Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Riadok # {0}: Reference Document Type musí byť jedným z objednávky, faktúry alebo Journal Entry"
 DocType: Employee,Current Address,Aktuálna adresa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Je-li položka je varianta další položku pak popis, obraz, oceňování, daní atd bude stanoven ze šablony, pokud není výslovně uvedeno"
 DocType: Serial No,Purchase / Manufacture Details,Nákup / Výroba Podrobnosti
@@ -5100,7 +5194,7 @@
 DocType: Hub Settings,Hub Settings,Nastavení Hub
 DocType: Project,Gross Margin %,Hrubá Marža %
 DocType: BOM,With Operations,S operacemi
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Položky účtovníctva už boli vykonané v mene, {0} pre firmu {1}. Vyberte pohľadávky a záväzku účet s menou {0}."
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Položky účtovníctva už boli vykonané v mene, {0} pre firmu {1}. Vyberte pohľadávky a záväzku účet s menou {0}."
 DocType: Asset,Is Existing Asset,Je existujúcemu aktívu
 DocType: Salary Detail,Statistical Component,Štatistická zložka
 DocType: Warranty Claim,If different than customer address,Pokud se liší od adresy zákazníka
@@ -5108,13 +5202,14 @@
 DocType: BOM Operation,BOM Operation,BOM Operation
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Na předchozí řady Částka
 DocType: Student,Home Address,Adresa bydliska
+DocType: Item,Has Expiry Date,Má dátum skončenia platnosti
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Nastavenia Variantu položky.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,prevod majetku
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,prevod majetku
 DocType: POS Profile,POS Profile,POS Profile
 DocType: Training Event,Event Name,Názov udalosti
 DocType: Physician,Phone (Office),Telefón (Office)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,vstupné
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Prijímacie konanie pre {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,vstupné
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Prijímacie konanie pre {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Sezónnost pro nastavení rozpočtů, cíle atd."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Názov premennej
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Položka {0} je šablóna, prosím vyberte jednu z jeho variantov"
@@ -5123,7 +5218,7 @@
 DocType: Assessment Plan,Room,izbu
 DocType: Purchase Order,Advance Paid,Vyplacené zálohy
 DocType: Item,Item Tax,Daň Položky
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Materiál Dodávateľovi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Materiál Dodávateľovi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Spotrebný Faktúra
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Prah {0}% sa objaví viac ako raz
 DocType: Expense Claim,Employees Email Id,Zaměstnanci Email Id
@@ -5134,32 +5229,30 @@
 DocType: Program,Program Name,Názov programu
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Zvažte daň či poplatek za
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Skutočné množstvo je povinné
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} v súčasnosti má postavenie {1} Scorecardu pre dodávateľov a nákupné objednávky tomuto dodávateľovi by mali byť vydané opatrne.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} v súčasnosti má postavenie {1} Scorecardu pre dodávateľov a nákupné objednávky tomuto dodávateľovi by mali byť vydané opatrne.
 DocType: Employee Loan,Loan Type,pôžička Type
 DocType: Scheduling Tool,Scheduling Tool,plánovanie Tool
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Kreditní karta
 DocType: BOM,Item to be manufactured or repacked,Položka být vyráběn nebo znovu zabalena
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Výchozí nastavení pro akciových transakcí.
-DocType: Purchase Invoice,Next Date,Ďalší Dátum
 DocType: Employee Education,Major/Optional Subjects,Hlavní / Volitelné předměty
 DocType: Sales Invoice Item,Drop Ship,Drop Loď
+DocType: Hub Settings,Suspended,suspendovaný
 DocType: Training Event,Attendees,Účastníci
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Zde si můžete udržovat rodinné detailů, jako jsou jméno a povolání rodičem, manželem a dětmi"
 DocType: Academic Term,Term End Date,Termín Dátum ukončenia
-DocType: Hub Settings,Seller Name,Prodejce Name
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Daně a poplatky odečteny (Company měna)
 DocType: Item Group,General Settings,Všeobecné nastavenia
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Z měny a měny nemůže být stejné
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Pridať inštruktorov
 DocType: Stock Entry,Repack,Přebalit
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Musíte Uložte formulář před pokračováním
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Najskôr vyberte spoločnosť
 DocType: Item Attribute,Numeric Values,Číselné hodnoty
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Pripojiť Logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Úrovne zásob
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Úrovne zásob
 DocType: Customer,Commission Rate,Výška provízie
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Vytvorili {0} scorecards pre {1} medzi:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Vytvoriť Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Vytvoriť Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Aplikace Block dovolené podle oddělení.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer",Typ platby musí byť jedným z príjem Pay a interný prevod
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analytika
@@ -5174,11 +5267,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Základný kapitál
 DocType: Shopping Cart Settings,Show Public Attachments,Zobraziť verejné prílohy
 DocType: Packing Slip,Package Weight Details,Hmotnost balení Podrobnosti
+DocType: Restaurant Reservation,Reservation Time,Čas rezervácie
 DocType: Payment Gateway Account,Payment Gateway Account,Platobná brána účet
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Po dokončení platby presmerovať užívateľa na vybrané stránky.
 DocType: Company,Existing Company,existujúce Company
 DocType: Healthcare Settings,Result Emailed,Výsledok bol odoslaný e-mailom
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","Daňová kategória bola zmenená na &quot;Celkom&quot;, pretože všetky položky sú položky, ktoré nie sú na sklade"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položiek&gt; Značka
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Vyberte soubor csv
 DocType: Student Leave Application,Mark as Present,Označiť ako prítomný
 DocType: Supplier Scorecard,Indicator Color,Farba indikátora
@@ -5203,11 +5298,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Urobiť Študent Batch
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Je převádět
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Získat předměty z BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Získat předměty z BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Vek Obchodnej iniciatívy v dňoch
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Riadok # {0}: Vysielanie dátum musí byť rovnaké ako dátum nákupu {1} aktíva {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Skontrolujte, či študent býva v hosteli inštitútu."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Prosím, zadajte Predajné objednávky v tabuľke vyššie"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Prosím, zadajte Predajné objednávky v tabuľke vyššie"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Nie je Vložené výplatných páskach
 ,Stock Summary,Sumár zásob
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Previesť aktíva z jedného skladu do druhého
@@ -5223,5 +5318,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: záporný nemůže být spojována s {1}
 DocType: Journal Entry,Subscription Section,Sekcia odberu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Účet {0} neexistuje
+DocType: Training Event,Training Program,Tréningový program
 DocType: Account,Cash,V hotovosti
 DocType: Employee,Short biography for website and other publications.,Krátký životopis na internetové stránky a dalších publikací.
diff --git a/erpnext/translations/sl.csv b/erpnext/translations/sl.csv
index b01b009..6389b89 100644
--- a/erpnext/translations/sl.csv
+++ b/erpnext/translations/sl.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Način plače
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Registriraj se
 DocType: Patient,Divorced,Ločen
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Postavke že sinhronizirano
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Dovoli da se artikel večkrat  doda v transakciji.
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Opusti Material obisk {0} pred preklicem te garancije
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Pustite Approvers
 DocType: Sales Partner,Dealer,Trgovec
 DocType: Consultation,Investigations,Preiskave
+DocType: Restaurant Order Entry,Click Enter To Add,Kliknite Enter za dodajanje
 DocType: Employee,Rented,Najemu
 DocType: Purchase Order,PO-,po-
 DocType: POS Profile,Applicable for User,Velja za člane
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Ustavljen Proizvodnja naročite ni mogoče preklicati, ga najprej Odčepiti preklicati"
 DocType: Vehicle Service,Mileage,Kilometrina
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,"Ali res želite, da ostanki ta sredstva?"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,"Ali res želite, da ostanki ta sredstva?"
 DocType: Drug Prescription,Update Schedule,Posodobi urnik
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Izberite Privzeta Dobavitelj
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Valuta je potrebna za tečajnico {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Preveri razpoložljivost
 DocType: Job Applicant,Job Applicant,Job Predlagatelj
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Ta temelji na transakcijah proti temu dobavitelju. Oglejte si časovnico spodaj za podrobnosti
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ni več zadetkov.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Pravna
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Dejanska davčna vrsta ne more biti vključen v ceno postavko v vrstici {0}
 DocType: Bank Guarantee,Customer,Stranka
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Menjalni tečaj mora biti enaka kot {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Ime stranke
 DocType: Vehicle,Natural Gas,Zemeljski plin
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Bančni račun ne more biti imenovan kot {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Bančni račun ne more biti imenovan kot {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Glave (ali skupine), proti katerim vknjižbe so narejeni in stanje se ohranijo."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Izjemna za {0} ne more biti manjša od nič ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Za obdelavo ni predloženih plačljivih lističev.
 DocType: Manufacturing Settings,Default 10 mins,Privzeto 10 minut
 DocType: Leave Type,Leave Type Name,Pustite Tip Ime
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Prikaži odprte
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,To akcijo je treba sprejeti sam danes za zgoraj omenjeno ponavljajoče se obdobje
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Zaporedje uspešno posodobljeno
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Naročilo
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural list Začetek Objavil
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Naročilnica Postavke da bodo prejete
 DocType: SMS Center,All Supplier Contact,Vse Dobavitelj Kontakt
 DocType: Support Settings,Support Settings,Nastavitve podpora
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Pričakuje Končni datum ne more biti manjši od pričakovanega začetka Datum
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Pričakuje Končni datum ne more biti manjši od pričakovanega začetka Datum
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Vrstica # {0}: Stopnja mora biti enaka kot {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,New Leave Application
 ,Batch Item Expiry Status,Serija Točka preteka Status
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Bank Osnutek
 DocType: Mode of Payment Account,Mode of Payment Account,Način plačilnega računa
 DocType: Consultation,Consultation,Posvetovanje
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Prodaja in vrnitev
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Prikaži Variante
 DocType: Academic Term,Academic Term,Academic Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Material
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Skrb za zdravje
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Zamuda pri plačilu (dnevi)
 DocType: Lab Prescription,Lab Prescription,Laboratorijski recept
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Razvrsti po ceni
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Service Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijska številka: {0} že naveden v prodajne fakture: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Račun
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijska številka: {0} že naveden v prodajne fakture: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Račun
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Poslovno leto {0} je potrebno
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obramba
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Vrstica # {0}:
 DocType: Timesheet,Total Costing Amount,Skupaj Stanejo Znesek
 DocType: Delivery Note,Vehicle No,Nobeno vozilo
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Izberite Cenik
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Izberite Cenik
 DocType: Accounts Settings,Currency Exchange Settings,Nastavitve menjave valut
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Vrstica # {0}: Plačilo dokument je potreben za dokončanje trasaction
 DocType: Production Order Operation,Work In Progress,V razvoju
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Izberite datum
 DocType: Employee,Holiday List,Holiday Seznam
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,"Prosimo, nastavite sistem imenovanja inštruktorja v šoli&gt; Nastavitve šole"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Računovodja
+DocType: Hub Settings,Selling Price List,Prodajni cenik
 DocType: Patient,Tobacco Current Use,Trenutna uporaba tobaka
 DocType: Cost Center,Stock User,Stock Uporabnik
 DocType: Company,Phone No,Telefon
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Urniki tečaj ustvaril:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Nov {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Nov {0}: # {1}
 ,Sales Partners Commission,Partnerji Sales Komisija
 DocType: Purchase Invoice,Rounding Adjustment,Prilagajanje zaokroževanja
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Kratica ne more imeti več kot 5 znakov
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",Referenca: {0} Oznaka: {1} in stranke: {2}
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kg
-DocType: Student Log,Log,dnevnik
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Odpiranje za službo.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Predloženi rezultat
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Predloženi rezultat
 DocType: Item Attribute,Increment,Prirastek
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Časovni razpon
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Izberite Skladišče ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Poročen
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Ni dovoljeno za {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Pridobi artikle iz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Stock ni mogoče posodobiti proti dobavnica {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Stock ni mogoče posodobiti proti dobavnica {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Izdelek {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,"Ni elementov, navedenih"
 DocType: Payment Reconciliation,Reconcile,Uskladitev
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pokojninski skladi
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Naslednja Amortizacija datum ne more biti pred Nakup Datum
 DocType: Consultation,Consultation Date,Datum posvetovanja
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Seznam izdelkov in odkritje za uporabnike ERPNext
 DocType: SMS Center,All Sales Person,Vse Sales oseba
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Mesečni Distribution ** vam pomaga razširjati proračuna / Target po mesecih, če imate sezonske v vašem podjetju."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Ni najdenih predmetov
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Plača Struktura Missing
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Ni najdenih predmetov
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Plača Struktura Missing
 DocType: Lead,Person Name,Ime oseba
 DocType: Sales Invoice Item,Sales Invoice Item,Artikel na računu
 DocType: Account,Credit,Credit
 DocType: POS Profile,Write Off Cost Center,Napišite Off stroškovni center
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",npr &quot;Osnovna šola&quot; ali &quot;University&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",npr &quot;Osnovna šola&quot; ali &quot;University&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Poročila o zalogi
 DocType: Warehouse,Warehouse Detail,Skladišče Detail
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prečkal za stranko {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Izraz Končni datum ne more biti najpozneje do leta End Datum študijskem letu, v katerem je izraz povezan (študijsko leto {}). Popravite datum in poskusite znova."
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Ali je osnovno sredstvo&quot; ne more biti brez nadzora, saj obstaja evidenca sredstev proti postavki"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Ali je osnovno sredstvo&quot; ne more biti brez nadzora, saj obstaja evidenca sredstev proti postavki"
 DocType: Vehicle Service,Brake Oil,Zavorna olja
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Stranka&gt; Skupina strank&gt; Teritorija
 DocType: Tax Rule,Tax Type,Davčna Type
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Davčna osnova
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Nimate dovoljenja za dodajanje ali posodobitev vnose pred {0}
 DocType: BOM,Item Image (if not slideshow),Postavka Image (če ne slideshow)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Obstaja Stranka z istim imenom
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Urne / 60) * Dejanska  čas operacije
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Vrstica # {0}: Referenčni dokument mora biti eden od zahtevkov za stroške ali vpisa v dnevnik
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Izberite BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Vrstica # {0}: Referenčni dokument mora biti eden od zahtevkov za stroške ali vpisa v dnevnik
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Izberite BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Nabavna vrednost dobavljenega predmeta
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,"Praznik na {0} ni med Od datuma, do sedaj"
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,zaposlenih Loan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Dnevnik aktivnosti:
 DocType: Fee Schedule,Send Payment Request Email,Pošlji e-pošto za plačilni zahtevek
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Element {0} ne obstaja v sistemu ali je potekla
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Element {0} ne obstaja v sistemu ali je potekla
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nepremičnina
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Izkaz računa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmacevtski izdelki
@@ -210,18 +213,23 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Uvoz Log
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Potegnite materiala Zahtevaj tipa Proizvodnja na podlagi zgornjih meril
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Uspešno neregistriran.
 DocType: Training Result Employee,Grade,razred
+DocType: Restaurant Table,No of Seats,Število sedežev
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Če želite dodati dinamični predmet, uporabite oznake z oznako <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Delivered dobavitelj
 DocType: SMS Center,All Contact,Vse Kontakt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Proizvodnja naročite že ustvarili za vse postavke s BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Proizvodnja naročite že ustvarili za vse postavke s BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Letne plače
 DocType: Daily Work Summary,Daily Work Summary,Dnevni Delo Povzetek
 DocType: Period Closing Voucher,Closing Fiscal Year,Zapiranje poslovno leto
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} je zamrznjeno
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Izberite obstoječo družbo za ustvarjanje kontnem načrtu
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} je zamrznjeno
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Izberite obstoječo družbo za ustvarjanje kontnem načrtu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Zaloga Stroški
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Izberite Target Skladišče
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Izberite Target Skladišče
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Izberite Target Skladišče
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Izberite Target Skladišče
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Vnesite Želeni Kontakt Email
 DocType: Program Enrollment,School Bus,Šolski avtobus
 DocType: Journal Entry,Contra Entry,Contra Začetek
@@ -238,9 +246,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Prenesite predloge, izpolnite ustrezne podatke in priložite spremenjeno datoteko. Vsi datumi in zaposleni kombinacija v izbranem obdobju, bo prišel v predlogo, z obstoječimi zapisi postrežbo"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Postavka {0} ni aktiven ali je bil dosežen konec življenja
+DocType: Student Admission Program,Minimum Age,Najnižja starost
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Primer: Osnovna matematika
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Da vključujejo davek v vrstici {0} v stopnji Element, davki v vrsticah {1} je treba vključiti tudi"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Nastavitve za HR modula
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Nastavitve za HR modula
 DocType: SMS Center,SMS Center,SMS center
 DocType: Sales Invoice,Change Amount,Znesek spremembe
 DocType: BOM Update Tool,New BOM,New BOM
@@ -250,7 +259,7 @@
 DocType: Lead,Request Type,Zahteva Type
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Naj Zaposleni
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Broadcasting
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Dodajanje sob
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Način nastavitve POS (Online / Offline)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Izvedba
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Podrobnosti o poslovanju izvajajo.
 DocType: Serial No,Maintenance Status,Status vzdrževanje
@@ -273,6 +282,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cenik mora biti primerno za nakup ali prodajo
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Datum namestitve ne more biti pred datumom dostave za postavko {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Popust na ceno iz cenika Stopnja (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Biokemija
 DocType: Offer Letter,Select Terms and Conditions,Izberite Pogoji
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,iz Vrednost
 DocType: Production Planning Tool,Sales Orders,Naročila Kupcev
@@ -307,15 +317,15 @@
 DocType: Sales Partner,Reseller,Reseller
 DocType: Codification Table,Medical Code,Zdravstvena koda
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Če je omogočeno, bo vključeval non-parkom v materialu zaprosil."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Vnesite Company
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Vnesite Company
 DocType: Delivery Note Item,Against Sales Invoice Item,Proti Sales računa Postavka
 ,Production Orders in Progress,Proizvodna naročila v teku
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Neto denarni tokovi pri financiranju
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","Lokalno shrambo je polna, ni shranil"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","Lokalno shrambo je polna, ni shranil"
 DocType: Lead,Address & Contact,Naslov in kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj neuporabljene liste iz prejšnjih dodelitev
 DocType: Sales Partner,Partner website,spletna stran partnerja
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Dodaj predmet
+DocType: Restaurant Order Entry,Add Item,Dodaj predmet
 DocType: Lab Test,Custom Result,Rezultat po meri
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Kontaktno ime
 DocType: Course Assessment Criteria,Course Assessment Criteria,Merila ocenjevanja tečaj
@@ -328,7 +338,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Zaprosi za nakup.
 DocType: Lab Test,Submitted Date,Datum predložitve
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Ta temelji na časovnih preglednicah ustvarjenih pred tem projektu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Neto plača ne sme biti manjši od 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Neto plača ne sme biti manjši od 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Če želite prenehati pošiljati ponavljajoča obvestila o napakah iz sistema, smo v naročnini označili polje Disabled"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Le izbrani Leave odobritelj lahko predloži pustite to Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Lajšanje Datum mora biti večja od Datum pridružitve
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Listi na leto
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,Profit &amp; Loss
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Liter
 DocType: Task,Total Costing Amount (via Time Sheet),Skupaj Costing Znesek (preko Čas lista)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,"Prosimo, nastavite Študente v študentskih skupinah"
 DocType: Item Website Specification,Item Website Specification,Element Spletna stran Specifikacija
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Pustite blokiranih
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Postavka {0} je konec življenja na {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Postavka {0} je konec življenja na {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,bančni vnosi
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Letno
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Sprava Postavka
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Orodje za oblikovanje študent Group tečaj
 DocType: Lead,Do Not Contact,Ne Pišite
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,"Ljudje, ki poučujejo v vaši organizaciji"
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Edinstven ID za sledenje vse ponavljajoče račune. To je ustvarila na oddajte.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Razvijalec programske opreme
 DocType: Item,Minimum Order Qty,Najmanjše naročilo Kol
 DocType: Pricing Rule,Supplier Type,Dobavitelj Type
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,Objavite v Hub
 DocType: Student Admission,Student Admission,študent Sprejem
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Postavka {0} je odpovedan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Zahteva za material
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Postavka {0} je odpovedan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Zahteva za material
 DocType: Bank Reconciliation,Update Clearance Date,Posodobitev Potrditev Datum
 DocType: Item,Purchase Details,Nakup Podrobnosti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Postavka {0} ni bilo mogoče najti v &quot;surovin, dobavljenih&quot; mizo v narocilo {1}"
 DocType: Patient Relation,Relation,Razmerje
 DocType: Shipping Rule,Worldwide Shipping,Dostava po celem svetu
 DocType: Patient Relation,Mother,mati
+DocType: Restaurant Reservation,Reservation End Time,Končni čas rezervacije
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Potrjena naročila od strank.
 DocType: Purchase Receipt Item,Rejected Quantity,Zavrnjeno Količina
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Zahtevek za plačilo {0} je bil ustvarjen
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Zahtevek za plačilo {0} je bil ustvarjen
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Nizka občutljivost
 DocType: Notification Control,Notification Control,Nadzor obvestilo
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,"Potrdite, ko ste končali usposabljanje"
 DocType: Lead,Suggestions,Predlogi
@@ -388,7 +401,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,"E-pošta plačilni list na zaposlenega, ki temelji na prednostni e-pošti izbrani na zaposlenega"
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"Prvi Leave odobritelj na seznamu, bo nastavljen kot privzeti Leave odobritelja"
 DocType: Tax Rule,Shipping County,Dostava County
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Naučite
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Naučite
 DocType: Asset,Next Depreciation Date,Naslednja Amortizacija Datum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Stroški dejavnost na zaposlenega
 DocType: Accounts Settings,Settings for Accounts,Nastavitve za račune
@@ -399,13 +412,13 @@
 DocType: Item,Synced With Hub,Sinhronizirano Z Hub
 DocType: Vehicle,Fleet Manager,Fleet Manager
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Vrstica # {0} {1} ne more biti negativna za element {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Napačno geslo
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Napačno geslo
 DocType: Item,Variant Of,Varianta
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Dopolnil Količina ne sme biti večja od &quot;Kol za Izdelava&quot;
 DocType: Period Closing Voucher,Closing Account Head,Zapiranje računa Head
 DocType: Employee,External Work History,Zunanji Delo Zgodovina
 DocType: Physician,Time per Appointment,Čas na imenovanje
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Krožna Reference Error
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Krožna Reference Error
 DocType: Appointment Type,Is Inpatient,Je bolnišnična
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Ime Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Z besedami (izvoz) bo viden, ko boste shranite dobavnici."
@@ -414,19 +427,18 @@
 DocType: Lead,Industry,Industrija
 DocType: Employee,Job Profile,Job profila
 DocType: BOM Item,Rate & Amount,Stopnja in znesek
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosimo, nastavite številske serije za udeležbo preko Setup&gt; Series Numbering"
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,To temelji na transakcijah zoper to družbo. Za podrobnosti si oglejte časovni načrt spodaj
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Obvesti po e-pošti na ustvarjanje avtomatičnega Material dogovoru
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Odporen
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Račun Type
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Stranka&gt; Skupina strank&gt; Teritorija
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Poročilo o dostavi
 DocType: Consultation,Encounter Impression,Ujemanje prikaza
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Postavitev Davki
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Stroški Prodano sredstvi
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,"Začetek Plačilo je bil spremenjen, ko je potegnil. Prosimo, še enkrat vleči."
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} dvakrat vpisana v postavki davku
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Povzetek za ta teden in ki potekajo dejavnosti
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} dvakrat vpisana v postavki davku
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Povzetek za ta teden in ki potekajo dejavnosti
 DocType: Student Applicant,Admitted,priznal
 DocType: Workstation,Rent Cost,Najem Stroški
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Znesek Po amortizacijo
@@ -441,36 +453,35 @@
 DocType: Shipping Rule,Valid for Countries,Velja za države
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ta postavka je Predloga in je ni mogoče uporabiti v transakcijah. Atributi postavka bodo kopirali več kot v različicah, razen če je nastavljeno &quot;Ne Kopiraj«"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Skupaj naročite Upoštevani
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Oznaka zaposleni (npr CEO, direktor itd.)"
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Oznaka zaposleni (npr CEO, direktor itd.)"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Stopnjo, po kateri je naročnik Valuta pretvori v osnovni valuti kupca"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Seveda razporejanje orodje
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Nakup računa ni mogoče sklepati na podlagi obstoječega sredstva {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Nujno] Napaka med ustvarjanjem ponavljajočih% s za% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Nujno] Napaka med ustvarjanjem ponavljajočih% s za% s
 DocType: Item Tax,Tax Rate,Davčna stopnja
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} že dodeljenih za Employee {1} za obdobje {2} do {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Izberite Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Izberite Item
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Nakup Račun {0} je že predložila
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Vrstica # {0}: mora Serija Ne biti enaka kot {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,"Pretvarjanje, da non-Group"
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Serija (lot) postavke.
 DocType: C-Form Invoice Detail,Invoice Date,Datum računa
 DocType: GL Entry,Debit Amount,Debetni Znesek
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},"Ne more biti samo 1 račun na podjetje, v {0} {1}"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Glej prilogo
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},"Ne more biti samo 1 račun na podjetje, v {0} {1}"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Glej prilogo
 DocType: Purchase Order,% Received,% Prejeto
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Ustvarjanje skupin študentov
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Setup Že Complete !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Setup Že Complete !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Credit Opomba Znesek
 DocType: Setup Progress Action,Action Document,Akcijski dokument
 ,Finished Goods,"Končnih izdelkov,"
 DocType: Delivery Note,Instructions,Navodila
 DocType: Quality Inspection,Inspected By,Pregledajo
 DocType: Maintenance Visit,Maintenance Type,Vzdrževanje Type
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} ni vpisan v teku {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Koda postavke&gt; Skupina izdelkov&gt; Blagovna znamka
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} ni vpisan v teku {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serijska št {0} ne pripada dobavnica {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Dodaj artikel
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Dodaj artikel
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Postavka Inšpekcijski parametrov kakovosti
 DocType: Leave Application,Leave Approver Name,Pustite odobritelju Name
 DocType: Depreciation Schedule,Schedule Date,Urnik Datum
@@ -492,7 +503,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Delovni čas
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Spremenite izhodiščno / trenutno zaporedno številko obstoječega zaporedja.
 DocType: Dosage Strength,Strength,Moč
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Ustvari novo stranko
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Ustvari novo stranko
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Če je več Rules Cenik še naprej prevladovala, so pozvane, da nastavite Priority ročno za reševanje morebitnih sporov."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Ustvari naročilnice
 ,Purchase Register,Nakup Register
@@ -511,7 +522,7 @@
 DocType: Lab Test Template,Single,Samski
 DocType: Salary Slip,Total Loan Repayment,Skupaj posojila Povračilo
 DocType: Account,Cost of Goods Sold,Nabavna vrednost prodanega blaga
-DocType: Purchase Invoice,Yearly,Letni
+DocType: Subscription,Yearly,Letni
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Vnesite stroškovni center
 DocType: Drug Prescription,Dosage,Odmerjanje
 DocType: Journal Entry Account,Sales Order,Naročilo
@@ -542,7 +553,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globalne nastavitve za vseh proizvodnih procesov.
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Zamrznjena Stanuje
 DocType: SMS Log,Sent On,Pošlje On
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Lastnost {0} izbrana večkrat v atributih tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Lastnost {0} izbrana večkrat v atributih tabeli
 DocType: HR Settings,Employee record is created using selected field. ,Evidenco o zaposlenih delavcih je ustvarjena s pomočjo izbrano polje.
 DocType: Sales Order,Not Applicable,Se ne uporablja
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday gospodar.
@@ -568,13 +579,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Skupaj listi dodeljena je obvezna
 DocType: Patient,AB Positive,AB pozitivno
 DocType: Job Opening,Description of a Job Opening,Opis službo Otvoritev
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,V čakanju na aktivnosti za danes
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,V čakanju na aktivnosti za danes
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Šivih.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,"Plača Komponenta za Timesheet na izplačane plače, ki temelji."
 DocType: Sales Order Item,Used for Production Plan,Uporablja se za proizvodnjo načrta
 DocType: Employee Loan,Total Payment,Skupaj plačila
 DocType: Manufacturing Settings,Time Between Operations (in mins),Čas med dejavnostmi (v minutah)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} se odpravi tako dejanje ne more biti dokončana
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} se odpravi tako dejanje ne more biti dokončana
 DocType: Customer,Buyer of Goods and Services.,Kupec blaga in storitev.
 DocType: Journal Entry,Accounts Payable,Računi se plačuje
 DocType: Patient,Allergies,Alergije
@@ -586,22 +597,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Opozori na naročila za nakup
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Naštejte nekaj vaših strank. Ti bi se lahko organizacije ali posamezniki.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Dovolj deli za izgradnjo
+DocType: POS Profile User,POS Profile User,POS profil uporabnika
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Neposredne dohodkovne
 DocType: Patient Appointment,Date TIme,Datum čas
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Filter ne more temeljiti na račun, če je združena s račun"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Upravni uradnik
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Izberite tečaj
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Izberite tečaj
 DocType: Codification Table,Codification Table,Tabela kodifikacije
 DocType: Timesheet Detail,Hrs,hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,"Prosimo, izberite Company"
 DocType: Stock Entry Detail,Difference Account,Razlika račun
 DocType: Purchase Invoice,Supplier GSTIN,Dobavitelj GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Ne more blizu naloga, saj je njena odvisna Naloga {0} ni zaprt."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,"Vnesite skladišče, za katere se bo dvignjeno Material Zahteva"
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Ne more blizu naloga, saj je njena odvisna Naloga {0} ni zaprt."
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Vnesite skladišče, za katere se bo dvignjeno Material Zahteva"
 DocType: Production Order,Additional Operating Cost,Dodatne operacijski stroškov
 DocType: Lab Test Template,Lab Routine,Lab Routine
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kozmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Za pripojitev, mora naslednje lastnosti biti enaka za oba predmetov"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Za pripojitev, mora naslednje lastnosti biti enaka za oba predmetov"
 DocType: Shipping Rule,Net Weight,Neto teža
 DocType: Employee,Emergency Phone,Zasilna Telefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Nakup
@@ -612,7 +624,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,"Prosimo, določite stopnjo za praga 0%"
 DocType: Sales Order,To Deliver,Dostaviti
 DocType: Purchase Invoice Item,Item,Postavka
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Serijska št postavka ne more biti del
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Visoka občutljivost
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Serijska št postavka ne more biti del
 DocType: Journal Entry,Difference (Dr - Cr),Razlika (Dr - Cr)
 DocType: Account,Profit and Loss,Dobiček in izguba
 DocType: Patient,Risk Factors,Dejavniki tveganja
@@ -621,7 +634,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Upravljanje Podizvajalci
 DocType: Vital Signs,Body Temperature,Temperatura telesa
 DocType: Project,Project will be accessible on the website to these users,Projekt bo na voljo na spletni strani teh uporabnikov
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Določite vrsto projekta.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Določite vrsto projekta.
 DocType: Supplier Scorecard,Weighting Function,Tehtalna funkcija
 DocType: Physician,OP Consulting Charge,OP Consulting Charge
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Nastavite svoje
@@ -635,7 +648,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Prirastek ne more biti 0
 DocType: Production Planning Tool,Material Requirement,Material Zahteva
 DocType: Company,Delete Company Transactions,Izbriši transakcije družbe
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Referenčna številka in referenčni datum je obvezna za banke transakcijo
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Referenčna številka in referenčni datum je obvezna za banke transakcijo
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Dodaj / Uredi davkov in dajatev
 DocType: Payment Entry Reference,Supplier Invoice No,Dobavitelj Račun Ne
 DocType: Territory,For reference,Za sklic
@@ -643,12 +656,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Ne morem izbrisati Serijska št {0}, saj je uporabljen v transakcijah zalogi"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Zapiranje (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,zdravo
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Move Item
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Move Item
 DocType: Serial No,Warranty Period (Days),Garancijski rok (dni)
 DocType: Installation Note Item,Installation Note Item,Namestitev Opomba Postavka
 DocType: Production Plan Item,Pending Qty,Pending Kol
 DocType: Budget,Ignore,Ignoriraj
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} ni aktiven
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} ni aktiven
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Preverite nastavitve za dimenzije za tiskanje
 DocType: Salary Slip,Salary Slip Timesheet,Plača Slip Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dobavitelj Skladišče obvezno za podizvajalcev Potrdilo o nakupu
@@ -657,7 +670,7 @@
 DocType: Pricing Rule,Sales Partner,Prodaja Partner
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Vse ocenjevalne table dobaviteljev.
 DocType: Buying Settings,Purchase Receipt Required,Potrdilo o nakupu Obvezno
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Oceni Vrednotenje je obvezna, če je začel Odpiranje Stock"
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,"Oceni Vrednotenje je obvezna, če je začel Odpiranje Stock"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Ni najdenih v tabeli računa zapisov
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Izberite podjetja in Zabava Vrsta najprej
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Finančni / računovodstvo leto.
@@ -694,7 +707,7 @@
 DocType: Quotation,Quotation To,Ponudba za
 DocType: Lead,Middle Income,Bližnji Prihodki
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Odprtino (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Privzeto mersko enoto za postavko {0} ni mogoče neposredno spremeniti, ker ste že naredili nekaj transakcije (-e) z drugo UOM. Boste morali ustvariti nov element, da uporabi drugačno Privzeti UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Privzeto mersko enoto za postavko {0} ni mogoče neposredno spremeniti, ker ste že naredili nekaj transakcije (-e) z drugo UOM. Boste morali ustvariti nov element, da uporabi drugačno Privzeti UOM."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Dodeljen znesek ne more biti negativna
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Nastavite Company
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Nastavite Company
@@ -709,6 +722,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,"Izberite Plačilo računa, da bo Bank Entry"
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Ustvarjanje zapisov zaposlencev za upravljanje listje, odhodkov terjatev in na izplačane plače"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Period predpisovanja
+DocType: Restaurant Reservation,Restaurant Reservation,Rezervacija restavracij
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Predlog Pisanje
 DocType: Payment Entry Deduction,Payment Entry Deduction,Plačilo Začetek odštevanja
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Obstaja še ena Sales Oseba {0} z enako id zaposlenih
@@ -716,7 +730,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Masters
 DocType: Assessment Plan,Maximum Assessment Score,Najvišja ocena Ocena
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Update banka transakcijske Termini
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,sledenje čas
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,sledenje čas
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,DVOJNIK ZA TRANSPORTER
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskalna Leto Company
 DocType: Packing Slip Item,DN Detail,DN Detail
@@ -725,8 +739,9 @@
 DocType: Batch,Batch Description,Serija Opis
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Ustvarjanje študentskih skupin
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Ustvarjanje študentskih skupin
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Plačilo Gateway računa ni ustvaril, si ustvariti ročno."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Plačilo Gateway računa ni ustvaril, si ustvariti ročno."
 DocType: Supplier Scorecard,Per Year,Letno
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Ni upravičen do sprejema v tem programu kot na DOB
 DocType: Sales Invoice,Sales Taxes and Charges,Prodajne Davki in dajatve
 DocType: Employee,Organization Profile,Organizacija Profil
 DocType: Vital Signs,Height (In Meter),Višina (v metrih)
@@ -762,7 +777,7 @@
 DocType: Student Batch Name,Batch Name,serija Ime
 DocType: Fee Validity,Max number of visit,Največje število obiska
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet ustvaril:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},"Prosim, nastavite privzeto gotovinski ali bančni račun v načinu plačevanja {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},"Prosim, nastavite privzeto gotovinski ali bančni račun v načinu plačevanja {0}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,včlanite se
 DocType: GST Settings,GST Settings,GST Nastavitve
 DocType: Selling Settings,Customer Naming By,Stranka Imenovanje Z
@@ -794,16 +809,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Iztovorjeni stroškov Davki in prispevki
 DocType: Production Order Operation,Actual Start Time,Actual Start Time
 DocType: BOM Operation,Operation Time,Operacija čas
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Finish
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Finish
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Osnovna
 DocType: Timesheet,Total Billed Hours,Skupaj Obračunane ure
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Napišite enkratnem znesku
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Napišite enkratnem znesku
 DocType: Leave Block List Allow,Allow User,Dovoli Uporabnik
 DocType: Journal Entry,Bill No,Bill Ne
 DocType: Company,Gain/Loss Account on Asset Disposal,Dobiček / izguba račun o odlaganju sredstev
 DocType: Vehicle Log,Service Details,storitev Podrobnosti
 DocType: Vehicle Log,Service Details,storitev Podrobnosti
-DocType: Purchase Invoice,Quarterly,Četrtletno
+DocType: Subscription,Quarterly,Četrtletno
 DocType: Lab Test Template,Grouped,Združeno
 DocType: Selling Settings,Delivery Note Required,Dostava Opomba Obvezno
 DocType: Bank Guarantee,Bank Guarantee Number,Bančna garancija Število
@@ -813,12 +828,12 @@
 DocType: Student Attendance,Student Attendance,študent Udeležba
 DocType: Sales Invoice Timesheet,Time Sheet,čas Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,"Backflush Surovine, ki temelji na"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,"Prosimo, vnesite podatke točko"
 DocType: Interest,Interest,Obresti
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,pre Sales
 DocType: Purchase Receipt,Other Details,Drugi podatki
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Lab Test,Test Template,Preskusna predloga
+DocType: Restaurant Order Entry Item,Served,Servirano
 DocType: Account,Accounts,Računi
 DocType: Vehicle,Odometer Value (Last),Vrednost števca (Zadnja)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Predloge meril uspešnosti dobaviteljev.
@@ -830,26 +845,28 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Predogled Plača listek
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Račun {0} je bil vpisan večkrat
 DocType: Account,Expenses Included In Valuation,Stroški Vključeno v vrednotenju
-DocType: Hub Settings,Seller City,Prodajalec Mesto
 ,Absent Student Report,Odsoten Student Report
 DocType: Email Digest,Next email will be sent on:,Naslednje sporočilo bo poslano na:
 DocType: Offer Letter Term,Offer Letter Term,Pisna ponudba Term
 DocType: Supplier Scorecard,Per Week,Tedensko
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Element ima variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Element ima variante.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Skupaj študent
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Postavka {0} ni bilo mogoče najti
 DocType: Bin,Stock Value,Stock Value
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,Zapisi o plačilih bodo ustvarjeni v ozadju. V primeru napake se sporočilo o napaki posodablja na seznamu.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Podjetje {0} ne obstaja
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} ima veljavnost do {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} ima veljavnost do {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Tree Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Količina porabljene na enoto
 DocType: Serial No,Warranty Expiry Date,Garancija Datum preteka
 DocType: Material Request Item,Quantity and Warehouse,Količina in skladišča
+DocType: Hub Settings,Unregister,Odjavite se
 DocType: Sales Invoice,Commission Rate (%),Komisija Stopnja (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Izberite program
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Izberite program
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Izberite program
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Izberite program
 DocType: Project,Estimated Cost,Ocenjeni strošek
 DocType: Purchase Order,Link to material requests,Povezava na materialne zahteve
+DocType: Hub Settings,Publish,Objavi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
 DocType: Journal Entry,Credit Card Entry,Začetek Credit Card
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Podjetje in računi
@@ -860,13 +877,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Zapri Priložnost Po dnevih
 ,Reserved,Rezervirano
 DocType: Purchase Order,Supply Raw Materials,Oskrba z Surovine
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Datum, na katerega se bo ustvarila naslednji račun. To je ustvarila na oddajte."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Kratkoročna sredstva
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} ni zaloge artikla
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',"Pošljite povratne informacije o usposabljanju, tako da kliknete »Povratne informacije o usposabljanju« in nato »Novo«,"
 DocType: Mode of Payment Account,Default Account,Privzeti račun
 DocType: Payment Entry,Received Amount (Company Currency),Prejela znesek (družba Valuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,"Svinec je treba določiti, če je priložnost narejen iz svinca"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,"Svinec je treba določiti, če je priložnost narejen iz svinca"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Prosimo, izberite tedensko off dan"
 DocType: Patient,O Negative,O Negativno
 DocType: Production Order Operation,Planned End Time,Načrtovano Končni čas
@@ -882,10 +898,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energy
 DocType: Opportunity,Opportunity From,Priložnost Od
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mesečno poročilo o izplačanih plačah.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Dodaj podjetje
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,"Vrstica {0}: {1} Serijske številke, potrebne za postavko {2}. Dali ste {3}."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,"Vrstica {0}: {1} Serijske številke, potrebne za postavko {2}. Dali ste {3}."
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Izberite tabelo
 DocType: BOM,Website Specifications,Spletna Specifikacije
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} je neveljaven e-poštni naslov v razdelku »Prejemniki«
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} je neveljaven e-poštni naslov v razdelku »Prejemniki«
 DocType: Special Test Items,Particulars,Podrobnosti
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiotik.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Od {0} tipa {1}
@@ -893,11 +909,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Vrstica {0}: Factor Pretvorba je obvezna
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Več Cena Pravila obstaja z enakimi merili, se rešujejo spore z dodelitvijo prednost. Cena Pravila: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne more izključiti ali preklicati BOM saj je povezan z drugimi BOMs
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne more izključiti ali preklicati BOM saj je povezan z drugimi BOMs
 DocType: Opportunity,Maintenance,Vzdrževanje
 DocType: Item Attribute Value,Item Attribute Value,Postavka Lastnost Vrednost
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Prodajne akcije.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Ustvari evidenco prisotnosti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Ustvari evidenco prisotnosti
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -935,12 +951,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,"Prosimo, da najprej vnesete artikel"
 DocType: Account,Liability,Odgovornost
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionirano Znesek ne sme biti večja od škodnega Znesek v vrstici {0}.
+DocType: Salary Detail,Do not include in total,Ne vključite v celoti
 DocType: Company,Default Cost of Goods Sold Account,Privzeto Nabavna vrednost prodanega blaga račun
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Cenik ni izbrana
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Cenik ni izbrana
 DocType: Employee,Family Background,Družina Ozadje
 DocType: Request for Quotation Supplier,Send Email,Pošlji e-pošto
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Opozorilo: Invalid Attachment {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Ne Dovoljenje
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Opozorilo: Invalid Attachment {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Ne Dovoljenje
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Zahtevan cenik
 DocType: Vital Signs,Heart Rate / Pulse,Srčni utrip / impulz
 DocType: Company,Default Bank Account,Privzeti bančni račun
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Za filtriranje, ki temelji na stranke, da izberete Party Vnesite prvi"
@@ -968,12 +986,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Točka Row {idx} {DOCTYPE} {DOCNAME} ne obstaja v zgoraj &#39;{DOCTYPE} &quot;tabela
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,"Timesheet {0}, je že končana ali preklicana"
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ni opravil
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dan v mesecu, v katerem se bo samodejno Račun ustvarjen na primer 05, 28, itd"
 DocType: Item Variant Settings,Copy Fields to Variant,Kopiraj polja v Variant
 DocType: Asset,Opening Accumulated Depreciation,Odpiranje nabrano amortizacijo
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Rezultat mora biti manjša od ali enaka 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Vpis orodje
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,Zapisi C-Form
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,Zapisi C-Form
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Kupec in dobavitelj
 DocType: Email Digest,Email Digest Settings,E-pošta Digest Nastavitve
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Hvala za vaš posel!
@@ -991,13 +1008,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Citiraj stanje
 DocType: Maintenance Visit,Completion Status,Zaključek Status
 DocType: HR Settings,Enter retirement age in years,Vnesite upokojitveno starost v letih
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Ciljna Skladišče
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Izberite skladišče
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Ciljna Skladišče
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Izberite skladišče
 DocType: Cheque Print Template,Starting location from left edge,Izhajajoč lokacijo od levega roba
 DocType: Item,Allow over delivery or receipt upto this percent,Dovoli nad dostavo ali prejem upto tem odstotkov
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Uvoz Udeležba
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Vse Postavka Skupine
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Vse Postavka Skupine
 DocType: Process Payroll,Activity Log,Dnevnik aktivnosti
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Čisti dobiček / izguba
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Samodejno sestavite sporočilo o predložitvi transakcij.
@@ -1009,7 +1026,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Predvidoma Kol
 DocType: Sales Invoice,Payment Due Date,Datum zapadlosti
 DocType: Drug Prescription,Interval UOM,Interval UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Postavka Variant {0} že obstaja z enakimi atributi
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Postavka Variant {0} že obstaja z enakimi atributi
+DocType: Item,Hub Publishing Details,Podrobnosti o objavljanju zvezdišča
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&quot;Odpiranje&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Odpri storiti
 DocType: Notification Control,Delivery Note Message,Dostava Opomba Sporočilo
@@ -1029,10 +1047,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: Surovina ne more biti enaka kot glavna postavka
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Skupaj veljavnih cenah na Potrdilo o nakupu postavke tabele mora biti enaka kot Skupaj davkov in dajatev
 DocType: Sales Team,Incentives,Spodbude
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Prijavite se za vozlišče
 DocType: SMS Log,Requested Numbers,Zahtevane številke
 DocType: Production Planning Tool,Only Obtain Raw Materials,Pridobite le surovine
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Cenitev uspešnosti.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Omogočanje &quot;uporabiti za košarico&quot;, kot je omogočeno Košarica in da mora biti vsaj ena Davčna pravilo za Košarica"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Omogočanje &quot;uporabiti za košarico&quot;, kot je omogočeno Košarica in da mora biti vsaj ena Davčna pravilo za Košarica"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Plačilo Začetek {0} je povezan proti odredbi {1}, preverite, če je treba izvleči, kot prej v tem računu."
 DocType: Sales Invoice Item,Stock Details,Stock Podrobnosti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Project Value
@@ -1051,12 +1070,14 @@
 DocType: Salary Slip,Working Days,Delovni dnevi
 DocType: Serial No,Incoming Rate,Dohodni Rate
 DocType: Packing Slip,Gross Weight,Bruto Teža
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,"Ime vašega podjetja, za katero ste vzpostavitvijo tega sistema."
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Omogoči Hub
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,"Ime vašega podjetja, za katero ste vzpostavitvijo tega sistema."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Vključi počitnice v Total no. delovnih dni
 DocType: Job Applicant,Hold,Držite
 DocType: Employee,Date of Joining,Datum pridružitve
 DocType: Naming Series,Update Series,Posodobi zaporedje
 DocType: Supplier Quotation,Is Subcontracted,Je v podizvajanje
+DocType: Restaurant Table,Minimum Seating,Najmanjše število sedežev
 DocType: Item Attribute,Item Attribute Values,Postavka Lastnost Vrednote
 DocType: Examination Result,Examination Result,Preizkus Rezultat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Potrdilo o nakupu
@@ -1067,13 +1088,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Ni mogoče najti terminu v naslednjih {0} dni za delovanje {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan material za sklope
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Prodajni partnerji in ozemelj
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} mora biti aktiven
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} mora biti aktiven
 DocType: Journal Entry,Depreciation Entry,Amortizacija Začetek
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Prosimo, najprej izberite vrsto dokumenta"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Preklic Material Obiski {0} pred preklicem to vzdrževanje obisk
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serijska št {0} ne pripada postavki {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Zahtevani Kol
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Skladišča z obstoječim poslom ni mogoče pretvoriti v knjigi.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Skladišča z obstoječim poslom ni mogoče pretvoriti v knjigi.
 DocType: Bank Reconciliation,Total Amount,Skupni znesek
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Založništvo
 DocType: Prescription Duration,Number,Številka
@@ -1084,7 +1105,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Prodaja Cenik
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Če je označeno, bo stranka ustvarjena, mapirana na Patient. Pacientovi računi bodo ustvarjeni proti tej Stranki. Med ustvarjanjem bolnika lahko izberete tudi obstoječo stranko."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Objavite sinhronizirati elemente
 DocType: Bank Reconciliation,Account Currency,Valuta računa
 DocType: Lab Test,Sample ID,Vzorec ID
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Navedite zaokrožijo račun v družbi
@@ -1093,11 +1113,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Employee {0} ni aktiven ali pa ne obstaja
 DocType: Fee Structure,Components,komponente
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Vnesite Asset Kategorija točke {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Postavka Variante {0} posodobljen
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Postavka Variante {0} posodobljen
 DocType: Quality Inspection Reading,Reading 6,Branje 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,"Ne more {0} {1} {2}, brez kakršne koli negativne izjemno račun"
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","ki se generirajo. Če je odloženo, boste morali ročno spremeniti polje »Ponovi na dan v mesecu« tega"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,"Ne more {0} {1} {2}, brez kakršne koli negativne izjemno račun"
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Nakup računa Advance
-DocType: Hub Settings,Sync Now,Sync Now
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Vrstica {0}: Credit vnos ni mogoče povezati z {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Določite proračuna za proračunsko leto.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Privzeti bančni / gotovinski račun bo samodejno posodbljen v POS računu, ko je izbran ta način."
@@ -1109,13 +1130,13 @@
 DocType: Item,Is Purchase Item,Je Nakup Postavka
 DocType: Asset,Purchase Invoice,Nakup Račun
 DocType: Stock Ledger Entry,Voucher Detail No,Bon Detail Ne
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Nov račun
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Nov račun
 DocType: Stock Entry,Total Outgoing Value,Skupaj Odhodni Vrednost
 DocType: Physician,Appointments,Imenovanja
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Pričetek in rok bi moral biti v istem proračunskem letu
 DocType: Lead,Request for Information,Zahteva za informacije
 ,LeaderBoard,leaderboard
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Sinhronizacija Offline Računi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Sinhronizacija Offline Računi
 DocType: Payment Request,Paid,Plačan
 DocType: Program Fee,Program Fee,Cena programa
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1134,11 +1155,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Naročilnica item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Posredna Prihodki
 DocType: Student Attendance Tool,Student Attendance Tool,Študent Udeležba orodje
+DocType: Restaurant Menu,Price List (Auto created),Cenik (samodejno ustvarjen)
 DocType: Cheque Print Template,Date Settings,Datum Nastavitve
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variance
 ,Company Name,ime podjetja
 DocType: SMS Center,Total Message(s),Skupaj sporočil (-i)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Izberite Postavka za prenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Izberite Postavka za prenos
 DocType: Purchase Invoice,Additional Discount Percentage,Dodatni popust Odstotek
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Oglejte si seznam vseh videoposnetkov pomočjo
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Izberite račun vodja banke, kjer je bila deponirana pregled."
@@ -1155,6 +1177,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,meter
 DocType: Workstation,Electricity Cost,Stroški električne energije
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne pošiljajte zaposlenih rojstnodnevnih opomnikov
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Shrani nastavitve
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Zahtevani izdelki
 DocType: Item,Inspection Criteria,Merila Inšpekcijske
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Prenese
 DocType: BOM Website Item,BOM Website Item,BOM Spletna stran Element
@@ -1172,11 +1196,11 @@
 DocType: Journal Entry,Total Amount in Words,Skupni znesek z besedo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Prišlo je do napake. Eden verjeten razlog je lahko, da niste shranili obrazec. Obrnite support@erpnext.com če je težava odpravljena."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Košarica
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Sklep Tip mora biti eden od {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Sklep Tip mora biti eden od {0}
 DocType: Lead,Next Contact Date,Naslednja Stik Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Odpiranje Količina
 DocType: Healthcare Settings,Appointment Reminder,Opomnik o imenovanju
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Prosim vnesite račun za znesek spremembe
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Prosim vnesite račun za znesek spremembe
 DocType: Student Batch Name,Student Batch Name,Student Serija Ime
 DocType: Consultation,Doctor,Doktor
 DocType: Holiday List,Holiday List Name,Ime Holiday Seznam
@@ -1184,12 +1208,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,urnik predmeta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Delniških opcij
 DocType: Journal Entry Account,Expense Claim,Expense zahtevek
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Ali res želite obnoviti ta izločeni sredstva?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Količina za {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Ali res želite obnoviti ta izločeni sredstva?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Količina za {0}
 DocType: Leave Application,Leave Application,Zapusti Application
 DocType: Patient,Patient Relation,Pacientovo razmerje
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Pustite Orodje razdelitve emisijskih
+DocType: Item,Hub Category to Publish,Kategorija vozlišča za objavo
 DocType: Leave Block List,Leave Block List Dates,Pustite Block List termini
+DocType: Sales Invoice,Billing Address GSTIN,Naslov za izstavitev računa GSTIN
 DocType: Workstation,Net Hour Rate,Neto urna postavka
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Pristali Stroški Potrdilo o nakupu
 DocType: Company,Default Terms,Privzeti pogoji
@@ -1199,11 +1225,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Navedite {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Odstranjeni deli brez spremembe količine ali vrednosti.
 DocType: Delivery Note,Delivery To,Dostava
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Lastnost miza je obvezna
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Lastnost miza je obvezna
 DocType: Production Planning Tool,Get Sales Orders,Pridobite prodajnih nalogov
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ne more biti negativna
 DocType: Training Event,Self-Study,Samo-študija
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Popust
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Popust
 DocType: Asset,Total Number of Depreciations,Skupno število amortizacije
 DocType: Sales Invoice Item,Rate With Margin,Oceni z mejo
 DocType: Sales Invoice Item,Rate With Margin,Oceni z mejo
@@ -1211,7 +1237,7 @@
 DocType: Task,Urgent,Nujna
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Navedite veljavno Row ID za vrstico {0} v tabeli {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Ni mogoče najti spremenljivke:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Izberite polje za urejanje iz numpad
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Izberite polje za urejanje iz numpad
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Pojdite na namizje in začeti uporabljati ERPNext
 DocType: Item,Manufacturer,Proizvajalec
 DocType: Landed Cost Item,Purchase Receipt Item,Potrdilo o nakupu Postavka
@@ -1226,7 +1252,7 @@
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation_dashboard.py +11,Records,Zapisi
 DocType: Asset,Scrapped,izločeni
 apps/erpnext/erpnext/config/stock.py +200,"Attributes for Item Variants. e.g Size, Color etc.","Atributi za postavko variant. primer velikost, barvo itd"
-DocType: Purchase Invoice,Returns,vrne
+DocType: Purchase Invoice,Returns,Vračila
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Skladišče
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serijska št {0} je pod vzdrževalne pogodbe stanuje {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,zaposlovanje
@@ -1242,8 +1268,8 @@
 DocType: GL Entry,Against,Proti
 DocType: Item,Default Selling Cost Center,Privzet stroškovni center prodaje
 DocType: Sales Partner,Implementation Partner,Izvajanje Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Poštna številka
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Naročilo {0} je {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Poštna številka
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Naročilo {0} je {1}
 DocType: Opportunity,Contact Info,Kontaktni podatki
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Izdelava Zaloga Entries
 DocType: Packing Slip,Net Weight UOM,Neto teža UOM
@@ -1254,6 +1280,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Get Tedenski datumov
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Končni datum ne sme biti manjši kot začetni datum
 DocType: Sales Person,Select company name first.,Izberite ime podjetja prvič.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Nizka do visoka
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Prejete ponudbe
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Zamenjajte BOM in posodobite najnovejšo ceno v vseh BOM
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Za {0} | {1} {2}
@@ -1273,7 +1300,7 @@
 DocType: Program Enrollment,Transportation,Prevoz
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Neveljavna Lastnost
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} je treba predložiti
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Količina mora biti manjša ali enaka {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Količina mora biti manjša ali enaka {0}
 DocType: SMS Center,Total Characters,Skupaj Znaki
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},"Prosimo, izberite BOM BOM v polju za postavko {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Račun Detail
@@ -1288,7 +1315,7 @@
 ,Ordered Items To Be Billed,Naročeno Postavke placevali
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Od mora biti manj Razpon kot gibala
 DocType: Global Defaults,Global Defaults,Globalni Privzeto
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Projekt Sodelovanje Vabilo
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Projekt Sodelovanje Vabilo
 DocType: Salary Slip,Deductions,Odbitki
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Ime dejanja
@@ -1306,13 +1333,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Predplačila
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Nič zahtevati
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Druga proračunska zapis &#39;{0}&#39; že obstaja proti {1} &quot;{2}&quot; za poslovno leto {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"""Dejanski datum začetka"" ne more biti novejši od ""dejanskega končnega datuma"""
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"""Dejanski datum začetka"" ne more biti novejši od ""dejanskega končnega datuma"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Vodstvo
 DocType: Cheque Print Template,Payer Settings,Nastavitve plačnik
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To bo dodan Točka Kodeksa variante. Na primer, če je vaša kratica je &quot;SM&quot;, in oznaka postavka je &quot;T-shirt&quot;, postavka koda varianto bo &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Neto Pay (z besedami), bo viden, ko boste shranite plačilnega lista."
 DocType: Purchase Invoice,Is Return,Je Return
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Previdno
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Previdno
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Nazaj / opominu
 DocType: Price List Country,Price List Country,Cenik Država
 DocType: Item,UOMs,UOMs
@@ -1327,17 +1354,18 @@
 DocType: Account,Balance Sheet,Bilanca stanja
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Stalo Center za postavko s točko zakonika &quot;
 DocType: Fee Validity,Valid Till,Veljavno do
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Način plačila ni nastavljen. Prosimo, preverite, ali je bil račun nastavljen na načinu plačila ali na POS profil."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Način plačila ni nastavljen. Prosimo, preverite, ali je bil račun nastavljen na načinu plačila ali na POS profil."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Isti element ni mogoče vnesti večkrat.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Nadaljnje računi se lahko izvede v skupinah, vendar vnosi lahko zoper niso skupin"
 DocType: Lead,Lead,Ponudba
 DocType: Email Digest,Payables,Obveznosti
 DocType: Course,Course Intro,Seveda Intro
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Stock Začetek {0} ustvaril
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosimo, nastavite številske serije za udeležbo preko Setup&gt; Series Numbering"
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Stock Začetek {0} ustvaril
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Vrstica # {0}: Zavrnjena Kol ne more biti vpisana v Nabava Nazaj
 ,Purchase Order Items To Be Billed,Naročilnica Postavke placevali
 DocType: Purchase Invoice Item,Net Rate,Net Rate
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Izberite kupca
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Izberite kupca
 DocType: Purchase Invoice Item,Purchase Invoice Item,Nakup računa item
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Zaloga Glavna knjiga Prijave in GL Vnosi se oglaša za izbrane Nakup Prejemki
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Postavka 1
@@ -1358,7 +1386,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Dvojnik vrstica {0} z enako {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Poslovno leto {0} ni bilo mogoče najti
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Postavitev Zaposleni
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Postavitev Zaposleni
 DocType: Sales Order,SO-,SO-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,"Prosimo, izberite predpono najprej"
 DocType: Employee,O-,O-
@@ -1370,12 +1398,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Ogled Ledger
 DocType: Grading Scale,Intervals,intervali
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najzgodnejša
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Element, skupina obstaja z istim imenom, vas prosimo, spremenite ime elementa ali preimenovati skupino element"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Element, skupina obstaja z istim imenom, vas prosimo, spremenite ime elementa ali preimenovati skupino element"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Študent Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Ostali svet
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Ostali svet
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Postavki {0} ne more imeti Batch
 ,Budget Variance Report,Proračun Varianca Poročilo
 DocType: Salary Slip,Gross Pay,Bruto Pay
+DocType: Item,Is Item from Hub,Je predmet iz vozlišča
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Vrstica {0}: Vrsta dejavnosti je obvezna.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Plačane dividende
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Računovodstvo Ledger
@@ -1385,8 +1414,9 @@
 DocType: Vehicle Log,Service Detail,Service Podrobnosti
 DocType: BOM,Item Description,Postavka Opis
 DocType: Student Sibling,Student Sibling,študent Sorodstvena
-DocType: Purchase Invoice,Is Recurring,Je Ponavljajoči
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Način Plačilo
 DocType: Purchase Invoice,Supplied Items,Priložena Items
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},"Prosimo, nastavite aktivni meni za restavracijo {0}"
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Količina za izdelavo
 DocType: Email Digest,New Income,Novi prihodki
@@ -1397,6 +1427,7 @@
 ,Student and Guardian Contact Details,Študent in Guardian Kontaktni podatki
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Vrstica {0}: Za dobavitelja je potrebno {0} e-poštni naslov za pošiljanje e-pošte
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Začasna Otvoritev
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Oglejte si vozlišče
 ,Employee Leave Balance,Zaposleni Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},"Saldo račun {0}, morajo biti vedno {1}"
 DocType: Patient Appointment,More Info,Več informacij
@@ -1416,13 +1447,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Naročilo {0} ni veljavno
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Opozori na novo zahtevo za citate
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Naročilnice vam pomaga načrtovati in spremljati svoje nakupe
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Oprostite, podjetja ne morejo biti združeni"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Oprostite, podjetja ne morejo biti združeni"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Testi laboratorijskih testov
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Skupna količina Vprašanje / Transfer {0} v dogovoru Material {1} \ ne sme biti večja od zahtevane količine {2} za postavko {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Majhno
 DocType: Employee,Employee Number,Število zaposlenih
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Zadeva št (y) že v uporabi. Poskusite z zadevo št {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Zadeva št (y) že v uporabi. Poskusite z zadevo št {0}
 DocType: Project,% Completed,% Dokončana
 ,Invoiced Amount (Exculsive Tax),Obračunani znesek (Exculsive Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Postavka 2
@@ -1437,11 +1468,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Posredni stroški
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Vrstica {0}: Kol je obvezna
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Kmetijstvo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Svoje izdelke ali storitve
 DocType: Special Test Items,Special Test Items,Posebni testni elementi
 DocType: Mode of Payment,Mode of Payment,Način plačila
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Spletna stran Slika bi morala biti javna datoteka ali spletna stran URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Spletna stran Slika bi morala biti javna datoteka ali spletna stran URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,"To je skupina, root element in ga ni mogoče urejati."
@@ -1449,9 +1480,9 @@
 DocType: Vehicle,Fuel UOM,gorivo UOM
 DocType: Warehouse,Warehouse Contact Info,Skladišče Kontakt Info
 DocType: Payment Entry,Write Off Difference Amount,Napišite Off Razlika Znesek
-DocType: Purchase Invoice,Recurring Type,Ponavljajoči Type
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: email zaposlenih ni mogoče najti, zato je e-poštno sporočilo ni bilo poslano"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: email zaposlenih ni mogoče najti, zato je e-poštno sporočilo ni bilo poslano"
 DocType: Item,Foreign Trade Details,Zunanjo trgovino Podrobnosti
+,Assessment Plan Status,Status načrta ocenjevanja
 DocType: Email Digest,Annual Income,Letni dohodek
 DocType: Serial No,Serial No Details,Serijska št Podrobnosti
 DocType: Purchase Invoice Item,Item Tax Rate,Postavka Davčna stopnja
@@ -1459,15 +1490,14 @@
 DocType: Student Group Student,Group Roll Number,Skupina Roll Število
 DocType: Student Group Student,Group Roll Number,Skupina Roll Število
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, lahko le kreditne račune povezati proti drugemu vstop trajnika"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Vsota vseh uteži nalog bi moral biti 1. Prosimo, da ustrezno prilagodi uteži za vse naloge v projektu"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Dobavnica {0} ni predložila
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Vsota vseh uteži nalog bi moral biti 1. Prosimo, da ustrezno prilagodi uteži za vse naloge v projektu"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Dobavnica {0} ni predložila
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Postavka {0} mora biti podizvajalcev item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapitalski Oprema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cen Pravilo je najprej treba izbrati glede na &quot;Uporabi On &#39;polju, ki je lahko točka, točka Group ali Brand."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Najprej nastavite kodo izdelka
-DocType: Hub Settings,Seller Website,Prodajalec Spletna stran
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Najprej nastavite kodo izdelka
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Skupna dodeljena odstotek za prodajne ekipe mora biti 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Skupna dodeljena odstotek za prodajne ekipe mora biti 100
 DocType: Sales Invoice Item,Edit Description,Uredi Opis
 DocType: Antibiotic,Antibiotic,Antibiotik
 ,Team Updates,ekipa Posodobitve
@@ -1488,12 +1518,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Skupaj (družba Valuta)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Serijska številka {0} je začela več kot enkrat
 DocType: Depreciation Schedule,Journal Entry,Vnos v dnevnik
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} izdelkov v teku
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} izdelkov v teku
 DocType: Workstation,Workstation Name,Workstation Name
 DocType: Grading Scale Interval,Grade Code,razred Code
 DocType: POS Item Group,POS Item Group,POS Element Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} ne pripada postavki {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} ne pripada postavki {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Salary Slip,Bank Account No.,Št. bančnega računa
 DocType: Naming Series,This is the number of the last created transaction with this prefix,To je številka zadnjega ustvarjene transakcijo s tem predpono
@@ -1510,10 +1540,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Zahteva za ponudbo dobavitelja
 DocType: Healthcare Settings,Registration Message,Registracija sporočilo
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Strojna oprema
-DocType: Sales Order,Recurring Upto,Ponavljajoči Upto
 DocType: Prescription Dosage,Prescription Dosage,Odmerjanje na recept
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Prosimo izberite Company
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Prosimo izberite Company
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Privilege Zapusti
 DocType: Purchase Invoice,Supplier Invoice Date,Dobavitelj Datum računa
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,na
@@ -1529,10 +1558,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Prekrivajoča pogoji najdemo med:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Proti listu Začetek {0} je že prilagojena proti neki drugi kupon
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Skupna vrednost naročila
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Hrana
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Hrana
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Staranje Območje 3
 DocType: Maintenance Schedule Item,No of Visits,Število obiskov
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},obstaja Vzdrževanje Razpored {0} proti {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Ali želite objaviti svoje elemente v središče?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,Vpisovanje študentov
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta zaključni račun mora biti {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Seštevek točk za vseh ciljev bi morala biti 100. To je {0}
@@ -1543,9 +1573,9 @@
 DocType: Authorization Rule,Average Discount,Povprečen Popust
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Utilities
-DocType: Purchase Invoice Item,Accounting,Računovodstvo
+DocType: POS Profile,Accounting,Računovodstvo
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Izberite serij za združena postavko
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Izberite serij za združena postavko
 DocType: Asset,Depreciation Schedules,Amortizacija Urniki
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Prijavni rok ne more biti obdobje dodelitve izven dopusta
 DocType: Activity Cost,Projects,Projekti
@@ -1561,7 +1591,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',Stanje odobritve mora biti &quot;Approved&quot; ali &quot;Zavrnjeno&quot;
 DocType: Physician,Contacts and Address,Stiki in naslov
 DocType: Purchase Invoice,Contact Person,Kontaktna oseba
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Pričakovani datum začetka' ne more biti večji od 'Pričakovan datum zaključka'
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','Pričakovani datum začetka' ne more biti večji od 'Pričakovan datum zaključka'
 DocType: Course Scheduling Tool,Course End Date,Seveda Končni datum
 DocType: Holiday List,Holidays,Počitnice
 DocType: Sales Order Item,Planned Quantity,Načrtovana Količina
@@ -1569,10 +1599,11 @@
 DocType: Item,Maintain Stock,Ohraniti park
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Zaloga Vpisi že ustvarjene za proizvodnjo red
 DocType: Employee,Prefered Email,Prednostna pošta
+DocType: Student Admission,Eligibility and Details,Upravičenost in podrobnosti
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Neto sprememba v osnovno sredstvo
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Pustite prazno, če velja za vse označb"
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Naboj tip &quot;Dejanski&quot; v vrstici {0} ni mogoče vključiti v postavko Rate
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Od datetime
 DocType: Email Digest,For Company,Za podjetje
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Sporočilo dnevnik.
@@ -1580,19 +1611,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Dobavitelj Scorecard Scoring Spremenljivka
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Znesek nabave
 DocType: Sales Invoice,Shipping Address Name,Naslov dostave
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Kontni načrt
 DocType: Material Request,Terms and Conditions Content,Pogoji in vsebina
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,ne more biti večja kot 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Postavka {0} ni zaloge Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Postavka {0} ni zaloge Item
 DocType: Maintenance Visit,Unscheduled,Nenačrtovana
 DocType: Employee,Owned,Lasti
 DocType: Salary Detail,Depends on Leave Without Pay,Odvisno od dopusta brez plačila
 DocType: Pricing Rule,"Higher the number, higher the priority","Višja kot je številka, višja je prioriteta"
 ,Purchase Invoice Trends,Račun za nakup Trendi
 DocType: Employee,Better Prospects,Boljši obeti
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Vrstica # {0}: Serija {1} ima le {2} kol. Izberite drugo serijo, ki ima {3} kol na voljo ali razdeli vrstico v več vrstic, da poda / vprašanja iz različnih serij"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Vrstica # {0}: Serija {1} ima le {2} kol. Izberite drugo serijo, ki ima {3} kol na voljo ali razdeli vrstico v več vrstic, da poda / vprašanja iz različnih serij"
 DocType: Vehicle,License Plate,Registrska tablica
 DocType: Appraisal,Goals,Cilji
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Izberite POS profil
 DocType: Warranty Claim,Warranty / AMC Status,Garancija / AMC Status
 ,Accounts Browser,Računi Browser
 DocType: Payment Entry Reference,Payment Entry Reference,Plačilo Začetek Reference
@@ -1610,7 +1641,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Delavec ne more poročati zase.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Če računa je zamrznjeno, so vpisi dovoljeni omejenih uporabnikov."
 DocType: Email Digest,Bank Balance,Banka Balance
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},"Računovodstvo Vstop za {0}: lahko {1}, se izvede le v valuti: {2}"
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},"Računovodstvo Vstop za {0}: lahko {1}, se izvede le v valuti: {2}"
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil delovnega mesta, potrebna usposobljenost itd"
 DocType: Journal Entry Account,Account Balance,Stanje na računu
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Davčna pravilo za transakcije.
@@ -1619,8 +1650,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Skupaj davki in dajatve (Company valuti)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Prikaži nezaprt poslovno leto je P &amp; L bilanc
 DocType: Lab Test Template,Collection Details,Podrobnosti o zbirki
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","izberite cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date iz tabConsultation ct, `tabLab Prescription` cp kjer ct.patient = &#39;{0}&#39; in cp.parent = ct. ime in cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Dostava račun
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Račun {2} je neaktiven
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,"Naredite Prodajni nalogi, ki vam pomaga načrtovati svoje delo in poda na čas"
@@ -1637,7 +1666,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Pakiranje listek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Urad za najem
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Nastavitve Setup SMS gateway
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Uvoz uspelo!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Uvoz uspelo!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Še ni naslov dodal.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation delovno uro
 DocType: Vital Signs,Blood Pressure,Krvni pritisk
@@ -1662,7 +1691,7 @@
 DocType: Sales Invoice,Source,Vir
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Prikaži zaprto
 DocType: Leave Type,Is Leave Without Pay,Se Leave brez plačila
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Sredstvo kategorije je obvezna za fiksno postavko sredstev
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Sredstvo kategorije je obvezna za fiksno postavko sredstev
 DocType: Fee Validity,Fee Validity,Veljavnost pristojbine
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Ni najdenih v tabeli plačil zapisov
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ta {0} ni v nasprotju s {1} za {2} {3}
@@ -1683,8 +1712,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Ustvari Interesenti
 DocType: Maintenance Schedule,Schedules,Urniki
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,Profil POS je potreben za uporabo Point-of-Sale
 DocType: Purchase Invoice Item,Net Amount,Neto znesek
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} ni bila vložena tako dejanje ne more biti dokončana
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} ni bila vložena tako dejanje ne more biti dokončana
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Ne
 DocType: Landed Cost Voucher,Additional Charges,dodatni stroški
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatni popust Znesek (Valuta Company)
@@ -1693,7 +1723,7 @@
 ,Support Hour Distribution,Podpora Distribution Hour
 DocType: Maintenance Visit,Maintenance Visit,Vzdrževanje obisk
 DocType: Student,Leaving Certificate Number,Leaving Certificate Število
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Imenovanje je preklicano, preglejte in prekličite račun {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Imenovanje je preklicano, preglejte in prekličite račun {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Dostopno Serija Količina na Warehouse
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Update Print Format
 DocType: Landed Cost Voucher,Landed Cost Help,Pristali Stroški Pomoč
@@ -1716,8 +1746,8 @@
 DocType: Patient,Tobacco Past Use,Pretekla uporaba tobaka
 DocType: Sales Invoice Item,Brand Name,Blagovna znamka
 DocType: Purchase Receipt,Transporter Details,Transporter Podrobnosti
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Uporabnik {0} je že dodeljen zdravniku {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Privzeto skladišče je potrebna za izbrano postavko
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Uporabnik {0} je že dodeljen zdravniku {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Privzeto skladišče je potrebna za izbrano postavko
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Škatla
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,Možni Dobavitelj
 DocType: Budget,Monthly Distribution,Mesečni Distribution
@@ -1727,8 +1757,8 @@
 DocType: Sales Partner,Sales Partner Target,Prodaja Partner Target
 DocType: Loan Type,Maximum Loan Amount,Največja Znesek posojila
 DocType: Pricing Rule,Pricing Rule,Cen Pravilo
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Podvojena številka rola študent {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Podvojena številka rola študent {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Podvojena številka rola študent {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Podvojena številka rola študent {0}
 DocType: Budget,Action if Annual Budget Exceeded,"Ukrep, če letni proračun Prekoračitev"
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Material Zahteva za narocilo
 DocType: Shopping Cart Settings,Payment Success URL,Plačilo Uspeh URL
@@ -1745,7 +1775,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} se morajo pojaviti le enkrat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ne sme odtujiti bolj {0} od {1} proti narocilo {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Listi Dodeljena Uspešno za {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Ni prispevkov za pakiranje
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Ni prispevkov za pakiranje
 DocType: Shipping Rule Condition,From Value,Od vrednosti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Proizvodnja Količina je obvezna
 DocType: Employee Loan,Repayment Method,Povračilo Metoda
@@ -1759,6 +1789,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Zaloga Obveznosti
 DocType: Purchase Invoice,Supplier Warehouse,Dobavitelj Skladišče
 DocType: Opportunity,Contact Mobile No,Kontaktna mobilna številka
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Izberite podjetje
 ,Material Requests for which Supplier Quotations are not created,Material Prošnje za katere so Dobavitelj Citati ni ustvaril
 DocType: Student Group,Set 0 for no limit,Nastavite 0 za brez omejitev
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Dan (s), na kateri se prijavljate za dopust, so prazniki. Vam ni treba zaprositi za dopust."
@@ -1768,24 +1799,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Naredite predračun
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Druga poročila
 DocType: Dependent Task,Dependent Task,Odvisna Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},"Faktor pretvorbe za privzeto mersko enoto, mora biti 1 v vrstici {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},"Faktor pretvorbe za privzeto mersko enoto, mora biti 1 v vrstici {0}"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Dopust tipa {0} ne more biti daljši od {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Poskusite načrtovanju operacij za X dni vnaprej.
 DocType: HR Settings,Stop Birthday Reminders,Stop Birthday opomniki
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},"Prosimo, nastavite privzetega izplačane plače je treba plačati račun v družbi {0}"
 DocType: SMS Center,Receiver List,Sprejemnik Seznam
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Iskanje Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Iskanje Item
 DocType: Patient Appointment,Referring Physician,Referenčni zdravnik
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Porabljeni znesek
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Neto sprememba v gotovini
 DocType: Assessment Plan,Grading Scale,Ocenjevalna lestvica
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Merska enota {0} je v pretvorbeni faktor tabeli vpisana več kot enkrat
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,že končana
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Merska enota {0} je v pretvorbeni faktor tabeli vpisana več kot enkrat
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,že končana
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Zaloga v roki
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Plačilni Nalog že obstaja {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Strošek izdanih postavk
 DocType: Physician,Hospital,Bolnišnica
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Količina ne sme biti več kot {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Količina ne sme biti več kot {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Prejšnja Proračunsko leto ni zaprt
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Starost (dnevi)
 DocType: Quotation Item,Quotation Item,Postavka ponudbe
@@ -1796,8 +1827,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Dobavitelj Type gospodar.
 DocType: Purchase Order Item,Supplier Part Number,Dobavitelj Številka dela
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Menjalno razmerje ne more biti 0 ali 1
-DocType: Sales Invoice,Reference Document,referenčni dokument
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} je odpovedan ali ustavljen
+DocType: Subscription,Reference Document,referenčni dokument
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} je odpovedan ali ustavljen
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Vozilo Dispatch Datum
 DocType: Healthcare Settings,Default Medical Code Standard,Privzeti standard za medicinsko kodo
@@ -1806,6 +1837,7 @@
 DocType: Company,Default Payable Account,Privzeto plačljivo račun
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Nastavitve za spletni košarici, kot so predpisi v pomorskem prometu, cenik itd"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% zaračunano
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Razvrsti po ceni ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Rezervirano Kol
 DocType: Party Account,Party Account,Račun Party
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Človeški viri
@@ -1817,13 +1849,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Naredite izplačilu vnos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Vrstica {0}: Advance zoper dobavitelja mora biti v breme
 DocType: Company,Default Values,Privzete vrednosti
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frekvenca} izvleček
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Frekvenca} izvleček
 DocType: Expense Claim,Total Amount Reimbursed,"Skupnega zneska, povrnjenega"
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ta temelji na dnevnikih glede na ta vozila. Oglejte si časovnico spodaj za podrobnosti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Zoper dobavitelja Račun {0} dne {1}
 DocType: Customer,Default Price List,Privzeto Cenik
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,zapis Gibanje sredstvo {0} ustvaril
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,"Ne, ne moreš brisati poslovnega leta {0}. Poslovno leto {0} je privzet v globalnih nastavitvah"
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Kupec z istim imenom že obstaja
 DocType: Journal Entry,Entry Type,Začetek Type
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Ne načrt ocena povezana s to skupino ocenjevanja
 ,Customer Credit Balance,Stranka Credit Balance
@@ -1834,7 +1867,7 @@
 DocType: Quotation,Term Details,Izraz Podrobnosti
 DocType: Project,Total Sales Cost (via Sales Order),Skupna prodaja Stroški (prek prodajnega naloga)
 DocType: Project,Total Sales Cost (via Sales Order),Skupna prodaja Stroški (prek prodajnega naloga)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,ne more vpisati več kot {0} študentov za to študentsko skupino.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,ne more vpisati več kot {0} študentov za to študentsko skupino.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,svinec Štetje
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,svinec Štetje
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} mora biti večje od 0
@@ -1852,9 +1885,11 @@
 DocType: Lab Test,Technician Name,Ime tehnika
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Prekinitev povezave med Plačilo na Izbris računa
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Trenutni Stanje kilometrov vpisana mora biti večja od začetne števca prevožene poti vozila {0}
+DocType: Restaurant Reservation,No Show,Ni predstave
 DocType: Shipping Rule Country,Shipping Rule Country,Država dostavnega pravila
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Pusti in postrežbo
 DocType: Maintenance Visit,Partially Completed,Delno Dopolnil
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Zmerna občutljivost
 DocType: Leave Type,Include holidays within leaves as leaves,Vključite počitnice v listih kot listja
 DocType: Sales Invoice,Packed Items,Pakirane Items
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garancija zahtevek zoper Serial No.
@@ -1871,13 +1906,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Plačan znesek (družba Valuta)
 DocType: Purchase Invoice,Additional Discount,Dodatni popust
 DocType: Selling Settings,Selling Settings,Prodaja Nastavitve
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Potrdi dejanje
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Dražbe
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Prosimo, navedite bodisi količina ali Ocenite vrednotenja ali oboje"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,izpolnitev
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Poglej v košarico
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Marketing Stroški
 ,Item Shortage Report,Postavka Pomanjkanje Poročilo
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Teža je omenjeno, \ nProsim omenja &quot;Teža UOM&quot; preveč"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Teža je omenjeno, \ nProsim omenja &quot;Teža UOM&quot; preveč"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Material Zahteva se uporablja za izdelavo tega staleža Entry
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Naslednja Amortizacija Datum je obvezna za nove investicije
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Ločeno Group s sedežem tečaj za vsako serijo
@@ -1890,12 +1926,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Naredite vknjižba Za vsako borzno gibanje
 DocType: Leave Allocation,Total Leaves Allocated,Skupaj Listi Dodeljena
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Skladišče zahteva pri Row št {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,"Prosimo, vnesite veljaven proračunsko leto, datum začetka in konca"
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,"Prosimo, vnesite veljaven proračunsko leto, datum začetka in konca"
 DocType: Employee,Date Of Retirement,Datum upokojitve
 DocType: Upload Attendance,Get Template,Get predlogo
 DocType: Material Request,Transferred,Preneseni
 DocType: Vehicle,Doors,vrata
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext Setup Complete!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Zberi pristojbino za registracijo pacientov
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,davčna Breakup
@@ -1914,37 +1950,37 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Če ima ta postavka variante, potem ne more biti izbran v prodajnih naročil itd"
 DocType: Lead,Next Contact By,Naslednja Kontakt Z
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},"Količina, potrebna za postavko {0} v vrstici {1}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},"Količina, potrebna za postavko {0} v vrstici {1}"
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},"Skladišče {0} ni mogoče izbrisati, kot obstaja količina za postavko {1}"
 DocType: Quotation,Order Type,Sklep Type
-DocType: Purchase Invoice,Notification Email Address,Obvestilo e-poštni naslov
 ,Item-wise Sales Register,Element-pametno Sales Registriraj se
 DocType: Asset,Gross Purchase Amount,Bruto znesek nakupa
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Začetne stave
 DocType: Asset,Depreciation Method,Metoda amortiziranja
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Offline
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je to DDV vključen v osnovni stopnji?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Skupaj Target
 DocType: Job Applicant,Applicant for a Job,Kandidat za službo
 DocType: Production Plan Material Request,Production Plan Material Request,Proizvodnja Zahteva načrt Material
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Ni Proizvodne Naročila ustvarjena
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Ni Proizvodne Naročila ustvarjena
 DocType: Stock Reconciliation,Reconciliation JSON,Uskladitev JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Preveč stolpcev. Izvoziti poročilo in ga natisnete s pomočjo aplikacije za preglednice.
 DocType: Purchase Invoice Item,Batch No,Serija Ne
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Zahteva za ponudbo: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Dovoli več prodajnih nalogov zoper naročnikovo narocilo
 DocType: Student Group Instructor,Student Group Instructor,Inštruktor Študent Skupina
 DocType: Student Group Instructor,Student Group Instructor,Inštruktor Študent Skupina
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Skrbnika2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Main
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Main
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavite predpona za številčenje serij na vaše transakcije
 DocType: Employee Attendance Tool,Employees HTML,zaposleni HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Privzeto BOM ({0}) mora biti aktiven za to postavko ali njeno predlogo
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Privzeto BOM ({0}) mora biti aktiven za to postavko ali njeno predlogo
 DocType: Employee,Leave Encashed?,Dopusta unovčijo?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Priložnost Iz polja je obvezno
 DocType: Email Digest,Annual Expenses,letni stroški
 DocType: Item,Variants,Variante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Naredite narocilo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Naredite narocilo
 DocType: SMS Center,Send To,Pošlji
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Ni dovolj bilanca dopust za dopust tipa {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Dodeljen znesek
@@ -1962,6 +1998,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Študent Skupina moč
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Proti listu Začetek {0} nima neprimerljivo {1} vnos
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,cenitve
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Dogodki za usposabljanje
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Podvajati Zaporedna številka vpisana v postavko {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Pogoj za Shipping pravilu
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,vnesite
@@ -1971,7 +2008,7 @@
 DocType: Sales Order,To Deliver and Bill,Dostaviti in Bill
 DocType: Student Group,Instructors,inštruktorji
 DocType: GL Entry,Credit Amount in Account Currency,Credit Znesek v Valuta računa
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} je treba predložiti
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} je treba predložiti
 DocType: Authorization Control,Authorization Control,Pooblastilo za nadzor
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Vrstica # {0}: zavrnitev Skladišče je obvezno proti zavrnil postavki {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Plačilo
@@ -1990,11 +2027,11 @@
 DocType: Quotation Item,Actual Qty,Dejanska Količina
 DocType: Sales Invoice Item,References,Reference
 DocType: Quality Inspection Reading,Reading 10,Branje 10
-DocType: Hub Settings,Hub Node,Hub Node
+DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Vnesli ste podvojene elemente. Prosimo, popravite in poskusite znova."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Sodelavec
 DocType: Asset Movement,Asset Movement,Gibanje sredstvo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,Nova košarico
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,Nova košarico
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Postavka {0} ni serialized postavka
 DocType: SMS Center,Create Receiver List,Ustvarite sprejemnik seznam
 DocType: Vehicle,Wheels,kolesa
@@ -2008,15 +2045,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikacije
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Kaže, da je paket del tega dostave (samo osnutka)"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Naredite Entry plačila
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Količina za postavko {0} sme biti manjša od {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Količina za postavko {0} sme biti manjša od {1}
 ,Sales Invoice Trends,Prodajni fakturi Trendi
 DocType: Leave Application,Apply / Approve Leaves,Uporabi / Odobri Leaves
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Za
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Za
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Lahko sklicuje vrstico le, če je tip naboj &quot;Na prejšnje vrstice Znesek&quot; ali &quot;prejšnje vrstice Total&quot;"
 DocType: Sales Order Item,Delivery Warehouse,Dostava Skladišče
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Drevo centrov finančnih stroškov.
 DocType: Serial No,Delivery Document No,Dostava dokument št
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Prosim nastavite &quot;dobiček / izguba račun pri odtujitvi sredstev&quot; v družbi {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Prosim nastavite &quot;dobiček / izguba račun pri odtujitvi sredstev&quot; v družbi {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Dobili predmetov iz nakupa Prejemki
 DocType: Serial No,Creation Date,Datum nastanka
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Postavka {0} pojavi večkrat v Ceniku {1}
@@ -2027,12 +2064,13 @@
 DocType: Student,Student Mobile Number,Študent mobilno številko
 DocType: Item,Has Variants,Ima Variante
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Posodobi odgovor
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Ste že izbrane postavke iz {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Ste že izbrane postavke iz {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Ime mesečnim izplačilom
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Serija ID je obvezen
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Serija ID je obvezen
 DocType: Sales Person,Parent Sales Person,Nadrejena Sales oseba
-DocType: Purchase Invoice,Recurring Invoice,Ponavljajoči Račun
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Visoka do nizka
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Najprej izberite program
 DocType: Patient Appointment,Patient Age,Pacientova doba
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Upravljanje projektov
 DocType: Supplier,Supplier of Goods or Services.,Dobavitelj blaga ali storitev.
@@ -2040,8 +2078,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Neplačani računi za terjatve, ki jih je treba uporabiti, če niso določeni v Patientu za rezervacijo stroškov posvetovanja."
 DocType: Vehicle Log,Fuel Price,gorivo Cena
 DocType: Budget,Budget,Proračun
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Nastavi odprto
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Osnovno sredstvo točka mora biti postavka ne-stock.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Nastavi odprto
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Osnovno sredstvo točka mora biti postavka ne-stock.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Proračun ne more biti dodeljena pred {0}, ker to ni prihodek ali odhodek račun"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Doseženi
 DocType: Student Admission,Application Form Route,Prijavnica pot
@@ -2055,12 +2093,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Postavka {0} ni setup za Serijska št. Preverite item mojster
 DocType: Maintenance Visit,Maintenance Time,Vzdrževanje čas
 ,Amount to Deliver,"Znesek, Deliver"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Isti element je bil večkrat vnesen. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Datum izraz začetka ne more biti zgodnejši od datuma Leto začetku študijskega leta, v katerem je izraz povezan (študijsko leto {}). Popravite datum in poskusite znova."
 DocType: Guardian,Guardian Interests,Guardian Zanima
 DocType: Naming Series,Current Value,Trenutna vrednost
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"obstaja več proračunskih let za datum {0}. Prosim, nastavite podjetje v poslovnem letu"
 DocType: School Settings,Instructor Records to be created by,"Zapise za inštruktorje, ki jih bo ustvaril"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} ustvaril
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} ustvaril
 DocType: Delivery Note Item,Against Sales Order,Za Naročilo Kupca
 ,Serial No Status,Serijska Status Ne
 DocType: Payment Entry Reference,Outstanding,Izjemna
@@ -2070,10 +2109,10 @@
 						must be greater than or equal to {2}","Vrstica {0}: nastavi {1} periodičnost, razlika med od do sedaj \ mora biti večja od ali enaka {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Ta temelji na gibanju zalog. Glej {0} za podrobnosti
 DocType: Pricing Rule,Selling,Prodaja
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Znesek {0} {1} odšteti pred {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Znesek {0} {1} odšteti pred {2}
 DocType: Employee,Salary Information,Plača Informacije
 DocType: Sales Person,Name and Employee ID,Ime in zaposlenih ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Rok ne more biti pred datumom knjiženja
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Rok ne more biti pred datumom knjiženja
 DocType: Website Item Group,Website Item Group,Spletna stran Element Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Dajatve in davki
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Vnesite Referenčni datum
@@ -2099,7 +2138,7 @@
 DocType: Issue,Resolution Details,Resolucija Podrobnosti
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,dodelitve
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Merila sprejemljivosti
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Vnesite Material Prošnje v zgornji tabeli
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Vnesite Material Prošnje v zgornji tabeli
 DocType: Item Attribute,Attribute Name,Ime atributa
 DocType: BOM,Show In Website,Pokaži V Website
 DocType: Shopping Cart Settings,Show Quantity in Website,Prikaži Količina na spletni strani
@@ -2108,7 +2147,7 @@
 DocType: Item Reorder,Check in (group),Preverite v (skupina)
 ,Qty to Order,Količina naročiti
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Glava račun v odgovornosti ali kapitala, v katerem se bo dobiček / izguba rezervirana"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Ganttov diagram vseh nalog.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Ganttov diagram vseh nalog.
 DocType: Opportunity,Mins to First Response,Minut do prvega odziva
 DocType: Pricing Rule,Margin Type,Margin Type
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} ur
@@ -2129,36 +2168,36 @@
 DocType: Patient,Surgical History,Kirurška zgodovina
 DocType: Employee,Resignation Letter Date,Odstop pismo Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Cenovne Pravila so dodatno filtriran temelji na količini.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},"Prosimo, da določi datum Vstop za zaposlenega {0}"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},"Prosimo, da določi datum Vstop za zaposlenega {0}"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},"Prosimo, da določi datum Vstop za zaposlenega {0}"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},"Prosimo, da določi datum Vstop za zaposlenega {0}"
 DocType: Task,Total Billing Amount (via Time Sheet),Skupni znesek plačevanja (preko Čas lista)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ponovite Customer Prihodki
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) mora imeti vlogo &quot;Expense odobritelju&quot;
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Par
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Izberite BOM in Količina za proizvodnjo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Izberite BOM in Količina za proizvodnjo
 DocType: Asset,Depreciation Schedule,Amortizacija Razpored
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Prodaja Partner naslovi in kontakti
 DocType: Bank Reconciliation Detail,Against Account,Proti račun
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Polovica Dan Datum mora biti med Od datuma in do danes
 DocType: Maintenance Schedule Detail,Actual Date,Dejanski datum
 DocType: Item,Has Batch No,Ima Serija Ne
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Letni obračun: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Letni obračun: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Davčna blago in storitve (DDV Indija)
 DocType: Delivery Note,Excise Page Number,Trošarinska Številka strani
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Podjetje, od datuma do datuma je obvezen"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Pojdite s posvetovanja
 DocType: Asset,Purchase Date,Datum nakupa
 DocType: Employee,Personal Details,Osebne podrobnosti
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Prosim nastavite &quot;Asset Center Amortizacija stroškov&quot; v družbi {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Prosim nastavite &quot;Asset Center Amortizacija stroškov&quot; v družbi {0}
 ,Maintenance Schedules,Vzdrževanje Urniki
 DocType: Task,Actual End Date (via Time Sheet),Dejanski končni datum (preko Čas lista)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Znesek {0} {1} proti {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Znesek {0} {1} proti {2} {3}
 ,Quotation Trends,Trendi ponudb
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},"Element Group, ki niso navedeni v točki mojster za postavko {0}"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Bremenitev računa mora biti Terjatve račun
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Bremenitev računa mora biti Terjatve račun
 DocType: Shipping Rule Condition,Shipping Amount,Znesek Dostave
 DocType: Supplier Scorecard Period,Period Score,Obdobje obdobja
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Dodaj stranke
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Dodaj stranke
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Dokler Znesek
 DocType: Lab Test Template,Special,Poseben
 DocType: Purchase Invoice Item,Conversion Factor,Faktor pretvorbe
@@ -2166,13 +2205,14 @@
 ,Vehicle Expenses,Stroški vozil
 DocType: Serial No,Invoice Details,Podrobnosti na računu
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},"Pričakovana vrednost po življenjski dobi, mora biti večja ali enaka {0}"
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Začni
+DocType: Hub Category,Hub Category,Kategorija vozlišča
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Število vozil
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Datum, na katerega se bodo ponavljajoče račun stop"
 DocType: Employee Loan,Loan Amount,Znesek posojila
 DocType: Program Enrollment,Self-Driving Vehicle,Self-Vožnja vozil
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Stalni ocenjevalni list dobavitelja
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Vrstica {0}: Kosovnica nismo našli v postavki {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Vrstica {0}: Kosovnica nismo našli v postavki {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Skupaj dodeljena listi {0} ne sme biti manjši od že odobrenih listov {1} za obdobje
 DocType: Journal Entry,Accounts Receivable,Terjatve
 ,Supplier-Wise Sales Analytics,Dobavitelj-Wise Prodajna Analytics
@@ -2184,7 +2224,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Matično igrišče (pustite prazno, če to ni del obvladujoče Course)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Pustite prazno, če velja za vse vrste zaposlenih"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuirajo pristojbin na podlagi
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Evidence prisotnosti
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Evidence prisotnosti
 DocType: HR Settings,HR Settings,Nastavitve HR
 DocType: Salary Slip,net pay info,net info plačilo
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Ta vrednost se posodablja na seznamu Privzeta prodajna cena.
@@ -2195,7 +2235,7 @@
 DocType: Patient,B Positive,B Pozitivni
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Kol mora biti 1, kot točka je osnovno sredstvo. Prosimo, uporabite ločeno vrstico za večkratno Kol."
 DocType: Leave Block List Allow,Leave Block List Allow,Pustite Block List Dovoli
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr ne more biti prazna ali presledek
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr ne more biti prazna ali presledek
 DocType: Patient Medical Record,Patient Medical Record,Zdravniški zapis bolnika
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Skupina Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Šport
@@ -2212,9 +2252,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Mogoče najti menjalni tečaj za {0} in {1} za ključ datumu {2}. Prosimo ustvariti zapis Valuta Exchange ročno
 DocType: POS Profile,Price List,Cenik
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} je zdaj privzeta poslovno leto. Prosimo, osvežite brskalnik za spremembe začele veljati."
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Odhodkov Terjatve
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Odhodkov Terjatve
 DocType: Issue,Support,Podpora
 ,BOM Search,BOM Iskanje
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.","Objavite &quot;Na zalogi&quot; ali &quot;Ni na zalogi&quot; na vozlišču na podlagi zalog, ki so na voljo v tem skladišču."
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Zapiranje (Odpiranje + vsote)
 DocType: Vehicle,Fuel Type,Vrsta goriva
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Prosimo, navedite valuto v družbi"
@@ -2226,16 +2267,16 @@
 DocType: Healthcare Settings,Remind Before,Opomni pred
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Faktor UOM Pretvorba je potrebno v vrstici {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Vrsta dokumenta mora biti eden od prodajnega naloga, prodaje računa ali Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Vrsta dokumenta mora biti eden od prodajnega naloga, prodaje računa ali Journal Entry"
 DocType: Salary Component,Deduction,Odbitek
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Vrstica {0}: Od časa in do časa je obvezna.
 DocType: Stock Reconciliation Item,Amount Difference,znesek Razlika
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Postavka Cena dodana za {0} v Ceniku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Postavka Cena dodana za {0} v Ceniku {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Vnesite ID Employee te prodaje oseba
 DocType: Territory,Classification of Customers by region,Razvrstitev stranke po regijah
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Razlika Znesek mora biti nič
 DocType: Project,Gross Margin,Gross Margin
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,"Prosimo, da najprej vnesete Production artikel"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,"Prosimo, da najprej vnesete Production artikel"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Izračunan Izjava bilance banke
 DocType: Normal Test Template,Normal Test Template,Običajna preskusna predloga
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,onemogočena uporabnik
@@ -2245,21 +2286,22 @@
 DocType: Salary Slip,Total Deduction,Skupaj Odbitek
 ,Production Analytics,proizvodne Analytics
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,To temelji na transakcijah proti temu bolniku. Podrobnosti si oglejte spodaj
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Stroškovno Posodobljeno
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Stroškovno Posodobljeno
 DocType: Employee,Date of Birth,Datum rojstva
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Postavka {0} je bil že vrnjen
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiskalno leto ** predstavlja poslovno leto. Vse vknjižbe in druge velike transakcije so povezane  z izidi ** poslovnega leta **.
 DocType: Opportunity,Customer / Lead Address,Stranka / Naslov ponudbe
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Nastavitev kazalčevega kazalnika
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Opozorilo: Neveljavno potrdilo SSL za pritrditev {0}
-DocType: Student Admission,Eligibility,Upravičenost
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Ime načrta ocenjevanja
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Opozorilo: Neveljavno potrdilo SSL za pritrditev {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Interesenti vam pomaga dobiti posel, dodamo vse svoje stike in več kot vaše vodi"
 DocType: Production Order Operation,Actual Operation Time,Dejanska Operacija čas
 DocType: Authorization Rule,Applicable To (User),Ki se uporabljajo za (Uporabnik)
 DocType: Purchase Taxes and Charges,Deduct,Odbitka
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Opis dela
 DocType: Student Applicant,Applied,Applied
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Re-open
 DocType: Sales Invoice Item,Qty as per Stock UOM,Kol. kot na UOM
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Ime skrbnika2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Posebni znaki razen ""-"" ""."", ""#"", in ""/"" niso dovoljeni v poimenovanju zaporedja"
@@ -2271,7 +2313,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Proizvodnja Manager
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serijska št {0} je pod garancijo stanuje {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Split Dostava Opomba v pakete.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Pošiljke
+apps/erpnext/erpnext/hooks.py +107,Shipments,Pošiljke
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Skupaj Dodeljena Znesek (družba Valuta)
 DocType: Purchase Order Item,To be delivered to customer,Ki jih je treba dostaviti kupcu
 DocType: BOM,Scrap Material Cost,Stroški odpadnega materiala
@@ -2294,8 +2336,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Nastavitve različice postavke
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Izberite Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Pustite prazno, če velja za vse oddelke"
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Vrste zaposlitve (trajna, pogodbeni, intern itd)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} je obvezna za postavko {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Vrste zaposlitve (trajna, pogodbeni, intern itd)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} je obvezna za postavko {1}
 DocType: Process Payroll,Fortnightly,vsakih štirinajst dni
 DocType: Currency Exchange,From Currency,Iz valute
 DocType: Vital Signs,Weight (In Kilogram),Teža (v kilogramih)
@@ -2320,7 +2362,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Prosimo, kliknite na &quot;ustvarjajo Seznamu&quot;, da bi dobili razpored"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Tam so bile napake pri brisanju naslednje razporede:
 DocType: Bin,Ordered Quantity,Naročeno Količina
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",npr &quot;Build orodja za gradbenike&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",npr &quot;Build orodja za gradbenike&quot;
 DocType: Grading Scale,Grading Scale Intervals,Ocenjevalna lestvica intervali
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: lahko računovodski vnos za {2} se opravi le v valuti: {3}
 DocType: Production Order,In Process,V postopku
@@ -2344,11 +2386,10 @@
 DocType: Purchase Invoice,With Payment of Tax,S plačilom davka
 DocType: Expense Claim Detail,Expense Claim Detail,Expense Zahtevek Detail
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Trojnih dobavitelja
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,"Prosimo, izberite ustrezen račun"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,"Prosimo, izberite ustrezen račun"
 DocType: Item,Weight UOM,Teža UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Struktura Plač zaposlenih
 DocType: Patient,Blood Group,Blood Group
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,V teku
 DocType: Course,Course Name,Ime predmeta
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Uporabniki, ki lahko potrdijo zahtevke zapustiti določenega zaposlenega"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Pisarniška oprema
@@ -2367,7 +2408,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Cene se ne bodo pokazale, če Cenik ni nastavljen"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Prosimo, navedite državo ta prevoz pravilu ali preverite Dostava po celem svetu"
 DocType: Stock Entry,Total Incoming Value,Skupaj Dohodni Vrednost
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Bremenitev je potrebno
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Bremenitev je potrebno
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomaga slediti časa, stroškov in zaračunavanje za aktivnostmi s svojo ekipo, podpisan"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Nakup Cenik
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Predloge spremenljivk rezultatov dobaviteljev.
@@ -2377,7 +2418,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Uskladitev plačil
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Prosimo, izberite ime zadolžen osebe"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tehnologija
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Skupaj neplačano: {0}
+DocType: Hub Settings,Unregister from Hub,Odjavite se iz Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Skupaj neplačano: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Spletna stran Operacija
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Ponujamo Letter
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Ustvarjajo Materialne zahteve (MRP) in naročila za proizvodnjo.
@@ -2389,7 +2431,9 @@
 DocType: Physician Schedule Time Slot,To Time,Time
 DocType: Authorization Rule,Approving Role (above authorized value),Odobritvi vloge (nad pooblaščeni vrednosti)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Credit Za računu mora biti plačljivo račun
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija: {0} ne more biti starš ali otrok {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Prosimo, izberite Študentski Pristop, ki je obvezen za študenta, ki plača študent"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija: {0} ne more biti starš ali otrok {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Izberite cenik za objavo cen
 DocType: Production Order Operation,Completed Qty,Končano število
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Za {0}, lahko le debetne račune povezati proti drugemu knjiženje"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Seznam Cena {0} je onemogočena
@@ -2402,39 +2446,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} serijske številke, potrebne za postavko {1}. Ki ste ga navedli {2}."
 DocType: Stock Reconciliation Item,Current Valuation Rate,Trenutni tečaj Vrednotenje
 DocType: Item,Customer Item Codes,Stranka Postavka Kode
+DocType: Training Event,Advance,Napredovanje
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,za ponovni ponovitev.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange dobiček / izguba
 DocType: Opportunity,Lost Reason,Lost Razlog
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,New Naslov
 DocType: Quality Inspection,Sample Size,Velikost vzorca
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Vnesite Prejem dokumenta
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Vsi predmeti so bili že obračunano
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Prosimo, navedite veljaven &quot;Od zadevi št &#39;"
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',"Prosimo, navedite veljaven &quot;Od zadevi št &#39;"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Nadaljnje stroškovna mesta se lahko izvede v skupinah, vendar vnosi lahko zoper niso skupin"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Uporabniki in dovoljenja
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Naročila za proizvodnjo Ustvarjen: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Naročila za proizvodnjo Ustvarjen: {0}
 DocType: Branch,Branch,Branch
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tiskanje in Branding
 DocType: Company,Total Monthly Sales,Skupna mesečna prodaja
 DocType: Bin,Actual Quantity,Dejanska količina
 DocType: Shipping Rule,example: Next Day Shipping,Primer: Next Day Shipping
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serijska št {0} ni bilo mogoče najti
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Naročnina je bila {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Naročnina je bila {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Program urnika
 DocType: Fee Schedule Program,Student Batch,študent serije
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,"izberite * iz `tabVital Signs`, kjer bolnik = &#39;{0}&#39;, ki ga določi znak_date desc 1"
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Naredite Študent
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Min razred
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Ti so bili povabljeni k sodelovanju na projektu: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Zdravnik ni na voljo na {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Ti so bili povabljeni k sodelovanju na projektu: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Zdravnik ni na voljo na {0}
 DocType: Leave Block List Date,Block Date,Block Datum
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Dodajte polje za naročniško polje na področju doctype {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Opomba: dobavitelj dostava
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Prijavi se zdaj
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Prijavi se zdaj
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Dejanska Kol {0} / čakajoči Kol {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Dejanska Kol {0} / čakajoči Kol {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-trgovina GSTIN
 DocType: Sales Order,Not Delivered,Ne Delivered
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Pričakovani datum ne sme biti pred datumom transakcije
 ,Bank Clearance Summary,Banka Potrditev Povzetek
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Ustvarjanje in upravljanje dnevne, tedenske in mesečne email prebavlja."
 DocType: Appraisal Goal,Appraisal Goal,Cenitev cilj
@@ -2442,12 +2487,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,zgradbe
 DocType: Fee Schedule,Fee Structure,Fee Struktura
 DocType: Timesheet Detail,Costing Amount,Stanejo Znesek
-DocType: Student Admission,Application Fee,Fee uporaba
+DocType: Student Admission Program,Application Fee,Fee uporaba
 DocType: Process Payroll,Submit Salary Slip,Predloži plačilni list
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maxiumm popust za Element {0} je {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Maxiumm popust za Element {0} je {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Uvoz v razsutem stanju
 DocType: Sales Partner,Address & Contacts,Naslov &amp; Kontakti
 DocType: SMS Log,Sender Name,Sender Name
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Razvrsti po kriterijih
 DocType: POS Profile,[Select],[Izberite]
 DocType: Vital Signs,Blood Pressure (diastolic),Krvni tlak (diastolični)
 DocType: SMS Log,Sent To,Poslano
@@ -2456,7 +2502,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Naslednja Stik datum ne more biti v preteklosti
 DocType: Company,For Reference Only.,Samo za referenco.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Zdravnik {0} ni na voljo {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Izberite Serija št
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Izberite Serija št
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Neveljavna {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,Reference Inv
@@ -2472,15 +2518,15 @@
 DocType: Normal Test Items,Require Result Value,Zahtevajte vrednost rezultata
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Primer št ne more biti 0
 DocType: Item,Show a slideshow at the top of the page,Prikaži diaprojekcijo na vrhu strani
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Trgovine
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Trgovine
 DocType: Project Type,Projects Manager,Projekti Manager
 DocType: Serial No,Delivery Time,Čas dostave
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,"Staranje, ki temelji na"
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Imenovanje je preklicano
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Imenovanje je preklicano
 DocType: Item,End of Life,End of Life
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Potovanja
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,"Ni aktivnega ali privzeti plač struktura, ugotovljena za zaposlenega {0} za datumoma"
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Potovanja
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,"Ni aktivnega ali privzeti plač struktura, ugotovljena za zaposlenega {0} za datumoma"
 DocType: Leave Block List,Allow Users,Dovoli uporabnike
 DocType: Purchase Order,Customer Mobile No,Stranka Mobile No
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Ponavljajoči
@@ -2489,12 +2535,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Posodobitev Stroški
 DocType: Item Reorder,Item Reorder,Postavka Preureditev
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Prikaži Plača listek
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Prenos Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Prenos Material
 DocType: Fees,Send Payment Request,Pošiljanje zahtevka za plačilo
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Določite operacij, obratovalne stroške in daje edinstveno Operacija ni na vaše poslovanje."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,"Ta dokument je nad mejo, ki jo {0} {1} za postavko {4}. Delaš drugo {3} zoper isto {2}?"
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,"Prosim, nastavite ponavljajočih se po shranjevanju"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,znesek računa Izberite sprememba
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,znesek računa Izberite sprememba
 DocType: Purchase Invoice,Price List Currency,Cenik Valuta
 DocType: Naming Series,User must always select,Uporabnik mora vedno izbrati
 DocType: Stock Settings,Allow Negative Stock,Dovoli Negative Stock
@@ -2514,7 +2560,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Zaposleni
 DocType: Sample Collection,Collected Time,Zbrani čas
 DocType: Company,Sales Monthly History,Mesečna zgodovina prodaje
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Izberite Serija
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Izberite Serija
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} je v celoti zaračunano
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Življenjski znaki
 DocType: Training Event,End Time,Končni čas
@@ -2522,16 +2568,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Plačilni Odbitki ali izguba
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardni pogodbeni pogoji za prodajo ali nakup.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Skupina kupon
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,"Ali ste prepričani, da želite preklicati ta sestanek?"
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,prodaja Pipeline
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},"Prosim, nastavite privzetega računa v plač komponento {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Zahtevani Na
 DocType: Rename Tool,File to Rename,Datoteka za preimenovanje
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Izberite BOM za postavko v vrstici {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Izberite BOM za postavko v vrstici {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Račun {0} ne ujema z družbo {1} v načinu račun: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Določeno BOM {0} ne obstaja za postavko {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Vzdrževanje Urnik {0} je treba odpovedati pred preklicem te Sales Order
+DocType: POS Profile,Applicable for Users,Uporabno za uporabnike
 DocType: Notification Control,Expense Claim Approved,Expense Zahtevek Odobreno
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Plača Slip delavca {0} že ustvarili za to obdobje
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Plača Slip delavca {0} že ustvarili za to obdobje
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Pharmaceutical
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Vrednost kupljenih artiklov
 DocType: Selling Settings,Sales Order Required,Zahtevano je naročilo
@@ -2556,6 +2604,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,organizacija
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,organizacija
 DocType: BOM Update Tool,BOM Update Tool,Orodje za posodobitev BOM
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Račun stranke ni bil določen, nastavite privzeti račun stranke v podjetju"
 DocType: SG Creation Tool Course,Student Group Name,Ime študent Group
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Ustvarjanje pristojbin
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Prosimo, preverite, ali ste prepričani, da želite izbrisati vse posle, za te družbe. Vaši matični podatki bodo ostali kot je. Ta ukrep ni mogoče razveljaviti."
@@ -2564,29 +2613,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne more biti večji od načrtovanih quanitity ({2}) v proizvodnji naročite {3}
 DocType: Shipping Rule,Shipping Rule Label,Oznaka dostavnega pravila
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Uporabniški forum
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Surovine ne more biti prazno.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Ni mogel posodobiti vozni park, faktura vsebuje padec element ladijskega prometa."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Surovine ne more biti prazno.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Ni mogel posodobiti vozni park, faktura vsebuje padec element ladijskega prometa."
 DocType: Lab Test Sample,Lab Test Sample,Vzorec laboratorijskega testa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Hitro Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Vi stopnje ni mogoče spremeniti, če BOM omenjeno agianst vsako postavko"
+DocType: Restaurant,Invoice Series Prefix,Predpisi serije računov
 DocType: Employee,Previous Work Experience,Prejšnja Delovne izkušnje
 DocType: Stock Entry,For Quantity,Za Količino
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Vnesite načrtovanih Količina za postavko {0} v vrstici {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Vnesite načrtovanih Količina za postavko {0} v vrstici {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} ni predloženo
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Prošnje za artikle.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Ločena proizvodnja naročilo bo ustvarjen za vsakega končnega dobro točko.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} mora biti negativen na povratni dokument
 ,Minutes to First Response for Issues,Minut do prvega odziva na vprašanja
 DocType: Purchase Invoice,Terms and Conditions1,Pogoji in razmer1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,"Ime zavoda, za katerega vzpostavitev tega sistema."
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,"Ime zavoda, za katerega vzpostavitev tega sistema."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Vknjižba zamrzniti do tega datuma, nihče ne more narediti / spremeniti vnos razen vlogi določeno spodaj."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Prosimo, shranite dokument pred ustvarjanjem razpored vzdrževanja"
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Najnovejša cena posodobljena v vseh BOM
 DocType: Fee Schedule,Successful,Uspešno
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Stanje projekta
 DocType: UOM,Check this to disallow fractions. (for Nos),"Preverite, da je to prepoveste frakcij. (za številkami)"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,so bile oblikovane naslednje naročila za proizvodnjo:
-DocType: Student Admission,Naming Series (for Student Applicant),Poimenovanje Series (za Student prijavitelja)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,so bile oblikovane naslednje naročila za proizvodnjo:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Poimenovanje Series (za Student prijavitelja)
 DocType: Delivery Note,Transporter Name,Transporter Name
 DocType: Authorization Rule,Authorized Value,Dovoljena vrednost
 DocType: BOM,Show Operations,prikaži Operations
@@ -2610,7 +2660,7 @@
 ,Employees working on a holiday,Zaposleni na počitnice
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Present
 DocType: Project,% Complete Method,% Complete Metoda
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Zdravilo
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Zdravilo
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Datum začetka vzdrževanje ne more biti pred datumom dostave za serijsko št {0}
 DocType: Production Order,Actual End Date,Dejanski končni datum
 DocType: BOM,Operating Cost (Company Currency),Obratovalni stroški (družba Valuta)
@@ -2628,13 +2678,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,"Odobritvi Uporabnik ne more biti isto kot uporabnika je pravilo, ki veljajo za"
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Osnovni tečaj (kot na borzi UOM)
 DocType: SMS Log,No of Requested SMS,Št zaprošene SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Pusti brez plačila ne ujema z odobrenimi evidence Leave aplikacij
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Pusti brez plačila ne ujema z odobrenimi evidence Leave aplikacij
 DocType: Campaign,Campaign-.####,Akcija -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Naslednji koraki
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,"Prosimo, da določene elemente na najboljših možnih cenah"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Izračunajte
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto blizu Priložnost po 15 dneh
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Nakupna naročila niso dovoljena za {0} zaradi postavke ocene rezultatov {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Nakupna naročila niso dovoljena za {0} zaradi postavke ocene rezultatov {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Leto zaključka
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / svinec%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / svinec%
@@ -2642,6 +2692,7 @@
 DocType: Vital Signs,Nutrition Values,Prehranske vrednosti
 DocType: Lab Test Template,Is billable,Je zaračunljiv
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Za zdravnik {0} je treba določiti oba &quot;Urnik zdravnikov&quot; in čas na imenovanju &quot;
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Distributer tretja oseba / trgovec / provizije agent / podružnica / prodajalec, ki prodaja podjetja, izdelke za provizijo."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} proti narocilo {1}
 DocType: Patient,Patient Demographics,Demografija pacienta
@@ -2671,7 +2722,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","Standardna davčna predlogo, ki se lahko uporablja za vse nakupnih poslov. To predlogo lahko vsebuje seznam davčnih glavami in tudi drugih odhodkov glavah, kot so &quot;Shipping&quot;, &quot;zavarovanje&quot;, &quot;Ravnanje&quot; itd #### Opomba davčno stopnjo, ki jo določite tu bo standard davčna stopnja za vse ** Točke * *. Če obstajajo ** Items **, ki imajo različne stopnje, ki jih je treba dodati v ** Element davku ** miza v ** Element ** mojstra. #### Opis Stolpci 1. Vrsta Izračun: - To je lahko na ** Net Total ** (to je vsota osnovnega zneska). - ** Na prejšnje vrstice Total / Znesek ** (za kumulativnih davkov ali dajatev). Če izberete to možnost, bo davek treba uporabiti kot odstotek prejšnje vrstice (davčne tabele) znesek ali skupaj. - ** Dejanska ** (kot je omenjeno). 2. Račun Head: The knjiga račun, pod katerimi se bodo rezervirana ta davek 3. stroškovni center: Če davek / pristojbina je prihodek (kot ladijski promet) ali odhodek je treba rezervirana proti centru stroškov. 4. Opis: Opis davka (bo, da se natisne v faktur / narekovajev). 5. stopnja: Davčna stopnja. 6. Znesek: Davčna znesek. 7. Skupaj: Kumulativno do te točke. 8. Vnesite Row: Če je na osnovi &quot;Prejšnji Row Total&quot; lahko izberete številko vrstice, ki bo sprejet kot osnova za ta izračun (privzeta je prejšnja vrstica). 9. Razmislite davek ali dajatev za: V tem razdelku lahko določite, če je davek / pristojbina le za vrednotenje (ni del skupaj) ali samo za skupno (ne dodajajo vrednost za postavko), ali pa oboje. 10. Dodajte ali odštejemo: Ali želite dodati ali odbiti davek."
 DocType: Homepage,Homepage,Domača stran
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Izberite zdravnika ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',tabulator za posodobitevConsultation set account = &#39;{0}&#39; kjer ime = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd Količina
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Fee Records Created - {0}
 DocType: Asset Category Account,Asset Category Account,Sredstvo Kategorija račun
@@ -2683,7 +2733,7 @@
 DocType: Asset,Manual,Ročno
 DocType: Salary Component Account,Salary Component Account,Plača Komponenta račun
 DocType: Global Defaults,Hide Currency Symbol,Skrij valutni simbol
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","npr Bank, gotovini, Kreditna kartica"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","npr Bank, gotovini, Kreditna kartica"
 DocType: Lead Source,Source Name,Source Name
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Normalni krvni tlak pri odraslih je približno 120 mmHg sistoličnega in 80 mmHg diastoličnega, okrajšanega &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Dobropis
@@ -2702,16 +2752,16 @@
 DocType: Patient,Occupation,poklic
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Vrstica {0}: Začetni datum mora biti pred končnim datumom
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Skupaj (Kol)
-DocType: Sales Invoice,This Document,Ta dokument
 DocType: Installation Note Item,Installed Qty,Nameščen Kol
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,To je lahko zaradi nekaterih neveljavnih e - poštnih naslovov v
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Dodali ste
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Rezultat usposabljanja
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Rezultat usposabljanja
 DocType: Purchase Invoice,Is Paid,je plačano
 DocType: Salary Structure,Total Earning,Skupaj zaslužka
 DocType: Purchase Receipt,Time at which materials were received,"Čas, v katerem so bile prejete materiale"
 DocType: Stock Ledger Entry,Outgoing Rate,Odhodni Rate
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Organizacija podružnica gospodar.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Organizacija podružnica gospodar.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,ali
 DocType: Sales Order,Billing Status,Status zaračunavanje
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Prijavi težavo
@@ -2726,8 +2776,9 @@
 DocType: Notification Control,Sales Order Message,Sales Order Sporočilo
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Privzeta nastavitev Vrednote, kot so podjetja, valuta, tekočem proračunskem letu, itd"
 DocType: Payment Entry,Payment Type,Način plačila
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Izberite Serija za postavko {0}. Ni mogoče, da bi našli eno serijo, ki izpolnjuje te zahteve"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Izberite Serija za postavko {0}. Ni mogoče, da bi našli eno serijo, ki izpolnjuje te zahteve"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Izberite Serija za postavko {0}. Ni mogoče, da bi našli eno serijo, ki izpolnjuje te zahteve"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Izberite Serija za postavko {0}. Ni mogoče, da bi našli eno serijo, ki izpolnjuje te zahteve"
+DocType: Hub Category,Parent Category,Kategorija staršev
 DocType: Process Payroll,Select Employees,Izberite Zaposleni
 DocType: Opportunity,Potential Sales Deal,Potencialni Sales Deal
 DocType: Complaint,Complaints,Pritožbe
@@ -2765,7 +2816,7 @@
 DocType: Bin,Reserved Quantity,Rezervirano Količina
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Vnesite veljaven e-poštni naslov
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Vnesite veljaven e-poštni naslov
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,"Prosimo, izberite predmet v vozičku"
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,"Prosimo, izberite predmet v vozičku"
 DocType: Landed Cost Voucher,Purchase Receipt Items,Nakup Prejem Items
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Prilagajanje Obrazci
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,arrear
@@ -2775,15 +2826,15 @@
 DocType: Payment Request,Amount in customer's currency,Znesek v valuti stranke
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Dostava
 DocType: Stock Reconciliation Item,Current Qty,Trenutni Kol
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Dodaj dobavitelje
+DocType: Restaurant Menu,Restaurant Menu,Restavracija Meni
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,prejšnja
 DocType: Appraisal Goal,Key Responsibility Area,Key Odgovornost Area
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Študentski Paketi vam pomaga slediti sejnin, ocene in pristojbine za študente"
 DocType: Payment Entry,Total Allocated Amount,Skupaj Dodeljena Znesek
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Privzeta nastavitev popis račun za stalne inventarizacije
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Privzeta nastavitev popis račun za stalne inventarizacije
 DocType: Item Reorder,Material Request Type,Material Zahteva Type
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural list Vstop za pla iz {0} in {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","Lokalno shrambo je polna, ni rešil"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","Lokalno shrambo je polna, ni rešil"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Vrstica {0}: UOM Conversion Factor je obvezna
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Zmogljivost sob
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref
@@ -2822,16 +2873,18 @@
 DocType: Project,Task Completion,naloga Zaključek
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Ni na zalogi
 DocType: Appraisal,HR User,HR Uporabnik
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Davki in dajatve Odbitek
-apps/erpnext/erpnext/hooks.py +129,Issues,Vprašanja
+apps/erpnext/erpnext/hooks.py +138,Issues,Vprašanja
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Stanje mora biti eno od {0}
 DocType: Sales Invoice,Debit To,Bremenitev
+DocType: Restaurant Menu Item,Restaurant Menu Item,Restavracija Menu Item
 DocType: Delivery Note,Required only for sample item.,Zahteva le za točko vzorca.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Dejanska Kol Po Transaction
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Št plačilni list dalo med {0} in {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Št plačilni list dalo med {0} in {1}
 ,Pending SO Items For Purchase Request,Dokler SO Točke za nakup dogovoru
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Študentski Sprejemi
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} je onemogočeno
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Študentski Sprejemi
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} je onemogočeno
 DocType: Supplier,Billing Currency,Zaračunavanje Valuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Extra Large
@@ -2854,6 +2907,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Navedite ni obiskov zahtevanih
 DocType: Stock Settings,Default Valuation Method,Način Privzeto Vrednotenje
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,Fee
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Posodabljanje je v teku. Mogoče bo trajalo nekaj časa.
 DocType: Vehicle Log,Fuel Qty,gorivo Kol
 DocType: Production Order Operation,Planned Start Time,Načrtovano Start Time
 DocType: Course,Assessment,ocena
@@ -2869,7 +2923,7 @@
 DocType: Price List,Price List Master,Cenik Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Vse prodajne transakcije je lahko označena pred številnimi ** Prodajni Osebe **, tako da lahko nastavite in spremljanje ciljev."
 ,S.O. No.,SO No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},"Prosimo, da ustvarite strank iz svinca {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},"Prosimo, da ustvarite strank iz svinca {0}"
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Izberite Patient
 DocType: Price List,Applicable for Countries,Velja za države
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Ime parametra
@@ -2901,27 +2955,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Expense / Razlika račun ({0}) mora biti račun &quot;poslovni izid&quot;
 DocType: Project,Copied From,Kopirano iz
 DocType: Project,Copied From,Kopirano iz
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Ime napaka: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,pomanjkanje
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Ime napaka: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,pomanjkanje
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} ni povezan z {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Udeležba na zaposlenega {0} je že označeno
 DocType: Packing Slip,If more than one package of the same type (for print),Če več paketov istega tipa (v tisku)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Privzeto stran nastavite v nastavitvah restavracij
 ,Salary Register,plača Registracija
 DocType: Warehouse,Parent Warehouse,Parent Skladišče
 DocType: C-Form Invoice Detail,Net Total,Neto Skupaj
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Privzeti BOM nismo našli v postavki {0} in projektno {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Privzeti BOM nismo našli v postavki {0} in projektno {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Opredeliti različne vrste posojil
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Neporavnani znesek
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Čas (v minutah)
 DocType: Project Task,Working,Delovna
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock Queue (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Finančno leto
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Finančno leto
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} ne pripada družbi {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,"Za {0} ni bilo mogoče rešiti funkcije ocene rezultatov. Prepričajte se, da formula velja."
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Stane na
 DocType: Healthcare Settings,Out Patient Settings,Out Patient Settings
 DocType: Account,Round Off,Zaokrožite
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Količina mora biti pozitivna
 ,Requested Qty,Zahteval Kol
 DocType: Tax Rule,Use for Shopping Cart,Uporabite za Košarica
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Vrednost {0} za Attribute {1} ne obstaja na seznamu veljavnega točke Lastnost Vrednosti za postavko {2}
@@ -2930,7 +2986,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Dajatve bodo razdeljeni sorazmerno na podlagi postavka Kol ali znesek, glede na vašo izbiro"
 DocType: Maintenance Visit,Purposes,Nameni
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,"Atleast en element, se vpiše z negativnim količino v povratni dokument"
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Dodajanje predmetov
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacija {0} dlje od vseh razpoložljivih delovnih ur v delovni postaji {1}, razčleniti operacijo na več operacij"
 ,Requested,Zahteval
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Ni Opombe
@@ -2942,6 +2997,8 @@
 DocType: Employee Loan,Repaid/Closed,Povrne / Zaprto
 DocType: Item,Total Projected Qty,Skupne projekcije Kol
 DocType: Monthly Distribution,Distribution Name,Porazdelitev Name
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dobavitelj&gt; Dobavitelj tip
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Stopnja vrednotenja ni mogoče najti za postavko {0}, ki je potrebna za izvršitev računovodskih vnosov za {1} {2}. Če je predmet predmet transakcije kot element ničelne vrednosti za vrednost v {1}, navedite to v tabeli {1} Item. V nasprotnem primeru ustvarite transakcijo dohodne delnice za postavko ali navedite stopnjo vrednotenja v zapisu postavke in poskusite poslati / preklicati ta vnos"
 DocType: Course,Course Code,Koda predmeta
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Inšpekcija kakovosti potrebna za postavko {0}
 DocType: POS Settings,Use POS in Offline Mode,Uporabite POS v načinu brez povezave
@@ -2952,14 +3009,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Upravljanje Territory drevo.
 DocType: Journal Entry Account,Sales Invoice,Račun
 DocType: Journal Entry Account,Party Balance,Balance Party
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,"Prosimo, izberite Uporabi popust na"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,"Prosimo, izberite Uporabi popust na"
 DocType: Company,Default Receivable Account,Privzeto Terjatve račun
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Ustvarite Bank vnos za celotno plačo za zgoraj izbranih kriterijih
 DocType: Physician,Physician Schedule,Urnik zdravnika
 DocType: Purchase Invoice,Deemed Export,Izbrisani izvoz
 DocType: Stock Entry,Material Transfer for Manufacture,Prenos materialov za proizvodnjo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Popust Odstotek se lahko uporablja bodisi proti ceniku ali za vse cenik.
-DocType: Purchase Invoice,Half-yearly,Polletna
+DocType: Subscription,Half-yearly,Polletna
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Računovodstvo Vstop za zalogi
 DocType: Lab Test,LabTest Approver,Odobritev LabTest
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Ste že ocenili za ocenjevalnih meril {}.
@@ -2988,13 +3045,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Extra Small
 DocType: Company,Standard Template,standard Template
 DocType: Training Event,Theory,teorija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,"Opozorilo: Material Zahtevana Količina je manj kot minimalna, da Kol"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,"Opozorilo: Material Zahtevana Količina je manj kot minimalna, da Kol"
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Račun {0} je zamrznjen
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pravna oseba / Hčerinska družba z ločenim računom ki pripada organizaciji.
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Hrana, pijača, tobak"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Lahko le plačilo proti neobračunano {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Stopnja Komisija ne more biti večja od 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Lahko le plačilo proti neobračunano {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Stopnja Komisija ne more biti večja od 100
 DocType: Stock Entry,Subcontract,Podizvajalska pogodba
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Vnesite {0} najprej
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Ni odgovorov
@@ -3012,10 +3069,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Barva
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Merila načrt ocenjevanja
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Preprečevanje nakupnih naročil
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Občutljivo
 DocType: Patient Appointment,Scheduled,Načrtovano
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Zahteva za ponudbo.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosimo, nastavite sistem imenovanja zaposlenih v kadri&gt; HR Settings"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Prosimo, izberite postavko, kjer &quot;Stock postavka je&quot; &quot;Ne&quot; in &quot;Je Sales Postavka&quot; je &quot;Yes&quot; in ni druge Bundle izdelka"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Izberite stranko
 DocType: Student Log,Academic,akademski
 DocType: Patient,Personal and Social History,Osebna in socialna zgodovina
 DocType: Fee Schedule,Fee Breakup for each student,Povračilo stroškov za vsakega študenta
@@ -3025,7 +3083,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Oceni Vrednotenje
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Cenik Valuta ni izbran
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Cenik Valuta ni izbran
 apps/erpnext/erpnext/config/healthcare.py +46,Results,Rezultati
 ,Student Monthly Attendance Sheet,Študent Mesečni Udeležba Sheet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Employee {0} je že zaprosil za {1} med {2} in {3}
@@ -3041,7 +3099,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Upravljanje prodajne partnerje.
 DocType: Quality Inspection,Inspection Type,Inšpekcijski Type
 DocType: Fee Validity,Visited yet,Obiskal še
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Skladišča z obstoječim poslom ni mogoče pretvoriti v skupino.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Skladišča z obstoječim poslom ni mogoče pretvoriti v skupino.
 DocType: Assessment Result Tool,Result HTML,rezultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Poteče
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Dodaj Študenti
@@ -3068,7 +3126,7 @@
 DocType: Healthcare Settings,Result Printed,Rezultat natisnjen
 DocType: Asset Category Account,Depreciation Expense Account,Amortizacija račun
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Poskusna doba
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Ogled {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Ogled {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Samo leaf vozlišča so dovoljene v transakciji
 DocType: Expense Claim,Expense Approver,Expense odobritelj
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Vrstica {0}: Advance proti naročniku mora biti kredit
@@ -3080,7 +3138,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Da datetime
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Urniki tečaj črta:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Dnevniki za ohranjanje statusa dostave sms
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Nastavite prodajne cilje
 DocType: Accounts Settings,Make Payment via Journal Entry,Naredite plačilo preko Journal Entry
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Tiskano na
 DocType: Item,Inspection Required before Delivery,Inšpekcijski Zahtevana pred dostavo
@@ -3088,7 +3145,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Čakanju Dejavnosti
 DocType: Patient Appointment,Reminded,Opomniti
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Vaša organizacija
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Vaša organizacija
 DocType: Fee Component,Fees Category,pristojbine Kategorija
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Vnesite lajšanje datum.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
@@ -3100,7 +3157,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Preureditev Raven
 DocType: Company,Chart Of Accounts Template,Graf Of predlogo računov
 DocType: Attendance,Attendance Date,Udeležba Datum
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Kos Cena posodabljati za {0} v ceniku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Kos Cena posodabljati za {0} v ceniku {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plača razpadu temelji na zaslužek in odbitka.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Račun z zapirali vozlišč ni mogoče pretvoriti v knjigo terjatev
 DocType: Purchase Invoice Item,Accepted Warehouse,Accepted Skladišče
@@ -3116,9 +3173,10 @@
 ,Employee Birthday,Zaposleni Rojstni dan
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Študent Serija Udeležba orodje
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,Limit navzkrižnim
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Načrtovani Upto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Tveganega kapitala
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Akademski izraz s tem &quot;študijskem letu &#39;{0} in&quot; Trajanje Ime&#39; {1} že obstaja. Prosimo, spremenite te vnose in poskusite znova."
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Kot že obstajajo transakcije proti zapisu {0}, ki jih ne more spremeniti vrednosti {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Kot že obstajajo transakcije proti zapisu {0}, ki jih ne more spremeniti vrednosti {1}"
 DocType: UOM,Must be Whole Number,Mora biti celo število
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nove Listi Dodeljena (v dnevih)
 DocType: Purchase Invoice,Invoice Copy,račun Kopiraj
@@ -3128,7 +3186,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Številka računa
 DocType: Shopping Cart Settings,Orders,Naročila
 DocType: Employee Leave Approver,Leave Approver,Pustite odobritelju
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Izberite serijo
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Izberite serijo
 DocType: Assessment Group,Assessment Group Name,Ime skupine ocena
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material Preneseno za Izdelava
 DocType: Expense Claim,"A user with ""Expense Approver"" role",Uporabnik z &quot;Expense odobritelj&quot; vlogi
@@ -3143,7 +3201,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Obdobje Closing Začetek
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Izberite oddelek ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Stroškovno Center z obstoječimi transakcij ni mogoče pretvoriti v skupini
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Znesek {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Znesek {0} {1} {2} {3}
 DocType: Account,Depreciation,Amortizacija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dobavitelj (-i)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Zaposleni Udeležba Tool
@@ -3155,10 +3213,12 @@
 DocType: GL Entry,Voucher No,Voucher ni
 ,Lead Owner Efficiency,Svinec Lastnik Učinkovitost
 ,Lead Owner Efficiency,Svinec Lastnik Učinkovitost
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Najbolj priljubljeni
 DocType: Leave Allocation,Leave Allocation,Pustite Dodelitev
 DocType: Payment Request,Recipient Message And Payment Details,Prejemnik sporočila in način plačila
 DocType: Training Event,Trainer Email,Trainer Email
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Material Zahteve {0} ustvarjene
+DocType: Restaurant Reservation,No of People,Število ljudi
 DocType: Production Planning Tool,Include sub-contracted raw materials,Vključi podizvajalcev surovin
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Predloga izrazov ali pogodbe.
 DocType: Purchase Invoice,Address and Contact,Naslov in Stik
@@ -3167,10 +3227,11 @@
 DocType: Supplier,Last Day of the Next Month,Zadnji dan v naslednjem mesecu
 DocType: Support Settings,Auto close Issue after 7 days,Auto blizu Izdaja po 7 dneh
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Dopusta ni mogoče dodeliti pred {0}, saj je bilanca dopust že-carry posredujejo v evidenco dodeljevanja dopust prihodnji {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Opomba: Zaradi / Referenčni datum presega dovoljene kreditnih stranka dni s {0} dan (s)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Opomba: Zaradi / Referenčni datum presega dovoljene kreditnih stranka dni s {0} dan (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,študent Prijavitelj
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL ZA PREJEMNIKA
 DocType: Asset Category Account,Accumulated Depreciation Account,Bilančni Amortizacija račun
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,To e-poštno sporočilo je samodejno generirano
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Vnosi
 DocType: Program Enrollment,Boarding Student,Boarding Študent
 DocType: Asset,Expected Value After Useful Life,Pričakovana vrednost Po Koristne življenja
@@ -3178,7 +3239,7 @@
 DocType: Activity Cost,Billing Rate,Zaračunavanje Rate
 ,Qty to Deliver,Količina na Deliver
 ,Stock Analytics,Analiza zaloge
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Operacije se ne sme ostati prazno
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Operacije se ne sme ostati prazno
 DocType: Maintenance Visit Purpose,Against Document Detail No,Proti Podrobnosti dokumenta št
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Vrsta Party je obvezen
 DocType: Quality Inspection,Outgoing,Odhodni
@@ -3200,7 +3261,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,"Izberite študentov ročno za skupine dejavnosti, ki temelji"
 DocType: Journal Entry,User Remark,Uporabnik Pripomba
 DocType: Lead,Market Segment,Tržni segment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Plačani znesek ne sme biti večja od celotnega negativnega neplačanega zneska {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Plačani znesek ne sme biti večja od celotnega negativnega neplačanega zneska {0}
 DocType: Supplier Scorecard Period,Variables,Spremenljivke
 DocType: Employee Internal Work History,Employee Internal Work History,Zaposleni Notranji Delo Zgodovina
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Zapiranje (Dr)
@@ -3229,21 +3290,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Dobite posodobitve
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Račun {2} ne pripada družbi {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Material Zahteva {0} je odpovedan ali ustavi
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Pustite upravljanje
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Pustite upravljanje
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,"Skupina, ki jo račun"
 DocType: Sales Order,Fully Delivered,Popolnoma Delivered
 DocType: Lead,Lower Income,Nižji od dobička
+DocType: Restaurant Order Entry,Current Order,Trenutni naročilo
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Vir in cilj skladišče ne more biti enaka za vrstico {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika računa mora biti tip Asset / Liability račun, saj je ta Stock Sprava je Entry Otvoritev"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Plačanega zneska ne sme biti večja od zneska kredita {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Pojdite v programe
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Naročilnica zahtevanega števila za postavko {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Proizvodnja Sklep ni bil ustvarjen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Proizvodnja Sklep ni bil ustvarjen
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Od datuma' mora biti za 'Do datuma '
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},"status študenta, ne more spremeniti {0} je povezana z uporabo študentskega {1}"
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},"status študenta, ne more spremeniti {0} je povezana z uporabo študentskega {1}"
 DocType: Asset,Fully Depreciated,celoti amortizirana
 ,Stock Projected Qty,Stock Predvidena Količina
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},"Stranka {0} ne pripada, da projekt {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},"Stranka {0} ne pripada, da projekt {1}"
 DocType: Employee Attendance Tool,Marked Attendance HTML,Markirana Udeležba HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Citati so predlogi, ponudbe, ki ste jih poslali svojim strankam"
 DocType: Sales Order,Customer's Purchase Order,Stranke Naročilo
@@ -3254,8 +3316,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Prosim, nastavite Število amortizacije Rezervirano"
 DocType: Supplier Scorecard Period,Calculations,Izračuni
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Vrednost ali Kol
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Produkcije Naročila ni mogoče povečati za:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Produkcije Naročila ni mogoče povečati za:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Minute
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Prosimo, nastavite imena serije za {0} prek Setup&gt; Settings&gt; Series Naming"
 DocType: Purchase Invoice,Purchase Taxes and Charges,Nakup davki in dajatve
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Pojdi na dobavitelje
 ,Qty to Receive,Količina za prejemanje
@@ -3269,7 +3332,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Credit Za računu mora biti bilanca računa
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Vse vrste Dobavitelj
 DocType: Global Defaults,Disable In Words,"Onemogoči ""z besedami"""
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Oznaka je obvezna, ker se postavka samodejno ni oštevilčen"
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,"Oznaka je obvezna, ker se postavka samodejno ni oštevilčen"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Ponudba {0} ni tipa {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vzdrževanje Urnik Postavka
 DocType: Sales Order,%  Delivered,% Dostavljeno
@@ -3291,23 +3354,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Otvoritev Balance Equity
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Usklajevanje
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,preostala
 DocType: Appraisal,Appraisal,Cenitev
 DocType: Purchase Invoice,GST Details,Podrobnosti o GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},E-pošta poslana dobavitelju {0}
+DocType: Item,Default Sales Unit of Measure,Privzeta prodajna enota ukrepa
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum se ponovi
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Pooblaščeni podpisnik
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Pustite odobritelj mora biti eden od {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Ustvari pristojbine
-DocType: Hub Settings,Seller Email,Prodajalec Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Skupaj Nakup Cost (via računu o nakupu)
 DocType: Training Event,Start Time,Začetni čas
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Izberite Količina
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Izberite Količina
 DocType: Customs Tariff Number,Customs Tariff Number,Carinska tarifa številka
 DocType: Patient Appointment,Patient Appointment,Imenovanje pacienta
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"Odobritvi vloge ne more biti enaka kot vloga je pravilo, ki veljajo za"
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Odjaviti iz te Email Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Odjaviti iz te Email Digest
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Pridobite dobavitelje po
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} ni bilo mogoče najti za predmet {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Pojdi na predmete
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Sporočilo je bilo poslano
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Račun z zapirali vozlišč ni mogoče nastaviti kot knjigo
@@ -3320,11 +3386,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Material Preneseno za Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Račun {0} ne obstaja
 DocType: Project,Project Type,Projekt Type
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Otroška naloga obstaja za to nalogo. Te naloge ne morete izbrisati.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Bodisi ciljna kol ali ciljna vrednost je obvezna.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Stroške različnih dejavnosti
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Ni več rezultatov
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Stroške različnih dejavnosti
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Nastavitev dogodkov na {0}, saj je zaposlenih pritrjen na spodnji prodaje oseb nima uporabniško {1}"
 DocType: Timesheet,Billing Details,Podrobnosti o obračunavanju
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Vir in cilj skladišče mora biti drugačen
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Vir in cilj skladišče mora biti drugačen
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},"Ni dovoljeno, da posodobite transakcije zalog starejši od {0}"
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Popolnoma zaračunavajo
@@ -3350,7 +3418,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Preveri vse
 DocType: Vehicle Log,Invoice Ref,Ref na računu
-DocType: Purchase Order,Recurring Order,Ponavljajoči naročilo
 DocType: Company,Default Income Account,Privzeto Prihodki račun
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Skupina kupec / stranka
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Nezaprt proračunskih let dobiček / izguba (Credit)
@@ -3364,9 +3431,9 @@
 DocType: Patient,A Negative,Negativno
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Nič več pokazati.
 DocType: Lead,From Customer,Od kupca
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Poziva
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Poziva
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Izdelek
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,Paketi
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,Paketi
 DocType: Project,Total Costing Amount (via Time Logs),Skupaj Stanejo Znesek (preko Čas Dnevniki)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Naročite časovni razpored
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
@@ -3391,7 +3458,7 @@
 DocType: School Settings,Current Academic Term,Trenutni Academic Term
 DocType: School Settings,Current Academic Term,Trenutni Academic Term
 DocType: Sales Order,Not Billed,Ne zaračunavajo
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Oba Skladišče mora pripadati isti družbi
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Oba Skladišče mora pripadati isti družbi
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Ni stikov še dodal.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Pristali Stroški bon Znesek
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,"Računi, ki jih dobavitelji postavljeno."
@@ -3400,7 +3467,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Popust Količina
 DocType: Purchase Invoice,Return Against Purchase Invoice,Vrni proti Račun za nakup
 DocType: Item,Warranty Period (in days),Garancijski rok (v dnevih)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',posodobi `tabPatient Appointment` nastavi sales_invoice = &#39;{0}&#39; kjer ime = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Povezava z Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Čisti denarni tok iz poslovanja
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Postavka 4
@@ -3409,8 +3475,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry račun
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Študentska skupina
 DocType: Shopping Cart Settings,Quotation Series,Zaporedje ponudb
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Element obstaja z istim imenom ({0}), prosimo, spremenite ime postavka skupine ali preimenovanje postavke"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Izberite stranko
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Element obstaja z istim imenom ({0}), prosimo, spremenite ime postavka skupine ali preimenovanje postavke"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Izberite stranko
 DocType: C-Form,I,jaz
 DocType: Company,Asset Depreciation Cost Center,Asset Center Amortizacija Stroški
 DocType: Sales Order Item,Sales Order Date,Datum Naročila Kupca
@@ -3419,6 +3485,7 @@
 DocType: Assessment Plan,Assessment Plan,načrt ocenjevanja
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Stranka {0} je ustvarjena.
 DocType: Stock Settings,Limit Percent,omejitev Odstotek
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Trenutno ni na zalogi
 ,Payment Period Based On Invoice Date,Plačilo obdobju na podlagi računa Datum
 DocType: Sample Collection,No. of print,Št. Tiskanja
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Manjka Menjalni tečaji za {0}
@@ -3474,13 +3541,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruto plača - Skupaj Odbitek - Posojilo Povračilo
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,Trenutni BOM in New BOM ne more biti enaka
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Plača Slip ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Plača Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Datum upokojitve mora biti večji od datuma pridružitve
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,"Je prišlo do napak, medtem ko razporejanje tečaj na:"
 DocType: Sales Invoice,Against Income Account,Proti dohodkov
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Dostavljeno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Postavka {0}: Ž Kol {1} ne more biti nižja od minimalne naročila Kol {2} (opredeljeno v točki).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Postavka {0}: Ž Kol {1} ne more biti nižja od minimalne naročila Kol {2} (opredeljeno v točki).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mesečni Distribution Odstotek
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Prijavite se kot drugi uporabnik.
 DocType: Territory,Territory Targets,Territory cilji
 DocType: Delivery Note,Transporter Info,Transporter Info
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},"Prosim, nastavite privzeto {0} v družbi {1}"
@@ -3488,13 +3556,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Enako dobavitelj je bila vpisana večkrat
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Kosmati dobiček / izguba
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Nakup Sklep Postavka Priložena
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Ime podjetja ne more biti podjetje
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Ime podjetja ne more biti podjetje
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Letter Glave za tiskane predloge.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Naslovi za tiskane predloge, npr predračunu."
 DocType: Program Enrollment,Walking,Hoditi
 DocType: Student Guardian,Student Guardian,študent Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Stroški Tip vrednotenje ni mogoče označiti kot Inclusive
 DocType: POS Profile,Update Stock,Posodobi zalogo
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,v naročnini
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Drugačna UOM za artikle bo privedlo do napačne (skupno) Neto teža vrednosti. Prepričajte se, da je neto teža vsake postavke v istem UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,Journal Entry za pretep
@@ -3544,15 +3613,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Sistem uporabniku (login) ID. Če je nastavljeno, bo postala privzeta za vse oblike HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Od {1}
 DocType: Task,depends_on,odvisno od
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Vrstni red za posodobitev najnovejše cene v vseh gradivih. Traja lahko nekaj minut.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Vrstni red za posodobitev najnovejše cene v vseh gradivih. Traja lahko nekaj minut.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Ime novega računa. Opomba: Prosimo, da ne ustvarjajo računov za kupce in dobavitelje"
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Država pametno privzeti naslov Predloge
 DocType: Sales Order Item,Supplier delivers to Customer,Dobavitelj zagotavlja naročniku
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) ni na zalogi
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Zaradi / Referenčni datum ne more biti po {0}
+,Sales Payment Summary,Povzetek prodaje plačila
+DocType: Restaurant,Restaurant,Restavracija
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Zaradi / Referenčni datum ne more biti po {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Uvoz in izvoz podatkov
 DocType: Patient,Account Details,podrobnosti računa
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Najdeno študenti
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Najdeno študenti
 DocType: Medical Department,Medical Department,Medicinski oddelek
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Merila ocenjevanja rezultatov ocenjevanja dobavitelja
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Račun Napotitev Datum
@@ -3563,8 +3634,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Izberite datum objave pred izbiro stranko
 DocType: Program Enrollment,School House,šola House
 DocType: Serial No,Out of AMC,Od AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Izberite Citati
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Izberite Citati
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Izberite Citati
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Izberite Citati
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Število amortizacije naročene ne sme biti večja od skupnega št amortizacije
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Naredite Maintenance obisk
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,"Prosimo, obrnite se na uporabnika, ki imajo Sales Master Manager {0} vlogo"
@@ -3572,7 +3643,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Company (ne stranka ali dobavitelj) gospodar.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Ta temelji na prisotnosti tega Študent
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Ni Študenti
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Dodajte več predmetov ali odprto popolno obliko
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Dodajte več predmetov ali odprto popolno obliko
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dobavnic {0} je treba preklicati pred preklicem te Sales Order
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Pojdi na uporabnike
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Plačan znesek + odpis Znesek ne sme biti večja od Grand Skupaj
@@ -3592,37 +3663,40 @@
 DocType: Fee Schedule,Fee Schedule,Razpored Fee
 DocType: Hub Settings,Publish Availability,Objavite Razpoložljivost
 DocType: Company,Create Chart Of Accounts Based On,"Ustvariti kontni okvir, ki temelji na"
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Ne morete ga pretvoriti v ne-skupino. Otroške naloge obstajajo.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,"Datum rojstva ne more biti večji, od današnjega."
 ,Stock Ageing,Staranje zaloge
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Študent {0} obstaja proti študentskega prijavitelja {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Prilagajanje zaokroževanja (valuta podjetja)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Evidenca prisotnosti
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Evidenca prisotnosti
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} {1} &quot;je onemogočena
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nastavi kot Odpri
 DocType: Cheque Print Template,Scanned Cheque,skeniranih Ček
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Pošlji samodejne elektronske pošte v Contacts o posredovanju transakcij.
 DocType: Timesheet,Total Billable Amount,Skupaj Odgovorni Znesek
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Postavka 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Vnos naročila
 DocType: Purchase Order,Customer Contact Email,Customer Contact Email
 DocType: Warranty Claim,Item and Warranty Details,Točka in Garancija Podrobnosti
 DocType: Sales Team,Contribution (%),Prispevek (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Opomba: Začetek Plačilo se ne bodo ustvarili, saj &quot;gotovinski ali bančni račun&quot; ni bil podan"
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Projekt {0} že obstaja
 DocType: Medical Department,Nursing User,Uporabnik zdravstvene nege
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Odgovornosti
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Obdobje veljavnosti te ponudbe se je končalo.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Obdobje veljavnosti te ponudbe se je končalo.
 DocType: Expense Claim Account,Expense Claim Account,Expense Zahtevek računa
 DocType: Accounts Settings,Allow Stale Exchange Rates,Dovoli tečajne menjalne tečaje
 DocType: Sales Person,Sales Person Name,Prodaja Oseba Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Vnesite atleast 1 račun v tabeli
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Dodaj uporabnike
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Dodaj uporabnike
 DocType: POS Item Group,Item Group,Element Group
 DocType: Item,Safety Stock,Varnostna zaloga
 DocType: Healthcare Settings,Healthcare Settings,Nastavitve zdravstvenega varstva
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,"Napredek% za nalogo, ne more biti več kot 100."
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,"Napredek% za nalogo, ne more biti več kot 100."
 DocType: Stock Reconciliation Item,Before reconciliation,Pred uskladitvijo
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Za {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Davki in dajatve na dodano vrednost (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Postavka Davčna Row {0} morajo upoštevati vrste davka ali prihodek ali odhodek ali Obdavčljivi
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Postavka Davčna Row {0} morajo upoštevati vrste davka ali prihodek ali odhodek ali Obdavčljivi
 DocType: Sales Order,Partly Billed,Delno zaračunavajo
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Točka {0} mora biti osnovno sredstvo postavka
 DocType: Item,Default BOM,Privzeto BOM
@@ -3638,6 +3712,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,spremenljivka
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Od dobavnica
 DocType: Student,Student Email Address,Študent e-poštni naslov
+DocType: Item,Hub Warehouse,Hub skladišče
 DocType: Physician Schedule Time Slot,From Time,Od časa
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Na zalogi:
 DocType: Notification Control,Custom Message,Sporočilo po meri
@@ -3646,9 +3721,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,študent Naslov
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,študent Naslov
 DocType: Purchase Invoice,Price List Exchange Rate,Cenik Exchange Rate
+DocType: POS Profile,POS Profile Name,Ime profila profila POS
 DocType: Purchase Invoice Item,Rate,Vrednost
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,naslov Ime
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,naslov Ime
 DocType: Stock Entry,From BOM,Od BOM
 DocType: Assessment Code,Assessment Code,Koda ocena
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Osnovni
@@ -3662,11 +3738,12 @@
 DocType: Salary Slip,Salary Structure,Struktura Plače
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Airline
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Vprašanje Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Vprašanje Material
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Pri ustvarjanju ponavljajoče se napake
 DocType: Material Request Item,For Warehouse,Za Skladišče
 DocType: Employee,Offer Date,Ponudba Datum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Ponudbe
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,"Ste v načinu brez povezave. Ne boste mogli naložiti, dokler imate omrežje."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,"Ste v načinu brez povezave. Ne boste mogli naložiti, dokler imate omrežje."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,ustvaril nobene skupine študentov.
 DocType: Purchase Invoice Item,Serial No,Zaporedna številka
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Mesečni Povračilo Znesek ne sme biti večja od zneska kredita
@@ -3676,17 +3753,18 @@
 DocType: Salary Slip,Total Working Hours,Skupaj Delovni čas
 DocType: Subscription,Next Schedule Date,Naslednji datum načrta
 DocType: Stock Entry,Including items for sub assemblies,"Vključno s postavkami, za sklope"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Vnesite vrednost mora biti pozitivna
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Vse Territories
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Vnesite vrednost mora biti pozitivna
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Vse Territories
 DocType: Purchase Invoice,Items,Predmeti
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Študent je že vpisan.
 DocType: Fiscal Year,Year Name,Leto Name
 DocType: Process Payroll,Process Payroll,Proces na izplačane plače
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Obstaja več prazniki od delovnih dneh tega meseca.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Obstaja več prazniki od delovnih dneh tega meseca.
 DocType: Product Bundle Item,Product Bundle Item,Izdelek Bundle Postavka
 DocType: Sales Partner,Sales Partner Name,Prodaja Partner Name
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Zahteva za Citati
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Zahteva za Citati
 DocType: Payment Reconciliation,Maximum Invoice Amount,Največja Znesek računa
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hematologija
 DocType: Normal Test Items,Normal Test Items,Normalni preskusni elementi
 DocType: Student Language,Student Language,študent jezik
 apps/erpnext/erpnext/config/selling.py +23,Customers,Stranke
@@ -3698,10 +3776,11 @@
 DocType: Issue,Opening Time,Otvoritev čas
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Od in Do datumov zahtevanih
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vrednostnih papirjev in blagovne borze
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Privzeto mersko enoto za Variant &#39;{0}&#39; mora biti enaka kot v predlogo &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Privzeto mersko enoto za Variant &#39;{0}&#39; mora biti enaka kot v predlogo &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Izračun temelji na
 DocType: Delivery Note Item,From Warehouse,Iz skladišča
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Ni Postavke z Bill materialov za Izdelava
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Ni Postavke z Bill materialov za Izdelava
+DocType: Restaurant,Default Customer,Privzeta stranka
 DocType: Assessment Plan,Supervisor Name,Ime nadzornik
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Ne potrdite, če je sestanek ustvarjen za isti dan"
 DocType: Program Enrollment Course,Program Enrollment Course,Program Vpis tečaj
@@ -3729,7 +3808,7 @@
 DocType: Payment Entry,Internal Transfer,Interni prenos
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,"Otrok račun obstaja za ta račun. Ne, ne moreš izbrisati ta račun."
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Bodisi ciljna kol ali ciljna vrednost je obvezna
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Ne obstaja privzeta BOM za postavko {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Ne obstaja privzeta BOM za postavko {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,"Prosimo, izberite datumom knjiženja najprej"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Pričetek mora biti pred Zapiranje Datum
 DocType: Leave Control Panel,Carry Forward,Carry Forward
@@ -3765,6 +3844,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Skupaj Present
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,računovodski izkazi
 DocType: Drug Prescription,Hour,Ura
+DocType: Restaurant Order Entry,Last Sales Invoice,Zadnji račun za prodajo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nova serijska številka ne more imeti skladišče. Skladišče mora nastaviti borze vstopu ali Potrdilo o nakupu
 DocType: Lead,Lead Type,Tip ponudbe
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Niste pooblaščeni za odobritev liste na Block termini
@@ -3801,64 +3881,66 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Ustvari uporabnike
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,gram
 DocType: Supplier Scorecard,Per Month,Na mesec
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Količina na Izdelava mora biti večja od 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Količina na Izdelava mora biti večja od 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Obiščite poročilo za vzdrževalna klic.
 DocType: Stock Entry,Update Rate and Availability,Posodobitev Oceni in razpoložljivost
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Odstotek ste dovoljeno prejemati ali dostaviti bolj proti količine naročenega. Na primer: Če ste naročili 100 enot. in vaš dodatek za 10%, potem ste lahko prejeli 110 enot."
 DocType: POS Customer Group,Customer Group,Skupina za stranke
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Nova Serija ID (po želji)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Nova Serija ID (po želji)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Expense račun je obvezna za postavko {0}
 DocType: BOM,Website Description,Spletna stran Opis
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Neto sprememba v kapitalu
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Najnovejši
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Prosim za prekinitev računu o nakupu {0} najprej
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-poštni naslov mora biti edinstven, že obstaja za {0}"
 DocType: Serial No,AMC Expiry Date,AMC preteka Datum
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,prejem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,prejem
 ,Sales Register,Prodaja Register
 DocType: Daily Work Summary Settings Company,Send Emails At,Pošlji e-pošte na
 DocType: Quotation,Quotation Lost Reason,Kotacija Lost Razlog
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Izberite svojo domeno
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',"izberi * iz tabAntent, kjer ime = &#39;{0}&#39;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Referenčna transakcija ni {0} dne {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Referenčna transakcija ni {0} dne {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nič ni za urejanje.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Pogled obrazca
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Povzetek za ta mesec in v teku dejavnosti
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Pogled obrazca
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Povzetek za ta mesec in v teku dejavnosti
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Dodajte uporabnike v svojo organizacijo, razen sebe."
 DocType: Customer Group,Customer Group Name,Skupina Ime stranke
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Ni še nobene stranke!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Ni še nobene stranke!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Izkaz denarnih tokov
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kredita vrednosti ne sme preseči najvišji možen kredit znesku {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,licenca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},"Prosimo, odstranite tej fakturi {0} od C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},"Prosimo, odstranite tej fakturi {0} od C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Prosimo, izberite Carry Forward, če želite vključiti tudi v preteklem poslovnem letu je bilanca prepušča tem fiskalnem letu"
 DocType: GL Entry,Against Voucher Type,Proti bon Type
 DocType: Physician,Phone (R),Telefon (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Dodane so časovne reže
 DocType: Item,Attributes,Atributi
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Omogoči predlogo
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Prosimo, nastavite imena serije za {0} prek Setup&gt; Settings&gt; Series Naming"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Vnesite račun za odpis
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Zadnja Datum naročila
 DocType: Patient,B Negative,B Negativno
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Račun {0} ne pripada podjetju {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Številke v vrstici {0} se ne ujema z dobavnice
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Številke v vrstici {0} se ne ujema z dobavnice
 DocType: Student,Guardian Details,Guardian Podrobnosti
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Udeležba za več zaposlenih
 DocType: Vehicle,Chassis No,podvozje ni
 DocType: Payment Request,Initiated,Začela
 DocType: Production Order,Planned Start Date,Načrtovani datum začetka
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Izberite BOM
 DocType: Serial No,Creation Document Type,Creation Document Type
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Končni datum mora biti večji od začetnega datuma
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Končni datum mora biti večji od začetnega datuma
 DocType: Leave Type,Is Encash,Je vnovči
 DocType: Leave Allocation,New Leaves Allocated,Nove Listi Dodeljena
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Podatki projekt pametno ni na voljo za ponudbo
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Končaj naprej
 DocType: Project,Expected End Date,Pričakovani datum zaključka
 DocType: Budget Account,Budget Amount,proračun Znesek
 DocType: Appraisal Template,Appraisal Template Title,Cenitev Predloga Naslov
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Od datuma {0} za zaposlenih {1} ne more biti pred povezuje Datum delavca {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Commercial
 DocType: Patient,Alcohol Current Use,Alkoholna trenutna uporaba
+DocType: Student Admission Program,Student Admission Program,Program sprejema študentov
 DocType: Payment Entry,Account Paid To,Račun Izplača
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent Item {0} ne sme biti Stock Postavka
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Vse izdelke ali storitve.
@@ -3867,30 +3949,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} proračuna za račun {1} proti {2} {3} je {4}. To bo presegel s {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Vrstica {0} # računa mora biti tipa &quot;osnovno sredstvo&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Out Kol
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Pravila za izračun zneska ladijskega za prodajo
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,in unchcked Onemogočeno v
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Serija je obvezna
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finančne storitve
 DocType: Student Sibling,Student ID,Student ID
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Vrste dejavnosti za Čas Dnevniki
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,E-pošta dobavitelja
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Vrste dejavnosti za Čas Dnevniki
 DocType: Tax Rule,Sales,Prodaja
 DocType: Stock Entry Detail,Basic Amount,Osnovni znesek
 DocType: Training Event,Exam,Izpit
 DocType: Complaint,Complaint,Pritožba
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Skladišče je potrebna za borzo postavki {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Skladišče je potrebna za borzo postavki {0}
 DocType: Leave Allocation,Unused leaves,Neizkoriščene listi
 DocType: Patient,Alcohol Past Use,Pretekla uporaba alkohola
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Država za zaračunavanje
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Prenos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Fetch eksplodiral BOM (vključno podsklopov)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Prenos
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Fetch eksplodiral BOM (vključno podsklopov)
 DocType: Authorization Rule,Applicable To (Employee),Ki se uporabljajo za (zaposlenih)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Datum zapadlosti je obvezno
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Datum zapadlosti je obvezno
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Prirastek za Attribute {0} ne more biti 0
 DocType: Journal Entry,Pay To / Recd From,Pay / Recd Od
 DocType: Naming Series,Setup Series,Nastavitve zaporedja
 DocType: Payment Reconciliation,To Invoice Date,Če želite Datum računa
 DocType: Supplier,Contact HTML,Kontakt HTML
 ,Inactive Customers,neaktivne stranke
+DocType: Student Admission Program,Maximum Age,Najvišja starost
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Odkupne Prejemki
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Kako Pricing pravilo se uporablja?
@@ -3909,6 +3993,7 @@
 DocType: GL Entry,Remarks,Opombe
 DocType: Payment Entry,Account Paid From,Račun se plača iz
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Oznaka
+DocType: Task,Parent Task,Naloga staršev
 DocType: Journal Entry,Write Off Based On,Odpisuje temelji na
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Naredite Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Tiskanje in Pisalne
@@ -3917,20 +4002,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Plača je že pripravljena za obdobje med {0} in {1}, Pusti obdobje uporabe ne more biti med tem časovnem obdobju."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Namestitev rekord Serial No.
 DocType: Guardian Interest,Guardian Interest,Guardian Obresti
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Nastavitev privzetih vrednosti za račune POS
 apps/erpnext/erpnext/config/hr.py +177,Training,usposabljanje
 DocType: Timesheet,Employee Detail,Podrobnosti zaposleni
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 E-ID
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 E-ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,"Naslednji datum za dan in ponovite na dnevih v mesecu, mora biti enaka"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,"Naslednji datum za dan in ponovite na dnevih v mesecu, mora biti enaka"
 DocType: Lab Prescription,Test Code,Testna koda
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Nastavitve za spletni strani
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ-ji niso dovoljeni za {0} zaradi postavke ocene rezultatov {1}
 DocType: Offer Letter,Awaiting Response,Čakanje na odgovor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Nad
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Skupni znesek {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Neveljaven atribut {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Skupni znesek {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Neveljaven atribut {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Omemba če nestandardni plača račun
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Enako postavka je bila vpisana večkrat. {Seznam}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',"Izberite ocenjevalne skupine, razen &quot;vseh skupin za presojo&quot;"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Vrstica {0}: Za postavko je potreben stroškovni center {1}
 DocType: Training Event Employee,Optional,Neobvezno
@@ -3953,13 +4038,15 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Stroški Center je obvezen za postavko {2}
 DocType: Vehicle,Policy No,Pravilnik št
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Dobili predmetov iz Bundle izdelkov
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Ker zaloga obstaja proti elementu {0}, ne morete omogočiti lastnosti variant"
 DocType: Asset,Straight Line,Ravna črta
 DocType: Project User,Project User,projekt Uporabnik
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Split
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Split
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Split
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Split
 DocType: GL Entry,Is Advance,Je Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Udeležba Od datuma in udeležba na Datum je obvezna
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,"Prosimo, vpišite &quot;Je v podizvajanje&quot;, kot DA ali NE"
+DocType: Item,Default Purchase Unit of Measure,Privzeta nabavna enota ukrepa
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Zadnje Sporočilo Datum
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Zadnje Sporočilo Datum
 DocType: Sales Team,Contact No.,Kontakt št.
@@ -3968,7 +4055,6 @@
 DocType: Production Order,Check if material transfer entry is not required,"Preverite, ali je vpis prenosa materiala ni potrebno"
 DocType: Production Order,Check if material transfer entry is not required,"Preverite, ali je vpis prenosa materiala ni potrebno"
 DocType: Program Enrollment Tool,Get Students From,Dobili študenti iz
-DocType: Hub Settings,Seller Country,Prodajalec Država
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Objavite elementov na spletni strani
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Skupina učenci v serijah
 DocType: Authorization Rule,Authorization Rule,Dovoljenje Pravilo
@@ -3978,8 +4064,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Prodajne Davki in dajatve predloge
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Skupaj (Credit)
 DocType: Repayment Schedule,Payment Date,Dan plačila
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nova Serija Kol
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nova Serija Kol
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Nova Serija Kol
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Nova Serija Kol
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Oblačila in dodatki
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,"Funkcije uteženih rezultatov ni bilo mogoče rešiti. Prepričajte se, da formula velja."
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Število reda
@@ -3997,6 +4083,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} ni mogoče predložiti, je že {2}"
 DocType: Tax Rule,Billing Country,Zaračunavanje Država
 DocType: Purchase Order Item,Expected Delivery Date,Pričakuje Dostava Datum
+DocType: Restaurant Order Entry,Restaurant Order Entry,Vnos naročila restavracij
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetnih in kreditnih ni enaka za {0} # {1}. Razlika je {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Zabava Stroški
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Naredite Zahteva material
@@ -4009,9 +4096,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Račun z obstoječim poslom ni mogoče izbrisati
 DocType: Vehicle,Last Carbon Check,Zadnja Carbon Check
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Pravni stroški
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Izberite količino na vrsti
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Izberite količino na vrsti
 DocType: Purchase Invoice,Posting Time,Ura vnosa
 DocType: Timesheet,% Amount Billed,% Zaračunani znesek
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Čas na imenovanje&quot; ni bil nastavljen za dr {0}. Dodajte ga v glavnega zdravnika.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefonske Stroški
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Označite to, če želite, da prisili uporabnika, da izberete vrsto pred shranjevanjem. Tam ne bo privzeto, če to preverite."
@@ -4022,6 +4110,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Customer Prihodki
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Potni stroški
 DocType: Maintenance Visit,Breakdown,Zlomiti se
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Dodajanje po meri naročenega polja v doctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Račun: {0} z valuti: ne more biti izbran {1}
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",Na podlagi najnovejšega razmerja cene / cene cenika / zadnje stopnje nakupa surovin samodejno posodobite stroške BOM prek načrtovalca.
 DocType: Bank Reconciliation Detail,Cheque Date,Ček Datum
@@ -4046,7 +4135,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Skupni znesek plačevanja (preko Čas Dnevniki)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Dobavitelj Id
 DocType: Payment Request,Payment Gateway Details,Plačilo Gateway Podrobnosti
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Količina mora biti večja od 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Količina mora biti večja od 0
 DocType: Journal Entry,Cash Entry,Cash Začetek
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Otroški vozlišča lahko ustvari samo na podlagi tipa vozlišča &quot;skupina&quot;
 DocType: Leave Application,Half Day Date,Polovica Dan Datum
@@ -4064,12 +4153,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Opomba: Točka {0} vpisana večkrat
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Vsi stiki.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Kratica podjetja
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Uporabnik {0} ne obstaja
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Uporabnik {0} ne obstaja
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Kratica
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Plačilo vnos že obstaja
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,"Ne authroized saj je {0}, presega meje"
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Plača predlogo gospodar.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Patologija
+DocType: Restaurant Order Entry,Restaurant Table,Restavracija Tabela
 DocType: Leave Type,Max Days Leave Allowed,Max dni dopusta Dovoljeno
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Nastavite Davčna pravilo za nakupovalno košarico
 DocType: Purchase Invoice,Taxes and Charges Added,Davki in dajatve Dodano
@@ -4081,10 +4172,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Ponudbe za interesente ali stranke.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Vloga Dovoljeno urediti zamrznjeno zalog
 ,Territory Target Variance Item Group-Wise,Ozemlje Ciljna Varianca Postavka Group-Wise
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Vse skupine strank
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Vse skupine strank
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Bilančni Mesečni
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obvezna. Mogoče je Menjalni zapis ni ustvarjen za {1} na {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Davčna Predloga je obvezna.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Davčna Predloga je obvezna.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Račun {0}: Matični račun {1} ne obstaja
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cenik Rate (družba Valuta)
 DocType: Products Settings,Products Settings,Nastavitve izdelki
@@ -4110,13 +4201,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Postavka Wise Davčna Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Kratica inštituta
 ,Item-wise Price List Rate,Element-pametno Cenik Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Dobavitelj za predračun
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Dobavitelj za predračun
 DocType: Quotation,In Words will be visible once you save the Quotation.,"V besedi bo viden, ko boste prihranili citata."
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Količina ({0}) ne more biti komponenta v vrstici {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Količina ({0}) ne more biti komponenta v vrstici {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Barcode {0} že uporabljajo v postavki {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Barcode {0} že uporabljajo v postavki {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Pravila za dodajanje stroškov dostave.
 DocType: Item,Opening Stock,Začetna zaloga
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Je potrebno kupca
@@ -4134,9 +4225,8 @@
 DocType: Customer,From Lead,Iz ponudbe
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Naročila sprosti za proizvodnjo.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Izberite poslovno leto ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,"POS Profil zahteva, da POS Entry"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,"POS Profil zahteva, da POS Entry"
 DocType: Program Enrollment Tool,Enroll Students,včlanite Študenti
-DocType: Hub Settings,Name Token,Ime Token
 DocType: Lab Test,Approved Date,Odobren datum
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardna Prodaja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Atleast eno skladišče je obvezna
@@ -4154,7 +4244,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Človeški viri
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Plačilo Sprava Plačilo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Davčni Sredstva
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Proizvodnja naročilo je {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Proizvodnja naročilo je {0}
 DocType: BOM Item,BOM No,BOM Ne
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} nima računa {1} ali že primerjali z drugimi kupon
@@ -4174,8 +4264,8 @@
 DocType: Currency Exchange,To Currency,Valutnemu
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,"Pustimo, da se naslednji uporabniki za odobritev dopusta Aplikacije za blok dni."
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Vrste Expense zahtevka.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},stopnjo za zapisu Prodajni {0} nižja kot njegovi {1}. Prodajni manj morajo vsebovati vsaj {2}
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},stopnjo za zapisu Prodajni {0} nižja kot njegovi {1}. Prodajni manj morajo vsebovati vsaj {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},stopnjo za zapisu Prodajni {0} nižja kot njegovi {1}. Prodajni manj morajo vsebovati vsaj {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},stopnjo za zapisu Prodajni {0} nižja kot njegovi {1}. Prodajni manj morajo vsebovati vsaj {2}
 DocType: Item,Taxes,Davki
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Plačana in ni podal
 DocType: Project,Default Cost Center,Privzet Stroškovni Center
@@ -4189,15 +4279,15 @@
 DocType: Employee Loan,Fully Disbursed,celoti izplačano
 DocType: Maintenance Visit,Customer Feedback,Customer Feedback
 DocType: Account,Expense,Expense
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Rezultat ne sme biti večja od najvišjo oceno
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Rezultat ne sme biti večja od najvišjo oceno
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Kupci in dobavitelji
 DocType: Item Attribute,From Range,Od Območje
 DocType: BOM,Set rate of sub-assembly item based on BOM,Nastavite količino predmeta sestavljanja na podlagi BOM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Skladenjska napaka v formuli ali stanje: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Skladenjska napaka v formuli ali stanje: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Daily Delo Povzetek Nastavitve Company
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,"Postavka {0} prezrta, ker ne gre za element parka"
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Predloži ta proizvodnja red za nadaljnjo predelavo.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Predloži ta proizvodnja red za nadaljnjo predelavo.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Da ne uporabljajo Cenovno pravilo v posameznem poslu, bi morali vsi, ki se uporabljajo pravila za oblikovanje cen so onemogočeni."
 DocType: Assessment Group,Parent Assessment Group,Skupina Ocena Parent
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Jobs
@@ -4214,12 +4304,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Nastavite Podjetje filtriranje prazno, če skupina Z je &quot;Podjetje&quot;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Napotitev datum ne more biti prihodnji datum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Vrstica # {0}: Serijska št {1} ne ujema z {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,za generiranje ponavljajočih se
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Casual Zapusti
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Lab Test UOM.
 DocType: Batch,Batch ID,Serija ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Opomba: {0}
 ,Delivery Note Trends,Dobavnica Trendi
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Povzetek Ta teden je
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Povzetek Ta teden je
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Na zalogi Količina
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Račun: {0} se lahko posodobi samo preko delniških poslov
 DocType: Student Group Creation Tool,Get Courses,Get Tečaji
@@ -4233,7 +4324,6 @@
 DocType: Purchase Order,To Bill,Billu
 DocType: Material Request,% Ordered,% Naročeno
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Za Študentske skupine temelji igrišče, bo tečaj se potrdi za vsakega študenta od vpisanih Tečaji v programu vpis."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Vnesite e-poštni naslov ločen z vejicami, se bo račun samodejno poslali na določen datum"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Akord
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Avg. Odkup tečaj
 DocType: Task,Actual Time (in Hours),Dejanski čas (v urah)
@@ -4247,7 +4337,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Postavka {0} ni setup za Serijska št. Kolona mora biti prazno
 DocType: Accounts Settings,Accounts Settings,Računi Nastavitve
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,odobri
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Ni zadetka
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Ni zadetka
 DocType: Customer,Sales Partner and Commission,Prodaja Partner in Komisija
 DocType: Employee Loan,Rate of Interest (%) / Year,Obrestna mera (%) / leto
 ,Project Quantity,projekt Količina
@@ -4259,55 +4349,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Črna
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Eksplozija Postavka
 DocType: Account,Auditor,Revizor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} postavke proizvedene
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} postavke proizvedene
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Nauči se več
 DocType: Cheque Print Template,Distance from top edge,Oddaljenost od zgornjega roba
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Cenik {0} je onemogočena ali pa ne obstaja
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Cenik {0} je onemogočena ali pa ne obstaja
 DocType: Purchase Invoice,Return,Return
 DocType: Production Order Operation,Production Order Operation,Proizvodnja naročite Delovanje
 DocType: Pricing Rule,Disable,Onemogoči
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,"Način plačila je potrebno, da bi plačilo"
 DocType: Project Task,Pending Review,Dokler Pregled
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Imenovanja in posvetovanja
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ni vpisan v Batch {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ni vpisan v Batch {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Sredstvo {0} ne more biti izločeni, saj je že {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense zahtevek (preko Expense zahtevka)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Odsoten
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Vrstica {0}: Valuta BOM # {1} mora biti enaka izbrani valuti {2}
 DocType: Journal Entry Account,Exchange Rate,Menjalni tečaj
 DocType: Patient,Additional information regarding the patient,Dodatne informacije o bolniku
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Naročilo {0} ni predloženo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Naročilo {0} ni predloženo
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Fee Component
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Fleet management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Dodaj artikle iz
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Fleet management
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Dodaj artikle iz
 DocType: Cheque Print Template,Regular,redno
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Skupaj weightage vseh ocenjevalnih meril mora biti 100%
-DocType: BOM,Last Purchase Rate,Zadnja Purchase Rate
+DocType: Purchase Order Item,Last Purchase Rate,Zadnja Purchase Rate
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Naloga ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Stock ne more obstajati za postavko {0}, saj ima variant"
 DocType: Lab Test,Mobile,Mobile
 ,Sales Person-wise Transaction Summary,Prodaja Oseba pametno Transakcijski Povzetek
 DocType: Training Event,Contact Number,Kontaktna številka
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Skladišče {0} ne obstaja
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registracija Za ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Skladišče {0} ne obstaja
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mesečni Distribucijski Odstotki
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Izbrana postavka ne more imeti Batch
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Stopnja Vrednotenje nismo našli v postavki {0}, ki mora opraviti vknjižbe besede {1} {2}. Če je element transakcijah kot element vzorca v {1}, se omenja, da v {1} Element tabeli. V nasprotnem primeru, ustvarite dohodni transakcijo zaloge za postavko ali omembe stopnji vrednotenja v evidenco Element, nato poskusite submiting / preklic ta vnos"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materialov podal proti tej dobavnici
+DocType: Training Event,Has Certificate,Ima potrdilo
 DocType: Project,Customer Details,Podrobnosti strank
 DocType: Employee,Reports to,Poročila
 ,Unpaid Expense Claim,Neplačana Expense zahtevek
 DocType: Payment Entry,Paid Amount,Znesek Plačila
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Raziščite prodajne cikle
 DocType: Assessment Plan,Supervisor,nadzornik
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,Na zalogi
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,Na zalogi
 ,Available Stock for Packing Items,Zaloga za embalirane izdelke
 DocType: Item Variant,Item Variant,Postavka Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Ocena Rezultat orodje
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Odpadno Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Predložene naročila ni mogoče izbrisati
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Predložene naročila ni mogoče izbrisati
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje na računu je že ""bremenitev"", ni dovoljeno nastaviti ""Stanje mora biti"" kot ""kredit"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Upravljanje kakovosti
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Točka {0} je bila onemogočena
@@ -4328,7 +4417,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Dovoli ničelni stopnji vrednotenja
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Dovoli ničelni stopnji vrednotenja
 DocType: Training Event Employee,Invited,povabljen
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Več aktivne strukture plač iskanja za zaposlenega {0} za datumoma
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Več aktivne strukture plač iskanja za zaposlenega {0} za datumoma
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Gateway račune.
 DocType: Employee,Employment Type,Vrsta zaposlovanje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Osnovna sredstva
@@ -4340,7 +4429,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Študent Email ID
 DocType: Employee,Notice (days),Obvestilo (dni)
 DocType: Tax Rule,Sales Tax Template,Sales Tax Predloga
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,"Izberite predmete, da shranite račun"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,"Izberite predmete, da shranite račun"
 DocType: Employee,Encashment Date,Vnovčevanje Datum
 DocType: Training Event,Internet,internet
 DocType: Special Test Template,Special Test Template,Posebna preskusna predloga
@@ -4350,7 +4439,7 @@
 DocType: Academic Term,Term Start Date,Izraz Datum začetka
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Štetje
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Štetje
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},V prilogi vam pošiljamo {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},V prilogi vam pošiljamo {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Banka Izjava ravnotežje kot na glavno knjigo
 DocType: Job Applicant,Applicant Name,Predlagatelj Ime
 DocType: Authorization Rule,Customer / Item Name,Stranka / Item Name
@@ -4370,7 +4459,7 @@
 DocType: Guardian,Guardian Of ,Guardian Of
 DocType: Grading Scale Interval,Threshold,prag
 DocType: BOM Update Tool,Current BOM,Trenutni BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Dodaj Serijska št
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Dodaj Serijska št
 DocType: Production Order Item,Available Qty at Source Warehouse,Na voljo Količina na Vir Warehouse
 apps/erpnext/erpnext/config/support.py +22,Warranty,garancija
 DocType: Purchase Invoice,Debit Note Issued,Opomin Izdano
@@ -4393,10 +4482,9 @@
 DocType: Account,Receivable,Terjatev
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Vrstica # {0}: ni dovoljeno spreminjati Dobavitelj kot Naročilo že obstaja
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Vloga, ki jo je dovoljeno vložiti transakcije, ki presegajo omejitve posojil zastavili."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Izberite artikel v Izdelava
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Master podatkov sinhronizacijo, lahko traja nekaj časa"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Izberite artikel v Izdelava
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Master podatkov sinhronizacijo, lahko traja nekaj časa"
 DocType: Item,Material Issue,Material Issue
-DocType: Hub Settings,Seller Description,Prodajalec Opis
 DocType: Employee Education,Qualification,Kvalifikacije
 DocType: Item Price,Item Price,Item Cena
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap &amp; Detergent
@@ -4404,7 +4492,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Od časa ne sme biti večja od do časa.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Naročeno
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Nadaljuj
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Nadaljuj
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Če je omogočeno, sistem ne bo posodobil polj različic iz predloge, ampak bo kopiral podatke iz spodaj omenjenih polj, pri čemer bo pripravil novo različico"
 DocType: Salary Detail,Component,Komponenta
 DocType: Assessment Criteria,Assessment Criteria Group,Skupina Merila ocenjevanja
 DocType: Healthcare Settings,Patient Name By,Ime bolnika z
@@ -4414,7 +4503,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Vnesite Odobritev vloge ali Potrditev uporabnika
 DocType: Journal Entry,Write Off Entry,Napišite Off Entry
 DocType: BOM,Rate Of Materials Based On,Oceni materialov na osnovi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dobavitelj&gt; Dobavitelj tip
+DocType: Item Variant Settings,Do not Update Variants,Ne posodobi variant
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Podpora Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Odznači vse
 DocType: POS Profile,Terms and Conditions,Pravila in pogoji
@@ -4423,7 +4512,7 @@
 DocType: Leave Block List,Applies to Company,Velja za podjetja
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,"Ni mogoče preklicati, ker je predložila Stock Začetek {0} obstaja"
 DocType: Employee Loan,Disbursement Date,izplačilo Datum
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&quot;Prejemniki&quot; niso navedeni
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&quot;Prejemniki&quot; niso navedeni
 DocType: BOM Update Tool,Update latest price in all BOMs,Posodobi najnovejšo ceno v vseh BOM
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Medicinski zapis
 DocType: Vehicle,Vehicle,vozila
@@ -4439,14 +4528,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,OPP / svinec%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Premoženjem amortizacije in Stanja
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Znesek {0} {1} je preselil iz {2} na {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Znesek {0} {1} je preselil iz {2} na {3}
 DocType: Sales Invoice,Get Advances Received,Get prejeti predujmi
 DocType: Email Digest,Add/Remove Recipients,Dodaj / Odstrani prejemnike
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Transakcija ni dovoljena zoper ustavili proizvodnjo naročite {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Če želite nastaviti to poslovno leto kot privzeto, kliknite na &quot;Set as Default&quot;"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,pridruži se
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,pridruži se
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Pomanjkanje Kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Obstaja postavka varianta {0} z enakimi atributi
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Obstaja postavka varianta {0} z enakimi atributi
 DocType: Employee Loan,Repay from Salary,Poplačilo iz Plača
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Zahteva plačilo pred {0} {1} za znesek {2}
@@ -4459,7 +4548,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Artikel naročila
 DocType: Salary Slip,Payment Days,Plačilni dnevi
 DocType: Patient,Dormant,mirujočih
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Skladišča z otrok vozlišča ni mogoče pretvoriti v knjigo terjatev
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Skladišča z otrok vozlišča ni mogoče pretvoriti v knjigo terjatev
 DocType: BOM,Manage cost of operations,Upravljati stroške poslovanja
 DocType: Accounts Settings,Stale Days,Stale dni
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Ko kateri koli od pregledanih transakcij &quot;Objavil&quot;, e-pop-up samodejno odpre, da pošljete e-pošto s pripadajočim &quot;stik&quot; v tem poslu, s poslom, kot prilogo. Uporabnik lahko ali pa ne pošljete e-pošto."
@@ -4473,10 +4562,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serijska št {0} je že prejela
 ,Requested Items To Be Transferred,Zahtevane blago prenaša
 DocType: Expense Claim,Vehicle Log,vozilo Log
-DocType: Purchase Invoice,Recurring Id,Ponavljajoči Id
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Prisotnost vročine (temp&gt; 38,5 ° C / 101,3 ° F ali trajne temp&gt; 38 ° C / 100,4 ° F)"
 DocType: Customer,Sales Team Details,Sales Team Podrobnosti
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Izbriši trajno?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Izbriši trajno?
 DocType: Expense Claim,Total Claimed Amount,Skupaj zahtevani znesek
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potencialne možnosti za prodajo.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Neveljavna {0}
@@ -4486,7 +4574,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Veleblagovnice
 ,Item Delivery Date,Datum dobave artikla
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Setup vaš šola v ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Setup vaš šola v ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Osnovna Sprememba Znesek (družba Valuta)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Ni vknjižbe za naslednjih skladiščih
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Shranite dokument na prvem mestu.
@@ -4498,13 +4586,12 @@
 DocType: Task,Is Milestone,je Milestone
 DocType: Daily Work Summary,Email Sent To,E-pošta poslana
 DocType: Budget,Warn,Opozori
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,"Ali ste prepričani, da se želite odjaviti?"
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Kakršne koli druge pripombe, omembe vredna napora, da bi moral iti v evidencah."
 DocType: BOM,Manufacturing User,Proizvodnja Uporabnik
 DocType: Purchase Invoice,Raw Materials Supplied,"Surovin, dobavljenih"
-DocType: Purchase Invoice,Recurring Print Format,Ponavljajoči Print Format
 DocType: C-Form,Series,Zaporedje
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Valuta cenika {0} mora biti {1} ali {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Dodaj izdelke
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Valuta cenika {0} mora biti {1} ali {2}
 DocType: Appraisal,Appraisal Template,Cenitev Predloga
 DocType: Item Group,Item Classification,Postavka Razvrstitev
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Business Development Manager
@@ -4518,7 +4605,7 @@
 DocType: Item Attribute Value,Attribute Value,Vrednosti atributa
 ,Itemwise Recommended Reorder Level,Itemwise Priporočena Preureditev Raven
 DocType: Salary Detail,Salary Detail,plača Podrobnosti
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,"Prosimo, izberite {0} najprej"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,"Prosimo, izberite {0} najprej"
 DocType: Appointment Type,Physician,Zdravnik
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Serija {0} od Postavka {1} je potekla.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Posvetovanja
@@ -4529,7 +4616,7 @@
 DocType: Salary Detail,Default Amount,Privzeti znesek
 DocType: Lab Test Template,Descriptive,Opisno
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Skladišče ni mogoče najti v sistemu
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Povzetek tega meseca je
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Povzetek tega meseca je
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kakovost Inšpekcijski Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Zamrzni zaloge starejše od` mora biti manjša od %d dni.
 DocType: Tax Rule,Purchase Tax Template,Nakup Davčna Template
@@ -4552,12 +4639,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Usposabljanje Dogodki / Rezultati
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,"Nabrano amortizacijo, na"
 DocType: Sales Invoice,C-Form Applicable,"C-obliki, ki velja"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},"Delovanje Čas mora biti večja od 0, za obratovanje {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},"Delovanje Čas mora biti večja od 0, za obratovanje {0}"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Skladišče je obvezna
 DocType: Supplier,Address and Contacts,Naslov in kontakti
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Conversion Detail
 DocType: Program,Program Abbreviation,Kratica programa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Proizvodnja naročilo ne more biti postavljeno pred Predloga Postavka
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Proizvodnja naročilo ne more biti postavljeno pred Predloga Postavka
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Dajatve so posodobljeni v Potrdilo o nakupu ob vsaki postavki
 DocType: Warranty Claim,Resolved By,Rešujejo s
 DocType: Bank Guarantee,Start Date,Datum začetka
@@ -4583,27 +4670,28 @@
 DocType: Employee,Educational Qualification,Izobraževalni Kvalifikacije
 DocType: Workstation,Operating Costs,Obratovalni stroški
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Ukrep, če skupna mesečna Proračun Prekoračitev"
-DocType: Purchase Invoice,Submit on creation,Predloži na ustvarjanje
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Valuta za {0} mora biti {1}
+DocType: Subscription,Submit on creation,Predloži na ustvarjanje
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Valuta za {0} mora biti {1}
 DocType: Asset,Disposal Date,odstranjevanje Datum
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-pošta bo poslana vsem aktivnih zaposlenih v družbi na določeni uri, če nimajo počitnic. Povzetek odgovorov bo poslano ob polnoči."
 DocType: Employee Leave Approver,Employee Leave Approver,Zaposleni Leave odobritelj
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Vrstica {0}: Vpis Preureditev že obstaja za to skladišče {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Ne more razglasiti kot izgubljena, ker je bil predračun postavil."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Predlogi za usposabljanje
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Vrstica {0}: Vpis Preureditev že obstaja za to skladišče {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Ne more razglasiti kot izgubljena, ker je bil predračun postavil."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Predlogi za usposabljanje
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Proizvodnja naročite {0} je treba predložiti
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Merila ocenjevalnih meril za dobavitelje
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},"Prosimo, izberite Start in končni datum za postavko {0}"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Seveda je obvezna v vrsti {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Do danes ne more biti pred od datuma
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Dodaj / Uredi Cene
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Dodaj / Uredi Cene
 DocType: Batch,Parent Batch,nadrejena Serija
 DocType: Batch,Parent Batch,nadrejena Serija
 DocType: Cheque Print Template,Cheque Print Template,Ček Print Predloga
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Grafikon stroškovnih mest
 DocType: Lab Test Template,Sample Collection,Zbiranje vzorcev
 ,Requested Items To Be Ordered,Zahtevane Postavke naloži
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Moja naročila
 DocType: Price List,Price List Name,Cenik Ime
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Dnevni Delo Povzetek za {0}
 DocType: Employee Loan,Totals,Pri zaokrožanju
@@ -4622,12 +4710,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} enote {1} potrebno {2} na {3} {4} za {5} za dokončanje te transakcije.
 DocType: Fee Schedule,Student Category,študent kategorije
 DocType: Announcement,Student,študent
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,"Organizacijska enota (oddelek), master."
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,"Organizacijska enota (oddelek), master."
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Pojdi v sobe
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Vnesite sporočilo pred pošiljanjem
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,DVOJNIK dobavitelja
 DocType: Email Digest,Pending Quotations,Dokler Citati
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Point-of-Sale profila
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Point-of-Sale profila
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Konfiguracije laboratorijskih testov.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Nezavarovana posojila
 DocType: Cost Center,Cost Center Name,Stalo Ime Center
@@ -4637,6 +4725,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Total Paid Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,"Sporočila večji od 160 znakov, bo razdeljeno v več sporočilih"
 DocType: Purchase Receipt Item,Received and Accepted,Prejme in potrdi
+DocType: Hub Settings,Company and Seller Profile,Profil podjetja in prodajalca
 ,GST Itemised Sales Register,DDV Razčlenjeni prodaje Registracija
 ,Serial No Service Contract Expiry,Zaporedna številka Service Contract preteka
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,"Ne, ne moreš kreditnih in debetnih isti račun ob istem času"
@@ -4646,10 +4735,11 @@
 DocType: Item,Variant Based On,"Varianta, ki temelji na"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Skupaj weightage dodeljena mora biti 100%. To je {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Vaše Dobavitelji
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Prosim popravite
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,"Ni mogoče nastaviti kot izgubili, kot je narejena Sales Order."
 DocType: Request for Quotation Item,Supplier Part No,Šifra dela dobavitelj
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"ne more odbiti, če je kategorija za &quot;vrednotenje&quot; ali &quot;Vaulation in Total&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Prejela od
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Prejela od
 DocType: Lead,Converted,Pretvorjena
 DocType: Item,Has Serial No,Ima Serijska št
 DocType: Employee,Date of Issue,Datum izdaje
@@ -4657,7 +4747,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Kot je na Nastavitve Nakup če Nakup Reciept Zahtevano == &quot;DA&quot;, nato pa za ustvarjanje računu o nakupu, uporabnik potreba ustvariti Nakup listek najprej za postavko {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Vrstica # {0}: Nastavite Dobavitelj za postavko {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Vrstica {0}: Ure vrednost mora biti večja od nič.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Spletna stran slike {0} pritrjena na postavki {1} ni mogoče najti
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Spletna stran slike {0} pritrjena na postavki {1} ni mogoče najti
 DocType: Issue,Content Type,Vrsta vsebine
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Računalnik
 DocType: Item,List this Item in multiple groups on the website.,Seznam ta postavka v več skupinah na spletni strani.
@@ -4668,14 +4758,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Pridobite neusklajene vnose
 DocType: Payment Reconciliation,From Invoice Date,Od Datum računa
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Nimate dovoljenja za predložitev
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,valuta za zaračunavanje mora biti enaka bodisi privzeti comapany v valuti ali stranka računa valuto
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,valuta za zaračunavanje mora biti enaka bodisi privzeti comapany v valuti ali stranka računa valuto
 DocType: Healthcare Settings,Laboratory Settings,Laboratorijske nastavitve
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,pustite Vnovčevanje
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Kaj to naredi?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Za skladišča
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Vse Študentski Sprejemi
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Kaj to naredi?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Za skladišča
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Vse Študentski Sprejemi
 ,Average Commission Rate,Povprečen Komisija Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Ima Serial ne&quot; ne more biti &#39;Da&#39; za ne-parka postavko
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Ima Serial ne&quot; ne more biti &#39;Da&#39; za ne-parka postavko
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Izberite Stanje
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Udeležba ni mogoče označiti za prihodnje datume
 DocType: Pricing Rule,Pricing Rule Help,Cen Pravilo Pomoč
@@ -4693,41 +4783,41 @@
 DocType: Item,Customer Code,Koda za stranke
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},"Opomnik za rojstni dan, za {0}"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dni od zadnjega naročila
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Bremenitev računa mora biti bilanca računa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Bremenitev računa mora biti bilanca računa
 DocType: Buying Settings,Naming Series,Poimenovanje zaporedja
 DocType: Leave Block List,Leave Block List Name,Pustite Ime Block List
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Datum zavarovanje Začetek sme biti manjša od datuma zavarovanje End
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,"Prosimo, nastavite sistem imenovanja inštruktorja v šoli&gt; Nastavitve šole"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Zaloga Sredstva
 DocType: Timesheet,Production Detail,proizvodnja Podrobnosti
+DocType: Restaurant,Active Menu,Aktivni meni
 DocType: Target Detail,Target Qty,Ciljna Kol
 DocType: Shopping Cart Settings,Checkout Settings,Naročilo Nastavitve
 DocType: Attendance,Present,Present
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Dobavnica {0} ni treba predložiti
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Dobavnica {0} ni treba predložiti
 DocType: Notification Control,Sales Invoice Message,Prodaja Račun Sporočilo
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Zapiranje račun {0} mora biti tipa odgovornosti / kapital
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Plača Slip delavca {0} že ustvarili za časa stanja {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Plača Slip delavca {0} že ustvarili za časa stanja {1}
 DocType: Vehicle Log,Odometer,števec kilometrov
 DocType: Sales Order Item,Ordered Qty,Naročeno Kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Postavka {0} je onemogočena
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Postavka {0} je onemogočena
 DocType: Stock Settings,Stock Frozen Upto,Stock Zamrznjena Stanuje
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM ne vsebuje nobenega elementa zaloge
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Projektna dejavnost / naloga.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM ne vsebuje nobenega elementa zaloge
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Projektna dejavnost / naloga.
 DocType: Vehicle Log,Refuelling Details,Oskrba z gorivom Podrobnosti
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Ustvarjajo plače kombineže
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Odkup je treba preveriti, če se uporablja za izbrana kot {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,"Popust, mora biti manj kot 100"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Zadnja stopnja nakup ni bilo mogoče najti
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Napišite enkratni znesek (družba Valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,zaračunavanje storitev ure
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,Privzeti BOM za {0} ni bilo mogoče najti
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Vrstica # {0}: Prosim nastavite naročniško količino
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Privzeti BOM za {0} ni bilo mogoče najti
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Vrstica # {0}: Prosim nastavite naročniško količino
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,"Dotaknite predmete, da jih dodate tukaj"
 DocType: Fees,Program Enrollment,Program Vpis
 DocType: Landed Cost Voucher,Landed Cost Voucher,Pristali Stroški bon
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Prosim, nastavite {0}"
-DocType: Purchase Invoice,Repeat on Day of Month,Ponovite na dan Meseca
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} neaktiven študent
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} neaktiven študent
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} neaktiven študent
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} neaktiven študent
 DocType: Employee,Health Details,Zdravje Podrobnosti
 DocType: Offer Letter,Offer Letter Terms,Pisna ponudba pogoji
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Če želite ustvariti zahtevek za plačilo je potrebno referenčni dokument
@@ -4736,7 +4826,6 @@
 DocType: Employee External Work History,Salary,Plača
 DocType: Serial No,Delivery Document Type,Dostava Document Type
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Predložiti vse plačilne liste za zgoraj izbranih kriterijih
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Sinhronizirane postavke
 DocType: Sales Order,Partly Delivered,Delno Delivered
 DocType: Email Digest,Receivables,Terjatve
 DocType: Lead Source,Lead Source,Vir ponudbe
@@ -4757,9 +4846,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Staranje Razpon 2
 DocType: SG Creation Tool Course,Max Strength,Max moč
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM nadomesti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Izberite elemente glede na datum dostave
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Izberite elemente glede na datum dostave
 ,Sales Analytics,Prodajna analitika
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Na voljo {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Na voljo {0}
 ,Prospects Engaged But Not Converted,Obeti Ukvarjajo pa ne pretvorijo
 ,Prospects Engaged But Not Converted,Obeti Ukvarjajo pa ne pretvorijo
 DocType: Manufacturing Settings,Manufacturing Settings,Proizvodne Nastavitve
@@ -4767,10 +4856,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Mobile No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Vnesite privzeto valuto v podjetju Master
 DocType: Stock Entry Detail,Stock Entry Detail,Stock Začetek Detail
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Dnevni opomniki
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Dnevni opomniki
 DocType: Products Settings,Home Page is Products,Domača stran je izdelki
 ,Asset Depreciation Ledger,Sredstvo Amortizacija Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Davčna Pravilo Konflikti z {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Davčna Pravilo Konflikti z {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Novo ime računa
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,"Surovin, dobavljenih Stroški"
 DocType: Selling Settings,Settings for Selling Module,Nastavitve za modul Prodaja
@@ -4784,8 +4873,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Postavka {0} mora biti stock postavka
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Privzeto Delo v skladišču napredku
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Privzete nastavitve za računovodske posle.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosimo, nastavite sistem imenovanja zaposlenih v kadri&gt; HR Settings"
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Pričakovani datum ne more biti pred Material Request Datum
+DocType: Restaurant,Default Tax Template,Privzeta davčna predloga
 DocType: Fees,Student Details,Podrobnosti študenta
 DocType: Purchase Invoice Item,Stock Qty,Stock Kol
 DocType: Purchase Invoice Item,Stock Qty,Stock Kol
@@ -4804,8 +4894,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Pojdi na elemente
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Actual
+DocType: Restaurant Menu,Restaurant Manager,Upravitelj restavracij
 DocType: Authorization Rule,Customerwise Discount,Customerwise Popust
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Timesheet za naloge.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Timesheet za naloge.
 DocType: Purchase Invoice,Against Expense Account,Proti Expense račun
 DocType: Production Order,Production Order,Proizvodnja naročilo
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Je že bil predložen Namestitev Opomba {0}
@@ -4813,7 +4904,6 @@
 DocType: Quotation Item,Against Docname,Proti Docname
 DocType: SMS Center,All Employee (Active),Vsi zaposlenih (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Oglejte si zdaj
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Izberite obdobje, ko bo račun samodejno ustvari"
 DocType: BOM,Raw Material Cost,Raw Material Stroški
 DocType: Item Reorder,Re-Order Level,Ponovno naročila ravni
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Vnesite predmete in načrtovano kol, za katere želite, da dvig proizvodnih nalogov ali prenos surovin za analizo."
@@ -4826,24 +4916,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Vrsta poročila je obvezna
 DocType: Item,Serial Number Series,Serijska številka zaporedja
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Skladišče je obvezna za borzo postavki {0} v vrstici {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Dodaj programe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Trgovina na drobno in na debelo
 DocType: Issue,First Responded On,Najprej odgovorila
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Uvrstitev točke v več skupinah
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiskalna Leto Start Date in fiskalno leto End Date so že določeni v proračunskem letu {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Potrditev Datum posodobljeni
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Serija
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Serija
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split Serija
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split Serija
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Uspešno usklajeno
 DocType: Request for Quotation Supplier,Download PDF,Prenos PDF
 DocType: Production Order,Planned End Date,Načrtovan End Date
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,"Prosimo, vnesite datum razporeditve"
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Če so predmeti shranjeni.
 DocType: Request for Quotation,Supplier Detail,Dobavitelj Podrobnosti
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Napaka v formuli ali stanja: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Napaka v formuli ali stanja: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Obračunani znesek
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Uteži meril morajo biti do 100%
 DocType: Attendance,Attendance,Udeležba
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,zalogi
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,zalogi
 DocType: BOM,Materials,Materiali
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Če ni izbrana, bo seznam je treba dodati, da vsak oddelek, kjer je treba uporabiti."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Vir in Target skladišča ne more biti enaka
@@ -4861,6 +4951,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,On Net Total
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Vrednost atributa {0} mora biti v razponu od {1} do {2} v korakih po {3} za postavko {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Ciljna skladišče v vrstici {0} mora biti enaka kot Production reda
+DocType: Restaurant Reservation,Waitlisted,Waitlisted
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,"Valuta ni mogoče spremeniti, potem ko vnose uporabljate kakšno drugo valuto"
 DocType: Vehicle Service,Clutch Plate,sklopka Plate
 DocType: Company,Round Off Account,Zaokrožijo račun
@@ -4877,7 +4968,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Ime New Sales oseba
 DocType: Packing Slip,Gross Weight UOM,Bruto Teža UOM
 DocType: Delivery Note Item,Against Sales Invoice,Za račun
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Vnesite serijske številke za serialized postavko
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Vnesite serijske številke za serialized postavko
 DocType: Bin,Reserved Qty for Production,Rezervirano Količina za proizvodnjo
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Pustite neoznačeno, če ne želite, da razmisli serije, hkrati pa seveda temelji skupin."
 DocType: Asset,Frequency of Depreciation (Months),Pogostost amortizacijo (meseci)
@@ -4888,7 +4979,7 @@
 DocType: Lab Test,Test Group,Testna skupina
 DocType: Payment Reconciliation,Receivable / Payable Account,Terjatve / plačljivo račun
 DocType: Delivery Note Item,Against Sales Order Item,Proti Sales Order Postavka
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},"Prosimo, navedite Lastnost vrednost za atribut {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},"Prosimo, navedite Lastnost vrednost za atribut {0}"
 DocType: Item,Default Warehouse,Privzeto Skladišče
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Proračun ne more biti dodeljena pred Group račun {0}
 DocType: Healthcare Settings,Patient Registration,Registracija pacientov
@@ -4918,6 +5009,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Prodaja oseba
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Proračun in Center Stroški
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Večkratni način plačila ni dovoljen
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,za
 ,Appointment Analytics,Imenovanje Analytics
 DocType: Vehicle Service,Half Yearly,Polletne
 DocType: Lead,Blog Subscriber,Blog Subscriber
@@ -4936,7 +5028,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,quot Štetje
 ,BOM Stock Report,BOM Stock Poročilo
 DocType: Stock Reconciliation Item,Quantity Difference,količina Razlika
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Predelava na izplačane plače
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Predelava na izplačane plače
 DocType: Opportunity Item,Basic Rate,Osnovni tečaj
 DocType: GL Entry,Credit Amount,Credit Znesek
 DocType: Cheque Print Template,Signatory Position,podpisnik Položaj
@@ -4950,12 +5042,12 @@
 DocType: Tax Rule,Tax Rule,Davčna Pravilo
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Ohraniti ista stopnja V celotnem ciklu prodaje
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Načrtujte čas dnevnike zunaj Workstation delovnih ur.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Stranke v vrsti
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} nima urnika zdravnika. Dodajte ga v glavnega zdravnika
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Stranke v vrsti
 DocType: Student,Nationality,državljanstvo
 ,Items To Be Requested,"Predmeti, ki bodo zahtevana"
-DocType: Purchase Order,Get Last Purchase Rate,Get zadnjega nakupa Rate
 DocType: Company,Company Info,Informacije o podjetju
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Izberite ali dodati novo stranko
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Izberite ali dodati novo stranko
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Stroškovno mesto je potrebno rezervirati odhodek zahtevek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Uporaba sredstev (sredstva)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ta temelji na prisotnosti tega zaposlenega
@@ -4963,6 +5055,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Debetni račun
 DocType: Fiscal Year,Year Start Date,Leto Start Date
 DocType: Attendance,Employee Name,ime zaposlenega
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Vnos naročila restavracije
 DocType: Sales Invoice,Rounded Total (Company Currency),Zaokrožena Skupaj (Company Valuta)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Ne more prikrite skupini, saj je izbrana vrsta računa."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} je bila spremenjena. Osvežite.
@@ -4973,6 +5066,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Zaslužki zaposlencev
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Pakirana količina mora biti enaka količini za postavko {0} v vrstici {1}
 DocType: Production Order,Manufactured Qty,Izdelano Kol
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Račun ustvarjen
 DocType: Purchase Receipt Item,Accepted Quantity,Accepted Količina
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Nastavite privzeto Hiša List za zaposlenega {0} ali podjetja {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} ne obstaja
@@ -4982,18 +5076,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Vrstica št {0}: količina ne more biti večja od Dokler Znesek proti Expense zahtevka {1}. Dokler Znesek je {2}
 DocType: Maintenance Schedule,Schedule,Urnik
 DocType: Account,Parent Account,Matični račun
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Na voljo
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Na voljo
 DocType: Quality Inspection Reading,Reading 3,Branje 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Bon Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Cenik ni mogoče najti ali onemogočena
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Cenik ni mogoče najti ali onemogočena
 DocType: Lab Test,Approved,Odobreno
 DocType: Pricing Rule,Price,Cena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',Zaposleni razrešen na {0} mora biti nastavljen kot &quot;levo&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Zaposleni razrešen na {0} mora biti nastavljen kot &quot;levo&quot;
+DocType: Hub Settings,Last Sync On,Zadnja sinhronizacija je vključena
 DocType: Guardian,Guardian,Guardian
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Cenitev {0} ustvarjena za Employee {1} v določenem časovnem obdobju
 DocType: Employee,Education,Izobraževanje
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,del
 DocType: Selling Settings,Campaign Naming By,Imenovanje akcija Z
 DocType: Employee,Current Address Is,Trenutni Naslov je
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Mesečna prodajna tarča (
@@ -5008,7 +5103,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Šifra predmeta:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Vnesite Expense račun
 DocType: Account,Stock,Zaloga
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Vrsta dokumenta mora biti eden od narocilo, Nakup računa ali Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Vrsta dokumenta mora biti eden od narocilo, Nakup računa ali Journal Entry"
 DocType: Employee,Current Address,Trenutni naslov
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Če postavka je varianta drug element, potem opis, slike, cene, davki, itd bo določil iz predloge, razen če je izrecno določeno"
 DocType: Serial No,Purchase / Manufacture Details,Nakup / Izdelava Podrobnosti
@@ -5039,7 +5134,7 @@
 DocType: Hub Settings,Hub Settings,Nastavitve Hub
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,Pri poslovanju
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Vknjižbe so že bili sprejeti v valuti {0} za družbo {1}. Izberite terjatve ali obveznosti račun z valuto {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Vknjižbe so že bili sprejeti v valuti {0} za družbo {1}. Izberite terjatve ali obveznosti račun z valuto {0}.
 DocType: Asset,Is Existing Asset,Je obstoječemu sredstvu
 DocType: Salary Detail,Statistical Component,Statistični Komponenta
 DocType: Salary Detail,Statistical Component,Statistični Komponenta
@@ -5048,13 +5143,14 @@
 DocType: BOM Operation,BOM Operation,BOM Delovanje
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Na prejšnje vrstice Znesek
 DocType: Student,Home Address,Domači naslov
+DocType: Item,Has Expiry Date,Ima rok veljavnosti
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Nastavitve različice postavke.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,prenos sredstev
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,prenos sredstev
 DocType: POS Profile,POS Profile,POS profila
 DocType: Training Event,Event Name,Ime dogodka
 DocType: Physician,Phone (Office),Telefon (Office)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,sprejem
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Vstopnine za {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,sprejem
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Vstopnine za {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Sezonskost za nastavitev proračunov, cilji itd"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Ime spremenljivke
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Postavka {0} je predlogo, izberite eno od njenih različic"
@@ -5063,7 +5159,7 @@
 DocType: Assessment Plan,Room,soba
 DocType: Purchase Order,Advance Paid,Advance Paid
 DocType: Item,Item Tax,Postavka Tax
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Material za dobavitelja
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Material za dobavitelja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Trošarina Račun
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Praga {0}% pojavi več kot enkrat
 DocType: Expense Claim,Employees Email Id,Zaposleni Email Id
@@ -5074,32 +5170,30 @@
 DocType: Program,Program Name,Ime programa
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Razmislite davek ali dajatev za
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Dejanska Količina je obvezna
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} ima trenutno {1} oceno za ocenjevalce dobaviteljev in naročila za naročila temu dobavitelju je treba previdno izdati.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} ima trenutno {1} oceno za ocenjevalce dobaviteljev in naročila za naročila temu dobavitelju je treba previdno izdati.
 DocType: Employee Loan,Loan Type,posojilo Vrsta
 DocType: Scheduling Tool,Scheduling Tool,razporejanje orodje
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Credit Card
 DocType: BOM,Item to be manufactured or repacked,"Postavka, ki se proizvaja ali prepakirana"
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Privzete nastavitve za transakcije vrednostnih papirjev.
-DocType: Purchase Invoice,Next Date,Naslednja Datum
 DocType: Employee Education,Major/Optional Subjects,Major / Izbirni predmeti
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
+DocType: Hub Settings,Suspended,Suspendirano
 DocType: Training Event,Attendees,udeleženci
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Tukaj lahko vzdržujejo družinske podrobnosti, kot so ime in poklic staršev, zakonca in otrok"
 DocType: Academic Term,Term End Date,Izraz Končni datum
-DocType: Hub Settings,Seller Name,Prodajalec Name
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Davki in dajatve Odbitek (družba Valuta)
 DocType: Item Group,General Settings,Splošne nastavitve
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Od denarja in denarja ne more biti enaka
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Dodajanje inštruktorjev
 DocType: Stock Entry,Repack,Zapakirajte
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,"Morate Shranite obrazec, preden nadaljujete"
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Najprej izberite podjetje
 DocType: Item Attribute,Numeric Values,Numerične vrednosti
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Priložite Logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Zaloga Ravni
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Zaloga Ravni
 DocType: Customer,Commission Rate,Komisija Rate
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Ustvarjene {0} kazalnike za {1} med:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Naredite Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Naredite Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Aplikacije blok dopustu oddelka.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Plačilo Tip mora biti eden od Prejemanje, plačati in notranji prenos"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -5114,11 +5208,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Osnovni kapital
 DocType: Shopping Cart Settings,Show Public Attachments,Prikaži Javna Priključki
 DocType: Packing Slip,Package Weight Details,Paket Teža Podrobnosti
+DocType: Restaurant Reservation,Reservation Time,Čas rezervacije
 DocType: Payment Gateway Account,Payment Gateway Account,Plačilo Gateway račun
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Po zaključku plačila preusmeri uporabnika na izbrano stran.
 DocType: Company,Existing Company,obstoječa podjetja
 DocType: Healthcare Settings,Result Emailed,Rezultati so poslani
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","Davčna kategorija se je spremenila v &quot;Skupaj&quot;, ker so vsi artikli, ki niso zalogi"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Koda postavke&gt; Skupina izdelkov&gt; Blagovna znamka
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Izberite csv datoteko
 DocType: Student Leave Application,Mark as Present,Označi kot Present
 DocType: Supplier Scorecard,Indicator Color,Barva indikatorja
@@ -5143,11 +5239,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Naj Student Batch
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Se Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Pridobi artikle iz BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Pridobi artikle iz BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Dobavni rok dni
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Napotitev Datum mora biti enak datumu nakupa {1} od sredstva {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Označite to, če je študent s stalnim prebivališčem v Hostel inštituta."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Vnesite Prodajne nalogov v zgornji tabeli
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Vnesite Prodajne nalogov v zgornji tabeli
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Ni predložil plačilne liste
 ,Stock Summary,Stock Povzetek
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Prenese sredstva iz enega skladišča v drugo
@@ -5163,5 +5259,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Vrstica {0}: debetna vnos ne more biti povezano z {1}
 DocType: Journal Entry,Subscription Section,Naročniška sekcija
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Račun {0} ne obstaja
+DocType: Training Event,Training Program,Program usposabljanja
 DocType: Account,Cash,Gotovina
 DocType: Employee,Short biography for website and other publications.,Kratka biografija za spletne strani in drugih publikacij.
diff --git a/erpnext/translations/sq.csv b/erpnext/translations/sq.csv
index 1eac545..bc7ffc7 100644
--- a/erpnext/translations/sq.csv
+++ b/erpnext/translations/sq.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Mode paga
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Regjistrohu
 DocType: Patient,Divorced,I divorcuar
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Gjërat tashmë synced
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Lejoni Pika për të shtuar disa herë në një transaksion
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancel materiale Vizitoni {0} para se anulimi këtë kërkuar garancinë
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Lini Aprovuesit
 DocType: Sales Partner,Dealer,Tregtar
 DocType: Consultation,Investigations,hetimet
+DocType: Restaurant Order Entry,Click Enter To Add,Kliko Enter To Add
 DocType: Employee,Rented,Me qira
 DocType: Purchase Order,PO-,poli-
 DocType: POS Profile,Applicable for User,E aplikueshme për anëtarët
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Ndaloi Rendit prodhimit nuk mund të anulohet, tapën atë më parë për të anulluar"
 DocType: Vehicle Service,Mileage,Largësi
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,A jeni të vërtetë doni për të hequr këtë pasuri?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,A jeni të vërtetë doni për të hequr këtë pasuri?
 DocType: Drug Prescription,Update Schedule,Orari i azhurnimit
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Zgjidh Default Furnizuesi
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Valuta është e nevojshme për Lista Çmimi {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Kontrolloni disponueshmërinë
 DocType: Job Applicant,Job Applicant,Job Aplikuesi
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Kjo është e bazuar në transaksionet kundër këtij Furnizuesi. Shih afat kohor më poshtë për detaje
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nuk ka rezultate shumë.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Legal
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Tatimi aktual lloji nuk mund të përfshihen në normë Item në rresht {0}
 DocType: Bank Guarantee,Customer,Klient
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Exchange Rate duhet të jetë i njëjtë si {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Emri i Klientit
 DocType: Vehicle,Natural Gas,Gazit natyror
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Llogari bankare nuk mund të quhet si {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Llogari bankare nuk mund të quhet si {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Kokat (ose grupe) kundër të cilit Hyrjet e kontabilitetit janë bërë dhe bilancet janë të mirëmbajtura.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Shquar për {0} nuk mund të jetë më pak se zero ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Nuk ka skeda të pagave të paraqitura për t&#39;u përpunuar.
 DocType: Manufacturing Settings,Default 10 mins,Default 10 minuta
 DocType: Leave Type,Leave Type Name,Lini Lloji Emri
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Trego të hapur
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Është e nevojshme që sot të merret vetë ky veprim për ato që përmenden më sipër
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Seria Përditësuar sukses
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,arkë
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural Journal Hyrja Dërguar
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Items Rendit Blerje të pranohen
 DocType: SMS Center,All Supplier Contact,Të gjitha Furnizuesi Kontakt
 DocType: Support Settings,Support Settings,Cilësimet mbështetje
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Pritet Data e Përfundimit nuk mund të jetë më pak se sa pritej Data e fillimit
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Pritet Data e Përfundimit nuk mund të jetë më pak se sa pritej Data e fillimit
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Norma duhet të jetë i njëjtë si {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,New Pushimi Aplikimi
 ,Batch Item Expiry Status,Batch Item Status skadimit
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Draft Bank
 DocType: Mode of Payment Account,Mode of Payment Account,Mënyra e Llogarisë Pagesave
 DocType: Consultation,Consultation,këshillim
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Shitjet dhe Kthimet
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Shfaq Variantet
 DocType: Academic Term,Academic Term,Term akademik
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,material
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Kujdes shëndetësor
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Vonesa në pagesa (ditë)
 DocType: Lab Prescription,Lab Prescription,Kërkimi i laboratorit
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Rendit sipas Çmimit
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,shpenzimeve të shërbimit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Numri Serial: {0} është referuar tashmë në shitje Faturë: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Faturë
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Numri Serial: {0} është referuar tashmë në shitje Faturë: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Faturë
 DocType: Maintenance Schedule Item,Periodicity,Periodicitet
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Viti Fiskal {0} është e nevojshme
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Mbrojtje
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Total Shuma kushton
 DocType: Delivery Note,Vehicle No,Automjeteve Nuk ka
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,"Ju lutem, përzgjidhni Lista e Çmimeve"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,"Ju lutem, përzgjidhni Lista e Çmimeve"
 DocType: Accounts Settings,Currency Exchange Settings,Cilësimet e këmbimit valutor
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Row # {0}: dokument Pagesa është e nevojshme për të përfunduar trasaction
 DocType: Production Order Operation,Work In Progress,Punë në vazhdim
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Ju lutemi zgjidhni data
 DocType: Employee,Holiday List,Festa Lista
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Ju lutemi vendosni Sistemin e Emërimit të Instruktorit në Shkolla&gt; Cilësimet e Shkollave
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Llogaritar
+DocType: Hub Settings,Selling Price List,Lista e Çmimeve të Shitjes
 DocType: Patient,Tobacco Current Use,Përdorimi aktual i duhanit
 DocType: Cost Center,Stock User,Stock User
 DocType: Company,Phone No,Telefoni Asnjë
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Oraret e kursit krijuar:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},New {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},New {0}: # {1}
 ,Sales Partners Commission,Shitjet Partnerët Komisioni
 DocType: Purchase Invoice,Rounding Adjustment,Rregullimi i rrumbullakosjes
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Shkurtesa nuk mund të ketë më shumë se 5 karaktere
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Docname prind Detail
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",Referenca: {0} Artikull Code: {1} dhe klientit: {2}
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kg
-DocType: Student Log,Log,Identifikohu
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Hapja për një punë.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Rezultati i paraqitur
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Rezultati i paraqitur
 DocType: Item Attribute,Increment,Rritje
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Intervalin kohor
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Zgjidh Magazina ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,I martuar
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Nuk lejohet për {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Të marrë sendet nga
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Stock nuk mund të rifreskohet kundër dorëzimit Shënim {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Stock nuk mund të rifreskohet kundër dorëzimit Shënim {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Product {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nuk ka artikuj të listuara
 DocType: Payment Reconciliation,Reconcile,Pajtojë
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondet pensionale
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Zhvlerësimi Date tjetër nuk mund të jetë më parë data e blerjes
 DocType: Consultation,Consultation Date,Data e konsultimit
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Listimi i produktit dhe zbulimi për përdoruesit ERPNext
 DocType: SMS Center,All Sales Person,Të gjitha Person Sales
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Shpërndarja mujore ** ju ndihmon të shpërndani Buxhetore / Target gjithë muaj nëse keni sezonalitetit në biznesin tuaj.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Nuk sende gjetur
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Struktura Paga Missing
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Nuk sende gjetur
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Struktura Paga Missing
 DocType: Lead,Person Name,Emri personi
 DocType: Sales Invoice Item,Sales Invoice Item,Item Shitjet Faturë
 DocType: Account,Credit,Kredi
 DocType: POS Profile,Write Off Cost Center,Shkruani Off Qendra Kosto
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",p.sh. &quot;Shkolla fillore&quot; ose &quot;University&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",p.sh. &quot;Shkolla fillore&quot; ose &quot;University&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Stock Raportet
 DocType: Warehouse,Warehouse Detail,Magazina Detail
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Kufiri i kreditit ka kaluar për konsumator {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term End Date nuk mund të jetë më vonë se Data Year fund të vitit akademik në të cilin termi është i lidhur (Viti Akademik {}). Ju lutem, Korrigjo datat dhe provoni përsëri."
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;A është e aseteve fikse&quot; nuk mund të jetë e pakontrolluar, pasi ekziston rekord Pasurive ndaj artikullit"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;A është e aseteve fikse&quot; nuk mund të jetë e pakontrolluar, pasi ekziston rekord Pasurive ndaj artikullit"
 DocType: Vehicle Service,Brake Oil,Brake Oil
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klienti&gt; Grupi i Klientit&gt; Territori
 DocType: Tax Rule,Tax Type,Lloji Tatimore
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Shuma e tatueshme
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Ju nuk jeni i autorizuar për të shtuar ose shënimet e para përditësim {0}
 DocType: BOM,Item Image (if not slideshow),Item Image (nëse nuk Slideshow)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Ekziston një klient me të njëjtin emër
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Ore Rate / 60) * aktuale Operacioni Koha
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Rreshti # {0}: Referenca Lloji i Dokumentit duhet të jetë një nga Kërkesat e Shpenzimeve ose Hyrja në Regjistrim
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Zgjidh BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Rreshti # {0}: Referenca Lloji i Dokumentit duhet të jetë një nga Kërkesat e Shpenzimeve ose Hyrja në Regjistrim
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Zgjidh BOM
 DocType: SMS Log,SMS Log,SMS Identifikohu
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kostoja e Artikujve dorëzohet
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Festa në {0} nuk është në mes Nga Data dhe To Date
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,Kredi punonjës
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Identifikohu Aktiviteti:
 DocType: Fee Schedule,Send Payment Request Email,Dërgoni Email Kërkesën për Pagesë
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Item {0} nuk ekziston në sistemin apo ka skaduar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Item {0} nuk ekziston në sistemin apo ka skaduar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Real Estate
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Deklarata e llogarisë
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutike
@@ -210,18 +213,23 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Import Identifikohu
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Pull materiale Kërkesa e tipit Prodhime bazuar në kriteret e mësipërme
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,S&#39;aktivizohet me sukses.
 DocType: Training Result Employee,Grade,Gradë
+DocType: Restaurant Table,No of Seats,Jo e Vendeve
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Për të shtuar lëndë dinamike, përdorni etiketat jinja si <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Dorëzuar nga furnizuesi
 DocType: SMS Center,All Contact,Të gjitha Kontakt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Rendit prodhimi krijuar tashmë për të gjitha sendet me bom
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Rendit prodhimi krijuar tashmë për të gjitha sendet me bom
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Paga vjetore
 DocType: Daily Work Summary,Daily Work Summary,Daily Përmbledhje Work
 DocType: Period Closing Voucher,Closing Fiscal Year,Mbyllja e Vitit Fiskal
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} është e ngrirë
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,"Ju lutem, përzgjidhni kompanie ekzistuese për krijimin Skemën e Kontabilitetit"
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} është e ngrirë
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,"Ju lutem, përzgjidhni kompanie ekzistuese për krijimin Skemën e Kontabilitetit"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Stock Shpenzimet
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Zgjidhni Target Magazina
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Zgjidhni Target Magazina
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Zgjidhni Target Magazina
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Zgjidhni Target Magazina
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Ju lutemi shkruani Preferred miqve
 DocType: Program Enrollment,School Bus,Autobus shkolle
 DocType: Journal Entry,Contra Entry,Contra Hyrja
@@ -238,9 +246,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Shkarko template, plotësoni të dhënat e duhura dhe të bashkëngjitni e tanishëm. Të gjitha datat dhe punonjës kombinim në periudhën e zgjedhur do të vijë në template, me të dhënat ekzistuese frekuentimit"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Item {0} nuk është aktiv apo fundi i jetës është arritur
+DocType: Student Admission Program,Minimum Age,Mosha minimale
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Shembull: Matematikë themelore
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Të përfshijnë tatimin në rresht {0} në shkallën Item, taksat në rreshtat {1} duhet të përfshihen edhe"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Cilësimet për HR Module
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Cilësimet për HR Module
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Ndryshimi Shuma
 DocType: BOM Update Tool,New BOM,Bom i ri
@@ -250,7 +259,7 @@
 DocType: Lead,Request Type,Kërkesë Type
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,bëni punonjës
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Transmetimi
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Shto Dhoma
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Modaliteti i konfigurimit të POS (Online / Offline)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Ekzekutim
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detajet e operacioneve të kryera.
 DocType: Serial No,Maintenance Status,Mirëmbajtja Statusi
@@ -273,6 +282,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Lista çmimi duhet të jetë i zbatueshëm për blerjen ose shitjen e
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Data Instalimi nuk mund të jetë para datës së dorëzimit për pika {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Zbritje në listën e çmimeve Norma (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,biokimi
 DocType: Offer Letter,Select Terms and Conditions,Zgjidhni Termat dhe Kushtet
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,Vlera out
 DocType: Production Planning Tool,Sales Orders,Sales Urdhërat
@@ -307,15 +317,15 @@
 DocType: Sales Partner,Reseller,Reseller
 DocType: Codification Table,Medical Code,Kodi mjekësor
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Nëse zgjidhet, do të përfshijë çështje jo-aksioneve në kërkesat materiale."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Ju lutemi shkruani Company
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Ju lutemi shkruani Company
 DocType: Delivery Note Item,Against Sales Invoice Item,Kundër Item Shitjet Faturë
 ,Production Orders in Progress,Urdhërat e prodhimit në Progres
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Paraja neto nga Financimi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage është e plotë, nuk ka shpëtuar"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage është e plotë, nuk ka shpëtuar"
 DocType: Lead,Address & Contact,Adresa &amp; Kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Shtoni gjethe të papërdorura nga alokimet e mëparshme
 DocType: Sales Partner,Partner website,website partner
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Shto Item
+DocType: Restaurant Order Entry,Add Item,Shto Item
 DocType: Lab Test,Custom Result,Rezultati personal
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Kontakt Emri
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kriteret e vlerësimit kurs
@@ -328,7 +338,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Kërkesë për blerje.
 DocType: Lab Test,Submitted Date,Data e Dërguar
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Kjo është e bazuar në Fletët Koha krijuara kundër këtij projekti
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Pay Net nuk mund të jetë më pak se 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Pay Net nuk mund të jetë më pak se 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Për të ndaluar dërgimin e njoftimeve të përsëritura të gabimit nga sistemi, ne kemi kontrolluar fushën e Kufizuar në pajtim"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Vetëm aprovuesi zgjedhur Pushimi mund ta paraqesë këtë kërkesë lini
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Lehtësimin Data duhet të jetë më i madh se data e bashkimit
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Lë në vit
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,Fitimi dhe Humbja
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Litra
 DocType: Task,Total Costing Amount (via Time Sheet),Total Kostoja Shuma (via Koha Sheet)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Ju lutemi të organizoni Studentët nën Grupet Studentore
 DocType: Item Website Specification,Item Website Specification,Item Faqja Specifikimi
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Lini Blocked
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Item {0} ka arritur në fund të saj të jetës në {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Item {0} ka arritur në fund të saj të jetës në {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Banka Entries
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Vjetor
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Pajtimi Item
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Kursi Group Student Krijimi Tool
 DocType: Lead,Do Not Contact,Mos Kontaktoni
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,Njerëzit të cilët japin mësim në organizatën tuaj
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,ID unike për ndjekjen e të gjitha faturave të përsëritura. Ajo është krijuar për të paraqitur.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimale Rendit Qty
 DocType: Pricing Rule,Supplier Type,Furnizuesi Type
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,Publikojë në Hub
 DocType: Student Admission,Student Admission,Pranimi Student
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Item {0} është anuluar
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Kërkesë materiale
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Item {0} është anuluar
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Kërkesë materiale
 DocType: Bank Reconciliation,Update Clearance Date,Update Pastrimi Data
 DocType: Item,Purchase Details,Detajet Blerje
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} nuk u gjet në &#39;e para materiale të furnizuara &quot;tryezë në Rendit Blerje {1}
 DocType: Patient Relation,Relation,Lidhje
 DocType: Shipping Rule,Worldwide Shipping,Shipping në mbarë botën
 DocType: Patient Relation,Mother,nënë
+DocType: Restaurant Reservation,Reservation End Time,Koha e përfundimit të rezervimit
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Urdhra të konfirmuara nga konsumatorët.
 DocType: Purchase Receipt Item,Rejected Quantity,Sasi të refuzuar
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Kërkesa për pagesë {0} u krijua
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Kërkesa për pagesë {0} u krijua
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Ndjeshmëri e ulët
 DocType: Notification Control,Notification Control,Kontrolli Njoftim
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Ju lutemi konfirmoni sapo të keni përfunduar trajnimin tuaj
 DocType: Lead,Suggestions,Sugjerime
@@ -388,7 +401,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Emails paga shqip për punonjës të bazuar në email preferuar zgjedhur në punonjësi
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Aprovuesi i parë Leave në listë do të jetë vendosur si default Leave aprovuesi
 DocType: Tax Rule,Shipping County,Shipping County
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Mëso
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Mëso
 DocType: Asset,Next Depreciation Date,Zhvlerësimi Data Next
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktiviteti Kosto për punonjës
 DocType: Accounts Settings,Settings for Accounts,Cilësimet për Llogaritë
@@ -399,13 +412,13 @@
 DocType: Item,Synced With Hub,Synced Me Hub
 DocType: Vehicle,Fleet Manager,Fleet Menaxher
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} nuk mund të jetë negative për artikull {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Gabuar Fjalëkalimi
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Gabuar Fjalëkalimi
 DocType: Item,Variant Of,Variant i
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Kompletuar Qty nuk mund të jetë më i madh se &quot;Qty për Prodhimi&quot;
 DocType: Period Closing Voucher,Closing Account Head,Mbyllja Shef Llogaria
 DocType: Employee,External Work History,Historia e jashtme
 DocType: Physician,Time per Appointment,Koha për Emërim
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Qarkorja Referenca Gabim
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Qarkorja Referenca Gabim
 DocType: Appointment Type,Is Inpatient,Është pacient
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Emri Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Me fjalë (eksport) do të jetë i dukshëm një herë ju ruani notën shpërndarëse.
@@ -414,19 +427,18 @@
 DocType: Lead,Industry,Industri
 DocType: Employee,Job Profile,Profile Job
 DocType: BOM Item,Rate & Amount,Rate &amp; Shuma
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ju lutem vendosni numrat e numrave për Pjesëmarrjen përmes Setup&gt; Seritë e Numërimit
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Kjo bazohet në transaksione kundër kësaj kompanie. Shiko detajet më poshtë për detaje
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Njoftojë me email për krijimin e kërkesës automatike materiale
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,i qëndrueshëm
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Lloji Faturë
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klienti&gt; Grupi i Klientit&gt; Territori
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Ofrimit Shënim
 DocType: Consultation,Encounter Impression,Impresioni i takimit
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Ngritja Tatimet
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Kostoja e asetit të shitur
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,"Pagesa Hyrja është ndryshuar, pasi që ju nxorrën atë. Ju lutemi të tërheqë atë përsëri."
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} hyrë dy herë në Tatimin Item
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Përmbledhje për këtë javë dhe aktivitete në pritje
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} hyrë dy herë në Tatimin Item
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Përmbledhje për këtë javë dhe aktivitete në pritje
 DocType: Student Applicant,Admitted,pranuar
 DocType: Workstation,Rent Cost,Qira Kosto
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Shuma Pas Zhvlerësimi
@@ -441,36 +453,35 @@
 DocType: Shipping Rule,Valid for Countries,I vlefshëm për vendet
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Ky artikull është një Template dhe nuk mund të përdoret në transaksionet. Atribute pika do të kopjohet gjatë në variantet nëse nuk është vendosur &quot;Jo Copy &#39;
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Rendit Gjithsej konsideruar
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Përcaktimi Punonjës (p.sh. CEO, drejtor etj)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Përcaktimi Punonjës (p.sh. CEO, drejtor etj)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Shkalla në të cilën Valuta Customer është konvertuar në bazë monedhën klientit
 DocType: Course Scheduling Tool,Course Scheduling Tool,Sigurisht caktimin Tool
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Blerje Fatura nuk mund të bëhet kundër një aktiv ekzistues {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Urgjent] Gabim gjatë krijimit të përsëritjes% s për% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Urgjent] Gabim gjatë krijimit të përsëritjes% s për% s
 DocType: Item Tax,Tax Rate,Shkalla e tatimit
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ndarë tashmë për punonjësit {1} për periudhën {2} në {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Zgjidh Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Zgjidh Item
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Blerje Fatura {0} është dorëzuar tashmë
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Nuk duhet të jetë i njëjtë si {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convert për të jo-Group
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Batch (shumë) e një artikulli.
 DocType: C-Form Invoice Detail,Invoice Date,Data e faturës
 DocType: GL Entry,Debit Amount,Shuma Debi
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Nuk mund të jetë vetëm 1 Llogaria për Kompaninë në {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Ju lutem shikoni shtojcën
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Nuk mund të jetë vetëm 1 Llogaria për Kompaninë në {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Ju lutem shikoni shtojcën
 DocType: Purchase Order,% Received,% Marra
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Krijo Grupet Student
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Setup Tashmë komplet !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Setup Tashmë komplet !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Credit Note Shuma
 DocType: Setup Progress Action,Action Document,Dokumenti i Veprimit
 ,Finished Goods,Mallrat përfunduar
 DocType: Delivery Note,Instructions,Udhëzime
 DocType: Quality Inspection,Inspected By,Inspektohen nga
 DocType: Maintenance Visit,Maintenance Type,Mirëmbajtja Type
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} nuk është i regjistruar në lëndës {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kodi i artikullit&gt; Grupi i artikullit&gt; Markë
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} nuk është i regjistruar në lëndës {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial Asnjë {0} nuk i përket dorëzimit Shënim {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Shto Items
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Shto Items
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Item Cilësia Inspektimi Parametri
 DocType: Leave Application,Leave Approver Name,Lini Emri aprovuesi
 DocType: Depreciation Schedule,Schedule Date,Orari Data
@@ -492,7 +503,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Orari i punës
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Ndryshimi filluar / numrin e tanishëm sekuencë e një serie ekzistuese.
 DocType: Dosage Strength,Strength,Forcë
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Krijo një klient i ri
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Krijo një klient i ri
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Nëse Rregullat shumta Çmimeve të vazhdojë të mbizotërojë, përdoruesit janë të kërkohet për të vendosur përparësi dorë për të zgjidhur konfliktin."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Krijo urdhëron Blerje
 ,Purchase Register,Blerje Regjistrohu
@@ -511,7 +522,7 @@
 DocType: Lab Test Template,Single,I vetëm
 DocType: Salary Slip,Total Loan Repayment,Ripagimi Total Loan
 DocType: Account,Cost of Goods Sold,Kostoja e mallrave të shitura
-DocType: Purchase Invoice,Yearly,Vjetor
+DocType: Subscription,Yearly,Vjetor
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Ju lutemi shkruani Qendra Kosto
 DocType: Drug Prescription,Dosage,dozim
 DocType: Journal Entry Account,Sales Order,Sales Order
@@ -542,7 +553,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Konfigurimet Global për të gjitha proceset e prodhimit.
 DocType: Accounts Settings,Accounts Frozen Upto,Llogaritë ngrira Upto
 DocType: SMS Log,Sent On,Dërguar në
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Atribut {0} zgjedhur disa herë në atributet Tabelën
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Atribut {0} zgjedhur disa herë në atributet Tabelën
 DocType: HR Settings,Employee record is created using selected field. ,Rekord punonjës është krijuar duke përdorur fushën e zgjedhur.
 DocType: Sales Order,Not Applicable,Nuk aplikohet
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Mjeshtër pushime.
@@ -568,13 +579,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Gjithsej lë alokuara është i detyrueshëm
 DocType: Patient,AB Positive,AB Pozitiv
 DocType: Job Opening,Description of a Job Opening,Përshkrimi i një Hapja Job
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Aktivitetet në pritje për sot
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Aktivitetet në pritje për sot
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Pjesëmarrja rekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Komponenti Paga për pasqyrë e mungesave pagave bazë.
 DocType: Sales Order Item,Used for Production Plan,Përdoret për Planin e prodhimit
 DocType: Employee Loan,Total Payment,Pagesa Total
 DocType: Manufacturing Settings,Time Between Operations (in mins),Koha Midis Operacioneve (në minuta)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} është anuluar në mënyrë veprimi nuk mund të përfundojë
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} është anuluar në mënyrë veprimi nuk mund të përfundojë
 DocType: Customer,Buyer of Goods and Services.,Blerësi i mallrave dhe shërbimeve.
 DocType: Journal Entry,Accounts Payable,Llogaritë e pagueshme
 DocType: Patient,Allergies,Alergjia
@@ -586,23 +597,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Paralajmëroni Urdhërat e Blerjes
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Lista disa nga klientët tuaj. Ata mund të jenë organizata ose individë.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Pjesë mjaftueshme për të ndërtuar
+DocType: POS Profile User,POS Profile User,Profili i POS-ut
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Të ardhurat direkte
 DocType: Patient Appointment,Date TIme,Data Përmbledhje
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Nuk mund të filtruar në bazë të llogarisë, në qoftë se të grupuara nga Llogaria"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Zyrtar Administrativ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,"Ju lutem, përzgjidhni Course"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,"Ju lutem, përzgjidhni Course"
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,"Ju lutem, përzgjidhni Course"
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,"Ju lutem, përzgjidhni Course"
 DocType: Codification Table,Codification Table,Tabela e kodifikimit
 DocType: Timesheet Detail,Hrs,orë
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,"Ju lutem, përzgjidhni Company"
 DocType: Stock Entry Detail,Difference Account,Llogaria Diferenca
 DocType: Purchase Invoice,Supplier GSTIN,furnizuesi GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Nuk mund detyrë afër sa detyra e saj të varur {0} nuk është e mbyllur.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,Ju lutem shkruani Magazina për të cilat do të ngrihen materiale Kërkesë
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Nuk mund detyrë afër sa detyra e saj të varur {0} nuk është e mbyllur.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Ju lutem shkruani Magazina për të cilat do të ngrihen materiale Kërkesë
 DocType: Production Order,Additional Operating Cost,Shtesë Kosto Operative
 DocType: Lab Test Template,Lab Routine,Rutina e laboratorit
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kozmetikë
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Të bashkojë, pronat e mëposhtme duhet të jenë të njëjta për të dy artikujve"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Të bashkojë, pronat e mëposhtme duhet të jenë të njëjta për të dy artikujve"
 DocType: Shipping Rule,Net Weight,Net Weight
 DocType: Employee,Emergency Phone,Urgjencës Telefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,blej
@@ -613,7 +625,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Ju lutemi të përcaktuar klasën për Prag 0%
 DocType: Sales Order,To Deliver,Për të ofruar
 DocType: Purchase Invoice Item,Item,Artikull
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Serial asnjë artikull nuk mund të jetë një pjesë
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Ndjeshmëri e lartë
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Serial asnjë artikull nuk mund të jetë një pjesë
 DocType: Journal Entry,Difference (Dr - Cr),Diferenca (Dr - Cr)
 DocType: Account,Profit and Loss,Fitimi dhe Humbja
 DocType: Patient,Risk Factors,Faktoret e rrezikut
@@ -622,7 +635,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Menaxhimi Nënkontraktimi
 DocType: Vital Signs,Body Temperature,Temperatura e trupit
 DocType: Project,Project will be accessible on the website to these users,Projekti do të jetë në dispozicion në faqen e internetit të këtyre përdoruesve
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Përcaktoni llojin e Projektit.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Përcaktoni llojin e Projektit.
 DocType: Supplier Scorecard,Weighting Function,Funksioni i peshimit
 DocType: Physician,OP Consulting Charge,Ngarkimi OP Consulting
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Setup your
@@ -636,7 +649,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Rritja nuk mund të jetë 0
 DocType: Production Planning Tool,Material Requirement,Kërkesa materiale
 DocType: Company,Delete Company Transactions,Fshij Transaksionet Company
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,I Referencës dhe Referenca Date është e detyrueshme për transaksion Bank
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,I Referencës dhe Referenca Date është e detyrueshme për transaksion Bank
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Add / Edit taksat dhe tatimet
 DocType: Payment Entry Reference,Supplier Invoice No,Furnizuesi Fatura Asnjë
 DocType: Territory,For reference,Për referencë
@@ -644,12 +657,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Nuk mund të fshini serial {0}, ashtu siç është përdorur në transaksionet e aksioneve"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Mbyllja (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Përshëndetje
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Leviz Item
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Leviz Item
 DocType: Serial No,Warranty Period (Days),Garanci Periudha (ditë)
 DocType: Installation Note Item,Installation Note Item,Instalimi Shënim Item
 DocType: Production Plan Item,Pending Qty,Në pritje Qty
 DocType: Budget,Ignore,Injoroj
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} nuk është aktiv
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} nuk është aktiv
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Dimensionet kontrolloni Setup për printim
 DocType: Salary Slip,Salary Slip Timesheet,Paga Slip pasqyrë e mungesave
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Furnizuesi Magazina i detyrueshëm për të nën-kontraktuar Blerje marrjes
@@ -658,7 +671,7 @@
 DocType: Pricing Rule,Sales Partner,Sales Partner
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Të gjitha tabelat e rezultateve të furnizuesit.
 DocType: Buying Settings,Purchase Receipt Required,Pranimi Blerje kërkuar
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Vlerësimi Vlerësoni është i detyrueshëm në qoftë Hapja Stock hyrë
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,Vlerësimi Vlerësoni është i detyrueshëm në qoftë Hapja Stock hyrë
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nuk u gjetën në tabelën Faturë të dhënat
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Ju lutem, përzgjidhni kompanisë dhe Partisë Lloji i parë"
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Financiare / vit kontabilitetit.
@@ -695,7 +708,7 @@
 DocType: Quotation,Quotation To,Citat Për
 DocType: Lead,Middle Income,Të ardhurat e Mesme
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Hapja (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default njësinë e matjes për artikullit {0} nuk mund të ndryshohet drejtpërdrejt sepse ju keni bërë tashmë një transaksioni (et) me një tjetër UOM. Ju do të duhet për të krijuar një artikull të ri për të përdorur një Default ndryshme UOM.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default njësinë e matjes për artikullit {0} nuk mund të ndryshohet drejtpërdrejt sepse ju keni bërë tashmë një transaksioni (et) me një tjetër UOM. Ju do të duhet për të krijuar një artikull të ri për të përdorur një Default ndryshme UOM.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Shuma e ndarë nuk mund të jetë negative
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Ju lutemi të vendosur Kompaninë
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Ju lutemi të vendosur Kompaninë
@@ -710,6 +723,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Zgjidhni Pagesa Llogaria për të bërë Banka Hyrja
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Krijo dhënat e punonjësve për të menaxhuar gjethe, pretendimet e shpenzimeve dhe pagave"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Periudha e parashkrimit
+DocType: Restaurant Reservation,Restaurant Reservation,Rezervim Restoranti
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Propozimi Shkrimi
 DocType: Payment Entry Deduction,Payment Entry Deduction,Pagesa Zbritja Hyrja
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Një person tjetër Sales {0} ekziston me të njëjtin id punonjës
@@ -717,7 +731,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Masters
 DocType: Assessment Plan,Maximum Assessment Score,Vlerësimi maksimal Score
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Datat e transaksionit Update Banka
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Koha Tracking
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Koha Tracking
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,Duplicate TRANSPORTUESIT
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskale Viti i kompanisë
 DocType: Packing Slip Item,DN Detail,DN Detail
@@ -725,8 +739,9 @@
 DocType: Timesheet,Billed,Faturuar
 DocType: Batch,Batch Description,Batch Përshkrim
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Krijimi i grupeve të studentëve
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Pagesa Gateway Llogaria nuk është krijuar, ju lutemi krijoni një të tillë me dorë."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Pagesa Gateway Llogaria nuk është krijuar, ju lutemi krijoni një të tillë me dorë."
 DocType: Supplier Scorecard,Per Year,Në vit
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Nuk ka të drejtë për pranim në këtë program sipas DOB
 DocType: Sales Invoice,Sales Taxes and Charges,Shitjet Taksat dhe Tarifat
 DocType: Employee,Organization Profile,Organizata Profilin
 DocType: Vital Signs,Height (In Meter),Lartësia (në metër)
@@ -762,7 +777,7 @@
 DocType: Student Batch Name,Batch Name,Batch Emri
 DocType: Fee Validity,Max number of visit,Numri maksimal i vizitës
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Pasqyrë e mungesave krijuar:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Ju lutemi të vendosur Cash parazgjedhur apo llogari bankare në mënyra e pagesës {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Ju lutemi të vendosur Cash parazgjedhur apo llogari bankare në mënyra e pagesës {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,regjistroj
 DocType: GST Settings,GST Settings,GST Settings
 DocType: Selling Settings,Customer Naming By,Emërtimi Customer Nga
@@ -794,16 +809,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Taksat zbarkoi Kosto dhe Tarifat
 DocType: Production Order Operation,Actual Start Time,Aktuale Koha e fillimit
 DocType: BOM Operation,Operation Time,Operacioni Koha
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,fund
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,fund
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,bazë
 DocType: Timesheet,Total Billed Hours,Orët totale faturuara
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Shkruani Off Shuma
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Shkruani Off Shuma
 DocType: Leave Block List Allow,Allow User,Lejojë përdoruesin
 DocType: Journal Entry,Bill No,Bill Asnjë
 DocType: Company,Gain/Loss Account on Asset Disposal,Llogaria Gain / Humbja në hedhjen e Aseteve
 DocType: Vehicle Log,Service Details,Details shërbimit
 DocType: Vehicle Log,Service Details,Details shërbimit
-DocType: Purchase Invoice,Quarterly,Tremujor
+DocType: Subscription,Quarterly,Tremujor
 DocType: Lab Test Template,Grouped,grupuar
 DocType: Selling Settings,Delivery Note Required,Ofrimit Shënim kërkuar
 DocType: Bank Guarantee,Bank Guarantee Number,Bank Numri Guarantee
@@ -813,12 +828,12 @@
 DocType: Student Attendance,Student Attendance,Pjesëmarrja Student
 DocType: Sales Invoice Timesheet,Time Sheet,Koha Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush të lëndëve të para në bazë të
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Ju lutem shkruani të dhënat pika
 DocType: Interest,Interest,interes
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Sales para
 DocType: Purchase Receipt,Other Details,Detaje të tjera
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Lab Test,Test Template,Template Test
+DocType: Restaurant Order Entry Item,Served,Served
 DocType: Account,Accounts,Llogaritë
 DocType: Vehicle,Odometer Value (Last),Vlera rrugëmatës (i fundit)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Modelet e kritereve të rezultateve të ofruesve.
@@ -830,25 +845,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Preview Paga Shqip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Llogaria {0} ka hyrë disa herë
 DocType: Account,Expenses Included In Valuation,Shpenzimet e përfshira në Vlerësimit
-DocType: Hub Settings,Seller City,Shitës qytetit
 ,Absent Student Report,Mungon Raporti Student
 DocType: Email Digest,Next email will be sent on:,Email ardhshëm do të dërgohet në:
 DocType: Offer Letter Term,Offer Letter Term,Oferta Letër Term
 DocType: Supplier Scorecard,Per Week,Në javë
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Item ka variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Item ka variante.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Student Gjithsej
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Item {0} nuk u gjet
 DocType: Bin,Stock Value,Stock Vlera
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,"Të dhënat e tarifave do të krijohen në sfond. Në rast të ndonjë gabimi, mesazhi i gabimit do të përditësohet në Orarin."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Kompania {0} nuk ekziston
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} ka vlefshmërinë e tarifës deri në {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} ka vlefshmërinë e tarifës deri në {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Tree Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Qty konsumuar për njësi
 DocType: Serial No,Warranty Expiry Date,Garanci Data e skadimit
 DocType: Material Request Item,Quantity and Warehouse,Sasia dhe Magazina
+DocType: Hub Settings,Unregister,unregister
 DocType: Sales Invoice,Commission Rate (%),Vlerësoni komision (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,"Ju lutem, përzgjidhni Program"
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,"Ju lutem, përzgjidhni Program"
 DocType: Project,Estimated Cost,Kostoja e vlerësuar
 DocType: Purchase Order,Link to material requests,Link të kërkesave materiale
+DocType: Hub Settings,Publish,publikoj
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Hapësirës ajrore
 DocType: Journal Entry,Credit Card Entry,Credit Card Hyrja
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Company dhe Llogaritë
@@ -859,13 +876,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Mbylle Opportunity pas ditë
 ,Reserved,I rezervuar
 DocType: Purchase Order,Supply Raw Materials,Furnizimit të lëndëve të para
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Data në të cilën fatura e ardhshme do të gjenerohet. Ajo është krijuar për të paraqitur.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Pasuritë e tanishme
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} nuk është një gjendje Item
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',Ju lutemi ndani komentet tuaja në trajnim duke klikuar në &#39;Trajnimi i Feedback&#39; dhe pastaj &#39;New&#39;
 DocType: Mode of Payment Account,Default Account,Gabim Llogaria
 DocType: Payment Entry,Received Amount (Company Currency),Shuma e marrë (Company Valuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,"Lead duhet të vendosen, nëse Opportunity është bërë nga Lead"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,"Lead duhet të vendosen, nëse Opportunity është bërë nga Lead"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Ju lutem, përzgjidhni ditë javore jashtë"
 DocType: Patient,O Negative,O Negative
 DocType: Production Order Operation,Planned End Time,Planifikuar Fundi Koha
@@ -881,10 +897,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energji
 DocType: Opportunity,Opportunity From,Opportunity Nga
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Deklarata mujore e pagave.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Shto kompani
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rreshti {0}: {1} Numrat serialë të kërkuar për artikullin {2}. Ju keni dhënë {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rreshti {0}: {1} Numrat serialë të kërkuar për artikullin {2}. Ju keni dhënë {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Zgjidh një tabelë
 DocType: BOM,Website Specifications,Specifikimet Website
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} është një adresë e pavlefshme email në &#39;Përfituesit&#39;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} është një adresë e pavlefshme email në &#39;Përfituesit&#39;
 DocType: Special Test Items,Particulars,Të dhënat
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiotik.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Nga {0} nga lloji {1}
@@ -892,11 +908,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Row {0}: Konvertimi Faktori është e detyrueshme
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Rregullat e çmimeve të shumta ekziston me kritere të njëjta, ju lutemi të zgjidhur konfliktin duke caktuar prioritet. Rregullat Çmimi: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nuk mund të çaktivizuar ose të anulojë bom si ajo është e lidhur me BOM-in e tjera
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nuk mund të çaktivizuar ose të anulojë bom si ajo është e lidhur me BOM-in e tjera
 DocType: Opportunity,Maintenance,Mirëmbajtje
 DocType: Item Attribute Value,Item Attribute Value,Item atribut Vlera
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Shitjet fushata.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,bëni pasqyrë e mungesave
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,bëni pasqyrë e mungesave
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -934,12 +950,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Ju lutemi shkruani pika e parë
 DocType: Account,Liability,Detyrim
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Shuma e sanksionuar nuk mund të jetë më e madhe se shuma e kërkesës në Row {0}.
+DocType: Salary Detail,Do not include in total,Mos përfshini në total
 DocType: Company,Default Cost of Goods Sold Account,Gabim Kostoja e mallrave të shitura Llogaria
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Lista e Çmimeve nuk zgjidhet
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Lista e Çmimeve nuk zgjidhet
 DocType: Employee,Family Background,Historiku i familjes
 DocType: Request for Quotation Supplier,Send Email,Dërgo Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Warning: Attachment Invalid {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Nuk ka leje
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Warning: Attachment Invalid {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Nuk ka leje
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Cito kërkohet
 DocType: Vital Signs,Heart Rate / Pulse,Shkalla e zemrës / Pulsi
 DocType: Company,Default Bank Account,Gabim Llogarisë Bankare
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Për të filtruar në bazë të Partisë, Partia zgjidhni llojin e parë"
@@ -966,12 +984,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Item Row {IDX}: {} {DOCTYPE docname} nuk ekziston në më sipër &#39;{DOCTYPE}&#39; tabelë
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Pasqyrë e mungesave {0} është përfunduar tashmë ose anuluar
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Nuk ka detyrat
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Ditë të muajit në të cilin fatura auto do të gjenerohet p.sh. 05, 28 etj"
 DocType: Item Variant Settings,Copy Fields to Variant,Kopjoni Fushat në Variant
 DocType: Asset,Opening Accumulated Depreciation,Hapja amortizimi i akumuluar
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Rezultati duhet të jetë më pak se ose e barabartë me 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Regjistrimi Tool
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,Të dhënat C-Forma
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,Të dhënat C-Forma
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Customer dhe Furnizues
 DocType: Email Digest,Email Digest Settings,Email Settings Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Ju faleminderit për biznesin tuaj!
@@ -989,13 +1006,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Statusi i citatit
 DocType: Maintenance Visit,Completion Status,Përfundimi Statusi
 DocType: HR Settings,Enter retirement age in years,Shkruani moshën e pensionit në vitet
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Magazina
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,"Ju lutem, përzgjidhni një depo"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Target Magazina
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,"Ju lutem, përzgjidhni një depo"
 DocType: Cheque Print Template,Starting location from left edge,Duke filluar vend nga buzë e majtë
 DocType: Item,Allow over delivery or receipt upto this percent,Lejo mbi ofrimin ose pranimin upto këtë qind
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Pjesëmarrja e importit
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Të gjitha Item Grupet
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Të gjitha Item Grupet
 DocType: Process Payroll,Activity Log,Aktiviteti Identifikohu
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Fitimi neto / Humbja
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatikisht shkruaj mesazh për dorëzimin e transaksioneve.
@@ -1007,7 +1024,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Projektuar Qty
 DocType: Sales Invoice,Payment Due Date,Afati i pageses
 DocType: Drug Prescription,Interval UOM,Interval UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Item Varianti {0} tashmë ekziston me atributet e njëjta
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Item Varianti {0} tashmë ekziston me atributet e njëjta
+DocType: Item,Hub Publishing Details,Detajet e botimit të Hub
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&quot;Hapja&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Hapur për të bërë
 DocType: Notification Control,Delivery Note Message,Ofrimit Shënim Mesazh
@@ -1027,10 +1045,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM {{0}: Materiali i papërpunuar nuk mund të jetë i njëjtë me artikullin kryesor
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Akuzat totale të zbatueshme në Blerje tryezë Receipt artikujt duhet të jetë i njëjtë si Total taksat dhe tarifat
 DocType: Sales Team,Incentives,Nxitjet
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Regjistrohu për Hub
 DocType: SMS Log,Requested Numbers,Numrat kërkuara
 DocType: Production Planning Tool,Only Obtain Raw Materials,Vetëm Merrni lëndëve të para
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Vlerësimit të performancës.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Duke bërë të mundur &#39;Përdorimi për Shportë&#39;, si Shporta është aktivizuar dhe duhet të ketë të paktën një Rule Tax per Shporta"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Duke bërë të mundur &#39;Përdorimi për Shportë&#39;, si Shporta është aktivizuar dhe duhet të ketë të paktën një Rule Tax per Shporta"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Pagesa Hyrja {0} është e lidhur kundrejt Rendit {1}, kontrolloni nëse ajo duhet të largohen sa më parë në këtë faturë."
 DocType: Sales Invoice Item,Stock Details,Stock Detajet
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Vlera e Projektit
@@ -1049,12 +1068,14 @@
 DocType: Salary Slip,Working Days,Ditët e punës
 DocType: Serial No,Incoming Rate,Hyrëse Rate
 DocType: Packing Slip,Gross Weight,Peshë Bruto
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,Emri i kompanisë suaj për të cilën ju jeni të vendosur këtë sistem.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Aktivizo Hub
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,Emri i kompanisë suaj për të cilën ju jeni të vendosur këtë sistem.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Përfshijnë pushimet në total nr. i ditëve të punës
 DocType: Job Applicant,Hold,Mbaj
 DocType: Employee,Date of Joining,Data e Bashkimi
 DocType: Naming Series,Update Series,Update Series
 DocType: Supplier Quotation,Is Subcontracted,Është nënkontraktuar
+DocType: Restaurant Table,Minimum Seating,Vendndodhja minimale
 DocType: Item Attribute,Item Attribute Values,Vlerat Item ia atribuojnë
 DocType: Examination Result,Examination Result,Ekzaminimi Result
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Pranimi Blerje
@@ -1065,13 +1086,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Në pamundësi për të gjetur vend i caktuar kohë në {0} ditëve të ardhshme për funksionimin {1}
 DocType: Production Order,Plan material for sub-assemblies,Materiali plan për nën-kuvendet
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Sales Partners dhe Territori
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} duhet të jetë aktiv
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} duhet të jetë aktiv
 DocType: Journal Entry,Depreciation Entry,Zhvlerësimi Hyrja
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Ju lutem zgjidhni llojin e dokumentit të parë
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Anuloje Vizitat Materiale {0} para anulimit të kësaj vizite Mirëmbajtja
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial Asnjë {0} nuk i përkasin Item {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Kerkohet Qty
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Depot me transaksion ekzistues nuk mund të konvertohet në librin.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Depot me transaksion ekzistues nuk mund të konvertohet në librin.
 DocType: Bank Reconciliation,Total Amount,Shuma totale
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Botime Internet
 DocType: Prescription Duration,Number,numër
@@ -1082,7 +1103,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista Sales Çmimi
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Nëse kontrollohet, një klient do të krijohet, i mapuar tek Pacienti. Faturat e pacientit do të krijohen kundër këtij klienti. Ju gjithashtu mund të zgjidhni Klientin ekzistues gjatë krijimit të pacientit."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publikimi i të sync artikuj
 DocType: Bank Reconciliation,Account Currency,Llogaria Valuta
 DocType: Lab Test,Sample ID,Shembull i ID
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Ju lutemi të përmendim rrumbullohem Llogari në Kompaninë
@@ -1091,11 +1111,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Punonjës {0} nuk është aktiv apo nuk ekziston
 DocType: Fee Structure,Components,komponentet
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Ju lutem shkruani Pasurive Kategoria në pikën {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Item Variantet {0} përditësuar
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Item Variantet {0} përditësuar
 DocType: Quality Inspection Reading,Reading 6,Leximi 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,"Nuk mund {0} {1} {2}, pa asnjë faturë negative shquar"
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","për tu gjeneruar. Nëse vonohet, do të duhet të ndryshoni manualisht fushën &quot;Repeat on Day of Month&quot; të kësaj"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,"Nuk mund {0} {1} {2}, pa asnjë faturë negative shquar"
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Blerje Faturë Advance
-DocType: Hub Settings,Sync Now,Sync Tani
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: Hyrja e kredisë nuk mund të jetë i lidhur me një {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Të përcaktojë buxhetin për një vit financiar.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Parazgjedhur llogari Banka / Cash do të rifreskohet automatikisht në POS Faturës kur kjo mënyrë është zgjedhur.
@@ -1107,13 +1128,13 @@
 DocType: Item,Is Purchase Item,Është Blerje Item
 DocType: Asset,Purchase Invoice,Blerje Faturë
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail Asnjë
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Sales New Fatura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Sales New Fatura
 DocType: Stock Entry,Total Outgoing Value,Vlera Totale largohet
 DocType: Physician,Appointments,emërimet
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Hapja Data dhe Data e mbylljes duhet të jetë brenda të njëjtit vit fiskal
 DocType: Lead,Request for Information,Kërkesë për Informacion
 ,LeaderBoard,Fituesit
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Sync Offline Faturat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Sync Offline Faturat
 DocType: Payment Request,Paid,I paguar
 DocType: Program Fee,Program Fee,Tarifa program
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1132,11 +1153,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Rendit Blerje Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Të ardhurat indirekte
 DocType: Student Attendance Tool,Student Attendance Tool,Pjesëmarrja Student Tool
+DocType: Restaurant Menu,Price List (Auto created),Lista e çmimeve (krijuar automatikisht)
 DocType: Cheque Print Template,Date Settings,Data Settings
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Grindje
 ,Company Name,Emri i kompanisë
 DocType: SMS Center,Total Message(s),Përgjithshme mesazh (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Përzgjidh Item për transferimin
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Përzgjidh Item për transferimin
 DocType: Purchase Invoice,Additional Discount Percentage,Përqindja shtesë Discount
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Shiko një listë të të gjitha ndihmë videot
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Zgjidh llogaria kreu i bankës ku kontrolli ishte depozituar.
@@ -1154,6 +1176,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,metër
 DocType: Workstation,Electricity Cost,Kosto të energjisë elektrike
 DocType: HR Settings,Don't send Employee Birthday Reminders,Mos dërgoni punonjës Ditëlindja Përkujtesat
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Ruaj cilësimet
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Produkte të kërkuara
 DocType: Item,Inspection Criteria,Kriteret e Inspektimit
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Transferuar
 DocType: BOM Website Item,BOM Website Item,BOM Website Item
@@ -1171,11 +1195,11 @@
 DocType: Journal Entry,Total Amount in Words,Shuma totale në fjalë
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Pati një gabim. Një arsye e mundshme mund të jetë që ju nuk e keni ruajtur formën. Ju lutemi te kontaktoni support@erpnext.com nëse problemi vazhdon.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Shporta ime
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Rendit Lloji duhet të jetë një nga {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Rendit Lloji duhet të jetë një nga {0}
 DocType: Lead,Next Contact Date,Tjetër Kontakt Data
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Hapja Qty
 DocType: Healthcare Settings,Appointment Reminder,Kujtesë për Emër
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,"Ju lutem, jepni llogari për Ndryshim Shuma"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,"Ju lutem, jepni llogari për Ndryshim Shuma"
 DocType: Student Batch Name,Student Batch Name,Student Batch Emri
 DocType: Consultation,Doctor,mjek
 DocType: Holiday List,Holiday List Name,Festa Lista Emri
@@ -1183,12 +1207,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Orari i kursit
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Stock Options
 DocType: Journal Entry Account,Expense Claim,Shpenzim Claim
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,A jeni të vërtetë doni për të rivendosur këtë pasuri braktiset?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Qty për {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,A jeni të vërtetë doni për të rivendosur këtë pasuri braktiset?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Qty për {0}
 DocType: Leave Application,Leave Application,Lini Aplikimi
 DocType: Patient,Patient Relation,Lidhja e pacientit
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Lini Alokimi Tool
+DocType: Item,Hub Category to Publish,Kategoria Hub për Publikim
 DocType: Leave Block List,Leave Block List Dates,Dërgo Block Lista Datat
+DocType: Sales Invoice,Billing Address GSTIN,Adresa e Faturimit GSTIN
 DocType: Workstation,Net Hour Rate,Shkalla neto Ore
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Kosto zbarkoi Blerje Receipt
 DocType: Company,Default Terms,Kushtet Default
@@ -1198,11 +1224,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Ju lutem specifikoni një {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Artikuj hequr me asnjë ndryshim në sasi ose në vlerë.
 DocType: Delivery Note,Delivery To,Ofrimit të
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Tabela atribut është i detyrueshëm
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Tabela atribut është i detyrueshëm
 DocType: Production Planning Tool,Get Sales Orders,Get Sales urdhëron
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} nuk mund të jetë negative
 DocType: Training Event,Self-Study,Self-Study
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Zbritje
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Zbritje
 DocType: Asset,Total Number of Depreciations,Numri i përgjithshëm i nënçmime
 DocType: Sales Invoice Item,Rate With Margin,Shkalla me diferencë
 DocType: Sales Invoice Item,Rate With Margin,Shkalla me diferencë
@@ -1210,7 +1236,7 @@
 DocType: Task,Urgent,Urgjent
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Ju lutem specifikoni një ID te vlefshme Row për rresht {0} në tryezë {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Nuk mund të gjeni ndryshore:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Ju lutemi zgjidhni një fushë për të redaktuar nga numpad
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Ju lutemi zgjidhni një fushë për të redaktuar nga numpad
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Shko në Desktop dhe të fillojë përdorimin ERPNext
 DocType: Item,Manufacturer,Prodhues
 DocType: Landed Cost Item,Purchase Receipt Item,Blerje Pranimi i artikullit
@@ -1241,8 +1267,8 @@
 DocType: GL Entry,Against,Kundër
 DocType: Item,Default Selling Cost Center,Gabim Qendra Shitja Kosto
 DocType: Sales Partner,Implementation Partner,Partner Zbatimi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Kodi Postal
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Sales Order {0} është {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Kodi Postal
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Sales Order {0} është {1}
 DocType: Opportunity,Contact Info,Informacionet Kontakt
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Marrja e aksioneve Entries
 DocType: Packing Slip,Net Weight UOM,Net Weight UOM
@@ -1253,6 +1279,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Merr e pushimit javor Datat
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,End Date nuk mund të jetë më pak se Data e fillimit
 DocType: Sales Person,Select company name first.,Përzgjidh kompani emri i parë.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,I ulët në të lartë
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Kuotimet e marra nga furnizuesit.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Replace BOM dhe update çmimin e fundit në të gjitha BOMs
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Për {0} | {1} {2}
@@ -1273,7 +1300,7 @@
 DocType: Program Enrollment,Transportation,Transport
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Atributi i pavlefshëm
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} duhet të dorëzohet
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Sasia duhet të jetë më e vogël se ose e barabartë me {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Sasia duhet të jetë më e vogël se ose e barabartë me {0}
 DocType: SMS Center,Total Characters,Totali Figurë
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},"Ju lutem, përzgjidhni bom në fushën BOM për Item {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Detail C-Forma Faturë
@@ -1288,7 +1315,7 @@
 ,Ordered Items To Be Billed,Items urdhëruar të faturuar
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Nga një distancë duhet të jetë më pak se në rang
 DocType: Global Defaults,Global Defaults,Defaults Global
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Bashkëpunimi Project Ftesë
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Bashkëpunimi Project Ftesë
 DocType: Salary Slip,Deductions,Zbritjet
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Emri i Veprimit
@@ -1306,13 +1333,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Shitjet Faturë Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Asgjë për të kërkuar
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Një tjetër rekord i buxhetit &#39;{0}&#39; ekziston kundër {1} &#39;{2}&#39; për vitin fiskal {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','Data e Fillimit' nuk mund të jetë më i madh se 'Data e Mbarimit'
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','Data e Fillimit' nuk mund të jetë më i madh se 'Data e Mbarimit'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Drejtuesit
 DocType: Cheque Print Template,Payer Settings,Cilësimet paguesit
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Kjo do t&#39;i bashkëngjitet Kodit Pika e variant. Për shembull, në qoftë se shkurtim juaj është &quot;SM&quot;, dhe kodin pika është &quot;T-shirt&quot;, kodi pika e variantit do të jetë &quot;T-shirt-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Neto Pay (me fjalë) do të jetë i dukshëm një herë ju ruani gabim pagave.
 DocType: Purchase Invoice,Is Return,Është Kthimi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Kujdes
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Kujdes
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Kthimi / Debiti Note
 DocType: Price List Country,Price List Country,Lista e Çmimeve Vendi
 DocType: Item,UOMs,UOMs
@@ -1327,17 +1354,18 @@
 DocType: Account,Balance Sheet,Bilanci i gjendjes
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Qendra Kosto Per Item me Kodin Item &quot;
 DocType: Fee Validity,Valid Till,E vlefshme deri
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode pagesa nuk është i konfiguruar. Ju lutem kontrolloni, nëse llogaria është vendosur në Mode të pagesave ose në POS Profilin."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode pagesa nuk është i konfiguruar. Ju lutem kontrolloni, nëse llogaria është vendosur në Mode të pagesave ose në POS Profilin."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Same artikull nuk mund të futen shumë herë.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Llogaritë e mëtejshme mund të bëhen në bazë të grupeve, por hyra mund të bëhet kundër jo-grupeve"
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Pagueshme
 DocType: Course,Course Intro,Sigurisht Intro
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Stock Hyrja {0} krijuar
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ju lutem vendosni numrat e numrave për Pjesëmarrjen përmes Setup&gt; Seritë e Numërimit
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Stock Hyrja {0} krijuar
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Refuzuar Qty nuk mund të futen në Blerje Kthim
 ,Purchase Order Items To Be Billed,Items Rendit Blerje Për të faturohet
 DocType: Purchase Invoice Item,Net Rate,Net Rate
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Ju lutemi zgjidhni një klient
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Ju lutemi zgjidhni një klient
 DocType: Purchase Invoice Item,Purchase Invoice Item,Blerje Item Faturë
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Ledger Hyrje dhe GL Entries janë reposted për Pranimeve zgjedhura Blerje
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Pika 1
@@ -1358,7 +1386,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Duplicate rresht {0} me të njëjtën {1}
 ,Trial Balance,Bilanci gjyqi
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Viti Fiskal {0} nuk u gjet
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Ngritja Punonjësit
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Ngritja Punonjësit
 DocType: Sales Order,SO-,KËSHTU QË-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,"Ju lutem, përzgjidhni prefiks parë"
 DocType: Employee,O-,O-
@@ -1370,12 +1398,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Shiko Ledger
 DocType: Grading Scale,Intervals,intervalet
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Hershme
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Një Grup Item ekziston me të njëjtin emër, ju lutemi të ndryshojë emrin pika ose riemërtoj grupin pika"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Një Grup Item ekziston me të njëjtin emër, ju lutemi të ndryshojë emrin pika ose riemërtoj grupin pika"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Pjesa tjetër e botës
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Pjesa tjetër e botës
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} nuk mund të ketë Serisë
 ,Budget Variance Report,Buxheti Varianca Raport
 DocType: Salary Slip,Gross Pay,Pay Bruto
+DocType: Item,Is Item from Hub,Është pika nga Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Row {0}: Aktiviteti lloji është i detyrueshëm.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividentët e paguar
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Ledger Kontabilitet
@@ -1385,8 +1414,9 @@
 DocType: Vehicle Log,Service Detail,Detail shërbimit
 DocType: BOM,Item Description,Përshkrimi i artikullit
 DocType: Student Sibling,Student Sibling,Student vëlla
-DocType: Purchase Invoice,Is Recurring,Është i vazhdueshëm
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Mode Pagesa
 DocType: Purchase Invoice,Supplied Items,Artikujve të furnizuara
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Vendosni një menu aktive për restorantin {0}
 DocType: Student,STUD.,Kurvar.
 DocType: Production Order,Qty To Manufacture,Qty Për Prodhimi
 DocType: Email Digest,New Income,Të ardhurat e re
@@ -1397,6 +1427,7 @@
 ,Student and Guardian Contact Details,Student dhe Guardian Detajet e Kontaktit
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Row {0}: Për të furnizuesit {0} Adresa Email është e nevojshme për të dërguar një email
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Hapja e përkohshme
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Shiko Qendrën
 ,Employee Leave Balance,Punonjës Pushimi Bilanci
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Gjendjen e llogarisë {0} duhet të jetë gjithmonë {1}
 DocType: Patient Appointment,More Info,More Info
@@ -1416,13 +1447,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Sales Order {0} nuk është e vlefshme
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Paralajmëroni për Kërkesë të re për Kuotime
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,urdhrat e blerjes t&#39;ju ndihmuar të planit dhe të ndjekin deri në blerjet tuaja
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Na vjen keq, kompanitë nuk mund të bashkohen"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Na vjen keq, kompanitë nuk mund të bashkohen"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Recetat e testit të laboratorit
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",totale sasia Çështja / Transfer {0} në materiale Kërkesë {1} \ nuk mund të jetë më e madhe se sasia e kërkuar {2} për pikën {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,I vogël
 DocType: Employee,Employee Number,Numri punonjës
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Rast No (s) në përdorim. Provoni nga Rasti Nr {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Rast No (s) në përdorim. Provoni nga Rasti Nr {0}
 DocType: Project,% Completed,% Kompletuar
 ,Invoiced Amount (Exculsive Tax),Shuma e faturuar (Tax Exculsive)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Item 2
@@ -1437,11 +1468,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Shpenzimet indirekte
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Row {0}: Qty është e detyrueshme
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Bujqësi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Produktet ose shërbimet tuaja
 DocType: Special Test Items,Special Test Items,Artikujt e veçantë të testimit
 DocType: Mode of Payment,Mode of Payment,Mënyra e pagesës
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Faqja Image duhet të jetë një file publik ose URL website
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Faqja Image duhet të jetë një file publik ose URL website
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Ky është një grup artikull rrënjë dhe nuk mund të redaktohen.
@@ -1449,9 +1480,9 @@
 DocType: Vehicle,Fuel UOM,Fuel UOM
 DocType: Warehouse,Warehouse Contact Info,Magazina Kontaktimit
 DocType: Payment Entry,Write Off Difference Amount,Shkruaj Off Diferenca Shuma
-DocType: Purchase Invoice,Recurring Type,Përsëritur Type
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: email Punonjësi nuk gjendet, kështu nuk email dërguar"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: email Punonjësi nuk gjendet, kështu nuk email dërguar"
 DocType: Item,Foreign Trade Details,Jashtëm Details Tregtisë
+,Assessment Plan Status,Statusi i Planit të Vlerësimit
 DocType: Email Digest,Annual Income,Të ardhurat vjetore
 DocType: Serial No,Serial No Details,Serial No Detajet
 DocType: Purchase Invoice Item,Item Tax Rate,Item Tax Rate
@@ -1459,15 +1490,14 @@
 DocType: Student Group Student,Group Roll Number,Grupi Roll Number
 DocType: Student Group Student,Group Roll Number,Grupi Roll Number
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Për {0}, vetëm llogaritë e kreditit mund të jetë i lidhur kundër një tjetër hyrje debiti"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total i të gjitha peshave duhet të jetë detyrë 1. Ju lutemi të rregulluar peshat e të gjitha detyrave të Projektit në përputhje me rrethanat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Ofrimit Shënim {0} nuk është dorëzuar
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total i të gjitha peshave duhet të jetë detyrë 1. Ju lutemi të rregulluar peshat e të gjitha detyrave të Projektit në përputhje me rrethanat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Ofrimit Shënim {0} nuk është dorëzuar
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Item {0} duhet të jetë një nënkontraktohet Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Pajisje kapitale
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Rregulla e Çmimeve është zgjedhur për herë të parë në bazë të &quot;Apliko në &#39;fushë, të cilat mund të jenë të artikullit, Grupi i artikullit ose markë."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Ju lutemi të vendosni fillimisht Kodin e Artikullit
-DocType: Hub Settings,Seller Website,Shitës Faqja
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Ju lutemi të vendosni fillimisht Kodin e Artikullit
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Gjithsej përqindje ndarë për shitjet e ekipit duhet të jetë 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Gjithsej përqindje ndarë për shitjet e ekipit duhet të jetë 100
 DocType: Sales Invoice Item,Edit Description,Ndrysho Përshkrimi
 DocType: Antibiotic,Antibiotic,antibiotik
 ,Team Updates,Ekipi Updates
@@ -1488,12 +1518,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Total (Kompania Valuta)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Numri serik {0} hyrë më shumë se një herë
 DocType: Depreciation Schedule,Journal Entry,Journal Hyrja
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} artikuj në progres
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} artikuj në progres
 DocType: Workstation,Workstation Name,Workstation Emri
 DocType: Grading Scale Interval,Grade Code,Kodi Grade
 DocType: POS Item Group,POS Item Group,POS Item Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} nuk i përket Item {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} nuk i përket Item {1}
 DocType: Sales Partner,Target Distribution,Shpërndarja Target
 DocType: Salary Slip,Bank Account No.,Llogarisë Bankare Nr
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Ky është numri i transaksionit të fundit të krijuar me këtë prefiks
@@ -1510,10 +1540,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Kërkesë për Kuotim Furnizuesit
 DocType: Healthcare Settings,Registration Message,Mesazhi i regjistrimit
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Hardware
-DocType: Sales Order,Recurring Upto,përsëritur upto
 DocType: Prescription Dosage,Prescription Dosage,Dozimi i recetës
 DocType: Attendance,HR Manager,Menaxher HR
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Ju lutem zgjidhni një Company
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Ju lutem zgjidhni një Company
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Privilegj Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Furnizuesi Data e faturës
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,për
@@ -1529,10 +1558,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Kushtet e mbivendosjes gjenden në mes:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Kundër Fletoren Hyrja {0} është përshtatur tashmë kundër një kupon tjetër
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Vlera Totale Rendit
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Ushqim
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Ushqim
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Gama plakjen 3
 DocType: Maintenance Schedule Item,No of Visits,Nr i vizitave
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Mirëmbajtja Shtojca {0} ekziston kundër {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Dëshiron të publikosh artikujt tuaj në hub?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,studenti regjistrimit
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Monedhën e llogarisë Mbyllja duhet të jetë {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Shuma e pikëve për të gjitha qëllimet duhet të jetë 100. Kjo është {0}
@@ -1543,9 +1573,9 @@
 DocType: Authorization Rule,Average Discount,Discount mesatar
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Shërbime komunale
-DocType: Purchase Invoice Item,Accounting,Llogaritje
+DocType: POS Profile,Accounting,Llogaritje
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,"Ju lutem, përzgjidhni tufa për artikull në pako"
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,"Ju lutem, përzgjidhni tufa për artikull në pako"
 DocType: Asset,Depreciation Schedules,Oraret e amortizimit
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Periudha e aplikimit nuk mund të jetë periudhë ndarja leje jashtë
 DocType: Activity Cost,Projects,Projektet
@@ -1561,7 +1591,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',Miratimi Statusi duhet të jetë &quot;miratuar&quot; ose &quot;Refuzuar &#39;
 DocType: Physician,Contacts and Address,Kontaktet dhe Adresa
 DocType: Purchase Invoice,Contact Person,Personi kontaktues
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&quot;Pritet Data e Fillimit &#39;nuk mund të jetë më i madh se&quot; Data e Përfundimit e pritshme&#39;
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&quot;Pritet Data e Fillimit &#39;nuk mund të jetë më i madh se&quot; Data e Përfundimit e pritshme&#39;
 DocType: Course Scheduling Tool,Course End Date,Sigurisht End Date
 DocType: Holiday List,Holidays,Pushime
 DocType: Sales Order Item,Planned Quantity,Sasia e planifikuar
@@ -1569,10 +1599,11 @@
 DocType: Item,Maintain Stock,Ruajtja Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Stock Entries krijuar tashmë për Rendin Production
 DocType: Employee,Prefered Email,i preferuar Email
+DocType: Student Admission,Eligibility and Details,Pranueshmëria dhe Detajet
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Ndryshimi neto në aseteve fikse
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lini bosh nëse konsiderohet për të gjitha përcaktimeve
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Ngarkesa e tipit &#39;aktuale&#39; në rresht {0} nuk mund të përfshihen në Item Rate
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Nga datetime
 DocType: Email Digest,For Company,Për Kompaninë
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log komunikimi.
@@ -1580,19 +1611,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Rezultati i rezultatit të furnitorit që shënon variablën
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Blerja Shuma
 DocType: Sales Invoice,Shipping Address Name,Transporti Adresa Emri
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Lista e Llogarive
 DocType: Material Request,Terms and Conditions Content,Termat dhe Kushtet Përmbajtja
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,nuk mund të jetë më i madh se 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Item {0} nuk është një gjendje Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Item {0} nuk është një gjendje Item
 DocType: Maintenance Visit,Unscheduled,Paplanifikuar
 DocType: Employee,Owned,Pronësi
 DocType: Salary Detail,Depends on Leave Without Pay,Varet në pushim pa pagesë
 DocType: Pricing Rule,"Higher the number, higher the priority","Më i lartë numri, më i lartë prioriteti"
 ,Purchase Invoice Trends,Blerje Trendet Faturë
 DocType: Employee,Better Prospects,Perspektivë më të mirë
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Rresht # {0}: The batch {1} ka vetëm {2} Qty. Ju lutem zgjidhni një tjetër grumbull cila ka {3} Qty në dispozicion ose ndarë rresht në rreshta të shumta, për të ofruar / çështje nga tufa të shumta"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Rresht # {0}: The batch {1} ka vetëm {2} Qty. Ju lutem zgjidhni një tjetër grumbull cila ka {3} Qty në dispozicion ose ndarë rresht në rreshta të shumta, për të ofruar / çështje nga tufa të shumta"
 DocType: Vehicle,License Plate,Targë
 DocType: Appraisal,Goals,Qëllimet
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Zgjidh Profilin e POS
 DocType: Warranty Claim,Warranty / AMC Status,Garanci / AMC Statusi
 ,Accounts Browser,Llogaritë Browser
 DocType: Payment Entry Reference,Payment Entry Reference,Pagesa Reference Hyrja
@@ -1610,7 +1641,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Punonjësi nuk mund të raportojnë për veten e tij.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Në qoftë se llogaria është e ngrirë, shënimet janë të lejuar për përdoruesit të kufizuara."
 DocType: Email Digest,Bank Balance,Bilanci bankë
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Hyrja Kontabiliteti për {0}: {1} mund të bëhen vetëm në monedhën: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Hyrja Kontabiliteti për {0}: {1} mund të bëhen vetëm në monedhën: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profili i punës, kualifikimet e nevojshme etj"
 DocType: Journal Entry Account,Account Balance,Bilanci i llogarisë
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Rregulla taksë për transaksionet.
@@ -1619,8 +1650,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Totali Taksat dhe Tarifat (Kompania Valuta)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Trego P &amp; L bilancet pambyllur vitit fiskal
 DocType: Lab Test Template,Collection Details,Detajet e mbledhjes
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","zgjidhni cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date nga tabConsultation ct, `tabLab Prescription` cp ku ct.patient = &#39;{0}&#39; dhe cp.parent = ct. emri dhe cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Llogaria anijeve
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Llogaria {2} është joaktiv
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Bëni Sales urdhëron për të ndihmuar ju planifikoni punën tuaj dhe të japë në kohë
@@ -1637,7 +1666,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Shqip Paketimi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Zyra Qira
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS settings portë
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import dështoi!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import dështoi!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Ka adresë shtuar ende.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation orë pune
 DocType: Vital Signs,Blood Pressure,Presioni i gjakut
@@ -1662,7 +1691,7 @@
 DocType: Sales Invoice,Source,Burim
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Shfaq të mbyllura
 DocType: Leave Type,Is Leave Without Pay,Lini është pa pagesë
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Asset Kategoria është i detyrueshëm për artikull Aseteve Fikse
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Asset Kategoria është i detyrueshëm për artikull Aseteve Fikse
 DocType: Fee Validity,Fee Validity,Vlefshmëria e tarifës
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nuk u gjetën në tabelën e Pagesave të dhënat
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Kjo {0} konfliktet me {1} për {2} {3}
@@ -1683,8 +1712,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Ekzekutiv Kërko
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Krijo kryeson
 DocType: Maintenance Schedule,Schedules,Oraret
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,Profil POS duhet të përdorë Point-of-Sale
 DocType: Purchase Invoice Item,Net Amount,Shuma neto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} nuk ka qenë i paraqitur në mënyrë veprimi nuk mund të përfundojë
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} nuk ka qenë i paraqitur në mënyrë veprimi nuk mund të përfundojë
 DocType: Purchase Order Item Supplied,BOM Detail No,Bom Detail Asnjë
 DocType: Landed Cost Voucher,Additional Charges,akuza të tjera
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Shtesë Shuma Discount (Valuta Company)
@@ -1693,7 +1723,7 @@
 ,Support Hour Distribution,Shpërndarja e orëve të mbështetjes
 DocType: Maintenance Visit,Maintenance Visit,Mirëmbajtja Vizitoni
 DocType: Student,Leaving Certificate Number,Lënia Certifikata Numri
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Emërimi u anulua, Ju lutem shqyrtoni dhe anuloni faturën {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Emërimi u anulua, Ju lutem shqyrtoni dhe anuloni faturën {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Batch dispozicion Qty në Magazina
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Update Print Format
 DocType: Landed Cost Voucher,Landed Cost Help,Zbarkoi Kosto Ndihmë
@@ -1716,8 +1746,8 @@
 DocType: Patient,Tobacco Past Use,Përdorimi i Kaluar i Duhanit
 DocType: Sales Invoice Item,Brand Name,Brand Name
 DocType: Purchase Receipt,Transporter Details,Detajet Transporter
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Përdoruesi {0} është caktuar tashmë tek Mjeku {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,depo Default është e nevojshme për pika të zgjedhura
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Përdoruesi {0} është caktuar tashmë tek Mjeku {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,depo Default është e nevojshme për pika të zgjedhura
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Kuti
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,mundur Furnizuesi
 DocType: Budget,Monthly Distribution,Shpërndarja mujore
@@ -1727,8 +1757,8 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 DocType: Loan Type,Maximum Loan Amount,Shuma maksimale e kredisë
 DocType: Pricing Rule,Pricing Rule,Rregulla e Çmimeve
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Numri Duplicate roll për nxënës {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Numri Duplicate roll për nxënës {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Numri Duplicate roll për nxënës {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Numri Duplicate roll për nxënës {0}
 DocType: Budget,Action if Annual Budget Exceeded,Veprimi në qoftë Buxheti vjetor Tejkaluar
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Kërkesë materiale për të blerë Radhit
 DocType: Shopping Cart Settings,Payment Success URL,Pagesa Suksesi URL
@@ -1745,7 +1775,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} duhet të shfaqen vetëm një herë
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nuk lejohet të tranfer më {0} se {1} kundër Rendit Blerje {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Lë alokuar sukses për {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Asnjë informacion që të dal
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Asnjë informacion që të dal
 DocType: Shipping Rule Condition,From Value,Nga Vlera
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Prodhim Sasia është e detyrueshme
 DocType: Employee Loan,Repayment Method,Metoda Ripagimi
@@ -1759,6 +1789,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Stock Detyrimet
 DocType: Purchase Invoice,Supplier Warehouse,Furnizuesi Magazina
 DocType: Opportunity,Contact Mobile No,Kontaktoni Mobile Asnjë
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Zgjidh kompanisë
 ,Material Requests for which Supplier Quotations are not created,Kërkesat materiale për të cilat Kuotimet Furnizuesi nuk janë krijuar
 DocType: Student Group,Set 0 for no limit,Set 0 për pa limit
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dita (s) në të cilin ju po aplikoni për leje janë festa. Ju nuk duhet të aplikoni për leje.
@@ -1768,24 +1799,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Bëni Kuotim
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Raportet tjera
 DocType: Dependent Task,Dependent Task,Detyra e varur
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Faktori i konvertimit për Njësinë e parazgjedhur të Masës duhet të jetë 1 në rreshtin e {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Faktori i konvertimit për Njësinë e parazgjedhur të Masës duhet të jetë 1 në rreshtin e {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Pushimi i tipit {0} nuk mund të jetë më i gjatë se {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Provoni planifikimin e operacioneve për ditë X paraprakisht.
 DocType: HR Settings,Stop Birthday Reminders,Stop Ditëlindja Harroni
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Ju lutemi të vendosur Default Payroll Llogaria e pagueshme në Kompaninë {0}
 DocType: SMS Center,Receiver List,Marresit Lista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Kërko Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Kërko Item
 DocType: Patient Appointment,Referring Physician,Mjeku referues
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Shuma konsumuar
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Ndryshimi neto në para të gatshme
 DocType: Assessment Plan,Grading Scale,Scale Nota
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Njësia e masës {0} ka hyrë më shumë se një herë në Konvertimi Faktori Tabelën
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,përfunduar tashmë
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Njësia e masës {0} ka hyrë më shumë se një herë në Konvertimi Faktori Tabelën
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,përfunduar tashmë
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock In Hand
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Kërkesa pagesa tashmë ekziston {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kostoja e Artikujve emetuara
 DocType: Physician,Hospital,spital
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Sasia nuk duhet të jetë më shumë se {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Sasia nuk duhet të jetë më shumë se {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Previous Viti financiar nuk është e mbyllur
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Mosha (ditë)
 DocType: Quotation Item,Quotation Item,Citat Item
@@ -1796,8 +1827,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Furnizuesi Lloji mjeshtër.
 DocType: Purchase Order Item,Supplier Part Number,Furnizuesi Pjesa Numër
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Shkalla e konvertimit nuk mund të jetë 0 ose 1
-DocType: Sales Invoice,Reference Document,Dokumenti Referenca
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} është anuluar ose ndaluar
+DocType: Subscription,Reference Document,Dokumenti Referenca
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} është anuluar ose ndaluar
 DocType: Accounts Settings,Credit Controller,Kontrolluesi krediti
 DocType: Delivery Note,Vehicle Dispatch Date,Automjeteve Dërgimi Data
 DocType: Healthcare Settings,Default Medical Code Standard,Standardi i Kodit të Mjekësisë Default
@@ -1806,6 +1837,7 @@
 DocType: Company,Default Payable Account,Gabim Llogaria pagueshme
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Cilësimet për internet shopping cart tilla si rregullat e transportit detar, lista e çmimeve etj"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% faturuar
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Rendit sipas Çmimit ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Qty rezervuara
 DocType: Party Account,Party Account,Llogaria Partia
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Burimeve Njerëzore
@@ -1817,13 +1849,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Bëni disbursimi Hyrja
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Advance kundër Furnizuesit duhet të debiti
 DocType: Company,Default Values,Vlerat Default
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frekuencë} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Frekuencë} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Shuma totale rimbursohen
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Kjo është e bazuar në shkrimet kundër këtij automjeteve. Shih afat kohor më poshtë për detaje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Kundër Furnizuesin Fatura {0} datë {1}
 DocType: Customer,Default Price List,E albumit Lista e Çmimeve
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Rekord Lëvizja Asset {0} krijuar
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ju nuk mund të fshini Viti Fiskal {0}. Viti Fiskal {0} është vendosur si default në Settings Global
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Një klient me të njëjtin emër tashmë ekziston
 DocType: Journal Entry,Entry Type,Hyrja Lloji
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Nuk ka plan vlerësimi lidhur me këtë grup të vlerësimit
 ,Customer Credit Balance,Bilanci Customer Credit
@@ -1834,7 +1867,7 @@
 DocType: Quotation,Term Details,Detajet Term
 DocType: Project,Total Sales Cost (via Sales Order),Sales Total Kosto (via Sales Order)
 DocType: Project,Total Sales Cost (via Sales Order),Sales Total Kosto (via Sales Order)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Nuk mund të regjistrohen më shumë se {0} nxënësve për këtë grup të studentëve.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Nuk mund të regjistrohen më shumë se {0} nxënësve për këtë grup të studentëve.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Numërimi Lead
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Numërimi Lead
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} duhet të jetë më i madh se 0
@@ -1852,9 +1885,11 @@
 DocType: Lab Test,Technician Name,Emri Teknik
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Shkëput Pagesa mbi anulimin e Faturë
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Leximi aktuale Odometer hyrë duhet të jetë më i madh se fillestare automjeteve rrugëmatës {0}
+DocType: Restaurant Reservation,No Show,Asnjë shfaqje
 DocType: Shipping Rule Country,Shipping Rule Country,Rregulla Shipping Vendi
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Lini dhe Pjesëmarrja
 DocType: Maintenance Visit,Partially Completed,Kompletuar Pjesërisht
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Ndjeshmëri e moderuar
 DocType: Leave Type,Include holidays within leaves as leaves,Përfshijnë pushimet brenda lë si gjethe
 DocType: Sales Invoice,Packed Items,Items të mbushura
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garanci Padia kundër Serial Nr
@@ -1871,13 +1906,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Paid Shuma (Kompania Valuta)
 DocType: Purchase Invoice,Additional Discount,Discount shtesë
 DocType: Selling Settings,Selling Settings,Shitja Settings
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Konfirmo veprimin
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Auctions Online
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Ju lutem specifikoni ose Sasia apo vlerësimin Vlerësoni apo të dyja
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,përmbushje
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Shiko në Shportë
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Shpenzimet e marketingut
 ,Item Shortage Report,Item Mungesa Raport
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Pesha është përmendur, \ nJu lutemi të përmendim &quot;Weight UOM&quot; shumë"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Pesha është përmendur, \ nJu lutemi të përmendim &quot;Weight UOM&quot; shumë"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Kërkesa material përdoret për të bërë këtë Stock Hyrja
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Zhvlerësimi Data Next është i detyrueshëm për pasuri të re
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Sigurisht veçantë bazuar Grupi për çdo Batch
@@ -1890,12 +1926,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Bëni hyrje të kontabilitetit për çdo veprim Stock
 DocType: Leave Allocation,Total Leaves Allocated,Totali Lë alokuar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Magazina kërkohet në radhë nr {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Ju lutem shkruani Viti Financiar i vlefshëm Start dhe Datat Fundi
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Ju lutem shkruani Viti Financiar i vlefshëm Start dhe Datat Fundi
 DocType: Employee,Date Of Retirement,Data e daljes në pension
 DocType: Upload Attendance,Get Template,Get Template
 DocType: Material Request,Transferred,transferuar
 DocType: Vehicle,Doors,Dyer
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext Setup Complete!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Mblidhni Tarifën për Regjistrimin e Pacientëve
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,Breakup Tax
@@ -1914,37 +1950,37 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Nëse ky artikull ka variante, atëherë ajo nuk mund të zgjidhen në shitje urdhrat etj"
 DocType: Lead,Next Contact By,Kontakt Next By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Sasia e nevojshme për Item {0} në rresht {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Sasia e nevojshme për Item {0} në rresht {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Magazina {0} nuk mund të fshihet si ekziston sasia e artikullit {1}
 DocType: Quotation,Order Type,Rendit Type
-DocType: Purchase Invoice,Notification Email Address,Njoftimi Email Adresa
 ,Item-wise Sales Register,Pika-mençur Sales Regjistrohu
 DocType: Asset,Gross Purchase Amount,Shuma Blerje Gross
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Hapjet e hapjes
 DocType: Asset,Depreciation Method,Metoda e amortizimit
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,në linjë
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,në linjë
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,A është kjo Tatimore të përfshira në normën bazë?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Target Total
 DocType: Job Applicant,Applicant for a Job,Aplikuesi për një punë
 DocType: Production Plan Material Request,Production Plan Material Request,Prodhimi Plan Material Request
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Nuk urdhërat e prodhimit të krijuara
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Nuk urdhërat e prodhimit të krijuara
 DocType: Stock Reconciliation,Reconciliation JSON,Pajtimi JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Shumë kolona. Eksportit raportin dhe të shtypura duke përdorur një aplikim spreadsheet.
 DocType: Purchase Invoice Item,Batch No,Batch Asnjë
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Kërkesa për kuotim: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Lejo Sales shumta urdhra kundër Rendit Blerje një konsumatorit
 DocType: Student Group Instructor,Student Group Instructor,Grupi Student Instruktor
 DocType: Student Group Instructor,Student Group Instructor,Grupi Student Instruktor
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Kryesor
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Kryesor
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Prefiksi vendosur për numëron seri mbi transaksionet tuaja
 DocType: Employee Attendance Tool,Employees HTML,punonjësit HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Gabim BOM ({0}) duhet të jetë aktiv për këtë artikull ose template saj
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Gabim BOM ({0}) duhet të jetë aktiv për këtë artikull ose template saj
 DocType: Employee,Leave Encashed?,Dërgo arkëtuar?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Nga fushë është e detyrueshme
 DocType: Email Digest,Annual Expenses,Shpenzimet vjetore
 DocType: Item,Variants,Variantet
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Bëni Rendit Blerje
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Bëni Rendit Blerje
 DocType: SMS Center,Send To,Send To
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Nuk ka bilanc mjaft leje për pushim Lloji {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Shuma e ndarë
@@ -1961,6 +1997,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Grupi Student Forca
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Kundër Fletoren Hyrja {0} nuk ka asnjë pashoq {1} hyrje
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,vlerësime
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Ngjarje Trajnimi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Duplicate Serial Asnjë hyrë për Item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Një kusht për Sundimin Shipping
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Ju lutemi shkruani
@@ -1970,7 +2007,7 @@
 DocType: Sales Order,To Deliver and Bill,Për të ofruar dhe Bill
 DocType: Student Group,Instructors,instruktorët
 DocType: GL Entry,Credit Amount in Account Currency,Shuma e kredisë në llogari në monedhë të
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} duhet të dorëzohet
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} duhet të dorëzohet
 DocType: Authorization Control,Authorization Control,Kontrolli Autorizimi
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Rejected Magazina është e detyrueshme kundër Item refuzuar {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Pagesa
@@ -1989,11 +2026,11 @@
 DocType: Quotation Item,Actual Qty,Aktuale Qty
 DocType: Sales Invoice Item,References,Referencat
 DocType: Quality Inspection Reading,Reading 10,Leximi 10
-DocType: Hub Settings,Hub Node,Hub Nyja
+DocType: Hub Category,Hub Node,Hub Nyja
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Ju keni hyrë artikuj kopjuar. Ju lutemi të ndrequr dhe provoni përsëri.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Koleg
 DocType: Asset Movement,Asset Movement,Lëvizja e aseteve
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,Shporta e re
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,Shporta e re
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Item {0} nuk është një Item serialized
 DocType: SMS Center,Create Receiver List,Krijo Marresit Lista
 DocType: Vehicle,Wheels,rrota
@@ -2007,15 +2044,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikacionit
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Tregon se paketa është pjesë e këtij ofrimit (Vetëm draft)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Kryej pagesa Hyrja
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Sasia e artikullit {0} duhet të jetë më pak se {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Sasia e artikullit {0} duhet të jetë më pak se {1}
 ,Sales Invoice Trends,Shitjet Trendet faturave
 DocType: Leave Application,Apply / Approve Leaves,Aplikoni / Miratimi Leaves
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Për
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Për
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Mund t&#39;i referohet rresht vetëm nëse tipi është ngarkuar &quot;Për Previous Shuma Row &#39;ose&#39; Previous Row Total&quot;
 DocType: Sales Order Item,Delivery Warehouse,Ofrimit Magazina
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Pema e Qendrave te Kostos financiare.
 DocType: Serial No,Delivery Document No,Ofrimit Dokumenti Asnjë
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Ju lutemi të vendosur &#39;Gain llogari / humbje neto nga shitja aseteve&#39; në kompaninë {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Ju lutemi të vendosur &#39;Gain llogari / humbje neto nga shitja aseteve&#39; në kompaninë {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Të marrë sendet nga Pranimeve Blerje
 DocType: Serial No,Creation Date,Krijimi Data
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Item {0} shfaqet herë të shumta në Çmimi Lista {1}
@@ -2026,12 +2063,13 @@
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Ka Variantet
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Përditësoni përgjigjen
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Ju keni zgjedhur tashmë artikuj nga {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Ju keni zgjedhur tashmë artikuj nga {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Emri i Shpërndarjes Mujore
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Grumbull ID është i detyrueshëm
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Grumbull ID është i detyrueshëm
 DocType: Sales Person,Parent Sales Person,Shitjet prind Person
-DocType: Purchase Invoice,Recurring Invoice,Fatura përsëritur
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Lartë në të ulët
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Zgjidhni programin e parë
 DocType: Patient Appointment,Patient Age,Mosha e pacientit
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Menaxhimi i Projekteve
 DocType: Supplier,Supplier of Goods or Services.,Furnizuesi i mallrave ose shërbimeve.
@@ -2039,8 +2077,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Llogaritë e llogarive të arkëtueshme që do të përdoren nëse nuk vendosen në pacient për të rezervuar akuzat e Konsultimit.
 DocType: Vehicle Log,Fuel Price,Fuel Price
 DocType: Budget,Budget,Buxhet
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Cakto hapur
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Fixed Item Aseteve duhet të jetë një element jo-aksioneve.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Cakto hapur
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Fixed Item Aseteve duhet të jetë një element jo-aksioneve.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Buxheti nuk mund të caktohet {0} kundër, pasi kjo nuk është një llogari të ardhura ose shpenzime"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Arritur
 DocType: Student Admission,Application Form Route,Formular Aplikimi Route
@@ -2054,12 +2092,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Item {0} nuk është setup për Serial Nr. Kontrolloni mjeshtër Item
 DocType: Maintenance Visit,Maintenance Time,Mirëmbajtja Koha
 ,Amount to Deliver,Shuma për të Ofruar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Artikulli i njëjtë është futur disa herë. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term Data e fillimit nuk mund të jetë më herët se Year Data e fillimit të vitit akademik në të cilin termi është i lidhur (Viti Akademik {}). Ju lutem, Korrigjo datat dhe provoni përsëri."
 DocType: Guardian,Guardian Interests,Guardian Interesat
 DocType: Naming Series,Current Value,Vlera e tanishme
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,vite të shumta fiskale ekzistojnë për datën {0}. Ju lutemi të vënë kompaninë në vitin fiskal
 DocType: School Settings,Instructor Records to be created by,Regjistruesi i instruktorit të krijohet nga
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} krijuar
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} krijuar
 DocType: Delivery Note Item,Against Sales Order,Kundër Sales Rendit
 ,Serial No Status,Serial Asnjë Statusi
 DocType: Payment Entry Reference,Outstanding,i shquar
@@ -2069,10 +2108,10 @@
 						must be greater than or equal to {2}","Row {0}: Për të vendosur {1} periodiciteti, dallimi në mes të dhe në datën \ duhet të jetë më e madhe se ose e barabartë me {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Kjo është e bazuar në lëvizjen e aksioneve. Shih {0} për detaje
 DocType: Pricing Rule,Selling,Shitja
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Shuma {0} {1} zbritur kundër {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Shuma {0} {1} zbritur kundër {2}
 DocType: Employee,Salary Information,Informacione paga
 DocType: Sales Person,Name and Employee ID,Emri dhe punonjës ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Për shkak Data nuk mund të jetë para se të postimi Data
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Për shkak Data nuk mund të jetë para se të postimi Data
 DocType: Website Item Group,Website Item Group,Faqja kryesore Item Grupi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Detyrat dhe Taksat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Ju lutem shkruani datën Reference
@@ -2098,7 +2137,7 @@
 DocType: Issue,Resolution Details,Rezoluta Detajet
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alokimet
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Kriteret e pranimit
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Ju lutemi shkruani Kërkesat materiale në tabelën e mësipërme
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Ju lutemi shkruani Kërkesat materiale në tabelën e mësipërme
 DocType: Item Attribute,Attribute Name,Atribut Emri
 DocType: BOM,Show In Website,Shfaq Në Website
 DocType: Shopping Cart Settings,Show Quantity in Website,Trego sasia në faqen
@@ -2107,7 +2146,7 @@
 DocType: Item Reorder,Check in (group),Kontrolloni në (grupi)
 ,Qty to Order,Qty të Rendit
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Kreu Llogaria nën pasiv ose kapital, në të cilën Fitimi / Humbja do të jetë e rezervuar"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Grafiku Gantt e të gjitha detyrave.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Grafiku Gantt e të gjitha detyrave.
 DocType: Opportunity,Mins to First Response,Minuta për Përgjigje Parë
 DocType: Pricing Rule,Margin Type,margin Lloji
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} orë
@@ -2129,36 +2168,36 @@
 DocType: Patient,Surgical History,Historia kirurgjikale
 DocType: Employee,Resignation Letter Date,Dorëheqja Letër Data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Rregullat e Çmimeve të filtruar më tej në bazë të sasisë.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Ju lutemi të vendosur datën e bashkuar për të punësuar {0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Ju lutemi të vendosur datën e bashkuar për të punësuar {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Ju lutemi të vendosur datën e bashkuar për të punësuar {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Ju lutemi të vendosur datën e bashkuar për të punësuar {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Total Shuma Faturimi (via Koha Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Përsëriteni ardhurat Klientit
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) duhet të ketë rol &#39;aprovuesi kurriz&#39;
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Palë
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Zgjidhni bom dhe Qty për Prodhimin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Zgjidhni bom dhe Qty për Prodhimin
 DocType: Asset,Depreciation Schedule,Zhvlerësimi Orari
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Adresat Sales partner dhe Kontakte
 DocType: Bank Reconciliation Detail,Against Account,Kundër Llogaria
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Half Data Day duhet të jetë midis Nga Data dhe deri më sot
 DocType: Maintenance Schedule Detail,Actual Date,Aktuale Data
 DocType: Item,Has Batch No,Ka Serisë Asnjë
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Faturimi vjetore: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Faturimi vjetore: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Mallrat dhe Shërbimet Tatimore (GST India)
 DocType: Delivery Note,Excise Page Number,Akciza Faqja Numër
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Kompania, Nga Data dhe deri më sot është e detyrueshme"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Merrni nga Konsultimi
 DocType: Asset,Purchase Date,Blerje Date
 DocType: Employee,Personal Details,Detajet personale
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Ju lutemi të vendosur &#39;të mjeteve Qendra Amortizimi Kosto&#39; në Kompaninë {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Ju lutemi të vendosur &#39;të mjeteve Qendra Amortizimi Kosto&#39; në Kompaninë {0}
 ,Maintenance Schedules,Mirëmbajtja Oraret
 DocType: Task,Actual End Date (via Time Sheet),Aktuale End Date (via Koha Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Shuma {0} {1} kundër {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Shuma {0} {1} kundër {2} {3}
 ,Quotation Trends,Kuotimit Trendet
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Grupi pika nuk përmendet në pikën për të zotëruar pikën {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Debiti te llogaria duhet të jetë një llogari të arkëtueshme
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Debiti te llogaria duhet të jetë një llogari të arkëtueshme
 DocType: Shipping Rule Condition,Shipping Amount,Shuma e anijeve
 DocType: Supplier Scorecard Period,Period Score,Vota e periudhës
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Shto Konsumatorët
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Shto Konsumatorët
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Në pritje Shuma
 DocType: Lab Test Template,Special,i veçantë
 DocType: Purchase Invoice Item,Conversion Factor,Konvertimi Faktori
@@ -2166,13 +2205,14 @@
 ,Vehicle Expenses,Shpenzimet automjeteve
 DocType: Serial No,Invoice Details,detajet e faturës
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Vlera e pritshme pas jetës së dobishme duhet të jetë më e madhe se ose e barabartë me {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Filloni
+DocType: Hub Category,Hub Category,Kategoria Hub
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Numri i Automjeteve
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,Data në të cilën përsëritura fatura do të ndalet
 DocType: Employee Loan,Loan Amount,Shuma e kredisë
 DocType: Program Enrollment,Self-Driving Vehicle,Self-Driving automjeteve
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Përputhësi i rezultatit të furnitorit
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Row {0}: Bill e materialeve nuk u gjet për pika {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Row {0}: Bill e materialeve nuk u gjet për pika {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Gjithsej gjethet e ndara {0} nuk mund të jetë më pak se gjethet tashmë të miratuara {1} për periudhën
 DocType: Journal Entry,Accounts Receivable,Llogaritë e arkëtueshme
 ,Supplier-Wise Sales Analytics,Furnizuesi-i mençur Sales Analytics
@@ -2184,7 +2224,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Kursi Parent (Lini bosh, në qoftë se kjo nuk është pjesë e mëmë natyrisht)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Lini bosh nëse konsiderohet për të gjitha llojet e punonjësve
 DocType: Landed Cost Voucher,Distribute Charges Based On,Shpërndarjen Akuzat Bazuar Në
-apps/erpnext/erpnext/hooks.py +131,Timesheets,timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,timesheets
 DocType: HR Settings,HR Settings,HR Cilësimet
 DocType: Salary Slip,net pay info,info net pay
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Kjo vlerë përditësohet në Listën e Çmimeve të Shitjes së Parazgjedhur.
@@ -2195,7 +2235,7 @@
 DocType: Patient,B Positive,B Pozitiv
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty duhet të jetë 1, pasi pika është një pasuri fikse. Ju lutem përdorni rresht të veçantë për Qty shumëfishtë."
 DocType: Leave Block List Allow,Leave Block List Allow,Dërgo Block Lista Lejoni
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr nuk mund të jetë bosh ose hapësirë
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr nuk mund të jetë bosh ose hapësirë
 DocType: Patient Medical Record,Patient Medical Record,Regjistrimi mjekësor pacient
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Grup për jo-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportiv
@@ -2211,9 +2251,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Në pamundësi për të gjetur kursin e këmbimit për {0} në {1} për datën kyçe {2}. Ju lutem të krijuar një rekord Currency Exchange dorë
 DocType: POS Profile,Price List,Tarifë
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} është tani default Viti Fiskal. Ju lutemi të rifreskoni shfletuesin tuaj për ndryshim të hyjnë në fuqi.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Kërkesat e shpenzimeve
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Kërkesat e shpenzimeve
 DocType: Issue,Support,Mbështetje
 ,BOM Search,Bom Kërko
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Publikoni &quot;Në Stock&quot; ose &quot;Not in Stock&quot; në Hub bazuar në stokun në dispozicion në këtë depo.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Mbyllja (Hapja + arrin)
 DocType: Vehicle,Fuel Type,Fuel Lloji
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Ju lutem specifikoni monedhës në Kompaninë
@@ -2225,16 +2266,16 @@
 DocType: Healthcare Settings,Remind Before,Kujtoj Para
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Faktori UOM Konvertimi është e nevojshme në rresht {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Lloji i dokumentit duhet të jetë një nga Sales Rendit, Sales Fatura ose Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Lloji i dokumentit duhet të jetë një nga Sales Rendit, Sales Fatura ose Journal Entry"
 DocType: Salary Component,Deduction,Zbritje
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Row {0}: Nga koha dhe në kohë është i detyrueshëm.
 DocType: Stock Reconciliation Item,Amount Difference,shuma Diferenca
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Item Çmimi shtuar për {0} në çmim Lista {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Item Çmimi shtuar për {0} në çmim Lista {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Ju lutemi shkruani punonjës Id i këtij personi të shitjes
 DocType: Territory,Classification of Customers by region,Klasifikimi i Konsumatorëve sipas rajonit
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Dallimi Shuma duhet të jetë zero
 DocType: Project,Gross Margin,Marzhi bruto
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Ju lutemi shkruani Prodhimi pikën e parë
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Ju lutemi shkruani Prodhimi pikën e parë
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Llogaritur Banka bilanci Deklarata
 DocType: Normal Test Template,Normal Test Template,Modeli i Testimit Normal
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,përdorues me aftësi të kufizuara
@@ -2244,21 +2285,22 @@
 DocType: Salary Slip,Total Deduction,Zbritje Total
 ,Production Analytics,Analytics prodhimit
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Kjo bazohet në transaksione kundër këtij Pacienti. Shiko detajet më poshtë për detaje
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Kosto Përditësuar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Kosto Përditësuar
 DocType: Employee,Date of Birth,Data e lindjes
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Item {0} tashmë është kthyer
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Viti Fiskal ** përfaqëson një viti financiar. Të gjitha shënimet e kontabilitetit dhe transaksionet tjera të mëdha janë gjurmuar kundër Vitit Fiskal ** **.
 DocType: Opportunity,Customer / Lead Address,Customer / Adresa Lead
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Vendosja e Scorecard Furnizues
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Warning: certifikatë SSL Invalid në shtojcën {0}
-DocType: Student Admission,Eligibility,pranueshmëri
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Emri i Planit të Vlerësimit
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Warning: certifikatë SSL Invalid në shtojcën {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Çon ju ndihmojë të merrni të biznesit, shtoni të gjitha kontaktet tuaja dhe më shumë si çon tuaj"
 DocType: Production Order Operation,Actual Operation Time,Aktuale Operacioni Koha
 DocType: Authorization Rule,Applicable To (User),Për të zbatueshme (User)
 DocType: Purchase Taxes and Charges,Deduct,Zbres
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Përshkrimi i punës
 DocType: Student Applicant,Applied,i aplikuar
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Ri-hapur
 DocType: Sales Invoice Item,Qty as per Stock UOM,Qty sipas Stock UOM
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Emri Guardian2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Karaktere speciale përveç &quot;-&quot; &quot;.&quot;, &quot;#&quot;, dhe &quot;/&quot; nuk lejohet në emërtimin seri"
@@ -2270,7 +2312,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Prodhim Menaxher
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial Asnjë {0} është nën garanci upto {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Shënim Split dorëzimit në pako.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Dërgesat
+apps/erpnext/erpnext/hooks.py +107,Shipments,Dërgesat
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Gjithsej shuma e akorduar (Company Valuta)
 DocType: Purchase Order Item,To be delivered to customer,Që do të dërgohen për të klientit
 DocType: BOM,Scrap Material Cost,Scrap Material Kosto
@@ -2293,8 +2335,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Cilësimet e variantit të artikullit
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Zgjidh kompanisë ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Lini bosh nëse konsiderohet për të gjitha departamentet
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Llojet e punësimit (, kontratë të përhershme, etj intern)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} është e detyrueshme për Item {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Llojet e punësimit (, kontratë të përhershme, etj intern)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} është e detyrueshme për Item {1}
 DocType: Process Payroll,Fortnightly,dyjavor
 DocType: Currency Exchange,From Currency,Nga Valuta
 DocType: Vital Signs,Weight (In Kilogram),Pesha (në kilogram)
@@ -2319,7 +2361,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Ju lutem klikoni në &quot;Generate&quot; Listën për të marrë orarin
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,"Ka pasur gabime, ndërsa fshirjes oraret e mëposhtme:"
 DocType: Bin,Ordered Quantity,Sasi të Urdhërohet
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",p.sh. &quot;Ndërtimi mjetet për ndërtuesit&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",p.sh. &quot;Ndërtimi mjetet për ndërtuesit&quot;
 DocType: Grading Scale,Grading Scale Intervals,Intervalet Nota Scale
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Accounting Hyrja për {2} mund të bëhet vetëm në monedhën: {3}
 DocType: Production Order,In Process,Në Procesin
@@ -2343,11 +2385,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Me pagesën e tatimit
 DocType: Expense Claim Detail,Expense Claim Detail,Shpenzim Kërkesa Detail
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Tri kopje për furnizuesit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,"Ju lutem, përzgjidhni llogarinë e saktë"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,"Ju lutem, përzgjidhni llogarinë e saktë"
 DocType: Item,Weight UOM,Pesha UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Struktura Paga e punonjësve
 DocType: Patient,Blood Group,Grup gjaku
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Në pritje të
 DocType: Course,Course Name,Emri i kursit
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Përdoruesit të cilët mund të miratojë aplikacione të lënë një punonjës të veçantë për
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Zyra Pajisje
@@ -2366,7 +2407,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Çmimet nuk do të shfaqet në qoftë Lista Çmimi nuk është vendosur
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Ju lutem specifikoni një vend për këtë Rregull Shipping ose kontrolloni anijeve në botë
 DocType: Stock Entry,Total Incoming Value,Vlera Totale hyrëse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Debi Për të është e nevojshme
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Debi Për të është e nevojshme
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ndihmojë për të mbajtur gjurmët e kohës, kostos dhe faturimit për Aktivitetet e kryera nga ekipi juaj"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Blerje Lista e Çmimeve
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Modelet e variablave të rezultateve të rezultateve të furnizuesit.
@@ -2376,7 +2417,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Pajtimi Pagesa
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Ju lutem, përzgjidhni emrin incharge personi"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologji
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Total papaguar: {0}
+DocType: Hub Settings,Unregister from Hub,Çregjistro nga Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Total papaguar: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Website Operacioni
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Oferta Letër
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generate Kërkesat materiale (MRP) dhe urdhërat e prodhimit.
@@ -2388,7 +2430,9 @@
 DocType: Physician Schedule Time Slot,To Time,Për Koha
 DocType: Authorization Rule,Approving Role (above authorized value),Miratimi Rolit (mbi vlerën e autorizuar)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Kredia për llogari duhet të jetë një llogari e pagueshme
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} nuk mund të jetë prindi ose fëmija i {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Ju lutemi zgjidhni Pranimin e Studentit i cili është i detyrueshëm për aplikantin e paguar të studentëve
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} nuk mund të jetë prindi ose fëmija i {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Ju lutemi zgjidhni listën e çmimeve për të publikuar çmimet
 DocType: Production Order Operation,Completed Qty,Kompletuar Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Për {0}, vetëm llogaritë e debitit mund të jetë i lidhur kundër një tjetër hyrjes krediti"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Lista e Çmimeve {0} është me aftësi të kufizuara
@@ -2401,39 +2445,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numrat Serial nevojshme për Item {1}. Ju keni dhënë {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Shkalla aktuale Vlerësimi
 DocType: Item,Customer Item Codes,Kodet Customer Item
+DocType: Training Event,Advance,avancoj
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,për të bërë përsëritje përsëri.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange Gain / Humbje
 DocType: Opportunity,Lost Reason,Humbur Arsyeja
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Adresa e re
 DocType: Quality Inspection,Sample Size,Shembull Madhësi
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Ju lutemi shkruani Dokumenti Marrjes
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Të gjitha sendet janë tashmë faturohen
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Ju lutem specifikoni një të vlefshme &#39;nga rasti Jo&#39;
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',Ju lutem specifikoni një të vlefshme &#39;nga rasti Jo&#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Qendrat e mëtejshme e kostos mund të bëhet në bazë të Grupeve por hyra mund të bëhet kundër jo-grupeve
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Përdoruesit dhe Lejet
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Urdhërat e prodhimit Krijuar: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Urdhërat e prodhimit Krijuar: {0}
 DocType: Branch,Branch,Degë
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Printime dhe quajtur
 DocType: Company,Total Monthly Sales,Shitjet mujore totale
 DocType: Bin,Actual Quantity,Sasia aktuale
 DocType: Shipping Rule,example: Next Day Shipping,shembull: Transporti Dita e ardhshme
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial Asnjë {0} nuk u gjet
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Abonimi ka qenë {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Abonimi ka qenë {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Programi i Programit të Tarifave
 DocType: Fee Schedule Program,Student Batch,Batch Student
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,zgjidhni * nga `tabVital Signs` ku pacienti = &#39;{0}&#39; urdhër nga signs_date desc limit 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,bëni Student
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Min Grade
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Ju keni qenë të ftuar për të bashkëpunuar në këtë projekt: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Mjeku nuk është i disponueshëm në {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Ju keni qenë të ftuar për të bashkëpunuar në këtë projekt: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Mjeku nuk është i disponueshëm në {0}
 DocType: Leave Block List Date,Block Date,Data bllok
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Shto kodin e abonimit në fushën e personalizimit në doktutin {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Shënimi i dorëzimit të furnitorit
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Apliko tani
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Apliko tani
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Sasia aktual {0} / pritje Sasia {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Sasia aktual {0} / pritje Sasia {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-commerce GSTIN
 DocType: Sales Order,Not Delivered,Jo Dorëzuar
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Data e pritshme nuk mund të jetë para datës së transaksionit
 ,Bank Clearance Summary,Pastrimi Përmbledhje Banka
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Krijuar dhe menaxhuar digests ditore, javore dhe mujore email."
 DocType: Appraisal Goal,Appraisal Goal,Vlerësimi Qëllimi
@@ -2441,12 +2486,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Ndërtesat
 DocType: Fee Schedule,Fee Structure,Struktura Fee
 DocType: Timesheet Detail,Costing Amount,Kushton Shuma
-DocType: Student Admission,Application Fee,Tarifë aplikimi
+DocType: Student Admission Program,Application Fee,Tarifë aplikimi
 DocType: Process Payroll,Submit Salary Slip,Submit Kuponi pagave
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Zbritje Maxiumm për Item {0} është {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Zbritje Maxiumm për Item {0} është {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importi në Bulk
 DocType: Sales Partner,Address & Contacts,Adresa dhe Kontaktet
 DocType: SMS Log,Sender Name,Sender Emri
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Rendit sipas kritereve
 DocType: POS Profile,[Select],[Zgjidh]
 DocType: Vital Signs,Blood Pressure (diastolic),Presioni i gjakut (diastolik)
 DocType: SMS Log,Sent To,Dërguar në
@@ -2455,7 +2501,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Next Kontakt Data nuk mund të jetë në të kaluarën
 DocType: Company,For Reference Only.,Vetëm për referencë.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Mjeku {0} nuk është i disponueshëm në {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Zgjidh Batch No
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Zgjidh Batch No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Invalid {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,Referenca Inv
@@ -2471,15 +2517,15 @@
 DocType: Normal Test Items,Require Result Value,Kërkoni vlerën e rezultatit
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Rast No. nuk mund të jetë 0
 DocType: Item,Show a slideshow at the top of the page,Tregojnë një Slideshow në krye të faqes
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Dyqane
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Dyqane
 DocType: Project Type,Projects Manager,Projektet Menaxher
 DocType: Serial No,Delivery Time,Koha e dorëzimit
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Plakjen Bazuar Në
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Emërimi u anulua
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Emërimi u anulua
 DocType: Item,End of Life,Fundi i jetës
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Udhëtim
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Asnjë Struktura aktiv apo Paga parazgjedhur gjetur për punonjës {0} për të dhënë data
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Udhëtim
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Asnjë Struktura aktiv apo Paga parazgjedhur gjetur për punonjës {0} për të dhënë data
 DocType: Leave Block List,Allow Users,Lejojnë përdoruesit
 DocType: Purchase Order,Customer Mobile No,Customer Mobile Asnjë
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Periodik
@@ -2488,12 +2534,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Update Kosto
 DocType: Item Reorder,Item Reorder,Item reorder
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Trego Paga Shqip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Material Transferimi
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Material Transferimi
 DocType: Fees,Send Payment Request,Dërgo Kërkesën për Pagesë
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Specifikoni operacionet, koston operative dhe të japë një operacion i veçantë nuk ka për operacionet tuaja."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ky dokument është mbi kufirin nga {0} {1} për pika {4}. A jeni duke bërë një tjetër {3} kundër të njëjtit {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Ju lutemi të vendosur përsëritur pas kursimit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Llogaria Shuma Zgjidh ndryshim
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Llogaria Shuma Zgjidh ndryshim
 DocType: Purchase Invoice,Price List Currency,Lista e Çmimeve Valuta
 DocType: Naming Series,User must always select,Përdoruesi duhet të zgjidhni gjithmonë
 DocType: Stock Settings,Allow Negative Stock,Lejo Negativ Stock
@@ -2513,7 +2559,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Punonjës
 DocType: Sample Collection,Collected Time,Koha e mbledhur
 DocType: Company,Sales Monthly History,Historia mujore e shitjeve
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Zgjidh Batch
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Zgjidh Batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} është faturuar plotësisht
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Shenja jete
 DocType: Training Event,End Time,Fundi Koha
@@ -2521,16 +2567,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Zbritjet e pagesës ose Loss
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Kushtet e kontratës standarde për shitje ose blerje.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Grupi nga Bonon
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Je i sigurt që dëshiron ta anulosh këtë takim?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Sales tubacionit
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Ju lutemi të vendosur llogarinë e paracaktuar në Paga Komponentin {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Kerkohet Në
 DocType: Rename Tool,File to Rename,Paraqesë për Rename
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Ju lutem, përzgjidhni bom për Item në rresht {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Ju lutem, përzgjidhni bom për Item në rresht {0}"
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Llogaria {0} nuk përputhet me Kompaninë {1} në Mode e Llogarisë: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Specifikuar BOM {0} nuk ekziston për Item {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Mirëmbajtja Orari {0} duhet të anulohet para se anulimi këtë Radhit Sales
+DocType: POS Profile,Applicable for Users,E aplikueshme për përdoruesit
 DocType: Notification Control,Expense Claim Approved,Shpenzim Kërkesa Miratuar
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Slip Paga e punonjësit të {0} krijuar tashmë për këtë periudhë
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Slip Paga e punonjësit të {0} krijuar tashmë për këtë periudhë
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Farmaceutike
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kostoja e artikujve të blerë
 DocType: Selling Settings,Sales Order Required,Sales Rendit kërkuar
@@ -2555,6 +2603,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,organizatë
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,organizatë
 DocType: BOM Update Tool,BOM Update Tool,BOM Update Tool
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Llogaria e partisë nuk është e specifikuar, ju lutemi konfiguroni llogarinë e parazgjedhur të partisë në kompani"
 DocType: SG Creation Tool Course,Student Group Name,Emri Group Student
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Krijimi i Tarifave
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Ju lutem sigurohuni që ju me të vërtetë dëshironi të fshini të gjitha transaksionet për këtë kompani. Të dhënat tuaja mjeshtër do të mbetet ashtu siç është. Ky veprim nuk mund të zhbëhet.
@@ -2563,29 +2612,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) nuk mund të jetë më i madh se quanitity planifikuar ({2}) në Prodhimi i rendit {3}
 DocType: Shipping Rule,Shipping Rule Label,Rregulla Transporti Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forumi User
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Lëndëve të para nuk mund të jetë bosh.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Nuk mund të rinovuar aksioneve, fatura përmban anijeve rënie artikull."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Lëndëve të para nuk mund të jetë bosh.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Nuk mund të rinovuar aksioneve, fatura përmban anijeve rënie artikull."
 DocType: Lab Test Sample,Lab Test Sample,Shembulli i testit të laboratorit
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Quick Journal Hyrja
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Ju nuk mund të ndryshoni normës nëse bom përmendur agianst çdo send
+DocType: Restaurant,Invoice Series Prefix,Prefiksi i Serisë së Faturës
 DocType: Employee,Previous Work Experience,Përvoja e mëparshme e punës
 DocType: Stock Entry,For Quantity,Për Sasia
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Ju lutem shkruani e planifikuar Qty për Item {0} në rresht {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Ju lutem shkruani e planifikuar Qty për Item {0} në rresht {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} nuk është dorëzuar
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Kërkesat për sendet.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Mënyrë e veçantë prodhimi do të krijohen për secilin artikull përfunduar mirë.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} duhet të jetë negative në dokumentin e kthimit
 ,Minutes to First Response for Issues,Minuta për Përgjigje e parë për Çështje
 DocType: Purchase Invoice,Terms and Conditions1,Termat dhe Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,Emri i institutit për të cilat ju jeni të vendosur deri këtë sistem.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,Emri i institutit për të cilat ju jeni të vendosur deri këtë sistem.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Rregjistrimi kontabël ngrirë deri në këtë datë, askush nuk mund të bëjë / modifikoj hyrjen përveç rolit të specifikuar më poshtë."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Ju lutemi ruani dokumentin para se të gjeneruar orar të mirëmbajtjes
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Çmimi i fundit i përditësuar në të gjitha BOM
 DocType: Fee Schedule,Successful,E suksesshme
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Statusi i Projektit
 DocType: UOM,Check this to disallow fractions. (for Nos),Kontrolloni këtë për të moslejuar fraksionet. (Për Nos)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,janë krijuar Urdhërat e mëposhtme prodhimit:
-DocType: Student Admission,Naming Series (for Student Applicant),Emërtimi Series (për Student Aplikantit)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,janë krijuar Urdhërat e mëposhtme prodhimit:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Emërtimi Series (për Student Aplikantit)
 DocType: Delivery Note,Transporter Name,Transporter Emri
 DocType: Authorization Rule,Authorized Value,Vlera e autorizuar
 DocType: BOM,Show Operations,Shfaq Operacionet
@@ -2609,7 +2659,7 @@
 ,Employees working on a holiday,Punonjës që punojnë në një festë
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark pranishëm
 DocType: Project,% Complete Method,% Complete Metoda
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,drogë
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,drogë
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Data e fillimit të mirëmbajtjes nuk mund të jetë para datës së dorëzimit për Serial Nr {0}
 DocType: Production Order,Actual End Date,Aktuale End Date
 DocType: BOM,Operating Cost (Company Currency),Kosto Operative (Company Valuta)
@@ -2627,13 +2677,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Miratimi përdoruesin nuk mund të jetë i njëjtë si përdorues rregulli është i zbatueshëm për
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Norma bazë (sipas Stock UOM)
 DocType: SMS Log,No of Requested SMS,Nr i SMS kërkuar
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Dërgo Pa Paguhet nuk përputhet me të dhënat Leave Aplikimi miratuara
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Dërgo Pa Paguhet nuk përputhet me të dhënat Leave Aplikimi miratuara
 DocType: Campaign,Campaign-.####,Fushata -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Hapat e ardhshëm
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Ju lutemi të furnizimit me artikuj të specifikuara në normat më të mirë të mundshme
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Bëni Faturë
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto Opportunity afër pas 15 ditësh
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Urdhërat e blerjes nuk janë të lejuara për {0} për shkak të një pozicioni të rezultateve të {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Urdhërat e blerjes nuk janë të lejuara për {0} për shkak të një pozicioni të rezultateve të {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Fundi Viti
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot /% Lead
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot /% Lead
@@ -2641,6 +2691,7 @@
 DocType: Vital Signs,Nutrition Values,Vlerat e të ushqyerit
 DocType: Lab Test Template,Is billable,Është e pagueshme
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Të dyja &quot;Orari i Mjekut&quot; dhe Koha për Emërim &quot;duhet të vendosen për Dr {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Një shpërndarës i palës së tretë / tregtari / komision agjent / degë / reseller që shet produkte kompani për një komision.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} kundër Rendit Blerje {1}
 DocType: Patient,Patient Demographics,Demografia e pacientëve
@@ -2670,7 +2721,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","Template Standard taksave që mund të aplikohet për të gjitha transaksionet e blerjes. Kjo template mund të përmbajë listë të krerëve të taksave si dhe kokat e tjera të shpenzimeve, si &quot;tregtar&quot;, &quot;Sigurimi&quot;, &quot;Trajtimi&quot; etj #### Shënim norma e tatimit që ju të përcaktuar këtu do të jetë norma standarde e taksave për të gjitha ** Items * *. Nëse ka Items ** ** që kanë norma të ndryshme, ato duhet të shtohet në ** Item Tatimit ** Tabela në ** Item ** zotit. #### Përshkrimi i Shtyllave 1. Llogaritja Type: - Kjo mund të jetë në ** neto totale ** (që është shuma e shumës bazë). - ** Në rreshtit të mëparshëm totalit / Shuma ** (për taksat ose tarifat kumulative). Në qoftë se ju zgjidhni këtë opsion, tatimi do të aplikohet si një përqindje e rreshtit të mëparshëm (në tabelën e taksave) shumën apo total. - ** ** Aktuale (siç u përmend). 2. Llogaria Udhëheqës: Libri Llogaria nën të cilat kjo taksë do të jetë e rezervuar 3. Qendra Kosto: Nëse tatimi i / Akuza është një ardhura (si anijet) ose shpenzime ajo duhet të jetë e rezervuar ndaj Qendrës kosto. 4. Përshkrimi: Përshkrimi i tatimit (që do të shtypen në faturat / thonjëza). 5. Rate: Shkalla tatimore. 6. Shuma: Shuma Tatimore. 7. Gjithsej: totale kumulative në këtë pikë. 8. Shkruani Row: Nëse në bazë të &quot;rreshtit të mëparshëm Total&quot; ju mund të zgjidhni numrin e rreshtit të cilat do të merren si bazë për këtë llogaritje (default është rreshtit të mëparshëm). 9. Konsideroni tatim apo detyrim per: Në këtë seksion ju mund të specifikoni nëse taksa / çmimi është vetëm për vlerësimin (jo një pjesë e totalit) apo vetëm për totalin (nuk shtojnë vlerën e sendit), ose për të dyja. 10. Add ose Zbres: Nëse ju dëshironi të shtoni ose të zbres tatimin."
 DocType: Homepage,Homepage,Faqe Hyrëse
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Zgjidh mjekun ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',update tabConsultation set invoice = &#39;{0}&#39; ku emri = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd Sasia
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Records tarifë Krijuar - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Kategoria Llogaria
@@ -2682,7 +2732,7 @@
 DocType: Asset,Manual,udhëzues
 DocType: Salary Component Account,Salary Component Account,Llogaria Paga Komponenti
 DocType: Global Defaults,Hide Currency Symbol,Fshih Valuta size
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","psh Banka, Cash, Credit Card"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","psh Banka, Cash, Credit Card"
 DocType: Lead Source,Source Name,burimi Emri
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Tensioni normal i pushimit të gjakut në një të rritur është afërsisht 120 mmHg systolic, dhe 80 mmHg diastolic, shkurtuar &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Credit Shënim
@@ -2701,16 +2751,16 @@
 DocType: Patient,Occupation,profesion
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: Filloni Data duhet të jetë përpara End Date
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Gjithsej (Qty)
-DocType: Sales Invoice,This Document,Ky dokument
 DocType: Installation Note Item,Installed Qty,Instaluar Qty
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Kjo mund të jetë për shkak të disa adresave të pavlefshme të
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Ju shtuar
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Rezultati Training
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Rezultati Training
 DocType: Purchase Invoice,Is Paid,është Paid
 DocType: Salary Structure,Total Earning,Fituar Total
 DocType: Purchase Receipt,Time at which materials were received,Koha në të cilën janë pranuar materialet e
 DocType: Stock Ledger Entry,Outgoing Rate,Largohet Rate
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Mjeshtër degë organizatë.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Mjeshtër degë organizatë.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,ose
 DocType: Sales Order,Billing Status,Faturimi Statusi
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Raportoni një çështje
@@ -2725,8 +2775,9 @@
 DocType: Notification Control,Sales Order Message,Sales Rendit Mesazh
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Set Vlerat Default si Company, Valuta, vitin aktual fiskal, etj"
 DocType: Payment Entry,Payment Type,Lloji Pagesa
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Ju lutem, përzgjidhni një grumbull për pika {0}. Në pamundësi për të gjetur një grumbull të vetme që përmbush këtë kërkesë"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Ju lutem, përzgjidhni një grumbull për pika {0}. Në pamundësi për të gjetur një grumbull të vetme që përmbush këtë kërkesë"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Ju lutem, përzgjidhni një grumbull për pika {0}. Në pamundësi për të gjetur një grumbull të vetme që përmbush këtë kërkesë"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Ju lutem, përzgjidhni një grumbull për pika {0}. Në pamundësi për të gjetur një grumbull të vetme që përmbush këtë kërkesë"
+DocType: Hub Category,Parent Category,Kategoria e prindërve
 DocType: Process Payroll,Select Employees,Zgjidhni Punonjësit
 DocType: Opportunity,Potential Sales Deal,Shitjet e mundshme marrëveshjen
 DocType: Complaint,Complaints,Ankese
@@ -2764,7 +2815,7 @@
 DocType: Bin,Reserved Quantity,Sasia e rezervuara
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Ju lutemi shkruani adresën vlefshme email
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Ju lutemi shkruani adresën vlefshme email
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Ju lutemi zgjidhni një artikull në karrocë
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Ju lutemi zgjidhni një artikull në karrocë
 DocType: Landed Cost Voucher,Purchase Receipt Items,Items Receipt Blerje
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Format customizing
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,arrear
@@ -2774,15 +2825,15 @@
 DocType: Payment Request,Amount in customer's currency,Shuma në monedhë të klientit
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Ofrimit të
 DocType: Stock Reconciliation Item,Current Qty,Qty tanishme
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Shto Furnizuesit
+DocType: Restaurant Menu,Restaurant Menu,Menuja e Restorantit
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,prev
 DocType: Appraisal Goal,Key Responsibility Area,Key Zona Përgjegjësia
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Mallrat e studentëve të ju ndihmojë të gjetur frekuentimit, vlerësimet dhe tarifat për studentët"
 DocType: Payment Entry,Total Allocated Amount,Shuma totale e alokuar
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Bëje llogari inventarit parazgjedhur për inventarit të përhershëm
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Bëje llogari inventarit parazgjedhur për inventarit të përhershëm
 DocType: Item Reorder,Material Request Type,Material Type Kërkesë
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural Gazeta hyrjes pagave nga {0} në {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage është e plotë, nuk ka shpëtuar"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage është e plotë, nuk ka shpëtuar"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Konvertimi Faktori është i detyrueshëm
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Kapaciteti i dhomës
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref
@@ -2821,16 +2872,18 @@
 DocType: Project,Task Completion,Task Përfundimi
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Jo në magazinë
 DocType: Appraisal,HR User,HR User
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Taksat dhe Tarifat zbritet
-apps/erpnext/erpnext/hooks.py +129,Issues,Çështjet
+apps/erpnext/erpnext/hooks.py +138,Issues,Çështjet
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Statusi duhet të jetë një nga {0}
 DocType: Sales Invoice,Debit To,Debi Për
+DocType: Restaurant Menu Item,Restaurant Menu Item,Menyja e Restorantit
 DocType: Delivery Note,Required only for sample item.,Kërkohet vetëm për pika të mostrës.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qty aktual Pas Transaksionit
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Nuk ka paga shqip gjetur mes {0} dhe {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Nuk ka paga shqip gjetur mes {0} dhe {1}
 ,Pending SO Items For Purchase Request,Në pritje SO artikuj për Kërkesë Blerje
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Pranimet e studentëve
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} është me aftësi të kufizuara
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Pranimet e studentëve
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} është me aftësi të kufizuara
 DocType: Supplier,Billing Currency,Faturimi Valuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Shumë i madh
@@ -2853,6 +2906,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Ju lutemi përmendni i vizitave të kërkuara
 DocType: Stock Settings,Default Valuation Method,Gabim Vlerësimi Metoda
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,tarifë
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Përditësohet në progres. Mund të duhet një kohë.
 DocType: Vehicle Log,Fuel Qty,Fuel Qty
 DocType: Production Order Operation,Planned Start Time,Planifikuar Koha e fillimit
 DocType: Course,Assessment,vlerësim
@@ -2868,7 +2922,7 @@
 DocType: Price List,Price List Master,Lista e Çmimeve Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Gjitha Shitjet Transaksionet mund të tagged kundër shumta ** Personat Sales ** në mënyrë që ju mund të vendosni dhe monitoruar objektivat.
 ,S.O. No.,SO Nr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Ju lutem të krijuar Customer nga Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Ju lutem të krijuar Customer nga Lead {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Zgjidh Patient
 DocType: Price List,Applicable for Countries,Të zbatueshme për vendet
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Emri i parametrit
@@ -2900,27 +2954,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Llogari shpenzim / Diferenca ({0}) duhet të jetë një llogari &quot;fitimit ose humbjes &#39;
 DocType: Project,Copied From,kopjuar nga
 DocType: Project,Copied From,kopjuar nga
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Emri error: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,mungesa
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Emri error: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,mungesa
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} nuk lidhet me {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Pjesëmarrja për punonjës {0} është shënuar tashmë
 DocType: Packing Slip,If more than one package of the same type (for print),Nëse më shumë se një paketë të të njëjtit lloj (për shtyp)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Vendosni klientin e parazgjedhur në Cilësimet e Restorantit
 ,Salary Register,Paga Regjistrohu
 DocType: Warehouse,Parent Warehouse,Magazina Parent
 DocType: C-Form Invoice Detail,Net Total,Net Total
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Default BOM nuk u gjet për Item {0} dhe Project {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Default BOM nuk u gjet për Item {0} dhe Project {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Përcaktojnë lloje të ndryshme të kredive
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Shuma Outstanding
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Koha (në minuta)
 DocType: Project Task,Working,Punës
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock Radhë (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Viti financiar
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Viti financiar
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} nuk i përkasin kompanisë {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,Nuk mund të zgjidhet funksioni i rezultateve të kritereve për {0}. Sigurohuni që formula është e vlefshme.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Të kushtojë sa më
 DocType: Healthcare Settings,Out Patient Settings,Nga cilësimet e pacientit
 DocType: Account,Round Off,Rrumbullohem
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Sasia duhet të jetë pozitive
 ,Requested Qty,Kërkohet Qty
 DocType: Tax Rule,Use for Shopping Cart,Përdorni për Shopping Cart
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Vlera {0} për atribut {1} nuk ekziston në listën e artikullit vlefshme atribut Vlerat për Item {2}
@@ -2929,7 +2985,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Akuzat do të shpërndahen në mënyrë proporcionale në bazë të Qty pika ose sasi, si për zgjedhjen tuaj"
 DocType: Maintenance Visit,Purposes,Qëllimet
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Atleast një artikull duhet të lidhet me sasinë negativ në dokumentin e kthimit
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Shtoni kurse
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacioni {0} gjatë se çdo orë në dispozicion të punës në workstation {1}, prishen operacionin në operacione të shumta"
 ,Requested,Kërkuar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Asnjë Vërejtje
@@ -2941,6 +2996,8 @@
 DocType: Employee Loan,Repaid/Closed,Paguhet / Mbyllur
 DocType: Item,Total Projected Qty,Total projektuar Qty
 DocType: Monthly Distribution,Distribution Name,Emri shpërndarja
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Furnizuesi&gt; Lloji i Furnizuesit
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Shkalla e vlerësimit nuk është gjetur për Item {0}, e cila kërkohet të bëjë shënime të kontabilitetit për {1} {2}. Nëse artikulli është duke u kryer si një zë zero vlerësimi në {1}, ju lutemi përmendni atë në tabelën {1} Item. Përndryshe, ju lutemi krijoni një transaksion të aksioneve në hyrje për artikullin ose përmendni normën e vlerësimit në regjistrin e artikullit dhe pastaj provoni paraqitjen / anulimin e këtij hyrjes"
 DocType: Course,Course Code,Kodi Kursi
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Inspektimi Cilësia e nevojshme për Item {0}
 DocType: POS Settings,Use POS in Offline Mode,Përdorni POS në modalitetin Offline
@@ -2951,14 +3008,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Manage Territorit Tree.
 DocType: Journal Entry Account,Sales Invoice,Shitjet Faturë
 DocType: Journal Entry Account,Party Balance,Bilanci i Partisë
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,"Ju lutem, përzgjidhni Aplikoni zbritje në"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,"Ju lutem, përzgjidhni Aplikoni zbritje në"
 DocType: Company,Default Receivable Account,Gabim Llogaria Arkëtueshme
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Krijo Banka e hyrjes për pagën totale e paguar për kriteret e përzgjedhura më sipër
 DocType: Physician,Physician Schedule,Orari i mjekut
 DocType: Purchase Invoice,Deemed Export,Shqyrtuar Eksport
 DocType: Stock Entry,Material Transfer for Manufacture,Transferimi materiale për Prodhimin
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Përqindja zbritje mund të aplikohet ose ndaj një listë të çmimeve apo për të gjithë listën e çmimeve.
-DocType: Purchase Invoice,Half-yearly,Gjashtëmujor
+DocType: Subscription,Half-yearly,Gjashtëmujor
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Hyrja kontabilitetit për magazinë
 DocType: Lab Test,LabTest Approver,Aprovuesi i LabTest
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Ju kanë vlerësuar tashmë me kriteret e vlerësimit {}.
@@ -2987,13 +3044,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Extra Vogla
 DocType: Company,Standard Template,Template standard
 DocType: Training Event,Theory,teori
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Warning: Materiali kërkuar Qty është më pak se minimale Rendit Qty
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Warning: Materiali kërkuar Qty është më pak se minimale Rendit Qty
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Llogaria {0} është ngrirë
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Personit juridik / subsidiare me një tabelë të veçantë e llogarive i përkasin Organizatës.
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Ushqim, Pije &amp; Duhani"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Vetëm mund të bëni pagesën kundër pafaturuar {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Shkalla e Komisionit nuk mund të jetë më e madhe se 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Vetëm mund të bëni pagesën kundër pafaturuar {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Shkalla e Komisionit nuk mund të jetë më e madhe se 100
 DocType: Stock Entry,Subcontract,Nënkontratë
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Ju lutem shkruani {0} parë
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Nuk ka përgjigje nga
@@ -3011,10 +3068,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Ngjyra
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Kriteret plan vlerësimi
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Parandalimi i urdhrave të blerjes
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,i prekshëm
 DocType: Patient Appointment,Scheduled,Planifikuar
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Kërkesa për kuotim.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ju lutem vendosni Sistemin e Emërimit të Punonjësve në Burimet Njerëzore&gt; Cilësimet e HR
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Ju lutem zgjidhni Item ku &quot;A Stock Pika&quot; është &quot;Jo&quot; dhe &quot;është pika e shitjes&quot; është &quot;Po&quot;, dhe nuk ka asnjë tjetër Bundle Produktit"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Zgjidh Klientin
 DocType: Student Log,Academic,Akademik
 DocType: Patient,Personal and Social History,Historia personale dhe sociale
 DocType: Fee Schedule,Fee Breakup for each student,Shkëputja e taksës për secilin nxënës
@@ -3024,7 +3082,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Vlerësimi Rate
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,naftë
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Lista e Çmimeve Valuta nuk zgjidhet
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Lista e Çmimeve Valuta nuk zgjidhet
 apps/erpnext/erpnext/config/healthcare.py +46,Results,Rezultate
 ,Student Monthly Attendance Sheet,Student Pjesëmarrja mujore Sheet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Punonjës {0} ka aplikuar tashmë për {1} midis {2} dhe {3}
@@ -3040,7 +3098,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Manage Shitje Partnerët.
 DocType: Quality Inspection,Inspection Type,Inspektimi Type
 DocType: Fee Validity,Visited yet,Vizita ende
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Depot me transaksion ekzistues nuk mund të konvertohet në grup.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Depot me transaksion ekzistues nuk mund të konvertohet në grup.
 DocType: Assessment Result Tool,Result HTML,Rezultati HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Skadon ne
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Shto Studentët
@@ -3067,7 +3125,7 @@
 DocType: Healthcare Settings,Result Printed,Rezultati Printuar
 DocType: Asset Category Account,Depreciation Expense Account,Llogaria Zhvlerësimi Shpenzimet
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Periudha provuese
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Shiko {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Shiko {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Vetëm nyjet fletë janë të lejuara në transaksion
 DocType: Expense Claim,Expense Approver,Shpenzim aprovuesi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Row {0}: Advance kundër Customer duhet të jetë krediti
@@ -3079,7 +3137,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Për datetime
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Oraret e kursit fshirë:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Shkrime për ruajtjen e statusit të dorëzimit SMS
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Cakto Target Shitje
 DocType: Accounts Settings,Make Payment via Journal Entry,Të bëjë pagesën përmes Journal Hyrja
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Shtypur On
 DocType: Item,Inspection Required before Delivery,Inspektimi i nevojshëm para dorëzimit
@@ -3087,7 +3144,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Aktivitetet në pritje
 DocType: Patient Appointment,Reminded,kujtoi
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Organizata juaj
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Organizata juaj
 DocType: Fee Component,Fees Category,tarifat Category
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Ju lutemi të hyrë në lehtësimin datën.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Sasia
@@ -3099,7 +3156,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reorder Niveli
 DocType: Company,Chart Of Accounts Template,Chart e Llogarive Stampa
 DocType: Attendance,Attendance Date,Pjesëmarrja Data
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Item Çmimi përditësuar për {0} në çmimore {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Item Çmimi përditësuar për {0} në çmimore {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Shpërbërjes paga në bazë të fituar dhe zbritje.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Llogaria me nyje fëmijëve nuk mund të konvertohet në Ledger
 DocType: Purchase Invoice Item,Accepted Warehouse,Magazina pranuar
@@ -3115,9 +3172,10 @@
 ,Employee Birthday,Punonjës Ditëlindja
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Batch Pjesëmarrja Tool
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,Limit Kaloi
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Planifikuar Upto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Një term akademike me këtë &#39;vitin akademik&#39; {0} dhe &#39;Term Emri&#39; {1} ekziston. Ju lutemi të modifikojë këto të hyra dhe të provoni përsëri.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Si ka transaksione ekzistuese kundër artikull {0}, ju nuk mund të ndryshojë vlerën e {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Si ka transaksione ekzistuese kundër artikull {0}, ju nuk mund të ndryshojë vlerën e {1}"
 DocType: UOM,Must be Whole Number,Duhet të jetë numër i plotë
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Lë të reja alokuara (në ditë)
 DocType: Purchase Invoice,Invoice Copy,fatura Copy
@@ -3127,7 +3185,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Numri i faturës
 DocType: Shopping Cart Settings,Orders,Urdhërat
 DocType: Employee Leave Approver,Leave Approver,Lini aprovuesi
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,"Ju lutem, përzgjidhni një grumbull"
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,"Ju lutem, përzgjidhni një grumbull"
 DocType: Assessment Group,Assessment Group Name,Emri Grupi i Vlerësimit
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material Transferuar për Prodhime
 DocType: Expense Claim,"A user with ""Expense Approver"" role",Një përdorues me &quot;Shpenzimi aprovuesi&quot; rolin
@@ -3142,7 +3200,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Periudha Mbyllja Hyrja
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Zgjidh Departamentin ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Qendra Kosto me transaksionet ekzistuese nuk mund të konvertohet në grup
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Shuma {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Shuma {0} {1} {2} {3}
 DocType: Account,Depreciation,Amortizim
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Furnizuesi (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Punonjës Pjesëmarrja Tool
@@ -3154,10 +3212,12 @@
 DocType: GL Entry,Voucher No,Voucher Asnjë
 ,Lead Owner Efficiency,Efikasiteti Lead Owner
 ,Lead Owner Efficiency,Efikasiteti Lead Owner
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Më popullor
 DocType: Leave Allocation,Leave Allocation,Lini Alokimi
 DocType: Payment Request,Recipient Message And Payment Details,Marrësi Message Dhe Detajet e pagesës
 DocType: Training Event,Trainer Email,trajner Email
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Kërkesat Materiale {0} krijuar
+DocType: Restaurant Reservation,No of People,Jo e njerëzve
 DocType: Production Planning Tool,Include sub-contracted raw materials,Përfshirja e lëndëve të para nën-kontraktuar
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Template i termave apo kontrate.
 DocType: Purchase Invoice,Address and Contact,Adresa dhe Kontakt
@@ -3166,10 +3226,11 @@
 DocType: Supplier,Last Day of the Next Month,Dita e fundit e muajit të ardhshëm
 DocType: Support Settings,Auto close Issue after 7 days,Auto Issue ngushtë pas 7 ditësh
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lënë nuk mund të ndahen përpara {0}, si bilanci leja ka qenë tashmë copë dërgohet në regjistrin e ardhshëm alokimit Pushimi {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Shënim: Për shkak / Data Referenca kalon lejuar ditët e kreditit të konsumatorëve nga {0} ditë (s)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Shënim: Për shkak / Data Referenca kalon lejuar ditët e kreditit të konsumatorëve nga {0} ditë (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Aplikuesi
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL për RECIPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,Llogaria akumuluar Zhvlerësimi
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Kjo email është autogenerated
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
 DocType: Program Enrollment,Boarding Student,Boarding Student
 DocType: Asset,Expected Value After Useful Life,Vlera e pritshme pas së dobishme
@@ -3177,7 +3238,7 @@
 DocType: Activity Cost,Billing Rate,Rate Faturimi
 ,Qty to Deliver,Qty të Dorëzojë
 ,Stock Analytics,Stock Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Operacionet nuk mund të lihet bosh
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Operacionet nuk mund të lihet bosh
 DocType: Maintenance Visit Purpose,Against Document Detail No,Kundër Document Detail Jo
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Lloji Party është e detyrueshme
 DocType: Quality Inspection,Outgoing,Largohet
@@ -3200,7 +3261,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Zgjidh studentët me dorë për aktivitetin bazuar Grupit
 DocType: Journal Entry,User Remark,Përdoruesi Vërejtje
 DocType: Lead,Market Segment,Segmenti i Tregut
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Shuma e paguar nuk mund të jetë më e madhe se shuma totale negative papaguar {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Shuma e paguar nuk mund të jetë më e madhe se shuma totale negative papaguar {0}
 DocType: Supplier Scorecard Period,Variables,Variablat
 DocType: Employee Internal Work History,Employee Internal Work History,Punonjës historia e Brendshme
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Mbyllja (Dr)
@@ -3229,21 +3290,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Get Updates
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Llogaria {2} nuk i përkasin kompanisë {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Materiali Kërkesë {0} është anuluar ose ndërprerë
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Lini Menaxhimi
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Lini Menaxhimi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Grupi nga Llogaria
 DocType: Sales Order,Fully Delivered,Dorëzuar plotësisht
 DocType: Lead,Lower Income,Të ardhurat më të ulëta
+DocType: Restaurant Order Entry,Current Order,Rendi aktual
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Burimi dhe depo objektiv nuk mund të jetë i njëjtë për të rresht {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Llogaria ndryshim duhet të jetë një llogari lloj Aseteve / Detyrimeve, pasi kjo Stock Pajtimi është një Hyrja Hapja"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Shuma e disbursuar nuk mund të jetë më e madhe se: Kredia {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Shkoni te Programet
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Blerje numrin urdhër që nevojitet për artikullit {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Rendit prodhimit jo krijuar
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Rendit prodhimit jo krijuar
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;Nga Data &quot;duhet të jetë pas&quot; deri më sot &quot;
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Nuk mund të ndryshojë statusin si nxënës {0} është e lidhur me aplikimin e studentëve {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Nuk mund të ndryshojë statusin si nxënës {0} është e lidhur me aplikimin e studentëve {1}
 DocType: Asset,Fully Depreciated,amortizuar plotësisht
 ,Stock Projected Qty,Stock Projektuar Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Customer {0} nuk i përket projektit {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Customer {0} nuk i përket projektit {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Pjesëmarrja e shënuar HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Citate janë propozimet, ofertat keni dërguar për klientët tuaj"
 DocType: Sales Order,Customer's Purchase Order,Rendit Blerje konsumatorit
@@ -3254,8 +3316,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Ju lutemi të vendosur Numri i nënçmime rezervuar
 DocType: Supplier Scorecard Period,Calculations,llogaritjet
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Vlera ose Qty
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Urdhërat Productions nuk mund të ngrihen për:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Urdhërat Productions nuk mund të ngrihen për:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Minutë
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vendosni Serinë Naming për {0} nëpërmjet Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Invoice,Purchase Taxes and Charges,Blerje taksat dhe tatimet
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Shko tek Furnizuesit
 ,Qty to Receive,Qty të marrin
@@ -3269,7 +3332,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Kredi në llogarinë duhet të jetë një llogari Bilanci i Gjendjes
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Gjitha llojet Furnizuesi
 DocType: Global Defaults,Disable In Words,Disable Në fjalë
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,Kodi i artikullit është i detyrueshëm për shkak Item nuk është numëruar në mënyrë automatike
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,Kodi i artikullit është i detyrueshëm për shkak Item nuk është numëruar në mënyrë automatike
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Citat {0} nuk e tipit {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Orari Mirëmbajtja Item
 DocType: Sales Order,%  Delivered,% Dorëzuar
@@ -3291,23 +3354,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Hapja Bilanci ekuitetit
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,pajtim
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,mbetur
 DocType: Appraisal,Appraisal,Vlerësim
 DocType: Purchase Invoice,GST Details,Detajet e GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},Email dërguar për furnizuesit {0}
+DocType: Item,Default Sales Unit of Measure,Njësia e shitjes së paracaktuar të masës
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data përsëritet
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Nënshkrues i autorizuar
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Dërgo aprovuesi duhet të jetë një nga {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Krijo tarifa
-DocType: Hub Settings,Seller Email,Shitës Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Gjithsej Kosto Blerje (nëpërmjet Blerje Faturës)
 DocType: Training Event,Start Time,Koha e fillimit
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Zgjidh Sasia
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Zgjidh Sasia
 DocType: Customs Tariff Number,Customs Tariff Number,Numri Tarifa doganore
 DocType: Patient Appointment,Patient Appointment,Emërimi i pacientit
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Miratimi Rolit nuk mund të jetë i njëjtë si rolin rregulli është i zbatueshëm për
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Çabonoheni nga ky Dërgoje Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Çabonoheni nga ky Dërgoje Digest
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Merrni Furnizuesit Nga
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} nuk u gjet për Item {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Shkoni në Kurse
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mesazh dërguar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Llogari me nyje të fëmijëve nuk mund të vendosen si librit
@@ -3320,11 +3386,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Materiali Transferuar për Prodhim
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Llogaria {0} nuk ekziston
 DocType: Project,Project Type,Lloji i projektit
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Detyra e fëmijës ekziston për këtë detyrë. Nuk mund ta fshish këtë detyrë.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Ose Qty objektiv ose objektiv shuma është e detyrueshme.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Kosto e aktiviteteve të ndryshme
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Nuk ka më rezultate
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Kosto e aktiviteteve të ndryshme
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Vendosja Ngjarje për {0}, pasi që punonjësit e bashkangjitur më poshtë Personave Sales nuk ka një ID User {1}"
 DocType: Timesheet,Billing Details,detajet e faturimit
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Burimi dhe depo objektiv duhet të jetë i ndryshëm
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Burimi dhe depo objektiv duhet të jetë i ndryshëm
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Nuk lejohet të përtërini transaksioneve të aksioneve të vjetër se {0}
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Faturuar plotësisht
@@ -3351,7 +3419,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,kontrollo të gjitha
 DocType: Vehicle Log,Invoice Ref,faturë Ref
-DocType: Purchase Order,Recurring Order,Rendit përsëritur
 DocType: Company,Default Income Account,Llogaria e albumit ardhurat
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Grupi Customer / Customer
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Pambyllur fiskale Years Fitimi / Humbja (Credit)
@@ -3365,9 +3432,9 @@
 DocType: Patient,A Negative,Një Negativ
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Asgjë më shumë për të treguar.
 DocType: Lead,From Customer,Nga Klientit
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Telefonatat
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Telefonatat
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Një produkt
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,tufa
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,tufa
 DocType: Project,Total Costing Amount (via Time Logs),Shuma kushton (nëpërmjet Koha Shkrime)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Bëni Orarin e Tarifave
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
@@ -3392,7 +3459,7 @@
 DocType: School Settings,Current Academic Term,Term aktual akademik
 DocType: School Settings,Current Academic Term,Term aktual akademik
 DocType: Sales Order,Not Billed,Jo faturuar
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Të dyja Magazina duhet t&#39;i përkasë njëjtës kompani
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Të dyja Magazina duhet t&#39;i përkasë njëjtës kompani
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Nuk ka kontakte të shtuar ende.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Kosto zbarkoi Voucher Shuma
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Faturat e ngritura nga furnizuesit.
@@ -3401,7 +3468,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Shuma Discount
 DocType: Purchase Invoice,Return Against Purchase Invoice,Kthehu kundër Blerje Faturë
 DocType: Item,Warranty Period (in days),Garanci Periudha (në ditë)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',update `tabPatient Appointment` vendosur sales_invoice = &#39;{0}&#39; ku name = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Raporti me Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Paraja neto nga operacionet
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Pika 4
@@ -3410,8 +3476,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Llogaria Journal Hyrja
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupi Student
 DocType: Shopping Cart Settings,Quotation Series,Citat Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Një artikull ekziston me të njëjtin emër ({0}), ju lutemi të ndryshojë emrin e grupit pika ose riemërtoj pika"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Ju lutemi zgjidhni klientit
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Një artikull ekziston me të njëjtin emër ({0}), ju lutemi të ndryshojë emrin e grupit pika ose riemërtoj pika"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Ju lutemi zgjidhni klientit
 DocType: C-Form,I,unë
 DocType: Company,Asset Depreciation Cost Center,Asset Center Zhvlerësimi Kostoja
 DocType: Sales Order Item,Sales Order Date,Sales Order Data
@@ -3420,6 +3486,7 @@
 DocType: Assessment Plan,Assessment Plan,Plani i vlerësimit
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Klienti {0} është krijuar.
 DocType: Stock Settings,Limit Percent,Limit Percent
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Aktualisht nuk ka të aksioneve në dispozicion në ndonjë depo
 ,Payment Period Based On Invoice Date,Periudha e pagesës bazuar në datën Faturë
 DocType: Sample Collection,No. of print,Numri i printimit
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Missing Currency Exchange Rates për {0}
@@ -3475,13 +3542,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Zbritja Total - shlyerjen e kredisë
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,BOM aktuale dhe të reja bom nuk mund të jetë e njëjtë
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Paga Slip ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Paga Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Data e daljes në pension duhet të jetë më i madh se data e bashkimit
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,"Ka pasur gabime, ndërsa caktimin kurs për:"
 DocType: Sales Invoice,Against Income Account,Kundër llogarisë së të ardhurave
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Dorëzuar
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Qty Urdhërohet {1} nuk mund të jetë më pak se Qty mënyrë minimale {2} (përcaktuar në pikën).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Qty Urdhërohet {1} nuk mund të jetë më pak se Qty mënyrë minimale {2} (përcaktuar në pikën).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mujor Përqindja e shpërndarjes
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Ju lutemi identifikohuni si një përdorues tjetër.
 DocType: Territory,Territory Targets,Synimet Territory
 DocType: Delivery Note,Transporter Info,Transporter Informacion
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Ju lutemi të vendosur parazgjedhur {0} në Kompaninë {1}
@@ -3489,13 +3557,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Same furnizuesi është lidhur shumë herë
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Fitimi bruto / Humbja
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Blerje Rendit Item furnizuar
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Emri i kompanisë nuk mund të jetë i kompanisë
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Emri i kompanisë nuk mund të jetë i kompanisë
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Kryetarët letër për të shtypura templates.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titujt për shtypura templates p.sh. ProFORMA faturë.
 DocType: Program Enrollment,Walking,ecje
 DocType: Student Guardian,Student Guardian,Guardian Student
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Akuzat lloj vlerësimi nuk mund të shënuar si gjithëpërfshirës
 DocType: POS Profile,Update Stock,Update Stock
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,në abonim
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ndryshme për sendet do të çojë në të gabuar (Total) vlerën neto Pesha. Sigurohuni që pesha neto e çdo send është në të njëjtën UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Bom Rate
 DocType: Asset,Journal Entry for Scrap,Journal Hyrja për skrap
@@ -3545,15 +3614,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Përdoruesi i Sistemit (login) ID. Nëse vendosur, ajo do të bëhet e parazgjedhur për të gjitha format e burimeve njerëzore."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Nga {1}
 DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Në pritje për përditësimin e çmimit të fundit në të gjitha dokumentet e materialeve. Mund të duhen disa minuta.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Në pritje për përditësimin e çmimit të fundit në të gjitha dokumentet e materialeve. Mund të duhen disa minuta.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Emri i llogarisë së re. Shënim: Ju lutem mos krijoni llogari për klientët dhe furnizuesit
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Shteti parazgjedhur i mençur Adresa Templates
 DocType: Sales Order Item,Supplier delivers to Customer,Furnizuesi jep Klientit
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Forma / Item / {0}) është nga të aksioneve
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Për shkak / Referenca Data nuk mund të jetë pas {0}
+,Sales Payment Summary,Përmbledhje e Shitjeve të Pagesave
+DocType: Restaurant,Restaurant,Restorant
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Për shkak / Referenca Data nuk mund të jetë pas {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importi dhe Eksporti i të dhënave
 DocType: Patient,Account Details,detajet e llogarise
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Nuk studentët Found
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Nuk studentët Found
 DocType: Medical Department,Medical Department,Departamenti i Mjekësisë
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Kriteret e Shënimit të Rezultatit të Furnizuesit
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Fatura Posting Data
@@ -3564,7 +3635,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,"Ju lutem, përzgjidhni datën e postimit para se të zgjedhur Partinë"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Nga AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,"Ju lutem, përzgjidhni Citate"
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,"Ju lutem, përzgjidhni Citate"
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numri i nënçmime rezervuar nuk mund të jetë më e madhe se Total Numri i nënçmime
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Bëni Mirëmbajtja vizitë
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,Ju lutem kontaktoni për përdoruesit të cilët kanë Sales Master Menaxher {0} rol
@@ -3572,7 +3643,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Kompani (jo Customer ose Furnizuesi) mjeshtër.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Kjo është e bazuar në pjesëmarrjen e këtij Student
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Nuk ka Studentët në
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Shto artikuj më shumë apo formë të hapur të plotë
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Shto artikuj më shumë apo formë të hapur të plotë
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Shënime ofrimit {0} duhet të anulohet para se anulimi këtë Radhit Sales
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Shko te Përdoruesit
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Shuma e paguar + anullojë Shuma nuk mund të jetë më i madh se Grand Total
@@ -3592,37 +3663,40 @@
 DocType: Fee Schedule,Fee Schedule,Orari Tarifa
 DocType: Hub Settings,Publish Availability,Publikimi i Disponueshmëria
 DocType: Company,Create Chart Of Accounts Based On,Krijoni planin kontabël në bazë të
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Nuk mund të konvertohet në jo-grup. Detyrat e fëmijëve ekzistojnë.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Data e lindjes nuk mund të jetë më e madhe se sa sot.
 ,Stock Ageing,Stock plakjen
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Student {0} ekzistojnë kundër aplikantit studentore {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Rregullimi i Llogaritjeve (Valuta e Kompanisë)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,pasqyrë e mungesave
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,pasqyrë e mungesave
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} &#39;{1}&#39; është me aftësi të kufizuara
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Bëje si Open
 DocType: Cheque Print Template,Scanned Cheque,skanuar çek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Dërgo email automatike në Kontaktet për transaksionet Dorëzimi.
 DocType: Timesheet,Total Billable Amount,Shuma totale billable
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Pika 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Rendit Hyrja
 DocType: Purchase Order,Customer Contact Email,Customer Contact Email
 DocType: Warranty Claim,Item and Warranty Details,Pika dhe Garanci Details
 DocType: Sales Team,Contribution (%),Kontributi (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Shënim: Pagesa Hyrja nuk do të jetë krijuar që nga &#39;Cash ose Llogarisë Bankare &quot;nuk ishte specifikuar
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Projekti {0} tashmë ekziston
 DocType: Medical Department,Nursing User,Përdorues i Infermierisë
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Përgjegjësitë
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Periudha e vlefshmërisë së këtij citati ka përfunduar.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Periudha e vlefshmërisë së këtij citati ka përfunduar.
 DocType: Expense Claim Account,Expense Claim Account,Llogaria Expense Kërkesa
 DocType: Accounts Settings,Allow Stale Exchange Rates,Lejoni shkëmbimin e stale të këmbimit
 DocType: Sales Person,Sales Person Name,Sales Person Emri
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Ju lutemi shkruani atleast 1 faturën në tryezë
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Shto Përdoruesit
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Shto Përdoruesit
 DocType: POS Item Group,Item Group,Grupi i artikullit
 DocType: Item,Safety Stock,Siguria Stock
 DocType: Healthcare Settings,Healthcare Settings,Cilësimet e kujdesit shëndetësor
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Progresi% për një detyrë nuk mund të jetë më shumë se 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Progresi% për një detyrë nuk mund të jetë më shumë se 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Para se të pajtimit
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Për {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Taksat dhe Tarifat Shtuar (Kompania Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Tatimore pika {0} duhet të keni një llogari te tipit Tatimit ose e ardhur ose shpenzim ose ngarkimit
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Tatimore pika {0} duhet të keni një llogari te tipit Tatimit ose e ardhur ose shpenzim ose ngarkimit
 DocType: Sales Order,Partly Billed,Faturuar Pjesërisht
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Item {0} duhet të jetë një artikull Fixed Asset
 DocType: Item,Default BOM,Gabim bom
@@ -3638,6 +3712,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,variabël
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Nga dorëzim Shënim
 DocType: Student,Student Email Address,Student Email Adresa
+DocType: Item,Hub Warehouse,Magazina Hub
 DocType: Physician Schedule Time Slot,From Time,Nga koha
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Në magazinë:
 DocType: Notification Control,Custom Message,Custom Mesazh
@@ -3645,9 +3720,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,Cash ose Banka Llogaria është e detyrueshme për të bërë hyrjen e pagesës
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Adresa Student
 DocType: Purchase Invoice,Price List Exchange Rate,Lista e Çmimeve Exchange Rate
+DocType: POS Profile,POS Profile Name,Emri i Profilit POS
 DocType: Purchase Invoice Item,Rate,Normë
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Mjek praktikant
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,adresa Emri
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,adresa Emri
 DocType: Stock Entry,From BOM,Nga bom
 DocType: Assessment Code,Assessment Code,Kodi i vlerësimit
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Themelor
@@ -3661,11 +3737,12 @@
 DocType: Salary Slip,Salary Structure,Struktura e pagave
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Linjë ajrore
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Materiali çështje
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Materiali çështje
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Ndodhi një gabim gjatë krijimit të përsëritjes
 DocType: Material Request Item,For Warehouse,Për Magazina
 DocType: Employee,Offer Date,Oferta Data
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citate
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Ju jeni në offline mode. Ju nuk do të jetë në gjendje për të rifreskoni deri sa të ketë rrjet.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Ju jeni në offline mode. Ju nuk do të jetë në gjendje për të rifreskoni deri sa të ketë rrjet.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Nuk Grupet Student krijuar.
 DocType: Purchase Invoice Item,Serial No,Serial Asnjë
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Shuma mujore e pagesës nuk mund të jetë më e madhe se Shuma e Kredisë
@@ -3675,17 +3752,18 @@
 DocType: Salary Slip,Total Working Hours,Gjithsej Orari i punës
 DocType: Subscription,Next Schedule Date,Data e ardhshme e orarit
 DocType: Stock Entry,Including items for sub assemblies,Duke përfshirë edhe artikuj për nën kuvendet
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Shkruani Vlera duhet të jetë pozitiv
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Të gjitha Territoret
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Shkruani Vlera duhet të jetë pozitiv
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Të gjitha Territoret
 DocType: Purchase Invoice,Items,Artikuj
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Studenti është regjistruar tashmë.
 DocType: Fiscal Year,Year Name,Viti Emri
 DocType: Process Payroll,Process Payroll,Procesi i Pagave
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Ka më shumë pushimet sesa ditëve pune këtë muaj.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Ka më shumë pushimet sesa ditëve pune këtë muaj.
 DocType: Product Bundle Item,Product Bundle Item,Produkt Bundle Item
 DocType: Sales Partner,Sales Partner Name,Emri Sales Partner
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Kërkesën për kuotimin
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Kërkesën për kuotimin
 DocType: Payment Reconciliation,Maximum Invoice Amount,Shuma maksimale Faturë
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,hematologjisë
 DocType: Normal Test Items,Normal Test Items,Artikujt e Testimit Normal
 DocType: Student Language,Student Language,Student Gjuha
 apps/erpnext/erpnext/config/selling.py +23,Customers,Klientët
@@ -3696,10 +3774,11 @@
 DocType: Issue,Opening Time,Koha e hapjes
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Nga dhe në datat e kërkuara
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Letrave me Vlerë dhe Shkëmbimeve të Mallrave
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default njësinë e matjes për Varianti &#39;{0}&#39; duhet të jetë i njëjtë si në Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default njësinë e matjes për Varianti &#39;{0}&#39; duhet të jetë i njëjtë si në Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Llogaritur bazuar në
 DocType: Delivery Note Item,From Warehouse,Nga Magazina
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Nuk Items me faturën e materialeve të Prodhimi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Nuk Items me faturën e materialeve të Prodhimi
+DocType: Restaurant,Default Customer,Customer Default
 DocType: Assessment Plan,Supervisor Name,Emri Supervisor
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Mos konfirmoni nëse emërimi është krijuar për të njëjtën ditë
 DocType: Program Enrollment Course,Program Enrollment Course,Program Regjistrimi Kursi
@@ -3726,7 +3805,7 @@
 DocType: Payment Entry,Internal Transfer,Transfer të brendshme
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Llogari fëmijë ekziston për këtë llogari. Ju nuk mund të fshini këtë llogari.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Ose Qty objektiv ose shuma e synuar është e detyrueshme
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Nuk ekziston parazgjedhur bom për Item {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Nuk ekziston parazgjedhur bom për Item {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,"Ju lutem, përzgjidhni datën e postimit parë"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Hapja Data duhet të jetë para datës së mbylljes
 DocType: Leave Control Panel,Carry Forward,Bart
@@ -3761,6 +3840,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,I pranishëm Total
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,Deklaratat e kontabilitetit
 DocType: Drug Prescription,Hour,Orë
+DocType: Restaurant Order Entry,Last Sales Invoice,Fatura e shitjeve të fundit
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Jo i ri Serial nuk mund të ketë depo. Magazina duhet të përcaktohen nga Bursa e hyrjes ose marrjes Blerje
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Ju nuk jeni i autorizuar të miratojë lë në datat Block
@@ -3795,64 +3875,66 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Krijo Përdoruesit
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,gram
 DocType: Supplier Scorecard,Per Month,Në muaj
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Sasi të Prodhimi duhet të jetë më e madhe se 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Sasi të Prodhimi duhet të jetë më e madhe se 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Vizitoni raport për thirrjen e mirëmbajtjes.
 DocType: Stock Entry,Update Rate and Availability,Update Vlerësoni dhe Disponueshmëria
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Përqindja ju keni të drejtë për të marrë ose të japë më shumë kundër sasi të urdhëruar. Për shembull: Nëse ju keni urdhëruar 100 njësi. dhe Allowance juaj është 10%, atëherë ju keni të drejtë për të marrë 110 njësi."
 DocType: POS Customer Group,Customer Group,Grupi Klientit
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),New ID Batch (Fakultativ)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),New ID Batch (Fakultativ)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Llogari shpenzim është i detyrueshëm për pikën {0}
 DocType: BOM,Website Description,Website Përshkrim
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Ndryshimi neto në ekuitetit
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Më të Rejat
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Ju lutemi anuloni Blerje Faturën {0} parë
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adresa Email duhet të jetë unike, tashmë ekziston për {0}"
 DocType: Serial No,AMC Expiry Date,AMC Data e Mbarimit
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,Faturë
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,Faturë
 ,Sales Register,Shitjet Regjistrohu
 DocType: Daily Work Summary Settings Company,Send Emails At,Dërgo email Në
 DocType: Quotation,Quotation Lost Reason,Citat Humbur Arsyeja
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Zgjidh Domain tuaj
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',zgjidhni * nga tabPatient ku name = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},reference Transaction asnjë {0} datë {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},reference Transaction asnjë {0} datë {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nuk ka asgjë për të redaktuar.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Shiko formularin
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Përmbledhje për këtë muaj dhe aktivitetet në pritje
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Shiko formularin
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Përmbledhje për këtë muaj dhe aktivitetet në pritje
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Shtojini përdoruesit në organizatën tuaj, përveç vetes."
 DocType: Customer Group,Customer Group Name,Emri Grupi Klientit
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Nuk ka Konsumatorët akoma!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Nuk ka Konsumatorët akoma!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Pasqyra Cash Flow
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Sasia huaja nuk mund të kalojë sasi maksimale huazimin e {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Liçensë
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Ju lutem hiqni këtë Faturë {0} nga C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Ju lutem hiqni këtë Faturë {0} nga C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Ju lutem, përzgjidhni Mbaj përpara në qoftë se ju të dëshironi që të përfshijë bilancit vitit të kaluar fiskal lë të këtij viti fiskal"
 DocType: GL Entry,Against Voucher Type,Kundër Voucher Type
 DocType: Physician,Phone (R),Telefoni (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Hapat e kohës shtohen
 DocType: Item,Attributes,Atributet
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Aktivizo modelin
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vendosni Serinë Naming për {0} nëpërmjet Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,"Ju lutem, jepini të anullojë Llogari"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Rendit fundit Date
 DocType: Patient,B Negative,B Negative
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Llogaria {0} nuk i takon kompanisë {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Numrat serial në rresht {0} nuk përputhet me shpërndarjen Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Numrat serial në rresht {0} nuk përputhet me shpërndarjen Note
 DocType: Student,Guardian Details,Guardian Details
 DocType: C-Form,C-Form,C-Forma
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Pjesëmarrja për të punësuarit të shumta
 DocType: Vehicle,Chassis No,Shasia No
 DocType: Payment Request,Initiated,Iniciuar
 DocType: Production Order,Planned Start Date,Planifikuar Data e Fillimit
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Ju lutem zgjidhni një BOM
 DocType: Serial No,Creation Document Type,Krijimi Dokumenti Type
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Data e përfundimit duhet të jetë më e madhe se data e fillimit
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Data e përfundimit duhet të jetë më e madhe se data e fillimit
 DocType: Leave Type,Is Encash,Është marr me para në dorë
 DocType: Leave Allocation,New Leaves Allocated,Gjethet e reja të alokuar
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Të dhënat Project-i mençur nuk është në dispozicion për Kuotim
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Mbarojeni
 DocType: Project,Expected End Date,Pritet Data e Përfundimit
 DocType: Budget Account,Budget Amount,Shuma buxheti
 DocType: Appraisal Template,Appraisal Template Title,Vlerësimi Template Titulli
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Nga Data {0} për Employee {1} nuk mund të jetë para Data bashkuar punonjësit {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Komercial
 DocType: Patient,Alcohol Current Use,Përdorimi aktual i alkoolit
+DocType: Student Admission Program,Student Admission Program,Programi i pranimit të studentëve
 DocType: Payment Entry,Account Paid To,Llogaria Paid To
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Prind Item {0} nuk duhet të jetë një Stock Item
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Të gjitha prodhimet ose shërbimet.
@@ -3861,30 +3943,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Buxheti për Llogarinë {1} kundër {2} {3} është {4}. Ajo do të kalojë nga {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Llogaria duhet të jenë të tipit &quot;Asset fikse &#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Nga Qty
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Rregullat për të llogaritur shumën e anijeve për një shitje
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,dhe unchcked Disabled në
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Seria është i detyrueshëm
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Shërbimet Financiare
 DocType: Student Sibling,Student ID,ID Student
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Llojet e aktiviteteve për Koha Shkrime
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Email Furnizues
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Llojet e aktiviteteve për Koha Shkrime
 DocType: Tax Rule,Sales,Shitjet
 DocType: Stock Entry Detail,Basic Amount,Shuma bazë
 DocType: Training Event,Exam,Provimi
 DocType: Complaint,Complaint,ankim
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Magazina e nevojshme për aksioneve Item {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Magazina e nevojshme për aksioneve Item {0}
 DocType: Leave Allocation,Unused leaves,Gjethet e papërdorura
 DocType: Patient,Alcohol Past Use,Përdorimi i mëparshëm i alkoolit
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Shteti Faturimi
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transferim
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Fetch bom shpërtheu (përfshirë nën-kuvendet)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Transferim
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Fetch bom shpërtheu (përfshirë nën-kuvendet)
 DocType: Authorization Rule,Applicable To (Employee),Për të zbatueshme (punonjës)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Për shkak Data është e detyrueshme
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Për shkak Data është e detyrueshme
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Rritja për Atributit {0} nuk mund të jetë 0
 DocType: Journal Entry,Pay To / Recd From,Për të paguar / Recd Nga
 DocType: Naming Series,Setup Series,Setup Series
 DocType: Payment Reconciliation,To Invoice Date,Në faturën Date
 DocType: Supplier,Contact HTML,Kontakt HTML
 ,Inactive Customers,Konsumatorët jo aktive
+DocType: Student Admission Program,Maximum Age,Mosha maksimale
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Pranimet Blerje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Si Rregulla e Çmimeve aplikohet?
@@ -3903,6 +3987,7 @@
 DocType: GL Entry,Remarks,Vërejtje
 DocType: Payment Entry,Account Paid From,Llogaria e paguar nga
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Item Code
+DocType: Task,Parent Task,Detyra e Prindit
 DocType: Journal Entry,Write Off Based On,Shkruani Off bazuar në
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,bëni Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Print dhe Stationery
@@ -3911,19 +3996,19 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Paga përpunuar tashmë për periudhën ndërmjet {0} dhe {1}, Lini periudha e aplikimit nuk mund të jetë në mes të këtyre datave."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Rekord Instalimi për një Nr Serial
 DocType: Guardian Interest,Guardian Interest,Guardian Interesi
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Vendosni vlerat e parazgjedhur për faturat POS
 apps/erpnext/erpnext/config/hr.py +177,Training,stërvitje
 DocType: Timesheet,Employee Detail,Detail punonjës
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Email ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,Dita datën tjetër dhe përsëritet në ditën e Muajit duhet të jetë e barabartë
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Dita datën tjetër dhe përsëritet në ditën e Muajit duhet të jetë e barabartë
 DocType: Lab Prescription,Test Code,Kodi i Testimit
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Parametrat për faqen e internetit
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},Kerkesat e kerkesave nuk lejohen per {0} per shkak te nje standarti te rezultateve te {1}
 DocType: Offer Letter,Awaiting Response,Në pritje të përgjigjes
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Sipër
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Shuma totale {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},atribut i pavlefshëm {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Shuma totale {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},atribut i pavlefshëm {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Përmend në qoftë se llogaria jo-standarde pagueshme
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Same artikull është futur shumë herë. {listë}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Ju lutemi zgjidhni grupin e vlerësimit të tjera se &quot;të gjitha grupet e vlerësimit &#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Rresht {0}: Qendra kosto është e nevojshme për një artikull {1}
 DocType: Training Event Employee,Optional,fakultativ
@@ -3946,12 +4031,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Qendra Kosto është e detyrueshme për Item {2}
 DocType: Vehicle,Policy No,Politika No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Të marrë sendet nga Bundle produktit
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Ndërsa stoku ekziston kundër një artikulli {0}, ju nuk mund të aktivizoni ka variante pronash"
 DocType: Asset,Straight Line,Vijë e drejtë
 DocType: Project User,Project User,User Project
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,ndarje
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,ndarje
 DocType: GL Entry,Is Advance,Është Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Pjesëmarrja Nga Data dhe Pjesëmarrja deri më sot është e detyrueshme
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,Ju lutemi shkruani &#39;është nënkontraktuar&#39; si Po apo Jo
+DocType: Item,Default Purchase Unit of Measure,Njësia e Blerjes së Parazgjedhur të Masës
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Data e fundit Komunikimi
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Data e fundit Komunikimi
 DocType: Sales Team,Contact No.,Kontakt Nr
@@ -3959,7 +4046,6 @@
 DocType: Production Order,Scrap Warehouse,Scrap Magazina
 DocType: Production Order,Check if material transfer entry is not required,Kontrolloni nëse hyrja transferimi material nuk është e nevojshme
 DocType: Program Enrollment Tool,Get Students From,Get Studentët nga
-DocType: Hub Settings,Seller Country,Shitës Vendi
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publikojnë artikuj në faqen
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Grupi nxënësit tuaj në tufa
 DocType: Authorization Rule,Authorization Rule,Rregulla Autorizimi
@@ -3969,7 +4055,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Shitjet Taksat dhe Tarifat Stampa
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Total (Credit)
 DocType: Repayment Schedule,Payment Date,Data e pagesës
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,New Batch Qty
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,New Batch Qty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Veshmbathje &amp; Aksesorë
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,Nuk mund të zgjidhej funksioni i rezultateve të peshuara. Sigurohuni që formula është e vlefshme.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Numri i Rendit
@@ -3987,6 +4073,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} nuk mund të paraqitet, ajo është tashmë {2}"
 DocType: Tax Rule,Billing Country,Faturimi Vendi
 DocType: Purchase Order Item,Expected Delivery Date,Pritet Data e dorëzimit
+DocType: Restaurant Order Entry,Restaurant Order Entry,Regjistrimi i Restorantit
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debi dhe Kredi jo të barabartë për {0} # {1}. Dallimi është {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Shpenzimet Argëtim
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Bëni materiale Kërkesë
@@ -3999,9 +4086,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Llogaria me transaksion ekzistues nuk mund të fshihet
 DocType: Vehicle,Last Carbon Check,Last Kontrolloni Carbon
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Shpenzimet ligjore
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Ju lutemi zgjidhni sasinë në rresht
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Ju lutemi zgjidhni sasinë në rresht
 DocType: Purchase Invoice,Posting Time,Posting Koha
 DocType: Timesheet,% Amount Billed,% Shuma faturuar
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Koha për Emërim&quot; nuk është caktuar për Dr {0}. Shtojeni atë në Master Master.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Shpenzimet telefonike
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Kontrolloni këtë në qoftë se ju doni për të detyruar përdoruesit për të zgjedhur një seri përpara se të kryeni. Nuk do të ketë parazgjedhur në qoftë se ju kontrolloni këtë.
@@ -4012,6 +4100,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Të ardhurat New Customer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Shpenzimet e udhëtimit
 DocType: Maintenance Visit,Breakdown,Avari
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Shto fushën me parapagesë në doktorin {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Llogaria: {0} me monedhën: {1} nuk mund të zgjidhen
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Përditësimi i çmimit BOM automatikisht nëpërmjet Planifikuesit, bazuar në normën e fundit të vlerësimit / normën e çmimeve / normën e fundit të blerjes së lëndëve të para."
 DocType: Bank Reconciliation Detail,Cheque Date,Çek Data
@@ -4036,7 +4125,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Shuma totale Faturimi (nëpërmjet Koha Shkrime)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Furnizuesi Id
 DocType: Payment Request,Payment Gateway Details,Pagesa Gateway Details
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Sasia duhet të jetë më e madhe se 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Sasia duhet të jetë më e madhe se 0
 DocType: Journal Entry,Cash Entry,Hyrja Cash
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,nyjet e fëmijëve mund të krijohen vetëm me nyje të tipit &#39;Grupit&#39;
 DocType: Leave Application,Half Day Date,Half Day Date
@@ -4054,12 +4143,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Shënim: Item {0} hyrë herë të shumta
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Të gjitha kontaktet.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Shkurtesa kompani
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Përdoruesi {0} nuk ekziston
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Përdoruesi {0} nuk ekziston
 DocType: Subscription,SUB-,nën-
 DocType: Item Attribute Value,Abbreviation,Shkurtim
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Pagesa Hyrja tashmë ekziston
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Jo Authroized që nga {0} tejkalon kufijtë
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Mjeshtër paga template.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,patologji
+DocType: Restaurant Order Entry,Restaurant Table,Tavolina e restorantit
 DocType: Leave Type,Max Days Leave Allowed,Max Ditët Pushimi Lejohet
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Set Rregulla Taksa për shopping cart
 DocType: Purchase Invoice,Taxes and Charges Added,Taksat dhe Tarifat Shtuar
@@ -4071,10 +4162,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Kuotat për kryeson apo klientët.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Roli i lejuar për të redaktuar aksioneve të ngrirë
 ,Territory Target Variance Item Group-Wise,Territori i synuar Varianca Item Grupi i urti
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Të gjitha grupet e konsumatorëve
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Të gjitha grupet e konsumatorëve
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,akumuluar mujore
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} është i detyrueshëm. Ndoshta rekord Currency Exchange nuk është krijuar për {1} të {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Template tatimi është i detyrueshëm.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Template tatimi është i detyrueshëm.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Llogaria {0}: llogari Parent {1} nuk ekziston
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Lista e Çmimeve Rate (Kompania Valuta)
 DocType: Products Settings,Products Settings,Produkte Settings
@@ -4100,12 +4191,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Item Tatimore urti Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Shkurtesa Institute
 ,Item-wise Price List Rate,Pika-mençur Lista e Çmimeve Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Furnizuesi Citat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Furnizuesi Citat
 DocType: Quotation,In Words will be visible once you save the Quotation.,Me fjalë do të jetë i dukshëm një herë ju ruani Kuotim.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Sasi ({0}) nuk mund të jetë një pjesë në rradhë {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Barkodi {0} përdorur tashmë në pikën {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Barkodi {0} përdorur tashmë në pikën {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Rregullat për të shtuar shpenzimet e transportit detar.
 DocType: Item,Opening Stock,hapja Stock
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Konsumatorit është e nevojshme
@@ -4123,9 +4214,8 @@
 DocType: Customer,From Lead,Nga Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Urdhërat lëshuar për prodhim.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Zgjidh Vitin Fiskal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS Profilin nevojshme për të bërë POS Hyrja
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS Profilin nevojshme për të bërë POS Hyrja
 DocType: Program Enrollment Tool,Enroll Students,regjistrohen Studentët
-DocType: Hub Settings,Name Token,Emri Token
 DocType: Lab Test,Approved Date,Data e Aprovuar
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Shitja Standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Atleast një depo është e detyrueshme
@@ -4143,7 +4233,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Burimeve Njerëzore
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pajtimi Pagesa Pagesa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Pasuritë tatimore
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Prodhimi Order ka qenë {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Prodhimi Order ka qenë {0}
 DocType: BOM Item,BOM No,Bom Asnjë
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Hyrja {0} nuk ka llogari {1} ose tashmë krahasohen me kupon tjetër
@@ -4163,7 +4253,7 @@
 DocType: Currency Exchange,To Currency,Për të Valuta
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Lejo përdoruesit e mëposhtme të miratojë Dërgo Aplikacione për ditë bllok.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Llojet e shpenzimeve kërkesës.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Shitjen e normës për elementit {0} është më e ulët se saj {1}. Shitja e normës duhet të jetë atleast {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Shitjen e normës për elementit {0} është më e ulët se saj {1}. Shitja e normës duhet të jetë atleast {2}
 DocType: Item,Taxes,Tatimet
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Paguar dhe nuk dorëzohet
 DocType: Project,Default Cost Center,Qendra Kosto e albumit
@@ -4177,15 +4267,15 @@
 DocType: Employee Loan,Fully Disbursed,lëvrohet plotësisht
 DocType: Maintenance Visit,Customer Feedback,Feedback Customer
 DocType: Account,Expense,Shpenzim
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Rezultati nuk mund të jetë më e madhe se rezultatin maksimal
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Rezultati nuk mund të jetë më e madhe se rezultatin maksimal
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Konsumatorët dhe Furnizuesit
 DocType: Item Attribute,From Range,Nga Varg
 DocType: BOM,Set rate of sub-assembly item based on BOM,Cakto shkallën e artikullit të nën-montimit bazuar në BOM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},gabim sintakse në formulën ose kushte: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},gabim sintakse në formulën ose kushte: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Puna Daily Settings Përmbledhje Company
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,Item {0} injoruar pasi ajo nuk është një artikull të aksioneve
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Submit Kjo mënyrë e prodhimit për përpunim të mëtejshëm.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Submit Kjo mënyrë e prodhimit për përpunim të mëtejshëm.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Për të nuk zbatohet Rregulla e Çmimeve në një transaksion të caktuar, të gjitha rregullat e aplikueshme çmimeve duhet të jetë me aftësi të kufizuara."
 DocType: Assessment Group,Parent Assessment Group,Parent Group Vlerësimit
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Jobs
@@ -4202,12 +4292,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Ju lutemi të vendosur Company filtër bosh nëse Group By është &#39;Company&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Posting Data nuk mund të jetë data e ardhmja
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: serial {1} nuk përputhet me {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,për gjenerimin e përsëritjes
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Lini Rastesishme
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Lab Test UOM.
 DocType: Batch,Batch ID,ID Batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Shënim: {0}
 ,Delivery Note Trends,Trendet ofrimit Shënim
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Përmbledhja e kësaj jave
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Përmbledhja e kësaj jave
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Në modelet Qty
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Llogaria: {0} mund të përditësuar vetëm përmes aksionare transaksionet
 DocType: Student Group Creation Tool,Get Courses,Get Kurse
@@ -4221,7 +4312,6 @@
 DocType: Purchase Order,To Bill,Për Bill
 DocType: Material Request,% Ordered,% Urdhërohet
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Për Grupin bazuar Course Studentëve, kursi do të miratohet për çdo student nga kurset e regjistruar në programin e regjistrimit."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Shkruani Email Adresa ndara me presje, fatura do të postohet automatikisht në datën e caktuar"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Punë me copë
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Avg. Blerja Rate
 DocType: Task,Actual Time (in Hours),Koha aktuale (në orë)
@@ -4235,7 +4325,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Item {0} nuk është setup për Serial Nr. Kolona duhet të jetë bosh
 DocType: Accounts Settings,Accounts Settings,Llogaritë Settings
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,miratoj
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Asnjë rezultat për të paraqitur
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Asnjë rezultat për të paraqitur
 DocType: Customer,Sales Partner and Commission,Sales Partner dhe Komisioni
 DocType: Employee Loan,Rate of Interest (%) / Year,Norma e interesit (%) / Viti
 ,Project Quantity,Sasia Project
@@ -4247,55 +4337,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,E zezë
 DocType: BOM Explosion Item,BOM Explosion Item,Bom Shpërthimi i artikullit
 DocType: Account,Auditor,Revizor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} artikuj prodhuara
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} artikuj prodhuara
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Mëso më shumë
 DocType: Cheque Print Template,Distance from top edge,Largësia nga buzë të lartë
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Lista e Çmimeve {0} është me aftësi të kufizuara ose nuk ekziston
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Lista e Çmimeve {0} është me aftësi të kufizuara ose nuk ekziston
 DocType: Purchase Invoice,Return,Kthimi
 DocType: Production Order Operation,Production Order Operation,Prodhimit Rendit Operacioni
 DocType: Pricing Rule,Disable,Disable
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Mënyra e pagesës është e nevojshme për të bërë një pagesë
 DocType: Project Task,Pending Review,Në pritje Rishikimi
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Emërimet dhe konsultimet
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nuk është i regjistruar në grumbull {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nuk është i regjistruar në grumbull {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} nuk mund të braktiset, pasi ajo është tashmë {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Gjithsej Kërkesa shpenzimeve (nëpërmjet shpenzimeve Kërkesës)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Mungon
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Valuta e BOM # {1} duhet të jetë e barabartë me monedhën e zgjedhur {2}
 DocType: Journal Entry Account,Exchange Rate,Exchange Rate
 DocType: Patient,Additional information regarding the patient,Informacione shtesë lidhur me pacientin
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Sales Order {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Sales Order {0} nuk është dorëzuar
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Komponenti Fee
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Menaxhimi Fleet
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Shto artikuj nga
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Menaxhimi Fleet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Shto artikuj nga
 DocType: Cheque Print Template,Regular,i rregullt
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Weightage i përgjithshëm i të gjitha kriteret e vlerësimit duhet të jetë 100%
-DocType: BOM,Last Purchase Rate,Rate fundit Blerje
+DocType: Purchase Order Item,Last Purchase Rate,Rate fundit Blerje
 DocType: Account,Asset,Pasuri
 DocType: Project Task,Task ID,Detyra ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock nuk mund të ekzistojë për Item {0} pasi ka variante
 DocType: Lab Test,Mobile,i lëvizshëm
 ,Sales Person-wise Transaction Summary,Sales Person-i mençur Përmbledhje Transaction
 DocType: Training Event,Contact Number,Numri i kontaktit
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Magazina {0} nuk ekziston
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Regjistrohu Për Hub ERPNext
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Magazina {0} nuk ekziston
 DocType: Monthly Distribution,Monthly Distribution Percentages,Përqindjet mujore Shpërndarjes
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Elementi i përzgjedhur nuk mund të ketë Serisë
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Shkalla e vlerësimit nuk u gjet për pika {0}, e cila është e nevojshme për të bërë shënimet e kontabilitetit për {1} {2}. Nëse artikulli është transacting si një artikull mostër në {1}, ju lutemi të përmendim se në {1} tryezë artikull. Përndryshe, ju lutem të krijuar një transaksion hyrje aksioneve për artikull ose përmend normën e vlerësimit në të dhënat artikull, dhe pastaj të përpiqet dërgimi / anulimit këtë term"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% E materialeve dorëzuar kundër këtij notën shpërndarëse
+DocType: Training Event,Has Certificate,Ka certifikatë
 DocType: Project,Customer Details,Detajet e klientit
 DocType: Employee,Reports to,Raportet për
 ,Unpaid Expense Claim,Papaguar shpenzimeve Kërkesa
 DocType: Payment Entry,Paid Amount,Paid Shuma
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Eksploro Cikullin e Shitjes
 DocType: Assessment Plan,Supervisor,mbikëqyrës
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,online
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,online
 ,Available Stock for Packing Items,Stock dispozicion për Items Paketimi
 DocType: Item Variant,Item Variant,Item Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Vlerësimi Rezultati Tool
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,urdhërat e dorëzuara nuk mund të fshihet
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,urdhërat e dorëzuara nuk mund të fshihet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Bilanci i llogarisë tashmë në Debitimit, ju nuk jeni i lejuar për të vendosur &quot;Bilanci Must Be &#39;si&#39; Credit&quot;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Menaxhimit të Cilësisë
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,{0} artikull ka qenë me aftësi të kufizuara
@@ -4315,7 +4404,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: konfliktet timings me radhë {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Lejo Zero Vlerësimit Vlerësoni
 DocType: Training Event Employee,Invited,Të ftuar
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Multiple Strukturat aktive pagave gjetur për punonjës {0} për të dhënë data
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Multiple Strukturat aktive pagave gjetur për punonjës {0} për të dhënë data
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Setup Llogaritë Gateway.
 DocType: Employee,Employment Type,Lloji Punësimi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Mjetet themelore
@@ -4327,7 +4416,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Njoftim (ditë)
 DocType: Tax Rule,Sales Tax Template,Template Sales Tax
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Zgjidhni artikuj për të shpëtuar faturën
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Zgjidhni artikuj për të shpëtuar faturën
 DocType: Employee,Encashment Date,Arkëtim Data
 DocType: Training Event,Internet,internet
 DocType: Special Test Template,Special Test Template,Modeli i Testimit Special
@@ -4336,7 +4425,7 @@
 DocType: Production Order,Planned Operating Cost,Planifikuar Kosto Operative
 DocType: Academic Term,Term Start Date,Term Data e fillimit
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Ju lutem gjeni bashkangjitur {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Ju lutem gjeni bashkangjitur {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Balanca Deklarata Banka sipas Librit Kryesor
 DocType: Job Applicant,Applicant Name,Emri i aplikantit
 DocType: Authorization Rule,Customer / Item Name,Customer / Item Emri
@@ -4356,7 +4445,7 @@
 DocType: Guardian,Guardian Of ,kujdestar i
 DocType: Grading Scale Interval,Threshold,prag
 DocType: BOM Update Tool,Current BOM,Bom aktuale
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Shto Jo Serial
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Shto Jo Serial
 DocType: Production Order Item,Available Qty at Source Warehouse,Qty në dispozicion në burim Magazina
 apps/erpnext/erpnext/config/support.py +22,Warranty,garanci
 DocType: Purchase Invoice,Debit Note Issued,Debit Note Hedhur në qarkullim
@@ -4379,10 +4468,9 @@
 DocType: Account,Receivable,Arkëtueshme
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Nuk lejohet të ndryshojë Furnizuesit si Urdhër Blerje tashmë ekziston
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Roli që i lejohet të paraqesë transaksionet që tejkalojnë limitet e kreditit përcaktuara.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Zgjidhni Items të Prodhimi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Master dhënat syncing, ajo mund të marrë disa kohë"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Zgjidhni Items të Prodhimi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Master dhënat syncing, ajo mund të marrë disa kohë"
 DocType: Item,Material Issue,Materiali Issue
-DocType: Hub Settings,Seller Description,Shitës Përshkrim
 DocType: Employee Education,Qualification,Kualifikim
 DocType: Item Price,Item Price,Item Çmimi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sapun dhe detergjent
@@ -4390,7 +4478,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Nga koha nuk mund të jetë më i madh se në kohë.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Urdhërohet
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Vazhdoj
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Vazhdoj
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Nëse aktivizohet atëherë sistemi nuk do të azhurnojë fushat e varianteve nga shablloni, por do të kopjojë të dhënat e fushave të përmendura më poshtë duke bërë variant të ri"
 DocType: Salary Detail,Component,komponent
 DocType: Assessment Criteria,Assessment Criteria Group,Kriteret e vlerësimit Group
 DocType: Healthcare Settings,Patient Name By,Emri i pacientit nga
@@ -4400,7 +4489,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Ju lutemi shkruani Miratimi Roli ose Miratimi përdoruesin
 DocType: Journal Entry,Write Off Entry,Shkruani Off Hyrja
 DocType: BOM,Rate Of Materials Based On,Shkalla e materialeve në bazë të
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Furnizuesi&gt; Lloji i Furnizuesit
+DocType: Item Variant Settings,Do not Update Variants,Mos Update Variante
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Mbështetje
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Uncheck gjitha
 DocType: POS Profile,Terms and Conditions,Termat dhe Kushtet
@@ -4409,7 +4498,7 @@
 DocType: Leave Block List,Applies to Company,Zbatohet për Kompaninë
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,"Nuk mund të anulojë, sepse paraqitet Stock Hyrja {0} ekziston"
 DocType: Employee Loan,Disbursement Date,disbursimi Date
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;Përfituesit&#39; nuk janë të specifikuara
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Përfituesit&#39; nuk janë të specifikuara
 DocType: BOM Update Tool,Update latest price in all BOMs,Përditësoni çmimin e fundit në të gjitha BOM-et
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Regjistri mjekësor
 DocType: Vehicle,Vehicle,automjet
@@ -4424,14 +4513,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Nënçmime aseteve dhe Bilancet
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Shuma {0} {1} transferuar nga {2} të {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Shuma {0} {1} transferuar nga {2} të {3}
 DocType: Sales Invoice,Get Advances Received,Get Përparimet marra
 DocType: Email Digest,Add/Remove Recipients,Add / Remove Recipients
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Transaksioni nuk lejohet kundër Prodhimit ndalur Rendit {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Për të vendosur këtë vit fiskal si default, klikoni mbi &#39;Bëje si Default&#39;"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,bashkohem
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,bashkohem
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Mungesa Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Item variant {0} ekziston me atributet e njëjta
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Item variant {0} ekziston me atributet e njëjta
 DocType: Employee Loan,Repay from Salary,Paguajë nga paga
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Kerkuar pagesën kundër {0} {1} për sasi {2}
@@ -4444,7 +4533,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Sales Rendit Item
 DocType: Salary Slip,Payment Days,Ditët e pagesës
 DocType: Patient,Dormant,në gjumë
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Depot me nyjet e fëmijëve nuk mund të konvertohet në Ledger
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Depot me nyjet e fëmijëve nuk mund të konvertohet në Ledger
 DocType: BOM,Manage cost of operations,Menaxhuar koston e operacioneve
 DocType: Accounts Settings,Stale Days,Ditët Stale
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Kur ndonjë nga transaksionet e kontrolluara janë &quot;Dërguar&quot;, një email pop-up u hap automatikisht për të dërguar një email tek të lidhur &quot;Kontakt&quot; në këtë transaksion, me transaksionin si një shtojcë. Ky përdorues mund ose nuk mund të dërgoni email."
@@ -4458,10 +4547,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serial Asnjë {0} tashmë është marrë
 ,Requested Items To Be Transferred,Items kërkuar të transferohet
 DocType: Expense Claim,Vehicle Log,Vehicle Identifikohu
-DocType: Purchase Invoice,Recurring Id,Përsëritur Id
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),Prania e etheve (temp&gt; 38.5 ° C / 101.3 ° F ose temperatura e qëndrueshme&gt; 38 ° C / 100.4 ° F)
 DocType: Customer,Sales Team Details,Detajet shitjet e ekipit
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Fshini përgjithmonë?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Fshini përgjithmonë?
 DocType: Expense Claim,Total Claimed Amount,Shuma totale Pohoi
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Mundësi potenciale për të shitur.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Invalid {0}
@@ -4471,7 +4559,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Dyqane
 ,Item Delivery Date,Data e dorëzimit të artikullit
 DocType: Warehouse,PIN,GJILPËRË
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Setup shkolla juaj në ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Setup shkolla juaj në ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Ndryshimi Shuma (Company Valuta)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Nuk ka hyrje të kontabilitetit për magazinat e mëposhtme
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Ruaj dokumentin e parë.
@@ -4483,13 +4571,12 @@
 DocType: Task,Is Milestone,A Milestone
 DocType: Daily Work Summary,Email Sent To,Email Sent To
 DocType: Budget,Warn,Paralajmëroj
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Je i sigurt që dëshiron të çregjistrosh?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Çdo vërejtje të tjera, përpjekje të përmendet se duhet të shkoni në të dhënat."
 DocType: BOM,Manufacturing User,Prodhim i përdoruesit
 DocType: Purchase Invoice,Raw Materials Supplied,Lëndëve të para furnizuar
-DocType: Purchase Invoice,Recurring Print Format,Format përsëritur Print
 DocType: C-Form,Series,Seri
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Valuta e listës së çmimeve {0} duhet të jetë {1} ose {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Shto Produkte
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Valuta e listës së çmimeve {0} duhet të jetë {1} ose {2}
 DocType: Appraisal,Appraisal Template,Vlerësimi Template
 DocType: Item Group,Item Classification,Klasifikimi i artikullit
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Zhvillimin e Biznesit Manager
@@ -4503,7 +4590,7 @@
 DocType: Item Attribute Value,Attribute Value,Atribut Vlera
 ,Itemwise Recommended Reorder Level,Itemwise Recommended reorder Niveli
 DocType: Salary Detail,Salary Detail,Paga Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,"Ju lutem, përzgjidhni {0} parë"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,"Ju lutem, përzgjidhni {0} parë"
 DocType: Appointment Type,Physician,mjek
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Batch {0} i artikullit {1} ka skaduar.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,konsultimet
@@ -4514,7 +4601,7 @@
 DocType: Salary Detail,Default Amount,Gabim Shuma
 DocType: Lab Test Template,Descriptive,përshkrues
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Magazina nuk gjendet ne sistem
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Përmbledhje këtij muaji
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Përmbledhje këtij muaji
 DocType: Quality Inspection Reading,Quality Inspection Reading,Inspektimi Leximi Cilësia
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Ngrij Stoqet me te vjetra se` duhet të jetë më e vogël se% d ditë.
 DocType: Tax Rule,Purchase Tax Template,Blerje Template Tatimore
@@ -4537,12 +4624,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Ngjarjet / rezultateve të trajnimit
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Amortizimin e akumuluar si në
 DocType: Sales Invoice,C-Form Applicable,C-Formulari i zbatueshëm
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Operacioni Koha duhet të jetë më e madhe se 0 për Operacionin {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Operacioni Koha duhet të jetë më e madhe se 0 për Operacionin {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Magazina është e detyrueshme
 DocType: Supplier,Address and Contacts,Adresa dhe Kontakte
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Konvertimi Detail
 DocType: Program,Program Abbreviation,Shkurtesa program
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Rendit prodhimi nuk mund të ngrihet kundër një Template Item
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Rendit prodhimi nuk mund të ngrihet kundër një Template Item
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Akuzat janë përditësuar në pranimin Blerje kundër çdo send
 DocType: Warranty Claim,Resolved By,Zgjidhen nga
 DocType: Bank Guarantee,Start Date,Data e Fillimit
@@ -4568,26 +4655,27 @@
 DocType: Employee,Educational Qualification,Kualifikimi arsimor
 DocType: Workstation,Operating Costs,Shpenzimet Operative
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Veprimi në qoftë akumuluar tejkaluar buxhetin mujor
-DocType: Purchase Invoice,Submit on creation,Submit në krijimin
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Monedhë për {0} duhet të jetë {1}
+DocType: Subscription,Submit on creation,Submit në krijimin
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Monedhë për {0} duhet të jetë {1}
 DocType: Asset,Disposal Date,Shkatërrimi Date
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Email do të dërgohet të gjithë të punësuarve aktive e shoqërisë në orë të caktuar, në qoftë se ata nuk kanë pushim. Përmbledhje e përgjigjeve do të dërgohet në mesnatë."
 DocType: Employee Leave Approver,Employee Leave Approver,Punonjës Pushimi aprovuesi
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Një hyrje Reorder tashmë ekziston për këtë depo {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Nuk mund të deklarojë si të humbur, sepse Kuotim i është bërë."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Feedback Training
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Një hyrje Reorder tashmë ekziston për këtë depo {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Nuk mund të deklarojë si të humbur, sepse Kuotim i është bërë."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Feedback Training
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Prodhimi Rendit {0} duhet të dorëzohet
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Kriteret e Scorecard Furnizuesit
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},"Ju lutem, përzgjidhni Data e Fillimit Data e Përfundimit Kohëzgjatja për Item {0}"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Kursi është i detyrueshëm në rresht {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Deri më sot nuk mund të jetë e para nga data e
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Add / Edit Çmimet
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Add / Edit Çmimet
 DocType: Batch,Parent Batch,Batch Parent
 DocType: Cheque Print Template,Cheque Print Template,Çek Print Template
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Grafiku i Qendrave te Kostos
 DocType: Lab Test Template,Sample Collection,Sample Collection
 ,Requested Items To Be Ordered,Items kërkuar të Urdhërohet
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Urdhërat e mia
 DocType: Price List,Price List Name,Lista e Çmimeve Emri
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Daily Përmbledhje Puna për {0}
 DocType: Employee Loan,Totals,Totalet
@@ -4606,12 +4694,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} njësitë e {1} nevojshme në {2} në {3} {4} për {5} për të përfunduar këtë transaksion.
 DocType: Fee Schedule,Student Category,Student Category
 DocType: Announcement,Student,student
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Njësia Organizata (departamenti) mjeshtër.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Njësia Organizata (departamenti) mjeshtër.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Shkoni në Dhoma
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Ju lutem shkruani mesazhin para se të dërgonte
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,Duplicate Furnizuesi
 DocType: Email Digest,Pending Quotations,Në pritje Citate
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Point-of-Sale Profilin
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Point-of-Sale Profilin
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Konfigurimet e testit të laboratorit.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Kredi pasiguruar
 DocType: Cost Center,Cost Center Name,Kosto Emri Qendra
@@ -4621,6 +4709,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Totale e paguar Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Mesazhet më të mëdha se 160 karaktere do të ndahet në mesazhe të shumta
 DocType: Purchase Receipt Item,Received and Accepted,Marrë dhe pranuar
+DocType: Hub Settings,Company and Seller Profile,Profili i Kompanisë dhe Shitësit
 ,GST Itemised Sales Register,GST e detajuar Sales Regjistrohu
 ,Serial No Service Contract Expiry,Serial Asnjë Shërbimit Kontratë Expiry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Ju nuk mund të kreditit dhe debitit njëjtën llogari në të njëjtën kohë
@@ -4630,10 +4719,11 @@
 DocType: Item,Variant Based On,Variant i bazuar në
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Weightage Gjithsej caktuar duhet të jetë 100%. Kjo është {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Furnizuesit tuaj
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Ju lutem korrigjoni
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Nuk mund të vendosur si Humbur si Sales Order është bërë.
 DocType: Request for Quotation Item,Supplier Part No,Furnizuesi Part No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Nuk mund të zbres kur kategori është për &#39;vlerësimin&#39; ose &#39;Vaulation dhe Total &quot;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Marrë nga
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Marrë nga
 DocType: Lead,Converted,Konvertuar
 DocType: Item,Has Serial No,Nuk ka Serial
 DocType: Employee,Date of Issue,Data e lëshimit
@@ -4641,7 +4731,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Sipas Settings Blerja nëse blerja Reciept Required == &#39;PO&#39;, pastaj për krijimin Blerje Faturën, përdoruesi duhet të krijoni Marrjes blerjen e parë për pikën {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Row # {0}: Furnizuesi Set për pika {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Row {0}: Hours Vlera duhet të jetë më e madhe se zero.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Faqja Image {0} bashkangjitur në pikën {1} nuk mund të gjendet
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Faqja Image {0} bashkangjitur në pikën {1} nuk mund të gjendet
 DocType: Issue,Content Type,Përmbajtja Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Kompjuter
 DocType: Item,List this Item in multiple groups on the website.,Lista këtë artikull në grupe të shumta në faqen e internetit.
@@ -4652,14 +4742,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Get Unreconciled Entries
 DocType: Payment Reconciliation,From Invoice Date,Nga Faturë Data
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Ju nuk keni leje për të dorëzuar
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,monedhë faturimit duhet të jetë e barabartë me monedhën ose llogarinë pala e secilës parazgjedhur comapany e monedhës
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,monedhë faturimit duhet të jetë e barabartë me monedhën ose llogarinë pala e secilës parazgjedhur comapany e monedhës
 DocType: Healthcare Settings,Laboratory Settings,Cilësimet laboratorike
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Lini arkëtim
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Çfarë do të bëni?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Për Magazina
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Të gjitha Pranimet e studentëve
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Çfarë do të bëni?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Për Magazina
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Të gjitha Pranimet e studentëve
 ,Average Commission Rate,Mesatare Rate Komisioni
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,&#39;Nuk ka Serial&#39; nuk mund të jetë &#39;Po&#39; për jo-aksioneve artikull
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,&#39;Nuk ka Serial&#39; nuk mund të jetë &#39;Po&#39; për jo-aksioneve artikull
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Zgjidh statusin
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Pjesëmarrja nuk mund të shënohet për datat e ardhshme
 DocType: Pricing Rule,Pricing Rule Help,Rregulla e Çmimeve Ndihmë
@@ -4677,41 +4767,41 @@
 DocType: Item,Customer Code,Kodi Klientit
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Vërejtje ditëlindjen për {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Ditët Që Rendit Fundit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Debi Për shkak duhet të jetë një llogari Bilanci i Gjendjes
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Debi Për shkak duhet të jetë një llogari Bilanci i Gjendjes
 DocType: Buying Settings,Naming Series,Emërtimi Series
 DocType: Leave Block List,Leave Block List Name,Dërgo Block Lista Emri
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,date Insurance Fillimi duhet të jetë më pak se data Insurance Fund
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Ju lutemi vendosni Sistemin e Emërimit të Instruktorit në Shkolla&gt; Cilësimet e Shkollave
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Pasuritë e aksioneve
 DocType: Timesheet,Production Detail,Detail e prodhimit
+DocType: Restaurant,Active Menu,Meny aktiv
 DocType: Target Detail,Target Qty,Target Qty
 DocType: Shopping Cart Settings,Checkout Settings,Cilësimet Checkout
 DocType: Attendance,Present,I pranishëm
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Ofrimit Shënim {0} nuk duhet të dorëzohet
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Ofrimit Shënim {0} nuk duhet të dorëzohet
 DocType: Notification Control,Sales Invoice Message,Mesazh Shitjet Faturë
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Llogarisë {0} Mbyllja duhet të jetë e tipit me Përgjegjësi / ekuitetit
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Paga Slip nga punonjësi {0} krijuar tashmë për fletë kohë {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Paga Slip nga punonjësi {0} krijuar tashmë për fletë kohë {1}
 DocType: Vehicle Log,Odometer,rrugëmatës
 DocType: Sales Order Item,Ordered Qty,Urdhërohet Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Item {0} është me aftësi të kufizuara
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Item {0} është me aftësi të kufizuara
 DocType: Stock Settings,Stock Frozen Upto,Stock ngrira Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM nuk përmban ndonjë artikull aksioneve
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Aktiviteti i projekt / detyra.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM nuk përmban ndonjë artikull aksioneve
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Aktiviteti i projekt / detyra.
 DocType: Vehicle Log,Refuelling Details,Details Rimbushja
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generate paga rrëshqet
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Blerja duhet të kontrollohet, nëse është e aplikueshme për të është zgjedhur si {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Discount duhet të jetë më pak se 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Shkalla e fundit e blerjes nuk u gjet
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Shkruaj Off Shuma (Kompania Valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,faturimit Hours
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,BOM Default për {0} nuk u gjet
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Row # {0}: Ju lutemi të vendosur sasinë Reorder
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM Default për {0} nuk u gjet
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Row # {0}: Ju lutemi të vendosur sasinë Reorder
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Prekni për të shtuar artikuj tyre këtu
 DocType: Fees,Program Enrollment,program Regjistrimi
 DocType: Landed Cost Voucher,Landed Cost Voucher,Zbarkoi Voucher Kosto
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Ju lutemi të vendosur {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Përsëriteni në Ditën e Muajit
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} është nxënës joaktiv
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} është nxënës joaktiv
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} është nxënës joaktiv
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} është nxënës joaktiv
 DocType: Employee,Health Details,Detajet Shëndeti
 DocType: Offer Letter,Offer Letter Terms,Oferta Kushtet Letër
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Për të krijuar një kërkesë për pagesë dokument reference është e nevojshme
@@ -4720,7 +4810,6 @@
 DocType: Employee External Work History,Salary,Rrogë
 DocType: Serial No,Delivery Document Type,Ofrimit Dokumenti Type
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Paraqit të gjitha rrëshqet pagave për kriteret e përzgjedhura më sipër
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Items synced
 DocType: Sales Order,Partly Delivered,Dorëzuar Pjesërisht
 DocType: Email Digest,Receivables,Arkëtueshme
 DocType: Lead Source,Lead Source,Burimi Lead
@@ -4741,9 +4830,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Gama plakjen 2
 DocType: SG Creation Tool Course,Max Strength,Max Forca
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,Bom zëvendësohet
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Zgjedhni artikujt bazuar në Datën e Dorëzimit
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Zgjedhni artikujt bazuar në Datën e Dorëzimit
 ,Sales Analytics,Sales Analytics
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Në dispozicion {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Në dispozicion {0}
 ,Prospects Engaged But Not Converted,Perspektivat angazhuar Por Jo konvertuar
 ,Prospects Engaged But Not Converted,Perspektivat angazhuar Por Jo konvertuar
 DocType: Manufacturing Settings,Manufacturing Settings,Prodhim Cilësimet
@@ -4751,10 +4840,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Mobile No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Ju lutem shkruani monedhën parazgjedhje në kompaninë Master
 DocType: Stock Entry Detail,Stock Entry Detail,Stock Hyrja Detail
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Harroni të Përditshëm
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Harroni të Përditshëm
 DocType: Products Settings,Home Page is Products,Faqja Kryesore është Produkte
 ,Asset Depreciation Ledger,Zhvlerësimi i aseteve Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Konfliktet Rregulla tatimor me {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Konfliktet Rregulla tatimor me {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,New Emri i llogarisë
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Kosto të lëndëve të para furnizuar
 DocType: Selling Settings,Settings for Selling Module,Cilësimet për shitjen Module
@@ -4768,8 +4857,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Item {0} duhet të jetë një gjendje Item
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Default Puna Në Magazina Progresit
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Default settings për transaksionet e kontabilitetit.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ju lutem vendosni Sistemin e Emërimit të Punonjësve në Burimet Njerëzore&gt; Cilësimet e HR
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Data e pritshme nuk mund të jetë e para materiale Kërkesë Data
+DocType: Restaurant,Default Tax Template,Modeli Tatimor i Parazgjedhur
 DocType: Fees,Student Details,Detajet e Studentit
 DocType: Purchase Invoice Item,Stock Qty,Stock Qty
 DocType: Purchase Invoice Item,Stock Qty,Stock Qty
@@ -4788,8 +4878,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Shko te artikujt
 DocType: Sales Partner,Partner Type,Lloji Partner
 DocType: Purchase Taxes and Charges,Actual,Aktual
+DocType: Restaurant Menu,Restaurant Manager,Menaxheri i Restorantit
 DocType: Authorization Rule,Customerwise Discount,Customerwise Discount
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Pasqyrë e mungesave për detyra.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Pasqyrë e mungesave për detyra.
 DocType: Purchase Invoice,Against Expense Account,Kundër Llogaria shpenzimeve
 DocType: Production Order,Production Order,Rendit prodhimit
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Instalimi Shënim {0} tashmë është dorëzuar
@@ -4797,7 +4888,6 @@
 DocType: Quotation Item,Against Docname,Kundër Docname
 DocType: SMS Center,All Employee (Active),Të gjitha Punonjës (Aktive)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Shiko Tani
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Zgjidhni periudhën kur fatura do të gjenerohet automatikisht
 DocType: BOM,Raw Material Cost,Raw Material Kosto
 DocType: Item Reorder,Re-Order Level,Re-Rendit nivel
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Shkruani artikuj dhe Qty planifikuar për të cilën ju doni të rritur urdhërat e prodhimit ose shkarkoni materiale të papërpunuara për analizë.
@@ -4810,24 +4900,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Raporti Lloji është i detyrueshëm
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Depoja është e detyrueshme për aksioneve Item {0} në rresht {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Shto programe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Shitje me pakicë dhe shumicë
 DocType: Issue,First Responded On,Së pari u përgjigj më
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kryqi Listimi i artikullit në grupe të shumta
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Viti Fiskal Data e Fillimit dhe Viti Fiskal Fundi Data e janë vendosur tashmë në vitin fiskal {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Pastrimi Date updated
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Batch Split
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Batch Split
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Batch Split
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Batch Split
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Harmonizuar me sukses
 DocType: Request for Quotation Supplier,Download PDF,Shkarko PDF
 DocType: Production Order,Planned End Date,Planifikuar Data e Përfundimit
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Ju lutemi shkruani datën e orarit
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Ku sendet janë ruajtur.
 DocType: Request for Quotation,Supplier Detail,furnizuesi Detail
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Error ne formulen ose gjendje: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Error ne formulen ose gjendje: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Shuma e faturuar
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Peshat e kriterit duhet të shtojnë deri në 100%
 DocType: Attendance,Attendance,Pjesëmarrje
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,Stock Items
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,Stock Items
 DocType: BOM,Materials,Materiale
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Nëse nuk kontrollohet, lista do të duhet të shtohet për çdo Departamentit ku ajo duhet të zbatohet."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Burimi dhe Target Warehouse nuk mund të jetë e njëjtë
@@ -4845,6 +4935,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,On Net Total
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Vlera për atribut {0} duhet të jetë brenda intervalit {1} të {2} në increments e {3} për Item {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Magazinë synuar në radhë {0} duhet të jetë i njëjtë si Rendit Prodhimi
+DocType: Restaurant Reservation,Waitlisted,e konfirmuar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,"Valuta nuk mund të ndryshohet, pasi duke e bërë shënimet duke përdorur disa valutë tjetër"
 DocType: Vehicle Service,Clutch Plate,Plate Clutch
 DocType: Company,Round Off Account,Rrumbullakët Off Llogari
@@ -4861,7 +4952,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Emri i ri Sales Person
 DocType: Packing Slip,Gross Weight UOM,Bruto Pesha UOM
 DocType: Delivery Note Item,Against Sales Invoice,Kundër Sales Faturës
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Ju lutem shkruani numrat serik për artikull serialized
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Ju lutem shkruani numrat serik për artikull serialized
 DocType: Bin,Reserved Qty for Production,Rezervuar Qty për Prodhimin
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Dërgo pakontrolluar në qoftë se ju nuk doni të marrin në konsideratë duke bërë grumbull grupet kurs të bazuar.
 DocType: Asset,Frequency of Depreciation (Months),Frekuenca e Zhvlerësimit (Muaj)
@@ -4872,7 +4963,7 @@
 DocType: Lab Test,Test Group,Grupi i Testimeve
 DocType: Payment Reconciliation,Receivable / Payable Account,Arkëtueshme / pagueshme Llogaria
 DocType: Delivery Note Item,Against Sales Order Item,Kundër Sales Rendit Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Ju lutem specifikoni atribut Vlera për atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Ju lutem specifikoni atribut Vlera për atribut {0}
 DocType: Item,Default Warehouse,Gabim Magazina
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Buxheti nuk mund të caktohet kundër Llogaria Grupit {0}
 DocType: Healthcare Settings,Patient Registration,Regjistrimi i pacientit
@@ -4902,6 +4993,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Sales Person
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Buxheti dhe Qendra Kosto
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Mënyra e parazgjedhur e pagesës nuk lejohet
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,për
 ,Appointment Analytics,Analiza e emërimeve
 DocType: Vehicle Service,Half Yearly,Gjysma vjetore
 DocType: Lead,Blog Subscriber,Blog Subscriber
@@ -4920,7 +5012,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,quot Count
 ,BOM Stock Report,BOM Stock Raporti
 DocType: Stock Reconciliation Item,Quantity Difference,sasia Diferenca
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Përpunimi Pagave
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Përpunimi Pagave
 DocType: Opportunity Item,Basic Rate,Norma bazë
 DocType: GL Entry,Credit Amount,Shuma e kreditit
 DocType: Cheque Print Template,Signatory Position,Pozita nënshkruese
@@ -4934,12 +5026,12 @@
 DocType: Tax Rule,Tax Rule,Rregulla Tatimore
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Ruajtja njëjtin ritëm Gjatë gjithë Sales Cikli
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planifikoni kohë shkrimet jashtë orarit Workstation punës.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Konsumatorët në radhë
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} nuk ka një orar të mjekut. Shtoni në Master
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Konsumatorët në radhë
 DocType: Student,Nationality,kombësi
 ,Items To Be Requested,Items të kërkohet
-DocType: Purchase Order,Get Last Purchase Rate,Get fundit Blerje Vlerësoni
 DocType: Company,Company Info,Company Info
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Zgjidhni ose shtoni klient të ri
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Zgjidhni ose shtoni klient të ri
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Qendra Kosto është e nevojshme për të librit një kërkesë shpenzimeve
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplikimi i mjeteve (aktiveve)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Kjo është e bazuar në pjesëmarrjen e këtij punonjësi
@@ -4947,6 +5039,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Llogaria Debiti
 DocType: Fiscal Year,Year Start Date,Viti Data e Fillimit
 DocType: Attendance,Employee Name,Emri punonjës
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Produkti i Renditjes
 DocType: Sales Invoice,Rounded Total (Company Currency),Harmonishëm Total (Kompania Valuta)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Nuk mund të fshehta të grupit për shkak Tipi Llogarisë është zgjedhur.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} është modifikuar. Ju lutem refresh.
@@ -4957,6 +5050,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Përfitimet e Punonjësve
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Sasia e mbushur duhet të barabartë sasi për Item {0} në rresht {1}
 DocType: Production Order,Manufactured Qty,Prodhuar Qty
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Fatura u krijua
 DocType: Purchase Receipt Item,Accepted Quantity,Sasi të pranuar
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Ju lutemi të vendosur një default Holiday Lista për punonjësit {0} ose Company {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} nuk ekziston
@@ -4966,18 +5060,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Asnjë {0}: Shuma nuk mund të jetë më e madhe se pritje Shuma kundër shpenzimeve sipas Pretendimit {1}. Në pritje Shuma është {2}
 DocType: Maintenance Schedule,Schedule,Orar
 DocType: Account,Parent Account,Llogaria prind
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Në dispozicion
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Në dispozicion
 DocType: Quality Inspection Reading,Reading 3,Leximi 3
 ,Hub,Qendër
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Lista e Çmimeve nuk u gjet ose me aftësi të kufizuara
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Lista e Çmimeve nuk u gjet ose me aftësi të kufizuara
 DocType: Lab Test,Approved,I miratuar
 DocType: Pricing Rule,Price,Çmim
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',Punonjës lirohet për {0} duhet të jetë vendosur si &#39;majtë&#39;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Punonjës lirohet për {0} duhet të jetë vendosur si &#39;majtë&#39;
+DocType: Hub Settings,Last Sync On,Sinjali i fundit në
 DocType: Guardian,Guardian,kujdestar
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Vlerësimi {0} krijuar për punonjësit {1} në datën e caktuar varg
 DocType: Employee,Education,Arsim
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,del
 DocType: Selling Settings,Campaign Naming By,Emërtimi Fushata By
 DocType: Employee,Current Address Is,Adresa e tanishme është
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Synimi i shitjeve mujore (
@@ -4992,7 +5087,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Kodi i kursit:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Ju lutemi shkruani Llogari kurriz
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Lloji i dokumentit duhet të jetë një e Rendit Blerje, Blerje Faturë ose Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Lloji i dokumentit duhet të jetë një e Rendit Blerje, Blerje Faturë ose Journal Entry"
 DocType: Employee,Current Address,Adresa e tanishme
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Nëse pika është një variant i një tjetër çështje pastaj përshkrimin, imazhi, çmimi, taksat, etj do të vendoset nga template përveç nëse specifikohet shprehimisht"
 DocType: Serial No,Purchase / Manufacture Details,Blerje / Detajet Prodhimi
@@ -5023,7 +5118,7 @@
 DocType: Hub Settings,Hub Settings,Hub Cilësimet
 DocType: Project,Gross Margin %,Marzhi bruto%
 DocType: BOM,With Operations,Me Operacioneve
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Regjistrimet kontabël tashmë janë bërë në monedhën {0} për kompaninë {1}. Ju lutem, përzgjidhni një llogari arkëtueshëm ose të pagueshëm me monedhën {0}."
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Regjistrimet kontabël tashmë janë bërë në monedhën {0} për kompaninë {1}. Ju lutem, përzgjidhni një llogari arkëtueshëm ose të pagueshëm me monedhën {0}."
 DocType: Asset,Is Existing Asset,Është Asetin ekzistuese
 DocType: Salary Detail,Statistical Component,Komponenti statistikore
 DocType: Salary Detail,Statistical Component,Komponenti statistikore
@@ -5032,13 +5127,14 @@
 DocType: BOM Operation,BOM Operation,Bom Operacioni
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Në Shuma Previous Row
 DocType: Student,Home Address,Adresa e shtepise
+DocType: Item,Has Expiry Date,Ka Data e Skadimit
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Cilësimet e variantit të artikullit.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Asset Transfer
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,Asset Transfer
 DocType: POS Profile,POS Profile,POS Profilin
 DocType: Training Event,Event Name,Event Emri
 DocType: Physician,Phone (Office),Telefoni (Zyra)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,pranim
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Regjistrimet për {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,pranim
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Regjistrimet për {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Sezonalitetit për vendosjen buxhetet, objektivat etj"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Emri i ndryshueshëm
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Item {0} është një template, ju lutem zgjidhni një nga variantet e saj"
@@ -5047,7 +5143,7 @@
 DocType: Assessment Plan,Room,dhomë
 DocType: Purchase Order,Advance Paid,Advance Paid
 DocType: Item,Item Tax,Tatimi i artikullit
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Materiale për Furnizuesin
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Materiale për Furnizuesin
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Akciza Faturë
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Pragun {0}% shfaqet më shumë se një herë
 DocType: Expense Claim,Employees Email Id,Punonjësit Email Id
@@ -5058,32 +5154,30 @@
 DocType: Program,Program Name,program Emri
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Konsideroni tatimit apo detyrimit për
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Aktuale Qty është e detyrueshme
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} aktualisht ka një {1} Scorecard të Furnizuesit, dhe Urdhërat e Blerjes për këtë furnizues duhet të lëshohen me kujdes."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} aktualisht ka një {1} Scorecard të Furnizuesit, dhe Urdhërat e Blerjes për këtë furnizues duhet të lëshohen me kujdes."
 DocType: Employee Loan,Loan Type,Lloji Loan
 DocType: Scheduling Tool,Scheduling Tool,caktimin Tool
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Credit Card
 DocType: BOM,Item to be manufactured or repacked,Pika për të prodhuar apo ripaketohen
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Default settings për transaksionet e aksioneve.
-DocType: Purchase Invoice,Next Date,Next Data
 DocType: Employee Education,Major/Optional Subjects,/ Subjektet e mëdha fakultative
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
+DocType: Hub Settings,Suspended,pezulluar
 DocType: Training Event,Attendees,pjesëmarrësit
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Këtu ju mund të mbajë të dhënat e familjes si emrin dhe profesionin e prindërve, bashkëshortit dhe fëmijëve"
 DocType: Academic Term,Term End Date,Term End Date
-DocType: Hub Settings,Seller Name,Shitës Emri
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Taksat dhe Tarifat zbritet (Kompania Valuta)
 DocType: Item Group,General Settings,Cilësimet përgjithshme
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Nga Valuta dhe me monedhën nuk mund të jetë e njëjtë
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Shto instruktorë
 DocType: Stock Entry,Repack,Ripaketoi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Ju duhet të ruani formën para se të vazhdoni
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Ju lutem zgjidhni fillimisht Kompaninë
 DocType: Item Attribute,Numeric Values,Vlerat numerike
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Bashkangjit Logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Nivelet e aksioneve
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Nivelet e aksioneve
 DocType: Customer,Commission Rate,Rate Komisioni
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Krijuar {0} tabelat e rezultateve për {1} midis:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Bëni Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Bëni Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Aplikacionet pushimit bllok nga departamenti.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Pagesa Lloji duhet të jetë një nga Merre, të paguajë dhe Transfer të Brendshme"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analitikë
@@ -5098,11 +5192,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Capital Stock
 DocType: Shopping Cart Settings,Show Public Attachments,Trego Attachments publike
 DocType: Packing Slip,Package Weight Details,Paketa Peshë Detajet
+DocType: Restaurant Reservation,Reservation Time,Koha e rezervimit
 DocType: Payment Gateway Account,Payment Gateway Account,Pagesa Llogaria Gateway
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Pas përfundimit të pagesës përcjellëse përdorues në faqen e zgjedhur.
 DocType: Company,Existing Company,Company ekzistuese
 DocType: Healthcare Settings,Result Emailed,Rezultati u dërgua me email
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","Tax Category ka ndryshuar për të &quot;Total&quot;, sepse të gjitha sendet janë artikuj jo-aksioneve"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kodi i artikullit&gt; Grupi i artikullit&gt; Markë
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,"Ju lutem, përzgjidhni një skedar CSV"
 DocType: Student Leave Application,Mark as Present,Mark si pranishëm
 DocType: Supplier Scorecard,Indicator Color,Treguesi Ngjyra
@@ -5127,11 +5223,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Bëni Serisë Student
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Është Mbaj Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Të marrë sendet nga bom
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Të marrë sendet nga bom
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead ditësh
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Posting Data duhet të jetë i njëjtë si data e blerjes {1} e aseteve {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Kontrolloni këtë nëse studenti banon në Hostel e Institutit.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Ju lutem shkruani urdhëron Sales në tabelën e mësipërme
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Ju lutem shkruani urdhëron Sales në tabelën e mësipërme
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Jo Dërguar pagave rrëshqet
 ,Stock Summary,Stock Përmbledhje
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Transferimi një aktiv nga një magazinë në tjetrën
@@ -5147,5 +5243,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: debiti hyrja nuk mund të jetë i lidhur me një {1}
 DocType: Journal Entry,Subscription Section,Seksioni i abonimit
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Llogaria {0} nuk ekziston
+DocType: Training Event,Training Program,Programi i Trajnimit
 DocType: Account,Cash,Para
 DocType: Employee,Short biography for website and other publications.,Biografia e shkurtër për faqen e internetit dhe botime të tjera.
diff --git a/erpnext/translations/sr-SP.csv b/erpnext/translations/sr-SP.csv
index 8718710..3a07b80 100644
--- a/erpnext/translations/sr-SP.csv
+++ b/erpnext/translations/sr-SP.csv
@@ -2,11 +2,13 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Prosjek dnevne isporuke
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Skladište {0} ne može biti obrisano dok postoji zaliha za artikal {1}
 DocType: Item,Is Purchase Item,Artikal je za poručivanje
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Skladište {0} ne postoji
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Skladište {0} ne postoji
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Potvrđene porudžbine od strane kupaca
+DocType: Salary Slip,Salary Structure,Структура плата
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Prijavi grešku
+DocType: Salary Slip,Net Pay,Neto plaćanje
 DocType: Purchase Invoice Item,Item Tax Rate,Poreska stopa
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Kreirajte novog kupca
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Kreirajte novog kupca
 DocType: Item Variant Attribute,Attribute,Atribut
 DocType: POS Profile,POS Profile,POS profil
 DocType: Purchase Invoice,Currency and Price List,Valuta i cjenovnik
@@ -18,7 +20,7 @@
 DocType: Mode of Payment,Mode of Payment,Način plaćanja
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Moja korpa
 DocType: Payment Entry,Payment From / To,Plaćanje od / za
-DocType: Purchase Invoice,Grand Total (Company Currency),Za plaćanje (Valuta)
+DocType: Purchase Invoice,Grand Total (Company Currency),Za plaćanje (Valuta preduzeća)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Insufficient Stock,Nedovoljna količina
 DocType: Sales Invoice,Shipping Rule,Pravila nabavke
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Bruto dobit / gubitak
@@ -45,16 +47,17 @@
 apps/erpnext/erpnext/config/selling.py +23,Customers,Kupci
 DocType: Production Order,Production Order,Proizvodne porudžbine
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Kupovina
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} nije aktivan
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Dodaj stavke iz  БОМ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Odaberite kupca
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} nije aktivan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +762,Return / Credit Note,Povraćaj / knjižno odobrenje
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Dodaj stavke iz  БОМ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Odaberite kupca
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nova adresa
 ,Stock Summary,Pregled zalihe
 DocType: Stock Entry Detail,Additional Cost,Dodatni trošak
 ,Purchase Invoice Trends,Trendovi faktura dobavljaća
 DocType: Item Price,Item Price,Cijena artikla
 DocType: Sales Order Item,Sales Order Date,Datum prodajnog naloga
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Otpremnica {0} se ne može potvrditi
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Otpremnica {0} se ne može potvrditi
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} status je {2}
 DocType: BOM,Item Image (if not slideshow),Slika artikla (ako nije prezentacija)
 DocType: Territory,Classification of Customers by region,Klasifikacija kupaca po regiji
@@ -92,9 +95,9 @@
 DocType: Purchase Invoice,Supplier Invoice Date,Datum fakture dobavljača
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Knjiženje {0} nema nalog {1} ili je već povezan sa drugim izvodom
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +29,-Above,- Iznad
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} je otkazan ili stopiran
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} je otkazan ili stopiran
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Porezi i naknade dodate (valuta preduzeća)
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Van mreže (offline)
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Van mreže (offline)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Bilješka: {0}
 DocType: Lead,Lost Quotation,Izgubljen Predračun
 DocType: Account,Account,Račun
@@ -111,13 +114,13 @@
 DocType: Delivery Note Item,From Warehouse,Iz skladišta
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Prikaži zatvorene
 DocType: Customer,Additional information regarding the customer.,Dodatne informacije o kupcu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Skladište je potrebno unijeti za artikal {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Skladište je potrebno unijeti za artikal {0}
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Uplata već postoji
 DocType: Project,Customer Details,Korisnički detalji
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Primjer:. ABCD ##### 
  Ако Радња је смештена i serijski broj se ne pominje u transakcijama, onda će automatski serijski broj biti kreiran na osnovu ove serije. Ukoliko uvijek želite da eksplicitno spomenete serijski broj ove šifre, onda je ostavite praznu."
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,Na mreži
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,Na mreži
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Kupac i dobavljač
 DocType: Project,% Completed,Završeno %
 DocType: Journal Entry Account,Sales Invoice,Faktura prodaje
@@ -126,7 +129,6 @@
 DocType: Sales Order,Track this Sales Order against any Project,Prati ovaj prodajni nalog na bilo kom projektu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +491,[Error],[Greška]
 DocType: Supplier,Supplier Details,Detalji o dobavljaču
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Dodaj kurseve
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum zajednice
 ,Batch Item Expiry Status,Pregled artikala sa rokom trajanja
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Plaćanje
@@ -140,25 +142,26 @@
 DocType: Interest,Academics User,Akademski korisnik
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Izjava o računu
 DocType: Delivery Note,Billing Address,Adresa za naplatu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Sve države
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Sve države
 DocType: Payment Entry,Received Amount (Company Currency),Iznos uplate (Valuta preduzeća)
 DocType: Lab Test Template,Standard Selling Rate,Standarna prodajna cijena
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Ljudski resursi
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Korisnički portal
 DocType: Purchase Order Item Supplied,Stock UOM,JM zalihe
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Izaberite ili dodajte novog kupca
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Izaberite ili dodajte novog kupca
 ,Trial Balance for Party,Struktura dugovanja
 DocType: Program Enrollment Tool,New Program,Novi program
 DocType: Product Bundle Item,Product Bundle Item,Sastavljeni proizvodi
 DocType: Lead,Address & Contact,Adresa i kontakt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Make ,Napravi
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Ovo praćenje je zasnovano na kretanje zaliha. Pogledajte {0} za više detalja
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Kontni plan
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Svi kontakti
 DocType: Item,Default Warehouse,Podrazumijevano skladište
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Тренутно не постоје залихе у складишту
 DocType: Company,Default Letter Head,Podrazumijevano zaglavlje
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Prodajni nalog {0} nije validan
 DocType: Account,Credit,Potražuje
-DocType: C-Form Invoice Detail,Grand Total,Ukupan iznos
+DocType: C-Form Invoice Detail,Grand Total,Za plaćanje
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Ljudski resursi
 DocType: Selling Settings,Delivery Note Required,Otpremnica je obavezna
 DocType: Payment Entry,Type of Payment,Vrsta plaćanja
@@ -172,7 +175,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Par
 ,Profitability Analysis,Analiza profitabilnosti
 DocType: Attendance,HR Manager,Menadžer za ljudske resurse
-DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Ukupan porez i naknade(valuta preduzeća)
+DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Porez (valuta preduzeća)
 DocType: Quality Inspection,Quality Manager,Menadžer za kvalitet
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Sales Invoice {0} has already been submitted,Faktura prodaje {0} je već potvrđena
 DocType: Purchase Invoice,Is Return,Da li je povratak
@@ -203,7 +206,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Dozvolite isporukuili prijem robe ukoliko ne premaši ovaj procenat
 DocType: Shopping Cart Settings,Orders,Porudžbine
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Promjene na zalihama
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Dodaj stavke iz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Dodaj stavke iz
 DocType: Sales Invoice,Rounded Total (Company Currency),Zaokruženi ukupan iznos (valuta preduzeća)
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ako ovaj artikal ima varijante, onda ne može biti biran u prodajnom nalogu."
 DocType: Pricing Rule,Discount on Price List Rate (%),Popust na cijene iz cjenovnika (%)
@@ -213,7 +216,7 @@
 DocType: Email Digest,New Sales Orders,Novi prodajni nalozi
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Korpa je prazna
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Unos zaliha {0} nije potvrđen
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Ostatak svijeta
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Ostatak svijeta
 DocType: Production Order,Additional Operating Cost,Dodatni operativni troškovi
 DocType: Purchase Invoice,Rejected Warehouse,Odbijeno skladište
 DocType: Request for Quotation,Manufacturing Manager,Menadžer proizvodnje
@@ -225,11 +228,12 @@
 DocType: Purchase Invoice,Select Shipping Address,Odaberite adresu isporuke
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Iznos za fakturisanje
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Kreiranje prodajnog naloga će vam pomoći da isplanirate svoje vrijeme i dostavite robu na vrijeme
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Sinhronizuj offline fakture
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Sinhronizuj offline fakture
 DocType: BOM,Manufacturing,Proizvodnja
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Isporučeno
 DocType: Delivery Note,Customer's Purchase Order No,Broj porudžbenice kupca
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,U tabelu iznad unesite prodajni nalog
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,U tabelu iznad unesite prodajni nalog
+DocType: Quality Inspection,Report Date,Datum izvještaja
 DocType: POS Profile,Item Groups,Vrste artikala
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Bruto dobit%
 DocType: Payment Request,Payment Request,Upit za plaćanje
@@ -240,7 +244,7 @@
 DocType: Item,Variant Based On,Varijanta zasnovana na
 DocType: Payment Entry,Transaction ID,Transakcije
 DocType: Payment Entry Reference,Allocated,Dodijeljeno
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Dodaj još stavki ili otvori kompletan prozor
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Dodaj još stavki ili otvori kompletan prozor
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Rezervisana za prodaju
 DocType: POS Item Group,Item Group,Vrste artikala
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Starost (Dani)
@@ -252,7 +256,7 @@
 DocType: Customer,From Lead,Od Lead-a
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza potencijalnih kupaca
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status Projekta
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Sve vrste artikala
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Sve vrste artikala
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serijski broj {0} ne postoji
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Još uvijek nema dodatih kontakata
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Opseg dospijeća 3
@@ -263,19 +267,18 @@
 DocType: Item,Foreign Trade Details,Spoljnotrgovinski detalji
 DocType: Item,Minimum Order Qty,Minimalna količina za poručivanje
 DocType: Budget,Fiscal Year,Fiskalna godina
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Izaberite skladište
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Izaberite skladište
 DocType: Project,Project will be accessible on the website to these users,Projekat će biti dostupan na sajtu sledećim korisnicima
 DocType: Company,Services,Usluge
 apps/erpnext/erpnext/public/js/pos/pos.html +4,Item Cart,Korpa sa artiklima
 DocType: Warehouse,Warehouse Detail,Detalji o skldištu
 DocType: Quotation Item,Quotation Item,Stavka sa ponude
 DocType: Purchase Order Item,Warehouse and Reference,Skladište i veza
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Dodaj proizvode
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Nalog {2} je neaktivan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađena
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Nema napomene
 DocType: Notification Control,Purchase Receipt Message,Poruka u Prijemu robe
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Podešavanje je već urađeno !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Podešavanje je već urađeno !
 DocType: Purchase Invoice,Taxes and Charges Deducted,Umanjeni porezi i naknade
 DocType: Item,Default Unit of Measure,Podrazumijevana jedinica mjere
 DocType: Purchase Invoice Item,Serial No,Serijski broj
@@ -284,9 +287,9 @@
 DocType: Bank Reconciliation Detail,Posting Date,Datum dokumenta
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Ukupan povezani iznos (Valuta)
 DocType: Account,Income,Prihod
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Dodaj stavke
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Cjenovnik nije pronađen ili je zaključan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Nova faktura
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Dodaj stavke
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Cjenovnik nije pronađen ili je zaključan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Nova faktura
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Novo preduzeće
 DocType: Issue,Support Team,Tim za podršku
 DocType: Item,Valuation Method,Način vrednovanja
@@ -294,9 +297,10 @@
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Iznos dodatnog popusta (valuta preduzeća)
 DocType: Opportunity,Maintenance,Održavanje
 DocType: Item Price,Multiple Item prices.,Više cijena artikala
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,je primljen od
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,je primljen od
 DocType: Payment Entry,Write Off Difference Amount,Otpis razlike u iznosu
 DocType: Payment Entry,Cheque/Reference Date,Datum izvoda
+DocType: Repayment Schedule,Payment Date,Datum plaćanja
 DocType: Vehicle,Additional Details,Dodatni detalji
 DocType: Company,Create Chart Of Accounts Based On,Kreiraj kontni plan prema
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Otvori To Do
@@ -315,15 +319,14 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Na zalihama
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Umanjeni porezi i naknade (valuta preduzeća)
 DocType: Stock Entry,Additional Costs,Dodatni troškovi
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Kupac sa istim imenom već postoji
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +26,POS Profile {0} already created for user: {1} and company {2},POS profil {0} je već kreiran za korisnika: {1} i kompaniju {2}
 DocType: Item,Default Selling Cost Center,Podrazumijevani centar troškova
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Još uvijek nema kupaca!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Još uvijek nema kupaca!
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Ovo je zasnovano na transkcijama ovog klijenta. Pogledajte vremensku liniju ispod za dodatne informacije
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +64,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Upozorenje: Prodajni nalog {0}već postoji veza sa porudžbenicom kupca {1}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Analitička kartica
 DocType: Stock Entry,Total Outgoing Value,Ukupna vrijednost isporuke
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Prodajni nalog {0} је {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Prodajni nalog {0} је {1}
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Podesi automatski serijski broj da koristi FIFO
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Novi kupci
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Prije prodaje
@@ -350,9 +353,10 @@
 ,Sales Invoice Trends,Trendovi faktura prodaje
 DocType: Purchase Invoice,Tax Breakup,Porez po pozicijama
 DocType: Expense Claim,Task,Zadatak
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Dodaj / Izmijeni cijene
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Proizvodna porudžbina je već kreirana za sve artikle sa BOM
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Dodaj / Izmijeni cijene
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Proizvodna porudžbina je već kreirana za sve artikle sa BOM
 ,Item Prices,Cijene artikala
+DocType: Salary Component,Salary Component,Компонента плате
 DocType: Sales Order,Customer's Purchase Order Date,Datum porudžbenice kupca
 DocType: Item,Country of Origin,Zemlja porijekla
 DocType: Quotation,Order Type,Vrsta porudžbine
@@ -360,7 +364,7 @@
 DocType: Sales Invoice,Tax ID,Poreski broj
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,Wip skladište
 ,Itemwise Recommended Reorder Level,Pregled otpremljenih artikala
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Prodajni nalog {0} nije potvrđen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Prodajni nalog {0} nije potvrđen
 DocType: Item,Default Material Request Type,Podrazumijevani zahtjev za tip materijala
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Prodajna linija
 DocType: Payment Entry,Pay,Plati
@@ -371,13 +375,13 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +158,Quotation {0} is cancelled,Ponuda {0} je otkazana
 DocType: Asset,Item Code,Šifra artikla
 DocType: Purchase Order,Customer Mobile No,Broj telefona kupca
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Premještanje artikala
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Premještanje artikala
 DocType: Buying Settings,Buying Settings,Podešavanja nabavke
 DocType: Vehicle,Fleet Manager,Menadžer transporta
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Nivoi zalihe
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Nivoi zalihe
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Saldo (Po)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Sastavnica
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sinhronizuj podatke iz centrale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sinhronizuj podatke iz centrale
 DocType: Landed Cost Voucher,Purchase Receipts,Prijemi robe
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Prilagođavanje formi
 DocType: Purchase Invoice,Overdue,Istekao
@@ -389,7 +393,7 @@
 DocType: Pricing Rule,Selling,Prodaja
 DocType: Purchase Order,Customer Contact,Kontakt kupca
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Artikal {0} ne postoji
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Dodaj korisnike
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Dodaj korisnike
 ,Completed Production Orders,Završena proizvodna porudžbina
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Serial Numbers,Izaberite serijske brojeve
 DocType: Bank Reconciliation Detail,Payment Entry,Uplate
@@ -399,13 +403,13 @@
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Podrazumijevana podešavanja za dio Promjene na zalihama
 DocType: Production Planning Tool,Get Sales Orders,Pregledaj prodajne naloge
 DocType: Stock Ledger Entry,Stock Ledger Entry,Unos zalihe robe
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Naziv adrese
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Naziv adrese
 DocType: Item Group,Item Group Name,Naziv vrste artikala
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +118,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Isto ime grupe kupca već postoji. Promijenite ime kupca ili izmijenite grupu kupca
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još jedan  {0} # {1} postoji u vezanom Unosu zaliha {2}
 DocType: Item,Has Serial No,Ima serijski broj
 DocType: Payment Entry,Difference Amount (Company Currency),Razlika u iznosu (Valuta)
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Dodaj serijski broj
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Dodaj serijski broj
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Preduzeće i računi
 DocType: Employee,Current Address Is,Trenutna adresa je
 DocType: Payment Entry,Unallocated Amount,Nepovezani iznos
@@ -429,7 +433,7 @@
 DocType: Warehouse,Warehouse Name,Naziv skladišta
 DocType: Authorization Rule,Customer / Item Name,Kupac / Naziv proizvoda
 DocType: Student,Home Address,Kućna adresa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Ponuda dobavljača
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Ponuda dobavljača
 DocType: Material Request Item,Quantity and Warehouse,Količina i skladište
 DocType: Purchase Invoice,Taxes and Charges Added,Porezi i naknade dodate
 DocType: Production Order,Warehouses,Skladišta
@@ -450,28 +454,32 @@
 ,Point of Sale,Kasa
 ,Open Production Orders,Otvorene proizvodne porudžbine
 DocType: Landed Cost Item,Purchase Receipt Item,Stavka Prijema robe
+DocType: Salary Slip,Payment Days,Dana za plaćanje
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Uslovi i odredbe šablon
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Unos zaliha {0} je kreiran
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Unos zaliha {0} je kreiran
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Pogledajte u korpi
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Cijena artikla je izmijenjena {0} u cjenovniku {1}
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Popust
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Cijena artikla je izmijenjena {0} u cjenovniku {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Popust
 DocType: Packing Slip,Net Weight UOM,Neto težina  JM
 DocType: Selling Settings,Sales Order Required,Prodajni nalog je obavezan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Pretraži artikal
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Pretraži artikal
 ,Delivered Items To Be Billed,Nefakturisana isporučena roba
 DocType: Account,Debit,Duguje
+DocType: Bank Reconciliation Detail,Payment Document,Dokument za plaćanje
 DocType: Purchase Invoice,In Words (Company Currency),Riječima (valuta kompanije)
 ,Purchase Receipt Trends,Trendovi prijema robe
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Fiskalna godina {0} ne postoji
 DocType: Purchase Invoice Item,Accepted Warehouse,Prihvaćeno skladište
+DocType: Account,Income Account,Račun prihoda
 DocType: Journal Entry Account,Account Balance,Knjigovodstveno stanje
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,U skladište
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,U skladište
 DocType: Purchase Invoice,Contact Person,Kontakt osoba
 DocType: Item,Item Code for Suppliers,Dobavljačeva šifra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Povraćaj / knjižno zaduženje
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Zahtjev za ponudu dobavljača
 apps/erpnext/erpnext/config/accounts.py +142,Banking and Payments,Bakarstvo i plaćanja
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Активни Леадс / Kupci
-DocType: Purchase Invoice Item,Accounting,Računovodstvo
+DocType: POS Profile,Accounting,Računovodstvo
 DocType: Item,Manufacture,Proizvodnja
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Novi zadatak
 DocType: Journal Entry,Accounts Payable,Obaveze prema dobavljačima
@@ -479,10 +487,12 @@
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Preostalo za uplatu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Skladište je potrebno unijeti na poziciji {0}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Naziv novog skladišta
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Broj izvoda {0} na datum {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Broj izvoda {0} na datum {1}
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Kreiraj prodajni nalog
+DocType: Purchase Invoice,Items,Artikli
 DocType: Payment Entry,Allocate Payment Amount,Poveži uplaćeni iznos
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Datum i vrijeme štampe
+DocType: Sales Invoice,Debit To,Zaduženje za
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Minimum jedno skladište je obavezno
 DocType: Price List,Price List Name,Naziv cjenovnika
 DocType: Item,Purchase Details,Detalji kupovine
@@ -493,11 +503,11 @@
 DocType: Purchase Invoice,Additional Discount Amount,Iznos dodatnog popusta
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum početka projekta
 DocType: Announcement,Student,Student
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Zaliha se ne može promijeniti jer je vezana sa otpremnicom {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Zaliha se ne može promijeniti jer je vezana sa otpremnicom {0}
 DocType: Drug Prescription,Hour,Sat
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Stablo vrste artikala
 DocType: POS Profile,Update Stock,Ažuriraj zalihu
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Ciljno skladište
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Ciljno skladište
 ,Delivery Note Trends,Trendovi Otpremnica
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Sva skladišta
 DocType: Stock Reconciliation,Difference Amount,Razlika u iznosu
@@ -511,11 +521,12 @@
 DocType: Selling Settings,Default Customer Group,Podrazumijevana grupa kupaca
 DocType: GL Entry,Party,Partija
 ,Total Stock Summary,Ukupan pregled zalihe
+DocType: Purchase Invoice,Net Total (Company Currency),Ukupno (Valuta preduzeća)
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Otpisati
 DocType: Notification Control,Delivery Note Message,Poruka na otpremnici
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Ne može se obrisati serijski broj {0}, dok god se nalazi u dijelu Promjene na zalihama"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Kupci na čekanju
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Kupci na čekanju
 DocType: Purchase Invoice,Price List Currency,Valuta Cjenovnika
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +129,Project Manager,Projektni menadzer
 DocType: Journal Entry,Accounts Receivable,Potraživanja od kupaca
@@ -523,35 +534,35 @@
 DocType: Account,Expense,Rashod
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newsletter-i
 DocType: Purchase Invoice,Select Supplier Address,Izaberite adresu dobavljača
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Cjenovnik {0} je zaključan ili ne postoji
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Cjenovnik {0} je zaključan ili ne postoji
 DocType: Delivery Note,Billing Address Name,Naziv adrese za naplatu
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Dodaj stavku
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Sve grupe kupca
+DocType: Restaurant Order Entry,Add Item,Dodaj stavku
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Sve grupe kupca
 DocType: Item,Weight UOM,JM Težina
 DocType: Purchase Invoice Item,Stock Qty,Zaliha
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Opseg dospijeća 1
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,Artikli na zalihama
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,Nova korpa
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,Artikli na zalihama
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,Nova korpa
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analitika
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Novi {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Novi {0}: # {1}
 DocType: Supplier,Fixed Days,Fiksni dani
 DocType: Purchase Receipt Item,Rate and Amount,Cijena i vrijednost
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,'Total','Ukupno bez PDV-a'
-DocType: Purchase Invoice,Total Taxes and Charges,Ukupan porez i naknade
+DocType: Purchase Invoice,Total Taxes and Charges,Porez
 DocType: Purchase Order Item,Supplier Part Number,Dobavljačeva šifra
 DocType: Project Task,Project Task,Projektni zadatak
 DocType: Item Group,Parent Item Group,Nadređena Vrsta artikala
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,Kreirao je korisnik {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,Kreirao je korisnik {0}
 DocType: Purchase Order,Advance Paid,Avansno plačanje
 DocType: Opportunity,Customer / Lead Address,Kupac / Adresa lead-a
 DocType: Buying Settings,Default Buying Price List,Podrazumijevani Cjenovnik
 DocType: Purchase Invoice Item,Qty,Kol
 DocType: Mode of Payment,General,Opšte
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Otpisati iznos
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Otpisati iznos
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Outstanding Amount,Preostalo za plaćanje
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +320,Not Paid and Not Delivered,Nije plaćeno i nije isporučeno
 DocType: Bank Reconciliation,Total Amount,Ukupan iznos
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Izaberite cjenovnik
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Izaberite cjenovnik
 DocType: Quality Inspection,Item Serial No,Seriski broj artikla
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Customer Service,Usluga kupca
 DocType: Cost Center,Stock User,Korisnik zaliha
@@ -572,10 +583,11 @@
 DocType: GL Entry,Voucher Type,Vrsta dokumenta
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serijski broj {0} je već primljen
 apps/erpnext/erpnext/controllers/accounts_controller.py +476,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Ukupan avns({0}) na porudžbini {1} ne može biti veći od Ukupnog iznosa ({2})
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Cjenovnik nije odabran
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Cjenovnik nije odabran
 DocType: Item,Total Projected Qty,Ukupna projektovana količina
 DocType: Shipping Rule Condition,Shipping Rule Condition,Uslovi  pravila nabavke
 ,Customer Credit Balance,Kreditni limit kupca
+DocType: C-Form Invoice Detail,Net Total,Ukupno
 DocType: Purchase Invoice,Return,Povraćaj
 DocType: Sales Order Item,Delivery Warehouse,Skladište dostave
 DocType: Purchase Invoice,Total (Company Currency),Ukupno bez PDV-a (Valuta)
@@ -585,7 +597,7 @@
 DocType: Depreciation Schedule,Journal Entry,Knjiženje
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Ovo je zasnovano na transkcijama ovog dobavljača. Pogledajte vremensku liniju ispod za dodatne informacije
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Iznad 90 dana
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Serijski broj na poziciji {0} se ne poklapa sa otpremnicom
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Serijski broj na poziciji {0} se ne poklapa sa otpremnicom
 apps/erpnext/erpnext/public/js/templates/contact_list.html +37,New Contact,Novi kontakt
 DocType: Production Planning Tool,Create Production Orders,Kreiraj porudžbinu za proizvodnju
 DocType: Purchase Invoice,Returns,Povraćaj
@@ -593,7 +605,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Vrijednost Projekta
 DocType: Warehouse,Parent Warehouse,Nadređeno skladište
 DocType: Payment Request,Make Sales Invoice,Kreiraj fakturu prodaje
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Obriši
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,Obriši
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Izaberite skladište...
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Faktura / Detalji knjiženja
 ,Projected Quantity as Source,Projektovana izvorna količina
@@ -601,15 +613,15 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Kreiraj korisnike
 DocType: Pricing Rule,Price,Cijena
 DocType: Supplier Scorecard Scoring Standing,Employee,Zaposleni
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Projektna aktivnost / zadatak
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Projektna aktivnost / zadatak
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervisano skladište u Prodajnom nalogu / Skladište gotovog proizvoda
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +670,Quantity,Količina
 DocType: Buying Settings,Purchase Receipt Required,Prijem robe je obavezan
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Valuta je obavezna za Cjenovnik {0}
 DocType: POS Customer Group,Customer Group,Grupa kupaca
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Skladište se jedino može promijeniti u dijelu Unos zaliha / Otpremnica / Prijem robe
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Zahtjev za ponude
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Naučite
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Zahtjev za ponude
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Naučite
 DocType: Purchase Invoice,Additional Discount,Dodatni popust
 DocType: Payment Entry,Cheque/Reference No,Broj izvoda
 DocType: C-Form,Series,Vrsta dokumenta
@@ -617,22 +629,23 @@
 DocType: Payment Entry,Total Allocated Amount,Ukupno povezani iznos
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Sve adrese
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Korisnici i dozvole
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Dodaj kupce
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Dodaj kupce
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Otpremite robu prvo
 DocType: Lead,From Customer,Od kupca
 DocType: Item,Maintain Stock,Vođenje zalihe
 DocType: Sales Invoice Item,Sales Order Item,Pozicija prodajnog naloga
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Godišnji promet: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Godišnji promet: {0}
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Rezervisana kol.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Ništa nije pronađeno
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Ništa nije pronađeno
 DocType: Item,Copy From Item Group,Kopiraj iz vrste artikala
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Molimo odaberite Predračune
+DocType: Purchase Taxes and Charges,On Net Total,Na Neto vrijednost
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Molimo odaberite Predračune
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} se ne nalazi u aktivnim poslovnim godinama.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Brzo knjiženje
 DocType: Sales Order,Partly Delivered,Djelimično isporučeno
 DocType: Purchase Invoice Item,Quality Inspection,Provjera kvaliteta
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,Računovodstveni iskazi
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Cijena je dodata na artiklu {0} iz cjenovnika {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Cijena je dodata na artiklu {0} iz cjenovnika {1}
 DocType: Project Type,Projects Manager,Projektni menadžer
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Ponuda {0} ne propada {1}
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Svi proizvodi ili usluge.
@@ -641,7 +654,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +764,Quotation,Ponuda
 DocType: Item,Has Variants,Ima varijante
 DocType: Price List Country,Price List Country,Zemlja cjenovnika
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Datum dospijeća je obavezan
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Datum dospijeća je obavezan
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Korpa
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Promjene na zalihama prije {0} su zamrznute
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Kupac {0} je prekoračio kreditni limit {1} / {2}
@@ -662,14 +675,15 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +395,{0} {1} is cancelled or closed,{0} {1} je otkazan ili zatvoren
 DocType: Request for Quotation Item,Request for Quotation Item,Zahtjev za stavku sa ponude
 DocType: Homepage,Products,Proizvodi
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","npr. ""Izrada alata za profesionalce"""
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Ukupno neplaćeno: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","npr. ""Izrada alata za profesionalce"""
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Ukupno neplaćeno: {0}
 DocType: Purchase Invoice,Is Paid,Je plaćeno
 ,Ordered Items To Be Billed,Nefakturisani prodajni nalozi
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Ostali izvještaji
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Kupovina
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Otpremnice
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,U riječima će biti vidljivo tek kada sačuvate prodajni nalog.
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Прикажи одсечак плате
 DocType: Journal Entry Account,Sales Order,Prodajni nalog
 DocType: Stock Entry,Customer or Supplier Details,Detalji kupca ili dobavljača
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Prodaja
diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv
index 73cca74..dddc555 100644
--- a/erpnext/translations/sr.csv
+++ b/erpnext/translations/sr.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Плата режим
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Регистровати
 DocType: Patient,Divorced,Разведен
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Ставке које се већ синхронизовано
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Дозволите тачка треба додати више пута у трансакцији
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Одбацити Материјал Посетите {0} пре отказивања ове гаранцији
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Производи широке потрошње
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Оставите Аппроверс
 DocType: Sales Partner,Dealer,Трговац
 DocType: Consultation,Investigations,Истраге
+DocType: Restaurant Order Entry,Click Enter To Add,Кликните Ентер за додавање
 DocType: Employee,Rented,Изнајмљени
 DocType: Purchase Order,PO-,po-
 DocType: POS Profile,Applicable for User,Важи за кориснике
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Стоппед Производња поредак не може бити поништен, то Унстоп прво да откажете"
 DocType: Vehicle Service,Mileage,километража
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Да ли заиста желите да укине ову имовину?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Да ли заиста желите да укине ову имовину?
 DocType: Drug Prescription,Update Schedule,Упдате Сцхедуле
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Изаберите Примарни добављач
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Валута је потребан за ценовнику {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Провери доступност
 DocType: Job Applicant,Job Applicant,Посао захтева
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Ово је засновано на трансакције против тог добављача. Погледајте рок доле за детаље
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Нема више резултата.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,правни
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Актуелне тип порез не може бити укључен у стопу тачка у низу {0}
 DocType: Bank Guarantee,Customer,Купац
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Курс курс мора да буде исти као {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Име клијента
 DocType: Vehicle,Natural Gas,Природни гас
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Жиро рачун не може бити именован као {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Жиро рачун не може бити именован као {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Хеадс (или групе) против које рачуноводствене уноси се праве и биланси се одржавају.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Выдающийся для {0} не может быть меньше нуля ( {1} )
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Нема поднесених плата за обраду.
 DocType: Manufacturing Settings,Default 10 mins,Уобичајено 10 минс
 DocType: Leave Type,Leave Type Name,Оставите Име Вид
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,схов отворен
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Неопходно је и данас предузети ову акцију за горе поменуто понављање
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Серия Обновлено Успешно
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Провери
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Аццурал Часопис Ступање Субмиттед
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Налог за куповину ставке које се примају
 DocType: SMS Center,All Supplier Contact,Све Снабдевач Контакт
 DocType: Support Settings,Support Settings,Подршка подешавања
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Очекивани Датум завршетка не може бити мањи од очекиваног почетка Датум
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Очекивани Датум завршетка не може бити мањи од очекиваног почетка Датум
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ред # {0}: курс мора да буде исти као {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Нова апликација одсуство
 ,Batch Item Expiry Status,Батцх артикла истека статус
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Банка Нацрт
 DocType: Mode of Payment Account,Mode of Payment Account,Начин плаћања налог
 DocType: Consultation,Consultation,Консултације
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Продаја и повратак
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Схов Варијанте
 DocType: Academic Term,Academic Term,akademski Рок
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Материјал
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,здравство
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Кашњење у плаћању (Дани)
 DocType: Lab Prescription,Lab Prescription,Лаб рецепт
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Сортирај по цени
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,сервис Трошкови
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Серијски број: {0} је већ наведено у продаји фактуре: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Фактура
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Серијски број: {0} је већ наведено у продаји фактуре: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Периодичност
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Фискална година {0} је потребно
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,одбрана
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Ров # {0}:
 DocType: Timesheet,Total Costing Amount,Укупно Цостинг Износ
 DocType: Delivery Note,Vehicle No,Нема возила
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Изаберите Ценовник
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Изаберите Ценовник
 DocType: Accounts Settings,Currency Exchange Settings,Поставке размене валута
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Ред # {0}: Документ Плаћање је потребно за завршетак трасацтион
 DocType: Production Order Operation,Work In Progress,Ворк Ин Прогресс
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Молимо одаберите датум
 DocType: Employee,Holiday List,Холидаи Листа
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Молимо вас да поставите систем именовања инструктора у школи&gt; Поставке школе
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,рачуновођа
+DocType: Hub Settings,Selling Price List,Продајна цена
 DocType: Patient,Tobacco Current Use,Употреба дувана
 DocType: Cost Center,Stock User,Сток Корисник
 DocType: Company,Phone No,Тел
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Распоред курса цреатед:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Нови {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Нови {0}: # {1}
 ,Sales Partners Commission,Продаја Партнери Комисија
 DocType: Purchase Invoice,Rounding Adjustment,Прилагођавање заокруживања
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Аббревиатура не может иметь более 5 символов
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Родитељ Детаљ доцнаме
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Референца: {0}, Код товара: {1} Цустомер: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,кг
-DocType: Student Log,Log,Пријава
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Отварање за посао.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Резултат је поднет
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Резултат је поднет
 DocType: Item Attribute,Increment,Повећање
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Временски распон
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Изабери Варехоусе ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Ожењен
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Није дозвољено за {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Гет ставке из
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Производ {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Но итемс листед
 DocType: Payment Reconciliation,Reconcile,помирити
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пензиони фондови
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Следећа Амортизација Датум не може бити пре купуваве
 DocType: Consultation,Consultation Date,Датум консултације
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Списак производа и откривање за кориснике ЕРПНект
 DocType: SMS Center,All Sales Person,Све продаје Особа
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Месечни Дистрибуција ** помаже да дистрибуирате буџет / Таргет преко месеци ако имате сезонски у свом послу.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Није пронађено ставки
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Плата Структура Недостаје
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Није пронађено ставки
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Плата Структура Недостаје
 DocType: Lead,Person Name,Особа Име
 DocType: Sales Invoice Item,Sales Invoice Item,Продаја Рачун шифра
 DocType: Account,Credit,Кредит
 DocType: POS Profile,Write Off Cost Center,Отпис Центар трошкова
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",нпр &quot;Основна школа&quot; или &quot;Универзитет&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",нпр &quot;Основна школа&quot; или &quot;Универзитет&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,stock Извештаји
 DocType: Warehouse,Warehouse Detail,Магацин Детаљ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Пређена кредитни лимит за купца {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Рок Датум завршетка не може бити касније од годину завршити Датум школске године у којој је термин везан (академска година {}). Молимо исправите датуме и покушајте поново.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Да ли је основних средстава&quot; не може бити неконтролисано, као средствима запис постоји у односу на ставке"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Да ли је основних средстава&quot; не може бити неконтролисано, као средствима запис постоји у односу на ставке"
 DocType: Vehicle Service,Brake Oil,кочница уље
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Корисник&gt; Корисничка група&gt; Територија
 DocType: Tax Rule,Tax Type,Пореска Тип
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,опорезиви износ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},"Вы не авторизованы , чтобы добавить или обновить записи до {0}"
 DocType: BOM,Item Image (if not slideshow),Артикал слика (ако не слидесхов)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Существуетклиентов с одноименным названием
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Час курс / 60) * Пуна Операција време
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Ред # {0}: Референтни тип документа мора бити један од потраживања трошкова или уноса дневника
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Избор БОМ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Ред # {0}: Референтни тип документа мора бити један од потраживања трошкова или уноса дневника
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Избор БОМ
 DocType: SMS Log,SMS Log,СМС Пријава
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Трошкови уручене пошиљке
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Празник на {0} није између Од датума и до сада
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,zaposleni кредита
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Активност Пријављивање :
 DocType: Fee Schedule,Send Payment Request Email,Пошаљите захтев за плаћање
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,"Пункт {0} не существует в системе, или истек"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,"Пункт {0} не существует в системе, или истек"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Некретнине
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Изјава рачуна
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Фармација
@@ -210,18 +213,23 @@
 DocType: Employee,B-,Б-
 DocType: Upload Attendance,Import Log,Увоз се
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Повуците Материал захтев типа производње на основу горе наведених критеријума
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Успешно нерегистровани.
 DocType: Training Result Employee,Grade,разред
+DocType: Restaurant Table,No of Seats,Број седишта
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Да бисте додали динамичку тему, користите јинџинске ознаке <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Деливеред добављач
 DocType: SMS Center,All Contact,Све Контакт
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Производња заказа већ створена за све ставке са БОМ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Производња заказа већ створена за све ставке са БОМ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Годишња плата
 DocType: Daily Work Summary,Daily Work Summary,Дневни Рад Преглед
 DocType: Period Closing Voucher,Closing Fiscal Year,Затварање Фискална година
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} је замрзнут
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Молимо одаберите постојећу компанију за израду контни
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} је замрзнут
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Молимо одаберите постојећу компанију за израду контни
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Акции Расходы
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Селецт Таргет Варехоусе
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Селецт Таргет Варехоусе
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Селецт Таргет Варехоусе
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Селецт Таргет Варехоусе
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Молимо Вас да унесете предност контакт емаил
 DocType: Program Enrollment,School Bus,Школски аутобус
 DocType: Journal Entry,Contra Entry,Цонтра Ступање
@@ -239,9 +247,10 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Преузмите шаблон, попуните одговарајуће податке и приложите измењену датотеку.
  Све датуми и запослени комбинација у одабраном периоду ће доћи у шаблону, са постојећим евиденцију"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Пункт {0} не является активным или конец жизни был достигнут
+DocType: Student Admission Program,Minimum Age,Минимална доб
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Пример: Басиц Матхематицс
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item , налоги в строках должны быть также включены {1}"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Настройки для модуля HR
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Настройки для модуля HR
 DocType: SMS Center,SMS Center,СМС центар
 DocType: Sales Invoice,Change Amount,Промена Износ
 DocType: BOM Update Tool,New BOM,Нови БОМ
@@ -251,7 +260,7 @@
 DocType: Lead,Request Type,Захтев Тип
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Маке Емплоиее
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,радиодифузија
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Додајте собе
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Начин подешавања ПОС (Онлине / Оффлине)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,извршење
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Детаљи о пословању спроведена.
 DocType: Serial No,Maintenance Status,Одржавање статус
@@ -274,6 +283,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Прайс-лист должен быть применим для покупки или продажи
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Дата установки не может быть до даты доставки для Пункт {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Попуст на цену Лист стопа (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Биокемија
 DocType: Offer Letter,Select Terms and Conditions,Изаберите Услови
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,od Вредност
 DocType: Production Planning Tool,Sales Orders,Салес Ордерс
@@ -308,15 +318,15 @@
 DocType: Sales Partner,Reseller,Продавац
 DocType: Codification Table,Medical Code,Медицински код
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Ако је означено, ће укључивати не-залихама у материјалу захтевима."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Унесите фирму
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Унесите фирму
 DocType: Delivery Note Item,Against Sales Invoice Item,Против продаје Фактура тачком
 ,Production Orders in Progress,Производни Поруџбине у напретку
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Нето готовина из финансирања
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","Локалну меморију је пуна, није сачувао"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","Локалну меморију је пуна, није сачувао"
 DocType: Lead,Address & Contact,Адреса и контакт
 DocType: Leave Allocation,Add unused leaves from previous allocations,Додај неискоришћене листове из претходних алокација
 DocType: Sales Partner,Partner website,сајт партнер
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Додајте ставку
+DocType: Restaurant Order Entry,Add Item,Додајте ставку
 DocType: Lab Test,Custom Result,Прилагођени резултат
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Контакт Име
 DocType: Course Assessment Criteria,Course Assessment Criteria,Критеријуми процене цоурсе
@@ -329,7 +339,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Захтев за куповину.
 DocType: Lab Test,Submitted Date,Датум подношења
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Ово се заснива на временској Схеетс насталих против овог пројекта
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Нето плата не може бити мања од 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Нето плата не може бити мања од 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Да бисте зауставили слање понављајућих обавештења о грешци из система, у претплати смо означили поље Дисаблед"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Только выбранный Оставить утверждающий мог представить этот Оставить заявку
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Освобождение Дата должна быть больше даты присоединения
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Леавес по години
@@ -338,9 +349,10 @@
 DocType: Email Digest,Profit & Loss,Губитак профита
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Литар
 DocType: Task,Total Costing Amount (via Time Sheet),Укупно Обрачун трошкова Износ (преко Тиме Схеет)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Молим поставите студенте под студентске групе
 DocType: Item Website Specification,Item Website Specification,Ставка Сајт Спецификација
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Оставите Блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Банк unosi
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,годовой
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Стоцк Помирење артикла
@@ -349,7 +361,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Студент Група Стварање Алат курс
 DocType: Lead,Do Not Contact,Немојте Контакт
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,Људи који предају у вашој организацији
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Стеам ИД за праћење свих понавља фактуре. Генерише се на субмит.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Софтваре Девелопер
 DocType: Item,Minimum Order Qty,Минимална количина за поручивање
 DocType: Pricing Rule,Supplier Type,Снабдевач Тип
@@ -359,17 +370,19 @@
 DocType: Item,Publish in Hub,Објављивање у Хуб
 DocType: Student Admission,Student Admission,студент Улаз
 ,Terretory,Терретори
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Пункт {0} отменяется
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Материјал Захтев
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Пункт {0} отменяется
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Материјал Захтев
 DocType: Bank Reconciliation,Update Clearance Date,Упдате Дате клиренс
 DocType: Item,Purchase Details,Куповина Детаљи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Ставка {0} није пронађен у &quot;сировине Испоручује се &#39;сто у нарудзбенице {1}
 DocType: Patient Relation,Relation,Однос
 DocType: Shipping Rule,Worldwide Shipping,Широм света Достава
 DocType: Patient Relation,Mother,мајка
+DocType: Restaurant Reservation,Reservation End Time,Време завршетка резервације
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Потврђена наређења од купаца.
 DocType: Purchase Receipt Item,Rejected Quantity,Одбијен Количина
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Захтев за плаћање {0} креиран
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Захтев за плаћање {0} креиран
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Ниска осетљивост
 DocType: Notification Control,Notification Control,Обавештење Контрола
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Потврдите кад завршите обуку
 DocType: Lead,Suggestions,Предлози
@@ -389,7 +402,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Емаилс плата клизање да запосленом на основу пожељног е-маил одабран у запосленог
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Први одсуство одобраватељ на листи ће бити постављен као подразумевани Аппровер Леаве
 DocType: Tax Rule,Shipping County,Достава жупанија
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Научити
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Научити
 DocType: Asset,Next Depreciation Date,Следећа Амортизација Датум
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Активност Трошкови по запосленом
 DocType: Accounts Settings,Settings for Accounts,Подешавања за рачуне
@@ -400,13 +413,13 @@
 DocType: Item,Synced With Hub,Синхронизују са Хуб
 DocType: Vehicle,Fleet Manager,флота директор
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Ред # {0}: {1} не може бити негативна за ставку {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Погрешна Лозинка
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Погрешна Лозинка
 DocType: Item,Variant Of,Варијанта
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Завршен ком не може бити већи од 'Количина за производњу'
 DocType: Period Closing Voucher,Closing Account Head,Затварање рачуна Хеад
 DocType: Employee,External Work History,Спољни власници
 DocType: Physician,Time per Appointment,Време по именовању
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Циркуларне референце Грешка
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Циркуларне референце Грешка
 DocType: Appointment Type,Is Inpatient,Је стационарно
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Гуардиан1 Име
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,У Вордс (извоз) ће бити видљив када сачувате напомену Деливери.
@@ -415,19 +428,18 @@
 DocType: Lead,Industry,Индустрија
 DocType: Employee,Job Profile,Профиль работы
 DocType: BOM Item,Rate & Amount,Рате &amp; Амоунт
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Молимо да подесите серију бројева за присуство преко Сетуп&gt; Сериес Нумберинг
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Ово се заснива на трансакцијама против ове компаније. За детаље погледајте временски оквир испод
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Обавестити путем емаила на стварању аутоматског материјала захтеву
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Отпорно
 DocType: Journal Entry,Multi Currency,Тема Валута
 DocType: Payment Reconciliation Invoice,Invoice Type,Фактура Тип
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Корисник&gt; Корисничка група&gt; Територија
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Обавештење о пријему пошиљке
 DocType: Consultation,Encounter Impression,Енцоунтер Импрессион
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Подешавање Порези
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Набавна вредност продате Ассет
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,Плаћање Ступање је модификована након што га извукао. Молимо вас да га опет повуците.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} вводится дважды в пункт налоге
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Преглед за ову недељу и чекају активности
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} вводится дважды в пункт налоге
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Преглед за ову недељу и чекају активности
 DocType: Student Applicant,Admitted,Признао
 DocType: Workstation,Rent Cost,Издавање Трошкови
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Износ Након Амортизација
@@ -442,36 +454,35 @@
 DocType: Shipping Rule,Valid for Countries,Важи за земље
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Ово је тачка шаблона и не може се користити у трансакцијама. Атрибути јединица ће бити копирани у варијанти осим 'Нема Копирање' постављено
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Укупно Ордер Сматра
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Сотрудник обозначение (например генеральный директор , директор и т.д.) ."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Сотрудник обозначение (например генеральный директор , директор и т.д.) ."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Стопа по којој Купац Валута се претварају у основне валуте купца
 DocType: Course Scheduling Tool,Course Scheduling Tool,Наравно Распоред Алат
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ред # {0}: фактури не може се против постојеће имовине {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Ургент] Грешка приликом креирања понављајућег% с за% с
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Ургент] Грешка приликом креирања понављајућег% с за% с
 DocType: Item Tax,Tax Rate,Пореска стопа
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} већ издвојила за запосленог {1} за период {2} {3} у
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Избор артикла
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Избор артикла
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Ред # {0}: Серијски бр морају бити исти као {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Претвори у не-Гроуп
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Групно (много) од стране јединице.
 DocType: C-Form Invoice Detail,Invoice Date,Фактуре
 DocType: GL Entry,Debit Amount,Износ задужења
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Може постојати само 1 налог за предузеће у {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Молимо погледајте прилог
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Може постојати само 1 налог за предузеће у {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Молимо погледајте прилог
 DocType: Purchase Order,% Received,% Примљено
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Створити студентских група
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Подешавање Већ Комплетна !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Подешавање Већ Комплетна !
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Кредит Напомена Износ
 DocType: Setup Progress Action,Action Document,Акциони документ
 ,Finished Goods,готове робе
 DocType: Delivery Note,Instructions,Инструкције
 DocType: Quality Inspection,Inspected By,Контролисано Би
 DocType: Maintenance Visit,Maintenance Type,Одржавање Тип
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} није уписано у току {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Шифра производа&gt; Група производа&gt; Бренд
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} није уписано у току {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Серийный номер {0} не принадлежит накладной {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ЕРПНект демо
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Додај артикле
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Додај артикле
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Ставка Провера квалитета Параметар
 DocType: Leave Application,Leave Approver Name,Оставите одобраватељ Име
 DocType: Depreciation Schedule,Schedule Date,Распоред Датум
@@ -493,7 +504,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Радно време
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Промена стартовања / струја број редни постојеће серије.
 DocType: Dosage Strength,Strength,Снага
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Креирајте нови клијента
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Креирајте нови клијента
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ако више Цене Правила наставити да превлада, корисници су упитани да подесите приоритет ручно да реши конфликт."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Створити куповини Ордерс
 ,Purchase Register,Куповина Регистрација
@@ -512,7 +523,7 @@
 DocType: Lab Test Template,Single,Самац
 DocType: Salary Slip,Total Loan Repayment,Укупно Отплата кредита
 DocType: Account,Cost of Goods Sold,Себестоимость реализованных товаров
-DocType: Purchase Invoice,Yearly,Годишње
+DocType: Subscription,Yearly,Годишње
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Унесите трошка
 DocType: Drug Prescription,Dosage,Дозирање
 DocType: Journal Entry Account,Sales Order,Продаја Наручите
@@ -543,7 +554,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобална подешавања за свим производним процесима.
 DocType: Accounts Settings,Accounts Frozen Upto,Рачуни Фрозен Упто
 DocType: SMS Log,Sent On,Послата
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} изабран више пута у атрибутима табели
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} изабран више пута у атрибутима табели
 DocType: HR Settings,Employee record is created using selected field. ,Запослени Запис се креира коришћењем изабрано поље.
 DocType: Sales Order,Not Applicable,Није применљиво
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Мастер отдыха .
@@ -568,13 +579,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Укупно лишће издвојена обавезна
 DocType: Patient,AB Positive,АБ Позитиван
 DocType: Job Opening,Description of a Job Opening,Опис посао Отварање
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Пендинг активности за данас
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Пендинг активности за данас
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Гледалаца рекорд.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Плата Компонента за плате на основу ТимеСхеет.
 DocType: Sales Order Item,Used for Production Plan,Користи се за производни план
 DocType: Employee Loan,Total Payment,Укупан износ
 DocType: Manufacturing Settings,Time Between Operations (in mins),Време између операција (у минута)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} је отказана тако да акција не може бити завршен
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} је отказана тако да акција не може бити завршен
 DocType: Customer,Buyer of Goods and Services.,Купац робе и услуга.
 DocType: Journal Entry,Accounts Payable,Обавезе према добављачима
 DocType: Patient,Allergies,Алергије
@@ -586,23 +597,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Упозоравај наруџбенице
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Листанеколико ваших клијената . Они могу бити организације и појединци .
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Довољно Делови за изградњу
+DocType: POS Profile User,POS Profile User,ПОС Профил корисника
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Прямая прибыль
 DocType: Patient Appointment,Date TIme,Датум време
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Не можете да филтрирате на основу налога , ако груписани по налогу"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Административни службеник
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Молимо одаберите Цоурсе
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Молимо одаберите Цоурсе
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Молимо одаберите Цоурсе
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Молимо одаберите Цоурсе
 DocType: Codification Table,Codification Table,Табела кодификације
 DocType: Timesheet Detail,Hrs,хрс
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Молимо изаберите Цомпани
 DocType: Stock Entry Detail,Difference Account,Разлика налог
 DocType: Purchase Invoice,Supplier GSTIN,добављач ГСТИН
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Не можете да затворите задатак као њен задатак зависи {0} није затворен.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,Унесите складиште за које Материјал Захтев ће бити подигнута
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Не можете да затворите задатак као њен задатак зависи {0} није затворен.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Унесите складиште за које Материјал Захтев ће бити подигнута
 DocType: Production Order,Additional Operating Cost,Додатни Оперативни трошкови
 DocType: Lab Test Template,Lab Routine,Лаб Роутине
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,козметика
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Да бисте објединили , следеће особине морају бити исти за обе ставке"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Да бисте објединили , следеће особине морају бити исти за обе ставке"
 DocType: Shipping Rule,Net Weight,Нето тежина
 DocType: Employee,Emergency Phone,Хитна Телефон
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,купити
@@ -613,7 +625,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Молимо Вас да дефинише оцену за праг 0%
 DocType: Sales Order,To Deliver,Да Испоручи
 DocType: Purchase Invoice Item,Item,ставка
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Серијски број Ставка не може да буде део
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Висока осетљивост
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Серијски број Ставка не може да буде део
 DocType: Journal Entry,Difference (Dr - Cr),Разлика ( др - Кр )
 DocType: Account,Profit and Loss,Прибыль и убытки
 DocType: Patient,Risk Factors,Фактори ризика
@@ -622,7 +635,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Управљање Подуговарање
 DocType: Vital Signs,Body Temperature,Телесна температура
 DocType: Project,Project will be accessible on the website to these users,Пројекат ће бити доступни на сајту ових корисника
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Дефинишите тип пројекта.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Дефинишите тип пројекта.
 DocType: Supplier Scorecard,Weighting Function,Функција пондерирања
 DocType: Physician,OP Consulting Charge,ОП Консалтинг Цхарге
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Поставите свој
@@ -636,7 +649,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Повећање не може бити 0
 DocType: Production Planning Tool,Material Requirement,Материјал Захтев
 DocType: Company,Delete Company Transactions,Делете Цомпани трансакције
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Референца број и референце Датум је обавезна за банке трансакције
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Референца број и референце Датум је обавезна за банке трансакције
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Адд / Едит порези и таксе
 DocType: Payment Entry Reference,Supplier Invoice No,Снабдевач фактура бр
 DocType: Territory,For reference,За референце
@@ -644,12 +657,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Не могу да избришем серијски број {0}, као што се користи у промету акција"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Затварање (Цр)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Здраво
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,мове артикла
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,мове артикла
 DocType: Serial No,Warranty Period (Days),Гарантни период (дани)
 DocType: Installation Note Item,Installation Note Item,Инсталација Напомена Ставка
 DocType: Production Plan Item,Pending Qty,Кол чекању
 DocType: Budget,Ignore,Игнорисати
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} није активан
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} није активан
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,цхецк сетуп димензије за штампање
 DocType: Salary Slip,Salary Slip Timesheet,Плата Слип Тимесхеет
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Поставщик Склад обязательным для субподрядчиком ТОВАРНЫЙ ЧЕК
@@ -658,7 +671,7 @@
 DocType: Pricing Rule,Sales Partner,Продаја Партнер
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Све испоставне картице.
 DocType: Buying Settings,Purchase Receipt Required,Куповина Потврда Обавезно
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Процена курс је обавезна ако Отварање Сток ушла
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,Процена курс је обавезна ако Отварање Сток ушла
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Нема резултата у фактури табели записи
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Молимо Вас да изаберете Цомпани и Партије Типе прво
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Финансовый / отчетного года .
@@ -695,7 +708,7 @@
 DocType: Quotation,Quotation To,Цитат
 DocType: Lead,Middle Income,Средњи приход
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Открытие (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Уобичајено јединица мере за тачке {0} не може директно мењати, јер сте већ направили неке трансакције (с) са другим УЦГ. Мораћете да креирате нову ставку да користи другачији Дефаулт УЦГ."
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Уобичајено јединица мере за тачке {0} не може директно мењати, јер сте већ направили неке трансакције (с) са другим УЦГ. Мораћете да креирате нову ставку да користи другачији Дефаулт УЦГ."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Додељена сума не може бити негативан
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Подесите Цомпани
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Подесите Цомпани
@@ -710,6 +723,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Избор Плаћање рачуна да банке Ентри
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Створити запослених евиденције за управљање лишће, трошковима тврдње и плате"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Период рецептора
+DocType: Restaurant Reservation,Restaurant Reservation,Резервација ресторана
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Писање предлога
 DocType: Payment Entry Deduction,Payment Entry Deduction,Плаћање Ступање дедукције
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Још једна особа Продаја {0} постоји са истим запослених ид
@@ -717,7 +731,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Мајстори
 DocType: Assessment Plan,Maximum Assessment Score,Максимални Процена Резултат
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Упдате Банк трансакције Датуми
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,time Трацкинг
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,time Трацкинг
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,Дупликат за ТРАНСПОРТЕР
 DocType: Fiscal Year Company,Fiscal Year Company,Фискална година Компанија
 DocType: Packing Slip Item,DN Detail,ДН Детаљ
@@ -725,8 +739,9 @@
 DocType: Timesheet,Billed,Изграђена
 DocType: Batch,Batch Description,Батцх Опис
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Креирање студентских група
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Паимент Гатеваи налог није створен, ручно направите."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Паимент Гатеваи налог није створен, ручно направите."
 DocType: Supplier Scorecard,Per Year,Годишње
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Није прихватљиво за пријем у овом програму према ДОБ-у
 DocType: Sales Invoice,Sales Taxes and Charges,Продаја Порези и накнаде
 DocType: Employee,Organization Profile,Профиль организации
 DocType: Vital Signs,Height (In Meter),Висина (у метрима)
@@ -762,7 +777,7 @@
 DocType: Student Batch Name,Batch Name,батцх Име
 DocType: Fee Validity,Max number of visit,Максималан број посета
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Тимесхеет цреатед:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,уписати
 DocType: GST Settings,GST Settings,ПДВ подешавања
 DocType: Selling Settings,Customer Naming By,Кориснички назив под
@@ -794,16 +809,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Истовара порези и таксе
 DocType: Production Order Operation,Actual Start Time,Стварна Почетак Време
 DocType: BOM Operation,Operation Time,Операција време
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,завршити
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,завршити
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,база
 DocType: Timesheet,Total Billed Hours,Укупно Обрачунате сат
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Отпис Износ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Отпис Износ
 DocType: Leave Block List Allow,Allow User,Дозволите кориснику
 DocType: Journal Entry,Bill No,Бил Нема
 DocType: Company,Gain/Loss Account on Asset Disposal,Добитак / губитак налог на средства одлагању
 DocType: Vehicle Log,Service Details,Сервице Детаљи
 DocType: Vehicle Log,Service Details,Сервице Детаљи
-DocType: Purchase Invoice,Quarterly,Тромесечни
+DocType: Subscription,Quarterly,Тромесечни
 DocType: Lab Test Template,Grouped,Груписано
 DocType: Selling Settings,Delivery Note Required,Испорука Напомена Обавезно
 DocType: Bank Guarantee,Bank Guarantee Number,Банкарска гаранција Број
@@ -813,12 +828,12 @@
 DocType: Student Attendance,Student Attendance,студент Присуство
 DocType: Sales Invoice Timesheet,Time Sheet,Распоред
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Бацкфлусх сировине на основу
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,"Пожалуйста, введите детали деталя"
 DocType: Interest,Interest,интерес
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Пре продаје
 DocType: Purchase Receipt,Other Details,Остали детаљи
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,суплиер
 DocType: Lab Test,Test Template,Тест Темплате
+DocType: Restaurant Order Entry Item,Served,Сервирано
 DocType: Account,Accounts,Рачуни
 DocType: Vehicle,Odometer Value (Last),Одометер вредност (Задња)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Шаблони за критеријуме резултата добављача.
@@ -830,26 +845,28 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Преглед плата Слип
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Рачун {0} је ушла више пута
 DocType: Account,Expenses Included In Valuation,Трошкови укључени у процене
-DocType: Hub Settings,Seller City,Продавац Град
 ,Absent Student Report,Абсент Студентски Извештај
 DocType: Email Digest,Next email will be sent on:,Следећа порука ће бити послата на:
 DocType: Offer Letter Term,Offer Letter Term,Понуда Леттер Терм
 DocType: Supplier Scorecard,Per Week,Недељно
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Тачка има варијанте.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Тачка има варијанте.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Тотал Студент
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Пункт {0} не найден
 DocType: Bin,Stock Value,Вредност акције
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,"Евиденције о накнади ће бити створене у позадини. У случају било какве грешке, порука о грешци ће бити ажурирана у Распореду."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Фирма {0} не постоји
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} има важећу тарифу до {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} има важећу тарифу до {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Дрво Тип
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Кол Потрошено по јединици
 DocType: Serial No,Warranty Expiry Date,Гаранција Датум истека
 DocType: Material Request Item,Quantity and Warehouse,Количина и Магацин
+DocType: Hub Settings,Unregister,Одјавите се
 DocType: Sales Invoice,Commission Rate (%),Комисија Стопа (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Молимо одаберите програм
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Молимо одаберите програм
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Молимо одаберите програм
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Молимо одаберите програм
 DocType: Project,Estimated Cost,Процењени трошкови
 DocType: Purchase Order,Link to material requests,Линк материјалним захтевима
+DocType: Hub Settings,Publish,Објави
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,ваздушно-космички простор
 DocType: Journal Entry,Credit Card Entry,Кредитна картица Ступање
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Компанија и рачуни
@@ -860,13 +877,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Близу Прилика Након неколико дана
 ,Reserved,Резервисано
 DocType: Purchase Order,Supply Raw Materials,Суппли Сировине
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Датум који ће бити генерисан следећи рачун. То се генерише на достави.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,оборотные активы
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} не является акционерным Пункт
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',"Молимо вас да поделите своје повратне информације на тренинг кликом на &#39;Феедбацк Феедбацк&#39;, а затим &#39;Нев&#39;"
 DocType: Mode of Payment Account,Default Account,Уобичајено Рачун
 DocType: Payment Entry,Received Amount (Company Currency),Примљени износ (Фирма валута)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,"Ведущий должен быть установлен , если Возможность сделан из свинца"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,"Ведущий должен быть установлен , если Возможность сделан из свинца"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Пожалуйста, выберите в неделю выходной"
 DocType: Patient,O Negative,О Негативе
 DocType: Production Order Operation,Planned End Time,Планирано време завршетка
@@ -882,10 +898,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,енергија
 DocType: Opportunity,Opportunity From,Прилика Од
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Месечна плата изјава.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Додај компанију
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ред {0}: {1} Серијски бројеви потребни за ставку {2}. Дали сте {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ред {0}: {1} Серијски бројеви потребни за ставку {2}. Дали сте {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Изаберите табелу
 DocType: BOM,Website Specifications,Сајт Спецификације
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} је неважећа адреса е-поште у &#39;Примаоцима&#39;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} је неважећа адреса е-поште у &#39;Примаоцима&#39;
 DocType: Special Test Items,Particulars,Спецулатионс
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Антибиотик.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Од {0} типа {1}
@@ -893,11 +909,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Ред {0}: Фактор конверзије је обавезно
 DocType: Employee,A+,А +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Вишеструки Цена Правила постоји са истим критеријумима, молимо вас да решавају конфликте са приоритетом. Цена Правила: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не можете деактивирати или отказати БОМ јер је повезан са другим саставница
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не можете деактивирати или отказати БОМ јер је повезан са другим саставница
 DocType: Opportunity,Maintenance,Одржавање
 DocType: Item Attribute Value,Item Attribute Value,Итем Вредност атрибута
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Кампании по продажам .
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Маке тимесхеет
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Маке тимесхеет
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -954,12 +970,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Молимо унесите прва тачка
 DocType: Account,Liability,одговорност
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционисани износ не може бити већи од износ потраживања у низу {0}.
+DocType: Salary Detail,Do not include in total,Не укључујте у потпуности
 DocType: Company,Default Cost of Goods Sold Account,Уобичајено Набавна вредност продате робе рачуна
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Прайс-лист не выбран
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Прайс-лист не выбран
 DocType: Employee,Family Background,Породица Позадина
 DocType: Request for Quotation Supplier,Send Email,Сенд Емаил
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Упозорење: Неважећи Прилог {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Без дозвола
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Упозорење: Неважећи Прилог {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Без дозвола
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Цитирај молио
 DocType: Vital Signs,Heart Rate / Pulse,Срце / пулса
 DocType: Company,Default Bank Account,Уобичајено банковног рачуна
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Филтрирање на основу партије, изаберите партија Типе први"
@@ -987,12 +1005,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Итем Ред {идк}: {ДОЦТИПЕ} {ДОЦНАМЕ} не постоји у горе &#39;{ДОЦТИПЕ}&#39; сто
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Тимесхеет {0} је већ завршен или отказан
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Но задаци
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Дан у месецу на којем друмски фактура ће бити генерисан нпр 05, 28 итд"
 DocType: Item Variant Settings,Copy Fields to Variant,Копирај поља на варијанту
 DocType: Asset,Opening Accumulated Depreciation,Отварање акумулирана амортизација
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Коначан мора бити мања или једнака 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Програм Упис Алат
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,Ц - Форма евиденција
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,Ц - Форма евиденција
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Купаца и добављача
 DocType: Email Digest,Email Digest Settings,Е-маил подешавања Дигест
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Хвала за ваш посао!
@@ -1010,13 +1027,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Куоте Статус
 DocType: Maintenance Visit,Completion Status,Завршетак статус
 DocType: HR Settings,Enter retirement age in years,Унесите старосну границу за пензионисање у годинама
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Циљна Магацин
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Изаберите складиште
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Циљна Магацин
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Изаберите складиште
 DocType: Cheque Print Template,Starting location from left edge,Почетна локација од леве ивице
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволите преко испоруку или пријем упто овом одсто
 DocType: Stock Entry,STE-,аортна
 DocType: Upload Attendance,Import Attendance,Увоз Гледалаца
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Все Группы товаров
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Все Группы товаров
 DocType: Process Payroll,Activity Log,Активност Пријава
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Нето добит / губитак
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Автоматически создавать сообщение о подаче сделок .
@@ -1028,7 +1045,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Пројектовани Кол
 DocType: Sales Invoice,Payment Due Date,Плаћање Дуе Дате
 DocType: Drug Prescription,Interval UOM,Интервал УОМ
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Тачка Варијанта {0} већ постоји са истим атрибутима
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Тачка Варијанта {0} већ постоји са истим атрибутима
+DocType: Item,Hub Publishing Details,Детаљи издавања станице
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;Отварање&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Опен То До
 DocType: Notification Control,Delivery Note Message,Испорука Напомена порука
@@ -1048,10 +1066,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,БОМ # {0}: Сировина не може бити иста као главна ставка
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Укупно Важећи Оптужбе у куповини потврда за ставке табели мора бити исти као и укупних пореза и накнада
 DocType: Sales Team,Incentives,Подстицаји
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Региструјте се за Хуб
 DocType: SMS Log,Requested Numbers,Тражени Бројеви
 DocType: Production Planning Tool,Only Obtain Raw Materials,Само Добијање Сировине
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Учинка.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Омогућавање &#39;Користи се за Корпа &quot;, као што је омогућено Корпа и требало би да постоји најмање један Пореска правила за Корпа"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Омогућавање &#39;Користи се за Корпа &quot;, као што је омогућено Корпа и требало би да постоји најмање један Пореска правила за Корпа"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Ступање плаћање {0} је повезан против налога {1}, провери да ли треба да се повуче као напредак у овој фактури."
 DocType: Sales Invoice Item,Stock Details,Сток Детаљи
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Пројекат Вредност
@@ -1070,12 +1089,14 @@
 DocType: Salary Slip,Working Days,Радних дана
 DocType: Serial No,Incoming Rate,Долазни Оцени
 DocType: Packing Slip,Gross Weight,Бруто тежина
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,Име ваше компаније за коју сте се постављање овог система .
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Омогући Хуб
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,Име ваше компаније за коју сте се постављање овог система .
 DocType: HR Settings,Include holidays in Total no. of Working Days,Укључи одмор у Укупан бр. радних дана
 DocType: Job Applicant,Hold,Држати
 DocType: Employee,Date of Joining,Датум Придруживање
 DocType: Naming Series,Update Series,Упдате
 DocType: Supplier Quotation,Is Subcontracted,Да ли подизвођење
+DocType: Restaurant Table,Minimum Seating,Минимално седиште
 DocType: Item Attribute,Item Attribute Values,Итем Особина Вредности
 DocType: Examination Result,Examination Result,преглед резултата
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Куповина Пријем
@@ -1086,13 +1107,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Није могуће пронаћи време за наредних {0} дана за рад {1}
 DocType: Production Order,Plan material for sub-assemblies,План материјал за подсклопови
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Продајних партнера и Регија
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,БОМ {0} мора бити активна
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,БОМ {0} мора бити активна
 DocType: Journal Entry,Depreciation Entry,Амортизација Ступање
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Прво изаберите врсту документа
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Отменить Материал просмотров {0} до отмены этого обслуживания визит
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Серийный номер {0} не принадлежит Пункт {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Обавезно Кол
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Складишта са постојећим трансакције не могу се претворити у књизи.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Складишта са постојећим трансакције не могу се претворити у књизи.
 DocType: Bank Reconciliation,Total Amount,Укупан износ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Интернет издаваштво
 DocType: Prescription Duration,Number,Број
@@ -1103,7 +1124,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Продаја Ценовник
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Ако се провери, биће креиран корисник, мапиран на Патиент. Пацијентове фактуре ће бити створене против овог Корисника. Такође можете изабрати постојећег купца током стварања Пацијента."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Објављивање за синхронизацију ставки
 DocType: Bank Reconciliation,Account Currency,Рачун Валута
 DocType: Lab Test,Sample ID,Пример узорка
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Молимо да наведете заокружују рачун у компанији
@@ -1112,11 +1132,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Сотрудник {0} не активен или не существует
 DocType: Fee Structure,Components,komponente
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Молимо унесите Ассет Категорија тачке {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Ставка Варијанте {0} ажурирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Ставка Варијанте {0} ажурирани
 DocType: Quality Inspection Reading,Reading 6,Читање 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Цан нот {0} {1} {2} без негативних изузетан фактура
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","да се генерише. Ако је одложено, морате ручно промијенити поље &quot;Понови на дан дана&quot; овога"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Цан нот {0} {1} {2} без негативних изузетан фактура
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Фактури Адванце
-DocType: Hub Settings,Sync Now,Синц Сада
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Ров {0}: Кредит Унос се не може повезати са {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Дефинисати буџет за финансијске године.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Уобичајено банка / Готовина налог ће аутоматски бити ажуриран у ПОС фактура, када је овај режим изабран."
@@ -1128,13 +1149,13 @@
 DocType: Item,Is Purchase Item,Да ли је куповина артикла
 DocType: Asset,Purchase Invoice,Фактури
 DocType: Stock Ledger Entry,Voucher Detail No,Ваучер Детаљ Бр.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Нови продаје Фактура
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Нови продаје Фактура
 DocType: Stock Entry,Total Outgoing Value,Укупна вредност Одлазећи
 DocType: Physician,Appointments,Именовања
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Датум отварања и затварања Дате треба да буде у истој фискалној години
 DocType: Lead,Request for Information,Захтев за информације
 ,LeaderBoard,банер
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Синц Оффлине Рачуни
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Синц Оффлине Рачуни
 DocType: Payment Request,Paid,Плаћен
 DocType: Program Fee,Program Fee,naknada програм
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1153,11 +1174,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Куповина ставке поруџбине
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Косвенная прибыль
 DocType: Student Attendance Tool,Student Attendance Tool,Студент Присуство Алат
+DocType: Restaurant Menu,Price List (Auto created),Ценовник (Аутоматски креиран)
 DocType: Cheque Print Template,Date Settings,Датум Поставке
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Варијација
 ,Company Name,Име компаније
 DocType: SMS Center,Total Message(s),Всего сообщений (ы)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Избор тачка за трансфер
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Избор тачка за трансфер
 DocType: Purchase Invoice,Additional Discount Percentage,Додатни попуст Проценат
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Погледајте листу сву помоћ видео
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Изаберите главу рачуна банке у којој је депонован чек.
@@ -1175,6 +1197,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Метар
 DocType: Workstation,Electricity Cost,Струја Трошкови
 DocType: HR Settings,Don't send Employee Birthday Reminders,Немојте слати запослених подсетник за рођендан
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Сачувајте подешавања
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Тражени производи
 DocType: Item,Inspection Criteria,Инспекцијски Критеријуми
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Преносе
 DocType: BOM Website Item,BOM Website Item,БОМ Сајт артикла
@@ -1192,11 +1216,11 @@
 DocType: Journal Entry,Total Amount in Words,Укупан износ у речи
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Дошло је до грешке . Један могући разлог би могао бити да нисте сачували форму . Молимо контактирајте суппорт@ерпнект.цом акопроблем и даље постоји .
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Моја Корпа
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Наручи Тип мора бити један од {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Наручи Тип мора бити један од {0}
 DocType: Lead,Next Contact Date,Следеће Контакт Датум
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Отварање Кол
 DocType: Healthcare Settings,Appointment Reminder,Опомена за именовање
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Молимо Вас да унесете налог за промене Износ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Молимо Вас да унесете налог за промене Износ
 DocType: Student Batch Name,Student Batch Name,Студент Серија Име
 DocType: Consultation,Doctor,Доцтор
 DocType: Holiday List,Holiday List Name,Холидаи Листа Име
@@ -1204,12 +1228,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Распоред курса
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Сток Опције
 DocType: Journal Entry Account,Expense Claim,Расходи потраживање
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Да ли заиста желите да вратите овај укинута средства?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Количина за {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Да ли заиста желите да вратите овај укинута средства?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Количина за {0}
 DocType: Leave Application,Leave Application,Оставите апликацију
 DocType: Patient,Patient Relation,Релација пацијента
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Оставите Тоол доделе
+DocType: Item,Hub Category to Publish,Категорија Хуб објавити
 DocType: Leave Block List,Leave Block List Dates,Оставите Датуми листу блокираних
+DocType: Sales Invoice,Billing Address GSTIN,Адреса за обрачун ГСТИН
 DocType: Workstation,Net Hour Rate,Нет час курс
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Слетео набавну Пријем
 DocType: Company,Default Terms,Уобичајено Правила
@@ -1219,11 +1245,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Наведите {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Уклоњене ствари без промене у количини или вриједности.
 DocType: Delivery Note,Delivery To,Достава Да
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Атрибут сто је обавезно
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Атрибут сто је обавезно
 DocType: Production Planning Tool,Get Sales Orders,Гет продајних налога
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} не може бити негативан
 DocType: Training Event,Self-Study,Само-студирање
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Попуст
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Попуст
 DocType: Asset,Total Number of Depreciations,Укупан број Амортизација
 DocType: Sales Invoice Item,Rate With Margin,Стопа Са маргина
 DocType: Sales Invoice Item,Rate With Margin,Стопа Са маргина
@@ -1231,7 +1257,7 @@
 DocType: Task,Urgent,Хитан
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Наведите важећу Ров ИД за редом {0} у табели {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Није могуће пронаћи варијаблу:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Молимо изаберите поље за уређивање из нумпад-а
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Молимо изаберите поље за уређивање из нумпад-а
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Иди на Десктоп и почнете да користите ЕРПНект
 DocType: Item,Manufacturer,Произвођач
 DocType: Landed Cost Item,Purchase Receipt Item,Куповина ставке Рецеипт
@@ -1262,8 +1288,8 @@
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,По умолчанию Продажа Стоимость центр
 DocType: Sales Partner,Implementation Partner,Имплементација Партнер
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Поштански број
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Салес Ордер {0} је {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Поштански број
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Салес Ордер {0} је {1}
 DocType: Opportunity,Contact Info,Контакт Инфо
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Макинг Стоцк записи
 DocType: Packing Slip,Net Weight UOM,Тежина УОМ
@@ -1274,6 +1300,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Гет Офф Недељно Датуми
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,"Дата окончания не может быть меньше , чем Дата начала"
 DocType: Sales Person,Select company name first.,Изаберите прво име компаније.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Низак до висок
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Цитати од добављача.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Замените БОМ и ажурирајте најновију цену у свим БОМ
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Да {0} | {1} {2}
@@ -1294,7 +1321,7 @@
 DocType: Program Enrollment,Transportation,транспорт
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,неважећи Атрибут
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} должны быть представлены
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Количина мора бити мањи од или једнак {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Количина мора бити мањи од или једнак {0}
 DocType: SMS Center,Total Characters,Укупно Карактери
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Молимо Вас да изаберете БОМ БОМ у пољу за ставку {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Ц-Форм Рачун Детаљ
@@ -1309,7 +1336,7 @@
 ,Ordered Items To Be Billed,Ж артикала буду наплаћени
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Од Опсег мора да буде мањи од у распону
 DocType: Global Defaults,Global Defaults,Глобални Дефаултс
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Пројекат Сарадња Позив
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Пројекат Сарадња Позив
 DocType: Salary Slip,Deductions,Одбици
 DocType: Leave Allocation,LAL/,ЛАЛ /
 DocType: Setup Progress Action,Action Name,Назив акције
@@ -1327,13 +1354,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Продаја Рачун Адванце
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Ништа се захтевати
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Још једна буџета запис &#39;{0}&#39; већ постоји против {1} {2} &#39;за фискалну годину {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"""Стварни датум почетка"" не може бити већи од ""Стварни датум завршетка"""
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"""Стварни датум почетка"" не може бити већи од ""Стварни датум завршетка"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,управљање
 DocType: Cheque Print Template,Payer Settings,обвезник Подешавања
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ово ће бити прикључена на Кодекса тачка на варијанте. На пример, ако је ваш скраћеница је ""СМ"", а код ставка је ""МАЈИЦА"", ставка код варијанте ће бити ""МАЈИЦА-СМ"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Нето плата (у речи) ће бити видљив када сачувате Слип плату.
 DocType: Purchase Invoice,Is Return,Да ли је Повратак
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Опрез
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Опрез
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Повратак / задужењу
 DocType: Price List Country,Price List Country,Ценовник Земља
 DocType: Item,UOMs,УОМс
@@ -1348,17 +1375,18 @@
 DocType: Account,Balance Sheet,баланс
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Цост Центер За ставку са Код товара '
 DocType: Fee Validity,Valid Till,Важи до
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режим плаћања није подешен. Молимо вас да проверите, да ли налог је постављен на начину плаћања или на ПОС профил."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режим плаћања није подешен. Молимо вас да проверите, да ли налог је постављен на начину плаћања или на ПОС профил."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Исто ставка не може се уписати више пута.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Даље рачуни могу бити у групама, али уноса можете извршити над несрпским групама"
 DocType: Lead,Lead,Довести
 DocType: Email Digest,Payables,Обавезе
 DocType: Course,Course Intro,Наравно Увод
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Стоцк Ступање {0} је направљена
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Молимо да подесите серију бројева за присуство преко Сетуп&gt; Сериес Нумберинг
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Стоцк Ступање {0} је направљена
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ред # {0}: Одбијен количина не може се уписати у откупу Повратак
 ,Purchase Order Items To Be Billed,Налог за куповину артикала буду наплаћени
 DocType: Purchase Invoice Item,Net Rate,Нето курс
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Изаберите купца
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Изаберите купца
 DocType: Purchase Invoice Item,Purchase Invoice Item,Фактури Итем
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Сток Ледгер уноси и ГЛ Пријаве се постављати за одабране куповине Примања
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Тачка 1
@@ -1379,7 +1407,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Дубликат строка {0} с же {1}
 ,Trial Balance,Пробни биланс
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Фискална година {0} није пронађен
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Подешавање Запослени
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Подешавање Запослени
 DocType: Sales Order,SO-,ТАКО-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,"Пожалуйста, выберите префикс первым"
 DocType: Employee,O-,О-
@@ -1391,12 +1419,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Погледај Леџер
 DocType: Grading Scale,Intervals,интервали
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Најраније
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем , пожалуйста, измените имя элемента или переименовать группу товаров"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем , пожалуйста, измените имя элемента или переименовать группу товаров"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Студент Мобилни број
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Остальной мир
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Остальной мир
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Ставка {0} не може имати Батцх
 ,Budget Variance Report,Буџет Разлика извештај
 DocType: Salary Slip,Gross Pay,Бруто Паи
+DocType: Item,Is Item from Hub,Је ставка из чворишта
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Ред {0}: Тип активност је обавезна.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Исплаћене дивиденде
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Књиговодство Леџер
@@ -1406,8 +1435,9 @@
 DocType: Vehicle Log,Service Detail,сервис Детаљ
 DocType: BOM,Item Description,Ставка Опис
 DocType: Student Sibling,Student Sibling,студент Сиблинг
-DocType: Purchase Invoice,Is Recurring,Је се понавља
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Режим плаћања
 DocType: Purchase Invoice,Supplied Items,Додатна артикала
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Молимо активирајте мени за ресторан {0}
 DocType: Student,STUD.,ПАСТУВ.
 DocType: Production Order,Qty To Manufacture,Кол Да Производња
 DocType: Email Digest,New Income,Нова приход
@@ -1418,6 +1448,7 @@
 ,Student and Guardian Contact Details,Студент и Гуардиан контакт детаљи
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Ред {0}: За добављача {0} е-маил адреса је дужан да пошаље е-маил
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Привремени Отварање
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Виев Хуб
 ,Employee Leave Balance,Запослени одсуство Биланс
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Весы для счета {0} должен быть всегда {1}
 DocType: Patient Appointment,More Info,Више информација
@@ -1437,13 +1468,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Упозорити на нови захтев за цитате
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Наруџбенице помоћи да планирате и праћење куповина
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Жао нам је , компаније не могу да се споје"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Жао нам је , компаније не могу да се споје"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Тестирање лабораторијских тестова
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Укупна количина Издање / трансфер {0} у Индустријска Захтев {1} \ не може бити већа од тражене количине {2} за тачка {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Мали
 DocType: Employee,Employee Number,Запослени Број
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Случай Нет (ы) уже используется. Попробуйте из дела № {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Случай Нет (ы) уже используется. Попробуйте из дела № {0}
 DocType: Project,% Completed,Завршено %
 ,Invoiced Amount (Exculsive Tax),Износ фактуре ( Екцулсиве Пореска )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Тачка 2
@@ -1458,11 +1489,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,косвенные расходы
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Ред {0}: Кол је обавезно
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,пољопривреда
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Синц мастер података
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Синц мастер података
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Ваши производи или услуге
 DocType: Special Test Items,Special Test Items,Специјалне тестне тачке
 DocType: Mode of Payment,Mode of Payment,Начин плаћања
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Сајт Слика треба да буде јавни фајл или УРЛ веб-сајта
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Сајт Слика треба да буде јавни фајл или УРЛ веб-сајта
 DocType: Student Applicant,AP,АП
 DocType: Purchase Invoice Item,BOM,БОМ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,То јекорен ставка група и не може се мењати .
@@ -1470,24 +1501,23 @@
 DocType: Vehicle,Fuel UOM,Гориво УОМ
 DocType: Warehouse,Warehouse Contact Info,Магацин Контакт Инфо
 DocType: Payment Entry,Write Off Difference Amount,Отпис Дифференце Износ
-DocType: Purchase Invoice,Recurring Type,Понављајући Тип
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: е запослених није пронађен, стога емаил није послата"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: е запослених није пронађен, стога емаил није послата"
 DocType: Item,Foreign Trade Details,Спољнотрговинска Детаљи
+,Assessment Plan Status,Статус плана процене
 DocType: Email Digest,Annual Income,Годишњи приход
 DocType: Serial No,Serial No Details,Серијска Нема детаља
 DocType: Purchase Invoice Item,Item Tax Rate,Ставка Пореска стопа
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,Изаберите лекар и датум
 DocType: Student Group Student,Group Roll Number,"Група Ролл, број"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитне рачуни могу бити повезани против неке друге ставке дебитне"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Збир свих радних тегова треба да буде 1. Подесите тежине свих задатака пројекта у складу са тим
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Збир свих радних тегова треба да буде 1. Подесите тежине свих задатака пројекта у складу са тим
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Пункт {0} должен быть Субдоговорная Пункт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Капитальные оборудование
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Правилник о ценама је први изабран на основу 'Примени на ""терену, који могу бити артикла, шифра групе или Марка."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Молимо прво поставите код за ставку
-DocType: Hub Settings,Seller Website,Продавац Сајт
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Молимо прво поставите код за ставку
 DocType: Item,ITEM-,Артикл-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Всего выделено процент для отдела продаж должен быть 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Всего выделено процент для отдела продаж должен быть 100
 DocType: Sales Invoice Item,Edit Description,Измени опис
 DocType: Antibiotic,Antibiotic,Антибиотик
 ,Team Updates,тим ажурирања
@@ -1508,12 +1538,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Укупно (Фирма валута)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Серийный номер {0} вошли более одного раза
 DocType: Depreciation Schedule,Journal Entry,Јоурнал Ентри
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} ставки у току
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} ставки у току
 DocType: Workstation,Workstation Name,Воркстатион Име
 DocType: Grading Scale Interval,Grade Code,граде код
 DocType: POS Item Group,POS Item Group,ПОС Тачка Група
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Емаил Дигест:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},БОМ {0} не припада тачком {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},БОМ {0} не припада тачком {1}
 DocType: Sales Partner,Target Distribution,Циљна Дистрибуција
 DocType: Salary Slip,Bank Account No.,Банковни рачун бр
 DocType: Naming Series,This is the number of the last created transaction with this prefix,То је број последње створеног трансакције са овим префиксом
@@ -1530,10 +1560,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Захтев за понуду добављача
 DocType: Healthcare Settings,Registration Message,Регистрација порука
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,аппаратные средства
-DocType: Sales Order,Recurring Upto,понављајући Упто
 DocType: Prescription Dosage,Prescription Dosage,Досаге на рецепт
 DocType: Attendance,HR Manager,ХР Менаџер
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Изаберите Цомпани
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Изаберите Цомпани
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Привилегированный Оставить
 DocType: Purchase Invoice,Supplier Invoice Date,Датум фактуре добављача
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,по
@@ -1549,10 +1578,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Перекрытие условия найдено между :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Против часопису Ступање {0} је већ прилагођен против неког другог ваучера
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Укупна вредност поруџбине
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,еда
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,еда
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Старење Опсег 3
 DocType: Maintenance Schedule Item,No of Visits,Број посета
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Распоред одржавања {0} постоји од {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Да ли желите објавити своје ставке у Хуб?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,Уписивање student
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валута затварања рачуна мора да буде {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Збир бодова за све циљеве би требало да буде 100. То је {0}
@@ -1563,9 +1593,9 @@
 DocType: Authorization Rule,Average Discount,Просечна дисконтна
 DocType: Purchase Invoice Item,UOM,УОМ
 DocType: Rename Tool,Utilities,Комуналне услуге
-DocType: Purchase Invoice Item,Accounting,Рачуноводство
+DocType: POS Profile,Accounting,Рачуноводство
 DocType: Employee,EMP/,ЕБ /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Молимо одаберите серије за дозирано ставку
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Молимо одаберите серије за дозирано ставку
 DocType: Asset,Depreciation Schedules,Амортизација Распоред
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Период примене не може бити изван одсуство расподела Период
 DocType: Activity Cost,Projects,Пројекти
@@ -1581,7 +1611,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',"Состояние утверждения должны быть ""Одобрено"" или "" Отклонено """
 DocType: Physician,Contacts and Address,Контакти и адреса
 DocType: Purchase Invoice,Contact Person,Контакт особа
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"""Очекивани датум почетка"" не може бити већи од ""Очекивани датум завршетка"""
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""Очекивани датум почетка"" не може бити већи од ""Очекивани датум завршетка"""
 DocType: Course Scheduling Tool,Course End Date,Наравно Датум завршетка
 DocType: Holiday List,Holidays,Празници
 DocType: Sales Order Item,Planned Quantity,Планирана количина
@@ -1589,10 +1619,11 @@
 DocType: Item,Maintain Stock,Одржавајте Стоцк
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Сток уноси већ створене за производно Реда
 DocType: Employee,Prefered Email,преферед Е-маил
+DocType: Student Admission,Eligibility and Details,Подобност и Детаљи
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Нето промена у основном средству
 DocType: Leave Control Panel,Leave blank if considered for all designations,Оставите празно ако се сматра за све ознакама
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные ' в строке {0} не могут быть включены в пункт Оценить
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Мак: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Мак: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Од датетиме
 DocType: Email Digest,For Company,За компаније
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Комуникација дневник.
@@ -1600,19 +1631,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Добављач Сцорецард Сцоринг Вариабле
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Куповина Износ
 DocType: Sales Invoice,Shipping Address Name,Достава Адреса Име
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Контни
 DocType: Material Request,Terms and Conditions Content,Услови коришћења садржаја
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,не може бити већи од 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
 DocType: Maintenance Visit,Unscheduled,Неплански
 DocType: Employee,Owned,Овнед
 DocType: Salary Detail,Depends on Leave Without Pay,Зависи оставити без Паи
 DocType: Pricing Rule,"Higher the number, higher the priority","Виши број, већи приоритет"
 ,Purchase Invoice Trends,Фактури Трендови
 DocType: Employee,Better Prospects,Бољи изгледи
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Ред # {0}: Шаржа {1} има само {2} Кти. Молимо одаберите другу групу која има {3} Кти Аваилабле или поделити ред у више редова, да испоручи / проблема из више серија"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Ред # {0}: Шаржа {1} има само {2} Кти. Молимо одаберите другу групу која има {3} Кти Аваилабле или поделити ред у више редова, да испоручи / проблема из више серија"
 DocType: Vehicle,License Plate,Регистарске таблице
 DocType: Appraisal,Goals,Циљеви
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Изаберите ПОС профил
 DocType: Warranty Claim,Warranty / AMC Status,Гаранција / АМЦ статус
 ,Accounts Browser,Дебиторская Браузер
 DocType: Payment Entry Reference,Payment Entry Reference,Плаћање Ступање Референтна
@@ -1631,7 +1662,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Запослени не може пријавити за себе.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Аконалог је замрзнут , уноси могу да ограничене корисницима ."
 DocType: Email Digest,Bank Balance,Стање на рачуну
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Књиговодство Ступање на {0}: {1} може се вршити само у валути: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Књиговодство Ступање на {0}: {1} може се вршити само у валути: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Профиль работы , квалификация , необходимые т.д."
 DocType: Journal Entry Account,Account Balance,Рачун Биланс
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Пореска Правило за трансакције.
@@ -1640,8 +1671,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Укупни порези и таксе (Друштво валута)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Схов П &amp; Л стања унцлосед фискалну годину
 DocType: Lab Test Template,Collection Details,Детаљи колекције
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","изаберите цп.наме, цп.тест_цоде, цп.парент, цп.инвоице, цт.пхисициан, цт.цонсултатион_дате из табЦонсултатион цт, `табЛаб Пресцриптион` цп гдје цт.патиент = &#39;{0}&#39; и цп.парент = цт. име и цп.тест_цреатед = 0"
 DocType: Shipping Rule,Shipping Account,Достава рачуна
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: налог {2} је неактиван
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Маке Салес Ордерс ће вам помоћи да планирате свој рад и доставити на време
@@ -1658,7 +1687,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Паковање Слип
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,аренда площади для офиса
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Подешавање Подешавања СМС Гатеваи
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Увоз није успело !
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Увоз није успело !
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Адреса додао.
 DocType: Workstation Working Hour,Workstation Working Hour,Воркстатион радни сат
 DocType: Vital Signs,Blood Pressure,Крвни притисак
@@ -1683,7 +1712,7 @@
 DocType: Sales Invoice,Source,Извор
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,схов затворено
 DocType: Leave Type,Is Leave Without Pay,Да ли је Оставите без плате
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Средство Категорија је обавезна за фиксне тачке средстава
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Средство Категорија је обавезна за фиксне тачке средстава
 DocType: Fee Validity,Fee Validity,Валидност накнаде
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Нема резултата у табели плаћања записи
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ова {0} је у супротности са {1} за {2} {3}
@@ -1704,8 +1733,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Екецутиве Сеарцх
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,створити Леадс
 DocType: Maintenance Schedule,Schedules,Распореди
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,ПОС профил је потребан да користи Поинт-оф-Сале
 DocType: Purchase Invoice Item,Net Amount,Нето износ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} није поднет тако да акција не може бити завршен
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} није поднет тако да акција не може бити завршен
 DocType: Purchase Order Item Supplied,BOM Detail No,БОМ Детаљ Нема
 DocType: Landed Cost Voucher,Additional Charges,Додатни трошкови
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Додатне Износ попуста (Фирма валута)
@@ -1714,7 +1744,7 @@
 ,Support Hour Distribution,Подршка Дистрибуција сата
 DocType: Maintenance Visit,Maintenance Visit,Одржавање посета
 DocType: Student,Leaving Certificate Number,Леавинг Цертифицате Нумбер
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Именовање је отказано, молимо прегледајте и откажите фактуру {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Именовање је отказано, молимо прегледајте и откажите фактуру {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Доступно партије Кол у складишту
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Упдате Принт Формат
 DocType: Landed Cost Voucher,Landed Cost Help,Слетео Трошкови Помоћ
@@ -1737,8 +1767,8 @@
 DocType: Patient,Tobacco Past Use,Коришћење прошлости дувана
 DocType: Sales Invoice Item,Brand Name,Бранд Наме
 DocType: Purchase Receipt,Transporter Details,Транспортер Детаљи
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Корисник {0} је већ додељен лекару {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Уобичајено складиште је потребан за одабране ставке
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Корисник {0} је већ додељен лекару {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Уобичајено складиште је потребан за одабране ставке
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,коробка
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,могуће добављача
 DocType: Budget,Monthly Distribution,Месечни Дистрибуција
@@ -1748,8 +1778,8 @@
 DocType: Sales Partner,Sales Partner Target,Продаја Партнер Циљна
 DocType: Loan Type,Maximum Loan Amount,Максимални износ кредита
 DocType: Pricing Rule,Pricing Rule,Цены Правило
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Дупликат Д број за студента {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Дупликат Д број за студента {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Дупликат Д број за студента {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Дупликат Д број за студента {0}
 DocType: Budget,Action if Annual Budget Exceeded,Акција ако Годишњи буџет Екцеедед
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Материјал захтјев за откуп Ордер
 DocType: Shopping Cart Settings,Payment Success URL,Плаћање Успех УРЛ адреса
@@ -1766,7 +1796,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} мора појавити само једном
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Није дозвољено да транфер више {0} од {1} против нарудзбенице {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Листья Выделенные Успешно для {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Нет объектов для вьючных
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Нет объектов для вьючных
 DocType: Shipping Rule Condition,From Value,Од вредности
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Производња Количина је обавезно
 DocType: Employee Loan,Repayment Method,Начин отплате
@@ -1780,6 +1810,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Акции Обязательства
 DocType: Purchase Invoice,Supplier Warehouse,Снабдевач Магацин
 DocType: Opportunity,Contact Mobile No,Контакт Мобиле Нема
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Изаберите компанију
 ,Material Requests for which Supplier Quotations are not created,Материјални Захтеви за који Супплиер Цитати нису створени
 DocType: Student Group,Set 0 for no limit,Сет 0 без ограничења
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Дан (и) на коју се пријављујете за дозволу су празници. Не морате пријавити за одмор.
@@ -1789,24 +1820,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Направи понуду
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Остали извештаји
 DocType: Dependent Task,Dependent Task,Зависна Задатак
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Покушајте планирање операција за Кс дана унапред.
 DocType: HR Settings,Stop Birthday Reminders,Стани Рођендан Подсетници
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Молимо поставите Дефаулт Паиролл Паиабле рачун у компанији {0}
 DocType: SMS Center,Receiver List,Пријемник Листа
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Тражи артикла
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Тражи артикла
 DocType: Patient Appointment,Referring Physician,Референтни лекар
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Цонсумед Износ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Нето промена на пари
 DocType: Assessment Plan,Grading Scale,скала оцењивања
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,већ завршено
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,већ завршено
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Стоцк Ин Ханд
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Плаћање Захтјев већ постоји {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Трошкови издатих ставки
 DocType: Physician,Hospital,Болница
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Количина не сме бити више од {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Количина не сме бити више од {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Претходној финансијској години није затворена
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Старост (Дани)
 DocType: Quotation Item,Quotation Item,Понуда шифра
@@ -1817,8 +1848,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Тип Поставщик мастер .
 DocType: Purchase Order Item,Supplier Part Number,Снабдевач Број дела
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Коэффициент конверсии не может быть 0 или 1
-DocType: Sales Invoice,Reference Document,Ознака документа
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} отказан или заустављен
+DocType: Subscription,Reference Document,Ознака документа
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} отказан или заустављен
 DocType: Accounts Settings,Credit Controller,Кредитни контролер
 DocType: Delivery Note,Vehicle Dispatch Date,Отпрема Возила Датум
 DocType: Healthcare Settings,Default Medical Code Standard,Стандардни медицински кодни стандард
@@ -1827,6 +1858,7 @@
 DocType: Company,Default Payable Account,Уобичајено оплате рачуна
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Подешавања за онлине куповину као што су испоруке правила, ценовник итд"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Приходована
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Сортирај по цијени ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Резервисано Кол
 DocType: Party Account,Party Account,Странка налог
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Человеческие ресурсы
@@ -1838,13 +1870,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Маке исплата Ентри
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Ред {0}: Унапред против добављач мора да се задужи
 DocType: Company,Default Values,Уобичајено Вредности
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Фрекуенци} Дигест
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Фрекуенци} Дигест
 DocType: Expense Claim,Total Amount Reimbursed,Укупан износ рефундирају
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ово је засновано на трупаца против овог возила. Погледајте рок доле за детаље
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Против добављача Фактура {0} {1} од
 DocType: Customer,Default Price List,Уобичајено Ценовник
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Кретање средство запис {0} је направљена
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ви не можете брисати Фискална година {0}. Фискална {0} Година је постављен као подразумевани у глобалним поставкама
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Клијент са истим именом већ постоји
 DocType: Journal Entry,Entry Type,Ступање Тип
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Нема плана процене повезан са овом групом процене
 ,Customer Credit Balance,Кориснички кредитни биланс
@@ -1855,7 +1888,7 @@
 DocType: Quotation,Term Details,Орочена Детаљи
 DocType: Project,Total Sales Cost (via Sales Order),Укупна продаја трошкова (преко Салес Ордер)
 DocType: Project,Total Sales Cost (via Sales Order),Укупна продаја трошкова (преко Салес Ордер)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Не могу уписати више од {0} студенте за ову студентској групи.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Не могу уписати више од {0} студенте за ову студентској групи.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,olovo Точка
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,olovo Точка
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} мора бити већи од 0
@@ -1873,9 +1906,11 @@
 DocType: Lab Test,Technician Name,Име техничара
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Унлинк плаћања о отказивању рачуна
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Тренутни читање Пробег ушао треба да буде већа од почетне километраже возила {0}
+DocType: Restaurant Reservation,No Show,Но Схов
 DocType: Shipping Rule Country,Shipping Rule Country,Достава Правило Земља
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Остави и Присуство
 DocType: Maintenance Visit,Partially Completed,Дјелимично Завршено
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Умерена осетљивост
 DocType: Leave Type,Include holidays within leaves as leaves,"Укључи празнике у листовима, као лишће"
 DocType: Sales Invoice,Packed Items,Пакују артикала
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Гаранција Тужба против серијским бројем
@@ -1892,13 +1927,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Уплаћеног износа (Фирма валута)
 DocType: Purchase Invoice,Additional Discount,Додатни попуст
 DocType: Selling Settings,Selling Settings,Продаја Сеттингс
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Потврди акцију
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Онлине Аукције
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Наведите било Количина или вредновања оцену или обоје
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,испуњење
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Погледај у корпу
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Маркетинговые расходы
 ,Item Shortage Report,Ставка о несташици извештај
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се спомиње, \n Молимо вас да се позовете на ""Тежина УОМ"" превише"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се спомиње, \n Молимо вас да се позовете на ""Тежина УОМ"" превише"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Материјал Захтев се користи да би овај унос Стоцк
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Следећа Амортизација Датум је обавезан за инвестицију
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Одвојени базирана Група наравно за сваку серију
@@ -1910,12 +1946,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Направите Рачуноводство унос за сваки Стоцк Покрета
 DocType: Leave Allocation,Total Leaves Allocated,Укупно Лишће Издвојена
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Магацин потребно на Ров Но {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Молимо Вас да унесете важи финансијске године датум почетка
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Молимо Вас да унесете важи финансијске године датум почетка
 DocType: Employee,Date Of Retirement,Датум одласка у пензију
 DocType: Upload Attendance,Get Template,Гет шаблона
 DocType: Material Request,Transferred,пренети
 DocType: Vehicle,Doors,vrata
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ЕРПНект Подешавање Комплетна!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ЕРПНект Подешавање Комплетна!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Прикупити накнаду за регистрацију пацијента
 DocType: Course Assessment Criteria,Weightage,Веигхтаге
 DocType: Purchase Invoice,Tax Breakup,porez на распад
@@ -1934,37 +1970,37 @@
 DocType: Employee,AB+,АБ +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ако ова ставка има варијанте, онда не може бити изабран у налозима продаје итд"
 DocType: Lead,Next Contact By,Следеће Контакт По
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Кол-во для Пункт {0} в строке {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Кол-во для Пункт {0} в строке {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Магацин {0} не може бити обрисан јер постоји количина за Ставку {1}
 DocType: Quotation,Order Type,Врста поруџбине
-DocType: Purchase Invoice,Notification Email Address,Обавештење е-маил адреса
 ,Item-wise Sales Register,Предмет продаје-мудре Регистрација
 DocType: Asset,Gross Purchase Amount,Бруто Куповина Количина
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Почетни баланси
 DocType: Asset,Depreciation Method,Амортизација Метод
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,оффлине
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,оффлине
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Да ли је то такса у Основном Рате?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Укупно Циљна
 DocType: Job Applicant,Applicant for a Job,Подносилац захтева за посао
 DocType: Production Plan Material Request,Production Plan Material Request,Производња план Материјал Упит
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,"Нет Производственные заказы , созданные"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,"Нет Производственные заказы , созданные"
 DocType: Stock Reconciliation,Reconciliation JSON,Помирење ЈСОН
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Превише колоне. Извоз извештај и одштампајте га помоћу тих апликација.
 DocType: Purchase Invoice Item,Batch No,Групно Нема
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Захтев за понуду: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Дозволите више продајних налога против нарудзбенице купац је
 DocType: Student Group Instructor,Student Group Instructor,Студент Група Инструктор
 DocType: Student Group Instructor,Student Group Instructor,Студент Група Инструктор
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Гуардиан2 Мобилни број
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,основной
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,основной
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Варијанта
 DocType: Naming Series,Set prefix for numbering series on your transactions,Сет префикс за нумерисање серију на својим трансакцијама
 DocType: Employee Attendance Tool,Employees HTML,zaposleni ХТМЛ
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Уобичајено БОМ ({0}) мора бити активан за ову ставку или његовог шаблон
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Уобичајено БОМ ({0}) мора бити активан за ову ставку или његовог шаблон
 DocType: Employee,Leave Encashed?,Оставите Енцасхед?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Прилика Од пољу је обавезна
 DocType: Email Digest,Annual Expenses,Годишњи трошкови
 DocType: Item,Variants,Варијанте
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Маке наруџбенице
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Маке наруџбенице
 DocType: SMS Center,Send To,Пошаљи
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Додијељени износ
@@ -1982,6 +2018,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Студент Група Снага
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Против часопису Ступање {0} нема никакву премца {1} улазак
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,аппраисалс
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Догађаји обуке
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Дубликат Серийный номер вводится для Пункт {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Услов за владавину Схиппинг
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Унесите
@@ -1991,7 +2028,7 @@
 DocType: Sales Order,To Deliver and Bill,Да достави и Билл
 DocType: Student Group,Instructors,instruktori
 DocType: GL Entry,Credit Amount in Account Currency,Износ кредита на рачуну валути
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,БОМ {0} мора да се поднесе
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,БОМ {0} мора да се поднесе
 DocType: Authorization Control,Authorization Control,Овлашћење за контролу
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ред # {0}: Одбијен Складиште је обавезна против одбијен тачком {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Плаћање
@@ -2010,11 +2047,11 @@
 DocType: Quotation Item,Actual Qty,Стварна Кол
 DocType: Sales Invoice Item,References,Референце
 DocType: Quality Inspection Reading,Reading 10,Читање 10
-DocType: Hub Settings,Hub Node,Хуб Ноде
+DocType: Hub Category,Hub Node,Хуб Ноде
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Унели дупликате . Молимо исправи и покушајте поново .
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,помоћник
 DocType: Asset Movement,Asset Movement,средство покрет
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,Нова корпа
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,Нова корпа
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Пункт {0} не сериализованным Пункт
 DocType: SMS Center,Create Receiver List,Направите листу пријемника
 DocType: Vehicle,Wheels,Точкови
@@ -2028,15 +2065,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,телекомуникација
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Указује на то да пакет је део ове испоруке (само нацрт)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Уплатите Ентри
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Количество по пункту {0} должно быть меньше {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Количество по пункту {0} должно быть меньше {1}
 ,Sales Invoice Trends,Продаје Фактура трендови
 DocType: Leave Application,Apply / Approve Leaves,Нанесите / Цоунт Леавес
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Због
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Због
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Можете обратиться строку , только если тип заряда «О Предыдущая сумма Row » или « Предыдущая Row Всего"""
 DocType: Sales Order Item,Delivery Warehouse,Испорука Складиште
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Дрво центара финансијске трошкове.
 DocType: Serial No,Delivery Document No,Достава докумената Нема
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Молимо поставите &#39;добитак / губитак налог на средства располагања &quot;у компанији {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Молимо поставите &#39;добитак / губитак налог на средства располагања &quot;у компанији {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Гет ставки од куповине Примања
 DocType: Serial No,Creation Date,Датум регистрације
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Пункт {0} несколько раз появляется в прайс-лист {1}
@@ -2047,12 +2084,13 @@
 DocType: Student,Student Mobile Number,Студент Број мобилног телефона
 DocType: Item,Has Variants,Хас Варијанте
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Упдате Респонсе
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Који сте изабрали ставке из {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Који сте изабрали ставке из {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Назив мјесечни
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Батцх ИД је обавезна
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Батцх ИД је обавезна
 DocType: Sales Person,Parent Sales Person,Продаја Родитељ Особа
-DocType: Purchase Invoice,Recurring Invoice,Понављајући Рачун
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Висока до ниска
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Прво изаберите програм
 DocType: Patient Appointment,Patient Age,Пацијентско доба
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Управљање пројектима
 DocType: Supplier,Supplier of Goods or Services.,Добављач робе или услуга.
@@ -2060,8 +2098,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Подразумевани рачуни потраживања који ће се користити ако нису постављени у Пацијенту да резервишу Консултације.
 DocType: Vehicle Log,Fuel Price,Гориво Цена
 DocType: Budget,Budget,Буџет
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Сет Опен
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Основних средстава тачка мора бити нон-лагеру предмета.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Сет Опен
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Основних средстава тачка мора бити нон-лагеру предмета.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Буџет не може се одредити према {0}, јер то није прихода или расхода рачун"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Постигнута
 DocType: Student Admission,Application Form Route,Образац за пријаву Рута
@@ -2075,12 +2113,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Пункт {0} не установка для мастера серийные номера Проверить товара
 DocType: Maintenance Visit,Maintenance Time,Одржавање време
 ,Amount to Deliver,Износ на Избави
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Иста ставка је унета више пута. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Рок Датум почетка не може бити раније него годину дана датум почетка академске године на коју се израз је везан (академска година {}). Молимо исправите датуме и покушајте поново.
 DocType: Guardian,Guardian Interests,Гуардиан Интереси
 DocType: Naming Series,Current Value,Тренутна вредност
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Више фискалне године постоје за датум {0}. Молимо поставите компаније у фискалној години
 DocType: School Settings,Instructor Records to be created by,Инструкторске записе које креира
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} создан
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} создан
 DocType: Delivery Note Item,Against Sales Order,Против продаје налога
 ,Serial No Status,Серијски број статус
 DocType: Payment Entry Reference,Outstanding,Изванредан
@@ -2090,10 +2129,10 @@
 						must be greater than or equal to {2}","Ров {0}: За подешавање {1} периодичност, разлика између од и до данас \ мора бити већи или једнак {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Ово је засновано на складе кретању. Погледајте {0} за детаље
 DocType: Pricing Rule,Selling,Продаја
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Износ {0} {1} одузима од {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Износ {0} {1} одузима од {2}
 DocType: Employee,Salary Information,Плата Информација
 DocType: Sales Person,Name and Employee ID,Име и број запослених
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,"Впритык не может быть , прежде чем отправлять Дата"
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,"Впритык не может быть , прежде чем отправлять Дата"
 DocType: Website Item Group,Website Item Group,Сајт тачка Група
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Пошлины и налоги
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
@@ -2119,7 +2158,7 @@
 DocType: Issue,Resolution Details,Резолуција Детаљи
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,издвајања
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Критеријуми за пријем
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Унесите Материјални захтеве у горњој табели
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Унесите Материјални захтеве у горњој табели
 DocType: Item Attribute,Attribute Name,Назив атрибута
 DocType: BOM,Show In Website,Схов у сајт
 DocType: Shopping Cart Settings,Show Quantity in Website,Схов Количина на сајту
@@ -2128,7 +2167,7 @@
 DocType: Item Reorder,Check in (group),Цхецк ин (група)
 ,Qty to Order,Количина по поруџбини
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Шеф рачун под одговорности или капитала, у којем ће Добитак / Губитак се резервисати"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Гантов графикон свих задатака.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Гантов графикон свих задатака.
 DocType: Opportunity,Mins to First Response,Мин до Фирст Респонсе
 DocType: Pricing Rule,Margin Type,маргин Тип
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} сати
@@ -2150,36 +2189,36 @@
 DocType: Patient,Surgical History,Хируршка историја
 DocType: Employee,Resignation Letter Date,Оставка Писмо Датум
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Цене Правила се даље филтрира на основу количине.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Подесите датум приступања за запосленог {0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Подесите датум приступања за запосленог {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Подесите датум приступања за запосленог {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Подесите датум приступања за запосленог {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Укупно Износ обрачуна (преко Тиме Схеет)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Поновите Кориснички Приход
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) мора имати улогу 'Екпенсе одобраватељ'
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,пара
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Изабери БОМ и Кти за производњу
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Изабери БОМ и Кти за производњу
 DocType: Asset,Depreciation Schedule,Амортизација Распоред
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Продаја Партнер адресе и контакт
 DocType: Bank Reconciliation Detail,Against Account,Против налога
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Пола Дан Датум треба да буде између Од датума и до данас
 DocType: Maintenance Schedule Detail,Actual Date,Стварни датум
 DocType: Item,Has Batch No,Има Батцх Нема
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Годишња плаћања: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Годишња плаћања: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Роба и услуга Порез (ПДВ Индија)
 DocType: Delivery Note,Excise Page Number,Акцизе Број странице
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Компанија, Од датума и до данас је обавезно"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Узмите из консултације
 DocType: Asset,Purchase Date,Датум куповине
 DocType: Employee,Personal Details,Лични детаљи
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Молимо поставите &#39;Ассет Амортизација Набавна центар &quot;у компанији {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Молимо поставите &#39;Ассет Амортизација Набавна центар &quot;у компанији {0}
 ,Maintenance Schedules,Планове одржавања
 DocType: Task,Actual End Date (via Time Sheet),Стварна Датум завршетка (преко Тиме Схеет)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Износ {0} {1} против {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Износ {0} {1} против {2} {3}
 ,Quotation Trends,Котировочные тенденции
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Ставка група не помиње у тачки мајстор за ставку {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Дебитна Да рачуну мора бити потраживања рачун
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Дебитна Да рачуну мора бити потраживања рачун
 DocType: Shipping Rule Condition,Shipping Amount,Достава Износ
 DocType: Supplier Scorecard Period,Period Score,Оцена периода
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Додај Купци
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Додај Купци
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Чека Износ
 DocType: Lab Test Template,Special,Посебно
 DocType: Purchase Invoice Item,Conversion Factor,Конверзија Фактор
@@ -2187,13 +2226,14 @@
 ,Vehicle Expenses,Трошкови возила
 DocType: Serial No,Invoice Details,Детаљи рачуна
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Очекивана вредност после корисног века трајања мора бити већи или једнак {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Почиње
+DocType: Hub Category,Hub Category,Главна категорија
 DocType: Purchase Invoice,SEZ,СЕЗ
 DocType: Purchase Receipt,Vehicle Number,Број возила
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,Датум на који се понавља фактура ће бити зауставити
 DocType: Employee Loan,Loan Amount,Износ позајмице
 DocType: Program Enrollment,Self-Driving Vehicle,Селф-Дривинг возила
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Добављач Сцорецард Стандинг
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Ред {0}: Билл оф Материалс није пронађена за тачком {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Ред {0}: Билл оф Материалс није пронађена за тачком {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Укупно издвојена лишће {0} не може бити мањи од већ одобрених лишћа {1} за период
 DocType: Journal Entry,Accounts Receivable,Потраживања
 ,Supplier-Wise Sales Analytics,Добављач - Висе Салес Аналитика
@@ -2205,7 +2245,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Родитељ голф (Оставите празно, ако то није део матичног Цоурсе)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Оставите празно ако се сматра за све типове запослених
 DocType: Landed Cost Voucher,Distribute Charges Based On,Дистрибуирају пријава по
-apps/erpnext/erpnext/hooks.py +131,Timesheets,тимесхеетс
+apps/erpnext/erpnext/hooks.py +140,Timesheets,тимесхеетс
 DocType: HR Settings,HR Settings,ХР Подешавања
 DocType: Salary Slip,net pay info,Нето плата Информације о
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Ова вриједност се ажурира у листи подразумеваних продајних цијена.
@@ -2216,7 +2256,7 @@
 DocType: Patient,B Positive,Б Позитивно
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ред # {0}: Кол-во мора бити 1, као тачка је основна средства. Молимо вас да користите посебан ред за вишеструко Кол."
 DocType: Leave Block List Allow,Leave Block List Allow,Оставите листу блокираних Аллов
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Аббр не може бити празно или простор
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Аббр не може бити празно или простор
 DocType: Patient Medical Record,Patient Medical Record,Пацијент медицински запис
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Група не-Гроуп
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,спортски
@@ -2233,9 +2273,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Није могуће пронаћи курс за {0} до {1} за кључне дана {2}. Направите валута Екцханге рекорд ручно
 DocType: POS Profile,Price List,Ценовник
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} теперь используется по умолчанию финансовый год . Пожалуйста, обновите страницу в браузере , чтобы изменения вступили в силу."
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Расходи Потраживања
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Расходи Потраживања
 DocType: Issue,Support,Подршка
 ,BOM Search,БОМ Тражи
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Објавите &quot;На лагеру&quot; или &quot;Нема на лагеру&quot; на Хуб-у на основу расположивих залиха у овом складишту.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Затварање (Опенинг + износи)
 DocType: Vehicle,Fuel Type,Врста горива
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Молимо наведите валуту у Друштву
@@ -2247,16 +2288,16 @@
 DocType: Healthcare Settings,Remind Before,Подсети Пре
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Фактор Единица измерения преобразования требуется в строке {0}
 DocType: Production Plan Item,material_request_item,материал_рекуест_итем
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Ред # {0}: Референца Тип документа мора бити један од продаје реда, продаје Фактура или Јоурнал Ентри"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Ред # {0}: Референца Тип документа мора бити један од продаје реда, продаје Фактура или Јоурнал Ентри"
 DocType: Salary Component,Deduction,Одузимање
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Ред {0}: Од времена и времена је обавезно.
 DocType: Stock Reconciliation Item,Amount Difference,iznos Разлика
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Ставка Цена додат за {0} у ценовнику {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Ставка Цена додат за {0} у ценовнику {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Молимо Вас да унесете Ид радник ове продаје особе
 DocType: Territory,Classification of Customers by region,Класификација купаца по региону
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Разлика Износ мора бити нула
 DocType: Project,Gross Margin,Бруто маржа
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Молимо унесите прво Производња пункт
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Молимо унесите прво Производња пункт
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Обрачуната банка Биланс
 DocType: Normal Test Template,Normal Test Template,Нормални тестни шаблон
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,искључени корисник
@@ -2266,21 +2307,22 @@
 DocType: Salary Slip,Total Deduction,Укупно Одбитак
 ,Production Analytics,Продуцтион analitika
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Ово се заснива на трансакцијама против овог пацијента. Погледајте детаље испод
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Трошкови ажурирано
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Трошкови ажурирано
 DocType: Employee,Date of Birth,Датум рођења
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Пункт {0} уже вернулся
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Фискална година** представља Финансијску годину. Све рачуноводствене уносе и остале главне трансакције се прате наспрам **Фискалне фодине**.
 DocType: Opportunity,Customer / Lead Address,Кориснички / Олово Адреса
 DocType: Patient,DOB,ДОБ
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Поставка Сцорецард Сетуп
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Упозорење: Неважећи сертификат ССЛ на везаности {0}
-DocType: Student Admission,Eligibility,квалификованост
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Назив плана процене
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Упозорење: Неважећи сертификат ССЛ на везаности {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Леадс вам помоћи да посао, додати све своје контакте и још као своје трагове"
 DocType: Production Order Operation,Actual Operation Time,Стварна Операција време
 DocType: Authorization Rule,Applicable To (User),Важећи Да (Корисник)
 DocType: Purchase Taxes and Charges,Deduct,Одбити
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Опис посла
 DocType: Student Applicant,Applied,примењен
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Снова откройте
 DocType: Sales Invoice Item,Qty as per Stock UOM,Кол по залихама ЗОЦГ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Гуардиан2 Име
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специјални знакови осим ""-"" ""."", ""#"", и ""/"" није дозвољено у именовању серије"
@@ -2292,7 +2334,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Производња директор
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Серийный номер {0} находится на гарантии ДО {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Сплит Напомена Испорука у пакетима.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Пошиљке
+apps/erpnext/erpnext/hooks.py +107,Shipments,Пошиљке
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Укупно додељени износ (Фирма валута)
 DocType: Purchase Order Item,To be delivered to customer,Који ће бити достављен купца
 DocType: BOM,Scrap Material Cost,Отпадног материјала Трошкови
@@ -2315,8 +2357,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Поставке варијанте ставке
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Изаберите фирму ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Оставите празно ако се сматра за сва одељења
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Виды занятости (постоянная , контракт, стажер и т.д. ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Виды занятости (постоянная , контракт, стажер и т.д. ) ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
 DocType: Process Payroll,Fortnightly,четрнаестодневни
 DocType: Currency Exchange,From Currency,Од валутног
 DocType: Vital Signs,Weight (In Kilogram),Тежина (у килограму)
@@ -2341,7 +2383,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Пожалуйста, нажмите на кнопку "" Generate Расписание "" , чтобы получить график"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Било је грешака приликом брисања следећих начина:
 DocType: Bin,Ordered Quantity,Наручено Количина
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","например ""Build инструменты для строителей """
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","например ""Build инструменты для строителей """
 DocType: Grading Scale,Grading Scale Intervals,Скала оцењивања Интервали
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Рачуноводство Улаз за {2} може се вршити само у валути: {3}
 DocType: Production Order,In Process,У процесу
@@ -2365,11 +2407,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Уз плаћање пореза
 DocType: Expense Claim Detail,Expense Claim Detail,Расходи потраживање Детаљ
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Три примерка за добављача
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Молимо изаберите исправан рачун
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Молимо изаберите исправан рачун
 DocType: Item,Weight UOM,Тежина УОМ
 DocType: Salary Structure Employee,Salary Structure Employee,Плата Структура запослених
 DocType: Patient,Blood Group,Крв Група
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Нерешен
 DocType: Course,Course Name,Назив курса
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Корисници који могу одобри одсуство апликације у конкретној запосленог
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,оборудование офиса
@@ -2388,7 +2429,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Цене неће бити приказан ако Ценовник није подешен
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Наведите земљу за ову Схиппинг правило или проверите ворлдвиде схиппинг
 DocType: Stock Entry,Total Incoming Value,Укупна вредност Долазни
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Дебитна Да је потребно
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Дебитна Да је потребно
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Тимесхеетс лакше пратили времена, трошкова и рачуна за АКТИВНОСТИ урадио ваш тим"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Куповина Ценовник
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Шаблони варијабли индекса добављача.
@@ -2398,7 +2439,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Плаћање Помирење
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Пожалуйста, выберите имя InCharge Лица"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,технологија
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Укупно Неплаћени: {0}
+DocType: Hub Settings,Unregister from Hub,Одјавите се из Хуб-а
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Укупно Неплаћени: {0}
 DocType: BOM Website Operation,BOM Website Operation,БОМ Сајт Операција
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Понуда Леттер
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Генеришите Захтеви материјал (МРП) и производних налога.
@@ -2410,7 +2452,9 @@
 DocType: Physician Schedule Time Slot,To Time,За време
 DocType: Authorization Rule,Approving Role (above authorized value),Одобравање улога (изнад овлашћеног вредности)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Кредит на рачун мора бити Плаћа рачун
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия : {0} не может быть родитель или ребенок {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Молимо изаберите Студентски пријем који је обавезан за ученику који је платио
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия : {0} не может быть родитель или ребенок {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Изаберите ценовник за објављивање цене
 DocType: Production Order Operation,Completed Qty,Завршен Кол
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само дебитне рачуни могу бити повезани против другог кредитног уласка"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Прайс-лист {0} отключена
@@ -2423,39 +2467,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} серијски бројеви који су потребни за тачком {1}. Ви сте под условом {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Тренутни Процена курс
 DocType: Item,Customer Item Codes,Кориснички кодова
+DocType: Training Event,Advance,Адванце
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,због поновног понављања.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Курсне / Губитак
 DocType: Opportunity,Lost Reason,Лост Разлог
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Нова адреса
 DocType: Quality Inspection,Sample Size,Величина узорка
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Молимо унесите документ о пријему
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Све ставке су већ фактурисано
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Наведите тачну &#39;Од Предмет бр&#39;
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',Наведите тачну &#39;Од Предмет бр&#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Даље трошкова центри могу да буду под групама, али уноса можете извршити над несрпским групама"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Корисници и дозволе
 DocType: Vehicle Log,VLOG.,ВЛОГ.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Производни Поруџбине Креирано: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Производни Поруџбине Креирано: {0}
 DocType: Branch,Branch,Филијала
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Печать и брендинг
 DocType: Company,Total Monthly Sales,Укупна месечна продаја
 DocType: Bin,Actual Quantity,Стварна Количина
 DocType: Shipping Rule,example: Next Day Shipping,Пример: Нект Даи Схиппинг
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Серијски број {0} није пронађен
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Претплата је била {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Претплата је била {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Програм распоређивања накнада
 DocType: Fee Schedule Program,Student Batch,студент партије
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,изаберите * из `табВитал Сигнс` гдје је пацијент = &#39;{0}&#39; поруџбина знаком_дате десц 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Маке Студент
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Мин разреда
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Позвани сте да сарађују на пројекту: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Лекар није доступан на {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Позвани сте да сарађују на пројекту: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Лекар није доступан на {0}
 DocType: Leave Block List Date,Block Date,Блоцк Дате
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Додајте кориснички ИД претплате у доктипе {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Напомена за испоруку добављача
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Пријавите се
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Пријавите се
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Ацтуал Кти {0} / Ваитинг Кти {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Ацтуал Кти {0} / Ваитинг Кти {1}
 DocType: Purchase Invoice,E-commerce GSTIN,Е-трговина ГСТИН
 DocType: Sales Order,Not Delivered,Није Испоручено
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Очекивани датум не може бити пре датума трансакције
 ,Bank Clearance Summary,Банка Чишћење Резиме
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Создание и управление ежедневные , еженедельные и ежемесячные дайджесты новостей."
 DocType: Appraisal Goal,Appraisal Goal,Процена Гол
@@ -2463,12 +2508,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,zgrade
 DocType: Fee Schedule,Fee Structure,naknada Структура
 DocType: Timesheet Detail,Costing Amount,Кошта Износ
-DocType: Student Admission,Application Fee,Накнада за апликацију
+DocType: Student Admission Program,Application Fee,Накнада за апликацију
 DocType: Process Payroll,Submit Salary Slip,Пошаљи Слип платама
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maxiumm скидка на Пункт {0} {1} %
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Maxiumm скидка на Пункт {0} {1} %
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Увоз у расутом стању
 DocType: Sales Partner,Address & Contacts,Адреса и контакти
 DocType: SMS Log,Sender Name,Сендер Наме
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Сортирај према критеријумима
 DocType: POS Profile,[Select],[ Изаберите ]
 DocType: Vital Signs,Blood Pressure (diastolic),Крвни притисак (дијастолни)
 DocType: SMS Log,Sent To,Послат
@@ -2477,7 +2523,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Следећа контакт Датум не могу бити у прошлости
 DocType: Company,For Reference Only.,За справки.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Лекар {0} није доступан на {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Избор серијски бр
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Избор серијски бр
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Неважећи {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,ПИНВ-РЕТ-
 DocType: Fee Validity,Reference Inv,Референце Инв
@@ -2493,15 +2539,15 @@
 DocType: Normal Test Items,Require Result Value,Захтевај вредност резултата
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Предмет бр не може бити 0
 DocType: Item,Show a slideshow at the top of the page,Приказивање слајдова на врху странице
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,БОМ
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Магазины
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,БОМ
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Магазины
 DocType: Project Type,Projects Manager,Пројекти менаџер
 DocType: Serial No,Delivery Time,Време испоруке
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Старење Басед Он
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Именовање је отказано
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Именовање је отказано
 DocType: Item,End of Life,Крај живота
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,путешествие
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Нема активног или стандардна плата структура наћи за запосленог {0} за одређени датум
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,путешествие
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Нема активног или стандардна плата структура наћи за запосленог {0} за одређени датум
 DocType: Leave Block List,Allow Users,Дозволи корисницима
 DocType: Purchase Order,Customer Mobile No,Кориснички Мобилни број
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Који се враћа
@@ -2510,12 +2556,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Ажурирање Трошкови
 DocType: Item Reorder,Item Reorder,Предмет Реордер
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Схов плата Слип
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Пренос материјала
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Пренос материјала
 DocType: Fees,Send Payment Request,Пошаљите захтев за плаћање
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Наведите операције , оперативне трошкове и дају јединствену операцију без своје пословање ."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Овај документ је преко границе од {0} {1} за ставку {4}. Правиш други {3} против исте {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Молимо поставите понављају након снимања
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Избор промена износ рачуна
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Избор промена износ рачуна
 DocType: Purchase Invoice,Price List Currency,Ценовник валута
 DocType: Naming Series,User must always select,Корисник мора увек изабрати
 DocType: Stock Settings,Allow Negative Stock,Дозволи Негативно Стоцк
@@ -2535,7 +2581,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Запосленик
 DocType: Sample Collection,Collected Time,Скупљено време
 DocType: Company,Sales Monthly History,Месечна историја продаје
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Избор Серија
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Избор Серија
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} је у потпуности наплаћује
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Витални знаци
 DocType: Training Event,End Time,Крајње време
@@ -2543,16 +2589,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Плаћања Одбици или губитак
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Стандартные условия договора для продажи или покупки.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Группа по ваучером
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Да ли сте сигурни да желите да откажете овај термин?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Продаја Цевовод
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Молимо поставите подразумевани рачун у плате компоненте {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Обавезно На
 DocType: Rename Tool,File to Rename,Филе Ренаме да
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Молимо одаберите БОМ за предмета на Ров {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Молимо одаберите БОМ за предмета на Ров {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Рачун {0} не поклапа са Компаније {1} у режиму рачуна: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Указано БОМ {0} не постоји за ставку {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График обслуживания {0} должно быть отменено до отмены этого заказ клиента
+DocType: POS Profile,Applicable for Users,Применљиво за кориснике
 DocType: Notification Control,Expense Claim Approved,Расходи потраживање одобрено
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Плата Слип запосленог {0} већ створен за овај период
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Плата Слип запосленог {0} већ створен за овај период
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,фармацевтический
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Трошкови Купљено
 DocType: Selling Settings,Sales Order Required,Продаја Наручите Обавезно
@@ -2576,6 +2624,7 @@
 DocType: Offer Letter,Accepted,Примљен
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,организација
 DocType: BOM Update Tool,BOM Update Tool,Алат за ажурирање БОМ-а
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Партијски налог који није наведен, молимо вас подесите почетни рачун странке у предузећу"
 DocType: SG Creation Tool Course,Student Group Name,Студент Име групе
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Креирање накнада
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Молимо проверите да ли сте заиста желите да избришете све трансакције за ову компанију. Ваши основни подаци ће остати како јесте. Ова акција се не може поништити.
@@ -2584,29 +2633,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) не може бити већи од планираног куанитити ({2}) у производњи Низ {3}
 DocType: Shipping Rule,Shipping Rule Label,Достава Правило Лабел
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Корисник форум
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Сировине не може бити празан.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Није могуће ажурирати залихе, фактура садржи испоруку ставку дроп."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Сировине не може бити празан.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Није могуће ажурирати залихе, фактура садржи испоруку ставку дроп."
 DocType: Lab Test Sample,Lab Test Sample,Узорак за лабораторијско испитивање
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Брзо Јоурнал Ентри
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Не можете променити стопу ако бом помиње агианст било које ставке
+DocType: Restaurant,Invoice Series Prefix,Префикс серије рачуна
 DocType: Employee,Previous Work Experience,Претходно радно искуство
 DocType: Stock Entry,For Quantity,За Количина
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Пожалуйста, введите Запланированное Количество по пункту {0} в строке {1}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},"Пожалуйста, введите Запланированное Количество по пункту {0} в строке {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} не представлено
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Захтеви за ставке.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Одвојена производња поруџбина ће бити направљен за сваку готовог добар ставке.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} мора бити негативан у повратном документу
 ,Minutes to First Response for Issues,Минутес то први одговор на питања
 DocType: Purchase Invoice,Terms and Conditions1,Услови и Цондитионс1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,Име института за коју се постављање овог система.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,Име института за коју се постављање овог система.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Рачуноводствени унос замрзнуте до овог датума, нико не може / изменити унос осим улоге доле наведеном."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Сачувајте документ пре генерисања план одржавања
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Најновија цена ажурирана у свим БОМ
 DocType: Fee Schedule,Successful,Успешно
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Статус пројекта
 DocType: UOM,Check this to disallow fractions. (for Nos),Проверите то тако да одбаци фракција. (За НОС)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Следећи производних налога су створени:
-DocType: Student Admission,Naming Series (for Student Applicant),Именовање серије (за Студент подносиоца захтева)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Следећи производних налога су створени:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Именовање серије (за Студент подносиоца захтева)
 DocType: Delivery Note,Transporter Name,Транспортер Име
 DocType: Authorization Rule,Authorized Value,Овлашћени Вредност
 DocType: BOM,Show Operations,Схов операције
@@ -2630,7 +2680,7 @@
 ,Employees working on a holiday,Запослени који раде на одмор
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Марко Садашња
 DocType: Project,% Complete Method,% Комплетна Метод
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Друг
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Друг
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Техническое обслуживание дата не может быть до даты доставки для Serial No {0}
 DocType: Production Order,Actual End Date,Сунце Датум завршетка
 DocType: BOM,Operating Cost (Company Currency),Оперативни трошкови (Фирма валута)
@@ -2648,13 +2698,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,"Утверждении покупатель не может быть такой же, как пользователь правило применимо к"
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Основни курс (по Стоцк УЦГ)
 DocType: SMS Log,No of Requested SMS,Нема тражених СМС
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Оставите без плате се не слаже са одобреним подацима одсуство примене
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Оставите без плате се не слаже са одобреним подацима одсуство примене
 DocType: Campaign,Campaign-.####,Кампания - . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следећи кораци
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Молимо вас да доставите одређене ставке на најбољи могући стопама
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Маке фактуру
 DocType: Selling Settings,Auto close Opportunity after 15 days,Ауто затварање Могућност након 15 дана
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Наруџбе за куповину нису дозвољене за {0} због стања картице која се налази на {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Наруџбе за куповину нису дозвољене за {0} због стања картице која се налази на {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,До краја године
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Куот / Олово%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Куот / Олово%
@@ -2662,6 +2712,7 @@
 DocType: Vital Signs,Nutrition Values,Вредности исхране
 DocType: Lab Test Template,Is billable,Да ли се може уплатити
 DocType: Delivery Note,DN-,ДН-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Оба &quot;Распоред лекара&quot; и време на заказ &quot;морају бити постављени за др {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Треће лице дистрибутер / дилер / заступника / сарадник / дистрибутер који продаје компанијама производе за провизију.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} против нарудзбенице {1}
 DocType: Patient,Patient Demographics,Демографија пацијента
@@ -2711,7 +2762,6 @@
  10. Додајте или Одузети: Било да желите да додате или одбије порез."
 DocType: Homepage,Homepage,страница
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Изаберите лекара ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',упдате табЦонсултатион сет инвоице = &#39;{0}&#39; где име = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Рецд Количина
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Накнада Записи Цреатед - {0}
 DocType: Asset Category Account,Asset Category Account,Средство Категорија налог
@@ -2723,7 +2773,7 @@
 DocType: Asset,Manual,Упутство
 DocType: Salary Component Account,Salary Component Account,Плата Компонента налог
 DocType: Global Defaults,Hide Currency Symbol,Сакриј симбол валуте
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","нпр банка, Готовина, кредитна картица"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","нпр банка, Готовина, кредитна картица"
 DocType: Lead Source,Source Name,извор Име
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Нормални крвни притисак при одраслима је око 120 ммХг систолног, а дијастолни 80 ммХг, скраћени &quot;120/80 ммХг&quot;"
 DocType: Journal Entry,Credit Note,Кредитни Напомена
@@ -2742,16 +2792,16 @@
 DocType: Patient,Occupation,занимање
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Ред {0} : Датум почетка мора да буде пре крајњег датума
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Укупно (ком)
-DocType: Sales Invoice,This Document,Овај документ
 DocType: Installation Note Item,Installed Qty,Инсталирани Кол
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Ово може бити због неких неважећих е-маил адреса у
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Додали сте
 DocType: Purchase Taxes and Charges,Parenttype,Паренттипе
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,obuka Резултат
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,obuka Резултат
 DocType: Purchase Invoice,Is Paid,Се плаћа
 DocType: Salary Structure,Total Earning,Укупна Зарада
 DocType: Purchase Receipt,Time at which materials were received,Време у коме су примљене материјали
 DocType: Stock Ledger Entry,Outgoing Rate,Одлазећи курс
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Организация филиал мастер .
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Организация филиал мастер .
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,или
 DocType: Sales Order,Billing Status,Обрачун статус
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Пријави грешку
@@ -2766,8 +2816,9 @@
 DocType: Notification Control,Sales Order Message,Продаја Наручите порука
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Установить значения по умолчанию , как Болгарии, Валюта , текущий финансовый год и т.д."
 DocType: Payment Entry,Payment Type,Плаћање Тип
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Изаберите Батцх за тачке {0}. Није могуће пронаћи једну групу која испуњава овај услов
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Изаберите Батцх за тачке {0}. Није могуће пронаћи једну групу која испуњава овај услов
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Изаберите Батцх за тачке {0}. Није могуће пронаћи једну групу која испуњава овај услов
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Изаберите Батцх за тачке {0}. Није могуће пронаћи једну групу која испуњава овај услов
+DocType: Hub Category,Parent Category,родитељ Категорија
 DocType: Process Payroll,Select Employees,Изаберите Запослени
 DocType: Opportunity,Potential Sales Deal,Потенцијални Продаја Деал
 DocType: Complaint,Complaints,Жалбе
@@ -2805,7 +2856,7 @@
 DocType: Bin,Reserved Quantity,Резервисани Количина
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Унесите исправну е-маил адресу
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Унесите исправну е-маил адресу
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Молимо изаберите ставку у корпи
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Молимо изаберите ставку у корпи
 DocType: Landed Cost Voucher,Purchase Receipt Items,Куповина Ставке пријема
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Прилагођавање Облици
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,Заостатак
@@ -2815,15 +2866,15 @@
 DocType: Payment Request,Amount in customer's currency,Износ у валути купца
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Испорука
 DocType: Stock Reconciliation Item,Current Qty,Тренутни ком
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Додајте добављаче
+DocType: Restaurant Menu,Restaurant Menu,Ресторан мени
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,прев
 DocType: Appraisal Goal,Key Responsibility Area,Кључна Одговорност Површина
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Студент Пакети помоћи да пратите посећеност, процене и накнаде за студенте"
 DocType: Payment Entry,Total Allocated Amount,Укупно издвајају
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Сет Дефаулт инвентар рачун за вечити инвентар
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Сет Дефаулт инвентар рачун за вечити инвентар
 DocType: Item Reorder,Material Request Type,Материјал Врста Захтева
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Аццурал Јоурнал Ентри за плате од {0} до {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","Локалну меморију је пуна, није сачувао"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","Локалну меморију је пуна, није сачувао"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Ред {0}: УОМ фактор конверзије је обавезна
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Капацитет собе
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Реф
@@ -2862,16 +2913,18 @@
 DocType: Project,Task Completion,zadatak Завршетак
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Није у стању
 DocType: Appraisal,HR User,ХР Корисник
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,ПОС?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Порези и накнаде одузима
-apps/erpnext/erpnext/hooks.py +129,Issues,Питања
+apps/erpnext/erpnext/hooks.py +138,Issues,Питања
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Статус должен быть одним из {0}
 DocType: Sales Invoice,Debit To,Дебитна Да
+DocType: Restaurant Menu Item,Restaurant Menu Item,Ресторан Ставка менија
 DocType: Delivery Note,Required only for sample item.,Потребно само за узорак ставку.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Стварна Кол Након трансакције
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Нема плата клизање налази између {0} и {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Нема плата клизање налази између {0} и {1}
 ,Pending SO Items For Purchase Request,Чекању СО Артикли за куповину захтеву
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Студент Пријемни
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} је онемогућен
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Студент Пријемни
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} је онемогућен
 DocType: Supplier,Billing Currency,Обрачун Валута
 DocType: Sales Invoice,SINV-RET-,СИНВ-РЕТ-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Екстра велики
@@ -2894,6 +2947,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Пожалуйста, укажите кол-во посещений , необходимых"
 DocType: Stock Settings,Default Valuation Method,Уобичајено Процена Метод
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,провизија
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,У току је ажурирање. Можда ће потрајати неко вријеме.
 DocType: Vehicle Log,Fuel Qty,Гориво ком
 DocType: Production Order Operation,Planned Start Time,Планирано Почетак Време
 DocType: Course,Assessment,процена
@@ -2909,7 +2963,7 @@
 DocType: Price List,Price List Master,Ценовник Мастер
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Све продаје Трансакције се могу означена против више лица ** ** Продаја тако да можете подесити и пратити циљеве.
 ,S.O. No.,С.О. Не.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},"Пожалуйста, создайте Клиента от свинца {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},"Пожалуйста, создайте Клиента от свинца {0}"
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Изаберите Пацијент
 DocType: Price List,Applicable for Countries,Важи за земље
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Име параметра
@@ -2953,27 +3007,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Расходи / Разлика налог ({0}) мора бити ""Добитак или губитак 'налога"
 DocType: Project,Copied From,копиран из
 DocType: Project,Copied From,копиран из
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Име грешка: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,мањак
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Име грешка: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,мањак
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} није повезана са {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Посещаемость за работника {0} уже отмечен
 DocType: Packing Slip,If more than one package of the same type (for print),Ако више од једног пакета истог типа (за штампу)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Подесите подразумевани купац у подешавањима ресторана
 ,Salary Register,плата Регистрација
 DocType: Warehouse,Parent Warehouse,родитељ Магацин
 DocType: C-Form Invoice Detail,Net Total,Нето Укупно
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Стандардно БОМ није пронађен за тачком {0} и пројекат {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Стандардно БОМ није пронађен за тачком {0} и пројекат {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Дефинисати различите врсте кредита
 DocType: Bin,FCFS Rate,Стопа ФЦФС
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Изванредна Износ
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Време (у мин)
 DocType: Project Task,Working,Радни
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Берза Куеуе (ФИФО)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Финансијска година
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Финансијска година
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} не принадлежит компании {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,Није могуће решити функцију резултата критеријума за {0}. Проверите да ли је формула валидна.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Коштају као на
 DocType: Healthcare Settings,Out Patient Settings,Оут Пацијент Сеттингс
 DocType: Account,Round Off,Заокружити
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Количина мора бити позитивна
 ,Requested Qty,Тражени Кол
 DocType: Tax Rule,Use for Shopping Cart,Користи се за Корпа
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Вредност {0} за атрибут {1} не постоји у листи важећег тачке вредности атрибута за тачком {2}
@@ -2982,7 +3038,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Оптужбе ће бити дистрибуиран пропорционално на основу тачка Количина или износа, по вашем избору"
 DocType: Maintenance Visit,Purposes,Сврхе
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Барем једна ставка треба унети у негативном количином у повратном документа
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Додај курсеве
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операција {0} дуже него што је било на располагању радног времена у станици {1}, разбити операцију у више операција"
 ,Requested,Тражени
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Но Примедбе
@@ -2994,6 +3049,8 @@
 DocType: Employee Loan,Repaid/Closed,Отплаћује / Цлосед
 DocType: Item,Total Projected Qty,Укупна пројектована количина
 DocType: Monthly Distribution,Distribution Name,Дистрибуција Име
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Супплиер&gt; Тип добављача
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Стопа процене није пронађена за ставку {0}, која је обавезна да изврши рачуноводствене уносе за {1} {2}. Ако је ставка трансакција као ставка нулте стопе процене у {1}, молимо вас да наведете то у табели {1} Итем. У супротном, молимо вас да креирате долазни промет са акцијама за ставку или наведете стопу процене у запису Ставке, а затим покушајте да пошаљете / поништите овај унос"
 DocType: Course,Course Code,Наравно код
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},"Контроль качества , необходимые для Пункт {0}"
 DocType: POS Settings,Use POS in Offline Mode,Користите ПОС у Оффлине начину
@@ -3004,14 +3061,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Управление Территория дерево .
 DocType: Journal Entry Account,Sales Invoice,Продаја Рачун
 DocType: Journal Entry Account,Party Balance,Парти Стање
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,Молимо одаберите Аппли попуста на
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Молимо одаберите Аппли попуста на
 DocType: Company,Default Receivable Account,Уобичајено потраживања рачуна
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,"Направи Банк, улаз за укупне плате исплаћене за горе изабране критеријуме"
 DocType: Physician,Physician Schedule,Распоред лекара
 DocType: Purchase Invoice,Deemed Export,Изгледа извоз
 DocType: Stock Entry,Material Transfer for Manufacture,Пренос материјала за Производња
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Попуст Проценат може да се примени било против ценовнику или за све Ценовником.
-DocType: Purchase Invoice,Half-yearly,Полугодишње
+DocType: Subscription,Half-yearly,Полугодишње
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Рачуноводство Ентри за Деонице
 DocType: Lab Test,LabTest Approver,ЛабТест Аппровер
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Већ сте оцијенили за критеријуми за оцењивање {}.
@@ -3040,13 +3097,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Ектра Смалл
 DocType: Company,Standard Template,стандард Шаблон
 DocType: Training Event,Theory,теорија
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Упозорење : Материјал Тражени Кол је мање од Минимална количина за поручивање
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Упозорење : Материјал Тражени Кол је мање од Минимална количина за поручивање
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Счет {0} заморожен
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Правно лице / Подружница са посебном контном припада организацији.
 DocType: Payment Request,Mute Email,Муте-маил
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Храна , пиће и дуван"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Може само извршити уплату против ненаплаћене {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,"Скорость Комиссия не может быть больше, чем 100"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Може само извршити уплату против ненаплаћене {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,"Скорость Комиссия не может быть больше, чем 100"
 DocType: Stock Entry,Subcontract,Подуговор
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Молимо Вас да унесете {0} прво
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Нема одговора од
@@ -3064,10 +3121,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Боја
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Критеријуми процене План
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Превент Ордер Ордерс
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Осетљив
 DocType: Patient Appointment,Scheduled,Планиран
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Захтев за понуду.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Молимо да подесите систем именовања запослених у људским ресурсима&gt; ХР Сеттингс
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Молимо одаберите ставку где &quot;је акционарско тачка&quot; је &quot;Не&quot; и &quot;Да ли је продаје Тачка&quot; &quot;Да&quot; и нема другог производа Бундле
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Изаберите купца
 DocType: Student Log,Academic,академски
 DocType: Patient,Personal and Social History,Лична и друштвена историја
 DocType: Fee Schedule,Fee Breakup for each student,Накнада за сваки студент
@@ -3077,7 +3135,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Процена Стопа
 DocType: Stock Reconciliation,SR/,СР /
 DocType: Vehicle,Diesel,дизел
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Прайс-лист Обмен не выбран
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Прайс-лист Обмен не выбран
 apps/erpnext/erpnext/config/healthcare.py +46,Results,Резултати
 ,Student Monthly Attendance Sheet,Студент Месечно Присуство лист
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Сотрудник {0} уже подало заявку на {1} между {2} и {3}
@@ -3093,7 +3151,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Управљање продајних партнера.
 DocType: Quality Inspection,Inspection Type,Инспекција Тип
 DocType: Fee Validity,Visited yet,Посјећено још
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Складишта са постојећим трансакцији не може бити конвертована у групу.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Складишта са постојећим трансакцији не може бити конвертована у групу.
 DocType: Assessment Result Tool,Result HTML,rezultat ХТМЛ-
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Истиче
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Додај Студенти
@@ -3120,7 +3178,7 @@
 DocType: Healthcare Settings,Result Printed,Ресулт Принтед
 DocType: Asset Category Account,Depreciation Expense Account,Амортизација Трошкови рачуна
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Пробни период
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Прегледати {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Прегледати {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Само листа чворови су дозвољени у трансакцији
 DocType: Expense Claim,Expense Approver,Расходи одобраватељ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Ред {0}: Унапред против Купца мора бити кредит
@@ -3132,7 +3190,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Да датетиме
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Распоред курса избрисан:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Протоколи за одржавање смс статус испоруке
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Подесите продајну цену
 DocType: Accounts Settings,Make Payment via Journal Entry,Извршити уплату преко Јоурнал Ентри
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Штампано на
 DocType: Item,Inspection Required before Delivery,Инспекција Потребна пре испоруке
@@ -3140,7 +3197,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Пендинг Активности
 DocType: Patient Appointment,Reminded,Подсетио
 DocType: Patient,PID-,ПИД-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Ваш Организација
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Ваш Организација
 DocType: Fee Component,Fees Category,naknade Категорија
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,"Пожалуйста, введите даты снятия ."
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Амт
@@ -3152,7 +3209,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Реордер Ниво
 DocType: Company,Chart Of Accounts Template,Контни план Темплате
 DocType: Attendance,Attendance Date,Гледалаца Датум
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Ставка Цена ажуриран за {0} у ценовником {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Ставка Цена ажуриран за {0} у ценовником {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Плата распада на основу зараде и дедукције.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Счет с дочерних узлов не могут быть преобразованы в книге
 DocType: Purchase Invoice Item,Accepted Warehouse,Прихваћено Магацин
@@ -3168,9 +3225,10 @@
 ,Employee Birthday,Запослени Рођендан
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Студент партије Присуство Алат
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,лимит Цроссед
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Планирани Упто
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Вентуре Цапитал
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Академски назив са овим &#39;школској&#39; {0} и &#39;Рок име&#39; {1} већ постоји. Молимо Вас да измените ове ставке и покушајте поново.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Као што постоје постоје трансакције против ставку {0}, не може да промени вредност {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Као што постоје постоје трансакције против ставку {0}, не може да промени вредност {1}"
 DocType: UOM,Must be Whole Number,Мора да буде цео број
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Нове Лишће Издвојена (у данима)
 DocType: Purchase Invoice,Invoice Copy,faktura Копирање
@@ -3180,7 +3238,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Фактура број
 DocType: Shopping Cart Settings,Orders,Поруџбине
 DocType: Employee Leave Approver,Leave Approver,Оставите Аппровер
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Изаберите серију
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Изаберите серију
 DocType: Assessment Group,Assessment Group Name,Процена Име групе
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Материјал Пребачен за производњу
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Корисник са ""Расходи одобраватељ"" улози"
@@ -3195,7 +3253,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Затварање период Ступање
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Изаберите Одељење ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,МВЗ с существующими сделок не могут быть преобразованы в группе
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Износ {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Износ {0} {1} {2} {3}
 DocType: Account,Depreciation,амортизация
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Супплиер (с)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Запослени Присуство Алат
@@ -3207,10 +3265,12 @@
 DocType: GL Entry,Voucher No,Ваучер Бр.
 ,Lead Owner Efficiency,Олово Власник Ефикасност
 ,Lead Owner Efficiency,Олово Власник Ефикасност
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Најпопуларнији
 DocType: Leave Allocation,Leave Allocation,Оставите Алокација
 DocType: Payment Request,Recipient Message And Payment Details,Прималац поруке и плаћања Детаљи
 DocType: Training Event,Trainer Email,тренер-маил
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Запросы Материал {0} создан
+DocType: Restaurant Reservation,No of People,Број људи
 DocType: Production Planning Tool,Include sub-contracted raw materials,Укључују подуговорене сировина
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Предложак термина или уговору.
 DocType: Purchase Invoice,Address and Contact,Адреса и контакт
@@ -3219,10 +3279,11 @@
 DocType: Supplier,Last Day of the Next Month,Последњи дан наредног мјесеца
 DocType: Support Settings,Auto close Issue after 7 days,Ауто затварање издање након 7 дана
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Оставите не може се доделити пре {0}, као одсуство стање је већ Царри-прослеђен у будућем расподеле одсуство записника {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Напомена: Због / Референтни Датум прелази дозвољене кредитним купац дана од {0} дана (и)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Напомена: Због / Референтни Датум прелази дозвољене кредитним купац дана од {0} дана (и)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,студент Подносилац
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,Оригинал на РЕЦИПИЕНТ
 DocType: Asset Category Account,Accumulated Depreciation Account,Исправка вриједности рачуна
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Овај е-маил је аутогенерисан
 DocType: Stock Settings,Freeze Stock Entries,Фреезе уносе берза
 DocType: Program Enrollment,Boarding Student,ЈУ Студентски
 DocType: Asset,Expected Value After Useful Life,Очекује Вредност Након користан Лифе
@@ -3230,7 +3291,7 @@
 DocType: Activity Cost,Billing Rate,Обрачун курс
 ,Qty to Deliver,Количина на Избави
 ,Stock Analytics,Стоцк Аналитика
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Операције не може остати празно
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Операције не може остати празно
 DocType: Maintenance Visit Purpose,Against Document Detail No,Против докумената детаља Нема
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Парти Тип је обавезно
 DocType: Quality Inspection,Outgoing,Друштвен
@@ -3253,7 +3314,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Изаберите студенти ручно активности заснива Групе
 DocType: Journal Entry,User Remark,Корисник Напомена
 DocType: Lead,Market Segment,Сегмент тржишта
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Плаћени износ не може бити већи од укупног негативног преостали износ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Плаћени износ не може бити већи од укупног негативног преостали износ {0}
 DocType: Supplier Scorecard Period,Variables,Варијабле
 DocType: Employee Internal Work History,Employee Internal Work History,Запослени Интерна Рад Историја
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Затварање (др)
@@ -3283,21 +3344,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Гет Упдатес
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: налог {2} не припада компанији {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Материал Запрос {0} отменяется или остановлен
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Оставите Манагемент
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Оставите Манагемент
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Группа по Счет
 DocType: Sales Order,Fully Delivered,Потпуно Испоручено
 DocType: Lead,Lower Income,Доња прихода
+DocType: Restaurant Order Entry,Current Order,Тренутни ред
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Источник и цель склад не может быть одинаковым для ряда {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разлика Рачун мора бити тип активом / одговорношћу рачуна, јер Сток Помирење је отварање Ступање"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Исплаћено износ не може бити већи од кредита Износ {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Иди на програме
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Производња Поруџбина није направљена
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Производња Поруџбина није направљена
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Од датума"" мора бити након ""До датума"""
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Не могу да променим статус студента {0} је повезан са применом студентског {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Не могу да променим статус студента {0} је повезан са применом студентског {1}
 DocType: Asset,Fully Depreciated,потпуно отписаних
 ,Stock Projected Qty,Пројектовани Стоцк Кти
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Приметан Присуство ХТМЛ
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Цитати су предлози, понуде које сте послали да својим клијентима"
 DocType: Sales Order,Customer's Purchase Order,Куповина нарудзбини
@@ -3308,8 +3370,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Молимо поставите Број Амортизација Жути картони
 DocType: Supplier Scorecard Period,Calculations,Израчунавање
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Вредност или Кол
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Продуцтионс Налози не може да се подигне за:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Продуцтионс Налози не може да се подигне за:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,минут
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Поставите називе серије за {0} преко Сетуп&gt; Сеттингс&gt; Сериес Наминг
 DocType: Purchase Invoice,Purchase Taxes and Charges,Куповина Порези и накнаде
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Иди на добављаче
 ,Qty to Receive,Количина за примање
@@ -3323,7 +3386,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Кредит на рачун мора да буде биланса стања
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Сви Типови добављача
 DocType: Global Defaults,Disable In Words,Онемогућити У Вордс
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Код товара является обязательным, поскольку Деталь не автоматически нумеруются"
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,"Код товара является обязательным, поскольку Деталь не автоматически нумеруются"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Цитата {0} не типа {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Одржавање Распоред шифра
 DocType: Sales Order,%  Delivered,Испоручено %
@@ -3345,23 +3408,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Почетно стање Капитал
 DocType: Lead,CRM,ЦРМ
 DocType: Purchase Invoice,N,Н
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Помирење
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,остали
 DocType: Appraisal,Appraisal,Процена
 DocType: Purchase Invoice,GST Details,ГСТ Детаилс
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},Емаил који је послат добављачу {0}
+DocType: Item,Default Sales Unit of Measure,Подразумевана продајна јединица мјере
 DocType: Opportunity,OPTY-,ОПТИ-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Датум се понавља
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Овлашћени потписник
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Оставьте утверждающий должен быть одним из {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Креирај накнаде
-DocType: Hub Settings,Seller Email,Продавац маил
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Укупно набавној вредности (преко фактури)
 DocType: Training Event,Start Time,Почетак Време
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Изаберите Количина
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Изаберите Количина
 DocType: Customs Tariff Number,Customs Tariff Number,Царинска тарифа број
 DocType: Patient Appointment,Patient Appointment,Именовање пацијента
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"Утверждении роль не может быть такой же, как роль правило применимо к"
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Унсубсцрибе из овог Емаил Дигест
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Унсубсцрибе из овог Емаил Дигест
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Добијте добављаче
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} није пронађен за ставку {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Иди на курсеве
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Порука је послата
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Рачун са дететом чворова не може да се подеси као књиге
@@ -3374,11 +3440,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Материјал пребачени на Мануфацтуринг
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Рачун {0} не постоји
 DocType: Project,Project Type,Тип пројекта
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Цхилд Таск постоји за овај задатак. Не можете да избришете овај задатак.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Либо целевой Количество или целевое количество является обязательным.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Трошкови различитих активности
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Нема више резултата
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Трошкови различитих активности
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Постављање Догађаји на {0}, јер запослени у прилогу у наставку продаје лица нема Усер ИД {1}"
 DocType: Timesheet,Billing Details,Детаљи наплате
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Извор и циљ складиште мора бити другачија
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Извор и циљ складиште мора бити другачија
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Није дозвољено да ажурирате акција трансакције старије од {0}
 DocType: Purchase Invoice Item,PR Detail,ПР Детаљ
 DocType: Sales Order,Fully Billed,Потпуно Изграђена
@@ -3405,7 +3473,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Вире Трансфер
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Štiklirati sve
 DocType: Vehicle Log,Invoice Ref,фактура Реф
-DocType: Purchase Order,Recurring Order,Понављало Ордер
 DocType: Company,Default Income Account,Уобичајено прихода Рачун
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Кориснички Група / Кориснички
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Унцлосед фискалне године Добитак / Губитак (кредит)
@@ -3419,9 +3486,9 @@
 DocType: Patient,A Negative,Негативан
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Ништа више да покаже.
 DocType: Lead,From Customer,Од купца
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Звонки
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Звонки
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Производ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,Пакети
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,Пакети
 DocType: Project,Total Costing Amount (via Time Logs),Укупно Кошта Износ (преко Тиме Протоколи)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Направите распоред накнада
 DocType: Purchase Order Item Supplied,Stock UOM,Берза УОМ
@@ -3445,7 +3512,7 @@
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Лишће и одмор
 DocType: School Settings,Current Academic Term,Тренутни академски Рок
 DocType: Sales Order,Not Billed,Није Изграђена
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Оба Магацин мора припадати истој компанији
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Оба Магацин мора припадати истој компанији
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Нема контаката додао.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Слетео Трошкови Ваучер Износ
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Рачуни подигао Добављачи.
@@ -3454,7 +3521,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Сумма скидки
 DocType: Purchase Invoice,Return Against Purchase Invoice,Повратак против фактури
 DocType: Item,Warranty Period (in days),Гарантни период (у данима)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',упдате `табПатиент Аппоинтмент` поставите салес_инвоице = &#39;{0}&#39; где име = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Однос са Гуардиан1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Нето готовина из пословања
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Тачка 4
@@ -3463,8 +3529,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Јоурнал Ентри рачуна
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,студент Група
 DocType: Shopping Cart Settings,Quotation Series,Цитат Серија
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Элемент существует с тем же именем ({0} ) , пожалуйста, измените название группы или переименовать пункт"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Молимо одаберите клијента
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Элемент существует с тем же именем ({0} ) , пожалуйста, измените название группы или переименовать пункт"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Молимо одаберите клијента
 DocType: C-Form,I,ја
 DocType: Company,Asset Depreciation Cost Center,Средство Амортизација Трошкови центар
 DocType: Sales Order Item,Sales Order Date,Продаја Датум поруџбине
@@ -3473,6 +3539,7 @@
 DocType: Assessment Plan,Assessment Plan,Процена план
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Клијент {0} је креиран.
 DocType: Stock Settings,Limit Percent,лимит Проценат
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Тренутно нема доступних трговина на залихама
 ,Payment Period Based On Invoice Date,Период отплате Басед Он Фактура Дате
 DocType: Sample Collection,No. of print,Број отиска
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Миссинг валутниј курс за {0}
@@ -3528,13 +3595,14 @@
 DocType: Customer,CUST-,ЦУСТ-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Бруто плате - Укупно Одузимање - Отплата кредита
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,"Текущий спецификации и Нью- BOM не может быть таким же,"
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Плата Слип ИД
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Плата Слип ИД
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Дата выхода на пенсию должен быть больше даты присоединения
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,"Било је грешака, док заказују курс на:"
 DocType: Sales Invoice,Against Income Account,Против приход
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Испоручено
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Ставка {0}: Ж ком {1} не може бити мањи од Минимална количина за поручивање {2} (дефинисан у тачки).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Ставка {0}: Ж ком {1} не може бити мањи од Минимална количина за поручивање {2} (дефинисан у тачки).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Месечни Дистрибуција Проценат
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Молимо пријавите се као други корисник.
 DocType: Territory,Territory Targets,Територија Мете
 DocType: Delivery Note,Transporter Info,Транспортер Инфо
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Молимо поставите подразумевани {0} у компанији {1}
@@ -3542,13 +3610,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Исти добављач је ушао више пута
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Бруто добит / губитак
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Наруџбенице артикла у комплету
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Назив компаније не може бити Фирма
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Назив компаније не може бити Фирма
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Письмо главы для шаблонов печати .
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Титулы для шаблонов печатных например Фактуры Proforma .
 DocType: Program Enrollment,Walking,Ходање
 DocType: Student Guardian,Student Guardian,студент Гардијан
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Тип Процена трошкови не могу означити као инцлусиве
 DocType: POS Profile,Update Stock,Упдате Стоцк
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,у претплати
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Различные Единица измерения для элементов приведет к некорректному (Всего) значение массы нетто . Убедитесь, что вес нетто каждого элемента находится в том же UOM ."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,БОМ курс
 DocType: Asset,Journal Entry for Scrap,Јоурнал Ентри за отпад
@@ -3598,15 +3667,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Систем Корисник (пријављивање) ИД. Ако се постави, она ће постати стандардна за све ХР облицима."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Од {1}
 DocType: Task,depends_on,депендс_он
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Очекује се ажурирање најновије цене у свим материјалима. Може потрајати неколико минута.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Очекује се ажурирање најновије цене у свим материјалима. Може потрајати неколико минута.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Име новог налога. Напомена: Молимо вас да не стварају налоге за купцима и добављачима
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Земља мудар подразумевана адреса шаблон
 DocType: Sales Order Item,Supplier delivers to Customer,Добављач доставља клијенту
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Облик / тачка / {0}) није у складишту
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Због / Референтна Датум не може бити после {0}
+,Sales Payment Summary,Сажетак плаћања продаје
+DocType: Restaurant,Restaurant,Ресторан
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Због / Референтна Датум не може бити после {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Подаци Увоз и извоз
 DocType: Patient,Account Details,Детаљи рачуна
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Ниједан студент Фоунд
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Ниједан студент Фоунд
 DocType: Medical Department,Medical Department,Медицински одјел
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Критеријуми бодовања Сцорецард-а
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Фактура датум постања
@@ -3617,8 +3688,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Молимо одаберите датум постања пре избора Парти
 DocType: Program Enrollment,School House,Школа Кућа
 DocType: Serial No,Out of AMC,Од АМЦ
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Молимо одаберите Куотатионс
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Молимо одаберите Куотатионс
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Молимо одаберите Куотатионс
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Молимо одаберите Куотатионс
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Број Амортизација жути картон, не може бити већи од Укупан број Амортизација"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Маке одржавање Посетите
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,Молимо контактирајте кориснику који је продаја Мастер менаџер {0} улогу
@@ -3626,7 +3697,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Компания ( не клиента или поставщика ) хозяин.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Ово је засновано на похађања овог Студент
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Но Ученици у
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Додали још ставки или Опен пуној форми
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Додали још ставки или Опен пуној форми
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Иди на Кориснике
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,"Платные сумма + списания сумма не может быть больше, чем общий итог"
@@ -3646,37 +3717,40 @@
 DocType: Fee Schedule,Fee Schedule,цјеновник
 DocType: Hub Settings,Publish Availability,Објављивање Доступност
 DocType: Company,Create Chart Of Accounts Based On,Створити контни план на основу
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Не могу да претворим у не-групу. Постоје задаци за децу.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Датум рођења не може бити већи него данас.
 ,Stock Ageing,Берза Старење
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Студент {0} постоје против подносиоца пријаве студента {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Прилагођавање заокруживања (валута компаније)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Распоред
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Распоред
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' је онемогућен
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Постави као Опен
 DocType: Cheque Print Template,Scanned Cheque,скенирана Чек
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Пошаљи аутоматске поруке е-поште у Контакте о достављању трансакцијама.
 DocType: Timesheet,Total Billable Amount,Укупно Наплативи Износ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Тачка 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Унос налога
 DocType: Purchase Order,Customer Contact Email,Кориснички Контакт Е-маил
 DocType: Warranty Claim,Item and Warranty Details,Ставка и гаранције Детаљи
 DocType: Sales Team,Contribution (%),Учешће (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана , так как "" Наличные или Банковский счет "" не был указан"
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Пројекат {0} већ постоји
 DocType: Medical Department,Nursing User,Нурсинг Усер
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Одговорности
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Рок важности ове понуде је завршен.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Рок важности ове понуде је завршен.
 DocType: Expense Claim Account,Expense Claim Account,Расходи Захтев налог
 DocType: Accounts Settings,Allow Stale Exchange Rates,Дозволите старе курсеве
 DocType: Sales Person,Sales Person Name,Продаја Особа Име
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Пожалуйста, введите не менее чем 1 -фактуру в таблице"
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Додај корисника
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Додај корисника
 DocType: POS Item Group,Item Group,Ставка Група
 DocType: Item,Safety Stock,Безбедност Сток
 DocType: Healthcare Settings,Healthcare Settings,Поставке здравствене заштите
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Напредак% за задатак не може бити више од 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Напредак% за задатак не може бити више од 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Пре помирења
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Да {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Порези и накнаде додавања (Друштво валута)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Налоговый ряд {0} должен иметь учетную запись типа налога или доходов или расходов или платная
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Налоговый ряд {0} должен иметь учетную запись типа налога или доходов или расходов или платная
 DocType: Sales Order,Partly Billed,Делимично Изграђена
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Итем {0} мора бити основних средстава итем
 DocType: Item,Default BOM,Уобичајено БОМ
@@ -3692,6 +3766,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,варијабла
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Из доставница
 DocType: Student,Student Email Address,Студент-маил адреса
+DocType: Item,Hub Warehouse,Хуб складиште
 DocType: Physician Schedule Time Slot,From Time,Од времена
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,На лагеру:
 DocType: Notification Control,Custom Message,Прилагођена порука
@@ -3700,9 +3775,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,студент Адреса
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,студент Адреса
 DocType: Purchase Invoice,Price List Exchange Rate,Цена курсној листи
+DocType: POS Profile,POS Profile Name,ПОС Профил Име
 DocType: Purchase Invoice Item,Rate,Стопа
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,стажиста
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Адреса Име
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Адреса Име
 DocType: Stock Entry,From BOM,Од БОМ
 DocType: Assessment Code,Assessment Code,Процена код
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,основной
@@ -3716,11 +3792,12 @@
 DocType: Salary Slip,Salary Structure,Плата Структура
 DocType: Account,Bank,Банка
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ваздушна линија
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Питање Материјал
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Питање Материјал
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Дошло је до грешке приликом стварања понављајуће
 DocType: Material Request Item,For Warehouse,За Варехоусе
 DocType: Employee,Offer Date,Понуда Датум
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Цитати
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Ви сте у оффлине моду. Нећете моћи да поново све док имате мрежу.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Ви сте у оффлине моду. Нећете моћи да поново све док имате мрежу.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Нема Студент Групе створио.
 DocType: Purchase Invoice Item,Serial No,Серијски број
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Месечна отплата износ не може бити већи од кредита Износ
@@ -3730,17 +3807,18 @@
 DocType: Salary Slip,Total Working Hours,Укупно Радно време
 DocType: Subscription,Next Schedule Date,Следећи датум распореда
 DocType: Stock Entry,Including items for sub assemblies,Укључујући ставке за под скупштине
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Унесите вредност мора бити позитивна
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Все территории
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Унесите вредност мора бити позитивна
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Все территории
 DocType: Purchase Invoice,Items,Артикли
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Студент је већ уписано.
 DocType: Fiscal Year,Year Name,Име године
 DocType: Process Payroll,Process Payroll,Процес Паиролл
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,"Есть больше праздников , чем рабочих дней в этом месяце."
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,"Есть больше праздников , чем рабочих дней в этом месяце."
 DocType: Product Bundle Item,Product Bundle Item,Производ Бундле артикла
 DocType: Sales Partner,Sales Partner Name,Продаја Име партнера
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Захтев за Куотатионс
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Захтев за Куотатионс
 DocType: Payment Reconciliation,Maximum Invoice Amount,Максимални износ фактуре
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Хематологија
 DocType: Normal Test Items,Normal Test Items,Нормални тестови
 DocType: Student Language,Student Language,студент Језик
 apps/erpnext/erpnext/config/selling.py +23,Customers,Купци
@@ -3752,10 +3830,11 @@
 DocType: Issue,Opening Time,Радно време
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"От и До даты , необходимых"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Хартије од вредности и робним берзама
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Уобичајено Јединица мере за варијанту &#39;{0}&#39; мора бити исти као у темплате &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Уобичајено Јединица мере за варијанту &#39;{0}&#39; мора бити исти као у темплате &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Израчунајте Басед Он
 DocType: Delivery Note Item,From Warehouse,Од Варехоусе
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Но Предмети са саставница у Производња
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Но Предмети са саставница у Производња
+DocType: Restaurant,Default Customer,Дефаулт Цустомер
 DocType: Assessment Plan,Supervisor Name,Супервизор Име
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Не потврдите да ли је заказан термин за исти дан
 DocType: Program Enrollment Course,Program Enrollment Course,Програм Упис предмета
@@ -3783,7 +3862,7 @@
 DocType: Payment Entry,Internal Transfer,Интерни пренос
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Детский учетная запись существует для этой учетной записи . Вы не можете удалить этот аккаунт .
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Либо целевой Количество или целевое количество является обязательным
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Молимо Вас да изаберете датум постања први
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Датум отварања треба да буде пре затварања Дате
 DocType: Leave Control Panel,Carry Forward,Пренети
@@ -3819,6 +3898,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Укупно Поклон
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,рачуноводствених исказа
 DocType: Drug Prescription,Hour,час
+DocType: Restaurant Order Entry,Last Sales Invoice,Последња продаја фактура
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Новый Серийный номер не может быть Склад . Склад должен быть установлен на фондовой Вступил или приобрести получении
 DocType: Lead,Lead Type,Олово Тип
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Нисте ауторизовани да одобри лишће на блок Датуми
@@ -3855,65 +3935,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,створити корисника
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,грам
 DocType: Supplier Scorecard,Per Month,Месечно
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Количина да Производња мора бити већи од 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Количина да Производња мора бити већи од 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Посетите извештаја за одржавање разговора.
 DocType: Stock Entry,Update Rate and Availability,Ажурирање курс и доступност
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Проценат вам је дозвољено да примају или испоручи више од количине наредио. На пример: Ако сте наредили 100 јединица. и ваш додатак је 10% онда вам је дозвољено да примају 110 јединица.
 DocType: POS Customer Group,Customer Group,Кориснички Група
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Нови Батцх ид (опционо)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Нови Батцх ид (опционо)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Нови Батцх ид (опционо)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Нови Батцх ид (опционо)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Расходов счета является обязательным для пункта {0}
 DocType: BOM,Website Description,Вебсајт Опис
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Нето промена у капиталу
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Најновије
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Откажите фактури {0} први
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Е-маил адреса мора бити јединствена, већ постоји за {0}"
 DocType: Serial No,AMC Expiry Date,АМЦ Датум истека
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,Признаница
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,Признаница
 ,Sales Register,Продаја Регистрација
 DocType: Daily Work Summary Settings Company,Send Emails At,Шаљу мејлове на
 DocType: Quotation,Quotation Lost Reason,Понуда Лост разлог
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Изаберите Ваш домен
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',изаберите * из табПатиент гдје име = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Трансакција референца не {0} од {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Трансакција референца не {0} од {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Не постоји ништа да измените .
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Форм Виев
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Преглед за овај месец и чекају активности
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Форм Виев
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Преглед за овај месец и чекају активности
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Додајте кориснике у своју организацију, осим себе."
 DocType: Customer Group,Customer Group Name,Кориснички Назив групе
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Но Купци иет!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Но Купци иет!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Извештај о токовима готовине
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Износ кредита не може бити већи од максимални износ кредита {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,лиценца
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Молимо вас да уклоните ову фактуру {0} од Ц-Форм {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Молимо вас да уклоните ову фактуру {0} од Ц-Форм {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Молимо изаберите пренети ако такође желите да укључите претходну фискалну годину је биланс оставља на ову фискалну годину
 DocType: GL Entry,Against Voucher Type,Против Вауцер Типе
 DocType: Physician,Phone (R),Телефон (Р)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Додато је временска утрка
 DocType: Item,Attributes,Атрибути
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Омогући шаблон
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Поставите називе серије за {0} преко Сетуп&gt; Сеттингс&gt; Сериес Наминг
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,"Пожалуйста, введите списать счет"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Последњи Низ Датум
 DocType: Patient,B Negative,Б Негативе
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Рачун {0} не припада компанији {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Серијски бројеви у низу {0} не поклапа са Деливери Ноте
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Серијски бројеви у низу {0} не поклапа са Деливери Ноте
 DocType: Student,Guardian Details,гуардиан Детаљи
 DocType: C-Form,C-Form,Ц-Форм
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Марк Присуство за више радника
 DocType: Vehicle,Chassis No,шасија Нема
 DocType: Payment Request,Initiated,Покренут
 DocType: Production Order,Planned Start Date,Планирани датум почетка
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Изаберите БОМ
 DocType: Serial No,Creation Document Type,Документ регистрације Тип
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Крајњи датум мора бити већи од почетног датума
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Крајњи датум мора бити већи од почетног датума
 DocType: Leave Type,Is Encash,Да ли уновчити
 DocType: Leave Allocation,New Leaves Allocated,Нови Леавес Издвојена
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Проект мудрый данные не доступны для коммерческого предложения
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Заврши
 DocType: Project,Expected End Date,Очекивани датум завршетка
 DocType: Budget Account,Budget Amount,Износ буџета
 DocType: Appraisal Template,Appraisal Template Title,Процена Шаблон Наслов
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Од датума {0} за Запослени {1} не може бити прије уласка Дате запосленог {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,коммерческий
 DocType: Patient,Alcohol Current Use,Употреба алкохола
+DocType: Student Admission Program,Student Admission Program,Студентски пријемни програм
 DocType: Payment Entry,Account Paid To,Рачун Паид То
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Родитељ артикла {0} не сме бити лагеру предмета
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Сви производи или услуге.
@@ -3922,30 +4004,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} буџета за налог {1} против {2} {3} је {4}. То ће премашити по {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Ред {0} # Рачун мора бити типа &#39;основним средствима&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Од Кол
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Правила за израчунавање износа испоруке за продају
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,и унцхцкед Онемогућено у
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Серия является обязательным
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Финансијске услуге
 DocType: Student Sibling,Student ID,студентска
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Врсте активности за време Логс
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Супплиер Емаил
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Врсте активности за време Логс
 DocType: Tax Rule,Sales,Продајни
 DocType: Stock Entry Detail,Basic Amount,Основни Износ
 DocType: Training Event,Exam,испит
 DocType: Complaint,Complaint,Жалба
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
 DocType: Leave Allocation,Unused leaves,Неискоришћени листови
 DocType: Patient,Alcohol Past Use,Употреба алкохола у прошлости
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Кр
 DocType: Tax Rule,Billing State,Тецх Стате
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Пренос
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Фетцх експлодирала бом ( укључујући подсклопова )
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Пренос
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Фетцх експлодирала бом ( укључујући подсклопова )
 DocType: Authorization Rule,Applicable To (Employee),Важећи Да (запослених)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Дуе Дате обавезна
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Дуе Дате обавезна
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Повећање за Аттрибуте {0} не може бити 0
 DocType: Journal Entry,Pay To / Recd From,Плати Да / Рецд Од
 DocType: Naming Series,Setup Series,Подешавање Серија
 DocType: Payment Reconciliation,To Invoice Date,За датум фактуре
 DocType: Supplier,Contact HTML,Контакт ХТМЛ
 ,Inactive Customers,неактивни Купци
+DocType: Student Admission Program,Maximum Age,Максимално доба
 DocType: Landed Cost Voucher,LCV,ЛЦВ
 DocType: Landed Cost Voucher,Purchase Receipts,Куповина Примици
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Како се примењује Правилник о ценама?
@@ -3964,6 +4048,7 @@
 DocType: GL Entry,Remarks,Примедбе
 DocType: Payment Entry,Account Paid From,Рачун Паид Од
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Сировина Шифра
+DocType: Task,Parent Task,Задатак родитеља
 DocType: Journal Entry,Write Off Based On,Отпис Басед Он
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Маке Леад
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Принт и Папирна
@@ -3972,20 +4057,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Плата већ обрађени за период од {0} и {1}, Оставите период апликација не може бити између овај период."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Инсталација рекорд за серијским бр
 DocType: Guardian Interest,Guardian Interest,гуардиан камата
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Подеси подразумеване вредности за ПОС Рачуне
 apps/erpnext/erpnext/config/hr.py +177,Training,тренинг
 DocType: Timesheet,Employee Detail,zaposleni Детаљи
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Гуардиан1 маил ИД
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Гуардиан1 маил ИД
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,Следећи датум је дан и поновите на дан месеца морају бити једнаки
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Следећи датум је дан и поновите на дан месеца морају бити једнаки
 DocType: Lab Prescription,Test Code,Тест Цоде
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Подешавања за интернет страницама
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},РФК-ови нису дозвољени за {0} због стања стола за резултат {1}
 DocType: Offer Letter,Awaiting Response,Очекујем одговор
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Горе
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Укупан износ {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Неважећи атрибут {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Укупан износ {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Неважећи атрибут {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Поменули да нестандардни плаћа рачун
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Исто ставка је више пута ушао. {листа}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Молимо одаберите групу процене осим &quot;Све за оцењивање група&quot;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Ред {0}: Цена центра је потребна за ставку {1}
 DocType: Training Event Employee,Optional,Опционо
@@ -4008,13 +4093,15 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Трошкови Центар је обавезан за пункт {2}
 DocType: Vehicle,Policy No,politika Нема
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Гет ставки из производа Бундле
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Пошто стање постоји против ставке {0}, не можете да омогућите својство варијанти"
 DocType: Asset,Straight Line,Права линија
 DocType: Project User,Project User,projekat Корисник
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Разделити
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Разделити
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Разделити
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Разделити
 DocType: GL Entry,Is Advance,Да ли Адванце
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Гледалаца Од Датум и радног То Дате је обавезна
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,"Пожалуйста, введите ' Является субподряду "", как Да или Нет"
+DocType: Item,Default Purchase Unit of Measure,Подразумевана јединица куповине мјере
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Последњи Комуникација Датум
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Последњи Комуникација Датум
 DocType: Sales Team,Contact No.,Контакт број
@@ -4023,7 +4110,6 @@
 DocType: Production Order,Check if material transfer entry is not required,Проверите да ли није потребна унос пренос материјала
 DocType: Production Order,Check if material transfer entry is not required,Проверите да ли није потребна унос пренос материјала
 DocType: Program Enrollment Tool,Get Students From,Гет студенти из
-DocType: Hub Settings,Seller Country,Продавац Земља
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Објављивање ставке на сајту
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Група ваши ученици у серијама
 DocType: Authorization Rule,Authorization Rule,Овлашћење Правило
@@ -4033,8 +4119,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Продаја Порези и накнаде Темплате
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Укупно (кредит)
 DocType: Repayment Schedule,Payment Date,Датум исплате
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Нова Серија ком
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Нова Серија ком
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Нова Серија ком
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Нова Серија ком
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Одећа и прибор
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,Не могу да решим тежински резултат. Проверите да ли је формула валидна.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Број Реда
@@ -4052,6 +4138,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ред # {0}: имовине {1} не може се поднети, већ је {2}"
 DocType: Tax Rule,Billing Country,Zemlja naplate
 DocType: Purchase Order Item,Expected Delivery Date,Очекивани Датум испоруке
+DocType: Restaurant Order Entry,Restaurant Order Entry,Ордер Ордер Ентри
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебитне и кредитне није једнака за {0} # {1}. Разлика је {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,представительские расходы
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Маке Материал захтев
@@ -4064,9 +4151,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Счет с существующей сделки не могут быть удалены
 DocType: Vehicle,Last Carbon Check,Последња Угљен Одлазак
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,судебные издержки
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Молимо одаберите количину на реду
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Молимо одаберите количину на реду
 DocType: Purchase Invoice,Posting Time,Постављање Време
 DocType: Timesheet,% Amount Billed,% Фактурисаних износа
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Време по именовању&quot; није постављено за др {0}. Додајте га у главу лекара.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Телефон Расходы
 DocType: Sales Partner,Logo,Лого
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Проверите ово ако желите да натера кориснику да одабере серију пре чувања. Неће бити подразумевано ако проверите ово.
@@ -4077,6 +4165,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Нови Кориснички Приход
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Командировочные расходы
 DocType: Maintenance Visit,Breakdown,Слом
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Додајте прилагођено поље Претплата у доцтипе {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Рачун: {0} са валутом: {1} не може бити изабран
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Аутоматско ажурирање трошкова БОМ-а путем Планера, на основу најновије процене стопе цена / цене цена / последње цене сировина."
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Датум
@@ -4101,7 +4190,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Укупно цард Износ (преко Тиме Протоколи)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Добављач Ид
 DocType: Payment Request,Payment Gateway Details,Паимент Гатеваи Детаљи
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Количину треба већи од 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Количину треба већи од 0
 DocType: Journal Entry,Cash Entry,Готовина Ступање
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Дете чворови се може створити само под типа чворова &#39;групе&#39;
 DocType: Leave Application,Half Day Date,Полудневни Датум
@@ -4119,12 +4208,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Примечание: Пункт {0} вошли несколько раз
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Сви контакти.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Компанија Скраћеница
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Пользователь {0} не существует
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Пользователь {0} не существует
 DocType: Subscription,SUB-,СУБ-
 DocType: Item Attribute Value,Abbreviation,Скраћеница
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Плаћање Ступање већ постоји
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Не Authroized с {0} превышает пределы
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Шаблоном Зарплата .
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Патологија
+DocType: Restaurant Order Entry,Restaurant Table,Ресторан Табле
 DocType: Leave Type,Max Days Leave Allowed,Мак Дани Оставите животиње
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Сет Пореска Правило за куповину
 DocType: Purchase Invoice,Taxes and Charges Added,Порези и накнаде додавања
@@ -4136,10 +4227,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Цитати на води или клијената.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Улога дозвољено да мењате замрзнуте залихе
 ,Territory Target Variance Item Group-Wise,Территория Целевая Разница Пункт Группа Мудрого
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Все Группы клиентов
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Все Группы клиентов
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,картон Месечно
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} је обавезно. Можда Мењачница запис није створен за {1} на {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Пореска Шаблон је обавезно.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Пореска Шаблон је обавезно.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Рачун {0}: {1 Родитељ рачун} не постоји
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ценовник Цена (Друштво валута)
 DocType: Products Settings,Products Settings,производи подешавања
@@ -4165,13 +4256,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Пункт Мудрый Налоговый Подробно
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Институт држава
 ,Item-wise Price List Rate,Ставка - мудар Ценовник курс
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Снабдевач Понуда
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Снабдевач Понуда
 DocType: Quotation,In Words will be visible once you save the Quotation.,У речи ће бити видљив када сачувате цитат.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Количина ({0}) не може бити део у низу {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Количина ({0}) не може бити део у низу {1}
 DocType: Consultation,C-,Ц-
 DocType: Attendance,ATT-,АТТ-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Штрих {0} уже используется в пункте {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Штрих {0} уже используется в пункте {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Правила для добавления стоимости доставки .
 DocType: Item,Opening Stock,otvaranje Сток
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Требуется клиентов
@@ -4190,9 +4281,8 @@
 DocType: Customer,From Lead,Од Леад
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Поруџбине пуштен за производњу.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Изаберите Фискална година ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,ПОС Профил потребно да ПОС Ентри
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,ПОС Профил потребно да ПОС Ентри
 DocType: Program Enrollment Tool,Enroll Students,упис студената
-DocType: Hub Settings,Name Token,Име токен
 DocType: Lab Test,Approved Date,Одобрени датум
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Стандардна Продаја
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Атлеаст једно складиште је обавезно
@@ -4210,7 +4300,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Људски Ресурси
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Плаћање Плаћање Помирење
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,налоговые активы
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Производња Ред је био {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Производња Ред је био {0}
 DocType: BOM Item,BOM No,БОМ Нема
 DocType: Instructor,INS/,ИНС /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Јоурнал Ентри {0} нема налог {1} или већ упарен против другог ваучера
@@ -4230,8 +4320,8 @@
 DocType: Currency Exchange,To Currency,Валутном
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Дозволи следеће корисницима да одобри Апликације оставити за блок дана.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Врсте расхода потраживања.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Продајном курсу за ставку {0} је нижи од својих {1}. Продаје стопа буде атлеаст {2}
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Продајном курсу за ставку {0} је нижи од својих {1}. Продаје стопа буде атлеаст {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Продајном курсу за ставку {0} је нижи од својих {1}. Продаје стопа буде атлеаст {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Продајном курсу за ставку {0} је нижи од својих {1}. Продаје стопа буде атлеаст {2}
 DocType: Item,Taxes,Порези
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Паид и није испоручена
 DocType: Project,Default Cost Center,Уобичајено Трошкови Центар
@@ -4245,15 +4335,15 @@
 DocType: Employee Loan,Fully Disbursed,potpuno Додељено
 DocType: Maintenance Visit,Customer Feedback,Кориснички Феедбацк
 DocType: Account,Expense,расход
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Резултат не може бити већи од максималан број бодова
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Резултат не може бити већи од максималан број бодова
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Купци и добављачи
 DocType: Item Attribute,From Range,Од Ранге
 DocType: BOM,Set rate of sub-assembly item based on BOM,Поставите брзину ставке подкомпонента на основу БОМ-а
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Синтакса грешка у формули или стања: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Синтакса грешка у формули или стања: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Свакодневном раду Преглед подешавања Фирма
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,"Пункт {0} игнорируется, так как это не складские позиции"
 DocType: Appraisal,APRSL,АПРСЛ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Пошаљите ова производња би за даљу обраду .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Пошаљите ова производња би за даљу обраду .
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Да не примењује Правилник о ценама у одређеном трансакцијом, све важеће Цене Правила би требало да буде онемогућен."
 DocType: Assessment Group,Parent Assessment Group,Родитељ Процена Група
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Послови
@@ -4270,12 +4360,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Молимо поставите Фирма филтер празно ако Група По је &#39;Фирма&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Датум постања не може бити будућност датум
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Ред # {0}: Серијски број {1} не одговара {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,за стварање понављајуће
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Повседневная Оставить
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Лаб Тест УОМ.
 DocType: Batch,Batch ID,Батцх ИД
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Примечание: {0}
 ,Delivery Note Trends,Достава Напомена трендови
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Овонедељном Преглед
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Овонедељном Преглед
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,На залихама Количина
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Рачун: {0} може да се ажурира само преко Стоцк промету
 DocType: Student Group Creation Tool,Get Courses,Гет Курсеви
@@ -4289,7 +4380,6 @@
 DocType: Purchase Order,To Bill,Билу
 DocType: Material Request,% Ordered,% Од А до Ж
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","За Студент Гроуп курс заснован, Курс ће бити потврђена за сваког студента из уписаних курсева у програм Упис."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Унесите е-маил адреса зарезима, фактура ће аутоматски бити послат на одређени датум"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,рад плаћен на акорд
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Про. Куповни
 DocType: Task,Actual Time (in Hours),Тренутно време (у сатима)
@@ -4303,7 +4393,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Пункт {0} не установка для серийные номера колонке должно быть пустым
 DocType: Accounts Settings,Accounts Settings,Рачуни Подешавања
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,одобрити
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Нема резултата који треба да пошаљу
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Нема резултата који треба да пошаљу
 DocType: Customer,Sales Partner and Commission,Продаја партнера и Комисија
 DocType: Employee Loan,Rate of Interest (%) / Year,Каматна стопа (%) / Иеар
 ,Project Quantity,projekat Количина
@@ -4315,55 +4405,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Црн
 DocType: BOM Explosion Item,BOM Explosion Item,БОМ Експлозија шифра
 DocType: Account,Auditor,Ревизор
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} ставки производе
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} ставки производе
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Сазнајте више
 DocType: Cheque Print Template,Distance from top edge,Удаљеност од горње ивице
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Ценовник {0} је онемогућена или не постоји
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Ценовник {0} је онемогућена или не постоји
 DocType: Purchase Invoice,Return,Повратак
 DocType: Production Order Operation,Production Order Operation,Производња Ордер Операција
 DocType: Pricing Rule,Disable,запрещать
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Начин плаћања је обавезан да изврши уплату
 DocType: Project Task,Pending Review,Чека критику
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Именовања и консултације
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} није уписано у Батцх {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} није уписано у Батцх {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Средство {0} не може бити укинута, јер је већ {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Укупни расходи Цлаим (преко Екпенсе потраживања)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,марк Одсутан
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Ред {0}: Валута у БОМ # {1} треба да буде једнака изабране валуте {2}
 DocType: Journal Entry Account,Exchange Rate,Курс
 DocType: Patient,Additional information regarding the patient,Додатне информације о пацијенту
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
 DocType: Homepage,Tag Line,таг линија
 DocType: Fee Component,Fee Component,naknada Компонента
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Управљање возним парком
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Адд ставке из
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Управљање возним парком
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Адд ставке из
 DocType: Cheque Print Template,Regular,редован
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Укупно Веигхтаге свих критеријума процене мора бити 100%
-DocType: BOM,Last Purchase Rate,Последња куповина Стопа
+DocType: Purchase Order Item,Last Purchase Rate,Последња куповина Стопа
 DocType: Account,Asset,преимућство
 DocType: Project Task,Task ID,Задатак ИД
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Стоцк не може постојати за ставку {0} од има варијанте
 DocType: Lab Test,Mobile,Мобиле
 ,Sales Person-wise Transaction Summary,Продавац у питању трансакција Преглед
 DocType: Training Event,Contact Number,Контакт број
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Магацин {0} не постоји
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Регистер За ЕРПНект Хуб
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Магацин {0} не постоји
 DocType: Monthly Distribution,Monthly Distribution Percentages,Месечни Дистрибуција Проценти
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Изабрана опција не може имати Батцх
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Процена стопа није пронађен за тачком {0}, која је потребна да уради рачуноводствене ставке за {1} {2}. Ако је ставка трансакцијама као ставка узорка у {1}, молимо вас да поменете да је у {1} табели тачка. У супротном, молимо вас да створи долазни стоцк трансакцију за стопу процене тачка или поменути у записнику јединице, а затим покушајте достављање / отказивања тхис ентри"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% испоручених материјала на основу ове Отпремнице
+DocType: Training Event,Has Certificate,Има сертификат
 DocType: Project,Customer Details,Кориснички Детаљи
 DocType: Employee,Reports to,Извештаји
 ,Unpaid Expense Claim,Неплаћени расходи Захтев
 DocType: Payment Entry,Paid Amount,Плаћени Износ
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Истражите кола за продају
 DocType: Assessment Plan,Supervisor,надзорник
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,мрежи
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,мрежи
 ,Available Stock for Packing Items,На располагању лагер за паковање ставке
 DocType: Item Variant,Item Variant,Итем Варијанта
 DocType: Assessment Result Tool,Assessment Result Tool,Алат Резултат процена
 DocType: BOM Scrap Item,BOM Scrap Item,БОМ отпад артикла
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Достављени налози се не могу избрисати
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Достављени налози се не могу избрисати
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Стање рачуна већ у задуживање, није вам дозвољено да поставите 'Стање Муст Бе' као 'Кредит'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Управљање квалитетом
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Итем {0} је онемогућен
@@ -4383,7 +4472,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Ров # {0}: ТИМИНГС сукоби са редом {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Дозволите Зеро Вредновање Рате
 DocType: Training Event Employee,Invited,позван
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Више активни структуре плате фоунд фор запосленом {0} за одређени датум
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Више активни структуре плате фоунд фор запосленом {0} за одређени датум
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Сетуп Гатеваи рачуни.
 DocType: Employee,Employment Type,Тип запослења
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,капитальные активы
@@ -4395,7 +4484,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Студент-маил ИД
 DocType: Employee,Notice (days),Обавештење ( дана )
 DocType: Tax Rule,Sales Tax Template,Порез на промет Шаблон
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Изабрали ставке да спасе фактуру
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Изабрали ставке да спасе фактуру
 DocType: Employee,Encashment Date,Датум Енцасхмент
 DocType: Training Event,Internet,Интернет
 DocType: Special Test Template,Special Test Template,Специјални тест шаблон
@@ -4404,7 +4493,7 @@
 DocType: Production Order,Planned Operating Cost,Планирани Оперативни трошкови
 DocType: Academic Term,Term Start Date,Термин Датум почетка
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,опп Точка
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},У прилогу {0} {1} #
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},У прилогу {0} {1} #
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Банка Биланс по Главној књизи
 DocType: Job Applicant,Applicant Name,Подносилац захтева Име
 DocType: Authorization Rule,Customer / Item Name,Кориснички / Назив
@@ -4424,7 +4513,7 @@
 DocType: Guardian,Guardian Of ,čuvar
 DocType: Grading Scale Interval,Threshold,праг
 DocType: BOM Update Tool,Current BOM,Тренутни БОМ
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Додај сериал но
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Додај сериал но
 DocType: Production Order Item,Available Qty at Source Warehouse,Доступно Количина на извору Варехоусе
 apps/erpnext/erpnext/config/support.py +22,Warranty,гаранција
 DocType: Purchase Invoice,Debit Note Issued,Задужењу Издато
@@ -4447,10 +4536,9 @@
 DocType: Account,Receivable,Дебиторская задолженность
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ред # {0}: Није дозвољено да промени снабдевача као Пурцхасе Ордер већ постоји
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Улога која је дозвољено да поднесе трансакције које превазилазе кредитне лимите.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Изабери ставке у Производња
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Основни подаци синхронизације, то би могло да потраје"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Изабери ставке у Производња
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Основни подаци синхронизације, то би могло да потраје"
 DocType: Item,Material Issue,Материјал Издање
-DocType: Hub Settings,Seller Description,Продавац Опис
 DocType: Employee Education,Qualification,Квалификација
 DocType: Item Price,Item Price,Артикал Цена
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Сапун и детерџент
@@ -4458,7 +4546,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Фром Тиме не може бити већи од на време.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Мотион Пицтуре & Видео
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ж
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Резиме
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Резиме
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Ако је омогућено, систем неће ажурирати поља варијанти из шаблона, али ће копирати податке из доље наведених поља док правите нову варијанту"
 DocType: Salary Detail,Component,Саставни део
 DocType: Assessment Criteria,Assessment Criteria Group,Критеријуми за процену Група
 DocType: Healthcare Settings,Patient Name By,Име пацијента од
@@ -4468,7 +4557,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Пожалуйста, введите утверждении роли или утверждении Пользователь"
 DocType: Journal Entry,Write Off Entry,Отпис Ентри
 DocType: BOM,Rate Of Materials Based On,Стопа материјала на бази
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Супплиер&gt; Тип добављача
+DocType: Item Variant Settings,Do not Update Variants,Не ажурирајте варијанте
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Подршка Аналтиицс
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Искључи све
 DocType: POS Profile,Terms and Conditions,Услови
@@ -4477,7 +4566,7 @@
 DocType: Leave Block List,Applies to Company,Примењује се на предузећа
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,"Нельзя отменить , потому что представляется со Вступление {0} существует"
 DocType: Employee Loan,Disbursement Date,isplata Датум
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;Примаоци&#39; нису наведени
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Примаоци&#39; нису наведени
 DocType: BOM Update Tool,Update latest price in all BOMs,Ажурирај најновију цену у свим БОМ
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Медицински запис
 DocType: Vehicle,Vehicle,Возило
@@ -4493,14 +4582,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Опп / Олово%
 DocType: Material Request,MREQ-,МРЕК-
 ,Asset Depreciations and Balances,Средстава Амортизација и ваге
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Износ {0} {1} је прешао из {2} у {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Износ {0} {1} је прешао из {2} у {3}
 DocType: Sales Invoice,Get Advances Received,Гет аванси
 DocType: Email Digest,Add/Remove Recipients,Адд / Ремове прималаца
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Сделка не допускается в отношении остановил производство ордена {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Да бисте подесили ову фискалну годину , као подразумевајуће , кликните на "" Сет ас Дефаулт '"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Придружити
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Придружити
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Мањак Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
 DocType: Employee Loan,Repay from Salary,Отплатити од плате
 DocType: Leave Application,LAP/,ЛАП /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Тражећи исплату од {0} {1} за износ {2}
@@ -4513,7 +4602,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Продаја Наручите артикла
 DocType: Salary Slip,Payment Days,Дана исплате
 DocType: Patient,Dormant,скривен
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Складишта са дететом чворова не могу се претворити у ЛЕДГЕР
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Складишта са дететом чворова не могу се претворити у ЛЕДГЕР
 DocType: BOM,Manage cost of operations,Управљање трошкове пословања
 DocType: Accounts Settings,Stale Days,Стале Даис
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Када неки од селектираних трансакција &quot;Послао&quot;, е поп-уп аутоматски отворила послати емаил на вези &quot;Контакт&quot; у тој трансакцији, са трансакцијом као прилог. Корисник може или не може да пошаље поруку."
@@ -4527,10 +4616,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Серийный номер {0} уже получил
 ,Requested Items To Be Transferred,Тражени Артикли ће се пренети
 DocType: Expense Claim,Vehicle Log,возило се
-DocType: Purchase Invoice,Recurring Id,Понављајући Ид
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Присуство грознице (температура&gt; 38,5 ° Ц / 101,3 ° Ф или трајна темп&gt; 38 ° Ц / 100,4 ° Ф)"
 DocType: Customer,Sales Team Details,Продајни тим Детаљи
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Обриши трајно?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Обриши трајно?
 DocType: Expense Claim,Total Claimed Amount,Укупан износ полаже
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Потенцијалне могућности за продају.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Неважећи {0}
@@ -4540,7 +4628,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Робне куце
 ,Item Delivery Date,Датум испоруке артикла
 DocType: Warehouse,PIN,ПИН-
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Подесите школа у ЕРПНект
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Подесите школа у ЕРПНект
 DocType: Sales Invoice,Base Change Amount (Company Currency),База Промена Износ (Фирма валута)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Нет учетной записи для следующих складов
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Први Сачувајте документ.
@@ -4552,13 +4640,12 @@
 DocType: Task,Is Milestone,Да ли је МОТО
 DocType: Daily Work Summary,Email Sent To,Емаил Сент То
 DocType: Budget,Warn,Упозорити
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Да ли сте сигурни да желите да се одјавите?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Било који други примедбе, напоменути напор који треба да иде у евиденцији."
 DocType: BOM,Manufacturing User,Производња Корисник
 DocType: Purchase Invoice,Raw Materials Supplied,Сировине комплету
-DocType: Purchase Invoice,Recurring Print Format,Поновни Принт Формат
 DocType: C-Form,Series,серија
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Валута ценовника {0} мора бити {1} или {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Додај производе
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Валута ценовника {0} мора бити {1} или {2}
 DocType: Appraisal,Appraisal Template,Процена Шаблон
 DocType: Item Group,Item Classification,Итем Класификација
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Менаџер за пословни развој
@@ -4572,7 +4659,7 @@
 DocType: Item Attribute Value,Attribute Value,Вредност атрибута
 ,Itemwise Recommended Reorder Level,Препоручени ниво Итемвисе Реордер
 DocType: Salary Detail,Salary Detail,плата Детаљ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Изаберите {0} први
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Изаберите {0} први
 DocType: Appointment Type,Physician,Лекар
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Батцх {0} од тачке {1} је истекао.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Консултације
@@ -4583,7 +4670,7 @@
 DocType: Salary Detail,Default Amount,Уобичајено Износ
 DocType: Lab Test Template,Descriptive,Дескриптивно
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Складиште није пронађен у систему
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Овај месец је Преглед
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Овај месец је Преглед
 DocType: Quality Inspection Reading,Quality Inspection Reading,Провера квалитета Рединг
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,"""Замрзни акције старије од"" треба да буде мање од %d дана."
 DocType: Tax Rule,Purchase Tax Template,Порез на промет Темплате
@@ -4606,12 +4693,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Обука Евентс / Ресултс
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Акумулирана амортизација као на
 DocType: Sales Invoice,C-Form Applicable,Ц-примењује
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Операција време мора бити већи од 0 за операцију {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Операција време мора бити већи од 0 за операцију {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Складиште је обавезно
 DocType: Supplier,Address and Contacts,Адреса и контакти
 DocType: UOM Conversion Detail,UOM Conversion Detail,УОМ Конверзија Детаљ
 DocType: Program,Program Abbreviation,програм држава
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Производња поредак не може бити подигнута против тачка Темплате
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Производња поредак не може бити подигнута против тачка Темплате
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Оптужбе се ажурирају у рачуном против сваке ставке
 DocType: Warranty Claim,Resolved By,Решен
 DocType: Bank Guarantee,Start Date,Датум почетка
@@ -4637,27 +4724,28 @@
 DocType: Employee,Educational Qualification,Образовни Квалификације
 DocType: Workstation,Operating Costs,Оперативни трошкови
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Акција ако целокупна месечна буџет Екцеедед
-DocType: Purchase Invoice,Submit on creation,Пошаљи на стварању
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Валута за {0} мора бити {1}
+DocType: Subscription,Submit on creation,Пошаљи на стварању
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Валута за {0} мора бити {1}
 DocType: Asset,Disposal Date,odlaganje Датум
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Емаилс ће бити послат свим активних радника компаније у датом сат времена, ако немају одмора. Сажетак одговора ће бити послат у поноћ."
 DocType: Employee Leave Approver,Employee Leave Approver,Запослени одсуство одобраватељ
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Ров {0}: Унос Прераспоређивање већ постоји у овој магацин {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Не могу прогласити као изгубљен , јер Понуда је учињен ."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,обука Контакт
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Ров {0}: Унос Прераспоређивање већ постоји у овој магацин {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Не могу прогласити као изгубљен , јер Понуда је учињен ."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,обука Контакт
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Производственный заказ {0} должны быть представлены
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Критеријуми за оцењивање добављача
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},"Пожалуйста, выберите дату начала и дату окончания Пункт {0}"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Наравно обавезна је у реду {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,До данас не може бити раније од датума
 DocType: Supplier Quotation Item,Prevdoc DocType,Превдоц ДОЦТИПЕ
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Додај / измени Прицес
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Додај / измени Прицес
 DocType: Batch,Parent Batch,родитељ Серија
 DocType: Batch,Parent Batch,родитељ Серија
 DocType: Cheque Print Template,Cheque Print Template,Чек Штампа Шаблон
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Дијаграм трошкова центара
 DocType: Lab Test Template,Sample Collection,Сампле Цоллецтион
 ,Requested Items To Be Ordered,Тражени ставке за Ж
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Ми Ордерс
 DocType: Price List,Price List Name,Ценовник Име
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Дневни Рад Преглед за {0}
 DocType: Employee Loan,Totals,Укупно
@@ -4676,12 +4764,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} јединице {1} потребна {2} на {3} {4} за {5} довршите ову трансакцију.
 DocType: Fee Schedule,Student Category,студент Категорија
 DocType: Announcement,Student,студент
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Название подразделения (департамент) хозяин.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Название подразделения (департамент) хозяин.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Идите у Собе
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Пожалуйста, введите сообщение перед отправкой"
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,ДУПЛИЦАТЕ за добављача
 DocType: Email Digest,Pending Quotations,у току Куотатионс
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Поинт-оф-Сале Профиле
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Поинт-оф-Сале Профиле
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Конфигурације лабораторијског теста.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,необеспеченных кредитов
 DocType: Cost Center,Cost Center Name,Трошкови Име центар
@@ -4691,6 +4779,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Укупно Плаћени Амт
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Порука већи од 160 карактера ће бити подељен на више Упис
 DocType: Purchase Receipt Item,Received and Accepted,Примио и прихватио
+DocType: Hub Settings,Company and Seller Profile,Профил фирме и продавца
 ,GST Itemised Sales Register,ПДВ ставкама продаје Регистрација
 ,Serial No Service Contract Expiry,Серијски број услуга Уговор Истек
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Ви не можете кредитних и дебитних исти налог у исто време
@@ -4700,10 +4789,11 @@
 DocType: Item,Variant Based On,Варијанту засновану на
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Всего Weightage назначен должна быть 100% . Это {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Ваши Добављачи
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Молим вас исправите
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Не можете поставити као Лост као Продаја Наручите је направљен .
 DocType: Request for Quotation Item,Supplier Part No,Добављач Део Бр
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',не могу одбити када категорија је за &quot;процену вредности&quot; или &quot;Ваулатион и Тотал &#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Primio od
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Primio od
 DocType: Lead,Converted,Претворено
 DocType: Item,Has Serial No,Има Серијски број
 DocType: Employee,Date of Issue,Датум издавања
@@ -4711,7 +4801,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Према куповина Сеттингс ако објекат Рециепт Обавезно == &#39;ДА&#39;, а затим за стварање фактури, корисник треба да креира Куповина потврду за прву ставку за {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Ред # {0}: Сет добављача за ставку {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Ред {0}: Сати вредност мора бити већа од нуле.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Сајт Слика {0} везани са тачком {1} не могу наћи
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Сајт Слика {0} везани са тачком {1} не могу наћи
 DocType: Issue,Content Type,Тип садржаја
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,рачунар
 DocType: Item,List this Item in multiple groups on the website.,Наведи ову ставку у више група на сајту.
@@ -4722,14 +4812,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Гет неусаглашених уносе
 DocType: Payment Reconciliation,From Invoice Date,Од Датум рачуна
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Немате дозволу за слање
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,"валута наплате мора бити једнака валути или странка рачуна валути било једног, било дефаулт цомапани је"
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,"валута наплате мора бити једнака валути или странка рачуна валути било једног, било дефаулт цомапани је"
 DocType: Healthcare Settings,Laboratory Settings,Лабораторијске поставке
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Оставите уновчења
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Шта он ради ?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Да Варехоусе
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Све Студент Пријемни
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Шта он ради ?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Да Варехоусе
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Све Студент Пријемни
 ,Average Commission Rate,Просечан курс Комисија
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,"""Има серијски број"" не може бити ""Да"" за артикл који није на залихама"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,"""Има серијски број"" не може бити ""Да"" за артикл који није на залихама"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Изаберите Статус
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Гледалаца не може бити означен за будуће датуме
 DocType: Pricing Rule,Pricing Rule Help,Правилник о ценама Помоћ
@@ -4747,41 +4837,41 @@
 DocType: Item,Customer Code,Кориснички Код
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Подсетник за рођендан за {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дана Од Последња Наручи
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Дебитна на рачун мора да буде биланса стања
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Дебитна на рачун мора да буде биланса стања
 DocType: Buying Settings,Naming Series,Именовање Сериес
 DocType: Leave Block List,Leave Block List Name,Оставите Име листу блокираних
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Осигурање Датум почетка треба да буде мања од осигурања Енд дате
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Молимо вас да поставите систем именовања инструктора у школи&gt; Поставке школе
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,фондовые активы
 DocType: Timesheet,Production Detail,proizvodnja Детаљ
+DocType: Restaurant,Active Menu,Активни мени
 DocType: Target Detail,Target Qty,Циљна Кол
 DocType: Shopping Cart Settings,Checkout Settings,Плаћање подешавања
 DocType: Attendance,Present,Представљање
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Доставка Примечание {0} не должны быть представлены
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Доставка Примечание {0} не должны быть представлены
 DocType: Notification Control,Sales Invoice Message,Продаја Рачун Порука
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Затварање рачуна {0} мора бити типа одговорности / Екуити
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Плата Слип запосленог {0} већ креиран за време стања {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Плата Слип запосленог {0} већ креиран за време стања {1}
 DocType: Vehicle Log,Odometer,мерач за пређени пут
 DocType: Sales Order Item,Ordered Qty,Ж Кол
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Ставка {0} је онемогућен
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Ставка {0} је онемогућен
 DocType: Stock Settings,Stock Frozen Upto,Берза Фрозен Упто
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,БОМ не садржи никакву стоцк итем
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Пројекат активност / задатак.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,БОМ не садржи никакву стоцк итем
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Пројекат активност / задатак.
 DocType: Vehicle Log,Refuelling Details,Рефуеллинг Детаљи
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Генериши стаје ПЛАТА
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Куповина се мора проверити, ако је применљиво Јер је изабрана као {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Скидка должна быть меньше 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Последња куповина стопа није пронађен
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Отпис Износ (Фирма валута)
 DocType: Sales Invoice Timesheet,Billing Hours,обрачун сат
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,Уобичајено БОМ за {0} није пронађен
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Ред # {0}: Молим вас сет количину преусмеравање
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Уобичајено БОМ за {0} није пронађен
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Ред # {0}: Молим вас сет количину преусмеравање
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Додирните ставке да их додати
 DocType: Fees,Program Enrollment,програм Упис
 DocType: Landed Cost Voucher,Landed Cost Voucher,Слетео Трошкови Ваучер
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Пожалуйста, установите {0}"
-DocType: Purchase Invoice,Repeat on Day of Month,Поновите на дан у месецу
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} неактиван Студент
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} неактиван Студент
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} неактиван Студент
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} неактиван Студент
 DocType: Employee,Health Details,Здравље Детаљи
 DocType: Offer Letter,Offer Letter Terms,Понуда Леттер Услови
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Да бисте направили захтев за плаћање је потребан референтни документ
@@ -4790,7 +4880,6 @@
 DocType: Employee External Work History,Salary,Плата
 DocType: Serial No,Delivery Document Type,Испорука Доцумент Типе
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Доставе све рачуне плата за горе наведене изабраним критеријумима
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} артикала синхронизовано
 DocType: Sales Order,Partly Delivered,Делимично Испоручено
 DocType: Email Digest,Receivables,Потраживања
 DocType: Lead Source,Lead Source,Олово Соурце
@@ -4812,9 +4901,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Старење Опсег 2
 DocType: SG Creation Tool Course,Max Strength,мак Снага
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,БОМ заменио
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Изаберите ставке на основу датума испоруке
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Изаберите ставке на основу датума испоруке
 ,Sales Analytics,Продаја Аналитика
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Доступно {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Доступно {0}
 ,Prospects Engaged But Not Converted,Изгледи ангажовани али не конвертују
 ,Prospects Engaged But Not Converted,Изгледи ангажовани али не конвертују
 DocType: Manufacturing Settings,Manufacturing Settings,Производња Подешавања
@@ -4822,10 +4911,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Гуардиан1 Мобилни број
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,"Пожалуйста, введите валюту по умолчанию в компании Master"
 DocType: Stock Entry Detail,Stock Entry Detail,Берза Унос Детаљ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Дневни Подсетник
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Дневни Подсетник
 DocType: Products Settings,Home Page is Products,Почетна страница је Производи
 ,Asset Depreciation Ledger,Средство Амортизација књига
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Сукоби Пореска Правило са {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Сукоби Пореска Правило са {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Нови налог Име
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Сировине комплету Цост
 DocType: Selling Settings,Settings for Selling Module,Подешавања за Селлинг Модуле
@@ -4839,8 +4928,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Пункт {0} должен быть запас товара
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Уобичајено Ворк Ин Прогресс Варехоусе
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Настройки по умолчанию для бухгалтерских операций .
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Молимо да подесите систем именовања запослених у људским ресурсима&gt; ХР Сеттингс
 DocType: Maintenance Visit,MV,СН
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Очекивани датум не може бити пре Материјал Захтев Датум
+DocType: Restaurant,Default Tax Template,Подразумевани образац пореза
 DocType: Fees,Student Details,Студент Детаилс
 DocType: Purchase Invoice Item,Stock Qty,стоцк ком
 DocType: Employee Loan,Repayment Period in Months,Период отплате у месецима
@@ -4858,8 +4948,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Иди на ставке
 DocType: Sales Partner,Partner Type,Партнер Тип
 DocType: Purchase Taxes and Charges,Actual,Стваран
+DocType: Restaurant Menu,Restaurant Manager,Ресторан менаџер
 DocType: Authorization Rule,Customerwise Discount,Цустомервисе Попуст
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Тимесхеет за послове.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Тимесхеет за послове.
 DocType: Purchase Invoice,Against Expense Account,Против трошковником налог
 DocType: Production Order,Production Order,Продуцтион Ордер
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Установка Примечание {0} уже представлен
@@ -4867,7 +4958,6 @@
 DocType: Quotation Item,Against Docname,Против Доцнаме
 DocType: SMS Center,All Employee (Active),Све Запослени (активна)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Погледај Сада
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Изаберите период када ће рачун бити аутоматски генерисан
 DocType: BOM,Raw Material Cost,Сировина Трошак
 DocType: Item Reorder,Re-Order Level,Поново би Левел
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Унесите ставке и планирани Кол за које желите да подигне наређења производне или преузети сировине за анализу.
@@ -4880,24 +4970,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Тип отчета является обязательным
 DocType: Item,Serial Number Series,Серијски број серија
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Склад является обязательным для складе Пункт {0} в строке {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Додај програме
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Малопродаја и велепродаја
 DocType: Issue,First Responded On,Прво одговорила
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Оглас крст од предмета на више група
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фискална година Датум почетка и фискалну годину Датум завршетка су већ постављена у фискалној {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Цлеаранце Датум ажуриран
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,подела Серија
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,подела Серија
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,подела Серија
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,подела Серија
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Успешно помирили
 DocType: Request for Quotation Supplier,Download PDF,довнлоад ПДФ
 DocType: Production Order,Planned End Date,Планирани Датум Крај
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Молимо унесите датум распореда
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Где ставке су ускладиштене.
 DocType: Request for Quotation,Supplier Detail,добављач Детаљ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Грешка у формули или стања: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Грешка у формули или стања: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Фактурисани износ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Тегови критеријума морају додати до 100%
 DocType: Attendance,Attendance,Похађање
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,залихама
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,залихама
 DocType: BOM,Materials,Материјали
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ако се не проверава, листа ће морати да се дода сваком одељењу где има да се примењује."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Изворни и циљни Магацин не могу бити исти
@@ -4915,6 +5005,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,Он Нет Укупно
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Вредност за атрибут {0} мора бити у распону од {1} {2} у корацима од {3} за тачком {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,"Целевая склад в строке {0} должно быть таким же , как производственного заказа"
+DocType: Restaurant Reservation,Waitlisted,Ваитлистед
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Валута не може да се промени након што уносе користите неки други валуте
 DocType: Vehicle Service,Clutch Plate,цлутцх плате
 DocType: Company,Round Off Account,Заокружити рачун
@@ -4931,7 +5022,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Продаја нових особа Име
 DocType: Packing Slip,Gross Weight UOM,Бруто тежина УОМ
 DocType: Delivery Note Item,Against Sales Invoice,Против продаје фактура
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Молимо унесите серијске бројеве за серијализованом ставку
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Молимо унесите серијске бројеве за серијализованом ставку
 DocType: Bin,Reserved Qty for Production,Резервисан Кти за производњу
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Остави неконтролисано ако не желите да размотри серије правећи курса на бази групе.
 DocType: Asset,Frequency of Depreciation (Months),Учесталост амортизације (месеци)
@@ -4942,7 +5033,7 @@
 DocType: Lab Test,Test Group,Тест група
 DocType: Payment Reconciliation,Receivable / Payable Account,Примања / обавезе налог
 DocType: Delivery Note Item,Against Sales Order Item,Против продаје Ордер тачком
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Наведите Вредност атрибута за атрибут {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Наведите Вредност атрибута за атрибут {0}
 DocType: Item,Default Warehouse,Уобичајено Магацин
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Буџет не може бити додељен против групе рачуна {0}
 DocType: Healthcare Settings,Patient Registration,Регистрација пацијената
@@ -4972,6 +5063,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Продаја Особа
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Буџет и трошкова центар
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Вишеструки начин плаћања није дозвољен
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,за
 ,Appointment Analytics,Именовање аналитике
 DocType: Vehicle Service,Half Yearly,Пола Годишњи
 DocType: Lead,Blog Subscriber,Блог Претплатник
@@ -4990,7 +5082,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,куот Точка
 ,BOM Stock Report,БОМ Сток Извештај
 DocType: Stock Reconciliation Item,Quantity Difference,Количина Разлика
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Обрада платног списка
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Обрада платног списка
 DocType: Opportunity Item,Basic Rate,Основна стопа
 DocType: GL Entry,Credit Amount,Износ кредита
 DocType: Cheque Print Template,Signatory Position,potpisnik Позиција
@@ -5004,12 +5096,12 @@
 DocType: Tax Rule,Tax Rule,Пореска Правило
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Одржавајте исту стопу Широм продајног циклуса
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,План време дневнике ван Воркстатион радног времена.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Купци у редовима
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Др {0} нема распоред лекара. Додајте га у мајстора лекара
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Купци у редовима
 DocType: Student,Nationality,националност
 ,Items To Be Requested,Артикли бити затражено
-DocType: Purchase Order,Get Last Purchase Rate,Гет Ласт Рате Куповина
 DocType: Company,Company Info,Подаци фирме
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Изабрати или додати новог купца
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Изабрати или додати новог купца
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Трошка је обавезан да резервишете трошковима захтев
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Применение средств ( активов )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ово је засновано на похађања овог запосленог
@@ -5017,6 +5109,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Текући рачуни
 DocType: Fiscal Year,Year Start Date,Датум почетка године
 DocType: Attendance,Employee Name,Запослени Име
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Ресторан за унос ставке
 DocType: Sales Invoice,Rounded Total (Company Currency),Заобљени Укупно (Друштво валута)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Не могу да цоверт групи јер је изабран Тип рачуна.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} был изменен. Обновите .
@@ -5027,6 +5120,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Примања запослених
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
 DocType: Production Order,Manufactured Qty,Произведено Кол
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Креирана фактура
 DocType: Purchase Receipt Item,Accepted Quantity,Прихваћено Количина
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Молимо подесите подразумевани Хамптон Лист за запосленог {0} или Фирма {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} не постоји
@@ -5036,18 +5130,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Не {0}: Износ не може бити већи од очекивању износ од трошковником потраживања {1}. У очекивању Износ је {2}
 DocType: Maintenance Schedule,Schedule,Распоред
 DocType: Account,Parent Account,Родитељ рачуна
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Доступно
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Доступно
 DocType: Quality Inspection Reading,Reading 3,Читање 3
 ,Hub,Средиште
 DocType: GL Entry,Voucher Type,Тип ваучера
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Ценовник није пронађен или онемогућен
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Ценовник није пронађен или онемогућен
 DocType: Lab Test,Approved,Одобрено
 DocType: Pricing Rule,Price,цена
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как "" левые"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как "" левые"""
+DocType: Hub Settings,Last Sync On,Ласт Синц Он
 DocType: Guardian,Guardian,старатељ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Оценка {0} создан Требуются {1} в указанный диапазон дат
 DocType: Employee,Education,образовање
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,дел
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,дел
 DocType: Selling Settings,Campaign Naming By,Кампания Именование По
 DocType: Employee,Current Address Is,Тренутна Адреса Је
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Месечна продајна цена (
@@ -5062,7 +5157,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Шифра курса:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Унесите налог Екпенсе
 DocType: Account,Stock,Залиха
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ред # {0}: Референца Тип документа мора бити један од нарудзбенице, фактури или Јоурнал Ентри"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ред # {0}: Референца Тип документа мора бити један од нарудзбенице, фактури или Јоурнал Ентри"
 DocType: Employee,Current Address,Тренутна адреса
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ако ставка је варијанта неким другим онда опис, слике, цене, порези итд ће бити постављен из шаблона, осим ако изричито наведено"
 DocType: Serial No,Purchase / Manufacture Details,Куповина / Производња Детаљи
@@ -5093,7 +5188,7 @@
 DocType: Hub Settings,Hub Settings,Хуб Подешавања
 DocType: Project,Gross Margin %,Бруто маржа%
 DocType: BOM,With Operations,Са операције
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Рачуноводствене ставке су већ учињени у валути {0} за компанију {1}. Изаберите обавеза или примања рачун са валутом {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Рачуноводствене ставке су већ учињени у валути {0} за компанију {1}. Изаберите обавеза или примања рачун са валутом {0}.
 DocType: Asset,Is Existing Asset,Да ли је постојеће имовине
 DocType: Salary Detail,Statistical Component,Статистички Компонента
 DocType: Salary Detail,Statistical Component,Статистички Компонента
@@ -5102,13 +5197,14 @@
 DocType: BOM Operation,BOM Operation,БОМ Операција
 DocType: Purchase Taxes and Charges,On Previous Row Amount,На претходни ред Износ
 DocType: Student,Home Address,Кућна адреса
+DocType: Item,Has Expiry Date,Има датум истека
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Поставке варијанте ставке.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,трансфер имовине
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,трансфер имовине
 DocType: POS Profile,POS Profile,ПОС Профил
 DocType: Training Event,Event Name,Име догађаја
 DocType: Physician,Phone (Office),Телефон (Оффице)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,улаз
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Пријемни за {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,улаз
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Пријемни за {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Сезонски за постављање буџети, мете итд"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Име променљиве
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Ставка {0} је шаблон, изаберите једну од својих варијанти"
@@ -5117,7 +5213,7 @@
 DocType: Assessment Plan,Room,соба
 DocType: Purchase Order,Advance Paid,Адванце Паид
 DocType: Item,Item Tax,Ставка Пореска
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Материјал за добављача
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Материјал за добављача
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Акцизе фактура
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Тресхолд {0}% појављује више пута
 DocType: Expense Claim,Employees Email Id,Запослени Емаил ИД
@@ -5128,32 +5224,30 @@
 DocType: Program,Program Name,Назив програма
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Размислите пореза или оптужба за
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Стварна ком је обавезна
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} тренутно има {1} Сцорецард става, а наруџбине за овај добављач треба издати опрезно."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} тренутно има {1} Сцорецард става, а наруџбине за овај добављач треба издати опрезно."
 DocType: Employee Loan,Loan Type,Тип кредита
 DocType: Scheduling Tool,Scheduling Tool,Заказивање Алат
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,кредитна картица
 DocType: BOM,Item to be manufactured or repacked,Ставка да буду произведени или препакује
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Настройки по умолчанию для биржевых операций .
-DocType: Purchase Invoice,Next Date,Следећи датум
 DocType: Employee Education,Major/Optional Subjects,Мајор / Опциони предмети
 DocType: Sales Invoice Item,Drop Ship,Дроп Схип
+DocType: Hub Settings,Suspended,Суспендирано
 DocType: Training Event,Attendees,Присутни
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Овде можете одржавати детаље породице као име и окупације родитеља, брачног друга и деце"
 DocType: Academic Term,Term End Date,Термин Датум завршетка
-DocType: Hub Settings,Seller Name,Продавац Име
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Порези и накнаде одузима (Друштво валута)
 DocType: Item Group,General Settings,Генерал Сеттингс
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Од Валуте и до валута не може да буде иста
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Адд Инструцторс
 DocType: Stock Entry,Repack,Препаковати
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,"Вы должны Сохраните форму , прежде чем приступить"
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Прво изаберите Компанију
 DocType: Item Attribute,Numeric Values,Нумеричке вредности
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Прикрепите логотип
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,stock Нивои
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,stock Нивои
 DocType: Customer,Commission Rate,Комисија Оцени
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Направљене {0} карте карте за {1} између:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Маке Вариант
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Маке Вариант
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Блок оставите апликације по одељењу.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Тип уплата мора бити један од Примите, Паи и интерни трансфер"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,аналитика
@@ -5168,11 +5262,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Капитал Сток
 DocType: Shopping Cart Settings,Show Public Attachments,Схов Публиц Прилози
 DocType: Packing Slip,Package Weight Details,Пакет Тежина Детаљи
+DocType: Restaurant Reservation,Reservation Time,Време резервације
 DocType: Payment Gateway Account,Payment Gateway Account,Паимент Гатеваи налог
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Након завршетка уплате преусмерава корисника на одабране стране.
 DocType: Company,Existing Company,postojeća Фирма
 DocType: Healthcare Settings,Result Emailed,Резултат послат
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","Порез Категорија је промењено у &quot;Тотал&quot;, јер су сви предмети су не залихама"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Шифра производа&gt; Група производа&gt; Бренд
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Изаберите ЦСВ датотеку
 DocType: Student Leave Application,Mark as Present,Марк на поклон
 DocType: Supplier Scorecard,Indicator Color,Боја индикатора
@@ -5197,11 +5293,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Маке Студент Батцх
 DocType: Fee Schedule,FRQ.,ФРК.
 DocType: Leave Type,Is Carry Forward,Је напред Царри
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Се ставке из БОМ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Се ставке из БОМ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Олово Дани Тиме
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Ред # {0}: Постављање Дате мора бити исти као и датуму куповине {1} из средстава {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Проверите ово ако је ученик борави у Института Хостел.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Молимо унесите продајних налога у горњој табели
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Молимо унесите продајних налога у горњој табели
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Не поднесе плата Слипс
 ,Stock Summary,стоцк Преглед
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Пребаци средство из једног складишта у друго
@@ -5217,5 +5313,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Ров {0}: Дебит Унос се не може повезати са {1}
 DocType: Journal Entry,Subscription Section,Субсцриптион Сецтион
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Счет {0} не существует
+DocType: Training Event,Training Program,Програм обуке
 DocType: Account,Cash,Готовина
 DocType: Employee,Short biography for website and other publications.,Кратка биографија за сајт и других публикација.
diff --git a/erpnext/translations/sv.csv b/erpnext/translations/sv.csv
index e7688e3..74e3bcf 100644
--- a/erpnext/translations/sv.csv
+++ b/erpnext/translations/sv.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Lön Läge
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Registrera
 DocType: Patient,Divorced,Skild
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Produkter redan synkroniserade
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Tillåt Punkt som ska läggas till flera gånger i en transaktion
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Avbryt Material {0} innan du avbryter denna garantianspråk
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Konsumentprodukter
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Ledighetsgodkännare
 DocType: Sales Partner,Dealer,Återförsäljare
 DocType: Consultation,Investigations,undersökningar
+DocType: Restaurant Order Entry,Click Enter To Add,Klicka på Enter för att lägga till
 DocType: Employee,Rented,Hyrda
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Tillämplig för Användare
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Stoppad produktionsorder kan inte återkallas, unstop det första att avbryta"
 DocType: Vehicle Service,Mileage,Miltal
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Vill du verkligen att skrota denna tillgång?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Vill du verkligen att skrota denna tillgång?
 DocType: Drug Prescription,Update Schedule,Uppdateringsschema
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Välj Standard Leverantör
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Valuta krävs för prislista {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Kontrollera tillgänglighet
 DocType: Job Applicant,Job Applicant,Arbetssökande
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Detta grundar sig på transaktioner mot denna leverantör. Se tidslinje nedan för mer information
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Inga fler resultat.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Rättslig
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Verklig typskatt kan inte ingå i produktomsättning i rad {0}
 DocType: Bank Guarantee,Customer,Kunden
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Växelkurs måste vara samma som {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Kundnamn
 DocType: Vehicle,Natural Gas,Naturgas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Bankkontot kan inte namnges som {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Bankkontot kan inte namnges som {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Huvudtyper (eller grupper) mot vilka bokföringsposter görs och balanser upprätthålls.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Utstående för {0} kan inte vara mindre än noll ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Det finns inga inlämnade löneskalor att bearbeta.
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 minuter
 DocType: Leave Type,Leave Type Name,Ledighetstyp namn
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Visa öppna
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Det är nödvändigt att vidta denna åtgärd idag i dag för ovan nämnda återkommande
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Serie uppdaterats
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Checka ut
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural Journal Entry Inlagd
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Inköpsorder Artiklar att ta emot
 DocType: SMS Center,All Supplier Contact,Alla Leverantörskontakter
 DocType: Support Settings,Support Settings,support Inställningar
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Förväntad Slutdatum kan inte vara mindre än förväntat startdatum
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Förväntad Slutdatum kan inte vara mindre än förväntat startdatum
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Rad # {0}: Pris måste vara samma som {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Ny Ledighets ansökningan
 ,Batch Item Expiry Status,Batch Punkt Utgångs Status
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Bankväxel
 DocType: Mode of Payment Account,Mode of Payment Account,Betalningssätt konto
 DocType: Consultation,Consultation,Samråd
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Försäljning och Returer
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Visar varianter
 DocType: Academic Term,Academic Term,Akademisk termin
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Material
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sjukvård
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Försenad betalning (dagar)
 DocType: Lab Prescription,Lab Prescription,Lab Prescription
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Sortera efter pris
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,tjänsten Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} är redan refererad i försäljningsfaktura: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Faktura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} är redan refererad i försäljningsfaktura: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodicitet
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Räkenskapsårets {0} krävs
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Försvar
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Rad # {0}:
 DocType: Timesheet,Total Costing Amount,Totala Kalkyl Mängd
 DocType: Delivery Note,Vehicle No,Fordons nr
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Välj Prislista
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Välj Prislista
 DocType: Accounts Settings,Currency Exchange Settings,Valutaväxlingsinställningar
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Rad # {0}: Betalning dokument krävs för att slutföra trasaction
 DocType: Production Order Operation,Work In Progress,Pågående Arbete
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Välj datum
 DocType: Employee,Holiday List,Holiday Lista
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Vänligen installera Instruktör Naming System in School&gt; Skolan Inställningar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Revisor
+DocType: Hub Settings,Selling Price List,Försäljningsprislista
 DocType: Patient,Tobacco Current Use,Tobaks nuvarande användning
 DocType: Cost Center,Stock User,Lager Användar
 DocType: Company,Phone No,Telefonnr
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Kurs Scheman skapas:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Ny {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Ny {0}: # {1}
 ,Sales Partners Commission,Försäljning Partners kommissionen
 DocType: Purchase Invoice,Rounding Adjustment,Avrundningsjustering
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Förkortning kan inte ha mer än 5 tecken
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Överordnat Detalj doknamn
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referens: {0}, Artikelnummer: {1} och Kund: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kg
-DocType: Student Log,Log,Logga
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Öppning för ett jobb.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Resultat skickat
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Resultat skickat
 DocType: Item Attribute,Increment,Inkrement
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Tidsrymd
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Välj Warehouse ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Gift
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Ej tillåtet för {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Få objekt från
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Stock kan inte uppdateras mot följesedel {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Stock kan inte uppdateras mot följesedel {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkten {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Inga föremål listade
 DocType: Payment Reconciliation,Reconcile,Avstämma
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionsfonder
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Nästa avskrivning Datum kan inte vara före Inköpsdatum
 DocType: Consultation,Consultation Date,Samrådsdagen
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Produktlista och upptäckt för ERPNext-användare
 DocType: SMS Center,All Sales Person,Alla försäljningspersonal
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Månatlig Distribution ** hjälper du distribuerar budgeten / Mål över månader om du har säsongs i din verksamhet.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Inte artiklar hittade
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Lönestruktur saknas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Inte artiklar hittade
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Lönestruktur saknas
 DocType: Lead,Person Name,Namn
 DocType: Sales Invoice Item,Sales Invoice Item,Fakturan Punkt
 DocType: Account,Credit,Kredit
 DocType: POS Profile,Write Off Cost Center,Avskrivning kostnadsställe
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",t.ex. &quot;Primary School&quot; eller &quot;universitet&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",t.ex. &quot;Primary School&quot; eller &quot;universitet&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,lagerrapporter
 DocType: Warehouse,Warehouse Detail,Lagerdetalj
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Kreditgräns har överskridits för kund {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Termen Slutdatum kan inte vara senare än slutet av året Datum för läsåret som termen är kopplad (läsåret {}). Rätta datum och försök igen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Är Fast Asset&quot; kan inte vara okontrollerat, som Asset rekord existerar mot objektet"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Är Fast Asset&quot; kan inte vara okontrollerat, som Asset rekord existerar mot objektet"
 DocType: Vehicle Service,Brake Oil,bromsolja
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kund&gt; Kundgrupp&gt; Territorium
 DocType: Tax Rule,Tax Type,Skatte Typ
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Skattepliktiga belopp
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Du har inte behörighet att lägga till eller uppdatera poster före {0}
 DocType: BOM,Item Image (if not slideshow),Produktbild (om inte bildspel)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,En kund finns med samma namn
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Timmar / 60) * Faktisk produktionstid
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Referensdokumenttyp måste vara ett av kostnadskrav eller journalinmatning
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Välj BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Referensdokumenttyp måste vara ett av kostnadskrav eller journalinmatning
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Välj BOM
 DocType: SMS Log,SMS Log,SMS-logg
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kostnad levererat gods
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Semester på {0} är inte mellan Från datum och Till datum
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,Employee Loan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Aktivitets Logg:
 DocType: Fee Schedule,Send Payment Request Email,Skicka betalningsförfrågan via e-post
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Objektet existerar inte {0} i systemet eller har löpt ut
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Objektet existerar inte {0} i systemet eller har löpt ut
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Fastighet
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Kontoutdrag
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Läkemedel
@@ -210,18 +213,23 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Import logg
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Dra Material Begär typ Tillverkning baserat på ovanstående kriterier
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Framgångsrikt oregistrerad.
 DocType: Training Result Employee,Grade,Kvalitet
+DocType: Restaurant Table,No of Seats,Antal platser
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","För att lägga till dynamiskt ämne, använd jinja-taggar som <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Levereras av Supplier
 DocType: SMS Center,All Contact,Alla Kontakter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Produktionsorder redan skapats för alla objekt med BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Produktionsorder redan skapats för alla objekt med BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Årslön
 DocType: Daily Work Summary,Daily Work Summary,Dagliga Work Sammandrag
 DocType: Period Closing Voucher,Closing Fiscal Year,Stänger Räkenskapsårets
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} är fryst
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Välj befintligt företag för att skapa konto
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} är fryst
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Välj befintligt företag för att skapa konto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Stock Kostnader
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Välj Target Warehouse
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Välj Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Välj Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Välj Target Warehouse
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Ange Preferred Kontakt Email
 DocType: Program Enrollment,School Bus,Skolbuss
 DocType: Journal Entry,Contra Entry,Konteringsanteckning
@@ -238,9 +246,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Hämta mallen, fyll lämpliga uppgifter och bifoga den modifierade filen. Alla datum och anställdas kombinationer i den valda perioden kommer i mallen, med befintliga närvaroutdrag"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Produkt {0} är inte aktiv eller uttjänta har nåtts
+DocType: Student Admission Program,Minimum Age,Lägsta ålder
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Exempel: Grundläggande matematik
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om du vill inkludera skatt i rad {0} i punkt hastighet, skatter i rader {1} måste också inkluderas"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Inställningar för HR-modul
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Inställningar för HR-modul
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Ändra Mängd
 DocType: BOM Update Tool,New BOM,Ny BOM
@@ -250,7 +259,7 @@
 DocType: Lead,Request Type,Typ av förfrågan
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,göra Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Sändning
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Lägg till rum
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Inställningsläge för POS (Online / Offline)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Exekvering
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detaljer om de åtgärder som genomförs.
 DocType: Serial No,Maintenance Status,Underhåll Status
@@ -273,6 +282,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prislista måste gälla för att köpa eller sälja
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Installationsdatum kan inte vara före leveransdatum för punkt {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Rabatt på Prislista Andel (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Biokemi
 DocType: Offer Letter,Select Terms and Conditions,Välj Villkor
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,ut Värde
 DocType: Production Planning Tool,Sales Orders,Kundorder
@@ -307,15 +317,15 @@
 DocType: Sales Partner,Reseller,Återförsäljare
 DocType: Codification Table,Medical Code,Medicinsk kod
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Om markerad, kommer att innehålla icke-lager i materialet begäran."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Ange Företag
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Ange Företag
 DocType: Delivery Note Item,Against Sales Invoice Item,Mot fakturaprodukt
 ,Production Orders in Progress,Aktiva Produktionsordrar
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Nettokassaflöde från finansiering
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","Localstorage är full, inte spara"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","Localstorage är full, inte spara"
 DocType: Lead,Address & Contact,Adress och kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Lägg oanvända blad från tidigare tilldelningar
 DocType: Sales Partner,Partner website,partner webbplats
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Lägg till vara
+DocType: Restaurant Order Entry,Add Item,Lägg till vara
 DocType: Lab Test,Custom Result,Anpassat resultat
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Kontaktnamn
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kriterier för bedömning Course
@@ -328,7 +338,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Begäran om köp.
 DocType: Lab Test,Submitted Date,Inlämnad Datum
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Detta grundar sig på tidrapporter som skapats mot detta projekt
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Nettolön kan inte vara mindre än 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Nettolön kan inte vara mindre än 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",För att sluta skicka repeterande felmeddelanden från systemet har vi markerat Inaktiverat fält i prenumerationen
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Endast den valda Ledighets ansvarig kan lämna denna ledighets applikationen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Avgångs Datum måste vara större än Datum för anställningsdatum
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Avgångar per år
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,Vinst förlust
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Liter
 DocType: Task,Total Costing Amount (via Time Sheet),Totalt Costing Belopp (via Tidrapportering)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Vänligen uppsättning studenter under studentgrupper
 DocType: Item Website Specification,Item Website Specification,Produkt hemsidespecifikation
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Lämna Blockerad
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Punkt {0} har nått slutet av sin livslängd på {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Punkt {0} har nått slutet av sin livslängd på {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,bankAnteckningar
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Årlig
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Lager Avstämning Punkt
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Creation Tool Course
 DocType: Lead,Do Not Contact,Kontakta ej
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,Personer som undervisar i organisationen
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Den unika ID för att spåra alla återkommande fakturor. Det genereras på skicka.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Mjukvaruutvecklare
 DocType: Item,Minimum Order Qty,Minimum Antal
 DocType: Pricing Rule,Supplier Type,Leverantör Typ
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,Publicera i Hub
 DocType: Student Admission,Student Admission,Student Antagning
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Punkt {0} avbryts
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Materialförfrågan
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Punkt {0} avbryts
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Materialförfrågan
 DocType: Bank Reconciliation,Update Clearance Date,Uppdatera Clearance Datum
 DocType: Item,Purchase Details,Inköpsdetaljer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Produkt  {0} hittades inte i ""råvaror som levereras""  i beställning {1}"
 DocType: Patient Relation,Relation,Förhållande
 DocType: Shipping Rule,Worldwide Shipping,Världsomspännande sändnings
 DocType: Patient Relation,Mother,Mor
+DocType: Restaurant Reservation,Reservation End Time,Bokning Sluttid
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Bekräftade ordrar från kunder.
 DocType: Purchase Receipt Item,Rejected Quantity,Avvisad Kvantitet
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Betalningsförfrågan {0} skapad
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Betalningsförfrågan {0} skapad
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Låg känslighet
 DocType: Notification Control,Notification Control,Anmälningskontroll
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Vänligen bekräfta när du har avslutat din träning
 DocType: Lead,Suggestions,Förslag
@@ -388,7 +401,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,E-post lönebesked till anställd baserat på föredragna e-post väljs i Employee
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Den första Lämna godkännare i listan kommer att anges som standard Lämna godkännare
 DocType: Tax Rule,Shipping County,Frakt County
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Lär dig
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Lär dig
 DocType: Asset,Next Depreciation Date,Nästa Av- Datum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivitet Kostnad per anställd
 DocType: Accounts Settings,Settings for Accounts,Inställningar för konton
@@ -399,13 +412,13 @@
 DocType: Item,Synced With Hub,Synkroniserad med Hub
 DocType: Vehicle,Fleet Manager,Fleet manager
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Rad # {0}: {1} kan inte vara negativt för produkten {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Fel Lösenord
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Fel Lösenord
 DocType: Item,Variant Of,Variant av
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"Avslutade Antal kan inte vara större än ""antal för Tillverkning '"
 DocType: Period Closing Voucher,Closing Account Head,Stänger Konto Huvud
 DocType: Employee,External Work History,Extern Arbetserfarenhet
 DocType: Physician,Time per Appointment,Tid per möte
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Cirkelreferens fel
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Cirkelreferens fel
 DocType: Appointment Type,Is Inpatient,Är inpatient
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 Namn
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,I ord (Export) kommer att vara synlig när du sparar följesedel.
@@ -414,19 +427,18 @@
 DocType: Lead,Industry,Industri
 DocType: Employee,Job Profile,Jobbprofilen
 DocType: BOM Item,Rate & Amount,Betygsätt och belopp
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vänligen uppsätt nummerserien för deltagande via Inställningar&gt; Numreringsserie
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Detta baseras på transaktioner mot detta företag. Se tidslinjen nedan för detaljer
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Meddela via e-post om skapandet av automatisk Material Begäran
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Resistent
 DocType: Journal Entry,Multi Currency,Flera valutor
 DocType: Payment Reconciliation Invoice,Invoice Type,Faktura Typ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kund&gt; Kundgrupp&gt; Territorium
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Följesedel
 DocType: Consultation,Encounter Impression,Encounter Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Ställa in skatter
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Kostnader för sålda Asset
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,Betalningsposten har ändrats efter att du hämtade den. Vänligen hämta igen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} inlagd två gånger under punkten Skatt
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Sammanfattning för denna vecka och pågående aktiviteter
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} inlagd två gånger under punkten Skatt
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Sammanfattning för denna vecka och pågående aktiviteter
 DocType: Student Applicant,Admitted,medgav
 DocType: Workstation,Rent Cost,Hyr Kostnad
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Belopp efter avskrivningar
@@ -441,36 +453,35 @@
 DocType: Shipping Rule,Valid for Countries,Gäller för länder
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Denna punkt är en mall och kan inte användas i transaktioner. Punkt attribut kommer att kopieras över till varianterna inte &quot;Nej Kopiera&quot; ställs in
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Den totala order Anses
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Anställd beteckning (t.ex. VD, direktör osv)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Anställd beteckning (t.ex. VD, direktör osv)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,I takt med vilket kundens Valuta omvandlas till kundens basvaluta
 DocType: Course Scheduling Tool,Course Scheduling Tool,Naturligtvis Scheduling Tool
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rad # {0}: Inköp Faktura kan inte göras mot en befintlig tillgång {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Urgent] Fel vid skapande av återkommande% s för% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Urgent] Fel vid skapande av återkommande% s för% s
 DocType: Item Tax,Tax Rate,Skattesats
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} som redan tilldelats för anställd {1} för perioden {2} till {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Välj Punkt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Välj Punkt
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Inköpsfakturan {0} är redan lämnad
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Rad # {0}: Batch nr måste vara samma som {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Konvertera till icke-gruppen
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Batch (parti) i en punkt.
 DocType: C-Form Invoice Detail,Invoice Date,Fakturadatum
 DocType: GL Entry,Debit Amount,Debit Belopp
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Det kan bara finnas ett konto per Company i {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Se bifogad fil
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Det kan bara finnas ett konto per Company i {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Se bifogad fil
 DocType: Purchase Order,% Received,% Emot
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Skapa studentgrupper
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Inställning Redan Komplett !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Inställning Redan Komplett !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Kreditnotbelopp
 DocType: Setup Progress Action,Action Document,Handlingsdokument
 ,Finished Goods,Färdiga Varor
 DocType: Delivery Note,Instructions,Instruktioner
 DocType: Quality Inspection,Inspected By,Inspekteras av
 DocType: Maintenance Visit,Maintenance Type,Servicetyp
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} är inte inskriven i kursen {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Artikelnummer&gt; Varugrupp&gt; Varumärke
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} är inte inskriven i kursen {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serienummer {0} tillhör inte följesedel {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Lägg produkter
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Lägg produkter
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Produktkvalitetskontroll Parameter
 DocType: Leave Application,Leave Approver Name,Ledighetsgodkännare Namn
 DocType: Depreciation Schedule,Schedule Date,Schema Datum
@@ -492,7 +503,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Arbetstimmar
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Ändra start / aktuella sekvensnumret av en befintlig serie.
 DocType: Dosage Strength,Strength,Styrka
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Skapa en ny kund
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Skapa en ny kund
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Om flera prissättningsregler fortsätta att gälla, kan användarna uppmanas att ställa Prioritet manuellt för att lösa konflikten."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Skapa inköpsorder
 ,Purchase Register,Inköpsregistret
@@ -511,7 +522,7 @@
 DocType: Lab Test Template,Single,Singel
 DocType: Salary Slip,Total Loan Repayment,Totala låne Återbetalning
 DocType: Account,Cost of Goods Sold,Kostnad för sålda varor
-DocType: Purchase Invoice,Yearly,Årlig
+DocType: Subscription,Yearly,Årlig
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Ange kostnadsställe
 DocType: Drug Prescription,Dosage,Dosering
 DocType: Journal Entry Account,Sales Order,Kundorder
@@ -541,7 +552,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globala inställningar för alla tillverkningsprocesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Konton frysta upp till
 DocType: SMS Log,Sent On,Skickas på
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valda flera gånger i attribut Tabell
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valda flera gånger i attribut Tabell
 DocType: HR Settings,Employee record is created using selected field. ,Personal register skapas med hjälp av valda fältet.
 DocType: Sales Order,Not Applicable,Inte Tillämpbar
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Semester topp.
@@ -567,13 +578,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Totalt blad tilldelats är obligatorisk
 DocType: Patient,AB Positive,AB Positiv
 DocType: Job Opening,Description of a Job Opening,Beskrivning av ett jobb
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,I avvaktan på aktiviteter för dag
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,I avvaktan på aktiviteter för dag
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Närvaro lista
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Lönedel för tidrapport baserad lönelistan.
 DocType: Sales Order Item,Used for Production Plan,Används för produktionsplan
 DocType: Employee Loan,Total Payment,Total betalning
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (i minuter)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} avbryts så åtgärden kan inte slutföras
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} avbryts så åtgärden kan inte slutföras
 DocType: Customer,Buyer of Goods and Services.,Köpare av varor och tjänster.
 DocType: Journal Entry,Accounts Payable,Leverantörsreskontra
 DocType: Patient,Allergies,allergier
@@ -585,23 +596,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Varna inköpsorder
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Lista några av dina kunder. De kunde vara organisationer eller privatpersoner.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Tillräckligt med delar för att bygga
+DocType: POS Profile User,POS Profile User,POS Profil Användare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Direkt inkomst
 DocType: Patient Appointment,Date TIme,Datum Tid
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Kan inte filtrera baserat på konto, om grupperad efter konto"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Handläggare
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Var god välj Kurs
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Var god välj Kurs
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Var god välj Kurs
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Var god välj Kurs
 DocType: Codification Table,Codification Table,Kodifierings tabell
 DocType: Timesheet Detail,Hrs,H
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Välj Företag
 DocType: Stock Entry Detail,Difference Account,Differenskonto
 DocType: Purchase Invoice,Supplier GSTIN,Leverantör GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Det går inte att stänga uppgiften då dess huvuduppgift {0} inte är stängd.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,Ange vilket lager som Material Begäran kommer att anges mot
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Det går inte att stänga uppgiften då dess huvuduppgift {0} inte är stängd.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Ange vilket lager som Material Begäran kommer att anges mot
 DocType: Production Order,Additional Operating Cost,Ytterligare driftkostnader
 DocType: Lab Test Template,Lab Routine,Lab Routine
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","För att sammanfoga, måste följande egenskaper vara samma för båda objekten"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","För att sammanfoga, måste följande egenskaper vara samma för båda objekten"
 DocType: Shipping Rule,Net Weight,Nettovikt
 DocType: Employee,Emergency Phone,Nödtelefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Köpa
@@ -612,7 +624,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Ange grad för tröskelvärdet 0%
 DocType: Sales Order,To Deliver,Att Leverera
 DocType: Purchase Invoice Item,Item,Objekt
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Serienummer objekt kan inte vara en bråkdel
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Hög känslighet
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Serienummer objekt kan inte vara en bråkdel
 DocType: Journal Entry,Difference (Dr - Cr),Skillnad (Dr - Cr)
 DocType: Account,Profit and Loss,Resultaträkning
 DocType: Patient,Risk Factors,Riskfaktorer
@@ -621,7 +634,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Hantera Underleverantörer
 DocType: Vital Signs,Body Temperature,Kroppstemperatur
 DocType: Project,Project will be accessible on the website to these users,Projektet kommer att vara tillgänglig på webbplatsen till dessa användare
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Definiera projekttyp.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Definiera projekttyp.
 DocType: Supplier Scorecard,Weighting Function,Viktningsfunktion
 DocType: Physician,OP Consulting Charge,OP Consulting Charge
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Ställ in din
@@ -635,7 +648,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Inkrement kan inte vara 0
 DocType: Production Planning Tool,Material Requirement,Material Krav
 DocType: Company,Delete Company Transactions,Radera Företagstransactions
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Referensnummer och referens Datum är obligatorisk för Bank transaktion
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Referensnummer och referens Datum är obligatorisk för Bank transaktion
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Lägg till / redigera skatter och avgifter
 DocType: Payment Entry Reference,Supplier Invoice No,Leverantörsfaktura Nej
 DocType: Territory,For reference,Som referens
@@ -643,12 +656,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan inte ta bort Löpnummer {0}, eftersom det används i aktietransaktioner"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Closing (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Hallå
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Flytta objekt
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Flytta objekt
 DocType: Serial No,Warranty Period (Days),Garantiperiod (dagar)
 DocType: Installation Note Item,Installation Note Item,Installeringsnotis objekt
 DocType: Production Plan Item,Pending Qty,Väntar Antal
 DocType: Budget,Ignore,Ignorera
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} är inte aktiv
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} är inte aktiv
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,kryss Setup dimensioner för utskrift
 DocType: Salary Slip,Salary Slip Timesheet,Lön Slip Tidrapport
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverantör Warehouse obligatorisk för underleverantörer inköpskvitto
@@ -657,7 +670,7 @@
 DocType: Pricing Rule,Sales Partner,Försäljnings Partner
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Alla leverantörs scorecards.
 DocType: Buying Settings,Purchase Receipt Required,Inköpskvitto Krävs
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Värderings Rate är obligatoriskt om ingående lager in
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,Värderings Rate är obligatoriskt om ingående lager in
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Inga träffar i Faktura tabellen
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Välj Företag och parti typ först
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Budget / räkenskapsåret.
@@ -694,7 +707,7 @@
 DocType: Quotation,Quotation To,Offert Till
 DocType: Lead,Middle Income,Medelinkomst
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Öppning (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standard mätenhet för punkt {0} kan inte ändras direkt eftersom du redan har gjort vissa transaktioner (s) med en annan UOM. Du måste skapa en ny punkt för att använda en annan standard UOM.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standard mätenhet för punkt {0} kan inte ändras direkt eftersom du redan har gjort vissa transaktioner (s) med en annan UOM. Du måste skapa en ny punkt för att använda en annan standard UOM.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Avsatt belopp kan inte vara negativ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Vänligen ställ in företaget
 DocType: Purchase Order Item,Billed Amt,Fakturerat ant.
@@ -708,6 +721,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Välj Betalkonto att Bank Entry
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Skapa anställda register för att hantera löv, räkningar och löner"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Receptperiod
+DocType: Restaurant Reservation,Restaurant Reservation,Restaurangbokning
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Förslagsskrivning
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betalning Entry Avdrag
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,En annan säljare {0} finns med samma anställningsid
@@ -715,7 +729,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Masters
 DocType: Assessment Plan,Maximum Assessment Score,Maximal Assessment Score
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Uppdatera banköverföring Datum
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Time Tracking
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Time Tracking
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,DUPLICERA FÖR TRANSPORTER
 DocType: Fiscal Year Company,Fiscal Year Company,Räkenskapsårets Företag
 DocType: Packing Slip Item,DN Detail,DN Detalj
@@ -724,8 +738,9 @@
 DocType: Batch,Batch Description,Batch Beskrivning
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Skapa studentgrupper
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Skapa studentgrupper
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Betalning Gateway konto inte skapat, vänligen skapa ett manuellt."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Betalning Gateway konto inte skapat, vänligen skapa ett manuellt."
 DocType: Supplier Scorecard,Per Year,Per år
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Inte berättigad till antagning i detta program enligt DOB
 DocType: Sales Invoice,Sales Taxes and Charges,Försäljnings skatter och avgifter
 DocType: Employee,Organization Profile,Organisation Profil
 DocType: Vital Signs,Height (In Meter),Höjd (In Meter)
@@ -761,7 +776,7 @@
 DocType: Student Batch Name,Batch Name,batch Namn
 DocType: Fee Validity,Max number of visit,Max antal besök
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Tidrapport skapat:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Ställ in standard Kontant eller bankkonto i betalningssätt {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Ställ in standard Kontant eller bankkonto i betalningssätt {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,Skriva in
 DocType: GST Settings,GST Settings,GST-inställningar
 DocType: Selling Settings,Customer Naming By,Kundnamn på
@@ -793,16 +808,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landed Cost skatter och avgifter
 DocType: Production Order Operation,Actual Start Time,Faktisk starttid
 DocType: BOM Operation,Operation Time,Drifttid
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Yta
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Yta
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Bas
 DocType: Timesheet,Total Billed Hours,Totalt Fakturerade Timmar
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Avskrivningsbelopp
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Avskrivningsbelopp
 DocType: Leave Block List Allow,Allow User,Tillåt användaren
 DocType: Journal Entry,Bill No,Fakturanr
 DocType: Company,Gain/Loss Account on Asset Disposal,Vinst / Förlust konto på Asset Avfallshantering
 DocType: Vehicle Log,Service Details,Service detaljer
 DocType: Vehicle Log,Service Details,Service detaljer
-DocType: Purchase Invoice,Quarterly,Kvartals
+DocType: Subscription,Quarterly,Kvartals
 DocType: Lab Test Template,Grouped,grupperade
 DocType: Selling Settings,Delivery Note Required,Följesedel Krävs
 DocType: Bank Guarantee,Bank Guarantee Number,Bankgaranti nummer
@@ -812,12 +827,12 @@
 DocType: Student Attendance,Student Attendance,Student Närvaro
 DocType: Sales Invoice Timesheet,Time Sheet,Tidrapportering
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Återrapportering Råvaror Based On
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Ange produktdetaljer
 DocType: Interest,Interest,Intressera
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,pre Sales
 DocType: Purchase Receipt,Other Details,Övriga detaljer
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Lab Test,Test Template,Testmall
+DocType: Restaurant Order Entry Item,Served,Serveras
 DocType: Account,Accounts,Konton
 DocType: Vehicle,Odometer Value (Last),Vägmätare Value (Senaste)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Mallar med leverantörsspecifika kriterier.
@@ -829,26 +844,28 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Förhandsvisning lönebesked
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Konto {0} har angetts flera gånger
 DocType: Account,Expenses Included In Valuation,Kostnader ingår i rapporten
-DocType: Hub Settings,Seller City,Säljaren stad
 ,Absent Student Report,Frånvarorapport Student
 DocType: Email Digest,Next email will be sent on:,Nästa e-post kommer att skickas på:
 DocType: Offer Letter Term,Offer Letter Term,Erbjudande Brev Villkor
 DocType: Supplier Scorecard,Per Week,Per vecka
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Produkten har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Produkten har varianter.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Totalt Student
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Produkt  {0} hittades inte
 DocType: Bin,Stock Value,Stock Värde
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,Avgiftsposter skapas i bakgrunden. Vid eventuella fel kommer felmeddelandet att uppdateras i schemat.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,existerar inte företag {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} har avgiftsgiltighet till {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} har avgiftsgiltighet till {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Tree Typ
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Antal konsumeras per Enhet
 DocType: Serial No,Warranty Expiry Date,Garanti Förfallodatum
 DocType: Material Request Item,Quantity and Warehouse,Kvantitet och Lager
+DocType: Hub Settings,Unregister,Avregistrera
 DocType: Sales Invoice,Commission Rate (%),Provisionsandel (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Var god välj Program
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Var god välj Program
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Var god välj Program
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Var god välj Program
 DocType: Project,Estimated Cost,Beräknad kostnad
 DocType: Purchase Order,Link to material requests,Länk till material förfrågningar
+DocType: Hub Settings,Publish,Publicera
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
 DocType: Journal Entry,Credit Card Entry,Kreditkorts logg
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Företag och konton
@@ -859,13 +876,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Nära möjlighet efter dagar
 ,Reserved,Reserverat
 DocType: Purchase Order,Supply Raw Materials,Supply Råvaror
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Det datum då nästa faktura kommer att genereras. Det genereras på skicka.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Nuvarande Tillgångar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} är inte en lagervara
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',Vänligen dela din feedback till träningen genom att klicka på &quot;Träningsreaktion&quot; och sedan &quot;Ny&quot;
 DocType: Mode of Payment Account,Default Account,Standard konto
 DocType: Payment Entry,Received Amount (Company Currency),Erhållet belopp (Company valuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,Prospekt måste ställas in om Möjligheten är skapad av Prospekt
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,Prospekt måste ställas in om Möjligheten är skapad av Prospekt
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Välj helgdagar
 DocType: Patient,O Negative,O Negativ
 DocType: Production Order Operation,Planned End Time,Planerat Sluttid
@@ -881,10 +897,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energi
 DocType: Opportunity,Opportunity From,Möjlighet Från
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Månadslön uttalande.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Lägg till företag
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rad {0}: {1} Serienummer krävs för punkt {2}. Du har angett {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rad {0}: {1} Serienummer krävs för punkt {2}. Du har angett {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Välj en tabell
 DocType: BOM,Website Specifications,Webbplats Specifikationer
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} är en ogiltig e-postadress i &quot;Mottagare&quot;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} är en ogiltig e-postadress i &quot;Mottagare&quot;
 DocType: Special Test Items,Particulars,uppgifter
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiotikum.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Från {0} av typen {1}
@@ -892,11 +908,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Rad {0}: Omvandlingsfaktor är obligatoriskt
 DocType: Employee,A+,A+
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Flera Pris Regler finns med samma kriterier, vänligen lösa konflikter genom att tilldela prioritet. Pris Regler: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,Det går inte att inaktivera eller avbryta BOM eftersom det är kopplat till andra stycklistor
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,Det går inte att inaktivera eller avbryta BOM eftersom det är kopplat till andra stycklistor
 DocType: Opportunity,Maintenance,Underhåll
 DocType: Item Attribute Value,Item Attribute Value,Produkt Attribut Värde
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Säljkampanjer.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,göra Tidrapport
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,göra Tidrapport
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -934,12 +950,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Ange Artikel först
 DocType: Account,Liability,Ansvar
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktionerade Belopp kan inte vara större än fordringsbelopp i raden {0}.
+DocType: Salary Detail,Do not include in total,Inkludera inte totalt
 DocType: Company,Default Cost of Goods Sold Account,Standardkostnad Konto Sålda Varor
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Prislista inte valt
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Prislista inte valt
 DocType: Employee,Family Background,Familjebakgrund
 DocType: Request for Quotation Supplier,Send Email,Skicka Epost
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Varning: Ogiltig Attachment {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Inget Tillstånd
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Varning: Ogiltig Attachment {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Inget Tillstånd
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Begärt citat
 DocType: Vital Signs,Heart Rate / Pulse,Hjärtfrekvens / puls
 DocType: Company,Default Bank Account,Standard bankkonto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","För att filtrera baserat på partiet, väljer Party Typ först"
@@ -966,12 +984,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Punkt Row {idx}: {doctype} {doknamn} existerar inte i ovanstående &quot;{doctype} tabellen
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Tidrapport {0} är redan slutförts eller avbrutits
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Inga uppgifter
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den dagen i den månad som auto faktura kommer att genereras t.ex. 05, 28 etc"
 DocType: Item Variant Settings,Copy Fields to Variant,Kopiera fält till variant
 DocType: Asset,Opening Accumulated Depreciation,Ingående ackumulerade avskrivningar
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Betyg måste vara mindre än eller lika med 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Programmet Inskrivning Tool
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C-Form arkiv
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C-Form arkiv
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Kunder och leverantör
 DocType: Email Digest,Email Digest Settings,E-postutskick Inställningar
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Tack för din verksamhet!
@@ -989,13 +1006,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Citatstatus
 DocType: Maintenance Visit,Completion Status,Slutförande Status
 DocType: HR Settings,Enter retirement age in years,Ange pensionsåldern i år
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Lager
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Var god välj ett lager
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Target Lager
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Var god välj ett lager
 DocType: Cheque Print Template,Starting location from left edge,Startplats från vänstra kanten
 DocType: Item,Allow over delivery or receipt upto this percent,Tillåt överleverans eller mottagande upp till denna procent
 DocType: Stock Entry,STE-,Stefan
 DocType: Upload Attendance,Import Attendance,Import Närvaro
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Alla artikelgrupper
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Alla artikelgrupper
 DocType: Process Payroll,Activity Log,Aktivitets Logg
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Netto Vinst / Förlust
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Komponera meddelandet automatiskt mot uppvisande av transaktioner.
@@ -1007,7 +1024,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Projicerad Antal
 DocType: Sales Invoice,Payment Due Date,Förfallodag
 DocType: Drug Prescription,Interval UOM,Intervall UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Punkt Variant {0} finns redan med samma attribut
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Punkt Variant {0} finns redan med samma attribut
+DocType: Item,Hub Publishing Details,Hub Publishing Detaljer
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&quot;Öppna&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Öppna för att göra
 DocType: Notification Control,Delivery Note Message,Följesedel Meddelande
@@ -1027,10 +1045,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: Råmaterial kan inte vara samma som huvudartikel
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Totalt tillämpliga avgifter i inköpskvittot Items tabellen måste vara densamma som den totala skatter och avgifter
 DocType: Sales Team,Incentives,Sporen
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Registrera dig för nav
 DocType: SMS Log,Requested Numbers,Begärda nummer
 DocType: Production Planning Tool,Only Obtain Raw Materials,Endast Skaffa Råvaror
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Utvecklingssamtal.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Aktivera användning för Varukorgen &quot;, som Kundvagnen är aktiverad och det bör finnas åtminstone en skattebestämmelse för Varukorgen"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Aktivera användning för Varukorgen &quot;, som Kundvagnen är aktiverad och det bör finnas åtminstone en skattebestämmelse för Varukorgen"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Betalning Entry {0} är kopplad mot Order {1}, kontrollera om det ska dras i förskott i denna faktura."
 DocType: Sales Invoice Item,Stock Details,Lager Detaljer
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt Värde
@@ -1049,12 +1068,14 @@
 DocType: Salary Slip,Working Days,Arbetsdagar
 DocType: Serial No,Incoming Rate,Inkommande betyg
 DocType: Packing Slip,Gross Weight,Bruttovikt
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,Namnet på ditt företag som du ställer in det här systemet.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Aktivera nav
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,Namnet på ditt företag som du ställer in det här systemet.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Inkludera semester i Totalt antal. Arbetsdagar
 DocType: Job Applicant,Hold,Håll
 DocType: Employee,Date of Joining,Datum för att delta
 DocType: Naming Series,Update Series,Uppdatera Serie
 DocType: Supplier Quotation,Is Subcontracted,Är utlagt
+DocType: Restaurant Table,Minimum Seating,Minsta sätet
 DocType: Item Attribute,Item Attribute Values,Produkt Attribut Värden
 DocType: Examination Result,Examination Result,Examination Resultat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Inköpskvitto
@@ -1065,13 +1086,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Det går inte att hitta tidslucka i de närmaste {0} dagar för Operation {1}
 DocType: Production Order,Plan material for sub-assemblies,Planera material för underenheter
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Säljpartners och Territory
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} måste vara aktiv
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} måste vara aktiv
 DocType: Journal Entry,Depreciation Entry,avskrivningar Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Välj dokumenttyp först
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Avbryt Material {0} innan du avbryter detta Underhållsbesök
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Löpnummer {0} inte tillhör punkt {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Obligatorisk Antal
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Lager med befintlig transaktion kan inte konverteras till redovisningen.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Lager med befintlig transaktion kan inte konverteras till redovisningen.
 DocType: Bank Reconciliation,Total Amount,Totala Summan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Prescription Duration,Number,siffra
@@ -1082,7 +1103,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Försäljning Prislista
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Om den är markerad kommer en kund att skapas, mappad till patienten. Patientfakturor kommer att skapas mot den här kunden. Du kan också välja befintlig kund medan du skapar patienten."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicera till synkroniseringsobjekt
 DocType: Bank Reconciliation,Account Currency,Konto Valuta
 DocType: Lab Test,Sample ID,Prov ID
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Ango Avrundningskonto i bolaget
@@ -1091,11 +1111,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Medarbetare {0} är inte aktiv eller existerar inte
 DocType: Fee Structure,Components,Komponenter
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Ange tillgångsslag i punkt {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Produkt Varianter {0} uppdaterad
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Produkt Varianter {0} uppdaterad
 DocType: Quality Inspection Reading,Reading 6,Avläsning 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Kan inte {0} {1} {2} utan någon negativ enastående faktura
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this",att genereras. Om försenad måste du manuellt ändra fältet &quot;Repetera på dag i månad&quot; här
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Kan inte {0} {1} {2} utan någon negativ enastående faktura
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Inköpsfakturan Advancerat
-DocType: Hub Settings,Sync Now,Synkronisera nu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Rad {0}: kreditering kan inte kopplas till en {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Definiera budget för budgetåret.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Standard Bank / Kontant konto kommer att uppdateras automatiskt i POS faktura när detta läge är valt.
@@ -1107,13 +1128,13 @@
 DocType: Item,Is Purchase Item,Är beställningsobjekt
 DocType: Asset,Purchase Invoice,Inköpsfaktura
 DocType: Stock Ledger Entry,Voucher Detail No,Rabatt Detalj nr
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Ny försäljningsfaktura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Ny försäljningsfaktura
 DocType: Stock Entry,Total Outgoing Value,Totalt Utgående Värde
 DocType: Physician,Appointments,utnämningar
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Öppningsdatum och Slutdatum bör ligga inom samma räkenskapsår
 DocType: Lead,Request for Information,Begäran om upplysningar
 ,LeaderBoard,leaderboard
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Synkroniserings Offline fakturor
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Synkroniserings Offline fakturor
 DocType: Payment Request,Paid,Betalats
 DocType: Program Fee,Program Fee,Kurskostnad
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1132,11 +1153,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Inköpsorder Artikeln
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Indirekt inkomst
 DocType: Student Attendance Tool,Student Attendance Tool,Student Närvaro Tool
+DocType: Restaurant Menu,Price List (Auto created),Prislista (automatiskt skapad)
 DocType: Cheque Print Template,Date Settings,Datum Inställningar
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Varians
 ,Company Name,Företagsnamn
 DocType: SMS Center,Total Message(s),Totalt Meddelande (er)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Välj föremål för Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Välj föremål för Transfer
 DocType: Purchase Invoice,Additional Discount Percentage,Ytterligare rabatt Procent
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Visa en lista över alla hjälp videos
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Välj konto chefen för banken, där kontrollen avsattes."
@@ -1154,6 +1176,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Meter
 DocType: Workstation,Electricity Cost,Elkostnad
 DocType: HR Settings,Don't send Employee Birthday Reminders,Skicka inte anställdas födelsedagspåminnelser
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Spara inställningar
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Begärda produkter
 DocType: Item,Inspection Criteria,Inspektionskriterier
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Överfört
 DocType: BOM Website Item,BOM Website Item,BOM Website Post
@@ -1171,11 +1195,11 @@
 DocType: Journal Entry,Total Amount in Words,Total mängd i ord
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Det var ett problem. En trolig orsak kan vara att du inte har sparat formuläret. Vänligen kontakta support@erpnext.com om problemet kvarstår.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Min kundvagn
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Beställd Typ måste vara en av {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Beställd Typ måste vara en av {0}
 DocType: Lead,Next Contact Date,Nästa Kontakt Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Öppning Antal
 DocType: Healthcare Settings,Appointment Reminder,Avtal påminnelse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Ange konto för förändring Belopp
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Ange konto för förändring Belopp
 DocType: Student Batch Name,Student Batch Name,Elev batchnamn
 DocType: Consultation,Doctor,Läkare
 DocType: Holiday List,Holiday List Name,Semester Listnamn
@@ -1183,12 +1207,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,schema Course
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Optioner
 DocType: Journal Entry Account,Expense Claim,Utgiftsräkning
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Vill du verkligen vill återställa detta skrotas tillgång?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Antal för {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Vill du verkligen vill återställa detta skrotas tillgång?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Antal för {0}
 DocType: Leave Application,Leave Application,Ledighetsansöknan
 DocType: Patient,Patient Relation,Patientrelation
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Ledighet Tilldelningsverktyget
+DocType: Item,Hub Category to Publish,Hub kategori att publicera
 DocType: Leave Block List,Leave Block List Dates,Lämna Block Lista Datum
+DocType: Sales Invoice,Billing Address GSTIN,Faktureringsadress GSTIN
 DocType: Workstation,Net Hour Rate,Netto timmekostnad
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landad kostnad inköpskvitto
 DocType: Company,Default Terms,Standardvillkor
@@ -1198,11 +1224,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Specificera en {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Borttagna objekt med någon förändring i kvantitet eller värde.
 DocType: Delivery Note,Delivery To,Leverans till
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Attributtabell är obligatoriskt
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Attributtabell är obligatoriskt
 DocType: Production Planning Tool,Get Sales Orders,Hämta kundorder
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} kan inte vara negativ
 DocType: Training Event,Self-Study,Självstudie
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Rabatt
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Rabatt
 DocType: Asset,Total Number of Depreciations,Totalt Antal Avskrivningar
 DocType: Sales Invoice Item,Rate With Margin,Betygsätt med marginal
 DocType: Sales Invoice Item,Rate With Margin,Betygsätt med marginal
@@ -1210,7 +1236,7 @@
 DocType: Task,Urgent,Brådskande
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Vänligen ange en giltig rad ID för rad {0} i tabellen {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Det gick inte att hitta variabel:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Var god välj ett fält för att redigera från numpad
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Var god välj ett fält för att redigera från numpad
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Gå till skrivbordet och börja använda ERPNext
 DocType: Item,Manufacturer,Tillverkare
 DocType: Landed Cost Item,Purchase Receipt Item,Inköpskvitto Artikel
@@ -1241,8 +1267,8 @@
 DocType: GL Entry,Against,Mot
 DocType: Item,Default Selling Cost Center,Standard Kostnadsställe Försäljning
 DocType: Sales Partner,Implementation Partner,Genomförande Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Postnummer
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Kundorder {0} är {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Postnummer
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Kundorder {0} är {1}
 DocType: Opportunity,Contact Info,Kontaktinformation
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Göra Stock Inlägg
 DocType: Packing Slip,Net Weight UOM,Nettovikt UOM
@@ -1253,6 +1279,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Hämta Veckodagar
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Slutdatum kan inte vara mindre än Startdatum
 DocType: Sales Person,Select company name first.,Välj företagsnamn först.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Låg till Hög
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Offerter mottaget från leverantörer.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Byt BOM och uppdatera senaste pris i alla BOM
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Till {0} | {1} {2}
@@ -1273,7 +1300,7 @@
 DocType: Program Enrollment,Transportation,Transportfordon
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Ogiltig Attribut
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} måste lämnas in
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Kvantitet måste vara mindre än eller lika med {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Kvantitet måste vara mindre än eller lika med {0}
 DocType: SMS Center,Total Characters,Totalt Tecken
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Välj BOM i BOM fältet för produkt{0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form faktura Detalj
@@ -1288,7 +1315,7 @@
 ,Ordered Items To Be Billed,Beställda varor att faktureras
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Från Range måste vara mindre än ligga
 DocType: Global Defaults,Global Defaults,Globala standardinställningar
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Projektsamarbete Inbjudan
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Projektsamarbete Inbjudan
 DocType: Salary Slip,Deductions,Avdrag
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Åtgärdsnamn
@@ -1306,13 +1333,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Försäljning Faktura Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Ingenting att begära
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},En annan budget record &#39;{0}&#39; finns redan mot {1} {2} för räkenskapsåret {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Faktiskt startdatum&quot; inte kan vara större än &quot;Faktiskt slutdatum&quot;
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Faktiskt startdatum&quot; inte kan vara större än &quot;Faktiskt slutdatum&quot;
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Ledning
 DocType: Cheque Print Template,Payer Settings,Payer Inställningar
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Detta kommer att läggas till den punkt koden varianten. Till exempel, om din förkortning är &quot;SM&quot;, och försändelsekoden är &quot;T-TRÖJA&quot;, posten kod varianten kommer att vara &quot;T-Shirt-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettolön (i ord) kommer att vara synliga när du sparar lönebeskedet.
 DocType: Purchase Invoice,Is Return,Är Returnerad
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Varning
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Varning
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Retur / debetnota
 DocType: Price List Country,Price List Country,Prislista Land
 DocType: Item,UOMs,UOM
@@ -1327,17 +1354,18 @@
 DocType: Account,Balance Sheet,Balansräkning
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',"Kostnadcenter för artikel med artikelkod """
 DocType: Fee Validity,Valid Till,Giltig till
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betalning läget är inte konfigurerad. Kontrollera, om kontot har satts på läge av betalningar eller på POS profil."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betalning läget är inte konfigurerad. Kontrollera, om kontot har satts på läge av betalningar eller på POS profil."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Samma post kan inte anges flera gånger.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ytterligare konton kan göras inom ramen för grupper, men poster kan göras mot icke-grupper"
 DocType: Lead,Lead,Prospekt
 DocType: Email Digest,Payables,Skulder
 DocType: Course,Course Intro,kurs Introduktion
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Stock Entry {0} skapades
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vänligen uppsätt nummerserien för deltagande via Inställningar&gt; Numreringsserie
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Stock Entry {0} skapades
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Rad # {0}:  avvisat antal kan inte anmälas för retur
 ,Purchase Order Items To Be Billed,Inköpsorder Artiklar att faktureras
 DocType: Purchase Invoice Item,Net Rate,Netto kostnad
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Var god välj en kund
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Var god välj en kund
 DocType: Purchase Invoice Item,Purchase Invoice Item,Inköpsfaktura Artiklar
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Ledger inlägg och GL Posterna reposted för valda kvitton
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Produkt  1
@@ -1358,7 +1386,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Duplicate raden {0} med samma {1}
 ,Trial Balance,Trial Balans
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Räkenskapsårets {0} hittades inte
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Ställa in Anställda
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Ställa in Anställda
 DocType: Sales Order,SO-,SÅ-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Välj prefix först
 DocType: Employee,O-,O-
@@ -1370,12 +1398,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Se journal
 DocType: Grading Scale,Intervals,intervaller
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidigast
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Ett varugrupp finns med samma namn, ändra objektets namn eller byta namn på varugrupp"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Ett varugrupp finns med samma namn, ändra objektets namn eller byta namn på varugrupp"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Resten av världen
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Resten av världen
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} kan inte ha Batch
 ,Budget Variance Report,Budget Variationsrapport
 DocType: Salary Slip,Gross Pay,Bruttolön
+DocType: Item,Is Item from Hub,Är objekt från nav
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Rad {0}: Aktivitetstyp är obligatorisk.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Lämnad utdelning
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Redovisning Ledger
@@ -1385,8 +1414,9 @@
 DocType: Vehicle Log,Service Detail,tjänsten Detalj
 DocType: BOM,Item Description,Produktbeskrivning
 DocType: Student Sibling,Student Sibling,Student Syskon
-DocType: Purchase Invoice,Is Recurring,Är återkommande
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Betalningsläget
 DocType: Purchase Invoice,Supplied Items,Medföljande tillbehör
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Ange en aktiv meny för restaurang {0}
 DocType: Student,STUD.,HINGST.
 DocType: Production Order,Qty To Manufacture,Antal att tillverka
 DocType: Email Digest,New Income,ny inkomst
@@ -1397,6 +1427,7 @@
 ,Student and Guardian Contact Details,Student och Guardian Kontaktuppgifter
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Row {0}: För leverantören {0} E-postadress krävs för att skicka e-post
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Tillfällig Öppning
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Visa nav
 ,Employee Leave Balance,Anställd Avgångskostnad
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Saldo konto {0} måste alltid vara {1}
 DocType: Patient Appointment,More Info,Mer Information
@@ -1416,13 +1447,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Kundorder {0} är inte giltig
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Varna för ny Offertförfrågan
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Inköpsorder hjälpa dig att planera och följa upp dina inköp
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Tyvärr, kan företagen inte slås samman"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Tyvärr, kan företagen inte slås samman"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Prescriptions
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Den totala emissions / Transfer mängd {0} i Material Begäran {1} \ inte kan vara större än efterfrågat antal {2} till punkt {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Liten
 DocType: Employee,Employee Number,Anställningsnummer
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Ärendenr är redani bruk. Försök från ärende nr {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Ärendenr är redani bruk. Försök från ärende nr {0}
 DocType: Project,% Completed,% Slutfört
 ,Invoiced Amount (Exculsive Tax),Fakturerat belopp (Exklusive skatt)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Produkt  2
@@ -1437,11 +1468,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Indirekta kostnader
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Rad {0}: Antal är obligatoriskt
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Jordbruk
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sync basdata
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sync basdata
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Dina produkter eller tjänster
 DocType: Special Test Items,Special Test Items,Särskilda testpunkter
 DocType: Mode of Payment,Mode of Payment,Betalningssätt
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Website Bild bör vara en offentlig fil eller webbadress
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Website Bild bör vara en offentlig fil eller webbadress
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Detta är en rot varugrupp och kan inte ändras.
@@ -1449,24 +1480,23 @@
 DocType: Vehicle,Fuel UOM,bränsle UOM
 DocType: Warehouse,Warehouse Contact Info,Lagrets kontaktinfo
 DocType: Payment Entry,Write Off Difference Amount,Skriv differensen Belopp
-DocType: Purchase Invoice,Recurring Type,Återkommande Typ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: Anställd e-post hittades inte, därför e-post skickas inte"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: Anställd e-post hittades inte, därför e-post skickas inte"
 DocType: Item,Foreign Trade Details,Foreign Trade Detaljer
+,Assessment Plan Status,Bedömningsplan status
 DocType: Email Digest,Annual Income,Årlig inkomst
 DocType: Serial No,Serial No Details,Serial Inga detaljer
 DocType: Purchase Invoice Item,Item Tax Rate,Produkt Skattesats
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,Var god välj Läkare och datum
 DocType: Student Group Student,Group Roll Number,Grupprullnummer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",För {0} kan endast kreditkonton länkas mot en annan debitering
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Summan av alla uppgift vikter bör vara 1. Justera vikter av alla projektuppgifter i enlighet
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Följesedel {0} är inte lämnad
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Summan av alla uppgift vikter bör vara 1. Justera vikter av alla projektuppgifter i enlighet
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Följesedel {0} är inte lämnad
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Produkt  {0} måste vara ett underleverantörs produkt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapital Utrustning
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prissättning regel baseras först på ""Lägg till på' fälten, som kan vara artikel, artikelgrupp eller Märke."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Vänligen ange produktkoden först
-DocType: Hub Settings,Seller Website,Säljare Webbplatsen
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Vänligen ange produktkoden först
 DocType: Item,ITEM-,PUNKT-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Totala fördelade procentsats för säljteam bör vara 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Totala fördelade procentsats för säljteam bör vara 100
 DocType: Sales Invoice Item,Edit Description,Redigera Beskrivning
 DocType: Antibiotic,Antibiotic,Antibiotikum
 ,Team Updates,team Uppdateringar
@@ -1487,12 +1517,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Totalt (Company valuta)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Serienummer {0} in mer än en gång
 DocType: Depreciation Schedule,Journal Entry,Journalanteckning
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} objekt pågår
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} objekt pågår
 DocType: Workstation,Workstation Name,Arbetsstation Namn
 DocType: Grading Scale Interval,Grade Code,grade kod
 DocType: POS Item Group,POS Item Group,POS Artikelgrupp
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-postutskick:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} tillhör inte föremål {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} tillhör inte föremål {1}
 DocType: Sales Partner,Target Distribution,Target Fördelning
 DocType: Salary Slip,Bank Account No.,Bankkonto nr
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Detta är numret på den senast skapade transaktionen med detta prefix
@@ -1509,10 +1539,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Offertförfrågan Leverantör
 DocType: Healthcare Settings,Registration Message,Registreringsmeddelande
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Hårdvara
-DocType: Sales Order,Recurring Upto,Återkommande kommande~~POS=HEADCOMP Upp
 DocType: Prescription Dosage,Prescription Dosage,Receptbelagd dosering
 DocType: Attendance,HR Manager,HR-chef
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Välj ett företag
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Välj ett företag
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Enskild ledighet
 DocType: Purchase Invoice,Supplier Invoice Date,Leverantörsfakturadatum
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,per
@@ -1528,10 +1557,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Överlappande förhållanden som råder mellan:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Mot Journal anteckning{0} är redan anpassat mot någon annan kupong
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Totalt ordervärde
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Mat
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Mat
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Åldringsräckvidd 3
 DocType: Maintenance Schedule Item,No of Visits,Antal besök
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Underhållschema {0} existerar mot {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Vill du publicera dina artiklar till hub?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,Inlärning elev
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta avslutnings Hänsyn måste vara {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Summan av poäng för alla mål bör vara 100. Det är {0}
@@ -1542,9 +1572,9 @@
 DocType: Authorization Rule,Average Discount,Genomsnittlig rabatt
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Verktyg
-DocType: Purchase Invoice Item,Accounting,Redovisning
+DocType: POS Profile,Accounting,Redovisning
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Var god välj satser för batched item
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Var god välj satser för batched item
 DocType: Asset,Depreciation Schedules,avskrivningstider
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Ansökningstiden kan inte vara utanför ledighet fördelningsperioden
 DocType: Activity Cost,Projects,Projekt
@@ -1560,7 +1590,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',"Godkännandestatus måste vara ""Godkänd"" eller ""Avvisad"""
 DocType: Physician,Contacts and Address,Kontakter och adress
 DocType: Purchase Invoice,Contact Person,Kontaktperson
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"""Förväntat startdatum"" kan inte vara större än ""Förväntat slutdatum"""
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""Förväntat startdatum"" kan inte vara större än ""Förväntat slutdatum"""
 DocType: Course Scheduling Tool,Course End Date,Kurs Slutdatum
 DocType: Holiday List,Holidays,Helgdagar
 DocType: Sales Order Item,Planned Quantity,Planerad Kvantitet
@@ -1568,10 +1598,11 @@
 DocType: Item,Maintain Stock,Behåll Lager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Aktie Inlägg redan skapats för produktionsorder
 DocType: Employee,Prefered Email,Föredragen E
+DocType: Student Admission,Eligibility and Details,Behörighet och detaljer
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Netto Förändring av anläggningstillgång
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lämna tomt om det anses vara för alla beteckningar
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Avgift av typ ""faktiska"" i raden {0} kan inte ingå i artikelomsättningen"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Från Daterad tid
 DocType: Email Digest,For Company,För Företag
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikationslog.
@@ -1579,19 +1610,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Leverantör Scorecard Scorevariabel
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Köpa mängd
 DocType: Sales Invoice,Shipping Address Name,Leveransadress Namn
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Kontoplan
 DocType: Material Request,Terms and Conditions Content,Villkor Innehåll
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,kan inte vara större än 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Produkt  {0} är inte en lagervara
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Produkt  {0} är inte en lagervara
 DocType: Maintenance Visit,Unscheduled,Ledig
 DocType: Employee,Owned,Ägs
 DocType: Salary Detail,Depends on Leave Without Pay,Beror på avgång utan lön
 DocType: Pricing Rule,"Higher the number, higher the priority","Högre nummer, högre prioritet"
 ,Purchase Invoice Trends,Inköpsfaktura Trender
 DocType: Employee,Better Prospects,Bättre prospekt
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",Rad # {0}: Batch {1} har endast {2} qty. Var god välj en annan sats som har {3} antal tillgängliga eller dela raden i flera rader för att leverera / utgå från flera satser
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",Rad # {0}: Batch {1} har endast {2} qty. Var god välj en annan sats som har {3} antal tillgängliga eller dela raden i flera rader för att leverera / utgå från flera satser
 DocType: Vehicle,License Plate,Registreringsskylt
 DocType: Appraisal,Goals,Mål
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Välj POS-profil
 DocType: Warranty Claim,Warranty / AMC Status,Garanti / AMC Status
 ,Accounts Browser,Konton Webbläsare
 DocType: Payment Entry Reference,Payment Entry Reference,Betalning Entry Referens
@@ -1609,7 +1640,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Anställd kan inte anmäla sig själv.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Om kontot är fruset, är poster endast tillgängligt för begränsade användare."
 DocType: Email Digest,Bank Balance,BANKTILLGODOHAVANDE
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Kontering för {0}: {1} kan endast göras i valuta: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Kontering för {0}: {1} kan endast göras i valuta: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Jobb profil, kvalifikationer som krävs osv"
 DocType: Journal Entry Account,Account Balance,Balanskonto
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Skatte Regel för transaktioner.
@@ -1618,8 +1649,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Totala skatter och avgifter (Företags valuta)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Visa ej avslutad skatteårets P &amp; L balanser
 DocType: Lab Test Template,Collection Details,Samlingsdetaljer
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","välj cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date från tabConsultation ct, `tabLab Prescription` cp där ct.patient = &#39;{0}&#39; och cp.parent = ct. namn och cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Frakt konto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} är inaktiv
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Gör kundorder för att hjälpa dig att planera ditt arbete och leverera i tid
@@ -1636,7 +1665,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Följesedel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Kontorshyra
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS-gateway-inställningar
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import misslyckades!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import misslyckades!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Ingen adress inlagd ännu.
 DocType: Workstation Working Hour,Workstation Working Hour,Arbetsstation arbetstimme
 DocType: Vital Signs,Blood Pressure,Blodtryck
@@ -1661,7 +1690,7 @@
 DocType: Sales Invoice,Source,Källa
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,show stängd
 DocType: Leave Type,Is Leave Without Pay,Är ledighet utan lön
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Asset Kategori är obligatorisk för fast tillgångsposten
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Asset Kategori är obligatorisk för fast tillgångsposten
 DocType: Fee Validity,Fee Validity,Avgift Giltighet
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Inga träffar i betalningstabellen
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Detta {0} konflikter med {1} för {2} {3}
@@ -1682,8 +1711,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Skapa Leads
 DocType: Maintenance Schedule,Schedules,Scheman
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,POS-profil krävs för att använda Point of Sale
 DocType: Purchase Invoice Item,Net Amount,Nettobelopp
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} har inte skickats in så åtgärden kan inte slutföras
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} har inte skickats in så åtgärden kan inte slutföras
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detalj nr
 DocType: Landed Cost Voucher,Additional Charges,Tillkommande avgifter
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Ytterligare rabattbeloppet (Företagsvaluta)
@@ -1692,7 +1722,7 @@
 ,Support Hour Distribution,Stödtiddistribution
 DocType: Maintenance Visit,Maintenance Visit,Servicebesök
 DocType: Student,Leaving Certificate Number,Leaving Certificate Number
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Avstämning av avtalet, Granska och avbryt faktura {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Avstämning av avtalet, Granska och avbryt faktura {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Tillgänglig Batch Antal vid Lager
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Uppdatera utskriftsformat
 DocType: Landed Cost Voucher,Landed Cost Help,Landad kostnad Hjälp
@@ -1715,8 +1745,8 @@
 DocType: Patient,Tobacco Past Use,Tidig användning av tobak
 DocType: Sales Invoice Item,Brand Name,Varumärke
 DocType: Purchase Receipt,Transporter Details,Transporter Detaljer
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Användaren {0} är redan tilldelad läkare {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Standardlager krävs för vald post
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Användaren {0} är redan tilldelad läkare {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Standardlager krävs för vald post
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Låda
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,möjlig Leverantör
 DocType: Budget,Monthly Distribution,Månads Fördelning
@@ -1726,8 +1756,8 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 DocType: Loan Type,Maximum Loan Amount,Maximala lånebeloppet
 DocType: Pricing Rule,Pricing Rule,Prissättning Regel
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Dubbelnummer för student {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Dubbelnummer för student {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Dubbelnummer för student {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Dubbelnummer för student {0}
 DocType: Budget,Action if Annual Budget Exceeded,Åtgärd om årsbudgeten överskriden
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Material begäran om att inköpsorder
 DocType: Shopping Cart Settings,Payment Success URL,Betalning Framgång URL
@@ -1744,7 +1774,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} måste bara finnas en gång
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ej tillåtet att flytta mer {0} än {1} mot beställning {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Lämnar Avsatt framgångsrikt för {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Inga produkter att packa
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Inga produkter att packa
 DocType: Shipping Rule Condition,From Value,Från Värde
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Tillverknings Kvantitet är obligatorisk
 DocType: Employee Loan,Repayment Method,återbetalning Metod
@@ -1758,6 +1788,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Stock Skulder
 DocType: Purchase Invoice,Supplier Warehouse,Leverantör Lager
 DocType: Opportunity,Contact Mobile No,Kontakt Mobil nr
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Välj företag
 ,Material Requests for which Supplier Quotations are not created,Material Begäran för vilka leverantörsofferter är inte skapade
 DocType: Student Group,Set 0 for no limit,Set 0 för ingen begränsning
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dagen (s) som du ansöker om ledighet är helgdagar. Du behöver inte ansöka om tjänstledighet.
@@ -1767,24 +1798,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Skapa offert
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,andra rapporter
 DocType: Dependent Task,Dependent Task,Beroende Uppgift
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Omvandlingsfaktor för standardmåttenhet måste vara en i raden {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Omvandlingsfaktor för standardmåttenhet måste vara en i raden {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Ledighet av typen {0} inte kan vara längre än {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Försök att planera verksamheten för X dagar i förväg.
 DocType: HR Settings,Stop Birthday Reminders,Stop födelsedag Påminnelser
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Ställ Default Lön betalas konto i bolaget {0}
 DocType: SMS Center,Receiver List,Mottagare Lista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Sök Produkt
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Sök Produkt
 DocType: Patient Appointment,Referring Physician,Hänvisande läkare
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Förbrukad mängd
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Nettoförändring i Cash
 DocType: Assessment Plan,Grading Scale,Betygsskala
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mätenhet {0} har angetts mer än en gång i Omvandlingsfaktor Tabell
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,redan avslutat
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mätenhet {0} har angetts mer än en gång i Omvandlingsfaktor Tabell
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,redan avslutat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Lager i handen
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Betalning förfrågan finns redan {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kostnad för utfärdade artiklar
 DocType: Physician,Hospital,Sjukhus
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Antal får inte vara mer än {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Antal får inte vara mer än {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Föregående räkenskapsperiod inte stängd
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Ålder (dagar)
 DocType: Quotation Item,Quotation Item,Offert Artikel
@@ -1795,8 +1826,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Leverantör Typ mästare.
 DocType: Purchase Order Item,Supplier Part Number,Leverantör Artikelnummer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Konverteringskurs kan inte vara 0 eller 1
-DocType: Sales Invoice,Reference Document,referensdokument
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} är avbruten eller stoppad
+DocType: Subscription,Reference Document,referensdokument
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} är avbruten eller stoppad
 DocType: Accounts Settings,Credit Controller,Kreditcontroller
 DocType: Delivery Note,Vehicle Dispatch Date,Fordon Avgångs Datum
 DocType: Healthcare Settings,Default Medical Code Standard,Standard Medical Code Standard
@@ -1805,6 +1836,7 @@
 DocType: Company,Default Payable Account,Standard betalkonto
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Inställningar för webbutik som fraktregler, prislista mm"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Fakturerad
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Sortera efter pris ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserverad Antal
 DocType: Party Account,Party Account,Parti-konto
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Personal Resurser
@@ -1816,13 +1848,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Gör utbetalning Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Rad {0}: Advance mot Leverantören måste debitera
 DocType: Company,Default Values,Standardvärden
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frekvens} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Frekvens} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Totala belopp som ersatts
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Detta grundar sig på stockar mot detta fordon. Se tidslinje nedan för mer information
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Mot leverantörsfakturor {0} den {1}
 DocType: Customer,Default Price List,Standard Prislista
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Asset Rörelse rekord {0} skapades
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Du kan inte ta bort Räkenskapsårets {0}. Räkenskapsårets {0} är satt som standard i Globala inställningar
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,En kund med samma namn finns redan
 DocType: Journal Entry,Entry Type,Entry Type
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Ingen utvärderingsplan kopplad till denna bedömningsgrupp
 ,Customer Credit Balance,Kund tillgodohavande
@@ -1833,7 +1866,7 @@
 DocType: Quotation,Term Details,Term Detaljer
 DocType: Project,Total Sales Cost (via Sales Order),Totala försäljningskostnader (via försäljningsorder)
 DocType: Project,Total Sales Cost (via Sales Order),Totala försäljningskostnader (via försäljningsorder)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Det går inte att registrera mer än {0} studenter för denna elevgrupp.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Det går inte att registrera mer än {0} studenter för denna elevgrupp.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lödräkning
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lödräkning
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} måste vara större än 0
@@ -1851,9 +1884,11 @@
 DocType: Lab Test,Technician Name,Tekniker namn
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Bort länken Betalning på Indragning av faktura
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Nuvarande vägmätare läsning deltagare bör vara större än initial Vägmätarvärde {0}
+DocType: Restaurant Reservation,No Show,Icke infinnande
 DocType: Shipping Rule Country,Shipping Rule Country,Frakt Regel Land
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Lämna och närvaro
 DocType: Maintenance Visit,Partially Completed,Delvis Färdig
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Måttlig känslighet
 DocType: Leave Type,Include holidays within leaves as leaves,Inkludera semester inom ledighet som ledighet
 DocType: Sales Invoice,Packed Items,Packade artiklar
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garantianspråk mot serienummer
@@ -1870,13 +1905,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Betald Belopp (Company valuta)
 DocType: Purchase Invoice,Additional Discount,Ytterligare rabatt
 DocType: Selling Settings,Selling Settings,Försälja Inställningar
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Bekräfta åtgärd
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Auktioner
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Ange antingen Kvantitet eller Värderingsomsättning eller båda
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Uppfyllelse
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Visa i varukorgen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Marknadsföringskostnader
 ,Item Shortage Report,Produkt Brist Rapportera
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vikt nämns \ Vänligen ange ""Vikt UOM"" också"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vikt nämns \ Vänligen ange ""Vikt UOM"" också"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Material Begäran används för att göra detta Lagerinlägg
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Nästa Avskrivningar Datum är obligatoriskt för ny tillgång
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Separat kursbaserad grupp för varje grupp
@@ -1889,12 +1925,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Skapa kontering för varje lagerförändring
 DocType: Leave Allocation,Total Leaves Allocated,Totala Löv Avsatt
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Lager krävs vid Rad nr {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Ange ett giltigt räkenskapsåret start- och slutdatum
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Ange ett giltigt räkenskapsåret start- och slutdatum
 DocType: Employee,Date Of Retirement,Datum för pensionering
 DocType: Upload Attendance,Get Template,Hämta mall
 DocType: Material Request,Transferred,Överförd
 DocType: Vehicle,Doors,dörrar
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext Setup Complete!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Samla avgift för patientregistrering
 DocType: Course Assessment Criteria,Weightage,Vikt
 DocType: Purchase Invoice,Tax Breakup,Skatteavbrott
@@ -1913,37 +1949,37 @@
 DocType: Employee,AB+,AB+
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Om denna artikel har varianter, så det kan inte väljas i kundorder etc."
 DocType: Lead,Next Contact By,Nästa Kontakt Vid
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Kvantitet som krävs för artikel {0} i rad {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Kvantitet som krävs för artikel {0} i rad {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Lager {0} kan inte tas bort då kvantitet existerar för artiklar {1}
 DocType: Quotation,Order Type,Beställ Type
-DocType: Purchase Invoice,Notification Email Address,Anmälan E-postadress
 ,Item-wise Sales Register,Produktvis säljregister
 DocType: Asset,Gross Purchase Amount,Bruttoköpesumma
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Öppningsbalanser
 DocType: Asset,Depreciation Method,avskrivnings Metod
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Off-line
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Off-line
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Är denna skatt inkluderar i Basic kursen?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Totalt Target
 DocType: Job Applicant,Applicant for a Job,Sökande för ett jobb
 DocType: Production Plan Material Request,Production Plan Material Request,Produktionsplanen Material Begäran
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Inga produktionsorder skapas
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Inga produktionsorder skapas
 DocType: Stock Reconciliation,Reconciliation JSON,Avstämning JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Alltför många kolumner. Exportera rapporten och skriva ut det med hjälp av ett kalkylprogram.
 DocType: Purchase Invoice Item,Batch No,Batch nr
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Begäran om offert: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Tillåt flera kundorder mot Kundens beställning
 DocType: Student Group Instructor,Student Group Instructor,Studentgruppsinstruktör
 DocType: Student Group Instructor,Student Group Instructor,Studentgruppsinstruktör
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Huvud
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Huvud
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Ställ prefix för nummerserie på dina transaktioner
 DocType: Employee Attendance Tool,Employees HTML,Anställda HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) måste vara aktiv för denna artikel eller dess mall
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) måste vara aktiv för denna artikel eller dess mall
 DocType: Employee,Leave Encashed?,Lämna inlösen?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Möjlighet Från fältet är obligatoriskt
 DocType: Email Digest,Annual Expenses,årliga kostnader
 DocType: Item,Variants,Varianter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Skapa beställning
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Skapa beställning
 DocType: SMS Center,Send To,Skicka Till
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Det finns inte tillräckligt ledighet balans för Lämna typ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Avsatt mängd
@@ -1961,6 +1997,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Studentgruppsstyrkan
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Mot Journal anteckning {0} inte har någon matchat {1} inlägg
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,bedömningar
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Utbildningshändelser
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Duplicera Löpnummer upp till punkt {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,En förutsättning för en frakt Regel
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Stig på
@@ -1970,7 +2007,7 @@
 DocType: Sales Order,To Deliver and Bill,Att leverera och Bill
 DocType: Student Group,Instructors,instruktörer
 DocType: GL Entry,Credit Amount in Account Currency,Credit Belopp i konto Valuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} måste lämnas in
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} måste lämnas in
 DocType: Authorization Control,Authorization Control,Behörighetskontroll
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Rad # {0}: Avslag Warehouse är obligatoriskt mot förkastade Punkt {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Betalning
@@ -1989,11 +2026,11 @@
 DocType: Quotation Item,Actual Qty,Faktiska Antal
 DocType: Sales Invoice Item,References,Referenser
 DocType: Quality Inspection Reading,Reading 10,Avläsning 10
-DocType: Hub Settings,Hub Node,Nav Nod
+DocType: Hub Category,Hub Node,Nav Nod
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Du har angett dubbletter. Vänligen rätta och försök igen.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Associate
 DocType: Asset Movement,Asset Movement,Asset Rörelse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,ny vagn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,ny vagn
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Produktt {0} är inte en serialiserad Produkt
 DocType: SMS Center,Create Receiver List,Skapa Mottagare Lista
 DocType: Vehicle,Wheels,hjul
@@ -2007,15 +2044,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekommunikation
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Anger att paketet är en del av denna leverans (endast utkast)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Skapa inbetalninginlägg
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Kvantitet för artikel {0} måste vara mindre än {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Kvantitet för artikel {0} måste vara mindre än {1}
 ,Sales Invoice Trends,Fakturan Trender
 DocType: Leave Application,Apply / Approve Leaves,Ansök / Godkänn ledigheter
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,För
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,För
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Kan hänvisa till rad endast om avgiften är ""På föregående v Belopp"" eller ""Föregående rad Total"""
 DocType: Sales Order Item,Delivery Warehouse,Leverans Lager
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Träd av finansiella kostnadsställen.
 DocType: Serial No,Delivery Document No,Leverans Dokument nr
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Ställ &quot;Vinst / Förlust konto på Asset Avfallshantering &#39;i sällskap {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Ställ &quot;Vinst / Förlust konto på Asset Avfallshantering &#39;i sällskap {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Hämta objekt från kvitton
 DocType: Serial No,Creation Date,Skapelsedagen
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Punkt {0} visas flera gånger i prislista {1}
@@ -2026,12 +2063,13 @@
 DocType: Student,Student Mobile Number,Student Mobilnummer
 DocType: Item,Has Variants,Har Varianter
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Uppdatera svar
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Du har redan valt objekt från {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Du har redan valt objekt från {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Namn på månadens distribution
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch-ID är obligatoriskt
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch-ID är obligatoriskt
 DocType: Sales Person,Parent Sales Person,Överordnad Försäljningsperson
-DocType: Purchase Invoice,Recurring Invoice,Återkommande Faktura
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Hög till låg
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Välj programmet först
 DocType: Patient Appointment,Patient Age,Patientåldern
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Hantera projekt
 DocType: Supplier,Supplier of Goods or Services.,Leverantör av varor eller tjänster.
@@ -2039,8 +2077,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Standardfordringar som kan användas om den inte är inställd på patienten för att boka konsultavgifter.
 DocType: Vehicle Log,Fuel Price,bränsle~~POS=TRUNC Pris
 DocType: Budget,Budget,Budget
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Ange öppet
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Fast Asset Objektet måste vara en icke-lagervara.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Ange öppet
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Fast Asset Objektet måste vara en icke-lagervara.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget kan inte tilldelas mot {0}, eftersom det inte är en intäkt eller kostnad konto"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Uppnått
 DocType: Student Admission,Application Form Route,Ansökningsblankett Route
@@ -2054,12 +2092,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Produkt {0} är inte inställt för Serial Nos. Kontrollera huvudprodukt
 DocType: Maintenance Visit,Maintenance Time,Servicetid
 ,Amount to Deliver,Belopp att leverera
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Samma sak har skrivits in flera gånger. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Termen Startdatum kan inte vara tidigare än året Startdatum för läsåret som termen är kopplad (läsåret {}). Rätta datum och försök igen.
 DocType: Guardian,Guardian Interests,Guardian Intressen
 DocType: Naming Series,Current Value,Nuvarande Värde
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Flera räkenskapsår finns för dagen {0}. Ställ företag under räkenskapsåret
 DocType: School Settings,Instructor Records to be created by,Instruktörsrekord som ska skapas av
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} skapad
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} skapad
 DocType: Delivery Note Item,Against Sales Order,Mot kundorder
 ,Serial No Status,Serial No Status
 DocType: Payment Entry Reference,Outstanding,Utestående
@@ -2069,10 +2108,10 @@
 						must be greater than or equal to {2}","Rad {0}: Om du vill ställa {1} periodicitet, tidsskillnad mellan från och till dags datum \ måste vara större än eller lika med {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Detta är baserat på aktie rörelse. Se {0} för mer information
 DocType: Pricing Rule,Selling,Försäljnings
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Belopp {0} {1} avräknas mot {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Belopp {0} {1} avräknas mot {2}
 DocType: Employee,Salary Information,Lön Information
 DocType: Sales Person,Name and Employee ID,Namn och Anställnings ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Förfallodatum kan inte vara före Publiceringsdatum
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Förfallodatum kan inte vara före Publiceringsdatum
 DocType: Website Item Group,Website Item Group,Webbplats Produkt Grupp
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Tullar och skatter
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Ange Referensdatum
@@ -2098,7 +2137,7 @@
 DocType: Issue,Resolution Details,Åtgärds Detaljer
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,anslag
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Acceptanskriterier
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Ange Material Begäran i ovanstående tabell
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Ange Material Begäran i ovanstående tabell
 DocType: Item Attribute,Attribute Name,Attribut Namn
 DocType: BOM,Show In Website,Visa i Webbsida
 DocType: Shopping Cart Settings,Show Quantity in Website,Visa Kvantitet i Website
@@ -2107,7 +2146,7 @@
 DocType: Item Reorder,Check in (group),Checka in (grupp)
 ,Qty to Order,Antal till Ordern
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Konto huvudet under skuld eller eget kapital, där vinst / förlust bokas"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Gantt-schema för alla uppgifter.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Gantt-schema för alla uppgifter.
 DocType: Opportunity,Mins to First Response,Minuter till First Response
 DocType: Pricing Rule,Margin Type,marginal Type
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} timmar
@@ -2128,36 +2167,36 @@
 DocType: Patient,Surgical History,Kirurgisk historia
 DocType: Employee,Resignation Letter Date,Avskedsbrev Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Prissättning Regler ytterligare filtreras baserat på kvantitet.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Ange datum för anslutning till anställd {0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Ange datum för anslutning till anställd {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Ange datum för anslutning till anställd {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Ange datum för anslutning till anställd {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Totalt Billing Belopp (via Tidrapportering)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Upprepa kund Intäkter
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) måste ha rollen ""Utgiftsgodkännare"""
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Par
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Välj BOM och Antal för produktion
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Välj BOM och Antal för produktion
 DocType: Asset,Depreciation Schedule,avskrivningsplanen
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Försäljningspartneradresser och kontakter
 DocType: Bank Reconciliation Detail,Against Account,Mot Konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Halv Dag Datum bör vara mellan Från datum och hittills
 DocType: Maintenance Schedule Detail,Actual Date,Faktiskt Datum
 DocType: Item,Has Batch No,Har Sats nr
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Årlig Billing: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Årlig Billing: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Varor och tjänster Skatt (GST Indien)
 DocType: Delivery Note,Excise Page Number,Punktnotering sidnummer
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Företag, är obligatorisk Från datum och Till datum"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Få från samråd
 DocType: Asset,Purchase Date,inköpsdatum
 DocType: Employee,Personal Details,Personliga Detaljer
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Ställ &quot;Asset Avskrivningar kostnadsställe&quot; i bolaget {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Ställ &quot;Asset Avskrivningar kostnadsställe&quot; i bolaget {0}
 ,Maintenance Schedules,Underhålls scheman
 DocType: Task,Actual End Date (via Time Sheet),Faktisk Slutdatum (via Tidrapportering)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Belopp {0} {1} mot {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Belopp {0} {1} mot {2} {3}
 ,Quotation Trends,Offert Trender
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Produktgruppen nämns inte i huvudprodukten för objektet {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Debitering av konto måste vara ett mottagarkonto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Debitering av konto måste vara ett mottagarkonto
 DocType: Shipping Rule Condition,Shipping Amount,Fraktbelopp
 DocType: Supplier Scorecard Period,Period Score,Periodpoäng
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Lägg till kunder
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Lägg till kunder
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Väntande antal
 DocType: Lab Test Template,Special,Särskild
 DocType: Purchase Invoice Item,Conversion Factor,Omvandlingsfaktor
@@ -2165,13 +2204,14 @@
 ,Vehicle Expenses,fordons Kostnader
 DocType: Serial No,Invoice Details,Faktura detaljer
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Förväntat värde efter livslängd måste vara större än eller lika med {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Börja på
+DocType: Hub Category,Hub Category,Navkategori
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Fordonsnummer
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,Den dag då återkommande faktura kommer att stoppa
 DocType: Employee Loan,Loan Amount,Lånebelopp
 DocType: Program Enrollment,Self-Driving Vehicle,Självkörande fordon
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Leverantörs Scorecard Standing
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Row {0}: Bill of Materials hittades inte för objektet {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Row {0}: Bill of Materials hittades inte för objektet {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Totalt tilldelade blad {0} kan inte vara mindre än redan godkända blad {1} för perioden
 DocType: Journal Entry,Accounts Receivable,Kundreskontra
 ,Supplier-Wise Sales Analytics,Leverantör-Wise Sales Analytics
@@ -2183,7 +2223,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)",Föräldrarkurs (lämna tomt om detta inte ingår i föräldrakursen)
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Lämna tomt om det anses vara för alla typer  av anställda
 DocType: Landed Cost Voucher,Distribute Charges Based On,Fördela avgifter som grundas på
-apps/erpnext/erpnext/hooks.py +131,Timesheets,tidrapporter
+apps/erpnext/erpnext/hooks.py +140,Timesheets,tidrapporter
 DocType: HR Settings,HR Settings,HR Inställningar
 DocType: Salary Slip,net pay info,nettolön info
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Detta värde uppdateras i standardförsäljningsprislistan.
@@ -2194,7 +2234,7 @@
 DocType: Patient,B Positive,B Positiv
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rad # {0}: Antal måste vara en, som objektet är en anläggningstillgång. Använd separat rad för flera st."
 DocType: Leave Block List Allow,Leave Block List Allow,Lämna Block List Tillåt
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Förkortning kan inte vara tomt
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Förkortning kan inte vara tomt
 DocType: Patient Medical Record,Patient Medical Record,Patient Medical Record
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Grupp till icke-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
@@ -2211,9 +2251,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Det gick inte att hitta växelkursen för {0} till {1} för nyckeldatum {2}. Var god skapa en valutautbyteslista manuellt
 DocType: POS Profile,Price List,Prislista
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} är nu standard räkenskapsår. Vänligen uppdatera din webbläsare för att ändringen ska träda i kraft.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Räkningar
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Räkningar
 DocType: Issue,Support,Stöd
 ,BOM Search,BOM Sök
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Publicera &quot;I lager&quot; eller &quot;Ej i lager&quot; på nav baserat på lager som finns i lageret.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Stänger (Öppna + Totals)
 DocType: Vehicle,Fuel Type,Bränsletyp
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Ange valuta i bolaget
@@ -2225,16 +2266,16 @@
 DocType: Healthcare Settings,Remind Before,Påminn före
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM omräkningsfaktor i rad {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rad # {0}: Referensdokument Type måste vara en av kundorder, försäljningsfakturan eller journalanteckning"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rad # {0}: Referensdokument Type måste vara en av kundorder, försäljningsfakturan eller journalanteckning"
 DocType: Salary Component,Deduction,Avdrag
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Rad {0}: Från tid och till tid är obligatorisk.
 DocType: Stock Reconciliation Item,Amount Difference,mängd Skillnad
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Artikel Pris till för {0} i prislista {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Artikel Pris till för {0} i prislista {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Ange anställnings Id för denna säljare
 DocType: Territory,Classification of Customers by region,Klassificering av kunder per region
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Skillnad Belopp måste vara noll
 DocType: Project,Gross Margin,Bruttomarginal
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Ange Produktionsartikel först
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Ange Produktionsartikel först
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Beräknat Kontoutdrag balans
 DocType: Normal Test Template,Normal Test Template,Normal testmall
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,inaktiverad användare
@@ -2244,21 +2285,22 @@
 DocType: Salary Slip,Total Deduction,Totalt Avdrag
 ,Production Analytics,produktions~~POS=TRUNC Analytics
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Detta baseras på transaktioner mot denna patient. Se tidslinjen nedan för detaljer
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Kostnad Uppdaterad
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Kostnad Uppdaterad
 DocType: Employee,Date of Birth,Födelsedatum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Punkt {0} redan har returnerat
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Räkenskapsårets ** representerar budgetåret. Alla bokföringsposter och andra större transaktioner spåras mot ** räkenskapsår **.
 DocType: Opportunity,Customer / Lead Address,Kund / Huvudadress
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Leverans Scorecard Setup
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Varning: Ogiltig SSL-certifikat på fäst {0}
-DocType: Student Admission,Eligibility,Behörighet
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Bedömningsplan Namn
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Varning: Ogiltig SSL-certifikat på fäst {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Leads hjälpa dig att få verksamheten, lägga till alla dina kontakter och mer som dina leder"
 DocType: Production Order Operation,Actual Operation Time,Faktisk driftstid
 DocType: Authorization Rule,Applicable To (User),Är tillämpligt för (Användare)
 DocType: Purchase Taxes and Charges,Deduct,Dra av
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Arbetsbeskrivning
 DocType: Student Applicant,Applied,Applicerad
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Återuppta
 DocType: Sales Invoice Item,Qty as per Stock UOM,Antal per lager UOM
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 Namn
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specialtecken utom &quot;-&quot; &quot;.&quot;, &quot;#&quot;, och &quot;/&quot; inte tillåtet att namnge serie"
@@ -2270,7 +2312,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Tillverkningsansvarig
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Löpnummer {0} är under garanti upp till {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Split följesedel i paket.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Transporter
+apps/erpnext/erpnext/hooks.py +107,Shipments,Transporter
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Sammanlagda anslaget (Company valuta)
 DocType: Purchase Order Item,To be delivered to customer,Som skall levereras till kund
 DocType: BOM,Scrap Material Cost,Skrot Material Kostnad
@@ -2293,8 +2335,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Alternativ för varianter av varianter
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Välj Företaget ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Lämna tomt om det anses vara för alla avdelningar
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Typer av anställning (permanent, kontrakts, praktikant osv)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} är obligatoriskt för punkt {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Typer av anställning (permanent, kontrakts, praktikant osv)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} är obligatoriskt för punkt {1}
 DocType: Process Payroll,Fortnightly,Var fjortonde dag
 DocType: Currency Exchange,From Currency,Från Valuta
 DocType: Vital Signs,Weight (In Kilogram),Vikt (i kilogram)
@@ -2319,7 +2361,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Klicka på ""Skapa schema"" för att få schemat"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Det fanns fel vid borttagning följande scheman:
 DocType: Bin,Ordered Quantity,Beställd kvantitet
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",t.ex. &quot;Bygg verktyg för byggare&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",t.ex. &quot;Bygg verktyg för byggare&quot;
 DocType: Grading Scale,Grading Scale Intervals,Betygsskal
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: kontering för {2} kan endast göras i valuta: {3}
 DocType: Production Order,In Process,Pågående
@@ -2343,11 +2385,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Med betalning av skatt
 DocType: Expense Claim Detail,Expense Claim Detail,Räkningen Detalj
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLIKAT FÖR LEVERANTÖR
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Välj rätt konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Välj rätt konto
 DocType: Item,Weight UOM,Vikt UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Lönestruktur anställd
 DocType: Patient,Blood Group,Blodgrupp
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Väntar
 DocType: Course,Course Name,KURSNAMN
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Användare som kan godkänna en specifik arbetstagarens ledighet applikationer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Kontorsutrustning
@@ -2366,7 +2407,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Priserna kommer inte att visas om prislista inte är inställd
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Ange ett land för frakt regel eller kontrollera Världsomspännande sändnings
 DocType: Stock Entry,Total Incoming Value,Totalt Inkommande Värde
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Debitering krävs
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Debitering krävs
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Tidrapporter hjälpa till att hålla reda på tid, kostnad och fakturering för aktiviteter som utförts av ditt team"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Inköps Prislista
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Mallar med leverantörsspecifika variabler.
@@ -2376,7 +2417,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Betalning Avstämning
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Välj Ansvariges namn
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknik
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Totalt Obetalda: {0}
+DocType: Hub Settings,Unregister from Hub,Avregistrera från nav
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Totalt Obetalda: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Webbplats Operation
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Erbjudande Brev
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generera Material Begäran (GMB) och produktionsorder.
@@ -2388,7 +2430,9 @@
 DocType: Physician Schedule Time Slot,To Time,Till Time
 DocType: Authorization Rule,Approving Role (above authorized value),Godkännande Roll (ovan auktoriserad värde)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Kredit till konto måste vara en skuld konto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan inte vara över eller barn under {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Vänligen välj Studenttillträde, vilket är obligatoriskt för den studerande som betalas"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan inte vara över eller barn under {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Var god välj en prislista för att publicera priser
 DocType: Production Order Operation,Completed Qty,Avslutat Antal
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",För {0} kan bara debitkonton länkas mot en annan kreditering
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Prislista {0} är inaktiverad
@@ -2401,39 +2445,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serienummer krävs för punkt {1}. Du har gett {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Nuvarande värderingensomsättning
 DocType: Item,Customer Item Codes,Kund artikelnummer
+DocType: Training Event,Advance,Förskott
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,för att återkomma igen.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange vinst / förlust
 DocType: Opportunity,Lost Reason,Förlorad Anledning
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Ny adress
 DocType: Quality Inspection,Sample Size,Provstorlek
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Ange Kvitto Dokument
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Alla objekt har redan fakturerats
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Ange ett giltigt Från ärende nr &quot;
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',Ange ett giltigt Från ärende nr &quot;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Ytterligare kostnadsställen kan göras i grupperna men poster kan göras mot icke-grupper
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Användare och behörigheter
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Produktionsorder Skapad: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Produktionsorder Skapad: {0}
 DocType: Branch,Branch,Bransch
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tryckning och Branding
 DocType: Company,Total Monthly Sales,Total månadsförsäljning
 DocType: Bin,Actual Quantity,Verklig Kvantitet
 DocType: Shipping Rule,example: Next Day Shipping,exempel: Nästa dag Leverans
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Löpnummer {0} hittades inte
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Prenumerationen har varit {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Prenumerationen har varit {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Avgiftsschema Program
 DocType: Fee Schedule Program,Student Batch,elev Batch
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,välj * från `tabVital Signs` där patient = &#39;{0}&#39; ordning med signs_date desc limit 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,gör Student
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Min betyg
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Du har blivit inbjuden att samarbeta i projektet: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Läkare inte tillgänglig på {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Du har blivit inbjuden att samarbeta i projektet: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Läkare inte tillgänglig på {0}
 DocType: Leave Block List Date,Block Date,Block Datum
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Lägg till anpassat fält Prenumerations-id i doktypen {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Leverantörsleveransnotering
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Ansök nu
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Ansök nu
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Faktiskt antal {0} / Vänta antal {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Faktiskt antal {0} / Vänta antal {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-handel GSTIN
 DocType: Sales Order,Not Delivered,Inte Levererad
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Förväntad Datum kan inte vara före Transaktionsdatum
 ,Bank Clearance Summary,Banken Clearance Sammanfattning
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Skapa och hantera dagliga, vecko- och månads epostflöden."
 DocType: Appraisal Goal,Appraisal Goal,Bedömning Mål
@@ -2441,12 +2486,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Byggnader
 DocType: Fee Schedule,Fee Structure,avgift struktur
 DocType: Timesheet Detail,Costing Amount,Kalkyl Mängd
-DocType: Student Admission,Application Fee,Anmälningsavgift
+DocType: Student Admission Program,Application Fee,Anmälningsavgift
 DocType: Process Payroll,Submit Salary Slip,Skicka lönebeskedet
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maximum rabatt för punkt {0} är {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Maximum rabatt för punkt {0} är {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import av Bulk
 DocType: Sales Partner,Address & Contacts,Adress och kontakter
 DocType: SMS Log,Sender Name,Avsändarnamn
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Sortera efter kriterier
 DocType: POS Profile,[Select],[Välj]
 DocType: Vital Signs,Blood Pressure (diastolic),Blodtryck (diastoliskt)
 DocType: SMS Log,Sent To,Skickat Till
@@ -2455,7 +2501,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Next Kontakt Datum kan inte vara i det förflutna
 DocType: Company,For Reference Only.,För referens.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Läkare {0} är inte tillgänglig på {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Välj batchnummer
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Välj batchnummer
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ogiltigt {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-retro
 DocType: Fee Validity,Reference Inv,Referens Inv
@@ -2471,15 +2517,15 @@
 DocType: Normal Test Items,Require Result Value,Kräver resultatvärde
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Ärendenr kan inte vara 0
 DocType: Item,Show a slideshow at the top of the page,Visa ett bildspel på toppen av sidan
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,stycklistor
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Butiker
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,stycklistor
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Butiker
 DocType: Project Type,Projects Manager,Projekt Chef
 DocType: Serial No,Delivery Time,Leveranstid
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Åldring Baserad på
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Avtalet avbröts
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Avtalet avbröts
 DocType: Item,End of Life,Uttjänta
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Resa
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Ingen aktiv eller standard lönestruktur hittades för arbetstagare {0} för de givna datum
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Resa
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Ingen aktiv eller standard lönestruktur hittades för arbetstagare {0} för de givna datum
 DocType: Leave Block List,Allow Users,Tillåt användare
 DocType: Purchase Order,Customer Mobile No,Kund Mobil nr
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Återkommande
@@ -2488,12 +2534,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Uppdatera Kostnad
 DocType: Item Reorder,Item Reorder,Produkt Ändra ordning
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Visa lönebesked
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Transfermaterial
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Transfermaterial
 DocType: Fees,Send Payment Request,Skicka betalningsförfrågan
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Ange verksamhet, driftskostnad och ger en unik drift nej till din verksamhet."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Detta dokument är över gränsen med {0} {1} för posten {4}. Är du göra en annan {3} mot samma {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Ställ återkommande efter att ha sparat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Välj förändringsbelopp konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Välj förändringsbelopp konto
 DocType: Purchase Invoice,Price List Currency,Prislista Valuta
 DocType: Naming Series,User must always select,Användaren måste alltid välja
 DocType: Stock Settings,Allow Negative Stock,Tillåt Negativ lager
@@ -2513,7 +2559,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Anställd
 DocType: Sample Collection,Collected Time,Samlad tid
 DocType: Company,Sales Monthly History,Försäljning månadshistoria
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Välj Batch
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Välj Batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} är fullt fakturerad
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Vitala tecken
 DocType: Training Event,End Time,Sluttid
@@ -2521,16 +2567,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Betalnings Avdrag eller förlust
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standard avtalsvillkor för försäljning eller köp.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Grupp av Voucher
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Är du säker på att du vill avbryta detta möte?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Sales Pipeline
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Ställ in standardkonto i lönedel {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Obligatorisk På
 DocType: Rename Tool,File to Rename,Fil att byta namn på
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Välj BOM till punkt i rad {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Välj BOM till punkt i rad {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Konto {0} matchar inte företaget {1} i Konto: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Fastställt BOM {0} finns inte till punkt {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Underhållsschema {0} måste avbrytas innanman kan dra avbryta kundorder
+DocType: POS Profile,Applicable for Users,Gäller för användare
 DocType: Notification Control,Expense Claim Approved,Räkningen Godkänd
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Lönebesked av personal {0} redan skapats för denna period
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Lönebesked av personal {0} redan skapats för denna period
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Farmaceutiska
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kostnad för köpta varor
 DocType: Selling Settings,Sales Order Required,Kundorder krävs
@@ -2555,6 +2603,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Organisation
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Organisation
 DocType: BOM Update Tool,BOM Update Tool,BOM Update Tool
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Party-konto inte specificerat, var god installera standardpartykonto i företag"
 DocType: SG Creation Tool Course,Student Group Name,Student gruppnamn
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Skapa avgifter
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Se till att du verkligen vill ta bort alla transaktioner för företag. Dina basdata kommer att förbli som det är. Denna åtgärd kan inte ångras.
@@ -2563,29 +2612,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kan inte vara större än planerad kvantitet ({2}) i produktionsorder {3}
 DocType: Shipping Rule,Shipping Rule Label,Frakt Regel Etikett
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Användarforum
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Råvaror kan inte vara tomt.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Det gick inte att uppdatera lager, faktura innehåller släppa sjöfarten objekt."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Råvaror kan inte vara tomt.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Det gick inte att uppdatera lager, faktura innehåller släppa sjöfarten objekt."
 DocType: Lab Test Sample,Lab Test Sample,Lab Test Prov
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Du kan inte ändra kurs om BOM nämnts mot någon artikel
+DocType: Restaurant,Invoice Series Prefix,Faktura Serie Prefix
 DocType: Employee,Previous Work Experience,Tidigare Arbetslivserfarenhet
 DocType: Stock Entry,For Quantity,För Antal
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Ange planerad Antal till punkt {0} vid rad {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Ange planerad Antal till punkt {0} vid rad {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} inte lämnad
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Begäran efter artiklar
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Separat produktionsorder kommer att skapas för varje färdig bra objekt.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} måste vara negativ i gengäld dokument
 ,Minutes to First Response for Issues,Minuter till First Response för frågor
 DocType: Purchase Invoice,Terms and Conditions1,Villkor och Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,Namnet på institutet som du installerar systemet.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,Namnet på institutet som du installerar systemet.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Kontering frysta fram till detta datum, ingen kan göra / ändra posten förutom ange roll nedan."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Vänligen spara dokumentet innan du skapar underhållsschema
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Senaste pris uppdaterat i alla BOMs
 DocType: Fee Schedule,Successful,Framgångsrik
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projektstatus
 DocType: UOM,Check this to disallow fractions. (for Nos),Markera att tillåta bråkdelar. (För NOS)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Följande produktionsorder skapades:
-DocType: Student Admission,Naming Series (for Student Applicant),Naming Series (för Student Sökande)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Följande produktionsorder skapades:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Naming Series (för Student Sökande)
 DocType: Delivery Note,Transporter Name,Transportör Namn
 DocType: Authorization Rule,Authorized Value,Auktoriserad Värde
 DocType: BOM,Show Operations,Visa Operations
@@ -2609,7 +2659,7 @@
 ,Employees working on a holiday,Anställda som arbetar på en semester
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Närvarande
 DocType: Project,% Complete Method,% Komplett metod
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Läkemedel
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Läkemedel
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Underhåll startdatum kan inte vara före leveransdatum för Löpnummer {0}
 DocType: Production Order,Actual End Date,Faktiskt Slutdatum
 DocType: BOM,Operating Cost (Company Currency),Driftskostnad (Company valuta)
@@ -2627,13 +2677,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Godkända användare kan inte vara samma användare som regeln är tillämpad på
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (enligt Stock UOM)
 DocType: SMS Log,No of Requested SMS,Antal Begärd SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Lämna utan lön inte stämmer överens med godkända Lämna ansökan registrerar
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Lämna utan lön inte stämmer överens med godkända Lämna ansökan registrerar
 DocType: Campaign,Campaign-.####,Kampanj -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Nästa steg
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Ange de specificerade poster till bästa möjliga pris
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Skapa Faktura
 DocType: Selling Settings,Auto close Opportunity after 15 days,Stäng automatiskt Affärsmöjlighet efter 15 dagar
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Inköpsorder är inte tillåtna för {0} på grund av ett scorecard med {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Inköpsorder är inte tillåtna för {0} på grund av ett scorecard med {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,slut År
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Bly%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Bly%
@@ -2641,6 +2691,7 @@
 DocType: Vital Signs,Nutrition Values,Näringsvärden
 DocType: Lab Test Template,Is billable,Är fakturerbar
 DocType: Delivery Note,DN-,DN
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Både &quot;Physician Schedule&quot; och Time Per Appointment &quot;måste ställas in för Dr {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,En tredjepartsdistributör / bonusagent / affiliate / återförsäljare som säljer företagets produkter för en provision.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} mot beställning {1}
 DocType: Patient,Patient Demographics,Patient Demographics
@@ -2670,7 +2721,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","Schablonskatt mall som kan tillämpas på alla köptransaktioner. Denna mall kan innehålla en lista över skatte huvuden och även andra kostnadshuvuden som &quot;Shipping&quot;, &quot;Försäkring&quot;, &quot;Hantera&quot; etc. #### Obs Skattesatsen du definierar här kommer att bli den schablonskatt för alla ** artiklar * *. Om det finns ** artiklar ** som har olika priser, måste de läggas till i ** Punkt skatt ** tabellen i ** Punkt ** mästare. #### Beskrivning av kolumner 1. Beräkning Typ: - Det kan vara på ** Net Totalt ** (som är summan av grundbeloppet). - ** I föregående v Totalt / Belopp ** (för kumulativa skatter eller avgifter). Om du väljer det här alternativet, kommer skatten att tillämpas som en procentandel av föregående rad (i skattetabellen) belopp eller total. - ** Faktisk ** (som nämns). 2. Konto Head: Konto huvudbok enligt vilket denna skatt kommer att bokas 3. Kostnadsställe: Om skatten / avgiften är en inkomst (som sjöfarten) eller kostnader det måste bokas mot ett kostnadsställe. 4. Beskrivning: Beskrivning av skatten (som ska skrivas ut i fakturor / citationstecken). 5. Sätt betyg: skattesats. 6. Belopp Momsbelopp. 7. Totalt: Ackumulerad total till denna punkt. 8. Skriv Row: Om baserad på &quot;Föregående rad Total&quot; kan du välja radnumret som kommer att tas som en bas för denna beräkning (standard är föregående rad). 9. Tänk skatt eller avgift för: I det här avsnittet kan du ange om skatten / avgiften är endast för värdering (inte en del av den totala) eller endast för total (inte tillföra värde till objektet) eller för båda. 10. Lägg till eller dra av: Oavsett om du vill lägga till eller dra av skatten."
 DocType: Homepage,Homepage,Hemsida
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Välj läkare ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',uppdateringsflikConsultationsuppsättningsfaktura = &#39;{0}&#39; där namn = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd Kvantitet
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Arvodes Records Skapad - {0}
 DocType: Asset Category Account,Asset Category Account,Tillgångsslag konto
@@ -2682,7 +2732,7 @@
 DocType: Asset,Manual,Manuell
 DocType: Salary Component Account,Salary Component Account,Lönedel konto
 DocType: Global Defaults,Hide Currency Symbol,Dölj Valutasymbol
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","t.ex. bank, kontanter, kreditkort"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","t.ex. bank, kontanter, kreditkort"
 DocType: Lead Source,Source Name,käll~~POS=TRUNC
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Normal vilande blodtryck hos en vuxen är cirka 120 mmHg systolisk och 80 mmHg diastolisk, förkortad &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Kreditnota
@@ -2701,16 +2751,16 @@
 DocType: Patient,Occupation,Ockupation
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Rad {0}: Startdatum måste vara före slutdatum
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Totalt (Antal)
-DocType: Sales Invoice,This Document,Det här dokumentet
 DocType: Installation Note Item,Installed Qty,Installerat antal
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Detta kan vara på grund av några ogiltiga e-postadresser i
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Du har lagt till
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,utbildning Resultat
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,utbildning Resultat
 DocType: Purchase Invoice,Is Paid,Är betalad
 DocType: Salary Structure,Total Earning,Totalt Tjänar
 DocType: Purchase Receipt,Time at which materials were received,Tidpunkt för material mottogs
 DocType: Stock Ledger Entry,Outgoing Rate,Utgående betyg
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Organisation gren ledare.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Organisation gren ledare.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,eller
 DocType: Sales Order,Billing Status,Faktureringsstatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Rapportera ett problem
@@ -2725,8 +2775,9 @@
 DocType: Notification Control,Sales Order Message,Kundorder Meddelande
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Ange standardvärden som bolaget, Valuta, varande räkenskapsår, etc."
 DocType: Payment Entry,Payment Type,Betalning Typ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Var god välj en sats för objekt {0}. Det går inte att hitta en enda sats som uppfyller detta krav
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Var god välj en sats för objekt {0}. Det går inte att hitta en enda sats som uppfyller detta krav
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Var god välj en sats för objekt {0}. Det går inte att hitta en enda sats som uppfyller detta krav
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Var god välj en sats för objekt {0}. Det går inte att hitta en enda sats som uppfyller detta krav
+DocType: Hub Category,Parent Category,Föräldrakategori
 DocType: Process Payroll,Select Employees,Välj Anställda
 DocType: Opportunity,Potential Sales Deal,Potentiella säljmöjligheter
 DocType: Complaint,Complaints,klagomål
@@ -2764,7 +2815,7 @@
 DocType: Bin,Reserved Quantity,Reserverad Kvantitet
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Ange giltig e-postadress
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Ange giltig e-postadress
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Var god välj ett objekt i vagnen
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Var god välj ett objekt i vagnen
 DocType: Landed Cost Voucher,Purchase Receipt Items,Inköpskvitto artiklar
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Anpassa formulären
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,Resterande skuld
@@ -2774,15 +2825,15 @@
 DocType: Payment Request,Amount in customer's currency,Belopp i kundens valuta
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Leverans
 DocType: Stock Reconciliation Item,Current Qty,Aktuellt Antal
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Lägg till leverantörer
+DocType: Restaurant Menu,Restaurant Menu,Restaurangmeny
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Föregående
 DocType: Appraisal Goal,Key Responsibility Area,Nyckelansvar Områden
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Student partier hjälpa dig att spåra närvaro, bedömningar och avgifter för studenter"
 DocType: Payment Entry,Total Allocated Amount,Sammanlagda anslaget
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Ange standardinventeringskonto för evig inventering
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Ange standardinventeringskonto för evig inventering
 DocType: Item Reorder,Material Request Type,Typ av Materialbegäran
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural Journal Entry för löner från {0} till {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","Localstorage är full, inte spara"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","Localstorage är full, inte spara"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Rad {0}: UOM Omvandlingsfaktor är obligatorisk
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Rumskapacitet
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref
@@ -2821,16 +2872,18 @@
 DocType: Project,Task Completion,uppgift Slutförande
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Inte i lager
 DocType: Appraisal,HR User,HR-Konto
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Skatter och avgifter Avdragen
-apps/erpnext/erpnext/hooks.py +129,Issues,Frågor
+apps/erpnext/erpnext/hooks.py +138,Issues,Frågor
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status måste vara en av {0}
 DocType: Sales Invoice,Debit To,Debitering
+DocType: Restaurant Menu Item,Restaurant Menu Item,Restaurang menyobjekt
 DocType: Delivery Note,Required only for sample item.,Krävs endast för provobjekt.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Faktiska Antal Efter transaktion
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Ingen lön slip hittades mellan {0} och {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Ingen lön slip hittades mellan {0} och {1}
 ,Pending SO Items For Purchase Request,I avvaktan på SO Artiklar till inköpsanmodan
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Student Antagning
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} är inaktiverad
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Student Antagning
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} är inaktiverad
 DocType: Supplier,Billing Currency,Faktureringsvaluta
 DocType: Sales Invoice,SINV-RET-,SINV-retro
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Extra Stor
@@ -2853,6 +2906,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Ange antal besökare (krävs)
 DocType: Stock Settings,Default Valuation Method,Standardvärderingsmetod
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,Avgift
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Uppdatering pågår. Det kan ta ett tag.
 DocType: Vehicle Log,Fuel Qty,bränsle Antal
 DocType: Production Order Operation,Planned Start Time,Planerad starttid
 DocType: Course,Assessment,Värdering
@@ -2868,7 +2922,7 @@
 DocType: Price List,Price List Master,Huvudprislista
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Alla försäljningstransaktioner kan märkas mot flera ** säljare ** så att du kan ställa in och övervaka mål.
 ,S.O. No.,SÅ Nej
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Skapa Kunden från Prospekt {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Skapa Kunden från Prospekt {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Välj patient
 DocType: Price List,Applicable for Countries,Gäller Länder
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Parameternamn
@@ -2900,27 +2954,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Utgift / Differens konto ({0}) måste vara ett ""vinst eller förlust"" konto"
 DocType: Project,Copied From,Kopierad från
 DocType: Project,Copied From,Kopierad från
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Namn fel: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Brist
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Namn fel: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,Brist
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} inte förknippas med {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Närvaro för anställd {0} är redan märkt
 DocType: Packing Slip,If more than one package of the same type (for print),Om mer än ett paket av samma typ (för utskrift)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Ange standardkund i Restauranginställningar
 ,Salary Register,lön Register
 DocType: Warehouse,Parent Warehouse,moderLager
 DocType: C-Form Invoice Detail,Net Total,Netto Totalt
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Standard BOM hittades inte för punkt {0} och projekt {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Standard BOM hittades inte för punkt {0} och projekt {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Definiera olika lån typer
 DocType: Bin,FCFS Rate,FCFS betyg
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Utestående Belopp
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Tid (i min)
 DocType: Project Task,Working,Arbetande
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock kö (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Budgetår
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Budgetår
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} tillhör inte Företag {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,Det gick inte att lösa kriterierna för funktionen {0}. Se till att formeln är giltig.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Kostnad som på
 DocType: Healthcare Settings,Out Patient Settings,Ut patientinställningar
 DocType: Account,Round Off,Runda Av
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Mängden måste vara positiv
 ,Requested Qty,Begärt Antal
 DocType: Tax Rule,Use for Shopping Cart,Används för Varukorgen
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Värde {0} för Attribut {1} finns inte i listan över giltiga Punkt attributvärden för punkt {2}
@@ -2929,7 +2985,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Avgifter kommer att fördelas proportionellt baserad på produktantal eller belopp, enligt ditt val"
 DocType: Maintenance Visit,Purposes,Ändamål
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Minst ett objekt ska anges med negativt kvantitet i returdokument
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Lägg till kurser
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} längre än alla tillgängliga arbetstiden i arbetsstation {1}, bryta ner verksamheten i flera operationer"
 ,Requested,Begärd
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Anmärkningar
@@ -2941,6 +2996,8 @@
 DocType: Employee Loan,Repaid/Closed,Återbetalas / Stängd
 DocType: Item,Total Projected Qty,Totala projicerade Antal
 DocType: Monthly Distribution,Distribution Name,Distributions Namn
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Leverantör&gt; Leverantörstyp
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Värderingsfrekvensen hittades inte för objektet {0}, vilket krävs för att göra bokföringsuppgifter för {1} {2}. Om objektet handlar som en nollvärdesfaktor i {1}, ange det i {1} Item-tabellen. Annars kan du skapa en inkommande aktieaffär för objektet eller ange värderingsfrekvensen i objektposten och försök sedan skicka in / av den här posten"
 DocType: Course,Course Code,Kurskod
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Kvalitetskontroll krävs för punkt {0}
 DocType: POS Settings,Use POS in Offline Mode,Använd POS i offline-läge
@@ -2951,14 +3008,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Hantera Områden.
 DocType: Journal Entry Account,Sales Invoice,Försäljning Faktura
 DocType: Journal Entry Account,Party Balance,Parti Balans
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,Välj Verkställ rabatt på
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Välj Verkställ rabatt på
 DocType: Company,Default Receivable Account,Standard Mottagarkonto
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Skapa Bankinlägg för den totala lönen för de ovan valda kriterier
 DocType: Physician,Physician Schedule,Läkare Schema
 DocType: Purchase Invoice,Deemed Export,Fördjupad export
 DocType: Stock Entry,Material Transfer for Manufacture,Material Transfer för Tillverkning
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Rabatt Procent kan appliceras antingen mot en prislista eller för alla prislistor.
-DocType: Purchase Invoice,Half-yearly,Halvårs
+DocType: Subscription,Half-yearly,Halvårs
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Kontering för lager
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Du har redan bedömt för bedömningskriterierna {}.
@@ -2987,13 +3044,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Extra Liten
 DocType: Company,Standard Template,standardmall
 DocType: Training Event,Theory,Teori
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Varning: Material Begärt Antal är mindre än Minimum Antal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Varning: Material Begärt Antal är mindre än Minimum Antal
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Kontot {0} är fruset
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juridisk person / Dotterbolag med en separat kontoplan som tillhör organisationen.
 DocType: Payment Request,Mute Email,Mute E
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Mat, dryck och tobak"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Kan bara göra betalning mot ofakturerade {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Provisionshastighet kan inte vara större än 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Kan bara göra betalning mot ofakturerade {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Provisionshastighet kan inte vara större än 100
 DocType: Stock Entry,Subcontract,Subkontrakt
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Ange {0} först
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Inga svar från
@@ -3011,10 +3068,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Färg
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Bedömningsplanskriterier
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Förhindra köporder
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Mottaglig
 DocType: Patient Appointment,Scheduled,Planerad
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Offertförfrågan.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vänligen uppsättning Anställningsnamnssystem i mänsklig resurs&gt; HR-inställningar
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Välj punkt där ""Är Lagervara"" är ""Nej"" och ""Är försäljningsprodukt"" är ""Ja"" och det finns ingen annat produktpaket"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Välj kund
 DocType: Student Log,Academic,Akademisk
 DocType: Patient,Personal and Social History,Personlig och social historia
 DocType: Fee Schedule,Fee Breakup for each student,Avgift för varje elev
@@ -3024,7 +3082,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Värderings betyg
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Prislista Valuta inte valt
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Prislista Valuta inte valt
 apps/erpnext/erpnext/config/healthcare.py +46,Results,Resultat
 ,Student Monthly Attendance Sheet,Student Monthly Närvaro Sheet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Anställd {0} har redan ansökt om {1} mellan {2} och {3}
@@ -3040,7 +3098,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Hantera Försäljning Partners.
 DocType: Quality Inspection,Inspection Type,Inspektionstyp
 DocType: Fee Validity,Visited yet,Besökt ännu
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Lager med befintlig transaktion kan inte konverteras till gruppen.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Lager med befintlig transaktion kan inte konverteras till gruppen.
 DocType: Assessment Result Tool,Result HTML,resultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Går ut den
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Lägg till elever
@@ -3067,7 +3125,7 @@
 DocType: Healthcare Settings,Result Printed,Resultat skrivet
 DocType: Asset Category Account,Depreciation Expense Account,Avskrivningar konto
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Provanställning
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Visa {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Visa {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Endast huvudnoder är tillåtna i transaktionen
 DocType: Expense Claim,Expense Approver,Utgiftsgodkännare
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Rad {0}: Advance mot Kunden måste vara kredit
@@ -3079,7 +3137,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Till Datetime
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Kurs Scheman utgå:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Loggar för att upprätthålla sms leveransstatus
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Ange försäljningsmål
 DocType: Accounts Settings,Make Payment via Journal Entry,Gör betalning via Journal Entry
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Tryckt på
 DocType: Item,Inspection Required before Delivery,Inspektion krävs innan leverans
@@ -3087,7 +3144,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Väntande Verksamhet
 DocType: Patient Appointment,Reminded,påminde
 DocType: Patient,PID-,PID
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Din organisation
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Din organisation
 DocType: Fee Component,Fees Category,avgifter Kategori
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Ange avlösningsdatum.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Ant
@@ -3099,7 +3156,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Ombeställningsnivå
 DocType: Company,Chart Of Accounts Template,Konto Mall
 DocType: Attendance,Attendance Date,Närvaro Datum
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Artikel Pris uppdaterad för {0} i prislista {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Artikel Pris uppdaterad för {0} i prislista {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Lön upplösning baserat på inkomster och avdrag.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Konto med underordnade noder kan inte omvandlas till liggaren
 DocType: Purchase Invoice Item,Accepted Warehouse,Godkänt Lager
@@ -3115,9 +3172,10 @@
 ,Employee Birthday,Anställd Födelsedag
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Elev Batch Närvaro Tool
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,gräns Korsade
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Schemalagt Upto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Tilldelningskapital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,En termin med detta &quot;Academic Year &#39;{0} och&quot; Term Name &quot;{1} finns redan. Ändra dessa poster och försök igen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}",Eftersom det finns transaktioner mot produkten {0} så kan du inte ändra värdet av {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}",Eftersom det finns transaktioner mot produkten {0} så kan du inte ändra värdet av {1}
 DocType: UOM,Must be Whole Number,Måste vara heltal
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nya Ledigheter Tilldelade (i dagar)
 DocType: Purchase Invoice,Invoice Copy,Faktura kopia
@@ -3127,7 +3185,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
 DocType: Shopping Cart Settings,Orders,Beställningar
 DocType: Employee Leave Approver,Leave Approver,Ledighetsgodkännare
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Var god välj ett parti
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Var god välj ett parti
 DocType: Assessment Group,Assessment Group Name,Bedömning Gruppnamn
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material Överfört för tillverkning
 DocType: Expense Claim,"A user with ""Expense Approver"" role","En användare med ""Utgiftsgodkännare""-roll"
@@ -3142,7 +3200,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Period Utgående Post
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Välj avdelning ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Kostnadsställe med befintliga transaktioner kan inte omvandlas till grupp
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Mängden {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Mängden {0} {1} {2} {3}
 DocType: Account,Depreciation,Avskrivningar
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverantör (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Anställd närvaro Tool
@@ -3154,10 +3212,12 @@
 DocType: GL Entry,Voucher No,Rabatt nr
 ,Lead Owner Efficiency,Effektivitet hos ledningsägaren
 ,Lead Owner Efficiency,Effektivitet hos ledningsägaren
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Mest populär
 DocType: Leave Allocation,Leave Allocation,Ledighet tilldelad
 DocType: Payment Request,Recipient Message And Payment Details,Mottagare Meddelande och betalningsuppgifter
 DocType: Training Event,Trainer Email,Trainer E
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Material Begäran {0} skapades
+DocType: Restaurant Reservation,No of People,Antal människor
 DocType: Production Planning Tool,Include sub-contracted raw materials,Inkludera underleverantörer råvaror
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Mall av termer eller kontrakt.
 DocType: Purchase Invoice,Address and Contact,Adress och Kontakt
@@ -3166,10 +3226,11 @@
 DocType: Supplier,Last Day of the Next Month,Sista dagen i nästa månad
 DocType: Support Settings,Auto close Issue after 7 days,Stäng automatiskt Problem efter 7 dagar
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lämna inte kan fördelas före {0}, som ledighet balans redan har carry-vidarebefordras i framtiden ledighet tilldelningspost {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),OBS: På grund / Referens Datum överstiger tillåtna kundkreditdagar från {0} dag (ar)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),OBS: På grund / Referens Datum överstiger tillåtna kundkreditdagar från {0} dag (ar)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Sökande
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL FÖR MOTTAGARE
 DocType: Asset Category Account,Accumulated Depreciation Account,Ackumulerade avskrivningar konto
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Det här e-postmeddelandet är autogenererat
 DocType: Stock Settings,Freeze Stock Entries,Frys Lager Inlägg
 DocType: Program Enrollment,Boarding Student,Boarding Student
 DocType: Asset,Expected Value After Useful Life,Förväntat värde eller återanvändas
@@ -3177,7 +3238,7 @@
 DocType: Activity Cost,Billing Rate,Faktureringsfrekvens
 ,Qty to Deliver,Antal att leverera
 ,Stock Analytics,Arkiv Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Verksamheten kan inte lämnas tomt
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Verksamheten kan inte lämnas tomt
 DocType: Maintenance Visit Purpose,Against Document Detail No,Mot Dokument Detalj nr
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Party Type är obligatorisk
 DocType: Quality Inspection,Outgoing,Utgående
@@ -3200,7 +3261,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Välj studenter manuellt för aktivitetsbaserad grupp
 DocType: Journal Entry,User Remark,Användar Anmärkning
 DocType: Lead,Market Segment,Marknadssegment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Utbetalda beloppet kan inte vara större än den totala negativa utestående beloppet {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Utbetalda beloppet kan inte vara större än den totala negativa utestående beloppet {0}
 DocType: Supplier Scorecard Period,Variables,variabler
 DocType: Employee Internal Work History,Employee Internal Work History,Anställd interna arbetshistoria
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Closing (Dr)
@@ -3230,21 +3291,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Hämta uppdateringar
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} inte tillhör bolaget {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Material Begäran {0} avbryts eller stoppas
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Lämna ledning
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Lämna ledning
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Grupp per konto
 DocType: Sales Order,Fully Delivered,Fullt Levererad
 DocType: Lead,Lower Income,Lägre intäkter
+DocType: Restaurant Order Entry,Current Order,Nuvarande ordning
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Källa och mål lager kan inte vara samma för rad {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differenskonto måste vara en tillgång / skuld kontotyp, eftersom denna lageravstämning är en öppnings post"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Betalats Beloppet får inte vara större än Loan Mängd {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Gå till Program
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Inköpsordernr som krävs för punkt {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Produktionsorder inte skapat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Produktionsorder inte skapat
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Från datum&quot; måste vara efter &quot;Till datum&quot;
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Det går inte att ändra status som studerande {0} är kopplad med student ansökan {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Det går inte att ändra status som studerande {0} är kopplad med student ansökan {1}
 DocType: Asset,Fully Depreciated,helt avskriven
 ,Stock Projected Qty,Lager Projicerad Antal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Kund {0} tillhör inte projektet {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Kund {0} tillhör inte projektet {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Markerad Närvaro HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Citat är förslag, bud som du har skickat till dina kunder"
 DocType: Sales Order,Customer's Purchase Order,Kundens beställning
@@ -3255,8 +3317,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Ställ in Antal Avskrivningar bokat
 DocType: Supplier Scorecard Period,Calculations,beräkningar
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Värde eller Antal
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Produktioner Beställningar kan inte höjas för:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Produktioner Beställningar kan inte höjas för:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Minut
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ange Naming Series för {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Invoice,Purchase Taxes and Charges,Inköp skatter och avgifter
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Gå till Leverantörer
 ,Qty to Receive,Antal att ta emot
@@ -3270,7 +3333,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Tack till kontot måste vara ett balanskonto
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Alla Leverantörs Typer
 DocType: Global Defaults,Disable In Words,Inaktivera uttrycker in
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,Produktkod är obligatoriskt eftersom Varan inte är automatiskt numrerad
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,Produktkod är obligatoriskt eftersom Varan inte är automatiskt numrerad
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Offert {0} inte av typen {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Underhållsschema Produkt
 DocType: Sales Order,%  Delivered,% Levereras
@@ -3292,23 +3355,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Ingående balans kapital
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Försoning
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Återstående
 DocType: Appraisal,Appraisal,Värdering
 DocType: Purchase Invoice,GST Details,GST-detaljer
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},E-post som skickas till leverantören {0}
+DocType: Item,Default Sales Unit of Measure,Standardförsäljningsenhet av åtgärd
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum upprepas
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Firmatecknare
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Ledighetsgodkännare måste vara en av {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Skapa avgifter
-DocType: Hub Settings,Seller Email,Säljare E-post
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Totala inköpskostnaden (via inköpsfaktura)
 DocType: Training Event,Start Time,Starttid
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Välj antal
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Välj antal
 DocType: Customs Tariff Number,Customs Tariff Number,Tulltaxan Nummer
 DocType: Patient Appointment,Patient Appointment,Patientavnämning
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Godkännande Roll kan inte vara samma som roll regel är tillämplig på
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Avbeställa Facebook Twitter Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Avbeställa Facebook Twitter Digest
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Få leverantörer av
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} hittades inte för artikel {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Gå till kurser
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Meddelande Skickat
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Konto med underordnade noder kan inte ställas in som huvudbok
@@ -3321,11 +3387,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Material Överfört för tillverkning
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Konto {0} existerar inte
 DocType: Project,Project Type,Projekt Typ
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Barnuppgift finns för denna uppgift. Du kan inte ta bort denna uppgift.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Antingen mål antal eller målbeloppet är obligatorisk.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Kostnader för olika aktiviteter
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Inga fler resultat
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Kostnader för olika aktiviteter
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Inställning Händelser till {0}, eftersom personal bifogas nedan försäljare inte har en användar-ID {1}"
 DocType: Timesheet,Billing Details,Faktureringsuppgifter
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Källa och mål lager måste vara annorlunda
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Källa och mål lager måste vara annorlunda
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Ej tillåtet att uppdatera lagertransaktioner äldre än {0}
 DocType: Purchase Invoice Item,PR Detail,PR Detalj
 DocType: Sales Order,Fully Billed,Fullt fakturerad
@@ -3352,7 +3420,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Elektronisk Överföring
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Kontrollera alla
 DocType: Vehicle Log,Invoice Ref,faktura Ref
-DocType: Purchase Order,Recurring Order,Återkommande Order
 DocType: Company,Default Income Account,Standard Inkomstkonto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Kundgrupp / Kunder
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Oavslutade räkenskapsår Vinst / Förlust (Credit)
@@ -3366,9 +3433,9 @@
 DocType: Patient,A Negative,En negativ
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Inget mer att visa.
 DocType: Lead,From Customer,Från Kunden
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Samtal
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Samtal
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,En produkt
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,partier
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,partier
 DocType: Project,Total Costing Amount (via Time Logs),Totalt kalkyl Belopp (via Time Loggar)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Gör avgiftsschema
 DocType: Purchase Order Item Supplied,Stock UOM,Lager UOM
@@ -3393,7 +3460,7 @@
 DocType: School Settings,Current Academic Term,Nuvarande akademisk term
 DocType: School Settings,Current Academic Term,Nuvarande akademisk term
 DocType: Sales Order,Not Billed,Inte Billed
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Både Lagren måste tillhöra samma företag
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Både Lagren måste tillhöra samma företag
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Inga kontakter inlagda ännu.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Landad Kostnad rabattmängd
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Räkningar som framförts av leverantörer.
@@ -3402,7 +3469,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Rabattbelopp
 DocType: Purchase Invoice,Return Against Purchase Invoice,Återgå mot inköpsfaktura
 DocType: Item,Warranty Period (in days),Garantitiden (i dagar)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',uppdatera `tabPatient Appointment` set sales_invoice = &#39;{0}&#39; där namn = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Relation med Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Netto kassaflöde från rörelsen
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Produkt  4
@@ -3411,8 +3477,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Journalanteckning konto
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student-gruppen
 DocType: Shopping Cart Settings,Quotation Series,Offert Serie
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Ett objekt finns med samma namn ({0}), ändra objektets varugrupp eller byt namn på objektet"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Välj kund
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Ett objekt finns med samma namn ({0}), ändra objektets varugrupp eller byt namn på objektet"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Välj kund
 DocType: C-Form,I,jag
 DocType: Company,Asset Depreciation Cost Center,Avskrivning kostnadsställe
 DocType: Sales Order Item,Sales Order Date,Kundorder Datum
@@ -3421,6 +3487,7 @@
 DocType: Assessment Plan,Assessment Plan,Bedömningsplan
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Kund {0} är skapad.
 DocType: Stock Settings,Limit Percent,gräns Procent
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,För närvarande finns ingen lager i lager
 ,Payment Period Based On Invoice Date,Betalningstiden Baserad på Fakturadatum
 DocType: Sample Collection,No. of print,Antal utskrivningar
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Saknas valutakurser för {0}
@@ -3476,13 +3543,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Summa Avdrag - Loan Återbetalning
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,Aktuell BOM och Nya BOM kan inte vara samma
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Lön Slip ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Lön Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Datum för pensionering måste vara större än Datum för att delta
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Det fanns fel medan schemaläggning kurs på:
 DocType: Sales Invoice,Against Income Account,Mot Inkomst konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Levererad
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Produkt  {0}: Beställd st {1} kan inte vara mindre än minimiorder st {2} (definierat i punkt).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Produkt  {0}: Beställd st {1} kan inte vara mindre än minimiorder st {2} (definierat i punkt).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månadsdistributions Procent
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Vänligen logga in som en annan användare.
 DocType: Territory,Territory Targets,Territorium Mål
 DocType: Delivery Note,Transporter Info,Transporter info
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Ställ in default {0} i bolaget {1}
@@ -3490,13 +3558,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Samma leverantör har angetts flera gånger
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Brutto Vinst / Förlust
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Inköpsorder Artikelleverans
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Företagsnamn kan inte vara företag
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Företagsnamn kan inte vara företag
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Brevhuvuden för utskriftsmallar.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titlar för utskriftsmallar t.ex. Proforma faktura.
 DocType: Program Enrollment,Walking,Gående
 DocType: Student Guardian,Student Guardian,Student Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Värderingsavgifter kan inte markerats som inklusive
 DocType: POS Profile,Update Stock,Uppdatera lager
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,i prenumerationen
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Olika UOM för produkter kommer att leda till felaktiga (Total) Nettovikts värden. Se till att Nettovikt för varje post är i samma UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM betyg
 DocType: Asset,Journal Entry for Scrap,Journal Entry för skrot
@@ -3546,15 +3615,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Systemanvändare (inloggning) ID. Om inställt, kommer det att bli standard för alla HR former."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Från {1}
 DocType: Task,depends_on,beror på
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Köpt för uppdatering av senaste priset i allt material. Det kan ta några minuter.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Köpt för uppdatering av senaste priset i allt material. Det kan ta några minuter.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Namn på ett nytt konto. Obs: Vänligen inte skapa konton för kunder och leverantörer
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Landsvis standard adressmallar
 DocType: Sales Order Item,Supplier delivers to Customer,Leverantören levererar till kunden
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Föremål / {0}) är slut
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},På grund / Referens Datum kan inte vara efter {0}
+,Sales Payment Summary,Försäljningsbetalningssammanfattning
+DocType: Restaurant,Restaurant,Restaurang
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},På grund / Referens Datum kan inte vara efter {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data Import och export
 DocType: Patient,Account Details,Kontouppgifter
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Inga studenter Funnet
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Inga studenter Funnet
 DocType: Medical Department,Medical Department,Medicinska avdelningen
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Leverantör Scorecard Scoring Criteria
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Fakturabokningsdatum
@@ -3565,8 +3636,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Välj bokningsdatum innan du väljer Party
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Slut på AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Var god välj Citat
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Var god välj Citat
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Var god välj Citat
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Var god välj Citat
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antal Avskrivningar bokat kan inte vara större än Totalt antal Avskrivningar
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Skapa Servicebesök
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,Vänligen kontakta för användaren som har roll försäljningschef {0}
@@ -3574,7 +3645,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Företag (inte kund eller leverantör) ledare.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Detta grundar sig på närvaron av denna Student
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Inga studenter i
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Lägga till fler objekt eller öppna fullständiga formen
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Lägga till fler objekt eller öppna fullständiga formen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Följesedelsnoteringar {0} måste avbrytas innan du kan avbryta denna kundorder
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Gå till Användare
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Betald belopp + Avskrivningsbelopp kan inte vara större än Totalsumma
@@ -3594,37 +3665,40 @@
 DocType: Fee Schedule,Fee Schedule,avgift Schema
 DocType: Hub Settings,Publish Availability,Publicera tillgänglighet
 DocType: Company,Create Chart Of Accounts Based On,Skapa konto Baserad på
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Kan inte konvertera det till icke-grupp. Barnuppgifter finns.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Födelsedatum kan inte vara längre fram än i dag.
 ,Stock Ageing,Lager Åldrande
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Student {0} finns mot elev sökande {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Avrundningsjustering (företagsvaluta)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,tidrapport
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,tidrapport
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} {1} &quot;är inaktiverad
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ange som Open
 DocType: Cheque Print Template,Scanned Cheque,skannad Check
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Skicka automatiska meddelanden till kontakter på Skickar transaktioner.
 DocType: Timesheet,Total Billable Amount,Totala Fakturerbar Mängd
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Produkt 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Orderläggning
 DocType: Purchase Order,Customer Contact Email,Kundkontakt Email
 DocType: Warranty Claim,Item and Warranty Details,Punkt och garantiinformation
 DocType: Sales Team,Contribution (%),Bidrag (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Obs: Betalningpost kommer inte skapas eftersom ""Kontanter eller bankkonto"" angavs inte"
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Projektet {0} finns redan
 DocType: Medical Department,Nursing User,Sjuksköterska användare
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Ansvarsområden
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Giltighetstiden för denna notering har upphört.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Giltighetstiden för denna notering har upphört.
 DocType: Expense Claim Account,Expense Claim Account,Räkningen konto
 DocType: Accounts Settings,Allow Stale Exchange Rates,Tillåt inaktuella valutakurser
 DocType: Sales Person,Sales Person Name,Försäljnings Person Namn
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Ange minst 1 faktura i tabellen
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Lägg till användare
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Lägg till användare
 DocType: POS Item Group,Item Group,Produkt Grupp
 DocType: Item,Safety Stock,Säkerhetslager
 DocType: Healthcare Settings,Healthcare Settings,Sjukvård Inställningar
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Framsteg% för en uppgift kan inte vara mer än 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Framsteg% för en uppgift kan inte vara mer än 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Innan avstämning
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Till {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skatter och avgifter Added (Company valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Produkt Skatte Rad {0} måste ha typen Skatt eller intäkt eller kostnad eller Avgiftsbelagd
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Produkt Skatte Rad {0} måste ha typen Skatt eller intäkt eller kostnad eller Avgiftsbelagd
 DocType: Sales Order,Partly Billed,Delvis Faktuerard
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Punkt {0} måste vara en fast tillgångspost
 DocType: Item,Default BOM,Standard BOM
@@ -3640,6 +3714,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,Variabel
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Från Följesedel
 DocType: Student,Student Email Address,Student E-postadress
+DocType: Item,Hub Warehouse,Hub Warehouse
 DocType: Physician Schedule Time Slot,From Time,Från Tid
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,I lager:
 DocType: Notification Control,Custom Message,Anpassat Meddelande
@@ -3648,9 +3723,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Studentadress
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Studentadress
 DocType: Purchase Invoice,Price List Exchange Rate,Prislista Växelkurs
+DocType: POS Profile,POS Profile Name,POS-profilnamn
 DocType: Purchase Invoice Item,Rate,Betygsätt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Adressnamn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Adressnamn
 DocType: Stock Entry,From BOM,Från BOM
 DocType: Assessment Code,Assessment Code,bedömning kod
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Grundläggande
@@ -3664,11 +3740,12 @@
 DocType: Salary Slip,Salary Structure,Lönestruktur
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Flygbolag
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Problem Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Problem Material
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Ett fel uppstod när du skapade återkommande
 DocType: Material Request Item,For Warehouse,För Lager
 DocType: Employee,Offer Date,Erbjudandet Datum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citat
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Du befinner dig i offline-läge. Du kommer inte att kunna ladda tills du har nätverket.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Du befinner dig i offline-läge. Du kommer inte att kunna ladda tills du har nätverket.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Inga studentgrupper skapas.
 DocType: Purchase Invoice Item,Serial No,Serienummer
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Månatliga återbetalningen belopp kan inte vara större än Lånebelopp
@@ -3678,17 +3755,18 @@
 DocType: Salary Slip,Total Working Hours,Totala arbetstiden
 DocType: Subscription,Next Schedule Date,Nästa schemaläggningsdatum
 DocType: Stock Entry,Including items for sub assemblies,Inklusive poster för underheter
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Ange värde måste vara positiv
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Alla territorierna
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Ange värde måste vara positiv
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Alla territorierna
 DocType: Purchase Invoice,Items,Produkter
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student är redan inskriven.
 DocType: Fiscal Year,Year Name,År namn
 DocType: Process Payroll,Process Payroll,Process Lön
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Det finns mer semester än arbetsdagar denna månad.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Det finns mer semester än arbetsdagar denna månad.
 DocType: Product Bundle Item,Product Bundle Item,Produktpaket Punkt
 DocType: Sales Partner,Sales Partner Name,Försäljnings Partner Namn
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Begäran om Citat
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Begäran om Citat
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maximal Fakturabelopp
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hematology
 DocType: Normal Test Items,Normal Test Items,Normala testpunkter
 DocType: Student Language,Student Language,Student Språk
 apps/erpnext/erpnext/config/selling.py +23,Customers,kunder
@@ -3700,10 +3778,11 @@
 DocType: Issue,Opening Time,Öppnings Tid
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Från och Till datum krävs
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Värdepapper och råvarubörserna
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard mätenhet för Variant &quot;{0}&quot; måste vara samma som i Mall &quot;{1}&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard mätenhet för Variant &quot;{0}&quot; måste vara samma som i Mall &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,Beräkna baserad på
 DocType: Delivery Note Item,From Warehouse,Från Warehouse
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Inga objekt med Bill of Materials att tillverka
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Inga objekt med Bill of Materials att tillverka
+DocType: Restaurant,Default Customer,Standardkund
 DocType: Assessment Plan,Supervisor Name,Supervisor Namn
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Bekräfta inte om mötet är skapat för samma dag
 DocType: Program Enrollment Course,Program Enrollment Course,Program Inskrivningskurs
@@ -3730,7 +3809,7 @@
 DocType: Payment Entry,Internal Transfer,Intern transaktion
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Underkonto existerar för det här kontot. Du kan inte ta bort det här kontot.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Antingen mål antal eller målbeloppet är obligatorisk
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Ingen standard BOM finns till punkt {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Ingen standard BOM finns till punkt {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Välj Publiceringsdatum först
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Öppningsdatum ska vara innan Slutdatum
 DocType: Leave Control Panel,Carry Forward,Skicka Vidare
@@ -3766,6 +3845,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Totalt Närvarande
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,räkenskaper
 DocType: Drug Prescription,Hour,Timme
+DocType: Restaurant Order Entry,Last Sales Invoice,Sista försäljningsfaktura
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nya Löpnummer kan inte ha Lager. Lagermåste ställas in av lagerpost eller inköpskvitto
 DocType: Lead,Lead Type,Prospekt Typ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Du har inte behörighet att godkänna löv på Block Datum
@@ -3802,65 +3882,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Skapa användare
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,Gram
 DocType: Supplier Scorecard,Per Month,Per månad
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Kvantitet som Tillverkning måste vara större än 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Kvantitet som Tillverkning måste vara större än 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Besöksrapport för service samtal.
 DocType: Stock Entry,Update Rate and Availability,Uppdateringsfrekvens och tillgänglighet
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Andel som är tillåtet att ta emot eller leverera mer mot beställt antal. Till exempel: Om du har beställt 100 enheter. och din ersättning är 10% då du får ta emot 110 enheter.
 DocType: POS Customer Group,Customer Group,Kundgrupp
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Nytt parti-id (valfritt)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Nytt parti-id (valfritt)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Nytt parti-id (valfritt)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Nytt parti-id (valfritt)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Utgiftskonto är obligatorisk för produkten {0}
 DocType: BOM,Website Description,Webbplats Beskrivning
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Nettoförändringen i eget kapital
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Nyaste
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Vänligen avbryta inköpsfaktura {0} först
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-postadress måste vara unikt, redan för {0}"
 DocType: Serial No,AMC Expiry Date,AMC Förfallodatum
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,Mottagande
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,Mottagande
 ,Sales Register,Försäljningsregistret
 DocType: Daily Work Summary Settings Company,Send Emails At,Skicka e-post Vid
 DocType: Quotation,Quotation Lost Reason,Anledning förlorad Offert
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Välj din domän
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',välj * från tabPatient där namn = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Transaktions referensnummer {0} daterad {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Transaktions referensnummer {0} daterad {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Det finns inget att redigera.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Form View
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Sammanfattning för denna månad och pågående aktiviteter
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Form View
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Sammanfattning för denna månad och pågående aktiviteter
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Lägg till användare till din organisation, annat än dig själv."
 DocType: Customer Group,Customer Group Name,Kundgruppnamn
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Inga kunder än!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Inga kunder än!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Kassaflödesanalys
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeloppet kan inte överstiga Maximal låne Mängd {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licens
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Ta bort denna faktura {0} från C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Ta bort denna faktura {0} från C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Välj Överföring om du även vill inkludera föregående räkenskapsårs balans till detta räkenskapsår
 DocType: GL Entry,Against Voucher Type,Mot Kupongtyp
 DocType: Physician,Phone (R),Telefon (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Tidsspår läggs till
 DocType: Item,Attributes,Attributer
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Aktivera mall
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ange Naming Series för {0} via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Ange avskrivningskonto
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Sista beställningsdatum
 DocType: Patient,B Negative,B Negativ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Kontot {0} till inte företaget {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Serienumren i rad {0} matchar inte med leveransnotering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Serienumren i rad {0} matchar inte med leveransnotering
 DocType: Student,Guardian Details,Guardian Detaljer
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Närvaro för flera anställda
 DocType: Vehicle,Chassis No,chassi nr
 DocType: Payment Request,Initiated,Initierad
 DocType: Production Order,Planned Start Date,Planerat startdatum
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Var god välj en BOM
 DocType: Serial No,Creation Document Type,Skapande Dokumenttyp
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Slutdatumet måste vara större än startdatumet
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Slutdatumet måste vara större än startdatumet
 DocType: Leave Type,Is Encash,Är incheckad
 DocType: Leave Allocation,New Leaves Allocated,Nya Ledigheter Avsatta
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projektvis uppgifter finns inte tillgängligt för Offert
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Sluta på
 DocType: Project,Expected End Date,Förväntad Slutdatum
 DocType: Budget Account,Budget Amount,budget~~POS=TRUNC
 DocType: Appraisal Template,Appraisal Template Title,Bedömning mall Titel
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Från Date {0} för Employee {1} kan inte vara före anställdes Inträdesdatum {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Kommersiell
 DocType: Patient,Alcohol Current Use,Alkoholströmanvändning
+DocType: Student Admission Program,Student Admission Program,Studentträningsprogram
 DocType: Payment Entry,Account Paid To,Konto betalt för att
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Moderbolaget Punkt {0} får inte vara en lagervara
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Alla produkter eller tjänster.
@@ -3869,30 +3951,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budget för kontot {1} mot {2} {3} är {4}. Det kommer att överskrida av {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Rad {0} # Hänsyn måste vara av typen &quot;Fast Asset&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Ut Antal
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Regler för att beräkna fraktbeloppet för en försäljning
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,och unchcked Disabled in the
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Serien är obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansiella Tjänster
 DocType: Student Sibling,Student ID,Student-ID
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Olika typer av aktiviteter för Time Loggar
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Leverantörs Email
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Olika typer av aktiviteter för Time Loggar
 DocType: Tax Rule,Sales,Försäljning
 DocType: Stock Entry Detail,Basic Amount,BASBELOPP
 DocType: Training Event,Exam,Examen
 DocType: Complaint,Complaint,Klagomål
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Lager krävs för Lagervara {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Lager krävs för Lagervara {0}
 DocType: Leave Allocation,Unused leaves,Oanvända blad
 DocType: Patient,Alcohol Past Use,Alkohol tidigare användning
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Faktureringsstaten
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Överföring
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Fetch expanderande BOM (inklusive underenheter)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Överföring
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Fetch expanderande BOM (inklusive underenheter)
 DocType: Authorization Rule,Applicable To (Employee),Är tillämpligt för (anställd)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Förfallodatum är obligatorisk
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Förfallodatum är obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Påslag för Attribut {0} inte kan vara 0
 DocType: Journal Entry,Pay To / Recd From,Betala Till / RECD Från
 DocType: Naming Series,Setup Series,Inställnings Serie
 DocType: Payment Reconciliation,To Invoice Date,Att fakturadatum
 DocType: Supplier,Contact HTML,Kontakta HTML
 ,Inactive Customers,inaktiva kunder
+DocType: Student Admission Program,Maximum Age,Maximal ålder
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Kvitton
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Hur prissättning tillämpas?
@@ -3911,6 +3995,7 @@
 DocType: GL Entry,Remarks,Anmärkningar
 DocType: Payment Entry,Account Paid From,Konto betalas från
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Råvaru Artikelkod
+DocType: Task,Parent Task,Föräldrauppgift
 DocType: Journal Entry,Write Off Based On,Avskrivning Baseras på
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,gör Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Print och brevpapper
@@ -3919,20 +4004,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",Lön redan behandlas för perioden mellan {0} och {1} Lämna ansökningstiden kan inte vara mellan detta datumintervall.
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Installationsinfo för ett serienummer
 DocType: Guardian Interest,Guardian Interest,Guardian intresse
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Ange standardvärden för POS-fakturor
 apps/erpnext/erpnext/config/hr.py +177,Training,Utbildning
 DocType: Timesheet,Employee Detail,anställd Detalj
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Email ID
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Email ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,Nästa datum dag och Upprepa på dagen av månaden måste vara lika
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Nästa datum dag och Upprepa på dagen av månaden måste vara lika
 DocType: Lab Prescription,Test Code,Testkod
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Inställningar för webbplats hemsida
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ är inte tillåtna för {0} på grund av ett styrkort som står för {1}
 DocType: Offer Letter,Awaiting Response,Väntar på svar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Ovan
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Summa belopp {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Ogiltig attribut {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Summa belopp {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Ogiltig attribut {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Nämn om inte-standard betalnings konto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Samma sak har skrivits in flera gånger. {lista}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Var god välj bedömningsgruppen annan än &quot;Alla bedömningsgrupper&quot;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Rad {0}: Kostnadscentrum krävs för ett objekt {1}
 DocType: Training Event Employee,Optional,Frivillig
@@ -3955,13 +4040,15 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostnadsställe är obligatorisk för punkt {2}
 DocType: Vehicle,Policy No,policy Nej
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Få artiklar från produkt Bundle
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property",Eftersom lagret finns mot ett objekt {0} kan du inte aktivera varianternas egenskap
 DocType: Asset,Straight Line,Rak linje
 DocType: Project User,Project User,projektAnvändar
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Dela
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Dela
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Dela
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Dela
 DocType: GL Entry,Is Advance,Är Advancerad
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Närvaro Från Datum och närvaro hittills är obligatorisk
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,"Ange ""Är underleverantör"" som Ja eller Nej"
+DocType: Item,Default Purchase Unit of Measure,Standard inköpsenhet av åtgärd
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Senaste kommunikationsdatum
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Senaste kommunikationsdatum
 DocType: Sales Team,Contact No.,Kontakt nr
@@ -3970,7 +4057,6 @@
 DocType: Production Order,Check if material transfer entry is not required,Kontrollera om materialöverföring inte krävs
 DocType: Production Order,Check if material transfer entry is not required,Kontrollera om materialöverföring inte krävs
 DocType: Program Enrollment Tool,Get Students From,Få studenter från
-DocType: Hub Settings,Seller Country,Säljare Land
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publicera artiklar på webbplatsen
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Grupp dina elever i omgångar
 DocType: Authorization Rule,Authorization Rule,Auktoriseringsregel
@@ -3980,8 +4066,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Försäljnings Skatter och avgifter Mall
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Total (Credit)
 DocType: Repayment Schedule,Payment Date,Betalningsdag
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Ny sats antal
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Ny sats antal
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Ny sats antal
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Ny sats antal
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Kläder &amp; tillbehör
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,Kunde inte lösa viktad poängfunktion. Se till att formeln är giltig.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Antal Beställningar
@@ -3999,6 +4085,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rad # {0}: Asset {1} kan inte lämnas, är det redan {2}"
 DocType: Tax Rule,Billing Country,Faktureringsland
 DocType: Purchase Order Item,Expected Delivery Date,Förväntat leveransdatum
+DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurang Order Entry
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet och kredit inte är lika för {0} # {1}. Skillnaden är {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Representationskostnader
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Gör Material Request
@@ -4011,9 +4098,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Konto med befintlig transaktioner kan inte tas bort
 DocType: Vehicle,Last Carbon Check,Sista Carbon Check
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Rättsskydds
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Var god välj antal på rad
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Var god välj antal på rad
 DocType: Purchase Invoice,Posting Time,Boknings Tid
 DocType: Timesheet,% Amount Billed,% Belopp fakturerat
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Tid per möte&quot; har inte ställts in för Dr {0}. Lägg till det i läkarmästaren.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefon Kostnader
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Markera det här om du vill tvinga användaren att välja en serie innan du sparar. Det blir ingen standard om du kontrollera detta.
@@ -4024,6 +4112,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nya kund Intäkter
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Resekostnader
 DocType: Maintenance Visit,Breakdown,Nedbrytning
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Lägg till anpassat fält Prenumeration i doktypen {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan inte väljas {1}
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Uppdatera BOM-kostnad automatiskt via Scheduler, baserat på senaste värderingsfrekvens / prislista / senaste inköpshastighet för råvaror."
 DocType: Bank Reconciliation Detail,Cheque Date,Check Datum
@@ -4048,7 +4137,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Totalt Billing Belopp (via Time Loggar)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Leverantör Id
 DocType: Payment Request,Payment Gateway Details,Betalning Gateway Detaljer
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Kvantitet bör vara större än 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Kvantitet bör vara större än 0
 DocType: Journal Entry,Cash Entry,Kontantinlägg
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Underordnade noder kan endast skapas under &quot;grupp&quot; typ noder
 DocType: Leave Application,Half Day Date,Halvdag Datum
@@ -4066,12 +4155,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Obs: Punkt {0} inlagd flera gånger
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Alla kontakter.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Företagetsförkortning
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Användare {0} inte existerar
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Användare {0} inte existerar
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Förkortning
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Betalning Entry redan existerar
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Inte auktoriserad eftersom {0} överskrider gränser
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Lön mall mästare.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Patologi
+DocType: Restaurant Order Entry,Restaurant Table,Restaurangbord
 DocType: Leave Type,Max Days Leave Allowed,Max dagars ledighet tillåtna
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Ställ skatt Regel för varukorgen
 DocType: Purchase Invoice,Taxes and Charges Added,Skatter och avgifter Added
@@ -4083,10 +4174,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Offerter till prospekt eller kunder
 DocType: Stock Settings,Role Allowed to edit frozen stock,Roll tillåtet att redigera fryst lager
 ,Territory Target Variance Item Group-Wise,Territory Mål Varians Post Group-Wise
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Alla kundgrupper
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Alla kundgrupper
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,ackumulerade månads
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} är obligatorisk. Kanske Valutaväxlingsposten  inte är skapad för {1} till {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Skatte Mall är obligatorisk.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Skatte Mall är obligatorisk.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Konto {0}: Förälder konto {1} existerar inte
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prislista värde (Företagsvaluta)
 DocType: Products Settings,Products Settings,produkter Inställningar
@@ -4112,13 +4203,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Produktvis Skatte Detalj
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Institute Förkortning
 ,Item-wise Price List Rate,Produktvis Prislistavärde
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Leverantör Offert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Leverantör Offert
 DocType: Quotation,In Words will be visible once you save the Quotation.,I Ord kommer att synas när du sparar offerten.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Kvantitet ({0}) kan inte vara en fraktion i rad {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Kvantitet ({0}) kan inte vara en fraktion i rad {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,attrak-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Streckkod {0} används redan i punkt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Streckkod {0} används redan i punkt {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Regler för att lägga fraktkostnader.
 DocType: Item,Opening Stock,ingående lager
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kunden är obligatoriskt
@@ -4136,9 +4227,8 @@
 DocType: Customer,From Lead,Från Prospekt
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Order släppts för produktion.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Välj räkenskapsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS profil som krävs för att göra POS inlägg
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS profil som krävs för att göra POS inlägg
 DocType: Program Enrollment Tool,Enroll Students,registrera studenter
-DocType: Hub Settings,Name Token,Namn token
 DocType: Lab Test,Approved Date,Godkänd datum
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardförsäljnings
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Minst ett lager är obligatorisk
@@ -4156,7 +4246,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Personal administration
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Betalning Avstämning Betalning
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Skattefordringar
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Produktionsorder har varit {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Produktionsorder har varit {0}
 DocType: BOM Item,BOM No,BOM nr
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Journalanteckning {0} har inte konto {1} eller redan matchad mot andra kuponger
@@ -4176,8 +4266,8 @@
 DocType: Currency Exchange,To Currency,Till Valuta
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Tillåt följande användarna att godkänna ledighetsansökningar för grupp dagar.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Olika typer av utgiftsräkning.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Försäljningsfrekvensen för objektet {0} är lägre än dess {1}. Försäljningsfrekvensen bör vara minst {2}
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Försäljningsfrekvensen för objektet {0} är lägre än dess {1}. Försäljningsfrekvensen bör vara minst {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Försäljningsfrekvensen för objektet {0} är lägre än dess {1}. Försäljningsfrekvensen bör vara minst {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Försäljningsfrekvensen för objektet {0} är lägre än dess {1}. Försäljningsfrekvensen bör vara minst {2}
 DocType: Item,Taxes,Skatter
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Betald och inte levererats
 DocType: Project,Default Cost Center,Standardkostnadsställe
@@ -4191,15 +4281,15 @@
 DocType: Employee Loan,Fully Disbursed,fullt Utbetalt
 DocType: Maintenance Visit,Customer Feedback,Kund Feedback
 DocType: Account,Expense,Utgift
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Värdering kan inte vara större än maximal poäng
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Värdering kan inte vara större än maximal poäng
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Kunder och Leverantörer
 DocType: Item Attribute,From Range,Från räckvidd
 DocType: BOM,Set rate of sub-assembly item based on BOM,Ange sats för delmonteringsobjekt baserat på BOM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Syntax error i formel eller tillstånd: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Syntax error i formel eller tillstånd: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Det dagliga arbetet Sammanfattning Inställningar Company
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,Punkt {0} ignoreras eftersom det inte är en lagervara
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Skicka det här produktionsorder för ytterligare behandling.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Skicka det här produktionsorder för ytterligare behandling.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","För att inte tillämpa prissättning regel i en viss transaktion, bör alla tillämpliga prissättning regler inaktiveras."
 DocType: Assessment Group,Parent Assessment Group,Parent Assessment Group
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,jobb
@@ -4216,12 +4306,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Vänligen ange Företagets filter tomt om Group By är &quot;Company&quot;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Publiceringsdatum kan inte vara framtida tidpunkt
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Rad # {0}: Löpnummer {1} inte stämmer överens med {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,för att generera de återkommande
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Tillfällig ledighet
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Lab Test UOM.
 DocType: Batch,Batch ID,Batch-ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Obs: {0}
 ,Delivery Note Trends,Följesedel Trender
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Veckans Sammanfattning
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Veckans Sammanfattning
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,I lager Antal
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan endast uppdateras via aktietransaktioner
 DocType: Student Group Creation Tool,Get Courses,få Banor
@@ -4235,7 +4326,6 @@
 DocType: Purchase Order,To Bill,Till Bill
 DocType: Material Request,% Ordered,% Beordrade
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",För kursbaserad studentgrupp kommer kursen att valideras för varje student från de inskrivna kurser i programinsökan.
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Ange e-postadress separerade med kommatecken, kommer fakturan att skickas automatiskt visst datum"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Ackord
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Avg. Köpkurs
 DocType: Task,Actual Time (in Hours),Faktisk tid (i timmar)
@@ -4249,7 +4339,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Produkt  {0} är inte inställt för Serial Nos. Kolumn måste vara tom
 DocType: Accounts Settings,Accounts Settings,Kontoinställningar
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,Godkänna
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Inget resultat att skicka in
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Inget resultat att skicka in
 DocType: Customer,Sales Partner and Commission,Försäljningen Partner och kommissionen
 DocType: Employee Loan,Rate of Interest (%) / Year,Hastighet av intresse (%) / år
 ,Project Quantity,projekt Kvantitet
@@ -4261,55 +4351,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Svart
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosions Punkt
 DocType: Account,Auditor,Redigerare
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} objekt producerade
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} objekt producerade
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Läs mer
 DocType: Cheque Print Template,Distance from top edge,Avståndet från den övre kanten
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Prislista {0} är inaktiverad eller inte existerar
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Prislista {0} är inaktiverad eller inte existerar
 DocType: Purchase Invoice,Return,Återgå
 DocType: Production Order Operation,Production Order Operation,Produktionsorder Drift
 DocType: Pricing Rule,Disable,Inaktivera
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Verk betalning krävs för att göra en betalning
 DocType: Project Task,Pending Review,Väntar På Granskning
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Möten och samråd
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} är inte inskriven i batch {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} är inte inskriven i batch {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Tillgångs {0} kan inte skrotas, eftersom det redan är {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Totalkostnadskrav (via utgiftsräkning)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Frånvarande
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rad {0}: Valuta för BOM # {1} bör vara lika med den valda valutan {2}
 DocType: Journal Entry Account,Exchange Rate,Växelkurs
 DocType: Patient,Additional information regarding the patient,Ytterligare information om patienten
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Kundorder {0} är inte lämnat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Kundorder {0} är inte lämnat
 DocType: Homepage,Tag Line,Tag Linje
 DocType: Fee Component,Fee Component,avgift Komponent
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Fleet Management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Lägga till objekt från
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Fleet Management
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Lägga till objekt från
 DocType: Cheque Print Template,Regular,Regelbunden
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Total weightage av alla kriterier för bedömning måste vara 100%
-DocType: BOM,Last Purchase Rate,Senaste Beställningsvärde
+DocType: Purchase Order Item,Last Purchase Rate,Senaste Beställningsvärde
 DocType: Account,Asset,Tillgång
 DocType: Project Task,Task ID,Aktivitets-ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock kan inte existera till punkt {0} sedan har varianter
 DocType: Lab Test,Mobile,Mobil
 ,Sales Person-wise Transaction Summary,Försäljningen person visa transaktion Sammanfattning
 DocType: Training Event,Contact Number,Kontaktnummer
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Lager {0} existerar inte
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrera För ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Lager {0} existerar inte
 DocType: Monthly Distribution,Monthly Distribution Percentages,Månadsdistributions Procentsatser
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Det valda alternativet kan inte ha Batch
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Värdering hastighet hittades inte för föremål {0}, vilket krävs för att göra bokföringsposter för {1} {2}. Om objektet är transaktions som prov objekt i {1}, nämn det i {1} Punkt tabellen. Annars kan du skapa ett inkommande lagertransaktion för objektet eller omnämnande värderingstakten i post och försök sedan inlämning / avbryta denna post"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Av material som levereras mot detta följesedel
+DocType: Training Event,Has Certificate,Har certifikat
 DocType: Project,Customer Details,Kunduppgifter
 DocType: Employee,Reports to,Rapporter till
 ,Unpaid Expense Claim,Obetald räkningen
 DocType: Payment Entry,Paid Amount,Betalt belopp
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Utforska försäljningscykel
 DocType: Assessment Plan,Supervisor,Handledare
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,Uppkopplad
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,Uppkopplad
 ,Available Stock for Packing Items,Tillgängligt lager för förpackningsprodukter
 DocType: Item Variant,Item Variant,Produkt Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Bedömningsresultatverktyg
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Punkt
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Inlämnade order kan inte tas bort
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Inlämnade order kan inte tas bort
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Kontosaldo redan i Debit, du är inte tillåten att ställa ""Balans måste vara"" som ""Kredit"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Kvalitetshantering
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Punkt {0} har inaktiverats
@@ -4330,7 +4419,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Tillåt nollvärderingsfrekvens
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Tillåt nollvärderingsfrekvens
 DocType: Training Event Employee,Invited,inbjuden
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Flera aktiva lönestruktur hittades för arbetstagare {0} för de givna datum
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Flera aktiva lönestruktur hittades för arbetstagare {0} för de givna datum
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Setup Gateway konton.
 DocType: Employee,Employment Type,Anställnings Typ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Fasta tillgångar
@@ -4342,7 +4431,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Student E ID
 DocType: Employee,Notice (days),Observera (dagar)
 DocType: Tax Rule,Sales Tax Template,Moms Mall
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Välj objekt för att spara fakturan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Välj objekt för att spara fakturan
 DocType: Employee,Encashment Date,Inlösnings Datum
 DocType: Training Event,Internet,internet
 DocType: Special Test Template,Special Test Template,Särskild testmall
@@ -4351,7 +4440,7 @@
 DocType: Production Order,Planned Operating Cost,Planerade driftkostnader
 DocType: Academic Term,Term Start Date,Term Startdatum
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Oppräknare
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Härmed bifogas {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Härmed bifogas {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Kontoutdrag balans per huvudbok
 DocType: Job Applicant,Applicant Name,Sökandes Namn
 DocType: Authorization Rule,Customer / Item Name,Kund / artikelnamn
@@ -4371,7 +4460,7 @@
 DocType: Guardian,Guardian Of ,väktare
 DocType: Grading Scale Interval,Threshold,Tröskel
 DocType: BOM Update Tool,Current BOM,Aktuell BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Lägg till Serienr
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Lägg till Serienr
 DocType: Production Order Item,Available Qty at Source Warehouse,Tillgänglig kvantitet vid källlagret
 apps/erpnext/erpnext/config/support.py +22,Warranty,Garanti
 DocType: Purchase Invoice,Debit Note Issued,Debetnota utfärdad
@@ -4394,10 +4483,9 @@
 DocType: Account,Receivable,Fordran
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Rad # {0}: Inte tillåtet att byta leverantör som beställning redan existerar
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Roll som får godkänna transaktioner som överstiger kreditgränser.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Välj produkter i Tillverkning
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Basdata synkronisering, kan det ta lite tid"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Välj produkter i Tillverkning
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Basdata synkronisering, kan det ta lite tid"
 DocType: Item,Material Issue,Materialproblem
-DocType: Hub Settings,Seller Description,Säljare Beskrivning
 DocType: Employee Education,Qualification,Kvalifikation
 DocType: Item Price,Item Price,Produkt Pris
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap &amp; tvättmedel
@@ -4405,7 +4493,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Från Tiden kan inte vara större än då.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Beställde
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Återuppta
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Återuppta
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,Om det är aktiverat kommer systemet inte att uppdatera fälten för varianter från mallen men kommer att kopiera data för nedan nämnda fält samtidigt som den skapar en ny variant
 DocType: Salary Detail,Component,Komponent
 DocType: Assessment Criteria,Assessment Criteria Group,Bedömningskriteriegrupp
 DocType: Healthcare Settings,Patient Name By,Patientnamn Av
@@ -4415,7 +4504,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Ange Godkännande roll eller godkänna Användare
 DocType: Journal Entry,Write Off Entry,Avskrivningspost
 DocType: BOM,Rate Of Materials Based On,Hastighet av material baserade på
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Leverantör&gt; Leverantörstyp
+DocType: Item Variant Settings,Do not Update Variants,Uppdatera inte varianter
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Stöd Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Avmarkera alla
 DocType: POS Profile,Terms and Conditions,Villkor
@@ -4424,7 +4513,7 @@
 DocType: Leave Block List,Applies to Company,Gäller Företag
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,Det går inte att avbryta eftersom lämnad Lagernotering {0} existerar
 DocType: Employee Loan,Disbursement Date,utbetalning Datum
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&quot;Mottagare&quot; inte specificerat
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&quot;Mottagare&quot; inte specificerat
 DocType: BOM Update Tool,Update latest price in all BOMs,Uppdatera senaste priset i alla BOMs
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Vårdjournal
 DocType: Vehicle,Vehicle,Fordon
@@ -4439,14 +4528,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Avskrivningar och saldon
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Belopp {0} {1} överförs från {2} till {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Belopp {0} {1} överförs från {2} till {3}
 DocType: Sales Invoice,Get Advances Received,Få erhållna förskott
 DocType: Email Digest,Add/Remove Recipients,Lägg till / ta bort mottagare
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Transaktion inte tillåtet mot stoppad produktionsorder {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","För att ställa denna verksamhetsåret som standard, klicka på &quot;Ange som standard&quot;"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Ansluta sig
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Ansluta sig
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Brist Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Punkt variant {0} finns med samma attribut
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Punkt variant {0} finns med samma attribut
 DocType: Employee Loan,Repay from Salary,Repay från Lön
 DocType: Leave Application,LAP/,KNÄ/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Begärande betalning mot {0} {1} för mängden {2}
@@ -4459,7 +4548,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Försäljning Beställningsvara
 DocType: Salary Slip,Payment Days,Betalningsdagar
 DocType: Patient,Dormant,Vilande
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Lager med underordnade noder kan inte omvandlas till liggaren
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Lager med underordnade noder kan inte omvandlas till liggaren
 DocType: BOM,Manage cost of operations,Hantera kostnaderna för verksamheten
 DocType: Accounts Settings,Stale Days,Stale Days
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","När någon av de kontrollerade transaktionerna  är""Skickat"", en e-post pop-up öppnas automatiskt för att skicka ett mail till den tillhörande ""Kontakt"" i denna transaktion, med transaktionen som en bifogad fil. Användaren kan eller inte kan skicka e-post."
@@ -4473,10 +4562,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serienummer {0} redan har mottagits
 ,Requested Items To Be Transferred,Efterfrågade artiklar som ska överföras
 DocType: Expense Claim,Vehicle Log,fordonet Log
-DocType: Purchase Invoice,Recurring Id,Återkommande Id
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Förekomst av feber (temp&gt; 38,5 ° C eller upprepad temperatur&gt; 38 ° C / 100,4 ° F)"
 DocType: Customer,Sales Team Details,Försäljnings Team Detaljer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Ta bort permanent?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Ta bort permanent?
 DocType: Expense Claim,Total Claimed Amount,Totalt yrkade beloppet
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potentiella möjligheter för att sälja.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Ogiltigt {0}
@@ -4486,7 +4574,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Varuhus
 ,Item Delivery Date,Leveransdatum för artikel
 DocType: Warehouse,PIN,STIFT
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Setup din skola i ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Setup din skola i ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Basförändring Belopp (Company valuta)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Inga bokföringsposter för följande lager
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Spara dokumentet först.
@@ -4498,13 +4586,12 @@
 DocType: Task,Is Milestone,Är Milestone
 DocType: Daily Work Summary,Email Sent To,Email skickat till
 DocType: Budget,Warn,Varna
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Är du säker på att du vill avregistrera?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Alla andra anmärkningar, anmärkningsvärt ansträngning som ska gå i registren."
 DocType: BOM,Manufacturing User,Tillverkningsanvändare
 DocType: Purchase Invoice,Raw Materials Supplied,Råvaror Levereras
-DocType: Purchase Invoice,Recurring Print Format,Återkommande Utskriftsformat
 DocType: C-Form,Series,Serie
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Valutan i prislistan {0} måste vara {1} eller {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Lägg till produkter
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Valutan i prislistan {0} måste vara {1} eller {2}
 DocType: Appraisal,Appraisal Template,Bedömning mall
 DocType: Item Group,Item Classification,Produkt Klassificering
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Business Development Manager
@@ -4518,7 +4605,7 @@
 DocType: Item Attribute Value,Attribute Value,Attribut Värde
 ,Itemwise Recommended Reorder Level,Produktvis Rekommenderad Ombeställningsnivå
 DocType: Salary Detail,Salary Detail,lön Detalj
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Välj {0} först
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Välj {0} först
 DocType: Appointment Type,Physician,Läkare
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Batch {0} av Punkt {1} har löpt ut.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,samråd
@@ -4529,7 +4616,7 @@
 DocType: Salary Detail,Default Amount,Standard Mängd
 DocType: Lab Test Template,Descriptive,Beskrivande
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Lagret hittades inte i systemet
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Månadens Sammanfattning
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Månadens Sammanfattning
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalitetskontroll Läsning
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Frys lager äldre än` bör vara mindre än% d dagar.
 DocType: Tax Rule,Purchase Tax Template,Köp Tax Mall
@@ -4552,12 +4639,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Utbildningshändelser / resultat
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Ackumulerade avskrivningar som på
 DocType: Sales Invoice,C-Form Applicable,C-Form Tillämplig
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Operation Time måste vara större än 0 för drift {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Operation Time måste vara större än 0 för drift {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Warehouse är obligatoriskt
 DocType: Supplier,Address and Contacts,Adress och kontakter
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Omvandlings Detalj
 DocType: Program,Program Abbreviation,program Förkortning
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Produktionsorder kan inte skickas till en objektmall
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Produktionsorder kan inte skickas till en objektmall
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Avgifter uppdateras i inköpskvitto för varje post
 DocType: Warranty Claim,Resolved By,Åtgärdad av
 DocType: Bank Guarantee,Start Date,Start Datum
@@ -4583,26 +4670,27 @@
 DocType: Employee,Educational Qualification,Utbildnings Kvalificering
 DocType: Workstation,Operating Costs,Operations Kostnader
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Åtgärder om sammanlagda månadsbudgeten överskrids
-DocType: Purchase Invoice,Submit on creation,Lämna in en skapelse
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Valuta för {0} måste vara {1}
+DocType: Subscription,Submit on creation,Lämna in en skapelse
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Valuta för {0} måste vara {1}
 DocType: Asset,Disposal Date,bortskaffande Datum
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-post kommer att skickas till alla aktiva anställda i bolaget vid en given timme, om de inte har semester. Sammanfattning av svaren kommer att sändas vid midnatt."
 DocType: Employee Leave Approver,Employee Leave Approver,Anställd Lämna godkännare
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Rad {0}: En Beställnings post finns redan för detta lager {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Det går inte att ange som förlorad, eftersom Offert har gjorts."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,utbildning Feedback
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Rad {0}: En Beställnings post finns redan för detta lager {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Det går inte att ange som förlorad, eftersom Offert har gjorts."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,utbildning Feedback
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Produktionsorder {0} måste lämnas in
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Leverantörs Scorecard Criteria
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Välj startdatum och slutdatum för punkt {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Kursen är obligatorisk i rad {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Hittills inte kan vara före startdatum
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Lägg till / redigera priser
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Lägg till / redigera priser
 DocType: Batch,Parent Batch,Föräldragrupp
 DocType: Cheque Print Template,Cheque Print Template,Check utskriftsmall
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Kontoplan på Kostnadsställen
 DocType: Lab Test Template,Sample Collection,Provsamling
 ,Requested Items To Be Ordered,Efterfrågade artiklar Beställningsvara
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Mina beställningar
 DocType: Price List,Price List Name,Pris Listnamn
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Det dagliga arbetet Sammandrag för {0}
 DocType: Employee Loan,Totals,Totals
@@ -4621,12 +4709,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} enheter av {1} behövs i {2} på {3} {4} för {5} för att slutföra denna transaktion.
 DocType: Fee Schedule,Student Category,elev Kategori
 DocType: Announcement,Student,Elev
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Organisation enhet (avdelnings) ledare.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Organisation enhet (avdelnings) ledare.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Gå till rum
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Ange meddelandet innan du skickar
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,DUPLICERA FÖR LEVERANTÖR
 DocType: Email Digest,Pending Quotations,avvaktan Citat
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Butikförsäljnings profil
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Butikförsäljnings profil
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Lab Test Configurations.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Lån utan säkerhet
 DocType: Cost Center,Cost Center Name,Kostnadcenter Namn
@@ -4636,6 +4724,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Totalt betalade Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Meddelanden som är större än 160 tecken delas in i flera meddelanden
 DocType: Purchase Receipt Item,Received and Accepted,Mottagit och godkänt
+DocType: Hub Settings,Company and Seller Profile,Företag och säljare profil
 ,GST Itemised Sales Register,GST Artized Sales Register
 ,Serial No Service Contract Expiry,Löpnummer serviceavtal löper ut
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Du kan inte kreditera och debitera samma konto på samma gång
@@ -4645,10 +4734,11 @@
 DocType: Item,Variant Based On,Variant Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Totalt weightage delas ska vara 100%. Det är {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Dina Leverantörer
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Vänligen korrigera
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Kan inte ställa in då Förlorad kundorder är gjord.
 DocType: Request for Quotation Item,Supplier Part No,Leverantör varunummer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Det går inte att dra när kategori är för &quot;Värdering&quot; eller &quot;Vaulation och Total&quot;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Mottagen från
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Mottagen från
 DocType: Lead,Converted,Konverterad
 DocType: Item,Has Serial No,Har Löpnummer
 DocType: Employee,Date of Issue,Utgivningsdatum
@@ -4656,7 +4746,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",Enligt Köpinställningar om inköp krävs == &#39;JA&#39; och sedan för att skapa Köpfaktura måste användaren skapa Köp kvittot först för punkt {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Rad # {0}: Ställ Leverantör för punkt {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,V {0}: Timmar Värdet måste vara större än noll.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Website Bild {0} fäst till punkt {1} kan inte hittas
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Website Bild {0} fäst till punkt {1} kan inte hittas
 DocType: Issue,Content Type,Typ av innehåll
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Dator
 DocType: Item,List this Item in multiple groups on the website.,Lista detta objekt i flera grupper på webbplatsen.
@@ -4667,14 +4757,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Hämta ej verifierade Anteckningar
 DocType: Payment Reconciliation,From Invoice Date,Från fakturadatum
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Du har inte behörighet att skicka in
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,Fakturerings valutan måste vara lika med antingen standard comapany valuta eller partikontovaluta
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Fakturerings valutan måste vara lika med antingen standard comapany valuta eller partikontovaluta
 DocType: Healthcare Settings,Laboratory Settings,Laboratorieinställningar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Lämna inlösen
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Vad gör den?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Till Warehouse
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Alla Student Antagning
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Vad gör den?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Till Warehouse
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Alla Student Antagning
 ,Average Commission Rate,Genomsnittligt commisionbetyg
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Har Löpnummer&quot; kan inte vara &quot;ja&quot; för icke Beställningsvara
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Har Löpnummer&quot; kan inte vara &quot;ja&quot; för icke Beställningsvara
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Välj Status
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Närvaro kan inte markeras för framtida datum
 DocType: Pricing Rule,Pricing Rule Help,Prissättning Regel Hjälp
@@ -4692,41 +4782,41 @@
 DocType: Item,Customer Code,Kund kod
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Påminnelse födelsedag för {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dagar sedan senast Order
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Debitering av kontot måste vara ett balanskonto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Debitering av kontot måste vara ett balanskonto
 DocType: Buying Settings,Naming Series,Namge Serien
 DocType: Leave Block List,Leave Block List Name,Lämna Blocklistnamn
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Insurance Startdatum bör vara mindre än försäkring Slutdatum
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Vänligen installera Instruktör Naming System in School&gt; Skolan Inställningar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Tillgångar
 DocType: Timesheet,Production Detail,produktion Detalj
+DocType: Restaurant,Active Menu,Aktiv meny
 DocType: Target Detail,Target Qty,Mål Antal
 DocType: Shopping Cart Settings,Checkout Settings,kassa Inställningar
 DocType: Attendance,Present,Närvarande
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Följesedel {0} får inte lämnas
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Följesedel {0} får inte lämnas
 DocType: Notification Control,Sales Invoice Message,Fakturan Meddelande
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Utgående konto {0} måste vara av typen Ansvar / Equity
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Lönebesked av personal {0} redan skapats för tidrapporten {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Lönebesked av personal {0} redan skapats för tidrapporten {1}
 DocType: Vehicle Log,Odometer,Vägmätare
 DocType: Sales Order Item,Ordered Qty,Beställde Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Punkt {0} är inaktiverad
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Punkt {0} är inaktiverad
 DocType: Stock Settings,Stock Frozen Upto,Lager Fryst Upp
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM inte innehåller någon lagervara
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Projektverksamhet / uppgift.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM inte innehåller någon lagervara
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Projektverksamhet / uppgift.
 DocType: Vehicle Log,Refuelling Details,Tanknings Detaljer
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generera lönebesked
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Köp måste anges, i förekommande fall väljs som {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabatt måste vara mindre än 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Sista köpkurs hittades inte
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skriv engångsavgift (Company valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,fakturerings Timmar
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,Standard BOM för {0} hittades inte
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Rad # {0}: Ställ in beställningsmängd
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Standard BOM för {0} hittades inte
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Rad # {0}: Ställ in beställningsmängd
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Tryck på objekt för att lägga till dem här
 DocType: Fees,Program Enrollment,programmet Inskrivning
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landad Kostnad rabatt
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Ställ in {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Upprepa på Månadsdag
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} är inaktiv student
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} är inaktiv student
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} är inaktiv student
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} är inaktiv student
 DocType: Employee,Health Details,Hälsa Detaljer
 DocType: Offer Letter,Offer Letter Terms,Erbjudande Brev Villkor
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,För att skapa en betalningsförfrågan krävs referensdokument
@@ -4735,7 +4825,6 @@
 DocType: Employee External Work History,Salary,Lön
 DocType: Serial No,Delivery Document Type,Leverans Dokumenttyp
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Skicka alla lönebesked för de ovan valda kriterier
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} artiklar synkroniseras
 DocType: Sales Order,Partly Delivered,Delvis Levererad
 DocType: Email Digest,Receivables,Fordringar
 DocType: Lead Source,Lead Source,bly Källa
@@ -4756,9 +4845,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Åldringsräckvidd 2
 DocType: SG Creation Tool Course,Max Strength,max Styrka
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM ersatte
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Välj objekt baserat på leveransdatum
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Välj objekt baserat på leveransdatum
 ,Sales Analytics,Försäljnings Analytics
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Tillgängliga {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Tillgängliga {0}
 ,Prospects Engaged But Not Converted,Utsikter Engaged Men Not Converted
 ,Prospects Engaged But Not Converted,Utsikter Engaged Men Not Converted
 DocType: Manufacturing Settings,Manufacturing Settings,Tillverknings Inställningar
@@ -4766,10 +4855,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Mobile No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Ange standardvaluta i Bolaget
 DocType: Stock Entry Detail,Stock Entry Detail,Stock Entry Detalj
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Dagliga påminnelser
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Dagliga påminnelser
 DocType: Products Settings,Home Page is Products,Hemsida är produkter
 ,Asset Depreciation Ledger,Avskrivning Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Skatt Regel Konflikter med {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Skatt Regel Konflikter med {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nytt kontonamn
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Råvaror Levererans Kostnad
 DocType: Selling Settings,Settings for Selling Module,Inställningar för att sälja Modul
@@ -4783,8 +4872,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Produkt {0} måste vara en lagervara
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard Work In Progress Warehouse
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Standardinställningarna för bokföringstransaktioner.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vänligen uppsättning Anställningsnamnssystem i mänsklig resurs&gt; HR-inställningar
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Förväntat datum kan inte vara före datum för materialbegäran
+DocType: Restaurant,Default Tax Template,Standardskattemall
 DocType: Fees,Student Details,Studentuppgifter
 DocType: Purchase Invoice Item,Stock Qty,Lager Antal
 DocType: Purchase Invoice Item,Stock Qty,Lager Antal
@@ -4803,8 +4893,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Gå till objekt
 DocType: Sales Partner,Partner Type,Partner Typ
 DocType: Purchase Taxes and Charges,Actual,Faktisk
+DocType: Restaurant Menu,Restaurant Manager,Restaurangchef
 DocType: Authorization Rule,Customerwise Discount,Kundrabatt
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Tidrapport för uppgifter.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Tidrapport för uppgifter.
 DocType: Purchase Invoice,Against Expense Account,Mot utgiftskonto
 DocType: Production Order,Production Order,Produktionsorder
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Installeringsnotis {0} har redan lämnats in
@@ -4812,7 +4903,6 @@
 DocType: Quotation Item,Against Docname,Mot doknamn
 DocType: SMS Center,All Employee (Active),Personal (aktiv)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Visa nu
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Välj den period när fakturan kommer att genereras automatiskt
 DocType: BOM,Raw Material Cost,Råvarukostnad
 DocType: Item Reorder,Re-Order Level,Återuppta nivå
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Ange produkter och planerad ant. som du vill höja produktionsorder eller hämta råvaror för analys.
@@ -4825,24 +4915,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Rapporttyp är obligatorisk
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Lager är obligatoriskt för Lagervara {0} i rad {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Lägg till program
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Detaljhandel och grossisthandel
 DocType: Issue,First Responded On,Först svarade den
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kors Notering av punkt i flera grupper
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Räkenskapsårets Startdatum och Räkenskapsårets Slutdatum är redan inställd under räkenskapsåret {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Clearance Datum uppdateras
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split Batch
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Framgångsrikt Avstämt
 DocType: Request for Quotation Supplier,Download PDF,Hämta PDF
 DocType: Production Order,Planned End Date,Planerat Slutdatum
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Vänligen ange schemaläggningsdatum
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Där artiklar lagras.
 DocType: Request for Quotation,Supplier Detail,leverantör Detalj
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Fel i formel eller ett tillstånd: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Fel i formel eller ett tillstånd: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Fakturerade belopp
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kriterievikter måste lägga till upp till 100%
 DocType: Attendance,Attendance,Närvaro
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,lager
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,lager
 DocType: BOM,Materials,Material
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Om inte markerad, måste listan läggas till varje avdelning där den måste tillämpas."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Källa och Mål Warehouse kan inte vara samma
@@ -4860,6 +4950,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,På Net Totalt
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Värde för Attribut {0} måste vara inom intervallet {1} till {2} i steg om {3} till punkt {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Target lager i rad {0} måste vara densamma som produktionsorder
+DocType: Restaurant Reservation,Waitlisted,väntelistan
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Valuta kan inte ändras efter att ha gjort poster med någon annan valuta
 DocType: Vehicle Service,Clutch Plate,kopplingslamell
 DocType: Company,Round Off Account,Avrunda konto
@@ -4876,7 +4967,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Ny försäljnings Person Namn
 DocType: Packing Slip,Gross Weight UOM,Bruttovikt UOM
 DocType: Delivery Note Item,Against Sales Invoice,Mot fakturan
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Vänligen ange serienumren för seriell post
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Vänligen ange serienumren för seriell post
 DocType: Bin,Reserved Qty for Production,Reserverad Kvantitet för produktion
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Lämna avmarkerad om du inte vill överväga batch medan du gör kursbaserade grupper.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Lämna avmarkerad om du inte vill överväga batch medan du gör kursbaserade grupper.
@@ -4888,7 +4979,7 @@
 DocType: Lab Test,Test Group,Testgrupp
 DocType: Payment Reconciliation,Receivable / Payable Account,Fordran / Betal konto
 DocType: Delivery Note Item,Against Sales Order Item,Mot Försäljningvara
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Ange Attribut Värde för attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Ange Attribut Värde för attribut {0}
 DocType: Item,Default Warehouse,Standard Lager
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budget kan inte tilldelas mot gruppkonto {0}
 DocType: Healthcare Settings,Patient Registration,Patientregistrering
@@ -4918,6 +5009,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Försäljnings person
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Budget och kostnadsställe
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Multipla standard betalningssätt är inte tillåtet
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,för
 ,Appointment Analytics,Utnämningsanalys
 DocType: Vehicle Service,Half Yearly,Halvår
 DocType: Lead,Blog Subscriber,Blogg Abonnent
@@ -4937,7 +5029,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Citaträkning
 ,BOM Stock Report,BOM Stock Report
 DocType: Stock Reconciliation Item,Quantity Difference,kvantitet Skillnad
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Bearbetning Lön
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Bearbetning Lön
 DocType: Opportunity Item,Basic Rate,Baskurs
 DocType: GL Entry,Credit Amount,Kreditbelopp
 DocType: Cheque Print Template,Signatory Position,tecknaren Position
@@ -4951,12 +5043,12 @@
 DocType: Tax Rule,Tax Rule,Skatte Rule
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Behåll samma takt hela säljcykeln
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planera tidsloggar utanför planerad arbetstid.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Kunder i kö
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} har ingen läkarplan. Lägg till det i läkarmästaren
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Kunder i kö
 DocType: Student,Nationality,Nationalitet
 ,Items To Be Requested,Produkter att begäras
-DocType: Purchase Order,Get Last Purchase Rate,Hämta Senaste Beställningsvärdet
 DocType: Company,Company Info,Företagsinfo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Välj eller lägga till en ny kund
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Välj eller lägga till en ny kund
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Kostnadsställe krävs för att boka en räkningen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Tillämpning av medel (tillgångar)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Detta är baserat på närvaron av detta till anställda
@@ -4964,6 +5056,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Bankkortkonto
 DocType: Fiscal Year,Year Start Date,År Startdatum
 DocType: Attendance,Employee Name,Anställd Namn
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restaurang Order Entry Item
 DocType: Sales Invoice,Rounded Total (Company Currency),Avrundat Totalt (Företagsvaluta)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Det går inte att konvertera till koncernen eftersom Kontotyp valts.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} har ändrats. Vänligen uppdatera.
@@ -4974,6 +5067,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Ersättningar till anställda
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Packad kvantitet måste vara samma kvantitet för punkt {0} i rad {1}
 DocType: Production Order,Manufactured Qty,Tillverkas Antal
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Faktura skapad
 DocType: Purchase Receipt Item,Accepted Quantity,Godkänd Kvantitet
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Vänligen ange ett standardkalender för anställd {0} eller Company {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} existerar inte
@@ -4983,18 +5077,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rad nr {0}: Beloppet kan inte vara större än utestående beloppet mot utgiftsräkning {1}. I avvaktan på Beloppet är {2}
 DocType: Maintenance Schedule,Schedule,Tidtabell
 DocType: Account,Parent Account,Moderbolaget konto
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Tillgängligt
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Tillgängligt
 DocType: Quality Inspection Reading,Reading 3,Avläsning 3
 ,Hub,Nav
 DocType: GL Entry,Voucher Type,Rabatt Typ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Prislista hittades inte eller avaktiverad
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Prislista hittades inte eller avaktiverad
 DocType: Lab Test,Approved,Godkänd
 DocType: Pricing Rule,Price,Pris
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',"Anställd sparkades på {0} måste ställas in som ""lämnat"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',"Anställd sparkades på {0} måste ställas in som ""lämnat"""
+DocType: Hub Settings,Last Sync On,Senast synkroniserad
 DocType: Guardian,Guardian,väktare
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Bedömning {0} skapades för anställd {1} på visst datumintervall
 DocType: Employee,Education,Utbildning
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,del
 DocType: Selling Settings,Campaign Naming By,Kampanj namnges av
 DocType: Employee,Current Address Is,Nuvarande adress är
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Månatlig försäljningsmål (
@@ -5009,7 +5104,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Kurskod:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Ange utgiftskonto
 DocType: Account,Stock,Lager
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rad # {0}: Referensdokument Type måste vara en av inköpsorder, inköpsfaktura eller journalanteckning"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rad # {0}: Referensdokument Type måste vara en av inköpsorder, inköpsfaktura eller journalanteckning"
 DocType: Employee,Current Address,Nuvarande Adress
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Om artikeln är en variant av ett annat objekt kommer beskrivning, bild, prissättning, skatter etc att ställas från mallen om inte annat uttryckligen anges"
 DocType: Serial No,Purchase / Manufacture Details,Inköp / Tillverknings Detaljer
@@ -5040,7 +5135,7 @@
 DocType: Hub Settings,Hub Settings,Nav Inställningar
 DocType: Project,Gross Margin %,Bruttomarginal%
 DocType: BOM,With Operations,Med verksamhet
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Bokföringsposter har redan gjorts i valuta {0} för företag {1}. Välj en fordran eller skuld konto med valuta {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Bokföringsposter har redan gjorts i valuta {0} för företag {1}. Välj en fordran eller skuld konto med valuta {0}.
 DocType: Asset,Is Existing Asset,Är befintlig tillgång
 DocType: Salary Detail,Statistical Component,Statistisk komponent
 DocType: Salary Detail,Statistical Component,Statistisk komponent
@@ -5049,13 +5144,14 @@
 DocType: BOM Operation,BOM Operation,BOM Drift
 DocType: Purchase Taxes and Charges,On Previous Row Amount,På föregående v Belopp
 DocType: Student,Home Address,Hemadress
+DocType: Item,Has Expiry Date,Har förfallodatum
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Alternativ för varianter av varianter.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,överföring av tillgångar
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,överföring av tillgångar
 DocType: POS Profile,POS Profile,POS-Profil
 DocType: Training Event,Event Name,Händelsenamn
 DocType: Physician,Phone (Office),Telefon (Office)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,Tillträde
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Antagning för {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,Tillträde
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Antagning för {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Säsongs för att fastställa budgeten, mål etc."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Variabelt namn
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Punkt {0} är en mall, välj en av dess varianter"
@@ -5064,7 +5160,7 @@
 DocType: Assessment Plan,Room,Rum
 DocType: Purchase Order,Advance Paid,Förskottsbetalning
 DocType: Item,Item Tax,Produkt Skatt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Material till leverantören
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Material till leverantören
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Punkt Faktura
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Tröskel {0}% visas mer än en gång
 DocType: Expense Claim,Employees Email Id,Anställdas E-post Id
@@ -5075,32 +5171,30 @@
 DocType: Program,Program Name,program~~POS=TRUNC
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Värdera skatt eller avgift för
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiska Antal är obligatorisk
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} har för närvarande ett {1} leverantörssortkort, och inköpsorder till denna leverantör bör utfärdas med försiktighet."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} har för närvarande ett {1} leverantörssortkort, och inköpsorder till denna leverantör bör utfärdas med försiktighet."
 DocType: Employee Loan,Loan Type,lånetyp
 DocType: Scheduling Tool,Scheduling Tool,schemaläggning Tool
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Kreditkort
 DocType: BOM,Item to be manufactured or repacked,Produkt som skall tillverkas eller packas
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Standardinställningarna för aktietransaktioner.
-DocType: Purchase Invoice,Next Date,Nästa Datum
 DocType: Employee Education,Major/Optional Subjects,Stora / valfria ämnen
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
+DocType: Hub Settings,Suspended,Upphängd
 DocType: Training Event,Attendees,Deltagare
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Här kan du behålla familje detaljer som namn och ockupationen av förälder, make och barn"
 DocType: Academic Term,Term End Date,Term Slutdatum
-DocType: Hub Settings,Seller Name,Säljaren Namn
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Skatter och avgifter Avgår (Company valuta)
 DocType: Item Group,General Settings,Allmänna Inställningar
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Från valuta och till valuta kan inte vara samma
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Lägg till instruktörer
 DocType: Stock Entry,Repack,Packa om
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Du måste spara formuläret innan du fortsätter
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Var god välj Företaget först
 DocType: Item Attribute,Numeric Values,Numeriska värden
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Fäst Logo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,lager~~POS=TRUNC
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,lager~~POS=TRUNC
 DocType: Customer,Commission Rate,Provisionbetyg
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Skapade {0} scorecards för {1} mellan:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Gör Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Gör Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Block ledighet applikationer avdelningsvis.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer",Betalning Type måste vara en av mottagning Betala och intern överföring
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -5115,11 +5209,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Kapital Lager
 DocType: Shopping Cart Settings,Show Public Attachments,Visa offentliga bilagor
 DocType: Packing Slip,Package Weight Details,Paket Vikt Detaljer
+DocType: Restaurant Reservation,Reservation Time,Bokningstid
 DocType: Payment Gateway Account,Payment Gateway Account,Betalning Gateway konto
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Efter betalning avslutad omdirigera användare till valda sidan.
 DocType: Company,Existing Company,befintliga Company
 DocType: Healthcare Settings,Result Emailed,Resultat Emailed
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",Skattekategori har ändrats till &quot;Totalt&quot; eftersom alla artiklar är poster som inte är lagret
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Artikelnummer&gt; Varugrupp&gt; Varumärke
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Välj en csv-fil
 DocType: Student Leave Application,Mark as Present,Mark som Present
 DocType: Supplier Scorecard,Indicator Color,Indikatorfärg
@@ -5144,11 +5240,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Göra Student Batch
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Är Överförd
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Hämta artiklar från BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Hämta artiklar från BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Ledtid dagar
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rad # {0}: Publiceringsdatum måste vara densamma som inköpsdatum {1} av tillgångar {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Kolla här om studenten är bosatt vid institutets vandrarhem.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Ange kundorder i tabellen ovan
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Ange kundorder i tabellen ovan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Inte lämnat lönebesked
 ,Stock Summary,lager Sammanfattning
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Överföra en tillgång från ett lager till ett annat
@@ -5164,5 +5260,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Rad {0}: debitering kan inte kopplas till en {1}
 DocType: Journal Entry,Subscription Section,Prenumerationsavsnitt
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Kontot {0} existerar inte
+DocType: Training Event,Training Program,Träningsprogram
 DocType: Account,Cash,Kontanter
 DocType: Employee,Short biography for website and other publications.,Kort biografi för webbplatsen och andra publikationer.
diff --git a/erpnext/translations/sw.csv b/erpnext/translations/sw.csv
index a1f068e..32a1c9d 100644
--- a/erpnext/translations/sw.csv
+++ b/erpnext/translations/sw.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Njia ya Mshahara
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Jisajili
 DocType: Patient,Divorced,Talaka
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Vitu tayari vimeunganishwa
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Ruhusu Item kuongezwa mara nyingi katika shughuli
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Futa Ziara ya Nyenzo {0} kabla ya kufuta madai ya Waranti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Bidhaa za Watumiaji
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Acha vibali
 DocType: Sales Partner,Dealer,Muzaji
 DocType: Consultation,Investigations,Uchunguzi
+DocType: Restaurant Order Entry,Click Enter To Add,Bonyeza Ingia Kuongeza
 DocType: Employee,Rented,Ilipangwa
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Inatumika kwa Mtumiaji
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Amri ya Utayarisho haiwezi kufutwa, Fungua kwanza kufuta"
 DocType: Vehicle Service,Mileage,Mileage
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Je! Kweli unataka kugawa kipengee hiki?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Je! Kweli unataka kugawa kipengee hiki?
 DocType: Drug Prescription,Update Schedule,Sasisha Ratiba
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Chagua Mtoa Default
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Fedha inahitajika kwa Orodha ya Bei {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Angalia upatikanaji
 DocType: Job Applicant,Job Applicant,Mwombaji wa Ayubu
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Hii inategemea mashirikiano dhidi ya Wasambazaji huu. Tazama kalenda ya chini kwa maelezo zaidi
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Hakuna matokeo zaidi.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Kisheria
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Kodi halisi ya aina haiwezi kuingizwa katika kiwango cha kipengee kwenye mstari {0}
 DocType: Bank Guarantee,Customer,Wateja
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Kiwango cha Exchange lazima iwe sawa na {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Jina la Wateja
 DocType: Vehicle,Natural Gas,Gesi ya asili
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Akaunti ya benki haiwezi kuitwa jina la {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Akaunti ya benki haiwezi kuitwa jina la {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Viongozi (au makundi) ambayo Maingilio ya Uhasibu hufanywa na mizani huhifadhiwa.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Bora kwa {0} haiwezi kuwa chini ya sifuri ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Hakuna Slips za Mshahara zilizosajiliwa.
 DocType: Manufacturing Settings,Default 10 mins,Default 10 mins
 DocType: Leave Type,Leave Type Name,Acha Jina Aina
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Onyesha wazi
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Ni muhimu kuchukua hatua hii leo yenyewe kwa mara kwa mara iliyotajwa hapo juu
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Mfululizo umehifadhiwa kwa ufanisi
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Angalia
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Usajili wa Maandishi ya Usajili Iliwasilishwa
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Vitu vya Utaratibu wa Ununuzi Ili Kupokea
 DocType: SMS Center,All Supplier Contact,Mawasiliano Yote ya Wasambazaji
 DocType: Support Settings,Support Settings,Mipangilio ya Kusaidia
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Tarehe ya Mwisho Inayotarajiwa haiwezi kuwa chini ya Tarehe ya Mwanzo Iliyotarajiwa
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Tarehe ya Mwisho Inayotarajiwa haiwezi kuwa chini ya Tarehe ya Mwanzo Iliyotarajiwa
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Kiwango lazima kiwe sawa na {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Maombi Mpya ya Kuacha
 ,Batch Item Expiry Status,Kipengee cha Muhtasari wa Kipengee Hali
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Rasimu ya Benki
 DocType: Mode of Payment Account,Mode of Payment Account,Akaunti ya Akaunti ya Malipo
 DocType: Consultation,Consultation,Ushauri
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Mauzo na Kurudi
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Onyesha Mabadiliko
 DocType: Academic Term,Academic Term,Muda wa Elimu
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Nyenzo
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Huduma ya afya
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Kuchelewa kwa malipo (Siku)
 DocType: Lab Prescription,Lab Prescription,Dawa ya Dawa
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Panga kwa Bei
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Gharama za Huduma
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Nambari ya Serial: {0} tayari imeelezea katika Invoice ya Mauzo: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Invoice
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Nambari ya Serial: {0} tayari imeelezea katika Invoice ya Mauzo: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Invoice
 DocType: Maintenance Schedule Item,Periodicity,Periodicity
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Mwaka wa Fedha {0} inahitajika
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Ulinzi
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Kiasi cha jumla ya gharama
 DocType: Delivery Note,Vehicle No,Hakuna Gari
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Tafadhali chagua Orodha ya Bei
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Tafadhali chagua Orodha ya Bei
 DocType: Accounts Settings,Currency Exchange Settings,Mipangilio ya Kubadilisha Fedha
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Row # {0}: Hati ya kulipa inahitajika ili kukamilisha shughuli
 DocType: Production Order Operation,Work In Progress,Kazi inaendelea
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Tafadhali chagua tarehe
 DocType: Employee,Holiday List,Orodha ya likizo
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Tafadhali kuanzisha Mfumo wa Kuitwa Msaidizi katika Shule&gt; Mipangilio ya Shule
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Mhasibu
+DocType: Hub Settings,Selling Price List,Orodha ya Bei ya Kuuza
 DocType: Patient,Tobacco Current Use,Tabibu Matumizi ya Sasa
 DocType: Cost Center,Stock User,Mtumiaji wa hisa
 DocType: Company,Phone No,No Simu
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Schedules za kozi ziliundwa:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Mpya {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Mpya {0}: # {1}
 ,Sales Partners Commission,Tume ya Washirika wa Mauzo
 DocType: Purchase Invoice,Rounding Adjustment,Marekebisho ya Upangaji
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Hali haiwezi kuwa na wahusika zaidi ya 5
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Jina la jina la Mzazi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Rejea: {0}, Msimbo wa Item: {1} na Wateja: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kilo
-DocType: Student Log,Log,Ingia
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Kufungua kwa Kazi.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,Matokeo ya {0} yaliyotolewa
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,Matokeo ya {0} yaliyotolewa
 DocType: Item Attribute,Increment,Uingizaji
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Timespan
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Chagua Warehouse ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Ndoa
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Hairuhusiwi kwa {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Pata vitu kutoka
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Hifadhi haiwezi kurekebishwa dhidi ya Kumbuka Utoaji {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Hifadhi haiwezi kurekebishwa dhidi ya Kumbuka Utoaji {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Bidhaa {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Hakuna vitu vilivyoorodheshwa
 DocType: Payment Reconciliation,Reconcile,Kuunganishwa
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Mfuko wa Pensheni
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Tarehe ya Uzito ya pili haiwezi kuwa kabla ya Tarehe ya Ununuzi
 DocType: Consultation,Consultation Date,Tarehe ya Ushauri
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Orodha ya bidhaa na ugunduzi kwa watumiaji wa ERPNext
 DocType: SMS Center,All Sales Person,Mtu wa Mauzo wote
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Usambazaji wa kila mwezi ** husaidia kusambaza Bajeti / Target miezi miwili ikiwa una msimu katika biashara yako.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Si vitu vilivyopatikana
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Mfumo wa Mshahara Ukosefu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Si vitu vilivyopatikana
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Mfumo wa Mshahara Ukosefu
 DocType: Lead,Person Name,Jina la Mtu
 DocType: Sales Invoice Item,Sales Invoice Item,Bidhaa Invoice Bidhaa
 DocType: Account,Credit,Mikopo
 DocType: POS Profile,Write Off Cost Center,Andika Kituo cha Gharama
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",mfano &quot;Shule ya Msingi&quot; au &quot;Chuo Kikuu&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",mfano &quot;Shule ya Msingi&quot; au &quot;Chuo Kikuu&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Ripoti za hisa
 DocType: Warehouse,Warehouse Detail,Maelezo ya Ghala
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Kizuizi cha mkopo kimevuka kwa wateja {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Tarehe ya Mwisho wa Mwisho haiwezi kuwa baadaye kuliko Tarehe ya Mwisho wa Mwaka wa Mwaka wa Chuo ambazo neno hilo limeunganishwa (Mwaka wa Chuo {}). Tafadhali tengeneza tarehe na jaribu tena.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Je, Mali isiyohamishika&quot; hawezi kufunguliwa, kama rekodi ya Malipo ipo dhidi ya kipengee"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Je, Mali isiyohamishika&quot; hawezi kufunguliwa, kama rekodi ya Malipo ipo dhidi ya kipengee"
 DocType: Vehicle Service,Brake Oil,Mafuta ya Brake
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Wateja&gt; Kikundi cha Wateja&gt; Eneo
 DocType: Tax Rule,Tax Type,Aina ya Kodi
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Kiwango cha Ushuru
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Huna mamlaka ya kuongeza au kusasisha safu kabla ya {0}
 DocType: BOM,Item Image (if not slideshow),Image Image (kama si slideshow)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Wateja huwa na jina moja
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Kiwango cha Saa / 60) * Muda halisi wa Uendeshaji
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Aina ya Kumbukumbu ya Kumbukumbu lazima iwe moja ya Madai ya Madai au Ingia ya Jarida
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Chagua BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Aina ya Kumbukumbu ya Kumbukumbu lazima iwe moja ya Madai ya Madai au Ingia ya Jarida
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Chagua BOM
 DocType: SMS Log,SMS Log,Ingia ya SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Gharama ya Vitu Vilivyotolewa
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Likizo ya {0} si kati ya Tarehe na Tarehe
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,Mkopo wa Wafanyakazi
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Ingia ya Shughuli:
 DocType: Fee Schedule,Send Payment Request Email,Tuma Email Request Request
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Item {0} haipo katika mfumo au imeisha muda
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Item {0} haipo katika mfumo au imeisha muda
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Real Estate
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Taarifa ya Akaunti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Madawa
@@ -210,17 +213,22 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Ingia Ingia
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Puta Nyenzo ya Nakala ya aina ya Utengenezaji kulingana na vigezo hapo juu
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Imefanikiwa bila usajili.
 DocType: Training Result Employee,Grade,Daraja
+DocType: Restaurant Table,No of Seats,Hakuna Viti
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Ili kuongeza somo la nguvu, tumia tags za jinja kama <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Iliyotolewa na Wafanyabiashara
 DocType: SMS Center,All Contact,Mawasiliano yote
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Utaratibu wa Uzalishaji umeundwa tayari kwa vitu vyote na BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Utaratibu wa Uzalishaji umeundwa tayari kwa vitu vyote na BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Mshahara wa Kila mwaka
 DocType: Daily Work Summary,Daily Work Summary,Muhtasari wa Kazi ya Kila siku
 DocType: Period Closing Voucher,Closing Fiscal Year,Kufunga Mwaka wa Fedha
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} imehifadhiwa
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Tafadhali chagua Kampuni iliyopo kwa kuunda Chati ya Akaunti
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} imehifadhiwa
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Tafadhali chagua Kampuni iliyopo kwa kuunda Chati ya Akaunti
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Gharama za Hifadhi
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Chagua Ghala la Target
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Chagua Ghala la Target
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Tafadhali ingiza barua pepe ya Mawasiliano ya Preferred
 DocType: Program Enrollment,School Bus,Bus School
 DocType: Journal Entry,Contra Entry,Uingizaji wa Contra
@@ -237,9 +245,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Pakua Kigezo, jaza data sahihi na ushikamishe faili iliyobadilishwa. Tarehe zote na mchanganyiko wa mfanyakazi katika kipindi cha kuchaguliwa watakuja kwenye template, na kumbukumbu za mahudhurio zilizopo"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Kipengee {0} sio kazi au mwisho wa uhai umefikiwa
+DocType: Student Admission Program,Minimum Age,Umri mdogo
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Mfano: Msabati Msingi
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Ili ni pamoja na kodi katika mstari {0} katika kiwango cha kipengee, kodi katika safu {1} lazima pia ziingizwe"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Mipangilio ya Moduli ya HR
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Mipangilio ya Moduli ya HR
 DocType: SMS Center,SMS Center,Kituo cha SMS
 DocType: Sales Invoice,Change Amount,Badilisha kiasi
 DocType: BOM Update Tool,New BOM,BOM mpya
@@ -249,7 +258,7 @@
 DocType: Lead,Request Type,Aina ya Ombi
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Fanya Waajiriwa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Matangazo
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Ongeza Vyumba
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Mipangilio ya POS (Online / Offline)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Utekelezaji
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Maelezo ya shughuli zilizofanywa.
 DocType: Serial No,Maintenance Status,Hali ya Matengenezo
@@ -272,6 +281,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Orodha ya Bei lazima iwezekanavyo kwa Ununuzi au Ununuzi
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Tarehe ya usanii haiwezi kuwa kabla ya tarehe ya utoaji wa Bidhaa {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Punguzo kwa Orodha ya Bei Kiwango (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Biochemistry
 DocType: Offer Letter,Select Terms and Conditions,Chagua Masharti na Masharti
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,Thamani ya nje
 DocType: Production Planning Tool,Sales Orders,Maagizo ya Mauzo
@@ -306,15 +316,15 @@
 DocType: Sales Partner,Reseller,Muuzaji
 DocType: Codification Table,Medical Code,Kanuni ya Matibabu
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Ikiwa imechungwa, itajumuisha vipengee vya hisa ambavyo hazipatikani kwenye Maombi ya Nyenzo."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Tafadhali ingiza Kampuni
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Tafadhali ingiza Kampuni
 DocType: Delivery Note Item,Against Sales Invoice Item,Dhidi ya Bidhaa ya Invoice Item
 ,Production Orders in Progress,Maagizo ya Uzalishaji katika Maendeleo
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Fedha Nasi kutoka kwa Fedha
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","Mitaa ya Mitaa imejaa, haikuhifadhi"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","Mitaa ya Mitaa imejaa, haikuhifadhi"
 DocType: Lead,Address & Contact,Anwani na Mawasiliano
 DocType: Leave Allocation,Add unused leaves from previous allocations,Ongeza majani yasiyotumika kutoka kwa mgao uliopita
 DocType: Sales Partner,Partner website,Mtandao wa wavuti
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Ongeza kitu
+DocType: Restaurant Order Entry,Add Item,Ongeza kitu
 DocType: Lab Test,Custom Result,Matokeo ya Desturi
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Jina la Mawasiliano
 DocType: Course Assessment Criteria,Course Assessment Criteria,Vigezo vya Tathmini ya Kozi
@@ -327,7 +337,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Omba la ununuzi.
 DocType: Lab Test,Submitted Date,Tarehe iliyotolewa
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Hii inategemea Majedwali ya Muda yaliyoundwa dhidi ya mradi huu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Net Pay haiwezi kuwa chini ya 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Net Pay haiwezi kuwa chini ya 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Ili kuacha kutuma arifa za kurudia hitilafu kutoka kwa mfumo, tumeangalia shamba la Walemavu katika usajili"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Msaidizi wa Kuacha wa Kuondoka tu anaweza kuwasilisha Maombi haya ya kuondoka
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Tarehe ya Kuondoa lazima iwe kubwa kuliko Tarehe ya kujiunga
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Majani kwa mwaka
@@ -336,9 +347,10 @@
 DocType: Email Digest,Profit & Loss,Faida &amp; Kupoteza
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Vitabu
 DocType: Task,Total Costing Amount (via Time Sheet),Kiwango cha jumla cha gharama (kupitia Karatasi ya Muda)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Tafadhali kuanzisha Wanafunzi chini ya Vikundi vya Wanafunzi
 DocType: Item Website Specification,Item Website Specification,Ufafanuzi wa Tovuti
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Acha Kuzuiwa
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Kipengee {0} kilifikia mwisho wa maisha kwa {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Kipengee {0} kilifikia mwisho wa maisha kwa {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Entries ya Benki
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Kila mwaka
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Toleo la Upatanisho wa hisa
@@ -347,7 +359,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Kozi ya Uumbaji wa Wanafunzi wa Wanafunzi
 DocType: Lead,Do Not Contact,Usiwasiliane
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,Watu ambao hufundisha katika shirika lako
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Id idhini ya kufuatilia ankara zote za mara kwa mara. Inazalishwa kwa kuwasilisha.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Msanidi Programu
 DocType: Item,Minimum Order Qty,Kiwango cha chini cha Uchina
 DocType: Pricing Rule,Supplier Type,Aina ya Wasambazaji
@@ -357,17 +368,19 @@
 DocType: Item,Publish in Hub,Chapisha katika Hub
 DocType: Student Admission,Student Admission,Uingizaji wa Wanafunzi
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Kipengee {0} kimefutwa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Ombi la Nyenzo
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Kipengee {0} kimefutwa
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Ombi la Nyenzo
 DocType: Bank Reconciliation,Update Clearance Date,Sasisha tarehe ya kufuta
 DocType: Item,Purchase Details,Maelezo ya Ununuzi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Kipengee {0} haipatikani kwenye meza ya &#39;Vifaa vya Raw zinazotolewa&#39; katika Manunuzi ya Ununuzi {1}
 DocType: Patient Relation,Relation,Uhusiano
 DocType: Shipping Rule,Worldwide Shipping,Usafirishaji duniani kote
 DocType: Patient Relation,Mother,Mama
+DocType: Restaurant Reservation,Reservation End Time,Muda wa Mwisho wa Uhifadhi
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Amri zilizohakikishwa kutoka kwa Wateja.
 DocType: Purchase Receipt Item,Rejected Quantity,Nambari ya Kukataliwa
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Ombi la kulipa {0} limeundwa
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Ombi la kulipa {0} limeundwa
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Sensitivity Low
 DocType: Notification Control,Notification Control,Udhibiti wa Arifa
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Tafadhali thibitisha mara moja umekamilisha mafunzo yako
 DocType: Lead,Suggestions,Mapendekezo
@@ -387,7 +400,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Mipango ya mishahara ya barua pepe kwa mfanyakazi kulingana na barua pepe iliyopendekezwa iliyochaguliwa katika Mfanyakazi
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Msaidizi wa kwanza wa Kuondoka kwenye orodha utawekwa kama Msaidizi wa Kuacha wa Kuacha
 DocType: Tax Rule,Shipping County,Kata ya Meli
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Jifunze
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Jifunze
 DocType: Asset,Next Depreciation Date,Tarehe ya Uzito ya pili
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Shughuli ya Gharama kwa Wafanyakazi
 DocType: Accounts Settings,Settings for Accounts,Mipangilio ya Akaunti
@@ -398,13 +411,13 @@
 DocType: Item,Synced With Hub,Ilifananishwa na Hub
 DocType: Vehicle,Fleet Manager,Meneja wa Fleet
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} haiwezi kuwa hasi kwa kipengee {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Nywila isiyo sahihi
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Nywila isiyo sahihi
 DocType: Item,Variant Of,Tofauti Ya
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Uchina uliokamilika hauwezi kuwa mkubwa kuliko &#39;Uchina kwa Utengenezaji&#39;
 DocType: Period Closing Voucher,Closing Account Head,Kufunga kichwa cha Akaunti
 DocType: Employee,External Work History,Historia ya Kazi ya Kazi
 DocType: Physician,Time per Appointment,Muda kwa Uteuzi
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Hitilafu ya Kumbukumbu ya Circular
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Hitilafu ya Kumbukumbu ya Circular
 DocType: Appointment Type,Is Inpatient,"Je, ni mgonjwa"
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Jina la Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Katika Maneno (Kuhamisha) itaonekana wakati unapohifadhi Kumbuka Utoaji.
@@ -413,19 +426,18 @@
 DocType: Lead,Industry,Sekta
 DocType: Employee,Job Profile,Profaili ya Kazi
 DocType: BOM Item,Rate & Amount,Kiwango na Kiasi
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Tafadhali kuanzisha mfululizo wa kuhesabu kwa Mahudhurio kupitia Upangilio&gt; Orodha ya Kuhesabu
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Hii inategemea shughuli za Kampuni hii. Tazama kalenda ya chini kwa maelezo zaidi
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Arifa kwa barua pepe juu ya uumbaji wa Nyenzo ya Nyenzo ya Moja kwa moja
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Wanakabiliwa
 DocType: Journal Entry,Multi Currency,Fedha nyingi
 DocType: Payment Reconciliation Invoice,Invoice Type,Aina ya ankara
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Wateja&gt; Kikundi cha Wateja&gt; Eneo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Kumbuka Utoaji
 DocType: Consultation,Encounter Impression,Kukutana na Mchapishaji
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Kuweka Kodi
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Gharama ya Malipo ya Kuuza
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,Ulipaji wa Malipo umebadilishwa baada ya kuvuta. Tafadhali futa tena.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} imeingia mara mbili katika Kodi ya Item
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Muhtasari wa wiki hii na shughuli zinazosubiri
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} imeingia mara mbili katika Kodi ya Item
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Muhtasari wa wiki hii na shughuli zinazosubiri
 DocType: Student Applicant,Admitted,Imekubaliwa
 DocType: Workstation,Rent Cost,Gharama ya Kodi
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Kiasi Baada ya kushuka kwa thamani
@@ -439,36 +451,35 @@
 DocType: Shipping Rule,Valid for Countries,Halali kwa Nchi
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Jedwali hili ni Kigezo na hawezi kutumika katika shughuli. Vipengee vya kipengee vitachapishwa kwenye vipengee isipokuwa &#39;Hakuna nakala&#39; imewekwa
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Amri ya Jumla imezingatiwa
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Jina la waajiriwa (kwa mfano Mkurugenzi Mtendaji, Mkurugenzi nk)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Jina la waajiriwa (kwa mfano Mkurugenzi Mtendaji, Mkurugenzi nk)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Kiwango ambacho Fedha ya Wateja inabadilishwa kwa sarafu ya msingi ya wateja
 DocType: Course Scheduling Tool,Course Scheduling Tool,Chombo cha Mpangilio wa Kozi
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Invoice ya Ununuzi haiwezi kufanywa dhidi ya mali iliyopo {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,Hitilafu [ya haraka] wakati wa kujenga% s mara kwa mara kwa% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,Hitilafu [ya haraka] wakati wa kujenga% s mara kwa mara kwa% s
 DocType: Item Tax,Tax Rate,Kiwango cha Kodi
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} tayari imetengwa kwa Mfanyakazi {1} kwa muda {2} hadi {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Chagua kitu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Chagua kitu
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Invozi ya Ununuzi {0} imewasilishwa tayari
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Kundi Hakuna lazima iwe sawa na {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Badilisha kwa mashirika yasiyo ya Kundi
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Kundi (kura) ya Kipengee.
 DocType: C-Form Invoice Detail,Invoice Date,Tarehe ya ankara
 DocType: GL Entry,Debit Amount,Kiwango cha Debit
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Kunaweza tu Akaunti 1 kwa Kampuni katika {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Tafadhali tazama kiambatisho
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Kunaweza tu Akaunti 1 kwa Kampuni katika {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Tafadhali tazama kiambatisho
 DocType: Purchase Order,% Received,Imepokea
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Unda Vikundi vya Wanafunzi
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Kuweka Tayari Kukamilisha !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Kuweka Tayari Kukamilisha !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Kiwango cha Kumbuka Mikopo
 DocType: Setup Progress Action,Action Document,Kitambulisho cha Hatua
 ,Finished Goods,Bidhaa zilizokamilishwa
 DocType: Delivery Note,Instructions,Maelekezo
 DocType: Quality Inspection,Inspected By,Iliyotambuliwa na
 DocType: Maintenance Visit,Maintenance Type,Aina ya Matengenezo
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} hajasajiliwa katika Kozi {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Msimbo wa Item&gt; Kikundi cha Bidhaa&gt; Brand
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} hajasajiliwa katika Kozi {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial Hakuna {0} sio wa Kumbuka Kumbuka {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Ongeza Vitu
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Ongeza Vitu
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Kipimo cha Ubora wa Bidhaa
 DocType: Leave Application,Leave Approver Name,Acha Jina la Msaidizi
 DocType: Depreciation Schedule,Schedule Date,Tarehe ya Ratiba
@@ -488,7 +499,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Saa za kazi
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Badilisha idadi ya mwanzo / ya sasa ya mlolongo wa mfululizo uliopo.
 DocType: Dosage Strength,Strength,Nguvu
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Unda Wateja wapya
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Unda Wateja wapya
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ikiwa Sheria nyingi za bei zinaendelea kushinda, watumiaji wanaombwa kuweka Kipaumbele kwa mikono ili kutatua migogoro."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Unda Amri ya Ununuzi
 ,Purchase Register,Daftari ya Ununuzi
@@ -507,7 +518,7 @@
 DocType: Lab Test Template,Single,Mmoja
 DocType: Salary Slip,Total Loan Repayment,Ulipaji wa Mkopo wa Jumla
 DocType: Account,Cost of Goods Sold,Gharama ya bidhaa zilizouzwa
-DocType: Purchase Invoice,Yearly,Kila mwaka
+DocType: Subscription,Yearly,Kila mwaka
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Tafadhali ingiza Kituo cha Gharama
 DocType: Drug Prescription,Dosage,Kipimo
 DocType: Journal Entry Account,Sales Order,Uagizaji wa Mauzo
@@ -537,7 +548,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Mipangilio ya Global kwa mchakato wa utengenezaji wote.
 DocType: Accounts Settings,Accounts Frozen Upto,Akaunti Yamehifadhiwa Upto
 DocType: SMS Log,Sent On,Imepelekwa
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Ishara {0} imechaguliwa mara nyingi kwenye Jedwali la Attributes
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Ishara {0} imechaguliwa mara nyingi kwenye Jedwali la Attributes
 DocType: HR Settings,Employee record is created using selected field. ,Rekodi ya wafanyakazi ni kuundwa kwa kutumia shamba iliyochaguliwa.
 DocType: Sales Order,Not Applicable,Siofaa
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Likizo ya bwana.
@@ -562,13 +573,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Majani yote yaliyotengwa ni lazima
 DocType: Patient,AB Positive,AB Chanya
 DocType: Job Opening,Description of a Job Opening,Maelezo ya Kufungua kazi
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Shughuli zinasubiri leo
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Shughuli zinasubiri leo
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Kuhudhuria rekodi.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Kipengele cha Mshahara kwa malipo ya nyakati ya maraheet.
 DocType: Sales Order Item,Used for Production Plan,Kutumika kwa Mpango wa Uzalishaji
 DocType: Employee Loan,Total Payment,Malipo ya Jumla
 DocType: Manufacturing Settings,Time Between Operations (in mins),Muda Kati ya Uendeshaji (kwa muda mfupi)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} imefutwa ili hatua haiwezi kukamilika
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} imefutwa ili hatua haiwezi kukamilika
 DocType: Customer,Buyer of Goods and Services.,Mnunuzi wa Bidhaa na Huduma.
 DocType: Journal Entry,Accounts Payable,Akaunti za kulipwa
 DocType: Patient,Allergies,Dawa
@@ -580,22 +591,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Angalia Amri za Ununuzi
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Andika orodha ya wateja wako wachache. Wanaweza kuwa mashirika au watu binafsi.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Vipande vyenye Kujenga
+DocType: POS Profile User,POS Profile User,Mtumiaji wa Programu ya POS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Mapato ya moja kwa moja
 DocType: Patient Appointment,Date TIme,Tarehe TIme
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Haiwezi kuchuja kulingana na Akaunti, ikiwa imewekwa na Akaunti"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Afisa wa Usimamizi
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Tafadhali chagua kozi
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Tafadhali chagua kozi
 DocType: Codification Table,Codification Table,Jedwali la Ushauri
 DocType: Timesheet Detail,Hrs,Hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Tafadhali chagua Kampuni
 DocType: Stock Entry Detail,Difference Account,Akaunti ya Tofauti
 DocType: Purchase Invoice,Supplier GSTIN,GSTIN wa Wasambazaji
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Haiwezi kufunga kazi kama kazi yake ya kutegemea {0} haijafungwa.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,Tafadhali ingiza Ghala la Maombi ya Nyenzo ambayo itafufuliwa
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Haiwezi kufunga kazi kama kazi yake ya kutegemea {0} haijafungwa.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Tafadhali ingiza Ghala la Maombi ya Nyenzo ambayo itafufuliwa
 DocType: Production Order,Additional Operating Cost,Gharama za ziada za uendeshaji
 DocType: Lab Test Template,Lab Routine,Daima Lab
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Vipodozi
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Ili kuunganisha, mali zifuatazo lazima ziwe sawa kwa vitu vyote viwili"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Ili kuunganisha, mali zifuatazo lazima ziwe sawa kwa vitu vyote viwili"
 DocType: Shipping Rule,Net Weight,Weight Net
 DocType: Employee,Emergency Phone,Simu ya dharura
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Nunua
@@ -605,7 +617,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Tafadhali fafanua daraja la Msingi 0%
 DocType: Sales Order,To Deliver,Ili Kuokoa
 DocType: Purchase Invoice Item,Item,Kipengee
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Serial hakuna bidhaa haiwezi kuwa sehemu
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Sensitivity High
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Serial hakuna bidhaa haiwezi kuwa sehemu
 DocType: Journal Entry,Difference (Dr - Cr),Tofauti (Dr - Cr)
 DocType: Account,Profit and Loss,Faida na Kupoteza
 DocType: Patient,Risk Factors,Mambo ya Hatari
@@ -614,7 +627,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Kusimamia Kudhibiti Msaada
 DocType: Vital Signs,Body Temperature,Joto la Mwili
 DocType: Project,Project will be accessible on the website to these users,Mradi utapatikana kwenye tovuti kwa watumiaji hawa
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Eleza aina ya Mradi.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Eleza aina ya Mradi.
 DocType: Supplier Scorecard,Weighting Function,Weighting Kazi
 DocType: Physician,OP Consulting Charge,Ushauri wa ushauri wa OP
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Weka yako
@@ -628,7 +641,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Uingizaji hauwezi kuwa 0
 DocType: Production Planning Tool,Material Requirement,Mahitaji ya Nyenzo
 DocType: Company,Delete Company Transactions,Futa Shughuli za Kampuni
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Kitabu cha Marejeo na Kumbukumbu ni lazima kwa shughuli za Benki
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Kitabu cha Marejeo na Kumbukumbu ni lazima kwa shughuli za Benki
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Ongeza / Badilisha Taxes na Malipo
 DocType: Payment Entry Reference,Supplier Invoice No,Nambari ya ankara ya wasambazaji
 DocType: Territory,For reference,Kwa kumbukumbu
@@ -636,12 +649,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Haiwezi kufuta Serial No {0}, kama inatumiwa katika ushirikiano wa hisa"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Kufungwa (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Sawa
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Hoja Item
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Hoja Item
 DocType: Serial No,Warranty Period (Days),Kipindi cha udhamini (Siku)
 DocType: Installation Note Item,Installation Note Item,Kitu cha Kumbuka cha Ufungaji
 DocType: Production Plan Item,Pending Qty,Uchina uliotarajiwa
 DocType: Budget,Ignore,Puuza
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} haifanyi kazi
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} haifanyi kazi
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Weka vipimo vipimo vya kuchapisha
 DocType: Salary Slip,Salary Slip Timesheet,Timesheet ya Mshahara Mshahara
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Ghala la Wafanyabiashara lazima kwa Receipt ya Ununuzi wa chini ya mkataba
@@ -650,7 +663,7 @@
 DocType: Pricing Rule,Sales Partner,Mshirika wa Mauzo
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Mapendekezo yote ya Wasambazaji.
 DocType: Buying Settings,Purchase Receipt Required,Receipt ya Ununuzi inahitajika
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Kiwango cha Vigeo ni lazima ikiwa Stock Inapoingia
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,Kiwango cha Vigeo ni lazima ikiwa Stock Inapoingia
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Hakuna kumbukumbu zilizopatikana kwenye meza ya ankara
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Tafadhali chagua Aina ya Kampuni na Chapa kwanza
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Mwaka wa fedha / uhasibu.
@@ -687,7 +700,7 @@
 DocType: Quotation,Quotation To,Nukuu Kwa
 DocType: Lead,Middle Income,Mapato ya Kati
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Kufungua (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Kipengee cha Kupima kwa Kipengee cha Bidhaa {0} hawezi kubadilishwa moja kwa moja kwa sababu tayari umefanya shughuli au UOM mwingine. Utahitaji kujenga kipengee kipya cha kutumia UOM tofauti ya UOM.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Kipengee cha Kupima kwa Kipengee cha Bidhaa {0} hawezi kubadilishwa moja kwa moja kwa sababu tayari umefanya shughuli au UOM mwingine. Utahitaji kujenga kipengee kipya cha kutumia UOM tofauti ya UOM.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Kiwango kilichowekwa hawezi kuwa hasi
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Tafadhali weka Kampuni
 DocType: Purchase Order Item,Billed Amt,Alilipwa Amt
@@ -701,6 +714,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Chagua Akaunti ya Malipo kwa Kufungua Benki
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Unda kumbukumbu za Wafanyakazi kusimamia majani, madai ya gharama na malipo"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Kipindi cha Dawa
+DocType: Restaurant Reservation,Restaurant Reservation,Uhifadhi wa Mkahawa
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Kuandika Proposal
 DocType: Payment Entry Deduction,Payment Entry Deduction,Utoaji wa Kuingia kwa Malipo
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Mtu mwingine wa Mauzo {0} yupo na id idumu ya mfanyakazi
@@ -708,7 +722,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Masters
 DocType: Assessment Plan,Maximum Assessment Score,Makadirio ya Kiwango cha Tathmini
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Sasisha Dates ya Shughuli za Benki
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Ufuatiliaji wa Muda
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Ufuatiliaji wa Muda
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,DUPLICATE kwa TRANSPORTER
 DocType: Fiscal Year Company,Fiscal Year Company,Kampuni ya Mwaka wa Fedha
 DocType: Packing Slip Item,DN Detail,DN Detail
@@ -716,8 +730,9 @@
 DocType: Timesheet,Billed,Inauzwa
 DocType: Batch,Batch Description,Maelezo ya Bande
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Kujenga makundi ya wanafunzi
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Akaunti ya Gateway ya Malipo haijatengenezwa, tafadhali ingiza moja kwa moja."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Akaunti ya Gateway ya Malipo haijatengenezwa, tafadhali ingiza moja kwa moja."
 DocType: Supplier Scorecard,Per Year,Kwa mwaka
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Haikubaliki kuingia kwenye programu hii kama DOB
 DocType: Sales Invoice,Sales Taxes and Charges,Malipo ya Kodi na Malipo
 DocType: Employee,Organization Profile,Profaili ya Shirika
 DocType: Vital Signs,Height (In Meter),Urefu (Katika mita)
@@ -753,7 +768,7 @@
 DocType: Student Batch Name,Batch Name,Jina la Kundi
 DocType: Fee Validity,Max number of visit,Idadi kubwa ya ziara
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet iliunda:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Tafadhali weka Akaunti ya Fedha au Benki ya Mkopo katika Mfumo wa Malipo {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Tafadhali weka Akaunti ya Fedha au Benki ya Mkopo katika Mfumo wa Malipo {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,Ingia
 DocType: GST Settings,GST Settings,Mipangilio ya GST
 DocType: Selling Settings,Customer Naming By,Mteja anayeitwa na
@@ -785,15 +800,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Malipo ya Gharama na Malipo
 DocType: Production Order Operation,Actual Start Time,Muda wa Kuanza
 DocType: BOM Operation,Operation Time,Muda wa Uendeshaji
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Kumaliza
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Kumaliza
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Msingi
 DocType: Timesheet,Total Billed Hours,Masaa Yote yaliyolipwa
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Andika Kiasi
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Andika Kiasi
 DocType: Leave Block List Allow,Allow User,Ruhusu Mtumiaji
 DocType: Journal Entry,Bill No,Bill No
 DocType: Company,Gain/Loss Account on Asset Disposal,Akaunti ya Kupoteza / Kupoteza juu ya Upunguzaji wa Mali
 DocType: Vehicle Log,Service Details,Maelezo ya Huduma
-DocType: Purchase Invoice,Quarterly,Jumatatu
+DocType: Subscription,Quarterly,Jumatatu
 DocType: Lab Test Template,Grouped,Yameunganishwa
 DocType: Selling Settings,Delivery Note Required,Kumbuka Utoaji Inahitajika
 DocType: Bank Guarantee,Bank Guarantee Number,Nambari ya Dhamana ya Benki
@@ -802,12 +817,12 @@
 DocType: Student Attendance,Student Attendance,Mahudhurio ya Wanafunzi
 DocType: Sales Invoice Timesheet,Time Sheet,Karatasi ya Muda
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Vipande vya Raw vya Backflush Kulingana na
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Tafadhali ingiza maelezo ya kipengee
 DocType: Interest,Interest,Hamu
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Mauzo ya awali
 DocType: Purchase Receipt,Other Details,Maelezo mengine
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Kuinua
 DocType: Lab Test,Test Template,Kigezo cha Mtihani
+DocType: Restaurant Order Entry Item,Served,Imehudumiwa
 DocType: Account,Accounts,Akaunti
 DocType: Vehicle,Odometer Value (Last),Thamani ya Odometer (Mwisho)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Matukio ya vigezo vya scorecard ya wasambazaji.
@@ -819,25 +834,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Angalia Slip ya Mshahara
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Akaunti {0} imeingizwa mara nyingi
 DocType: Account,Expenses Included In Valuation,Malipo Pamoja na Valuation
-DocType: Hub Settings,Seller City,Mji wa Wauzaji
 ,Absent Student Report,Ripoti ya Wanafunzi Yasiyo
 DocType: Email Digest,Next email will be sent on:,Imefuata barua pepe itatumwa kwenye:
 DocType: Offer Letter Term,Offer Letter Term,Nambari ya Barua ya Kutoa
 DocType: Supplier Scorecard,Per Week,Kila wiki
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Item ina tofauti.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Item ina tofauti.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Jumla ya Mwanafunzi
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Kipengee {0} haipatikani
 DocType: Bin,Stock Value,Thamani ya Hifadhi
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,Rekodi za ada zitaundwa nyuma. Ikiwa kuna hitilafu yoyote ujumbe wa kosa utasasishwa katika Ratiba.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Kampuni {0} haipo
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} ina uhalali wa ada mpaka {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} ina uhalali wa ada mpaka {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Aina ya Mti
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Uchina hutumiwa kwa kitengo
 DocType: Serial No,Warranty Expiry Date,Tarehe ya Kumalizika ya Udhamini
 DocType: Material Request Item,Quantity and Warehouse,Wingi na Ghala
+DocType: Hub Settings,Unregister,Wala usajili
 DocType: Sales Invoice,Commission Rate (%),Kiwango cha Tume (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Tafadhali chagua Programu
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Tafadhali chagua Programu
 DocType: Project,Estimated Cost,Gharama zilizohesabiwa
 DocType: Purchase Order,Link to material requests,Unganisha maombi ya vifaa
+DocType: Hub Settings,Publish,Kuchapisha
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Mazingira
 DocType: Journal Entry,Credit Card Entry,Kuingia Kadi ya Mikopo
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Kampuni na Akaunti
@@ -848,13 +865,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Fungua Fursa Baada ya Siku
 ,Reserved,Imehifadhiwa
 DocType: Purchase Order,Supply Raw Materials,Vifaa vya Malighafi
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Tarehe ambayo ankara ijayo itazalishwa. Inazalishwa kwa kuwasilisha.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Malipo ya sasa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} si kitu cha hisa
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',Tafadhali shiriki maoni yako kwenye mafunzo kwa kubonyeza &#39;Mafunzo ya Maoni&#39; na kisha &#39;Mpya&#39;
 DocType: Mode of Payment Account,Default Account,Akaunti ya Akaunti
 DocType: Payment Entry,Received Amount (Company Currency),Kiasi kilichopokelewa (Fedha la Kampuni)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,Kiongozi lazima kiweke kama Mfanyabiashara unafanywa kutoka kwa Kiongozi
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,Kiongozi lazima kiweke kama Mfanyabiashara unafanywa kutoka kwa Kiongozi
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Tafadhali chagua kila wiki siku
 DocType: Patient,O Negative,O Hasi
 DocType: Production Order Operation,Planned End Time,Muda wa Mwisho
@@ -870,10 +886,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Nishati
 DocType: Opportunity,Opportunity From,Fursa Kutoka
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Taarifa ya mshahara kila mwezi.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Ongeza Kampuni
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Nambari za nambari zinahitajika kwa Bidhaa {2}. Umetoa {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Nambari za nambari zinahitajika kwa Bidhaa {2}. Umetoa {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Tafadhali chagua meza
 DocType: BOM,Website Specifications,Ufafanuzi wa tovuti
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} ni anwani ya barua pepe batili katika &#39;Wapokeaji&#39;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} ni anwani ya barua pepe batili katika &#39;Wapokeaji&#39;
 DocType: Special Test Items,Particulars,Maelezo
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiotic.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Kutoka {0} ya aina {1}
@@ -881,11 +897,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Row {0}: Kiini cha Kubadilisha ni lazima
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Sheria nyingi za Bei zipo na vigezo sawa, tafadhali tatua mgogoro kwa kuwapa kipaumbele. Kanuni za Bei: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,Haiwezi kuzima au kufuta BOM kama inavyounganishwa na BOM nyingine
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,Haiwezi kuzima au kufuta BOM kama inavyounganishwa na BOM nyingine
 DocType: Opportunity,Maintenance,Matengenezo
 DocType: Item Attribute Value,Item Attribute Value,Thamani ya Thamani ya Bidhaa
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Kampeni za mauzo.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Fanya Timesheet
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Fanya Timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -923,12 +939,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Tafadhali ingiza kipengee kwanza
 DocType: Account,Liability,Dhima
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Kizuizi cha Hesabu haiwezi kuwa kikubwa kuliko Kiasi cha Madai katika Row {0}.
+DocType: Salary Detail,Do not include in total,Usijumuishe kwa jumla
 DocType: Company,Default Cost of Goods Sold Account,Akaunti ya Kuuza Gharama ya Bidhaa
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Orodha ya Bei haichaguliwa
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Orodha ya Bei haichaguliwa
 DocType: Employee,Family Background,Familia ya Background
 DocType: Request for Quotation Supplier,Send Email,Kutuma barua pepe
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Onyo: Sakilili batili {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Hakuna Ruhusa
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Onyo: Sakilili batili {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Hakuna Ruhusa
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Quote Iliombwa
 DocType: Vital Signs,Heart Rate / Pulse,Kiwango cha Moyo / Pulse
 DocType: Company,Default Bank Account,Akaunti ya Akaunti ya Default
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Kuchuja kulingana na Chama, chagua Aina ya Chama kwanza"
@@ -955,12 +973,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Jambo Row {idx}: {doctype} {docname} haipo katika meza ya &#39;{doctype}&#39; hapo juu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} tayari imekamilika au kufutwa
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Hakuna kazi
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Siku ya mwezi ambayo ankara ya gari itazalishwa kwa mfano 05, 28 nk"
 DocType: Item Variant Settings,Copy Fields to Variant,Weka Mashamba kwa Tofauti
 DocType: Asset,Opening Accumulated Depreciation,Kufungua kushuka kwa thamani
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score lazima iwe chini au sawa na 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Chombo cha Usajili wa Programu
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,Rekodi za Fomu za C
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,Rekodi za Fomu za C
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Wateja na Wasambazaji
 DocType: Email Digest,Email Digest Settings,Mipangilio ya Digest ya barua pepe
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Asante kwa biashara yako!
@@ -978,13 +995,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Hali ya Quote
 DocType: Maintenance Visit,Completion Status,Hali ya kukamilisha
 DocType: HR Settings,Enter retirement age in years,Ingiza umri wa kustaafu kwa miaka
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Ghala la Ghala
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Tafadhali chagua ghala
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Ghala la Ghala
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Tafadhali chagua ghala
 DocType: Cheque Print Template,Starting location from left edge,Kuanzia eneo kutoka kwa makali ya kushoto
 DocType: Item,Allow over delivery or receipt upto this percent,Ruhusu utoaji au risiti hadi asilimia hii
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Weka Mahudhurio
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Vikundi vyote vya Item
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Vikundi vyote vya Item
 DocType: Process Payroll,Activity Log,Ingia ya Shughuli
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Faida Nzuri / Kupoteza
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Tuma ujumbe wa moja kwa moja kwenye uwasilishaji wa shughuli.
@@ -996,7 +1013,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Uchina uliopangwa
 DocType: Sales Invoice,Payment Due Date,Tarehe ya Kutayarisha Malipo
 DocType: Drug Prescription,Interval UOM,Muda wa UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Tofauti ya kipengee {0} tayari ipo na sifa sawa
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Tofauti ya kipengee {0} tayari ipo na sifa sawa
+DocType: Item,Hub Publishing Details,Maelezo ya Uchapishaji wa Hub
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;Kufungua&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Fungua Kufanya
 DocType: Notification Control,Delivery Note Message,Ujumbe wa Kumbuka Utoaji
@@ -1016,10 +1034,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: Vifaa vyenye rangi haviwezi kuwa sawa na Bidhaa kuu
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Malipo Yote ya Kuhitajika katika Jedwali la Vipokezi vya Ununuzi lazima lifanane na Jumla ya Kodi na Malipo
 DocType: Sales Team,Incentives,Vidokezo
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Jisajili kwa Hub
 DocType: SMS Log,Requested Numbers,Hesabu zilizoombwa
 DocType: Production Planning Tool,Only Obtain Raw Materials,Tu Kupata Vifaa vya Raw
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Tathmini ya utendaji.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Kuwezesha &#39;Matumizi kwa Ununuzi wa Ununuzi&#39;, kama Kifaa cha Ununuzi kinawezeshwa na kuna lazima iwe na Kanuni moja ya Ushuru kwa Kundi la Ununuzi"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Kuwezesha &#39;Matumizi kwa Ununuzi wa Ununuzi&#39;, kama Kifaa cha Ununuzi kinawezeshwa na kuna lazima iwe na Kanuni moja ya Ushuru kwa Kundi la Ununuzi"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Uingiaji wa Malipo {0} umeunganishwa dhidi ya Amri {1}, angalia ikiwa inapaswa kuvutwa kama mapema katika ankara hii."
 DocType: Sales Invoice Item,Stock Details,Maelezo ya hisa
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Thamani ya Mradi
@@ -1038,12 +1057,14 @@
 DocType: Salary Slip,Working Days,Siku za Kazi
 DocType: Serial No,Incoming Rate,Kiwango kinachoingia
 DocType: Packing Slip,Gross Weight,Uzito wa Pato
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,Jina la kampuni yako ambayo unaanzisha mfumo huu.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Wezesha Hub
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,Jina la kampuni yako ambayo unaanzisha mfumo huu.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Jumuisha likizo katika Jumla ya. ya siku za kazi
 DocType: Job Applicant,Hold,Weka
 DocType: Employee,Date of Joining,Tarehe ya kujiunga
 DocType: Naming Series,Update Series,Sasisha Mfululizo
 DocType: Supplier Quotation,Is Subcontracted,"Je, unachangamizwa"
+DocType: Restaurant Table,Minimum Seating,Kukaa chini
 DocType: Item Attribute,Item Attribute Values,Kipengee cha sifa za Maadili
 DocType: Examination Result,Examination Result,Matokeo ya Uchunguzi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Receipt ya Ununuzi
@@ -1054,13 +1075,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Haiwezi kupata Muda wa Slot katika siku zifuatazo {0} kwa Uendeshaji {1}
 DocType: Production Order,Plan material for sub-assemblies,Panga nyenzo kwa makusanyiko ndogo
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Washirika wa Mauzo na Wilaya
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} lazima iwe hai
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} lazima iwe hai
 DocType: Journal Entry,Depreciation Entry,Kuingia kwa kushuka kwa thamani
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Tafadhali chagua aina ya hati kwanza
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Futa Ziara Nyenzo {0} kabla ya kufuta Kutembelea Utunzaji huu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial Hakuna {0} si ya Bidhaa {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Uliohitajika Uchina
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Maghala na shughuli zilizopo haziwezi kubadilishwa kwenye kiwanja.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Maghala na shughuli zilizopo haziwezi kubadilishwa kwenye kiwanja.
 DocType: Bank Reconciliation,Total Amount,Jumla
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Kuchapisha mtandao
 DocType: Prescription Duration,Number,Nambari
@@ -1071,7 +1092,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Orodha ya Bei ya Mauzo
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Ikiwa imechungwa, mteja atatengenezwa, amechukuliwa kwa Mgonjwa. Invoice za Mgonjwa zitaundwa dhidi ya Wateja hawa. Unaweza pia kuchagua Wateja aliyepo wakati wa kujenga Mgonjwa."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Chapisha ili kusawazisha vitu
 DocType: Bank Reconciliation,Account Currency,Fedha za Akaunti
 DocType: Lab Test,Sample ID,Kitambulisho cha Mfano
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Tafadhali tuma Akaunti ya Pande zote katika Kampuni
@@ -1080,11 +1100,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Mfanyakazi {0} haifanyi kazi au haipo
 DocType: Fee Structure,Components,Vipengele
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Tafadhali ingiza Kundi la Mali katika Item {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Vipengee vya Toleo {0} vinavyosasishwa
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Vipengee vya Toleo {0} vinavyosasishwa
 DocType: Quality Inspection Reading,Reading 6,Kusoma 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Haiwezi {0} {1} {2} bila ankara yoyote mbaya
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","ili kuzalishwa. Ikiwa imechelewa, utahitajika kubadilisha &quot;Rudia Siku ya Mwezi&quot; shamba hili"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Haiwezi {0} {1} {2} bila ankara yoyote mbaya
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Ununuzi wa ankara ya awali
-DocType: Hub Settings,Sync Now,Sawazisha Sasa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: Uingiaji wa mikopo hauwezi kuunganishwa na {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Eleza bajeti kwa mwaka wa kifedha.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Akaunti ya Default Bank / Cash itasasishwa moja kwa moja katika ankara za POS wakati hali hii imechaguliwa.
@@ -1096,13 +1117,13 @@
 DocType: Item,Is Purchase Item,Inunuzi ya Bidhaa
 DocType: Asset,Purchase Invoice,Invozi ya Ununuzi
 DocType: Stock Ledger Entry,Voucher Detail No,Maelezo ya Voucher No
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Invozi mpya ya Mauzo
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Invozi mpya ya Mauzo
 DocType: Stock Entry,Total Outgoing Value,Thamani Yote ya Kuondoka
 DocType: Physician,Appointments,Uteuzi
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Tarehe ya Ufunguzi na Tarehe ya Kufungwa lazima iwe ndani ya mwaka mmoja wa Fedha
 DocType: Lead,Request for Information,Ombi la Taarifa
 ,LeaderBoard,Kiongozi wa Viongozi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Sawazisha ankara zisizo kwenye mtandao
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Sawazisha ankara zisizo kwenye mtandao
 DocType: Payment Request,Paid,Ilipwa
 DocType: Program Fee,Program Fee,Malipo ya Programu
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1112,7 +1133,7 @@
 DocType: Guardian,Guardian Name,Jina la Mlinzi
 DocType: Cheque Print Template,Has Print Format,Ina Chapisho la Kuchapa
 DocType: Employee Loan,Sanctioned,Imeteuliwa
-apps/erpnext/erpnext/accounts/page/pos/pos.js +73, is mandatory. Maybe Currency Exchange record is not created for ,ni lazima. Labda Rekodi ya Kubadilisha Fedha haikuundwa kwa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +73, is mandatory. Maybe Currency Exchange record is not created for ,ni lazima. Labda Rekodi ya ubadilishaji Fedha haikuundwa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Tafadhali taja Serial Hakuna kwa Bidhaa {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +622,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Kwa vitu vya &#39;Bidhaa Bundle&#39;, Ghala, Serial No na Batch Hakuna itazingatiwa kutoka kwenye orodha ya &#39;Orodha ya Ufungashaji&#39;. Ikiwa Hakuna Ghala na Batch No ni sawa kwa vitu vyote vya kuingiza kwa bidhaa yoyote ya &#39;Bidhaa Bundle&#39;, maadili haya yanaweza kuingizwa kwenye meza kuu ya Bidhaa, maadili yatakopwa kwenye &#39;Orodha ya Ufungashaji&#39;."
 DocType: Job Opening,Publish on website,Chapisha kwenye tovuti
@@ -1121,11 +1142,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Nambari ya Utaratibu wa Ununuzi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Mapato ya moja kwa moja
 DocType: Student Attendance Tool,Student Attendance Tool,Chombo cha Kuhudhuria Wanafunzi
+DocType: Restaurant Menu,Price List (Auto created),Orodha ya Bei (Iliundwa kwa Auto)
 DocType: Cheque Print Template,Date Settings,Mpangilio wa Tarehe
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Tofauti
 ,Company Name,jina la kampuni
 DocType: SMS Center,Total Message(s),Ujumbe Jumla (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Chagua Kitu cha Kuhamisha
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Chagua Kitu cha Kuhamisha
 DocType: Purchase Invoice,Additional Discount Percentage,Asilimia ya Punguzo la ziada
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Tazama orodha ya video zote za usaidizi
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Chagua kichwa cha akaunti cha benki ambapo hundi iliwekwa.
@@ -1142,6 +1164,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Mita
 DocType: Workstation,Electricity Cost,Gharama za Umeme
 DocType: HR Settings,Don't send Employee Birthday Reminders,Usitumie Makumbusho ya Siku ya Kuzaliwa
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Weka Mipangilio
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Bidhaa zilizoombwa
 DocType: Item,Inspection Criteria,Vigezo vya ukaguzi
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Imehamishwa
 DocType: BOM Website Item,BOM Website Item,BOM ya Bidhaa ya Tovuti
@@ -1158,11 +1182,11 @@
 DocType: Journal Entry,Total Amount in Words,Jumla ya Kiasi kwa Maneno
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Kulikuwa na hitilafu. Sababu moja ya uwezekano inaweza kuwa kwamba haujahifadhi fomu. Tafadhali wasiliana na support@erpnext.com ikiwa tatizo linaendelea.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Yangu Cart
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Aina ya Utaratibu lazima iwe moja ya {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Aina ya Utaratibu lazima iwe moja ya {0}
 DocType: Lead,Next Contact Date,Tarehe ya Kuwasiliana ijayo
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Ufunguzi wa Uchina
 DocType: Healthcare Settings,Appointment Reminder,Kumbukumbu ya Uteuzi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Tafadhali ingiza Akaunti ya Kiasi cha Mabadiliko
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Tafadhali ingiza Akaunti ya Kiasi cha Mabadiliko
 DocType: Student Batch Name,Student Batch Name,Jina la Kundi la Mwanafunzi
 DocType: Consultation,Doctor,Daktari
 DocType: Holiday List,Holiday List Name,Jina la Orodha ya likizo
@@ -1170,12 +1194,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Ratiba ya Kozi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Chaguzi za hisa
 DocType: Journal Entry Account,Expense Claim,Madai ya Madai
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,"Je, kweli unataka kurejesha mali hii iliyokatwa?"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Uchina kwa {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,"Je, kweli unataka kurejesha mali hii iliyokatwa?"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Uchina kwa {0}
 DocType: Leave Application,Leave Application,Acha Maombi
 DocType: Patient,Patient Relation,Uhusiano wa Mgonjwa
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Acha Chombo cha Ugawaji
+DocType: Item,Hub Category to Publish,Jamii ya Hifadhi ya Kuchapisha
 DocType: Leave Block List,Leave Block List Dates,Acha Tarehe ya Kuzuia Orodha
+DocType: Sales Invoice,Billing Address GSTIN,Anwani ya kulipia GSTIN
 DocType: Workstation,Net Hour Rate,Kiwango cha Saa ya Nambari
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Rejeipt ya Ununuzi wa Gharama
 DocType: Company,Default Terms,Masharti ya Default
@@ -1185,18 +1211,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Tafadhali taja {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Vipengee vilivyoondolewa bila mabadiliko katika wingi au thamani.
 DocType: Delivery Note,Delivery To,Utoaji Kwa
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Toleo la meza ni lazima
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Toleo la meza ni lazima
 DocType: Production Planning Tool,Get Sales Orders,Pata Maagizo ya Mauzo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} haiwezi kuwa hasi
 DocType: Training Event,Self-Study,Kujitegemea
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Punguzo
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Punguzo
 DocType: Asset,Total Number of Depreciations,Jumla ya Idadi ya Dhamana
 DocType: Sales Invoice Item,Rate With Margin,Kiwango cha Kwa Margin
 DocType: Workstation,Wages,Mishahara
 DocType: Task,Urgent,Haraka
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Tafadhali taja Kitambulisho cha Row halali kwa mstari {0} katika jedwali {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Haiwezi kupata variable:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Tafadhali chagua shamba kuhariri kutoka numpad
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Tafadhali chagua shamba kuhariri kutoka numpad
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Nenda kwenye Desktop na uanze kutumia ERPNext
 DocType: Item,Manufacturer,Mtengenezaji
 DocType: Landed Cost Item,Purchase Receipt Item,Ununuzi wa Receipt Item
@@ -1227,8 +1253,8 @@
 DocType: GL Entry,Against,Dhidi
 DocType: Item,Default Selling Cost Center,Kituo cha Gharama ya Kuuza Ghali
 DocType: Sales Partner,Implementation Partner,Utekelezaji wa Mshiriki
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Namba ya Posta
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Amri ya Mauzo {0} ni {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Namba ya Posta
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Amri ya Mauzo {0} ni {1}
 DocType: Opportunity,Contact Info,Maelezo ya Mawasiliano
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Kufanya Entries Stock
 DocType: Packing Slip,Net Weight UOM,Uzito wa Uzito wa Nambari
@@ -1239,6 +1265,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Pata Dondoo za Majuma
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Tarehe ya Mwisho haiwezi kuwa chini ya Tarehe ya Mwanzo
 DocType: Sales Person,Select company name first.,Chagua jina la kampuni kwanza.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Chini hadi Juu
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Nukuu zilizopokea kutoka kwa Wauzaji.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Badilisha BOM na usasishe bei ya hivi karibuni katika BOM zote
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Kwa {0} | {1} {2}
@@ -1257,7 +1284,7 @@
 DocType: Program Enrollment,Transportation,Usafiri
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Attribute batili
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} lazima iwasilishwa
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Wingi lazima iwe chini au sawa na {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Wingi lazima iwe chini au sawa na {0}
 DocType: SMS Center,Total Characters,Washirika wa jumla
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Tafadhali chagua BOM katika uwanja wa BOM kwa Item {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Maelezo ya Nambari ya Invoice ya Fomu
@@ -1272,7 +1299,7 @@
 ,Ordered Items To Be Billed,Vipengele vya Amri vinavyopigwa
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Kutoka kwa Range lazima iwe chini ya Kupanga
 DocType: Global Defaults,Global Defaults,Ufafanuzi wa Global
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Mwaliko wa Ushirikiano wa Mradi
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Mwaliko wa Ushirikiano wa Mradi
 DocType: Salary Slip,Deductions,Kupunguza
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Jina la Hatua
@@ -1290,13 +1317,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Advance ya Mauzo ya Mauzo
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Hakuna chochote cha kuomba
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Rekodi nyingine ya Bajeti &#39;{0}&#39; tayari imesimama dhidi ya {1} &#39;{2}&#39; kwa mwaka wa fedha {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&#39;Tarehe ya Kuanza&#39; haiwezi kuwa kubwa zaidi kuliko &#39;Tarehe ya mwisho ya mwisho&#39;
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','Tarehe sahihi ya Kuanza' haiwezi kuwa kubwa zaidi kuliko 'Tarehe ya mwisho ya mwisho'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Usimamizi
 DocType: Cheque Print Template,Payer Settings,Mipangilio ya Payer
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Hii itaongezwa kwenye Kanuni ya Nambari ya Mchapishaji. Kwa mfano, ikiwa kichwa chako ni &quot;SM&quot;, na msimbo wa kipengee ni &quot;T-SHIRT&quot;, msimbo wa kipengee wa kipengee utakuwa &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net Pay (kwa maneno) itaonekana baada ya kuokoa Slip ya Mshahara.
 DocType: Purchase Invoice,Is Return,Inarudi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Tahadhari
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Tahadhari
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Kurudi / Kumbuka Debit
 DocType: Price List Country,Price List Country,Orodha ya Bei ya Nchi
 DocType: Item,UOMs,UOM
@@ -1311,17 +1338,18 @@
 DocType: Account,Balance Sheet,Karatasi ya Mizani
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Kituo cha Gharama kwa Bidhaa na Msimbo wa Bidhaa &#39;
 DocType: Fee Validity,Valid Till,Halali Mpaka
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Njia ya Malipo haijasanidiwa. Tafadhali angalia, kama akaunti imewekwa kwenye Mfumo wa Malipo au kwenye POS Profile."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Njia ya Malipo haijasanidiwa. Tafadhali angalia, kama akaunti imewekwa kwenye Mfumo wa Malipo au kwenye POS Profile."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Kitu kimoja hawezi kuingizwa mara nyingi.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Akaunti zaidi zinaweza kufanywa chini ya Vikundi, lakini viingilio vinaweza kufanywa dhidi ya wasio Vikundi"
 DocType: Lead,Lead,Cheza
 DocType: Email Digest,Payables,Malipo
 DocType: Course,Course Intro,Intro Course
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Entry Entry {0} imeundwa
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Tafadhali kuanzisha mfululizo wa kuhesabu kwa Mahudhurio kupitia Upangilio&gt; Orodha ya Kuhesabu
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Entry Entry {0} imeundwa
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Nambari iliyokataliwa haiwezi kuingizwa katika Kurudi kwa Ununuzi
 ,Purchase Order Items To Be Billed,Vitu vya Utaratibu wa Ununuzi Ili Kulipwa
 DocType: Purchase Invoice Item,Net Rate,Kiwango cha Nambari
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Tafadhali chagua mteja
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Tafadhali chagua mteja
 DocType: Purchase Invoice Item,Purchase Invoice Item,Bidhaa ya Invoice ya Ununuzi
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Entries Ledger Entries na GL Entries ni reposted kwa Receipts ya kuchaguliwa Ununuzi
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Kipengee 1
@@ -1340,7 +1368,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Mstari wa Duplicate {0} na sawa {1}
 ,Trial Balance,Mizani ya majaribio
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Mwaka wa Fedha {0} haukupatikana
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Kuweka Wafanyakazi
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Kuweka Wafanyakazi
 DocType: Sales Order,SO-,SO-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Tafadhali chagua kiambatisho kwanza
 DocType: Employee,O-,O-
@@ -1352,12 +1380,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Tazama kizuizi
 DocType: Grading Scale,Intervals,Mapumziko
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Mapema kabisa
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Kundi la Bidhaa limekuwa na jina moja, tafadhali ubadilisha jina la kipengee au uunda jina la kundi la bidhaa"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Kundi la Bidhaa limekuwa na jina moja, tafadhali ubadilisha jina la kipengee au uunda jina la kundi la bidhaa"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Namba ya Mkono ya Mwanafunzi
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Mwisho wa Dunia
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Mwisho wa Dunia
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} haiwezi kuwa na Kundi
 ,Budget Variance Report,Ripoti ya Tofauti ya Bajeti
 DocType: Salary Slip,Gross Pay,Pato la Pato
+DocType: Item,Is Item from Hub,Ni kitu kutoka Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Row {0}: Aina ya Shughuli ni lazima.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Mgawanyiko ulipwa
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Ledger ya Uhasibu
@@ -1367,8 +1396,9 @@
 DocType: Vehicle Log,Service Detail,Maelezo ya Huduma
 DocType: BOM,Item Description,Maelezo ya maelezo
 DocType: Student Sibling,Student Sibling,Kijana wa Kike
-DocType: Purchase Invoice,Is Recurring,Inaendelea
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Njia ya Malipo
 DocType: Purchase Invoice,Supplied Items,Vitu vinavyopatikana
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Tafadhali weka orodha ya kazi ya Mgahawa {0}
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Uchina Ili Kufanya
 DocType: Email Digest,New Income,Mapato mapya
@@ -1378,6 +1408,7 @@
 ,Student and Guardian Contact Details,Mwanafunzi na Mlinzi Maelezo ya Mawasiliano
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Row {0}: Kwa wauzaji {0} Anwani ya barua pepe inahitajika kutuma barua pepe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Ufunguo wa Muda
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Tazama Hub
 ,Employee Leave Balance,Mizani ya Waajiriwa
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Mizani ya Akaunti {0} lazima iwe {1}
 DocType: Patient Appointment,More Info,Maelezo zaidi
@@ -1397,13 +1428,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Uagizaji wa Mauzo {0} halali
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Tahadhari kwa ombi mpya ya Nukuu
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Amri za ununuzi husaidia kupanga na kufuatilia ununuzi wako
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Samahani, makampuni hawezi kuunganishwa"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Samahani, makampuni hawezi kuunganishwa"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Maagizo ya Majaribio ya Lab
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Jalada la jumla / Vipimo vya uhamisho {0} katika Maombi ya Vifaa {1} \ hawezi kuwa kubwa zaidi kuliko kiasi kilichoombwa {2} kwa Bidhaa {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Ndogo
 DocType: Employee,Employee Number,Nambari ya Waajiriwa
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Kesi Hakuna (s) tayari kutumika. Jaribu kutoka kwenye Uchunguzi Hapana {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Kesi Hakuna (s) tayari kutumika. Jaribu kutoka kwenye Uchunguzi Hapana {0}
 DocType: Project,% Completed,Imekamilika
 ,Invoiced Amount (Exculsive Tax),Kiasi kilichotolewa (kodi ya nje)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Kipengee 2
@@ -1418,11 +1449,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Gharama zisizo sahihi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Row {0}: Uchina ni lazima
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Kilimo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Sawa Data ya Mwalimu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sawa Data ya Mwalimu
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Bidhaa au Huduma zako
 DocType: Special Test Items,Special Test Items,Vipimo vya Mtihani maalum
 DocType: Mode of Payment,Mode of Payment,Hali ya Malipo
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Image ya tovuti lazima iwe faili ya umma au URL ya tovuti
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Image ya tovuti lazima iwe faili ya umma au URL ya tovuti
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Hii ni kikundi cha bidhaa cha mizizi na haiwezi kuhaririwa.
@@ -1430,24 +1461,23 @@
 DocType: Vehicle,Fuel UOM,UOM ya mafuta
 DocType: Warehouse,Warehouse Contact Info,Info ya Kuwasiliana na Ghala
 DocType: Payment Entry,Write Off Difference Amount,Andika Tofauti Tofauti
-DocType: Purchase Invoice,Recurring Type,Aina ya mara kwa mara
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: barua pepe ya mfanyakazi haipatikani, hivyo barua pepe haitumwa"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: barua pepe ya mfanyakazi haipatikani, hivyo barua pepe haitumwa"
 DocType: Item,Foreign Trade Details,Maelezo ya Biashara ya Nje
+,Assessment Plan Status,Hali ya Mpango wa Tathmini
 DocType: Email Digest,Annual Income,Mapato ya kila mwaka
 DocType: Serial No,Serial No Details,Serial Hakuna Maelezo
 DocType: Purchase Invoice Item,Item Tax Rate,Kiwango cha Kodi ya Kodi
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,Tafadhali chagua Mganga na Tarehe
 DocType: Student Group Student,Group Roll Number,Nambari ya Roll ya Kikundi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Kwa {0}, akaunti za mikopo tu zinaweza kuunganishwa dhidi ya kuingia mwingine kwa debit"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Jumla ya yote uzito wa kazi lazima 1. Tafadhali weka uzito wa kazi zote za Mradi ipasavyo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Kumbuka Utoaji {0} haujawasilishwa
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Jumla ya yote uzito wa kazi lazima 1. Tafadhali weka uzito wa kazi zote za Mradi ipasavyo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Kumbuka Utoaji {0} haujawasilishwa
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Kipengee {0} kinafaa kuwa kitu cha Chini
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Vifaa vya Capital
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Rule ya bei ni ya kwanza kuchaguliwa kulingana na shamba la &#39;Weka On&#39;, ambayo inaweza kuwa Item, Kikundi cha Bidhaa au Brand."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Tafadhali weka Kanuni ya Kwanza
-DocType: Hub Settings,Seller Website,Tovuti ya Wauzaji
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Tafadhali weka Kanuni ya Kwanza
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Asilimia ya jumla iliyotengwa kwa timu ya mauzo inapaswa kuwa 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Asilimia ya jumla iliyotengwa kwa timu ya mauzo inapaswa kuwa 100
 DocType: Sales Invoice Item,Edit Description,Hariri Maelezo
 DocType: Antibiotic,Antibiotic,Antibiotic
 ,Team Updates,Updates ya Timu
@@ -1468,12 +1498,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Jumla (Kampuni ya Fedha)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Nambari ya serial {0} imeingia zaidi ya mara moja
 DocType: Depreciation Schedule,Journal Entry,Kuingia kwa Jarida
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} vitu vinaendelea
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} vitu vinaendelea
 DocType: Workstation,Workstation Name,Jina la kazi
 DocType: Grading Scale Interval,Grade Code,Daraja la Kanuni
 DocType: POS Item Group,POS Item Group,Kundi la Bidhaa la POS
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Ujumbe wa barua pepe:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} sio Kipengee {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} sio Kipengee {1}
 DocType: Sales Partner,Target Distribution,Usambazaji wa Target
 DocType: Salary Slip,Bank Account No.,Akaunti ya Akaunti ya Benki
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Huu ndio idadi ya shughuli za mwisho zilizoundwa na kiambishi hiki
@@ -1489,10 +1519,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Ombi la Mtoaji wa Nukuu
 DocType: Healthcare Settings,Registration Message,Ujumbe wa Usajili
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Vifaa
-DocType: Sales Order,Recurring Upto,Inarudi Upto
 DocType: Prescription Dosage,Prescription Dosage,Kipimo cha Dawa
 DocType: Attendance,HR Manager,Meneja wa HR
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Tafadhali chagua Kampuni
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Tafadhali chagua Kampuni
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Uondoaji wa Hifadhi
 DocType: Purchase Invoice,Supplier Invoice Date,Tarehe ya Invoice ya Wasambazaji
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,kwa kila
@@ -1508,10 +1537,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Hali ya uingiliano hupatikana kati ya:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Dhidi ya Kuingia kwa Vitambulisho {0} tayari imebadilishwa dhidi ya hati ya nyingine
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Thamani ya Udhibiti wa Jumla
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Chakula
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Chakula
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Kipindi cha kuzeeka 3
 DocType: Maintenance Schedule Item,No of Visits,Hakuna ya Ziara
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Ratiba ya Matengenezo {0} ipo dhidi ya {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Je! Unataka kuchapisha Vitu vyao kwenye Hub?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,Kujiandikisha mwanafunzi
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Fedha ya Akaunti ya kufunga lazima {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Sum ya pointi kwa malengo yote inapaswa kuwa 100. Ni {0}
@@ -1522,9 +1552,9 @@
 DocType: Authorization Rule,Average Discount,Average Discount
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Vya kutumia
-DocType: Purchase Invoice Item,Accounting,Uhasibu
+DocType: POS Profile,Accounting,Uhasibu
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Tafadhali chagua vikundi vya kipengee cha kupigwa
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Tafadhali chagua vikundi vya kipengee cha kupigwa
 DocType: Asset,Depreciation Schedules,Ratiba ya kushuka kwa thamani
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Kipindi cha maombi hawezi kuwa nje ya kipindi cha ugawaji wa kuondoka
 DocType: Activity Cost,Projects,Miradi
@@ -1540,7 +1570,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',Hali ya kibali lazima iwe &#39;Imeidhinishwa&#39; au &#39;Imekataliwa&#39;
 DocType: Physician,Contacts and Address,Mawasiliano na Anwani
 DocType: Purchase Invoice,Contact Person,Kuwasiliana na mtu
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&#39;Tarehe ya Mwanzo Inatarajiwa&#39; haiwezi kuwa kubwa zaidi kuliko &#39;Tarehe ya Mwisho Inatarajiwa&#39;
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&#39;Tarehe ya Mwanzo Inatarajiwa&#39; haiwezi kuwa kubwa zaidi kuliko &#39;Tarehe ya Mwisho Inatarajiwa&#39;
 DocType: Course Scheduling Tool,Course End Date,Tarehe ya Mwisho wa Kozi
 DocType: Holiday List,Holidays,Likizo
 DocType: Sales Order Item,Planned Quantity,Wingi wa Mpango
@@ -1548,10 +1578,11 @@
 DocType: Item,Maintain Stock,Weka Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Entries Entries tayari kuundwa kwa Uzalishaji Order
 DocType: Employee,Prefered Email,Barua pepe iliyopendekezwa
+DocType: Student Admission,Eligibility and Details,Uhalali na Maelezo
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Mabadiliko ya Net katika Mali isiyohamishika
 DocType: Leave Control Panel,Leave blank if considered for all designations,Acha tupu ikiwa inachukuliwa kwa sifa zote
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Malipo ya aina ya &#39;Kweli&#39; katika mstari {0} haiwezi kuingizwa katika Kiwango cha Bidhaa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Kutoka wakati wa Tarehe
 DocType: Email Digest,For Company,Kwa Kampuni
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Ingia ya mawasiliano.
@@ -1559,19 +1590,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Scorecard ya Wafanyabiashara Mboresho
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Kununua Kiasi
 DocType: Sales Invoice,Shipping Address Name,Jina la Jina la Mafikisho
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Chati ya Akaunti
 DocType: Material Request,Terms and Conditions Content,Masharti na Masharti Maudhui
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,haiwezi kuwa zaidi ya 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Kipengee {0} si kitu cha hisa
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Kipengee {0} si kitu cha hisa
 DocType: Maintenance Visit,Unscheduled,Haijahamishwa
 DocType: Employee,Owned,Imepewa
 DocType: Salary Detail,Depends on Leave Without Pay,Inategemea kuondoka bila kulipa
 DocType: Pricing Rule,"Higher the number, higher the priority","Nambari ya juu, juu ya kipaumbele"
 ,Purchase Invoice Trends,Ununuzi wa Misaada ya ankara
 DocType: Employee,Better Prospects,Matarajio Bora
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Row # {0}: Kikundi {1} kina {2} qty tu. Tafadhali chagua kundi lingine ambalo linapatikana {3} qty au kupasuliwa mstari katika safu nyingi, kutoa / kutolewa kutoka kwa makundi mengi"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Row # {0}: Kikundi {1} kina {2} qty tu. Tafadhali chagua kundi lingine ambalo linapatikana {3} qty au kupasuliwa mstari katika safu nyingi, kutoa / kutolewa kutoka kwa makundi mengi"
 DocType: Vehicle,License Plate,Bamba la leseni
 DocType: Appraisal,Goals,Malengo
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Chagua Profaili ya POS
 DocType: Warranty Claim,Warranty / AMC Status,Waranti / Hali ya AMC
 ,Accounts Browser,Kivinjari cha Hesabu
 DocType: Payment Entry Reference,Payment Entry Reference,Kumbukumbu ya Kuingia kwa Malipo
@@ -1589,7 +1620,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Mfanyakazi hawezi kujijulisha mwenyewe.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ikiwa akaunti imehifadhiwa, maingilio yanaruhusiwa watumiaji waliozuiwa."
 DocType: Email Digest,Bank Balance,Mizani ya Benki
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Kuingia kwa Uhasibu kwa {0}: {1} inaweza tu kufanywa kwa fedha: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Kuingia kwa Uhasibu kwa {0}: {1} inaweza tu kufanywa kwa fedha: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profaili ya kazi, sifa zinazohitajika nk."
 DocType: Journal Entry Account,Account Balance,Mizani ya Akaunti
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Sheria ya Ushuru kwa ajili ya shughuli.
@@ -1598,8 +1629,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Jumla ya Kodi na Malipo (Kampuni ya Fedha)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Onyesha mizani ya P &amp; L isiyopunguzwa mwaka wa fedha
 DocType: Lab Test Template,Collection Details,Maelezo ya Ukusanyaji
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","chagua cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date kutoka tabKutafuta ct, `tabLab Prescription` cp ambapo ct.patient = &#39;{0}&#39; na cp.parent = ct. jina na cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Alama ya Akaunti
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Akaunti {2} haitumiki
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Fanya Maagizo ya Mauzo kukusaidia kupanga mpango wako na kutoa muda
@@ -1616,7 +1645,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Ufungashaji wa Ufungashaji
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Kodi ya Ofisi
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Sanidi mipangilio ya uingizaji wa SMS
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Ingiza Imeshindwa!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Ingiza Imeshindwa!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Hakuna anwani iliyoongezwa bado.
 DocType: Workstation Working Hour,Workstation Working Hour,Kazi ya Kazi ya Kazini
 DocType: Vital Signs,Blood Pressure,Shinikizo la damu
@@ -1641,7 +1670,7 @@
 DocType: Sales Invoice,Source,Chanzo
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Onyesha imefungwa
 DocType: Leave Type,Is Leave Without Pay,Anatoka bila Kulipa
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Jamii ya Mali ni ya lazima kwa kipengee cha Mali isiyohamishika
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Jamii ya Mali ni ya lazima kwa kipengee cha Mali isiyohamishika
 DocType: Fee Validity,Fee Validity,Uhalali wa ada
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Hakuna kumbukumbu zilizopatikana kwenye meza ya Malipo
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Hii {0} inakabiliana na {1} kwa {2} {3}
@@ -1662,8 +1691,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Utafutaji wa Mtendaji
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Unda Mwongozo
 DocType: Maintenance Schedule,Schedules,Mipango
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,Profaili ya POS inahitajika kutumia Point-of-Sale
 DocType: Purchase Invoice Item,Net Amount,Kiasi cha Nambari
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} haijawasilishwa hivyo hatua haiwezi kukamilika
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} haijawasilishwa hivyo hatua haiwezi kukamilika
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Maelezo ya No
 DocType: Landed Cost Voucher,Additional Charges,Malipo ya ziada
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Kiasi cha Kutoa Kiasi (Kampuni ya Fedha)
@@ -1672,7 +1702,7 @@
 ,Support Hour Distribution,Usambazaji Saa Saa
 DocType: Maintenance Visit,Maintenance Visit,Kutembelea Utunzaji
 DocType: Student,Leaving Certificate Number,Kuondoka Nambari ya Cheti
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Uteuzi umefutwa, Tafadhali kagua na kufuta ankara {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Uteuzi umefutwa, Tafadhali kagua na kufuta ankara {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Inapatikana Chini ya Baki katika Ghala
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Sasisha Format ya Kuchapa
 DocType: Landed Cost Voucher,Landed Cost Help,Msaada wa Gharama za Utoaji
@@ -1695,7 +1725,7 @@
 DocType: Patient,Tobacco Past Use,Tabibu Matumizi ya zamani
 DocType: Sales Invoice Item,Brand Name,Jina la Brand
 DocType: Purchase Receipt,Transporter Details,Maelezo ya Transporter
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Ghala la msingi linahitajika kwa kipengee kilichochaguliwa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Ghala la msingi linahitajika kwa kipengee kilichochaguliwa
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Sanduku
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,Wafanyabiashara wawezekana
 DocType: Budget,Monthly Distribution,Usambazaji wa kila mwezi
@@ -1705,7 +1735,7 @@
 DocType: Sales Partner,Sales Partner Target,Lengo la Mshirika wa Mauzo
 DocType: Loan Type,Maximum Loan Amount,Kiwango cha Mikopo Kikubwa
 DocType: Pricing Rule,Pricing Rule,Kanuni ya bei
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Duplicate roll idadi kwa mwanafunzi {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Duplicate roll idadi kwa mwanafunzi {0}
 DocType: Budget,Action if Annual Budget Exceeded,Hatua kama Bajeti ya Mwaka imeendelea
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Nambari ya Nyenzo ya Ununuzi wa Utaratibu
 DocType: Shopping Cart Settings,Payment Success URL,URL ya Mafanikio ya Malipo
@@ -1722,7 +1752,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} lazima ionekane mara moja tu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Hairuhusiwi kufungua zaidi {0} kuliko {1} dhidi ya Ununuzi wa Order {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Majani yaliyopangwa kwa Mafanikio kwa {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Hakuna Vipande vya kuingiza
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Hakuna Vipande vya kuingiza
 DocType: Shipping Rule Condition,From Value,Kutoka kwa Thamani
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Uzalishaji wa Wingi ni lazima
 DocType: Employee Loan,Repayment Method,Njia ya kulipa
@@ -1736,6 +1766,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Mkopo wa Mkopo
 DocType: Purchase Invoice,Supplier Warehouse,Ghala la Wafanyabiashara
 DocType: Opportunity,Contact Mobile No,Wasiliana No Simu ya Simu
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Chagua Kampuni
 ,Material Requests for which Supplier Quotations are not created,Maombi ya nyenzo ambayo Nukuu za Wasambazaji haziumbwa
 DocType: Student Group,Set 0 for no limit,Weka 0 bila kikomo
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Siku (s) ambayo unaomba kwa ajili ya kuondoka ni likizo. Hauhitaji kuomba kuondoka.
@@ -1745,24 +1776,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Fanya Nukuu
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Taarifa nyingine
 DocType: Dependent Task,Dependent Task,Kazi ya Kudumu
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Sababu ya ubadilishaji kwa chaguo-msingi Kipimo cha Kupima lazima iwe 1 kwenye mstari {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Sababu ya ubadilishaji kwa chaguo-msingi Kipimo cha Kupima lazima iwe 1 kwenye mstari {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Kuondoka kwa aina {0} haiwezi kuwa zaidi kuliko {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Jaribu kupanga shughuli kwa siku X kabla.
 DocType: HR Settings,Stop Birthday Reminders,Weka Vikumbusho vya Kuzaliwa
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Tafadhali weka Akaunti ya Kulipa ya Payroll ya Kipawa katika Kampuni {0}
 DocType: SMS Center,Receiver List,Orodha ya Kupokea
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Tafuta kitu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Tafuta kitu
 DocType: Patient Appointment,Referring Physician,Akizungumzia Mganga
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Kiwango kilichotumiwa
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Mabadiliko ya Net katika Fedha
 DocType: Assessment Plan,Grading Scale,Kuweka Scale
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Kipimo cha Upimaji {0} kiliingizwa zaidi ya mara moja kwenye Jedwali la Kubadilisha Ubadilishaji
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,Tayari imekamilika
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Kipimo cha Upimaji {0} kiliingizwa zaidi ya mara moja kwenye Jedwali la Kubadilisha Ubadilishaji
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,Tayari imekamilika
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock In Hand
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Ombi la Malipo tayari lipo {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Gharama ya Vitu Vipitishwa
 DocType: Physician,Hospital,Hospitali
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Wingi haipaswi kuwa zaidi ya {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Wingi haipaswi kuwa zaidi ya {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Mwaka wa Fedha uliopita haujafungwa
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Umri (Siku)
 DocType: Quotation Item,Quotation Item,Nukuu ya Nukuu
@@ -1773,8 +1804,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Aina ya Wafanyabiashara.
 DocType: Purchase Order Item,Supplier Part Number,Nambari ya Sehemu ya Wasambazaji
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Kiwango cha uongofu hawezi kuwa 0 au 1
-DocType: Sales Invoice,Reference Document,Hati ya Kumbukumbu
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} imefutwa au imesimamishwa
+DocType: Subscription,Reference Document,Hati ya Kumbukumbu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} imefutwa au imesimamishwa
 DocType: Accounts Settings,Credit Controller,Mdhibiti wa Mikopo
 DocType: Delivery Note,Vehicle Dispatch Date,Tarehe ya Kuondoa Gari
 DocType: Healthcare Settings,Default Medical Code Standard,Kiwango cha Kiwango cha Matibabu cha Kudumu
@@ -1783,6 +1814,7 @@
 DocType: Company,Default Payable Account,Akaunti ya malipo yenye malipo
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Mipangilio ya gari la ununuzi mtandaoni kama sheria za meli, orodha ya bei nk."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Imelipwa
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Panga kwa Bei ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Nambari iliyohifadhiwa
 DocType: Party Account,Party Account,Akaunti ya Chama
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Rasilimali
@@ -1794,13 +1826,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Fanya Uingiaji wa Malipo
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Kabla ya Mtoaji lazima awe deni
 DocType: Company,Default Values,Maadili ya Maadili
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{mzunguko} Piga
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{mzunguko} Piga
 DocType: Expense Claim,Total Amount Reimbursed,Jumla ya Kizuizi
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Hii inategemea magogo dhidi ya Gari hii. Tazama kalenda ya chini kwa maelezo zaidi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Dhidi ya Invoice ya Wasambazaji {0} dated {1}
 DocType: Customer,Default Price List,Orodha ya Bei ya Hitilafu
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Rekodi ya Movement ya Malipo {0} imeundwa
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Huwezi kufuta Mwaka wa Fedha {0}. Mwaka wa Fedha {0} umewekwa kama default katika Mipangilio ya Global
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Mteja mwenye jina sawa tayari yupo
 DocType: Journal Entry,Entry Type,Aina ya Kuingia
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Hakuna mpango wa tathmini unaohusishwa na kikundi hiki cha tathmini
 ,Customer Credit Balance,Mizani ya Mikopo ya Wateja
@@ -1810,7 +1843,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Bei
 DocType: Quotation,Term Details,Maelezo ya muda
 DocType: Project,Total Sales Cost (via Sales Order),Jumla ya Gharama za Mauzo (kupitia Mauzo ya Mauzo)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Haiwezi kujiandikisha zaidi ya {0} wanafunzi kwa kikundi hiki cha wanafunzi.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Haiwezi kujiandikisha zaidi ya {0} wanafunzi kwa kikundi hiki cha wanafunzi.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Hesabu ya Kiongozi
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} lazima iwe kubwa kuliko 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Mipango ya Uwezo Kwa (Siku)
@@ -1826,9 +1859,11 @@
 DocType: Lab Test,Technician Name,Jina la mafundi
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Unlink Malipo ya Kuondoa Invoice
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Orodha ya Odometer ya sasa imewekwa inapaswa kuwa kubwa kuliko Odometer ya awali ya Gari {0}
+DocType: Restaurant Reservation,No Show,Hakuna Onyesha
 DocType: Shipping Rule Country,Shipping Rule Country,Nchi ya Maagizo ya Utoaji
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Acha na Uhudhuriaji
 DocType: Maintenance Visit,Partially Completed,Ilikamilishwa kikamilifu
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Sensitivity ya wastani
 DocType: Leave Type,Include holidays within leaves as leaves,Jumuisha likizo ndani ya majani kama majani
 DocType: Sales Invoice,Packed Items,Vipuri vilivyowekwa
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Madai ya Udhamini dhidi ya Namba ya Serial.
@@ -1843,13 +1878,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Kiasi kilicholipwa (Fedha la Kampuni)
 DocType: Purchase Invoice,Additional Discount,Punguzo la ziada
 DocType: Selling Settings,Selling Settings,Kuuza Mipangilio
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Thibitisha Hatua
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Madaada ya mtandaoni
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Tafadhali taja ama Wingi au Valuation Rate au wote wawili
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Utekelezaji
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Angalia katika Kifaa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Malipo ya Masoko
 ,Item Shortage Report,Ripoti ya uhaba wa habari
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Uzito umetajwa, \ nSafadhali kutaja &quot;Uzito UOM&quot; pia"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Uzito umetajwa, \ nSafadhali kutaja &quot;Uzito UOM&quot; pia"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Ombi la Nyenzo lilitumiwa kufanya Usajili huu wa hisa
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Tarehe ya Uzito ya pili inahitajika kwa mali mpya
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Toka Kundi la kozi la Kundi kwa kila Batch
@@ -1861,12 +1897,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Fanya Uingizaji wa Uhasibu Kwa Kila Uhamisho wa Stock
 DocType: Leave Allocation,Total Leaves Allocated,Majani ya Jumla Yamewekwa
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Ghala inayohitajika kwenye Row No {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Tafadhali ingiza Msaada wa Mwaka wa Fedha na Mwisho wa Tarehe
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Tafadhali ingiza Msaada wa Mwaka wa Fedha na Mwisho wa Tarehe
 DocType: Employee,Date Of Retirement,Tarehe ya Kustaafu
 DocType: Upload Attendance,Get Template,Pata Kigezo
 DocType: Material Request,Transferred,Imehamishwa
 DocType: Vehicle,Doors,Milango
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext Setup Kamili!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext Setup Kamili!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Kukusanya ada kwa Usajili wa Mgonjwa
 DocType: Course Assessment Criteria,Weightage,Uzito
 DocType: Purchase Invoice,Tax Breakup,Kuvunja kodi
@@ -1885,36 +1921,36 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ikiwa bidhaa hii ina tofauti, basi haiwezi kuchaguliwa katika amri za mauzo nk."
 DocType: Lead,Next Contact By,Kuwasiliana Nafuatayo
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Kiasi kinachohitajika kwa Item {0} mfululizo {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Kiasi kinachohitajika kwa Item {0} mfululizo {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Ghala {0} haiwezi kufutwa kama kiasi kilichopo kwa Bidhaa {1}
 DocType: Quotation,Order Type,Aina ya Utaratibu
-DocType: Purchase Invoice,Notification Email Address,Anwani ya barua pepe ya arifa
 ,Item-wise Sales Register,Daftari ya Mauzo ya hekima
 DocType: Asset,Gross Purchase Amount,Jumla ya Ununuzi wa Pato
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Mizani ya Ufunguzi
 DocType: Asset,Depreciation Method,Njia ya kushuka kwa thamani
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Hifadhi ya mbali
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Hifadhi ya mbali
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,"Je, kodi hii imejumuishwa katika Msingi Msingi?"
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Jumla ya Target
 DocType: Job Applicant,Applicant for a Job,Mwombaji wa Kazi
 DocType: Production Plan Material Request,Production Plan Material Request,Mpango wa Ushauri wa Nyenzo ya Uzalishaji
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Hakuna Amri za Uzalishaji zilizoundwa
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Hakuna Amri za Uzalishaji zilizoundwa
 DocType: Stock Reconciliation,Reconciliation JSON,Upatanisho JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Safu nyingi za safu. Tuma taarifa na uchapishe kwa kutumia programu ya lahajedwali.
 DocType: Purchase Invoice Item,Batch No,Bundi No
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Ombi la Nukuu: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Ruhusu Amri nyingi za Mauzo dhidi ya Utaratibu wa Ununuzi wa Wateja
 DocType: Student Group Instructor,Student Group Instructor,Mwalimu wa Kikundi cha Wanafunzi
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Simu ya Mkono Hakuna
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Kuu
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Kuu
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Tofauti
 DocType: Naming Series,Set prefix for numbering series on your transactions,Weka kiambishi kwa mfululizo wa nambari kwenye shughuli zako
 DocType: Employee Attendance Tool,Employees HTML,Waajiri HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,BOM ya chaguo-msingi ({0}) lazima iwe kazi kwa kipengee hiki au template yake
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,BOM ya chaguo-msingi ({0}) lazima iwe kazi kwa kipengee hiki au template yake
 DocType: Employee,Leave Encashed?,Je! Uacha Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Fursa kutoka shamba ni lazima
 DocType: Email Digest,Annual Expenses,Gharama za kila mwaka
 DocType: Item,Variants,Tofauti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Fanya Order ya Ununuzi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Fanya Order ya Ununuzi
 DocType: SMS Center,Send To,Tuma kwa
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Hakuna usawa wa kutosha wa kuondoka kwa Aina ya Kuondoka {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Ilipunguzwa kiasi
@@ -1929,6 +1965,7 @@
 DocType: Item,Serial Nos and Batches,Serial Nos na Batches
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Nguvu ya Kikundi cha Wanafunzi
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Tathmini
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Mazoezi ya Mafunzo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Duplicate Serial Hakuna aliingia kwa Item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Hali ya Utawala wa Usafirishaji
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Tafadhali ingiza
@@ -1938,7 +1975,7 @@
 DocType: Sales Order,To Deliver and Bill,Kutoa na Bill
 DocType: Student Group,Instructors,Wafundishaji
 DocType: GL Entry,Credit Amount in Account Currency,Mikopo Kiasi katika Fedha ya Akaunti
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} lazima iwasilishwa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} lazima iwasilishwa
 DocType: Authorization Control,Authorization Control,Kudhibiti Udhibiti
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Ghala iliyokataliwa ni lazima dhidi ya Kitu kilichokataliwa {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Malipo
@@ -1956,11 +1993,11 @@
 DocType: Quotation Item,Actual Qty,Uhakika halisi
 DocType: Sales Invoice Item,References,Marejeleo
 DocType: Quality Inspection Reading,Reading 10,Kusoma 10
-DocType: Hub Settings,Hub Node,Node ya Hub
+DocType: Hub Category,Hub Node,Node ya Hub
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Umeingiza vitu vya duplicate. Tafadhali tengeneza na jaribu tena.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Washirika
 DocType: Asset Movement,Asset Movement,Mwendo wa Mali
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,New Cart
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,New Cart
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Kipengee {0} si Kipengee cha sina
 DocType: SMS Center,Create Receiver List,Unda Orodha ya Kupokea
 DocType: Vehicle,Wheels,Magurudumu
@@ -1974,15 +2011,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Mawasiliano ya simu
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Inaonyesha kwamba mfuko ni sehemu ya utoaji huu (Tu Rasimu)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Fanya Uingiaji wa Malipo
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Wingi wa Bidhaa {0} lazima iwe chini ya {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Wingi wa Bidhaa {0} lazima iwe chini ya {1}
 ,Sales Invoice Trends,Mwelekeo wa Mauzo ya Invoice
 DocType: Leave Application,Apply / Approve Leaves,Tumia / Thibitisha Majani
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Kwa
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Kwa
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Inaweza kutaja safu tu ikiwa aina ya malipo ni &#39;Juu ya Uliopita Mshahara Kiasi&#39; au &#39;Uliopita Row Jumla&#39;
 DocType: Sales Order Item,Delivery Warehouse,Ghala la Utoaji
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Mti wa vituo vya gharama za kifedha.
 DocType: Serial No,Delivery Document No,Nambari ya Hati ya Utoaji
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Tafadhali weka &#39;Akaunti ya Kupoteza / Kupoteza kwa Upunguzaji wa Mali&#39; katika Kampuni {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Tafadhali weka &#39;Akaunti ya Kupoteza / Kupoteza kwa Upunguzaji wa Mali&#39; katika Kampuni {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Pata Vitu Kutoka Mapato ya Ununuzi
 DocType: Serial No,Creation Date,Tarehe ya Uumbaji
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Kipengee {0} kinaonekana mara nyingi katika orodha ya bei {1}
@@ -1993,11 +2030,12 @@
 DocType: Student,Student Mobile Number,Namba ya Simu ya Wanafunzi
 DocType: Item,Has Variants,Ina tofauti
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Sasisha jibu
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Tayari umechagua vitu kutoka {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Tayari umechagua vitu kutoka {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Jina la Usambazaji wa Kila mwezi
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Kitambulisho cha Batch ni lazima
 DocType: Sales Person,Parent Sales Person,Mtu wa Mauzo ya Mzazi
-DocType: Purchase Invoice,Recurring Invoice,Invoice ya mara kwa mara
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Hadi ya chini
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Chagua programu kwanza
 DocType: Patient Appointment,Patient Age,Umri mgonjwa
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Miradi ya Kusimamia
 DocType: Supplier,Supplier of Goods or Services.,Uuzaji wa Bidhaa au Huduma.
@@ -2005,8 +2043,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Akaunti zilizopatikana zinazotumiwa kutumiwa ikiwa haziwekwa katika Mgonjwa ili uweke gharama za ushauri.
 DocType: Vehicle Log,Fuel Price,Bei ya Mafuta
 DocType: Budget,Budget,Bajeti
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Weka wazi
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Vifaa vya Mali isiyohamishika lazima iwe kipengee cha hisa.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Weka wazi
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Vifaa vya Mali isiyohamishika lazima iwe kipengee cha hisa.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Bajeti haipatikani dhidi ya {0}, kama sio akaunti ya Mapato au ya gharama"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Imetimizwa
 DocType: Student Admission,Application Form Route,Njia ya Fomu ya Maombi
@@ -2020,12 +2058,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Kipengee {0} si kuanzisha kwa Serial Nos. Angalia kipengee cha kitu
 DocType: Maintenance Visit,Maintenance Time,Muda wa Matengenezo
 ,Amount to Deliver,Kiasi cha Kutoa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Kitu kimoja kimeingizwa mara nyingi. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Tarehe ya Kuanza ya Mwisho haiwezi kuwa mapema zaidi kuliko Tarehe ya Mwanzo wa Mwaka wa Mwaka wa Chuo ambao neno hilo linaunganishwa (Mwaka wa Chuo {}). Tafadhali tengeneza tarehe na jaribu tena.
 DocType: Guardian,Guardian Interests,Maslahi ya Guardian
 DocType: Naming Series,Current Value,Thamani ya sasa
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Miaka kadhaa ya fedha ikopo kwa tarehe {0}. Tafadhali weka kampuni katika Mwaka wa Fedha
 DocType: School Settings,Instructor Records to be created by,Kumbukumbu ya Mwalimu ili kuundwa na
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} imeundwa
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} imeundwa
 DocType: Delivery Note Item,Against Sales Order,Dhidi ya Mauzo ya Utaratibu
 ,Serial No Status,Serial Hakuna Hali
 DocType: Payment Entry Reference,Outstanding,Bora
@@ -2035,10 +2074,10 @@
 						must be greater than or equal to {2}","Row {0}: Kuweka {1} mara kwa mara, tofauti kati ya na hadi sasa \ lazima iwe kubwa kuliko au sawa na {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Hii inategemea harakati za hisa. Angalia {0} kwa maelezo
 DocType: Pricing Rule,Selling,Kuuza
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Kiasi {0} {1} kilichopunguzwa dhidi ya {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Kiasi {0} {1} kilichopunguzwa dhidi ya {2}
 DocType: Employee,Salary Information,Maelezo ya Mshahara
 DocType: Sales Person,Name and Employee ID,Jina na ID ya Waajiriwa
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Tarehe ya Kutokana haiwezi kuwa kabla ya Tarehe ya Kuweka
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Tarehe ya Kutokana haiwezi kuwa kabla ya Tarehe ya Kuweka
 DocType: Website Item Group,Website Item Group,Website Item Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Kazi na Kodi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Tafadhali ingiza tarehe ya Marejeo
@@ -2063,7 +2102,7 @@
 DocType: Issue,Resolution Details,Maelezo ya Azimio
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Ugawaji
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Vigezo vya Kukubali
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Tafadhali ingiza Maombi ya Nyenzo katika meza iliyo hapo juu
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Tafadhali ingiza Maombi ya Nyenzo katika meza iliyo hapo juu
 DocType: Item Attribute,Attribute Name,Jina la sifa
 DocType: BOM,Show In Website,Onyesha kwenye tovuti
 DocType: Shopping Cart Settings,Show Quantity in Website,Onyesha Wingi kwenye Tovuti
@@ -2072,7 +2111,7 @@
 DocType: Item Reorder,Check in (group),Angalia (kikundi)
 ,Qty to Order,Uchina kwa Amri
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Kichwa cha akaunti chini ya Uwezo au Equity, ambapo Faida / Uvunjaji utawekwa"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Gantt chati ya kazi zote.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Gantt chati ya kazi zote.
 DocType: Opportunity,Mins to First Response,Mafanikio ya Kwanza ya Jibu
 DocType: Pricing Rule,Margin Type,Aina ya Margin
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} masaa
@@ -2093,35 +2132,35 @@
 DocType: Patient,Surgical History,Historia ya upasuaji
 DocType: Employee,Resignation Letter Date,Barua ya Kuondoa Tarehe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Kanuni za bei ni zilizochujwa zaidi kulingana na wingi.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Tafadhali weka tarehe ya kujiunga na mfanyakazi {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Tafadhali weka tarehe ya kujiunga na mfanyakazi {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Kiasi cha kulipa jumla (kupitia Karatasi ya Muda)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Rudia Mapato ya Wateja
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) lazima awe na jukumu la &quot;Msaidizi wa gharama&quot;
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Jozi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Chagua BOM na Uchina kwa Uzalishaji
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Chagua BOM na Uchina kwa Uzalishaji
 DocType: Asset,Depreciation Schedule,Ratiba ya kushuka kwa thamani
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Mauzo ya Mazungumzo ya Washiriki na Mawasiliano
 DocType: Bank Reconciliation Detail,Against Account,Dhidi ya Akaunti
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Tarehe ya Siku ya Nusu inapaswa kuwa kati ya Tarehe na Tarehe
 DocType: Maintenance Schedule Detail,Actual Date,Tarehe halisi
 DocType: Item,Has Batch No,Ina Bande No
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Ulipaji wa Mwaka: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Ulipaji wa Mwaka: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Malipo na Huduma za Kodi (GST India)
 DocType: Delivery Note,Excise Page Number,Nambari ya Ukurasa wa Ushuru
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Kampuni, Tarehe na Tarehe ni lazima"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Pata kutoka kwenye Ushauri
 DocType: Asset,Purchase Date,Tarehe ya Ununuzi
 DocType: Employee,Personal Details,Maelezo ya kibinafsi
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Tafadhali weka &#39;kituo cha gharama ya kushuka kwa thamani ya mali&#39; katika Kampuni {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Tafadhali weka &#39;kituo cha gharama ya kushuka kwa thamani ya mali&#39; katika Kampuni {0}
 ,Maintenance Schedules,Mipango ya Matengenezo
 DocType: Task,Actual End Date (via Time Sheet),Tarehe ya mwisho ya mwisho (kupitia Karatasi ya Muda)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Kiasi {0} {1} dhidi ya {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Kiasi {0} {1} dhidi ya {2} {3}
 ,Quotation Trends,Mwelekeo wa Nukuu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Kikundi cha kipengee ambacho hakijajwa katika kipengee cha bidhaa kwa kipengee {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Debit Kwa akaunti lazima iwe akaunti inayoidhinishwa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Debit Kwa akaunti lazima iwe akaunti inayoidhinishwa
 DocType: Shipping Rule Condition,Shipping Amount,Kiasi cha usafirishaji
 DocType: Supplier Scorecard Period,Period Score,Kipindi cha Kipindi
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Ongeza Wateja
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Ongeza Wateja
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Kiasi kinachosubiri
 DocType: Lab Test Template,Special,Maalum
 DocType: Purchase Invoice Item,Conversion Factor,Fact Conversion
@@ -2129,13 +2168,14 @@
 ,Vehicle Expenses,Gharama za Gari
 DocType: Serial No,Invoice Details,Maelezo ya ankara
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Thamani inayotarajiwa baada ya maisha muhimu lazima iwe kubwa kuliko au sawa na {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Anza
+DocType: Hub Category,Hub Category,Jamii ya Hub
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Nambari ya Gari
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,Tarehe ambayo ankara ya mara kwa mara itaacha
 DocType: Employee Loan,Loan Amount,Kiasi cha Mikopo
 DocType: Program Enrollment,Self-Driving Vehicle,Gari ya kujitegemea
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Washirika wa Scorecard Wamesimama
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Row {0}: Sheria ya Vifaa haipatikani kwa Bidhaa {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Row {0}: Sheria ya Vifaa haipatikani kwa Bidhaa {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Majani yaliyotengwa {0} hayawezi kuwa chini ya majani yaliyoidhinishwa tayari {1} kwa muda
 DocType: Journal Entry,Accounts Receivable,Akaunti inapatikana
 ,Supplier-Wise Sales Analytics,Wafanyabiashara-Wiseja Mauzo Analytics
@@ -2146,7 +2186,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Kozi ya Mzazi (Acha tupu, kama hii si sehemu ya Kozi ya Mzazi)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Acha tupu ikiwa inachukuliwa kwa aina zote za mfanyakazi
 DocType: Landed Cost Voucher,Distribute Charges Based On,Shirikisha mishahara ya msingi
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,Mipangilio ya HR
 DocType: Salary Slip,net pay info,maelezo ya kulipa wavu
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Thamani hii inasasishwa katika Orodha ya Bei ya Mauzo ya Default.
@@ -2157,7 +2197,7 @@
 DocType: Patient,B Positive,B Chanya
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Uchina lazima uwe 1, kama kipengee ni mali iliyobaki. Tafadhali tumia mstari wa tofauti kwa qty nyingi."
 DocType: Leave Block List Allow,Leave Block List Allow,Acha orodha ya kuzuia Kuruhusu
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr haiwezi kuwa tupu au nafasi
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr haiwezi kuwa tupu au nafasi
 DocType: Patient Medical Record,Patient Medical Record,Kumbukumbu ya Matibabu Mgonjwa
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Gundi kwa Wasio Kikundi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Michezo
@@ -2173,9 +2213,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Haiwezi kupata kiwango cha ubadilishaji kwa {0} kwa {1} kwa tarehe muhimu {2}. Tafadhali tengeneza rekodi ya Fedha ya Fedha kwa mkono
 DocType: POS Profile,Price List,Orodha ya bei
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} sasa ni Mwaka wa Fedha wa kawaida. Tafadhali rasha upya kivinjari chako ili mabadiliko yaweke.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Madai ya gharama
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Madai ya gharama
 DocType: Issue,Support,Msaada
 ,BOM Search,Utafutaji wa BOM
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Chapisha &quot;Katika Hifadhi&quot; au &quot;Sio katika Hifadhi&quot; kwenye Hifadhi kulingana na hisa zilizopo katika ghala hii.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Kufunga (Kufungua + Totals)
 DocType: Vehicle,Fuel Type,Aina ya mafuta
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Tafadhali taja fedha katika Kampuni
@@ -2187,16 +2228,16 @@
 DocType: Healthcare Settings,Remind Before,Kumkumbusha Kabla
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Kipengele cha kubadilisha UOM kinahitajika katika mstari {0}
 DocType: Production Plan Item,material_request_item,vifaa_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Aina ya Kumbukumbu ya Kumbukumbu lazima iwe moja ya Uagizaji wa Mauzo, Invoice ya Mauzo au Ingiza Jarida"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Aina ya Kumbukumbu ya Kumbukumbu lazima iwe moja ya Uagizaji wa Mauzo, Invoice ya Mauzo au Ingiza Jarida"
 DocType: Salary Component,Deduction,Utoaji
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Row {0}: Kutoka wakati na muda ni lazima.
 DocType: Stock Reconciliation Item,Amount Difference,Tofauti tofauti
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Item Bei imeongezwa kwa {0} katika Orodha ya Bei {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Item Bei imeongezwa kwa {0} katika Orodha ya Bei {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Tafadhali ingiza Id Idhini ya mtu huyu wa mauzo
 DocType: Territory,Classification of Customers by region,Uainishaji wa Wateja kwa kanda
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Tofauti Kiasi lazima iwe sifuri
 DocType: Project,Gross Margin,Margin ya Pato
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Tafadhali ingiza Bidhaa ya Uzalishaji kwanza
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Tafadhali ingiza Bidhaa ya Uzalishaji kwanza
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Usawa wa Taarifa ya Benki
 DocType: Normal Test Template,Normal Test Template,Kigezo cha Mtihani wa kawaida
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,mtumiaji mlemavu
@@ -2206,21 +2247,22 @@
 DocType: Salary Slip,Total Deduction,Utoaji Jumla
 ,Production Analytics,Uchambuzi wa Uzalishaji
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Hii inategemea shughuli za Mgonjwa. Tazama kalenda ya chini kwa maelezo zaidi
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Gharama ya Kusasishwa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Gharama ya Kusasishwa
 DocType: Employee,Date of Birth,Tarehe ya kuzaliwa
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Kipengee {0} kimerejea
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Mwaka wa Fedha ** inawakilisha Mwaka wa Fedha. Entries zote za uhasibu na shughuli nyingine kubwa zinapatikana dhidi ya ** Mwaka wa Fedha **.
 DocType: Opportunity,Customer / Lead Address,Anwani ya Wateja / Kiongozi
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Kuweka Scorecard Setup
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Onyo: Cheti cha SSL batili kwenye kiambatisho {0}
-DocType: Student Admission,Eligibility,Uhalali
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Jina la Mpango wa Tathmini
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Onyo: Cheti cha SSL batili kwenye kiambatisho {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Inaongoza kukusaidia kupata biashara, ongeza anwani zako zote na zaidi kama inaongoza yako"
 DocType: Production Order Operation,Actual Operation Time,Saa halisi ya Uendeshaji
 DocType: Authorization Rule,Applicable To (User),Inafaa kwa (Mtumiaji)
 DocType: Purchase Taxes and Charges,Deduct,Deduct
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Maelezo ya Kazi
 DocType: Student Applicant,Applied,Imewekwa
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Fungua tena
 DocType: Sales Invoice Item,Qty as per Stock UOM,Uchina kama kwa hisa ya UOM
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Jina la Guardian2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Tabia maalum isipokuwa &quot;-&quot;, &quot;#&quot;, &quot;.&quot; na &quot;/&quot; haruhusiwi katika kutaja mfululizo"
@@ -2232,7 +2274,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Meneja wa Uzalishaji
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial Hapana {0} ni chini ya udhamini upto {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Kugawanya Kumbuka utoaji katika vifurushi.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Upelekaji
+apps/erpnext/erpnext/hooks.py +107,Shipments,Upelekaji
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Kiasi kilichopangwa (Kampuni ya Fedha)
 DocType: Purchase Order Item,To be delivered to customer,Ili kupelekwa kwa wateja
 DocType: BOM,Scrap Material Cost,Gharama za Nyenzo za Nyenzo
@@ -2254,8 +2296,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Mipangilio ya Mchapishaji ya Bidhaa
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Chagua Kampuni ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Acha tupu ikiwa inachukuliwa kwa idara zote
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Aina ya ajira (kudumu, mkataba, intern nk)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} ni lazima kwa Bidhaa {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Aina ya ajira (kudumu, mkataba, intern nk)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} ni lazima kwa Bidhaa {1}
 DocType: Process Payroll,Fortnightly,Usiku wa jioni
 DocType: Currency Exchange,From Currency,Kutoka kwa Fedha
 DocType: Vital Signs,Weight (In Kilogram),Uzito (Kilogramu)
@@ -2279,7 +2321,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Tafadhali bonyeza &#39;Generate Schedule&#39; ili kupata ratiba
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Kulikuwa na makosa wakati wa kufuta ratiba zifuatazo:
 DocType: Bin,Ordered Quantity,Amri ya Amri
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",km &quot;Kujenga zana kwa wajenzi&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",km &quot;Kujenga zana kwa wajenzi&quot;
 DocType: Grading Scale,Grading Scale Intervals,Kuweka vipindi vya Scale
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Kuingia kwa Akaunti ya {2} inaweza tu kufanywa kwa fedha: {3}
 DocType: Production Order,In Process,Katika Mchakato
@@ -2302,11 +2344,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Kwa Malipo ya Kodi
 DocType: Expense Claim Detail,Expense Claim Detail,Tumia maelezo ya dai
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,FINDA KWA MFASHAJI
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Tafadhali chagua akaunti sahihi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Tafadhali chagua akaunti sahihi
 DocType: Item,Weight UOM,Uzito UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Mshirika wa Mshahara
 DocType: Patient,Blood Group,Kikundi cha Damu
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Inasubiri
 DocType: Course,Course Name,Jina la kozi
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Watumiaji ambao wanaweza kupitisha maombi ya kuondoka kwa mfanyakazi maalum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Vifaa vya ofisi
@@ -2325,7 +2366,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Bei haitaonyeshwa kama Orodha ya Bei haijawekwa
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Tafadhali taja nchi kwa Utawala huu wa Usafirishaji au angalia Usafirishaji duniani kote
 DocType: Stock Entry,Total Incoming Value,Thamani ya Ingizo Yote
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Debit To inahitajika
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Debit To inahitajika
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets kusaidia kuweka wimbo wa muda, gharama na bili kwa activites kufanyika kwa timu yako"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Orodha ya Bei ya Ununuzi
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Matukio ya vigezo vya scorecard za wasambazaji.
@@ -2335,7 +2376,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Upatanisho wa Malipo
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Tafadhali chagua jina la Incharge Person
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknolojia
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Jumla isiyolipwa: {0}
+DocType: Hub Settings,Unregister from Hub,Ungiajili kutoka Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Jumla isiyolipwa: {0}
 DocType: BOM Website Operation,BOM Website Operation,Huduma ya tovuti ya BOM
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Barua ya Kutoa
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Tengeneza Maombi ya Nyenzo (MRP) na Maagizo ya Uzalishaji.
@@ -2347,7 +2389,9 @@
 DocType: Physician Schedule Time Slot,To Time,Kwa Muda
 DocType: Authorization Rule,Approving Role (above authorized value),Idhini ya Kupitisha (juu ya thamani iliyoidhinishwa)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Mikopo Kwa akaunti lazima iwe akaunti ya kulipwa
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},Upungufu wa BOM: {0} hawezi kuwa mzazi au mtoto wa {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Tafadhali chagua Uingizaji wa Mwanafunzi ambao ni lazima kwa mwombaji aliyepwa msamaha
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},Upungufu wa BOM: {0} hawezi kuwa mzazi au mtoto wa {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Tafadhali chagua Orodha ya Bei ili kuchapisha bei
 DocType: Production Order Operation,Completed Qty,Uliokamilika Uchina
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Kwa {0}, akaunti za debit tu zinaweza kuunganishwa dhidi ya kuingizwa kwa mkopo mwingine"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Orodha ya Bei {0} imezimwa
@@ -2359,38 +2403,39 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Serial Hesabu inahitajika kwa Bidhaa {1}. Umetoa {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Kiwango cha Thamani ya sasa
 DocType: Item,Customer Item Codes,Nambari za Bidhaa za Wateja
+DocType: Training Event,Advance,Mapema
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,kwa kufanya mara kwa mara tena.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Kubadilisha / Kupoteza
 DocType: Opportunity,Lost Reason,Sababu iliyopotea
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Anwani mpya
 DocType: Quality Inspection,Sample Size,Ukubwa wa Mfano
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Tafadhali ingiza Hati ya Receipt
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Vitu vyote tayari vinatumiwa
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Tafadhali onyesha halali &#39;Kutoka Halali Nambari&#39;
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',Tafadhali onyesha halali &#39;Kutoka Halali Nambari&#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Vituo vya gharama zaidi vinaweza kufanywa chini ya Vikundi lakini viingilio vinaweza kufanywa dhidi ya wasio Vikundi
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Watumiaji na Ruhusa
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Maagizo ya Uzalishaji Iliyoundwa: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Maagizo ya Uzalishaji Iliyoundwa: {0}
 DocType: Branch,Branch,Tawi
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Uchapishaji na Kubandika
 DocType: Company,Total Monthly Sales,Jumla ya Mauzo ya Mwezi
 DocType: Bin,Actual Quantity,Kiasi halisi
 DocType: Shipping Rule,example: Next Day Shipping,mfano: Utoaji wa siku inayofuata
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial Hapana {0} haipatikani
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Usajili umekuwa {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Usajili umekuwa {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Mpango wa ratiba ya ada
 DocType: Fee Schedule Program,Student Batch,Kundi la Wanafunzi
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,chagua * kutoka kwa `vidokezo vya Vital` ambapo wapi mgonjwa = &#39;{0}&#39; amri kwa ishara_data ya kikomo cha 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Fanya Mwanafunzi
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Daraja la Kidogo
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Umealikwa kushirikiana kwenye mradi: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Daktari haipatikani kwenye {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Umealikwa kushirikiana kwenye mradi: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Daktari haipatikani kwenye {0}
 DocType: Leave Block List Date,Block Date,Weka Tarehe
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Ongeza Idhini ya Usajili wa desturi katika mafundisho {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Kumbuka Utoaji wa Wasambazaji
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Tumia Sasa
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Tumia Sasa
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Uhakika halisi {0} / Kiwango cha kusubiri {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-commerce GSTIN
 DocType: Sales Order,Not Delivered,Haikutolewa
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Tarehe inayotarajiwa haiwezi kuwa kabla ya Tarehe ya Transaction
 ,Bank Clearance Summary,Muhtasari wa Muhtasari wa Benki
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Unda na udhibiti majaribio ya barua pepe kila siku, kila wiki na kila mwezi."
 DocType: Appraisal Goal,Appraisal Goal,Lengo la Kutathmini
@@ -2398,12 +2443,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Majengo
 DocType: Fee Schedule,Fee Structure,Mfumo wa Mali
 DocType: Timesheet Detail,Costing Amount,Kiwango cha gharama
-DocType: Student Admission,Application Fee,Malipo ya Maombi
+DocType: Student Admission Program,Application Fee,Malipo ya Maombi
 DocType: Process Payroll,Submit Salary Slip,Tuma Slip ya Mshahara
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maxiumm discount kwa Item {0} ni {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Maxiumm discount kwa Item {0} ni {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Ingiza katika Bonde
 DocType: Sales Partner,Address & Contacts,Anwani na Mawasiliano
 DocType: SMS Log,Sender Name,Jina la Sender
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Panga na Hatua
 DocType: POS Profile,[Select],[Chagua]
 DocType: Vital Signs,Blood Pressure (diastolic),Shinikizo la damu (diastoli)
 DocType: SMS Log,Sent To,Imepelekwa
@@ -2412,7 +2458,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Tarehe ya Kuwasiliana inayofuata haiwezi kuwa katika siku za nyuma
 DocType: Company,For Reference Only.,Kwa Kumbukumbu Tu.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Daktari {0} haipatikani kwenye {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Chagua Batch No
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Chagua Batch No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Halafu {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,Mwaliko wa Kumbukumbu
@@ -2428,15 +2474,15 @@
 DocType: Normal Test Items,Require Result Value,Thamani ya Thamani ya Uhitaji
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Kesi Hapana haiwezi kuwa 0
 DocType: Item,Show a slideshow at the top of the page,Onyesha slideshow juu ya ukurasa
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Maduka
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Maduka
 DocType: Project Type,Projects Manager,Meneja wa Miradi
 DocType: Serial No,Delivery Time,Muda wa Utoaji
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Kuzeeka kwa Msingi
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Uteuzi umefutwa
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Uteuzi umefutwa
 DocType: Item,End of Life,Mwisho wa Uzima
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Safari
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Hakuna muundo wa Mshahara wa Mshahara au wa Mteja uliopatikana kwa mfanyakazi {0} kwa tarehe zilizopewa
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Safari
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Hakuna muundo wa Mshahara wa Mshahara au wa Mteja uliopatikana kwa mfanyakazi {0} kwa tarehe zilizopewa
 DocType: Leave Block List,Allow Users,Ruhusu Watumiaji
 DocType: Purchase Order,Customer Mobile No,Nambari ya Simu ya Wateja
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Inaendelea
@@ -2445,12 +2491,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Sasisha Gharama
 DocType: Item Reorder,Item Reorder,Kipengee Upya
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Onyesha Slip ya Mshahara
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Nyenzo za Uhamisho
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Nyenzo za Uhamisho
 DocType: Fees,Send Payment Request,Tuma Ombi la Malipo
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Taja shughuli, gharama za uendeshaji na kutoa Operesheni ya kipekee bila shughuli zako."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Hati hii imepungua kwa {0} {1} kwa kipengee {4}. Je! Unafanya mwingine {3} dhidi ya sawa {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Tafadhali kuweka mara kwa mara baada ya kuokoa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Chagua akaunti ya kubadilisha kiasi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Chagua akaunti ya kubadilisha kiasi
 DocType: Purchase Invoice,Price List Currency,Orodha ya Bei ya Fedha
 DocType: Naming Series,User must always select,Mtumiaji lazima ague daima
 DocType: Stock Settings,Allow Negative Stock,Ruhusu Stock mbaya
@@ -2470,7 +2516,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Mfanyakazi
 DocType: Sample Collection,Collected Time,Wakati uliokusanywa
 DocType: Company,Sales Monthly History,Historia ya Mwezi ya Mauzo
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Chagua Batch
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Chagua Batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} imekamilika kikamilifu
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Vital Ishara
 DocType: Training Event,End Time,Muda wa Mwisho
@@ -2478,16 +2524,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Upunguzaji wa Malipo au Kupoteza
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Kanuni za mkataba wa Standard kwa Mauzo au Ununuzi.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Jumuisha kwa Voucher
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Una uhakika unataka kufuta miadi hii?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Bomba la Mauzo
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Tafadhali weka akaunti ya msingi katika Kipengele cha Mshahara {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Inahitajika
 DocType: Rename Tool,File to Rename,Funga Kurejesha tena
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Tafadhali chagua BOM kwa Bidhaa katika Row {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Tafadhali chagua BOM kwa Bidhaa katika Row {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Akaunti {0} hailingani na Kampuni {1} katika Mode ya Akaunti: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},BOM iliyojulikana {0} haipo kwa Bidhaa {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Ratiba ya Matengenezo {0} lazima iondoliwe kabla ya kufuta Sheria hii ya Mauzo
+DocType: POS Profile,Applicable for Users,Inatumika kwa Watumiaji
 DocType: Notification Control,Expense Claim Approved,Madai ya Madai yaliidhinishwa
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Kulipwa kwa mshahara wa mfanyakazi {0} tayari kuundwa kwa kipindi hiki
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Kulipwa kwa mshahara wa mfanyakazi {0} tayari kuundwa kwa kipindi hiki
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Madawa
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Gharama ya Vitu Vilivyotunzwa
 DocType: Selling Settings,Sales Order Required,Amri ya Mauzo Inahitajika
@@ -2511,6 +2559,7 @@
 DocType: Offer Letter,Accepted,Imekubaliwa
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Shirika
 DocType: BOM Update Tool,BOM Update Tool,Chombo cha Mwisho cha BOM
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Akaunti ya sherehe haijainishwa, tafadhali kuanzisha akaunti ya chama cha ubaguzi kwa kampuni"
 DocType: SG Creation Tool Course,Student Group Name,Jina la Kikundi cha Wanafunzi
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Kujenga ada
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Tafadhali hakikisha unataka kufuta shughuli zote za kampuni hii. Data yako bwana itabaki kama ilivyo. Hatua hii haiwezi kufutwa.
@@ -2519,29 +2568,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) haiwezi kuwa kubwa kuliko kiwango kilichopangwa ({2}) katika Utaratibu wa Uzalishaji {3}
 DocType: Shipping Rule,Shipping Rule Label,Lebo ya Rule ya Utoaji
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum Forum
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Malighafi haziwezi kuwa tupu.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Haikuweza kusasisha hisa, ankara ina bidhaa ya kusafirisha kushuka."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Malighafi haziwezi kuwa tupu.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Haikuweza kusasisha hisa, ankara ina bidhaa ya kusafirisha kushuka."
 DocType: Lab Test Sample,Lab Test Sample,Mfano wa Mtihani wa Lab
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Huwezi kubadili kiwango kama BOM imetajwa agianst kitu chochote
+DocType: Restaurant,Invoice Series Prefix,Msaada wa Mfululizo wa Invoice
 DocType: Employee,Previous Work Experience,Uzoefu wa Kazi uliopita
 DocType: Stock Entry,For Quantity,Kwa Wingi
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Tafadhali ingiza Kiini kilichopangwa kwa Bidhaa {0} kwenye safu {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Tafadhali ingiza Kiini kilichopangwa kwa Bidhaa {0} kwenye safu {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} haijawasilishwa
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Maombi ya vitu.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Ugavi wa utaratibu wa uzalishaji utaundwa kwa kila kitu kilichomalizika vizuri.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} lazima iwe hasi katika hati ya kurudi
 ,Minutes to First Response for Issues,Dakika kwa Maswali ya kwanza ya Masuala
 DocType: Purchase Invoice,Terms and Conditions1,Masharti na Masharti1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,Jina la taasisi ambayo unaanzisha mfumo huu.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,Jina la taasisi ambayo unaanzisha mfumo huu.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Uingizaji wa uhasibu umehifadhiwa hadi tarehe hii, hakuna mtu anaweza kufanya / kurekebisha kuingia isipokuwa jukumu lililoelezwa hapo chini."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Tafadhali salama waraka kabla ya kuzalisha ratiba ya matengenezo
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Bei ya hivi karibuni imesasishwa katika BOM zote
 DocType: Fee Schedule,Successful,Inafanikiwa
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Hali ya Mradi
 DocType: UOM,Check this to disallow fractions. (for Nos),Angalia hii ili kupinga marufuku. (kwa Nos)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Maagizo ya Uzalishaji yafuatayo yalifanywa:
-DocType: Student Admission,Naming Series (for Student Applicant),Mfululizo wa majina (kwa Msaidizi wa Mwanafunzi)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Maagizo ya Uzalishaji yafuatayo yalifanywa:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Mfululizo wa majina (kwa Msaidizi wa Mwanafunzi)
 DocType: Delivery Note,Transporter Name,Jina la Transporter
 DocType: Authorization Rule,Authorized Value,Thamani iliyoidhinishwa
 DocType: BOM,Show Operations,Onyesha Kazi
@@ -2565,7 +2615,7 @@
 ,Employees working on a holiday,Wafanyakazi wanaofanya kazi likizo
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Andika Sasa
 DocType: Project,% Complete Method,Njia kamili
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Madawa
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Madawa
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Tarehe ya kuanza ya matengenezo haiwezi kuwa kabla ya tarehe ya kujifungua kwa Serial No {0}
 DocType: Production Order,Actual End Date,Tarehe ya mwisho ya mwisho
 DocType: BOM,Operating Cost (Company Currency),Gharama za Uendeshaji (Fedha la Kampuni)
@@ -2583,19 +2633,20 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Kupitisha Mtumiaji hawezi kuwa sawa na mtumiaji utawala unaofaa
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Kiwango cha msingi (kama kwa Stock UOM)
 DocType: SMS Log,No of Requested SMS,Hakuna ya SMS iliyoombwa
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Acha bila ya kulipa hailingani na kumbukumbu za Maombi ya Kuondoka
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Acha bila ya kulipa hailingani na kumbukumbu za Maombi ya Kuondoka
 DocType: Campaign,Campaign-.####,Kampeni -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Hatua Zingine
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Tafadhali usambaze vitu maalum kwa viwango bora zaidi
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Fanya ankara
 DocType: Selling Settings,Auto close Opportunity after 15 days,Funga karibu na fursa baada ya siku 15
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Amri za Ununuzi hayaruhusiwi kwa {0} kutokana na msimamo wa alama ya {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Amri za Ununuzi hayaruhusiwi kwa {0} kutokana na msimamo wa alama ya {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Mwisho wa Mwaka
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Kiongozi%
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Tarehe ya Mwisho wa Mkataba lazima iwe kubwa kuliko Tarehe ya Kujiunga
 DocType: Vital Signs,Nutrition Values,Maadili ya lishe
 DocType: Lab Test Template,Is billable,Ni billable
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Wote &quot;Ratiba Ratiba&quot; na Muda Kwa Uteuzi &quot;lazima kuweka kwa Dr {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Washirika wa tatu / muuzaji / wakala wa tume / mshirika / wauzaji ambaye anauza bidhaa za kampuni kwa tume.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} dhidi ya Utaratibu wa Ununuzi {1}
 DocType: Patient,Patient Demographics,Idadi ya Watu wa Magonjwa
@@ -2625,7 +2676,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","Template ya kodi ya kawaida ambayo inaweza kutumika kwa Shughuli zote za Ununuzi. Template hii inaweza kuwa na orodha ya vichwa vya kodi na pia majukumu mengine kama &quot;Shipping&quot;, &quot;Bima&quot;, &quot;Kushikilia&quot; nk #### Kumbuka kiwango cha kodi unachofafanua hapa kitakuwa kiwango cha kodi ya kila kitu * *. Ikiwa kuna ** Vitu ** vilivyo na viwango tofauti, lazima ziongezwe kwenye meza ya ** ya Item ** ** kwenye ** Item ** bwana. #### Maelezo ya nguzo 1. Aina ya mahesabu: - Hii inaweza kuwa kwenye ** Net Jumla ** (hiyo ni jumla ya kiasi cha msingi). - ** Katika Mstari uliopita Mto / Kiasi ** (kwa kodi za malipo au mashtaka). Ikiwa utichagua chaguo hili, kodi itatumika kama asilimia ya safu ya awali (katika meza ya kodi) kiasi au jumla. - ** Halisi ** (kama ilivyoelezwa). 2. Mkurugenzi wa Akaunti: Mwandishi wa Akaunti chini ya kodi hii itafunguliwa 3. Kituo cha Gharama: Ikiwa kodi / malipo ni mapato (kama meli) au gharama zinahitajika kutumiwa kwenye kituo cha gharama. 4. Maelezo: Maelezo ya kodi (ambayo yatachapishwa katika ankara / quotes). 5. Kiwango: kiwango cha kodi. 6. Kiasi: Kiwango cha Ushuru. 7. Jumla: Jumla ya jumla kwa hatua hii. 8. Ingiza Mstari: Ikiwa msingi wa &quot;Mstari uliopita Uliopita&quot; unaweza kuchagua namba ya mstari ambayo itachukuliwa kama msingi kwa hesabu hii (default ni mstari uliopita). 9. Fikiria kodi au malipo kwa: Katika kifungu hiki unaweza kutaja ikiwa kodi / malipo ni kwa ajili ya hesabu tu (sio sehemu ya jumla) au kwa jumla (haina kuongeza thamani kwa bidhaa) au kwa wote. 10. Ongeza au Deduct: Ikiwa unataka kuongeza au kupunguza kodi."
 DocType: Homepage,Homepage,Homepage
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Chagua Mganga ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',sasisha tabKuongezea kuweka invoice = &#39;{0}&#39; ambapo jina = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Vipimo vya Recd
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Kumbukumbu za ada zilizoundwa - {0}
 DocType: Asset Category Account,Asset Category Account,Akaunti ya Jamii ya Mali
@@ -2637,7 +2687,7 @@
 DocType: Asset,Manual,Mwongozo
 DocType: Salary Component Account,Salary Component Account,Akaunti ya Mshahara wa Mshahara
 DocType: Global Defaults,Hide Currency Symbol,Ficha Symbol ya Fedha
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","mfano Benki, Fedha, Kadi ya Mikopo"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","mfano Benki, Fedha, Kadi ya Mikopo"
 DocType: Lead Source,Source Name,Jina la Chanzo
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Kupumzika kwa shinikizo la damu kwa mtu mzima ni takribani 120 mmHg systolic, na 80 mmHg diastolic, iliyofupishwa &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Maelezo ya Mikopo
@@ -2656,16 +2706,16 @@
 DocType: Patient,Occupation,Kazi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: tarehe ya mwanzo lazima iwe kabla ya tarehe ya mwisho
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Jumla (Uchina)
-DocType: Sales Invoice,This Document,Hati hii
 DocType: Installation Note Item,Installed Qty,Uchina uliowekwa
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Hii inaweza kuwa kwa sababu ya Anwani za barua pepe zisizo sahihi katika
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Uliongeza
 DocType: Purchase Taxes and Charges,Parenttype,Mzazi
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Matokeo ya Mafunzo
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Matokeo ya Mafunzo
 DocType: Purchase Invoice,Is Paid,Ni kulipwa
 DocType: Salary Structure,Total Earning,Jumla ya Kupata
 DocType: Purchase Receipt,Time at which materials were received,Wakati ambapo vifaa vilipokelewa
 DocType: Stock Ledger Entry,Outgoing Rate,Kiwango cha Kuondoka
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Shirika la tawi la taasisi.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Shirika la tawi la taasisi.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,au
 DocType: Sales Order,Billing Status,Hali ya kulipia
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Ripoti Suala
@@ -2680,7 +2730,8 @@
 DocType: Notification Control,Sales Order Message,Ujumbe wa Utaratibu wa Mauzo
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Weka Maadili ya Hifadhi kama Kampuni, Fedha, Sasa Fedha ya Sasa, nk."
 DocType: Payment Entry,Payment Type,Aina ya malipo
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Tafadhali chagua Batch kwa Bidhaa {0}. Haiwezi kupata kundi moja linalotimiza mahitaji haya
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Tafadhali chagua Batch kwa Bidhaa {0}. Haiwezi kupata kundi moja linalotimiza mahitaji haya
+DocType: Hub Category,Parent Category,Jamii ya Mzazi
 DocType: Process Payroll,Select Employees,Chagua Waajiriwa
 DocType: Opportunity,Potential Sales Deal,Uwezekano wa Mauzo ya Mauzo
 DocType: Complaint,Complaints,Malalamiko
@@ -2717,7 +2768,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),Utambulisho wa mfuko wa utoaji (kwa kuchapishwa)
 DocType: Bin,Reserved Quantity,Waliohifadhiwa Wingi
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Tafadhali ingiza anwani ya barua pepe halali
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Tafadhali chagua kipengee kwenye gari
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Tafadhali chagua kipengee kwenye gari
 DocType: Landed Cost Voucher,Purchase Receipt Items,Ununuzi wa Receipt Items
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Fomu za Customizing
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,Nyuma
@@ -2727,15 +2778,15 @@
 DocType: Payment Request,Amount in customer's currency,Kiasi cha fedha za wateja
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Utoaji
 DocType: Stock Reconciliation Item,Current Qty,Uchina wa sasa
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Ongeza Wauzaji
+DocType: Restaurant Menu,Restaurant Menu,Mkahawa wa Menyu
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Kabla
 DocType: Appraisal Goal,Key Responsibility Area,Eneo la Ujibu wa Ufunguo
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Majaribio ya Wanafunzi husaidia kufuatilia mahudhurio, tathmini na ada kwa wanafunzi"
 DocType: Payment Entry,Total Allocated Amount,Kiasi kilichopangwa
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Weka akaunti ya hesabu ya msingi kwa hesabu ya daima
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Weka akaunti ya hesabu ya msingi kwa hesabu ya daima
 DocType: Item Reorder,Material Request Type,Aina ya Uomba wa Nyenzo
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural Journal Kuingia kwa mishahara kutoka {0} hadi {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","Mitaa ya Mitaa imejaa, haikuhifadhi"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","Mitaa ya Mitaa imejaa, haikuhifadhi"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Kipengele cha kubadilisha UOM ni lazima
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Uwezo wa Chumba
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref
@@ -2774,16 +2825,18 @@
 DocType: Project,Task Completion,Kukamilisha Kazi
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Sio katika Hifadhi
 DocType: Appraisal,HR User,Mtumiaji wa HR
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Kodi na Malipo zimefutwa
-apps/erpnext/erpnext/hooks.py +129,Issues,Mambo
+apps/erpnext/erpnext/hooks.py +138,Issues,Mambo
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Hali lazima iwe moja ya {0}
 DocType: Sales Invoice,Debit To,Debit To
+DocType: Restaurant Menu Item,Restaurant Menu Item,Menyu ya Menyu ya Mgahawa
 DocType: Delivery Note,Required only for sample item.,Inahitajika tu kwa bidhaa ya sampuli.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Uhakika halisi baada ya Shughuli
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Hakuna kuingizwa kwa mshahara kupatikana kati ya {0} na {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Hakuna kuingizwa kwa mshahara kupatikana kati ya {0} na {1}
 ,Pending SO Items For Purchase Request,Inasubiri vitu vya SO Kwa Ununuzi wa Ombi
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Uingizaji wa Wanafunzi
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} imezimwa
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Uingizaji wa Wanafunzi
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} imezimwa
 DocType: Supplier,Billing Currency,Fedha ya kulipia
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Ziada kubwa
@@ -2806,6 +2859,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Tafadhali angalia hakuna wa ziara zinazohitajika
 DocType: Stock Settings,Default Valuation Method,Njia ya Hifadhi ya Kimaadili
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,Malipo
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Mwisho unaendelea. Inaweza kuchukua muda.
 DocType: Vehicle Log,Fuel Qty,Uchina wa mafuta
 DocType: Production Order Operation,Planned Start Time,Muda wa Kuanza
 DocType: Course,Assessment,Tathmini
@@ -2821,7 +2875,7 @@
 DocType: Price List,Price List Master,Orodha ya Bei Mwalimu
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Shughuli zote za Mauzo zinaweza kutambulishwa dhidi ya watu wengi wa Mauzo ** ili uweze kuweka na kufuatilia malengo.
 ,S.O. No.,SO Hapana.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Tafadhali tengeneza Wateja kutoka Kiongozi {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Tafadhali tengeneza Wateja kutoka Kiongozi {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Chagua Mgonjwa
 DocType: Price List,Applicable for Countries,Inahitajika kwa Nchi
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Jina la Kipimo
@@ -2852,27 +2906,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,Maelezo ya Invoice ya Wasambazaji
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Akaunti ya gharama na tofauti ({0}) lazima iwe akaunti ya &#39;Faida au Kupoteza&#39;
 DocType: Project,Copied From,Ilikosa Kutoka
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Jina la kosa: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Uhaba
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Jina la kosa: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,Uhaba
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} haihusiani na {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Mahudhurio ya mfanyakazi {0} tayari amewekwa alama
 DocType: Packing Slip,If more than one package of the same type (for print),Ikiwa zaidi ya mfuko mmoja wa aina moja (kwa kuchapishwa)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Tafadhali weka mteja default katika Mipangilio ya Mkahawa
 ,Salary Register,Daftari ya Mshahara
 DocType: Warehouse,Parent Warehouse,Ghala la Mzazi
 DocType: C-Form Invoice Detail,Net Total,Jumla ya Net
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},BOM ya kutosha haipatikani kwa Item {0} na Mradi {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},BOM ya kutosha haipatikani kwa Item {0} na Mradi {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Eleza aina mbalimbali za mkopo
 DocType: Bin,FCFS Rate,Kiwango cha FCFS
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Kiasi Kikubwa
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Muda (kwa mchana)
 DocType: Project Task,Working,Kufanya kazi
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Taa ya Hifadhi (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Mwaka wa Fedha
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Mwaka wa Fedha
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} sio Kampuni {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,Haikuweza kutatua kazi ya alama ya alama kwa {0}. Hakikisha fomu hiyo halali.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Gharama kama
 DocType: Healthcare Settings,Out Patient Settings,Nje Mipangilio ya Mgonjwa
 DocType: Account,Round Off,Pande zote
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Wingi lazima uwe na chanya
 ,Requested Qty,Uliotakiwa Uchina
 DocType: Tax Rule,Use for Shopping Cart,Tumia kwa Ununuzi wa Ununuzi
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Thamani {0} ya Attribute {1} haikuwepo katika orodha ya Makala ya Hifadhi ya Thamani ya Bidhaa {2}
@@ -2881,7 +2937,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Malipo yatasambazwa kulingana na bidhaa qty au kiasi, kulingana na uteuzi wako"
 DocType: Maintenance Visit,Purposes,Malengo
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Atleast kitu kimoja kinapaswa kuingizwa kwa kiasi kikubwa katika hati ya kurudi
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Ongeza Mafunzo
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Uendeshaji {0} kwa muda mrefu kuliko masaa yoyote ya kazi iliyopo katika kituo cha kazi {1}, uvunja operesheni katika shughuli nyingi"
 ,Requested,Aliomba
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Hakuna Maneno
@@ -2893,6 +2948,8 @@
 DocType: Employee Loan,Repaid/Closed,Kulipwa / Kufungwa
 DocType: Item,Total Projected Qty,Jumla ya Uchina uliopangwa
 DocType: Monthly Distribution,Distribution Name,Jina la Usambazaji
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Wasambazaji&gt; Aina ya Wasambazaji
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Kiwango cha kiwango cha thamani haipatikani kwa Bidhaa {0}, ambayo inahitajika kufanya fomu za uhasibu kwa {1} {2}. Ikiwa kipengee kinatumia kama kiwango cha kiwango cha hesabu ya kiwango cha {1}, tafadhali angalia kuwa kwenye {1} meza ya jedwali. Vinginevyo, tafadhali tengeneza shughuli za hisa zinazoingia kwa kipengee au tumaja kiwango cha hesabu katika rekodi ya Bidhaa, kisha jaribu kuwasilisha / kufuta kufungua hii"
 DocType: Course,Course Code,Msimbo wa Kozi
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Ukaguzi wa Ubora unaohitajika kwa Bidhaa {0}
 DocType: POS Settings,Use POS in Offline Mode,Tumia POS katika Hali ya Nje
@@ -2903,14 +2960,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Dhibiti Miti ya Wilaya.
 DocType: Journal Entry Account,Sales Invoice,Invozi ya Mauzo
 DocType: Journal Entry Account,Party Balance,Mizani ya Chama
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,Tafadhali chagua Weka Kutoa Discount On
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Tafadhali chagua Weka Kutoa Discount On
 DocType: Company,Default Receivable Account,Akaunti ya Akaunti ya Kupokea
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Unda Uingiaji wa Benki kwa mshahara wa jumla uliopatiwa kwa vigezo vilivyochaguliwa hapo juu
 DocType: Physician,Physician Schedule,Ratiba ya Mbaguzi
 DocType: Purchase Invoice,Deemed Export,Exported kuagizwa
 DocType: Stock Entry,Material Transfer for Manufacture,Uhamisho wa Nyenzo kwa Utengenezaji
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Asilimia ya Punguzo inaweza kutumika ama dhidi ya orodha ya bei au orodha zote za bei.
-DocType: Purchase Invoice,Half-yearly,Nusu ya mwaka
+DocType: Subscription,Half-yearly,Nusu ya mwaka
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Kuingia kwa Uhasibu kwa Stock
 DocType: Lab Test,LabTest Approver,Msaidizi wa LabTest
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Tayari umehakikishia vigezo vya tathmini {}.
@@ -2939,13 +2996,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Kinga ndogo
 DocType: Company,Standard Template,Kigezo cha Kigezo
 DocType: Training Event,Theory,Nadharia
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Onyo: Nyenzo Nambari Iliyoombwa ni chini ya Upeo wa chini wa Uagizaji
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Onyo: Nyenzo Nambari Iliyoombwa ni chini ya Upeo wa chini wa Uagizaji
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Akaunti {0} imehifadhiwa
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Shirika la Kisheria / Subsidiary na Chart tofauti ya Akaunti ya Shirika.
 DocType: Payment Request,Mute Email,Tuma barua pepe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Chakula, Beverage &amp; Tobacco"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Inaweza tu kulipa malipo dhidi ya unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Kiwango cha Tume haiwezi kuwa zaidi ya 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Inaweza tu kulipa malipo dhidi ya unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Kiwango cha Tume haiwezi kuwa zaidi ya 100
 DocType: Stock Entry,Subcontract,Usikilize
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Tafadhali ingiza {0} kwanza
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Hakuna majibu kutoka
@@ -2963,10 +3020,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Rangi
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Vigezo vya Mpango wa Tathmini
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Zuia Maagizo ya Ununuzi
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Inapotosha
 DocType: Patient Appointment,Scheduled,Imepangwa
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Ombi la nukuu.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Tafadhali kuanzisha Mfumo wa Jina la Waajiriwa katika Rasilimali za Binadamu&gt; Mipangilio ya HR
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Tafadhali chagua Kitu ambacho &quot;Je, Kitu cha Hifadhi&quot; ni &quot;Hapana&quot; na &quot;Je, Ni Kitu cha Mauzo&quot; ni &quot;Ndiyo&quot; na hakuna Bundi la Bidhaa"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Chagua Wateja
 DocType: Student Log,Academic,Elimu
 DocType: Patient,Personal and Social History,Historia ya kibinafsi na ya kijamii
 DocType: Fee Schedule,Fee Breakup for each student,Kulipwa kwa kila mwanafunzi
@@ -2976,7 +3034,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Kiwango cha Thamani
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Dizeli
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Orodha ya Bei Fedha isiyochaguliwa
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Orodha ya Bei Fedha isiyochaguliwa
 apps/erpnext/erpnext/config/healthcare.py +46,Results,Matokeo
 ,Student Monthly Attendance Sheet,Karatasi ya Wahudumu wa Mwezi kila mwezi
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Mfanyakazi {0} tayari ameomba kwa {1} kati ya {2} na {3}
@@ -2991,7 +3049,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Dhibiti Washirika wa Mauzo.
 DocType: Quality Inspection,Inspection Type,Aina ya Ukaguzi
 DocType: Fee Validity,Visited yet,Alirudi bado
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Maghala na shughuli zilizopo haziwezi kubadilishwa kuwa kikundi.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Maghala na shughuli zilizopo haziwezi kubadilishwa kuwa kikundi.
 DocType: Assessment Result Tool,Result HTML,Matokeo ya HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Inamalizika
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Ongeza Wanafunzi
@@ -3018,7 +3076,7 @@
 DocType: Healthcare Settings,Result Printed,Matokeo yaliyochapishwa
 DocType: Asset Category Account,Depreciation Expense Account,Akaunti ya gharama ya kushuka kwa thamani
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Muda wa majaribio
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Tazama {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Tazama {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Node tu za majani zinaruhusiwa katika shughuli
 DocType: Expense Claim,Expense Approver,Msaidizi wa gharama
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Row {0}: Upendeleo dhidi ya Wateja lazima uwe mkopo
@@ -3029,7 +3087,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Ili Ufikiaji
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Schedules za Kozi zimefutwa:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Ingia kwa kudumisha hali ya utoaji wa SMS
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Weka Target ya Mauzo
 DocType: Accounts Settings,Make Payment via Journal Entry,Fanya Malipo kupitia Ingia ya Machapisho
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Kuchapishwa
 DocType: Item,Inspection Required before Delivery,Ukaguzi unahitajika kabla ya Utoaji
@@ -3037,7 +3094,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Shughuli zinazosubiri
 DocType: Patient Appointment,Reminded,Alikumbushwa
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Shirika lako
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Shirika lako
 DocType: Fee Component,Fees Category,Ada ya Jamii
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Tafadhali ingiza tarehe ya kufuta.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Am
@@ -3049,7 +3106,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reorder Level
 DocType: Company,Chart Of Accounts Template,Chati ya Kigezo cha Akaunti
 DocType: Attendance,Attendance Date,Tarehe ya Kuhudhuria
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Item Bei iliyosasishwa kwa {0} katika Orodha ya Bei {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Item Bei iliyosasishwa kwa {0} katika Orodha ya Bei {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Uvunjaji wa mshahara kulingana na Kupata na Kupunguza.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Akaunti yenye nodes za mtoto haiwezi kubadilishwa kwenye kiongozi
 DocType: Purchase Invoice Item,Accepted Warehouse,Ghala iliyokubaliwa
@@ -3065,9 +3122,10 @@
 ,Employee Birthday,Kuzaliwa kwa Waajiriwa
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Chombo cha Uhudhuriaji wa Wanafunzi
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,Upeo umevuka
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Imepangwa Upto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital Venture
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Jina la kitaaluma na &#39;Mwaka wa Mwaka&#39; &#39;{0} na&#39; Jina la Muda &#39;{1} tayari lipo. Tafadhali tengeneza safu hizi na jaribu tena.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Kama kuna shughuli zilizopo dhidi ya kipengee {0}, huwezi kubadilisha thamani ya {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Kama kuna shughuli zilizopo dhidi ya kipengee {0}, huwezi kubadilisha thamani ya {1}"
 DocType: UOM,Must be Whole Number,Inapaswa kuwa Nambari Yote
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Majani mapya yaliyowekwa (Katika Siku)
 DocType: Purchase Invoice,Invoice Copy,Nakala ya ankara
@@ -3077,7 +3135,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Nambari ya ankara
 DocType: Shopping Cart Settings,Orders,Amri
 DocType: Employee Leave Approver,Leave Approver,Acha Msaidizi
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Tafadhali chagua batch
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Tafadhali chagua batch
 DocType: Assessment Group,Assessment Group Name,Jina la Kundi la Tathmini
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Nyenzo Iliyohamishwa kwa Utengenezaji
 DocType: Expense Claim,"A user with ""Expense Approver"" role",Mtumiaji na jukumu la &quot;Msaidizi wa gharama&quot;
@@ -3092,7 +3150,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Uingiaji wa Kipindi cha Kipindi
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Chagua Idara ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Kituo cha Gharama na shughuli zilizopo haziwezi kubadilishwa kuwa kikundi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Kiasi {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Kiasi {0} {1} {2} {3}
 DocType: Account,Depreciation,Kushuka kwa thamani
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Wasambazaji (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Chombo cha Kuhudhuria Waajiriwa
@@ -3103,10 +3161,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,Maingizo ya Malipo {0} hayajaunganishwa
 DocType: GL Entry,Voucher No,Voucher No
 ,Lead Owner Efficiency,Ufanisi wa Mmiliki wa Uongozi
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Wengi maarufu
 DocType: Leave Allocation,Leave Allocation,Acha Ugawaji
 DocType: Payment Request,Recipient Message And Payment Details,Ujumbe wa mpokeaji na maelezo ya malipo
 DocType: Training Event,Trainer Email,Barua ya Mkufunzi
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Maombi ya Nyenzo {0} yaliyoundwa
+DocType: Restaurant Reservation,No of People,Hakuna Watu
 DocType: Production Planning Tool,Include sub-contracted raw materials,Jumuisha vifaa vyenye vyenye mkataba
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Kigezo cha maneno au mkataba.
 DocType: Purchase Invoice,Address and Contact,Anwani na Mawasiliano
@@ -3115,10 +3175,11 @@
 DocType: Supplier,Last Day of the Next Month,Siku ya mwisho ya Mwezi ujao
 DocType: Support Settings,Auto close Issue after 7 days,Funga karibu na Suala baada ya siku 7
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Kuondoka hakuwezi kutengwa kabla ya {0}, kama usawa wa kuondoka tayari umebeba katika rekodi ya ugawaji wa kuondoka baadaye {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Kumbuka: Kutokana / Tarehe ya Marejeo inazidi siku za mikopo za mteja zilizoruhusiwa na {0} siku (s)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Kumbuka: Kutokana / Tarehe ya Marejeo inazidi siku za mikopo za mteja zilizoruhusiwa na {0} siku (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Mwombaji wa Mwanafunzi
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,KIFUNA KWA RECIPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,Akaunti ya Kushuka kwa Uzito
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Barua pepe hii imejitokeza
 DocType: Stock Settings,Freeze Stock Entries,Fungua Entries za Stock
 DocType: Program Enrollment,Boarding Student,Kuogelea Mwanafunzi
 DocType: Asset,Expected Value After Useful Life,Thamani Inayotarajiwa Baada ya Maisha ya Muhimu
@@ -3126,7 +3187,7 @@
 DocType: Activity Cost,Billing Rate,Kiwango cha kulipia
 ,Qty to Deliver,Uchina Ili Kuokoa
 ,Stock Analytics,Analytics ya hisa
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Kazi haiwezi kushoto tupu
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Kazi haiwezi kushoto tupu
 DocType: Maintenance Visit Purpose,Against Document Detail No,Dhidi ya Detail Document No
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Aina ya Chama ni lazima
 DocType: Quality Inspection,Outgoing,Inatoka
@@ -3176,21 +3237,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Pata Marekebisho
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Akaunti {2} sio ya Kampuni {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Ombi la Vifaa {0} limefutwa au kusimamishwa
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Acha Usimamizi
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Acha Usimamizi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Kundi na Akaunti
 DocType: Sales Order,Fully Delivered,Kutolewa kikamilifu
 DocType: Lead,Lower Income,Mapato ya chini
+DocType: Restaurant Order Entry,Current Order,Utaratibu wa sasa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Chanzo na ghala la lengo haliwezi kuwa sawa kwa mstari {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Athari ya tofauti lazima iwe akaunti ya aina ya Asset / Dhima, tangu hii Upatanisho wa Stock ni Ufungashaji wa Ufunguzi"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Kiasi kilichopotea hawezi kuwa kikubwa kuliko Kiasi cha Mikopo {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Nenda kwenye Programu
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Nambari ya Order ya Ununuzi inahitajika kwa Bidhaa {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Utaratibu wa Uzalishaji haukuundwa
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Utaratibu wa Uzalishaji haukuundwa
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;Tarehe Tarehe&#39; lazima iwe baada ya &#39;Tarehe&#39;
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Haiwezi kubadilisha hali kama mwanafunzi {0} imeunganishwa na programu ya mwanafunzi {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Haiwezi kubadilisha hali kama mwanafunzi {0} imeunganishwa na programu ya mwanafunzi {1}
 DocType: Asset,Fully Depreciated,Kikamilifu imepungua
 ,Stock Projected Qty,Uchina Uliopangwa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Wateja {0} sio mradi {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Wateja {0} sio mradi {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Kuhudhuria alama HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Nukuu ni mapendekezo, zabuni ambazo umetuma kwa wateja wako"
 DocType: Sales Order,Customer's Purchase Order,Amri ya Ununuzi wa Wateja
@@ -3201,8 +3263,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Tafadhali weka Idadi ya Dhamana iliyopangwa
 DocType: Supplier Scorecard Period,Calculations,Mahesabu
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Thamani au Uchina
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Amri za Uzalishaji haziwezi kuinuliwa kwa:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Amri za Uzalishaji haziwezi kuinuliwa kwa:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Dakika
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Tafadhali weka Mfululizo wa Naming kwa {0} kupitia Setup&gt; Mipangilio&gt; Mfululizo wa Naming
 DocType: Purchase Invoice,Purchase Taxes and Charges,Malipo na Malipo ya Ununuzi
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Nenda kwa Wauzaji
 ,Qty to Receive,Uchina Ili Kupokea
@@ -3215,7 +3278,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Mikopo Kwa akaunti lazima iwe Hesabu ya Hesabu ya Hesabu
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Aina zote za Wasambazaji
 DocType: Global Defaults,Disable In Words,Zimaza Maneno
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,Msimbo wa kipengee ni lazima kwa sababu Kipengee hakijasaniwa
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,Msimbo wa kipengee ni lazima kwa sababu Kipengee hakijasaniwa
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Nukuu {0} si ya aina {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Ratiba ya Ratiba ya Matengenezo
 DocType: Sales Order,%  Delivered,Imetolewa
@@ -3237,23 +3300,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Kufungua Mizani Equity
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Upatanisho
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Inakaa
 DocType: Appraisal,Appraisal,Tathmini
 DocType: Purchase Invoice,GST Details,Maelezo ya GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},Barua pepe imetumwa kwa muuzaji {0}
+DocType: Item,Default Sales Unit of Measure,Kipengee cha Mauzo cha Kiwango cha Mauzo
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Tarehe inarudiwa
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Ishara iliyoidhinishwa
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Acha vibali lazima iwe moja ya {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Unda ada
-DocType: Hub Settings,Seller Email,Barua ya muuzaji
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Gharama ya Jumla ya Ununuzi (kupitia Invoice ya Ununuzi)
 DocType: Training Event,Start Time,Anza Muda
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Chagua Wingi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Chagua Wingi
 DocType: Customs Tariff Number,Customs Tariff Number,Nambari ya Ushuru wa Forodha
 DocType: Patient Appointment,Patient Appointment,Uteuzi wa Mgonjwa
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Idhini ya kupitisha haiwezi kuwa sawa na jukumu utawala unaofaa
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Ondoa kutoka kwa Ujumbe huu wa Barua pepe
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Ondoa kutoka kwa Ujumbe huu wa Barua pepe
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Pata Wauzaji
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} haipatikani kwa Bidhaa {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Nenda kwa Kozi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Ujumbe uliotumwa
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Akaunti yenye nodes za watoto haiwezi kuweka kama kiongozi
@@ -3266,11 +3332,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Nyenzo Iliyohamishwa kwa Uzalishaji
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Akaunti {0} haipo
 DocType: Project,Project Type,Aina ya Mradi
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Kazi ya Watoto ipo kwa Kazi hii. Huwezi kufuta Kazi hii.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Vipi lengo la qty au kiasi lengo ni lazima.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Gharama ya shughuli mbalimbali
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Hakuna matokeo zaidi
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Gharama ya shughuli mbalimbali
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Kuweka Matukio kwa {0}, kwa kuwa Mfanyikazi amefungwa kwa Watu chini ya Mauzo hawana ID ya Mtumiaji {1}"
 DocType: Timesheet,Billing Details,Maelezo ya kulipia
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Chanzo na lengo la ghala lazima iwe tofauti
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Chanzo na lengo la ghala lazima iwe tofauti
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Hairuhusiwi kusasisha ushirikiano wa hisa zaidi kuliko {0}
 DocType: Purchase Invoice Item,PR Detail,Maelezo ya PR
 DocType: Sales Order,Fully Billed,Imejazwa kikamilifu
@@ -3296,7 +3364,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Uhamisho wa Wire
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Angalia yote
 DocType: Vehicle Log,Invoice Ref,Invoice Ref
-DocType: Purchase Order,Recurring Order,Order ya mara kwa mara
 DocType: Company,Default Income Account,Akaunti ya Mapato ya Default
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Kundi la Wateja / Wateja
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Mikopo ya Mali isiyofunguliwa Faida / Kupoteza (Mikopo)
@@ -3310,9 +3377,9 @@
 DocType: Patient,A Negative,Hasi
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Hakuna zaidi ya kuonyesha.
 DocType: Lead,From Customer,Kutoka kwa Wateja
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Wito
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Wito
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Bidhaa
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,Vita
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,Vita
 DocType: Project,Total Costing Amount (via Time Logs),Jumla ya Kiwango cha Gharama (kupitia Hifadhi za Muda)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Fanya ratiba ya ada
 DocType: Purchase Order Item Supplied,Stock UOM,UOM ya hisa
@@ -3336,7 +3403,7 @@
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Majani na Likizo
 DocType: School Settings,Current Academic Term,Kipindi cha sasa cha elimu
 DocType: Sales Order,Not Billed,Si Billed
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Ghala zote mbili lazima ziwe na Kampuni moja
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Ghala zote mbili lazima ziwe na Kampuni moja
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Hakuna anwani zilizoongezwa bado.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Kiwango cha Voucher ya Gharama
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Miradi iliyotolewa na Wauzaji.
@@ -3345,7 +3412,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Kiasi cha Punguzo
 DocType: Purchase Invoice,Return Against Purchase Invoice,Rudi dhidi ya ankara ya ununuzi
 DocType: Item,Warranty Period (in days),Kipindi cha udhamini (katika siku)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',sasisha `tabia ya Uteuzi wa Patient&#39;infoice = &#39;{0}&#39; ambapo jina = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Uhusiano na Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Fedha Nacho kutoka kwa Uendeshaji
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Item 4
@@ -3354,8 +3420,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Akaunti ya Kuingia kwa Kawaida
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Kikundi cha Wanafunzi
 DocType: Shopping Cart Settings,Quotation Series,Mfululizo wa Nukuu
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Kipengee kinacho na jina moja ({0}), tafadhali soma jina la kikundi cha bidhaa au uunda jina tena"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Tafadhali chagua mteja
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Kipengee kinacho na jina moja ({0}), tafadhali soma jina la kikundi cha bidhaa au uunda jina tena"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Tafadhali chagua mteja
 DocType: C-Form,I,Mimi
 DocType: Company,Asset Depreciation Cost Center,Kituo cha gharama ya kushuka kwa thamani ya mali
 DocType: Sales Order Item,Sales Order Date,Tarehe ya Utaratibu wa Mauzo
@@ -3364,6 +3430,7 @@
 DocType: Assessment Plan,Assessment Plan,Mpango wa Tathmini
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Mteja {0} ameundwa.
 DocType: Stock Settings,Limit Percent,Percent Limit
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Hivi sasa hakuna hisa zinazopatikana katika ghala lolote
 ,Payment Period Based On Invoice Date,Kipindi cha Malipo Kulingana na tarehe ya ankara
 DocType: Sample Collection,No. of print,Hapana ya kuchapishwa
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Viwango vya Kubadilisha Fedha Hazipo kwa {0}
@@ -3419,13 +3486,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pato la Pato la Jumla - Utoaji Jumla - Ulipaji wa Mikopo
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,BOM ya sasa na BOM Mpya haiwezi kuwa sawa
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Kitambulisho cha Mshahara wa Mshahara
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Kitambulisho cha Mshahara wa Mshahara
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Tarehe ya Kustaafu lazima iwe kubwa kuliko Tarehe ya kujiunga
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Kulikuwa na makosa wakati wa ratiba ya kozi juu ya:
 DocType: Sales Invoice,Against Income Account,Dhidi ya Akaunti ya Mapato
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Ametolewa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Kipengee {0}: Iliyoagizwa qty {1} haiwezi kuwa chini ya amri ya chini qty {2} (iliyoelezwa katika Item).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Kipengee {0}: Iliyoagizwa qty {1} haiwezi kuwa chini ya amri ya chini qty {2} (iliyoelezwa katika Item).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Asilimia ya Usambazaji wa Kila mwezi
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Tafadhali ingia kama mtumiaji mwingine.
 DocType: Territory,Territory Targets,Malengo ya Wilaya
 DocType: Delivery Note,Transporter Info,Info Transporter
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Tafadhali teua default {0} katika Kampuni {1}
@@ -3433,13 +3501,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Muuzaji sawa ameingizwa mara nyingi
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Faida ya Pato / Kupoteza
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Nambari ya Utaratibu wa Ununuzi Inayotolewa
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Jina la Kampuni hawezi kuwa Kampuni
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Jina la Kampuni hawezi kuwa Kampuni
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Viongozi wa Barua kwa templates za kuchapisha.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Majina ya nyaraka za uchapishaji mfano Msajili wa Proforma.
 DocType: Program Enrollment,Walking,Kutembea
 DocType: Student Guardian,Student Guardian,Mlezi wa Mwanafunzi
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Malipo ya aina ya thamani haipatikani kama Kuunganisha
 DocType: POS Profile,Update Stock,Sasisha Stock
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,katika usajili
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM tofauti kwa vitu itasababisha kutosa (Jumla) thamani ya uzito wa Nambari. Hakikisha kwamba Uzito wa Net wa kila kitu ni katika UOM sawa.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Kiwango cha BOM
 DocType: Asset,Journal Entry for Scrap,Jarida la Kuingia kwa Scrap
@@ -3486,15 +3555,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Kitambulisho cha mtumiaji wa mfumo (kuingia). Ikiwa imewekwa, itakuwa default kwa aina zote HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Kutoka {1}
 DocType: Task,depends_on,inategemea na
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Imesababishwa kwa uboreshaji wa bei ya hivi karibuni katika Bila zote za Vifaa. Inaweza kuchukua dakika chache.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Imesababishwa kwa uboreshaji wa bei ya hivi karibuni katika Bila zote za Vifaa. Inaweza kuchukua dakika chache.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Jina la Akaunti mpya. Kumbuka: Tafadhali usijenge akaunti kwa Wateja na Wauzaji
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Nchi za hekima za Hitilafu za Hitilafu za Nchi
 DocType: Sales Order Item,Supplier delivers to Customer,Wasambazaji hutoa kwa Wateja
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Fomu / Bidhaa / {0}) haipo nje ya hisa
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Kutokana / Tarehe ya Kumbukumbu haiwezi kuwa baada ya {0}
+,Sales Payment Summary,Muhtasari wa Malipo ya Mauzo
+DocType: Restaurant,Restaurant,Mgahawa
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Kutokana / Tarehe ya Kumbukumbu haiwezi kuwa baada ya {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Kuingiza Data na Kuagiza
 DocType: Patient,Account Details,Maelezo ya Akaunti
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Hakuna wanafunzi waliopatikana
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Hakuna wanafunzi waliopatikana
 DocType: Medical Department,Medical Department,Idara ya Matibabu
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Scorecard ya Wafanyabiashara Hatua za Kipazo
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Tarehe ya Kuagiza Invozi
@@ -3505,7 +3576,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Tafadhali chagua Tarehe ya Kuweka kabla ya kuchagua Chama
 DocType: Program Enrollment,School House,Shule ya Shule
 DocType: Serial No,Out of AMC,Nje ya AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Tafadhali chagua Nukuu
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Tafadhali chagua Nukuu
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Idadi ya kushuka kwa thamani iliyotengenezwa haiwezi kuwa kubwa zaidi kuliko Jumla ya Idadi ya Dhamana
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Fanya Ziara ya Utunzaji
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,Tafadhali wasiliana na mtumiaji aliye na jukumu la Meneja Mauzo {0}
@@ -3513,7 +3584,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Kampuni (si Wateja au Wafanyabiashara) Mwalimu.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Hii inategemea mahudhurio ya Mwanafunzi
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Hakuna Wanafunzi
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Ongeza vitu vingine au kufungua fomu kamili
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Ongeza vitu vingine au kufungua fomu kamili
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Vidokezo vya utoaji {0} lazima kufutwa kabla ya kufuta Sheria hii ya Mauzo
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Nenda kwa Watumiaji
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Kiasi kilicholipwa + Andika Kiasi hawezi kuwa kubwa zaidi kuliko Jumla ya Jumla
@@ -3533,37 +3604,40 @@
 DocType: Fee Schedule,Fee Schedule,Ratiba ya ada
 DocType: Hub Settings,Publish Availability,Chapisha Upatikanaji
 DocType: Company,Create Chart Of Accounts Based On,Unda Chati ya Hesabu za Akaunti
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Haiwezi kuibadilisha kuwa sio kundi. Kazi za Watoto zipo.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Tarehe ya kuzaliwa haiwezi kuwa kubwa kuliko leo.
 ,Stock Ageing,Kuzaa hisa
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Mwanafunzi {0} iko juu ya mwombaji wa mwanafunzi {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Marekebisho ya Upangaji (Kampuni ya Fedha)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Timesheet
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Timesheet
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} &#39;{1}&#39; imezimwa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Weka kama Fungua
 DocType: Cheque Print Template,Scanned Cheque,Angalia Angalia
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Tuma barua pepe moja kwa moja kwa Wafanyabiashara juu ya Kuwasilisha shughuli.
 DocType: Timesheet,Total Billable Amount,Kiasi cha Jumla cha Billable
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Kipengee 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Kuingia kwa Amri
 DocType: Purchase Order,Customer Contact Email,Anwani ya Mawasiliano ya Wateja
 DocType: Warranty Claim,Item and Warranty Details,Maelezo na maelezo ya dhamana
 DocType: Sales Team,Contribution (%),Mchango (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Kumbuka: Uingiaji wa Malipo hautaundwa tangu &#39;Akaunti ya Fedha au Benki&#39; haijainishwa
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Mradi {0} tayari umepo
 DocType: Medical Department,Nursing User,Mtumiaji wa Uuguzi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Majukumu
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Kipindi cha uhalali wa nukuu hii imekwisha.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Kipindi cha uhalali wa nukuu hii imekwisha.
 DocType: Expense Claim Account,Expense Claim Account,Akaunti ya dai ya gharama
 DocType: Accounts Settings,Allow Stale Exchange Rates,Ruhusu Viwango vya Exchange za Stale
 DocType: Sales Person,Sales Person Name,Jina la Mtu wa Mauzo
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Tafadhali ingiza ankara 1 kwenye meza
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Ongeza Watumiaji
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Ongeza Watumiaji
 DocType: POS Item Group,Item Group,Kundi la Bidhaa
 DocType: Item,Safety Stock,Usalama wa Hifadhi
 DocType: Healthcare Settings,Healthcare Settings,Mipangilio ya afya
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Maendeleo% ya kazi haiwezi kuwa zaidi ya 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Maendeleo% ya kazi haiwezi kuwa zaidi ya 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Kabla ya upatanisho
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Kwa {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Kodi na Malipo Aliongeza (Fedha za Kampuni)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Rangi ya Kodi ya Ushuru {0} lazima iwe na akaunti ya aina ya kodi au mapato au gharama au malipo
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Rangi ya Kodi ya Ushuru {0} lazima iwe na akaunti ya aina ya kodi au mapato au gharama au malipo
 DocType: Sales Order,Partly Billed,Sehemu ya Billed
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Kipengee {0} kinafaa kuwa kipengee cha Mali isiyohamishika
 DocType: Item,Default BOM,BOM ya default
@@ -3579,6 +3653,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,Inaweza kubadilika
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Kutoka Kumbuka Utoaji
 DocType: Student,Student Email Address,Anwani ya barua pepe ya wanafunzi
+DocType: Item,Hub Warehouse,Warehouse Hub
 DocType: Physician Schedule Time Slot,From Time,Kutoka wakati
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Katika Stock:
 DocType: Notification Control,Custom Message,Ujumbe maalum
@@ -3586,9 +3661,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,Akaunti au Akaunti ya Benki ni lazima kwa kuingia malipo
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Anwani ya Wanafunzi
 DocType: Purchase Invoice,Price List Exchange Rate,Orodha ya Badilishaji ya Bei
+DocType: POS Profile,POS Profile Name,Jina la Profaili ya POS
 DocType: Purchase Invoice Item,Rate,Kiwango
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Ndani
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Jina la Anwani
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Jina la Anwani
 DocType: Stock Entry,From BOM,Kutoka BOM
 DocType: Assessment Code,Assessment Code,Kanuni ya Tathmini
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Msingi
@@ -3602,11 +3678,12 @@
 DocType: Salary Slip,Salary Structure,Mshahara wa Mshahara
 DocType: Account,Bank,Benki
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Ndege
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Matatizo ya Matatizo
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Matatizo ya Matatizo
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Hitilafu imetokea wakati wa kuunda mara kwa mara
 DocType: Material Request Item,For Warehouse,Kwa Ghala
 DocType: Employee,Offer Date,Tarehe ya Kutoa
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Nukuu
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Wewe uko katika hali ya mkondo. Hutaweza kupakia upya mpaka una mtandao.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Wewe uko katika hali ya mkondo. Hutaweza kupakia upya mpaka una mtandao.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Hakuna Vikundi vya Wanafunzi vilivyoundwa.
 DocType: Purchase Invoice Item,Serial No,Serial No
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Kiwango cha Ushuru wa kila mwezi hawezi kuwa kubwa kuliko Kiwango cha Mikopo
@@ -3616,17 +3693,18 @@
 DocType: Salary Slip,Total Working Hours,Jumla ya Masaa ya Kazi
 DocType: Subscription,Next Schedule Date,Tarehe ya Ratiba iliyofuata
 DocType: Stock Entry,Including items for sub assemblies,Ikijumuisha vitu kwa makusanyiko ndogo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Ingiza thamani lazima iwe nzuri
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Wilaya zote
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Ingiza thamani lazima iwe nzuri
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Wilaya zote
 DocType: Purchase Invoice,Items,Vitu
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Mwanafunzi tayari amejiandikisha.
 DocType: Fiscal Year,Year Name,Jina la Mwaka
 DocType: Process Payroll,Process Payroll,Mchakato wa Mishahara
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Kuna sikukuu zaidi kuliko siku za kazi mwezi huu.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Kuna sikukuu zaidi kuliko siku za kazi mwezi huu.
 DocType: Product Bundle Item,Product Bundle Item,Bidhaa ya Bundle Item
 DocType: Sales Partner,Sales Partner Name,Jina la Mshirika wa Mauzo
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Ombi la Nukuu
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Ombi la Nukuu
 DocType: Payment Reconciliation,Maximum Invoice Amount,Kiasi cha Invoice Kiasi
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hematology
 DocType: Normal Test Items,Normal Test Items,Vipimo vya kawaida vya Mtihani
 DocType: Student Language,Student Language,Lugha ya Wanafunzi
 apps/erpnext/erpnext/config/selling.py +23,Customers,Wateja
@@ -3637,10 +3715,11 @@
 DocType: Issue,Opening Time,Wakati wa Ufunguzi
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Kutoka na Ili tarehe inahitajika
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Usalama &amp; Mchanganyiko wa Bidhaa
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Kitengo cha Mchapishaji cha Mchapishaji &#39;{0}&#39; lazima iwe sawa na katika Kigezo &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Kitengo cha Mchapishaji cha Mchapishaji &#39;{0}&#39; lazima iwe sawa na katika Kigezo &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Tumia Mahesabu
 DocType: Delivery Note Item,From Warehouse,Kutoka kwa Ghala
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Hakuna Vipengee Vipengee vya Vifaa vya Kutengeneza
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Hakuna Vipengee Vipengee vya Vifaa vya Kutengeneza
+DocType: Restaurant,Default Customer,Wateja wa Mteja
 DocType: Assessment Plan,Supervisor Name,Jina la Msimamizi
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Usihakikishe ikiwa uteuzi umeundwa kwa siku ile ile
 DocType: Program Enrollment Course,Program Enrollment Course,Kozi ya Usajili wa Programu
@@ -3667,7 +3746,7 @@
 DocType: Payment Entry,Internal Transfer,Uhamisho wa Ndani
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Akaunti ya watoto ipo kwa akaunti hii. Huwezi kufuta akaunti hii.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Vipi lengo la qty au kiasi lengo ni lazima
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Hakuna BOM ya default iliyopo kwa Bidhaa {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Hakuna BOM ya default iliyopo kwa Bidhaa {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Tafadhali chagua Tarehe ya Kuweka kwanza
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Tarehe ya Ufunguzi lazima iwe kabla ya Tarehe ya Kufungwa
 DocType: Leave Control Panel,Carry Forward,Endelea mbele
@@ -3702,6 +3781,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Jumla ya Sasa
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,Taarifa za Uhasibu
 DocType: Drug Prescription,Hour,Saa
+DocType: Restaurant Order Entry,Last Sales Invoice,Hati ya Mwisho ya Mauzo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Serial Mpya Hapana haiwezi kuwa na Ghala. Ghala lazima liwekewe na Entry Entry au Receipt ya Ununuzi
 DocType: Lead,Lead Type,Aina ya Kiongozi
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Huna mamlaka ya kupitisha majani kwenye Tarehe ya Kuzuia
@@ -3736,64 +3816,66 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Unda Watumiaji
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,Gramu
 DocType: Supplier Scorecard,Per Month,Kwa mwezi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Wingi wa Utengenezaji lazima uwe mkubwa kuliko 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Wingi wa Utengenezaji lazima uwe mkubwa kuliko 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Tembelea ripoti ya simu ya matengenezo.
 DocType: Stock Entry,Update Rate and Availability,Sasisha Kiwango na Upatikanaji
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Asilimia unaruhusiwa kupokea au kutoa zaidi dhidi ya kiasi kilichoamriwa. Kwa mfano: Ikiwa umeamuru vitengo 100. na Ruzuku lako ni 10% basi unaruhusiwa kupokea vitengo 110.
 DocType: POS Customer Group,Customer Group,Kundi la Wateja
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Kitambulisho kipya cha chaguo (Hiari)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Kitambulisho kipya cha chaguo (Hiari)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Akaunti ya gharama ni lazima kwa kipengee {0}
 DocType: BOM,Website Description,Website Description
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Mabadiliko ya Net katika Equity
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Karibuni zaidi
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Tafadhali cancel ankara ya Ununuzi {0} kwanza
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Anwani ya barua pepe inapaswa kuwa ya kipekee, tayari ipo kwa {0}"
 DocType: Serial No,AMC Expiry Date,Tarehe ya Kumalizika ya AMC
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,Receipt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,Receipt
 ,Sales Register,Daftari ya Mauzo
 DocType: Daily Work Summary Settings Company,Send Emails At,Tuma Barua pepe Kwa
 DocType: Quotation,Quotation Lost Reason,Sababu iliyopoteza Nukuu
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Chagua Domain yako
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',chagua * kutoka kwa tabPatient ambapo jina = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Rejea ya usafirishaji hakuna {0} dated {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Rejea ya usafirishaji hakuna {0} dated {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Hakuna kitu cha kuhariri.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Tazama Fomu
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Muhtasari wa mwezi huu na shughuli zinazosubiri
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Tazama Fomu
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Muhtasari wa mwezi huu na shughuli zinazosubiri
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Ongeza watumiaji kwenye shirika lako, isipokuwa wewe mwenyewe."
 DocType: Customer Group,Customer Group Name,Jina la Kundi la Wateja
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Hakuna Wateja bado!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Hakuna Wateja bado!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Taarifa ya Flow Flow
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kiasi cha Mkopo hawezi kuzidi Kiwango cha Mikopo ya Upeo wa {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Leseni
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Tafadhali ondoa hii ankara {0} kutoka C-Fomu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Tafadhali ondoa hii ankara {0} kutoka C-Fomu {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Tafadhali chagua Kuendeleza ikiwa unataka pia kuweka usawa wa mwaka uliopita wa fedha hadi mwaka huu wa fedha
 DocType: GL Entry,Against Voucher Type,Dhidi ya Aina ya Voucher
 DocType: Physician,Phone (R),Simu (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Muda wa muda umeongezwa
 DocType: Item,Attributes,Sifa
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Wezesha Kigezo
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Tafadhali weka Mfululizo wa Naming kwa {0} kupitia Setup&gt; Mipangilio&gt; Mfululizo wa Naming
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Tafadhali ingiza Akaunti ya Kuandika Akaunti
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Tarehe ya mwisho ya tarehe
 DocType: Patient,B Negative,B mbaya
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Akaunti {0} sio ya kampuni {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Nambari za Serial katika mstari {0} haifani na Kumbuka Utoaji
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Nambari za Serial katika mstari {0} haifani na Kumbuka Utoaji
 DocType: Student,Guardian Details,Maelezo ya Guardian
 DocType: C-Form,C-Form,Fomu ya C
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Attendance kwa wafanyakazi wengi
 DocType: Vehicle,Chassis No,Chassis No
 DocType: Payment Request,Initiated,Ilianzishwa
 DocType: Production Order,Planned Start Date,Tarehe ya Kuanza Iliyopangwa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Tafadhali chagua BOM
 DocType: Serial No,Creation Document Type,Aina ya Hati ya Uumbaji
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Tarehe ya mwisho lazima iwe kubwa kuliko tarehe ya kuanza
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Tarehe ya mwisho lazima iwe kubwa kuliko tarehe ya kuanza
 DocType: Leave Type,Is Encash,Ni Encash
 DocType: Leave Allocation,New Leaves Allocated,Majani mapya yamewekwa
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Data ya busara ya mradi haipatikani kwa Nukuu
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Mwisho
 DocType: Project,Expected End Date,Tarehe ya Mwisho Inayotarajiwa
 DocType: Budget Account,Budget Amount,Kiasi cha Bajeti
 DocType: Appraisal Template,Appraisal Template Title,Kitambulisho cha Kigezo cha Kigezo
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Tarehe Tarehe {0} kwa Mfanyakazi {1} haiwezi kuwa kabla ya tarehe ya kujiunga na mfanyakazi {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Biashara
 DocType: Patient,Alcohol Current Use,Pombe Sasa Matumizi
+DocType: Student Admission Program,Student Admission Program,Mpango wa Uingizaji wa Wanafunzi
 DocType: Payment Entry,Account Paid To,Akaunti Ililipwa
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Item ya Mzazi {0} haipaswi kuwa Item ya Hifadhi
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Bidhaa zote au Huduma.
@@ -3802,30 +3884,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Bajeti ya Akaunti {1} dhidi ya {2} {3} ni {4}. Itazidisha {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Akaunti {0} # Akaunti lazima iwe ya aina &#39;Mali isiyohamishika&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Nje ya Uchina
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Amri ya kuhesabu kiasi cha meli kwa ajili ya kuuza
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,na Walemavu wasiozuiwa katika
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Mfululizo ni lazima
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Huduma za Fedha
 DocType: Student Sibling,Student ID,Kitambulisho cha Mwanafunzi
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Aina ya shughuli za Kumbukumbu za Muda
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Barua ya Wasambazaji
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Aina ya shughuli za Kumbukumbu za Muda
 DocType: Tax Rule,Sales,Mauzo
 DocType: Stock Entry Detail,Basic Amount,Kiasi cha Msingi
 DocType: Training Event,Exam,Mtihani
 DocType: Complaint,Complaint,Malalamiko
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Ghala inayotakiwa kwa kipengee cha hisa {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Ghala inayotakiwa kwa kipengee cha hisa {0}
 DocType: Leave Allocation,Unused leaves,Majani yasiyotumika
 DocType: Patient,Alcohol Past Use,Pombe Matumizi ya Kale
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Hali ya kulipia
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Uhamisho
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Pata BOM ilipungua (ikiwa ni pamoja na mikutano ndogo)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Uhamisho
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Pata BOM ilipungua (ikiwa ni pamoja na mikutano ndogo)
 DocType: Authorization Rule,Applicable To (Employee),Inafaa kwa (Mfanyakazi)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Tarehe ya Kutokana ni ya lazima
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Tarehe ya Kutokana ni ya lazima
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Uingizaji wa Kushikilia {0} hauwezi kuwa 0
 DocType: Journal Entry,Pay To / Recd From,Kulipa / Recd Kutoka
 DocType: Naming Series,Setup Series,Mipangilio ya kuanzisha
 DocType: Payment Reconciliation,To Invoice Date,Kwa tarehe ya ankara
 DocType: Supplier,Contact HTML,Wasiliana HTML
 ,Inactive Customers,Wateja wasio na kazi
+DocType: Student Admission Program,Maximum Age,Umri wa Umri
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Receipts ya Ununuzi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,"Je, Sheria ya Pesa inatumikaje?"
@@ -3844,6 +3928,7 @@
 DocType: GL Entry,Remarks,Maelezo
 DocType: Payment Entry,Account Paid From,Akaunti Ililipwa Kutoka
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Msimbo wa Nakala ya Nyenzo
+DocType: Task,Parent Task,Kazi ya Mzazi
 DocType: Journal Entry,Write Off Based On,Andika Msaada
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Fanya Kiongozi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Chapisha na vifaa
@@ -3852,19 +3937,19 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Mshahara tayari umeongezwa kwa muda kati ya {0} na {1}, Kuacha kipindi cha maombi hawezi kuwa kati ya tarehe hii ya tarehe."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Rekodi ya ufungaji wa Nambari ya Serial
 DocType: Guardian Interest,Guardian Interest,Maslahi ya Guardian
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Weka maadili ya msingi ya POS ankara
 apps/erpnext/erpnext/config/hr.py +177,Training,Mafunzo
 DocType: Timesheet,Employee Detail,Maelezo ya Waajiriwa
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Barua ya barua pepe
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,Siku ya Tarehe inayofuata na kurudia siku ya mwezi lazima iwe sawa
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Siku ya Tarehe inayofuata na kurudia siku ya mwezi lazima iwe sawa
 DocType: Lab Prescription,Test Code,Kanuni ya mtihani
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Mipangilio ya ukurasa wa nyumbani wa wavuti
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQs haziruhusiwi kwa {0} kutokana na msimamo wa alama ya {1}
 DocType: Offer Letter,Awaiting Response,Inasubiri Jibu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Juu
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Jumla ya Kiasi {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Tabia isiyo sahihi {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Jumla ya Kiasi {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Tabia isiyo sahihi {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Eleza kama akaunti isiyo ya kawaida kulipwa
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Kitu kimoja kimeingizwa mara nyingi. {orodha}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Tafadhali chagua kikundi cha tathmini badala ya &#39;Makundi Yote ya Tathmini&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Row {0}: Kituo cha gharama kinahitajika kwa kipengee {1}
 DocType: Training Event Employee,Optional,Hiari
@@ -3887,19 +3972,20 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kituo cha Gharama ni lazima kwa Bidhaa {2}
 DocType: Vehicle,Policy No,Sera ya Sera
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Pata vipengee kutoka kwenye Mfuko wa Bidhaa
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Kama hisa iko juu ya kipengee {0}, huwezi kuwezesha ina mali tofauti"
 DocType: Asset,Straight Line,Sawa Mstari
 DocType: Project User,Project User,Mtumiaji wa Mradi
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Split
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Split
 DocType: GL Entry,Is Advance,Ni Mapema
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Kuhudhuria Kutoka Tarehe na Kuhudhuria hadi Tarehe ni lazima
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,"Tafadhali ingiza &#39;Je, unatetewa&#39; kama Ndiyo au Hapana"
+DocType: Item,Default Purchase Unit of Measure,Kitengo cha Ununuzi cha Default
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Tarehe ya Mawasiliano ya Mwisho
 DocType: Sales Team,Contact No.,Wasiliana Na.
 DocType: Bank Reconciliation,Payment Entries,Entries ya Malipo
 DocType: Production Order,Scrap Warehouse,Ghala la Ghala
 DocType: Production Order,Check if material transfer entry is not required,Angalia ikiwa kuingizwa kwa nyenzo haifai
 DocType: Program Enrollment Tool,Get Students From,Pata Wanafunzi Kutoka
-DocType: Hub Settings,Seller Country,Nchi ya muuzaji
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Chapisha Items kwenye tovuti
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Shirikisha wanafunzi wako katika makundi
 DocType: Authorization Rule,Authorization Rule,Sheria ya Uidhinishaji
@@ -3909,7 +3995,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Kigezo cha Malipo na Malipo
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Jumla (Mikopo)
 DocType: Repayment Schedule,Payment Date,Tarehe ya Malipo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Uchina Mpya
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Uchina Mpya
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Nguo &amp; Accessories
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,Haikuweza kutatua kazi ya alama ya uzito. Hakikisha fomu hiyo halali.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Idadi ya Utaratibu
@@ -3927,6 +4013,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Malipo {1} haiwezi kufungwa, tayari ni {2}"
 DocType: Tax Rule,Billing Country,Nchi ya kulipia
 DocType: Purchase Order Item,Expected Delivery Date,Tarehe ya Utoaji Inayotarajiwa
+DocType: Restaurant Order Entry,Restaurant Order Entry,Mkahawa wa Kuingia Uagizaji
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit na Mikopo si sawa kwa {0} # {1}. Tofauti ni {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Gharama za Burudani
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Fanya ombi la Nyenzo
@@ -3939,9 +4026,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Akaunti na shughuli zilizopo haziwezi kufutwa
 DocType: Vehicle,Last Carbon Check,Check Carbon Mwisho
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Gharama za Kisheria
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Tafadhali chagua kiasi kwenye mstari
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Tafadhali chagua kiasi kwenye mstari
 DocType: Purchase Invoice,Posting Time,Wakati wa Kuchapa
 DocType: Timesheet,% Amount Billed,Kiasi kinachojazwa
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Muda kwa Uteuzi&quot; haujawekwa kwa Dr {0}. Ongeza kwenye Mwalimu wa daktari.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Malipo ya Simu
 DocType: Sales Partner,Logo,Rangi
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Angalia hii ikiwa unataka kulazimisha mtumiaji kuchagua mfululizo kabla ya kuokoa. Hutakuwa na default ikiwa utaangalia hii.
@@ -3952,6 +4040,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Mapato ya Wateja Mpya
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Gharama za kusafiri
 DocType: Maintenance Visit,Breakdown,Kuvunja
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Ongeza usajili wa desturi kwenye mafundisho {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Akaunti: {0} kwa fedha: {1} haiwezi kuchaguliwa
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Sasisha BOM gharama moja kwa moja kupitia Mpangilio, kwa kuzingatia kiwango cha hivi karibuni cha kiwango cha bei / bei ya bei / mwisho wa ununuzi wa vifaa vya malighafi."
 DocType: Bank Reconciliation Detail,Cheque Date,Tarehe ya Kuangalia
@@ -3976,7 +4065,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Jumla ya Kiwango cha Ulipaji (kupitia Vitambulisho vya Muda)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Idha ya Wasambazaji
 DocType: Payment Request,Payment Gateway Details,Maelezo ya Gateway ya Malipo
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Wingi wanapaswa kuwa mkubwa kuliko 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Wingi wanapaswa kuwa mkubwa kuliko 0
 DocType: Journal Entry,Cash Entry,Kuingia kwa Fedha
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Node za watoto zinaweza kuundwa tu chini ya nambari za aina ya &#39;Kikundi&#39;
 DocType: Leave Application,Half Day Date,Tarehe ya Nusu ya Siku
@@ -3993,12 +4082,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Kumbuka: Kipengee {0} kiliingizwa mara nyingi
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Mawasiliano Yote.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Hali ya Kampuni
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Mtumiaji {0} haipo
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Mtumiaji {0} haipo
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Hali
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Kuingia kwa Malipo tayari kuna
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Sio kuchapishwa tangu {0} inapozidi mipaka
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Mshauri wa template mshahara.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Patholojia
+DocType: Restaurant Order Entry,Restaurant Table,Jedwali la Mgahawa
 DocType: Leave Type,Max Days Leave Allowed,Siku za Max Zimekwisha Kuruhusiwa
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Weka Kanuni ya Ushuru kwa gari la ununuzi
 DocType: Purchase Invoice,Taxes and Charges Added,Kodi na Malipo Aliongeza
@@ -4010,10 +4101,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Quotes Kuongoza au Wateja.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Kazi Imeruhusiwa kuhariri hisa zilizohifadhiwa
 ,Territory Target Variance Item Group-Wise,Ugawanyiko wa Target Kikundi Kikundi-Hekima
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Vikundi vyote vya Wateja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Vikundi vyote vya Wateja
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Imekusanywa kila mwezi
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ni lazima. Kumbukumbu ya Kubadilisha Fedha Labda haikuundwa kwa {1} kwa {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Kigezo cha Kodi ni lazima.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Kigezo cha Kodi ni lazima.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Akaunti {0}: Akaunti ya Mzazi {1} haipo
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Orodha ya Bei ya Thamani (Fedha la Kampuni)
 DocType: Products Settings,Products Settings,Mipangilio ya Bidhaa
@@ -4039,12 +4130,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Jedwali Maelezo ya kodi ya busara
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Usanidi wa Taasisi
 ,Item-wise Price List Rate,Orodha ya bei ya bei ya bei
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Nukuu ya Wafanyabiashara
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Nukuu ya Wafanyabiashara
 DocType: Quotation,In Words will be visible once you save the Quotation.,Katika Maneno itaonekana wakati unapohifadhi Nukuu.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Wingi ({0}) hawezi kuwa sehemu ya mstari {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Barcode {0} tayari kutumika katika Item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Barcode {0} tayari kutumika katika Item {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Sheria ya kuongeza gharama za meli.
 DocType: Item,Opening Stock,Ufunguzi wa Hifadhi
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Wateja inahitajika
@@ -4062,9 +4153,8 @@
 DocType: Customer,From Lead,Kutoka Kiongozi
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Amri iliyotolewa kwa ajili ya uzalishaji.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Chagua Mwaka wa Fedha ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,Profaili ya POS inahitajika ili ufanye POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,Profaili ya POS inahitajika ili ufanye POS Entry
 DocType: Program Enrollment Tool,Enroll Students,Jiandikisha Wanafunzi
-DocType: Hub Settings,Name Token,Jina la Tokeni
 DocType: Lab Test,Approved Date,Tarehe iliyoidhinishwa
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Uuzaji wa kawaida
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Atleast ghala moja ni lazima
@@ -4082,7 +4172,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Rasilimali watu
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Malipo ya Upatanisho wa Malipo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Mali ya Kodi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Utaratibu wa Uzalishaji umekuwa {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Utaratibu wa Uzalishaji umekuwa {0}
 DocType: BOM Item,BOM No,BOM Hapana
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Uingiaji wa Vitambulisho {0} hauna akaunti {1} au tayari imefananishwa dhidi ya vyeti vingine
@@ -4102,7 +4192,7 @@
 DocType: Currency Exchange,To Currency,Ili Fedha
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Ruhusu watumiaji wafuatayo kupitisha Maombi ya Kuacha kwa siku za kuzuia.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Aina ya Madai ya Madai.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Kiwango cha kuuza kwa kipengee {0} ni cha chini kuliko {1} yake. Kiwango cha uuzaji kinapaswa kuwa salama {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Kiwango cha kuuza kwa kipengee {0} ni cha chini kuliko {1} yake. Kiwango cha uuzaji kinapaswa kuwa salama {2}
 DocType: Item,Taxes,Kodi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Ilipwa na Haijaokolewa
 DocType: Project,Default Cost Center,Kituo cha Ghali cha Default
@@ -4116,15 +4206,15 @@
 DocType: Employee Loan,Fully Disbursed,Kutengwa kabisa
 DocType: Maintenance Visit,Customer Feedback,Maoni ya Wateja
 DocType: Account,Expense,Gharama
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Alama haiwezi kuwa kubwa zaidi kuliko alama ya Maximum
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Alama haiwezi kuwa kubwa zaidi kuliko alama ya Maximum
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Wateja na Wauzaji
 DocType: Item Attribute,From Range,Kutoka Mbalimbali
 DocType: BOM,Set rate of sub-assembly item based on BOM,Weka kiwango cha kipengee kidogo cha mkutano kulingana na BOM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Hitilafu ya Syntax katika fomu au hali: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Hitilafu ya Syntax katika fomu au hali: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Mtaalam wa Mipangilio ya Kazi ya Kila siku
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,Kipengee {0} kinachunguzwa kwani si kitu cha hisa
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Tuma Utaratibu huu wa Uzalishaji wa usindikaji zaidi.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Tuma Utaratibu huu wa Uzalishaji wa usindikaji zaidi.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Ili kuomba Sheria ya bei katika shughuli fulani, Sheria zote za Bei lazima zimezimwa."
 DocType: Assessment Group,Parent Assessment Group,Kundi la Tathmini ya Mzazi
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Kazi
@@ -4141,12 +4231,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Tafadhali weka Chujio cha Kampuni kikiwa tupu ikiwa Kundi Na &#39;Kampuni&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Tarehe ya Kuchapisha haiwezi kuwa tarehe ya baadaye
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} hailingani na {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,kwa kuzalisha mara kwa mara
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Kuondoka kwa kawaida
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Mtihani wa UAM wa Lab.
 DocType: Batch,Batch ID,Kitambulisho cha Bundi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Kumbuka: {0}
 ,Delivery Note Trends,Mwelekeo wa Kumbuka Utoaji
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Muhtasari wa wiki hii
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Muhtasari wa wiki hii
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Katika Stock
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Akaunti: {0} inaweza kurekebishwa tu kupitia Ushirikiano wa Hifadhi
 DocType: Student Group Creation Tool,Get Courses,Pata Mafunzo
@@ -4160,7 +4251,6 @@
 DocType: Purchase Order,To Bill,Kwa Bill
 DocType: Material Request,% Ordered,Aliamriwa
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Kwa Kundi la Wanafunzi la msingi, Kozi itastahikiwa kwa kila Mwanafunzi kutoka Kozi zilizosajiliwa katika Uandikishaji wa Programu."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Ingiza Anwani ya barua pepe iliyotengwa na visa, ankara itatumwa moja kwa moja tarehe fulani"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Piecework
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Mg. Kiwango cha kununua
 DocType: Task,Actual Time (in Hours),Muda halisi (katika Masaa)
@@ -4174,7 +4264,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Kipengee {0} sio kuanzisha kwa Nakala Zetu. Sawa lazima iwe tupu
 DocType: Accounts Settings,Accounts Settings,Mipangilio ya Akaunti
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,Thibitisha
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Hakuna matokeo ya kuwasilisha
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Hakuna matokeo ya kuwasilisha
 DocType: Customer,Sales Partner and Commission,Mshirika wa Mauzo na Tume
 DocType: Employee Loan,Rate of Interest (%) / Year,Kiwango cha Maslahi (%) / Mwaka
 ,Project Quantity,Mradi wa Wingi
@@ -4185,55 +4275,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Nyeusi
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Bidhaa ya Mlipuko
 DocType: Account,Auditor,Mkaguzi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} vitu vilivyotengenezwa
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} vitu vilivyotengenezwa
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Jifunze zaidi
 DocType: Cheque Print Template,Distance from top edge,Umbali kutoka makali ya juu
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Orodha ya Bei {0} imezimwa au haipo
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Orodha ya Bei {0} imezimwa au haipo
 DocType: Purchase Invoice,Return,Rudi
 DocType: Production Order Operation,Production Order Operation,Uendeshaji wa Utaratibu wa Uzalishaji
 DocType: Pricing Rule,Disable,Zima
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Njia ya kulipa inahitajika kufanya malipo
 DocType: Project Task,Pending Review,Mapitio Yasubiri
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Uteuzi na Ushauri
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} haijasajiliwa katika Batch {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} haijasajiliwa katika Batch {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Malipo {0} hayawezi kupigwa, kama tayari {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Madai ya jumla ya gharama (kupitia madai ya gharama)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Weka alama
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Fedha ya BOM # {1} inapaswa kuwa sawa na sarafu iliyochaguliwa {2}
 DocType: Journal Entry Account,Exchange Rate,Kiwango cha Exchange
 DocType: Patient,Additional information regarding the patient,Maelezo ya ziada kuhusu mgonjwa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Sheria ya Mauzo {0} haijawasilishwa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Sheria ya Mauzo {0} haijawasilishwa
 DocType: Homepage,Tag Line,Mstari wa Tag
 DocType: Fee Component,Fee Component,Fomu ya Malipo
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Usimamizi wa Fleet
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Ongeza vitu kutoka
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Usimamizi wa Fleet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Ongeza vitu kutoka
 DocType: Cheque Print Template,Regular,Mara kwa mara
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Jumla ya uzito wa Vigezo vyote vya Tathmini lazima iwe 100%
-DocType: BOM,Last Purchase Rate,Kiwango cha Mwisho cha Ununuzi
+DocType: Purchase Order Item,Last Purchase Rate,Kiwango cha Mwisho cha Ununuzi
 DocType: Account,Asset,Mali
 DocType: Project Task,Task ID,Kitambulisho cha Task
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Hifadhi haipatikani kwa Item {0} tangu ina tofauti
 DocType: Lab Test,Mobile,Rununu
 ,Sales Person-wise Transaction Summary,Muhtasari wa Shughuli za Wafanyabiashara wa Mauzo
 DocType: Training Event,Contact Number,Namba ya mawasiliano
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Ghala {0} haipo
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Jisajili kwa ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Ghala {0} haipo
 DocType: Monthly Distribution,Monthly Distribution Percentages,Asilimia ya Usambazaji wa Kila mwezi
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Bidhaa iliyochaguliwa haiwezi kuwa na Batch
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Kiwango cha kiwango cha thamani haipatikani kwa Bidhaa {0}, ambayo inahitajika kufanya fomu za uhasibu kwa {1} {2}. Ikiwa kipengee kinatumia kama sampuli ya kipengee katika {1}, tafadhali angalia kuwa katika {1} meza ya jedwali. Vinginevyo, tafadhali tengeneza shughuli za hisa zinazoingia kwa kipengee au tumaja kiwango cha hesabu katika rekodi ya Bidhaa, kisha jaribu kuwasilisha / kufuta kufungua hii"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% ya vifaa vinavyotolewa dhidi ya Kumbuka Utoaji huu
+DocType: Training Event,Has Certificate,Ina Cheti
 DocType: Project,Customer Details,Maelezo ya Wateja
 DocType: Employee,Reports to,Ripoti kwa
 ,Unpaid Expense Claim,Madai ya gharama ya kulipwa
 DocType: Payment Entry,Paid Amount,Kiwango kilicholipwa
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Pitia Mzunguko wa Mauzo
 DocType: Assessment Plan,Supervisor,Msimamizi
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,Online
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,Online
 ,Available Stock for Packing Items,Inapatikana Stock kwa Vipuri vya Ufungashaji
 DocType: Item Variant,Item Variant,Tofauti ya Tofauti
 DocType: Assessment Result Tool,Assessment Result Tool,Kitabu cha Matokeo ya Tathmini
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Kipengee cha Bidhaa
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Maagizo yaliyowasilishwa hayawezi kufutwa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Maagizo yaliyowasilishwa hayawezi kufutwa
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Usawa wa Akaunti tayari katika Debit, huruhusiwi kuweka &#39;Mizani lazima iwe&#39; kama &#39;Mikopo&#39;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Usimamizi wa Ubora
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Item {0} imezimwa
@@ -4253,7 +4342,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: Muda unapingana na mstari {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Ruhusu Kiwango cha Vigezo vya Zero
 DocType: Training Event Employee,Invited,Alialikwa
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Miundo ya Mishahara yenye kazi nyingi inayopatikana kwa mfanyakazi {0} kwa tarehe zilizopewa
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Miundo ya Mishahara yenye kazi nyingi inayopatikana kwa mfanyakazi {0} kwa tarehe zilizopewa
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Akaunti za Kuweka Gateway.
 DocType: Employee,Employment Type,Aina ya Ajira
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Mali za kudumu
@@ -4265,7 +4354,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Kitambulisho cha Barua ya Wanafunzi
 DocType: Employee,Notice (days),Angalia (siku)
 DocType: Tax Rule,Sales Tax Template,Kigezo cha Kodi ya Mauzo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Chagua vitu ili uhifadhi ankara
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Chagua vitu ili uhifadhi ankara
 DocType: Employee,Encashment Date,Tarehe ya Kuingiza
 DocType: Training Event,Internet,Internet
 DocType: Special Test Template,Special Test Template,Kigezo cha Mtihani maalum
@@ -4274,7 +4363,7 @@
 DocType: Production Order,Planned Operating Cost,Gharama za uendeshaji zilizopangwa
 DocType: Academic Term,Term Start Date,Tarehe ya Mwisho wa Mwisho
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Upinzani wa Opp
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Tafadhali pata masharti {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Tafadhali pata masharti {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Usawa wa Taarifa ya Benki kama kwa Jedwali Mkuu
 DocType: Job Applicant,Applicant Name,Jina la Msaidizi
 DocType: Authorization Rule,Customer / Item Name,Jina la Wateja / Bidhaa
@@ -4294,7 +4383,7 @@
 DocType: Guardian,Guardian Of ,Mlezi wa
 DocType: Grading Scale Interval,Threshold,Kizuizi
 DocType: BOM Update Tool,Current BOM,BOM ya sasa
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Ongeza No ya Serial
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Ongeza No ya Serial
 DocType: Production Order Item,Available Qty at Source Warehouse,Uchina Inapatikana kwenye Ghala la Chanzo
 apps/erpnext/erpnext/config/support.py +22,Warranty,Warranty
 DocType: Purchase Invoice,Debit Note Issued,Kumbuka ya Debit imeondolewa
@@ -4317,10 +4406,9 @@
 DocType: Account,Receivable,Inapatikana
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Hairuhusiwi kubadili Wasambazaji kama Ununuzi wa Utaratibu tayari upo
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Jukumu ambalo linaruhusiwa kuwasilisha ushirikiano unaozidi mipaka ya mikopo.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Chagua Vitu Ili Kukuza
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Usawazishaji wa data ya Mwalimu, inaweza kuchukua muda"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Chagua Vitu Ili Kukuza
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Usawazishaji wa data ya Mwalimu, inaweza kuchukua muda"
 DocType: Item,Material Issue,Matatizo ya Nyenzo
-DocType: Hub Settings,Seller Description,Maelezo ya muuzaji
 DocType: Employee Education,Qualification,Ustahili
 DocType: Item Price,Item Price,Item Bei
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sabuni &amp; Daktari
@@ -4328,7 +4416,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Kutoka Muda haiwezi kuwa kubwa zaidi kuliko Ili Muda.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Picha na Video ya Mwendo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Amri
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Rejea
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Rejea
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,Ikiwa imewezeshwa mfumo hautasasisha mashamba ya vipengee kutoka kwa template lakini itasakili data ya mashamba yaliyotajwa hapo chini wakati wa kufanya aina mpya
 DocType: Salary Detail,Component,Kipengele
 DocType: Assessment Criteria,Assessment Criteria Group,Makundi ya Vigezo vya Tathmini
 DocType: Healthcare Settings,Patient Name By,Jina la Mgonjwa Na
@@ -4338,7 +4427,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Tafadhali ingiza Uwezeshaji au Kuidhinisha Mtumiaji
 DocType: Journal Entry,Write Off Entry,Andika Entry Entry
 DocType: BOM,Rate Of Materials Based On,Kiwango cha Vifaa vya msingi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Wasambazaji&gt; Aina ya Wasambazaji
+DocType: Item Variant Settings,Do not Update Variants,"Je, si Mwisho Badiliko"
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics ya msaada
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Futa yote
 DocType: POS Profile,Terms and Conditions,Sheria na Masharti
@@ -4347,7 +4436,7 @@
 DocType: Leave Block List,Applies to Company,Inahitajika kwa Kampuni
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,Haiwezi kufuta kwa sababu In Entry In Stock {0} ipo
 DocType: Employee Loan,Disbursement Date,Tarehe ya Malipo
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;Waliopokea&#39; sio maalum
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Waliopokea&#39; sio maalum
 DocType: BOM Update Tool,Update latest price in all BOMs,Sasisha bei ya hivi karibuni katika BOM zote
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Rekodi ya Matibabu
 DocType: Vehicle,Vehicle,Gari
@@ -4362,14 +4451,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Upinzani / Kiongozi%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Upungufu wa Mali na Mizani
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Kiasi {0} {1} kilichohamishwa kutoka {2} hadi {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Kiasi {0} {1} kilichohamishwa kutoka {2} hadi {3}
 DocType: Sales Invoice,Get Advances Received,Pata Mafanikio Yaliyopokelewa
 DocType: Email Digest,Add/Remove Recipients,Ongeza / Ondoa Wapokeaji
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Shughuli haziruhusiwi dhidi ya Kudhibiti Utaratibu wa Uzalishaji {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Ili kuweka Mwaka huu wa Fedha kama Msingi, bonyeza &#39;Weka kama Msingi&#39;"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Jiunge
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Jiunge
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Uchina wa Ufupi
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Tofauti ya kipengee {0} ipo na sifa sawa
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Tofauti ya kipengee {0} ipo na sifa sawa
 DocType: Employee Loan,Repay from Salary,Malipo kutoka kwa Mshahara
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Inalipa malipo dhidi ya {0} {1} kwa kiasi {2}
@@ -4382,7 +4471,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Bidhaa ya Uagizaji wa Mauzo
 DocType: Salary Slip,Payment Days,Siku za Malipo
 DocType: Patient,Dormant,Imekaa
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Maghala yenye nodes ya watoto hawezi kubadilishwa kwenye kiongozi
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Maghala yenye nodes ya watoto hawezi kubadilishwa kwenye kiongozi
 DocType: BOM,Manage cost of operations,Dhibiti gharama za shughuli
 DocType: Accounts Settings,Stale Days,Siku za Stale
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Wakati shughuli zozote zilizotajwa zimepewa &quot;Kutumwa&quot;, barua pepe ya pop-up imefunguliwa moja kwa moja ili kutuma barua pepe kwa &quot;Mawasiliano&quot; inayohusishwa katika shughuli hiyo, pamoja na shughuli kama kiambatisho. Mtumiaji anaweza au hawezi kutuma barua pepe."
@@ -4396,10 +4485,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Hakuna Serial {0} tayari imepokea
 ,Requested Items To Be Transferred,Vitu Vilivyoombwa Ili Kuhamishwa
 DocType: Expense Claim,Vehicle Log,Ingia ya Magari
-DocType: Purchase Invoice,Recurring Id,Id inayoendelea
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),Uwepo wa homa (temp&gt; 38.5 ° C / 101.3 ° F au temp.) 38 ° C / 100.4 ° F)
 DocType: Customer,Sales Team Details,Maelezo ya Timu ya Mauzo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Futa kwa kudumu?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Futa kwa kudumu?
 DocType: Expense Claim,Total Claimed Amount,Kiasi kilichodaiwa
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Uwezo wa fursa za kuuza.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Inalidhika {0}
@@ -4409,7 +4497,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Idara ya maduka
 ,Item Delivery Date,Tarehe ya Utoaji wa Item
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Weka Shule yako katika ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Weka Shule yako katika ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Kiwango cha Mabadiliko ya Msingi (Fedha la Kampuni)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Hakuna kuingizwa kwa uhasibu kwa maghala yafuatayo
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Hifadhi hati kwanza.
@@ -4421,13 +4509,12 @@
 DocType: Task,Is Milestone,Ni muhimu sana
 DocType: Daily Work Summary,Email Sent To,Imepelekwa kwa barua pepe
 DocType: Budget,Warn,Tahadhari
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Una uhakika unataka kusajili?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Maneno mengine yoyote, jitihada zinazostahili ambazo zinapaswa kuingia kwenye rekodi."
 DocType: BOM,Manufacturing User,Mtengenezaji wa Viwanda
 DocType: Purchase Invoice,Raw Materials Supplied,Vifaa vya Malighafi hutolewa
-DocType: Purchase Invoice,Recurring Print Format,Mpangilio wa Kuchapisha Uliopita
 DocType: C-Form,Series,Mfululizo
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Fedha ya orodha ya bei {0} lazima iwe {1} au {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Ongeza Bidhaa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Fedha ya orodha ya bei {0} lazima iwe {1} au {2}
 DocType: Appraisal,Appraisal Template,Kigezo cha Uhakiki
 DocType: Item Group,Item Classification,Uainishaji wa Bidhaa
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Meneja wa Maendeleo ya Biashara
@@ -4441,7 +4528,7 @@
 DocType: Item Attribute Value,Attribute Value,Thamani ya Thamani
 ,Itemwise Recommended Reorder Level,Inemwise Inapendekezwa Mpangilio wa Mpangilio
 DocType: Salary Detail,Salary Detail,Maelezo ya Mshahara
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Tafadhali chagua {0} kwanza
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Tafadhali chagua {0} kwanza
 DocType: Appointment Type,Physician,Daktari
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Kipengee {0} cha Bidhaa {1} kimekamilika.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Majadiliano
@@ -4452,9 +4539,9 @@
 DocType: Salary Detail,Default Amount,Kiasi cha malipo
 DocType: Lab Test Template,Descriptive,Maelezo
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Ghala haipatikani kwenye mfumo
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Muhtasari wa Mwezi huu
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Muhtasari wa Mwezi huu
 DocType: Quality Inspection Reading,Quality Inspection Reading,Uhakiki wa Uhakiki wa Ubora
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,&#39;Punguza Hifadhi za Kale kuliko `lazima iwe ndogo kuliko siku% d.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,'Zuia Hifadhi za Bidha za Kale Kuliko` lazima iwe ndogo kuliko siku% d.
 DocType: Tax Rule,Purchase Tax Template,Kigezo cha Kodi ya Ununuzi
 apps/erpnext/erpnext/utilities/user_progress.py +45,Set a sales goal you'd like to achieve for your company.,Weka lengo la mauzo ungependa kufikia kwa kampuni yako.
 ,Project wise Stock Tracking,Ufuatiliaji wa Hitilafu wa Mradi
@@ -4475,12 +4562,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Mafunzo ya Matukio / Matokeo
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Kushuka kwa thamani kwa wakati
 DocType: Sales Invoice,C-Form Applicable,Fomu ya C inahitajika
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Muda wa Uendeshaji lazima uwe mkubwa kuliko 0 kwa Uendeshaji {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Muda wa Uendeshaji lazima uwe mkubwa kuliko 0 kwa Uendeshaji {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Ghala ni lazima
 DocType: Supplier,Address and Contacts,Anwani na Mawasiliano
 DocType: UOM Conversion Detail,UOM Conversion Detail,Maelezo ya Uongofu wa UOM
 DocType: Program,Program Abbreviation,Hali ya Mpangilio
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Utaratibu wa Uzalishaji hauwezi kuinuliwa dhidi ya Kigezo cha Bidhaa
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Utaratibu wa Uzalishaji hauwezi kuinuliwa dhidi ya Kigezo cha Bidhaa
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Malipo yanasasishwa katika Receipt ya Ununuzi dhidi ya kila kitu
 DocType: Warranty Claim,Resolved By,Ilifanywa na
 DocType: Bank Guarantee,Start Date,Tarehe ya Mwanzo
@@ -4506,26 +4593,27 @@
 DocType: Employee,Educational Qualification,Ufanisi wa Elimu
 DocType: Workstation,Operating Costs,Gharama za uendeshaji
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Hatua kama Bajeti ya Mwezi Yote Ilipatikana
-DocType: Purchase Invoice,Submit on creation,Wasilisha kwenye uumbaji
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Fedha ya {0} lazima iwe {1}
+DocType: Subscription,Submit on creation,Wasilisha kwenye uumbaji
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Fedha ya {0} lazima iwe {1}
 DocType: Asset,Disposal Date,Tarehe ya kupoteza
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Barua pepe zitatumwa kwa Wafanyakazi wote wa Kampuni katika saa iliyotolewa, ikiwa hawana likizo. Muhtasari wa majibu itatumwa usiku wa manane."
 DocType: Employee Leave Approver,Employee Leave Approver,Msaidizi wa Kuondoa Waajiri
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Kuingilia upya tayari kunapo kwa ghala hili {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Haiwezi kutangaza kama kupotea, kwa sababu Nukuu imefanywa."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Mafunzo ya Mafunzo
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Kuingilia upya tayari kunapo kwa ghala hili {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Haiwezi kutangaza kama kupotea, kwa sababu Nukuu imefanywa."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Mafunzo ya Mafunzo
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Utaratibu wa Uzalishaji {0} lazima uwasilishwe
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Vigezo vya Scorecard za Wasambazaji
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Tafadhali chagua tarehe ya kuanza na tarehe ya mwisho ya kipengee {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Kozi ni lazima katika mstari {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Hadi sasa haiwezi kuwa kabla kabla ya tarehe
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Ongeza / Hariri Bei
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Ongeza / Hariri Bei
 DocType: Batch,Parent Batch,Kundi cha Mzazi
 DocType: Cheque Print Template,Cheque Print Template,Angalia Kigezo cha Print
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Chati ya Vituo vya Gharama
 DocType: Lab Test Template,Sample Collection,Mkusanyiko wa Mfano
 ,Requested Items To Be Ordered,Vitu Vilivyoombwa Ili Kuagizwa
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Amri Zangu
 DocType: Price List,Price List Name,Jina la Orodha ya Bei
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Muhtasari wa Kazi ya Kila siku kwa {0}
 DocType: Employee Loan,Totals,Jumla
@@ -4543,12 +4631,12 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Valid till date cannot be before transaction date,Halali hadi tarehe haiwezi kuwa kabla ya tarehe ya shughuli
 DocType: Fee Schedule,Student Category,Jamii ya Wanafunzi
 DocType: Announcement,Student,Mwanafunzi
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Shirika la kitengo (idara) bwana.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Shirika la kitengo (idara) bwana.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Nenda kwenye Vyumba
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Tafadhali ingiza ujumbe kabla ya kutuma
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,DUPLICATE KWA MFASHAJI
 DocType: Email Digest,Pending Quotations,Nukuu zinazopendu
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Ushauri wa Maandishi ya Uhakika
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Ushauri wa Maandishi ya Uhakika
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Mipangilio ya Majaribio ya Lab.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Mikopo isiyohakikishiwa
 DocType: Cost Center,Cost Center Name,Jina la Kituo cha Gharama
@@ -4558,6 +4646,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Jumla ya malipo ya Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Ujumbe mkubwa kuliko wahusika 160 utagawanywa katika ujumbe nyingi
 DocType: Purchase Receipt Item,Received and Accepted,Imepokea na Kukubaliwa
+DocType: Hub Settings,Company and Seller Profile,Kampuni na Profaili ya Wauzaji
 ,GST Itemised Sales Register,GST Register Itemized Sales Register
 ,Serial No Service Contract Expiry,Serial Hakuna Mpangilio wa Mkataba wa Huduma
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Huwezi kulipa mikopo na kulipa akaunti sawa wakati huo huo
@@ -4567,10 +4656,11 @@
 DocType: Item,Variant Based On,Tofauti kulingana na
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Jumla ya uzito uliopangwa lazima iwe 100%. Ni {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Wauzaji wako
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Tafadhali sahihisha
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Haiwezi kuweka kama Lost kama Mauzo Order inafanywa.
 DocType: Request for Quotation Item,Supplier Part No,Sehemu ya Wafanyabiashara No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Haiwezi kufuta wakati kiwanja ni kwa &#39;Valuation&#39; au &#39;Vikwazo na Jumla&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Imepokea Kutoka
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Imepokea Kutoka
 DocType: Lead,Converted,Ilibadilishwa
 DocType: Item,Has Serial No,Ina Serial No
 DocType: Employee,Date of Issue,Tarehe ya Suala
@@ -4578,7 +4668,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Kwa mujibu wa Mipangilio ya Ununuzi ikiwa Ununuzi wa Reciept Inahitajika == &#39;Ndiyo&#39;, kisha kwa Kujenga Invoice ya Ununuzi, mtumiaji haja ya kuunda Receipt ya Ununuzi kwanza kwa kipengee {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Row # {0}: Weka wauzaji kwa kipengee {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Row {0}: Thamani ya saa lazima iwe kubwa kuliko sifuri.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Image ya tovuti {0} iliyoambatana na Item {1} haiwezi kupatikana
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Image ya tovuti {0} iliyoambatana na Item {1} haiwezi kupatikana
 DocType: Issue,Content Type,Aina ya Maudhui
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Kompyuta
 DocType: Item,List this Item in multiple groups on the website.,Andika kitu hiki katika makundi mengi kwenye tovuti.
@@ -4589,14 +4679,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Pata Maingiliano yasiyotambulika
 DocType: Payment Reconciliation,From Invoice Date,Kutoka tarehe ya ankara
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Huna idhini ya kuwasilisha
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,Sarafu ya kulipia lazima iwe sawa na sarafu ya msingi ya comapany au sarafu ya akaunti ya chama
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Sarafu ya kulipia lazima iwe sawa na sarafu ya msingi ya comapany au sarafu ya akaunti ya chama
 DocType: Healthcare Settings,Laboratory Settings,Mazingira ya Maabara
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Acha Acha
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Inafanya nini?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Kwa Ghala
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Uingizaji wa Wanafunzi wote
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Inafanya nini?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Kwa Ghala
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Uingizaji wa Wanafunzi wote
 ,Average Commission Rate,Wastani wa Tume ya Kiwango
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,&#39;Ina Serial No&#39; haiwezi kuwa &#39;Ndio&#39; kwa bidhaa zisizo za hisa
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,&#39;Ina Serial No&#39; haiwezi kuwa &#39;Ndio&#39; kwa bidhaa zisizo za hisa
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Chagua Hali
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Mahudhurio hayawezi kutambuliwa kwa tarehe za baadaye
 DocType: Pricing Rule,Pricing Rule Help,Msaada wa Kanuni ya bei
@@ -4614,40 +4704,40 @@
 DocType: Item,Customer Code,Kanuni ya Wateja
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Kikumbusho cha Kuzaliwa kwa {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Siku Tangu Toleo la Mwisho
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Debit Kwa akaunti lazima iwe Hesabu ya Hesabu ya Hesabu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Debit Kwa akaunti lazima iwe Hesabu ya Hesabu ya Hesabu
 DocType: Buying Settings,Naming Series,Mfululizo wa majina
 DocType: Leave Block List,Leave Block List Name,Acha jina la orodha ya kuzuia
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Tarehe ya kuanza kwa bima inapaswa kuwa chini ya tarehe ya mwisho ya Bima
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Tafadhali kuanzisha Mfumo wa Kuitwa Msaidizi katika Shule&gt; Mipangilio ya Shule
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Mali ya Hifadhi
 DocType: Timesheet,Production Detail,Maelezo ya Uzalishaji
+DocType: Restaurant,Active Menu,Menyu ya Kazi
 DocType: Target Detail,Target Qty,Uchina wa Target
 DocType: Shopping Cart Settings,Checkout Settings,Mipangilio ya Checkout
 DocType: Attendance,Present,Sasa
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Kumbuka Utoaji {0} haipaswi kuwasilishwa
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Kumbuka Utoaji {0} haipaswi kuwasilishwa
 DocType: Notification Control,Sales Invoice Message,Ujumbe wa Invoice ya Mauzo
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Akaunti ya kufungwa {0} lazima iwe ya Dhima / Usawa wa aina
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Kulipwa kwa mshahara wa mfanyakazi {0} tayari kuundwa kwa karatasi ya muda {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Kulipwa kwa mshahara wa mfanyakazi {0} tayari kuundwa kwa karatasi ya muda {1}
 DocType: Vehicle Log,Odometer,Odometer
 DocType: Sales Order Item,Ordered Qty,Iliyoamriwa Uchina
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Item {0} imezimwa
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Item {0} imezimwa
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM haina kitu chochote cha hisa
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Shughuli ya mradi / kazi.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM haina kitu chochote cha hisa
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Shughuli ya mradi / kazi.
 DocType: Vehicle Log,Refuelling Details,Maelezo ya Refueling
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Kuzalisha Slips za Mshahara
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Ununuzi lazima uangaliwe, ikiwa Inahitajika Ilichaguliwa kama {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Punguzo lazima liwe chini ya 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Kiwango cha mwisho cha ununuzi haipatikani
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Andika Kiasi (Dhamana ya Kampuni)
 DocType: Sales Invoice Timesheet,Billing Hours,Masaa ya kulipia
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,BOM ya default kwa {0} haipatikani
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Row # {0}: Tafadhali weka upya kiasi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM ya default kwa {0} haipatikani
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Row # {0}: Tafadhali weka upya kiasi
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Gonga vitu ili uziweze hapa
 DocType: Fees,Program Enrollment,Uandikishaji wa Programu
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher ya Gharama ya Uliopita
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Tafadhali weka {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Rudia Siku ya Mwezi
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} ni mwanafunzi asiye na kazi
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} ni mwanafunzi asiye na kazi
 DocType: Employee,Health Details,Maelezo ya Afya
 DocType: Offer Letter,Offer Letter Terms,Fidia Masharti ya Barua
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Ili kuunda hati ya kumbukumbu ya Rufaa ya Malipo inahitajika
@@ -4655,7 +4745,6 @@
 DocType: Employee External Work History,Salary,Mshahara
 DocType: Serial No,Delivery Document Type,Aina ya Nyaraka za Utoaji
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Tuma slips zote za mshahara kwa vigezo vilivyochaguliwa hapo juu
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Vipengee vimeunganishwa
 DocType: Sales Order,Partly Delivered,Sehemu iliyotolewa
 DocType: Email Digest,Receivables,Mapato
 DocType: Lead Source,Lead Source,Chanzo cha Mwelekeo
@@ -4676,19 +4765,19 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Aina ya kuzeeka 2
 DocType: SG Creation Tool Course,Max Strength,Nguvu ya Max
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM imebadilishwa
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Chagua Vitu kulingana na tarehe ya utoaji
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Chagua Vitu kulingana na tarehe ya utoaji
 ,Sales Analytics,Uchambuzi wa Mauzo
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Inapatikana {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Inapatikana {0}
 ,Prospects Engaged But Not Converted,Matarajio yaliyotumika lakini haijaongozwa
 DocType: Manufacturing Settings,Manufacturing Settings,Mipangilio ya Uzalishaji
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Kuweka Barua pepe
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Simu ya Mkono Hakuna
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Tafadhali ingiza fedha za msingi kwa Kampuni ya Kampuni
 DocType: Stock Entry Detail,Stock Entry Detail,Maelezo ya Entry Entry
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Kumbukumbu za kila siku
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Kumbukumbu za kila siku
 DocType: Products Settings,Home Page is Products,Ukurasa wa Kwanza ni Bidhaa
 ,Asset Depreciation Ledger,Msanidi wa Upungufu wa Mali
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Migogoro ya Kanuni za Ushuru na {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Migogoro ya Kanuni za Ushuru na {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Jina la Akaunti Mpya
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Malighafi ya Raw zinazotolewa
 DocType: Selling Settings,Settings for Selling Module,Mipangilio kwa ajili ya kuuza Moduli
@@ -4702,8 +4791,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Kipengee {0} kinafaa kuwa kitu cha hisa
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Kazi ya Kazi katika Hifadhi ya Maendeleo
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Mipangilio ya mipangilio ya shughuli za uhasibu.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Tafadhali kuanzisha Mfumo wa Jina la Waajiriwa katika Rasilimali za Binadamu&gt; Mipangilio ya HR
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Tarehe inayotarajiwa haiwezi kuwa kabla ya Tarehe ya Kuomba Nyenzo
+DocType: Restaurant,Default Tax Template,Kigezo cha Ushuru cha Default
 DocType: Fees,Student Details,Maelezo ya Wanafunzi
 DocType: Purchase Invoice Item,Stock Qty,Kiwanda
 DocType: Employee Loan,Repayment Period in Months,Kipindi cha ulipaji kwa Miezi
@@ -4721,8 +4811,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Nenda kwa Vitu
 DocType: Sales Partner,Partner Type,Aina ya Washirika
 DocType: Purchase Taxes and Charges,Actual,Kweli
+DocType: Restaurant Menu,Restaurant Manager,Meneja wa Mgahawa
 DocType: Authorization Rule,Customerwise Discount,Ugawaji wa Wateja
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Timesheet kwa ajili ya kazi.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Timesheet kwa ajili ya kazi.
 DocType: Purchase Invoice,Against Expense Account,Dhidi ya Akaunti ya gharama
 DocType: Production Order,Production Order,Utaratibu wa Uzalishaji
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Maelezo ya Usanidi {0} tayari imewasilishwa
@@ -4730,7 +4821,6 @@
 DocType: Quotation Item,Against Docname,Dhidi ya Nyaraka
 DocType: SMS Center,All Employee (Active),Wafanyakazi wote (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Tazama Sasa
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Chagua wakati ambapo ankara itazalishwa moja kwa moja
 DocType: BOM,Raw Material Cost,Gharama za Nyenzo za Raw
 DocType: Item Reorder,Re-Order Level,Kiwango cha Udhibiti wa Rejea
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Ingiza vitu na mipangilio ya qty ambayo unataka kuongeza amri za uzalishaji au download vifaa vya malighafi kwa ajili ya uchambuzi.
@@ -4743,23 +4833,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Aina ya Ripoti ni lazima
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Ghala ni lazima kwa kipengee cha hisa {0} mfululizo {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Ongeza Programu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail &amp; Wholesale
 DocType: Issue,First Responded On,Kwanza Alijibu
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kuweka Orodha ya Msalaba katika vikundi vingi
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Tarehe ya Mwanzo wa Fedha na Tarehe ya Mwisho wa Fedha Tarehe tayari imewekwa mwaka wa Fedha {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Tarehe ya kufuta imewekwa
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Piga Kundi
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Piga Kundi
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Imefanikiwa kuunganishwa
 DocType: Request for Quotation Supplier,Download PDF,Pakua PDF
 DocType: Production Order,Planned End Date,Tarehe ya Mwisho Imepangwa
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Tafadhali ingiza Tarehe ya Ratiba
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Ambapo vitu vinahifadhiwa.
 DocType: Request for Quotation,Supplier Detail,Maelezo ya Wasambazaji
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Hitilafu katika fomu au hali: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Hitilafu katika fomu au hali: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Kiasi kilichopishwa
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Vipimo vya vigezo lazima kuongeza hadi 100%
 DocType: Attendance,Attendance,Mahudhurio
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,Vitu vya hisa
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,Vitu vya hisa
 DocType: BOM,Materials,Vifaa
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ikiwa hakizingatiwa, orodha itahitajika kuongezwa kwa kila Idara ambapo itatakiwa kutumika."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Hifadhi ya Chanzo na Target haiwezi kuwa sawa
@@ -4777,6 +4867,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,Juu ya Net Jumla
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Thamani ya Ushirikina {0} lazima iwe kati ya {1} hadi {2} katika vipengee vya {3} kwa Bidhaa {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Ghala inayolenga katika mstari {0} lazima iwe sawa na Utaratibu wa Uzalishaji
+DocType: Restaurant Reservation,Waitlisted,Inastahiliwa
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Fedha haiwezi kubadilishwa baada ya kuingiza saini kwa kutumia sarafu nyingine
 DocType: Vehicle Service,Clutch Plate,Bamba la Clutch
 DocType: Company,Round Off Account,Ondoa Akaunti
@@ -4793,7 +4884,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Jina la mtu mpya wa mauzo
 DocType: Packing Slip,Gross Weight UOM,Uzito wa Pato UOM
 DocType: Delivery Note Item,Against Sales Invoice,Dhidi ya ankara za Mauzo
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Tafadhali ingiza namba za serial kwa bidhaa iliyotumiwa
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Tafadhali ingiza namba za serial kwa bidhaa iliyotumiwa
 DocType: Bin,Reserved Qty for Production,Nambari iliyohifadhiwa ya Uzalishaji
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Acha kuondoka bila kufuata kama hutaki kuzingatia kundi wakati wa kufanya makundi ya msingi.
 DocType: Asset,Frequency of Depreciation (Months),Upeo wa kushuka kwa thamani (Miezi)
@@ -4804,7 +4895,7 @@
 DocType: Lab Test,Test Group,Jaribio la Kikundi
 DocType: Payment Reconciliation,Receivable / Payable Account,Akaunti ya Kulipwa / Kulipa
 DocType: Delivery Note Item,Against Sales Order Item,Dhidi ya Vipengee vya Udhibiti wa Mauzo
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Tafadhali taja Thamani ya Attribut kwa sifa {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Tafadhali taja Thamani ya Attribut kwa sifa {0}
 DocType: Item,Default Warehouse,Ghala la Ghalafa
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Bajeti haipatikani dhidi ya Akaunti ya Kundi {0}
 DocType: Healthcare Settings,Patient Registration,Usajili wa Mgonjwa
@@ -4833,6 +4924,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Mtu wa Mauzo
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Kituo cha Bajeti na Gharama
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Njia ya malipo ya malipo ya kuruhusiwa haiwezi kuruhusiwa
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,kwa
 ,Appointment Analytics,Uchambuzi wa Uteuzi
 DocType: Vehicle Service,Half Yearly,Nusu ya mwaka
 DocType: Lead,Blog Subscriber,Msajili wa Blog
@@ -4840,7 +4932,7 @@
 DocType: Healthcare Settings,Consultations in valid days,Majadiliano katika siku halali
 DocType: Assessment Plan Criteria,Maximum Score,Upeo wa alama
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Unda sheria ili kuzuia shughuli kulingana na maadili.
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +49, Group Roll No,Rangi ya Kikundi Hakuna
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +49, Group Roll No,Roll No. ya Kikundi
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +9,Fee Creation Failed,Uumbaji wa Ada Imeshindwa
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Acha tupu ikiwa unafanya makundi ya wanafunzi kwa mwaka
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ikiwa hunakiliwa, Jumla ya. ya siku za kazi zitajumuisha likizo, na hii itapunguza thamani ya mshahara kwa siku"
@@ -4850,7 +4942,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Hesabu ya Quot
 ,BOM Stock Report,Ripoti ya hisa ya BOM
 DocType: Stock Reconciliation Item,Quantity Difference,Tofauti Tofauti
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Usindikaji wa Mishahara
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Usindikaji wa Mishahara
 DocType: Opportunity Item,Basic Rate,Kiwango cha Msingi
 DocType: GL Entry,Credit Amount,Mikopo
 DocType: Cheque Print Template,Signatory Position,Hali ya Ishara
@@ -4864,12 +4956,12 @@
 DocType: Tax Rule,Tax Rule,Kanuni ya Ushuru
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Kudumisha Kiwango Chake Katika Mzunguko wa Mauzo
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Panga magogo ya wakati nje ya Masaa ya kazi ya Kazini.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Wateja katika foleni
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} hana Ratiba ya Matibabu. Ongeza kwenye Bwana wa Mbaguzi
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Wateja katika foleni
 DocType: Student,Nationality,Urithi
 ,Items To Be Requested,Vitu Ili Kuombwa
-DocType: Purchase Order,Get Last Purchase Rate,Pata Kiwango cha Ununuzi wa Mwisho
 DocType: Company,Company Info,Maelezo ya Kampuni
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Chagua au kuongeza mteja mpya
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Chagua au kuongeza mteja mpya
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Kituo cha gharama kinahitajika kuandika madai ya gharama
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Matumizi ya Fedha (Mali)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Hii inategemea mahudhurio ya Waajiriwa
@@ -4877,6 +4969,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Akaunti ya Debit
 DocType: Fiscal Year,Year Start Date,Tarehe ya Mwanzo wa Mwaka
 DocType: Attendance,Employee Name,Jina la Waajiriwa
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Mgahawa wa Uagizaji wa Kuagiza
 DocType: Sales Invoice,Rounded Total (Company Currency),Jumla ya mviringo (Fedha la Kampuni)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Haiwezi kufunika kwa Kundi kwa sababu Aina ya Akaunti imechaguliwa.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} imebadilishwa. Tafadhali furahisha.
@@ -4887,6 +4980,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Faida ya Waajiriwa
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Wingi uliowekwa lazima iwe sawa kiasi cha Bidhaa {0} mfululizo {1}
 DocType: Production Order,Manufactured Qty,Uchina uliotengenezwa
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Invoice Iliyoundwa
 DocType: Purchase Receipt Item,Accepted Quantity,Nambari iliyokubaliwa
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Tafadhali weka Orodha ya likizo ya default kwa Waajiriwa {0} au Kampuni {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} haipo
@@ -4896,18 +4990,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row No {0}: Kiasi hawezi kuwa kikubwa kuliko Kiwango cha Kusubiri dhidi ya Madai ya Madai {1}. Kiasi kinachosubiri ni {2}
 DocType: Maintenance Schedule,Schedule,Ratiba
 DocType: Account,Parent Account,Akaunti ya Mzazi
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Inapatikana
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Inapatikana
 DocType: Quality Inspection Reading,Reading 3,Kusoma 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Aina ya Voucher
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Orodha ya Bei haipatikani au imezimwa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Orodha ya Bei haipatikani au imezimwa
 DocType: Lab Test,Approved,Imekubaliwa
 DocType: Pricing Rule,Price,Bei
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',Wafanyakazi waliondolewa kwenye {0} lazima waweke kama &#39;kushoto&#39;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Wafanyakazi waliondolewa kwenye {0} lazima waweke kama &#39;kushoto&#39;
+DocType: Hub Settings,Last Sync On,Mwisho Sync On
 DocType: Guardian,Guardian,Mlezi
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Tathmini {0} iliundwa kwa Mfanyakazi {1} katika kipindi cha tarehe iliyotolewa
 DocType: Employee,Education,Elimu
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,Del
 DocType: Selling Settings,Campaign Naming By,Kampeni inayoitwa na
 DocType: Employee,Current Address Is,Anwani ya sasa Is
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Lengo la Mauzo ya Mwezi (
@@ -4922,7 +5017,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Msimbo wa Kozi:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Tafadhali ingiza Akaunti ya gharama
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Aina ya Kumbukumbu ya Kumbukumbu inapaswa kuwa moja ya Utaratibu wa Ununuzi, Invoice ya Ununuzi au Ingia ya Jarida"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Aina ya Kumbukumbu ya Kumbukumbu inapaswa kuwa moja ya Utaratibu wa Ununuzi, Invoice ya Ununuzi au Ingia ya Jarida"
 DocType: Employee,Current Address,Anuani ya sasa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ikiwa kipengee ni tofauti ya kipengee kingine basi maelezo, picha, bei, kodi nk zitawekwa kutoka template isipokuwa waziwazi"
 DocType: Serial No,Purchase / Manufacture Details,Maelezo ya Ununuzi / Utengenezaji
@@ -4953,7 +5048,7 @@
 DocType: Hub Settings,Hub Settings,Mipangilio ya Hub
 DocType: Project,Gross Margin %,Margin ya Pato%
 DocType: BOM,With Operations,Na Uendeshaji
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Uingizaji wa uhasibu umefanywa kwa fedha {0} kwa kampuni {1}. Tafadhali chagua akaunti inayolipwa au inayolipwa kwa sarafu {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Uingizaji wa uhasibu umefanywa kwa fedha {0} kwa kampuni {1}. Tafadhali chagua akaunti inayolipwa au inayolipwa kwa sarafu {0}.
 DocType: Asset,Is Existing Asset,"Je, kuna Malipo"
 DocType: Salary Detail,Statistical Component,Kipengele cha Takwimu
 DocType: Warranty Claim,If different than customer address,Ikiwa tofauti na anwani ya wateja
@@ -4961,13 +5056,14 @@
 DocType: BOM Operation,BOM Operation,Uendeshaji wa BOM
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Kwenye Mshahara Uliopita
 DocType: Student,Home Address,Anwani ya nyumbani
+DocType: Item,Has Expiry Date,Ina Tarehe ya Muda
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Mipangilio ya Mchapishaji ya Bidhaa.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Weka Malipo
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,Weka Malipo
 DocType: POS Profile,POS Profile,Profaili ya POS
 DocType: Training Event,Event Name,Jina la Tukio
 DocType: Physician,Phone (Office),Simu (Ofisi)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,Uingizaji
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Kukubali kwa {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,Uingizaji
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Kukubali kwa {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Msimu wa kuweka bajeti, malengo nk."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Jina linalofautiana
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Kipengee {0} ni template, tafadhali chagua moja ya vipengele vyake"
@@ -4976,7 +5072,7 @@
 DocType: Assessment Plan,Room,Chumba
 DocType: Purchase Order,Advance Paid,Ilipwa kulipwa
 DocType: Item,Item Tax,Kodi ya Item
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Nyenzo kwa Wafanyabiashara
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Nyenzo kwa Wafanyabiashara
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Ankara ya ushuru
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Kizuizi {0}% kinaonekana zaidi ya mara moja
 DocType: Expense Claim,Employees Email Id,Waajiri Barua Id
@@ -4987,32 +5083,30 @@
 DocType: Program,Program Name,Jina la Programu
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Fikiria kodi au malipo kwa
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Uhakika halisi ni lazima
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} kwa sasa ina {1} Wafanyabiashara Scorecard amesimama, na Amri ya Ununuzi kwa mtoa huduma hii inapaswa kutolewa."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} kwa sasa ina {1} Wafanyabiashara Scorecard amesimama, na Amri ya Ununuzi kwa mtoa huduma hii inapaswa kutolewa."
 DocType: Employee Loan,Loan Type,Aina ya Mikopo
 DocType: Scheduling Tool,Scheduling Tool,Kitabu cha Mpangilio
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Kadi ya Mikopo
 DocType: BOM,Item to be manufactured or repacked,Kipengee cha kutengenezwa au kupakiwa
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Mipangilio ya mipangilio ya ushirikiano wa hisa.
-DocType: Purchase Invoice,Next Date,Tarehe inayofuata
 DocType: Employee Education,Major/Optional Subjects,Majukumu makubwa / Chaguo
 DocType: Sales Invoice Item,Drop Ship,Turua Utoaji
+DocType: Hub Settings,Suspended,Imesimamishwa
 DocType: Training Event,Attendees,Waliohudhuria
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Hapa unaweza kudumisha maelezo ya familia kama jina na kazi ya mzazi, mke na watoto"
 DocType: Academic Term,Term End Date,Tarehe ya Mwisho wa Mwisho
-DocType: Hub Settings,Seller Name,Jina la Muuzaji
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Kodi na Malipo yamefutwa (Fedha la Kampuni)
 DocType: Item Group,General Settings,Mazingira ya Jumla
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Kutoka kwa Fedha na Fedha haiwezi kuwa sawa
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Ongeza Wafundishaji
 DocType: Stock Entry,Repack,Piga
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Lazima Uhifadhi fomu kabla ya kuendelea
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Tafadhali chagua Kampuni kwanza
 DocType: Item Attribute,Numeric Values,Vigezo vya Hesabu
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Ambatisha Alama
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Ngazi za hisa
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Ngazi za hisa
 DocType: Customer,Commission Rate,Kiwango cha Tume
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Iliunda {0} alama za alama kwa {1} kati ya:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Fanya Tofauti
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Fanya Tofauti
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Zima maombi ya kuondoka na idara.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Aina ya Malipo lazima iwe moja ya Kupokea, Kulipa na Uhamisho wa Ndani"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -5027,11 +5121,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Capital Stock
 DocType: Shopping Cart Settings,Show Public Attachments,Onyesha Viambatisho vya Umma
 DocType: Packing Slip,Package Weight Details,Maelezo ya Ufuatiliaji wa Pakiti
+DocType: Restaurant Reservation,Reservation Time,Muda wa Uhifadhi
 DocType: Payment Gateway Account,Payment Gateway Account,Akaunti ya Gateway ya Malipo
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Baada ya kukamilika kwa malipo kulirejesha mtumiaji kwenye ukurasa uliochaguliwa.
 DocType: Company,Existing Company,Kampuni iliyopo
 DocType: Healthcare Settings,Result Emailed,Matokeo yamefunuliwa
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",Jamii ya Kodi imebadilishwa kuwa &quot;Jumla&quot; kwa sababu Vitu vyote si vitu vya hisa
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Msimbo wa Item&gt; Kikundi cha Bidhaa&gt; Brand
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Tafadhali chagua faili ya csv
 DocType: Student Leave Application,Mark as Present,Mark kama sasa
 DocType: Supplier Scorecard,Indicator Color,Rangi ya Kiashiria
@@ -5051,16 +5147,16 @@
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Mradi wa mradi.
 apps/erpnext/erpnext/controllers/status_updater.py +209,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Ili kuruhusu zaidi ya kulipa au kuagiza zaidi, sasisha &quot;Ruzuku&quot; katika Mipangilio ya Hifadhi au Bidhaa."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Uonyeshe alama yoyote kama $ nk karibu na sarafu.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Siku ya nusu)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),Nusu Siku
 DocType: Supplier,Credit Days,Siku za Mikopo
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Fanya Kundi la Mwanafunzi
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Inaendelea mbele
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Pata Vitu kutoka kwa BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Pata Vitu kutoka kwa BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Siku za Kiongozi
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Tarehe ya Kuweka lazima iwe sawa na tarehe ya ununuzi {1} ya mali {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Angalia hii ikiwa Mwanafunzi anaishi katika Hosteli ya Taasisi.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Tafadhali ingiza Amri za Mauzo kwenye jedwali hapo juu
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Tafadhali ingiza Amri za Mauzo kwenye jedwali hapo juu
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Hailipiwa Salari Slips
 ,Stock Summary,Summary Stock
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Tumia mali kutoka kwa ghala moja hadi nyingine
@@ -5076,5 +5172,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: Uingizaji wa malipo hauwezi kuunganishwa na {1}
 DocType: Journal Entry,Subscription Section,Sehemu ya Usajili
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Akaunti {0} haipo
+DocType: Training Event,Training Program,Programu ya Mafunzo
 DocType: Account,Cash,Fedha
 DocType: Employee,Short biography for website and other publications.,Wasifu mfupi wa tovuti na machapisho mengine.
diff --git a/erpnext/translations/ta.csv b/erpnext/translations/ta.csv
index eff9d66..a597072 100644
--- a/erpnext/translations/ta.csv
+++ b/erpnext/translations/ta.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,சம்பளம் முறை
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,பதிவு
 DocType: Patient,Divorced,விவாகரத்து
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,பொருட்கள் ஏற்கனவே ஒத்திசைக்கப்படாது
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,பொருள் ஒரு பரிமாற்றத்தில் பல முறை சேர்க்க அனுமதி
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,பொருள் வருகை {0} இந்த உத்தரவாதத்தை கூறுகின்றனர் ரத்து முன் ரத்து
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,நுகர்வோர் தயாரிப்புகள்
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,குற்றம் விட்டு
 DocType: Sales Partner,Dealer,வாணிகம் செய்பவர்
 DocType: Consultation,Investigations,விசாரணைகள்
+DocType: Restaurant Order Entry,Click Enter To Add,சேர் என்பதை கிளிக் செய்யவும்
 DocType: Employee,Rented,வாடகைக்கு
 DocType: Purchase Order,PO-,இம்
 DocType: POS Profile,Applicable for User,பயனர் பொருந்தும்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","நிறுத்தி உற்பத்தி ஆணை ரத்து செய்ய முடியாது, ரத்து செய்ய முதலில் அதை தடை இல்லாத"
 DocType: Vehicle Service,Mileage,மைலேஜ்
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,நீங்கள் உண்மையில் இந்த சொத்து கைவிட்டால் செய்ய விரும்புகிறீர்களா?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,நீங்கள் உண்மையில் இந்த சொத்து கைவிட்டால் செய்ய விரும்புகிறீர்களா?
 DocType: Drug Prescription,Update Schedule,புதுப்பிப்பு அட்டவணை
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,இயல்புநிலை சப்ளையர் தேர்வு
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},நாணய விலை பட்டியல் தேவையான {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,கிடைக்கும் என்பதை சரிபார்க்கவும்
 DocType: Job Applicant,Job Applicant,வேலை விண்ணப்பதாரர்
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,இந்த சப்ளையர் எதிராக பரிமாற்றங்கள் அடிப்படையாக கொண்டது. விவரங்கள் கீழே காலவரிசை பார்க்க
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,மேலும் முடிவுகள் இல்லை.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,சட்ட
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},உண்மையான வகை வரி வரிசையில் மதிப்பிட சேர்க்கப்பட்டுள்ளது முடியாது {0}
 DocType: Bank Guarantee,Customer,வாடிக்கையாளர்
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),மாற்று வீதம் அதே இருக்க வேண்டும் {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,வாடிக்கையாளர் பெயர்
 DocType: Vehicle,Natural Gas,இயற்கை எரிவாயு
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},வங்கி கணக்கு என பெயரிடப்பட்டது {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},வங்கி கணக்கு என பெயரிடப்பட்டது {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"தலைவர்கள் (குழுக்களின்) எதிராக, 
 கணக்கு  பதிவுகள் செய்யப்படுகின்றன மற்றும் சமநிலைகள் பராமரிக்கப்படுகிறது."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),சிறந்த {0} பூஜ்யம் விட குறைவாக இருக்க முடியாது ( {1} )
@@ -49,6 +49,7 @@
 DocType: Manufacturing Settings,Default 10 mins,10 நிமிடங்கள் இயல்புநிலை
 DocType: Leave Type,Leave Type Name,வகை பெயர் விட்டு
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,திறந்த காட்டு
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,இன்றைய தினம் இந்த நடவடிக்கை மீண்டும் எடுக்கப்பட வேண்டும்
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,தொடர் வெற்றிகரமாக புதுப்பிக்கப்பட்டது
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,வெளியேறுதல்
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural ஜர்னல் நுழைவு சமர்ப்பிக்கப்பட்டது
@@ -57,13 +58,14 @@
 ,Purchase Order Items To Be Received,"பெறப்பட்டுள்ள இருக்கவும் செய்ய வாங்குதல், ஆர்டர் உருப்படிகள்"
 DocType: SMS Center,All Supplier Contact,அனைத்து சப்ளையர் தொடர்பு
 DocType: Support Settings,Support Settings,ஆதரவு அமைப்புகள்
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,எதிர்பார்த்த முடிவு தேதி எதிர்பார்க்கப்படுகிறது தொடக்க தேதி விட குறைவாக இருக்க முடியாது
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,எதிர்பார்த்த முடிவு தேதி எதிர்பார்க்கப்படுகிறது தொடக்க தேதி விட குறைவாக இருக்க முடியாது
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ரோ # {0}: விகிதம் அதே இருக்க வேண்டும் {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,புதிய விடுப்பு விண்ணப்பம்
 ,Batch Item Expiry Status,தொகுதி பொருள் காலாவதியாகும் நிலை
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,வங்கி உண்டியல்
 DocType: Mode of Payment Account,Mode of Payment Account,கொடுப்பனவு கணக்கு முறை
 DocType: Consultation,Consultation,கலந்தாய்வின்
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,விற்பனை மற்றும் வருவாய்
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,காட்டு மாறிகள்
 DocType: Academic Term,Academic Term,கல்வி கால
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,பொருள்
@@ -80,9 +82,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,உடல்நலம்
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),கட்டணம் தாமதம் (நாட்கள்)
 DocType: Lab Prescription,Lab Prescription,லேப் பரிந்துரைப்பு
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,விலை மூலம் வரிசைப்படுத்தவும்
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,சேவை செலவு
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},வரிசை எண்: {0} ஏற்கனவே விற்பனை விலைப்பட்டியல் குறிக்கப்படுகிறது உள்ளது: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,விலைப்பட்டியல்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},வரிசை எண்: {0} ஏற்கனவே விற்பனை விலைப்பட்டியல் குறிக்கப்படுகிறது உள்ளது: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,விலைப்பட்டியல்
 DocType: Maintenance Schedule Item,Periodicity,வட்டம்
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,நிதியாண்டு {0} தேவையான
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,பாதுகாப்பு
@@ -92,19 +95,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,ரோ # {0}:
 DocType: Timesheet,Total Costing Amount,மொத்த செலவு தொகை
 DocType: Delivery Note,Vehicle No,வாகனம் இல்லை
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,விலை பட்டியல் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,விலை பட்டியல் தேர்ந்தெடுக்கவும்
 DocType: Accounts Settings,Currency Exchange Settings,நாணய மாற்றுதல் அமைப்புகள்
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,ரோ # {0}: கொடுப்பனவு ஆவணம் trasaction முடிக்க வேண்டும்
 DocType: Production Order Operation,Work In Progress,முன்னேற்றம் வேலை
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,தேதியைத் தேர்ந்தெடுக்கவும்
 DocType: Employee,Holiday List,விடுமுறை பட்டியல்
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,பள்ளியில் பள்ளி ஆசிரியர்களுக்கான பெயரிடும் அமைப்பு அமைப்பது
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,கணக்கர்
+DocType: Hub Settings,Selling Price List,விலை பட்டியல் விற்பனை
 DocType: Patient,Tobacco Current Use,புகையிலை தற்போதைய பயன்பாடு
 DocType: Cost Center,Stock User,பங்கு பயனர்
 DocType: Company,Phone No,இல்லை போன்
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,நிச்சயமாக அட்டவணை உருவாக்கப்பட்ட:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},புதிய {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},புதிய {0}: # {1}
 ,Sales Partners Commission,விற்பனை பங்குதாரர்கள் ஆணையம்
 DocType: Purchase Invoice,Rounding Adjustment,வட்டமான சரிசெய்தல்
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,சுருக்கமான மேற்பட்ட 5 எழுத்துக்கள் முடியாது
@@ -125,9 +128,8 @@
 DocType: Packed Item,Parent Detail docname,பெற்றோர் விரிவாக docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",குறிப்பு: {0} பொருள் குறியீடு: {1} மற்றும் வாடிக்கையாளர்: {2}
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,கிலோ
-DocType: Student Log,Log,புகுபதிகை
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,ஒரு வேலை திறப்பு.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} முடிவு சமர்ப்பிக்கப்பட்டது
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} முடிவு சமர்ப்பிக்கப்பட்டது
 DocType: Item Attribute,Increment,சம்பள உயர்வு
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,கால இடைவெளி
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,கிடங்கு தேர்ந்தெடுக்கவும் ...
@@ -136,7 +138,7 @@
 DocType: Patient,Married,திருமணம்
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},அனுமதி இல்லை {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,இருந்து பொருட்களை பெற
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},பங்கு விநியோக குறிப்பு எதிராக மேம்படுத்தப்பட்டது முடியாது {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},பங்கு விநியோக குறிப்பு எதிராக மேம்படுத்தப்பட்டது முடியாது {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},தயாரிப்பு {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,உருப்படிகள் எதுவும் பட்டியலிடப்படவில்லை
 DocType: Payment Reconciliation,Reconcile,சமரசம்
@@ -146,29 +148,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,ஓய்வூதிய நிதி
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,அடுத்து தேய்மானம் தேதி கொள்முதல் தேதி முன்பாக இருக்கக் கூடாது
 DocType: Consultation,Consultation Date,ஆலோசனை தேதி
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNext பயனர்களுக்கான தயாரிப்பு பட்டியல் மற்றும் கண்டுபிடிப்பு
 DocType: SMS Center,All Sales Person,அனைத்து விற்பனை நபர்
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** மாதாந்திர விநியோகம் ** நீங்கள் உங்கள் வணிக பருவகால இருந்தால் நீங்கள் மாதங்கள் முழுவதும் பட்ஜெட் / இலக்கு விநியோகிக்க உதவுகிறது.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,பொருட்களை காணவில்லை
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,சம்பளத் திட்டத்தை காணாமல்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,பொருட்களை காணவில்லை
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,சம்பளத் திட்டத்தை காணாமல்
 DocType: Lead,Person Name,நபர் பெயர்
 DocType: Sales Invoice Item,Sales Invoice Item,விற்பனை விலைப்பட்டியல் பொருள்
 DocType: Account,Credit,கடன்
 DocType: POS Profile,Write Off Cost Center,செலவு மையம் இனிய எழுத
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",எ.கா. &quot;முதன்மை பள்ளி&quot; அல்லது &quot;பல்கலைக்கழகம்&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",எ.கா. &quot;முதன்மை பள்ளி&quot; அல்லது &quot;பல்கலைக்கழகம்&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,பங்கு அறிக்கைகள்
 DocType: Warehouse,Warehouse Detail,சேமிப்பு கிடங்கு விரிவாக
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},கடன் எல்லை வாடிக்கையாளர் கடந்து {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,கால முடிவு தேதி பின்னர் கால இணைக்கப்பட்ட செய்ய கல்வியாண்டின் ஆண்டு முடிவு தேதி விட முடியாது (கல்வி ஆண்டு {}). தேதிகள் சரிசெய்து மீண்டும் முயற்சிக்கவும்.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;நிலையான சொத்து உள்ளது&quot; சொத்து சாதனை உருப்படியை எதிராக உள்ளது என, நீக்கம் செய்ய முடியாது"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;நிலையான சொத்து உள்ளது&quot; சொத்து சாதனை உருப்படியை எதிராக உள்ளது என, நீக்கம் செய்ய முடியாது"
 DocType: Vehicle Service,Brake Oil,பிரேக் ஆயில்
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,வாடிக்கையாளர்&gt; வாடிக்கையாளர் குழு&gt; மண்டலம்
 DocType: Tax Rule,Tax Type,வரி வகை
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,வரிவிதிக்கத்தக்க தொகை
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},நீங்கள் முன் உள்ளீடுகளை சேர்க்க அல்லது மேம்படுத்தல் அங்கீகாரம் இல்லை {0}
 DocType: BOM,Item Image (if not slideshow),பொருள் படம் (இல்லையென்றால் ஸ்லைடுஷோ)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,"ஒரு வாடிக்கையாளர் , அதே பெயரில்"
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(அவ்வேளை விகிதம் / 60) * உண்மையான நடவடிக்கையை நேரம்
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,வரிசை # {0}: குறிப்பு ஆவண வகை செலவுக் கோரிக்கை அல்லது பத்திரிகை நுழைவு ஒன்றில் இருக்க வேண்டும்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,BOM தேர்வு
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,வரிசை # {0}: குறிப்பு ஆவண வகை செலவுக் கோரிக்கை அல்லது பத்திரிகை நுழைவு ஒன்றில் இருக்க வேண்டும்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,BOM தேர்வு
 DocType: SMS Log,SMS Log,எஸ்எம்எஸ் புகுபதிகை
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,வழங்கப்படுகிறது பொருட்களை செலவு
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} விடுமுறை வரம்பு தேதி தேதி இடையே அல்ல
@@ -196,7 +199,7 @@
 DocType: Journal Entry Account,Employee Loan,பணியாளர் கடன்
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,நடவடிக்கை பதிவு
 DocType: Fee Schedule,Send Payment Request Email,கட்டணம் கோரிக்கை மின்னஞ்சல் அனுப்பு
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,பொருள் {0} அமைப்பில் இல்லை அல்லது காலாவதியானது
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,பொருள் {0} அமைப்பில் இல்லை அல்லது காலாவதியானது
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,வீடு
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,கணக்கு அறிக்கை
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,மருந்துப்பொருள்கள்
@@ -211,18 +214,23 @@
 DocType: Employee,B-,பி-
 DocType: Upload Attendance,Import Log,புகுபதிகை இறக்குமதி
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,மேலே அளவுகோல்களை அடிப்படையாக வகை உற்பத்தி பொருள் வேண்டுகோள் இழுக்க
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,வெற்றிகரமாக பதிவு செய்யப்படவில்லை.
 DocType: Training Result Employee,Grade,தரம்
+DocType: Restaurant Table,No of Seats,இடங்கள் இல்லை
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","மாறும் பொருள் சேர்க்க, jinja குறிச்சொற்களை பயன்படுத்த <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,சப்ளையர் மூலம் வழங்கப்படுகிறது
 DocType: SMS Center,All Contact,அனைத்து தொடர்பு
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,உற்பத்தி ஆணை ஏற்கனவே BOM அனைத்து பொருட்கள் உருவாக்கப்பட்ட
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,உற்பத்தி ஆணை ஏற்கனவே BOM அனைத்து பொருட்கள் உருவாக்கப்பட்ட
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,ஆண்டு சம்பளம்
 DocType: Daily Work Summary,Daily Work Summary,தினசரி வேலை சுருக்கம்
 DocType: Period Closing Voucher,Closing Fiscal Year,நிதியாண்டு மூடுவதற்கு
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} உறைந்து
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,கணக்கு வரைபடம் உருவாக்க இருக்கும் நிறுவனத்தை தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} உறைந்து
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,கணக்கு வரைபடம் உருவாக்க இருக்கும் நிறுவனத்தை தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,பங்கு செலவுகள்
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,இலக்கு கிடங்கு தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,இலக்கு கிடங்கு தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,இலக்கு கிடங்கு தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,இலக்கு கிடங்கு தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,உள்ளிடவும் விருப்பமான தொடர்பு மின்னஞ்சல்
 DocType: Program Enrollment,School Bus,பள்ளி பேருந்து
 DocType: Journal Entry,Contra Entry,கான்ட்ரா நுழைவு
@@ -240,9 +248,10 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", டெம்ப்ளேட் பதிவிறக்கம் பொருத்தமான தரவு நிரப்ப செய்தது கோப்பு இணைக்கவும்.
  தேர்வு காலம் இருக்கும் அனைத்து தேதிகளும் ஊழியர் இணைந்து ஏற்கனவே உள்ள வருகைப் பதிவேடுகள் கொண்டு, டெம்ப்ளேட் வரும்"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,பொருள் {0} செயலில் இல்லை அல்லது வாழ்க்கை முடிவுக்கு வந்து விட்டது
+DocType: Student Admission Program,Minimum Age,குறைந்தபட்ச வயது
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,உதாரணம்: அடிப்படை கணிதம்
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","வரிசையில் வரி ஆகியவை அடங்கும் {0} பொருள் விகிதம் , வரிசைகளில் வரிகளை {1} சேர்க்கப்பட்டுள்ளது"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,அலுவலக தொகுதி அமைப்புகள்
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,அலுவலக தொகுதி அமைப்புகள்
 DocType: SMS Center,SMS Center,எஸ்எம்எஸ் மையம்
 DocType: Sales Invoice,Change Amount,அளவு மாற்ற
 DocType: BOM Update Tool,New BOM,புதிய BOM
@@ -252,7 +261,7 @@
 DocType: Lead,Request Type,கோரிக்கை வகை
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,பணியாளர் செய்ய
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ஒலிபரப்புதல்
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,மனைகளைச் சேர்க்கவும்
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),POS இன் அமைவு முறை (ஆன்லைன் / ஆஃப்லைன்)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,நிர்வாகத்தினருக்கு
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,குலையை மூடுதல் மேற்கொள்ளப்படும்.
 DocType: Serial No,Maintenance Status,பராமரிப்பு நிலையை
@@ -275,6 +284,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,விலை பட்டியல் கொள்முதல் அல்லது விற்பனை பொருந்தும் வேண்டும்
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},நிறுவல் தேதி உருப்படி பிரசவ தேதி முன் இருக்க முடியாது {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),விலை பட்டியல் விகிதம் தள்ளுபடி (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,உயிர்வேதியியல்
 DocType: Offer Letter,Select Terms and Conditions,தேர்வு விதிமுறைகள் மற்றும் நிபந்தனைகள்
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,அவுட் மதிப்பு
 DocType: Production Planning Tool,Sales Orders,விற்பனை ஆணைகள்
@@ -309,15 +319,15 @@
 DocType: Sales Partner,Reseller,மறுவிற்பனையாளர்
 DocType: Codification Table,Medical Code,மருத்துவக் குறியீடு
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","தேர்ந்தெடுக்கப்பட்டால், பொருள் கோரிக்கைகளில் பங்கற்ற பொருட்களை அடங்கும்."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,நிறுவனத்தின் உள்ளிடவும்
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,நிறுவனத்தின் உள்ளிடவும்
 DocType: Delivery Note Item,Against Sales Invoice Item,விற்பனை விலைப்பட்டியல் பொருள் எதிராக
 ,Production Orders in Progress,முன்னேற்றம் உற்பத்தி ஆணைகள்
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,கடன் இருந்து நிகர பண
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage முழு உள்ளது, காப்பாற்ற முடியவில்லை"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage முழு உள்ளது, காப்பாற்ற முடியவில்லை"
 DocType: Lead,Address & Contact,முகவரி மற்றும் தொடர்பு கொள்ள
 DocType: Leave Allocation,Add unused leaves from previous allocations,முந்தைய ஒதுக்கீடுகளை இருந்து பயன்படுத்தப்படாத இலைகள் சேர்க்கவும்
 DocType: Sales Partner,Partner website,பங்குதாரரான வலைத்தளத்தில்
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,பொருள் சேர்
+DocType: Restaurant Order Entry,Add Item,பொருள் சேர்
 DocType: Lab Test,Custom Result,விருப்ப முடிவு
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,பெயர் தொடர்பு
 DocType: Course Assessment Criteria,Course Assessment Criteria,கோர்ஸ் மதிப்பீடு செய்க மதீப்பீட்டு
@@ -330,7 +340,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,வாங்குவதற்கு கோரிக்கை.
 DocType: Lab Test,Submitted Date,சமர்ப்பிக்கப்பட்ட தேதி
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,இந்த திட்டத்திற்கு எதிராக உருவாக்கப்பட்ட நேரம் தாள்கள் அடிப்படையாக கொண்டது
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,நிகர சம்பளம் 0 விட குறைவாக இருக்க முடியாது
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,நிகர சம்பளம் 0 விட குறைவாக இருக்க முடியாது
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","கணினியில் இருந்து மீண்டும் மீண்டும் பிழை அறிவிப்புகளை அனுப்புவதை நிறுத்த, சந்தாவில் உள்ள முடக்கப்பட்ட புலத்தை நாங்கள் சரிபார்க்கிறோம்"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,"தேர்வு விடுமுறை வீடு, இந்த விடுமுறை விண்ணப்பத்தை"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,தேதி நிவாரணத்தில் சேர தேதி விட அதிகமாக இருக்க வேண்டும்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,வருடத்திற்கு விடுப்பு
@@ -339,9 +350,10 @@
 DocType: Email Digest,Profit & Loss,லாபம் மற்றும் நஷ்டம்
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,லிட்டர்
 DocType: Task,Total Costing Amount (via Time Sheet),மொத்த செலவுவகை தொகை (நேரம் தாள் வழியாக)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,மாணவர் குழுக்களுக்கு கீழ் மாணவர்களை அமைத்திடுங்கள்
 DocType: Item Website Specification,Item Website Specification,பொருள் வலைத்தளம் குறிப்புகள்
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,தடுக்கப்பட்ட விட்டு
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},பொருள் {0} வாழ்க்கை அதன் இறுதியில் அடைந்துவிட்டது {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},பொருள் {0} வாழ்க்கை அதன் இறுதியில் அடைந்துவிட்டது {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,வங்கி பதிவுகள்
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,வருடாந்திர
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,பங்கு நல்லிணக்க பொருள்
@@ -350,7 +362,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,மாணவர் குழு உருவாக்கம் கருவி பாடநெறி
 DocType: Lead,Do Not Contact,தொடர்பு இல்லை
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,உங்கள் நிறுவனத்தில் உள்ள கற்பிக்க மக்கள்
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,அனைத்து மீண்டும் பொருள் தேடும் தனிப்பட்ட ஐடி. அதை சமர்ப்பிக்க இல் உருவாக்கப்பட்டது.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,மென்பொருள் டெவலப்பர்
 DocType: Item,Minimum Order Qty,குறைந்தபட்ச ஆணை அளவு
 DocType: Pricing Rule,Supplier Type,வழங்குபவர் வகை
@@ -360,17 +371,19 @@
 DocType: Item,Publish in Hub,மையம் உள்ள வெளியிடு
 DocType: Student Admission,Student Admission,மாணவர் சேர்க்கை
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,பொருள் {0} ரத்து
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,பொருள் கோரிக்கை
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,பொருள் {0} ரத்து
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,பொருள் கோரிக்கை
 DocType: Bank Reconciliation,Update Clearance Date,இசைவு தேதி புதுப்பிக்க
 DocType: Item,Purchase Details,கொள்முதல் விவரம்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},கொள்முதல் ஆணை உள்ள &#39;மூலப்பொருட்கள் சப்ளை&#39; அட்டவணை காணப்படவில்லை பொருள் {0} {1}
 DocType: Patient Relation,Relation,உறவு
 DocType: Shipping Rule,Worldwide Shipping,உலகம் முழுவதும் கப்பல்
 DocType: Patient Relation,Mother,தாய்
+DocType: Restaurant Reservation,Reservation End Time,இட ஒதுக்கீடு முடிவு நேரம்
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,வாடிக்கையாளர்கள் இருந்து உத்தரவுகளை உறுதி.
 DocType: Purchase Receipt Item,Rejected Quantity,நிராகரிக்கப்பட்டது அளவு
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,கட்டணம் கோரிக்கை {0} உருவாக்கப்பட்டது
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,கட்டணம் கோரிக்கை {0} உருவாக்கப்பட்டது
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,குறைந்த உணர்திறன்
 DocType: Notification Control,Notification Control,அறிவிப்பு கட்டுப்பாடு
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,பயிற்சி முடிந்தவுடன் உறுதிப்படுத்தவும்
 DocType: Lead,Suggestions,பரிந்துரைகள்
@@ -390,7 +403,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,விருப்பமான மின்னஞ்சல் பணியாளர் தேர்வு அடிப்படையில் ஊழியர் மின்னஞ்சல்கள் சம்பளம் சீட்டு
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,பட்டியலில் முதல் விடுப்பு சர்க்கார் தரப்பில் சாட்சி இயல்புநிலை விடுப்பு சர்க்கார் தரப்பில் சாட்சி என அமைக்க வேண்டும்
 DocType: Tax Rule,Shipping County,கப்பல் உள்ளூரில்
-apps/erpnext/erpnext/config/desktop.py +158,Learn,அறிய
+apps/erpnext/erpnext/config/desktop.py +159,Learn,அறிய
 DocType: Asset,Next Depreciation Date,அடுத்த தேய்மானம் தேதி
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,பணியாளர் ஒன்றுக்கு நடவடிக்கை செலவு
 DocType: Accounts Settings,Settings for Accounts,கணக்குகளைத் அமைப்புகள்
@@ -401,13 +414,13 @@
 DocType: Item,Synced With Hub,ஹப் ஒத்திசைய
 DocType: Vehicle,Fleet Manager,கடற்படை மேலாளர்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},ரோ # {0}: {1} உருப்படியை எதிர்மறையாக இருக்க முடியாது {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,தவறான கடவுச்சொல்
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,தவறான கடவுச்சொல்
 DocType: Item,Variant Of,மாறுபாடு
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',அது 'அளவு உற்பத்தி செய்ய' நிறைவு அளவு அதிகமாக இருக்க முடியாது
 DocType: Period Closing Voucher,Closing Account Head,கணக்கு தலைமை மூடுவதற்கு
 DocType: Employee,External Work History,வெளி வேலை வரலாறு
 DocType: Physician,Time per Appointment,நியமனம் ஒன்றுக்கு
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,வட்ட குறிப்பு பிழை
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,வட்ட குறிப்பு பிழை
 DocType: Appointment Type,Is Inpatient,உள்நோயாளி
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 பெயர்
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,நீங்கள் டெலிவரி குறிப்பு சேமிக்க முறை வேர்ட்ஸ் (ஏற்றுமதி) காண முடியும்.
@@ -417,19 +430,18 @@
 DocType: Lead,Industry,தொழில்
 DocType: Employee,Job Profile,வேலை விவரம்
 DocType: BOM Item,Rate & Amount,விகிதம் &amp; தொகை
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,அமைவு&gt; எண் வரிசை தொடர் மூலம் கலந்துரையாடலுக்கான வரிசை எண்ணை அமைக்கவும்
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,இந்த நிறுவனத்திற்கு எதிரான பரிவர்த்தனைகளை அடிப்படையாகக் கொண்டது. விபரங்களுக்கு கீழே காலவரிசைப் பார்க்கவும்
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,தானியங்கி பொருள் கோரிக்கை உருவாக்கம் மின்னஞ்சல் மூலம் தெரிவிக்க
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,எதிர்ப்பு
 DocType: Journal Entry,Multi Currency,பல நாணய
 DocType: Payment Reconciliation Invoice,Invoice Type,விலைப்பட்டியல் வகை
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,வாடிக்கையாளர்&gt; வாடிக்கையாளர் குழு&gt; மண்டலம்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,டெலிவரி குறிப்பு
 DocType: Consultation,Encounter Impression,மன அழுத்தத்தை எதிர்கொள்ளுங்கள்
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,வரி அமைத்தல்
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,விற்கப்பட்டது சொத்து செலவு
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,நீங்கள் அதை இழுத்து பின்னர் கொடுப்பனவு நுழைவு மாற்றப்பட்டுள்ளது. மீண்டும் அதை இழுக்க கொள்ளவும்.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} பொருள் வரி இரண்டு முறை
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,இந்த வாரம் மற்றும் நிலுவையில் நடவடிக்கைகள் சுருக்கம்
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} பொருள் வரி இரண்டு முறை
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,இந்த வாரம் மற்றும் நிலுவையில் நடவடிக்கைகள் சுருக்கம்
 DocType: Student Applicant,Admitted,ஒப்பு
 DocType: Workstation,Rent Cost,வாடகை செலவு
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,தொகை தேய்மானம் பிறகு
@@ -444,36 +456,35 @@
 DocType: Shipping Rule,Valid for Countries,நாடுகள் செல்லுபடியாகும்
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,இந்த உருப்படி ஒரு டெம்ப்ளேட் உள்ளது பரிமாற்றங்களை பயன்படுத்த முடியாது. 'இல்லை நகல் அமைக்க வரை பொருள் பண்புகளை மாறிகள் மீது நகல்
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,அது கருதப்பட்டு மொத்த ஆணை
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","பணியாளர் பதவி ( எ.கா., தலைமை நிர்வாக அதிகாரி , இயக்குனர் முதலியன) ."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","பணியாளர் பதவி ( எ.கா., தலைமை நிர்வாக அதிகாரி , இயக்குனர் முதலியன) ."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,விகிதம் இது வாடிக்கையாளர் நாணயத்தின் வாடிக்கையாளர் அடிப்படை நாணய மாற்றப்படும்
 DocType: Course Scheduling Tool,Course Scheduling Tool,பாடநெறி திட்டமிடல் கருவி
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ரோ # {0}: கொள்முதல் விலைப்பட்டியல் இருக்கும் சொத்துடன் எதிராகவும் முடியாது {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,% S க்கான% s ஐ மீண்டும் உருவாக்கும்போது [Urgent] பிழை
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,% S க்கான% s ஐ மீண்டும் உருவாக்கும்போது [Urgent] பிழை
 DocType: Item Tax,Tax Rate,வரி விகிதம்
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ஏற்கனவே பணியாளர் ஒதுக்கப்பட்ட {1} காலம் {2} க்கான {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,உருப்படி தேர்வுசெய்க
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,உருப்படி தேர்வுசெய்க
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,கொள்முதல் விலைப்பட்டியல் {0} ஏற்கனவே சமர்ப்பிக்கப்பட்ட
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},ரோ # {0}: கூறு எண் அதே இருக்க வேண்டும் {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,அல்லாத குழு மாற்றுக
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,ஒரு பொருள் ஒரு தொகுதி (நிறைய).
 DocType: C-Form Invoice Detail,Invoice Date,விலைப்பட்டியல் தேதி
 DocType: GL Entry,Debit Amount,பற்று தொகை
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},மட்டுமே கம்பெனி ஒன்றுக்கு 1 கணக்கு இருக்க முடியாது {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,இணைப்பு பார்க்கவும்
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},மட்டுமே கம்பெனி ஒன்றுக்கு 1 கணக்கு இருக்க முடியாது {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,இணைப்பு பார்க்கவும்
 DocType: Purchase Order,% Received,% பெறப்பட்டது
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,மாணவர் குழுக்கள் உருவாக்க
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,அமைப்பு ஏற்கனவே முடிந்து !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,அமைப்பு ஏற்கனவே முடிந்து !
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,கடன் குறிப்பு தொகை
 DocType: Setup Progress Action,Action Document,செயல் ஆவணம்
 ,Finished Goods,முடிக்கப்பட்ட பொருட்கள்
 DocType: Delivery Note,Instructions,அறிவுறுத்தல்கள்
 DocType: Quality Inspection,Inspected By,மூலம் ஆய்வு
 DocType: Maintenance Visit,Maintenance Type,பராமரிப்பு அமைப்பு
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} கோர்ஸ் பதிவுசெய்யாமலிருந்தால் உள்ளது {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,பொருள் குறியீடு&gt; பொருள் குழு&gt; பிராண்ட்
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} கோர்ஸ் பதிவுசெய்யாமலிருந்தால் உள்ளது {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},தொடர் இல {0} டெலிவரி குறிப்பு அல்ல {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext டெமோ
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,பொருட்களை சேர்க்க
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,பொருட்களை சேர்க்க
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,பொருள் தரமான ஆய்வு அளவுரு
 DocType: Leave Application,Leave Approver Name,தரப்பில் சாட்சி பெயர் விடவும்
 DocType: Depreciation Schedule,Schedule Date,அட்டவணை தேதி
@@ -495,7 +506,7 @@
 DocType: Salary Slip Timesheet,Working Hours,வேலை நேரங்கள்
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ஏற்கனவே தொடரில் தற்போதைய / தொடக்க வரிசை எண் மாற்ற.
 DocType: Dosage Strength,Strength,வலிமை
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,ஒரு புதிய வாடிக்கையாளர் உருவாக்கவும்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,ஒரு புதிய வாடிக்கையாளர் உருவாக்கவும்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","பல விலை விதிகள் நிலவும் தொடர்ந்து இருந்தால், பயனர்கள் முரண்பாட்டை தீர்க்க கைமுறையாக முன்னுரிமை அமைக்க கேட்கப்பட்டது."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,கொள்முதல் ஆணைகள் உருவாக்க
 ,Purchase Register,பதிவு வாங்குவதற்கு
@@ -514,7 +525,7 @@
 DocType: Lab Test Template,Single,ஒற்றை
 DocType: Salary Slip,Total Loan Repayment,மொத்த கடன் தொகையை திரும்பச் செலுத்துதல்
 DocType: Account,Cost of Goods Sold,விற்கப்படும் பொருட்களின் விலை
-DocType: Purchase Invoice,Yearly,வருடாந்திர
+DocType: Subscription,Yearly,வருடாந்திர
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,செலவு மையம் உள்ளிடவும்
 DocType: Drug Prescription,Dosage,மருந்தளவு
 DocType: Journal Entry Account,Sales Order,விற்பனை ஆணை
@@ -545,7 +556,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,அனைத்து உற்பத்தி செயல்முறைகள் உலக அமைப்புகள்.
 DocType: Accounts Settings,Accounts Frozen Upto,உறைந்த வரை கணக்குகள்
 DocType: SMS Log,Sent On,அன்று அனுப்பப்பட்டது
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,கற்பிதம் {0} காரணிகள் அட்டவணை பல முறை தேர்வு
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,கற்பிதம் {0} காரணிகள் அட்டவணை பல முறை தேர்வு
 DocType: HR Settings,Employee record is created using selected field. ,பணியாளர் பதிவு தேர்ந்தெடுக்கப்பட்ட துறையில் பயன்படுத்தி உருவாக்கப்பட்டது.
 DocType: Sales Order,Not Applicable,பொருந்தாது
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,விடுமுறை மாஸ்டர் .
@@ -571,13 +582,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ஒதுக்கப்பட்ட மொத்த இலைகள் கட்டாயமாகும்
 DocType: Patient,AB Positive,AB நேர்மறை
 DocType: Job Opening,Description of a Job Opening,ஒரு வேலை ஆரம்பிப்பு விளக்கம்
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,இன்று நிலுவையில் நடவடிக்கைகள்
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,இன்று நிலுவையில் நடவடிக்கைகள்
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,வருகை பதிவு.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,டைம் ஷீட் சார்ந்த சம்பளம் சம்பளம் உபகரண.
 DocType: Sales Order Item,Used for Production Plan,உற்பத்தி திட்டத்தை பயன்படுத்திய
 DocType: Employee Loan,Total Payment,மொத்த கொடுப்பனவு
 DocType: Manufacturing Settings,Time Between Operations (in mins),(நிமிடங்கள்) செயல்களுக்கு இடையே நேரம்
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} ஓர் செயல் முடிவடைந்தால் முடியாது ரத்துசெய்யப்பட்டது
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} ஓர் செயல் முடிவடைந்தால் முடியாது ரத்துசெய்யப்பட்டது
 DocType: Customer,Buyer of Goods and Services.,பொருட்கள் மற்றும் சேவைகள் வாங்குபவர்.
 DocType: Journal Entry,Accounts Payable,கணக்குகள் செலுத்த வேண்டிய
 DocType: Patient,Allergies,ஒவ்வாமைகள்
@@ -589,23 +600,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,கொள்முதல் கட்டளைகளை எச்சரிக்கவும்
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,உங்கள் வாடிக்கையாளர்களுக்கு ஒரு சில பட்டியல் . அவர்கள் நிறுவனங்கள் அல்லது தனிநபர்கள் இருக்க முடியும் .
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,போதும் பாகங்கள் கட்டுவது எப்படி
+DocType: POS Profile User,POS Profile User,POS பயனர் பயனர்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,நேரடி வருமானம்
 DocType: Patient Appointment,Date TIme,தேதி நேரம்
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","கணக்கு மூலம் தொகுக்கப்பட்டுள்ளது என்றால் , கணக்கு அடிப்படையில் வடிகட்ட முடியாது"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,நிர்வாக அதிகாரி
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,கோர்ஸ் தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,கோர்ஸ் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,கோர்ஸ் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,கோர்ஸ் தேர்ந்தெடுக்கவும்
 DocType: Codification Table,Codification Table,குறியீட்டு அட்டவணை
 DocType: Timesheet Detail,Hrs,மணி
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,நிறுவனத்தின் தேர்ந்தெடுக்கவும்
 DocType: Stock Entry Detail,Difference Account,வித்தியாசம் கணக்கு
 DocType: Purchase Invoice,Supplier GSTIN,சப்ளையர் GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,அதன் சார்ந்து பணி {0} மூடவில்லை நெருக்கமாக பணி அல்ல முடியும்.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,பொருள் கோரிக்கை எழுப்பப்படும் எந்த கிடங்கு உள்ளிடவும்
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,அதன் சார்ந்து பணி {0} மூடவில்லை நெருக்கமாக பணி அல்ல முடியும்.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,பொருள் கோரிக்கை எழுப்பப்படும் எந்த கிடங்கு உள்ளிடவும்
 DocType: Production Order,Additional Operating Cost,கூடுதல் இயக்க செலவு
 DocType: Lab Test Template,Lab Routine,லேப் ரோட்டின்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,ஒப்பனை
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","ஒன்றாக்க , பின்வரும் பண்புகளை இரு பொருட்களை சமமாக இருக்க வேண்டும்"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","ஒன்றாக்க , பின்வரும் பண்புகளை இரு பொருட்களை சமமாக இருக்க வேண்டும்"
 DocType: Shipping Rule,Net Weight,நிகர எடை
 DocType: Employee,Emergency Phone,அவசர தொலைபேசி
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,வாங்க
@@ -616,7 +628,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,ஆரம்பம் 0% அளவீட்டைக் வரையறுக்க கொள்ளவும்
 DocType: Sales Order,To Deliver,வழங்க
 DocType: Purchase Invoice Item,Item,பொருள்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,சீரியல் எந்த உருப்படியை ஒரு பகுதியை இருக்க முடியாது
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,உயர் உணர்திறன்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,சீரியல் எந்த உருப்படியை ஒரு பகுதியை இருக்க முடியாது
 DocType: Journal Entry,Difference (Dr - Cr),வேறுபாடு ( டாக்டர் - CR)
 DocType: Account,Profit and Loss,இலாப நட்ட
 DocType: Patient,Risk Factors,ஆபத்து காரணிகள்
@@ -625,7 +638,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,நிர்வாக உப ஒப்பந்தமிடல்
 DocType: Vital Signs,Body Temperature,உடல் வெப்பநிலை
 DocType: Project,Project will be accessible on the website to these users,திட்ட இந்த பயனர்களுக்கு வலைத்தளத்தில் அணுக வேண்டும்
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,திட்ட வகை வரையறுக்க.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,திட்ட வகை வரையறுக்க.
 DocType: Supplier Scorecard,Weighting Function,எடை செயல்பாடு
 DocType: Physician,OP Consulting Charge,OP ஆலோசனை சார்ஜ்
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,அமை
@@ -639,7 +652,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,சம்பள உயர்வு 0 இருக்க முடியாது
 DocType: Production Planning Tool,Material Requirement,பொருள் தேவை
 DocType: Company,Delete Company Transactions,நிறுவனத்தின் பரிவர்த்தனைகள் நீக்கு
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,குறிப்பு இல்லை மற்றும் பரிந்துரை தேதி வங்கி பரிவர்த்தனை அத்தியாவசியமானதாகும்
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,குறிப்பு இல்லை மற்றும் பரிந்துரை தேதி வங்கி பரிவர்த்தனை அத்தியாவசியமானதாகும்
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,வரிகள் மற்றும் கட்டணங்கள் சேர்க்க / திருத்தவும்
 DocType: Payment Entry Reference,Supplier Invoice No,வழங்குபவர் விலைப்பட்டியல் இல்லை
 DocType: Territory,For reference,குறிப்பிற்கு
@@ -647,12 +660,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","நீக்க முடியாது தொ.எ. {0}, அது பங்கு பரிவர்த்தனைகள் பயன்படுத்தப்படும் விதத்தில்"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),நிறைவு (CR)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,வணக்கம்
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,உருப்படியை
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,உருப்படியை
 DocType: Serial No,Warranty Period (Days),உத்தரவாதத்தை காலம் (நாட்கள்)
 DocType: Installation Note Item,Installation Note Item,நிறுவல் குறிப்பு பொருள்
 DocType: Production Plan Item,Pending Qty,நிலுவையில் அளவு
 DocType: Budget,Ignore,புறக்கணி
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} செயலில் இல்லை
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} செயலில் இல்லை
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,அச்சிடும் அமைப்பு காசோலை பரிமாணங்களை
 DocType: Salary Slip,Salary Slip Timesheet,சம்பளம் ஸ்லிப் டைம் ஷீட்
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,துணை ஒப்பந்த கொள்முதல் ரசீது கட்டாயமாக வழங்குபவர் கிடங்கு
@@ -661,7 +674,7 @@
 DocType: Pricing Rule,Sales Partner,விற்பனை வரன்வாழ்க்கை துணை
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,எல்லா சப்ளையர் ஸ்கார்கார்டுகளும்.
 DocType: Buying Settings,Purchase Receipt Required,கொள்முதல் ரசீது தேவை
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,ஆரம்ப இருப்பு உள்ளிட்ட மதிப்பீட்டு மதிப்பீடு அத்தியாவசியமானதாகும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,ஆரம்ப இருப்பு உள்ளிட்ட மதிப்பீட்டு மதிப்பீடு அத்தியாவசியமானதாகும்
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,விலைப்பட்டியல் அட்டவணை காணப்படவில்லை பதிவுகள்
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,முதல் நிறுவனம் மற்றும் கட்சி வகை தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,நிதி / கணக்கு ஆண்டு .
@@ -698,7 +711,7 @@
 DocType: Quotation,Quotation To,என்று மேற்கோள்
 DocType: Lead,Middle Income,நடுத்தர வருமானம்
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),திறப்பு (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"நீங்கள் ஏற்கனவே மற்றொரு UOM சில பரிவர்த்தனை (ங்கள்) செய்துவிட்டேன் ஏனெனில் பொருள் நடவடிக்கையாக, இயல்புநிலை பிரிவு {0} நேரடியாக மாற்ற முடியாது. நீங்கள் வேறு ஒரு இயல்புநிலை UOM பயன்படுத்த ஒரு புதிய பொருள் உருவாக்க வேண்டும்."
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"நீங்கள் ஏற்கனவே மற்றொரு UOM சில பரிவர்த்தனை (ங்கள்) செய்துவிட்டேன் ஏனெனில் பொருள் நடவடிக்கையாக, இயல்புநிலை பிரிவு {0} நேரடியாக மாற்ற முடியாது. நீங்கள் வேறு ஒரு இயல்புநிலை UOM பயன்படுத்த ஒரு புதிய பொருள் உருவாக்க வேண்டும்."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,ஒதுக்கப்பட்ட தொகை எதிர்மறை இருக்க முடியாது
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,நிறுவனத்தின் அமைக்கவும்
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,நிறுவனத்தின் அமைக்கவும்
@@ -713,6 +726,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,வங்கி நுழைவு செய்ய கொடுப்பனவு கணக்கு தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","இலைகள், இழப்பில் கூற்றுக்கள் மற்றும் சம்பள நிர்வகிக்க பணியாளர் பதிவுகளை உருவாக்க"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,பரிந்துரைப்பு காலம்
+DocType: Restaurant Reservation,Restaurant Reservation,உணவக முன்பதிவு
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,மானசாவுடன்
 DocType: Payment Entry Deduction,Payment Entry Deduction,கொடுப்பனவு நுழைவு விலக்கு
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,மற்றொரு விற்பனைப் {0} அதே பணியாளர் ஐடி கொண்டு உள்ளது
@@ -720,7 +734,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,முதுநிலை
 DocType: Assessment Plan,Maximum Assessment Score,அதிகபட்ச மதிப்பீடு மதிப்பெண்
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,புதுப்பிக்கப்பட்டது வங்கி பரிவர்த்தனை தினங்கள்
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,நேரம் கண்காணிப்பு
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,நேரம் கண்காணிப்பு
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,டிரான்ஸ்போர்ட்டருக்கான DUPLICATE
 DocType: Fiscal Year Company,Fiscal Year Company,நிதியாண்டு நிறுவனத்தின்
 DocType: Packing Slip Item,DN Detail,DN விரிவாக
@@ -729,8 +743,9 @@
 DocType: Batch,Batch Description,தொகுதி விளக்கம்
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,மாணவர் குழுக்களை உருவாக்குகிறது
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,மாணவர் குழுக்களை உருவாக்குகிறது
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","பணம் நுழைவாயில் கணக்கு உருவாக்கப்பட்ட இல்லை, கைமுறையாக ஒரு உருவாக்க வேண்டும்."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","பணம் நுழைவாயில் கணக்கு உருவாக்கப்பட்ட இல்லை, கைமுறையாக ஒரு உருவாக்க வேண்டும்."
 DocType: Supplier Scorecard,Per Year,வருடத்திற்கு
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,DOB இன் படி இந்தத் திட்டத்தில் சேர்க்கைக்கு தகுதியற்றவர் இல்லை
 DocType: Sales Invoice,Sales Taxes and Charges,விற்பனை வரி மற்றும் கட்டணங்கள்
 DocType: Employee,Organization Profile,அமைப்பு விவரம்
 DocType: Vital Signs,Height (In Meter),உயரம் (மீட்டரில்)
@@ -766,7 +781,7 @@
 DocType: Student Batch Name,Batch Name,தொகுதி பெயர்
 DocType: Fee Validity,Max number of visit,விஜயத்தின் அதிகபட்ச எண்ணிக்கை
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,டைம் ஷீட் உருவாக்கப்பட்ட:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},கொடுப்பனவு முறையில் இயல்புநிலை பண அல்லது வங்கி கணக்கு அமைக்கவும் {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},கொடுப்பனவு முறையில் இயல்புநிலை பண அல்லது வங்கி கணக்கு அமைக்கவும் {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,பதிவுசெய்யவும்
 DocType: GST Settings,GST Settings,ஜிஎஸ்டி அமைப்புகள்
 DocType: Selling Settings,Customer Naming By,மூலம் பெயரிடுதல் வாடிக்கையாளர்
@@ -798,16 +813,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landed செலவு வரிகள் மற்றும் கட்டணங்கள்
 DocType: Production Order Operation,Actual Start Time,உண்மையான தொடக்க நேரம்
 DocType: BOM Operation,Operation Time,ஆபரேஷன் நேரம்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,முடிந்தது
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,முடிந்தது
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,அடித்தளம்
 DocType: Timesheet,Total Billed Hours,மொத்த பில் மணி
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,மொத்த தொகை இனிய எழுத
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,மொத்த தொகை இனிய எழுத
 DocType: Leave Block List Allow,Allow User,பயனர் அனுமதி
 DocType: Journal Entry,Bill No,பில் இல்லை
 DocType: Company,Gain/Loss Account on Asset Disposal,சொத்துக்கள் மீது லாபம் / நஷ்டம் கணக்கு
 DocType: Vehicle Log,Service Details,சேவை விவரங்கள்
 DocType: Vehicle Log,Service Details,சேவை விவரங்கள்
-DocType: Purchase Invoice,Quarterly,கால் ஆண்டுக்கு ஒரு முறை நிகழ்கிற
+DocType: Subscription,Quarterly,கால் ஆண்டுக்கு ஒரு முறை நிகழ்கிற
 DocType: Lab Test Template,Grouped,தொகுக்கப்பட்டுள்ளது
 DocType: Selling Settings,Delivery Note Required,டெலிவரி குறிப்பு தேவை
 DocType: Bank Guarantee,Bank Guarantee Number,வங்கி உத்தரவாத எண்
@@ -817,12 +832,12 @@
 DocType: Student Attendance,Student Attendance,மாணவர் வருகை
 DocType: Sales Invoice Timesheet,Time Sheet,நேரம் தாள்
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush மூலப்பொருட்கள் அடித்தளமாகக்
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,உருப்படியை விவரங்கள் உள்ளிடவும்
 DocType: Interest,Interest,ஆர்வம்
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,முன் விற்பனை
 DocType: Purchase Receipt,Other Details,மற்ற விவரங்கள்
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,டெஸ்ட் டெம்ப்ளேட்
+DocType: Restaurant Order Entry Item,Served,பணியாற்றினார்
 DocType: Account,Accounts,கணக்குகள்
 DocType: Vehicle,Odometer Value (Last),ஓடோமீட்டர் மதிப்பு (கடைசி)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,சப்ளையர் ஸ்கோர் கார்ட் அளவுகோல்களின் டெம்ப்ளேட்கள்.
@@ -834,26 +849,28 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,முன்னோட்டம் சம்பளம் ஸ்லிப்
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,கணக்கு {0} பல முறை உள்ளிட்ட வருகிறது
 DocType: Account,Expenses Included In Valuation,செலவுகள் மதிப்பீட்டு சேர்க்கப்பட்டுள்ளது
-DocType: Hub Settings,Seller City,விற்பனையாளர் நகரத்தை
 ,Absent Student Report,இல்லாத மாணவர் அறிக்கை
 DocType: Email Digest,Next email will be sent on:,அடுத்த மின்னஞ்சலில் அனுப்பி வைக்கப்படும்:
 DocType: Offer Letter Term,Offer Letter Term,கடிதம் கால சலுகை
 DocType: Supplier Scorecard,Per Week,வாரத்திற்கு
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,பொருள் வகைகள் உண்டு.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,பொருள் வகைகள் உண்டு.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,மொத்த மாணவர்
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,பொருள் {0} இல்லை
 DocType: Bin,Stock Value,பங்கு மதிப்பு
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,"பின்னணியில் கட்டணம் பதிவுகள் உருவாக்கப்படும். ஏதேனும் பிழை ஏற்பட்டால், பிழைச் செய்தி அட்டவணையில் புதுப்பிக்கப்படும்."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,நிறுவனத்தின் {0} இல்லை
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} {1} வரை கட்டணம் செல்லுபடியாகும்
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} {1} வரை கட்டணம் செல்லுபடியாகும்
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,மரம் வகை
 DocType: BOM Explosion Item,Qty Consumed Per Unit,அளவு அலகு ஒவ்வொரு உட்கொள்ளப்படுகிறது
 DocType: Serial No,Warranty Expiry Date,உத்தரவாதத்தை காலாவதியாகும் தேதி
 DocType: Material Request Item,Quantity and Warehouse,அளவு மற்றும் சேமிப்பு கிடங்கு
+DocType: Hub Settings,Unregister,பதிவுநீக்கு
 DocType: Sales Invoice,Commission Rate (%),கமிஷன் விகிதம் (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,தேர்ந்தெடுக்கவும் திட்டம்
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,தேர்ந்தெடுக்கவும் திட்டம்
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,தேர்ந்தெடுக்கவும் திட்டம்
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,தேர்ந்தெடுக்கவும் திட்டம்
 DocType: Project,Estimated Cost,விலை மதிப்பீடு
 DocType: Purchase Order,Link to material requests,பொருள் கோரிக்கைகளை இணைப்பு
+DocType: Hub Settings,Publish,வெளியிடு
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,வான்வெளி
 DocType: Journal Entry,Credit Card Entry,கடன் அட்டை நுழைவு
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,கணக்குகள் நிறுவனம் மற்றும்
@@ -864,13 +881,12 @@
 DocType: Selling Settings,Close Opportunity After Days,நாட்கள் பிறகு மூடு வாய்ப்பு
 ,Reserved,முன்பதிவு
 DocType: Purchase Order,Supply Raw Materials,வழங்கல் மூலப்பொருட்கள்
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,அடுத்து விலைப்பட்டியல் உருவாக்கப்படும் எந்த தேதி. அதை சமர்ப்பிக்க உருவாக்கப்படும்.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,நடப்பு சொத்துக்கள்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} ஒரு பங்கு பொருள் அல்ல
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',பயிற்சிக்கான உங்கள் கருத்துக்களை &#39;பயிற்சியளிப்பு&#39; மற்றும் &#39;புதிய&#39;
 DocType: Mode of Payment Account,Default Account,முன்னிருப்பு கணக்கு
 DocType: Payment Entry,Received Amount (Company Currency),பெறப்பட்ட தொகை (நிறுவனத்தின் நாணய)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,வாய்ப்பு முன்னணி தயாரிக்கப்படுகிறது என்றால் முன்னணி அமைக்க வேண்டும்
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,வாய்ப்பு முன்னணி தயாரிக்கப்படுகிறது என்றால் முன்னணி அமைக்க வேண்டும்
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,வாராந்திர ஆஃப் நாள் தேர்வு செய்க
 DocType: Patient,O Negative,ஓ நெகட்டிவ்
 DocType: Production Order Operation,Planned End Time,திட்டமிட்ட நேரம்
@@ -886,10 +902,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,சக்தி
 DocType: Opportunity,Opportunity From,வாய்ப்பு வரம்பு
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,மாத சம்பளம் அறிக்கை.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,நிறுவனத்தைச் சேர்க்கவும்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,வரிசை {0}: {1} பொருள் {2} க்கான தொடர் எண்கள் தேவைப்படும். நீங்கள் {3} வழங்கியுள்ளீர்கள்.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,வரிசை {0}: {1} பொருள் {2} க்கான தொடர் எண்கள் தேவைப்படும். நீங்கள் {3} வழங்கியுள்ளீர்கள்.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,ஒரு அட்டவணையைத் தேர்ந்தெடுக்கவும்
 DocType: BOM,Website Specifications,இணையத்தளம் விருப்பம்
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} என்பது &#39;பெறுநர்கள்&#39; இன் தவறான மின்னஞ்சல் முகவரி.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} என்பது &#39;பெறுநர்கள்&#39; இன் தவறான மின்னஞ்சல் முகவரி.
 DocType: Special Test Items,Particulars,விவரங்கள்
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,ஆண்டிபயாடிக்.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0} இருந்து: {0} வகை {1}
@@ -897,11 +913,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,ரோ {0}: மாற்று காரணி கட்டாய ஆகிறது
 DocType: Employee,A+,ஒரு +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","பல விலை விதிகள் அளவுகோல் கொண்டு உள்ளது, முன்னுரிமை ஒதுக்க மூலம் மோதலை தீர்க்க தயவு செய்து. விலை விதிகள்: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,செயலிழக்க அல்லது அது மற்ற BOM கள் தொடர்பு உள்ளது என BOM ரத்துசெய்ய முடியாது
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,செயலிழக்க அல்லது அது மற்ற BOM கள் தொடர்பு உள்ளது என BOM ரத்துசெய்ய முடியாது
 DocType: Opportunity,Maintenance,பராமரிப்பு
 DocType: Item Attribute Value,Item Attribute Value,பொருள் மதிப்பு பண்பு
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,விற்பனை பிரச்சாரங்களை .
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,டைம் ஷீட் செய்ய
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,டைம் ஷீட் செய்ய
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -958,12 +974,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,முதல் பொருள் உள்ளிடவும்
 DocType: Account,Liability,பொறுப்பு
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ஒப்புதல் தொகை ரோ கூறுகின்றனர் காட்டிலும் அதிகமாக இருக்க முடியாது {0}.
+DocType: Salary Detail,Do not include in total,மொத்தத்தில் சேர்க்க வேண்டாம்
 DocType: Company,Default Cost of Goods Sold Account,பொருட்களை விற்பனை கணக்கு இயல்பான செலவு
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,விலை பட்டியல் தேர்வு
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,விலை பட்டியல் தேர்வு
 DocType: Employee,Family Background,குடும்ப பின்னணி
 DocType: Request for Quotation Supplier,Send Email,மின்னஞ்சல் அனுப்ப
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},எச்சரிக்கை: தவறான இணைப்பு {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,அனுமதி இல்லை
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},எச்சரிக்கை: தவறான இணைப்பு {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,அனுமதி இல்லை
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,கோரிக்கை கோரப்பட்டது
 DocType: Vital Signs,Heart Rate / Pulse,ஹார்ட் ரேட் / பல்ஸ்
 DocType: Company,Default Bank Account,முன்னிருப்பு வங்கி கணக்கு
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",கட்சி அடிப்படையில் வடிகட்ட தேர்ந்தெடுக்கவும் கட்சி முதல் வகை
@@ -990,12 +1008,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,பொருள் வரிசையில் {அச்சுக்கோப்புகளை வாசிக்க}: {டாக்டைப்பானது} {docName} மேலே இல்லை '{டாக்டைப்பானது}' அட்டவணை
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,டைம் ஷீட் {0} ஏற்கனவே நிறைவு அல்லது ரத்து செய்யப்பட்டது
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,பணிகள் எதுவும் இல்லை
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","கார் விலைப்பட்டியல் 05, 28 எ.கா. உருவாக்கப்படும் மாதத்தின் நாள்"
 DocType: Item Variant Settings,Copy Fields to Variant,மாறுபாடுகளுக்கு புலங்களை நகலெடுக்கவும்
 DocType: Asset,Opening Accumulated Depreciation,குவிக்கப்பட்ட தேய்மானம் திறந்து
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ஸ்கோர் குறைவாக அல்லது 5 சமமாக இருக்க வேண்டும்
 DocType: Program Enrollment Tool,Program Enrollment Tool,திட்டம் சேர்க்கை கருவி
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,சி படிவம் பதிவுகள்
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,சி படிவம் பதிவுகள்
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,வாடிக்கையாளர் மற்றும் சப்ளையர்
 DocType: Email Digest,Email Digest Settings,மின்னஞ்சல் டைஜஸ்ட் அமைப்புகள்
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,உங்கள் வணிக நன்றி!
@@ -1013,13 +1030,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Quote நிலை
 DocType: Maintenance Visit,Completion Status,நிறைவு நிலைமை
 DocType: HR Settings,Enter retirement age in years,ஆண்டுகளில் ஓய்வு பெறும் வயதை உள்ளிடவும்
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,இலக்கு கிடங்கு
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,ஒரு கிடங்கில் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,இலக்கு கிடங்கு
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,ஒரு கிடங்கில் தேர்ந்தெடுக்கவும்
 DocType: Cheque Print Template,Starting location from left edge,இடது ஓரத்தில் இருந்து இடம் தொடங்கி
 DocType: Item,Allow over delivery or receipt upto this percent,இந்த சதவிகிதம் வரை விநியோக அல்லது ரசீது மீது அனுமதிக்கவும்
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,இறக்குமதி வருகை
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,அனைத்து பொருள் குழுக்கள்
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,அனைத்து பொருள் குழுக்கள்
 DocType: Process Payroll,Activity Log,நடவடிக்கை பதிவு
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,நிகர லாபம் / இழப்பு
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,தானாக நடவடிக்கைகள் சமர்ப்பிப்பு செய்தி உருவாக்கும் .
@@ -1031,7 +1048,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,திட்டமிட்டிருந்தது அளவு
 DocType: Sales Invoice,Payment Due Date,கொடுப்பனவு காரணமாக தேதி
 DocType: Drug Prescription,Interval UOM,இடைவெளி UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,பொருள் மாற்று {0} ஏற்கனவே அதே பண்புகளை கொண்ட உள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,பொருள் மாற்று {0} ஏற்கனவே அதே பண்புகளை கொண்ட உள்ளது
+DocType: Item,Hub Publishing Details,ஹப் பப்ளிஷிங் விவரங்கள்
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;திறந்து&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,செய்ய திறந்த
 DocType: Notification Control,Delivery Note Message,டெலிவரி குறிப்பு செய்தி
@@ -1051,10 +1069,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: மூல பொருள் பிரதான உருப்படி போலவே இருக்க முடியாது
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,கொள்முதல் ரசீது பொருட்கள் அட்டவணையில் மொத்த பொருந்தும் கட்டணங்கள் மொத்த வரி மற்றும் கட்டணங்கள் அதே இருக்க வேண்டும்
 DocType: Sales Team,Incentives,செயல் தூண்டுதல்
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,ஹப் பதிவு
 DocType: SMS Log,Requested Numbers,கோரப்பட்ட எண்கள்
 DocType: Production Planning Tool,Only Obtain Raw Materials,ஒரே மூலப்பொருட்கள் பெறுதல்
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,செயல்திறன் மதிப்பிடுதல்.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","இயக்குவதால் என வண்டியில் செயல்படுத்தப்படும், &#39;வண்டியில் பயன்படுத்தவும்&#39; மற்றும் வண்டியில் குறைந்தபட்சம் ஒரு வரி விதி இருக்க வேண்டும்"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","இயக்குவதால் என வண்டியில் செயல்படுத்தப்படும், &#39;வண்டியில் பயன்படுத்தவும்&#39; மற்றும் வண்டியில் குறைந்தபட்சம் ஒரு வரி விதி இருக்க வேண்டும்"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","கொடுப்பனவு நுழைவு {0} ஆணை {1}, அது இந்த விலைப்பட்டியல் முன்பணமாக இழுத்து வேண்டும் என்றால் சரிபார்க்க இணைக்கப்பட்டுள்ளது."
 DocType: Sales Invoice Item,Stock Details,பங்கு விபரங்கள்
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,திட்ட மதிப்பு
@@ -1073,12 +1092,14 @@
 DocType: Salary Slip,Working Days,வேலை நாட்கள்
 DocType: Serial No,Incoming Rate,உள்வரும் விகிதம்
 DocType: Packing Slip,Gross Weight,மொத்த எடை
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,நீங்கள் இந்த அமைப்பை அமைக்க இது உங்கள் நிறுவனத்தின் பெயர் .
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,மையத்தை இயக்கு
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,நீங்கள் இந்த அமைப்பை அமைக்க இது உங்கள் நிறுவனத்தின் பெயர் .
 DocType: HR Settings,Include holidays in Total no. of Working Days,மொத்த எந்த விடுமுறை அடங்கும். வேலை நாட்கள்
 DocType: Job Applicant,Hold,பிடி
 DocType: Employee,Date of Joining,சேர்வது தேதி
 DocType: Naming Series,Update Series,மேம்படுத்தல் தொடர்
 DocType: Supplier Quotation,Is Subcontracted,துணை ஒப்பந்தம்
+DocType: Restaurant Table,Minimum Seating,குறைந்தபட்ச சீட்டிங்
 DocType: Item Attribute,Item Attribute Values,பொருள் பண்புக்கூறு கலாச்சாரம்
 DocType: Examination Result,Examination Result,தேர்வு முடிவு
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,ரசீது வாங்க
@@ -1089,13 +1110,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},ஆபரேஷன் அடுத்த {0} நாட்கள் நேரத்தில் கண்டுபிடிக்க முடியவில்லை {1}
 DocType: Production Order,Plan material for sub-assemblies,துணை கூட்டங்கள் திட்டம் பொருள்
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,விற்பனை பங்குதாரர்கள் மற்றும் பிரதேச
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} செயலில் இருக்க வேண்டும்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} செயலில் இருக்க வேண்டும்
 DocType: Journal Entry,Depreciation Entry,தேய்மானம் நுழைவு
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,முதல் ஆவணம் வகையை தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,இந்த பராமரிப்பு பணிகள் முன் பொருள் வருகைகள் {0} ரத்து
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},தொடர் இல {0} பொருள் அல்ல {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,தேவையான அளவு
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,தற்போதுள்ள பரிவர்த்தனை கிடங்குகள் பேரேடு மாற்றப்பட முடியாது.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,தற்போதுள்ள பரிவர்த்தனை கிடங்குகள் பேரேடு மாற்றப்பட முடியாது.
 DocType: Bank Reconciliation,Total Amount,மொத்த தொகை
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,"இணைய 
 வெளியிடுதல்"
@@ -1107,7 +1128,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,விற்பனை விலை பட்டியல்
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","சரிபார்க்கப்பட்டால், ஒரு வாடிக்கையாளர் உருவாக்கப்பட்டு, நோயாளிக்கு ஒப்பிடப்படுவார். இந்த வாடிக்கையாளருக்கு எதிராக நோயாளி இரகசியங்கள் உருவாக்கப்படும். நோயாளி உருவாக்கும் போது நீங்கள் ஏற்கனவே வாடிக்கையாளரைத் தேர்ந்தெடுக்கலாம்."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,பொருட்களை ஒத்திசைக்க வெளியிடு
 DocType: Bank Reconciliation,Account Currency,கணக்கு நாணய
 DocType: Lab Test,Sample ID,மாதிரி ஐடி
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,நிறுவனத்தின் வட்ட இனிய கணக்கு குறிப்பிடவும்
@@ -1116,11 +1136,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,பணியாளர் {0} செயலில் இல்லை அல்லது இல்லை
 DocType: Fee Structure,Components,கூறுகள்
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},தயவு செய்து பொருள் உள்ள சொத்து வகை நுழைய {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,பொருள் மாறிகள் {0} மேம்படுத்தப்பட்டது
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,பொருள் மாறிகள் {0} மேம்படுத்தப்பட்டது
 DocType: Quality Inspection Reading,Reading 6,6 படித்தல்
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,இல்லை {0} {1} {2} இல்லாமல் எந்த எதிர்மறை நிலுவையில் விலைப்பட்டியல் Can
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","உருவாக்கப்பட வேண்டும். தாமதமாக இருந்தால், இந்த &quot;மாதத் தினத்தை மீண்டும் செய்&quot; என்பதை கைமுறையாக மாற்ற வேண்டும்"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,இல்லை {0} {1} {2} இல்லாமல் எந்த எதிர்மறை நிலுவையில் விலைப்பட்டியல் Can
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,விலைப்பட்டியல் அட்வான்ஸ் வாங்குவதற்கு
-DocType: Hub Settings,Sync Now,இப்போது ஒத்திசை
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},ரோ {0}: கடன் நுழைவு இணைத்தே ஒரு {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,ஒரு நிதி ஆண்டில் வரவு-செலவுத் திட்ட வரையறை.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,இந்த முறையில் தேர்ந்தெடுக்கும் போது முன்னிருப்பு வங்கி / பண கணக்கு தானாக பிஓஎஸ் விலைப்பட்டியல் உள்ள புதுப்பிக்கப்படும்.
@@ -1132,13 +1153,13 @@
 DocType: Item,Is Purchase Item,கொள்முதல் பொருள்
 DocType: Asset,Purchase Invoice,விலைப்பட்டியல் கொள்வனவு
 DocType: Stock Ledger Entry,Voucher Detail No,ரசீது விரிவாக இல்லை
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,புதிய விற்பனை விலைப்பட்டியல்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,புதிய விற்பனை விலைப்பட்டியல்
 DocType: Stock Entry,Total Outgoing Value,மொத்த வெளிச்செல்லும் மதிப்பு
 DocType: Physician,Appointments,சந்திப்புகளைப்
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,தேதி மற்றும் முடிவுத் திகதி திறந்து அதே நிதியாண்டு க்குள் இருக்க வேண்டும்
 DocType: Lead,Request for Information,தகவல் கோரிக்கை
 ,LeaderBoard,முன்னிலை
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,ஒத்திசைவு ஆஃப்லைன் பொருள்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,ஒத்திசைவு ஆஃப்லைன் பொருள்
 DocType: Payment Request,Paid,Paid
 DocType: Program Fee,Program Fee,திட்டம் கட்டணம்
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1157,11 +1178,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,ஆர்டர் பொருள் வாங்க
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,மறைமுக வருமானம்
 DocType: Student Attendance Tool,Student Attendance Tool,மாணவர் வருகை கருவி
+DocType: Restaurant Menu,Price List (Auto created),விலை பட்டியல் (தானாக உருவாக்கப்பட்டது)
 DocType: Cheque Print Template,Date Settings,தேதி அமைப்புகள்
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,மாறுபாடு
 ,Company Name,நிறுவனத்தின் பெயர்
 DocType: SMS Center,Total Message(s),மொத்த செய்தி (கள்)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,மாற்றம் உருப்படி தேர்வுசெய்க
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,மாற்றம் உருப்படி தேர்வுசெய்க
 DocType: Purchase Invoice,Additional Discount Percentage,கூடுதல் தள்ளுபடி சதவீதம்
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,அனைத்து உதவி வீடியோக்களை பட்டியலை காண்க
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,காசோலை டெபாசிட் அங்கு வங்கி கணக்கு தலைவர் தேர்வு.
@@ -1179,6 +1201,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,மீட்டர்
 DocType: Workstation,Electricity Cost,மின்சார செலவு
 DocType: HR Settings,Don't send Employee Birthday Reminders,பணியாளர் நினைவூட்டல்கள் அனுப்ப வேண்டாம்
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,அமைப்புகளை சேமிக்கவும்
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,தேவைப்படும் தயாரிப்புகள்
 DocType: Item,Inspection Criteria,ஆய்வு வரையறைகள்
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,மாற்றப்பட்டால்
 DocType: BOM Website Item,BOM Website Item,BOM இணையத்தளம் பொருள்
@@ -1196,11 +1220,11 @@
 DocType: Journal Entry,Total Amount in Words,சொற்கள் மொத்த தொகை
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,ஒரு பிழை ஏற்பட்டது . ஒரு சாத்தியமான காரணம் நீங்கள் வடிவம் காப்பாற்ற முடியாது என்று இருக்க முடியும் . சிக்கல் தொடர்ந்தால் support@erpnext.com தொடர்பு கொள்ளவும்.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,என் வண்டியில்
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},ஒழுங்கு வகை ஒன்றாக இருக்க வேண்டும் {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},ஒழுங்கு வகை ஒன்றாக இருக்க வேண்டும் {0}
 DocType: Lead,Next Contact Date,அடுத்த தொடர்பு தேதி
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,திறந்து அளவு
 DocType: Healthcare Settings,Appointment Reminder,நியமனம் நினைவூட்டல்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,தயவு செய்து தொகை மாற்றத்தைக் கணக்கில் நுழைய
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,தயவு செய்து தொகை மாற்றத்தைக் கணக்கில் நுழைய
 DocType: Student Batch Name,Student Batch Name,மாணவர் தொகுதி பெயர்
 DocType: Consultation,Doctor,டாக்டர்
 DocType: Holiday List,Holiday List Name,விடுமுறை பட்டியல் பெயர்
@@ -1208,12 +1232,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,அட்டவணை பாடநெறி
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,ஸ்டாக் ஆப்ஷன்ஸ்
 DocType: Journal Entry Account,Expense Claim,இழப்பில் கோரிக்கை
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,நீங்கள் உண்மையில் இந்த முறித்துள்ளது சொத்து மீட்க வேண்டும் என்று விரும்புகிறீர்களா?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},ஐந்து அளவு {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,நீங்கள் உண்மையில் இந்த முறித்துள்ளது சொத்து மீட்க வேண்டும் என்று விரும்புகிறீர்களா?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},ஐந்து அளவு {0}
 DocType: Leave Application,Leave Application,விண்ணப்ப விட்டு
 DocType: Patient,Patient Relation,நோயாளி உறவு
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,ஒதுக்கீடு கருவி விட்டு
+DocType: Item,Hub Category to Publish,வெளியிட வகை
 DocType: Leave Block List,Leave Block List Dates,பிளாக் பட்டியல் தினங்கள் விட்டு
+DocType: Sales Invoice,Billing Address GSTIN,பில்லிங் முகவரி GSTIN
 DocType: Workstation,Net Hour Rate,நிகர மணி விகிதம்
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,இறங்கினார் செலவு கொள்முதல் ரசீது
 DocType: Company,Default Terms,இயல்புநிலை நெறிமுறைகள்
@@ -1223,11 +1249,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},தயவு செய்து குறிப்பிட ஒரு {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,அளவு அல்லது மதிப்பு எந்த மாற்றமும் நீக்கப்பட்ட விடயங்கள்.
 DocType: Delivery Note,Delivery To,வழங்கும்
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,கற்பிதம் அட்டவணையின் கட்டாயமாகும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,கற்பிதம் அட்டவணையின் கட்டாயமாகும்
 DocType: Production Planning Tool,Get Sales Orders,விற்பனை ஆணைகள் கிடைக்கும்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} எதிர்மறை இருக்க முடியாது
 DocType: Training Event,Self-Study,சுய ஆய்வு
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,தள்ளுபடி
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,தள்ளுபடி
 DocType: Asset,Total Number of Depreciations,Depreciations எண்ணிக்கை
 DocType: Sales Invoice Item,Rate With Margin,மார்ஜின் உடன் விகிதம்
 DocType: Sales Invoice Item,Rate With Margin,மார்ஜின் உடன் விகிதம்
@@ -1235,7 +1261,7 @@
 DocType: Task,Urgent,அவசரமான
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},அட்டவணையில் வரிசை {0} ஒரு செல்லுபடியாகும் வரிசை ஐடி தயவு செய்து குறிப்பிடவும் {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,மாறி கண்டுபிடிக்க முடியவில்லை:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,நம்பகத்தன்மையிலிருந்து தொகுப்பதற்கு ஒரு புலத்தைத் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,நம்பகத்தன்மையிலிருந்து தொகுப்பதற்கு ஒரு புலத்தைத் தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,டெஸ்க்டாப் சென்று ERPNext பயன்படுத்தி தொடங்க
 DocType: Item,Manufacturer,உற்பத்தியாளர்
 DocType: Landed Cost Item,Purchase Receipt Item,ரசீது பொருள் வாங்க
@@ -1266,8 +1292,8 @@
 DocType: GL Entry,Against,எதிராக
 DocType: Item,Default Selling Cost Center,இயல்புநிலை விற்பனை செலவு மையம்
 DocType: Sales Partner,Implementation Partner,செயல்படுத்தல் வரன்வாழ்க்கை துணை
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,ஜிப் குறியீடு
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},விற்பனை ஆணை {0} {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,ஜிப் குறியீடு
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},விற்பனை ஆணை {0} {1}
 DocType: Opportunity,Contact Info,தகவல் தொடர்பு
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,பங்கு பதிவுகள் செய்தல்
 DocType: Packing Slip,Net Weight UOM,நிகர எடை UOM
@@ -1278,6 +1304,7 @@
 DocType: Holiday List,Get Weekly Off Dates,வாராந்திர இனிய தினங்கள் கிடைக்கும்
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,முடிவு தேதி தொடங்கும் நாள் விட குறைவாக இருக்க முடியாது
 DocType: Sales Person,Select company name first.,முதல் நிறுவனத்தின் பெயரை தேர்ந்தெடுக்கவும்.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,குறைந்தது உயர்
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,மேற்கோள்கள் சப்ளையர்கள் இருந்து பெற்றார்.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOM ஐ மாற்றவும் மற்றும் அனைத்து BOM களில் சமீபத்திய விலை புதுப்பிக்கவும்
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},எப்படி {0} | {1} {2}
@@ -1298,7 +1325,7 @@
 DocType: Program Enrollment,Transportation,போக்குவரத்து
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,தவறான கற்பிதம்
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} சமர்ப்பிக்க வேண்டும்
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},அளவு குறைவாக அல்லது சமமாக இருக்க வேண்டும் {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},அளவு குறைவாக அல்லது சமமாக இருக்க வேண்டும் {0}
 DocType: SMS Center,Total Characters,மொத்த எழுத்துகள்
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},பொருள் BOM துறையில் BOM தேர்ந்தெடுக்கவும் {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,சி படிவம் விலைப்பட்டியல் விரிவாக
@@ -1313,7 +1340,7 @@
 ,Ordered Items To Be Billed,கணக்கில் வேண்டும் உத்தரவிட்டது உருப்படிகள்
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,ரேஞ்ச் குறைவாக இருக்க வேண்டும் இருந்து விட வரையறைக்கு
 DocType: Global Defaults,Global Defaults,உலக இயல்புநிலைகளுக்கு
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,திட்ட கூட்டு அழைப்பிதழ்
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,திட்ட கூட்டு அழைப்பிதழ்
 DocType: Salary Slip,Deductions,விலக்கிற்கு
 DocType: Leave Allocation,LAL/,லால் /
 DocType: Setup Progress Action,Action Name,அதிரடி பெயர்
@@ -1331,13 +1358,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,விற்பனை விலைப்பட்டியல் முன்பணம்
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,எதுவும் கோர
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},மற்றொரு பட்ஜெட் சாதனை &#39;{0}&#39; ஏற்கனவே எதிராக உள்ளது {1} &#39;{2}&#39; நிதி ஆண்டிற்கான {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',' உண்மையான தொடக்க தேதி ' உண்மையான முடிவு தேதி' யை விட அதிகமாக இருக்க முடியாது
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',' உண்மையான தொடக்க தேதி ' உண்மையான முடிவு தேதி' யை விட அதிகமாக இருக்க முடியாது
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,மேலாண்மை
 DocType: Cheque Print Template,Payer Settings,செலுத்துவோரை அமைப்புகள்
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","இந்த மாற்று பொருள் குறியீடு இணைக்கப்படும். உங்கள் சுருக்கம் ""எஸ்.எம்"", மற்றும் என்றால் உதாரணமாக, இந்த உருப்படியை குறியீடு ""சட்டை"", ""டி-சட்டை-எஸ்.எம்"" இருக்கும் மாறுபாடு உருப்படியை குறியீடு ஆகிறது"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,நீங்கள் சம்பள விபரம் சேமிக்க முறை நிகர வருவாய் (வார்த்தைகளில்) காண முடியும்.
 DocType: Purchase Invoice,Is Return,திரும்ப
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,எச்சரிக்கை
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,எச்சரிக்கை
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,திரும்ப / டெபிட் குறிப்பு
 DocType: Price List Country,Price List Country,விலை பட்டியல் நாடு
 DocType: Item,UOMs,UOMs
@@ -1352,17 +1379,18 @@
 DocType: Account,Balance Sheet,இருப்பு தாள்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ','பொருள் கோட் பொருள் சென்டர் செலவாகும்
 DocType: Fee Validity,Valid Till,செல்லுபடியாகாத காலம்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","பணம் செலுத்தும் முறை உள்ளமைக்கப்படவில்லை. கணக்கு கொடுப்பனவு முறை அல்லது பிஓஎஸ் பதிவு செய்தது பற்றி அமைக்க என்பதையும், சரிபார்க்கவும்."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","பணம் செலுத்தும் முறை உள்ளமைக்கப்படவில்லை. கணக்கு கொடுப்பனவு முறை அல்லது பிஓஎஸ் பதிவு செய்தது பற்றி அமைக்க என்பதையும், சரிபார்க்கவும்."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,அதே பொருளைப் பலமுறை உள்ளிட முடியாது.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","மேலும் கணக்குகளை குழுக்கள் கீழ் செய்யப்பட்ட, ஆனால் உள்ளீடுகளை அல்லாத குழுக்கள் எதிராகவும் முடியும்"
 DocType: Lead,Lead,தலைமை
 DocType: Email Digest,Payables,Payables
 DocType: Course,Course Intro,பாடநெறி அறிமுகம்
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,பங்கு நுழைவு {0} உருவாக்கப்பட்ட
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,அமைவு&gt; எண் வரிசை தொடர் மூலம் கலந்துரையாடலுக்கான வரிசை எண்ணை அமைக்கவும்
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,பங்கு நுழைவு {0} உருவாக்கப்பட்ட
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,ரோ # {0}: அளவு கொள்முதல் ரிட்டன் உள்ளிட முடியாது நிராகரிக்கப்பட்டது
 ,Purchase Order Items To Be Billed,"பில்லிங் செய்யப்படும் விதமே இருக்கவும் செய்ய வாங்குதல், ஆர்டர் உருப்படிகள்"
 DocType: Purchase Invoice Item,Net Rate,நிகர விகிதம்
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,ஒரு வாடிக்கையாளரைத் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,ஒரு வாடிக்கையாளரைத் தேர்ந்தெடுக்கவும்
 DocType: Purchase Invoice Item,Purchase Invoice Item,விலைப்பட்டியல் பொருள் வாங்க
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,பங்கு லெட்ஜர் பதிவுகள் மற்றும் GL பதிவுகள் தேர்வு கொள்முதல் ரசீதுகள் இடுகையிட்டார்கள்
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,பொருள் 1
@@ -1383,7 +1411,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},பிரதி வரிசையில் {0} அதே {1}
 ,Trial Balance,விசாரணை இருப்பு
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,நிதியாண்டு {0} காணவில்லை
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,ஊழியர் அமைத்தல்
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,ஊழியர் அமைத்தல்
 DocType: Sales Order,SO-,அதனால்-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,முதல் முன்னொட்டு தேர்வு செய்க
 DocType: Employee,O-,O-
@@ -1395,12 +1423,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,காட்சி லெட்ஜர்
 DocType: Grading Scale,Intervals,இடைவெளிகள்
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,முந்தைய
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","ஒரு உருப்படி குழு அதே பெயரில் , உருப்படி பெயர் மாற்ற அல்லது உருப்படியை குழு பெயர்மாற்றம் செய்க"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","ஒரு உருப்படி குழு அதே பெயரில் , உருப்படி பெயர் மாற்ற அல்லது உருப்படியை குழு பெயர்மாற்றம் செய்க"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,மாணவர் மொபைல் எண்
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,உலகம் முழுவதும்
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,உலகம் முழுவதும்
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,பொருள் {0} பணி முடியாது
 ,Budget Variance Report,வரவு செலவு வேறுபாடு அறிக்கை
 DocType: Salary Slip,Gross Pay,ஒட்டு மொத்த ஊதியம் / சம்பளம்
+DocType: Item,Is Item from Hub,பொருள் இருந்து மையமாக உள்ளது
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,ரோ {0}: நடவடிக்கை வகை கட்டாயமாகும்.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,பங்கிலாபங்களைப்
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,கணக்கியல்  பேரேடு
@@ -1410,8 +1439,9 @@
 DocType: Vehicle Log,Service Detail,சேவை விரிவாக
 DocType: BOM,Item Description,பொருள் விளக்கம்
 DocType: Student Sibling,Student Sibling,மாணவர் உடன்பிறந்தோர்
-DocType: Purchase Invoice,Is Recurring,தொடர்
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,பணம் செலுத்தும் முறை
 DocType: Purchase Invoice,Supplied Items,வழங்கப்பட்ட பொருட்கள்
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},உணவகத்திற்கு {0}
 DocType: Student,STUD.,மூளைச்சாவு.
 DocType: Production Order,Qty To Manufacture,உற்பத்தி அளவு
 DocType: Email Digest,New Income,புதிய வரவு
@@ -1422,6 +1452,7 @@
 ,Student and Guardian Contact Details,மாணவர் மற்றும் கார்டியன் தொடர்பு விவரங்கள்
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,ரோ {0}: சப்ளையர் க்கு {0} மின்னஞ்சல் முகவரி மின்னஞ்சல் அனுப்ப வேண்டும்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,தற்காலிக திறப்பு
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,ஹப் பார்க்கவும்
 ,Employee Leave Balance,பணியாளர் விடுப்பு இருப்பு
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},{0} எப்போதும் இருக்க வேண்டும் கணக்கு இருப்பு {1}
 DocType: Patient Appointment,More Info,மேலும் தகவல்
@@ -1441,13 +1472,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,விற்பனை ஆணை {0} தவறானது
 DocType: Supplier Scorecard,Warn for new Request for Quotations,மேற்கோள்களுக்கான புதிய கோரிக்கைக்கு எச்சரிக்கவும்
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,கொள்முதல் ஆணைகள் நீ திட்டமிட உதவும் உங்கள் கொள்முதல் சரி வர
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","மன்னிக்கவும், நிறுவனங்கள் ஒன்றாக்க முடியாது"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","மன்னிக்கவும், நிறுவனங்கள் ஒன்றாக்க முடியாது"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,லேப் சோதனை பரிந்துரைப்புகள்
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",மொத்த வெளியீடு மாற்றம் / அளவு {0} பொருள் கோரிக்கை {1} \ பொருள் {2} கோரிய அளவு அதிகமாக இருக்கக் கூடாது முடியும் {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,சிறிய
 DocType: Employee,Employee Number,பணியாளர் எண்
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},வழக்கு எண் (கள்) ஏற்கனவே பயன்பாட்டில் உள்ளது. வழக்கு எண் இருந்து முயற்சி {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},வழக்கு எண் (கள்) ஏற்கனவே பயன்பாட்டில் உள்ளது. வழக்கு எண் இருந்து முயற்சி {0}
 DocType: Project,% Completed,% முடிந்தது
 ,Invoiced Amount (Exculsive Tax),விலை விவரம் தொகை ( ஒதுக்கி தள்ளும் பண்புடைய வரி )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,பொருள் 2
@@ -1462,11 +1493,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,மறைமுக செலவுகள்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,ரோ {0}: அளவு கட்டாய ஆகிறது
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,விவசாயம்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,ஒத்திசைவு முதன்மை தரவு
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,ஒத்திசைவு முதன்மை தரவு
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,உங்கள் தயாரிப்புகள் அல்லது சேவைகள்
 DocType: Special Test Items,Special Test Items,சிறப்பு டெஸ்ட் பொருட்கள்
 DocType: Mode of Payment,Mode of Payment,கட்டணம் செலுத்தும் முறை
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,இணைய பட ஒரு பொது கோப்பு அல்லது வலைத்தளத்தின் URL இருக்க வேண்டும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,இணைய பட ஒரு பொது கோப்பு அல்லது வலைத்தளத்தின் URL இருக்க வேண்டும்
 DocType: Student Applicant,AP,ஆந்திர
 DocType: Purchase Invoice Item,BOM,பொருட்களின் அளவுக்கான ரசீது(BOM)
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,இந்த ஒரு ரூட் உருப்படியை குழு மற்றும் திருத்த முடியாது .
@@ -1474,9 +1505,9 @@
 DocType: Vehicle,Fuel UOM,எரிபொருள் UOM
 DocType: Warehouse,Warehouse Contact Info,சேமிப்பு கிடங்கு தொடர்பு தகவல்
 DocType: Payment Entry,Write Off Difference Amount,வேறுபாடு தொகை ஆஃப் எழுத
-DocType: Purchase Invoice,Recurring Type,மீண்டும் வகை
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: ஊழியர் மின்னஞ்சல் கிடைக்கவில்லை, எனவே மின்னஞ்சல் அனுப்பப்படவில்லை."
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: ஊழியர் மின்னஞ்சல் கிடைக்கவில்லை, எனவே மின்னஞ்சல் அனுப்பப்படவில்லை."
 DocType: Item,Foreign Trade Details,வெளிநாட்டு வர்த்தக விவரங்கள்
+,Assessment Plan Status,மதிப்பீட்டு திட்டம் நிலை
 DocType: Email Digest,Annual Income,ஆண்டு வருமானம்
 DocType: Serial No,Serial No Details,தொடர் எண் விவரம்
 DocType: Purchase Invoice Item,Item Tax Rate,பொருள் வரி விகிதம்
@@ -1484,15 +1515,14 @@
 DocType: Student Group Student,Group Roll Number,குழு ரோல் எண்
 DocType: Student Group Student,Group Roll Number,குழு ரோல் எண்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} மட்டுமே கடன் கணக்குகள் மற்றொரு பற்று நுழைவு எதிராக இணைக்கப்பட்ட ஐந்து
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,அனைத்து பணி எடைகள் மொத்த இருக்க வேண்டும் 1. அதன்படி அனைத்து திட்ட பணிகளை எடைகள் சரிசெய்யவும்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,விநியோக  குறிப்பு {0} சமர்ப்பிக்கவில்லை
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,அனைத்து பணி எடைகள் மொத்த இருக்க வேண்டும் 1. அதன்படி அனைத்து திட்ட பணிகளை எடைகள் சரிசெய்யவும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,விநியோக  குறிப்பு {0} சமர்ப்பிக்கவில்லை
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,பொருள் {0} ஒரு துணை ஒப்பந்தம் பொருள் இருக்க வேண்டும்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,மூலதன கருவிகள்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","விலை விதி முதல் பொருள், பொருள் பிரிவு அல்லது பிராண்ட் முடியும், துறையில் 'விண்ணப்பிக்க' அடிப்படையில் தேர்வு செய்யப்படுகிறது."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,முதலில் உருப்படி கோட் ஐ அமைக்கவும்
-DocType: Hub Settings,Seller Website,விற்பனையாளர் வலைத்தளம்
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,முதலில் உருப்படி கோட் ஐ அமைக்கவும்
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,விற்பனை குழு மொத்த ஒதுக்கீடு சதவீதம் 100 இருக்க வேண்டும்
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,விற்பனை குழு மொத்த ஒதுக்கீடு சதவீதம் 100 இருக்க வேண்டும்
 DocType: Sales Invoice Item,Edit Description,விளக்கம் திருத்த
 DocType: Antibiotic,Antibiotic,ஆண்டிபயாடிக்
 ,Team Updates,குழு மேம்படுத்தல்கள்
@@ -1513,12 +1543,12 @@
 DocType: Purchase Invoice,Total (Company Currency),மொத்த (நிறுவனத்தின் நாணயம்)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,சீரியல் எண்ணை {0} க்கும் மேற்பட்ட முறை உள்ளிட்ட
 DocType: Depreciation Schedule,Journal Entry,பத்திரிகை நுழைவு
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} முன்னேற்றம் பொருட்களை
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} முன்னேற்றம் பொருட்களை
 DocType: Workstation,Workstation Name,பணிநிலைய பெயர்
 DocType: Grading Scale Interval,Grade Code,தர குறியீடு
 DocType: POS Item Group,POS Item Group,பிஓஎஸ் பொருள் குழு
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,மின்னஞ்சல் தொகுப்பு:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} பொருள் சேர்ந்தவர்கள் இல்லை {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} பொருள் சேர்ந்தவர்கள் இல்லை {1}
 DocType: Sales Partner,Target Distribution,இலக்கு விநியோகம்
 DocType: Salary Slip,Bank Account No.,வங்கி கணக்கு எண்
 DocType: Naming Series,This is the number of the last created transaction with this prefix,இந்த முன்னொட்டு கடந்த உருவாக்கப்பட்ட பரிவர்த்தனை எண்ணிக்கை
@@ -1535,10 +1565,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,மேற்கோள் சப்ளையர் கோரிக்கை
 DocType: Healthcare Settings,Registration Message,பதிவு செய்தியிடல்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,வன்பொருள்
-DocType: Sales Order,Recurring Upto,தொடர் வரை
 DocType: Prescription Dosage,Prescription Dosage,பரிந்துரை மருந்து
 DocType: Attendance,HR Manager,அலுவலக மேலாளர்
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,ஒரு நிறுவனத்தின் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,ஒரு நிறுவனத்தின் தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,தனிச்சலுகை விடுப்பு
 DocType: Purchase Invoice,Supplier Invoice Date,வழங்குபவர் விலைப்பட்டியல் தேதி
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,ஒன்றுக்கு
@@ -1555,10 +1584,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,இடையே காணப்படும் ஒன்றுடன் ஒன்று நிலைமைகள் :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,ஜர்னல் எதிராக நுழைவு {0} ஏற்கனவே வேறு சில ரசீது எதிரான சரிசெய்யப்பட்டது
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,மொத்த ஒழுங்கு மதிப்பு
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,உணவு
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,உணவு
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,வயதான ரேஞ்ச் 3
 DocType: Maintenance Schedule Item,No of Visits,வருகைகள் எண்ணிக்கை
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},பராமரிப்பு அட்டவணை {0} எதிராக உள்ளது {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,உங்கள் உருப்படிகளை மையமாக வெளியிட வேண்டுமா?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,பதிவுசெய்யும் மாணவர்
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},கணக்கை மூடுவதற்கான நாணயம் இருக்க வேண்டும் {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},அனைத்து இலக்குகளை புள்ளிகள் தொகை இது 100 இருக்க வேண்டும் {0}
@@ -1569,9 +1599,9 @@
 DocType: Authorization Rule,Average Discount,சராசரி தள்ளுபடி
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,பயன்பாடுகள்
-DocType: Purchase Invoice Item,Accounting,கணக்கியல்
+DocType: POS Profile,Accounting,கணக்கியல்
 DocType: Employee,EMP/,ஊழியர் /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,பேட்ச்சுடு உருப்படியை தொகுப்புகளும் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,பேட்ச்சுடு உருப்படியை தொகுப்புகளும் தேர்ந்தெடுக்கவும்
 DocType: Asset,Depreciation Schedules,தேய்மானம் கால அட்டவணைகள்
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,விண்ணப்ப காலம் வெளியே விடுப்பு ஒதுக்கீடு காலம் இருக்க முடியாது
 DocType: Activity Cost,Projects,திட்டங்கள்
@@ -1587,7 +1617,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',அங்கீகாரநிலையை அங்கீகரிக்கப்பட்ட 'அல்லது' நிராகரிக்கப்பட்டது '
 DocType: Physician,Contacts and Address,தொடர்புகள் மற்றும் முகவரி
 DocType: Purchase Invoice,Contact Person,நபர் தொடர்பு
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',' எதிர்பார்த்த தொடக்க தேதி ' 'எதிர்பார்த்த முடிவு தேதி ' ஐ விட அதிகமாக இருக்க முடியாது
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',' எதிர்பார்த்த தொடக்க தேதி ' 'எதிர்பார்த்த முடிவு தேதி ' ஐ விட அதிகமாக இருக்க முடியாது
 DocType: Course Scheduling Tool,Course End Date,நிச்சயமாக முடிவு தேதி
 DocType: Holiday List,Holidays,விடுமுறை
 DocType: Sales Order Item,Planned Quantity,திட்டமிட்ட அளவு
@@ -1595,10 +1625,11 @@
 DocType: Item,Maintain Stock,பங்கு பராமரிக்கவும்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,ஏற்கனவே உற்பத்தி ஆணை உருவாக்கப்பட்ட பங்கு பதிவுகள்
 DocType: Employee,Prefered Email,prefered மின்னஞ்சல்
+DocType: Student Admission,Eligibility and Details,தகுதி மற்றும் விவரம்
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,நிலையான சொத்து நிகர மாற்றம்
 DocType: Leave Control Panel,Leave blank if considered for all designations,அனைத்து வடிவ கருத்தில் இருந்தால் வெறுமையாக
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,வகை வரிசையில் {0} ல் ' உண்மையான ' பொறுப்பு மதிப்பிட சேர்க்கப்பட்டுள்ளது முடியாது
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},அதிகபட்சம்: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},அதிகபட்சம்: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,தேதி நேரம் இருந்து
 DocType: Email Digest,For Company,நிறுவனத்தின்
 apps/erpnext/erpnext/config/support.py +17,Communication log.,தொடர்பாடல் பதிவு.
@@ -1606,19 +1637,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,சப்ளையர் ஸ்கோர் கார்ட் மாறி
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,தொகை வாங்கும்
 DocType: Sales Invoice,Shipping Address Name,ஷிப்பிங் முகவரி பெயர்
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,கணக்கு விளக்கப்படம்
 DocType: Material Request,Terms and Conditions Content,நிபந்தனைகள் உள்ளடக்கம்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,100 க்கும் அதிகமாக இருக்க முடியாது
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,பொருள் {0} ஒரு பங்கு பொருள் அல்ல
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,பொருள் {0} ஒரு பங்கு பொருள் அல்ல
 DocType: Maintenance Visit,Unscheduled,திட்டமிடப்படாத
 DocType: Employee,Owned,சொந்தமானது
 DocType: Salary Detail,Depends on Leave Without Pay,சம்பளமில்லா விடுப்பு பொறுத்தது
 DocType: Pricing Rule,"Higher the number, higher the priority","உயர் எண், அதிக முன்னுரிமை"
 ,Purchase Invoice Trends,விலைப்பட்டியல் போக்குகள் வாங்குவதற்கு
 DocType: Employee,Better Prospects,நல்ல வாய்ப்புகள்
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","ரோ # {0}: தொகுதி {1} மட்டுமே {2} கொத்தமல்லி உள்ளது. கிடைக்க கொண்ட {3} கொத்தமல்லி மற்றொரு தொகுதி தேர்ந்தெடுக்கவும் அல்லது / பல தொகுப்புகளும் இருந்து பிரச்சினை வழங்க, பல வரிசைகள் ஒரு வரிசையில் பிரிக்கவும்"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","ரோ # {0}: தொகுதி {1} மட்டுமே {2} கொத்தமல்லி உள்ளது. கிடைக்க கொண்ட {3} கொத்தமல்லி மற்றொரு தொகுதி தேர்ந்தெடுக்கவும் அல்லது / பல தொகுப்புகளும் இருந்து பிரச்சினை வழங்க, பல வரிசைகள் ஒரு வரிசையில் பிரிக்கவும்"
 DocType: Vehicle,License Plate,உரிமம் தகடு
 DocType: Appraisal,Goals,இலக்குகளை
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,POS சுயவிவரத்தைத் தேர்ந்தெடுக்கவும்
 DocType: Warranty Claim,Warranty / AMC Status,உத்தரவாதத்தை / AMC நிலைமை
 ,Accounts Browser,கணக்கு உலாவி
 DocType: Payment Entry Reference,Payment Entry Reference,கொடுப்பனவு நுழைவு குறிப்பு
@@ -1637,7 +1668,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,பணியாளர் தன்னை தெரிவிக்க முடியாது.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","கணக்கு முடக்கப்படும் என்றால், உள்ளீடுகளை தடை செய்த அனுமதிக்கப்படுகிறது ."
 DocType: Email Digest,Bank Balance,வங்கி மீதி
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} மட்டுமே நாணய முடியும்: {0} பைனான்ஸ் நுழைவு {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} மட்டுமே நாணய முடியும்: {0} பைனான்ஸ் நுழைவு {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","வேலை சுயவிவரத்தை, தகுதிகள் தேவை முதலியன"
 DocType: Journal Entry Account,Account Balance,கணக்கு இருப்பு
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,பரிவர்த்தனைகள் வரி விதி.
@@ -1646,8 +1677,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),மொத்த வரி மற்றும் கட்டணங்கள் (நிறுவனத்தின் கரன்சி)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,மூடப்படாத நிதி ஆண்டில் பி &amp; எல் நிலுவைகளை காட்டு
 DocType: Lab Test Template,Collection Details,சேகரிப்பு விவரங்கள்
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date தாவலில் இருந்து. கூட்டுப்புழு ct, `tabLab பரிந்துரைப்பு` cp where ct.patient = &#39;{0}&#39; மற்றும் cp.parent = ct. பெயர் மற்றும் cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,கப்பல் கணக்கு
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: கணக்கு {2} செயலற்று உள்ளது
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,விற்பனை ஆணைகள் நீங்கள் உங்கள் வேலை திட்டமிட உதவும் மற்றும் சரியான நேரத்தில் வழங்க செய்ய
@@ -1664,7 +1693,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,ஸ்லிப் பொதி
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,அலுவலகத்திற்கு வாடகைக்கு
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,அமைப்பு எஸ்எம்எஸ் வாயில் அமைப்புகள்
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,இறக்குமதி தோல்வி!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,இறக்குமதி தோல்வி!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,இல்லை முகவரி இன்னும் கூறினார்.
 DocType: Workstation Working Hour,Workstation Working Hour,பணிநிலையம் வேலை செய்யும் நேரம்
 DocType: Vital Signs,Blood Pressure,இரத்த அழுத்தம்
@@ -1689,7 +1718,7 @@
 DocType: Sales Invoice,Source,மூல
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,மூடப்பட்டது காட்டு
 DocType: Leave Type,Is Leave Without Pay,சம்பளமில்லா விடுப்பு
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,சொத்து வகை நிலையான சொத்து உருப்படியை அத்தியாவசியமானதாகும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,சொத்து வகை நிலையான சொத்து உருப்படியை அத்தியாவசியமானதாகும்
 DocType: Fee Validity,Fee Validity,கட்டணம் செல்லுபடியாகும்
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,கொடுப்பனவு அட்டவணை காணப்படவில்லை பதிவுகள்
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},இந்த {0} கொண்டு மோதல்கள் {1} க்கான {2} {3}
@@ -1710,8 +1739,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,நிறைவேற்று தேடல்
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,லீட்ஸ் உருவாக்கவும்
 DocType: Maintenance Schedule,Schedules,கால அட்டவணைகள்
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,பாயிண்ட்-ன்-விற்பனைக்கு POS விவரம் தேவை
 DocType: Purchase Invoice Item,Net Amount,நிகர விலை
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} ஓர் செயல் முடிவடைந்தால் முடியாது சமர்ப்பிக்க செய்யப்படவில்லை
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} ஓர் செயல் முடிவடைந்தால் முடியாது சமர்ப்பிக்க செய்யப்படவில்லை
 DocType: Purchase Order Item Supplied,BOM Detail No,"BOM 
 விபரம் எண்"
 DocType: Landed Cost Voucher,Additional Charges,கூடுதல் கட்டணங்கள்
@@ -1721,7 +1751,7 @@
 ,Support Hour Distribution,மணிநேர ஆதரவு வழங்குதல்
 DocType: Maintenance Visit,Maintenance Visit,பராமரிப்பு வருகை
 DocType: Student,Leaving Certificate Number,சான்றிதழ் எண் விட்டு
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","நியமனம் ரத்து செய்யப்பட்டது, தயவுசெய்து மதிப்பாய்வு செய்து, விலைப்பட்டியல் {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","நியமனம் ரத்து செய்யப்பட்டது, தயவுசெய்து மதிப்பாய்வு செய்து, விலைப்பட்டியல் {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,கிடங்கு உள்ள கிடைக்கும் தொகுதி அளவு
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,புதுப்பிக்கப்பட்டது அச்சு வடிவம்
 DocType: Landed Cost Voucher,Landed Cost Help,Landed செலவு உதவி
@@ -1744,8 +1774,8 @@
 DocType: Patient,Tobacco Past Use,புகையிலை கடந்த பயன்பாடு
 DocType: Sales Invoice Item,Brand Name,குறியீட்டு பெயர்
 DocType: Purchase Receipt,Transporter Details,இடமாற்றி விபரங்கள்
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},பயனர் {0} ஏற்கனவே மருத்துவர் {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,இயல்புநிலை கிடங்கில் தேர்ந்தெடுத்தவையை தேவை
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},பயனர் {0} ஏற்கனவே மருத்துவர் {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,இயல்புநிலை கிடங்கில் தேர்ந்தெடுத்தவையை தேவை
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,பெட்டி
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,சாத்தியமான சப்ளையர்
 DocType: Budget,Monthly Distribution,மாதாந்திர விநியோகம்
@@ -1755,8 +1785,8 @@
 DocType: Sales Partner,Sales Partner Target,விற்பனை வரன்வாழ்க்கை துணை இலக்கு
 DocType: Loan Type,Maximum Loan Amount,அதிகபட்ச கடன் தொகை
 DocType: Pricing Rule,Pricing Rule,விலை விதி
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},மாணவர் க்கான பிரதி ரோல் எண்ணை {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},மாணவர் க்கான பிரதி ரோல் எண்ணை {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},மாணவர் க்கான பிரதி ரோல் எண்ணை {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},மாணவர் க்கான பிரதி ரோல் எண்ணை {0}
 DocType: Budget,Action if Annual Budget Exceeded,அதிரடி ஆண்டு வரவு-செலவுத் மீறிவிட்டது
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,ஆணை வாங்க பொருள் வேண்டுதல்
 DocType: Shopping Cart Settings,Payment Success URL,கட்டணம் வெற்றி URL ஐ
@@ -1773,7 +1803,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} ஒரு முறை மட்டுமே தோன்ற வேண்டும்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},மேலும் பரிமாற்ற அனுமதி இல்லை {0} விட {1} கொள்முதல் ஆணை எதிராக {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},விடுப்பு வெற்றிகரமாக ஒதுக்கப்பட்ட {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,மூட்டை உருப்படிகள் எதுவும் இல்லை
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,மூட்டை உருப்படிகள் எதுவும் இல்லை
 DocType: Shipping Rule Condition,From Value,மதிப்பு இருந்து
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,உற்பத்தி அளவு கட்டாய ஆகிறது
 DocType: Employee Loan,Repayment Method,திரும்பச் செலுத்துதல் முறை
@@ -1787,6 +1817,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,பங்கு பொறுப்புகள்
 DocType: Purchase Invoice,Supplier Warehouse,வழங்குபவர் கிடங்கு
 DocType: Opportunity,Contact Mobile No,மொபைல் எண்  தொடர்பு
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,நிறுவனம் தேர்ந்தெடு
 ,Material Requests for which Supplier Quotations are not created,வழங்குபவர் மேற்கோள்கள் உருவாக்கப்பட்ட எந்த பொருள் கோரிக்கைகள்
 DocType: Student Group,Set 0 for no limit,எந்த எல்லை 0 அமை
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,நீங்கள் விடுப்பு விண்ணப்பிக்கும் எந்த நாள் (கள்) விடுமுறை. நீங்கள் விடுப்பு விண்ணப்பிக்க வேண்டும்.
@@ -1796,24 +1827,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,மேற்கோள் செய்ய
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,பிற அறிக்கைகள்
 DocType: Dependent Task,Dependent Task,தங்கிவாழும் பணி
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},நடவடிக்கை இயல்புநிலை பிரிவு மாற்ற காரணி வரிசையில் 1 வேண்டும் {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},நடவடிக்கை இயல்புநிலை பிரிவு மாற்ற காரணி வரிசையில் 1 வேண்டும் {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},வகை விடுப்பு {0} மேலாக இருக்க முடியாது {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,முன்கூட்டியே எக்ஸ் நாட்கள் நடவடிக்கைகளுக்குத் திட்டமிட்டுள்ளது முயற்சி.
 DocType: HR Settings,Stop Birthday Reminders,நிறுத்து நினைவூட்டல்கள்
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},நிறுவனத்தின் இயல்புநிலை சம்பளப்பட்டியல் செலுத்த வேண்டிய கணக்கு அமைக்கவும் {0}
 DocType: SMS Center,Receiver List,ரிசீவர் பட்டியல்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,தேடல் பொருள்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,தேடல் பொருள்
 DocType: Patient Appointment,Referring Physician,மருத்துவர் குறிப்பிடுகிறார்
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,உட்கொள்ளுகிறது தொகை
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,பண நிகர மாற்றம்
 DocType: Assessment Plan,Grading Scale,தரம் பிரித்தல் ஸ்கேல்
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,நடவடிக்கை அலகு {0} மேலும் மாற்று காரணி அட்டவணை முறை விட உள்ளிட்ட
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,ஏற்கனவே நிறைவு
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,நடவடிக்கை அலகு {0} மேலும் மாற்று காரணி அட்டவணை முறை விட உள்ளிட்ட
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,ஏற்கனவே நிறைவு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,கை பங்கு
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},பணம் கோரிக்கை ஏற்கனவே உள்ளது {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,வெளியிடப்படுகிறது பொருட்களை செலவு
 DocType: Physician,Hospital,மருத்துவமனையில்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},அளவு அதிகமாக இருக்க கூடாது {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},அளவு அதிகமாக இருக்க கூடாது {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,முந்தைய நிதி ஆண்டில் மூடவில்லை
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),வயது (நாட்கள்)
 DocType: Quotation Item,Quotation Item,மேற்கோள் பொருள்
@@ -1824,8 +1855,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,வழங்குபவர் வகை மாஸ்டர் .
 DocType: Purchase Order Item,Supplier Part Number,வழங்குபவர் பாகம் எண்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,மாற்று விகிதம் 0 அல்லது 1 இருக்க முடியாது
-DocType: Sales Invoice,Reference Document,குறிப்பு ஆவண
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} ரத்து செய்யப்பட்டது அல்லது நிறுத்தி உள்ளது
+DocType: Subscription,Reference Document,குறிப்பு ஆவண
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} ரத்து செய்யப்பட்டது அல்லது நிறுத்தி உள்ளது
 DocType: Accounts Settings,Credit Controller,கடன் கட்டுப்பாட்டாளர்
 DocType: Delivery Note,Vehicle Dispatch Date,வாகன அனுப்புகை தேதி
 DocType: Healthcare Settings,Default Medical Code Standard,இயல்புநிலை மருத்துவ குறியீடு தரநிலை
@@ -1834,6 +1865,7 @@
 DocType: Company,Default Payable Account,இயல்புநிலை செலுத்த வேண்டிய கணக்கு
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","அத்தகைய கப்பல் விதிகள், விலை பட்டியல் முதலியன போன்ற ஆன்லைன் வணிக வண்டி அமைப்புகள்"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% வசூலிக்கப்படும்
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,விலை மூலம் வரிசைப்படுத்து ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,பாதுகாக்கப்பட்டவை அளவு
 DocType: Party Account,Party Account,கட்சி கணக்கு
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,மனித வளங்கள்
@@ -1845,13 +1877,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,இரு வாரங்கள் முடிவதற்குள் நுழைவு செய்ய
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,ரோ {0}: சப்ளையர் எதிராக அட்வான்ஸ் பற்று
 DocType: Company,Default Values,இயல்புநிலை மதிப்புகள்
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{அதிர்வெண்} டைஜஸ்ட்
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{அதிர்வெண்} டைஜஸ்ட்
 DocType: Expense Claim,Total Amount Reimbursed,மொத்த அளவு திரும்ப
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,இந்த வாகன எதிராக பதிவுகள் அடிப்படையாக கொண்டது. விவரங்கள் கீழே காலவரிசை பார்க்க
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},வழங்குபவர் எதிராக விலைப்பட்டியல் {0} தேதியிட்ட {1}
 DocType: Customer,Default Price List,முன்னிருப்பு விலை பட்டியல்
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,சொத்து இயக்கம் சாதனை {0} உருவாக்கப்பட்ட
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,நீங்கள் நீக்க முடியாது நிதியாண்டு {0}. நிதியாண்டு {0} உலகளாவிய அமைப்புகள் முன்னிருப்பாக அமைக்க உள்ளது
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,அதே பெயருடன் ஒரு வாடிக்கையாளர் ஏற்கனவே உள்ளார்
 DocType: Journal Entry,Entry Type,நுழைவு வகை
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,இந்த மதிப்பீடு குழு இணைக்கப்பட்ட இல்லை மதிப்பீடு திட்டம்
 ,Customer Credit Balance,வாடிக்கையாளர் கடன் இருப்பு
@@ -1861,7 +1894,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,விலை
 DocType: Quotation,Term Details,கால விவரம்
 DocType: Project,Total Sales Cost (via Sales Order),மொத்த விற்பனை செலவு (விற்பனை ஆணை வழியாக)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,{0} இந்த மாணவர் குழு மாணவர்கள் விட சேர முடியாது.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,{0} இந்த மாணவர் குழு மாணவர்கள் விட சேர முடியாது.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,முன்னணி கவுண்ட்
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,முன்னணி கவுண்ட்
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 விட அதிகமாக இருக்க வேண்டும்
@@ -1879,9 +1912,11 @@
 DocType: Lab Test,Technician Name,தொழில்நுட்ப பெயர்
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,விலைப்பட்டியல் ரத்து கட்டணங்களை செலுத்தும் இணைப்பகற்றம்
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},தற்போதைய ஓடோமீட்டர் வாசிப்பு உள்ளிட்ட ஆரம்ப வாகன ஓடோமீட்டர் விட அதிகமாக இருக்க வேண்டும் {0}
+DocType: Restaurant Reservation,No Show,காட்சி இல்லை
 DocType: Shipping Rule Country,Shipping Rule Country,கப்பல் விதி நாடு
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,விட்டு மற்றும் வருகை
 DocType: Maintenance Visit,Partially Completed,ஓரளவிற்கு பூர்த்தி
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,மிதமான உணர்திறன்
 DocType: Leave Type,Include holidays within leaves as leaves,இலைகள் போன்ற இலைகள் உள்ள விடுமுறை சேர்க்கவும்
 DocType: Sales Invoice,Packed Items,நிரம்பிய பொருட்கள்
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,வரிசை எண் எதிரான உத்தரவாதத்தை கூறுகின்றனர்
@@ -1898,13 +1933,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),செலுத்தப்பட்ட தொகை எவ்வளவு (நிறுவனத்தின் நாணய)
 DocType: Purchase Invoice,Additional Discount,கூடுதல் தள்ளுபடி
 DocType: Selling Settings,Selling Settings,அமைப்புகள் விற்பனை
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,செயல் என்பதை உறுதிப்படுத்துக
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ஆன்லைன் ஏலங்களில்
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,அளவு அல்லது மதிப்பீட்டு விகிதம் அல்லது இரண்டு அல்லது குறிப்பிடவும்
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,நிறைவேற்றுதல்
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,வண்டியில் காண்க
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,மார்க்கெட்டிங் செலவுகள்
 ,Item Shortage Report,பொருள் பற்றாக்குறை அறிக்கை
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","எடை கூட ""எடை UOM"" குறிப்பிட தயவு செய்து \n குறிப்பிடப்பட்டுள்ளது"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","எடை கூட ""எடை UOM"" குறிப்பிட தயவு செய்து \n குறிப்பிடப்பட்டுள்ளது"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,இந்த பங்கு நுழைவு செய்ய பயன்படுத்தப்படும் பொருள் கோரிக்கை
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,அடுத்த தேய்மானம் தேதி புதிய சொத்து அத்தியாவசியமானதாகும்
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,ஒவ்வொரு தொகுதி தனி நிச்சயமாக பொறுத்தே குழு
@@ -1917,12 +1953,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ஒவ்வொரு பங்கு கணக்கு பதிவு செய்ய
 DocType: Leave Allocation,Total Leaves Allocated,மொத்த இலைகள் ஒதுக்கப்பட்ட
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},ரோ இல்லை தேவையான கிடங்கு {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,செல்லுபடியாகும் நிதி ஆண்டின் தொடக்க மற்றும் முடிவு தேதிகளை உள்ளிடவும்
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,செல்லுபடியாகும் நிதி ஆண்டின் தொடக்க மற்றும் முடிவு தேதிகளை உள்ளிடவும்
 DocType: Employee,Date Of Retirement,ஓய்வு தேதி
 DocType: Upload Attendance,Get Template,வார்ப்புரு கிடைக்கும்
 DocType: Material Request,Transferred,மாற்றப்பட்டது
 DocType: Vehicle,Doors,கதவுகள்
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext அமைவு முடிந்தது!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext அமைவு முடிந்தது!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,நோயாளி பதிவுக்கான கட்டணம் சேகரிக்கவும்
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,வரி முறிவுக்குப்
@@ -1941,37 +1977,37 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","இந்த உருப்படியை வகைகள் உண்டு என்றால், அது விற்பனை ஆணைகள் முதலியன தேர்வு"
 DocType: Lead,Next Contact By,அடுத்த தொடர்பு
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},உருப்படி தேவையான அளவு {0} வரிசையில் {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},உருப்படி தேவையான அளவு {0} வரிசையில் {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},அளவு பொருள் உள்ளது என கிடங்கு {0} நீக்க முடியாது {1}
 DocType: Quotation,Order Type,வரிசை வகை
-DocType: Purchase Invoice,Notification Email Address,அறிவிப்பு மின்னஞ்சல் முகவரி
 ,Item-wise Sales Register,பொருள் வாரியான விற்பனை பதிவு
 DocType: Asset,Gross Purchase Amount,மொத்த கொள்முதல் அளவு
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,திறக்கும் இருப்பு
 DocType: Asset,Depreciation Method,தேய்மானம் முறை
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,ஆஃப்லைன்
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,ஆஃப்லைன்
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,இந்த வரி அடிப்படை விகிதம் சேர்க்கப்பட்டுள்ளது?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,மொத்த இலக்கு
 DocType: Job Applicant,Applicant for a Job,ஒரு வேலை விண்ணப்பதாரர்
 DocType: Production Plan Material Request,Production Plan Material Request,உற்பத்தித் திட்டத்தைத் பொருள் வேண்டுகோள்
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,உருவாக்கப்பட்ட எந்த உற்பத்தி ஆணைகள்
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,உருவாக்கப்பட்ட எந்த உற்பத்தி ஆணைகள்
 DocType: Stock Reconciliation,Reconciliation JSON,சமரசம் JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,பல பத்திகள். அறிக்கை ஏற்றுமதி மற்றும் ஒரு விரிதாள் பயன்பாட்டை பயன்படுத்தி அச்சிட.
 DocType: Purchase Invoice Item,Batch No,தொகுதி இல்லை
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},மேற்கோள் தேவை கோரிக்கை: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,ஒரு வாடிக்கையாளர் கொள்முதல் ஆணை எதிராக பல விற்பனை ஆணைகள் அனுமதி
 DocType: Student Group Instructor,Student Group Instructor,மாணவர் குழு பயிற்றுவிப்பாளர்
 DocType: Student Group Instructor,Student Group Instructor,மாணவர் குழு பயிற்றுவிப்பாளர்
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 கைப்பேசி
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,முதன்மை
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,முதன்மை
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,மாற்று
 DocType: Naming Series,Set prefix for numbering series on your transactions,உங்கள் நடவடிக்கைகள் மீது தொடர் எண்ணுவதற்கான முன்னொட்டு அமைக்க
 DocType: Employee Attendance Tool,Employees HTML,"ஊழியர், HTML"
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,"இயல்புநிலை BOM, ({0}) இந்த உருப்படியை அல்லது அதன் டெம்ப்ளேட் தீவிரமாக இருக்க வேண்டும்"
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,"இயல்புநிலை BOM, ({0}) இந்த உருப்படியை அல்லது அதன் டெம்ப்ளேட் தீவிரமாக இருக்க வேண்டும்"
 DocType: Employee,Leave Encashed?,காசாக்கப்பட்டால் விட்டு?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,துறையில் இருந்து வாய்ப்பு கட்டாய ஆகிறது
 DocType: Email Digest,Annual Expenses,வருடாந்த செலவுகள்
 DocType: Item,Variants,மாறிகள்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,கொள்முதல் ஆணை செய்ய
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,கொள்முதல் ஆணை செய்ய
 DocType: SMS Center,Send To,அனுப்பு
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},விடுப்பு வகை போதுமான விடுப்பு சமநிலை இல்லை {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ஒதுக்கப்பட்டுள்ள தொகை
@@ -1988,6 +2024,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,மாணவர் குழு வலிமை
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,ஜர்னல் எதிராக நுழைவு {0} எந்த வேறொன்றும் {1} நுழைவு இல்லை
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,மதிப்பீடுகளில்
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,பயிற்சி நிகழ்வுகள்
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},நகல் சீரியல் இல்லை உருப்படி உள்ளிட்ட {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ஒரு கப்பல் ஆட்சிக்கு ஒரு நிலையில்
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,தயவுசெய்து உள்ளீடவும்
@@ -1997,7 +2034,7 @@
 DocType: Sales Order,To Deliver and Bill,வழங்க மசோதா
 DocType: Student Group,Instructors,பயிற்றுனர்கள்
 DocType: GL Entry,Credit Amount in Account Currency,கணக்கு நாணய கடன் தொகை
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} சமர்ப்பிக்க வேண்டும்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} சமர்ப்பிக்க வேண்டும்
 DocType: Authorization Control,Authorization Control,அங்கீகாரம் கட்டுப்பாடு
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ரோ # {0}: கிடங்கு நிராகரிக்கப்பட்டது நிராகரித்தது பொருள் எதிராக கட்டாயமாகும் {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,கொடுப்பனவு
@@ -2016,11 +2053,11 @@
 DocType: Quotation Item,Actual Qty,உண்மையான அளவு
 DocType: Sales Invoice Item,References,குறிப்புகள்
 DocType: Quality Inspection Reading,Reading 10,10 படித்தல்
-DocType: Hub Settings,Hub Node,மையம் கணு
+DocType: Hub Category,Hub Node,மையம் கணு
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,நீங்கள் போலி பொருட்களை நுழைந்தது. சரிசெய்து மீண்டும் முயற்சிக்கவும்.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,இணை
 DocType: Asset Movement,Asset Movement,சொத்து இயக்கம்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,புதிய வண்டி
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,புதிய வண்டி
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,பொருள் {0} ஒரு தொடர் பொருள் அல்ல
 DocType: SMS Center,Create Receiver List,பெறுநர் பட்டியல் உருவாக்க
 DocType: Vehicle,Wheels,வீல்ஸ்
@@ -2034,15 +2071,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,தொலைத்தொடர்பு
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),தொகுப்பு இந்த விநியோக ஒரு பகுதியாக உள்ளது என்று குறிக்கிறது (மட்டும் வரைவு)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,கொடுப்பனவு நுழைவு செய்ய
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},அளவு உருப்படி {0} விட குறைவாக இருக்க வேண்டும் {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},அளவு உருப்படி {0} விட குறைவாக இருக்க வேண்டும் {1}
 ,Sales Invoice Trends,விற்பனை விலைப்பட்டியல் போக்குகள்
 DocType: Leave Application,Apply / Approve Leaves,இலைகள் ஒப்புதல் / விண்ணப்பிக்கவும்
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,ஐந்து
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,ஐந்து
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',கட்டணம் வகை அல்லது ' முந்தைய வரிசை மொத்த ' முந்தைய வரிசை அளவு ' மட்டுமே வரிசையில் பார்க்கவும் முடியும்
 DocType: Sales Order Item,Delivery Warehouse,டெலிவரி கிடங்கு
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,நிதி செலவு மையங்கள் மரம்.
 DocType: Serial No,Delivery Document No,டெலிவரி ஆவண இல்லை
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},&#39;சொத்துக்களை மீது லாபம் / நஷ்டம் கணக்கு&#39; அமைக்க கம்பெனி உள்ள {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},&#39;சொத்துக்களை மீது லாபம் / நஷ்டம் கணக்கு&#39; அமைக்க கம்பெனி உள்ள {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,கொள்முதல் ரசீதுகள் இருந்து விடயங்கள் பெறவும்
 DocType: Serial No,Creation Date,உருவாக்கிய தேதி
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},பொருள் {0} விலை பட்டியல் பல முறை தோன்றும் {1}
@@ -2053,12 +2090,13 @@
 DocType: Student,Student Mobile Number,மாணவர் மொபைல் எண்
 DocType: Item,Has Variants,வகைகள் உண்டு
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,பதில் புதுப்பிக்கவும்
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},நீங்கள் ஏற்கனவே இருந்து பொருட்களை தேர்ந்தெடுத்த {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},நீங்கள் ஏற்கனவே இருந்து பொருட்களை தேர்ந்தெடுத்த {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,மாதாந்திர விநியோகம் பெயர்
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,தொகுப்பு ஐடி கட்டாயமாகும்
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,தொகுப்பு ஐடி கட்டாயமாகும்
 DocType: Sales Person,Parent Sales Person,பெற்றோர் விற்பனை நபர்
-DocType: Purchase Invoice,Recurring Invoice,மீண்டும் விலைப்பட்டியல்
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,அதிக உயரம்
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,முதலில் நிரலைத் தேர்ந்தெடுக்கவும்
 DocType: Patient Appointment,Patient Age,நோயாளி வயது
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,திட்டங்கள் நிர்வாக
 DocType: Supplier,Supplier of Goods or Services.,பொருட்கள் அல்லது சேவைகள் சப்ளையர்.
@@ -2066,8 +2104,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"ஆலோசனைக் கட்டணம் கட்டாயமாக நோயாளிக்கு அமைக்கப்படாவிட்டால், இயலக்கூடிய பெறத்தக்க கணக்குகள் பயன்படுத்தப்பட வேண்டும்."
 DocType: Vehicle Log,Fuel Price,எரிபொருள் விலை
 DocType: Budget,Budget,வரவு செலவு திட்டம்
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,திறந்த அமை
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,நிலையான சொத்து பொருள் அல்லாத பங்கு உருப்படியை இருக்க வேண்டும்.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,திறந்த அமை
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,நிலையான சொத்து பொருள் அல்லாத பங்கு உருப்படியை இருக்க வேண்டும்.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",அது ஒரு வருமான அல்லது செலவு கணக்கு அல்ல என பட்ஜெட் எதிராக {0} ஒதுக்கப்படும் முடியாது
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,அடைய
 DocType: Student Admission,Application Form Route,விண்ணப்ப படிவம் வழி
@@ -2081,12 +2119,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,பொருள் {0} சீரியல் எண்கள் சோதனை பொருள் மாஸ்டர் அமைப்பு அல்ல
 DocType: Maintenance Visit,Maintenance Time,பராமரிப்பு நேரம்
 ,Amount to Deliver,அளவு வழங்க வேண்டும்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},அதே உருப்படியை பல முறை உள்ளிட்டுள்ளது. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,கால தொடக்க தேதி கால இணைக்கப்பட்ட செய்ய கல்வியாண்டின் ஆண்டு தொடக்க தேதி முன்னதாக இருக்க முடியாது (கல்வி ஆண்டு {}). தேதிகள் சரிசெய்து மீண்டும் முயற்சிக்கவும்.
 DocType: Guardian,Guardian Interests,கார்டியன் ஆர்வம்
 DocType: Naming Series,Current Value,தற்போதைய மதிப்பு
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,பல நிதியாண்டு தேதி {0} உள்ளன. இந்த நிதி ஆண்டில் நிறுவனம் அமைக்கவும்
 DocType: School Settings,Instructor Records to be created by,பயிற்றுவிப்பாளர் பதிவுகள் உருவாக்கப்பட வேண்டும்
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} உருவாக்கப்பட்டது
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} உருவாக்கப்பட்டது
 DocType: Delivery Note Item,Against Sales Order,விற்னையாளர் எதிராக
 ,Serial No Status,தொடர் இல்லை நிலைமை
 DocType: Payment Entry Reference,Outstanding,சிறந்த
@@ -2097,10 +2136,10 @@
  இடையே வேறுபாடு அதிகமாக அல்லது சமமாக இருக்க வேண்டும், {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,இந்த பங்கு இயக்கத்தை அடிப்படையாக கொண்டது. பார்க்க {0} விவரங்களுக்கு
 DocType: Pricing Rule,Selling,விற்பனை
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},அளவு {0} {1} எதிராக கழிக்கப்படும் {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},அளவு {0} {1} எதிராக கழிக்கப்படும் {2}
 DocType: Employee,Salary Information,சம்பளம் தகவல்
 DocType: Sales Person,Name and Employee ID,பெயர் மற்றும் பணியாளர் ஐடி
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,காரணம் தேதி தேதி தகவல்களுக்கு முன் இருக்க முடியாது
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,காரணம் தேதி தேதி தகவல்களுக்கு முன் இருக்க முடியாது
 DocType: Website Item Group,Website Item Group,இணைய தகவல்கள் குழு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,கடமைகள் மற்றும் வரி
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,குறிப்பு தேதியை உள்ளிடவும்
@@ -2126,7 +2165,7 @@
 DocType: Issue,Resolution Details,தீர்மானம் விவரம்
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ஒதுக்கீடுகள்
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,ஏற்று கொள்வதற்கான நிபந்தனை
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,தயவு செய்து மேலே உள்ள அட்டவணையில் பொருள் கோரிக்கைகள் நுழைய
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,தயவு செய்து மேலே உள்ள அட்டவணையில் பொருள் கோரிக்கைகள் நுழைய
 DocType: Item Attribute,Attribute Name,பெயர் பண்பு
 DocType: BOM,Show In Website,இணையத்தளம் காண்பி
 DocType: Shopping Cart Settings,Show Quantity in Website,இணையத்தளம் கலப்பினமாடுகள் காட்டு
@@ -2135,7 +2174,7 @@
 DocType: Item Reorder,Check in (group),சரிபார்க்க (குழு)
 ,Qty to Order,அளவு ஒழுங்கிற்கு
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","லாபம் / இழப்பு பதிவு செய்யப்படும் எந்த பொறுப்பு அல்லது ஈக்விட்டி கீழ் கணக்கு தலை,"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,அனைத்து பணிகளை கன்ட் விளக்கப்படம்.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,அனைத்து பணிகளை கன்ட் விளக்கப்படம்.
 DocType: Opportunity,Mins to First Response,முதல் பதில் நிமிடங்கள்
 DocType: Pricing Rule,Margin Type,மார்ஜின் வகை
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} மணி
@@ -2156,37 +2195,37 @@
 DocType: Patient,Surgical History,அறுவை சிகிச்சை வரலாறு
 DocType: Employee,Resignation Letter Date,ராஜினாமா கடிதம் தேதி
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,விலை விதிமுறைகள் மேலும் அளவு அடிப்படையில் வடிகட்டப்பட்டு.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},பணியாளரின் சேர தேதி அமைக்கவும் {0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},பணியாளரின் சேர தேதி அமைக்கவும் {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},பணியாளரின் சேர தேதி அமைக்கவும் {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},பணியாளரின் சேர தேதி அமைக்கவும் {0}
 DocType: Task,Total Billing Amount (via Time Sheet),மொத்த பில்லிங் அளவு (நேரம் தாள் வழியாக)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,மீண்டும் வாடிக்கையாளர் வருவாய்
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1})பங்கு 'செலவு ஒப்புதல்' வேண்டும்
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,இணை
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,ஆக்கத்துக்கான BOM மற்றும் அளவு தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,ஆக்கத்துக்கான BOM மற்றும் அளவு தேர்ந்தெடுக்கவும்
 DocType: Asset,Depreciation Schedule,தேய்மானம் அட்டவணை
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,விற்பனை பார்ட்னர் முகவரிகள் மற்றும் தொடர்புகள்
 DocType: Bank Reconciliation Detail,Against Account,கணக்கு எதிராக
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,அரை நாள் தேதி வரம்பு தேதி தேதி இடையே இருக்க வேண்டும்
 DocType: Maintenance Schedule Detail,Actual Date,உண்மையான தேதி
 DocType: Item,Has Batch No,கூறு எண் உள்ளது
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},வருடாந்த பில்லிங்: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},வருடாந்த பில்லிங்: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),பொருட்கள் மற்றும் சேவைகள் வரி (ஜிஎஸ்டி இந்தியா)
 DocType: Delivery Note,Excise Page Number,கலால் பக்கம் எண்
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","நிறுவனத்தின், வரம்பு தேதி மற்றும் தேதி கட்டாயமாகும்"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,ஆலோசனை இருந்து பெறவும்
 DocType: Asset,Purchase Date,கொள்முதல் தேதி
 DocType: Employee,Personal Details,தனிப்பட்ட விவரங்கள்
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},நிறுவனத்தின் &#39;சொத்து தேய்மானம் செலவு மையம்&#39; அமைக்கவும் {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},நிறுவனத்தின் &#39;சொத்து தேய்மானம் செலவு மையம்&#39; அமைக்கவும் {0}
 ,Maintenance Schedules,பராமரிப்பு அட்டவணை
 DocType: Task,Actual End Date (via Time Sheet),உண்மையான முடிவு தேதி (நேரம் தாள் வழியாக)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},அளவு {0} {1} எதிராக {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},அளவு {0} {1} எதிராக {2} {3}
 ,Quotation Trends,மேற்கோள் போக்குகள்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},"பொருள் குழு குறிப்பிடப்படவில்லை
 உருப்படியை {0} ல் உருப்படியை மாஸ்டர்"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,கணக்கில் பற்று ஒரு பெறத்தக்க கணக்கு இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,கணக்கில் பற்று ஒரு பெறத்தக்க கணக்கு இருக்க வேண்டும்
 DocType: Shipping Rule Condition,Shipping Amount,கப்பல் தொகை
 DocType: Supplier Scorecard Period,Period Score,காலம் ஸ்கோர்
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,வாடிக்கையாளர்கள் சேர்
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,வாடிக்கையாளர்கள் சேர்
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,நிலுவையில் தொகை
 DocType: Lab Test Template,Special,சிறப்பு
 DocType: Purchase Invoice Item,Conversion Factor,மாற்ற காரணி
@@ -2194,13 +2233,14 @@
 ,Vehicle Expenses,வாகன செலவுகள்
 DocType: Serial No,Invoice Details,விவரப்பட்டியல் விவரங்கள்
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},பயனுள்ள வாழ்க்கை பிறகு எதிர்பார்க்கப்பட்ட மதிப்பு அதிகமாக அல்லது சமமாக இருக்க வேண்டும் {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,தொடங்குங்கள்
+DocType: Hub Category,Hub Category,ஹப் பகுப்பு
 DocType: Purchase Invoice,SEZ,சிறப்புப் பொருளாதார மண்டலம்
 DocType: Purchase Receipt,Vehicle Number,வாகன எண்
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,மீண்டும் விலைப்பட்டியல் நிறுத்த வேண்டும் எந்த தேதி
 DocType: Employee Loan,Loan Amount,கடன்தொகை
 DocType: Program Enrollment,Self-Driving Vehicle,சுயமாக ஓட்டும் வாகன
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,சப்ளையர் ஸ்கார்கார்டு ஸ்டாண்டிங்
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},ரோ {0}: பொருட்களை பில் பொருள் காணப்படவில்லை இல்லை {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},ரோ {0}: பொருட்களை பில் பொருள் காணப்படவில்லை இல்லை {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,மொத்த ஒதுக்கீடு இலைகள் {0} குறைவாக இருக்க முடியாது காலம் ஏற்கனவே ஒப்புதல் இலைகள் {1} விட
 DocType: Journal Entry,Accounts Receivable,கணக்குகள்
 ,Supplier-Wise Sales Analytics,வழங்குபவர் - தம்பதியினர் அனலிட்டிக்ஸ்
@@ -2212,7 +2252,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)",பெற்றோர் கோர்ஸ் (காலியாக விடவும் இந்த பெற்றோர் கோர்ஸ் பகுதியாக இல்லை என்றால்)
 DocType: Leave Control Panel,Leave blank if considered for all employee types,அனைத்து பணியாளர் வகையான கருதப்படுகிறது என்றால் வெறுமையாக
 DocType: Landed Cost Voucher,Distribute Charges Based On,விநியோகிக்க குற்றச்சாட்டுக்களை அடிப்படையாகக் கொண்டு
-apps/erpnext/erpnext/hooks.py +131,Timesheets,timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,timesheets
 DocType: HR Settings,HR Settings,அலுவலக அமைப்புகள்
 DocType: Salary Slip,net pay info,நிகர ஊதியம் தகவல்
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,இந்த மதிப்பு இயல்புநிலை விற்பனை விலை பட்டியலில் புதுப்பிக்கப்பட்டது.
@@ -2223,7 +2263,7 @@
 DocType: Patient,B Positive,பி நேர்மறை
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ரோ # {0}: அளவு 1, உருப்படி ஒரு நிலையான சொத்தாக இருக்கிறது இருக்க வேண்டும். பல கொத்தமல்லி தனி வரிசையில் பயன்படுத்தவும்."
 DocType: Leave Block List Allow,Leave Block List Allow,பிளாக் பட்டியல் அனுமதி விட்டு
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,சுருக்கம் வெற்று அல்லது இடைவெளி  இருக்க முடியாது
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,சுருக்கம் வெற்று அல்லது இடைவெளி  இருக்க முடியாது
 DocType: Patient Medical Record,Patient Medical Record,நோயாளி மருத்துவ பதிவு
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,அல்லாத குழு குழு
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,விளையாட்டு
@@ -2240,9 +2280,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,ஈடாக விகிதம் கண்டுபிடிக்க முடியவில்லை {0} {1} முக்கிய தேதி {2}. கைமுறையாக ஒரு செலாவணி பதிவை உருவாக்க கொள்ளவும்
 DocType: POS Profile,Price List,விலை பட்டியல்
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} இப்போது இயல்புநிலை நிதியாண்டு ஆகிறது . விளைவு எடுக்க மாற்றம் உங்களது உலாவி புதுப்பிக்கவும் .
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,செலவு கூற்றுக்கள்
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,செலவு கூற்றுக்கள்
 DocType: Issue,Support,ஆதரவு
 ,BOM Search,"BOM, தேடல்"
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",ஹப் மீது &quot;பங்குகளில்&quot; அல்லது &quot;நாட்டில் இல்லை பங்கு&quot; வெளியிட இந்த கிடங்கில் பங்கு அடிப்படையில்.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),நிறைவு (+ கூட்டுத்தொகை திறக்கப்படவுள்ளது)
 DocType: Vehicle,Fuel Type,எரிபொருள் வகை
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,நிறுவனத்தின் நாணய குறிப்பிடவும்
@@ -2254,16 +2295,16 @@
 DocType: Healthcare Settings,Remind Before,முன் நினைவூட்டு
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},மொறட்டுவ பல்கலைகழகம் மாற்ற காரணி வரிசையில் தேவைப்படுகிறது {0}
 DocType: Production Plan Item,material_request_item,பொருள் கோரிக்கை உருப்படியை
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ரோ # {0}: குறிப்பு ஆவண வகை விற்பனை ஆணை ஒன்று, விற்பனை விலைப்பட்டியல் அல்லது பத்திரிகை நுழைவு இருக்க வேண்டும்"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ரோ # {0}: குறிப்பு ஆவண வகை விற்பனை ஆணை ஒன்று, விற்பனை விலைப்பட்டியல் அல்லது பத்திரிகை நுழைவு இருக்க வேண்டும்"
 DocType: Salary Component,Deduction,கழித்தல்
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,ரோ {0}: நேரம் இருந்து மற்றும் நேரம் கட்டாயமாகும்.
 DocType: Stock Reconciliation Item,Amount Difference,தொகை  வேறுபாடு
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},பொருள் விலை சேர்க்கப்பட்டது {0} விலை பட்டியல்  {1} ல்
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},பொருள் விலை சேர்க்கப்பட்டது {0} விலை பட்டியல்  {1} ல்
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,இந்த வியாபாரி பணியாளர் Id உள்ளிடவும்
 DocType: Territory,Classification of Customers by region,பிராந்தியம் மூலம் வாடிக்கையாளர்கள் பிரிவுகள்
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,வேறுபாடு தொகை பூஜ்ஜியமாக இருக்க வேண்டும்
 DocType: Project,Gross Margin,மொத்த அளவு
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,முதல் உற்பத்தி பொருள் உள்ளிடவும்
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,முதல் உற்பத்தி பொருள் உள்ளிடவும்
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,கணக்கிடப்படுகிறது வங்கி அறிக்கை சமநிலை
 DocType: Normal Test Template,Normal Test Template,சாதாரண டெஸ்ட் டெம்ப்ளேட்
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ஊனமுற்ற பயனர்
@@ -2273,21 +2314,22 @@
 DocType: Salary Slip,Total Deduction,மொத்த பொருத்தியறிதல்
 ,Production Analytics,உற்பத்தி அனலிட்டிக்ஸ்
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,இந்த நோயாளிக்கு எதிரான பரிவர்த்தனைகளை அடிப்படையாகக் கொண்டது. விபரங்களுக்கு கீழே காலவரிசைப் பார்க்கவும்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,செலவு புதுப்பிக்கப்பட்ட
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,செலவு புதுப்பிக்கப்பட்ட
 DocType: Employee,Date of Birth,பிறந்த நாள்
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,பொருள் {0} ஏற்கனவே திரும்பினார்
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** நிதியாண்டு ** ஒரு நிதி ஆண்டு பிரதிபலிக்கிறது. அனைத்து உள்ளீடுகளை மற்றும் பிற முக்கிய பரிமாற்றங்கள் ** ** நிதியாண்டு எதிரான கண்காணிக்கப்படும்.
 DocType: Opportunity,Customer / Lead Address,வாடிக்கையாளர் / முன்னணி முகவரி
 DocType: Patient,DOB,பிறப்புச்
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,சப்ளையர் ஸ்கோர் கார்ட் அமைப்பு
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},எச்சரிக்கை: இணைப்பு தவறான SSL சான்றிதழ் {0}
-DocType: Student Admission,Eligibility,தகுதி
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,மதிப்பீட்டு திட்டம் பெயர்
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},எச்சரிக்கை: இணைப்பு தவறான SSL சான்றிதழ் {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads",தடங்கள் நீங்கள் வணிக உங்கள் தடங்கள் போன்ற உங்கள் தொடர்புகள் மற்றும் மேலும் சேர்க்க உதவ
 DocType: Production Order Operation,Actual Operation Time,உண்மையான நடவடிக்கையை நேரம்
 DocType: Authorization Rule,Applicable To (User),பொருந்தும் (பயனர்)
 DocType: Purchase Taxes and Charges,Deduct,கழித்து
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,வேலை விபரம்
 DocType: Student Applicant,Applied,பிரயோக
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,மீண்டும் திற
 DocType: Sales Invoice Item,Qty as per Stock UOM,பங்கு மொறட்டுவ பல்கலைகழகம் படி அளவு
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 பெயர்
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","தவிர, சிறப்பு எழுத்துக்கள் ""-"" ""."", ""#"", மற்றும் ""/"" தொடர் பெயரிடும் அனுமதி இல்லை"
@@ -2299,7 +2341,7 @@
 DocType: Request for Quotation,Manufacturing Manager,தயாரிப்பு மேலாளர்
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},தொடர் இல {0} வரை உத்தரவாதத்தை கீழ் உள்ளது {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,தொகுப்புகளை கொண்டு டெலிவரி குறிப்பு பிரிந்தது.
-apps/erpnext/erpnext/hooks.py +98,Shipments,படுவதற்கு
+apps/erpnext/erpnext/hooks.py +107,Shipments,படுவதற்கு
 DocType: Payment Entry,Total Allocated Amount (Company Currency),மொத்த ஒதுக்கப்பட்ட தொகை (நிறுவனத்தின் நாணய)
 DocType: Purchase Order Item,To be delivered to customer,வாடிக்கையாளர் வழங்க வேண்டும்
 DocType: BOM,Scrap Material Cost,குப்பை பொருள் செலவு
@@ -2322,8 +2364,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,பொருள் மாற்று அமைப்புகள்
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,நிறுவனத்தின் தேர்ந்தெடுக்கவும் ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,அனைத்து துறைகளில் கருதப்படுகிறது என்றால் வெறுமையாக
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","வேலைவாய்ப்பு ( நிரந்தர , ஒப்பந்த , பயிற்சி முதலியன) வகைகள் ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} பொருள் கட்டாய {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","வேலைவாய்ப்பு ( நிரந்தர , ஒப்பந்த , பயிற்சி முதலியன) வகைகள் ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} பொருள் கட்டாய {1}
 DocType: Process Payroll,Fortnightly,இரண்டு வாரங்களுக்கு ஒரு முறை
 DocType: Currency Exchange,From Currency,நாணய இருந்து
 DocType: Vital Signs,Weight (In Kilogram),எடை (கிலோகிராம்)
@@ -2348,7 +2390,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"அட்டவணை பெற ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து,"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,பின்வரும் கால அட்டவணைகள் நீக்கும் போது தவறுகள் இருந்தன:
 DocType: Bin,Ordered Quantity,உத்தரவிட்டார் அளவு
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","உதாரணமாக, "" கட்டுமான கருவிகள் கட்ட """
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","உதாரணமாக, "" கட்டுமான கருவிகள் கட்ட """
 DocType: Grading Scale,Grading Scale Intervals,தரம் பிரித்தல் அளவுகோல் இடைவெளிகள்
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}:  நுழைவு கணக்கியல் {2} ல் நாணய மட்டுமே அவ்வாறு செய்யமுடியும்: {3}
 DocType: Production Order,In Process,செயல்முறை உள்ள
@@ -2372,11 +2414,10 @@
 DocType: Purchase Invoice,With Payment of Tax,வரி செலுத்துதல்
 DocType: Expense Claim Detail,Expense Claim Detail,செலவு  கோரிக்கை  விவரம்
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,வினியோகஸ்தரின் மும்மடங்கான
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,சரியான கணக்கில் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,சரியான கணக்கில் தேர்ந்தெடுக்கவும்
 DocType: Item,Weight UOM,எடை மொறட்டுவ பல்கலைகழகம்
 DocType: Salary Structure Employee,Salary Structure Employee,சம்பளம் அமைப்பு பணியாளர்
 DocType: Patient,Blood Group,குருதி பகுப்பினம்
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,முடிவுபெறாத
 DocType: Course,Course Name,படிப்பின் பெயர்
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ஒரு குறிப்பிட்ட ஊழியர் விடுப்பு விண்ணப்பங்கள் ஒப்புதல் முடியும் பயனர்கள்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,அலுவலக உபகரணங்கள்
@@ -2395,7 +2436,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,விலை பட்டியல் அமைக்கப்படவில்லை எனில் காண்பிக்கப்படும் விலைகளில் முடியாது
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,இந்த கப்பல் விதி ஒரு நாடு குறிப்பிட அல்லது உலகம் முழுவதும் கப்பல் சரிபார்க்கவும்
 DocType: Stock Entry,Total Incoming Value,மொத்த உள்வரும் மதிப்பு
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,பற்று தேவைப்படுகிறது
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,பற்று தேவைப்படுகிறது
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets உங்கள் அணி செய்யப்படுகிறது செயல்பாடுகளுக்கு நேரம், செலவு மற்றும் பில்லிங் கண்காணிக்க உதவும்"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,கொள்முதல் விலை பட்டியல்
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,சப்ளையர் ஸ்கோர் கார்டு மாறிகளின் டெம்ப்ளேட்கள்.
@@ -2405,7 +2446,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,கொடுப்பனவு நல்லிணக்க
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,பொறுப்பாளர் நபரின் பெயர் தேர்வு செய்க
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,தொழில்நுட்ப
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},மொத்த செலுத்தப்படாத: {0}
+DocType: Hub Settings,Unregister from Hub,மையத்திலிருந்து பதிவுநீக்கம்
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},மொத்த செலுத்தப்படாத: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM இணையத்தளம் ஆபரேஷன்
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,சலுகை  கடிதம்
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,பொருள் கோரிக்கைகள் (எம்ஆர்பி) மற்றும் உற்பத்தி ஆணைகள் உருவாக்க.
@@ -2417,7 +2459,9 @@
 DocType: Physician Schedule Time Slot,To Time,டைம்
 DocType: Authorization Rule,Approving Role (above authorized value),(அங்கீகாரம் மதிப்பை மேலே) பாத்திரம் அப்ரூவிங்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,கணக்கில் வரவு ஒரு செலுத்த வேண்டிய கணக்கு இருக்க வேண்டும்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM மறுநிகழ்வு : {0} பெற்றோர் அல்லது குழந்தை இருக்க முடியாது {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,ஊதியம் பெறும் மாணவர் விண்ணப்பதாரருக்கு கண்டிப்பாகத் தேவைப்படும் மாணவர் சேர்க்கைக்குத் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM மறுநிகழ்வு : {0} பெற்றோர் அல்லது குழந்தை இருக்க முடியாது {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,விலை வெளியிட ஒரு விலை பட்டியல் தேர்ந்தெடுக்கவும்
 DocType: Production Order Operation,Completed Qty,முடிக்கப்பட்ட அளவு
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",{0} மட்டுமே டெபிட் கணக்குகள் மற்றொரு கடன் நுழைவு எதிராக இணைக்கப்பட்ட ஐந்து
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,விலை பட்டியல் {0} முடக்கப்பட்டுள்ளது
@@ -2430,39 +2474,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} பொருள் தேவையான சீரியல் எண்கள் {1}. நீங்கள் வழங்கிய {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,தற்போதைய மதிப்பீட்டு விகிதம்
 DocType: Item,Customer Item Codes,வாடிக்கையாளர் பொருள் குறியீடுகள்
+DocType: Training Event,Advance,அட்வான்ஸ்
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,மீண்டும் மீண்டும் செய்வதற்காக.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,செலாவணி லாபம் / நஷ்டம்
 DocType: Opportunity,Lost Reason,இழந்த காரணம்
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,புதிய முகவரி
 DocType: Quality Inspection,Sample Size,மாதிரி அளவு
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,தயவு செய்து ரசீது ஆவண நுழைய
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,அனைத்து பொருட்களும் ஏற்கனவே விலை விவரம்
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;வழக்கு எண் வரம்பு&#39; சரியான குறிப்பிடவும்
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',&#39;வழக்கு எண் வரம்பு&#39; சரியான குறிப்பிடவும்
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,மேலும் செலவு மையங்கள் குழுக்கள் கீழ் செய்யப்பட்ட ஆனால் உள்ளீடுகளை அல்லாத குழுக்கள் எதிராகவும் முடியும்
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,பயனர்கள் மற்றும் அனுமதிகள்
 DocType: Vehicle Log,VLOG.,பதிவின்.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},உற்பத்தி ஆணைகள் உருவாக்கப்பட்டது: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},உற்பத்தி ஆணைகள் உருவாக்கப்பட்டது: {0}
 DocType: Branch,Branch,கிளை
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,அச்சிடுதல் மற்றும் பிராண்டிங்
 DocType: Company,Total Monthly Sales,மொத்த மாத விற்பனை
 DocType: Bin,Actual Quantity,உண்மையான அளவு
 DocType: Shipping Rule,example: Next Day Shipping,உதாரணமாக: அடுத்த நாள் கப்பல்
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,இல்லை தொ.இல. {0}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},சந்தா {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},சந்தா {0}
 DocType: Fee Schedule Program,Fee Schedule Program,கட்டணம் அட்டவணை திட்டம்
 DocType: Fee Schedule Program,Student Batch,மாணவர் தொகுதி
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,&#39;tabVital Signs&#39; இலிருந்து * நோயாளியின் = &#39;{0}&#39; ஒழுங்கு sign_date வீச்சளவு வரம்பு 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,மாணவர் செய்ய
 DocType: Supplier Scorecard Scoring Standing,Min Grade,குறைந்த தரம்
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},நீங்கள் திட்டம் இணைந்து அழைக்கப்பட்டுள்ளனர்: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},{0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},நீங்கள் திட்டம் இணைந்து அழைக்கப்பட்டுள்ளனர்: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},{0}
 DocType: Leave Block List Date,Block Date,தேதி தடை
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Doctype {0} இல் தனிப்பயன் புலம் சந்தா ஐடி சேர்க்கவும்
 DocType: Purchase Receipt,Supplier Delivery Note,சப்ளையர் டெலிவரி குறிப்பு
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,இப்பொழுது விண்ணப்பியுங்கள்
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,இப்பொழுது விண்ணப்பியுங்கள்
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},உண்மையான அளவு {0} / காத்திருக்கும் அளவு {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},உண்மையான அளவு {0} / காத்திருக்கும் அளவு {1}
 DocType: Purchase Invoice,E-commerce GSTIN,மின் வணிகம் GSTIN
 DocType: Sales Order,Not Delivered,அனுப்பப்படவில்லை.
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,எதிர்பார்க்கப்படும் தேதி பரிவர்த்தனை தேதிக்கு முன் இருக்க முடியாது
 ,Bank Clearance Summary,வங்கி இசைவு சுருக்கம்
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","உருவாக்கவும் , தினசரி வாராந்திர மற்றும் மாதாந்திர மின்னஞ்சல் சுருக்கங்களின் நிர்வகிக்க ."
 DocType: Appraisal Goal,Appraisal Goal,மதிப்பீட்டு இலக்கு
@@ -2470,13 +2515,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,கட்டிடங்கள்
 DocType: Fee Schedule,Fee Structure,கட்டணம் அமைப்பு
 DocType: Timesheet Detail,Costing Amount,இதற்கான செலவு தொகை
-DocType: Student Admission,Application Fee,விண்ணப்பக் கட்டணம்
+DocType: Student Admission Program,Application Fee,விண்ணப்பக் கட்டணம்
 DocType: Process Payroll,Submit Salary Slip,சம்பளம் ஸ்லிப் &#39;to
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,"பொருள் {0} {1}% க்கான 
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,"பொருள் {0} {1}% க்கான 
 அதிகபட்ச தள்ளுபடி"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,மொத்த  இறக்குமதி
 DocType: Sales Partner,Address & Contacts,முகவரி மற்றும் தொடர்புகள்
 DocType: SMS Log,Sender Name,அனுப்புநர் பெயர்
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,வரையறைகள் மூலம் வரிசைப்படுத்து
 DocType: POS Profile,[Select],[ தேர்ந்தெடு ]
 DocType: Vital Signs,Blood Pressure (diastolic),இரத்த அழுத்தம் (சிறுநீர்ப்பை)
 DocType: SMS Log,Sent To,அனுப்பப்படும்
@@ -2485,7 +2531,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,அடுத்த தொடர்பு தேதி கடந்த காலத்தில் இருக்க முடியாது
 DocType: Company,For Reference Only.,குறிப்பு மட்டும்.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},{1} இல் மருத்துவர் {0} கிடைக்கவில்லை
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,தொகுதி தேர்வு இல்லை
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,தொகுதி தேர்வு இல்லை
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},தவறான {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,குறிப்பு அழை
@@ -2501,15 +2547,15 @@
 DocType: Normal Test Items,Require Result Value,முடிவு மதிப்பு தேவை
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,வழக்கு எண் 0 இருக்க முடியாது
 DocType: Item,Show a slideshow at the top of the page,பக்கம் மேலே ஒரு ஸ்லைடு ஷோ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,ஸ்டோர்கள்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,ஸ்டோர்கள்
 DocType: Project Type,Projects Manager,திட்டங்கள் மேலாளர்
 DocType: Serial No,Delivery Time,விநியோக நேரம்
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,அடிப்படையில் மூப்படைதலுக்கான
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,நியமனம் ரத்துசெய்யப்பட்டது
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,நியமனம் ரத்துசெய்யப்பட்டது
 DocType: Item,End of Life,வாழ்க்கை முடிவுக்கு
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,சுற்றுலா
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,கொடுக்கப்பட்டுள்ள தேதிகளில் ஊழியர் {0} க்கு எந்த செயலில் அல்லது இயல்புநிலை சம்பளம் அமைப்பு
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,சுற்றுலா
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,கொடுக்கப்பட்டுள்ள தேதிகளில் ஊழியர் {0} க்கு எந்த செயலில் அல்லது இயல்புநிலை சம்பளம் அமைப்பு
 DocType: Leave Block List,Allow Users,பயனர்கள் அனுமதி
 DocType: Purchase Order,Customer Mobile No,வாடிக்கையாளர் கைப்பேசி எண்
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,ரெக்கியூரிங்
@@ -2518,12 +2564,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,மேம்படுத்தல்
 DocType: Item Reorder,Item Reorder,உருப்படியை மறுவரிசைப்படுத்துக
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,சம்பளம் ஷோ ஸ்லிப்
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,மாற்றம் பொருள்
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,மாற்றம் பொருள்
 DocType: Fees,Send Payment Request,கட்டணம் கோரிக்கை அனுப்பவும்
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","நடவடிக்கைகள் , இயக்க செலவு குறிப்பிட உங்கள் நடவடிக்கைகள் ஒரு தனிப்பட்ட நடவடிக்கை இல்லை கொடுக்க ."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,இந்த ஆவணம் மூலம் எல்லை மீறிவிட்டது {0} {1} உருப்படியை {4}. நீங்கள் கவனிக்கிறீர்களா மற்றொரு {3} அதே எதிராக {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,சேமிப்பு பிறகு மீண்டும் அமைக்கவும்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,மாற்றம் தேர்வு அளவு கணக்கு
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,மாற்றம் தேர்வு அளவு கணக்கு
 DocType: Purchase Invoice,Price List Currency,விலை பட்டியல் நாணயத்தின்
 DocType: Naming Series,User must always select,பயனர் எப்போதும் தேர்ந்தெடுக்க வேண்டும்
 DocType: Stock Settings,Allow Negative Stock,எதிர்மறை பங்கு அனுமதிக்கும்
@@ -2543,7 +2589,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,ஊழியர்
 DocType: Sample Collection,Collected Time,சேகரிக்கப்பட்ட நேரம்
 DocType: Company,Sales Monthly History,விற்பனை மாதாந்திர வரலாறு
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,தொகுதி தேர்வு
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,தொகுதி தேர்வு
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} முழுமையாக வசூலிக்கப்படும்
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,முக்கிய அறிகுறிகள்
 DocType: Training Event,End Time,முடிவு நேரம்
@@ -2551,16 +2597,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,கொடுப்பனவு விலக்கிற்கு அல்லது இழப்பு
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,விற்பனை அல்லது கொள்முதல் தரநிலை ஒப்பந்த அடிப்படையில் .
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,வவுச்சர் மூலம் குழு
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,இந்த சந்திப்பை நிச்சயமாக ரத்துசெய்ய விரும்புகிறீர்களா?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,விற்பனை பைப்லைன்
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},சம்பளம் உபகரண உள்ள இயல்பான கணக்கு அமைக்கவும் {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,தேவையான அன்று
 DocType: Rename Tool,File to Rename,மறுபெயர் கோப்புகள்
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"தயவு செய்து வரிசையில் பொருள் BOM, தேர்வு {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"தயவு செய்து வரிசையில் பொருள் BOM, தேர்வு {0}"
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},கணக்கு {0} {1} கணக்கு முறை உள்ள நிறுவனத்துடன் இணைந்தது பொருந்தவில்லை: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},பொருள் இருப்பு இல்லை BOM {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,பராமரிப்பு அட்டவணை {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
+DocType: POS Profile,Applicable for Users,பயனர்களுக்கு பொருந்தும்
 DocType: Notification Control,Expense Claim Approved,செலவு  கோரிக்கை ஏற்கப்பட்டது
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,ஊழியர் சம்பளம் ஸ்லிப் {0} ஏற்கனவே இந்த காலத்தில் உருவாக்கப்பட்ட
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,ஊழியர் சம்பளம் ஸ்லிப் {0} ஏற்கனவே இந்த காலத்தில் உருவாக்கப்பட்ட
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,மருந்து
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,வாங்கிய பொருட்களை செலவு
 DocType: Selling Settings,Sales Order Required,விற்பனை ஆர்டர் தேவை
@@ -2585,6 +2633,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,அமைப்பு
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,அமைப்பு
 DocType: BOM Update Tool,BOM Update Tool,BOM புதுப்பித்தல் கருவி
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","கட்சி கணக்கு குறிப்பிடப்படவில்லை, தயவுசெய்து நிறுவனத்தில் இயல்புநிலை கட்சி கணக்கை அமைக்கவும்"
 DocType: SG Creation Tool Course,Student Group Name,மாணவர் குழு பெயர்
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,கட்டணம் உருவாக்குதல்
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,நீங்கள் உண்மையில் இந்த நிறுவனத்தின் அனைத்து பரிமாற்றங்கள் நீக்க வேண்டும் என்பதை உறுதி செய்யுங்கள். இது போன்ற உங்கள் மாஸ்டர் தரவு இருக்கும். இந்தச் செயலைச் செயல்.
@@ -2593,29 +2642,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) திட்டமிட்ட அளவை விட அதிகமாக இருக்க முடியாது ({2}) உற்பத்தி ஆணை {3}
 DocType: Shipping Rule,Shipping Rule Label,கப்பல் விதி லேபிள்
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,பயனர் கருத்துக்களம்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,மூலப்பொருட்கள் காலியாக இருக்க முடியாது.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","பங்கு புதுப்பிக்க முடியவில்லை, விலைப்பட்டியல் துளி கப்பல் உருப்படி உள்ளது."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,மூலப்பொருட்கள் காலியாக இருக்க முடியாது.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","பங்கு புதுப்பிக்க முடியவில்லை, விலைப்பட்டியல் துளி கப்பல் உருப்படி உள்ளது."
 DocType: Lab Test Sample,Lab Test Sample,லேப் டெஸ்ட் மாதிரி
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,விரைவு ஜர்னல் நுழைவு
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM எந்த பொருளை agianst குறிப்பிட்டுள்ள நீங்கள் வீதம் மாற்ற முடியாது
+DocType: Restaurant,Invoice Series Prefix,விலைப்பட்டியல் தொடர் முன்னொட்டு
 DocType: Employee,Previous Work Experience,முந்தைய பணி அனுபவம்
 DocType: Stock Entry,For Quantity,அளவு
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},பொருள் திட்டமிடப்பட்டுள்ளது அளவு உள்ளிடவும் {0} வரிசையில் {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},பொருள் திட்டமிடப்பட்டுள்ளது அளவு உள்ளிடவும் {0} வரிசையில் {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} சமர்ப்பிக்கப்படவில்லை
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,பொருட்கள் கோரிக்கைகள்.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,தனி உற்பத்தி வரிசையில் ஒவ்வொரு முடிக்கப்பட்ட நல்ல உருப்படியை செய்தது.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} திரும்ப ஆவணத்தில் எதிர்மறை இருக்க வேண்டும்
 ,Minutes to First Response for Issues,சிக்கல்கள் முதல் பதில் நிமிடங்கள்
 DocType: Purchase Invoice,Terms and Conditions1,விதிமுறைகள் மற்றும் Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,சபையின் பெயரால் இது நீங்கள் இந்த அமைப்பை அமைக்க வேண்டும்.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,சபையின் பெயரால் இது நீங்கள் இந்த அமைப்பை அமைக்க வேண்டும்.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","இந்த தேதி வரை உறைநிலையில் பைனான்ஸ் நுழைவு, யாரும் / கீழே குறிப்பிட்ட பங்கை தவிர நுழைவு மாற்ற முடியும்."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"பராமரிப்பு அட்டவணை உருவாக்கும் முன் ஆவணத்தை சேமிக்க , தயவு செய்து"
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,அனைத்து BOM களில் சமீபத்திய விலை மேம்படுத்தப்பட்டது
 DocType: Fee Schedule,Successful,வெற்றிகரமான
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,திட்டம் நிலை
 DocType: UOM,Check this to disallow fractions. (for Nos),அனுமதிப்பதில்லை உராய்வுகள் இந்த சரிபார்க்கவும். (இலக்கங்கள் ஐந்து)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,பின்வரும் உற்பத்தித் தேவைகளை உருவாக்கப்பட்ட:
-DocType: Student Admission,Naming Series (for Student Applicant),தொடர் பெயரிடும் (மாணவர் விண்ணப்பதாரர்கள்)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,பின்வரும் உற்பத்தித் தேவைகளை உருவாக்கப்பட்ட:
+DocType: Student Admission Program,Naming Series (for Student Applicant),தொடர் பெயரிடும் (மாணவர் விண்ணப்பதாரர்கள்)
 DocType: Delivery Note,Transporter Name,இடமாற்றி பெயர்
 DocType: Authorization Rule,Authorized Value,அங்கீகரிக்கப்பட்ட மதிப்பு
 DocType: BOM,Show Operations,ஆபரேஷன்ஸ் காட்டு
@@ -2639,7 +2689,7 @@
 ,Employees working on a holiday,ஒரு விடுமுறை வேலை ஊழியர்
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,மார்க் தற்போதைய
 DocType: Project,% Complete Method,% முழுமையான முறை
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,மருந்து
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,மருந்து
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},பராமரிப்பு தொடக்க தேதி வரிசை எண்{0} விநியோகம் தேதி முன் இருக்க முடியாது
 DocType: Production Order,Actual End Date,உண்மையான முடிவு தேதி
 DocType: BOM,Operating Cost (Company Currency),இயக்க செலவு (நிறுவனத்தின் நாணய)
@@ -2657,13 +2707,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,பயனர் ஒப்புதல் ஆட்சி பொருந்தும் பயனர் அதே இருக்க முடியாது
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),அடிப்படை வீத (பங்கு UOM படி)
 DocType: SMS Log,No of Requested SMS,கோரப்பட்ட எஸ்எம்எஸ் இல்லை
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,சம்பளமில்லா விடுப்பு ஒப்புதல் விடுப்பு விண்ணப்பம் பதிவுகள் பொருந்தவில்லை
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,சம்பளமில்லா விடுப்பு ஒப்புதல் விடுப்பு விண்ணப்பம் பதிவுகள் பொருந்தவில்லை
 DocType: Campaign,Campaign-.####,பிரச்சாரத்தின் . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,அடுத்த படிகள்
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,சிறந்த சாத்தியமுள்ள விகிதங்களில் குறிப்பிட்ட பொருட்களை வழங்கவும்
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,விலைப்பட்டியல் செய்ய
 DocType: Selling Settings,Auto close Opportunity after 15 days,15 நாட்களுக்கு பிறகு ஆட்டோ நெருங்கிய வாய்ப்பு
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} ஸ்கோர் கார்டு தரநிலை காரணமாக {0} வாங்குவதற்கு ஆர்டர் அனுமதிக்கப்படவில்லை.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} ஸ்கோர் கார்டு தரநிலை காரணமாக {0} வாங்குவதற்கு ஆர்டர் அனுமதிக்கப்படவில்லை.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,இறுதி ஆண்டு
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / முன்னணி%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / முன்னணி%
@@ -2671,6 +2721,7 @@
 DocType: Vital Signs,Nutrition Values,ஊட்டச்சத்து கலாச்சாரம்
 DocType: Lab Test Template,Is billable,பில்லிங் செய்யப்படுகிறது
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",இரண்டு &quot;மருத்துவ அட்டவணை&quot; மற்றும் நியமனம் ஒன்றுக்கு நேரம் &quot;டாக்டர் அமைக்க வேண்டும் {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,கமிஷன் நிறுவனங்கள் பொருட்கள் விற்கும் ஒரு மூன்றாம் தரப்பு விநியோகஸ்தராக / வியாபாரி / கமிஷன் முகவர் / இணைப்பு / விற்பனையாளரை.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} கொள்முதல் ஆணை எதிரான {1}
 DocType: Patient,Patient Demographics,நோயாளியின் புள்ளிவிவரங்கள்
@@ -2720,7 +2771,6 @@
  10. சேர் அல்லது கழித்து: நீங்கள் சேர்க்க அல்லது வரி கழித்து வேண்டும் என்பதை."
 DocType: Homepage,Homepage,முகப்பு
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,மருத்துவர் தேர்வு ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',மேம்படுத்தல் தாவலைதொகுப்பு அமைவு விலைப்பட்டியல் = &#39;{0}&#39; where name = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd அளவு
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},கட்டணம் பதிவுகள்   உருவாக்கப்பட்டது - {0}
 DocType: Asset Category Account,Asset Category Account,சொத்து வகை கணக்கு
@@ -2732,7 +2782,7 @@
 DocType: Asset,Manual,கையேடு
 DocType: Salary Component Account,Salary Component Account,சம்பளம் உபகரண கணக்கு
 DocType: Global Defaults,Hide Currency Symbol,நாணய சின்னம் மறைக்க
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","எ.கா.வங்கி, பண, கடன் அட்டை"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","எ.கா.வங்கி, பண, கடன் அட்டை"
 DocType: Lead Source,Source Name,மூல பெயர்
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","வயது வந்தவர்களில் சாதாரண ஓய்வு பெற்ற இரத்த அழுத்தம் ஏறத்தாழ 120 mmHg சிஸ்டாலிக், மற்றும் 80 mmHg diastolic, சுருக்கப்பட்ட &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,வரவுக்குறிப்பு
@@ -2751,16 +2801,16 @@
 DocType: Patient,Occupation,தொழில்
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,ரோ {0} : தொடங்கும் நாள் நிறைவு நாள் முன்னதாக இருக்க வேண்டும்
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),மொத்தம் (அளவு)
-DocType: Sales Invoice,This Document,இந்த ஆவண
 DocType: Installation Note Item,Installed Qty,நிறுவப்பட்ட அளவு
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,சில தவறான மின்னஞ்சல் முகவரிகளின் காரணமாக இது இருக்கலாம்
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,நீங்கள் சேர்த்தீர்கள்
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,பயிற்சி முடிவு
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,பயிற்சி முடிவு
 DocType: Purchase Invoice,Is Paid,செலுத்தப்படுகிறது
 DocType: Salary Structure,Total Earning,மொத்த வருமானம்
 DocType: Purchase Receipt,Time at which materials were received,பொருட்கள் பெற்றனர் எந்த நேரத்தில்
 DocType: Stock Ledger Entry,Outgoing Rate,வெளிச்செல்லும் விகிதம்
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,அமைப்பு கிளை மாஸ்டர் .
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,அமைப்பு கிளை மாஸ்டர் .
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,அல்லது
 DocType: Sales Order,Billing Status,பில்லிங் நிலைமை
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,சிக்கலை புகார்
@@ -2775,8 +2825,9 @@
 DocType: Notification Control,Sales Order Message,விற்பனை ஆர்டர் செய்தி
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","முதலியன கம்பெனி, நாணய , நடப்பு நிதியாண்டில் , போன்ற அமை கலாச்சாரம்"
 DocType: Payment Entry,Payment Type,கொடுப்பனவு வகை
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,பொருள் ஒரு தொகுதி தேர்ந்தெடுக்கவும் {0}. இந்த தேவையை நிறைவேற்றும் என்று ஒரு ஒற்றை தொகுதி கண்டுபிடிக்க முடியவில்லை
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,பொருள் ஒரு தொகுதி தேர்ந்தெடுக்கவும் {0}. இந்த தேவையை நிறைவேற்றும் என்று ஒரு ஒற்றை தொகுதி கண்டுபிடிக்க முடியவில்லை
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,பொருள் ஒரு தொகுதி தேர்ந்தெடுக்கவும் {0}. இந்த தேவையை நிறைவேற்றும் என்று ஒரு ஒற்றை தொகுதி கண்டுபிடிக்க முடியவில்லை
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,பொருள் ஒரு தொகுதி தேர்ந்தெடுக்கவும் {0}. இந்த தேவையை நிறைவேற்றும் என்று ஒரு ஒற்றை தொகுதி கண்டுபிடிக்க முடியவில்லை
+DocType: Hub Category,Parent Category,பெற்றோர் வகை
 DocType: Process Payroll,Select Employees,தேர்வு ஊழியர்
 DocType: Opportunity,Potential Sales Deal,சாத்தியமான விற்பனை ஒப்பந்தம்
 DocType: Complaint,Complaints,புகார்கள்
@@ -2814,7 +2865,7 @@
 DocType: Bin,Reserved Quantity,ஒதுக்கப்பட்ட அளவு
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,சரியான மின்னஞ்சல் முகவரியை உள்ளிடவும்
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,சரியான மின்னஞ்சல் முகவரியை உள்ளிடவும்
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,வண்டி ஒரு உருப்படி தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,வண்டி ஒரு உருப்படி தேர்ந்தெடுக்கவும்
 DocType: Landed Cost Voucher,Purchase Receipt Items,ரசீது பொருட்கள் வாங்க
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,வடிவமைக்கப்படுகிறது படிவங்கள்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,நிலுவைப்
@@ -2824,15 +2875,15 @@
 DocType: Payment Request,Amount in customer's currency,வாடிக்கையாளர் நாட்டின் நாணய தொகை
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,விநியோகம்
 DocType: Stock Reconciliation Item,Current Qty,தற்போதைய அளவு
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,சப்ளையர்களைச் சேர்க்கவும்
+DocType: Restaurant Menu,Restaurant Menu,உணவக மெனு
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,முன்
 DocType: Appraisal Goal,Key Responsibility Area,முக்கிய பொறுப்பு பகுதி
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","மாணவர் தொகுப்புகளும் நீங்கள் வருகை, மாணவர்களுக்கு மதிப்பீடுகளை மற்றும் கட்டணங்கள் கண்காணிக்க உதவும்"
 DocType: Payment Entry,Total Allocated Amount,மொத்த ஒதுக்கப்பட்ட தொகை
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,நிரந்தர சரக்கு இயல்புநிலை சரக்கு கணக்கை அமை
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,நிரந்தர சரக்கு இயல்புநிலை சரக்கு கணக்கை அமை
 DocType: Item Reorder,Material Request Type,பொருள் கோரிக்கை வகை
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},{0} இலிருந்து சம்பளம் க்கான Accural ஜர்னல் நுழைவு {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save",LocalStorage நிரம்பி விட்டதால் காப்பாற்ற முடியவில்லை
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save",LocalStorage நிரம்பி விட்டதால் காப்பாற்ற முடியவில்லை
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,ரோ {0}: UOM மாற்றக் காரணி கட்டாயமாகும்
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,அறை கொள்ளளவு
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,குறிப்
@@ -2871,16 +2922,18 @@
 DocType: Project,Task Completion,பணி நிறைவு
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,பங்கு இல்லை
 DocType: Appraisal,HR User,அலுவலக பயனர்
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,பிஓஎஸ்?
 DocType: Purchase Invoice,Taxes and Charges Deducted,கழிக்கப்படும் வரி மற்றும் கட்டணங்கள்
-apps/erpnext/erpnext/hooks.py +129,Issues,சிக்கல்கள்
+apps/erpnext/erpnext/hooks.py +138,Issues,சிக்கல்கள்
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},நிலைமை ஒன்றாக இருக்க வேண்டும் {0}
 DocType: Sales Invoice,Debit To,செய்ய பற்று
+DocType: Restaurant Menu Item,Restaurant Menu Item,உணவக மெனு பொருள்
 DocType: Delivery Note,Required only for sample item.,ஒரே மாதிரி உருப்படியை தேவைப்படுகிறது.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,பரிவர்த்தனை பிறகு உண்மையான அளவு
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},சம்பளம் சீட்டு இல்லை ஆகியவற்றுக்கிடையில் காணப்படுகிறது {0} மற்றும் {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},சம்பளம் சீட்டு இல்லை ஆகியவற்றுக்கிடையில் காணப்படுகிறது {0} மற்றும் {1}
 ,Pending SO Items For Purchase Request,கொள்முதல் கோரிக்கை நிலுவையில் எனவே விடயங்கள்
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,மாணவர் சேர்க்கை
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} முடக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,மாணவர் சேர்க்கை
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} முடக்கப்பட்டுள்ளது
 DocType: Supplier,Billing Currency,பில்லிங் நாணய
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,மிகப் பெரியது
@@ -2903,6 +2956,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,குறிப்பிட தயவுசெய்து தேவையான வருகைகள் எந்த
 DocType: Stock Settings,Default Valuation Method,முன்னிருப்பு மதிப்பீட்டு முறை
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,கட்டணம்
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,மேம்படுத்தல் முன்னேற்றம். இது சிறிது நேரம் ஆகலாம்.
 DocType: Vehicle Log,Fuel Qty,எரிபொருள் அளவு
 DocType: Production Order Operation,Planned Start Time,திட்டமிட்ட தொடக்க நேரம்
 DocType: Course,Assessment,மதிப்பீடு
@@ -2918,7 +2972,7 @@
 DocType: Price List,Price List Master,விலை பட்டியல் மாஸ்டர்
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,நீங்கள் அமைக்க மற்றும் இலக்குகள் கண்காணிக்க முடியும் என்று அனைத்து விற்பனை நடவடிக்கைகள் பல ** விற்பனை நபர்கள் ** எதிரான குறித்துள்ளார்.
 ,S.O. No.,S.O. இல்லை
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},முன்னணி இருந்து வாடிக்கையாளர் உருவாக்க தயவுசெய்து {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},முன்னணி இருந்து வாடிக்கையாளர் உருவாக்க தயவுசெய்து {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,நோயாளிக்குத் தேர்ந்தெடுங்கள்
 DocType: Price List,Applicable for Countries,நாடுகள் பொருந்தும்
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,அளவுரு பெயர்
@@ -2962,27 +3016,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,செலவு / வித்தியாசம் கணக்கு ({0}) ஒரு 'லாபம் அல்லது நஷ்டம்' கணக்கு இருக்க வேண்டும்
 DocType: Project,Copied From,இருந்து நகலெடுத்து
 DocType: Project,Copied From,இருந்து நகலெடுத்து
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},பெயர் பிழை: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,பற்றாக்குறை
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},பெயர் பிழை: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,பற்றாக்குறை
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{2} {3}உடன் {0} {1} தொடர்புடையது இல்லை
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ஊழியர் வருகை {0} ஏற்கனவே குறிக்கப்பட்டுள்ளது
 DocType: Packing Slip,If more than one package of the same type (for print),அதே வகை மேற்பட்ட தொகுப்பு (அச்சுக்கு)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,உணவக அமைப்பில் இயல்புநிலை வாடிக்கையாளரை அமைக்கவும்
 ,Salary Register,சம்பளம் பதிவு
 DocType: Warehouse,Parent Warehouse,பெற்றோர் கிடங்கு
 DocType: C-Form Invoice Detail,Net Total,நிகர மொத்தம்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},இயல்புநிலை BOM பொருள் காணப்படவில்லை இல்லை {0} மற்றும் திட்ட {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},இயல்புநிலை BOM பொருள் காணப்படவில்லை இல்லை {0} மற்றும் திட்ட {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,பல்வேறு கடன் வகைகளில் வரையறுத்து
 DocType: Bin,FCFS Rate,FCFS விகிதம்
 DocType: Payment Reconciliation Invoice,Outstanding Amount,சிறந்த தொகை
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),நேரம் (நிமிடங்களில்)
 DocType: Project Task,Working,உழைக்கும்
 DocType: Stock Ledger Entry,Stock Queue (FIFO),பங்கு வரிசையில் (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,நிதி ஆண்டு
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,நிதி ஆண்டு
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} நிறுவனத்திற்கு சொந்தமானது இல்லை {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,{0} க்கான அடிப்படை ஸ்கோர் செயல்பாட்டை தீர்க்க முடியவில்லை. சூத்திரம் செல்லுபடியாகும் என்பதை உறுதிப்படுத்தவும்.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,என செலவு
 DocType: Healthcare Settings,Out Patient Settings,நோயாளி அமைப்புகள் வெளியே
 DocType: Account,Round Off,ஆஃப் சுற்றுக்கு
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,அளவு நேர்மறை இருக்க வேண்டும்
 ,Requested Qty,கோரப்பட்ட அளவு
 DocType: Tax Rule,Use for Shopping Cart,வண்டியில் பயன்படுத்தவும்
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},மதிப்பு {0} பண்பு {1} செல்லுபடியாகும் பொருள் பட்டியலில் இல்லை பொருள் பண்புக்கூறு மதிப்புகள் இல்லை {2}
@@ -2991,7 +3047,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","கட்டணங்கள் விகிதாசாரத்தில் தேர்வு படி, உருப்படி கொத்தமல்லி அல்லது அளவு அடிப்படையில்"
 DocType: Maintenance Visit,Purposes,நோக்கங்கள்
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,குறைந்தபட்சம் ஒரு பொருளை திருப்பி ஆவணம் எதிர்மறை அளவு உள்ளிட்ட
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,பாடநெறிகளைச் சேருங்கள்
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ஆபரேஷன் {0} பணிநிலையம் உள்ள எந்த கிடைக்க வேலை மணி நேரத்திற்கு {1}, பல நடவடிக்கைகளில் அறுவை சிகிச்சை உடைந்து"
 ,Requested,கோரப்பட்ட
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,குறிப்புகள் இல்லை
@@ -3003,6 +3058,7 @@
 DocType: Employee Loan,Repaid/Closed,தீர்வையான / மூடப்பட்ட
 DocType: Item,Total Projected Qty,மொத்த உத்தேச அளவு
 DocType: Monthly Distribution,Distribution Name,விநியோக பெயர்
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,சப்ளையர்&gt; சப்ளையர் வகை
 DocType: Course,Course Code,பாடநெறி குறியீடு
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},பொருள் தேவை தரமான ஆய்வு {0}
 DocType: POS Settings,Use POS in Offline Mode,POS ஐ ஆஃப்லைன் பயன்முறையில் பயன்படுத்தவும்
@@ -3013,14 +3069,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,மண்டலம் மரம் நிர்வகி .
 DocType: Journal Entry Account,Sales Invoice,விற்பனை விலை விவரம்
 DocType: Journal Entry Account,Party Balance,கட்சி இருப்பு
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,தள்ளுபடி விண்ணப்பிக்க தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,தள்ளுபடி விண்ணப்பிக்க தேர்ந்தெடுக்கவும்
 DocType: Company,Default Receivable Account,இயல்புநிலை பெறத்தக்க கணக்கு
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,மேலே தேர்ந்தெடுக்கப்பட்ட தகுதி சம்பளம் மொத்த சம்பளம் வங்கி நுழைவு உருவாக்கவும்
 DocType: Physician,Physician Schedule,மருத்துவர் அட்டவணை
 DocType: Purchase Invoice,Deemed Export,ஏற்றுக்கொள்ளப்பட்ட ஏற்றுமதி
 DocType: Stock Entry,Material Transfer for Manufacture,உற்பத்தி பொருள் மாற்றம்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,தள்ளுபடி சதவீதம் விலை பட்டியலை எதிராக அல்லது அனைத்து விலை பட்டியல் ஒன்று பயன்படுத்த முடியும்.
-DocType: Purchase Invoice,Half-yearly,அரை ஆண்டு
+DocType: Subscription,Half-yearly,அரை ஆண்டு
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,பங்கு பைனான்ஸ் நுழைவு
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,ஏற்கனவே மதிப்பீட்டிற்குத் தகுதி மதிப்பீடு செய்யப்பட்டதன் {}.
@@ -3049,13 +3105,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,மிகச்சிறியது
 DocType: Company,Standard Template,ஸ்டாண்டர்ட் வார்ப்புரு
 DocType: Training Event,Theory,தியரி
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,எச்சரிக்கை : அளவு கோரப்பட்ட பொருள் குறைந்தபட்ச ஆணை அளவு குறைவாக உள்ளது
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,எச்சரிக்கை : அளவு கோரப்பட்ட பொருள் குறைந்தபட்ச ஆணை அளவு குறைவாக உள்ளது
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,கணக்கு {0} உறைந்திருக்கும்
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,நிறுவனத்திற்கு சொந்தமான கணக்குகள் ஒரு தனி விளக்கப்படம் சட்ட நிறுவனம் / துணைநிறுவனத்திற்கு.
 DocType: Payment Request,Mute Email,முடக்கு மின்னஞ்சல்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","உணவு , குளிர்பானங்கள் & புகையிலை"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},மட்டுமே எதிரான கட்டணம் செய்யலாம் unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,கமிஷன் விகிதம் அதிகமாக 100 இருக்க முடியாது
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},மட்டுமே எதிரான கட்டணம் செய்யலாம் unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,கமிஷன் விகிதம் அதிகமாக 100 இருக்க முடியாது
 DocType: Stock Entry,Subcontract,உள் ஒப்பந்தம்
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,முதல் {0} உள்ளிடவும்
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,இருந்து பதிலில்லை
@@ -3073,10 +3129,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,நிறம்
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,மதிப்பீடு திட்டம் தகுதி
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,வாங்குவதற்கான ஆர்டர்களைத் தடு
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,பாதிக்கப்படுகின்றன
 DocType: Patient Appointment,Scheduled,திட்டமிடப்பட்ட
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,விலைப்பட்டியலுக்கான கோரிக்கை.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,மனித வளத்தில் பணியாளர் பெயரிடும் அமைப்பை அமைத்தல்&gt; HR அமைப்புகள்
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","&quot;இல்லை&quot; மற்றும் &quot;விற்பனை பொருள் இது&quot;, &quot;பங்கு உருப்படியை&quot; எங்கே &quot;ஆம்&quot; என்று பொருள் தேர்ந்தெடுக்க மற்றும் வேறு எந்த தயாரிப்பு மூட்டை உள்ளது செய்க"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,வாடிக்கையாளரைத் தேர்ந்தெடுக்கவும்
 DocType: Student Log,Academic,கல்வி
 DocType: Patient,Personal and Social History,தனிப்பட்ட மற்றும் சமூக வரலாறு
 DocType: Fee Schedule,Fee Breakup for each student,ஒவ்வொரு மாணவனுக்கும் கட்டணம் விதிக்கப்படும்
@@ -3086,7 +3143,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,மதிப்பீட்டு விகிதம்
 DocType: Stock Reconciliation,SR/,எஸ்ஆர் /
 DocType: Vehicle,Diesel,டீசல்
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,விலை பட்டியல் நாணய தேர்வு
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,விலை பட்டியல் நாணய தேர்வு
 apps/erpnext/erpnext/config/healthcare.py +46,Results,முடிவுகள்
 ,Student Monthly Attendance Sheet,மாணவர் மாதாந்திர வருகை தாள்
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},பணியாளர் {0} ஏற்கனவே {2} {3} இடையே {1} விண்ணப்பித்துள்ளனர்
@@ -3101,7 +3158,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,விற்னையாளர் பங்குதாரர்கள் நிர்வகி.
 DocType: Quality Inspection,Inspection Type,ஆய்வு அமைப்பு
 DocType: Fee Validity,Visited yet,இதுவரை பார்வையிட்டது
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,தற்போதுள்ள பரிவர்த்தனை கிடங்குகள் குழு மாற்றப்பட முடியாது.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,தற்போதுள்ள பரிவர்த்தனை கிடங்குகள் குழு மாற்றப்பட முடியாது.
 DocType: Assessment Result Tool,Result HTML,விளைவாக HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,அன்று காலாவதியாகிறது
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,மாணவர்கள் சேர்
@@ -3128,7 +3185,7 @@
 DocType: Healthcare Settings,Result Printed,முடிவு அச்சிடப்பட்டது
 DocType: Asset Category Account,Depreciation Expense Account,தேய்மானம் செலவில் கணக்கு
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,ப்ரொபேஷ்னரி காலம்
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},{0} காண்க
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},{0} காண்க
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ஒரே இலை முனைகள் பரிமாற்றத்தில் அனுமதிக்கப்படுகிறது
 DocType: Expense Claim,Expense Approver,செலவின தரப்பில் சாட்சி
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,ரோ {0}: வாடிக்கையாளர் எதிராக அட்வான்ஸ் கடன் இருக்க வேண்டும்
@@ -3140,7 +3197,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,நாள்நேரம் செய்ய
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,நிச்சயமாக அட்டவணை நீக்கப்பட்டது:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,எஸ்எம்எஸ் விநியோகம் அந்தஸ்து தக்கவைப்பதற்கு பதிவுகள்
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,விற்பனை இலக்கை அமைக்கவும்
 DocType: Accounts Settings,Make Payment via Journal Entry,பத்திரிகை நுழைவு வழியாக பணம் செலுத்து
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,அச்சிடப்பட்டது அன்று
 DocType: Item,Inspection Required before Delivery,பரிசோதனை டெலிவரி முன் தேவையான
@@ -3148,7 +3204,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,நிலுவையில் நடவடிக்கைகள்
 DocType: Patient Appointment,Reminded,நினைவூட்டப்பட்டது
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,உங்கள் அமைப்பு
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,உங்கள் அமைப்பு
 DocType: Fee Component,Fees Category,கட்டணம் பகுப்பு
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,தேதி நிவாரணத்தில் உள்ளிடவும்.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,விவரங்கள்
@@ -3160,7 +3216,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,மறுவரிசைப்படுத்துக நிலை
 DocType: Company,Chart Of Accounts Template,கணக்குகள் டெம்ப்ளேட் வரைவு
 DocType: Attendance,Attendance Date,வருகை தேதி
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},விலை பட்டியல் {1} ல்   பொருள் விலை {0} மேம்படுத்தப்பட்டது
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},விலை பட்டியல் {1} ல்   பொருள் விலை {0} மேம்படுத்தப்பட்டது
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,சம்பளம் கலைத்தல் வருமானம் மற்றும் துப்பறியும் அடிப்படையாக கொண்டது.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,குழந்தை முனைகளில் கணக்கு பேரேடு மாற்றப்பட முடியாது
 DocType: Purchase Invoice Item,Accepted Warehouse,கிடங்கு ஏற்கப்பட்டது
@@ -3176,9 +3232,10 @@
 ,Employee Birthday,பணியாளர் பிறந்தநாள்
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,மாணவர் தொகுதி வருகை கருவி
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,எல்லை குறுக்கு கோடிட்ட
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,திட்டமிடப்பட்டது
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,துணிகர முதலீடு
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"இந்த &#39;கல்வி ஆண்டு&#39; கொண்ட ஒரு கல்விசார் கால {0} மற்றும் &#39;கால பெயர்&#39; {1} ஏற்கனவே உள்ளது. இந்த உள்ளீடுகளை மாற்ற, மீண்டும் முயற்சிக்கவும்."
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","உருப்படியை {0} எதிராக இருக்கும் பரிமாற்றங்கள் உள்ளன, நீங்கள் மதிப்பு மாற்ற முடியாது {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","உருப்படியை {0} எதிராக இருக்கும் பரிமாற்றங்கள் உள்ளன, நீங்கள் மதிப்பு மாற்ற முடியாது {1}"
 DocType: UOM,Must be Whole Number,முழு எண் இருக்க வேண்டும்
 DocType: Leave Control Panel,New Leaves Allocated (In Days),புதிய விடுப்பு (நாட்களில்) ஒதுக்கப்பட்ட
 DocType: Purchase Invoice,Invoice Copy,விலைப்பட்டியல் நகல்
@@ -3188,7 +3245,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,விலைப்பட்டியல் எண்
 DocType: Shopping Cart Settings,Orders,ஆணைகள்
 DocType: Employee Leave Approver,Leave Approver,சர்க்கார் தரப்பில் சாட்சி விட்டு
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,ஒரு தொகுதி தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,ஒரு தொகுதி தேர்ந்தெடுக்கவும்
 DocType: Assessment Group,Assessment Group Name,மதிப்பீட்டு குழு பெயர்
 DocType: Manufacturing Settings,Material Transferred for Manufacture,பொருள் உற்பத்தி மாற்றப்பட்டது
 DocType: Expense Claim,"A user with ""Expense Approver"" role","""செலவு ஒப்புதல்"" பாத்திரம் ஒரு பயனர்"
@@ -3203,7 +3260,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,காலம் நிறைவு நுழைவு
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,திணைக்களம் தேர்ந்தெடு ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,ஏற்கனவே பரிவர்த்தனைகள் செலவு மையம் குழு மாற்றப்பட முடியாது
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},தொகை {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},தொகை {0} {1} {2} {3}
 DocType: Account,Depreciation,மதிப்பிறக்கம் தேய்மானம்
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),வழங்குபவர் (கள்)
 DocType: Employee Attendance Tool,Employee Attendance Tool,பணியாளர் வருகை கருவி
@@ -3215,10 +3272,12 @@
 DocType: GL Entry,Voucher No,ரசீது இல்லை
 ,Lead Owner Efficiency,முன்னணி உரிமையாளர் திறன்
 ,Lead Owner Efficiency,முன்னணி உரிமையாளர் திறன்
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,மிகவும் பிரபலமான
 DocType: Leave Allocation,Leave Allocation,ஒதுக்கீடு விட்டு
 DocType: Payment Request,Recipient Message And Payment Details,பெறுநரின் செய்தி மற்றும் கொடுப்பனவு விபரங்கள்
 DocType: Training Event,Trainer Email,பயிற்சி மின்னஞ்சல்
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,பொருள் கோரிக்கைகள் {0} உருவாக்கப்பட்டது
+DocType: Restaurant Reservation,No of People,மக்கள் இல்லை
 DocType: Production Planning Tool,Include sub-contracted raw materials,துணை ஒப்பந்த மூலப்பொருட்கள் சேர்க்கவும்
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,சொற்கள் அல்லது ஒப்பந்த வார்ப்புரு.
 DocType: Purchase Invoice,Address and Contact,முகவரி மற்றும் தொடர்பு
@@ -3227,10 +3286,11 @@
 DocType: Supplier,Last Day of the Next Month,அடுத்த மாதத்தின் கடைசி நாளில்
 DocType: Support Settings,Auto close Issue after 7 days,7 நாட்களுக்குப் பிறகு ஆட்டோ நெருங்கிய வெளியீடு
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","முன் ஒதுக்கீடு செய்யப்படும் {0}, விடுப்பு சமநிலை ஏற்கனவே கேரி-அனுப்பி எதிர்கால விடுப்பு ஒதுக்கீடு பதிவில் இருந்து வருகிறது {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),குறிப்பு: / குறிப்பு தேதி {0} நாள் அனுமதிக்கப்பட்ட வாடிக்கையாளர் கடன் அதிகமாகவும் (கள்)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),குறிப்பு: / குறிப்பு தேதி {0} நாள் அனுமதிக்கப்பட்ட வாடிக்கையாளர் கடன் அதிகமாகவும் (கள்)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,மாணவர் விண்ணப்பதாரர்
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,RECIPIENT ஐச் அசல்
 DocType: Asset Category Account,Accumulated Depreciation Account,திரண்ட தேய்மானம் கணக்கு
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,இந்த மின்னஞ்சல் autogenerated
 DocType: Stock Settings,Freeze Stock Entries,பங்கு பதிவுகள் நிறுத்தப்படலாம்
 DocType: Program Enrollment,Boarding Student,போர்டிங் மாணவர்
 DocType: Asset,Expected Value After Useful Life,எதிர்பார்த்த மதிப்பு  பயனுள்ள வாழ்க்கை பிறகு
@@ -3238,7 +3298,7 @@
 DocType: Activity Cost,Billing Rate,பில்லிங் விகிதம்
 ,Qty to Deliver,அடித்தளத்திருந்து அளவு
 ,Stock Analytics,பங்கு அனலிட்டிக்ஸ்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,ஆபரேஷன்ஸ் வெறுமையாக முடியும்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,ஆபரேஷன்ஸ் வெறுமையாக முடியும்
 DocType: Maintenance Visit Purpose,Against Document Detail No,ஆவண விபரம் எண் எதிராக
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,கட்சி வகை அத்தியாவசியமானதாகும்
 DocType: Quality Inspection,Outgoing,வெளிச்செல்லும்
@@ -3261,7 +3321,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,நடவடிக்கை பொறுத்தே குழு கைமுறையாகச் மாணவர்கள் தேர்வு
 DocType: Journal Entry,User Remark,பயனர் குறிப்பு
 DocType: Lead,Market Segment,சந்தை பிரிவு
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},செலுத்திய தொகை மொத்த எதிர்மறை கடன் தொகையை விட அதிகமாக இருக்க முடியாது {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},செலுத்திய தொகை மொத்த எதிர்மறை கடன் தொகையை விட அதிகமாக இருக்க முடியாது {0}
 DocType: Supplier Scorecard Period,Variables,மாறிகள்
 DocType: Employee Internal Work History,Employee Internal Work History,பணியாளர் உள் வேலை வரலாறு
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),நிறைவு (டாக்டர்)
@@ -3291,21 +3351,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,மேம்படுத்தல்கள் கிடைக்கும்
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: கணக்கு {2} நிறுவனத்தின் சொந்தம் இல்லை {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,பொருள் கோரிக்கை {0} ரத்து அல்லது நிறுத்தி
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,மேலாண்மை விடவும்
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,மேலாண்மை விடவும்
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,கணக்கு குழு
 DocType: Sales Order,Fully Delivered,முழுமையாக வழங்கப்படுகிறது
 DocType: Lead,Lower Income,குறைந்த வருமானம்
+DocType: Restaurant Order Entry,Current Order,தற்போதைய வரிசை
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},மூல மற்றும் அடைவு கிடங்கில் வரிசையில் அதே இருக்க முடியாது {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",இந்த பங்கு நல்லிணக்க ஒரு தொடக்க நுழைவு என்பதால் வேறுபாடு அக்கவுண்ட் சொத்து / பொறுப்பு வகை கணக்கு இருக்க வேண்டும்
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},செலவிட்டு தொகை கடன் தொகை அதிகமாக இருக்கக் கூடாது கொள்ளலாம் {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,நிகழ்ச்சிகளுக்கு செல்க
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},கொள்முதல் ஆணை எண் பொருள் தேவை {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,உற்பத்தி ஆர்டர் உருவாக்கப்பட்டது இல்லை
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,உற்பத்தி ஆர்டர் உருவாக்கப்பட்டது இல்லை
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',' வரம்பு தேதி ' தேதி ' பிறகு இருக்க வேண்டும்
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},மாணவர் என நிலையை மாற்ற முடியாது {0} மாணவர் பயன்பாடு இணைந்தவர் {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},மாணவர் என நிலையை மாற்ற முடியாது {0} மாணவர் பயன்பாடு இணைந்தவர் {1}
 DocType: Asset,Fully Depreciated,முழுமையாக தணியாக
 ,Stock Projected Qty,பங்கு அளவு திட்டமிடப்பட்ட
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},வாடிக்கையாளர் {0} திட்டம் அல்ல {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},வாடிக்கையாளர் {0} திட்டம் அல்ல {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,"அடையாளமிட்ட வருகை, HTML"
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",மேற்கோள்கள் முன்மொழிவுகள் நீங்கள் உங்கள் வாடிக்கையாளர்களுக்கு அனுப்பியுள்ளோம் ஏலம் உள்ளன
 DocType: Sales Order,Customer's Purchase Order,வாடிக்கையாளர் கொள்முதல் ஆணை
@@ -3316,8 +3377,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Depreciations எண்ணிக்கை பதிவுசெய்தீர்கள் அமைக்கவும்
 DocType: Supplier Scorecard Period,Calculations,கணக்கீடுகள்
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,மதிப்பு அல்லது அளவு
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,புரொடக்சன்ஸ் ஆணைகள் எழுப்பியது முடியாது:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,புரொடக்சன்ஸ் ஆணைகள் எழுப்பியது முடியாது:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,நிமிஷம்
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,அமைவு&gt; அமைப்புகள்&gt; பெயரிடும் தொடர்கள் வழியாக {0} பெயரிடும் தொடர்களை அமைக்கவும்
 DocType: Purchase Invoice,Purchase Taxes and Charges,கொள்முதல் வரி மற்றும் கட்டணங்கள்
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,சப்ளையர்களிடம் செல்க
 ,Qty to Receive,மதுரையில் அளவு
@@ -3331,7 +3393,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,கணக்கில் பணம் வரவு ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,அனைத்து வழங்குபவர் வகைகள்
 DocType: Global Defaults,Disable In Words,சொற்கள் முடக்கு
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,பொருள் தானாக எண் ஏனெனில் பொருள் கோட் கட்டாய ஆகிறது
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,பொருள் தானாக எண் ஏனெனில் பொருள் கோட் கட்டாய ஆகிறது
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},மேற்கோள் {0} அல்ல வகை {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,பராமரிப்பு அட்டவணை பொருள்
 DocType: Sales Order,%  Delivered,அனுப்பப்பட்டது%
@@ -3353,23 +3415,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,திறப்பு இருப்பு ஈக்விட்டி
 DocType: Lead,CRM,"CRM,"
 DocType: Purchase Invoice,N,என்
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,நல்லிணக்க
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,மீதமுள்ள
 DocType: Appraisal,Appraisal,மதிப்பிடுதல்
 DocType: Purchase Invoice,GST Details,GST விவரம்
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},சப்ளையர் அனுப்பப்படும் மின்னஞ்சல் {0}
+DocType: Item,Default Sales Unit of Measure,அளவீட்டின் இயல்புநிலை விற்பனை பிரிவு
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,தேதி மீண்டும்
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,அங்கீகரிக்கப்பட்ட கையொப்பதாரரால்
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},"விட்டு வீடு, ஒன்றாக இருக்க வேண்டும் {0}"
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,கட்டணம் உருவாக்கவும்
-DocType: Hub Settings,Seller Email,விற்பனையாளர் மின்னஞ்சல்
 DocType: Project,Total Purchase Cost (via Purchase Invoice),மொத்த கொள்முதல் விலை (கொள்முதல் விலைப்பட்டியல் வழியாக)
 DocType: Training Event,Start Time,தொடக்க நேரம்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,தேர்வு அளவு
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,தேர்வு அளவு
 DocType: Customs Tariff Number,Customs Tariff Number,சுங்க கட்டணம் எண்
 DocType: Patient Appointment,Patient Appointment,நோயாளி நியமனம்
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,பங்கு ஒப்புதல் ஆட்சி பொருந்தும் பாத்திரம் அதே இருக்க முடியாது
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,இந்த மின்னஞ்சல் டைஜஸ்ட் இருந்து விலகுவதற்காக
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,இந்த மின்னஞ்சல் டைஜஸ்ட் இருந்து விலகுவதற்காக
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,மூலம் சப்ளையர்கள் கிடைக்கும்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} பொருள் {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,பாடத்திட்டங்களுக்குச் செல்
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,செய்தி அனுப்பப்பட்டது
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,குழந்தை முனைகளில் கணக்கு பேரேடு அமைக்க முடியாது
@@ -3382,11 +3447,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,பொருள் தயாரிப்பு இடமாற்றம்
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,கணக்கு {0} இல்லை உள்ளது
 DocType: Project,Project Type,திட்ட வகை
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,இந்த பணிக்கான குழந்தை பணி உள்ளது. இந்த பணி நீக்க முடியாது.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,இலக்கு அளவு அல்லது இலக்கு அளவு கட்டாயமாகும்.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,பல்வேறு நடவடிக்கைகள் செலவு
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,இன்னும் முடிவு இல்லை
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,பல்வேறு நடவடிக்கைகள் செலவு
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","அமைத்தல் நிகழ்வுகள் {0}, விற்பனை நபர்கள் கீழே இணைக்கப்பட்டுள்ளது பணியாளர் ஒரு பயனர் ஐடி இல்லை என்பதால் {1}"
 DocType: Timesheet,Billing Details,பில்லிங் விவரங்கள்
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,மூல மற்றும் இலக்கு கிடங்கில் வேறு இருக்க வேண்டும்
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,மூல மற்றும் இலக்கு கிடங்கில் வேறு இருக்க வேண்டும்
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},விட பங்கு பரிவர்த்தனைகள் பழைய இற்றைப்படுத்த முடியாது {0}
 DocType: Purchase Invoice Item,PR Detail,PR விரிவாக
 DocType: Sales Order,Fully Billed,முழுமையாக வசூலிக்கப்படும்
@@ -3413,7 +3480,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,வயர் மாற்றம்
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,அனைத்து பாருங்கள்
 DocType: Vehicle Log,Invoice Ref,விலைப்பட்டியல் குறிப்பு
-DocType: Purchase Order,Recurring Order,வழக்கமாகத் தோன்றும் ஆணை
 DocType: Company,Default Income Account,இயல்புநிலை வருமான கணக்கு
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,வாடிக்கையாளர் குழு / வாடிக்கையாளர்
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),மூடப்படாத வரி ஆண்டுக்கான லாபம் / இழப்பு (கடன்)
@@ -3427,9 +3493,9 @@
 DocType: Patient,A Negative,ஒரு எதிர்மறை
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,மேலும் காண்பிக்க எதுவும் இல்லை.
 DocType: Lead,From Customer,வாடிக்கையாளர் இருந்து
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,அழைப்புகள்
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,அழைப்புகள்
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,ஒரு தயாரிப்பு
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,தொகுப்புகளும்
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,தொகுப்புகளும்
 DocType: Project,Total Costing Amount (via Time Logs),மொத்த செலவு தொகை (நேரத்தில் பதிவுகள் வழியாக)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,கட்டணம் செலுத்தவும்
 DocType: Purchase Order Item Supplied,Stock UOM,பங்கு மொறட்டுவ பல்கலைகழகம்
@@ -3454,7 +3520,7 @@
 DocType: School Settings,Current Academic Term,தற்போதைய கல்வி கால
 DocType: School Settings,Current Academic Term,தற்போதைய கல்வி கால
 DocType: Sales Order,Not Billed,கட்டணம் இல்லை
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,இரண்டு கிடங்கு அதே நிறுவனத்திற்கு சொந்தமானது வேண்டும்
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,இரண்டு கிடங்கு அதே நிறுவனத்திற்கு சொந்தமானது வேண்டும்
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,தொடர்புகள் இல்லை இன்னும் சேர்க்கப்படவில்லை.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Landed செலவு ரசீது தொகை
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,பில்கள் விநியோகஸ்தர்கள் எழுப்பும்.
@@ -3463,7 +3529,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,தள்ளுபடி தொகை
 DocType: Purchase Invoice,Return Against Purchase Invoice,எதிராக கொள்முதல் விலைப்பட்டியல் திரும்ப
 DocType: Item,Warranty Period (in days),உத்தரவாதத்தை காலம் (நாட்கள்)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',update` tabPatient Appointment` set விற்பனை_அழுவை = &#39;{0}&#39; where name = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Guardian1 அரசுடன் உறவு
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,செயல்பாடுகள் இருந்து நிகர பண
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,பொருள் 4
@@ -3472,8 +3537,8 @@
 DocType: Journal Entry Account,Journal Entry Account,பத்திரிகை நுழைவு கணக்கு
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,மாணவர் குழு
 DocType: Shopping Cart Settings,Quotation Series,மேற்கோள் தொடர்
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","ஒரு பொருளை ( {0} ) , உருப்படி குழு பெயர் மாற்ற அல்லது மறுபெயரிட தயவு செய்து அதே பெயரில்"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,வாடிக்கையாளர் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","ஒரு பொருளை ( {0} ) , உருப்படி குழு பெயர் மாற்ற அல்லது மறுபெயரிட தயவு செய்து அதே பெயரில்"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,வாடிக்கையாளர் தேர்ந்தெடுக்கவும்
 DocType: C-Form,I,நான்
 DocType: Company,Asset Depreciation Cost Center,சொத்து தேய்மானம் செலவு மையம்
 DocType: Sales Order Item,Sales Order Date,விற்பனை ஆர்டர் தேதி
@@ -3482,6 +3547,7 @@
 DocType: Assessment Plan,Assessment Plan,மதிப்பீடு திட்டம்
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,வாடிக்கையாளர் {0} உருவாக்கப்பட்டது.
 DocType: Stock Settings,Limit Percent,எல்லை சதவீதம்
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,தற்போது எந்த கிடங்கிலும் பங்கு இல்லை
 ,Payment Period Based On Invoice Date,விலைப்பட்டியல் தேதியின் அடிப்படையில் கொடுப்பனவு காலம்
 DocType: Sample Collection,No. of print,அச்சு எண்
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},காணாமல் நாணய மாற்று விகிதங்கள் {0}
@@ -3537,13 +3603,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,மொத்த பே - மொத்த பொருத்தியறிதல் - கடனாக தொகையை திரும்பச் செலுத்துதல்
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,தற்போதைய BOM மற்றும் நியூ BOM அதே இருக்க முடியாது
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,சம்பளம் ஸ்லிப் ஐடி
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,சம்பளம் ஸ்லிப் ஐடி
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,ஓய்வு நாள் சேர தேதி விட அதிகமாக இருக்க வேண்டும்
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,நிச்சயமாக திட்டமிடும் போது தவறுகள் இருந்தன:
 DocType: Sales Invoice,Against Income Account,வருமான கணக்கு எதிராக
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% வழங்கப்படுகிறது
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,பொருள் {0}: உத்தரவிட்டார் அளவு {1} குறைந்தபட்ச வரிசை அளவு {2} (உருப்படியை வரையறுக்கப்பட்ட) விட குறைவாக இருக்க முடியாது.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,பொருள் {0}: உத்தரவிட்டார் அளவு {1} குறைந்தபட்ச வரிசை அளவு {2} (உருப்படியை வரையறுக்கப்பட்ட) விட குறைவாக இருக்க முடியாது.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,மாதாந்திர விநியோகம் சதவீதம்
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,தயவுசெய்து மற்றொரு பயனராக உள்நுழைக.
 DocType: Territory,Territory Targets,மண்டலம் இலக்குகள்
 DocType: Delivery Note,Transporter Info,போக்குவரத்து தகவல்
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},இயல்புநிலை {0} நிறுவனத்தின் அமைக்கவும் {1}
@@ -3551,13 +3618,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,அதே சப்ளையர் பல முறை உள்ளிட்ட வருகிறது
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,மொத்த லாபம் / இழப்பு
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,கொள்முதல் ஆணை பொருள் வழங்கியது
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,நிறுவனத்தின் பெயர் நிறுவனத்தின் இருக்க முடியாது
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,நிறுவனத்தின் பெயர் நிறுவனத்தின் இருக்க முடியாது
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,அச்சு வார்ப்புருக்கள் தலைமை பெயர்.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"அச்சு வார்ப்புருக்கள் தலைப்புகள் , எ.கா. செய்யறதுன்னு ."
 DocType: Program Enrollment,Walking,வாக்கிங்
 DocType: Student Guardian,Student Guardian,மாணவர் கார்டியன்
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,மதிப்பீட்டு வகை குற்றச்சாட்டுக்கள் உள்ளீடான என குறிக்கப்பட்டுள்ளன
 DocType: POS Profile,Update Stock,பங்கு புதுப்பிக்க
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,சந்தாவில்
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,பொருட்களை பல்வேறு மொறட்டுவ பல்கலைகழகம் தவறான ( மொத்த ) நிகர எடை மதிப்பு வழிவகுக்கும். ஒவ்வொரு பொருளின் நிகர எடை அதே மொறட்டுவ பல்கலைகழகம் உள்ளது என்று உறுதி.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM விகிதம்
 DocType: Asset,Journal Entry for Scrap,ஸ்கிராப் பத்திரிகை நுழைவு
@@ -3607,15 +3675,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","கணினி பயனர் (உள்நுழைய) ஐடி. அமைத்தால், அது அனைத்து அலுவலக வடிவங்கள் முன்னிருப்பு போம்."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0} இருந்து: {1}
 DocType: Task,depends_on,பொறுத்தது
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,பொருட்கள் அனைத்து பில் சமீபத்திய விலை மேம்படுத்தும் வரிசை. சில நிமிடங்கள் ஆகலாம்.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,பொருட்கள் அனைத்து பில் சமீபத்திய விலை மேம்படுத்தும் வரிசை. சில நிமிடங்கள் ஆகலாம்.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,புதிய கணக்கு பெயர். குறிப்பு: வாடிக்கையாளர்களும் விநியோகத்தர்களும் கணக்குகள் உருவாக்க வேண்டாம்
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,நாடு வாரியாக இயல்புநிலை முகவரி டெம்ப்ளேட்கள்
 DocType: Sales Order Item,Supplier delivers to Customer,சப்ளையர் வாடிக்கையாளர் வழங்குகிறது
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# படிவம் / பொருள் / {0}) பங்கு வெளியே
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},காரணமாக / குறிப்பு தேதி பின்னர் இருக்க முடியாது {0}
+,Sales Payment Summary,விற்பனை கட்டணம் சுருக்கம்
+DocType: Restaurant,Restaurant,உணவகம்
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},காரணமாக / குறிப்பு தேதி பின்னர் இருக்க முடியாது {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,தரவு இறக்குமதி மற்றும் ஏற்றுமதி
 DocType: Patient,Account Details,கணக்கு விவரம்
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,மாணவர்கள் காணப்படவில்லை.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,மாணவர்கள் காணப்படவில்லை.
 DocType: Medical Department,Medical Department,மருத்துவ துறை
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,சப்ளையர் ஸ்கோர் கார்ட் ஸ்கேரிங் க்ரிடீரியா
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,விலைப்பட்டியல் பதிவுசெய்ய தேதி
@@ -3626,8 +3696,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,"கட்சி தேர்வு செய்யும் முன், பதிவுசெய்ய தேதி தேர்ந்தெடுக்கவும்"
 DocType: Program Enrollment,School House,பள்ளி ஹவுஸ்
 DocType: Serial No,Out of AMC,AMC வெளியே
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,மேற்கோள்கள் தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,மேற்கோள்கள் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,மேற்கோள்கள் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,மேற்கோள்கள் தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,முன்பதிவு செய்யப்பட்டது தேய்மானம்  எண்ணிக்கையை விட அதிகமாக இருக்க முடியும்
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,பராமரிப்பு விஜயம் செய்ய
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,விற்பனை மாஸ்டர் மேலாளர் {0} பங்கு கொண்ட பயனர் தொடர்பு கொள்ளவும்
@@ -3635,7 +3705,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,நிறுவனத்தின் ( இல்லை வாடிக்கையாளருக்கு அல்லது வழங்குநருக்கு ) மாஸ்டர் .
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,இந்த மாணவர் வருகை அடிப்படையாக கொண்டது
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,எந்த மாணவர்
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,மேலும் பொருட்களை அல்லது திறந்த முழு வடிவம் சேர்க்க
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,மேலும் பொருட்களை அல்லது திறந்த முழு வடிவம் சேர்க்க
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,டெலிவரி குறிப்புகள் {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,பயனர்களிடம் செல்க
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,பணம் அளவு + அளவு தள்ளுபடி கிராண்ட் மொத்த விட முடியாது
@@ -3655,37 +3725,40 @@
 DocType: Fee Schedule,Fee Schedule,கட்டண அட்டவணை
 DocType: Hub Settings,Publish Availability,கிடைக்கும் வெளியிடு
 DocType: Company,Create Chart Of Accounts Based On,கணக்குகளை அடிப்படையில் வரைவு உருவாக்கு
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,அதை அல்லாத குழு மாற்ற முடியாது. குழந்தை பணிகள் உள்ளன.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,பிறந்த தேதி இன்று விட அதிகமாக இருக்க முடியாது.
 ,Stock Ageing,பங்கு மூப்படைதலுக்கான
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},மாணவர் {0} மாணவர் விண்ணப்பதாரர் எதிராக உள்ளன {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),வட்டமான சரிசெய்தல் (கம்பெனி நாணய)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,டைம் ஷீட்
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,டைம் ஷீட்
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} {1} 'முடக்கப்பட்டுள்ளது
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,திறந்த அமை
 DocType: Cheque Print Template,Scanned Cheque,ஸ்கேன் காசோலை
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,சமர்ப்பிக்கும் பரிமாற்றங்கள் மீது தொடர்புகள் தானியங்கி மின்னஞ்சல்களை அனுப்ப.
 DocType: Timesheet,Total Billable Amount,மொத்த பில்லிடக்கூடியது தொகை
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,பொருள் 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,ஆர்டர் நுழைவு
 DocType: Purchase Order,Customer Contact Email,வாடிக்கையாளர் தொடர்பு மின்னஞ்சல்
 DocType: Warranty Claim,Item and Warranty Details,பொருள் மற்றும் உத்தரவாதத்தை விபரங்கள்
 DocType: Sales Team,Contribution (%),பங்களிப்பு (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,குறிப்பு: கொடுப்பனவு நுழைவு ' பண அல்லது வங்கி கணக்கு ' குறிப்பிடப்படவில்லை என்பதால் உருவாக்கப்பட்டது முடியாது
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,திட்டம் {0} ஏற்கனவே உள்ளது
 DocType: Medical Department,Nursing User,நர்சிங் பயனர்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,பொறுப்புகள்
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,இந்த மேற்கோள் செல்லுபடியாகும் காலம் முடிந்தது.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,இந்த மேற்கோள் செல்லுபடியாகும் காலம் முடிந்தது.
 DocType: Expense Claim Account,Expense Claim Account,செலவு கூறுகின்றனர் கணக்கு
 DocType: Accounts Settings,Allow Stale Exchange Rates,நிலையான மாற்று விகிதங்களை அனுமதி
 DocType: Sales Person,Sales Person Name,விற்பனை நபர் பெயர்
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,அட்டவணையில் குறைந்தது 1 விலைப்பட்டியல் உள்ளிடவும்
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,பயனர்கள் சேர்க்கவும்
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,பயனர்கள் சேர்க்கவும்
 DocType: POS Item Group,Item Group,பொருள் குழு
 DocType: Item,Safety Stock,பாதுகாப்பு பங்கு
 DocType: Healthcare Settings,Healthcare Settings,சுகாதார அமைப்புகள்
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,ஒரு பணி முன்னேற்றம்% 100 க்கும் மேற்பட்ட இருக்க முடியாது.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,ஒரு பணி முன்னேற்றம்% 100 க்கும் மேற்பட்ட இருக்க முடியாது.
 DocType: Stock Reconciliation Item,Before reconciliation,சமரசம் முன்
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},எப்படி {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),வரிகள் மற்றும் கட்டணங்கள் சேர்க்கப்பட்டது (நிறுவனத்தின் கரன்சி)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,பொருள் வரி வரிசையில் {0} வகை வரி அல்லது வருமான அல்லது செலவு அல்லது வசூலிக்கப்படும் கணக்கு இருக்க வேண்டும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,பொருள் வரி வரிசையில் {0} வகை வரி அல்லது வருமான அல்லது செலவு அல்லது வசூலிக்கப்படும் கணக்கு இருக்க வேண்டும்
 DocType: Sales Order,Partly Billed,இதற்கு கட்டணம்
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,பொருள் {0} ஒரு நிலையான சொத்தின் பொருள் இருக்க வேண்டும்
 DocType: Item,Default BOM,முன்னிருப்பு BOM
@@ -3701,6 +3774,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,மாறி
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,டெலிவரி குறிப்பு இருந்து
 DocType: Student,Student Email Address,மாணவர் மின்னஞ்சல் முகவரி
+DocType: Item,Hub Warehouse,ஹப் கிடங்கு
 DocType: Physician Schedule Time Slot,From Time,நேரம் இருந்து
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,கையிருப்பில்:
 DocType: Notification Control,Custom Message,தனிப்பயன் செய்தி
@@ -3709,9 +3783,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,மாணவர் முகவரி
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,மாணவர் முகவரி
 DocType: Purchase Invoice,Price List Exchange Rate,விலை பட்டியல் செலாவணி விகிதம்
+DocType: POS Profile,POS Profile Name,POS சுயவிவரத்தின் பெயர்
 DocType: Purchase Invoice Item,Rate,விலை
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,நடமாட்டத்தை கட்டுபடுத்து
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,முகவரி பெயர்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,முகவரி பெயர்
 DocType: Stock Entry,From BOM,"BOM, இருந்து"
 DocType: Assessment Code,Assessment Code,மதிப்பீடு குறியீடு
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,அடிப்படையான
@@ -3725,11 +3800,12 @@
 DocType: Salary Slip,Salary Structure,சம்பளம் அமைப்பு
 DocType: Account,Bank,வங்கி
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,விமானத்துறை
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,பிரச்சினை பொருள்
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,பிரச்சினை பொருள்
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,மீண்டும் உருவாக்கும்போது பிழை ஏற்பட்டது
 DocType: Material Request Item,For Warehouse,கிடங்கு
 DocType: Employee,Offer Date,சலுகை  தேதி
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,மேற்கோள்கள்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,நீங்கள் ஆஃப்லைனில் உள்ளன. நீங்கள் பிணைய வேண்டும் வரை ஏற்றவும் முடியாது.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,நீங்கள் ஆஃப்லைனில் உள்ளன. நீங்கள் பிணைய வேண்டும் வரை ஏற்றவும் முடியாது.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,மாணவர் குழுக்கள் உருவாக்கப்படவில்லை.
 DocType: Purchase Invoice Item,Serial No,இல்லை தொடர்
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,மாதாந்திர கட்டுந்தொகை கடன் தொகை அதிகமாக இருக்கக் கூடாது முடியும்
@@ -3739,17 +3815,18 @@
 DocType: Salary Slip,Total Working Hours,மொத்த வேலை நேரங்கள்
 DocType: Subscription,Next Schedule Date,அடுத்த அட்டவணை தேதி
 DocType: Stock Entry,Including items for sub assemblies,துணை தொகுதிகளுக்கான உருப்படிகள் உட்பட
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,உள்ளிடவும் மதிப்பு நேர்மறையாக இருக்க வேண்டும்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,அனைத்து பிரதேசங்களையும்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,உள்ளிடவும் மதிப்பு நேர்மறையாக இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,அனைத்து பிரதேசங்களையும்
 DocType: Purchase Invoice,Items,பொருட்கள்
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,மாணவர் ஏற்கனவே பதிவு செய்யப்பட்டது.
 DocType: Fiscal Year,Year Name,ஆண்டு பெயர்
 DocType: Process Payroll,Process Payroll,செயல்முறை சம்பளப்பட்டியல்
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,இந்த மாதம் வேலை நாட்களுக்கு மேல் விடுமுறை உள்ளன .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,இந்த மாதம் வேலை நாட்களுக்கு மேல் விடுமுறை உள்ளன .
 DocType: Product Bundle Item,Product Bundle Item,தயாரிப்பு மூட்டை பொருள்
 DocType: Sales Partner,Sales Partner Name,விற்பனை வரன்வாழ்க்கை துணை பெயர்
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,விலைக்குறிப்புகளுக்கான வேண்டுகோள்
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,விலைக்குறிப்புகளுக்கான வேண்டுகோள்
 DocType: Payment Reconciliation,Maximum Invoice Amount,அதிகபட்ச விலைப்பட்டியல் அளவு
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,இரத்தவியல்
 DocType: Normal Test Items,Normal Test Items,சாதாரண சோதனை பொருட்கள்
 DocType: Student Language,Student Language,மாணவர் மொழி
 apps/erpnext/erpnext/config/selling.py +23,Customers,வாடிக்கையாளர்கள்
@@ -3761,10 +3838,11 @@
 DocType: Issue,Opening Time,நேரம் திறந்து
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,தேவையான தேதிகள் மற்றும் இதயம்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,செக்யூரிட்டிஸ் & பண்ட பரிமாற்ற
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',மாற்று அளவீடு இயல்புநிலை யூனிட் &#39;{0}&#39; டெம்ப்ளேட் அதே இருக்க வேண்டும் &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',மாற்று அளவீடு இயல்புநிலை யூனிட் &#39;{0}&#39; டெம்ப்ளேட் அதே இருக்க வேண்டும் &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ஆனால் அடிப்படையில் கணக்கிட
 DocType: Delivery Note Item,From Warehouse,கிடங்கில் இருந்து
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,பொருட்களை பில் கொண்டு உருப்படிகள் இல்லை தயாரிப்பதற்கான
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,பொருட்களை பில் கொண்டு உருப்படிகள் இல்லை தயாரிப்பதற்கான
+DocType: Restaurant,Default Customer,இயல்புநிலை வாடிக்கையாளர்
 DocType: Assessment Plan,Supervisor Name,மேற்பார்வையாளர் பெயர்
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,ஒரே நாளில் சந்திப்பு உருவாக்கப்பட்டது என்றால் உறுதிப்படுத்தாதீர்கள்
 DocType: Program Enrollment Course,Program Enrollment Course,திட்டம் பதிவு கோர்ஸ்
@@ -3792,7 +3870,7 @@
 DocType: Payment Entry,Internal Transfer,உள்நாட்டு மாற்றம்
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,குழந்தை கணக்கு இந்த கணக்கு உள்ளது . நீங்கள் இந்த கணக்கை நீக்க முடியாது .
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,இலக்கு அளவு அல்லது இலக்கு அளவு கட்டாயமாகும்.
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},"இயல்புநிலை BOM, பொருள் உள்ளது {0}"
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},"இயல்புநிலை BOM, பொருள் உள்ளது {0}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,முதல் பதிவுசெய்ய தேதி தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,தேதி திறந்து தேதி மூடுவதற்கு முன் இருக்க வேண்டும்
 DocType: Leave Control Panel,Carry Forward,முன்னெடுத்து செல்
@@ -3828,6 +3906,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,மொத்த தற்போதைய
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,கணக்கு அறிக்கைகள்
 DocType: Drug Prescription,Hour,மணி
+DocType: Restaurant Order Entry,Last Sales Invoice,கடைசி விற்பனை விலைப்பட்டியல்
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,புதிய சீரியல் இல்லை கிடங்கு முடியாது . கிடங்கு பங்கு நுழைவு அல்லது கொள்முதல் ரசீது மூலம் அமைக்க வேண்டும்
 DocType: Lead,Lead Type,முன்னணி வகை
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,நீங்கள் பிளாக் தேதிகள் இலைகள் ஒப்புதல் அங்கீகாரம் இல்லை
@@ -3864,65 +3943,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,பயனர்கள் உருவாக்கவும்
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,கிராம
 DocType: Supplier Scorecard,Per Month,ஒரு மாதம்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,உற்பத்தி செய்ய அளவு 0 அதிகமாக இருக்க வேண்டும்.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,உற்பத்தி செய்ய அளவு 0 அதிகமாக இருக்க வேண்டும்.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,பராமரிப்பு அழைப்பு அறிக்கையை பார்க்க.
 DocType: Stock Entry,Update Rate and Availability,மேம்படுத்தல் விகிதம் மற்றும் கிடைக்கும்
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,நீங்கள் அளவு எதிராக இன்னும் பெற அல்லது வழங்க அனுமதிக்கப்படுகிறது சதவீதம் உத்தரவிட்டது. எடுத்துக்காட்டாக: நீங்கள் 100 அலகுகள் உத்தரவிட்டார் என்றால். உங்கள் அலவன்ஸ் 10% நீங்கள் 110 அலகுகள் பெற அனுமதிக்கப்படும்.
 DocType: POS Customer Group,Customer Group,வாடிக்கையாளர் பிரிவு
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),புதிய தொகுப்பு ஐடி (விரும்பினால்)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),புதிய தொகுப்பு ஐடி (விரும்பினால்)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),புதிய தொகுப்பு ஐடி (விரும்பினால்)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),புதிய தொகுப்பு ஐடி (விரும்பினால்)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},செலவு கணக்கு உருப்படியை கட்டாய {0}
 DocType: BOM,Website Description,இணையதளத்தில் விளக்கம்
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ஈக்விட்டி நிகர மாற்றம்
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,புதியது
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,கொள்முதல் விலைப்பட்டியல் {0} ரத்து செய்க முதல்
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","மின்னஞ்சல் முகவரி, தனித்துவமானதாக இருக்க வேண்டும் ஏற்கனவே உள்ளது {0}"
 DocType: Serial No,AMC Expiry Date,AMC காலாவதியாகும் தேதி
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,ரசீது
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,ரசீது
 ,Sales Register,விற்பனை பதிவு
 DocType: Daily Work Summary Settings Company,Send Emails At,மின்னஞ்சல்களை அனுப்பவும்
 DocType: Quotation,Quotation Lost Reason,மேற்கோள் காரணம் லாஸ்ட்
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,உங்கள் டொமைன் தேர்வு
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',tabPatient இலிருந்து * name = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},பரிவர்த்தனை குறிப்பு இல்லை {0} தேதியிட்ட {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},பரிவர்த்தனை குறிப்பு இல்லை {0} தேதியிட்ட {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,திருத்த எதுவும் இல்லை .
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,படிவம் காட்சி
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,இந்த மாதம் மற்றும் நிலுவையில் நடவடிக்கைகள் சுருக்கம்
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,படிவம் காட்சி
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,இந்த மாதம் மற்றும் நிலுவையில் நடவடிக்கைகள் சுருக்கம்
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","உங்களை தவிர, உங்கள் நிறுவனத்திற்கு பயனர்களைச் சேர்க்கவும்."
 DocType: Customer Group,Customer Group Name,வாடிக்கையாளர் குழு பெயர்
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,இதுவரை இல்லை வாடிக்கையாளர்கள்!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,இதுவரை இல்லை வாடிக்கையாளர்கள்!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,பணப்பாய்வு அறிக்கை
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},கடன் தொகை அதிகபட்ச கடன் தொகை தாண்ட முடியாது {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,உரிமம்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},சி-படிவம் இந்த விலைப்பட்டியல் {0} நீக்கவும் {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},சி-படிவம் இந்த விலைப்பட்டியல் {0} நீக்கவும் {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,நீங்கள் முந்தைய நிதி ஆண்டின் இருப்புநிலை இந்த நிதி ஆண்டு விட்டு சேர்க்க விரும்பினால் முன் எடுத்து கொள்ளவும்
 DocType: GL Entry,Against Voucher Type,வவுச்சர் வகை எதிராக
 DocType: Physician,Phone (R),தொலைபேசி (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,நேர இடங்கள் சேர்க்கப்பட்டன
 DocType: Item,Attributes,கற்பிதங்கள்
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,டெம்ப்ளேட் இயக்கு
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,அமைவு&gt; அமைப்புகள்&gt; பெயரிடும் தொடர்கள் வழியாக {0} பெயரிடும் தொடர்களை அமைக்கவும்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,கணக்கு எழுத உள்ளிடவும்
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,கடைசி ஆர்டர் தேதி
 DocType: Patient,B Negative,பி நெகட்டிவ்
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},கணக்கு {0} செய்கிறது நிறுவனம் சொந்தமானது {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,வரிசையில் {0} இல் சீரியல் எண்கள் டெலிவரி குறிப்பு உடன் பொருந்தவில்லை
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,வரிசையில் {0} இல் சீரியல் எண்கள் டெலிவரி குறிப்பு உடன் பொருந்தவில்லை
 DocType: Student,Guardian Details,பாதுகாவலர்  விபரங்கள்
 DocType: C-Form,C-Form,சி படிவம்
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,பல ஊழியர்கள் மார்க் வருகை
 DocType: Vehicle,Chassis No,சேஸ் எண்
 DocType: Payment Request,Initiated,தொடங்கப்பட்ட
 DocType: Production Order,Planned Start Date,திட்டமிட்ட தொடக்க தேதி
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,தயவு செய்து ஒரு BOM ஐ தேர்ந்தெடுக்கவும்
 DocType: Serial No,Creation Document Type,உருவாக்கம் ஆவண வகை
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,தொடக்க தேதியை விட தேதி தேதியே அதிகமாக இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,தொடக்க தேதியை விட தேதி தேதியே அதிகமாக இருக்க வேண்டும்
 DocType: Leave Type,Is Encash,ரொக்கமான
 DocType: Leave Allocation,New Leaves Allocated,புதிய ஒதுக்கப்பட்ட இலைகள்
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,திட்ட வாரியான தரவு மேற்கோள் கிடைக்கவில்லை
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,முடிவுக்கு
 DocType: Project,Expected End Date,எதிர்பார்க்கப்படுகிறது முடிவு தேதி
 DocType: Budget Account,Budget Amount,பட்ஜெட் தொகை
 DocType: Appraisal Template,Appraisal Template Title,மதிப்பீட்டு வார்ப்புரு தலைப்பு
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},வரம்பு தேதி {0} க்கான பணியாளர் {1} ஊழியர் இணைந்ததாக தேதி முன்பாக இருக்கக் கூடாது {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,வர்த்தகம்
 DocType: Patient,Alcohol Current Use,மது தற்போதைய பயன்பாடு
+DocType: Student Admission Program,Student Admission Program,மாணவர் சேர்க்கை திட்டம்
 DocType: Payment Entry,Account Paid To,கணக்கில் பணம்
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,பெற்றோர் பொருள் {0} ஒரு பங்கு பொருள் இருக்க கூடாது
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,அனைத்து தயாரிப்புகள் அல்லது சேவைகள்.
@@ -3931,30 +4012,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} கணக்கு பட்ஜெட் {1} எதிராக {2} {3} ஆகும் {4}. இது தாண்டிவிட {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',ரோ {0} # கணக்கு வகை இருக்க வேண்டும் &#39;நிலையான சொத்து&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,அளவு அவுட்
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,ஒரு விற்பனை கப்பல் அளவு கணக்கிட விதிகள்
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,மற்றும் unchcked இல் முடக்கப்பட்டது
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,தொடர் கட்டாயமாகும்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,நிதி சேவைகள்
 DocType: Student Sibling,Student ID,மாணவர் அடையாளம்
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,நேரம் பதிவேடுகளுக்கு நடவடிக்கைகள் வகைகள்
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,சப்ளையர் மின்னஞ்சல்
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,நேரம் பதிவேடுகளுக்கு நடவடிக்கைகள் வகைகள்
 DocType: Tax Rule,Sales,விற்பனை
 DocType: Stock Entry Detail,Basic Amount,அடிப்படை தொகை
 DocType: Training Event,Exam,தேர்வு
 DocType: Complaint,Complaint,புகார்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},பங்கு பொருள் தேவை கிடங்கு {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},பங்கு பொருள் தேவை கிடங்கு {0}
 DocType: Leave Allocation,Unused leaves,பயன்படுத்தப்படாத இலைகள்
 DocType: Patient,Alcohol Past Use,மது போஸ்ட் பயன்படுத்து
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,பில்லிங் மாநிலம்
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,பரிமாற்றம்
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),( துணை கூட்டங்கள் உட்பட ) வெடித்தது BOM எடு
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,பரிமாற்றம்
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),( துணை கூட்டங்கள் உட்பட ) வெடித்தது BOM எடு
 DocType: Authorization Rule,Applicable To (Employee),பொருந்தும் (பணியாளர்)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,தேதி அத்தியாவசியமானதாகும்
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,தேதி அத்தியாவசியமானதாகும்
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,பண்பு உயர்வு {0} 0 இருக்க முடியாது
 DocType: Journal Entry,Pay To / Recd From,வரம்பு / Recd செய்ய பணம்
 DocType: Naming Series,Setup Series,அமைப்பு தொடர்
 DocType: Payment Reconciliation,To Invoice Date,தேதி விலைப்பட்டியல்
 DocType: Supplier,Contact HTML,தொடர்பு HTML
 ,Inactive Customers,செயல்பாடற்ற வாடிக்கையாளர்கள்
+DocType: Student Admission Program,Maximum Age,அதிகபட்ச வயது
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,கொள்முதல் ரசீதுகள்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,எப்படி விலை பயன்படுத்தப்படும் விதி என்ன?
@@ -3973,6 +4056,7 @@
 DocType: GL Entry,Remarks,கருத்துக்கள்
 DocType: Payment Entry,Account Paid From,கணக்கு இருந்து பணம்
 DocType: Purchase Order Item Supplied,Raw Material Item Code,மூலப்பொருட்களின் பொருள் குறியீடு
+DocType: Task,Parent Task,பெற்றோர் பணி
 DocType: Journal Entry,Write Off Based On,ஆனால் அடிப்படையில் இனிய எழுத
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,முன்னணி செய்ய
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,அச்சு மற்றும் ஸ்டேஷனரி
@@ -3981,20 +4065,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","சம்பளம் ஏற்கனவே இடையே {0} மற்றும் {1}, விட்டு பயன்பாடு காலத்தில் இந்த தேதி வரம்பில் இடையே இருக்க முடியாது காலத்தில் பதப்படுத்தப்பட்ட."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,ஒரு சீரியல் எண் நிறுவல் பதிவு
 DocType: Guardian Interest,Guardian Interest,பாதுகாவலர்  வட்டி
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,POS இன்மைச்களுக்கான அமைவு இயல்புநிலை மதிப்புகள்
 apps/erpnext/erpnext/config/hr.py +177,Training,பயிற்சி
 DocType: Timesheet,Employee Detail,பணியாளர் விபரம்
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 மின்னஞ்சல் ஐடி
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 மின்னஞ்சல் ஐடி
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,அடுத்து தேதி நாள் மற்றும் மாதம் நாளில் மீண்டும் சமமாக இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,அடுத்து தேதி நாள் மற்றும் மாதம் நாளில் மீண்டும் சமமாக இருக்க வேண்டும்
 DocType: Lab Prescription,Test Code,டெஸ்ட் கோட்
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,இணைய முகப்பு அமைப்புகள்
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},{0} என்ற ஸ்கோர் கார்டு தரவரிசை காரணமாக RFQ கள் {0}
 DocType: Offer Letter,Awaiting Response,பதிலை எதிர்பார்த்திருப்பதாகவும்
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,மேலே
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},மொத்த தொகை {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},தவறான கற்பிதம் {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},மொத்த தொகை {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},தவறான கற்பிதம் {0} {1}
 DocType: Supplier,Mention if non-standard payable account,குறிப்பிட தரமற்ற செலுத்தப்பட கணக்கு என்றால்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},அதே பொருளைப் பலமுறை நுழைந்தது வருகிறது. {பட்டியலில்}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',தயவு செய்து &#39;அனைத்து மதிப்பீடு குழுக்கள்&#39; தவிர வேறு மதிப்பீடு குழு தேர்வு
 DocType: Training Event Employee,Optional,விருப்ப
 DocType: Salary Slip,Earning & Deduction,சம்பாதிக்கும் & விலக்கு
@@ -4018,11 +4102,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,தயாரிப்பு மூட்டை இருந்து பொருட்களை பெற
 DocType: Asset,Straight Line,நேர் கோடு
 DocType: Project User,Project User,திட்ட பயனர்
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,பிரி
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,பிரி
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,பிரி
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,பிரி
 DocType: GL Entry,Is Advance,முன்பணம்
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,தேதி தேதி மற்றும் வருகை வருகை கட்டாய ஆகிறது
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,உள்ளிடவும் ஆம் அல்லது இல்லை என ' துணை ஒப்பந்தம்'
+DocType: Item,Default Purchase Unit of Measure,அளவின் இயல்பு கொள்முதல் அலகு
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,கடைசியாக தொடர்பாடல் தேதி
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,கடைசியாக தொடர்பாடல் தேதி
 DocType: Sales Team,Contact No.,தொடர்பு எண்
@@ -4031,7 +4116,6 @@
 DocType: Production Order,Check if material transfer entry is not required,பொருள் பரிமாற்ற நுழைவு தேவையில்லை என்று சரிபார்க்கவும்
 DocType: Production Order,Check if material transfer entry is not required,பொருள் பரிமாற்ற நுழைவு தேவையில்லை என்று சரிபார்க்கவும்
 DocType: Program Enrollment Tool,Get Students From,இருந்து மாணவர்கள் பெற
-DocType: Hub Settings,Seller Country,விற்பனையாளர் நாடு
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,இணையத்தளம் வெளியிடு
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,தொகுப்புகளும் குழு உங்கள் மாணவர்கள்
 DocType: Authorization Rule,Authorization Rule,அங்கீகார விதி
@@ -4041,8 +4125,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,விற்பனை வரி மற்றும் கட்டணங்கள் டெம்ப்ளேட்
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),மொத்த (கடன்)
 DocType: Repayment Schedule,Payment Date,கட்டணம் தேதி
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,புதிய தொகுதி அளவு
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,புதிய தொகுதி அளவு
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,புதிய தொகுதி அளவு
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,புதிய தொகுதி அளவு
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,ஆடை & ஆபரனங்கள்
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,எடையிடப்பட்ட ஸ்கோர் செயல்பாட்டை தீர்க்க முடியவில்லை. சூத்திரம் செல்லுபடியாகும் என்பதை உறுதிப்படுத்தவும்.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,ஆணை எண்
@@ -4060,6 +4144,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ரோ # {0}: சொத்து {1} சமர்ப்பிக்க முடியாது, அது ஏற்கனவே {2}"
 DocType: Tax Rule,Billing Country,பில்லிங் நாடு
 DocType: Purchase Order Item,Expected Delivery Date,எதிர்பார்க்கப்படுகிறது டெலிவரி தேதி
+DocType: Restaurant Order Entry,Restaurant Order Entry,உணவகம் ஆர்டர் நுழைவு
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,கடன் மற்றும் பற்று {0} # சம அல்ல {1}. வித்தியாசம் இருக்கிறது {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,பொழுதுபோக்கு செலவினங்கள்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,பொருள் வேண்டுகோள் செய்ய
@@ -4072,7 +4157,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,ஏற்கனவே பரிவர்த்தனை கணக்கு நீக்க முடியாது
 DocType: Vehicle,Last Carbon Check,கடந்த கார்பன் சோதனை
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,சட்ட செலவுகள்
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,வரிசையில் அளவு தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,வரிசையில் அளவு தேர்ந்தெடுக்கவும்
 DocType: Purchase Invoice,Posting Time,நேரம் தகவல்களுக்கு
 DocType: Timesheet,% Amount Billed,% தொகை
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,தொலைபேசி செலவுகள்
@@ -4085,6 +4170,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,புதிய வாடிக்கையாளர் வருவாய்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,போக்குவரத்து செலவுகள்
 DocType: Maintenance Visit,Breakdown,முறிவு
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},டாக்டைப் {0} இல் தனிப்பயன் புலம் சந்தாவைச் சேர்க்கவும்
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,கணக்கு: {0} நாணயத்துடன்: {1} தேர்வு செய்ய முடியாது
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","சமீபத்திய மதிப்பீட்டு விகிதம் / விலை பட்டியல் விகிதம் / மூலப்பொருட்களின் கடைசி கொள்முதல் வீதத்தின் அடிப்படையில், திட்டமிடலின் மூலம் தானாக BOM செலவு புதுப்பிக்கவும்."
 DocType: Bank Reconciliation Detail,Cheque Date,காசோலை தேதி
@@ -4109,7 +4195,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),மொத்த பில்லிங் அளவு (நேரத்தில் பதிவுகள் வழியாக)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,வழங்குபவர் அடையாளம்
 DocType: Payment Request,Payment Gateway Details,பணம் நுழைவாயில் விபரங்கள்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,அளவு 0 அதிகமாக இருக்க வேண்டும்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,அளவு 0 அதிகமாக இருக்க வேண்டும்
 DocType: Journal Entry,Cash Entry,பண நுழைவு
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,குழந்தை முனைகளில் மட்டும் &#39;குரூப்&#39; வகை முனைகளில் கீழ் உருவாக்கப்பட்ட முடியும்
 DocType: Leave Application,Half Day Date,அரை நாள் தேதி
@@ -4127,12 +4213,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,குறிப்பு: பொருள் {0} பல முறை உள்ளிட்ட
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,அனைத்து தொடர்புகள்.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,நிறுவனத்தின் சுருக்கமான
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,பயனர் {0} இல்லை
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,பயனர் {0} இல்லை
 DocType: Subscription,SUB-,துணை
 DocType: Item Attribute Value,Abbreviation,சுருக்கமான
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,கொடுப்பனவு நுழைவு ஏற்கனவே உள்ளது
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} வரம்புகளை அதிகமாக இருந்து அங்கீகாரம் இல்லை
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,சம்பளம் வார்ப்புரு மாஸ்டர் .
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,நோய்க்குறியியல்
+DocType: Restaurant Order Entry,Restaurant Table,உணவக அட்டவணை
 DocType: Leave Type,Max Days Leave Allowed,அதிகபட்சம்  நாட்கள் அனுமதிக்கப்பட்ட விடவும்
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,வண்டியை அமைக்க வரி விதி
 DocType: Purchase Invoice,Taxes and Charges Added,வரிகள் மற்றும் கட்டணங்கள் சேர்க்கப்பட்டது
@@ -4144,10 +4232,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,தாங்கியவர்கள் விளைவாக அல்லது வாடிக்கையாளர்களுக்கு மேற்கோள்.
 DocType: Stock Settings,Role Allowed to edit frozen stock,உறைந்த பங்கு திருத்த அனுமதி பங்கு
 ,Territory Target Variance Item Group-Wise,மண்டலம் இலக்கு வேறுபாடு பொருள் குழு வாரியாக
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,அனைத்து வாடிக்கையாளர் குழுக்கள்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,அனைத்து வாடிக்கையாளர் குழுக்கள்
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,திரட்டப்பட்ட மாதாந்திர
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} கட்டாயமாகும். ஒருவேளை செலாவணி சாதனை {2} செய்ய {1} உருவாக்கப்பட்டது அல்ல.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,வரி டெம்ப்ளேட் கட்டாயமாகும்.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,வரி டெம்ப்ளேட் கட்டாயமாகும்.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,கணக்கு {0}: பெற்றோர் கணக்கு {1} இல்லை
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),விலை பட்டியல் விகிதம் (நிறுவனத்தின் கரன்சி)
 DocType: Products Settings,Products Settings,தயாரிப்புகள் அமைப்புகள்
@@ -4173,12 +4261,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,பொருள் வாரியாக வரி விவரம்
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,நிறுவனம் சுருக்கமான
 ,Item-wise Price List Rate,பொருள் வாரியான விலை பட்டியல் விகிதம்
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,வழங்குபவர் விலைப்பட்டியல்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,வழங்குபவர் விலைப்பட்டியல்
 DocType: Quotation,In Words will be visible once you save the Quotation.,நீங்கள் மேற்கோள் சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},அளவு ({0}) வரிசையில் ஒரு பகுதியை இருக்க முடியாது {1}
 DocType: Consultation,C-,சி
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},பார்கோடு {0} ஏற்கனவே பொருள் பயன்படுத்தப்படுகிறது {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},பார்கோடு {0} ஏற்கனவே பொருள் பயன்படுத்தப்படுகிறது {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,கப்பல் செலவுகள் சேர்த்து விதிகள் .
 DocType: Item,Opening Stock,ஆரம்ப இருப்பு
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,வாடிக்கையாளர் தேவை
@@ -4197,9 +4285,8 @@
 DocType: Customer,From Lead,முன்னணி இருந்து
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ஆணைகள் உற்பத்தி வெளியிடப்பட்டது.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,நிதியாண்டு தேர்ந்தெடுக்கவும் ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,பிஓஎஸ் செய்தது பிஓஎஸ் நுழைவு செய்ய வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,பிஓஎஸ் செய்தது பிஓஎஸ் நுழைவு செய்ய வேண்டும்
 DocType: Program Enrollment Tool,Enroll Students,மாணவர்கள் பதிவுசெய்யவும்
-DocType: Hub Settings,Name Token,பெயர் டோக்கன்
 DocType: Lab Test,Approved Date,அங்கீகரிக்கப்பட்ட தேதி
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ஸ்டாண்டர்ட் விற்பனை
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,குறைந்தது ஒரு கிடங்கில் அவசியமானதாகும்
@@ -4217,7 +4304,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,மையம்  வள
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,கொடுப்பனவு நல்லிணக்க கொடுப்பனவு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,வரி சொத்துகள்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},உற்பத்தி ஆணை வருகிறது {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},உற்பத்தி ஆணை வருகிறது {0}
 DocType: BOM Item,BOM No,BOM எண்
 DocType: Instructor,INS/,ஐஎன்எஸ் /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,பத்திரிகை நுழைவு {0} {1} அல்லது ஏற்கனவே மற்ற ரசீது எதிராக பொருந்தியது கணக்கு இல்லை
@@ -4237,7 +4324,7 @@
 DocType: Currency Exchange,To Currency,நாணய செய்ய
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,பின்வரும் பயனர்கள் தொகுதி நாட்கள் விடுப்பு விண்ணப்பங்கள் ஏற்று கொள்ள அனுமதிக்கும்.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,செலவின உரிமைகோரல் வகைகள்.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},அதன் {1} உருப்படியை விகிதம் விற்பனை {0} விட குறைவாக உள்ளது. விகிதம் விற்பனை இருக்க வேண்டும் குறைந்தது {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},அதன் {1} உருப்படியை விகிதம் விற்பனை {0} விட குறைவாக உள்ளது. விகிதம் விற்பனை இருக்க வேண்டும் குறைந்தது {2}
 DocType: Item,Taxes,வரி
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,ஊதியம் மற்றும் பெறாதபோது
 DocType: Project,Default Cost Center,இயல்புநிலை விலை மையம்
@@ -4251,15 +4338,15 @@
 DocType: Employee Loan,Fully Disbursed,முழுமையாக வழங்கப் பட
 DocType: Maintenance Visit,Customer Feedback,வாடிக்கையாளர் கருத்து
 DocType: Account,Expense,செலவு
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,மதிப்பெண் அதிகபட்ச மதிப்பெண் அதிகமாக இருக்கக் கூடாது முடியும்
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,மதிப்பெண் அதிகபட்ச மதிப்பெண் அதிகமாக இருக்கக் கூடாது முடியும்
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,வாடிக்கையாளர்கள் மற்றும் சப்ளையர்கள்
 DocType: Item Attribute,From Range,வரம்பில் இருந்து
 DocType: BOM,Set rate of sub-assembly item based on BOM,BOM அடிப்படையிலான உப-அசெஸசிக் உருப்படிகளின் விகிதம் அமைக்கவும்
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},சூத்திரம் அல்லது நிலையில் தொடரியல் பிழை: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},சூத்திரம் அல்லது நிலையில் தொடரியல் பிழை: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,தினசரி வேலை சுருக்கம் அமைப்புகள் நிறுவனத்தின்
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,அது ஒரு பங்கு உருப்படியை இல்லை என்பதால் பொருள் {0} அலட்சியம்
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,மேலும் செயலாக்க இந்த உற்பத்தி ஆர்டர் .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,மேலும் செயலாக்க இந்த உற்பத்தி ஆர்டர் .
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","ஒரு குறிப்பிட்ட பரிமாற்றத்தில் விலை விதி பொருந்தும் இல்லை, அனைத்து பொருந்தும் விலை விதிகள் முடக்கப்பட்டுள்ளது."
 DocType: Assessment Group,Parent Assessment Group,பெற்றோர் மதிப்பீடு குழு
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,வேலைகள்
@@ -4276,12 +4363,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',நிறுவனத்தின் வெற்று வடிகட்ட அமைக்கவும் என்றால் குழுவினராக &#39;நிறுவனத்தின்&#39; ஆகும்
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,பதிவுசெய்ய தேதி எதிர்கால தேதியில் இருக்க முடியாது
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},ரோ # {0}: தொ.எ. {1} பொருந்தவில்லை {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,மீண்டும் உருவாக்குவதற்கு
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,தற்செயல் விடுப்பு
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,ஆய்வக சோதனை UOM.
 DocType: Batch,Batch ID,தொகுதி அடையாள
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},குறிப்பு: {0}
 ,Delivery Note Trends,பந்து குறிப்பு போக்குகள்
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,இந்த வார சுருக்கம்
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,இந்த வார சுருக்கம்
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,பங்கு அளவு உள்ள
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,கணக்கு: {0} மட்டுமே பங்கு பரிவர்த்தனைகள் வழியாக புதுப்பிக்க முடியும்
 DocType: Student Group Creation Tool,Get Courses,மைதானங்கள் பெற
@@ -4295,7 +4383,6 @@
 DocType: Purchase Order,To Bill,மசோதாவுக்கு
 DocType: Material Request,% Ordered,% உத்தரவிட்டார்
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","கோர்ஸ் சார்ந்த மாணவர் குழுக்களுக்கான, கோர்ஸ் திட்டம் பதிவு சேர்ந்தார் பாடப்பிரிவுகள் இருந்து ஒவ்வொரு மாணவர் மதிப்பாய்வு செய்யப்படும்."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","பிரிக்கப்பட்ட உள்ளிடவும் மின்னஞ்சல் முகவரி, விலைப்பட்டியல் குறிப்பிட்ட தேதியில் தானாக அனுப்பியிருந்தோம் வேண்டும்"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,சிறுதுண்டு வேலைக்கு
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,சராசரி. வாங்குதல் விகிதம்
 DocType: Task,Actual Time (in Hours),(மணிகளில்) உண்மையான நேரம்
@@ -4309,7 +4396,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,பொருள் {0} சீரியல் எண்கள் வரிசை அமைப்பு காலியாக இருக்கவேண்டும் அல்ல
 DocType: Accounts Settings,Accounts Settings,கணக்குகள் அமைப்புகள்
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,ஒப்புதல்
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,சமர்ப்பிக்க முடிவு இல்லை
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,சமர்ப்பிக்க முடிவு இல்லை
 DocType: Customer,Sales Partner and Commission,விற்பனை பார்ட்னர் மற்றும் கமிஷன்
 DocType: Employee Loan,Rate of Interest (%) / Year,வட்டி (%) / ஆண்டின் விகிதம்
 ,Project Quantity,திட்ட அளவு
@@ -4321,55 +4408,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,கருப்பு
 DocType: BOM Explosion Item,BOM Explosion Item,BOM வெடிப்பு பொருள்
 DocType: Account,Auditor,ஆடிட்டர்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} உற்பத்தி பொருட்களை
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} உற்பத்தி பொருட்களை
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,மேலும் அறிக
 DocType: Cheque Print Template,Distance from top edge,மேல் விளிம்பில் இருந்து தூரம்
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,விலை பட்டியல் {0} முடக்கப்பட்டால் அல்லது இல்லை
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,விலை பட்டியல் {0} முடக்கப்பட்டால் அல்லது இல்லை
 DocType: Purchase Invoice,Return,திரும்ப
 DocType: Production Order Operation,Production Order Operation,உத்தரவு ஆபரேஷன்
 DocType: Pricing Rule,Disable,முடக்கு
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,கட்டணம் செலுத்தும் முறை கட்டணம் செலுத்துவதற்கு தேவைப்படுகிறது
 DocType: Project Task,Pending Review,விமர்சனம் நிலுவையில்
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,நியமனங்கள் மற்றும் ஆலோசனைகள்
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} தொகுதி சேரவில்லை உள்ளது {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} தொகுதி சேரவில்லை உள்ளது {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",அது ஏற்கனவே உள்ளது என சொத்து {0} குறைத்து முடியாது {1}
 DocType: Task,Total Expense Claim (via Expense Claim),(செலவு கூறுகின்றனர் வழியாக) மொத்த செலவு கூறுகின்றனர்
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,குறி இல்லாமல்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ரோ {0}: டெலி # கரன்சி {1} தேர்வு நாணய சமமாக இருக்க வேண்டும் {2}
 DocType: Journal Entry Account,Exchange Rate,அயல்நாட்டு நாணய பரிமாற்ற விகிதம் வீதம்
 DocType: Patient,Additional information regarding the patient,நோயாளியைப் பற்றிய கூடுதல் தகவல்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,விற்பனை ஆணை {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,விற்பனை ஆணை {0} சமர்ப்பிக்க
 DocType: Homepage,Tag Line,டேக் லைன்
 DocType: Fee Component,Fee Component,கட்டண பகுதியிலேயே
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,கடற்படை  மேலாண்மை
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,இருந்து பொருட்களை சேர்க்கவும்
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,கடற்படை  மேலாண்மை
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,இருந்து பொருட்களை சேர்க்கவும்
 DocType: Cheque Print Template,Regular,வழக்கமான
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,அனைத்து மதிப்பீடு அடிப்படியின் மொத்த முக்கியத்துவத்தைச் 100% இருக்க வேண்டும்
-DocType: BOM,Last Purchase Rate,கடந்த கொள்முதல் விலை
+DocType: Purchase Order Item,Last Purchase Rate,கடந்த கொள்முதல் விலை
 DocType: Account,Asset,சொத்து
 DocType: Project Task,Task ID,பணி ஐடி
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,பொருள் இருக்க முடியாது பங்கு {0} என்பதால் வகைகள் உண்டு
 DocType: Lab Test,Mobile,மொபைல்
 ,Sales Person-wise Transaction Summary,விற்பனை நபர் வாரியான பரிவர்த்தனை சுருக்கம்
 DocType: Training Event,Contact Number,தொடர்பு எண்
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,கிடங்கு {0} இல்லை
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext மையம் பதிவு
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,கிடங்கு {0} இல்லை
 DocType: Monthly Distribution,Monthly Distribution Percentages,மாதாந்திர விநியோகம் சதவீதங்கள்
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,தேர்ந்தெடுக்கப்பட்ட உருப்படியை தொகுதி முடியாது
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","மதிப்பீடு விகிதம் பொருள் {0} கணக்கு உள்ளீடுகளை செய்ய நேர்ந்தால் எந்த காணப்படவில்லை {1} {2}. உருப்படி ஒரு மாதிரி உருப்படியாக transacting என்றால் {1}, {1} பொருள் அட்டவணையில் என்று குறிப்பிடவும். இல்லையெனில், பொருள் பதிவில் உருப்படியை அல்லது குறிப்பிடவும் மதிப்பீட்டு விகிதம் ஒரு உள்வரும் பங்கு பரிவர்த்தனை உருவாக்க செய்யவும், பின் இந்த நுழைவு ரத்து / அள்ளிப்பதற்கு முயற்சி"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,இந்த டெலிவரி குறிப்பு எதிராக அளிக்கப்பட்ட பொருட்களை%
+DocType: Training Event,Has Certificate,சான்றிதழ் உள்ளது
 DocType: Project,Customer Details,வாடிக்கையாளர் விவரம்
 DocType: Employee,Reports to,அறிக்கைகள்
 ,Unpaid Expense Claim,செலுத்தப்படாத செலவு கூறுகின்றனர்
 DocType: Payment Entry,Paid Amount,பணம் தொகை
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,விற்பனை சுழற்சியை ஆராயுங்கள்
 DocType: Assessment Plan,Supervisor,மேற்பார்வையாளர்
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,ஆன்லைன்
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,ஆன்லைன்
 ,Available Stock for Packing Items,பொருட்கள் பொதி கிடைக்கும் பங்கு
 DocType: Item Variant,Item Variant,பொருள் மாற்று
 DocType: Assessment Result Tool,Assessment Result Tool,மதிப்பீடு முடிவு கருவி
 DocType: BOM Scrap Item,BOM Scrap Item,டெலி ஸ்க்ராப் பொருள்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,சமர்ப்பிக்கப்பட்ட ஆர்டர்களைப் நீக்க முடியாது
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,சமர்ப்பிக்கப்பட்ட ஆர்டர்களைப் நீக்க முடியாது
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ஏற்கனவே பற்று உள்ள கணக்கு நிலுவை, நீங்கள் 'கடன்' இருப்பு வேண்டும் 'அமைக்க அனுமதி இல்லை"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,தர மேலாண்மை
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
@@ -4390,7 +4476,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,ஜீரோ மதிப்பீடு விகிதம் அனுமதி
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,ஜீரோ மதிப்பீடு விகிதம் அனுமதி
 DocType: Training Event Employee,Invited,அழைப்பு
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,செயலில் உள்ள பல சம்பளம் கட்டமைப்புகள் கொடுக்கப்பட்டுள்ள தேதிகளில் ஊழியர் {0} காணப்படவில்லை
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,செயலில் உள்ள பல சம்பளம் கட்டமைப்புகள் கொடுக்கப்பட்டுள்ள தேதிகளில் ஊழியர் {0} காணப்படவில்லை
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,அமைப்பு நுழைவாயில் கணக்குகள்.
 DocType: Employee,Employment Type,வேலை வகை
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,நிலையான சொத்துக்கள்
@@ -4403,7 +4489,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,மாணவர் மின்னஞ்சல் ஐடி
 DocType: Employee,Notice (days),அறிவிப்பு ( நாட்கள்)
 DocType: Tax Rule,Sales Tax Template,விற்பனை வரி டெம்ப்ளேட்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,விலைப்பட்டியல் காப்பாற்ற பொருட்களை தேர்வு
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,விலைப்பட்டியல் காப்பாற்ற பொருட்களை தேர்வு
 DocType: Employee,Encashment Date,பணமாக்கல் தேதி
 DocType: Training Event,Internet,இணைய
 DocType: Special Test Template,Special Test Template,சிறப்பு டெஸ்ட் டெம்ப்ளேட்
@@ -4413,7 +4499,7 @@
 DocType: Academic Term,Term Start Date,கால தொடக்க தேதி
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,எதிரில் கவுண்ட்
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,எதிரில் கவுண்ட்
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},தயவு செய்து இணைக்கப்பட்ட {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},தயவு செய்து இணைக்கப்பட்ட {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,பொது பேரேடு படி வங்கி அறிக்கை சமநிலை
 DocType: Job Applicant,Applicant Name,விண்ணப்பதாரர் பெயர்
 DocType: Authorization Rule,Customer / Item Name,வாடிக்கையாளர் / உருப்படி பெயர்
@@ -4433,7 +4519,7 @@
 DocType: Guardian,Guardian Of ,ஆனால் கார்டியன்
 DocType: Grading Scale Interval,Threshold,ஆரம்பம்
 DocType: BOM Update Tool,Current BOM,தற்போதைய பொருட்களின் அளவுக்கான ரசீது
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,தொடர் எண் சேர்
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,தொடர் எண் சேர்
 DocType: Production Order Item,Available Qty at Source Warehouse,மூல கிடங்கு கிடைக்கும் அளவு
 apps/erpnext/erpnext/config/support.py +22,Warranty,உத்தரவாதத்தை
 DocType: Purchase Invoice,Debit Note Issued,டெபிட் குறிப்பை வெளியிட்டு
@@ -4456,10 +4542,9 @@
 DocType: Account,Receivable,பெறத்தக்க
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ரோ # {0}: கொள்முதல் ஆணை ஏற்கனவே உள்ளது என சப்ளையர் மாற்ற அனுமதி
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,அமைக்க கடன் எல்லை மீறிய நடவடிக்கைகளை சமர்ப்பிக்க அனுமதி என்று பாத்திரம்.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,உற்பத்தி உருப்படிகளைத் தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","மாஸ்டர் தரவு ஒத்திசைவை, அது சில நேரம் ஆகலாம்"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,உற்பத்தி உருப்படிகளைத் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","மாஸ்டர் தரவு ஒத்திசைவை, அது சில நேரம் ஆகலாம்"
 DocType: Item,Material Issue,பொருள் வழங்கல்
-DocType: Hub Settings,Seller Description,விற்பனையாளர் விளக்கம்
 DocType: Employee Education,Qualification,தகுதி
 DocType: Item Price,Item Price,பொருள் விலை
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,சோப் & சோப்பு
@@ -4467,7 +4552,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,அவ்வப்போது விட அதிகமாக இருக்க முடியாது.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,மோஷன் பிக்சர் & வீடியோ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ஆணையிட்டார்
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,துவைக்கும் இயந்திரம்
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,துவைக்கும் இயந்திரம்
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"இயக்கப்பட்டிருந்தால், அமைப்பு டெம்ப்ளேட்டில் இருந்து மாறுபாடுகளின் துறைகள் புதுப்பிக்கப்படாது ஆனால் புதிய மாறுபாட்டின் போது பின்வரும் துறைகளில் தரவை நகலெடுக்கும்"
 DocType: Salary Detail,Component,கூறு
 DocType: Assessment Criteria,Assessment Criteria Group,மதிப்பீடு செய்க மதீப்பீட்டு குழு
 DocType: Healthcare Settings,Patient Name By,மூலம் நோயாளி பெயர்
@@ -4477,7 +4563,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,பங்கு அங்கீகரிக்கிறது அல்லது பயனர் அனுமதி உள்ளிடவும்
 DocType: Journal Entry,Write Off Entry,நுழைவு ஆஃப் எழுத
 DocType: BOM,Rate Of Materials Based On,ஆனால் அடிப்படையில் பொருட்களின் விகிதம்
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,சப்ளையர்&gt; சப்ளையர் வகை
+DocType: Item Variant Settings,Do not Update Variants,புதுப்பிப்புகள் மாறுபடாதே
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,ஆதரவு Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,அனைத்தையும் தேர்வுநீக்கு
 DocType: POS Profile,Terms and Conditions,நிபந்தனைகள்
@@ -4486,7 +4572,7 @@
 DocType: Leave Block List,Applies to Company,நிறுவனத்தின் பொருந்தும்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,"சமர்ப்பிக்கப்பட்ட பங்கு நுழைவு {0} ஏனெனில், ரத்து செய்ய முடியாது"
 DocType: Employee Loan,Disbursement Date,இரு வாரங்கள் முடிவதற்குள் தேதி
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;பெறுநர்கள்&#39; குறிப்பிடப்படவில்லை
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;பெறுநர்கள்&#39; குறிப்பிடப்படவில்லை
 DocType: BOM Update Tool,Update latest price in all BOMs,அனைத்து BOM களில் சமீபத்திய விலை புதுப்பிக்கவும்
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,மருத்துவ பதிவு
 DocType: Vehicle,Vehicle,வாகன
@@ -4502,14 +4588,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,எதிரில் / முன்னணி%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,சொத்து Depreciations மற்றும் சமநிலைகள்
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},அளவு {0} {1} இருந்து இடமாற்றம் {2} க்கு {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},அளவு {0} {1} இருந்து இடமாற்றம் {2} க்கு {3}
 DocType: Sales Invoice,Get Advances Received,முன்னேற்றம் பெற்ற கிடைக்கும்
 DocType: Email Digest,Add/Remove Recipients,சேர்க்க / பெற்றவர்கள் அகற்று
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},பரிவர்த்தனை நிறுத்தி உத்தரவு எதிரான அனுமதி இல்லை {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","இயல்புநிலை என இந்த நிதியாண்டில் அமைக்க, ' இயல்புநிலை அமை ' கிளிக்"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,சேர
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,சேர
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,பற்றாக்குறைவே அளவு
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,பொருள் மாறுபாடு {0} அதே பண்புகளை கொண்ட உள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,பொருள் மாறுபாடு {0} அதே பண்புகளை கொண்ட உள்ளது
 DocType: Employee Loan,Repay from Salary,சம்பளம் இருந்து திருப்பி
 DocType: Leave Application,LAP/,மடியில் /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},எதிராக கட்டணம் கோருகிறது {0} {1} அளவு {2}
@@ -4522,7 +4608,7 @@
 DocType: Sales Invoice Item,Sales Order Item,விற்பனை ஆணை உருப்படி
 DocType: Salary Slip,Payment Days,கட்டணம் நாட்கள்
 DocType: Patient,Dormant,உழைக்காத
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,குழந்தை முனைகள் கொண்ட கிடங்குகள் லெட்ஜர் மாற்றப்பட முடியாது
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,குழந்தை முனைகள் கொண்ட கிடங்குகள் லெட்ஜர் மாற்றப்பட முடியாது
 DocType: BOM,Manage cost of operations,செயற்பாடுகளின் செலவு நிர்வகி
 DocType: Accounts Settings,Stale Days,நிலையான நாட்கள்
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","சரி நடவடிக்கைகள் எந்த &quot;Submitted&quot; போது, ஒரு மின்னஞ்சல் பாப் அப் தானாகவே ஒரு இணைப்பாக பரிவர்த்தனை மூலம், அந்த பரிமாற்றத்தில் தொடர்புடைய &quot;தொடர்பு&quot; ஒரு மின்னஞ்சல் அனுப்ப திறக்கப்பட்டது. பயனர் அல்லது மின்னஞ்சல் அனுப்ப முடியாது."
@@ -4536,10 +4622,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,தொடர் இல {0} ஏற்கனவே பெற்றுள்ளது
 ,Requested Items To Be Transferred,மாற்றப்படுவதற்கு கோரப்பட்ட விடயங்கள்
 DocType: Expense Claim,Vehicle Log,வாகன பதிவு
-DocType: Purchase Invoice,Recurring Id,மீண்டும் அடையாளம்
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),காய்ச்சல் (வெப்பநிலை&gt; 38.5 ° C / 101.3 ° F அல்லது நீடித்த வெப்பம்&gt; 38 ° C / 100.4 ° F)
 DocType: Customer,Sales Team Details,விற்பனை குழு விவரம்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,நிரந்தரமாக நீக்கு?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,நிரந்தரமாக நீக்கு?
 DocType: Expense Claim,Total Claimed Amount,மொத்த கோரப்பட்ட தொகை
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,விற்பனை திறன் வாய்ப்புகள்.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},தவறான {0}
@@ -4549,7 +4634,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,பல்பொருள் அங்காடி
 ,Item Delivery Date,பொருள் வழங்கல் தேதி
 DocType: Warehouse,PIN,PIN ஐ
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,ERPNext உங்கள் பள்ளி அமைப்பு
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,ERPNext உங்கள் பள்ளி அமைப்பு
 DocType: Sales Invoice,Base Change Amount (Company Currency),மாற்றம் அடிப்படை தொகை (நிறுவனத்தின் நாணய)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,பின்வரும் கிடங்குகள் இல்லை கணக்கியல் உள்ளீடுகள்
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,முதல் ஆவணம் சேமிக்கவும்.
@@ -4561,12 +4646,11 @@
 DocType: Task,Is Milestone,மைல்கல் ஆகும்
 DocType: Daily Work Summary,Email Sent To,மின்னஞ்சல் அனுப்பப்படும்
 DocType: Budget,Warn,எச்சரிக்கை
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,நிச்சயமாக நீங்கள் பதிவு செய்ய வேண்டுமா?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","வேறு எந்த கருத்துக்கள், பதிவுகள் செல்ல வேண்டும் என்று குறிப்பிடத்தக்கது முயற்சியாகும்."
 DocType: BOM,Manufacturing User,உற்பத்தி பயனர்
 DocType: Purchase Invoice,Raw Materials Supplied,மூலப்பொருட்கள் வழங்கியது
-DocType: Purchase Invoice,Recurring Print Format,பெரும்பாலும் உடன் அச்சு வடிவம்
 DocType: C-Form,Series,தொடர்
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,தயாரிப்புகள் சேர்க்கவும்
 DocType: Appraisal,Appraisal Template,மதிப்பீட்டு வார்ப்புரு
 DocType: Item Group,Item Classification,பொருள் பிரிவுகள்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,வணிக மேம்பாட்டு மேலாளர்
@@ -4580,7 +4664,7 @@
 DocType: Item Attribute Value,Attribute Value,மதிப்பு பண்பு
 ,Itemwise Recommended Reorder Level,இனவாரியாக மறுவரிசைப்படுத்துக நிலை பரிந்துரைக்கப்படுகிறது
 DocType: Salary Detail,Salary Detail,சம்பளம் விபரம்
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,முதல் {0} தேர்வு செய்க
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,முதல் {0} தேர்வு செய்க
 DocType: Appointment Type,Physician,மருத்துவர்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,பொருள் ஒரு தொகுதி {0} {1} காலாவதியாகிவிட்டது.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,ஆலோசனைகளை
@@ -4591,7 +4675,7 @@
 DocType: Salary Detail,Default Amount,இயல்புநிலை தொகை
 DocType: Lab Test Template,Descriptive,விளக்கமான
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,அமைப்பு இல்லை கிடங்கு
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,இந்த மாதம் சுருக்கம்
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,இந்த மாதம் சுருக்கம்
 DocType: Quality Inspection Reading,Quality Inspection Reading,தரமான ஆய்வு படித்தல்
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,` விட பழைய உறைந்து பங்குகள் ` % d நாட்கள் குறைவாக இருக்க வேண்டும் .
 DocType: Tax Rule,Purchase Tax Template,வரி வார்ப்புரு வாங்க
@@ -4614,12 +4698,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,பயிற்சி நிகழ்வுகள் / முடிவுகள்
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,என தேய்மானம் திரட்டப்பட்ட
 DocType: Sales Invoice,C-Form Applicable,பொருந்தாது சி படிவம்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},ஆபரேஷன் நேரம் ஆபரேஷன் 0 விட இருக்க வேண்டும் {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},ஆபரேஷன் நேரம் ஆபரேஷன் 0 விட இருக்க வேண்டும் {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,கிடங்கு கட்டாயமாகும்
 DocType: Supplier,Address and Contacts,முகவரி மற்றும் தொடர்புகள்
 DocType: UOM Conversion Detail,UOM Conversion Detail,மொறட்டுவ பல்கலைகழகம் மாற்றம் விரிவாக
 DocType: Program,Program Abbreviation,திட்டம் சுருக்கமான
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,உத்தரவு ஒரு பொருள் டெம்ப்ளேட் எதிராக எழுப்பப்பட்ட
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,உத்தரவு ஒரு பொருள் டெம்ப்ளேட் எதிராக எழுப்பப்பட்ட
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,கட்டணங்கள் ஒவ்வொரு உருப்படியை எதிரான வாங்கும் ரசீது இல் புதுப்பிக்கப்பட்டது
 DocType: Warranty Claim,Resolved By,மூலம் தீர்க்கப்பட
 DocType: Bank Guarantee,Start Date,தொடக்க தேதி
@@ -4645,27 +4729,28 @@
 DocType: Employee,Educational Qualification,கல்வி தகுதி
 DocType: Workstation,Operating Costs,செலவுகள்
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,அதிரடி என்றால் திரட்டப்பட்ட மாதாந்திர பட்ஜெட்டை மீறய
-DocType: Purchase Invoice,Submit on creation,உருவாக்கம் சமர்ப்பிக்க
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},நாணய {0} இருக்க வேண்டும் {1}
+DocType: Subscription,Submit on creation,உருவாக்கம் சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},நாணய {0} இருக்க வேண்டும் {1}
 DocType: Asset,Disposal Date,நீக்கம் தேதி
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","மின்னஞ்சல்கள் அவர்கள் விடுமுறை இல்லை என்றால், கொடுக்கப்பட்ட நேரத்தில் நிறுவனத்தின் அனைத்து செயலில் ஊழியர் அனுப்பி வைக்கப்படும். மறுமொழிகளின் சுருக்கம் நள்ளிரவில் அனுப்பப்படும்."
 DocType: Employee Leave Approver,Employee Leave Approver,பணியாளர் விடுப்பு ஒப்புதல்
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},ரோ {0}: ஒரு மறுவரிசைப்படுத்துக நுழைவு ஏற்கனவே இந்த கிடங்கு உள்ளது {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","இழந்தது மேற்கோள் செய்யப்பட்டது ஏனெனில் , அறிவிக்க முடியாது ."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,பயிற்சி மதிப்பீட்டு
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},ரோ {0}: ஒரு மறுவரிசைப்படுத்துக நுழைவு ஏற்கனவே இந்த கிடங்கு உள்ளது {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","இழந்தது மேற்கோள் செய்யப்பட்டது ஏனெனில் , அறிவிக்க முடியாது ."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,பயிற்சி மதிப்பீட்டு
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,உத்தரவு {0} சமர்ப்பிக்க வேண்டும்
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,சப்ளையர் ஸ்கோர் கார்ட் க்ரிடீரியா
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},தொடக்க தேதி மற்றும் பொருள் முடிவு தேதி தேர்வு செய்க {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},பாடநெறி வரிசையில் கட்டாய {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,தேதி தேதி முதல் முன் இருக்க முடியாது
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc டாக்டைப்பின்
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,திருத்த/ விலை சேர்க்கவும்
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,திருத்த/ விலை சேர்க்கவும்
 DocType: Batch,Parent Batch,பெற்றோர் தொகுதி
 DocType: Batch,Parent Batch,பெற்றோர் தொகுதி
 DocType: Cheque Print Template,Cheque Print Template,காசோலை அச்சு வார்ப்புரு
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,செலவு மையங்கள் விளக்கப்படம்
 DocType: Lab Test Template,Sample Collection,மாதிரி சேகரிப்பு
 ,Requested Items To Be Ordered,கேட்டு கேட்டு விடயங்கள்
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,என்னுடைய கட்டளைகள்
 DocType: Price List,Price List Name,விலை பட்டியல் பெயர்
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},தினசரி வேலை சுருக்கம் {0}
 DocType: Employee Loan,Totals,மொத்த
@@ -4684,12 +4769,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1} தேவை {2} ம் {3} {4} க்கான {5} இந்த பரிவர்த்தனையை நிறைவு செய்ய அலகுகள்.
 DocType: Fee Schedule,Student Category,மாணவர் பிரிவின்
 DocType: Announcement,Student,மாணவர்
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,அமைப்பு அலகு ( துறை ) மாஸ்டர் .
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,அமைப்பு அலகு ( துறை ) மாஸ்டர் .
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,மனைகளுக்குச் செல்
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,அனுப்புவதற்கு முன் செய்தி உள்ளிடவும்
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,வினியோகஸ்தரின் DUPLICATE
 DocType: Email Digest,Pending Quotations,மேற்கோள்கள் நிலுவையில்
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,புள்ளி விற்பனை செய்தது
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,புள்ளி விற்பனை செய்தது
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,ஆய்வக சோதனை அமைப்புகள்.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,பிணையற்ற கடன்கள்
 DocType: Cost Center,Cost Center Name,மையம் பெயர் செலவு
@@ -4699,6 +4784,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,மொத்த பணம் விவரங்கள்
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,60 எழுத்துகளுக்கு அதிகமாக செய்திகள் பல செய்திகளை பிரிந்தது
 DocType: Purchase Receipt Item,Received and Accepted,பெற்று ஏற்கப்பட்டது
+DocType: Hub Settings,Company and Seller Profile,நிறுவனம் மற்றும் விற்பனை செய்தது
 ,GST Itemised Sales Register,ஜிஎஸ்டி வகைப்படுத்தப்பட்டவையாகவும் விற்பனை பதிவு
 ,Serial No Service Contract Expiry,தொடர் எண் சேவை ஒப்பந்தம் காலாவதியாகும்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,நீங்கள் கடன் மற்றும் அதே நேரத்தில் அதே கணக்கு பற்று முடியாது
@@ -4708,10 +4794,11 @@
 DocType: Item,Variant Based On,மாற்று சார்ந்த அன்று
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},ஒதுக்கப்படும் மொத்த தாக்கத்தில் 100 % இருக்க வேண்டும். இது {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,உங்கள் சப்ளையர்கள்
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,தயவுசெய்து சரி
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,விற்பனை ஆணை உள்ளது என இழந்தது அமைக்க முடியாது.
 DocType: Request for Quotation Item,Supplier Part No,சப்ளையர் பகுதி இல்லை
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',வகை &#39;மதிப்பீட்டு&#39; அல்லது &#39;Vaulation மற்றும் மொத்த&#39; க்கான போது கழித்து முடியாது
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,பெறப்படும்
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,பெறப்படும்
 DocType: Lead,Converted,மாற்றப்படுகிறது
 DocType: Item,Has Serial No,வரிசை எண்  உள்ளது
 DocType: Employee,Date of Issue,இந்த தேதி
@@ -4719,7 +4806,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","வாங்குதல் அமைப்புகள் படி கொள்முதல் Reciept தேவையான == &#39;ஆம்&#39;, பின்னர் கொள்முதல் விலைப்பட்டியல் உருவாக்கும், பயனர் உருப்படியை முதல் கொள்முதல் ரசீது உருவாக்க வேண்டும் என்றால் {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},ரோ # {0}: உருப்படியை அமைக்க சப்ளையர் {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,ரோ {0}: மணி மதிப்பு பூஜ்யம் விட அதிகமாக இருக்க வேண்டும்.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,பொருள் {1} இணைக்கப்பட்ட வலைத்தளம் பட {0} காணலாம்
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,பொருள் {1} இணைக்கப்பட்ட வலைத்தளம் பட {0} காணலாம்
 DocType: Issue,Content Type,உள்ளடக்க வகை
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,கணினி
 DocType: Item,List this Item in multiple groups on the website.,வலைத்தளத்தில் பல குழுக்கள் இந்த உருப்படி பட்டியல்.
@@ -4730,14 +4817,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,ஒப்புரவாகவேயில்லை பதிவுகள் பெற
 DocType: Payment Reconciliation,From Invoice Date,விலைப்பட்டியல் வரம்பு தேதி
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,சமர்ப்பிக்க அனுமதி இல்லை
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,பில்லிங் நாணய இயல்புநிலை comapany நாணய அல்லது கட்சி கணக்கு நாணயம் சமமாக இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,பில்லிங் நாணய இயல்புநிலை comapany நாணய அல்லது கட்சி கணக்கு நாணயம் சமமாக இருக்க வேண்டும்
 DocType: Healthcare Settings,Laboratory Settings,ஆய்வக அமைப்புகள்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,விடுப்பிற்கீடான பணம் பெறுதல்
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,அது என்ன?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,சேமிப்பு கிடங்கு வேண்டும்
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,அனைத்து மாணவர் சேர்க்கை
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,அது என்ன?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,சேமிப்பு கிடங்கு வேண்டும்
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,அனைத்து மாணவர் சேர்க்கை
 ,Average Commission Rate,சராசரி கமிஷன் விகிதம்
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,' சீரியல் இல்லை உள்ளது ' அல்லாத பங்கு உருப்படியை 'ஆம்' இருக்க முடியாது
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,' சீரியல் இல்லை உள்ளது ' அல்லாத பங்கு உருப்படியை 'ஆம்' இருக்க முடியாது
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,நிலைமையைத் தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,வருகை எதிர்கால நாட்களுக்கு குறித்தது முடியாது
 DocType: Pricing Rule,Pricing Rule Help,விலை விதி உதவி
@@ -4755,40 +4842,40 @@
 DocType: Item,Customer Code,வாடிக்கையாளர் கோட்
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},பிறந்த நாள் நினைவூட்டல் {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,கடந்த சில நாட்களாக கடைசி ஆர்டர்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,கணக்கில் பற்று ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,கணக்கில் பற்று ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
 DocType: Buying Settings,Naming Series,தொடர் பெயரிடும்
 DocType: Leave Block List,Leave Block List Name,பிளாக் பட்டியல் பெயர் விட்டு
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,காப்புறுதி தொடக்க தேதி காப்புறுதி முடிவு தேதி விட குறைவாக இருக்க வேண்டும்
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,பள்ளியில் பள்ளி ஆசிரியர்களுக்கான பெயரிடும் அமைப்பு அமைப்பது
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,பங்கு சொத்துக்கள்
 DocType: Timesheet,Production Detail,உற்பத்தி விபரம்
+DocType: Restaurant,Active Menu,செயலில் உள்ள மெனு
 DocType: Target Detail,Target Qty,இலக்கு அளவு
 DocType: Shopping Cart Settings,Checkout Settings,வெளியேறுதல்  அமைப்புகள்
 DocType: Attendance,Present,தற்போது
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,டெலிவரி குறிப்பு {0} சமர்ப்பிக்க கூடாது
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,டெலிவரி குறிப்பு {0} சமர்ப்பிக்க கூடாது
 DocType: Notification Control,Sales Invoice Message,விற்பனை விலைப்பட்டியல் செய்தி
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,கணக்கு {0} நிறைவு வகை பொறுப்பு / ஈக்விட்டி இருக்க வேண்டும்
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},ஊழியர் சம்பளம் ஸ்லிப் {0} ஏற்கனவே நேரம் தாள் உருவாக்கப்பட்ட {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},ஊழியர் சம்பளம் ஸ்லிப் {0} ஏற்கனவே நேரம் தாள் உருவாக்கப்பட்ட {1}
 DocType: Vehicle Log,Odometer,ஓடோமீட்டர்
 DocType: Sales Order Item,Ordered Qty,அளவு உத்தரவிட்டார்
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
 DocType: Stock Settings,Stock Frozen Upto,பங்கு வரை உறை
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,டெலி எந்த பங்கு உருப்படியை கொண்டிருக்கும் இல்லை
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,திட்ட செயல்பாடு / பணி.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,டெலி எந்த பங்கு உருப்படியை கொண்டிருக்கும் இல்லை
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,திட்ட செயல்பாடு / பணி.
 DocType: Vehicle Log,Refuelling Details,Refuelling விபரங்கள்
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,சம்பளம் சீட்டுகள் உருவாக்குதல்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","பொருந்துகின்ற என தேர்வு என்றால் வாங்குதல், சரிபார்க்கப்பட வேண்டும் {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,தள்ளுபடி 100 க்கும் குறைவான இருக்க வேண்டும்
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,கடைசியாக கொள்முதல் விகிதம் இல்லை
 DocType: Purchase Invoice,Write Off Amount (Company Currency),தொகை ஆஃப் எழுத (நிறுவனத்தின் நாணய)
 DocType: Sales Invoice Timesheet,Billing Hours,பில்லிங் மணி
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,"{0} இல்லை இயல்புநிலை BOM,"
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,ரோ # {0}: மீள் கட்டளை அளவு அமைக்க கொள்ளவும்
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,"{0} இல்லை இயல்புநிலை BOM,"
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,ரோ # {0}: மீள் கட்டளை அளவு அமைக்க கொள்ளவும்
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,அவர்களை இங்கே சேர்க்கலாம் உருப்படிகளை தட்டவும்
 DocType: Fees,Program Enrollment,திட்டம் பதிவு
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed செலவு வவுச்சர்
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},அமைக்கவும் {0}
-DocType: Purchase Invoice,Repeat on Day of Month,மாதம் ஒரு நாள் மீண்டும்
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} மாணவர் செயலற்று
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} மாணவர் செயலற்று
 DocType: Employee,Health Details,சுகாதார விவரம்
 DocType: Offer Letter,Offer Letter Terms,கடிதம் சொற்கள் வழங்குகின்றன
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,ஒரு கொடுப்பனவு வேண்டுகோள் குறிப்பு ஆவணம் தேவை உருவாக்க
@@ -4797,7 +4884,6 @@
 DocType: Employee External Work History,Salary,சம்பளம்
 DocType: Serial No,Delivery Document Type,டெலிவரி ஆவண வகை
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,மேலே தேர்ந்தெடுக்கப்பட்ட அடிப்படை அனைத்து சம்பளம் பின்னடைவு &#39;to
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} பொருட்கள் ஒத்திசைக்கப்படாது
 DocType: Sales Order,Partly Delivered,இதற்கு அனுப்பப்பட்டது
 DocType: Email Digest,Receivables,வரவுகள்
 DocType: Lead Source,Lead Source,முன்னணி மூல
@@ -4819,9 +4905,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,வயதான ரேஞ்ச் 2
 DocType: SG Creation Tool Course,Max Strength,அதிகபட்சம்  வலிமை
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM மாற்றவும்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,டெலிவரி தேதி அடிப்படையில் தேர்ந்தெடுக்கப்பட்ட விடயங்கள்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,டெலிவரி தேதி அடிப்படையில் தேர்ந்தெடுக்கப்பட்ட விடயங்கள்
 ,Sales Analytics,விற்பனை அனலிட்டிக்ஸ்
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},கிடைக்கும் {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},கிடைக்கும் {0}
 ,Prospects Engaged But Not Converted,வாய்ப்புக்கள் நிச்சயமானவர் ஆனால் மாற்றப்படவில்லை
 ,Prospects Engaged But Not Converted,வாய்ப்புக்கள் நிச்சயமானவர் ஆனால் மாற்றப்படவில்லை
 DocType: Manufacturing Settings,Manufacturing Settings,உற்பத்தி அமைப்புகள்
@@ -4829,10 +4915,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 கைப்பேசி
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,நிறுவனத்தின் முதன்மை இயல்புநிலை நாணய உள்ளிடவும்
 DocType: Stock Entry Detail,Stock Entry Detail,பங்கு நுழைவு விரிவாக
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,டெய்லி நினைவூட்டல்கள்
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,டெய்லி நினைவூட்டல்கள்
 DocType: Products Settings,Home Page is Products,முகப்பு பக்கம் தயாரிப்புகள் ஆகும்
 ,Asset Depreciation Ledger,சொத்து தேய்மானம் லெட்ஜர்
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},வரி விதிமுறை முரண்படுகிறது {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},வரி விதிமுறை முரண்படுகிறது {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,புதிய கணக்கு பெயர்
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,மூலப்பொருட்கள் விலை வழங்கியது
 DocType: Selling Settings,Settings for Selling Module,தொகுதி விற்பனையான அமைப்புகள்
@@ -4846,8 +4932,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,பொருள் {0} ஒரு பங்கு பொருளாக இருக்க வேண்டும்
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,முன்னேற்றம் கிடங்கில் இயல்புநிலை வேலை
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,கணக்கு பரிமாற்றங்கள் இயல்புநிலை அமைப்புகளை .
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,மனித வளத்தில் பணியாளர் பெயரிடும் அமைப்பை அமைத்தல்&gt; HR அமைப்புகள்
 DocType: Maintenance Visit,MV,எம்.வி.
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,எதிர்பார்க்கப்படுகிறது தேதி பொருள் கோரிக்கை தேதி முன் இருக்க முடியாது
+DocType: Restaurant,Default Tax Template,இயல்புநிலை வரி வார்ப்புரு
 DocType: Fees,Student Details,மாணவர் விவரங்கள்
 DocType: Purchase Invoice Item,Stock Qty,பங்கு அளவு
 DocType: Purchase Invoice Item,Stock Qty,பங்கு அளவு
@@ -4866,8 +4953,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,உருப்படிகளுக்கு செல்க
 DocType: Sales Partner,Partner Type,வரன்வாழ்க்கை துணை வகை
 DocType: Purchase Taxes and Charges,Actual,உண்மையான
+DocType: Restaurant Menu,Restaurant Manager,உணவு விடுதி மேலாளர்
 DocType: Authorization Rule,Customerwise Discount,வாடிக்கையாளர் வாரியாக தள்ளுபடி
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,பணிகளை டைம் ஷீட்.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,பணிகளை டைம் ஷீட்.
 DocType: Purchase Invoice,Against Expense Account,செலவு கணக்கு எதிராக
 DocType: Production Order,Production Order,உற்பத்தி ஆணை
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,நிறுவல் குறிப்பு {0} ஏற்கனவே சமர்ப்பித்த
@@ -4875,7 +4963,6 @@
 DocType: Quotation Item,Against Docname,ஆவணம் பெயர் எதிராக
 DocType: SMS Center,All Employee (Active),அனைத்து பணியாளர் (செயலில்)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,இப்போது காண்க
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,விலைப்பட்டியல் தானாக உருவாக்கப்படும் போது காலம் தேர்வு
 DocType: BOM,Raw Material Cost,மூலப்பொருட்களின் செலவு
 DocType: Item Reorder,Re-Order Level,மீண்டும் ஒழுங்கு நிலை
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,நீங்கள் உற்பத்தி ஆர்டர்கள் உயர்த்த அல்லது ஆய்வில் மூலப்பொருட்கள் பதிவிறக்க வேண்டிய உருப்படிகளை மற்றும் திட்டமிட்ட அளவு உள்ளிடவும்.
@@ -4888,24 +4975,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,புகார் வகை கட்டாய ஆகிறது
 DocType: Item,Serial Number Series,வரிசை எண் தொடர்
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},கிடங்கு பங்கு பொருள் கட்டாய {0} வரிசையில் {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,நிரல்களைச் சேர்க்கவும்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,சில்லறை & விற்பனை
 DocType: Issue,First Responded On,முதல் தேதி இணையம்
 DocType: Website Item Group,Cross Listing of Item in multiple groups,பல குழுக்கள் பொருள் கிராஸ் பட்டியல்
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},நிதியாண்டு தொடக்க தேதி மற்றும் நிதி ஆண்டு இறுதியில் தேதி ஏற்கனவே நிதி ஆண்டில் அமைக்க {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,மேம்படுத்தப்பட்டது இசைவு தேதி
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,பிரி தொகுதி
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,பிரி தொகுதி
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,பிரி தொகுதி
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,பிரி தொகுதி
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,வெற்றிகரமாக ஒருமைப்படுத்திய
 DocType: Request for Quotation Supplier,Download PDF,பதிவிறக்கம் PDF
 DocType: Production Order,Planned End Date,திட்டமிட்ட தேதி
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,அட்டவணை தேதி உள்ளிடவும்
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,அங்கு பொருட்களை சேமிக்கப்படும்.
 DocType: Request for Quotation,Supplier Detail,சப்ளையர் விபரம்
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},சூத்திரம் அல்லது நிலையில் பிழை: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},சூத்திரம் அல்லது நிலையில் பிழை: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,விலை விவரம் தொகை
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,அளவுகோல் எடைகள் 100% வரை சேர்க்க வேண்டும்
 DocType: Attendance,Attendance,வருகை
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,பங்கு பொருட்கள்
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,பங்கு பொருட்கள்
 DocType: BOM,Materials,பொருட்கள்
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","சரி இல்லை என்றால், பட்டியலில் அதை பயன்படுத்த வேண்டும் ஒவ்வொரு துறை சேர்க்க வேண்டும்."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,மூல மற்றும் அடைவு கிடங்கு அதே இருக்க முடியாது
@@ -4923,6 +5010,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,நிகர மொத்தம்
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},கற்பிதம் {0} மதிப்பு எல்லைக்குள் இருக்க வேண்டும் {1} க்கு {2} அதிகரிப்பில் {3} பொருள் {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,வரிசையில் இலக்கு கிடங்கில் {0} அதே இருக்க வேண்டும் உத்தரவு
+DocType: Restaurant Reservation,Waitlisted,உறுதியாகாத
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,நாணய வேறு நாணயங்களுக்கு பயன்படுத்தி உள்ளீடுகள் செய்வதில் பிறகு மாற்றிக்கொள்ள
 DocType: Vehicle Service,Clutch Plate,கிளட்ச் தட்டு
 DocType: Company,Round Off Account,கணக்கு ஆஃப் சுற்றுக்கு
@@ -4939,7 +5027,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,புதிய விற்பனைப் பெயர்
 DocType: Packing Slip,Gross Weight UOM,மொத்த எடை மொறட்டுவ பல்கலைகழகம்
 DocType: Delivery Note Item,Against Sales Invoice,விற்பனை விலைப்பட்டியல் எதிராக
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,தயவு செய்து தொடராக உருப்படியை தொடர் எண்கள் நுழைய
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,தயவு செய்து தொடராக உருப்படியை தொடர் எண்கள் நுழைய
 DocType: Bin,Reserved Qty for Production,உற்பத்திக்கான அளவு ஒதுக்கப்பட்ட
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,நீங்கள் நிச்சயமாக அடிப்படையிலான குழுக்களைக் செய்யும் போது தொகுதி கருத்தில் கொள்ள விரும்பவில்லை என்றால் தேர்வுசெய்யாமல் விடவும்.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,நீங்கள் நிச்சயமாக அடிப்படையிலான குழுக்களைக் செய்யும் போது தொகுதி கருத்தில் கொள்ள விரும்பவில்லை என்றால் தேர்வுசெய்யாமல் விடவும்.
@@ -4951,7 +5039,7 @@
 DocType: Lab Test,Test Group,டெஸ்ட் குழு
 DocType: Payment Reconciliation,Receivable / Payable Account,பெறத்தக்க / செலுத்த வேண்டிய கணக்கு
 DocType: Delivery Note Item,Against Sales Order Item,விற்பனை ஆணை பொருள் எதிராக
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},பண்பு மதிப்பு பண்பு குறிப்பிடவும் {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},பண்பு மதிப்பு பண்பு குறிப்பிடவும் {0}
 DocType: Item,Default Warehouse,இயல்புநிலை சேமிப்பு கிடங்கு
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},பட்ஜெட் குழு கணக்கை எதிராக ஒதுக்கப்படும் முடியாது {0}
 DocType: Healthcare Settings,Patient Registration,நோயாளி பதிவு
@@ -4980,6 +5068,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,விற்பனை நபர்
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,பட்ஜெட் மற்றும் செலவு மையம்
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,கட்டணம் செலுத்திய பல இயல்புநிலை முறை அனுமதிக்கப்படவில்லை
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,அதற்காக
 ,Appointment Analytics,நியமனம் அனலிட்டிக்ஸ்
 DocType: Vehicle Service,Half Yearly,அரையாண்டு
 DocType: Lead,Blog Subscriber,வலைப்பதிவு சந்தாதாரர்
@@ -4999,7 +5088,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,quot கவுண்ட்
 ,BOM Stock Report,BOM பங்கு அறிக்கை
 DocType: Stock Reconciliation Item,Quantity Difference,அளவு வேறுபாடு
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,பதப்படுத்துதல் சம்பளப்பட்டியல்
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,பதப்படுத்துதல் சம்பளப்பட்டியல்
 DocType: Opportunity Item,Basic Rate,அடிப்படை விகிதம்
 DocType: GL Entry,Credit Amount,கடன் தொகை
 DocType: Cheque Print Template,Signatory Position,கையொப்பமிட தலைப்பு
@@ -5013,12 +5102,12 @@
 DocType: Tax Rule,Tax Rule,வரி விதி
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,விற்பனை சைக்கிள் முழுவதும் அதே விகிதத்தில் பராமரிக்க
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,வர்க்ஸ்டேஷன் பணிநேரம் தவிர்த்து நேரத்தில் பதிவுகள் திட்டமிட்டுள்ளோம்.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,கியூ உள்ள வாடிக்கையாளர்கள்
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,டாக்டர் {0} ஒரு மருத்துவர் அட்டவணை இல்லை. அதை மருத்துவர் மாஸ்டர் சேர்க்க
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,கியூ உள்ள வாடிக்கையாளர்கள்
 DocType: Student,Nationality,தேசியம்
 ,Items To Be Requested,கோரப்பட்ட பொருட்களை
-DocType: Purchase Order,Get Last Purchase Rate,கடைசியாக கொள்முதல் விலை கிடைக்கும்
 DocType: Company,Company Info,நிறுவன தகவல்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,தேர்ந்தெடுக்கவும் அல்லது புதிய வாடிக்கையாளர் சேர்க்க
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,தேர்ந்தெடுக்கவும் அல்லது புதிய வாடிக்கையாளர் சேர்க்க
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,செலவு மையம் ஒரு செலவினமாக கூற்றை பதிவு செய்ய தேவைப்படுகிறது
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),நிதி பயன்பாடு ( சொத்துக்கள் )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,இந்த பணியாளர் வருகை அடிப்படையாக கொண்டது
@@ -5026,6 +5115,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,பற்று கணக்கு
 DocType: Fiscal Year,Year Start Date,ஆண்டு தொடக்க தேதி
 DocType: Attendance,Employee Name,பணியாளர் பெயர்
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,உணவகம் ஆர்டர் நுழைவு பொருள்
 DocType: Sales Invoice,Rounded Total (Company Currency),வட்டமான மொத்த (நிறுவனத்தின் கரன்சி)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"கணக்கு வகை தேர்வு, ஏனெனில் குழு இரகசிய முடியாது."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} மாற்றப்பட்டுள்ளது . புதுப்பிக்கவும்.
@@ -5036,6 +5126,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,பணியாளர் நன்மைகள்
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},{0} வரிசையில் {1} நிரம்பிய அளவு உருப்படி அளவு சமமாக வேண்டும்
 DocType: Production Order,Manufactured Qty,உற்பத்தி அளவு
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,விலைப்பட்டியல் உருவாக்கப்பட்டது
 DocType: Purchase Receipt Item,Accepted Quantity,அளவு ஏற்கப்பட்டது
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},ஒரு இயல்பான விடுமுறை பட்டியல் பணியாளர் அமைக்க தயவு செய்து {0} அல்லது நிறுவனத்தின் {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} இல்லை
@@ -5045,18 +5136,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ரோ இல்லை {0}: தொகை செலவு கூறுகின்றனர் {1} எதிராக தொகை நிலுவையில் விட அதிகமாக இருக்க முடியாது. நிலுவையில் அளவு {2}
 DocType: Maintenance Schedule,Schedule,அனுபந்தம்
 DocType: Account,Parent Account,பெற்றோர் கணக்கு
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,கிடைக்கக்கூடிய
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,கிடைக்கக்கூடிய
 DocType: Quality Inspection Reading,Reading 3,3 படித்தல்
 ,Hub,மையம்
 DocType: GL Entry,Voucher Type,ரசீது வகை
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,விலை பட்டியல் காணப்படும் அல்லது ஊனமுற்ற
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,விலை பட்டியல் காணப்படும் அல்லது ஊனமுற்ற
 DocType: Lab Test,Approved,ஏற்பளிக்கப்பட்ட
 DocType: Pricing Rule,Price,விலை
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',{0} ம் நிம்மதியாக பணியாளர் 'இடது' அமைக்க வேண்டும்
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',{0} ம் நிம்மதியாக பணியாளர் 'இடது' அமைக்க வேண்டும்
+DocType: Hub Settings,Last Sync On,கடைசி ஒத்திசைவு
 DocType: Guardian,Guardian,பாதுகாவலர்
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,மதிப்பீடு {0} {1} தேதியில் வரம்பில் பணியாளர் உருவாக்கப்பட்டது
 DocType: Employee,Education,கல்வி
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,டெல்
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,டெல்
 DocType: Selling Settings,Campaign Naming By,பிரச்சாரம் பெயரிடும் மூலம்
 DocType: Employee,Current Address Is,தற்போதைய முகவரி
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,மாதாந்திர விற்பனை இலக்கு (
@@ -5071,7 +5163,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,பாடநெறி குறியீடு:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,செலவு கணக்கு உள்ளிடவும்
 DocType: Account,Stock,பங்கு
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ரோ # {0}: குறிப்பு ஆவண வகை கொள்முதல் ஆணை ஒன்று, கொள்முதல் விலைப்பட்டியல் அல்லது பத்திரிகை நுழைவு இருக்க வேண்டும்"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ரோ # {0}: குறிப்பு ஆவண வகை கொள்முதல் ஆணை ஒன்று, கொள்முதல் விலைப்பட்டியல் அல்லது பத்திரிகை நுழைவு இருக்க வேண்டும்"
 DocType: Employee,Current Address,தற்போதைய முகவரி
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","வெளிப்படையாக குறிப்பிட்ட வரை பின்னர் உருப்படியை விளக்கம், படம், விலை, வரி டெம்ப்ளேட் இருந்து அமைக்க வேண்டும் போன்றவை மற்றொரு உருப்படியை ஒரு மாறுபாடு இருக்கிறது என்றால்"
 DocType: Serial No,Purchase / Manufacture Details,கொள்முதல் / உற்பத்தி விவரம்
@@ -5102,7 +5194,7 @@
 DocType: Hub Settings,Hub Settings,மையம்  அமைப்புகள்
 DocType: Project,Gross Margin %,மொத்த அளவு%
 DocType: BOM,With Operations,செயல்பாடுகள் மூலம்
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,கணக்கு உள்ளீடுகளை ஏற்கனவே நாணய செய்யப்பட்டுள்ளது {0} நிறுவனம் {1}. நாணயத்துடன் ஒரு பெறத்தக்க செலுத்தவேண்டிய கணக்கைத் தேர்ந்தெடுக்கவும் {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,கணக்கு உள்ளீடுகளை ஏற்கனவே நாணய செய்யப்பட்டுள்ளது {0} நிறுவனம் {1}. நாணயத்துடன் ஒரு பெறத்தக்க செலுத்தவேண்டிய கணக்கைத் தேர்ந்தெடுக்கவும் {0}.
 DocType: Asset,Is Existing Asset,இருக்கும் சொத்து
 DocType: Salary Detail,Statistical Component,புள்ளி உபகரண
 DocType: Salary Detail,Statistical Component,புள்ளி உபகரண
@@ -5111,13 +5203,14 @@
 DocType: BOM Operation,BOM Operation,BOM ஆபரேஷன்
 DocType: Purchase Taxes and Charges,On Previous Row Amount,முந்தைய வரிசை தொகை
 DocType: Student,Home Address,வீட்டு முகவரி
+DocType: Item,Has Expiry Date,காலாவதி தேதி உள்ளது
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,பொருள் மாற்று அமைப்புகள்.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,மாற்றம் சொத்து
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,மாற்றம் சொத்து
 DocType: POS Profile,POS Profile,பிஓஎஸ் செய்தது
 DocType: Training Event,Event Name,நிகழ்வு பெயர்
 DocType: Physician,Phone (Office),தொலைபேசி (அலுவலகம்)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,சேர்க்கை
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},சேர்க்கை {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,சேர்க்கை
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},சேர்க்கை {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","அமைக்க வரவு செலவு திட்டம், இலக்குகளை முதலியன உங்கம்மா"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,மாறி பெயர்
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","{0} பொருள் ஒரு டெம்ப்ளேட் உள்ளது, அதன் வகைகள் ஒன்றைத் தேர்ந்தெடுக்கவும்"
@@ -5126,7 +5219,7 @@
 DocType: Assessment Plan,Room,அறை
 DocType: Purchase Order,Advance Paid,முன்பணம்
 DocType: Item,Item Tax,பொருள் வரி
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,சப்ளையர் பொருள்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,சப்ளையர் பொருள்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,கலால் விலைப்பட்டியல்
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,உயர் அளவு {0}% முறை மேல் காட்சிக்கு
 DocType: Expense Claim,Employees Email Id,ஊழியர்கள் மின்னஞ்சல் விலாசம்
@@ -5137,32 +5230,30 @@
 DocType: Program,Program Name,திட்டம் பெயர்
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,வரி அல்லது பொறுப்பு கருத்தில்
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,உண்மையான அளவு கட்டாய ஆகிறது
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} தற்போது {1} சப்ளையர் ஸ்கோர்கார்டு நின்று உள்ளது, இந்த சப்ளையருக்கான கொள்முதல் ஆணை எச்சரிக்கையுடன் வெளியிடப்பட வேண்டும்."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} தற்போது {1} சப்ளையர் ஸ்கோர்கார்டு நின்று உள்ளது, இந்த சப்ளையருக்கான கொள்முதல் ஆணை எச்சரிக்கையுடன் வெளியிடப்பட வேண்டும்."
 DocType: Employee Loan,Loan Type,கடன் வகை
 DocType: Scheduling Tool,Scheduling Tool,திட்டமிடல் கருவி
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,கடன் அட்டை
 DocType: BOM,Item to be manufactured or repacked,உருப்படியை உற்பத்தி அல்லது repacked வேண்டும்
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,பங்கு பரிவர்த்தனை இயல்புநிலை அமைப்புகளை .
-DocType: Purchase Invoice,Next Date,அடுத்த நாள்
 DocType: Employee Education,Major/Optional Subjects,முக்கிய / விருப்ப பாடங்கள்
 DocType: Sales Invoice Item,Drop Ship,டிராப் கப்பல்
+DocType: Hub Settings,Suspended,இடைநீக்கம்
 DocType: Training Event,Attendees,பங்கேற்பாளர்கள்
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","இங்கே நீங்கள் பெற்றோர், மனைவி மற்றும் குழந்தைகள் பெயர் மற்றும் ஆக்கிரமிப்பு போன்ற குடும்ப விவரங்கள் பராமரிக்க முடியும்"
 DocType: Academic Term,Term End Date,கால முடிவு தேதி
-DocType: Hub Settings,Seller Name,விற்பனையாளர் பெயர்
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),வரிகள் மற்றும் கட்டணங்கள் கழிக்கப்படும் (நிறுவனத்தின் கரன்சி)
 DocType: Item Group,General Settings,பொது அமைப்புகள்
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,நாணய மற்றும் நாணயத்தை அதே இருக்க முடியாது
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,பயிற்றுவிப்பாளர்களைச் சேர்க்கவும்
 DocType: Stock Entry,Repack,RePack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,தொடர்வதற்கு முன் படிவத்தை சேமிக்க வேண்டும்
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,முதலில் நிறுவனத்தைத் தேர்ந்தெடுக்கவும்
 DocType: Item Attribute,Numeric Values,எண்மதிப்பையும்
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,லோகோ இணைக்கவும்
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,பங்கு நிலைகள்
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,பங்கு நிலைகள்
 DocType: Customer,Commission Rate,தரகு விகிதம்
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,{0} க்கு இடையே {0} ஸ்கோட்கார்டுகள் உருவாக்கப்பட்டது:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,மாற்று செய்ய
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,மாற்று செய்ய
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,துறை மூலம் பயன்பாடுகள் விட்டு தடுக்கும்.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","கொடுப்பனவு வகை ஏற்றுக்கொண்டு ஒன்று இருக்க செலுத்த, உள்நாட் மாற்றம் வேண்டும்"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,அனலிட்டிக்ஸ்
@@ -5177,11 +5268,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,மூலதன கையிருப்பு
 DocType: Shopping Cart Settings,Show Public Attachments,பொது இணைப்புகள் காட்டு
 DocType: Packing Slip,Package Weight Details,தொகுப்பு எடை விவரம்
+DocType: Restaurant Reservation,Reservation Time,முன்பதிவு நேரம்
 DocType: Payment Gateway Account,Payment Gateway Account,பணம் நுழைவாயில் கணக்கு
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,கட்டணம் முடிந்த பிறகு தேர்ந்தெடுக்கப்பட்ட பக்கம் பயனர் திருப்பி.
 DocType: Company,Existing Company,தற்போதுள்ள நிறுவனம்
 DocType: Healthcare Settings,Result Emailed,முடிவு மின்னஞ்சல் அனுப்பப்பட்டது
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",வரி பிரிவு &quot;மொத்த&quot; மாற்றப்பட்டுள்ளது அனைத்து பொருட்கள் அல்லாத பங்கு பொருட்களை ஏனெனில்
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,பொருள் குறியீடு&gt; பொருள் குழு&gt; பிராண்ட்
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,ஒரு கோப்பை தேர்ந்தெடுக்கவும்
 DocType: Student Leave Application,Mark as Present,தற்போதைய மார்க்
 DocType: Supplier Scorecard,Indicator Color,காட்டி வண்ணம்
@@ -5206,11 +5299,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,மாணவர் தொகுதி செய்ய
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,முன்னோக்கி எடுத்துச்செல்
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,BOM இருந்து பொருட்களை பெற
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,BOM இருந்து பொருட்களை பெற
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,நேரம் நாட்கள் வழிவகுக்கும்
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ரோ # {0}: தேதி பதிவுசெய்ய கொள்முதல் தேதி அதே இருக்க வேண்டும் {1} சொத்தின் {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,மாணவர் நிறுவனத்தின் விடுதி வசிக்கிறார் இந்த பாருங்கள்.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,தயவு செய்து மேலே உள்ள அட்டவணையில் விற்பனை ஆணைகள் நுழைய
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,தயவு செய்து மேலே உள்ள அட்டவணையில் விற்பனை ஆணைகள் நுழைய
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,சமர்ப்பிக்கப்பட்டது சம்பளம் துண்டுகளைக் இல்லை
 ,Stock Summary,பங்கு சுருக்கம்
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,ஒருவரையொருவர் நோக்கி கிடங்கில் இருந்து ஒரு சொத்து பரிமாற்றம்
@@ -5226,5 +5319,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ரோ {0}: ஒப்புதல் நுழைவு இணைத்தே ஒரு {1}
 DocType: Journal Entry,Subscription Section,சந்தா பகுதி
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,கணக்கு {0} இல்லை
+DocType: Training Event,Training Program,பயிற்சி நிகழ்ச்சித்திட்டம்
 DocType: Account,Cash,பணம்
 DocType: Employee,Short biography for website and other publications.,இணையதளம் மற்றும் பிற வெளியீடுகள் குறுகிய வாழ்க்கை.
diff --git a/erpnext/translations/te.csv b/erpnext/translations/te.csv
index be8199e..2c3506c 100644
--- a/erpnext/translations/te.csv
+++ b/erpnext/translations/te.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,జీతం మోడ్
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,నమోదు
 DocType: Patient,Divorced,విడాకులు
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,అంశాలు ఇప్పటికే సమకాలీకరించిన
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,అంశం ఒక లావాదేవీ పలుమార్లు జోడించడానికి అనుమతించు
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,మెటీరియల్ సందర్శించండి {0} ఈ వారంటీ దావా రద్దు ముందు రద్దు
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,కన్జ్యూమర్ ప్రొడక్ట్స్
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Approvers వదిలి
 DocType: Sales Partner,Dealer,డీలర్
 DocType: Consultation,Investigations,పరిశోధనల
+DocType: Restaurant Order Entry,Click Enter To Add,జోడించు క్లిక్ చేయండి
 DocType: Employee,Rented,అద్దెకు
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,వాడుకరి వర్తించే
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",ఆగిపోయింది ఉత్పత్తి ఆర్డర్ రద్దు చేయలేము రద్దు మొదటి అది Unstop
 DocType: Vehicle Service,Mileage,మైలేజ్
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,మీరు నిజంగా ఈ ఆస్తి ను అనుకుంటున్నారు?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,మీరు నిజంగా ఈ ఆస్తి ను అనుకుంటున్నారు?
 DocType: Drug Prescription,Update Schedule,నవీకరణ షెడ్యూల్
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,డిఫాల్ట్ సరఫరాదారు ఎంచుకోండి
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},కరెన్సీ ధర జాబితా కోసం అవసరం {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,లభ్యతను తనిఖీలు చేయండి
 DocType: Job Applicant,Job Applicant,ఉద్యోగం అభ్యర్థి
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,ఈ ఈ సరఫరాదారు వ్యతిరేకంగా లావాదేవీలు ఆధారంగా. వివరాల కోసం ఈ క్రింది కాలక్రమం చూడండి
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,ఫలితాలు లేవు.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,లీగల్
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},వాస్తవ రకం పన్ను వరుసగా అంశం రేటు చేర్చబడిన సాధ్యం {0}
 DocType: Bank Guarantee,Customer,కస్టమర్
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),ఎక్స్చేంజ్ రేట్ అదే ఉండాలి {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,వినియోగదారుని పేరు
 DocType: Vehicle,Natural Gas,సహజవాయువు
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},బ్యాంక్ ఖాతా పేరుతో సాధ్యం కాదు {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},బ్యాంక్ ఖాతా పేరుతో సాధ్యం కాదు {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,తలలు (లేదా సమూహాలు) ఇది వ్యతిరేకంగా అకౌంటింగ్ ఎంట్రీలు తయారు చేస్తారు మరియు నిల్వలను నిర్వహించబడుతున్నాయి.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),అత్యుత్తమ {0} ఉండకూడదు కంటే తక్కువ సున్నా ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,ప్రాసెస్ చేయడానికి ఎలాంటి సమర్పించిన జీతం స్లిప్స్ లేవు.
 DocType: Manufacturing Settings,Default 10 mins,10 నిమిషాలు డిఫాల్ట్
 DocType: Leave Type,Leave Type Name,టైప్ వదిలి పేరు
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,ఓపెన్ చూపించు
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,పైన పేర్కొన్న పునరావృత కోసం నేడు ఈ చర్యను తీసుకోవలసిన అవసరం ఉంది
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,సిరీస్ విజయవంతంగా నవీకరించబడింది
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,హోటల్ నుంచి బయటకు వెళ్లడం
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural జర్నల్ ఎంట్రీ సమర్పించిన
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,కొనుగోలు ఆర్డర్ అంశాలు అందుకోవాలి
 DocType: SMS Center,All Supplier Contact,అన్ని సరఫరాదారు సంప్రదించండి
 DocType: Support Settings,Support Settings,మద్దతు సెట్టింగ్లు
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,ఊహించినది ముగింపు తేదీ ఊహించిన ప్రారంభం తేదీ కంటే తక్కువ ఉండకూడదు
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,ఊహించినది ముగింపు తేదీ ఊహించిన ప్రారంభం తేదీ కంటే తక్కువ ఉండకూడదు
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,రో # {0}: రేటు అదే ఉండాలి {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,న్యూ లీవ్ అప్లికేషన్
 ,Batch Item Expiry Status,బ్యాచ్ అంశం గడువు హోదా
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,బ్యాంక్ డ్రాఫ్ట్
 DocType: Mode of Payment Account,Mode of Payment Account,చెల్లింపు ఖాతా మోడ్
 DocType: Consultation,Consultation,కన్సల్టేషన్
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,సేల్స్ అండ్ రిటర్న్స్
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,షో రకరకాలు
 DocType: Academic Term,Academic Term,అకడమిక్ టర్మ్
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,మెటీరియల్
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ఆరోగ్య సంరక్షణ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),చెల్లింపు లో ఆలస్యం (రోజులు)
 DocType: Lab Prescription,Lab Prescription,ల్యాబ్ ప్రిస్క్రిప్షన్
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,ధర ద్వారా క్రమబద్ధీకరించు
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,సర్వీస్ ఖర్చుల
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},క్రమ సంఖ్య: {0} ఇప్పటికే సేల్స్ వాయిస్ లో రిఫరెన్సుగా ఉంటుంది: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,వాయిస్
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},క్రమ సంఖ్య: {0} ఇప్పటికే సేల్స్ వాయిస్ లో రిఫరెన్సుగా ఉంటుంది: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,వాయిస్
 DocType: Maintenance Schedule Item,Periodicity,ఆవర్తకత
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ఫిస్కల్ ఇయర్ {0} అవసరం
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,రక్షణ
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,రో # {0}:
 DocType: Timesheet,Total Costing Amount,మొత్తం వ్యయంతో మొత్తం
 DocType: Delivery Note,Vehicle No,వాహనం లేవు
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,ధర జాబితా దయచేసి ఎంచుకోండి
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,ధర జాబితా దయచేసి ఎంచుకోండి
 DocType: Accounts Settings,Currency Exchange Settings,కరెన్సీ ఎక్స్చేంజ్ సెట్టింగులు
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,రో # {0}: చెల్లింపు పత్రం trasaction పూర్తి అవసరం
 DocType: Production Order Operation,Work In Progress,పని జరుగుచున్నది
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,దయచేసి తేదీని ఎంచుకోండి
 DocType: Employee,Holiday List,హాలిడే జాబితా
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,దయచేసి స్కూల్ స్కూల్ సెట్టింగులలో సెటప్ ఇన్స్ట్రక్టర్ నేమింగ్ సిస్టమ్
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,అకౌంటెంట్
+DocType: Hub Settings,Selling Price List,ధర జాబితా అమ్మకం
 DocType: Patient,Tobacco Current Use,పొగాకు ప్రస్తుత ఉపయోగం
 DocType: Cost Center,Stock User,స్టాక్ వాడుకరి
 DocType: Company,Phone No,ఫోన్ సంఖ్య
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,కోర్సు షెడ్యూల్స్ రూపొందించినవారు:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},న్యూ {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},న్యూ {0}: # {1}
 ,Sales Partners Commission,సేల్స్ భాగస్వాములు కమిషన్
 DocType: Purchase Invoice,Rounding Adjustment,వృత్తాకార అడ్జస్ట్మెంట్
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,కంటే ఎక్కువ 5 అక్షరాలు కాదు సంక్షిప్తీకరణ
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,మాతృ వివరాలు docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","సూచన: {0}, Item కోడ్: {1} మరియు కస్టమర్: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,కిలొగ్రామ్
-DocType: Student Log,Log,లోనికి ప్రవేశించండి
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,ఒక Job కొరకు తెరవడం.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} ఫలితం సమర్పించబడింది
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} ఫలితం సమర్పించబడింది
 DocType: Item Attribute,Increment,పెంపు
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,కాల వ్యవధి
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,వేర్హౌస్ ఎంచుకోండి ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,వివాహితులు
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},కోసం అనుమతి లేదు {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,నుండి అంశాలను పొందండి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},స్టాక్ డెలివరీ గమనిక వ్యతిరేకంగా నవీకరించబడింది సాధ్యం కాదు {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},స్టాక్ డెలివరీ గమనిక వ్యతిరేకంగా నవీకరించబడింది సాధ్యం కాదు {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ఉత్పత్తి {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,జాబితా అంశాలను తోబుట్టువుల
 DocType: Payment Reconciliation,Reconcile,పునరుద్దరించటానికి
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,పెన్షన్ ఫండ్స్
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,తదుపరి అరుగుదల తేదీ కొనుగోలు తేదీ ముందు ఉండకూడదు
 DocType: Consultation,Consultation Date,సంప్రదింపు తేదీ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ఉత్పత్తి జాబితా మరియు ERPNext వినియోగదారుల కోసం ఆవిష్కరణ
 DocType: SMS Center,All Sales Person,అన్ని సేల్స్ పర్సన్
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** మంత్లీ పంపిణీ ** మీరు నెలల అంతటా బడ్జెట్ / టార్గెట్ పంపిణీ మీరు మీ వ్యాపారంలో seasonality కలిగి ఉంటే సహాయపడుతుంది.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,వస్తువులను కనుగొన్నారు
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,జీతం నిర్మాణం మిస్సింగ్
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,వస్తువులను కనుగొన్నారు
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,జీతం నిర్మాణం మిస్సింగ్
 DocType: Lead,Person Name,వ్యక్తి పేరు
 DocType: Sales Invoice Item,Sales Invoice Item,సేల్స్ వాయిస్ అంశం
 DocType: Account,Credit,క్రెడిట్
 DocType: POS Profile,Write Off Cost Center,ఖర్చు సెంటర్ ఆఫ్ వ్రాయండి
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",ఉదా &quot;ప్రాథమిక స్కూల్&quot; లేదా &quot;విశ్వవిద్యాలయం&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",ఉదా &quot;ప్రాథమిక స్కూల్&quot; లేదా &quot;విశ్వవిద్యాలయం&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,స్టాక్ నివేదికలు
 DocType: Warehouse,Warehouse Detail,వేర్హౌస్ వివరాలు
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},క్రెడిట్ పరిమితి కస్టమర్ కోసం దాటింది చేయబడింది {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,టర్మ్ ముగింపు తేదీ తర్వాత అకడమిక్ ఇయర్ ఇయర్ ఎండ్ తేదీ పదం సంబంధమున్న కంటే ఉండకూడదు (అకాడమిక్ ఇయర్ {}). దయచేసి తేదీలు సరిచేసి మళ్ళీ ప్రయత్నించండి.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;స్థిర ఆస్తిగా&quot;, అనియంత్రిత ఉండకూడదు అసెట్ రికార్డు అంశం వ్యతిరేకంగా కాలమే"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;స్థిర ఆస్తిగా&quot;, అనియంత్రిత ఉండకూడదు అసెట్ రికార్డు అంశం వ్యతిరేకంగా కాలమే"
 DocType: Vehicle Service,Brake Oil,బ్రేక్ ఆయిల్
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,కస్టమర్&gt; కస్టమర్ గ్రూప్&gt; భూభాగం
 DocType: Tax Rule,Tax Type,పన్ను టైప్
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,పన్ను పరిధిలోకి వచ్చే మొత్తం
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},మీరు ముందు ఎంట్రీలు జోడించడానికి లేదా నవీకరణ అధికారం లేదు {0}
 DocType: BOM,Item Image (if not slideshow),అంశం చిత్రం (స్లైడ్ లేకపోతే)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ఒక కస్టమర్ అదే పేరుతో
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(గంట రేట్ / 60) * అసలు ఆపరేషన్ సమయం
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,రో # {0}: రిఫరెన్స్ డాక్యుమెంట్ టైప్ తప్పనిసరిగా వ్యయం దావా లేదా జర్నల్ ఎంట్రీలో ఒకటిగా ఉండాలి
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,బిఒఎం ఎంచుకోండి
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,రో # {0}: రిఫరెన్స్ డాక్యుమెంట్ టైప్ తప్పనిసరిగా వ్యయం దావా లేదా జర్నల్ ఎంట్రీలో ఒకటిగా ఉండాలి
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,బిఒఎం ఎంచుకోండి
 DocType: SMS Log,SMS Log,SMS లోనికి
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,పంపిణీ వస్తువుల ధర
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} లో సెలవు తేదీ నుండి నేటివరకు మధ్య జరిగేది కాదు
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,ఉద్యోగి లోన్
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,కార్యాచరణ లోనికి ప్రవేశించండి
 DocType: Fee Schedule,Send Payment Request Email,చెల్లింపు అభ్యర్థన ఇమెయిల్ను పంపండి
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,{0} అంశం వ్యవస్థ ఉనికిలో లేదు లేదా గడువు ముగిసింది
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,{0} అంశం వ్యవస్థ ఉనికిలో లేదు లేదా గడువు ముగిసింది
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,హౌసింగ్
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,ఖాతా ప్రకటన
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ఫార్మాస్యూటికల్స్
@@ -210,18 +213,23 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,దిగుమతుల చిట్టా
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,పైన ప్రమాణం ఆధారిత రకం తయారీ విషయ అభ్యర్థన పుల్
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,విజయవంతంగా నమోదు కాలేదు.
 DocType: Training Result Employee,Grade,గ్రేడ్
+DocType: Restaurant Table,No of Seats,సీట్ల సంఖ్య
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","డైనమిక్ విషయం జోడించడానికి, వంటి jinja టాగ్లు ఉపయోగించండి <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,సరఫరాదారు ద్వారా పంపిణీ
 DocType: SMS Center,All Contact,అన్ని సంప్రదించండి
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,ఉత్పత్తి ఆర్డర్ ఇప్పటికే BOM అన్ని అంశాలను రూపొందించినవారు
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,ఉత్పత్తి ఆర్డర్ ఇప్పటికే BOM అన్ని అంశాలను రూపొందించినవారు
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,వార్షిక జీతం
 DocType: Daily Work Summary,Daily Work Summary,డైలీ వర్క్ సారాంశం
 DocType: Period Closing Voucher,Closing Fiscal Year,ఫిస్కల్ ఇయర్ మూసివేయడం
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} ఘనీభవించిన
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,దయచేసి ఖాతాల చార్ట్ సృష్టించడానికి ఉన్న కంపెనీ ఎంచుకోండి
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} ఘనీభవించిన
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,దయచేసి ఖాతాల చార్ట్ సృష్టించడానికి ఉన్న కంపెనీ ఎంచుకోండి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,స్టాక్ ఖర్చులు
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,టార్గెట్ వేర్హౌస్ ఎంచుకోండి
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,టార్గెట్ వేర్హౌస్ ఎంచుకోండి
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,టార్గెట్ వేర్హౌస్ ఎంచుకోండి
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,టార్గెట్ వేర్హౌస్ ఎంచుకోండి
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,నమోదు చేయండి ఇష్టపడే సంప్రదించండి ఇమెయిల్
 DocType: Program Enrollment,School Bus,స్కూల్ బస్
 DocType: Journal Entry,Contra Entry,పద్దు
@@ -238,9 +246,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", మూస తగిన డేటా నింపి ఆ మారిన ఫైలులో అటాచ్. ఎంపిక కాలంలో అన్ని తేదీలు మరియు ఉద్యోగి కలయిక ఉన్న హాజరు రికార్డుల తో, టెంప్లేట్ వస్తాయి"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,{0} ఐటెమ్ చురుకుగా కాదు లేదా జీవితాంతం చేరుకుంది చెయ్యబడింది
+DocType: Student Admission Program,Minimum Age,కనీస వయసు
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,ఉదాహరణ: బేసిక్ గణితం
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","అంశం రేటు వరుసగా {0} లో పన్ను చేర్చడానికి, వరుసలలో పన్నులు {1} కూడా చేర్చారు తప్పక"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,ఆర్ మాడ్యూల్ కోసం సెట్టింగులు
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,ఆర్ మాడ్యూల్ కోసం సెట్టింగులు
 DocType: SMS Center,SMS Center,SMS సెంటర్
 DocType: Sales Invoice,Change Amount,మొత్తం మారుతుంది
 DocType: BOM Update Tool,New BOM,న్యూ BOM
@@ -250,7 +259,7 @@
 DocType: Lead,Request Type,అభ్యర్థన పద్ధతి
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,ఉద్యోగి చేయండి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,బ్రాడ్కాస్టింగ్
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,రూట్లను జోడించండి
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),POS యొక్క సెటప్ మోడ్ (ఆన్లైన్ / ఆఫ్లైన్)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,ఎగ్జిక్యూషన్
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,కార్యకలాపాల వివరాలను చేపట్టారు.
 DocType: Serial No,Maintenance Status,నిర్వహణ స్థితి
@@ -273,6 +282,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,ధర జాబితా కొనడం లేదా అమ్మడం కోసం వర్తించే ఉండాలి
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},సంస్థాపన తేదీ అంశం కోసం డెలివరీ తేదీ ముందు ఉండరాదు {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),ధర జాబితా రేటు తగ్గింపు (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,బయోకెమిస్ట్రీ
 DocType: Offer Letter,Select Terms and Conditions,Select నియమాలు మరియు నిబంధనలు
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,అవుట్ విలువ
 DocType: Production Planning Tool,Sales Orders,సేల్స్ ఆర్డర్స్
@@ -307,15 +317,15 @@
 DocType: Sales Partner,Reseller,పునఃవిక్రేత
 DocType: Codification Table,Medical Code,మెడికల్ కోడ్
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","తనిఖీ చేస్తే, మెటీరియల్ రిక్వెస్ట్ కాని స్టాక్ అంశాలను కలిగి ఉంటుంది."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,కంపెనీ నమోదు చేయండి
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,కంపెనీ నమోదు చేయండి
 DocType: Delivery Note Item,Against Sales Invoice Item,సేల్స్ వాయిస్ అంశం వ్యతిరేకంగా
 ,Production Orders in Progress,ప్రోగ్రెస్ లో ఉత్పత్తి ఆర్డర్స్
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,ఫైనాన్సింగ్ నుండి నికర నగదు
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage పూర్తి, సేవ్ లేదు"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage పూర్తి, సేవ్ లేదు"
 DocType: Lead,Address & Contact,చిరునామా &amp; సంప్రదింపు
 DocType: Leave Allocation,Add unused leaves from previous allocations,మునుపటి కేటాయింపులు నుండి ఉపయోగించని ఆకులు జోడించండి
 DocType: Sales Partner,Partner website,భాగస్వామి వెబ్సైట్
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,చేర్చు
+DocType: Restaurant Order Entry,Add Item,చేర్చు
 DocType: Lab Test,Custom Result,కస్టమ్ ఫలితం
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,సంప్రదింపు పేరు
 DocType: Course Assessment Criteria,Course Assessment Criteria,కోర్సు అంచనా ప్రమాణం
@@ -328,7 +338,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,కొనుగోలు కోసం అభ్యర్థన.
 DocType: Lab Test,Submitted Date,సమర్పించిన తేదీ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,ఈ ఈ ప్రాజెక్టుకు వ్యతిరేకంగా రూపొందించినవారు షీట్లుగా ఆధారంగా
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,నికర పే కంటే తక్కువ 0 కాదు
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,నికర పే కంటే తక్కువ 0 కాదు
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","సిస్టమ్ నుండి పునరావృత లోపం నోటిఫికేషన్లను పంపడాన్ని నిలిపివేయడానికి, మేము చందాలో డిసేబుల్డ్ ఫీల్డ్ను తనిఖీ చేసాము"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,మాత్రమే ఎంచుకున్న లీవ్ అప్రూవర్గా ఈ లీవ్ అప్లికేషన్ సమర్పించవచ్చు
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,తేదీ ఉపశమనం చేరడం తేదీ కంటే ఎక్కువ ఉండాలి
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,సంవత్సరానికి ఆకులు
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,లాభం &amp; నష్టం
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,లీటరు
 DocType: Task,Total Costing Amount (via Time Sheet),మొత్తం ఖర్చు మొత్తం (సమయం షీట్ ద్వారా)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,స్టూడెంట్ గుంపుల క్రింద విద్యార్థులు సెటప్ చేయండి
 DocType: Item Website Specification,Item Website Specification,అంశం వెబ్సైట్ స్పెసిఫికేషన్
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Leave నిరోధిత
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},అంశం {0} జీవితం యొక్క దాని ముగింపు చేరుకుంది {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},అంశం {0} జీవితం యొక్క దాని ముగింపు చేరుకుంది {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,బ్యాంక్ ఎంట్రీలు
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,వార్షిక
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,స్టాక్ సయోధ్య అంశం
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,స్టూడెంట్ గ్రూప్ సృష్టి సాధనం కోర్సు
 DocType: Lead,Do Not Contact,సంప్రదించండి చేయవద్దు
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,మీ సంస్థ వద్ద బోధిస్తారు వ్యక్తుల
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,అన్ని పునరావృత ఇన్వాయిస్లు ట్రాకింగ్ కోసం ఏకైక ID. ఇది submit న రవాణా జరుగుతుంది.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,సాఫ్ట్వేర్ డెవలపర్
 DocType: Item,Minimum Order Qty,కనీస ఆర్డర్ ప్యాక్ చేసిన అంశాల
 DocType: Pricing Rule,Supplier Type,సరఫరాదారు టైప్
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,హబ్ లో ప్రచురించండి
 DocType: Student Admission,Student Admission,విద్యార్థి అడ్మిషన్
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,{0} అంశం రద్దు
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,మెటీరియల్ అభ్యర్థన
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,{0} అంశం రద్దు
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,మెటీరియల్ అభ్యర్థన
 DocType: Bank Reconciliation,Update Clearance Date,నవీకరణ క్లియరెన్స్ తేదీ
 DocType: Item,Purchase Details,కొనుగోలు వివరాలు
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},కొనుగోలు ఆర్డర్ లో &#39;రా మెటీరియల్స్ పంపినవి&#39; పట్టికలో దొరకలేదు అంశం {0} {1}
 DocType: Patient Relation,Relation,రిలేషన్
 DocType: Shipping Rule,Worldwide Shipping,ప్రపంచవ్యాప్తంగా షిప్పింగ్
 DocType: Patient Relation,Mother,తల్లి
+DocType: Restaurant Reservation,Reservation End Time,రిజర్వేషన్ ఎండ్ టైమ్
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,వినియోగదారుడు నుండి ధృవీకరించబడిన ఆదేశాలు.
 DocType: Purchase Receipt Item,Rejected Quantity,తిరస్కరించబడిన పరిమాణం
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,చెల్లింపు అభ్యర్థన {0} సృష్టించబడింది
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,చెల్లింపు అభ్యర్థన {0} సృష్టించబడింది
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,తక్కువ సున్నితత్వం
 DocType: Notification Control,Notification Control,నోటిఫికేషన్ కంట్రోల్
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,మీరు మీ శిక్షణని పూర్తి చేసిన తర్వాత నిర్ధారించండి
 DocType: Lead,Suggestions,సలహాలు
@@ -388,7 +401,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,ఇష్టపడే ఇమెయిల్ లో ఉద్యోగి ఎంపిక ఆధారంగా ఉద్యోగి ఇమెయిళ్ళు జీతం స్లిప్
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,జాబితాలో మొదటి లీవ్ అప్రూవర్గా డిఫాల్ట్ లీవ్ అప్రూవర్గా సెట్ చేయబడుతుంది
 DocType: Tax Rule,Shipping County,షిప్పింగ్ కౌంటీ
-apps/erpnext/erpnext/config/desktop.py +158,Learn,తెలుసుకోండి
+apps/erpnext/erpnext/config/desktop.py +159,Learn,తెలుసుకోండి
 DocType: Asset,Next Depreciation Date,తదుపరి అరుగుదల తేదీ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,ఉద్యోగి ప్రతి కార్యాచరణ ఖర్చు
 DocType: Accounts Settings,Settings for Accounts,అకౌంట్స్ కోసం సెట్టింగులు
@@ -399,13 +412,13 @@
 DocType: Item,Synced With Hub,హబ్ సమకాలీకరించబడింది
 DocType: Vehicle,Fleet Manager,విమానాల మేనేజర్
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},రో # {0}: {1} అంశం కోసం ప్రతికూల ఉండకూడదు {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,సరియినది కాని రహస్య పదము
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,సరియినది కాని రహస్య పదము
 DocType: Item,Variant Of,వేరియంట్
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',కంటే &#39;ప్యాక్ చేసిన అంశాల తయారీకి&#39; పూర్తి ప్యాక్ చేసిన అంశాల ఎక్కువ ఉండకూడదు
 DocType: Period Closing Voucher,Closing Account Head,ఖాతా తల ముగింపు
 DocType: Employee,External Work History,బాహ్య వర్క్ చరిత్ర
 DocType: Physician,Time per Appointment,నియామకానికి సమయం
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,సర్క్యులర్ సూచన లోపం
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,సర్క్యులర్ సూచన లోపం
 DocType: Appointment Type,Is Inpatient,ఇన్పేషెంట్
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 పేరు
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,మీరు డెలివరీ గమనిక సేవ్ ఒకసారి పదాలు (ఎగుమతి) లో కనిపిస్తుంది.
@@ -414,19 +427,18 @@
 DocType: Lead,Industry,ఇండస్ట్రీ
 DocType: Employee,Job Profile,ఉద్యోగ ప్రొఫైల్
 DocType: BOM Item,Rate & Amount,రేట్ &amp; మొత్తం
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,సెటప్&gt; నంబరింగ్ సిరీస్ ద్వారా హాజరు కోసం నంబర్ సిరీస్ను సెటప్ చేయండి
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,ఇది ఈ కంపెనీకి వ్యతిరేకంగా లావాదేవీల ఆధారంగా ఉంది. వివరాలు కోసం కాలక్రమం క్రింద చూడండి
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ఆటోమేటిక్ మెటీరియల్ అభ్యర్థన సృష్టి పై ఇమెయిల్ ద్వారా తెలియజేయి
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,రెసిస్టెంట్
 DocType: Journal Entry,Multi Currency,మల్టీ కరెన్సీ
 DocType: Payment Reconciliation Invoice,Invoice Type,వాయిస్ పద్ధతి
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,కస్టమర్&gt; కస్టమర్ గ్రూప్&gt; భూభాగం
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,డెలివరీ గమనిక
 DocType: Consultation,Encounter Impression,ఎన్కౌంటర్ ఇంప్రెషన్
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,పన్నులు ఏర్పాటు
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,సోల్డ్ ఆస్తి యొక్క ధర
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,మీరు వైదొలగిన తర్వాత చెల్లింపు ఎంట్రీ మారిస్తే. మళ్ళీ తీసి దయచేసి.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} అంశం పన్ను రెండుసార్లు ఎంటర్
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,ఈ వారం పెండింగ్ కార్యకలాపాలకు సారాంశం
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} అంశం పన్ను రెండుసార్లు ఎంటర్
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,ఈ వారం పెండింగ్ కార్యకలాపాలకు సారాంశం
 DocType: Student Applicant,Admitted,చేరినవారి
 DocType: Workstation,Rent Cost,రెంట్ ఖర్చు
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,మొత్తం అరుగుదల తరువాత
@@ -441,36 +453,35 @@
 DocType: Shipping Rule,Valid for Countries,దేశములలో చెలామణి
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ఈ అంశాన్ని ఒక మూస మరియు లావాదేవీలలో ఉపయోగించబడదు. &#39;నో కాపీ&#39; సెట్ చేయబడితే తప్ప అంశం గుణాలను భేదకాలలోకి పైగా కాపీ అవుతుంది
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,భావించబడుతున్నది మొత్తం ఆర్డర్
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Employee హోదా (ఉదా CEO, డైరెక్టర్ మొదలైనవి)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Employee హోదా (ఉదా CEO, డైరెక్టర్ మొదలైనవి)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,కస్టమర్ కరెన్సీ కస్టమర్ బేస్ కరెన్సీ మార్చబడుతుంది రేటుపై
 DocType: Course Scheduling Tool,Course Scheduling Tool,కోర్సు షెడ్యూల్ టూల్
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},రో # {0}: కొనుగోలు వాయిస్ ఇప్పటికే ఉన్న ఆస్తి వ్యతిరేకంగా చేయలేము {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,% S కోసం పునరావృత% s సృష్టించేటప్పుడు [అర్జంట్] లోపం
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,% S కోసం పునరావృత% s సృష్టించేటప్పుడు [అర్జంట్] లోపం
 DocType: Item Tax,Tax Rate,పన్ను శాతమ్
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ఇప్పటికే ఉద్యోగి కోసం కేటాయించిన {1} కాలానికి {2} కోసం {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,అంశాన్ని ఎంచుకోండి
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,అంశాన్ని ఎంచుకోండి
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,వాయిస్ {0} ఇప్పటికే సమర్పించిన కొనుగోలు
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},రో # {0}: బ్యాచ్ లేవు అదే ఉండాలి {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,కాని గ్రూప్ మార్చు
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,ఒక అంశం యొక్క బ్యాచ్ (చాలా).
 DocType: C-Form Invoice Detail,Invoice Date,వాయిస్ తేదీ
 DocType: GL Entry,Debit Amount,డెబిట్ మొత్తం
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},మాత్రమే కంపెనీవారి ప్రతి 1 ఖాతా ఉండగలడు {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,అటాచ్మెంట్ చూడండి
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},మాత్రమే కంపెనీవారి ప్రతి 1 ఖాతా ఉండగలడు {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,అటాచ్మెంట్ చూడండి
 DocType: Purchase Order,% Received,% పొందింది
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,విద్యార్థి సమూహాలు సృష్టించండి
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,సెటప్ ఇప్పటికే సంపూర్ణ !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,సెటప్ ఇప్పటికే సంపూర్ణ !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,క్రెడిట్ గమనిక మొత్తం
 DocType: Setup Progress Action,Action Document,చర్య పత్రం
 ,Finished Goods,తయారైన వస్తువులు
 DocType: Delivery Note,Instructions,సూచనలు
 DocType: Quality Inspection,Inspected By,తనిఖీలు
 DocType: Maintenance Visit,Maintenance Type,నిర్వహణ పద్ధతి
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} కోర్సు చేరాడు లేదు {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,అంశం కోడ్&gt; అంశం సమూహం&gt; బ్రాండ్
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} కోర్సు చేరాడు లేదు {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},సీరియల్ లేవు {0} డెలివరీ గమనిక చెందినది కాదు {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext డెమో
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,అంశాలు జోడించండి
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,అంశాలు జోడించండి
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,అంశం నాణ్యత తనిఖీ పారామిత
 DocType: Leave Application,Leave Approver Name,అప్రూవర్గా వదిలి పేరు
 DocType: Depreciation Schedule,Schedule Date,షెడ్యూల్ తేదీ
@@ -492,7 +503,7 @@
 DocType: Salary Slip Timesheet,Working Hours,పని గంటలు
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,అప్పటికే ఉన్న సిరీస్ ప్రారంభం / ప్రస్తుత క్రమ సంఖ్య మార్చండి.
 DocType: Dosage Strength,Strength,బలం
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,ఒక కొత్త కస్టమర్ సృష్టించు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,ఒక కొత్త కస్టమర్ సృష్టించు
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","బహుళ ధర రూల్స్ వ్యాప్తి చెందడం కొనసాగుతుంది, వినియోగదారులు పరిష్కరించవచ్చు మానవీయంగా ప్రాధాన్యత సెట్ కోరతారు."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,కొనుగోలు ఉత్తర్వులు సృష్టించు
 ,Purchase Register,కొనుగోలు నమోదు
@@ -511,7 +522,7 @@
 DocType: Lab Test Template,Single,సింగిల్
 DocType: Salary Slip,Total Loan Repayment,మొత్తం లోన్ తిరిగి చెల్లించే
 DocType: Account,Cost of Goods Sold,వస్తువుల ఖర్చు సోల్డ్
-DocType: Purchase Invoice,Yearly,వార్షిక
+DocType: Subscription,Yearly,వార్షిక
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,ఖర్చు సెంటర్ నమోదు చేయండి
 DocType: Drug Prescription,Dosage,మోతాదు
 DocType: Journal Entry Account,Sales Order,అమ్మకాల ఆర్డర్
@@ -542,7 +553,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,అన్ని తయారీ ప్రక్రియలకు గ్లోబల్ సెట్టింగులు.
 DocType: Accounts Settings,Accounts Frozen Upto,ఘనీభవించిన వరకు అకౌంట్స్
 DocType: SMS Log,Sent On,న పంపిన
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,లక్షణం {0} గుణాలు పట్టిక పలుమార్లు ఎంపిక
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,లక్షణం {0} గుణాలు పట్టిక పలుమార్లు ఎంపిక
 DocType: HR Settings,Employee record is created using selected field. ,Employee రికార్డు ఎంపిక రంగంలో ఉపయోగించి రూపొందించినవారు ఉంది.
 DocType: Sales Order,Not Applicable,వర్తించదు
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,హాలిడే మాస్టర్.
@@ -568,13 +579,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,కేటాయించింది మొత్తం ఆకులు తప్పనిసరి
 DocType: Patient,AB Positive,AB అనుకూల
 DocType: Job Opening,Description of a Job Opening,ఒక ఉద్యోగ అవకాశాల వివరణ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,నేడు పెండింగ్లో కార్యకలాపాలు
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,నేడు పెండింగ్లో కార్యకలాపాలు
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,హాజరు రికార్డు.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet ఆధారంగా పేరోల్ కోసం జీతం భాగం.
 DocType: Sales Order Item,Used for Production Plan,ఉత్పత్తి ప్లాన్ వుపయోగించే
 DocType: Employee Loan,Total Payment,మొత్తం చెల్లింపు
 DocType: Manufacturing Settings,Time Between Operations (in mins),(నిమిషాలు) ఆపరేషన్స్ మధ్య సమయం
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} చర్య పూర్తి చేయబడదు కాబట్టి రద్దు
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} చర్య పూర్తి చేయబడదు కాబట్టి రద్దు
 DocType: Customer,Buyer of Goods and Services.,గూడ్స్ అండ్ సర్వీసెస్ కొనుగోలుదారు.
 DocType: Journal Entry,Accounts Payable,చెల్లించవలసిన ఖాతాలు
 DocType: Patient,Allergies,అలర్జీలు
@@ -586,23 +597,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,కొనుగోలు ఆర్డర్లను హెచ్చరించండి
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,మీ వినియోగదారులు కొన్ని జాబితా. వారు సంస్థలు లేదా వ్యక్తులతో కావచ్చు.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,తగినంత భాగాలు బిల్డ్
+DocType: POS Profile User,POS Profile User,POS ప్రొఫైల్ వాడుకరి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,ప్రత్యక్ష ఆదాయం
 DocType: Patient Appointment,Date TIme,తేదీ TIme
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","ఖాతా ద్వారా సమూహం ఉంటే, ఖాతా ఆధారంగా వేరు చేయలేని"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,అడ్మినిస్ట్రేటివ్ ఆఫీసర్
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,దయచేసి కోర్సు ఎంచుకోండి
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,దయచేసి కోర్సు ఎంచుకోండి
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,దయచేసి కోర్సు ఎంచుకోండి
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,దయచేసి కోర్సు ఎంచుకోండి
 DocType: Codification Table,Codification Table,కోడెఫికేషన్ టేబుల్
 DocType: Timesheet Detail,Hrs,గంటలు
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,కంపెనీ దయచేసి ఎంచుకోండి
 DocType: Stock Entry Detail,Difference Account,తేడా ఖాతా
 DocType: Purchase Invoice,Supplier GSTIN,సరఫరాదారు GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,దాని ఆధారపడి పని {0} సంవృతం కాదు దగ్గరగా పని కాదు.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,మెటీరియల్ అభ్యర్థన పెంచింది చేయబడే గిడ్డంగి నమోదు చేయండి
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,దాని ఆధారపడి పని {0} సంవృతం కాదు దగ్గరగా పని కాదు.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,మెటీరియల్ అభ్యర్థన పెంచింది చేయబడే గిడ్డంగి నమోదు చేయండి
 DocType: Production Order,Additional Operating Cost,అదనపు నిర్వహణ ఖర్చు
 DocType: Lab Test Template,Lab Routine,ల్యాబ్ రొటీన్
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,కాస్మటిక్స్
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","విలీనం, క్రింది రెండు లక్షణాలతో అంశాలను అదే ఉండాలి"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","విలీనం, క్రింది రెండు లక్షణాలతో అంశాలను అదే ఉండాలి"
 DocType: Shipping Rule,Net Weight,నికర బరువు
 DocType: Employee,Emergency Phone,అత్యవసర ఫోన్
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,కొనుగోలు
@@ -613,7 +625,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,దయచేసి త్రెష్ 0% గ్రేడ్ నిర్వచించే
 DocType: Sales Order,To Deliver,రక్షిం
 DocType: Purchase Invoice Item,Item,అంశం
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,సీరియల్ ఏ అంశం ఒక భిన్నం ఉండకూడదు
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,అధిక సున్నితత్వం
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,సీరియల్ ఏ అంశం ఒక భిన్నం ఉండకూడదు
 DocType: Journal Entry,Difference (Dr - Cr),తేడా (డాక్టర్ - CR)
 DocType: Account,Profit and Loss,లాభం మరియు నష్టం
 DocType: Patient,Risk Factors,ప్రమాద కారకాలు
@@ -622,7 +635,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,మేనేజింగ్ ఉప
 DocType: Vital Signs,Body Temperature,శరీర ఉష్ణోగ్రత
 DocType: Project,Project will be accessible on the website to these users,ప్రాజెక్టు ఈ వినియోగదారులకు వెబ్ సైట్ అందుబాటులో ఉంటుంది
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,ప్రాజెక్ట్ రకం నిర్వచించండి.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,ప్రాజెక్ట్ రకం నిర్వచించండి.
 DocType: Supplier Scorecard,Weighting Function,వెయిటింగ్ ఫంక్షన్
 DocType: Physician,OP Consulting Charge,OP కన్సల్టింగ్ ఛార్జ్
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,సెటప్ మీ
@@ -636,7 +649,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,పెంపు 0 ఉండకూడదు
 DocType: Production Planning Tool,Material Requirement,వస్తు అవసరాల
 DocType: Company,Delete Company Transactions,కంపెనీ లావాదేవీలు తొలగించు
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,రిఫరెన్స్ ఇక లేవు ప్రస్తావన తేదీ బ్యాంక్ లావాదేవీల తప్పనిసరి
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,రిఫరెన్స్ ఇక లేవు ప్రస్తావన తేదీ బ్యాంక్ లావాదేవీల తప్పనిసరి
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ మార్చు పన్నులు మరియు ఆరోపణలు జోడించండి
 DocType: Payment Entry Reference,Supplier Invoice No,సరఫరాదారు వాయిస్ లేవు
 DocType: Territory,For reference,సూచన కోసం
@@ -644,12 +657,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","తొలగించలేరు సీరియల్ లేవు {0}, ఇది స్టాక్ లావాదేవీలు ఉపయోగిస్తారు వంటి"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),మూసివేయడం (CR)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,హలో
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,తరలించు అంశం
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,తరలించు అంశం
 DocType: Serial No,Warranty Period (Days),వారంటీ కాలం (రోజులు)
 DocType: Installation Note Item,Installation Note Item,సంస్థాపన సూచన అంశం
 DocType: Production Plan Item,Pending Qty,పెండింగ్ ప్యాక్ చేసిన అంశాల
 DocType: Budget,Ignore,విస్మరించు
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} సక్రియ కాదు
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} సక్రియ కాదు
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,ముద్రణా సెటప్ చెక్ కొలతలు
 DocType: Salary Slip,Salary Slip Timesheet,జీతం స్లిప్ TIMESHEET
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ఉప-ఒప్పంద కొనుగోలు రసీదులు తప్పనిసరి సరఫరాదారు వేర్హౌస్
@@ -658,7 +671,7 @@
 DocType: Pricing Rule,Sales Partner,సేల్స్ భాగస్వామి
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,అన్ని సరఫరాదారు స్కోర్కార్డులు.
 DocType: Buying Settings,Purchase Receipt Required,కొనుగోలు రసీదులు అవసరం
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,తెరవడం స్టాక్ ఎంటర్ చేస్తే వాల్యువేషన్ రేటు తప్పనిసరి
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,తెరవడం స్టాక్ ఎంటర్ చేస్తే వాల్యువేషన్ రేటు తప్పనిసరి
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,వాయిస్ పట్టిక కనుగొనబడలేదు రికార్డులు
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,మొదటి కంపెనీ మరియు పార్టీ రకాన్ని ఎంచుకోండి
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,ఫైనాన్షియల్ / అకౌంటింగ్ సంవత్సరం.
@@ -695,7 +708,7 @@
 DocType: Quotation,Quotation To,.కొటేషన్
 DocType: Lead,Middle Income,మధ్య ఆదాయ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),ప్రారంభ (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,మీరు ఇప్పటికే మరొక UoM కొన్ని ట్రాన్సాక్షన్ (లు) చేసిన ఎందుకంటే అంశం కోసం మెజర్ అప్రమేయ యూనిట్ {0} నేరుగా మారలేదు. మీరు వేరే డిఫాల్ట్ UoM ఉపయోగించడానికి ఒక కొత్త అంశాన్ని సృష్టించడానికి అవసరం.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,మీరు ఇప్పటికే మరొక UoM కొన్ని ట్రాన్సాక్షన్ (లు) చేసిన ఎందుకంటే అంశం కోసం మెజర్ అప్రమేయ యూనిట్ {0} నేరుగా మారలేదు. మీరు వేరే డిఫాల్ట్ UoM ఉపయోగించడానికి ఒక కొత్త అంశాన్ని సృష్టించడానికి అవసరం.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,కేటాయించింది మొత్తం ప్రతికూల ఉండకూడదు
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,కంపెనీ సెట్ దయచేసి
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,కంపెనీ సెట్ దయచేసి
@@ -710,6 +723,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,బ్యాంక్ ఎంట్రీ చేయడానికి చెల్లింపు ఖాతా ఎంచుకోండి
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","ఆకులు, వ్యయం వాదనలు మరియు పేరోల్ నిర్వహించడానికి ఉద్యోగి రికార్డులు సృష్టించు"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,ప్రిస్క్రిప్షన్ కాలం
+DocType: Restaurant Reservation,Restaurant Reservation,రెస్టారెంట్ రిజర్వేషన్
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,ప్రతిపాదన రాయడం
 DocType: Payment Entry Deduction,Payment Entry Deduction,చెల్లింపు ఎంట్రీ తీసివేత
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,మరో సేల్స్ పర్సన్ {0} అదే ఉద్యోగి ఐడితో ఉంది
@@ -717,7 +731,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,మాస్టర్స్
 DocType: Assessment Plan,Maximum Assessment Score,గరిష్ఠ అసెస్మెంట్ స్కోరు
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,నవీకరణ బ్యాంక్ ట్రాన్సాక్షన్ తేదీలు
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,సమయం ట్రాకింగ్
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,సమయం ట్రాకింగ్
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,ట్రాన్స్పోర్టర్ నకిలీ
 DocType: Fiscal Year Company,Fiscal Year Company,ఫిస్కల్ ఇయర్ కంపెనీ
 DocType: Packing Slip Item,DN Detail,DN వివరాలు
@@ -726,8 +740,9 @@
 DocType: Batch,Batch Description,బ్యాచ్ వివరణ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,విద్యార్థి సంఘాలు సృష్టిస్తోంది
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,విద్యార్థి సంఘాలు సృష్టిస్తోంది
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","చెల్లింపు గేట్వే ఖాతా సృష్టించలేదు, దయచేసి ఒక్క సృష్టించడానికి."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","చెల్లింపు గేట్వే ఖాతా సృష్టించలేదు, దయచేసి ఒక్క సృష్టించడానికి."
 DocType: Supplier Scorecard,Per Year,సంవత్సరానికి
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,DOB ప్రకారం ఈ కార్యక్రమంలో ప్రవేశానికి అర్హత లేదు
 DocType: Sales Invoice,Sales Taxes and Charges,సేల్స్ పన్నులు మరియు ఆరోపణలు
 DocType: Employee,Organization Profile,ఆర్గనైజేషన్ ప్రొఫైల్
 DocType: Vital Signs,Height (In Meter),ఎత్తు (మీటర్లో)
@@ -763,7 +778,7 @@
 DocType: Student Batch Name,Batch Name,బ్యాచ్ పేరు
 DocType: Fee Validity,Max number of visit,సందర్శన యొక్క అత్యధిక సంఖ్య
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet రూపొందించినవారు:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},చెల్లింపు విధానం లో డిఫాల్ట్ నగదు లేదా బ్యాంక్ ఖాతా సెట్ దయచేసి {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},చెల్లింపు విధానం లో డిఫాల్ట్ నగదు లేదా బ్యాంక్ ఖాతా సెట్ దయచేసి {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,నమోదు
 DocType: GST Settings,GST Settings,జిఎస్టి సెట్టింగులు
 DocType: Selling Settings,Customer Naming By,ద్వారా కస్టమర్ నేమింగ్
@@ -795,16 +810,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,అడుగుపెట్టాయి ఖర్చు పన్నులు మరియు ఆరోపణలు
 DocType: Production Order Operation,Actual Start Time,వాస్తవ ప్రారంభ సమయం
 DocType: BOM Operation,Operation Time,ఆపరేషన్ సమయం
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,ముగించు
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,ముగించు
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,బేస్
 DocType: Timesheet,Total Billed Hours,మొత్తం కస్టమర్లకు గంటలు
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,మొత్తం ఆఫ్ వ్రాయండి
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,మొత్తం ఆఫ్ వ్రాయండి
 DocType: Leave Block List Allow,Allow User,వాడుకరి అనుమతించు
 DocType: Journal Entry,Bill No,బిల్ లేవు
 DocType: Company,Gain/Loss Account on Asset Disposal,ఆస్తి తొలగింపు లాభపడిన / నష్టం ఖాతా
 DocType: Vehicle Log,Service Details,సర్వీస్ వివరాలు
 DocType: Vehicle Log,Service Details,సర్వీస్ వివరాలు
-DocType: Purchase Invoice,Quarterly,క్వార్టర్లీ
+DocType: Subscription,Quarterly,క్వార్టర్లీ
 DocType: Lab Test Template,Grouped,గుంపు
 DocType: Selling Settings,Delivery Note Required,డెలివరీ గమనిక లు
 DocType: Bank Guarantee,Bank Guarantee Number,బ్యాంక్ గ్యారంటీ సంఖ్య
@@ -814,12 +829,12 @@
 DocType: Student Attendance,Student Attendance,విద్యార్థి హాజరు
 DocType: Sales Invoice Timesheet,Time Sheet,సమయ పట్టిక
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush రా మెటీరియల్స్ బేస్డ్ న
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,అంశం వివరాలు నమోదు చేయండి
 DocType: Interest,Interest,వడ్డీ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,ప్రీ సేల్స్
 DocType: Purchase Receipt,Other Details,ఇతర వివరాలు
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,టెస్ట్ మూస
+DocType: Restaurant Order Entry Item,Served,పనిచేశారు
 DocType: Account,Accounts,అకౌంట్స్
 DocType: Vehicle,Odometer Value (Last),ఓడోమీటార్ విలువ (చివరి)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,సరఫరాదారు స్కోర్కార్డు ప్రమాణాల యొక్క టెంప్లేట్లు.
@@ -831,26 +846,28 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,ప్రివ్యూ వేతనం స్లిప్
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,ఖాతా {0} అనేకసార్లు నమోదు చేసిన
 DocType: Account,Expenses Included In Valuation,ఖర్చులు విలువలో
-DocType: Hub Settings,Seller City,అమ్మకాల సిటీ
 ,Absent Student Report,కరువవడంతో విద్యార్థి నివేదిక
 DocType: Email Digest,Next email will be sent on:,తదుపరి ఇమెయిల్ పంపబడుతుంది:
 DocType: Offer Letter Term,Offer Letter Term,లెటర్ టర్మ్ ఆఫర్
 DocType: Supplier Scorecard,Per Week,వారానికి
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,అంశం రకాల్లో.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,అంశం రకాల్లో.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,మొత్తం విద్యార్థి
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,అంశం {0} దొరకలేదు
 DocType: Bin,Stock Value,స్టాక్ విలువ
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,"ఫీజు రికార్డులు నేపథ్యంలో సృష్టించబడతాయి. ఏ లోపం అయినా, దోష సందేశం షెడ్యూల్ లో అప్డేట్ అవుతుంది."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,కంపెనీ {0} ఉనికిలో లేదు
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} {1} వరకు ఫీజు చెల్లుబాటు ఉంది
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} {1} వరకు ఫీజు చెల్లుబాటు ఉంది
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,ట్రీ టైప్
 DocType: BOM Explosion Item,Qty Consumed Per Unit,ప్యాక్ చేసిన అంశాల యూనిట్కు సేవించాలి
 DocType: Serial No,Warranty Expiry Date,వారంటీ గడువు తేదీ
 DocType: Material Request Item,Quantity and Warehouse,పరిమాణ మరియు వేర్హౌస్
+DocType: Hub Settings,Unregister,నమోదు తీసివేత
 DocType: Sales Invoice,Commission Rate (%),కమిషన్ రేటు (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,దయచేసి ఎంచుకోండి ప్రోగ్రామ్
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,దయచేసి ఎంచుకోండి ప్రోగ్రామ్
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,దయచేసి ఎంచుకోండి ప్రోగ్రామ్
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,దయచేసి ఎంచుకోండి ప్రోగ్రామ్
 DocType: Project,Estimated Cost,అంచనా వ్యయం
 DocType: Purchase Order,Link to material requests,పదార్థం అభ్యర్థనలు లింక్
+DocType: Hub Settings,Publish,ప్రచురించు
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,ఏరోస్పేస్
 DocType: Journal Entry,Credit Card Entry,క్రెడిట్ కార్డ్ ఎంట్రీ
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,కంపెనీ మరియు అకౌంట్స్
@@ -861,13 +878,12 @@
 DocType: Selling Settings,Close Opportunity After Days,అవకాశ డేస్ తర్వాత దగ్గరి
 ,Reserved,రిసర్వ్డ్
 DocType: Purchase Order,Supply Raw Materials,సప్లై రా మెటీరియల్స్
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,తదుపరి ఇన్వాయిస్ ఉత్పత్తి అవుతుంది తేదీ. ఇది submit న రవాణా జరుగుతుంది.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,ప్రస్తుత ఆస్తులు
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} స్టాక్ అంశం కాదు
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',"శిక్షణ ఫీడ్బ్యాక్ మీద క్లిక్ చేసి, తరువాత &#39;కొత్త&#39;"
 DocType: Mode of Payment Account,Default Account,డిఫాల్ట్ ఖాతా
 DocType: Payment Entry,Received Amount (Company Currency),అందుకున్న మొత్తం (కంపెనీ కరెన్సీ)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,అవకాశం లీడ్ నుండి తయారు చేస్తారు ఉంటే లీడ్ ఏర్పాటు చేయాలి
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,అవకాశం లీడ్ నుండి తయారు చేస్తారు ఉంటే లీడ్ ఏర్పాటు చేయాలి
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,వీక్లీ ఆఫ్ రోజును ఎంచుకోండి
 DocType: Patient,O Negative,ఓ నెగటివ్
 DocType: Production Order Operation,Planned End Time,అనుకున్న ముగింపు సమయం
@@ -883,10 +899,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,శక్తి
 DocType: Opportunity,Opportunity From,నుండి అవకాశం
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,మంత్లీ జీతం ప్రకటన.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,కంపెనీని జోడించండి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,వరుస {0}: {1} అంశం కోసం {2} క్రమ సంఖ్య అవసరం. మీరు {3} ను అందించారు.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,వరుస {0}: {1} అంశం కోసం {2} క్రమ సంఖ్య అవసరం. మీరు {3} ను అందించారు.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,దయచేసి ఒక పట్టికను ఎంచుకోండి
 DocType: BOM,Website Specifications,వెబ్సైట్ లక్షణాలు
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} &#39;గ్రహీతలు&#39; లో చెల్లని ఇమెయిల్ చిరునామా
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} &#39;గ్రహీతలు&#39; లో చెల్లని ఇమెయిల్ చిరునామా
 DocType: Special Test Items,Particulars,వివరముల
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,యాంటిబయోటిక్.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: నుండి {0} రకం {1}
@@ -894,11 +910,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,రో {0}: మార్పిడి ఫాక్టర్ తప్పనిసరి
 DocType: Employee,A+,ఒక +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","అదే ప్రమాణాల బహుళ ధర రూల్స్ ఉనికిలో ఉంది, ప్రాధాన్యత కేటాయించి వివాద పరిష్కారం దయచేసి. ధర నియమాలు: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,సోమరిగాచేయు లేదా ఇతర BOMs తో అనుసంధానం BOM రద్దు కాదు
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,సోమరిగాచేయు లేదా ఇతర BOMs తో అనుసంధానం BOM రద్దు కాదు
 DocType: Opportunity,Maintenance,నిర్వహణ
 DocType: Item Attribute Value,Item Attribute Value,అంశం విలువను ఆపాదించే
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,సేల్స్ ప్రచారాలు.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,tIMESHEET చేయండి
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,tIMESHEET చేయండి
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -936,12 +952,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,మొదటి అంశం నమోదు చేయండి
 DocType: Account,Liability,బాధ్యత
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,మంజూరు మొత్తం రో లో క్లెయిమ్ సొమ్ము కంటే ఎక్కువ ఉండకూడదు {0}.
+DocType: Salary Detail,Do not include in total,మొత్తంలో చేర్చవద్దు
 DocType: Company,Default Cost of Goods Sold Account,గూడ్స్ సోల్డ్ ఖాతా యొక్క డిఫాల్ట్ ఖర్చు
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,ధర జాబితా ఎంచుకోలేదు
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,ధర జాబితా ఎంచుకోలేదు
 DocType: Employee,Family Background,కుటుంబ నేపథ్యం
 DocType: Request for Quotation Supplier,Send Email,ఇమెయిల్ పంపండి
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},హెచ్చరిక: చెల్లని జోడింపు {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,అనుమతి లేదు
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},హెచ్చరిక: చెల్లని జోడింపు {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,అనుమతి లేదు
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,కోట్ అభ్యర్థించబడింది
 DocType: Vital Signs,Heart Rate / Pulse,హార్ట్ రేట్ / పల్స్
 DocType: Company,Default Bank Account,డిఫాల్ట్ బ్యాంక్ ఖాతా
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",పార్టీ ఆధారంగా ఫిల్టర్ ఎన్నుకోండి పార్టీ మొదటి రకం
@@ -969,12 +987,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,అంశం రో {IDX}: {doctype} {DOCNAME} లేదు పైన ఉనికిలో లేదు &#39;{doctype}&#39; పట్టిక
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} ఇప్పటికే పూర్తి లేదా రద్దు
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,విధులు లేవు
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ఆటో ఇన్వాయిస్ 05, 28 etc ఉదా ఉత్పత్తి అవుతుంది ఇది నెల రోజు"
 DocType: Item Variant Settings,Copy Fields to Variant,కాపీ ఫీల్డ్స్ వేరియంట్
 DocType: Asset,Opening Accumulated Depreciation,పోగుచేసిన తరుగుదల తెరవడం
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,స్కోరు 5 కంటే తక్కువ లేదా సమానంగా ఉండాలి
 DocType: Program Enrollment Tool,Program Enrollment Tool,ప్రోగ్రామ్ నమోదు టూల్
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,సి ఫారం రికార్డులు
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,సి ఫారం రికార్డులు
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,కస్టమర్ మరియు సరఫరాదారు
 DocType: Email Digest,Email Digest Settings,ఇమెయిల్ డైజెస్ట్ సెట్టింగ్స్
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,మీ వ్యాపారానికి ధన్యవాదములు!
@@ -992,13 +1009,13 @@
 DocType: Request for Quotation Supplier,Quote Status,కోట్ స్థితి
 DocType: Maintenance Visit,Completion Status,పూర్తి స్థితి
 DocType: HR Settings,Enter retirement age in years,సంవత్సరాలలో విరమణ వయసు ఎంటర్
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,టార్గెట్ వేర్హౌస్
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,దయచేసి ఒక గిడ్డంగి ఎంచుకోండి
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,టార్గెట్ వేర్హౌస్
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,దయచేసి ఒక గిడ్డంగి ఎంచుకోండి
 DocType: Cheque Print Template,Starting location from left edge,ఎడమ అంచు నుండి నగర ప్రారంభిస్తోంది
 DocType: Item,Allow over delivery or receipt upto this percent,ఈ శాతం వరకు డెలివరీ లేదా రసీదులు పైగా అనుమతించు
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,దిగుమతి హాజరు
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,అన్ని అంశం గుంపులు
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,అన్ని అంశం గుంపులు
 DocType: Process Payroll,Activity Log,కార్యాచరణ లాగ్
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,నికర లాభం / నష్టం
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,స్వయంచాలకంగా లావాదేవీల సమర్పణ సందేశాన్ని కంపోజ్.
@@ -1010,7 +1027,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,ప్రొజెక్టెడ్ ప్యాక్ చేసిన అంశాల
 DocType: Sales Invoice,Payment Due Date,చెల్లింపు గడువు తేదీ
 DocType: Drug Prescription,Interval UOM,విరామం UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,అంశం వేరియంట్ {0} ఇప్పటికే అదే గుణ ఉంది
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,అంశం వేరియంట్ {0} ఇప్పటికే అదే గుణ ఉంది
+DocType: Item,Hub Publishing Details,హబ్ ప్రచురణ వివరాలు
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;ప్రారంభిస్తున్నాడు&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,డు ఓపెన్
 DocType: Notification Control,Delivery Note Message,డెలివరీ గమనిక సందేశం
@@ -1030,10 +1048,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: ముడి పదార్థం ప్రధాన అంశం వలె ఉండకూడదు
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,కొనుగోలు స్వీకరణపై అంశాలు పట్టికలో మొత్తం వర్తించే ఛార్జీలు మొత్తం పన్నులు మరియు ఆరోపణలు అదే ఉండాలి
 DocType: Sales Team,Incentives,ఇన్సెంటివ్స్
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,హబ్ కోసం నమోదు
 DocType: SMS Log,Requested Numbers,అభ్యర్థించిన సంఖ్యలు
 DocType: Production Planning Tool,Only Obtain Raw Materials,కేవలం రా మెటీరియల్స్ పొందుము
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,చేసిన పనికి పొగడ్తలు.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","సమర్ధించే షాపింగ్ కార్ట్ ప్రారంభించబడింది వంటి, &#39;షాపింగ్ కార్ట్ ఉపయోగించండి&#39; మరియు షాపింగ్ కార్ట్ కోసం కనీసం ఒక పన్ను రూల్ ఉండాలి"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","సమర్ధించే షాపింగ్ కార్ట్ ప్రారంభించబడింది వంటి, &#39;షాపింగ్ కార్ట్ ఉపయోగించండి&#39; మరియు షాపింగ్ కార్ట్ కోసం కనీసం ఒక పన్ను రూల్ ఉండాలి"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","చెల్లింపు ఎంట్రీ {0} ఆర్డర్ {1}, ఈ వాయిస్ లో అడ్వాన్సుగా తీసుకున్నాడు తప్పకుండా తనిఖీ వ్యతిరేకంగా ముడిపడి ఉంది."
 DocType: Sales Invoice Item,Stock Details,స్టాక్ వివరాలు
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,ప్రాజెక్టు విలువ
@@ -1052,12 +1071,14 @@
 DocType: Salary Slip,Working Days,వర్కింగ్ డేస్
 DocType: Serial No,Incoming Rate,ఇన్కమింగ్ రేటు
 DocType: Packing Slip,Gross Weight,స్థూల బరువు
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,మీ కంపెనీ పేరు ఇది కోసం మీరు ఈ వ్యవస్థ ఏర్పాటు.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,హబ్ ప్రారంభించు
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,మీ కంపెనీ పేరు ఇది కోసం మీరు ఈ వ్యవస్థ ఏర్పాటు.
 DocType: HR Settings,Include holidays in Total no. of Working Days,ఏ మొత్తం లో సెలవులు చేర్చండి. వర్కింగ్ డేస్
 DocType: Job Applicant,Hold,హోల్డ్
 DocType: Employee,Date of Joining,చేరిన తేదీ
 DocType: Naming Series,Update Series,నవీకరణ సిరీస్
 DocType: Supplier Quotation,Is Subcontracted,"బహుకరించింది, మరలా ఉంది"
+DocType: Restaurant Table,Minimum Seating,కనీస సీటింగ్
 DocType: Item Attribute,Item Attribute Values,అంశం లక్షణం విలువలు
 DocType: Examination Result,Examination Result,పరీక్ష ఫలితం
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,కొనుగోలు రసీదులు
@@ -1068,13 +1089,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},ఆపరేషన్ కోసం తదుపరి {0} రోజుల్లో టైమ్ స్లాట్ దొరక్కపోతే {1}
 DocType: Production Order,Plan material for sub-assemblies,ఉప శాసనసభలకు ప్రణాళిక పదార్థం
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,సేల్స్ భాగస్వాములు అండ్ టెరిటరీ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,బిఒఎం {0} సక్రియ ఉండాలి
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,బిఒఎం {0} సక్రియ ఉండాలి
 DocType: Journal Entry,Depreciation Entry,అరుగుదల ఎంట్రీ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,మొదటి డాక్యుమెంట్ రకాన్ని ఎంచుకోండి
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ఈ నిర్వహణ సందర్శించండి రద్దు ముందు రద్దు మెటీరియల్ సందర్శనల {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},సీరియల్ లేవు {0} అంశం చెందినది కాదు {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Required ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,ఉన్న లావాదేవీతో గిడ్డంగులు లెడ్జర్ మార్చబడతాయి కాదు.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,ఉన్న లావాదేవీతో గిడ్డంగులు లెడ్జర్ మార్చబడతాయి కాదు.
 DocType: Bank Reconciliation,Total Amount,మొత్తం డబ్బు
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,ఇంటర్నెట్ పబ్లిషింగ్
 DocType: Prescription Duration,Number,సంఖ్య
@@ -1085,7 +1106,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,సేల్స్ ధర జాబితా
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","తనిఖీ చేసినట్లయితే, ఒక కస్టమర్ సృష్టించబడుతుంది, రోగికి మ్యాప్ చేయబడుతుంది. ఈ కస్టమర్కు వ్యతిరేకంగా రోగి ఇన్వాయిస్లు సృష్టించబడతాయి. రోగిని సృష్టించేటప్పుడు మీరు ఇప్పటికే ఉన్న కస్టమర్ను కూడా ఎంచుకోవచ్చు."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,అంశాలను సమకాలీకరించడానికి ప్రచురించు
 DocType: Bank Reconciliation,Account Currency,ఖాతా కరెన్సీ
 DocType: Lab Test,Sample ID,నమూనా ID
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,కంపెనీ లో రౌండ్ ఆఫ్ ఖాతా చెప్పలేదు దయచేసి
@@ -1094,11 +1114,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,{0} ఉద్యోగి చురుకుగా కాదు లేదా ఉనికిలో లేదు
 DocType: Fee Structure,Components,భాగాలు
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Item లో అసెట్ వర్గం నమోదు చేయండి {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,అంశం రకరకాలు {0} నవీకరించబడింది
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,అంశం రకరకాలు {0} నవీకరించబడింది
 DocType: Quality Inspection Reading,Reading 6,6 పఠనం
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,కాదు {0} {1} {2} లేకుండా ఏ ప్రతికూల అత్యుత్తమ వాయిస్ కెన్
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","ఉత్పన్నం. ఆలస్యమైతే, మీరు మాన్యువల్గా దీనిని &quot;నెలవారీ రోజున పునరావృతం చేయి&quot; ఫీల్డ్ మార్చాలి"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,కాదు {0} {1} {2} లేకుండా ఏ ప్రతికూల అత్యుత్తమ వాయిస్ కెన్
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,వాయిస్ అడ్వాన్స్ కొనుగోలు
-DocType: Hub Settings,Sync Now,ఇప్పుడు సమకాలీకరించు
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},రో {0}: క్రెడిట్ ఎంట్రీ తో జతచేయవచ్చు ఒక {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,ఆర్థిక సంవత్సరం బడ్జెట్లో నిర్వచించండి.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,ఈ మోడ్ ఎంపిక ఉన్నప్పుడు డిఫాల్ట్ బ్యాంక్ / నగదు ఖాతా స్వయంచాలకంగా POS వాయిస్ అప్డేట్ అవుతుంది.
@@ -1110,13 +1131,13 @@
 DocType: Item,Is Purchase Item,కొనుగోలు అంశం
 DocType: Asset,Purchase Invoice,కొనుగోలు వాయిస్
 DocType: Stock Ledger Entry,Voucher Detail No,ఓచర్ వివరాలు లేవు
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,న్యూ సేల్స్ వాయిస్
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,న్యూ సేల్స్ వాయిస్
 DocType: Stock Entry,Total Outgoing Value,మొత్తం అవుట్గోయింగ్ విలువ
 DocType: Physician,Appointments,నియామకాల
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,తేదీ మరియు ముగింపు తేదీ తెరవడం అదే ఫిస్కల్ ఇయర్ లోపల ఉండాలి
 DocType: Lead,Request for Information,సమాచారం కోసం అభ్యర్థన
 ,LeaderBoard,లీడర్బోర్డ్
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,సమకాలీకరణ ఆఫ్లైన్ రసీదులు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,సమకాలీకరణ ఆఫ్లైన్ రసీదులు
 DocType: Payment Request,Paid,చెల్లింపు
 DocType: Program Fee,Program Fee,ప్రోగ్రామ్ రుసుము
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1135,11 +1156,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,ఆర్డర్ అంశం కొనుగోలు
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,పరోక్ష ఆదాయం
 DocType: Student Attendance Tool,Student Attendance Tool,విద్యార్థి హాజరు టూల్
+DocType: Restaurant Menu,Price List (Auto created),ధర జాబితా (ఆటో సృష్టించబడింది)
 DocType: Cheque Print Template,Date Settings,తేదీ సెట్టింగులు
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,అంతర్భేధం
 ,Company Name,కంపెనీ పేరు
 DocType: SMS Center,Total Message(s),మొత్తం సందేశం (లు)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,బదిలీ కోసం అంశాన్ని ఎంచుకోండి
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,బదిలీ కోసం అంశాన్ని ఎంచుకోండి
 DocType: Purchase Invoice,Additional Discount Percentage,అదనపు డిస్కౌంట్ శాతం
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,అన్ని సహాయ వీడియోలను జాబితాను వీక్షించండి
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,చెక్ జమ జరిగినది ఎక్కడ బ్యాంకు ఖాతాను ఎంచుకోండి తల.
@@ -1157,6 +1179,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,మీటర్
 DocType: Workstation,Electricity Cost,విద్యుత్ ఖర్చు
 DocType: HR Settings,Don't send Employee Birthday Reminders,Employee జన్మదిన రిమైండర్లు పంపవద్దు
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,అమరికలను భద్రపరచు
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,అభ్యర్థించిన ఉత్పత్తులు
 DocType: Item,Inspection Criteria,ఇన్స్పెక్షన్ ప్రమాణం
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,బదిలీ
 DocType: BOM Website Item,BOM Website Item,బిఒఎం వెబ్సైట్ అంశం
@@ -1174,11 +1198,11 @@
 DocType: Journal Entry,Total Amount in Words,పదాలు లో మొత్తం పరిమాణం
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,ఒక లోపం ఉంది. వన్ మూడింటిని కారణం మీరు రూపం సేవ్ చేయలేదు అని కావచ్చు. సమస్య కొనసాగితే support@erpnext.com సంప్రదించండి.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,నా కార్ట్
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},ఆర్డర్ రకం ఒకటి ఉండాలి {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},ఆర్డర్ రకం ఒకటి ఉండాలి {0}
 DocType: Lead,Next Contact Date,తదుపరి సంప్రదించండి తేదీ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,ప్యాక్ చేసిన అంశాల తెరవడం
 DocType: Healthcare Settings,Appointment Reminder,అపాయింట్మెంట్ రిమైండర్
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,మొత్తం చేంజ్ ఖాతాను నమోదు చేయండి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,మొత్తం చేంజ్ ఖాతాను నమోదు చేయండి
 DocType: Student Batch Name,Student Batch Name,స్టూడెంట్ బ్యాచ్ పేరు
 DocType: Consultation,Doctor,డాక్టర్
 DocType: Holiday List,Holiday List Name,హాలిడే జాబితా పేరు
@@ -1186,12 +1210,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,షెడ్యూల్ కోర్సు
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,స్టాక్ ఆప్షన్స్
 DocType: Journal Entry Account,Expense Claim,ఖర్చు చెప్పడం
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,మీరు నిజంగా ఈ చిత్తు ఆస్తి పునరుద్ధరించేందుకు పెట్టమంటారా?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},కోసం చేసిన అంశాల {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,మీరు నిజంగా ఈ చిత్తు ఆస్తి పునరుద్ధరించేందుకు పెట్టమంటారా?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},కోసం చేసిన అంశాల {0}
 DocType: Leave Application,Leave Application,లీవ్ అప్లికేషన్
 DocType: Patient,Patient Relation,పేషంట్ రిలేషన్
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,కేటాయింపు టూల్ వదిలి
+DocType: Item,Hub Category to Publish,హబ్ వర్గం ప్రచురించడానికి
 DocType: Leave Block List,Leave Block List Dates,బ్లాక్ జాబితా తేదీలు వదిలి
+DocType: Sales Invoice,Billing Address GSTIN,బిల్లింగ్ అడ్రస్ GSTIN
 DocType: Workstation,Net Hour Rate,నికర గంట రేట్
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,అడుగుపెట్టాయి ఖర్చు కొనుగోలు రసీదులు
 DocType: Company,Default Terms,డిఫాల్ట్ నిబంధనలు
@@ -1201,11 +1227,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},దయచేసి పేర్కొనండి ఒక {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,పరిమాణం లేదా విలువ ఎటువంటి మార్పు తొలగించబడిన అంశాలు.
 DocType: Delivery Note,Delivery To,డెలివరీ
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,లక్షణం పట్టిక తప్పనిసరి
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,లక్షణం పట్టిక తప్పనిసరి
 DocType: Production Planning Tool,Get Sales Orders,సేల్స్ ఆర్డర్స్ పొందండి
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ప్రతికూల ఉండకూడదు
 DocType: Training Event,Self-Study,స్వంత చదువు
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,డిస్కౌంట్
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,డిస్కౌంట్
 DocType: Asset,Total Number of Depreciations,Depreciations మొత్తం సంఖ్య
 DocType: Sales Invoice Item,Rate With Margin,మార్జిన్ తో రేటు
 DocType: Sales Invoice Item,Rate With Margin,మార్జిన్ తో రేటు
@@ -1213,7 +1239,7 @@
 DocType: Task,Urgent,అర్జంట్
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},పట్టికలో వరుసగా {0} కోసం చెల్లుబాటులో రో ID పేర్కొనవచ్చు దయచేసి {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,వేరియబుల్ని కనుగొనడం సాధ్యం కాదు:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,దయచేసి నంపాడ్ నుండి సవరించడానికి ఒక ఫీల్డ్ను ఎంచుకోండి
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,దయచేసి నంపాడ్ నుండి సవరించడానికి ఒక ఫీల్డ్ను ఎంచుకోండి
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,డెస్క్టాప్ వెళ్ళండి మరియు ERPNext ఉపయోగించడం ప్రారంభించడానికి
 DocType: Item,Manufacturer,తయారీదారు
 DocType: Landed Cost Item,Purchase Receipt Item,కొనుగోలు రసీదులు అంశం
@@ -1244,8 +1270,8 @@
 DocType: GL Entry,Against,ఎగైనెస్ట్
 DocType: Item,Default Selling Cost Center,డిఫాల్ట్ సెల్లింగ్ ఖర్చు సెంటర్
 DocType: Sales Partner,Implementation Partner,అమలు భాగస్వామి
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,జిప్ కోడ్
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},అమ్మకాల ఆర్డర్ {0} ఉంది {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,జిప్ కోడ్
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},అమ్మకాల ఆర్డర్ {0} ఉంది {1}
 DocType: Opportunity,Contact Info,సంప్రదింపు సమాచారం
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,స్టాక్ ఎంట్రీలు మేకింగ్
 DocType: Packing Slip,Net Weight UOM,నికర బరువు UoM
@@ -1256,6 +1282,7 @@
 DocType: Holiday List,Get Weekly Off Dates,వీక్లీ ఆఫ్ తేదీలు పొందండి
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,ముగింపు తేదీ ప్రారంభ తేదీ కంటే తక్కువ ఉండకూడదు
 DocType: Sales Person,Select company name first.,మొదటిది ఎంచుకోండి కంపెనీ పేరు.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,తక్కువ నుండి హై
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,కొటేషన్స్ పంపిణీదారుల నుండి పొందింది.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,"BOM ని పునఃస్థాపించి, అన్ని BOM లలో తాజా ధరను నవీకరించండి"
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},కు {0} | {1} {2}
@@ -1276,7 +1303,7 @@
 DocType: Program Enrollment,Transportation,రవాణా
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,చెల్లని లక్షణం
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} సమర్పించాలి
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},పరిమాణం కంటే తక్కువ లేదా సమానంగా ఉండాలి {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},పరిమాణం కంటే తక్కువ లేదా సమానంగా ఉండాలి {0}
 DocType: SMS Center,Total Characters,మొత్తం అక్షరాలు
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},అంశం కోసం BOM రంగంలో BOM దయచేసి ఎంచుకోండి {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,సి ఫారం వాయిస్ వివరాలు
@@ -1291,7 +1318,7 @@
 ,Ordered Items To Be Billed,క్రమ అంశాలు బిల్ టు
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,రేంజ్ తక్కువ ఉండాలి కంటే పరిధి
 DocType: Global Defaults,Global Defaults,గ్లోబల్ డిఫాల్ట్
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,ప్రాజెక్టు కొలాబరేషన్ ఆహ్వానం
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,ప్రాజెక్టు కొలాబరేషన్ ఆహ్వానం
 DocType: Salary Slip,Deductions,తగ్గింపులకు
 DocType: Leave Allocation,LAL/,లాల్ /
 DocType: Setup Progress Action,Action Name,చర్య పేరు
@@ -1309,13 +1336,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,సేల్స్ వాయిస్ అడ్వాన్స్
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,నథింగ్ అభ్యర్థించవచ్చు
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},మరో బడ్జెట్ రికార్డు &#39;{0}&#39; ఇప్పటికే వ్యతిరేకంగా ఉంది {1} &#39;{2}&#39; ఆర్థిక సంవత్సరానికి {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&#39;అసలు ప్రారంభ తేదీ&#39; &#39;వాస్తవిక ముగింపు తేదీ&#39; కంటే ఎక్కువ ఉండకూడదు
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&#39;అసలు ప్రారంభ తేదీ&#39; &#39;వాస్తవిక ముగింపు తేదీ&#39; కంటే ఎక్కువ ఉండకూడదు
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,మేనేజ్మెంట్
 DocType: Cheque Print Template,Payer Settings,చెల్లింపుదారు సెట్టింగులు
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ఈ శ్రేణి Item కోడ్ చేర్చవలసి ఉంటుంది. మీ సంక్షిప్త &quot;SM&quot; మరియు ఉదాహరణకు, అంశం కోడ్ &quot;T- షర్టు&quot;, &quot;T- షర్టు-SM&quot; ఉంటుంది వేరియంట్ అంశం కోడ్"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,మీరు వేతనం స్లిప్ సేవ్ ఒకసారి (మాటలలో) నికర పే కనిపిస్తుంది.
 DocType: Purchase Invoice,Is Return,రాబడి
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,హెచ్చరిక
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,హెచ్చరిక
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,రిటర్న్ / డెబిట్ గమనిక
 DocType: Price List Country,Price List Country,ధర జాబితా దేశం
 DocType: Item,UOMs,UOMs
@@ -1330,17 +1357,18 @@
 DocType: Account,Balance Sheet,బ్యాలెన్స్ షీట్
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',&#39;అంశం కోడ్ అంశం సెంటర్ ఖర్చు
 DocType: Fee Validity,Valid Till,చెల్లుతుంది టిల్
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",చెల్లింపు రకం కన్ఫిగర్ చేయబడలేదు. ఖాతా చెల్లింపులు మోడ్ మీద లేదా POS ప్రొఫైల్ సెట్ చేయబడ్డాయి వచ్చారో లేదో తనిఖీ చేయండి.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",చెల్లింపు రకం కన్ఫిగర్ చేయబడలేదు. ఖాతా చెల్లింపులు మోడ్ మీద లేదా POS ప్రొఫైల్ సెట్ చేయబడ్డాయి వచ్చారో లేదో తనిఖీ చేయండి.
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,అదే అంశం అనేకసార్లు ఎంటర్ చేయలేరు.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","మరింత ఖాతాల గుంపులు కింద తయారు చేయవచ్చు, కానీ ఎంట్రీలు కాని గుంపులు వ్యతిరేకంగా తయారు చేయవచ్చు"
 DocType: Lead,Lead,లీడ్
 DocType: Email Digest,Payables,Payables
 DocType: Course,Course Intro,కోర్సు ఉపోద్ఘాతం
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,స్టాక్ ఎంట్రీ {0} రూపొందించారు
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,సెటప్&gt; నంబరింగ్ సిరీస్ ద్వారా హాజరు కోసం నంబర్ సిరీస్ను సెటప్ చేయండి
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,స్టాక్ ఎంట్రీ {0} రూపొందించారు
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,రో # {0}: ప్యాక్ చేసిన అంశాల కొనుగోలు చూపించు నమోదు కాదు తిరస్కరించబడిన
 ,Purchase Order Items To Be Billed,కొనుగోలు ఆర్డర్ అంశాలు బిల్ టు
 DocType: Purchase Invoice Item,Net Rate,నికర రేటు
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,దయచేసి కస్టమర్ను ఎంచుకోండి
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,దయచేసి కస్టమర్ను ఎంచుకోండి
 DocType: Purchase Invoice Item,Purchase Invoice Item,వాయిస్ అంశం కొనుగోలు
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,స్టాక్ లెడ్జర్ ఎంట్రీలు మరియు GL ఎంట్రీలు ఎన్నుకున్నారు కొనుగోలు రసీదులు కోసం మళ్ళీ పోస్ట్ చేసారు ఉంటాయి
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,అంశం 1
@@ -1360,7 +1388,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},తో నకిలీ వరుసగా {0} అదే {1}
 ,Trial Balance,ట్రయల్ బ్యాలెన్స్
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,ఫిస్కల్ ఇయర్ {0} దొరకలేదు
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,ఉద్యోగులు ఏర్పాటు
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,ఉద్యోగులు ఏర్పాటు
 DocType: Sales Order,SO-,SO-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,మొదటి ఉపసర్గ దయచేసి ఎంచుకోండి
 DocType: Employee,O-,O-
@@ -1372,12 +1400,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,చూడండి లెడ్జర్
 DocType: Grading Scale,Intervals,విరామాలు
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,తొట్టతొలి
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","ఒక అంశం గ్రూప్ అదే పేరుతో, అంశం పేరు మార్చడానికి లేదా అంశం సమూహం పేరు దయచేసి"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","ఒక అంశం గ్రూప్ అదే పేరుతో, అంశం పేరు మార్చడానికి లేదా అంశం సమూహం పేరు దయచేసి"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,స్టూడెంట్ మొబైల్ నెంబరు
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,ప్రపంచంలోని మిగిలిన
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,ప్రపంచంలోని మిగిలిన
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,అంశం {0} బ్యాచ్ ఉండకూడదు
 ,Budget Variance Report,బడ్జెట్ విస్తృతి నివేదిక
 DocType: Salary Slip,Gross Pay,స్థూల పే
+DocType: Item,Is Item from Hub,హబ్ నుండి అంశం
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,రో {0}: కార్యాచరణ టైప్ తప్పనిసరి.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,డివిడెండ్ చెల్లించిన
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,అకౌంటింగ్ లెడ్జర్
@@ -1387,8 +1416,9 @@
 DocType: Vehicle Log,Service Detail,సర్వీస్ వివరాలు
 DocType: BOM,Item Description,వస్తువు వివరణ
 DocType: Student Sibling,Student Sibling,స్టూడెంట్ తోబుట్టువులు
-DocType: Purchase Invoice,Is Recurring,పునరావృత ఉంది
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,చెల్లింపు రకం
 DocType: Purchase Invoice,Supplied Items,సరఫరా అంశాలు
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},దయచేసి రెస్టారెంట్ {0} కోసం సక్రియ మెనును సెట్ చేయండి
 DocType: Student,STUD.,స్టడ్.
 DocType: Production Order,Qty To Manufacture,తయారీకి అంశాల
 DocType: Email Digest,New Income,న్యూ ఆదాయం
@@ -1398,6 +1428,7 @@
 ,Student and Guardian Contact Details,స్టూడెంట్ మరియు గార్డియన్ సంప్రదించాల్సిన
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,రో {0}: సరఫరాదారు కోసం {0} ఇమెయిల్ అడ్రసు పంపించవలసిన అవసరం ఉంది
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,తాత్కాలిక ప్రారంభోత్సవం
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,హబ్ చూడండి
 ,Employee Leave Balance,ఉద్యోగి సెలవు సంతులనం
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},ఖాతా సంతులనం {0} ఎల్లప్పుడూ ఉండాలి {1}
 DocType: Patient Appointment,More Info,మరింత సమాచారం
@@ -1417,13 +1448,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,అమ్మకాల ఆర్డర్ {0} చెల్లదు
 DocType: Supplier Scorecard,Warn for new Request for Quotations,ఉల్లేఖనాల కోసం క్రొత్త అభ్యర్థన కోసం హెచ్చరించండి
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,కొనుగోలు ఆర్డర్లు మీరు ప్లాన్ సహాయం మరియు మీ కొనుగోళ్లపై అనుసరించాల్సి
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","క్షమించండి, కంపెనీలు విలీనం సాధ్యం కాదు"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","క్షమించండి, కంపెనీలు విలీనం సాధ్యం కాదు"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,ల్యాబ్ టెస్ట్ ప్రిస్క్రిప్షన్స్
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",మొత్తం ఇష్యూ / ట్రాన్స్ఫర్ పరిమాణం {0} మెటీరియల్ అభ్యర్థన {1} \ అంశం కోసం అభ్యర్థించిన పరిమాణం {2} కంటే ఎక్కువ ఉండకూడదు {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,చిన్న
 DocType: Employee,Employee Number,Employee సంఖ్య
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},కేస్ లేదు (s) ఇప్పటికే ఉపయోగంలో ఉంది. కేస్ నో నుండి ప్రయత్నించండి {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},కేస్ లేదు (s) ఇప్పటికే ఉపయోగంలో ఉంది. కేస్ నో నుండి ప్రయత్నించండి {0}
 DocType: Project,% Completed,% పూర్తయింది
 ,Invoiced Amount (Exculsive Tax),ఇన్వాయిస్ మొత్తం (Exculsive పన్ను)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,అంశం 2
@@ -1438,11 +1469,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,పరోక్ష ఖర్చులు
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,రో {0}: Qty తప్పనిసరి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,వ్యవసాయం
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,సమకాలీకరణ మాస్టర్ డేటా
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,సమకాలీకరణ మాస్టర్ డేటా
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,మీ ఉత్పత్తులు లేదా సేవల
 DocType: Special Test Items,Special Test Items,ప్రత్యేక టెస్ట్ అంశాలు
 DocType: Mode of Payment,Mode of Payment,చెల్లింపు విధానం
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,వెబ్సైట్ చిత్రం పబ్లిక్ ఫైలు లేదా వెబ్సైట్ URL అయి ఉండాలి
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,వెబ్సైట్ చిత్రం పబ్లిక్ ఫైలు లేదా వెబ్సైట్ URL అయి ఉండాలి
 DocType: Student Applicant,AP,ఏపీ
 DocType: Purchase Invoice Item,BOM,బిఒఎం
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,ఈ రూట్ అంశం సమూహం ఉంది మరియు సవరించడం సాధ్యం కాదు.
@@ -1450,9 +1481,9 @@
 DocType: Vehicle,Fuel UOM,ఇంధన UoM
 DocType: Warehouse,Warehouse Contact Info,వేర్హౌస్ సంప్రదింపు సమాచారం
 DocType: Payment Entry,Write Off Difference Amount,తేడా మొత్తం ఆఫ్ వ్రాయండి
-DocType: Purchase Invoice,Recurring Type,పునరావృత టైప్
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: ఉద్యోగి ఇమెయిల్ దొరకలేదు, అందుకే పంపలేదు ఇమెయిల్"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: ఉద్యోగి ఇమెయిల్ దొరకలేదు, అందుకే పంపలేదు ఇమెయిల్"
 DocType: Item,Foreign Trade Details,ఫారిన్ ట్రేడ్ వివరాలు
+,Assessment Plan Status,అంచనా ప్రణాళిక స్థితి
 DocType: Email Digest,Annual Income,వార్షిక ఆదాయం
 DocType: Serial No,Serial No Details,సీరియల్ సంఖ్య వివరాలు
 DocType: Purchase Invoice Item,Item Tax Rate,అంశం పన్ను రేటు
@@ -1460,15 +1491,14 @@
 DocType: Student Group Student,Group Roll Number,గ్రూప్ రోల్ సంఖ్య
 DocType: Student Group Student,Group Roll Number,గ్రూప్ రోల్ సంఖ్య
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, కేవలం క్రెడిట్ ఖాతాల మరొక డెబిట్ ప్రవేశం వ్యతిరేకంగా లింక్ చేయవచ్చు కోసం"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,అన్ని పని బరువులు మొత్తం 1 ఉండాలి తదనుగుణంగా ప్రణాళిక పనులు బరువులు సర్దుబాటు చేయండి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,డెలివరీ గమనిక {0} సమర్పించిన లేదు
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,అన్ని పని బరువులు మొత్తం 1 ఉండాలి తదనుగుణంగా ప్రణాళిక పనులు బరువులు సర్దుబాటు చేయండి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,డెలివరీ గమనిక {0} సమర్పించిన లేదు
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,అంశం {0} ఒక ఉప-ఒప్పంద అంశం ఉండాలి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,రాజధాని పరికరాలు
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","ధర రూల్ మొదటి ఆధారంగా ఎంపిక ఉంటుంది అంశం, అంశం గ్రూప్ లేదా బ్రాండ్ కావచ్చు, ఫీల్డ్ &#39;న వర్తించు&#39;."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,దయచేసి మొదటి అంశం కోడ్ను సెట్ చేయండి
-DocType: Hub Settings,Seller Website,అమ్మకాల వెబ్సైట్
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,దయచేసి మొదటి అంశం కోడ్ను సెట్ చేయండి
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,అమ్మకాలు జట్టు మొత్తం కేటాయించింది శాతం 100 ఉండాలి
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,అమ్మకాలు జట్టు మొత్తం కేటాయించింది శాతం 100 ఉండాలి
 DocType: Sales Invoice Item,Edit Description,ఎడిట్ వివరణ
 DocType: Antibiotic,Antibiotic,యాంటిబయోటిక్
 ,Team Updates,టీమ్ నవీకరణలు
@@ -1489,12 +1519,12 @@
 DocType: Purchase Invoice,Total (Company Currency),మొత్తం (కంపెనీ కరెన్సీ)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,{0} క్రమ సంఖ్య ఒకసారి కంటే ఎక్కువ ప్రవేశించింది
 DocType: Depreciation Schedule,Journal Entry,జర్నల్ ఎంట్రీ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} పురోగతి అంశాలను
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} పురోగతి అంశాలను
 DocType: Workstation,Workstation Name,కార్యక్షేత్ర పేరు
 DocType: Grading Scale Interval,Grade Code,గ్రేడ్ కోడ్
 DocType: POS Item Group,POS Item Group,POS అంశం గ్రూప్
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,సారాంశ ఇమెయిల్:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},బిఒఎం {0} అంశం చెందినది కాదు {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},బిఒఎం {0} అంశం చెందినది కాదు {1}
 DocType: Sales Partner,Target Distribution,టార్గెట్ పంపిణీ
 DocType: Salary Slip,Bank Account No.,బ్యాంక్ ఖాతా నంబర్
 DocType: Naming Series,This is the number of the last created transaction with this prefix,ఈ ఉపసర్గ గత రూపొందించినవారు లావాదేవీ సంఖ్య
@@ -1511,10 +1541,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,కొటేషన్ సరఫరాదారు కోసం అభ్యర్థన
 DocType: Healthcare Settings,Registration Message,నమోదు సందేశం
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,హార్డ్వేర్
-DocType: Sales Order,Recurring Upto,పునరావృత వరకు
 DocType: Prescription Dosage,Prescription Dosage,ప్రిస్క్రిప్షన్ మోతాదు
 DocType: Attendance,HR Manager,HR మేనేజర్
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,ఒక కంపెనీ దయచేసి ఎంచుకోండి
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,ఒక కంపెనీ దయచేసి ఎంచుకోండి
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,ప్రివిలేజ్ లీవ్
 DocType: Purchase Invoice,Supplier Invoice Date,సరఫరాదారు వాయిస్ తేదీ
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,పర్
@@ -1530,10 +1559,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,మధ్య దొరకలేదు అతివ్యాప్తి పరిస్థితులు:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,జర్నల్ వ్యతిరేకంగా ఎంట్రీ {0} ఇప్పటికే కొన్ని ఇతర రసీదును వ్యతిరేకంగా సర్దుబాటు
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,మొత్తం ఆర్డర్ విలువ
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,ఆహార
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,ఆహార
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,ఏజింగ్ రేంజ్ 3
 DocType: Maintenance Schedule Item,No of Visits,సందర్శనల సంఖ్య
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},నిర్వహణ షెడ్యూల్ {0} వ్యతిరేకంగా ఉంది {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,మీరు హబ్ మీ ఐటెమ్లను ప్రచురించాలనుకుంటున్నారా?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,నమోదు అవుతున్న విద్యార్ధి
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},మూసివేయబడిన ఖాతా కరెన్సీ ఉండాలి {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},అన్ని గోల్స్ కోసం పాయింట్లు మొత్తానికి ఇది 100 ఉండాలి {0}
@@ -1544,9 +1574,9 @@
 DocType: Authorization Rule,Average Discount,సగటు డిస్కౌంట్
 DocType: Purchase Invoice Item,UOM,UoM
 DocType: Rename Tool,Utilities,యుటిలిటీస్
-DocType: Purchase Invoice Item,Accounting,అకౌంటింగ్
+DocType: POS Profile,Accounting,అకౌంటింగ్
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,దయచేసి సమూహం చేయబడిన అంశం వంతులవారీగా ఎంచుకోండి
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,దయచేసి సమూహం చేయబడిన అంశం వంతులవారీగా ఎంచుకోండి
 DocType: Asset,Depreciation Schedules,అరుగుదల షెడ్యూల్స్
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,అప్లికేషన్ కాలం వెలుపల సెలవు కేటాయింపు కాలం ఉండకూడదు
 DocType: Activity Cost,Projects,ప్రాజెక్ట్స్
@@ -1562,7 +1592,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',ఆమోద స్థితి &#39;అప్రూవ్డ్ లేదా&#39; తిరస్కరించింది &#39;తప్పక
 DocType: Physician,Contacts and Address,కాంటాక్ట్స్ మరియు చిరునామా
 DocType: Purchase Invoice,Contact Person,పర్సన్ సంప్రదించండి
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&#39;ఊహించిన ప్రారంభం తేది&#39; కంటే ఎక్కువ &#39;ఊహించినది ముగింపు తేదీ&#39; ఉండకూడదు
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&#39;ఊహించిన ప్రారంభం తేది&#39; కంటే ఎక్కువ &#39;ఊహించినది ముగింపు తేదీ&#39; ఉండకూడదు
 DocType: Course Scheduling Tool,Course End Date,కోర్సు ముగింపు తేదీ
 DocType: Holiday List,Holidays,సెలవులు
 DocType: Sales Order Item,Planned Quantity,ప్రణాళిక పరిమాణం
@@ -1570,10 +1600,11 @@
 DocType: Item,Maintain Stock,స్టాక్ నిర్వహించడానికి
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,ఇప్పటికే ఉత్పత్తి ఆర్డర్ రూపొందించినవారు స్టాక్ ఎంట్రీలు
 DocType: Employee,Prefered Email,prefered ఇమెయిల్
+DocType: Student Admission,Eligibility and Details,అర్హతలు మరియు వివరాలు
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,స్థిర ఆస్తి నికర మార్పును
 DocType: Leave Control Panel,Leave blank if considered for all designations,అన్ని వివరణలకు భావిస్తారు ఉంటే ఖాళీ వదిలి
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,రకం &#39;యదార్థ&#39; వరుసగా బాధ్యతలు {0} అంశాన్ని రేటు చేర్చారు సాధ్యం కాదు
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},మాక్స్: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},మాక్స్: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,తేదీసమయం నుండి
 DocType: Email Digest,For Company,కంపెనీ
 apps/erpnext/erpnext/config/support.py +17,Communication log.,కమ్యూనికేషన్ లాగ్.
@@ -1581,19 +1612,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,సరఫరాదారు స్కోర్కార్డ్ స్కోరింగ్ వేరియబుల్
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,కొనుగోలు సొమ్ము
 DocType: Sales Invoice,Shipping Address Name,షిప్పింగ్ చిరునామా పేరు
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,ఖాతాల చార్ట్
 DocType: Material Request,Terms and Conditions Content,నియమాలు మరియు నిబంధనలు కంటెంట్
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,100 కంటే ఎక్కువ ఉండకూడదు
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,{0} అంశం స్టాక్ అంశం కాదు
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,{0} అంశం స్టాక్ అంశం కాదు
 DocType: Maintenance Visit,Unscheduled,అనుకోని
 DocType: Employee,Owned,ఆధ్వర్యంలోని
 DocType: Salary Detail,Depends on Leave Without Pay,పే లేకుండా వదిలి ఆధారపడి
 DocType: Pricing Rule,"Higher the number, higher the priority","అధిక సంఖ్య, ఎక్కువ ప్రాధాన్యత"
 ,Purchase Invoice Trends,వాయిస్ ట్రెండ్లులో కొనుగోలు
 DocType: Employee,Better Prospects,మెరుగైన అవకాశాలు
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","రో # {0}: బ్యాచ్ {1} కేవలం {2} అంశాల ఉంది. దయచేసి {3} అంశాల అందుబాటులో ఉంది మరొక బ్యాచ్ ఎంచుకోండి లేదా బహుళ బ్యాచ్లు నుండి బట్వాడా / సమస్య, బహుళ వరుసలు లోకి వరుసగా విడిపోయి"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","రో # {0}: బ్యాచ్ {1} కేవలం {2} అంశాల ఉంది. దయచేసి {3} అంశాల అందుబాటులో ఉంది మరొక బ్యాచ్ ఎంచుకోండి లేదా బహుళ బ్యాచ్లు నుండి బట్వాడా / సమస్య, బహుళ వరుసలు లోకి వరుసగా విడిపోయి"
 DocType: Vehicle,License Plate,లైసెన్స్ ప్లేట్
 DocType: Appraisal,Goals,లక్ష్యాలు
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,POS ప్రొఫైల్ను ఎంచుకోండి
 DocType: Warranty Claim,Warranty / AMC Status,వారంటీ / AMC స్థితి
 ,Accounts Browser,అకౌంట్స్ బ్రౌజర్
 DocType: Payment Entry Reference,Payment Entry Reference,చెల్లింపు ఎంట్రీ సూచన
@@ -1611,7 +1642,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Employee తనను రిపోర్ట్ చేయలేరు.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",ఖాతా ఘనీభవించిన ఉంటే ప్రవేశాలు పరిమితం వినియోగదారులు అనుమతించబడతాయి.
 DocType: Email Digest,Bank Balance,బ్యాంకు బ్యాలెన్స్
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ఏకైక కరెన్సీగా తయారు చేయవచ్చు: {0} కోసం అకౌంటింగ్ ఎంట్రీ {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ఏకైక కరెన్సీగా తయారు చేయవచ్చు: {0} కోసం అకౌంటింగ్ ఎంట్రీ {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","జాబ్ ప్రొఫైల్, అర్హతలు అవసరం మొదలైనవి"
 DocType: Journal Entry Account,Account Balance,ఖాతా నిలువ
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,లావాదేవీలకు పన్ను రూల్.
@@ -1620,8 +1651,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),మొత్తం పన్నులు మరియు ఆరోపణలు (కంపెనీ కరెన్సీ)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,మూసివేయబడని ఆర్థిక సంవత్సరం పి &amp; L నిల్వలను చూపించు
 DocType: Lab Test Template,Collection Details,సేకరణ వివరాలు
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, tab నుండి ct.consultation_dateConsultation ct, `tabLab ప్రిస్క్రిప్షన్` cp ఇక్కడ ct.patient = &#39;{0}&#39; మరియు cp.parent = ct. పేరు మరియు cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,షిప్పింగ్ ఖాతా
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: ఖాతా {2} నిష్క్రియంగా
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,సేల్స్ ఆర్డర్స్ మీరు మీ పని ప్లాన్ సహాయం మరియు సమయం బట్వాడా చేయండి
@@ -1638,7 +1667,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,ప్యాకింగ్ స్లిప్
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,ఆఫీసు రెంట్
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,సెటప్ SMS గేట్వే సెట్టింగులు
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,దిగుమతి విఫలమైంది!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,దిగుమతి విఫలమైంది!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,ఏ చిరునామా ఇంకా జోడించారు.
 DocType: Workstation Working Hour,Workstation Working Hour,కార్యక్షేత్ర పని గంట
 DocType: Vital Signs,Blood Pressure,రక్తపోటు
@@ -1663,7 +1692,7 @@
 DocType: Sales Invoice,Source,మూల
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,మూసి షో
 DocType: Leave Type,Is Leave Without Pay,పే లేకుండా వదిలి ఉంటుంది
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,ఆస్తి వర్గం స్థిర ఆస్తి అంశం తప్పనిసరి
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,ఆస్తి వర్గం స్థిర ఆస్తి అంశం తప్పనిసరి
 DocType: Fee Validity,Fee Validity,ఫీజు చెల్లుబాటు
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,చెల్లింపు పట్టిక కనుగొనబడలేదు రికార్డులు
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},ఈ {0} తో విభేదాలు {1} కోసం {2} {3}
@@ -1684,8 +1713,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ఎగ్జిక్యూటివ్ శోధన
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,లీడ్స్ సృష్టించు
 DocType: Maintenance Schedule,Schedules,షెడ్యూల్స్
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,పాయింట్ ఆఫ్ సేల్ ను ఉపయోగించడానికి POS ప్రొఫైల్ అవసరం
 DocType: Purchase Invoice Item,Net Amount,నికర మొత్తం
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} సమర్పించిన చేయలేదు చర్య పూర్తి చేయబడదు కాబట్టి
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} సమర్పించిన చేయలేదు చర్య పూర్తి చేయబడదు కాబట్టి
 DocType: Purchase Order Item Supplied,BOM Detail No,బిఒఎం వివరాలు లేవు
 DocType: Landed Cost Voucher,Additional Charges,అదనపు ఛార్జీలు
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),అదనపు డిస్కౌంట్ మొత్తం (కంపెనీ కరెన్సీ)
@@ -1694,7 +1724,7 @@
 ,Support Hour Distribution,మద్దతు గంట పంపిణీ
 DocType: Maintenance Visit,Maintenance Visit,నిర్వహణ సందర్శించండి
 DocType: Student,Leaving Certificate Number,సర్టిఫికెట్ సంఖ్య వదిలి
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","నియామకం రద్దు చేయబడింది, దయచేసి ఇన్వాయిస్ను సమీక్షించండి మరియు రద్దు చేయండి {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","నియామకం రద్దు చేయబడింది, దయచేసి ఇన్వాయిస్ను సమీక్షించండి మరియు రద్దు చేయండి {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Warehouse వద్ద అందుబాటులో బ్యాచ్ ప్యాక్ చేసిన అంశాల
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,నవీకరణ ప్రింట్ ఫార్మాట్
 DocType: Landed Cost Voucher,Landed Cost Help,అడుగుపెట్టాయి ఖర్చు సహాయము
@@ -1717,8 +1747,8 @@
 DocType: Patient,Tobacco Past Use,పొగాకు గత ఉపయోగం
 DocType: Sales Invoice Item,Brand Name,బ్రాండ్ పేరు
 DocType: Purchase Receipt,Transporter Details,ట్రాన్స్పోర్టర్ వివరాలు
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},వాడుకరి {0} ఇప్పటికే వైద్యుడికి కేటాయించబడింది {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,డిఫాల్ట్ గిడ్డంగిలో ఎంచుకున్న అంశం కోసం అవసరం
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},వాడుకరి {0} ఇప్పటికే వైద్యుడికి కేటాయించబడింది {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,డిఫాల్ట్ గిడ్డంగిలో ఎంచుకున్న అంశం కోసం అవసరం
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,బాక్స్
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,సాధ్యమైన సరఫరాదారు
 DocType: Budget,Monthly Distribution,మంత్లీ పంపిణీ
@@ -1728,8 +1758,8 @@
 DocType: Sales Partner,Sales Partner Target,సేల్స్ భాగస్వామిలో టార్గెట్
 DocType: Loan Type,Maximum Loan Amount,గరిష్ఠ రుణ మొత్తం
 DocType: Pricing Rule,Pricing Rule,ధర రూల్
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},విద్యార్థి కోసం నకిలీ రోల్ నంబర్ {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},విద్యార్థి కోసం నకిలీ రోల్ నంబర్ {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},విద్యార్థి కోసం నకిలీ రోల్ నంబర్ {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},విద్యార్థి కోసం నకిలీ రోల్ నంబర్ {0}
 DocType: Budget,Action if Annual Budget Exceeded,యాక్షన్ వార్షిక బడ్జెట్ మించింది ఉంటే
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,ఆర్డర్ కొనుగోలు మెటీరియల్ అభ్యర్థన
 DocType: Shopping Cart Settings,Payment Success URL,చెల్లింపు విజయవంతం URL
@@ -1746,7 +1776,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} ఒక్కసారి మాత్రమే కనిపిస్తుంది ఉండాలి
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},మరింత బదిలీ చేయాలా అనుమతి లేదు {0} కంటే {1} కొనుగోలు ఆర్డర్ వ్యతిరేకంగా {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},విజయవంతంగా కేటాయించిన లీవ్స్ {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,ఏ అంశాలు సర్దుకుని
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,ఏ అంశాలు సర్దుకుని
 DocType: Shipping Rule Condition,From Value,విలువ నుంచి
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,తయారీ పరిమాణం తప్పనిసరి
 DocType: Employee Loan,Repayment Method,తిరిగి చెల్లించే విధానం
@@ -1760,6 +1790,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,స్టాక్ బాధ్యతలు
 DocType: Purchase Invoice,Supplier Warehouse,సరఫరాదారు వేర్హౌస్
 DocType: Opportunity,Contact Mobile No,సంప్రదించండి మొబైల్ లేవు
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,కంపెనీని ఎంచుకోండి
 ,Material Requests for which Supplier Quotations are not created,సరఫరాదారు కొటేషన్స్ రూపొందించినవారు లేని పదార్థం అభ్యర్థనలు
 DocType: Student Group,Set 0 for no limit,ఎటువంటి పరిమితి 0 సెట్
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,మీరు సెలవు కోసం దరఖాస్తు ఇది రోజు (లు) పండుగలు. మీరు సెలవు కోసం దరఖాస్తు అవసరం లేదు.
@@ -1769,24 +1800,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,కొటేషన్ చేయండి
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,ఇతర నివేదికలు
 DocType: Dependent Task,Dependent Task,అస్వతంత్ర టాస్క్
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},మెజర్ యొక్క డిఫాల్ట్ యూనిట్ మార్పిడి అంశం వరుసగా 1 ఉండాలి {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},మెజర్ యొక్క డిఫాల్ట్ యూనిట్ మార్పిడి అంశం వరుసగా 1 ఉండాలి {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},రకం లీవ్ {0} కంటే ఎక్కువ ఉండరాదు {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ముందుగానే X రోజులు కార్యకలాపాలు ప్రణాళిక ప్రయత్నించండి.
 DocType: HR Settings,Stop Birthday Reminders,ఆపు జన్మదిన రిమైండర్లు
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},కంపెనీ డిఫాల్ట్ పేరోల్ చెల్లించవలసిన ఖాతా సెట్ దయచేసి {0}
 DocType: SMS Center,Receiver List,స్వీకర్త జాబితా
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,శోధన అంశం
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,శోధన అంశం
 DocType: Patient Appointment,Referring Physician,వైద్యున్ని సూచించడం
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,వినియోగించిన మొత్తం
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,నగదు నికర మార్పు
 DocType: Assessment Plan,Grading Scale,గ్రేడింగ్ స్కేల్
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,మెజర్ {0} యొక్క యూనిట్ మార్పిడి ఫాక్టర్ టేబుల్ లో ఒకసారి కంటే ఎక్కువ నమోదు చేయబడింది
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,ఇప్పటికే పూర్తి
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,మెజర్ {0} యొక్క యూనిట్ మార్పిడి ఫాక్టర్ టేబుల్ లో ఒకసారి కంటే ఎక్కువ నమోదు చేయబడింది
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,ఇప్పటికే పూర్తి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,చేతిలో స్టాక్
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},చెల్లింపు అభ్యర్థన ఇప్పటికే ఉంది {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,జారీచేయబడింది వస్తువుల ధర
 DocType: Physician,Hospital,హాస్పిటల్
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},పరిమాణం కంటే ఎక్కువ ఉండకూడదు {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},పరిమాణం కంటే ఎక్కువ ఉండకూడదు {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,మునుపటి ఆర్థిక సంవత్సరం మూసివేయబడింది లేదు
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),వయసు (రోజులు)
 DocType: Quotation Item,Quotation Item,కొటేషన్ అంశం
@@ -1797,8 +1828,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,సరఫరాదారు టైప్ మాస్టర్.
 DocType: Purchase Order Item,Supplier Part Number,సరఫరాదారు పార్ట్ సంఖ్య
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,మార్పిడి రేటు 0 లేదా 1 ఉండకూడదు
-DocType: Sales Invoice,Reference Document,రిఫరెన్స్ డాక్యుమెంట్
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} రద్దు లేదా ఆగిపోయిన
+DocType: Subscription,Reference Document,రిఫరెన్స్ డాక్యుమెంట్
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} రద్దు లేదా ఆగిపోయిన
 DocType: Accounts Settings,Credit Controller,క్రెడిట్ కంట్రోలర్
 DocType: Delivery Note,Vehicle Dispatch Date,వాహనం డిస్పాచ్ తేదీ
 DocType: Healthcare Settings,Default Medical Code Standard,డిఫాల్ట్ మెడికల్ కోడ్ స్టాండర్డ్
@@ -1807,6 +1838,7 @@
 DocType: Company,Default Payable Account,డిఫాల్ట్ చెల్లించవలసిన ఖాతా
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","ఇటువంటి షిప్పింగ్ నియమాలు, ధర జాబితా మొదలైనవి ఆన్లైన్ షాపింగ్ కార్ట్ కోసం సెట్టింగులు"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% కస్టమర్లకు
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,ధర ద్వారా క్రమబద్ధీకరించు ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,ప్రత్యేకించుకోవడమైనది ప్యాక్ చేసిన అంశాల
 DocType: Party Account,Party Account,పార్టీ ఖాతా
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,మానవ వనరులు
@@ -1818,13 +1850,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,చెల్లించుట ఎంట్రీ చేయండి
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,రో {0}: సరఫరాదారు వ్యతిరేకంగా అడ్వాన్స్ డెబిట్ తప్పక
 DocType: Company,Default Values,డిఫాల్ట్ విలువలు
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{ఫ్రీక్వెన్సీ} డైజెస్ట్
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{ఫ్రీక్వెన్సీ} డైజెస్ట్
 DocType: Expense Claim,Total Amount Reimbursed,మొత్తం మొత్తం డబ్బులు
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,ఈ ఈ వాహనం వ్యతిరేకంగా లాగ్లను ఆధారంగా. వివరాల కోసం ఈ క్రింది కాలక్రమం చూడండి
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},సరఫరాదారు వ్యతిరేకంగా వాయిస్ {0} నాటి {1}
 DocType: Customer,Default Price List,డిఫాల్ట్ ధర జాబితా
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,ఆస్తి ఉద్యమం రికార్డు {0} రూపొందించారు
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,మీరు తొలగించలేరు ఫిస్కల్ ఇయర్ {0}. ఫిస్కల్ ఇయర్ {0} గ్లోబల్ సెట్టింగ్స్ లో డిఫాల్ట్ గా సెట్
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,అదే పేరుతో ఉన్న కస్టమర్ ఇప్పటికే ఉంది
 DocType: Journal Entry,Entry Type,ఎంట్రీ రకం
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,తోబుట్టువుల అంచనా ప్రణాళిక ఈ అంచనా సమూహం ముడిపడి
 ,Customer Credit Balance,కస్టమర్ క్రెడిట్ సంతులనం
@@ -1835,7 +1868,7 @@
 DocType: Quotation,Term Details,టర్మ్ వివరాలు
 DocType: Project,Total Sales Cost (via Sales Order),మొత్తం సేల్స్ ఖర్చు (అమ్మకాల ఉత్తర్వు ద్వారా)
 DocType: Project,Total Sales Cost (via Sales Order),మొత్తం సేల్స్ ఖర్చు (అమ్మకాల ఉత్తర్వు ద్వారా)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,{0} ఈ విద్యార్థి సమూహం కోసం విద్యార్థులు కంటే మరింత నమోదు చేయలేరు.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,{0} ఈ విద్యార్థి సమూహం కోసం విద్యార్థులు కంటే మరింత నమోదు చేయలేరు.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,లీడ్ కౌంట్
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 కంటే ఎక్కువ ఉండాలి
 DocType: Manufacturing Settings,Capacity Planning For (Days),(రోజులు) పరిమాణ ప్రణాళికా
@@ -1852,9 +1885,11 @@
 DocType: Lab Test,Technician Name,టెక్నీషియన్ పేరు
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,వాయిస్ రద్దు చెల్లింపు లింక్ను రద్దు
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},ఎంటర్ ప్రస్తుత ఓడోమీటార్ పఠనం ప్రారంభ వాహనం ఓడోమీటార్ కన్నా ఎక్కువ ఉండాలి {0}
+DocType: Restaurant Reservation,No Show,ప్రదర్శన లేదు
 DocType: Shipping Rule Country,Shipping Rule Country,షిప్పింగ్ రూల్ దేశం
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,వదిలివేయండి మరియు హాజరు
 DocType: Maintenance Visit,Partially Completed,పాక్షికంగా పూర్తి
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,ఆధునిక సున్నితత్వం
 DocType: Leave Type,Include holidays within leaves as leaves,ఆకులు ఆకులు లోపల సెలవులు చేర్చండి
 DocType: Sales Invoice,Packed Items,ప్యాక్ చేసిన అంశాలు
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,సీరియల్ నంబర్ వ్యతిరేకంగా వారంటీ దావా
@@ -1871,13 +1906,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),మొత్తం చెల్లించారు (కంపెనీ కరెన్సీ)
 DocType: Purchase Invoice,Additional Discount,అదనపు డిస్కౌంట్
 DocType: Selling Settings,Selling Settings,సెట్టింగులు సెల్లింగ్
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,చర్యను నిర్థారించండి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ఆన్లైన్ వేలంపాటలు
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,పరిమాణం లేదా మదింపు రేటు లేదా రెండు గాని రాయండి
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,నిర్వాహ
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,కార్ట్ లో చూడండి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,మార్కెటింగ్ ఖర్చులు
 ,Item Shortage Report,అంశం కొరత రిపోర్ట్
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","బరువు \ n దయచేసి చాలా &quot;బరువు UoM&quot; చెప్పలేదు, ప్రస్తావించబడింది"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","బరువు \ n దయచేసి చాలా &quot;బరువు UoM&quot; చెప్పలేదు, ప్రస్తావించబడింది"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,మెటీరియల్ అభ్యర్థన ఈ స్టాక్ ఎంట్రీ చేయడానికి ఉపయోగిస్తారు
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,తదుపరి అరుగుదల తేదీ నూతన ఆస్తి తప్పనిసరి
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,ప్రతి బ్యాచ్ కోసం ప్రత్యేక కోర్సు ఆధారంగా గ్రూప్
@@ -1890,12 +1926,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ప్రతి స్టాక్ ఉద్యమం కోసం అకౌంటింగ్ ఎంట్రీ చేయండి
 DocType: Leave Allocation,Total Leaves Allocated,మొత్తం ఆకులు కేటాయించిన
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},రో లేవు అవసరం వేర్హౌస్ {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,చెల్లుబాటు అయ్యే ఆర్థిక సంవత్సరం ప్రారంభ మరియు ముగింపు తేదీలను ఎంటర్ చేయండి
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,చెల్లుబాటు అయ్యే ఆర్థిక సంవత్సరం ప్రారంభ మరియు ముగింపు తేదీలను ఎంటర్ చేయండి
 DocType: Employee,Date Of Retirement,రిటైర్మెంట్ డేట్ అఫ్
 DocType: Upload Attendance,Get Template,మూస పొందండి
 DocType: Material Request,Transferred,బదిలీ
 DocType: Vehicle,Doors,ది డోర్స్
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext సెటప్ పూర్తి!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext సెటప్ పూర్తి!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,పేషంట్ రిజిస్ట్రేషన్ కోసం ఫీజుని సేకరించండి
 DocType: Course Assessment Criteria,Weightage,వెయిటేజీ
 DocType: Purchase Invoice,Tax Breakup,పన్ను వేర్పాటు
@@ -1914,37 +1950,37 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","ఈ అంశాన్ని రకాల్లో, అప్పుడు అది అమ్మకాలు ఆదేశాలు మొదలైనవి ఎంపిక సాధ్యం కాదు"
 DocType: Lead,Next Contact By,నెక్స్ట్ సంప్రదించండి
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},వరుసగా అంశం {0} కోసం అవసరం పరిమాణం {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},వరుసగా అంశం {0} కోసం అవసరం పరిమాణం {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},పరిమాణం అంశం కోసం ఉనికిలో వేర్హౌస్ {0} తొలగించబడవు {1}
 DocType: Quotation,Order Type,ఆర్డర్ రకం
-DocType: Purchase Invoice,Notification Email Address,ప్రకటన ఇమెయిల్ అడ్రస్
 ,Item-wise Sales Register,అంశం వారీగా సేల్స్ నమోదు
 DocType: Asset,Gross Purchase Amount,స్థూల కొనుగోలు మొత్తాన్ని
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,ప్రారంభ నిల్వలు
 DocType: Asset,Depreciation Method,అరుగుదల విధానం
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,ఆఫ్లైన్
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,ఆఫ్లైన్
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,ప్రాథమిక రేటు లో కూడా ఈ పన్ను?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,మొత్తం టార్గెట్
 DocType: Job Applicant,Applicant for a Job,ఒక Job కొరకు అభ్యర్ధించే
 DocType: Production Plan Material Request,Production Plan Material Request,ఉత్పత్తి ప్రణాళిక మెటీరియల్ అభ్యర్థన
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,సృష్టించలేదు ఉత్పత్తి ఆర్డర్స్
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,సృష్టించలేదు ఉత్పత్తి ఆర్డర్స్
 DocType: Stock Reconciliation,Reconciliation JSON,సయోధ్య JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,చాలా కాలమ్. నివేదిక ఎగుమతి చేయండి మరియు స్ప్రెడ్షీట్ అనువర్తనం ఉపయోగించి ప్రింట్.
 DocType: Purchase Invoice Item,Batch No,బ్యాచ్ లేవు
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},ఉల్లేఖన కోసం అభ్యర్థన: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,ఒక కస్టమర్ యొక్క కొనుగోలు ఆర్డర్ వ్యతిరేకంగా బహుళ సేల్స్ ఆర్డర్స్ అనుమతించు
 DocType: Student Group Instructor,Student Group Instructor,స్టూడెంట్ గ్రూప్ బోధకుడు
 DocType: Student Group Instructor,Student Group Instructor,స్టూడెంట్ గ్రూప్ బోధకుడు
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 మొబైల్ లేవు
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,ప్రధాన
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,ప్రధాన
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,వేరియంట్
 DocType: Naming Series,Set prefix for numbering series on your transactions,మీ లావాదేవీలపై సిరీస్ నంబరింగ్ కోసం సెట్ ఉపసర్గ
 DocType: Employee Attendance Tool,Employees HTML,ఉద్యోగులు HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,డిఫాల్ట్ BOM ({0}) ఈ అంశం లేదా దాని టెంప్లేట్ కోసం చురుకుగా ఉండాలి
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,డిఫాల్ట్ BOM ({0}) ఈ అంశం లేదా దాని టెంప్లేట్ కోసం చురుకుగా ఉండాలి
 DocType: Employee,Leave Encashed?,Encashed వదిలి?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ఫీల్డ్ నుండి అవకాశం తప్పనిసరి
 DocType: Email Digest,Annual Expenses,వార్షిక ఖర్చులు
 DocType: Item,Variants,రకరకాలు
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,కొనుగోలు ఆర్డర్ చేయండి
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,కొనుగోలు ఆర్డర్ చేయండి
 DocType: SMS Center,Send To,పంపే
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},లీవ్ పద్ధతి కోసం తగినంత సెలవు సంతులనం లేదు {0}
 DocType: Payment Reconciliation Payment,Allocated amount,కేటాయించింది మొత్తం
@@ -1962,6 +1998,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,స్టూడెంట్ గ్రూప్ శక్తి
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,జర్నల్ వ్యతిరేకంగా ఎంట్రీ {0} ఏదైనా సరిపోలని {1} ఎంట్రీ లేదు
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,అంచనాలు
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,శిక్షణ కార్యక్రమాలు
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},సీరియల్ అంశం ఏదీ ప్రవేశించింది నకిలీ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ఒక షిప్పింగ్ రూల్ ఒక పరిస్థితి
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,దయచేసి నమోదు చెయ్యండి
@@ -1971,7 +2008,7 @@
 DocType: Sales Order,To Deliver and Bill,బట్వాడా మరియు బిల్
 DocType: Student Group,Instructors,బోధకులు
 DocType: GL Entry,Credit Amount in Account Currency,ఖాతా కరెన్సీ లో క్రెడిట్ మొత్తం
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,బిఒఎం {0} సమర్పించాలి
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,బిఒఎం {0} సమర్పించాలి
 DocType: Authorization Control,Authorization Control,అధికార కంట్రోల్
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},రో # {0}: వేర్హౌస్ తిరస్కరించబడిన తిరస్కరించిన వస్తువు వ్యతిరేకంగా తప్పనిసరి {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,చెల్లింపు
@@ -1990,11 +2027,11 @@
 DocType: Quotation Item,Actual Qty,వాస్తవ ప్యాక్ చేసిన అంశాల
 DocType: Sales Invoice Item,References,సూచనలు
 DocType: Quality Inspection Reading,Reading 10,10 పఠనం
-DocType: Hub Settings,Hub Node,హబ్ నోడ్
+DocType: Hub Category,Hub Node,హబ్ నోడ్
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,మీరు నకిలీ అంశాలను నమోదు చేసారు. సరిదిద్ది మళ్లీ ప్రయత్నించండి.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,అసోసియేట్
 DocType: Asset Movement,Asset Movement,ఆస్తి ఉద్యమం
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,న్యూ కార్ట్
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,న్యూ కార్ట్
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} అంశం సీరియల్ అంశం కాదు
 DocType: SMS Center,Create Receiver List,స్వీకర్త జాబితా సృష్టించు
 DocType: Vehicle,Wheels,వీల్స్
@@ -2008,15 +2045,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,టెలికమ్యూనికేషన్స్
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),ప్యాకేజీ దూస్రా (మాత్రమే డ్రాఫ్ట్) లో ఒక భాగంగా ఉంది అని సూచిస్తుంది
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,చెల్లింపు ఎంట్రీ చేయండి
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},అంశం పరిమాణం {0} కంటే తక్కువ ఉండాలి {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},అంశం పరిమాణం {0} కంటే తక్కువ ఉండాలి {1}
 ,Sales Invoice Trends,సేల్స్ వాయిస్ ట్రెండ్లులో
 DocType: Leave Application,Apply / Approve Leaves,ఆకులు ఆమోదించండి / వర్తించు
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,కోసం
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,కోసం
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',లేదా &#39;మునుపటి రో మొత్తం&#39; &#39;మునుపటి రో మొత్తం మీద&#39; ఛార్జ్ రకం మాత్రమే ఉంటే వరుసగా సూచించవచ్చు
 DocType: Sales Order Item,Delivery Warehouse,డెలివరీ వేర్హౌస్
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,ఆర్థిక వ్యయం సెంటర్స్ చెట్టు.
 DocType: Serial No,Delivery Document No,డెలివరీ డాక్యుమెంట్ లేవు
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},కంపెనీ &#39;ఆస్తి తొలగింపు పై పెరుగుట / నష్టం ఖాతాకు&#39; సెట్ దయచేసి {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},కంపెనీ &#39;ఆస్తి తొలగింపు పై పెరుగుట / నష్టం ఖాతాకు&#39; సెట్ దయచేసి {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,కొనుగోలు రసీదులు నుండి అంశాలను పొందండి
 DocType: Serial No,Creation Date,సృష్టి తేదీ
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},{0} అంశం ధర జాబితా లో అనేకసార్లు కనిపిస్తుంది {1}
@@ -2027,12 +2064,13 @@
 DocType: Student,Student Mobile Number,స్టూడెంట్ మొబైల్ నంబర్
 DocType: Item,Has Variants,రకాల్లో
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,ప్రతిస్పందనని నవీకరించండి
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},మీరు ఇప్పటికే ఎంపిక నుండి అంశాలను రోజులో {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},మీరు ఇప్పటికే ఎంపిక నుండి అంశాలను రోజులో {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,మంత్లీ పంపిణీ పేరు
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,బ్యాచ్ ID తప్పనిసరి
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,బ్యాచ్ ID తప్పనిసరి
 DocType: Sales Person,Parent Sales Person,మాతృ సేల్స్ పర్సన్
-DocType: Purchase Invoice,Recurring Invoice,పునరావృత వాయిస్
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,అధిక నుండి తక్కువ
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,మొదట కార్యక్రమం ఎంచుకోండి
 DocType: Patient Appointment,Patient Age,పేషెంట్ యుగం
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,ప్రాజెక్ట్స్ మేనేజింగ్
 DocType: Supplier,Supplier of Goods or Services.,"వస్తు, సేవల సరఫరాదారు."
@@ -2040,8 +2078,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,కన్సల్టేషన్ చార్జీలను బుక్ చేయడానికి రోగిలో సెట్ చేయకపోతే డిఫాల్ట్ స్వీకరించదగిన ఖాతాలు ఉపయోగించబడతాయి.
 DocType: Vehicle Log,Fuel Price,ఇంధన ధర
 DocType: Budget,Budget,బడ్జెట్
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,ఓపెన్ సెట్
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,స్థిర ఆస్తి అంశం కాని స్టాక్ అంశం ఉండాలి.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,ఓపెన్ సెట్
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,స్థిర ఆస్తి అంశం కాని స్టాక్ అంశం ఉండాలి.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",అది ఒక ఆదాయం వ్యయం ఖాతా కాదు బడ్జెట్ వ్యతిరేకంగా {0} కేటాయించిన సాధ్యం కాదు
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,ఆర్జిత
 DocType: Student Admission,Application Form Route,అప్లికేషన్ ఫారం రూట్
@@ -2055,12 +2093,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,{0} అంశం సీరియల్ నాస్ కొరకు సెటప్ కాదు. అంశం మాస్టర్ తనిఖీ
 DocType: Maintenance Visit,Maintenance Time,నిర్వహణ సమయం
 ,Amount to Deliver,మొత్తం అందించేందుకు
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},అదే అంశం అనేకసార్లు నమోదు చేయబడింది. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,టర్మ్ ప్రారంభ తేదీ పదం సంబంధమున్న విద్యా సంవత్సరం ఇయర్ ప్రారంభ తేదీ కంటే ముందు ఉండకూడదు (అకాడమిక్ ఇయర్ {}). దయచేసి తేదీలు సరిచేసి మళ్ళీ ప్రయత్నించండి.
 DocType: Guardian,Guardian Interests,గార్డియన్ అభిరుచులు
 DocType: Naming Series,Current Value,కరెంట్ వేల్యూ
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,బహుళ ఆర్థిక సంవత్సరాలలో తేదీ {0} ఉన్నాయి. ఫిస్కల్ ఇయర్ లో కంపెనీని స్థాపించారు దయచేసి
 DocType: School Settings,Instructor Records to be created by,బోధకుడు రికార్డ్స్ సృష్టించాలి
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} రూపొందించినవారు
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} రూపొందించినవారు
 DocType: Delivery Note Item,Against Sales Order,అమ్మకాల ఆర్డర్ వ్యతిరేకంగా
 ,Serial No Status,సీరియల్ ఏ స్థితి
 DocType: Payment Entry Reference,Outstanding,అసాధారణ
@@ -2070,10 +2109,10 @@
 						must be greater than or equal to {2}",రో {0}: సెట్ చేసేందుకు {1} ఆవర్తకత నుండి మరియు తేదీ \ మధ్య తేడా కంటే ఎక్కువ లేదా సమానంగా ఉండాలి {2}
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,ఈ స్టాక్ ఉద్యమం ఆధారంగా. చూడండి {0} వివరాలకు
 DocType: Pricing Rule,Selling,సెల్లింగ్
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},మొత్తం {0} {1} వ్యతిరేకంగా తీసివేయబడుతుంది {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},మొత్తం {0} {1} వ్యతిరేకంగా తీసివేయబడుతుంది {2}
 DocType: Employee,Salary Information,జీతం ఇన్ఫర్మేషన్
 DocType: Sales Person,Name and Employee ID,పేరు మరియు Employee ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,గడువు తేదీ తేదీ చేసినది ముందు ఉండరాదు
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,గడువు తేదీ తేదీ చేసినది ముందు ఉండరాదు
 DocType: Website Item Group,Website Item Group,వెబ్సైట్ అంశం గ్రూప్
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,సుంకాలు మరియు పన్నుల
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,సూచన తేదీని ఎంటర్ చేయండి
@@ -2099,7 +2138,7 @@
 DocType: Issue,Resolution Details,రిజల్యూషన్ వివరాలు
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,కేటాయింపులు
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,అంగీకారం ప్రమాణం
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,పైన ఇచ్చిన పట్టికలో మెటీరియల్ అభ్యర్థనలు నమోదు చేయండి
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,పైన ఇచ్చిన పట్టికలో మెటీరియల్ అభ్యర్థనలు నమోదు చేయండి
 DocType: Item Attribute,Attribute Name,పేరు లక్షణం
 DocType: BOM,Show In Website,వెబ్సైట్ షో
 DocType: Shopping Cart Settings,Show Quantity in Website,లో వెబ్సైట్ పరిమాణం చూపించు
@@ -2108,7 +2147,7 @@
 DocType: Item Reorder,Check in (group),లో చెక్ (గ్రూపు)
 ,Qty to Order,ఆర్డర్ చేయటం అంశాల
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","లాభం / నష్టం బుక్ చేయబడుతుంది దీనిలో బాధ్యత లేదా ఈక్విటీ క్రింద ఖాతా తల,"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,అన్ని పనులు గాంట్ పటం.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,అన్ని పనులు గాంట్ పటం.
 DocType: Opportunity,Mins to First Response,మొదటి రెస్పాన్స్ ఎలా నిమిషాలు
 DocType: Pricing Rule,Margin Type,మార్జిన్ టైప్
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} గంటల
@@ -2130,36 +2169,36 @@
 DocType: Patient,Surgical History,శస్త్రచికిత్స చరిత్ర
 DocType: Employee,Resignation Letter Date,రాజీనామా ఉత్తరం తేదీ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,ధర నిబంధనలకు మరింత పరిమాణం ఆధారంగా ఫిల్టర్.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},ఉద్యోగికి తీసుకొన్న తేదీ సెట్ దయచేసి {0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},ఉద్యోగికి తీసుకొన్న తేదీ సెట్ దయచేసి {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},ఉద్యోగికి తీసుకొన్న తేదీ సెట్ దయచేసి {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},ఉద్యోగికి తీసుకొన్న తేదీ సెట్ దయచేసి {0}
 DocType: Task,Total Billing Amount (via Time Sheet),మొత్తం బిల్లింగ్ మొత్తం (సమయం షీట్ ద్వారా)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,తిరిగి కస్టమర్ రెవెన్యూ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) పాత్ర &#39;ఖర్చుల అప్రూవర్గా&#39; కలిగి ఉండాలి
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,పెయిర్
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,ఉత్పత్తి కోసం BOM మరియు ప్యాక్ చేసిన అంశాల ఎంచుకోండి
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,ఉత్పత్తి కోసం BOM మరియు ప్యాక్ చేసిన అంశాల ఎంచుకోండి
 DocType: Asset,Depreciation Schedule,అరుగుదల షెడ్యూల్
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,అమ్మకపు భాగస్వామిగా చిరునామాల్లో కాంటాక్ట్స్
 DocType: Bank Reconciliation Detail,Against Account,ఖాతా వ్యతిరేకంగా
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,హాఫ్ డే తేదీ తేదీ నుండి నేటివరకు మధ్య ఉండాలి
 DocType: Maintenance Schedule Detail,Actual Date,అసలు తేదీ
 DocType: Item,Has Batch No,బ్యాచ్ లేవు ఉంది
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},వార్షిక బిల్లింగ్: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},వార్షిక బిల్లింగ్: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),గూడ్స్ అండ్ సర్వీసెస్ టాక్స్ (జిఎస్టి భారతదేశం)
 DocType: Delivery Note,Excise Page Number,ఎక్సైజ్ పేజీ సంఖ్య
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","కంపెనీ, తేదీ నుండి మరియు తేదీ తప్పనిసరి"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,సంప్రదింపు నుండి పొందండి
 DocType: Asset,Purchase Date,కొనిన తేదీ
 DocType: Employee,Personal Details,వ్యక్తిగత వివరాలు
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},&#39;ఆస్తి అరుగుదల వ్యయ కేంద్రం&#39; కంపెనీవారి సెట్ దయచేసి {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},&#39;ఆస్తి అరుగుదల వ్యయ కేంద్రం&#39; కంపెనీవారి సెట్ దయచేసి {0}
 ,Maintenance Schedules,నిర్వహణ షెడ్యూల్స్
 DocType: Task,Actual End Date (via Time Sheet),ముగింపు తేదీ (సమయం షీట్ ద్వారా)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},మొత్తం {0} {1} వ్యతిరేకంగా {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},మొత్తం {0} {1} వ్యతిరేకంగా {2} {3}
 ,Quotation Trends,కొటేషన్ ట్రెండ్లులో
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},అంశం గ్రూప్ అంశం కోసం అంశాన్ని మాస్టర్ ప్రస్తావించలేదు {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,ఖాతాకు డెబిట్ ఒక స్వీకరించదగిన ఖాతా ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,ఖాతాకు డెబిట్ ఒక స్వీకరించదగిన ఖాతా ఉండాలి
 DocType: Shipping Rule Condition,Shipping Amount,షిప్పింగ్ మొత్తం
 DocType: Supplier Scorecard Period,Period Score,కాలం స్కోరు
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,వినియోగదారుడు జోడించండి
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,వినియోగదారుడు జోడించండి
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,పెండింగ్ మొత్తం
 DocType: Lab Test Template,Special,ప్రత్యేక
 DocType: Purchase Invoice Item,Conversion Factor,మార్పిడి ఫాక్టర్
@@ -2167,13 +2206,14 @@
 ,Vehicle Expenses,వాహనం ఖర్చులు
 DocType: Serial No,Invoice Details,ఇన్వాయిస్ వివరాలు
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},వినియోగ జీవితం అయిపోయిన తరువాత ఊహించిన విలువ కంటే ఎక్కువ లేదా సమానంగా ఉండాలి {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,ప్రారంభించండి
+DocType: Hub Category,Hub Category,హబ్ వర్గం
 DocType: Purchase Invoice,SEZ,సెజ్
 DocType: Purchase Receipt,Vehicle Number,వాహనం సంఖ్య
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,పునరావృత ఇన్వాయిస్ ఆపడానికి చేయబడే తేదీ
 DocType: Employee Loan,Loan Amount,అప్పు మొత్తం
 DocType: Program Enrollment,Self-Driving Vehicle,సెల్ఫ్-డ్రైవింగ్ వాహనం
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,సరఫరాదారు స్కోర్కార్డింగ్ స్టాండింగ్
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},రో {0}: మెటీరియల్స్ బిల్ అంశం దొరకలేదు {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},రో {0}: మెటీరియల్స్ బిల్ అంశం దొరకలేదు {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,మొత్తం కేటాయించింది ఆకులు {0} తక్కువ ఉండకూడదు కాలం కోసం ఇప్పటికే ఆమోదం ఆకులు {1} కంటే
 DocType: Journal Entry,Accounts Receivable,స్వీకరించదగిన ఖాతాలు
 ,Supplier-Wise Sales Analytics,సరఫరాదారు వివేకవంతుడు సేల్స్ Analytics
@@ -2185,7 +2225,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)",మాతృ కోర్సు (ఖాళీ వదిలి ఈ మాతృ కోర్సు భాగం కాదు ఉంటే)
 DocType: Leave Control Panel,Leave blank if considered for all employee types,అన్ని ఉద్యోగి రకాల భావిస్తారు ఉంటే ఖాళీ వదిలి
 DocType: Landed Cost Voucher,Distribute Charges Based On,పంపిణీ ఆరోపణలపై బేస్డ్
-apps/erpnext/erpnext/hooks.py +131,Timesheets,timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,timesheets
 DocType: HR Settings,HR Settings,ఆర్ సెట్టింగ్స్
 DocType: Salary Slip,net pay info,నికర పే సమాచారం
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,ఈ విలువ డిఫాల్ట్ సేల్స్ ప్రైస్ జాబితాలో నవీకరించబడింది.
@@ -2196,7 +2236,7 @@
 DocType: Patient,B Positive,B అనుకూలమైన
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","రో # {0}: ప్యాక్ చేసిన అంశాల 1, అంశం ఒక స్థిర ఆస్తి ఉంది ఉండాలి. దయచేసి బహుళ అంశాల కోసం ప్రత్యేక వరుస ఉపయోగించడానికి."
 DocType: Leave Block List Allow,Leave Block List Allow,బ్లాక్ జాబితా అనుమతించు వదిలి
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr ఖాళీ లేదా ఖాళీ ఉండరాదు
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr ఖాళీ లేదా ఖాళీ ఉండరాదు
 DocType: Patient Medical Record,Patient Medical Record,పేషెంట్ మెడికల్ రికార్డ్
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,కాని గ్రూప్ గ్రూప్
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,క్రీడలు
@@ -2212,9 +2252,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,మారక రేటు దొరక్కపోతే {0} కు {1} కీ తేదీ కోసం {2}. దయచేసి కరెన్సీ ఎక్స్ఛేంజ్ రికార్డు మానవీయంగా సృష్టించడానికి
 DocType: POS Profile,Price List,కొనుగోలు ధర
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} డిఫాల్ట్ ఫిస్కల్ ఇయర్ ఇప్పుడు. మార్పు ప్రభావితం కావడానికి మీ బ్రౌజర్ రిఫ్రెష్ చెయ్యండి.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,ఖర్చు వాదనలు
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,ఖర్చు వాదనలు
 DocType: Issue,Support,మద్దతు
 ,BOM Search,బిఒఎం శోధన
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",ఈ గిడ్డంగిలో &quot;స్టాక్ ఇన్&quot; లేదా &quot;నాట్ ఇన్ స్టాక్&quot; హబ్ మీద ఉన్న స్టాక్ ఆధారంగా ప్రచురించండి.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),మూసివేయడం (+ మొత్తాలు తెరవడం)
 DocType: Vehicle,Fuel Type,ఇంధన పద్ధతి
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,కంపెనీ లో కరెన్సీ రాయండి
@@ -2226,16 +2267,16 @@
 DocType: Healthcare Settings,Remind Before,ముందు గుర్తు చేయండి
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UoM మార్పిడి అంశం వరుసగా అవసరం {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","రో # {0}: రిఫరెన్స్ డాక్యుమెంట్ టైప్ అమ్మకాల ఉత్తర్వు ఒకటి, సేల్స్ వాయిస్ లేదా జర్నల్ ఎంట్రీ ఉండాలి"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","రో # {0}: రిఫరెన్స్ డాక్యుమెంట్ టైప్ అమ్మకాల ఉత్తర్వు ఒకటి, సేల్స్ వాయిస్ లేదా జర్నల్ ఎంట్రీ ఉండాలి"
 DocType: Salary Component,Deduction,తీసివేత
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,రో {0}: టైమ్ నుండి మరియు సమయం తప్పనిసరి.
 DocType: Stock Reconciliation Item,Amount Difference,మొత్తం తక్షణ
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},అంశం ధర కోసం జోడించిన {0} ధర జాబితా లో {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},అంశం ధర కోసం జోడించిన {0} ధర జాబితా లో {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,ఈ విక్రయాల వ్యక్తి యొక్క ఉద్యోగి ID నమోదు చేయండి
 DocType: Territory,Classification of Customers by region,ప్రాంతం ద్వారా వినియోగదారుడు వర్గీకరణ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,తేడా సొమ్ము సున్నా ఉండాలి
 DocType: Project,Gross Margin,స్థూల సరిహద్దు
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,మొదటి ఉత్పత్తి అంశం నమోదు చేయండి
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,మొదటి ఉత్పత్తి అంశం నమోదు చేయండి
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,గణించిన బ్యాంక్ స్టేట్మెంట్ సంతులనం
 DocType: Normal Test Template,Normal Test Template,సాధారణ టెస్ట్ మూస
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,వికలాంగ యూజర్
@@ -2245,21 +2286,22 @@
 DocType: Salary Slip,Total Deduction,మొత్తం తీసివేత
 ,Production Analytics,ఉత్పత్తి Analytics
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,ఇది ఈ రోగికి సంబంధించిన లావాదేవీల ఆధారంగా ఉంది. వివరాలు కోసం కాలక్రమం క్రింద చూడండి
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,ధర నవీకరించబడింది
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,ధర నవీకరించబడింది
 DocType: Employee,Date of Birth,పుట్టిన తేది
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,అంశం {0} ఇప్పటికే తిరిగి చెయ్యబడింది
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ఫిస్కల్ ఇయర్ ** ఆర్థిక సంవత్సరం సూచిస్తుంది. అన్ని అకౌంటింగ్ ఎంట్రీలు మరియు ఇతర ప్రధాన లావాదేవీల ** ** ఫిస్కల్ ఇయర్ వ్యతిరేకంగా చూడబడతాయి.
 DocType: Opportunity,Customer / Lead Address,కస్టమర్ / లీడ్ చిరునామా
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,సరఫరాదారు స్కోర్కార్డ్ సెటప్
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},హెచ్చరిక: అటాచ్మెంట్ చెల్లని SSL సర్టిఫికెట్ {0}
-DocType: Student Admission,Eligibility,అర్హత
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,అంచనా ప్రణాళిక పేరు
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},హెచ్చరిక: అటాచ్మెంట్ చెల్లని SSL సర్టిఫికెట్ {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","లీడ్స్ మీరు వ్యాపార, అన్ని మీ పరిచయాలను మరియు మరింత మీ లీడ్స్ జోడించడానికి పొందడానికి సహాయంగా"
 DocType: Production Order Operation,Actual Operation Time,అసలు ఆపరేషన్ సమయం
 DocType: Authorization Rule,Applicable To (User),వర్తించదగిన (వాడుకరి)
 DocType: Purchase Taxes and Charges,Deduct,తీసివేయు
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,ఉద్యోగ వివరణ
 DocType: Student Applicant,Applied,అప్లైడ్
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,మళ్ళీ తెరువు
 DocType: Sales Invoice Item,Qty as per Stock UOM,ప్యాక్ చేసిన అంశాల స్టాక్ UoM ప్రకారం
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 పేరు
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","తప్ప ప్రత్యేక అక్షరాలను &quot;-&quot; &quot;.&quot;, &quot;#&quot;, మరియు &quot;/&quot; సిరీస్ నామకరణ లో అనుమతించబడవు"
@@ -2271,7 +2313,7 @@
 DocType: Request for Quotation,Manufacturing Manager,తయారీ మేనేజర్
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},సీరియల్ లేవు {0} వరకు వారంటీ కింద {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,ప్యాకేజీలు స్ప్లిట్ డెలివరీ గమనించండి.
-apps/erpnext/erpnext/hooks.py +98,Shipments,ప్యాకేజీల
+apps/erpnext/erpnext/hooks.py +107,Shipments,ప్యాకేజీల
 DocType: Payment Entry,Total Allocated Amount (Company Currency),మొత్తం కేటాయించిన మొత్తం (కంపెనీ కరెన్సీ)
 DocType: Purchase Order Item,To be delivered to customer,కస్టమర్ పంపిణీ ఉంటుంది
 DocType: BOM,Scrap Material Cost,స్క్రాప్ మెటీరియల్ కాస్ట్
@@ -2294,8 +2336,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,అంశం వేరియంట్ సెట్టింగులు
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,కంపెనీ ఎంచుకోండి ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,అన్ని శాఖల కోసం భావిస్తారు ఉంటే ఖాళీ వదిలి
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","ఉపాధి రకాలు (శాశ్వత, కాంట్రాక్టు ఇంటర్న్ మొదలైనవి)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} అంశం తప్పనిసరి {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","ఉపాధి రకాలు (శాశ్వత, కాంట్రాక్టు ఇంటర్న్ మొదలైనవి)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} అంశం తప్పనిసరి {1}
 DocType: Process Payroll,Fortnightly,పక్ష
 DocType: Currency Exchange,From Currency,కరెన్సీ నుండి
 DocType: Vital Signs,Weight (In Kilogram),బరువు (కిలోగ్రాంలో)
@@ -2320,7 +2362,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,షెడ్యూల్ పొందడానికి &#39;రూపొందించండి షెడ్యూల్&#39; క్లిక్ చేయండి
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,కింది షెడ్యూల్ తొలగిచడంలో లోపాలున్నాయి:
 DocType: Bin,Ordered Quantity,క్రమ పరిమాణం
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",ఉదా &quot;బిల్డర్ల కోసం టూల్స్ బిల్డ్&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",ఉదా &quot;బిల్డర్ల కోసం టూల్స్ బిల్డ్&quot;
 DocType: Grading Scale,Grading Scale Intervals,గ్రేడింగ్ స్కేల్ విరామాలు
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {2} కోసం అకౌంటింగ్ ప్రవేశం మాత్రమే కరెన్సీ తయారు చేయవచ్చు: {3}
 DocType: Production Order,In Process,ప్రక్రియ లో
@@ -2344,11 +2386,10 @@
 DocType: Purchase Invoice,With Payment of Tax,పన్ను చెల్లింపుతో
 DocType: Expense Claim Detail,Expense Claim Detail,ఖర్చు చెప్పడం వివరాలు
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,సరఫరా కోసం మూడు ప్రతులు
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,సరైన ఖాతాను ఎంచుకోండి
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,సరైన ఖాతాను ఎంచుకోండి
 DocType: Item,Weight UOM,బరువు UoM
 DocType: Salary Structure Employee,Salary Structure Employee,జీతం నిర్మాణం ఉద్యోగి
 DocType: Patient,Blood Group,రక్తం గ్రూపు
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,పెండింగ్
 DocType: Course,Course Name,కోర్సు పేరు
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ఒక నిర్దిష్ట ఉద్యోగి సెలవు అప్లికేషన్లు ఆమోదించవచ్చు చేసిన వాడుకరులు
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,ఆఫీసు పరికరాలు
@@ -2367,7 +2408,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,ధర జాబితా సెట్ చెయ్యకపోతే ధరలు చూపబడవు
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,ఈ షిప్పింగ్ రూల్ ఒక దేశం పేర్కొనండి లేదా ప్రపంచవ్యాప్తం షిప్పింగ్ తనిఖీ చేయండి
 DocType: Stock Entry,Total Incoming Value,మొత్తం ఇన్కమింగ్ విలువ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,డెబిట్ అవసరం ఉంది
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,డెబిట్ అవసరం ఉంది
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets మీ జట్టు చేసిన కృత్యాలు కోసం సమయం, ఖర్చు మరియు బిల్లింగ్ ట్రాక్ సహాయం"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,కొనుగోలు ధర జాబితా
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,సరఫరాదారు స్కోర్కార్డ్ వేరియబుల్స్ యొక్క టెంప్లేట్లు.
@@ -2377,7 +2418,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,చెల్లింపు సయోధ్య
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,ఏసిపి వ్యక్తి యొక్క పేరు ఎంచుకోండి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,టెక్నాలజీ
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},మొత్తం చెల్లించని: {0}
+DocType: Hub Settings,Unregister from Hub,హబ్ నుండి నమోదుకాని
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},మొత్తం చెల్లించని: {0}
 DocType: BOM Website Operation,BOM Website Operation,బిఒఎం వెబ్సైట్ ఆపరేషన్
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,లెటర్ ఆఫర్
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,మెటీరియల్ అభ్యర్థనలు (MRP) మరియు ఉత్పత్తి ఆర్డర్స్ ఉత్పత్తి.
@@ -2389,7 +2431,9 @@
 DocType: Physician Schedule Time Slot,To Time,సమయం
 DocType: Authorization Rule,Approving Role (above authorized value),(అధికారం విలువ పై) Role ఆమోదిస్తోంది
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,ఖాతాకు క్రెడిట్ ఒక చెల్లించవలసిన ఖాతా ఉండాలి
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},బిఒఎం సూత్రం: {0} యొక్క పేరెంట్ లేదా బాల ఉండకూడదు {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,దయచేసి చెల్లించిన విద్యార్ధి దరఖాస్తుదారునికి తప్పనిసరిగా తప్పనిసరి అయిన స్టూడెంట్ అడ్మిషన్ ఎంచుకోండి
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},బిఒఎం సూత్రం: {0} యొక్క పేరెంట్ లేదా బాల ఉండకూడదు {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,దయచేసి ధర ప్రచురించడానికి ధర జాబితాను ఎంచుకోండి
 DocType: Production Order Operation,Completed Qty,పూర్తైన ప్యాక్ చేసిన అంశాల
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","{0}, మాత్రమే డెబిట్ ఖాతాల మరో క్రెడిట్ ప్రవేశానికి వ్యతిరేకంగా లింక్ చేయవచ్చు కోసం"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,ధర జాబితా {0} నిలిపివేయబడింది
@@ -2402,38 +2446,39 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} అంశం అవసరం సీరియల్ సంఖ్యలు {1}. మీరు అందించిన {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,ప్రస్తుత లెక్కింపు రేటు
 DocType: Item,Customer Item Codes,కస్టమర్ Item కోడులు
+DocType: Training Event,Advance,అడ్వాన్స్
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,పునరావృతమయ్యేలా చేయడానికి.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,ఎక్స్చేంజ్ పెరుగుట / నష్టం
 DocType: Opportunity,Lost Reason,లాస్ట్ కారణము
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,క్రొత్త చిరునామా
 DocType: Quality Inspection,Sample Size,నమూనా పరిమాణం
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,స్వీకరణపై డాక్యుమెంట్ నమోదు చేయండి
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,అన్ని అంశాలను ఇప్పటికే ఇన్వాయిస్ చేశారు
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;కేస్ నెం నుండి&#39; చెల్లని రాయండి
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',&#39;కేస్ నెం నుండి&#39; చెల్లని రాయండి
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,మరింత ఖర్చు కేంద్రాలు గుంపులు కింద తయారు చేయవచ్చు కానీ ఎంట్రీలు కాని గుంపులు వ్యతిరేకంగా తయారు చేయవచ్చు
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,వినియోగదారులు మరియు అనుమతులు
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},ఉత్పత్తి ఆర్డర్స్ రూపొందించబడింది: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},ఉత్పత్తి ఆర్డర్స్ రూపొందించబడింది: {0}
 DocType: Branch,Branch,బ్రాంచ్
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ముద్రణ మరియు బ్రాండింగ్
 DocType: Company,Total Monthly Sales,మొత్తం మంత్లీ సేల్స్
 DocType: Bin,Actual Quantity,వాస్తవ పరిమాణం
 DocType: Shipping Rule,example: Next Day Shipping,ఉదాహరణకు: తదుపరి డే షిప్పింగ్
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,దొరకలేదు సీరియల్ లేవు {0}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},సభ్యత్వము {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},సభ్యత్వము {0}
 DocType: Fee Schedule Program,Fee Schedule Program,ఫీజు షెడ్యూల్ ప్రోగ్రామ్
 DocType: Fee Schedule Program,Student Batch,స్టూడెంట్ బ్యాచ్
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,`టాబు నుండి &#39;* ఎంచుకున్నవివికీత సంకేతాలు` రోగి =&#39; {0} &#39;ఆర్డర్స్_డెటెట్ పరిమితి 1 ద్వారా
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,స్టూడెంట్ చేయండి
 DocType: Supplier Scorecard Scoring Standing,Min Grade,కనిష్ట గ్రేడ్
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},మీరు ప్రాజెక్ట్ సహకరించడానికి ఆహ్వానించబడ్డారు: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},వైద్యుడు {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},మీరు ప్రాజెక్ట్ సహకరించడానికి ఆహ్వానించబడ్డారు: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},వైద్యుడు {0}
 DocType: Leave Block List Date,Block Date,బ్లాక్ తేదీ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Doctype {0} లో కస్టమ్ ఫీల్డ్ సబ్స్క్రిప్షన్ ఐడిని జోడించండి
 DocType: Purchase Receipt,Supplier Delivery Note,సరఫరాదారు డెలివరీ గమనిక
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,ఇప్పుడు వర్తించు
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,ఇప్పుడు వర్తించు
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},అసలు ప్యాక్ చేసిన అంశాల {0} / వేచి ప్యాక్ చేసిన అంశాల {1}
 DocType: Purchase Invoice,E-commerce GSTIN,ఇ-కామర్స్ GSTIN
 DocType: Sales Order,Not Delivered,పంపిణీ లేదు
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,ఊహించిన తేదీ లావాదేవీ తేదీకి ముందు ఉండకూడదు
 ,Bank Clearance Summary,బ్యాంక్ క్లియరెన్స్ సారాంశం
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",సృష్టించు మరియు రోజువారీ వార మరియు నెలసరి ఇమెయిల్ Digests నిర్వహించండి.
 DocType: Appraisal Goal,Appraisal Goal,అప్రైసల్ గోల్
@@ -2441,12 +2486,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,భవనాలు
 DocType: Fee Schedule,Fee Structure,ఫీజు స్ట్రక్చర్
 DocType: Timesheet Detail,Costing Amount,ఖరీదు మొత్తం
-DocType: Student Admission,Application Fee,అప్లికేషన్ రుసుము
+DocType: Student Admission Program,Application Fee,అప్లికేషన్ రుసుము
 DocType: Process Payroll,Submit Salary Slip,వేతనం స్లిప్ సమర్పించండి
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,అంశం {0} ఉంది {1}% కోసం Maxiumm డిస్కౌంట్
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,అంశం {0} ఉంది {1}% కోసం Maxiumm డిస్కౌంట్
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,పెద్దమొత్తంలో దిగుమతి
 DocType: Sales Partner,Address & Contacts,చిరునామా &amp; కాంటాక్ట్స్
 DocType: SMS Log,Sender Name,పంపినవారు పేరు
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,ప్రమాణం ద్వారా క్రమబద్ధీకరించు
 DocType: POS Profile,[Select],[ఎంచుకోండి]
 DocType: Vital Signs,Blood Pressure (diastolic),రక్తపోటు (డయాస్టొలిక్)
 DocType: SMS Log,Sent To,పంపిన
@@ -2455,7 +2501,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,తదుపరి సంప్రదించండి తేదీ గతంలో ఉండకూడదు
 DocType: Company,For Reference Only.,సూచన ఓన్లి.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},వైద్యుడు {0} {1} లో అందుబాటులో లేదు
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,బ్యాచ్ ఎంచుకోండి లేవు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,బ్యాచ్ ఎంచుకోండి లేవు
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},చెల్లని {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,సూచన ఆహ్వానం
@@ -2471,15 +2517,15 @@
 DocType: Normal Test Items,Require Result Value,ఫలిత విలువ అవసరం
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,కేస్ నం 0 ఉండకూడదు
 DocType: Item,Show a slideshow at the top of the page,పేజీ ఎగువన ఒక స్లైడ్ చూపించు
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,దుకాణాలు
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,దుకాణాలు
 DocType: Project Type,Projects Manager,ప్రాజెక్ట్స్ మేనేజర్
 DocType: Serial No,Delivery Time,డెలివరీ సమయం
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,ఆధారంగా ఏజింగ్
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,అపాయింట్మెంట్ రద్దు చేయబడింది
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,అపాయింట్మెంట్ రద్దు చేయబడింది
 DocType: Item,End of Life,లైఫ్ ఎండ్
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,ప్రయాణం
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,సక్రియ లేదా డిఫాల్ట్ జీతం నిర్మాణం ఇచ్చిన తేదీలు ఉద్యోగుల {0} కనుగొనబడలేదు
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,ప్రయాణం
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,సక్రియ లేదా డిఫాల్ట్ జీతం నిర్మాణం ఇచ్చిన తేదీలు ఉద్యోగుల {0} కనుగొనబడలేదు
 DocType: Leave Block List,Allow Users,వినియోగదారులు అనుమతించు
 DocType: Purchase Order,Customer Mobile No,కస్టమర్ మొబైల్ లేవు
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,పునరావృత
@@ -2488,12 +2534,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,నవీకరణ ఖర్చు
 DocType: Item Reorder,Item Reorder,అంశం క్రమాన్ని మార్చు
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,జీతం షో స్లిప్
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,ట్రాన్స్ఫర్ మెటీరియల్
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,ట్రాన్స్ఫర్ మెటీరియల్
 DocType: Fees,Send Payment Request,చెల్లింపు అభ్యర్థనను పంపండి
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","కార్యకలాపాలు, నిర్వహణ ఖర్చు పేర్కొనండి మరియు మీ కార్యకలాపాలను ఎలాంటి ఒక ఏకైక ఆపరేషన్ ఇస్తాయి."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ఈ పత్రం పరిమితి {0} {1} అంశం {4}. మీరు తయారు మరొక {3} అదే వ్యతిరేకంగా {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,గండం పునరావృత సెట్ చెయ్యండి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,మార్పు ఎంచుకోండి మొత్తం ఖాతా
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,మార్పు ఎంచుకోండి మొత్తం ఖాతా
 DocType: Purchase Invoice,Price List Currency,ధర జాబితా కరెన్సీ
 DocType: Naming Series,User must always select,వినియోగదారు ఎల్లప్పుడూ ఎంచుకోవాలి
 DocType: Stock Settings,Allow Negative Stock,ప్రతికూల స్టాక్ అనుమతించు
@@ -2513,7 +2559,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Employee
 DocType: Sample Collection,Collected Time,సేకరించిన సమయం
 DocType: Company,Sales Monthly History,సేల్స్ మంత్లీ హిస్టరీ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,బ్యాచ్ ఎంచుకోండి
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,బ్యాచ్ ఎంచుకోండి
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} పూర్తిగా బిల్
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,కీలక గుర్తులు
 DocType: Training Event,End Time,ముగింపు సమయం
@@ -2521,16 +2567,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,చెల్లింపు తగ్గింపు లేదా నష్టం
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,సేల్స్ లేదా కొనుగోలు ప్రామాణిక ఒప్పందం నిబంధనలు.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,ఓచర్ ద్వారా గ్రూప్
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,మీరు ఖచ్చితంగా ఈ అపాయింట్మెంట్ను రద్దు చేయాలనుకుంటున్నారా?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,సేల్స్ పైప్లైన్
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},జీతం కాంపొనెంట్లో డిఫాల్ట్ ఖాతా సెట్ దయచేసి {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Required న
 DocType: Rename Tool,File to Rename,పేరుమార్చు దాఖలు
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},దయచేసి రో అంశం బిఒఎం ఎంచుకోండి {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},దయచేసి రో అంశం బిఒఎం ఎంచుకోండి {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},ఖాతా {0} {1} లో ఖాతా మోడ్ కంపెనీతో సరిపోలడం లేదు: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},అంశం కోసం లేదు పేర్కొన్న BOM {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,నిర్వహణ షెడ్యూల్ {0} ఈ అమ్మకాల ఆర్డర్ రద్దు ముందే రద్దు చేయాలి
+DocType: POS Profile,Applicable for Users,వినియోగదారులకు వర్తించేది
 DocType: Notification Control,Expense Claim Approved,ఖర్చు చెప్పడం ఆమోదించబడింది
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,ఉద్యోగి వేతనం స్లిప్ {0} ఇప్పటికే ఈ కాలానికి రూపొందించినవారు
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,ఉద్యోగి వేతనం స్లిప్ {0} ఇప్పటికే ఈ కాలానికి రూపొందించినవారు
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,ఫార్మాస్యూటికల్
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,కొనుగోలు వస్తువుల ధర
 DocType: Selling Settings,Sales Order Required,అమ్మకాల ఆర్డర్ అవసరం
@@ -2555,6 +2603,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,సంస్థ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,సంస్థ
 DocType: BOM Update Tool,BOM Update Tool,BOM అప్డేట్ టూల్
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","పార్టీ ఖాతా పేర్కొనబడలేదు, దయచేసి సంస్థలో సెటప్ డిఫాల్ట్ పార్టీ ఖాతా"
 DocType: SG Creation Tool Course,Student Group Name,స్టూడెంట్ గ్రూప్ పేరు
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,రుసుము సృష్టిస్తోంది
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,మీరు నిజంగా ఈ సంస్థ కోసం అన్ని లావాదేవీలు తొలగించాలనుకుంటున్నారా నిర్ధారించుకోండి. ఇది వంటి మీ మాస్టర్ డేటా అలాగే ఉంటుంది. ఈ చర్య రద్దు సాధ్యం కాదు.
@@ -2563,29 +2612,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ప్రణాళిక quanitity కంటే ఎక్కువ ఉండకూడదు ({2}) ఉత్పత్తి ఆర్డర్ {3}
 DocType: Shipping Rule,Shipping Rule Label,షిప్పింగ్ రూల్ లేబుల్
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,వాడుకరి ఫోరం
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,రా మెటీరియల్స్ ఖాళీ ఉండకూడదు.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","స్టాక్ అప్డేట్ కాలేదు, ఇన్వాయిస్ డ్రాప్ షిప్పింగ్ అంశం కలిగి."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,రా మెటీరియల్స్ ఖాళీ ఉండకూడదు.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","స్టాక్ అప్డేట్ కాలేదు, ఇన్వాయిస్ డ్రాప్ షిప్పింగ్ అంశం కలిగి."
 DocType: Lab Test Sample,Lab Test Sample,ల్యాబ్ పరీక్ష నమూనా
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,త్వరిత జర్నల్ ఎంట్రీ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,బిఒఎం ఏ అంశం agianst పేర్కొన్నారు ఉంటే మీరు రేటు మార్చలేరు
+DocType: Restaurant,Invoice Series Prefix,ఇన్వాయిస్ సిరీస్ ప్రిఫిక్స్
 DocType: Employee,Previous Work Experience,మునుపటి పని అనుభవం
 DocType: Stock Entry,For Quantity,పరిమాణం
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},వరుస వద్ద అంశం {0} ప్రణాలిక ప్యాక్ చేసిన అంశాల నమోదు చేయండి {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},వరుస వద్ద అంశం {0} ప్రణాలిక ప్యాక్ చేసిన అంశాల నమోదు చేయండి {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} సమర్పించిన లేదు
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,అంశాలను అభ్యర్థనలు.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,ప్రత్యేక నిర్మాణ ఆర్డర్ ప్రతి పూర్తయిన మంచి అంశం రూపొందించినవారు ఉంటుంది.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} తిరిగి పత్రంలో ప్రతికూల ఉండాలి
 ,Minutes to First Response for Issues,సమస్యలకు మొదటి రెస్పాన్స్ మినిట్స్
 DocType: Purchase Invoice,Terms and Conditions1,నిబంధనలు మరియు Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,ఇన్స్టిట్యూట్ యొక్క పేరు ఇది కోసం మీరు ఈ వ్యవస్థ ఏర్పాటు చేస్తారు.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,ఇన్స్టిట్యూట్ యొక్క పేరు ఇది కోసం మీరు ఈ వ్యవస్థ ఏర్పాటు చేస్తారు.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",ఈ తేదీ వరకు స్తంభింప అకౌంటింగ్ ఎంట్రీ ఎవరూ / అలా క్రింద పేర్కొన్న పాత్ర తప్ప ఎంట్రీ సవరించవచ్చు.
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,నిర్వహణ షెడ్యూల్ రూపొందించడానికి ముందు పత్రం సేవ్ దయచేసి
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,తాజా ధర అన్ని BOM లలో నవీకరించబడింది
 DocType: Fee Schedule,Successful,విజయవంతమైన
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,ప్రాజెక్టు హోదా
 DocType: UOM,Check this to disallow fractions. (for Nos),భిన్నాలు నిరాకరించేందుకు ఈ తనిఖీ. (NOS కోసం)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,క్రింది ఉత్పత్తి ఆర్డర్స్ ఏర్పరచారు:
-DocType: Student Admission,Naming Series (for Student Applicant),సిరీస్ నేమింగ్ (స్టూడెంట్ దరఖాస్తుదారు కోసం)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,క్రింది ఉత్పత్తి ఆర్డర్స్ ఏర్పరచారు:
+DocType: Student Admission Program,Naming Series (for Student Applicant),సిరీస్ నేమింగ్ (స్టూడెంట్ దరఖాస్తుదారు కోసం)
 DocType: Delivery Note,Transporter Name,ట్రాన్స్పోర్టర్ పేరు
 DocType: Authorization Rule,Authorized Value,ఆథరైజ్డ్ విలువ
 DocType: BOM,Show Operations,ఆపరేషన్స్ షో
@@ -2609,7 +2659,7 @@
 ,Employees working on a holiday,ఒక సెలవు ఉద్యోగులు
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,మార్క్ ప్రెజెంట్
 DocType: Project,% Complete Method,% పూర్తి విధానం
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,డ్రగ్
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,డ్రగ్
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},నిర్వహణ ప్రారంభ తేదీ సీరియల్ నో డెలివరీ తేదీ ముందు ఉండరాదు {0}
 DocType: Production Order,Actual End Date,వాస్తవిక ముగింపు తేదీ
 DocType: BOM,Operating Cost (Company Currency),ఆపరేటింగ్ వ్యయం (కంపెనీ కరెన్సీ)
@@ -2627,13 +2677,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,వాడుకరి ఆమోదిస్తోంది పాలన వర్తిస్తుంది యూజర్ అదే ఉండకూడదు
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),ప్రాథమిక రేటు (స్టాక్ UoM ప్రకారం)
 DocType: SMS Log,No of Requested SMS,అభ్యర్థించిన SMS సంఖ్య
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,పే లేకుండా వదిలి లేదు ఆమోదం అప్లికేషన్ లీవ్ రికార్డులు సరిపోలడం లేదు
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,పే లేకుండా వదిలి లేదు ఆమోదం అప్లికేషన్ లీవ్ రికార్డులు సరిపోలడం లేదు
 DocType: Campaign,Campaign-.####,ప్రచారం -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,తదుపరి దశలు
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,ఉత్తమమైన రేట్లు వద్ద పేర్కొన్న అంశాలను అందించండి
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,వాయిస్ చేయండి
 DocType: Selling Settings,Auto close Opportunity after 15 days,15 రోజుల తర్వాత ఆటో దగ్గరగా అవకాశం
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} యొక్క స్కోర్కార్డ్ స్టాండింగ్ వల్ల {0} కొనుగోలు ఆర్డర్లు అనుమతించబడవు.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} యొక్క స్కోర్కార్డ్ స్టాండింగ్ వల్ల {0} కొనుగోలు ఆర్డర్లు అనుమతించబడవు.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,ముగింపు సంవత్సరం
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,QUOT / లీడ్%
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,కాంట్రాక్ట్ ముగింపు తేదీ చేరడం తేదీ కంటే ఎక్కువ ఉండాలి
@@ -2669,7 +2719,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","అన్ని కొనుగోలు లావాదేవీల అన్వయించవచ్చు ప్రామాణిక పన్ను టెంప్లేట్. ఈ టెంప్లేట్ మొదలైనవి #### మీరు అన్ని ** అంశాలు ప్రామాణిక పన్ను రేటు ఉంటుంది ఇక్కడ నిర్వచించే పన్ను రేటు గమనిక &quot;నిర్వహణకు&quot; పన్ను తలలు మరియు &quot;షిప్పింగ్&quot;, &quot;బీమా&quot; వంటి ఇతర ఖర్చుల తలలు జాబితా కలిగి చేయవచ్చు * *. వివిధ అవుతున్నాయి ** ఆ ** అంశాలు ఉన్నాయి ఉంటే, వారు ** అంశం టాక్స్లు జత చేయాలి ** ** అంశం ** మాస్టర్ పట్టిక. #### లు వివరణ 1. గణన పద్ధతి: - ఈ (ప్రాథమిక మొత్తాన్ని మొత్తానికి) ** నికర మొత్తం ** ఉండకూడదు. - ** మునుపటి రో మొత్తం / మొత్తం ** న (సంచిత పన్నులు లేదా ఆరోపణలు కోసం). మీరు ఈ ఎంపికను ఎంచుకుంటే, పన్ను మొత్తాన్ని లేదా మొత్తం (పన్ను పట్టికలో) మునుపటి వరుసగా శాతంగా వర్తించబడుతుంది. - ** ** వాస్తవాధీన (పేర్కొన్న). 2. ఖాతా హెడ్: ఈ పన్ను 3. ఖర్చు సెంటర్ బుక్ ఉంటుంది కింద ఖాతా లెడ్జర్: పన్ను / ఛార్జ్ (షిప్పింగ్ లాంటి) ఆదాయం లేదా వ్యయం ఉంటే అది ఖర్చుతో సెంటర్ వ్యతిరేకంగా బుక్ అవసరం. 4. వివరణ: పన్ను వివరణ (ఆ ఇన్వాయిస్లు / కోట్స్ లో ప్రింట్ చేయబడుతుంది). 5. రేటు: పన్ను రేటు. 6. మొత్తం: పన్ను మొత్తం. 7. మొత్తం: ఈ పాయింట్ సంచిత మొత్తం. 8. రో నమోదు చేయండి: ఆధారంగా ఉంటే &quot;మునుపటి రో మొత్తం&quot; మీరు ఈ లెక్కింపు కోసం ఒక బేస్ (డిఫాల్ట్ మునుపటి వరుస ఉంది) గా తీసుకోబడుతుంది ఇది వరుసగా సంఖ్య ఎంచుకోవచ్చు. 9. పన్ను లేదా ఛార్జ్ పరిగణించండి: పన్ను / ఛార్జ్ విలువను మాత్రమే (మొత్తం భాగం కాదు) లేదా (అంశం విలువ జోడించడానికి లేదు) మొత్తం లేదా రెండూ ఉంటే ఈ విభాగంలో మీరు పేర్కొనవచ్చు. 10. జోడించండి లేదా తగ్గించండి: మీరు జోడించవచ్చు లేదా పన్ను తీసివేయు నిశ్చఇ."
 DocType: Homepage,Homepage,హోమ్పేజీ
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,వైద్యుడిని ఎంచుకోండి ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',అప్డేట్ ట్యాబ్నుసంబంధిత సెట్ ఇన్వాయిస్ = &#39;{0}&#39; పేరు పేరు = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd పరిమాణం
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},ఫీజు రికార్డ్స్ రూపొందించబడింది - {0}
 DocType: Asset Category Account,Asset Category Account,ఆస్తి వర్గం ఖాతా
@@ -2681,7 +2730,7 @@
 DocType: Asset,Manual,మాన్యువల్
 DocType: Salary Component Account,Salary Component Account,జీతం భాగం ఖాతా
 DocType: Global Defaults,Hide Currency Symbol,కరెన్సీ మానవ చిత్ర దాచు
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","ఉదా బ్యాంక్, నగదు, క్రెడిట్ కార్డ్"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","ఉదా బ్యాంక్, నగదు, క్రెడిట్ కార్డ్"
 DocType: Lead Source,Source Name,మూలం పేరు
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","వయోజనలో సాధారణ విశ్రాంతి రక్తపోటు సుమారు 120 mmHg సిస్టోలిక్, మరియు 80 mmHg డయాస్టొలిక్, సంక్షిప్తంగా &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,క్రెడిట్ గమనిక
@@ -2700,16 +2749,16 @@
 DocType: Patient,Occupation,వృత్తి
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,రో {0}: ప్రారంభ తేదీ ముగింపు తేదీ ముందు ఉండాలి
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),మొత్తం () ప్యాక్ చేసిన అంశాల
-DocType: Sales Invoice,This Document,ఈ డాక్యుమెంట్
 DocType: Installation Note Item,Installed Qty,ఇన్స్టాల్ ప్యాక్ చేసిన అంశాల
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,కొన్ని చెల్లుబాటు అయ్యే ఇమెయిల్ చిరునామాల కారణంగా ఇది కావచ్చు
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,మీరు జోడించబడ్డారు
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,శిక్షణ ఫలితం
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,శిక్షణ ఫలితం
 DocType: Purchase Invoice,Is Paid,చెల్లిస్తున్నప్పటికీ
 DocType: Salary Structure,Total Earning,మొత్తం ఎర్నింగ్
 DocType: Purchase Receipt,Time at which materials were received,పదార్థాలు అందుకున్న సమయంలో
 DocType: Stock Ledger Entry,Outgoing Rate,అవుట్గోయింగ్ రేటు
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,ఆర్గనైజేషన్ శాఖ మాస్టర్.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,ఆర్గనైజేషన్ శాఖ మాస్టర్.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,లేదా
 DocType: Sales Order,Billing Status,బిల్లింగ్ స్థితి
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ఒక సమస్యను నివేదించండి
@@ -2724,8 +2773,9 @@
 DocType: Notification Control,Sales Order Message,అమ్మకాల ఆర్డర్ సందేశం
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","మొదలైనవి కంపెనీ, కరెన్సీ, ప్రస్తుత ఆర్థిక సంవత్సరంలో వంటి సెట్ డిఫాల్ట్ విలువలు"
 DocType: Payment Entry,Payment Type,చెల్లింపు పద్ధతి
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,దయచేసి అంశం కోసం ఒక బ్యాచ్ ఎంచుకోండి {0}. ఈ అవసరాన్ని తీర్చగల ఒకే బ్యాచ్ దొరక్కపోతే
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,దయచేసి అంశం కోసం ఒక బ్యాచ్ ఎంచుకోండి {0}. ఈ అవసరాన్ని తీర్చగల ఒకే బ్యాచ్ దొరక్కపోతే
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,దయచేసి అంశం కోసం ఒక బ్యాచ్ ఎంచుకోండి {0}. ఈ అవసరాన్ని తీర్చగల ఒకే బ్యాచ్ దొరక్కపోతే
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,దయచేసి అంశం కోసం ఒక బ్యాచ్ ఎంచుకోండి {0}. ఈ అవసరాన్ని తీర్చగల ఒకే బ్యాచ్ దొరక్కపోతే
+DocType: Hub Category,Parent Category,మాతృ వర్గం
 DocType: Process Payroll,Select Employees,Select ఉద్యోగులు
 DocType: Opportunity,Potential Sales Deal,సంభావ్య సేల్స్ డీల్
 DocType: Complaint,Complaints,ఫిర్యాదులు
@@ -2762,7 +2812,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),డెలివరీ కోసం ప్యాకేజీ గుర్తింపు (ముద్రణ కోసం)
 DocType: Bin,Reserved Quantity,రిసర్వ్డ్ పరిమాణం
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,చెల్లుబాటు అయ్యే ఇమెయిల్ చిరునామాను నమోదు చేయండి
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,దయచేసి కార్ట్లో ఒక అంశాన్ని ఎంచుకోండి
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,దయచేసి కార్ట్లో ఒక అంశాన్ని ఎంచుకోండి
 DocType: Landed Cost Voucher,Purchase Receipt Items,కొనుగోలు రసీదులు అంశాలు
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,మలచుకొనుట పత్రాలు
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,బకాయిలో
@@ -2772,15 +2822,15 @@
 DocType: Payment Request,Amount in customer's currency,కస్టమర్ యొక్క కరెన్సీ లో మొత్తం
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,డెలివరీ
 DocType: Stock Reconciliation Item,Current Qty,ప్రస్తుత ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,సరఫరాదారులను జోడించండి
+DocType: Restaurant Menu,Restaurant Menu,రెస్టారెంట్ మెను
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,మునుపటి
 DocType: Appraisal Goal,Key Responsibility Area,కీ బాధ్యత ఏరియా
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","స్టూడెంట్ ఇస్తున్న మీరు విద్యార్థులకు హాజరు, లెక్కింపులు మరియు ఫీజు ట్రాక్ సహాయం"
 DocType: Payment Entry,Total Allocated Amount,మొత్తం కేటాయించిన సొమ్ము
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,శాశ్వత జాబితా కోసం డిఫాల్ట్ జాబితా ఖాతా సెట్
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,శాశ్వత జాబితా కోసం డిఫాల్ట్ జాబితా ఖాతా సెట్
 DocType: Item Reorder,Material Request Type,మెటీరియల్ అభ్యర్థన పద్ధతి
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},నుండి {0} కు వేతనాల కోసం Accural జర్నల్ ఎంట్రీ {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage పూర్తి, సేవ్ లేదు"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage పూర్తి, సేవ్ లేదు"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,రో {0}: UoM మార్పిడి ఫాక్టర్ తప్పనిసరి
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,గది సామర్థ్యం
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref
@@ -2819,16 +2869,18 @@
 DocType: Project,Task Completion,టాస్క్ పూర్తి
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,కాదు స్టాక్
 DocType: Appraisal,HR User,ఆర్ వాడుకరి
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,పన్నులు మరియు ఆరోపణలు తగ్గించబడుతూ
-apps/erpnext/erpnext/hooks.py +129,Issues,ఇష్యూస్
+apps/erpnext/erpnext/hooks.py +138,Issues,ఇష్యూస్
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},స్థితి ఒకటి ఉండాలి {0}
 DocType: Sales Invoice,Debit To,డెబిట్
+DocType: Restaurant Menu Item,Restaurant Menu Item,రెస్టారెంట్ మెను అంశం
 DocType: Delivery Note,Required only for sample item.,నమూనా మాత్రమే అంశం కోసం అవసరం.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,లావాదేవీ తరువాత వాస్తవంగా ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},తోబుట్టువుల జీతం స్లిప్ మధ్య దొరకలేదు {0} మరియు {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},తోబుట్టువుల జీతం స్లిప్ మధ్య దొరకలేదు {0} మరియు {1}
 ,Pending SO Items For Purchase Request,కొనుగోలు అభ్యర్థన SO పెండింగ్లో ఉన్న అంశాలు
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,స్టూడెంట్ అడ్మిషన్స్
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} నిలిపివేయబడింది
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,స్టూడెంట్ అడ్మిషన్స్
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} నిలిపివేయబడింది
 DocType: Supplier,Billing Currency,బిల్లింగ్ కరెన్సీ
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,ఎక్స్ ట్రా లార్జ్
@@ -2851,6 +2903,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,అవసరం సందర్శనల సంఖ్య చెప్పలేదు దయచేసి
 DocType: Stock Settings,Default Valuation Method,డిఫాల్ట్ లెక్కింపు విధానం
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,ఫీజు
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,నవీకరణ పురోగమనంలో ఉంది. కొంత సమయం పట్టవచ్చు.
 DocType: Vehicle Log,Fuel Qty,ఇంధన ప్యాక్ చేసిన అంశాల
 DocType: Production Order Operation,Planned Start Time,అనుకున్న ప్రారంభ సమయం
 DocType: Course,Assessment,అసెస్మెంట్
@@ -2866,7 +2919,7 @@
 DocType: Price List,Price List Master,ధర జాబితా మాస్టర్
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,మీరు సెట్ మరియు లక్ష్యాలు మానిటర్ విధంగా అన్ని సేల్స్ లావాదేవీలు బహుళ ** సేల్స్ పర్సన్స్ ** వ్యతిరేకంగా ట్యాగ్ చేయవచ్చు.
 ,S.O. No.,SO నం
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},లీడ్ నుండి కస్టమర్ సృష్టించడానికి దయచేసి {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},లీడ్ నుండి కస్టమర్ సృష్టించడానికి దయచేసి {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,రోగిని ఎంచుకోండి
 DocType: Price List,Applicable for Countries,దేశాలు వర్తించే
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,పారామీటర్ పేరు
@@ -2897,27 +2950,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,సరఫరాదారు ఇన్వాయిస్ వివరాలు
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ఖర్చుల / తేడా ఖాతా ({0}) ఒక &#39;లాభం లేదా నష్టం ఖాతా ఉండాలి
 DocType: Project,Copied From,నుండి కాపీ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},దోషం: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,కొరత
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},దోషం: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,కొరత
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} సంబంధం లేదు {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ఉద్యోగి {0} కోసం హాజరు ఇప్పటికే గుర్తించబడింది
 DocType: Packing Slip,If more than one package of the same type (for print),ఉంటే ఒకే రకమైన ఒకటి కంటే ఎక్కువ ప్యాకేజీ (ముద్రణ కోసం)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,దయచేసి రెస్టారెంట్ సెట్టింగ్లలో డిఫాల్ట్ కస్టమర్ను సెట్ చేయండి
 ,Salary Register,జీతం నమోదు
 DocType: Warehouse,Parent Warehouse,మాతృ వేర్హౌస్
 DocType: C-Form Invoice Detail,Net Total,నికర మొత్తం
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},డిఫాల్ట్ BOM అంశం దొరకలేదు {0} మరియు ప్రాజెక్ట్ {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},డిఫాల్ట్ BOM అంశం దొరకలేదు {0} మరియు ప్రాజెక్ట్ {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,వివిధ రకాల రుణాలపై నిర్వచించండి
 DocType: Bin,FCFS Rate,FCFS రేటు
 DocType: Payment Reconciliation Invoice,Outstanding Amount,అసాధారణ పరిమాణం
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),సమయం (నిమిషాల్లో)
 DocType: Project Task,Working,వర్కింగ్
 DocType: Stock Ledger Entry,Stock Queue (FIFO),స్టాక్ క్యూ (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,ఆర్థిక సంవత్సరం
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,ఆర్థిక సంవత్సరం
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} కంపెనీకి చెందినది కాదు {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,{0} కోసం ప్రమాణ స్కోర్ ఫంక్షన్ను పరిష్కరించలేరు. సూత్రం చెల్లుబాటు అవుతుందని నిర్ధారించుకోండి.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,గా ఖర్చు
 DocType: Healthcare Settings,Out Patient Settings,పేషెంట్ సెట్టింగులు
 DocType: Account,Round Off,ఆఫ్ రౌండ్
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,పరిమాణం సానుకూలంగా ఉండాలి
 ,Requested Qty,అభ్యర్థించిన ప్యాక్ చేసిన అంశాల
 DocType: Tax Rule,Use for Shopping Cart,షాపింగ్ కార్ట్ ఉపయోగించండి
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},విలువ {0} లక్షణం కోసం {1} లేదు చెల్లదు అంశం జాబితాలో ఉనికిలో అంశం లక్షణం విలువలు {2}
@@ -2926,7 +2981,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","ఆరోపణలు ఎంత మీ ఎంపిక ప్రకారం, అంశం అంశాల లేదా మొత్తం ఆధారంగా పంపిణీ చేయబడుతుంది"
 DocType: Maintenance Visit,Purposes,ప్రయోజనాల
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,కనీసం ఒక అంశం తిరిగి పత్రంలో ప్రతికూల పరిమాణం తో నమోదు చేయాలి
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,కోర్సులు జోడించండి
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ఆపరేషన్ {0} వర్క్స్టేషన్ ఏ అందుబాటులో పని గంటల కంటే ఎక్కువ {1}, బహుళ కార్యకలాపాలు లోకి ఆపరేషన్ విచ్ఛిన్నం"
 ,Requested,అభ్యర్థించిన
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,సంఖ్య వ్యాఖ్యలు
@@ -2938,6 +2992,7 @@
 DocType: Employee Loan,Repaid/Closed,తిరిగి చెల్లించడం / ముగించబడినది
 DocType: Item,Total Projected Qty,మొత్తం అంచనా ప్యాక్ చేసిన అంశాల
 DocType: Monthly Distribution,Distribution Name,పంపిణీ పేరు
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,సరఫరాదారు&gt; సరఫరాదారు రకం
 DocType: Course,Course Code,కోర్సు కోడ్
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},అంశం కోసం అవసరం నాణ్యత తనిఖీ {0}
 DocType: POS Settings,Use POS in Offline Mode,ఆఫ్లైన్ మోడ్లో POS ని ఉపయోగించండి
@@ -2948,14 +3003,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,భూభాగం ట్రీ నిర్వహించండి.
 DocType: Journal Entry Account,Sales Invoice,సేల్స్ వాయిస్
 DocType: Journal Entry Account,Party Balance,పార్టీ సంతులనం
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,డిస్కౌంట్ న వర్తించు దయచేసి ఎంచుకోండి
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,డిస్కౌంట్ న వర్తించు దయచేసి ఎంచుకోండి
 DocType: Company,Default Receivable Account,డిఫాల్ట్ స్వీకరించదగిన ఖాతా
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,పైన ఎంచుకున్న ప్రమాణం కోసం చెల్లించే మొత్తం జీతం కోసం బ్యాంక్ ఎంట్రీ సృష్టించు
 DocType: Physician,Physician Schedule,వైద్యుడు షెడ్యూల్
 DocType: Purchase Invoice,Deemed Export,డీమ్డ్ ఎక్స్పోర్ట్
 DocType: Stock Entry,Material Transfer for Manufacture,తయారీ కోసం మెటీరియల్ ట్రాన్స్ఫర్
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,డిస్కౌంట్ శాతం ఒక ధర జాబితా వ్యతిరేకంగా లేదా అన్ని ధర జాబితా కోసం గాని అన్వయించవచ్చు.
-DocType: Purchase Invoice,Half-yearly,సగం వార్షిక
+DocType: Subscription,Half-yearly,సగం వార్షిక
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,స్టాక్ కోసం అకౌంటింగ్ ఎంట్రీ
 DocType: Lab Test,LabTest Approver,ల్యాబ్ టెస్ట్ అప్ప్రోవర్
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,మీరు ఇప్పటికే అంచనా ప్రమాణం కోసం అంచనా {}.
@@ -2984,13 +3039,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,అదనపు చిన్న
 DocType: Company,Standard Template,ప్రామాణిక మూస
 DocType: Training Event,Theory,థియరీ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,హెచ్చరిక: Qty అభ్యర్థించిన మెటీరియల్ కనీస ఆర్డర్ ప్యాక్ చేసిన అంశాల కంటే తక్కువ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,హెచ్చరిక: Qty అభ్యర్థించిన మెటీరియల్ కనీస ఆర్డర్ ప్యాక్ చేసిన అంశాల కంటే తక్కువ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,ఖాతా {0} ఘనీభవించిన
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,సంస్థ చెందిన ఖాతాల ప్రత్యేక చార్ట్ తో లీగల్ సంస్థ / అనుబంధ.
 DocType: Payment Request,Mute Email,మ్యూట్ ఇమెయిల్
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","ఫుడ్, బేవరేజ్ పొగాకు"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},మాత్రమే వ్యతిరేకంగా చెల్లింపు చేయవచ్చు unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,కమిషన్ రేటు కంటే ఎక్కువ 100 ఉండకూడదు
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},మాత్రమే వ్యతిరేకంగా చెల్లింపు చేయవచ్చు unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,కమిషన్ రేటు కంటే ఎక్కువ 100 ఉండకూడదు
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,ముందుగా {0} నమోదు చేయండి
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,నుండి సంఖ్య ప్రత్యుత్తరాలు
@@ -3008,10 +3063,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,కలర్
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,అసెస్మెంట్ ప్రణాళిక ప్రమాణం
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,కొనుగోలు ఆర్డర్లు అడ్డుకో
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,అనుమానాస్పదం
 DocType: Patient Appointment,Scheduled,షెడ్యూల్డ్
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,కొటేషన్ కోసం అభ్యర్థన.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,దయచేసి మానవ వనరులో HR ఉద్యోగ నామకరణ వ్యవస్థ సెటప్ చేయండి&gt; హెచ్ఆర్ సెట్టింగులు
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","&quot;నో&quot; మరియు &quot;సేల్స్ అంశం&quot; &quot;స్టాక్ అంశం ఏమిటంటే&quot; పేరు &quot;అవును&quot; ఉంది అంశాన్ని ఎంచుకుని, ఏ ఇతర ఉత్పత్తి కట్ట ఉంది దయచేసి"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,కస్టమర్ని ఎంచుకోండి
 DocType: Student Log,Academic,అకడమిక్
 DocType: Patient,Personal and Social History,వ్యక్తిగత మరియు సామాజిక చరిత్ర
 DocType: Fee Schedule,Fee Breakup for each student,ఫీజు ప్రతి విద్యార్థి కోసం విభజన
@@ -3021,7 +3077,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,వాల్యువేషన్ రేటు
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,డీజిల్
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,ధర జాబితా కరెన్సీ ఎంపిక లేదు
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,ధర జాబితా కరెన్సీ ఎంపిక లేదు
 apps/erpnext/erpnext/config/healthcare.py +46,Results,ఫలితాలు
 ,Student Monthly Attendance Sheet,స్టూడెంట్ మంత్లీ హాజరు షీట్
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Employee {0} ఇప్పటికే దరఖాస్తు చేశారు {1} మధ్య {2} మరియు {3}
@@ -3036,7 +3092,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,సేల్స్ భాగస్వాములు నిర్వహించండి.
 DocType: Quality Inspection,Inspection Type,ఇన్స్పెక్షన్ టైప్
 DocType: Fee Validity,Visited yet,ఇంకా సందర్శించారు
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,ఉన్న లావాదేవీతో గిడ్డంగులు సమూహం మార్చబడతాయి కాదు.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,ఉన్న లావాదేవీతో గిడ్డంగులు సమూహం మార్చబడతాయి కాదు.
 DocType: Assessment Result Tool,Result HTML,ఫలితం HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,గడువు ముగిసేది
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,స్టూడెంట్స్ జోడించండి
@@ -3063,7 +3119,7 @@
 DocType: Healthcare Settings,Result Printed,ఫలితం ముద్రించబడింది
 DocType: Asset Category Account,Depreciation Expense Account,అరుగుదల వ్యయం ఖాతా
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,ప్రొబేషనరీ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},వీక్షించండి {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},వీక్షించండి {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,కేవలం ఆకు నోడ్స్ లావాదేవీ అనుమతించబడతాయి
 DocType: Expense Claim,Expense Approver,ఖర్చుల అప్రూవర్గా
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,రో {0}: కస్టమర్ వ్యతిరేకంగా అడ్వాన్స్ క్రెడిట్ ఉండాలి
@@ -3074,7 +3130,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,తేదీసమయం కు
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,కోర్సు షెడ్యూల్స్ తొలగించారు:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,SMS పంపిణీ స్థితి నిర్వహించాల్సిన దినచర్య
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,సేల్స్ టార్గెట్ సెట్
 DocType: Accounts Settings,Make Payment via Journal Entry,జర్నల్ ఎంట్రీ ద్వారా చెల్లింపు చేయండి
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,ప్రింటెడ్ న
 DocType: Item,Inspection Required before Delivery,ఇన్స్పెక్షన్ డెలివరీ ముందు అవసరం
@@ -3082,7 +3137,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,పెండింగ్ చర్యలు
 DocType: Patient Appointment,Reminded,కు రిమైండ్
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,మీ ఆర్గనైజేషన్
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,మీ ఆర్గనైజేషన్
 DocType: Fee Component,Fees Category,ఫీజు వర్గం
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,తేదీ ఉపశమనం ఎంటర్ చెయ్యండి.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,ఆంట్
@@ -3094,7 +3149,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,క్రమాన్ని మార్చు స్థాయి
 DocType: Company,Chart Of Accounts Template,అకౌంట్స్ మూస చార్ట్
 DocType: Attendance,Attendance Date,హాజరు తేదీ
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},అంశం ధర {0} లో ధర జాబితా కోసం నవీకరించబడింది {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},అంశం ధర {0} లో ధర జాబితా కోసం నవీకరించబడింది {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ఎర్నింగ్ మరియు తీసివేత ఆధారంగా జీతం విడిపోవటం.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,పిల్లల నోడ్స్ తో ఖాతా లెడ్జర్ మార్చబడతాయి కాదు
 DocType: Purchase Invoice Item,Accepted Warehouse,అంగీకరించిన వేర్హౌస్
@@ -3110,9 +3165,10 @@
 ,Employee Birthday,Employee పుట్టినరోజు
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,స్టూడెంట్ బ్యాచ్ హాజరు టూల్
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,పరిమితి దాటి
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,షెడ్యూల్డ్ వరకు
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,వెంచర్ కాపిటల్
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,ఈ &#39;విద్యా సంవత్సరం&#39; ఒక విద్యాపరమైన పదం {0} మరియు &#39;టర్మ్ పేరు&#39; {1} ఇప్పటికే ఉంది. ఈ ప్రవేశాలు మార్చి మళ్ళీ ప్రయత్నించండి.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","అంశం {0} వ్యతిరేకంగా ఇప్పటికే లావాదేవీలు ఉన్నాయి, మీరు విలువ మార్చలేరు {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","అంశం {0} వ్యతిరేకంగా ఇప్పటికే లావాదేవీలు ఉన్నాయి, మీరు విలువ మార్చలేరు {1}"
 DocType: UOM,Must be Whole Number,మొత్తం సంఖ్య ఉండాలి
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(రోజుల్లో) కేటాయించిన కొత్త ఆకులు
 DocType: Purchase Invoice,Invoice Copy,వాయిస్ కాపీ
@@ -3122,7 +3178,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,ఇన్వాయిస్ సంఖ్యా
 DocType: Shopping Cart Settings,Orders,ఆర్డర్స్
 DocType: Employee Leave Approver,Leave Approver,అప్రూవర్గా వదిలి
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,దయచేసి బ్యాచ్ ఎంచుకోండి
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,దయచేసి బ్యాచ్ ఎంచుకోండి
 DocType: Assessment Group,Assessment Group Name,అసెస్మెంట్ గ్రూప్ పేరు
 DocType: Manufacturing Settings,Material Transferred for Manufacture,మెటీరియల్ తయారీకి బదిలీ
 DocType: Expense Claim,"A user with ""Expense Approver"" role",&quot;ఖర్చుల అప్రూవర్గా&quot; పాత్ర తో ఒక వినియోగదారు
@@ -3137,7 +3193,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,కాలం ముగింపు ఎంట్రీ
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,శాఖ ఎంచుకోండి ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,ఉన్న లావాదేవీలతో ఖర్చు సెంటర్ సమూహం మార్చబడతాయి కాదు
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},మొత్తం {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},మొత్తం {0} {1} {2} {3}
 DocType: Account,Depreciation,అరుగుదల
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),సరఫరాదారు (లు)
 DocType: Employee Attendance Tool,Employee Attendance Tool,ఉద్యోగి హాజరు టూల్
@@ -3148,10 +3204,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,చెల్లింపు ఎంట్రీలు {0} అన్ చేయబడినాయి
 DocType: GL Entry,Voucher No,ఓచర్ లేవు
 ,Lead Owner Efficiency,జట్టు యజమాని సమర్థత
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,అత్యంత ప్రజాదరణ
 DocType: Leave Allocation,Leave Allocation,కేటాయింపు వదిలి
 DocType: Payment Request,Recipient Message And Payment Details,గ్రహీత సందేశం మరియు చెల్లింపు వివరాలు
 DocType: Training Event,Trainer Email,శిక్షణ ఇమెయిల్
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,రూపొందించినవారు మెటీరియల్ అభ్యర్థనలు {0}
+DocType: Restaurant Reservation,No of People,ప్రజల సంఖ్య
 DocType: Production Planning Tool,Include sub-contracted raw materials,ఉప-ఒప్పంద ముడి పదార్థాలు చేర్చండి
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,నిబంధనలు ఒప్పందం మూస.
 DocType: Purchase Invoice,Address and Contact,చిరునామా మరియు సంప్రదించు
@@ -3160,10 +3218,11 @@
 DocType: Supplier,Last Day of the Next Month,వచ్చే నెల చివరి డే
 DocType: Support Settings,Auto close Issue after 7 days,7 రోజుల తరువాత ఆటో దగ్గరగా ఇష్యూ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ముందు కేటాయించబడతాయి కాదు వదిలేయండి {0}, సెలవు సంతులనం ఇప్పటికే క్యారీ-ఫార్వార్డ్ భవిష్యత్తులో సెలవు కేటాయింపు రికార్డు ఉన్నాడు, {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),గమనిక: కారణంగా / సూచన తేదీ {0} రోజు ద్వారా అనుమతి కస్టమర్ క్రెడిట్ రోజుల మించి (లు)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),గమనిక: కారణంగా / సూచన తేదీ {0} రోజు ద్వారా అనుమతి కస్టమర్ క్రెడిట్ రోజుల మించి (లు)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,స్టూడెంట్ దరఖాస్తుదారు
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,స్వీకర్త కోసం ORIGINAL
 DocType: Asset Category Account,Accumulated Depreciation Account,పోగుచేసిన తరుగుదల ఖాతా
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,ఈ ఇమెయిల్ ఆటోజెనరేటేడ్
 DocType: Stock Settings,Freeze Stock Entries,ఫ్రీజ్ స్టాక్ ఎంట్రీలు
 DocType: Program Enrollment,Boarding Student,బోర్డింగ్ విద్యార్థి
 DocType: Asset,Expected Value After Useful Life,వినియోగ జీవితం అయిపోయిన తరువాత ఆశిస్తున్న విలువ
@@ -3171,7 +3230,7 @@
 DocType: Activity Cost,Billing Rate,బిల్లింగ్ రేటు
 ,Qty to Deliver,పంపిణీ చేయడానికి అంశాల
 ,Stock Analytics,స్టాక్ Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,ఆపరేషన్స్ ఖాళీగా కాదు
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,ఆపరేషన్స్ ఖాళీగా కాదు
 DocType: Maintenance Visit Purpose,Against Document Detail No,డాక్యుమెంట్ వివరాలు వ్యతిరేకంగా ఏ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,పార్టీ టైప్ తప్పనిసరి
 DocType: Quality Inspection,Outgoing,అవుట్గోయింగ్
@@ -3193,7 +3252,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,కార్యాచరణ ఆధారంగా గ్రూప్ కోసం మానవీయంగా విద్యార్థులు ఎంచుకోండి
 DocType: Journal Entry,User Remark,వాడుకరి వ్యాఖ్య
 DocType: Lead,Market Segment,మార్కెట్ విభాగానికీ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},మొత్తం చెల్లించారు మొత్తం ప్రతికూల అసాధారణ మొత్తం కంటే ఎక్కువ ఉండకూడదు {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},మొత్తం చెల్లించారు మొత్తం ప్రతికూల అసాధారణ మొత్తం కంటే ఎక్కువ ఉండకూడదు {0}
 DocType: Supplier Scorecard Period,Variables,వేరియబుల్స్
 DocType: Employee Internal Work History,Employee Internal Work History,Employee అంతర్గత వర్క్ చరిత్ర
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),మూసివేయడం (డాక్టర్)
@@ -3222,21 +3281,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,నవీకరణలు పొందండి
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: ఖాతా {2} కంపెనీ చెందదు {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,మెటీరియల్ అభ్యర్థన {0} రద్దు లేదా ఆగిపోయిన
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,మేనేజ్మెంట్ వదిలి
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,మేనేజ్మెంట్ వదిలి
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,ఖాతా గ్రూప్
 DocType: Sales Order,Fully Delivered,పూర్తిగా పంపిణీ
 DocType: Lead,Lower Income,తక్కువ ఆదాయ
+DocType: Restaurant Order Entry,Current Order,ప్రస్తుత ఆర్డర్
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},మూల మరియు లక్ష్య గిడ్డంగి వరుసగా ఒకే ఉండకూడదు {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ఈ స్టాక్ సయోధ్య ఒక ప్రారంభ ఎంట్రీ నుండి తేడా ఖాతా, ఒక ఆస్తి / బాధ్యత రకం ఖాతా ఉండాలి"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},పంపించబడతాయి మొత్తాన్ని రుణ మొత్తం కంటే ఎక్కువ ఉండకూడదు {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,ప్రోగ్రామ్లకు వెళ్లండి
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},అంశం అవసరం ఆర్డర్ సంఖ్య కొనుగోలు {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,ఉత్పత్తి ఆర్డర్ సృష్టించలేదు
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,ఉత్పత్తి ఆర్డర్ సృష్టించలేదు
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;తేదీ నుండి&#39; తర్వాత &#39;తేదీ&#39; ఉండాలి
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},విద్యార్థిగా స్థితిని మార్చలేరు {0} విద్యార్ధి అప్లికేషన్ ముడిపడి ఉంటుంది {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},విద్యార్థిగా స్థితిని మార్చలేరు {0} విద్యార్ధి అప్లికేషన్ ముడిపడి ఉంటుంది {1}
 DocType: Asset,Fully Depreciated,పూర్తిగా విలువ తగ్గుతున్న
 ,Stock Projected Qty,స్టాక్ ప్యాక్ చేసిన అంశాల ప్రొజెక్టెడ్
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},చెందదు {0} కస్టమర్ ప్రొజెక్ట్ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},చెందదు {0} కస్టమర్ ప్రొజెక్ట్ {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,గుర్తించ హాజరు HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","సుభాషితాలు, ప్రతిపాదనలు ఉన్నాయి మీరు మీ వినియోగదారులకు పంపారు వేలం"
 DocType: Sales Order,Customer's Purchase Order,కస్టమర్ యొక్క కొనుగోలు ఆర్డర్
@@ -3247,8 +3307,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,దయచేసి Depreciations సంఖ్య బుక్ సెట్
 DocType: Supplier Scorecard Period,Calculations,గణాంకాలు
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,విలువ లేదా ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,ప్రొడక్షన్స్ ఆర్డర్స్ పెంచుతాడు సాధ్యం కాదు:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,ప్రొడక్షన్స్ ఆర్డర్స్ పెంచుతాడు సాధ్యం కాదు:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,నిమిషం
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,దయచేసి సెటప్&gt; సెట్టింగులు&gt; నామకరణ సిరీస్ ద్వారా {0} నామకరణ సిరీస్ను సెట్ చేయండి
 DocType: Purchase Invoice,Purchase Taxes and Charges,పన్నులు మరియు ఆరోపణలు కొనుగోలు
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,సరఫరాదారులకు వెళ్లండి
 ,Qty to Receive,స్వీకరించడానికి అంశాల
@@ -3261,7 +3322,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,ఖాతాకు క్రెడిట్ బాలన్స్ షీట్ ఖాతా ఉండాలి
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,అన్ని సరఫరాదారు రకాలు
 DocType: Global Defaults,Disable In Words,వర్డ్స్ ఆపివేయి
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,వస్తువు దానంతటదే లెక్కించబడ్డాయి లేదు ఎందుకంటే Item కోడ్ తప్పనిసరి
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,వస్తువు దానంతటదే లెక్కించబడ్డాయి లేదు ఎందుకంటే Item కోడ్ తప్పనిసరి
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},కొటేషన్ {0} కాదు రకం {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,నిర్వహణ షెడ్యూల్ అంశం
 DocType: Sales Order,%  Delivered,% పంపిణీ
@@ -3283,23 +3344,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,ఓపెనింగ్ సంతులనం ఈక్విటీ
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,సయోధ్య
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,మిగిలిన
 DocType: Appraisal,Appraisal,అప్రైసల్
 DocType: Purchase Invoice,GST Details,GST వివరాలు
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},సరఫరాదారు పంపిన ఇమెయిల్ {0}
+DocType: Item,Default Sales Unit of Measure,కొలత యొక్క డిఫాల్ట్ సేల్స్ యూనిట్
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,తేదీ పునరావృతమవుతుంది
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,సంతకం పెట్టడానికి అధికారం
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},ఒకటి ఉండాలి అప్రూవర్గా వదిలి {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,ఫీజులను సృష్టించండి
-DocType: Hub Settings,Seller Email,అమ్మకాల ఇమెయిల్
 DocType: Project,Total Purchase Cost (via Purchase Invoice),మొత్తం కొనుగోలు ఖర్చు (కొనుగోలు వాయిస్ ద్వారా)
 DocType: Training Event,Start Time,ప్రారంభ సమయం
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Select పరిమాణం
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Select పరిమాణం
 DocType: Customs Tariff Number,Customs Tariff Number,కస్టమ్స్ సుంకాల సంఖ్య
 DocType: Patient Appointment,Patient Appointment,పేషెంట్ నియామకం
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,రోల్ ఆమోదిస్తోంది పాలన వర్తిస్తుంది పాత్ర అదే ఉండకూడదు
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,ఈ ఇమెయిల్ డైజెస్ట్ నుండి సభ్యత్వాన్ని రద్దు
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,ఈ ఇమెయిల్ డైజెస్ట్ నుండి సభ్యత్వాన్ని రద్దు
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,ద్వారా సరఫరా పొందండి
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},అంశం కోసం {0} కనుగొనబడలేదు {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,కోర్సులు వెళ్ళండి
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,సందేశం పంపబడింది
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,పిల్లల నోడ్స్ తో ఖాతా లెడ్జర్ సెట్ కాదు
@@ -3312,11 +3376,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,పదార్థం తయారీ కోసం బదిలీ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,ఖాతా {0} చేస్తుంది ఉందో
 DocType: Project,Project Type,ప్రాజెక్ట్ పద్ధతి
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,ఈ టాస్క్ కోసం చైల్డ్ టాస్క్ ఉనికిలో ఉంది. మీరు ఈ విధిని తొలగించలేరు.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,గాని లక్ష్యాన్ని అంశాల లేదా లక్ష్యం మొత్తం తప్పనిసరి.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,వివిధ కార్యకలాపాలు ఖర్చు
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,మరిన్ని ఫలితాలు లేవు
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,వివిధ కార్యకలాపాలు ఖర్చు
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","ఈవెంట్స్ చేస్తోంది {0}, సేల్స్ పర్సన్స్ క్రింద జత ఉద్యోగి వాడుకరి ID లేదు నుండి {1}"
 DocType: Timesheet,Billing Details,బిల్లింగ్ వివరాలు
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,మూల మరియు లక్ష్య గిడ్డంగిలో భిన్నంగా ఉండాలి
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,మూల మరియు లక్ష్య గిడ్డంగిలో భిన్నంగా ఉండాలి
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},లేదు కంటే పాత స్టాక్ లావాదేవీలు అప్డేట్ అనుమతి {0}
 DocType: Purchase Invoice Item,PR Detail,పిఆర్ వివరాలు
 DocType: Sales Order,Fully Billed,పూర్తిగా కస్టమర్లకు
@@ -3342,7 +3408,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,వైర్ ట్రాన్స్ఫర్
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,అన్ని తనిఖీ
 DocType: Vehicle Log,Invoice Ref,వాయిస్ Ref
-DocType: Purchase Order,Recurring Order,పునరావృత ఆర్డర్
 DocType: Company,Default Income Account,డిఫాల్ట్ ఆదాయం ఖాతా
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,కస్టమర్ గ్రూప్ / కస్టమర్
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),మూసివేయని ఫిస్కల్ సంవత్సరాల లాభం / నష్టం (క్రెడిట్)
@@ -3356,9 +3421,9 @@
 DocType: Patient,A Negative,ప్రతికూలమైనది
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,ఇంకేమీ చూపించడానికి.
 DocType: Lead,From Customer,కస్టమర్ నుండి
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,కాల్స్
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,కాల్స్
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,ఒక ఉత్పత్తి
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,వంతులవారీగా
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,వంతులవారీగా
 DocType: Project,Total Costing Amount (via Time Logs),మొత్తం వ్యయంతో మొత్తం (టైమ్ దినచర్య ద్వారా)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,ఫీజు షెడ్యూల్ చేయండి
 DocType: Purchase Order Item Supplied,Stock UOM,స్టాక్ UoM
@@ -3382,7 +3447,7 @@
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,ఆకులు మరియు హాలిడే
 DocType: School Settings,Current Academic Term,ప్రస్తుత విద్యా టర్మ్
 DocType: Sales Order,Not Billed,బిల్ చేయబడలేదు
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,రెండు వేర్హౌస్ అదే కంపెనీకి చెందిన ఉండాలి
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,రెండు వేర్హౌస్ అదే కంపెనీకి చెందిన ఉండాలి
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,పరిచయాలు లేవు ఇంకా జోడించారు.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,అడుగుపెట్టాయి ఖర్చు ఓచర్ మొత్తం
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,సప్లయర్స్ పెంచింది బిల్లులు.
@@ -3391,7 +3456,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,డిస్కౌంట్ మొత్తం
 DocType: Purchase Invoice,Return Against Purchase Invoice,ఎగైనెస్ట్ కొనుగోలు వాయిస్ తిరిగి
 DocType: Item,Warranty Period (in days),(రోజుల్లో) వారంటీ వ్యవధి
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',update` tabPatient Appointment` సెట్ విక్రయాలు _invoice = &#39;{0}&#39; పేరు పేరు = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Guardian1 తో రిలేషన్
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,ఆపరేషన్స్ నుండి నికర నగదు
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,అంశం 4
@@ -3400,8 +3464,8 @@
 DocType: Journal Entry Account,Journal Entry Account,జర్నల్ ఎంట్రీ ఖాతా
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,స్టూడెంట్ గ్రూప్
 DocType: Shopping Cart Settings,Quotation Series,కొటేషన్ సిరీస్
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","ఒక అంశం అదే పేరుతో ({0}), అంశం గుంపు పేరు మార్చడానికి లేదా అంశం పేరు దయచేసి"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,దయచేసి కస్టమర్ ఎంచుకోండి
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","ఒక అంశం అదే పేరుతో ({0}), అంశం గుంపు పేరు మార్చడానికి లేదా అంశం పేరు దయచేసి"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,దయచేసి కస్టమర్ ఎంచుకోండి
 DocType: C-Form,I,నేను
 DocType: Company,Asset Depreciation Cost Center,ఆస్తి అరుగుదల వ్యయ కేంద్రం
 DocType: Sales Order Item,Sales Order Date,సేల్స్ ఆర్డర్ తేదీ
@@ -3410,6 +3474,7 @@
 DocType: Assessment Plan,Assessment Plan,అసెస్మెంట్ ప్రణాళిక
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,కస్టమర్ {0} సృష్టించబడింది.
 DocType: Stock Settings,Limit Percent,పరిమితి శాతం
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,ఏ గిడ్డంగిలో ప్రస్తుతం స్టాక్ లేదు
 ,Payment Period Based On Invoice Date,వాయిస్ తేదీ ఆధారంగా చెల్లింపు కాలం
 DocType: Sample Collection,No. of print,ప్రింట్ సంఖ్య
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},తప్పిపోయిన కరెన్సీ మారక {0}
@@ -3465,13 +3530,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,స్థూల పే - మొత్తం తీసివేత - లోన్ తిరిగి చెల్లించే
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,ప్రస్తుత BOM మరియు న్యూ BOM అదే ఉండకూడదు
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,జీతం స్లిప్ ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,జీతం స్లిప్ ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,రిటైర్మెంట్ డేట్ అఫ్ చేరడం తేదీ కంటే ఎక్కువ ఉండాలి
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,కోర్సు షెడ్యూల్ అయితే లోపాలున్నాయి:
 DocType: Sales Invoice,Against Income Account,ఆదాయపు ఖాతా వ్యతిరేకంగా
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% పంపిణీ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,అంశం {0}: క్రమ చేసిన అంశాల {1} కనీస క్రమంలో అంశాల {2} (అంశం లో నిర్వచించిన) కంటే తక్కువ ఉండకూడదు.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,అంశం {0}: క్రమ చేసిన అంశాల {1} కనీస క్రమంలో అంశాల {2} (అంశం లో నిర్వచించిన) కంటే తక్కువ ఉండకూడదు.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,మంత్లీ పంపిణీ శాతం
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,దయచేసి మరొక యూజర్గా లాగిన్ అవ్వండి.
 DocType: Territory,Territory Targets,భూభాగం టార్గెట్స్
 DocType: Delivery Note,Transporter Info,ట్రాన్స్పోర్టర్ సమాచారం
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},డిఫాల్ట్ {0} లో కంపెనీ సెట్ దయచేసి {1}
@@ -3479,13 +3545,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,అదే సరఫరాదారు అనేకసార్లు నమోదు చేసిన
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,స్థూల లాభం / నష్టం
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,ఆర్డర్ అంశం పంపినవి కొనుగోలు
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,కంపెనీ పేరు కంపెనీ ఉండకూడదు
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,కంపెనీ పేరు కంపెనీ ఉండకూడదు
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ముద్రణ టెంప్లేట్లు లెటర్ హెడ్స్.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ముద్రణ టెంప్లేట్లు కోసం శీర్షికలు ప్రొఫార్మా ఇన్వాయిస్ ఉదా.
 DocType: Program Enrollment,Walking,వాకింగ్
 DocType: Student Guardian,Student Guardian,స్టూడెంట్ గార్డియన్
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,వాల్యువేషన్ రకం ఆరోపణలు ఇన్క్లుసివ్ వంటి గుర్తించబడిన చేయవచ్చు
 DocType: POS Profile,Update Stock,నవీకరణ స్టాక్
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,చందాలో
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"అంశాలు, వివిధ UoM తప్పు (మొత్తం) నికర బరువు విలువ దారి తీస్తుంది. ప్రతి అంశం యొక్క నికర బరువు అదే UoM లో ఉంది నిర్ధారించుకోండి."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,బిఒఎం రేటు
 DocType: Asset,Journal Entry for Scrap,స్క్రాప్ జర్నల్ ఎంట్రీ
@@ -3533,15 +3600,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","వ్యవస్థ యూజర్ (లాగిన్) ID. సెట్ చేస్తే, అది అన్ని హెచ్ ఆర్ రూపాలు కోసం డిఫాల్ట్ అవుతుంది."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: నుండి {1}
 DocType: Task,depends_on,ఆధారపడి
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,మెటీరియల్స్ అన్ని బిల్లులో తాజా ధరను నవీకరించడానికి క్యూ. దీనికి కొన్ని నిమిషాలు పట్టవచ్చు.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,మెటీరియల్స్ అన్ని బిల్లులో తాజా ధరను నవీకరించడానికి క్యూ. దీనికి కొన్ని నిమిషాలు పట్టవచ్చు.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,కొత్త ఖాతా యొక్క పేరు. గమనిక: వినియోగదారులు మరియు సరఫరాదారులతో కోసం ఖాతాలను సృష్టించడం లేదు దయచేసి
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,దేశం వారీగా డిఫాల్ట్ చిరునామా టెంప్లేట్లు
 DocType: Sales Order Item,Supplier delivers to Customer,సరఫరాదారు కస్టమర్ కు అందిస్తాడు
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ఫారం / అంశం / {0}) స్టాక్ ముగిసింది
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},కారణంగా / సూచన తేదీ తర్వాత ఉండకూడదు {0}
+,Sales Payment Summary,సేల్స్ చెల్లింపు సారాంశం
+DocType: Restaurant,Restaurant,రెస్టారెంట్
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},కారణంగా / సూచన తేదీ తర్వాత ఉండకూడదు {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,డేటా దిగుమతి మరియు ఎగుమతి
 DocType: Patient,Account Details,ఖాతా వివరాలు
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,తోబుట్టువుల విద్యార్థులు దొరకలేదు
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,తోబుట్టువుల విద్యార్థులు దొరకలేదు
 DocType: Medical Department,Medical Department,మెడికల్ డిపార్ట్మెంట్
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,సరఫరాదారు స్కోర్కార్డింగ్ స్కోరింగ్ ప్రమాణం
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,వాయిస్ పోస్టింగ్ తేదీ
@@ -3552,7 +3621,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,దయచేసి పార్టీ ఎంచుకోవడం ముందు పోస్టింగ్ తేదిని ఎంచుకోండి
 DocType: Program Enrollment,School House,స్కూల్ హౌస్
 DocType: Serial No,Out of AMC,AMC యొక్క అవుట్
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,దయచేసి కొటేషన్స్ ఎంచుకోండి
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,దయచేసి కొటేషన్స్ ఎంచుకోండి
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,బుక్ Depreciations సంఖ్య Depreciations మొత్తం సంఖ్య కంటే ఎక్కువ ఉండకూడదు
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,నిర్వహణ సందర్శించండి చేయండి
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,సేల్స్ మాస్టర్ మేనేజర్ {0} పాత్ర కలిగిన వినియోగదారుకు సంప్రదించండి
@@ -3560,7 +3629,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,కంపెనీ (కాదు కస్టమర్ లేదా సరఫరాదారు) మాస్టర్.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ఈ ఈ విద్యార్థి హాజరు ఆధారంగా
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,స్టూడెంట్స్ లో లేవు
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,మరింత అంశాలు లేదా ఓపెన్ పూర్తి రూపం జోడించండి
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,మరింత అంశాలు లేదా ఓపెన్ పూర్తి రూపం జోడించండి
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,డెలివరీ గమనికలు {0} ఈ అమ్మకాల ఆర్డర్ రద్దు ముందే రద్దు చేయాలి
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,వినియోగదారులకు వెళ్లండి
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,చెల్లించిన మొత్తం పరిమాణం గ్రాండ్ మొత్తం కంటే ఎక్కువ ఉండకూడదు ఆఫ్ వ్రాయండి +
@@ -3580,37 +3649,40 @@
 DocType: Fee Schedule,Fee Schedule,ఫీజు షెడ్యూల్
 DocType: Hub Settings,Publish Availability,అందుబాటు ప్రచురించు
 DocType: Company,Create Chart Of Accounts Based On,అకౌంట్స్ బేస్డ్ న చార్ట్ సృష్టించు
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,గుంపుగా మార్చలేరు. చైల్డ్ విధులు ఉన్నాయి.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,పుట్టిన తేదీ నేడు కంటే ఎక్కువ ఉండకూడదు.
 ,Stock Ageing,స్టాక్ ఏజింగ్
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},స్టూడెంట్ {0} విద్యార్ధి దరఖాస్తుదారు వ్యతిరేకంగా ఉనికిలో {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),వృత్తాకార అడ్జస్ట్మెంట్ (కంపెనీ కరెన్సీ)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,సమయ పట్టిక
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,సమయ పట్టిక
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} &#39;{1}&#39; నిలిపివేయబడింది
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ఓపెన్ గా సెట్
 DocType: Cheque Print Template,Scanned Cheque,స్కాన్ చేసిన ప్రిపే
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,సమర్పిస్తోంది లావాదేవీలపై కాంటాక్ట్స్ ఆటోమేటిక్ ఇమెయిల్స్ పంపడం.
 DocType: Timesheet,Total Billable Amount,మొత్తం Billable మొత్తం
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,ఐటమ్ 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,ఆర్డర్ ఎంట్రీ
 DocType: Purchase Order,Customer Contact Email,కస్టమర్ సంప్రదించండి ఇమెయిల్
 DocType: Warranty Claim,Item and Warranty Details,అంశం మరియు వారంటీ వివరాలు
 DocType: Sales Team,Contribution (%),కాంట్రిబ్యూషన్ (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,గమనిక: చెల్లింపు ఎంట్రీ నుండి రూపొందించినవారు కాదు &#39;నగదు లేదా బ్యాంక్ ఖాతా&#39; పేర్కొనబడలేదు
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,ప్రాజెక్ట్ {0} ఇప్పటికే ఉంది
 DocType: Medical Department,Nursing User,నర్సింగ్ వాడుకరి
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,బాధ్యతలు
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,ఈ ఉల్లేఖన యొక్క కాలం చెల్లినది.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,ఈ ఉల్లేఖన యొక్క కాలం చెల్లినది.
 DocType: Expense Claim Account,Expense Claim Account,ఖర్చు చెప్పడం ఖాతా
 DocType: Accounts Settings,Allow Stale Exchange Rates,స్థిర మార్పిడి రేట్లు అనుమతించు
 DocType: Sales Person,Sales Person Name,సేల్స్ పర్సన్ పేరు
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,పట్టిక కనీసం 1 ఇన్వాయిస్ నమోదు చేయండి
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,వినియోగదారులను జోడించండి
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,వినియోగదారులను జోడించండి
 DocType: POS Item Group,Item Group,అంశం గ్రూప్
 DocType: Item,Safety Stock,భద్రత స్టాక్
 DocType: Healthcare Settings,Healthcare Settings,హెల్త్కేర్ సెట్టింగ్లు
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,కార్యానికి ప్రోగ్రెస్% కంటే ఎక్కువ 100 ఉండకూడదు.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,కార్యానికి ప్రోగ్రెస్% కంటే ఎక్కువ 100 ఉండకూడదు.
 DocType: Stock Reconciliation Item,Before reconciliation,సయోధ్య ముందు
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},కు {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),పన్నులు మరియు ఆరోపణలు చేర్చబడింది (కంపెనీ కరెన్సీ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,అంశం పన్ను రో {0} రకం పన్ను లేదా ఆదాయం వ్యయం లేదా విధింపదగిన యొక్క ఖాతా ఉండాలి
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,అంశం పన్ను రో {0} రకం పన్ను లేదా ఆదాయం వ్యయం లేదా విధింపదగిన యొక్క ఖాతా ఉండాలి
 DocType: Sales Order,Partly Billed,పాక్షికంగా గుర్తింపు పొందిన
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,అంశం {0} ఒక స్థిర ఆస్తి అంశం ఉండాలి
 DocType: Item,Default BOM,డిఫాల్ట్ BOM
@@ -3626,6 +3698,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,వేరియబుల్
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,డెలివరీ గమనిక
 DocType: Student,Student Email Address,స్టూడెంట్ ఇమెయిల్ అడ్రస్
+DocType: Item,Hub Warehouse,హబ్ వేర్హౌస్
 DocType: Physician Schedule Time Slot,From Time,సమయం నుండి
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,అందుబాటులో ఉంది:
 DocType: Notification Control,Custom Message,కస్టమ్ సందేశం
@@ -3634,9 +3707,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,స్టూడెంట్ అడ్రస్
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,స్టూడెంట్ అడ్రస్
 DocType: Purchase Invoice,Price List Exchange Rate,ధర జాబితా ఎక్స్చేంజ్ రేట్
+DocType: POS Profile,POS Profile Name,POS ప్రొఫైల్ పేరు
 DocType: Purchase Invoice Item,Rate,రేటు
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,ఇంటర్న్
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,చిరునామా పేరు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,చిరునామా పేరు
 DocType: Stock Entry,From BOM,బిఒఎం నుండి
 DocType: Assessment Code,Assessment Code,అసెస్మెంట్ కోడ్
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,ప్రాథమిక
@@ -3650,11 +3724,12 @@
 DocType: Salary Slip,Salary Structure,జీతం నిర్మాణం
 DocType: Account,Bank,బ్యాంక్
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,వైనానిక
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,ఇష్యూ మెటీరియల్
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,ఇష్యూ మెటీరియల్
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,పునరావృతమయ్యేటప్పుడు లోపం సంభవించింది
 DocType: Material Request Item,For Warehouse,వేర్హౌస్ కోసం
 DocType: Employee,Offer Date,ఆఫర్ తేదీ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,కొటేషన్స్
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,మీరు ఆఫ్లైన్ మోడ్లో ఉన్నాయి. మీరు నెట్వర్కు వరకు రీలోడ్ చేయలేరు.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,మీరు ఆఫ్లైన్ మోడ్లో ఉన్నాయి. మీరు నెట్వర్కు వరకు రీలోడ్ చేయలేరు.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,తోబుట్టువుల స్టూడెంట్ గ్రూప్స్ రూపొందించినవారు.
 DocType: Purchase Invoice Item,Serial No,సీరియల్ లేవు
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,మంత్లీ నంతవరకు మొత్తాన్ని రుణ మొత్తం కంటే ఎక్కువ ఉండకూడదు
@@ -3664,17 +3739,18 @@
 DocType: Salary Slip,Total Working Hours,మొత్తం వర్కింగ్ అవర్స్
 DocType: Subscription,Next Schedule Date,తదుపరి షెడ్యూల్ తేదీ
 DocType: Stock Entry,Including items for sub assemblies,ఉప శాసనసభలకు అంశాలు సహా
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,ఎంటర్ విలువ సానుకూల ఉండాలి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,అన్ని ప్రాంతాలు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,ఎంటర్ విలువ సానుకూల ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,అన్ని ప్రాంతాలు
 DocType: Purchase Invoice,Items,అంశాలు
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,విద్యార్థిని అప్పటికే చేరతాడు.
 DocType: Fiscal Year,Year Name,ఇయర్ పేరు
 DocType: Process Payroll,Process Payroll,ప్రాసెస్ పేరోల్
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,పని రోజుల కంటే ఎక్కువ సెలవులు ఈ నెల ఉన్నాయి.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,పని రోజుల కంటే ఎక్కువ సెలవులు ఈ నెల ఉన్నాయి.
 DocType: Product Bundle Item,Product Bundle Item,ఉత్పత్తి కట్ట అంశం
 DocType: Sales Partner,Sales Partner Name,సేల్స్ భాగస్వామి పేరు
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,కొటేషన్స్ కోసం అభ్యర్థన
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,కొటేషన్స్ కోసం అభ్యర్థన
 DocType: Payment Reconciliation,Maximum Invoice Amount,గరిష్టంగా ఇన్వాయిస్ మొత్తం
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,హెమటాలజీ
 DocType: Normal Test Items,Normal Test Items,సాధారణ టెస్ట్ అంశాలు
 DocType: Student Language,Student Language,స్టూడెంట్ భాషా
 apps/erpnext/erpnext/config/selling.py +23,Customers,వినియోగదారుడు
@@ -3686,10 +3762,11 @@
 DocType: Issue,Opening Time,ప్రారంభ సమయం
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,నుండి మరియు అవసరమైన తేదీలు
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,సెక్యూరిటీస్ అండ్ కమోడిటీ ఎక్స్చేంజెస్
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',వేరియంట్ కోసం మెజర్ అప్రమేయ యూనిట్ &#39;{0}&#39; మూస లో అదే ఉండాలి &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',వేరియంట్ కోసం మెజర్ అప్రమేయ యూనిట్ &#39;{0}&#39; మూస లో అదే ఉండాలి &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,బేస్డ్ న లెక్కించు
 DocType: Delivery Note Item,From Warehouse,గిడ్డంగి నుండి
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,మెటీరియల్స్ బిల్ తో ఏ ఐటంలు తయారీకి
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,మెటీరియల్స్ బిల్ తో ఏ ఐటంలు తయారీకి
+DocType: Restaurant,Default Customer,డిఫాల్ట్ కస్టమర్
 DocType: Assessment Plan,Supervisor Name,సూపర్వైజర్ పేరు
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,అదే రోజున నియామకం సృష్టించబడితే నిర్ధారించవద్దు
 DocType: Program Enrollment Course,Program Enrollment Course,ప్రోగ్రామ్ ఎన్రోల్మెంట్ కోర్సు
@@ -3717,7 +3794,7 @@
 DocType: Payment Entry,Internal Transfer,అంతర్గత బదిలీ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,చైల్డ్ ఖాతా ఈ ఖాతా అవసరమయ్యారు. మీరు ఈ ఖాతా తొలగించలేరు.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,గాని లక్ష్యాన్ని అంశాల లేదా లక్ష్యం మొత్తం తప్పనిసరి
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},డిఫాల్ట్ BOM అంశం కోసం ఉంది {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},డిఫాల్ట్ BOM అంశం కోసం ఉంది {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,మొదటి పోస్టింగ్ తేదీ దయచేసి ఎంచుకోండి
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,తేదీ తెరవడం తేదీ మూసివేయడం ముందు ఉండాలి
 DocType: Leave Control Panel,Carry Forward,కుంటున్న
@@ -3753,6 +3830,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,మొత్తం ప్రెజెంట్
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,అకౌంటింగ్ ప్రకటనలు
 DocType: Drug Prescription,Hour,అవర్
+DocType: Restaurant Order Entry,Last Sales Invoice,చివరి సేల్స్ ఇన్వాయిస్
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,కొత్త సీరియల్ లేవు వేర్హౌస్ కలిగి చేయవచ్చు. వేర్హౌస్ స్టాక్ ఎంట్రీ లేదా కొనుగోలు రసీదులు ద్వారా ఏర్పాటు చేయాలి
 DocType: Lead,Lead Type,లీడ్ టైప్
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,మీరు బ్లాక్ తేదీలు ఆకులు ఆమోదించడానికి అధికారం లేదు
@@ -3789,65 +3867,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,యూజర్లను సృష్టించండి
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,గ్రామ
 DocType: Supplier Scorecard,Per Month,ఒక నెలకి
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,తయారీకి పరిమాణం 0 కన్నా ఎక్కువ ఉండాలి.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,తయారీకి పరిమాణం 0 కన్నా ఎక్కువ ఉండాలి.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,నిర్వహణ కాల్ కోసం నివేదిక సందర్శించండి.
 DocType: Stock Entry,Update Rate and Availability,నవీకరణ రేటు మరియు అందుబాటు
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,శాతం మీరు అందుకుంటారు లేదా ఆదేశించింది పరిమాణం వ్యతిరేకంగా మరింత బట్వాడా అనుమతించబడతాయి. ఉదాహరణకు: మీరు 100 యూనిట్ల పురమాయించారు ఉంటే. మరియు మీ భత్యం అప్పుడు మీరు 110 యూనిట్ల అందుకోవడానికి అనుమతించబడతాయి 10% ఉంది.
 DocType: POS Customer Group,Customer Group,కస్టమర్ గ్రూప్
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),న్యూ బ్యాచ్ ID (ఆప్షనల్)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),న్యూ బ్యాచ్ ID (ఆప్షనల్)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),న్యూ బ్యాచ్ ID (ఆప్షనల్)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),న్యూ బ్యాచ్ ID (ఆప్షనల్)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},ఖర్చు ఖాతా అంశం తప్పనిసరి {0}
 DocType: BOM,Website Description,వెబ్సైట్ వివరణ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ఈక్విటీ నికర మార్పు
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,సరికొత్త
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,మొదటి కొనుగోలు వాయిస్ {0} రద్దు చేయండి
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ఇమెయిల్ అడ్రస్ కోసం ఇప్పటికే ఉనికిలో ఉంది, ప్రత్యేకంగా ఉండాలి {0}"
 DocType: Serial No,AMC Expiry Date,ఎఎంసి గడువు తేదీ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,స్వీకరణపై
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,స్వీకరణపై
 ,Sales Register,సేల్స్ నమోదు
 DocType: Daily Work Summary Settings Company,Send Emails At,వద్ద ఇమెయిల్స్ పంపడం
 DocType: Quotation,Quotation Lost Reason,కొటేషన్ లాస్ట్ కారణము
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,మీ డొమైన్ ఎంచుకోండి
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',టాబ్ పేషెంట్ నుండి * ఎంచుకోండి పేరు పేరు = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},లావాదేవీ ప్రస్తావన {0} నాటి {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},లావాదేవీ ప్రస్తావన {0} నాటి {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,సవరించడానికి ఉంది ఏమీ.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,ఫారమ్ వీక్షణ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,ఈ నెల పెండింగ్ కార్యకలాపాలకు సారాంశం
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,ఫారమ్ వీక్షణ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,ఈ నెల పెండింగ్ కార్యకలాపాలకు సారాంశం
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.",మిమ్మల్ని కాకుండా మీ సంస్థకు వినియోగదారులను జోడించండి.
 DocType: Customer Group,Customer Group Name,కస్టమర్ గ్రూప్ పేరు
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,ఇంకా వినియోగదారుడు లేవు!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,ఇంకా వినియోగదారుడు లేవు!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,లావాదేవి నివేదిక
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},రుణ మొత్తం గరిష్ట రుణ మొత్తం మించకూడదు {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,లైసెన్సు
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},సి ఫారం నుండి ఈ వాయిస్ {0} తొలగించడానికి దయచేసి {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},సి ఫారం నుండి ఈ వాయిస్ {0} తొలగించడానికి దయచేసి {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,మీరు కూడా గత ఆర్థిక సంవత్సరం సంతులనం ఈ ఆర్థిక సంవత్సరం ఆకులు ఉన్నాయి అనుకుంటే కుంటున్న దయచేసి ఎంచుకోండి
 DocType: GL Entry,Against Voucher Type,ఓచర్ పద్ధతి వ్యతిరేకంగా
 DocType: Physician,Phone (R),ఫోన్ (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,సమయ విభాగాలు జోడించబడ్డాయి
 DocType: Item,Attributes,గుణాలు
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,టెంప్లేట్ ప్రారంభించు
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,దయచేసి సెటప్&gt; సెట్టింగులు&gt; నామకరణ సిరీస్ ద్వారా {0} నామకరణ సిరీస్ను సెట్ చేయండి
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,ఖాతా ఆఫ్ వ్రాయండి నమోదు చేయండి
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,చివరి ఆర్డర్ తేదీ
 DocType: Patient,B Negative,బి నెగటివ్
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ఖాతా {0} చేస్తుంది కంపెనీ చెందినవి కాదు {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,వరుసగా {0} లో సీరియల్ సంఖ్యలు డెలివరీ గమనిక సరిపోలడం లేదు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,వరుసగా {0} లో సీరియల్ సంఖ్యలు డెలివరీ గమనిక సరిపోలడం లేదు
 DocType: Student,Guardian Details,గార్డియన్ వివరాలు
 DocType: C-Form,C-Form,సి ఫారం
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,బహుళ ఉద్యోగులకు మార్క్ హాజరు
 DocType: Vehicle,Chassis No,చట్రపు లేవు
 DocType: Payment Request,Initiated,ప్రారంభించిన
 DocType: Production Order,Planned Start Date,ప్రణాళిక ప్రారంభ తేదీ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,దయచేసి BOM ను ఎంచుకోండి
 DocType: Serial No,Creation Document Type,సృష్టి డాక్యుమెంట్ టైప్
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,ముగింపు తేదీ కంటే తేదీ ముగింపు తప్పక ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,ముగింపు తేదీ కంటే తేదీ ముగింపు తప్పక ఉండాలి
 DocType: Leave Type,Is Encash,Encash ఉంది
 DocType: Leave Allocation,New Leaves Allocated,కొత్త ఆకులు కేటాయించిన
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,ప్రాజెక్టు వారీగా డేటా కొటేషన్ అందుబాటులో లేదు
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,అంతం
 DocType: Project,Expected End Date,ఊహించినది ముగింపు తేదీ
 DocType: Budget Account,Budget Amount,బడ్జెట్ మొత్తం
 DocType: Appraisal Template,Appraisal Template Title,అప్రైసల్ మూస శీర్షిక
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},తేదీ నుండి {0} ఎంప్లాయ్ {1} ఉద్యోగి చేరిన తేదీ ముందు ఉండకూడదు {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,కమర్షియల్స్
 DocType: Patient,Alcohol Current Use,ఆల్కహాల్ కరెంట్ యూజ్
+DocType: Student Admission Program,Student Admission Program,స్టూడెంట్ అడ్మిషన్ ప్రోగ్రాం
 DocType: Payment Entry,Account Paid To,ఖాతా చెల్లింపు
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,మాతృ అంశం {0} స్టాక్ అంశం ఉండకూడదు
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,అన్ని ఉత్పత్తులు లేదా సేవలు.
@@ -3856,30 +3936,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} ఖాతా కోసం బడ్జెట్ {1} వ్యతిరేకంగా {2} {3} ఉంది {4}. ఇది మించి {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',రో {0} # ఖాతా రకం ఉండాలి &#39;స్థిర ఆస్తి&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,ప్యాక్ చేసిన అంశాల అవుట్
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,నిబంధనలు అమ్మకానికి షిప్పింగ్ మొత్తం లెక్కించేందుకు
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,మరియు అన్చెక్టెడ్ లో డిసేబుల్డ్
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,సిరీస్ తప్పనిసరి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,ఫైనాన్షియల్ సర్వీసెస్
 DocType: Student Sibling,Student ID,విద్యార్థి ID
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,సమయం చిట్టాలు చర్యలు రకాలు
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,సరఫరాదారు ఇమెయిల్
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,సమయం చిట్టాలు చర్యలు రకాలు
 DocType: Tax Rule,Sales,సేల్స్
 DocType: Stock Entry Detail,Basic Amount,ప్రాథమిక సొమ్ము
 DocType: Training Event,Exam,పరీక్షా
 DocType: Complaint,Complaint,ఫిర్యాదు
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},వేర్హౌస్ స్టాక్ అంశం అవసరం {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},వేర్హౌస్ స్టాక్ అంశం అవసరం {0}
 DocType: Leave Allocation,Unused leaves,ఉపయోగించని ఆకులు
 DocType: Patient,Alcohol Past Use,ఆల్కహాల్ పాస్ట్ యూజ్
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,బిల్లింగ్ రాష్ట్రం
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,ట్రాన్స్ఫర్
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),(ఉప అసెంబ్లీలను సహా) పేలింది BOM పొందు
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,ట్రాన్స్ఫర్
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),(ఉప అసెంబ్లీలను సహా) పేలింది BOM పొందు
 DocType: Authorization Rule,Applicable To (Employee),వర్తించదగిన (ఉద్యోగి)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,గడువు తేదీ తప్పనిసరి
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,గడువు తేదీ తప్పనిసరి
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,గుణానికి పెంపు {0} 0 ఉండకూడదు
 DocType: Journal Entry,Pay To / Recd From,నుండి / Recd పే
 DocType: Naming Series,Setup Series,సెటప్ సిరీస్
 DocType: Payment Reconciliation,To Invoice Date,తేదీ వాయిస్
 DocType: Supplier,Contact HTML,సంప్రదించండి HTML
 ,Inactive Customers,క్రియారహిత వినియోగదారుడు
+DocType: Student Admission Program,Maximum Age,గరిష్ఠ వయసు
 DocType: Landed Cost Voucher,LCV,ఎల్సీవీ
 DocType: Landed Cost Voucher,Purchase Receipts,కొనుగోలు రసీదులు
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,ఎలా ధర రూల్ వర్తించబడుతుంది?
@@ -3898,6 +3980,7 @@
 DocType: GL Entry,Remarks,విశేషాంశాలు
 DocType: Payment Entry,Account Paid From,ఖాతా నుండి చెల్లింపు
 DocType: Purchase Order Item Supplied,Raw Material Item Code,రా మెటీరియల్ Item కోడ్
+DocType: Task,Parent Task,మాతృ టాస్క్
 DocType: Journal Entry,Write Off Based On,బేస్డ్ న ఆఫ్ వ్రాయండి
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,లీడ్ చేయండి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,ముద్రణ మరియు స్టేషనరీ
@@ -3906,20 +3989,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","జీతం ఇప్పటికే మధ్య {0} మరియు {1}, అప్లికేషన్ కాలం వదిలి ఈ తేదీ పరిధి మధ్య ఉండకూడదు కాలానికి ప్రాసెస్."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,ఒక సీరియల్ నం సంస్థాపన రికార్డు
 DocType: Guardian Interest,Guardian Interest,గార్డియన్ వడ్డీ
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,POS ఇన్వాయిస్లు కోసం డిఫాల్ట్ విలువలను సెటప్ చేయండి
 apps/erpnext/erpnext/config/hr.py +177,Training,శిక్షణ
 DocType: Timesheet,Employee Detail,ఉద్యోగి వివరాలు
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ఇమెయిల్ ID
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ఇమెయిల్ ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,తదుపరి తేదీ రోజు మరియు నెల దినాన రిపీట్ సమానంగా ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,తదుపరి తేదీ రోజు మరియు నెల దినాన రిపీట్ సమానంగా ఉండాలి
 DocType: Lab Prescription,Test Code,టెస్ట్ కోడ్
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,వెబ్సైట్ హోమ్ కోసం సెట్టింగులు
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},{0} స్కోర్కార్డ్ స్టాండింగ్ కారణంగా {0} కోసం RFQ లు అనుమతించబడవు
 DocType: Offer Letter,Awaiting Response,రెస్పాన్స్ వేచిఉండి
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,పైన
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},మొత్తం పరిమాణం {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},చెల్లని లక్షణం {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},మొత్తం పరిమాణం {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},చెల్లని లక్షణం {0} {1}
 DocType: Supplier,Mention if non-standard payable account,చెప్పలేదు ప్రామాణికం కాని చెల్లించవలసిన ఖాతా ఉంటే
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},అదే అంశం అనేకసార్లు ఎంటర్ చెయ్యబడింది. {జాబితా}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',దయచేసి &#39;అన్ని అసెస్మెంట్ గుంపులు&#39; కంటే ఇతర అంచనా సమూహం ఎంచుకోండి
 DocType: Training Event Employee,Optional,ఐచ్ఛికము
 DocType: Salary Slip,Earning & Deduction,ఎర్నింగ్ &amp; తీసివేత
@@ -3943,11 +4026,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,ఉత్పత్తి కట్ట నుండి అంశాలు పొందండి
 DocType: Asset,Straight Line,సరళ రేఖ
 DocType: Project User,Project User,ప్రాజెక్ట్ యూజర్
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,స్ప్లిట్
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,స్ప్లిట్
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,స్ప్లిట్
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,స్ప్లిట్
 DocType: GL Entry,Is Advance,అడ్వాన్స్ ఉంది
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,తేదీ తేదీ మరియు హాజరును హాజరు తప్పనిసరి
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,"అవును లేదా సంఖ్య వంటి &#39;బహుకరించింది, మరలా ఉంది&#39; నమోదు చేయండి"
+DocType: Item,Default Purchase Unit of Measure,కొలత యొక్క డిఫాల్ట్ కొనుగోలు యూనిట్
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,చివరి కమ్యూనికేషన్ తేదీ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,చివరి కమ్యూనికేషన్ తేదీ
 DocType: Sales Team,Contact No.,సంప్రదించండి నం
@@ -3956,7 +4040,6 @@
 DocType: Production Order,Check if material transfer entry is not required,పదార్థం బదిలీ ఎంట్రీ అవసరం లేదు ఉంటే తనిఖీ
 DocType: Production Order,Check if material transfer entry is not required,పదార్థం బదిలీ ఎంట్రీ అవసరం లేదు ఉంటే తనిఖీ
 DocType: Program Enrollment Tool,Get Students From,నుండి స్టూడెంట్స్ పొందండి
-DocType: Hub Settings,Seller Country,అమ్మకాల దేశం
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,వెబ్ సైట్ లో అంశాలను ప్రచురించు
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,వంతులవారీగా మీ విద్యార్థులు గ్రూప్
 DocType: Authorization Rule,Authorization Rule,అధికార రూల్
@@ -3966,8 +4049,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,సేల్స్ పన్నులు మరియు ఆరోపణలు మూస
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),మొత్తం (క్రెడిట్)
 DocType: Repayment Schedule,Payment Date,చెల్లింపు తేదీ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,న్యూ బ్యాచ్ ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,న్యూ బ్యాచ్ ప్యాక్ చేసిన అంశాల
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,న్యూ బ్యాచ్ ప్యాక్ చేసిన అంశాల
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,న్యూ బ్యాచ్ ప్యాక్ చేసిన అంశాల
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,దుస్తులు &amp; ఉపకరణాలు
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,వెయిటెడ్ స్కోర్ ఫంక్షన్ పరిష్కరించలేము. సూత్రం చెల్లుబాటు అవుతుందని నిర్ధారించుకోండి.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,ఆర్డర్ సంఖ్య
@@ -3985,6 +4068,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","రో # {0}: ఆస్తి {1} సమర్పించిన కాదు, అది ఇప్పటికే ఉంది {2}"
 DocType: Tax Rule,Billing Country,బిల్లింగ్ దేశం
 DocType: Purchase Order Item,Expected Delivery Date,ఊహించినది డెలివరీ తేదీ
+DocType: Restaurant Order Entry,Restaurant Order Entry,రెస్టారెంట్ ఆర్డర్ ఎంట్రీ
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,డెబిట్ మరియు క్రెడిట్ {0} # సమాన కాదు {1}. తేడా ఉంది {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,వినోదం ఖర్చులు
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,మెటీరియల్ అభ్యర్థన చేయడానికి
@@ -3997,7 +4081,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,ఇప్పటికే లావాదేవీతో ఖాతా తొలగించడం సాధ్యం కాదు
 DocType: Vehicle,Last Carbon Check,చివరి కార్బన్ పరిశీలించడం
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,లీగల్ ఖర్చులు
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,దయచేసి వరుసగా న పరిమాణం ఎంచుకోండి
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,దయచేసి వరుసగా న పరిమాణం ఎంచుకోండి
 DocType: Purchase Invoice,Posting Time,పోస్టింగ్ సమయం
 DocType: Timesheet,% Amount Billed,% మొత్తం కస్టమర్లకు
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,టెలిఫోన్ ఖర్చులు
@@ -4010,6 +4094,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,కొత్త కస్టమర్ రెవెన్యూ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,ప్రయాణ ఖర్చులు
 DocType: Maintenance Visit,Breakdown,విభజన
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Doctype {0} లో కస్టమ్ ఫీల్డ్ చందాను జోడించు
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,ఖాతా: {0} కరెన్సీతో: {1} ఎంపిక సాధ్యం కాదు
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",తాజా వాల్యుయేషన్ రేట్ / ధర జాబితా రేటు / ముడి పదార్థాల చివరి కొనుగోలు రేట్ ఆధారంగా షెడ్యూలర్ ద్వారా స్వయంచాలకంగా BOM ధరని నవీకరించండి.
 DocType: Bank Reconciliation Detail,Cheque Date,ప్రిపే తేదీ
@@ -4034,7 +4119,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),మొత్తం బిల్లింగ్ మొత్తం (టైమ్ దినచర్య ద్వారా)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,సరఫరాదారు Id
 DocType: Payment Request,Payment Gateway Details,చెల్లింపు గేట్వే వివరాలు
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,పరిమాణం 0 కన్నా ఎక్కువ ఉండాలి
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,పరిమాణం 0 కన్నా ఎక్కువ ఉండాలి
 DocType: Journal Entry,Cash Entry,క్యాష్ ఎంట్రీ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,చైల్డ్ నోడ్స్ మాత్రమే &#39;గ్రూప్&#39; రకం నోడ్స్ క్రింద రూపొందించినవారు చేయవచ్చు
 DocType: Leave Application,Half Day Date,హాఫ్ డే తేదీ
@@ -4052,12 +4137,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,గమనిక: అంశం {0} అనేకసార్లు ఎంటర్
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,అన్ని కాంటాక్ట్స్.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,కంపెనీ సంక్షిప్తీకరణ
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,వాడుకరి {0} ఉనికిలో లేదు
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,వాడుకరి {0} ఉనికిలో లేదు
 DocType: Subscription,SUB-,ఉప
 DocType: Item Attribute Value,Abbreviation,సంక్షిప్త
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,చెల్లింపు ఎంట్రీ ఇప్పటికే ఉంది
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} పరిమితులు మించిపోయింది నుండి authroized లేదు
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,జీతం టెంప్లేట్ మాస్టర్.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,పాథాలజీ
+DocType: Restaurant Order Entry,Restaurant Table,రెస్టారెంట్ టేబుల్
 DocType: Leave Type,Max Days Leave Allowed,మాక్స్ డేస్ లీవ్ అనుమతించబడినవి
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,షాపింగ్ కార్ట్ సెట్ పన్ను రూల్
 DocType: Purchase Invoice,Taxes and Charges Added,పన్నులు మరియు ఆరోపణలు చేర్చబడింది
@@ -4069,10 +4156,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,లీడ్స్ లేదా వినియోగదారుడు కోట్స్.
 DocType: Stock Settings,Role Allowed to edit frozen stock,పాత్ర ఘనీభవించిన స్టాక్ సవరించడానికి అనుమతించబడినవి
 ,Territory Target Variance Item Group-Wise,భూభాగం టార్గెట్ విస్తృతి అంశం గ్రూప్-వైజ్
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,అన్ని కస్టమర్ సమూహాలు
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,అన్ని కస్టమర్ సమూహాలు
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,పోగుచేసిన మంత్లీ
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} తప్పనిసరి. బహుశా కరెన్సీ ఎక్స్ఛేంజ్ రికార్డు {1} {2} కోసం సృష్టించబడలేదు.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,పన్ను మూస తప్పనిసరి.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,పన్ను మూస తప్పనిసరి.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,ఖాతా {0}: మాతృ ఖాతా {1} ఉనికిలో లేదు
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),ధర జాబితా రేటు (కంపెనీ కరెన్సీ)
 DocType: Products Settings,Products Settings,ఉత్పత్తులు సెట్టింగులు
@@ -4098,13 +4185,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,అంశం వైజ్ పన్ను వివరాలు
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,ఇన్స్టిట్యూట్ సంక్షిప్తీకరణ
 ,Item-wise Price List Rate,అంశం వారీగా ధర జాబితా రేటు
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,సరఫరాదారు కొటేషన్
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,సరఫరాదారు కొటేషన్
 DocType: Quotation,In Words will be visible once you save the Quotation.,మీరు కొటేషన్ సేవ్ ఒకసారి వర్డ్స్ కనిపిస్తుంది.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},మొత్తము ({0}) వరుసలో ఒక భిన్నం ఉండకూడదు {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},మొత్తము ({0}) వరుసలో ఒక భిన్నం ఉండకూడదు {1}
 DocType: Consultation,C-,సి
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},బార్కోడ్ {0} ఇప్పటికే అంశం ఉపయోగిస్తారు {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},బార్కోడ్ {0} ఇప్పటికే అంశం ఉపయోగిస్తారు {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,షిప్పింగ్ ఖర్చులు జోడించడం కోసం రూల్స్.
 DocType: Item,Opening Stock,తెరవడం స్టాక్
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,కస్టమర్ అవసరం
@@ -4122,9 +4209,8 @@
 DocType: Customer,From Lead,లీడ్ నుండి
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ఆర్డర్స్ ఉత్పత్తి కోసం విడుదల చేసింది.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,ఫిస్కల్ ఇయర్ ఎంచుకోండి ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS ప్రొఫైల్ POS ఎంట్రీ చేయడానికి అవసరం
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS ప్రొఫైల్ POS ఎంట్రీ చేయడానికి అవసరం
 DocType: Program Enrollment Tool,Enroll Students,విద్యార్ధులను నమోదు
-DocType: Hub Settings,Name Token,పేరు టోకెన్
 DocType: Lab Test,Approved Date,ఆమోదించబడిన తేదీ
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ప్రామాణిక సెల్లింగ్
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,కనీసం ఒక గిడ్డంగి తప్పనిసరి
@@ -4142,7 +4228,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,మానవ వనరుల
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,చెల్లింపు సయోధ్య చెల్లింపు
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,పన్ను ఆస్తులను
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},ఉత్పత్తి ఆర్డర్ ఉంది {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},ఉత్పత్తి ఆర్డర్ ఉంది {0}
 DocType: BOM Item,BOM No,బిఒఎం లేవు
 DocType: Instructor,INS/,ఐఎన్ఎస్ /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,జర్నల్ ఎంట్రీ {0} {1} లేదా ఇప్పటికే ఇతర రసీదును జతచేసేందుకు ఖాతా లేదు
@@ -4162,8 +4248,8 @@
 DocType: Currency Exchange,To Currency,కరెన్సీ
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,క్రింది వినియోగదారులకు బ్లాక్ రోజులు లీవ్ అప్లికేషన్స్ ఆమోదించడానికి అనుమతించు.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,ఖర్చు చెప్పడం రకాలు.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},దాని {1} సెల్లింగ్ అంశం కోసం రేటు {0} కంటే తక్కువగా ఉంటుంది. సెల్లింగ్ రేటు ఉండాలి కనీసం {2}
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},దాని {1} సెల్లింగ్ అంశం కోసం రేటు {0} కంటే తక్కువగా ఉంటుంది. సెల్లింగ్ రేటు ఉండాలి కనీసం {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},దాని {1} సెల్లింగ్ అంశం కోసం రేటు {0} కంటే తక్కువగా ఉంటుంది. సెల్లింగ్ రేటు ఉండాలి కనీసం {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},దాని {1} సెల్లింగ్ అంశం కోసం రేటు {0} కంటే తక్కువగా ఉంటుంది. సెల్లింగ్ రేటు ఉండాలి కనీసం {2}
 DocType: Item,Taxes,పన్నులు
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,చెల్లింపు మరియు పంపిణీ
 DocType: Project,Default Cost Center,డిఫాల్ట్ ఖర్చు సెంటర్
@@ -4177,15 +4263,15 @@
 DocType: Employee Loan,Fully Disbursed,పూర్తిగా పంపించబడతాయి
 DocType: Maintenance Visit,Customer Feedback,కస్టమర్ అభిప్రాయం
 DocType: Account,Expense,ఖర్చుల
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,స్కోరు గరిష్ట స్కోరు కంటే ఎక్కువ ఉండకూడదు
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,స్కోరు గరిష్ట స్కోరు కంటే ఎక్కువ ఉండకూడదు
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,వినియోగదారుడు మరియు సరఫరాదారులు
 DocType: Item Attribute,From Range,రేంజ్ నుండి
 DocType: BOM,Set rate of sub-assembly item based on BOM,BOM ఆధారంగా సబ్-అసోసియేషన్ ఐటెమ్ రేట్ను అమర్చండి
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},ఫార్ములా లేదా స్థితిలో వాక్యనిర్మాణ దోషం: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},ఫార్ములా లేదా స్థితిలో వాక్యనిర్మాణ దోషం: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,డైలీ వర్క్ సారాంశం సెట్టింగులు కంపెనీ
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,అది నుంచి నిర్లక్ష్యం అంశం {0} స్టాక్ అంశాన్ని కాదు
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,తదుపరి ప్రాసెసింగ్ కోసం ఈ ఉత్పత్తి ఆర్డర్ సమర్పించండి.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,తదుపరి ప్రాసెసింగ్ కోసం ఈ ఉత్పత్తి ఆర్డర్ సమర్పించండి.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","ఒక నిర్దిష్ట లావాదేవీ ధర రూల్ వర్తించదు, అన్ని వర్తించే ధర రూల్స్ డిసేబుల్ చేయాలి."
 DocType: Assessment Group,Parent Assessment Group,మాతృ అసెస్మెంట్ గ్రూప్
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,ఉద్యోగాలు
@@ -4202,12 +4288,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',కంపెనీ ఖాళీ ఫిల్టర్ సెట్ చేయండి బృందంచే &#39;కంపెనీ&#39; ఉంది
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,పోస్ట్ చేసిన తేదీ భవిష్య తేదీలో ఉండకూడదు
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},రో # {0}: సీరియల్ లేవు {1} తో సరిపోలడం లేదు {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,పునరావృతమవుతున్నందుకు
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,సాధారణం లీవ్
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,ల్యాబ్ టెస్ట్ UOM.
 DocType: Batch,Batch ID,బ్యాచ్ ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},గమనిక: {0}
 ,Delivery Note Trends,డెలివరీ గమనిక ట్రెండ్లులో
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,ఈ వారపు సారాంశం
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,ఈ వారపు సారాంశం
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,స్టాక్ ప్యాక్ చేసిన అంశాల లో
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,ఖాతా: {0} మాత్రమే స్టాక్ లావాదేవీలు ద్వారా నవీకరించబడింది చేయవచ్చు
 DocType: Student Group Creation Tool,Get Courses,కోర్సులు పొందండి
@@ -4221,7 +4308,6 @@
 DocType: Purchase Order,To Bill,బిల్
 DocType: Material Request,% Ordered,% క్రమ
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","కోర్సు ఆధారంగా విద్యార్థి సమూహం కోసం, కోర్సు ప్రోగ్రామ్ ఎన్రోల్మెంట్ చేరాడు కోర్సులు నుండి ప్రతి విద్యార్థి కోసం చెల్లుబాటు అవుతుంది."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","ఎంటర్ ఇమెయిల్ అడ్రస్ కామాలతో వేరు, ఇన్వాయిస్ ప్రత్యేక తేదీ స్వయంచాలకంగా మెయిల్ చేయబడుతుంది"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Piecework
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,కనీస. బైయింగ్ రేట్
 DocType: Task,Actual Time (in Hours),(గంటల్లో) వాస్తవ సమయం
@@ -4235,7 +4321,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,{0} అంశం సీరియల్ నాస్ కొరకు సెటప్ కాదు. కాలమ్ ఖాళీగా ఉండాలి
 DocType: Accounts Settings,Accounts Settings,సెట్టింగులు అకౌంట్స్
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,ఆమోదించడానికి
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,సమర్పించవలసిన ఫలితం లేదు
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,సమర్పించవలసిన ఫలితం లేదు
 DocType: Customer,Sales Partner and Commission,సేల్స్ భాగస్వామిలో మరియు కమిషన్
 DocType: Employee Loan,Rate of Interest (%) / Year,ఆసక్తి రేటు (%) / ఆఫ్ ది ఇయర్
 ,Project Quantity,ప్రాజెక్టు పరిమాణం
@@ -4247,55 +4333,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,బ్లాక్
 DocType: BOM Explosion Item,BOM Explosion Item,బిఒఎం ప్రేలుడు అంశం
 DocType: Account,Auditor,ఆడిటర్
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} అంశాలు ఉత్పత్తి
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} అంశాలు ఉత్పత్తి
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,ఇంకా నేర్చుకో
 DocType: Cheque Print Template,Distance from top edge,టాప్ అంచు నుండి దూరం
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,ధర జాబితా {0} నిలిపివేస్తే లేదా ఉనికిలో లేదు
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,ధర జాబితా {0} నిలిపివేస్తే లేదా ఉనికిలో లేదు
 DocType: Purchase Invoice,Return,రిటర్న్
 DocType: Production Order Operation,Production Order Operation,ఉత్పత్తి ఆర్డర్ ఆపరేషన్
 DocType: Pricing Rule,Disable,ఆపివేయి
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,చెల్లింపు విధానం ఒక చెల్లింపు చేయడానికి అవసరం
 DocType: Project Task,Pending Review,సమీక్ష పెండింగ్లో
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,నియామకాలు మరియు సంప్రదింపులు
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} బ్యాచ్ చేరాడు లేదు {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} బ్యాచ్ చేరాడు లేదు {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",అది ఇప్పటికే ఉంది ఆస్తుల {0} బహిష్కరించాలని కాదు {1}
 DocType: Task,Total Expense Claim (via Expense Claim),(ఖర్చు చెప్పడం ద్వారా) మొత్తం ఖర్చు చెప్పడం
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,మార్క్ కరువవడంతో
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},రో {0}: పాఠశాల బిఒఎం # కరెన్సీ {1} ఎంపిక కరెన్సీ సమానంగా ఉండాలి {2}
 DocType: Journal Entry Account,Exchange Rate,ఎక్స్చేంజ్ రేట్
 DocType: Patient,Additional information regarding the patient,రోగి గురించి అదనపు సమాచారం
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,అమ్మకాల ఆర్డర్ {0} సమర్పించిన లేదు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,అమ్మకాల ఆర్డర్ {0} సమర్పించిన లేదు
 DocType: Homepage,Tag Line,ట్యాగ్ లైన్
 DocType: Fee Component,Fee Component,ఫీజు భాగం
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,ఫ్లీట్ మేనేజ్మెంట్
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,నుండి అంశాలను జోడించండి
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,ఫ్లీట్ మేనేజ్మెంట్
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,నుండి అంశాలను జోడించండి
 DocType: Cheque Print Template,Regular,రెగ్యులర్
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,అన్ని అసెస్మెంట్ ప్రమాణ మొత్తం వెయిటేజీ 100% ఉండాలి
-DocType: BOM,Last Purchase Rate,చివరి కొనుగోలు రేటు
+DocType: Purchase Order Item,Last Purchase Rate,చివరి కొనుగోలు రేటు
 DocType: Account,Asset,ఆస్తి
 DocType: Project Task,Task ID,టాస్క్ ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,అంశం కోసం ఉండలేవు స్టాక్ {0} నుండి రకాల్లో
 DocType: Lab Test,Mobile,మొబైల్
 ,Sales Person-wise Transaction Summary,సేల్స్ పర్సన్ వారీగా లావాదేవీ సారాంశం
 DocType: Training Event,Contact Number,సంప్రదించండి సంఖ్య
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,వేర్హౌస్ {0} ఉనికిలో లేదు
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext హబ్ నమోదు
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,వేర్హౌస్ {0} ఉనికిలో లేదు
 DocType: Monthly Distribution,Monthly Distribution Percentages,మంత్లీ పంపిణీ శాతములు
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,ఎంచుకున్న అంశం బ్యాచ్ ఉండకూడదు
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","వాల్యువేషన్ రేటు అంశం {0} కోసం అకౌంటింగ్ ఎంట్రీలు చేయాల్సి ఉంది ఇది కోసం దొరకలేదు {1} {2}. అంశం లో ఒక నమూనా అంశం వంటి లావాదేవీ ఉంటే {1}, {1} అంశం పట్టికలో పేర్కొన్నాయి దయచేసి. లేకపోతే, అంశం రికార్డు అంశం లేదా ప్రస్తావన మదింపు రేటు ఇన్కమింగ్ స్టాక్ లావాదేవీ సృష్టించండి, తరువాత submiting ప్రయత్నించండి / ఈ ఎంట్రీ రద్దు దయచేసి"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,పదార్థాల% ఈ డెలివరీ గమనిక వ్యతిరేకంగా పంపిణీ
+DocType: Training Event,Has Certificate,సర్టిఫికెట్ ఉంది
 DocType: Project,Customer Details,కస్టమర్ వివరాలు
 DocType: Employee,Reports to,కు నివేదికలు
 ,Unpaid Expense Claim,చెల్లించని ఖర్చుల దావా
 DocType: Payment Entry,Paid Amount,మొత్తం చెల్లించారు
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,సేల్స్ సైకిల్ విశ్లేషించండి
 DocType: Assessment Plan,Supervisor,సూపర్వైజర్
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,ఆన్లైన్
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,ఆన్లైన్
 ,Available Stock for Packing Items,ప్యాకింగ్ అంశాలను అందుబాటులో స్టాక్
 DocType: Item Variant,Item Variant,అంశం వేరియంట్
 DocType: Assessment Result Tool,Assessment Result Tool,అసెస్మెంట్ ఫలితం టూల్
 DocType: BOM Scrap Item,BOM Scrap Item,బిఒఎం స్క్రాప్ అంశం
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,సమర్పించిన ఆర్డర్లను తొలగించలేరని
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,సమర్పించిన ఆర్డర్లను తొలగించలేరని
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ఇప్పటికే డెబిట్ ఖాతా సంతులనం, మీరు &#39;క్రెడిట్&#39; గా &#39;సంతులనం ఉండాలి&#39; సెట్ అనుమతి లేదు"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,క్వాలిటీ మేనేజ్మెంట్
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,అంశం {0} ఆపివేయబడింది
@@ -4316,7 +4401,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,అనుమతించు జీరో వాల్యువేషన్ రేటు
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,అనుమతించు జీరో వాల్యువేషన్ రేటు
 DocType: Training Event Employee,Invited,ఆహ్వానించారు
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,ఇచ్చిన తేదీలు ఉద్యోగుల {0} కనుగొనబడలేదు బహుళ క్రియాశీల జీతం స్ట్రక్చర్స్
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,ఇచ్చిన తేదీలు ఉద్యోగుల {0} కనుగొనబడలేదు బహుళ క్రియాశీల జీతం స్ట్రక్చర్స్
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,సెటప్ గేట్వే ఖాతాలు.
 DocType: Employee,Employment Type,ఉపాధి రకం
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,స్థిర ఆస్తులు
@@ -4328,7 +4413,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,స్టూడెంట్ అడ్రెస్
 DocType: Employee,Notice (days),నోటీసు (రోజులు)
 DocType: Tax Rule,Sales Tax Template,సేల్స్ టాక్స్ మూస
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,ఇన్వాయిస్ సేవ్ చెయ్యడానికి ఐటమ్లను ఎంచుకోండి
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,ఇన్వాయిస్ సేవ్ చెయ్యడానికి ఐటమ్లను ఎంచుకోండి
 DocType: Employee,Encashment Date,ఎన్క్యాష్మెంట్ తేదీ
 DocType: Training Event,Internet,ఇంటర్నెట్
 DocType: Special Test Template,Special Test Template,ప్రత్యేక టెస్ట్ మూస
@@ -4338,7 +4423,7 @@
 DocType: Academic Term,Term Start Date,టర్మ్ ప్రారంభ తేదీ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp కౌంట్
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp కౌంట్
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},కనుగొనడానికి దయచేసి జత {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},కనుగొనడానికి దయచేసి జత {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,జనరల్ లెడ్జర్ ప్రకారం బ్యాంక్ స్టేట్మెంట్ సంతులనం
 DocType: Job Applicant,Applicant Name,దరఖాస్తుదారు పేరు
 DocType: Authorization Rule,Customer / Item Name,కస్టమర్ / అంశం పేరు
@@ -4358,7 +4443,7 @@
 DocType: Guardian,Guardian Of ,ది గార్డియన్
 DocType: Grading Scale Interval,Threshold,త్రెష్
 DocType: BOM Update Tool,Current BOM,ప్రస్తుత BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,సీరియల్ లేవు జోడించండి
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,సీరియల్ లేవు జోడించండి
 DocType: Production Order Item,Available Qty at Source Warehouse,మూల వేర్హౌస్ వద్ద అందుబాటులో ప్యాక్ చేసిన అంశాల
 apps/erpnext/erpnext/config/support.py +22,Warranty,వారంటీ
 DocType: Purchase Invoice,Debit Note Issued,డెబిట్ గమనిక జారీచేయబడింది
@@ -4381,10 +4466,9 @@
 DocType: Account,Receivable,స్వీకరించదగిన
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,రో # {0}: కొనుగోలు ఆర్డర్ ఇప్పటికే ఉనికిలో సరఫరాదారు మార్చడానికి అనుమతి లేదు
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,సెట్ క్రెడిట్ పరిధులకు మించిన లావాదేవీలు submit అనుమతి పాత్ర.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,తయారీ ఐటెమ్లను ఎంచుకోండి
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","మాస్టర్ డేటా సమకాలీకరించడాన్ని, కొంత సమయం పడుతుంది"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,తయారీ ఐటెమ్లను ఎంచుకోండి
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","మాస్టర్ డేటా సమకాలీకరించడాన్ని, కొంత సమయం పడుతుంది"
 DocType: Item,Material Issue,మెటీరియల్ ఇష్యూ
-DocType: Hub Settings,Seller Description,అమ్మకాల వివరణ
 DocType: Employee Education,Qualification,అర్హతలు
 DocType: Item Price,Item Price,అంశం ధర
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,సబ్బు &amp; డిటర్జెంట్
@@ -4392,7 +4476,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,ఎప్పటికప్పుడు కంటే ఎక్కువ ఉండకూడదు.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,మోషన్ పిక్చర్ &amp; వీడియో
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,క్రమ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,పునఃప్రారంభం
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,పునఃప్రారంభం
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,ప్రారంభించబడితే అప్పుడు సిస్టమ్ టెంప్లేట్ నుండి వైవిధ్యాల యొక్క రంగాలను అప్డేట్ చెయ్యదు కానీ కొత్త రూపాంతరం చేస్తున్నప్పుడు క్రింది పేర్కొన్న క్షేత్రాల డేటాను కాపీ చేస్తుంది
 DocType: Salary Detail,Component,కాంపోనెంట్
 DocType: Assessment Criteria,Assessment Criteria Group,అంచనా ప్రమాణం గ్రూప్
 DocType: Healthcare Settings,Patient Name By,ద్వారా పేషంట్ పేరు
@@ -4402,7 +4487,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,రోల్ ఆమోదిస్తోంది లేదా వాడుకరి ఆమోదిస్తోంది నమోదు చేయండి
 DocType: Journal Entry,Write Off Entry,ఎంట్రీ ఆఫ్ వ్రాయండి
 DocType: BOM,Rate Of Materials Based On,రేటు పదార్థాల బేస్డ్ న
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,సరఫరాదారు&gt; సరఫరాదారు రకం
+DocType: Item Variant Settings,Do not Update Variants,వేరియంట్స్ అప్డేట్ చేయవద్దు
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,మద్దతు Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,అన్నింటినీ
 DocType: POS Profile,Terms and Conditions,నిబంధనలు మరియు షరతులు
@@ -4411,7 +4496,7 @@
 DocType: Leave Block List,Applies to Company,కంపెనీకి వర్తిస్తుంది
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,సమర్పించిన స్టాక్ ఎంట్రీ {0} ఉంది ఎందుకంటే రద్దు కాదు
 DocType: Employee Loan,Disbursement Date,చెల్లించుట తేదీ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;గ్రహీతలు&#39; పేర్కొనబడలేదు
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;గ్రహీతలు&#39; పేర్కొనబడలేదు
 DocType: BOM Update Tool,Update latest price in all BOMs,అన్ని BOM లలో తాజా ధరను నవీకరించండి
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,మెడికల్ రికార్డు
 DocType: Vehicle,Vehicle,వాహనం
@@ -4427,14 +4512,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / లీడ్%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,ఆస్తి Depreciations మరియు నిల్వలను
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},మొత్తం {0} {1} నుంచి బదిలీ {2} నుండి {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},మొత్తం {0} {1} నుంచి బదిలీ {2} నుండి {3}
 DocType: Sales Invoice,Get Advances Received,అడ్వాన్సెస్ స్వీకరించిన గెట్
 DocType: Email Digest,Add/Remove Recipients,గ్రహీతలు జోడించు / తొలగించు
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},లావాదేవీ ఆగిపోయింది ఉత్పత్తి వ్యతిరేకంగా అనుమతి లేదు ఆర్డర్ {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",డిఫాల్ట్ గా ఈ ఆర్థిక సంవత్సరం సెట్ &#39;డిఫాల్ట్ గా సెట్&#39; పై క్లిక్
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,చేరండి
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,చేరండి
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,కొరత ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,అంశం వేరియంట్ {0} అదే లక్షణాలు తో ఉంది
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,అంశం వేరియంట్ {0} అదే లక్షణాలు తో ఉంది
 DocType: Employee Loan,Repay from Salary,జీతం నుండి తిరిగి
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},వ్యతిరేకంగా చెల్లింపు అభ్యర్థించడం {0} {1} మొత్తం {2}
@@ -4447,7 +4532,7 @@
 DocType: Sales Invoice Item,Sales Order Item,అమ్మకాల ఆర్డర్ అంశం
 DocType: Salary Slip,Payment Days,చెల్లింపు డేస్
 DocType: Patient,Dormant,నిద్రాణమైన
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,పిల్లల నోడ్స్ తో గిడ్డంగులు లెడ్జర్ మార్చబడతాయి కాదు
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,పిల్లల నోడ్స్ తో గిడ్డంగులు లెడ్జర్ మార్చబడతాయి కాదు
 DocType: BOM,Manage cost of operations,కార్యకలాపాల వ్యయాన్ని నిర్వహించండి
 DocType: Accounts Settings,Stale Days,పాత డేస్
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","తనిఖీ లావాదేవీల ఏ &quot;సమర్పించిన&quot; చేసినప్పుడు, ఒక ఇమెయిల్ పాప్ అప్ స్వయంచాలకంగా జోడింపుగా లావాదేవీతో, ఆ లావాదేవీ సంబంధం &quot;సంప్రదించండి&quot; కు ఒక ఇమెయిల్ పంపండి తెరిచింది. యూజర్ మారవచ్చు లేదా ఇమెయిల్ పంపలేరు."
@@ -4461,10 +4546,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,సీరియల్ లేవు {0} ఇప్పటికే అందింది
 ,Requested Items To Be Transferred,అభ్యర్థించిన అంశాలు బదిలీ
 DocType: Expense Claim,Vehicle Log,వాహనం లోనికి ప్రవేశించండి
-DocType: Purchase Invoice,Recurring Id,పునరావృత Id
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),జ్వరం ఉండటం (తాత్కాలికంగా&gt; 38.5 ° C / 101.3 ° F లేదా నిరంతర ఉష్ణోగ్రత 38 ° C / 100.4 ° F)
 DocType: Customer,Sales Team Details,సేల్స్ టీం వివరాలు
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,శాశ్వతంగా తొలగించాలా?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,శాశ్వతంగా తొలగించాలా?
 DocType: Expense Claim,Total Claimed Amount,మొత్తం క్లెయిమ్ చేసిన మొత్తం
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,అమ్మకం కోసం సమర్థవంతమైన అవకాశాలు.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},చెల్లని {0}
@@ -4474,7 +4558,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,డిపార్ట్మెంట్ స్టోర్స్
 ,Item Delivery Date,అంశం డెలివరీ తేదీ
 DocType: Warehouse,PIN,పిన్
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,లో ERPNext మీ స్కూల్ సెటప్
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,లో ERPNext మీ స్కూల్ సెటప్
 DocType: Sales Invoice,Base Change Amount (Company Currency),బేస్ మార్చు మొత్తం (కంపెనీ కరెన్సీ)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,క్రింది గిడ్డంగులు కోసం అకౌంటింగ్ ఎంట్రీలు
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,మొదటి డాక్యుమెంట్ సేవ్.
@@ -4486,13 +4570,12 @@
 DocType: Task,Is Milestone,మైల్స్టోన్ ఉంది
 DocType: Daily Work Summary,Email Sent To,ఇమెయిల్ పంపబడింది
 DocType: Budget,Warn,హెచ్చరించు
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,మీరు ఖచ్చితంగా నమోదు చేయనిది కావాలా?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",ఏ ఇతర స్టర్ రికార్డులలో వెళ్ళాలి అని చెప్పుకోదగిన ప్రయత్నం.
 DocType: BOM,Manufacturing User,తయారీ వాడుకరి
 DocType: Purchase Invoice,Raw Materials Supplied,రా మెటీరియల్స్ పంపినవి
-DocType: Purchase Invoice,Recurring Print Format,పునరావృత ప్రింట్ ఫార్మాట్
 DocType: C-Form,Series,సిరీస్
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},ధర జాబితా యొక్క కరెన్సీ {0} {1} లేదా {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,ఉత్పత్తులు జోడించండి
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},ధర జాబితా యొక్క కరెన్సీ {0} {1} లేదా {2}
 DocType: Appraisal,Appraisal Template,అప్రైసల్ మూస
 DocType: Item Group,Item Classification,అంశం వర్గీకరణ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,వ్యాపారం అభివృద్ధి మేనేజర్
@@ -4506,7 +4589,7 @@
 DocType: Item Attribute Value,Attribute Value,విలువ లక్షణం
 ,Itemwise Recommended Reorder Level,Itemwise క్రమాన్ని స్థాయి సిఫార్సు
 DocType: Salary Detail,Salary Detail,జీతం వివరాలు
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,ముందుగా {0} దయచేసి ఎంచుకోండి
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,ముందుగా {0} దయచేసి ఎంచుకోండి
 DocType: Appointment Type,Physician,వైద్యుడు
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,అంశం బ్యాచ్ {0} {1} గడువు ముగిసింది.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,సంప్రదింపులు
@@ -4517,7 +4600,7 @@
 DocType: Salary Detail,Default Amount,డిఫాల్ట్ మొత్తం
 DocType: Lab Test Template,Descriptive,డిస్క్రిప్టివ్
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,వేర్హౌస్ వ్యవస్థలో దొరకలేదు
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,ఈ నెల సారాంశం
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,ఈ నెల సారాంశం
 DocType: Quality Inspection Reading,Quality Inspection Reading,నాణ్యత తనిఖీ పఠనం
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`ఫ్రీజ్ స్టాక్స్ పాత Than`% d రోజుల కంటే తక్కువగా ఉండాలి.
 DocType: Tax Rule,Purchase Tax Template,పన్ను మూస కొనుగోలు
@@ -4540,12 +4623,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,శిక్షణ ఈవెంట్స్ / ఫలితాలు
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,గా అరుగుదల పోగుచేసిన
 DocType: Sales Invoice,C-Form Applicable,సి ఫారం వర్తించే
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},ఆపరేషన్ సమయం ఆపరేషన్ కోసం 0 కంటే ఎక్కువ ఉండాలి {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},ఆపరేషన్ సమయం ఆపరేషన్ కోసం 0 కంటే ఎక్కువ ఉండాలి {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,వేర్హౌస్ తప్పనిసరి
 DocType: Supplier,Address and Contacts,చిరునామా మరియు కాంటాక్ట్స్
 DocType: UOM Conversion Detail,UOM Conversion Detail,UoM మార్పిడి వివరాలు
 DocType: Program,Program Abbreviation,ప్రోగ్రామ్ సంక్షిప్తీకరణ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,ఉత్పత్తి ఆర్డర్ ఒక అంశం మూస వ్యతిరేకంగా లేవనెత్తిన సాధ్యం కాదు
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,ఉత్పత్తి ఆర్డర్ ఒక అంశం మూస వ్యతిరేకంగా లేవనెత్తిన సాధ్యం కాదు
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,ఆరోపణలు ప్రతి అంశం వ్యతిరేకంగా కొనుగోలు రసీదులు లో నవీకరించబడింది ఉంటాయి
 DocType: Warranty Claim,Resolved By,ద్వారా పరిష్కరించిన
 DocType: Bank Guarantee,Start Date,ప్రారంబపు తేది
@@ -4571,27 +4654,28 @@
 DocType: Employee,Educational Qualification,అర్హతలు
 DocType: Workstation,Operating Costs,నిర్వహణ వ్యయాలు
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,యాక్షన్ సేకరించారు మంత్లీ బడ్జెట్ మించింది ఉంటే
-DocType: Purchase Invoice,Submit on creation,సృష్టి సమర్పించండి
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},కరెన్సీ కోసం {0} ఉండాలి {1}
+DocType: Subscription,Submit on creation,సృష్టి సమర్పించండి
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},కరెన్సీ కోసం {0} ఉండాలి {1}
 DocType: Asset,Disposal Date,తొలగింపు తేదీ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ఇమెయిళ్ళు వారు సెలవు లేకపోతే, ఇచ్చిన గంట వద్ద కంపెనీ అన్ని యాక్టివ్ ఉద్యోగులు పంపబడును. ప్రతిస్పందనల సారాంశం అర్ధరాత్రి పంపబడుతుంది."
 DocType: Employee Leave Approver,Employee Leave Approver,ఉద్యోగి సెలవు అప్రూవర్గా
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},రో {0}: ఒక క్రమాన్ని ఎంట్రీ ఇప్పటికే ఈ గిడ్డంగి కోసం ఉంది {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","కొటేషన్ చేయబడింది ఎందుకంటే, కోల్పోయిన డిక్లేర్ కాదు."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,శిక్షణ అభిప్రాయం
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},రో {0}: ఒక క్రమాన్ని ఎంట్రీ ఇప్పటికే ఈ గిడ్డంగి కోసం ఉంది {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","కొటేషన్ చేయబడింది ఎందుకంటే, కోల్పోయిన డిక్లేర్ కాదు."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,శిక్షణ అభిప్రాయం
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,ఆర్డర్ {0} సమర్పించాలి ఉత్పత్తి
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,సరఫరాదారు స్కోరు ప్రమాణం
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},అంశం కోసం ప్రారంభ తేదీ మరియు ముగింపు తేదీ దయచేసి ఎంచుకోండి {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},కోర్సు వరుసగా తప్పనిసరి {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,తేదీ తేదీ నుండి ముందు ఉండరాదు
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,/ మార్చు ధరలు జోడించండి
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,/ మార్చు ధరలు జోడించండి
 DocType: Batch,Parent Batch,మాతృ బ్యాచ్
 DocType: Batch,Parent Batch,మాతృ బ్యాచ్
 DocType: Cheque Print Template,Cheque Print Template,ప్రిపే ప్రింట్ మూస
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,ఖర్చు కేంద్రాలు చార్ట్
 DocType: Lab Test Template,Sample Collection,నమూనా కలెక్షన్
 ,Requested Items To Be Ordered,అభ్యర్థించిన అంశాలు ఆదేశించింది ఉండాలి
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,నా ఆర్డర్స్
 DocType: Price List,Price List Name,ధర జాబితా పేరు
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},డైలీ వర్క్ సారాంశం {0}
 DocType: Employee Loan,Totals,మొత్తాలు
@@ -4610,12 +4694,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1} అవసరమవుతారు {2} లో {3} {4} కోసం {5} ఈ లావాదేవీని పూర్తి చేయడానికి యూనిట్లు.
 DocType: Fee Schedule,Student Category,స్టూడెంట్ వర్గం
 DocType: Announcement,Student,విద్యార్థి
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,సంస్థ యూనిట్ (విభాగం) మాస్టర్.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,సంస్థ యూనిట్ (విభాగం) మాస్టర్.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,రూములు వెళ్ళండి
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,పంపే ముందు సందేశాన్ని నమోదు చేయండి
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,సరఫరా కోసం DUPLICATE
 DocType: Email Digest,Pending Quotations,పెండింగ్లో కొటేషన్స్
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,పాయింట్ ఆఫ్ అమ్మకానికి ప్రొఫైల్
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,పాయింట్ ఆఫ్ అమ్మకానికి ప్రొఫైల్
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,ల్యాబ్ పరీక్ష కాన్ఫిగరేషన్లు.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,హామీలేని రుణాలు
 DocType: Cost Center,Cost Center Name,ఖర్చు సెంటర్ పేరు
@@ -4625,6 +4709,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,మొత్తం చెల్లించిన ఆంట్
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 అక్షరాల కంటే ఎక్కువ సందేశాలు బహుళ సందేశాలను విభజించబడింది ఉంటుంది
 DocType: Purchase Receipt Item,Received and Accepted,అందుకున్నారు మరియు Accepted
+DocType: Hub Settings,Company and Seller Profile,కంపెనీ మరియు విక్రేత ప్రొఫైల్
 ,GST Itemised Sales Register,జిఎస్టి వర్గీకరించబడ్డాయి సేల్స్ నమోదు
 ,Serial No Service Contract Expiry,సీరియల్ లేవు సర్వీస్ కాంట్రాక్ట్ గడువు
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,మీరు క్రెడిట్ మరియు అదే సమయంలో అదే అకౌంటు డెబిట్ కాదు
@@ -4634,10 +4719,11 @@
 DocType: Item,Variant Based On,వేరియంట్ బేస్డ్ న
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},100% ఉండాలి కేటాయించిన మొత్తం వెయిటేజీ. ఇది {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,మీ సరఫరాదారులు
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,సరిదిద్దండి
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,అమ్మకాల ఆర్డర్ చేసిన ఓడిపోయింది సెట్ చెయ్యబడదు.
 DocType: Request for Quotation Item,Supplier Part No,సరఫరాదారు పార్ట్ లేవు
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',వర్గం &#39;మదింపు&#39; లేదా &#39;Vaulation మరియు మొత్తం&#39; కోసం ఉన్నప్పుడు తీసివేయు కాదు
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,నుండి అందుకున్న
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,నుండి అందుకున్న
 DocType: Lead,Converted,కన్వర్టెడ్
 DocType: Item,Has Serial No,సీరియల్ లేవు ఉంది
 DocType: Employee,Date of Issue,జారీ చేసిన తేది
@@ -4645,7 +4731,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","కొనుగోలు సెట్టింగులు ప్రకారం కొనుగోలు Reciept అవసరం == &#39;అవును&#39;, అప్పుడు కొనుగోలు వాయిస్ సృష్టించడానికి, యూజర్ అంశం కోసం మొదటి కొనుగోలు స్వీకరణపై సృష్టించాలి ఉంటే {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},రో # {0}: అంశాన్ని సెట్ సరఫరాదారు {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,రో {0}: గంటలు విలువ సున్నా కంటే ఎక్కువ ఉండాలి.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,అంశం {1} జత వెబ్సైట్ చిత్రం {0} కనుగొనబడలేదు
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,అంశం {1} జత వెబ్సైట్ చిత్రం {0} కనుగొనబడలేదు
 DocType: Issue,Content Type,కంటెంట్ రకం
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,కంప్యూటర్
 DocType: Item,List this Item in multiple groups on the website.,వెబ్ సైట్ బహుళ సమూహాలు ఈ అంశం జాబితా.
@@ -4656,14 +4742,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled ఎంట్రీలు పొందండి
 DocType: Payment Reconciliation,From Invoice Date,వాయిస్ తేదీ నుండి
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,మీకు సమర్పించడానికి అనుమతి లేదు
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,బిల్లింగ్ కరెన్సీ డిఫాల్ట్ comapany యొక్క గాని కరెన్సీ లేదా పార్టీ ఖాతా కరెన్సీ సమానంగా ఉండాలి
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,బిల్లింగ్ కరెన్సీ డిఫాల్ట్ comapany యొక్క గాని కరెన్సీ లేదా పార్టీ ఖాతా కరెన్సీ సమానంగా ఉండాలి
 DocType: Healthcare Settings,Laboratory Settings,ప్రయోగశాల సెట్టింగులు
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,ఎన్క్యాష్మెంట్ వదిలి
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,ఇది ఏమి చేస్తుంది?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,గిడ్డంగి
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,అన్ని విద్యార్థి అడ్మిషన్స్
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,ఇది ఏమి చేస్తుంది?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,గిడ్డంగి
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,అన్ని విద్యార్థి అడ్మిషన్స్
 ,Average Commission Rate,సగటు కమిషన్ రేటు
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,&#39;అవును&#39; ఉంటుంది కాని స్టాక్ అంశం కోసం కాదు &#39;సీరియల్ చెప్పడం&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,&#39;అవును&#39; ఉంటుంది కాని స్టాక్ అంశం కోసం కాదు &#39;సీరియల్ చెప్పడం&#39;
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,స్థితిని ఎంచుకోండి
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,హాజరు భవిష్యత్తులో తేదీలు కోసం గుర్తించబడవు
 DocType: Pricing Rule,Pricing Rule Help,ధర రూల్ సహాయం
@@ -4681,41 +4767,41 @@
 DocType: Item,Customer Code,కస్టమర్ కోడ్
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},పుట్టినరోజు రిమైండర్ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,చివరి ఆర్డర్ నుండి రోజుల్లో
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,ఖాతాకు డెబిట్ బాలన్స్ షీట్ ఖాతా ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,ఖాతాకు డెబిట్ బాలన్స్ షీట్ ఖాతా ఉండాలి
 DocType: Buying Settings,Naming Series,నామకరణ సిరీస్
 DocType: Leave Block List,Leave Block List Name,బ్లాక్ జాబితా వదిలి పేరు
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,భీమా తేదీ ప్రారంభించండి భీమా ముగింపు తేదీ కంటే తక్కువ ఉండాలి
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,దయచేసి స్కూల్ స్కూల్ సెట్టింగులలో సెటప్ ఇన్స్ట్రక్టర్ నేమింగ్ సిస్టమ్
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,స్టాక్ ఆస్తులు
 DocType: Timesheet,Production Detail,ఉత్పత్తి వివరాలు
+DocType: Restaurant,Active Menu,సక్రియ మెను
 DocType: Target Detail,Target Qty,టార్గెట్ ప్యాక్ చేసిన అంశాల
 DocType: Shopping Cart Settings,Checkout Settings,తనిఖీ సెట్టింగ్లు
 DocType: Attendance,Present,ప్రెజెంట్
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,డెలివరీ గమనిక {0} సమర్పించిన కాకూడదని
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,డెలివరీ గమనిక {0} సమర్పించిన కాకూడదని
 DocType: Notification Control,Sales Invoice Message,సేల్స్ వాయిస్ మెసేజ్
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,ఖాతా {0} మూసివేయడం రకం బాధ్యత / ఈక్విటీ ఉండాలి
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},ఉద్యోగి వేతనం స్లిప్ {0} ఇప్పటికే సమయం షీట్ కోసం సృష్టించబడింది {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},ఉద్యోగి వేతనం స్లిప్ {0} ఇప్పటికే సమయం షీట్ కోసం సృష్టించబడింది {1}
 DocType: Vehicle Log,Odometer,ఓడోమీటార్
 DocType: Sales Order Item,Ordered Qty,క్రమ ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,అంశం {0} నిలిపివేయబడింది
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,అంశం {0} నిలిపివేయబడింది
 DocType: Stock Settings,Stock Frozen Upto,స్టాక్ ఘనీభవించిన వరకు
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,బిఒఎం ఏ స్టాక్ అంశం కలిగి లేదు
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,ప్రాజెక్టు చర్య / పని.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,బిఒఎం ఏ స్టాక్ అంశం కలిగి లేదు
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,ప్రాజెక్టు చర్య / పని.
 DocType: Vehicle Log,Refuelling Details,Refuelling వివరాలు
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,జీతం స్లిప్స్ రూపొందించండి
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}",వర్తించే ఎంపిక ఉంది ఉంటే కొనుగోలు తనిఖీ చెయ్యాలి {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,డిస్కౌంట్ 100 కంటే తక్కువ ఉండాలి
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,గత కొనుగోలు రేటు దొరకలేదు
 DocType: Purchase Invoice,Write Off Amount (Company Currency),మొత్తం ఆఫ్ వ్రాయండి (కంపెనీ కరెన్సీ)
 DocType: Sales Invoice Timesheet,Billing Hours,బిల్లింగ్ గంటలు
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,కోసం {0} దొరకలేదు డిఫాల్ట్ బిఒఎం
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,రో # {0}: క్రమాన్ని పరిమాణం సెట్ చెయ్యండి
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,కోసం {0} దొరకలేదు డిఫాల్ట్ బిఒఎం
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,రో # {0}: క్రమాన్ని పరిమాణం సెట్ చెయ్యండి
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,వాటిని ఇక్కడ జోడించడానికి అంశాలను నొక్కండి
 DocType: Fees,Program Enrollment,ప్రోగ్రామ్ నమోదు
 DocType: Landed Cost Voucher,Landed Cost Voucher,అడుగుపెట్టాయి ఖర్చు ఓచర్
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},సెట్ దయచేసి {0}
-DocType: Purchase Invoice,Repeat on Day of Month,నెల రోజు రిపీట్
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} క్రియారహితంగా విద్యార్థి
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} క్రియారహితంగా విద్యార్థి
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} క్రియారహితంగా విద్యార్థి
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} క్రియారహితంగా విద్యార్థి
 DocType: Employee,Health Details,ఆరోగ్యం వివరాలు
 DocType: Offer Letter,Offer Letter Terms,లెటర్ నిబంధనలు ఆఫర్
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,ఒక చెల్లింపు అభ్యర్థన సూచన పత్రం అవసరం సృష్టించడానికి
@@ -4724,7 +4810,6 @@
 DocType: Employee External Work History,Salary,జీతం
 DocType: Serial No,Delivery Document Type,డెలివరీ డాక్యుమెంట్ టైప్
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,పైన ఎంచుకున్న ప్రమాణం కోసం వేతన స్లిప్స్ సమర్పించండి
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} అంశాలు సమకాలీకరించిన
 DocType: Sales Order,Partly Delivered,పాక్షికంగా పంపిణీ
 DocType: Email Digest,Receivables,పొందింది
 DocType: Lead Source,Lead Source,లీడ్ మూల
@@ -4745,9 +4830,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,ఏజింగ్ రేంజ్ 2
 DocType: SG Creation Tool Course,Max Strength,మాక్స్ శక్తి
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,బిఒఎం భర్తీ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,డెలివరీ తేదీ ఆధారంగా అంశాలను ఎంచుకోండి
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,డెలివరీ తేదీ ఆధారంగా అంశాలను ఎంచుకోండి
 ,Sales Analytics,సేల్స్ Analytics
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},అందుబాటులో {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},అందుబాటులో {0}
 ,Prospects Engaged But Not Converted,ప్రాస్పెక్టస్ ఎంగేజ్డ్ కానీ మారలేదు
 ,Prospects Engaged But Not Converted,ప్రాస్పెక్టస్ ఎంగేజ్డ్ కానీ మారలేదు
 DocType: Manufacturing Settings,Manufacturing Settings,తయారీ సెట్టింగ్స్
@@ -4755,10 +4840,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 మొబైల్ లేవు
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,కంపెనీ మాస్టర్ డిఫాల్ట్ కరెన్సీ నమోదు చేయండి
 DocType: Stock Entry Detail,Stock Entry Detail,స్టాక్ ఎంట్రీ వివరాలు
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,రోజువారీ రిమైండర్లు
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,రోజువారీ రిమైండర్లు
 DocType: Products Settings,Home Page is Products,హోం పేజి ఉత్పత్తులు ఉంది
 ,Asset Depreciation Ledger,ఆస్తి అరుగుదల లెడ్జర్
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},తో పన్ను రూల్ గొడవలు {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},తో పన్ను రూల్ గొడవలు {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,కొత్త ఖాతా పేరు
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,రా మెటీరియల్స్ పంపినవి ఖర్చు
 DocType: Selling Settings,Settings for Selling Module,మాడ్యూల్ సెల్లింగ్ కోసం సెట్టింగులు
@@ -4772,8 +4857,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,అంశం {0} స్టాక్ అంశం ఉండాలి
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,ప్రోగ్రెస్ వేర్హౌస్ డిఫాల్ట్ వర్క్
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,అకౌంటింగ్ లావాదేవీలకు డిఫాల్ట్ సెట్టింగులను.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,దయచేసి మానవ వనరులో HR ఉద్యోగ నామకరణ వ్యవస్థ సెటప్ చేయండి&gt; హెచ్ఆర్ సెట్టింగులు
 DocType: Maintenance Visit,MV,ఎంవి
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,ఊహించినది తేదీ మెటీరియల్ అభ్యర్థన తేదీ ముందు ఉండరాదు
+DocType: Restaurant,Default Tax Template,డిఫాల్ట్ పన్ను మూస
 DocType: Fees,Student Details,విద్యార్థి వివరాలు
 DocType: Purchase Invoice Item,Stock Qty,స్టాక్ ప్యాక్ చేసిన అంశాల
 DocType: Purchase Invoice Item,Stock Qty,స్టాక్ ప్యాక్ చేసిన అంశాల
@@ -4792,8 +4878,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,అంశాలను వెళ్ళు
 DocType: Sales Partner,Partner Type,భాగస్వామి రకం
 DocType: Purchase Taxes and Charges,Actual,వాస్తవ
+DocType: Restaurant Menu,Restaurant Manager,రెస్టారెంట్ మేనేజర్
 DocType: Authorization Rule,Customerwise Discount,Customerwise డిస్కౌంట్
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,పనులు కోసం timesheet.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,పనులు కోసం timesheet.
 DocType: Purchase Invoice,Against Expense Account,ఖర్చుల ఖాతా వ్యతిరేకంగా
 DocType: Production Order,Production Order,ఉత్పత్తి ఆర్డర్
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,సంస్థాపన సూచన {0} ఇప్పటికే సమర్పించబడింది
@@ -4801,7 +4888,6 @@
 DocType: Quotation Item,Against Docname,Docname వ్యతిరేకంగా
 DocType: SMS Center,All Employee (Active),అన్ని ఉద్యోగి (యాక్టివ్)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,ఇప్పుడు వీక్షణ
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,వాయిస్ స్వయంచాలకంగా ఉత్పత్తి అవుతుంది కాలం ఎంచుకోండి
 DocType: BOM,Raw Material Cost,రా మెటీరియల్ ఖర్చు
 DocType: Item Reorder,Re-Order Level,రీ-ఆర్డర్ స్థాయి
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,మీరు ఉత్పత్తి ఆర్డర్లు పెంచడానికి లేదా విశ్లేషణకు ముడి పదార్థాలు డౌన్లోడ్ కోరుకుంటున్న అంశాలు మరియు ప్రణాళిక చేసిన అంశాల ఎంటర్.
@@ -4814,24 +4900,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,నివేదిక రకం తప్పనిసరి
 DocType: Item,Serial Number Series,క్రమ సంఖ్య సిరీస్
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},వేర్హౌస్ వరుసగా స్టాక్ అంశం {0} తప్పనిసరి {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,ప్రోగ్రామ్లను జోడించండి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,రిటైల్ &amp; టోకు
 DocType: Issue,First Responded On,మొదటి న స్పందించారు
 DocType: Website Item Group,Cross Listing of Item in multiple groups,బహుళ సమూహాలు అంశం యొక్క క్రాస్ జాబితా
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ఫిస్కల్ ఇయర్ ప్రారంభ తేదీ మరియు ఫిస్కల్ ఇయర్ ఎండ్ తేదీ ఇప్పటికే ఫిస్కల్ ఇయర్ నిర్మితమయ్యాయి {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,క్లియరెన్స్ తేదీ నవీకరించబడింది
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,స్ప్లిట్ బ్యాచ్
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,స్ప్లిట్ బ్యాచ్
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,స్ప్లిట్ బ్యాచ్
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,స్ప్లిట్ బ్యాచ్
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,విజయవంతంగా అనుకూలీకరించబడిన
 DocType: Request for Quotation Supplier,Download PDF,PDF డౌన్లోడ్
 DocType: Production Order,Planned End Date,ప్రణాళిక ముగింపు తేదీ
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,దయచేసి షెడ్యూల్ తేదీని నమోదు చేయండి
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,అంశాలను ఎక్కడ నిల్వ చేయబడతాయి.
 DocType: Request for Quotation,Supplier Detail,సరఫరాదారు వివరాలు
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},ఫార్ములా లేదా స్థితిలో లోపం: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},ఫార్ములా లేదా స్థితిలో లోపం: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,ఇన్వాయిస్ మొత్తం
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,ప్రమాణం బరువులు తప్పక 100% వరకు ఉండాలి
 DocType: Attendance,Attendance,హాజరు
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,స్టాక్ అంశాలు
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,స్టాక్ అంశాలు
 DocType: BOM,Materials,మెటీరియల్స్
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","తనిఖీ లేకపోతే, జాబితా అనువర్తిత వుంటుంది పేరు ప్రతి శాఖ చేర్చబడుతుంది ఉంటుంది."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,మూల మరియు టార్గెట్ వేర్హౌస్ అదే ఉండకూడదు
@@ -4849,6 +4935,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,నికర మొత్తం
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},లక్షణం {0} విలువ పరిధిలో ఉండాలి {1} కు {2} యొక్క ఇంక్రిమెంట్ {3} అంశం {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,{0} వరుసగా టార్గెట్ గిడ్డంగి ఉత్పత్తి ఆర్డర్ అదే ఉండాలి
+DocType: Restaurant Reservation,Waitlisted,waitlisted
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,కరెన్సీ కొన్ని ఇతర కరెన్సీ ఉపయోగించి ఎంట్రీలు తరువాత మారలేదు
 DocType: Vehicle Service,Clutch Plate,క్లచ్ ప్లేట్
 DocType: Company,Round Off Account,ఖాతా ఆఫ్ రౌండ్
@@ -4865,7 +4952,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,న్యూ సేల్స్ పర్సన్ పేరు
 DocType: Packing Slip,Gross Weight UOM,స్థూల బరువు UoM
 DocType: Delivery Note Item,Against Sales Invoice,సేల్స్ వాయిస్ వ్యతిరేకంగా
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,సీరియల్ అంశం కోసం సీరియల్ సంఖ్యలు నమోదు చేయండి
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,సీరియల్ అంశం కోసం సీరియల్ సంఖ్యలు నమోదు చేయండి
 DocType: Bin,Reserved Qty for Production,ప్రొడక్షన్ ప్యాక్ చేసిన అంశాల రిసర్వ్డ్
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,మీరు కోర్సు ఆధారంగా సమూహాలు చేస్తున్నప్పుటికీ బ్యాచ్ పరిగణలోకి అనుకుంటే ఎంచుకోవద్దు.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,మీరు కోర్సు ఆధారంగా సమూహాలు చేస్తున్నప్పుటికీ బ్యాచ్ పరిగణలోకి అనుకుంటే ఎంచుకోవద్దు.
@@ -4877,7 +4964,7 @@
 DocType: Lab Test,Test Group,టెస్ట్ గ్రూప్
 DocType: Payment Reconciliation,Receivable / Payable Account,స్వీకరించదగిన / చెల్లించవలసిన ఖాతా
 DocType: Delivery Note Item,Against Sales Order Item,అమ్మకాల ఆర్డర్ అంశం వ్యతిరేకంగా
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},గుణానికి విలువ లక్షణం రాయండి {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},గుణానికి విలువ లక్షణం రాయండి {0}
 DocType: Item,Default Warehouse,డిఫాల్ట్ వేర్హౌస్
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},బడ్జెట్ గ్రూప్ ఖాతా వ్యతిరేకంగా కేటాయించిన సాధ్యం కాదు {0}
 DocType: Healthcare Settings,Patient Registration,పేషంట్ రిజిస్ట్రేషన్
@@ -4907,6 +4994,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,సేల్స్ పర్సన్
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,బడ్జెట్ మరియు వ్యయ కేంద్రం
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,చెల్లింపు యొక్క బహుళ డిఫాల్ట్ మోడ్ అనుమతించబడదు
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,కొరకు
 ,Appointment Analytics,నియామకం విశ్లేషణలు
 DocType: Vehicle Service,Half Yearly,అర్ధవార్షిక
 DocType: Lead,Blog Subscriber,బ్లాగు సబ్స్క్రయిబర్
@@ -4925,7 +5013,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,qUOT కౌంట్
 ,BOM Stock Report,బిఒఎం స్టాక్ రిపోర్ట్
 DocType: Stock Reconciliation Item,Quantity Difference,పరిమాణం తేడా
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,ప్రోసెసింగ్ పేరోల్
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,ప్రోసెసింగ్ పేరోల్
 DocType: Opportunity Item,Basic Rate,ప్రాథమిక రేటు
 DocType: GL Entry,Credit Amount,క్రెడిట్ మొత్తం
 DocType: Cheque Print Template,Signatory Position,సంతకం చేసే స్థానం
@@ -4939,12 +5027,12 @@
 DocType: Tax Rule,Tax Rule,పన్ను రూల్
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,సేల్స్ సైకిల్ అంతటా అదే రేటు నిర్వహించడానికి
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,కార్యక్షేత్ర పని గంటలు సమయం లాగ్లను ప్లాన్.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,క్యూ లో వినియోగదారుడు
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,డాక్టర్ {0} కి వైద్యుని షెడ్యూల్ లేదు. వైద్యుని మాస్టర్ లో చేర్చండి
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,క్యూ లో వినియోగదారుడు
 DocType: Student,Nationality,జాతీయత
 ,Items To Be Requested,అంశాలు అభ్యర్థించిన టు
-DocType: Purchase Order,Get Last Purchase Rate,గత కొనుగోలు రేటు పొందండి
 DocType: Company,Company Info,కంపెనీ సమాచారం
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,ఎంచుకోండి లేదా కొత్త కస్టమర్ జోడించడానికి
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,ఎంచుకోండి లేదా కొత్త కస్టమర్ జోడించడానికి
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,వ్యయ కేంద్రం ఒక వ్యయం దావా బుక్ అవసరం
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ఫండ్స్ (ఆస్తులు) యొక్క అప్లికేషన్
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ఈ ఈ ఉద్యోగి హాజరు ఆధారంగా
@@ -4952,6 +5040,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,డెబిట్ ఖాతా
 DocType: Fiscal Year,Year Start Date,సంవత్సరం ప్రారంభం తేదీ
 DocType: Attendance,Employee Name,ఉద్యోగి పేరు
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,రెస్టారెంట్ ఆర్డర్ ఎంట్రీ అంశం
 DocType: Sales Invoice,Rounded Total (Company Currency),నున్నటి మొత్తం (కంపెనీ కరెన్సీ)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,ఖాతా రకం ఎంపిక ఎందుకంటే గ్రూప్ ప్రచ్ఛన్న కాదు.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} మారిస్తే. రిఫ్రెష్ చెయ్యండి.
@@ -4962,6 +5051,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,ఉద్యోగుల లాభాల
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},ప్యాక్ పరిమాణం వరుసగా అంశం {0} పరిమాణం సమానంగా ఉండాలి {1}
 DocType: Production Order,Manufactured Qty,తయారు ప్యాక్ చేసిన అంశాల
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,వాయిస్ సృష్టించబడింది
 DocType: Purchase Receipt Item,Accepted Quantity,అంగీకరించిన పరిమాణం
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},ఒక డిఫాల్ట్ ఉద్యోగి కోసం హాలిడే జాబితా సెట్ దయచేసి {0} లేదా కంపెనీ {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} చేస్తుంది ఉందో
@@ -4971,18 +5061,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},రో లేవు {0}: మొత్తం ఖర్చు చెప్పడం {1} వ్యతిరేకంగా మొత్తం పెండింగ్ కంటే ఎక్కువ ఉండకూడదు. పెండింగ్ మొత్తంలో {2}
 DocType: Maintenance Schedule,Schedule,షెడ్యూల్
 DocType: Account,Parent Account,మాతృ ఖాతా
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,అందుబాటులో
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,అందుబాటులో
 DocType: Quality Inspection Reading,Reading 3,3 పఠనం
 ,Hub,హబ్
 DocType: GL Entry,Voucher Type,ఓచర్ టైప్
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,ధర జాబితా దొరకలేదు లేదా డిసేబుల్ లేదు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,ధర జాబితా దొరకలేదు లేదా డిసేబుల్ లేదు
 DocType: Lab Test,Approved,ఆమోదించబడింది
 DocType: Pricing Rule,Price,ధర
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',{0} ఏర్పాటు చేయాలి మీద ఉపశమనం ఉద్యోగి &#39;Left&#39; గా
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',{0} ఏర్పాటు చేయాలి మీద ఉపశమనం ఉద్యోగి &#39;Left&#39; గా
+DocType: Hub Settings,Last Sync On,చివరి సమకాలీకరణ ఆన్ చేయబడింది
 DocType: Guardian,Guardian,సంరక్షకుడు
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,అప్రైసల్ {0} {1} ఇవ్వబడిన తేదీ పరిధిలో ఉద్యోగి కోసం సృష్టించబడింది
 DocType: Employee,Education,ఎడ్యుకేషన్
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,del
 DocType: Selling Settings,Campaign Naming By,ద్వారా ప్రచారం నేమింగ్
 DocType: Employee,Current Address Is,ప్రస్తుత చిరునామా
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,మంత్లీ సేల్స్ టార్గెట్ (
@@ -4997,7 +5088,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,కోర్సు కోడ్:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,ఖర్చుల ఖాతాను నమోదు చేయండి
 DocType: Account,Stock,స్టాక్
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","రో # {0}: రిఫరెన్స్ డాక్యుమెంట్ టైప్ కొనుగోలు ఆర్డర్ ఒకటి, కొనుగోలు వాయిస్ లేదా జర్నల్ ఎంట్రీ ఉండాలి"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","రో # {0}: రిఫరెన్స్ డాక్యుమెంట్ టైప్ కొనుగోలు ఆర్డర్ ఒకటి, కొనుగోలు వాయిస్ లేదా జర్నల్ ఎంట్రీ ఉండాలి"
 DocType: Employee,Current Address,ప్రస్తుత చిరునామా
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","స్పష్టంగా పేర్కొన్న తప్ప తరువాత అంశం వివరణ, చిత్రం, ధర, పన్నులు టెంప్లేట్ నుండి సెట్ చేయబడతాయి etc మరొక అంశం యొక్క ఒక వైవిధ్యం ఉంటే"
 DocType: Serial No,Purchase / Manufacture Details,కొనుగోలు / తయారీ వివరాలు
@@ -5028,7 +5119,7 @@
 DocType: Hub Settings,Hub Settings,హబ్ సెట్టింగ్స్
 DocType: Project,Gross Margin %,స్థూల సరిహద్దు %
 DocType: BOM,With Operations,ఆపరేషన్స్ తో
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,అకౌంటింగ్ ఎంట్రీలు ఇప్పటికే కరెన్సీ చేసారు {0} సంస్థ కోసం {1}. కరెన్సీతో గానీ స్వీకరించదగిన లేదా చెల్లించవలసిన ఖాతాను ఎంచుకోండి {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,అకౌంటింగ్ ఎంట్రీలు ఇప్పటికే కరెన్సీ చేసారు {0} సంస్థ కోసం {1}. కరెన్సీతో గానీ స్వీకరించదగిన లేదా చెల్లించవలసిన ఖాతాను ఎంచుకోండి {0}.
 DocType: Asset,Is Existing Asset,ఆస్తి ఉన్న ఈజ్
 DocType: Salary Detail,Statistical Component,స్టాటిస్టికల్ భాగం
 DocType: Salary Detail,Statistical Component,స్టాటిస్టికల్ భాగం
@@ -5037,13 +5128,14 @@
 DocType: BOM Operation,BOM Operation,బిఒఎం ఆపరేషన్
 DocType: Purchase Taxes and Charges,On Previous Row Amount,మునుపటి రో మొత్తం మీద
 DocType: Student,Home Address,హోం చిరునామా
+DocType: Item,Has Expiry Date,గడువు తేదీ ఉంది
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,అంశం వేరియంట్ సెట్టింగులు.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,ట్రాన్స్ఫర్ ఆస్తి
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,ట్రాన్స్ఫర్ ఆస్తి
 DocType: POS Profile,POS Profile,POS ప్రొఫైల్
 DocType: Training Event,Event Name,ఈవెంట్ పేరు
 DocType: Physician,Phone (Office),ఫోన్ (ఆఫీసు)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,అడ్మిషన్
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},కోసం ప్రవేశాలు {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,అడ్మిషన్
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},కోసం ప్రవేశాలు {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","సెట్ బడ్జెట్లు, లక్ష్యాలను మొదలైనవి కోసం కాలికోద్యోగం"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,వేరియబుల్ పేరు
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","{0} అంశం ఒక టెంప్లేట్, దాని వైవిధ్యాలు ఒకటి ఎంచుకోండి దయచేసి"
@@ -5052,7 +5144,7 @@
 DocType: Assessment Plan,Room,గది
 DocType: Purchase Order,Advance Paid,అడ్వాన్స్ చెల్లింపు
 DocType: Item,Item Tax,అంశం పన్ను
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,సరఫరాదారు మెటీరియల్
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,సరఫరాదారు మెటీరియల్
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,ఎక్సైజ్ వాయిస్
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,ప్రభావసీమ {0}% ఒకసారి కంటే ఎక్కువ కనిపిస్తుంది
 DocType: Expense Claim,Employees Email Id,ఉద్యోగులు ఇమెయిల్ ఐడి
@@ -5063,32 +5155,30 @@
 DocType: Program,Program Name,ప్రోగ్రామ్ పేరు
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,పన్ను లేదా ఛార్జ్ పరిగణించండి
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,వాస్తవ ప్యాక్ చేసిన అంశాల తప్పనిసరి
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} ప్రస్తుతం {1} సరఫరాదారు స్కోర్కార్డ్ నిలబడి ఉంది మరియు ఈ సరఫరాదారుకి కొనుగోలు ఆర్డర్లు హెచ్చరికతో జారీ చేయాలి.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} ప్రస్తుతం {1} సరఫరాదారు స్కోర్కార్డ్ నిలబడి ఉంది మరియు ఈ సరఫరాదారుకి కొనుగోలు ఆర్డర్లు హెచ్చరికతో జారీ చేయాలి.
 DocType: Employee Loan,Loan Type,లోన్ టైప్
 DocType: Scheduling Tool,Scheduling Tool,షెడ్యూలింగ్ టూల్
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,క్రెడిట్ కార్డ్
 DocType: BOM,Item to be manufactured or repacked,అంశం తయారు లేదా repacked వుంటుంది
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,స్టాక్ లావాదేవీలకు డిఫాల్ట్ సెట్టింగులను.
-DocType: Purchase Invoice,Next Date,తదుపరి తేదీ
 DocType: Employee Education,Major/Optional Subjects,మేజర్ / ఆప్షనల్ సబ్జెక్ట్స్
 DocType: Sales Invoice Item,Drop Ship,డ్రాప్ షిప్
+DocType: Hub Settings,Suspended,సస్పెండ్
 DocType: Training Event,Attendees,హాజర్
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","ఇక్కడ మీరు పేరు మరియు పేరెంట్, భార్యకు, పిల్లలకు ఆక్రమణ వంటి కుటుంబం వివరాలు అందుకోగలదు"
 DocType: Academic Term,Term End Date,టర్మ్ ముగింపు తేదీ
-DocType: Hub Settings,Seller Name,విక్రేత పేరు
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),పన్నులు మరియు ఆరోపణలు తగ్గించబడుతూ (కంపెనీ కరెన్సీ)
 DocType: Item Group,General Settings,సాధారణ సెట్టింగులు
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,కరెన్సీ నుండి మరియు కరెన్సీ అదే ఉండకూడదు
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,బోధకులను జోడించండి
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,మీరు కొనసాగే ముందు రూపం సేవ్ చేయాలి
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,మొదట కంపెనీని ఎంచుకోండి
 DocType: Item Attribute,Numeric Values,సంఖ్యా విలువలు
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,లోగో అటాచ్
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,స్టాక్ స్థాయిలు
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,స్టాక్ స్థాయిలు
 DocType: Customer,Commission Rate,కమిషన్ రేటు
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,{0} కోసం {0} స్కోర్కార్డ్లు సృష్టించబడ్డాయి:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,వేరియంట్ చేయండి
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,వేరియంట్ చేయండి
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,శాఖ బ్లాక్ సెలవు అప్లికేషన్లు.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","చెల్లింపు పద్ధతి, స్వీకరించండి ఒకటి ఉండాలి చెల్లించండి మరియు అంతర్గత బదిలీ"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,విశ్లేషణలు
@@ -5103,11 +5193,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,మూలధన నిల్వలను
 DocType: Shopping Cart Settings,Show Public Attachments,పబ్లిక్ అటాచ్మెంట్లు చూపించు
 DocType: Packing Slip,Package Weight Details,ప్యాకేజీ బరువు వివరాలు
+DocType: Restaurant Reservation,Reservation Time,రిజర్వేషన్ సమయం
 DocType: Payment Gateway Account,Payment Gateway Account,చెల్లింపు గేట్వే ఖాతా
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,చెల్లింపు పూర్తయిన తర్వాత ఎంపిక పేజీకి వినియోగదారు మళ్ళింపు.
 DocType: Company,Existing Company,ఇప్పటికే కంపెనీ
 DocType: Healthcare Settings,Result Emailed,ఫలితం ఇమెయిల్ చేయబడింది
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",పన్ను వర్గం &quot;మొత్తం&quot; మార్చబడింది ఆల్ కాని స్టాక్ అంశాలను ఎందుకంటే
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,అంశం కోడ్&gt; అంశం సమూహం&gt; బ్రాండ్
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,ఒక csv ఫైల్ను ఎంచుకోండి
 DocType: Student Leave Application,Mark as Present,కానుకగా మార్క్
 DocType: Supplier Scorecard,Indicator Color,సూచిక రంగు
@@ -5132,11 +5224,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,స్టూడెంట్ బ్యాచ్ చేయండి
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,ఫార్వర్డ్ కారి ఉంటుంది
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,బిఒఎం నుండి అంశాలు పొందండి
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,బిఒఎం నుండి అంశాలు పొందండి
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,సమయం రోజులు లీడ్
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},రో # {0}: తేదీ పోస్టింగ్ కొనుగోలు తేదీని అదే ఉండాలి {1} ఆస్తి యొక్క {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,విద్యార్థుల సంస్థ హాస్టల్ వద్ద నివసిస్తున్నారు ఉంది అయితే దీన్ని ఎంచుకోండి.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,పైన ఇచ్చిన పట్టికలో సేల్స్ ఆర్డర్స్ నమోదు చేయండి
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,పైన ఇచ్చిన పట్టికలో సేల్స్ ఆర్డర్స్ నమోదు చేయండి
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,సమర్పించలేదు జీతం స్లిప్స్
 ,Stock Summary,స్టాక్ సారాంశం
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,మరొక గిడ్డంగి నుండి ఒక ఆస్తి బదిలీ
@@ -5152,5 +5244,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},రో {0}: డెబిట్ ప్రవేశం తో జతచేయవచ్చు ఒక {1}
 DocType: Journal Entry,Subscription Section,సభ్యత్వ విభాగం
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,ఖాతా {0} ఉనికిలో లేదు
+DocType: Training Event,Training Program,శిక్షణ కార్యక్రమం
 DocType: Account,Cash,క్యాష్
 DocType: Employee,Short biography for website and other publications.,వెబ్సైట్ మరియు ఇతర ప్రచురణలకు క్లుప్త జీవితచరిత్ర.
diff --git a/erpnext/translations/th.csv b/erpnext/translations/th.csv
index 5a6bb02..9c5c2e0 100644
--- a/erpnext/translations/th.csv
+++ b/erpnext/translations/th.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,โหมดเงินเดือน
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,สมัครสมาชิก
 DocType: Patient,Divorced,หย่าร้าง
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,รายการซิงค์แล้ว
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,อนุญาตให้รายการที่จะเพิ่มหลายครั้งในการทำธุรกรรม
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,ยกเลิกวัสดุเยี่ยมชม {0} ก่อนที่จะยกเลิกการรับประกันเรียกร้องนี้
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,สินค้าอุปโภคบริโภค
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,ผู้อนุมัติการลา
 DocType: Sales Partner,Dealer,เจ้ามือ
 DocType: Consultation,Investigations,สืบสวน
+DocType: Restaurant Order Entry,Click Enter To Add,คลิก Enter เพื่อเพิ่ม
 DocType: Employee,Rented,เช่า
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,ใช้งานได้สำหรับผู้ใช้
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",หยุดใบสั่งผลิตไม่สามารถยกเลิกจุกมันเป็นครั้งแรกที่จะยกเลิก
 DocType: Vehicle Service,Mileage,ระยะทาง
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,คุณไม่อยากที่จะทิ้งสินทรัพย์นี้?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,คุณไม่อยากที่จะทิ้งสินทรัพย์นี้?
 DocType: Drug Prescription,Update Schedule,อัปเดตตารางเวลา
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,เลือกผู้ผลิตเริ่มต้น
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},สกุลเงินเป็นสิ่งจำเป็นสำหรับราคา {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,ตรวจสอบความพร้อมใช้งาน
 DocType: Job Applicant,Job Applicant,ผู้สมัครงาน
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,นี้ขึ้นอยู่กับการทำธุรกรรมกับผู้จัดหาสินค้านี้ ดูระยะเวลารายละเอียดด้านล่าง
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,ไม่มีผลมากขึ้น
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,กฎหมาย
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},ประเภทภาษีที่เกิดขึ้นจริงไม่สามารถรวมอยู่ในราคาสินค้าในแถว {0}
 DocType: Bank Guarantee,Customer,ลูกค้า
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),อัตราแลกเปลี่ยนจะต้องเป็นเช่นเดียวกับ {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ชื่อลูกค้า
 DocType: Vehicle,Natural Gas,ก๊าซธรรมชาติ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},บัญชีธนาคารไม่สามารถตั้งชื่อเป็น {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},บัญชีธนาคารไม่สามารถตั้งชื่อเป็น {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,หัว (หรือกลุ่ม) กับบัญชีรายการที่จะทำและจะรักษายอด
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),ที่โดดเด่นสำหรับ {0} ไม่ สามารถน้อยกว่า ศูนย์ ( {1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,ไม่มีการส่งบิลเงินเดือนเพื่อดำเนินการ
 DocType: Manufacturing Settings,Default 10 mins,เริ่มต้น 10 นาที
 DocType: Leave Type,Leave Type Name,ฝากชื่อประเภท
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,แสดงเปิด
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,มันเป็นสิ่งที่จำเป็นที่จะดำเนินการในวันนี้เองสำหรับที่กล่าวมาข้างต้นที่เกิดขึ้น
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,ชุด ล่าสุด ที่ประสบความสำเร็จ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,เช็คเอาท์
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural วารสารรายการ Submitted
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,รายการสั่งซื้อที่จะได้รับ
 DocType: SMS Center,All Supplier Contact,ติดต่อผู้ผลิตทั้งหมด
 DocType: Support Settings,Support Settings,การตั้งค่าการสนับสนุน
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,คาดว่าวันที่สิ้นสุดไม่สามารถจะน้อยกว่าที่คาดว่าจะเริ่มวันที่
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,คาดว่าวันที่สิ้นสุดไม่สามารถจะน้อยกว่าที่คาดว่าจะเริ่มวันที่
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,แถว # {0}: ให้คะแนนจะต้องเป็นเช่นเดียวกับ {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,คำร้องขอการลาใหม่
 ,Batch Item Expiry Status,Batch รายการสถานะหมดอายุ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,ตั๋วแลกเงิน
 DocType: Mode of Payment Account,Mode of Payment Account,โหมดของการบัญชีการชำระเงิน
 DocType: Consultation,Consultation,การปรึกษาหารือ
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,การขายและการคืนสินค้า
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,แสดงหลากหลายรูปแบบ
 DocType: Academic Term,Academic Term,ระยะทางวิชาการ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,วัสดุ
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,การดูแลสุขภาพ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ความล่าช้าในการชำระเงิน (วัน)
 DocType: Lab Prescription,Lab Prescription,การกําหนด Lab
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,เรียงตามราคา
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ค่าใช้จ่ายในการให้บริการ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},หมายเลขซีเรียล: {0} มีการอ้างถึงในใบแจ้งหนี้การขายแล้ว: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,ใบกำกับสินค้า
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},หมายเลขซีเรียล: {0} มีการอ้างถึงในใบแจ้งหนี้การขายแล้ว: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,ใบกำกับสินค้า
 DocType: Maintenance Schedule Item,Periodicity,การเป็นช่วง ๆ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ปีงบประมาณ {0} จะต้อง
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ฝ่ายจำเลย
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,แถว # {0}:
 DocType: Timesheet,Total Costing Amount,จํานวนต้นทุนรวม
 DocType: Delivery Note,Vehicle No,รถไม่มี
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,เลือกรายชื่อราคา
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,เลือกรายชื่อราคา
 DocType: Accounts Settings,Currency Exchange Settings,การตั้งค่าสกุลเงิน
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,แถว # {0}: เอกสารการชำระเงินจะต้องดำเนินการธุรกรรม
 DocType: Production Order Operation,Work In Progress,ทำงานในความคืบหน้า
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,กรุณาเลือกวันที่
 DocType: Employee,Holiday List,รายการวันหยุด
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,โปรดตั้งค่าระบบการตั้งชื่อผู้เรียนในโรงเรียน&gt; การตั้งค่าโรงเรียน
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,นักบัญชี
+DocType: Hub Settings,Selling Price List,รายการราคาขาย
 DocType: Patient,Tobacco Current Use,การใช้ในปัจจุบันของยาสูบ
 DocType: Cost Center,Stock User,หุ้นผู้ใช้
 DocType: Company,Phone No,โทรศัพท์ไม่มี
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,ตารางหลักสูตรการสร้าง:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},ใหม่ {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},ใหม่ {0}: # {1}
 ,Sales Partners Commission,สำนักงานคณะกรรมการกำกับการขายหุ้นส่วน
 DocType: Purchase Invoice,Rounding Adjustment,การปรับการปัดเศษ
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,ตัวอักษรย่อ ห้ามมีความยาวมากกว่า 5 ตัวอักษร
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,docname รายละเอียดผู้ปกครอง
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",ข้อมูลอ้างอิง: {0} รหัสรายการ: {1} และลูกค้า: {2}
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,กิโลกรัม
-DocType: Student Log,Log,เข้าสู่ระบบ
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,เปิดงาน
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} ผลลัพธ์ที่ส่งมา
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} ผลลัพธ์ที่ส่งมา
 DocType: Item Attribute,Increment,การเพิ่มขึ้น
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,ช่วงเวลา
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,เลือกคลังสินค้า ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,แต่งงาน
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},ไม่อนุญาตสำหรับ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,รับรายการจาก
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},หุ้น ไม่สามารถปรับปรุง กับ การจัดส่งสินค้า หมายเหตุ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},หุ้น ไม่สามารถปรับปรุง กับ การจัดส่งสินค้า หมายเหตุ {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},สินค้า {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,ไม่มีรายการที่ระบุไว้
 DocType: Payment Reconciliation,Reconcile,คืนดี
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,กองทุน บำเหน็จบำนาญ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,ถัดไปวันที่ค่าเสื่อมราคาที่ไม่สามารถจะซื้อก่อนวันที่
 DocType: Consultation,Consultation Date,วันที่ปรึกษา
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,รายชื่อผลิตภัณฑ์และการค้นพบสำหรับผู้ใช้ ERPNext
 DocType: SMS Center,All Sales Person,คนขายทั้งหมด
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** การกระจายรายเดือน ** จะช่วยให้คุณแจกจ่ายงบประมาณ / เป้าหมายข้ามเดือนถ้าคุณมีฤดูกาลในธุรกิจของคุณ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,ไม่พบรายการ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,โครงสร้างเงินเดือนที่ขาดหายไป
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,ไม่พบรายการ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,โครงสร้างเงินเดือนที่ขาดหายไป
 DocType: Lead,Person Name,คนที่ชื่อ
 DocType: Sales Invoice Item,Sales Invoice Item,รายการใบแจ้งหนี้การขาย
 DocType: Account,Credit,เครดิต
 DocType: POS Profile,Write Off Cost Center,เขียนปิดศูนย์ต้นทุน
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",เช่น &quot;โรงเรียนประถม&quot; หรือ &quot;มหาวิทยาลัย&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",เช่น &quot;โรงเรียนประถม&quot; หรือ &quot;มหาวิทยาลัย&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,รายงานสต็อกสินค้า
 DocType: Warehouse,Warehouse Detail,รายละเอียดคลังสินค้า
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},วงเงินสินเชื่อที่ได้รับการข้ามสำหรับลูกค้า {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,วันที่สิ้นสุดระยะเวลาที่ไม่สามารถจะช้ากว่าปีวันที่สิ้นสุดปีการศึกษาที่คำว่ามีการเชื่อมโยง (ปีการศึกษา {}) โปรดแก้ไขวันและลองอีกครั้ง
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","ไม่สามารถเพิกถอน ""คือสินทรัพย์ถาวร"" ได้เพราะมีบันทึกสินทรัพย์ที่อยู่กับรายการ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","ไม่สามารถเพิกถอน ""คือสินทรัพย์ถาวร"" ได้เพราะมีบันทึกสินทรัพย์ที่อยู่กับรายการ"
 DocType: Vehicle Service,Brake Oil,น้ำมันเบรค
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ลูกค้า&gt; กลุ่มลูกค้า&gt; เขตแดน
 DocType: Tax Rule,Tax Type,ประเภทภาษี
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,จำนวนเงินที่ต้องเสียภาษี
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},คุณยังไม่ได้รับอนุญาตให้ เพิ่มหรือปรับปรุง รายการ ก่อน {0}
 DocType: BOM,Item Image (if not slideshow),รูปภาพสินค้า (ถ้าไม่สไลด์โชว์)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ลูกค้าที่มีอยู่ ที่มีชื่อเดียวกัน
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(อัตราค่าแรง / 60) * เวลาที่ดำเนินงานจริง
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,แถว # {0}: ประเภทเอกสารอ้างอิงต้องเป็นหนึ่งในการเรียกร้องค่าใช้จ่ายหรือบันทึกประจำวัน
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,เลือก BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,แถว # {0}: ประเภทเอกสารอ้างอิงต้องเป็นหนึ่งในการเรียกร้องค่าใช้จ่ายหรือบันทึกประจำวัน
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,เลือก BOM
 DocType: SMS Log,SMS Log,เข้าสู่ระบบ SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,ค่าใช้จ่ายในการจัดส่งสินค้า
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,วันหยุดในวันที่ {0} ไม่ได้ระหว่างนับจากวันและวันที่
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,เงินกู้พนักงาน
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,บันทึกกิจกรรม:
 DocType: Fee Schedule,Send Payment Request Email,ส่งอีเมลคำขอชำระเงิน
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,รายการที่ {0} ไม่อยู่ใน ระบบหรือ หมดอายุแล้ว
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,รายการที่ {0} ไม่อยู่ใน ระบบหรือ หมดอายุแล้ว
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,อสังหาริมทรัพย์
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,งบบัญชี
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ยา
@@ -210,18 +213,23 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,บันทึกข้อมูลการนำเข้า
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,ดึงขอวัสดุประเภทผลิตตามเกณฑ์ดังกล่าวข้างต้น
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,ไม่ได้ลงทะเบียนสำเร็จ
 DocType: Training Result Employee,Grade,เกรด
+DocType: Restaurant Table,No of Seats,ไม่มีที่นั่ง
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>",ในการเพิ่มเรื่องแบบไดนามิกให้ใช้แท็ก jinja เช่น <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>
 DocType: Sales Invoice Item,Delivered By Supplier,จัดส่งโดยผู้ผลิต
 DocType: SMS Center,All Contact,ติดต่อทั้งหมด
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,ใบสั่งผลิตสร้างไว้แล้วสำหรับรายการทั้งหมดที่มี BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,ใบสั่งผลิตสร้างไว้แล้วสำหรับรายการทั้งหมดที่มี BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,เงินเดือนประจำปี
 DocType: Daily Work Summary,Daily Work Summary,สรุปการทำงานประจำวัน
 DocType: Period Closing Voucher,Closing Fiscal Year,ปิดปีงบประมาณ
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} ถูกระงับการใช้งานชั่วคราว
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,กรุณาเลือก บริษัท ที่มีอยู่สำหรับการสร้างผังบัญชี
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} ถูกระงับการใช้งานชั่วคราว
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,กรุณาเลือก บริษัท ที่มีอยู่สำหรับการสร้างผังบัญชี
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,ค่าใช้จ่ายใน สต็อก
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,เลือกคลังข้อมูลเป้าหมาย
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,เลือกคลังข้อมูลเป้าหมาย
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,เลือกคลังข้อมูลเป้าหมาย
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,เลือกคลังข้อมูลเป้าหมาย
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,กรุณาใส่อีเมล์ที่ต้องการติดต่อ
 DocType: Program Enrollment,School Bus,รถโรงเรียน
 DocType: Journal Entry,Contra Entry,ในทางตรงกันข้ามการเข้า
@@ -239,9 +247,10 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","ดาวน์โหลดแม่แบบกรอกข้อมูลที่เหมาะสมและแนบไฟล์ที่ถูกแก้ไข
  ทุกวันและการรวมกันของพนักงานในระยะเวลาที่เลือกจะมาในแม่แบบที่มีการบันทึกการเข้าร่วมที่มีอยู่"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,รายการที่ {0} ไม่ได้ใช้งาน หรือจุดสิ้นสุดของ ชีวิต ได้ถึง
+DocType: Student Admission Program,Minimum Age,อายุขั้นต่ำ
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,ตัวอย่าง: วิชาคณิตศาสตร์พื้นฐาน
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",จะรวมถึง ภาษี ในแถว {0} ใน อัตรา รายการ ภาษี ใน แถว {1} จะต้องรวม
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,การตั้งค่าสำหรับ โมดูล ทรัพยากรบุคคล
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,การตั้งค่าสำหรับ โมดูล ทรัพยากรบุคคล
 DocType: SMS Center,SMS Center,ศูนย์ SMS
 DocType: Sales Invoice,Change Amount,เปลี่ยนจำนวน
 DocType: BOM Update Tool,New BOM,BOM ใหม่
@@ -251,7 +260,7 @@
 DocType: Lead,Request Type,ชนิดของการร้องขอ
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,สร้างพนักงาน
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,บรอดคาสติ้ง
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,เพิ่มห้อง
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),โหมดตั้งค่า POS (ออนไลน์ / ออฟไลน์)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,การปฏิบัติ
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,รายละเอียดของการดำเนินการดำเนินการ
 DocType: Serial No,Maintenance Status,สถานะการบำรุงรักษา
@@ -274,6 +283,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,รายการราคา จะต้องใช้ได้กับ การซื้อ หรือการขาย
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},วันที่ การติดตั้ง ไม่สามารถ ก่อนวันที่ จัดส่ง สินค้า {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),ส่วนลดราคา Rate (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,ชีวเคมี
 DocType: Offer Letter,Select Terms and Conditions,เลือกข้อตกลงและเงื่อนไข
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,ราคาออกมา
 DocType: Production Planning Tool,Sales Orders,ใบสั่งขาย
@@ -308,15 +318,15 @@
 DocType: Sales Partner,Reseller,ผู้ค้าปลีก
 DocType: Codification Table,Medical Code,รหัสทางการแพทย์
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.",หากการตรวจสอบจะรวมถึงรายการที่ไม่ใช่หุ้นในคำขอวัสดุ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,กรุณาใส่ บริษัท
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,กรุณาใส่ บริษัท
 DocType: Delivery Note Item,Against Sales Invoice Item,กับใบแจ้งหนี้การขายสินค้า
 ,Production Orders in Progress,สั่งซื้อ การผลิตใน ความคืบหน้า
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,เงินสดสุทธิจากการจัดหาเงินทุน
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save",LocalStorage เต็มไม่ได้บันทึก
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save",LocalStorage เต็มไม่ได้บันทึก
 DocType: Lead,Address & Contact,ที่อยู่และการติดต่อ
 DocType: Leave Allocation,Add unused leaves from previous allocations,เพิ่มใบไม่ได้ใช้จากการจัดสรรก่อนหน้า
 DocType: Sales Partner,Partner website,เว็บไซต์พันธมิตร
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,เพิ่มรายการ
+DocType: Restaurant Order Entry,Add Item,เพิ่มรายการ
 DocType: Lab Test,Custom Result,ผลลัพธ์แบบกำหนดเอง
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,ชื่อผู้ติดต่อ
 DocType: Course Assessment Criteria,Course Assessment Criteria,เกณฑ์การประเมินหลักสูตร
@@ -329,7 +339,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ขอซื้อ
 DocType: Lab Test,Submitted Date,วันที่ส่ง
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,นี้จะขึ้นอยู่กับแผ่น Time ที่สร้างขึ้นกับโครงการนี้
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,จ่ายสุทธิไม่สามารถน้อยกว่า 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,จ่ายสุทธิไม่สามารถน้อยกว่า 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",หากต้องการหยุดส่งการแจ้งเตือนข้อผิดพลาดซ้ำ ๆ จากระบบเราจะตรวจสอบฟิลด์ Disabled ในการสมัครสมาชิก
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,เพียง เลือก ผู้อนุมัติ ออกสามารถส่ง ออกจาก โปรแกรมนี้
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,บรรเทา วันที่ ต้องมากกว่า วันที่ เข้าร่วม
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,การลาต่อปี
@@ -338,9 +349,10 @@
 DocType: Email Digest,Profit & Loss,กำไรขาดทุน
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,ลิตร
 DocType: Task,Total Costing Amount (via Time Sheet),รวมคำนวณต้นทุนจำนวนเงิน (ผ่านใบบันทึกเวลา)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,โปรดตั้งค่านักเรียนภายใต้กลุ่มนักเรียน
 DocType: Item Website Specification,Item Website Specification,สเปกเว็บไซต์รายการ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ฝากที่ถูกบล็อก
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},รายการ {0} ได้ ถึงจุดสิ้นสุด ของ ชีวิตบน {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},รายการ {0} ได้ ถึงจุดสิ้นสุด ของ ชีวิตบน {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,รายการธนาคาร
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,ประจำปี
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,สต็อกสินค้าสมานฉันท์
@@ -349,7 +361,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,คอร์สกลุ่มนักศึกษาสร้างเครื่องมือ
 DocType: Lead,Do Not Contact,ไม่ ติดต่อ
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,คนที่สอนในองค์กรของคุณ
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,ID ไม่ซ้ำกันสำหรับการติดตามใบแจ้งหนี้ที่เกิดขึ้นทั้งหมด มันถูกสร้างขึ้นเมื่อส่ง
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,นักพัฒนาซอฟต์แวร์
 DocType: Item,Minimum Order Qty,จำนวนสั่งซื้อขั้นต่ำ
 DocType: Pricing Rule,Supplier Type,ประเภทผู้ผลิต
@@ -359,17 +370,19 @@
 DocType: Item,Publish in Hub,เผยแพร่ใน Hub
 DocType: Student Admission,Student Admission,การรับสมัครนักศึกษา
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,รายการ {0} จะถูกยกเลิก
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,ขอวัสดุ
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,รายการ {0} จะถูกยกเลิก
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,ขอวัสดุ
 DocType: Bank Reconciliation,Update Clearance Date,อัพเดทวันที่ Clearance
 DocType: Item,Purchase Details,รายละเอียดการซื้อ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},รายการ {0} ไม่พบใน &#39;วัตถุดิบมา&#39; ตารางในการสั่งซื้อ {1}
 DocType: Patient Relation,Relation,ความสัมพันธ์
 DocType: Shipping Rule,Worldwide Shipping,การจัดส่งสินค้าทั่วโลก
 DocType: Patient Relation,Mother,แม่
+DocType: Restaurant Reservation,Reservation End Time,เวลาสิ้นสุดการจอง
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,คำสั่งซื้อได้รับการยืนยันจากลูกค้า
 DocType: Purchase Receipt Item,Rejected Quantity,จำนวนปฏิเสธ
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,สร้างคำขอการชำระเงิน {0} แล้ว
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,สร้างคำขอการชำระเงิน {0} แล้ว
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,ความไวแสงต่ำ
 DocType: Notification Control,Notification Control,ควบคุมการแจ้งเตือน
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,โปรดยืนยันเมื่อคุณจบการฝึกอบรมแล้ว
 DocType: Lead,Suggestions,ข้อเสนอแนะ
@@ -389,7 +402,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,สลิปอีเมล์เงินเดือนให้กับพนักงานบนพื้นฐานของอีเมลที่ต้องการเลือกในการพนักงาน
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,อนุมัติไว้ครั้งแรกในรายการจะถูกกำหนดเป็นค่าเริ่มต้นอนุมัติไว้
 DocType: Tax Rule,Shipping County,การจัดส่งสินค้าเคาน์ตี้
-apps/erpnext/erpnext/config/desktop.py +158,Learn,เรียนรู้
+apps/erpnext/erpnext/config/desktop.py +159,Learn,เรียนรู้
 DocType: Asset,Next Depreciation Date,ถัดไปวันที่ค่าเสื่อมราคา
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,ค่าใช้จ่ายในกิจกรรมต่อพนักงาน
 DocType: Accounts Settings,Settings for Accounts,การตั้งค่าสำหรับบัญชี
@@ -400,13 +413,13 @@
 DocType: Item,Synced With Hub,ซิงค์กับฮับ
 DocType: Vehicle,Fleet Manager,ผู้จัดการกอง
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},แถว # {0}: {1} ไม่สามารถลบสำหรับรายการ {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,รหัสผ่านไม่ถูกต้อง
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,รหัสผ่านไม่ถูกต้อง
 DocType: Item,Variant Of,แตกต่างจาก
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',เสร็จสมบูรณ์จำนวนไม่สามารถจะสูงกว่า 'จำนวนการผลิต'
 DocType: Period Closing Voucher,Closing Account Head,ปิดหัวบัญชี
 DocType: Employee,External Work History,ประวัติการทำงานภายนอก
 DocType: Physician,Time per Appointment,เวลาต่อการนัดหมาย
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,ข้อผิดพลาดในการอ้างอิงแบบวงกลม
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,ข้อผิดพลาดในการอ้างอิงแบบวงกลม
 DocType: Appointment Type,Is Inpatient,เป็นผู้ป่วยใน
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,ชื่อ Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,ในคำพูดของ (ส่งออก) จะปรากฏเมื่อคุณบันทึกหมายเหตุจัดส่งสินค้า
@@ -415,19 +428,18 @@
 DocType: Lead,Industry,อุตสาหกรรม
 DocType: Employee,Job Profile,รายละเอียด งาน
 DocType: BOM Item,Rate & Amount,อัตราและจำนวนเงิน
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,กรุณาตั้งหมายเลขชุดสำหรับการเข้าร่วมประชุมผ่านทาง Setup&gt; Numbering Series
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,นี้ขึ้นอยู่กับการทำธุรกรรมกับ บริษัท นี้ ดูรายละเอียดเพิ่มเติมเกี่ยวกับเส้นเวลาด้านล่าง
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,แจ้งทางอีเมล์เมื่อการสร้างการร้องขอวัสดุโดยอัตโนมัติ
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,ต้านทาน
 DocType: Journal Entry,Multi Currency,หลายสกุลเงิน
 DocType: Payment Reconciliation Invoice,Invoice Type,ประเภทใบแจ้งหนี้
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ลูกค้า&gt; กลุ่มลูกค้า&gt; เขตแดน
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,หมายเหตุจัดส่งสินค้า
 DocType: Consultation,Encounter Impression,Encounter Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,การตั้งค่าภาษี
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,ต้นทุนของทรัพย์สินที่ขาย
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,เข้าชำระเงินได้รับการแก้ไขหลังจากที่คุณดึงมัน กรุณาดึงมันอีกครั้ง
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} ได้บันทึกเป็นครั้งที่สองใน รายการ ภาษี
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,สรุปในสัปดาห์นี้และกิจกรรมที่ค้างอยู่
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} ได้บันทึกเป็นครั้งที่สองใน รายการ ภาษี
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,สรุปในสัปดาห์นี้และกิจกรรมที่ค้างอยู่
 DocType: Student Applicant,Admitted,ที่ยอมรับ
 DocType: Workstation,Rent Cost,ต้นทุนการ ให้เช่า
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,จำนวนเงินหลังจากที่ค่าเสื่อมราคา
@@ -442,36 +454,35 @@
 DocType: Shipping Rule,Valid for Countries,ที่ถูกต้องสำหรับประเทศ
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,รายการนี้เป็นแม่แบบและไม่สามารถนำมาใช้ในการทำธุรกรรม คุณลักษณะสินค้าจะถูกคัดลอกไปสู่สายพันธุ์เว้นแต่ 'ไม่คัดลอก' ถูกตั้งค่า
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ยอดสั่งซื้อรวมถือว่า
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",การแต่งตั้ง พนักงาน ของคุณ (เช่น ซีอีโอ ผู้อำนวยการ ฯลฯ )
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).",การแต่งตั้ง พนักงาน ของคุณ (เช่น ซีอีโอ ผู้อำนวยการ ฯลฯ )
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,อัตราที่สกุลเงินลูกค้าจะแปลงเป็นสกุลเงินหลักของลูกค้า
 DocType: Course Scheduling Tool,Course Scheduling Tool,หลักสูตรเครื่องมือการตั้งเวลา
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},แถว # {0}: ซื้อใบแจ้งหนี้ไม่สามารถทำกับเนื้อหาที่มีอยู่ {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Urgent] เกิดข้อผิดพลาดขณะสร้าง% s ที่เกิดซ้ำสำหรับ% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Urgent] เกิดข้อผิดพลาดขณะสร้าง% s ที่เกิดซ้ำสำหรับ% s
 DocType: Item Tax,Tax Rate,อัตราภาษี
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} จัดสรรสำหรับพนักงาน {1} แล้วสำหรับรอบระยะเวลา {2} ถึง {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,เลือกรายการ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,เลือกรายการ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,ซื้อ ใบแจ้งหนี้ {0} มีการส่ง แล้ว
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},แถว # {0}: รุ่นที่ไม่มีจะต้องเป็นเช่นเดียวกับ {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,แปลงที่ไม่ใช่กลุ่ม
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,แบทช์ (มาก) ของรายการ
 DocType: C-Form Invoice Detail,Invoice Date,วันที่ออกใบแจ้งหนี้
 DocType: GL Entry,Debit Amount,จำนวนเงินเดบิต
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},มีเพียงสามารถเป็น 1 บัญชีต่อ บริษัท {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,โปรดดูสิ่งที่แนบมา
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},มีเพียงสามารถเป็น 1 บัญชีต่อ บริษัท {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,โปรดดูสิ่งที่แนบมา
 DocType: Purchase Order,% Received,% ที่ได้รับแล้ว
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,สร้างกลุ่มนักศึกษา
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,การติดตั้ง เสร็จสมบูรณ์ แล้ว !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,การติดตั้ง เสร็จสมบูรณ์ แล้ว !
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,เครดิตจำนวนเงิน
 DocType: Setup Progress Action,Action Document,เอกสารการกระทำ
 ,Finished Goods,สินค้า สำเร็จรูป
 DocType: Delivery Note,Instructions,คำแนะนำ
 DocType: Quality Inspection,Inspected By,การตรวจสอบโดย
 DocType: Maintenance Visit,Maintenance Type,ประเภทการบำรุงรักษา
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} ไม่ได้ลงทะเบียนในหลักสูตร {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,รหัสรายการ&gt; กลุ่มสินค้า&gt; แบรนด์
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} ไม่ได้ลงทะเบียนในหลักสูตร {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},อนุกรม ไม่มี {0} ไม่ได้อยู่ใน การจัดส่งสินค้า หมายเหตุ {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext สาธิต
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,เพิ่มรายการ
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,เพิ่มรายการ
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,รายการพารามิเตอร์การตรวจสอบคุณภาพ
 DocType: Leave Application,Leave Approver Name,ชื่อผู้อนุมัติการลา
 DocType: Depreciation Schedule,Schedule Date,กำหนดการ วันที่
@@ -493,7 +504,7 @@
 DocType: Salary Slip Timesheet,Working Hours,เวลาทำการ
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,เปลี่ยนหมายเลขลำดับเริ่มต้น / ปัจจุบันของชุดที่มีอยู่
 DocType: Dosage Strength,Strength,ความแข็งแรง
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,สร้างลูกค้าใหม่
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,สร้างลูกค้าใหม่
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",ถ้ากฎการกำหนดราคาหลายยังคงเหนือกว่าผู้ใช้จะขอให้ตั้งลำดับความสำคัญด้วยตนเองเพื่อแก้ไขความขัดแย้ง
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,สร้างใบสั่งซื้อ
 ,Purchase Register,สั่งซื้อสมัครสมาชิก
@@ -512,7 +523,7 @@
 DocType: Lab Test Template,Single,เดียว
 DocType: Salary Slip,Total Loan Repayment,รวมการชำระคืนเงินกู้
 DocType: Account,Cost of Goods Sold,ค่าใช้จ่ายของ สินค้าที่ขาย
-DocType: Purchase Invoice,Yearly,ประจำปี
+DocType: Subscription,Yearly,ประจำปี
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,กรุณาใส่ ศูนย์ต้นทุน
 DocType: Drug Prescription,Dosage,ปริมาณ
 DocType: Journal Entry Account,Sales Order,สั่งซื้อขาย
@@ -543,7 +554,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,การตั้งค่าโดยรวม สำหรับกระบวนการผลิตทั้งหมด
 DocType: Accounts Settings,Accounts Frozen Upto,บัญชีถูกแช่แข็งจนถึง
 DocType: SMS Log,Sent On,ส่ง
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,แอตทริบิวต์ {0} เลือกหลายครั้งในคุณสมบัติตาราง
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,แอตทริบิวต์ {0} เลือกหลายครั้งในคุณสมบัติตาราง
 DocType: HR Settings,Employee record is created using selected field. ,ระเบียนของพนักงานจะถูกสร้างขึ้นโดยใช้เขตข้อมูลที่เลือก
 DocType: Sales Order,Not Applicable,ไม่สามารถใช้งาน
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,นาย ฮอลิเดย์
@@ -569,13 +580,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ใบรวมจัดสรรมีผลบังคับใช้
 DocType: Patient,AB Positive,AB บวก
 DocType: Job Opening,Description of a Job Opening,คำอธิบายของการเปิดงาน
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,ที่รอดำเนินการกิจกรรมสำหรับวันนี้
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,ที่รอดำเนินการกิจกรรมสำหรับวันนี้
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,บันทึกการเข้าร่วมประชุม
 DocType: Salary Structure,Salary Component for timesheet based payroll.,ตัวแทนเงินเดือนสำหรับ timesheet ตามบัญชีเงินเดือน
 DocType: Sales Order Item,Used for Production Plan,ที่ใช้ในการวางแผนการผลิต
 DocType: Employee Loan,Total Payment,การชำระเงินรวม
 DocType: Manufacturing Settings,Time Between Operations (in mins),เวลาระหว่างการดำเนินงาน (ในนาที)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} ถูกยกเลิกดังนั้นการดำเนินการไม่สามารถทำได้
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} ถูกยกเลิกดังนั้นการดำเนินการไม่สามารถทำได้
 DocType: Customer,Buyer of Goods and Services.,ผู้ซื้อสินค้าและบริการ
 DocType: Journal Entry,Accounts Payable,บัญชีเจ้าหนี้
 DocType: Patient,Allergies,โรคภูมิแพ้
@@ -587,23 +598,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,เตือนคำสั่งซื้อ
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,รายการ บางส่วนของ ลูกค้าของคุณ พวกเขาจะเป็น องค์กร หรือบุคคล
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,อะไหล่พอที่จะสร้าง
+DocType: POS Profile User,POS Profile User,ผู้ใช้โปรไฟล์ POS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,รายได้ โดยตรง
 DocType: Patient Appointment,Date TIme,วันเวลา
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",ไม่สามารถกรอง ตาม บัญชี ถ้า จัดกลุ่มตาม บัญชี
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,พนักงานธุรการ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,กรุณาเลือกหลักสูตร
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,กรุณาเลือกหลักสูตร
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,กรุณาเลือกหลักสูตร
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,กรุณาเลือกหลักสูตร
 DocType: Codification Table,Codification Table,ตารางการแจกแจง
 DocType: Timesheet Detail,Hrs,ชั่วโมง
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,กรุณาเลือก บริษัท
 DocType: Stock Entry Detail,Difference Account,บัญชี ที่แตกต่างกัน
 DocType: Purchase Invoice,Supplier GSTIN,ผู้จัดจำหน่าย GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,ไม่สามารถปิดงานเป็นงานขึ้นอยู่กับ {0} ไม่ได้ปิด
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,กรุณากรอก คลังสินค้า ที่ ขอ วัสดุ จะ ได้รับการเลี้ยงดู
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,ไม่สามารถปิดงานเป็นงานขึ้นอยู่กับ {0} ไม่ได้ปิด
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,กรุณากรอก คลังสินค้า ที่ ขอ วัสดุ จะ ได้รับการเลี้ยงดู
 DocType: Production Order,Additional Operating Cost,เพิ่มเติมต้นทุนการดำเนินงาน
 DocType: Lab Test Template,Lab Routine,Lab Routine
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,เครื่องสำอาง
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items",ที่จะ ผสาน คุณสมบัติต่อไปนี้ จะต้อง เหมือนกันสำหรับ ทั้งสองรายการ
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items",ที่จะ ผสาน คุณสมบัติต่อไปนี้ จะต้อง เหมือนกันสำหรับ ทั้งสองรายการ
 DocType: Shipping Rule,Net Weight,ปริมาณสุทธิ
 DocType: Employee,Emergency Phone,โทรศัพท์ ฉุกเฉิน
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,ซื้อ
@@ -614,7 +626,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,โปรดกำหนดระดับสำหรับเกณฑ์ 0%
 DocType: Sales Order,To Deliver,ที่จะส่งมอบ
 DocType: Purchase Invoice Item,Item,สินค้า
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,อนุกรมไม่มีรายการไม่สามารถเป็นเศษส่วน
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,ความไวแสงสูง
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,อนุกรมไม่มีรายการไม่สามารถเป็นเศษส่วน
 DocType: Journal Entry,Difference (Dr - Cr),แตกต่าง ( ดร. - Cr )
 DocType: Account,Profit and Loss,กำไรและ ขาดทุน
 DocType: Patient,Risk Factors,ปัจจัยเสี่ยง
@@ -623,7 +636,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,รับเหมาช่วงการจัดการ
 DocType: Vital Signs,Body Temperature,อุณหภูมิของร่างกาย
 DocType: Project,Project will be accessible on the website to these users,โครงการจะสามารถเข้าถึงได้บนเว็บไซต์ของผู้ใช้เหล่านี้
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,กำหนดชนิดของโครงการ
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,กำหนดชนิดของโครงการ
 DocType: Supplier Scorecard,Weighting Function,ฟังก์ชันการถ่วงน้ำหนัก
 DocType: Physician,OP Consulting Charge,ค่าที่ปรึกษา OP
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,ตั้งค่าของคุณ
@@ -637,7 +650,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,ไม่สามารถเพิ่มเป็น 0
 DocType: Production Planning Tool,Material Requirement,ความต้องการวัสดุ
 DocType: Company,Delete Company Transactions,ลบรายการที่ บริษัท
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,อ้างอิงและการอ้างอิงวันที่มีผลบังคับใช้สำหรับการทำธุรกรรมธนาคาร
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,อ้างอิงและการอ้างอิงวันที่มีผลบังคับใช้สำหรับการทำธุรกรรมธนาคาร
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,เพิ่ม / แก้ไข ภาษีและค่าธรรมเนียม
 DocType: Payment Entry Reference,Supplier Invoice No,ใบแจ้งหนี้ที่ผู้ผลิตไม่มี
 DocType: Territory,For reference,สำหรับการอ้างอิง
@@ -645,12 +658,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions",ไม่สามารถลบไม่มี Serial {0} เป็นมันถูกนำมาใช้ในการทำธุรกรรมหุ้น
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),ปิด (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,สวัสดี
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,ย้ายรายการ
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,ย้ายรายการ
 DocType: Serial No,Warranty Period (Days),ระยะเวลารับประกัน (วัน)
 DocType: Installation Note Item,Installation Note Item,รายการหมายเหตุการติดตั้ง
 DocType: Production Plan Item,Pending Qty,รอดำเนินการจำนวน
 DocType: Budget,Ignore,ไม่สนใจ
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} ไม่ได้ใช้งาน
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} ไม่ได้ใช้งาน
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,ขนาดการตั้งค่าการตรวจสอบสำหรับการพิมพ์
 DocType: Salary Slip,Salary Slip Timesheet,Timesheet สลิปเงินเดือน
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,คลังสินค้า ผู้จัดจำหน่าย ผลบังคับใช้สำหรับ ย่อย ทำสัญญา รับซื้อ
@@ -659,7 +672,7 @@
 DocType: Pricing Rule,Sales Partner,พันธมิตรการขาย
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,ดัชนีชี้วัดทั้งหมดของ Supplier
 DocType: Buying Settings,Purchase Receipt Required,รับซื้อที่จำเป็น
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,อัตราการประเมินมีผลบังคับใช้หากเปิดการแจ้งเข้ามา
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,อัตราการประเมินมีผลบังคับใช้หากเปิดการแจ้งเข้ามา
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,ไม่พบใบแจ้งหนี้ในตารางบันทึก
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,กรุณาเลือก บริษัท และประเภทพรรคแรก
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,การเงิน รอบปีบัญชี /
@@ -696,7 +709,7 @@
 DocType: Quotation,Quotation To,ใบเสนอราคาเพื่อ
 DocType: Lead,Middle Income,มีรายได้ปานกลาง
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),เปิด ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,เริ่มต้นหน่วยวัดสำหรับรายการ {0} ไม่สามารถเปลี่ยนแปลงได้โดยตรงเพราะคุณได้ทำแล้วการทำธุรกรรมบาง (s) กับ UOM อื่น คุณจะต้องสร้างรายการใหม่ที่จะใช้ที่แตกต่างกันเริ่มต้น UOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,เริ่มต้นหน่วยวัดสำหรับรายการ {0} ไม่สามารถเปลี่ยนแปลงได้โดยตรงเพราะคุณได้ทำแล้วการทำธุรกรรมบาง (s) กับ UOM อื่น คุณจะต้องสร้างรายการใหม่ที่จะใช้ที่แตกต่างกันเริ่มต้น UOM
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,จำนวนเงินที่จัดสรร ไม่สามารถ ลบ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,โปรดตั้ง บริษัท
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,โปรดตั้ง บริษัท
@@ -711,6 +724,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,เลือกบัญชีการชำระเงินเพื่อเข้าธนาคาร
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll",สร้างระเบียนของพนักงานในการจัดการใบเรียกร้องค่าใช้จ่ายและเงินเดือน
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,ระยะเวลากําหนด
+DocType: Restaurant Reservation,Restaurant Reservation,จองร้านอาหาร
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,การเขียน ข้อเสนอ
 DocType: Payment Entry Deduction,Payment Entry Deduction,หักรายการชำระเงิน
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,อีกคนขาย {0} อยู่กับรหัสพนักงานเดียวกัน
@@ -718,7 +732,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,ข้อมูลหลัก
 DocType: Assessment Plan,Maximum Assessment Score,คะแนนประเมินสูงสุด
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,ปรับปรุงธนาคารวันที่เกิดรายการ
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,การติดตามเวลา
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,การติดตามเวลา
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,ทำซ้ำสำหรับผู้ขนส่ง
 DocType: Fiscal Year Company,Fiscal Year Company,ปีงบประมาณ บริษัท
 DocType: Packing Slip Item,DN Detail,รายละเอียด DN
@@ -727,8 +741,9 @@
 DocType: Batch,Batch Description,คำอธิบาย Batch
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,การสร้างกลุ่มนักเรียน
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,การสร้างกลุ่มนักเรียน
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.",Payment Gateway บัญชีไม่ได้สร้างโปรดสร้างด้วยตนเอง
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.",Payment Gateway บัญชีไม่ได้สร้างโปรดสร้างด้วยตนเอง
 DocType: Supplier Scorecard,Per Year,ต่อปี
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,ไม่มีสิทธิ์รับเข้าเรียนในโครงการนี้ต่อ DOB
 DocType: Sales Invoice,Sales Taxes and Charges,ภาษีการขายและค่าใช้จ่าย
 DocType: Employee,Organization Profile,องค์กร รายละเอียด
 DocType: Vital Signs,Height (In Meter),ความสูง (เป็นเมตร)
@@ -764,7 +779,7 @@
 DocType: Student Batch Name,Batch Name,ชื่อแบทช์
 DocType: Fee Validity,Max number of visit,จำนวนการเข้าชมสูงสุด
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet สร้าง:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},กรุณาตั้ง ค่าเริ่มต้น เงินสด หรือ บัญชีเงินฝากธนาคาร ใน โหมด ของ การชำระเงิน {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},กรุณาตั้ง ค่าเริ่มต้น เงินสด หรือ บัญชีเงินฝากธนาคาร ใน โหมด ของ การชำระเงิน {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,ลงทะเบียน
 DocType: GST Settings,GST Settings,การตั้งค่า GST
 DocType: Selling Settings,Customer Naming By,การตั้งชื่อตามลูกค้า
@@ -796,16 +811,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ที่ดินภาษีต้นทุนและค่าใช้จ่าย
 DocType: Production Order Operation,Actual Start Time,เวลาเริ่มต้นที่เกิดขึ้นจริง
 DocType: BOM Operation,Operation Time,เปิดบริการเวลา
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,เสร็จสิ้น
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,เสร็จสิ้น
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,ฐาน
 DocType: Timesheet,Total Billed Hours,รวมชั่วโมงการเรียกเก็บเงิน
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,เขียนทันทีจำนวน
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,เขียนทันทีจำนวน
 DocType: Leave Block List Allow,Allow User,อนุญาตให้ผู้ใช้
 DocType: Journal Entry,Bill No,หมายเลขบิล
 DocType: Company,Gain/Loss Account on Asset Disposal,บัญชีกำไร / ขาดทุนจากการขายสินทรัพย์
 DocType: Vehicle Log,Service Details,รายละเอียดการให้บริการ
 DocType: Vehicle Log,Service Details,รายละเอียดการให้บริการ
-DocType: Purchase Invoice,Quarterly,ทุกไตรมาส
+DocType: Subscription,Quarterly,ทุกไตรมาส
 DocType: Lab Test Template,Grouped,การจัดกลุ่ม
 DocType: Selling Settings,Delivery Note Required,หมายเหตุจัดส่งสินค้าที่จำเป็น
 DocType: Bank Guarantee,Bank Guarantee Number,หมายเลขการรับประกันธนาคาร
@@ -815,12 +830,12 @@
 DocType: Student Attendance,Student Attendance,นักศึกษาเข้าร่วม
 DocType: Sales Invoice Timesheet,Time Sheet,ใบบันทึกเวลา
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush วัตถุดิบที่ใช้ใน
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,กรุณากรอก รายละเอียดของรายการ
 DocType: Interest,Interest,ดอกเบี้ย
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,ขายก่อน
 DocType: Purchase Receipt,Other Details,รายละเอียดอื่น ๆ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Lab Test,Test Template,เทมเพลตการทดสอบ
+DocType: Restaurant Order Entry Item,Served,ทำหน้าที่
 DocType: Account,Accounts,บัญชี
 DocType: Vehicle,Odometer Value (Last),ราคาเครื่องวัดระยะทาง (สุดท้าย)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,เทมเพลตเกณฑ์การให้คะแนนของซัพพลายเออร์
@@ -832,26 +847,28 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,ดูตัวอย่างสลิปเงินเดือน
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,บัญชี {0} ได้รับการป้อนหลายครั้ง
 DocType: Account,Expenses Included In Valuation,ค่าใช้จ่ายรวมอยู่ในการประเมินมูลค่า
-DocType: Hub Settings,Seller City,ผู้ขายเมือง
 ,Absent Student Report,รายงานนักศึกษาขาด
 DocType: Email Digest,Next email will be sent on:,อีเมล์ถัดไปจะถูกส่งเมื่อ:
 DocType: Offer Letter Term,Offer Letter Term,เสนอระยะจดหมาย
 DocType: Supplier Scorecard,Per Week,ต่อสัปดาห์
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,รายการที่มีสายพันธุ์
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,รายการที่มีสายพันธุ์
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,นักศึกษารวม
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,รายการที่ {0} ไม่พบ
 DocType: Bin,Stock Value,มูลค่าหุ้น
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,บันทึกค่าใช้จ่ายจะถูกสร้างขึ้นในแบ็กกราวด์ ในกรณีที่มีข้อผิดพลาดใด ๆ ข้อความแสดงข้อผิดพลาดจะได้รับการอัปเดตในตารางเวลา
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,บริษัท {0} ไม่อยู่
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} มีความถูกต้องของค่าบริการจนถึง {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} มีความถูกต้องของค่าบริการจนถึง {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,ประเภท ต้นไม้
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Consumed จำนวนต่อหน่วย
 DocType: Serial No,Warranty Expiry Date,วันหมดอายุการรับประกัน
 DocType: Material Request Item,Quantity and Warehouse,ปริมาณและคลังสินค้า
+DocType: Hub Settings,Unregister,ยกเลิกการลงทะเบียน
 DocType: Sales Invoice,Commission Rate (%),อัตราค่าคอมมิชชั่น (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,โปรดเลือกโปรแกรม
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,โปรดเลือกโปรแกรม
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,โปรดเลือกโปรแกรม
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,โปรดเลือกโปรแกรม
 DocType: Project,Estimated Cost,ค่าใช้จ่ายประมาณ
 DocType: Purchase Order,Link to material requests,เชื่อมโยงไปยังการร้องขอวัสดุ
+DocType: Hub Settings,Publish,ประกาศ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,การบินและอวกาศ
 DocType: Journal Entry,Credit Card Entry,เข้าบัตรเครดิต
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,บริษัท ฯ และบัญชี
@@ -862,13 +879,12 @@
 DocType: Selling Settings,Close Opportunity After Days,ปิดโอกาสหลังจากวัน
 ,Reserved,ที่สงวนไว้
 DocType: Purchase Order,Supply Raw Materials,ซัพพลายวัตถุดิบ
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,วันที่ใบแจ้งหนี้ต่อไปจะถูกสร้างขึ้น มันถูกสร้างขึ้นบนส่ง
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,สินทรัพย์หมุนเวียน
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} ไม่ได้เป็นรายการควบคุมสต้อก
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',โปรดแบ่งปันความคิดเห็นของคุณในการฝึกอบรมโดยคลิกที่ &#39;Training Feedback&#39; จากนั้นคลิก &#39;New&#39;
 DocType: Mode of Payment Account,Default Account,บัญชีเริ่มต้น
 DocType: Payment Entry,Received Amount (Company Currency),ได้รับจำนวนเงิน ( บริษัท สกุล)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,ต้องตั้งช่องทาง ถ้า โอกาสถูกสร้างมาจากช่องทาง
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,ต้องตั้งช่องทาง ถ้า โอกาสถูกสร้างมาจากช่องทาง
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,กรุณาเลือก วันหยุด ประจำสัปดาห์
 DocType: Patient,O Negative,O เชิงลบ
 DocType: Production Order Operation,Planned End Time,เวลาสิ้นสุดการวางแผน
@@ -884,10 +900,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,พลังงาน
 DocType: Opportunity,Opportunity From,โอกาสจาก
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,งบเงินเดือน
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,เพิ่ม บริษัท
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,แถว {0}: {1} ต้องระบุหมายเลขผลิตภัณฑ์สำหรับรายการ {2} คุณได้ให้ {3} แล้ว
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,แถว {0}: {1} ต้องระบุหมายเลขผลิตภัณฑ์สำหรับรายการ {2} คุณได้ให้ {3} แล้ว
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,โปรดเลือกตาราง
 DocType: BOM,Website Specifications,ข้อมูลจำเพาะเว็บไซต์
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} คือที่อยู่อีเมลที่ไม่ถูกต้องใน &quot;ผู้รับ&quot;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} คือที่อยู่อีเมลที่ไม่ถูกต้องใน &quot;ผู้รับ&quot;
 DocType: Special Test Items,Particulars,รายละเอียด
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,ยาปฏิชีวนะ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: จาก {0} ประเภท {1}
@@ -895,11 +911,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,แถว {0}: ปัจจัยการแปลงมีผลบังคับใช้
 DocType: Employee,A+,A+
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",กฎราคาหลายอยู่กับเกณฑ์เดียวกันโปรดแก้ปัญหาความขัดแย้งโดยการกำหนดลำดับความสำคัญ กฎราคา: {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,ไม่สามารถยกเลิกการใช้งานหรือยกเลิก BOM ตามที่มีการเชื่อมโยงกับ BOMs อื่น ๆ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,ไม่สามารถยกเลิกการใช้งานหรือยกเลิก BOM ตามที่มีการเชื่อมโยงกับ BOMs อื่น ๆ
 DocType: Opportunity,Maintenance,การบำรุงรักษา
 DocType: Item Attribute Value,Item Attribute Value,รายการค่าแอตทริบิวต์
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,แคมเปญการขาย
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,สร้างเวลาการทำงาน
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,สร้างเวลาการทำงาน
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -956,12 +972,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,กรุณากรอก รายการ แรก
 DocType: Account,Liability,ความรับผิดชอบ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ตามทำนองคลองธรรมจำนวนเงินไม่สามารถจะสูงกว่าจำนวนเงินที่เรียกร้องในแถว {0}
+DocType: Salary Detail,Do not include in total,ไม่รวมในทั้งหมด
 DocType: Company,Default Cost of Goods Sold Account,เริ่มต้นค่าใช้จ่ายของบัญชีที่ขายสินค้า
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,ราคา ไม่ได้เลือก
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,ราคา ไม่ได้เลือก
 DocType: Employee,Family Background,ภูมิหลังของครอบครัว
 DocType: Request for Quotation Supplier,Send Email,ส่งอีเมล์
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},คำเตือน: สิ่งที่แนบมาไม่ถูกต้อง {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,ไม่ได้รับอนุญาต
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},คำเตือน: สิ่งที่แนบมาไม่ถูกต้อง {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,ไม่ได้รับอนุญาต
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,อ้างสิทธิ์ที่ร้องขอ
 DocType: Vital Signs,Heart Rate / Pulse,อัตราหัวใจ / ชีพจร
 DocType: Company,Default Bank Account,บัญชีธนาคารเริ่มต้น
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",ในการกรองขึ้นอยู่กับพรรคเลือกพรรคพิมพ์ครั้งแรก
@@ -989,12 +1007,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,รายการแถว {IDX}: {DOCTYPE} {} DOCNAME ไม่อยู่ในข้างต้น &#39;{} DOCTYPE&#39; ตาราง
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} เสร็จสมบูรณ์แล้วหรือยกเลิก
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ไม่มีงาน
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","วันของเดือนที่ใบแจ้งหนี้อัตโนมัติจะถูกสร้างขึ้นเช่น 05, 28 ฯลฯ"
 DocType: Item Variant Settings,Copy Fields to Variant,คัดลอกช่องข้อมูลเป็น Variant
 DocType: Asset,Opening Accumulated Depreciation,เปิดค่าเสื่อมราคาสะสม
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,คะแนน ต้องน้อยกว่า หรือ เท่ากับ 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,เครื่องมือการลงทะเบียนโปรแกรม
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C- บันทึก แบบฟอร์ม
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C- บันทึก แบบฟอร์ม
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,ลูกค้าและผู้จัดจำหน่าย
 DocType: Email Digest,Email Digest Settings,การตั้งค่าอีเมลเด่น
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,ขอบคุณสำหรับธุรกิจของคุณ!
@@ -1012,13 +1029,13 @@
 DocType: Request for Quotation Supplier,Quote Status,สถานะการอ้างอิง
 DocType: Maintenance Visit,Completion Status,สถานะเสร็จ
 DocType: HR Settings,Enter retirement age in years,ใส่อายุเกษียณในปีที่ผ่าน
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,คลังสินค้าเป้าหมาย
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,โปรดเลือกคลังสินค้า
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,คลังสินค้าเป้าหมาย
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,โปรดเลือกคลังสินค้า
 DocType: Cheque Print Template,Starting location from left edge,สถานที่เริ่มต้นจากขอบด้านซ้าย
 DocType: Item,Allow over delivery or receipt upto this percent,อนุญาตให้ส่งมอบหรือใบเสร็จรับเงินได้ไม่เกินร้อยละนี้
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,การเข้าร่วมประชุมและนำเข้า
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,ทั้งหมด รายการ กลุ่ม
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,ทั้งหมด รายการ กลุ่ม
 DocType: Process Payroll,Activity Log,บันทึกกิจกรรม
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,กำไร / ขาดทุน
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,เขียนข้อความ โดยอัตโนมัติใน การส่ง ของ การทำธุรกรรม
@@ -1030,7 +1047,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,จำนวนที่คาดการณ์ไว้
 DocType: Sales Invoice,Payment Due Date,วันที่ครบกำหนด ชำระเงิน
 DocType: Drug Prescription,Interval UOM,ช่วง UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,รายการตัวแปร {0} อยู่แล้วที่มีลักษณะเดียวกัน
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,รายการตัวแปร {0} อยู่แล้วที่มีลักษณะเดียวกัน
+DocType: Item,Hub Publishing Details,รายละเอียด Hub Publishing
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening','กำลังเปิด'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,เปิดให้ทำ
 DocType: Notification Control,Delivery Note Message,ข้อความหมายเหตุจัดส่งสินค้า
@@ -1050,10 +1068,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: วัตถุดิบไม่สามารถเหมือนกับรายการหลักได้
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ค่าใช้จ่ายรวมในการซื้อโต๊ะใบเสร็จรับเงินรายการที่จะต้องเป็นเช่นเดียวกับภาษีและค่าใช้จ่ายรวม
 DocType: Sales Team,Incentives,แรงจูงใจ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,ลงทะเบียนศูนย์
 DocType: SMS Log,Requested Numbers,ตัวเลขการขอ
 DocType: Production Planning Tool,Only Obtain Raw Materials,ขอรับเฉพาะวัตถุดิบ
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,ประเมินผลการปฏิบัติ
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",การเปิดใช้งาน &#39;ใช้สำหรับรถเข็น&#39; เป็นรถเข็นถูกเปิดใช้งานและควรจะมีกฎภาษีอย่างน้อยหนึ่งสำหรับรถเข็น
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",การเปิดใช้งาน &#39;ใช้สำหรับรถเข็น&#39; เป็นรถเข็นถูกเปิดใช้งานและควรจะมีกฎภาษีอย่างน้อยหนึ่งสำหรับรถเข็น
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",รายการชำระเงิน {0} มีการเชื่อมโยงกับการสั่งซื้อ {1} ตรวจสอบว่ามันควรจะดึงล่วงหน้าในใบแจ้งหนี้นี้
 DocType: Sales Invoice Item,Stock Details,หุ้นรายละเอียด
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,มูลค่าโครงการ
@@ -1072,12 +1091,14 @@
 DocType: Salary Slip,Working Days,วันทำการ
 DocType: Serial No,Incoming Rate,อัตราเข้า
 DocType: Packing Slip,Gross Weight,น้ำหนักรวม
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,ชื่อของ บริษัท ของคุณ ที่คุณ มีการตั้งค่า ระบบนี้
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,เปิดใช้งานฮับ
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,ชื่อของ บริษัท ของคุณ ที่คุณ มีการตั้งค่า ระบบนี้
 DocType: HR Settings,Include holidays in Total no. of Working Days,รวมถึงวันหยุดในไม่รวม ของวันทําการ
 DocType: Job Applicant,Hold,ถือ
 DocType: Employee,Date of Joining,วันที่ของการเข้าร่วม
 DocType: Naming Series,Update Series,Series ปรับปรุง
 DocType: Supplier Quotation,Is Subcontracted,เหมา
+DocType: Restaurant Table,Minimum Seating,ที่นั่งขั้นต่ำ
 DocType: Item Attribute,Item Attribute Values,รายการค่าแอตทริบิวต์
 DocType: Examination Result,Examination Result,ผลการตรวจสอบ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,ใบเสร็จรับเงินการสั่งซื้อ
@@ -1088,13 +1109,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},ไม่สามารถหาช่วงเวลาใน {0} วันถัดไปสำหรับการปฏิบัติงาน {1}
 DocType: Production Order,Plan material for sub-assemblies,วัสดุแผนประกอบย่อย
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,พันธมิตรการขายและดินแดน
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} จะต้องใช้งาน
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} จะต้องใช้งาน
 DocType: Journal Entry,Depreciation Entry,รายการค่าเสื่อมราคา
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,เลือกประเภทของเอกสารที่แรก
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ยกเลิก การเข้าชม วัสดุ {0} ก่อนที่จะ ยกเลิก การบำรุงรักษา นี้ เยี่ยมชม
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},อนุกรม ไม่มี {0} ไม่ได้อยู่ใน รายการ {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,จำนวนที่ต้องการ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,โกดังกับการทำธุรกรรมที่มีอยู่ไม่สามารถแปลงบัญชีแยกประเภท
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,โกดังกับการทำธุรกรรมที่มีอยู่ไม่สามารถแปลงบัญชีแยกประเภท
 DocType: Bank Reconciliation,Total Amount,รวมเป็นเงิน
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,สำนักพิมพ์ ทางอินเทอร์เน็ต
 DocType: Prescription Duration,Number,จำนวน
@@ -1105,7 +1126,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,ขายราคาตามรายการ
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.",ถ้าเลือกไว้ลูกค้าจะถูกสร้างขึ้นแมปกับผู้ป่วย จะมีการสร้างใบแจ้งหนี้ของผู้ป่วยต่อลูกค้ารายนี้ นอกจากนี้คุณยังสามารถเลือกลูกค้าที่มีอยู่ขณะสร้างผู้ป่วย
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,เผยแพร่เพื่อซิงค์รายการ
 DocType: Bank Reconciliation,Account Currency,สกุลเงินของบัญชี
 DocType: Lab Test,Sample ID,รหัสตัวอย่าง
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,กรุณาระบุบัญชีรอบปิด บริษัท
@@ -1114,11 +1134,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,พนักงาน {0} ไม่ได้ ใช้งานอยู่หรือ ไม่อยู่
 DocType: Fee Structure,Components,ส่วนประกอบ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},กรุณากรอกประเภทสินทรัพย์ในข้อ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,สินค้าหลากหลายรูปแบบ {0} ปรับปรุง
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,สินค้าหลากหลายรูปแบบ {0} ปรับปรุง
 DocType: Quality Inspection Reading,Reading 6,Reading 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,ไม่สามารถ {0} {1} {2} โดยไม่ต้องมีใบแจ้งหนี้ที่โดดเด่นในเชิงลบ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this",ที่จะสร้างขึ้น หากล่าช้าคุณจะต้องเปลี่ยนฟิลด์ &quot;ทำซ้ำในช่วงวันที่&quot; ด้วยตนเอง
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,ไม่สามารถ {0} {1} {2} โดยไม่ต้องมีใบแจ้งหนี้ที่โดดเด่นในเชิงลบ
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ใบแจ้งหนี้การซื้อล่วงหน้า
-DocType: Hub Settings,Sync Now,ซิงค์เดี๋ยวนี้
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},แถว {0}: รายการเครดิตไม่สามารถเชื่อมโยงกับ {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,กำหนดงบประมาณสำหรับปีงบการเงิน
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,เริ่มต้นบัญชีธนาคาร / เงินสดจะถูกปรับปรุงโดยอัตโนมัติในใบแจ้งหนี้ POS เมื่อโหมดนี้ถูกเลือก
@@ -1130,13 +1151,13 @@
 DocType: Item,Is Purchase Item,รายการซื้อเป็น
 DocType: Asset,Purchase Invoice,ซื้อใบแจ้งหนี้
 DocType: Stock Ledger Entry,Voucher Detail No,รายละเอียดบัตรกำนัลไม่มี
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,ใบแจ้งหนี้การขายใหม่
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,ใบแจ้งหนี้การขายใหม่
 DocType: Stock Entry,Total Outgoing Value,มูลค่าที่ส่งออกทั้งหมด
 DocType: Physician,Appointments,นัดหมาย
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,เปิดวันที่และวันปิดควรจะอยู่ในปีงบประมาณเดียวกัน
 DocType: Lead,Request for Information,การร้องขอข้อมูล
 ,LeaderBoard,ลีดเดอร์
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,ซิงค์ออฟไลน์ใบแจ้งหนี้
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,ซิงค์ออฟไลน์ใบแจ้งหนี้
 DocType: Payment Request,Paid,ชำระ
 DocType: Program Fee,Program Fee,ค่าธรรมเนียมโครงการ
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1155,11 +1176,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,สั่งซื้อสินค้าสั่งซื้อ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,รายได้ ทางอ้อม
 DocType: Student Attendance Tool,Student Attendance Tool,เครื่องมือนักศึกษาเข้าร่วม
+DocType: Restaurant Menu,Price List (Auto created),รายการราคา (สร้างโดยอัตโนมัติ)
 DocType: Cheque Print Template,Date Settings,การตั้งค่าของวันที่
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,ความแปรปรวน
 ,Company Name,ชื่อ บริษัท
 DocType: SMS Center,Total Message(s),ข้อความ รวม (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,เลือกรายการสำหรับการโอนเงิน
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,เลือกรายการสำหรับการโอนเงิน
 DocType: Purchase Invoice,Additional Discount Percentage,เพิ่มเติมร้อยละส่วนลด
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,ดูรายการทั้งหมดวิดีโอความช่วยเหลือที่
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,เลือกหัวที่บัญชีของธนาคารที่ตรวจสอบถูกวาง
@@ -1177,6 +1199,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,เมตร
 DocType: Workstation,Electricity Cost,ค่าใช้จ่าย ไฟฟ้า
 DocType: HR Settings,Don't send Employee Birthday Reminders,อย่าส่ง พนักงาน เตือนวันเกิด
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,บันทึกการตั้งค่า
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,ขอผลิตภัณฑ์
 DocType: Item,Inspection Criteria,เกณฑ์การตรวจสอบ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,โอน
 DocType: BOM Website Item,BOM Website Item,BOM รายการเว็บไซต์
@@ -1193,11 +1217,11 @@
 DocType: Journal Entry,Total Amount in Words,จำนวนเงินทั้งหมดในคำ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,เกิดข้อผิดพลาด น่าจะเป็น เหตุผลหนึ่งที่ อาจ เป็นไปได้ว่า คุณ ยังไม่ได้บันทึก ในรูปแบบ โปรดติดต่อ support@erpnext.com ถ้า ปัญหายังคงอยู่
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,รถเข็นของฉัน
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},ประเภทการสั่งซื้อต้องเป็นหนึ่งใน {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},ประเภทการสั่งซื้อต้องเป็นหนึ่งใน {0}
 DocType: Lead,Next Contact Date,วันที่ถัดไปติดต่อ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,เปิด จำนวน
 DocType: Healthcare Settings,Appointment Reminder,นัดหมายเตือน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,กรุณากรอกบัญชีเพื่อการเปลี่ยนแปลงจำนวน
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,กรุณากรอกบัญชีเพื่อการเปลี่ยนแปลงจำนวน
 DocType: Student Batch Name,Student Batch Name,นักศึกษาชื่อชุด
 DocType: Consultation,Doctor,คุณหมอ
 DocType: Holiday List,Holiday List Name,ชื่อรายการวันหยุด
@@ -1205,12 +1229,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,ตารางเรียน
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,ตัวเลือกหุ้น
 DocType: Journal Entry Account,Expense Claim,เรียกร้องค่าใช้จ่าย
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,จริงๆคุณต้องการเรียกคืนสินทรัพย์ไนต์นี้หรือไม่?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},จำนวนสำหรับ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,จริงๆคุณต้องการเรียกคืนสินทรัพย์ไนต์นี้หรือไม่?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},จำนวนสำหรับ {0}
 DocType: Leave Application,Leave Application,ใบลา
 DocType: Patient,Patient Relation,ความสัมพันธ์ของผู้ป่วย
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,เครื่องมือการจัดสรรการลา
+DocType: Item,Hub Category to Publish,ฮับประเภทที่จะเผยแพร่
 DocType: Leave Block List,Leave Block List Dates,ไม่ระบุวันที่รายการบล็อก
+DocType: Sales Invoice,Billing Address GSTIN,ที่อยู่การเรียกเก็บเงิน GSTIN
 DocType: Workstation,Net Hour Rate,อัตราชั่วโมงสุทธิ
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,ค่าใช้จ่ายใบเสร็จรับเงินลงซื้อ
 DocType: Company,Default Terms,ข้อกำหนดในการเริ่มต้น
@@ -1220,11 +1246,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},โปรดระบุ {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,รายการที่ลบออกด้วยการเปลี่ยนแปลงในปริมาณหรือไม่มีค่า
 DocType: Delivery Note,Delivery To,เพื่อจัดส่งสินค้า
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,ตาราง Attribute มีผลบังคับใช้
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,ตาราง Attribute มีผลบังคับใช้
 DocType: Production Planning Tool,Get Sales Orders,รับการสั่งซื้อการขาย
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ไม่สามารถเป็นจำนวนลบได้
 DocType: Training Event,Self-Study,การศึกษาด้วยตนเอง
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,ส่วนลด
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,ส่วนลด
 DocType: Asset,Total Number of Depreciations,จำนวนรวมของค่าเสื่อมราคา
 DocType: Sales Invoice Item,Rate With Margin,อัตรากับ Margin
 DocType: Sales Invoice Item,Rate With Margin,อัตรากับ Margin
@@ -1232,7 +1258,7 @@
 DocType: Task,Urgent,ด่วน
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},โปรดระบุ ID แถวที่ถูกต้องสำหรับแถว {0} ในตาราง {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,ไม่สามารถหาตัวแปร:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,โปรดเลือกฟิลด์ที่ต้องการแก้ไขจาก numpad
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,โปรดเลือกฟิลด์ที่ต้องการแก้ไขจาก numpad
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,ไปยัง Desktop และเริ่มต้นใช้ ERPNext
 DocType: Item,Manufacturer,ผู้ผลิต
 DocType: Landed Cost Item,Purchase Receipt Item,ซื้อสินค้าใบเสร็จรับเงิน
@@ -1263,8 +1289,8 @@
 DocType: GL Entry,Against,กับ
 DocType: Item,Default Selling Cost Center,ขาย เริ่มต้นที่ ศูนย์ต้นทุน
 DocType: Sales Partner,Implementation Partner,พันธมิตรการดำเนินงาน
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,รหัสไปรษณีย์
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},ใบสั่งขาย {0} เป็น {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,รหัสไปรษณีย์
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},ใบสั่งขาย {0} เป็น {1}
 DocType: Opportunity,Contact Info,ข้อมูลการติดต่อ
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,ทำรายการสต็อก
 DocType: Packing Slip,Net Weight UOM,UOM น้ำหนักสุทธิ
@@ -1275,6 +1301,7 @@
 DocType: Holiday List,Get Weekly Off Dates,รับวันปิดสัปดาห์
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,วันที่สิ้นสุด ไม่สามารถ จะน้อยกว่า วันเริ่มต้น
 DocType: Sales Person,Select company name first.,เลือกชื่อ บริษัท แรก
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,ต่ำไปสูง
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ใบเสนอราคาที่ได้รับจากผู้จัดจำหน่าย
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,แทนที่ BOM และอัปเดตราคาล่าสุดใน BOM ทั้งหมด
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},เพื่อ {0} | {1} {2}
@@ -1295,7 +1322,7 @@
 DocType: Program Enrollment,Transportation,การขนส่ง
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,แอตทริบิวต์ไม่ถูกต้อง
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} จำเป็นต้องส่ง
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},ปริมาณต้องน้อยกว่าหรือเท่ากับ {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},ปริมาณต้องน้อยกว่าหรือเท่ากับ {0}
 DocType: SMS Center,Total Characters,ตัวอักษรรวม
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},กรุณาเลือก BOM BOM ในด้านการพิจารณาวาระที่ {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form รายละเอียดใบแจ้งหนี้
@@ -1310,7 +1337,7 @@
 ,Ordered Items To Be Billed,รายการที่สั่งซื้อจะเรียกเก็บเงิน
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,จากช่วงจะต้องมีน้อยกว่าในช่วง
 DocType: Global Defaults,Global Defaults,เริ่มต้นทั่วโลก
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,ขอเชิญร่วมโครงการ
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,ขอเชิญร่วมโครงการ
 DocType: Salary Slip,Deductions,การหักเงิน
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,ชื่อการกระทำ
@@ -1328,13 +1355,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,ขายใบแจ้งหนี้ล่วงหน้า
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,ไม่มีอะไรที่จะ ขอ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},บันทึกงบประมาณอีก &#39;{0}&#39; อยู่แล้วกับ {1} &quot;{2} &#39;สำหรับปีงบการเงิน {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',' วันเริ่มต้น จริง ' ไม่สามารถ จะมากกว่า ' วันสิ้นสุด จริง '
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',' วันเริ่มต้น จริง ' ไม่สามารถ จะมากกว่า ' วันสิ้นสุด จริง '
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,การจัดการ
 DocType: Cheque Print Template,Payer Settings,การตั้งค่าการชำระเงิน
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","นี้จะถูกผนวกเข้ากับรหัสสินค้าของตัวแปร ตัวอย่างเช่นถ้าย่อของคุณคือ ""เอสเอ็ม"" และรหัสรายการคือ ""เสื้อยืด"" รหัสรายการของตัวแปรจะเป็น ""เสื้อ-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,จ่ายสุทธิ (คำ) จะสามารถมองเห็นได้เมื่อคุณบันทึกสลิปเงินเดือน
 DocType: Purchase Invoice,Is Return,คือการกลับมา
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,ความระมัดระวัง
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,ความระมัดระวัง
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,ย้อนกลับ / เดบิตหมายเหตุ
 DocType: Price List Country,Price List Country,ราคาประเทศ
 DocType: Item,UOMs,UOMs
@@ -1349,17 +1376,18 @@
 DocType: Account,Balance Sheet,รายงานงบดุล
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',ศูนย์ต้นทุนสำหรับสินค้าที่มีรหัสสินค้า '
 DocType: Fee Validity,Valid Till,ใช้ได้จนถึง
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",วิธีการชำระเงินไม่ได้กำหนดค่า กรุณาตรวจสอบไม่ว่าจะเป็นบัญชีที่ได้รับการตั้งค่าในโหมดของการชำระเงินหรือบนโปรไฟล์ POS
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",วิธีการชำระเงินไม่ได้กำหนดค่า กรุณาตรวจสอบไม่ว่าจะเป็นบัญชีที่ได้รับการตั้งค่าในโหมดของการชำระเงินหรือบนโปรไฟล์ POS
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,รายการเดียวกันไม่สามารถเข้ามาหลายครั้ง
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",บัญชีเพิ่มเติมสามารถทำภายใต้กลุ่ม แต่รายการที่สามารถทำกับกลุ่มที่ไม่
 DocType: Lead,Lead,ช่องทาง
 DocType: Email Digest,Payables,เจ้าหนี้
 DocType: Course,Course Intro,หลักสูตรแนะนำ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,แจ้งรายการ {0} สร้าง
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,กรุณาตั้งหมายเลขชุดสำหรับการเข้าร่วมประชุมผ่านทาง Setup&gt; Numbering Series
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,แจ้งรายการ {0} สร้าง
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,แถว # {0}: ปฏิเสธจำนวนไม่สามารถเข้าไปอยู่ในการซื้อกลับ
 ,Purchase Order Items To Be Billed,รายการใบสั่งซื้อที่จะได้รับจำนวนมากที่สุด
 DocType: Purchase Invoice Item,Net Rate,อัตราการสุทธิ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,โปรดเลือกลูกค้า
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,โปรดเลือกลูกค้า
 DocType: Purchase Invoice Item,Purchase Invoice Item,สั่งซื้อสินค้าใบแจ้งหนี้
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,รายการบัญชีแยกประเภทหุ้นและ GL รายการที่ reposted สำหรับซื้อรายรับที่เลือก
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,รายการที่ 1
@@ -1380,7 +1408,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},แถว ที่ซ้ำกัน {0} ด้วย เหมือนกัน {1}
 ,Trial Balance,งบทดลอง
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,ปีงบประมาณ {0} ไม่พบ
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,การตั้งค่าพนักงาน
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,การตั้งค่าพนักงาน
 DocType: Sales Order,SO-,ดังนั้น-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,กรุณาเลือก คำนำหน้า เป็นครั้งแรก
 DocType: Employee,O-,O-
@@ -1392,12 +1420,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,ดู บัญชีแยกประเภท
 DocType: Grading Scale,Intervals,ช่วงเวลา
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ที่เก่าแก่ที่สุด
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group",รายการกลุ่ม ที่มีอยู่ ที่มีชื่อเดียวกัน กรุณาเปลี่ยน ชื่อรายการหรือเปลี่ยนชื่อ กลุ่ม รายการ
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group",รายการกลุ่ม ที่มีอยู่ ที่มีชื่อเดียวกัน กรุณาเปลี่ยน ชื่อรายการหรือเปลี่ยนชื่อ กลุ่ม รายการ
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,หมายเลขโทรศัพท์มือถือของนักเรียน
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,ส่วนที่เหลือ ของโลก
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,ส่วนที่เหลือ ของโลก
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,รายการ {0} ไม่สามารถมีแบทช์
 ,Budget Variance Report,รายงานความแปรปรวนของงบประมาณ
 DocType: Salary Slip,Gross Pay,จ่ายขั้นต้น
+DocType: Item,Is Item from Hub,รายการจากฮับ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,แถว {0}: ประเภทกิจกรรมมีผลบังคับใช้
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,การจ่ายเงินปันผล
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,บัญชีแยกประเภท
@@ -1407,8 +1436,9 @@
 DocType: Vehicle Log,Service Detail,รายละเอียดบริการ
 DocType: BOM,Item Description,รายละเอียดสินค้า
 DocType: Student Sibling,Student Sibling,พี่น้องนักศึกษา
-DocType: Purchase Invoice,Is Recurring,เป็นที่เกิดขึ้น
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,วิธีการชำระเงิน
 DocType: Purchase Invoice,Supplied Items,จัดรายการ
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},โปรดตั้งเมนูที่ใช้งานสำหรับร้านอาหาร {0}
 DocType: Student,STUD.,สตั๊ด
 DocType: Production Order,Qty To Manufacture,จำนวนการผลิต
 DocType: Email Digest,New Income,รายได้ใหม่
@@ -1419,6 +1449,7 @@
 ,Student and Guardian Contact Details,นักเรียนและผู้ปกครองรายละเอียดการติดต่อ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,แถว {0}: สำหรับผู้จัดจำหน่าย {0} อีเมล์จะต้องส่งอีเมล
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,เปิดชั่วคราว
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,ดูฮับ
 ,Employee Leave Balance,ยอดคงเหลือพนักงานออก
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},ยอดคงเหลือ บัญชี {0} จะต้อง {1}
 DocType: Patient Appointment,More Info,ข้อมูลเพิ่มเติม
@@ -1438,13 +1469,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,การขายสินค้า {0} ไม่ถูกต้อง
 DocType: Supplier Scorecard,Warn for new Request for Quotations,แจ้งเตือนคำขอใหม่สำหรับใบเสนอราคา
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,คำสั่งซื้อที่ช่วยให้คุณวางแผนและติดตามในการซื้อสินค้าของคุณ
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged",ขออภัย บริษัท ไม่สามารถ รวม
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged",ขออภัย บริษัท ไม่สามารถ รวม
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,ข้อกำหนดการทดสอบในแล็บ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",ปริมาณการเบิก / โอนทั้งหมด {0} วัสดุในการจอง {1} \ ไม่สามารถจะสูงกว่าปริมาณการร้องขอ {2} สำหรับรายการ {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,เล็ก
 DocType: Employee,Employee Number,จำนวนพนักงาน
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},กรณีที่ ไม่ ( s) การใช้งานแล้ว ลอง จาก กรณี ไม่มี {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},กรณีที่ ไม่ ( s) การใช้งานแล้ว ลอง จาก กรณี ไม่มี {0}
 DocType: Project,% Completed,% เสร็จสมบูรณ์
 ,Invoiced Amount (Exculsive Tax),จำนวนเงินที่ ออกใบแจ้งหนี้ ( Exculsive ภาษี )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,รายการที่ 2
@@ -1459,11 +1490,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,ค่าใช้จ่าย ทางอ้อม
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,แถว {0}: จำนวนมีผลบังคับใช้
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,การเกษตร
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,ซิงค์ข้อมูลหลัก
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,ซิงค์ข้อมูลหลัก
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,สินค้า หรือ บริการของคุณ
 DocType: Special Test Items,Special Test Items,รายการทดสอบพิเศษ
 DocType: Mode of Payment,Mode of Payment,โหมดของการชำระเงิน
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,ภาพ Website ควรจะเป็นไฟล์สาธารณะหรือ URL ของเว็บไซต์
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,ภาพ Website ควรจะเป็นไฟล์สาธารณะหรือ URL ของเว็บไซต์
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,กลุ่มนี้เป็นกลุ่ม รายการที่ ราก และ ไม่สามารถแก้ไขได้
@@ -1471,9 +1502,9 @@
 DocType: Vehicle,Fuel UOM,เชื้อเพลิง UOM
 DocType: Warehouse,Warehouse Contact Info,ข้อมูลติดต่อคลังสินค้า
 DocType: Payment Entry,Write Off Difference Amount,จำนวนหนี้สูญความแตกต่าง
-DocType: Purchase Invoice,Recurring Type,ประเภทที่เกิดขึ้น
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent",{0}: ไม่พบอีเมลของพนักงาน อีเมล์นี้จึงไม่ได้ถูกส่ง
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent",{0}: ไม่พบอีเมลของพนักงาน อีเมล์นี้จึงไม่ได้ถูกส่ง
 DocType: Item,Foreign Trade Details,รายละเอียดการค้าต่างประเทศ
+,Assessment Plan Status,สถานะแผนงานการประเมิน
 DocType: Email Digest,Annual Income,รายได้ต่อปี
 DocType: Serial No,Serial No Details,รายละเอียดหมายเลขเครื่อง
 DocType: Purchase Invoice Item,Item Tax Rate,อัตราภาษีสินค้า
@@ -1481,15 +1512,14 @@
 DocType: Student Group Student,Group Roll Number,หมายเลขกลุ่ม
 DocType: Student Group Student,Group Roll Number,หมายเลขกลุ่ม
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",มีบัญชีประเภทเครดิตเท่านั้น ที่สามารถเชื่อมโยงกับรายการประเภทเดบิต สำหรับ {0}
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,รวมทุกน้ำหนักงานควรจะ 1. โปรดปรับน้ำหนักของงานโครงการทั้งหมดตาม
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,หมายเหตุ การจัดส่ง {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,รวมทุกน้ำหนักงานควรจะ 1. โปรดปรับน้ำหนักของงานโครงการทั้งหมดตาม
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,หมายเหตุ การจัดส่ง {0} ไม่ได้ ส่ง
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,รายการ {0} จะต้องเป็น รายการ ย่อย หด
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,อุปกรณ์ ทุน
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",กฎข้อแรกคือการกำหนดราคาเลือกตาม 'สมัครในสนามซึ่งจะมีรายการกลุ่มสินค้าหรือยี่ห้อ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,โปรดตั้งค่ารหัสรายการก่อน
-DocType: Hub Settings,Seller Website,เว็บไซต์ขาย
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,โปรดตั้งค่ารหัสรายการก่อน
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,ร้อยละ จัดสรร รวม สำหรับทีม ขายควร เป็น 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,ร้อยละ จัดสรร รวม สำหรับทีม ขายควร เป็น 100
 DocType: Sales Invoice Item,Edit Description,แก้ไขรายละเอียด
 DocType: Antibiotic,Antibiotic,ยาปฏิชีวนะ
 ,Team Updates,การปรับปรุงทีม
@@ -1510,12 +1540,12 @@
 DocType: Purchase Invoice,Total (Company Currency),รวม (บริษัท สกุลเงิน)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,หมายเลข {0} เข้ามา มากกว่าหนึ่งครั้ง
 DocType: Depreciation Schedule,Journal Entry,รายการบันทึก
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} รายการ อยู่ระหว่างดำเนินการ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} รายการ อยู่ระหว่างดำเนินการ
 DocType: Workstation,Workstation Name,ชื่อเวิร์กสเตชัน
 DocType: Grading Scale Interval,Grade Code,รหัสเกรด
 DocType: POS Item Group,POS Item Group,กลุ่มสินค้า จุดขาย
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ส่งอีเมล์หัวข้อสำคัญ:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} ไม่ได้อยู่ในรายการ {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} ไม่ได้อยู่ในรายการ {1}
 DocType: Sales Partner,Target Distribution,การกระจายเป้าหมาย
 DocType: Salary Slip,Bank Account No.,เลขที่บัญชีธนาคาร
 DocType: Naming Series,This is the number of the last created transaction with this prefix,นี่คือหมายเลขของรายการที่สร้างขึ้นล่าสุดกับคำนำหน้านี้
@@ -1532,10 +1562,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,การขอใบเสนอราคาผู้ผลิต
 DocType: Healthcare Settings,Registration Message,ข้อความลงทะเบียน
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,ฮาร์ดแวร์
-DocType: Sales Order,Recurring Upto,ที่เกิดขึ้นไม่เกิน
 DocType: Prescription Dosage,Prescription Dosage,ปริมาณยาตามใบสั่งแพทย์
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,กรุณาเลือก บริษัท
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,กรุณาเลือก บริษัท
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,สิทธิ ออก
 DocType: Purchase Invoice,Supplier Invoice Date,วันที่ใบแจ้งหนี้ผู้จัดจำหน่าย
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,ต่อ
@@ -1551,10 +1580,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,เงื่อนไข ที่ทับซ้อนกัน ระหว่าง พบ :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,กับอนุทิน {0} จะถูกปรับแล้วกับบางบัตรกำนัลอื่น ๆ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,มูลค่าการสั่งซื้อทั้งหมด
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,อาหาร
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,อาหาร
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,ช่วงสูงอายุ 3
 DocType: Maintenance Schedule Item,No of Visits,ไม่มีการเข้าชม
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},กำหนดการซ่อมบำรุง {0} อยู่กับ {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,คุณต้องการเผยแพร่รายการไปยัง Hub หรือไม่?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,นักเรียนเข้าศึกษา
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},สกุลเงินของบัญชีจะต้องปิด {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},ผลรวมของคะแนนสำหรับเป้าหมายทั้งหมดควรจะเป็น 100 มันเป็น {0}
@@ -1565,9 +1595,9 @@
 DocType: Authorization Rule,Average Discount,ส่วนลดโดยเฉลี่ย
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,ยูทิลิตี้
-DocType: Purchase Invoice Item,Accounting,การบัญชี
+DocType: POS Profile,Accounting,การบัญชี
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,โปรดเลือก batches สำหรับ batched item
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,โปรดเลือก batches สำหรับ batched item
 DocType: Asset,Depreciation Schedules,ตารางค่าเสื่อมราคา
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,รับสมัครไม่สามารถออกจากนอกระยะเวลาการจัดสรร
 DocType: Activity Cost,Projects,โครงการ
@@ -1583,7 +1613,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',สถานะการอนุมัติ ต้อง 'อนุมัติ ' หรือ ' ปฏิเสธ '
 DocType: Physician,Contacts and Address,ที่อยู่ติดต่อและที่อยู่
 DocType: Purchase Invoice,Contact Person,Contact Person
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','วันที่คาดว่าจะเริ่มต้น' ไม่สามารถ จะมากกว่า 'วันที่คาดว่าจะจบ'
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','วันที่คาดว่าจะเริ่มต้น' ไม่สามารถ จะมากกว่า 'วันที่คาดว่าจะจบ'
 DocType: Course Scheduling Tool,Course End Date,แน่นอนวันที่สิ้นสุด
 DocType: Holiday List,Holidays,วันหยุด
 DocType: Sales Order Item,Planned Quantity,จำนวนวางแผน
@@ -1591,10 +1621,11 @@
 DocType: Item,Maintain Stock,รักษาสต็อก
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,รายการสต็อกที่สร้างไว้แล้วสำหรับการสั่งซื้อการผลิต
 DocType: Employee,Prefered Email,ที่ต้องการอีเมล์
+DocType: Student Admission,Eligibility and Details,คุณสมบัติและรายละเอียด
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,เปลี่ยนสุทธิในสินทรัพย์ถาวร
 DocType: Leave Control Panel,Leave blank if considered for all designations,เว้นไว้หากพิจารณากำหนดทั้งหมด
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ค่าใช้จ่าย ประเภท ' จริง ' ในแถว {0} ไม่สามารถ รวมอยู่ใน อัตรา รายการ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},สูงสุด: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},สูงสุด: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,จาก Datetime
 DocType: Email Digest,For Company,สำหรับ บริษัท
 apps/erpnext/erpnext/config/support.py +17,Communication log.,บันทึกการสื่อสาร
@@ -1602,19 +1633,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,ตัวชี้วัดการให้คะแนน Scorecard ของซัพพลายเออร์
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,จำนวนซื้อ
 DocType: Sales Invoice,Shipping Address Name,การจัดส่งสินค้าที่อยู่ชื่อ
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,ผังบัญชี
 DocType: Material Request,Terms and Conditions Content,ข้อตกลงและเงื่อนไขเนื้อหา
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,ไม่สามารถมีค่ามากกว่า 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,รายการที่ {0} ไม่ได้เป็น รายการ สต็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,รายการที่ {0} ไม่ได้เป็น รายการ สต็อก
 DocType: Maintenance Visit,Unscheduled,ไม่ได้หมายกำหนดการ
 DocType: Employee,Owned,เจ้าของ
 DocType: Salary Detail,Depends on Leave Without Pay,ขึ้นอยู่กับการออกโดยไม่จ่ายเงิน
 DocType: Pricing Rule,"Higher the number, higher the priority",สูงกว่าจำนวนที่สูงขึ้นมีความสำคัญ
 ,Purchase Invoice Trends,แนวโน้มการซื้อใบแจ้งหนี้
 DocType: Employee,Better Prospects,อนาคตที่ดีกว่า
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",แถว # {0}: กลุ่ม {1} มีเพียง {2} จำนวน โปรดเลือกชุดที่มีจำนวน {3} จำนวนที่มีอยู่หรือแบ่งแถวเป็นหลายแถวเพื่อส่งมอบ / ออกจากแบทช์หลายรายการ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",แถว # {0}: กลุ่ม {1} มีเพียง {2} จำนวน โปรดเลือกชุดที่มีจำนวน {3} จำนวนที่มีอยู่หรือแบ่งแถวเป็นหลายแถวเพื่อส่งมอบ / ออกจากแบทช์หลายรายการ
 DocType: Vehicle,License Plate,ป้ายทะเบียนรถ
 DocType: Appraisal,Goals,เป้าหมาย
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,เลือกโปรไฟล์ POS
 DocType: Warranty Claim,Warranty / AMC Status,สถานะการรับประกัน / AMC
 ,Accounts Browser,ตัวเรียกดูบัญชี
 DocType: Payment Entry Reference,Payment Entry Reference,อ้างอิงรายการชำระเงิน
@@ -1633,7 +1664,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,พนักงานไม่สามารถรายงานให้กับตัวเอง
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",หากบัญชีถูกแช่แข็ง รายการ จะได้รับอนุญาต ให้กับผู้ใช้ ที่ จำกัด
 DocType: Email Digest,Bank Balance,ยอดเงินในธนาคาร
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},บัญชีรายการสำหรับ {0}: {1} สามารถทำได้ในสกุลเงิน: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},บัญชีรายการสำหรับ {0}: {1} สามารถทำได้ในสกุลเงิน: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.",รายละเอียด งาน คุณสมบัติ ที่จำเป็น อื่น ๆ
 DocType: Journal Entry Account,Account Balance,ยอดเงินในบัญชี
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,กฎภาษีสำหรับการทำธุรกรรม
@@ -1642,8 +1673,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),รวมภาษีและค่าบริการ (สกุลเงิน บริษัท )
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,แสดงยอดคงเหลือ P &amp; L ปีงบประมาณ unclosed ของ
 DocType: Lab Test Template,Collection Details,รายละเอียดคอลเล็กชัน
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","เลือก cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date จาก tabConsultation ct, `tabLab Prescription` cp โดย ct.patient = &#39;{0}&#39; และ cp.parent = ct. ชื่อและ cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,บัญชีการจัดส่งสินค้า
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: บัญชี {2} ไม่ได้ใช้งาน
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,ทำให้คำสั่งซื้อยอดขายที่จะช่วยให้คุณวางแผนการทำงานของคุณและส่งมอบตรงเวลา
@@ -1660,7 +1689,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,สลิป
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,สำนักงาน ให้เช่า
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,การตั้งค่าการติดตั้งเกตเวย์ SMS
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,นำเข้า ล้มเหลว
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,นำเข้า ล้มเหลว
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,ที่อยู่ไม่เพิ่มเลย
 DocType: Workstation Working Hour,Workstation Working Hour,เวิร์คสเตชั่ชั่วโมงการทำงาน
 DocType: Vital Signs,Blood Pressure,ความดันโลหิต
@@ -1685,7 +1714,7 @@
 DocType: Sales Invoice,Source,แหล่ง
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,แสดงปิด
 DocType: Leave Type,Is Leave Without Pay,ถูกทิ้งไว้โดยไม่ต้องจ่ายเงิน
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,ประเภทสินทรัพย์ที่มีผลบังคับใช้สำหรับรายการสินทรัพย์ถาวร
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,ประเภทสินทรัพย์ที่มีผลบังคับใช้สำหรับรายการสินทรัพย์ถาวร
 DocType: Fee Validity,Fee Validity,ความถูกต้องของค่าธรรมเนียม
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,ไม่พบในตารางการชำระเงินบันทึก
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},นี้ {0} ขัดแย้งกับ {1} สำหรับ {2} {3}
@@ -1706,8 +1735,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,การค้นหา ผู้บริหาร
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,สร้างโอกาสในการขาย
 DocType: Maintenance Schedule,Schedules,ตารางเวลา
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,จำเป็นต้องใช้ข้อมูล POS เพื่อใช้ Point-of-Sale
 DocType: Purchase Invoice Item,Net Amount,ปริมาณสุทธิ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,ยังไม่ได้ส่งรายการ {0} {1} ดังนั้นการดำเนินการไม่สามารถทำได้
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,ยังไม่ได้ส่งรายการ {0} {1} ดังนั้นการดำเนินการไม่สามารถทำได้
 DocType: Purchase Order Item Supplied,BOM Detail No,รายละเอียด BOM ไม่มี
 DocType: Landed Cost Voucher,Additional Charges,ค่าใช้จ่ายเพิ่มเติม
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),จำนวนส่วนลดเพิ่มเติม (สกุลเงิน บริษัท )
@@ -1716,7 +1746,7 @@
 ,Support Hour Distribution,การแจกแจงชั่วโมงการสนับสนุน
 DocType: Maintenance Visit,Maintenance Visit,การเข้ามาบำรุงรักษา
 DocType: Student,Leaving Certificate Number,ออกจากหมายเลขใบรับรอง
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}",นัดยกเลิกแล้วโปรดตรวจสอบและยกเลิกใบแจ้งหนี้ {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}",นัดยกเลิกแล้วโปรดตรวจสอบและยกเลิกใบแจ้งหนี้ {0}
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,จำนวนชุดที่โกดัง
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,รูปแบบการพิมพ์การปรับปรุง
 DocType: Landed Cost Voucher,Landed Cost Help,Landed ช่วยเหลือค่าใช้จ่าย
@@ -1739,8 +1769,8 @@
 DocType: Patient,Tobacco Past Use,การใช้ยาสูบในอดีต
 DocType: Sales Invoice Item,Brand Name,ชื่อยี่ห้อ
 DocType: Purchase Receipt,Transporter Details,รายละเอียด Transporter
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},ผู้ใช้ {0} ได้มอบหมายให้ Physician {1} แล้ว
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,คลังสินค้าเริ่มต้นเป็นสิ่งจำเป็นสำหรับรายการที่เลือก
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},ผู้ใช้ {0} ได้มอบหมายให้ Physician {1} แล้ว
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,คลังสินค้าเริ่มต้นเป็นสิ่งจำเป็นสำหรับรายการที่เลือก
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,กล่อง
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,ผู้ผลิตที่เป็นไปได้
 DocType: Budget,Monthly Distribution,การกระจายรายเดือน
@@ -1750,8 +1780,8 @@
 DocType: Sales Partner,Sales Partner Target,เป้าหมายยอดขายพันธมิตร
 DocType: Loan Type,Maximum Loan Amount,จำนวนเงินกู้สูงสุด
 DocType: Pricing Rule,Pricing Rule,กฎ การกำหนดราคา
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},หมายเลขม้วนซ้ำสำหรับนักเรียน {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},หมายเลขม้วนซ้ำสำหรับนักเรียน {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},หมายเลขม้วนซ้ำสำหรับนักเรียน {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},หมายเลขม้วนซ้ำสำหรับนักเรียน {0}
 DocType: Budget,Action if Annual Budget Exceeded,ดำเนินการหากเกินงบประมาณรายจ่ายประจำปี
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,สร้างคำขอวัสดุไปเป็นใบสั่งซื้อ
 DocType: Shopping Cart Settings,Payment Success URL,URL ที่ประสบความสำเร็จการชำระเงิน
@@ -1768,7 +1798,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} ต้องปรากฏเพียงครั้งเดียว
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},ไม่อนุญาตให้โอนมากขึ้น {0} กว่า {1} กับใบสั่งซื้อ {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},ใบ จัดสรร ประสบความสำเร็จ ในการ {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,ไม่มี รายการ ที่จะแพ็ค
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,ไม่มี รายการ ที่จะแพ็ค
 DocType: Shipping Rule Condition,From Value,จากมูลค่า
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,จำนวนการผลิต นี้มีความจำเป็น
 DocType: Employee Loan,Repayment Method,วิธีการชำระหนี้
@@ -1782,6 +1812,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,หนี้สิน หุ้น
 DocType: Purchase Invoice,Supplier Warehouse,คลังสินค้าผู้จัดจำหน่าย
 DocType: Opportunity,Contact Mobile No,เบอร์มือถือไม่มี
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,เลือก บริษัท
 ,Material Requests for which Supplier Quotations are not created,ขอ วัสดุ ที่ ใบเสนอราคา ของผู้ผลิต ไม่ได้สร้างขึ้น
 DocType: Student Group,Set 0 for no limit,ตั้ง 0 ไม่มีขีด จำกัด
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,วันที่ (s) ที่คุณจะใช้สำหรับการลาวันหยุด คุณไม่จำเป็นต้องใช้สำหรับการลา
@@ -1791,24 +1822,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,ทำให้ใบเสนอราคา
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,รายงานอื่น ๆ
 DocType: Dependent Task,Dependent Task,ขึ้นอยู่กับงาน
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},ปัจจัย การแปลง หน่วย เริ่มต้น ของการวัด จะต้อง อยู่ในแถว ที่ 1 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},ปัจจัย การแปลง หน่วย เริ่มต้น ของการวัด จะต้อง อยู่ในแถว ที่ 1 {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},การลา ประเภท {0} ไม่สามารถ จะยาวกว่า {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ลองวางแผน X วันล่วงหน้า
 DocType: HR Settings,Stop Birthday Reminders,หยุด วันเกิด การแจ้งเตือน
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},กรุณาตั้งค่าเริ่มต้นเงินเดือนบัญชีเจ้าหนี้ บริษัท {0}
 DocType: SMS Center,Receiver List,รายชื่อผู้รับ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,ค้นหาค้นหาสินค้า
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,ค้นหาค้นหาสินค้า
 DocType: Patient Appointment,Referring Physician,แพทย์แนะนำ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,บริโภคจํานวนเงิน
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,เปลี่ยนเป็นเงินสดสุทธิ
 DocType: Assessment Plan,Grading Scale,ระดับคะแนน
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,หน่วย ของการวัด {0} ได้รับการป้อน มากกว่าหนึ่งครั้งใน การแปลง ปัจจัย ตาราง
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,เสร็จสิ้นแล้ว
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,หน่วย ของการวัด {0} ได้รับการป้อน มากกว่าหนึ่งครั้งใน การแปลง ปัจจัย ตาราง
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,เสร็จสิ้นแล้ว
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,หุ้นอยู่ในมือ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},รวมเข้ากับการชำระเงินที่มีอยู่แล้ว {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ค่าใช้จ่ายของรายการที่ออก
 DocType: Physician,Hospital,โรงพยาบาล
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},จำนวนต้องไม่เกิน {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},จำนวนต้องไม่เกิน {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,ปีก่อนหน้านี้ทางการเงินไม่ได้ปิด
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),อายุ (วัน)
 DocType: Quotation Item,Quotation Item,รายการใบเสนอราคา
@@ -1819,8 +1850,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,ประเภท ผู้ผลิต หลัก
 DocType: Purchase Order Item,Supplier Part Number,หมายเลขชิ้นส่วนของผู้ผลิต
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,อัตราการแปลง ไม่สามารถเป็น 0 หรือ 1
-DocType: Sales Invoice,Reference Document,เอกสารอ้างอิง
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} ถูกยกเลิกหรือหยุดแล้ว
+DocType: Subscription,Reference Document,เอกสารอ้างอิง
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} ถูกยกเลิกหรือหยุดแล้ว
 DocType: Accounts Settings,Credit Controller,ควบคุมเครดิต
 DocType: Delivery Note,Vehicle Dispatch Date,วันที่ส่งยานพาหนะ
 DocType: Healthcare Settings,Default Medical Code Standard,Standard มาตรฐานการแพทย์
@@ -1829,6 +1860,7 @@
 DocType: Company,Default Payable Account,เริ่มต้นเจ้าหนี้การค้า
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",การตั้งค่าสำหรับตะกร้าช้อปปิ้งออนไลน์เช่นกฎการจัดส่งรายการราคา ฯลฯ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% เรียกเก็บเงินแล้ว
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,เรียงตามราคา ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,สงวนไว้ จำนวน
 DocType: Party Account,Party Account,บัญชีพรรค
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,ทรัพยากรบุคคล
@@ -1840,13 +1872,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,ทำให้การเบิกจ่ายรายการ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,แถว {0}: ล่วงหน้ากับต้องมีการหักเงินจากผู้ผลิต
 DocType: Company,Default Values,เริ่มต้นค่า
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{frequency} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{frequency} Digest
 DocType: Expense Claim,Total Amount Reimbursed,รวมจำนวนเงินชดเชย
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,แห่งนี้ตั้งอยู่บนพื้นฐานของบันทึกกับรถคันนี้ ดูระยะเวลารายละเอียดด้านล่าง
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},กับผู้ผลิตใบแจ้งหนี้ {0} วัน {1}
 DocType: Customer,Default Price List,รายการราคาเริ่มต้น
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,บันทึกการเคลื่อนไหวของสินทรัพย์ {0} สร้าง
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,คุณไม่สามารถลบปีงบประมาณ {0} ปีงบประมาณ {0} ตั้งเป็นค่าเริ่มต้นในการตั้งค่าส่วนกลาง
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,มีลูกค้าที่มีชื่อเดียวกันอยู่แล้ว
 DocType: Journal Entry,Entry Type,ประเภทรายการ
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,ไม่มีแผนการประเมินที่เชื่อมโยงกับกลุ่มประเมินนี้
 ,Customer Credit Balance,เครดิตบาลานซ์ลูกค้า
@@ -1857,7 +1890,7 @@
 DocType: Quotation,Term Details,รายละเอียดคำ
 DocType: Project,Total Sales Cost (via Sales Order),ยอดขายรวม (ผ่านใบสั่งขาย)
 DocType: Project,Total Sales Cost (via Sales Order),ยอดขายรวม (ผ่านใบสั่งขาย)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,ไม่สามารถลงทะเบียนมากกว่า {0} นักเรียนสำหรับนักเรียนกลุ่มนี้
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,ไม่สามารถลงทะเบียนมากกว่า {0} นักเรียนสำหรับนักเรียนกลุ่มนี้
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,นับตะกั่ว
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,นับตะกั่ว
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} ต้องมากกว่า 0
@@ -1875,9 +1908,11 @@
 DocType: Lab Test,Technician Name,ชื่อช่างเทคนิค
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ยกเลิกการเชื่อมโยงการชำระเงินในการยกเลิกใบแจ้งหนี้
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},อ่านวัดระยะทางที่ปัจจุบันเข้ามาควรจะมากกว่าครั้งแรกยานพาหนะ Odometer {0}
+DocType: Restaurant Reservation,No Show,ไม่แสดง
 DocType: Shipping Rule Country,Shipping Rule Country,กฎการจัดส่งสินค้าประเทศ
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,การลา และการเข้าร่วม
 DocType: Maintenance Visit,Partially Completed,เสร็จบางส่วน
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,ความไวปานกลาง
 DocType: Leave Type,Include holidays within leaves as leaves,รวมถึงวันหยุดที่อยู่ในใบเป็นใบ
 DocType: Sales Invoice,Packed Items,บรรจุรายการ
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,รับประกันเรียกร้องกับหมายเลขเครื่อง
@@ -1894,13 +1929,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),จำนวนเงินที่จ่าย (บริษัท สกุล)
 DocType: Purchase Invoice,Additional Discount,ส่วนลดเพิ่มเติม
 DocType: Selling Settings,Selling Settings,ตั้งค่าระบบการขาย
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,ยืนยันการดำเนินการ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,การประมูล ออนไลน์
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,โปรดระบุ ทั้ง จำนวน หรือ อัตรา การประเมิน หรือทั้งสองอย่าง
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,การบรรลุเป้าหมาย
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,ดูในรถเข็น
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,ค่าใช้จ่ายใน การตลาด
 ,Item Shortage Report,รายงานสินค้าไม่เพียงพอ
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","น้ำหนักที่ถูกกล่าวถึง, \n กรุณาระบุ ""น้ำหนัก UOM"" เกินไป"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","น้ำหนักที่ถูกกล่าวถึง, \n กรุณาระบุ ""น้ำหนัก UOM"" เกินไป"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ขอวัสดุที่ใช้เพื่อให้รายการสินค้านี้
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,ถัดไปวันที่มีผลบังคับใช้ค่าเสื่อมราคาของสินทรัพย์ใหม่
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,แยกกลุ่มตามหลักสูตรสำหรับทุกกลุ่ม
@@ -1913,12 +1949,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ทำให้ รายการ บัญชี สำหรับ ทุก การเคลื่อนไหวของ หุ้น
 DocType: Leave Allocation,Total Leaves Allocated,ใบรวมจัดสรร
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},ต้องระบุโกดังที่แถว {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,กรุณากรอกเริ่มต้นปีงบการเงินที่ถูกต้องและวันที่สิ้นสุด
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,กรุณากรอกเริ่มต้นปีงบการเงินที่ถูกต้องและวันที่สิ้นสุด
 DocType: Employee,Date Of Retirement,วันที่ของการเกษียณอายุ
 DocType: Upload Attendance,Get Template,รับแม่แบบ
 DocType: Material Request,Transferred,โอน
 DocType: Vehicle,Doors,ประตู
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,การติดตั้ง ERPNext เสร็จสิ้น
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,การติดตั้ง ERPNext เสร็จสิ้น
 DocType: Healthcare Settings,Collect Fee for Patient Registration,เก็บค่าธรรมเนียมการลงทะเบียนผู้ป่วย
 DocType: Course Assessment Criteria,Weightage,weightage
 DocType: Purchase Invoice,Tax Breakup,การแบ่งภาษี
@@ -1937,37 +1973,37 @@
 DocType: Employee,AB+,AB+
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",หากรายการนี้มีสายพันธุ์แล้วมันไม่สามารถเลือกในการสั่งซื้อการขายอื่น ๆ
 DocType: Lead,Next Contact By,ติดต่อถัดไป
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},จำนวน รายการ ที่จำเป็นสำหรับ {0} ในแถว {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},จำนวน รายการ ที่จำเป็นสำหรับ {0} ในแถว {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},คลังสินค้า {0} ไม่สามารถลบได้ เนื่องจากมีรายการ {1}
 DocType: Quotation,Order Type,ประเภทสั่งซื้อ
-DocType: Purchase Invoice,Notification Email Address,ที่อยู่อีเมลการแจ้งเตือน
 ,Item-wise Sales Register,การขายสินค้าที่ชาญฉลาดสมัครสมาชิก
 DocType: Asset,Gross Purchase Amount,จำนวนการสั่งซื้อขั้นต้น
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,ยอดคงเหลือเปิด
 DocType: Asset,Depreciation Method,วิธีการคิดค่าเสื่อมราคา
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,ออฟไลน์
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,ออฟไลน์
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,คือภาษีนี้รวมอยู่ในอัตราขั้นพื้นฐาน?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,เป้าหมายรวม
 DocType: Job Applicant,Applicant for a Job,สำหรับผู้สมัครงาน
 DocType: Production Plan Material Request,Production Plan Material Request,แผนการผลิตวัสดุที่ขอ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,ไม่มี ใบสั่ง ผลิต สร้างขึ้น
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,ไม่มี ใบสั่ง ผลิต สร้างขึ้น
 DocType: Stock Reconciliation,Reconciliation JSON,JSON สมานฉันท์
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,คอลัมน์มากเกินไป ส่งออกรายงานและพิมพ์โดยใช้โปรแกรมสเปรดชีต
 DocType: Purchase Invoice Item,Batch No,หมายเลขชุด
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},คำขอใบเสนอราคา: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,อนุญาตให้หลายคำสั่งขายกับการสั่งซื้อของลูกค้า
 DocType: Student Group Instructor,Student Group Instructor,ผู้สอนกลุ่มนักเรียน
 DocType: Student Group Instructor,Student Group Instructor,ผู้สอนกลุ่มนักเรียน
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 มือถือไม่มี
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,หลัก
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,หลัก
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,ตัวแปร
 DocType: Naming Series,Set prefix for numbering series on your transactions,กำหนดคำนำหน้าสำหรับหมายเลขชุดทำธุรกรรมของคุณ
 DocType: Employee Attendance Tool,Employees HTML,พนักงาน HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,BOM ค่าเริ่มต้น ({0}) จะต้องใช้งานสำหรับรายการนี้หรือแม่แบบของมัน
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,BOM ค่าเริ่มต้น ({0}) จะต้องใช้งานสำหรับรายการนี้หรือแม่แบบของมัน
 DocType: Employee,Leave Encashed?,ฝาก Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,โอกาสจากข้อมูลมีผลบังคับใช้
 DocType: Email Digest,Annual Expenses,ค่าใช้จ่ายประจำปี
 DocType: Item,Variants,ตัวแปร
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,สร้างใบสั่งซื้อ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,สร้างใบสั่งซื้อ
 DocType: SMS Center,Send To,ส่งให้
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},ที่มีอยู่ไม่ สมดุล เพียงพอสำหรับ การลา ออกจาก ประเภท {0}
 DocType: Payment Reconciliation Payment,Allocated amount,จำนวนเงินที่จัดสรร
@@ -1985,6 +2021,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,ความแรงของกลุ่มนักศึกษา
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,กับอนุทิน {0} ไม่ได้มีที่ไม่มีใครเทียบ {1} รายการ
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,การประเมินผล
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,กิจกรรมการฝึกอบรม
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},ซ้ำ หมายเลขเครื่อง ป้อนสำหรับ รายการ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,เงื่อนไขสำหรับกฎการจัดส่งสินค้า
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,กรุณากรอก
@@ -1994,7 +2031,7 @@
 DocType: Sales Order,To Deliver and Bill,การส่งและบิล
 DocType: Student Group,Instructors,อาจารย์ผู้สอน
 DocType: GL Entry,Credit Amount in Account Currency,จำนวนเงินเครดิตสกุลเงินในบัญชี
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} จะต้องส่ง
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} จะต้องส่ง
 DocType: Authorization Control,Authorization Control,ควบคุมการอนุมัติ
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},แถว # {0}: ปฏิเสธคลังสินค้ามีผลบังคับใช้กับปฏิเสธรายการ {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,วิธีการชำระเงิน
@@ -2013,11 +2050,11 @@
 DocType: Quotation Item,Actual Qty,จำนวนจริง
 DocType: Sales Invoice Item,References,อ้างอิง
 DocType: Quality Inspection Reading,Reading 10,อ่าน 10
-DocType: Hub Settings,Hub Node,Hub โหนด
+DocType: Hub Category,Hub Node,Hub โหนด
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,คุณได้ป้อนรายการซ้ำกัน กรุณาแก้ไขและลองอีกครั้ง
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,ภาคี
 DocType: Asset Movement,Asset Movement,การเคลื่อนไหวของสินทรัพย์
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,รถเข็นใหม่
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,รถเข็นใหม่
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,รายการที่ {0} ไม่ได้เป็นรายการ ต่อเนื่อง
 DocType: SMS Center,Create Receiver List,สร้างรายการรับ
 DocType: Vehicle,Wheels,ล้อ
@@ -2031,15 +2068,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,การสื่อสารโทรคมนาคม
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),แสดงให้เห็นว่าแพคเกจเป็นส่วนหนึ่งของการส่งมอบนี้ (เฉพาะร่าง)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,บันทึกรายการชำระเงิน
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},ปริมาณ รายการ {0} ต้องน้อยกว่า {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},ปริมาณ รายการ {0} ต้องน้อยกว่า {1}
 ,Sales Invoice Trends,แนวโน้มการขายใบแจ้งหนี้
 DocType: Leave Application,Apply / Approve Leaves,สมัคร / อนุมัติใบ
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,สำหรับ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,สำหรับ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',สามารถดู แถว เฉพาะในกรณีที่ ค่าใช้จ่าย ประเภทคือ ใน แถว หน้า จำนวน 'หรือ' แล้ว แถว รวม
 DocType: Sales Order Item,Delivery Warehouse,คลังสินค้าจัดส่งสินค้า
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,ต้นไม้ของศูนย์ต้นทุนทางการเงิน
 DocType: Serial No,Delivery Document No,เอกสารจัดส่งสินค้าไม่มี
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},โปรดตั้ง &#39;บัญชี / ขาดทุนกำไรจากการขายสินทรัพย์ใน บริษัท {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},โปรดตั้ง &#39;บัญชี / ขาดทุนกำไรจากการขายสินทรัพย์ใน บริษัท {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,รับสินค้าจากการสั่งซื้อใบเสร็จรับเงิน
 DocType: Serial No,Creation Date,วันที่สร้าง
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},รายการ {0} ปรากฏขึ้น หลายครั้งใน ราคาตามรายการ {1}
@@ -2050,12 +2087,13 @@
 DocType: Student,Student Mobile Number,หมายเลขโทรศัพท์มือถือของนักเรียน
 DocType: Item,Has Variants,มีหลากหลายรูปแบบ
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,อัปเดตการตอบกลับ
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},คุณได้เลือกแล้วรายการจาก {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},คุณได้เลือกแล้วรายการจาก {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ชื่อของการกระจายรายเดือน
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ต้องใช้รหัสแบทช์
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ต้องใช้รหัสแบทช์
 DocType: Sales Person,Parent Sales Person,ผู้ปกครองคนขาย
-DocType: Purchase Invoice,Recurring Invoice,ใบแจ้งหนี้ที่เกิดขึ้นประจำ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,สูงไปต่ำ
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,เลือกโปรแกรมก่อน
 DocType: Patient Appointment,Patient Age,อายุผู้ป่วย
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,จัดการโครงการ
 DocType: Supplier,Supplier of Goods or Services.,ผู้ผลิตสินค้าหรือบริการ
@@ -2063,8 +2101,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,บัญชีลูกหนี้ผิดนัดที่จะใช้หากไม่ได้ระบุไว้ในสมุดรายชื่อผู้ป่วย
 DocType: Vehicle Log,Fuel Price,ราคาน้ำมัน
 DocType: Budget,Budget,งบประมาณ
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,ตั้งค่าเปิด
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,รายการสินทรัพย์ถาวรจะต้องเป็นรายการที่ไม่สต็อก
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,ตั้งค่าเปิด
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,รายการสินทรัพย์ถาวรจะต้องเป็นรายการที่ไม่สต็อก
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",งบประมาณไม่สามารถกำหนดกับ {0} เป็นมันไม่ได้เป็นบัญชีรายได้หรือค่าใช้จ่าย
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,ที่ประสบความสำเร็จ
 DocType: Student Admission,Application Form Route,แบบฟอร์มใบสมัครเส้นทาง
@@ -2078,12 +2116,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,รายการที่ {0} ไม่ได้ ติดตั้ง สำหรับต้นแบบ อนุกรม Nos ได้ ตรวจสอบ รายการ
 DocType: Maintenance Visit,Maintenance Time,ระยะเวลาการบำรุงรักษา
 ,Amount to Deliver,ปริมาณการส่ง
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},มีการป้อนรายการเดียวกันหลายครั้ง {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,วันที่เริ่มวาระจะต้องไม่เร็วกว่าปีวันเริ่มต้นของปีการศึกษาที่คำว่ามีการเชื่อมโยง (ปีการศึกษา {}) โปรดแก้ไขวันและลองอีกครั้ง
 DocType: Guardian,Guardian Interests,สนใจการ์เดียน
 DocType: Naming Series,Current Value,ค่าปัจจุบัน
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,รอบระยะเวลาบัญชีที่มีอยู่หลายสำหรับวันที่ {0} โปรดตั้ง บริษัท ในปีงบประมาณ
 DocType: School Settings,Instructor Records to be created by,บันทึกผู้สอนที่จะสร้างขึ้นโดย
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} สร้าง
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} สร้าง
 DocType: Delivery Note Item,Against Sales Order,กับ การขายสินค้า
 ,Serial No Status,สถานะหมายเลขเครื่อง
 DocType: Payment Entry Reference,Outstanding,โดดเด่น
@@ -2094,10 +2133,10 @@
  ต้องมากกว่าหรือเท่ากับ {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,นี้ขึ้นอยู่กับการเคลื่อนไหวของหุ้น ดู {0} สำหรับรายละเอียด
 DocType: Pricing Rule,Selling,การขาย
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},จำนวน {0} {1} หักกับ {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},จำนวน {0} {1} หักกับ {2}
 DocType: Employee,Salary Information,ข้อมูลเงินเดือน
 DocType: Sales Person,Name and Employee ID,ชื่อและลูกจ้าง ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,วันที่ครบกำหนด ไม่สามารถ ก่อน วันที่ประกาศ
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,วันที่ครบกำหนด ไม่สามารถ ก่อน วันที่ประกาศ
 DocType: Website Item Group,Website Item Group,กลุ่มสินค้าเว็บไซต์
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,หน้าที่ และภาษี
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,กรุณากรอก วันที่ อ้างอิง
@@ -2123,7 +2162,7 @@
 DocType: Issue,Resolution Details,รายละเอียดความละเอียด
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,การจัดสรร
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,เกณฑ์การยอมรับ กําหนดเกณฑ์ การยอมรับ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,กรุณากรอกคำขอวัสดุในตารางข้างต้น
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,กรุณากรอกคำขอวัสดุในตารางข้างต้น
 DocType: Item Attribute,Attribute Name,ชื่อแอตทริบิวต์
 DocType: BOM,Show In Website,แสดงในเว็บไซต์
 DocType: Shopping Cart Settings,Show Quantity in Website,แสดงจำนวนสินค้าในเว็บไซต์
@@ -2132,7 +2171,7 @@
 DocType: Item Reorder,Check in (group),เช็คอิน (กลุ่ม)
 ,Qty to Order,จำนวนการสั่งซื้อสินค้า
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked",หัวบัญชีภายใต้ความรับผิดหรือส่วนได้เสียในการที่กำไร / ขาดทุนจะได้รับการจอง
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,แผนภูมิแกรนต์ของงานทั้งหมด
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,แผนภูมิแกรนต์ของงานทั้งหมด
 DocType: Opportunity,Mins to First Response,นาทีที่จะตอบสนองแรก
 DocType: Pricing Rule,Margin Type,ประเภทอัตรากำไรขั้นต้น
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} ชั่วโมง
@@ -2154,36 +2193,36 @@
 DocType: Patient,Surgical History,ประวัติการผ่าตัด
 DocType: Employee,Resignation Letter Date,วันที่ใบลาออก
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,กฎการกำหนดราคาจะถูกกรองต่อไปขึ้นอยู่กับปริมาณ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},โปรดกำหนดวันที่เข้าร่วมสำหรับพนักงาน {0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},โปรดกำหนดวันที่เข้าร่วมสำหรับพนักงาน {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},โปรดกำหนดวันที่เข้าร่วมสำหรับพนักงาน {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},โปรดกำหนดวันที่เข้าร่วมสำหรับพนักงาน {0}
 DocType: Task,Total Billing Amount (via Time Sheet),จำนวนเงินที่เรียกเก็บเงินรวม (ผ่านใบบันทึกเวลา)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ซ้ำรายได้ของลูกค้า
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ต้องมีสิทธิ์เป็น 'ผู้อนุมัติค่าใช้จ่าย'
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,คู่
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,เลือก BOM และจำนวนการผลิต
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,เลือก BOM และจำนวนการผลิต
 DocType: Asset,Depreciation Schedule,กำหนดการค่าเสื่อมราคา
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,ที่อยู่และที่อยู่ติดต่อของฝ่ายขาย
 DocType: Bank Reconciliation Detail,Against Account,กับบัญชี
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,ครึ่งวันวันควรอยู่ระหว่างนับจากวันและวันที่
 DocType: Maintenance Schedule Detail,Actual Date,วันที่เกิดขึ้นจริง
 DocType: Item,Has Batch No,ชุดมีไม่มี
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},การเรียกเก็บเงินประจำปี: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},การเรียกเก็บเงินประจำปี: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),ภาษีสินค้าและบริการ (GST India)
 DocType: Delivery Note,Excise Page Number,หมายเลขหน้าสรรพสามิต
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory",บริษัท นับจากวันที่และวันที่มีผลบังคับใช้
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,ได้รับจากการปรึกษาหารือ
 DocType: Asset,Purchase Date,วันที่ซื้อ
 DocType: Employee,Personal Details,รายละเอียดส่วนบุคคล
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},โปรดตั้ง &#39;ศูนย์สินทรัพย์ค่าเสื่อมราคาค่าใช้จ่ายใน บริษัท {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},โปรดตั้ง &#39;ศูนย์สินทรัพย์ค่าเสื่อมราคาค่าใช้จ่ายใน บริษัท {0}
 ,Maintenance Schedules,กำหนดการบำรุงรักษา
 DocType: Task,Actual End Date (via Time Sheet),ที่เกิดขึ้นจริงวันที่สิ้นสุด (ผ่านใบบันทึกเวลา)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},จำนวน {0} {1} กับ {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},จำนวน {0} {1} กับ {2} {3}
 ,Quotation Trends,ใบเสนอราคา แนวโน้ม
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},กลุ่มสินค้าไม่ได้กล่าวถึงในหลักรายการสำหรับรายการที่ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,เดบิตในการบัญชีจะต้องเป็นบัญชีลูกหนี้
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,เดบิตในการบัญชีจะต้องเป็นบัญชีลูกหนี้
 DocType: Shipping Rule Condition,Shipping Amount,จำนวนการจัดส่งสินค้า
 DocType: Supplier Scorecard Period,Period Score,ระยะเวลาคะแนน
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,เพิ่มลูกค้า
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,เพิ่มลูกค้า
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,จำนวนเงินที่ รอดำเนินการ
 DocType: Lab Test Template,Special,พิเศษ
 DocType: Purchase Invoice Item,Conversion Factor,ปัจจัยการเปลี่ยนแปลง
@@ -2191,13 +2230,14 @@
 ,Vehicle Expenses,ค่าใช้จ่ายในยานพาหนะ
 DocType: Serial No,Invoice Details,รายละเอียดใบแจ้งหนี้
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},ค่าที่คาดหวังหลังจากที่อายุการใช้งานจะต้องมากกว่าหรือเท่ากับ {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,เริ่มต้นเมื่อ
+DocType: Hub Category,Hub Category,หมวดหมู่ฮับ
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,จำนวนยานพาหนะ
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,วันที่ใบแจ้งหนี้ที่เกิดขึ้นจะถูกหยุด
 DocType: Employee Loan,Loan Amount,การกู้ยืมเงิน
 DocType: Program Enrollment,Self-Driving Vehicle,รถยนต์ขับเอง
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,จัดทำ Scorecard ของผู้จัดหา
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},แถว {0}: Bill of Materials ไม่พบรายการ {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},แถว {0}: Bill of Materials ไม่พบรายการ {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,ใบจัดสรรรวม {0} ไม่สามารถจะน้อยกว่าการอนุมัติแล้วใบ {1} สําหรับงวด
 DocType: Journal Entry,Accounts Receivable,ลูกหนี้
 ,Supplier-Wise Sales Analytics,ผู้ผลิต ฉลาด Analytics ขาย
@@ -2208,7 +2248,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)",หลักสูตรสำหรับผู้ปกครอง (เว้นแต่เป็นส่วนหนึ่งของหลักสูตรสำหรับผู้ปกครอง)
 DocType: Leave Control Panel,Leave blank if considered for all employee types,เว้นไว้หากพิจารณาให้พนักงานทุกประเภท
 DocType: Landed Cost Voucher,Distribute Charges Based On,กระจายค่าใช้จ่ายขึ้นอยู่กับ
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Timesheets
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,การตั้งค่าทรัพยากรบุคคล
 DocType: Salary Slip,net pay info,ข้อมูลค่าใช้จ่ายสุทธิ
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,ค่านี้ได้รับการปรับปรุงในรายการราคาขายเริ่มต้น
@@ -2219,7 +2259,7 @@
 DocType: Patient,B Positive,B บวก
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",แถว # {0}: จำนวนต้องเป็น 1 เป็นรายการที่เป็นสินทรัพย์ถาวร โปรดใช้แถวแยกต่างหากสำหรับจำนวนหลาย
 DocType: Leave Block List Allow,Leave Block List Allow,ฝากรายการบล็อกอนุญาตให้
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,เงื่อนไขที่ไม่สามารถเป็นที่ว่างเปล่าหรือพื้นที่
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,เงื่อนไขที่ไม่สามารถเป็นที่ว่างเปล่าหรือพื้นที่
 DocType: Patient Medical Record,Patient Medical Record,บันทึกการแพทย์ของผู้ป่วย
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,กลุ่มที่ไม่ใช่กลุ่ม
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,กีฬา
@@ -2236,9 +2276,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,ไม่สามารถหาอัตราแลกเปลี่ยนสำหรับ {0} ถึง {1} สำหรับวันสำคัญ {2} โปรดสร้างบันทึกการแลกเปลี่ยนสกุลเงินด้วยตนเอง
 DocType: POS Profile,Price List,บัญชีแจ้งราคาสินค้า
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ตอนนี้เป็นปีงบประมาณเริ่มต้น กรุณารีเฟรชเบราว์เซอร์ ของคุณ สำหรับการเปลี่ยนแปลงที่จะมีผลบังคับใช้
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,ค่าใช้จ่ายในการเรียกร้อง
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,ค่าใช้จ่ายในการเรียกร้อง
 DocType: Issue,Support,สนับสนุน
 ,BOM Search,BOM ค้นหา
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",เผยแพร่ &quot;ในสต็อก&quot; หรือ &quot;ไม่อยู่ในสต็อก&quot; บนฮับตามสต็อคที่มีอยู่ในคลังสินค้านี้
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),ปิด (เปิดผลรวม +)
 DocType: Vehicle,Fuel Type,ประเภทของน้ำมันเชื้อเพลิง
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,โปรดระบุสกุลเงินใน บริษัท
@@ -2250,16 +2291,16 @@
 DocType: Healthcare Settings,Remind Before,เตือนก่อน
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},ปัจจัย UOM แปลง จะต้อง อยู่ในแถว {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","แถว # {0}: การอ้างอิงเอกสารชนิดต้องเป็นหนึ่งในการสั่งซื้อสินค้าขาย, การขายใบแจ้งหนี้หรือวารสารรายการ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","แถว # {0}: การอ้างอิงเอกสารชนิดต้องเป็นหนึ่งในการสั่งซื้อสินค้าขาย, การขายใบแจ้งหนี้หรือวารสารรายการ"
 DocType: Salary Component,Deduction,การหัก
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,แถว {0}: จากเวลาและต้องการเวลามีผลบังคับใช้
 DocType: Stock Reconciliation Item,Amount Difference,จำนวนเงินที่แตกต่าง
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},รายการสินค้าเพิ่มสำหรับ {0} ในราคา {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},รายการสินค้าเพิ่มสำหรับ {0} ในราคา {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,กรุณากรอกพนักงาน Id นี้คนขาย
 DocType: Territory,Classification of Customers by region,การจำแนกประเภทของลูกค้าตามภูมิภาค
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,ความแตกต่างจำนวนเงินต้องเป็นศูนย์
 DocType: Project,Gross Margin,กำไรขั้นต้น
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,กรุณากรอก ผลิต รายการ แรก
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,กรุณากรอก ผลิต รายการ แรก
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,ธนาคารคำนวณยอดเงินงบ
 DocType: Normal Test Template,Normal Test Template,เทมเพลตการทดสอบปกติ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ผู้ใช้ที่ถูกปิดการใช้งาน
@@ -2269,21 +2310,22 @@
 DocType: Salary Slip,Total Deduction,หักรวม
 ,Production Analytics,Analytics ผลิต
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,นี้ขึ้นอยู่กับการทำธุรกรรมกับผู้ป่วยรายนี้ ดูรายละเอียดจากเส้นเวลาด้านล่าง
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,ค่าใช้จ่ายในการปรับปรุง
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,ค่าใช้จ่ายในการปรับปรุง
 DocType: Employee,Date of Birth,วันเกิด
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,รายการ {0} ได้รับ กลับมา แล้ว
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ปีงบประมาณ ** หมายถึงปีทางการเงิน ทุกรายการบัญชีและการทำธุรกรรมอื่น ๆ ที่สำคัญมีการติดตามต่อปี ** ** การคลัง
 DocType: Opportunity,Customer / Lead Address,ลูกค้า / ที่อยู่
 DocType: Patient,DOB,วันเกิด
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,การตั้งค่า Scorecard ของผู้จัดหา
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},คำเตือน: ใบรับรอง SSL ที่ไม่ถูกต้องในสิ่งที่แนบมา {0}
-DocType: Student Admission,Eligibility,เหมาะ
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,ชื่อแผนประเมิน
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},คำเตือน: ใบรับรอง SSL ที่ไม่ถูกต้องในสิ่งที่แนบมา {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads",นำไปสู่การช่วยให้คุณได้รับธุรกิจเพิ่มรายชื่อทั้งหมดของคุณและมากขึ้นเป็นผู้นำของคุณ
 DocType: Production Order Operation,Actual Operation Time,เวลาการดำเนินงานที่เกิดขึ้นจริง
 DocType: Authorization Rule,Applicable To (User),ที่ใช้บังคับกับ (User)
 DocType: Purchase Taxes and Charges,Deduct,หัก
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,รายละเอียดตำแหน่งงาน
 DocType: Student Applicant,Applied,ประยุกต์
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Re - เปิด
 DocType: Sales Invoice Item,Qty as per Stock UOM,จำนวนตามสต็อก UOM
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,ชื่อ Guardian2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","อักขระพิเศษยกเว้น ""-"" ""."", ""#"" และ ""/"" ไม่ได้รับอนุญาตในการตั้งชื่อชุด"
@@ -2295,7 +2337,7 @@
 DocType: Request for Quotation,Manufacturing Manager,ผู้จัดการฝ่ายผลิต
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},อนุกรม ไม่มี {0} อยู่ภายใต้การ รับประกัน ไม่เกิน {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,แยกหมายเหตุจัดส่งสินค้าเข้าไปในแพคเกจ
-apps/erpnext/erpnext/hooks.py +98,Shipments,การจัดส่ง
+apps/erpnext/erpnext/hooks.py +107,Shipments,การจัดส่ง
 DocType: Payment Entry,Total Allocated Amount (Company Currency),รวมจัดสรร ( บริษัท สกุล)
 DocType: Purchase Order Item,To be delivered to customer,ที่จะส่งมอบให้กับลูกค้า
 DocType: BOM,Scrap Material Cost,ต้นทุนเศษวัสดุ
@@ -2318,8 +2360,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,การตั้งค่าชุดตัวเลือกรายการ
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,เลือก บริษัท ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,เว้นไว้หากพิจารณาให้หน่วยงานทั้งหมด
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",ประเภท ของการจ้างงาน ( ถาวร สัญญา ฝึกงาน ฯลฯ )
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} ต้องระบุสำหรับ รายการ {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).",ประเภท ของการจ้างงาน ( ถาวร สัญญา ฝึกงาน ฯลฯ )
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} ต้องระบุสำหรับ รายการ {1}
 DocType: Process Payroll,Fortnightly,รายปักษ์
 DocType: Currency Exchange,From Currency,จากสกุลเงิน
 DocType: Vital Signs,Weight (In Kilogram),น้ำหนัก (เป็นกิโลกรัม)
@@ -2344,7 +2386,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,กรุณา คลิกที่ 'สร้าง ตาราง ' ที่จะได้รับ ตารางเวลา
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,มีข้อผิดพลาดขณะลบตารางต่อไปนี้เป็น:
 DocType: Bin,Ordered Quantity,จำนวนสั่ง
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","เช่น ""เครื่องมือการสร้างสำหรับผู้ก่อสร้าง """
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","เช่น ""เครื่องมือการสร้างสำหรับผู้ก่อสร้าง """
 DocType: Grading Scale,Grading Scale Intervals,ช่วงการวัดผลการชั่ง
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: รายการบัญชีสำหรับ {2} สามารถทำในเฉพาะสกุลเงิน: {3}
 DocType: Production Order,In Process,ในกระบวนการ
@@ -2368,11 +2410,10 @@
 DocType: Purchase Invoice,With Payment of Tax,การชำระภาษี
 DocType: Expense Claim Detail,Expense Claim Detail,รายละเอียดค่าใช้จ่ายสินไหม
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICATE สำหรับซัพพลายเออร์
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,กรุณาเลือกบัญชีที่ถูกต้อง
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,กรุณาเลือกบัญชีที่ถูกต้อง
 DocType: Item,Weight UOM,UOM น้ำหนัก
 DocType: Salary Structure Employee,Salary Structure Employee,พนักงานโครงสร้างเงินเดือน
 DocType: Patient,Blood Group,กรุ๊ปเลือด
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,คาราคาซัง
 DocType: Course,Course Name,หลักสูตรการอบรม
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ผู้ใช้ที่สามารถอนุมัติพนักงานเฉพาะแอพพลิเคลา
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,อุปกรณ์ สำนักงาน
@@ -2391,7 +2432,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,ราคาจะไม่แสดงถ้าราคาไม่ได้ตั้งค่า
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,โปรดระบุประเทศสำหรับกฎการจัดส่งสินค้านี้หรือตรวจสอบการจัดส่งสินค้าทั่วโลก
 DocType: Stock Entry,Total Incoming Value,ค่าเข้ามาทั้งหมด
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,เดบิตในการที่จะต้อง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,เดบิตในการที่จะต้อง
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",Timesheets ช่วยให้การติดตามของเวลาค่าใช้จ่ายและการเรียกเก็บเงินสำหรับกิจกรรมที่ทำโดยทีมงานของคุณ
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ซื้อราคา
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,เทมเพลตของตัวแปรชี้วัดของซัพพลายเออร์
@@ -2401,7 +2442,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,กระทบยอดการชำระเงิน
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,กรุณา เลือกชื่อ Incharge บุคคล
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,เทคโนโลยี
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},รวมค้างชำระ: {0}
+DocType: Hub Settings,Unregister from Hub,ยกเลิกการลงทะเบียนจาก Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},รวมค้างชำระ: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM การดำเนินงานเว็บไซต์
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,จดหมายเสนอ
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,สร้างคำขอวัสดุ (MRP) และคำสั่งการผลิต
@@ -2413,7 +2455,9 @@
 DocType: Physician Schedule Time Slot,To Time,ถึงเวลา
 DocType: Authorization Rule,Approving Role (above authorized value),อนุมัติบทบาท (สูงกว่าค่าที่ได้รับอนุญาต)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,เครดิตการบัญชีจะต้องเป็นบัญชีเจ้าหนี้
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM เรียกซ้ำ : {0} ไม่สามารถ เป็นผู้ปกครอง หรือเด็ก ของ {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,โปรดเลือกการรับนักศึกษาซึ่งเป็นข้อบังคับสำหรับผู้สมัครที่ได้รับค่าเล่าเรียน
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM เรียกซ้ำ : {0} ไม่สามารถ เป็นผู้ปกครอง หรือเด็ก ของ {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,โปรดเลือกรายการราคาเพื่อเผยแพร่ราคา
 DocType: Production Order Operation,Completed Qty,จำนวนเสร็จ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",มีบัญชีประเภทเดบิตเท่านั้น ที่สามารถเชื่อมโยงกับรายการประเภทเครดิต สำหรับ {0}
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,ราคา {0} ถูกปิดใช้งาน
@@ -2426,39 +2470,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} เลขหมายประจำเครื่องจำเป็นสำหรับรายการ {1} คุณได้ให้ {2}
 DocType: Stock Reconciliation Item,Current Valuation Rate,อัตราการประเมินมูลค่าปัจจุบัน
 DocType: Item,Customer Item Codes,ลูกค้ารหัสสินค้า
+DocType: Training Event,Advance,ความก้าวหน้า
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,สำหรับการทำกิจวัตรอีกครั้ง
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,กำไรจากอัตราแลกเปลี่ยน / ขาดทุน
 DocType: Opportunity,Lost Reason,เหตุผลที่สูญหาย
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,ที่อยู่ใหม่
 DocType: Quality Inspection,Sample Size,ขนาดของกลุ่มตัวอย่าง
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,กรุณากรอกเอกสารใบเสร็จรับเงิน
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,รายการทั้งหมดที่ ได้รับการ ออกใบแจ้งหนี้ แล้ว
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',โปรดระบุที่ถูกต้อง &#39;จากคดีหมายเลข&#39;
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',โปรดระบุที่ถูกต้อง &#39;จากคดีหมายเลข&#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,ศูนย์ต้นทุนเพิ่มเติมสามารถทำภายใต้กลุ่ม แต่รายการที่สามารถทำกับกลุ่มที่ไม่
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ผู้ใช้และสิทธิ์
 DocType: Vehicle Log,VLOG.,VLOG
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},ใบสั่งผลิตที่สร้างไว้: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},ใบสั่งผลิตที่สร้างไว้: {0}
 DocType: Branch,Branch,สาขา
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,การพิมพ์และ การสร้างแบรนด์
 DocType: Company,Total Monthly Sales,ยอดขายรวมรายเดือน
 DocType: Bin,Actual Quantity,จำนวนที่เกิดขึ้นจริง
 DocType: Shipping Rule,example: Next Day Shipping,ตัวอย่างเช่นการจัดส่งสินค้าวันถัดไป
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,ไม่มี Serial {0} ไม่พบ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},สมัครรับข้อมูลแล้ว {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},สมัครรับข้อมูลแล้ว {0}
 DocType: Fee Schedule Program,Fee Schedule Program,ตารางค่าตอบแทน
 DocType: Fee Schedule Program,Student Batch,ชุดนักศึกษา
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,เลือก * จาก &quot;TabVital Signs&quot; ที่ผู้ป่วย = &#39;{0}&#39; โดย sign_date desc limit 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,ทำให้นักศึกษา
 DocType: Supplier Scorecard Scoring Standing,Min Grade,เกรดต่ำสุด
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},คุณได้รับเชิญที่จะทำงานร่วมกันในโครงการ: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},แพทย์ไม่พร้อมให้บริการเมื่อ {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},คุณได้รับเชิญที่จะทำงานร่วมกันในโครงการ: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},แพทย์ไม่พร้อมให้บริการเมื่อ {0}
 DocType: Leave Block List Date,Block Date,บล็อกวันที่
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},เพิ่มรหัสการสมัครรับข้อมูลภาคสนามแบบกำหนดเองใน doctype {0}
 DocType: Purchase Receipt,Supplier Delivery Note,หมายเหตุการจัดส่งของผู้จัดจำหน่าย
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,ลงทะเบียนเลย
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,ลงทะเบียนเลย
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},จำนวนจริง {0} / รอจำนวน {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},จำนวนจริง {0} / รอจำนวน {1}
 DocType: Purchase Invoice,E-commerce GSTIN,อีคอมเมิร์ซ GSTIN
 DocType: Sales Order,Not Delivered,ไม่ได้ส่ง
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,วันที่คาดว่าจะไม่สามารถเป็นได้ก่อนวันที่ทำรายการ
 ,Bank Clearance Summary,ข้อมูลอย่างย่อ Clearance ธนาคาร
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",การสร้างและจัดการ รายวันรายสัปดาห์ และรายเดือน ย่อยสลาย ทางอีเมล์
 DocType: Appraisal Goal,Appraisal Goal,เป้าหมายการประเมิน
@@ -2466,12 +2511,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,สิ่งปลูกสร้าง
 DocType: Fee Schedule,Fee Structure,โครงสร้างค่าธรรมเนียม
 DocType: Timesheet Detail,Costing Amount,ต้นทุนปริมาณ
-DocType: Student Admission,Application Fee,ค่าธรรมเนียมการสมัคร
+DocType: Student Admission Program,Application Fee,ค่าธรรมเนียมการสมัคร
 DocType: Process Payroll,Submit Salary Slip,ส่งสลิปเงินเดือน
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,ส่วนลด Maxiumm กับ รายการ {0} เป็น {1} %
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,ส่วนลด Maxiumm กับ รายการ {0} เป็น {1} %
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,การนำเข้าสินค้าในกลุ่ม
 DocType: Sales Partner,Address & Contacts,ที่อยู่ติดต่อ &amp;
 DocType: SMS Log,Sender Name,ชื่อผู้ส่ง
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,เรียงตามเกณฑ์
 DocType: POS Profile,[Select],[เลือก ]
 DocType: Vital Signs,Blood Pressure (diastolic),ความดันโลหิต (diastolic)
 DocType: SMS Log,Sent To,ส่งไปยัง
@@ -2480,7 +2526,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,ถัดไปติดต่อวันที่ไม่สามารถอยู่ในอดีตที่ผ่านมา
 DocType: Company,For Reference Only.,สำหรับการอ้างอิงเท่านั้น
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},แพทย์ {0} ไม่มีให้บริการใน {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,เลือกแบทช์
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,เลือกแบทช์
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},ไม่ถูกต้อง {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,Inv อ้างอิง
@@ -2496,15 +2542,15 @@
 DocType: Normal Test Items,Require Result Value,ต้องมีค่าผลลัพธ์
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,คดีหมายเลข ไม่สามารถ เป็น 0
 DocType: Item,Show a slideshow at the top of the page,สไลด์โชว์ที่ด้านบนของหน้า
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,ร้านค้า
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,ร้านค้า
 DocType: Project Type,Projects Manager,ผู้จัดการโครงการ
 DocType: Serial No,Delivery Time,เวลาจัดส่งสินค้า
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,เอจจิ้ง อยู่ ที่
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,นัดยกเลิกแล้ว
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,นัดยกเลิกแล้ว
 DocType: Item,End of Life,ในตอนท้ายของชีวิต
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,การเดินทาง
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,ไม่มีการใช้งานหรือเริ่มต้นโครงสร้างเงินเดือนของพนักงานพบ {0} สำหรับวันที่กำหนด
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,การเดินทาง
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,ไม่มีการใช้งานหรือเริ่มต้นโครงสร้างเงินเดือนของพนักงานพบ {0} สำหรับวันที่กำหนด
 DocType: Leave Block List,Allow Users,อนุญาตให้ผู้ใช้งาน
 DocType: Purchase Order,Customer Mobile No,มือถือของลูกค้าไม่มี
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,การคืน
@@ -2513,12 +2559,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,ปรับปรุง ค่าใช้จ่าย
 DocType: Item Reorder,Item Reorder,รายการ Reorder
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,สลิปเงินเดือนที่ต้องการแสดง
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,โอน วัสดุ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,โอน วัสดุ
 DocType: Fees,Send Payment Request,ส่งคำขอการชำระเงิน
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",ระบุการดำเนินการ ค่าใช้จ่าย ในการดำเนินงาน และให้การดำเนินการ ที่ไม่ซ้ำกัน ในการ ดำเนินงานของคุณ
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,เอกสารนี้เป็นเกินขีด จำกัด โดย {0} {1} สำหรับรายการ {4} คุณกำลังทำอีก {3} กับเดียวกัน {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,กรุณาตั้งค่าที่เกิดขึ้นหลังจากการบันทึก
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,บัญชีจำนวนเงินที่เลือกเปลี่ยน
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,บัญชีจำนวนเงินที่เลือกเปลี่ยน
 DocType: Purchase Invoice,Price List Currency,สกุลเงินรายการราคา
 DocType: Naming Series,User must always select,ผู้ใช้จะต้องเลือก
 DocType: Stock Settings,Allow Negative Stock,อนุญาตให้สต็อกเชิงลบ
@@ -2538,7 +2584,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,ลูกจ้าง
 DocType: Sample Collection,Collected Time,เวลาที่รวบรวม
 DocType: Company,Sales Monthly History,ประวัติการขายรายเดือน
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,เลือกแบทช์
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,เลือกแบทช์
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} ได้ถูกเรียกเก็บเงินเต็มจำนวน
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,สัญญาณที่สำคัญ
 DocType: Training Event,End Time,เวลาสิ้นสุด
@@ -2546,16 +2592,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,การหักเงินชำระเงินหรือการสูญเสีย
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,ข้อสัญญา มาตรฐานสำหรับ การขายหรือการ ซื้อ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,จัดกลุ่มตาม Voucher
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,คุณแน่ใจหรือว่าต้องการยกเลิกการนัดหมายนี้
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,ท่อขาย
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},กรุณาตั้งค่าบัญชีเริ่มต้นเงินเดือนตัวแทน {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,ต้องใช้ใน
 DocType: Rename Tool,File to Rename,การเปลี่ยนชื่อไฟล์
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},กรุณาเลือก BOM สำหรับสินค้าในแถว {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},กรุณาเลือก BOM สำหรับสินค้าในแถว {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},บัญชี {0} ไม่ตรงกับ บริษัท {1} ในโหมดบัญชี: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},ระบุ BOM {0} ไม่อยู่สำหรับรายการ {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ตาราง การบำรุงรักษา {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
+DocType: POS Profile,Applicable for Users,ใช้ได้สำหรับผู้ใช้
 DocType: Notification Control,Expense Claim Approved,เรียกร้องค่าใช้จ่ายที่ได้รับอนุมัติ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,สลิปเงินเดือนของพนักงาน {0} สร้างไว้แล้วสำหรับช่วงเวลานี้
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,สลิปเงินเดือนของพนักงาน {0} สร้างไว้แล้วสำหรับช่วงเวลานี้
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,เภสัชกรรม
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ค่าใช้จ่ายของรายการที่ซื้อ
 DocType: Selling Settings,Sales Order Required,สั่งซื้อยอดขายที่ต้องการ
@@ -2580,6 +2628,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,องค์กร
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,องค์กร
 DocType: BOM Update Tool,BOM Update Tool,เครื่องมืออัปเดต BOM
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company",ไม่ได้ระบุบัญชีของบุคคลใดโปรดตั้งค่าบัญชีบุคคลที่เป็นค่าเริ่มต้นใน บริษัท
 DocType: SG Creation Tool Course,Student Group Name,ชื่อกลุ่มนักศึกษา
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,การสร้างค่าธรรมเนียม
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,โปรดตรวจสอบว่าคุณต้องการที่จะลบการทำธุรกรรมทั้งหมดของ บริษัท นี้ ข้อมูลหลักของคุณจะยังคงอยู่อย่างที่มันเป็น การดำเนินการนี้ไม่สามารถยกเลิกได้
@@ -2588,29 +2637,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ไม่สามารถกำหนดให้สูงกว่าปริมาณที่วางแผนไว้ ({2}) ในการสั่งผลิต {3}
 DocType: Shipping Rule,Shipping Rule Label,ป้ายกฎการจัดส่งสินค้า
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ผู้ใช้งานฟอรั่ม
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,วัตถุดิบไม่สามารถมีช่องว่าง
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","ไม่สามารถอัปเดสต็อก, ใบแจ้งหนี้ที่มีรายการการขนส่งลดลง"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,วัตถุดิบไม่สามารถมีช่องว่าง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","ไม่สามารถอัปเดสต็อก, ใบแจ้งหนี้ที่มีรายการการขนส่งลดลง"
 DocType: Lab Test Sample,Lab Test Sample,Lab Test Sample
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,วารสารรายการด่วน
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,คุณไม่สามารถเปลี่ยน อัตรา ถ้า BOM กล่าว agianst รายการใด ๆ
+DocType: Restaurant,Invoice Series Prefix,คำนำหน้าของซีรี่ส์ใบแจ้งหนี้
 DocType: Employee,Previous Work Experience,ประสบการณ์การทำงานก่อนหน้า
 DocType: Stock Entry,For Quantity,สำหรับจำนวน
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},กรุณากรอก จำนวน การ วางแผน รายการ {0} ที่ แถว {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},กรุณากรอก จำนวน การ วางแผน รายการ {0} ที่ แถว {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} ยังไม่ได้ส่ง
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,ขอรายการ
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,เพื่อผลิตแยกจะถูกสร้างขึ้นสำหรับรายการที่ดีในแต่ละสำเร็จรูป
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} จะต้องติดลบในเอกสารตีกลับ
 ,Minutes to First Response for Issues,นาทีเพื่อตอบสนองแรกสำหรับปัญหา
 DocType: Purchase Invoice,Terms and Conditions1,ข้อตกลงและ Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,ชื่อของสถาบันที่คุณมีการตั้งค่าระบบนี้
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,ชื่อของสถาบันที่คุณมีการตั้งค่าระบบนี้
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",รายการบัญชีแช่แข็งถึงวันนี้ไม่มีใครสามารถทำ / แก้ไขรายการยกเว้นบทบาทที่ระบุไว้ด้านล่าง
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,กรุณา บันทึกเอกสารก่อนที่จะ สร้าง ตารางการบำรุงรักษา
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,มีการอัปเดตราคาล่าสุดใน BOM ทั้งหมด
 DocType: Fee Schedule,Successful,ที่ประสบความสำเร็จ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,สถานะโครงการ
 DocType: UOM,Check this to disallow fractions. (for Nos),ตรวจสอบนี้จะไม่อนุญาตให้เศษส่วน (สำหรับ Nos)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,คำสั่งซื้อการผลิตต่อไปนี้ถูกสร้าง:
-DocType: Student Admission,Naming Series (for Student Applicant),การตั้งชื่อชุด (สำหรับนักศึกษาสมัคร)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,คำสั่งซื้อการผลิตต่อไปนี้ถูกสร้าง:
+DocType: Student Admission Program,Naming Series (for Student Applicant),การตั้งชื่อชุด (สำหรับนักศึกษาสมัคร)
 DocType: Delivery Note,Transporter Name,ชื่อ Transporter
 DocType: Authorization Rule,Authorized Value,มูลค่าที่ได้รับอนุญาต
 DocType: BOM,Show Operations,แสดงการดำเนินงาน
@@ -2634,7 +2684,7 @@
 ,Employees working on a holiday,พนักงานที่ทำงานในวันหยุด
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,กำหนดให้เป็นปัจจุบัน
 DocType: Project,% Complete Method,% วิธีการที่สมบูรณ์แบบ
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,ยา
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,ยา
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},วันที่เริ่มต้น การบำรุงรักษา ไม่สามารถ ก่อนวัน ส่งสำหรับ อนุกรม ไม่มี {0}
 DocType: Production Order,Actual End Date,วันที่สิ้นสุดจริง
 DocType: BOM,Operating Cost (Company Currency),ต้นทุนการดำเนินงาน ( บริษัท สกุล)
@@ -2652,13 +2702,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,อนุมัติ ผู้ใช้ ไม่สามารถเป็น เช่นเดียวกับ ผู้ ปกครองใช้กับ
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),อัตราขั้นพื้นฐาน (ตามหุ้น UOM)
 DocType: SMS Log,No of Requested SMS,ไม่มีของ SMS ขอ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,ทิ้งไว้โดยไม่ต้องจ่ายไม่ตรงกับที่ได้รับอนุมัติบันทึกออกจากแอพลิเคชัน
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,ทิ้งไว้โดยไม่ต้องจ่ายไม่ตรงกับที่ได้รับอนุมัติบันทึกออกจากแอพลิเคชัน
 DocType: Campaign,Campaign-.####,แคมเปญ . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ขั้นตอนถัดไป
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,กรุณาจัดหารายการที่ระบุในอัตราที่ดีที่สุด
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,ทำให้ ใบแจ้งหนี้
 DocType: Selling Settings,Auto close Opportunity after 15 days,รถยนต์ใกล้โอกาสหลังจาก 15 วัน
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,คำสั่งซื้อซื้อไม่ได้รับอนุญาตสำหรับ {0} เนื่องจากมีการจดแต้มที่ {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,คำสั่งซื้อซื้อไม่ได้รับอนุญาตสำหรับ {0} เนื่องจากมีการจดแต้มที่ {1}
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,ปีที่จบ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2715,7 +2765,6 @@
  10 เพิ่มหรือหัก: ไม่ว่าคุณต้องการที่จะเพิ่มหรือหักภาษี"
 DocType: Homepage,Homepage,โฮมเพจ
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,เลือกแพทย์ ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',update tabConsultation set invoice = &#39;{0}&#39; โดยที่ name = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,จำนวน Recd
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},ค่าธรรมเนียมระเบียนที่สร้าง - {0}
 DocType: Asset Category Account,Asset Category Account,บัญชีสินทรัพย์ประเภท
@@ -2727,7 +2776,7 @@
 DocType: Asset,Manual,คู่มือ
 DocType: Salary Component Account,Salary Component Account,บัญชีเงินเดือนตัวแทน
 DocType: Global Defaults,Hide Currency Symbol,ซ่อนสัญลักษณ์สกุลเงิน
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","เช่น ธนาคาร, เงินสด, บัตรเครดิต"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","เช่น ธนาคาร, เงินสด, บัตรเครดิต"
 DocType: Lead Source,Source Name,แหล่งที่มาของชื่อ
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""",ปกติความดันโลหิตในผู้ป่วยประมาณ 120 mmHg systolic และ 80 mmHg diastolic ย่อมาจาก &quot;120/80 mmHg&quot;
 DocType: Journal Entry,Credit Note,หมายเหตุเครดิต
@@ -2746,16 +2795,16 @@
 DocType: Patient,Occupation,อาชีพ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,แถว {0}: วันที่ เริ่มต้น ต้องอยู่ก่อน วันที่สิ้นสุด
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),รวม (จำนวน)
-DocType: Sales Invoice,This Document,เอกสารฉบับนี้
 DocType: Installation Note Item,Installed Qty,จำนวนการติดตั้ง
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,ซึ่งอาจเป็นเพราะที่อยู่อีเมลที่ไม่ถูกต้องบางส่วนใน
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,คุณเพิ่ม
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,ผลการฝึกอบรม
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,ผลการฝึกอบรม
 DocType: Purchase Invoice,Is Paid,เป็นค่าใช้จ่าย
 DocType: Salary Structure,Total Earning,กำไรรวม
 DocType: Purchase Receipt,Time at which materials were received,เวลาที่ได้รับวัสดุ
 DocType: Stock Ledger Entry,Outgoing Rate,อัตราการส่งออก
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,ปริญญาโท สาขา องค์กร
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,ปริญญาโท สาขา องค์กร
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,หรือ
 DocType: Sales Order,Billing Status,สถานะการเรียกเก็บเงิน
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,รายงาน ฉบับ
@@ -2770,8 +2819,9 @@
 DocType: Notification Control,Sales Order Message,ข้อความสั่งซื้อขาย
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",การตั้ง ค่าเริ่มต้น เช่น บริษัท สกุลเงิน ปัจจุบัน ปีงบประมาณ ฯลฯ
 DocType: Payment Entry,Payment Type,ประเภท การชำระเงิน
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,โปรดเลือกแบทช์สำหรับรายการ {0} ไม่สามารถหาชุดงานเดี่ยวที่ตอบสนองความต้องการนี้ได้
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,โปรดเลือกแบทช์สำหรับรายการ {0} ไม่สามารถหาชุดงานเดี่ยวที่ตอบสนองความต้องการนี้ได้
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,โปรดเลือกแบทช์สำหรับรายการ {0} ไม่สามารถหาชุดงานเดี่ยวที่ตอบสนองความต้องการนี้ได้
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,โปรดเลือกแบทช์สำหรับรายการ {0} ไม่สามารถหาชุดงานเดี่ยวที่ตอบสนองความต้องการนี้ได้
+DocType: Hub Category,Parent Category,หมวดหมู่ผู้ปกครอง
 DocType: Process Payroll,Select Employees,เลือกพนักงาน
 DocType: Opportunity,Potential Sales Deal,ที่อาจเกิดขึ้น Deal ขาย
 DocType: Complaint,Complaints,ร้องเรียน
@@ -2809,7 +2859,7 @@
 DocType: Bin,Reserved Quantity,จำนวนสงวน
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,โปรดป้อนที่อยู่อีเมลที่ถูกต้อง
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,โปรดป้อนที่อยู่อีเมลที่ถูกต้อง
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,โปรดเลือกรายการในรถเข็น
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,โปรดเลือกรายการในรถเข็น
 DocType: Landed Cost Voucher,Purchase Receipt Items,ซื้อสินค้าใบเสร็จรับเงิน
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,การปรับรูปแบบ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,arrear
@@ -2819,15 +2869,15 @@
 DocType: Payment Request,Amount in customer's currency,จำนวนเงินในสกุลเงินของลูกค้า
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,การจัดส่งสินค้า
 DocType: Stock Reconciliation Item,Current Qty,จำนวนปัจจุบัน
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,เพิ่มซัพพลายเออร์
+DocType: Restaurant Menu,Restaurant Menu,เมนูร้านอาหาร
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,ก่อนหน้า
 DocType: Appraisal Goal,Key Responsibility Area,พื้นที่ความรับผิดชอบหลัก
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",ชุดนักศึกษาช่วยให้คุณติดตามการเข้าร่วมการประเมินและค่าธรรมเนียมสำหรับนักเรียน
 DocType: Payment Entry,Total Allocated Amount,จำนวนเงินที่ได้รับจัดสรร
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,ตั้งค่าบัญชีพื้นที่โฆษณาเริ่มต้นสำหรับพื้นที่โฆษณาถาวร
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,ตั้งค่าบัญชีพื้นที่โฆษณาเริ่มต้นสำหรับพื้นที่โฆษณาถาวร
 DocType: Item Reorder,Material Request Type,ประเภทของการขอวัสดุ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural วารสารรายการสำหรับเงินเดือนจาก {0} เป็น {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save",LocalStorage เต็มไม่ได้บันทึก
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save",LocalStorage เต็มไม่ได้บันทึก
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,แถว {0}: UOM ปัจจัยการแปลงมีผลบังคับใช้
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,ความจุของห้องพัก
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,อ้าง
@@ -2866,16 +2916,18 @@
 DocType: Project,Task Completion,เสร็จงาน
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,ไม่ได้อยู่ในสต็อก
 DocType: Appraisal,HR User,ผู้ใช้งานทรัพยากรบุคคล
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,ภาษีและค่าบริการหัก
-apps/erpnext/erpnext/hooks.py +129,Issues,ปัญหา
+apps/erpnext/erpnext/hooks.py +138,Issues,ปัญหา
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},สถานะ ต้องเป็นหนึ่งใน {0}
 DocType: Sales Invoice,Debit To,เดบิตเพื่อ
+DocType: Restaurant Menu Item,Restaurant Menu Item,รายการเมนูร้านอาหาร
 DocType: Delivery Note,Required only for sample item.,ที่จำเป็นสำหรับรายการตัวอย่าง
 DocType: Stock Ledger Entry,Actual Qty After Transaction,จำนวนที่เกิดขึ้นจริงหลังทำรายการ
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},ไม่มีสลิปเงินเดือนพบกันระหว่าง {0} และ {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},ไม่มีสลิปเงินเดือนพบกันระหว่าง {0} และ {1}
 ,Pending SO Items For Purchase Request,รายการที่รอดำเนินการเพื่อให้ใบขอซื้อ
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,การรับสมัครนักศึกษา
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} ถูกปิดใช้งาน
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,การรับสมัครนักศึกษา
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} ถูกปิดใช้งาน
 DocType: Supplier,Billing Currency,สกุลเงินการเรียกเก็บเงิน
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,ขนาดใหญ่พิเศษ
@@ -2898,6 +2950,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,กรุณาระบุ ไม่ จำเป็นต้องมี การเข้าชม
 DocType: Stock Settings,Default Valuation Method,วิธีการประเมินค่าเริ่มต้น
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,ค่าธรรมเนียม
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,กำลังอัปเดตอยู่ระหว่างดำเนินการ มันอาจจะใช้เวลาสักครู่.
 DocType: Vehicle Log,Fuel Qty,น้ำมันเชื้อเพลิงจำนวน
 DocType: Production Order Operation,Planned Start Time,เวลาเริ่มต้นการวางแผน
 DocType: Course,Assessment,การประเมินผล
@@ -2913,7 +2966,7 @@
 DocType: Price List,Price List Master,ราคาโท
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ขายทำธุรกรรมทั้งหมดสามารถติดแท็กกับหลายบุคคลที่ขาย ** ** เพื่อให้คุณสามารถตั้งค่าและตรวจสอบเป้าหมาย
 ,S.O. No.,เลขที่ใบสั่งขาย
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},กรุณาสร้าง ลูกค้า จากช่องทาง {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},กรุณาสร้าง ลูกค้า จากช่องทาง {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,เลือกผู้ป่วย
 DocType: Price List,Applicable for Countries,ใช้งานได้สำหรับประเทศ
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,ชื่อพารามิเตอร์
@@ -2957,27 +3010,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ค่าใช้จ่ายบัญชี / แตกต่าง ({0}) จะต้องเป็นบัญชี 'กำไรหรือขาดทุน'
 DocType: Project,Copied From,คัดลอกจาก
 DocType: Project,Copied From,คัดลอกจาก
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},ข้อผิดพลาดชื่อ: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,ความขาดแคลน
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},ข้อผิดพลาดชื่อ: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,ความขาดแคลน
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} ไม่เชื่อมโยงกับ {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,เข้าร่วม สำหรับพนักงาน {0} จะถูกทำเครื่องหมาย แล้ว
 DocType: Packing Slip,If more than one package of the same type (for print),หากมีมากกว่าหนึ่งแพคเกจประเภทเดียวกัน (พิมพ์)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,โปรดตั้งค่าลูกค้าเริ่มต้นในการตั้งค่าร้านอาหาร
 ,Salary Register,เงินเดือนที่ต้องการสมัครสมาชิก
 DocType: Warehouse,Parent Warehouse,คลังสินค้าผู้ปกครอง
 DocType: C-Form Invoice Detail,Net Total,สุทธิ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},ไม่พบรายการ BOM เริ่มต้นสำหรับรายการ {0} และโครงการ {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},ไม่พบรายการ BOM เริ่มต้นสำหรับรายการ {0} และโครงการ {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,กำหนดประเภทสินเชื่อต่างๆ
 DocType: Bin,FCFS Rate,อัตรา FCFS
 DocType: Payment Reconciliation Invoice,Outstanding Amount,ยอดคงค้าง
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),เวลา (นาที)
 DocType: Project Task,Working,ทำงาน
 DocType: Stock Ledger Entry,Stock Queue (FIFO),สต็อกคิว (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,ปีการเงิน
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,ปีการเงิน
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} ไม่ได้เป็นของ บริษัท {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,ไม่สามารถแก้ฟังก์ชันคะแนนเกณฑ์สำหรับ {0} ได้ ตรวจสอบให้แน่ใจว่าสูตรถูกต้อง
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,ค่าใช้จ่ายในการ
 DocType: Healthcare Settings,Out Patient Settings,การตั้งค่าผู้ป่วยนอก
 DocType: Account,Round Off,หมดยก
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,ปริมาณต้องเป็นบวก
 ,Requested Qty,ขอ จำนวน
 DocType: Tax Rule,Use for Shopping Cart,ใช้สำหรับรถเข็น
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},ราคา {0} สำหรับแอตทริบิวต์ {1} ไม่อยู่ในรายชื่อของรายการที่ถูกต้องแอตทริบิวต์ค่าสำหรับรายการ {2}
@@ -2986,7 +3041,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",ค่าใช้จ่ายจะถูกกระจายไปตามสัดส่วนในปริมาณรายการหรือจำนวนเงินตามที่คุณเลือก
 DocType: Maintenance Visit,Purposes,วัตถุประสงค์
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,อย่างน้อยหนึ่งรายการที่ควรจะใส่ที่มีปริมาณเชิงลบในเอกสารกลับมา
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,เพิ่มหลักสูตร
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",การดำเนินงาน {0} นานกว่าชั่วโมงการทำงานใด ๆ ที่มีอยู่ในเวิร์กสเตชัน {1} ทำลายลงการดำเนินงานในการดำเนินงานหลาย
 ,Requested,ร้องขอ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,หมายเหตุไม่มี
@@ -2998,6 +3052,8 @@
 DocType: Employee Loan,Repaid/Closed,ชำระคืน / ปิด
 DocType: Item,Total Projected Qty,รวมประมาณการจำนวน
 DocType: Monthly Distribution,Distribution Name,ชื่อการแจกจ่าย
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,ผู้จัดจำหน่าย&gt; ประเภทผู้จัดจำหน่าย
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",ไม่พบอัตราการประเมินสำหรับรายการ {0} ซึ่งจำเป็นต้องทำรายการทางบัญชีสำหรับ {1} {2} หากรายการกำลังทำธุรกรรมเป็นรายการอัตราการเสียค่าเป็นศูนย์ใน {1} โปรดระบุว่าในตาราง {1} รายการ มิฉะนั้นโปรดสร้างธุรกรรมขาเข้าของรายการหรือระบุอัตราการประเมินค่าในเร็กคอร์ดรายการจากนั้นลองส่ง / ยกเลิกรายการนี้
 DocType: Course,Course Code,รหัสรายวิชา
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},การตรวจสอบคุณภาพ ที่จำเป็นสำหรับ รายการ {0}
 DocType: POS Settings,Use POS in Offline Mode,ใช้ POS ในโหมดออฟไลน์
@@ -3008,14 +3064,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,จัดการ ต้นไม้ มณฑล
 DocType: Journal Entry Account,Sales Invoice,ขายใบแจ้งหนี้
 DocType: Journal Entry Account,Party Balance,ยอดคงเหลือพรรค
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,กรุณาเลือกใช้ส่วนลด
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,กรุณาเลือกใช้ส่วนลด
 DocType: Company,Default Receivable Account,บัญชีเริ่มต้นลูกหนี้
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,สร้างธนาคารรับสมัครสำหรับเงินเดือนทั้งหมดที่จ่ายสำหรับเกณฑ์ที่เลือกข้างต้น
 DocType: Physician,Physician Schedule,กำหนดการแพทย์
 DocType: Purchase Invoice,Deemed Export,ถือว่าส่งออก
 DocType: Stock Entry,Material Transfer for Manufacture,โอนวัสดุสำหรับการผลิต
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,ร้อยละส่วนลดสามารถนำไปใช้อย่างใดอย่างหนึ่งกับราคาหรือราคาตามรายการทั้งหมด
-DocType: Purchase Invoice,Half-yearly,รายหกเดือน
+DocType: Subscription,Half-yearly,รายหกเดือน
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,เข้าบัญชีสำหรับสต็อก
 DocType: Lab Test,LabTest Approver,ผู้ประเมิน LabTest
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,คุณได้รับการประเมินเกณฑ์การประเมินแล้ว {}
@@ -3044,13 +3100,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,ขนาดเล็กเป็นพิเศษ
 DocType: Company,Standard Template,แม่แบบมาตรฐาน
 DocType: Training Event,Theory,ทฤษฎี
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,คำเตือน: ขอ วัสดุ จำนวน น้อยกว่า จำนวน สั่งซื้อขั้นต่ำ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,คำเตือน: ขอ วัสดุ จำนวน น้อยกว่า จำนวน สั่งซื้อขั้นต่ำ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,บัญชี {0} จะถูก แช่แข็ง
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,นิติบุคคล / สาขา ที่มีผังบัญชีแยกกัน ภายใต้องค์กร
 DocType: Payment Request,Mute Email,ปิดเสียงอีเมล์
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","อาหาร, เครื่องดื่ม และ ยาสูบ"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},สามารถชำระเงินยังไม่เรียกเก็บกับ {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,อัตราค่านายหน้า ไม่สามารถ จะมากกว่า 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},สามารถชำระเงินยังไม่เรียกเก็บกับ {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,อัตราค่านายหน้า ไม่สามารถ จะมากกว่า 100
 DocType: Stock Entry,Subcontract,สัญญารับช่วง
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,กรุณากรอก {0} แรก
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,ไม่มีการตอบกลับจาก
@@ -3068,10 +3124,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,สี
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,เกณฑ์การประเมินผลแผน
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,ป้องกันคำสั่งซื้อ
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,อ่อนแอ
 DocType: Patient Appointment,Scheduled,กำหนด
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,ขอใบเสนอราคา.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,กรุณาติดตั้ง System Employee Naming System ใน Human Resource&gt; HR Settings
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",กรุณาเลือกรายการที่ &quot;เป็นสต็อกสินค้า&quot; เป็น &quot;ไม่&quot; และ &quot;ขายเป็นรายการ&quot; คือ &quot;ใช่&quot; และไม่มีการ Bundle สินค้าอื่น ๆ
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,เลือกลูกค้า
 DocType: Student Log,Academic,วิชาการ
 DocType: Patient,Personal and Social History,ประวัติส่วนตัวและสังคม
 DocType: Fee Schedule,Fee Breakup for each student,การแบ่งค่าธรรมเนียมสำหรับนักเรียนแต่ละคน
@@ -3081,7 +3138,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,อัตราการประเมิน
 DocType: Stock Reconciliation,SR/,#/
 DocType: Vehicle,Diesel,ดีเซล
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,สกุลเงิน ราคา ไม่ได้เลือก
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,สกุลเงิน ราคา ไม่ได้เลือก
 apps/erpnext/erpnext/config/healthcare.py +46,Results,ผล
 ,Student Monthly Attendance Sheet,นักศึกษาแผ่นเข้าร่วมประชุมรายเดือน
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},พนักงาน {0} ได้ใช้ แล้วสำหรับ {1} ระหว่าง {2} และ {3}
@@ -3097,7 +3154,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,การจัดการหุ้นส่วนขาย
 DocType: Quality Inspection,Inspection Type,ประเภทการตรวจสอบ
 DocType: Fee Validity,Visited yet,เยี่ยมชมแล้ว
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,โกดังกับการทำธุรกรรมที่มีอยู่ไม่สามารถแปลงไปยังกลุ่ม
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,โกดังกับการทำธุรกรรมที่มีอยู่ไม่สามารถแปลงไปยังกลุ่ม
 DocType: Assessment Result Tool,Result HTML,ผล HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,หมดอายุเมื่อวันที่
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,เพิ่มนักเรียน
@@ -3124,7 +3181,7 @@
 DocType: Healthcare Settings,Result Printed,ผลการพิมพ์
 DocType: Asset Category Account,Depreciation Expense Account,บัญชีค่าเสื่อมราคาค่าใช้จ่าย
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,ระยะเวลาการฝึกงาน
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},ดู {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},ดู {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,โหนดใบเท่านั้นที่จะเข้าในการทำธุรกรรม
 DocType: Expense Claim,Expense Approver,ค่าใช้จ่ายที่อนุมัติ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,แถว {0}: ล่วงหน้ากับลูกค้าจะต้องมีเครดิต
@@ -3136,7 +3193,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,เพื่อ Datetime
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,ตารางหลักสูตรการลบ:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,บันทึกการรักษาสถานะการจัดส่งทาง SMS
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,ตั้งเป้าหมายการขาย
 DocType: Accounts Settings,Make Payment via Journal Entry,ชำระเงินผ่านวารสารรายการ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,พิมพ์บน
 DocType: Item,Inspection Required before Delivery,ตรวจสอบก่อนที่จะต้องจัดส่งสินค้า
@@ -3144,7 +3200,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,ที่รอดำเนินการกิจกรรม
 DocType: Patient Appointment,Reminded,เตือน
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,องค์กรของคุณ
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,องค์กรของคุณ
 DocType: Fee Component,Fees Category,ค่าธรรมเนียมหมวดหมู่
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,กรุณากรอก วันที่ บรรเทา
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,amt
@@ -3156,7 +3212,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,สั่งซื้อใหม่ระดับ
 DocType: Company,Chart Of Accounts Template,ผังบัญชีแม่แบบ
 DocType: Attendance,Attendance Date,วันที่เข้าร่วม
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},รายการราคาปรับปรุงสำหรับ {0} ในราคา {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},รายการราคาปรับปรุงสำหรับ {0} ในราคา {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,การล่มสลายเงินเดือนขึ้นอยู่กับกำไรและหัก
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,บัญชีที่มี ต่อมน้ำเด็ก ไม่สามารถ แปลงเป็น บัญชีแยกประเภท
 DocType: Purchase Invoice Item,Accepted Warehouse,คลังสินค้าได้รับการยอมรับ
@@ -3172,9 +3228,10 @@
 ,Employee Birthday,วันเกิดของพนักงาน
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,นักศึกษาเข้าร่วมชุดเครื่องมือ
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,จำกัด การข้าม
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Scheduled Upto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,บริษัท ร่วมทุน
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,ระยะทางวิชาการกับเรื่องนี้ &#39;ปีการศึกษา&#39; {0} และ &#39;ระยะชื่อ&#39; {1} อยู่แล้ว โปรดแก้ไขรายการเหล่านี้และลองอีกครั้ง
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}",เนื่องจากมีการทำธุรกรรมที่มีอยู่กับรายการ {0} คุณไม่สามารถเปลี่ยนค่าของ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}",เนื่องจากมีการทำธุรกรรมที่มีอยู่กับรายการ {0} คุณไม่สามารถเปลี่ยนค่าของ {1}
 DocType: UOM,Must be Whole Number,ต้องเป็นจำนวนเต็ม
 DocType: Leave Control Panel,New Leaves Allocated (In Days),ใบใหม่ที่จัดสรร (ในวัน)
 DocType: Purchase Invoice,Invoice Copy,สำเนาใบกำกับสินค้า
@@ -3184,7 +3241,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,จำนวนใบแจ้งหนี้
 DocType: Shopping Cart Settings,Orders,คำสั่งซื้อ
 DocType: Employee Leave Approver,Leave Approver,ผู้อนุมัติการลา
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,โปรดเลือกแบทช์
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,โปรดเลือกแบทช์
 DocType: Assessment Group,Assessment Group Name,ชื่อกลุ่มการประเมิน
 DocType: Manufacturing Settings,Material Transferred for Manufacture,โอนวัสดุเพื่อการผลิต
 DocType: Expense Claim,"A user with ""Expense Approver"" role","ผู้ใช้ที่มีบทบาท ""อนุมัติค่าใช้จ่าย"""
@@ -3199,7 +3256,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,ระยะเวลาการเข้าปิดบัญชี
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,เลือกแผนก ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,ศูนย์ต้นทุน กับการทำธุรกรรม ที่มีอยู่ ไม่สามารถ แปลงเป็น กลุ่ม
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},จำนวน {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},จำนวน {0} {1} {2} {3}
 DocType: Account,Depreciation,ค่าเสื่อมราคา
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ผู้ผลิต (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,เครื่องมือเข้าร่วมประชุมพนักงาน
@@ -3211,10 +3268,12 @@
 DocType: GL Entry,Voucher No,บัตรกำนัลไม่มี
 ,Lead Owner Efficiency,ประสิทธิภาพของเจ้าของตะกั่ว
 ,Lead Owner Efficiency,ประสิทธิภาพของเจ้าของตะกั่ว
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,ที่นิยมมากที่สุด
 DocType: Leave Allocation,Leave Allocation,การจัดสรรการลา
 DocType: Payment Request,Recipient Message And Payment Details,ผู้รับข้อความและรายละเอียดการชำระเงิน
 DocType: Training Event,Trainer Email,เทรนเนอร์อีเมล์
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,ขอ วัสดุ {0} สร้าง
+DocType: Restaurant Reservation,No of People,ไม่มีผู้คน
 DocType: Production Planning Tool,Include sub-contracted raw materials,รวมถึงวัตถุดิบย่อยหด
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,แม่ของข้อตกลงหรือสัญญา
 DocType: Purchase Invoice,Address and Contact,ที่อยู่และการติดต่อ
@@ -3223,10 +3282,11 @@
 DocType: Supplier,Last Day of the Next Month,วันสุดท้ายของเดือนถัดไป
 DocType: Support Settings,Auto close Issue after 7 days,รถยนต์ใกล้ฉบับหลังจาก 7 วัน
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",ออกจากไม่สามารถได้รับการจัดสรรก่อน {0} เป็นสมดุลลาได้รับแล้วนำติดตัวส่งต่อไปในอนาคตอันลาบันทึกจัดสรร {1}
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),หมายเหตุ: เนื่องจาก / วันอ้างอิงเกินวันที่ได้รับอนุญาตให้เครดิตของลูกค้าโดย {0} วัน (s)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),หมายเหตุ: เนื่องจาก / วันอ้างอิงเกินวันที่ได้รับอนุญาตให้เครดิตของลูกค้าโดย {0} วัน (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,สมัครนักศึกษา
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL FOR RECIPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,บัญชีค่าเสื่อมราคาสะสม
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,อีเมลนี้ถูกสร้างขึ้นอัตโนมัติ
 DocType: Stock Settings,Freeze Stock Entries,ตรึงคอมเมนต์สินค้า
 DocType: Program Enrollment,Boarding Student,นักเรียนกินนอน
 DocType: Asset,Expected Value After Useful Life,ค่าที่คาดหวังหลังจากที่มีชีวิตที่มีประโยชน์
@@ -3234,7 +3294,7 @@
 DocType: Activity Cost,Billing Rate,อัตราการเรียกเก็บเงิน
 ,Qty to Deliver,จำนวนที่จะส่งมอบ
 ,Stock Analytics,สต็อก Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,การดำเนินงานไม่สามารถเว้นว่าง
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,การดำเนินงานไม่สามารถเว้นว่าง
 DocType: Maintenance Visit Purpose,Against Document Detail No,กับรายละเอียดของเอกสารเลขที่
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,ประเภทของบุคคลที่มีผลบังคับใช้
 DocType: Quality Inspection,Outgoing,ขาออก
@@ -3257,7 +3317,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,เลือกนักเรียนด้วยตนเองสำหรับกลุ่มกิจกรรม
 DocType: Journal Entry,User Remark,หมายเหตุผู้ใช้
 DocType: Lead,Market Segment,ส่วนตลาด
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},ที่เรียกชำระแล้วจำนวนเงินที่ไม่สามารถจะสูงกว่ายอดรวมที่โดดเด่นในเชิงลบ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},ที่เรียกชำระแล้วจำนวนเงินที่ไม่สามารถจะสูงกว่ายอดรวมที่โดดเด่นในเชิงลบ {0}
 DocType: Supplier Scorecard Period,Variables,ตัวแปร
 DocType: Employee Internal Work History,Employee Internal Work History,ประวัติการทำงานของพนักงานภายใน
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),ปิด (Dr)
@@ -3287,21 +3347,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ได้รับการปรับปรุง
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: บัญชี {2} ไม่ได้เป็นของ บริษัท {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,คำขอใช้วัสดุ {0} ถูกยกเลิก หรือ ระงับแล้ว
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,ออกจากการบริหารจัดการ
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,ออกจากการบริหารจัดการ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,จัดกลุ่มตามบัญชี
 DocType: Sales Order,Fully Delivered,จัดส่งอย่างเต็มที่
 DocType: Lead,Lower Income,รายได้ต่ำ
+DocType: Restaurant Order Entry,Current Order,คำสั่งซื้อปัจจุบัน
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},แหล่งที่มาและ คลังสินค้า เป้าหมาย ไม่สามารถเป็น เหมือนกันสำหรับ แถว {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",บัญชีที่แตกต่างจะต้องเป็นสินทรัพย์ / รับผิดบัญชีประเภทตั้งแต่นี้กระทบยอดสต็อกเป็นรายการเปิด
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},การเบิกจ่ายจำนวนเงินที่ไม่สามารถจะสูงกว่าจำนวนเงินกู้ {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,ไปที่ Programs
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},จำนวน การสั่งซื้อ สินค้า ที่จำเป็นสำหรับ {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,ใบสั่งผลิตไม่ได้สร้าง
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,ใบสั่งผลิตไม่ได้สร้าง
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','จาก วันที่ ' ต้อง เป็นหลังจากที่ ' นัด '
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ไม่สามารถเปลี่ยนสถานะเป็นนักเรียน {0} มีการเชื่อมโยงกับโปรแกรมนักเรียน {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},ไม่สามารถเปลี่ยนสถานะเป็นนักเรียน {0} มีการเชื่อมโยงกับโปรแกรมนักเรียน {1}
 DocType: Asset,Fully Depreciated,ค่าเสื่อมราคาหมด
 ,Stock Projected Qty,หุ้น ที่คาดการณ์ จำนวน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},ลูกค้า {0} ไม่ได้อยู่ใน โครงการ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},ลูกค้า {0} ไม่ได้อยู่ใน โครงการ {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,ผู้เข้าร่วมการทำเครื่องหมาย HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",ใบเสนอราคาข้อเสนอการเสนอราคาที่คุณส่งให้กับลูกค้าของคุณ
 DocType: Sales Order,Customer's Purchase Order,การสั่งซื้อของลูกค้า
@@ -3312,8 +3373,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,กรุณาตั้งค่าจำนวนค่าเสื่อมราคาจอง
 DocType: Supplier Scorecard Period,Calculations,การคำนวณ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,ค่าหรือ จำนวน
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,สั่งซื้อโปรดักชั่นไม่สามารถยกขึ้นเพื่อ:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,สั่งซื้อโปรดักชั่นไม่สามารถยกขึ้นเพื่อ:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,นาที
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,โปรดตั้งค่าชุดการตั้งชื่อสำหรับ {0} ผ่านการตั้งค่า&gt; การตั้งค่า&gt; การตั้งชื่อซีรี่ส์
 DocType: Purchase Invoice,Purchase Taxes and Charges,ภาษีซื้อและค่าบริการ
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,ไปที่ Suppliers
 ,Qty to Receive,จำนวน การรับ
@@ -3327,7 +3389,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,เครดิตไปยังบัญชีจะต้องเป็นบัญชีงบดุล
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,ทุก ประเภท ของผู้ผลิต
 DocType: Global Defaults,Disable In Words,ปิดการใช้งานในคำพูด
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,รหัสสินค้า ที่จำเป็น เพราะ สินค้า ไม่ เลขโดยอัตโนมัติ
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,รหัสสินค้า ที่จำเป็น เพราะ สินค้า ไม่ เลขโดยอัตโนมัติ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},ไม่ได้ ชนิดของ ใบเสนอราคา {0} {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,รายการกำหนดการซ่อมบำรุง
 DocType: Sales Order,%  Delivered,% จัดส่งแล้ว
@@ -3349,23 +3411,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,เปิดทุนคงเหลือ
 DocType: Lead,CRM,การจัดการลูกค้าสัมพันธ์
 DocType: Purchase Invoice,N,ยังไม่มีข้อความ
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,การประนีประนอม
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,ที่เหลืออยู่
 DocType: Appraisal,Appraisal,การตีราคา
 DocType: Purchase Invoice,GST Details,รายละเอียด GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},อีเมลที่ส่งถึงผู้จัดจำหน่าย {0}
+DocType: Item,Default Sales Unit of Measure,ยอดขายหน่วยวัดเริ่มต้น
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,วันที่ซ้ำแล้วซ้ำอีก
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,ผู้มีอำนาจลงนาม
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},ผู้อนุมัติการลา ต้องเป็นหนึ่งใน {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,สร้างค่าธรรมเนียม
-DocType: Hub Settings,Seller Email,อีเมล์ผู้ขาย
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ค่าใช้จ่ายในการจัดซื้อรวม (ผ่านการซื้อใบแจ้งหนี้)
 DocType: Training Event,Start Time,เวลา
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,เลือกจำนวน
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,เลือกจำนวน
 DocType: Customs Tariff Number,Customs Tariff Number,ศุลกากรจำนวนภาษี
 DocType: Patient Appointment,Patient Appointment,นัดหมายผู้ป่วย
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,อนุมัติ บทบาท ไม่สามารถเป็น เช่นเดียวกับ บทบาทของ กฎใช้กับ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,ยกเลิกการรับอีเมล์ Digest นี้
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,ยกเลิกการรับอีเมล์ Digest นี้
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,รับซัพพลายเออร์โดย
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},ไม่พบ {0} สำหรับรายการ {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,ไปที่หลักสูตร
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,ข้อความส่งแล้ว
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,บัญชีที่มีโหนดลูกไม่สามารถกำหนดให้เป็นบัญชีแยกประเภท
@@ -3378,11 +3443,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,โอนวัสดุเพื่อไปผลิต
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,บัญชี {0} ไม่อยู่
 DocType: Project,Project Type,ประเภทโครงการ
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,งานลูกมีอยู่สำหรับงานนี้ คุณไม่สามารถลบงานนี้ได้
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ทั้ง จำนวน เป้าหมาย หรือจำนวน เป้าหมายที่ มีผลบังคับใช้
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,ค่าใช้จ่ายของกิจกรรมต่างๆ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,ไม่มีผลลัพธ์มากขึ้น
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,ค่าใช้จ่ายของกิจกรรมต่างๆ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",การตั้งค่ากิจกรรมเพื่อ {0} เนื่องจากพนักงานที่แนบมาด้านล่างนี้พนักงานขายไม่ได้ User ID {1}
 DocType: Timesheet,Billing Details,รายละเอียดการเรียกเก็บเงิน
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,แหล่งที่มาและคลังสินค้าเป้าหมายต้องแตกต่าง
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,แหล่งที่มาและคลังสินค้าเป้าหมายต้องแตกต่าง
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},ไม่ได้รับอนุญาตในการปรับปรุงการทำธุรกรรมหุ้นเก่ากว่า {0}
 DocType: Purchase Invoice Item,PR Detail,รายละเอียดประชาสัมพันธ์
 DocType: Sales Order,Fully Billed,ในจำนวนอย่างเต็มที่
@@ -3409,7 +3476,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,โอนเงิน
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,ตรวจสอบทั้งหมด
 DocType: Vehicle Log,Invoice Ref,Ref ใบแจ้งหนี้
-DocType: Purchase Order,Recurring Order,การสั่งซื้อที่เกิดขึ้น
 DocType: Company,Default Income Account,บัญชีรายได้เริ่มต้น
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,กลุ่ม ลูกค้า / ลูกค้า
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed ปีงบประมาณกำไร / ขาดทุน (เครดิต)
@@ -3423,9 +3489,9 @@
 DocType: Patient,A Negative,เป็นลบ
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,ไม่มีอะไรมากที่จะแสดง
 DocType: Lead,From Customer,จากลูกค้า
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,โทร
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,โทร
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,ผลิตภัณฑ์
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,ชุด
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,ชุด
 DocType: Project,Total Costing Amount (via Time Logs),จํานวนต้นทุนรวม (ผ่านบันทึกเวลา)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,สร้างตารางค่าธรรมเนียม
 DocType: Purchase Order Item Supplied,Stock UOM,UOM สต็อก
@@ -3450,7 +3516,7 @@
 DocType: School Settings,Current Academic Term,ระยะเวลาการศึกษาปัจจุบัน
 DocType: School Settings,Current Academic Term,ระยะเวลาการศึกษาปัจจุบัน
 DocType: Sales Order,Not Billed,ไม่ได้เรียกเก็บ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,ทั้ง คลังสินค้า ต้องอยู่ใน บริษัท เดียวกัน
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,ทั้ง คลังสินค้า ต้องอยู่ใน บริษัท เดียวกัน
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,ไม่มีที่ติดต่อเข้ามาเลย
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,ที่ดินจํานวนเงินค่าใช้จ่ายคูปอง
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,ตั๋วเงินยกโดยซัพพลายเออร์
@@ -3459,7 +3525,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,จำนวน ส่วนลด
 DocType: Purchase Invoice,Return Against Purchase Invoice,กลับไปกับการซื้อใบแจ้งหนี้
 DocType: Item,Warranty Period (in days),ระยะเวลารับประกัน (วัน)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',update &#39;tabPatient Appointment` ตั้ง sales_invoice =&#39; {0} &#39;โดยที่ name =&#39; {1} &#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,ความสัมพันธ์กับ Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,เงินสดจากการดำเนินงานสุทธิ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,วาระที่ 4
@@ -3468,8 +3533,8 @@
 DocType: Journal Entry Account,Journal Entry Account,วารสารบัญชีเข้า
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,กลุ่มนักศึกษา
 DocType: Shopping Cart Settings,Quotation Series,ชุดใบเสนอราคา
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",รายการที่มีอยู่ ที่มีชื่อเดียวกัน ({0}) กรุณาเปลี่ยนชื่อกลุ่ม รายการ หรือเปลี่ยนชื่อ รายการ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,กรุณาเลือกลูกค้า
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item",รายการที่มีอยู่ ที่มีชื่อเดียวกัน ({0}) กรุณาเปลี่ยนชื่อกลุ่ม รายการ หรือเปลี่ยนชื่อ รายการ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,กรุณาเลือกลูกค้า
 DocType: C-Form,I,ผม
 DocType: Company,Asset Depreciation Cost Center,สินทรัพย์ศูนย์ต้นทุนค่าเสื่อมราคา
 DocType: Sales Order Item,Sales Order Date,วันที่สั่งซื้อขาย
@@ -3478,6 +3543,7 @@
 DocType: Assessment Plan,Assessment Plan,แผนการประเมิน
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,สร้างลูกค้า {0} แล้ว
 DocType: Stock Settings,Limit Percent,ร้อยละขีด จำกัด
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,ไม่มีคลังสินค้าในคลังสินค้าใด ๆ
 ,Payment Period Based On Invoice Date,ระยะเวลา ในการชำระเงิน ตาม ใบแจ้งหนี้ ใน วันที่
 DocType: Sample Collection,No. of print,จำนวนการพิมพ์
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},สกุลเงินที่หายไปอัตราแลกเปลี่ยนสำหรับ {0}
@@ -3533,13 +3599,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,จ่ายขั้นต้น - ลดรวม - การชำระคืนเงินกู้
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,BOM ปัจจุบันและ ใหม่ BOM ไม่สามารถ จะเหมือนกัน
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,เงินเดือน ID สลิป
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,เงินเดือน ID สลิป
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,วันที่ ของ การเกษียณอายุ ต้องมากกว่า วันที่ เข้าร่วม
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,มีข้อผิดพลาดในขณะที่การจัดตารางการหลักสูตรคือ:
 DocType: Sales Invoice,Against Income Account,กับบัญชีรายได้
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% ส่งแล้ว
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,รายการ {0}: จำนวนสั่ง {1} ไม่สามารถจะน้อยกว่าจำนวนสั่งซื้อขั้นต่ำ {2} (ที่กำหนดไว้ในรายการ)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,รายการ {0}: จำนวนสั่ง {1} ไม่สามารถจะน้อยกว่าจำนวนสั่งซื้อขั้นต่ำ {2} (ที่กำหนดไว้ในรายการ)
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,การกระจายรายเดือนร้อยละ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,โปรดเข้าสู่ระบบในฐานะผู้ใช้รายอื่น
 DocType: Territory,Territory Targets,เป้าหมายดินแดน
 DocType: Delivery Note,Transporter Info,ข้อมูลการขนย้าย
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},กรุณาตั้งค่าเริ่มต้น {0} ใน บริษัท {1}
@@ -3547,13 +3614,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,ผลิตเดียวกันได้รับการป้อนหลายครั้ง
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,กำไร/ขาดทุน ขั้นต้น
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,รายการสั่งซื้อที่จำหน่าย
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,ชื่อ บริษัท ที่ไม่สามารถเป็น บริษัท
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,ชื่อ บริษัท ที่ไม่สามารถเป็น บริษัท
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,หัว จดหมาย สำหรับการพิมพ์ แม่แบบ
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ชื่อ แม่แบบ สำหรับการพิมพ์ เช่นผู้ Proforma Invoice
 DocType: Program Enrollment,Walking,เดิน
 DocType: Student Guardian,Student Guardian,เดอะการ์เดียนักศึกษา
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,ค่าใช้จ่ายประเภทการประเมินไม่สามารถทำเครื่องหมายเป็น Inclusive
 DocType: POS Profile,Update Stock,อัพเดทสต็อก
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,ในการสมัครสมาชิก
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ที่แตกต่างกัน สำหรับรายการที่ จะ นำไปสู่การ ที่ไม่ถูกต้อง ( รวม ) ค่า น้ำหนักสุทธิ ให้แน่ใจว่า น้ำหนักสุทธิ ของแต่ละรายการ ที่อยู่ในUOM เดียวกัน
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,อัตรา BOM
 DocType: Asset,Journal Entry for Scrap,วารสารรายการเศษ
@@ -3603,15 +3671,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",ผู้ใช้ระบบ (login) ID ถ้าชุดก็จะกลายเป็นค่าเริ่มต้นสำหรับทุกรูปแบบทรัพยากรบุคคล
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: จาก {1}
 DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,จัดคิวเพื่ออัปเดตราคาล่าสุดในบิลวัสดุทั้งหมด อาจใช้เวลาสักครู่
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,จัดคิวเพื่ออัปเดตราคาล่าสุดในบิลวัสดุทั้งหมด อาจใช้เวลาสักครู่
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,ชื่อของบัญชีใหม่ หมายเหตุ: กรุณาอย่าสร้างบัญชีสำหรับลูกค้าและผู้จำหน่าย
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,แม่แบบของประเทศที่อยู่เริ่มต้นอย่างชาญฉลาด
 DocType: Sales Order Item,Supplier delivers to Customer,ผู้ผลิตมอบให้กับลูกค้า
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (แบบ # รายการ / / {0}) ไม่มีในสต๊อก
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},เนื่องจาก / วันอ้างอิงต้องไม่อยู่หลัง {0}
+,Sales Payment Summary,สรุปการชำระเงิน
+DocType: Restaurant,Restaurant,ร้านอาหาร
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},เนื่องจาก / วันอ้างอิงต้องไม่อยู่หลัง {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ข้อมูลนำเข้าและส่งออก
 DocType: Patient,Account Details,รายละเอียดบัญชี
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,ไม่พบนักเรียน
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,ไม่พบนักเรียน
 DocType: Medical Department,Medical Department,แผนกการแพทย์
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,เกณฑ์การให้คะแนนของ Scorecard ของผู้จัดหา
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,ใบแจ้งหนี้วันที่โพสต์
@@ -3622,8 +3692,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,กรุณาเลือกวันที่โพสต์ก่อนที่จะเลือกพรรค
 DocType: Program Enrollment,School House,โรงเรียนบ้าน
 DocType: Serial No,Out of AMC,ออกของ AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,โปรดเลือกใบเสนอราคา
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,โปรดเลือกใบเสนอราคา
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,โปรดเลือกใบเสนอราคา
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,โปรดเลือกใบเสนอราคา
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,จำนวนค่าเสื่อมราคาจองไม่สามารถจะสูงกว่าจำนวนค่าเสื่อมราคา
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,ทำให้ การบำรุงรักษา เยี่ยมชม
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,กรุณาติดต่อผู้ใช้ที่มีผู้จัดการฝ่ายขายโท {0} บทบาท
@@ -3631,7 +3701,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,บริษัท (ไม่ใช่ ลูกค้า หรือ ซัพพลายเออร์ ) เจ้านาย
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,นี้ขึ้นอยู่กับการเข้าร่วมประชุมของนักศึกษานี้
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,ไม่มีนักเรียนเข้ามา
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,เพิ่มรายการมากขึ้นหรือเต็มรูปแบบเปิด
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,เพิ่มรายการมากขึ้นหรือเต็มรูปแบบเปิด
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ใบนำส่งสินค้า {0} ต้องถูกยกเลิก ก่อนยกเลิกคำสั่งขายนี้
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,ไปที่ผู้ใช้
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,ชำระ เงิน + เขียน ปิด จำนวน ไม่สามารถ จะสูงกว่า แกรนด์ รวม
@@ -3651,37 +3721,40 @@
 DocType: Fee Schedule,Fee Schedule,ตารางอัตราค่าธรรมเนียม
 DocType: Hub Settings,Publish Availability,เผยแพร่ความพร้อม
 DocType: Company,Create Chart Of Accounts Based On,สร้างผังบัญชีอยู่บนพื้นฐานของ
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,ไม่สามารถแปลงเป็นกลุ่มที่ไม่ใช่กลุ่มได้ งานเด็กมีอยู่แล้ว
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,วันเกิดไม่สามารถจะสูงกว่าวันนี้
 ,Stock Ageing,เอจจิ้งสต็อก
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},นักศึกษา {0} อยู่กับผู้สมัครนักเรียน {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),การปรับการปัดเศษ (สกุลเงินของ บริษัท )
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,timesheet
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,timesheet
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} ‘{1}' ถูกปิดใช้งาน
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ตั้งเป็นเปิด
 DocType: Cheque Print Template,Scanned Cheque,สแกนเช็ค
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ส่งอีเมลโดยอัตโนมัติไปยังรายชื่อในการทำธุรกรรมการส่ง
 DocType: Timesheet,Total Billable Amount,รวมจำนวนเงินที่เรียกเก็บเงิน
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,วาระที่ 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,รายการสั่งซื้อ
 DocType: Purchase Order,Customer Contact Email,อีเมล์ที่ใช้ติดต่อลูกค้า
 DocType: Warranty Claim,Item and Warranty Details,รายการและรายละเอียดการรับประกัน
 DocType: Sales Team,Contribution (%),สมทบ (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,หมายเหตุ : รายการ การชำระเงินจะ ไม่ได้รับการ สร้างขึ้นตั้งแต่ ' เงินสด หรือ บัญชี ธนาคาร ไม่ได้ระบุ
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,โครงการ {0} มีอยู่แล้ว
 DocType: Medical Department,Nursing User,ผู้ใช้พยาบาล
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,ความรับผิดชอบ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,ช่วงสิ้นสุดของใบเสนอราคานี้สิ้นสุดลงแล้ว
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,ช่วงสิ้นสุดของใบเสนอราคานี้สิ้นสุดลงแล้ว
 DocType: Expense Claim Account,Expense Claim Account,บัญชีค่าใช้จ่ายเรียกร้อง
 DocType: Accounts Settings,Allow Stale Exchange Rates,อนุญาตอัตราแลกเปลี่ยนที่อ่อนลง
 DocType: Sales Person,Sales Person Name,ชื่อคนขาย
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,กรุณากรอก atleast 1 ใบแจ้งหนี้ ในตาราง
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,เพิ่มผู้ใช้
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,เพิ่มผู้ใช้
 DocType: POS Item Group,Item Group,กลุ่มสินค้า
 DocType: Item,Safety Stock,หุ้นที่ปลอดภัย
 DocType: Healthcare Settings,Healthcare Settings,การตั้งค่าการดูแลสุขภาพ
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,% ความคืบหน้าสำหรับงานไม่ได้มากกว่า 100
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,% ความคืบหน้าสำหรับงานไม่ได้มากกว่า 100
 DocType: Stock Reconciliation Item,Before reconciliation,ก่อนที่จะกลับไปคืนดี
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},ไปที่ {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ภาษีและค่าใช้จ่ายเพิ่ม (สกุลเงิน บริษัท )
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,รายการ แถว ภาษี {0} ต้องมีบัญชี ภาษี ประเภท หรือ รายได้ หรือ ค่าใช้จ่าย หรือ คิดค่าบริการได้
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,รายการ แถว ภาษี {0} ต้องมีบัญชี ภาษี ประเภท หรือ รายได้ หรือ ค่าใช้จ่าย หรือ คิดค่าบริการได้
 DocType: Sales Order,Partly Billed,จำนวนมากที่สุดเป็นส่วนใหญ่
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,รายการ {0} จะต้องเป็นรายการสินทรัพย์ถาวร
 DocType: Item,Default BOM,BOM เริ่มต้น
@@ -3697,6 +3770,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,ตัวแปร
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,จากหมายเหตุการจัดส่งสินค้า
 DocType: Student,Student Email Address,อีเมล์ของนักศึกษา
+DocType: Item,Hub Warehouse,Hub Warehouse
 DocType: Physician Schedule Time Slot,From Time,ตั้งแต่เวลา
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,มีสินค้า:
 DocType: Notification Control,Custom Message,ข้อความที่กำหนดเอง
@@ -3705,9 +3779,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,ที่อยู่ของนักเรียน
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,ที่อยู่ของนักเรียน
 DocType: Purchase Invoice,Price List Exchange Rate,ราคาอัตราแลกเปลี่ยนรายชื่อ
+DocType: POS Profile,POS Profile Name,ชื่อโปรไฟล์ POS
 DocType: Purchase Invoice Item,Rate,อัตรา
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,แพทย์ฝึกหัด
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,ชื่อที่อยู่
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,ชื่อที่อยู่
 DocType: Stock Entry,From BOM,จาก BOM
 DocType: Assessment Code,Assessment Code,รหัสการประเมิน
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,ขั้นพื้นฐาน
@@ -3721,11 +3796,12 @@
 DocType: Salary Slip,Salary Structure,โครงสร้างเงินเดือน
 DocType: Account,Bank,ธนาคาร
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,สายการบิน
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,ฉบับวัสดุ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,ฉบับวัสดุ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,เกิดข้อผิดพลาดขณะสร้างงานที่เกิดขึ้นประจำ
 DocType: Material Request Item,For Warehouse,สำหรับโกดัง
 DocType: Employee,Offer Date,ข้อเสนอ วันที่
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ใบเสนอราคา
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,คุณกำลังอยู่ในโหมดออฟไลน์ คุณจะไม่สามารถที่จะโหลดจนกว่าคุณจะมีเครือข่าย
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,คุณกำลังอยู่ในโหมดออฟไลน์ คุณจะไม่สามารถที่จะโหลดจนกว่าคุณจะมีเครือข่าย
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,ไม่มีกลุ่มนักศึกษาสร้าง
 DocType: Purchase Invoice Item,Serial No,อนุกรมไม่มี
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,จำนวนเงินที่ชำระหนี้รายเดือนไม่สามารถจะสูงกว่าจำนวนเงินกู้
@@ -3735,17 +3811,18 @@
 DocType: Salary Slip,Total Working Hours,รวมชั่วโมงทำงาน
 DocType: Subscription,Next Schedule Date,วันที่กำหนดการถัดไป
 DocType: Stock Entry,Including items for sub assemblies,รวมทั้งรายการสำหรับส่วนประกอบย่อย
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,ค่าใส่ต้องเป็นบวก
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,ดินแดน ทั้งหมด
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,ค่าใส่ต้องเป็นบวก
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,ดินแดน ทั้งหมด
 DocType: Purchase Invoice,Items,รายการ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,นักศึกษาลงทะเบียนเรียนแล้ว
 DocType: Fiscal Year,Year Name,ชื่อปี
 DocType: Process Payroll,Process Payroll,เงินเดือนกระบวนการ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,มี วันหยุด มากขึ้นกว่าที่ เป็น วันทำการ ในเดือนนี้
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,มี วันหยุด มากขึ้นกว่าที่ เป็น วันทำการ ในเดือนนี้
 DocType: Product Bundle Item,Product Bundle Item,Bundle รายการสินค้า
 DocType: Sales Partner,Sales Partner Name,ชื่อพันธมิตรขาย
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,การขอใบเสนอราคา
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,การขอใบเสนอราคา
 DocType: Payment Reconciliation,Maximum Invoice Amount,จำนวนใบแจ้งหนี้สูงสุด
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,โลหิตวิทยา
 DocType: Normal Test Items,Normal Test Items,รายการทดสอบปกติ
 DocType: Student Language,Student Language,ภาษานักศึกษา
 apps/erpnext/erpnext/config/selling.py +23,Customers,ลูกค้า
@@ -3757,10 +3834,11 @@
 DocType: Issue,Opening Time,เปิดเวลา
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,จากและถึง วันที่คุณต้องการ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,หลักทรัพย์และ การแลกเปลี่ยน สินค้าโภคภัณฑ์
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',เริ่มต้นหน่วยวัดสำหรับตัวแปร &#39;{0}&#39; จะต้องเป็นเช่นเดียวกับในแม่แบบ &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',เริ่มต้นหน่วยวัดสำหรับตัวแปร &#39;{0}&#39; จะต้องเป็นเช่นเดียวกับในแม่แบบ &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,การคำนวณพื้นฐานตาม
 DocType: Delivery Note Item,From Warehouse,จากคลังสินค้า
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,ไม่มีรายการที่มี Bill of Materials การผลิต
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,ไม่มีรายการที่มี Bill of Materials การผลิต
+DocType: Restaurant,Default Customer,ลูกค้าเริ่มต้น
 DocType: Assessment Plan,Supervisor Name,ชื่อผู้บังคับบัญชา
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,อย่ายืนยันว่ามีการสร้างการนัดหมายสำหรับวันเดียวกันหรือไม่
 DocType: Program Enrollment Course,Program Enrollment Course,หลักสูตรการลงทะเบียนเรียน
@@ -3788,7 +3866,7 @@
 DocType: Payment Entry,Internal Transfer,โอนภายใน
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,บัญชีของเด็ก ที่มีอยู่ สำหรับบัญชีนี้ คุณไม่สามารถลบ บัญชีนี้
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ทั้ง จำนวน เป้าหมาย หรือจำนวน เป้าหมายที่ มีผลบังคับใช้
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},ไม่มี BOM เริ่มต้น แล้วสำหรับ รายการ {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},ไม่มี BOM เริ่มต้น แล้วสำหรับ รายการ {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,กรุณาเลือกวันที่โพสต์แรก
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,เปิดวันที่ควรเป็นก่อนที่จะปิดวันที่
 DocType: Leave Control Panel,Carry Forward,Carry Forward
@@ -3823,6 +3901,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,ปัจจุบันทั้งหมด
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,รายการบัญชี
 DocType: Drug Prescription,Hour,ชั่วโมง
+DocType: Restaurant Order Entry,Last Sales Invoice,ใบเสนอราคาการขายครั้งล่าสุด
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,ใหม่ หมายเลขเครื่อง ไม่สามารถมี คลังสินค้า คลังสินค้า จะต้องตั้งค่า โดย สต็อก รายการ หรือ รับซื้อ
 DocType: Lead,Lead Type,ชนิดช่องทาง
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,คุณไม่ได้รับอนุญาตในการอนุมัติวันลา ในวันที่ถูกบล็อก
@@ -3859,65 +3938,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,สร้างผู้ใช้
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,กรัม
 DocType: Supplier Scorecard,Per Month,ต่อเดือน
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,ปริมาณการผลิตจะต้องมากกว่า 0
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,ปริมาณการผลิตจะต้องมากกว่า 0
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,เยี่ยมชมรายงานสำหรับการบำรุงรักษาโทร
 DocType: Stock Entry,Update Rate and Availability,ปรับปรุงอัตราและความพร้อมใช้งาน
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,เปอร์เซ็นต์ที่คุณได้รับอนุญาตให้ได้รับหรือส่งมอบมากขึ้นกับปริมาณที่สั่งซื้อ ตัวอย่างเช่นหากคุณได้สั่งซื้อ 100 หน่วย และค่าเผื่อของคุณจะ 10% แล้วคุณจะได้รับอนุญาตจะได้รับ 110 หน่วย
 DocType: POS Customer Group,Customer Group,กลุ่มลูกค้า
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),รหัสแบทช์ใหม่ (ไม่บังคับ)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),รหัสแบทช์ใหม่ (ไม่บังคับ)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),รหัสแบทช์ใหม่ (ไม่บังคับ)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),รหัสแบทช์ใหม่ (ไม่บังคับ)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},บัญชีค่าใช้จ่าย ที่จำเป็น สำหรับรายการที่ {0}
 DocType: BOM,Website Description,คำอธิบายเว็บไซต์
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,เปลี่ยนแปลงสุทธิในส่วนของเจ้าของ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,ใหม่ล่าสุด
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,กรุณายกเลิกการซื้อใบแจ้งหนี้ {0} แรก
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",อีเมล์ต้องไม่ซ้ำกันอยู่แล้วสำหรับ {0}
 DocType: Serial No,AMC Expiry Date,วันที่หมดอายุ AMC
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,ใบเสร็จรับเงิน
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,ใบเสร็จรับเงิน
 ,Sales Register,ขายสมัครสมาชิก
 DocType: Daily Work Summary Settings Company,Send Emails At,ส่งอีเมล์ที่
 DocType: Quotation,Quotation Lost Reason,ใบเสนอราคา Lost เหตุผล
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,เลือกโดเมนของคุณ
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',เลือก * จาก tabPatient โดยที่ name = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},การอ้างอิงการทำธุรกรรมไม่มี {0} วันที่ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},การอ้างอิงการทำธุรกรรมไม่มี {0} วันที่ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ไม่มีอะไรที่จะ แก้ไข คือ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,มุมมองแบบฟอร์ม
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,สรุปในเดือนนี้และกิจกรรมที่อยู่ระหว่างดำเนินการ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,มุมมองแบบฟอร์ม
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,สรุปในเดือนนี้และกิจกรรมที่อยู่ระหว่างดำเนินการ
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.",เพิ่มผู้ใช้ในองค์กรของคุณนอกเหนือจากตัวคุณเอง
 DocType: Customer Group,Customer Group Name,ชื่อกลุ่มลูกค้า
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,ยังไม่มีลูกค้า!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,ยังไม่มีลูกค้า!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,งบกระแสเงินสด
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},วงเงินกู้ไม่เกินจำนวนเงินกู้สูงสุดของ {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,การอนุญาต
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},กรุณาลบนี้ใบแจ้งหนี้ {0} จาก C-แบบฟอร์ม {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},กรุณาลบนี้ใบแจ้งหนี้ {0} จาก C-แบบฟอร์ม {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,เลือกดำเนินการต่อถ้าคุณยังต้องการที่จะรวมถึงความสมดุลในปีงบประมาณก่อนหน้านี้ออกไปในปีงบการเงิน
 DocType: GL Entry,Against Voucher Type,กับประเภทบัตร
 DocType: Physician,Phone (R),โทรศัพท์ (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,เพิ่มช่องเวลาแล้ว
 DocType: Item,Attributes,คุณลักษณะ
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,เปิดใช้เทมเพลต
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,โปรดตั้งค่าชุดการตั้งชื่อสำหรับ {0} ผ่านการตั้งค่า&gt; การตั้งค่า&gt; การตั้งชื่อซีรี่ส์
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,กรุณากรอกตัวอักษร เขียน ปิด บัญชี
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,วันที่สั่งซื้อล่าสุด
 DocType: Patient,B Negative,B เชิงลบ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},บัญชี {0} ไม่ได้เป็นของ บริษัท {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,หมายเลขซีเรียลในแถว {0} ไม่ตรงกับหมายเหตุการจัดส่ง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,หมายเลขซีเรียลในแถว {0} ไม่ตรงกับหมายเหตุการจัดส่ง
 DocType: Student,Guardian Details,รายละเอียดผู้ปกครอง
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,มาร์คเข้าร่วมสำหรับพนักงานหลาย
 DocType: Vehicle,Chassis No,แชสซีไม่มี
 DocType: Payment Request,Initiated,ริเริ่ม
 DocType: Production Order,Planned Start Date,เริ่มต้นการวางแผนวันที่สมัคร
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,โปรดเลือก BOM
 DocType: Serial No,Creation Document Type,ประเภท การสร้าง เอกสาร
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,วันที่สิ้นสุดต้องมากกว่าวันที่เริ่มต้น
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,วันที่สิ้นสุดต้องมากกว่าวันที่เริ่มต้น
 DocType: Leave Type,Is Encash,เป็นได้เป็นเงินสด
 DocType: Leave Allocation,New Leaves Allocated,ใหม่ใบจัดสรร
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,ข้อมูล โครงการ ฉลาด ไม่สามารถใช้ได้กับ ใบเสนอราคา
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,จบลง
 DocType: Project,Expected End Date,คาดว่าวันที่สิ้นสุด
 DocType: Budget Account,Budget Amount,จำนวนงบประมาณ
 DocType: Appraisal Template,Appraisal Template Title,หัวข้อแม่แบบประเมิน
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},จากวันที่ {0} สำหรับพนักงาน {1} ไม่สามารถก่อนที่พนักงานเข้าร่วมวันที่ {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,เชิงพาณิชย์
 DocType: Patient,Alcohol Current Use,การใช้แอลกอฮอล์ในปัจจุบัน
+DocType: Student Admission Program,Student Admission Program,โปรแกรมการรับนักศึกษา
 DocType: Payment Entry,Account Paid To,บัญชีชำระเงิน
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,ผู้ปกครองรายการ {0} ต้องไม่เป็นรายการสต็อก
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,ผลิตภัณฑ์หรือบริการ  ทั้งหมด
@@ -3926,30 +4007,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} งบประมาณสำหรับบัญชี {1} กับ {2} {3} คือ {4} บัญชีจะเกินโดย {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',แถว {0} # บัญชีต้องเป็นชนิด &#39;สินทรัพย์ถาวร&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,ออก จำนวน
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,กฎระเบียบในการคำนวณปริมาณการขนส่งสินค้าสำหรับการขาย
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,และยกเลิกการปิดใช้งานใน
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,ชุด มีผลบังคับใช้
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,บริการทางการเงิน
 DocType: Student Sibling,Student ID,รหัสนักศึกษา
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,ประเภทของกิจกรรมสำหรับบันทึกเวลา
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,อีเมลผู้จัดจำหน่าย
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,ประเภทของกิจกรรมสำหรับบันทึกเวลา
 DocType: Tax Rule,Sales,ขาย
 DocType: Stock Entry Detail,Basic Amount,จํานวนเงินขั้นพื้นฐาน
 DocType: Training Event,Exam,การสอบ
 DocType: Complaint,Complaint,การร้องเรียน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},คลังสินค้า ที่จำเป็นสำหรับ รายการ หุ้น {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},คลังสินค้า ที่จำเป็นสำหรับ รายการ หุ้น {0}
 DocType: Leave Allocation,Unused leaves,ใบที่ไม่ได้ใช้
 DocType: Patient,Alcohol Past Use,การใช้แอลกอฮอล์ในอดีต
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,สถานะ เรียกเก็บเงิน
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,โอน
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),เรียก BOM ระเบิด (รวมถึงการ ประกอบย่อย )
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,โอน
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),เรียก BOM ระเบิด (รวมถึงการ ประกอบย่อย )
 DocType: Authorization Rule,Applicable To (Employee),ที่ใช้บังคับกับ (พนักงาน)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,วันที่ครบกำหนดมีผลบังคับใช้
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,วันที่ครบกำหนดมีผลบังคับใช้
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,เพิ่มสำหรับแอตทริบิวต์ {0} ไม่สามารถเป็น 0
 DocType: Journal Entry,Pay To / Recd From,จ่ายให้ Recd / จาก
 DocType: Naming Series,Setup Series,ชุดติดตั้ง
 DocType: Payment Reconciliation,To Invoice Date,วันที่ออกใบแจ้งหนี้
 DocType: Supplier,Contact HTML,HTML ติดต่อ
 ,Inactive Customers,ลูกค้าที่ไม่ได้ใช้งาน
+DocType: Student Admission Program,Maximum Age,อายุสูงสุด
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,ซื้อรายรับ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,วิธีกฎการกำหนดราคาจะใช้?
@@ -3968,6 +4051,7 @@
 DocType: GL Entry,Remarks,ข้อคิดเห็น
 DocType: Payment Entry,Account Paid From,บัญชีจ่ายจาก
 DocType: Purchase Order Item Supplied,Raw Material Item Code,วัสดุดิบรหัสสินค้า
+DocType: Task,Parent Task,งานหลัก
 DocType: Journal Entry,Write Off Based On,เขียนปิดขึ้นอยู่กับ
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,ทำให้ตะกั่ว
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,พิมพ์และเครื่องเขียน
@@ -3976,20 +4060,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",เงินเดือนที่ต้องการการประมวลผลแล้วสำหรับรอบระยะเวลาระหว่าง {0} และ {1} ฝากรับสมัครไม่สามารถอยู่ระหว่างช่วงวันที่นี้
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,บันทึกการติดตั้งสำหรับหมายเลขเครื่อง
 DocType: Guardian Interest,Guardian Interest,ผู้ปกครองที่น่าสนใจ
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,ตั้งค่าเริ่มต้นสำหรับใบแจ้งหนี้ POS
 apps/erpnext/erpnext/config/hr.py +177,Training,การอบรม
 DocType: Timesheet,Employee Detail,รายละเอียดการทำงานของพนักงาน
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,รหัสอีเมล Guardian1
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,รหัสอีเมล Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,วันวันถัดไปและทำซ้ำในวันเดือนจะต้องเท่ากัน
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,วันวันถัดไปและทำซ้ำในวันเดือนจะต้องเท่ากัน
 DocType: Lab Prescription,Test Code,รหัสทดสอบ
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,การตั้งค่าสำหรับหน้าแรกของเว็บไซต์
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQs ไม่ได้รับอนุญาตสำหรับ {0} เนื่องจากสถานะการจดแต้ม {1}
 DocType: Offer Letter,Awaiting Response,รอการตอบสนอง
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,สูงกว่า
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},ยอดรวม {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},แอตทริบิวต์ไม่ถูกต้อง {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},ยอดรวม {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},แอตทริบิวต์ไม่ถูกต้อง {0} {1}
 DocType: Supplier,Mention if non-standard payable account,พูดถึงบัญชีที่ต้องชำระเงินที่ไม่ได้มาตรฐาน
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},มีการป้อนรายการเดียวกันหลายครั้ง {รายการ}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',โปรดเลือกกลุ่มการประเมินอื่นนอกเหนือจาก &#39;กลุ่มการประเมินทั้งหมด&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},แถว {0}: ต้องใช้ศูนย์ต้นทุนสำหรับรายการ {1}
 DocType: Training Event Employee,Optional,ไม่จำเป็น
@@ -4012,13 +4096,15 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: จำเป็นต้องระบุศูนย์ต้นทุนสำหรับรายการ {2}
 DocType: Vehicle,Policy No,ไม่มีนโยบาย
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,รับรายการจาก Bundle สินค้า
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property",เมื่อสต็อคมีอยู่กับรายการ {0} คุณจะไม่สามารถเปิดใช้งานคุณสมบัติพร็อพเพอร์ตี้ได้
 DocType: Asset,Straight Line,เส้นตรง
 DocType: Project User,Project User,ผู้ใช้โครงการ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,แยก
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,แยก
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,แยก
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,แยก
 DocType: GL Entry,Is Advance,ล่วงหน้า
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,เข้าร่วมประชุม จาก วันที่และ การเข้าร่วมประชุม เพื่อให้ มีผลบังคับใช้ วันที่
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,กรุณากรอก ' คือ รับเหมา ' เป็น ใช่หรือไม่ใช่
+DocType: Item,Default Purchase Unit of Measure,ชุดซื้อหน่วยวัดเริ่มต้น
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,วันที่ผ่านรายการล่าสุด
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,วันที่ผ่านรายการล่าสุด
 DocType: Sales Team,Contact No.,ติดต่อหมายเลข
@@ -4027,7 +4113,6 @@
 DocType: Production Order,Check if material transfer entry is not required,ตรวจสอบว่ารายการโอนวัสดุไม่จำเป็นต้องใช้
 DocType: Production Order,Check if material transfer entry is not required,ตรวจสอบว่ารายการโอนวัสดุไม่จำเป็นต้องใช้
 DocType: Program Enrollment Tool,Get Students From,รับนักเรียนจาก
-DocType: Hub Settings,Seller Country,ผู้ขายประเทศ
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,รายการเผยแพร่บนเว็บไซต์
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,กลุ่มนักเรียนของคุณใน batches
 DocType: Authorization Rule,Authorization Rule,กฎการอนุญาต
@@ -4037,8 +4122,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,ภาษีการขายและค่าใช้จ่ายแม่แบบ
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),รวม (เครดิต)
 DocType: Repayment Schedule,Payment Date,วันจ่าย
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,จำนวนแบทช์ใหม่
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,จำนวนแบทช์ใหม่
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,จำนวนแบทช์ใหม่
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,จำนวนแบทช์ใหม่
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,เครื่องแต่งกาย และอุปกรณ์เสริม
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,ไม่สามารถแก้ฟังก์ชันการถ่วงน้ำหนักได้ ตรวจสอบให้แน่ใจว่าสูตรถูกต้อง
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,จำนวนการสั่งซื้อ
@@ -4056,6 +4141,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",แถว # {0}: สินทรัพย์ {1} ไม่สามารถส่งมันมีอยู่แล้ว {2}
 DocType: Tax Rule,Billing Country,ประเทศการเรียกเก็บเงิน
 DocType: Purchase Order Item,Expected Delivery Date,คาดว่าวันที่ส่ง
+DocType: Restaurant Order Entry,Restaurant Order Entry,รายการสั่งซื้อร้านอาหาร
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,เดบิตและเครดิตไม่เท่ากันสำหรับ {0} # {1} ความแตกต่างคือ {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,ค่าใช้จ่ายใน ความบันเทิง
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,ทำให้วัสดุที่ขอ
@@ -4068,9 +4154,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,บัญชี ที่มีอยู่ กับการทำธุรกรรม ไม่สามารถลบได้
 DocType: Vehicle,Last Carbon Check,ตรวจสอบคาร์บอนล่าสุด
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,ค่าใช้จ่ายทางกฎหมาย
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,โปรดเลือกปริมาณในแถว
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,โปรดเลือกปริมาณในแถว
 DocType: Purchase Invoice,Posting Time,โพสต์เวลา
 DocType: Timesheet,% Amount Billed,% ของยอดเงินที่เรียกเก็บแล้ว
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Time Per Appointment&quot; ไม่ได้รับการตั้งค่าสำหรับ Dr {0} เพิ่มใน Physician Master
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,ค่าใช้จ่าย โทรศัพท์
 DocType: Sales Partner,Logo,เครื่องหมาย
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,ตรวจสอบเรื่องนี้ถ้าคุณต้องการบังคับให้ผู้ใช้เลือกชุดก่อนที่จะบันทึก จะมีค่าเริ่มต้นไม่ถ้าคุณตรวจสอบนี้
@@ -4081,6 +4168,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,รายได้ลูกค้าใหม่
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,ค่าใช้จ่ายใน การเดินทาง
 DocType: Maintenance Visit,Breakdown,การเสีย
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},เพิ่มการสมัครรับข้อมูลฟิลด์ที่กำหนดเองใน doctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,บัญชี: {0} กับสกุลเงิน: {1} ไม่สามารถเลือกได้
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",อัพเดตค่าใช้จ่าย BOM โดยอัตโนมัติผ่าน Scheduler ตามอัตราการประเมินล่าสุด / อัตราราคา / อัตราการซื้อวัตถุดิบครั้งล่าสุด
 DocType: Bank Reconciliation Detail,Cheque Date,วันที่เช็ค
@@ -4105,7 +4193,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),จำนวนเงินที่เรียกเก็บเงินรวม (ผ่านบันทึกเวลา)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Id ผู้ผลิต
 DocType: Payment Request,Payment Gateway Details,การชำระเงินรายละเอียดเกตเวย์
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,ปริมาณที่ควรจะเป็นมากกว่า 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,ปริมาณที่ควรจะเป็นมากกว่า 0
 DocType: Journal Entry,Cash Entry,เงินสดเข้า
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,โหนดลูกจะสามารถสร้างได้ภายใต้ &#39;กลุ่ม&#39; ต่อมน้ำประเภท
 DocType: Leave Application,Half Day Date,ครึ่งวันวัน
@@ -4123,12 +4211,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,หมายเหตุ : รายการ {0} เข้ามา หลายครั้ง
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,ติดต่อทั้งหมด
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,ชื่อย่อ บริษัท
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,ผู้ใช้ {0} ไม่อยู่
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,ผู้ใช้ {0} ไม่อยู่
 DocType: Subscription,SUB-,อนุ
 DocType: Item Attribute Value,Abbreviation,ตัวย่อ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,รายการชำระเงินที่มีอยู่แล้ว
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,ไม่ authroized ตั้งแต่ {0} เกินขีด จำกัด
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,แม่ เงินเดือน หลัก
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,พยาธิวิทยา
+DocType: Restaurant Order Entry,Restaurant Table,โต๊ะอาหาร
 DocType: Leave Type,Max Days Leave Allowed,จำนวนวันสูงสุดที่อนุญาตให้ลา
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,ตั้งกฎภาษีสำหรับรถเข็น
 DocType: Purchase Invoice,Taxes and Charges Added,ภาษีและค่าบริการเพิ่ม
@@ -4140,10 +4230,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ใบเสนอราคาไปยังช่องทาง หรือลูกค้า
 DocType: Stock Settings,Role Allowed to edit frozen stock,บทบาทอนุญาตให้แก้ไขหุ้นแช่แข็ง
 ,Territory Target Variance Item Group-Wise,มณฑล เป้าหมาย แปรปรวน กลุ่มสินค้า - ฉลาด
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,ทุกกลุ่ม ลูกค้า
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,ทุกกลุ่ม ลูกค้า
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,สะสมรายเดือน
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} มีความจำเป็น รายการบันทึกอัตราแลกเปลี่ยนเงินตราไม่ได้สร้างขึ้นสำหรับ {1} เป็น {2}
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,แม่แบบภาษีมีผลบังคับใช้
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,แม่แบบภาษีมีผลบังคับใช้
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,บัญชี {0}: บัญชีผู้ปกครอง {1} ไม่อยู่
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),อัตราราคาปกติ (สกุลเงิน บริษัท )
 DocType: Products Settings,Products Settings,การตั้งค่าผลิตภัณฑ์
@@ -4169,13 +4259,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,รายการ ฉลาด รายละเอียด ภาษี
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,สถาบันชื่อย่อ
 ,Item-wise Price List Rate,รายการ ฉลาด อัตรา ราคาตามรายการ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,ใบเสนอราคาของผู้ผลิต
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,ใบเสนอราคาของผู้ผลิต
 DocType: Quotation,In Words will be visible once you save the Quotation.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกใบเสนอราคา
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},จำนวน ({0}) ไม่สามารถเป็นเศษส่วนในแถว {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},จำนวน ({0}) ไม่สามารถเป็นเศษเล็กเศษน้อยในแถว {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},บาร์โค้ด {0} ได้ใช้แล้วในรายการ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},บาร์โค้ด {0} ได้ใช้แล้วในรายการ {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,กฎระเบียบ สำหรับการเพิ่ม ค่าใช้จ่ายใน การจัดส่งสินค้า
 DocType: Item,Opening Stock,เปิดการแจ้ง
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ลูกค้า จะต้อง
@@ -4193,9 +4283,8 @@
 DocType: Customer,From Lead,จากช่องทาง
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,คำสั่งปล่อยให้การผลิต
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,เลือกปีงบประมาณ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,รายละเอียด จุดขาย จำเป็นต้องทำให้ จุดขาย บันทึกได้
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,รายละเอียด จุดขาย จำเป็นต้องทำให้ จุดขาย บันทึกได้
 DocType: Program Enrollment Tool,Enroll Students,รับสมัครนักเรียน
-DocType: Hub Settings,Name Token,ชื่อ Token
 DocType: Lab Test,Approved Date,วันที่อนุมัติ
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ขาย มาตรฐาน
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,อย่างน้อยหนึ่งคลังสินค้ามีผลบังคับใช้
@@ -4213,7 +4302,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,ทรัพยากรมนุษย์
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,กระทบยอดการชำระเงิน
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,สินทรัพย์ ภาษี
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},ใบสั่งผลิตแบบไม่ต่อเนื่อง {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},ใบสั่งผลิตแบบไม่ต่อเนื่อง {0}
 DocType: BOM Item,BOM No,BOM ไม่มี
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,อนุทิน {0} ไม่มีบัญชี {1} หรือการจับคู่แล้วกับบัตรกำนัลอื่น ๆ
@@ -4233,8 +4322,8 @@
 DocType: Currency Exchange,To Currency,กับสกุลเงิน
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,อนุญาตให้ผู้ใช้ต่อไปเพื่อขออนุมัติการใช้งานออกวันบล็อก
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,ชนิดของการเรียกร้องค่าใช้จ่าย
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},อัตราการขายสำหรับรายการ {0} ต่ำกว่า {1} อัตราการขายต้องน้อยที่สุด {2}
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},อัตราการขายสำหรับรายการ {0} ต่ำกว่า {1} อัตราการขายต้องน้อยที่สุด {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},อัตราการขายสำหรับรายการ {0} ต่ำกว่า {1} อัตราการขายต้องน้อยที่สุด {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},อัตราการขายสำหรับรายการ {0} ต่ำกว่า {1} อัตราการขายต้องน้อยที่สุด {2}
 DocType: Item,Taxes,ภาษี
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,การชำระเงินและไม่ได้ส่งมอบ
 DocType: Project,Default Cost Center,เริ่มต้นที่ศูนย์ต้นทุน
@@ -4248,15 +4337,15 @@
 DocType: Employee Loan,Fully Disbursed,การเบิกจ่ายอย่างเต็มที่
 DocType: Maintenance Visit,Customer Feedback,คำติชมของลูกค้า
 DocType: Account,Expense,ค่าใช้จ่าย
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,คะแนนไม่สามารถจะสูงกว่าคะแนนสูงสุด
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,คะแนนไม่สามารถจะสูงกว่าคะแนนสูงสุด
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,ลูกค้าและซัพพลายเออร์
 DocType: Item Attribute,From Range,จากช่วง
 DocType: BOM,Set rate of sub-assembly item based on BOM,กำหนดอัตราของรายการย่อยประกอบขึ้นจาก BOM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},ไวยากรณ์ผิดพลาดในสูตรหรือเงื่อนไข: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},ไวยากรณ์ผิดพลาดในสูตรหรือเงื่อนไข: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,ทำงาน บริษัท ตั้งค่าข้อมูลอย่างย่อประจำวัน
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,รายการที่ {0} ไม่สนใจ เพราะมัน ไม่ได้เป็น รายการที่ สต็อก
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,ส่ง การผลิต การสั่งซื้อ นี้ สำหรับการประมวลผล ต่อไป
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,ส่ง การผลิต การสั่งซื้อ นี้ สำหรับการประมวลผล ต่อไป
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",ที่จะไม่ใช้กฎการกำหนดราคาในการทำธุรกรรมโดยเฉพาะอย่างยิ่งกฎการกำหนดราคาทั้งหมดสามารถใช้งานควรจะปิดการใช้งาน
 DocType: Assessment Group,Parent Assessment Group,ผู้ปกครองกลุ่มประเมิน
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,งาน
@@ -4273,12 +4362,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',โปรดตั้งค่าตัวกรอง บริษัท หาก Group By เป็น &#39;Company&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,โพสต์วันที่ไม่สามารถเป็นวันที่ในอนาคต
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},แถว # {0}: ไม่มี Serial {1} ไม่ตรงกับ {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,สำหรับการสร้างที่เกิดขึ้นประจำ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,สบาย ๆ ออก
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Lab Test UOM
 DocType: Batch,Batch ID,ID ชุด
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},หมายเหตุ : {0}
 ,Delivery Note Trends,แนวโน้มหมายเหตุการจัดส่งสินค้า
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,ข้อมูลอย่างนี้สัปดาห์
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,ข้อมูลอย่างนี้สัปดาห์
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,ในสต็อกจำนวน
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,บัญชี: {0} เท่านั้นที่สามารถได้รับการปรับปรุงผ่านการทำธุรกรรมสต็อก
 DocType: Student Group Creation Tool,Get Courses,รับหลักสูตร
@@ -4292,7 +4382,6 @@
 DocType: Purchase Order,To Bill,บิล
 DocType: Material Request,% Ordered,% สั่งแล้ว
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",สำหรับกลุ่มนักศึกษาหลักสูตรจะมีการตรวจสอบหลักสูตรสำหรับนักเรียนทุกคนจากหลักสูตรที่ลงทะเบียนเรียนในการลงทะเบียนหลักสูตร
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date",ป้อนที่อยู่อีเมลคั่นด้วยเครื่องหมายจุลภาคใบแจ้งหนี้จะถูกส่งโดยอัตโนมัติในวันที่โดยเฉพาะอย่างยิ่ง
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,งานเหมา
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,ราคาซื้อเฉลี่ย
 DocType: Task,Actual Time (in Hours),เวลาที่เกิดขึ้นจริง (ในชั่วโมง)
@@ -4306,7 +4395,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,รายการที่ {0} ไม่ได้ ติดตั้งสำหรับ คอลัมน์ อนุกรม เลขที่ จะต้องมี ที่ว่างเปล่า
 DocType: Accounts Settings,Accounts Settings,ตั้งค่าบัญชี
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,อนุมัติ
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,ไม่มีผลลัพธ์ที่จะส่ง
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,ไม่มีผลลัพธ์ที่จะส่ง
 DocType: Customer,Sales Partner and Commission,พันธมิตรการขายและสำนักงานคณะกรรมการกำกับ
 DocType: Employee Loan,Rate of Interest (%) / Year,อัตราดอกเบี้ย (%) / ปี
 ,Project Quantity,จำนวนโครงการ
@@ -4318,55 +4407,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,สีดำ
 DocType: BOM Explosion Item,BOM Explosion Item,รายการระเบิด BOM
 DocType: Account,Auditor,ผู้สอบบัญชี
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} รายการผลิตแล้ว
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} รายการผลิตแล้ว
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,เรียนรู้เพิ่มเติม
 DocType: Cheque Print Template,Distance from top edge,ระยะห่างจากขอบด้านบน
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,ราคา {0} เป็นคนพิการหรือไม่มีอยู่
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,ราคา {0} เป็นคนพิการหรือไม่มีอยู่
 DocType: Purchase Invoice,Return,กลับ
 DocType: Production Order Operation,Production Order Operation,การดำเนินงานการผลิตการสั่งซื้อ
 DocType: Pricing Rule,Disable,ปิดการใช้งาน
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,โหมดการชำระเงินจะต้องชำระเงิน
 DocType: Project Task,Pending Review,รอตรวจทาน
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,การนัดหมายและการปรึกษาหารือ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ไม่ได้ลงทะเบียนในชุด{2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ไม่ได้ลงทะเบียนในชุด{2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",สินทรัพย์ {0} ไม่สามารถทิ้งขณะที่มันมีอยู่แล้ว {1}
 DocType: Task,Total Expense Claim (via Expense Claim),การเรียกร้องค่าใช้จ่ายรวม (ผ่านการเรียกร้องค่าใช้จ่าย)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,มาร์คขาด
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},แถว {0}: สกุลเงินของ BOM # {1} ควรจะเท่ากับสกุลเงินที่เลือก {2}
 DocType: Journal Entry Account,Exchange Rate,อัตราแลกเปลี่ยน
 DocType: Patient,Additional information regarding the patient,ข้อมูลเพิ่มเติมเกี่ยวกับผู้ป่วย
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,การขายสินค้า {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,การขายสินค้า {0} ไม่ได้ ส่ง
 DocType: Homepage,Tag Line,สายแท็ก
 DocType: Fee Component,Fee Component,ค่าบริการตัวแทน
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,การจัดการ Fleet
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,เพิ่มรายการจาก
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,การจัดการ Fleet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,เพิ่มรายการจาก
 DocType: Cheque Print Template,Regular,ปกติ
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,weightage รวมทุกเกณฑ์การประเมินจะต้อง 100%
-DocType: BOM,Last Purchase Rate,อัตราซื้อล่าสุด
+DocType: Purchase Order Item,Last Purchase Rate,อัตราซื้อล่าสุด
 DocType: Account,Asset,สินทรัพย์
 DocType: Project Task,Task ID,รหัสงาน
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,หุ้นไม่สามารถที่มีอยู่สำหรับรายการ {0} ตั้งแต่มีสายพันธุ์
 DocType: Lab Test,Mobile,โทรศัพท์มือถือ
 ,Sales Person-wise Transaction Summary,การขายอย่างย่อรายการคนฉลาด
 DocType: Training Event,Contact Number,เบอร์ติดต่อ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,ไม่พบคลังสินค้า {0} ในระบบ
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ลงทะเบียนสำหรับ ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,ไม่พบคลังสินค้า {0} ในระบบ
 DocType: Monthly Distribution,Monthly Distribution Percentages,เปอร์เซ็นต์การกระจายรายเดือน
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,รายการที่เลือกไม่สามารถมีแบทช์
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",อัตราการประเมินไม่พบรายการ {0} ซึ่งเป็นสิ่งจำเป็นที่ต้องทำรายการบัญชีสำหรับ {1} {2} หากรายการที่จะทำธุรกรรมเป็นรายการตัวอย่างใน {1} กรุณาพูดถึงว่าใน {1} ตารางรายการ มิฉะนั้นโปรดสร้างธุรกรรมหุ้นขาเข้าสำหรับสินค้าหรือการกล่าวถึงอัตราการประเมินมูลค่าในรายการบันทึกแล้วลอง submiting / ยกเลิกรายการนี้
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% ของวัสดุที่ส่งมอบเทียบกับหมายเหตุการจัดส่งนี้
+DocType: Training Event,Has Certificate,มีใบรับรอง
 DocType: Project,Customer Details,รายละเอียดลูกค้า
 DocType: Employee,Reports to,รายงานไปยัง
 ,Unpaid Expense Claim,การเรียกร้องค่าใช้จ่ายที่ค้างชำระ
 DocType: Payment Entry,Paid Amount,จำนวนเงินที่ชำระ
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,สำรวจรอบการขาย
 DocType: Assessment Plan,Supervisor,ผู้ดูแล
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,ออนไลน์
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,ออนไลน์
 ,Available Stock for Packing Items,สต็อกสำหรับการบรรจุรายการ
 DocType: Item Variant,Item Variant,รายการตัวแปร
 DocType: Assessment Result Tool,Assessment Result Tool,เครื่องมือการประเมินผล
 DocType: BOM Scrap Item,BOM Scrap Item,BOM เศษรายการ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,คำสั่งที่ส่งมาไม่สามารถลบได้
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,คำสั่งที่ส่งมาไม่สามารถลบได้
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",ยอดเงินในบัญชีแล้วในเดบิตคุณไม่ได้รับอนุญาตให้ตั้ง 'ยอดดุลต้องเป็น' เป็น 'เครดิต
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,การบริหารจัดการคุณภาพ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,รายการ {0} ถูกปิดใช้งาน
@@ -4387,7 +4475,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,อนุญาตให้ใช้อัตราการประเมินค่าเป็นศูนย์
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,อนุญาตให้ใช้อัตราการประเมินค่าเป็นศูนย์
 DocType: Training Event Employee,Invited,ได้รับเชิญ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,หลายโครงสร้างเงินเดือนที่ต้องการใช้งานพบพนักงาน {0} สำหรับวันที่กำหนด
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,หลายโครงสร้างเงินเดือนที่ต้องการใช้งานพบพนักงาน {0} สำหรับวันที่กำหนด
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,บัญชีการติดตั้งเกตเวย์
 DocType: Employee,Employment Type,ประเภทการจ้างงาน
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,สินทรัพย์ถาวร
@@ -4399,7 +4487,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,อีเมล์ ID นักศึกษา
 DocType: Employee,Notice (days),แจ้งให้ทราบล่วงหน้า (วัน)
 DocType: Tax Rule,Sales Tax Template,แม่แบบภาษีการขาย
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,เลือกรายการที่จะบันทึกในใบแจ้งหนี้
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,เลือกรายการที่จะบันทึกในใบแจ้งหนี้
 DocType: Employee,Encashment Date,วันที่การได้เป็นเงินสด
 DocType: Training Event,Internet,อินเทอร์เน็ต
 DocType: Special Test Template,Special Test Template,เทมเพลตการทดสอบพิเศษ
@@ -4409,7 +4497,7 @@
 DocType: Academic Term,Term Start Date,ในระยะวันที่เริ่มต้น
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},กรุณาหาแนบ {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},กรุณาหาแนบ {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,ยอดเงินบัญชีธนาคารตามบัญชีแยกประเภททั่วไป
 DocType: Job Applicant,Applicant Name,ชื่อผู้ยื่นคำขอ
 DocType: Authorization Rule,Customer / Item Name,ชื่อลูกค้า / รายการ
@@ -4429,7 +4517,7 @@
 DocType: Guardian,Guardian Of ,ผู้ปกครองของ
 DocType: Grading Scale Interval,Threshold,ธรณีประตู
 DocType: BOM Update Tool,Current BOM,BOM ปัจจุบัน
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,เพิ่ม หมายเลขซีเรียล
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,เพิ่ม หมายเลขซีเรียล
 DocType: Production Order Item,Available Qty at Source Warehouse,จำนวนที่มีอยู่ที่ Source Warehouse
 apps/erpnext/erpnext/config/support.py +22,Warranty,การรับประกัน
 DocType: Purchase Invoice,Debit Note Issued,หมายเหตุเดบิตที่ออก
@@ -4452,10 +4540,9 @@
 DocType: Account,Receivable,ลูกหนี้
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,แถว # {0}: ไม่อนุญาตให้ผู้ผลิตที่จะเปลี่ยนเป็นใบสั่งซื้ออยู่แล้ว
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,บทบาทที่ได้รับอนุญาตให้ส่งการทำธุรกรรมที่เกินวงเงินที่กำหนด
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,เลือกรายการที่จะผลิต
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","การซิงค์ข้อมูลหลัก, อาจทำงานบางช่วงเวลา"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,เลือกรายการที่จะผลิต
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","การซิงค์ข้อมูลหลัก, อาจทำงานบางช่วงเวลา"
 DocType: Item,Material Issue,บันทึกการใช้วัสดุ
-DocType: Hub Settings,Seller Description,รายละเอียดผู้ขาย
 DocType: Employee Education,Qualification,คุณสมบัติ
 DocType: Item Price,Item Price,ราคาสินค้า
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,สบู่ และ ผงซักฟอก
@@ -4463,7 +4550,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,จากเวลาที่ไม่สามารถมีค่ามากกว่าการเวลา
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,ภาพยนตร์ และวิดีโอ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ได้รับคำสั่ง
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,ประวัติย่อ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,ประวัติย่อ
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,หากเปิดใช้งานระบบจะไม่อัปเดตฟิลด์ของตัวแปรจากเทมเพลต แต่จะคัดลอกข้อมูลของฟิลด์ด้านล่างที่กล่าวถึงในขณะที่สร้างตัวแปรใหม่
 DocType: Salary Detail,Component,ตัวแทน
 DocType: Assessment Criteria,Assessment Criteria Group,กลุ่มเกณฑ์การประเมิน
 DocType: Healthcare Settings,Patient Name By,ชื่อผู้ป่วยโดย
@@ -4473,7 +4561,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,กรุณากรอก บทบาท การอนุมัติ หรือ ให้ความเห็นชอบ ผู้ใช้
 DocType: Journal Entry,Write Off Entry,เขียนปิดเข้า
 DocType: BOM,Rate Of Materials Based On,อัตราวัสดุตาม
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,ผู้จัดจำหน่าย&gt; ประเภทผู้จัดจำหน่าย
+DocType: Item Variant Settings,Do not Update Variants,อย่าอัปเดต Variants
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics สนับสนุน
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,ยกเลิกการเลือกทั้งหมด
 DocType: POS Profile,Terms and Conditions,ข้อตกลงและเงื่อนไข
@@ -4482,7 +4570,7 @@
 DocType: Leave Block List,Applies to Company,นำไปใช้กับ บริษัท
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,ไม่สามารถยกเลิก ได้เพราะ ส่ง สินค้า เข้า {0} มีอยู่
 DocType: Employee Loan,Disbursement Date,วันที่เบิกจ่าย
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;ผู้รับ&#39; ไม่ได้ระบุ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;ผู้รับ&#39; ไม่ได้ระบุ
 DocType: BOM Update Tool,Update latest price in all BOMs,อัปเดตราคาล่าสุดใน BOM ทั้งหมด
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,บันทึกการแพทย์
 DocType: Vehicle,Vehicle,พาหนะ
@@ -4498,14 +4586,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,ค่าเสื่อมราคาสินทรัพย์และยอดคงเหลือ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},จำนวน {0} {1} โอนจาก {2} เป็น {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},จำนวน {0} {1} โอนจาก {2} เป็น {3}
 DocType: Sales Invoice,Get Advances Received,รับเงินรับล่วงหน้า
 DocType: Email Digest,Add/Remove Recipients,เพิ่ม / ลบ ชื่อผู้รับ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},การทำธุรกรรมที่ ไม่ได้รับอนุญาต กับ หยุด การผลิต สั่งซื้อ {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",การตั้งค่า นี้ ปีงบประมาณ เป็นค่าเริ่มต้น ให้คลิกที่ 'ตั้ง เป็นค่าเริ่มต้น '
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,ร่วม
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,ร่วม
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,ปัญหาการขาดแคลนจำนวน
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,ตัวแปรรายการ {0} อยู่ที่มีลักษณะเดียวกัน
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,ตัวแปรรายการ {0} อยู่ที่มีลักษณะเดียวกัน
 DocType: Employee Loan,Repay from Salary,ชำระคืนจากเงินเดือน
 DocType: Leave Application,LAP/,ตัก/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},ร้องขอการชำระเงินจาก {0} {1} สำหรับจำนวนเงิน {2}
@@ -4518,7 +4606,7 @@
 DocType: Sales Invoice Item,Sales Order Item,รายการสั่งซื้อการขาย
 DocType: Salary Slip,Payment Days,วันชำระเงิน
 DocType: Patient,Dormant,อยู่เฉยๆ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,โกดังกับโหนดลูกไม่สามารถแปลงบัญชีแยกประเภท
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,โกดังกับโหนดลูกไม่สามารถแปลงบัญชีแยกประเภท
 DocType: BOM,Manage cost of operations,จัดการค่าใช้จ่ายในการดำเนินงาน
 DocType: Accounts Settings,Stale Days,Stale Days
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",เมื่อใดของการทำธุรกรรมการตรวจสอบเป็น &quot;Submitted&quot; อีเมล์แบบ pop-up เปิดโดยอัตโนมัติในการส่งอีเมลไปยัง &quot;ติดต่อ&quot; ที่เกี่ยวข้องในการทำธุรกรรมที่มีการทำธุรกรรมเป็นสิ่งที่แนบ ผู้ใช้อาจจะหรือไม่อาจจะส่งอีเมล
@@ -4532,10 +4620,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,อนุกรม ไม่มี {0} ได้รับ อยู่แล้ว
 ,Requested Items To Be Transferred,รายการที่ได้รับการร้องขอจะถูกถ่ายโอน
 DocType: Expense Claim,Vehicle Log,ยานพาหนะเข้าสู่ระบบ
-DocType: Purchase Invoice,Recurring Id,รหัสที่เกิดขึ้น
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),การมีไข้ (อุณหภูมิ&gt; 38.5 ° C / 101.3 ° F หรืออุณหภูมิคงที่&gt; 38 ° C / 100.4 ° F)
 DocType: Customer,Sales Team Details,ขายรายละเอียดทีม
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,ลบอย่างถาวร?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,ลบอย่างถาวร?
 DocType: Expense Claim,Total Claimed Amount,จำนวนรวมอ้าง
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,โอกาสที่มีศักยภาพสำหรับการขาย
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},ไม่ถูกต้อง {0}
@@ -4545,7 +4632,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ห้างสรรพสินค้า
 ,Item Delivery Date,วันที่จัดส่งสินค้า
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,การติดตั้งของโรงเรียนใน ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,การติดตั้งของโรงเรียนใน ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),ฐานจำนวนเปลี่ยน (สกุลเงินบริษัท)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,ไม่มี รายการบัญชี สำหรับคลังสินค้า ดังต่อไปนี้
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,บันทึกเอกสารครั้งแรก
@@ -4557,13 +4644,12 @@
 DocType: Task,Is Milestone,เป็น Milestone
 DocType: Daily Work Summary,Email Sent To,อีเมลที่ส่งไป
 DocType: Budget,Warn,เตือน
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,คุณแน่ใจหรือไม่ว่าต้องการยกเลิกการลงทะเบียน
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",ใด ๆ ข้อสังเกตอื่น ๆ ความพยายามที่น่าสังเกตว่าควรจะไปในบันทึก
 DocType: BOM,Manufacturing User,ผู้ใช้การผลิต
 DocType: Purchase Invoice,Raw Materials Supplied,วัตถุดิบ
-DocType: Purchase Invoice,Recurring Print Format,รูปแบบที่เกิดขึ้นประจำพิมพ์
 DocType: C-Form,Series,ชุด
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},สกุลเงินของรายการราคา {0} ต้องเป็น {1} หรือ {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,เพิ่มผลิตภัณฑ์
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},สกุลเงินของรายการราคา {0} ต้องเป็น {1} หรือ {2}
 DocType: Appraisal,Appraisal Template,แม่แบบการประเมิน
 DocType: Item Group,Item Classification,การจัดประเภทรายการ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,ผู้จัดการฝ่ายพัฒนาธุรกิจ
@@ -4577,7 +4663,7 @@
 DocType: Item Attribute Value,Attribute Value,ค่าแอตทริบิวต์
 ,Itemwise Recommended Reorder Level,แนะนำ Itemwise Reorder ระดับ
 DocType: Salary Detail,Salary Detail,รายละเอียดเงินเดือน
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,กรุณาเลือก {0} ครั้งแรก
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,กรุณาเลือก {0} ครั้งแรก
 DocType: Appointment Type,Physician,แพทย์
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,รุ่นที่ {0} ของรายการ {1} หมดอายุ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,การให้คำปรึกษา
@@ -4588,7 +4674,7 @@
 DocType: Salary Detail,Default Amount,จำนวนเงินที่เริ่มต้น
 DocType: Lab Test Template,Descriptive,พรรณนา
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,ไม่พบในโกดัง ระบบ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,ข้อมูลอย่างเดือนนี้
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,ข้อมูลอย่างเดือนนี้
 DocType: Quality Inspection Reading,Quality Inspection Reading,การตรวจสอบคุณภาพการอ่าน
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,ค่าของ `อายัด (freeze) Stock ที่เก่ากว่า ` ควรจะ มีขนาดเล็กกว่า % d วัน
 DocType: Tax Rule,Purchase Tax Template,ซื้อแม่แบบภาษี
@@ -4611,12 +4697,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,กิจกรรม / ผลการฝึกอบรม
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,ค่าเสื่อมราคาสะสม ณ วันที่
 DocType: Sales Invoice,C-Form Applicable,C-Form สามารถนำไปใช้ได้
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},เวลาการดำเนินงานจะต้องมากกว่า 0 สำหรับการปฏิบัติงาน {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},เวลาการดำเนินงานจะต้องมากกว่า 0 สำหรับการปฏิบัติงาน {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,ต้องระบุคลังสินค้า
 DocType: Supplier,Address and Contacts,ที่อยู่และที่ติดต่อ
 DocType: UOM Conversion Detail,UOM Conversion Detail,รายละเอียดการแปลง UOM
 DocType: Program,Program Abbreviation,ชื่อย่อโปรแกรม
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,ใบสั่งผลิตไม่สามารถขึ้นกับแม่แบบรายการ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,ใบสั่งผลิตไม่สามารถขึ้นกับแม่แบบรายการ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,ค่าใช้จ่ายที่มีการปรับปรุงในใบเสร็จรับเงินกับแต่ละรายการ
 DocType: Warranty Claim,Resolved By,แก้ไขได้โดยการ
 DocType: Bank Guarantee,Start Date,วันที่เริ่มต้น
@@ -4642,27 +4728,28 @@
 DocType: Employee,Educational Qualification,วุฒิการศึกษา
 DocType: Workstation,Operating Costs,ค่าใช้จ่ายในการดำเนินงาน
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,ดำเนินการหากสะสมเกินงบประมาณรายเดือน
-DocType: Purchase Invoice,Submit on creation,ส่งในการสร้าง
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},สกุลเงินสำหรับ {0} &#39;จะต้อง {1}
+DocType: Subscription,Submit on creation,ส่งในการสร้าง
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},สกุลเงินสำหรับ {0} &#39;จะต้อง {1}
 DocType: Asset,Disposal Date,วันที่จำหน่าย
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",อีเมลจะถูกส่งไปยังพนักงานที่ใช้งานทั้งหมดของ บริษัท ในเวลาที่กำหนดหากพวกเขาไม่ได้มีวันหยุด บทสรุปของการตอบสนองจะถูกส่งในเวลาเที่ยงคืน
 DocType: Employee Leave Approver,Employee Leave Approver,อนุมัติพนักงานออก
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},แถว {0}: รายการสั่งซื้อใหม่อยู่แล้วสำหรับคลังสินค้านี้ {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.",ไม่ สามารถประกาศ เป็น หายไป เพราะ ใบเสนอราคา ได้รับการทำ
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,การฝึกอบรมผลตอบรับ
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},แถว {0}: รายการสั่งซื้อใหม่อยู่แล้วสำหรับคลังสินค้านี้ {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.",ไม่ สามารถประกาศ เป็น หายไป เพราะ ใบเสนอราคา ได้รับการทำ
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,การฝึกอบรมผลตอบรับ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,สั่งผลิต {0} จะต้องส่ง
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,เกณฑ์ชี้วัดของผู้จัดหาผลิตภัณฑ์
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},กรุณาเลือก วันเริ่มต้น และ วันที่สิ้นสุด สำหรับรายการที่ {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},แน่นอนมีผลบังคับใช้ในแถว {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,วันที่ ไม่สามารถ ก่อนที่จะ นับจากวันที่
 DocType: Supplier Quotation Item,Prevdoc DocType,DocType Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,เพิ่ม / แก้ไขราคา
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,เพิ่ม / แก้ไขราคา
 DocType: Batch,Parent Batch,กลุ่มผู้ปกครอง
 DocType: Batch,Parent Batch,กลุ่มผู้ปกครอง
 DocType: Cheque Print Template,Cheque Print Template,แม่แบบการพิมพ์เช็ค
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,แผนภูมิของศูนย์ต้นทุน
 DocType: Lab Test Template,Sample Collection,การเก็บตัวอย่าง
 ,Requested Items To Be Ordered,รายการที่ได้รับการร้องขอที่จะสั่งซื้อ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,คำสั่งซื้อของฉัน
 DocType: Price List,Price List Name,ชื่อรายการราคา
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},สรุปการทำงานประจำวันสำหรับ {0}
 DocType: Employee Loan,Totals,ผลรวม
@@ -4681,12 +4768,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} หน่วย {1} จำเป็นใน {2} ใน {3} {4} สำหรับ {5} ในการทำธุรกรรมนี้
 DocType: Fee Schedule,Student Category,หมวดหมู่นักศึกษา
 DocType: Announcement,Student,นักเรียน
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,หน่วย องค์กร (เขตปกครอง) ต้นแบบ
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,หน่วย องค์กร (เขตปกครอง) ต้นแบบ
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,ไปที่ห้อง
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,กรุณาใส่ข้อความ ก่อนที่จะส่ง
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,ทำซ้ำสำหรับซัพพลายเออร์
 DocType: Email Digest,Pending Quotations,ที่รอการอนุมัติใบเสนอราคา
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,จุดขายข้อมูลส่วนตัว
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,จุดขายข้อมูลส่วนตัว
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Lab Test Configurations
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,เงินให้กู้ยืม ที่ไม่มีหลักประกัน
 DocType: Cost Center,Cost Center Name,ค่าใช้จ่ายชื่อศูนย์
@@ -4696,6 +4783,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,ทั้งหมดที่จ่าย Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,ข้อความที่ยาวกว่า 160 ตัวอักษร จะถูกแบ่งออกเป็นหลายข้อความ
 DocType: Purchase Receipt Item,Received and Accepted,และได้รับการยอมรับ
+DocType: Hub Settings,Company and Seller Profile,ข้อมูล บริษัท และผู้ขาย
 ,GST Itemised Sales Register,GST ลงทะเบียนสินค้า
 ,Serial No Service Contract Expiry,อนุกรมไม่มีหมดอายุสัญญาบริการ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,คุณไม่ สามารถเครดิต และ หักเงินจากบัญชี เดียวกันในเวลาเดียวกัน
@@ -4705,10 +4793,11 @@
 DocType: Item,Variant Based On,ตัวแปรอยู่บนพื้นฐานของ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},weightage รวม ที่ได้รับมอบหมาย ควรจะ 100% มันเป็น {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,ซัพพลายเออร์ ของคุณ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,โปรดแก้ไข
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,ไม่สามารถตั้งค่า ที่ หายไป ในขณะที่ การขายสินค้า ที่ทำ
 DocType: Request for Quotation Item,Supplier Part No,ผู้ผลิตชิ้นส่วน
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ไม่สามารถหักค่าใช้จ่ายเมื่อเป็นหมวดหมู่สำหรับ &#39;การประเมินค่า&#39; หรือ &#39;Vaulation และรวม
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,ที่ได้รับจาก
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,ที่ได้รับจาก
 DocType: Lead,Converted,แปลง
 DocType: Item,Has Serial No,มีซีเรียลไม่มี
 DocType: Employee,Date of Issue,วันที่ออก
@@ -4716,7 +4805,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",ตามการตั้งค่าการซื้อหาก Purchase Reciept Required == &#39;YES&#39; จากนั้นสำหรับการสร้าง Invoice ซื้อผู้ใช้ต้องสร้างใบเสร็จการรับสินค้าเป็นอันดับแรกสำหรับรายการ {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},แถว # {0}: ตั้งผู้ผลิตสำหรับรายการ {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,แถว {0}: ค่าเวลาทำการต้องมีค่ามากกว่าศูนย์
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,ภาพ Website {0} แนบไปกับรายการ {1} ไม่สามารถพบได้
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,ภาพ Website {0} แนบไปกับรายการ {1} ไม่สามารถพบได้
 DocType: Issue,Content Type,ประเภทเนื้อหา
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,คอมพิวเตอร์
 DocType: Item,List this Item in multiple groups on the website.,รายการนี้ในหลายกลุ่มในเว็บไซต์
@@ -4727,14 +4816,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,คอมเมนต์ได้รับ Unreconciled
 DocType: Payment Reconciliation,From Invoice Date,จากวันที่ใบแจ้งหนี้
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,คุณไม่ได้รับอนุญาตให้ส่ง
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,สกุลเงินที่เรียกเก็บเงินจะต้องเท่ากับสกุลเงินของบริษัทเริ่มต้นหรือหรือสกุลเงินของบัญชีฝ่ายใดฝ่ายหนึ่ง
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,สกุลเงินที่เรียกเก็บเงินจะต้องเท่ากับสกุลเงินของบริษัทเริ่มต้นหรือหรือสกุลเงินของบัญชีฝ่ายใดฝ่ายหนึ่ง
 DocType: Healthcare Settings,Laboratory Settings,การตั้งค่าห้องปฏิบัติการ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,ปล่อยให้เป็นเงินสด
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,มัน ทำอะไรได้บ้าง
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,ไปที่โกดัง
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,ทั้งหมดเป็นนักศึกษา
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,มัน ทำอะไรได้บ้าง
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,ไปที่โกดัง
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,ทั้งหมดเป็นนักศึกษา
 ,Average Commission Rate,อัตราเฉลี่ยของค่าคอมมิชชั่น
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,'มีเลขซีเรียล' ไม่สามารถเป็น 'ใช่' สำหรับรายการที่ไม่ใช่สต็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,'มีเลขซีเรียล' ไม่สามารถเป็น 'ใช่' สำหรับรายการที่ไม่ใช่สต็อก
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,เลือกสถานะ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,ผู้เข้าร่วมไม่สามารถทำเครื่องหมายสำหรับวันที่ในอนาคต
 DocType: Pricing Rule,Pricing Rule Help,กฎการกำหนดราคาช่วยเหลือ
@@ -4752,41 +4841,41 @@
 DocType: Item,Customer Code,รหัสลูกค้า
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},เตือนวันเกิดสำหรับ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ตั้งแต่ วันที่ สั่งซื้อ ล่าสุด
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,เพื่อเดบิตบัญชีจะต้องเป็นบัญชีงบดุล
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,เพื่อเดบิตบัญชีจะต้องเป็นบัญชีงบดุล
 DocType: Buying Settings,Naming Series,การตั้งชื่อซีรีส์
 DocType: Leave Block List,Leave Block List Name,ฝากชื่อรายการที่ถูกบล็อก
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,วันประกันเริ่มต้นควรจะน้อยกว่าวันประกันสิ้นสุด
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,โปรดตั้งค่าระบบการตั้งชื่อผู้เรียนในโรงเรียน&gt; การตั้งค่าโรงเรียน
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,สินทรัพย์ หุ้น
 DocType: Timesheet,Production Detail,รายละเอียดการผลิต
+DocType: Restaurant,Active Menu,เมนูที่ใช้งานอยู่
 DocType: Target Detail,Target Qty,จำนวนเป้าหมาย
 DocType: Shopping Cart Settings,Checkout Settings,การตั้งค่าเช็คเอาต์
 DocType: Attendance,Present,นำเสนอ
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,หมายเหตุ การจัดส่ง {0} จะต้องไม่ถูก ส่งมา
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,หมายเหตุ การจัดส่ง {0} จะต้องไม่ถูก ส่งมา
 DocType: Notification Control,Sales Invoice Message,ข้อความขายใบแจ้งหนี้
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,บัญชีปิด {0} ต้องเป็นชนิดรับผิด / ผู้ถือหุ้น
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},สลิปเงินเดือนของพนักงาน {0} สร้างไว้แล้วสำหรับแผ่นเวลา {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},สลิปเงินเดือนของพนักงาน {0} สร้างไว้แล้วสำหรับแผ่นเวลา {1}
 DocType: Vehicle Log,Odometer,วัดระยะทาง
 DocType: Sales Order Item,Ordered Qty,สั่งซื้อ จำนวน
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,รายการ {0} ถูกปิดใช้งาน
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,รายการ {0} ถูกปิดใช้งาน
 DocType: Stock Settings,Stock Frozen Upto,สต็อกไม่เกิน Frozen
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM ไม่ได้มีรายการสินค้าใด ๆ
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,กิจกรรมของโครงการ / งาน
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM ไม่ได้มีรายการสินค้าใด ๆ
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,กิจกรรมของโครงการ / งาน
 DocType: Vehicle Log,Refuelling Details,รายละเอียดเชื้อเพลิง
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,สร้าง Slips เงินเดือน
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}",ต้องเลือก การซื้อ ถ้าเลือก ใช้ได้กับ เป็น {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ส่วนลด จะต้อง น้อยกว่า 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,ไม่พบอัตราการซื้อล่าสุด
 DocType: Purchase Invoice,Write Off Amount (Company Currency),เขียนปิดจำนวนเงิน (บริษัท สกุล)
 DocType: Sales Invoice Timesheet,Billing Hours,ชั่วโมงทำการเรียกเก็บเงิน
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,BOM เริ่มต้นสำหรับ {0} ไม่พบ
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,แถว # {0}: กรุณาตั้งค่าปริมาณการสั่งซื้อ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM เริ่มต้นสำหรับ {0} ไม่พบ
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,แถว # {0}: กรุณาตั้งค่าปริมาณการสั่งซื้อ
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,แตะรายการเพื่อเพิ่มที่นี่
 DocType: Fees,Program Enrollment,การลงทะเบียนโปรแกรม
 DocType: Landed Cost Voucher,Landed Cost Voucher,ที่ดินคูปองต้นทุน
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},กรุณาตั้ง {0}
-DocType: Purchase Invoice,Repeat on Day of Month,ทำซ้ำในวันเดือน
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} เป็นนักเรียนที่ไม่ได้ใช้งาน
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} เป็นนักเรียนที่ไม่ได้ใช้งาน
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} เป็นนักเรียนที่ไม่ได้ใช้งาน
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} เป็นนักเรียนที่ไม่ได้ใช้งาน
 DocType: Employee,Health Details,รายละเอียดสุขภาพ
 DocType: Offer Letter,Offer Letter Terms,เสนอเงื่อนไขจดหมาย
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,ในการสร้างเอกสารอ้างอิงคำขอการชำระเงินต้องระบุ
@@ -4795,7 +4884,6 @@
 DocType: Employee External Work History,Salary,เงินเดือน
 DocType: Serial No,Delivery Document Type,ประเภทเอกสารการจัดส่งสินค้า
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,ส่งบิลเงินเดือนทั้งหมดสำหรับเกณฑ์ที่เลือกข้างต้น
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} รายการที่ซิงค์แล้ว
 DocType: Sales Order,Partly Delivered,ส่งบางส่วน
 DocType: Email Digest,Receivables,ลูกหนี้
 DocType: Lead Source,Lead Source,ที่มาของช่องทาง
@@ -4817,9 +4905,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,ช่วงสูงอายุ 2
 DocType: SG Creation Tool Course,Max Strength,ความแรงของแม็กซ์
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM แทนที่
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,เลือกรายการตามวันที่จัดส่ง
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,เลือกรายการตามวันที่จัดส่ง
 ,Sales Analytics,Analytics ขาย
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},ที่มีจำหน่าย {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},ที่มีจำหน่าย {0}
 ,Prospects Engaged But Not Converted,แนวโน้มมีส่วนร่วม แต่ไม่ได้แปลง
 ,Prospects Engaged But Not Converted,แนวโน้มมีส่วนร่วม แต่ไม่ได้แปลง
 DocType: Manufacturing Settings,Manufacturing Settings,การตั้งค่าการผลิต
@@ -4827,10 +4915,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 มือถือไม่มี
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,กรุณาใส่ สกุลเงินเริ่มต้น ใน บริษัท มาสเตอร์
 DocType: Stock Entry Detail,Stock Entry Detail,รายละเอียดรายการสินค้า
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,การแจ้งเตือนทุกวัน
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,การแจ้งเตือนทุกวัน
 DocType: Products Settings,Home Page is Products,หน้าแรกคือผลิตภัณฑ์
 ,Asset Depreciation Ledger,บัญชีแยกประเภทค่าเสื่อมราคาสินทรัพย์
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},ความขัดแย้งกับกฎภาษี {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},ความขัดแย้งกับกฎภาษี {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,ชื่อ บัญชีผู้ใช้ใหม่
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,วัตถุดิบที่จำหน่ายค่าใช้จ่าย
 DocType: Selling Settings,Settings for Selling Module,การตั้งค่าสำหรับการขายโมดูล
@@ -4844,8 +4932,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,รายการ {0} จะต้องมี รายการ หุ้น
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,เริ่มต้นการทำงานในความคืบหน้าโกดัง
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,ตั้งค่าเริ่มต้น สำหรับการทำธุรกรรม ทางบัญชี
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,กรุณาติดตั้ง System Employee Naming System ใน Human Resource&gt; HR Settings
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,วันที่ คาดว่าจะ ไม่สามารถเป็น วัสดุ ก่อนที่จะ ขอ วันที่
+DocType: Restaurant,Default Tax Template,เทมเพลตภาษีที่ผิดนัด
 DocType: Fees,Student Details,รายละเอียดของนักเรียน
 DocType: Purchase Invoice Item,Stock Qty,จำนวนหุ้น
 DocType: Purchase Invoice Item,Stock Qty,จำนวนหุ้น
@@ -4864,8 +4953,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,ไปที่รายการ
 DocType: Sales Partner,Partner Type,ประเภทคู่
 DocType: Purchase Taxes and Charges,Actual,ตามความเป็นจริง
+DocType: Restaurant Menu,Restaurant Manager,ผู้จัดการร้านอาหาร
 DocType: Authorization Rule,Customerwise Discount,ส่วนลด Customerwise
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Timesheet สำหรับงาน
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Timesheet สำหรับงาน
 DocType: Purchase Invoice,Against Expense Account,กับบัญชีค่าใช้จ่าย
 DocType: Production Order,Production Order,สั่งซื้อการผลิต
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,หมายเหตุ การติดตั้ง {0} ได้ ถูกส่งมา อยู่แล้ว
@@ -4873,7 +4963,6 @@
 DocType: Quotation Item,Against Docname,กับ ชื่อเอกสาร
 DocType: SMS Center,All Employee (Active),พนักงาน (อยู่ในระบบ) ทั้งหมด
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,ดู ตอนนี้
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,เลือกระยะเวลาเมื่อใบแจ้งหนี้จะถูกสร้างขึ้นโดยอัตโนมัติ
 DocType: BOM,Raw Material Cost,วัตถุดิบต้นทุน
 DocType: Item Reorder,Re-Order Level,ระดับ Re-Order
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,ป้อนรายการและจำนวนที่วางแผนไว้สำหรับที่คุณต้องการที่จะยกระดับการสั่งผลิตหรือดาวน์โหลดวัตถุดิบสำหรับการวิเคราะห์
@@ -4886,24 +4975,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,ประเภทรายงาน มีผลบังคับใช้
 DocType: Item,Serial Number Series,ชุด หมายเลข
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},คลังสินค้า จำเป็นสำหรับ รายการสต๊อก {0} ในแถว {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,เพิ่มโปรแกรม
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,ค้าปลีกและ ขายส่ง
 DocType: Issue,First Responded On,ครั้งแรกเมื่อวันที่ง่วง
 DocType: Website Item Group,Cross Listing of Item in multiple groups,รายชื่อครอสของรายการในหลายกลุ่ม
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},วันเริ่มต้นปีงบประมาณและปีงบประมาณสิ้นสุดวันที่มีการตั้งค่าอยู่แล้วในปีงบประมาณ {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,โปรโมชั่นวันที่มีการปรับปรุง
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,แบ่งแบทช์
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,แบ่งแบทช์
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,แบ่งแบทช์
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,แบ่งแบทช์
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Reconciled ประสบความสำเร็จ
 DocType: Request for Quotation Supplier,Download PDF,ดาวน์โหลดไฟล์ PDF
 DocType: Production Order,Planned End Date,วันที่สิ้นสุดการวางแผน
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,โปรดป้อนวันที่กำหนดการ
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,ที่รายการจะถูกเก็บไว้
 DocType: Request for Quotation,Supplier Detail,รายละเอียดผู้จัดจำหน่าย
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},ข้อผิดพลาดในสูตรหรือเงื่อนไข: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},ข้อผิดพลาดในสูตรหรือเงื่อนไข: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,ใบแจ้งหนี้จํานวนเงิน
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,เกณฑ์น้ำหนักต้องเพิ่มได้ถึง 100%
 DocType: Attendance,Attendance,การดูแลรักษา
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,รายการที่แจ้ง
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,รายการที่แจ้ง
 DocType: BOM,Materials,วัสดุ
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",ถ้าไม่ได้ตรวจสอบรายชื่อจะต้องมีการเพิ่มแต่ละแผนกที่มันจะต้องมีการใช้
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,ต้นทางและปลายทางคลังสินค้าไม่สามารถจะเหมือนกัน
@@ -4921,6 +5010,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,เมื่อรวมสุทธิ
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},ค่าสำหรับแอตทริบิวต์ {0} จะต้องอยู่ในช่วงของ {1} เป็น {2} ในการเพิ่มขึ้นของ {3} สำหรับรายการ {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,คลังสินค้า เป้าหมาย ในแถว {0} จะต้อง เป็นเช่นเดียวกับ การผลิต การสั่งซื้อ
+DocType: Restaurant Reservation,Waitlisted,waitlisted
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,สกุลเงินไม่สามารถเปลี่ยนแปลงได้หลังจากการทำรายการโดยใช้เงินสกุลอื่น
 DocType: Vehicle Service,Clutch Plate,จานคลัทช์
 DocType: Company,Round Off Account,ปิดรอบบัญชี
@@ -4937,7 +5027,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,ชื่อใหม่คนขาย
 DocType: Packing Slip,Gross Weight UOM,น้ำหนักรวม UOM
 DocType: Delivery Note Item,Against Sales Invoice,กับขายใบแจ้งหนี้
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,โปรดป้อนหมายเลขซีเรียลสำหรับรายการต่อเนื่อง
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,โปรดป้อนหมายเลขซีเรียลสำหรับรายการต่อเนื่อง
 DocType: Bin,Reserved Qty for Production,ลิขสิทธิ์จำนวนการผลิต
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ปล่อยให้ไม่ทำเครื่องหมายหากคุณไม่ต้องการพิจารณาชุดในขณะที่สร้างกลุ่มตามหลักสูตร
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ปล่อยให้ไม่ทำเครื่องหมายหากคุณไม่ต้องการพิจารณาชุดในขณะที่สร้างกลุ่มตามหลักสูตร
@@ -4949,7 +5039,7 @@
 DocType: Lab Test,Test Group,กลุ่มทดสอบ
 DocType: Payment Reconciliation,Receivable / Payable Account,ลูกหนี้ / เจ้าหนี้การค้า
 DocType: Delivery Note Item,Against Sales Order Item,กับการขายรายการสั่งซื้อ
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},โปรดระบุคุณสมบัติราคาแอตทริบิวต์ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},โปรดระบุคุณสมบัติราคาแอตทริบิวต์ {0}
 DocType: Item,Default Warehouse,คลังสินค้าเริ่มต้น
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},งบประมาณไม่สามารถกำหนดกลุ่มกับบัญชี {0}
 DocType: Healthcare Settings,Patient Registration,การลงทะเบียนผู้ป่วย
@@ -4979,6 +5069,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,พนักงานขาย
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,งบประมาณและศูนย์ต้นทุน
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,โหมดการชำระเงินเริ่มต้นหลายรูปแบบไม่ได้รับอนุญาต
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,สำหรับ
 ,Appointment Analytics,การแต่งตั้ง Analytics
 DocType: Vehicle Service,Half Yearly,ประจำปีครึ่ง
 DocType: Lead,Blog Subscriber,สมาชิกบล็อก
@@ -4998,7 +5089,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,นับ Quot
 ,BOM Stock Report,รายงานแจ้ง BOM
 DocType: Stock Reconciliation Item,Quantity Difference,ปริมาณความแตกต่าง
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,การประมวลผลเงินเดือน
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,การประมวลผลเงินเดือน
 DocType: Opportunity Item,Basic Rate,อัตราขั้นพื้นฐาน
 DocType: GL Entry,Credit Amount,จำนวนเครดิต
 DocType: Cheque Print Template,Signatory Position,ตำแหน่งลงนาม
@@ -5012,12 +5103,12 @@
 DocType: Tax Rule,Tax Rule,กฎภาษี
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,รักษาอัตราเดียวตลอดวงจรการขาย
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,บันทึกเวลานอกแผนเวิร์คสเตชั่ชั่วโมงทำงาน
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,ลูกค้าที่อยู่ในคิว
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,ดร. {0} ไม่มีตารางแพทย์ เพิ่มในหลักแพทย์
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,ลูกค้าที่อยู่ในคิว
 DocType: Student,Nationality,สัญชาติ
 ,Items To Be Requested,รายการที่จะ ได้รับการร้องขอ
-DocType: Purchase Order,Get Last Purchase Rate,รับซื้อให้ล่าสุด
 DocType: Company,Company Info,ข้อมูล บริษัท
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,เลือกหรือเพิ่มลูกค้าใหม่
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,เลือกหรือเพิ่มลูกค้าใหม่
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,ศูนย์ต้นทุนจะต้องสำรองการเรียกร้องค่าใช้จ่าย
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),การใช้ประโยชน์กองทุน (สินทรัพย์)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,นี้ขึ้นอยู่กับการเข้าร่วมของพนักงานนี้
@@ -5025,6 +5116,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,บัญชีเดบิต
 DocType: Fiscal Year,Year Start Date,วันที่เริ่มต้นปี
 DocType: Attendance,Employee Name,ชื่อของพนักงาน
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,รายการรายการสั่งซื้อของร้านอาหาร
 DocType: Sales Invoice,Rounded Total (Company Currency),รวมกลม (สกุลเงิน บริษัท )
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,ไม่สามารถแอบแฝงเข้ากลุ่มเพราะประเภทบัญชีถูกเลือก
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} ถูกแก้ไขแล้ว กรุณาโหลดใหม่อีกครั้ง
@@ -5035,6 +5127,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,ผลประโยชน์ของพนักงาน
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},ปริมาณ การบรรจุ จะต้องเท่ากับ ปริมาณ สินค้า {0} ในแถว {1}
 DocType: Production Order,Manufactured Qty,จำนวนการผลิต
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,สร้างใบแจ้งหนี้แล้ว
 DocType: Purchase Receipt Item,Accepted Quantity,จำนวนที่ยอมรับ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},กรุณาตั้งค่าเริ่มต้นรายการวันหยุดสำหรับพนักงาน {0} หรือ บริษัท {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: ไม่พบ {1}
@@ -5044,18 +5137,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},แถวไม่มี {0}: จำนวนเงินไม่สามารถจะสูงกว่าจำนวนเงินที่ค้างอยู่กับค่าใช้จ่ายในการเรียกร้อง {1} ที่รอดำเนินการเป็นจำนวน {2}
 DocType: Maintenance Schedule,Schedule,กำหนดการ
 DocType: Account,Parent Account,บัญชีผู้ปกครอง
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,ที่มีจำหน่าย
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,ที่มีจำหน่าย
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,ดุม
 DocType: GL Entry,Voucher Type,ประเภทบัตรกำนัล
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,ราคาไม่พบหรือคนพิการ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,ราคาไม่พบหรือคนพิการ
 DocType: Lab Test,Approved,ได้รับการอนุมัติ
 DocType: Pricing Rule,Price,ราคา
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',พนักงาน โล่งใจ ที่ {0} จะต้องตั้งค่า เป็น ' ซ้าย '
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',พนักงาน โล่งใจ ที่ {0} จะต้องตั้งค่า เป็น ' ซ้าย '
+DocType: Hub Settings,Last Sync On,ซิงค์ล่าสุดเปิด
 DocType: Guardian,Guardian,ผู้ปกครอง
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ประเมิน {0} สร้างขึ้นสำหรับ พนักงาน {1} ใน ช่วงวันที่ ที่กำหนด
 DocType: Employee,Education,การศึกษา
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,Del
 DocType: Selling Settings,Campaign Naming By,ตั้งชื่อ ตาม แคมเปญ
 DocType: Employee,Current Address Is,ที่อยู่ ปัจจุบัน เป็น
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,เป้าหมายการขายรายเดือน (
@@ -5070,7 +5164,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,รหัสรายวิชา:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,กรุณากรอกบัญชีค่าใช้จ่าย
 DocType: Account,Stock,คลังสินค้า
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","แถว # {0}: การอ้างอิงเอกสารชนิดต้องเป็นหนึ่งในการสั่งซื้อ, ซื้อใบแจ้งหนี้หรือวารสารรายการ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","แถว # {0}: การอ้างอิงเอกสารชนิดต้องเป็นหนึ่งในการสั่งซื้อ, ซื้อใบแจ้งหนี้หรือวารสารรายการ"
 DocType: Employee,Current Address,ที่อยู่ปัจจุบัน
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","หากรายการเป็นตัวแปรของรายการอื่นแล้วคำอธิบายภาพ, การกำหนดราคาภาษี ฯลฯ จะถูกตั้งค่าจากแม่นอกจากที่ระบุไว้อย่างชัดเจน"
 DocType: Serial No,Purchase / Manufacture Details,รายละเอียด การซื้อ / การผลิต
@@ -5101,7 +5195,7 @@
 DocType: Hub Settings,Hub Settings,การตั้งค่า Hub
 DocType: Project,Gross Margin %,กำไรขั้นต้น %
 DocType: BOM,With Operations,กับการดำเนินงาน
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,รายการบัญชีที่ได้รับการทำในสกุลเงิน {0} สำหรับ บริษัท {1} กรุณาเลือกบัญชีลูกหนี้หรือเจ้าหนี้กับสกุลเงิน {0}
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,รายการบัญชีที่ได้รับการทำในสกุลเงิน {0} สำหรับ บริษัท {1} กรุณาเลือกบัญชีลูกหนี้หรือเจ้าหนี้กับสกุลเงิน {0}
 DocType: Asset,Is Existing Asset,เป็นสินทรัพย์ที่มีอยู่
 DocType: Salary Detail,Statistical Component,ส่วนประกอบทางสถิติ
 DocType: Salary Detail,Statistical Component,ส่วนประกอบทางสถิติ
@@ -5110,13 +5204,14 @@
 DocType: BOM Operation,BOM Operation,การดำเนินงาน BOM
 DocType: Purchase Taxes and Charges,On Previous Row Amount,เกี่ยวกับจำนวนเงินแถวก่อนหน้า
 DocType: Student,Home Address,ที่อยู่บ้าน
+DocType: Item,Has Expiry Date,มีวันหมดอายุ
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,การตั้งค่าชุดตัวเลือกรายการ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,การโอนสินทรัพย์
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,การโอนสินทรัพย์
 DocType: POS Profile,POS Profile,รายละเอียด จุดขาย
 DocType: Training Event,Event Name,ชื่องาน
 DocType: Physician,Phone (Office),โทรศัพท์ (สำนักงาน)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,การรับเข้า
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},การรับสมัครสำหรับ {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,การรับเข้า
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},การรับสมัครสำหรับ {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.",ฤดูกาลสำหรับงบประมาณการตั้งค่าเป้าหมาย ฯลฯ
 DocType: Supplier Scorecard Scoring Variable,Variable Name,ชื่อตัวแปร
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",รายการ {0} เป็นแม่แบบโปรดเลือกหนึ่งในตัวแปรของมัน
@@ -5125,7 +5220,7 @@
 DocType: Assessment Plan,Room,ห้อง
 DocType: Purchase Order,Advance Paid,จ่ายล่วงหน้า
 DocType: Item,Item Tax,ภาษีสินค้า
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,วัสดุในการจัดจำหน่าย
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,วัสดุในการจัดจำหน่าย
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,สรรพสามิตใบแจ้งหนี้
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,treshold {0}% ปรากฏมากกว่าหนึ่งครั้ง
 DocType: Expense Claim,Employees Email Id,Email รหัสพนักงาน
@@ -5136,32 +5231,30 @@
 DocType: Program,Program Name,ชื่อโครงการ
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,พิจารณาภาษีหรือคิดค่าบริการสำหรับ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,จำนวนที่เกิดขึ้นจริงมีผลบังคับใช้
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} ปัจจุบันมีสถานะ {1} Scorecard ของผู้จัดหาและใบสั่งซื้อของผู้จัดจำหน่ายรายนี้ควรได้รับการเตือนด้วยความระมัดระวัง
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} ปัจจุบันมีสถานะ {1} Scorecard ของผู้จัดหาและใบสั่งซื้อของผู้จัดจำหน่ายรายนี้ควรได้รับการเตือนด้วยความระมัดระวัง
 DocType: Employee Loan,Loan Type,ประเภทเงินกู้
 DocType: Scheduling Tool,Scheduling Tool,เครื่องมือการตั้งเวลา
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,บัตรเครดิต
 DocType: BOM,Item to be manufactured or repacked,รายการที่จะผลิตหรือ repacked
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,ตั้งค่าเริ่มต้น สำหรับการทำธุรกรรม หุ้น
-DocType: Purchase Invoice,Next Date,วันที่ถัดไป
 DocType: Employee Education,Major/Optional Subjects,วิชาเอก / เสริม
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
+DocType: Hub Settings,Suspended,ที่ถูกระงับ
 DocType: Training Event,Attendees,ผู้เข้าร่วมประชุม
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",ที่นี่คุณสามารถรักษารายละเอียดเช่นชื่อครอบครัวและอาชีพของผู้ปกครองคู่สมรสและเด็ก
 DocType: Academic Term,Term End Date,วันที่สิ้นสุดระยะ
-DocType: Hub Settings,Seller Name,ชื่อผู้ขาย
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),ภาษีและค่าใช้จ่ายหัก (สกุลเงิน บริษัท )
 DocType: Item Group,General Settings,การตั้งค่าทั่วไป
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,สกุลเงินจากสกุลเงินและไม่สามารถเดียวกัน
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,เพิ่มผู้สอน
 DocType: Stock Entry,Repack,หีบห่ออีกครั้ง
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,คุณต้องบันทึกแบบฟอร์มก่อนที่จะดำเนินการต่อ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,โปรดเลือก บริษัท ก่อน
 DocType: Item Attribute,Numeric Values,ค่าที่เป็นตัวเลข
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,แนบ โลโก้
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,ระดับสต็อก
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,ระดับสต็อก
 DocType: Customer,Commission Rate,อัตราค่าคอมมิชชั่น
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,สร้าง {0} หน้าต่างสรุปสำหรับ {1} ระหว่าง:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,ทำให้ตัวแปร
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,ทำให้ตัวแปร
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,ปิดกั้นการใช้งานออกโดยกรม
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer",ประเภทการชำระเงินต้องเป็นหนึ่งในการรับชำระเงินและการโอนเงินภายใน
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -5176,11 +5269,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,ทุนหลักทรัพย์
 DocType: Shopping Cart Settings,Show Public Attachments,แสดงเอกสารแนบสาธารณะ
 DocType: Packing Slip,Package Weight Details,รายละเอียดแพคเกจน้ำหนัก
+DocType: Restaurant Reservation,Reservation Time,เวลาจอง
 DocType: Payment Gateway Account,Payment Gateway Account,บัญชี Gateway การชำระเงิน
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,หลังจากเสร็จสิ้นการชำระเงินเปลี่ยนเส้นทางผู้ใช้ไปยังหน้าเลือก
 DocType: Company,Existing Company,บริษัท ที่มีอยู่
 DocType: Healthcare Settings,Result Emailed,ผลการส่งอีเมล
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",หมวดหมู่ภาษีได้เปลี่ยนเป็น &quot;ยอดรวม&quot; แล้วเนื่องจากรายการทั้งหมดเป็นรายการที่ไม่ใช่สต็อค
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,รหัสรายการ&gt; กลุ่มสินค้า&gt; แบรนด์
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,เลือกไฟล์ CSV
 DocType: Student Leave Application,Mark as Present,มาร์คเป็นปัจจุบัน
 DocType: Supplier Scorecard,Indicator Color,สีตัวบ่งชี้
@@ -5205,11 +5300,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,สร้างกลุ่มนักศึกษา
 DocType: Fee Schedule,FRQ.,ฟิลด์ความถี่สูงสุด
 DocType: Leave Type,Is Carry Forward,เป็น Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,รับสินค้า จาก BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,รับสินค้า จาก BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,นำวันเวลา
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},แถว # {0}: โพสต์วันที่ต้องเป็นเช่นเดียวกับวันที่ซื้อ {1} สินทรัพย์ {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,ตรวจสอบว่านักเรียนอาศัยอยู่ที่ Hostel ของสถาบันหรือไม่
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,โปรดป้อนคำสั่งขายในตารางข้างต้น
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,โปรดป้อนคำสั่งขายในตารางข้างต้น
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,ไม่ได้ส่งสลิปเงินเดือน
 ,Stock Summary,แจ้งข้อมูลอย่างย่อ
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,โอนสินทรัพย์จากที่หนึ่งไปยังอีกคลังสินค้า
@@ -5225,5 +5320,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},แถว {0}: รายการเดบิตไม่สามารถเชื่อมโยงกับ {1}
 DocType: Journal Entry,Subscription Section,ส่วนการสมัครสมาชิก
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,บัญชี {0} ไม่อยู่
+DocType: Training Event,Training Program,หลักสูตรการฝึกอบรม
 DocType: Account,Cash,เงินสด
 DocType: Employee,Short biography for website and other publications.,ชีวประวัติสั้นสำหรับเว็บไซต์และสิ่งพิมพ์อื่น ๆ
diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv
index bfb0dbd..7973479 100644
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,Maaş Modu
 DocType: Employee,Salary Mode,Maaş Modu
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Kayıt olmak
 DocType: Patient,Divorced,Ayrılmış
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Öğeler zaten senkronize
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Bir işlemde öğenin birden çok eklenmesine izin ver
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Malzeme ziyaret {0} Bu Garanti Talep iptal etmeden önce iptal
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Tüketici Ürünleri
@@ -21,13 +21,14 @@
 DocType: Sales Partner,Dealer,Satıcı
 DocType: Sales Partner,Dealer,Satıcı
 DocType: Consultation,Investigations,Araştırmalar
+DocType: Restaurant Order Entry,Click Enter To Add,Ekle Gir&#39;i tıklayın
 DocType: Employee,Rented,Kiralanmış
 DocType: Employee,Rented,Kiralanmış
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Kullanıcı için geçerlidir
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Durduruldu Üretim Sipariş iptal edilemez, iptal etmek için ilk önce unstop"
 DocType: Vehicle Service,Mileage,Kilometre
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Bu varlığı gerçekten hurda etmek istiyor musunuz?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Bu varlığı gerçekten hurda etmek istiyor musunuz?
 DocType: Drug Prescription,Update Schedule,Programı Güncelle
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Seç Varsayılan Tedarikçi
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Döviz Fiyat Listesi için gereklidir {0}
@@ -36,7 +37,6 @@
 DocType: Patient Appointment,Check availability,Uygunluğu kontrol et
 DocType: Job Applicant,Job Applicant,İş Başvuru Sahiibi
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Bu Bu Satıcıya karşı işlemlere dayanmaktadır. Ayrıntılar için aşağıdaki zaman çizelgesini bakın
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Daha fazla sonuç.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Yasal
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Yasal
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Gerçek tip vergi satırda Öğe fiyatına dahil edilemez {0}
@@ -49,13 +49,14 @@
 DocType: Sales Invoice,Customer Name,Müşteri Adı
 DocType: Sales Invoice,Customer Name,Müşteri Adı
 DocType: Vehicle,Natural Gas,Doğal gaz
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Banka hesabı olarak adlandırılan olamaz {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Banka hesabı adı {0} olamaz
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Kafaları (veya gruplar) kendisine karşı Muhasebe Girişler yapılır ve dengeler korunur.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),{0} için bekleyen sıfırdan az olamaz ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,İşlemek için gönderilen Ücret Slipsi yok.
 DocType: Manufacturing Settings,Default 10 mins,10 dakika Standart
 DocType: Leave Type,Leave Type Name,İzin Tipi Adı
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Açık olanları göster
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Yukarıda sözü edilen tekrarlanan olaylar için bu hareketi kendisi yapmak gerekiyor
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Seri Başarıyla güncellendi
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Çıkış yapmak
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural günlük girdisi Ekleyen
@@ -65,7 +66,7 @@
 ,Purchase Order Items To Be Received,AlınacakSatınalma Siparişi Kalemleri
 DocType: SMS Center,All Supplier Contact,Bütün Tedarikçi İrtibatları
 DocType: Support Settings,Support Settings,Destek Ayarları
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Beklenen Bitiş Tarihi Beklenen Başlangıç Tarihinden daha az olamaz
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Beklenen Bitiş Tarihi Beklenen Başlangıç Tarihinden daha az olamaz
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Satır # {0}: Puan aynı olmalıdır {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Yeni İzin Uygulaması
 ,Batch Item Expiry Status,Toplu Öğe Bitiş Durumu
@@ -73,6 +74,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Banka poliçesi
 DocType: Mode of Payment Account,Mode of Payment Account,Ödeme Şekli Hesabı
 DocType: Consultation,Consultation,konsültasyon
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Satışlar ve İadeler
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Göster Varyantlar
 DocType: Academic Term,Academic Term,Akademik Dönem
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Malzeme
@@ -92,9 +94,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sağlık hizmeti
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Ödeme Gecikme (Gün)
 DocType: Lab Prescription,Lab Prescription,Laboratuar Reçetesi
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Fiyata göre sırala
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,hizmet Gideri
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},"Seri Numarası: {0}, Satış Faturasında zaten atıfta bulunuldu: {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Fatura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},"Seri Numarası: {0}, Satış Faturasında zaten atıfta bulunuldu: {1}"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Fatura
 DocType: Maintenance Schedule Item,Periodicity,Periyodik olarak tekrarlanma
 DocType: Maintenance Schedule Item,Periodicity,Periyodik olarak tekrarlanma
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Mali yıl {0} gereklidir
@@ -108,21 +111,21 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Satır # {0}:
 DocType: Timesheet,Total Costing Amount,Toplam Maliyet Tutarı
 DocType: Delivery Note,Vehicle No,Araç No
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Fiyat Listesi seçiniz
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Fiyat Listesi seçiniz
 DocType: Accounts Settings,Currency Exchange Settings,Döviz Kurları Ayarları
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Satır # {0}: Ödeme belge trasaction tamamlamak için gereklidir
 DocType: Production Order Operation,Work In Progress,Devam eden iş
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,tarih seçiniz
 DocType: Employee,Holiday List,Tatil Listesi
 DocType: Employee,Holiday List,Tatil Listesi
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Okulda Eğitici İsme Sistemini Kurun&gt; Okul Ayarları
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Muhasebeci
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Muhasebeci
+DocType: Hub Settings,Selling Price List,Satış Fiyatı Listesi
 DocType: Patient,Tobacco Current Use,Tütün Mevcut Kullanımı
 DocType: Cost Center,Stock User,Hisse Senedi Kullanıcı
 DocType: Company,Phone No,Telefon No
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Ders Programları oluşturuldu:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Yeni {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Yeni {0}: # {1}
 ,Sales Partners Commission,Satış Ortakları Komisyonu
 ,Sales Partners Commission,Satış Ortakları Komisyonu
 DocType: Purchase Invoice,Rounding Adjustment,Yuvarlama Ayarı
@@ -146,9 +149,8 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referans: {0}, Ürün Kodu: {1} ve Müşteri: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kilogram
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kilogram
-DocType: Student Log,Log,Giriş
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,İş Açılışı.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Sonuç gönderildi
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Sonuç gönderildi
 DocType: Item Attribute,Increment,Artım
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Zaman aralığı
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Warehouse Seçiniz ...
@@ -159,7 +161,7 @@
 DocType: Patient,Married,Evli
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Izin verilmez {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Öğeleri alın
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Stok İrsaliye {0} karşısı güncellenmez
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Stok İrsaliye {0} karşısı güncellenmez
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Ürün {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Listelenen öğe yok
 DocType: Payment Reconciliation,Reconcile,Uzlaştırmak
@@ -172,29 +174,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Emeklilik Fonları
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Sonraki Amortisman Tarihi Satın Alma Tarihinden önce olamaz
 DocType: Consultation,Consultation Date,Danışma Tarihi
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNext kullanıcıları için ürün listeleme ve keşif
 DocType: SMS Center,All Sales Person,Bütün Satıcılar
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,İşinizde sezonluk değişkenlik varsa **Aylık Dağılım** Bütçe/Hedef'i aylara dağıtmanıza yardımcı olur.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,ürün bulunamadı
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Maaş Yapısı Eksik
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,ürün bulunamadı
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Maaş Yapısı Eksik
 DocType: Lead,Person Name,Kişi Adı
 DocType: Sales Invoice Item,Sales Invoice Item,Satış Faturası Ürünü
 DocType: Account,Credit,Kredi
-DocType: POS Profile,Write Off Cost Center,Borç Silme Maliyet Merkezi
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""","örneğin, &quot;İlköğretim Okulu&quot; ya da &quot;Üniversite&quot;"
+DocType: POS Profile,Write Off Cost Center,Şüpheli Alacak Maliyet Merkezi
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""","örneğin, &quot;İlköğretim Okulu&quot; ya da &quot;Üniversite&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Stok Raporları
 DocType: Warehouse,Warehouse Detail,Depo Detayı
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Kredi limiti müşteri için aşıldı {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Dönem Bitiş Tarihi sonradan terim bağlantılı olduğu için Akademik Yılı Yıl Sonu tarihi daha olamaz (Akademik Yılı {}). tarihleri düzeltmek ve tekrar deneyin.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","'Sabit Varlıktır' seçimi kaldırılamaz, çünkü Varlık kayıtları bulunuyor"
-DocType: Vehicle Service,Brake Oil,fren Yağı
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","'Sabit Varlıktır' seçimi kaldırılamaz, çünkü Varlık kayıtları bulunuyor"
+DocType: Vehicle Service,Brake Oil,Fren Yağı
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Müşteri&gt; Müşteri Grubu&gt; Bölge
 DocType: Tax Rule,Tax Type,Vergi Türü
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Vergilendirilebilir Tutar
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},{0} dan önceki girdileri ekleme veya güncelleme yetkiniz yok
 DocType: BOM,Item Image (if not slideshow),Ürün Görüntü (yoksa slayt)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Aynı isimle bulunan bir müşteri
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Saat Hızı / 60) * Gerçek Çalışma Süresi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,"Sıra # {0}: Referans Belge Türü, Gider Talebi veya Günlük Girişi olmalıdır"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,seç BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,"Sıra # {0}: Referans Belge Türü, Gider Talebi veya Günlük Girişi olmalıdır"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,seç BOM
 DocType: SMS Log,SMS Log,SMS Kayıtları
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Teslim Öğeler Maliyeti
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} üzerinde tatil Tarihten itibaren ve Tarihi arasında değil
@@ -225,7 +228,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Etkinlik Günlüğü:
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Etkinlik Günlüğü:
 DocType: Fee Schedule,Send Payment Request Email,Ödeme Talebi E-postasını Gönder
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Ürün {0} sistemde yoktur veya süresi dolmuştur
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Ürün {0} sistemde yoktur veya süresi dolmuştur
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Gayrimenkul
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Gayrimenkul
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Hesap Beyanı
@@ -244,19 +247,24 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Günlüğü İçe Aktar
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Yukarıdaki kriterlere dayalı tip Üretim Malzeme İsteği çekin
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Başarıyla kayıt dışı edildi.
 DocType: Training Result Employee,Grade,sınıf
+DocType: Restaurant Table,No of Seats,Koltuk Sayısı
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>",Dinamik konu eklemek için aşağıdaki gibi jinja etiketleri kullanın: <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>
 DocType: Sales Invoice Item,Delivered By Supplier,Tedarikçi Tarafından Teslim
 DocType: SMS Center,All Contact,Tüm İrtibatlar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Üretim Sipariş zaten BOM ile tüm öğeler için yaratılmış
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Üretim Sipariş zaten BOM ile tüm öğeler için yaratılmış
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Yıllık Gelir
 DocType: Daily Work Summary,Daily Work Summary,Günlük Çalışma Özeti
 DocType: Period Closing Voucher,Closing Fiscal Year,Mali Yılı Kapanış
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} donduruldu
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Hesap tablosu oluşturmak için Varolan Firma seçiniz
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} donduruldu
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Hesap tablosu oluşturmak için Varolan Firma seçiniz
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Stok Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Stok Giderleri
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Hedef Ambarı&#39;nı seçin
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Hedef Ambarı&#39;nı seçin
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Hedef Ambarı&#39;nı seçin
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Hedef Ambarı&#39;nı seçin
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Tercih İletişim Email giriniz
 DocType: Program Enrollment,School Bus,Okul otobüsü
 DocType: Journal Entry,Contra Entry,Hesaba Alacak Girişi
@@ -274,10 +282,11 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", Şablon İndir uygun verileri doldurmak ve değiştirilmiş dosya ekleyin.
  Seçilen dönemde tüm tarihler ve çalışan kombinasyonu mevcut katılım kayıtları ile, şablonda gelecek"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Ürün {0} aktif değil veya kullanım ömrünün sonuna gelindi
+DocType: Student Admission Program,Minimum Age,Asgari yaş
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Örnek: Temel Matematik
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Satır {0} a vergi eklemek için  {1} satırlarındaki vergiler de dahil edilmelidir
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,İK Modülü Ayarları
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,İK Modülü Ayarları
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,İK Modülü Ayarları
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,İK Modülü Ayarları
 DocType: SMS Center,SMS Center,SMS Merkezi
 DocType: SMS Center,SMS Center,SMS Merkezi
 DocType: Sales Invoice,Change Amount,Değişim Miktarı
@@ -290,14 +299,14 @@
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Çalışan Girişi Yap
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Yayın
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Yayın
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Odalar Ekle
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),POS&#39;un kurulum modu (Çevrimiçi / Çevrimdışı)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Yerine Getirme
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Yerine Getirme
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Operasyonların detayları gerçekleştirdi.
 DocType: Serial No,Maintenance Status,Bakım Durumu
 DocType: Serial No,Maintenance Status,Bakım Durumu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Borç hesabı {2} için tedarikçi tanımlanmalıdır
-apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Öğeleri ve Fiyatlandırma
+apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Öğeler ve Fiyatlandırma
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Toplam saat: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Tarihten itibaren Mali yıl içinde olmalıdır Tarihten itibaren  = {0} varsayılır
 DocType: Drug Prescription,Interval,Aralık
@@ -317,6 +326,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Kurulum tarih Ürün için teslim tarihinden önce olamaz {0}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Kurulum tarih Ürün için teslim tarihinden önce olamaz {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Fiyat Listesi Puan İndirim (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,biokimya
 DocType: Offer Letter,Select Terms and Conditions,Şartlar ve Koşulları Seç
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,out Değeri
 DocType: Production Planning Tool,Sales Orders,Satış Siparişleri
@@ -344,7 +354,7 @@
 DocType: Naming Series,Series List for this Transaction,Bu İşlem için Seri Listesi
 DocType: Company,Enable Perpetual Inventory,Sürekli Envanteri Etkinleştir
 DocType: Company,Default Payroll Payable Account,Standart Bordro Ödenecek Hesap
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +51,Update Email Group,Güncelleme E-posta Grubu
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +51,Update Email Group,E-posta grubunu güncelle
 DocType: Sales Invoice,Is Opening Entry,Açılış Girdisi
 DocType: Lab Test Template,"If unchecked, the item wont be appear in Sales Invoice, but can be used in group test creation. ","İşaretlenmezse, öğe Satış Faturasında görünmez, ancak grup testi oluşturulmasında kullanılabilir."
 DocType: Customer Group,Mention if non-standard receivable account applicable,Mansiyon standart dışı alacak hesabı varsa
@@ -356,15 +366,15 @@
 DocType: Sales Partner,Reseller,Bayi
 DocType: Codification Table,Medical Code,Tıbbi Kod
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Seçili ise, Malzeme İstekler olmayan stok ürün içerecek."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Şirket girin
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Şirket girin
 DocType: Delivery Note Item,Against Sales Invoice Item,Satış Fatura Kalemi karşılığı
 ,Production Orders in Progress,Devam eden Üretim Siparişleri
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Finansman Sağlanan Net Nakit
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","YerelDepolama dolu, tasarruf etmedi"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","YerelDepolama dolu, tasarruf etmedi"
 DocType: Lead,Address & Contact,Adres ve İrtibat
 DocType: Leave Allocation,Add unused leaves from previous allocations,Önceki tahsisleri kullanılmayan yaprakları ekleyin
 DocType: Sales Partner,Partner website,Ortak web sitesi
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Ürün Ekle
+DocType: Restaurant Order Entry,Add Item,Ürün Ekle
 DocType: Lab Test,Custom Result,Özel Sonuç
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,İletişim İsmi
 DocType: Course Assessment Criteria,Course Assessment Criteria,Ders Değerlendirme Kriterleri
@@ -377,7 +387,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Satın alma talebi
 DocType: Lab Test,Submitted Date,Teslim Tarihi
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,"Bu, bu projeye karşı oluşturulan Zaman kağıtları dayanmaktadır"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Net Ücret az 0 olamaz
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Net Ücret az 0 olamaz
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Sistemden tekrar eden hata bildirimlerini göndermeyi durdurmak için, abonelikte Devre Dışı alanını işaretledik"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Yalnızca seçilen izin onaylayıcı bu İzin uygulamasını verebilir
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Ayrılma tarihi Katılma tarihinden sonra olmalıdır
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Yıl başına bırakır
@@ -386,11 +397,12 @@
 DocType: Email Digest,Profit & Loss,Kar kaybı
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Litre
 DocType: Task,Total Costing Amount (via Time Sheet),(Zaman Formu aracılığıyla) Toplam Maliyet Tutarı
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Lütfen Öğrencileri Öğrenci Grupları Altına Kurun
 DocType: Item Website Specification,Item Website Specification,Ürün Web Sitesi Özellikleri
 DocType: Item Website Specification,Item Website Specification,Ürün Web Sitesi Özellikleri
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,İzin engellendi
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Ürün {0} {1}de kullanım ömrünün sonuna gelmiştir.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Banka Girişler
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Ürün {0} {1}de kullanım ömrünün sonuna gelmiştir.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Banka Girişleri
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Yıllık
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Yıllık
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stok Mutabakat Kalemi
@@ -399,7 +411,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Öğrenci Grubu Oluşturma Aracı Kursu
 DocType: Lead,Do Not Contact,İrtibata Geçmeyin
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,kuruluşunuz öğretmek insanlar
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Bütün mükerrer faturaları izlemek için özel kimlik. Teslimatta oluşturulacaktır.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Yazılım Geliştirici
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Yazılım Geliştirici
 DocType: Item,Minimum Order Qty,Minimum Sipariş Miktarı
@@ -411,19 +422,21 @@
 DocType: Item,Publish in Hub,Hub Yayınla
 DocType: Student Admission,Student Admission,Öğrenci Kabulü
 ,Terretory,Bölge
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Ürün {0} iptal edildi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Malzeme Talebi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Malzeme Talebi
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Ürün {0} iptal edildi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Malzeme Talebi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Malzeme Talebi
 DocType: Bank Reconciliation,Update Clearance Date,Güncelleme Alma Tarihi
 DocType: Item,Purchase Details,Satın alma Detayları
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Satın Alma Emri &#39;Hammadde Tedarik&#39; tablosunda bulunamadı Item {0} {1}
 DocType: Patient Relation,Relation,İlişki
 DocType: Shipping Rule,Worldwide Shipping,Dünya çapında Nakliye
-DocType: Patient Relation,Mother,anne
+DocType: Patient Relation,Mother,Anne
+DocType: Restaurant Reservation,Reservation End Time,Rezervasyon Bitiş Saati
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Müşteriler Siparişi Onaylandı.
 DocType: Purchase Receipt Item,Rejected Quantity,Reddedilen Miktar
 DocType: Purchase Receipt Item,Rejected Quantity,Reddedilen Miktar
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Ödeme isteği {0} oluşturuldu
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Ödeme isteği {0} oluşturuldu
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Düşük Hassasiyet
 DocType: Notification Control,Notification Control,Bildirim Kontrolü
 DocType: Notification Control,Notification Control,Bildirim Kontrolü
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Lütfen eğitiminizi tamamladığınızda onaylayın
@@ -447,7 +460,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Çalışan seçilen tercih edilen e-posta dayalı çalışana e-postalar maaş kayma
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,İlk kullanıcı sistem yöneticisi olacaktır (daha sonra değiştirebilirsiniz)
 DocType: Tax Rule,Shipping County,Kargo İlçe
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Öğrenin
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Öğrenin
 DocType: Asset,Next Depreciation Date,Bir sonraki değer kaybı tarihi
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Çalışan başına Etkinlik Maliyeti
 DocType: Accounts Settings,Settings for Accounts,Hesaplar için Ayarlar
@@ -458,13 +471,13 @@
 DocType: Item,Synced With Hub,Hub ile Senkronize
 DocType: Vehicle,Fleet Manager,Filo Yöneticisi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Satır # {0}: {1} öğe için negatif olamaz {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Yanlış Şifre
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Yanlış Şifre
 DocType: Item,Variant Of,Of Varyant
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Daha 'Miktar imalatı için' Tamamlandı Adet büyük olamaz
 DocType: Period Closing Voucher,Closing Account Head,Kapanış Hesap Başkanı
 DocType: Employee,External Work History,Dış Çalışma Geçmişi
 DocType: Physician,Time per Appointment,Randevu Süresi
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Dairesel Referans Hatası
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Dairesel Referans Hatası
 DocType: Appointment Type,Is Inpatient,Yatan hasta mı
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 Adı
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Tutarın Yazılı Hali (İhracat) İrsaliyeyi kaydettiğinizde görünür olacaktır.
@@ -474,20 +487,19 @@
 DocType: Employee,Job Profile,İş Profili
 DocType: Employee,Job Profile,İş Profili
 DocType: BOM Item,Rate & Amount,Oran ve Miktar
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Kurulum ile Seyirci için numaralandırma serisini ayarlayın&gt; Serileri Numaralandırma
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,"Bu, bu Şirkete karşı işlemlere dayanmaktadır. Ayrıntılar için aşağıdaki zaman çizelgesine bakın"
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Otomatik Malzeme Talebi oluşturulması durumunda e-posta ile bildir
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,dayanıklı
 DocType: Journal Entry,Multi Currency,Çoklu Para Birimi
 DocType: Payment Reconciliation Invoice,Invoice Type,Fatura Türü
 DocType: Payment Reconciliation Invoice,Invoice Type,Fatura Türü
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Müşteri&gt; Müşteri Grubu&gt; Bölge
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,İrsaliye
 DocType: Consultation,Encounter Impression,Karşılaşma İzlenim
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Vergiler kurma
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Satılan Varlığın Maliyeti
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,Bunu çekti sonra Ödeme Giriş modifiye edilmiştir. Tekrar çekin lütfen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} iki kere ürün vergisi girildi
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Bu hafta ve bekleyen aktiviteler için Özet
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} iki kere ürün vergisi girildi
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Bu hafta ve bekleyen aktiviteler için Özet
 DocType: Student Applicant,Admitted,Başvuruldu
 DocType: Workstation,Rent Cost,Kira Bedeli
 DocType: Workstation,Rent Cost,Kira Bedeli
@@ -503,14 +515,14 @@
 DocType: Shipping Rule,Valid for Countries,Ülkeler için geçerli
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Bu Ürün Şablon ve işlemlerde kullanılamaz. 'Hayır Kopyala' ayarlanmadığı sürece Öğe özellikleri varyantları içine üzerinden kopyalanır
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Dikkat Toplam Sipariş
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Çalışan görevi (ör. CEO, Müdür vb.)"
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Çalışan görevi (ör. CEO, Müdür vb.)"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Müşteri Para Biriminin Müşterinin temel birimine dönüştürülme oranı
 DocType: Course Scheduling Tool,Course Scheduling Tool,Ders Planlama Aracı
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Satır # {0}: Alış Fatura varolan varlık karşı yapılamaz {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Acil]% s için yinelenen% s oluşturulurken hata oluştu
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Acil] yinelenen %s oluşturulurken hata oluştu (%s için)
 DocType: Item Tax,Tax Rate,Vergi Oranı
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} zaten Çalışan tahsis {1} dönem {2} için {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Öğe Seç
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Öğe Seç
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Satın alma Faturası {0} zaten teslim edildi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Satır # {0}: Toplu Hayır aynı olmalıdır {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Olmayan gruba dönüştürme
@@ -518,12 +530,12 @@
 DocType: C-Form Invoice Detail,Invoice Date,Fatura Tarihi
 DocType: C-Form Invoice Detail,Invoice Date,Fatura Tarihi
 DocType: GL Entry,Debit Amount,Borç Tutarı
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Sadece Şirket&#39;in başına 1 Hesap olabilir {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Eke bakın
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Sadece Şirket&#39;in başına 1 Hesap olabilir {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Eke bakın
 DocType: Purchase Order,% Received,% Alındı
 DocType: Purchase Order,% Received,% Alındı
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Öğrenci Grupları Oluşturma
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Kurulum Tamamlandı!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Kurulum Tamamlandı!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Kredi Not Tutarı
 DocType: Setup Progress Action,Action Document,Eylem Belgesi
 ,Finished Goods,Mamüller
@@ -533,11 +545,10 @@
 DocType: Quality Inspection,Inspected By,Denetleyen
 DocType: Maintenance Visit,Maintenance Type,Bakım Türü
 DocType: Maintenance Visit,Maintenance Type,Bakım Türü
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},"{0} - {1}, {2} Kursuna kayıtlı değil"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Ürün Kodu&gt; Ürün Grubu&gt; Marka
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},"{0} - {1}, {2} Kursuna kayıtlı değil"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Seri No {0} İrsaliye  {1} e ait değil
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demosu
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Ürünler Ekle
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Ürünler Ekle
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Ürün Kalite Kontrol Parametreleri
 DocType: Leave Application,Leave Approver Name,Onaylayan Adı bırakın
 DocType: Depreciation Schedule,Schedule Date,Program Tarihi
@@ -562,7 +573,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Iş saatleri
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Varolan bir serinin başlangıç / geçerli sıra numarasını değiştirin.
 DocType: Dosage Strength,Strength,kuvvet
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Yeni müşteri oluştur
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Yeni müşteri oluştur
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Birden fazla fiyatlandırma Kuralo hakimse, kullanıcılardan zorunu çözmek için Önceliği elle ayarlamaları istenir"
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Satınalma Siparişleri oluşturun
 ,Purchase Register,Satın alma kaydı
@@ -585,8 +596,8 @@
 DocType: Lab Test Template,Single,Bireysel
 DocType: Salary Slip,Total Loan Repayment,Toplam Kredi Geri Ödeme
 DocType: Account,Cost of Goods Sold,Satışların Maliyeti
-DocType: Purchase Invoice,Yearly,Yıllık
-DocType: Purchase Invoice,Yearly,Yıllık
+DocType: Subscription,Yearly,Yıllık
+DocType: Subscription,Yearly,Yıllık
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Maliyet Merkezi giriniz
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Maliyet Merkezi giriniz
 DocType: Drug Prescription,Dosage,Dozaj
@@ -621,7 +632,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Tüm üretim süreçleri için genel ayarlar.
 DocType: Accounts Settings,Accounts Frozen Upto,Dondurulmuş hesaplar
 DocType: SMS Log,Sent On,Gönderim Zamanı
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Özellik {0} Nitelikler Tablo birden çok kez seçilmiş
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Özellik {0} Nitelikler Tablo birden çok kez seçilmiş
 DocType: HR Settings,Employee record is created using selected field. ,Çalışan kaydı seçilen alan kullanılarak yapılmıştır
 DocType: Sales Order,Not Applicable,Uygulanamaz
 DocType: Sales Order,Not Applicable,Uygulanamaz
@@ -631,7 +642,7 @@
 DocType: Delivery Note,Billing Address,Faturalama  Adresi
 DocType: BOM,Costing,Maliyetlendirme
 DocType: BOM,Costing,Maliyetlendirme
-DocType: Tax Rule,Billing County,fatura İlçe
+DocType: Tax Rule,Billing County,Fatura İlçesi
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","İşaretli ise, vergi miktarının hali hazırda Basım Oranında/Basım Miktarında dahil olduğu düşünülecektir"
 DocType: Request for Quotation,Message for Supplier,Tedarikçi için mesaj
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Toplam Adet
@@ -651,14 +662,14 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Tahsis edilen toplam yaprakları zorunludur
 DocType: Patient,AB Positive,AB Pozitif
 DocType: Job Opening,Description of a Job Opening,İş Açılış Açıklaması
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Bugün için Bekleyen faaliyetler
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Bugün için Bekleyen faaliyetler
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Katılım kaydı.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,zaman çizelgesi tabanlı bordro için maaş Bileşeni.
 DocType: Sales Order Item,Used for Production Plan,Üretim Planı için kullanılan
 DocType: Sales Order Item,Used for Production Plan,Üretim Planı için kullanılan
 DocType: Employee Loan,Total Payment,Toplam ödeme
 DocType: Manufacturing Settings,Time Between Operations (in mins),(Dakika içinde) Operasyonlar Arası Zaman
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,"{0} {1} iptal edildi, bu nedenle eylem tamamlanamadı"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,"{0} {1} iptal edildi, bu nedenle eylem tamamlanamadı"
 DocType: Customer,Buyer of Goods and Services.,Mal ve Hizmet Alıcı.
 DocType: Journal Entry,Accounts Payable,Vadesi gelmiş hesaplar
 DocType: Patient,Allergies,Alerjiler
@@ -670,26 +681,27 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Satınalma Siparişlerini Uyarın
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Müşterilerinizin birkaçını listeleyin. Bunlar kuruluşlar veya bireyler olabilir.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Yeter Parçaları Build
+DocType: POS Profile User,POS Profile User,POS Profil Kullanıcıları
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Doğrudan Gelir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Doğrudan Gelir
 DocType: Patient Appointment,Date TIme,Tarih Tarihi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Hesap, olarak gruplandırıldı ise Hesaba dayalı filtreleme yapamaz"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,İdari Memur
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,İdari Memur
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Lütfen Kursu seçin
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Lütfen Kursu seçin
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Lütfen Kursu seçin
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Lütfen Kursu seçin
 DocType: Codification Table,Codification Table,Codification Table
 DocType: Timesheet Detail,Hrs,saat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Firma seçiniz
 DocType: Stock Entry Detail,Difference Account,Fark Hesabı
 DocType: Stock Entry Detail,Difference Account,Fark Hesabı
 DocType: Purchase Invoice,Supplier GSTIN,Tedarikçi GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Bağımlı görevi {0} kapalı değil yakın bir iş değildir Can.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,Malzeme Talebinin yapılacağı Depoyu girin
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Bağımlı görevi {0} kapalı değil yakın bir iş değildir Can.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Malzeme Talebinin yapılacağı Depoyu girin
 DocType: Production Order,Additional Operating Cost,Ek İşletme Maliyeti
 DocType: Lab Test Template,Lab Routine,Laboratuar rutini
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Bakım ürünleri
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Birleştirmek için, aşağıdaki özellikler her iki Ürün için de aynı olmalıdır"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Birleştirmek için, aşağıdaki özellikler her iki Ürün için de aynı olmalıdır"
 DocType: Shipping Rule,Net Weight,Net Ağırlık
 DocType: Employee,Emergency Phone,Acil Telefon
 DocType: Employee,Emergency Phone,Acil Telefon
@@ -702,7 +714,8 @@
 DocType: Sales Order,To Deliver,Teslim edilecek
 DocType: Purchase Invoice Item,Item,Ürün
 DocType: Purchase Invoice Item,Item,Ürün
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Seri hiçbir öğe bir kısmını olamaz
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Yüksek hassasiyet
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Seri hiçbir öğe bir kısmını olamaz
 DocType: Journal Entry,Difference (Dr - Cr),Fark (Dr - Cr)
 DocType: Journal Entry,Difference (Dr - Cr),Fark (Dr - Cr)
 DocType: Account,Profit and Loss,Kar ve Zarar
@@ -711,9 +724,9 @@
 DocType: Patient,Occupational Hazards and Environmental Factors,Mesleki Tehlikeler ve Çevresel Faktörler
 DocType: Vital Signs,Respiratory rate,Solunum hızı
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Yönetme Taşeronluk
-DocType: Vital Signs,Body Temperature,Vücut ısısı
+DocType: Vital Signs,Body Temperature,Vücut Sıcaklığı
 DocType: Project,Project will be accessible on the website to these users,Proje internet sitesinde şu kullanıcılar için erişilebilir olacak
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Proje türünü tanımlayın.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Proje türünü tanımlayın.
 DocType: Supplier Scorecard,Weighting Function,Ağırlıklandırma İşlevi
 DocType: Physician,OP Consulting Charge,OP Danışmanlık Ücreti
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Kurun
@@ -728,7 +741,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Artım 0 olamaz
 DocType: Production Planning Tool,Material Requirement,Malzeme İhtiyacı
 DocType: Company,Delete Company Transactions,Şirket İşlemleri sil
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Referans No ve Referans Tarih Banka işlem için zorunludur
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Referans No ve Referans Tarih Banka işlem için zorunludur
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Ekle / Düzenle Vergi ve Harçlar
 DocType: Payment Entry Reference,Supplier Invoice No,Tedarikçi Fatura No
 DocType: Payment Entry Reference,Supplier Invoice No,Tedarikçi Fatura No
@@ -738,14 +751,14 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Kapanış (Cr)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Kapanış (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Merhaba
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Taşı Öğe
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Taşı Öğe
 DocType: Serial No,Warranty Period (Days),Garanti Süresi (Gün)
 DocType: Serial No,Warranty Period (Days),Garanti Süresi (Gün)
 DocType: Installation Note Item,Installation Note Item,Kurulum Notu Maddesi
 DocType: Production Plan Item,Pending Qty,Bekleyen Adet
 DocType: Budget,Ignore,Yoksay
 DocType: Budget,Ignore,Yoksay
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} aktif değil
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} aktif değil
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Baskı için Kurulum onay boyutları
 DocType: Salary Slip,Salary Slip Timesheet,Maaş Kayma Zaman Çizelgesi
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Alt Sözleşmeye bağlı Alım makbuzu için Tedarikçi deposu zorunludur
@@ -757,7 +770,7 @@
 DocType: Pricing Rule,Sales Partner,Satış Ortağı
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Tüm Tedarikçi puan kartları.
 DocType: Buying Settings,Purchase Receipt Required,Gerekli Satın alma makbuzu
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Açılış Stok girdiyseniz Değerleme Oranı zorunludur
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,Açılış Stok girdiyseniz Değerleme Oranı zorunludur
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Fatura tablosunda kayıt bulunamadı
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Fatura tablosunda kayıt bulunamadı
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,İlk Şirket ve Parti Tipi seçiniz
@@ -800,7 +813,7 @@
 DocType: Lead,Middle Income,Orta Gelir
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Açılış (Cr)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Açılış (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Zaten başka Ölçü Birimi bazı işlem (ler) yaptık çünkü Öğe için Ölçü Varsayılan Birim {0} doğrudan değiştirilemez. Farklı Standart Ölçü Birimi kullanmak için yeni bir öğe oluşturmanız gerekecektir.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Zaten başka Ölçü Birimi bazı işlem (ler) yaptık çünkü Öğe için Ölçü Varsayılan Birim {0} doğrudan değiştirilemez. Farklı Standart Ölçü Birimi kullanmak için yeni bir öğe oluşturmanız gerekecektir.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Atama yapılan miktar negatif olamaz
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Lütfen şirketi ayarlayın.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Lütfen şirketi ayarlayın.
@@ -815,6 +828,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Seç Ödeme Hesabı Banka girişi yapmak için
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Yaprakları, harcama talepleri ve bordro yönetmek için Çalışan kaydı oluşturma"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Reçete Dönemi
+DocType: Restaurant Reservation,Restaurant Reservation,Restaurant Rezervasyonu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Teklifi Yazma
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Teklifi Yazma
 DocType: Payment Entry Deduction,Payment Entry Deduction,Ödeme Giriş Kesintisi
@@ -823,7 +837,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Alanlar
 DocType: Assessment Plan,Maximum Assessment Score,Maksimum Değerlendirme Puanı
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Güncelleme Banka İşlem Tarihleri
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Zaman Takip
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Zaman Takip
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,ULAŞTIRICI ARALIĞI
 DocType: Fiscal Year Company,Fiscal Year Company,Mali Yıl Şirketi
 DocType: Packing Slip Item,DN Detail,DN Detay
@@ -831,10 +845,11 @@
 DocType: Training Event,Conference,Konferans
 DocType: Timesheet,Billed,Faturalanmış
 DocType: Timesheet,Billed,Faturalanmış
-DocType: Batch,Batch Description,Toplu Açıklama
+DocType: Batch,Batch Description,Parti Açıklaması
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Öğrenci grupları oluşturma
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Ödeme Gateway Hesabı oluşturulmaz, el bir tane oluşturun lütfen."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Ödeme Gateway Hesabı oluşturulmaz, el bir tane oluşturun lütfen."
 DocType: Supplier Scorecard,Per Year,Yıl başına
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Bu programda DOB&#39;a göre kabul edilmemek
 DocType: Sales Invoice,Sales Taxes and Charges,Satış Vergi ve Harçlar
 DocType: Employee,Organization Profile,Kuruluş Profili
 DocType: Vital Signs,Height (In Meter),Yükseklik (Metrede)
@@ -873,10 +888,10 @@
 DocType: Issue,Resolution Date,Karar Tarihi
 DocType: Issue,Resolution Date,Karar Tarihi
 DocType: Lab Test Template,Compound,bileşik
-DocType: Student Batch Name,Batch Name,toplu Adı
+DocType: Student Batch Name,Batch Name,Parti Adı
 DocType: Fee Validity,Max number of visit,Maks Ziyaret Sayısı
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Mesai Kartı oluşturuldu:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},{0} Ödeme şeklinde varsayılan nakit veya banka hesabı ayarlayınız
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},{0} Ödeme şeklinde varsayılan nakit veya banka hesabı ayarlayınız
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,kaydetmek
 DocType: GST Settings,GST Settings,GST Ayarları
 DocType: Selling Settings,Customer Naming By,Müşterinin Bilinen Adı
@@ -899,7 +914,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Tüketilen
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +157,{0}: {1} not found in Invoice Details table,{0}: {1} Fatura Ayrıntıları tablosunda bulunamadı
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +157,{0}: {1} not found in Invoice Details table,{0}: {1} Fatura Ayrıntıları tablosunda bulunamadı
-DocType: Company,Round Off Cost Center,Maliyet Merkezi Kapalı Yuvarlak
+DocType: Company,Round Off Cost Center,Yuvarlama Maliyet Merkezi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +227,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Bakım Ziyareti {0} bu Satış Emri iptal edilmeden önce iptal edilmelidir
 DocType: Item,Material Transfer,Materyal Transfer
 DocType: Item,Material Transfer,Materyal Transfer
@@ -913,18 +928,18 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Indi Maliyet Vergiler ve Ücretler
 DocType: Production Order Operation,Actual Start Time,Gerçek Başlangıç Zamanı
 DocType: BOM Operation,Operation Time,Çalışma Süresi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Bitiş
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Bitiş
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,baz
 DocType: Timesheet,Total Billed Hours,Toplam Faturalı Saat
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Borç Silme Miktarı
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Şüpheli Alacak Miktarı
 DocType: Leave Block List Allow,Allow User,Kullanıcıya izin ver
 DocType: Journal Entry,Bill No,Fatura No
 DocType: Journal Entry,Bill No,Fatura No
 DocType: Company,Gain/Loss Account on Asset Disposal,Varlık Bertaraf karı / Zarar Hesabı
 DocType: Vehicle Log,Service Details,Hizmet Detayları
 DocType: Vehicle Log,Service Details,Hizmet Detayları
-DocType: Purchase Invoice,Quarterly,Üç ayda bir
-DocType: Purchase Invoice,Quarterly,Üç ayda bir
+DocType: Subscription,Quarterly,Üç ayda bir
+DocType: Subscription,Quarterly,Üç ayda bir
 DocType: Lab Test Template,Grouped,gruplanmış
 DocType: Selling Settings,Delivery Note Required,İrsaliye Gerekli
 DocType: Bank Guarantee,Bank Guarantee Number,Banka Garanti Numarası
@@ -934,13 +949,13 @@
 DocType: Student Attendance,Student Attendance,Öğrenci Seyirci
 DocType: Sales Invoice Timesheet,Time Sheet,Mesai Kartı
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Hammaddeleri Dayalı
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Lütfen ayrıntıları girin
 DocType: Interest,Interest,Faiz
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Ön satış
 DocType: Purchase Receipt,Other Details,Diğer Detaylar
 DocType: Purchase Receipt,Other Details,Diğer Detaylar
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Lab Test,Test Template,Test Şablonu
+DocType: Restaurant Order Entry Item,Served,sunulan
 DocType: Account,Accounts,Hesaplar
 DocType: Account,Accounts,Hesaplar
 DocType: Vehicle,Odometer Value (Last),Sayaç Değeri (Son)
@@ -955,29 +970,31 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Önizleme Maaş Kayma
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Hesap {0} birden çok kez girilmiş
 DocType: Account,Expenses Included In Valuation,Değerlemeye dahil giderler
-DocType: Hub Settings,Seller City,Satıcı Şehri
 ,Absent Student Report,Öğrenci Devamsızlık Raporu
 DocType: Email Digest,Next email will be sent on:,Sonraki e-posta gönderilecek:
 DocType: Offer Letter Term,Offer Letter Term,Mektubu Dönem Teklif
 DocType: Supplier Scorecard,Per Week,Haftada
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Öğe varyantları vardır.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Öğe varyantları vardır.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Toplam Öğrenci
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Ürün {0} bulunamadı
 DocType: Bin,Stock Value,Stok Değeri
 DocType: Bin,Stock Value,Stok Değeri
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,Ücret kayıtları arka planda oluşturulacaktır. Herhangi bir hata durumunda hata mesajı Çizelgede güncellenecektir.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Şirket {0} yok
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},"{0}, {1} yılına kadar ücret geçerliliğine sahiptir."
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},"{0}, {1} yılına kadar ücret geçerliliğine sahiptir."
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Ağaç Tipi
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Birim Başına Tüketilen Miktar
 DocType: Serial No,Warranty Expiry Date,Garanti Son Kullanma Tarihi
 DocType: Serial No,Warranty Expiry Date,Garanti Son Kullanma Tarihi
 DocType: Material Request Item,Quantity and Warehouse,Miktar ve Depo
 DocType: Material Request Item,Quantity and Warehouse,Miktar ve Depo
+DocType: Hub Settings,Unregister,Kaydı iptal
 DocType: Sales Invoice,Commission Rate (%),Komisyon Oranı (%)
 DocType: Sales Invoice,Commission Rate (%),Komisyon Oranı (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Lütfen Program Seçiniz
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Lütfen Program Seçiniz
 DocType: Project,Estimated Cost,Tahmini maliyeti
 DocType: Purchase Order,Link to material requests,materyal isteklere Bağlantı
+DocType: Hub Settings,Publish,yayınlamak
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Havacılık ve Uzay;
 DocType: Journal Entry,Credit Card Entry,Kredi Kartı Girişi
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Şirket ve Hesaplar
@@ -989,7 +1006,6 @@
 DocType: Selling Settings,Close Opportunity After Days,Gün Sonra Kapat Fırsatı
 ,Reserved,Ayrılmış
 DocType: Purchase Order,Supply Raw Materials,Tedarik Hammaddeler
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Bir sonraki fatura oluşturulur tarih. Bu teslim oluşturulur.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Mevcut Varlıklar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Mevcut Varlıklar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} bir stok ürünü değildir.
@@ -997,7 +1013,7 @@
 DocType: Mode of Payment Account,Default Account,Varsayılan Hesap
 DocType: Mode of Payment Account,Default Account,Varsayılan Hesap
 DocType: Payment Entry,Received Amount (Company Currency),Alınan Tutar (Şirket Para Birimi)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,Talepten fırsat oluşturuldu ise talep ayarlanmalıdır
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,Talepten fırsat oluşturuldu ise talep ayarlanmalıdır
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Haftalık izin gününü seçiniz
 DocType: Patient,O Negative,O Negatif
 DocType: Production Order Operation,Planned End Time,Planlanan Bitiş Zamanı
@@ -1016,10 +1032,10 @@
 DocType: Opportunity,Opportunity From,Fırsattan itibaren
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Aylık maaş beyanı.
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Aylık maaş beyanı.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Şirket Ekle
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{0} Satırı: {1} {2} Numarası için seri numarası gerekli. {3} adresini verdiniz.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{0} Satırı: {1} {2} Numarası için seri numarası gerekli. {3} adresini verdiniz.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Lütfen bir tablo seçin
 DocType: BOM,Website Specifications,Web Sitesi Özellikleri
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',"{0}, &#39;Alıcılar&#39; bölümünde geçersiz bir e-posta adresidir"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',"{0}, &#39;Alıcılar&#39; bölümünde geçersiz bir e-posta adresidir"
 DocType: Special Test Items,Particulars,Ayrıntılar
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiyotik.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: gönderen {0} çeşidi {1}
@@ -1027,12 +1043,12 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Satır {0}: Dönüşüm katsayısı zorunludur
 DocType: Employee,A+,A+
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Çoklu Fiyat Kuralları aynı kriterler ile var, öncelik atayarak çatışma çözmek lütfen. Fiyat Kuralları: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,Devre dışı bırakmak veya diğer ürün ağaçları ile bağlantılı olarak BOM iptal edilemiyor
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,Devre dışı bırakmak veya diğer ürün ağaçları ile bağlantılı olarak BOM iptal edilemiyor
 DocType: Opportunity,Maintenance,Bakım
 DocType: Opportunity,Maintenance,Bakım
 DocType: Item Attribute Value,Item Attribute Value,Ürün Özellik Değeri
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Satış kampanyaları.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Zaman Çizelgesi olun
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Zaman Çizelgesi olun
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -1072,7 +1088,7 @@
  7. Toplam: Bu noktaya Toplu toplam.
  8. Enter Satır: ""Önceki Satır Toplam"" dayalı Eğer bu hesaplama için bir üs (varsayılan bir önceki satır olduğu) olarak alınacaktır satır numarasını seçebilirsiniz.
  9. Temel Puan dahil bu vergi ?: size bu işaretlerseniz, bu vergi kalemi aşağıdaki tabloda gösterilen olmayacak, ama ana öğe tabloda Temel Oranı dahil olacağı anlamına gelir. Eğer müşterilere düz (tüm vergiler dahil) fiyat fiyat vermek istediğiniz yararlıdır."
-DocType: Employee,Bank A/C No.,Bank Hesap No.
+DocType: Employee,Bank A/C No.,Banka Hesap No.
 DocType: Bank Guarantee,Project,Proje
 DocType: Bank Guarantee,Project,Proje
 DocType: Quality Inspection Reading,Reading 7,7 Okuma
@@ -1092,13 +1108,15 @@
 DocType: Account,Liability,Borç
 DocType: Account,Liability,Borç
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Yaptırıma Tutar Satır talep miktarı daha büyük olamaz {0}.
+DocType: Salary Detail,Do not include in total,Toplamda yer almama
 DocType: Company,Default Cost of Goods Sold Account,Ürünler Satılan Hesabı Varsayılan Maliyeti
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Fiyat Listesi seçilmemiş
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Fiyat Listesi seçilmemiş
 DocType: Employee,Family Background,Aile Geçmişi
 DocType: Request for Quotation Supplier,Send Email,E-posta Gönder
 DocType: Request for Quotation Supplier,Send Email,E-posta Gönder
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Uyarı: Geçersiz Eklenti {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,İzin yok
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Uyarı: Geçersiz Eklenti {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,İzin yok
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Alıntı İstek İsteği
 DocType: Vital Signs,Heart Rate / Pulse,Nabız / Darbe
 DocType: Company,Default Bank Account,Varsayılan Banka Hesabı
 DocType: Company,Default Bank Account,Varsayılan Banka Hesabı
@@ -1129,13 +1147,12 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Ürün Satır {idx}: {doctype} {docname} Yukarıdaki mevcut değildir &#39;{doctype}&#39; tablosu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Mesai Kartı {0} tamamlanmış veya iptal edilmiş
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,görev yok
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Otomatik fatura 05, 28 vb gibi oluşturulur hangi ayın günü"
 DocType: Item Variant Settings,Copy Fields to Variant,Alanları Varyanta Kopyala
 DocType: Asset,Opening Accumulated Depreciation,Birikmiş Amortisman Açılış
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Skor 5'ten az veya eşit olmalıdır
 DocType: Program Enrollment Tool,Program Enrollment Tool,Programı Kaydı Aracı
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C-Form kayıtları
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C-Form kayıtları
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C-Form kayıtları
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C-Form kayıtları
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Müşteri ve Tedarikçi
 DocType: Email Digest,Email Digest Settings,E-Mail Bülteni ayarları
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,İşiniz için teşekkür ederim!
@@ -1154,13 +1171,13 @@
 DocType: Maintenance Visit,Completion Status,Tamamlanma Durumu
 DocType: Maintenance Visit,Completion Status,Tamamlanma Durumu
 DocType: HR Settings,Enter retirement age in years,yıllarda emeklilik yaşı girin
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Hedef Depo
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Lütfen bir depo seçiniz
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Hedef Depo
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Lütfen bir depo seçiniz
 DocType: Cheque Print Template,Starting location from left edge,sol kenarından yerini başlayan
 DocType: Item,Allow over delivery or receipt upto this percent,Bu kadar yüzde teslimatı veya makbuz üzerinde izin ver
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Yoklamayı İçe Aktar
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Bütün Ürün Grupları
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Bütün Ürün Grupları
 DocType: Process Payroll,Activity Log,Etkinlik Günlüğü
 DocType: Process Payroll,Activity Log,Etkinlik Günlüğü
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Net Kar / Zarar
@@ -1174,7 +1191,8 @@
 DocType: Sales Invoice,Payment Due Date,Son Ödeme Tarihi
 DocType: Sales Invoice,Payment Due Date,Son Ödeme Tarihi
 DocType: Drug Prescription,Interval UOM,Aralık UOM&#39;sı
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Öğe Variant {0} zaten aynı özelliklere sahip bulunmaktadır
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Öğe Variant {0} zaten aynı özelliklere sahip bulunmaktadır
+DocType: Item,Hub Publishing Details,Hub Yayınlama Ayrıntıları
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;Açılış&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,To Do Aç
 DocType: Notification Control,Delivery Note Message,İrsaliye Mesajı
@@ -1183,7 +1201,7 @@
 DocType: Expense Claim,Expenses,Giderler
 DocType: Item Variant Attribute,Item Variant Attribute,Öğe Varyant Özellik
 ,Purchase Receipt Trends,Satın Alma Teslim Alma Analizi
-DocType: Process Payroll,Bimonthly,iki ayda bir
+DocType: Process Payroll,Bimonthly,İki ayda bir
 DocType: Vehicle Service,Brake Pad,Fren pedalı
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Research & Development,Araştırma ve Geliştirme
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Research & Development,Araştırma ve Geliştirme
@@ -1195,15 +1213,16 @@
 DocType: Leave Block List Date,Leave Block List Date,İzin engel listesi tarihi
 DocType: Pricing Rule,Price or Discount,Fiyat veya İndirim
 DocType: Pricing Rule,Price or Discount,Fiyat veya İndirim
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: Hammadde ana Madde ile aynı olamaz
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,Ürün ağacı #{0}: Hammadde ana madde ile aynı olamaz
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Satın Alma Makbuzu Öğeler tablosundaki toplam Uygulanabilir Masraflar Toplam Vergi ve Masraflar aynı olmalıdır
 DocType: Sales Team,Incentives,Teşvikler
 DocType: Sales Team,Incentives,Teşvikler
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Hub için Kayıt Olun
 DocType: SMS Log,Requested Numbers,Talep Sayılar
 DocType: Production Planning Tool,Only Obtain Raw Materials,Sadece Hammaddeleri elde
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Performans değerlendirme.
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Performans değerlendirme.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Etkinleştirme Alışveriş Sepeti etkin olarak, &#39;Alışveriş Sepeti için kullan&#39; ve Alışveriş Sepeti için en az bir vergi Kural olmalıdır"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Etkinleştirme Alışveriş Sepeti etkin olarak, &#39;Alışveriş Sepeti için kullan&#39; ve Alışveriş Sepeti için en az bir vergi Kural olmalıdır"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Ödeme giriş {0} Sipariş, bu faturada avans olarak çekilmiş olmalıdır eğer {1}, kontrol karşı bağlantılıdır."
 DocType: Sales Invoice Item,Stock Details,Stok Detayları
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Proje Bedeli
@@ -1224,13 +1243,15 @@
 DocType: Serial No,Incoming Rate,Gelen Oranı
 DocType: Packing Slip,Gross Weight,Brüt Ağırlık
 DocType: Packing Slip,Gross Weight,Brüt Ağırlık
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,Bu sistemi kurduğunu şirketinizin adı
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Hub&#39;ı etkinleştir
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,Bu sistemi kurduğunu şirketinizin adı
 DocType: HR Settings,Include holidays in Total no. of Working Days,Çalışma günlerinin toplam sayısı ile tatilleri dahil edin
 DocType: Job Applicant,Hold,Muhafaza et
 DocType: Employee,Date of Joining,Katılma Tarihi
 DocType: Employee,Date of Joining,Katılma Tarihi
 DocType: Naming Series,Update Series,Seriyi Güncelle
 DocType: Supplier Quotation,Is Subcontracted,Taşerona verilmiş
+DocType: Restaurant Table,Minimum Seating,Minimum Oturma
 DocType: Item Attribute,Item Attribute Values,Ürün Özellik Değerler
 DocType: Examination Result,Examination Result,Sınav Sonucu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Satın Alma İrsaliyesi
@@ -1241,13 +1262,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Çalışma için bir sonraki {0} günlerde Zaman Slot bulamayan {1}
 DocType: Production Order,Plan material for sub-assemblies,Alt-montajlar Plan malzeme
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Satış Ortakları ve Bölge
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,Ürün Ağacı {0} aktif olmalıdır
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,Ürün Ağacı {0} aktif olmalıdır
 DocType: Journal Entry,Depreciation Entry,Amortisman kayıt
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Önce belge türünü seçiniz
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Bu Bakım Ziyaretini iptal etmeden önce Malzeme Ziyareti {0} iptal edin
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Seri No {0} Ürün {1} e ait değil
 DocType: Purchase Receipt Item Supplied,Required Qty,Gerekli Adet
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Mevcut işlem ile depolar defterine dönüştürülür edilemez.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Mevcut işlem ile depolar defterine dönüştürülür edilemez.
 DocType: Bank Reconciliation,Total Amount,Toplam Tutar
 DocType: Bank Reconciliation,Total Amount,Toplam Tutar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,İnternet Yayıncılığı
@@ -1260,7 +1281,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Satış Fiyat Listesi
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","İşaretlenirse, Hasta ile eşleştirilen bir müşteri oluşturulur. Bu Müşteri&#39;ye karşı hasta faturaları oluşturulacaktır. Hasta oluşturulurken mevcut Müşteri&#39;yi seçebilirsiniz."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Öğeleri senkronize Yayınla
 DocType: Bank Reconciliation,Account Currency,Hesabın Döviz Cinsi
 DocType: Lab Test,Sample ID,Örnek Kimlik Numarası
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Şirket Yuvarlak Kapalı Hesabı belirtin
@@ -1270,11 +1290,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Çalışan {0} aktif değil veya yok.
 DocType: Fee Structure,Components,Bileşenler
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Ürün Varlık Kategori giriniz {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Öğe Türevleri {0} güncellendi
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Öğe Türevleri {0} güncellendi
 DocType: Quality Inspection Reading,Reading 6,6 Okuma
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,değil {0} {1} {2} olmadan herhangi bir olumsuz ödenmemiş fatura Can
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","oluşturulacak. Gecikmeli ise, bunun &quot;Ayın Gününde Tekrarla&quot; alanını manuel olarak değiştirmeniz gerekecek"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,değil {0} {1} {2} olmadan herhangi bir olumsuz ödenmemiş fatura Can
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Fatura peşin alım
-DocType: Hub Settings,Sync Now,Sync Şimdi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Satır {0}: Kredi giriş ile bağlantılı edilemez bir {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Bir mali yıl için bütçeyi tanımlayın.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Bu mod seçildiğinde Varsayılan Banka / Kasa hesabı otomatik olarak POS Faturada güncellenecektir.
@@ -1287,14 +1308,14 @@
 DocType: Asset,Purchase Invoice,Satınalma Faturası
 DocType: Asset,Purchase Invoice,Satınalma Faturası
 DocType: Stock Ledger Entry,Voucher Detail No,Föy Detay no
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Yeni Satış Faturası
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Yeni Satış Faturası
 DocType: Stock Entry,Total Outgoing Value,Toplam Giden Değeri
 DocType: Physician,Appointments,randevular
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Tarih ve Kapanış Tarihi Açılış aynı Mali Yılı içinde olmalıdır
 DocType: Lead,Request for Information,Bilgi İsteği
 DocType: Lead,Request for Information,Bilgi İsteği
 ,LeaderBoard,Liderler Sıralaması
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Senkronizasyon Çevrimdışı Faturalar
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Senkronizasyon Çevrimdışı Faturalar
 DocType: Payment Request,Paid,Ücretli
 DocType: Program Fee,Program Fee,Program Ücreti
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1315,13 +1336,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Dolaylı Gelir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Dolaylı Gelir
 DocType: Student Attendance Tool,Student Attendance Tool,Öğrenci Devam Aracı
+DocType: Restaurant Menu,Price List (Auto created),Fiyat Listesi (Otomatik oluşturuldu)
 DocType: Cheque Print Template,Date Settings,Tarih Ayarları
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Varyans
 ,Company Name,Firma Adı
 ,Company Name,Firma Adı
 DocType: SMS Center,Total Message(s),Toplam Mesaj (lar)
 DocType: SMS Center,Total Message(s),Toplam Mesaj (lar)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Transferi için seçin Öğe
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Transferi için seçin Öğe
 DocType: Purchase Invoice,Additional Discount Percentage,Ek iskonto yüzdesi
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Tüm yardım videoların bir listesini görüntüleyin
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Çekin yatırıldığı bankadaki hesap başlığını seçiniz
@@ -1334,18 +1356,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimyasal
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Bu mod seçildiğinde varsayılan Banka / Kasa hesabı otomatik Maaş Dergisi girdisi güncellenecektir.
 DocType: BOM,Raw Material Cost(Company Currency),Hammadde Maliyeti (Şirket Para Birimi)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Tüm öğeler zaten bu üretim Sipariş devredilmiştir.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Tüm öğeler zaten bu üretim siparişine aktarıldı.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},"Sıra # {0}: Oran, {1} {2} &#39;de kullanılan hızdan daha büyük olamaz"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},"Sıra # {0}: Oran, {1} {2} &#39;de kullanılan hızdan daha büyük olamaz"
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Metre
 DocType: Workstation,Electricity Cost,Elektrik Maliyeti
 DocType: Workstation,Electricity Cost,Elektrik Maliyeti
 DocType: HR Settings,Don't send Employee Birthday Reminders,Çalışanların Doğumgünü Hatırlatmalarını gönderme
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Ayarları kaydet
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,İstenen Ürünler
 DocType: Item,Inspection Criteria,Muayene Kriterleri
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Aktarılan
 DocType: BOM Website Item,BOM Website Item,Ürün Ağacı Web Sitesi kalemi
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,Upload your letter head and logo. (you can edit them later).,Mektup baş ve logosu yükleyin. (Daha sonra bunları düzenleyebilirsiniz).
-DocType: Timesheet Detail,Bill,fatura
+DocType: Timesheet Detail,Bill,Fatura
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Sonraki Amortisman Tarihi geçmiş tarih olarak girilir
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +204,White,Beyaz
 DocType: SMS Center,All Lead (Open),Bütün Müşteri Adayları (Açık)
@@ -1357,12 +1381,12 @@
 DocType: Student Admission,Admission Start Date,Kabul Başlangıç Tarihi
 DocType: Journal Entry,Total Amount in Words,Sözlü Toplam Tutar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Hata oluştu. Bunun sebebi formu kaydetmemeniz olabilir. Sorun devam ederse support@erpnext.com adresi ile iltişime geçiniz
-apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Benim Sepeti
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Sipariş türü şunlardan biri olmalıdır {0}
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Alışveriş Sepetim
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Sipariş türü şunlardan biri olmalıdır {0}
 DocType: Lead,Next Contact Date,Sonraki İrtibat Tarihi
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Açılış Miktarı
 DocType: Healthcare Settings,Appointment Reminder,Randevu Hatırlatıcısı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Değişim Miktarı Hesabı giriniz
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Değişim Miktarı Hesabı giriniz
 DocType: Student Batch Name,Student Batch Name,Öğrenci Toplu Adı
 DocType: Consultation,Doctor,doktor
 DocType: Holiday List,Holiday List Name,Tatil Listesi Adı
@@ -1372,12 +1396,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Stok Seçenekleri
 DocType: Journal Entry Account,Expense Claim,Gider Talebi
 DocType: Journal Entry Account,Expense Claim,Gider Talebi
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Eğer gerçekten bu hurdaya varlığın geri yüklemek istiyor musunuz?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Için Adet {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Eğer gerçekten bu hurdaya varlığın geri yüklemek istiyor musunuz?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Için Adet {0}
 DocType: Leave Application,Leave Application,İzin uygulaması
 DocType: Patient,Patient Relation,Hasta ilişkisi
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,İzin Tahsis Aracı
+DocType: Item,Hub Category to Publish,Yayınlanacak Hub Kategorisi
 DocType: Leave Block List,Leave Block List Dates,İzin engel listesi tarihleri
+DocType: Sales Invoice,Billing Address GSTIN,Fatura adresi GSTIN
 DocType: Workstation,Net Hour Rate,Net Saat Hızı
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,İnen Maliyet Alım Makbuzu
 DocType: Company,Default Terms,Standart Şartları
@@ -1388,12 +1414,12 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Lütfen belirtin a {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Miktar veya değer hiçbir değişiklik ile kaldırıldı öğeler.
 DocType: Delivery Note,Delivery To,Teslim
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Özellik tablosu zorunludur
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Özellik tablosu zorunludur
 DocType: Production Planning Tool,Get Sales Orders,Satış Şiparişlerini alın
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} negatif olamaz
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} negatif olamaz
 DocType: Training Event,Self-Study,Bireysel çalışma
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Indirim
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Indirim
 DocType: Asset,Total Number of Depreciations,Amortismanlar Sayısı
 DocType: Sales Invoice Item,Rate With Margin,Marjla Oran
 DocType: Sales Invoice Item,Rate With Margin,Marjla Oran
@@ -1402,7 +1428,7 @@
 DocType: Task,Urgent,Acil
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Tablodaki satır {0} için geçerli Satır kimliği belirtiniz {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Değişken bulunamadı:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Lütfen numpad&#39;den düzenlemek için bir alan seçin
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Lütfen numpad&#39;den düzenlemek için bir alan seçin
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Masaüstüne gidip ERPNext 'i kullanmaya başlayabilirsiniz
 DocType: Item,Manufacturer,Üretici
 DocType: Landed Cost Item,Purchase Receipt Item,Satın Alma makbuzu Ürünleri
@@ -1438,8 +1464,8 @@
 DocType: Item,Default Selling Cost Center,Standart Satış Maliyet Merkezi
 DocType: Sales Partner,Implementation Partner,Uygulama Ortağı
 DocType: Sales Partner,Implementation Partner,Uygulama Ortağı
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Posta Kodu
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Satış Sipariş {0} {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Posta Kodu
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Satış Sipariş {0} {1}
 DocType: Opportunity,Contact Info,İletişim Bilgileri
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Stok Girişleri Yapımı
 DocType: Packing Slip,Net Weight UOM,Net Ağırlık Ölçü Birimi
@@ -1451,6 +1477,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Haftalık Hesap Kesim tarihlerini alın
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,"Bitiş Tarihi, Başlangıç Tarihinden daha az olamaz"
 DocType: Sales Person,Select company name first.,Önce şirket adı seçiniz
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Alçaktan yükseğe
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Tedarikçilerden alınan teklifler.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Tüm BOM&#39;larda BOM&#39;u değiştirin ve en son fiyatı güncelleyin.
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Şu kişi(lere) {0} | {1} {2}
@@ -1473,7 +1500,7 @@
 DocType: Program Enrollment,Transportation,Taşıma
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,geçersiz Özellik
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} teslim edilmelidir
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Miktara göre daha az veya ona eşit olmalıdır {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Miktara göre daha az veya ona eşit olmalıdır {0}
 DocType: SMS Center,Total Characters,Toplam Karakterler
 DocType: SMS Center,Total Characters,Toplam Karakterler
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Ürün için BOM BOM alanında seçiniz {0}
@@ -1489,7 +1516,7 @@
 ,Ordered Items To Be Billed,Faturalanacak Sipariş Edilen Ürünler
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Menzil az olmak zorundadır Kimden daha Range için
 DocType: Global Defaults,Global Defaults,Küresel Varsayılanlar
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Proje Ortak Çalışma Daveti
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Proje Ortak Çalışma Daveti
 DocType: Salary Slip,Deductions,Kesintiler
 DocType: Salary Slip,Deductions,Kesintiler
 DocType: Leave Allocation,LAL/,LAL /
@@ -1509,15 +1536,15 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Satış Fatura Avansı
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Talep edecek bir şey yok
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Başka bir bütçe rekoru &#39;{0}&#39; zaten karşı var {1} &#39;{2}&#39; mali yıl için {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"'Fiili Başlangıç Tarihi', 'Fiili Bitiş Tarihi' den büyük olamaz"
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"'Fiili Başlangıç Tarihi', 'Fiili Bitiş Tarihi' den büyük olamaz"
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"'Fiili Başlangıç Tarihi', 'Fiili Bitiş Tarihi' den büyük olamaz"
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"'Fiili Başlangıç Tarihi', 'Fiili Bitiş Tarihi' den büyük olamaz"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Yönetim
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Yönetim
 DocType: Cheque Print Template,Payer Settings,ödeyici Ayarları
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Bu varyant Ürün Kodu eklenecektir. Senin kısaltması ""SM"", ve eğer, örneğin, ürün kodu ""T-Shirt"", ""T-Shirt-SM"" olacak varyantın madde kodu"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net Ödeme (sözlü) Maaş Makbuzunu kaydettiğinizde görünecektir
 DocType: Purchase Invoice,Is Return,İade mi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Dikkat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Dikkat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,İade / Borç Dekontu
 DocType: Price List Country,Price List Country,Fiyat Listesi Ülke
 DocType: Item,UOMs,Ölçü Birimleri
@@ -1534,18 +1561,19 @@
 DocType: Account,Balance Sheet,Bilanço
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ','Ürün Kodu Ürün için Merkezi'ni Maliyet
 DocType: Fee Validity,Valid Till,Kadar geçerli
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Ödeme Modu yapılandırılmamış. Hesap Ödemeler Modu veya POS Profili ayarlanmış olup olmadığını kontrol edin.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Ödeme Modu yapılandırılmamış. Hesap Ödemeler Modu veya POS Profili ayarlanmış olup olmadığını kontrol edin.
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Aynı madde birden çok kez girilemez.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ek hesaplar Gruplar altında yapılabilir, ancak girişler olmayan Gruplar karşı yapılabilir"
 DocType: Lead,Lead,Talep Yaratma
 DocType: Email Digest,Payables,Borçlar
 DocType: Email Digest,Payables,Borçlar
 DocType: Course,Course Intro,Ders giriş
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Stok Giriş {0} oluşturuldu
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Kurulum ile Seyirci için numaralandırma serisini ayarlayın&gt; Serileri Numaralandırma
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Stok Giriş {0} oluşturuldu
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Satır # {0}: Miktar Satınalma Return girilemez Reddedildi
 ,Purchase Order Items To Be Billed,Faturalanacak Satınalma Siparişi Kalemleri
 DocType: Purchase Invoice Item,Net Rate,Net Hızı
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Lütfen bir müşteri seçin
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Lütfen bir müşteri seçin
 DocType: Purchase Invoice Item,Purchase Invoice Item,Satın alma Faturası Ürünleri
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stok Ledger Girişler ve GL Girişler seçilen Satınalma Makbuzlar için yayınlanırsa edilir
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Madde 1
@@ -1570,7 +1598,7 @@
 ,Trial Balance,Mizan
 ,Trial Balance,Mizan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,bulunamadı Mali Yılı {0}
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Çalışanlar kurma
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Çalışanlar kurma
 DocType: Sales Order,SO-,YANİ-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Önce Ön ek seçiniz
 DocType: Employee,O-,O-
@@ -1584,12 +1612,13 @@
 DocType: Grading Scale,Intervals,Aralıklar
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,En erken
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,En erken
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Bir Ürün grubu aynı isimle bulunuyorsa, lütfen Ürün veya Ürün grubu adını değiştirin"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Bir Ürün grubu aynı isimle bulunuyorsa, lütfen Ürün veya Ürün grubu adını değiştirin"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Öğrenci Mobil No
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Dünyanın geri kalanı
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Dünyanın geri kalanı
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Öğe {0} Toplu olamaz
 ,Budget Variance Report,Bütçe Fark Raporu
 DocType: Salary Slip,Gross Pay,Brüt Ödeme
+DocType: Item,Is Item from Hub,Hub&#39;dan Öğe Var mı
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Satır {0}: Etkinlik Türü zorunludur.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Temettü Ücretli
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Muhasebe Defteri
@@ -1599,8 +1628,9 @@
 DocType: Vehicle Log,Service Detail,hizmet Detayı
 DocType: BOM,Item Description,Ürün Tanımı
 DocType: Student Sibling,Student Sibling,Öğrenci Kardeş
-DocType: Purchase Invoice,Is Recurring,Dönüşümlü mı
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Ödeme Modu
 DocType: Purchase Invoice,Supplied Items,Verilen Öğeler
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Lütfen restoran {0} için etkin bir menü ayarlayın.
 DocType: Student,STUD.,DAMIZLIK.
 DocType: Production Order,Qty To Manufacture,Üretilecek Miktar
 DocType: Email Digest,New Income,yeni Gelir
@@ -1611,6 +1641,7 @@
 ,Student and Guardian Contact Details,Öğrenci ve Guardian İletişim Bilgileri
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Satır {0}: tedarikçisi için {0} E-posta Adresi e-posta göndermek için gereklidir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Geçici Açma
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Gösteri Merkezi
 ,Employee Leave Balance,Çalışanın Kalan İzni
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Hesap {0} her zaman dengede olmalı {1}
 DocType: Patient Appointment,More Info,Daha Fazla Bilgi
@@ -1633,13 +1664,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Satış Sipariş {0} geçerli değildir
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Teklifler için yeni İstek uyarısı yapın
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Satın alma siparişleri planı ve alışverişlerinizi takip
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Üzgünüz, şirketler birleştirilemiyor"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Üzgünüz, şirketler birleştirilemiyor"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Testi Reçeteleri
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Malzeme Talebi toplam Sayı / Aktarım miktarı {0} {1} \ Ürün için istenen miktar {2} daha büyük olamaz {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Küçük
 DocType: Employee,Employee Number,Çalışan sayısı
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Konu Numarası/numaraları zaten kullanımda. Konu No {0} olarak deneyin.
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Konu Numarası/numaraları zaten kullanımda. Konu No {0} olarak deneyin.
 DocType: Project,% Completed,% Tamamlanan
 ,Invoiced Amount (Exculsive Tax),Faturalanan Tutar (Vergi Hariç)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Madde 2
@@ -1658,12 +1689,12 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Satır {0}: Miktar zorunludur
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Tarım
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Tarım
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Senkronizasyon Ana Veri
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Senkronizasyon Ana Veri
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Ürünleriniz veya hizmetleriniz
 DocType: Special Test Items,Special Test Items,Özel Test Öğeleri
 DocType: Mode of Payment,Mode of Payment,Ödeme Şekli
 DocType: Mode of Payment,Mode of Payment,Ödeme Şekli
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Web Sitesi Resim kamu dosya veya web sitesi URL olmalıdır
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Web Sitesi Resim kamu dosya veya web sitesi URL olmalıdır
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,Ürün Ağacı
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Bu bir kök Ürün grubudur ve düzenlenemez.
@@ -1671,10 +1702,10 @@
 DocType: Vehicle,Fuel UOM,yakıt UOM
 DocType: Warehouse,Warehouse Contact Info,Depo İletişim Bilgileri
 DocType: Warehouse,Warehouse Contact Info,Depo İletişim Bilgileri
-DocType: Payment Entry,Write Off Difference Amount,Fark Tutarı Kapalı yaz
-DocType: Purchase Invoice,Recurring Type,Tekrarlanma Türü
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent",{0}: Çalışanın e-posta adresi bulunamadığı için e-posta gönderilemedi
+DocType: Payment Entry,Write Off Difference Amount,Şüpheli Alacak Fark Hesabı
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent",{0}: Çalışanın e-posta adresi bulunamadığı için e-posta gönderilemedi
 DocType: Item,Foreign Trade Details,Dış Ticaret Detayları
+,Assessment Plan Status,Değerlendirme Planı Durumu
 DocType: Email Digest,Annual Income,Yıllık gelir
 DocType: Serial No,Serial No Details,Seri No Detayları
 DocType: Serial No,Serial No Details,Seri No Detayları
@@ -1683,17 +1714,16 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,Lütfen Hekim ve Tarih&#39;i seçin
 DocType: Student Group Student,Group Roll Number,Grup Rulosu Numarası
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, sadece kredi hesapları başka bir ödeme girişine karşı bağlantılı olabilir için"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,tüm görev ağırlıkları toplamı 1. buna göre tüm proje görevleri ağırlıkları ayarlayın olmalıdır
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,İrsaliye {0} teslim edilmedi
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,tüm görev ağırlıkları toplamı 1. buna göre tüm proje görevleri ağırlıkları ayarlayın olmalıdır
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,İrsaliye {0} teslim edilmedi
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Ürün {0} bir taşeron ürünü olmalıdır
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Sermaye Ekipmanları
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Sermaye Ekipmanları
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Fiyatlandırma Kuralı ilk olarak 'Uygula' alanı üzerinde seçilir, bu bir Ürün, Grup veya Marka olabilir."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Lütfen Önce Öğe Kodunu ayarlayın
-DocType: Hub Settings,Seller Website,Satıcı Sitesi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Lütfen Önce Öğe Kodunu ayarlayın
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Satış ekibi için ayrılan toplam yüzde 100 olmalıdır
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Satış ekibi için ayrılan toplam yüzde 100 olmalıdır
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Satış ekibi için ayrılan toplam yüzde 100 olmalıdır
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Satış ekibi için ayrılan toplam yüzde 100 olmalıdır
 DocType: Sales Invoice Item,Edit Description,Edit Açıklama
 DocType: Antibiotic,Antibiotic,Antibiyotik
 ,Team Updates,Ekip Güncellemeleri
@@ -1716,13 +1746,13 @@
 DocType: Purchase Invoice,Total (Company Currency),Toplam (Şirket Para)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Seri numarası {0} birden çok girilmiş
 DocType: Depreciation Schedule,Journal Entry,Kayıt Girdisi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} ürün işlemde
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} ürün işlemde
 DocType: Workstation,Workstation Name,İş İstasyonu Adı
 DocType: Workstation,Workstation Name,İş İstasyonu Adı
 DocType: Grading Scale Interval,Grade Code,sınıf Kodu
 DocType: POS Item Group,POS Item Group,POS Ürün Grubu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Digest e-posta:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},Ürün Ağacı {0} {1} Kalemine ait değil
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},Ürün Ağacı {0} {1} Kalemine ait değil
 DocType: Sales Partner,Target Distribution,Hedef Dağıtımı
 DocType: Salary Slip,Bank Account No.,Banka Hesap No
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Bu ön ekle son oluşturulmuş işlemlerin sayısıdır
@@ -1741,11 +1771,10 @@
 DocType: Healthcare Settings,Registration Message,Kayıt Mesajı
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Donanım
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Donanım
-DocType: Sales Order,Recurring Upto,Tekrarlanan Kadar
 DocType: Prescription Dosage,Prescription Dosage,Reçeteli Dozaj
 DocType: Attendance,HR Manager,İK Yöneticisi
 DocType: Attendance,HR Manager,İK Yöneticisi
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Bir Şirket seçiniz
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Bir Şirket seçiniz
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Privilege bırak
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Privilege bırak
 DocType: Purchase Invoice,Supplier Invoice Date,Tedarikçi Fatura Tarihi
@@ -1763,11 +1792,12 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Şunların arasında çakışan koşullar bulundu:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Journal Karşı giriş {0} zaten başka çeki karşı ayarlanır
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Toplam Sipariş Miktarı
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Yiyecek Grupları
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Yiyecek Grupları
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Yiyecek Grupları
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Yiyecek Grupları
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Yaşlanma Aralığı 3
 DocType: Maintenance Schedule Item,No of Visits,Ziyaret sayısı
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},{1} ile ilgili Bakım Çizelgesi {0} var
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Öğelerinizi Hub&#39;a yayınlamak istiyor musunuz?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,kaydolunan öğrenci
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Kapanış Hesap Para olmalıdır {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Tüm hedefler için puan toplamı It is 100. olmalıdır {0}
@@ -1780,10 +1810,10 @@
 DocType: Authorization Rule,Average Discount,Ortalama İndirim
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Programlar
-DocType: Purchase Invoice Item,Accounting,Muhasebe
-DocType: Purchase Invoice Item,Accounting,Muhasebe
+DocType: POS Profile,Accounting,Muhasebe
+DocType: POS Profile,Accounting,Muhasebe
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Toplanan öğe için lütfen toplu seç
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Toplanan öğe için lütfen toplu seç
 DocType: Asset,Depreciation Schedules,Amortisman Çizelgeleri
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Uygulama süresi dışında izin tahsisi dönemi olamaz
 DocType: Activity Cost,Projects,Projeler
@@ -1802,8 +1832,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',Onay Durumu 'Onaylandı' veya 'Reddedildi' olmalıdır
 DocType: Physician,Contacts and Address,Kişiler ve Adres
 DocType: Purchase Invoice,Contact Person,İrtibat Kişi
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"'Beklenen Başlangıç Tarihi', 'Beklenen Bitiş Tarihi' den büyük olamaz"
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"'Beklenen Başlangıç Tarihi', 'Beklenen Bitiş Tarihi' den büyük olamaz"
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"'Beklenen Başlangıç Tarihi', 'Beklenen Bitiş Tarihi' den büyük olamaz"
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"'Beklenen Başlangıç Tarihi', 'Beklenen Bitiş Tarihi' den büyük olamaz"
 DocType: Course Scheduling Tool,Course End Date,Kurs Bitiş Tarihi
 DocType: Holiday List,Holidays,Bayram
 DocType: Holiday List,Holidays,Bayram
@@ -1814,10 +1844,11 @@
 DocType: Item,Maintain Stock,Stok koruyun
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Zaten Üretim Siparişi için oluşturulan Stok Girişler
 DocType: Employee,Prefered Email,Tercih edilen e-posta
+DocType: Student Admission,Eligibility and Details,Uygunluk ve Ayrıntılar
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Sabit Varlık Net Değişim
 DocType: Leave Control Panel,Leave blank if considered for all designations,Tüm tanımları için kabul ise boş bırakın
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Satır {0}'daki 'Gerçek' ücret biçimi Ürün Br.Fiyatına dahil edilemez
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,DateTime Gönderen
 DocType: Email Digest,For Company,Şirket için
 DocType: Email Digest,For Company,Şirket için
@@ -1826,21 +1857,20 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Tedarikçi Puan Kartı Değişken Skorlama
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Alım Miktarı
 DocType: Sales Invoice,Shipping Address Name,Teslimat Adresi İsmi
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Hesap Tablosu
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Hesap Tablosu
 DocType: Material Request,Terms and Conditions Content,Şartlar ve Koşullar İçeriği
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,100 'den daha büyük olamaz
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Ürün {0} bir stok ürünü değildir
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Ürün {0} bir stok ürünü değildir
 DocType: Maintenance Visit,Unscheduled,Plânlanmamış
 DocType: Employee,Owned,Hisseli
 DocType: Salary Detail,Depends on Leave Without Pay,Pay olmadan İzni bağlıdır
 DocType: Pricing Rule,"Higher the number, higher the priority","Yüksek sayı, yüksek öncelikli"
 ,Purchase Invoice Trends,Satın Alma Fatura Analizi
 DocType: Employee,Better Prospects,Iyi Beklentiler
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",Sıra # {0}: Toplu işlem {1} yalnızca {2} adetlik bir miktara sahip. Lütfen {3} adet mevcut olan başka bir partiyi seçin veya satırı birden çok partiye dağıtmak / yayınlamak için satırı birden çok satıra bölün.
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",Sıra # {0}: Toplu işlem {1} yalnızca {2} adetlik bir miktara sahip. Lütfen {3} adet mevcut olan başka bir partiyi seçin veya satırı birden çok partiye dağıtmak / yayınlamak için satırı birden çok satıra bölün.
 DocType: Vehicle,License Plate,Plaka
 DocType: Appraisal,Goals,Hedefler
 DocType: Appraisal,Goals,Hedefler
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,POS Profilini Seç
 DocType: Warranty Claim,Warranty / AMC Status,Garanti / AMC Durum
 DocType: Warranty Claim,Warranty / AMC Status,Garanti / AMC Durum
 ,Accounts Browser,Hesap Tarayıcı
@@ -1848,7 +1878,7 @@
 DocType: GL Entry,GL Entry,GL Girdisi
 DocType: HR Settings,Employee Settings,Çalışan Ayarları
 DocType: HR Settings,Employee Settings,Çalışan Ayarları
-,Batch-Wise Balance History,Parti-Bilgi Bakiye Geçmişi
+,Batch-Wise Balance History,Parti Geneli Bakiye Geçmişi
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,"Yazdırma ayarları, ilgili baskı biçiminde güncellendi"
 DocType: Package Code,Package Code,Paket Kodu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Apprentice,Çırak
@@ -1861,8 +1891,8 @@
 DocType: Supplier Scorecard Period,SSC-,SSc
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Çalışan kendi kendine rapor olamaz.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hesap dondurulmuş ise, girdiler kısıtlı kullanıcılara açıktır."
-DocType: Email Digest,Bank Balance,Banka hesap bakiyesi
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} sadece para yapılabilir: {0} Muhasebe Kayıt {2}
+DocType: Email Digest,Bank Balance,Banka Bakiyesi
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} sadece para yapılabilir: {0} Muhasebe Kayıt {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","İş Profili, gerekli nitelikler vb"
 DocType: Journal Entry Account,Account Balance,Hesap Bakiyesi
 DocType: Journal Entry Account,Account Balance,Hesap Bakiyesi
@@ -1872,8 +1902,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Toplam Vergi ve Harçlar (Şirket Para Birimi)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,kapanmamış mali yılın P &amp; L dengeleri göster
 DocType: Lab Test Template,Collection Details,Koleksiyon Ayrıntıları
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","tab.Consultation ct, `tabLab Prescription` cp&#39;den cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date seçin. cp.patient = &#39;{0}&#39; ve cp.parent = ct. ad ve cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Nakliye Hesap
 DocType: Shipping Rule,Shipping Account,Nakliye Hesap
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Hesap {2} etkin değil
@@ -1895,7 +1923,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Ofis Kiraları
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Kurulum SMS ağ geçidi ayarları
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Kurulum SMS ağ geçidi ayarları
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,İçe Aktarma Başarısız!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,İçe Aktarma Başarısız!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Hiçbir adres Henüz eklenmiş.
 DocType: Workstation Working Hour,Workstation Working Hour,İş İstasyonu Çalışma Saati
 DocType: Vital Signs,Blood Pressure,Kan basıncı
@@ -1924,7 +1952,7 @@
 DocType: Sales Invoice,Source,Kaynak
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Kapalı olanları göster
 DocType: Leave Type,Is Leave Without Pay,Pay Yapmadan mı
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Sabit Varlık için Varlık Kategorisi zorunludur
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Sabit Varlık için Varlık Kategorisi zorunludur
 DocType: Fee Validity,Fee Validity,Ücret Geçerliği
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Ödeme tablosunda kayıt bulunamadı
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Ödeme tablosunda kayıt bulunamadı
@@ -1948,8 +1976,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Yürütücü Arama
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,İlanlar oluştur
 DocType: Maintenance Schedule,Schedules,Programlar
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,"POS Profili, Satış Noktasını Kullanmak için Gereklidir"
 DocType: Purchase Invoice Item,Net Amount,Net Miktar
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} gönderilmedi, bu nedenle eylem tamamlanamadı"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} gönderilmedi, bu nedenle eylem tamamlanamadı"
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detay yok
 DocType: Landed Cost Voucher,Additional Charges,Ek ücretler
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Ek İndirim Tutarı (Şirket Para Birimi)
@@ -1959,8 +1988,8 @@
 DocType: Maintenance Visit,Maintenance Visit,Bakım Ziyareti
 DocType: Maintenance Visit,Maintenance Visit,Bakım Ziyareti
 DocType: Student,Leaving Certificate Number,Sertifika Numarası Leaving
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Randevu iptal edildi, lütfen {0} faturayı inceleyin ve iptal edin."
-DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Depo Available at Toplu Adet
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Randevu iptal edildi, lütfen {0} faturayı inceleyin ve iptal edin."
+DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Depoda Mevcut Parti Miktarı
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Update Yazıcı Formatı
 DocType: Landed Cost Voucher,Landed Cost Help,Indi Maliyet Yardım
 DocType: Purchase Invoice,Select Shipping Address,Seç Teslimat Adresi
@@ -1983,8 +2012,8 @@
 DocType: Sales Invoice Item,Brand Name,Marka Adı
 DocType: Sales Invoice Item,Brand Name,Marka Adı
 DocType: Purchase Receipt,Transporter Details,Taşıyıcı Detayları
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},{0} kullanıcısı zaten Hekime {1} atandı
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Standart depo seçilen öğe için gereklidir
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},{0} kullanıcısı zaten Hekime {1} atandı
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Standart depo seçilen öğe için gereklidir
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Kutu
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Kutu
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,Olası Tedarikçi
@@ -1996,8 +2025,8 @@
 DocType: Sales Partner,Sales Partner Target,Satış Ortağı Hedefi
 DocType: Loan Type,Maximum Loan Amount,Maksimum Kredi Miktarı
 DocType: Pricing Rule,Pricing Rule,Fiyatlandırma Kuralı
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},{0} öğrencisi için yinelenen rulo numarası
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},{0} öğrencisi için yinelenen rulo numarası
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},{0} öğrencisi için yinelenen rulo numarası
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},{0} öğrencisi için yinelenen rulo numarası
 DocType: Budget,Action if Annual Budget Exceeded,Yıllık Bütçe aşıldıysa yapılacak işlem
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Satınalma Siparişi Malzeme Talebi
 DocType: Shopping Cart Settings,Payment Success URL,Ödeme Başarı URL
@@ -2016,7 +2045,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} sadece bir kez yer almalıdır
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Daha fazla tranfer izin yok {0} daha {1} Satınalma Siparişi karşı {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},İzinler {0} için başarıyla tahsis edildi
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Ambalajlanacak Ürün Yok
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Ambalajlanacak Ürün Yok
 DocType: Shipping Rule Condition,From Value,Değerden
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Üretim Miktarı zorunludur
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Üretim Miktarı zorunludur
@@ -2032,6 +2061,7 @@
 DocType: Purchase Invoice,Supplier Warehouse,Tedarikçi Deposu
 DocType: Purchase Invoice,Supplier Warehouse,Tedarikçi Deposu
 DocType: Opportunity,Contact Mobile No,İrtibat Mobil No
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Şirket Seç
 ,Material Requests for which Supplier Quotations are not created,Kendisi için tedarikçi fiyat teklifi oluşturulmamış Malzeme Talepleri
 DocType: Student Group,Set 0 for no limit,hiçbir sınırı 0 olarak ayarlayın
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Eğer izin için başvuruda edildiği gün (ler) tatildir. Sen izin talebinde gerekmez.
@@ -2041,25 +2071,25 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Teklifi Yap
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,diğer Raporlar
 DocType: Dependent Task,Dependent Task,Bağımlı Görev
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Tedbir varsayılan Birimi için dönüşüm faktörü satırda 1 olmalıdır {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Tedbir varsayılan Birimi için dönüşüm faktörü satırda 1 olmalıdır {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Tip{0} izin  {1}'den uzun olamaz
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Peşin X gün için operasyonlar planlama deneyin.
 DocType: HR Settings,Stop Birthday Reminders,Doğum günü hatırlatıcılarını durdur
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Şirket Standart Bordro Ödenecek Hesap ayarlayın {0}
 DocType: SMS Center,Receiver List,Alıcı Listesi
 DocType: SMS Center,Receiver List,Alıcı Listesi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Arama Öğe
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Arama Öğe
 DocType: Patient Appointment,Referring Physician,Danışan Hekim
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Tüketilen Tutar
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Nakit Net Değişim
 DocType: Assessment Plan,Grading Scale,Notlandırma ölçeği
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Ölçü Birimi {0} Dönüşüm katsayısı tablosunda birden fazla kez girildi.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,Zaten tamamlandı
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Ölçü Birimi {0} Dönüşüm katsayısı tablosunda birden fazla kez girildi.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,Zaten tamamlandı
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Elde Edilen Stoklar
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Ödeme Talebi zaten var {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,İhraç Öğeler Maliyeti
 DocType: Physician,Hospital,Hastane
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Miktar fazla olmamalıdır {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Miktar fazla olmamalıdır {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Geçmiş Mali Yıl kapatılmamış
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Yaş (Gün)
 DocType: Quotation Item,Quotation Item,Teklif Ürünü
@@ -2071,8 +2101,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Tedarikçi Türü Alanı.
 DocType: Purchase Order Item,Supplier Part Number,Tedarikçi Parti Numarası
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Dönüşüm oranı 0 veya 1 olamaz
-DocType: Sales Invoice,Reference Document,referans Belgesi
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} iptal edilmiş veya durdurulmuş
+DocType: Subscription,Reference Document,referans Belgesi
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} iptal edilmiş veya durdurulmuş
 DocType: Accounts Settings,Credit Controller,Kredi Kontrolü
 DocType: Delivery Note,Vehicle Dispatch Date,Araç Sevk Tarihi
 DocType: Delivery Note,Vehicle Dispatch Date,Araç Sevk Tarihi
@@ -2082,6 +2112,7 @@
 DocType: Company,Default Payable Account,Standart Ödenecek Hesap
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Böyle nakliye kuralları, fiyat listesi vb gibi online alışveriş sepeti için Ayarlar"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Faturalandırıldı
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Fiyata göre sıralama ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Ayrılmış Miktar
 DocType: Party Account,Party Account,Taraf Hesabı
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,İnsan Kaynakları
@@ -2095,7 +2126,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Ödeme Girişi yapın
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Satır {0}: Tedarikçi karşı Advance debit gerekir
 DocType: Company,Default Values,Varsayılan Değerler
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequency} Bülten
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Frequency} Bülten
 DocType: Expense Claim,Total Amount Reimbursed,Toplam Tutar Geri ödenen
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,"Bu, bu Araç karşı günlükleri dayanmaktadır. Ayrıntılar için aşağıdaki zaman çizelgesini bakın"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},{1} tarihli {0} Tedarikçi Faturası karşılığı
@@ -2103,6 +2134,7 @@
 DocType: Customer,Default Price List,Standart Fiyat Listesi
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Varlık Hareket kaydı {0} oluşturuldu
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Silemezsiniz Mali Yılı {0}. Mali yıl {0} Genel ayarlar varsayılan olarak ayarlanır
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Aynı ada sahip bir müşteri zaten var
 DocType: Journal Entry,Entry Type,Girdi Türü
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Bu değerlendirme grubuyla bağlantılı bir değerlendirme planı yok
 ,Customer Credit Balance,Müşteri Kredi Bakiyesi
@@ -2114,7 +2146,7 @@
 DocType: Quotation,Term Details,Dönem Ayrıntıları
 DocType: Project,Total Sales Cost (via Sales Order),Toplam Satış Maliyeti (Satış Siparişi Yoluyla)
 DocType: Project,Total Sales Cost (via Sales Order),Toplam Satış Maliyeti (Satış Siparişi Yoluyla)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Bu öğrenci grubu için {0} öğrencilere göre daha kayıt olamaz.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Bu öğrenci grubu için {0} öğrencilere göre daha kayıt olamaz.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Müşteri Adayı Sayısı
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Müşteri Adayı Sayısı
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} değeri 0 dan büyük olmalı
@@ -2132,10 +2164,12 @@
 DocType: Lab Test,Technician Name,Teknisyen Adı
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Fatura İptaline İlişkin Ödeme bağlantısını kaldır
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Girilen Güncel Yolölçer okuma başlangıç Araç Odometrenin daha fazla olmalıdır {0}
+DocType: Restaurant Reservation,No Show,Gösterim Yok
 DocType: Shipping Rule Country,Shipping Rule Country,Nakliye Kural Ülke
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Bırakın ve Seyirci
 DocType: Maintenance Visit,Partially Completed,Kısmen Tamamlandı
 DocType: Maintenance Visit,Partially Completed,Kısmen Tamamlandı
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Orta Hassasiyet
 DocType: Leave Type,Include holidays within leaves as leaves,Yapraklar gibi yaprakları içinde tatil dahil
 DocType: Sales Invoice,Packed Items,Paketli Ürünler
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Seri No. karşı Garanti İddiası
@@ -2154,6 +2188,7 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Ödenen Tutar (Şirket Para Biriminde)
 DocType: Purchase Invoice,Additional Discount,Ek İndirim
 DocType: Selling Settings,Selling Settings,Satış Ayarları
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,İşlemi Onaylayın
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Müzayede
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Müzayede
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Miktar veya Değerleme Br.Fiyatı ya da her ikisini de belirtiniz
@@ -2163,7 +2198,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Pazarlama Giderleri
 ,Item Shortage Report,Ürün Yetersizliği Raporu
 ,Item Shortage Report,Ürün Yetersizliği Raporu
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Ağırlık çok ""Ağırlık Ölçü Birimi"" belirtiniz \n, söz edilmektedir"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Ağırlık çok ""Ağırlık Ölçü Birimi"" belirtiniz \n, söz edilmektedir"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Bu stok girdisini yapmak için kullanılan Malzeme Talebi
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Sonraki Amortisman Tarihi yeni varlık için zorunludur
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Her Toplu İş için Ayrılmış Kurs Tabanlı Grup
@@ -2176,13 +2211,13 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Her Stok Hareketi için Muhasebe kaydı oluştur
 DocType: Leave Allocation,Total Leaves Allocated,Ayrılan toplam izinler
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Satır No gerekli Depo {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Geçerli Mali Yılı Başlangıç ve Bitiş Tarihleri girin
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Geçerli Mali Yılı Başlangıç ve Bitiş Tarihleri girin
 DocType: Employee,Date Of Retirement,Emeklilik Tarihiniz
 DocType: Employee,Date Of Retirement,Emeklilik Tarihiniz
 DocType: Upload Attendance,Get Template,Şablon alın
 DocType: Material Request,Transferred,aktarılan
 DocType: Vehicle,Doors,Kapılar
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext Kurulumu Tamamlandı!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext Kurulumu Tamamlandı!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Hasta Kayıt için Toplama Ücreti
 DocType: Course Assessment Criteria,Weightage,Ağırlık
 DocType: Purchase Invoice,Tax Breakup,Vergi dağılımı
@@ -2202,42 +2237,41 @@
 DocType: Employee,AB+,AB+
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Bu öğeyi varyantları varsa, o zaman satış siparişleri vb seçilemez"
 DocType: Lead,Next Contact By,Sonraki İrtibat
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Satır {1} deki Ürün {0} için gereken miktar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Satır {1} deki Ürün {0} için gereken miktar
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Ürün {1} için miktar mevcut olduğundan depo {0} silinemez
 DocType: Quotation,Order Type,Sipariş Türü
 DocType: Quotation,Order Type,Sipariş Türü
-DocType: Purchase Invoice,Notification Email Address,Bildirim E-posta Adresi
-DocType: Purchase Invoice,Notification Email Address,Bildirim E-posta Adresi
 ,Item-wise Sales Register,Ürün bilgisi Satış Kaydı
 DocType: Asset,Gross Purchase Amount,Brüt sipariş tutarı
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Açılış Bakiyeleri
 DocType: Asset,Depreciation Method,Amortisman Yöntemi
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Çevrimdışı
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Çevrimdışı
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Bu Vergi Temel Br.Fiyata dahil mi?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Toplam Hedef
 DocType: Job Applicant,Applicant for a Job,İş için aday
 DocType: Production Plan Material Request,Production Plan Material Request,Üretim Planı Malzeme Talebi
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Üretim Emri Oluşturulmadı
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Üretim Emri Oluşturulmadı
 DocType: Stock Reconciliation,Reconciliation JSON,Mutabakat JSON
 DocType: Stock Reconciliation,Reconciliation JSON,Mutabakat JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Çok fazla sütun. Raporu çıkarın ve spreadsheet uygulaması kullanarak yazdırın.
 DocType: Purchase Invoice Item,Batch No,Parti No
 DocType: Purchase Invoice Item,Batch No,Parti No
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Teklif İsteği: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Müşterinin Satın Alma Siparişine karşılık birden fazla Satış Siparişine izin ver.
 DocType: Student Group Instructor,Student Group Instructor,Öğrenci Grubu Eğitmeni
 DocType: Student Group Instructor,Student Group Instructor,Öğrenci Grubu Eğitmeni
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobil yok
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Ana
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Ana
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Ana
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Ana
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Varyant
 DocType: Naming Series,Set prefix for numbering series on your transactions,İşlemlerinizde seri numaralandırma için ön ek ayarlayın
 DocType: Employee Attendance Tool,Employees HTML,"Çalışanlar, HTML"
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Standart BOM ({0}) Bu öğe veya şablon için aktif olmalıdır
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Standart BOM ({0}) Bu öğe veya şablon için aktif olmalıdır
 DocType: Employee,Leave Encashed?,İzin Tahsil Edilmiş mi?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Kimden alanında Fırsat zorunludur
 DocType: Email Digest,Annual Expenses,yıllık giderler
 DocType: Item,Variants,Varyantlar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Satın Alma Emri verin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Satın Alma Emri verin
 DocType: SMS Center,Send To,Gönder
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},İzin tipi{0} için yeterli izin bakiyesi yok
 DocType: Payment Reconciliation Payment,Allocated amount,Ayrılan miktar
@@ -2256,7 +2290,8 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Öğrenci Grubu Gücü
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Öğrenci Grubu Gücü
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Journal Karşı giriş {0} herhangi eşsiz {1} girişi yok
-apps/erpnext/erpnext/config/hr.py +137,Appraisals,Appraisals
+apps/erpnext/erpnext/config/hr.py +137,Appraisals,Değerlendirme
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Eğitim Etkinlikleri
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Çoğaltın Seri No Ürün için girilen {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Çoğaltın Seri No Ürün için girilen {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Nakliye Kuralı için koşul
@@ -2267,7 +2302,7 @@
 DocType: Sales Order,To Deliver and Bill,Teslim edilecek ve Faturalanacak
 DocType: Student Group,Instructors,Ders
 DocType: GL Entry,Credit Amount in Account Currency,Hesap Para Birimi Kredi Tutarı
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,Ürün Ağacı {0} devreye alınmalıdır
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,Ürün Ağacı {0} devreye alınmalıdır
 DocType: Authorization Control,Authorization Control,Yetki Kontrolü
 DocType: Authorization Control,Authorization Control,Yetki Kontrolü
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Satır # {0}: Depo Reddedildi reddedilen Öğe karşı zorunludur {1}
@@ -2287,12 +2322,12 @@
 DocType: Quotation Item,Actual Qty,Gerçek Adet
 DocType: Sales Invoice Item,References,Kaynaklar
 DocType: Quality Inspection Reading,Reading 10,10 Okuma
-DocType: Hub Settings,Hub Node,Hub Düğüm
+DocType: Hub Category,Hub Node,Hub Düğüm
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Yinelenen Ürünler girdiniz. Lütfen düzeltip yeniden deneyin.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Ortak
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Ortak
 DocType: Asset Movement,Asset Movement,Varlık Hareketi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,Yeni Sepet
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,Yeni Sepet
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Ürün {0} bir seri Ürün değildir
 DocType: SMS Center,Create Receiver List,Alıcı listesi oluşturma
 DocType: Vehicle,Wheels,Tekerlekler
@@ -2307,16 +2342,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomünikasyon
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Paketin bu teslimatın bir parçası olduğunu gösterir (Sadece Taslak)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Ödeme Girdisi Oluştur
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Ürün {0} için miktar{1} den az olmalıdır
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Ürün {0} için miktar{1} den az olmalıdır
 ,Sales Invoice Trends,Satış Faturası Trendler
 ,Sales Invoice Trends,Satış Faturası Trendler
 DocType: Leave Application,Apply / Approve Leaves,Yapraklar Onayla / Uygula
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,İçin
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,İçin
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Eğer ücret biçimi 'Önceki Ham Miktar' veya 'Önceki Ham Totk' ise referans verebilir
 DocType: Sales Order Item,Delivery Warehouse,Teslim Depo
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Finansal Maliyet Merkezleri Ağacı.
 DocType: Serial No,Delivery Document No,Teslim Belge No
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Şirket &#39;Varlık Elden Çıkarılmasına İlişkin Kâr / Zarar Hesabı&#39; set Lütfen {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Lütfen 'Varlık Elden Çıkarılmasına İlişkin Kâr / Zarar Hesabı''nı {0} şirketi için ayarlayın
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Satınalma Makbuzlar Gönderen Ürünleri alın
 DocType: Serial No,Creation Date,Oluşturulma Tarihi
 DocType: Serial No,Creation Date,Oluşturulma Tarihi
@@ -2328,11 +2363,12 @@
 DocType: Student,Student Mobile Number,Öğrenci Cep Numarası
 DocType: Item,Has Variants,Varyasyoları var
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Yanıt Güncelle
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Zaten öğeleri seçtiniz {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Zaten öğeleri seçtiniz {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Aylık Dağıtım Adı
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Toplu İşlem Kimliği zorunludur
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Parti numarası zorunludur
 DocType: Sales Person,Parent Sales Person,Ana Satış Elemanı
-DocType: Purchase Invoice,Recurring Invoice,Mükerrer Fatura
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Yüksekten Düşüğe
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Önce programı seçin
 DocType: Patient Appointment,Patient Age,Hasta Yaşı
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Projeleri yönetme
 DocType: Supplier,Supplier of Goods or Services.,Mal veya Hizmet alanı.
@@ -2341,11 +2377,11 @@
 DocType: Vehicle Log,Fuel Price,yakıt Fiyatı
 DocType: Budget,Budget,Bütçe
 DocType: Budget,Budget,Bütçe
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Aç ayarla
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Sabit Kıymet Öğe olmayan bir stok kalemi olmalıdır.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Aç ayarla
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Sabit Kıymet Öğe olmayan bir stok kalemi olmalıdır.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Bir gelir ya da gider hesabı değil gibi Bütçe, karşı {0} atanamaz"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Arşivlendi
-DocType: Student Admission,Application Form Route,Başvuru Formu Rota
+DocType: Student Admission,Application Form Route,Başvuru Yönerge Formu
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Bölge / Müşteri
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,o ödeme olmadan terk beri Türü {0} tahsis edilemez bırakın
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Satır {0}: Tahsis miktar {1} daha az ya da olağanüstü miktarda fatura eşit olmalıdır {2}
@@ -2358,14 +2394,15 @@
 DocType: Maintenance Visit,Maintenance Time,Bakım Zamanı
 DocType: Maintenance Visit,Maintenance Time,Bakım Zamanı
 ,Amount to Deliver,Teslim edilecek tutar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Aynı öğe birden çok kez girildi. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Dönem Başlangıç Tarihi terim bağlantılı olduğu için Akademik Yılı Year Başlangıç Tarihi daha önce olamaz (Akademik Yılı {}). tarihleri düzeltmek ve tekrar deneyin.
 DocType: Guardian,Guardian Interests,Guardian İlgi
 DocType: Naming Series,Current Value,Mevcut değer
 DocType: Naming Series,Current Value,Mevcut değer
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,{0} tarihi için birden fazla mali yıl bulunuyor. Lütfen firma için mali yıl tanımlayınız.
 DocType: School Settings,Instructor Records to be created by,Öğretmen Kayıtları tarafından oluşturulacak
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} oluşturuldu
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} oluşturuldu
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} oluşturuldu
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} oluşturuldu
 DocType: Delivery Note Item,Against Sales Order,Satış Emri Karşılığı
 ,Serial No Status,Seri No Durumu
 ,Serial No Status,Seri No Durumu
@@ -2378,10 +2415,10 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Bu stok hareketi dayanmaktadır. Bkz {0} ayrıntılar için
 DocType: Pricing Rule,Selling,Satış
 DocType: Pricing Rule,Selling,Satış
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},{2}'ye karşılık düşülecek miktar {0} {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},{2}'ye karşılık düşülecek miktar {0} {1}
 DocType: Employee,Salary Information,Maaş Bilgisi
 DocType: Sales Person,Name and Employee ID,İsim ve Çalışan Kimliği
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Bitiş Tarihi gönderim tarihinden önce olamaz
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Bitiş Tarihi gönderim tarihinden önce olamaz
 DocType: Website Item Group,Website Item Group,Web Sitesi Ürün Grubu
 DocType: Website Item Group,Website Item Group,Web Sitesi Ürün Grubu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Harç ve Vergiler
@@ -2411,7 +2448,7 @@
 DocType: Issue,Resolution Details,Karar Detayları
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Atamalar
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Onaylanma Kriterleri
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Yukarıdaki tabloda Malzeme İstekleri giriniz
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Yukarıdaki tabloda Malzeme İstekleri giriniz
 DocType: Item Attribute,Attribute Name,Öznitelik Adı
 DocType: BOM,Show In Website,Web sitesinde Göster
 DocType: Shopping Cart Settings,Show Quantity in Website,Web Sitesi Miktarı göster
@@ -2420,7 +2457,7 @@
 DocType: Item Reorder,Check in (group),(Grup) kontrol
 ,Qty to Order,Sipariş Miktarı
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Kar / Zarar rezerve edileceği Sorumluluk veya Özkaynak altında hesap kafa,"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Bütün görevlerin Gantt Şeması.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Bütün görevlerin Gantt Şeması.
 DocType: Opportunity,Mins to First Response,İlk Müdahale için Dk
 DocType: Pricing Rule,Margin Type,Kar türü
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} saat
@@ -2445,21 +2482,21 @@
 DocType: Employee,Resignation Letter Date,İstifa Mektubu Tarihi
 DocType: Employee,Resignation Letter Date,İstifa Mektubu Tarihi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Fiyatlandırma Kuralları miktara dayalı olarak tekrar filtrelenir.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Lütfen çalışan {0} için Katılma Tarihi&#39;ni ayarlayın.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Lütfen çalışan {0} için Katılma Tarihi&#39;ni ayarlayın.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Lütfen çalışan {0} için Katılma Tarihi&#39;ni ayarlayın.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Lütfen çalışan {0} için Katılma Tarihi&#39;ni ayarlayın.
 DocType: Task,Total Billing Amount (via Time Sheet),Toplam Fatura Tutarı (Zaman Sheet yoluyla)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Tekrar Müşteri Gelir
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) rolü 'Gider onaylayansanız' olmalıdır
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Çift
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Çift
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Üretim için BOM ve Miktar seçin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Üretim için BOM ve Miktar seçin
 DocType: Asset,Depreciation Schedule,Amortisman Programı
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Satış Ortağı Adresleri ve Kişiler
 DocType: Bank Reconciliation Detail,Against Account,Hesap karşılığı
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Yarım Gün Tarih Tarihinden ve Tarihi arasında olmalıdır
 DocType: Maintenance Schedule Detail,Actual Date,Gerçek Tarih
 DocType: Item,Has Batch No,Parti No Var
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Yıllık Fatura: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Yıllık Fatura: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Mal ve Hizmet Vergisi (GST India)
 DocType: Delivery Note,Excise Page Number,Tüketim Sayfa Numarası
 DocType: Delivery Note,Excise Page Number,Tüketim Sayfa Numarası
@@ -2467,17 +2504,17 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Danışmadan Başla
 DocType: Asset,Purchase Date,Satınalma Tarihi
 DocType: Employee,Personal Details,Kişisel Bilgiler
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Lütfen firma {0} için 'Varlık Değer Kaybı Maliyet Merkezi' tanımlayın
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Lütfen firma {0} için 'Varlık Değer Kaybı Maliyet Merkezi' tanımlayın
 ,Maintenance Schedules,Bakım Programları
 DocType: Task,Actual End Date (via Time Sheet),Gerçek tamamlanma tarihi (Zaman Tablosu'ndan)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Miktar {0} {2} karşılığı {1} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Miktar {0} {2} karşılığı {1} {3}
 ,Quotation Trends,Teklif Trendleri
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Ürün {0} içim Ürün alanında Ürün grubu belirtilmemiş
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Hesaba için Bankamatik bir Alacak hesabı olması gerekir
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Hesaba için Bankamatik bir Alacak hesabı olması gerekir
 DocType: Shipping Rule Condition,Shipping Amount,Kargo Tutarı
 DocType: Shipping Rule Condition,Shipping Amount,Kargo Tutarı
 DocType: Supplier Scorecard Period,Period Score,Dönem Notu
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Müşteri Ekle
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Müşteri(ler) Ekle
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Bekleyen Tutar
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Bekleyen Tutar
 DocType: Lab Test Template,Special,Özel
@@ -2486,13 +2523,14 @@
 ,Vehicle Expenses,araç Giderleri
 DocType: Serial No,Invoice Details,Fatura detayları
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},kullanım ömrünün sonunda beklenen değer daha büyük ya da eşit olmalıdır {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Başla
+DocType: Hub Category,Hub Category,Hub Kategorisi
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Araç Sayısı
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,Yinelenen faturanın durdurulacağı tarih
 DocType: Employee Loan,Loan Amount,Kredi miktarı
 DocType: Program Enrollment,Self-Driving Vehicle,Kendinden Sürüşlü Araç
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Tedarikçi Puan Kartı Daimi
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Satır {0}: Malzeme Listesi Öğe için bulunamadı {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Satır {0}: Malzeme Listesi Öğe için bulunamadı {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Toplam ayrılan yapraklar {0} az olamaz dönem için önceden onaylanmış yaprakları {1} den
 DocType: Journal Entry,Accounts Receivable,Alacak hesapları
 DocType: Journal Entry,Accounts Receivable,Alacak hesapları
@@ -2505,7 +2543,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Ebeveyn Kursu (Ebeveyn Kursunun bir parçası değilse, boş bırakın)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Tüm çalışan tipleri için kabul ise boş bırakın
 DocType: Landed Cost Voucher,Distribute Charges Based On,Dağıt Masraflar Dayalı
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Mesai kartları
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Mesai kartları
 DocType: HR Settings,HR Settings,İK Ayarları
 DocType: HR Settings,HR Settings,İK Ayarları
 DocType: Salary Slip,net pay info,net ücret bilgisi
@@ -2517,7 +2555,7 @@
 DocType: Patient,B Positive,B Olumlu
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Satır # {0}: öğe sabit kıymet olarak Adet, 1 olmalıdır. Birden fazla qty için ayrı bir satır kullanın."
 DocType: Leave Block List Allow,Leave Block List Allow,İzin engel listesi müsaade eder
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Kısaltma boş veya boşluktan oluşamaz
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Kısaltma boş veya boşluktan oluşamaz
 DocType: Patient Medical Record,Patient Medical Record,Hasta Tıbbi Kayıt
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Sigara Grup Grup
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Spor
@@ -2539,10 +2577,11 @@
 DocType: POS Profile,Price List,Fiyat listesi
 DocType: POS Profile,Price List,Fiyat listesi
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} varsayılan Mali Yıldır. Değiştirmek için tarayıcınızı yenileyiniz
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Gider İddiaları
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Gider İddiaları
 DocType: Issue,Support,Destek
 DocType: Issue,Support,Destek
 ,BOM Search,Ürün Ağacı Arama
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Yayın için &quot;Stokta&quot; ya da &quot;Stokta Bulunmadı&quot; on Hub bu stokta mevcut bulunan stokları esas alın.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Kapanış (+ toplamları Açılış)
 DocType: Vehicle,Fuel Type,Yakıt tipi
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Şirket para belirtiniz
@@ -2554,17 +2593,17 @@
 DocType: Healthcare Settings,Remind Before,Daha Önce Hatırlat
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Ölçü Birimi Dönüşüm katsayısı satır {0} da gereklidir
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",Satır # {0}: Referans Doküman Türü Satış Sipariş biri Satış Fatura veya günlük girdisi olmalıdır
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",Satır # {0}: Referans Doküman Türü Satış Sipariş biri Satış Fatura veya günlük girdisi olmalıdır
 DocType: Salary Component,Deduction,Kesinti
 DocType: Salary Component,Deduction,Kesinti
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Satır {0}: From Time ve Zaman için zorunludur.
 DocType: Stock Reconciliation Item,Amount Difference,tutar Farkı
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Ürün Fiyatı için katma {0} Fiyat Listesi {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Ürün Fiyatı için katma {0} Fiyat Listesi {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Bu satış kişinin Çalışan Kimliği giriniz
 DocType: Territory,Classification of Customers by region,Bölgelere göre Müşteriler sınıflandırılması
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Fark Tutar sıfır olmalıdır
 DocType: Project,Gross Margin,Brüt Marj
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Önce Üretim Ürününü giriniz
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Önce Üretim Ürününü giriniz
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Hesaplanan Banka Hesap bakiyesi
 DocType: Normal Test Template,Normal Test Template,Normal Test Şablonu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Engelli kullanıcı
@@ -2575,7 +2614,7 @@
 DocType: Salary Slip,Total Deduction,Toplam Kesinti
 ,Production Analytics,Üretim Analytics
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,"Bu, bu Hastaya karşı işlemlere dayanmaktadır. Ayrıntılar için aşağıdaki zaman çizelgesine bakın"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Maliyet Güncelleme
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Maliyet Güncelleme
 DocType: Employee,Date of Birth,Doğum tarihi
 DocType: Employee,Date of Birth,Doğum tarihi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Ürün {0} zaten iade edilmiş
@@ -2583,14 +2622,15 @@
 DocType: Opportunity,Customer / Lead Address,Müşteri Adresi
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Tedarikçi Puan Kartı Kurulumu
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Uyarı: eki Geçersiz SSL sertifikası {0}
-DocType: Student Admission,Eligibility,uygunluk
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Değerlendirme Planı Adı
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Uyarı: eki Geçersiz SSL sertifikası {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","İlanlar iş, tüm kişileri ve daha fazla potansiyel müşteri olarak eklemek yardımcı"
 DocType: Production Order Operation,Actual Operation Time,Gerçek Çalışma Süresi
 DocType: Authorization Rule,Applicable To (User),(Kullanıcıya) Uygulanabilir
 DocType: Purchase Taxes and Charges,Deduct,Düşmek
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,İş Tanımı
 DocType: Student Applicant,Applied,Başvuruldu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Yeniden açın
 DocType: Sales Invoice Item,Qty as per Stock UOM,Her Stok Ölçü Birimi (birim) için miktar
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 Adı
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Dışında Özel Karakterler ""-"" ""."", ""#"", ve ""/"" serisi adlandırma izin verilmiyor"
@@ -2605,7 +2645,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Üretim Müdürü
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Seri No {0} {1} uyarınca garantide
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,İrsaliyeyi ambalajlara böl.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Gönderiler
+apps/erpnext/erpnext/hooks.py +107,Shipments,Gönderiler
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Toplam Ayrılan Tutar (Şirket Para Birimi)
 DocType: Purchase Order Item,To be delivered to customer,Müşteriye teslim edilmek üzere
 DocType: BOM,Scrap Material Cost,Hurda Malzeme Maliyet
@@ -2632,8 +2672,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Öğe Varyant Ayarları
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Firma Seçin ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Tüm bölümler için kabul ise boş bırakın
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","İstihdam (daimi, sözleşmeli, stajyer vb) Türleri."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} Ürün {1} için zorunludur
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","İstihdam (daimi, sözleşmeli, stajyer vb) Türleri."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} Ürün {1} için zorunludur
 DocType: Process Payroll,Fortnightly,iki haftada bir
 DocType: Currency Exchange,From Currency,Para biriminden
 DocType: Vital Signs,Weight (In Kilogram),Ağırlık (Kilogram cinsinden)
@@ -2656,12 +2696,12 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankacılık
 apps/erpnext/erpnext/utilities/activation.py +108,Add Timesheets,Zaman Çizelgesi ekle
 DocType: Vehicle Service,Service Item,servis Öğe
-DocType: Bank Guarantee,Bank Guarantee,Banka garantisi
-DocType: Bank Guarantee,Bank Guarantee,Banka garantisi
+DocType: Bank Guarantee,Bank Guarantee,Banka Garantisi
+DocType: Bank Guarantee,Bank Guarantee,Banka Garantisi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Programı almak için 'Program Oluştura' tıklayınız
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Aşağıdaki programları silerken hata oluştu:
 DocType: Bin,Ordered Quantity,Sipariş Edilen Miktar
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","örneğin """"İnşaatçılar için inşaat araçları"
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","örneğin """"İnşaatçılar için inşaat araçları"
 DocType: Grading Scale,Grading Scale Intervals,Not Verme Ölçeği Aralıkları
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {2} için muhasebe kaydı yalnızca bu para birimi ile yapılabilir: {3}
 DocType: Production Order,In Process,Süreci
@@ -2685,12 +2725,11 @@
 DocType: Purchase Invoice,With Payment of Tax,Vergi Ödeme İle
 DocType: Expense Claim Detail,Expense Claim Detail,Gideri Talebi Detayı
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Tedarikçi için TRIPLICATE
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Doğru hesabı seçin
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Doğru hesabı seçin
 DocType: Item,Weight UOM,Ağırlık Ölçü Birimi
 DocType: Salary Structure Employee,Salary Structure Employee,Maaş Yapısı Çalışan
 DocType: Patient,Blood Group,Kan grubu
 DocType: Patient,Blood Group,Kan grubu
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Bekliyor
 DocType: Course,Course Name,Ders Adı
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Belirli bir çalışanın izni uygulamalarını onaylayabilir Kullanıcılar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Ofis Gereçleri
@@ -2711,7 +2750,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Fiyat Listesi ayarlı değilse fiyatları gösterilmeyecektir
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Bu Nakliye Kural için bir ülke belirtin ya da Dünya Denizcilik&#39;in kontrol edin
 DocType: Stock Entry,Total Incoming Value,Toplam Gelen Değeri
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Bankamatik To gereklidir
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Bankamatik To gereklidir
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Zaman çizelgeleri ekip tarafından yapılan aktiviteler için zaman, maliyet ve fatura izlemenize yardımcı"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Satınalma Fiyat Listesi
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Tedarikçi puan kartı değişkenlerinin şablonları.
@@ -2722,7 +2761,8 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Sorumlu kişinin adını seçiniz
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknoloji
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknoloji
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Toplam Ödenmemiş: {0}
+DocType: Hub Settings,Unregister from Hub,Hub&#39;ın kaydını iptal et
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Toplam Ödenmemiş: {0}
 DocType: BOM Website Operation,BOM Website Operation,Ürün Ağacı Web Sitesi Operasyonu
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Mektubu Teklif
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Malzeme İstekleri (MRP) ve Üretim Emirleri oluşturun.
@@ -2735,7 +2775,9 @@
 DocType: Physician Schedule Time Slot,To Time,Zamana
 DocType: Authorization Rule,Approving Role (above authorized value),(Yetkili değerin üstünde) Rolü onaylanması
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Hesaba için Kredi bir Ödenecek hesabı olması gerekir
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM özyineleme: {0} ebeveyn veya çocuk olamaz {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Lütfen ödenen öğrenci başvurusu için zorunlu Öğrenci Kabulünü seçin
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM özyineleme: {0} ebeveyn veya çocuk olamaz {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Lütfen fiyatlandırma yayınlamak için bir fiyat listesi seçin
 DocType: Production Order Operation,Completed Qty,Tamamlanan Adet
 DocType: Production Order Operation,Completed Qty,Tamamlanan Adet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","{0}, sadece banka hesapları başka bir kredi girişine karşı bağlantılı olabilir için"
@@ -2750,18 +2792,20 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Öğe için gerekli Seri Numaraları {1}. Sağladığınız {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Güncel Değerleme Oranı
 DocType: Item,Customer Item Codes,Müşteri Ürün Kodları
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Değişim Kâr / Zarar
+DocType: Training Event,Advance,İlerlemek
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,tekrarlanan tekrar yapmak için.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Kambiyo Kâr / Zarar
 DocType: Opportunity,Lost Reason,Kayıp Nedeni
 DocType: Opportunity,Lost Reason,Kayıp Nedeni
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Yeni Adres
 DocType: Quality Inspection,Sample Size,Numune Miktarı
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Makbuz Belge giriniz
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Bütün Ürünler zaten faturalandırılmıştır
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Lütfen geçerlli bir 'durum nodan başlayarak' belirtiniz
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',Lütfen geçerlli bir 'durum nodan başlayarak' belirtiniz
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Daha fazla masraf Gruplar altında yapılabilir, ancak girişleri olmayan Gruplar karşı yapılabilir"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Kullanıcılar ve İzinler
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Üretim Siparişleri düzenlendi: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Üretim Siparişleri düzenlendi: {0}
 DocType: Branch,Branch,Şube
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Baskı ve Markalaşma
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Baskı ve Markalaşma
@@ -2769,23 +2813,22 @@
 DocType: Bin,Actual Quantity,Gerçek Miktar
 DocType: Shipping Rule,example: Next Day Shipping,Örnek: Bir sonraki gün sevkiyat
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Bulunamadı Seri No {0}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Abonelik {0} oldu
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Abonelik {0} oldu
 DocType: Fee Schedule Program,Fee Schedule Program,Ücret Programı Programı
 DocType: Fee Schedule Program,Student Batch,Öğrenci Toplu
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,Hasta = &#39;{0}&#39; siparişini sign_date desc limit 1 ile &#39;tabVital Signs&#39; den * seçin *
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Öğrenci olun
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Min Grade
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},{0} projesine katkıda bulunmak için davet edildiniz
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Hekim {0} &#39;da mevcut değil
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},{0} projesine katkıda bulunmak için davet edildiniz
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Hekim {0} &#39;da mevcut değil
 DocType: Leave Block List Date,Block Date,Blok Tarih
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},{0} doctype&#39;da özel alan Abonelik Kimliği ekleyin
 DocType: Purchase Receipt,Supplier Delivery Note,Tedarikçi Teslim Notu
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Şimdi Başvur
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Şimdi Başvur
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Gerçekleşen Miktar {0} / Bekleyen Miktar {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Gerçekleşen Miktar {0} / Bekleyen Miktar {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-ticaret GSTIN
 DocType: Sales Order,Not Delivered,Teslim Edilmedi
 DocType: Sales Order,Not Delivered,Teslim Edilmedi
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,"Beklenen Tarih, İşlem Tarihinden önce olamaz"
 ,Bank Clearance Summary,Banka Gümrükleme Özet
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Günlük, haftalık ve aylık e-posta özetleri oluştur."
 DocType: Appraisal Goal,Appraisal Goal,Değerlendirme Hedefi
@@ -2793,13 +2836,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Binalar
 DocType: Fee Schedule,Fee Structure,ücret Yapısı
 DocType: Timesheet Detail,Costing Amount,Maliyet Tutarı
-DocType: Student Admission,Application Fee,Başvuru ücreti
+DocType: Student Admission Program,Application Fee,Başvuru ücreti
 DocType: Process Payroll,Submit Salary Slip,Bordro Gönder
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Malzeme {0} için maksimum indirim {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Malzeme {0} için maksimum indirim {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Toplu İçe Aktar
 DocType: Sales Partner,Address & Contacts,Adresler ve Kontaklar
 DocType: SMS Log,Sender Name,Gönderenin Adı
 DocType: SMS Log,Sender Name,Gönderenin Adı
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Kriterlere göre sırala
 DocType: POS Profile,[Select],[Seç]
 DocType: POS Profile,[Select],[Seç]
 DocType: Vital Signs,Blood Pressure (diastolic),Kan Basıncı (diyastolik)
@@ -2809,14 +2853,14 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Sonraki İletişim Tarih geçmişte olamaz
 DocType: Company,For Reference Only.,Başvuru için sadece.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Hekim {0} {1} üzerinde mevcut değil
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Toplu İş Numarayı Seç
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Toplu İş Numarayı Seç
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Geçersiz {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-ret
 DocType: Fee Validity,Reference Inv,Referans Inv
 DocType: Sales Invoice Advance,Advance Amount,Avans miktarı
 DocType: Sales Invoice Advance,Advance Amount,Avans Tutarı
 DocType: Manufacturing Settings,Capacity Planning,Kapasite Planlama
-DocType: Supplier Quotation,Rounding Adjustment (Company Currency,Yuvarlama Ayarı (Şirket Para Birimi
+DocType: Supplier Quotation,Rounding Adjustment (Company Currency,Yuvarlama Ayarı (Şirket Kuru
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,'Tarihten itibaren' gereklidir
 DocType: Journal Entry,Reference Number,Referans Numarası
 DocType: Journal Entry,Reference Number,Referans Numarası
@@ -2828,18 +2872,18 @@
 DocType: Normal Test Items,Require Result Value,Sonuç Değerini Gerektir
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Durum No 0 olamaz
 DocType: Item,Show a slideshow at the top of the page,Sayfanın üstünde bir slayt gösterisi göster
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Ürün Ağaçları
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Mağazalar
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Mağazalar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Ürün Ağaçları
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Mağazalar
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Mağazalar
 DocType: Project Type,Projects Manager,Proje Yöneticisi
 DocType: Serial No,Delivery Time,İrsaliye Zamanı
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Yaşlandırma Temeli
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Dayalı Yaşlanma
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Randevu iptal edildi
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Randevu iptal edildi
 DocType: Item,End of Life,Kullanım süresi Sonu
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Gezi
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Gezi
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Verilen tarihler için çalışan {0} için bulunamadı aktif veya varsayılan Maaş Yapısı
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Gezi
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Gezi
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Verilen tarihler için çalışan {0} için bulunamadı aktif veya varsayılan Maaş Yapısı
 DocType: Leave Block List,Allow Users,Kullanıcılara izin ver
 DocType: Purchase Order,Customer Mobile No,Müşteri Mobil Hayır
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Yinelenen
@@ -2849,12 +2893,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Güncelleme Maliyeti
 DocType: Item Reorder,Item Reorder,Ürün Yeniden Sipariş
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Göster Maaş Kayma
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Transfer Malzemesi
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Transfer Malzemesi
 DocType: Fees,Send Payment Request,Ödeme Talebi Gönderme
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","İşlemleri, işlem maliyetlerini belirtiniz ve işlemlerinize kendilerine özgü işlem numaraları veriniz."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Bu belge ile sınırı üzerinde {0} {1} öğe için {4}. yapıyoruz aynı karşı başka {3} {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,kaydettikten sonra yinelenen ayarlayın
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Seç değişim miktarı hesabı
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Seç değişim miktarı hesabı
 DocType: Purchase Invoice,Price List Currency,Fiyat Listesi Para Birimi
 DocType: Purchase Invoice,Price List Currency,Fiyat Listesi Para Birimi
 DocType: Naming Series,User must always select,Kullanıcı her zaman seçmelidir
@@ -2878,7 +2922,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Çalışan
 DocType: Sample Collection,Collected Time,Toplanan Zaman
 DocType: Company,Sales Monthly History,Satış Aylık Tarihi
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Toplu İş Seç
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Toplu İş Seç
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} tam fatura edilir
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Hayati bulgular
 DocType: Training Event,End Time,Bitiş Zamanı
@@ -2887,16 +2931,18 @@
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Satış veya Satın Alma için standart sözleşme şartları.
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Satış veya Satın Alma için standart sözleşme şartları.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Dekont Grubu
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Bu randevuyu iptal etmek istediğinize emin misiniz?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,satış Hattı
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Maaş Bileşeni varsayılan hesabı ayarlamak Lütfen {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Gerekli Açık
 DocType: Rename Tool,File to Rename,Rename Dosya
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Satır Öğe için BOM seçiniz {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Satır Öğe için BOM seçiniz {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},"Hesap {0}, Şirket {1} Hesap Modu'yla eşleşmiyor: {2}"
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Ürün için yok Belirtilen BOM {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Bakım Programı {0} bu Satış Emri iptal edilmeden önce iptal edilmelidir
+DocType: POS Profile,Applicable for Users,Kullanıcılar için geçerlidir
 DocType: Notification Control,Expense Claim Approved,Gideri Talebi Onaylandı
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,çalışanın maaş Kuponu {0} zaten bu dönem için oluşturulan
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,çalışanın maaş Kuponu {0} zaten bu dönem için oluşturulan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Ecza
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Satın Öğeler Maliyeti
 DocType: Selling Settings,Sales Order Required,Satış Sipariş Gerekli
@@ -2924,6 +2970,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,organizasyon
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,organizasyon
 DocType: BOM Update Tool,BOM Update Tool,BOM Güncelleme Aracı
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Parti hesabı belirtilmedi, lütfen şirkette varsayılan parti hesabını ayarlayın"
 DocType: SG Creation Tool Course,Student Group Name,Öğrenci Grubu Adı
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Ücret Yaratmak
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Bu şirkete ait bütün işlemleri silmek istediğinizden emin olun. Ana veriler olduğu gibi kalacaktır. Bu işlem geri alınamaz.
@@ -2932,30 +2979,31 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) planlanan quanitity daha büyük olamaz ({2}) Üretim Sipariş {3}
 DocType: Shipping Rule,Shipping Rule Label,Kargo Kural Etiketi
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,kullanıcı Forumu
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Hammaddeler boş olamaz.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Stok güncelleme olamazdı, fatura damla nakliye öğe içeriyor."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Hammaddeler boş olamaz.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Stok güncelleme olamazdı, fatura damla nakliye öğe içeriyor."
 DocType: Lab Test Sample,Lab Test Sample,Laboratuvar Testi Örneği
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Hızlı Kayıt Girdisi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Herhangi bir Ürünye karşo BOM belirtildiyse oran değiştiremezsiniz.
+DocType: Restaurant,Invoice Series Prefix,Fatura Serisi Öneki
 DocType: Employee,Previous Work Experience,Önceki İş Deneyimi
 DocType: Employee,Previous Work Experience,Önceki İş Deneyimi
 DocType: Stock Entry,For Quantity,Miktar
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Satır {1} deki {0} Ürünler için planlanan miktarı giriniz
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Satır {1} deki {0} Ürünler için planlanan miktarı giriniz
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} teslim edilmedi
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Ürün istekleri.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Her mamül madde için ayrı üretim emri oluşturulacaktır.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} return belgesinde negatif olmalıdır
 ,Minutes to First Response for Issues,Sorunları İlk Tepki Dakika
 DocType: Purchase Invoice,Terms and Conditions1,Şartlar ve Koşullar 1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,Enstitünün adı kendisi için bu sistemi kuruyoruz.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,Enstitünün adı kendisi için bu sistemi kuruyoruz.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Muhasebe entry bu tarihe kadar dondurulmuş, kimse / aşağıda belirtilen rolü dışında girdisini değiştirin yapabilirsiniz."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Bakım programı oluşturmadan önce belgeyi kaydedin
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Tüm BOM&#39;larda güncellenen son fiyat
 DocType: Fee Schedule,Successful,Başarılı
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Proje Durumu
 DocType: UOM,Check this to disallow fractions. (for Nos),Kesirlere izin vermemek için işaretleyin (Numaralar için)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Aşağıdaki Üretim Siparişleri yaratıldı:
-DocType: Student Admission,Naming Series (for Student Applicant),Seri İsimlendirme (Öğrenci Başvuru için)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Aşağıdaki Üretim Siparişleri yaratıldı:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Seri İsimlendirme (Öğrenci Başvuru için)
 DocType: Delivery Note,Transporter Name,Taşıyıcı Adı
 DocType: Authorization Rule,Authorized Value,Yetkili Değer
 DocType: BOM,Show Operations,göster İşlemleri
@@ -2983,7 +3031,7 @@
 ,Employees working on a holiday,tatil çalışanlar
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mevcut İşaretle
 DocType: Project,% Complete Method,% Tamamlandı Yöntem
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,İlaç
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,İlaç
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Seri No {0} için bakım başlangıç tarihi teslim tarihinden önce olamaz
 DocType: Production Order,Actual End Date,Fiili Bitiş Tarihi
 DocType: Production Order,Actual End Date,Fiili Bitiş Tarihi
@@ -3004,14 +3052,14 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Onaylayan Kullanıcı kuralın uygulanabilir olduğu kullanıcı ile aynı olamaz
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Temel Oranı (Stok Ölçü Birimi göre)
 DocType: SMS Log,No of Requested SMS,İstenen SMS Sayısı
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,onaylanmış bırakın Uygulama kayıtları ile eşleşmiyor Öde Yapmadan
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,onaylanmış bırakın Uygulama kayıtları ile eşleşmiyor Öde Yapmadan
 DocType: Campaign,Campaign-.####,Kampanya-.####
 DocType: Campaign,Campaign-.####,Kampanya-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Sonraki adımlar
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Lütfen belirtilen ürünleri mümkün olan en rekabetçi fiyatlarla sununuz
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Fatura Oluştur
 DocType: Selling Settings,Auto close Opportunity after 15 days,15 gün sonra otomatik yakın Fırsat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} hesap kartının puan durumu nedeniyle {0} için Satın Alma Siparişlerine izin verilmiyor.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} hesap kartının puan durumu nedeniyle {0} için Satın Alma Siparişlerine izin verilmiyor.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,bitiş yılı
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Teklif/Müşteri Adayı yüzdesi
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Teklif/Müşteri Adayı yüzdesi
@@ -3019,6 +3067,7 @@
 DocType: Vital Signs,Nutrition Values,Beslenme Değerleri
 DocType: Lab Test Template,Is billable,Faturalandırılabilir mi
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",{0} Dr için her iki &quot;Hekim Programı&quot; ve Randevu Süresi &quot;ayarlanmalıdır.
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Bir komisyon için şirketlerin ürünlerini satan bir üçüncü taraf dağıtıcı / bayi / komisyon ajan / ortaklık / bayi.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} Satınalma siparişine karşı{1}
 DocType: Patient,Patient Demographics,Hasta Demografi
@@ -3068,7 +3117,6 @@
  10. Ekle veya Düşebilme: eklemek veya vergi kesintisi etmek isteyin."
 DocType: Homepage,Homepage,Anasayfa
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Hekimi seçin ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',update tabConsultation set fatura = &#39;{0}&#39; burada name = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Alınan Miktar
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Ücret Kayıtları düzenlendi - {0}
 DocType: Asset Category Account,Asset Category Account,Varlık Tipi Hesabı
@@ -3077,11 +3125,11 @@
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Kasa Hesabı
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Kasa Hesabı
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Sonraki İletişim Sorumlusu Müşteri Aday Kaydının E-posta Adresi ile aynı olamaz
-DocType: Tax Rule,Billing City,Fatura Şehir
+DocType: Tax Rule,Billing City,Fatura Şehri
 DocType: Asset,Manual,Manuel
 DocType: Salary Component Account,Salary Component Account,Maaş Bileşen Hesabı
 DocType: Global Defaults,Hide Currency Symbol,Para birimi simgesini gizle
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","Örneğin: Banka, Nakit, Kredi Kartı"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","Örneğin: Banka, Nakit, Kredi Kartı"
 DocType: Lead Source,Source Name,kaynak Adı
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""",Yetişkinlerde normal istirahat tansiyonu sistolik olarak yaklaşık 120 mmHg ve &quot;120/80 mmHg&quot; olarak kısaltılan 80 mmHg diastoliktir
 DocType: Journal Entry,Credit Note,Kredi mektubu
@@ -3104,17 +3152,17 @@
 DocType: Patient,Occupation,Meslek
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Satır {0}: Başlangıç tarihi bitiş tarihinden önce olmalıdır
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Toplam (Adet)
-DocType: Sales Invoice,This Document,Bu belge
 DocType: Installation Note Item,Installed Qty,Kurulan Miktar
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,"Bunun nedeni, telefonunuzdaki bazı geçersiz E-posta Adresleri olabilir."
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Sen ekledin
 DocType: Purchase Taxes and Charges,Parenttype,Ana Tip
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Eğitim Sonucu
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Eğitim Sonucu
 DocType: Purchase Invoice,Is Paid,Ücretli mi
 DocType: Salary Structure,Total Earning,Toplam Kazanç
 DocType: Salary Structure,Total Earning,Toplam Kazanç
 DocType: Purchase Receipt,Time at which materials were received,Malzemelerin alındığı zaman
 DocType: Stock Ledger Entry,Outgoing Rate,Giden Oranı
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Kuruluş Şube Alanı
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Kuruluş Şube Alanı
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,veya
 DocType: Sales Order,Billing Status,Fatura Durumu
 DocType: Sales Order,Billing Status,Fatura Durumu
@@ -3133,8 +3181,9 @@
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Şirket, Para Birimi, Mali yıl vb gibi standart değerleri ayarlayın"
 DocType: Payment Entry,Payment Type,Ödeme Şekli
 DocType: Payment Entry,Payment Type,Ödeme Şekli
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Lütfen {0} Öğe için bir Toplu İşareti seçin. Bu gereksinimi karşılayan tek bir toplu bulunamadı
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Lütfen {0} Öğe için bir Toplu İşareti seçin. Bu gereksinimi karşılayan tek bir toplu bulunamadı
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Lütfen {0} Öğe için bir Toplu İşareti seçin. Bu gereksinimi karşılayan tek bir toplu bulunamadı
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Lütfen {0} Öğe için bir Toplu İşareti seçin. Bu gereksinimi karşılayan tek bir toplu bulunamadı
+DocType: Hub Category,Parent Category,aile kategorisi
 DocType: Process Payroll,Select Employees,Seçin Çalışanlar
 DocType: Opportunity,Potential Sales Deal,Potansiyel Satış Fırsat
 DocType: Complaint,Complaints,Şikayetler
@@ -3175,7 +3224,7 @@
 DocType: Bin,Reserved Quantity,Ayrılan Miktar
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Lütfen geçerli e-posta adresini girin
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Lütfen geçerli e-posta adresini girin
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Lütfen sepetten bir öğe seçin
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Lütfen sepetten bir öğe seçin
 DocType: Landed Cost Voucher,Purchase Receipt Items,Satın alma makbuzu Ürünleri
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Özelleştirme Formları
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,bakiye
@@ -3186,16 +3235,16 @@
 DocType: Payment Request,Amount in customer's currency,Müşterinin para miktarı
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,İrsaliye
 DocType: Stock Reconciliation Item,Current Qty,Güncel Adet
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Tedarikçi Ekle
+DocType: Restaurant Menu,Restaurant Menu,Restaurant Menü
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Önceki
 DocType: Appraisal Goal,Key Responsibility Area,Kilit Sorumluluk Alanı
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Öğrenci Partileri Eğer öğrenciler için katılım, değerlendirme ve ücretler izlemenize yardımcı"
 DocType: Payment Entry,Total Allocated Amount,Toplam Ayrılan Tutar
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Sürekli envanter için varsayılan envanter hesabı ayarla
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Sürekli envanter için varsayılan envanter hesabı ayarla
 DocType: Item Reorder,Material Request Type,Malzeme İstek Türü
 DocType: Item Reorder,Material Request Type,Malzeme İstek Türü
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},{0} olarak maaş Accural günlük girdisi {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save",YerelDepolama dolu kurtarmadı
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save",YerelDepolama dolu kurtarmadı
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Satır {0}: Ölçü Birimi Dönüşüm Faktörü zorunludur
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Oda Kapasitesi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref
@@ -3242,17 +3291,19 @@
 DocType: Project,Task Completion,görev Tamamlama
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Stokta yok
 DocType: Appraisal,HR User,İK Kullanıcı
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Mahsup Vergi ve Harçlar
-apps/erpnext/erpnext/hooks.py +129,Issues,Sorunlar
+apps/erpnext/erpnext/hooks.py +138,Issues,Sorunlar
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Durum şunlardan biri olmalıdır {0}
 DocType: Sales Invoice,Debit To,Borç
+DocType: Restaurant Menu Item,Restaurant Menu Item,Restaurant Menü Öğesi
 DocType: Delivery Note,Required only for sample item.,Sadece örnek Ürün için gereklidir.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,İşlem sonrası gerçek Adet
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},arasında bulunamadı maaş kayma {0} ve {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},arasında bulunamadı maaş kayma {0} ve {1}
 ,Pending SO Items For Purchase Request,Satın Alma Talebi bekleyen PO Ürünleri
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Öğrenci Kabulleri
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} devre dışı
-DocType: Supplier,Billing Currency,Fatura Döviz
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Öğrenci Kabulleri
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} devre dışı
+DocType: Supplier,Billing Currency,Fatura Para Birimi
 DocType: Sales Invoice,SINV-RET-,SINV-ret
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Ekstra Büyük
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Toplam Yapraklar
@@ -3280,9 +3331,10 @@
 DocType: Stock Settings,Default Valuation Method,Standart Değerleme Yöntemi
 DocType: Stock Settings,Default Valuation Method,Standart Değerleme Yöntemi
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,ücret
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Güncelleme devam ediyor. Bu biraz zaman alabilir.
 DocType: Vehicle Log,Fuel Qty,yakıt Adet
 DocType: Production Order Operation,Planned Start Time,Planlanan Başlangıç Zamanı
-DocType: Course,Assessment,değerlendirme
+DocType: Course,Assessment,Değerlendirme
 DocType: Payment Entry Reference,Allocated,Ayrılan
 apps/erpnext/erpnext/config/accounts.py +275,Close Balance Sheet and book Profit or Loss.,Bilançoyu Kapat ve Kar veya Zararı ayır.
 DocType: Student Applicant,Application Status,Başvuru Durumu
@@ -3296,7 +3348,7 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Ayarlamak ve hedefleri izleyebilirsiniz böylece tüm satış işlemleri birden ** Satış Kişilerin ** karşı etiketlenmiş olabilir.
 ,S.O. No.,Satış Emri No
 ,S.O. No.,Satış Emri No
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Lütfen alan {0}'dan Müşteri oluşturunuz
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Lütfen alan {0}'dan Müşteri oluşturunuz
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Hastayı seçin
 DocType: Price List,Applicable for Countries,Ülkeler için geçerlidir
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Parametre Adı
@@ -3340,28 +3392,30 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Gider / Fark hesabı({0}), bir 'Kar veya Zarar' hesabı olmalıdır"
 DocType: Project,Copied From,Kopyalanacak
 DocType: Project,Copied From,Kopyalanacak
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Adı hatası: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Kıtlık
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Adı hatası: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,Kıtlık
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} şunlarla ilintili değil: {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Çalışan {0} için devam zaten işaretlenmiştir
 DocType: Packing Slip,If more than one package of the same type (for print),(Baskı için) aynı ambalajdan birden fazla varsa
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Lütfen Restoran Ayarları&#39;nda varsayılan müşteriyi ayarlayın
 ,Salary Register,Maaş Kayıt
 DocType: Warehouse,Parent Warehouse,Ana Depo
 DocType: C-Form Invoice Detail,Net Total,Net Toplam
 DocType: C-Form Invoice Detail,Net Total,Net Toplam
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Öğe {0} ve Proje {1} için varsayılan BOM bulunamadı
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Öğe {0} ve Proje {1} için varsayılan BOM bulunamadı
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Çeşitli kredi türlerini tanımlama
 DocType: Bin,FCFS Rate,FCFS Oranı
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Bekleyen Tutar
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),(Dakika cinsinden) Zaman
 DocType: Project Task,Working,Çalışıyor
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Stok Kuyruğu (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Mali yıl
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Mali yıl
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} Şirket {1}E ait değildir
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,{0} için ölçüt puanı işlevi çözülemedi. Formülün geçerli olduğundan emin olun.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,olarak Maliyet
 DocType: Healthcare Settings,Out Patient Settings,Out Patient Settings
-DocType: Account,Round Off,Tamamlamak
+DocType: Account,Round Off,Yuvarlama
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Miktar pozitif olmalı
 ,Requested Qty,İstenen miktar
 DocType: Tax Rule,Use for Shopping Cart,Alışveriş Sepeti kullanın
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Değer {0} özniteliği için {1} Öğe için Özellik Değerleri geçerli Öğe listesinde bulunmayan {2}
@@ -3370,7 +3424,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Masraflar orantılı seçiminize göre, madde qty veya miktarına göre dağıtılmış olacak"
 DocType: Maintenance Visit,Purposes,Amaçları
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,En az bir öğe dönüş belgesinde negatif miktar ile girilmelidir
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Ders Ekle
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Çalışma {0} iş istasyonunda herhangi bir mevcut çalışma saatleri daha uzun {1}, birden operasyonlarına operasyon yıkmak"
 ,Requested,Talep
 ,Requested,Talep
@@ -3384,6 +3437,8 @@
 DocType: Item,Total Projected Qty,Tahmini toplam Adet
 DocType: Monthly Distribution,Distribution Name,Dağıtım Adı
 DocType: Monthly Distribution,Distribution Name,Dağıtım Adı
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Tedarikçi&gt; Tedarikçi Türü
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","{1} {2} için muhasebe kayıtları yapmak için gerekli olan {0} Öğesi için değerleme oranı bulunamadı. Öğe {1} &#39;de sıfır değerleme oranı maddesi olarak işlem yapıyorsa, lütfen bunu {1} Öğe tablosunda belirtin. Aksi takdirde, lütfen öğe için gelen bir hisse senedi işlemini oluşturun veya Öğe kayıtlarında değerleme oranını belirtin ve daha sonra bu girişi göndermeyi / iptal etmeyi deneyin"
 DocType: Course,Course Code,Kurs kodu
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Ürün  {0} için gerekli Kalite Kontrol
 DocType: POS Settings,Use POS in Offline Mode,Çevrimdışı Modda POS kullanın
@@ -3395,14 +3450,14 @@
 DocType: Journal Entry Account,Sales Invoice,Satış Faturası
 DocType: Journal Entry Account,Sales Invoice,Satış Faturası
 DocType: Journal Entry Account,Party Balance,Parti Dengesi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,İndirim Açık Uygula seçiniz
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,İndirim Açık Uygula seçiniz
 DocType: Company,Default Receivable Account,Standart Alacak Hesabı
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Yukarıda seçilen kriterler için ödenen toplam maaş için banka girdisi oluşturun
 DocType: Physician,Physician Schedule,Hekim Çizelgesi
 DocType: Purchase Invoice,Deemed Export,İhracatın Dengesi
 DocType: Stock Entry,Material Transfer for Manufacture,Üretim için Materyal Transfer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,İndirim Yüzdesi bir Fiyat listesine veya bütün fiyat listelerine karşı uygulanabilir.
-DocType: Purchase Invoice,Half-yearly,Yarı Yıllık
+DocType: Subscription,Half-yearly,Yarı Yıllık
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Stokta Muhasebe Giriş
 DocType: Lab Test,LabTest Approver,LabTest Onaylayıcısı
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Zaten değerlendirme kriteri {} için değerlendirdiniz.
@@ -3436,15 +3491,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Extra Small
 DocType: Company,Standard Template,standart Şablon
 DocType: Training Event,Theory,teori
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Uyarı: İstenen Ürün Miktarı Minimum Sipariş Miktarından az
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Uyarı: İstenen Ürün Miktarı Minimum Sipariş Miktarından az
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Hesap {0} dondurulmuş
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Hesap {0} donduruldu
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Örgüte ait Hesap ayrı Planı Tüzel Kişilik / Yardımcı.
-DocType: Payment Request,Mute Email,Sessiz E-posta
+DocType: Payment Request,Mute Email,E-postayı Sessize Al
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Gıda, İçecek ve Tütün"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Gıda, İçecek ve Tütün"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Sadece karşı ödeme yapabilirsiniz faturalanmamış {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Komisyon oranı 100'den fazla olamaz
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Sadece karşı ödeme yapabilirsiniz faturalanmamış {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Komisyon oranı 100'den fazla olamaz
 DocType: Stock Entry,Subcontract,Alt sözleşme
 DocType: Stock Entry,Subcontract,Alt sözleşme
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,İlk {0} giriniz
@@ -3466,10 +3521,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Renk
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Değerlendirme Planı Kriterleri
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Satınalma Siparişlerini Önleme
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Duyarlı
 DocType: Patient Appointment,Scheduled,Planlandı
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Fiyat Teklif Talebi.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lütfen İnsan Kaynağında Çalışan Adlandırma Sistemini kurun&gt; HR Ayarları
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",&quot;Hayır&quot; ve &quot;Satış Öğe mı&quot; &quot;Stok Öğe mı&quot; nerede &quot;Evet&quot; ise Birimini seçmek ve başka hiçbir Ürün Paketi var Lütfen
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Müşteri Seç
 DocType: Student Log,Academic,Akademik
 DocType: Patient,Personal and Social History,Kişisel ve Sosyal Tarih
 DocType: Fee Schedule,Fee Breakup for each student,Her öğrenci için Ücret Ayrılması
@@ -3480,7 +3536,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Değerleme Oranı
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Dizel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Fiyat Listesi para birimi seçilmemiş
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Fiyat Listesi para birimi seçilmemiş
 apps/erpnext/erpnext/config/healthcare.py +46,Results,Sonuçlar
 ,Student Monthly Attendance Sheet,Öğrenci Aylık Hazirun Cetveli
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Çalışan {0} hali hazırda  {2} ve {3} arasında {1} için başvurmuştur
@@ -3497,7 +3553,7 @@
 DocType: Quality Inspection,Inspection Type,Muayene Türü
 DocType: Quality Inspection,Inspection Type,Muayene Türü
 DocType: Fee Validity,Visited yet,Henüz ziyaret edilmedi
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Mevcut işlem ile depolar grubuna dönüştürülemez.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Mevcut işlem ile depolar grubuna dönüştürülemez.
 DocType: Assessment Result Tool,Result HTML,Sonuç HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Tarihinde sona eriyor
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Öğrenci ekle
@@ -3530,19 +3586,18 @@
 DocType: Healthcare Settings,Result Printed,Basılmış Sonuç
 DocType: Asset Category Account,Depreciation Expense Account,Amortisman Giderleri Hesabı
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Deneme süresi
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},{0} görüntüleme
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},{0} görüntüleme
 DocType: Customer Group,Only leaf nodes are allowed in transaction,İşlemde yalnızca yaprak düğümlere izin verilir
 DocType: Expense Claim,Expense Approver,Gider Approver
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Satır {0}: Müşteriye karşı Advance kredi olmalı
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Grup grup dışı
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +58,Batch is mandatory in row {0},Toplu iş {0} satırında zorunludur
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +58,Batch is mandatory in row {0},Toplu iş {0} satırında zorunludur
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +58,Batch is mandatory in row {0},Parti {0}. satırda zorunludur
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +58,Batch is mandatory in row {0},Parti {0}. satırda zorunludur
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Tedarik edilen satın alma makbuzu ürünü
 DocType: Payment Entry,Pay,Ödeme
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,DateTime için
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Ders Programları silindi:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Sms teslim durumunu korumak için Günlükleri
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Satış Hedefini Ayarlayın
 DocType: Accounts Settings,Make Payment via Journal Entry,Dergi Giriş aracılığıyla Ödeme Yap
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Baskılı Açık
 DocType: Item,Inspection Required before Delivery,Muayene Teslim önce Gerekli
@@ -3550,7 +3605,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Bekleyen Etkinlikleri
 DocType: Patient Appointment,Reminded,hatırlatıldı
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Kuruluşunuz
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Kuruluşunuz
 DocType: Fee Component,Fees Category,Ücretler Kategori
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Lütfen Boşaltma tarihi girin.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
@@ -3563,7 +3618,7 @@
 DocType: Company,Chart Of Accounts Template,Hesaplar Şablon Grafik
 DocType: Attendance,Attendance Date,Katılım Tarihi
 DocType: Attendance,Attendance Date,Katılım Tarihi
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Ürün Fiyatı {0} Fiyat Listesi için güncellenmiş {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Ürün Fiyatı {0} Fiyat Listesi için güncellenmiş {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Kazanç ve Kesintiye göre Maaş Aralığı.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Alt hesapları bulunan hesaplar muhasebe defterine dönüştürülemez.
 DocType: Purchase Invoice Item,Accepted Warehouse,Kabul edilen depo
@@ -3585,10 +3640,11 @@
 ,Employee Birthday,Çalışan Doğum Günü
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Öğrenci Toplu Katılım Aracı
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,sınır Çapraz
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Zamanlanmış Upto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Girişim Sermayesi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Girişim Sermayesi
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Bu &#39;Akademik Yılı&#39; ile akademik bir terim {0} ve &#39;Vadeli Adı&#39; {1} zaten var. Bu girişleri değiştirmek ve tekrar deneyin.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","öğe {0} karşı varolan işlemler vardır gibi, değerini değiştiremezsiniz {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","öğe {0} karşı varolan işlemler vardır gibi, değerini değiştiremezsiniz {1}"
 DocType: UOM,Must be Whole Number,Tam Numara olmalı
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Tahsis Edilen Yeni İzinler (Günler)
 DocType: Purchase Invoice,Invoice Copy,Fatura Kopyalama
@@ -3601,7 +3657,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Fatura Numarası
 DocType: Shopping Cart Settings,Orders,Siparişler
 DocType: Employee Leave Approver,Leave Approver,İzin Onaylayan
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Lütfen bir parti seçin
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Lütfen bir parti seçin
 DocType: Assessment Group,Assessment Group Name,Değerlendirme Grubu Adı
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Üretim için Materyal Transfer
 DocType: Expense Claim,"A user with ""Expense Approver"" role","""Gider Onaylayıcısı"" rolü ile bir kullanıcı"
@@ -3616,7 +3672,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Dönem Kapanış Girişi
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Bölümü seçin ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Maliyet Merkezi mevcut işlemlere gruba dönüştürülemez
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Miktar {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Miktar {0} {1} {2} {3}
 DocType: Account,Depreciation,Amortisman
 DocType: Account,Depreciation,Amortisman
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Tedarikçi (ler)
@@ -3629,10 +3685,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,Ödeme Girişler {0}-un bağlantılıdır
 DocType: GL Entry,Voucher No,Föy No
 ,Lead Owner Efficiency,Kurşun Sahibi Verimliliği
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,En popüler
 DocType: Leave Allocation,Leave Allocation,İzin Tahsisi
 DocType: Payment Request,Recipient Message And Payment Details,Alıcı Mesaj Ve Ödeme Ayrıntıları
 DocType: Training Event,Trainer Email,eğitmen E-posta
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Malzeme Talepleri {0} oluşturuldu
+DocType: Restaurant Reservation,No of People,İnsanlar Sayısı
 DocType: Production Planning Tool,Include sub-contracted raw materials,taşeronluk hammadde Dahil
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Şart veya sözleşmeler şablonu.
 DocType: Purchase Invoice,Address and Contact,Adresler ve Kontaklar
@@ -3641,10 +3699,11 @@
 DocType: Supplier,Last Day of the Next Month,Sonraki Ay Son Gün
 DocType: Support Settings,Auto close Issue after 7 days,7 gün sonra otomatik yakın Sayı
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Önce tahsis edilemez bırakın {0}, izin dengesi zaten carry iletilen gelecek izin tahsisi kayıtlarında olduğu gibi {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Not: nedeniyle / Referans Tarihi {0} gün izin müşteri kredi günü aştığı (ler)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Not: nedeniyle / Referans Tarihi {0} gün izin müşteri kredi günü aştığı (ler)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Öğrenci Başvuru
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ALIŞVERİŞ MADDESİ İÇİN ORİJİNAL
 DocType: Asset Category Account,Accumulated Depreciation Account,Birikmiş Amortisman Hesabı
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Bu e-posta otomatik olarak oluşturuldu
 DocType: Stock Settings,Freeze Stock Entries,Donmuş Stok Girdileri
 DocType: Program Enrollment,Boarding Student,Yatılı Öğrenci
 DocType: Asset,Expected Value After Useful Life,Kullanım süresi sonunda beklenen değer
@@ -3652,7 +3711,7 @@
 DocType: Activity Cost,Billing Rate,Fatura Oranı
 ,Qty to Deliver,Teslim Edilecek Miktar
 ,Stock Analytics,Stok Analizi
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Operasyon boş bırakılamaz
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Operasyon boş bırakılamaz
 DocType: Maintenance Visit Purpose,Against Document Detail No,Karşılık Belge Detay No.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Parti Tipi zorunludur
 DocType: Quality Inspection,Outgoing,Giden
@@ -3679,7 +3738,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Etkinliğe Dayalı Grup için öğrencileri manuel olarak seçin
 DocType: Journal Entry,User Remark,Kullanıcı Açıklaması
 DocType: Lead,Market Segment,Pazar Segmenti
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},"Ödenen Tutar, toplam negatif ödenmemiş miktardan daha fazla olamaz {0}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},"Ödenen Tutar, toplam negatif ödenmemiş miktardan daha fazla olamaz {0}"
 DocType: Supplier Scorecard Period,Variables,Değişkenler
 DocType: Employee Internal Work History,Employee Internal Work History,Çalışan Dahili İş Geçmişi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Kapanış (Dr)
@@ -3687,7 +3746,7 @@
 DocType: Cheque Print Template,Cheque Size,Çek Boyutu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +232,Serial No {0} not in stock,Seri No {0} stokta değil
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Satış işlemleri için vergi şablonu.
-DocType: Sales Invoice,Write Off Outstanding Amount,Bekleyen Miktarı Sil
+DocType: Sales Invoice,Write Off Outstanding Amount,Vadesi Dolmuş Şüpheli Alacak Miktarı
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},"Hesap {0}, Şirket {1} ile eşleşmiyor"
 DocType: School Settings,Current Academic Year,Mevcut Akademik Yıl
 DocType: School Settings,Current Academic Year,Mevcut Akademik Yıl
@@ -3711,22 +3770,23 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Güncellemeler Alın
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Hesap {2} Şirket&#39;e ait olmayan {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Malzeme Talebi {0} iptal edilmiş veya durdurulmuştur
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Yönetim bırakın
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Yönetim bırakın
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Hesap Grubu
 DocType: Sales Order,Fully Delivered,Tamamen Teslim Edilmiş
 DocType: Lead,Lower Income,Alt Gelir
 DocType: Lead,Lower Income,Alt Gelir
+DocType: Restaurant Order Entry,Current Order,Geçerli Sipariş
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Kaynak ve hedef depo Satır {0} için aynu olamaz
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",Bu Stok Mutabakatı bir Hesap Açılış Kaydı olduğundan fark hesabının aktif ya da pasif bir hesap tipi olması gerekmektedir
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Bir Kullanım Tutarı Kredi Miktarı daha büyük olamaz {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Programlara Git
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Ürüni {0} için Satınalma Siparişi numarası gerekli
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Üretim Sipariş oluşturulmadı
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Üretim Sipariş oluşturulmadı
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Tarihten itibaren ' Tarihine Kadar' dan sonra olmalıdır
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},öğrenci olarak durumunu değiştirmek olamaz {0} öğrenci uygulaması ile bağlantılı {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},öğrenci olarak durumunu değiştirmek olamaz {0} öğrenci uygulaması ile bağlantılı {1}
 DocType: Asset,Fully Depreciated,Değer kaybı tamamlanmış
 ,Stock Projected Qty,Öngörülen Stok Miktarı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Müşteri {0} projeye ait değil {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Müşteri {0} projeye ait değil {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,İşaretlenmiş Devamlılık HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Alıntılar, müşterilerinize gönderilen adres teklifler önerileri şunlardır"
 DocType: Sales Order,Customer's Purchase Order,Müşterinin Sipariş
@@ -3737,9 +3797,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Amortisman Sayısı rezervasyonu ayarlayın
 DocType: Supplier Scorecard Period,Calculations,Hesaplamalar
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Değer veya Miktar
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Productions Siparişler için yükseltilmiş olamaz:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Productions Siparişler için yükseltilmiş olamaz:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Dakika
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Dakika
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Lütfen Kurulum&gt; Ayarlar&gt; Adlandırma Serisi aracılığıyla {0} için Adlandırma Serisini ayarlayın.
 DocType: Purchase Invoice,Purchase Taxes and Charges,Alım Vergi ve Harçları
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Tedarikçiler Listesine Git
 ,Qty to Receive,Alınacak Miktar
@@ -3754,7 +3815,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Hesabın için Kredi bir bilanço hesabı olmalıdır
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Bütün Tedarikçi Tipleri
 DocType: Global Defaults,Disable In Words,Words devre dışı bırak
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,Ürün Kodu zorunludur çünkü Ürün otomatik olarak numaralandırmaz
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,Ürün Kodu zorunludur çünkü Ürün otomatik olarak numaralandırmaz
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Teklif {0} {1} türünde
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Bakım Programı Ürünü
 DocType: Sales Order,%  Delivered,% Teslim Edildi
@@ -3778,24 +3839,27 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Açılış Bakiyesi Hisse
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N-
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Mutabakat
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Kalan
 DocType: Appraisal,Appraisal,Appraisal:Değerlendirme
 DocType: Purchase Invoice,GST Details,GST Detayları
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},{0} tedarikçisine e-posta gönderildi
+DocType: Item,Default Sales Unit of Measure,Varsayılan Öğe Satış Birimi
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Tarih tekrarlanır
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Yetkili imza
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Bırakın onaylayan biri olmalıdır {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Bırakın onaylayan biri olmalıdır {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Ücret Yarat
-DocType: Hub Settings,Seller Email,Satıcı E-
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Toplam Satınalma Maliyeti (Satın Alma Fatura üzerinden)
 DocType: Training Event,Start Time,Başlangıç Zamanı
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,",Miktar Seç"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,",Miktar Seç"
 DocType: Customs Tariff Number,Customs Tariff Number,Gümrük Tarife numarası
 DocType: Patient Appointment,Patient Appointment,Hasta Randevusu
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Onaylama Rolü kuralın uygulanabilir olduğu rolle aynı olamaz
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Bu e-posta Digest aboneliğinden çık
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Bu e-posta Digest aboneliğinden çık
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Tarafından Satıcı Alın
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{1} öğesi için {0} bulunamadı
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Kurslara Git
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Gönderilen Mesaj
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Gönderilen Mesaj
@@ -3811,11 +3875,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Hesap {0} yok
 DocType: Project,Project Type,Proje Tipi
 DocType: Project,Project Type,Proje Tipi
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Bu Görev için Çocuk Görevi var. Bu görevi silemezsiniz.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Hedef miktarı veya hedef tutarı zorunludur.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Çeşitli faaliyetler Maliyeti
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Daha fazla sonuç yok
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Çeşitli faaliyetler Maliyeti
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Olaylar ayarlanması {0}, Satış Kişilerin altına bağlı çalışan bir kullanıcı kimliğine sahip olmadığından {1}"
 DocType: Timesheet,Billing Details,Fatura Detayları
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Kaynak ve hedef depo farklı olmalıdır
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Kaynak ve hedef depo farklı olmalıdır
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},{0} dan eski stok işlemlerini güncellemeye izin yok
 DocType: Purchase Invoice Item,PR Detail,PR Detayı
 DocType: Sales Order,Fully Billed,Tam Faturalı
@@ -3844,7 +3910,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Elektronik transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Tümünü kontrol
 DocType: Vehicle Log,Invoice Ref,fatura Ref
-DocType: Purchase Order,Recurring Order,Tekrarlayan Sipariş
 DocType: Company,Default Income Account,Standart Gelir Hesabı
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Müşteri Grup / Müşteri
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Müşteri Grup / Müşteri
@@ -3859,10 +3924,10 @@
 DocType: Patient,A Negative,Negatif
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Hiçbir şey daha göstermek için.
 DocType: Lead,From Customer,Müşteriden
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Aramalar
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Aramalar
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Aramalar
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Aramalar
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Ürün
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,Partiler
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,Partiler
 DocType: Project,Total Costing Amount (via Time Logs),Toplam Maliyet Tutarı (Zaman Kayıtlar üzerinden)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Ücreti Ayarla
 DocType: Purchase Order Item Supplied,Stock UOM,Stok Ölçü Birimi
@@ -3889,17 +3954,16 @@
 DocType: School Settings,Current Academic Term,Mevcut Akademik Dönem
 DocType: School Settings,Current Academic Term,Mevcut Akademik Dönem
 DocType: Sales Order,Not Billed,Faturalanmamış
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Her iki depo da aynı şirkete ait olmalıdır
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Her iki depo da aynı şirkete ait olmalıdır
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Hiç kişiler Henüz eklenmiş.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Bindirilmiş Maliyet Tutarı
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Tedarikçiler tarafından artırılan faturalar
-DocType: POS Profile,Write Off Account,Hesabı Kapat
+DocType: POS Profile,Write Off Account,Şüpheli Alacaklar Hesabı
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +78,Debit Note Amt,Borç Notu Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,İndirim Tutarı
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,İndirim Tutarı
 DocType: Purchase Invoice,Return Against Purchase Invoice,Karşı Satınalma Fatura Dönüş
 DocType: Item,Warranty Period (in days),(Gün) Garanti Süresi
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',`tabPatient Randevuyu &#39;güncelle set sales_invoice =&#39; {0} &#39;burada name =&#39; {1} &#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Guardian1 ile İlişkisi
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Faaliyetlerden Kaynaklanan Net Nakit
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Madde 4
@@ -3908,8 +3972,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Kayıt Girdisi Hesabı
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Öğrenci Grubu
 DocType: Shopping Cart Settings,Quotation Series,Teklif Serisi
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Bir Ürün aynı isimle bulunuyorsa ({0}), lütfen madde grubunun veya maddenin adını değiştirin"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,müşteri seçiniz
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Bir Ürün aynı isimle bulunuyorsa ({0}), lütfen madde grubunun veya maddenin adını değiştirin"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,müşteri seçiniz
 DocType: C-Form,I,ben
 DocType: Company,Asset Depreciation Cost Center,Varlık Değer Kaybı Maliyet Merkezi
 DocType: Sales Order Item,Sales Order Date,Satış Sipariş Tarihi
@@ -3919,6 +3983,7 @@
 DocType: Assessment Plan,Assessment Plan,Değerlendirme Planı
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Müşteri {0} oluşturuldu.
 DocType: Stock Settings,Limit Percent,Sınır Yüzde
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Şu an herhangi bir depoda stok yok
 ,Payment Period Based On Invoice Date,Fatura Tarihine Dayalı Ödeme Süresi
 DocType: Sample Collection,No. of print,Baskı sayısı
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Eksik Döviz Kurları {0}
@@ -3974,18 +4039,19 @@
 DocType: Patient,Marital Status,Medeni durum
 DocType: Stock Settings,Auto Material Request,Otomatik Malzeme Talebi
 DocType: Stock Settings,Auto Material Request,Otomatik Malzeme Talebi
-DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Depo itibaren Available at Toplu Adet
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Depodaki mevcut Parti Miktarı
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Brüt Ücret - Toplam Kesintisi - Kredi Geri Ödeme
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,Cari BOM ve Yeni BOM aynı olamaz
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,Cari BOM ve Yeni BOM aynı olamaz
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Maaş Kayma kimliği
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Maaş Kayma kimliği
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Emeklilik Tarihi katılım tarihinden büyük olmalıdır
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,kursu planlaması yaparken hatalar vardı:
 DocType: Sales Invoice,Against Income Account,Karşılık Gelir Hesabı
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Teslim Edildi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Öğe {0}: Sıralı qty {1} minimum sipariş qty {2} (Öğe tanımlanan) daha az olamaz.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Öğe {0}: Sıralı qty {1} minimum sipariş qty {2} (Öğe tanımlanan) daha az olamaz.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Aylık Dağılımı Yüzde
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Lütfen başka bir kullanıcı olarak giriş yapınız.
 DocType: Territory,Territory Targets,Bölge Hedefleri
 DocType: Territory,Territory Targets,Bölge Hedefleri
 DocType: Delivery Note,Transporter Info,Taşıyıcı Bilgisi
@@ -3994,13 +4060,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Aynı Tedarikçi birden fazla kez girilmiş
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Brüt Kar / Zarar
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Tedarik edilen Satınalma Siparişi Ürünü
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Şirket Adı olamaz
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Şirket Adı olamaz
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Baskı şablonları için antetli kağıtlar
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Baskı Şablonları için başlıklar, örneğin Proforma Fatura"
 DocType: Program Enrollment,Walking,Yürüme
 DocType: Student Guardian,Student Guardian,Öğrenci Guardian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Değerleme tipi ücretleri dahil olarak işaretlenmiş olamaz
 DocType: POS Profile,Update Stock,Stok güncelle
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,abonelikte
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Ürünler için farklı Ölçü Birimi yanlış (Toplam) net ağırlıklı değere yol açacaktır. Net ağırlıklı değerin aynı olduğundan emin olun.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Ürün Ağacı Oranı
 DocType: Asset,Journal Entry for Scrap,Hurda için kayıt girişi
@@ -4020,13 +4087,13 @@
 DocType: Expense Claim,Task,Görev
 DocType: Expense Claim,Task,Görev
 DocType: Purchase Taxes and Charges,Reference Row #,Referans Satırı #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Toplu numarası Ürün için zorunludur {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},{0} ürünü için parti numarası zorunludur
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Bu bir kök satış kişisidir ve düzenlenemez.
 DocType: Salary Detail,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ","Seçilirse, bu bileşen içinde belirtilen veya hesaplanan değer kazanç veya kesintilere katkıda bulunmaz. Bununla birlikte, bu değer, eklenebilecek veya düşülebilecek diğer bileşenler tarafından referans alınabilir."
 DocType: Salary Detail,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ","Seçilirse, bu bileşen içinde belirtilen veya hesaplanan değer kazanç veya kesintilere katkıda bulunmaz. Bununla birlikte, bu değer, eklenebilecek veya düşülebilecek diğer bileşenler tarafından referans alınabilir."
 ,Stock Ledger,Stok defteri
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Puan: {0}
-DocType: Company,Exchange Gain / Loss Account,Değişim Kâr / Zarar Hesabı
+DocType: Company,Exchange Gain / Loss Account,Kambiyo Kâr / Zarar Hesabı
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Çalışan ve Seyirci
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Amaç şunlardan biri olmalıdır: {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Fill the form and save it,Formu doldurun ve kaydedin
@@ -4047,21 +4114,23 @@
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Güncel İş Olanakları
 DocType: Company,Stock Adjustment Account,Stok Düzeltme Hesabı
 DocType: Company,Stock Adjustment Account,Stok Düzeltme Hesabı
-apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Silmek
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Şüpheli Alacak
 DocType: Timesheet Detail,Operation ID,Operasyon Kimliği
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Sistem kullanıcı (giriş) kimliği, bütün İK formları için varsayılan olacaktır"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: gönderen {1}
 DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Tüm Malzeme Listesi&#39;nde en son fiyatı güncellemek için bekletildi. Birkaç dakika sürebilir.
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Yeni Hesap Adı. Not: Müşteriler ve Tedarikçiler için hesapları oluşturmak etmeyin
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Tüm Malzeme Listesi&#39;nde en son fiyatı güncellemek için bekletildi. Birkaç dakika sürebilir.
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Yeni Hesabın Adı. Not: Müşteriler ve Tedarikçiler için hesap oluşturmayın
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Ülke bilgisi varsayılan adres şablonları
 DocType: Sales Order Item,Supplier delivers to Customer,Tedarikçi Müşteriye teslim
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/Item/{0}) stokta yok
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Due / Referans Tarihi sonra olamaz {0}
+,Sales Payment Summary,Satış Ödeme Özeti
+DocType: Restaurant,Restaurant,Restoran
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Due / Referans Tarihi sonra olamaz {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,İçeri/Dışarı Aktar
 DocType: Patient,Account Details,Hesap Detayları
 DocType: Patient,Account Details,Hesap Detayları
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Hiçbir öğrenci Bulundu
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Hiçbir öğrenci Bulundu
 DocType: Medical Department,Medical Department,Tıp Departmanı
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Tedarikçi Puan Kartı Puanlama Kriterleri
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Fatura Gönderme Tarihi
@@ -4072,8 +4141,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Partiyi seçmeden önce Gönderme Tarihi seçiniz
 DocType: Program Enrollment,School House,Okul Evi
 DocType: Serial No,Out of AMC,Çıkış AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Lütfen Teklifler&#39;i seçin
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Lütfen Teklifler&#39;i seçin
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Lütfen Teklifler&#39;i seçin
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Lütfen Teklifler&#39;i seçin
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Rezervasyon amortismanları sayısı amortismanlar Toplam Sayısı fazla olamaz
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Bakım Ziyareti Yapın
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,Satış Usta Müdürü {0} role sahip kullanıcıya irtibata geçiniz
@@ -4082,10 +4151,10 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Şirket (değil Müşteri veya alanı) usta.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,"Bu, bu Öğrencinin katılımıyla dayanmaktadır"
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Içinde öğrenci yok
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Daha fazla ürün ekle veya Tam formu aç
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Daha fazla ürün ekle veya Tam formu aç
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Satış Emri iptal edilmeden önce İrsaliyeler {0} iptal edilmelidir
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Kullanıcılara Git
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Ödenen Tutar ve Düşülen Tutar toplamı Genel Toplamdan fazla olamaz
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Ödenen Tutar ve Şüpheli Alacak Tutarı toplamı Genel Toplamdan fazla olamaz
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} Ürün {1} için geçerli bir parti numarası değildir
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Not: İzin tipi {0} için yeterli izin günü kalmamış
 apps/erpnext/erpnext/regional/india/utils.py +15,Invalid GSTIN or Enter NA for Unregistered,Kayıtlı Olmadığı İçin Geçersiz GSTIN veya Gir NA
@@ -4104,39 +4173,42 @@
 DocType: Fee Schedule,Fee Schedule,Ücret tarifesi
 DocType: Hub Settings,Publish Availability,Durumunu Yayınla
 DocType: Company,Create Chart Of Accounts Based On,Hesaplar Tabanlı On Of grafik oluşturma
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Grup dışı olarak dönüştürülemez. Çocuk Görevleri var.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Doğum Tarihi bugünkünden daha büyük olamaz.
 ,Stock Ageing,Stok Yaşlanması
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Öğrenci {0} öğrenci başvuru karşı mevcut {1}
-DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Yuvarlama Ayarı (Şirket Para Birimi)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Zaman çizelgesi
+DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Yuvarlama Ayarı (Şirket Kuru)
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Zaman çizelgesi
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' devre dışı
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Açık olarak ayarlayın
 DocType: Cheque Print Template,Scanned Cheque,taranan Çek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Gönderilmesi işlemlere Kişiler otomatik e-postalar gönderin.
 DocType: Timesheet,Total Billable Amount,Toplam Faturalandırılabilir Tutar
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Madde 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Sipariş girişi
 DocType: Purchase Order,Customer Contact Email,Müşteri İletişim E-mail
 DocType: Warranty Claim,Item and Warranty Details,Ürün ve Garanti Detayları
 DocType: Sales Team,Contribution (%),Katkı Payı (%)
 DocType: Sales Team,Contribution (%),Katkı Payı (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"'Nakit veya Banka Hesabı' belirtilmediğinden ötürü, Ödeme Girdisi oluşturulmayacaktır"
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,{0} projesi zaten mevcut
 DocType: Medical Department,Nursing User,Hemşirelik kullanıcısı
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Sorumluluklar
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Bu fiyat teklifinin geçerlilik süresi sona erdi.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Bu fiyat teklifinin geçerlilik süresi sona erdi.
 DocType: Expense Claim Account,Expense Claim Account,Gider Talep Hesabı
-DocType: Accounts Settings,Allow Stale Exchange Rates,Eski Döviz Kurlarına İzin Vermek
+DocType: Accounts Settings,Allow Stale Exchange Rates,Eski Döviz Kurlarına İzin Ver
 DocType: Sales Person,Sales Person Name,Satış Personeli Adı
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Tabloya en az 1 fatura girin
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Kullanıcı Ekle
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Kullanıcı Ekle
 DocType: POS Item Group,Item Group,Ürün Grubu
 DocType: POS Item Group,Item Group,Ürün Grubu
 DocType: Item,Safety Stock,Emniyet Stoğu
 DocType: Healthcare Settings,Healthcare Settings,Sağlık Ayarları
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Bir görev için ilerleme% 100&#39;den fazla olamaz.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Bir görev için ilerleme% 100&#39;den fazla olamaz.
 DocType: Stock Reconciliation Item,Before reconciliation,Mutabakat öncesinde
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Şu kişiye {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Eklenen Vergi ve Harçlar (Şirket Para Birimi)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Ürün Vergi Satırı {0} Vergi Gelir Gider veya Ödenebilir türde hesabı olmalıdır.
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Ürün Vergi Satırı {0} Vergi Gelir Gider veya Ödenebilir türde hesabı olmalıdır.
 DocType: Sales Order,Partly Billed,Kısmen Faturalandı
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Öğe {0} Sabit Kıymet Öğe olmalı
 DocType: Item,Default BOM,Standart BOM
@@ -4153,6 +4225,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,Değişken
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,İrsaliyeden
 DocType: Student,Student Email Address,Öğrenci E-Posta Adresi
+DocType: Item,Hub Warehouse,Hub Ambarları
 DocType: Physician Schedule Time Slot,From Time,Zamandan
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Stokta var:
 DocType: Notification Control,Custom Message,Özel Mesaj
@@ -4163,10 +4236,11 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Öğrenci Adresi
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Öğrenci Adresi
 DocType: Purchase Invoice,Price List Exchange Rate,Fiyat Listesi Döviz Kuru
+DocType: POS Profile,POS Profile Name,POS Profil Adı
 DocType: Purchase Invoice Item,Rate,Birim Fiyat
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Stajyer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Stajyer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Adres Adı
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Adres Adı
 DocType: Stock Entry,From BOM,BOM Gönderen
 DocType: Assessment Code,Assessment Code,Değerlendirme Kodu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Temel
@@ -4184,13 +4258,14 @@
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Havayolu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Havayolu
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Sayı Malzeme
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Sayı Malzeme
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Yinelenen oluşturulurken bir hata oluştu
 DocType: Material Request Item,For Warehouse,Depo için
 DocType: Material Request Item,For Warehouse,Depo için
 DocType: Employee,Offer Date,Teklif Tarihi
 DocType: Employee,Offer Date,Teklif Tarihi
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Özlü Sözler
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Çevrimdışı moddasınız. Bağlantıyı sağlayıncaya kadar yenileneme yapamayacaksınız.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Çevrimdışı moddasınız. Bağlantıyı sağlayıncaya kadar yenileneme yapamayacaksınız.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Hiçbir Öğrenci Grupları oluşturuldu.
 DocType: Purchase Invoice Item,Serial No,Seri No
 DocType: Purchase Invoice Item,Serial No,Seri No
@@ -4201,20 +4276,21 @@
 DocType: Salary Slip,Total Working Hours,Toplam Çalışma Saatleri
 DocType: Subscription,Next Schedule Date,Sonraki Program Tarihi
 DocType: Stock Entry,Including items for sub assemblies,Alt montajlar için öğeleri içeren
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Enter değeri pozitif olmalıdır
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Bütün Bölgeler
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Enter değeri pozitif olmalıdır
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Bütün Bölgeler
 DocType: Purchase Invoice,Items,Ürünler
 DocType: Purchase Invoice,Items,Ürünler
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Öğrenci zaten kayıtlı olduğu.
 DocType: Fiscal Year,Year Name,Yıl Adı
 DocType: Fiscal Year,Year Name,Yıl Adı
 DocType: Process Payroll,Process Payroll,Süreç Bordrosu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Bu ayda çalışma günlerinden daha fazla tatil vardır.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Bu ayda çalışma günlerinden daha fazla tatil vardır.
 DocType: Product Bundle Item,Product Bundle Item,Ürün Paketi Ürün
 DocType: Sales Partner,Sales Partner Name,Satış Ortağı Adı
 DocType: Sales Partner,Sales Partner Name,Satış Ortağı Adı
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Fiyat Teklif Talepleri
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Fiyat Teklif Talepleri
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimum Fatura Tutarı
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hematoloji
 DocType: Normal Test Items,Normal Test Items,Normal Test Öğeleri
 DocType: Student Language,Student Language,Öğrenci Dili
 apps/erpnext/erpnext/config/selling.py +23,Customers,Müşteriler
@@ -4226,10 +4302,11 @@
 DocType: Issue,Opening Time,Açılış Zamanı
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Tarih aralığı gerekli
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Teminatlar ve Emtia Borsaları
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant için Ölçü Varsayılan Birim &#39;{0}&#39; Şablon aynı olmalıdır &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant için Ölçü Varsayılan Birim &#39;{0}&#39; Şablon aynı olmalıdır &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Tabanlı hesaplayın
 DocType: Delivery Note Item,From Warehouse,Atölyesi&#39;nden
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Malzeme Listesine Öğe Yok İmalat için
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Malzeme Listesine Öğe Yok İmalat için
+DocType: Restaurant,Default Customer,Varsayılan Müşteri
 DocType: Assessment Plan,Supervisor Name,Süpervizör Adı
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Aynı gün için randevu oluşturulup oluşturulmadığını teyit etmeyin
 DocType: Program Enrollment Course,Program Enrollment Course,Program Kayıt Kursu
@@ -4261,7 +4338,7 @@
 DocType: Payment Entry,Internal Transfer,İç transfer
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Bu hesap için çocuk hesabı var. Bu hesabı silemezsiniz.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Hedef miktarı veya hedef tutarı zorunludur
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Ürün {0} için Varsayılan BOM mevcut değildir
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Ürün {0} için Varsayılan BOM mevcut değildir
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,İlk Gönderme Tarihi seçiniz
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Tarih Açılış Tarihi Kapanış önce olmalıdır
 DocType: Leave Control Panel,Carry Forward,Nakletmek
@@ -4305,6 +4382,7 @@
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,Muhasebe Tabloları
 DocType: Drug Prescription,Hour,Saat
 DocType: Drug Prescription,Hour,Saat
+DocType: Restaurant Order Entry,Last Sales Invoice,Son Satış Faturası
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Yeni Seri No Warehouse olamaz. Depo Stok girişiyle veya alım makbuzuyla ayarlanmalıdır
 DocType: Lead,Lead Type,Talep Yaratma Tipi
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Blok Tarihlerdeki çıkışları onaylama yetkiniz yok
@@ -4313,7 +4391,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} tarafından onaylanmış
 DocType: Item,Default Material Request Type,Standart Malzeme Talebi Tipi
 DocType: Supplier Scorecard,Evaluation Period,Değerlendirme Süresi
-apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,bilinmeyen
+apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,Bilinmeyen
 DocType: Shipping Rule,Shipping Rule Conditions,Kargo Kural Koşulları
 DocType: Purchase Invoice,Export Type,İhracat Şekli
 DocType: BOM Update Tool,The new BOM after replacement,Değiştirilmesinden sonra yeni BOM
@@ -4344,51 +4422,50 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Kullanıcılar oluştur
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,Gram
 DocType: Supplier Scorecard,Per Month,Her ay
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Üretim Miktar 0&#39;dan büyük olmalıdır.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Üretim Miktar 0&#39;dan büyük olmalıdır.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Bakım araması için ziyaret raporu.
 DocType: Stock Entry,Update Rate and Availability,Güncelleme Oranı ve Kullanılabilirlik
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Sipariş edilen miktara karşı alabileceğiniz veya teslim edebileceğiniz daha fazla miktar. Örneğin, 100 birim sipariş verdiyseniz,izniniz %10'dur, bu durumda 110 birim almaya izniniz vardır."
 DocType: POS Customer Group,Customer Group,Müşteri Grubu
 DocType: POS Customer Group,Customer Group,Müşteri Grubu
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Yeni Toplu İşlem Kimliği (İsteğe Bağlı)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Yeni Toplu İşlem Kimliği (İsteğe Bağlı)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Yeni Toplu İşlem Kimliği (İsteğe Bağlı)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Yeni Toplu İşlem Kimliği (İsteğe Bağlı)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Ürün {0} için gider hesabı zorunludur
 DocType: BOM,Website Description,Web Sitesi Açıklaması
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Özkaynak Net Değişim
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,en yeni
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Lütfen önce iptal edin: Satınalma Faturası {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-posta adresi zaten var, benzersiz olmalıdır {0}"
 DocType: Serial No,AMC Expiry Date,AMC Bitiş Tarihi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,Makbuz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,Makbuz
 ,Sales Register,Satış Kayıt
 ,Sales Register,Satış Kayıt
 DocType: Daily Work Summary Settings Company,Send Emails At,At e-postalar gönderin
 DocType: Quotation,Quotation Lost Reason,Teklif Kayıp Nedeni
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Domain seçin
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',select * from tabPatient where name = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},İşlem referans yok {0} tarihli {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},İşlem referans yok {0} tarihli {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Düzenlenecek bir şey yok
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Form Görünümü
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Bu ay ve bekleyen aktiviteler için Özet
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Form Görünümü
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Bu ay ve bekleyen aktiviteler için Özet
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.",Kendiniz dışındaki kullanıcılarınızı kuruluşunuza ekleyin.
 DocType: Customer Group,Customer Group Name,Müşteri Grup Adı
 DocType: Customer Group,Customer Group Name,Müşteri Grup Adı
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Henüz müşteri yok!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Henüz müşteri yok!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Nakit Akım Tablosu
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kredi Miktarı Maksimum Kredi Tutarı geçemez {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Lisans
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},C-Form bu Fatura {0} kaldırın lütfen {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},C-Form bu Fatura {0} kaldırın lütfen {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Geçen mali yılın bakiyelerini bu mali yıla dahil etmek isterseniz Lütfen İleri Taşıyı seçin
 DocType: GL Entry,Against Voucher Type,Dekont Tipi karşılığı
 DocType: Physician,Phone (R),Telefon (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Zaman aralıkları eklendi
 DocType: Item,Attributes,Nitelikler
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Şablonu Etkinleştir
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Lütfen Kurulum&gt; Ayarlar&gt; Adlandırma Serisi aracılığıyla {0} için Adlandırma Serisini ayarlayın.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Borç Silme Hesabı Girin
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Lütfen Şüpheli Alacak Hesabını Girin
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Son Sipariş Tarihi
 DocType: Patient,B Negative,B Negatif
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Hesap {0} yapan şirkete ait değil {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,{0} satırındaki Seri Numaraları Teslimat Notu ile eşleşmiyor
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,{0} satırındaki Seri Numaraları Teslimat Notu ile eşleşmiyor
 DocType: Student,Guardian Details,Guardian Detayları
 DocType: C-Form,C-Form,C-Formu
 DocType: C-Form,C-Form,C-Formu
@@ -4396,11 +4473,13 @@
 DocType: Vehicle,Chassis No,şasi No
 DocType: Payment Request,Initiated,Başlatılan
 DocType: Production Order,Planned Start Date,Planlanan Başlangıç Tarihi
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Lütfen bir BOM seçin
 DocType: Serial No,Creation Document Type,Oluşturulan Belge Türü
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Bitiş tarihi başlangıç tarihinden daha büyük olmalıdır
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Bitiş tarihi başlangıç tarihinden daha büyük olmalıdır
 DocType: Leave Type,Is Encash,Bozdurulmuş
 DocType: Leave Allocation,New Leaves Allocated,Tahsis Edilen Yeni İzinler
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Proje bilgisi verileri Teklifimiz için mevcut değildir
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Bitiş tarihi
 DocType: Project,Expected End Date,Beklenen Bitiş Tarihi
 DocType: Project,Expected End Date,Beklenen Bitiş Tarihi
 DocType: Budget Account,Budget Amount,Bütçe Miktarı
@@ -4409,36 +4488,38 @@
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Ticari
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Ticari
 DocType: Patient,Alcohol Current Use,Alkol Kullanımı
+DocType: Student Admission Program,Student Admission Program,Öğrenci Kabul Programı
 DocType: Payment Entry,Account Paid To,Hesap şuna ödenmiş
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Veli Öğe {0} Stok Öğe olmamalıdır
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Bütün Ürünler veya Hizmetler.
-DocType: Expense Claim,More Details,Daha Fazla Bilgi
-DocType: Expense Claim,More Details,Daha Fazla Bilgi
+DocType: Expense Claim,More Details,Daha Fazla Detay
+DocType: Expense Claim,More Details,Daha Fazla Detay
 DocType: Supplier Quotation,Supplier Address,Tedarikçi Adresi
 DocType: Supplier Quotation,Supplier Address,Tedarikçi Adresi
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} {2} {3} için {1} bütçe hesabı {4} tanımlıdır. Bütçe {5} kadar aşılacaktır.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Satır {0}: Hesap türü 'Sabit Varlık' olmalıdır
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Çıkış Miktarı
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Bir Satış için nakliye miktarı hesaplama için kuralları
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,ve engellenmemiş Engelli
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Seri zorunludur
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansal Hizmetler
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansal Hizmetler
 DocType: Student Sibling,Student ID,Öğrenci Kimliği
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Zaman Kayıtlar faaliyetleri Türleri
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Tedarikçi Email
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Zaman Kayıtlar faaliyetleri Türleri
 DocType: Tax Rule,Sales,Satışlar
 DocType: Stock Entry Detail,Basic Amount,Temel Tutar
 DocType: Training Event,Exam,sınav
 DocType: Complaint,Complaint,şikâyet
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Stok Ürünü {0} için depo gereklidir
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Stok Ürünü {0} için depo gereklidir
 DocType: Leave Allocation,Unused leaves,Kullanılmayan yapraklar
-DocType: Patient,Alcohol Past Use,Alkol Past Use
+DocType: Patient,Alcohol Past Use,Alkol Geçmiş Kullanım
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Fatura Kamu
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transfer
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),(Alt-montajlar dahil) patlamış BOM'ları getir
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Transfer
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),(Alt-montajlar dahil) patlamış BOM'ları getir
 DocType: Authorization Rule,Applicable To (Employee),(Çalışana) uygulanabilir
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Due Date zorunludur
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Due Date zorunludur
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Attribute için Artım {0} 0 olamaz
 DocType: Journal Entry,Pay To / Recd From,Gönderen/Alınan
 DocType: Naming Series,Setup Series,Kurulum Serisi
@@ -4446,6 +4527,7 @@
 DocType: Payment Reconciliation,To Invoice Date,Tarihi Faturaya
 DocType: Supplier,Contact HTML,İletişim HTML
 ,Inactive Customers,Etkin olmayan müşteriler
+DocType: Student Admission Program,Maximum Age,Maksimum Yaş
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Satın Alma İrsaliyeleri
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Fiyatlandırma Kuralı Nasıl Uygulanır?
@@ -4466,6 +4548,7 @@
 DocType: GL Entry,Remarks,Açıklamalar
 DocType: Payment Entry,Account Paid From,Hesap şuradan ödenmiş
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Hammadde Malzeme Kodu
+DocType: Task,Parent Task,Ana Görev
 DocType: Journal Entry,Write Off Based On,Dayalı Borç Silme
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Müşteri Adayı Oluştur
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Baskı ve Kırtasiye
@@ -4474,20 +4557,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Maaş zaten {0} ve {1}, bu tarih aralığında olamaz başvuru süresini bırakın arasındaki dönem için işlenmiş."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Bir Seri No için kurulum kaydı.
 DocType: Guardian Interest,Guardian Interest,Guardian İlgi
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,POS Faturaları için varsayılan değerleri ayarlayın
 apps/erpnext/erpnext/config/hr.py +177,Training,Eğitim
 DocType: Timesheet,Employee Detail,Çalışan Detay
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 E-posta Kimliği
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 E-posta Kimliği
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,Sonraki tarih günü ve eşit olmalıdır Ay gününde tekrarlayın
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Sonraki tarih günü ve eşit olmalıdır Ay gününde tekrarlayın
 DocType: Lab Prescription,Test Code,Test Kodu
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Web sitesi ana sayfası için Ayarlar
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},{1} puan kartının statüsü nedeniyle {0} için tekliflere izin verilmiyor.
 DocType: Offer Letter,Awaiting Response,Tepki bekliyor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Yukarıdaki
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Toplam Tutar {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Geçersiz özellik {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Toplam Tutar {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Geçersiz özellik {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Standart dışı borç hesabı ise
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Aynı öğe birden çok kez girildi. {liste}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Lütfen &#39;Tüm Değerlendirme Grupları&#39; dışındaki değerlendirme grubunu seçin.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},{0} Satırı: {1} öğesi için maliyet merkezi gerekiyor
 DocType: Training Event Employee,Optional,İsteğe bağlı
@@ -4513,12 +4596,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},Ürün{2} için {0} {1}: Maliyert Merkezi zorunludur
 DocType: Vehicle,Policy No,Politika yok
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Ürün Bundle Öğeleri alın
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Stok {0} öğesine karşı bulunduğundan, varyant özelliklerini etkinleştiremezsiniz"
 DocType: Asset,Straight Line,Düz Çizgi
 DocType: Project User,Project User,Proje Kullanıcısı
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Bölünmüş
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Bölünmüş
 DocType: GL Entry,Is Advance,Avans
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,tarihinden  Tarihine kadar katılım zorunludur
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,'Taşeron var mı' alanına Evet veya Hayır giriniz
+DocType: Item,Default Purchase Unit of Measure,Varsayılan Satın Alma Önlemi Birimi
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Son İletişim Tarihi
 DocType: Sales Team,Contact No.,İletişim No
 DocType: Bank Reconciliation,Payment Entries,Ödeme Girişler
@@ -4526,7 +4611,6 @@
 DocType: Production Order,Check if material transfer entry is not required,Malzeme aktarım girişi gerekli değil mi kontrol edin
 DocType: Production Order,Check if material transfer entry is not required,Malzeme aktarım girişi gerekli değil mi kontrol edin
 DocType: Program Enrollment Tool,Get Students From,Gönderen Öğrenciler alın
-DocType: Hub Settings,Seller Country,Satıcı Ülke
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Web sitesinde Ürünleri yayınlayın
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,gruplar halinde Grup öğrencilerinizin
 DocType: Authorization Rule,Authorization Rule,Yetki Kuralı
@@ -4538,8 +4622,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Satış Vergi ve Harçlar Şablon
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Toplam (Kredi)
 DocType: Repayment Schedule,Payment Date,Ödeme tarihi
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Yeni Toplu İşlem Miktarı
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Yeni Toplu İşlem Miktarı
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Yeni Toplu İşlem Miktarı
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Yeni Toplu İşlem Miktarı
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Giyim ve Aksesuar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Giyim ve Aksesuar
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,Ağırlıklı skor fonksiyonunu çözemedim. Formülün geçerli olduğundan emin olun.
@@ -4557,9 +4641,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Satış Komisyonu
 DocType: Offer Letter Term,Value / Description,Değer / Açıklama
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Satır {0}: Sabit Varlık {1} gönderilemedi, zaten {2}"
-DocType: Tax Rule,Billing Country,Fatura Ülke
+DocType: Tax Rule,Billing Country,Fatura Ülkesi
 DocType: Purchase Order Item,Expected Delivery Date,Beklenen Teslim Tarihi
 DocType: Purchase Order Item,Expected Delivery Date,Beklenen Teslim Tarihi
+DocType: Restaurant Order Entry,Restaurant Order Entry,Restoran Siparişi Girişi
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Borç ve Kredi {0} # için eşit değil {1}. Fark {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Eğlence Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Eğlence Giderleri
@@ -4574,10 +4659,11 @@
 DocType: Vehicle,Last Carbon Check,Son Karbon Kontrol
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Yasal Giderler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Yasal Giderler
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Lütfen satırdaki miktarı seçin
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Lütfen satırdaki miktarı seçin
 DocType: Purchase Invoice,Posting Time,Gönderme Zamanı
 DocType: Purchase Invoice,Posting Time,Gönderme Zamanı
 DocType: Timesheet,% Amount Billed,% Faturalanan Tutar
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.","&quot;Randevu Süresi&quot; Dr {0} için ayarlanmadı, Hekim ustasına ekleyin."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefon Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefon Giderleri
 DocType: Sales Partner,Logo,Logo
@@ -4593,6 +4679,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Seyahat Giderleri
 DocType: Maintenance Visit,Breakdown,Arıza
 DocType: Maintenance Visit,Breakdown,Arıza
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},{0} doctype&#39;da özel alan Aboneliği ekleyin
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Hesap: {0} para ile: {1} seçilemez
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","BOM maliyetini, son değerleme oranı / fiyat listesi oranı / son hammadde alım oranı temel alınarak, Zamanlayıcı aracılığıyla otomatik olarak güncelleyin."
 DocType: Bank Reconciliation Detail,Cheque Date,Çek Tarih
@@ -4619,7 +4706,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Toplam Fatura Tutarı (Zaman Kayıtlar üzerinden)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Tedarikçi Kimliği
 DocType: Payment Request,Payment Gateway Details,Ödeme Gateway Detayları
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Miktar 0&#39;dan büyük olmalıdır
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Miktar 0&#39;dan büyük olmalıdır
 DocType: Journal Entry,Cash Entry,Nakit Girişi
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Çocuk düğümleri sadece &#39;Grup&#39; tür düğüm altında oluşturulabilir
 DocType: Leave Application,Half Day Date,Yarım Gün Tarih
@@ -4640,12 +4727,14 @@
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Tüm Kişiler.
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Tüm Kişiler.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Şirket Kısaltma
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Kullanıcı {0} yok
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Kullanıcı {0} yok
 DocType: Subscription,SUB-,ALT-
 DocType: Item Attribute Value,Abbreviation,Kısaltma
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Ödeme giriş zaten var
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} Yetkili değil {0} sınırı aşar
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Maaş Şablon Alanı.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Patoloji
+DocType: Restaurant Order Entry,Restaurant Table,Restaurant Masası
 DocType: Leave Type,Max Days Leave Allowed,En fazla izin günü
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Alışveriş sepeti için ayarla Vergi Kural
 DocType: Purchase Invoice,Taxes and Charges Added,Eklenen Vergi ve Harçlar
@@ -4657,10 +4746,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Müşterilere veya Taleplere verilen fiyatlar.
 DocType: Stock Settings,Role Allowed to edit frozen stock,dondurulmuş stok düzenlemeye İzinli rol
 ,Territory Target Variance Item Group-Wise,Bölge Hedef Varyans Ürün Grubu
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Bütün Müşteri Grupları
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Bütün Müşteri Grupları
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Aylık Birikim
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} zorunludur. {1} ve {2} için Döviz kaydı oluşturulmayabilir.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Vergi şablonu zorunludur.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Vergi şablonu zorunludur.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Hesap {0}: Ana hesap {1} yok
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Fiyat Listesi Oranı (Şirket para birimi)
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Fiyat Listesi Oranı (Şirket para birimi)
@@ -4689,13 +4778,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Ürün Vergi Detayları
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Enstitü Kısaltma
 ,Item-wise Price List Rate,Ürün bilgisi Fiyat Listesi Oranı
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Tedarikçi Teklifi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Tedarikçi Teklifi
 DocType: Quotation,In Words will be visible once you save the Quotation.,fiyat teklifini kaydettiğinizde görünür olacaktır
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Miktar ({0}) {1} sırasındaki kesir olamaz
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Miktar ({0}) {1} sırasındaki kesir olamaz
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Barkod {0} zaten Ürün {1} de kullanılmış
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},{0} barkodu zaten {1} ürününde kullanılmış
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Nakliye maliyetleri ekleme  Kuralları.
 DocType: Item,Opening Stock,Açılış Stok
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Müşteri gereklidir
@@ -4718,9 +4807,8 @@
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Üretim için verilen emirler.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Mali Yıl Seçin ...
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Mali Yıl Seçin ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS Profil POS Girişi yapmak için gerekli
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS Profil POS Girişi yapmak için gerekli
 DocType: Program Enrollment Tool,Enroll Students,Öğrenciler kayıt
-DocType: Hub Settings,Name Token,İsim Jetonu
 DocType: Lab Test,Approved Date,Onaylanmış Tarih
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standart Satış
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standart Satış
@@ -4743,7 +4831,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,İnsan Kaynakları
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Ödeme Mutabakat Ödemesi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Vergi Varlıkları
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Üretim Siparişi {0} oldu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Üretim Siparişi {0} oldu
 DocType: BOM Item,BOM No,BOM numarası
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Günlük girdisi {0} {1} ya da zaten başka bir çeki karşı eşleşen hesabınız yok
@@ -4766,8 +4854,8 @@
 DocType: Currency Exchange,To Currency,Para Birimine
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Blok günleri için aşağıdaki kullanıcıların izin uygulamalarını onaylamasına izin ver.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Gider talebi Türleri.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},"{0} öğesinin satış oranı, onun {1} değerinden düşük. Satış oranı atleast olmalıdır {2}"
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},"{0} öğesinin satış oranı, onun {1} değerinden düşük. Satış oranı atleast olmalıdır {2}"
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},"{0} öğesinin satış oranı, onun {1} değerinden düşük. Satış oranı atleast olmalıdır {2}"
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},"{0} öğesinin satış oranı, onun {1} değerinden düşük. Satış oranı atleast olmalıdır {2}"
 DocType: Item,Taxes,Vergiler
 DocType: Item,Taxes,Vergiler
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Ödendi ancak Teslim Edilmedi
@@ -4785,15 +4873,15 @@
 DocType: Maintenance Visit,Customer Feedback,Müşteri Görüşleri
 DocType: Account,Expense,Gider
 DocType: Account,Expense,Gider
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Skor Maksimum Skor daha büyük olamaz
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Skor Maksimum Skor daha büyük olamaz
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Müşteriler ve Tedarikçiler
 DocType: Item Attribute,From Range,Sınıfımızda
 DocType: BOM,Set rate of sub-assembly item based on BOM,BOM&#39;a dayalı alt montaj malzemesinin oranını ayarlama
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Formül ya da durumun söz dizimi hatası: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Formül ya da durumun söz dizimi hatası: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Günlük Çalışma Özet Ayarları Şirket
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,Stok ürünü olmadığından Ürün {0} yok sayıldı
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Daha fazla işlem için bu Üretim Siparişini Gönderin.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Daha fazla işlem için bu Üretim Siparişini Gönderin.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",Belli bir işlemde Fiyatlandırma kuralını uygulamamak için bütün mevcut Fiyatlandırma Kuralları devre dışı bırakılmalıdır.
 DocType: Assessment Group,Parent Assessment Group,Veli Değerlendirme Grubu
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,İşler
@@ -4811,13 +4899,14 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Gruplandırılmış &#39;Şirket&#39; ise lütfen şirket filtresini boş olarak ayarlayın.
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Gönderme Tarihi gelecek tarih olamaz
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Satır # {0}: Seri No {1} ile eşleşmiyor {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,tekrarlanan üretmek için
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Mazeret İzni
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Laboratuvar Testi UOM.
-DocType: Batch,Batch ID,Seri Kimliği
+DocType: Batch,Batch ID,Parti numarası
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Not: {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Not: {0}
 ,Delivery Note Trends,Teslimat Analizi
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Bu Haftanın Özeti
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Bu Haftanın Özeti
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Stok Adet
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Hesap: {0} sadece Stok İşlemleri üzerinden güncellenebilir
 DocType: Student Group Creation Tool,Get Courses,Kursları alın
@@ -4831,7 +4920,6 @@
 DocType: Purchase Order,To Bill,Faturala
 DocType: Material Request,% Ordered,% Sipariş edildi
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Kurs Tabanlı Öğrenci Grubu için, Kurs, Kayıt Edilen Program Kayıt Kurslarından her öğrenci için geçerli olacak."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","virgülle ayırarak giriniz E-posta Adresi, fatura belirli bir tarihte otomatik olarak postalanacaktır"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Parça başı iş
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Parça başı iş
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Ort. Alış Oranı
@@ -4846,7 +4934,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Ürün {0} Seri No kurulumu değildir. Sütun boş bırakılmalıdır
 DocType: Accounts Settings,Accounts Settings,Hesap ayarları
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,Onayla
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Gönderilecek Sonuç Yok
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Gönderilecek Sonuç Yok
 DocType: Customer,Sales Partner and Commission,Satış Ortağı ve Komisyon
 DocType: Employee Loan,Rate of Interest (%) / Year,İlgi (%) / Yılın Oranı
 ,Project Quantity,Proje Miktarı
@@ -4858,31 +4946,31 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Siyah
 DocType: BOM Explosion Item,BOM Explosion Item,Ürün Ağacı Patlatılmış Malzemeler
 DocType: Account,Auditor,Denetçi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} ürün üretildi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} ürün üretildi
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Daha fazla bilgi edin
 DocType: Cheque Print Template,Distance from top edge,üst kenarından uzaklık
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Fiyat Listesi {0} devre dışı veya yok
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Fiyat Listesi {0} devre dışı veya yok
 DocType: Purchase Invoice,Return,Dönüş
 DocType: Production Order Operation,Production Order Operation,Üretim Sipariş Operasyonu
 DocType: Pricing Rule,Disable,Devre Dışı Bırak
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Ödeme Modu ödeme yapmak için gereklidir
 DocType: Project Task,Pending Review,Bekleyen İnceleme
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Randevular ve İstişareler
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} Küme {2} &#39;ye kayıtlı değil
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} Küme {2} &#39;ye kayıtlı değil
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","{0} varlığı hurda edilemez, {1} da var olarak gözüküyor"
 DocType: Task,Total Expense Claim (via Expense Claim),(Gider İstem aracılığıyla) Toplam Gider İddiası
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Gelmedi işaretle
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Satır {0}: BOM # Döviz {1} seçilen para birimi eşit olmalıdır {2}
 DocType: Journal Entry Account,Exchange Rate,Döviz Kuru
 DocType: Patient,Additional information regarding the patient,Hastaya ilişkin ek bilgiler
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Satış Sipariş {0} teslim edilmedi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Satış Sipariş {0} teslim edilmedi
 DocType: Homepage,Tag Line,Etiket Hattı
 DocType: Fee Component,Fee Component,ücret Bileşeni
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Filo yönetimi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Öğelerden ekle
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Filo yönetimi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Öğelerden ekle
 DocType: Cheque Print Template,Regular,Düzenli
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Bütün Değerlendirme Kriterleri Toplam weightage% 100 olmalıdır
-DocType: BOM,Last Purchase Rate,Son Satış Fiyatı
+DocType: Purchase Order Item,Last Purchase Rate,Son Satış Fiyatı
 DocType: Account,Asset,Varlık
 DocType: Account,Asset,Varlık
 DocType: Project Task,Task ID,Görev Kimliği
@@ -4890,27 +4978,26 @@
 DocType: Lab Test,Mobile,seyyar
 ,Sales Person-wise Transaction Summary,Satış Personeli bilgisi İşlem Özeti
 DocType: Training Event,Contact Number,İletişim numarası
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Depo {0} yoktur
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext Hub için Kayıt
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Depo {0} yoktur
 DocType: Monthly Distribution,Monthly Distribution Percentages,Aylık Dağılımı Yüzdeler
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Seçilen öğe Toplu olamaz
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Değerleme oranı için muhasebe kayıtlarını yapmasını gerektiren durumlar Madde {0} için bulunamadı {1} {2}. öğesi örnek bir öğe olarak işlem yapan ise {1}, {1} Öğe tabloda bu belirtin. Aksi takdirde, / submiting deneyin bu girişi iptal sonra Öğe kaydındaki madde veya söz değerleme oranı için gelen stok hareket oluşturmak ve lütfen"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% malzeme bu İrsaliye karşılığında teslim edildi
+DocType: Training Event,Has Certificate,Sertifikalı
 DocType: Project,Customer Details,Müşteri Detayları
 DocType: Project,Customer Details,Müşteri Detayları
 DocType: Employee,Reports to,Raporlar
 DocType: Employee,Reports to,Raporlar
-,Unpaid Expense Claim,Ödenmemiş Gider İddiası
+,Unpaid Expense Claim,Ödenmemiş Gider Talebi
 DocType: Payment Entry,Paid Amount,Ödenen Tutar
 DocType: Payment Entry,Paid Amount,Ödenen Tutar
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Satış Döngüsünü Keşfedin
 DocType: Assessment Plan,Supervisor,supervisor
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,İnternet üzerinden
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,İnternet üzerinden
 ,Available Stock for Packing Items,Ambalajlama Ürünleri için mevcut stok
 DocType: Item Variant,Item Variant,Öğe Varyant
 DocType: Assessment Result Tool,Assessment Result Tool,Değerlendirme Sonucu Aracı
 DocType: BOM Scrap Item,BOM Scrap Item,Ürün Ağacı Hurda Kalemi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Gönderilen emir silinemez
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Gönderilen emir silinemez
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Bakiye borçlu durumdaysa alacaklı duruma çevrilemez.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Kalite Yönetimi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Kalite Yönetimi
@@ -4932,7 +5019,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Sıfır Değerleme Oranına izin ver
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Sıfır Değerleme Oranına izin ver
 DocType: Training Event Employee,Invited,davetli
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Verilen tarihler için çalışan {0} bulundu birden çok etkin Maaş Yapıları
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Verilen tarihler için çalışan {0} bulundu birden çok etkin Maaş Yapıları
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Kur Gateway hesapları.
 DocType: Employee,Employment Type,İstihdam Tipi
 DocType: Employee,Employment Type,İstihdam Tipi
@@ -4947,7 +5034,7 @@
 DocType: Employee,Notice (days),Bildirimi (gün)
 DocType: Employee,Notice (days),Bildirimi (gün)
 DocType: Tax Rule,Sales Tax Template,Satış Vergisi Şablon
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,fatura kaydetmek için öğeleri seçin
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,fatura kaydetmek için öğeleri seçin
 DocType: Employee,Encashment Date,Nakit Çekim Tarihi
 DocType: Training Event,Internet,Internet
 DocType: Special Test Template,Special Test Template,Özel Test Şablonu
@@ -4958,7 +5045,7 @@
 DocType: Academic Term,Term Start Date,Dönem Başlangıç Tarihi
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Sayısı
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Sayısı
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Bulmak Lütfen ekli {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Bulmak Lütfen ekli {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Genel Muhasebe uyarınca Banka Hesap bakiyesi
 DocType: Job Applicant,Applicant Name,Başvuru sahibinin adı
 DocType: Authorization Rule,Customer / Item Name,Müşteri / Ürün İsmi
@@ -4968,7 +5055,7 @@
 
 For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.
 
-Note: BOM = Bill of Materials","Birleştirilmiş grubu **Items** içinde **Item**. Bu özellik paketlenen  **Items** stoğunu kullanımı kolaylık sağlar ve birleştirilen **Item** kullanılmaz.  Paket **Item** içeriği ""Is Stock Item"" için ""No"" ve ""Is Sales Item"" seçimi ""Yes"". Örneğin: Laptop ve Arka sırtlığı ayrı ayrı satış yapıyorsunuz. Ancak müşteri ikisini beraber alırsa özel fiyattan satıcaksınız, bu durumda Laptop + Arka sırtlık yeni bir ürün kalemi olacaktır. Açıklama: BOM = Ürün Ağacı"
+Note: BOM = Bill of Materials","Birleştirilmiş grubu **Parçalar** içinde **Parça**. Bu özellik paketlenen  **Parçalar** stoğunu kullanımı kolaylık sağlar ve birleştirilen **Parça** kullanılmaz.  Paket **Parça** içeriği ""Stoktaki Parça"" için ""Hayır"" ve ""Satıştaki Parça"" seçimi ""Evet"". Örneğin: Laptop ve Arka sırtlığı ayrı ayrı satış yapıyorsunuz. Ancak müşteri ikisini beraber alırsa özel fiyattan satıcaksınız, bu durumda Laptop + Arka sırtlık yeni bir ürün kalemi olacaktır. Açıklama: BOM = Ürün Ağacı"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Ürün {0} için Seri no zorunludur
 DocType: Item Variant Attribute,Attribute,Nitelik
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Menzil / dan belirtiniz
@@ -4980,8 +5067,8 @@
 DocType: Grading Scale Interval,Threshold,eşik
 DocType: BOM Update Tool,Current BOM,Güncel BOM
 DocType: BOM Update Tool,Current BOM,Güncel BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Seri No Ekle
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Seri No Ekle
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Seri No Ekle
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Seri No Ekle
 DocType: Production Order Item,Available Qty at Source Warehouse,Kaynak Ambarında Mevcut Miktar
 apps/erpnext/erpnext/config/support.py +22,Warranty,Garanti
 DocType: Purchase Invoice,Debit Note Issued,Borç Dekontu İhraç
@@ -5009,10 +5096,9 @@
 DocType: Account,Receivable,Alacak
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Satır # {0}: Sipariş zaten var olduğu Tedarikçi değiştirmek için izin verilmez
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Kredi limiti ayarlarını geçen işlemleri teslim etmeye izinli rol
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,İmalat Öğe seç
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Ana veri senkronizasyonu, bu biraz zaman alabilir"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,İmalat Öğe seç
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Ana veri senkronizasyonu, bu biraz zaman alabilir"
 DocType: Item,Material Issue,Malzeme Verilişi
-DocType: Hub Settings,Seller Description,Satıcı Açıklaması
 DocType: Employee Education,Qualification,{0}Yeterlilik{/0} {1} {/1}
 DocType: Item Price,Item Price,Ürün Fiyatı
 DocType: Item Price,Item Price,Ürün Fiyatı
@@ -5024,7 +5110,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Sipariş Edildi
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Sipariş Edildi
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Devam et
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Devam et
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Etkinleştirilirse, sistem şablondaki varyant alanlarını güncellemez ancak aşağıdaki değişiklikler yapılırken aşağıda belirtilen alanların verilerini kopyalar."
 DocType: Salary Detail,Component,Bileşen
 DocType: Assessment Criteria,Assessment Criteria Group,Değerlendirme Ölçütleri Grup
 DocType: Healthcare Settings,Patient Name By,Hasta Adı Tarafından
@@ -5034,9 +5121,9 @@
 DocType: Naming Series,Select Transaction,İşlem Seçin
 DocType: Naming Series,Select Transaction,İşlem Seçin
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Onaylayıcı Rol veya Onaylayıcı Kullanıcı Giriniz
-DocType: Journal Entry,Write Off Entry,Girişi Kapalı Yazın
+DocType: Journal Entry,Write Off Entry,Şüpheli Alacak Girdisi
 DocType: BOM,Rate Of Materials Based On,Dayalı Ürün Br. Fiyatı
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Tedarikçi&gt; Tedarikçi Türü
+DocType: Item Variant Settings,Do not Update Variants,Varyantları Güncelleme
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Destek Analizi
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Tümünü işaretleme
 DocType: POS Profile,Terms and Conditions,Şartlar ve Koşullar
@@ -5046,7 +5133,7 @@
 DocType: Leave Block List,Applies to Company,Şirket için geçerli
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,Sunulan Stok Giriş {0} varolduğundan iptal edilemiyor
 DocType: Employee Loan,Disbursement Date,Ödeme tarihi
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;Alıcılar&#39; belirtilmemiş
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Alıcılar&#39; belirtilmemiş
 DocType: BOM Update Tool,Update latest price in all BOMs,Tüm BOM&#39;larda en son fiyatı güncelleyin
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Tıbbi kayıt
 DocType: Vehicle,Vehicle,araç
@@ -5064,15 +5151,15 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Satış Fırsatı/Müşteri Adayı yüzdesi
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Varlık Değer Kayıpları ve Hesapları
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},{0} {1} miktarı {2}'den {3}'e aktarılacak
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},{0} {1} miktarı {2}'den {3}'e aktarılacak
 DocType: Sales Invoice,Get Advances Received,Avansların alınmasını sağla
 DocType: Email Digest,Add/Remove Recipients,Alıcı Ekle/Kaldır
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Durdurulmuş Üretim Emrine {0} karşı işleme izin verilmez
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Varsayılan olarak bu Mali Yılı ayarlamak için, 'Varsayılan olarak ayarla' seçeneğini tıklayın"
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Varsayılan olarak bu Mali Yılı ayarlamak için, 'Varsayılan olarak ayarla' seçeneğini tıklayın"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Birleştir
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Birleştir
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Yetersizlik adeti
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Ürün çeşidi {0} aynı özelliklere sahip bulunmaktadır
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Ürün çeşidi {0} aynı özelliklere sahip bulunmaktadır
 DocType: Employee Loan,Repay from Salary,Maaş dan ödemek
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},"karşı ödeme talep {0}, {1} miktarda {2}"
@@ -5085,7 +5172,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Satış Sipariş Ürünü
 DocType: Salary Slip,Payment Days,Ödeme Günleri
 DocType: Patient,Dormant,Uykuda
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,alt düğümleri ile depolar Ledger dönüştürülebilir olamaz
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,alt düğümleri ile depolar Ledger dönüştürülebilir olamaz
 DocType: BOM,Manage cost of operations,İşlem Maliyetlerini Yönetin
 DocType: Accounts Settings,Stale Days,Bayat günler
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","İşaretli işlemlerden biri ""Teslim Edildiğinde"" işlemdeki ilgili ""Kişi""ye e-mail gönderecek bir e-mail penceresi açılacaktır, işlemi ekte gönderecektir."
@@ -5101,11 +5188,10 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Seri No {0} zaten alınmış
 ,Requested Items To Be Transferred,Transfer edilmesi istenen Ürünler
 DocType: Expense Claim,Vehicle Log,araç Giriş
-DocType: Purchase Invoice,Recurring Id,Tekrarlanan Kimlik
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),Ateşin varlığı (sıcaklık&gt; 38.5 ° C / 101.3 ° F veya sürekli&gt; 38 ° C / 100.4 ° F)
 DocType: Customer,Sales Team Details,Satış Ekibi Ayrıntıları
 DocType: Customer,Sales Team Details,Satış Ekibi Ayrıntıları
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Kalıcı olarak silinsin mi?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Kalıcı olarak silinsin mi?
 DocType: Expense Claim,Total Claimed Amount,Toplam İade edilen Tutar
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Satış için potansiyel Fırsatlar.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Geçersiz {0}
@@ -5117,7 +5203,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Departman mağazaları
 ,Item Delivery Date,Öğe Teslim Tarihi
 DocType: Warehouse,PIN,TOPLU İĞNE
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,ERPNext ayarlarını yap Okul
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,ERPNext ayarlarını yap Okul
 DocType: Sales Invoice,Base Change Amount (Company Currency),Baz Değişim Miktarı (Şirket Para Birimi)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Şu depolar için muhasebe girdisi yok
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,İlk belgeyi kaydedin.
@@ -5130,14 +5216,13 @@
 DocType: Task,Is Milestone,Milestone mu?
 DocType: Daily Work Summary,Email Sent To,E-posta Gönderilen
 DocType: Budget,Warn,Uyarmak
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Kaydını iptal etmek istediğinizden emin misiniz?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Başka bir konuşmasında, kayıtlarda gitmeli kayda değer çaba."
 DocType: BOM,Manufacturing User,Üretim Kullanıcı
 DocType: Purchase Invoice,Raw Materials Supplied,Tedarik edilen Hammaddeler
-DocType: Purchase Invoice,Recurring Print Format,Tekrarlayan Baskı Biçimi
 DocType: C-Form,Series,Seriler
 DocType: C-Form,Series,Seriler
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},{0} fiyat listesinin para birimi {1} veya {2} olmalıdır.
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Ürünler Ekle
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},{0} fiyat listesinin para birimi {1} veya {2} olmalıdır.
 DocType: Appraisal,Appraisal Template,Değerlendirme Şablonu
 DocType: Item Group,Item Classification,Ürün Sınıflandırması
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,İş Geliştirme Müdürü
@@ -5153,9 +5238,9 @@
 DocType: Item Attribute Value,Attribute Value,Değer Özellik
 ,Itemwise Recommended Reorder Level,Ürünnin Önerilen Yeniden Sipariş Düzeyi
 DocType: Salary Detail,Salary Detail,Maaş Detay
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Önce {0} seçiniz
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Önce {0} seçiniz
 DocType: Appointment Type,Physician,Doktor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Öğe Toplu {0} {1} süresi doldu.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,{0} partisindeki {1} ürününün ömrü doldu
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,istişareler
 DocType: Sales Invoice,Commission,Komisyon
 DocType: Sales Invoice,Commission,Komisyon
@@ -5166,7 +5251,7 @@
 DocType: Salary Detail,Default Amount,Standart Tutar
 DocType: Lab Test Template,Descriptive,Tanımlayıcı
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Sistemde depo bulunmadı
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Bu Ayın Özeti
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Bu Ayın Özeti
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kalite Kontrol Okuma
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kalite Kontrol Okuma
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Stocks Older Than` %d günden daha kısa olmalıdır.
@@ -5195,12 +5280,12 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Şundaki gibi birikimli değer kaybı
 DocType: Sales Invoice,C-Form Applicable,Uygulanabilir C-Formu
 DocType: Sales Invoice,C-Form Applicable,Uygulanabilir C-Formu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Çalışma Süresi Çalışma için 0&#39;dan büyük olmalıdır {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Çalışma Süresi Çalışma için 0&#39;dan büyük olmalıdır {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Depo zorunludur
 DocType: Supplier,Address and Contacts,Adresler ve Kontaklar
 DocType: UOM Conversion Detail,UOM Conversion Detail,Ölçü Birimi Dönüşüm Detayı
 DocType: Program,Program Abbreviation,Program Kısaltma
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Üretim siparişi Ürün Şablon karşı yükseltilmiş edilemez
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Üretim siparişi Ürün Şablon karşı yükseltilmiş edilemez
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Ücretler her öğenin karşı Satınalma Fiş güncellenir
 DocType: Warranty Claim,Resolved By,Tarafından Çözülmüştür
 DocType: Bank Guarantee,Start Date,Başlangıç Tarihi
@@ -5229,14 +5314,14 @@
 DocType: Employee,Educational Qualification,Eğitim Yeterliliği
 DocType: Workstation,Operating Costs,İşletim Maliyetleri
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Birikimli Aylık Bütçe aşıldıysa yapılacak işlem
-DocType: Purchase Invoice,Submit on creation,oluşturma Gönder
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Döviz {0} olmalıdır için {1}
+DocType: Subscription,Submit on creation,oluşturma Gönder
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Döviz {0} olmalıdır için {1}
 DocType: Asset,Disposal Date,Bertaraf tarihi
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Onlar tatil yoksa e-postalar, verilen saatte şirketin tüm Aktif Çalışanların gönderilecektir. Yanıtların Özeti gece yarısı gönderilecektir."
 DocType: Employee Leave Approver,Employee Leave Approver,Çalışan izin Onayı
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Satır {0}: Bir Yeniden Sipariş girişi zaten bu depo için var {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Kayıp olarak Kotasyon yapılmış çünkü, ilan edemez."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Eğitim Görüşleri
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Satır {0}: Bir Yeniden Sipariş girişi zaten bu depo için var {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Kayıp olarak Kotasyon yapılmış çünkü, ilan edemez."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Eğitim Görüşleri
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Üretim Siparişi {0} verilmelidir
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Tedarikçi Puan Kartı Kriterleri
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Ürün {0} için Başlangıç ve Bitiş tarihi seçiniz
@@ -5244,13 +5329,14 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Bitiş tarihi başlangıç tarihinden önce olmamalıdır
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc Doctype
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Fiyatları Ekle / Düzenle
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Fiyatları Ekle / Düzenle
 DocType: Batch,Parent Batch,Ana Parti
 DocType: Batch,Parent Batch,Ana Parti
 DocType: Cheque Print Template,Cheque Print Template,Çek Baskı Şablon
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Maliyet Merkezlerinin Grafikleri
 DocType: Lab Test Template,Sample Collection,Örnek koleksiyon
 ,Requested Items To Be Ordered,Sipariş edilmesi istenen Ürünler
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Siparişlerim
 DocType: Price List,Price List Name,Fiyat Listesi Adı
 DocType: Price List,Price List Name,Fiyat Listesi Adı
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Günlük Çalışma Özeti {0}
@@ -5276,12 +5362,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,Bu işlemi tamamlamak için {2} içinde {3} {4} üstünde {5} için {0} miktar {1} gerekli.
 DocType: Fee Schedule,Student Category,Öğrenci Kategorisi
 DocType: Announcement,Student,Öğrenci
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Kuruluş Birimi (departman) alanı
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Kuruluş Birimi (departman) alanı
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Odalara Git
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Lütfen Göndermeden önce mesajı giriniz
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,TEDARİKÇİ ÇEŞİTLİLİĞİ
 DocType: Email Digest,Pending Quotations,Teklif hazırlaması Bekleyen
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Satış Noktası Profili
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Satış Noktası Profili
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Lab Test Yapılandırmaları.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Teminatsız Krediler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Teminatsız Krediler
@@ -5293,6 +5379,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Toplam Ücretli Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 karakterden daha büyük mesajlar birden fazla mesaja bölünecektir
 DocType: Purchase Receipt Item,Received and Accepted,Alındı ve Kabul edildi
+DocType: Hub Settings,Company and Seller Profile,Şirket ve Satıcı Profili
 ,GST Itemised Sales Register,GST Madde Numaralı Satış Kaydı
 ,Serial No Service Contract Expiry,Seri No Hizmet Sözleşmesi Vadesi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Aynı hesabı aynı anda kredilendirip borçlandıramazsınız
@@ -5303,10 +5390,11 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Atanan toplam ağırlık % 100 olmalıdır. Bu {0} dır
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Tedarikçileriniz
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Tedarikçileriniz
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Lütfen düzeltin
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Satış Emri yapıldığında Kayıp olarak ayarlanamaz.
 DocType: Request for Quotation Item,Supplier Part No,Tedarikçi Parça No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',kategori &#39;Değerleme&#39; veya &#39;Vaulation ve Toplam&#39; için ne zaman tenzil edemez
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Dan alındı
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Dan alındı
 DocType: Lead,Converted,Dönüştürülmüş
 DocType: Item,Has Serial No,Seri no Var
 DocType: Employee,Date of Issue,Veriliş tarihi
@@ -5315,7 +5403,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Satın Alma Gerekliliği Alımı == &#39;EVET&#39; ise Satın Alma Ayarlarına göre, Satın Alma Faturası oluşturmak için kullanıcı {0} öğesi için önce Satın Alma Makbuzu oluşturmalıdır."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Satır # {0}: öğe için Set Tedarikçi {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Satır {0}: Saat değeri sıfırdan büyük olmalıdır.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Öğe {1} bağlı Web Sitesi Resmi {0} bulunamıyor
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Öğe {1} bağlı Web Sitesi Resmi {0} bulunamıyor
 DocType: Issue,Content Type,İçerik Türü
 DocType: Issue,Content Type,İçerik Türü
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Bilgisayar
@@ -5328,16 +5416,16 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Mutabık olmayan girdileri alın
 DocType: Payment Reconciliation,From Invoice Date,Fatura Tarihinden İtibaren
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Gönderebilme izniniz yok
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,Fatura para ya varsayılan comapany para birimi ya da parti hesap para eşit olmalıdır
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,"Fatura para birimi, kurumun veya grubun para birimiyle aynı olmalıdır"
 DocType: Healthcare Settings,Laboratory Settings,Laboratuar Ayarları
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Tahsil bırakın
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Ne yapar?
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Ne yapar?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Depoya
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Tüm Öğrenci Kabulleri
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Ne yapar?
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Ne yapar?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Depoya
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Tüm Öğrenci Kabulleri
 ,Average Commission Rate,Ortalama Komisyon Oranı
 ,Average Commission Rate,Ortalama Komisyon Oranı
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,Stokta olmayan ürünün 'Seri Nosu Var' 'Evet' olamaz
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,Stokta olmayan ürünün 'Seri Nosu Var' 'Evet' olamaz
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Durum Seç
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,İlerideki tarihler için katılım işaretlenemez
 DocType: Pricing Rule,Pricing Rule Help,Fiyatlandırma Kuralı Yardım
@@ -5359,44 +5447,44 @@
 DocType: Item,Customer Code,Müşteri Kodu
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Için Doğum Günü Hatırlatıcı {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Son siparişten bu yana geçen günler
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Hesabın için Bankamatik bir bilanço hesabı olmalıdır
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Hesabın için Bankamatik bir bilanço hesabı olmalıdır
 DocType: Buying Settings,Naming Series,Seri Adlandırma
 DocType: Leave Block List,Leave Block List Name,İzin engel listesi adı
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Sigorta Başlangıç tarihi Bitiş tarihi Sigortası daha az olmalıdır
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Okulda Eğitici İsme Sistemini Kurun&gt; Okul Ayarları
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Hazır Varlıklar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Hazır Varlıklar
 DocType: Timesheet,Production Detail,üretim Detay
+DocType: Restaurant,Active Menu,Aktif Menü
 DocType: Target Detail,Target Qty,Hedef Miktarı
 DocType: Shopping Cart Settings,Checkout Settings,Ödeme Ayarları
 DocType: Attendance,Present,Mevcut
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,İrsaliye {0} teslim edilmemelidir
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,İrsaliye {0} teslim edilmemelidir
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,İrsaliye {0} teslim edilmemelidir
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,İrsaliye {0} teslim edilmemelidir
 DocType: Notification Control,Sales Invoice Message,Satış Faturası Mesajı
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Hesap {0} Kapanış tipi Sorumluluk / Özkaynak olmalıdır
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},çalışanın maaş Kuponu {0} zaten zaman çizelgesi için oluşturulan {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},çalışanın maaş Kuponu {0} zaten zaman çizelgesi için oluşturulan {1}
 DocType: Vehicle Log,Odometer,Kilometre sayacı
 DocType: Sales Order Item,Ordered Qty,Sipariş Miktarı
 DocType: Sales Order Item,Ordered Qty,Sipariş Miktarı
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Öğe {0} devre dışı
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Öğe {0} devre dışı
 DocType: Stock Settings,Stock Frozen Upto,Stok Dondurulmuş
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,Ürün Ağacı hiç stoklanan kalem içermiyor
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Proje faaliyeti / görev.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,Ürün Ağacı hiç stoklanan kalem içermiyor
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Proje faaliyeti / görev.
 DocType: Vehicle Log,Refuelling Details,Yakıt Detayları
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Maaş Makbuzu Oluşturun
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Eğer Uygulanabilir {0} olarak seçilirse, alım kontrol edilmelidir."
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,İndirim 100'den az olmalıdır
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Son satın alma oranı bulunamadı
-DocType: Purchase Invoice,Write Off Amount (Company Currency),Tutar Off yazın (Şirket Para)
-DocType: Sales Invoice Timesheet,Billing Hours,fatura Saatleri
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,{0} bulunamadı için varsayılan BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Satır # {0}: yeniden sipariş miktarını ayarlamak Lütfen
+DocType: Purchase Invoice,Write Off Amount (Company Currency),Şüpheli Alacak Miktarı (Şirketin Kurunda)
+DocType: Sales Invoice Timesheet,Billing Hours,Fatura Saatleri
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,{0} bulunamadı için varsayılan BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Satır # {0}: yeniden sipariş miktarını ayarlamak Lütfen
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Buraya eklemek için öğelere dokunun
 DocType: Fees,Program Enrollment,programı Kaydı
 DocType: Landed Cost Voucher,Landed Cost Voucher,Indi Maliyet Çeki
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Lütfen {0} ayarlayınız
-DocType: Purchase Invoice,Repeat on Day of Month,Ayın gününde tekrarlayın
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} öğrencisi aktif değildir
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} öğrencisi aktif değildir
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} öğrencisi aktif değildir
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} öğrencisi aktif değildir
 DocType: Employee,Health Details,Sağlık Bilgileri
 DocType: Employee,Health Details,Sağlık Bilgileri
 DocType: Offer Letter,Offer Letter Terms,Harf Şartları Teklif
@@ -5408,7 +5496,6 @@
 DocType: Serial No,Delivery Document Type,Teslim Belge Türü
 DocType: Serial No,Delivery Document Type,Teslim Belge Türü
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Yukarıda seçilen kriterler için maaş makbuzları gönder
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Ürünler senkronize
 DocType: Sales Order,Partly Delivered,Kısmen Teslim Edildi
 DocType: Email Digest,Receivables,Alacaklar
 DocType: Email Digest,Receivables,Alacaklar
@@ -5431,9 +5518,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Yaşlanma Aralığı 2
 DocType: SG Creation Tool Course,Max Strength,Maksimum Güç
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM yerine
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Teslimat Tarihine Göre Öğe Seç
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Teslimat Tarihine Göre Öğe Seç
 ,Sales Analytics,Satış Analizleri
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Uygun {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Uygun {0}
 ,Prospects Engaged But Not Converted,"Etkilenen, ancak Dönüştürülmeyen Beklentiler"
 ,Prospects Engaged But Not Converted,"Etkilenen, ancak Dönüştürülmeyen Beklentiler"
 DocType: Manufacturing Settings,Manufacturing Settings,Üretim Ayarları
@@ -5441,10 +5528,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Mobil yok
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Lütfen Şirket Alanına varsayılan para birimini girin
 DocType: Stock Entry Detail,Stock Entry Detail,Stok Girdisi Detayı
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Günlük Hatırlatmalar
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Günlük Hatırlatmalar
 DocType: Products Settings,Home Page is Products,Ana Sayfa Ürünler konumundadır
 ,Asset Depreciation Ledger,Varlık Değer Kaybı Defteri
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Vergi Kural Çatışmalar {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Vergi Kural Çatışmalar {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Yeni Hesap Adı
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Yeni Hesap Adı
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Tedarik edilen Hammadde  Maliyeti
@@ -5460,14 +5547,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Ürün {0} bir stok ürünü olmalıdır
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,İlerleme Ambarlar&#39;da Standart Çalışma
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Muhasebe işlemleri için varsayılan ayarlar.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lütfen İnsan Kaynağında Çalışan Adlandırma Sistemini kurun&gt; HR Ayarları
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Beklenen Tarih Malzeme Talep Tarihinden önce olamaz
+DocType: Restaurant,Default Tax Template,Varsayılan Vergi Şablonu
 DocType: Fees,Student Details,Öğrenci Ayrıntıları
 DocType: Purchase Invoice Item,Stock Qty,Stok Miktarı
 DocType: Purchase Invoice Item,Stock Qty,Stok Miktarı
 DocType: Employee Loan,Repayment Period in Months,Aylar içinde Geri Ödeme Süresi
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Hata: Geçerli bir kimliği?
-DocType: Naming Series,Update Series Number,Seri Numarasını Güncelle
+DocType: Naming Series,Update Series Number,Seri Numaralarını Güncelle
 DocType: Account,Equity,Özkaynak
 DocType: Account,Equity,Özkaynak
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +78,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;Kar ve Zarar&#39; türü hesabı {2} Entry Açılış izin verilmez
@@ -5486,8 +5574,9 @@
 DocType: Sales Partner,Partner Type,Ortak Türü
 DocType: Purchase Taxes and Charges,Actual,Gerçek
 DocType: Purchase Taxes and Charges,Actual,Gerçek
+DocType: Restaurant Menu,Restaurant Manager,Restaurant yöneticisi
 DocType: Authorization Rule,Customerwise Discount,Müşteri İndirimi
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Görevler için mesai kartı.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Görevler için mesai kartı.
 DocType: Purchase Invoice,Against Expense Account,Karşılık Gider Hesabı
 DocType: Production Order,Production Order,Üretim Siparişi
 DocType: Production Order,Production Order,Üretim Siparişi
@@ -5498,7 +5587,6 @@
 DocType: SMS Center,All Employee (Active),Tüm Çalışanlar (Aktif)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Şimdi görüntüle
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Şimdi görüntüle
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Otomatik olarak fatura oluşturulacak dönemi seçin
 DocType: BOM,Raw Material Cost,Hammadde Maliyeti
 DocType: Item Reorder,Re-Order Level,Yeniden sipariş seviyesi
 DocType: Item Reorder,Re-Order Level,Yeniden Sipariş Seviyesi
@@ -5517,26 +5605,26 @@
 DocType: Item,Serial Number Series,Seri Numarası Serisi
 DocType: Item,Serial Number Series,Seri Numarası Serisi
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Satır {1} de stok Ürünü {0} için depo zorunludur
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Program Ekle
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Toptan ve Perakende Satış
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Toptan ve Perakende Satış
 DocType: Issue,First Responded On,İlk cevap verilen
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Çoklu gruplarda Ürün Cross İlanı
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Mali Yıl {0} da Mali Yıl Başlangıç Tarihi ve Mali Yıl Bitiş Tarihi zaten ayarlanmış
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Gümrükleme Tarihi güncellendi
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Bölme Bölmesi
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Bölme Bölmesi
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Bölme Bölmesi
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Bölme Bölmesi
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Başarıyla Uzlaştırıldı
 DocType: Request for Quotation Supplier,Download PDF,PDF İndir
 DocType: Production Order,Planned End Date,Planlanan Bitiş Tarihi
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Lütfen Zaman Çizelgesi Tarihini Girin
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Ürünlerin saklandığı yer
 DocType: Request for Quotation,Supplier Detail,Tedarikçi Detayı
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Formül ya da durumun hata: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Formül ya da durumun hata: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Faturalanan Tutar
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Ölçüt ağırlıkları% 100&#39;e varmalıdır
 DocType: Attendance,Attendance,Katılım
 DocType: Attendance,Attendance,Katılım
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,Stok Öğeler
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,Stok Öğeler
 DocType: BOM,Materials,Materyaller
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","İşaretli değilse, liste uygulanması gereken her Departmana eklenmelidir"
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Kaynak ve hedef Depo aynı olamaz
@@ -5555,9 +5643,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,Net toplam
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},{0} Attribute değer aralığında olmalıdır {1} {2} artışlarla {3} Öğe için {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Satır {0} daki hedef depo Üretim Emrindekiyle aynı olmalıdır
+DocType: Restaurant Reservation,Waitlisted,Bekleme listesindeki
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Para başka bir para birimini kullanarak girdileri yaptıktan sonra değiştirilemez
 DocType: Vehicle Service,Clutch Plate,Debriyaj Plakası
-DocType: Company,Round Off Account,Hesap Off Yuvarlak
+DocType: Company,Round Off Account,Yuvarlama Hesabı
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Yönetim Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Yönetim Giderleri
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Danışmanlık
@@ -5573,7 +5662,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Yeni Satış Kişi Adı
 DocType: Packing Slip,Gross Weight UOM,Brüt Ağırlık Ölçü Birimi
 DocType: Delivery Note Item,Against Sales Invoice,Satış Faturası Karşılığı
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Lütfen seri hale getirilmiş öğe için seri numaralarını girin
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Lütfen seri hale getirilmiş öğe için seri numaralarını girin
 DocType: Bin,Reserved Qty for Production,Üretim için Miktar saklıdır
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Kurs temelli gruplar yaparken toplu düşünmeyi istemiyorsanız, işaretlemeyin."
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Kurs temelli gruplar yaparken toplu düşünmeyi istemiyorsanız, işaretlemeyin."
@@ -5585,7 +5674,7 @@
 DocType: Lab Test,Test Group,Test Grubu
 DocType: Payment Reconciliation,Receivable / Payable Account,Alacak / Borç Hesap
 DocType: Delivery Note Item,Against Sales Order Item,Satış Sipariş Kalemi karşılığı
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Öznitelik için değeri Özellik belirtiniz {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Öznitelik için değeri Özellik belirtiniz {0}
 DocType: Item,Default Warehouse,Standart Depo
 DocType: Item,Default Warehouse,Standart Depo
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Bütçe Grubu Hesabı karşı atanamayan {0}
@@ -5616,6 +5705,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Satış Personeli
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Bütçe ve Maliyet Merkezi
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Birden fazla varsayılan ödeme moduna izin verilmiyor
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,için
 ,Appointment Analytics,Randevu Analizi
 DocType: Vehicle Service,Half Yearly,Yarım Yıllık
 DocType: Lead,Blog Subscriber,Blog Abonesi
@@ -5635,7 +5725,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Kontör Sayısı
 ,BOM Stock Report,Ürün Ağacı Stok Raporu
 DocType: Stock Reconciliation Item,Quantity Difference,Miktar Farkı
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,İşleme Bordro
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,İşleme Bordro
 DocType: Opportunity Item,Basic Rate,Temel Oran
 DocType: Opportunity Item,Basic Rate,Temel Oran
 DocType: GL Entry,Credit Amount,Kredi miktarı
@@ -5651,13 +5741,13 @@
 DocType: Tax Rule,Tax Rule,Vergi Kuralı
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Satış döngüsü boyunca aynı oranı koruyun
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Workstation Çalışma Saatleri dışında zaman günlükleri planlayın.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Kuyruk Müşteriler
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} &#39;nın Doktor Çizelgesi yok. Hekim ustasına ekle
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Kuyruk Müşteriler
 DocType: Student,Nationality,milliyet
 ,Items To Be Requested,İstenecek Ürünler
-DocType: Purchase Order,Get Last Purchase Rate,Son Alım Br.Fİyatını alın
 DocType: Company,Company Info,Şirket Bilgisi
 DocType: Company,Company Info,Şirket Bilgisi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Seçmek veya yeni müşteri eklemek
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Seçmek veya yeni müşteri eklemek
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Maliyet merkezi gider iddiayı kitaba gereklidir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Fon (varlık) başvurusu
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,"Bu, bu Çalışan katılımı esas alır"
@@ -5667,7 +5757,8 @@
 DocType: Fiscal Year,Year Start Date,Yıl Başlangıç Tarihi
 DocType: Attendance,Employee Name,Çalışan Adı
 DocType: Attendance,Employee Name,Çalışan Adı
-DocType: Sales Invoice,Rounded Total (Company Currency),Yuvarlanmış Toplam (Şirket para birimi)
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restaurant Sipariş Girişi Maddesi
+DocType: Sales Invoice,Rounded Total (Company Currency),Yuvarlanmış Toplam (Şirket Kuru)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Hesap Türü seçili olduğundan Grup gizli olamaz.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,"{0}, {1} düzenlenmiştir. Lütfen yenileyin."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Kullanıcıların şu günlerde İzin almasını engelle.
@@ -5677,6 +5768,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Çalışanlara Sağlanan Faydalar
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},{1} Paketli miktar satır {1} deki Ürün {0} a eşit olmalıdır
 DocType: Production Order,Manufactured Qty,Üretilen Miktar
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Oluşturulan Fatura
 DocType: Purchase Receipt Item,Accepted Quantity,Kabul edilen Miktar
 DocType: Purchase Receipt Item,Accepted Quantity,Kabul edilen Miktar
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Çalışan bir varsayılan Tatil Listesi set Lütfen {0} veya Şirket {1}
@@ -5687,22 +5779,23 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Sıra Hayır {0}: Tutar Gider İstem {1} karşı Tutar Bekleyen daha büyük olamaz. Bekleyen Tutar {2}
 DocType: Maintenance Schedule,Schedule,Program
 DocType: Account,Parent Account,Ana Hesap
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Uygun
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Uygun
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Uygun
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Uygun
 DocType: Quality Inspection Reading,Reading 3,3 Okuma
 DocType: Quality Inspection Reading,Reading 3,3 Okuma
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Föy Türü
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Fiyat Listesi bulunamadı veya devre dışı değil
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Fiyat Listesi bulunamadı veya devre dışı değil
 DocType: Lab Test,Approved,Onaylandı
 DocType: Pricing Rule,Price,Fiyat
 DocType: Pricing Rule,Price,Fiyat
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',"{0} üzerinde bırakılan işçi 'ayrılı' olarak ayarlanmalıdır"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',"{0} üzerinde bırakılan işçi 'ayrılı' olarak ayarlanmalıdır"""
+DocType: Hub Settings,Last Sync On,Son Senkronizasyon Açık
 DocType: Guardian,Guardian,vasi
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Verilen aralıkta Çalışan {1} için oluşturulan değerlendirme {0}
 DocType: Employee,Education,Eğitim
 DocType: Employee,Education,Eğitim
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,Del
 DocType: Selling Settings,Campaign Naming By,Kampanya İsimlendirmesini yapan
 DocType: Employee,Current Address Is,Güncel Adresi
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Aylık Satış Hedefi (
@@ -5710,7 +5803,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +41,"Optional. Sets company's default currency, if not specified.","İsteğe bağlı. Eğer belirtilmemişse, şirketin varsayılan para birimini belirler."
 DocType: Sales Invoice,Customer GSTIN,Müşteri GSTIN
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Muhasebe günlük girişleri.
-DocType: Delivery Note Item,Available Qty at From Warehouse,Depo itibaren Boş Adet
+DocType: Delivery Note Item,Available Qty at From Warehouse,Depodaki Boş Adet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,İlk Çalışan Kaydı seçiniz.
 DocType: POS Profile,Account for Change Amount,Değişim Miktarı Hesabı
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Satır {0}: Parti / Hesap ile eşleşmiyor {1} / {2} içinde {3} {4}
@@ -5719,12 +5812,12 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Gider Hesabı girin
 DocType: Account,Stock,Stok
 DocType: Account,Stock,Stok
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Satır # {0}: Referans Doküman Tipi Satın Alma Emri biri, Satın Alma Fatura veya günlük girdisi olmalıdır"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Satır # {0}: Referans Doküman Tipi Satın Alma Emri biri, Satın Alma Fatura veya günlük girdisi olmalıdır"
 DocType: Employee,Current Address,Mevcut Adresi
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Açıkça belirtilmediği sürece madde daha sonra açıklama, resim, fiyatlandırma, vergiler şablondan kurulacak vb başka bir öğe bir varyantı ise"
 DocType: Serial No,Purchase / Manufacture Details,Satın alma / Üretim Detayları
 DocType: Assessment Group,Assessment Group,Değerlendirme Grubu
-apps/erpnext/erpnext/config/stock.py +325,Batch Inventory,Toplu Envanteri
+apps/erpnext/erpnext/config/stock.py +325,Batch Inventory,Parti Envanteri
 DocType: Employee,Contract End Date,Sözleşme Bitiş Tarihi
 DocType: Employee,Contract End Date,Sözleşme Bitiş Tarihi
 DocType: Sales Order,Track this Sales Order against any Project,Bu satış emrini bütün Projelere karşı takip et
@@ -5758,7 +5851,7 @@
 DocType: Project,Gross Margin %,Brüt Kar Marjı%
 DocType: BOM,With Operations,Operasyon ile
 DocType: BOM,With Operations,Operasyon ile
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Muhasebe kayıtları zaten para yapılmış {0} şirket için {1}. Para ile bir alacak ya da borç hesabı seçin {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Muhasebe kayıtları zaten para yapılmış {0} şirket için {1}. Para ile bir alacak ya da borç hesabı seçin {0}.
 DocType: Asset,Is Existing Asset,Varlık Mevcut mı
 DocType: Salary Detail,Statistical Component,İstatistiksel Bileşen
 DocType: Salary Detail,Statistical Component,İstatistiksel Bileşen
@@ -5767,13 +5860,14 @@
 DocType: BOM Operation,BOM Operation,BOM Operasyonu
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Önceki satır toplamı
 DocType: Student,Home Address,Ev adresi
+DocType: Item,Has Expiry Date,Vade Sonu Var
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Öğe Varyant Ayarları.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,aktarım Varlık
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,aktarım Varlık
 DocType: POS Profile,POS Profile,POS Profili
 DocType: Training Event,Event Name,Etkinlik Adı
 DocType: Physician,Phone (Office),Telefon (Ofis)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,Başvuru
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},{0} için Kabul
+apps/erpnext/erpnext/hooks.py +147,Admission,Başvuru
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},{0} için Kabul
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Ayar bütçeler, hedefler vb Mevsimselliği"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Değişken Adı
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","{0} Öğe bir şablon, türevleri birini seçiniz"
@@ -5784,7 +5878,7 @@
 DocType: Purchase Order,Advance Paid,Peşin Ödenen
 DocType: Item,Item Tax,Ürün Vergisi
 DocType: Item,Item Tax,Ürün Vergisi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Tedarikçi Malzeme
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Tedarikçi Malzeme
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Tüketim Fatura
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,"Eşik {0},% kereden fazla görünür"
 DocType: Expense Claim,Employees Email Id,Çalışanların e-posta adresleri
@@ -5795,35 +5889,33 @@
 DocType: Program,Program Name,Programın Adı
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Vergi veya Ücret
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Gerçek Adet zorunludur
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} şu anda bir {1} Tedarikçi Puan Kartı&#39;na sahip ve bu tedarikçiye Satın Alma Siparişleri dikkatle verilmelidir.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} şu anda bir {1} Tedarikçi Puan Kartı&#39;na sahip ve bu tedarikçiye Satın Alma Siparişleri dikkatle verilmelidir.
 DocType: Employee Loan,Loan Type,kredi Türü
 DocType: Scheduling Tool,Scheduling Tool,zamanlama Aracı
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Kredi kartı
 DocType: BOM,Item to be manufactured or repacked,Üretilecek veya yeniden paketlenecek Ürün
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Stok işlemleri için Varsayılan ayarlar.
-DocType: Purchase Invoice,Next Date,Sonraki Tarihi
 DocType: Employee Education,Major/Optional Subjects,Ana / Opsiyonel Konular
 DocType: Sales Invoice Item,Drop Ship,Bırak Gemi
+DocType: Hub Settings,Suspended,Askıya alındı
 DocType: Training Event,Attendees,katılımcılar
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Burada ebeveyn, eş ve çocukların isim ve meslek gibi aile ayrıntıları  muhafaza edebilirsiniz"
 DocType: Academic Term,Term End Date,Dönem Bitiş Tarihi
-DocType: Hub Settings,Seller Name,Satıcı Adı
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Mahsup Vergi ve Harçlar (Şirket Para Biriminde)
 DocType: Item Group,General Settings,Genel Ayarlar
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Para biriminden ve para birimine aynı olamaz
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Eğitmen Ekle
 DocType: Stock Entry,Repack,Yeniden paketlemek
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Devam etmeden önce formu kaydetmelisiniz
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Lütfen önce Şirketi seçin
 DocType: Item Attribute,Numeric Values,Sayısal Değerler
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Logo Ekleyin
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Stok Seviyeleri
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Stok Seviyeleri
 DocType: Customer,Commission Rate,Komisyon Oranı
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,{1} için {0} puan kartını şu aralıklarla oluşturdu:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Variant oluştur
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Variant oluştur
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Departman tarafından blok aralığı uygulamaları.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Ödeme Şekli, Alma biri Öde ve İç Transferi gerekir"
-apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
+apps/erpnext/erpnext/config/selling.py +179,Analytics,Analitikler
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Sepet Boş
 DocType: Vehicle,Model,model
 DocType: Production Order,Actual Operating Cost,Gerçek İşletme Maliyeti
@@ -5837,11 +5929,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Öz sermaye
 DocType: Shopping Cart Settings,Show Public Attachments,Genel Ekleri Göster
 DocType: Packing Slip,Package Weight Details,Ambalaj Ağırlığı Detayları
+DocType: Restaurant Reservation,Reservation Time,Rezervasyon Süresi
 DocType: Payment Gateway Account,Payment Gateway Account,Ödeme Gateway Hesabı
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Ödeme tamamlandıktan sonra kullanıcıyı seçilen sayfaya yönlendir.
 DocType: Company,Existing Company,mevcut Şirket
 DocType: Healthcare Settings,Result Emailed,E-postayla gönderilen sonuç
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","Tüm Maddeler stokta bulunmayan maddeler olduğundan, Vergi Kategorisi &quot;Toplam&quot; olarak değiştirildi"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Ürün Kodu&gt; Ürün Grubu&gt; Marka
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Bir csv dosyası seçiniz
 DocType: Student Leave Application,Mark as Present,Şimdiki olarak işaretle
 DocType: Supplier Scorecard,Indicator Color,Gösterge Rengi
@@ -5868,11 +5962,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Öğrenci Toplu yapın
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,İleri taşınmış
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,BOM dan Ürünleri alın
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,BOM dan Ürünleri alın
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Teslim zamanı Günü
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Satır # {0}: Tarihi Gönderme satın alma tarihi olarak aynı olmalıdır {1} varlığın {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Öğrenci Enstitü Pansiyonunda ikamet ediyorsa bunu kontrol edin.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Yukarıdaki tabloda Satış Siparişleri giriniz
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Yukarıdaki tabloda Satış Siparişleri giriniz
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Maaş Fiş Ekleyen Değil
 ,Stock Summary,Stok Özeti
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,başka bir depodan bir varlık transfer
@@ -5889,6 +5983,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Satır {0}: Banka giriş ile bağlantılı edilemez bir {1}
 DocType: Journal Entry,Subscription Section,Abonelik Bölümü
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Hesap {0} yok
+DocType: Training Event,Training Program,Eğitim programı
 DocType: Account,Cash,Nakit
 DocType: Account,Cash,Nakit
 DocType: Employee,Short biography for website and other publications.,Web sitesi ve diğer yayınlar için kısa biyografi.
diff --git a/erpnext/translations/uk.csv b/erpnext/translations/uk.csv
index cb9c504..8c90d83 100644
--- a/erpnext/translations/uk.csv
+++ b/erpnext/translations/uk.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Режим виплати
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Реєструйся
 DocType: Patient,Divorced,У розлученні
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Товари вже синхронізовані
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Дозволити повторення номенклатурних позицій у операції
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Скасувати Матеріал Відвідати {0} до скасування Дана гарантія претензії
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Споживацькі товари
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Погоджувачі відпусток
 DocType: Sales Partner,Dealer,Дилер
 DocType: Consultation,Investigations,Розслідування
+DocType: Restaurant Order Entry,Click Enter To Add,Натисніть «Ввести додати»
 DocType: Employee,Rented,Орендовані
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Стосується користувача
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Призупинене виробниче замовлення не може бути скасоване, зніміть призупинку спочатку"
 DocType: Vehicle Service,Mileage,пробіг
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Ви дійсно хочете відмовитися від цього активу?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Ви дійсно хочете відмовитися від цього активу?
 DocType: Drug Prescription,Update Schedule,Оновити розклад
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Виберіть постачальника за замовчуванням
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Валюта необхідна для Прайс-листа {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Перевірте наявність
 DocType: Job Applicant,Job Applicant,Робота Заявник
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Це засновано на операціях проти цього постачальника. Див графік нижче для отримання докладної інформації
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Немає більше результатів.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Правовий
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Фактичний тип податку не може бути включений у вартість товару в рядку {0}
 DocType: Bank Guarantee,Customer,Клієнт
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),"Обмінний курс повинен бути такий же, як {0} {1} ({2})"
 DocType: Sales Invoice,Customer Name,Ім&#39;я клієнта
 DocType: Vehicle,Natural Gas,Природний газ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Банківський рахунок не може бути названий {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Банківський рахунок не може бути названий {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Керівники (або групи), проти якого Бухгалтерські записи виробляються і залишки зберігаються."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Видатний {0} не може бути менше нуля ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Процесу обробки заробітної плати не подано.
 DocType: Manufacturing Settings,Default 10 mins,За замовчуванням 10 хвилин
 DocType: Leave Type,Leave Type Name,Назва типу відпустки
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Показати відкритий
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Сьогодні це заходи необхідно прийняти для вищезгаданого повторюваного
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Серії оновлені успішно
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Перевірити
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural Запис в журналі Опубліковано
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,"Позиції Замовлення на придбання, які будуть отримані"
 DocType: SMS Center,All Supplier Contact,Всі постачальником Зв&#39;язатися
 DocType: Support Settings,Support Settings,налаштування підтримки
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,"Очікувана Дата закінчення не може бути менше, ніж очікувалося Дата початку"
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,"Очікувана Дата закінчення не може бути менше, ніж очікувалося Дата початку"
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Ряд # {0}: ціна повинна бути такою ж, як {1}: {2} ({3} / {4})"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Нова заява на відпустку
 ,Batch Item Expiry Status,Пакетна Пункт експірації Статус
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Банківський чек
 DocType: Mode of Payment Account,Mode of Payment Account,Режим розрахунковий рахунок
 DocType: Consultation,Consultation,Консультація
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Продажі та повернення
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Показати варіанти
 DocType: Academic Term,Academic Term,академічний термін
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,матеріал
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Охорона здоров&#39;я
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Затримка в оплаті (дні)
 DocType: Lab Prescription,Lab Prescription,Лабораторна рецептура
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Сортувати за ціною
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,послуги Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Серійний номер: {0} вже згадується в продажу рахунку: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Рахунок-фактура
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Серійний номер: {0} вже згадується в продажу рахунку: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Рахунок-фактура
 DocType: Maintenance Schedule Item,Periodicity,Періодичність
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Треба зазначити бюджетний період {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Захист
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Ряд # {0}:
 DocType: Timesheet,Total Costing Amount,Загальна вартість
 DocType: Delivery Note,Vehicle No,Автомобіль номер
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,"Будь ласка, виберіть Прайс-лист"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,"Будь ласка, виберіть Прайс-лист"
 DocType: Accounts Settings,Currency Exchange Settings,Параметри обміну валют
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Рядок # {0}: Платіжний документ потрібно для завершення операцій Встановлюються
 DocType: Production Order Operation,Work In Progress,В роботі
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,"Будь ласка, виберіть дати"
 DocType: Employee,Holiday List,Список вихідних
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,"Будь-ласка, встановіть Систему Назви Інструкторів у Школі&gt; Параметри Школи"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Бухгалтер
+DocType: Hub Settings,Selling Price List,Ціновий продаж
 DocType: Patient,Tobacco Current Use,Використання тютюну
 DocType: Cost Center,Stock User,Складській користувач
 DocType: Company,Phone No,№ Телефону
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Розклад курсів створено:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Новий {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Новий {0}: # {1}
 ,Sales Partners Commission,Комісія партнерів
 DocType: Purchase Invoice,Rounding Adjustment,Регулювання округлення
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,"Скорочення не може мати більше, ніж 5 символів"
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Батько Подробиці DOCNAME
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Посилання: {0}, Код товару: {1} і клієнта: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Кг
-DocType: Student Log,Log,Ввійти
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Вакансія
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Результат представлений
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Результат представлений
 DocType: Item Attribute,Increment,Приріст
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Проміжок часу
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Виберіть Склад ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Одружений
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Не допускається для {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Отримати елементи з
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Запаси не можуть оновитися Накладною {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Запаси не можуть оновитися Накладною {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Продукт {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,немає Перелічене
 DocType: Payment Reconciliation,Reconcile,Узгодити
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пенсійні фонди
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Наступна амортизація Дата не може бути перед покупкою Дати
 DocType: Consultation,Consultation Date,Дата консультації
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Список продуктів і відкриття для користувачів ERPNext
 DocType: SMS Center,All Sales Person,Всі Відповідальні з продажу
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"**Щомісячний розподіл** дозволяє розподілити Бюджет/Мету по місяцях, якщо у вашому бізнесі є сезонність."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Чи не знайшли товар
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Відсутня Структура зарплати
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Чи не знайшли товар
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Відсутня Структура зарплати
 DocType: Lead,Person Name,Ім&#39;я особи
 DocType: Sales Invoice Item,Sales Invoice Item,Позиція вихідного рахунку
 DocType: Account,Credit,Кредит
 DocType: POS Profile,Write Off Cost Center,Центр витрат списання
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""","наприклад, &quot;Початкова школа&quot; або &quot;Університет&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""","наприклад, &quot;Початкова школа&quot; або &quot;Університет&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Складські звіти
 DocType: Warehouse,Warehouse Detail,Детальна інформація по складу
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Кредитний ліміт було перейдено для клієнта {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Термін Дата закінчення не може бути пізніше, ніж за рік Дата закінчення навчального року, до якого цей термін пов&#39;язаний (навчальний рік {}). Будь ласка, виправте дату і спробуйте ще раз."
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Є основним засобом"" не може бути знято, оскільки існує запис засобу відносно об’єкту"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Є основним засобом"" не може бути знято, оскільки існує запис засобу відносно об’єкту"
 DocType: Vehicle Service,Brake Oil,гальмівні масла
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клієнт&gt; Група клієнтів&gt; Територія
 DocType: Tax Rule,Tax Type,Тип податку
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Оподатковувана сума
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},"У Вас немає прав, щоб додавати або оновлювати записи до {0}"
 DocType: BOM,Item Image (if not slideshow),Пункт зображення (якщо не слайд-шоу)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Уразливість існує клієнтів з тим же ім&#39;ям
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Тарифна ставка / 60) * Фактичний Час роботи
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Рядок # {0}: Тип довідкового документа повинен бути одним із претензій на витрати або Журнал
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Виберіть BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Рядок # {0}: Тип довідкового документа повинен бути одним із претензій на витрати або Журнал
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Виберіть BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Вартість комплектності
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,"Вихідні {0} не між ""Дата з"" та ""Дата По"""
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,співробітник позики
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Журнал активності:
 DocType: Fee Schedule,Send Payment Request Email,Надіслати електронною поштою запит на оплату
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,"Пункт {0} не існує в системі, або закінчився"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,"Пункт {0} не існує в системі, або закінчився"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Нерухомість
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Виписка
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Фармацевтика
@@ -210,18 +213,23 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Імпорт Ввійти
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,"Видати Замовлення матеріалу типу ""Виробництво"" на основі вищевказаних критеріїв"
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Успішно незареєстрований.
 DocType: Training Result Employee,Grade,клас
+DocType: Restaurant Table,No of Seats,Кількість місць
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Щоб додати динамічний предмет, використовуйте теги jinja, такі як <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Доставлено постачальником
 DocType: SMS Center,All Contact,Всі контактні
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Виробничий замовлення вже створений для всіх елементів з BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Виробничий замовлення вже створений для всіх елементів з BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Річна заробітна плата
 DocType: Daily Work Summary,Daily Work Summary,Щодня Резюме Робота
 DocType: Period Closing Voucher,Closing Fiscal Year,Закриття бюджетного періоду
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} заблоковано
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,"Будь ласка, виберіть існуючу компанію для створення плану рахунків"
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} заблоковано
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,"Будь ласка, виберіть існуючу компанію для створення плану рахунків"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Витрати на запаси
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Виберіть Target Warehouse
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Виберіть Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Виберіть Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Виберіть Target Warehouse
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Будь ласка, введіть Preferred Контакт E-mail"
 DocType: Program Enrollment,School Bus,Шкільний автобус
 DocType: Journal Entry,Contra Entry,Виправна запис
@@ -238,9 +246,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Завантажте шаблон, заповніть відповідні дані і долучіть змінений файл. Усі поєднання дат і співробітників в обраному періоді потраплять у шаблон разом з існуючими записами відвідуваності"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Пункт {0} не є активним або досяг дати завершення роботи з ним
+DocType: Student Admission Program,Minimum Age,Мінімальний вік
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Приклад: Елементарна математика
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Щоб включити податок у рядку {0} у розмірі Item, податки в рядках {1} повинні бути також включені"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Налаштування модуля HR
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Налаштування модуля HR
 DocType: SMS Center,SMS Center,SMS-центр
 DocType: Sales Invoice,Change Amount,Сума змін
 DocType: BOM Update Tool,New BOM,Новий документ Норми витрат
@@ -250,7 +259,7 @@
 DocType: Lead,Request Type,Тип запиту
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,зробити Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Радіомовлення
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Додати номери
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Режим налаштування POS (онлайн / офлайн)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Виконання
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Детальна інформація про виконані операції.
 DocType: Serial No,Maintenance Status,Стан Технічного обслуговування
@@ -273,6 +282,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Прайс-лист має застосовуватисьі для купівлі або продажу
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Дата встановлення не може бути до дати доставки по позиції {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Знижка на ціну з прайсу (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Біохімія
 DocType: Offer Letter,Select Terms and Conditions,Виберіть умови та положення
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,Розхід у Сумі
 DocType: Production Planning Tool,Sales Orders,Замовлення клієнта
@@ -307,15 +317,15 @@
 DocType: Sales Partner,Reseller,Торговий посередник
 DocType: Codification Table,Medical Code,Медичний кодекс
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Якщо цей прапорець встановлений, буде включати в себе позабіржові елементи в матеріалі запитів."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,"Будь ласка, введіть компанія"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,"Будь ласка, введіть компанія"
 DocType: Delivery Note Item,Against Sales Invoice Item,По позиціях вхідного рахунку-фактури
 ,Production Orders in Progress,Виробничі замовлення у роботі
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Чисті грошові кошти від фінансової
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage сповнений, не врятувало"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage сповнений, не врятувало"
 DocType: Lead,Address & Contact,Адреса та контакти
 DocType: Leave Allocation,Add unused leaves from previous allocations,Додати невикористані дні відпустки від попередніх призначень
 DocType: Sales Partner,Partner website,Веб-сайт партнера
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Додати елемент
+DocType: Restaurant Order Entry,Add Item,Додати елемент
 DocType: Lab Test,Custom Result,Користувацький результат
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Контактна особа
 DocType: Course Assessment Criteria,Course Assessment Criteria,Критерії оцінки курсу
@@ -328,7 +338,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Запит на покупку.
 DocType: Lab Test,Submitted Date,Дата відправлення
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,"Це засновано на табелів обліку робочого часу, створених проти цього проекту"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,"Net Pay не може бути менше, ніж 0"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,"Net Pay не може бути менше, ніж 0"
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Щоб зупинити надсилання сповіщень про повторювані помилки в системі, ми позначили поле &quot;Відключені&quot; в підписці"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Тільки вибраний погоджувач може провести цю Заяву на відпустку
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,"Дата звільнення повинна бути більше, ніж дата влаштування"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Листя на рік
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,Прибуток та збиток
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,літр
 DocType: Task,Total Costing Amount (via Time Sheet),Загальна калькуляція Сума (за допомогою Time Sheet)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,"Будь-ласка, налаштуйте студентів за групами студентів"
 DocType: Item Website Specification,Item Website Specification,Пункт Сайт Специфікація
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Залишити Заблоковані
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Товар {0} досяг кінцевої дати роботи з ним {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Товар {0} досяг кінцевої дати роботи з ним {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Банківські записи
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Річний
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Позиція Інвентаризації
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Курс Студентська група Інструмент створення
 DocType: Lead,Do Not Contact,Чи не Контакти
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,"Люди, які викладають у вашій організації"
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Унікальний ідентифікатор для відстеження всіх періодичних рахунків-фактур. Генерується при проведенні.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Розробник програмного забезпечення
 DocType: Item,Minimum Order Qty,Мінімальна к-сть замовлень
 DocType: Pricing Rule,Supplier Type,Тип постачальника
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,Опублікувати в Hub
 DocType: Student Admission,Student Admission,прийому студентів
 ,Terretory,Територія
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Пункт {0} скасовується
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Замовлення матеріалів
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Пункт {0} скасовується
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Замовлення матеріалів
 DocType: Bank Reconciliation,Update Clearance Date,Оновити Clearance дату
 DocType: Item,Purchase Details,Закупівля детальніше
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Товар {0} не знайдений у таблиці ""поставлена давальницька сировина"" у Замовленні на придбання {1}"
 DocType: Patient Relation,Relation,Відношення
 DocType: Shipping Rule,Worldwide Shipping,Доставка по всьому світу
 DocType: Patient Relation,Mother,мати
+DocType: Restaurant Reservation,Reservation End Time,Час закінчення бронювання
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Підтверджені замовлення від клієнтів.
 DocType: Purchase Receipt Item,Rejected Quantity,Відхилено Кількість
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Запит на оплату {0} створено
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Запит на оплату {0} створено
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Низька чутливість
 DocType: Notification Control,Notification Control,Управління Повідомлення
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,"Будь ласка, підтвердьте, як тільки ви закінчили свою підготовку"
 DocType: Lead,Suggestions,Пропозиції
@@ -388,7 +401,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,"Електронні листи зарплати ковзання співробітнику на основі кращого електронної пошти, обраного в Employee"
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Перший погоджувач відпусток у списку буде погоджувачем за замовчуванням
 DocType: Tax Rule,Shipping County,Область доставки
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Навчитися
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Навчитися
 DocType: Asset,Next Depreciation Date,Наступна дата амортизації
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Діяльність Вартість одного працівника
 DocType: Accounts Settings,Settings for Accounts,Налаштування для рахунків
@@ -399,13 +412,13 @@
 DocType: Item,Synced With Hub,Синхронізуються з Hub
 DocType: Vehicle,Fleet Manager,Fleet Manager
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Рядок # {0}: {1} не може бути негативним по пункту {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Невірний пароль
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Невірний пароль
 DocType: Item,Variant Of,Варіант
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"Завершена к-сть не може бути більше, ніж ""к-сть для виробництва"""
 DocType: Period Closing Voucher,Closing Account Head,Рахунок закриття
 DocType: Employee,External Work History,Зовнішній роботи Історія
 DocType: Physician,Time per Appointment,Час за призначенням
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Циклічна посилання Помилка
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Циклічна посилання Помилка
 DocType: Appointment Type,Is Inpatient,Є стаціонарним
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,ім&#39;я Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Прописом (експорт) буде видно, як тільки ви збережете накладну."
@@ -414,19 +427,18 @@
 DocType: Lead,Industry,Промисловість
 DocType: Employee,Job Profile,Профіль роботи
 DocType: BOM Item,Rate & Amount,Ставка та сума
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Будь ласка, налаштуйте серію нумерації для участі в Наборі&gt; Нумерована серія"
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Це базується на операціях проти цієї компанії. Детальніше див. Наведену нижче шкалу часу
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Повідомляти електронною поштою про створення автоматичних Замовлень матеріалів
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Стійкий
 DocType: Journal Entry,Multi Currency,Мультивалютна
 DocType: Payment Reconciliation Invoice,Invoice Type,Тип рахунку-фактури
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клієнт&gt; Група клієнтів&gt; Територія
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Накладна
 DocType: Consultation,Encounter Impression,Зустрічне враження
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Налаштування податків
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Собівартість проданих активів
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,"Оплата була змінена після pull. Ласка, pull it знову."
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,"{0} введений двічі в ""Податки"""
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Результати для цього тижня та незакінчена діяльність
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,"{0} введений двічі в ""Податки"""
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Результати для цього тижня та незакінчена діяльність
 DocType: Student Applicant,Admitted,зізнався
 DocType: Workstation,Rent Cost,Вартість оренди
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Залишкова вартість
@@ -441,36 +453,35 @@
 DocType: Shipping Rule,Valid for Countries,Дійсно для країн
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Цей об’єкт є шаблоном і не може бути використаний в операціях. Атрибути цієї позиції будуть копіюватися у варіанти, якщо не встановлено: ""Не копіювати"""
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Всього Замовити вважається
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Посада працівника (як-от, генеральний директор, директор тощо)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Посада працівника (як-от, генеральний директор, директор тощо)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Курс, за яким валюта покупця конвертується у базову валюту покупця"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Курс планування Інструмент
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Рядок # {0}: Вхідний рахунок-фактура не може бути зроблений щодо існуючого активу {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Терміново] Помилка при створенні повторюваних% s для% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Терміново] Помилка при створенні повторюваних% s для% s
 DocType: Item Tax,Tax Rate,Ставка податку
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} вже виділено Робітника {1} для періоду {2} в {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Вибрати пункт
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Вибрати пункт
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Вхідний рахунок-фактура {0} вже проведений
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"Ряд # {0}: Номер партії має бути таким же, як {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Перетворити в негрупповой
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Партія (багато) номенклатурних позицій.
 DocType: C-Form Invoice Detail,Invoice Date,Дата рахунку-фактури
 DocType: GL Entry,Debit Amount,Дебет Сума
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Там може бути тільки 1 аккаунт на компанію в {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,"Будь ласка, див вкладення"
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Там може бути тільки 1 аккаунт на компанію в {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,"Будь ласка, див вкладення"
 DocType: Purchase Order,% Received,% Отримано
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Створення студентських груп
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Встановлення вже завершено !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Встановлення вже завершено !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Кредит Примітка Сума
 DocType: Setup Progress Action,Action Document,Документ дій
 ,Finished Goods,Готові вироби
 DocType: Delivery Note,Instructions,Інструкції
 DocType: Quality Inspection,Inspected By,Перевірено
 DocType: Maintenance Visit,Maintenance Type,Тип Технічного обслуговування
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} не надійшли в курсі {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код товару&gt; Група предметів&gt; Бренд
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} не надійшли в курсі {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Серійний номер {0} не належить накладній {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Додати товари
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Додати товари
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Параметр сертифікату якості для номенклатурної позиції
 DocType: Leave Application,Leave Approver Name,Ім'я погоджувача відпустки
 DocType: Depreciation Schedule,Schedule Date,Розклад Дата
@@ -492,7 +503,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Робочі години
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Змінити стартову / поточний порядковий номер існуючого ряду.
 DocType: Dosage Strength,Strength,Сила
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Створення нового клієнта
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Створення нового клієнта
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Якщо кілька правил ціноутворення продовжують переважати, користувачам пропонується встановити пріоритет вручну та вирішити конфлікт."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Створення замовлень на поставку
 ,Purchase Register,Реєстр закупівель
@@ -511,7 +522,7 @@
 DocType: Lab Test Template,Single,Одиночний
 DocType: Salary Slip,Total Loan Repayment,Загальна сума погашення кредиту
 DocType: Account,Cost of Goods Sold,Вартість проданих товарів
-DocType: Purchase Invoice,Yearly,Річний
+DocType: Subscription,Yearly,Річний
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,"Будь ласка, введіть центр витрат"
 DocType: Drug Prescription,Dosage,Дозування
 DocType: Journal Entry Account,Sales Order,Замовлення клієнта
@@ -542,7 +553,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобальні налаштування для всіх виробничих процесів.
 DocType: Accounts Settings,Accounts Frozen Upto,Рахунки заблоковано по
 DocType: SMS Log,Sent On,Відправлено На
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} вибрано кілька разів в таблиці атрибутів
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} вибрано кілька разів в таблиці атрибутів
 DocType: HR Settings,Employee record is created using selected field. ,Співробітник запис створено за допомогою обраного поля.
 DocType: Sales Order,Not Applicable,Не застосовується
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Майстер вихідних.
@@ -568,13 +579,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,"Всього листя, виділені є обов&#39;язковим"
 DocType: Patient,AB Positive,AB Positive
 DocType: Job Opening,Description of a Job Opening,Опис роботу Відкриття
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,В очікуванні діяльність на сьогоднішній день
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,В очікуванні діяльність на сьогоднішній день
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Запис відвідування.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Компонент зарплати для відомостей основаних на тебелях
 DocType: Sales Order Item,Used for Production Plan,Використовується для виробничого плану
 DocType: Employee Loan,Total Payment,Загальна оплата
 DocType: Manufacturing Settings,Time Between Operations (in mins),Час між операціями (в хв)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} скасовується так що дія не може бути завершена
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} є скасованим так що дія не може бути завершена
 DocType: Customer,Buyer of Goods and Services.,Покупець товарів і послуг.
 DocType: Journal Entry,Accounts Payable,Кредиторська заборгованість
 DocType: Patient,Allergies,Алергія
@@ -586,23 +597,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Попереджати замовлення на купівлю
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Перерахуйте деякі з ваших клієнтів. Вони можуть бути організації або окремі особи.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Досить частини для зборки
+DocType: POS Profile User,POS Profile User,Користувач POS Профіль
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Пряма прибуток
 DocType: Patient Appointment,Date TIme,"Дата, час"
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Не можете фільтрувати на основі рахунку, якщо рахунок згруповані по"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Адміністративний співробітник
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,"Будь ласка, виберіть курс"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,"Будь ласка, виберіть курс"
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,"Будь ласка, виберіть курс"
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,"Будь ласка, виберіть курс"
 DocType: Codification Table,Codification Table,Таблиця кодифікації
 DocType: Timesheet Detail,Hrs,годин
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,"Будь ласка, виберіть компанію"
 DocType: Stock Entry Detail,Difference Account,Рахунок різниці
 DocType: Purchase Invoice,Supplier GSTIN,Постачальник GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Неможливо закрити завдання, як її залежить завдання {0} не закрите."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,"Будь ласка, введіть Склад для якого буде створено Замовлення матеріалів"
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Неможливо закрити завдання, як її залежить завдання {0} не закрите."
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Будь ласка, введіть Склад для якого буде створено Замовлення матеріалів"
 DocType: Production Order,Additional Operating Cost,Додаткова Експлуатаційні витрати
 DocType: Lab Test Template,Lab Routine,Лабораторна програма
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Косметика
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Щоб об&#39;єднати, наступні властивості повинні бути однаковими для обох пунктів"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Щоб об&#39;єднати, наступні властивості повинні бути однаковими для обох пунктів"
 DocType: Shipping Rule,Net Weight,Вага нетто
 DocType: Employee,Emergency Phone,Аварійний телефон
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Купівля
@@ -613,7 +625,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,"Будь ласка, визначте клас для Threshold 0%"
 DocType: Sales Order,To Deliver,Доставити
 DocType: Purchase Invoice Item,Item,Номенклатура
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Серійний номер не може бути дробовим
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Висока чутливість
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Серійний номер не може бути дробовим
 DocType: Journal Entry,Difference (Dr - Cr),Різниця (Д - Cr)
 DocType: Account,Profit and Loss,Про прибутки та збитки
 DocType: Patient,Risk Factors,Фактори ризику
@@ -622,7 +635,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Управління субпідрядом
 DocType: Vital Signs,Body Temperature,Температура тіла
 DocType: Project,Project will be accessible on the website to these users,Проект буде доступний на веб-сайті для цих користувачів
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Визначте тип проекту.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Визначте тип проекту.
 DocType: Supplier Scorecard,Weighting Function,Вагова функція
 DocType: Physician,OP Consulting Charge,ОП Консалтинговий збір
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Налаштуйте свій
@@ -636,7 +649,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Приріст не може бути 0
 DocType: Production Planning Tool,Material Requirement,Вимога Матеріал
 DocType: Company,Delete Company Transactions,Видалити операції компанії
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Посилання № та дата Reference є обов&#39;язковим для операції банку
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Посилання № та дата Reference є обов&#39;язковим для операції банку
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Додати / редагувати податки та збори
 DocType: Payment Entry Reference,Supplier Invoice No,Номер рахунку постачальника
 DocType: Territory,For reference,Для довідки
@@ -644,12 +657,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Не вдається видалити Серійний номер {0}, оскільки він використовується у складських операціях"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),На кінець (Кт)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Здравствуйте
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,перемістити елемент
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,перемістити елемент
 DocType: Serial No,Warranty Period (Days),Гарантійний термін (днів)
 DocType: Installation Note Item,Installation Note Item,Номенклатура відмітки про встановлення
 DocType: Production Plan Item,Pending Qty,К-сть в очікуванні
 DocType: Budget,Ignore,Ігнорувати
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} не активний
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} не активний
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Встановіть розміри чеку для друку
 DocType: Salary Slip,Salary Slip Timesheet,Табель зарплатного розрахунку
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Склад постачальника - обов'язковий для прихідних накладних субпідрядників
@@ -658,7 +671,7 @@
 DocType: Pricing Rule,Sales Partner,Торговий партнер
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Усі постачальники показників.
 DocType: Buying Settings,Purchase Receipt Required,Потрібна прихідна накладна
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Собівартість обов'язкова при введенні залишків
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,Собівартість обов'язкова при введенні залишків
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Не знайдено записів у таблиці рахунку-фактури
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Будь ласка, виберіть компанію та контрагента спершу"
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Фінансова / звітний рік.
@@ -695,7 +708,7 @@
 DocType: Quotation,Quotation To,Пропозиція для
 DocType: Lead,Middle Income,Середній дохід
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),На початок (Кт)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"За замовчуванням Одиниця виміру для п {0} не може бути змінений безпосередньо, тому що ви вже зробили деякі угоди (угод) з іншим UOM. Вам потрібно буде створити новий пункт для використання іншого замовчуванням одиниця виміру."
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"За замовчуванням Одиниця виміру для п {0} не може бути змінений безпосередньо, тому що ви вже зробили деякі угоди (угод) з іншим UOM. Вам потрібно буде створити новий пункт для використання іншого замовчуванням одиниця виміру."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Розподілена сума не може бути негативною
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,"Будь ласка, встановіть компанії"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,"Будь ласка, встановіть компанії"
@@ -710,6 +723,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Виберіть Обліковий запис Оплата зробити Банк Стажер
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Створення записів співробітників для управління листя, витрат і заробітної плати претензій"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Період призначення
+DocType: Restaurant Reservation,Restaurant Reservation,Бронювання ресторану
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Пропозиція Написання
 DocType: Payment Entry Deduction,Payment Entry Deduction,Відрахування з Оплати
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Інший Відповідальний з продажу {0} існує з тим же ідентифікатором працівника
@@ -717,7 +731,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Masters
 DocType: Assessment Plan,Maximum Assessment Score,Максимальний бал оцінки
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Оновлення дат банківських операцій
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,відстеження часу
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,відстеження часу
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,Дублює ДЛЯ TRANSPORTER
 DocType: Fiscal Year Company,Fiscal Year Company,Компанія фінансовий року
 DocType: Packing Slip Item,DN Detail,DN Деталь
@@ -725,8 +739,9 @@
 DocType: Timesheet,Billed,Виставлено рахунки
 DocType: Batch,Batch Description,Опис партії
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Створення студентських груп
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Обліковий запис платіжного шлюзу не створено, створіть його вручну будь-ласка."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Обліковий запис платіжного шлюзу не створено, створіть його вручну будь-ласка."
 DocType: Supplier Scorecard,Per Year,В рік
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Недоступно для вступу в цю програму згідно з DOB
 DocType: Sales Invoice,Sales Taxes and Charges,Податки та збори з продажу
 DocType: Employee,Organization Profile,Профіль організації
 DocType: Vital Signs,Height (In Meter),Висота (в метрі)
@@ -762,7 +777,7 @@
 DocType: Student Batch Name,Batch Name,пакетна Ім&#39;я
 DocType: Fee Validity,Max number of visit,Максимальна кількість відвідувань
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Табель робочого часу створено:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},"Будь ласка, встановіть Cash замовчуванням або банківського рахунку в режимі з оплати {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},"Будь ласка, встановіть Cash замовчуванням або банківського рахунку в режимі з оплати {0}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,зараховувати
 DocType: GST Settings,GST Settings,налаштування GST
 DocType: Selling Settings,Customer Naming By,Називати клієнтів по
@@ -794,15 +809,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Податки та збори з кінцевої вартості
 DocType: Production Order Operation,Actual Start Time,Фактичний початок Час
 DocType: BOM Operation,Operation Time,Час роботи
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,обробка
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,обробка
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,база
 DocType: Timesheet,Total Billed Hours,Всього Оплачувані Годинник
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Списання Сума
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Списання Сума
 DocType: Leave Block List Allow,Allow User,Дозволити користувачеві
 DocType: Journal Entry,Bill No,Bill №
 DocType: Company,Gain/Loss Account on Asset Disposal,Рахунок прибутків/збитків при ліквідації активів
 DocType: Vehicle Log,Service Details,сервіс Детальніше
-DocType: Purchase Invoice,Quarterly,Щоквартальний
+DocType: Subscription,Quarterly,Щоквартальний
 DocType: Lab Test Template,Grouped,Групувати
 DocType: Selling Settings,Delivery Note Required,Необхідна накладна
 DocType: Bank Guarantee,Bank Guarantee Number,Банківська гарантія Кількість
@@ -812,12 +827,12 @@
 DocType: Student Attendance,Student Attendance,Student Учасники
 DocType: Sales Invoice Timesheet,Time Sheet,Розклад
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,З зворотним промиванням Сировина матеріали на основі
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,"Будь ласка, введіть дані товаром"
 DocType: Interest,Interest,інтерес
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Препродаж
 DocType: Purchase Receipt,Other Details,Інші подробиці
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,Тестовий шаблон
+DocType: Restaurant Order Entry Item,Served,Подається
 DocType: Account,Accounts,Бухгалтерські рахунки
 DocType: Vehicle,Odometer Value (Last),Одометр Value (Last)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Шаблони критеріїв показників постачальників.
@@ -829,26 +844,28 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Попередній перегляд Зарплатного розрахунку
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Рахунок {0} був введений кілька разів
 DocType: Account,Expenses Included In Valuation,"Витрати, що включаються в оцінку"
-DocType: Hub Settings,Seller City,Продавець Місто
 ,Absent Student Report,Відсутня Student Report
 DocType: Email Digest,Next email will be sent on:,Наступна буде відправлено листа на:
 DocType: Offer Letter Term,Offer Letter Term,Пропозиція Лист термін
 DocType: Supplier Scorecard,Per Week,На тиждень
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Номенклатурна позиція має варіанти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Номенклатурна позиція має варіанти.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Загальна кількість студентів
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Пункт {0} знайдений
 DocType: Bin,Stock Value,Значення запасів
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,Плата за реєстрацію буде створено у фоновому режимі. У випадку помилки повідомлення про помилку буде оновлено в Розкладі.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Компанія {0} не існує
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} діє до {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} діє до {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Тип Дерева
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Кількість Споживана за одиницю
 DocType: Serial No,Warranty Expiry Date,Термін дії гарантії
 DocType: Material Request Item,Quantity and Warehouse,Кількість і Склад
+DocType: Hub Settings,Unregister,Скасувати реєстрацію
 DocType: Sales Invoice,Commission Rate (%),Ставка комісії (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,"Будь ласка, виберіть Програми"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,"Будь ласка, виберіть Програми"
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,"Будь ласка, виберіть Програми"
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,"Будь ласка, виберіть Програми"
 DocType: Project,Estimated Cost,орієнтовна вартість
 DocType: Purchase Order,Link to material requests,Посилання на матеріал запитів
+DocType: Hub Settings,Publish,Опублікувати
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Авіаційно-космічний
 DocType: Journal Entry,Credit Card Entry,Вступ Кредитна карта
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Компанія та Рахунки
@@ -859,13 +876,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Закрити Opportunity Після днів
 ,Reserved,Зарезервований
 DocType: Purchase Order,Supply Raw Materials,Постачання сировини
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Дата, на яку буде створений наступний рахунок-фактура. Генерується після проведення."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Оборотні активи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} не відноситься до інвентаря
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',"Будь ласка, поділіться своїм відгуком до тренінгу, натиснувши &quot;Навчальний відгук&quot;, а потім &quot;Нове&quot;"
 DocType: Mode of Payment Account,Default Account,Рахунок/обліковий запис за замовчуванням
 DocType: Payment Entry,Received Amount (Company Currency),Отримана сума (Компанія Валюта)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,"Lead повинен бути встановлений, якщо Нагода зроблена з Lead"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,"Lead повинен бути встановлений, якщо Нагода зроблена з Lead"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Будь ласка, виберіть щотижневий вихідний день"
 DocType: Patient,O Negative,O негативний
 DocType: Production Order Operation,Planned End Time,Плановані Час закінчення
@@ -881,10 +897,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Енергія
 DocType: Opportunity,Opportunity From,Нагода від
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Щомісячна виписка зарплата.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Додати компанію
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,"Рядок {0}: {1} Серійні номери, необхідні для пункту {2}. Ви надали {3}."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,"Рядок {0}: {1} Серійні номери, необхідні для пункту {2}. Ви надали {3}."
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,"Будь ласка, виберіть таблицю"
 DocType: BOM,Website Specifications,Характеристики веб-сайту
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} - це недійсна електронна адреса в &quot;Одержувачі&quot;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} - це недійсна електронна адреса в &quot;Одержувачі&quot;
 DocType: Special Test Items,Particulars,Особливості
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Антибіотик.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: З {0} типу {1}
@@ -892,11 +908,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коефіцієнт перетворення є обов&#39;язковим
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Кілька Ціна Правила існує з тими ж критеріями, будь ласка вирішити конфлікт шляхом присвоєння пріоритету. Ціна Правила: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете деактивувати або скасувати норми витрат, якщо вони пов'язані з іншими"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете деактивувати або скасувати норми витрат, якщо вони пов'язані з іншими"
 DocType: Opportunity,Maintenance,Технічне обслуговування
 DocType: Item Attribute Value,Item Attribute Value,Стан Значення атрибуту
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Кампанії з продажу.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Створити табель робочого часу
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Створити табель робочого часу
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -934,12 +950,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,"Будь ласка, введіть перший пункт"
 DocType: Account,Liability,Відповідальність
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Санкціонований сума не може бути більше, ніж претензії Сума в рядку {0}."
+DocType: Salary Detail,Do not include in total,Не включайте в цілому
 DocType: Company,Default Cost of Goods Sold Account,Рахунок собівартості проданих товарів за замовчуванням
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Прайс-лист не вибраний
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Прайс-лист не вибраний
 DocType: Employee,Family Background,Сімейні обставини
 DocType: Request for Quotation Supplier,Send Email,Відправити e-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Увага: Невірне долучення {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Немає доступу
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Увага: Невірне долучення {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Немає доступу
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Писати пишуть запит
 DocType: Vital Signs,Heart Rate / Pulse,Серцевий ритм / імпульс
 DocType: Company,Default Bank Account,Банківський рахунок за замовчуванням
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Щоб відфільтрувати на основі партії, виберіть партія першого типу"
@@ -967,12 +985,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Пункт Рядок {IDX}: {доктайпів} {DOCNAME} не існує в вище &#39;{доктайпів}&#39; таблиця
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Табель {0} вже завершено або скасовано
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,немає завдання
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","День місяця, в який авто-рахунок-фактура буде створений, наприклад, 05, 28 і т.д."
 DocType: Item Variant Settings,Copy Fields to Variant,Копіювати поля до варіанта
 DocType: Asset,Opening Accumulated Depreciation,Накопичений знос на момент відкриття
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Оцінка повинна бути менше або дорівнює 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Програма Зарахування Tool
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,С-Form записи
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,С-Form записи
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Покупець та Постачальник
 DocType: Email Digest,Email Digest Settings,Налаштування відправлення дайджестів
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Дякуємо Вам за співпрацю!
@@ -990,13 +1007,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Статус цитати
 DocType: Maintenance Visit,Completion Status,Статус завершення
 DocType: HR Settings,Enter retirement age in years,Введіть вік виходу на пенсію в роках
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Склад призначення
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,"Будь ласка, виберіть склад"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Склад призначення
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,"Будь ласка, виберіть склад"
 DocType: Cheque Print Template,Starting location from left edge,Лівий відступ
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволити перевищення доставки або накладної до цього відсотка
 DocType: Stock Entry,STE-,стереотипами
 DocType: Upload Attendance,Import Attendance,Імпорт Відвідуваності
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Всі Групи товарів
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Всі Групи товарів
 DocType: Process Payroll,Activity Log,Журнал активності
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Чистий прибуток / збиток
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Автоматично написати повідомлення за поданням угод.
@@ -1008,7 +1025,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Прогнозована к-сть
 DocType: Sales Invoice,Payment Due Date,Дата платежу
 DocType: Drug Prescription,Interval UOM,Інтервал УОМ
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Вже існує варіант позиції {0} з такими атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Вже існує варіант позиції {0} з такими атрибутами
+DocType: Item,Hub Publishing Details,Публікація концентратора
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',"""Відкривається"""
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Відкрити To Do
 DocType: Notification Control,Delivery Note Message,Доставка Примітка Повідомлення
@@ -1028,10 +1046,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,"BOM # {0}: сировина не може бути такою ж, як основний елемент"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Всього Застосовуються збори в таблиці Purchase квитанцій Елементів повинні бути такими ж, як всі податки і збори"
 DocType: Sales Team,Incentives,Стимули
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Зареєструватися для концентратора
 DocType: SMS Log,Requested Numbers,Необхідні Номери
 DocType: Production Planning Tool,Only Obtain Raw Materials,Отримати тільки сировину
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Продуктивність оцінка.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Включення &quot;Використовувати для Кошику», як Кошик включена і має бути принаймні один податок Правило Кошик"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Включення &quot;Використовувати для Кошику», як Кошик включена і має бути принаймні один податок Правило Кошик"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Документ оплати {0} прив'язаний до замовлення {1}, перевірте, чи не потрібно підтягнути це як передоплату у цьому рахунку-фактурі."
 DocType: Sales Invoice Item,Stock Details,Фото Деталі
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Вартість проекту
@@ -1050,12 +1069,14 @@
 DocType: Salary Slip,Working Days,Робочі дні
 DocType: Serial No,Incoming Rate,Прихідна вартість
 DocType: Packing Slip,Gross Weight,Вага брутто
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,"Назва вашої компанії, для якої ви налаштовуєте цю систему."
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Увімкнути концентратор
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,"Назва вашої компанії, для якої ви налаштовуєте цю систему."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Включити вихідні в загальну кількість робочих днів
 DocType: Job Applicant,Hold,Тримати
 DocType: Employee,Date of Joining,Дата влаштування
 DocType: Naming Series,Update Series,Серія Оновлення
 DocType: Supplier Quotation,Is Subcontracted,Субпідряджено
+DocType: Restaurant Table,Minimum Seating,Мінімальна кількість сидінь
 DocType: Item Attribute,Item Attribute Values,Пункт значень атрибутів
 DocType: Examination Result,Examination Result,експертиза Результат
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Прихідна накладна
@@ -1066,13 +1087,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Неможливо знайти часовий інтервал в найближчі {0} днів для роботи {1}
 DocType: Production Order,Plan material for sub-assemblies,План матеріал для суб-вузлів
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Торгові партнери та території
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,Документ Норми витрат {0} повинен бути активним
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,Документ Норми витрат {0} повинен бути активним
 DocType: Journal Entry,Depreciation Entry,Операція амортизації
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Будь ласка, виберіть тип документа в першу чергу"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Скасування матеріалів переглядів {0} до скасування цього обслуговування візит
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Серійний номер {0} не належить до номенклатурної позиції {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Необхідна к-сть
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Склади з існуючої транзакції не можуть бути перетворені в бухгалтерській книзі.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Склади з існуючої транзакції не можуть бути перетворені в бухгалтерській книзі.
 DocType: Bank Reconciliation,Total Amount,Загалом
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Інтернет видання
 DocType: Prescription Duration,Number,Номер
@@ -1083,7 +1104,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Продажі Прайс-лист
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Якщо буде встановлено прапорець, клієнт буде створений, підключений до пацієнта. З цією Клієнтом буде створено рахунки-пацієнти. Ви також можете вибрати існуючого Клієнта під час створення пацієнта."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Опублікувати синхронізувати елементи
 DocType: Bank Reconciliation,Account Currency,Валюта рахунку
 DocType: Lab Test,Sample ID,Ідентифікатор зразка
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,"Будь ласка, вкажіть округлити рахунок в Компанії"
@@ -1092,11 +1112,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Працівник {0} не є активним або не існує
 DocType: Fee Structure,Components,компоненти
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},"Будь ласка, введіть Asset Категорія в пункті {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Варіанти позиції {0} оновлено
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Варіанти позиції {0} оновлено
 DocType: Quality Inspection Reading,Reading 6,Читання 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Може не {0} {1} {2} без будь-якого негативного видатний рахунок-фактура
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","бути згенерованим. Якщо буде затримано, вам доведеться вручну змінити поле &quot;Повторити в день місяця&quot;"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Може не {0} {1} {2} без будь-якого негативного видатний рахунок-фактура
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Передоплата по вхідному рахунку
-DocType: Hub Settings,Sync Now,Синхронізувати зараз
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Ряд {0}: Кредитна запис не може бути пов&#39;язаний з {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Визначити бюджет на бюджетний період
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Обліковий запис за замовчуванням банк / Ксерокопіювання буде автоматично оновлюватися в POS фактурі коли обрано цей режим.
@@ -1108,13 +1129,13 @@
 DocType: Item,Is Purchase Item,Покупний товар
 DocType: Asset,Purchase Invoice,Вхідний рахунок-фактура
 DocType: Stock Ledger Entry,Voucher Detail No,Документ номер
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Новий вихідний рахунок
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Новий вихідний рахунок
 DocType: Stock Entry,Total Outgoing Value,Загальна сума розходу
 DocType: Physician,Appointments,Призначення
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Дата відкриття та дата закриття повинні бути в межах одного фінансового року
 DocType: Lead,Request for Information,Запит інформації
 ,LeaderBoard,LEADERBOARD
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Синхронізація Offline рахунків-фактур
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Синхронізація Offline рахунків-фактур
 DocType: Payment Request,Paid,Оплачений
 DocType: Program Fee,Program Fee,вартість програми
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1133,11 +1154,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Позиція замовлення на придбання
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Непряме прибуток
 DocType: Student Attendance Tool,Student Attendance Tool,Student Учасники Інструмент
+DocType: Restaurant Menu,Price List (Auto created),Прайс-лист (авто створений)
 DocType: Cheque Print Template,Date Settings,Налаштування дати
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Розбіжність
 ,Company Name,Назва компанії
 DocType: SMS Center,Total Message(s),Загалом повідомлень
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Вибрати пункт трансферу
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Вибрати пункт трансферу
 DocType: Purchase Invoice,Additional Discount Percentage,Додаткова знижка у відсотках
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Переглянути перелік усіх довідкових відео
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Виберіть account head банку, в якому був розміщений чек."
@@ -1155,6 +1177,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,метр
 DocType: Workstation,Electricity Cost,Вартість електроенергії
 DocType: HR Settings,Don't send Employee Birthday Reminders,Не посилати Employee народження Нагадування
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Зберегти налаштування
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Запитані продукти
 DocType: Item,Inspection Criteria,Інспекційні Критерії
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Всі передані
 DocType: BOM Website Item,BOM Website Item,BOM Сайт товару
@@ -1172,11 +1196,11 @@
 DocType: Journal Entry,Total Amount in Words,Загальна сума прописом
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Був помилка. Одна з можливих причин може бути те, що ви не зберегли форму. Будь ласка, зв&#39;яжіться з support@erpnext.com якщо проблема не усунена."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Мій кошик
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Тип замовлення повинна бути однією з {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Тип замовлення повинна бути однією з {0}
 DocType: Lead,Next Contact Date,Наступна контактна дата
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,К-сть на початок роботи
 DocType: Healthcare Settings,Appointment Reminder,Нагадування про призначення
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,"Будь ласка, введіть рахунок для суми змін"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,"Будь ласка, введіть рахунок для суми змін"
 DocType: Student Batch Name,Student Batch Name,Student Пакетне Ім&#39;я
 DocType: Consultation,Doctor,Доктор
 DocType: Holiday List,Holiday List Name,Ім'я списку вихідних
@@ -1184,12 +1208,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Розклад курсу
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Опціони
 DocType: Journal Entry Account,Expense Claim,Авансовий звіт
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Ви дійсно хочете відновити цей актив на злам?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Кількість для {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Ви дійсно хочете відновити цей актив на злам?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Кількість для {0}
 DocType: Leave Application,Leave Application,Заява на відпустку
 DocType: Patient,Patient Relation,Відносини пацієнта
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Інструмент призначення відпусток
+DocType: Item,Hub Category to Publish,Категорія концентратора для публікації
 DocType: Leave Block List,Leave Block List Dates,Дати списку блокування відпусток
+DocType: Sales Invoice,Billing Address GSTIN,Платіжна адреса GSTIN
 DocType: Workstation,Net Hour Rate,Чиста тарифна ставка
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Прихідна накладна зі всіма витратами
 DocType: Company,Default Terms,Умови за замовчуванням
@@ -1199,11 +1225,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Введіть {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Вилучені пункти без зміни в кількості або вартості.
 DocType: Delivery Note,Delivery To,Доставка Для
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Атрибут стіл є обов&#39;язковим
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Атрибут стіл є обов&#39;язковим
 DocType: Production Planning Tool,Get Sales Orders,Отримати Замовлення клієнта
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} не може бути від’ємним
 DocType: Training Event,Self-Study,Самоосвіта
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Знижка
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Знижка
 DocType: Asset,Total Number of Depreciations,Загальна кількість амортизацій
 DocType: Sales Invoice Item,Rate With Margin,Швидкість З полями
 DocType: Sales Invoice Item,Rate With Margin,Швидкість З полями
@@ -1211,7 +1237,7 @@
 DocType: Task,Urgent,Терміновий
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},"Будь ласка, вкажіть дійсний ідентифікатор рядка для рядка {0} в таблиці {1}"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Не вдається знайти змінну:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,"Будь ласка, виберіть поле для редагування з цифри"
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,"Будь ласка, виберіть поле для редагування з цифри"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Перейти до стільниці і почати користування ERPNext
 DocType: Item,Manufacturer,Виробник
 DocType: Landed Cost Item,Purchase Receipt Item,Позиція прихідної накладної
@@ -1242,8 +1268,8 @@
 DocType: GL Entry,Against,Проти
 DocType: Item,Default Selling Cost Center,Центр витрат продажу за замовчуванням
 DocType: Sales Partner,Implementation Partner,Реалізація Партнер
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Поштовий індекс
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Замовлення клієнта {0} {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Поштовий індекс
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Замовлення клієнта {0} {1}
 DocType: Opportunity,Contact Info,Контактна інформація
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Створення Руху ТМЦ
 DocType: Packing Slip,Net Weight UOM,Вага нетто Одиниця виміру
@@ -1254,6 +1280,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Отримати щотижневі вихідні
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,"Дата закінчення не може бути менше, ніж Дата початку"
 DocType: Sales Person,Select company name first.,Виберіть назву компанії в першу чергу.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Від низької до високої
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Пропозиції отримані від постачальників
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Замініть BOM та оновіть останню ціну у всіх BOMs
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Для {0} | {1} {2}
@@ -1274,7 +1301,7 @@
 DocType: Program Enrollment,Transportation,Транспорт
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,неправильний атрибут
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} повинен бути проведений
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Кількість повинна бути менше або дорівнює {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Кількість повинна бути менше або дорівнює {0}
 DocType: SMS Center,Total Characters,Загалом символів
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},"Будь ласка, виберіть Норми в полі Норми витрат для позиції {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,С-форма рахунки-фактури Подробиці
@@ -1289,7 +1316,7 @@
 ,Ordered Items To Be Billed,"Замовлені товари, на які не виставлені рахунки"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,"С Діапазон повинен бути менше, ніж діапазон"
 DocType: Global Defaults,Global Defaults,Глобальні значення за замовчуванням
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Співпраця Запрошення проекту
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Співпраця Запрошення проекту
 DocType: Salary Slip,Deductions,Відрахування
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Назва дії
@@ -1307,13 +1334,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Передоплата по вихідному рахунку
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Нічого не просити
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Бюджетний запис '{0}' вже існує проти {1} '{2}' для {3} бюджетного періоду
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"""Дата фактичного початку"" не може бути пізніше, ніж ""Дата фактичного завершення"""
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"""Дата фактичного початку"" не може бути пізніше, ніж ""Дата фактичного завершення"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Управління
 DocType: Cheque Print Template,Payer Settings,Налаштування платника
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Це буде додано до коду варіанту. Наприклад, якщо ваша абревіатура ""СМ"", і код товару ""Футболки"", тоді код варіанту буде ""Футболки-СМ"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Сума ""на руки"" (прописом) буде видно, як тільки ви збережете Зарплатний розрахунок."
 DocType: Purchase Invoice,Is Return,Повернення
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Обережно
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Обережно
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Повернення / дебетові Примітка
 DocType: Price List Country,Price List Country,Ціни Країна
 DocType: Item,UOMs,UOMs
@@ -1328,17 +1355,18 @@
 DocType: Account,Balance Sheet,Бухгалтерський баланс
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Центр витрат для позиції з кодом
 DocType: Fee Validity,Valid Till,Дійсний до
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режим оплати не налаштований. Будь ласка, перевірте, чи вибрний рахунок у Режимі Оплати або у POS-профілі."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режим оплати не налаштований. Будь ласка, перевірте, чи вибрний рахунок у Режимі Оплати або у POS-профілі."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Той же елемент не може бути введений кілька разів.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Подальші рахунки можуть бути зроблені відповідно до груп, але Ви можете бути проти НЕ-груп"
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Кредиторська заборгованість
 DocType: Course,Course Intro,курс Введення
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Рух ТМЦ {0} створено
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Будь ласка, налаштуйте серію нумерації для участі в Наборі&gt; Нумерована серія"
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Рух ТМЦ {0} створено
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ряд # {0}: Відхилену к-сть не можна вводити у Повернення постачальнику
 ,Purchase Order Items To Be Billed,"Позиції Замовлення на придбання, на які не виставлені рахунки"
 DocType: Purchase Invoice Item,Net Rate,Нетто-ставка
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,"Будь ласка, виберіть покупця"
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,"Будь ласка, виберіть покупця"
 DocType: Purchase Invoice Item,Purchase Invoice Item,Позиція вхідного рахунку
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Складська книга та Бухгалтерська книга поновлені за вибраною прихідною накладною
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Пункт 1
@@ -1359,7 +1387,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Дублікат ряд {0} з такою ж {1}
 ,Trial Balance,Оборотно-сальдова відомість
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Фінансовий рік {0} не знайдений
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Налаштування працівників
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Налаштування працівників
 DocType: Sales Order,SO-,SO-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,"Будь ласка, виберіть префікс в першу чергу"
 DocType: Employee,O-,О
@@ -1371,12 +1399,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Подивитися Леджер
 DocType: Grading Scale,Intervals,інтервали
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Найперша
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Існує група з такою самою назвою, будь ласка, змініть назву елементу або перейменуйте групу"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Існує група з такою самою назвою, будь ласка, змініть назву елементу або перейменуйте групу"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Решта світу
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Решта світу
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Позиція {0} не може мати партій
 ,Budget Variance Report,Звіт по розбіжностях бюджету
 DocType: Salary Slip,Gross Pay,Повна Платне
+DocType: Item,Is Item from Hub,Є товар від центру
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Рядок {0}: Вид діяльності є обов&#39;язковим.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,"Дивіденди, що сплачуються"
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Бухгалтерська книга
@@ -1386,8 +1415,9 @@
 DocType: Vehicle Log,Service Detail,деталь обслуговування
 DocType: BOM,Item Description,Опис товару
 DocType: Student Sibling,Student Sibling,студент Sibling
-DocType: Purchase Invoice,Is Recurring,Повторюється
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Режим компенсації
 DocType: Purchase Invoice,Supplied Items,Поставлені номенклатурні позиції
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},"Будь ласка, встановіть активне меню для ресторану {0}"
 DocType: Student,STUD.,Гвинтове.
 DocType: Production Order,Qty To Manufacture,К-сть для виробництва
 DocType: Email Digest,New Income,нові надходження
@@ -1398,6 +1428,7 @@
 ,Student and Guardian Contact Details,Студент і дбайливець Контактна інформація
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Рядок {0}: Для постачальника {0} Адреса електронної пошти необхідно надіслати електронною поштою
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Тимчасове відкриття
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Переглянути концентратор
 ,Employee Leave Balance,Залишок днів відпусток працівника
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Сальдо на рахунку {0} повинно бути завжди {1}
 DocType: Patient Appointment,More Info,Більше інформації
@@ -1417,13 +1448,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Замовлення клієнта {0} не є допустимим
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Попереджати новий запит на котирування
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Замовлення допоможуть вам планувати і стежити за ваші покупки
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","На жаль, компанії не можуть бути об&#39;єднані"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","На жаль, компанії не можуть бути об&#39;єднані"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Лабораторія тестових рецептів
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Загальна кількість  / Переміщена кількість {0} у Замовленні матеріалів {1} \ не може бути більше необхідної кількості {2} для позиції {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Невеликий
 DocType: Employee,Employee Number,Кількість працівників
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Справа Ні (и) вже використовується. Спробуйте зі справи № {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Справа Ні (и) вже використовується. Спробуйте зі справи № {0}
 DocType: Project,% Completed,% Завершено
 ,Invoiced Amount (Exculsive Tax),Сума за рахунками (Exculsive вартість)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Пункт 2
@@ -1438,11 +1469,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Непрямі витрати
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Ряд {0}: Кількість обов&#39;язково
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Сільське господарство
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Дані майстра синхронізації
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Дані майстра синхронізації
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Ваші продукти або послуги
 DocType: Special Test Items,Special Test Items,Спеціальні тестові елементи
 DocType: Mode of Payment,Mode of Payment,Спосіб платежу
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Зображення для веб-сайту має бути загальнодоступним файлом або адресою веб-сайту
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Зображення для веб-сайту має бути загальнодоступним файлом або адресою веб-сайту
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,Норми
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Це кореневий елемент групи і не можуть бути змінені.
@@ -1450,9 +1481,9 @@
 DocType: Vehicle,Fuel UOM,паливо UOM
 DocType: Warehouse,Warehouse Contact Info,Контактні дані складу
 DocType: Payment Entry,Write Off Difference Amount,Списання різниця в
-DocType: Purchase Invoice,Recurring Type,Тип періодичністі
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: Не знайдено електронної пошти працівника, тому e-mail не відправлено"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: Не знайдено електронної пошти працівника, тому e-mail не відправлено"
 DocType: Item,Foreign Trade Details,зовнішньоторговельна Детальніше
+,Assessment Plan Status,Статус плану оцінки
 DocType: Email Digest,Annual Income,Річний дохід
 DocType: Serial No,Serial No Details,Серійний номер деталі
 DocType: Purchase Invoice Item,Item Tax Rate,Податкова ставка
@@ -1460,15 +1491,14 @@
 DocType: Student Group Student,Group Roll Number,Група Ролл Кількість
 DocType: Student Group Student,Group Roll Number,Група Ролл Кількість
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, тільки кредитні рахунки можуть бути пов&#39;язані з іншою дебету"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Сума всіх ваг завдання повинна бути 1. Будь ласка, поміняйте ваги всіх завдань проекту, відповідно,"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Накладна {0} не проведена
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Сума всіх ваг завдання повинна бути 1. Будь ласка, поміняйте ваги всіх завдань проекту, відповідно,"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Накладна {0} не проведена
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Позиція {0} має бути субпідрядною
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Капітальні обладнання
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Цінове правило базується на полі ""Застосовується до"", у якому можуть бути: номенклатурна позиція, група або бренд."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,"Будь ласка, спочатку встановіть Код товару"
-DocType: Hub Settings,Seller Website,Веб-сайт продавця
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,"Будь ласка, спочатку встановіть Код товару"
 DocType: Item,ITEM-,item-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Всього виділено відсоток для відділу продажів повинна бути 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Всього виділено відсоток для відділу продажів повинна бути 100
 DocType: Sales Invoice Item,Edit Description,Редагувати опис
 DocType: Antibiotic,Antibiotic,Антибіотик
 ,Team Updates,команда поновлення
@@ -1489,12 +1519,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Загалом (у валюті компанії)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Серійний номер {0} введений більше ніж один раз
 DocType: Depreciation Schedule,Journal Entry,Проводка
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} виготовляються товари
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} виготовляються товари
 DocType: Workstation,Workstation Name,Назва робочої станції
 DocType: Grading Scale Interval,Grade Code,код Оцінка
 DocType: POS Item Group,POS Item Group,POS Item Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Електронна пошта Дайджест:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},Норми {0} не належать до позиції {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},Норми {0} не належать до позиції {1}
 DocType: Sales Partner,Target Distribution,Розподіл цілей
 DocType: Salary Slip,Bank Account No.,№ банківського рахунку
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Це номер останнього створеного операції з цим префіксом
@@ -1511,10 +1541,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Запит на комерційну пропозицію Постачальника
 DocType: Healthcare Settings,Registration Message,Реєстраційне повідомлення
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Апаратний
-DocType: Sales Order,Recurring Upto,повторювані Upto
 DocType: Prescription Dosage,Prescription Dosage,Рецептурна доза
 DocType: Attendance,HR Manager,менеджер з персоналу
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,"Будь ласка, виберіть компанію"
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,"Будь ласка, виберіть компанію"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Привілейований Залишити
 DocType: Purchase Invoice,Supplier Invoice Date,Дата рахунку постачальника
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,в
@@ -1530,10 +1559,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Перекриття умови знайдені між:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,За проводкою {0} вже є прив'язані інші документи
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Загальна вартість замовлення
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Їжа
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Їжа
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Старіння Діапазон 3
 DocType: Maintenance Schedule Item,No of Visits,Кількість відвідувань
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Графік обслуговування {0} існує проти {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Ви хочете опублікувати свої елементи в концентраторі?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,поступово студент
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валюта закритті рахунку повинні бути {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Сума балів за всі цілі повинні бути 100. Зараз {0}
@@ -1544,9 +1574,9 @@
 DocType: Authorization Rule,Average Discount,Середня Знижка
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Комунальні послуги
-DocType: Purchase Invoice Item,Accounting,Бухгалтерський облік
+DocType: POS Profile,Accounting,Бухгалтерський облік
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,"Будь ласка, виберіть партію для дозованого пункту"
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,"Будь ласка, виберіть партію для дозованого пункту"
 DocType: Asset,Depreciation Schedules,Розклади амортизації
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Термін подачі заяв не може бути за межами періоду призначених відпусток
 DocType: Activity Cost,Projects,Проекти
@@ -1562,7 +1592,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',Статус офіційного затвердження повинні бути «Схвалено&quot; або &quot;Відхилено&quot;
 DocType: Physician,Contacts and Address,Контакти та адреса
 DocType: Purchase Invoice,Contact Person,Контактна особа
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"""Дата очікуваного початку"" не може бути пізніше, ніж ""Дата очікуваного закінчення"""
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""Дата очікуваного початку"" не може бути пізніше, ніж ""Дата очікуваного закінчення"""
 DocType: Course Scheduling Tool,Course End Date,Курс Дата закінчення
 DocType: Holiday List,Holidays,Вихідні
 DocType: Sales Order Item,Planned Quantity,Плановані Кількість
@@ -1570,10 +1600,11 @@
 DocType: Item,Maintain Stock,Відстежувати наявність
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Рухи ТМЦ вже створено для виробничого замовлення
 DocType: Employee,Prefered Email,Бажаний E-mail
+DocType: Student Admission,Eligibility and Details,Відповідність та подробиці
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Чиста зміна в основних фондів
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Залиште порожнім, якщо для всіх посад"
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Нарахування типу &quot;Актуальні &#39;в рядку {0} не можуть бути включені в п Оцінити
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Макс: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Макс: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,З DateTime
 DocType: Email Digest,For Company,За компанію
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Журнал з&#39;єднань.
@@ -1581,19 +1612,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Варіатор оцінки скорингової картки постачальника
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Сума купівлі
 DocType: Sales Invoice,Shipping Address Name,Ім'я адреси доставки
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,План рахунків
 DocType: Material Request,Terms and Conditions Content,Зміст положень та умов
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,не може бути більше ніж 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Номенклатурна позиція {0} не є інвентарною
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Номенклатурна позиція {0} не є інвентарною
 DocType: Maintenance Visit,Unscheduled,Позапланові
 DocType: Employee,Owned,Бувший
 DocType: Salary Detail,Depends on Leave Without Pay,Залежить у відпустці без
 DocType: Pricing Rule,"Higher the number, higher the priority","Чим вище число, тим вище пріоритет"
 ,Purchase Invoice Trends,Динаміка вхідних рахунків
 DocType: Employee,Better Prospects,Кращі перспективи
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Рядок # {0}: Завантаження {1} має тільки {2} Кількість. Будь ласка, виберіть іншу партію, яка має {3} Кількість доступні або розділити рядок на кілька рядків, щоб доставити / випуск з декількох партій"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Рядок # {0}: Завантаження {1} має тільки {2} Кількість. Будь ласка, виберіть іншу партію, яка має {3} Кількість доступні або розділити рядок на кілька рядків, щоб доставити / випуск з декількох партій"
 DocType: Vehicle,License Plate,Номерний знак
 DocType: Appraisal,Goals,Мети
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Виберіть POS Profile
 DocType: Warranty Claim,Warranty / AMC Status,Гарантія / Статус річного обслуговування
 ,Accounts Browser,Переглядач рахунків
 DocType: Payment Entry Reference,Payment Entry Reference,Номер документу Оплата
@@ -1611,7 +1642,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Співробітник не може повідомити собі.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Якщо обліковий запис заморожується, записи дозволяється заборонених користувачів."
 DocType: Email Digest,Bank Balance,Банківський баланс
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Облік Вхід для {0}: {1} можуть бути зроблені тільки у валюті: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Облік Вхід для {0}: {1} можуть бути зроблені тільки у валюті: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Профіль роботи, потрібна кваліфікація і т.д."
 DocType: Journal Entry Account,Account Balance,Баланс
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Податкове правило для операцій
@@ -1620,8 +1651,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Податки та збори разом (Валюта компанії)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Показати сальдо прибутків/збитків незакритого фіскального року
 DocType: Lab Test Template,Collection Details,Інформація про колекцію
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","виберіть cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date з tabConsultation ct, `tabLab Prescription` cp, де ct.patient = &#39;{0}&#39; і cp.parent = ct. ім&#39;я та cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Рахунок доставки
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Рахунок {2} неактивний
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,"Зробити замовлення клієнтів, щоб допомогти вам спланувати роботу і поставити на час"
@@ -1638,7 +1667,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Пакувальний лист
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Оренда площі для офісу
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Встановіть налаштування шлюзу SMS
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Імпорт вдалося!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Імпорт вдалося!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Жодної адреси ще не додано
 DocType: Workstation Working Hour,Workstation Working Hour,Робочі години робочої станції
 DocType: Vital Signs,Blood Pressure,Кров&#39;яний тиск
@@ -1663,7 +1692,7 @@
 DocType: Sales Invoice,Source,Джерело
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Показати закрито
 DocType: Leave Type,Is Leave Without Pay,Є відпустці без
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Категорія активів є обов&#39;язковим для фіксованого елемента активів
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Категорія активів є обов&#39;язковим для фіксованого елемента активів
 DocType: Fee Validity,Fee Validity,Ступінь сплати
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Записи не знайдені в таблиці Оплата
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Це {0} конфлікти з {1} для {2} {3}
@@ -1684,8 +1713,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,створення потенційних
 DocType: Maintenance Schedule,Schedules,Розклади
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,Позиційний профіль вимагає використання Point-of-Sale
 DocType: Purchase Invoice Item,Net Amount,Чиста сума
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} не був представлений таким чином, дія не може бути завершена"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} не був підтвердженим таким чином, дія не може бути завершена"
 DocType: Purchase Order Item Supplied,BOM Detail No,Номер деталі у нормах
 DocType: Landed Cost Voucher,Additional Charges,додаткові збори
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Додаткова знижка Сума (валюта компанії)
@@ -1694,7 +1724,7 @@
 ,Support Hour Distribution,Час розповсюдження підтримки
 DocType: Maintenance Visit,Maintenance Visit,Візит для тех. обслуговування
 DocType: Student,Leaving Certificate Number,Залишивши номер сертифіката
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Призначення скасовано, будь ласка перегляньте та скасуйте рахунок-фактуру {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Призначення скасовано, будь ласка перегляньте та скасуйте рахунок-фактуру {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Доступна к-сть партії на складі
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Оновлення Формат друку
 DocType: Landed Cost Voucher,Landed Cost Help,Довідка з кінцевої вартості
@@ -1717,8 +1747,8 @@
 DocType: Patient,Tobacco Past Use,Тютюн в минулому використанні
 DocType: Sales Invoice Item,Brand Name,Назва бренду
 DocType: Purchase Receipt,Transporter Details,Transporter Деталі
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Користувач {0} вже призначений лікарю {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,За замовчуванням склад потрібно для обраного елемента
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Користувач {0} вже призначений лікарю {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,За замовчуванням склад потрібно для обраного елемента
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Коробка
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,можливий постачальник
 DocType: Budget,Monthly Distribution,Місячний розподіл
@@ -1728,8 +1758,8 @@
 DocType: Sales Partner,Sales Partner Target,Цілі торгового партнеру
 DocType: Loan Type,Maximum Loan Amount,Максимальна сума кредиту
 DocType: Pricing Rule,Pricing Rule,Цінове правило
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Дублікат номер рулону для студента {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Дублікат номер рулону для студента {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Дублікат номер рулону для студента {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Дублікат номер рулону для студента {0}
 DocType: Budget,Action if Annual Budget Exceeded,"Дія, якщо річний бюджет перевищено"
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Замовлення матеріалів у Замовлення на придбання
 DocType: Shopping Cart Settings,Payment Success URL,Успіх Оплата URL
@@ -1746,7 +1776,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} повинен з'явитися лише один раз
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Не дозволяється переміщення більш {0}, ніж {1} за Замовленням на придбання {2}"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Листя номером Успішно для {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,"Немає нічого, щоб упакувати"
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,"Немає нічого, щоб упакувати"
 DocType: Shipping Rule Condition,From Value,Від вартості
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Виробництво Кількість є обов&#39;язковим
 DocType: Employee Loan,Repayment Method,спосіб погашення
@@ -1760,6 +1790,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Зобов'язання по запасах
 DocType: Purchase Invoice,Supplier Warehouse,Склад постачальника
 DocType: Opportunity,Contact Mobile No,№ мобільного Контакту
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Виберіть компанію
 ,Material Requests for which Supplier Quotations are not created,"Замовлення матеріалів, для яких не створено Пропозицій постачальника"
 DocType: Student Group,Set 0 for no limit,Встановіть 0 для жодних обмежень
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"День(дні), на якій ви подаєте заяву на відпустку - вихідні. Вам не потрібно подавати заяву."
@@ -1769,24 +1800,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Зробіть цитати
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Інші звіти
 DocType: Dependent Task,Dependent Task,Залежить Завдання
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Коефіцієнт для замовчуванням Одиниця виміру повинні бути 1 в рядку {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Коефіцієнт для замовчуванням Одиниця виміру повинні бути 1 в рядку {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Відпустка типу {0} не може бути довше ніж {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Спробуйте планувати операції X днів вперед.
 DocType: HR Settings,Stop Birthday Reminders,Стоп нагадування про дні народження
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},"Будь ласка, встановіть за замовчуванням Payroll розрахунковий рахунок в компанії {0}"
 DocType: SMS Center,Receiver List,Список отримувачів
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Пошук товару
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Пошук товару
 DocType: Patient Appointment,Referring Physician,Звернення до лікаря
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Споживана Сума
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Чиста зміна грошових коштів
 DocType: Assessment Plan,Grading Scale,оціночна шкала
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Одиниця виміру {0} був введений більш ніж один раз в таблицю перетворення фактора
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,Вже завершено
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Одиниця виміру {0} був введений більш ніж один раз в таблицю перетворення фактора
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,Вже завершено
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,товарна готівку
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Запит про оплату {0} вже існує
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Вартість виданих предметів
 DocType: Physician,Hospital,Лікарня
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},"Кількість не повинна бути більше, ніж {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},"Кількість не повинна бути більше, ніж {0}"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Попередній бюджетний період не закритий
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Вік (днів)
 DocType: Quotation Item,Quotation Item,Позиція у пропозиції
@@ -1797,8 +1828,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,головний Тип постачальника
 DocType: Purchase Order Item,Supplier Part Number,Номер деталі постачальника
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Коефіцієнт конверсії не може бути 0 або 1
-DocType: Sales Invoice,Reference Document,довідковий документ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} скасовано або припинено
+DocType: Subscription,Reference Document,довідковий документ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} скасовано або припинено
 DocType: Accounts Settings,Credit Controller,Кредитний контролер
 DocType: Delivery Note,Vehicle Dispatch Date,Відправка транспортного засобу Дата
 DocType: Healthcare Settings,Default Medical Code Standard,Стандартний стандарт медичного коду
@@ -1807,6 +1838,7 @@
 DocType: Company,Default Payable Account,Рахунок оплат за замовчуванням
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Налаштування для онлайн кошика, такі як правила доставки, прайс-лист і т.д."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Оплачено
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Сортувати за ціною ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Зарезервована к-сть
 DocType: Party Account,Party Account,Рахунок контрагента
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Кадри
@@ -1818,13 +1850,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Зробити запис виплат
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Ряд {0}: Аванси по постачальнику повинні бути у дебеті
 DocType: Company,Default Values,Значення за замовчуванням
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{} Частоти Дайджест
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{} Частоти Дайджест
 DocType: Expense Claim,Total Amount Reimbursed,Загальна сума відшкодовуються
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Це засновано на колодах проти цього транспортного засобу. Див графік нижче для отримання докладної інформації
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Згідно вхідного рахунку-фактури {0} від {1}
 DocType: Customer,Default Price List,Прайс-лист за замовчуванням
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Рух активів {0} створено
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ви не можете видаляти фінансовий рік {0}. Фінансовий рік {0} встановлено за замовчанням в розділі Глобальні параметри
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Клієнт з тим самим ім&#39;ям вже існує
 DocType: Journal Entry,Entry Type,Тип запису
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Немає план оцінки пов&#39;язаний з цією групою по оцінці
 ,Customer Credit Balance,Кредитний Баланс клієнтів
@@ -1835,7 +1868,7 @@
 DocType: Quotation,Term Details,Термін Детальніше
 DocType: Project,Total Sales Cost (via Sales Order),Загальна вартість продажів (через замовлення клієнта)
 DocType: Project,Total Sales Cost (via Sales Order),Загальна вартість продажів (через замовлення клієнта)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Не зміг зареєструвати більш {0} студентів для цієї групи студентів.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Не зміг зареєструвати більш {0} студентів для цієї групи студентів.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ведучий граф
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ведучий граф
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} має бути більше 0
@@ -1853,9 +1886,11 @@
 DocType: Lab Test,Technician Name,Ім&#39;я техніки
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Відвязувати оплати при анулюванні рахунку-фактури
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},"Поточне значення одометра увійшли має бути більше, ніж початковий одометр автомобіля {0}"
+DocType: Restaurant Reservation,No Show,Немає шоу
 DocType: Shipping Rule Country,Shipping Rule Country,Країна правил доставки
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Відпустки та відвідуваність
 DocType: Maintenance Visit,Partially Completed,Частково завершено
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Помірна чутливість
 DocType: Leave Type,Include holidays within leaves as leaves,Включити вихідні у відпустках як відпустку
 DocType: Sales Invoice,Packed Items,Упаковані товари
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Гарантія Позов проти серійним номером
@@ -1872,13 +1907,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Платні Сума (Компанія валют)
 DocType: Purchase Invoice,Additional Discount,Додаткова знижка
 DocType: Selling Settings,Selling Settings,Налаштування продаж
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Підтвердити дію
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Інтернет Аукціони
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Будь ласка, зазначте кількість або собівартість або разом"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,звершення
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Дивіться в кошик
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Маркетингові витрати
 ,Item Shortage Report,Повідомлення про нестачу номенклатурних позицій
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вагу вказано, \ nБудь ласка, вкажіть ""Одиницю виміру ваги"" теж"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вагу вказано, \ nБудь ласка, вкажіть ""Одиницю виміру ваги"" теж"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,"Замовлення матеріалів, що зробило цей Рух ТМЦ"
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Наступна дата амортизації є обов'язковою для нового активу
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Окремий курс на основі групи для кожної партії
@@ -1891,12 +1927,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Робити бух. проводку для кожного руху запасів
 DocType: Leave Allocation,Total Leaves Allocated,Загалом призначено днів відпустки
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Потрібно вказати склад у рядку № {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,"Будь ласка, введіть дійсні дати початку та закінчення бюджетного періоду"
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,"Будь ласка, введіть дійсні дати початку та закінчення бюджетного періоду"
 DocType: Employee,Date Of Retirement,Дата вибуття
 DocType: Upload Attendance,Get Template,Отримати шаблон
 DocType: Material Request,Transferred,передано
 DocType: Vehicle,Doors,двері
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,Встановлення ERPNext завершено!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,Встановлення ERPNext завершено!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Збір плати за реєстрацію пацієнтів
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,податки Розпад
@@ -1915,37 +1951,37 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Якщо ця номенклатурна позиція має варіанти, то вона не може бути обрана в замовленнях і т.д."
 DocType: Lead,Next Contact By,Наступний контакт від
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Кількість для Пункт {0} в рядку {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Кількість для Пункт {0} в рядку {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},"Склад {0} не може бути вилучений, поки існує кількість для позиції {1}"
 DocType: Quotation,Order Type,Тип замовлення
-DocType: Purchase Invoice,Notification Email Address,E-mail адреса для повідомлень
 ,Item-wise Sales Register,Попозиційний реєстр продаж
 DocType: Asset,Gross Purchase Amount,Загальна вартість придбання
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Відкриття залишків
 DocType: Asset,Depreciation Method,Метод нарахування зносу
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Offline
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Це податок Включено в базовій ставці?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Всього Цільовий
 DocType: Job Applicant,Applicant for a Job,Претендент на роботу
 DocType: Production Plan Material Request,Production Plan Material Request,Замовлення матеріалів за планом виробництва
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Немає жодних створених Виробничих замовлень
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Немає жодних створених Виробничих замовлень
 DocType: Stock Reconciliation,Reconciliation JSON,Примирення JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Забагато стовбців. Експорт звіту і роздрукувати його за допомогою програми електронної таблиці.
 DocType: Purchase Invoice Item,Batch No,Партія №
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Запит на котирування: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Дозволити кілька замовлень клієнта на один оригінал замовлення клієнта
 DocType: Student Group Instructor,Student Group Instructor,Студентська група інструкторів
 DocType: Student Group Instructor,Student Group Instructor,Студентська група інструкторів
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Немає
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Головна
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Головна
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Варіант
 DocType: Naming Series,Set prefix for numbering series on your transactions,Встановіть префікс нумерації серії ваших операцій
 DocType: Employee Attendance Tool,Employees HTML,співробітники HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Норми за замовчуванням ({0}) мають бути активними для даного елемента або його шаблону
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Норми за замовчуванням ({0}) мають бути активними для даного елемента або його шаблону
 DocType: Employee,Leave Encashed?,Оплачуване звільнення?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"Поле ""З"" у Нагоді є обов'язковим"
 DocType: Email Digest,Annual Expenses,річні витрати
 DocType: Item,Variants,Варіанти
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Зробіть Замовлення на придбання
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Зробіть Замовлення на придбання
 DocType: SMS Center,Send To,Відправити
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Недостатньо днів залишилося для типу відпусток {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Розподілена сума
@@ -1963,6 +1999,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Студентська група Strength
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,"За проводкою {0} не має ніякого невідповідного {1}, запису"
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,атестації
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Навчальні заходи
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Повторювані Серійний номер вводиться для Пункт {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Умова для Правила доставки
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Будь ласка введіть
@@ -1972,7 +2009,7 @@
 DocType: Sales Order,To Deliver and Bill,Для доставки та виставлення рахунків
 DocType: Student Group,Instructors,інструктори
 DocType: GL Entry,Credit Amount in Account Currency,Сума кредиту у валюті рахунку
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,Норми витрат {0} потрібно провести
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,Норми витрат {0} потрібно провести
 DocType: Authorization Control,Authorization Control,Контроль Авторизація
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ряд # {0}: Відхилено Склад є обов&#39;язковим відносно відхилив Пункт {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Оплата
@@ -1991,11 +2028,11 @@
 DocType: Quotation Item,Actual Qty,Фактична к-сть
 DocType: Sales Invoice Item,References,Посилання
 DocType: Quality Inspection Reading,Reading 10,Читання 10
-DocType: Hub Settings,Hub Node,Вузол концентратора
+DocType: Hub Category,Hub Node,Вузол концентратора
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Ви ввели елементи, що повторюються. Будь-ласка, виправіть та спробуйте ще раз."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Асоціювати
 DocType: Asset Movement,Asset Movement,Рух активів
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,Нова кошик
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,Нова кошик
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Пункт {0} серіалізовані товару
 DocType: SMS Center,Create Receiver List,Створити список отримувачів
 DocType: Vehicle,Wheels,колеса
@@ -2009,15 +2046,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Телекомунікаційних
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Вказує, що пакет є частиною цієї поставки (тільки проекту)"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Створити Оплату
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},"Кількість для пункту {0} має бути менше, ніж {1}"
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},"Кількість для пункту {0} має бути менше, ніж {1}"
 ,Sales Invoice Trends,Динаміка вихідних рахунків
 DocType: Leave Application,Apply / Approve Leaves,Застосувати / Затвердити Листя
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Для
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Для
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Можете посилатися на рядок, тільки якщо тип стягнення ""На суму попереднього рядка» або «На загальну суму попереднього рядка"""
 DocType: Sales Order Item,Delivery Warehouse,Доставка Склад
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Дерево центрів фінансових витрат.
 DocType: Serial No,Delivery Document No,Доставка Документ №
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},"Будь ласка, встановіть &quot;прибуток / збиток Рахунок по поводженню з відходами активу в компанії {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},"Будь ласка, встановіть &quot;прибуток / збиток Рахунок по поводженню з відходами активу в компанії {0}"
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Отримати позиції з прихідної накладної
 DocType: Serial No,Creation Date,Дата створення
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Пункт {0} з'являється кілька разів у Прайс-листі {1}
@@ -2028,12 +2065,13 @@
 DocType: Student,Student Mobile Number,Студент Мобільний телефон
 DocType: Item,Has Variants,Має Варіанти
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Оновити відповідь
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Ви вже вибрали елементи з {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Ви вже вибрали елементи з {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Назва помісячного розподілу
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID є обов&#39;язковим
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID є обов&#39;язковим
 DocType: Sales Person,Parent Sales Person,Батьківський Відповідальний з продажу
-DocType: Purchase Invoice,Recurring Invoice,Періодичний рахунок
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Від високої до низької
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Спочатку виберіть програму
 DocType: Patient Appointment,Patient Age,Вік хворого
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Управління проектами
 DocType: Supplier,Supplier of Goods or Services.,Постачальник товарів або послуг.
@@ -2041,8 +2079,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Дебіторська заборгованість за замовчуванням, яка використовується, якщо не встановлено в Пацієнтці, щоб замовити консультаційні витрати."
 DocType: Vehicle Log,Fuel Price,паливо Ціна
 DocType: Budget,Budget,Бюджет
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Встановити Відкрити
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Основний засіб повинен бути нескладським .
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Встановити Відкрити
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Основний засіб повинен бути нескладським .
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Бюджет не може бути призначений на {0}, так як це не доход або витрата рахунки"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Досягнутий
 DocType: Student Admission,Application Form Route,Заявка на маршрут
@@ -2056,12 +2094,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Пункт {0} не налаштований на послідовний пп. Перевірити майстра предмета
 DocType: Maintenance Visit,Maintenance Time,Час Технічного обслуговування
 ,Amount to Deliver,Сума Поставте
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Той самий пункт введено кілька разів. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Термін Дата початку не може бути раніше, ніж рік Дата початку навчального року, до якого цей термін пов&#39;язаний (навчальний рік {}). Будь ласка, виправте дату і спробуйте ще раз."
 DocType: Guardian,Guardian Interests,хранителі Інтереси
 DocType: Naming Series,Current Value,Поточна вартість
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Кілька фінансових років існують на дату {0}. Будь ласка, встановіть компанію в фінансовому році"
 DocType: School Settings,Instructor Records to be created by,"Інструктор записів, які потрібно створити"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} створено
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} створено
 DocType: Delivery Note Item,Against Sales Order,На замовлення клієнта
 ,Serial No Status,Статус Серійного номеру
 DocType: Payment Entry Reference,Outstanding,Неоплачено
@@ -2071,10 +2110,10 @@
 						must be greater than or equal to {2}","Рядок {0}: Для установки {1} періодичності, різниця між від і до теперішнього часу \ повинно бути більше, ніж або дорівнює {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Базується на складському русі. Див {0} для отримання більш докладної інформації
 DocType: Pricing Rule,Selling,Продаж
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Сума {0} {1} відняті {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Сума {0} {1} відняті {2}
 DocType: Employee,Salary Information,Інформація по зарплаті
 DocType: Sales Person,Name and Employee ID,Ім'я та ідентифікатор працівника
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,"Дата ""До"" не може бути менша за дату створення"
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,"Дата ""До"" не може бути менша за дату створення"
 DocType: Website Item Group,Website Item Group,Група об’єктів веб-сайту
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Мита і податки
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Будь ласка, введіть дату Reference"
@@ -2100,7 +2139,7 @@
 DocType: Issue,Resolution Details,Дозвіл Подробиці
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,асигнування
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Критерії приймання
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Будь ласка, введіть Замовлення матеріалів у наведену вище таблицю"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,"Будь ласка, введіть Замовлення матеріалів у наведену вище таблицю"
 DocType: Item Attribute,Attribute Name,Ім'я атрибуту
 DocType: BOM,Show In Website,Показувати на веб-сайті
 DocType: Shopping Cart Settings,Show Quantity in Website,Показати Кількість в веб-сайт
@@ -2109,7 +2148,7 @@
 DocType: Item Reorder,Check in (group),Заїзд (група)
 ,Qty to Order,К-сть для замовлення
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Рахунок  (зобов'язання або капітал), на який буде проводитись прибуток/збиток"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Діаграма Ганта всіх завдань.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Діаграма Ганта всіх завдань.
 DocType: Opportunity,Mins to First Response,Mins до First Response
 DocType: Pricing Rule,Margin Type,Тип маржа
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} годин
@@ -2131,36 +2170,36 @@
 DocType: Patient,Surgical History,Хірургічна історія
 DocType: Employee,Resignation Letter Date,Дата листа про відставка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Ціни Правила далі фільтруються на основі кількості.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},"Будь ласка, встановіть дати приєднання для працівника {0}"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},"Будь ласка, встановіть дати приєднання для працівника {0}"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},"Будь ласка, встановіть дати приєднання для працівника {0}"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},"Будь ласка, встановіть дати приєднання для працівника {0}"
 DocType: Task,Total Billing Amount (via Time Sheet),Загальна сума оплат (через табель)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Виручка від постійних клієнтів
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) повинен мати роль ""Підтверджувач витрат"""
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Пара
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Виберіть BOM і Кількість для виробництва
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Виберіть BOM і Кількість для виробництва
 DocType: Asset,Depreciation Schedule,Запланована амортизація
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Партнер з продажу Адреси та контакти
 DocType: Bank Reconciliation Detail,Against Account,Кор.рахунок
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Поаяся Дата повинна бути в межах від дати і до теперішнього часу
 DocType: Maintenance Schedule Detail,Actual Date,Фактична дата
 DocType: Item,Has Batch No,Має номер партії
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Річні оплати: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Річні оплати: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Товари та послуги Tax (GST Індія)
 DocType: Delivery Note,Excise Page Number,Акцизний Номер сторінки
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Компанія, Дата початку та до теперішнього часу є обов&#39;язковим"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Отримати від Консультації
 DocType: Asset,Purchase Date,Дата покупки
 DocType: Employee,Personal Details,Особиста інформація
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},"Будь ласка, вкажіть ""Центр витрат амортизації"" в компанії {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},"Будь ласка, вкажіть ""Центр витрат амортизації"" в компанії {0}"
 ,Maintenance Schedules,Розклад запланованих обслуговувань
 DocType: Task,Actual End Date (via Time Sheet),Фактична дата закінчення (за допомогою табеля робочого часу)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Сума {0} {1} проти {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Сума {0} {1} проти {2} {3}
 ,Quotation Trends,Тренд пропозицій
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Група елемента не згадується у майстрі для елементу {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Дебетом рахунка повинні бути заборгованість рахунок
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Дебетом рахунка повинні бути заборгованість рахунок
 DocType: Shipping Rule Condition,Shipping Amount,Сума доставки
 DocType: Supplier Scorecard Period,Period Score,Оцінка періоду
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Додати Клієнти
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Додати Клієнти
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,До Сума
 DocType: Lab Test Template,Special,Спеціальний
 DocType: Purchase Invoice Item,Conversion Factor,Коефіцієнт перетворення
@@ -2168,13 +2207,14 @@
 ,Vehicle Expenses,Витрати транспортних засобів
 DocType: Serial No,Invoice Details,Інформація про рахунки
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},"Очікуване значення після того, як строк корисного використання повинно бути більше або дорівнює {0}"
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Почніть з
+DocType: Hub Category,Hub Category,Категорія концентратора
 DocType: Purchase Invoice,SEZ,СЕЗ
 DocType: Purchase Receipt,Vehicle Number,Кількість транспортних засобів
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Дата, на яку періодичний рахунок перестане створюватись"
 DocType: Employee Loan,Loan Amount,Розмір позики
 DocType: Program Enrollment,Self-Driving Vehicle,Самостійне водіння автомобіля
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Поставщик Scorecard Standing
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Рядок {0}: Відомість матеріалів не знайдено для елемента {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Рядок {0}: Відомість матеріалів не знайдено для елемента {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,"Всього виділені листя {0} не може бути менше, ніж вже затверджених листя {1} за період"
 DocType: Journal Entry,Accounts Receivable,Дебіторська заборгованість
 ,Supplier-Wise Sales Analytics,Аналітика продажу по постачальниках
@@ -2186,7 +2226,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Батько курс (залиште порожнім, якщо це не є частиною Батько курсу)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Залиште порожнім, якщо розглядати для всіх типів працівників"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Розподілити плату на основі
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Табелі робочого часу
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Табелі робочого часу
 DocType: HR Settings,HR Settings,Налаштування HR
 DocType: Salary Slip,net pay info,Чистий інформація платити
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Це значення оновлюється за умовчанням за цінами продажу.
@@ -2197,7 +2237,7 @@
 DocType: Patient,B Positive,B Позитивний
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Рядок # {0}: Кількість повинна бути 1, оскільки елемент є основним засобом. Будь ласка, створюйте декілька рядків, якщо кількість більше 1."
 DocType: Leave Block List Allow,Leave Block List Allow,Список блокування відпусток дозволяє
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Абревіатура не може бути пропущена або заповнена пробілами
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Абревіатура не може бути пропущена або заповнена пробілами
 DocType: Patient Medical Record,Patient Medical Record,Пацієнтська медична довідка
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Група не-групи
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спортивний
@@ -2214,9 +2254,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,"Неможливо знайти обмінний курс {0} до {1} для ключа дати {2}. Будь ласка, створіть запис Обмін валюти вручну"
 DocType: POS Profile,Price List,Прайс-лист
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} тепер є фінансовим роком за замовчуванням. Будь ласка, оновіть сторінку у вашому переглядачі, щоб зміни вступили в силу."
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Авансові звіти
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Авансові звіти
 DocType: Issue,Support,Підтримка
 ,BOM Search,Пошук норм
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Публікуйте &quot;На складі&quot; або &quot;Немає в наявності&quot; на концентраторі на основі наявних на складі запасів.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Закриття (відкриття + Итоги)
 DocType: Vehicle,Fuel Type,Тип палива
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Будь ласка, сформулюйте валюту в Компанії"
@@ -2228,16 +2269,16 @@
 DocType: Healthcare Settings,Remind Before,Нагадаю раніше
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Коефіцієнт перетворення Одиниця виміру потрібно в рядку {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Рядок # {0}: тип документу має бути одним з: замовлення клієнта, вихідний рахунок-фактура або запис журналу"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Рядок # {0}: тип документу має бути одним з: замовлення клієнта, вихідний рахунок-фактура або запис журналу"
 DocType: Salary Component,Deduction,Відрахування
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Рядок {0}: Від часу і часу є обов&#39;язковим.
 DocType: Stock Reconciliation Item,Amount Difference,сума різниця
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Ціна товару додається для {0} у прайс-листі {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Ціна товару додається для {0} у прайс-листі {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Будь ласка, введіть ідентифікатор працівника для цього Відповідального з продажу"
 DocType: Territory,Classification of Customers by region,Класифікація клієнтів по регіонах
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Сума різниці повинна дорівнювати нулю
 DocType: Project,Gross Margin,Валовий дохід
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,"Будь ласка, введіть Продукція перший пункт"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,"Будь ласка, введіть Продукція перший пункт"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Розрахунковий банк собі баланс
 DocType: Normal Test Template,Normal Test Template,Шаблон нормального тесту
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,відключений користувач
@@ -2247,21 +2288,22 @@
 DocType: Salary Slip,Total Deduction,Всього відрахування
 ,Production Analytics,виробництво Аналітика
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Це базується на операціях проти цього пацієнта. Нижче наведено докладну інформацію про часовій шкалі
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Вартість Оновлене
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Вартість Оновлене
 DocType: Employee,Date of Birth,Дата народження
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Пункт {0} вже повернулися
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Бюджетний період ** являє собою бюджетний період. Всі бухгалтерські та інші основні операції відслідковуються у розрізі **Бюджетного періоду**.
 DocType: Opportunity,Customer / Lead Address,Адреса Клієнта /  Lead-а
 DocType: Patient,DOB,ДОБ
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Установка Scorecard постачальника
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Увага: Невірний сертифікат SSL на прихильності {0}
-DocType: Student Admission,Eligibility,прийнятність
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Назва плану оцінки
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Увага: Невірний сертифікат SSL на прихильності {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Веде допомогти вам отримати бізнес, додати всі ваші контакти і багато іншого в ваших потенційних клієнтів"
 DocType: Production Order Operation,Actual Operation Time,Фактична Час роботи
 DocType: Authorization Rule,Applicable To (User),Застосовується до (Користувач)
 DocType: Purchase Taxes and Charges,Deduct,Відняти
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Описання роботи
 DocType: Student Applicant,Applied,прикладна
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Знову відкрийте
 DocType: Sales Invoice Item,Qty as per Stock UOM,Кількість у складській од.вим.
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,ім&#39;я Guardian2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Спеціальні символи, крім ""-"" ""."", ""#"", і ""/"" не допускаються у назві серій"
@@ -2273,7 +2315,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Виробництво менеджер
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Серійний номер {0} знаходиться на гарантії до {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Розбити накладну на пакети.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Поставки
+apps/erpnext/erpnext/hooks.py +107,Shipments,Поставки
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Загальна розподілена сума (валюта компанії)
 DocType: Purchase Order Item,To be delivered to customer,Для поставлятися замовнику
 DocType: BOM,Scrap Material Cost,Лом Матеріал Вартість
@@ -2296,8 +2338,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Параметр Варіантні налаштування
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Виберіть компанію ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Залиште порожнім, якщо розглядати для всіх відділів"
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Види зайнятості (постійна, за контрактом, стажист і т.д.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} є обов'язковим для товару {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Види зайнятості (постійна, за контрактом, стажист і т.д.)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} є обов'язковим для товару {1}
 DocType: Process Payroll,Fortnightly,раз на два тижні
 DocType: Currency Exchange,From Currency,З валюти
 DocType: Vital Signs,Weight (In Kilogram),Вага (у кілограмі)
@@ -2322,7 +2364,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Будь ласка, натисніть на кнопку ""Згенерувати розклад"", щоб отримати розклад"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Були помилки під час видалення наступні графіки:
 DocType: Bin,Ordered Quantity,Замовлену кількість
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","наприклад, &quot;Створення інструментів для будівельників&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","наприклад, &quot;Створення інструментів для будівельників&quot;"
 DocType: Grading Scale,Grading Scale Intervals,Інтервали Оціночна шкала
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Бухгалтерія Вхід для {2} може бути зроблено тільки в валюті: {3}
 DocType: Production Order,In Process,В процесі
@@ -2346,11 +2388,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Із сплатою податку
 DocType: Expense Claim Detail,Expense Claim Detail,Деталі Авансового звіту
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Triplicate ДЛЯ ПОСТАЧАЛЬНИКІВ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,"Будь ласка, виберіть правильний рахунок"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,"Будь ласка, виберіть правильний рахунок"
 DocType: Item,Weight UOM,Одиниця ваги
 DocType: Salary Structure Employee,Salary Structure Employee,Працівник Структури зарплати
 DocType: Patient,Blood Group,Група крові
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,До
 DocType: Course,Course Name,Назва курсу
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Користувачі, які можуть погодити  заяви на відпустки певного працівника"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Устаткування офісу
@@ -2369,7 +2410,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Ціни не будуть показані, якщо прайс-лист не встановлено"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Будь ласка, вкажіть країну цьому правилі судноплавства або перевірити Доставка по всьому світу"
 DocType: Stock Entry,Total Incoming Value,Загальна суму приходу
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Дебет вимагається
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Дебет вимагається
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets допоможе відстежувати час, вартість і виставлення рахунків для Активності зробленої вашої команди"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Прайс-лист закупівлі
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Шаблони постачальників показників змінної.
@@ -2379,7 +2420,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Узгодження оплат з рахунками
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Будь-ласка, виберіть ім'я відповідальної особи"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Технологія
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Загальна сума невиплачених: {0}
+DocType: Hub Settings,Unregister from Hub,Скасувати реєстрацію з центру
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Загальна сума невиплачених: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Операція Сайт
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Лист-пропозиція
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Генерує Замовлення матеріалів (MRP) та Виробничі замовлення.
@@ -2391,7 +2433,9 @@
 DocType: Physician Schedule Time Slot,To Time,Часу
 DocType: Authorization Rule,Approving Role (above authorized value),Затвердження роль (вище статутного вартості)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Кредит на рахунку повинен бути оплачується рахунок
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},Рекурсія у Нормах: {0} не може бути батьківським або підлеглим елементом {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Будь-ласка, оберіть Student Admission, який є обов&#39;язковим для платника заявника"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},Рекурсія у Нормах: {0} не може бути батьківським або підлеглим елементом {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,"Будь ласка, виберіть ціновий список, щоб опублікувати вартість"
 DocType: Production Order Operation,Completed Qty,Завершена к-сть
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Для {0}, тільки дебетові рахунки можуть бути пов&#39;язані з іншою кредитною вступу"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Прайс-лист {0} відключено
@@ -2404,39 +2448,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} Серійні номери, необхідні для позиції {1}. Ви надали {2}."
 DocType: Stock Reconciliation Item,Current Valuation Rate,Поточна собівартість
 DocType: Item,Customer Item Codes,Коди клієнта на товар
+DocType: Training Event,Advance,Аванс
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,для повторного повторення.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Обмін Прибуток / збиток
 DocType: Opportunity,Lost Reason,Забули Причина
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Нова адреса
 DocType: Quality Inspection,Sample Size,Обсяг вибірки
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,"Будь ласка, введіть Квитанція документ"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Всі деталі вже виставлений
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Будь ласка, вкажіть дійсний &quot;Від справі № &#39;"
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',"Будь ласка, вкажіть дійсний &quot;Від справі № &#39;"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Наступні центри витрат можна створювати під групами, але у проводках використовуються не-групи"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Люди і дозволу
 DocType: Vehicle Log,VLOG.,Відеоблогу.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Виробничі замовлення Створено: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Виробничі замовлення Створено: {0}
 DocType: Branch,Branch,Філія
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Друк і брендинг
 DocType: Company,Total Monthly Sales,Загальні щомісячні продажі
 DocType: Bin,Actual Quantity,Фактична кількість
 DocType: Shipping Rule,example: Next Day Shipping,Приклад: Відправка наступного дня
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Серійний номер {0} не знайдений
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Підписка була {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Підписка була {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Програма розкладів платежів
 DocType: Fee Schedule Program,Student Batch,Student Batch
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,"виділіть * з `tabVital Signs`, де patient = &#39;{0}&#39; порядок за знаками date_decline limit 1"
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,зробити Студент
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Мінімальна оцінка
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Ви були запрошені для спільної роботи над проектом: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Лікар не доступний на {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Ви були запрошені для спільної роботи над проектом: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Лікар не доступний на {0}
 DocType: Leave Block List Date,Block Date,Блок Дата
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Додати спеціальний ідентифікатор підписки поля в doctype {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Постачання доставки постачальника
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Подати заявку
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Подати заявку
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Фактична Кількість {0} / Очікування Кількість {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Фактична Кількість {0} / Очікування Кількість {1}
 DocType: Purchase Invoice,E-commerce GSTIN,Електронна комерція GSTIN
 DocType: Sales Order,Not Delivered,Не доставлено
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Очікувана дата не може передувати даті транзакції
 ,Bank Clearance Summary,Результат банківського клірінгу
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Створення і управління щоденні, щотижневі та щомісячні дайджести новин."
 DocType: Appraisal Goal,Appraisal Goal,Оцінка Мета
@@ -2444,12 +2489,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,будівлі
 DocType: Fee Schedule,Fee Structure,структура оплати
 DocType: Timesheet Detail,Costing Amount,Калькуляція Сума
-DocType: Student Admission,Application Fee,реєстраційний внесок
+DocType: Student Admission Program,Application Fee,реєстраційний внесок
 DocType: Process Payroll,Submit Salary Slip,Провести Зарплатний розрахунок
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maxiumm знижка Item {0} {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Maxiumm знижка Item {0} {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Імпорт наливом
 DocType: Sales Partner,Address & Contacts,Адреса та контакти
 DocType: SMS Log,Sender Name,Ім&#39;я відправника
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Сортувати за критеріями
 DocType: POS Profile,[Select],[Виберіть]
 DocType: Vital Signs,Blood Pressure (diastolic),Артеріальний тиск (діастолічний)
 DocType: SMS Log,Sent To,Відправлено
@@ -2458,7 +2504,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Наступна контактна дата не може бути у минулому
 DocType: Company,For Reference Only.,Для довідки тільки.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Лікар {0} недоступний на {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Виберіть Batch Немає
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Виберіть Batch Немає
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Невірний {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,Довідкова інв
@@ -2474,15 +2520,15 @@
 DocType: Normal Test Items,Require Result Value,Вимагати значення результату
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Справа № не може бути 0
 DocType: Item,Show a slideshow at the top of the page,Показати слайд-шоу у верхній частині сторінки
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Магазини
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Магазини
 DocType: Project Type,Projects Manager,Менеджер проектів
 DocType: Serial No,Delivery Time,Час доставки
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,На підставі проблем старіння
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Призначення скасовано
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Призначення скасовано
 DocType: Item,End of Life,End of Life (дата завершення роботи з товаром)
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Подорож
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Незнайдено жодної активної Структури зарплати або Структури зарплати за замовчуванням для співробітника {0} для зазначених дат
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Подорож
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Незнайдено жодної активної Структури зарплати або Структури зарплати за замовчуванням для співробітника {0} для зазначених дат
 DocType: Leave Block List,Allow Users,Надання користувачам
 DocType: Purchase Order,Customer Mobile No,Замовник Мобільна Немає
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Періодичність
@@ -2491,12 +2537,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Оновлення Вартість
 DocType: Item Reorder,Item Reorder,Пункт Змінити порядок
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Показати Зарплатний розрахунок
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Передача матеріалів
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Передача матеріалів
 DocType: Fees,Send Payment Request,Надіслати запит на оплату
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Вкажіть операцій, операційні витрати та дають унікальну операцію не в Ваших операцій."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Цей документ знаходиться над межею {0} {1} для елемента {4}. Ви робите інший {3} проти того ж {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,"Будь ласка, встановіть повторювані після збереження"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,Вибрати рахунок для суми змін
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Вибрати рахунок для суми змін
 DocType: Purchase Invoice,Price List Currency,Валюта прайс-листа
 DocType: Naming Series,User must always select,Користувач завжди повинен вибрати
 DocType: Stock Settings,Allow Negative Stock,Дозволити від'ємні залишки
@@ -2516,7 +2562,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Працівник
 DocType: Sample Collection,Collected Time,Зібраний час
 DocType: Company,Sales Monthly History,Щомісячна історія продажу
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Виберіть Batch
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Виберіть Batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} повністю виставлено рахунки
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Життєво-важливі ознаки
 DocType: Training Event,End Time,Час закінчення
@@ -2524,16 +2570,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,Відрахування з оплат або збиток
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Стандартні умови договору для продажу або покупки.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Згрупувати по документах
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,"Ви впевнені, що хочете скасувати цю зустріч?"
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Воронка продаж
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},"Будь ласка, встановіть обліковий запис стандартним записом в компоненті Зарплатний {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Обов&#39;язково На
 DocType: Rename Tool,File to Rename,Файл Перейменувати
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Будь ласка, виберіть Норми для елемента в рядку {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Будь ласка, виберіть Норми для елемента в рядку {0}"
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Рахунок {0} не збігається з Компанією {1} в режимі рахунку: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Зазначених Норм витрат {0} не існує для позиції {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Потрібно відмінити заплановане обслуговування {0} перед скасуванням цього Замовлення клієнта
+DocType: POS Profile,Applicable for Users,Застосовується для користувачів
 DocType: Notification Control,Expense Claim Approved,Авансовий звіт погоджено
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Зарплатний розрахунок для працівника {0} вже створено за цей період
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Зарплатний розрахунок для працівника {0} вже створено за цей період
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Фармацевтична
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Вартість куплених виробів
 DocType: Selling Settings,Sales Order Required,Необхідне Замовлення клієнта
@@ -2558,6 +2606,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,організація
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,організація
 DocType: BOM Update Tool,BOM Update Tool,Інструмент оновлення BOM
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Абонентський рахунок не вказано, будь-ласка, встановіть зареєстрований на облік учасник компанії рахунок"
 DocType: SG Creation Tool Course,Student Group Name,Ім&#39;я Студентська група
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Створення комісійних
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Будь ласка, переконайтеся, що ви дійсно хочете видалити всі транзакції для компанії. Ваші основні дані залишиться, як є. Ця дія не може бути скасовано."
@@ -2566,29 +2615,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) не може бути більше, ніж запланована кількість ({2}) у Виробничому замовленні {3}"
 DocType: Shipping Rule,Shipping Rule Label,Ярлик правил доставки
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Форум користувачів
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Сировина не може бути порожнім.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Не вдалося оновити запаси, рахунок-фактура містить позиції прямої доставки."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Сировина не може бути порожнім.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Не вдалося оновити запаси, рахунок-фактура містить позиції прямої доставки."
 DocType: Lab Test Sample,Lab Test Sample,Лабораторія випробувань зразка
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Швидка проводка
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Ви не можете змінити вартість, якщо для елементу вказані Норми"
+DocType: Restaurant,Invoice Series Prefix,Префікс серії рахунків-фактур
 DocType: Employee,Previous Work Experience,Попередній досвід роботи
 DocType: Stock Entry,For Quantity,Для Кількість
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Будь ласка, введіть планову к-сть для номенклатури {0} в рядку {1}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},"Будь ласка, введіть планову к-сть для номенклатури {0} в рядку {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} не проведений
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Запити для елементів.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Окреме виробниче замовлення буде створено для кожного готового виробу.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} повинен бути негативним у зворотному документі
 ,Minutes to First Response for Issues,Протокол до First Response у справах
 DocType: Purchase Invoice,Terms and Conditions1,Умови та положення1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,"Назва інституту, для якого ви встановлюєте цю систему."
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,"Назва інституту, для якого ви встановлюєте цю систему."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Бухгалтерські проводки заблоковано до цієї дати, ніхто не зможе зробити або змінити проводки крім ролі вказаної нижче."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Будь ласка, збережіть документ, перш ніж генерувати розклад технічного обслуговування"
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Остання ціна оновлена у всіх БОМ
 DocType: Fee Schedule,Successful,Успішний
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Статус проекту
 DocType: UOM,Check this to disallow fractions. (for Nos),"Перевірте це, щоб заборонити фракції. (для №)"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Були створені такі Виробничі замовлення:
-DocType: Student Admission,Naming Series (for Student Applicant),Іменування Series (для студентів Заявником)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Були створені такі Виробничі замовлення:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Іменування Series (для студентів Заявником)
 DocType: Delivery Note,Transporter Name,Transporter Назва
 DocType: Authorization Rule,Authorized Value,Статутний Значення
 DocType: BOM,Show Operations,Показати операції
@@ -2612,7 +2662,7 @@
 ,Employees working on a holiday,"Співробітники, що працюють у вихідні"
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Відзначити даний
 DocType: Project,% Complete Method,% Повний метод
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Наркотик
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Наркотик
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Дата початку обслуговування не може бути до дати доставки для серійного номеру {0}
 DocType: Production Order,Actual End Date,Фактична Дата закінчення
 DocType: BOM,Operating Cost (Company Currency),Експлуатаційні витрати (Компанія Валюта)
@@ -2630,13 +2680,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,"Затвердження користувач не може бути таким же, як користувач правило застосовно до"
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (як у фондовій UOM)
 DocType: SMS Log,No of Requested SMS,Кількість requested SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Відпустка за свій рахунок не відповідає затвердженим записам заяв на відпустку
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Відпустка за свій рахунок не відповідає затвердженим записам заяв на відпустку
 DocType: Campaign,Campaign-.####,Кампанія -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Наступні кроки
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,"Будь ласка, надайте зазначені пункти в найкращих можливих ставок"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Зробити рахунок-фактуру
 DocType: Selling Settings,Auto close Opportunity after 15 days,Авто близько Можливість через 15 днів
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Замовлення на придбання не дозволено на {0} через показник показника показника {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Замовлення на придбання не дозволено на {0} через показник показника показника {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,кінець року
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Свинець%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Свинець%
@@ -2644,6 +2694,7 @@
 DocType: Vital Signs,Nutrition Values,Харчування цінності
 DocType: Lab Test Template,Is billable,Оплачується
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Для Dr {0} слід встановити обидва &quot;Розклад лікарів&quot; та &quot;Час за призначення&quot;
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Сторонній дистриб'ютор / дилер / комісіонер / Партнер / реселер, що продає продукти компанії за комісію."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} за Замовленням на придбання {1}
 DocType: Patient,Patient Demographics,Демографічна характеристика пацієнта
@@ -2673,7 +2724,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","Стандартний шаблон податку, який може бути застосований до всіх операцій купівлі. Цей шаблон може містити перелік податкових заголовків, а також заголовків інших витрат, таких як ""Доставка"", ""Страхування"", ""Звернення"" і т.д. #### Примітка: податкова ставка, яку ви тут визначите, буде стандартною  для всіх **Об’єктів**. Якщо є **Об’єкти**, які мають різні ставки, вони повинні бути додані в таблицю **Податки**, що у **Item майстра**. #### Опис колонок 1. Розрахунок Тип: - Це може бути від ** ** Загальна Чистий (тобто сума основної суми). - ** На попередньому рядку Total / сума ** (за сукупністю податків або зборів). Якщо ви оберете цю опцію, податок буде застосовуватися, як у відсотках від попереднього ряду (у податковому таблиці) суми або загальної. - ** ** Фактичний (як уже згадувалося). 2. Рахунок Керівник: Рахунок книга, під яким цей податок будуть заброньовані 3. Вартість центр: Якщо податок / плата є доходом (як перевезення вантажу) або витрат це повинно бути заброньовано проти МВЗ. 4. Опис: Опис податку (які будуть надруковані в рахунках-фактурах / цитати). 5. Оцінити: Податкова ставка. 6. Сума: Сума податку. 7. Разом: Сумарне до цієї точки. 8. Введіть рядок: Якщо на базі ""Попередня рядок Усього"" ви можете вибрати номер рядка, який буде прийнято в якості основи для розрахунку цього (за замовчуванням це попереднє рядок). 9. Розглянемо податку або збору для: У цьому розділі ви можете поставити, якщо податок / плата тільки за оцінки (не частина всього) або тільки для загальної (не додати цінність пункту) або для обох. 10. Додати або відняти: Якщо ви хочете, щоб додати або відняти податок."
 DocType: Homepage,Homepage,Домашня сторінка
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Виберіть лікаря ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',"оновити вкладкуКонсультація set invoice = &#39;{0}&#39;, де name = &#39;{1}&#39;"
 DocType: Purchase Receipt Item,Recd Quantity,Кількість RECD
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Плата записи Створено - {0}
 DocType: Asset Category Account,Asset Category Account,Категорія активів Рахунок
@@ -2685,7 +2735,7 @@
 DocType: Asset,Manual,керівництво
 DocType: Salary Component Account,Salary Component Account,Рахунок компоненту зарплати
 DocType: Global Defaults,Hide Currency Symbol,Приховати символ валюти
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","наприклад банк, готівка, кредитна карта"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","наприклад банк, готівка, кредитна карта"
 DocType: Lead Source,Source Name,ім&#39;я джерела
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Нормальний спокійний артеріальний тиск у дорослої людини становить приблизно 120 мм рт. Ст. Систолічний і 80 мм рт. Ст. Діастолічний, скорочено &quot;120/80 мм рт. Ст.&quot;"
 DocType: Journal Entry,Credit Note,Кредитове авізо
@@ -2704,16 +2754,16 @@
 DocType: Patient,Occupation,рід занять
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Ряд {0}: Дата початку повинна бути раніше дати закінчення
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Всього (Кількість)
-DocType: Sales Invoice,This Document,цей документ
 DocType: Installation Note Item,Installed Qty,Встановлена к-сть
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Це може бути з-за деяких недійсних адрес електронної пошти в
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Ви додали
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,навчання Результат
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,навчання Результат
 DocType: Purchase Invoice,Is Paid,Оплачений
 DocType: Salary Structure,Total Earning,Всього дохід
 DocType: Purchase Receipt,Time at which materials were received,"Час, в якому були отримані матеріали"
 DocType: Stock Ledger Entry,Outgoing Rate,Вихідна ставка
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Організація філії господар.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Організація філії господар.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,або
 DocType: Sales Order,Billing Status,Статус рахунків
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Повідомити про проблему
@@ -2728,8 +2778,9 @@
 DocType: Notification Control,Sales Order Message,Повідомлення замовлення клієнта
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Встановити значення за замовчуванням, як-от компанія, валюта, поточний фінансовий рік і т.д."
 DocType: Payment Entry,Payment Type,Тип оплати
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Будь ласка, виберіть Batch для пункту {0}. Не вдалося знайти жодної партії, яка задовольняє цій вимозі"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Будь ласка, виберіть Batch для пункту {0}. Не вдалося знайти жодної партії, яка задовольняє цій вимозі"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Будь ласка, виберіть Batch для пункту {0}. Не вдалося знайти жодної партії, яка задовольняє цій вимозі"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Будь ласка, виберіть Batch для пункту {0}. Не вдалося знайти жодної партії, яка задовольняє цій вимозі"
+DocType: Hub Category,Parent Category,Батьківська категорія
 DocType: Process Payroll,Select Employees,Виберіть Співробітники
 DocType: Opportunity,Potential Sales Deal,Угода потенційних продажів
 DocType: Complaint,Complaints,Скарги
@@ -2766,7 +2817,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),Ідентифікація пакета для доставки (для друку)
 DocType: Bin,Reserved Quantity,Зарезервовано Кількість
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,"Будь ласка, введіть адресу електронної пошти"
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,"Будь ласка, виберіть товар у кошику"
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,"Будь ласка, виберіть товар у кошику"
 DocType: Landed Cost Voucher,Purchase Receipt Items,Позиції прихідної накладної
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Налаштування форм
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,заборгованість
@@ -2776,15 +2827,15 @@
 DocType: Payment Request,Amount in customer's currency,Сума в валюті клієнта
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Доставка
 DocType: Stock Reconciliation Item,Current Qty,Поточна к-сть
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Додати постачальників
+DocType: Restaurant Menu,Restaurant Menu,Меню ресторану
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Попередня
 DocType: Appraisal Goal,Key Responsibility Area,Ключ Відповідальність Площа
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Студентські Порції допомагають відслідковувати відвідуваність, оцінки та збори для студентів"
 DocType: Payment Entry,Total Allocated Amount,Загальна розподілена сума
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Встановити рахунок товарно-матеріальних запасів за замовчуванням для безперервної інвентаризації
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Встановити рахунок товарно-матеріальних запасів за замовчуванням для безперервної інвентаризації
 DocType: Item Reorder,Material Request Type,Тип Замовлення матеріалів
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural журнал запис на зарплату від {0} до {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage повна, не врятувало"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage повна, не врятувало"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Ряд {0}: Коефіцієнт перетворення Одиниця виміру є обов&#39;язковим
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Ємність кімнати
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Посилання
@@ -2823,16 +2874,18 @@
 DocType: Project,Task Completion,завершення завдання
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Немає на складі
 DocType: Appraisal,HR User,HR Користувач
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Відраховані податки та збори
-apps/erpnext/erpnext/hooks.py +129,Issues,Питань
+apps/erpnext/erpnext/hooks.py +138,Issues,Питань
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Стан повинен бути одним з {0}
 DocType: Sales Invoice,Debit To,Дебет
+DocType: Restaurant Menu Item,Restaurant Menu Item,Меню меню ресторану
 DocType: Delivery Note,Required only for sample item.,Потрібно лише для зразка пункту.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Фактична к-сть після операції
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Немає зарплати ковзання знаходиться між {0} і {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Немає зарплати ковзання знаходиться між {0} і {1}
 ,Pending SO Items For Purchase Request,"Замовлені товари, які очікують закупки"
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,зараховуються студентів
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} відключений
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,зараховуються студентів
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} відключений
 DocType: Supplier,Billing Currency,Валюта оплати
 DocType: Sales Invoice,SINV-RET-,Вих_Рах-Пов-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Дуже великий
@@ -2855,6 +2908,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Не кажучи вже про НЕ ласка відвідувань, необхідних"
 DocType: Stock Settings,Default Valuation Method,Метод оцінка за замовчуванням
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,плата
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Оновлення в процесі Це може зайняти деякий час.
 DocType: Vehicle Log,Fuel Qty,Паливо Кількість
 DocType: Production Order Operation,Planned Start Time,Плановані Час
 DocType: Course,Assessment,оцінка
@@ -2870,7 +2924,7 @@
 DocType: Price List,Price List Master,Майстер Прайс-листа
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Для всіх операцій продажу можна вказувати декількох ""Відповідальних з продажу"", так що ви можете встановлювати та контролювати цілі."
 ,S.O. No.,КО №
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},"Будь ласка, створіть клієнта з Lead {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},"Будь ласка, створіть клієнта з Lead {0}"
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Виберіть пацієнта
 DocType: Price List,Applicable for Countries,Стосується для країн
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Назва параметру
@@ -2902,27 +2956,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Витрати / рахунок різниці ({0}) повинен бути &quot;прибуток або збиток» рахунок
 DocType: Project,Copied From,скопійовано з
 DocType: Project,Copied From,скопійовано з
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Помилка Ім&#39;я: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Нестача
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Помилка Ім&#39;я: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,Нестача
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} не пов&#39;язаний з {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Відвідуваність працівника {0} вже внесена
 DocType: Packing Slip,If more than one package of the same type (for print),Якщо більш ніж один пакет того ж типу (для друку)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,"Будь ласка, встановіть клієнт за замовчуванням у налаштуваннях ресторану"
 ,Salary Register,дохід Реєстрація
 DocType: Warehouse,Parent Warehouse,Батьківський елемент складу
 DocType: C-Form Invoice Detail,Net Total,Чистий підсумок
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Стандартна BOM не знайдена для елемента {0} та Project {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Стандартна BOM не знайдена для елемента {0} та Project {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Визначення різних видів кредиту
 DocType: Bin,FCFS Rate,FCFS вартість
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Непогашена сума
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Час (в хв)
 DocType: Project Task,Working,Робоча
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Черга Інвентаря (4П)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Бюджетний період
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Бюджетний період
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} не належать компанії {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,"Не вдалося вирішити функції оцінки критеріїв для {0}. Переконайтеся, що формула дійсна."
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,"Вартість, як на"
 DocType: Healthcare Settings,Out Patient Settings,Налаштування пацієнта
 DocType: Account,Round Off,Округляти
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Кількість повинна бути позитивною
 ,Requested Qty,Замовлена (requested) к-сть
 DocType: Tax Rule,Use for Shopping Cart,Застосовувати для кошику
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Значення {0} атрибуту {1} не існує в списку дійсного пункту значень атрибутів для пункту {2}
@@ -2931,7 +2987,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Збори будуть розподілені пропорційно на основі к-сті або суми, за Вашим вибором"
 DocType: Maintenance Visit,Purposes,Мети
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Принаймні один елемент повинен бути введений з негативним кількістю у зворотному документа
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Додати курси
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операція {0} більше, ніж будь-яких наявних робочих годин на робочої станції {1}, зламати операції в кілька операцій"
 ,Requested,Запитаний
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Немає зауважень
@@ -2943,6 +2998,8 @@
 DocType: Employee Loan,Repaid/Closed,Повернений / Closed
 DocType: Item,Total Projected Qty,Загальна запланована Кількість
 DocType: Monthly Distribution,Distribution Name,Розподіл Ім&#39;я
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Постачальник&gt; Тип постачальника
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Коефіцієнт оцінки не знайдено для елемента {0}, який необхідний для ведення облікових записів за {1} {2}. Якщо позиція веде транзакцію як нульова ставка оцінки вартості в {1}, будь-ласка, зазначте це в таблиці {1} Item. В іншому випадку, будь ласка, створіть вхідну транзакцію за каталогію або зазначте оцінку ставки в запису елемента, а потім спробуйте подати / скасувати цю статтю"
 DocType: Course,Course Code,код курсу
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Для позиції {0} необхідний сертифікат якості
 DocType: POS Settings,Use POS in Offline Mode,Використовувати POS в автономному режимі
@@ -2953,14 +3010,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Управління Територія дерево.
 DocType: Journal Entry Account,Sales Invoice,Вихідний рахунок-фактура
 DocType: Journal Entry Account,Party Balance,Баланс контрагента
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,"Будь ласка, виберіть Застосувати знижки на"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,"Будь ласка, виберіть Застосувати знижки на"
 DocType: Company,Default Receivable Account,Рахунок дебеторської заборгованості за замовчуванням
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,"Створити банківську проводку на загальну суму заробітної плати, що виплачується за обраними вище критеріями"
 DocType: Physician,Physician Schedule,Графік лікаря
 DocType: Purchase Invoice,Deemed Export,Розглянуто Експорт
 DocType: Stock Entry,Material Transfer for Manufacture,Матеріал для виробництва передачі
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Знижка у відсотках можна застосовувати або стосовно прайс-листа або для всіх прайс-лист.
-DocType: Purchase Invoice,Half-yearly,Піврічний
+DocType: Subscription,Half-yearly,Піврічний
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Проводки по запасах
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Ви вже оцінили за критеріями оцінки {}.
@@ -2989,13 +3046,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Дуже невеликий
 DocType: Company,Standard Template,Стандартний шаблон
 DocType: Training Event,Theory,теорія
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Увага: Кількість замовленого матеріалу менша за мінімально допустиму
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Увага: Кількість замовленого матеріалу менша за мінімально допустиму
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Рахунок {0} заблоковано
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Юридична особа / Допоміжний з окремим Плану рахунків, що належать Організації."
 DocType: Payment Request,Mute Email,Відключення E-mail
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Продукти харчування, напої і тютюнові вироби"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Може здійснити платіж тільки по невиставлених {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,"Ставка комісії не може бути більше, ніж 100"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Може здійснити платіж тільки по невиставлених {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,"Ставка комісії не може бути більше, ніж 100"
 DocType: Stock Entry,Subcontract,Субпідряд
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,"Будь ласка, введіть {0} в першу чергу"
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Немає відповідей від
@@ -3013,10 +3070,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Колір
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Критерії оцінки плану
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Запобігати замовленням на купівлю
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Чутливий
 DocType: Patient Appointment,Scheduled,Заплановане
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Запит пропозиції.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Будь ласка, встановіть систему найменування працівників у людських ресурсах&gt; Параметри персоналу"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Будь ласка, виберіть позицію, в якої ""Складський"" встановлено у ""Ні"" і Продаєм цей товар"" - ""Так"", і немає жодного комплекту"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Виберіть клієнта
 DocType: Student Log,Academic,академічний
 DocType: Patient,Personal and Social History,Особиста та суспільна історія
 DocType: Fee Schedule,Fee Breakup for each student,Платіжний розрив для кожного студента
@@ -3026,7 +3084,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Собівартість
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,дизель
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Валюту прайс-листа не вибрано
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Валюту прайс-листа не вибрано
 apps/erpnext/erpnext/config/healthcare.py +46,Results,результати
 ,Student Monthly Attendance Sheet,Student Щомісячна відвідуваність Sheet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Співробітник {0} вже застосовується для {1} між {2} і {3}
@@ -3042,7 +3100,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Управління торговими партнерами
 DocType: Quality Inspection,Inspection Type,Тип інспекції
 DocType: Fee Validity,Visited yet,Відвідано ще
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Склади з існуючої транзакцією не можуть бути перетворені у групу.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Склади з існуючої транзакцією не можуть бути перетворені у групу.
 DocType: Assessment Result Tool,Result HTML,результат HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Діє до
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Додати студентів
@@ -3069,7 +3127,7 @@
 DocType: Healthcare Settings,Result Printed,Результат друкується
 DocType: Asset Category Account,Depreciation Expense Account,Рахунок витрат амортизації
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Випробувальний термін
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Переглянути {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Переглянути {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Тільки елементи (не групи) дозволені в операціях
 DocType: Expense Claim,Expense Approver,Витрати затверджує
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Ряд {0}: Аванси по клієнту повинні бути у кредиті
@@ -3081,7 +3139,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Для DateTime
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Розклад курсів видалені:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Журнали для підтримки статус доставки смс
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Встановити ціль продажу
 DocType: Accounts Settings,Make Payment via Journal Entry,Платити згідно Проводки
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,надруковано на
 DocType: Item,Inspection Required before Delivery,Огляд Обов&#39;язковий перед поставкою
@@ -3089,7 +3146,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,В очікуванні Діяльність
 DocType: Patient Appointment,Reminded,Нагадаємо
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Ваша організація
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Ваша організація
 DocType: Fee Component,Fees Category,тарифи Категорія
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,"Будь ласка, введіть дату зняття."
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Сум
@@ -3101,7 +3158,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Рівень перезамовлення
 DocType: Company,Chart Of Accounts Template,План рахунків бухгалтерського обліку шаблону
 DocType: Attendance,Attendance Date,Дата
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Ціна товару оновлена для {0} у прайс-листі {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Ціна товару оновлена для {0} у прайс-листі {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Розшифровка зарплати по нарахуваннях та відрахуваннях.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,"Рахунок з дочірніх вузлів, не можуть бути перетворені в бухгалтерській книзі"
 DocType: Purchase Invoice Item,Accepted Warehouse,Прийнято на склад
@@ -3117,9 +3174,10 @@
 ,Employee Birthday,Співробітник народження
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Пакетне відвідуваність Інструмент
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,межа Схрещені
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Заплановано до
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Венчурний капітал
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Академічний термін з цим &quot;Академічний рік&quot; {0} і &#39;Term Name &quot;{1} вже існує. Будь ласка, поміняйте ці записи і спробуйте ще раз."
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Як є існуючі операції проти пункту {0}, ви не можете змінити значення {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Як є існуючі операції проти пункту {0}, ви не можете змінити значення {1}"
 DocType: UOM,Must be Whole Number,Повинно бути ціле число
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Нові листя Виділені (у днях)
 DocType: Purchase Invoice,Invoice Copy,копія рахунку-фактури
@@ -3129,7 +3187,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Номер рахунку-фактури
 DocType: Shopping Cart Settings,Orders,Замовлення
 DocType: Employee Leave Approver,Leave Approver,Погоджувач відпустки
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,"Будь ласка, виберіть партію"
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,"Будь ласка, виберіть партію"
 DocType: Assessment Group,Assessment Group Name,Назва групи по оцінці
 DocType: Manufacturing Settings,Material Transferred for Manufacture,"Матеріал, переданий для виробництва"
 DocType: Expense Claim,"A user with ""Expense Approver"" role",Користувач з &quot;Витрати затверджує&quot; ролі
@@ -3144,7 +3202,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Операції закриття періоду
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Виберіть відділ ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,"Центр витрат з існуючими операціями, не може бути перетворений у групу"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Сума {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Сума {0} {1} {2} {3}
 DocType: Account,Depreciation,Амортизація
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Постачальник (и)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Інструмент роботи з відвідуваннями
@@ -3156,10 +3214,12 @@
 DocType: GL Entry,Voucher No,Номер документа
 ,Lead Owner Efficiency,Свинець Власник Ефективність
 ,Lead Owner Efficiency,Свинець Власник Ефективність
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Найбільш популярний
 DocType: Leave Allocation,Leave Allocation,Призначення відпустки
 DocType: Payment Request,Recipient Message And Payment Details,Повідомлення та платіжні реквізити
 DocType: Training Event,Trainer Email,тренер Email
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,"Замовлення матеріалів {0}, створені"
+DocType: Restaurant Reservation,No of People,Ні людей
 DocType: Production Planning Tool,Include sub-contracted raw materials,Включати субконтрактну сировину
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Шаблон умов договору
 DocType: Purchase Invoice,Address and Contact,Адреса та контакти
@@ -3168,10 +3228,11 @@
 DocType: Supplier,Last Day of the Next Month,Останній день наступного місяця
 DocType: Support Settings,Auto close Issue after 7 days,Авто близько Issue через 7 днів
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Відпустка не може бути призначена до{0}, оскільки залишок днів вже перенесений у наступний документ Призначення відпусток{1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примітка: Через / Вихідна дата перевищує дозволений кредит клієнт дня {0} день (їй)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примітка: Через / Вихідна дата перевищує дозволений кредит клієнт дня {0} день (їй)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,студент Абітурієнт
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ОРИГІНАЛ ДЛЯ ОТРИМУВАЧА
 DocType: Asset Category Account,Accumulated Depreciation Account,Рахунок накопиченого зносу
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Цей електронний лист створено автоматично
 DocType: Stock Settings,Freeze Stock Entries,Заморозити Рухи ТМЦ
 DocType: Program Enrollment,Boarding Student,інтернат студент
 DocType: Asset,Expected Value After Useful Life,Очікувана вартість після терміну використання
@@ -3179,7 +3240,7 @@
 DocType: Activity Cost,Billing Rate,Ціна для виставлення у рахунку
 ,Qty to Deliver,К-сть для доставки
 ,Stock Analytics,Аналіз складських залишків
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,"Операції, що не може бути залишено порожнім"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,"Операції, що не може бути залишено порожнім"
 DocType: Maintenance Visit Purpose,Against Document Detail No,На деталях документа немає
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Тип контрагента є обов'язковим
 DocType: Quality Inspection,Outgoing,Вихідний
@@ -3202,7 +3263,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Вибір студентів вручну для діяльності на основі групи
 DocType: Journal Entry,User Remark,Зауваження користувача
 DocType: Lead,Market Segment,Сегмент ринку
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Сплачена сума не може бути більше сумарного негативного непогашеної {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Сплачена сума не може бути більше сумарного негативного непогашеної {0}
 DocType: Supplier Scorecard Period,Variables,Змінні
 DocType: Employee Internal Work History,Employee Internal Work History,Співробітник внутрішньої історії роботи
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),На кінець (Дт)
@@ -3232,21 +3293,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Підписатись на новини
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Рахунок {2} не належить Компанії {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Замовлення матеріалів {0} відмінено або призупинено
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Управління відпустками
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Управління відпустками
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Групувати по рахунках
 DocType: Sales Order,Fully Delivered,Повністю доставлено
 DocType: Lead,Lower Income,Нижня дохід
+DocType: Restaurant Order Entry,Current Order,Поточний порядок
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Вихідний та цільовий склад не можуть бути однаковими у рядку {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Рахунок різниці повинен бути типу актив / зобов'язання, оскільки ця Інвентаризація - це введення залишків"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},"Освоєно Сума не може бути більше, ніж сума позики {0}"
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Перейдіть до програм
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},"Номер Замовлення на придбання, необхідний для {0}"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Виробничий замовлення не створено
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Виробничий замовлення не створено
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Від дати"" має бути раніше ""До дати"""
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Неможливо змінити статус студента {0} пов&#39;язаний з додатком студента {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Неможливо змінити статус студента {0} пов&#39;язаний з додатком студента {1}
 DocType: Asset,Fully Depreciated,повністю амортизується
 ,Stock Projected Qty,Прогнозований складський залишок
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Замовник {0} не належить до проекту {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Замовник {0} не належить до проекту {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Внесена відвідуваність HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Котирування є пропозиціями, пропозиціями відправлених до своїх клієнтів"
 DocType: Sales Order,Customer's Purchase Order,Оригінал замовлення клієнта
@@ -3257,8 +3319,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Будь ласка, встановіть кількість зарезервованих амортизацій"
 DocType: Supplier Scorecard Period,Calculations,Розрахунки
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Значення або Кількість
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Продукції Замовлення не можуть бути підняті для:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Продукції Замовлення не можуть бути підняті для:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Хвилин
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Будь-ласка, встановіть серію імен для {0} через Налаштування&gt; Налаштування&gt; Серія імен"
 DocType: Purchase Invoice,Purchase Taxes and Charges,Податки та збори закупівлі
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Перейдіть до Постачальників
 ,Qty to Receive,К-сть на отримання
@@ -3272,7 +3335,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Кредит на рахунку повинен бути баланс рахунку
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Всі типи постачальників
 DocType: Global Defaults,Disable In Words,"Відключити ""прописом"""
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Код товару є обов&#39;язковим, оскільки товар не автоматично нумеруються"
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,"Код товару є обов&#39;язковим, оскільки товар не автоматично нумеруються"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Пропозиція {0} НЕ типу {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Номенклатура Запланованого обслуговування
 DocType: Sales Order,%  Delivered,Доставлено%
@@ -3294,23 +3357,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Відкриття Баланс акцій
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Примирення
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,решті
 DocType: Appraisal,Appraisal,Оцінка
 DocType: Purchase Invoice,GST Details,Деталі GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},Електронна пошта відправляється постачальнику {0}
+DocType: Item,Default Sales Unit of Measure,Одиниця виміру за замовчуванням
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Дата повторюється
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,"Особа, яка має право підпису"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Погоджувачем відпустки повинен бути однин з {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Створіть комісії
-DocType: Hub Settings,Seller Email,Продавець E-mail
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Загальна вартість покупки (через рахунок покупки)
 DocType: Training Event,Start Time,Час початку
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Виберіть Кількість
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Виберіть Кількість
 DocType: Customs Tariff Number,Customs Tariff Number,Митний тариф номер
 DocType: Patient Appointment,Patient Appointment,Призначення пацієнта
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"Затвердження роль не може бути такою ж, як роль правило застосовно до"
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Відмовитися від цієї Email Дайджест
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Відмовитися від цієї Email Дайджест
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Отримати постачальників за
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} не знайдено для пункту {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Перейти до курсів
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Повідомлення відправлено
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,"Рахунок з дочірніх вузлів, не може бути встановлений як книгу"
@@ -3323,11 +3389,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Матеріал для виготовлення Переведений
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Рахунок {0} не існує робить
 DocType: Project,Project Type,Тип проекту
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Дитяча задача існує для цієї задачі. Ви не можете видалити це завдання.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Кінцева к-сть або сума є обов'язковими
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Вартість різних видів діяльності
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Більше немає результатів
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Вартість різних видів діяльності
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Призначення подій до {0}, оскільки працівник приєднаний до нижчевказаного Відповідального з продажуі не має ідентифікатора користувача {1}"
 DocType: Timesheet,Billing Details,платіжна інформація
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Вихідний і цільової склад повинні бути різними
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Вихідний і цільової склад повинні бути різними
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Не допускається оновлення складських операцій старше {0}
 DocType: Purchase Invoice Item,PR Detail,PR-Деталь
 DocType: Sales Order,Fully Billed,Повністю включено у рахунки
@@ -3354,7 +3422,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Банківський переказ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Перевірити все
 DocType: Vehicle Log,Invoice Ref,Рахунок-фактура Посилання
-DocType: Purchase Order,Recurring Order,Періодичне замовлення
 DocType: Company,Default Income Account,Рахунок доходів за замовчуванням
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Група клієнтів / клієнтів
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed фінансових років Прибуток / збиток (Кредит)
@@ -3368,9 +3435,9 @@
 DocType: Patient,A Negative,Негативний
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Нічого більше не показувати.
 DocType: Lead,From Customer,Від Замовника
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Дзвінки
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Дзвінки
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Продукт
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,порції
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,порції
 DocType: Project,Total Costing Amount (via Time Logs),Всього Калькуляція Сума (за допомогою журналів Time)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Зробити розклад заробітної плати
 DocType: Purchase Order Item Supplied,Stock UOM,Одиниця виміру запасів
@@ -3395,7 +3462,7 @@
 DocType: School Settings,Current Academic Term,Поточний Academic термін
 DocType: School Settings,Current Academic Term,Поточний Academic термін
 DocType: Sales Order,Not Billed,Не включено у рахунки
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Обидва Склад повинен належати тій же компанії
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Обидва Склад повинен належати тій же компанії
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Немає контактів ще не додавали.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Сума документу кінцевої вартості
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,"Законопроекти, підняті постачальників."
@@ -3404,7 +3471,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Сума знижки
 DocType: Purchase Invoice,Return Against Purchase Invoice,Повернення згідно вхідного рахунку
 DocType: Item,Warranty Period (in days),Гарантійний термін (в днях)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',"update `tabPatient Appointment` встановити sales_invoice = &#39;{0}&#39;, де name = &#39;{1}&#39;"
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Зв&#39;язок з Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Чисті грошові кошти від операційної
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Пункт 4
@@ -3413,8 +3479,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Рахунок Проводки
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Студентська група
 DocType: Shopping Cart Settings,Quotation Series,Серії пропозицій
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Пункт існує з таким же ім&#39;ям ({0}), будь ласка, змініть назву групи товарів або перейменувати пункт"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,"Будь ласка, виберіть клієнта"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Пункт існує з таким же ім&#39;ям ({0}), будь ласка, змініть назву групи товарів або перейменувати пункт"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,"Будь ласка, виберіть клієнта"
 DocType: C-Form,I,Я
 DocType: Company,Asset Depreciation Cost Center,Центр витрат амортизації
 DocType: Sales Order Item,Sales Order Date,Дата Замовлення клієнта
@@ -3423,6 +3489,7 @@
 DocType: Assessment Plan,Assessment Plan,план оцінки
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Клієнт {0} створено.
 DocType: Stock Settings,Limit Percent,граничне Відсоток
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,На даний момент немає запасів на будь-якому складі
 ,Payment Period Based On Invoice Date,Затримка оплати після виставлення рахунку
 DocType: Sample Collection,No. of print,Номер друку
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Відсутні курси валют для {0}
@@ -3478,13 +3545,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Разом Відрахування - Погашення кредиту
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,Нові норми не можуть бути такими ж як поточні
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,ID Зарплатного розрахунку
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,ID Зарплатного розрахунку
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,"Дата виходу на пенсію повинен бути більше, ніж дата влаштування"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Були помилки При плануванні курсу по:
 DocType: Sales Invoice,Against Income Account,На рахунок доходів
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Доставлено
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Позиція {0}: Замовлена к-сть {1} не може бути менше мінімальної к-сті замовлення {2} (визначеної у інвентарній картці).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Позиція {0}: Замовлена к-сть {1} не може бути менше мінімальної к-сті замовлення {2} (визначеної у інвентарній картці).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Щомісячний Процентний розподіл
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,"Будь ласка, увійдіть як інший користувач."
 DocType: Territory,Territory Targets,Територія Цілі
 DocType: Delivery Note,Transporter Info,Інформація про перевізника
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},"Будь ласка, встановіть значення за замовчуванням {0} в компанії {1}"
@@ -3492,13 +3560,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Те ж постачальник був введений кілька разів
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Валовий прибуток / збиток
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Позиція замовлення на придбання поставлена
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Назва компанії не може бути компанія
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Назва компанії не може бути компанія
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Фірмові заголовки для шаблонів друку.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Назви для шаблонів друку, наприклад рахунок-проформа."
 DocType: Program Enrollment,Walking,ходьба
 DocType: Student Guardian,Student Guardian,Студент-хранитель
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Звинувачення типу Оцінка не може відзначений як включено
 DocType: POS Profile,Update Stock,Оновити запас
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,в передплаті
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Різні Одиниця виміру для елементів призведе до неправильної (всього) значення маси нетто. Переконайтеся, що вага нетто кожного елемента знаходиться в тій же UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Вартість згідно норми
 DocType: Asset,Journal Entry for Scrap,Проводка для брухту
@@ -3548,15 +3617,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Ім’я Системного користувача. Якщо зазначене, то воно стане за замовчуванням для всіх форм відділу кадрів."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: З {1}
 DocType: Task,depends_on,залежить від
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Очікується оновлення останньої ціни у всіх Білльових Матеріалах. Це може зайняти кілька хвилин.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Очікується оновлення останньої ціни у всіх Білльових Матеріалах. Це може зайняти кілька хвилин.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Ім&#39;я нового Користувача. Примітка: Будь ласка, не створювати облікові записи для клієнтів і постачальників"
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Країнозалежний шаблон адреси за замовчуванням
 DocType: Sales Order Item,Supplier delivers to Customer,Постачальник доставляє клієнтові
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Форма/Об’єкт/{0}) немає в наявності
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Через / Довідник Дата не може бути після {0}
+,Sales Payment Summary,Підсумок платежів за продаж
+DocType: Restaurant,Restaurant,Ресторан
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Через / Довідник Дата не може бути після {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Імпорт та експорт даних
 DocType: Patient,Account Details,Деталі облікового запису
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,"Немає студентів, не знайдено"
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,"Немає студентів, не знайдено"
 DocType: Medical Department,Medical Department,Медичний департамент
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Критерії оцінки скорингової системи постачальника
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Дата створення рахунку-фактури
@@ -3567,8 +3638,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,"Будь ласка, виберіть дату запису, перш ніж вибрати контрагента"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,З Контракту на річне обслуговування
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,"Будь ласка, виберіть Витяги"
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,"Будь ласка, виберіть Витяги"
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,"Будь ласка, виберіть Витяги"
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,"Будь ласка, виберіть Витяги"
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Кількість проведених амортизацій не може бути більше за загальну кількість амортизацій
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Зробити Візит тех. обслуговування
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,"Будь ласка, зв&#39;яжіться з користувачем, які мають по продажах Майстер диспетчера {0} роль"
@@ -3576,7 +3647,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Компанії (не клієнтів або постачальників) господар.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Це засновано на відвідуваності цього студента
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,немає Студенти
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Додайте більше деталей або відкриту повну форму
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Додайте більше деталей або відкриту повну форму
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Доставка Примітки {0} має бути скасований до скасування цього замовлення клієнта
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Перейти до Користувачів
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,"Оплачена сума + Сума списання не може бути більше, ніж загальний підсумок"
@@ -3597,37 +3668,40 @@
 DocType: Fee Schedule,Fee Schedule,плата Розклад
 DocType: Hub Settings,Publish Availability,Опублікувати Наявність
 DocType: Company,Create Chart Of Accounts Based On,"Створення плану рахунків бухгалтерського обліку, засновані на"
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Неможливо перетворити його в негрупу. Дитячі завдання існують.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,"Дата народження не може бути більше, ніж сьогодні."
 ,Stock Ageing,Застарівання інвентаря
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Student {0} існує проти студента заявника {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Регулювання округлення (Валюта компанії)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Табель робочого часу
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Табель робочого часу
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' неактивний
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Встановити як Open
 DocType: Cheque Print Template,Scanned Cheque,Сканований чек
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Відправити автоматичні листи на Контакти Про подання операцій.
 DocType: Timesheet,Total Billable Amount,Загальна сума до розрахунку
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Пункт 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Замовлення
 DocType: Purchase Order,Customer Contact Email,Контакти з клієнтами E-mail
 DocType: Warranty Claim,Item and Warranty Details,Предмет і відомості про гарантії
 DocType: Sales Team,Contribution (%),Внесок (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примітка: Оплата не буде створена, оскільки не зазаначено ""Готівковий або банківський рахунок"""
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Проект {0} вже існує
 DocType: Medical Department,Nursing User,Медичний користувач
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Обов&#39;язки
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Термін дії цієї цитати закінчився.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Термін дії цієї цитати закінчився.
 DocType: Expense Claim Account,Expense Claim Account,Рахунок Авансового звіту
 DocType: Accounts Settings,Allow Stale Exchange Rates,Дозволити стабільний курс обміну
 DocType: Sales Person,Sales Person Name,Ім'я відповідального з продажу
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Будь ласка, введіть принаймні 1-фактуру у таблицю"
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Додати користувачів
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Додати користувачів
 DocType: POS Item Group,Item Group,Група
 DocType: Item,Safety Stock,Безпечний запас
 DocType: Healthcare Settings,Healthcare Settings,Налаштування охорони здоров&#39;я
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,"Прогрес% для завдання не може бути більше, ніж 100."
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,"Прогрес% для завдання не може бути більше, ніж 100."
 DocType: Stock Reconciliation Item,Before reconciliation,Перед інвентаризацією
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Для {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Податки та збори додано (Валюта компанії)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Податковий ряд {0} повинен мати обліковий запис типу податку або доходів або витрат або платно
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Податковий ряд {0} повинен мати обліковий запис типу податку або доходів або витрат або платно
 DocType: Sales Order,Partly Billed,Частково є у виставлених рахунках
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Пункт {0} повинен бути Fixed Asset Item
 DocType: Item,Default BOM,Норми за замовчуванням
@@ -3643,6 +3717,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,змінна
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,З накладної
 DocType: Student,Student Email Address,Студент E-mail адреса
+DocType: Item,Hub Warehouse,Магазин концентратора
 DocType: Physician Schedule Time Slot,From Time,Від часу
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,В наявності:
 DocType: Notification Control,Custom Message,Текст повідомлення
@@ -3651,9 +3726,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,студент Адреса
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,студент Адреса
 DocType: Purchase Invoice,Price List Exchange Rate,Обмінний курс прайс-листа
+DocType: POS Profile,POS Profile Name,Назва профілю POS
 DocType: Purchase Invoice Item,Rate,Ціна
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Інтерн
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Адреса Ім&#39;я
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Адреса Ім&#39;я
 DocType: Stock Entry,From BOM,З норм
 DocType: Assessment Code,Assessment Code,код оцінки
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Основний
@@ -3667,11 +3743,12 @@
 DocType: Salary Slip,Salary Structure,Структура зарплати
 DocType: Account,Bank,Банк
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авіакомпанія
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Матеріал Випуск
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Матеріал Випуск
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Під час створення повторюваних сталася помилка
 DocType: Material Request Item,For Warehouse,Для складу
 DocType: Employee,Offer Date,Дата пропозиції
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Пропозиції
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Ви перебуваєте в автономному режимі. Ви не зможете оновити доки не відновите зв’язок.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Ви перебуваєте в автономному режимі. Ви не зможете оновити доки не відновите зв’язок.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Жоден студент групи не створено.
 DocType: Purchase Invoice Item,Serial No,Серійний номер
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,"Щомісячне погашення Сума не може бути більше, ніж сума позики"
@@ -3681,17 +3758,18 @@
 DocType: Salary Slip,Total Working Hours,Всього годин роботи
 DocType: Subscription,Next Schedule Date,Дата наступного розкладу
 DocType: Stock Entry,Including items for sub assemblies,Включаючи позиції для наівфабрикатів
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Значення має бути позитивним
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Всі території
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Значення має бути позитивним
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Всі території
 DocType: Purchase Invoice,Items,Номенклатура
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Студент вже надійшов.
 DocType: Fiscal Year,Year Name,Назва року
 DocType: Process Payroll,Process Payroll,Розрахунок заробітної плати
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,У цьому місяці більше вихідних ніж робочих днів.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,У цьому місяці більше вихідних ніж робочих днів.
 DocType: Product Bundle Item,Product Bundle Item,Комплект
 DocType: Sales Partner,Sales Partner Name,Назва торгового партнеру
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Запит на надання пропозицій
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Запит на надання пропозицій
 DocType: Payment Reconciliation,Maximum Invoice Amount,Максимальна Сума рахунку
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Гематологія
 DocType: Normal Test Items,Normal Test Items,Нормальні тестові елементи
 DocType: Student Language,Student Language,Student Мова
 apps/erpnext/erpnext/config/selling.py +23,Customers,клієнти
@@ -3703,10 +3781,11 @@
 DocType: Issue,Opening Time,Час відкриття
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"Від і До дати, необхідних"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Цінні папери та бірж
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"За од.вим. за замовчуванням для варіанту '{0}' має бути такою ж, як в шаблоні ""{1} '"
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"За од.вим. за замовчуванням для варіанту '{0}' має бути такою ж, як в шаблоні ""{1} '"
 DocType: Shipping Rule,Calculate Based On,"Розрахувати, засновані на"
 DocType: Delivery Note Item,From Warehouse,Від Склад
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Ні предметів з Біллом матеріалів не повинна Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Ні предметів з Біллом матеріалів не повинна Manufacture
+DocType: Restaurant,Default Customer,За замовчуванням клієнт
 DocType: Assessment Plan,Supervisor Name,Ім'я супервайзера
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Не підтверджуйте, якщо зустріч призначена для того самого дня"
 DocType: Program Enrollment Course,Program Enrollment Course,Програма Зарахування курс
@@ -3734,7 +3813,7 @@
 DocType: Payment Entry,Internal Transfer,внутрішній переказ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Дитячий рахунок існує для цього облікового запису. Ви не можете видалити цей аккаунт.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Кінцева к-сть або сума є обов'язковими
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Немає Норм за замовчуванням для елемента {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Немає Норм за замовчуванням для елемента {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,"Будь ласка, виберіть спочатку дату запису"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,"Відкриття Дата повинна бути, перш ніж Дата закриття"
 DocType: Leave Control Panel,Carry Forward,Переносити
@@ -3770,6 +3849,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Разом Поточна
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,Бухгалтерська звітність
 DocType: Drug Prescription,Hour,Година
+DocType: Restaurant Order Entry,Last Sales Invoice,Останній продаж рахунків-фактур
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Новий Серійний номер не може мати склад. Склад повинен бути встановлений Рухом ТМЦ або Прихідною накладною
 DocType: Lead,Lead Type,Тип Lead-а
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Ви не уповноважений погоджувати відпустки на заблоковані дати
@@ -3806,65 +3886,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,створення користувачів
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,грам
 DocType: Supplier Scorecard,Per Month,На місяць
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,"Кількість, Виготовлення повинні бути більше, ніж 0."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,"Кількість, Виготовлення повинні бути більше, ніж 0."
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Звіт по візиту на виклик по тех. обслуговуванню.
 DocType: Stock Entry,Update Rate and Availability,Частота оновлення і доступність
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Відсоток, на який вам дозволено отримати або доставити більше порівняно з замовленої кількістю. Наприклад: Якщо ви замовили 100 одиниць, а Ваш Дозволений відсоток перевищення складає 10%, то ви маєте право отримати 110 одиниць."
 DocType: POS Customer Group,Customer Group,Група клієнтів
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Нова партія ID (Необов&#39;язково)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Нова партія ID (Необов&#39;язково)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Нова партія ID (Необов&#39;язково)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Нова партія ID (Необов&#39;язково)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Витрати рахунку є обов&#39;язковим для пункту {0}
 DocType: BOM,Website Description,Опис веб-сайту
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Чиста зміна в капіталі
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Найновіші
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,"Будь ласка, відмініть спочатку вхідний рахунок {0}"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Адреса електронної пошти повинен бути унікальним, вже існує для {0}"
 DocType: Serial No,AMC Expiry Date,Дата закінчення річного обслуговування
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,розписка
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,розписка
 ,Sales Register,Реєстр продаж
 DocType: Daily Work Summary Settings Company,Send Emails At,Електронна пошта на
 DocType: Quotation,Quotation Lost Reason,Причина втрати пропозиції
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Виберіть галузь
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',"виберіть * з tabPatient, де name = &#39;{0}&#39;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},Посилання на операцію № {0} від {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Посилання на операцію № {0} від {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Нема що редагувати
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Вид форми
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Результати для цього місяця та незакінчена діяльність
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Вид форми
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Результати для цього місяця та незакінчена діяльність
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Додайте користувачів до своєї організації, крім вас."
 DocType: Customer Group,Customer Group Name,Група Ім&#39;я клієнта
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Немає клієнтів ще!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Немає клієнтів ще!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Звіт про рух грошових коштів
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Сума кредиту не може перевищувати максимальний Сума кредиту {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,ліцензія
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},"Будь ласка, видаліть цю фактуру {0} з C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},"Будь ласка, видаліть цю фактуру {0} з C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year
 DocType: GL Entry,Against Voucher Type,Згідно док-ту типу
 DocType: Physician,Phone (R),Телефон (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Часові інтервали додані
 DocType: Item,Attributes,Атрибути
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Увімкнути шаблон
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Будь-ласка, встановіть серію імен для {0} через Налаштування&gt; Налаштування&gt; Серія імен"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,"Будь ласка, введіть рахунок списання"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Остання дата замовлення
 DocType: Patient,B Negative,B Негативний
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Рахунок {0} не належить компанії {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Серійні номери в рядку {0} не збігається з накладною
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Серійні номери в рядку {0} не збігається з накладною
 DocType: Student,Guardian Details,Детальніше Гардіан
 DocType: C-Form,C-Form,С-форма
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Марк відвідуваності для декількох співробітників
 DocType: Vehicle,Chassis No,шасі Немає
 DocType: Payment Request,Initiated,З ініціативи
 DocType: Production Order,Planned Start Date,Планована дата початку
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,"Будь ласка, виберіть BOM"
 DocType: Serial No,Creation Document Type,Створення типу документа
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,"Дата завершення повинна бути більшою, ніж дата початку"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,"Дата завершення повинна бути більшою, ніж дата початку"
 DocType: Leave Type,Is Encash,Є Обналічиваніє
 DocType: Leave Allocation,New Leaves Allocated,Призначити днів відпустки
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Проектні дані не доступні для пропозиції
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Кінець
 DocType: Project,Expected End Date,Очікувана Дата закінчення
 DocType: Budget Account,Budget Amount,сума бюджету
 DocType: Appraisal Template,Appraisal Template Title,Оцінка шаблону Назва
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},З дати {0} для співробітників {1} не може бути ще до вступу Дата працівника {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Комерційна
 DocType: Patient,Alcohol Current Use,Використання алкогольних напоїв
+DocType: Student Admission Program,Student Admission Program,Програма прийому студентів
 DocType: Payment Entry,Account Paid To,Рахунок оплати
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Батьківській елемент {0} не повинен бути складським
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Всі продукти або послуги.
@@ -3873,30 +3955,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Бюджет рахунку {1} проти {2} {3} одно {4}. Він буде перевищувати {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Рядок {0} # Рахунок повинен бути типу &quot;Fixed Asset&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Розхід у к-сті
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Правила для розрахунку кількості вантажу для продажу
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,і незафіксований. вимкнено в
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Серії є обов'язковими
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Фінансові послуги
 DocType: Student Sibling,Student ID,Student ID
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Види діяльності для Час Журнали
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Електронна пошта постачальника
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Види діяльності для Час Журнали
 DocType: Tax Rule,Sales,Продаж
 DocType: Stock Entry Detail,Basic Amount,Основна кількість
 DocType: Training Event,Exam,іспит
 DocType: Complaint,Complaint,Скарга
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},Необхідно вказати склад для номенклатури {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Необхідно вказати склад для номенклатури {0}
 DocType: Leave Allocation,Unused leaves,Невикористані дні відпустки
 DocType: Patient,Alcohol Past Use,Спиртне минуле використання
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Штат (оплата)
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Переклад
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Зібрати розібрані норми (у тому числі вузлів)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Переклад
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Зібрати розібрані норми (у тому числі вузлів)
 DocType: Authorization Rule,Applicable To (Employee),Застосовується до (Співробітник)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Завдяки Дата є обов&#39;язковим
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Завдяки Дата є обов&#39;язковим
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Приріст за атрибут {0} не може бути 0
 DocType: Journal Entry,Pay To / Recd From,Заплатити / Отримати
 DocType: Naming Series,Setup Series,Налаштування серій
 DocType: Payment Reconciliation,To Invoice Date,Рахунки-фактури з датою по
 DocType: Supplier,Contact HTML,Зв&#39;язатися з HTML-
 ,Inactive Customers,Неактивні Клієнти
+DocType: Student Admission Program,Maximum Age,Максимальний вік
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Прихідні накладні
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Як застосовується цінове правило?
@@ -3915,6 +3999,7 @@
 DocType: GL Entry,Remarks,Зауваження
 DocType: Payment Entry,Account Paid From,Рахунок Оплачено з
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Номенклатура давальної сировини
+DocType: Task,Parent Task,Батьківська задача
 DocType: Journal Entry,Write Off Based On,Списання заснований на
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,зробити Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Друк та канцелярські
@@ -3923,20 +4008,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Зарплата вже оброблена за період між {0} і {1}, Період відпустки не може бути в межах цього діапазону дат."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Установка рекорд для серійним номером
 DocType: Guardian Interest,Guardian Interest,опікун Відсотки
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Встановити значення за замовчуванням для рахунків-фактур POS
 apps/erpnext/erpnext/config/hr.py +177,Training,навчання
 DocType: Timesheet,Employee Detail,Дані працівника
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ІД епошти охоронця
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ІД епошти охоронця
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,день Дата наступного і повторити на День місяця має дорівнювати
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,день Дата наступного і повторити на День місяця має дорівнювати
 DocType: Lab Prescription,Test Code,Тестовий код
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Налаштування домашньої сторінки веб-сайту
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},Запити на RFQ не дозволені для {0} через показник показника показника {1}
 DocType: Offer Letter,Awaiting Response,В очікуванні відповіді
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Вище
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Загальна сума {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},Неприпустимий атрибут {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Загальна сума {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},Неприпустимий атрибут {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Згадка якщо нестандартні до оплати рахунків
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Той же пункт був введений кілька разів. {Список}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',"Будь ласка, виберіть групу оцінки, крім «всіх груп за оцінкою»"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Рядок {0}: для пункту {1} потрібен центр витрат.
 DocType: Training Event Employee,Optional,Необов&#39;язково
@@ -3959,13 +4044,15 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Центр витрат є обов'язковим для елементу {2}
 DocType: Vehicle,Policy No,політика Ні
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Отримати елементи з комплекту
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Оскільки акція існує проти елемента {0}, ви не можете включити має властивості варіантів"
 DocType: Asset,Straight Line,Лінійний
 DocType: Project User,Project User,проект Користувач
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,розщеплений
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,розщеплений
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,розщеплений
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,розщеплений
 DocType: GL Entry,Is Advance,Є попередня
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Відвідуваність з дати та по дату є обов'язковими
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,"Будь ласка, введіть ""субпідряджено"", як так чи ні"
+DocType: Item,Default Purchase Unit of Measure,За замовчуванням одиниця виміру закупівлі
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Остання дата зв&#39;язку
 DocType: Sales Team,Contact No.,Контакт No.
 DocType: Bank Reconciliation,Payment Entries,Оплати
@@ -3973,7 +4060,6 @@
 DocType: Production Order,Check if material transfer entry is not required,"Перевірте, якщо запис про передачу матеріалу не потрібно"
 DocType: Production Order,Check if material transfer entry is not required,"Перевірте, якщо запис про передачу матеріалу не потрібно"
 DocType: Program Enrollment Tool,Get Students From,Отримати студентів з
-DocType: Hub Settings,Seller Country,Продавець Країна
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Опублікувати об’єкти на веб-сайті
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Група ваших студентів в партіях
 DocType: Authorization Rule,Authorization Rule,Авторизація Правило
@@ -3983,8 +4069,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Шаблон податків та зборів на продаж
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Разом (кредит)
 DocType: Repayment Schedule,Payment Date,Дата оплати
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Нова партія Кількість
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Нова партія Кількість
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Нова партія Кількість
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Нова партія Кількість
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Одяг та аксесуари
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,"Не вдалося вирішити вагова функцію. Переконайтеся, що формула дійсна."
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Номер замовлення
@@ -4002,6 +4088,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Рядок # {0}: Asset {1} не може бути представлено, вже {2}"
 DocType: Tax Rule,Billing Country,Країна (оплата)
 DocType: Purchase Order Item,Expected Delivery Date,Очікувана дата поставки
+DocType: Restaurant Order Entry,Restaurant Order Entry,Замовлення ресторану
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебет і Кредит не рівні для {0} # {1}. Різниця {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Представницькі витрати
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Зробити запит Матеріал
@@ -4014,9 +4101,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Рахунок з існуючою транзакції не можуть бути вилучені
 DocType: Vehicle,Last Carbon Check,Останній Carbon Перевірити
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Судові витрати
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,"Будь ласка, виберіть кількість по ряду"
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,"Будь ласка, виберіть кількість по ряду"
 DocType: Purchase Invoice,Posting Time,Час запису
 DocType: Timesheet,% Amount Billed,Виставлено рахунків на %
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Час для призначення&quot; не встановлено для Dr {0}. Додайте його до магістра лікаря.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Телефон Витрати
 DocType: Sales Partner,Logo,Логотип
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Перевірте це, якщо ви хочете, щоб змусити користувача вибрати ряд перед збереженням. Там не буде за замовчуванням, якщо ви перевірити це."
@@ -4027,6 +4115,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Виручка від нових клієнтів
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Витрати на відрядження
 DocType: Maintenance Visit,Breakdown,Зламатися
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Додати спеціальну підписку на поле в doctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Рахунок: {0} з валютою: {1} не може бути обраний
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Оновити вартість BOM автоматично за допомогою Планувальника, виходячи з останньої норми курсу / цінового списку / останньої ціни закупівлі сировини."
 DocType: Bank Reconciliation Detail,Cheque Date,Дата чеку
@@ -4051,7 +4140,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Разом сума до оплати (згідно журналу)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Id постачальника
 DocType: Payment Request,Payment Gateway Details,Деталі платіжного шлюзу
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,"Кількість повинна бути більше, ніж 0"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,"Кількість повинна бути більше, ніж 0"
 DocType: Journal Entry,Cash Entry,Грошові запис
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Дочірні вузли можуть бути створені тільки в вузлах типу &quot;Група&quot;
 DocType: Leave Application,Half Day Date,півдня Дата
@@ -4069,12 +4158,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Примітка: Пункт {0} введений кілька разів
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Всі контакти.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Абревіатура Компанії
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Користувач {0} не існує
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Користувач {0} не існує
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Скорочення
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Оплата вже існує
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Не так Authroized {0} перевищує межі
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Майстер зарплатних шаблонів
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Патологія
+DocType: Restaurant Order Entry,Restaurant Table,Ресторанний стіл
 DocType: Leave Type,Max Days Leave Allowed,Макс днів відпустки тварин
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Встановіть податкове правило для кошику
 DocType: Purchase Invoice,Taxes and Charges Added,Податки та збори додано
@@ -4086,10 +4177,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Квоти для Lead-ів або клієнтів.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Роль з дозволом редагувати заблоковані складські рухи
 ,Territory Target Variance Item Group-Wise,Розбіжності цілей по територіях (по групах товарів)
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Всі групи покупців
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Всі групи покупців
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Накопичений в місяць
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} є обов'язковим. Може бути, Обмін валюти запис не створена для {1} до {2}."
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Податковий шаблон є обов'язковим
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Податковий шаблон є обов'язковим
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Рахунок {0}: Батьківський рахунок не існує {1}
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ціна з прайс-листа (валюта компанії)
 DocType: Products Settings,Products Settings,Налаштування виробів
@@ -4115,13 +4206,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Пункт Мудрий Податковий Подробиці
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Абревіатура інституту
 ,Item-wise Price List Rate,Ціни прайс-листів по-товарно
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Пропозиція постачальника
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Пропозиція постачальника
 DocType: Quotation,In Words will be visible once you save the Quotation.,"""Прописом"" буде видно, як тільки ви збережете пропозицію."
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Кількість ({0}) не може бути фракцією в рядку {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Кількість ({0}) не може бути фракцією в рядку {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,попит-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Штрихкод {0} вже використовується у номенклатурній позиції {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Штрихкод {0} вже використовується у номенклатурній позиції {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Правила для додавання транспортні витрати.
 DocType: Item,Opening Stock,Початкові залишки
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Потрібно клієнтів
@@ -4139,9 +4230,8 @@
 DocType: Customer,From Lead,З Lead-а
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Замовлення випущений у виробництво.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Виберіть фінансовий рік ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,"Необхідний POS-профіль, щоб зробити POS-операцію"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,"Необхідний POS-профіль, щоб зробити POS-операцію"
 DocType: Program Enrollment Tool,Enroll Students,зарахувати студентів
-DocType: Hub Settings,Name Token,Ім&#39;я маркера
 DocType: Lab Test,Approved Date,Затверджена дата
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Стандартний Продаж
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Принаймні одне склад є обов&#39;язковим
@@ -4159,7 +4249,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Людський ресурс
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Оплата узгодження
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Податкові активи
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Виробничий замовлення було {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Виробничий замовлення було {0}
 DocType: BOM Item,BOM No,Номер Норм
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Проводка {0} не має рахунку {1} або вже прив'язана до іншого документу
@@ -4179,8 +4269,8 @@
 DocType: Currency Exchange,To Currency,У валюту
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Дозволити наступним користувачам погоджувати відпустки на заблоковані дні.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Типи Авансових звітів.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},"ставка для пункту продажу {0} нижче, ніж його {1}. курс продажу повинен бути принаймні {2}"
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},"ставка для пункту продажу {0} нижче, ніж його {1}. курс продажу повинен бути принаймні {2}"
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},"ставка для пункту продажу {0} нижче, ніж його {1}. курс продажу повинен бути принаймні {2}"
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},"ставка для пункту продажу {0} нижче, ніж його {1}. курс продажу повинен бути принаймні {2}"
 DocType: Item,Taxes,Податки
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,Платні і не доставляється
 DocType: Project,Default Cost Center,Центр доходів/витрат за замовчуванням
@@ -4194,15 +4284,15 @@
 DocType: Employee Loan,Fully Disbursed,повністю Освоєно
 DocType: Maintenance Visit,Customer Feedback,Зворотній зв&#39;язок з клієнтами
 DocType: Account,Expense,Витрати
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,"Оцінка не може бути більше, ніж максимальний бал"
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,"Оцінка не може бути більше, ніж максимальний бал"
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Клієнти та постачальники
 DocType: Item Attribute,From Range,Від хребта
 DocType: BOM,Set rate of sub-assembly item based on BOM,Встановити швидкість елемента підскладки на основі BOM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Синтаксична помилка у формулі або умова: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Синтаксична помилка у формулі або умова: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Щоденна робота Резюме Налаштування компанії
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,"Пункт {0} ігноруються, так як це не інвентар"
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Проведіть це виробниче замовлення для подальшої обробки.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Проведіть це виробниче замовлення для подальшої обробки.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Для того, щоб не застосовувати цінове правило у певній операції всі правила, які могли би застосуватися мають бути відключені ."
 DocType: Assessment Group,Parent Assessment Group,Батько група по оцінці
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,роботи
@@ -4218,12 +4308,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Будь ласка, встановіть фільтр компанії порожнім, якщо група До є «Компанія»"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Дата розміщення не може бути майбутня дата
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},"Ряд # {0}: Серійний номер {1}, не відповідає {2} {3}"
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,для генерування повторюваних
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Непланована відпустка
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Лабораторний тест UOM.
 DocType: Batch,Batch ID,Ідентифікатор партії
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Примітка: {0}
 ,Delivery Note Trends,Тренд розхідних накладних
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Резюме цього тижня
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Резюме цього тижня
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,В наявності Кількість
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Рахунок: {0} може оновитися тільки операціями з інвентарем
 DocType: Student Group Creation Tool,Get Courses,отримати курси
@@ -4237,7 +4328,6 @@
 DocType: Purchase Order,To Bill,Очікує рахунку
 DocType: Material Request,% Ordered,% Замовлено
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Для заснованого курсу студентської групи, Курс буде перевірятися для кожного студента з зарахованих курсів в програмі зарахування."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Введіть адресу електронної пошти, розділених комами, рахунок-фактура буде відправлений автоматично на конкретну дату"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Відрядна робота
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Сер. ціна закупівлі
 DocType: Task,Actual Time (in Hours),Фактичний час (в годинах)
@@ -4251,7 +4341,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Пункт {0} не налаштований на послідовний пп. Колонка повинна бути порожньою
 DocType: Accounts Settings,Accounts Settings,Налаштування рахунків
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,затвердити
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Немає результатів для надсилання
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Немає результатів для надсилання
 DocType: Customer,Sales Partner and Commission,Торговий партнер та комісія
 DocType: Employee Loan,Rate of Interest (%) / Year,Процентна ставка (%) / рік
 ,Project Quantity,проект Кількість
@@ -4263,55 +4353,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Чорний
 DocType: BOM Explosion Item,BOM Explosion Item,Складова продукції згідно норм
 DocType: Account,Auditor,Аудитор
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} виготовлені товари
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} виготовлені товари
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Вивчайте більше
 DocType: Cheque Print Template,Distance from top edge,Відстань від верхнього краю
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Прайс-лист {0} відключений або не існує
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Прайс-лист {0} відключений або не існує
 DocType: Purchase Invoice,Return,Повернення
 DocType: Production Order Operation,Production Order Operation,Виробництво Порядок роботи
 DocType: Pricing Rule,Disable,Відключити
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Спосіб оплати потрібно здійснити оплату
 DocType: Project Task,Pending Review,В очікуванні відгук
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Призначення та консультації
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} не надійшов у Batch {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} не надійшов у Batch {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} не може бути утилізовані, як це вже {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Всього витрат (за Авансовим звітом)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Марк Відсутня
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Рядок {0}: Валюта BOM # {1} має дорівнювати вибрану валюту {2}
 DocType: Journal Entry Account,Exchange Rate,Курс валюти
 DocType: Patient,Additional information regarding the patient,Додаткова інформація щодо пацієнта
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Замовлення клієнта {0} не проведено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Замовлення клієнта {0} не проведено
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,плата компонентів
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Управління флотом
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Додати елементи з
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Управління флотом
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Додати елементи з
 DocType: Cheque Print Template,Regular,регулярне
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Всього Weightage всіх критеріїв оцінки повинні бути 100%
-DocType: BOM,Last Purchase Rate,Остання ціна закупівлі
+DocType: Purchase Order Item,Last Purchase Rate,Остання ціна закупівлі
 DocType: Account,Asset,Актив
 DocType: Project Task,Task ID,Завдання ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Не може бути залишків по позиції {0}, так як вона має варіанти"
 DocType: Lab Test,Mobile,Мобільний
 ,Sales Person-wise Transaction Summary,Операції у розрізі Відповідальних з продажу
 DocType: Training Event,Contact Number,Контактний номер
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Склад {0} не існує
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Зареєструватися на Hub ERPNext
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Склад {0} не існує
 DocType: Monthly Distribution,Monthly Distribution Percentages,Щомісячні Відсотки розподілу
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Обрана номенклатурна позиція не може мати партій
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Швидкість оцінки не знайдено для пункту {0}, яке потрібно робити бухгалтерські записи для {1} {2}. Якщо елемент угод як елемент зразка в {1}, будь ласка, відзначити, що в {1} таблиці Item. В іншому випадку, будь ласка, створити входять акції угоду по ст або згадки ставки оцінки в запису товару, а потім спробувати завершенням заповнення / скасуванням цього запису"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Матеріалів доставляється по цій накладній
+DocType: Training Event,Has Certificate,Має сертифікат
 DocType: Project,Customer Details,Реквізити клієнта
 DocType: Employee,Reports to,Підпорядкований
 ,Unpaid Expense Claim,Неоплачені витрати претензії
 DocType: Payment Entry,Paid Amount,Виплачена сума
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Дослідіть цикл продажу
 DocType: Assessment Plan,Supervisor,Супервайзер
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,Online
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,Online
 ,Available Stock for Packing Items,Доступно для пакування
 DocType: Item Variant,Item Variant,Варіант номенклатурної позиції
 DocType: Assessment Result Tool,Assessment Result Tool,Оцінка результату інструмент
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Лом Пункт
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Відправив замовлення не можуть бути видалені
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Відправив замовлення не можуть бути видалені
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс рахунку в дебет вже, ви не можете встановити &quot;баланс повинен бути&quot;, як &quot;Кредит»"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Управління якістю
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Пункт {0} відключена
@@ -4332,7 +4421,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Дозволити нульову Незалежну оцінку Оцінити
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Дозволити нульову Незалежну оцінку Оцінити
 DocType: Training Event Employee,Invited,запрошений
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,"Кілька активних Зарплатні структури, знайдені для працівника {0} для зазначених дат"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,"Кілька активних Зарплатні структури, знайдені для працівника {0} для зазначених дат"
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Налаштування шлюзу рахунку.
 DocType: Employee,Employment Type,Вид зайнятості
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Основні активи
@@ -4344,7 +4433,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,ІД епошти студента
 DocType: Employee,Notice (days),Попередження (днів)
 DocType: Tax Rule,Sales Tax Template,Шаблон податків на продаж
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Виберіть елементи для збереження рахунку-фактури
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Виберіть елементи для збереження рахунку-фактури
 DocType: Employee,Encashment Date,Дата виплати
 DocType: Training Event,Internet,інтернет
 DocType: Special Test Template,Special Test Template,Спеціальний шаблон тесту
@@ -4354,7 +4443,7 @@
 DocType: Academic Term,Term Start Date,Термін дата початку
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp граф
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp граф
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},Додається {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},Додається {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Банк балансовий звіт за Головну книгу
 DocType: Job Applicant,Applicant Name,Заявник Ім&#39;я
 DocType: Authorization Rule,Customer / Item Name,Замовник / Назва товару
@@ -4374,7 +4463,7 @@
 DocType: Guardian,Guardian Of ,хранитель
 DocType: Grading Scale Interval,Threshold,поріг
 DocType: BOM Update Tool,Current BOM,Поточні норми витрат
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Додати серійний номер
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Додати серійний номер
 DocType: Production Order Item,Available Qty at Source Warehouse,Доступний Кількість на складі Джерело
 apps/erpnext/erpnext/config/support.py +22,Warranty,гарантія
 DocType: Purchase Invoice,Debit Note Issued,Дебет Примітка Випущений
@@ -4397,10 +4486,9 @@
 DocType: Account,Receivable,Дебіторська заборгованість
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ряд # {0}: Не дозволено змінювати Постачальника оскільки вже існує Замовлення на придбання
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Роль, що дозволяє проводити операції, які перевищують ліміти кредитів."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Вибір елементів для виготовлення
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Майстер синхронізації даних, це може зайняти деякий час"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Вибір елементів для виготовлення
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Майстер синхронізації даних, це може зайняти деякий час"
 DocType: Item,Material Issue,Матеріал Випуск
-DocType: Hub Settings,Seller Description,Продавець Опис
 DocType: Employee Education,Qualification,Кваліфікація
 DocType: Item Price,Item Price,Ціна товару
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Мило та миючі засоби
@@ -4408,7 +4496,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Від часу не може бути більше часу.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Кіно & Відео
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Замовлено
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Резюме
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Резюме
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Якщо цей параметр увімкнено, система не буде оновлювати поля варіантів з шаблону, але копіює дані нижче вказаних полів при створенні нового варіанта"
 DocType: Salary Detail,Component,компонент
 DocType: Assessment Criteria,Assessment Criteria Group,Критерії оцінки Група
 DocType: Healthcare Settings,Patient Name By,Ім&#39;я пацієнта по
@@ -4418,7 +4507,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Будь ласка, введіть затвердження роль або затвердження Користувач"
 DocType: Journal Entry,Write Off Entry,Списання запис
 DocType: BOM,Rate Of Materials Based On,Вартість матеріалів базується на
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Постачальник&gt; Тип постачальника
+DocType: Item Variant Settings,Do not Update Variants,Не оновлюйте варіанти
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Аналітика підтримки
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Скасувати всі
 DocType: POS Profile,Terms and Conditions,Положення та умови
@@ -4427,7 +4516,7 @@
 DocType: Leave Block List,Applies to Company,Відноситься до Компанії
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,"Не можна скасувати, тому що проведений Рух ТМЦ {0} існує"
 DocType: Employee Loan,Disbursement Date,витрачання Дата
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&quot;Одержувачі&quot; не вказано
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&quot;Одержувачі&quot; не вказано
 DocType: BOM Update Tool,Update latest price in all BOMs,Оновити останню ціну у всіх БОМ
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Медичний запис
 DocType: Vehicle,Vehicle,транспортний засіб
@@ -4443,14 +4532,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,ОПП / Свинець%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Амортизація та баланси
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Сума {0} {1} переведений з {2} кілька разів {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Сума {0} {1} переведений з {2} кілька разів {3}
 DocType: Sales Invoice,Get Advances Received,Взяти отримані аванси
 DocType: Email Digest,Add/Remove Recipients,Додати / Видалити Одержувачів
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Угода не має проти зупинив виробництво Замовити {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Щоб встановити цей фінансовий рік, за замовчуванням, натисніть на кнопку &quot;Встановити за замовчуванням&quot;"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,приєднатися
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,приєднатися
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Брак к-сті
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Вже існує варіант позиції {0} з такими атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Вже існує варіант позиції {0} з такими атрибутами
 DocType: Employee Loan,Repay from Salary,Погашати із заробітної плати
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Запит платіж проти {0} {1} на суму {2}
@@ -4463,7 +4552,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Позиція замовлення клієнта
 DocType: Salary Slip,Payment Days,Дні оплати
 DocType: Patient,Dormant,бездіяльний
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Склади з дочірніми вузлами не можуть бути перетворені в бухгалтерській книзі
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Склади з дочірніми вузлами не можуть бути перетворені в бухгалтерській книзі
 DocType: BOM,Manage cost of operations,Управління вартість операцій
 DocType: Accounts Settings,Stale Days,Сталі дні
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Коли будь-яка з позначених операцій є ""Проведеною"", автоматично відкривається спливаюче вікно електронного листа, щоб надіслати лист з долученим документом  відповідному ""Контактові"". Чи надсилати, чи не надсилати листа користувач вирішує на свій розсуд."
@@ -4477,10 +4566,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Серійний номер {0} вже отриманий
 ,Requested Items To Be Transferred,"Номенклатура, що ми замовили але не отримали"
 DocType: Expense Claim,Vehicle Log,автомобіль Вхід
-DocType: Purchase Invoice,Recurring Id,Ідентифікатор періодичності
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Наявність лихоманки (температура&gt; 38,5 ° С / 101,3 ° F або стійка температура&gt; 38 ° C / 100,4 ° F)"
 DocType: Customer,Sales Team Details,Продажі команд Детальніше
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Видалити назавжди?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Видалити назавжди?
 DocType: Expense Claim,Total Claimed Amount,Усього сума претензії
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Потенційні можливості для продажу.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Невірний {0}
@@ -4490,7 +4578,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Універмаги
 ,Item Delivery Date,Дата доставки товару
 DocType: Warehouse,PIN,PIN-код
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Визначення своєї школи в ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Визначення своєї школи в ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Базова Зміна Сума (Компанія Валюта)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Немає бухгалтерських записів для наступних складів
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Спочатку збережіть документ.
@@ -4502,13 +4590,12 @@
 DocType: Task,Is Milestone,Чи є Milestone
 DocType: Daily Work Summary,Email Sent To,E-mail Надіслати
 DocType: Budget,Warn,Попереджати
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,"Ви впевнені, що хочете відмінити реєстрацію?"
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Будь-які інші зауваження, відзначити зусилля, які повинні йти в записах."
 DocType: BOM,Manufacturing User,Виробництво користувача
 DocType: Purchase Invoice,Raw Materials Supplied,Давальна сировина
-DocType: Purchase Invoice,Recurring Print Format,Формат періодичного друку
 DocType: C-Form,Series,Серії
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Валюта прайс-листа {0} має бути {1} або {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Додати продукти
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Валюта прайс-листа {0} має бути {1} або {2}
 DocType: Appraisal,Appraisal Template,Оцінка шаблону
 DocType: Item Group,Item Classification,Пункт Класифікація
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,менеджер з розвитку бізнесу
@@ -4522,7 +4609,7 @@
 DocType: Item Attribute Value,Attribute Value,Значення атрибуту
 ,Itemwise Recommended Reorder Level,Рекомендовані рівні перезамовлення по товарах
 DocType: Salary Detail,Salary Detail,Заробітна плата: Подробиці
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,"Будь ласка, виберіть {0} в першу чергу"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,"Будь ласка, виберіть {0} в першу чергу"
 DocType: Appointment Type,Physician,Лікар
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Партія {0} номенклатурної позиції {1} протермінована.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Консультації
@@ -4533,7 +4620,7 @@
 DocType: Salary Detail,Default Amount,За замовчуванням сума
 DocType: Lab Test Template,Descriptive,Описовий
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Склад не знайдений у системі
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Резюме цього місяця
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Резюме цього місяця
 DocType: Quality Inspection Reading,Quality Inspection Reading,Зчитування сертифікату якості
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,"Значення `Заморозити активи старіші ніж` повинно бути менше, ніж %d днів."
 DocType: Tax Rule,Purchase Tax Template,Шаблон податку на закупку
@@ -4556,12 +4643,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Навчання / Результати
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Накопичений знос на
 DocType: Sales Invoice,C-Form Applicable,"С-формі, застосовної"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},"Час роботи повинно бути більше, ніж 0 для операції {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},"Час роботи повинно бути більше, ніж 0 для операції {0}"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Склад є обов&#39;язковим
 DocType: Supplier,Address and Contacts,Адреса та контакти
 DocType: UOM Conversion Detail,UOM Conversion Detail,Одиниця виміру Перетворення Деталь
 DocType: Program,Program Abbreviation,Абревіатура програми
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Виробниче замовлення не може бути зроблене на шаблон номенклатурної позиції
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Виробниче замовлення не може бути зроблене на шаблон номенклатурної позиції
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Збори у прихідній накладній оновлюються по кожній позиції
 DocType: Warranty Claim,Resolved By,Вирішили За
 DocType: Bank Guarantee,Start Date,Дата початку
@@ -4587,27 +4674,28 @@
 DocType: Employee,Educational Qualification,Освітня кваліфікація
 DocType: Workstation,Operating Costs,Експлуатаційні витрати
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Дія, якщо накопичений місячний бюджет перевищено"
-DocType: Purchase Invoice,Submit on creation,Провести по створенню
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Валюта для {0} має бути {1}
+DocType: Subscription,Submit on creation,Провести по створенню
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Валюта для {0} має бути {1}
 DocType: Asset,Disposal Date,Утилізація Дата
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Електронні листи будуть відправлені до всіх активні працівники компанії на даний час, якщо у них немає відпустки. Резюме відповідей буде відправлений опівночі."
 DocType: Employee Leave Approver,Employee Leave Approver,Погоджувач відпустки працівника
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: Перезамовлення вже існує для цього складу {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Не можете бути оголошений як втрачений, бо вже зроблена пропозиція."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Навчання Зворотній зв&#39;язок
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: Перезамовлення вже існує для цього складу {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Не можете бути оголошений як втрачений, бо вже зроблена пропозиція."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Навчання Зворотній зв&#39;язок
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Виробниче замовлення {0} повинно бути проведеним
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Критерії оцінки показників постачальника
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},"Будь ласка, виберіть дату початку та дату закінчення Пункт {0}"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Курс є обов&#39;язковим в рядку {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,На сьогоднішній день не може бути раніше від дати
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Додати / Редагувати Ціни
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Додати / Редагувати Ціни
 DocType: Batch,Parent Batch,батько Batch
 DocType: Batch,Parent Batch,батько Batch
 DocType: Cheque Print Template,Cheque Print Template,Шаблон друку чеків
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Перелік центрів витрат
 DocType: Lab Test Template,Sample Collection,Збірка зразків
 ,Requested Items To Be Ordered,Номенклатура до замовлення
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Мої Замовлення
 DocType: Price List,Price List Name,Назва прайс-листа
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Щодня Резюме Робота для {0}
 DocType: Employee Loan,Totals,Загальні дані
@@ -4626,12 +4714,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,"{0} одиниць {1} необхідні {2} на {3} {4} для {5}, щоб завершити цю транзакцію."
 DocType: Fee Schedule,Student Category,студент Категорія
 DocType: Announcement,Student,студент
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Організація блок (департамент) господар.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Організація блок (департамент) господар.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Перейти в Номери
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Будь ласка, введіть повідомлення перед відправкою"
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,Дублює ДЛЯ ПОСТАЧАЛЬНИКІВ
 DocType: Email Digest,Pending Quotations,до Котирування
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,POS- Профіль
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,POS- Профіль
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Лабораторія тестових конфігурацій.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Незабезпечені кредити
 DocType: Cost Center,Cost Center Name,Назва центру витрат
@@ -4641,6 +4729,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Загальна оплачена сума
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Повідомлення більше ніж 160 символів будуть розділені на кілька повідомлень
 DocType: Purchase Receipt Item,Received and Accepted,Отримав і прийняв
+DocType: Hub Settings,Company and Seller Profile,Профіль компанії та продавця
 ,GST Itemised Sales Register,GST Деталізація продажів Реєстрація
 ,Serial No Service Contract Expiry,Закінчення сервісної угоди на серійний номер
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Один рахунок не може бути одночасно в дебеті та кредиті
@@ -4650,10 +4739,11 @@
 DocType: Item,Variant Based On,Варіант Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Всього weightage призначений повинна бути 100%. Це {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Ваші Постачальники
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,"Будь ласка, виправте"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,"Неможливо встановити, як втратив у продажу замовлення провадиться."
 DocType: Request for Quotation Item,Supplier Part No,Номер деталі постачальника
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Чи не можете відняти, коли категорія для &quot;Оцінка&quot; або &quot;Vaulation і Total &#39;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Отримано від
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Отримано від
 DocType: Lead,Converted,Перероблений
 DocType: Item,Has Serial No,Має серійний номер
 DocType: Employee,Date of Issue,Дата випуску
@@ -4661,7 +4751,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Згідно Настройці Покупки якщо Купівля Reciept Обов&#39;язково == «YES», то для створення рахунку-фактури, користувач необхідний створити квитанцію про покупку першим за пунктом {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Ряд # {0}: Встановити Постачальник по пункту {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Рядок {0}: значення годин має бути більше нуля.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,"Зображення для веб-сайту {0}, долучене до об’єкту {1} не може бути знайдене"
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,"Зображення для веб-сайту {0}, долучене до об’єкту {1} не може бути знайдене"
 DocType: Issue,Content Type,Тип вмісту
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Комп&#39;ютер
 DocType: Item,List this Item in multiple groups on the website.,Включити цей товар у декілька груп на веб сайті.
@@ -4672,14 +4762,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Отримати Неузгоджені Записи
 DocType: Payment Reconciliation,From Invoice Date,Рахунки-фактури з датою від
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Ви не маєте дозволу на відправлення
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,Валюта оплати має співпадати з валютою компанії або валютою рахунку контрагента
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,Валюта оплати має співпадати з валютою компанії або валютою рахунку контрагента
 DocType: Healthcare Settings,Laboratory Settings,Налаштування лабораторії
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Залиште Інкасацію
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Чим займається?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,На склад
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Все Вступникам Student
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Чим займається?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,На склад
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Все Вступникам Student
 ,Average Commission Rate,Середня ставка комісії
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,"""Має серійний номер"" не може бути ""Так"" для неінвентарного об’єкту"
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,"""Має серійний номер"" не може бути ""Так"" для неінвентарного об’єкту"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Виберіть статус
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Відвідуваність не можна вносити для майбутніх дат
 DocType: Pricing Rule,Pricing Rule Help,Довідка з цінових правил
@@ -4697,41 +4787,41 @@
 DocType: Item,Customer Code,Код клієнта
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Нагадування про день народження для {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дні з останнього ордена
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Дебетом рахунка повинні бути баланс рахунку
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Дебетом рахунка повинні бути баланс рахунку
 DocType: Buying Settings,Naming Series,Іменування серії
 DocType: Leave Block List,Leave Block List Name,Назва списку блокування відпусток
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,"Дата страхування початку повинна бути менше, ніж дата страхування End"
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,"Будь-ласка, встановіть Систему Назви Інструкторів у Школі&gt; Параметри Школи"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Складські запаси
 DocType: Timesheet,Production Detail,виробництво Деталь
+DocType: Restaurant,Active Menu,Активне меню
 DocType: Target Detail,Target Qty,Цільова Кількість
 DocType: Shopping Cart Settings,Checkout Settings,Checkout Налаштування
 DocType: Attendance,Present,Присутній
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Накладна {0} не повинні бути проведеною
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Накладна {0} не повинні бути проведеною
 DocType: Notification Control,Sales Invoice Message,Повідомлення вихідного рахунку
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Закриття рахунку {0} повинен бути типу відповідальністю / власний капітал
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Зарплатний розрахунок для працівника {0} вже створений на основі табелю {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Зарплатний розрахунок для працівника {0} вже створений на основі табелю {1}
 DocType: Vehicle Log,Odometer,одометр
 DocType: Sales Order Item,Ordered Qty,Замовлена (ordered) к-сть
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Пункт {0} відключена
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Пункт {0} відключена
 DocType: Stock Settings,Stock Frozen Upto,Рухи ТМЦ заблоковано по
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,Норми не містять жодного елементу запасів
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Проектна діяльність / завдання.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,Норми не містять жодного елементу запасів
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Проектна діяльність / завдання.
 DocType: Vehicle Log,Refuelling Details,заправні Детальніше
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Згенерувати Зарплатні розрахунки
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","""Купівля"" повинно бути позначено, якщо ""Застосовне для"" обране як {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,"Знижка повинна бути менше, ніж 100"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Останню ціну закупівлі не знайдено
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Списання Сума (Компанія валют)
 DocType: Sales Invoice Timesheet,Billing Hours,Оплачувані години
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,За замовчуванням BOM для {0} не найден
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,"Ряд # {0}: Будь ласка, встановіть кількість перезамовлення"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,За замовчуванням BOM для {0} не найден
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,"Ряд # {0}: Будь ласка, встановіть кількість перезамовлення"
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,"Натисніть пункти, щоб додати їх тут"
 DocType: Fees,Program Enrollment,Програма подачі заявок
 DocType: Landed Cost Voucher,Landed Cost Voucher,Документ кінцевої вартості
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Будь ласка, встановіть {0}"
-DocType: Purchase Invoice,Repeat on Day of Month,Повторіть день місяця
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} неактивний студент
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} неактивний студент
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} неактивний студент
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} неактивний студент
 DocType: Employee,Health Details,Детальніше Здоров&#39;я
 DocType: Offer Letter,Offer Letter Terms,Пропозиція Лист Умови
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Для створення запиту платежу потрібно посилання на документ
@@ -4740,7 +4830,6 @@
 DocType: Employee External Work History,Salary,Зарплата
 DocType: Serial No,Delivery Document Type,Доставка Тип документа
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,"Провести всі Зарплатні розрахунки, що задовільняються вибраним крітеріям"
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} товари синхронізовані
 DocType: Sales Order,Partly Delivered,Частково доставлений
 DocType: Email Digest,Receivables,Дебіторська заборгованість
 DocType: Lead Source,Lead Source,Lead Source
@@ -4760,9 +4849,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Старіння Діапазон 2
 DocType: SG Creation Tool Course,Max Strength,Максимальна міцність
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,Норми замінено
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Виберіть елементи на основі дати доставки
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Виберіть елементи на основі дати доставки
 ,Sales Analytics,Аналітика продажів
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Доступно {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Доступно {0}
 ,Prospects Engaged But Not Converted,Перспективи Займалися Але не Старовинні
 ,Prospects Engaged But Not Converted,Перспективи Займалися Але не Старовинні
 DocType: Manufacturing Settings,Manufacturing Settings,Налаштування виробництва
@@ -4770,10 +4859,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Mobile Немає
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,"Будь ласка, введіть валюту за замовчуванням в компанії Master"
 DocType: Stock Entry Detail,Stock Entry Detail,Деталі Руху ТМЦ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Щоденні нагадування
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Щоденні нагадування
 DocType: Products Settings,Home Page is Products,Головна сторінка є продукти
 ,Asset Depreciation Ledger,Книга амортизації
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Податковий Правило конфлікти з {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Податковий Правило конфлікти з {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Новий акаунт Ім&#39;я
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Вартість давальної сировини
 DocType: Selling Settings,Settings for Selling Module,Налаштування модуля Продаж
@@ -4787,8 +4876,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Номенклатурна позиція {0} має бути інвентарною
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,За замовчуванням роботи на складі Прогрес
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Налаштування за замовчуванням для обліку операцій.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Будь ласка, встановіть систему найменування працівників у людських ресурсах&gt; Параметри персоналу"
 DocType: Maintenance Visit,MV,М.В.
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Очікувана дата не може бути до дати Замовлення матеріалів
+DocType: Restaurant,Default Tax Template,Шаблон податку за замовчуванням
 DocType: Fees,Student Details,Студентські подробиці
 DocType: Purchase Invoice Item,Stock Qty,Фото Кількість
 DocType: Purchase Invoice Item,Stock Qty,Фото Кількість
@@ -4807,8 +4897,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Перейти до елементів
 DocType: Sales Partner,Partner Type,Тип Партнер
 DocType: Purchase Taxes and Charges,Actual,Фактичний
+DocType: Restaurant Menu,Restaurant Manager,Менеджер ресторану
 DocType: Authorization Rule,Customerwise Discount,Customerwise Знижка
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Timesheet для виконання завдань.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Timesheet для виконання завдань.
 DocType: Purchase Invoice,Against Expense Account,На рахунки витрат
 DocType: Production Order,Production Order,Виробниче замовлення
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Відмітка про встановлення {0} вже проведена
@@ -4816,7 +4907,6 @@
 DocType: Quotation Item,Against Docname,На DOCNAME
 DocType: SMS Center,All Employee (Active),Всі Співробітник (Активний)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Дивитися зараз
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Оберіть період, коли рахунок-фактура буде згенерований автоматично"
 DocType: BOM,Raw Material Cost,Сировина Вартість
 DocType: Item Reorder,Re-Order Level,Рівень дозамовлення
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Введіть позиції і планову к-сть, для яких ви хочете підвищити виробничі замовлення або завантажити сировини для аналізу."
@@ -4829,23 +4919,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Тип звіту є обов&#39;язковим
 DocType: Item,Serial Number Series,Серії серійних номерів
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Склад є обов'язковим для номенклатури {0} в рядку {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Додайте програми
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Роздрібна та оптова
 DocType: Issue,First Responded On,По-перше відгукнувся на
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Хрест Лістинг Пункт в декількох групах
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Дата початку та закінчення вже встановлені для фінансового року {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Clearance дату оновлено
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split Batch
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Успішно інвентаризовано
 DocType: Request for Quotation Supplier,Download PDF,завантажити PDF
 DocType: Production Order,Planned End Date,Планована Дата закінчення
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,"Будь ласка, введіть дату розкладу"
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Де елементи зберігаються.
 DocType: Request for Quotation,Supplier Detail,Постачальник: Подробиці
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Помилка у формулі або умова: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Помилка у формулі або умова: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Сума за рахунками
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Критеріальні ваги повинні складати до 100%
 DocType: Attendance,Attendance,Відвідуваність
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,Stock Items
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,Stock Items
 DocType: BOM,Materials,Матеріали
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Якщо не позначено, то список буде потрібно додати до кожного відділу, де він має бути застосований."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Вихідний та цільовий склад не можуть бути однаковими
@@ -4863,6 +4953,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,На чистий підсумок
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Значення атрибуту {0} має бути в діапазоні від {1} до {2} в збільшень {3} для п {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,"Склад призначення у рядку {0} повинен бути такий самий, як у виробничому замовленні"
+DocType: Restaurant Reservation,Waitlisted,Чекав на розсилку
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,"Валюта не може бути змінена після внесення запису, використовуючи інший валюти"
 DocType: Vehicle Service,Clutch Plate,диск зчеплення
 DocType: Company,Round Off Account,Рахунок заокруглення
@@ -4879,7 +4970,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Ім'я нового Відповідального з продажу
 DocType: Packing Slip,Gross Weight UOM,Вага брутто Одиниця виміру
 DocType: Delivery Note Item,Against Sales Invoice,На рахунок продажу
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,"Будь ласка, введіть серійні номери для серіалізовані пункту"
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,"Будь ласка, введіть серійні номери для серіалізовані пункту"
 DocType: Bin,Reserved Qty for Production,К-сть зарезервована для виробництва
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Залиште прапорець, якщо ви не хочете, щоб розглянути партію, роблячи групу курсів на основі."
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Залиште прапорець, якщо ви не хочете, щоб розглянути партію, роблячи групу курсів на основі."
@@ -4891,7 +4982,7 @@
 DocType: Lab Test,Test Group,Тестова група
 DocType: Payment Reconciliation,Receivable / Payable Account,Рахунок Кредиторської / Дебіторської заборгованості
 DocType: Delivery Note Item,Against Sales Order Item,На Sales Order Пункт
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},"Будь ласка, сформулюйте Значення атрибуту для атрибуту {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},"Будь ласка, сформулюйте Значення атрибуту для атрибуту {0}"
 DocType: Item,Default Warehouse,Склад за замовчуванням
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Бюджет не може бути призначений на обліковий запис групи {0}
 DocType: Healthcare Settings,Patient Registration,Реєстрація пацієнта
@@ -4921,6 +5012,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Відповідальний з продажу
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Бюджет та центр витрат
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Кілька типовий спосіб оплати за замовчуванням заборонено
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,для
 ,Appointment Analytics,Призначення Analytics
 DocType: Vehicle Service,Half Yearly,Півроку
 DocType: Lead,Blog Subscriber,Абонент блогу
@@ -4940,7 +5032,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Quot граф
 ,BOM Stock Report,BOM Stock Report
 DocType: Stock Reconciliation Item,Quantity Difference,Кількісна різниця
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Розрахунок заробітної плати
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Розрахунок заробітної плати
 DocType: Opportunity Item,Basic Rate,Базова ціна
 DocType: GL Entry,Credit Amount,Сума кредиту
 DocType: Cheque Print Template,Signatory Position,Положення підпису
@@ -4954,12 +5046,12 @@
 DocType: Tax Rule,Tax Rule,Податкове правило
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Підтримувати ціну протягом циклу продажу
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Планувати час журнали за межами робочої станції робочих годин.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Клієнти в черзі
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} не має розкладу лікарів. Додайте його в майстер лікаря
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Клієнти в черзі
 DocType: Student,Nationality,національність
 ,Items To Be Requested,Товари до відвантаження
-DocType: Purchase Order,Get Last Purchase Rate,Отримати останню ціну закупівлі
 DocType: Company,Company Info,Інформація про компанію
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Вибрати або додати нового клієнта
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Вибрати або додати нового клієнта
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,МВЗ потрібно замовити вимога про витрати
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Застосування засобів (активів)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Це засновано на відвідуваності цього співробітника
@@ -4967,6 +5059,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Дебетовий рахунок
 DocType: Fiscal Year,Year Start Date,Дата початку року
 DocType: Attendance,Employee Name,Ім'я працівника
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Замовлення на замовлення ресторану
 DocType: Sales Invoice,Rounded Total (Company Currency),Заокруглений підсумок (Валюта компанії)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Не можете приховані в групу, тому що обрано тип рахунку."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,"{0} {1} був змінений. Будь ласка, поновіть."
@@ -4977,6 +5070,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Виплати працівникам
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Упакування кількість повинна дорівнювати кількість для пункту {0} в рядку {1}
 DocType: Production Order,Manufactured Qty,Вироблена к-сть
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Рахунок створено
 DocType: Purchase Receipt Item,Accepted Quantity,Прийнята кількість
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},"Будь ласка, встановіть список вихідних за замовчуванням для працівника {0} або Компанії {1}"
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} не існує
@@ -4986,18 +5080,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Рядок № {0}: Сума не може бути більша ніж сума до погодження по Авансовому звіту {1}. Сума до погодження = {2}
 DocType: Maintenance Schedule,Schedule,Графік
 DocType: Account,Parent Account,Батьківський рахунок
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,наявний
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,наявний
 DocType: Quality Inspection Reading,Reading 3,Читання 3
 ,Hub,Концентратор
 DocType: GL Entry,Voucher Type,Тип документа
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Прайс-лист не знайдений або відключений
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Прайс-лист не знайдений або відключений
 DocType: Lab Test,Approved,Затверджений
 DocType: Pricing Rule,Price,Ціна
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',Співробітник звільняється від {0} повинен бути встановлений як &quot;ліві&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Співробітник звільняється від {0} повинен бути встановлений як &quot;ліві&quot;
+DocType: Hub Settings,Last Sync On,Остання синхронізація включена
 DocType: Guardian,Guardian,охоронець
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Оцінка {0} створений для працівника {1} в зазначений діапазон дат
 DocType: Employee,Education,Освіта
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,Del
 DocType: Selling Settings,Campaign Naming By,Називати кампанії за
 DocType: Employee,Current Address Is,Поточна адреса
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Щомісячна ціль продажу (
@@ -5012,7 +5107,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Код курсу:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,"Будь ласка, введіть видатковий рахунок"
 DocType: Account,Stock,Інвентар
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Рядок # {0}: тип документу має бути одним з: Замовлення на придбання, Вхідний рахунок-фактура або Запис журналу"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Рядок # {0}: тип документу має бути одним з: Замовлення на придбання, Вхідний рахунок-фактура або Запис журналу"
 DocType: Employee,Current Address,Поточна адреса
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Якщо товар є варіантом іншого, то опис, зображення, ціноутворення, податки і т.д. будуть встановлені на основі шаблону, якщо явно не вказано інше"
 DocType: Serial No,Purchase / Manufacture Details,Закупівля / Виробництво: Детальніше
@@ -5043,7 +5138,7 @@
 DocType: Hub Settings,Hub Settings,Налаштування концентратора
 DocType: Project,Gross Margin %,Валовий дохід %
 DocType: BOM,With Operations,З операцій
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Бухгалтерські вже були зроблені у валюті {0} для компанії {1}. Будь ласка, виберіть дебіторської або кредиторської заборгованості рахунок з валютою {0}."
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Бухгалтерські вже були зроблені у валюті {0} для компанії {1}. Будь ласка, виберіть дебіторської або кредиторської заборгованості рахунок з валютою {0}."
 DocType: Asset,Is Existing Asset,Існуючий актив
 DocType: Salary Detail,Statistical Component,Статистичний компонент
 DocType: Salary Detail,Statistical Component,Статистичний компонент
@@ -5052,13 +5147,14 @@
 DocType: BOM Operation,BOM Operation,Операція Норм витрат
 DocType: Purchase Taxes and Charges,On Previous Row Amount,На Попередня Сума Row
 DocType: Student,Home Address,Домашня адреса
+DocType: Item,Has Expiry Date,Дата закінчення терміну дії
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Параметр Варіантні налаштування.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,передача активів
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,передача активів
 DocType: POS Profile,POS Profile,POS-профіль
 DocType: Training Event,Event Name,Назва події
 DocType: Physician,Phone (Office),Телефон (офіс)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,вхід
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Вступникам для {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,вхід
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Вступникам для {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Сезонність для установки бюджети, цільові тощо"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Назва змінної
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Номенклатурна позиція {0} - шаблон, виберіть один з його варіантів"
@@ -5067,7 +5163,7 @@
 DocType: Assessment Plan,Room,кімната
 DocType: Purchase Order,Advance Paid,Попередньо оплачено
 DocType: Item,Item Tax,Податки
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Матеріал Постачальнику
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Матеріал Постачальнику
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Акцизний Рахунок
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% з&#39;являється більше одного разу
 DocType: Expense Claim,Employees Email Id,ІД епошти співробітника
@@ -5078,32 +5174,30 @@
 DocType: Program,Program Name,Назва програми
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Розглянемо податку або збору для
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Фактична к-сть обов'язкова
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} наразі має {1} Поставку Scorecard Постачальника, і замовлення на придбання для цього постачальника повинні бути випущені з обережністю."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} наразі має {1} Поставку Scorecard Постачальника, і замовлення на придбання для цього постачальника повинні бути випущені з обережністю."
 DocType: Employee Loan,Loan Type,Тип кредиту
 DocType: Scheduling Tool,Scheduling Tool,планування Інструмент
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Кредитна карта
 DocType: BOM,Item to be manufactured or repacked,Пункт має бути виготовлений чи перепакована
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Налаштування за замовчуванням для складських операцій.
-DocType: Purchase Invoice,Next Date,Наступна дата
 DocType: Employee Education,Major/Optional Subjects,Основні / Додаткові Суб&#39;єкти
 DocType: Sales Invoice Item,Drop Ship,Пряма доставка
+DocType: Hub Settings,Suspended,Призупинено
 DocType: Training Event,Attendees,присутні
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Тут ви можете зберегти сімейні дані, такі як ім'я та рід занять батька, чоловіка або дружини та дітей"
 DocType: Academic Term,Term End Date,Термін Дата закінчення
-DocType: Hub Settings,Seller Name,Продавець Ім&#39;я
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Відраховані податки та збори (Валюта компанії)
 DocType: Item Group,General Settings,Загальні налаштування
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,З валюти і валюти не може бути таким же
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Додати інструкторів
 DocType: Stock Entry,Repack,Перепакувати
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Ви повинні зберегти форму перед продовженням
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,"Будь ласка, спочатку виберіть компанію"
 DocType: Item Attribute,Numeric Values,Числові значення
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Долучити логотип
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Сток Рівні
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Сток Рівні
 DocType: Customer,Commission Rate,Ставка комісії
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Створено {0} показників для {1} між:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Зробити варіанти
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Зробити варіанти
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Блокувати заяви на відпустки по підрозділу.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Тип оплати повинен бути одним з Надсилати, Pay і внутрішній переказ"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Аналітика
@@ -5118,11 +5212,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Основний капітал
 DocType: Shopping Cart Settings,Show Public Attachments,Показати Публічні вкладення
 DocType: Packing Slip,Package Weight Details,Вага упаковки Детальніше
+DocType: Restaurant Reservation,Reservation Time,Час бронювання
 DocType: Payment Gateway Account,Payment Gateway Account,Обліковий запис платіжного шлюзу
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Після завершення оплати перенаправити користувача на обрану сторінку.
 DocType: Company,Existing Company,існуючі компанії
 DocType: Healthcare Settings,Result Emailed,Результат відправлено по електронній пошті
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","Tax Категорія було змінено на «Total», тому що всі деталі, немає в наявності"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код товару&gt; Група предметів&gt; Бренд
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,"Будь ласка, виберіть файл CSV з"
 DocType: Student Leave Application,Mark as Present,Повідомити про Present
 DocType: Supplier Scorecard,Indicator Color,Колір індикатора
@@ -5147,11 +5243,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Make Student Batch
 DocType: Fee Schedule,FRQ.,FRQ
 DocType: Leave Type,Is Carry Forward,Є переносити
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Отримати елементи з норм
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Отримати елементи з норм
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Час на поставку в днях
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"Рядок # {0}: Дата створення повинна бути такою ж, як дата покупки {1} активу {2}"
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Перевірте це, якщо студент проживає в гуртожитку інституту."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Будь ласка, введіть Замовлення клієнтів у наведеній вище таблиці"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Будь ласка, введіть Замовлення клієнтів у наведеній вище таблиці"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Чи не Опубліковано Зарплатні Slips
 ,Stock Summary,сумарний стік
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Передача активу з одного складу на інший
@@ -5167,5 +5263,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Ряд {0}: Дебет запис не може бути пов&#39;язаний з {1}
 DocType: Journal Entry,Subscription Section,Передплатна секція
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Рахунок {0} не існує
+DocType: Training Event,Training Program,Тренувальна програма
 DocType: Account,Cash,Грошові кошти
 DocType: Employee,Short biography for website and other publications.,Коротка біографія для веб-сайту та інших публікацій.
diff --git a/erpnext/translations/ur.csv b/erpnext/translations/ur.csv
index f1ff8b2..809bdee 100644
--- a/erpnext/translations/ur.csv
+++ b/erpnext/translations/ur.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,تنخواہ موڈ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,رجسٹر کریں
 DocType: Patient,Divorced,طلاق
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,اشیا پہلے ہی موافقت پذیر
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,آئٹم کو ایک ٹرانزیکشن میں ایک سے زیادہ بار شامل کیا جا کرنے کی اجازت دیں
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,مواد کا {0} اس دعوی وارنٹی منسوخ کرنے سے پہلے منسوخ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,صارفین کی مصنوعات
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Approvers چھوڑ دو
 DocType: Sales Partner,Dealer,ڈیلر
 DocType: Consultation,Investigations,تحقیقات
+DocType: Restaurant Order Entry,Click Enter To Add,شامل کرنے کیلئے درج کریں پر کلک کریں
 DocType: Employee,Rented,کرایے
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,صارف کے لئے قابل اطلاق
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",روک پروڈکشن آرڈر منسوخ نہیں کیا جا سکتا، منسوخ کرنے کے لئے سب سے پہلے اس Unstop
 DocType: Vehicle Service,Mileage,میلانہ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,اگر تم واقعی اس اثاثہ کو ختم کرنا چاہتے ہیں؟
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,اگر تم واقعی اس اثاثہ کو ختم کرنا چاہتے ہیں؟
 DocType: Drug Prescription,Update Schedule,شیڈول اپ ڈیٹ کریں
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,طے شدہ پردایک
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},کرنسی قیمت کی فہرست کے لئے ضروری ہے {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,دستیابی کی جانچ پڑتال کریں
 DocType: Job Applicant,Job Applicant,ملازمت کی درخواست گزار
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,یہ اس سپلائر خلاف لین دین کی بنیاد پر ہے. تفصیلات کے لئے نیچے ٹائم لائن ملاحظہ کریں
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,مزید نتائج نہیں.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,قانونی
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},اصل قسم ٹیکس صف میں شے کی درجہ بندی میں شامل نہیں کیا جا سکتا {0}
 DocType: Bank Guarantee,Customer,کسٹمر
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),زر مبادلہ کی شرح کے طور پر ایک ہی ہونا چاہیے {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,گاہک کا نام
 DocType: Vehicle,Natural Gas,قدرتی گیس
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},بینک اکاؤنٹ کے طور پر نامزد نہیں کیا جا سکتا {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},بینک اکاؤنٹ کے طور پر نامزد نہیں کیا جا سکتا {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,سربراہان (یا گروپ) جس کے خلاف اکاؤنٹنگ اندراجات بنا رہے ہیں اور توازن برقرار رکھا جاتا ہے.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),بقایا {0} نہیں ہو سکتا کے لئے صفر سے بھی کم ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,کوئی پیشگی تنخواہ پر عمل کرنے کے لئے نہیں ہیں.
 DocType: Manufacturing Settings,Default 10 mins,10 منٹس پہلے سے طے شدہ
 DocType: Leave Type,Leave Type Name,قسم کا نام چھوڑ دو
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,کھلی دکھائیں
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,یہ ضروری ہے کہ اس کارروائی کو آج ہی ذکر شدہ بار بار کے لۓ لے جا سکے
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,سیریز کو کامیابی سے حالیہ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,اس کو دیکھو
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural جرنل اندراج پیش
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,خریداری کے آرڈر اشیا موصول ہونے
 DocType: SMS Center,All Supplier Contact,تمام سپلائر سے رابطہ
 DocType: Support Settings,Support Settings,سپورٹ ترتیبات
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,متوقع تاریخ اختتام متوقع شروع کرنے کی تاریخ کے مقابلے میں کم نہیں ہو سکتا
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,متوقع تاریخ اختتام متوقع شروع کرنے کی تاریخ کے مقابلے میں کم نہیں ہو سکتا
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,صف # {0}: شرح کے طور پر ایک ہی ہونا چاہیے {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,نیا رخصت کی درخواست
 ,Batch Item Expiry Status,بیچ آئٹم ختم ہونے کی حیثیت
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,بینک ڈرافٹ
 DocType: Mode of Payment Account,Mode of Payment Account,ادائیگی اکاؤنٹ کے موڈ
 DocType: Consultation,Consultation,مشاورت
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,سیلز اور واپسی
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,دکھائیں متغیرات
 DocType: Academic Term,Academic Term,تعلیمی مدت
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,مواد
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,صحت کی دیکھ بھال
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ادائیگی میں تاخیر (دن)
 DocType: Lab Prescription,Lab Prescription,لیب نسخہ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,قیمت کی طرف سے ترتیب دیں
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,سروس کے اخراجات
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},سیریل نمبر: {0} نے پہلے ہی فروخت انوائس میں محولہ ہے: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,انوائس
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},سیریل نمبر: {0} نے پہلے ہی فروخت انوائس میں محولہ ہے: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,انوائس
 DocType: Maintenance Schedule Item,Periodicity,مدت
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,مالی سال {0} کی ضرورت ہے
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,دفاع
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,صف # {0}:
 DocType: Timesheet,Total Costing Amount,کل لاگت رقم
 DocType: Delivery Note,Vehicle No,گاڑی نہیں
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,قیمت کی فہرست براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,قیمت کی فہرست براہ مہربانی منتخب کریں
 DocType: Accounts Settings,Currency Exchange Settings,کرنسی ایکسچینج کی ترتیبات
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,صف # {0}: ادائیگی کی دستاویز trasaction مکمل کرنے کی ضرورت ہے
 DocType: Production Order Operation,Work In Progress,کام جاری ہے
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,تاریخ منتخب کیجیے
 DocType: Employee,Holiday List,چھٹیوں فہرست
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,براہ کرم سکول میں سکول کی ترتیبات میں اساتذہ نامیاتی نظام قائم کریں
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,اکاؤنٹنٹ
+DocType: Hub Settings,Selling Price List,قیمت کی فہرست فروخت
 DocType: Patient,Tobacco Current Use,تمباکو موجودہ استعمال
 DocType: Cost Center,Stock User,اسٹاک صارف
 DocType: Company,Phone No,فون نمبر
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,کورس شیڈول پیدا کیا:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},نیا {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},نیا {0}: # {1}
 ,Sales Partners Commission,سیلز شراکت دار کمیشن
 DocType: Purchase Invoice,Rounding Adjustment,راؤنڈنگ ایڈجسٹمنٹ
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,زیادہ سے زیادہ 5 حروف نہیں کر سکتے ہیں مخفف
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,والدین تفصیل docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",حوالہ: {0}، آئٹم کوڈ: {1} اور کسٹمر: {2}
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,کلو
-DocType: Student Log,Log,لاگ
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,ایک کام کے لئے کھولنے.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} نتیجہ جمع کر دیا گیا
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} نتیجہ جمع کر دیا گیا
 DocType: Item Attribute,Increment,اضافہ
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,وقت کی مدت
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,گودام منتخب کریں ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,شادی
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},کی اجازت نہیں {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,سے اشیاء حاصل
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},اسٹاک ترسیل کے نوٹ کے خلاف اپ ڈیٹ نہیں کیا جا سکتا {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},اسٹاک ترسیل کے نوٹ کے خلاف اپ ڈیٹ نہیں کیا جا سکتا {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},پروڈکٹ {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,کوئی آئٹم مندرج
 DocType: Payment Reconciliation,Reconcile,مصالحت
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,پنشن فنڈز
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,اگلا ہراس تاریخ تاریخ کی خریداری سے پہلے نہیں ہو سکتا
 DocType: Consultation,Consultation Date,مشاورت کی تاریخ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNext صارفین کیلئے پروڈکٹ لسٹنگ اور دریافت
 DocType: SMS Center,All Sales Person,تمام فروخت شخص
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ماہانہ ڈسٹریبیوش ** آپ کو مہینوں بھر بجٹ / نشانے کی تقسیم سے آپ کو آپ کے کاروبار میں seasonality کے ہو تو میں مدد ملتی ہے.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,آئٹم نہیں ملا
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,تنخواہ ساخت لاپتہ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,آئٹم نہیں ملا
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,تنخواہ ساخت لاپتہ
 DocType: Lead,Person Name,شخص کا نام
 DocType: Sales Invoice Item,Sales Invoice Item,فروخت انوائس آئٹم
 DocType: Account,Credit,کریڈٹ
 DocType: POS Profile,Write Off Cost Center,لاگت مرکز بند لکھیں
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",مثلا &quot;پرائمری سکول&quot; یا &quot;یونیورسٹی&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",مثلا &quot;پرائمری سکول&quot; یا &quot;یونیورسٹی&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,اسٹاک کی رپورٹ
 DocType: Warehouse,Warehouse Detail,گودام تفصیل
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},کریڈٹ کی حد گاہک کے لئے تجاوز کر گئی ہے {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,اصطلاح آخر تاریخ بعد میں جس چیز کی اصطلاح منسلک ہے کے تعلیمی سال کے سال آخر تاریخ سے زیادہ نہیں ہو سکتا ہے (تعلیمی سال {}). تاریخوں درست کریں اور دوبارہ کوشش کریں براہ مہربانی.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",&quot;فکسڈ اثاثہ ہے&quot; اثاثہ ریکارڈ کی شے کے خلاف موجود نہیں کے طور پر، انینترت ہو سکتا ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",&quot;فکسڈ اثاثہ ہے&quot; اثاثہ ریکارڈ کی شے کے خلاف موجود نہیں کے طور پر، انینترت ہو سکتا ہے
 DocType: Vehicle Service,Brake Oil,وقفے تیل
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,کسٹمر&gt; کسٹمر گروپ&gt; علاقہ
 DocType: Tax Rule,Tax Type,ٹیکس کی قسم
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,قابل ٹیکس رقم
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},تم سے پہلے اندراجات شامل کرنے یا اپ ڈیٹ کرنے کی اجازت نہیں ہے {0}
 DocType: BOM,Item Image (if not slideshow),آئٹم تصویر (سلائڈ شو نہیں تو)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ایک کسٹمر کو ایک ہی نام کے ساتھ موجود
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,ڰنٹےکی شرح / 60) * اصل آپریشن کے وقت)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,قطار # {0}: ریفرنس دستاویز کی قسم میں اخراجات کا دعوی یا جرنل انٹری ہونا لازمی ہے
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,BOM منتخب
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,قطار # {0}: ریفرنس دستاویز کی قسم میں اخراجات کا دعوی یا جرنل انٹری ہونا لازمی ہے
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,BOM منتخب
 DocType: SMS Log,SMS Log,ایس ایم ایس لاگ ان
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,ہونے والا اشیا کی لاگت
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} پر چھٹی تاریخ سے اور تاریخ کے درمیان نہیں ہے
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,ملازم قرض
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,سرگرمی لاگ ان:
 DocType: Fee Schedule,Send Payment Request Email,ای میل ادائیگی کی درخواست بھیجیں
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,{0} آئٹم نظام میں موجود نہیں ہے یا ختم ہو گیا ہے
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,{0} آئٹم نظام میں موجود نہیں ہے یا ختم ہو گیا ہے
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,ریل اسٹیٹ کی
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,اکاؤنٹ کا بیان
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,دواسازی
@@ -210,18 +213,23 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,درآمد لاگ ان
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,ھیںچو اوپر کے معیار کی بنیاد پر قسم تیاری کے مواد کی گذارش
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,کامیابی سے غیر رجسٹرڈ.
 DocType: Training Result Employee,Grade,گریڈ
+DocType: Restaurant Table,No of Seats,نشستوں کی تعداد
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","متحرک موضوع کو شامل کرنے کے لئے، جینجا ٹیگ استعمال کریں <div style=""""><pre style=""""> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,سپلائر کی طرف سے نجات بخشی
 DocType: SMS Center,All Contact,تمام رابطہ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,پروڈکشن آرڈر پہلے سے ہی BOM کے ساتھ تمام اشیاء کے لئے پیدا
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,پروڈکشن آرڈر پہلے سے ہی BOM کے ساتھ تمام اشیاء کے لئے پیدا
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,سالانہ تنخواہ
 DocType: Daily Work Summary,Daily Work Summary,روز مرہ کے کام کا خلاصہ
 DocType: Period Closing Voucher,Closing Fiscal Year,مالی سال بند
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} منجمد ھو گیا ھے
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,اکاؤنٹس کا چارٹ بنانے کے لئے موجودہ کمپنی براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} منجمد ھو گیا ھے
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,اکاؤنٹس کا چارٹ بنانے کے لئے موجودہ کمپنی براہ مہربانی منتخب کریں
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,اسٹاک اخراجات
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,کے ھدف گودام کریں
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,کے ھدف گودام کریں
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,کے ھدف گودام کریں
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,کے ھدف گودام کریں
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,داخل کریں ترجیحی رابطہ ای میل
 DocType: Program Enrollment,School Bus,اسکول بس
 DocType: Journal Entry,Contra Entry,برعکس انٹری
@@ -238,9 +246,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",، سانچہ ڈاؤن لوڈ مناسب اعداد و شمار کو بھرنے کے اور نظر ثانی شدہ فائل منسلک. منتخب مدت میں تمام تاریخوں اور ملازم مجموعہ موجودہ حاضری کے ریکارڈز کے ساتھ، سانچے میں آ جائے گا
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,{0} آئٹم فعال نہیں ہے یا زندگی کے اختتام تک پہنچ گیا ہے
+DocType: Student Admission Program,Minimum Age,کم از کم عمر
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,مثال: بنیادی ریاضی
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",شے کی درجہ بندی میں صف {0} میں ٹیکس شامل کرنے کے لئے، قطار میں ٹیکس {1} بھی شامل کیا جانا چاہئے
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,HR ماڈیول کے لئے ترتیبات
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,HR ماڈیول کے لئے ترتیبات
 DocType: SMS Center,SMS Center,ایس ایم ایس مرکز
 DocType: Sales Invoice,Change Amount,رقم تبدیل
 DocType: BOM Update Tool,New BOM,نیا BOM
@@ -250,7 +259,7 @@
 DocType: Lead,Request Type,درخواست کی قسم
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,ملازم بنائیں
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,نشریات
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,کمرے شامل کریں
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),POS کی سیٹ اپ موڈ (آن لائن / آف لائن)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,پھانسی
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,آپریشن کی تفصیلات سے کئے گئے.
 DocType: Serial No,Maintenance Status,بحالی رتبہ
@@ -273,6 +282,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,قیمت کی فہرست خرید یا فروخت کے لئے قابل ہونا چاہئے
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},تنصیب کی تاریخ شے کے لئے کی ترسیل کی تاریخ سے پہلے نہیں ہو سکتا {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),قیمت کی فہرست کی شرح پر ڈسکاؤنٹ (٪)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,بایو کیمسٹری
 DocType: Offer Letter,Select Terms and Conditions,منتخب کریں شرائط و ضوابط
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,آؤٹ ویلیو
 DocType: Production Planning Tool,Sales Orders,فروخت کے احکامات
@@ -307,15 +317,15 @@
 DocType: Sales Partner,Reseller,ری سیلر
 DocType: Codification Table,Medical Code,میڈیکل کوڈ
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.",جانچ پڑتال کی تو مواد کی درخواستوں میں غیر اسٹاک اشیاء میں شامل ہوں گے.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,کمپنی داخل کریں
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,کمپنی داخل کریں
 DocType: Delivery Note Item,Against Sales Invoice Item,فروخت انوائس آئٹم خلاف
 ,Production Orders in Progress,پیش رفت میں پیداوار کے احکامات
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,فنانسنگ کی طرف سے نیٹ کیش
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save",لئے LocalStorage بھرا ہوا ہے، نہیں بچا تھا
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save",لئے LocalStorage بھرا ہوا ہے، نہیں بچا تھا
 DocType: Lead,Address & Contact,ایڈریس اور رابطہ
 DocType: Leave Allocation,Add unused leaves from previous allocations,گزشتہ آونٹن سے غیر استعمال شدہ پتے شامل
 DocType: Sales Partner,Partner website,شراکت دار کا ویب سائٹ
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,آئٹم شامل کریں
+DocType: Restaurant Order Entry,Add Item,آئٹم شامل کریں
 DocType: Lab Test,Custom Result,اپنی مرضی کے نتائج
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,رابطے کا نام
 DocType: Course Assessment Criteria,Course Assessment Criteria,بلاشبہ تشخیص کا معیار
@@ -328,7 +338,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,خریداری کے لئے درخواست.
 DocType: Lab Test,Submitted Date,پیش کردہ تاریخ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,یہ اس منصوبے کے خلاف پیدا وقت کی چادریں پر مبنی ہے
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,نیٹ پے 0 سے کم نہیں ہو سکتا
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,نیٹ پے 0 سے کم نہیں ہو سکتا
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",سسٹم سے بار بار غلطی کی اطلاعات بھیجنے سے روکنے کے لئے، ہم نے رکنیت میں معذور فیلڈ کی جانچ پڑتال کی ہے
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,صرف منتخب شدہ رخصت کی منظوری دینے والا اس چھٹی کی درخواست پیش کر سکتے ہیں
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,تاریخ حاجت میں شمولیت کی تاریخ سے زیادہ ہونا چاہیے
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,سال پتے فی
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,منافع اور نقصان
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Litre
 DocType: Task,Total Costing Amount (via Time Sheet),کل لاگت کی رقم (وقت شیٹ کے ذریعے)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,برائے مہربانی طالب علموں کے طلبا کے تحت طلب کریں
 DocType: Item Website Specification,Item Website Specification,شے کی ویب سائٹ کی تفصیلات
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,چھوڑ کریں
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},آئٹم {0} پر زندگی کے اس کے آخر تک پہنچ گیا ہے {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},آئٹم {0} پر زندگی کے اس کے آخر تک پہنچ گیا ہے {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,بینک لکھے
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,سالانہ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,اسٹاک مصالحتی آئٹم
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,طالب علم گروپ کی تخلیق کا آلہ کورس
 DocType: Lead,Do Not Contact,سے رابطہ نہیں کرتے
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,آپ کی تنظیم میں پڑھانے والے لوگ
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,تمام بار بار چلنے والی رسیدیں باخبر رکھنے کے لئے منفرد ID. یہ جمع کرانے پر پیدا کیا جاتا ہے.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,سافٹ ویئر ڈویلپر
 DocType: Item,Minimum Order Qty,کم از کم آرڈر کی مقدار
 DocType: Pricing Rule,Supplier Type,پردایک قسم
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,حب میں شائع
 DocType: Student Admission,Student Admission,طالب علم داخلہ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,{0} آئٹم منسوخ کر دیا ہے
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,مواد کی درخواست
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,{0} آئٹم منسوخ کر دیا ہے
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,مواد کی درخواست
 DocType: Bank Reconciliation,Update Clearance Date,اپ ڈیٹ کی کلیئرنس تاریخ
 DocType: Item,Purchase Details,خریداری کی تفصیلات
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},خریداری کے آرڈر میں خام مال کی فراہمی &#39;کے ٹیبل میں شے نہیں مل سکا {0} {1}
 DocType: Patient Relation,Relation,ریلیشن
 DocType: Shipping Rule,Worldwide Shipping,دنیا بھر میں شپنگ
 DocType: Patient Relation,Mother,ماں
+DocType: Restaurant Reservation,Reservation End Time,ریزرویشن اختتام کا وقت
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,صارفین کی طرف سے اس بات کی تصدیق کے احکامات.
 DocType: Purchase Receipt Item,Rejected Quantity,مسترد مقدار
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,ادائیگی کی درخواست {0} تیار کی گئی ہے
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,ادائیگی کی درخواست {0} تیار کی گئی ہے
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,کم حساسیت
 DocType: Notification Control,Notification Control,نوٹیفکیشن کنٹرول
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,آپ کی تربیت مکمل کرنے کے بعد براہ کرم تصدیق کریں
 DocType: Lead,Suggestions,تجاویز
@@ -388,7 +401,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,ترجیحی ای میل ملازم میں منتخب کی بنیاد پر ملازم کو ای میلز تنخواہ کی پرچی
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,فہرست میں پہلے رخصت کی منظوری دینے والا پہلے سے طے شدہ چھوڑ گواہ کے طور پر قائم کیا جائے گا
 DocType: Tax Rule,Shipping County,شپنگ کاؤنٹی
-apps/erpnext/erpnext/config/desktop.py +158,Learn,جانیے
+apps/erpnext/erpnext/config/desktop.py +159,Learn,جانیے
 DocType: Asset,Next Depreciation Date,اگلا ہراس تاریخ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,فی ملازم سرگرمی لاگت
 DocType: Accounts Settings,Settings for Accounts,اکاؤنٹس کے لئے ترتیبات
@@ -399,13 +412,13 @@
 DocType: Item,Synced With Hub,حب کے ساتھ موافقت پذیر
 DocType: Vehicle,Fleet Manager,فلیٹ مینیجر
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},قطار # {0}: {1} شے کے لئے منفی نہیں ہوسکتا ہے {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,غلط شناختی لفظ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,غلط شناختی لفظ
 DocType: Item,Variant Of,کے مختلف
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',کے مقابلے میں &#39;مقدار تعمیر کرنے&#39; مکمل مقدار زیادہ نہیں ہو سکتا
 DocType: Period Closing Voucher,Closing Account Head,اکاؤنٹ ہیڈ بند
 DocType: Employee,External Work History,بیرونی کام کی تاریخ
 DocType: Physician,Time per Appointment,تقدیر کے وقت
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,سرکلر حوالہ خرابی
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,سرکلر حوالہ خرابی
 DocType: Appointment Type,Is Inpatient,بیمار ہے
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 نام
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,آپ ڈلیوری نوٹ بچانے بار الفاظ (ایکسپورٹ) میں نظر آئے گا.
@@ -413,19 +426,18 @@
 DocType: Lead,Industry,صنعت
 DocType: Employee,Job Profile,کام پروفائل
 DocType: BOM Item,Rate & Amount,شرح اور رقم
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,سیٹ اپ&gt; نمبر نمبر کے ذریعے حاضری کے لئے براہ کرم سلسلہ نمبر سیٹ کریں
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,یہ اس کمپنی کے خلاف ٹرانزیکشن پر مبنی ہے. تفصیلات کے لئے ذیل میں ٹائم لائن ملاحظہ کریں
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,خود کار طریقے سے مواد کی درخواست کی تخلیق پر ای میل کے ذریعے مطلع کریں
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,مزاحم
 DocType: Journal Entry,Multi Currency,ملٹی کرنسی
 DocType: Payment Reconciliation Invoice,Invoice Type,انوائس کی قسم
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,کسٹمر&gt; کسٹمر گروپ&gt; علاقہ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,ترسیل کے نوٹ
 DocType: Consultation,Encounter Impression,تصادم کا اثر
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,ٹیکس قائم
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,فروخت اثاثہ کی قیمت
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,آپ اسے نکالا بعد ادائیگی انٹری پر نظر ثانی کر دیا گیا ہے. اسے دوبارہ ھیںچو براہ مہربانی.
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} آئٹم ٹیکس میں دو بار میں داخل
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,اس ہفتے اور زیر التواء سرگرمیوں کا خلاصہ
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} آئٹم ٹیکس میں دو بار میں داخل
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,اس ہفتے اور زیر التواء سرگرمیوں کا خلاصہ
 DocType: Student Applicant,Admitted,اعتراف کیا
 DocType: Workstation,Rent Cost,کرایہ لاگت
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,رقم ہراس کے بعد
@@ -440,36 +452,35 @@
 DocType: Shipping Rule,Valid for Countries,ممالک کے لئے درست
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,یہ آئٹم ایک ٹیمپلیٹ ہے اور لین دین میں استعمال نہیں کیا جا سکتا. &#39;کوئی کاپی&#39; مقرر کیا گیا ہے جب تک آئٹم صفات مختلف حالتوں میں سے زیادہ کاپی کیا جائے گا
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,سمجھا کل آرڈر
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",ملازم عہدہ (مثلا سی ای او، ڈائریکٹر وغیرہ).
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).",ملازم عہدہ (مثلا سی ای او، ڈائریکٹر وغیرہ).
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,کسٹمر کرنسی کسٹمر کی بنیاد کرنسی تبدیل کیا جاتا ہے جس میں شرح
 DocType: Course Scheduling Tool,Course Scheduling Tool,کورس شیڈولنگ کا آلہ
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},صف # {0}: خریداری کی رسید ایک موجودہ اثاثہ کے خلاف بنایا نہیں جا سکتا {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[متوقع]٪ s کے لئے دوبارہ بارش٪ s بنانے میں خرابی
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[متوقع]٪ s کے لئے دوبارہ بارش٪ s بنانے میں خرابی
 DocType: Item Tax,Tax Rate,ٹیکس کی شرح
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} پہلے ہی ملازم کے لئے مختص {1} کی مدت {2} کے لئے {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,منتخب آئٹم
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,منتخب آئٹم
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,انوائس {0} پہلے ہی پیش کیا جاتا ہے کی خریداری
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},صف # {0}: بیچ کوئی طور پر ایک ہی ہونا ضروری ہے {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,غیر گروپ میں تبدیل
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,ایک آئٹم کے بیچ (بہت).
 DocType: C-Form Invoice Detail,Invoice Date,انوائس کی تاریخ
 DocType: GL Entry,Debit Amount,ڈیبٹ رقم
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},صرف فی کمپنی 1 اکاؤنٹ نہیں ہو سکتا {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,منسلکہ ملاحظہ کریں
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},صرف فی کمپنی 1 اکاؤنٹ نہیں ہو سکتا {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,منسلکہ ملاحظہ کریں
 DocType: Purchase Order,% Received,٪ موصول
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,طلبہ تنظیموں بنائیں
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,سیٹ اپ پہلے مکمل !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,سیٹ اپ پہلے مکمل !!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,کریڈٹ نوٹ رقم
 DocType: Setup Progress Action,Action Document,ایکشن دستاویز
 ,Finished Goods,تیار اشیاء
 DocType: Delivery Note,Instructions,ہدایات
 DocType: Quality Inspection,Inspected By,کی طرف سے معائنہ
 DocType: Maintenance Visit,Maintenance Type,بحالی قسم
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} کورس میں داخل نہیں کیا جاتا ہے {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,آئٹم کوڈ&gt; آئٹم گروپ&gt; برانڈ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} کورس میں داخل نہیں کیا جاتا ہے {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},سیریل نمبر {0} ترسیل کے نوٹ سے تعلق نہیں ہے {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext ڈیمو
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,مادے کا اضافہ
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,مادے کا اضافہ
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,آئٹم کے معیار معائنہ پیرامیٹر
 DocType: Leave Application,Leave Approver Name,منظوری دینے والا چھوڑ دو نام
 DocType: Depreciation Schedule,Schedule Date,شیڈول تاریخ
@@ -489,7 +500,7 @@
 DocType: Salary Slip Timesheet,Working Hours,کام کے اوقات
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ایک موجودہ سیریز کے شروع / موجودہ ترتیب تعداد کو تبدیل کریں.
 DocType: Dosage Strength,Strength,طاقت
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,ایک نئے گاہک بنائیں
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,ایک نئے گاہک بنائیں
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",ایک سے زیادہ قیمتوں کا تعین قواعد غالب کرنے کے لئے جاری ہے، صارفین تنازعہ کو حل کرنے دستی طور پر ترجیح مقرر کرنے کو کہا جاتا.
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,خریداری کے آرڈر بنائیں
 ,Purchase Register,خریداری رجسٹر
@@ -508,7 +519,7 @@
 DocType: Lab Test Template,Single,سنگل
 DocType: Salary Slip,Total Loan Repayment,کل قرض کی واپسی
 DocType: Account,Cost of Goods Sold,فروخت سامان کی قیمت
-DocType: Purchase Invoice,Yearly,سالانہ
+DocType: Subscription,Yearly,سالانہ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,لاگت مرکز درج کریں
 DocType: Drug Prescription,Dosage,خوراک
 DocType: Journal Entry Account,Sales Order,سیلز آرڈر
@@ -539,7 +550,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,تمام مینوفیکچرنگ کے عمل کے لئے عالمی ترتیبات.
 DocType: Accounts Settings,Accounts Frozen Upto,منجمد تک اکاؤنٹس
 DocType: SMS Log,Sent On,پر بھیجا
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,خاصیت {0} صفات ٹیبل میں ایک سے زیادہ مرتبہ منتخب
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,خاصیت {0} صفات ٹیبل میں ایک سے زیادہ مرتبہ منتخب
 DocType: HR Settings,Employee record is created using selected field. ,ملازم ریکارڈ منتخب کردہ میدان کا استعمال کرتے ہوئے تخلیق کیا جاتا ہے.
 DocType: Sales Order,Not Applicable,قابل اطلاق نہیں
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,چھٹیوں ماسٹر.
@@ -565,13 +576,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,مختص کل پتے لازمی ہے
 DocType: Patient,AB Positive,AB مثبت
 DocType: Job Opening,Description of a Job Opening,ایک کام افتتاحی تفصیل
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,آج کے لئے زیر غور سرگرمیوں
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,آج کے لئے زیر غور سرگرمیوں
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,حاضری کا ریکارڈ.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet بنیاد پے رول کے لئے تنخواہ کے اجزاء.
 DocType: Sales Order Item,Used for Production Plan,پیداوار کی منصوبہ بندی کے لئے استعمال کیا جاتا ہے
 DocType: Employee Loan,Total Payment,کل ادائیگی
 DocType: Manufacturing Settings,Time Between Operations (in mins),(منٹ میں) آپریشنز کے درمیان وقت
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} لہذا کارروائی مکمل نہیں کیا جا سکتا ہے منسوخ کر دیا ہے
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} لہذا کارروائی مکمل نہیں کیا جا سکتا ہے منسوخ کر دیا ہے
 DocType: Customer,Buyer of Goods and Services.,اشیا اور خدمات کی خریدار.
 DocType: Journal Entry,Accounts Payable,واجب الادا کھاتہ
 DocType: Patient,Allergies,الرجی
@@ -583,23 +594,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,خریداری کے احکامات کو خبردار کریں
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,آپ کے گاہکوں میں سے چند ایک کی فہرست. وہ تنظیموں یا افراد کے ہو سکتا ہے.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,بس بہت کچھ حصوں کی تعمیر
+DocType: POS Profile User,POS Profile User,POS پروفائل صارف
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,براہ راست آمدنی
 DocType: Patient Appointment,Date TIme,تاریخ وقت
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",اکاؤنٹ کی طرف سے گروپ ہے، اکاؤنٹ کی بنیاد پر فلٹر نہیں کر سکتے ہیں
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,ایڈمنسٹریٹو آفیسر
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,کورس کا انتخاب کریں
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,کورس کا انتخاب کریں
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,کورس کا انتخاب کریں
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,کورس کا انتخاب کریں
 DocType: Codification Table,Codification Table,کوڈڈیکشن ٹیبل
 DocType: Timesheet Detail,Hrs,بجے
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,کمپنی کا انتخاب کریں
 DocType: Stock Entry Detail,Difference Account,فرق اکاؤنٹ
 DocType: Purchase Invoice,Supplier GSTIN,سپلائر GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,اس کا انحصار کام {0} بند نہیں ہے کے طور پر قریب کام نہیں کر سکتے ہیں.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,مواد درخواست اٹھایا جائے گا جس کے لئے گودام میں داخل کریں
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,اس کا انحصار کام {0} بند نہیں ہے کے طور پر قریب کام نہیں کر سکتے ہیں.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,مواد درخواست اٹھایا جائے گا جس کے لئے گودام میں داخل کریں
 DocType: Production Order,Additional Operating Cost,اضافی آپریٹنگ لاگت
 DocType: Lab Test Template,Lab Routine,لیب روٹین
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,کاسمیٹک
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items",ضم کرنے کے لئے، مندرجہ ذیل خصوصیات دونوں اشیاء کے لئے ایک ہی ہونا چاہیے
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items",ضم کرنے کے لئے، مندرجہ ذیل خصوصیات دونوں اشیاء کے لئے ایک ہی ہونا چاہیے
 DocType: Shipping Rule,Net Weight,سارا وزن
 DocType: Employee,Emergency Phone,ایمرجنسی فون
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,خریدنے
@@ -610,7 +622,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,حد 0 فیصد گریڈ کی وضاحت براہ مہربانی
 DocType: Sales Order,To Deliver,نجات کے لئے
 DocType: Purchase Invoice Item,Item,آئٹم
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,سیریل کوئی شے ایک حصہ نہیں ہو سکتا
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,ہائی حساسیت
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,سیریل کوئی شے ایک حصہ نہیں ہو سکتا
 DocType: Journal Entry,Difference (Dr - Cr),فرق (ڈاکٹر - CR)
 DocType: Account,Profit and Loss,نفع اور نقصان
 DocType: Patient,Risk Factors,خطرہ عوامل
@@ -619,7 +632,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,منیجنگ ذیلی سمجھوتے
 DocType: Vital Signs,Body Temperature,جسمانی درجہ حرارت
 DocType: Project,Project will be accessible on the website to these users,منصوبہ ان کے صارفین کو ویب سائٹ پر قابل رسائی ہو جائے گا
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,پروجیکٹ کی قسم کی وضاحت کریں.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,پروجیکٹ کی قسم کی وضاحت کریں.
 DocType: Supplier Scorecard,Weighting Function,وزن کی فنکشن
 DocType: Physician,OP Consulting Charge,اوپی کنسلٹنگ چارج
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,اپنا سیٹ اپ کریں
@@ -633,7 +646,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,اضافہ 0 نہیں ہو سکتا
 DocType: Production Planning Tool,Material Requirement,مواد ضرورت
 DocType: Company,Delete Company Transactions,کمپنی معاملات حذف
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,حوالہ نمبر اور ریفرنس تاریخ بینک ٹرانزیکشن کے لئے لازمی ہے
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,حوالہ نمبر اور ریفرنس تاریخ بینک ٹرانزیکشن کے لئے لازمی ہے
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ ترمیم ٹیکس اور الزامات شامل
 DocType: Payment Entry Reference,Supplier Invoice No,سپلائر انوائس کوئی
 DocType: Territory,For reference,حوالے کے لیے
@@ -641,12 +654,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions",حذف نہیں کرسکتے ہیں سیریل کوئی {0}، یہ اسٹاک لین دین میں استعمال کیا جاتا ہے کے طور پر
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),بند (CR)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,ہیلو
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,منتقل آئٹم
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,منتقل آئٹم
 DocType: Serial No,Warranty Period (Days),وارنٹی مدت (دن)
 DocType: Installation Note Item,Installation Note Item,تنصیب نوٹ آئٹم
 DocType: Production Plan Item,Pending Qty,زیر مقدار
 DocType: Budget,Ignore,نظر انداز
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} فعال نہیں ہے
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} فعال نہیں ہے
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,پرنٹنگ کے لئے سیٹ اپ کے چیک جہتوں
 DocType: Salary Slip,Salary Slip Timesheet,تنخواہ کی پرچی Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ذیلی کنٹریکٹڈ خریداری کی رسید کے لئے لازمی پردایک گودام
@@ -655,7 +668,7 @@
 DocType: Pricing Rule,Sales Partner,سیلز پارٹنر
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,تمام سپلائر سکور کارڈ.
 DocType: Buying Settings,Purchase Receipt Required,خریداری کی رسید کی ضرورت ہے
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,اسٹاک کھولنے میں داخل ہوئے تو اندازہ شرح لازمی ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,اسٹاک کھولنے میں داخل ہوئے تو اندازہ شرح لازمی ہے
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,انوائس ٹیبل میں پایا کوئی ریکارڈ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,پہلی کمپنی اور پارٹی کی قسم منتخب کریں
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,مالی / اکاؤنٹنگ سال.
@@ -692,7 +705,7 @@
 DocType: Quotation,Quotation To,کے لئے کوٹیشن
 DocType: Lead,Middle Income,درمیانی آمدنی
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),افتتاحی (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,آپ نے پہلے ہی ایک UOM ساتھ کچھ لین دین (ے) بنا دیا ہے کی وجہ سے اشیاء کے لئے پیمائش کی پہلے سے طے شدہ یونٹ {0} براہ راست تبدیل نہیں کیا جا سکتا. آپ کو ایک مختلف پہلے سے طے شدہ UOM استعمال کرنے کے لئے ایک نیا آئٹم تخلیق کرنے کے لئے کی ضرورت ہو گی.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,آپ نے پہلے ہی ایک UOM ساتھ کچھ لین دین (ے) بنا دیا ہے کی وجہ سے اشیاء کے لئے پیمائش کی پہلے سے طے شدہ یونٹ {0} براہ راست تبدیل نہیں کیا جا سکتا. آپ کو ایک مختلف پہلے سے طے شدہ UOM استعمال کرنے کے لئے ایک نیا آئٹم تخلیق کرنے کے لئے کی ضرورت ہو گی.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,مختص رقم منفی نہیں ہو سکتا
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,کمپنی قائم کی مہربانی
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,کمپنی قائم کی مہربانی
@@ -707,6 +720,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,بینک اندراج کرنے کے لئے منتخب ادائیگی اکاؤنٹ
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll",پتیوں، اخراجات دعووں اور پے رول انتظام کرنے کے لئے ملازم ریکارڈز تخلیق کریں
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,نسخہ کا دورہ
+DocType: Restaurant Reservation,Restaurant Reservation,ریسٹورانٹ ریزرویشن
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,تجویز تحریری طور پر
 DocType: Payment Entry Deduction,Payment Entry Deduction,ادائیگی انٹری کٹوتی
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,ایک فروخت شخص {0} اسی ملازم ID کے ساتھ موجود
@@ -714,7 +728,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,ماسٹرز
 DocType: Assessment Plan,Maximum Assessment Score,زیادہ سے زیادہ تشخیص اسکور
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,اپ ڈیٹ بینک ٹرانزیکشن تواریخ
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,وقت سے باخبر رکھنے
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,وقت سے باخبر رکھنے
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,ٹرانسپورٹر کیلئے ڈپلیکیٹ
 DocType: Fiscal Year Company,Fiscal Year Company,مالی سال کمپنی
 DocType: Packing Slip Item,DN Detail,DN تفصیل
@@ -723,8 +737,9 @@
 DocType: Batch,Batch Description,بیچ تفصیل
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,طلبہ تنظیموں کی تشکیل
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,طلبہ تنظیموں کی تشکیل
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.",ادائیگی کے گیٹ وے اکاؤنٹ نہیں، دستی طور پر ایک بنانے کے لئے براہ مہربانی.
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.",ادائیگی کے گیٹ وے اکاؤنٹ نہیں، دستی طور پر ایک بنانے کے لئے براہ مہربانی.
 DocType: Supplier Scorecard,Per Year,سالانہ
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,DOB کے مطابق اس پروگرام میں داخل ہونے کے اہل نہیں
 DocType: Sales Invoice,Sales Taxes and Charges,سیلز ٹیکس اور الزامات
 DocType: Employee,Organization Profile,تنظیم پروفائل
 DocType: Vital Signs,Height (In Meter),اونچائی (میٹر میں)
@@ -760,7 +775,7 @@
 DocType: Student Batch Name,Batch Name,بیچ کا نام
 DocType: Fee Validity,Max number of visit,دورے کی زیادہ سے زیادہ تعداد
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet پیدا کیا:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},ادائیگی کے موڈ میں پہلے سے طے شدہ نقد یا بینک اکاؤنٹ مقرر کریں {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},ادائیگی کے موڈ میں پہلے سے طے شدہ نقد یا بینک اکاؤنٹ مقرر کریں {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,اندراج کریں
 DocType: GST Settings,GST Settings,GST ترتیبات
 DocType: Selling Settings,Customer Naming By,کی طرف سے گاہک نام دینے
@@ -792,16 +807,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,لینڈڈ لاگت ٹیکسز اور چارجز
 DocType: Production Order Operation,Actual Start Time,اصل وقت آغاز
 DocType: BOM Operation,Operation Time,آپریشن کے وقت
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,ختم
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,ختم
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,بنیاد
 DocType: Timesheet,Total Billed Hours,کل بل گھنٹے
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,رقم لکھیں
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,رقم لکھیں
 DocType: Leave Block List Allow,Allow User,صارف کی اجازت
 DocType: Journal Entry,Bill No,بل نہیں
 DocType: Company,Gain/Loss Account on Asset Disposal,ایسیٹ تلفی پر حاصل / نقصان کے اکاؤنٹ
 DocType: Vehicle Log,Service Details,سروس کی تفصیلات دیکھیں
 DocType: Vehicle Log,Service Details,سروس کی تفصیلات دیکھیں
-DocType: Purchase Invoice,Quarterly,سہ ماہی
+DocType: Subscription,Quarterly,سہ ماہی
 DocType: Lab Test Template,Grouped,گروپ
 DocType: Selling Settings,Delivery Note Required,ترسیل کے نوٹ کی ضرورت ہے
 DocType: Bank Guarantee,Bank Guarantee Number,بینک گارنٹی نمبر
@@ -811,12 +826,12 @@
 DocType: Student Attendance,Student Attendance,طلبا کی حاضری
 DocType: Sales Invoice Timesheet,Time Sheet,وقت شیٹ
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush خام مال کی بنیاد پر
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,شے کی تفصیلات درج کریں
 DocType: Interest,Interest,دلچسپی
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,پہلی فروخت
 DocType: Purchase Receipt,Other Details,دیگر تفصیلات
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,ٹیسٹ سانچہ
+DocType: Restaurant Order Entry Item,Served,خدمت کی
 DocType: Account,Accounts,اکاؤنٹس
 DocType: Vehicle,Odometer Value (Last),odometer قیمت (سابقہ)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,سپلائر سکور کارڈ کے معیار کے سانچے.
@@ -828,25 +843,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,پیش نظارہ تنخواہ کی پرچی
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,اکاؤنٹ {0} کئی بار داخل کیا گیا ہے
 DocType: Account,Expenses Included In Valuation,اخراجات تشخیص میں شامل
-DocType: Hub Settings,Seller City,فروش شہر
 ,Absent Student Report,غائب Student کی رپورٹ
 DocType: Email Digest,Next email will be sent on:,پیچھے اگلا، دوسرا ای میل پر بھیجا جائے گا:
 DocType: Offer Letter Term,Offer Letter Term,خط مدتی پیشکش
 DocType: Supplier Scorecard,Per Week,فی ہفتہ
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,آئٹم مختلف حالتوں ہے.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,آئٹم مختلف حالتوں ہے.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,کل طالب علم
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,آئٹم {0} نہیں ملا
 DocType: Bin,Stock Value,اسٹاک کی قیمت
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,پس منظر میں فیس ریکارڈ قائم کیے جائیں گے. کسی بھی غلطی کی صورت میں شیڈول میں خرابی کا پیغام اپ ڈیٹ کیا جائے گا.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,کمپنی {0} موجود نہیں ہے
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} تک فیس کی توثیق ہے {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} تک فیس کی توثیق ہے {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,درخت کی قسم
 DocType: BOM Explosion Item,Qty Consumed Per Unit,مقدار فی یونٹ بسم
 DocType: Serial No,Warranty Expiry Date,وارنٹی ختم ہونے کی تاریخ
 DocType: Material Request Item,Quantity and Warehouse,مقدار اور گودام
+DocType: Hub Settings,Unregister,غیر رجسٹر
 DocType: Sales Invoice,Commission Rate (%),کمیشن کی شرح (٪)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,براہ مہربانی منتخب کریں پروگرام
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,براہ مہربانی منتخب کریں پروگرام
 DocType: Project,Estimated Cost,تخمینی لاگت
 DocType: Purchase Order,Link to material requests,مواد درخواستوں کا لنک
+DocType: Hub Settings,Publish,شائع کریں
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,ایرواسپیس
 DocType: Journal Entry,Credit Card Entry,کریڈٹ کارڈ انٹری
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,کمپنی اور اکاؤنٹس
@@ -857,13 +874,12 @@
 DocType: Selling Settings,Close Opportunity After Days,دن کے بعد موقع بند کریں
 ,Reserved,محفوظ
 DocType: Purchase Order,Supply Raw Materials,خام مال کی سپلائی
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,اگلے انوائس پیدا کیا جائے گا جس پر تاریخ. یہ جمع کرانے پر پیدا کیا جاتا ہے.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,موجودہ اثاثہ جات
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} اسٹاک شے نہیں ہے
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',براہ کرم &#39;ٹریننگ فیڈریشن&#39; پر کلک کرکے تربیت کے لۓ اپنی رائے کا اشتراک کریں اور پھر &#39;نیا&#39;
 DocType: Mode of Payment Account,Default Account,پہلے سے طے شدہ اکاؤنٹ
 DocType: Payment Entry,Received Amount (Company Currency),موصولہ رقم (کمپنی کرنسی)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,مواقع لیڈ سے بنایا گیا ہے تو قیادت مرتب کیا جانا چاہئے
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,مواقع لیڈ سے بنایا گیا ہے تو قیادت مرتب کیا جانا چاہئے
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,ہفتہ وار چھٹی کا دن منتخب کریں
 DocType: Patient,O Negative,اے منفی
 DocType: Production Order Operation,Planned End Time,منصوبہ بندی اختتام وقت
@@ -879,8 +895,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,توانائی
 DocType: Opportunity,Opportunity From,سے مواقع
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,ماہانہ تنخواہ بیان.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,کمپنی کو شامل کریں
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,قطار {0}: {1} آئٹم {2} کے لئے سیریل نمبر ضروری ہے. آپ نے {3} فراہم کیا ہے.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,قطار {0}: {1} آئٹم {2} کے لئے سیریل نمبر ضروری ہے. آپ نے {3} فراہم کیا ہے.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,براہ کرم میز منتخب کریں
 DocType: BOM,Website Specifications,ویب سائٹ نردجیکرن
 DocType: Special Test Items,Particulars,نصاب
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,اینٹی بائیوٹک
@@ -889,11 +905,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,صف {0}: تبادلوں فیکٹر لازمی ہے
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",اسی معیار کے ساتھ ایک سے زیادہ قیمت کے قوانین موجود ہیں، براہ کرم ترجیحات کو تفویض کرکے تنازعات کو حل کریں. قیمت کے قواعد: {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,غیر فعال یا اسے دوسرے BOMs ساتھ منسلک کیا جاتا کے طور پر BOM منسوخ نہیں کر سکتے
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,غیر فعال یا اسے دوسرے BOMs ساتھ منسلک کیا جاتا کے طور پر BOM منسوخ نہیں کر سکتے
 DocType: Opportunity,Maintenance,بحالی
 DocType: Item Attribute Value,Item Attribute Value,شے کی قیمت خاصیت
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,سیلز مہمات.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Timesheet بنائیں
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Timesheet بنائیں
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -931,12 +947,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,پہلی شے داخل کریں
 DocType: Account,Liability,ذمہ داری
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,منظور رقم صف میں دعوے کی رقم سے زیادہ نہیں ہو سکتا {0}.
+DocType: Salary Detail,Do not include in total,کل میں شامل نہ کریں
 DocType: Company,Default Cost of Goods Sold Account,سامان فروخت اکاؤنٹ کے پہلے سے طے شدہ لاگت
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,قیمت کی فہرست منتخب نہیں
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,قیمت کی فہرست منتخب نہیں
 DocType: Employee,Family Background,خاندانی پس منظر
 DocType: Request for Quotation Supplier,Send Email,ای میل بھیجیں
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},انتباہ: غلط لف دستاویز {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,کوئی اجازت
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},انتباہ: غلط لف دستاویز {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,کوئی اجازت
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,اقتباس کی درخواست
 DocType: Vital Signs,Heart Rate / Pulse,دل کی شرح / پلس
 DocType: Company,Default Bank Account,پہلے سے طے شدہ بینک اکاؤنٹ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",پارٹی کی بنیاد پر فلٹر کرنے کے لئے، منتخب پارٹی پہلی قسم
@@ -964,12 +982,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,آئٹم صف {IDX): (DOCTYPE} {} DOCNAME مندرجہ بالا میں موجود نہیں ہے &#39;{DOCTYPE}&#39; کے ٹیبل
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} پہلے ہی مکمل یا منسوخ کر دیا ہے
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,کوئی کاموں
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",آٹو رسید 05، 28 وغیرہ مثال کے طور پر پیدا کیا جائے گا جس پر مہینے کا دن
 DocType: Item Variant Settings,Copy Fields to Variant,مختلف قسم کے فیلڈز
 DocType: Asset,Opening Accumulated Depreciation,جمع ہراس کھولنے
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,اسکور 5 سے کم یا برابر ہونا چاہیے
 DocType: Program Enrollment Tool,Program Enrollment Tool,پروگرام کے اندراج کے آلے
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,سی فارم ریکارڈز
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,سی فارم ریکارڈز
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,کسٹمر اور سپلائر
 DocType: Email Digest,Email Digest Settings,ای میل ڈائجسٹ ترتیبات
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,آپ کے کاروبار کے لئے آپ کا شکریہ!
@@ -987,13 +1004,13 @@
 DocType: Request for Quotation Supplier,Quote Status,اقتباس کی حیثیت
 DocType: Maintenance Visit,Completion Status,تکمیل کی حیثیت
 DocType: HR Settings,Enter retirement age in years,سال میں ریٹائرمنٹ کی عمر درج کریں
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,ہدف گودام
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,ایک گودام براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,ہدف گودام
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,ایک گودام براہ مہربانی منتخب کریں
 DocType: Cheque Print Template,Starting location from left edge,بائیں کنارے سے مقام پر شروع
 DocType: Item,Allow over delivery or receipt upto this percent,اس فی صد تک کی ترسیل یا رسید سے زیادہ کرنے کی اجازت دیں
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,درآمد حاضری
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,تمام آئٹم گروپس
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,تمام آئٹم گروپس
 DocType: Process Payroll,Activity Log,سرگرمی لاگ ان
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,خالص منافع / خسارہ
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,خود کار طریقے سے لین دین کی جمع کرانے پر پیغام لکھیں.
@@ -1005,7 +1022,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,متوقع مقدار
 DocType: Sales Invoice,Payment Due Date,ادائیگی کی وجہ سے تاریخ
 DocType: Drug Prescription,Interval UOM,انٹرا UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,آئٹم مختلف {0} پہلے ہی صفات کے ساتھ موجود
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,آئٹم مختلف {0} پہلے ہی صفات کے ساتھ موجود
+DocType: Item,Hub Publishing Details,ہب پبلشنگ کی تفصیلات
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',افتتاحی'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ایسا کرنے کے لئے کھلے
 DocType: Notification Control,Delivery Note Message,ترسیل کے نوٹ پیغام
@@ -1025,10 +1043,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,بوم # {0}: خام مال اہم آئٹم کی طرح نہیں ہوسکتی ہے
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,خریداری کی رسید اشیا ٹیبل میں تمام قابل اطلاق چارجز کل ٹیکس اور الزامات طور پر ایک ہی ہونا چاہیے
 DocType: Sales Team,Incentives,ترغیبات
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,حب کے لئے رجسٹر کریں
 DocType: SMS Log,Requested Numbers,درخواست نمبر
 DocType: Production Planning Tool,Only Obtain Raw Materials,صرف خام مال حاصل
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,کارکردگی تشخیص.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",کو چالو کرنے کے طور پر خریداری کی ٹوکری چالو حالت میں ہے، &#39;خریداری کی ٹوکری کے لئے استعمال کریں&#39; اور خریداری کی ٹوکری کے لئے کم از کم ایک ٹیکس حکمرانی نہیں ہونا چاہئے
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",کو چالو کرنے کے طور پر خریداری کی ٹوکری چالو حالت میں ہے، &#39;خریداری کی ٹوکری کے لئے استعمال کریں&#39; اور خریداری کی ٹوکری کے لئے کم از کم ایک ٹیکس حکمرانی نہیں ہونا چاہئے
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",ادائیگی انٹری {0} آرڈر {1}، اسے اس انوائس میں پیشگی کے طور پر نکالا جانا چاہئے تو چیک خلاف منسلک ہے.
 DocType: Sales Invoice Item,Stock Details,اسٹاک کی تفصیلات
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,پروجیکٹ ویلیو
@@ -1047,12 +1066,14 @@
 DocType: Salary Slip,Working Days,کام کے دنوں میں
 DocType: Serial No,Incoming Rate,موصولہ کی شرح
 DocType: Packing Slip,Gross Weight,مجموعی وزن
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,آپ کی کمپنی کے نام جس کے لئے آپ کو اس کے نظام کو قائم کر رہے ہیں.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,حب کو فعال کریں
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,آپ کی کمپنی کے نام جس کے لئے آپ کو اس کے نظام کو قائم کر رہے ہیں.
 DocType: HR Settings,Include holidays in Total no. of Working Days,کوئی کل میں تعطیلات شامل. کام کے دنوں کے
 DocType: Job Applicant,Hold,پکڑو
 DocType: Employee,Date of Joining,شمولیت کی تاریخ
 DocType: Naming Series,Update Series,اپ ڈیٹ سیریز
 DocType: Supplier Quotation,Is Subcontracted,ٹھیکے ہے
+DocType: Restaurant Table,Minimum Seating,کم سے کم نشست
 DocType: Item Attribute,Item Attribute Values,آئٹم خاصیت فہرست
 DocType: Examination Result,Examination Result,امتحان کے نتائج
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,خریداری کی رسید
@@ -1063,13 +1084,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},آپریشن کے لئے اگلے {0} دنوں میں وقت سلاٹ تلاش کرنے سے قاصر {1}
 DocType: Production Order,Plan material for sub-assemblies,ذیلی اسمبلیوں کے لئے منصوبہ مواد
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,سیلز شراکت دار اور علاقہ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} فعال ہونا ضروری ہے
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} فعال ہونا ضروری ہے
 DocType: Journal Entry,Depreciation Entry,ہراس انٹری
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,پہلی دستاویز کی قسم منتخب کریں
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,اس کی بحالی کا منسوخ کرنے سے پہلے منسوخ مواد دورہ {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},سیریل نمبر {0} آئٹم سے تعلق نہیں ہے {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,مطلوبہ مقدار
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,موجودہ منتقلی کے ساتھ گوداموں لیجر میں تبدیل نہیں کیا جا سکتا.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,موجودہ منتقلی کے ساتھ گوداموں لیجر میں تبدیل نہیں کیا جا سکتا.
 DocType: Bank Reconciliation,Total Amount,کل رقم
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,انٹرنیٹ پبلشنگ
 DocType: Prescription Duration,Number,نمبر
@@ -1080,7 +1101,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,سیلز قیمت کی فہرست
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.",اگر جانچ پڑتال ہو تو، ایک کسٹمر تخلیق کیا جائے گا، مریض کو نقدی. اس گاہک کے خلاف مریض انوائس بنائے جائیں گے. آپ مریض پیدا کرنے کے دوران موجودہ کسٹمر بھی منتخب کرسکتے ہیں.
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,اشیاء مطابقت پذیر کرنے کے شائع
 DocType: Bank Reconciliation,Account Currency,اکاؤنٹ کی کرنسی
 DocType: Lab Test,Sample ID,نمونہ ID
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,کمپنی میں گول آف اکاؤنٹ کا ذکر کریں
@@ -1089,11 +1109,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,{0} ملازم فعال نہیں ہے یا موجود نہیں ہے
 DocType: Fee Structure,Components,اجزاء
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},براہ مہربانی آئٹم {0} میں اثاثہ زمرہ درج کریں
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,آئٹم متغیرات {0} اپ ڈیٹ
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,آئٹم متغیرات {0} اپ ڈیٹ
 DocType: Quality Inspection Reading,Reading 6,6 پڑھنا
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,نہ {0} {1} {2} بھی منفی بقایا انوائس کے بغیر کر سکتے ہیں
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this",پیدا کرنے کے لئے. اگر تاخیر ہو تو، آپ کو دستی طور پر &quot;مہینے کے دن پر دوپہر&quot; کو تبدیل کرنا پڑے گا
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,نہ {0} {1} {2} بھی منفی بقایا انوائس کے بغیر کر سکتے ہیں
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,انوائس پیشگی خریداری
-DocType: Hub Settings,Sync Now,ہم آہنگی اب
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},صف {0}: کریڈٹ اندراج کے ساتھ منسلک نہیں کیا جا سکتا ہے {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,ایک مالی سال کے لئے بجٹ کی وضاحت کریں.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,اس موڈ کو منتخب کیا جاتا ہے جب پہلے سے طے شدہ بینک / کیش اکاؤنٹ خود کار طریقے سے پوزیشن انوائس میں اپ ڈیٹ کیا جائے گا.
@@ -1105,13 +1126,13 @@
 DocType: Item,Is Purchase Item,خریداری آئٹم
 DocType: Asset,Purchase Invoice,خریداری کی رسید
 DocType: Stock Ledger Entry,Voucher Detail No,واؤچر تفصیل کوئی
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,نئے فروخت انوائس
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,نئے فروخت انوائس
 DocType: Stock Entry,Total Outgoing Value,کل سبکدوش ہونے والے ویلیو
 DocType: Physician,Appointments,اپیلمنٹ
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,تاریخ اور آخری تاریخ کھولنے اسی مالی سال کے اندر اندر ہونا چاہئے
 DocType: Lead,Request for Information,معلومات کے لئے درخواست
 ,LeaderBoard,لیڈر
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,مطابقت پذیری حاضر انوائس
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,مطابقت پذیری حاضر انوائس
 DocType: Payment Request,Paid,ادائیگی
 DocType: Program Fee,Program Fee,پروگرام کی فیس
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1130,11 +1151,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,آرڈر شے کی خریداری
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,بالواسطہ آمدنی
 DocType: Student Attendance Tool,Student Attendance Tool,طلبا کی حاضری کا آلہ
+DocType: Restaurant Menu,Price List (Auto created),قیمت کی فہرست (آٹو تخلیق)
 DocType: Cheque Print Template,Date Settings,تاریخ کی ترتیبات
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,بادبانی
 ,Company Name,کمپنی کا نام
 DocType: SMS Center,Total Message(s),کل پیغام (ے)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,منتقلی کے لئے منتخب آئٹم
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,منتقلی کے لئے منتخب آئٹم
 DocType: Purchase Invoice,Additional Discount Percentage,اضافی ڈسکاؤنٹ فی صد
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,تمام قسم کی مدد ویڈیوز کی ایک فہرست دیکھیں
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,چیک جمع کیا گیا تھا جہاں بینک کے اکاؤنٹ منتخب کریں سر.
@@ -1152,6 +1174,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,میٹر
 DocType: Workstation,Electricity Cost,بجلی کی لاگت
 DocType: HR Settings,Don't send Employee Birthday Reminders,ملازم سالگرہ کی یاددہانیاں نہ بھیجیں
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,ترتیبات محفوظ کریں
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,درخواست کی مصنوعات
 DocType: Item,Inspection Criteria,معائنہ کا کلیہ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,transfered کیا
 DocType: BOM Website Item,BOM Website Item,BOM ویب آئٹم
@@ -1169,11 +1193,11 @@
 DocType: Journal Entry,Total Amount in Words,الفاظ میں کل رقم
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,میں ایک خامی تھی. ایک ممکنہ وجہ آپ کو فارم محفوظ نہیں ہے کہ ہو سکتا ہے. اگر مسئلہ برقرار رہے support@erpnext.com سے رابطہ کریں.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,میری کارڈز
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},آرڈر کی قسم سے ایک ہونا ضروری {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},آرڈر کی قسم سے ایک ہونا ضروری {0}
 DocType: Lead,Next Contact Date,اگلی رابطہ تاریخ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,مقدار کھولنے
 DocType: Healthcare Settings,Appointment Reminder,تقرری یاد دہانی
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,تبدیلی کی رقم کے اکاؤنٹ درج کریں
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,تبدیلی کی رقم کے اکاؤنٹ درج کریں
 DocType: Student Batch Name,Student Batch Name,Student کی بیچ کا نام
 DocType: Consultation,Doctor,ڈاکٹر
 DocType: Holiday List,Holiday List Name,چھٹیوں فہرست کا نام
@@ -1181,12 +1205,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,شیڈول کورس
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,اسٹاک اختیارات
 DocType: Journal Entry Account,Expense Claim,اخراجات کا دعوی
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,اگر تم واقعی اس کو ختم کر دیا اثاثہ بحال کرنا چاہتے ہیں؟
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},کے لئے مقدار {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,اگر تم واقعی اس کو ختم کر دیا اثاثہ بحال کرنا چاہتے ہیں؟
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},کے لئے مقدار {0}
 DocType: Leave Application,Leave Application,چھٹی کی درخواست
 DocType: Patient,Patient Relation,مریض تعلقات
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,ایلوکیشن چھوڑ دیں آلہ
+DocType: Item,Hub Category to Publish,حب زمرہ شائع کرنے کے لئے
 DocType: Leave Block List,Leave Block List Dates,بلاک فہرست تاریخوں چھوڑ
+DocType: Sales Invoice,Billing Address GSTIN,بلنگ ایڈریس GSTIN
 DocType: Workstation,Net Hour Rate,نیٹ گھنٹے کی شرح
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,لینڈڈ لاگت خریداری کی رسید
 DocType: Company,Default Terms,پہلے سے طے شدہ شرائط
@@ -1196,11 +1222,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},وضاحت کریں ایک {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,مقدار یا قدر میں کوئی تبدیلی نہیں کے ساتھ ختم اشیاء.
 DocType: Delivery Note,Delivery To,کی ترسیل کے
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,وصف میز لازمی ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,وصف میز لازمی ہے
 DocType: Production Planning Tool,Get Sales Orders,سیلز احکامات حاصل
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} منفی نہیں ہو سکتا
 DocType: Training Event,Self-Study,خود مطالعہ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,ڈسکاؤنٹ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,ڈسکاؤنٹ
 DocType: Asset,Total Number of Depreciations,Depreciations کی کل تعداد
 DocType: Sales Invoice Item,Rate With Margin,مارجن کے ساتھ کی شرح
 DocType: Sales Invoice Item,Rate With Margin,مارجن کے ساتھ کی شرح
@@ -1208,7 +1234,7 @@
 DocType: Task,Urgent,ارجنٹ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},ٹیبل میں قطار {0} کے لئے ایک درست صف ID کی وضاحت براہ کرم {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,متغیر تلاش کرنے میں ناکام
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,براہ مہربانی numpad سے ترمیم کرنے کے لئے فیلڈ کا انتخاب کریں
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,براہ مہربانی numpad سے ترمیم کرنے کے لئے فیلڈ کا انتخاب کریں
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,ڈیسک ٹاپ پر جائیں اور ERPNext استعمال کرتے ہوئے شروع
 DocType: Item,Manufacturer,ڈویلپر
 DocType: Landed Cost Item,Purchase Receipt Item,خریداری کی رسید آئٹم
@@ -1239,8 +1265,8 @@
 DocType: GL Entry,Against,کے خلاف
 DocType: Item,Default Selling Cost Center,پہلے سے طے شدہ فروخت لاگت مرکز
 DocType: Sales Partner,Implementation Partner,نفاذ ساتھی
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,زپ کوڈ
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},سیلز آرڈر {0} ہے {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,زپ کوڈ
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},سیلز آرڈر {0} ہے {1}
 DocType: Opportunity,Contact Info,رابطے کی معلومات
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,اسٹاک اندراجات کر رہے ہیں
 DocType: Packing Slip,Net Weight UOM,نیٹ وزن UOM
@@ -1251,6 +1277,7 @@
 DocType: Holiday List,Get Weekly Off Dates,ویکلی آف تاریخوں کو حاصل
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,ختم ہونے کی تاریخ شروع کرنے کی تاریخ کے مقابلے میں کم نہیں ہو سکتا
 DocType: Sales Person,Select company name first.,پہلے منتخب کمپنی کا نام.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,ہائی کم
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,کوٹیشن سپلائر کی طرف سے موصول.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,بوم تبدیل کریں اور تمام بی ایمز میں تازہ ترین قیمت کو اپ ڈیٹ کریں
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},کرنے کے لئے {0} | {1} {2}
@@ -1271,7 +1298,7 @@
 DocType: Program Enrollment,Transportation,نقل و حمل
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,غلط خاصیت
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} پیش کرنا ضروری ہے
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},مقدار {0} سے کم یا برابر ہونا ضروری ہے
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},مقدار {0} سے کم یا برابر ہونا ضروری ہے
 DocType: SMS Center,Total Characters,کل کردار
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},آئٹم کے لئے BOM میدان میں BOM منتخب کریں {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,سی فارم انوائس تفصیل
@@ -1286,7 +1313,7 @@
 ,Ordered Items To Be Billed,کو حکم دیا اشیاء بل بھیجا جائے کرنے کے لئے
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,رینج کم ہونا ضروری ہے کے مقابلے میں رینج کے لئے
 DocType: Global Defaults,Global Defaults,گلوبل ڈیفالٹس
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,منصوبے کے تعاون کا دعوت نامہ
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,منصوبے کے تعاون کا دعوت نامہ
 DocType: Salary Slip,Deductions,کٹوتیوں
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,ایکشن کا نام
@@ -1304,13 +1331,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,فروخت انوائس ایڈوانس
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,کچھ درخواست کرنے کے لئے
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},ایک اور بجٹ ریکارڈ &#39;{0}&#39; پہلے ہی خلاف موجود {1} &#39;{2}&#39; مالی سال کے لیے {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&#39;اصل تاریخ آغاز&#39; &#39;اصل تاریخ اختتام&#39; سے زیادہ نہیں ہو سکتا
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&#39;اصل تاریخ آغاز&#39; &#39;اصل تاریخ اختتام&#39; سے زیادہ نہیں ہو سکتا
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,مینجمنٹ
 DocType: Cheque Print Template,Payer Settings,بوگتانکرتا ترتیبات
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",یہ مختلف کی آئٹم کوڈ منسلک کیا جائے گا. آپ مخفف &quot;ایس ایم&quot; ہے، اور اگر مثال کے طور پر، شے کے کوڈ &quot;ٹی شرٹ&quot;، &quot;ٹی شرٹ-ایس ایم&quot; ہو جائے گا ویرینٹ کی شے کوڈ آن ہے
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,آپ کو تنخواہ پرچی بچانے بار (الفاظ میں) نیٹ پے نظر آئے گا.
 DocType: Purchase Invoice,Is Return,واپسی ہے
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,احتیاط
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,احتیاط
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,واپس / ڈیبٹ نوٹ
 DocType: Price List Country,Price List Country,قیمت کی فہرست ملک
 DocType: Item,UOMs,UOMs
@@ -1325,17 +1352,18 @@
 DocType: Account,Balance Sheet,بیلنس شیٹ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',&#39;آئٹم کوڈ شے کے لئے مرکز لاگت
 DocType: Fee Validity,Valid Till,تک مؤثر
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",ادائیگی موڈ تشکیل نہیں ہے. چاہے اکاؤنٹ ادائیگیاں کے موڈ پر یا POS پروفائل پر قائم کیا گیا ہے، براہ مہربانی چیک کریں.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",ادائیگی موڈ تشکیل نہیں ہے. چاہے اکاؤنٹ ادائیگیاں کے موڈ پر یا POS پروفائل پر قائم کیا گیا ہے، براہ مہربانی چیک کریں.
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,ایک ہی شے کے کئی بار داخل نہیں کیا جا سکتا.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",مزید اکاؤنٹس گروپوں کے تحت بنایا جا سکتا ہے، لیکن اندراجات غیر گروپوں کے خلاف بنایا جا سکتا ہے
 DocType: Lead,Lead,لیڈ
 DocType: Email Digest,Payables,Payables
 DocType: Course,Course Intro,کورس انٹرو
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,اسٹاک انٹری {0} پیدا
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,سیٹ اپ&gt; نمبر نمبر کے ذریعے حاضری کے لئے براہ کرم سلسلہ نمبر سیٹ کریں
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,اسٹاک انٹری {0} پیدا
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,صف # {0}: مقدار خریداری واپس میں داخل نہیں کیا جا سکتا مسترد
 ,Purchase Order Items To Be Billed,خریداری کے آرڈر اشیا بل بھیجا جائے کرنے کے لئے
 DocType: Purchase Invoice Item,Net Rate,نیٹ کی شرح
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,برائے مہربانی ایک کسٹمر منتخب کریں
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,برائے مہربانی ایک کسٹمر منتخب کریں
 DocType: Purchase Invoice Item,Purchase Invoice Item,انوائس شے کی خریداری
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,اسٹاک لیجر لکھے اور GL لکھے منتخب خریداری رسیدیں کے لئے دوبارہ شائع کر رہے ہیں
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,آئٹم کے 1
@@ -1356,7 +1384,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},کے ساتھ ڈپلیکیٹ قطار {0} اسی {1}
 ,Trial Balance,مقدمے کی سماعت توازن
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,مالی سال {0} نہیں ملا
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,ملازمین کو مقرر
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,ملازمین کو مقرر
 DocType: Sales Order,SO-,دینے واال
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,پہلے سابقہ براہ مہربانی منتخب کریں
 DocType: Employee,O-,O-
@@ -1368,12 +1396,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,لنک لیجر
 DocType: Grading Scale,Intervals,وقفے
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,قدیم ترین
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group",ایک آئٹم گروپ ایک ہی نام کے ساتھ موجود ہے، شے کے نام کو تبدیل کرنے یا شے کے گروپ کو دوسرا نام کریں
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group",ایک آئٹم گروپ ایک ہی نام کے ساتھ موجود ہے، شے کے نام کو تبدیل کرنے یا شے کے گروپ کو دوسرا نام کریں
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,طالب علم کے موبائل نمبر
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,باقی دنیا کے
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,باقی دنیا کے
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,آئٹم {0} بیچ نہیں کر سکتے ہیں
 ,Budget Variance Report,بجٹ تغیر رپورٹ
 DocType: Salary Slip,Gross Pay,مجموعی ادائیگی
+DocType: Item,Is Item from Hub,ہب سے آئٹم ہے
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,صف {0}: سرگرمی کی قسم لازمی ہے.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,فائدہ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,اکاؤنٹنگ لیجر
@@ -1383,8 +1412,9 @@
 DocType: Vehicle Log,Service Detail,سروس کا تفصیل
 DocType: BOM,Item Description,آئٹم تفصیل
 DocType: Student Sibling,Student Sibling,طالب علم بھائی
-DocType: Purchase Invoice,Is Recurring,مکرر ہے
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,ادائیگی کے موڈ
 DocType: Purchase Invoice,Supplied Items,فراہم کی اشیا
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},برائے مہربانی ریستوران کے لئے ایک فعال مینو مقرر کریں {0}
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,تیار کرنے کی مقدار
 DocType: Email Digest,New Income,نئی آمدنی
@@ -1395,6 +1425,7 @@
 ,Student and Guardian Contact Details,طالب علم اور گارڈین کے رابطے کی تفصیلات
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,صف {0}: سپلائر کے لئے {0} ای میل ایڈریس ای میل بھیجنے کی ضرورت ہے
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,عارضی افتتاحی
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,حب دیکھیں
 ,Employee Leave Balance,ملازم کی رخصت بیلنس
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},اکاؤنٹ کے لئے توازن {0} ہمیشہ ہونا ضروری {1}
 DocType: Patient Appointment,More Info,مزید معلومات
@@ -1414,13 +1445,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,سیلز آرڈر {0} درست نہیں ہے
 DocType: Supplier Scorecard,Warn for new Request for Quotations,کوٹیشن کے لئے نئی درخواست کے لئے انتباہ
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,خریداری کے احکامات کو آپ کی منصوبہ بندی کی مدد کرنے اور آپ کی خریداری پر عمل
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged",معذرت، کمپنیوں ضم نہیں کیا جا سکتا
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged",معذرت، کمپنیوں ضم نہیں کیا جا سکتا
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,لیب ٹیسٹ نسخہ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",کل مسئلہ / ٹرانسفر کی مقدار {0} مواد کی درخواست میں {1} \ {2} کی درخواست کی مقدار آئٹم کے لئے سے زیادہ نہیں ہو سکتا {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,چھوٹے
 DocType: Employee,Employee Number,ملازم نمبر
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},کیس نہیں (ے) پہلے سے استعمال میں. کیس نہیں سے کوشش {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},کیس نہیں (ے) پہلے سے استعمال میں. کیس نہیں سے کوشش {0}
 DocType: Project,% Completed,٪ مکمل
 ,Invoiced Amount (Exculsive Tax),انوائس کی رقم (Exculsive ٹیکس)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,آئٹم 2
@@ -1435,11 +1466,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,بالواسطہ اخراجات
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,صف {0}: مقدار لازمی ہے
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,زراعت
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,مطابقت پذیری ماسٹر ڈیٹا
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,مطابقت پذیری ماسٹر ڈیٹا
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,اپنی مصنوعات یا خدمات
 DocType: Special Test Items,Special Test Items,خصوصی ٹیسٹ اشیا
 DocType: Mode of Payment,Mode of Payment,ادائیگی کا طریقہ
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,ویب سائٹ تصویری ایک عوامی فائل یا ویب سائٹ یو آر ایل ہونا چاہئے
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,ویب سائٹ تصویری ایک عوامی فائل یا ویب سائٹ یو آر ایل ہونا چاہئے
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,یہ ایک جڑ شے گروپ ہے اور میں ترمیم نہیں کیا جا سکتا.
@@ -1447,9 +1478,9 @@
 DocType: Vehicle,Fuel UOM,ایندھن UOM
 DocType: Warehouse,Warehouse Contact Info,گودام معلومات رابطہ کریں
 DocType: Payment Entry,Write Off Difference Amount,فرق رقم لکھنے
-DocType: Purchase Invoice,Recurring Type,مکرر قسم
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent",{0}: ملازم کے ای میل نہیں ملا، اس وجہ سے نہیں بھیجے گئے ای میل
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent",{0}: ملازم کے ای میل نہیں ملا، اس وجہ سے نہیں بھیجے گئے ای میل
 DocType: Item,Foreign Trade Details,فارن ٹریڈ کی تفصیلات
+,Assessment Plan Status,تشخیص منصوبہ کی حیثیت
 DocType: Email Digest,Annual Income,سالانہ آمدنی
 DocType: Serial No,Serial No Details,سیریل کوئی تفصیلات
 DocType: Purchase Invoice Item,Item Tax Rate,آئٹم ٹیکس کی شرح
@@ -1457,15 +1488,14 @@
 DocType: Student Group Student,Group Roll Number,گروپ رول نمبر
 DocType: Student Group Student,Group Roll Number,گروپ رول نمبر
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0}، صرف کریڈٹ اکاؤنٹس ایک ڈیبٹ داخلے کے خلاف منسلک کیا جا سکتا ہے
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,تمام کام وزن کی کل ہونا چاہئے 1. اس کے مطابق تمام منصوبے کے کاموں کے وزن کو ایڈجسٹ کریں
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,ترسیل کے نوٹ {0} پیش نہیں ہے
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,تمام کام وزن کی کل ہونا چاہئے 1. اس کے مطابق تمام منصوبے کے کاموں کے وزن کو ایڈجسٹ کریں
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,ترسیل کے نوٹ {0} پیش نہیں ہے
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,آئٹم {0} ایک ذیلی کنٹریکٹڈ آئٹم ہونا ضروری ہے
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,کیپٹل سازوسامان
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",قیمتوں کا تعین اصول سب سے پہلے کی بنیاد پر منتخب کیا جاتا ہے آئٹم آئٹم گروپ یا برانڈ ہو سکتا ہے، میدان &#39;پر لگائیں&#39;.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,براہ مہربانی سب سے پہلے آئٹم کا کوڈ مقرر کریں
-DocType: Hub Settings,Seller Website,فروش ویب سائٹ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,براہ مہربانی سب سے پہلے آئٹم کا کوڈ مقرر کریں
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,فروخت کی ٹیم کے لئے مختص کل فی صد 100 ہونا چاہئے
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,فروخت کی ٹیم کے لئے مختص کل فی صد 100 ہونا چاہئے
 DocType: Sales Invoice Item,Edit Description,ترمیم تفصیل
 DocType: Antibiotic,Antibiotic,اینٹی بائیوٹک
 ,Team Updates,ٹیم کی تازہ ترین معلومات
@@ -1486,12 +1516,12 @@
 DocType: Purchase Invoice,Total (Company Currency),کل (کمپنی کرنسی)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,{0} سیریل نمبر ایک سے زائد بار میں داخل
 DocType: Depreciation Schedule,Journal Entry,جرنل اندراج
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} رفت میں اشیاء
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} رفت میں اشیاء
 DocType: Workstation,Workstation Name,کارگاہ نام
 DocType: Grading Scale Interval,Grade Code,گریڈ کوڈ
 DocType: POS Item Group,POS Item Group,POS آئٹم گروپ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ڈائجسٹ ای میل کریں:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} آئٹم سے تعلق نہیں ہے {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} آئٹم سے تعلق نہیں ہے {1}
 DocType: Sales Partner,Target Distribution,ہدف تقسیم
 DocType: Salary Slip,Bank Account No.,بینک اکاؤنٹ نمبر
 DocType: Naming Series,This is the number of the last created transaction with this prefix,یہ اپسرگ کے ساتھ گزشتہ پیدا لین دین کی تعداد ہے
@@ -1507,10 +1537,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,کوٹیشن سپلائر کے لئے درخواست
 DocType: Healthcare Settings,Registration Message,رجسٹریشن پیغام
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,ہارڈ ویئر
-DocType: Sales Order,Recurring Upto,مکرر تک
 DocType: Prescription Dosage,Prescription Dosage,پریزنٹیشن ڈوسج
 DocType: Attendance,HR Manager,HR مینیجر
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,ایک کمپنی کا انتخاب کریں
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,ایک کمپنی کا انتخاب کریں
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,استحقاق رخصت
 DocType: Purchase Invoice,Supplier Invoice Date,سپلائر انوائس تاریخ
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,فی
@@ -1526,10 +1555,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,کے درمیان پایا اتیویاپی حالات:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,جرنل کے خلاف اندراج {0} پہلے سے ہی کچھ دیگر واؤچر کے خلاف ایڈجسٹ کیا جاتا ہے
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,کل آرڈر ویلیو
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,خوراک
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,خوراک
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,خستہ رینج 3
 DocType: Maintenance Schedule Item,No of Visits,دوروں کی کوئی
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},بحالی کا شیڈول {0} کے خلاف موجود ہے {1}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,کیا آپ اپنے اشیاء کو حب میں شائع کرنا چاہتے ہیں؟
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,اندراج کے طالب علم
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},بند اکاؤنٹ کی کرنسی ہونا ضروری ہے {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},تمام مقاصد کے لئے پوائنٹس کی رقم یہ ہے 100. ہونا چاہئے {0}
@@ -1540,9 +1570,9 @@
 DocType: Authorization Rule,Average Discount,اوسط ڈسکاؤنٹ
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,افادیت
-DocType: Purchase Invoice Item,Accounting,اکاؤنٹنگ
+DocType: POS Profile,Accounting,اکاؤنٹنگ
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,batched شے کے لئے بیچوں براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,batched شے کے لئے بیچوں براہ مہربانی منتخب کریں
 DocType: Asset,Depreciation Schedules,ہراس کے شیڈول
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,درخواست کی مدت کے باہر چھٹی مختص مدت نہیں ہو سکتا
 DocType: Activity Cost,Projects,منصوبوں
@@ -1558,7 +1588,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',منظوری کی حیثیت &#39;منظور&#39; یا &#39;مسترد&#39; ہونا ضروری ہے
 DocType: Physician,Contacts and Address,رابطوں اور ایڈریس
 DocType: Purchase Invoice,Contact Person,رابطے کا بندہ
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',کی متوقع شروع کرنے کی تاریخ &#39;سے زیادہ&#39; متوقع تاریخ اختتام &#39;نہیں ہو سکتا
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',کی متوقع شروع کرنے کی تاریخ &#39;سے زیادہ&#39; متوقع تاریخ اختتام &#39;نہیں ہو سکتا
 DocType: Course Scheduling Tool,Course End Date,کورس کی آخری تاریخ
 DocType: Holiday List,Holidays,چھٹیاں
 DocType: Sales Order Item,Planned Quantity,منصوبہ بندی کی مقدار
@@ -1566,10 +1596,11 @@
 DocType: Item,Maintain Stock,اسٹاک کو برقرار رکھنے کے
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,پہلے سے پروڈکشن آرڈر کے لئے پیدا اسٹاک میں لکھے
 DocType: Employee,Prefered Email,prefered کی ای میل
+DocType: Student Admission,Eligibility and Details,اہلیت اور تفصیلات
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,فکسڈ اثاثہ میں خالص تبدیلی
 DocType: Leave Control Panel,Leave blank if considered for all designations,تمام مراتب کے لئے غور کیا تو خالی چھوڑ دیں
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,قسم &#39;اصل&#39; قطار میں کے انچارج {0} شے کی درجہ بندی میں شامل نہیں کیا جا سکتا
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},زیادہ سے زیادہ: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},زیادہ سے زیادہ: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,تریخ ویلہ سے
 DocType: Email Digest,For Company,کمپنی کے لئے
 apps/erpnext/erpnext/config/support.py +17,Communication log.,مواصلات لاگ ان کریں.
@@ -1577,19 +1608,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,سپلائر اسکور کارڈ سکورنگ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,خرید رقم
 DocType: Sales Invoice,Shipping Address Name,شپنگ ایڈریس کا نام
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,اکاؤنٹس کا چارٹ
 DocType: Material Request,Terms and Conditions Content,شرائط و ضوابط مواد
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,زیادہ سے زیادہ 100 سے زائد نہیں ہو سکتا
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,{0} آئٹم اسٹاک شے نہیں ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,{0} آئٹم اسٹاک شے نہیں ہے
 DocType: Maintenance Visit,Unscheduled,شیڈول کا اعلان
 DocType: Employee,Owned,ملکیت
 DocType: Salary Detail,Depends on Leave Without Pay,بغیر تنخواہ چھٹی پر منحصر ہے
 DocType: Pricing Rule,"Higher the number, higher the priority",زیادہ تعداد، اعلی ترجیح
 ,Purchase Invoice Trends,انوائس رجحانات خریدیں
 DocType: Employee,Better Prospects,بہتر امکانات
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",صف # {0}: بیچ {1} صرف {2} قی ہے. ایک اور بیچ دستیاب ہے جس {3} قی منتخب کریں یا / مسئلہ ایک سے زیادہ بیچوں سے فراہم کرنے کے لئے، ایک سے زیادہ قطاروں میں صف تقسیم مہربانی
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",صف # {0}: بیچ {1} صرف {2} قی ہے. ایک اور بیچ دستیاب ہے جس {3} قی منتخب کریں یا / مسئلہ ایک سے زیادہ بیچوں سے فراہم کرنے کے لئے، ایک سے زیادہ قطاروں میں صف تقسیم مہربانی
 DocType: Vehicle,License Plate,لائسنس پلیٹ
 DocType: Appraisal,Goals,اہداف
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,POS پروفائل منتخب کریں
 DocType: Warranty Claim,Warranty / AMC Status,وارنٹی / AMC رتبہ
 ,Accounts Browser,اکاؤنٹس براؤزر
 DocType: Payment Entry Reference,Payment Entry Reference,ادائیگی انٹری حوالہ
@@ -1607,7 +1638,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,ملازم خود کو رپورٹ نہیں دے سکتے.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",اکاؤنٹ منجمد ہے، اندراجات محدود صارفین کو اجازت دی جاتی ہے.
 DocType: Email Digest,Bank Balance,بینک کی بیلنس
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} صرف کرنسی میں بنایا جا سکتا ہے: {0} کے لئے اکاؤنٹنگ انٹری {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} صرف کرنسی میں بنایا جا سکتا ہے: {0} کے لئے اکاؤنٹنگ انٹری {2}
 DocType: Job Opening,"Job profile, qualifications required etc.",ایوب پروفائل، قابلیت کی ضرورت وغیرہ
 DocType: Journal Entry Account,Account Balance,اکاؤنٹ بیلنس
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,لین دین کے لئے ٹیکس اصول.
@@ -1616,8 +1647,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),کل ٹیکس اور الزامات (کمپنی کرنسی)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,نا بند کردہ مالی سال کی P &amp; L بیلنس دکھائیں
 DocType: Lab Test Template,Collection Details,مجموعہ تفصیلات
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0",cp.name، cp.test_code، cp.parent، cp.invoice، ct.physician، ct.consultation_date ٹیب مواصلات CT، `tabLab نسخہ` سی پی جہاں ct.patient = &#39;{0}&#39; اور cp.parent = CT. نام اور cp.test_created = 0
 DocType: Shipping Rule,Shipping Account,شپنگ اکاؤنٹ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: اکاؤنٹ {2} غیر فعال ہے
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,آپ کو آپ کے کام کی منصوبہ بندی اور مدد کرنے کے لئے سیلز آرڈر پر وقت بچا بنائیں
@@ -1634,7 +1663,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,پیکنگ پرچی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,دفتر کرایہ پر دستیاب
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,سیٹ اپ SMS گیٹ وے کی ترتیبات
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,درآمد میں ناکام!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,درآمد میں ناکام!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,کوئی ایڈریس کی ابھی تک شامل.
 DocType: Workstation Working Hour,Workstation Working Hour,کارگاہ قیامت کام کرنا
 DocType: Vital Signs,Blood Pressure,فشار خون
@@ -1659,7 +1688,7 @@
 DocType: Sales Invoice,Source,ماخذ
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,بند کر کے دکھائیں
 DocType: Leave Type,Is Leave Without Pay,تنخواہ کے بغیر چھوڑ
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,ایسیٹ قسم فکسڈ اثاثہ شے کے لئے لازمی ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,ایسیٹ قسم فکسڈ اثاثہ شے کے لئے لازمی ہے
 DocType: Fee Validity,Fee Validity,فیس وادی
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,ادائیگی ٹیبل میں پایا کوئی ریکارڈ
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},اس {0} کے ساتھ تنازعات {1} کو {2} {3}
@@ -1680,8 +1709,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ایگزیکٹو تلاش کریں
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,لیڈز بنائیں
 DocType: Maintenance Schedule,Schedules,شیڈول
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,پوائنٹ آف فروخت کا استعمال کرنے کے لئے پی ایس کی پروفائل ضروری ہے
 DocType: Purchase Invoice Item,Net Amount,اصل رقم
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} لہذا کارروائی مکمل نہیں کیا جا سکتا ہے جمع نہیں کیا گیا ہے
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} لہذا کارروائی مکمل نہیں کیا جا سکتا ہے جمع نہیں کیا گیا ہے
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM تفصیل کوئی
 DocType: Landed Cost Voucher,Additional Charges,اضافی چارجز
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),اضافی ڈسکاؤنٹ رقم (کمپنی کرنسی)
@@ -1690,7 +1720,7 @@
 ,Support Hour Distribution,سپورٹ گھنٹے کی تقسیم
 DocType: Maintenance Visit,Maintenance Visit,بحالی کا
 DocType: Student,Leaving Certificate Number,سرٹیفکیٹ نمبر چھوڑنا
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}",اپیل منسوخ کردی گئی ہے، براہ کرم انوائس کا جائزہ لیں اور منسوخ کریں {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}",اپیل منسوخ کردی گئی ہے، براہ کرم انوائس کا جائزہ لیں اور منسوخ کریں {0}
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,گودام پر دستیاب بیچ مقدار
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,اپ ڈیٹ پرنٹ کی شکل
 DocType: Landed Cost Voucher,Landed Cost Help,لینڈڈ لاگت مدد
@@ -1713,8 +1743,8 @@
 DocType: Patient,Tobacco Past Use,تمباکو ماضی کا استعمال
 DocType: Sales Invoice Item,Brand Name,برانڈ کا نام
 DocType: Purchase Receipt,Transporter Details,ٹرانسپورٹر تفصیلات
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},صارف {0} پہلے سے ہی ڈاکٹر کو مقرر کیا گیا ہے {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,پہلے سے طے شدہ گودام منتخب شے کے لئے کی ضرورت ہے
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},صارف {0} پہلے سے ہی ڈاکٹر کو مقرر کیا گیا ہے {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,پہلے سے طے شدہ گودام منتخب شے کے لئے کی ضرورت ہے
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,باکس
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,ممکنہ سپلائر
 DocType: Budget,Monthly Distribution,ماہانہ تقسیم
@@ -1724,8 +1754,8 @@
 DocType: Sales Partner,Sales Partner Target,سیلز پارٹنر ہدف
 DocType: Loan Type,Maximum Loan Amount,زیادہ سے زیادہ قرض کی رقم
 DocType: Pricing Rule,Pricing Rule,قیمتوں کا تعین اصول
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},طالب علم کے لئے ڈوپلیکیٹ رول نمبر {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},طالب علم کے لئے ڈوپلیکیٹ رول نمبر {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},طالب علم کے لئے ڈوپلیکیٹ رول نمبر {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},طالب علم کے لئے ڈوپلیکیٹ رول نمبر {0}
 DocType: Budget,Action if Annual Budget Exceeded,ایکشن سالانہ بجٹ سے تجاوز تو
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,آرڈر خریداری کے لئے مواد کی درخواست
 DocType: Shopping Cart Settings,Payment Success URL,ادائیگی کی کامیابی کے یو آر ایل
@@ -1742,7 +1772,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} صرف ایک بار ظاہر ہونا چاہیے
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},زیادہ tranfer کرنے کی اجازت نہیں {0} سے {1} خریداری کے آرڈر کے خلاف {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},کے لئے کامیابی روانہ مختص {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,کوئی شے پیک کرنے کے لئے
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,کوئی شے پیک کرنے کے لئے
 DocType: Shipping Rule Condition,From Value,قیمت سے
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,مینوفیکچرنگ مقدار لازمی ہے
 DocType: Employee Loan,Repayment Method,باز ادائیگی کا طریقہ
@@ -1756,6 +1786,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,اسٹاک واجبات
 DocType: Purchase Invoice,Supplier Warehouse,پردایک گودام
 DocType: Opportunity,Contact Mobile No,موبائل سے رابطہ کریں کوئی
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,کمپنی منتخب کریں
 ,Material Requests for which Supplier Quotations are not created,پردایک کوٹیشن پیدا نہیں کر رہے ہیں جس کے لئے مواد کی درخواست
 DocType: Student Group,Set 0 for no limit,کوئی حد 0 سیٹ کریں
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,آپ کی چھٹی کے لئے درخواست دے رہے ہیں جس دن (ے) تعطیلات ہیں. آپ کو چھوڑ کے لئے درخواست دینے کی ضرورت نہیں ہے.
@@ -1765,24 +1796,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,کوٹیشن بنائیں
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,دیگر رپورٹوں
 DocType: Dependent Task,Dependent Task,منحصر ٹاسک
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},پیمائش کی یونٹ کے لئے پہلے سے طے شدہ تبادلوں عنصر قطار میں ہونا چاہیے 1 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},پیمائش کی یونٹ کے لئے پہلے سے طے شدہ تبادلوں عنصر قطار میں ہونا چاہیے 1 {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},قسم کے حکم {0} سے زیادہ نہیں ہو سکتا {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,پیشگی ایکس دنوں کے لئے کی منصوبہ بندی کرنے کی کوشش کریں.
 DocType: HR Settings,Stop Birthday Reminders,سٹاپ سالگرہ تخسمارک
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},کمپنی میں پہلے سے طے شدہ پے رول قابل ادائیگی اکاؤنٹ سیٹ مہربانی {0}
 DocType: SMS Center,Receiver List,وصول کی فہرست
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,تلاش آئٹم
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,تلاش آئٹم
 DocType: Patient Appointment,Referring Physician,طبیعیات کا حوالہ دیتے ہوئے
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,بسم رقم
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,کیش میں خالص تبدیلی
 DocType: Assessment Plan,Grading Scale,گریڈنگ پیمانے
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,پیمائش {0} کے یونٹ تبادلوں فیکٹر ٹیبل میں ایک سے زائد بار میں داخل کر دیا گیا ہے
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,پہلے ہی مکمل
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,پیمائش {0} کے یونٹ تبادلوں فیکٹر ٹیبل میں ایک سے زائد بار میں داخل کر دیا گیا ہے
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,پہلے ہی مکمل
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,ہاتھ میں اسٹاک
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},ادائیگی کی درخواست پہلے سے موجود ہے {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,تاریخ اجراء اشیا کی لاگت
 DocType: Physician,Hospital,ہسپتال
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},مقدار سے زیادہ نہیں ہونا چاہئے {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},مقدار سے زیادہ نہیں ہونا چاہئے {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,گزشتہ مالی سال بند نہیں ہے
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),عمر (دن)
 DocType: Quotation Item,Quotation Item,کوٹیشن آئٹم
@@ -1793,8 +1824,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,پردایک قسم ماسٹر.
 DocType: Purchase Order Item,Supplier Part Number,پردایک حصہ نمبر
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,تبادلے کی شرح 0 یا 1 نہیں ہو سکتا
-DocType: Sales Invoice,Reference Document,حوالہ دستاویز
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} منسوخ یا بند کر دیا ہے
+DocType: Subscription,Reference Document,حوالہ دستاویز
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} منسوخ یا بند کر دیا ہے
 DocType: Accounts Settings,Credit Controller,کریڈٹ کنٹرولر
 DocType: Delivery Note,Vehicle Dispatch Date,گاڑی ڈسپیچ کی تاریخ
 DocType: Healthcare Settings,Default Medical Code Standard,پہلے سے طے شدہ میڈیکل کوڈ سٹینڈرڈ
@@ -1803,6 +1834,7 @@
 DocType: Company,Default Payable Account,پہلے سے طے شدہ قابل ادائیگی اکاؤنٹ
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",اس طرح کے شپنگ کے قوانین، قیمت کی فہرست وغیرہ کے طور پر آن لائن خریداری کی ٹوکری کے لئے ترتیبات
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}٪ بل
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,قیمت کی طرف سے ترتیب دیں ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,محفوظ مقدار
 DocType: Party Account,Party Account,پارٹی کے اکاؤنٹ
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,انسانی وسائل
@@ -1814,13 +1846,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,فراہمی انٹری بنائیں
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,صف {0}: سپلائر کے خلاف ایڈوانس ڈیبٹ ہونا ضروری ہے
 DocType: Company,Default Values,طے شدہ اقدار
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{تعدد} ڈائجسٹ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{تعدد} ڈائجسٹ
 DocType: Expense Claim,Total Amount Reimbursed,کل رقم آفسیٹ
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,یہ اس گاڑی کے خلاف نوشتہ پر مبنی ہے. تفصیلات کے لئے نیچے ٹائم لائن ملاحظہ کریں
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},پردایک خلاف انوائس {0} ء {1}
 DocType: Customer,Default Price List,پہلے سے طے شدہ قیمت کی فہرست
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,اثاثہ تحریک ریکارڈ {0} پیدا
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,آپ مالی سال {0} کو حذف نہیں کر سکتے ہیں. مالی سال {0} گلوبل ترتیبات میں ڈیفالٹ کے طور پر مقرر کیا جاتا ہے
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,ایک ہی نام کے ساتھ گاہک پہلے ہی موجود ہے
 DocType: Journal Entry,Entry Type,اندراج کی قسم
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,اس کا تعین گروپ کے ساتھ منسلک کوئی تشخیص کی منصوبہ بندی
 ,Customer Credit Balance,کسٹمر کے کریڈٹ بیلنس
@@ -1831,7 +1864,7 @@
 DocType: Quotation,Term Details,ٹرم تفصیلات
 DocType: Project,Total Sales Cost (via Sales Order),کل سیلز قیمت (سیلز آرڈر کے ذریعے)
 DocType: Project,Total Sales Cost (via Sales Order),کل سیلز قیمت (سیلز آرڈر کے ذریعے)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,{0} اس طالب علم گروپ کے لیے طالب علموں کو داخلہ سے زیادہ نہیں ہوسکتی.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,{0} اس طالب علم گروپ کے لیے طالب علموں کو داخلہ سے زیادہ نہیں ہوسکتی.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,لیڈ شمار
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,لیڈ شمار
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0}صفر سےبڈا ھونا ڇاھۓ
@@ -1848,9 +1881,11 @@
 DocType: Lab Test,Technician Name,ٹیکنشین کا نام
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,انوائس کی منسوخی پر ادائیگی کا لنک ختم کریں
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},درج کردہ موجودہ Odometer پڑھنا ابتدائی گاڑی Odometer سے زیادہ ہونا چاہئے {0}
+DocType: Restaurant Reservation,No Show,کوئی شو نہیں
 DocType: Shipping Rule Country,Shipping Rule Country,شپنگ حکمرانی ملک
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,چھوڑ دو اور حاضری
 DocType: Maintenance Visit,Partially Completed,جزوی طور پر مکمل
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,اعتدال پسند حساسیت
 DocType: Leave Type,Include holidays within leaves as leaves,پتے کے طور پر پتیوں کے اندر تعطیلات شامل
 DocType: Sales Invoice,Packed Items,پیک اشیا
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,سیریل نمبر کے خلاف دعوی وارنٹی
@@ -1867,13 +1902,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),ادائیگی کی رقم (کمپنی کرنسی)
 DocType: Purchase Invoice,Additional Discount,اضافی رعایت
 DocType: Selling Settings,Selling Settings,ترتیبات فروخت
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,ایکشن کی توثیق کریں
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,آن لائن نیلامیوں
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,مقدار یا تشخیص کی شرح یا دونوں یا تو وضاحت کریں
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,تکمیل
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,ٹوکری میں دیکھیں
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,مارکیٹنگ کے اخراجات
 ,Item Shortage Report,آئٹم کمی رپورٹ
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",وزن \ n براہ مہربانی بھی &quot;وزن UOM&quot; کا ذکر، ذکر کیا جاتا ہے
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",وزن \ n براہ مہربانی بھی &quot;وزن UOM&quot; کا ذکر، ذکر کیا جاتا ہے
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,مواد کی درخواست یہ اسٹاک اندراج کرنے کے لئے استعمال کیا جاتا ہے
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,اگلا ہراس تاریخ نیا اثاثہ کے لئے لازمی ہے
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,ہر بیچ کے لئے الگ الگ کورس مبنی گروپ
@@ -1886,12 +1922,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ہر اسٹاک تحریک کے لئے اکاؤنٹنگ اندراج
 DocType: Leave Allocation,Total Leaves Allocated,کل پتے مختص
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},صف کوئی ضرورت گودام {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,درست مالی سال شروع کریں اور انتھاء داخل کریں
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,درست مالی سال شروع کریں اور انتھاء داخل کریں
 DocType: Employee,Date Of Retirement,ریٹائرمنٹ کے تاریخ
 DocType: Upload Attendance,Get Template,سانچے حاصل
 DocType: Material Request,Transferred,منتقل
 DocType: Vehicle,Doors,دروازے
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext سیٹ اپ مکمل!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext سیٹ اپ مکمل!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,مریض کے رجسٹریشن کے لئے فیس جمع کریں
 DocType: Course Assessment Criteria,Weightage,اہمیت
 DocType: Purchase Invoice,Tax Breakup,ٹیکس بریک اپ
@@ -1910,37 +1946,37 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",اس شے کے مختلف حالتوں ہے، تو یہ فروخت کے احکامات وغیرہ میں منتخب نہیں کیا جا سکتا
 DocType: Lead,Next Contact By,کی طرف سے اگلے رابطہ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},قطار میں آئٹم {0} کے لئے ضروری مقدار {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},قطار میں آئٹم {0} کے لئے ضروری مقدار {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},مقدار شے کے لئے موجود ہے کے طور پر گودام {0} خارج نہیں کیا جا سکتا {1}
 DocType: Quotation,Order Type,آرڈر کی قسم
-DocType: Purchase Invoice,Notification Email Address,نوٹیفکیشن ای میل ایڈریس
 ,Item-wise Sales Register,آئٹم وار سیلز رجسٹر
 DocType: Asset,Gross Purchase Amount,مجموعی خریداری کی رقم
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,کھولنے کے بیلنس
 DocType: Asset,Depreciation Method,ہراس کا طریقہ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,آف لائن
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,آف لائن
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,بنیادی شرح میں شامل اس ٹیکس ہے؟
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,کل ہدف
 DocType: Job Applicant,Applicant for a Job,ایک کام کے لئے درخواست
 DocType: Production Plan Material Request,Production Plan Material Request,پیداوار کی منصوبہ بندی مواد گذارش
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,پیدا کوئی پیداوار کے احکامات
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,پیدا کوئی پیداوار کے احکامات
 DocType: Stock Reconciliation,Reconciliation JSON,مصالحتی JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,بہت زیادہ کالم. رپورٹ برآمد اور ایک سپریڈ شیٹ کی درخواست کا استعمال کرتے ہوئے پرنٹ.
 DocType: Purchase Invoice Item,Batch No,بیچ کوئی
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},کوٹیشن کے لئے درخواست: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,ایک گاہک کی خریداری کے آرڈر کے خلاف ایک سے زیادہ سیلز آرڈر کرنے کی اجازت دیں
 DocType: Student Group Instructor,Student Group Instructor,طالب علم گروپ انسٹرکٹر
 DocType: Student Group Instructor,Student Group Instructor,طالب علم گروپ انسٹرکٹر
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 موبائل نمبر
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,مین
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,مین
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,ویرینٹ
 DocType: Naming Series,Set prefix for numbering series on your transactions,آپ کے لین دین پر سیریز تعداد کے لئے مقرر اپسرگ
 DocType: Employee Attendance Tool,Employees HTML,ملازمین ایچ ٹی ایم ایل
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,پہلے سے طے شدہ BOM ({0}) یہ آئٹم یا اس سانچے کے لئے فعال ہونا ضروری ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,پہلے سے طے شدہ BOM ({0}) یہ آئٹم یا اس سانچے کے لئے فعال ہونا ضروری ہے
 DocType: Employee,Leave Encashed?,Encashed چھوڑ دیں؟
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,میدان سے مواقع لازمی ہے
 DocType: Email Digest,Annual Expenses,سالانہ اخراجات
 DocType: Item,Variants,متغیرات
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,خریداری کے آرڈر بنائیں
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,خریداری کے آرڈر بنائیں
 DocType: SMS Center,Send To,کے لئے بھیج
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},رخصت قسم کافی چھوڑ توازن نہیں ہے {0}
 DocType: Payment Reconciliation Payment,Allocated amount,مختص رقم
@@ -1956,6 +1992,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,طالب علم گروپ طاقت
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,جرنل کے خلاف اندراج {0} کسی بھی بے مثال {1} اندراج نہیں ہے
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,تشخیص
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,ٹریننگ واقعات
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},سیریل کوئی آئٹم کے لئے داخل نقل {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ایک شپنگ حکمرانی کے لئے ایک شرط
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,درج کریں
@@ -1965,7 +2002,7 @@
 DocType: Sales Order,To Deliver and Bill,نجات اور بل میں
 DocType: Student Group,Instructors,انسٹرکٹر
 DocType: GL Entry,Credit Amount in Account Currency,اکاؤنٹ کی کرنسی میں قرضے کی رقم
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} پیش کرنا ضروری ہے
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} پیش کرنا ضروری ہے
 DocType: Authorization Control,Authorization Control,اجازت کنٹرول
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},صف # {0}: گودام مسترد مسترد آئٹم خلاف لازمی ہے {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,ادائیگی
@@ -1984,11 +2021,11 @@
 DocType: Quotation Item,Actual Qty,اصل مقدار
 DocType: Sales Invoice Item,References,حوالہ جات
 DocType: Quality Inspection Reading,Reading 10,10 پڑھنا
-DocType: Hub Settings,Hub Node,حب گھنڈی
+DocType: Hub Category,Hub Node,حب گھنڈی
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,آپ کو ڈپلیکیٹ اشیاء میں داخل ہے. کو بہتر بنانے اور دوبارہ کوشش کریں.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,ایسوسی ایٹ
 DocType: Asset Movement,Asset Movement,ایسیٹ موومنٹ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,نیا ٹوکری
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,نیا ٹوکری
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} آئٹم وجہ سے serialized شے نہیں ہے
 DocType: SMS Center,Create Receiver List,وصول فہرست بنائیں
 DocType: Vehicle,Wheels,پہیے
@@ -2002,15 +2039,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,ٹیلی کمیونیکیشنز کا
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),پیکیج اس کی ترسیل (صرف ڈرافٹ) کا ایک حصہ ہے کہ اشارہ کرتا ہے
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,ادائیگی اندراج
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},شے کے لئے مقدار {0} سے کم ہونا چاہئے {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},شے کے لئے مقدار {0} سے کم ہونا چاہئے {1}
 ,Sales Invoice Trends,فروخت انوائس رجحانات
 DocType: Leave Application,Apply / Approve Leaves,پتے منظور / لگائیں
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,کے لئے
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,کے لئے
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',یا &#39;پچھلے صف کل&#39; &#39;پچھلے صف کی رقم پر انچارج قسم ہے صرف اس صورت میں رجوع کر سکتے ہیں صف
 DocType: Sales Order Item,Delivery Warehouse,ڈلیوری گودام
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,مالیاتی لاگت کے مراکز کا درخت.
 DocType: Serial No,Delivery Document No,ڈلیوری دستاویز
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},کمپنی میں &#39;اثاثہ تلفی پر حاصل / نقصان اکاؤنٹ&#39; مقرر مہربانی {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},کمپنی میں &#39;اثاثہ تلفی پر حاصل / نقصان اکاؤنٹ&#39; مقرر مہربانی {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,خریداری کی رسیدیں سے اشیاء حاصل
 DocType: Serial No,Creation Date,بنانے کی تاریخ
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},{0} شے کی قیمت کی فہرست میں ایک سے زیادہ مرتبہ ظاہر ہوتا ہے {1}
@@ -2021,11 +2058,12 @@
 DocType: Student,Student Mobile Number,طالب علم کے موبائل نمبر
 DocType: Item,Has Variants,مختلف حالتوں ہے
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,جواب اپ ڈیٹ کریں
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},آپ نے پہلے ہی سے اشیاء کو منتخب کیا ہے {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},آپ نے پہلے ہی سے اشیاء کو منتخب کیا ہے {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ماہانہ تقسیم کے نام
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,بیچ ID لازمی ہے
 DocType: Sales Person,Parent Sales Person,والدین فروخت شخص
-DocType: Purchase Invoice,Recurring Invoice,مکرر انوائس
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,کم سے کم
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,پہلے پروگرام کا انتخاب کریں
 DocType: Patient Appointment,Patient Age,مریض عمر
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,منصوبوں کو منظم کرنے
 DocType: Supplier,Supplier of Goods or Services.,سامان یا خدمات کی سپلائر.
@@ -2033,8 +2071,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,پہلے سے طے شدہ رسید کرنے والے اکاؤنٹس استعمال کرنے کے لئے مریض میں مقرر کنسلٹنٹس کے الزامات کے مطابق نہیں ہوتے ہیں.
 DocType: Vehicle Log,Fuel Price,ایندھن کی قیمت
 DocType: Budget,Budget,بجٹ
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,کھولیں مقرر کریں
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,فکسڈ اثاثہ آئٹم ایک غیر اسٹاک شے ہونا ضروری ہے.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,کھولیں مقرر کریں
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,فکسڈ اثاثہ آئٹم ایک غیر اسٹاک شے ہونا ضروری ہے.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",یہ ایک آمدنی یا اخراجات کے اکاؤنٹ نہیں ہے کے طور پر بجٹ کے خلاف {0} تفویض نہیں کیا جا سکتا
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,حاصل کیا
 DocType: Student Admission,Application Form Route,درخواست فارم روٹ
@@ -2048,11 +2086,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,{0} آئٹم سیریل نمبر کے لئے سیٹ اپ نہیں ہے. آئٹم ماسٹر چیک
 DocType: Maintenance Visit,Maintenance Time,بحالی وقت
 ,Amount to Deliver,رقم فراہم کرنے
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},اسی چیز کو کئی بار درج کیا گیا ہے. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ٹرم شروع کرنے کی تاریخ جس کی اصطلاح منسلک ہے کے تعلیمی سال سال شروع تاریخ سے پہلے نہیں ہو سکتا (تعلیمی سال {}). تاریخوں درست کریں اور دوبارہ کوشش کریں براہ مہربانی.
 DocType: Guardian,Guardian Interests,گارڈین دلچسپیاں
 DocType: Naming Series,Current Value,موجودہ قیمت
 DocType: School Settings,Instructor Records to be created by,انسٹریکٹر ریکارڈز کی طرف سے پیدا کی جائے گی
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} بن گیا
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} بن گیا
 DocType: Delivery Note Item,Against Sales Order,سیلز کے خلاف
 ,Serial No Status,سیریل کوئی حیثیت
 DocType: Payment Entry Reference,Outstanding,شاندار
@@ -2062,10 +2101,10 @@
 						must be greater than or equal to {2}",صف {0}: قائم کرنے {1} مدت، اور تاریخ \ کے درمیان فرق کرنے کے لئے یا اس سے زیادہ کے برابر ہونا چاہیے {2}
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,یہ اسٹاک تحریک پر مبنی ہے. تفصیلات کے لئے {0} ملاحظہ کریں
 DocType: Pricing Rule,Selling,فروخت
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},رقم {0} {1} خلاف کٹوتی {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},رقم {0} {1} خلاف کٹوتی {2}
 DocType: Employee,Salary Information,تنخواہ معلومات
 DocType: Sales Person,Name and Employee ID,نام اور ملازم ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,کی وجہ سے تاریخ تاریخ پوسٹنگ سے پہلے نہیں ہو سکتا
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,کی وجہ سے تاریخ تاریخ پوسٹنگ سے پہلے نہیں ہو سکتا
 DocType: Website Item Group,Website Item Group,ویب سائٹ آئٹم گروپ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,ڈیوٹی اور ٹیکس
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,حوالہ کوڈ داخل کریں.
@@ -2091,7 +2130,7 @@
 DocType: Issue,Resolution Details,قرارداد کی تفصیلات
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,تین ہلاک
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,قبولیت کا کلیہ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,مندرجہ بالا جدول میں مواد درخواستیں داخل کریں
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,مندرجہ بالا جدول میں مواد درخواستیں داخل کریں
 DocType: Item Attribute,Attribute Name,نام وصف
 DocType: BOM,Show In Website,ویب سائٹ میں دکھائیں
 DocType: Shopping Cart Settings,Show Quantity in Website,ویب سائٹ میں مقدار دکھائیں
@@ -2100,7 +2139,7 @@
 DocType: Item Reorder,Check in (group),میں چیک کریں (گروپ)
 ,Qty to Order,آرڈر کی مقدار
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked",ذمہ داری یا ایکوئٹی کے تحت اکاؤنٹ سر، منافع / نقصان مقدمہ درج کیا جائے گا جس میں
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,تمام کاموں کی Gantt چارٹ.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,تمام کاموں کی Gantt چارٹ.
 DocType: Opportunity,Mins to First Response,پہلا رسپانس منٹس
 DocType: Pricing Rule,Margin Type,مارجن کی قسم
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} گھنٹے
@@ -2122,35 +2161,35 @@
 DocType: Patient,Surgical History,جراحی تاریخ
 DocType: Employee,Resignation Letter Date,استعفی تاریخ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,قیمتوں کا تعین کے قواعد مزید مقدار کی بنیاد پر فلٹر کر رہے ہیں.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},ملازم کے لئے شامل ہونے کے تاریخ مقرر مہربانی {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},ملازم کے لئے شامل ہونے کے تاریخ مقرر مہربانی {0}
 DocType: Task,Total Billing Amount (via Time Sheet),کل بلنگ کی رقم (وقت شیٹ کے ذریعے)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,گاہک ریونیو
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1})کردارکے لیے 'اخراجات کی منظوری دینے والا' کردار ضروری ہے
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,جوڑی
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,پیداوار کے لئے BOM اور قی کریں
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,پیداوار کے لئے BOM اور قی کریں
 DocType: Asset,Depreciation Schedule,ہراس کا شیڈول
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,فروخت پارٹنر پتے اور روابط
 DocType: Bank Reconciliation Detail,Against Account,کے اکاؤنٹ کے خلاف
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,آدھا دن تاریخ تاریخ سے اور تاریخ کے درمیان ہونا چاہئے
 DocType: Maintenance Schedule Detail,Actual Date,اصل تاریخ
 DocType: Item,Has Batch No,بیچ نہیں ہے
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},سالانہ بلنگ: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},سالانہ بلنگ: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),اشیاء اور خدمات ٹیکس (جی ایس ٹی بھارت)
 DocType: Delivery Note,Excise Page Number,ایکسائز صفحہ نمبر
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory",کمپنی، تاریخ سے اور تاریخ کے لئے لازمی ہے
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,مشاورت سے حاصل کریں
 DocType: Asset,Purchase Date,خریداری کی تاریخ
 DocType: Employee,Personal Details,ذاتی تفصیلات
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},کمپنی میں &#39;اثاثہ ہراس لاگت سینٹر&#39; مقرر مہربانی {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},کمپنی میں &#39;اثاثہ ہراس لاگت سینٹر&#39; مقرر مہربانی {0}
 ,Maintenance Schedules,بحالی شیڈول
 DocType: Task,Actual End Date (via Time Sheet),اصل تاریخ اختتام (وقت شیٹ کے ذریعے)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},رقم {0} {1} خلاف {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},رقم {0} {1} خلاف {2} {3}
 ,Quotation Trends,کوٹیشن رجحانات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},آئٹم گروپ شے کے لئے شے ماسٹر میں ذکر نہیں {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,اکاؤنٹ ڈیبٹ ایک وصولی اکاؤنٹ ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,اکاؤنٹ ڈیبٹ ایک وصولی اکاؤنٹ ہونا ضروری ہے
 DocType: Shipping Rule Condition,Shipping Amount,شپنگ رقم
 DocType: Supplier Scorecard Period,Period Score,مدت کا اسکور
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,صارفین کا اضافہ کریں
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,صارفین کا اضافہ کریں
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,زیر التواء رقم
 DocType: Lab Test Template,Special,خصوصی
 DocType: Purchase Invoice Item,Conversion Factor,تبادلوں فیکٹر
@@ -2158,13 +2197,14 @@
 ,Vehicle Expenses,گاڑیوں کے اخراجات
 DocType: Serial No,Invoice Details,انوائس کی تفصیلات دیکھیں
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},مفید زندگی کے بعد متوقع قدر {0} سے زیادہ یا برابر ہونا ضروری ہے.
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,شروع کرو
+DocType: Hub Category,Hub Category,حب زمرہ
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,گاڑی نمبر
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,بار بار چلنے والی انوائس بند کیا جائے گا جس کی تاریخ
 DocType: Employee Loan,Loan Amount,قرضے کی رقم
 DocType: Program Enrollment,Self-Driving Vehicle,خود ڈرائیونگ وہیکل
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,سپلائر اسکور کارڈ اسٹینڈنگ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},صف {0}: مواد کے بل آئٹم کے لئے نہیں پایا {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},صف {0}: مواد کے بل آئٹم کے لئے نہیں پایا {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,کل مختص پتے {0} کم نہیں ہو سکتا مدت کے لئے پہلے سے ہی منظور پتے {1} سے
 DocType: Journal Entry,Accounts Receivable,وصولی اکاؤنٹس
 ,Supplier-Wise Sales Analytics,سپلائر-حکمت سیلز تجزیات
@@ -2176,7 +2216,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)",والدین کورس (، خالی چھوڑ دیں یہ پیرنٹ کورس کا حصہ نہیں ہے تو)
 DocType: Leave Control Panel,Leave blank if considered for all employee types,تمام ملازم اقسام کے لئے تصور کیا جاتا ہے تو خالی چھوڑ دیں
 DocType: Landed Cost Voucher,Distribute Charges Based On,تقسیم الزامات کی بنیاد پر
-apps/erpnext/erpnext/hooks.py +131,Timesheets,timesheets کو
+apps/erpnext/erpnext/hooks.py +140,Timesheets,timesheets کو
 DocType: HR Settings,HR Settings,HR ترتیبات
 DocType: Salary Slip,net pay info,نیٹ تنخواہ کی معلومات
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,یہ قیمت ڈیفالٹ سیلز قیمت کی قیمت میں اپ ڈیٹ کیا جاتا ہے.
@@ -2187,7 +2227,7 @@
 DocType: Patient,B Positive,بی مثبت
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",صف # {0}: قی، 1 ہونا ضروری شے ایک مقررہ اثاثہ ہے کے طور پر. ایک سے زیادہ مقدار کے لئے علیحدہ صف استعمال کریں.
 DocType: Leave Block List Allow,Leave Block List Allow,بلاک فہرست اجازت دیں چھوڑ دو
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr خالی یا جگہ نہیں ہو سکتا
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr خالی یا جگہ نہیں ہو سکتا
 DocType: Patient Medical Record,Patient Medical Record,مریض میڈیکل ریکارڈ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,غیر گروپ سے گروپ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,کھیل
@@ -2204,9 +2244,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,کلیدی تاریخ {2} کیلئے {0} سے {1} کے تبادلے کی شرح کو تلاش کرنے میں قاصر. دستی طور پر ایک کرنسی ایکسچینج ریکارڈ تشکیل دیں
 DocType: POS Profile,Price List,قیمتوں کی فہرست
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ڈیفالٹ مالی سال ہے. تبدیلی کا اثر لینے کے لئے اپنے براؤزر کو ریفریش کریں.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,اخراجات کے دعووں
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,اخراجات کے دعووں
 DocType: Issue,Support,سپورٹ
 ,BOM Search,Bom تلاش
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",اس گودام میں اسٹاک کی بنیاد پر حب پر &quot;اسٹاک میں&quot; یا &quot;نہیں میں اسٹاک&quot; شائع کریں.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),بند (کل کھولنے)
 DocType: Vehicle,Fuel Type,ایندھن کی قسم
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,کمپنی میں کرنسی کی وضاحت کریں
@@ -2218,16 +2259,16 @@
 DocType: Healthcare Settings,Remind Before,پہلے یاد رکھیں
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM تبادلوں عنصر قطار میں کی ضرورت ہے {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",صف # {0}: حوالہ دستاویز کی قسم سیلز آرڈر میں سے ایک، فروخت انوائس یا جرنل اندراج ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",صف # {0}: حوالہ دستاویز کی قسم سیلز آرڈر میں سے ایک، فروخت انوائس یا جرنل اندراج ہونا ضروری ہے
 DocType: Salary Component,Deduction,کٹوتی
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,صف {0}: وقت سے اور وقت کے لئے لازمی ہے.
 DocType: Stock Reconciliation Item,Amount Difference,رقم فرق
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},شے کی قیمت کے لئے شامل {0} قیمت کی فہرست میں {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},شے کی قیمت کے لئے شامل {0} قیمت کی فہرست میں {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,اس کی فروخت کے شخص کے ملازم کی شناخت درج کریں
 DocType: Territory,Classification of Customers by region,خطے کی طرف سے صارفین کی درجہ بندی
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,فرق رقم صفر ہونا ضروری ہے
 DocType: Project,Gross Margin,مجموعی مارجن
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,پہلی پیداوار آئٹم کوڈ داخل کریں
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,پہلی پیداوار آئٹم کوڈ داخل کریں
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,محسوب بینک کا گوشوارہ توازن
 DocType: Normal Test Template,Normal Test Template,عام ٹیسٹ سانچہ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,معذور صارف
@@ -2237,21 +2278,22 @@
 DocType: Salary Slip,Total Deduction,کل کٹوتی
 ,Production Analytics,پیداوار کے تجزیات
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,یہ اس مریض کے خلاف ٹرانزیکشنز پر مبنی ہے. تفصیلات کے لئے ذیل میں ٹائم لائن ملاحظہ کریں
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,لاگت اپ ڈیٹ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,لاگت اپ ڈیٹ
 DocType: Employee,Date of Birth,پیدائش کی تاریخ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,آئٹم {0} پہلے ہی واپس کر دیا گیا ہے
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** مالی سال ** ایک مالی سال کی نمائندگی کرتا ہے. تمام اکاؤنٹنگ اندراجات اور دیگر اہم لین دین *** مالی سال کے ساقھ ٹریک کر رہے ہیں.
 DocType: Opportunity,Customer / Lead Address,کسٹمر / لیڈ ایڈریس
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,سپلائر اسکور کارڈ سیٹ اپ
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},انتباہ: منسلکہ پر غلط SSL سرٹیفکیٹ {0}
-DocType: Student Admission,Eligibility,اہلیت
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,تشخیص منصوبہ نام
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},انتباہ: منسلکہ پر غلط SSL سرٹیفکیٹ {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads",لیڈز آپ کو ملتا کاروبار، آپ لیڈز کے طور پر آپ کے تمام رابطوں اور مزید شامل کی مدد
 DocType: Production Order Operation,Actual Operation Time,اصل آپریشن کے وقت
 DocType: Authorization Rule,Applicable To (User),لاگو (صارف)
 DocType: Purchase Taxes and Charges,Deduct,منہا
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,کام کی تفصیل
 DocType: Student Applicant,Applied,اطلاقی
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,دوبارہ کھولنے
 DocType: Sales Invoice Item,Qty as per Stock UOM,مقدار اسٹاک UOM کے مطابق
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 نام
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",سوائے خصوصی کردار &quot;-&quot; &quot;.&quot;، &quot;#&quot;، اور &quot;/&quot; سیریز کا نام میں اس کی اجازت نہیں
@@ -2263,7 +2305,7 @@
 DocType: Request for Quotation,Manufacturing Manager,مینوفیکچرنگ کے مینیجر
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},سیریل نمبر {0} تک وارنٹی کے تحت ہے {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,پیکجوں کے میں تقسیم ترسیل کے نوٹ.
-apps/erpnext/erpnext/hooks.py +98,Shipments,ترسیل
+apps/erpnext/erpnext/hooks.py +107,Shipments,ترسیل
 DocType: Payment Entry,Total Allocated Amount (Company Currency),کل مختص رقم (کمپنی کرنسی)
 DocType: Purchase Order Item,To be delivered to customer,گاہک کے حوالے کیا جائے گا
 DocType: BOM,Scrap Material Cost,سکریپ مواد کی لاگت
@@ -2286,8 +2328,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,آئٹم مختلف ترتیبات
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,کمپنی کو منتخب کریں ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,تمام محکموں کے لئے تصور کیا جاتا ہے تو خالی چھوڑ دیں
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",ملازمت کی اقسام (مستقل، کنٹریکٹ، انٹرن وغیرہ).
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} شے کے لئے لازمی ہے {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).",ملازمت کی اقسام (مستقل، کنٹریکٹ، انٹرن وغیرہ).
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} شے کے لئے لازمی ہے {1}
 DocType: Process Payroll,Fortnightly,پندرہ روزہ
 DocType: Currency Exchange,From Currency,کرنسی سے
 DocType: Vital Signs,Weight (In Kilogram),وزن (کلوگرام)
@@ -2312,7 +2354,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,شیڈول حاصل کرنے کے لئے پیدا شیڈول &#39;پر کلک کریں براہ مہربانی
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,مندرجہ ذیل نظام الاوقات حذف کرتے وقت غلطیاں تھے:
 DocType: Bin,Ordered Quantity,کا حکم دیا مقدار
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",مثلا &quot;عمارت سازوں کے لئے، فورم کے اوزار کی تعمیر&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",مثلا &quot;عمارت سازوں کے لئے، فورم کے اوزار کی تعمیر&quot;
 DocType: Grading Scale,Grading Scale Intervals,گریڈنگ پیمانے وقفے
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: اکاؤنٹنگ انٹری {2} کے لئے صرف کرنسی میں بنایا جا سکتا ہے: {3}
 DocType: Production Order,In Process,اس عمل میں
@@ -2336,11 +2378,10 @@
 DocType: Purchase Invoice,With Payment of Tax,ٹیکس کی ادائیگی کے ساتھ
 DocType: Expense Claim Detail,Expense Claim Detail,اخراجات دعوی تفصیل
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,سپلائر کے لئے تین پرت
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,درست اکاؤنٹ منتخب کریں
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,درست اکاؤنٹ منتخب کریں
 DocType: Item,Weight UOM,وزن UOM
 DocType: Salary Structure Employee,Salary Structure Employee,تنخواہ ساخت ملازم
 DocType: Patient,Blood Group,خون کا گروپ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,زیر غور
 DocType: Course,Course Name,کورس کا نام
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ایک مخصوص ملازم کی چھٹی ایپلی کیشنز منظور کر سکتے ہیں جو صارفین
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,آفس سازوسامان
@@ -2359,7 +2400,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,قیمت کی فہرست مقرر نہیں ہے تو قیمتیں نہیں دکھایا جائے گا
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,یہ شپنگ حکمرانی کے لئے ایک ملک کی وضاحت یا دنیا بھر میں شپنگ براہ مہربانی چیک کریں
 DocType: Stock Entry,Total Incoming Value,کل موصولہ ویلیو
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,ڈیبٹ کرنے کی ضرورت ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,ڈیبٹ کرنے کی ضرورت ہے
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",timesheets کو آپ کی ٹیم کی طرف سے کیا سرگرمیوں کے لئے وقت، لاگت اور بلنگ کا ٹریک رکھنے میں مدد
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,قیمت خرید کی فہرست
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,سپلائر سکور کارڈ متغیر کے سانچے.
@@ -2369,7 +2410,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,ادائیگی مصالحتی
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,انچارج شخص کا نام منتخب کریں
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,ٹیکنالوجی
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},کل غیر مقفل: {0}
+DocType: Hub Settings,Unregister from Hub,حب سے اندراج
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},کل غیر مقفل: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM ویب سائٹ آپریشن
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,خط پیش کرتے ہیں
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,مواد درخواستوں (یمآرپی) اور پیداوار کے احکامات حاصل کریں.
@@ -2381,7 +2423,9 @@
 DocType: Physician Schedule Time Slot,To Time,وقت
 DocType: Authorization Rule,Approving Role (above authorized value),(مجاز کی قیمت سے اوپر) کردار منظوری
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,اکاؤنٹ کریڈٹ ایک قابل ادائیگی اکاؤنٹ ہونا ضروری ہے
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM تکرار: {0} کے والدین یا بچے نہیں ہو سکتا {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,برائے مہربانی طالب علم داخلہ منتخب کریں جو ادا طلبہ کے درخواست دہندگان کے لئے لازمی ہے
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM تکرار: {0} کے والدین یا بچے نہیں ہو سکتا {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,قیمتوں کا تعین شائع کرنے کے لئے برائے مہربانی قیمت کی فہرست منتخب کریں
 DocType: Production Order Operation,Completed Qty,مکمل مقدار
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",{0}، صرف ڈیبٹ اکاؤنٹس دوسرے کریڈٹ داخلے کے خلاف منسلک کیا جا سکتا ہے
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,قیمت کی فہرست {0} غیر فعال ہے
@@ -2394,38 +2438,39 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} شے کے لئے کی ضرورت ہے سیریل نمبر {1}. آپ کی فراہم کردہ {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,موجودہ تشخیص کی شرح
 DocType: Item,Customer Item Codes,کسٹمر شے کوڈز
+DocType: Training Event,Advance,ایڈوانس
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,دوبارہ دوبارہ بنانے کے لئے.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,ایکسچینج گین / نقصان
 DocType: Opportunity,Lost Reason,کھو وجہ
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,نیا ایڈریس
 DocType: Quality Inspection,Sample Size,نمونہ سائز
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,رسید دستاویز درج کریں
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,تمام اشیاء پہلے ہی انوائس کیا گیا ہے
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;کیس نمبر سے&#39; درست وضاحت کریں
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',&#39;کیس نمبر سے&#39; درست وضاحت کریں
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,مزید لاگت کے مراکز گروپوں کے تحت بنایا جا سکتا ہے لیکن اندراجات غیر گروپوں کے خلاف بنایا جا سکتا ہے
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,صارفین اور اجازت
 DocType: Vehicle Log,VLOG.,vlog کے.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},پیداوار آرڈینز بنائے گئے: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},پیداوار آرڈینز بنائے گئے: {0}
 DocType: Branch,Branch,برانچ
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,طباعت اور برانڈنگ
 DocType: Company,Total Monthly Sales,کل ماہانہ فروخت
 DocType: Bin,Actual Quantity,اصل مقدار
 DocType: Shipping Rule,example: Next Day Shipping,مثال: اگلے دن شپنگ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,نہیں ملا سیریل کوئی {0}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},سبسکرائب کریں {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},سبسکرائب کریں {0}
 DocType: Fee Schedule Program,Fee Schedule Program,فیس شیڈول پروگرام
 DocType: Fee Schedule Program,Student Batch,Student کی بیچ
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,* ٹیب ویزا سگنلوں سے منتخب کریں جہاں علامات = &#39;{0}&#39; کے نشانات__یٹیٹ کی طرف سے ترتیب کی حد 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,طالب علم بنائیں
 DocType: Supplier Scorecard Scoring Standing,Min Grade,کم گریڈ
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},آپ کو منصوبے پر تعاون کرنے کیلئے مدعو کیا گیا ہے: {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},آپ کو منصوبے پر تعاون کرنے کیلئے مدعو کیا گیا ہے: {0}
 DocType: Leave Block List Date,Block Date,بلاک تاریخ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},doctype {0} میں اپنی مرضی کے فیلڈ سبسکرپشن کی شناخت شامل کریں
 DocType: Purchase Receipt,Supplier Delivery Note,سپلائر ڈلیوری نوٹ
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,اب لگائیں
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,اب لگائیں
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},اصل مقدار {0} / انتظار قی {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},اصل مقدار {0} / انتظار قی {1}
 DocType: Purchase Invoice,E-commerce GSTIN,ای کامرس GSTIN
 DocType: Sales Order,Not Delivered,نجات نہیں
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,متوقع تاریخ ٹرانزیکشن کی تاریخ سے پہلے نہیں ہوسکتی ہے
 ,Bank Clearance Summary,بینک کلیئرنس خلاصہ
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",بنائیں اور، یومیہ، ہفتہ وار اور ماہانہ ای میل ڈائجسٹ کا انتظام.
 DocType: Appraisal Goal,Appraisal Goal,تشخیص گول
@@ -2433,12 +2478,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,عمارات
 DocType: Fee Schedule,Fee Structure,فیس ڈھانچہ
 DocType: Timesheet Detail,Costing Amount,لاگت رقم
-DocType: Student Admission,Application Fee,درخواست کی فیس
+DocType: Student Admission Program,Application Fee,درخواست کی فیس
 DocType: Process Payroll,Submit Salary Slip,تنخواہ پرچی جمع کرائیں
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,آئٹم {0} ہے {1} فیصد Maxiumm ڈسکاؤنٹ
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,آئٹم {0} ہے {1} فیصد Maxiumm ڈسکاؤنٹ
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,بلک میں درآمد
 DocType: Sales Partner,Address & Contacts,ایڈریس اور رابطے
 DocType: SMS Log,Sender Name,مرسل کے نام
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,معیار کی طرف سے ترتیب دیں
 DocType: POS Profile,[Select],[چونے]
 DocType: Vital Signs,Blood Pressure (diastolic),بلڈ پریشر (ڈائاسولک)
 DocType: SMS Log,Sent To,کو بھیجا
@@ -2446,7 +2492,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,سافٹ ویئر
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,اگلی تاریخ سے رابطہ ماضی میں نہیں ہو سکتا
 DocType: Company,For Reference Only.,صرف ریفرنس کے لئے.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,بیچ منتخب نہیں
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,بیچ منتخب نہیں
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},غلط {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,حوالہ انو
@@ -2462,15 +2508,15 @@
 DocType: Normal Test Items,Require Result Value,ضرورت کے نتائج کی ضرورت ہے
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,کیس نمبر 0 نہیں ہو سکتا
 DocType: Item,Show a slideshow at the top of the page,صفحے کے سب سے اوپر ایک سلائڈ شو دکھانے کے
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,سٹورز
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,سٹورز
 DocType: Project Type,Projects Manager,منصوبوں کے مینیجر
 DocType: Serial No,Delivery Time,ڈیلیوری کا وقت
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,کی بنیاد پر خستہ
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,اپیل منسوخ کردی گئی
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,اپیل منسوخ کردی گئی
 DocType: Item,End of Life,زندگی کے اختتام
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,سفر
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,ملازم {0} کے لئے مل دی گئی تاریخوں کے لئے کوئی فعال یا ڈیفالٹ تنخواہ کی ساخت
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,سفر
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,ملازم {0} کے لئے مل دی گئی تاریخوں کے لئے کوئی فعال یا ڈیفالٹ تنخواہ کی ساخت
 DocType: Leave Block List,Allow Users,صارفین کو اجازت دے
 DocType: Purchase Order,Customer Mobile No,کسٹمر موبائل نہیں
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,مکرر
@@ -2479,12 +2525,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,اپ ڈیٹ لاگت
 DocType: Item Reorder,Item Reorder,آئٹم ترتیب
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,دکھائیں تنخواہ کی پرچی
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,منتقلی مواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,منتقلی مواد
 DocType: Fees,Send Payment Request,ادائیگی کی درخواست بھیجیں
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",آپریشن، آپریٹنگ لاگت کی وضاحت کریں اور اپنے آپریشن کی کوئی ایک منفرد آپریشن دے.
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,یہ دستاویز کی طرف سے حد سے زیادہ ہے {0} {1} شے کے لئے {4}. آپ کر رہے ہیں ایک اور {3} اسی کے خلاف {2}؟
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,کو بچانے کے بعد بار بار چلنے والی مقرر کریں
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,تبدیلی منتخب رقم اکاؤنٹ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,تبدیلی منتخب رقم اکاؤنٹ
 DocType: Purchase Invoice,Price List Currency,قیمت کی فہرست کرنسی
 DocType: Naming Series,User must always select,صارف نے ہمیشہ منتخب کرنا ضروری ہے
 DocType: Stock Settings,Allow Negative Stock,منفی اسٹاک کی اجازت دیں
@@ -2504,7 +2550,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,ملازم
 DocType: Sample Collection,Collected Time,جمع کردہ وقت
 DocType: Company,Sales Monthly History,فروخت ماہانہ تاریخ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,بیچ منتخب
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,بیچ منتخب
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} کو مکمل طور پر بل کیا جاتا ہے
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,ضروری نشانیاں
 DocType: Training Event,End Time,آخر وقت
@@ -2512,6 +2558,7 @@
 DocType: Payment Entry,Payment Deductions or Loss,ادائیگی کٹوتیوں یا گمشدگی
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,سیلز یا خریداری کے لئے معیاری معاہدہ شرائط.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,واؤچر کی طرف سے گروپ
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,کیا آپ واقعی اس مقررہ کو منسوخ کرنا چاہتے ہیں؟
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,فروخت کی پائپ لائن
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},تنخواہ کے اجزاء میں ڈیفالٹ اکاؤنٹ سیٹ مہربانی {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,مطلوب پر
@@ -2519,8 +2566,9 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},اکاؤنٹ {0} کمپنی {1} اکاؤنٹ سے موڈ میں نہیں ملتا ہے: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},شے کے لئے موجود نہیں ہے واضع BOM {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,بحالی کے شیڈول {0} اس سیلز آرڈر منسوخ کرنے سے پہلے منسوخ کر دیا جائے ضروری ہے
+DocType: POS Profile,Applicable for Users,صارفین کے لئے قابل اطلاق
 DocType: Notification Control,Expense Claim Approved,اخراجات کلیم منظور
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,ملازم کی تنخواہ کی پرچی {0} نے پہلے ہی اس کی مدت کے لئے پیدا
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,ملازم کی تنخواہ کی پرچی {0} نے پہلے ہی اس کی مدت کے لئے پیدا
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,دواسازی
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,خریدی اشیاء کی لاگت
 DocType: Selling Settings,Sales Order Required,سیلز آرڈر کی ضرورت ہے
@@ -2545,6 +2593,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,ادارہ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,ادارہ
 DocType: BOM Update Tool,BOM Update Tool,BOM اپ ڈیٹ کا آلہ
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company",پارٹی کا اکاؤنٹ متعین نہیں ہے، براہ مہربانی کمپنی میں ڈیفالٹ پارٹی کا اکاؤنٹ مقرر کریں
 DocType: SG Creation Tool Course,Student Group Name,طالب علم گروپ کا نام
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,فیس تخلیق
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,تم واقعی میں اس کمپنی کے لئے تمام لین دین کو حذف کرنا چاہتے براہ کرم یقینی بنائیں. یہ ہے کے طور پر آپ ماسٹر ڈیٹا رہیں گے. اس کارروائی کو رد نہیں کیا جا سکتا.
@@ -2553,29 +2602,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) منصوبہ بندی quanitity سے زیادہ نہیں ہو سکتا ({2}) پیداوار میں آرڈر {3}
 DocType: Shipping Rule,Shipping Rule Label,شپنگ حکمرانی لیبل
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,صارف فورم
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,خام مال خالی نہیں ہو سکتا.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.",اسٹاک کو اپ ڈیٹ نہیں کیا جا سکا، انوائس ڈراپ شپنگ آئٹم پر مشتمل ہے.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,خام مال خالی نہیں ہو سکتا.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.",اسٹاک کو اپ ڈیٹ نہیں کیا جا سکا، انوائس ڈراپ شپنگ آئٹم پر مشتمل ہے.
 DocType: Lab Test Sample,Lab Test Sample,لیب ٹیسٹنگ نمونہ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,فوری جرنل اندراج
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM کسی بھی شے agianst ذکر اگر آپ کی شرح کو تبدیل نہیں کر سکتے ہیں
+DocType: Restaurant,Invoice Series Prefix,انوائس سیریل پریفکس
 DocType: Employee,Previous Work Experience,گزشتہ کام کا تجربہ
 DocType: Stock Entry,For Quantity,مقدار کے لئے
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},صف میں آئٹم {0} کے لئے منصوبہ بندی کی مقدار درج کریں {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},صف میں آئٹم {0} کے لئے منصوبہ بندی کی مقدار درج کریں {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} جمع نہیں ہے
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,اشیاء کے لئے درخواست.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,علیحدہ پروڈکشن آرڈر ہر ایک کو ختم اچھی شے کے لئے پیدا کیا جائے گا.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} واپسی دستاویز میں منفی ہونا ضروری ہے
 ,Minutes to First Response for Issues,مسائل کے لئے پہلا رسپانس منٹ
 DocType: Purchase Invoice,Terms and Conditions1,شرائط و Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,انسٹی ٹیوٹ کے نام جس کے لئے آپ کو اس نظام قائم کر رہے ہیں.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,انسٹی ٹیوٹ کے نام جس کے لئے آپ کو اس نظام قائم کر رہے ہیں.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",اس تاریخ تک منجمد اکاؤنٹنگ اندراج، کوئی / کرتے ذیل کے متعین کردہ کردار سوائے اندراج میں ترمیم کرسکتے ہیں.
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,بحالی کے شیڈول پیدا کرنے سے پہلے دستاویز کو بچانے کے کریں
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,تمام بی ایمز میں تازہ ترین قیمت اپ ڈیٹ
 DocType: Fee Schedule,Successful,کامیاب
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,منصوبے کی حیثیت
 DocType: UOM,Check this to disallow fractions. (for Nos),کسور کو رد کرنا اس کی جانچ پڑتال. (نمبر کے لئے)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,مندرجہ ذیل پیداوار کے احکامات کو پیدا کیا گیا تھا:
-DocType: Student Admission,Naming Series (for Student Applicant),نام دینے سیریز (طالب علم کی درخواست گزار کے لئے)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,مندرجہ ذیل پیداوار کے احکامات کو پیدا کیا گیا تھا:
+DocType: Student Admission Program,Naming Series (for Student Applicant),نام دینے سیریز (طالب علم کی درخواست گزار کے لئے)
 DocType: Delivery Note,Transporter Name,ٹرانسپورٹر نام
 DocType: Authorization Rule,Authorized Value,مجاز ویلیو
 DocType: BOM,Show Operations,آپریشنز دکھائیں
@@ -2599,7 +2649,7 @@
 ,Employees working on a holiday,چھٹی پر کام کرنے والے ملازمین
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,مارک موجودہ
 DocType: Project,% Complete Method,٪ مکمل طریقہ
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,منشیات
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,منشیات
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},بحالی کے آغاز کی تاریخ سیریل نمبر کے لئے ترسیل کی تاریخ سے پہلے نہیں ہو سکتا {0}
 DocType: Production Order,Actual End Date,اصل تاریخ اختتام
 DocType: BOM,Operating Cost (Company Currency),آپریٹنگ لاگت (کمپنی کرنسی)
@@ -2617,13 +2667,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,صارف منظوری حکمرانی کے لئے لاگو ہوتا ہے صارف کے طور پر ہی نہیں ہو سکتا
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),بنیادی شرح (اسٹاک UOM کے مطابق)
 DocType: SMS Log,No of Requested SMS,درخواست ایس ایم ایس کی کوئی
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,بغیر تنخواہ چھٹی منظور شدہ رخصت کی درخواست ریکارڈ کے ساتھ میل نہیں کھاتا
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,بغیر تنخواہ چھٹی منظور شدہ رخصت کی درخواست ریکارڈ کے ساتھ میل نہیں کھاتا
 DocType: Campaign,Campaign-.####,مہم -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,اگلے مراحل
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,بہترین ممکنہ شرح پر بیان کردہ اشیاء فراہم مہربانی
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,انوائس بنائیں
 DocType: Selling Settings,Auto close Opportunity after 15 days,15 دنوں کے بعد آٹو بند مواقع
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} کے سکور کارڈ کارڈ کے سبب {0} کے لئے خریداری کے حکم کی اجازت نہیں ہے.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} کے سکور کارڈ کارڈ کے سبب {0} کے لئے خریداری کے حکم کی اجازت نہیں ہے.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,اختتام سال
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,عمومی quot / لیڈ٪
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,عمومی quot / لیڈ٪
@@ -2660,7 +2710,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.",تمام خریداری لین دین پر لاگو کیا جا سکتا ہے کہ معیاری ٹیکس سانچے. اس سانچے وغیرہ #### آپ سب ** اشیا کے لئے معیاری ٹیکس کی شرح ہو جائے گا یہاں وضاحت ٹیکس کی شرح یاد رکھیں &quot;ہینڈلنگ&quot;، ٹیکس سر اور &quot;شپنگ&quot;، &quot;انشورنس&quot; کی طرح بھی دیگر اخراجات کے سروں کی فہرست پر مشتمل کر سکتے ہیں * *. مختلف شرح ہے *** *** کہ اشیاء موجود ہیں تو، وہ ** آئٹم ٹیکس میں شامل ہونا ضروری ہے *** *** آئٹم ماسٹر میں میز. #### کالم کی وضاحت 1. حساب قسم: - یہ (کہ بنیادی رقم کی رقم ہے) *** نیٹ کل *** پر ہو سکتا ہے. - ** پچھلے صف کل / رقم ** پر (مجموعی ٹیکس یا الزامات کے لئے). اگر آپ اس اختیار کا انتخاب کرتے ہیں، ٹیکس کی رقم یا کل (ٹیکس ٹیبل میں) پچھلے صف کے ایک فی صد کے طور پر لاگو کیا جائے گا. - *** اصل (بیان). 2. اکاؤنٹ سربراہ: اس ٹیکس 3. لاگت مرکز بک کیا جائے گا جس کے تحت اکاؤنٹ لیجر: ٹیکس / انچارج (شپنگ کی طرح) ایک آمدنی ہے یا خرچ تو یہ ایک لاگت مرکز کے خلاف مقدمہ درج کیا جا کرنے کی ضرورت ہے. 4. تفصیل: ٹیکس کی تفصیل (کہ انوائس / واوین میں پرنٹ کیا جائے گا). 5. شرح: ٹیکس کی شرح. 6. رقم: ٹیکس کی رقم. 7. کل: اس نقطہ پر مجموعی کل. 8. صف درج کریں: کی بنیاد پر تو &quot;پچھلا صف کل&quot; آپ کو اس کے حساب کے لئے ایک بنیاد کے (پہلے سے مقررشدہ پچھلے صف ہے) کے طور پر لیا جائے گا جس میں صفیں منتخب کر سکتے ہیں. 9. کے لئے ٹیکس یا انچارج پر غور کریں: ٹیکس / انچارج تشخیص کے لئے ہے (کل کی ایک حصہ) یا صرف (شے کی قیمت شامل نہیں ہے) کل کے لئے یا دونوں کے لئے ہے اس سیکشن میں آپ وضاحت کر سکتے ہیں. 10. کریں یا منہا: آپ کو شامل یا ٹیکس کی کٹوتی کے لئے چاہتے ہیں.
 DocType: Homepage,Homepage,مرکزی صفحہ
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,طبیعیات کا انتخاب کریں ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',ٹیب کنسلٹنگ کی انوائس = &#39;{0}&#39; کو اپ ڈیٹ کریں جہاں نام = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Recd مقدار
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},فیس ریکارڈز کی تشکیل - {0}
 DocType: Asset Category Account,Asset Category Account,ایسیٹ زمرہ اکاؤنٹ
@@ -2672,7 +2721,7 @@
 DocType: Asset,Manual,دستی
 DocType: Salary Component Account,Salary Component Account,تنخواہ اجزاء اکاؤنٹ
 DocType: Global Defaults,Hide Currency Symbol,کرنسی کی علامت چھپائیں
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card",مثال کے طور پر بینک، کیش، کریڈٹ کارڈ
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card",مثال کے طور پر بینک، کیش، کریڈٹ کارڈ
 DocType: Lead Source,Source Name,ماخذ نام
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""",بالغ میں عام آرام دہ بلڈ پریشر تقریبا 120 ملی میٹر ہیزیسولول ہے، اور 80 ملی میٹر ایچ جی ڈاسکولک، مختصر &quot;120/80 ملی میٹر&quot;
 DocType: Journal Entry,Credit Note,کریڈٹ نوٹ
@@ -2691,16 +2740,16 @@
 DocType: Patient,Occupation,کاروبار
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,صف {0}: شروع کرنے کی تاریخ تاریخ اختتام سے پہلے ہونا ضروری ہے
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),کل (مقدار)
-DocType: Sales Invoice,This Document,یہ دستاویز
 DocType: Installation Note Item,Installed Qty,نصب مقدار
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,اس میں کچھ غلط ای میل ایڈریسز کی وجہ سے ہوسکتا ہے
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,آپ نے مزید کہا
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,تربیت کا نتیجہ
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,تربیت کا نتیجہ
 DocType: Purchase Invoice,Is Paid,ادا کیا جاتا ہے
 DocType: Salary Structure,Total Earning,کل کمائی
 DocType: Purchase Receipt,Time at which materials were received,مواد موصول ہوئیں جس میں وقت
 DocType: Stock Ledger Entry,Outgoing Rate,سبکدوش ہونے والے کی شرح
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,تنظیم شاخ ماسٹر.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,تنظیم شاخ ماسٹر.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,یا
 DocType: Sales Order,Billing Status,بلنگ کی حیثیت
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ایک مسئلہ کی اطلاع دیں
@@ -2715,8 +2764,9 @@
 DocType: Notification Control,Sales Order Message,سیلز آرڈر پیغام
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",وغیرہ کمپنی، کرنسی، رواں مالی سال کی طرح پہلے سے طے شدہ اقدار
 DocType: Payment Entry,Payment Type,ادائیگی کی قسم
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,آئٹم کے لئے ایک بیچ براہ مہربانی منتخب کریں {0}. اس ضرورت کو پورا کرتا ہے کہ ایک بیچ کو تلاش کرنے سے قاصر ہے
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,آئٹم کے لئے ایک بیچ براہ مہربانی منتخب کریں {0}. اس ضرورت کو پورا کرتا ہے کہ ایک بیچ کو تلاش کرنے سے قاصر ہے
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,آئٹم کے لئے ایک بیچ براہ مہربانی منتخب کریں {0}. اس ضرورت کو پورا کرتا ہے کہ ایک بیچ کو تلاش کرنے سے قاصر ہے
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,آئٹم کے لئے ایک بیچ براہ مہربانی منتخب کریں {0}. اس ضرورت کو پورا کرتا ہے کہ ایک بیچ کو تلاش کرنے سے قاصر ہے
+DocType: Hub Category,Parent Category,والدین کی قسم
 DocType: Process Payroll,Select Employees,منتخب ملازمین
 DocType: Opportunity,Potential Sales Deal,ممکنہ فروخت ڈیل
 DocType: Complaint,Complaints,شکایات
@@ -2754,7 +2804,7 @@
 DocType: Bin,Reserved Quantity,محفوظ مقدار
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,درست ای میل ایڈریس درج کریں
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,درست ای میل ایڈریس درج کریں
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,ٹوکری میں ایک آئٹم منتخب کریں
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,ٹوکری میں ایک آئٹم منتخب کریں
 DocType: Landed Cost Voucher,Purchase Receipt Items,خریداری کی رسید اشیا
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,تخصیص فارم
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,بقایا
@@ -2764,15 +2814,15 @@
 DocType: Payment Request,Amount in customer's currency,کسٹمر کی کرنسی میں رقم
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,ڈلیوری
 DocType: Stock Reconciliation Item,Current Qty,موجودہ مقدار
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,سپلائر شامل کریں
+DocType: Restaurant Menu,Restaurant Menu,ریسٹورانٹ مینو
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,پچھلا
 DocType: Appraisal Goal,Key Responsibility Area,کلیدی ذمہ داری کے علاقے
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",طالب علم بیچوں آپ کے طالب علموں کے لئے حاضری، جائزوں اور فیس کو ٹریک میں مدد
 DocType: Payment Entry,Total Allocated Amount,کل مختص رقم
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,ہمیشہ کی انوینٹری کے لئے پہلے سے طے شدہ انوینٹری اکاؤنٹ
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,ہمیشہ کی انوینٹری کے لئے پہلے سے طے شدہ انوینٹری اکاؤنٹ
 DocType: Item Reorder,Material Request Type,مواد درخواست کی قسم
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},سے {0} کو تنخواہوں کے لئے Accural جرنل اندراج {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save",لئے LocalStorage بھرا ہوا ہے، نہیں بچا تھا
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save",لئے LocalStorage بھرا ہوا ہے، نہیں بچا تھا
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,صف {0}: UOM تبادلوں فیکٹر لازمی ہے
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,کمرہ کی صلاحیت
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,ممبران
@@ -2811,16 +2861,18 @@
 DocType: Project,Task Completion,ٹاسک کی تکمیل
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,نہیں اسٹاک میں
 DocType: Appraisal,HR User,HR صارف
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS؟
 DocType: Purchase Invoice,Taxes and Charges Deducted,ٹیکسز اور الزامات کٹوتی
-apps/erpnext/erpnext/hooks.py +129,Issues,مسائل
+apps/erpnext/erpnext/hooks.py +138,Issues,مسائل
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},سٹیٹس سے ایک ہونا ضروری {0}
 DocType: Sales Invoice,Debit To,ڈیبٹ
+DocType: Restaurant Menu Item,Restaurant Menu Item,ریسٹورانٹ مینو آئٹم
 DocType: Delivery Note,Required only for sample item.,صرف نمونے شے کے لئے کی ضرورت ہے.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ٹرانزیکشن کے بعد اصل مقدار
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},کوئی تنخواہ کی پرچی کے درمیان پایا {0} اور {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},کوئی تنخواہ کی پرچی کے درمیان پایا {0} اور {1}
 ,Pending SO Items For Purchase Request,خریداری کی درخواست کے لئے بہت اشیا زیر التواء
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,طالب علم داخلہ
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,ترک ھو گیا ھے{0} {1}
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,طالب علم داخلہ
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,ترک ھو گیا ھے{0} {1}
 DocType: Supplier,Billing Currency,بلنگ کی کرنسی
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,اضافی بڑا
@@ -2843,6 +2895,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,ضرورت دوروں کا کوئی ذکر کریں
 DocType: Stock Settings,Default Valuation Method,پہلے سے طے شدہ تشخیص کا طریقہ
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,فیس
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,اپ ڈیٹ جاری ہے. یہ تھوڑی دیر لگتی ہے.
 DocType: Vehicle Log,Fuel Qty,ایندھن کی مقدار
 DocType: Production Order Operation,Planned Start Time,منصوبہ بندی کے آغاز کا وقت
 DocType: Course,Assessment,اسسمنٹ
@@ -2858,7 +2911,7 @@
 DocType: Price List,Price List Master,قیمت کی فہرست ماسٹر
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,آپ کی مقرر کردہ اور اہداف کی نگرانی کر سکتے ہیں تاکہ تمام سیلز معاملات سے زیادہ ** سیلز افراد ** خلاف ٹیگ کیا جا سکتا.
 ,S.O. No.,تو نمبر
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},لیڈ سے گاہک بنانے کے براہ مہربانی {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},لیڈ سے گاہک بنانے کے براہ مہربانی {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,مریض کو منتخب کریں
 DocType: Price List,Applicable for Countries,ممالک کے لئے قابل اطلاق
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,پیرامیٹر کا نام
@@ -2890,27 +2943,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,اخراجات / فرق اکاؤنٹ ({0}) ایک &#39;نفع یا نقصان کے اکاؤنٹ ہونا ضروری ہے
 DocType: Project,Copied From,سے کاپی
 DocType: Project,Copied From,سے کاپی
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},نام کی غلطی: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,قلت
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},نام کی غلطی: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,قلت
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} سے وابستہ نہیں کرتا {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ملازم {0} کے لئے حاضری پہلے سے نشان لگا دیا گیا
 DocType: Packing Slip,If more than one package of the same type (for print),تو اسی قسم کی ایک سے زیادہ پیکج (پرنٹ کے لئے)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,براہ کرم ریستوران ترتیبات میں ڈیفالٹ کسٹمر مقرر کریں
 ,Salary Register,تنخواہ رجسٹر
 DocType: Warehouse,Parent Warehouse,والدین گودام
 DocType: C-Form Invoice Detail,Net Total,نیٹ کل
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},پہلے سے طے شدہ BOM آئٹم کے لئے نہیں پایا {0} اور پروجیکٹ {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},پہلے سے طے شدہ BOM آئٹم کے لئے نہیں پایا {0} اور پروجیکٹ {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,مختلف قرض کی اقسام کی وضاحت کریں
 DocType: Bin,FCFS Rate,FCFS شرح
 DocType: Payment Reconciliation Invoice,Outstanding Amount,بقایا رقم
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),ٹائم (منٹ میں)
 DocType: Project Task,Working,کام کر رہے ہیں
 DocType: Stock Ledger Entry,Stock Queue (FIFO),اسٹاک قطار (فیفو)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,مالی سال
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,مالی سال
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} کمپنی سے تعلق نہیں ہے {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,{0} کے لئے معیار سکور فنکشن کو حل نہیں کیا جا سکا. یقینی بنائیں کہ فارمولہ درست ہے.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,کے طور پر لاگت
 DocType: Healthcare Settings,Out Patient Settings,باہر مریض کی ترتیبات
 DocType: Account,Round Off,منہاج القرآن
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,مقدار مثبت ہونا ضروری ہے
 ,Requested Qty,درخواست مقدار
 DocType: Tax Rule,Use for Shopping Cart,خریداری کی ٹوکری کے لئے استعمال کریں
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},ویلیو {0} وصف کے لئے {1} درست شے کی فہرست میں آئٹم کے لئے اقدار خاصیت موجود نہیں ہے {2}
@@ -2919,7 +2974,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",چارجز تناسب اپنے انتخاب کے مطابق، شے کی مقدار یا رقم کی بنیاد پر تقسیم کیا جائے گا
 DocType: Maintenance Visit,Purposes,مقاصد
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,کم سے کم ایک شے کی واپسی دستاویز میں منفی مقدار کے ساتھ درج کیا جانا چاہیے
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,کورسز شامل کریں
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",آپریشن {0} کارگاہ میں کسی بھی دستیاب کام کے گھنٹوں سے زیادہ وقت {1}، ایک سے زیادہ کی کارروائیوں میں آپریشن کو توڑنے
 ,Requested,درخواست
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,کوئی ریمارکس
@@ -2931,6 +2985,8 @@
 DocType: Employee Loan,Repaid/Closed,چکایا / بند کر دیا
 DocType: Item,Total Projected Qty,کل متوقع مقدار
 DocType: Monthly Distribution,Distribution Name,ڈسٹری بیوشن کا نام
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,سپلائر&gt; سپلائی کی قسم
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",آئٹم {0} کے لئے وابستہ کی شرح نہیں، جس میں {1} {2} کے اکاؤنٹنگ اندراج کرنا ضروری ہے. اگر آئٹم 1 {1} میں صفر کی قیمتوں کی شرح کی شرح کے طور پر ٹرانسمیشن کررہا ہے تو، براہ کرم اسے {1} آئٹم ٹیبل میں بتائیں. دوسری صورت میں، براہ کرم شے کے لئے آنے والا اسٹاک ٹرانزیکشن بنائیں یا شے کی ریکارڈ میں قیمتوں کی شرح کا ذکر کریں، اور پھر اس اندراج جمع کرانے / منسوخ کرنے کی کوشش کریں.
 DocType: Course,Course Code,کورس کوڈ
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},آئٹم کے لئے ضروری معیار معائنہ {0}
 DocType: POS Settings,Use POS in Offline Mode,آف لائن موڈ میں POS استعمال کریں
@@ -2941,14 +2997,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,علاقہ درخت کا انتظام کریں.
 DocType: Journal Entry Account,Sales Invoice,فروخت انوائس
 DocType: Journal Entry Account,Party Balance,پارٹی بیلنس
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,ڈسکاؤنٹ پر لاگو براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,ڈسکاؤنٹ پر لاگو براہ مہربانی منتخب کریں
 DocType: Company,Default Receivable Account,پہلے سے طے شدہ وصولی اکاؤنٹ
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,اوپر منتخب شدہ معیار کے لئے ادا کی مجموعی تنخواہ کے لئے بینک اندراج تشکیل
 DocType: Physician,Physician Schedule,معالج شیڈول
 DocType: Purchase Invoice,Deemed Export,ڈیمیٹڈ برآمد
 DocType: Stock Entry,Material Transfer for Manufacture,تیاری کے لئے مواد کی منتقلی
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,ڈسکاؤنٹ فی صد قیمت کی فہرست کے خلاف یا تمام قیمت کی فہرست کے لئے یا تو لاگو کیا جا سکتا.
-DocType: Purchase Invoice,Half-yearly,چھماہی
+DocType: Subscription,Half-yearly,چھماہی
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,اسٹاک کے لئے اکاؤنٹنگ انٹری
 DocType: Lab Test,LabTest Approver,LabTest کے قریب
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,آپ نے پہلے ہی تشخیص کے معیار کے تعین کی ہے {}.
@@ -2977,13 +3033,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,اضافی چھوٹے
 DocType: Company,Standard Template,سٹینڈرڈ سانچہ
 DocType: Training Event,Theory,نظریہ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,انتباہ: مقدار درخواست مواد کم از کم آرڈر کی مقدار سے کم ہے
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,انتباہ: مقدار درخواست مواد کم از کم آرڈر کی مقدار سے کم ہے
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,اکاؤنٹ {0} منجمد ہے
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,تنظیم سے تعلق رکھنے والے اکاؤنٹس کی ایک علیحدہ چارٹ کے ساتھ قانونی / ماتحت.
 DocType: Payment Request,Mute Email,گونگا ای میل
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",کھانا، مشروب اور تمباکو
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},صرف خلاف ادائیگی کر سکتے ہیں unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,کمیشن کی شرح زیادہ سے زیادہ 100 نہیں ہو سکتا
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},صرف خلاف ادائیگی کر سکتے ہیں unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,کمیشن کی شرح زیادہ سے زیادہ 100 نہیں ہو سکتا
 DocType: Stock Entry,Subcontract,اپپٹا
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,پہلے {0} درج کریں
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,کوئی جوابات سے
@@ -3001,10 +3057,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,رنگین
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,تشخیص کی منصوبہ بندی کا کلیہ
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,خریداری کے احکامات کو روکیں
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,ممنوعہ
 DocType: Patient Appointment,Scheduled,تخسوچت
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,کوٹیشن کے لئے درخواست.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,براہ کرم انسانی وسائل&gt; HR ترتیبات میں ملازم نامی کا نظام قائم کریں
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",&quot;نہیں&quot; اور &quot;فروخت آئٹم&quot; &quot;اسٹاک شے&quot; ہے جہاں &quot;ہاں&quot; ہے شے کو منتخب کریں اور کوئی دوسری مصنوعات بنڈل ہے براہ مہربانی
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,کسٹمر منتخب کریں
 DocType: Student Log,Academic,اکیڈمک
 DocType: Patient,Personal and Social History,ذاتی اور سماجی تاریخ
 DocType: Fee Schedule,Fee Breakup for each student,ہر طالب علم کے لئے فیس بریک اپ
@@ -3014,7 +3071,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,تشخیص کی شرح
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,ڈیزل
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,قیمت کی فہرست کرنسی منتخب نہیں
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,قیمت کی فہرست کرنسی منتخب نہیں
 apps/erpnext/erpnext/config/healthcare.py +46,Results,نتائج
 ,Student Monthly Attendance Sheet,Student کی ماہانہ حاضری شیٹ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},ملازم {0} پہلے ہی درخواست کی ہے {1} کے درمیان {2} اور {3}
@@ -3030,7 +3087,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,سیلز شراکت داروں کا انتظام کریں.
 DocType: Quality Inspection,Inspection Type,معائنہ کی قسم
 DocType: Fee Validity,Visited yet,ابھی تک ملاحظہ کی
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,موجودہ منتقلی کے ساتھ گوداموں گروپ کو تبدیل نہیں کیا جا سکتا.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,موجودہ منتقلی کے ساتھ گوداموں گروپ کو تبدیل نہیں کیا جا سکتا.
 DocType: Assessment Result Tool,Result HTML,نتیجہ HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,اختتامی میعاد
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,طلباء شامل کریں
@@ -3057,7 +3114,7 @@
 DocType: Healthcare Settings,Result Printed,نتائج پرنٹ
 DocType: Asset Category Account,Depreciation Expense Account,ہراس خرچ کے حساب
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,آزماءیشی عرصہ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},دیکھیں {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},دیکھیں {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,صرف پتی نوڈس ٹرانزیکشن میں اجازت دی جاتی ہے
 DocType: Expense Claim,Expense Approver,اخراجات کی منظوری دینے والا
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,صف {0}: کسٹمر کے خلاف کی کریڈٹ ہونا ضروری ہے
@@ -3068,7 +3125,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,تریخ ویلہ لئے
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,کورس شیڈول خارج کر دیا:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,ایس ایم ایس کی ترسیل کی حیثیت برقرار رکھنے کے لئے نوشتہ جات
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,سیلز ہدف سیٹ کریں
 DocType: Accounts Settings,Make Payment via Journal Entry,جرنل اندراج کے ذریعے ادائیگی
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,طباعت پر
 DocType: Item,Inspection Required before Delivery,انسپکشن ڈیلیوری سے پہلے کی ضرورت
@@ -3076,7 +3132,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,زیر سرگرمیاں
 DocType: Patient Appointment,Reminded,یاد دہانی
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,اپنی تنظیم
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,اپنی تنظیم
 DocType: Fee Component,Fees Category,فیس زمرہ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,تاریخ حاجت کوڈ داخل کریں.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
@@ -3088,7 +3144,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,ترتیب لیول
 DocType: Company,Chart Of Accounts Template,اکاؤنٹس سانچے کا چارٹ
 DocType: Attendance,Attendance Date,حاضری تاریخ
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},شے کی قیمت {0} میں قیمت کی فہرست کے لئے اپ ڈیٹ {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},شے کی قیمت {0} میں قیمت کی فہرست کے لئے اپ ڈیٹ {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,کمائی اور کٹوتی کی بنیاد پر تنخواہ ٹوٹنے.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,بچے نوڈس کے ساتھ اکاؤنٹ اکاؤنٹ میں تبدیل نہیں کیا جا سکتا
 DocType: Purchase Invoice Item,Accepted Warehouse,منظور گودام
@@ -3104,9 +3160,10 @@
 ,Employee Birthday,ملازم سالگرہ
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student کی بیچ حاضری کا آلہ
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,حد
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,اپ ڈیٹ کردہ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,وینچر کیپیٹل کی
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,اس &#39;تعلیمی سال&#39; کے ساتھ ایک تعلیمی اصطلاح {0} اور &#39;کی اصطلاح کا نام&#39; {1} پہلے سے موجود ہے. ان اندراجات پر نظر ثانی کریں اور دوبارہ کوشش کریں براہ مہربانی.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}",شے {0} خلاف موجودہ ٹرانزیکشنز ہیں کے طور پر، آپ کی قدر کو تبدیل نہیں کر سکتے {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}",شے {0} خلاف موجودہ ٹرانزیکشنز ہیں کے طور پر، آپ کی قدر کو تبدیل نہیں کر سکتے {1}
 DocType: UOM,Must be Whole Number,پورے نمبر ہونا لازمی ہے
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(دنوں میں) مختص نئے پتے
 DocType: Purchase Invoice,Invoice Copy,انوائس کاپی
@@ -3116,7 +3173,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,انوائس تعداد
 DocType: Shopping Cart Settings,Orders,احکامات
 DocType: Employee Leave Approver,Leave Approver,منظوری دینے والا چھوڑ دو
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,ایک بیچ براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,ایک بیچ براہ مہربانی منتخب کریں
 DocType: Assessment Group,Assessment Group Name,تجزیہ گروپ کا نام
 DocType: Manufacturing Settings,Material Transferred for Manufacture,مواد کی تیاری کے لئے منتقل
 DocType: Expense Claim,"A user with ""Expense Approver"" role",&quot;اخراجات کی منظوری دینے والا&quot; کردار کے ساتھ ایک صارف
@@ -3131,7 +3188,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,مدت بند انٹری
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,ڈیپارٹمنٹ منتخب کریں ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,موجودہ لین دین کے ساتھ لاگت مرکز گروپ کو تبدیل نہیں کیا جا سکتا
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},رقم {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},رقم {0} {1} {2} {3}
 DocType: Account,Depreciation,فرسودگی
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),پردایک (ے)
 DocType: Employee Attendance Tool,Employee Attendance Tool,ملازم حاضری کا آلہ
@@ -3143,10 +3200,12 @@
 DocType: GL Entry,Voucher No,واؤچر کوئی
 ,Lead Owner Efficiency,لیڈ مالک مستعدی
 ,Lead Owner Efficiency,لیڈ مالک مستعدی
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,سب سے زیادہ مقبول
 DocType: Leave Allocation,Leave Allocation,ایلوکیشن چھوڑ دو
 DocType: Payment Request,Recipient Message And Payment Details,وصول کنندہ کا پیغام اور ادائیگی کی تفصیلات
 DocType: Training Event,Trainer Email,ٹرینر کوارسال کریں
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,پیدا مواد درخواستوں {0}
+DocType: Restaurant Reservation,No of People,لوگ نہیں
 DocType: Production Planning Tool,Include sub-contracted raw materials,ذیلی کنٹریکٹ خام مواد شامل
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,شرائط یا معاہدے کے سانچے.
 DocType: Purchase Invoice,Address and Contact,ایڈریس اور رابطہ
@@ -3155,10 +3214,11 @@
 DocType: Supplier,Last Day of the Next Month,اگلے ماہ کے آخری دن
 DocType: Support Settings,Auto close Issue after 7 days,7 دن کے بعد آٹو بند مسئلہ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",پہلے مختص نہیں کیا جا سکتا چھوڑ {0}، چھٹی توازن پہلے ہی کیری فارورڈ مستقبل چھٹی مختص ریکارڈ میں کیا گیا ہے کے طور پر {1}
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نوٹ: کی وجہ / حوالہ تاریخ {0} دن کی طرف سے کی اجازت کسٹمر کے کریڈٹ دن سے زیادہ (ے)
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نوٹ: کی وجہ / حوالہ تاریخ {0} دن کی طرف سے کی اجازت کسٹمر کے کریڈٹ دن سے زیادہ (ے)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,طالب علم کی درخواست گزار
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,وصول کنندہ کے لئے ORIGINAL
 DocType: Asset Category Account,Accumulated Depreciation Account,جمع ہراس اکاؤنٹ
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,یہ ای میل autogenerated ہے
 DocType: Stock Settings,Freeze Stock Entries,جھروکے اسٹاک میں لکھے
 DocType: Program Enrollment,Boarding Student,بورڈنگ طالب علم
 DocType: Asset,Expected Value After Useful Life,مفید زندگی کے بعد کی متوقع قدر
@@ -3166,7 +3226,7 @@
 DocType: Activity Cost,Billing Rate,بلنگ کی شرح
 ,Qty to Deliver,نجات کے لئے مقدار
 ,Stock Analytics,اسٹاک تجزیات
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,آپریشنز خالی نہیں چھوڑا جا سکتا
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,آپریشنز خالی نہیں چھوڑا جا سکتا
 DocType: Maintenance Visit Purpose,Against Document Detail No,دستاویز تفصیل کے خلاف کوئی
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,پارٹی قسم لازمی ہے
 DocType: Quality Inspection,Outgoing,سبکدوش ہونے والے
@@ -3189,7 +3249,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,سرگرمی کی بنیاد پر گروپ کے لئے دستی طور پر طالب علموں منتخب
 DocType: Journal Entry,User Remark,صارف تبصرہ
 DocType: Lead,Market Segment,مارکیٹ کے علاقے
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},ادائیگی کی رقم مجموعی منفی بقایا رقم {0} سے زیادہ نہیں ہوسکتی ہے
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},ادائیگی کی رقم مجموعی منفی بقایا رقم {0} سے زیادہ نہیں ہوسکتی ہے
 DocType: Supplier Scorecard Period,Variables,متغیرات
 DocType: Employee Internal Work History,Employee Internal Work History,ملازم اندرونی کام تاریخ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),بند (ڈاکٹر)
@@ -3219,21 +3279,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,تازہ ترین معلومات حاصل کریں
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: اکاؤنٹ {2} کمپنی سے تعلق نہیں ہے {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,مواد درخواست {0} منسوخ یا بند کر دیا ہے
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,مینجمنٹ چھوڑ دو
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,مینجمنٹ چھوڑ دو
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,اکاؤنٹ کی طرف سے گروپ
 DocType: Sales Order,Fully Delivered,مکمل طور پر ہونے والا
 DocType: Lead,Lower Income,کم آمدنی
+DocType: Restaurant Order Entry,Current Order,موجودہ آرڈر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},ذریعہ اور ہدف گودام صف کے لئے ہی نہیں ہو سکتا {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",یہ اسٹاک مصالحتی ایک افتتاحی انٹری ہے کے بعد سے فرق اکاؤنٹ، ایک اثاثہ / ذمہ داری قسم اکاؤنٹ ہونا ضروری ہے
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},معاوضہ رقم قرض کی رقم سے زیادہ نہیں ہوسکتی ہے {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,پروگراموں پر جائیں
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},آئٹم کے لئے ضروری آرڈر نمبر خریداری {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,پروڈکشن آرڈر نہیں بنائی
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,پروڈکشن آرڈر نہیں بنائی
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;تاریخ سے&#39; کے بعد &#39;تاریخ کے لئے&#39; ہونا ضروری ہے
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},حیثیت کو تبدیل نہیں کر سکتے کیونکہ طالب علم {0} طالب علم کی درخواست کے ساتھ منسلک ہے {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},حیثیت کو تبدیل نہیں کر سکتے کیونکہ طالب علم {0} طالب علم کی درخواست کے ساتھ منسلک ہے {1}
 DocType: Asset,Fully Depreciated,مکمل طور پر فرسودگی
 ,Stock Projected Qty,اسٹاک مقدار متوقع
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},تعلق نہیں ہے {0} کسٹمر منصوبے کی {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},تعلق نہیں ہے {0} کسٹمر منصوبے کی {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,نشان حاضری ایچ ٹی ایم ایل
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",کوٹیشن، تجاویز ہیں بولیاں آپ اپنے گاہکوں کو بھیجا ہے
 DocType: Sales Order,Customer's Purchase Order,گاہک کی خریداری کے آرڈر
@@ -3244,8 +3305,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Depreciations کی تعداد بک مقرر کریں
 DocType: Supplier Scorecard Period,Calculations,حساب
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,قیمت یا مقدار
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,پروڈکشنز احکامات کو نہیں اٹھایا جا سکتا ہے:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,پروڈکشنز احکامات کو نہیں اٹھایا جا سکتا ہے:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,منٹ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,براہ کرم سیٹ اپ کے ذریعے {0} کے سلسلے میں ناممکن سیریز ترتیب دیں
 DocType: Purchase Invoice,Purchase Taxes and Charges,ٹیکس اور الزامات کی خریداری
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,سپلائرز پر جائیں
 ,Qty to Receive,وصول کرنے کی مقدار
@@ -3259,7 +3321,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,اکاؤنٹ کریڈٹ ایک بیلنس شیٹ اکاؤنٹ ہونا ضروری ہے
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,تمام پردایک اقسام
 DocType: Global Defaults,Disable In Words,الفاظ میں غیر فعال کریں
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,آئٹم خود کار طریقے سے شمار نہیں ہے کیونکہ آئٹم کوڈ لازمی ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,آئٹم خود کار طریقے سے شمار نہیں ہے کیونکہ آئٹم کوڈ لازمی ہے
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},کوٹیشن {0} نہیں قسم کی {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,بحالی کے شیڈول آئٹم
 DocType: Sales Order,%  Delivered,پھچ چوکا ٪
@@ -3281,23 +3343,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,افتتاحی بیلنس اکوئٹی
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,ن
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,اتفاق
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,باقی
 DocType: Appraisal,Appraisal,تشخیص
 DocType: Purchase Invoice,GST Details,GST تفصیلات
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},ای میل بھیجنے والے کو {0}
+DocType: Item,Default Sales Unit of Measure,ماپنے ڈیفالٹ سیلز یونٹ
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,تاریخ دہرایا گیا ہے
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,مجاز دستخط
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},سے ایک ہونا ضروری گواہ چھوڑ {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,فیس بنائیں
-DocType: Hub Settings,Seller Email,فروش ای میل
 DocType: Project,Total Purchase Cost (via Purchase Invoice),کل خریداری کی لاگت (انوائس خریداری کے ذریعے)
 DocType: Training Event,Start Time,وقت آغاز
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,منتخب مقدار
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,منتخب مقدار
 DocType: Customs Tariff Number,Customs Tariff Number,کسٹمز ٹیرف نمبر
 DocType: Patient Appointment,Patient Appointment,مریض کی تقرری
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,کردار منظوری حکمرانی کے لئے لاگو ہوتا ہے کردار کے طور پر ہی نہیں ہو سکتا
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,اس ای میل ڈائجسٹ سے رکنیت ختم
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,اس ای میل ڈائجسٹ سے رکنیت ختم
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,سپلائرز کی طرف سے حاصل کریں
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{1} آئٹم کے لئے نہیں مل سکا {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,کورسز پر جائیں
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,پیغام بھیجا
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,بچے نوڈس کے ساتھ اکاؤنٹ اکاؤنٹ کے طور پر مقرر نہیں کیا جا سکتا
@@ -3310,11 +3375,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,مواد مینوفیکچرنگ کے لئے منتقل
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,اکاؤنٹ {0} نہیں موجود
 DocType: Project,Project Type,منصوبے کی قسم
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,اس ٹاسک کے لئے بچے کا کام موجود ہے. آپ اس ٹاسک کو حذف نہیں کر سکتے ہیں.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,بہر ہدف مقدار یا ہدف رقم لازمی ہے.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,مختلف سرگرمیوں کی لاگت
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,مزید نتائج نہیں
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,مختلف سرگرمیوں کی لاگت
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",کرنے کے واقعات کی ترتیب {0}، سیلز افراد کو ذیل میں کے ساتھ منسلک ملازم ایک صارف کی شناخت کی ضرورت نہیں ہے کے بعد سے {1}
 DocType: Timesheet,Billing Details,بلنگ کی تفصیلات
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,ذریعہ اور ہدف گودام مختلف ہونا لازمی ہے
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,ذریعہ اور ہدف گودام مختلف ہونا لازمی ہے
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},نہیں کے مقابلے میں بڑی عمر کے اسٹاک لین دین کو اپ ڈیٹ کرنے کی اجازت دی {0}
 DocType: Purchase Invoice Item,PR Detail,پی آر تفصیل
 DocType: Sales Order,Fully Billed,مکمل طور پر بل
@@ -3340,7 +3407,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,وائر ٹرانسفر
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,تمام چیک کریں
 DocType: Vehicle Log,Invoice Ref,انوائس کے ممبران
-DocType: Purchase Order,Recurring Order,مکرر آرڈر
 DocType: Company,Default Income Account,پہلے سے طے شدہ آمدنی اکاؤنٹ
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,گاہک گروپ / کسٹمر
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),نا بند کردہ مالی سال منافع / خسارہ (کریڈٹ)
@@ -3354,9 +3420,9 @@
 DocType: Patient,A Negative,ایک منفی
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,زیادہ کچھ نہیں دکھانے کے لئے.
 DocType: Lead,From Customer,کسٹمر سے
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,کالیں
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,کالیں
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,ایک مصنوعات
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,بیچز
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,بیچز
 DocType: Project,Total Costing Amount (via Time Logs),کل لاگت رقم (وقت کیلیے نوشتہ جات دیکھیے کے ذریعے)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,فیس شیڈول بنائیں
 DocType: Purchase Order Item Supplied,Stock UOM,اسٹاک UOM
@@ -3380,7 +3446,7 @@
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,پتے اور چھٹیوں
 DocType: School Settings,Current Academic Term,موجودہ تعلیمی مدت
 DocType: Sales Order,Not Billed,بل نہیں
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,دونوں گودام ایک ہی کمپنی سے تعلق رکھتے ہیں چاہئے
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,دونوں گودام ایک ہی کمپنی سے تعلق رکھتے ہیں چاہئے
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,کوئی رابطے نے ابھی تک اکائونٹ.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,لینڈڈ لاگت واؤچر رقم
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,سپلائر کی طرف سے اٹھائے بل.
@@ -3389,7 +3455,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,ڈسکاؤنٹ رقم
 DocType: Purchase Invoice,Return Against Purchase Invoice,کے خلاف خریداری کی رسید واپس
 DocType: Item,Warranty Period (in days),(دن میں) وارنٹی مدت
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',اپ ڈیٹ کریں &#39;ٹیبپرٹ اپیلمنٹ` سیٹ sales_invoice =&#39; {0} &#39;جہاں نام =&#39; {1} &#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Guardian1 ساتھ تعلق
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,آپریشنز سے نیٹ کیش
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,آئٹم 4
@@ -3398,8 +3463,8 @@
 DocType: Journal Entry Account,Journal Entry Account,جرنل اندراج اکاؤنٹ
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,طالب علم گروپ
 DocType: Shopping Cart Settings,Quotation Series,کوٹیشن سیریز
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",ایک شے کے اسی نام کے ساتھ موجود ({0})، شے گروپ کا نام تبدیل یا شے کا نام تبدیل کریں
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,کسٹمر براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item",ایک شے کے اسی نام کے ساتھ موجود ({0})، شے گروپ کا نام تبدیل یا شے کا نام تبدیل کریں
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,کسٹمر براہ مہربانی منتخب کریں
 DocType: C-Form,I,میں
 DocType: Company,Asset Depreciation Cost Center,اثاثہ ہراس لاگت سینٹر
 DocType: Sales Order Item,Sales Order Date,سیلز آرڈر کی تاریخ
@@ -3408,6 +3473,7 @@
 DocType: Assessment Plan,Assessment Plan,تشخیص کی منصوبہ بندی
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,کسٹمر {0} پیدا ہوتا ہے.
 DocType: Stock Settings,Limit Percent,حد فیصد
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,فی الحال کوئی اسٹاک کسی بھی گودام میں دستیاب نہیں ہے
 ,Payment Period Based On Invoice Date,انوائس کی تاریخ کی بنیاد پر ادائیگی کی مدت
 DocType: Sample Collection,No. of print,پرنٹ نمبر نہیں
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},کے لئے لاپتہ کرنسی ایکسچینج قیمتیں {0}
@@ -3463,13 +3529,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,مجموعی پے - کل کٹوتی - قرض کی واپسی
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,موجودہ BOM اور نئی BOM ہی نہیں ہو سکتا
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,تنخواہ کی پرچی ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,تنخواہ کی پرچی ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,ریٹائرمنٹ کے تاریخ شمولیت کی تاریخ سے زیادہ ہونا چاہیے
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,پر کورس شیڈول جبکہ غلطیاں تھے:
 DocType: Sales Invoice,Against Income Account,انکم اکاؤنٹ کے خلاف
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}٪ پھنچ گیا
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,آئٹم {0}: حکم کی مقدار {1} کم از کم آرڈر کی مقدار {2} (آئٹم میں بیان کیا) سے کم نہیں ہو سکتا.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,آئٹم {0}: حکم کی مقدار {1} کم از کم آرڈر کی مقدار {2} (آئٹم میں بیان کیا) سے کم نہیں ہو سکتا.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ماہانہ تقسیم فی صد
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,براہ کرم دوسرے صارف کے طور پر لاگ ان کریں.
 DocType: Territory,Territory Targets,علاقہ اہداف
 DocType: Delivery Note,Transporter Info,ٹرانسپورٹر معلومات
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},برائے مہربانی ڈیفالٹ {0} کمپنی {1} میں مقرر کریں.
@@ -3477,13 +3544,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,ایک ہی سپلائر کئی بار داخل کیا گیا ہے
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,مجموعی منافع / نقصان
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,آرڈر آئٹم فراہم خریدیں
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,کمپنی کا نام نہیں ہو سکتا
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,کمپنی کا نام نہیں ہو سکتا
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,پرنٹ کے سانچوں کے لئے خط سر.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,پرنٹ کے سانچوں کے لئے عنوانات پروفارما انوائس مثلا.
 DocType: Program Enrollment,Walking,چلنے کے سہارے
 DocType: Student Guardian,Student Guardian,طالب علم گارڈین
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,تشخیص قسم کے الزامات شامل کے طور پر نشان نہیں کر سکتے ہیں
 DocType: POS Profile,Update Stock,اپ ڈیٹ اسٹاک
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,رکنیت میں
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,اشیاء کے لئے مختلف UOM غلط (کل) نیٹ وزن کی قیمت کی قیادت کریں گے. ہر شے کے نیٹ وزن اسی UOM میں ہے اس بات کو یقینی بنائیں.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM کی شرح
 DocType: Asset,Journal Entry for Scrap,سکریپ کے لئے جرنل اندراج
@@ -3532,15 +3600,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",نظام صارف (لاگ ان) کی شناخت. مقرر کیا ہے تو، یہ سب HR فارم کے لئے پہلے سے طے شدہ ہو جائے گا.
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: سے {1}
 DocType: Task,depends_on,منحصرکرتاہے
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,مواد کے تمام بلوں میں تازہ ترین قیمت کو اپ ڈیٹ کرنے کے لئے قطع نظر. یہ چند منٹ لگ سکتا ہے.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,مواد کے تمام بلوں میں تازہ ترین قیمت کو اپ ڈیٹ کرنے کے لئے قطع نظر. یہ چند منٹ لگ سکتا ہے.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,نئے اکاؤنٹ کا نام. نوٹ: صارفین اور سپلائرز کے اکاؤنٹس کی تخلیق نہیں کرتے ہیں براہ مہربانی
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,ملک وار طے شدہ ایڈریس سانچے
 DocType: Sales Order Item,Supplier delivers to Customer,پردایک کسٹمر کو فراہم
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/Item/{0})موجود نھی ھے
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},وجہ / حوالہ تاریخ کے بعد نہیں ہو سکتا {0}
+,Sales Payment Summary,سیلز ادائیگی کا خلاصہ
+DocType: Restaurant,Restaurant,ریسٹورانٹ
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},وجہ / حوالہ تاریخ کے بعد نہیں ہو سکتا {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ڈیٹا کی درآمد اور برآمد
 DocType: Patient,Account Details,اکاؤنٹ کی تفصیلات
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,کوئی طالب علم نہیں ملا
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,کوئی طالب علم نہیں ملا
 DocType: Medical Department,Medical Department,میڈیکل ڈپارٹمنٹ
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,سپلائر اسکور کارڈ اسکورنگ معیار
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,انوائس پوسٹنگ کی تاریخ
@@ -3551,8 +3621,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,پارٹی منتخب کرنے سے پہلے پوسٹنگ کی تاریخ براہ مہربانی منتخب کریں
 DocType: Program Enrollment,School House,سکول ہاؤس
 DocType: Serial No,Out of AMC,اے ایم سی کے باہر
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,کوٹیشن براہ مہربانی منتخب کریں
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,کوٹیشن براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,کوٹیشن براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,کوٹیشن براہ مہربانی منتخب کریں
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,بک Depreciations کی تعداد کل Depreciations کی تعداد سے زیادہ نہیں ہو سکتی
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,بحالی دورہ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,سیلز ماسٹر مینیجر {0} کردار ہے جو صارف سے رابطہ کریں
@@ -3560,7 +3630,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,کمپنی (نہیں مستقل خریدار یا سپلائر) ماسٹر.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,یہ اس طالب علم کی حاضری پر مبنی ہے
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,کوئی طلبا میں
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,مزید آئٹمز یا کھلی مکمل فارم شامل کریں
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,مزید آئٹمز یا کھلی مکمل فارم شامل کریں
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ترسیل نوٹوں {0} اس سیلز آرڈر منسوخ کرنے سے پہلے منسوخ کر دیا جائے ضروری ہے
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,صارفین پر جائیں
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,ادائیگی کی رقم رقم گرینڈ کل سے زیادہ نہیں ہو سکتا لکھنے +
@@ -3580,37 +3650,40 @@
 DocType: Fee Schedule,Fee Schedule,فیس شیڈول
 DocType: Hub Settings,Publish Availability,دستیابی شائع
 DocType: Company,Create Chart Of Accounts Based On,اکاؤنٹس کی بنیاد پر چارٹ بنائیں
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,اسے غیر گروپ میں تبدیل نہیں کر سکتا. بچے کے کام موجود ہیں.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,تاریخ پیدائش آج کے مقابلے میں زیادہ نہیں ہو سکتا.
 ,Stock Ageing,اسٹاک خستہ
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},طالب علم {0} طالب علم کے درخواست دہندگان کے خلاف موجود ہے {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),راؤنڈنگ ایڈجسٹمنٹ (کمپنی کی کرنسی)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,وقت شیٹ
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,وقت شیٹ
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} {1} &#39;غیر فعال ہے
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,کھولنے کے طور پر مقرر کریں
 DocType: Cheque Print Template,Scanned Cheque,سکین شدہ چیک
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,جمع لین دین پر خود کار طریقے سے رابطے ای میلز بھیجیں.
 DocType: Timesheet,Total Billable Amount,کل قابل بل کی رقم
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,آئٹم کے 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,آرڈر کی انٹری
 DocType: Purchase Order,Customer Contact Email,کسٹمر رابطہ ای میل
 DocType: Warranty Claim,Item and Warranty Details,آئٹم اور وارنٹی تفصیلات دیکھیں
 DocType: Sales Team,Contribution (%),شراکت (٪)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,نوٹ: ادائیگی کے اندراج کے بعد پیدا ہو گا &#39;نقد یا بینک اکاؤنٹ&#39; وضاحت نہیں کی گئی
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,پروجیکٹ {0} پہلے ہی موجود ہے
 DocType: Medical Department,Nursing User,نرسنگ صارف
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,ذمہ داریاں
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,اس کوٹیشن کی مدت کی مدت ختم ہوگئی ہے.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,اس کوٹیشن کی مدت کی مدت ختم ہوگئی ہے.
 DocType: Expense Claim Account,Expense Claim Account,اخراجات دعوی اکاؤنٹ
 DocType: Accounts Settings,Allow Stale Exchange Rates,اسٹیل ایکسچینج کی قیمت کی اجازت دیں
 DocType: Sales Person,Sales Person Name,فروخت کے شخص کا نام
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,ٹیبل میں کم سے کم 1 انوائس داخل کریں
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,صارفین شامل کریں
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,صارفین شامل کریں
 DocType: POS Item Group,Item Group,آئٹم گروپ
 DocType: Item,Safety Stock,سیفٹی اسٹاک
 DocType: Healthcare Settings,Healthcare Settings,صحت کی دیکھ بھال کی ترتیبات
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,ایک کام کے لئے پیش رفت٪ 100 سے زیادہ نہیں ہو سکتا.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,ایک کام کے لئے پیش رفت٪ 100 سے زیادہ نہیں ہو سکتا.
 DocType: Stock Reconciliation Item,Before reconciliation,مفاہمت پہلے
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},کرنے کے لئے {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ٹیکس اور الزامات شامل کر دیا گیا (کمپنی کرنسی)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,آئٹم ٹیکس صف {0} قسم ٹیکس یا آمدنی یا اخراجات یا ادائیگی کے اکاؤنٹ ہونا لازمی ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,آئٹم ٹیکس صف {0} قسم ٹیکس یا آمدنی یا اخراجات یا ادائیگی کے اکاؤنٹ ہونا لازمی ہے
 DocType: Sales Order,Partly Billed,جزوی طور پر بل
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,آئٹم {0} ایک فکسڈ اثاثہ آئٹم ہونا ضروری ہے
 DocType: Item,Default BOM,پہلے سے طے شدہ BOM
@@ -3626,6 +3699,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,رکن کی
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,ترسیل کے نوٹ سے
 DocType: Student,Student Email Address,طالب علم کا ای میل ایڈریس
+DocType: Item,Hub Warehouse,حب گودام
 DocType: Physician Schedule Time Slot,From Time,وقت سے
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,اسٹاک میں:
 DocType: Notification Control,Custom Message,اپنی مرضی کے پیغام
@@ -3634,9 +3708,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,طالب علم ایڈریس
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,طالب علم ایڈریس
 DocType: Purchase Invoice,Price List Exchange Rate,قیمت کی فہرست زر مبادلہ کی شرح
+DocType: POS Profile,POS Profile Name,POS پروفائل کا نام
 DocType: Purchase Invoice Item,Rate,شرح
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,انٹرن
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,ایڈریس نام
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,ایڈریس نام
 DocType: Stock Entry,From BOM,BOM سے
 DocType: Assessment Code,Assessment Code,تشخیص کے کوڈ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,بنیادی
@@ -3650,11 +3725,12 @@
 DocType: Salary Slip,Salary Structure,تنخواہ ساخت
 DocType: Account,Bank,بینک
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ایئرلائن
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,مسئلہ مواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,مسئلہ مواد
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,بار بار پیدا کرنے میں ایک خرابی ہوئی
 DocType: Material Request Item,For Warehouse,گودام کے لئے
 DocType: Employee,Offer Date,پیشکش تاریخ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,کوٹیشن
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,آپ آف لائن موڈ میں ہیں. آپ آپ کو نیٹ ورک ہے جب تک دوبارہ لوڈ کرنے کے قابل نہیں ہو گا.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,آپ آف لائن موڈ میں ہیں. آپ آپ کو نیٹ ورک ہے جب تک دوبارہ لوڈ کرنے کے قابل نہیں ہو گا.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,کوئی بھی طالب علم گروپ بنائے.
 DocType: Purchase Invoice Item,Serial No,سیریل نمبر
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,ماہانہ واپسی کی رقم قرض کی رقم سے زیادہ نہیں ہو سکتا
@@ -3664,17 +3740,18 @@
 DocType: Salary Slip,Total Working Hours,کل کام کے گھنٹے
 DocType: Subscription,Next Schedule Date,اگلی شیڈول تاریخ
 DocType: Stock Entry,Including items for sub assemblies,ذیلی اسمبلیوں کے لئے اشیاء سمیت
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,درج قدر مثبت ہونا چاہئے
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,تمام علاقوں
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,درج قدر مثبت ہونا چاہئے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,تمام علاقوں
 DocType: Purchase Invoice,Items,اشیا
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,طالب علم پہلے سے ہی مندرج ہے.
 DocType: Fiscal Year,Year Name,سال نام
 DocType: Process Payroll,Process Payroll,عمل کی تنخواہ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,کام کے دنوں کے مقابلے میں زیادہ کی تعطیلات اس ماہ ہیں.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,کام کے دنوں کے مقابلے میں زیادہ کی تعطیلات اس ماہ ہیں.
 DocType: Product Bundle Item,Product Bundle Item,پروڈکٹ بنڈل آئٹم
 DocType: Sales Partner,Sales Partner Name,سیلز پارٹنر نام
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,کوٹیشن کے لئے درخواست
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,کوٹیشن کے لئے درخواست
 DocType: Payment Reconciliation,Maximum Invoice Amount,زیادہ سے زیادہ انوائس کی رقم
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,ہیماتولوجی
 DocType: Normal Test Items,Normal Test Items,عام ٹیسٹ اشیا
 DocType: Student Language,Student Language,Student کی زبان
 apps/erpnext/erpnext/config/selling.py +23,Customers,گاہکوں
@@ -3686,10 +3763,11 @@
 DocType: Issue,Opening Time,افتتاحی وقت
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,سے اور مطلوبہ تاریخوں کے لئے
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,سیکورٹیز اینڈ ایکسچینج کماڈٹی
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',مختلف کے لئے پیمائش کی پہلے سے طے شدہ یونٹ &#39;{0}&#39; سانچے میں کے طور پر ایک ہی ہونا چاہیے &#39;{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',مختلف کے لئے پیمائش کی پہلے سے طے شدہ یونٹ &#39;{0}&#39; سانچے میں کے طور پر ایک ہی ہونا چاہیے &#39;{1}
 DocType: Shipping Rule,Calculate Based On,کی بنیاد پر حساب
 DocType: Delivery Note Item,From Warehouse,گودام سے
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,تیار کرنے کی مواد کے بل کے ساتھ کوئی شے
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,تیار کرنے کی مواد کے بل کے ساتھ کوئی شے
+DocType: Restaurant,Default Customer,ڈیفالٹ کسٹمر
 DocType: Assessment Plan,Supervisor Name,سپروائزر کا نام
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,اس بات کی توثیق نہ کریں کہ ایک ہی دن کے لئے اپوزیشن کا قیام کیا گیا ہے
 DocType: Program Enrollment Course,Program Enrollment Course,پروگرام اندراج کورس
@@ -3717,7 +3795,7 @@
 DocType: Payment Entry,Internal Transfer,اندرونی منتقلی
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,چائلڈ اکاؤنٹ اس اکاؤنٹ کے لئے موجود ہے. آپ اس اکاؤنٹ کو حذف نہیں کر سکتے ہیں.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,بہر ہدف مقدار یا ہدف رقم لازمی ہے
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},کوئی پہلے سے طے شدہ BOM شے کے لئے موجود {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},کوئی پہلے سے طے شدہ BOM شے کے لئے موجود {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,پہلے پوسٹنگ کی تاریخ منتخب کریں
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,تاریخ افتتاحی تاریخ بند کرنے سے پہلے ہونا چاہئے
 DocType: Leave Control Panel,Carry Forward,آگے لے جانے
@@ -3753,6 +3831,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,کل موجودہ
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,اکاؤنٹنگ بیانات
 DocType: Drug Prescription,Hour,قیامت
+DocType: Restaurant Order Entry,Last Sales Invoice,آخری سیلز انوائس
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,نیا سیریل کوئی گودام ہیں کر سکتے ہیں. گودام اسٹاک اندراج یا خریداری کی رسید کی طرف سے مقرر کیا جانا چاہیے
 DocType: Lead,Lead Type,لیڈ کی قسم
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,آپ کو بلاک تاریخوں پر پتے کو منظور کرنے کی اجازت نہیں ہے
@@ -3789,65 +3868,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,صارفین تخلیق
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,گرام
 DocType: Supplier Scorecard,Per Month,فی مہینہ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,تیار کرنے کی مقدار 0 سے زیادہ ہونا چاہیے.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,تیار کرنے کی مقدار 0 سے زیادہ ہونا چاہیے.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,بحالی کال کے لئے رپورٹ ملاحظہ کریں.
 DocType: Stock Entry,Update Rate and Availability,اپ ڈیٹ کی شرح اور دستیابی
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,فی صد آپ کو موصول ہونے یا حکم دیا مقدار کے خلاف زیادہ فراہم کرنے کے لئے اجازت دی جاتی ہے. مثال کے طور پر: آپ کو 100 یونٹس کا حکم دیا ہے تو. اور آپ الاؤنس تو آپ کو 110 یونٹس حاصل کرنے کے لئے اجازت دی جاتی ہے 10٪ ہے.
 DocType: POS Customer Group,Customer Group,گاہک گروپ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),نیا بیچ ID (اختیاری)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),نیا بیچ ID (اختیاری)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),نیا بیچ ID (اختیاری)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),نیا بیچ ID (اختیاری)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},اخراجات کے اکاؤنٹ شے کے لئے لازمی ہے {0}
 DocType: BOM,Website Description,ویب سائٹ تفصیل
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ایکوئٹی میں خالص تبدیلی
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,تازہ ترین
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,انوائس خریداری {0} منسوخ مہربانی سب سے پہلے
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",ای میل پتہ منفرد ہونا ضروری ہے، پہلے ہی {0} کے لئے موجود ہے.
 DocType: Serial No,AMC Expiry Date,AMC ختم ہونے کی تاریخ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,رسید
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,رسید
 ,Sales Register,سیلز رجسٹر
 DocType: Daily Work Summary Settings Company,Send Emails At,پر ای میلز بھیجیں
 DocType: Quotation,Quotation Lost Reason,کوٹیشن کھو وجہ
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,آپ کے ڈومین منتخب کریں
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',منتخب کریں * ٹیبپرٹ سے جہاں نام = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},ٹرانزیکشن ریفرنس کوئی {0} بتاریخ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},ٹرانزیکشن ریفرنس کوئی {0} بتاریخ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ترمیم کرنے کے لئے کچھ بھی نہیں ہے.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,فارم دیکھیں
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,اس مہینے اور زیر التواء سرگرمیوں کا خلاصہ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,فارم دیکھیں
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,اس مہینے اور زیر التواء سرگرمیوں کا خلاصہ
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.",اپنے آپ کے علاوہ اپنے تنظیم میں صارفین کو شامل کریں.
 DocType: Customer Group,Customer Group Name,گاہک گروپ کا نام
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,ابھی تک کوئی گاہک!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,ابھی تک کوئی گاہک!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,کیش فلو کا بیان
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},قرض کی رقم {0} کی زیادہ سے زیادہ قرض کی رقم سے زیادہ نہیں ہوسکتی
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,لائسنس
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},سی فارم سے اس انوائس {0} کو دور کریں {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},سی فارم سے اس انوائس {0} کو دور کریں {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,آپ کو بھی گزشتہ مالی سال کے توازن رواں مالی سال کے لئے چھوڑ دیتا شامل کرنے کے لئے چاہتے ہیں تو آگے بڑھانے براہ مہربانی منتخب کریں
 DocType: GL Entry,Against Voucher Type,واؤچر قسم کے خلاف
 DocType: Physician,Phone (R),فون (آر)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,ٹائم سلاٹس شامل ہیں
 DocType: Item,Attributes,صفات
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,سانچہ کو فعال کریں
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,براہ کرم سیٹ اپ کے ذریعے {0} کے سلسلے میں ناممکن سیریز ترتیب دیں
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,اکاؤنٹ لکھنے داخل کریں
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,آخری آرڈر کی تاریخ
 DocType: Patient,B Negative,بی منفی
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},اکاؤنٹ {0} کرتا کمپنی سے تعلق رکھتا نہیں {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,{0} قطار میں سیریل نمبر ڈلیوری نوٹ کے ساتھ میل نہیں کھاتا
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,{0} قطار میں سیریل نمبر ڈلیوری نوٹ کے ساتھ میل نہیں کھاتا
 DocType: Student,Guardian Details,گارڈین کی تفصیلات دیکھیں
 DocType: C-Form,C-Form,سی فارم
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,ایک سے زیادہ ملازمین کے لئے نشان حاضری
 DocType: Vehicle,Chassis No,چیسی کوئی
 DocType: Payment Request,Initiated,شروع
 DocType: Production Order,Planned Start Date,منصوبہ بندی شروع کرنے کی تاریخ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,براہ کرم ایک BOM منتخب کریں
 DocType: Serial No,Creation Document Type,تخلیق دستاویز کی قسم
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,اختتام تاریخ شروع ہونے کی تاریخ سے زیادہ ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,اختتام تاریخ شروع ہونے کی تاریخ سے زیادہ ہونا ضروری ہے
 DocType: Leave Type,Is Encash,بنانا ہے
 DocType: Leave Allocation,New Leaves Allocated,نئے پتے مختص
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,پروجیکٹ وار اعداد و شمار کوٹیشن کے لئے دستیاب نہیں ہے
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,ختم
 DocType: Project,Expected End Date,متوقع تاریخ اختتام
 DocType: Budget Account,Budget Amount,بجٹ کی رقم
 DocType: Appraisal Template,Appraisal Template Title,تشخیص سانچہ عنوان
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},ملازمت کے لۓ {0} تاریخ سے {1} ملازمت کی شمولیت اختیار کرنے سے پہلے نہیں ہوسکتا ہے {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,کمرشل
 DocType: Patient,Alcohol Current Use,الکحل موجودہ استعمال
+DocType: Student Admission Program,Student Admission Program,طالب علم داخلہ پروگرام
 DocType: Payment Entry,Account Paid To,اکاؤنٹ کے لئے ادا کی
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,والدین آئٹم {0} اسٹاک آئٹم نہیں ہونا چاہئے
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,تمام مصنوعات یا خدمات.
@@ -3856,30 +3937,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} اکاؤنٹ کے بجٹ {1} خلاف {2} {3} ہے {4}. اس کی طرف سے تجاوز کرے گا {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',صف {0} # اکاؤنٹ کی قسم کا ہونا چاہیے &#39;فکسڈ اثاثہ&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,مقدار باہر
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,قواعد فروخت کے لئے شپنگ رقم کا حساب کرنے
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,اور اس میں معذور غیر مقفل
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,سیریز لازمی ہے
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,مالیاتی خدمات
 DocType: Student Sibling,Student ID,طالب علم کی شناخت
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,وقت لاگز کے لئے سرگرمیوں کی اقسام
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,سپلائر ای میل
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,وقت لاگز کے لئے سرگرمیوں کی اقسام
 DocType: Tax Rule,Sales,سیلز
 DocType: Stock Entry Detail,Basic Amount,بنیادی رقم
 DocType: Training Event,Exam,امتحان
 DocType: Complaint,Complaint,شکایت
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},گودام اسٹاک آئٹم کے لئے ضروری {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},گودام اسٹاک آئٹم کے لئے ضروری {0}
 DocType: Leave Allocation,Unused leaves,غیر استعمال شدہ پتے
 DocType: Patient,Alcohol Past Use,شراب ماضی کا استعمال
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,کروڑ
 DocType: Tax Rule,Billing State,بلنگ ریاست
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,منتقلی
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),(ذیلی اسمبلیوں سمیت) پھٹا BOM آوردہ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,منتقلی
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),(ذیلی اسمبلیوں سمیت) پھٹا BOM آوردہ
 DocType: Authorization Rule,Applicable To (Employee),لاگو (ملازم)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,کی وجہ سے تاریخ لازمی ہے
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,کی وجہ سے تاریخ لازمی ہے
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,وصف کے لئے اضافہ {0} 0 نہیں ہو سکتا
 DocType: Journal Entry,Pay To / Recd From,سے / Recd کرنے کے لئے ادا
 DocType: Naming Series,Setup Series,سیٹ اپ سیریز
 DocType: Payment Reconciliation,To Invoice Date,تاریخ انوائس کے لئے
 DocType: Supplier,Contact HTML,رابطہ کریں ایچ ٹی ایم ایل
 ,Inactive Customers,غیر فعال کسٹمرز
+DocType: Student Admission Program,Maximum Age,زیادہ سے زیادہ عمر
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,خریداری کی رسیدیں
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,کس طرح کی قیمتوں کا تعین اصول کا اطلاق ہوتا ہے؟
@@ -3898,6 +3981,7 @@
 DocType: GL Entry,Remarks,ریمارکس
 DocType: Payment Entry,Account Paid From,اکاؤنٹ سے ادا
 DocType: Purchase Order Item Supplied,Raw Material Item Code,خام مال آئٹم کوڈ
+DocType: Task,Parent Task,والدین کا کام
 DocType: Journal Entry,Write Off Based On,کی بنیاد پر لکھنے
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,لیڈ بنائیں
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,پرنٹ اور سٹیشنری
@@ -3906,20 +3990,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",تنخواہ پہلے سے ہی درمیان {0} اور {1}، درخواست مدت چھوڑیں اس تاریخ کی حد کے درمیان نہیں ہو سکتا مدت کے لئے کارروائی کی.
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,ایک سیریل نمبر کے لئے تنصیب ریکارڈ
 DocType: Guardian Interest,Guardian Interest,گارڈین دلچسپی
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,POS انوائس کے لئے ڈیفالٹ اقدار سیٹ کریں
 apps/erpnext/erpnext/config/hr.py +177,Training,ٹریننگ
 DocType: Timesheet,Employee Detail,ملازم کی تفصیل
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ای میل آئی ڈی
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ای میل آئی ڈی
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,اگلی تاریخ کے دن اور مہینے کے دن دہرائیں برابر ہونا چاہیے
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,اگلی تاریخ کے دن اور مہینے کے دن دہرائیں برابر ہونا چاہیے
 DocType: Lab Prescription,Test Code,ٹیسٹ کوڈ
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,ویب سائٹ کے ہوم پیج کے لئے ترتیبات
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},{1} کے سکور کارڈ کے کھڑے ہونے کی وجہ سے RFQ کو {0} کی اجازت نہیں ہے.
 DocType: Offer Letter,Awaiting Response,جواب کا منتظر
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,اوپر
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},کل رقم {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},غلط وصف {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},کل رقم {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},غلط وصف {0} {1}
 DocType: Supplier,Mention if non-standard payable account,ذکر غیر معیاری قابل ادائیگی اکاؤنٹ ہے تو
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},ایک ہی شے کے کئی بار داخل کیا گیا ہے. {فہرست}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',&#39;تمام تعین گروپ&#39; کے علاوہ کسی اور کا تعین گروپ براہ مہربانی منتخب کریں
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},قطار {0}: ایک آئٹم {1} کے لئے لاگت مرکز کی ضرورت ہے
 DocType: Training Event Employee,Optional,اختیاری
@@ -3942,12 +4026,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: لاگت سینٹر شے کے لئے لازمی ہے {2}
 DocType: Vehicle,Policy No,پالیسی نہیں
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,پروڈکٹ بنڈل سے اشیاء حاصل
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property",جیسا کہ اسٹاک کسی آئٹم کے خلاف موجود ہے {0}، آپ کو مختلف قسم کے ملکیت کو فعال نہیں کرسکتا ہے
 DocType: Asset,Straight Line,سیدھی لکیر
 DocType: Project User,Project User,پروجیکٹ صارف
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,سپلٹ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,سپلٹ
 DocType: GL Entry,Is Advance,ایڈوانس ہے
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,تاریخ کے لئے تاریخ اور حاضری سے حاضری لازمی ہے
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,ہاں یا نہیں کے طور پر &#39;ٹھیکے ہے&#39; درج کریں
+DocType: Item,Default Purchase Unit of Measure,پیمائش کی ڈیفالٹ خریداری یونٹ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,آخری مواصلات تاریخ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,آخری مواصلات تاریخ
 DocType: Sales Team,Contact No.,رابطہ نمبر
@@ -3956,7 +4042,6 @@
 DocType: Production Order,Check if material transfer entry is not required,مواد کی منتقلی کے اندراج کی ضرورت نہیں ہے چیک کریں
 DocType: Production Order,Check if material transfer entry is not required,مواد کی منتقلی کے اندراج کی ضرورت نہیں ہے چیک کریں
 DocType: Program Enrollment Tool,Get Students From,سے طالب علموں کو حاصل کریں
-DocType: Hub Settings,Seller Country,فروش ملک
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,ویب سائٹ پر اشیاء شائع
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,بیچوں میں آپ کے طالب علموں کے گروپ
 DocType: Authorization Rule,Authorization Rule,اجازت اصول
@@ -3966,8 +4051,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,سیلز ٹیکس اور الزامات سانچہ
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),کل (کریڈٹ)
 DocType: Repayment Schedule,Payment Date,ادائیگی کی تاریخ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,نئی کھیپ قی
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,نئی کھیپ قی
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,نئی کھیپ قی
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,نئی کھیپ قی
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,ملبوسات اور لوازمات
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,وزن میں سکور کی تقریب کو حل نہیں کیا جا سکا. یقینی بنائیں کہ فارمولہ درست ہے.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,آرڈر کی تعداد
@@ -3985,6 +4070,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",قطار # {0}: اثاثہ {1} جمع نہیں کیا جا سکتا، یہ پہلے سے ہی ہے {2}
 DocType: Tax Rule,Billing Country,بلنگ کا ملک
 DocType: Purchase Order Item,Expected Delivery Date,متوقع تاریخ کی ترسیل
+DocType: Restaurant Order Entry,Restaurant Order Entry,ریسٹورنٹ آرڈر انٹری
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ڈیبٹ اور کریڈٹ {0} # کے لئے برابر نہیں {1}. فرق ہے {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,تفریح اخراجات
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,مواد درخواست کر
@@ -3997,7 +4083,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,موجودہ لین دین کے ساتھ اکاؤنٹ خارج کر دیا نہیں کیا جا سکتا
 DocType: Vehicle,Last Carbon Check,آخری کاربن چیک کریں
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,قانونی اخراجات
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,صف پر مقدار براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,صف پر مقدار براہ مہربانی منتخب کریں
 DocType: Purchase Invoice,Posting Time,پوسٹنگ وقت
 DocType: Timesheet,% Amount Billed,٪ رقم بل
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,ٹیلی فون اخراجات
@@ -4010,6 +4096,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,نئے گاہک ریونیو
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,سفر کے اخراجات
 DocType: Maintenance Visit,Breakdown,خرابی
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},doctype میں اپنی مرضی کے میدان سبسکرپشن شامل کریں {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,اکاؤنٹ: {0} کرنسی: {1} منتخب نہیں کیا جا سکتا
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",تازہ ترین قیمتوں کی شرح / قیمت کی فہرست کی شرح / خام مال کی آخری خریداری کی شرح پر مبنی بوم خود بخود لاگت کریں.
 DocType: Bank Reconciliation Detail,Cheque Date,چیک تاریخ
@@ -4034,7 +4121,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),کل بلنگ رقم (وقت کیلیے نوشتہ جات دیکھیے کے ذریعے)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,پردایک شناخت
 DocType: Payment Request,Payment Gateway Details,ادائیگی کے گیٹ وے کی تفصیلات دیکھیں
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,مقدار 0 سے زیادہ ہونا چاہئے
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,مقدار 0 سے زیادہ ہونا چاہئے
 DocType: Journal Entry,Cash Entry,کیش انٹری
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,بچے نوڈس صرف &#39;گروپ&#39; قسم نوڈس کے تحت پیدا کیا جا سکتا
 DocType: Leave Application,Half Day Date,آدھا دن تاریخ
@@ -4052,12 +4139,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,نوٹ: آئٹم {0} کئی بار میں داخل
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,تمام رابطے.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,کمپنی مخفف
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,صارف {0} موجود نہیں ہے
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,صارف {0} موجود نہیں ہے
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,مخفف
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,ادائیگی انٹری پہلے سے موجود ہے
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} حدود سے تجاوز کے بعد authroized نہیں
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,تنخواہ سانچے ماسٹر.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,ریاضی
+DocType: Restaurant Order Entry,Restaurant Table,ریسٹورانٹ ٹیبل
 DocType: Leave Type,Max Days Leave Allowed,زیادہ سے زیادہ دنوں کی رخصت کی اجازت
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,خریداری کی ٹوکری کے لئے مقرر ٹیکس اصول
 DocType: Purchase Invoice,Taxes and Charges Added,ٹیکس اور الزامات شامل کر دیا گیا
@@ -4069,10 +4158,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,لیڈز یا گاہکوں کو قیمت.
 DocType: Stock Settings,Role Allowed to edit frozen stock,کردار منجمد اسٹاک ترمیم کرنے کی اجازت
 ,Territory Target Variance Item Group-Wise,علاقہ ھدف تغیر آئٹم گروپ حکیم
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,تمام کسٹمر گروپوں
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,تمام کسٹمر گروپوں
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,جمع ماہانہ
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} لازمی ہے. ہو سکتا ہے کہ کرنسی ایکسچینج ریکارڈ {1} {2} کرنے کے لئے پیدا نہیں کر رہا ہے.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,ٹیکس سانچہ لازمی ہے.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,ٹیکس سانچہ لازمی ہے.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,اکاؤنٹ {0}: والدین اکاؤنٹ {1} موجود نہیں ہے
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),قیمت کی فہرست شرح (کمپنی کرنسی)
 DocType: Products Settings,Products Settings,مصنوعات ترتیبات
@@ -4098,13 +4187,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,آئٹم حکمت ٹیکس تفصیل
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,انسٹی ٹیوٹ مخفف
 ,Item-wise Price List Rate,آئٹم وار قیمت کی فہرست شرح
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,پردایک کوٹیشن
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,پردایک کوٹیشن
 DocType: Quotation,In Words will be visible once you save the Quotation.,آپ کوٹیشن بچانے بار الفاظ میں نظر آئے گا.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},مقدار ({0}) قطار میں ایک حصہ نہیں ہو سکتا {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},مقدار ({0}) قطار میں ایک حصہ نہیں ہو سکتا {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},بارکوڈ {0} پہلے ہی آئٹم میں استعمال {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},بارکوڈ {0} پہلے ہی آئٹم میں استعمال {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,شپنگ کے اخراجات شامل کرنے کے لئے رولز.
 DocType: Item,Opening Stock,اسٹاک کھولنے
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,کسٹمر کی ضرورت ہے
@@ -4122,9 +4211,8 @@
 DocType: Customer,From Lead,لیڈ سے
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,احکامات کی پیداوار کے لئے جاری.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,مالی سال منتخب کریں ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,پی او ایس پی او ایس پروفائل اندراج کرنے کے لئے کی ضرورت ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,پی او ایس پی او ایس پروفائل اندراج کرنے کے لئے کی ضرورت ہے
 DocType: Program Enrollment Tool,Enroll Students,طلباء اندراج کریں
-DocType: Hub Settings,Name Token,نام ٹوکن
 DocType: Lab Test,Approved Date,منظور شدہ تاریخ
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,سٹینڈرڈ فروخت
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,کم سے کم ایک گودام لازمی ہے
@@ -4142,7 +4230,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,انسانی وسائل
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,ادائیگی مفاہمت ادائیگی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,ٹیکس اثاثے
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},پیداوار آرڈر {0} ہے
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},پیداوار آرڈر {0} ہے
 DocType: BOM Item,BOM No,BOM کوئی
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,جرنل اندراج {0} {1} یا پہلے سے ہی دیگر واؤچر خلاف مماثلت اکاؤنٹ نہیں ہے
@@ -4162,7 +4250,7 @@
 DocType: Currency Exchange,To Currency,سینٹ کٹس اور نیوس
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,مندرجہ ذیل صارفین بلاک دنوں کے لئے چھوڑ درخواستیں منظور کرنے کی اجازت دیں.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,خرچ دعوی کی اقسام.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},آئٹم {0} کے لئے فروخت کی شرح اس سے کم ہے {1}. فروخت کی شرح کو کم از کم ہونا چاہئے {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},آئٹم {0} کے لئے فروخت کی شرح اس سے کم ہے {1}. فروخت کی شرح کو کم از کم ہونا چاہئے {2}
 DocType: Item,Taxes,ٹیکسز
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,ادا کی اور نجات نہیں
 DocType: Project,Default Cost Center,پہلے سے طے شدہ لاگت مرکز
@@ -4176,15 +4264,15 @@
 DocType: Employee Loan,Fully Disbursed,مکمل طور پر زرعی قرضوں کی فراہمی
 DocType: Maintenance Visit,Customer Feedback,کسٹمر آپ کی رائے
 DocType: Account,Expense,اخراجات
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,اسکور کے مقابلے میں زیادہ سے زیادہ سکور زیادہ نہیں ہو سکتی
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,اسکور کے مقابلے میں زیادہ سے زیادہ سکور زیادہ نہیں ہو سکتی
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,گاہکوں اور سپلائرز
 DocType: Item Attribute,From Range,رینج سے
 DocType: BOM,Set rate of sub-assembly item based on BOM,بوم پر مبنی ذیلی اسمبلی کی اشیاء کی شرح سیٹ کریں
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},فارمولہ یا حالت میں مطابقت پذیر غلطی: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},فارمولہ یا حالت میں مطابقت پذیر غلطی: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,روز مرہ کے کام کا خلاصہ ترتیبات کمپنی
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,اس کے بعد سے نظر انداز کر دیا آئٹم {0} اسٹاک شے نہیں ہے
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,مزید کارروائی کے لئے اس کی پیداوار آرڈر جمع کرائیں.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,مزید کارروائی کے لئے اس کی پیداوار آرڈر جمع کرائیں.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",ایک مخصوص ٹرانزیکشن میں قیمتوں کا تعین اصول لاگو نہیں کرنے کے لئے، تمام قابل اطلاق قیمتوں کا تعین قواعد غیر فعال کیا جانا چاہئے.
 DocType: Assessment Group,Parent Assessment Group,والدین کا تعین گروپ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,نوکریاں
@@ -4201,12 +4289,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',اگر گروپ سے &#39;کمپنی&#39; ہے کمپنی فلٹر کو خالی مقرر مہربانی
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,پوسٹنگ کی تاریخ مستقبل کی تاریخ میں نہیں ہو سکتا
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},صف # {0}: سیریل نمبر {1} کے ساتھ مطابقت نہیں ہے {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,بار بار پیدا کرنے کے لئے
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,آرام دہ اور پرسکون کی رخصت
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,لیب ٹیسٹ UOM.
 DocType: Batch,Batch ID,بیچ کی شناخت
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},نوٹ: {0}
 ,Delivery Note Trends,ترسیل کے نوٹ رجحانات
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,اس ہفتے کے خلاصے
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,اس ہفتے کے خلاصے
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,اسٹاک قی میں
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,اکاؤنٹ: {0} صرف اسٹاک معاملات کے ذریعے اپ ڈیٹ کیا جا سکتا ہے
 DocType: Student Group Creation Tool,Get Courses,کورسز حاصل کریں
@@ -4220,7 +4309,6 @@
 DocType: Purchase Order,To Bill,بل میں
 DocType: Material Request,% Ordered,٪سامان آرڈرھوگیا
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",کورس کی بنیاد پر طالب علم گروپ کے لئے، کورس کے پروگرام اندراج میں اندراج کورس سے ہر طالب علم کے لئے جائز قرار دیا جائے گا.
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date",کوما سے علیحدہ درج کریں ای میل ایڈریس، انوائس خاص تاریخ پر خود کار طریقے سے بھیج دیا جائے گا
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Piecework
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,اوسط. خرید کی شرح
 DocType: Task,Actual Time (in Hours),(گھنٹوں میں) اصل وقت
@@ -4234,7 +4322,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,{0} آئٹم سیریل نمبر کے لئے سیٹ اپ نہیں ہے. کالم خالی ہونا ضروری ہے
 DocType: Accounts Settings,Accounts Settings,ترتیبات اکاؤنٹس
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,منظور کریں
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,جمع کرنے کا کوئی نتیجہ نہیں
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,جمع کرنے کا کوئی نتیجہ نہیں
 DocType: Customer,Sales Partner and Commission,سیلز پارٹنر اور کمیشن
 DocType: Employee Loan,Rate of Interest (%) / Year,سود (٪) / سال کی شرح
 ,Project Quantity,پروجیکٹ مقدار
@@ -4246,55 +4334,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,سیاہ
 DocType: BOM Explosion Item,BOM Explosion Item,BOM دھماکہ آئٹم
 DocType: Account,Auditor,آڈیٹر
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} سے تیار اشیاء
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} سے تیار اشیاء
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,اورجانیے
 DocType: Cheque Print Template,Distance from top edge,اوپر کے کنارے سے فاصلہ
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,قیمت کی فہرست {0} غیر فعال ہے یا موجود نہیں ہے
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,قیمت کی فہرست {0} غیر فعال ہے یا موجود نہیں ہے
 DocType: Purchase Invoice,Return,واپس
 DocType: Production Order Operation,Production Order Operation,پروڈکشن آرڈر آپریشن
 DocType: Pricing Rule,Disable,غیر فعال کریں
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,ادائیگی کا طریقہ ایک ادائیگی کرنے کے لئے کی ضرورت ہے
 DocType: Project Task,Pending Review,زیر جائزہ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,اپیلمنٹ اور کنسلٹنٹس
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} بیچ میں اندراج نہیں ہے {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} بیچ میں اندراج نہیں ہے {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",یہ پہلے سے ہی ہے کے طور پر اثاثہ {0}، ختم نہیں کیا جا سکتا {1}
 DocType: Task,Total Expense Claim (via Expense Claim),(خرچ دعوی ذریعے) کل اخراجات کا دعوی
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,مارک غائب
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},صف {0}: BOM کی کرنسی # {1} کو منتخب کردہ کرنسی کے برابر ہونا چاہئے {2}
 DocType: Journal Entry Account,Exchange Rate,زر مبادلہ کی شرح
 DocType: Patient,Additional information regarding the patient,مریض کے متعلق اضافی معلومات
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,سیلز آرڈر {0} پیش نہیں ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,سیلز آرڈر {0} پیش نہیں ہے
 DocType: Homepage,Tag Line,ٹیگ لائن
 DocType: Fee Component,Fee Component,فیس اجزاء
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,بیڑے کے انتظام
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,سے اشیاء شامل کریں
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,بیڑے کے انتظام
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,سے اشیاء شامل کریں
 DocType: Cheque Print Template,Regular,باقاعدگی سے
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,تمام تشخیص کے معیار کے کل اہمیت کا ہونا ضروری ہے 100٪
-DocType: BOM,Last Purchase Rate,آخری خریداری کی شرح
+DocType: Purchase Order Item,Last Purchase Rate,آخری خریداری کی شرح
 DocType: Account,Asset,ایسیٹ
 DocType: Project Task,Task ID,ٹاسک ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,شے کے لئے موجود نہیں کر سکتے اسٹاک {0} کے بعد مختلف حالتوں ہے
 DocType: Lab Test,Mobile,موبائل
 ,Sales Person-wise Transaction Summary,فروخت شخص وار ٹرانزیکشن کا خلاصہ
 DocType: Training Event,Contact Number,رابطہ نمبر
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,گودام {0} موجود نہیں ہے
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext حب کے لئے اندراج کروائیں
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,گودام {0} موجود نہیں ہے
 DocType: Monthly Distribution,Monthly Distribution Percentages,ماہانہ تقسیم فی صد
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,منتخب شے بیچ نہیں کر سکتے ہیں
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",تشخیص کی شرح کے لئے اکاؤنٹنگ اندراجات کو ایسا کرنے کی ضرورت ہے جس آئٹم {0}، کے لئے نہیں پایا {1} {2}. آئٹم میں ایک نمونہ شے کے طور transacting کر رہا ہے تو {1}، {1} آئٹم ٹیبل میں کہ ذکر کریں. دوسری صورت میں، آئٹم کے ریکارڈ میں شے یا ذکر تشخیص کی شرح کے لئے ایک آنے والے اسٹاک ٹرانزیکشن کی تخلیق، اور پھر submiting کوشش کریں / اس اندراج منسوخ کریں براہ مہربانی
 DocType: Delivery Note,% of materials delivered against this Delivery Note,مواد کی یہ ترسیل کے نوٹ کے خلاف ہونے والا
+DocType: Training Event,Has Certificate,سرٹیفکیٹ ہے
 DocType: Project,Customer Details,گاہک کی تفصیلات
 DocType: Employee,Reports to,رپورٹیں
 ,Unpaid Expense Claim,بلا معاوضہ اخراجات دعوی
 DocType: Payment Entry,Paid Amount,ادائیگی کی رقم
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,سیلز سائیکل کا پتہ لگائیں
 DocType: Assessment Plan,Supervisor,سپروائزر
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,آن لائن
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,آن لائن
 ,Available Stock for Packing Items,پیکنگ اشیاء کے لئے دستیاب اسٹاک
 DocType: Item Variant,Item Variant,آئٹم مختلف
 DocType: Assessment Result Tool,Assessment Result Tool,تشخیص کے نتائج کا آلہ
 DocType: BOM Scrap Item,BOM Scrap Item,BOM سکریپ آئٹم
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,پیش احکامات خارج کر دیا نہیں کیا جا سکتا
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,پیش احکامات خارج کر دیا نہیں کیا جا سکتا
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",پہلے سے ڈیبٹ میں اکاؤنٹ بیلنس، آپ کو کریڈٹ &#39;کے طور پر کی بیلنس ہونا چاہئے&#39; قائم کرنے کی اجازت نہیں کر رہے ہیں
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,معیار منظم رکھنا
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,{0} آئٹم غیر فعال ہوگئی ہے
@@ -4315,7 +4402,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,اجازت دیں زیرو تشخیص کی شرح
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,اجازت دیں زیرو تشخیص کی شرح
 DocType: Training Event Employee,Invited,مدعو
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,ملازم {0} کے لئے مل دی گئی تاریخوں کے لئے ایک سے زیادہ فعال تنخواہ تعمیرات
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,ملازم {0} کے لئے مل دی گئی تاریخوں کے لئے ایک سے زیادہ فعال تنخواہ تعمیرات
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,سیٹ اپ گیٹ وے اکاؤنٹس.
 DocType: Employee,Employment Type,ملازمت کی قسم
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,مقرر اثاثے
@@ -4327,7 +4414,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Student کی ای میل آئی ڈی
 DocType: Employee,Notice (days),نوٹس (دن)
 DocType: Tax Rule,Sales Tax Template,سیلز ٹیکس سانچہ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,انوائس کو بچانے کے لئے اشیاء کو منتخب کریں
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,انوائس کو بچانے کے لئے اشیاء کو منتخب کریں
 DocType: Employee,Encashment Date,معاوضہ تاریخ
 DocType: Training Event,Internet,انٹرنیٹ
 DocType: Special Test Template,Special Test Template,خصوصی ٹیسٹ سانچہ
@@ -4337,7 +4424,7 @@
 DocType: Academic Term,Term Start Date,ٹرم شروع کرنے کی تاریخ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,بالمقابل شمار
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,بالمقابل شمار
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},تلاش کریں منسلک {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},تلاش کریں منسلک {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,جنرل لیجر کے مطابق بینک کا گوشوارہ توازن
 DocType: Job Applicant,Applicant Name,درخواست گزار کا نام
 DocType: Authorization Rule,Customer / Item Name,کسٹمر / نام شے
@@ -4357,7 +4444,7 @@
 DocType: Guardian,Guardian Of ,کے ولی
 DocType: Grading Scale Interval,Threshold,تھریشولڈ
 DocType: BOM Update Tool,Current BOM,موجودہ BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,سیریل نمبر شامل
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,سیریل نمبر شامل
 DocType: Production Order Item,Available Qty at Source Warehouse,ماخذ گودام پر دستیاب قی
 apps/erpnext/erpnext/config/support.py +22,Warranty,وارنٹی
 DocType: Purchase Invoice,Debit Note Issued,ڈیبٹ نوٹ اجراء
@@ -4380,10 +4467,9 @@
 DocType: Account,Receivable,وصولی
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,صف # {0}: خریداری کے آرڈر پہلے سے موجود ہے کے طور پر سپلائر تبدیل کرنے کی اجازت نہیں
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,مقرر کریڈٹ کی حد سے تجاوز ہے کہ لین دین پیش کرنے کی اجازت ہے کہ کردار.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,تیار کرنے کی اشیا منتخب کریں
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time",ماسٹر ڈیٹا مطابقت پذیری، اس میں کچھ وقت لگ سکتا ہے
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,تیار کرنے کی اشیا منتخب کریں
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time",ماسٹر ڈیٹا مطابقت پذیری، اس میں کچھ وقت لگ سکتا ہے
 DocType: Item,Material Issue,مواد مسئلہ
-DocType: Hub Settings,Seller Description,فروش تفصیل
 DocType: Employee Education,Qualification,اہلیت
 DocType: Item Price,Item Price,شے کی قیمت
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,صابن اور ڈٹرجنٹ
@@ -4391,7 +4477,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,وقت سے وقت سے زیادہ نہیں ہو سکتا.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,موشن پکچر اور ویڈیو
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,کا حکم دیا
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,دوبارہ شروع کریں
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,دوبارہ شروع کریں
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,اگر فعال ہو تو نظام ٹیمپلیٹ کے مختلف قسم کے میدانوں کو اپ ڈیٹ نہیں کرے گا لیکن نئے مختلف قسم کے بنانے کے دوران مندرجہ ذیل ذکر شدہ شعبوں کا ڈیٹا نقل کرے گا.
 DocType: Salary Detail,Component,اجزاء
 DocType: Assessment Criteria,Assessment Criteria Group,تشخیص کا معیار گروپ
 DocType: Healthcare Settings,Patient Name By,مریض کا نام
@@ -4401,7 +4488,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,کردار کی منظوری یا صارف منظوری داخل کریں
 DocType: Journal Entry,Write Off Entry,انٹری لکھنے
 DocType: BOM,Rate Of Materials Based On,شرح معدنیات کی بنیاد پر
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,سپلائر&gt; سپلائی کی قسم
+DocType: Item Variant Settings,Do not Update Variants,متغیرات کو اپ ڈیٹ نہ کریں
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,سپورٹ Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,تمام کو غیر منتخب
 DocType: POS Profile,Terms and Conditions,شرائط و ضوابط
@@ -4410,7 +4497,7 @@
 DocType: Leave Block List,Applies to Company,کمپنی پر لاگو ہوتا ہے
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,پیش اسٹاک انٹری {0} موجود ہے کیونکہ منسوخ نہیں کر سکتے
 DocType: Employee Loan,Disbursement Date,ادائیگی کی تاریخ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;وصول کنندگان&#39; متعین نہیں ہیں
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;وصول کنندگان&#39; متعین نہیں ہیں
 DocType: BOM Update Tool,Update latest price in all BOMs,تمام بی ایمز میں تازہ ترین قیمت اپ ڈیٹ کریں
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,میڈیکل ریکارڈ
 DocType: Vehicle,Vehicle,وہیکل
@@ -4426,14 +4513,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,بالمقابل / لیڈ٪
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,ایسیٹ Depreciations اور توازن
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},رقم {0} {1} سے منتقل کرنے {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},رقم {0} {1} سے منتقل کرنے {2} {3}
 DocType: Sales Invoice,Get Advances Received,پیشگی موصول ہو جاؤ
 DocType: Email Digest,Add/Remove Recipients,وصول کنندگان کو ہٹا دیں شامل کریں /
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},ٹرانزیکشن روک پیداوار کے خلاف کی اجازت نہیں آرڈر {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",، پہلے سے طے شدہ طور پر اس مالی سال مقرر کرنے کیلئے &#39;پہلے سے طے شدہ طور پر مقرر کریں&#39; پر کلک کریں
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,شامل ہوں
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,شامل ہوں
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,کمی کی مقدار
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,آئٹم ویرینٹ {0} اسی صفات کے ساتھ موجود
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,آئٹم ویرینٹ {0} اسی صفات کے ساتھ موجود
 DocType: Employee Loan,Repay from Salary,تنخواہ سے ادا
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},{2} {1} کے خلاف ادائیگی {2}
@@ -4446,7 +4533,7 @@
 DocType: Sales Invoice Item,Sales Order Item,سیلز آرڈر آئٹم
 DocType: Salary Slip,Payment Days,ادائیگی دنوں
 DocType: Patient,Dormant,امن
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,بچے نوڈس کے ساتھ گوداموں لیجر میں تبدیل نہیں کیا جا سکتا
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,بچے نوڈس کے ساتھ گوداموں لیجر میں تبدیل نہیں کیا جا سکتا
 DocType: BOM,Manage cost of operations,آپریشن کے اخراجات کا انتظام
 DocType: Accounts Settings,Stale Days,اسٹیل دن
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",جانچ پڑتال کے لین دین کے کسی بھی &quot;پیش&quot; کر رہے ہیں تو، ایک ای میل پاپ اپ خود کار طریقے سے منسلکہ کے طور پر لین دین کے ساتھ، کہ ٹرانزیکشن میں منسلک &quot;رابطہ&quot; کو ایک ای میل بھیجنے کے لئے کھول دیا. صارف مئی یا ای میل بھیجنے کے نہیں کر سکتے ہیں.
@@ -4460,10 +4547,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,سیریل نمبر {0} پہلے سے حاصل کیا گیا ہے
 ,Requested Items To Be Transferred,درخواست کی اشیاء منتقل کیا جائے
 DocType: Expense Claim,Vehicle Log,گاڑیوں کے تبا
-DocType: Purchase Invoice,Recurring Id,مکرر شناخت
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),بخار کی موجودگی (طلبا&gt; 38.5 ° C / 101.3 ° F یا مستحکم طے شدہ&gt; 38 ° C / 100.4 ° F)
 DocType: Customer,Sales Team Details,سیلز ٹیم تفصیلات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,مستقل طور پر خارج کر دیں؟
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,مستقل طور پر خارج کر دیں؟
 DocType: Expense Claim,Total Claimed Amount,کل دعوی رقم
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,فروخت کے لئے ممکنہ مواقع.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},غلط {0}
@@ -4473,7 +4559,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ڈیپارٹمنٹ سٹور
 ,Item Delivery Date,آئٹم ترسیل کی تاریخ
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,ERPNext میں اپنے سکول کا سیٹ اپ
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,ERPNext میں اپنے سکول کا سیٹ اپ
 DocType: Sales Invoice,Base Change Amount (Company Currency),بیس بدلیں رقم (کمپنی کرنسی)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,مندرجہ ذیل گوداموں کے لئے کوئی اکاؤنٹنگ اندراجات
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,پہلی دستاویز کو بچانے کے.
@@ -4485,13 +4571,12 @@
 DocType: Task,Is Milestone,سنگ میل ہے
 DocType: Daily Work Summary,Email Sent To,ای میل بھیجا
 DocType: Budget,Warn,انتباہ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,کیا آپ واقعی غیر رجسٹر کرنا چاہتے ہیں؟
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",کسی بھی دوسرے ریمارکس، ریکارڈ میں جانا چاہئے کہ قابل ذکر کوشش.
 DocType: BOM,Manufacturing User,مینوفیکچرنگ صارف
 DocType: Purchase Invoice,Raw Materials Supplied,خام مال فراہم
-DocType: Purchase Invoice,Recurring Print Format,مکرر پرنٹ کی شکل
 DocType: C-Form,Series,سیریز
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},قیمت فہرست {0} کی کرنسی ہونا ضروری ہے {1} یا {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,مصنوعات شامل کریں
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},قیمت فہرست {0} کی کرنسی ہونا ضروری ہے {1} یا {2}
 DocType: Appraisal,Appraisal Template,تشخیص سانچہ
 DocType: Item Group,Item Classification,آئٹم کی درجہ بندی
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,بزنس ڈیولپمنٹ مینیجر
@@ -4505,7 +4590,7 @@
 DocType: Item Attribute Value,Attribute Value,ویلیو وصف
 ,Itemwise Recommended Reorder Level,Itemwise ترتیب لیول سفارش
 DocType: Salary Detail,Salary Detail,تنخواہ تفصیل
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,پہلے {0} براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,پہلے {0} براہ مہربانی منتخب کریں
 DocType: Appointment Type,Physician,ڈاکٹر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,آئٹم کے بیچ {0} {1} ختم ہو گیا ہے.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,مشاورت
@@ -4516,7 +4601,7 @@
 DocType: Salary Detail,Default Amount,پہلے سے طے شدہ رقم
 DocType: Lab Test Template,Descriptive,تشریحی
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,گودام کے نظام میں نہیں ملا
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,اس ماہ کے خلاصے
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,اس ماہ کے خلاصے
 DocType: Quality Inspection Reading,Quality Inspection Reading,معیار معائنہ پڑھنا
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`جھروکے سٹاکس پرانے Than`٪ d دن سے چھوٹا ہونا چاہئے.
 DocType: Tax Rule,Purchase Tax Template,ٹیکس سانچہ خریداری
@@ -4539,12 +4624,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,تربیت کے واقعات / نتائج
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,کے طور پر ہراس جمع
 DocType: Sales Invoice,C-Form Applicable,سی فارم لاگو
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},آپریشن کے وقت کے آپریشن کے لئے زیادہ سے زیادہ 0 ہونا ضروری ہے {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},آپریشن کے وقت کے آپریشن کے لئے زیادہ سے زیادہ 0 ہونا ضروری ہے {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,گودام لازمی ہے
 DocType: Supplier,Address and Contacts,ایڈریس اور رابطے
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM تبادلوں تفصیل
 DocType: Program,Program Abbreviation,پروگرام کا مخفف
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,پروڈکشن آرڈر شے سانچہ خلاف اٹھایا نہیں کیا جا سکتا
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,پروڈکشن آرڈر شے سانچہ خلاف اٹھایا نہیں کیا جا سکتا
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,چارجز ہر شے کے خلاف خریداری کی رسید میں اپ ڈیٹ کیا جاتا ہے
 DocType: Warranty Claim,Resolved By,کی طرف سے حل
 DocType: Bank Guarantee,Start Date,شروع کرنے کی تاریخ
@@ -4570,27 +4655,28 @@
 DocType: Employee,Educational Qualification,تعلیمی اہلیت
 DocType: Workstation,Operating Costs,آپریٹنگ اخراجات
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,ایکشن اگر جمع ماہانہ بجٹ سے تجاوز
-DocType: Purchase Invoice,Submit on creation,تخلیق پر جمع کرائیں
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},{0} کیلئے کرنسی ہونا ضروری ہے {1}
+DocType: Subscription,Submit on creation,تخلیق پر جمع کرائیں
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},{0} کیلئے کرنسی ہونا ضروری ہے {1}
 DocType: Asset,Disposal Date,ڈسپوزل تاریخ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",ای میلز، دی وقت کمپنی کے تمام فعال ملازمین کو بھیجی جائے گی وہ چھٹی نہیں ہے تو. جوابات کا خلاصہ آدھی رات کو بھیجا جائے گا.
 DocType: Employee Leave Approver,Employee Leave Approver,ملازم کی رخصت کی منظوری دینے والا
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: ایک ترتیب اندراج پہلے ہی اس گودام کے لئے موجود ہے {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.",کوٹیشن بنا دیا گیا ہے کیونکہ، کے طور پر کھو نہیں بتا سکتے.
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,ٹریننگ کی رائے
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: ایک ترتیب اندراج پہلے ہی اس گودام کے لئے موجود ہے {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.",کوٹیشن بنا دیا گیا ہے کیونکہ، کے طور پر کھو نہیں بتا سکتے.
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,ٹریننگ کی رائے
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,آرڈر {0} پیش کرنا ضروری ہے پیداوار
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,سپلائر اسکور کارڈ معیار
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},شے کے لئے شروع کرنے کی تاریخ اور اختتام تاریخ کا انتخاب کریں براہ کرم {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},قطار {0} کورس لازمی ہے
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,تاریخ کی تاریخ کی طرف سے پہلے نہیں ہو سکتا
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,/ ترمیم قیمتیں شامل
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,/ ترمیم قیمتیں شامل
 DocType: Batch,Parent Batch,والدین بیچ
 DocType: Batch,Parent Batch,والدین بیچ
 DocType: Cheque Print Template,Cheque Print Template,چیک پرنٹ سانچہ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,لاگت کے مراکز کا چارٹ
 DocType: Lab Test Template,Sample Collection,نمونہ مجموعہ
 ,Requested Items To Be Ordered,درخواست کی اشیاء حکم دیا جائے گا
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,میرے حکم
 DocType: Price List,Price List Name,قیمت کی فہرست کا نام
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},{0} کیلئے روزانہ کام خلاصہ
 DocType: Employee Loan,Totals,کل
@@ -4609,12 +4695,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1} میں ضرورت {2} پر {3} {4} کو {5} اس ٹرانزیکشن مکمل کرنے کے یونٹوں.
 DocType: Fee Schedule,Student Category,Student کی قسم
 DocType: Announcement,Student,طالب علم
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,تنظیمی اکائی (محکمہ) ماسٹر.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,تنظیمی اکائی (محکمہ) ماسٹر.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,کمرے میں جاؤ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,بھیجنے سے پہلے پیغام درج کریں
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,سپلائر کے لئے نقل
 DocType: Email Digest,Pending Quotations,کوٹیشن زیر التوا
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,پوائنٹ کے فروخت پروفائل
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,پوائنٹ کے فروخت پروفائل
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,لیب ٹیسٹنگ ترتیب.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,امائبھوت قرض
 DocType: Cost Center,Cost Center Name,لاگت مرکز نام
@@ -4624,6 +4710,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,کل ادا AMT
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 حروف سے زیادہ پیغامات سے زیادہ پیغامات میں تقسیم کیا جائے گا
 DocType: Purchase Receipt Item,Received and Accepted,موصول ہوئی ہے اور قبول کر لیا
+DocType: Hub Settings,Company and Seller Profile,کمپنی اور بیچنے والا پروفائل
 ,GST Itemised Sales Register,GST آئٹمائزڈ سیلز رجسٹر
 ,Serial No Service Contract Expiry,سیریل کوئی خدمات کا معاہدہ ختم ہونے کی
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,آپ کے کریڈٹ اور ایک ہی وقت میں ایک ہی اکاؤنٹ سے ڈیبٹ نہیں کر سکتے ہیں
@@ -4633,10 +4720,11 @@
 DocType: Item,Variant Based On,ویرینٹ بنیاد پر
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},100٪ ہونا چاہئے تفویض کل اہمیت. یہ {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,اپنے سپلائرز
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,براہ کرم درست کریں
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,سیلز آرڈر بنایا گیا ہے کے طور پر کھو کے طور پر مقرر کر سکتے ہیں.
 DocType: Request for Quotation Item,Supplier Part No,پردایک حصہ نہیں
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',زمرہ &#39;تشخیص&#39; یا &#39;Vaulation اور کل&#39; کے لیے ہے جب کٹوتی نہیں کی جا سکتی
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,کی طرف سے موصول
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,کی طرف سے موصول
 DocType: Lead,Converted,تبدیل
 DocType: Item,Has Serial No,سیریل نہیں ہے
 DocType: Employee,Date of Issue,تاریخ اجراء
@@ -4644,7 +4732,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",خریدنے کی ترتیبات کے مطابق اگر خریداری کی ضرورت ہو تو == &#39;YES&#39;، پھر خریداری انوائس کی تخلیق کے لۓ، صارف کو شے کے لئے سب سے پہلے خریداری رسید بنانے کی ضرورت ہے {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},صف # {0}: شے کے لئے مقرر پردایک {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,صف {0}: گھنٹے قدر صفر سے زیادہ ہونا چاہیے.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,ویب سائٹ تصویری {0} آئٹم {1} سے منسلک نہیں مل سکتا
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,ویب سائٹ تصویری {0} آئٹم {1} سے منسلک نہیں مل سکتا
 DocType: Issue,Content Type,مواد کی قسم
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,کمپیوٹر
 DocType: Item,List this Item in multiple groups on the website.,ویب سائٹ پر ایک سے زیادہ گروہوں میں اس شے کی فہرست.
@@ -4655,14 +4743,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled لکھے حاصل
 DocType: Payment Reconciliation,From Invoice Date,انوائس کی تاریخ سے
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,آپ کو جمع کرنے کی اجازت نہیں ہے
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,بلنگ کی کرنسی comapany کی یا تو ڈیفالٹ کرنسی یا پارٹی کے اکاؤنٹ کی کرنسی کے برابر ہونا چاہیے
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,بلنگ کی کرنسی comapany کی یا تو ڈیفالٹ کرنسی یا پارٹی کے اکاؤنٹ کی کرنسی کے برابر ہونا چاہیے
 DocType: Healthcare Settings,Laboratory Settings,لیبارٹری کی ترتیبات
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,معاوضہ چھوڑ دو
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,یہ کیا کرتا ہے؟
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,گودام میں
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,تمام طالب علم داخلہ
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,یہ کیا کرتا ہے؟
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,گودام میں
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,تمام طالب علم داخلہ
 ,Average Commission Rate,اوسط کمیشن کی شرح
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,&#39;ہاں&#39; ہونا غیر اسٹاک شے کے لئے نہیں کر سکتے ہیں &#39;سیریل نہیں ہے&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,&#39;ہاں&#39; ہونا غیر اسٹاک شے کے لئے نہیں کر سکتے ہیں &#39;سیریل نہیں ہے&#39;
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,حیثیت کا انتخاب کریں
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,حاضری مستقبل کی تاریخوں کے لئے نشان لگا دیا گیا نہیں کیا جا سکتا
 DocType: Pricing Rule,Pricing Rule Help,قیمتوں کا تعین حکمرانی کی مدد
@@ -4680,40 +4768,40 @@
 DocType: Item,Customer Code,کسٹمر کوڈ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},کے لئے سالگرہ کی یاد دہانی {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,آخری آرڈر کے بعد دن
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,اکاؤنٹ ڈیبٹ ایک بیلنس شیٹ اکاؤنٹ ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,اکاؤنٹ ڈیبٹ ایک بیلنس شیٹ اکاؤنٹ ہونا ضروری ہے
 DocType: Buying Settings,Naming Series,نام سیریز
 DocType: Leave Block List,Leave Block List Name,بلاک کریں فہرست کا نام چھوڑ دو
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,انشورنس تاریخ آغاز انشورنس تاریخ اختتام سے کم ہونا چاہئے
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,براہ کرم سکول میں سکول کی ترتیبات میں اساتذہ نامیاتی نظام قائم کریں
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,اسٹاک اثاثوں
 DocType: Timesheet,Production Detail,پیداوار تفصیل
+DocType: Restaurant,Active Menu,فعال مینو
 DocType: Target Detail,Target Qty,ہدف کی مقدار
 DocType: Shopping Cart Settings,Checkout Settings,چیک آؤٹ ترتیبات
 DocType: Attendance,Present,موجودہ
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,ترسیل کے نوٹ {0} پیش نہیں کیا جانا چاہئے
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,ترسیل کے نوٹ {0} پیش نہیں کیا جانا چاہئے
 DocType: Notification Control,Sales Invoice Message,فروخت انوائس پیغام
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,اکاؤنٹ {0} بند قسم ذمہ داری / اکوئٹی کا ہونا ضروری ہے
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},ملازم کی تنخواہ کی پرچی {0} کے پاس پہلے وقت شیٹ کے لئے پیدا {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},ملازم کی تنخواہ کی پرچی {0} کے پاس پہلے وقت شیٹ کے لئے پیدا {1}
 DocType: Vehicle Log,Odometer,مسافت پیما
 DocType: Sales Order Item,Ordered Qty,کا حکم دیا مقدار
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,آئٹم {0} غیر فعال ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,آئٹم {0} غیر فعال ہے
 DocType: Stock Settings,Stock Frozen Upto,اسٹاک منجمد تک
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM کسی بھی اسٹاک شے پر مشتمل نہیں ہے
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,پروجیکٹ سرگرمی / کام.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM کسی بھی اسٹاک شے پر مشتمل نہیں ہے
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,پروجیکٹ سرگرمی / کام.
 DocType: Vehicle Log,Refuelling Details,Refuelling تفصیلات
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,تنخواہ تخم پیدا
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}",قابل اطلاق کے لئے کے طور پر منتخب کیا جاتا ہے تو خریدنے، جانچ پڑتال ہونا ضروری {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ڈسکاؤنٹ کم 100 ہونا ضروری ہے
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,آخری خریداری کی شرح نہ پایا
 DocType: Purchase Invoice,Write Off Amount (Company Currency),رقم لکھیں (کمپنی کرنسی)
 DocType: Sales Invoice Timesheet,Billing Hours,بلنگ کے اوقات
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,{0} نہیں پایا کیلئے ڈیفالٹ BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,صف # {0}: ترتیب مقدار مقرر کریں
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,{0} نہیں پایا کیلئے ڈیفالٹ BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,صف # {0}: ترتیب مقدار مقرر کریں
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,انہیں یہاں شامل کرنے کے لئے اشیاء کو تھپتھپائیں
 DocType: Fees,Program Enrollment,پروگرام کا اندراج
 DocType: Landed Cost Voucher,Landed Cost Voucher,لینڈڈ لاگت واؤچر
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},مقرر کریں {0}
-DocType: Purchase Invoice,Repeat on Day of Month,مہینے کا دن پر دہرائیں
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} غیر فعال طالب علم ہے
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} غیر فعال طالب علم ہے
 DocType: Employee,Health Details,صحت کی تفصیلات
 DocType: Offer Letter,Offer Letter Terms,خط کی شرائط کی پیشکش
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,ایک ادائیگی کی درخواست ریفرنس دستاویز کی ضرورت ہے پیدا کرنے کے لئے
@@ -4722,7 +4810,6 @@
 DocType: Employee External Work History,Salary,تنخواہ
 DocType: Serial No,Delivery Document Type,ڈلیوری دستاویز کی قسم
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,اوپر منتخب شدہ معیار کے لئے تمام تنخواہ تخم جمع کرائیں
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} اشیا موافقت پذیر
 DocType: Sales Order,Partly Delivered,جزوی طور پر ہونے والا
 DocType: Email Digest,Receivables,وصولی
 DocType: Lead Source,Lead Source,لیڈ ماخذ
@@ -4743,9 +4830,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,خستہ حد: 2
 DocType: SG Creation Tool Course,Max Strength,زیادہ سے زیادہ طاقت
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM تبدیل
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,ترسیل کی تاریخ پر مبنی اشیاء منتخب کریں
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,ترسیل کی تاریخ پر مبنی اشیاء منتخب کریں
 ,Sales Analytics,سیلز تجزیات
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},دستیاب {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},دستیاب {0}
 ,Prospects Engaged But Not Converted,امکانات منگنی لیکن تبدیل نہیں
 ,Prospects Engaged But Not Converted,امکانات منگنی لیکن تبدیل نہیں
 DocType: Manufacturing Settings,Manufacturing Settings,مینوفیکچرنگ کی ترتیبات
@@ -4753,10 +4840,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 موبائل نمبر
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,کمپنی ماسٹر میں پہلے سے طے شدہ کرنسی داخل کریں
 DocType: Stock Entry Detail,Stock Entry Detail,اسٹاک انٹری تفصیل
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,ڈیلی یاددہانی
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,ڈیلی یاددہانی
 DocType: Products Settings,Home Page is Products,ہوم پیج مصنوعات ہے
 ,Asset Depreciation Ledger,اثاثہ ہراس لیجر
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},ٹیکس اصول ٹکراؤ {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},ٹیکس اصول ٹکراؤ {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,نئے اکاؤنٹ کا نام
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,خام مال فراہم لاگت
 DocType: Selling Settings,Settings for Selling Module,ماڈیول فروخت کے لئے ترتیبات
@@ -4770,8 +4857,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,آئٹم {0} اسٹاک آئٹم ہونا ضروری ہے
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,پیش رفت گودام میں پہلے سے طے شدہ کام
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,اکاؤنٹنگ لین دین کے لئے پہلے سے طے شدہ ترتیبات.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,براہ کرم انسانی وسائل&gt; HR ترتیبات میں ملازم نامی کا نظام قائم کریں
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,متوقع تاریخ مواد کی درخواست کی تاریخ سے پہلے نہیں ہو سکتا
+DocType: Restaurant,Default Tax Template,ڈیفالٹ ٹیکس سانچہ
 DocType: Fees,Student Details,طالب علم کی تفصیلات
 DocType: Purchase Invoice Item,Stock Qty,اسٹاک قی
 DocType: Purchase Invoice Item,Stock Qty,اسٹاک قی
@@ -4790,8 +4878,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,اشیاء پر جائیں
 DocType: Sales Partner,Partner Type,پارٹنر کی قسم
 DocType: Purchase Taxes and Charges,Actual,اصل
+DocType: Restaurant Menu,Restaurant Manager,ریسٹورانٹ مینیجر
 DocType: Authorization Rule,Customerwise Discount,Customerwise ڈسکاؤنٹ
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,کاموں کے لئے Timesheet.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,کاموں کے لئے Timesheet.
 DocType: Purchase Invoice,Against Expense Account,اخراجات کے اکاؤنٹ کے خلاف
 DocType: Production Order,Production Order,پروڈکشن آرڈر
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,تنصیب نوٹ {0} پہلے ہی پیش کیا گیا ہے
@@ -4799,7 +4888,6 @@
 DocType: Quotation Item,Against Docname,Docname خلاف
 DocType: SMS Center,All Employee (Active),تمام ملازم (ایکٹو)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,اب ملاحظہ
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,انوائس خود کار طریقے سے پیدا کی جائے گی جب مدت کو منتخب کریں
 DocType: BOM,Raw Material Cost,خام مواد کی لاگت
 DocType: Item Reorder,Re-Order Level,دوبارہ آرڈر کی سطح
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,آپ کی پیداوار کے احکامات کو بڑھانے یا تجزیہ کے لئے خام مال، اتارنا کرنا چاہتے ہیں جس کے لئے اشیاء اور منصوبہ بندی کی مقدار درج کریں.
@@ -4812,24 +4900,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,رپورٹ کی قسم لازمی ہے
 DocType: Item,Serial Number Series,سیریل نمبر سیریز
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},گودام قطار میں اسٹاک آئٹم {0} کے لئے لازمی ہے {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,پروگرام شامل کریں
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,خوردہ اور تھوک فروشی
 DocType: Issue,First Responded On,پہلے جواب
 DocType: Website Item Group,Cross Listing of Item in multiple groups,ایک سے زیادہ گروہوں میں شے کی کراس لسٹنگ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},مالی سال شروع کرنے کی تاریخ اور مالی سال کے اختتام تاریخ پہلے ہی مالی سال میں مقرر کیا جاتا ہے {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,کلیئرنس کی تاریخ اپ ڈیٹ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,سپلٹ بیچ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,سپلٹ بیچ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,سپلٹ بیچ
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,سپلٹ بیچ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,کامیابی سے Reconciled
 DocType: Request for Quotation Supplier,Download PDF,لوڈ PDF
 DocType: Production Order,Planned End Date,منصوبہ بندی اختتام تاریخ
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,شیڈول کی تاریخ درج کریں
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,اشیاء کہاں محفوظ کیا جاتا ہے.
 DocType: Request for Quotation,Supplier Detail,پردایک تفصیل
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},فارمولا یا حالت میں خرابی: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},فارمولا یا حالت میں خرابی: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,انوائس کی رقم
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,معیار کے وزن 100٪
 DocType: Attendance,Attendance,حاضری
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,اسٹاک اشیا
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,اسٹاک اشیا
 DocType: BOM,Materials,مواد
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",نہیں کی جانچ پڑتال تو، فہرست یہ لاگو کیا جا کرنے کے لئے ہے جہاں ہر سیکشن میں شامل کرنا پڑے گا.
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,ذریعہ اور ہدف گودام ہی نہیں ہو سکتا
@@ -4846,6 +4934,7 @@
 DocType: Purchase Invoice,Advance Payments,ایڈوانس ادائیگی
 DocType: Purchase Taxes and Charges,On Net Total,نیٹ کل پر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,{0} قطار میں ہدف گودام پروڈکشن آرڈر کے طور پر ایک ہی ہونا چاہیے
+DocType: Restaurant Reservation,Waitlisted,انتظار کیا
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,کرنسی کسی دوسرے کرنسی استعمال اندراجات کرنے کے بعد تبدیل کر دیا گیا نہیں کیا جا سکتا
 DocType: Vehicle Service,Clutch Plate,کلچ پلیٹ
 DocType: Company,Round Off Account,اکاؤنٹ گول
@@ -4862,7 +4951,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,نیا سیلز شخص کا نام
 DocType: Packing Slip,Gross Weight UOM,مجموعی وزن UOM
 DocType: Delivery Note Item,Against Sales Invoice,فروخت انوائس کے خلاف
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,سے serialized شے کے لئے سیریل نمبرز درج کریں
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,سے serialized شے کے لئے سیریل نمبرز درج کریں
 DocType: Bin,Reserved Qty for Production,پیداوار کے لئے مقدار محفوظ ہیں-
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,انینترت چھوڑ دو آپ کو کورس کی بنیاد پر گروہوں بنانے کے دوران بیچ میں غور کرنے کے لئے نہیں کرنا چاہتے تو.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,انینترت چھوڑ دو آپ کو کورس کی بنیاد پر گروہوں بنانے کے دوران بیچ میں غور کرنے کے لئے نہیں کرنا چاہتے تو.
@@ -4874,7 +4963,7 @@
 DocType: Lab Test,Test Group,ٹیسٹ گروپ
 DocType: Payment Reconciliation,Receivable / Payable Account,وصولی / قابل ادائیگی اکاؤنٹ
 DocType: Delivery Note Item,Against Sales Order Item,سیلز آرڈر آئٹم خلاف
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},وصف کے لئے قدر وصف کی وضاحت کریں {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},وصف کے لئے قدر وصف کی وضاحت کریں {0}
 DocType: Item,Default Warehouse,پہلے سے طے شدہ گودام
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},بجٹ گروپ کے اکاؤنٹ کے خلاف مقرر نہیں کیا جا سکتا {0}
 DocType: Healthcare Settings,Patient Registration,مریض کا رجسٹریشن
@@ -4904,6 +4993,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,فروخت شخص
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,بجٹ اور لاگت سینٹر
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,ادائیگی کے ایک سے زیادہ ڈیفالٹ موڈ کی اجازت نہیں ہے
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,کے لئے
 ,Appointment Analytics,تقرری تجزیات
 DocType: Vehicle Service,Half Yearly,چھماہی
 DocType: Lead,Blog Subscriber,بلاگ سبسکرائبر
@@ -4923,7 +5013,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,عمومی quot شمار
 ,BOM Stock Report,BOM اسٹاک رپورٹ
 DocType: Stock Reconciliation Item,Quantity Difference,مقدار فرق
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,پروسیسنگ پے رول
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,پروسیسنگ پے رول
 DocType: Opportunity Item,Basic Rate,بنیادی شرح
 DocType: GL Entry,Credit Amount,کریڈٹ کی رقم
 DocType: Cheque Print Template,Signatory Position,دستخط پوزیشن
@@ -4937,12 +5027,12 @@
 DocType: Tax Rule,Tax Rule,ٹیکس اصول
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,سیلز سائیکل بھر میں ایک ہی شرح کو برقرار رکھنے
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,کارگاہ کام کے گھنٹے باہر وقت نوشتہ کی منصوبہ بندی.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,قطار میں صارفین
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,ڈاکٹر {0} میں ایک ڈاکٹر شیڈول نہیں ہے. اسے طبیعیات کے ماسٹر میں شامل کریں
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,قطار میں صارفین
 DocType: Student,Nationality,قومیت
 ,Items To Be Requested,اشیا درخواست کی جائے
-DocType: Purchase Order,Get Last Purchase Rate,آخری خریداری کی شرح حاصل
 DocType: Company,Company Info,کمپنی کی معلومات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,منتخب یا نئے گاہک شامل
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,منتخب یا نئے گاہک شامل
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,لاگت مرکز ایک اخراجات کے دعوی کی بکنگ کے لئے کی ضرورت ہے
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),فنڈز (اثاثے) کی درخواست
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,یہ اس ملازم کی حاضری پر مبنی ہے
@@ -4950,6 +5040,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,ڈیبٹ اکاؤنٹ
 DocType: Fiscal Year,Year Start Date,سال شروع کرنے کی تاریخ
 DocType: Attendance,Employee Name,ملازم کا نام
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,ریسٹورنٹ آرڈر انٹری آئٹم
 DocType: Sales Invoice,Rounded Total (Company Currency),مدور کل (کمپنی کرنسی)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,اکاؤنٹ کی قسم منتخب کیا جاتا ہے کی وجہ سے گروپ کو خفیہ نہیں کر سکتے ہیں.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} نظر ثانی کی گئی ہے. ریفریش کریں.
@@ -4960,6 +5051,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,ملازم فوائد
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},پیک مقدار قطار میں آئٹم {0} کے لئے مقدار برابر ضروری {1}
 DocType: Production Order,Manufactured Qty,تیار مقدار
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,انوائس بنا دیا
 DocType: Purchase Receipt Item,Accepted Quantity,منظور مقدار
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},براہ کرم ملازمت {0} یا کمپنی {1} کیلئے پہلے سے طے شدہ چھٹی کی فہرست مقرر کریں.
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} نہیں موجود
@@ -4969,18 +5061,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},صف کوئی {0}: رقم خرچ دعوی {1} کے خلاف زیر التواء رقم سے زیادہ نہیں ہو سکتا. زیر التواء رقم ہے {2}
 DocType: Maintenance Schedule,Schedule,شیڈول
 DocType: Account,Parent Account,والدین کے اکاؤنٹ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,دستیاب
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,دستیاب
 DocType: Quality Inspection Reading,Reading 3,3 پڑھنا
 ,Hub,حب
 DocType: GL Entry,Voucher Type,واؤچر کی قسم
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,قیمت کی فہرست پایا یا معذور نہیں
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,قیمت کی فہرست پایا یا معذور نہیں
 DocType: Lab Test,Approved,منظور
 DocType: Pricing Rule,Price,قیمت
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',{0} مقرر کیا جانا چاہئے پر فارغ ملازم &#39;بائیں&#39; کے طور پر
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',{0} مقرر کیا جانا چاہئے پر فارغ ملازم &#39;بائیں&#39; کے طور پر
+DocType: Hub Settings,Last Sync On,آخری مطابقت پذیری
 DocType: Guardian,Guardian,گارڈین
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,تشخیص {0} {1} مقررہ تاریخ کی حد میں ملازم کے لئے پیدا
 DocType: Employee,Education,تعلیم
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,ڈیل
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,ڈیل
 DocType: Selling Settings,Campaign Naming By,مہم کا نام دینے
 DocType: Employee,Current Address Is,موجودہ پتہ ہے
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,ماہانہ فروخت کی ھدف (
@@ -4995,7 +5088,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,کورس کا کوڈ:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,ایکسپینس اکاؤنٹ درج کریں
 DocType: Account,Stock,اسٹاک
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",صف # {0}: حوالہ دستاویز کی قسم خریداری کے آرڈر میں سے ایک، انوائس خریداری یا جرنل اندراج ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",صف # {0}: حوالہ دستاویز کی قسم خریداری کے آرڈر میں سے ایک، انوائس خریداری یا جرنل اندراج ہونا ضروری ہے
 DocType: Employee,Current Address,موجودہ پتہ
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",واضح طور پر مخصوص جب تک شے تو وضاحت، تصویر، قیمتوں کا تعین، ٹیکس سانچے سے مقرر کیا جائے گا وغیرہ کسی اور شے کی ایک مختلف ہے تو
 DocType: Serial No,Purchase / Manufacture Details,خریداری / تیاری تفصیلات
@@ -5026,7 +5119,7 @@
 DocType: Hub Settings,Hub Settings,حب ترتیبات
 DocType: Project,Gross Margin %,مجموعی مارجن٪
 DocType: BOM,With Operations,آپریشن کے ساتھ
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,اکاؤنٹنگ اندراجات پہلے ہی کرنسی میں بنایا گیا ہے {0} کمپنی کے لئے {1}. کرنسی کے ساتھ ایک وصولی یا قابل ادائیگی اکاؤنٹ منتخب کریں {0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,اکاؤنٹنگ اندراجات پہلے ہی کرنسی میں بنایا گیا ہے {0} کمپنی کے لئے {1}. کرنسی کے ساتھ ایک وصولی یا قابل ادائیگی اکاؤنٹ منتخب کریں {0}.
 DocType: Asset,Is Existing Asset,اثاثہ موجود ہے
 DocType: Salary Detail,Statistical Component,شماریاتی اجزاء
 DocType: Warranty Claim,If different than customer address,کسٹمر ایڈریس سے مختلف تو
@@ -5034,13 +5127,14 @@
 DocType: BOM Operation,BOM Operation,BOM آپریشن
 DocType: Purchase Taxes and Charges,On Previous Row Amount,پچھلے صف کی رقم پر
 DocType: Student,Home Address,گھر کا پتہ
+DocType: Item,Has Expiry Date,ختم ہونے کی تاریخ ہے
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,آئٹم مختلف ترتیبات.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,منتقلی ایسیٹ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,منتقلی ایسیٹ
 DocType: POS Profile,POS Profile,پی او ایس پروفائل
 DocType: Training Event,Event Name,واقعہ کا نام
 DocType: Physician,Phone (Office),فون (آفس)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,داخلہ
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},{0} کے لئے داخلہ
+apps/erpnext/erpnext/hooks.py +147,Admission,داخلہ
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},{0} کے لئے داخلہ
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.",ترتیب بجٹ، اہداف وغیرہ کے لئے seasonality کے
 DocType: Supplier Scorecard Scoring Variable,Variable Name,متغیر نام
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",{0} آئٹم ایک ٹیمپلیٹ ہے، اس کی مختلف حالتوں میں سے ایک کو منتخب کریں
@@ -5049,7 +5143,7 @@
 DocType: Assessment Plan,Room,کمرہ
 DocType: Purchase Order,Advance Paid,ایڈوانس ادا
 DocType: Item,Item Tax,آئٹم ٹیکس
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,سپلائر مواد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,سپلائر مواد
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,ایکسائز انوائس
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}٪ ایک بار سے زیادہ ظاہر ہوتا ہے
 DocType: Expense Claim,Employees Email Id,ملازمین ای میل کی شناخت
@@ -5060,32 +5154,30 @@
 DocType: Program,Program Name,پروگرام کا نام
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,کے لئے ٹیکس یا انچارج غور
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,اصل مقدار لازمی ہے
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} فی الحال ایک {1} سپلائر اسکور کارڈ کھڑا ہے، اور اس سپلائر کو خریدنے والے احکامات کو احتیاط کے ساتھ جاری کیا جانا چاہئے.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} فی الحال ایک {1} سپلائر اسکور کارڈ کھڑا ہے، اور اس سپلائر کو خریدنے والے احکامات کو احتیاط کے ساتھ جاری کیا جانا چاہئے.
 DocType: Employee Loan,Loan Type,قرض کی قسم
 DocType: Scheduling Tool,Scheduling Tool,شیڈولنگ کا آلہ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,کریڈٹ کارڈ
 DocType: BOM,Item to be manufactured or repacked,آئٹم تیار یا repacked جائے کرنے کے لئے
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,اسٹاک لین دین کے لئے پہلے سے طے شدہ ترتیبات.
-DocType: Purchase Invoice,Next Date,اگلی تاریخ
 DocType: Employee Education,Major/Optional Subjects,میجر / اختیاری مضامین
 DocType: Sales Invoice Item,Drop Ship,ڈراپ جہاز
+DocType: Hub Settings,Suspended,معطل
 DocType: Training Event,Attendees,شرکاء
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",یہاں آپ کا نام اور والدین، شریک حیات اور بچوں کی قبضے کی طرح خاندانی تفصیلات کو برقرار رکھنے کے کر سکتے ہیں
 DocType: Academic Term,Term End Date,اصطلاح آخر تاریخ
-DocType: Hub Settings,Seller Name,فروش نام
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),ٹیکسز اور الزامات کٹوتی (کمپنی کرنسی)
 DocType: Item Group,General Settings,عام ترتیبات
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,کرنسی سے اور کرنسی کے لئے ایک ہی نہیں ہو سکتا
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,انسٹرکٹر شامل کریں
 DocType: Stock Entry,Repack,repack کریں
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,تم آگے بڑھنے سے پہلے فارم بچانے کے لئے ضروری
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,براہ مہربانی سب سے پہلے کمپنی کا انتخاب کریں
 DocType: Item Attribute,Numeric Values,عددی اقدار
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,علامت (لوگو) منسلک کریں
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,اسٹاک کی سطح
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,اسٹاک کی سطح
 DocType: Customer,Commission Rate,کمیشن کی شرح
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,{1} کے لئے {1} اسکورकार्डز کے درمیان بنائیں:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,مختلف بنائیں
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,مختلف بنائیں
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,محکمہ کی طرف سے بلاک چھٹی ایپلی کیشنز.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer",ادائیگی کی قسم، وصول میں سے ایک ہو تنخواہ اور اندرونی منتقلی ضروری ہے
 apps/erpnext/erpnext/config/selling.py +179,Analytics,تجزیات
@@ -5100,11 +5192,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,دارالحکومت اسٹاک
 DocType: Shopping Cart Settings,Show Public Attachments,پبلک منسلک دکھائیں
 DocType: Packing Slip,Package Weight Details,پیکیج وزن تفصیلات
+DocType: Restaurant Reservation,Reservation Time,ریزرویشن کا وقت
 DocType: Payment Gateway Account,Payment Gateway Account,ادائیگی کے گیٹ وے اکاؤنٹ
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,ادائیگی مکمل ہونے کے بعد منتخب صفحے پر صارف ری.
 DocType: Company,Existing Company,موجودہ کمپنی
 DocType: Healthcare Settings,Result Emailed,نتیجہ ای میل
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",ٹیکس زمرہ &quot;کل&quot; سے تبدیل کردیا گیا ہے تمام اشیا غیر اسٹاک اشیاء ہیں کیونکہ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,آئٹم کوڈ&gt; آئٹم گروپ&gt; برانڈ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,ایک CSV فائل منتخب کریں
 DocType: Student Leave Application,Mark as Present,تحفے کے طور پر نشان زد کریں
 DocType: Supplier Scorecard,Indicator Color,اشارے رنگ
@@ -5129,11 +5223,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Student کی بیچ بنائیں
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,فارورڈ لے
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,BOM سے اشیاء حاصل
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,BOM سے اشیاء حاصل
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,وقت دن کی قیادت
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},صف # {0}: تاریخ پوسٹنگ خریداری کی تاریخ کے طور پر ایک ہی ہونا چاہیے {1} اثاثہ کی {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,طالب علم انسٹی ٹیوٹ کے ہاسٹل میں رہائش پذیر ہے تو اس کو چیک کریں.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,مندرجہ بالا جدول میں سیلز آرڈر درج کریں
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,مندرجہ بالا جدول میں سیلز آرڈر درج کریں
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,جمع نہیں تنخواہ تخم
 ,Stock Summary,اسٹاک کا خلاصہ
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,دوسرے ایک گودام سے ایک اثاثہ کی منتقلی
@@ -5149,5 +5243,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},صف {0}: ڈیبٹ اندراج کے ساتھ منسلک نہیں کیا جا سکتا ہے {1}
 DocType: Journal Entry,Subscription Section,سبسکرائب سیکشن
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,اکاؤنٹ {0} موجود نہیں ہے
+DocType: Training Event,Training Program,تربیتی پروگرام
 DocType: Account,Cash,کیش
 DocType: Employee,Short biography for website and other publications.,ویب سائٹ اور دیگر مطبوعات کے لئے مختصر سوانح عمری.
diff --git a/erpnext/translations/uz.csv b/erpnext/translations/uz.csv
index 1486433..7b12899 100644
--- a/erpnext/translations/uz.csv
+++ b/erpnext/translations/uz.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Ish haqi rejimi
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Ro&#39;yxatdan o&#39;tish
 DocType: Patient,Divorced,Ajrashgan
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Ma&#39;lumotlar allaqachon sinxronlangan
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Ob&#39;ektga bir amalda bir necha marta qo&#39;shilishiga ruxsat bering
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Ushbu kafolat talabnomasini bekor qilishdan avval materialni bekor qilish {0} ga tashrif buyuring
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Iste&#39;molchi mahsulotlari
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Tasdiqlovchilar qoldiring
 DocType: Sales Partner,Dealer,Diler
 DocType: Consultation,Investigations,Tadqiqotlar
+DocType: Restaurant Order Entry,Click Enter To Add,Qo&#39;shish uchun Enter ni bosing
 DocType: Employee,Rented,Ijaraga olingan
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Foydalanuvchining uchun amal qiladi
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","To&#39;xtatilgan ishlab chiqarish tartibi bekor qilinishi mumkin emas, bekor qilish uchun avval uni to&#39;xtatib turish"
 DocType: Vehicle Service,Mileage,Yugurish
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Haqiqatan ham ushbu obyektni yo&#39;qotmoqchimisiz?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Haqiqatan ham ushbu obyektni yo&#39;qotmoqchimisiz?
 DocType: Drug Prescription,Update Schedule,Jadvalni yangilash
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Standart etkazib beruvchini tanlang
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Narxlar ro&#39;yxati uchun valyuta talab qilinadi {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Mavjudligini tekshirib ko&#39;ring
 DocType: Job Applicant,Job Applicant,Ish beruvchi
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Bu Ta&#39;minotchi bilan tuzilgan bitimlarga asoslanadi. Tafsilotlar uchun quyidagi jadvalga qarang
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Boshqa natijalar yo&#39;q.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Huquqiy
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Haqiqiy turdagi soliqni {0} qatoridagi Item Rate ga qo&#39;shish mumkin emas
 DocType: Bank Guarantee,Customer,Xaridor
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Ayirboshlash kursi {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Xaridor nomi
 DocType: Vehicle,Natural Gas,Tabiiy gaz
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Bank hisobi {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Bank hisobi {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Buxgalteriya yozuvlari yozilgan va muvozanatlar saqlanib turadigan rahbarlar (yoki guruhlar).
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),{0} uchun ustunlik noldan kam bo&#39;lishi mumkin emas ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Jarayon uchun hech qanday taqdim etilmagan Ish haqi slipslari mavjud emas.
 DocType: Manufacturing Settings,Default 10 mins,Standart 10 daqiqa
 DocType: Leave Type,Leave Type Name,Tovar nomi qoldiring
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Ko&#39;rish ochiq
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Ushbu harakatni bugungi kunda yuqorida eslatib o&#39;tilgan davrda olish kerak
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Series muvaffaqiyatli yangilandi
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Tekshirib ko&#39;rmoq
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural jurnalining taqdimoti
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Buyurtma buyurtmalarini olish uchun
 DocType: SMS Center,All Supplier Contact,Barcha yetkazib beruvchi bilan aloqa
 DocType: Support Settings,Support Settings,Yordam sozlamalari
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Kutilayotgan yakunlangan sana kutilgan boshlanish sanasidan kam bo&#39;lishi mumkin emas
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Kutilayotgan yakunlangan sana kutilgan boshlanish sanasidan kam bo&#39;lishi mumkin emas
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Baho {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Yangi ishga tushirish
 ,Batch Item Expiry Status,Partiya mahsulotining amal qilish muddati
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Bank loyihasi
 DocType: Mode of Payment Account,Mode of Payment Account,To&#39;lov shakli hisob
 DocType: Consultation,Consultation,Maslamat
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Sotish va qaytarish
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Varyantlarni ko&#39;rsatish
 DocType: Academic Term,Academic Term,Akademik atamalar
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiallar
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sog&#39;liqni saqlash
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),To&#39;lovni kechiktirish (kunlar)
 DocType: Lab Prescription,Lab Prescription,Laboratoriya retsepti
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Narx bo&#39;yicha saralash
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Xizmat ketadi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Seriya raqami: {0} savdo faturasında zikr qilingan: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Billing
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Seriya raqami: {0} savdo faturasında zikr qilingan: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Billing
 DocType: Maintenance Schedule Item,Periodicity,Muntazamlik
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Moliyaviy yil {0} talab qilinadi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Mudofaa
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,# {0} qatori:
 DocType: Timesheet,Total Costing Amount,Jami xarajat summasi
 DocType: Delivery Note,Vehicle No,Avtomobil raqami
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,"Iltimos, narxlar ro&#39;yxatini tanlang"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,"Iltimos, narxlar ro&#39;yxatini tanlang"
 DocType: Accounts Settings,Currency Exchange Settings,Valyuta almashinuvi sozlamalari
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Row # {0}: Taqsimotni to&#39;ldirish uchun to&#39;lov hujjati talab qilinadi
 DocType: Production Order Operation,Work In Progress,Ishlar davom etmoqda
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,"Iltimos, tarixni tanlang"
 DocType: Employee,Holiday List,Dam olish ro&#39;yxati
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,"Iltimos, maktabdagi o&#39;qituvchilar nomini tizimini sozlang"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Hisobchi
+DocType: Hub Settings,Selling Price List,Sotuvlar narxlari
 DocType: Patient,Tobacco Current Use,Tamaki foydalanish
 DocType: Cost Center,Stock User,Tayyor foydalanuvchi
 DocType: Company,Phone No,Telefon raqami
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Yaratilgan kurs jadvali:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},Yangi {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Yangi {0}: # {1}
 ,Sales Partners Commission,Savdo hamkorlari komissiyasi
 DocType: Purchase Invoice,Rounding Adjustment,Yumaloq regulyatsiya
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Qisqartirishda 5dan ortiq belgi bo&#39;lishi mumkin emas
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,Ota-ona batafsil docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Malumot: {0}, mahsulot kodi: {1} va mijoz: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kg
-DocType: Student Log,Log,Kundalik
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Ish uchun ochilish.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} natijalar yuborildi
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} natijalar yuborildi
 DocType: Item Attribute,Increment,Ortiqcha
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Timespan
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,QXI tanlang ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Turmushga chiqdi
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},{0} uchun ruxsat berilmagan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Elementlarni oling
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Stokni etkazib berishga qarshi yangilanib bo&#39;lmaydi. {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Stokni etkazib berishga qarshi yangilanib bo&#39;lmaydi. {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Mahsulot {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Ro&#39;yxatda hech narsa yo&#39;q
 DocType: Payment Reconciliation,Reconcile,Muvaqqatlik
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensiya jamg&#39;armalari
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Keyingi Amortizatsiya tarixi sotib olish sanasidan oldin bo&#39;la olmaydi
 DocType: Consultation,Consultation Date,Maslahatlashuv sanasi
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Mahsulot ro&#39;yxati va ERPNext foydalanuvchilari uchun kashfiyot
 DocType: SMS Center,All Sales Person,Barcha Sotuvdagi Shaxs
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Oylik tarqatish ** sizning biznesingizda mevsimlik mavjud bo&#39;lsa, byudjet / maqsadni oylar davomida tarqatishga yordam beradi."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Ma&#39;lumotlar topilmadi
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Ish haqi tuzilmasi to&#39;liqsiz
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Ma&#39;lumotlar topilmadi
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Ish haqi tuzilmasi to&#39;liqsiz
 DocType: Lead,Person Name,Shaxs ismi
 DocType: Sales Invoice Item,Sales Invoice Item,Savdo Billing elementi
 DocType: Account,Credit,Kredit
 DocType: POS Profile,Write Off Cost Center,Malumot markazini yozing
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""","Masalan, &quot;Boshlang&#39;ich maktab&quot; yoki &quot;Universitet&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""","Masalan, &quot;Boshlang&#39;ich maktab&quot; yoki &quot;Universitet&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Birja yangiliklari
 DocType: Warehouse,Warehouse Detail,QXI detali
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},{0} {1} / {2} mijoz uchun kredit cheklovi kesib o&#39;tdi
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Davrning tugash sanasi atamalar bilan bog&#39;liq bo&#39;lgan Akademik yilning Yil oxiri sanasidan (Akademik yil) {} o&#39;tishi mumkin emas. Iltimos, sanalarni tahrirlang va qaytadan urinib ko&#39;ring."
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Ruxsat etilgan aktivlar&quot; ni belgilash mumkin emas, chunki ob&#39;ektga nisbatan Asset yozuvi mavjud"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Ruxsat etilgan aktivlar&quot; ni belgilash mumkin emas, chunki ob&#39;ektga nisbatan Asset yozuvi mavjud"
 DocType: Vehicle Service,Brake Oil,Tormoz yog&#39;i
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Xaridor&gt; Mijozlar guruhi&gt; Zonasi
 DocType: Tax Rule,Tax Type,Soliq turi
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Soliq summasi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},{0} dan oldin kiritilgan yozuvlarni qo&#39;shish yoki yangilash uchun ruxsat yo&#39;q
 DocType: BOM,Item Image (if not slideshow),Mavzu tasvir (agar slayd-shou bo&#39;lmasa)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Xaridor bir xil nomga ega
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Soat / 60) * Haqiqiy operatsiya vaqti
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,# {0} satri: Hujjatning Hujjat turi xarajat shikoyati yoki jurnali kiritmasidan biri bo&#39;lishi kerak
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,BOM-ni tanlang
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,# {0} satri: Hujjatning Hujjat turi xarajat shikoyati yoki jurnali kiritmasidan biri bo&#39;lishi kerak
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,BOM-ni tanlang
 DocType: SMS Log,SMS Log,SMS-jurnali
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Etkazib beriladigan mahsulotlarning narxi
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} bayrami sanasi va sanasi o&#39;rtasidagi emas
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,Xodimlarning qarzlari
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Faoliyat jurnali:
 DocType: Fee Schedule,Send Payment Request Email,To&#39;lov uchun so&#39;rov yuborish uchun E-mail
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,{0} mahsuloti tizimda mavjud emas yoki muddati tugagan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,{0} mahsuloti tizimda mavjud emas yoki muddati tugagan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Ko `chmas mulk
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Hisob qaydnomasi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Dori vositalari
@@ -210,17 +213,22 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Import jurnali
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Pull Materiallar turi Talebi Yuqoridagi mezonlarga asosan ishlab chiqarish
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Muvaffaqiyatsiz ro&#39;yxatdan o&#39;tkazilmagan.
 DocType: Training Result Employee,Grade,Baholash
+DocType: Restaurant Table,No of Seats,O&#39;rindiqlar soni
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Dinamik mavzuni qo'shish uchun, kabi jinja teglaridan foydalaning <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Yetkazib beruvchining etkazib beruvchisi
 DocType: SMS Center,All Contact,Barcha aloqa
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Ishlab chiqarish tartibi BOM bilan barcha elementlar uchun yaratilgan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Ishlab chiqarish tartibi BOM bilan barcha elementlar uchun yaratilgan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Yillik ish haqi
 DocType: Daily Work Summary,Daily Work Summary,Kundalik ish xulosasi
 DocType: Period Closing Voucher,Closing Fiscal Year,Moliyaviy yil yakuni
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1} muzlatilgan
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Hisoblar jadvali yaratish uchun mavjud Kompaniya-ni tanlang
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} muzlatilgan
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Hisoblar jadvali yaratish uchun mavjud Kompaniya-ni tanlang
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Aksiyadorlik xarajatlari
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Maqsadli omborni tanlang
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Maqsadli omborni tanlang
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Marhamat qilib, tanlangan aloqa elektron pochta manzilini kiriting"
 DocType: Program Enrollment,School Bus,Maktab avtobusi
 DocType: Journal Entry,Contra Entry,Contra kirish
@@ -237,9 +245,10 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Shabloni yuklab oling, tegishli ma&#39;lumotlarni to&#39;ldiring va o&#39;zgartirilgan fayllarni biriktiring. Tanlangan davr mobaynida barcha sanalar va ishchilarning tarkibi shablonga tushadi va mavjud yozuvlar mavjud"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,{0} elementi faol emas yoki umrining oxiriga yetdi
+DocType: Student Admission Program,Minimum Age,Minimal yosh
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Misol: Asosiy matematik
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Mavzu kursiga {0} qatoridagi soliqni kiritish uchun qatorlar {1} da soliqlar ham kiritilishi kerak
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,HR moduli uchun sozlamalar
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,HR moduli uchun sozlamalar
 DocType: SMS Center,SMS Center,SMS markazi
 DocType: Sales Invoice,Change Amount,Miqdorni o&#39;zgartirish
 DocType: BOM Update Tool,New BOM,Yangi BOM
@@ -249,7 +258,7 @@
 DocType: Lead,Request Type,So&#39;rov turi
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Xodim yarat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Radioeshittirish
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Xonalar qo&#39;shish
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),POSning sozlash rejimi (Onlayn / Offlayn)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Ijroiya
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Faoliyatning tafsilotlari.
 DocType: Serial No,Maintenance Status,Xizmat holati
@@ -272,6 +281,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Narxlar ro&#39;yxati Buyurtma yoki Sotish uchun tegishli bo&#39;lishi kerak
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},O&#39;rnatish sanasi {0} mahsuloti uchun etkazib berish tarixidan oldin bo&#39;lishi mumkin emas
 DocType: Pricing Rule,Discount on Price List Rate (%),Narxlar ro&#39;yxati narxiga chegirma (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Biokimyo
 DocType: Offer Letter,Select Terms and Conditions,Qoidalar va shartlarni tanlang
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,Chiqish qiymati
 DocType: Production Planning Tool,Sales Orders,Savdo buyurtmalarini
@@ -306,15 +316,15 @@
 DocType: Sales Partner,Reseller,Reseller
 DocType: Codification Table,Medical Code,Tibbiy kod
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Belgilangan bo&#39;lsa, moddiy buyurtmalarga tegishli bo&#39;lmagan mahsulotlarni o&#39;z ichiga oladi."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,"Iltimos, kompaniyani kiriting"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,"Iltimos, kompaniyani kiriting"
 DocType: Delivery Note Item,Against Sales Invoice Item,Sotuvdagi schyot-fakturaga qarshi
 ,Production Orders in Progress,Ishlab chiqarish buyurtmalarining davomi
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Moliyadan aniq pul
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","LocalStorage to&#39;liq, saqlanmadi"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage to&#39;liq, saqlanmadi"
 DocType: Lead,Address & Contact,Manzil &amp; Kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Oldindan ajratilgan mablag&#39;lardan foydalanilmagan barglarni qo&#39;shing
 DocType: Sales Partner,Partner website,Hamkorlik veb-sayti
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Mavzu qo&#39;shish
+DocType: Restaurant Order Entry,Add Item,Mavzu qo&#39;shish
 DocType: Lab Test,Custom Result,Maxsus natija
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Kontakt nomi
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kurs baholash mezonlari
@@ -327,7 +337,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Sotib olish talabi.
 DocType: Lab Test,Submitted Date,O&#39;tkazilgan sana
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Ushbu loyihaga qarshi yaratilgan vaqt jadvallariga asoslanadi
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Net ulush 0 dan kam bo&#39;lmasligi kerak
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Net ulush 0 dan kam bo&#39;lmasligi kerak
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",Tizimdan takroriy xato xabardorlarini jo&#39;natishni to&#39;xtatish uchun obunadagi &quot;O&#39;chirish&quot; maydonini tekshirdik
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Faqatgina tanlangan Leave Approver bu Taqdimotnomani topshirishi mumkin
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Ajratish sanasi qo&#39;shilish sanasidan katta bo&#39;lishi kerak
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Yillar davomida barglar
@@ -336,9 +347,10 @@
 DocType: Email Digest,Profit & Loss,Qor va ziyon
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,Litr
 DocType: Task,Total Costing Amount (via Time Sheet),Jami xarajat summasi (vaqt jadvalidan)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Talabalar uchun Talabalar Guruhi ostida tanlansin
 DocType: Item Website Specification,Item Website Specification,Veb-saytning spetsifikatsiyasi
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Blokdan chiqing
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},{0} elementi {1} da umrining oxiriga yetdi
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},{0} elementi {1} da umrining oxiriga yetdi
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Bank yozuvlari
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Yillik
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Qimmatli qog&#39;ozlar bitimining elementi
@@ -347,7 +359,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Isoning shogirdi guruhini yaratish vositasi kursi
 DocType: Lead,Do Not Contact,Aloqa qilmang
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,Tashkilotingizda ta&#39;lim beradigan odamlar
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Barcha takroriy to&#39;lovlarni kuzatish uchun yagona id. Bu topshirish bo&#39;yicha yaratiladi.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Dastur ishlab chiqaruvchisi
 DocType: Item,Minimum Order Qty,Minimal Buyurtma miqdori
 DocType: Pricing Rule,Supplier Type,Yetkazib beruvchi turi
@@ -357,17 +368,19 @@
 DocType: Item,Publish in Hub,Hubda nashr qiling
 DocType: Student Admission,Student Admission,Talabalarni qabul qilish
 ,Terretory,Teror
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,{0} mahsuloti bekor qilindi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Materiallar talabi
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,{0} mahsuloti bekor qilindi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Materiallar talabi
 DocType: Bank Reconciliation,Update Clearance Date,Bo&#39;shatish tarixini yangilash
 DocType: Item,Purchase Details,Xarid haqida ma&#39;lumot
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Buyurtma {1} da &quot;Xom moddalar bilan ta&#39;minlangan&quot; jadvalidagi {0} mahsuloti topilmadi
 DocType: Patient Relation,Relation,Aloqalar
 DocType: Shipping Rule,Worldwide Shipping,Xalqaro yuk tashish
 DocType: Patient Relation,Mother,Ona
+DocType: Restaurant Reservation,Reservation End Time,Rezervasyon tugash vaqti
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Xaridorlarning buyurtmalari tasdiqlangan.
 DocType: Purchase Receipt Item,Rejected Quantity,Rad qilingan miqdor
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,To&#39;lov talabi {0} yaratildi
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,To&#39;lov talabi {0} yaratildi
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Kam sezgirlik
 DocType: Notification Control,Notification Control,Xabarnoma nazorati
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Ta&#39;limingizni tugatganingizdan keyin tasdiqlang
 DocType: Lead,Suggestions,Takliflar
@@ -387,7 +400,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Xodimga ish haqi elektron pochtasi xodimiga tanlangan e-pochtaga asoslanib yuboriladi
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"Ro&#39;yxatdagi birinchi Approverni jo&#39;natsangiz, asl qiymati &quot;Approver qoldiring&quot; deb belgilanadi"
 DocType: Tax Rule,Shipping County,Yuk tashish hududi
-apps/erpnext/erpnext/config/desktop.py +158,Learn,O&#39;rganish
+apps/erpnext/erpnext/config/desktop.py +159,Learn,O&#39;rganish
 DocType: Asset,Next Depreciation Date,Keyingi Amortizatsiya sanasi
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Xodimga ko&#39;ra harajatlar
 DocType: Accounts Settings,Settings for Accounts,Hisob sozlamalari
@@ -398,13 +411,13 @@
 DocType: Item,Synced With Hub,Hub bilan sinxronlangan
 DocType: Vehicle,Fleet Manager,Filo menejeri
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},{{0} qatori: {1} element {2} uchun salbiy bo&#39;lishi mumkin emas
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Noto&#39;g&#39;ri parol
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Noto&#39;g&#39;ri parol
 DocType: Item,Variant Of,Variant Of
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Tugallangan Miqdor &quot;Katta ishlab chiqarish&quot; dan katta bo&#39;lishi mumkin emas
 DocType: Period Closing Voucher,Closing Account Head,Hisob boshini yopish
 DocType: Employee,External Work History,Tashqi ish tarixi
 DocType: Physician,Time per Appointment,Uchrashuv uchun vaqt
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Dairesel mos yozuvlar xatosi
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Dairesel mos yozuvlar xatosi
 DocType: Appointment Type,Is Inpatient,Statsionarmi?
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 Ismi
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Etkazib berish eslatmasini saqlaganingizdan so&#39;ng so&#39;zlar (eksport) ko&#39;rinadi.
@@ -412,19 +425,18 @@
 DocType: Lead,Industry,Sanoat
 DocType: Employee,Job Profile,Ishchi profil
 DocType: BOM Item,Rate & Amount,Bahosi va miqdori
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Iltimos, Setup&gt; Numbering Series orqali tomosha qilish uchun raqamlash seriyasini sozlang"
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Bu kompaniya bilan tuzilgan bitimlarga asoslanadi. Tafsilotlar uchun quyidagi jadvalga qarang
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Avtomatik Materializatsiya so&#39;rovini yaratish haqida E-mail orqali xabar bering
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Chidamli
 DocType: Journal Entry,Multi Currency,Ko&#39;p valyuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Faktura turi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Xaridor&gt; Mijozlar guruhi&gt; Zonasi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Yetkazib berish eslatmasi
 DocType: Consultation,Encounter Impression,Ta&#39;sir bilan taaluqli
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Soliqni o&#39;rnatish
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Sotilgan aktivlarning qiymati
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,"To&#39;lov kirish kiritilgandan keyin o&#39;zgartirildi. Iltimos, yana torting."
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} - mahsulotni soliqqa ikki marta kirgan
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Bu hafta uchun xulosa va kutilayotgan tadbirlar
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} - mahsulotni soliqqa ikki marta kirgan
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Bu hafta uchun xulosa va kutilayotgan tadbirlar
 DocType: Student Applicant,Admitted,Qabul qilingan
 DocType: Workstation,Rent Cost,Ijara haqi
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Amortizatsiyadan keyin jami miqdor
@@ -438,36 +450,35 @@
 DocType: Shipping Rule,Valid for Countries,Mamlakatlar uchun amal qiladi
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ushbu maqola shablon bo&#39;lib, operatsiyalarda mavjud emas. &quot;No Copy&quot; parametri belgilanmagan bo&#39;lsa, element identifikatorlari variantlarga ko&#39;chiriladi"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Ko&#39;rib umumiy Buyurtma
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Xodimning nomi (masalan, Bosh direktor, Direktor va boshqalar)."
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Xodimning nomi (masalan, Bosh direktor, Direktor va boshqalar)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Xaridor valyutasi mijozning asosiy valyutasiga aylantirilgan tarif
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kursni rejalashtirish vositasi
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Xarid-faktura mavjud mavjudotga qarshi {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Urgent]% s uchun takrorlanuvchi% s yaratishda xato
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Urgent]% s uchun takrorlanuvchi% s yaratishda xato
 DocType: Item Tax,Tax Rate,Soliq stavkasi
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{2} dan {3} gacha bo&#39;lgan xodim uchun {1} uchun ajratilgan {0}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Mavzu-ni tanlang
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Mavzu-ni tanlang
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Xaridni taqdim etgan {0} allaqachon yuborilgan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},# {0} satrida: {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Guruhga o&#39;tkazilmasin
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Ob&#39;ektning partiyasi (lot).
 DocType: C-Form Invoice Detail,Invoice Date,Faktura sanasi
 DocType: GL Entry,Debit Amount,Debet miqdori
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},{0} {1} da Kompaniyaga 1 Hisob faqatgina bo&#39;lishi mumkin
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,"Iltimos, ilova-ga qarang"
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},{0} {1} da Kompaniyaga 1 Hisob faqatgina bo&#39;lishi mumkin
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,"Iltimos, ilova-ga qarang"
 DocType: Purchase Order,% Received,Qabul qilingan
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Talabalar guruhini yaratish
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,O&#39;rnatish allaqachon yakunlandi!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,O&#39;rnatish allaqachon yakunlandi!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Kredit eslatma miqdori
 DocType: Setup Progress Action,Action Document,Hujjat
 ,Finished Goods,Tayyor mahsulotlar
 DocType: Delivery Note,Instructions,Ko&#39;rsatmalar
 DocType: Quality Inspection,Inspected By,Nazorat ostida
 DocType: Maintenance Visit,Maintenance Type,Xizmat turi
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} kursi {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Mahsulot kodi&gt; Mahsulot guruhi&gt; Tovar
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} kursi {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},No {0} seriyali etkazib berish eslatmasi {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNekst demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Ma&#39;lumotlar qo&#39;shish
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Ma&#39;lumotlar qo&#39;shish
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Mahsulot sifatini tekshirish parametrlari
 DocType: Leave Application,Leave Approver Name,Taxminiy nomi qoldiring
 DocType: Depreciation Schedule,Schedule Date,Jadval sanasi
@@ -487,7 +498,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Ish vaqti
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Mavjud ketma-ketlikning boshlang&#39;ich / to`g`ri qatorini o`zgartirish.
 DocType: Dosage Strength,Strength,Kuch-quvvat
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Yangi xaridorni yarating
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Yangi xaridorni yarating
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Agar bir nechta narx qoidalari ustunlik qila boshlasa, foydalanuvchilardan nizoni hal qilish uchun birinchi o&#39;ringa qo&#39;l o&#39;rnatish talab qilinadi."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Buyurtma buyurtmalarini yaratish
 ,Purchase Register,Xarid qilish Register
@@ -506,7 +517,7 @@
 DocType: Lab Test Template,Single,Yagona
 DocType: Salary Slip,Total Loan Repayment,Jami kreditni qaytarish
 DocType: Account,Cost of Goods Sold,Sotilgan mol-mulki
-DocType: Purchase Invoice,Yearly,Har yili
+DocType: Subscription,Yearly,Har yili
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Xarajat markazini kiriting
 DocType: Drug Prescription,Dosage,Dozaj
 DocType: Journal Entry Account,Sales Order,Savdo buyurtmasi
@@ -536,7 +547,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Barcha ishlab chiqarish jarayonlari uchun global sozlamalar.
 DocType: Accounts Settings,Accounts Frozen Upto,Hisoblar muzlatilgan
 DocType: SMS Log,Sent On,Yuborildi
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Xususiyat {0} xususiyati bir nechta marta Attributes jadvalida tanlangan
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Xususiyat {0} xususiyati bir nechta marta Attributes jadvalida tanlangan
 DocType: HR Settings,Employee record is created using selected field. ,Ishchi yozuvi tanlangan maydon yordamida yaratiladi.
 DocType: Sales Order,Not Applicable,Taalluqli emas
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Dam olish ustasi.
@@ -561,13 +572,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Berilgan barglarning barchasi majburiydir
 DocType: Patient,AB Positive,Evropa Ittifoqi ijobiy
 DocType: Job Opening,Description of a Job Opening,Ish ochilishi ta&#39;rifi
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Bugungi faoliyatni kutish
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Bugungi faoliyatni kutish
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Ishtirok etish yozuvi.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Zamonaviy ish haqi bo&#39;yicha ish haqi komponenti.
 DocType: Sales Order Item,Used for Production Plan,Ishlab chiqarish rejasi uchun ishlatiladi
 DocType: Employee Loan,Total Payment,Jami to&#39;lov
 DocType: Manufacturing Settings,Time Between Operations (in mins),Operatsiyalar o&#39;rtasida vaqt (daq.)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,"{0} {1} bekor qilinadi, shuning uchun amal bajarilmaydi"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,"{0} {1} bekor qilinadi, shuning uchun amal bajarilmaydi"
 DocType: Customer,Buyer of Goods and Services.,Mahsulot va xizmatlarni xaridor.
 DocType: Journal Entry,Accounts Payable,Kreditorlik qarzi
 DocType: Patient,Allergies,Allergiya
@@ -579,22 +590,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Sotib olish buyurtmalarini ogohlantiring
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Mijozlaringizning bir qismini ro&#39;yxatlang. Ular tashkilotlar yoki shaxslar bo&#39;lishi mumkin.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Qurilish uchun yetarli qismlar
+DocType: POS Profile User,POS Profile User,Qalin Foydalanuvchining profili
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,To&#39;g&#39;ridan-to&#39;g&#39;ri daromad
 DocType: Patient Appointment,Date TIme,Sana TIme
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Hisob asosida guruhlangan bo&#39;lsa, hisob qaydnomasi asosida filtrlay olmaydi"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Ma&#39;muriy xodim
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,"Iltimos, kursni tanlang"
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,"Iltimos, kursni tanlang"
 DocType: Codification Table,Codification Table,Kodlashtirish jadvali
 DocType: Timesheet Detail,Hrs,Hr
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,"Iltimos, Kompaniya-ni tanlang"
 DocType: Stock Entry Detail,Difference Account,Farq hisob
 DocType: Purchase Invoice,Supplier GSTIN,Yetkazib beruvchi GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Vazifani yopib bo&#39;lmaydi, chunki unga bog&#39;liq {0} vazifasi yopilmaydi."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,"Iltimos, Materiallar talabi ko&#39;tariladigan omborga kiriting"
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Vazifani yopib bo&#39;lmaydi, chunki unga bog&#39;liq {0} vazifasi yopilmaydi."
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Iltimos, Materiallar talabi ko&#39;tariladigan omborga kiriting"
 DocType: Production Order,Additional Operating Cost,Qo&#39;shimcha operatsion narx
 DocType: Lab Test Template,Lab Routine,Laboratoriya muntazamligi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items",Birlashtirish uchun quyidagi xususiyatlar ikkala element uchun bir xil bo&#39;lishi kerak
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items",Birlashtirish uchun quyidagi xususiyatlar ikkala element uchun bir xil bo&#39;lishi kerak
 DocType: Shipping Rule,Net Weight,Sof og&#39;irlik
 DocType: Employee,Emergency Phone,Favqulodda telefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Xarid qiling
@@ -604,7 +616,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,"Marhamat, esda tuting: 0%"
 DocType: Sales Order,To Deliver,Taqdim etish uchun
 DocType: Purchase Invoice Item,Item,Mavzu
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Serial hech bir element qisman bo&#39;lolmaydi
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Oliy sezuvchanlik
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Serial hech bir element qisman bo&#39;lolmaydi
 DocType: Journal Entry,Difference (Dr - Cr),Farq (shifokor - Cr)
 DocType: Account,Profit and Loss,Qor va ziyon
 DocType: Patient,Risk Factors,Xavf omillari
@@ -613,7 +626,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Subpudrat shartnomasini boshqarish
 DocType: Vital Signs,Body Temperature,Tana harorati
 DocType: Project,Project will be accessible on the website to these users,Ushbu foydalanuvchilarning veb-saytida loyihaga kirish mumkin bo&#39;ladi
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Loyiha turini belgilang.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Loyiha turini belgilang.
 DocType: Supplier Scorecard,Weighting Function,Og&#39;irligi funktsiyasi
 DocType: Physician,OP Consulting Charge,OP maslaxatchisi uchun to&#39;lov
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,O&#39;rnatish
@@ -627,7 +640,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Artish 0 bo&#39;lishi mumkin emas
 DocType: Production Planning Tool,Material Requirement,Moddiy talablar
 DocType: Company,Delete Company Transactions,Kompaniya jarayonini o&#39;chirish
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Bank bo&#39;yicha bitim uchun Yo&#39;naltiruvchi Yo&#39;naltiruvchi va Yo&#39;nalish sanasi majburiy hisoblanadi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Bank bo&#39;yicha bitim uchun Yo&#39;naltiruvchi Yo&#39;naltiruvchi va Yo&#39;nalish sanasi majburiy hisoblanadi
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Soliqlarni va to&#39;lovlarni qo&#39;shish / tahrirlash
 DocType: Payment Entry Reference,Supplier Invoice No,Yetkazib beruvchi hisob raqami №
 DocType: Territory,For reference,Malumot uchun
@@ -635,12 +648,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Serial No {0} o&#39;chirib tashlanmaydi, chunki u birja bitimlarida qo&#39;llaniladi"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Yakunlovchi (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Salom
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Ob&#39;ektni siljiting
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Ob&#39;ektni siljiting
 DocType: Serial No,Warranty Period (Days),Kafolat muddati (kunlar)
 DocType: Installation Note Item,Installation Note Item,O&#39;rnatish Eslatma elementi
 DocType: Production Plan Item,Pending Qty,Kutilayotgan son
 DocType: Budget,Ignore,E&#39;tibor bering
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} faol emas
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} faol emas
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,Bosib chiqarishni tekshirish registrlarini sozlang
 DocType: Salary Slip,Salary Slip Timesheet,Ish staji vaqt jadvalini
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Yetkazib beruvchi ombori subpudratli sotib olish uchun ariza uchun majburiydir
@@ -649,7 +662,7 @@
 DocType: Pricing Rule,Sales Partner,Savdo hamkori
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Barcha etkazib beruvchi kartalari.
 DocType: Buying Settings,Purchase Receipt Required,Qabul qilish pulligizga.Albatta talab qilinadi
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Ochiq aktsiyadorlik jamg&#39;armasi kiritilgan taqdirda baholash mezonlari majburiydir
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,Ochiq aktsiyadorlik jamg&#39;armasi kiritilgan taqdirda baholash mezonlari majburiydir
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Billing-jadvalida yozuvlar topilmadi
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Marhamat qilib Kompaniya va Partiya turini tanlang
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Moliyaviy / hisobot yili.
@@ -686,7 +699,7 @@
 DocType: Quotation,Quotation To,Qabul qilish
 DocType: Lead,Middle Income,O&#39;rta daromad
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Ochilish (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"{0} elementi uchun standart o&#39;lchov birligi bevosita o&#39;zgartirilmaydi, chunki siz boshqa UOM bilan ba&#39;zi bitimlar (tranzaktsiyalar) qildingiz. Boshqa bir standart UOM dan foydalanish uchun yangi element yaratishingiz lozim."
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"{0} elementi uchun standart o&#39;lchov birligi bevosita o&#39;zgartirilmaydi, chunki siz boshqa UOM bilan ba&#39;zi bitimlar (tranzaktsiyalar) qildingiz. Boshqa bir standart UOM dan foydalanish uchun yangi element yaratishingiz lozim."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Ajratilgan mablag&#39; salbiy bo&#39;lishi mumkin emas
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,"Iltimos, kompaniyani tanlang"
 DocType: Purchase Order Item,Billed Amt,Billing qilingan Amt
@@ -700,6 +713,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Bank hisobini yuritish uchun Hisobni tanlang
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Barglarni, xarajat da&#39;vatlarini va ish haqini boshqarish uchun xodimlar yozuvlarini yarating"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Reçeteleme davri
+DocType: Restaurant Reservation,Restaurant Reservation,Restoran rezervasyoni
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Takliflarni Yozish
 DocType: Payment Entry Deduction,Payment Entry Deduction,To&#39;lovni to&#39;lashni kamaytirish
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Boshqa bir Sotuvdagi Shaxs {0} bir xil xodim identifikatori mavjud
@@ -707,7 +721,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Masters
 DocType: Assessment Plan,Maximum Assessment Score,Maksimal baholash skori
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Bankning jurnali kunlarini yangilash
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,Vaqtni kuzatish
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,Vaqtni kuzatish
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,TRANSPORTERGA DUPLIKAT
 DocType: Fiscal Year Company,Fiscal Year Company,Moliyaviy yil Kompaniya
 DocType: Packing Slip Item,DN Detail,DN batafsil
@@ -715,8 +729,9 @@
 DocType: Timesheet,Billed,To&#39;lov
 DocType: Batch,Batch Description,Ommaviy tavsif
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Talabalar guruhlarini yaratish
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","To&#39;lov shlyuzi hisobini yaratib bo&#39;lmadi, iltimos, bir qo&#39;lda yarating."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","To&#39;lov shlyuzi hisobini yaratib bo&#39;lmadi, iltimos, bir qo&#39;lda yarating."
 DocType: Supplier Scorecard,Per Year,Bir yilda
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Ushbu dasturda DOBga mos kelmasligi mumkin
 DocType: Sales Invoice,Sales Taxes and Charges,Sotishdan olinadigan soliqlar va yig&#39;imlar
 DocType: Employee,Organization Profile,Tashkilot profili
 DocType: Vital Signs,Height (In Meter),Balandligi (metrda)
@@ -752,7 +767,7 @@
 DocType: Student Batch Name,Batch Name,Partiya nomi
 DocType: Fee Validity,Max number of visit,Tashrifning maksimal soni
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Tuzilish sahifasi:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},"Iltimos, odatdagi Cash yoki Bank hisobini {0} To&#39;lov tartibi rejimida tanlang."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},"Iltimos, odatdagi Cash yoki Bank hisobini {0} To&#39;lov tartibi rejimida tanlang."
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,Ro&#39;yxatga olish
 DocType: GST Settings,GST Settings,GST sozlamalari
 DocType: Selling Settings,Customer Naming By,Xaridor tomonidan nomlash
@@ -784,15 +799,15 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Foydali soliqlar va yig&#39;imlar
 DocType: Production Order Operation,Actual Start Time,Haqiqiy boshlash vaqti
 DocType: BOM Operation,Operation Time,Foydalanish muddati
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Tugatish
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Tugatish
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Asosiy
 DocType: Timesheet,Total Billed Hours,Jami hisoblangan soat
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Miqdorni yozing
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Miqdorni yozing
 DocType: Leave Block List Allow,Allow User,Foydalanuvchiga ruxsat berish
 DocType: Journal Entry,Bill No,Bill №
 DocType: Company,Gain/Loss Account on Asset Disposal,Aktivni yo&#39;qotish bo&#39;yicha daromad / yo&#39;qotish hisobi
 DocType: Vehicle Log,Service Details,Xizmat haqida ma&#39;lumot
-DocType: Purchase Invoice,Quarterly,Har chorakda
+DocType: Subscription,Quarterly,Har chorakda
 DocType: Lab Test Template,Grouped,Guruhlangan
 DocType: Selling Settings,Delivery Note Required,Yetkazib berish eslatmasi kerak
 DocType: Bank Guarantee,Bank Guarantee Number,Bank kafolati raqami
@@ -801,12 +816,12 @@
 DocType: Student Attendance,Student Attendance,Isoning shogirdi ishtiroki
 DocType: Sales Invoice Timesheet,Time Sheet,Vaqt varaqasi
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Chuqur xomashyo asosida ishlab chiqarilgan
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,"Iltimos, mahsulot ma&#39;lumotlarini kiriting"
 DocType: Interest,Interest,Foiz
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Old savdo
 DocType: Purchase Receipt,Other Details,Boshqa tafsilotlar
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,Viktorina shablonni
+DocType: Restaurant Order Entry Item,Served,Xizmat qildi
 DocType: Account,Accounts,Hisoblar
 DocType: Vehicle,Odometer Value (Last),Odometer qiymati (oxirgi)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Yetkazib beruvchilar koeffitsienti mezonlari namunalari.
@@ -818,25 +833,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Preview ish haqi slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,{0} hisobi bir necha marta kiritilgan
 DocType: Account,Expenses Included In Valuation,Baholashda ishtirok etish xarajatlari
-DocType: Hub Settings,Seller City,Sotuvchi Shahar
 ,Absent Student Report,Isoning shogirdi hisoboti yo&#39;q
 DocType: Email Digest,Next email will be sent on:,Keyingi elektron pochta orqali yuboriladi:
 DocType: Offer Letter Term,Offer Letter Term,Harf muddatini taklif qilish
 DocType: Supplier Scorecard,Per Week,Haftasiga
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Mavzu variantlarga ega.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Mavzu variantlarga ega.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Jami talabalar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,{0} elementi topilmadi
 DocType: Bin,Stock Value,Qimmatli qog&#39;ozlar qiymati
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,Ish haqi yozuvlari fonda yaratiladi. Xatolik yuz berganda xato xabari Jadvalda yangilanadi.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Kompaniya {0} mavjud emas
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} {1} ga qadar pullik amal qiladi
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} {1} ga qadar pullik amal qiladi
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Daraxt turi
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Har bir birlikda iste&#39;mol miqdori
 DocType: Serial No,Warranty Expiry Date,Kafolatning amal qilish muddati
 DocType: Material Request Item,Quantity and Warehouse,Miqdor va ombor
+DocType: Hub Settings,Unregister,Ro&#39;yhatdan o&#39;tish
 DocType: Sales Invoice,Commission Rate (%),Komissiya darajasi (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,"Iltimos, Dasturni tanlang"
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,"Iltimos, Dasturni tanlang"
 DocType: Project,Estimated Cost,Bashoratli narxlar
 DocType: Purchase Order,Link to material requests,Materiallar so&#39;rovlariga havola
+DocType: Hub Settings,Publish,Nashr qiling
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerokosmos
 DocType: Journal Entry,Credit Card Entry,Kredit kartalarini rasmiylashtirish
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Kompaniya va Hisoblar
@@ -847,13 +864,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Kunlardan keyin imkoniyatni yoqing
 ,Reserved,Rezervlangan
 DocType: Purchase Order,Supply Raw Materials,Xom-ashyo etkazib berish
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Keyingi hisob-fakturaning qaysi kuni tuzilishi. Bu topshirish bo&#39;yicha yaratiladi.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Joriy aktivlar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} - bu aksiya elementi emas
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',"&quot;Ta&#39;lim bo&#39;yicha hisobot&quot; ni bosing, so&#39;ngra &quot;Yangi&quot;"
 DocType: Mode of Payment Account,Default Account,Standart hisob
 DocType: Payment Entry,Received Amount (Company Currency),Qabul qilingan summalar (Kompaniya valyutasi)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,"Imkoniyat Qo&#39;rg&#39;oshin qilinsa, qo&#39;rg&#39;oshin o&#39;rnatilishi kerak"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,"Imkoniyat Qo&#39;rg&#39;oshin qilinsa, qo&#39;rg&#39;oshin o&#39;rnatilishi kerak"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Haftalik yopiq kunni tanlang
 DocType: Patient,O Negative,O salbiy
 DocType: Production Order Operation,Planned End Time,Rejalashtirilgan muddat
@@ -869,10 +885,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energiya
 DocType: Opportunity,Opportunity From,Imkoniyatdan foydalanish
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Oylik oylik maoshi.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Kompaniya qo&#39;shish
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Serial raqamlari {2} uchun kerak. Siz {3} ni taqdim qildingiz.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Serial raqamlari {2} uchun kerak. Siz {3} ni taqdim qildingiz.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,"Iltimos, jadval tanlang"
 DocType: BOM,Website Specifications,Veb-saytning texnik xususiyatlari
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} - &quot;Qabul qiluvchilar&quot; bo&#39;limida noto&#39;g&#39;ri e-pochta manzili
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} - &quot;Qabul qiluvchilar&quot; bo&#39;limida noto&#39;g&#39;ri e-pochta manzili
 DocType: Special Test Items,Particulars,Xususan
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiotik.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: {1} dan {0} dan
@@ -880,11 +896,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Row {0}: Konvertatsiya qilish omillari majburiydir
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Ko&#39;p narx qoidalari bir xil mezonlarga ega, iltimos, birinchi o&#39;ringa tayinlash orqali mojaroni hal qiling. Narxlar qoidalari: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,BOMni boshqa BOMlar bilan bog&#39;langanidek o&#39;chirib qo&#39;yish yoki bekor qilish mumkin emas
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,BOMni boshqa BOMlar bilan bog&#39;langanidek o&#39;chirib qo&#39;yish yoki bekor qilish mumkin emas
 DocType: Opportunity,Maintenance,Xizmat
 DocType: Item Attribute Value,Item Attribute Value,Mavzu xususiyati qiymati
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Savdo kampaniyalari.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Vaqt jadvalini tuzish
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Vaqt jadvalini tuzish
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -922,12 +938,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,"Iltimos, avval Elementni kiriting"
 DocType: Account,Liability,Javobgarlik
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktsiyalangan pul miqdori {0} qatorida da&#39;vo miqdori qiymatidan katta bo&#39;lmasligi kerak.
+DocType: Salary Detail,Do not include in total,Hammaga qo&#39;shmang
 DocType: Company,Default Cost of Goods Sold Account,Sotilgan hisoblangan tovarlarning qiymati
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Narxlar ro&#39;yxati tanlanmagan
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Narxlar ro&#39;yxati tanlanmagan
 DocType: Employee,Family Background,Oila fondi
 DocType: Request for Quotation Supplier,Send Email,Elektron pochta yuborish
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Ogohlantirish: yaroqsiz {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Izoh yo&#39;q
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Ogohlantirish: yaroqsiz {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Izoh yo&#39;q
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,So&#39;ralgan
 DocType: Vital Signs,Heart Rate / Pulse,Yurak urishi / zarba
 DocType: Company,Default Bank Account,Standart bank hisobi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",Partiyaga asoslangan filtrni belgilash uchun birinchi navbatda Partiya turini tanlang
@@ -954,12 +972,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Mahsulot satr {idx}: {doctype} {docname} yuqoridagi &quot;{doctype}&quot; jadvalida mavjud emas
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Vaqt jadvalining {0} allaqachon tugallangan yoki bekor qilingan
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Vazifalar yo&#39;q
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Avtomatik hisob-faktura ishlab chiqariladigan oyning kuni, masalan, 05, 28 va boshqalar"
 DocType: Item Variant Settings,Copy Fields to Variant,Maydonlarni Variantlarga nusxalash
 DocType: Asset,Opening Accumulated Depreciation,Biriktirilgan amortizatsiyani ochish
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Ballar 5dan kam yoki teng bo&#39;lishi kerak
 DocType: Program Enrollment Tool,Program Enrollment Tool,Dasturlarni ro&#39;yxatga olish vositasi
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C-formasi yozuvlari
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C-formasi yozuvlari
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Xaridor va yetkazib beruvchi
 DocType: Email Digest,Email Digest Settings,E-pochtada elektron pochta sozlamalari
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Ishingiz uchun tashakkur!
@@ -977,13 +994,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Iqtibos holati
 DocType: Maintenance Visit,Completion Status,Tugatish holati
 DocType: HR Settings,Enter retirement age in years,Yildan pensiya yoshiga o&#39;ting
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Nishon ombori
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,"Iltimos, omborni tanlang"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Nishon ombori
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,"Iltimos, omborni tanlang"
 DocType: Cheque Print Template,Starting location from left edge,Manzilni chap tomondan boshlash
 DocType: Item,Allow over delivery or receipt upto this percent,Bu foizga yetkazib berish yoki uni olish haqida ruxsat bering
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Importni davom ettirish
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Barcha elementlar guruhlari
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Barcha elementlar guruhlari
 DocType: Process Payroll,Activity Log,Faoliyat jurnali
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Net qor / ziyon
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Transaktsiyalarni topshirish haqida xabarni avtomatik tuzish.
@@ -995,7 +1012,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Loyihalangan son
 DocType: Sales Invoice,Payment Due Date,To&#39;lov sanasi
 DocType: Drug Prescription,Interval UOM,Intervalli UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Mavzu Variant {0} allaqachon bir xil atributlarga ega
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Mavzu Variant {0} allaqachon bir xil atributlarga ega
+DocType: Item,Hub Publishing Details,Hub nashriyot tafsilotlari
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&quot;Ochilish&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,To Do To Do
 DocType: Notification Control,Delivery Note Message,Yetkazib berish eslatmasi
@@ -1015,10 +1033,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: Xomashyo asosiy element bilan bir xil bo&#39;lishi mumkin emas
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Buyurtma olish bo&#39;yicha ma&#39;lumotlar jamlanmasi jami soliqlar va yig&#39;imlar bilan bir xil bo&#39;lishi kerak
 DocType: Sales Team,Incentives,Rag&#39;batlantirish
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Hub uchun ro&#39;yxatdan o&#39;ting
 DocType: SMS Log,Requested Numbers,Talab qilingan raqamlar
 DocType: Production Planning Tool,Only Obtain Raw Materials,Faqat xom ashyolarni olish
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Ishlashni baholash.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",Xarid qilish vositasi yoqilganligi uchun &quot;Savatga savatni ishlatish&quot; funksiyasini yoqish va savat uchun kamida bitta Soliq qoidasi bo&#39;lishi kerak
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",Xarid qilish vositasi yoqilganligi uchun &quot;Savatga savatni ishlatish&quot; funksiyasini yoqish va savat uchun kamida bitta Soliq qoidasi bo&#39;lishi kerak
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","To&#39;lov usuli {0} Buyurtmani {1} buyrug&#39;iga binoan bog&#39;langan, ushbu hisob-fakturada avans sifatida ko&#39;rib chiqilishi kerakligini tekshiring."
 DocType: Sales Invoice Item,Stock Details,Aksiya haqida ma&#39;lumot
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Loyiha qiymati
@@ -1037,12 +1056,14 @@
 DocType: Salary Slip,Working Days,Ish kunlari
 DocType: Serial No,Incoming Rate,Kiruvchi foiz
 DocType: Packing Slip,Gross Weight,Brutto vazni
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,Ushbu tizimni o&#39;rnatayotgan kompaniyangizning nomi.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Uyani yoqish
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,Ushbu tizimni o&#39;rnatayotgan kompaniyangizning nomi.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Dam olish kunlari jami no. Ish kunlari
 DocType: Job Applicant,Hold,Ushlab turing
 DocType: Employee,Date of Joining,Ishtirok etish sanasi
 DocType: Naming Series,Update Series,Yangilash turkumi
 DocType: Supplier Quotation,Is Subcontracted,Subpudrat
+DocType: Restaurant Table,Minimum Seating,Minimal yashash joyi
 DocType: Item Attribute,Item Attribute Values,Xususiyatning qiymatlari
 DocType: Examination Result,Examination Result,Test natijalari
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Xarid qilish arizasi
@@ -1053,13 +1074,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Operatsion {1} uchun keyingi {0} kunda Time Slotni topib bo&#39;lmadi
 DocType: Production Order,Plan material for sub-assemblies,Sub-assemblies uchun rejalashtirilgan material
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Savdo hamkorlari va hududi
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} faol bo&#39;lishi kerak
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} faol bo&#39;lishi kerak
 DocType: Journal Entry,Depreciation Entry,Amortizatsiyani kiritish
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Iltimos, avval hujjat turini tanlang"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Materialni bekor qilish Bu Xizmat tashrifini bekor qilishdan avval {0} tashrif
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},No {0} seriyasi {1} mahsulotiga tegishli emas
 DocType: Purchase Receipt Item Supplied,Required Qty,Kerakli son
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Mavjud bitimlarga ega bo&#39;lgan omborlar kitobga o&#39;tkazilmaydi.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Mavjud bitimlarga ega bo&#39;lgan omborlar kitobga o&#39;tkazilmaydi.
 DocType: Bank Reconciliation,Total Amount,Umumiy hisob
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet-nashriyot
 DocType: Prescription Duration,Number,Raqam
@@ -1070,7 +1091,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Sotuvlar narxlari ro&#39;yxati
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Agar belgilansa, mijoz yaratiladi, bemorga ko&#39;rsatiladi. Ushbu xaridorga qarshi bemor to&#39;lovlari yaratiladi. Siz shuningdek, mavjud bemorni yaratishda mavjud mijozni tanlashingiz mumkin."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Ob&#39;ektlarni sinxronlashtirish uchun nashr qiling
 DocType: Bank Reconciliation,Account Currency,Hisob valyutasi
 DocType: Lab Test,Sample ID,Namuna identifikatori
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,"Iltimos, kompaniyadagi Yagona hisob qaydnomasidan foydalaning"
@@ -1079,11 +1099,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Xodim {0} faol emas yoki mavjud emas
 DocType: Fee Structure,Components,Komponentlar
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},"Iltimos, {0} dagi Asset kategoriyasi kiriting"
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Mavzu Variantlari {0} yangilandi
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Mavzu Variantlari {0} yangilandi
 DocType: Quality Inspection Reading,Reading 6,O&#39;qish 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,{0} {1} {2} hech qanday salbiy taqdim etgan holda taqdim etilmaydi
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","ishlab chiqariladi. Kechiktirilsa, siz &quot;Oyning kuni bilan takrorlang&quot; maydonini qo&#39;lda o&#39;zgartiring"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,{0} {1} {2} hech qanday salbiy taqdim etgan holda taqdim etilmaydi
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Xarid-faktura avansini sotib oling
-DocType: Hub Settings,Sync Now,Endi sinxronlang
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: kredit yozuvini {1} bilan bog&#39;lash mumkin emas
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Moliyaviy yil uchun byudjetni belgilang.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Ushbu rejim tanlangach, Standart Bank / Cash hisob qaydnomasi avtomatik ravishda qalin hisob-fakturada yangilanadi."
@@ -1095,13 +1116,13 @@
 DocType: Item,Is Purchase Item,Sotib olish elementi
 DocType: Asset,Purchase Invoice,Xarajatlarni xarid qiling
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher batafsil No
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Yangi Sotuvdagi Billing
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Yangi Sotuvdagi Billing
 DocType: Stock Entry,Total Outgoing Value,Jami chiquvchi qiymat
 DocType: Physician,Appointments,Uchrashuvlar
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Ochilish sanasi va Yakunlovchi sanasi bir xil Moliya yili ichida bo&#39;lishi kerak
 DocType: Lead,Request for Information,Ma&#39;lumot uchun ma&#39;lumot
 ,LeaderBoard,LeaderBoard
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Oflayn xaritalarni sinxronlash
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Oflayn xaritalarni sinxronlash
 DocType: Payment Request,Paid,To&#39;langan
 DocType: Program Fee,Program Fee,Dastur haqi
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1120,11 +1141,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Buyurtma Buyurtma Buyurtma
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Bilvosita daromad
 DocType: Student Attendance Tool,Student Attendance Tool,Isoning shogirdi qatnashish vositasi
+DocType: Restaurant Menu,Price List (Auto created),Narxlar ro&#39;yxati (Avtomatik yaratilgan)
 DocType: Cheque Print Template,Date Settings,Sana Sozlamalari
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Varyans
 ,Company Name,kopmaniya nomi
 DocType: SMS Center,Total Message(s),Jami xabar (lar)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Transfer uchun ob&#39;ektni tanlang
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Transfer uchun ob&#39;ektni tanlang
 DocType: Purchase Invoice,Additional Discount Percentage,Qo&#39;shimcha imtiyozli foiz
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Barcha yordam videoslarining ro&#39;yxatini ko&#39;ring
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Hisobni topshirgan bank boshlig&#39;ini tanlang.
@@ -1141,6 +1163,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Metr
 DocType: Workstation,Electricity Cost,Elektr narx
 DocType: HR Settings,Don't send Employee Birthday Reminders,Xodimlarga Tug&#39;ilgan kun eslatmalarini yubormang
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Sozlamalarni saqlash
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Talab qilingan mahsulotlar
 DocType: Item,Inspection Criteria,Tekshiruv mezonlari
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,O&#39;tkazildi
 DocType: BOM Website Item,BOM Website Item,BOM veb-sayt elementi
@@ -1157,11 +1181,11 @@
 DocType: Journal Entry,Total Amount in Words,So&#39;zlarning umumiy miqdori
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Xatolik yuz berdi. Buning bir sababi, ariza saqlanmagan bo&#39;lishi mumkin. Muammo davom etsa, iltimos, support@erpnext.com bilan bog&#39;laning."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Mening savatim
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Buyurtma turi {0} dan biri bo&#39;lishi kerak
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Buyurtma turi {0} dan biri bo&#39;lishi kerak
 DocType: Lead,Next Contact Date,Keyingi aloqa kuni
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Miqdorni ochish
 DocType: Healthcare Settings,Appointment Reminder,Uchrashuv eslatmasi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,O&#39;zgarish uchun Hisobni kiriting
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,O&#39;zgarish uchun Hisobni kiriting
 DocType: Student Batch Name,Student Batch Name,Isoning shogirdi nomi
 DocType: Consultation,Doctor,Doktor
 DocType: Holiday List,Holiday List Name,Dam olish ro&#39;yxati nomi
@@ -1169,12 +1193,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Jadval kursi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Aksiyadorlik imkoniyatlari
 DocType: Journal Entry Account,Expense Claim,Xarajat shikoyati
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,"Chindan ham, bu eskirgan obyektni qayta tiklashni xohlaysizmi?"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},{0} uchun son
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,"Chindan ham, bu eskirgan obyektni qayta tiklashni xohlaysizmi?"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},{0} uchun son
 DocType: Leave Application,Leave Application,Ilovani qoldiring
 DocType: Patient,Patient Relation,Kasal munosabatlar
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Tahsis vositasini qoldiring
+DocType: Item,Hub Category to Publish,Nashr etiladigan tovush kategoriyasi
 DocType: Leave Block List,Leave Block List Dates,Bloklash ro&#39;yxatini qoldiring
+DocType: Sales Invoice,Billing Address GSTIN,To&#39;lov manzili GSTIN
 DocType: Workstation,Net Hour Rate,Net soat tezligi
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Chiqindilar narxini sotib olish qo&#39;ng&#39;irog&#39;i
 DocType: Company,Default Terms,Standart shartlar
@@ -1184,18 +1210,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},"Iltimos, {0}"
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Sifat yoki qiymat o&#39;zgarmasdan chiqarilgan elementlar.
 DocType: Delivery Note,Delivery To,Etkazib berish
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Xususiyat jadvali majburiydir
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Xususiyat jadvali majburiydir
 DocType: Production Planning Tool,Get Sales Orders,Savdo buyurtmalarini oling
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} salbiy bo&#39;lishi mumkin emas
 DocType: Training Event,Self-Study,O&#39;z-o&#39;zini tadqiq qilish
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Dasturi
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Dasturi
 DocType: Asset,Total Number of Depreciations,Amortismanlarning umumiy soni
 DocType: Sales Invoice Item,Rate With Margin,Marj bilan baholang
 DocType: Workstation,Wages,Ish haqi
 DocType: Task,Urgent,Shoshilinch
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Iltimos {1} jadvalidagi {0} qatoriga tegishli joriy qatorni identifikatorini ko&#39;rsating
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Argumentlar topilmadi:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,"Iltimos, numpad dan tahrir qilish uchun maydonni tanlang"
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,"Iltimos, numpad dan tahrir qilish uchun maydonni tanlang"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Ish stoliga o&#39;ting va ERPNext dasturini ishga tushiring
 DocType: Item,Manufacturer,Ishlab chiqaruvchi
 DocType: Landed Cost Item,Purchase Receipt Item,Qabulnoma nusxasini xarid qiling
@@ -1226,8 +1252,8 @@
 DocType: GL Entry,Against,Qarshi
 DocType: Item,Default Selling Cost Center,Standart sotish narxlari markazi
 DocType: Sales Partner,Implementation Partner,Dasturni amalga oshirish bo&#39;yicha hamkor
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Pochta indeksi
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Savdo Buyurtma {0} - {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Pochta indeksi
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Savdo Buyurtma {0} - {1}
 DocType: Opportunity,Contact Info,Aloqa ma&#39;lumotlari
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Aktsiyalarni kiritish
 DocType: Packing Slip,Net Weight UOM,Og&#39;irligi UOM
@@ -1238,6 +1264,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Haftalik yopiq sanalar oling
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Tugash sanasi Boshlanish sanasidan past bo&#39;lishi mumkin emas
 DocType: Sales Person,Select company name first.,Avval kompaniya nomini tanlang.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Yuqoridan pastga
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ta&#39;minlovchilar tomonidan olingan takliflar.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOMni almashtiring va barcha BOM&#39;lardagi eng so&#39;nggi narxni yangilang
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},{0} uchun {1} {2}
@@ -1256,7 +1283,7 @@
 DocType: Program Enrollment,Transportation,Tashish
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Noto&#39;g&#39;ri attribut
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} yuborilishi kerak
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Miqdori {0} dan kam yoki unga teng bo&#39;lishi kerak
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Miqdori {0} dan kam yoki unga teng bo&#39;lishi kerak
 DocType: SMS Center,Total Characters,Jami belgilar
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},"Iltimos, {0} uchun BOM maydonida BOM-ni tanlang"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-formasi faktura detallari
@@ -1271,7 +1298,7 @@
 ,Ordered Items To Be Billed,Buyurtma qilingan narsalar to&#39;lanishi kerak
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Qatordan oraliq oralig&#39;idan kam bo&#39;lishi kerak
 DocType: Global Defaults,Global Defaults,Global standartlar
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Loyiha hamkorlik taklifi
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Loyiha hamkorlik taklifi
 DocType: Salary Slip,Deductions,Tahlikalar
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Ro&#39;yxatdan o&#39;tish nomi
@@ -1289,13 +1316,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Sotuvdagi schyot-faktura Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,So&#39;raladigan hech narsa yo&#39;q
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Moliyaviy yil uchun {1} &quot;{2}&quot; ga qarshi &quot;{0}&quot; yana bir byudjet rekordi {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Haqiqiy boshlanish sanasi&quot; &quot;haqiqiy tugatish sanasi&quot; dan katta bo&#39;lishi mumkin emas
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Haqiqiy boshlanish sanasi&quot; &quot;haqiqiy tugatish sanasi&quot; dan katta bo&#39;lishi mumkin emas
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Boshqarish
 DocType: Cheque Print Template,Payer Settings,To&#39;lovchining sozlamalari
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Bunga Variantning Mahsulot kodiga qo&#39;shiladi. Misol uchun, qisqartma &quot;SM&quot; bo&#39;lsa va element kodi &quot;T-SHIRT&quot; bo&#39;lsa, variantning element kodi &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Ish haqi miqdorini saqlaganingizdan so&#39;ng, aniq to&#39;lov (so&#39;zlar bilan) ko&#39;rinadi."
 DocType: Purchase Invoice,Is Return,Qaytish
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,E&#39;tibor bering
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,E&#39;tibor bering
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Qaytaring / Debet Eslatma
 DocType: Price List Country,Price List Country,Narxlar ro&#39;yxati
 DocType: Item,UOMs,UOMlar
@@ -1309,17 +1336,18 @@
 DocType: Account,Balance Sheet,Balanslar varaqasi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Xarajat markazi Mahsulot kodi bo&#39;lgan mahsulot uchun &#39;
 DocType: Fee Validity,Valid Till,Tilligacha amal qiling
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",To&#39;lov tartibi sozlanmagan. Hisobni to&#39;lov usulida yoki Qalin profilda o&#39;rnatganligini tekshiring.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",To&#39;lov tartibi sozlanmagan. Hisobni to&#39;lov usulida yoki Qalin profilda o&#39;rnatganligini tekshiring.
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Xuddi shu element bir necha marta kiritilmaydi.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Boshqa hisoblar Guruhlar ostida amalga oshirilishi mumkin, lekin guruhlar bo&#39;lmagan guruhlarga qarshi yozuvlar kiritilishi mumkin"
 DocType: Lead,Lead,Qo&#39;rg&#39;oshin
 DocType: Email Digest,Payables,Qarzlar
 DocType: Course,Course Intro,Kursni tanishtir
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Stock Entry {0} yaratildi
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Iltimos, Setup&gt; Numbering Series orqali tomosha qilish uchun raqamlar seriyasini sozlang"
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Stock Entry {0} yaratildi
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,# {0} qatori: Rad etilgan Qty Xarid qilishni qaytarib bo&#39;lmaydi
 ,Purchase Order Items To Be Billed,Buyurtma buyurtmalarini sotib olish uchun to&#39;lovlar
 DocType: Purchase Invoice Item,Net Rate,Sof kurs
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,"Iltimos, mijozni tanlang"
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,"Iltimos, mijozni tanlang"
 DocType: Purchase Invoice Item,Purchase Invoice Item,Xarajatlarni taqdim etish elementi
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Qimmatli qog&#39;ozlar bilan bog&#39;liq yozuvlar va GL yozuvlari tanlangan xarid q&#39;abolari uchun qayta joylashtiriladi
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,1-band
@@ -1338,7 +1366,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Shu {1} bilan {0} qatorini nusxalash
 ,Trial Balance,Sinov balansi
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Moliyaviy yil {0} topilmadi
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Xodimlarni o&#39;rnatish
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Xodimlarni o&#39;rnatish
 DocType: Sales Order,SO-,SO-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,"Iltimos, avval prefiksni tanlang"
 DocType: Employee,O-,O-
@@ -1350,12 +1378,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Ledger-ni ko&#39;rib chiqing
 DocType: Grading Scale,Intervals,Intervallar
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Eng qadimgi
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Mavzu guruhi bir xil nom bilan mavjud bo&#39;lib, element nomini o&#39;zgartiring yoki element guruhini o&#39;zgartiring"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Mavzu guruhi bir xil nom bilan mavjud bo&#39;lib, element nomini o&#39;zgartiring yoki element guruhini o&#39;zgartiring"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Talabalar uchun mobil telefon raqami
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Dunyoning qolgan qismi
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Dunyoning qolgan qismi
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,{0} bandda partiyalar mavjud emas
 ,Budget Variance Report,Byudjet o&#39;zgaruvchilari hisoboti
 DocType: Salary Slip,Gross Pay,Brüt to&#39;lov
+DocType: Item,Is Item from Hub,Uyadan uydir
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Row {0}: Faoliyat turi majburiydir.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,To&#39;langan mablag&#39;lar
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Buxgalterlik hisobi
@@ -1365,8 +1394,9 @@
 DocType: Vehicle Log,Service Detail,Sizga xizmat ko&#39;rsatuvchi batafsil
 DocType: BOM,Item Description,Mavzu tavsifi
 DocType: Student Sibling,Student Sibling,Isoning shogirdi bo&#39;lgan birodar
-DocType: Purchase Invoice,Is Recurring,Ikki marta takrorlangan
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,To&#39;lov tartibi
 DocType: Purchase Invoice,Supplied Items,Mahsulotlar bilan ta&#39;minlangan
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Restoran {0} uchun faol menyu tanlang
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Ishlab chiqarish uchun miqdori
 DocType: Email Digest,New Income,Yangi daromad
@@ -1376,6 +1406,7 @@
 ,Student and Guardian Contact Details,Isoning shogirdi va Guardian bilan aloqa ma&#39;lumotlarini
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Row {0}: yetkazib beruvchi uchun {0} elektron pochta manzili uchun elektron pochta manzili talab qilinadi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Vaqtinchalik ochilish
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Hub-ni ko&#39;rish
 ,Employee Leave Balance,Xodimlarning balansidan chiqishi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Hisob uchun {0} muvozanat har doim {1} bo&#39;lishi kerak
 DocType: Patient Appointment,More Info,Qo&#39;shimcha ma&#39;lumot
@@ -1395,11 +1426,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Savdo Buyurtmani {0} haqiqiy emas
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Takliflar uchun yangi so&#39;rov uchun ogohlantir
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Xarid qilish buyurtmalari xaridlarni rejalashtirish va kuzatib borishingizga yordam beradi
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Kechirasiz, kompaniyalar birlashtirilmaydi"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Kechirasiz, kompaniyalar birlashtirilmaydi"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Laboratoriya testlari retseptlari
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Kichik
 DocType: Employee,Employee Number,Xodimlarning soni
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Hech qanday holatlar mavjud emas. Hech qanday {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Hech qanday holatlar mavjud emas. Hech qanday {0}
 DocType: Project,% Completed,% Bajarildi
 ,Invoiced Amount (Exculsive Tax),Xarajatlar miqdori (ortiqcha soliqlar)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,2-band
@@ -1414,11 +1445,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Bilvosita xarajatlar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Row {0}: Miqdor majburiydir
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Qishloq xo&#39;jaligi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Master ma&#39;lumotlarini sinxronlash
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Master ma&#39;lumotlarini sinxronlash
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Sizning Mahsulotlaringiz yoki Xizmatlaringiz
 DocType: Special Test Items,Special Test Items,Maxsus test buyumlari
 DocType: Mode of Payment,Mode of Payment,To&#39;lov tartibi
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Veb-sayt rasmiy umumiy fayl yoki veb-sayt URL bo&#39;lishi kerak
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Veb-sayt rasmiy umumiy fayl yoki veb-sayt URL bo&#39;lishi kerak
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Bu ildiz elementlar guruhidir va tahrirlanmaydi.
@@ -1426,24 +1457,23 @@
 DocType: Vehicle,Fuel UOM,Yoqilg&#39;i UOM
 DocType: Warehouse,Warehouse Contact Info,Qoidalarga oid aloqa ma&#39;lumotlari
 DocType: Payment Entry,Write Off Difference Amount,Foiz miqdorini yozing
-DocType: Purchase Invoice,Recurring Type,Ikkilangan tur
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent","{0}: Xodimlarning elektron pochta manzili topilmadi, shuning uchun elektron pochta orqali yuborilmadi"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent","{0}: Xodimlarning elektron pochta manzili topilmadi, shuning uchun elektron pochta orqali yuborilmadi"
 DocType: Item,Foreign Trade Details,Tashqi savdo tafsilotlari
+,Assessment Plan Status,Baholash rejasining holati
 DocType: Email Digest,Annual Income,Yillik daromad
 DocType: Serial No,Serial No Details,Seriya No Details
 DocType: Purchase Invoice Item,Item Tax Rate,Soliq to&#39;lovi stavkasi
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,"Iltimos, shifokor va Sana-ni tanlang"
 DocType: Student Group Student,Group Roll Number,Guruh Rulksi raqami
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} uchun faqat kredit hisoblari boshqa to&#39;lov usullariga bog&#39;liq bo&#39;lishi mumkin
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Barcha topshiriqlarning umumiy og&#39;irligi 1 bo&#39;lishi kerak. Iltimos, barcha loyiha vazifalarining vaznini mos ravishda moslang"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Yetkazib berish eslatmasi {0} yuborilmadi
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Barcha topshiriqlarning umumiy og&#39;irligi 1 bo&#39;lishi kerak. Iltimos, barcha loyiha vazifalarining vaznini mos ravishda moslang"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Yetkazib berish eslatmasi {0} yuborilmadi
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,{0} mahsuloti sub-shartnoma qo&#39;yilgan bo&#39;lishi kerak
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapital uskunalar
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Raqobatchilarimiz qoidasi &quot;Apply O&#39;n&quot; maydoniga asoslanib tanlangan, bular Item, Item Group yoki Tovar bo&#39;lishi mumkin."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Avval Mahsulot kodini o&#39;rnating
-DocType: Hub Settings,Seller Website,Sotuvchi veb-sayti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Avval Mahsulot kodini o&#39;rnating
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Savdo jamoasi uchun jami ajratilgan foiz 100 bo&#39;lishi kerak
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Savdo jamoasi uchun jami ajratilgan foiz 100 bo&#39;lishi kerak
 DocType: Sales Invoice Item,Edit Description,Tartibga solish tavsifi
 DocType: Antibiotic,Antibiotic,Antibiotik
 ,Team Updates,Jamoa yangiliklari
@@ -1464,12 +1494,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Jami (Kompaniya valyutasi)
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Seriya raqami {0} bir necha marta kiritilgan
 DocType: Depreciation Schedule,Journal Entry,Jurnalga kirish
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,Joriy {0} ta element
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,Joriy {0} ta element
 DocType: Workstation,Workstation Name,Ish stantsiyasining nomi
 DocType: Grading Scale Interval,Grade Code,Sinf kodi
 DocType: POS Item Group,POS Item Group,Qalin modda guruhi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-pochtasi:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} {1} mahsulotiga tegishli emas
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} {1} mahsulotiga tegishli emas
 DocType: Sales Partner,Target Distribution,Nishon tarqatish
 DocType: Salary Slip,Bank Account No.,Bank hisob raqami
 DocType: Naming Series,This is the number of the last created transaction with this prefix,"Bu, bu old qo&#39;shimchadagi oxirgi yaratilgan bitimning sonidir"
@@ -1485,10 +1515,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Buyurtma beruvchi etkazib beruvchisi
 DocType: Healthcare Settings,Registration Message,Ro&#39;yxatdan o&#39;tish xabar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Uskuna
-DocType: Sales Order,Recurring Upto,Qaytgan Upto
 DocType: Prescription Dosage,Prescription Dosage,Reçetesiz dozaj
 DocType: Attendance,HR Manager,Kadrlar bo&#39;yicha menejer
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,"Iltimos, kompaniyani tanlang"
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,"Iltimos, kompaniyani tanlang"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Yetkazib beruvchi hisob-fakturasi sanasi
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,boshiga
@@ -1504,9 +1533,10 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Quyidagilar orasida o&#39;zaro kelishilgan shartlar:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Journal Entryga qarshi {0} da allaqachon boshqa bir kvotaga nisbatan o&#39;rnatilgan
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Umumiy Buyurtma qiymati
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Ovqat
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Ovqat
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Qarish oralig&#39;i 3
 DocType: Maintenance Schedule Item,No of Visits,Tashriflar soni
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Ma&#39;lumotlaringiz uyasiga nashr qilmoqchimisiz?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,Talabgorni ro&#39;yxatga olish
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Yakuniy hisob raqamining valyutasi {0} bo&#39;lishi kerak
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Barcha maqsadlar uchun ball yig&#39;indisi 100 bo&#39;lishi kerak. Bu {0}
@@ -1517,9 +1547,9 @@
 DocType: Authorization Rule,Average Discount,O&#39;rtacha chegirma
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Kommunal xizmatlar
-DocType: Purchase Invoice Item,Accounting,Hisob-kitob
+DocType: POS Profile,Accounting,Hisob-kitob
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,"Iltimos, yig&#39;ilgan element uchun partiyalarni tanlang"
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,"Iltimos, yig&#39;ilgan element uchun partiyalarni tanlang"
 DocType: Asset,Depreciation Schedules,Amortizatsiya jadvallari
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Ariza soatlari tashqaridan ajratilgan muddatning tashqarisida bo&#39;lishi mumkin emas
 DocType: Activity Cost,Projects,Loyihalar
@@ -1535,7 +1565,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',Tasdiqlash maqomi &quot;Tasdiqlangan&quot; yoki &quot;Rad etilgan&quot; bo&#39;lishi kerak
 DocType: Physician,Contacts and Address,Kontaktlar va manzil
 DocType: Purchase Invoice,Contact Person,Bog&#39;lanish uchun shahs
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&quot;Bashoratli boshlanish sanasi&quot; kutilgan &quot;tugash sanasi&quot; dan kattaroq bo&#39;la olmaydi
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&quot;Bashoratli boshlanish sanasi&quot; kutilgan &quot;tugash sanasi&quot; dan kattaroq bo&#39;la olmaydi
 DocType: Course Scheduling Tool,Course End Date,Kurs tugash sanasi
 DocType: Holiday List,Holidays,Bayramlar
 DocType: Sales Order Item,Planned Quantity,Rejalashtirilgan miqdori
@@ -1543,10 +1573,11 @@
 DocType: Item,Maintain Stock,Qimmatli qog&#39;ozlar bozori
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Ishlab chiqarish tartibi uchun yaratilgan aktsiyalar
 DocType: Employee,Prefered Email,Tanlangan elektron pochta
+DocType: Student Admission,Eligibility and Details,Imtiyoz va tafsilotlar
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Ruxsat etilgan aktivlardagi aniq o&#39;zgarish
 DocType: Leave Control Panel,Leave blank if considered for all designations,Barcha belgilar uchun hisobga olingan holda bo&#39;sh qoldiring
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,{0} qatoridagi &quot;Haqiqiy&quot; turidagi to&#39;lovni &quot;Oddiy qiymat&quot; ga qo&#39;shish mumkin emas
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Maks: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Maks: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Datetime&#39;dan
 DocType: Email Digest,For Company,Kompaniya uchun
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Aloqa yozuvi.
@@ -1554,19 +1585,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Yetkazib beruvchi Scorecard Scoring Variable
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Xarid qilish miqdori
 DocType: Sales Invoice,Shipping Address Name,Yuk tashish manzili nomi
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Hisob jadvali
 DocType: Material Request,Terms and Conditions Content,Shartlar va shartlar tarkibi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,100 dan ortiq bo&#39;lishi mumkin emas
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,{0} elementi aktsiyalar elementi emas
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,{0} elementi aktsiyalar elementi emas
 DocType: Maintenance Visit,Unscheduled,Rejalashtirilmagan
 DocType: Employee,Owned,Egasi
 DocType: Salary Detail,Depends on Leave Without Pay,Pulsiz qoldiring
 DocType: Pricing Rule,"Higher the number, higher the priority","Raqamni ko&#39;paytirish, ustunlikning ustunligi"
 ,Purchase Invoice Trends,Billing yo&#39;nalishlarini xarid qiling
 DocType: Employee,Better Prospects,Yaxshi istiqbolga ega
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","# {0} qatori: {1} guruhida faqat {2} qty bor. Iltimos, {3} qty mavjud bo&#39;lgan boshqa qatorni tanlang yoki bir nechta partiyalardan etkazib berish uchun qatorni bir necha qatorga bo&#39;linib ko&#39;rsating"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","# {0} qatori: {1} guruhida faqat {2} qty bor. Iltimos, {3} qty mavjud bo&#39;lgan boshqa qatorni tanlang yoki bir nechta partiyalardan etkazib berish uchun qatorni bir necha qatorga bo&#39;linib ko&#39;rsating"
 DocType: Vehicle,License Plate,Plitalar
 DocType: Appraisal,Goals,Maqsadlar
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Qalin profilni tanlang
 DocType: Warranty Claim,Warranty / AMC Status,Kafolat / AMC Status
 ,Accounts Browser,Hisoblar brauzeri
 DocType: Payment Entry Reference,Payment Entry Reference,To&#39;lov uchun ariza namunasi
@@ -1584,7 +1615,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Xodim o&#39;z oldiga hisobot bera olmaydi.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Agar hisob buzilgan bo&#39;lsa, kirishlar cheklangan foydalanuvchilarga ruxsat etiladi."
 DocType: Email Digest,Bank Balance,Bank balansi
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} uchun buxgalteriya yozuvi: {1} faqatgina valyutada bo&#39;lishi mumkin: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} uchun buxgalteriya yozuvi: {1} faqatgina valyutada bo&#39;lishi mumkin: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Ishchi profil, talablar va boshqalar."
 DocType: Journal Entry Account,Account Balance,Hisob balansi
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Bitim uchun soliq qoidalari.
@@ -1593,8 +1624,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Jami soliqlar va yig&#39;imlar (Kompaniya valyutasi)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Yoqmagan moliyaviy yilgi P &amp; L balanslarini ko&#39;rsating
 DocType: Lab Test Template,Collection Details,To&#39;plash tafsilotlari
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date tabConsultation ct dan, tablab Prescription` cp, bu erda ct.patient = &#39;{0}&#39; va cp.parent = ct ni tanlang. nomi va cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Yuk tashish qaydnomasi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Hisob {2} faol emas
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Sizning ishingizni rejalashtirish va vaqtida yetkazib berishga yordam berish uchun Sotuvdagi buyurtma berish
@@ -1611,7 +1640,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Qoplamali sumkasi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Ofis ijarasi
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,SMS-gateway sozlamalarini to&#39;g&#39;rilash
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import amalga oshmadi!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import amalga oshmadi!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Hech qanday manzil hali qo&#39;shilmagan.
 DocType: Workstation Working Hour,Workstation Working Hour,Ish stantsiyani ish vaqti
 DocType: Vital Signs,Blood Pressure,Qon bosimi
@@ -1636,7 +1665,7 @@
 DocType: Sales Invoice,Source,Manba
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Yopiq ko&#39;rsatilsin
 DocType: Leave Type,Is Leave Without Pay,To&#39;lovsiz qoldirish
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Assot kategoriyasi Ruxsat etilgan obyektlar uchun majburiydir
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Assot kategoriyasi Ruxsat etilgan obyektlar uchun majburiydir
 DocType: Fee Validity,Fee Validity,Ish haqi amal qilish muddati
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,To&#39;lov jadvalida yozuvlar topilmadi
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},{0} {2} {3} uchun {1} bilan nizolar
@@ -1657,8 +1686,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Ijrochi Izlash
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Yaratmalar yaratish
 DocType: Maintenance Schedule,Schedules,Jadvallar
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,Sotish nuqtasini ishlatish uchun qalin profil talab qilinadi
 DocType: Purchase Invoice Item,Net Amount,Net miqdori
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} yuborilmadi, shuning uchun amal bajarilmaydi"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} yuborilmadi, shuning uchun amal bajarilmaydi"
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM batafsil
 DocType: Landed Cost Voucher,Additional Charges,Qo&#39;shimcha ish haqi
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Qo&#39;shimcha chegirma miqdori (Kompaniya valyutasi)
@@ -1667,7 +1697,7 @@
 ,Support Hour Distribution,Qo&#39;llash vaqtini taqsimlash
 DocType: Maintenance Visit,Maintenance Visit,Xizmat tashrifi
 DocType: Student,Leaving Certificate Number,Sertifikat raqamini qoldirish
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Uchrashuv bekor qilindi, Iltimos, {0} hisob-fakturasini ko&#39;rib chiqing va bekor qiling"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Uchrashuv bekor qilindi, Iltimos, {0} hisob-fakturasini ko&#39;rib chiqing va bekor qiling"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,QXIdagi mavjud ommaviy miqdori
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Bosib chiqarish formatini yangilang
 DocType: Landed Cost Voucher,Landed Cost Help,Yo&#39;lga tushgan xarajatli yordam
@@ -1690,8 +1720,8 @@
 DocType: Patient,Tobacco Past Use,Tamaki iste&#39;mol qilish
 DocType: Sales Invoice Item,Brand Name,Brendning nomi
 DocType: Purchase Receipt,Transporter Details,Tashuvchi ma&#39;lumoti
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},{0} {{} {1} shifokoriga allaqachon tayinlangan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Tanlangan element uchun odatiy ombor kerak
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},{0} {{} {1} shifokoriga allaqachon tayinlangan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Tanlangan element uchun odatiy ombor kerak
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Box
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,Mumkin bo&#39;lgan yetkazib beruvchi
 DocType: Budget,Monthly Distribution,Oylik tarqatish
@@ -1701,7 +1731,7 @@
 DocType: Sales Partner,Sales Partner Target,Savdo hamkorining maqsadi
 DocType: Loan Type,Maximum Loan Amount,Maksimal kredit summasi
 DocType: Pricing Rule,Pricing Rule,Raqobatchilar qoidasi
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Talabalar uchun {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Talabalar uchun {0}
 DocType: Budget,Action if Annual Budget Exceeded,Agar yillik byudjetdan oshib ketgan bo&#39;lsa
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Buyurtma buyurtmasiga buyurtma berish
 DocType: Shopping Cart Settings,Payment Success URL,To&#39;lov muvaffaqiyati URL manzili
@@ -1717,7 +1747,7 @@
 apps/erpnext/erpnext/config/stock.py +310,Opening Stock Balance,Qimmatli qog&#39;ozlar balansini ochish
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} faqat bir marta paydo bo&#39;lishi kerak
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},{0} uchun muvaffaqiyatli tarzda ajratilgan qoldirilganlar
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,To&#39;plam uchun hech narsa yo&#39;q
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,To&#39;plam uchun hech narsa yo&#39;q
 DocType: Shipping Rule Condition,From Value,Qiymatdan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Ishlab chiqarish miqdori majburiydir
 DocType: Employee Loan,Repayment Method,Qaytarilish usuli
@@ -1731,6 +1761,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Qarz majburiyatlari
 DocType: Purchase Invoice,Supplier Warehouse,Yetkazib beruvchi ombori
 DocType: Opportunity,Contact Mobile No,Mobil raqami bilan bog&#39;laning
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Kompaniya-ni tanlang
 ,Material Requests for which Supplier Quotations are not created,Yetkazib beruvchi kotirovkalari yaratilmagan moddiy talablar
 DocType: Student Group,Set 0 for no limit,Hech qanday chegara uchun 0-ni tanlang
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dam olish uchun ariza topshirgan kun (lar) bayramdir. Siz ta&#39;tilga ariza berishingiz shart emas.
@@ -1740,23 +1771,23 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Qabul qiling
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Boshqa hisobotlar
 DocType: Dependent Task,Dependent Task,Qaram vazifa
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Birlamchi o&#39;lchov birligi uchun ishlab chiqarish omili {0} qatorida 1 bo&#39;lishi kerak
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Birlamchi o&#39;lchov birligi uchun ishlab chiqarish omili {0} qatorida 1 bo&#39;lishi kerak
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},{0} tipidagi qoldiring {1} dan uzun bo&#39;lishi mumkin emas
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,X kun oldin rejalashtirilgan operatsiyalarni sinab ko&#39;ring.
 DocType: HR Settings,Stop Birthday Reminders,Tug&#39;ilgan kunlar eslatmalarini to&#39;xtatish
 DocType: SMS Center,Receiver List,Qabul qiluvchi ro&#39;yxati
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Qidiruv vositasi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Qidiruv vositasi
 DocType: Patient Appointment,Referring Physician,Shifokorga murojaat qilish
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Iste&#39;mol qilingan summalar
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Naqd pulning aniq o&#39;zgarishi
 DocType: Assessment Plan,Grading Scale,Baholash o&#39;lchovi
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,O&#39;lchov birligi {0} bir necha marta kiritilgan
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,To&#39;liq bajarildi
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,O&#39;lchov birligi {0} bir necha marta kiritilgan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,To&#39;liq bajarildi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Al-Qoida
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},To&#39;lov bo&#39;yicha so&#39;rov allaqachon {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Chiqarilgan mahsulotlarning narxi
 DocType: Physician,Hospital,Kasalxona
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Miqdori {0} dan ortiq bo&#39;lmasligi kerak
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Miqdori {0} dan ortiq bo&#39;lmasligi kerak
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Avvalgi moliyaviy yil yopiq emas
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Yosh (kunlar)
 DocType: Quotation Item,Quotation Item,Tavsif varag&#39;i
@@ -1767,8 +1798,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Yetkazib beruvchi turi ustasi.
 DocType: Purchase Order Item,Supplier Part Number,Yetkazib beruvchi qismi raqami
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Ishlab chiqarish darajasi 0 yoki 1 bo&#39;lishi mumkin emas
-DocType: Sales Invoice,Reference Document,Malumot hujjati
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} bekor qilindi yoki to&#39;xtatildi
+DocType: Subscription,Reference Document,Malumot hujjati
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} bekor qilindi yoki to&#39;xtatildi
 DocType: Accounts Settings,Credit Controller,Kredit nazoratchisi
 DocType: Delivery Note,Vehicle Dispatch Date,Avtomobilni jo&#39;natish sanasi
 DocType: Healthcare Settings,Default Medical Code Standard,Standart tibbiy standartlar standarti
@@ -1777,6 +1808,7 @@
 DocType: Company,Default Payable Account,Foydalanuvchi to&#39;lanadigan hisob
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Yuk tashish qoidalari, narxlar ro&#39;yxati va h.k. kabi onlayn xarid qilish vositasi sozlamalari"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% to&#39;ldirildi
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Narx bo&#39;yicha saralash
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Saqlandi Qty
 DocType: Party Account,Party Account,Partiya hisoblari
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Kadrlar bo&#39;limi
@@ -1788,13 +1820,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,To&#39;lovni kiritish
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Yetkazib beruvchiga qarshi oldindan qarzdor bo&#39;lishi kerak
 DocType: Company,Default Values,Standart qiymatlar
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequency} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Frequency} Digest
 DocType: Expense Claim,Total Amount Reimbursed,To&#39;lov miqdori to&#39;langan
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,"Bu, ushbu avtomobilga qarshi jurnallarga asoslangan. Tafsilotlar uchun quyidagi jadvalga qarang"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},{1} {0} etkazib beruvchi hisob-fakturasiga qarshi
 DocType: Customer,Default Price List,Standart narx ro&#39;yxati
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,Aktivlar harakati qaydlari {0} yaratildi
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Moliyaviy yil {0} ni o&#39;chirib bo&#39;lmaydi. Moliyaviy yil {0} global sozlamalarda sukut o&#39;rnatilgan
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Xuddi shu nomga ega bo&#39;lgan mijoz allaqachon mavjud
 DocType: Journal Entry,Entry Type,Kirish turi
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Ushbu baholash guruhi bilan bog&#39;liq bo&#39;lgan baholash rejasi yo&#39;q
 ,Customer Credit Balance,Xaridorlarning kredit balansi
@@ -1804,7 +1837,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Raqobatchilar
 DocType: Quotation,Term Details,Terim detallari
 DocType: Project,Total Sales Cost (via Sales Order),Jami sotish narxi (Sotuvdagi Buyurtma orqali)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Ushbu talabalar guruhida {0} dan ortiq talabalarni ro&#39;yxatdan o&#39;tkazib bo&#39;lmaydi.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Ushbu talabalar guruhida {0} dan ortiq talabalarni ro&#39;yxatdan o&#39;tkazib bo&#39;lmaydi.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Qo&#39;rg&#39;oshin soni
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 dan katta bo&#39;lishi kerak
 DocType: Manufacturing Settings,Capacity Planning For (Days),Imkoniyatlarni rejalashtirish (kunlar)
@@ -1820,9 +1853,11 @@
 DocType: Lab Test,Technician Name,Texnik nom
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Billingni bekor qilish bo&#39;yicha to&#39;lovni uzish
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Qo`yilgan O`chiratkichni o`zgartirishni o`zgartirish dastlabki Avtomobil Odometridan {0}
+DocType: Restaurant Reservation,No Show,Ko&#39;rish yo&#39;q
 DocType: Shipping Rule Country,Shipping Rule Country,Yuk tashish qoidalari mamlakat
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Qoldiring va davom eting
 DocType: Maintenance Visit,Partially Completed,Qisman bajarildi
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,O&#39;rtacha sezuvchanlik
 DocType: Leave Type,Include holidays within leaves as leaves,Bayramlardagi bayramlarni barglar sifatida qo&#39;shish
 DocType: Sales Invoice,Packed Items,Paketlangan narsalar
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Seriya raqami bo&#39;yicha kafolat talabi
@@ -1837,13 +1872,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),To&#39;langan pul miqdori (Kompaniya valyutasi)
 DocType: Purchase Invoice,Additional Discount,Qo&#39;shimcha chegirmalar
 DocType: Selling Settings,Selling Settings,Sotish sozlamalari
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Amalni tasdiqlang
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Onlayn auktsionlar
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Miqdor yoki baholash bahosini yoki ikkalasini ham ko&#39;rsating
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Tugatish
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Savatda ko&#39;rish
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Marketing xarajatlari
 ,Item Shortage Report,Mavzu kamchiliklari haqida hisobot
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Og&#39;irligi ko&#39;rsatilgan, \ n &quot;Og&#39;irligi UOM&quot; ni ham eslang"
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Og&#39;irligi ko&#39;rsatilgan, \ n &quot;Og&#39;irligi UOM&quot; ni ham eslang"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Ushbu moddiy yordamni kiritish uchun foydalanilgan materiallar talabi
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Keyinchalik keyingi Amortizatsiya tarixi yangi aktiv uchun majburiydir
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Har bir guruh uchun alohida kurs bo&#39;yicha guruh
@@ -1855,12 +1891,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Har bir aktsiyadorlik harakati uchun buxgalteriya hisobini kiritish
 DocType: Leave Allocation,Total Leaves Allocated,Jami ajratmalar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},No {0} qatorida talab qilingan ombor
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,"Iltimos, joriy moliyaviy yilni boshlash va tugatish sanasini kiriting"
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,"Iltimos, joriy moliyaviy yilni boshlash va tugatish sanasini kiriting"
 DocType: Employee,Date Of Retirement,Pensiya tarixi
 DocType: Upload Attendance,Get Template,Andoza olish
 DocType: Material Request,Transferred,O&#39;tkazildi
 DocType: Vehicle,Doors,Eshiklar
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext O&#39;rnatish tugallandi!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext O&#39;rnatish tugallandi!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Kasalni ro&#39;yxatdan o&#39;tkazish uchun yig&#39;im to&#39;lash
 DocType: Course Assessment Criteria,Weightage,Og&#39;irligi
 DocType: Purchase Invoice,Tax Breakup,Soliq to&#39;lash
@@ -1879,36 +1915,36 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Agar ushbu mahsulot varianti bo&#39;lsa, u holda savdo buyurtmalarida va hokazolarni tanlash mumkin emas."
 DocType: Lead,Next Contact By,Keyingi aloqa
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},{1} qatoridagi {0} element uchun zarur miqdori
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},{1} qatoridagi {0} element uchun zarur miqdori
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},{1} elementi uchun {0} ombori miqdorini yo&#39;q qilib bo&#39;lmaydi
 DocType: Quotation,Order Type,Buyurtma turi
-DocType: Purchase Invoice,Notification Email Address,Xabarnoma elektron pochta manzili
 ,Item-wise Sales Register,Buyurtmalar savdosi
 DocType: Asset,Gross Purchase Amount,Xarid qilishning umumiy miqdori
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Ochilish balanslari
 DocType: Asset,Depreciation Method,Amortizatsiya usuli
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,Oflayn
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,Oflayn
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ushbu soliq asosiy narxga kiritilganmi?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Umumiy maqsad
 DocType: Job Applicant,Applicant for a Job,Ish uchun murojaat etuvchi
 DocType: Production Plan Material Request,Production Plan Material Request,Ishlab chiqarish rejasi Materiallar talabi
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Buyurtma ishlab chiqarilmadi
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Buyurtma ishlab chiqarilmadi
 DocType: Stock Reconciliation,Reconciliation JSON,Moslik JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Juda ko&#39;p ustunlar. Hisobotni eksport qiling va elektron jadval ilovasidan foydalaning.
 DocType: Purchase Invoice Item,Batch No,Partiya no
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Buyurtma uchun ariza: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Xaridorning Buyurtma buyrug&#39;iga qarshi bir nechta Sotish Buyurtmalariga ruxsat berish
 DocType: Student Group Instructor,Student Group Instructor,Talabalar guruhining o&#39;qituvchisi
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobil raqami
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Asosiy
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Asosiy
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Sizning operatsiyalaringizda raqamlash seriyasi uchun prefiksni o&#39;rnating
 DocType: Employee Attendance Tool,Employees HTML,Xodimlar HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,Ushbu element yoki uning shabloni uchun standart BOM ({0}) faol bo&#39;lishi kerak
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Ushbu element yoki uning shabloni uchun standart BOM ({0}) faol bo&#39;lishi kerak
 DocType: Employee,Leave Encashed?,Encashed qoldiringmi?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Fursatdan dalolat majburiy
 DocType: Email Digest,Annual Expenses,Yillik xarajatlar
 DocType: Item,Variants,Variantlar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Buyurtma buyurtma qiling
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Buyurtma buyurtma qiling
 DocType: SMS Center,Send To,Yuborish
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},{0} to`g`ri to`g`ri uchun muvozanat etarli emas
 DocType: Payment Reconciliation Payment,Allocated amount,Ajratilgan mablag&#39;
@@ -1924,6 +1960,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Talabalar guruhining kuchi
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Jurnalga qarshi kiritilgan {0} yozuviga mos bo&#39;lmagan {1} yozuvi mavjud emas
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Baholash
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,O&#39;quv mashg&#39;ulotlari
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Duplikat ketma-ket No {0} element uchun kiritilgan
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Yuk tashish qoidalari uchun shart
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,"Iltimos, kiring"
@@ -1933,7 +1970,7 @@
 DocType: Sales Order,To Deliver and Bill,Taqdim etish va Bill
 DocType: Student Group,Instructors,O&#39;qituvchilar
 DocType: GL Entry,Credit Amount in Account Currency,Hisob valyutasida kredit summasi
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} yuborilishi kerak
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} yuborilishi kerak
 DocType: Authorization Control,Authorization Control,Avtorizatsiya nazorati
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Roy # {0}: Rad etilgan QXI rad etilgan elementga qarshi majburiydir {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,To&#39;lov
@@ -1951,11 +1988,11 @@
 DocType: Quotation Item,Actual Qty,Haqiqiy Miqdor
 DocType: Sales Invoice Item,References,Manbalar
 DocType: Quality Inspection Reading,Reading 10,O&#39;qish 10
-DocType: Hub Settings,Hub Node,Uyadan tugun
+DocType: Hub Category,Hub Node,Uyadan tugun
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Siz ikki nusxadagi ma&#39;lumotlar kiritdingiz. Iltimos, tuzatish va qayta urinib ko&#39;ring."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Birgalikda
 DocType: Asset Movement,Asset Movement,Asset harakati
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,Yangi savat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,Yangi savat
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} mahsuloti seriyali element emas
 DocType: SMS Center,Create Receiver List,Qabul qiluvchining ro&#39;yxatini yaratish
 DocType: Vehicle,Wheels,Jantlar
@@ -1969,15 +2006,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekommunikatsiyalar
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Paket ushbu etkazib berishning bir qismi ekanligini ko&#39;rsatadi (faqat loyiha)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,To&#39;lovni kiritish
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},{0} uchun mahsulot miqdori {1} dan kam bo&#39;lishi kerak
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},{0} uchun mahsulot miqdori {1} dan kam bo&#39;lishi kerak
 ,Sales Invoice Trends,Sotuvdagi taqdim etgan tendentsiyalari
 DocType: Leave Application,Apply / Approve Leaves,Yaproqlarni qo&#39;llash / tasdiqlash
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Uchun
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Uchun
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Qatorni faqatgina &#39;On oldingi satr miqdori&#39; yoki &#39;oldingi qatorni jami&#39;
 DocType: Sales Order Item,Delivery Warehouse,Etkazib beriladigan ombor
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Moliyaviy xarajatlar markazlarining daraxti.
 DocType: Serial No,Delivery Document No,Yetkazib berish hujjati №
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},{0} da kompaniyadagi aktivlarni yo&#39;qotish bo&#39;yicha &#39;Qimmatli /
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},{0} da kompaniyadagi aktivlarni yo&#39;qotish bo&#39;yicha &#39;Qimmatli /
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Buyurtma olimlaridan narsalarni oling
 DocType: Serial No,Creation Date,Yaratilish sanasi
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},{0} mahsuloti {1}
@@ -1988,11 +2025,12 @@
 DocType: Student,Student Mobile Number,Isoning shogirdi mobil raqami
 DocType: Item,Has Variants,Varyantlar mavjud
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Javobni yangilash
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},{0} {1} dan tanlangan elementlarni tanladingiz
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},{0} {1} dan tanlangan elementlarni tanladingiz
 DocType: Monthly Distribution,Name of the Monthly Distribution,Oylik tarqatish nomi
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Partiya identifikatori majburiydir
 DocType: Sales Person,Parent Sales Person,Ota-savdogar
-DocType: Purchase Invoice,Recurring Invoice,Ikkilamchi hisob-faktura
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Yuqoridan pastgacha
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Avval dasturni tanlang
 DocType: Patient Appointment,Patient Age,Bemor yoshi
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Loyihalarni boshqarish
 DocType: Supplier,Supplier of Goods or Services.,Mahsulot yoki xizmatlarni yetkazib beruvchi.
@@ -2000,8 +2038,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Agar bemorda konsultatsiya uchun to&#39;lovlar belgilanmagan bo&#39;lsa, foydalaniladigan debitorlik hisoblari."
 DocType: Vehicle Log,Fuel Price,Yoqilg&#39;i narxi
 DocType: Budget,Budget,Byudjet
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Ochish-ni tanlang
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Ruxsat etilgan aktiv elementi qimmatli qog&#39;oz emas.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Ochish-ni tanlang
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Ruxsat etilgan aktiv elementi qimmatli qog&#39;oz emas.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Byudjet {0} ga nisbatan tayinlanishi mumkin emas, chunki u daromad yoki xarajatlar hisobidir"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Saqlandi
 DocType: Student Admission,Application Form Route,Ariza shakli
@@ -2015,12 +2053,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,{0} mahsuloti ketma-ketlik uchun sozlanmagan
 DocType: Maintenance Visit,Maintenance Time,Xizmat muddati
 ,Amount to Deliver,Taqdim etiladigan summalar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Xuddi shu element bir necha marta kiritilgan. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Davrning boshlanishi sana atamasi bilan bog&#39;liq bo&#39;lgan Akademik yilning Yil boshlanishi sanasidan oldin bo&#39;lishi mumkin emas (Akademik yil (})). Iltimos, sanalarni tahrirlang va qaytadan urinib ko&#39;ring."
 DocType: Guardian,Guardian Interests,Guardian manfaatlari
 DocType: Naming Series,Current Value,Joriy qiymat
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"{0} sana uchun bir necha moliyaviy yillar mavjud. Iltimos, kompaniyani Moliyaviy yilga qo&#39;ying"
 DocType: School Settings,Instructor Records to be created by,O&#39;qituvchi tomonidan yaratiladigan yozuvlar
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} yaratildi
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} yaratildi
 DocType: Delivery Note Item,Against Sales Order,Savdo buyurtmasiga qarshi
 ,Serial No Status,Seriya No status
 DocType: Payment Entry Reference,Outstanding,Ajoyib
@@ -2030,10 +2069,10 @@
 						must be greater than or equal to {2}","Row {0}: davriylikni {1} o&#39;rnatish uchun, bu va hozirgi vaqt orasidagi farq {2} dan katta yoki teng bo&#39;lishi kerak"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Bu fond aktsiyalariga asoslangan. Tafsilotlar uchun {0} ga qarang
 DocType: Pricing Rule,Selling,Sotish
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},{0} {1} miqdori {2} ga nisbatan tushdi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},{0} {1} miqdori {2} ga nisbatan tushdi
 DocType: Employee,Salary Information,Ish haqi haqida ma&#39;lumot
 DocType: Sales Person,Name and Employee ID,Ismi va xizmatdoshi identifikatori
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Yetkazish sanasi o&#39;tilganlik sanasi sanasidan oldin bo&#39;la olmaydi
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Yetkazish sanasi o&#39;tilganlik sanasi sanasidan oldin bo&#39;la olmaydi
 DocType: Website Item Group,Website Item Group,Veb-sayt elementi guruhi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Vazifalar va soliq
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Iltimos, arizani kiriting"
@@ -2059,7 +2098,7 @@
 DocType: Issue,Resolution Details,Qaror ma&#39;lumotlari
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Ajratishlar
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Qabul shartlari
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Iltimos, yuqoridagi jadvalda Materiallar talablarini kiriting"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,"Iltimos, yuqoridagi jadvalda Materiallar talablarini kiriting"
 DocType: Item Attribute,Attribute Name,Xususiyat nomi
 DocType: BOM,Show In Website,Saytda ko&#39;rsatish
 DocType: Shopping Cart Settings,Show Quantity in Website,Saytdagi miqdori
@@ -2068,7 +2107,7 @@
 DocType: Item Reorder,Check in (group),Kirish (guruh)
 ,Qty to Order,Buyurtma miqdori
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Mas&#39;uliyat yoki o&#39;z mablag&#39;lari bo&#39;yicha hisob-varag&#39;i boshlig&#39;i, unda Qor / ziyon yo&#39;qolishi mumkin"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Barcha vazifalar uchun Gantt jadvali.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Barcha vazifalar uchun Gantt jadvali.
 DocType: Opportunity,Mins to First Response,Birinchi daqiqaga javob
 DocType: Pricing Rule,Margin Type,Marjin turi
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} soat
@@ -2089,35 +2128,35 @@
 DocType: Patient,Surgical History,Jarrohlik tarixi
 DocType: Employee,Resignation Letter Date,Ishdan bo&#39;shatish xati
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Raqobatchilar qoidalari miqdori bo&#39;yicha qo&#39;shimcha ravishda filtrlanadi.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},"Iltimos, xodimingizga {0}"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},"Iltimos, xodimingizga {0}"
 DocType: Task,Total Billing Amount (via Time Sheet),Jami to&#39;lov miqdori (vaqt jadvalidan)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Xaridor daromadini takrorlang
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) roli &quot;Expense Approver&quot;
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Juft
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Ishlab chiqarish uchun BOM va Qty ni tanlang
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Ishlab chiqarish uchun BOM va Qty ni tanlang
 DocType: Asset,Depreciation Schedule,Amortizatsiya jadvali
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Savdo hamkorlari manzili va aloqalar
 DocType: Bank Reconciliation Detail,Against Account,Hisobga qarshi
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Yarim kunlik sana Sana va Tarix orasida bo&#39;lishi kerak
 DocType: Maintenance Schedule Detail,Actual Date,Haqiqiy sana
 DocType: Item,Has Batch No,Partiya no
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Yillik to&#39;lov: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Yillik to&#39;lov: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Mol va xizmatlar solig&#39;i (GST Hindiston)
 DocType: Delivery Note,Excise Page Number,Aktsiz to&#39;lanadigan sahifa raqami
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Kompaniya, Sana va Sana uchun majburiydir"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Maslahatlashuvdan oling
 DocType: Asset,Purchase Date,Sotib olish sanasi
 DocType: Employee,Personal Details,Shaxsiy ma&#39;lumotlar
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},"Iltimos, {0} kompaniyasida &quot;Asset Amortizatsiya xarajatlari markazi&quot; ni belgilang"
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},"Iltimos, {0} kompaniyasida &quot;Asset Amortizatsiya xarajatlari markazi&quot; ni belgilang"
 ,Maintenance Schedules,Xizmat jadvali
 DocType: Task,Actual End Date (via Time Sheet),Haqiqiy tugash sanasi (vaqt jadvalidan orqali)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},{0} {1} miqdori {2} {3} ga qarshi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},{0} {1} miqdori {2} {3} ga qarshi
 ,Quotation Trends,Iqtiboslar tendentsiyalari
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},{0} element uchun maqola ustidagi ob&#39;ektlar guruhi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,Debet Hisobni hisobvaraq deb hisoblash kerak
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Debet Hisobni hisobvaraq deb hisoblash kerak
 DocType: Shipping Rule Condition,Shipping Amount,Yuk tashish miqdori
 DocType: Supplier Scorecard Period,Period Score,Davr hisoboti
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Mijozlarni qo&#39;shish
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Mijozlarni qo&#39;shish
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Kutilayotgan miqdor
 DocType: Lab Test Template,Special,Maxsus
 DocType: Purchase Invoice Item,Conversion Factor,Ishlab chiqarish omili
@@ -2125,13 +2164,14 @@
 ,Vehicle Expenses,Avtomobil xarajatlari
 DocType: Serial No,Invoice Details,Faktura tafsilotlari
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Foydali umrdan keyin kutilgan qiymat {0} dan katta yoki unga teng bo&#39;lishi kerak
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Boshlang
+DocType: Hub Category,Hub Category,Hub-toifa
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Avtomobil raqami
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,Takroriy hisob-fakturaning to&#39;xtatilish sanasi
 DocType: Employee Loan,Loan Amount,Kredit miqdori
 DocType: Program Enrollment,Self-Driving Vehicle,O&#39;z-o&#39;zidan avtomashina vositasi
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Yetkazib beruvchi Koreya kartasi
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Row {0}: Mahsulot {1} uchun topilmadi.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Row {0}: Mahsulot {1} uchun topilmadi.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Berilgan jami {0} barglari davr uchun tasdiqlangan {1} barglaridan kam bo&#39;lishi mumkin emas
 DocType: Journal Entry,Accounts Receivable,Kutilgan tushim
 ,Supplier-Wise Sales Analytics,Yetkazib beruvchi-aqlli Sotuvdagi Tahliliy
@@ -2142,7 +2182,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Ota-ona kursi (Bo&#39;sh qoldiring, agar bu Ota-ona kursining bir qismi bo&#39;lmasa)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Barcha xodimlar uchun mo&#39;ljallangan bo&#39;lsa bo&#39;sh qoldiring
 DocType: Landed Cost Voucher,Distribute Charges Based On,To&#39;lov asosida to&#39;lovlarni taqsimlash
-apps/erpnext/erpnext/hooks.py +131,Timesheets,Vaqt jadvallari
+apps/erpnext/erpnext/hooks.py +140,Timesheets,Vaqt jadvallari
 DocType: HR Settings,HR Settings,HRni sozlash
 DocType: Salary Slip,net pay info,aniq to&#39;lov ma&#39;lumoti
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Ushbu qiymat Default Sales Price List&#39;da yangilanadi.
@@ -2153,7 +2193,7 @@
 DocType: Patient,B Positive,B ijobiy
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: element 1 element bo&#39;lishi shart. Iltimos, bir necha qty uchun alohida qatordan foydalaning."
 DocType: Leave Block List Allow,Leave Block List Allow,Bloklashlar ro&#39;yxatini qoldiring
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr bo&#39;sh yoki bo&#39;sh joy bo&#39;la olmaydi
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr bo&#39;sh yoki bo&#39;sh joy bo&#39;la olmaydi
 DocType: Patient Medical Record,Patient Medical Record,Kasal Tibbiy Ro&#39;yxatdan
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Guruh bo&#39;lmaganlar guruhiga
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
@@ -2169,9 +2209,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,"{2} kalit sana uchun {0} dan {1} gacha bo&#39;lgan valyuta kursini topib bo&#39;lmadi. Iltimos, valyuta ayirboshlash yozuvini qo&#39;lda yarating"
 DocType: POS Profile,Price List,Narxlar ro&#39;yxati
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} endi standart Moliyaviy yil. O&#39;zgartirishni kuchga kiritish uchun brauzeringizni yangilang.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Xarajatlar bo&#39;yicha da&#39;vo
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Xarajatlar bo&#39;yicha da&#39;vo
 DocType: Issue,Support,Yordam
 ,BOM Search,BOM qidirish
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Ushbu omborda mavjud bo&#39;lgan kabinetga asosida &quot;In Stock&quot; yoki &quot;Stokta emas&quot; ni chop eting.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Yakunlovchi (ochilish + jami)
 DocType: Vehicle,Fuel Type,Yoqilg&#39;i turi
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Iltimos, kompaniyadagi valyutani ko&#39;rsating"
@@ -2182,16 +2223,16 @@
 DocType: Healthcare Settings,Remind Before,Avval eslatish
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},{0} qatorida UOM o&#39;tkazish faktori talab qilinadi
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","# {0} sath: Ariza Hujjat turi Sotuvdagi Buyurtma, Sotuvdagi Billing yoki Jurnal Yozuvi bo&#39;lishi kerak"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","# {0} sath: Ariza Hujjat turi Sotuvdagi Buyurtma, Sotuvdagi Billing yoki Jurnal Yozuvi bo&#39;lishi kerak"
 DocType: Salary Component,Deduction,O&#39;chirish
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Row {0}: Vaqt va vaqtdan boshlab majburiydir.
 DocType: Stock Reconciliation Item,Amount Difference,Miqdori farqi
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},{1} narxlar ro&#39;yxatida {0} uchun qo&#39;shilgan narx
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},{1} narxlar ro&#39;yxatida {0} uchun qo&#39;shilgan narx
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Iltimos, ushbu savdo vakili xodimining identifikatorini kiriting"
 DocType: Territory,Classification of Customers by region,Mintaqalar bo&#39;yicha mijozlarni tasniflash
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Ajratish miqdori nol bo&#39;lishi kerak
 DocType: Project,Gross Margin,Yalpi marj
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Avval ishlab chiqarish elementini kiriting
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Avval ishlab chiqarish elementini kiriting
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Bank hisob-kitob balansi hisoblangan
 DocType: Normal Test Template,Normal Test Template,Oddiy viktorina namunasi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,o&#39;chirilgan foydalanuvchi
@@ -2201,21 +2242,22 @@
 DocType: Salary Slip,Total Deduction,Jami cheklov
 ,Production Analytics,Ishlab chiqarish tahlillari
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Bu bemorga qilingan operatsiyalarga asoslanadi. Tafsilotlar uchun quyidagi jadvalga qarang
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Qiymati yangilandi
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Qiymati yangilandi
 DocType: Employee,Date of Birth,Tug&#39;ilgan sana
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,{0} elementi allaqachon qaytarilgan
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Moliyaviy yil ** moliyaviy yilni anglatadi. Barcha buxgalteriya yozuvlari va boshqa muhim bitimlar ** moliyaviy yilga nisbatan ** kuzatiladi.
 DocType: Opportunity,Customer / Lead Address,Xaridor / qo&#39;rg&#39;oshin manzili
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Yetkazib beruvchi Koreya kartasi
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Ogohlantirish: {0} biriktirmasidagi SSL sertifikati noto&#39;g&#39;ri.
-DocType: Student Admission,Eligibility,Muvofiqlik
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Baholash rejasining nomi
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Ogohlantirish: {0} biriktirmasidagi SSL sertifikati noto&#39;g&#39;ri.
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Rahbarlar sizning biznesingizga yordam beradi, sizning barcha kontaktlaringizni va boshqalaringizni yetakchilik qilishingiz mumkin"
 DocType: Production Order Operation,Actual Operation Time,Haqiqiy operatsiya vaqti
 DocType: Authorization Rule,Applicable To (User),Qo&#39;llaniladigan To (User)
 DocType: Purchase Taxes and Charges,Deduct,Deduct
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Ishning tavsifi
 DocType: Student Applicant,Applied,Amalga oshirildi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Qayta oching
 DocType: Sales Invoice Item,Qty as per Stock UOM,Qimmatli qog&#39;ozlar aktsiyadorlik jamiyati bo&#39;yicha
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 Ismi
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Maxsus belgilar &quot;-&quot;, &quot;#&quot;, &quot;.&quot; va &quot;/&quot; seriyasining nomlanishiga ruxsat berilmaydi"
@@ -2227,7 +2269,7 @@
 DocType: Request for Quotation,Manufacturing Manager,Ishlab chiqarish menejeri
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Har qanday {0} gacha {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Bo&#39;linishni tarqatish Paketlarga eslatma.
-apps/erpnext/erpnext/hooks.py +98,Shipments,Yuklar
+apps/erpnext/erpnext/hooks.py +107,Shipments,Yuklar
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Jami ajratilgan mablag&#39;lar (Kompaniya valyutasi)
 DocType: Purchase Order Item,To be delivered to customer,Xaridorga etkazib berish
 DocType: BOM,Scrap Material Cost,Hurda Materiallari narxi
@@ -2249,8 +2291,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Variant sozlamalari
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Kompaniyani tanlang ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Barcha bo&#39;limlarda ko&#39;rib chiqilsa bo&#39;sh qoldiring
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Ish turlari (doimiy, shartnoma, stajyor va hk)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} {1} mahsulot uchun majburiydir
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Ish turlari (doimiy, shartnoma, stajyor va hk)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} {1} mahsulot uchun majburiydir
 DocType: Process Payroll,Fortnightly,Ikki kun davomida
 DocType: Currency Exchange,From Currency,Valyutadan
 DocType: Vital Signs,Weight (In Kilogram),Og&#39;irligi (kilogrammda)
@@ -2274,7 +2316,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Jadvalni olish uchun &quot;Jadvalni yarat&quot; tugmasini bosing
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Quyidagi jadvallarni o&#39;chirishda xatolar yuz berdi:
 DocType: Bin,Ordered Quantity,Buyurtma miqdori
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","Masalan, &quot;Quruvchilar uchun asboblarni yaratish&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","Masalan, &quot;Quruvchilar uchun asboblarni yaratish&quot;"
 DocType: Grading Scale,Grading Scale Intervals,Baholash o&#39;lchov oralig&#39;i
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1} uchun: {2} uchun buxgalterlik yozuvi faqat valyutada amalga oshirilishi mumkin: {3}
 DocType: Production Order,In Process,Jarayonida
@@ -2297,11 +2339,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Soliq to&#39;lash bilan
 DocType: Expense Claim Detail,Expense Claim Detail,Xarajatlar bo&#39;yicha da&#39;vo tafsiloti
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Yetkazib beruvchiga TRIPLIKAT
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,"Iltimos, to&#39;g&#39;ri hisobni tanlang"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,"Iltimos, to&#39;g&#39;ri hisobni tanlang"
 DocType: Item,Weight UOM,Og&#39;irligi UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Ish haqi tuzilishi xodimi
 DocType: Patient,Blood Group,Qon guruhi
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Kutilmoqda
 DocType: Course,Course Name,Kurs nomi
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Muayyan xodimning ruxsatnomalarini tasdiqlashi mumkin bo&#39;lgan foydalanuvchilar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Ofis uskunalari
@@ -2320,7 +2361,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Narxlar ro&#39;yxati o&#39;rnatilmagan bo&#39;lsa, narxlar ko&#39;rsatilmaydi"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Iltimos, ushbu yuk tashish qoida uchun mamlakatni ko&#39;rsating yoki butun dunyo bo&#39;ylab yuklarni tekshiring"
 DocType: Stock Entry,Total Incoming Value,Jami kirish qiymati
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,Debet kerak
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Debet kerak
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Vaqt jadvallari sizning jamoangiz tomonidan amalga oshiriladigan tadbirlar uchun vaqtni, narxni va hisob-kitoblarni kuzatish imkonini beradi"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Sotib olish narxlari ro&#39;yxati
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Yetkazib beruvchilar kartalari o&#39;zgaruvchilari shabloni.
@@ -2330,7 +2371,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,To&#39;lovni taqsimlash
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Iltimos, Incharge Person nomini tanlang"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Texnologiya
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Jami to&#39;lanmagan: {0}
+DocType: Hub Settings,Unregister from Hub,Uyadan ro&#39;yxatdan o&#39;tish
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Jami to&#39;lanmagan: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM veb-sayt operatsiyasi
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Taklifnomani taqdim eting
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Materiallar talablari (MRP) va ishlab chiqarish buyurtmalarini yaratish.
@@ -2342,7 +2384,9 @@
 DocType: Physician Schedule Time Slot,To Time,Vaqtgacha
 DocType: Authorization Rule,Approving Role (above authorized value),Rolni tasdiqlash (vakolatli qiymatdan yuqoriroq)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Kredit Hisob uchun to&#39;lanadigan hisob bo&#39;lishi kerak
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} ota-ona yoki {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Iltimos, to&#39;ldirilgan talaba nomzodiga majburiy bo&#39;lgan talabgor qabul qiling"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} ota-ona yoki {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,"Narxlarni nashr qilish uchun iltimos, narxlar ro&#39;yxatini tanlang"
 DocType: Production Order Operation,Completed Qty,Tugallangan son
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",{0} uchun faqat bank hisoblari boshqa kredit yozuvlari bilan bog&#39;lanishi mumkin
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Narxlar ro&#39;yxati {0} o&#39;chirildi
@@ -2354,38 +2398,39 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Seriya raqamlari {1} uchun kerak. Siz {2} berilgansiz.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Joriy baholash darajasi
 DocType: Item,Customer Item Codes,Xaridor mahsulot kodlari
+DocType: Training Event,Advance,Advance
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,qayta-qayta qilish uchun.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Almashinish / Zarar
 DocType: Opportunity,Lost Reason,Yo&#39;qotilgan sabab
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Yangi manzil
 DocType: Quality Inspection,Sample Size,Namuna o&#39;lchami
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,"Iltimos, hujjatning hujjatini kiriting"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Barcha mahsulotlar allaqachon faktura qilingan
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Iltimos, tegishli &quot;Qoidadan boshlab&quot;"
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',"Iltimos, tegishli &quot;Qoidadan boshlab&quot;"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Qo&#39;shimcha xarajatlar markazlari Guruhlar bo&#39;yicha amalga oshirilishi mumkin, ammo guruhlar bo&#39;lmagan guruhlarga qarshi yozuvlarni kiritish mumkin"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Foydalanuvchilar va ruxsatnomalar
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Ishlab chiqarilgan buyurtmalar: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Ishlab chiqarilgan buyurtmalar: {0}
 DocType: Branch,Branch,Filial
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Bosib chiqarish va brendlash
 DocType: Company,Total Monthly Sales,Jami oylik sotish
 DocType: Bin,Actual Quantity,Haqiqiy miqdori
 DocType: Shipping Rule,example: Next Day Shipping,Masalan: Keyingi Kunlik Yuk tashish
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Seriya no {0} topilmadi
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Obuna {0} bo&#39;ldi
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Obuna {0} bo&#39;ldi
 DocType: Fee Schedule Program,Fee Schedule Program,Ish haqi dasturi
 DocType: Fee Schedule Program,Student Batch,Talabalar guruhi
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,"tabVital belgilardan`ni tanlang, bu erda patient = &#39;{0}&#39; sign_date desc limiti 1 bilan buyurtma bering"
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Talabani tayyorlang
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Eng kam sinf
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Siz loyihada hamkorlik qilish uchun taklif qilingan: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},{0} da shifokor mavjud emas
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Siz loyihada hamkorlik qilish uchun taklif qilingan: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},{0} da shifokor mavjud emas
 DocType: Leave Block List Date,Block Date,Bloklash sanasi
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},{0} doctype dagi maxsus maydonli obuna kimligini qo&#39;shing
 DocType: Purchase Receipt,Supplier Delivery Note,Yetkazib beruvchi etkazib berish Eslatma
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Endi murojaat qiling
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Endi murojaat qiling
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Haqiqiy miqdori {0} / kutayotgan Qty {1}
 DocType: Purchase Invoice,E-commerce GSTIN,E-tijorat GSTIN
 DocType: Sales Order,Not Delivered,Qabul qilinmadi
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Kutilgan sana Jurnal kunidan oldin bo&#39;lishi mumkin emas
 ,Bank Clearance Summary,Bankni ochish xulosasi
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Kundalik, haftalik va oylik elektron pochta digestlarini yarating va boshqaring."
 DocType: Appraisal Goal,Appraisal Goal,Baholash maqsadi
@@ -2393,12 +2438,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Binolar
 DocType: Fee Schedule,Fee Structure,To&#39;lov tarkibi
 DocType: Timesheet Detail,Costing Amount,Xarajatlar miqdori
-DocType: Student Admission,Application Fee,Ariza narxi
+DocType: Student Admission Program,Application Fee,Ariza narxi
 DocType: Process Payroll,Submit Salary Slip,Ish haqi slipini topshirish
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,{0} uchun Maxiumm chegirma {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,{0} uchun Maxiumm chegirma {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Katta hajmdagi import
 DocType: Sales Partner,Address & Contacts,Manzil va Kontaktlar
 DocType: SMS Log,Sender Name,Yuboruvchi nomi
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Mezon bo&#39;yicha saralash
 DocType: POS Profile,[Select],[Tanlash]
 DocType: Vital Signs,Blood Pressure (diastolic),Qon bosimi (diastolik)
 DocType: SMS Log,Sent To,Yuborilgan
@@ -2407,7 +2453,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Keyingi kontakt tarixi o&#39;tmishda bo&#39;lishi mumkin emas
 DocType: Company,For Reference Only.,Faqat ma&#39;lumot uchun.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},{1} shifokori {1} da mavjud emas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Partiya no. Ni tanlang
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Partiya no. Ni tanlang
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Noto&#39;g&#39;ri {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,Malumot
@@ -2423,15 +2469,15 @@
 DocType: Normal Test Items,Require Result Value,Natijada qiymat talab qiling
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case no 0 bo&#39;lishi mumkin emas
 DocType: Item,Show a slideshow at the top of the page,Sahifaning yuqori qismidagi slayd-shouni ko&#39;rsatish
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Do&#39;konlar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Do&#39;konlar
 DocType: Project Type,Projects Manager,Loyiha menejeri
 DocType: Serial No,Delivery Time,Yetkazish vaqti
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Qarish asosli
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Uchrashuv bekor qilindi
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Uchrashuv bekor qilindi
 DocType: Item,End of Life,Hayotning oxiri
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Sayohat
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Berilgan sana uchun ishlaydigan {0} uchun faol yoki standart ish haqi tuzilishi topilmadi
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Sayohat
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Berilgan sana uchun ishlaydigan {0} uchun faol yoki standart ish haqi tuzilishi topilmadi
 DocType: Leave Block List,Allow Users,Foydalanuvchilarga ruxsat berish
 DocType: Purchase Order,Customer Mobile No,Mijozlar Mobil raqami
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Ikkilamchi
@@ -2440,12 +2486,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Narxni yangilash
 DocType: Item Reorder,Item Reorder,Mahsulot qayta tartibga solish
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Ish haqi slipini ko&#39;rsatish
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Transfer materiallari
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Transfer materiallari
 DocType: Fees,Send Payment Request,To&#39;lov talabnomasini yuboring
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Operatsiyalarni, operatsion narxini belgilang va sizning operatsiyalaringizni bajarish uchun noyob Operatsiyani taqdim eting."
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ushbu hujjat {4} uchun {0} {1} tomonidan cheklangan. {2} ga qarshi yana bitta {3} qilyapsizmi?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Saqlaganingizdan keyin takroriy-ni tanlang
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,O&#39;zgarish miqdorini tanlang
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,O&#39;zgarish miqdorini tanlang
 DocType: Purchase Invoice,Price List Currency,Narxlari valyutasi
 DocType: Naming Series,User must always select,Foydalanuvchiga har doim tanlangan bo&#39;lishi kerak
 DocType: Stock Settings,Allow Negative Stock,Salbiy aksiyaga ruxsat berish
@@ -2464,7 +2510,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Xodim
 DocType: Sample Collection,Collected Time,To&#39;plangan vaqt
 DocType: Company,Sales Monthly History,Savdo oylik tarixi
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Batch-ni tanlang
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Batch-ni tanlang
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} to&#39;liq taqdim etiladi
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Vital belgilari
 DocType: Training Event,End Time,Tugash vaqti
@@ -2472,16 +2518,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,To&#39;lovni kamaytirish yoki yo&#39;qotish
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Sotuv yoki sotib olish uchun standart shartnoma shartlari.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Voucher tomonidan guruh
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Siz ushbu uchrashuvni bekor qilmoqchimisiz?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Savdo Quvuri
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},"Iltimos, ish haqi komponentida {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Majburiy On
 DocType: Rename Tool,File to Rename,Qayta nomlash uchun fayl
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Iltimos, Row {0} qatori uchun BOM-ni tanlang"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Iltimos, Row {0} qatori uchun BOM-ni tanlang"
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Hisob {0} Hisob holatida Kompaniya {1} bilan mos emas: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},{1} mahsulot uchun belgilangan BOM {0} mavjud emas
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,"Ushbu Sotuvdagi Buyurtmani bekor qilishdan avval, {0} Xizmat jadvali bekor qilinishi kerak"
+DocType: POS Profile,Applicable for Users,Foydalanuvchilar uchun amal qiladi
 DocType: Notification Control,Expense Claim Approved,Xarajat talabi ma&#39;qullangan
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Ish staji Bu davr uchun allaqachon yaratilgan {0} xodim
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Ish staji Bu davr uchun allaqachon yaratilgan {0} xodim
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Dori-darmon
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Xarid qilingan buyumlarning narxi
 DocType: Selling Settings,Sales Order Required,Savdo buyurtmasi kerak
@@ -2505,6 +2553,7 @@
 DocType: Offer Letter,Accepted,Qabul qilingan
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Tashkilot
 DocType: BOM Update Tool,BOM Update Tool,BOMni yangilash vositasi
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Partiya hisobi aniqlanmagan bo&#39;lsa, iltimos, kompaniyada sukut bo&#39;yicha partiya hisobini sozlang"
 DocType: SG Creation Tool Course,Student Group Name,Isoning shogirdi guruhi nomi
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Narxlarni yaratish
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Iltimos, ushbu kompaniya uchun barcha operatsiyalarni o&#39;chirib tashlamoqchimisiz. Sizning asosiy ma&#39;lumotlaringiz qoladi. Ushbu amalni bekor qilish mumkin emas."
@@ -2512,29 +2561,30 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Noto&#39;g&#39;ri reference {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Yuk tashish qoidalari yorlig&#39;i
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Foydalanuvchining forumi
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Xom ashyoni bo&#39;sh bo&#39;lishi mumkin emas.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Qimmatli qog&#39;ozlar yangilanib bo&#39;lmadi, hisob-faktura tomchi qoplama mahsulotini o&#39;z ichiga oladi."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Xom ashyoni bo&#39;sh bo&#39;lishi mumkin emas.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Qimmatli qog&#39;ozlar yangilanib bo&#39;lmadi, hisob-faktura tomchi qoplama mahsulotini o&#39;z ichiga oladi."
 DocType: Lab Test Sample,Lab Test Sample,Laborotoriya namunasi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Tez jurnalni kiritish
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Agar BOM biron-bir elementni eslatmasa, tarifni o&#39;zgartira olmaysiz"
+DocType: Restaurant,Invoice Series Prefix,Billing-uz prefiksi
 DocType: Employee,Previous Work Experience,Oldingi ish tajribasi
 DocType: Stock Entry,For Quantity,Miqdor uchun
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},{1} qatorida {0} uchun rejalashtirilgan sonni kiriting
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},{1} qatorida {0} uchun rejalashtirilgan sonni kiriting
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} yuborilmadi
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Ma&#39;lumotlar uchun talablar.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Har bir tayyor mahsulot uchun alohida ishlab chiqarish tartibi yaratiladi.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} qaytariladigan hujjatda salbiy bo&#39;lishi kerak
 ,Minutes to First Response for Issues,Muammolar uchun birinchi javob uchun daqiqalar
 DocType: Purchase Invoice,Terms and Conditions1,Shartlar va shartlar1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,Ushbu tizimni tashkil qilayotgan institut nomi.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,Ushbu tizimni tashkil qilayotgan institut nomi.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Bu sanaga qadar muzlatilgan yozuv donduruldu, hech kim quyida ko&#39;rsatilgan vazifalar tashqari kirishni o&#39;zgartirishi / o&#39;zgartirishi mumkin emas."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Xizmat rejasini tuzishdan oldin hujjatni saqlab qo&#39;ying
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Eng so&#39;nggi narx barcha BOMlarda yangilandi
 DocType: Fee Schedule,Successful,Muvaffaqiyatli
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Loyiha holati
 DocType: UOM,Check this to disallow fractions. (for Nos),Fraktsiyalarni taqiqlash uchun buni tanlang. (Nos uchun)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Quyidagi ishlab chiqarish buyurtmalari yaratildi:
-DocType: Student Admission,Naming Series (for Student Applicant),Nom turkumi (talabalar uchun)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Quyidagi ishlab chiqarish buyurtmalari yaratildi:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Nom turkumi (talabalar uchun)
 DocType: Delivery Note,Transporter Name,Transporter nomi
 DocType: Authorization Rule,Authorized Value,Tayinlangan qiymat
 DocType: BOM,Show Operations,Operatsiyalarni ko&#39;rsatish
@@ -2558,7 +2608,7 @@
 ,Employees working on a holiday,Bayramda ishlaydigan xodimlar
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Markni hozir aytib bering
 DocType: Project,% Complete Method,% Komple usul
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Dori
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Dori
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Xizmatni boshlash sanasi Serial No {0} uchun etkazib berish sanasidan oldin bo&#39;lishi mumkin emas.
 DocType: Production Order,Actual End Date,Haqiqiy tugash sanasi
 DocType: BOM,Operating Cost (Company Currency),Faoliyat xarajati (Kompaniya valyutasi)
@@ -2576,19 +2626,20 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Foydalanuvchini tasdiqlash qoida sifatida qo&#39;llanilishi mumkin bo&#39;lgan foydalanuvchi sifatida bir xil bo&#39;lishi mumkin emas
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Asosiy stavkasi (Har bir O&#39;quv markazi uchun)
 DocType: SMS Log,No of Requested SMS,Talab qilingan SMSlarning soni
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,"Pulsiz qoldirish, tasdiqlangan Taqdimnoma arizalari bilan mos emas"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,"Pulsiz qoldirish, tasdiqlangan Taqdimnoma arizalari bilan mos emas"
 DocType: Campaign,Campaign-.####,Kampaniya - ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Keyingi qadamlar
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,"Iltimos, ko&#39;rsatilgan narsalarni eng yaxshi narxlarda bering"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Billing-ni tanlang
 DocType: Selling Settings,Auto close Opportunity after 15 days,Avtomatik yopish 15 kundan keyin Imkoniyat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} belgisi tufayli buyurtma berish buyurtmalariga {0} uchun ruxsat berilmaydi.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} belgisi tufayli buyurtma berish buyurtmalariga {0} uchun ruxsat berilmaydi.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,End Year
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Qisqacha / qo&#39;rg&#39;oshin%
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Shartnoma tugash sanasi qo&#39;shilish sanasidan katta bo&#39;lishi kerak
 DocType: Vital Signs,Nutrition Values,Oziqlanish qiymati
 DocType: Lab Test Template,Is billable,To&#39;lanishi mumkin
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Doktor {0} uchun &quot;Shifokorlar rejasi&quot; va &quot;Tayinlangan vaqt&quot;
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Kompaniyalar mahsulotlarini komissiyaga sotadigan uchinchi tomon distributor / diler / komissiya agenti / affillangan / sotuvchisi.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} Xarid qilish buyrug&#39;iga qarshi {1}
 DocType: Patient,Patient Demographics,Kasal demografiyasi
@@ -2618,7 +2669,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","Barcha sotib olish operatsiyalarida qo&#39;llanilishi mumkin bo&#39;lgan standart soliq shabloni. Ushbu shablon soliq boshliqlarining ro&#39;yxatini va shuningdek, &quot;Yuk tashish&quot;, &quot;Sug&#39;urta&quot;, &quot;Xizmat&quot; va hokazolar kabi boshqa xarajatlarning boshlarini o&#39;z ichiga olishi mumkin. #### Eslatma Bu erda belgilagan soliq stavkasi barcha uchun standart soliq stavkasi bo&#39;ladi. *. Turli xil stavkalari bor ** Shartnomalar ** mavjud bo&#39;lsa, ular ** Ustun ** magistrining ** Item Tax ** jadvaliga qo&#39;shilishi kerak. #### Ustunlarning tavsifi 1. Hisoblash turi: - Bu ** bo&#39;lishi mumkin ** Total Total (ya&#39;ni asosiy miqdor summasi). - ** Oldingi qatorda Umumiy / Miqdori ** (jami soliq yoki yig&#39;im uchun). Agar siz bu optsiyani tanlasangiz, soliq soliq jadvalidagi avvalgi qatordagi foizga yoki jami miqdorda qo&#39;llaniladi. - ** Haqiqiy ** (yuqorida aytib o&#39;tilganidek). 2. Hisob boshlig&#39;i: ushbu soliq hisobga olinadigan Hisob naqsh kitobchisi. 3. Qiymat markazi: Agar soliq / majburiy to&#39;lov (daromad kabi) yoki xarajat bo&#39;lsa, u Xarajat markaziga zahiraga olinishi kerak. 4. Belgilar: Soliq tavsifi (fakturalar / tirnoqlarda chop etiladi). 5. Rate: Soliq stavkasi. 6. Miqdor: Soliq summasi. 7. Jami: bu nuqtaga jami jami. 8. Qatorni kiriting: Agar &quot;Older Row Total&quot; ga asoslangan holda ushbu hisob-kitob uchun asos sifatida olinadigan satr raqamini tanlash mumkin (asl qiymati oldingi satr). 9. Quyidagilar uchun soliq yoki majburiy to&#39;lovni ko&#39;rib chiqing: Ushbu bo&#39;limda soliq / yig&#39;im faqat baholash uchun (jami qismi emas) yoki faqat jami (mahsulotga qiymat qo&#39;shmaydi) yoki har ikkala uchun belgilanishi mumkin. 10. Qo&#39;shish yoki cheklash: Siz soliqni qo&#39;shish yoki kamaytirishni xohlaysizmi."
 DocType: Homepage,Homepage,Bosh sahifa
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Shifokorlar tanlang ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',yangilanish tabConsultation set up invoice = &#39;{0}&#39; qaerda name = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,Raqamlar soni
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Yaratilgan yozuvlar - {0}
 DocType: Asset Category Account,Asset Category Account,Aktiv turkumidagi hisob
@@ -2629,7 +2679,7 @@
 DocType: Asset,Manual,Qo&#39;llanma
 DocType: Salary Component Account,Salary Component Account,Ish haqi komponentining hisob raqami
 DocType: Global Defaults,Hide Currency Symbol,Valyuta belgisini yashirish
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","masalan, bank, naqd pul, kredit kartasi"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","masalan, bank, naqd pul, kredit kartasi"
 DocType: Lead Source,Source Name,Manba nomi
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Katta yoshdagi normal qon bosimi taxminan 120 mmHg sistolik va 80 mmHg diastolik, qisqartirilgan &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Kredit eslatma
@@ -2648,16 +2698,16 @@
 DocType: Patient,Occupation,Kasbingiz
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: Boshlanish sanasi tugash sanasidan oldin bo&#39;lishi kerak
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Hammasi bo&#39;lib (Miqdor)
-DocType: Sales Invoice,This Document,Ushbu hujjat
 DocType: Installation Note Item,Installed Qty,O&#39;rnatilgan Miqdor
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,"Buning sababi, ba&#39;zi bir bekor E-pochta manzili"
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Siz qo&#39;shildingiz
 DocType: Purchase Taxes and Charges,Parenttype,Parent turi
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Ta&#39;lim natijasi
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Ta&#39;lim natijasi
 DocType: Purchase Invoice,Is Paid,Pul to&#39;lanadi
 DocType: Salary Structure,Total Earning,Jami daromad
 DocType: Purchase Receipt,Time at which materials were received,Materiallar olingan vaqt
 DocType: Stock Ledger Entry,Outgoing Rate,Chiqish darajasi
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Tashkilot filialining ustasi.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Tashkilot filialining ustasi.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,yoki
 DocType: Sales Order,Billing Status,Billing holati
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Muammo haqida xabar bering
@@ -2672,7 +2722,8 @@
 DocType: Notification Control,Sales Order Message,Savdo buyurtma xabarlari
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Kompaniya, valyuta, joriy moliyaviy yil, va hokazo kabi standart qiymatlarni o&#39;rnating."
 DocType: Payment Entry,Payment Type,To&#39;lov turi
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,{0} uchun mahsulotni tanlang. Ushbu talabni bajaradigan yagona guruh topilmadi
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,{0} uchun mahsulotni tanlang. Ushbu talabni bajaradigan yagona guruh topilmadi
+DocType: Hub Category,Parent Category,Ota-toifa
 DocType: Process Payroll,Select Employees,Xodimlarni tanlang
 DocType: Opportunity,Potential Sales Deal,Potentsial savdo bitimi
 DocType: Complaint,Complaints,Shikoyat
@@ -2708,7 +2759,7 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),Yetkazib berish paketini aniqlash (chop etish uchun)
 DocType: Bin,Reserved Quantity,Rezervlangan miqdori
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,"Iltimos, to&#39;g&#39;ri elektron pochta manzilini kiriting"
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Savatdagi elementni tanlang
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Savatdagi elementni tanlang
 DocType: Landed Cost Voucher,Purchase Receipt Items,Qabulnoma buyurtmalarini sotib olish
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formalarni xususiylashtirish
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,Arrear
@@ -2718,15 +2769,15 @@
 DocType: Payment Request,Amount in customer's currency,Mijozning valyutadagi miqdori
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Yetkazib berish
 DocType: Stock Reconciliation Item,Current Qty,Joriy Miqdor
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Ta&#39;minlovchilarni qo&#39;shish
+DocType: Restaurant Menu,Restaurant Menu,Restoran menyusi
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Oldindan
 DocType: Appraisal Goal,Key Responsibility Area,Asosiy mas&#39;uliyat maydoni
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Talaba to&#39;dalari talabalar uchun tashrif buyurish, baholash va to&#39;lovlarni kuzatishda sizga yordam beradi"
 DocType: Payment Entry,Total Allocated Amount,Jami ajratilgan mablag&#39;lar
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Doimiy ro&#39;yxatga olish uchun odatiy inventarizatsiyadan foydalaning
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Doimiy ro&#39;yxatga olish uchun odatiy inventarizatsiyadan foydalaning
 DocType: Item Reorder,Material Request Type,Materiallar talabi turi
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural Journal {0} dan {1} ga qadar ish haqi uchun kirish
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","LocalStorage to&#39;liq, saqlanmadi"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage to&#39;liq, saqlanmadi"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Conversion Factor majburiydir
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Xona hajmi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ref
@@ -2765,16 +2816,18 @@
 DocType: Project,Task Completion,Vazifa yakuni
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Stoktaki emas
 DocType: Appraisal,HR User,HR foydalanuvchisi
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Soliqlar va yig&#39;imlar kamaytirildi
-apps/erpnext/erpnext/hooks.py +129,Issues,Muammolar
+apps/erpnext/erpnext/hooks.py +138,Issues,Muammolar
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Vaziyat {0} dan biri bo&#39;lishi kerak
 DocType: Sales Invoice,Debit To,Debet To
+DocType: Restaurant Menu Item,Restaurant Menu Item,Restoran menyusi
 DocType: Delivery Note,Required only for sample item.,Faqat namuna band uchun talab qilinadi.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Jurnal so&#39;ng haqiqiy miqdori
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},{0} va {1} o&#39;rtasida hech qanday maosh yo&#39;q
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},{0} va {1} o&#39;rtasida hech qanday maosh yo&#39;q
 ,Pending SO Items For Purchase Request,Buyurtma so&#39;rovini bajarish uchun buyurtmalarni bekor qilish
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Talabalarni qabul qilish
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} o&#39;chirib qo&#39;yilgan
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Talabalarni qabul qilish
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} o&#39;chirib qo&#39;yilgan
 DocType: Supplier,Billing Currency,To&#39;lov valyutasi
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Juda katta
@@ -2797,6 +2850,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Iltimos, kerakli tashriflardan hech qanday foydalanmang"
 DocType: Stock Settings,Default Valuation Method,Standart baholash usuli
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,Narxlar
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Yangilanish davom etmoqda. Biroz vaqt talab etiladi.
 DocType: Vehicle Log,Fuel Qty,Yoqilg&#39;i miqdori
 DocType: Production Order Operation,Planned Start Time,Rejalashtirilgan boshlash vaqti
 DocType: Course,Assessment,Baholash
@@ -2812,7 +2866,7 @@
 DocType: Price List,Price List Master,Narxlar ro&#39;yxati ustasi
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Barcha Sotuvdagi Jurnallarni bir nechta ** Sotuvdagi Shaxslarga ** joylashtirishingiz mumkin, shunday qilib maqsadlarni belgilashingiz va monitoring qilishingiz mumkin."
 ,S.O. No.,Yo&#39;q.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},"Iltimos, {0} qo&#39;rg&#39;oshidan mijozni yarating"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},"Iltimos, {0} qo&#39;rg&#39;oshidan mijozni yarating"
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Kasalni tanlang
 DocType: Price List,Applicable for Countries,Davlatlar uchun amal qiladi
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Parametrning nomi
@@ -2842,27 +2896,29 @@
 DocType: Purchase Invoice,Supplier Invoice Details,Yetkazib beruvchi hisob-faktura ma&#39;lumotlari
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Xarajatlar / farq statistikasi ({0}) &quot;Qor yoki ziyon&quot; hisobiga bo&#39;lishi kerak
 DocType: Project,Copied From,Ko&#39;chirildi
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Ism xato: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Kamchilik
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Ism xato: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,Kamchilik
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} {2} {3} bilan bog&#39;lanmagan
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Xodimga ({0} davomi allaqachon belgilangan
 DocType: Packing Slip,If more than one package of the same type (for print),Agar bir xil turdagi bir nechta paketi (chop etish uchun)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Restoran sozlamalarida standart mijozni tanlang
 ,Salary Register,Ish haqi registrati
 DocType: Warehouse,Parent Warehouse,Ota-onalar
 DocType: C-Form Invoice Detail,Net Total,Net Jami
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},{0} va Project {1} uchun standart BOM topilmadi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},{0} va Project {1} uchun standart BOM topilmadi
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Turli xil kredit turlarini aniqlang
 DocType: Bin,FCFS Rate,FCFS bahosi
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Ustun miqdori
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Soat (daqiqa)
 DocType: Project Task,Working,Ishlash
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Qimmatli qog&#39;ozlardagi navbat (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Moliyaviy yil
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Moliyaviy yil
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} Kompaniya {1} ga tegishli emas
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,{0} uchun kriteriya funksiyasini o&#39;chirib bo&#39;lmadi. Formulaning haqiqiyligiga ishonch hosil qiling.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Narh-navo
 DocType: Healthcare Settings,Out Patient Settings,Kasalni sozlash
 DocType: Account,Round Off,Dumaloq yopiq
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Miqdor ijobiy bo&#39;lishi kerak
 ,Requested Qty,Kerakli son
 DocType: Tax Rule,Use for Shopping Cart,Savatga savatni uchun foydalaning
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},{1} atributi uchun {0} {2} {Item uchun joriy element identifikatorlari qiymatlari ro&#39;yxatida mavjud emas
@@ -2871,7 +2927,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",Narxlar Sizning tanlovingiz bo&#39;yicha mahsulot miqdori yoki miqdori bo&#39;yicha mutanosib ravishda taqsimlanadi
 DocType: Maintenance Visit,Purposes,Maqsadlar
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Eng kamida bitta element qaytarib berilgan hujjatda salbiy miqdor bilan kiritilishi kerak
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Kurslar qo&#39;shish
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",{0} ish stantsiyasida ishlaydigan har qanday ish soatlaridan ko&#39;proq {0} operatsiya operatsiyani bir nechta operatsiyalarga ajratish
 ,Requested,Talab qilingan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Izohlar yo&#39;q
@@ -2883,6 +2938,8 @@
 DocType: Employee Loan,Repaid/Closed,Qaytarilgan / yopiq
 DocType: Item,Total Projected Qty,Jami loyiha miqdori
 DocType: Monthly Distribution,Distribution Name,Tarqatish nomi
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Yetkazib beruvchi&gt; Yetkazib beruvchi turi
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","{1} {2} uchun buxgalter yozuvlarini kiritish uchun talab qilinadigan {0} elementi uchun baholanish darajasi topilmadi. Agar element {1} da nol qiymatni baholash darajasi elementi sifatida ishlayotgan bo&#39;lsa, iltimos, {1} Mavzu jadvalidagi buni eslatib o&#39;ting. Aks holda, mahsulot ro&#39;yxatiga kiritilgan qimmatli qog&#39;ozlar bilan bog&#39;liq bitim tuzing yoki qiymat qaydini qaydlang va keyin ushbu yozuvni taqdim etishni / bekor qilib ko&#39;ring."
 DocType: Course,Course Code,Kurs kodi
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},{0} mahsulot uchun sifat nazorati zarur
 DocType: POS Settings,Use POS in Offline Mode,Oflayn rejimida QO&#39;yi ishlatish
@@ -2893,14 +2950,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Mintaqa daraxtini boshqarish.
 DocType: Journal Entry Account,Sales Invoice,Savdo billing
 DocType: Journal Entry Account,Party Balance,Partiya balansi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,"Iltimos, &quot;Ilovani yoqish&quot; ni tanlang"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,"Iltimos, &quot;Ilovani yoqish&quot; ni tanlang"
 DocType: Company,Default Receivable Account,Oladigan schyot hisob
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Yuqorida ko&#39;rsatilgan tanlangan mezonlarga to&#39;lanadigan umumiy ish haqi uchun bankdagi yozuvni yarating
 DocType: Physician,Physician Schedule,Shifokor dasturi
 DocType: Purchase Invoice,Deemed Export,Qabul qilingan eksport
 DocType: Stock Entry,Material Transfer for Manufacture,Ishlab chiqarish uchun material etkazib berish
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Chegirma foizlar yoki Narxlar ro&#39;yxatiga yoki barcha Narxlar ro&#39;yxatiga nisbatan qo&#39;llanilishi mumkin.
-DocType: Purchase Invoice,Half-yearly,Yarim yillik
+DocType: Subscription,Half-yearly,Yarim yillik
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Qimmatli qog&#39;ozlar uchun hisob yozuvi
 DocType: Lab Test,LabTest Approver,LabTest Approval
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Siz allaqachon baholash mezonlari uchun baholagansiz {}.
@@ -2929,13 +2986,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Qo&#39;shimcha kichik
 DocType: Company,Standard Template,Standart shablon
 DocType: Training Event,Theory,Nazariya
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Ogohlantirish: Kerakli ma&#39;lumot Minimum Buyurtma miqdori ostida
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Ogohlantirish: Kerakli ma&#39;lumot Minimum Buyurtma miqdori ostida
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,{0} hisobi muzlatilgan
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Yuridik shaxs / Tashkilotga qarashli alohida hisob-kitob rejasi bo&#39;lgan filial.
 DocType: Payment Request,Mute Email,E-pochtani o&#39;chirish
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Oziq-ovqat, ichgani va tamaki"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Faqat to&#39;ldirilmagan {0} ga to&#39;lovni amalga oshirishi mumkin
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Komissiya stavkasi 100 dan ortiq bo&#39;lishi mumkin emas
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Faqat to&#39;ldirilmagan {0} ga to&#39;lovni amalga oshirishi mumkin
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Komissiya stavkasi 100 dan ortiq bo&#39;lishi mumkin emas
 DocType: Stock Entry,Subcontract,Subpudrat
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Avval {0} kiriting
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Javoblar yo&#39;q
@@ -2953,10 +3010,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Rang
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Baholashni baholash mezonlari
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Buyurtma buyurtmalaridan saqlanish
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,E&#39;tiborli
 DocType: Patient Appointment,Scheduled,Rejalashtirilgan
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Taklif so&#39;rovi.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Inson resurslari&gt; HR parametrlarini Xodimlar uchun nomlash tizimini sozlang
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",&quot;Stoktaki Mahsulot&quot; - &quot;Yo&#39;q&quot; va &quot;Sotuvdagi Maqsad&quot; - &quot;Ha&quot; deb nomlangan Mavzu-ni tanlang va boshqa Mahsulot Bundlei yo&#39;q
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Xaridorni tanlang
 DocType: Student Log,Academic,Ilmiy
 DocType: Patient,Personal and Social History,Shaxsiy va ijtimoiy tarix
 DocType: Fee Schedule,Fee Breakup for each student,Har bir talaba uchun to&#39;lovni taqsimlash
@@ -2966,7 +3024,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Baholash darajasi
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Narxlar ro&#39;yxati Valyutasi tanlanmagan
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Narxlar ro&#39;yxati Valyutasi tanlanmagan
 apps/erpnext/erpnext/config/healthcare.py +46,Results,Natijalar
 ,Student Monthly Attendance Sheet,Talabalar oylik davomiyligi varaqasi
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},{0} xizmatdoshi allaqachon {1} uchun {2} va {3}
@@ -2981,7 +3039,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Savdo hamkorlarini boshqarish.
 DocType: Quality Inspection,Inspection Type,Tekshirish turi
 DocType: Fee Validity,Visited yet,Hoziroq tashrif buyurdi
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Mavjud bitimlarga ega bo&#39;lgan omborlar guruhga o&#39;tkazilmaydi.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Mavjud bitimlarga ega bo&#39;lgan omborlar guruhga o&#39;tkazilmaydi.
 DocType: Assessment Result Tool,Result HTML,Natijada HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Muddati tugaydi
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Talabalarni qo&#39;shish
@@ -3008,7 +3066,7 @@
 DocType: Healthcare Settings,Result Printed,Chop etilgan natija
 DocType: Asset Category Account,Depreciation Expense Account,Amortizatsiya ketadi hisob
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Sinov muddati
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},{0} ko&#39;rinishi
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},{0} ko&#39;rinishi
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Jurnal paytida faqat bargli tugunlarga ruxsat beriladi
 DocType: Expense Claim,Expense Approver,Xarajatlarni taqsimlash
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Row {0}: mijozga qarshi avans kredit bo&#39;lishi kerak
@@ -3019,7 +3077,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Datetime-ga
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Kurs jadvali o&#39;chirildi:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Sms yetkazib berish holatini saqlab qolish uchun qaydlar
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Sotuvdagi maqsadni tanlang
 DocType: Accounts Settings,Make Payment via Journal Entry,Jurnalga kirish orqali to&#39;lovni amalga oshiring
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,Chop etilgan
 DocType: Item,Inspection Required before Delivery,Etkazib berishdan oldin tekshirish kerak
@@ -3027,7 +3084,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Kutilayotgan amallar
 DocType: Patient Appointment,Reminded,Eslatildi
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Tashkilotingiz
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Tashkilotingiz
 DocType: Fee Component,Fees Category,Narxlar toifasi
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,"Iltimos, bo&#39;sh vaqtni kiriting."
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
@@ -3054,8 +3111,9 @@
 ,Employee Birthday,Xodimlarning tug&#39;ilgan kuni
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Talabalar to&#39;plamini tomosha qilish vositasi
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,Cheklangan chiziqli
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Rejalashtirilgan Upto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}",{0} elementiga nisbatan mavjud bitimlar mavjud bo&#39;lgani uchun {1} qiymatini o&#39;zgartira olmaysiz
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}",{0} elementiga nisbatan mavjud bitimlar mavjud bo&#39;lgani uchun {1} qiymatini o&#39;zgartira olmaysiz
 DocType: UOM,Must be Whole Number,Barcha raqamlar bo&#39;lishi kerak
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Yangi barglar ajratilgan (kunlar)
 DocType: Purchase Invoice,Invoice Copy,Faktura nusxasi
@@ -3065,7 +3123,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Billing raqami
 DocType: Shopping Cart Settings,Orders,Buyurtma
 DocType: Employee Leave Approver,Leave Approver,Approvatni qoldiring
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,"Iltimos, partiyani tanlang"
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,"Iltimos, partiyani tanlang"
 DocType: Assessment Group,Assessment Group Name,Baholash guruhining nomi
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Ishlab chiqarish uchun mo&#39;ljallangan material
 DocType: Expense Claim,"A user with ""Expense Approver"" role",&quot;Expense Approver&quot; roli bilan foydalanuvchi
@@ -3080,7 +3138,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Davrni yopish
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Bo&#39;limni tanlang ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Amalga oshirilgan operatsiyalar bilan Narx Markaziga guruhga o&#39;tish mumkin emas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Miqdor {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Miqdor {0} {1} {2} {3}
 DocType: Account,Depreciation,Amortizatsiya
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Yetkazib beruvchilar (lar)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Xodimlarga qatnashish vositasi
@@ -3091,10 +3149,12 @@
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,To&#39;lov yozuvlari {0} un-bog&#39;lanmagan
 DocType: GL Entry,Voucher No,Voucher No.
 ,Lead Owner Efficiency,Qurilish egasining samaradorligi
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Eng mashhurlari
 DocType: Leave Allocation,Leave Allocation,Ajratishni qoldiring
 DocType: Payment Request,Recipient Message And Payment Details,Qabul qiluvchi Xabar va to&#39;lov ma&#39;lumoti
 DocType: Training Event,Trainer Email,Trainer Email
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Materiallar talablari {0} yaratildi
+DocType: Restaurant Reservation,No of People,Odamlar yo&#39;q
 DocType: Production Planning Tool,Include sub-contracted raw materials,Sub-pudratli xom ashyolarni o&#39;z ichiga oladi
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Atamalar yoki shartnoma namunalari.
 DocType: Purchase Invoice,Address and Contact,Manzil va aloqa
@@ -3103,10 +3163,11 @@
 DocType: Supplier,Last Day of the Next Month,Keyingi oyning oxirgi kuni
 DocType: Support Settings,Auto close Issue after 7 days,7 kundan so&#39;ng avtomatik yopilish
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","{0} dan oldin qoldirib bo&#39;linmaydi, chunki kelajakda bo&#39;sh joy ajratish yozuvida {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),"Eslatma: Muddati o&#39;tgan / mos yozuvlar sanasi, mijozlar kredit kunlarini {0} kun (lar)"
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),"Eslatma: Muddati o&#39;tgan / mos yozuvlar sanasi, mijozlar kredit kunlarini {0} kun (lar)"
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Talabalar uchun nomzod
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL FOR RECIPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,Yig&#39;ilgan Amortisman hisobi
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Ushbu e-pochta autentifikatsiyalangan
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
 DocType: Program Enrollment,Boarding Student,Yatılı shogirdi
 DocType: Asset,Expected Value After Useful Life,Foydali hayotdan keyin kutilgan qiymat
@@ -3114,7 +3175,7 @@
 DocType: Activity Cost,Billing Rate,Billing darajasi
 ,Qty to Deliver,Miqdorni etkazish
 ,Stock Analytics,Stock Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Operatsiyalarni bo&#39;sh qoldirib bo&#39;lmaydi
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Operatsiyalarni bo&#39;sh qoldirib bo&#39;lmaydi
 DocType: Maintenance Visit Purpose,Against Document Detail No,Hujjat bo&#39;yicha batafsil ma&#39;lumot yo&#39;q
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Partiya turi majburiydir
 DocType: Quality Inspection,Outgoing,Chiqish
@@ -3135,7 +3196,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Faoliyatga asoslangan guruh uchun talabalarni qo&#39;lda tanlang
 DocType: Journal Entry,User Remark,Foydalanuvchi eslatmasi
 DocType: Lead,Market Segment,Bozor segmenti
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},To&#39;langan pul miqdori jami salbiy ortiqcha {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},To&#39;langan pul miqdori jami salbiy ortiqcha {0}
 DocType: Supplier Scorecard Period,Variables,Argumentlar
 DocType: Employee Internal Work History,Employee Internal Work History,Xodimning ichki ish tarixi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Yakunlovchi (doktor)
@@ -3164,20 +3225,21 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Yangilanishlarni oling
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Hisob {2} Kompaniyaga tegishli emas {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Materialda so&#39;rov {0} bekor qilindi yoki to&#39;xtatildi
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Boshqarishni qoldiring
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Boshqarishni qoldiring
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Hisobga ko&#39;ra guruh
 DocType: Sales Order,Fully Delivered,To&#39;liq topshirildi
 DocType: Lead,Lower Income,Kam daromad
+DocType: Restaurant Order Entry,Current Order,Joriy Buyurtma
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Resurs va maqsadli omborlar {0} qatori uchun bir xil bo&#39;lishi mumkin emas
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Farq Hisobi Hisob-kitobi bo&#39;lishi kerak, chunki bu fondning kelishuvi ochilish yozuvi"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Ish haqi miqdori Kredit summasidan katta bo&#39;lishi mumkin emas {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Dasturlarga o&#39;ting
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},{0} band uchun xaridni tartib raqami talab qilinadi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Ishlab chiqarish tartibi yaratilmadi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Ishlab chiqarish tartibi yaratilmadi
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Sana&quot; kunidan keyin &quot;To Date&quot;
 DocType: Asset,Fully Depreciated,To&#39;liq Amortizatsiyalangan
 ,Stock Projected Qty,Qimmatli qog&#39;ozlar miqdori
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Xaridor {0} loyihaga {1} tegishli emas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Xaridor {0} loyihaga {1} tegishli emas
 DocType: Employee Attendance Tool,Marked Attendance HTML,Belgilangan tomoshabin HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Qabullar sizning mijozlaringizga yuborilgan takliflar, takliflar"
 DocType: Sales Order,Customer's Purchase Order,Xaridor buyurtma buyurtmasi
@@ -3188,8 +3250,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Iltimos, ko&#39;rsatilgan Amortizatsiya miqdorini belgilang"
 DocType: Supplier Scorecard Period,Calculations,Hisoblashlar
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Qiymati yoki kattaligi
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Mahsulotlar buyurtmalarini quyidagi sabablarga ko&#39;ra olish mumkin:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Mahsulotlar buyurtmalarini quyidagi sabablarga ko&#39;ra olish mumkin:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Minut
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Iltimos, {0} uchun nomlash seriyasini Sozlamalar&gt; Sozlamalar&gt; Naming Series orqali sozlang"
 DocType: Purchase Invoice,Purchase Taxes and Charges,Soliqlar va yig&#39;imlar xarid qilish
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Ta&#39;minlovchilarga boring
 ,Qty to Receive,Qabul qiladigan Miqdor
@@ -3201,7 +3264,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Hisobga olish uchun Hisob balansi yozuvi bo&#39;lishi kerak
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Barcha yetkazib beruvchi turlari
 DocType: Global Defaults,Disable In Words,So&#39;zlarda o&#39;chirib qo&#39;yish
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Mahsulot kodi majburiydir, chunki ob&#39;ekt avtomatik ravishda raqamlangan emas"
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,"Mahsulot kodi majburiydir, chunki ob&#39;ekt avtomatik ravishda raqamlangan emas"
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Xizmat jadvali
 DocType: Sales Order,%  Delivered,% Taslim bo&#39;ldi
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,"Iltimos, to&#39;lov talabnomasini yuborish uchun Talabaga Email ID-ni belgilang"
@@ -3222,23 +3285,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Balansni muomalaga kiritish
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Muvofiqlik
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Qoldik
 DocType: Appraisal,Appraisal,Baholash
 DocType: Purchase Invoice,GST Details,GST tafsilotlari
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},{0} yetkazib beruvchiga yuborilgan elektron xat
+DocType: Item,Default Sales Unit of Measure,Standart savdo birligi o&#39;lchovi
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Sana takrorlanadi
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Vakolatli vakil
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Ilovani bekor qilish {0} dan biri bo&#39;lishi kerak
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Narxlarni yarating
-DocType: Hub Settings,Seller Email,Sotuvchi Elektron pochta
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Jami xarid qiymati (Xarid qilish byudjeti orqali)
 DocType: Training Event,Start Time,Boshlanish vaqti
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Miqdorni tanlang
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Miqdorni tanlang
 DocType: Customs Tariff Number,Customs Tariff Number,Bojxona tariflari raqami
 DocType: Patient Appointment,Patient Appointment,Bemorni tayinlash
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Ishtirokni tasdiqlash qoida sifatida qo&#39;llanilishi mumkin bo&#39;lgan rolga o&#39;xshamaydi
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Ushbu e-pochta xujjatidan obunani bekor qilish
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Ushbu e-pochta xujjatidan obunani bekor qilish
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Ta&#39;minlovchilarni qabul qiling
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{1} elementi uchun {0} topilmadi
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Kurslarga o&#39;ting
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Xabar yuborildi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,"Bola düğümleri bo&#39;lgan hisob, kitoblar sifatida ayarlanamaz"
@@ -3251,11 +3317,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Ishlab chiqarish uchun mo&#39;ljallangan material
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Hisob {0} mavjud emas
 DocType: Project,Project Type,Loyiha turi
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Ushbu Vazifa uchun Bola vazifasi mavjud. Ushbu vazifani o&#39;chira olmaysiz.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Nishon miqdor yoki maqsad miqdori majburiydir.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Turli faoliyat turlarining narxi
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Boshqa natijalar yo&#39;q
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Turli faoliyat turlarining narxi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Tadbirlarni {0} ga sozlash, chunki quyida ko&#39;rsatilgan Sotish Sotuviga qo&#39;yilgan xodimlar uchun foydalanuvchi identifikatori yo&#39;q {1}"
 DocType: Timesheet,Billing Details,To&#39;lov ma&#39;lumoti
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Resurslar va maqsadli omborlar boshqacha bo&#39;lishi kerak
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Resurslar va maqsadli omborlar boshqacha bo&#39;lishi kerak
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},{0} dan katta aktsiyalarini yangilash uchun ruxsat berilmadi
 DocType: Purchase Invoice Item,PR Detail,PR batafsil
 DocType: Sales Order,Fully Billed,To&#39;liq to&#39;ldirilgan
@@ -3281,7 +3349,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Telegraf ko&#39;chirmasi
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Barchasini tekshiring
 DocType: Vehicle Log,Invoice Ref,Faktura
-DocType: Purchase Order,Recurring Order,Takroriy Buyurtma
 DocType: Company,Default Income Account,Standart daromad hisoblari
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Mijozlar guruhi / xaridorlar
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Yopiq moliyaviy yillar Qor / ziyon (kredit)
@@ -3295,9 +3362,9 @@
 DocType: Patient,A Negative,Salbiy
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Ko&#39;rsatish uchun boshqa hech narsa yo&#39;q.
 DocType: Lead,From Customer,Xaridordan
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Qo&#39;ng&#39;iroqlar
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Qo&#39;ng&#39;iroqlar
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Mahsulot
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,Kassalar
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,Kassalar
 DocType: Project,Total Costing Amount (via Time Logs),Jami xarajat summasi (vaqt jadvallari orqali)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Ish haqi jadvalini tuzing
 DocType: Purchase Order Item Supplied,Stock UOM,Qimmatli qog&#39;ozlar UOM
@@ -3321,7 +3388,7 @@
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Barg va dam olish
 DocType: School Settings,Current Academic Term,Joriy Akademik atamalar
 DocType: Sales Order,Not Billed,To&#39;lov olinmaydi
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Har ikkisi ham bir xil kompaniyaga tegishli bo&#39;lishi kerak
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Har ikkisi ham bir xil kompaniyaga tegishli bo&#39;lishi kerak
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Hech qanday kontakt qo&#39;shilmagan.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Belgilangan xarajatlarning dastlabki miqdori
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Yetkazuvchilar tomonidan ko&#39;tarilgan qonun loyihalari.
@@ -3330,7 +3397,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Chegirma miqdori
 DocType: Purchase Invoice,Return Against Purchase Invoice,Xarajatlarni sotib olishdan voz kechish
 DocType: Item,Warranty Period (in days),Kafolat muddati (kunlar)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',Yangilanish `tabPatient Appointment` to&#39;ldirildi sales_invoice = &#39;{0}&#39; Bu yerda = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Guardian1 bilan aloqalar
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Operatsiyalar bo&#39;yicha aniq pul
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,4-band
@@ -3339,8 +3405,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Kundalik hisob yozuvi
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Talabalar guruhi
 DocType: Shopping Cart Settings,Quotation Series,Quotation Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Biror narsa ({0}) bir xil nom bilan mavjud bo&#39;lsa, iltimos, element guruh nomini o&#39;zgartiring yoki ob&#39;ektni qayta nomlang"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,"Iltimos, mijozni tanlang"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Biror narsa ({0}) bir xil nom bilan mavjud bo&#39;lsa, iltimos, element guruh nomini o&#39;zgartiring yoki ob&#39;ektni qayta nomlang"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,"Iltimos, mijozni tanlang"
 DocType: C-Form,I,Men
 DocType: Company,Asset Depreciation Cost Center,Aktivlar Amortizatsiya Narxlari Markazi
 DocType: Sales Order Item,Sales Order Date,Savdo Buyurtma sanasi
@@ -3349,6 +3415,7 @@
 DocType: Assessment Plan,Assessment Plan,Baholash rejasi
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Xaridor {0} yaratildi.
 DocType: Stock Settings,Limit Percent,Limit ulushi
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Hozirda biron-bir omborda stok yo&#39;q
 ,Payment Period Based On Invoice Date,Hisob-faktura sanasi asosida to&#39;lov davri
 DocType: Sample Collection,No. of print,Chop etish soni
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},{0} uchun yo&#39;qolgan valyuta kurslari
@@ -3404,13 +3471,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Brüt to&#39;lash - Jami cheklov - Kreditni qaytarish
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,Joriy BOM va yangi BOM bir xil bo&#39;lishi mumkin emas
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Ish haqi miqdori
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Ish haqi miqdori
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Pensiya tarixi sanasi qo&#39;shilish sanasidan katta bo&#39;lishi kerak
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Kursni rejalashtirish vaqtida xatolar bor edi:
 DocType: Sales Invoice,Against Income Account,Daromad hisobiga qarshi
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% taslim etildi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,{0} elementi: Buyurtma berilgan qty {1} minimal buyurtma miqdordan kam {2} dan kam bo&#39;lmasligi kerak.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,{0} elementi: Buyurtma berilgan qty {1} minimal buyurtma miqdordan kam {2} dan kam bo&#39;lmasligi kerak.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Oylik tarqatish foizi
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Iltimos boshqa foydalanuvchi sifatida kiring.
 DocType: Territory,Territory Targets,Mintaqaviy maqsadlar
 DocType: Delivery Note,Transporter Info,Transporter ma&#39;lumoti
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},{1} kompaniyasida standart {0} ni belgilang
@@ -3418,13 +3486,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Xuddi shunday yetkazib beruvchi bir necha marta kiritilgan
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Brüt Qor / Zarari
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Buyurtma buyurtmasi berilgan
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Kompaniyaning nomi Kompaniya bo&#39;lishi mumkin emas
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Kompaniyaning nomi Kompaniya bo&#39;lishi mumkin emas
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Chop etish uchun andozalar.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Bosma andozalar namunalari, masalan Proforma Billing."
 DocType: Program Enrollment,Walking,Yurish
 DocType: Student Guardian,Student Guardian,Talaba himoyachisi
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Baholashning turi to&#39;lovlari inklyuziv sifatida belgilanishi mumkin emas
 DocType: POS Profile,Update Stock,Stokni yangilang
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,obunada
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Ma&#39;lumotlar uchun turli UOM noto&#39;g&#39;ri (Total) Net Og&#39;irligi qiymatiga olib keladi. Har bir elementning aniq vazniga bir xil UOM ichida ekanligiga ishonch hosil qiling.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM darajasi
 DocType: Asset,Journal Entry for Scrap,Hurda uchun jurnalni kiritish
@@ -3472,15 +3541,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Tizim foydalanuvchisi (login) identifikatori. Agar belgilansa, u barcha HR formatlari uchun sukut bo&#39;ladi."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1} dan
 DocType: Task,depends_on,ga bog&#39;liq
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Barcha materiallar materiallarida eng so&#39;nggi narxni yangilash uchun navbatda turdi. Bir necha daqiqa o&#39;tishi mumkin.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Barcha materiallar materiallarida eng so&#39;nggi narxni yangilash uchun navbatda turdi. Bir necha daqiqa o&#39;tishi mumkin.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Yangi hisob nomi. Eslatma: Iltimos, mijozlar va etkazib beruvchilar uchun hisoblar yarating"
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Country wise wise manzili Shablonlar
 DocType: Sales Order Item,Supplier delivers to Customer,Yetkazib beruvchi xaridorga yetkazib beradi
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Shakl / element / {0}) aksiyalar mavjud emas
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Vaqt / ariza sanasi {0}
+,Sales Payment Summary,Sotuvni to&#39;lash xulosasi
+DocType: Restaurant,Restaurant,Restoran
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Vaqt / ariza sanasi {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Ma&#39;lumotlarni import qilish va eksport qilish
 DocType: Patient,Account Details,Hisob ma&#39;lumotlari
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Hech kim topilmadi
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Hech kim topilmadi
 DocType: Medical Department,Medical Department,Tibbiy bo&#39;lim
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Yetkazib beruvchi Scorecard reyting mezonlari
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Faktura yuborish sanasi
@@ -3491,7 +3562,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Tomonni tanlashdan oldin sanasi sanasini tanlang
 DocType: Program Enrollment,School House,Maktab uyi
 DocType: Serial No,Out of AMC,AMCdan tashqarida
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Iltimos takliflarni tanlang
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Iltimos takliflarni tanlang
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Qayd qilingan amortizatsiya miqdori jami Amortizatsiya miqdoridan ko&#39;p bo&#39;lishi mumkin emas
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Xizmatga tashrif buyurish
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,Sotish bo&#39;yicha Magistr Direktori {0} roli mavjud foydalanuvchi bilan bog&#39;laning
@@ -3499,7 +3570,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Kompaniya (mijoz yoki yetkazib beruvchi emas) ustasi.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Bu talaba ushbu talabaga asoslanadi
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Kirish yo&#39;q
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Boshqa narsalarni qo&#39;shish yoki to&#39;liq shaklni oching
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Boshqa narsalarni qo&#39;shish yoki to&#39;liq shaklni oching
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Ushbu Sotuvdagi Buyurtmani bekor qilishdan oldin etkazib berish xatnomalarini {0} bekor qilish kerak
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Foydalanuvchilarga o&#39;ting
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,To&#39;langan pul miqdori + Write Off To&#39;lov miqdori Grand Totaldan katta bo&#39;lishi mumkin emas
@@ -3519,37 +3590,40 @@
 DocType: Fee Schedule,Fee Schedule,Ish haqi jadvali
 DocType: Hub Settings,Publish Availability,Mavjudligi e&#39;lon qiling
 DocType: Company,Create Chart Of Accounts Based On,Hisoblar jadvalini tuzish
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Guruhni guruhga o&#39;tkazib bo&#39;lmadi. Bola vazifalari mavjud.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Tug&#39;ilgan sanasi bugungi kunda katta bo&#39;lmasligi mumkin.
 ,Stock Ageing,Qarshi qarish
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Isoning shogirdi {0} talaba arizachiga nisbatan {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Dumaloq tuzatish (Kompaniya valyutasi)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Vaqt jadvallari
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Vaqt jadvallari
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} &#39;{1}&#39; o&#39;chirib qo&#39;yilgan
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ochiq qilib belgilang
 DocType: Cheque Print Template,Scanned Cheque,Skaner qilingan tekshiruv
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Jurnallarni yuborish haqida Kontaktlar ga avtomatik elektron pochta xabarlarini yuboring.
 DocType: Timesheet,Total Billable Amount,Jami hisoblash summasi
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,3-modda
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Buyurtma yozuvi
 DocType: Purchase Order,Customer Contact Email,Mijozlar bilan aloqa elektron pochta
 DocType: Warranty Claim,Item and Warranty Details,Mahsulot va Kafolat haqida ma&#39;lumot
 DocType: Sales Team,Contribution (%),Miqdori (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Eslatma: &quot;Naqd yoki Bank hisobi&quot; ko&#39;rsatilmagani uchun to&#39;lov kiritish yaratilmaydi
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,{0} loyihasi allaqachon mavjud
 DocType: Medical Department,Nursing User,Hemşirelik Foydalanuvchi bilan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Mas&#39;uliyat
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Ushbu tirnoqning amal qilish muddati tugadi.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Ushbu tirnoqning amal qilish muddati tugadi.
 DocType: Expense Claim Account,Expense Claim Account,Xarajat shikoyati qaydnomasi
 DocType: Accounts Settings,Allow Stale Exchange Rates,Sovuq valyuta kurslariga ruxsat berish
 DocType: Sales Person,Sales Person Name,Sotuvchining ismi
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Iltimos, stolda atleast 1-fakturani kiriting"
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Foydalanuvchilarni qo&#39;shish
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Foydalanuvchilarni qo&#39;shish
 DocType: POS Item Group,Item Group,Mavzu guruhi
 DocType: Item,Safety Stock,Xavfsizlik kabinetga
 DocType: Healthcare Settings,Healthcare Settings,Sog&#39;liqni saqlash sozlamalari
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Bir vazifa uchun% progress 100 dan ortiq bo&#39;lishi mumkin emas.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Bir vazifa uchun% progress 100 dan ortiq bo&#39;lishi mumkin emas.
 DocType: Stock Reconciliation Item,Before reconciliation,Yig&#39;ilishdan oldin
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0} uchun
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Soliqlar va yig&#39;imlar qo&#39;shildi (Kompaniya valyutasi)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Mahsulot Soliq Royi {0} turidagi Soliq yoki daromad yoki xarajatlar yoki Ulanish uchun hisobga ega bo&#39;lishi kerak
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Mahsulot Soliq Royi {0} turidagi Soliq yoki daromad yoki xarajatlar yoki Ulanish uchun hisobga ega bo&#39;lishi kerak
 DocType: Sales Order,Partly Billed,Qisman taqsimlangan
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,{0} elementi Ruxsat etilgan aktiv obyekti bo&#39;lishi kerak
 DocType: Item,Default BOM,Standart BOM
@@ -3565,6 +3639,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,Argumentlar
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Etkazib berish eslatmasidan
 DocType: Student,Student Email Address,Isoning shogirdi elektron pochta manzili
+DocType: Item,Hub Warehouse,Hub ombori
 DocType: Physician Schedule Time Slot,From Time,Vaqtdan
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Omborda mavjud; sotuvda mavjud:
 DocType: Notification Control,Custom Message,Maxsus xabar
@@ -3572,9 +3647,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,To&#39;lovni kiritish uchun naqd pul yoki bank hisobi majburiydir
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Isoning shogirdi manzili
 DocType: Purchase Invoice,Price List Exchange Rate,Narxlar ro&#39;yxati almashuv kursi
+DocType: POS Profile,POS Profile Name,Qalin profil nomi
 DocType: Purchase Invoice Item,Rate,Baholash
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Stajyer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Manzil nomi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Manzil nomi
 DocType: Stock Entry,From BOM,BOM&#39;dan
 DocType: Assessment Code,Assessment Code,Baholash kodi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Asosiy
@@ -3588,11 +3664,12 @@
 DocType: Salary Slip,Salary Structure,Ish haqi tuzilishi
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aviakompaniya
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Muammo materiallari
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Muammo materiallari
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Ikki nusxadagi yaratish paytida xatolik yuz berdi
 DocType: Material Request Item,For Warehouse,QXI uchun
 DocType: Employee,Offer Date,Taklif sanasi
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Qo&#39;shtirnoq
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Siz oflayn rejasiz. Tarmoqqa ega bo&#39;lguncha qayta yuklay olmaysiz.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Siz oflayn rejasiz. Tarmoqqa ega bo&#39;lguncha qayta yuklay olmaysiz.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Hech qanday talabalar guruhi yaratilmagan.
 DocType: Purchase Invoice Item,Serial No,Serial №
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Oylik qaytarib beriladigan pul miqdori Kredit miqdoridan kattaroq bo&#39;lishi mumkin emas
@@ -3602,17 +3679,18 @@
 DocType: Salary Slip,Total Working Hours,Umumiy ish vaqti
 DocType: Subscription,Next Schedule Date,Keyingi Jadval tarixi
 DocType: Stock Entry,Including items for sub assemblies,Sub assemblies uchun elementlarni o&#39;z ichiga oladi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Qiymatni kiritish ijobiy bo&#39;lishi kerak
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Barcha hududlar
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Qiymatni kiritish ijobiy bo&#39;lishi kerak
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Barcha hududlar
 DocType: Purchase Invoice,Items,Mahsulotlar
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Talabalar allaqachon ro&#39;yxatdan o&#39;tgan.
 DocType: Fiscal Year,Year Name,Yil nomi
 DocType: Process Payroll,Process Payroll,Jarayonni to&#39;lash
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Bu oyda ish kunlaridan ko&#39;ra ko&#39;proq bayramlar bor.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Bu oyda ish kunlaridan ko&#39;ra ko&#39;proq bayramlar bor.
 DocType: Product Bundle Item,Product Bundle Item,Mahsulot paketi elementi
 DocType: Sales Partner,Sales Partner Name,Savdo hamkorining nomi
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Takliflar uchun so&#39;rov
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Takliflar uchun so&#39;rov
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimal Billing miqdori
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Gematologiya
 DocType: Normal Test Items,Normal Test Items,Oddiy test buyumlari
 DocType: Student Language,Student Language,Isoning shogirdi tili
 apps/erpnext/erpnext/config/selling.py +23,Customers,Iste&#39;molchilar
@@ -3623,10 +3701,11 @@
 DocType: Issue,Opening Time,Vaqtni ochish
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Kerakli kunlardan boshlab
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Qimmatli qog&#39;ozlar va BUyuMLAR birjalari
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',&#39;{0}&#39; variantining standart o&#39;lchov birligi &#39;{1}&#39; shablonidagi kabi bo&#39;lishi kerak
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',&#39;{0}&#39; variantining standart o&#39;lchov birligi &#39;{1}&#39; shablonidagi kabi bo&#39;lishi kerak
 DocType: Shipping Rule,Calculate Based On,Oddiy qiymatni hisoblash
 DocType: Delivery Note Item,From Warehouse,QXIdan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Ishlab chiqarish uchun materiallar varaqasi yo&#39;q
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Ishlab chiqarish uchun materiallar varaqasi yo&#39;q
+DocType: Restaurant,Default Customer,Standart mijoz
 DocType: Assessment Plan,Supervisor Name,Boshqaruvchi nomi
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Xuddi shu kuni Uchrashuvni tashkil etganligini tasdiqlamang
 DocType: Program Enrollment Course,Program Enrollment Course,Dasturlarni ro&#39;yxatga olish kursi
@@ -3653,7 +3732,7 @@
 DocType: Payment Entry,Internal Transfer,Ichki pul o&#39;tkazish
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Ushbu hisob uchun bolaning hisob raqami mavjud. Ushbu hisobni o&#39;chirib bo&#39;lmaydi.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Nishon miqdor yoki maqsad miqdori majburiydir
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},{0} element uchun odatiy BOM mavjud emas
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},{0} element uchun odatiy BOM mavjud emas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,"Marhamat, birinchi marta o&#39;tilganlik sanasi tanlang"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Ochilish sanasi tugash sanasidan oldin bo&#39;lishi kerak
 DocType: Leave Control Panel,Carry Forward,Oldinga boring
@@ -3688,6 +3767,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Jami mavjud
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,Buxgalteriya hisobi
 DocType: Drug Prescription,Hour,Soat
+DocType: Restaurant Order Entry,Last Sales Invoice,Oxirgi Sotuvdagi Billing
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"Yangi seriyali yo&#39;q, QXK bo&#39;lishi mumkin emas. QXI kabinetga kirish yoki Xarid qilish Qabulnomasi bilan o&#39;rnatilishi kerak"
 DocType: Lead,Lead Type,Qo&#39;rg&#39;oshin turi
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Siz bloklangan sana bo&#39;yicha barglarni tasdiqlash uchun vakolatga ega emassiz
@@ -3722,30 +3802,30 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Foydalanuvchilarni yaratish
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,Gram
 DocType: Supplier Scorecard,Per Month,Oyiga
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Ishlab chiqarish miqdori 0dan katta bo&#39;lishi kerak.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Ishlab chiqarish miqdori 0dan katta bo&#39;lishi kerak.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Xizmatga qo&#39;ng&#39;iroq qilish uchun hisobotga tashrif buyuring.
 DocType: Stock Entry,Update Rate and Availability,Yangilash darajasi va mavjudligi
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Buyurtma berilgan miqdorga nisbatan ko&#39;proq miqdorda qabul qilishingiz yoki topshirishingiz mumkin bo&#39;lgan foiz. Misol uchun: Agar siz 100 ta buyurtma bergan bo&#39;lsangiz. va sizning Rag&#39;batingiz 10% bo&#39;lsa, sizda 110 ta bo&#39;linmaga ega bo&#39;lishingiz mumkin."
 DocType: POS Customer Group,Customer Group,Mijozlar guruhi
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Yangi partiya identifikatori (majburiy emas)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Yangi partiya identifikatori (majburiy emas)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Xarajat hisobi {0} elementi uchun majburiydir.
 DocType: BOM,Website Description,Veb-sayt ta&#39;rifi
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Özkaynakta aniq o&#39;zgarishlar
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Yangilar
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Avval xaridlar fakturasini {0} bekor qiling
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-pochta manzili noyob bo&#39;lishi kerak, {0} uchun allaqachon mavjud"
 DocType: Serial No,AMC Expiry Date,AMC tugash sanasi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,Qabul qilish
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,Qabul qilish
 ,Sales Register,Savdo registri
 DocType: Daily Work Summary Settings Company,Send Emails At,Elektron pochta xabarlarini yuborish
 DocType: Quotation,Quotation Lost Reason,Iqtibos yo&#39;qolgan sabab
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Domeningizni tanlang
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',* tabPatient-dan tanlang * qaerda name = &#39;{0}&#39;
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Tahrir qilish uchun hech narsa yo&#39;q.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Formasi ko&#39;rinishi
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Bu oy uchun xulosa va kutilayotgan tadbirlar
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Formasi ko&#39;rinishi
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Bu oy uchun xulosa va kutilayotgan tadbirlar
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.",Foydalanuvchilarni o&#39;zingizning tashkilotingizdan tashqari tashkilotga qo&#39;shing.
 DocType: Customer Group,Customer Group Name,Mijozlar guruhi nomi
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Hozir mijozlar yo&#39;q!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Hozir mijozlar yo&#39;q!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Naqd pul oqimlari bayonoti
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kredit summasi {0} maksimum kredit summasidan oshib ketmasligi kerak.
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Litsenziya
@@ -3755,29 +3835,31 @@
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Vaqt oraliqlari qo&#39;shildi
 DocType: Item,Attributes,Xususiyatlar
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Shabloni yoqish
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Iltimos, {0} uchun nomlash seriyasini Sozlamalar&gt; Sozlamalar&gt; Naming Series orqali sozlang"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,"Iltimos, hisob raqamini kiriting"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Oxirgi Buyurtma sanasi
 DocType: Patient,B Negative,B salbiy
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Hisob {0} kompaniya {1} ga tegishli emas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,{0} qatoridagi ketma-ket raqamlar etkazib berish eslatmasiga mos kelmaydi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,{0} qatoridagi ketma-ket raqamlar etkazib berish eslatmasiga mos kelmaydi
 DocType: Student,Guardian Details,Guardian tafsilotlari
 DocType: C-Form,C-Form,C-shakl
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Bir nechta xodimlar uchun Markni tomosha qiling
 DocType: Vehicle,Chassis No,Yo&#39;lak No
 DocType: Payment Request,Initiated,Boshlandi
 DocType: Production Order,Planned Start Date,Rejalashtirilgan boshlanish sanasi
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,"Iltimos, BOM-ni tanlang"
 DocType: Serial No,Creation Document Type,Hujjatning tuzilishi
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Tugash sanasi boshlanish sanasidan katta bo&#39;lishi kerak
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Tugash sanasi boshlanish sanasidan katta bo&#39;lishi kerak
 DocType: Leave Type,Is Encash,Encashmi?
 DocType: Leave Allocation,New Leaves Allocated,Yangi barglar ajratildi
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Loyiha bo&#39;yicha ma&#39;lumot quyish uchun mavjud emas
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Tugatish
 DocType: Project,Expected End Date,Kutilayotgan tugash sanasi
 DocType: Budget Account,Budget Amount,Byudjet summasi
 DocType: Appraisal Template,Appraisal Template Title,Baholash shablonlari nomi
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Employee {1} uchun Sana {0} dan xodimning ishtirok etishidan oldin bo&#39;la olmaydi Sana {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Savdo
 DocType: Patient,Alcohol Current Use,Spirtli ichimliklarni ishlatish
+DocType: Student Admission Program,Student Admission Program,Talabalarni qabul qilish dasturi
 DocType: Payment Entry,Account Paid To,Hisoblangan pul
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,{0} Ota-ona element Stock kabinetga bo&#39;lishi shart emas
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Barcha mahsulotlar yoki xizmatlar.
@@ -3786,30 +3868,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} {1} {2} {3} ga qarshi hisob qaydnomasi {4}. {5} dan oshib ketadi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Hisob turi &quot;Ruxsat etilgan obyekt&quot; turi bo&#39;lishi kerak
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Miqdori
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Sotuvga jo&#39;natish miqdorini hisoblash qoidalari
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,va unchcked o&#39;chirilgan
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Seriya majburiy
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Moliyaviy xizmatlar
 DocType: Student Sibling,Student ID,Isoning shogirdi kimligi
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Vaqt qaydlari uchun faoliyat turlari
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Yetkazib beruvchi elektron pochta
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Vaqt qaydlari uchun faoliyat turlari
 DocType: Tax Rule,Sales,Savdo
 DocType: Stock Entry Detail,Basic Amount,Asosiy miqdori
 DocType: Training Event,Exam,Test
 DocType: Complaint,Complaint,Shikoyat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},{0} uchun kabinetga ombori kerak
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},{0} uchun kabinetga ombori kerak
 DocType: Leave Allocation,Unused leaves,Foydalanilmagan barglar
 DocType: Patient,Alcohol Past Use,Spirtli ichimliklarni o&#39;tmishda ishlatish
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Billing davlati
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),"Fetch portlash qilingan BOM (sub-assemblies, shu jumladan)"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),"Fetch portlash qilingan BOM (sub-assemblies, shu jumladan)"
 DocType: Authorization Rule,Applicable To (Employee),Qo&#39;llanilishi mumkin (xodim)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,To&#39;lov sanasi majburiydir
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,To&#39;lov sanasi majburiydir
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,{0} xususiyati uchun ortish 0 bo&#39;lishi mumkin emas
 DocType: Journal Entry,Pay To / Recd From,Qabul qiling / Qabul qiling
 DocType: Naming Series,Setup Series,O&#39;rnatish seriyasi
 DocType: Payment Reconciliation,To Invoice Date,Faktura tarixiga
 DocType: Supplier,Contact HTML,HTML bilan bog&#39;laning
 ,Inactive Customers,Faol bo&#39;lmagan mijozlar
+DocType: Student Admission Program,Maximum Age,Maksimal yosh
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Xarajatlarni xarid qiling
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Qanday qilib narx belgilash qoidalari qo&#39;llaniladi?
@@ -3828,6 +3912,7 @@
 DocType: GL Entry,Remarks,Izohlar
 DocType: Payment Entry,Account Paid From,Hisobdan to&#39;langan pul
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Xom-ashyo mahsulot kodi
+DocType: Task,Parent Task,Ota-ona vazifasi
 DocType: Journal Entry,Write Off Based On,Yopiq asosida yozish
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Qo&#39;rg&#39;oshin bo&#39;ling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Chop etish va ish yuritish
@@ -3836,18 +3921,18 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","{0} va {1} oralig&#39;idagi davrda allaqachon ishlov berilgan ish haqi, ushbu muddat oralig&#39;ida ariza berish muddati qoldirilmasligi kerak."
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Seriya raqami uchun o&#39;rnatish yozuvi
 DocType: Guardian Interest,Guardian Interest,Guardian qiziqishi
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,POS hisob-fakturalarida standart qiymatlarni sozlash
 apps/erpnext/erpnext/config/hr.py +177,Training,Trening
 DocType: Timesheet,Employee Detail,Xodimlar haqida batafsil
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Email identifikatori
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,Keyingi kunning kuni va oyning takroriy kuni teng bo&#39;lishi kerak
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Keyingi kunning kuni va oyning takroriy kuni teng bo&#39;lishi kerak
 DocType: Lab Prescription,Test Code,Sinov kodi
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Veb-sayt bosh sahifasining sozlamalari
 DocType: Offer Letter,Awaiting Response,Javobni kutish
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Yuqorida
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Jami miqdori {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},{0} {1} atributi noto&#39;g&#39;ri
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Jami miqdori {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},{0} {1} atributi noto&#39;g&#39;ri
 DocType: Supplier,Mention if non-standard payable account,Nodavlat to&#39;lanadigan hisob qaydnomasini qayd etish
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Xuddi shu element bir necha marta kiritilgan. {list}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',"Iltimos, barcha baholash guruhlaridan boshqa baholash guruhini tanlang."
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Row {0}: xarajat markazi {1}
 DocType: Training Event Employee,Optional,Majburiy emas
@@ -3870,19 +3955,20 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: narxlari markazi {2}
 DocType: Vehicle,Policy No,Siyosat No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Mahsulot paketidagi narsalarni oling
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property",{0} elementiga qarshi aktsiyalar mavjud bo&#39;lgani uchun sizda varianti xususiyatini yoqib bo&#39;lmaydi
 DocType: Asset,Straight Line,To&#39;g&#39;ri chiziq
 DocType: Project User,Project User,Loyiha foydalanuvchisi
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Split
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Split
 DocType: GL Entry,Is Advance,Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Sana va davomiylikdan Sana bo&#39;yicha ishtirok etish majburiydir
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,&quot;Yes&quot; yoki &quot;No&quot; deb nomlangan &quot;Subcontracted&quot; so&#39;zini kiriting
+DocType: Item,Default Purchase Unit of Measure,O&#39;lchamdagi standart sotib olish birligi
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Oxirgi aloqa davri
 DocType: Sales Team,Contact No.,Aloqa raqami.
 DocType: Bank Reconciliation,Payment Entries,To&#39;lov yozuvlari
 DocType: Production Order,Scrap Warehouse,Hurda ombori
 DocType: Production Order,Check if material transfer entry is not required,Moddiy uzatishni talab qilmasligini tekshiring
 DocType: Program Enrollment Tool,Get Students From,Shogirdlarni o&#39;zingizdan oling
-DocType: Hub Settings,Seller Country,Sotuvchi Davlat
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Saytdagi ma&#39;lumotlar nashr qiling
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Talabalaringizni guruhlarga qo&#39;shing
 DocType: Authorization Rule,Authorization Rule,Avtorizatsiya qoidasi
@@ -3892,7 +3978,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Savdo soliqlar va to&#39;lovlar shabloni
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Jami (kredit)
 DocType: Repayment Schedule,Payment Date,To&#39;lov sanasi
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Yangi Batch son
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Yangi Batch son
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Tashqi va o&#39;smirlar
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,Og&#39;irlikdagi ball vazifasini hal qila olmadi. Formulaning haqiqiyligiga ishonch hosil qiling.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Buyurtma soni
@@ -3910,6 +3996,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","# {0} qatori: Asset {1} yuborib bo&#39;lolmaydi, allaqachon {2}"
 DocType: Tax Rule,Billing Country,Billing davlati
 DocType: Purchase Order Item,Expected Delivery Date,Kutilayotgan etkazib berish sanasi
+DocType: Restaurant Order Entry,Restaurant Order Entry,Restoran Buyurtma yozuvi
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet va kredit {0} # {1} uchun teng emas. Farqi {2} dir.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,O&#39;yin xarajatlari
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Materiallar talabini bajarish
@@ -3922,9 +4009,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Mavjud amal bilan hisob o&#39;chirilmaydi
 DocType: Vehicle,Last Carbon Check,Oxirgi Karbon nazorati
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Huquqiy xarajatlar
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,"Iltimos, qatordagi miqdorni tanlang"
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,"Iltimos, qatordagi miqdorni tanlang"
 DocType: Purchase Invoice,Posting Time,Vaqtni yuborish vaqti
 DocType: Timesheet,% Amount Billed,% To&#39;lov miqdori
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.","&quot;Vaqtni belgilash vaqti&quot; doktor {0} uchun o&#39;rnatilmagan, uni shifokor ustasiga qo&#39;shing."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefon xarajatlari
 DocType: Sales Partner,Logo,Asosiy
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Foydalanuvchini saqlashdan oldin bir qatorni tanlashga majburlashni xohlasangiz, buni tekshiring. Buni tekshirsangiz, hech qanday ko&#39;rsatuv bo&#39;lmaydi."
@@ -3935,6 +4023,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Yangi xaridorlar daromadi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Sayohat xarajatlari
 DocType: Maintenance Visit,Breakdown,Buzilmoq
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},{0} doctype dagi maxsus maydon obunani qo&#39;shish
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Hisob: {0} valyutaga: {1} tanlanmaydi
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",Tez-tez yangilanadigan narxlarni / narx ro&#39;yxatining nisbati / xom ashyoning so&#39;nggi sotib olish nisbati asosida Scheduler orqali BOM narxini avtomatik ravishda yangilang.
 DocType: Bank Reconciliation Detail,Cheque Date,Tekshirish sanasi
@@ -3959,7 +4048,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Jami to&#39;lov miqdori (vaqtli jurnallar orqali)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Yetkazib beruvchi identifikatori
 DocType: Payment Request,Payment Gateway Details,Payment Gateway Details
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Miqdori 0 dan katta bo&#39;lishi kerak
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Miqdori 0 dan katta bo&#39;lishi kerak
 DocType: Journal Entry,Cash Entry,Naqd kiritish
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Bolalar tugunlari faqat &quot;Guruh&quot; tipidagi tugunlar ostida yaratilishi mumkin
 DocType: Leave Application,Half Day Date,Yarim kunlik sana
@@ -3977,12 +4066,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Eslatma: {0} elementi bir necha marta kiritilgan
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Barcha kontaktlar.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Kompaniya qisqartmasi
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,{0} foydalanuvchisi mavjud emas
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,{0} foydalanuvchisi mavjud emas
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Qisqartirish
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,To&#39;lov usuli allaqachon mavjud
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} dan boshlab authroized emas
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Ish haqi shabloni ustasi.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Patologiya
+DocType: Restaurant Order Entry,Restaurant Table,Restoran jadvalidan
 DocType: Leave Type,Max Days Leave Allowed,Maksimal kunlar ruxsat berilsin
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Xarid qilish vositasi uchun Soliq qoidasini o&#39;rnating
 DocType: Purchase Invoice,Taxes and Charges Added,Soliqlar va to&#39;lovlar qo&#39;shildi
@@ -3994,10 +4085,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Qabul qiluvchi yoki mijozlarga takliflar.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Muzlatilgan zahiralarni tartibga solishga rolik
 ,Territory Target Variance Item Group-Wise,Hududning maqsadli o&#39;zgarishi Mavzu guruh - dono
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Barcha xaridorlar guruhlari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Barcha xaridorlar guruhlari
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Yil olingan oy
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} majburiydir. Ehtimol, valyuta ayirboshlash yozuvi {1} - {2} uchun yaratilmagan."
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Soliq namunasi majburiydir.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Soliq namunasi majburiydir.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Hisob {0}: Ota-hisob {1} mavjud emas
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Narhlar kursi (Kompaniya valyutasi)
 DocType: Products Settings,Products Settings,Mahsulotlar Sozlamalari
@@ -4023,12 +4114,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Maqola Wise Soliq Batafsil
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Institut qisqartmasi
 ,Item-wise Price List Rate,Narh-navolar narxi ro&#39;yxati
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Yetkazib beruvchi kotirovkasi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Yetkazib beruvchi kotirovkasi
 DocType: Quotation,In Words will be visible once you save the Quotation.,So&#39;zlarni saqlaganingizdan so&#39;ng so&#39;zlar ko&#39;rinadi.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Miqdor ({0}) qatorda {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},{1} {{1} shtrix kodi
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},{1} {{1} shtrix kodi
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Yuk tashish xarajatlarini qo&#39;shish qoidalari.
 DocType: Item,Opening Stock,Ochilish hisobi
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Xaridor talab qilinadi
@@ -4046,9 +4137,8 @@
 DocType: Customer,From Lead,Qo&#39;rg&#39;oshin
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Ishlab chiqarish uchun chiqarilgan buyurtmalar.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Moliyaviy yilni tanlang ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,Qalin kirishni amalga oshirish uchun qalin profil talab qilinadi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,Qalin kirishni amalga oshirish uchun qalin profil talab qilinadi
 DocType: Program Enrollment Tool,Enroll Students,O&#39;quvchilarni ro&#39;yxatga olish
-DocType: Hub Settings,Name Token,Nomi tokeni
 DocType: Lab Test,Approved Date,Tasdiqlangan sana
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standart sotish
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Eng kamida bir omborxona majburiydir
@@ -4066,7 +4156,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Inson resursi
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,To&#39;lovni tasdiqlash to&#39;lovi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Soliq aktivlari
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Ishlab chiqarish tartibi {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Ishlab chiqarish tartibi {0}
 DocType: BOM Item,BOM No,BOM No
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Kundalik yozuv {0} da {1} hisobiga ega emas yoki boshqa to&#39;lovlarga qarshi allaqachon mos kelgan
@@ -4086,7 +4176,7 @@
 DocType: Currency Exchange,To Currency,Valyuta uchun
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Quyidagi foydalanuvchilarga bloklangan kunlar uchun Ilovalarni jo&#39;nating.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Xarajatlar shikoyati turlari.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},{0} elementi uchun sotish darajasi {1} dan past. Sotish narxi atleast {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},{0} elementi uchun sotish darajasi {1} dan past. Sotish narxi atleast {2}
 DocType: Item,Taxes,Soliqlar
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,To&#39;langan va etkazib berilmagan
 DocType: Project,Default Cost Center,Standart xarajatlar markazi
@@ -4100,15 +4190,15 @@
 DocType: Employee Loan,Fully Disbursed,To&#39;liq to&#39;langan
 DocType: Maintenance Visit,Customer Feedback,Xaridorlarning fikri
 DocType: Account,Expense,Xarajatlar
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Skor maksimal balldan ortiq bo&#39;lishi mumkin emas
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Skor maksimal balldan ortiq bo&#39;lishi mumkin emas
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Mijozlar va etkazib beruvchilar
 DocType: Item Attribute,From Range,Oralig&#39;idan
 DocType: BOM,Set rate of sub-assembly item based on BOM,BOM-ga asoslangan pastki yig&#39;iladigan elementni o&#39;rnatish tezligi
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Formulada yoki vaziyatda sintaksik xato: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Formulada yoki vaziyatda sintaksik xato: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Kundalik Ish Xulosa ri Kompaniya
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,{0} elementi hissa moddasi bo&#39;lmagani uchun e&#39;tibordan chetda
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Keyinchalik ishlash uchun ushbu ishlab chiqarish tartibini yuboring.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Keyinchalik ishlash uchun ushbu ishlab chiqarish tartibini yuboring.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",Raqobatchilar qoidasini muayyan operatsiyalarda qo&#39;llamaslik uchun barcha amaldagi narx qoidalari bekor qilinishi kerak.
 DocType: Assessment Group,Parent Assessment Group,Ota-ona baholash guruhi
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Ishlar
@@ -4125,12 +4215,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Guruh tomonidan &quot;Kompaniya&quot; bo&#39;lsa, Kompaniya filtrini bo&#39;sh qoldiring."
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Kiritilgan sana kelajakdagi sana bo&#39;la olmaydi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},# {0} qatori: ketma-ket No {1} {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,takroriy yaratish uchun
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Oddiy chiqish
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Laborator tekshiruvi UOM.
 DocType: Batch,Batch ID,Ommaviy ID raqami
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Eslatma: {0}
 ,Delivery Note Trends,Yetkazib berish bo&#39;yicha eslatma trend
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Ushbu xaftaning qisqacha bayoni
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Ushbu xaftaning qisqacha bayoni
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Qimmatli qog&#39;ozlar sonida
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Hisob: {0} faqatgina kabinetga operatsiyalari orqali yangilanishi mumkin
 DocType: Student Group Creation Tool,Get Courses,Kurslar oling
@@ -4144,7 +4235,6 @@
 DocType: Purchase Order,To Bill,Billga
 DocType: Material Request,% Ordered,% Buyurtma qilingan
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Kurs asosidagi talabalar guruhi uchun Kursni ro&#39;yxatdan o&#39;tishda ro&#39;yxatdan o&#39;tgan kurslardan har bir talaba uchun tasdiqlanadi.
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","E-pochta manzilini vergul bilan ajratib qo&#39;ying, hisob-faktura ma&#39;lum bir vaqtda avtomatik ravishda jo&#39;natiladi"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Perework
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Ort Xarid qilish darajasi
 DocType: Task,Actual Time (in Hours),Haqiqiy vaqt (soati)
@@ -4158,7 +4248,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,{0} elementi ketma-ketlik uchun sozlanmagan. Ustun bo&#39;sh bo&#39;lishi kerak
 DocType: Accounts Settings,Accounts Settings,Hisob sozlamalari
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,Tasdiqlang
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Yuborish uchun natija yo&#39;q
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Yuborish uchun natija yo&#39;q
 DocType: Customer,Sales Partner and Commission,Savdo hamkori va komissiyasi
 DocType: Employee Loan,Rate of Interest (%) / Year,Foiz stavkasi (%) / yil
 ,Project Quantity,Loyiha miqdori
@@ -4170,55 +4260,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Qora
 DocType: BOM Explosion Item,BOM Explosion Item,BOM portlash elementi
 DocType: Account,Auditor,Auditor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} mahsulot ishlab chiqarildi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} mahsulot ishlab chiqarildi
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Ko&#39;proq ma&#39;lumot olish
 DocType: Cheque Print Template,Distance from top edge,Yuqori tomondan masofa
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Narxlar ro&#39;yxati {0} o&#39;chirib qo&#39;yilgan yoki mavjud emas
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Narxlar ro&#39;yxati {0} o&#39;chirib qo&#39;yilgan yoki mavjud emas
 DocType: Purchase Invoice,Return,Qaytish
 DocType: Production Order Operation,Production Order Operation,Buyurtmaning ishlab chiqarilishi
 DocType: Pricing Rule,Disable,O&#39;chirish
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,To&#39;lovni amalga oshirish uchun to&#39;lov shakli talab qilinadi
 DocType: Project Task,Pending Review,Ko&#39;rib chiqishni kutish
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Uchrashuvlar va maslahatlar
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} Batch {2} ga kiritilmagan
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} Batch {2} ga kiritilmagan
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",{0} obyekti allaqachon {1}
 DocType: Task,Total Expense Claim (via Expense Claim),Jami xarajatlar bo&#39;yicha da&#39;vo (mablag &#39;to&#39;lovi bo&#39;yicha)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Luqo Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: BOM # {1} valyutasi tanlangan valyutaga teng bo&#39;lishi kerak {2}
 DocType: Journal Entry Account,Exchange Rate,Valyuta kursi
 DocType: Patient,Additional information regarding the patient,Bemor haqida qo&#39;shimcha ma&#39;lumot
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Savdo Buyurtma {0} yuborilmadi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Savdo Buyurtma {0} yuborilmadi
 DocType: Homepage,Tag Line,Tag qatori
 DocType: Fee Component,Fee Component,Narxlar komponenti
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Filo boshqarish
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Narsalarni qo&#39;shish
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Filo boshqarish
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Narsalarni qo&#39;shish
 DocType: Cheque Print Template,Regular,Muntazam
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Barcha baholash mezonlarining umumiy vazni 100%
-DocType: BOM,Last Purchase Rate,Oxirgi xarid qiymati
+DocType: Purchase Order Item,Last Purchase Rate,Oxirgi xarid qiymati
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Vazifa identifikatori
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,{0} element uchun kabinetga mavjud emas
 DocType: Lab Test,Mobile,Mobil
 ,Sales Person-wise Transaction Summary,Savdoni jismoniy shaxslar bilan ishlash xulosasi
 DocType: Training Event,Contact Number,Aloqa raqami
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,{0} ombori mavjud emas
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext uyasi uchun ro&#39;yxatdan o&#39;ting
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,{0} ombori mavjud emas
 DocType: Monthly Distribution,Monthly Distribution Percentages,Oylik tarqatish foizi
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Tanlangan elementda partiyalar mavjud emas
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","{1} {2} uchun buxgalter yozuvlarini kiritish uchun talab qilinadigan {0} elementi uchun baholanish darajasi topilmadi. Agar element {1} da namunaviy element sifatida ishlayotgan bo&#39;lsa, iltimos, {1} elementlar jadvali haqida gapirib qo&#39;ying. Aks holda, mahsulot ro&#39;yxatiga kiritilgan qimmatli qog&#39;ozlar bilan bog&#39;liq bitim tuzing yoki qiymat qaydini qaydlang va keyin ushbu yozuvni taqdim etishni / bekor qilib ko&#39;ring."
 DocType: Delivery Note,% of materials delivered against this Delivery Note,Ushbu etkazib berish eslatmasiga etkazilgan materiallarning%
+DocType: Training Event,Has Certificate,Sertifikatga ega
 DocType: Project,Customer Details,Xaridorlar uchun ma&#39;lumot
 DocType: Employee,Reports to,Hisobotlar
 ,Unpaid Expense Claim,To&#39;lanmagan to&#39;lov xarajatlari
 DocType: Payment Entry,Paid Amount,To&#39;langan pul miqdori
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Sotish tsiklini o&#39;rganing
 DocType: Assessment Plan,Supervisor,Boshqaruvchi
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,Onlaynda
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,Onlaynda
 ,Available Stock for Packing Items,Paket buyumlari mavjud
 DocType: Item Variant,Item Variant,Variant variantlari
 DocType: Assessment Result Tool,Assessment Result Tool,Ko&#39;rib natijasi vositasi
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Hurdası mahsulotlari
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,Berilgan buyurtmalarni o&#39;chirib bo&#39;lmaydi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,Berilgan buyurtmalarni o&#39;chirib bo&#39;lmaydi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Debet-da hisob balansi mavjud bo&#39;lsa, sizda &quot;Balance Must Be&quot; (&quot;Balans Must Be&quot;) &quot;Credit&quot;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Sifat menejmenti
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,{0} mahsuloti o&#39;chirib qo&#39;yildi
@@ -4238,7 +4327,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},# {0} satr: vaqt {1} qatori bilan zid
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Nolinchi baholash darajasiga ruxsat berish
 DocType: Training Event Employee,Invited,Taklif etilgan
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Berilgan sana uchun xodim {0} uchun bir nechta faol ish haqi tuzilmasi topildi
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Berilgan sana uchun xodim {0} uchun bir nechta faol ish haqi tuzilmasi topildi
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Gateway hisoblarini sozlash.
 DocType: Employee,Employment Type,Bandlik turi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Asosiy vositalar
@@ -4250,7 +4339,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Isoning shogirdi Email identifikatori
 DocType: Employee,Notice (days),Izoh (kun)
 DocType: Tax Rule,Sales Tax Template,Savdo bo&#39;yicha soliq jadvalini
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Billingni saqlash uchun elementlarni tanlang
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Billingni saqlash uchun elementlarni tanlang
 DocType: Employee,Encashment Date,Inkassatsiya sanasi
 DocType: Training Event,Internet,Internet
 DocType: Special Test Template,Special Test Template,Maxsus test shablonni
@@ -4259,7 +4348,7 @@
 DocType: Production Order,Planned Operating Cost,Rejalashtirilgan operatsion narx
 DocType: Academic Term,Term Start Date,Yil boshlanish sanasi
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},"Iltimos, iltimos, {0} # {1}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},"Iltimos, iltimos, {0} # {1}"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bank Bosh balansidagi balans balansi
 DocType: Job Applicant,Applicant Name,Ariza beruvchi nomi
 DocType: Authorization Rule,Customer / Item Name,Xaridor / Mahsulot nomi
@@ -4279,7 +4368,7 @@
 DocType: Guardian,Guardian Of ,Guardian Of
 DocType: Grading Scale Interval,Threshold,Eshik
 DocType: BOM Update Tool,Current BOM,Joriy BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Seriya raqami qo&#39;shing
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Seriya raqami qo&#39;shing
 DocType: Production Order Item,Available Qty at Source Warehouse,Manba omborida mavjud bo&#39;lgan son
 apps/erpnext/erpnext/config/support.py +22,Warranty,Kafolat
 DocType: Purchase Invoice,Debit Note Issued,Debet notasi chiqarildi
@@ -4302,10 +4391,9 @@
 DocType: Account,Receivable,Oladigan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Row # {0}: Yetkazib beruvchini Xarid qilish tartibi sifatida o&#39;zgartirishga ruxsat yo&#39;q, allaqachon mavjud"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Kredit limitlarini oshib ketadigan bitimlar taqdim etishga ruxsat berilgan rol.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Mahsulotni tayyorlash buyrug&#39;ini tanlang
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Magistr ma&#39;lumotlarini sinxronlash, biroz vaqt talab qilishi mumkin"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Mahsulotni tayyorlash buyrug&#39;ini tanlang
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Magistr ma&#39;lumotlarini sinxronlash, biroz vaqt talab qilishi mumkin"
 DocType: Item,Material Issue,Moddiy muammolar
-DocType: Hub Settings,Seller Description,Sotuvchi ta&#39;rifi
 DocType: Employee Education,Qualification,Malakali
 DocType: Item Price,Item Price,Mahsulot narxi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sovun va detarjen
@@ -4313,7 +4401,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Vaqtdan Vaqtga qaraganda Kattaroq bo&#39;la olmaydi.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Buyurtma qilingan
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Rezyume; qayta boshlash
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Rezyume; qayta boshlash
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Agar yoqilgan bo&#39;lsa, tizim shablondan varianti maydonlarini yangilamaydi, ammo yangi variantni yaratishda quyidagi maydonlardan ma&#39;lumotlarni ko&#39;chirib oladi"
 DocType: Salary Detail,Component,Komponent
 DocType: Assessment Criteria,Assessment Criteria Group,Baholash mezonlari guruhi
 DocType: Healthcare Settings,Patient Name By,Bemor nomi
@@ -4323,7 +4412,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Iltimos, rozni rozilikni kiriting yoki foydalanuvchini tasdiqlang"
 DocType: Journal Entry,Write Off Entry,Yozuvni yozing
 DocType: BOM,Rate Of Materials Based On,Materiallar asoslari
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Yetkazib beruvchi&gt; Yetkazib beruvchi turi
+DocType: Item Variant Settings,Do not Update Variants,Varyantlarni yangilang
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analytics-ni qo&#39;llab-quvvatlash
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Barchasini olib tashlang
 DocType: POS Profile,Terms and Conditions,Foydalanish shartlari
@@ -4332,7 +4421,7 @@
 DocType: Leave Block List,Applies to Company,Kompaniya uchun amal qiladi
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,"Bekor qilolmaysiz, chunki taqdim etilgan Stock Entry {0} mavjud"
 DocType: Employee Loan,Disbursement Date,To&#39;lov sanasi
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;Qabul qiluvchilar&#39; ko&#39;rsatilmagan
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Qabul qiluvchilar&#39; ko&#39;rsatilmagan
 DocType: BOM Update Tool,Update latest price in all BOMs,Barcha BOMlarda oxirgi narxni yangilang
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Tibbiy ma&#39;lumot
 DocType: Vehicle,Vehicle,Avtomobil
@@ -4347,14 +4436,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Assotsiatsiyalangan amortizatsiya va balans
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},{0} {1} miqdori {2} dan {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},{0} {1} miqdori {2} dan {3}
 DocType: Sales Invoice,Get Advances Received,Qabul qilingan avanslar oling
 DocType: Email Digest,Add/Remove Recipients,Qabul qiluvchilarni qo&#39;shish / o&#39;chirish
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Jarayon to&#39;xtatilgan ishlab chiqarish buyurtmasi bo&#39;yicha ruxsat etilmagan {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",Ushbu moliyaviy yilni &quot;Standart&quot; deb belgilash uchun &quot;Default as default&quot; -ni bosing
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Ishtirok etish
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Ishtirok etish
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Miqdori miqdori
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,{0} mahsulot varianti bir xil xususiyatlarga ega
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,{0} mahsulot varianti bir xil xususiyatlarga ega
 DocType: Employee Loan,Repay from Salary,Ish haqidan to&#39;lash
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},{0} {1} dan {2}
@@ -4367,7 +4456,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Savdo Buyurtma Buyurtma
 DocType: Salary Slip,Payment Days,To&#39;lov kunlari
 DocType: Patient,Dormant,Kutilmaganda
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Bolalar noduslari joylashgan omborlar kitobga o&#39;tkazilmaydi
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Bolalar noduslari joylashgan omborlar kitobga o&#39;tkazilmaydi
 DocType: BOM,Manage cost of operations,Amaliyot xarajatlarini boshqaring
 DocType: Accounts Settings,Stale Days,Eski kunlar
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Belgilangan tranzaktsiyalardan biri &quot;yuborilgan&quot; bo&#39;lsa, tranzaksiya bilan qo&#39;shimcha qilib, ushbu operatsiyada tegishli &quot;Kontakt&quot; ga elektron pochta yuborish uchun elektron pochta pop-up avtomatik ravishda ochiladi. Foydalanuvchi e-pochtani yuborishi yoki olmasligi mumkin."
@@ -4381,10 +4470,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,No {0} seriyali allaqachon qabul qilingan
 ,Requested Items To Be Transferred,Talab qilingan narsalarni yuborish
 DocType: Expense Claim,Vehicle Log,Avtomobil logi
-DocType: Purchase Invoice,Recurring Id,Qaytuvchi identifikator
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),Isitmaning mavjudligi (temp&gt; 38.5 ° C / 101.3 ° F yoki doimiy temp&gt; 38 ° C / 100.4 ° F)
 DocType: Customer,Sales Team Details,Savdo jamoasining tafsilotlari
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Doimiy o&#39;chirilsinmi?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Doimiy o&#39;chirilsinmi?
 DocType: Expense Claim,Total Claimed Amount,Jami da&#39;vo miqdori
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Sotish uchun potentsial imkoniyatlar.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Noto&#39;g&#39;ri {0}
@@ -4394,7 +4482,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Savdo do&#39;konlari
 ,Item Delivery Date,Mahsulotni etkazib berish sanasi
 DocType: Warehouse,PIN,PIN-kod
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Maktabingizni ERP-matnida sozlang
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Maktabingizni ERP-matnida sozlang
 DocType: Sales Invoice,Base Change Amount (Company Currency),Boz almashtirish miqdori (Kompaniya valyutasi)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Quyidagi omborlar uchun buxgalteriya yozuvlari mavjud emas
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Avval hujjatni yozib oling.
@@ -4406,13 +4494,12 @@
 DocType: Task,Is Milestone,Milestone
 DocType: Daily Work Summary,Email Sent To,E - mail yuborildi
 DocType: Budget,Warn,Ogoh bo&#39;ling
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Siz ro&#39;yxatdan o&#39;tkazishni xohlaysizmi?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Boshqa yozuvlar, yozuvlardagi diqqat-e&#39;tiborli harakatlar."
 DocType: BOM,Manufacturing User,Ishlab chiqarish foydalanuvchisi
 DocType: Purchase Invoice,Raw Materials Supplied,Xom-ashyo etkazib berildi
-DocType: Purchase Invoice,Recurring Print Format,Ikki nusxadagi chop formati
 DocType: C-Form,Series,Series
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Narxlar ro&#39;yxatining {0} valyutasi {1} yoki {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Mahsulot qo&#39;shish
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Narxlar ro&#39;yxatining {0} valyutasi {1} yoki {2}
 DocType: Appraisal,Appraisal Template,Baholash shabloni
 DocType: Item Group,Item Classification,Mavzu tasnifi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Ish oshirish menejeri
@@ -4425,7 +4512,7 @@
 DocType: Item Attribute Value,Attribute Value,Xususiyat bahosi
 ,Itemwise Recommended Reorder Level,Tavsiya etilgan buyurtmaning darajasi
 DocType: Salary Detail,Salary Detail,Ish haqi bo&#39;yicha batafsil
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Avval {0} ni tanlang
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Avval {0} ni tanlang
 DocType: Appointment Type,Physician,Shifokor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,{1} banddagi {0} guruhining amal qilish muddati tugadi.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Maslahatlar
@@ -4436,7 +4523,7 @@
 DocType: Salary Detail,Default Amount,Standart miqdor
 DocType: Lab Test Template,Descriptive,Ta&#39;riflovchi
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Tizimda mavjud bo&#39;lmagan ombor
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Ushbu oyning qisqacha bayoni
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Ushbu oyning qisqacha bayoni
 DocType: Quality Inspection Reading,Quality Inspection Reading,Sifatni tekshirishni o&#39;qish
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,&quot;Freeze Stocks Older&quot; dan kamida% d kun bo&#39;lishi kerak.
 DocType: Tax Rule,Purchase Tax Template,Xarid qilish shablonini sotib oling
@@ -4459,12 +4546,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,O&#39;quv mashg&#39;ulotlari / natijalari
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Yig&#39;ilgan Amortismanlar
 DocType: Sales Invoice,C-Form Applicable,C-formasi amal qiladi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Operatsion vaqti {0} dan foydalanish uchun 0 dan katta bo&#39;lishi kerak
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Operatsion vaqti {0} dan foydalanish uchun 0 dan katta bo&#39;lishi kerak
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,QXI majburiydir
 DocType: Supplier,Address and Contacts,Manzil va Kontaktlar
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM ishlab chiqarish ma&#39;lumoti
 DocType: Program,Program Abbreviation,Dastur qisqartmasi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Mahsulot shablonini ishlab chiqarish tartibi ko&#39;tarilmaydi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Mahsulot shablonini ishlab chiqarish tartibi ko&#39;tarilmaydi
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,To&#39;lovlar har bir elementga nisbatan Buyurtmachnomada yangilanadi
 DocType: Warranty Claim,Resolved By,Qaror bilan
 DocType: Bank Guarantee,Start Date,Boshlanish vaqti
@@ -4490,26 +4577,27 @@
 DocType: Employee,Educational Qualification,Ta&#39;lim malakasi
 DocType: Workstation,Operating Costs,Operatsion xarajatlar
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Yig&#39;ilgan oylik byudjetdan oshiq bo&#39;lgan harakatlar
-DocType: Purchase Invoice,Submit on creation,Yaratishni topshirish
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},{0} uchun valyuta {1} bo&#39;lishi kerak
+DocType: Subscription,Submit on creation,Yaratishni topshirish
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},{0} uchun valyuta {1} bo&#39;lishi kerak
 DocType: Asset,Disposal Date,Chiqarish sanasi
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Agar dam olishlari bo&#39;lmasa, elektron pochta xabarlari kompaniyaning barcha faol xodimlariga berilgan vaqtda yuboriladi. Javoblarning qisqacha bayoni yarim tunda yuboriladi."
 DocType: Employee Leave Approver,Employee Leave Approver,Xodimga taxminan yo&#39;l qo&#39;ying
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Qayta buyurtmaning arizasi allaqachon {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Yo&#39;qotilgan deb e&#39;lon qilinmaydi, chunki takliflar qilingan."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Ta&#39;lim bo&#39;yicha fikr-mulohazalar
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Qayta buyurtmaning arizasi allaqachon {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Yo&#39;qotilgan deb e&#39;lon qilinmaydi, chunki takliflar qilingan."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Ta&#39;lim bo&#39;yicha fikr-mulohazalar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Ishlab chiqarish Buyurtma {0} topshirilishi kerak
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Yetkazib beruvchi Kuzatuv Kriteri
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},"Iltimos, {0} uchun mahsulotning boshlanish sanasi va tugash sanasini tanlang"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Kurs {0} qatorida majburiydir.
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Bugungi kunga qadar tarixdan oldin bo&#39;la olmaydi
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Narxlarni qo&#39;shish / tahrirlash
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Narxlarni qo&#39;shish / tahrirlash
 DocType: Batch,Parent Batch,Ota-ona partiyasi
 DocType: Cheque Print Template,Cheque Print Template,Chop shablonini tekshiring
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Xarajat markazlari jadvali
 DocType: Lab Test Template,Sample Collection,Namunani yig&#39;ish
 ,Requested Items To Be Ordered,Buyurtma qilingan buyurtma qilingan narsalar
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Mening buyurtmalarim
 DocType: Price List,Price List Name,Narhlar ro&#39;yxati nomi
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},{0} uchun kundalik ish xulosasi
 DocType: Employee Loan,Totals,Jami
@@ -4528,12 +4616,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,Ushbu bitimni bajarish uchun {1} {0} {2} da {3} {4} da {5} uchun kerak.
 DocType: Fee Schedule,Student Category,Talaba toifasi
 DocType: Announcement,Student,Talaba
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Tashkiliy bo&#39;linma (bo&#39;lim) magistr.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Tashkiliy bo&#39;linma (bo&#39;lim) magistr.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Xonalarga boring
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Yuborishdan oldin xabarni kiriting
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,TAShQI TAQDIM ETILGAN
 DocType: Email Digest,Pending Quotations,Kutayotgan takliflar
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Sotuv nuqtasi profili
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Sotuv nuqtasi profili
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Laboratoriya test konfiguratsiyasi.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Ta&#39;minlanmagan kreditlar
 DocType: Cost Center,Cost Center Name,Xarajat markazi nomi
@@ -4543,6 +4631,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Hammasi bo&#39;lib to&#39;lanadi
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 belgidan kattaroq xabarlar bir nechta xabarlarga bo&#39;linadi
 DocType: Purchase Receipt Item,Received and Accepted,Qabul qilingan va qabul qilingan
+DocType: Hub Settings,Company and Seller Profile,Kompaniya va sotuvchi profil
 ,GST Itemised Sales Register,GST Itemized Sales Register
 ,Serial No Service Contract Expiry,Seriya Yo&#39;q Xizmat shartnoma muddati tugamadi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Siz bir vaqtning o&#39;zida bir xil hisobni to&#39;ldirishingiz va hisobni to&#39;lashingiz mumkin emas
@@ -4552,10 +4641,11 @@
 DocType: Item,Variant Based On,Variant asosida
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Belgilangan jami vaznda 100% bo&#39;lishi kerak. Bu {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Sizning etkazib beruvchilaringiz
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,"Iltimos, to&#39;g&#39;rilang"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Savdo buyurtmasi sifatida yo&#39;qolgan deb belgilanmaydi.
 DocType: Request for Quotation Item,Supplier Part No,Yetkazib beruvchi qism No
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Qaysi kategoriya uchun &quot;Baholash&quot; yoki &quot;Vaulusiya va jami&quot;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Qabul qilingan
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Qabul qilingan
 DocType: Lead,Converted,O&#39;tkazilgan
 DocType: Item,Has Serial No,Seriya raqami yo&#39;q
 DocType: Employee,Date of Issue,Berilgan sana
@@ -4563,7 +4653,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Xarid qilish sozlamalari kerak bo&#39;lsa == &quot;YES&quot; ni xarid qilsangiz, u holda Xarid-fakturani yaratish uchun foydalanuvchi oldin {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},{0} qator: Ta&#39;minlovchini {1} elementiga sozlang
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Row {0}: soat qiymati noldan katta bo&#39;lishi kerak.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Veb-sayt {1} mahsulotiga biriktirilgan {0} rasm topilmadi
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Veb-sayt {1} mahsulotiga biriktirilgan {0} rasm topilmadi
 DocType: Issue,Content Type,Kontent turi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Kompyuter
 DocType: Item,List this Item in multiple groups on the website.,Ushbu elementni veb-saytdagi bir nechta guruhda ko&#39;rsating.
@@ -4574,14 +4664,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Bog&#39;liq bo&#39;lmagan yozuvlarni qabul qiling
 DocType: Payment Reconciliation,From Invoice Date,Faktura sanasidan boshlab
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Sizga ruxsat berishga ruxsat yo&#39;q
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,To&#39;lov valyutasi odatdagidan hisoblangan valyuta yoki partiyaning hisob valyutasiga teng bo&#39;lishi kerak
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,To&#39;lov valyutasi odatdagidan hisoblangan valyuta yoki partiyaning hisob valyutasiga teng bo&#39;lishi kerak
 DocType: Healthcare Settings,Laboratory Settings,Laboratoriya sozlamalari
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Inkassatsiya qilishni qoldiring
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,U nima qiladi?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,QXIga
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Barcha talabalar qabul qilish
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,U nima qiladi?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,QXIga
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Barcha talabalar qabul qilish
 ,Average Commission Rate,O&#39;rtacha komissiya kursi
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Seriya Yo&#39;q&quot; yo&#39;q stokli mahsulot uchun &quot;Ha&quot; bo&#39;lishi mumkin emas
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Seriya Yo&#39;q&quot; yo&#39;q stokli mahsulot uchun &quot;Ha&quot; bo&#39;lishi mumkin emas
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Status-ni tanlang
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Kelgusi sanalar uchun tomosha qilish mumkin emas
 DocType: Pricing Rule,Pricing Rule Help,Raqobat qoidalari yordami
@@ -4599,40 +4689,40 @@
 DocType: Item,Customer Code,Xaridor kodi
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},{0} uchun tug&#39;ilgan kun eslatmasi
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Oxirgi Buyurtma berib o&#39;tgan kunlar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,Debet Hisobni balans hisoboti bo&#39;lishi kerak
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Debet Hisobni balans hisoboti bo&#39;lishi kerak
 DocType: Buying Settings,Naming Series,Namunaviy qator
 DocType: Leave Block List,Leave Block List Name,Blok ro&#39;yxati nomini qoldiring
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Sug&#39;urtaning boshlanish sanasi sug&#39;urta tugagan sanadan kam bo&#39;lishi kerak
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,"Iltimos, maktabdagi o&#39;qituvchilar nomini tizimini sozlang"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Fond aktivlari
 DocType: Timesheet,Production Detail,Ishlab chiqarish detali
+DocType: Restaurant,Active Menu,Faol menyu
 DocType: Target Detail,Target Qty,Nishon Miqdor
 DocType: Shopping Cart Settings,Checkout Settings,To&#39;lov sozlamalari
 DocType: Attendance,Present,Mavjud
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Yetkazib berish eslatmasi {0} yuborilmasligi kerak
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Yetkazib berish eslatmasi {0} yuborilmasligi kerak
 DocType: Notification Control,Sales Invoice Message,Sotuvdagi hisob-faktura xabari
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Hisobni yopish {0} javobgarlik / tenglik turi bo&#39;lishi kerak
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Ish staji {1} vaqt jadvalini uchun yaratilgan ({0})
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Ish staji {1} vaqt jadvalini uchun yaratilgan ({0})
 DocType: Vehicle Log,Odometer,Odometer
 DocType: Sales Order Item,Ordered Qty,Buyurtma miqdori
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,{0} element o&#39;chirib qo&#39;yilgan
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,{0} element o&#39;chirib qo&#39;yilgan
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOMda biron-bir mahsulot elementi yo&#39;q
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Loyiha faoliyati / vazifasi.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOMda biron-bir mahsulot elementi yo&#39;q
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Loyiha faoliyati / vazifasi.
 DocType: Vehicle Log,Refuelling Details,Yoqilg&#39;i tafsilotlari
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Ish haqi slipslarini yaratish
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","{0} sifatida tanlangan bo&#39;lsa, xarid qilishni tekshirish kerak"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Diskont 100 dan kam bo&#39;lishi kerak
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,So&#39;nggi xarid narxi topilmadi
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Miqdorni yozing (Kompaniya valyutasi)
 DocType: Sales Invoice Timesheet,Billing Hours,To&#39;lov vaqti
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,{0} uchun odatiy BOM topilmadi
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,"# {0} qatori: Iltimos, buyurtmaning miqdorini belgilang"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,{0} uchun odatiy BOM topilmadi
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,"# {0} qatori: Iltimos, buyurtmaning miqdorini belgilang"
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Bu yerga qo&#39;shish uchun narsalarni teging
 DocType: Fees,Program Enrollment,Dasturlarni ro&#39;yxatga olish
 DocType: Landed Cost Voucher,Landed Cost Voucher,Belgilangan xarajatlar varaqasi
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Iltimos, {0}"
-DocType: Purchase Invoice,Repeat on Day of Month,Oyning kuni bilan takrorlang
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} faol emas
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} faol emas
 DocType: Employee,Health Details,Sog&#39;liqni saqlash haqida ma&#39;lumot
 DocType: Offer Letter,Offer Letter Terms,Kelishuv shartlarini taklif qilish
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,To&#39;lov talabnomasini yaratish uchun ma&#39;lumotnoma talab qilinadi
@@ -4640,7 +4730,6 @@
 DocType: Employee External Work History,Salary,Ish haqi
 DocType: Serial No,Delivery Document Type,Hujjatning turi
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Yuqorida ko&#39;rsatilgan tanlangan mezonlarga barcha ish haqi slipslarini yuboring
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Sinxronlangan ma&#39;lumotlar
 DocType: Sales Order,Partly Delivered,Qisman etkazib berildi
 DocType: Email Digest,Receivables,Oladiganlar
 DocType: Lead Source,Lead Source,Qo&#39;rg&#39;oshin manbai
@@ -4661,19 +4750,19 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Qarish oralig&#39;i 2
 DocType: SG Creation Tool Course,Max Strength,Maks kuch
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM almashtirildi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Etkazib berish sanasi asosida narsalarni tanlang
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Etkazib berish sanasi asosida narsalarni tanlang
 ,Sales Analytics,Savdo tahlillari
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},{0} mavjud
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},{0} mavjud
 ,Prospects Engaged But Not Converted,"Kutilayotgan imkoniyatlar, lekin o&#39;zgartirilmadi"
 DocType: Manufacturing Settings,Manufacturing Settings,Ishlab chiqarish sozlamalari
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,E-pochtani sozlash
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 Mobil raqami
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,"Iltimos, kompaniyaning ustalidagi valyutani kiriting"
 DocType: Stock Entry Detail,Stock Entry Detail,Stock Entry Detail
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Kundalik eslatmalar
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Kundalik eslatmalar
 DocType: Products Settings,Home Page is Products,Bosh sahifa - Mahsulotlar
 ,Asset Depreciation Ledger,Aktivlar amortizatsiyasi
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Soliq qoidalari to&#39;qnashuvi {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Soliq qoidalari to&#39;qnashuvi {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Yangi hisob nomi
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Xom ashyo materiallari bilan ta&#39;minlangan
 DocType: Selling Settings,Settings for Selling Module,Sotuvdagi modulni sozlash
@@ -4687,8 +4776,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,{0} elementi birja elementi bo&#39;lishi kerak
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standart ishni bajarishda ombor
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Buxgalteriya operatsiyalari uchun standart sozlamalar.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Inson resurslari&gt; HR parametrlarini Xodimlar uchun nomlash tizimini sozlang
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Kutilgan sana Material Taqdir Sana oldin bo&#39;lolmaydi
+DocType: Restaurant,Default Tax Template,Standart soliq kodi
 DocType: Fees,Student Details,Talaba tafsilotlari
 DocType: Purchase Invoice Item,Stock Qty,Qissa soni
 DocType: Employee Loan,Repayment Period in Months,Oylardagi qaytarish davri
@@ -4706,8 +4796,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Ma&#39;lumotlar bo&#39;limiga o&#39;ting
 DocType: Sales Partner,Partner Type,Hamkor turi
 DocType: Purchase Taxes and Charges,Actual,Haqiqiy
+DocType: Restaurant Menu,Restaurant Manager,Restoran menejeri
 DocType: Authorization Rule,Customerwise Discount,Xaridor tomonidan taklif qilingan chegirmalar
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,Vazifalar uchun vaqt jadvalini.
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,Vazifalar uchun vaqt jadvalini.
 DocType: Purchase Invoice,Against Expense Account,Xarajatlar hisobiga qarshi
 DocType: Production Order,Production Order,Ishlab chiqarish tartibi
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,O&#39;rnatish uchun eslatma {0} allaqachon yuborilgan
@@ -4715,7 +4806,6 @@
 DocType: Quotation Item,Against Docname,Docnamega qarshi
 DocType: SMS Center,All Employee (Active),Barcha xodimlar (faol)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Hozir ko&#39;rish
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Hisob-fakturaning avtomatik shakllanadigan davrini tanlang
 DocType: BOM,Raw Material Cost,Xomashyo narxlari
 DocType: Item Reorder,Re-Order Level,Buyurtma darajasini qayta yuklash
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Ishlab chiqarish buyurtmalarini oshirish yoki tahlil qilish uchun xom ashyolarni yuklab olishni istagan narsalarni va rejalashtirilgan miqdorni kiriting.
@@ -4728,23 +4818,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Hisobot turi majburiydir
 DocType: Item,Serial Number Series,Seriya raqami
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},{1} qatoridagi kabinetga {0} uchun ombor kerak
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Dasturlarni qo&#39;shish
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Chakana va ulgurji savdo
 DocType: Issue,First Responded On,Birinchi javob
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Bir nechta guruhda elementlarning o&#39;zaro roziligi
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Moliyaviy yil boshlash sanasi va moliya yili tugash sanasi Moliyaviy yil {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Bo&#39;shatish sanasi yangilandi
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split partiyasi
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split partiyasi
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Muvaffaqiyatli o&#39;zaro kelishilgan
 DocType: Request for Quotation Supplier,Download PDF,PDF-ni yuklab olish
 DocType: Production Order,Planned End Date,Rejalashtirilgan tugash sanasi
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Jadvaldagi sanani kiriting
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Qaerda narsalar saqlanadi.
 DocType: Request for Quotation,Supplier Detail,Yetkazib beruvchi ma&#39;lumotlarni
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Formulada yoki vaziyatda xato: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Formulada yoki vaziyatda xato: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Xarajatlar miqdori
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Mezonning og&#39;irliklari 100%
 DocType: Attendance,Attendance,Ishtirok etish
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,Qimmatli qog&#39;ozlar
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,Qimmatli qog&#39;ozlar
 DocType: BOM,Materials,Materiallar
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Belgilangan bo&#39;lmasa, ro&#39;yxat qo&#39;llanilishi kerak bo&#39;lgan har bir Bo&#39;limga qo&#39;shilishi kerak."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Resurs va maqsadli omborlar bir xil bo&#39;lishi mumkin emas
@@ -4762,6 +4852,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,Jami aniq
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},{0} atributi uchun {4} belgisi uchun {1} - {2} oralig&#39;ida {3}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,{0} qatoridagi maqsadli ombor ishlab chiqarish tartibi bilan bir xil bo&#39;lishi kerak
+DocType: Restaurant Reservation,Waitlisted,Kutib turildi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Valyutani boshqa valyutani qo&#39;llagan holda kiritish o&#39;zgartirilmaydi
 DocType: Vehicle Service,Clutch Plate,Debriyaj plitasi
 DocType: Company,Round Off Account,Dumaloq hisob qaydnomasi
@@ -4778,7 +4869,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Yangi Sotuvdagi Shaxs ismi
 DocType: Packing Slip,Gross Weight UOM,Brüt Og&#39;irlik UOM
 DocType: Delivery Note Item,Against Sales Invoice,Sotuvdagi schyot-fakturaga qarshi
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Serileştirilmiş element uchun seriya raqamlarini kiriting
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Serileştirilmiş element uchun seriya raqamlarini kiriting
 DocType: Bin,Reserved Qty for Production,Ishlab chiqarish uchun belgilangan miqdor
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Kursga asoslangan guruhlarni tashkil qilishda partiyani ko&#39;rib chiqishni istamasangiz, belgilanmasdan qoldiring."
 DocType: Asset,Frequency of Depreciation (Months),Amortizatsiya chastotasi (oy)
@@ -4789,7 +4880,7 @@
 DocType: Lab Test,Test Group,Test guruhi
 DocType: Payment Reconciliation,Receivable / Payable Account,Oladigan / to&#39;lanadigan hisob
 DocType: Delivery Note Item,Against Sales Order Item,Savdo Buyurtma Mahsulotiga qarshi
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},"Iltimos, attribut qiymati uchun {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},"Iltimos, attribut qiymati uchun {0}"
 DocType: Item,Default Warehouse,Standart ombor
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Byudjetga {0} Guruh hisobi bo&#39;yicha topshirish mumkin emas
 DocType: Healthcare Settings,Patient Registration,Bemorni ro&#39;yxatdan o&#39;tkazish
@@ -4818,6 +4909,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Savdo vakili
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Byudjet va xarajatlar markazi
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Ko&#39;p ko&#39;rsatiladigan to&#39;lov shakli yo&#39;l qo&#39;yilmaydi
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,uchun
 ,Appointment Analytics,Uchrashuv tahlillari
 DocType: Vehicle Service,Half Yearly,Yarim yillik
 DocType: Lead,Blog Subscriber,Blog Obuna
@@ -4835,7 +4927,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Hisob soni
 ,BOM Stock Report,BOM birjasi
 DocType: Stock Reconciliation Item,Quantity Difference,Miqdor farq
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,To&#39;lovni qayta ishlash
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,To&#39;lovni qayta ishlash
 DocType: Opportunity Item,Basic Rate,Asosiy darajasi
 DocType: GL Entry,Credit Amount,Kredit miqdori
 DocType: Cheque Print Template,Signatory Position,Imzo varaqasi
@@ -4849,12 +4941,12 @@
 DocType: Tax Rule,Tax Rule,Soliq qoidalari
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Sotish davrida bir xil darajada ushlab turing
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Ish stantsiyasining ish soatlari tashqarisida vaqtni qayd etish.
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Navbatdagi mijozlar
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Doktor {0} da shifokor dasturlari mavjud emas. Uni shifokor ustasiga qo&#39;shing
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Navbatdagi mijozlar
 DocType: Student,Nationality,Fuqarolik
 ,Items To Be Requested,Talab qilinadigan narsalar
-DocType: Purchase Order,Get Last Purchase Rate,So&#39;nggi xarid narxini oling
 DocType: Company,Company Info,Kompaniya haqida ma&#39;lumot
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Yangi mijozni tanlang yoki qo&#39;shing
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Yangi mijozni tanlang yoki qo&#39;shing
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Xarajat markazidan mablag &#39;sarflashni talab qilish kerak
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Jamg&#39;armalar (aktivlar) ni qo&#39;llash
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Bu ushbu xodimning ishtirokiga asoslangan
@@ -4862,6 +4954,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Hisob qaydnomasi
 DocType: Fiscal Year,Year Start Date,Yil boshlanish sanasi
 DocType: Attendance,Employee Name,Xodimlarning nomi
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restoran Buyurtma bandini buyurtma qiling
 DocType: Sales Invoice,Rounded Total (Company Currency),Yalpi jami (Kompaniya valyutasi)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Hisob turi tanlanganligi sababli guruhga yashirin bo&#39;lmaydi.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,"{0} {1} o&#39;zgartirilgan. Iltimos, yangilang."
@@ -4872,6 +4965,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Ishchilarning nafaqalari
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},To&#39;ldirilgan miqdor {1} qatorda {0} uchun teng miqdorga ega bo&#39;lishi kerak
 DocType: Production Order,Manufactured Qty,Ishlab chiqarilgan Miqdor
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Hisob-faktura yaratildi
 DocType: Purchase Receipt Item,Accepted Quantity,Qabul qilingan miqdor
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},"Iltimos, xizmatdoshlar uchun {0} yoki Kompaniya {1}"
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} mavjud emas
@@ -4881,18 +4975,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},No {0} qatori: Miqdor kutilgan qarz miqdori bo&#39;yicha da&#39;volardan {1} dan yuqori bo&#39;lishi mumkin emas. Kutilayotgan miqdor {2}
 DocType: Maintenance Schedule,Schedule,Jadval
 DocType: Account,Parent Account,Ota-hisob
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Mavjud
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Mavjud
 DocType: Quality Inspection Reading,Reading 3,O&#39;qish 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher turi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Narxlar ro&#39;yxati topilmadi yoki o&#39;chirib qo&#39;yilgan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Narxlar ro&#39;yxati topilmadi yoki o&#39;chirib qo&#39;yilgan
 DocType: Lab Test,Approved,Tasdiqlandi
 DocType: Pricing Rule,Price,Narxlari
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',{0} da bo&#39;shagan xodim &quot;chapga&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',{0} da bo&#39;shagan xodim &quot;chapga&quot;
+DocType: Hub Settings,Last Sync On,So&#39;nggi sinxronlash yoqilgan
 DocType: Guardian,Guardian,Guardian
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Belgilangan sana oralig&#39;ida xodim {1} uchun baholangan {0} baholanadi
 DocType: Employee,Education,Ta&#39;lim
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,Del
 DocType: Selling Settings,Campaign Naming By,Kampaniya nomi bilan nomlash
 DocType: Employee,Current Address Is,Hozirgi manzili
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Oylik Sotuvdagi Nishon (
@@ -4907,7 +5002,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Kurs kodi:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,"Marhamat, hisobni kiriting"
 DocType: Account,Stock,Aksiyalar
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","# {0} satri: Hujjatning Hujjat turi Buyurtma Buyurtma, Buyurtma Xarajati yoki Jurnal Yozuvi bo&#39;lishi kerak"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","# {0} satri: Hujjatning Hujjat turi Buyurtma Buyurtma, Buyurtma Xarajati yoki Jurnal Yozuvi bo&#39;lishi kerak"
 DocType: Employee,Current Address,Joriy manzil
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Agar element boshqa narsaning varianti bo&#39;lsa, u holda tavsif, tasvir, narxlanish, soliq va boshqalar shablondan aniq belgilanmagan bo&#39;lsa"
 DocType: Serial No,Purchase / Manufacture Details,Sotib olish / ishlab chiqarish detali
@@ -4938,7 +5033,7 @@
 DocType: Hub Settings,Hub Settings,Hub sozlamalari
 DocType: Project,Gross Margin %,Yalpi marj%
 DocType: BOM,With Operations,Operatsiyalar bilan
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Kompaniya {1} uchun valyuta {0} da buxgalteriya hisobi allaqachon olib borilgan. Iltimos, {0} valyutasi bilan oladigan yoki to&#39;lovli hisobni tanlang."
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Kompaniya {1} uchun valyuta {0} da buxgalteriya hisobi allaqachon olib borilgan. Iltimos, {0} valyutasi bilan oladigan yoki to&#39;lovli hisobni tanlang."
 DocType: Asset,Is Existing Asset,Mavjud aktiv
 DocType: Salary Detail,Statistical Component,Statistik komponent
 DocType: Warranty Claim,If different than customer address,Mijozning manzilidan farq qilsa
@@ -4946,13 +5041,14 @@
 DocType: BOM Operation,BOM Operation,BOM operatsiyasi
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Oldingi qatorlar miqdori bo&#39;yicha
 DocType: Student,Home Address,Uy manzili
+DocType: Item,Has Expiry Date,Tugatish sanasi
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Variant sozlamalari.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transfer vositasi
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,Transfer vositasi
 DocType: POS Profile,POS Profile,Qalin profil
 DocType: Training Event,Event Name,Voqealar nomi
 DocType: Physician,Phone (Office),Telefon (ofis)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,Qabul qilish
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},{0} uchun qabul
+apps/erpnext/erpnext/hooks.py +147,Admission,Qabul qilish
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},{0} uchun qabul
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Byudjetni belgilashning mavsumiyligi, maqsadlari va boshqalar."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Argumentlar nomi
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","{0} element shablon bo&#39;lib, uning variantlaridan birini tanlang"
@@ -4961,7 +5057,7 @@
 DocType: Assessment Plan,Room,Xona
 DocType: Purchase Order,Advance Paid,Avans to&#39;langan
 DocType: Item,Item Tax,Mahsulot solig&#39;i
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Yetkazib beruvchiga material
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Yetkazib beruvchiga material
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Aksiz billing
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% bir martadan ortiq ko&#39;rinadi
 DocType: Expense Claim,Employees Email Id,Xodimlarning elektron pochta manzili
@@ -4972,31 +5068,29 @@
 DocType: Program,Program Name,Dastur nomi
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Soliqni yoki to&#39;lovni ko&#39;rib chiqing
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Haqiqiy miqdori majburiydir
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} hozirda {1} Yetkazib beruvchi reyting kartasiga ega va ushbu etkazib beruvchiga Buyurtma buyurtmalari ehtiyotkorlik bilan berilishi kerak.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} hozirda {1} Yetkazib beruvchi reyting kartasiga ega va ushbu etkazib beruvchiga Buyurtma buyurtmalari ehtiyotkorlik bilan berilishi kerak.
 DocType: Employee Loan,Loan Type,Kredit turi
 DocType: Scheduling Tool,Scheduling Tool,Vositachi rejalashtirish
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Kredit karta
 DocType: BOM,Item to be manufactured or repacked,Mahsulot ishlab chiqariladi yoki qayta paketlanadi
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Birja bitimlari uchun standart sozlamalar.
-DocType: Purchase Invoice,Next Date,Keyingi sana
 DocType: Employee Education,Major/Optional Subjects,Asosiy / Tanlovlar
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
+DocType: Hub Settings,Suspended,To&#39;xtatildi
 DocType: Training Event,Attendees,Ishtirokchilar
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Bu erda ota-onangiz, turmush o&#39;rtog&#39;ingiz va farzandlaringizning ismi va ishi kabi oilaviy ma&#39;lumotlarni saqlashingiz mumkin"
 DocType: Academic Term,Term End Date,Davr oxiri kuni
-DocType: Hub Settings,Seller Name,Sotuvchi nomi
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Soliq va majburiy to&#39;lovlar (Kompaniya valyutasi)
 DocType: Item Group,General Settings,Umumiy sozlamalar
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Valyuta va valyutaga nisbatan bir xil bo&#39;lmaydi
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Instruktorlar qo&#39;shing
 DocType: Stock Entry,Repack,Qaytarib oling
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Davom etishdan oldin anketani saqlashingiz kerak
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Avval Kompaniya-ni tanlang
 DocType: Item Attribute,Numeric Values,Raqamli qiymatlar
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Asosiy joylashtiring
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Kabinetga darajalari
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Kabinetga darajalari
 DocType: Customer,Commission Rate,Komissiya stavkasi
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Variant qiling
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Variant qiling
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bo&#39;lim tomonidan ilovalarni blokirovka qilish.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","To&#39;lov shakli olish, to&#39;lash va ichki to&#39;lovlardan biri bo&#39;lishi kerak"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Tahlillar
@@ -5011,11 +5105,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Sarmoya birjasi
 DocType: Shopping Cart Settings,Show Public Attachments,Ommaviy ilovalarni ko&#39;rsatish
 DocType: Packing Slip,Package Weight Details,Paket Og&#39;irligi haqida ma&#39;lumot
+DocType: Restaurant Reservation,Reservation Time,Rezervasyon muddati
 DocType: Payment Gateway Account,Payment Gateway Account,To&#39;lov shlyuz hisobi
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,"To&#39;lov tugagach, foydalanuvchini tanlangan sahifaga yo&#39;naltirish."
 DocType: Company,Existing Company,Mavjud kompaniya
 DocType: Healthcare Settings,Result Emailed,Elektron pochta orqali natija
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","Soliq kategoriyasi &quot;Hammasi&quot; deb o&#39;zgartirildi, chunki barcha narsalar qimmatli qog&#39;ozlar emas"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Mahsulot kodi&gt; Mahsulot guruhi&gt; Tovar
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,CSV faylini tanlang
 DocType: Student Leave Application,Mark as Present,Mavjud deb belgilash
 DocType: Supplier Scorecard,Indicator Color,Ko&#39;rsatkich rangi
@@ -5040,11 +5136,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Talabalar guruhini yaratish
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Oldinga harakat qilmoqda
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,BOM&#39;dan ma&#39;lumotlar ol
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,BOM&#39;dan ma&#39;lumotlar ol
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Uchrashuv vaqtlari
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},# {0} qatori: joylashtirish sanasi {1} aktivining {1} sotib olish sanasi bilan bir xil bo&#39;lishi kerak
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Talabaning Institut Pansionida istiqomat qilishini tekshiring.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Yuqoridagi jadvalda Savdo buyurtmalarini kiriting
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Yuqoridagi jadvalda Savdo buyurtmalarini kiriting
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Ish haqi noto&#39;g&#39;ri berilmagan
 ,Stock Summary,Qisqacha tavsifi
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Ob&#39;ektni bitta ombordan ikkinchisiga o&#39;tkazish
@@ -5060,5 +5156,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debit yozuvini {1} bilan bog&#39;lash mumkin emas
 DocType: Journal Entry,Subscription Section,Obuna bo&#39;limi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,{0} hisobi mavjud emas
+DocType: Training Event,Training Program,O&#39;quv dasturi
 DocType: Account,Cash,Naqd pul
 DocType: Employee,Short biography for website and other publications.,Veb-sayt va boshqa adabiyotlar uchun qisqacha biografiya.
diff --git a/erpnext/translations/vi.csv b/erpnext/translations/vi.csv
index 47ed610..6ad50b4 100644
--- a/erpnext/translations/vi.csv
+++ b/erpnext/translations/vi.csv
@@ -1,6 +1,6 @@
 DocType: Employee,Salary Mode,Chế độ tiền lương
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,Ghi danh
 DocType: Patient,Divorced,Đa ly dị
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Khoản mục đã được đồng bộ hóa
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Cho phép hàng để được thêm nhiều lần trong một giao dịch
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancel Material Visit {0} before cancelling this Warranty Claim
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Sản phẩm tiêu dùng
@@ -17,12 +17,13 @@
 DocType: Employee,Leave Approvers,Để lại người phê duyệt
 DocType: Sales Partner,Dealer,Đại lý
 DocType: Consultation,Investigations,Điều tra
+DocType: Restaurant Order Entry,Click Enter To Add,Nhấp Enter để Thêm
 DocType: Employee,Rented,Thuê
-DocType: Purchase Order,PO-,tiềm
+DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Áp dụng cho User
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Đơn đặt hàng không thể bị hủy, dẹp bỏ đơn hàng để hủy"
 DocType: Vehicle Service,Mileage,Cước phí
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Bạn có thực sự muốn tháo dỡ tài sản này?
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,Bạn có thực sự muốn tháo dỡ tài sản này?
 DocType: Drug Prescription,Update Schedule,Cập nhật Lịch trình
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Chọn Mặc định Nhà cung cấp
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Tiền tệ là cần thiết cho Danh sách Price {0}
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,Sẵn sàng kiểm tra
 DocType: Job Applicant,Job Applicant,Nộp đơn công việc
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Điều này được dựa trên các giao dịch với nhà cung cấp này. Xem dòng thời gian dưới đây để biết chi tiết
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Không có thêm kết quả.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Hợp lêk
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Thuế loại hình thực tế không thể được liệt kê trong định mức vật tư ở hàng {0}
 DocType: Bank Guarantee,Customer,Khách hàng
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Tỷ giá ngoại tệ phải được giống như {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Tên khách hàng
 DocType: Vehicle,Natural Gas,Khí ga tự nhiên
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Tài khoản ngân hàng không thể được đặt tên là {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Tài khoản ngân hàng không thể được đặt tên là {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Người đứng đầu (hoặc nhóm) đối với các bút toán kế toán được thực hiện và các số dư còn duy trì
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Đặc biệt cho {0} không thể nhỏ hơn không ({1})
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,Không có phiếu lương đã được đệ trình để xử lý.
 DocType: Manufacturing Settings,Default 10 mins,Mặc định 10 phút
 DocType: Leave Type,Leave Type Name,Loại bỏ Tên
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Hiện mở
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Cần phải thực hiện hành động này ngay hôm nay chính nó cho các định kỳ được đề cập ở trên
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Loạt Cập nhật thành công
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Kiểm tra
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Sổ nhật biên kế toán phát sinh đã được đệ trình
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,Tìm mua hàng để trở nhận
 DocType: SMS Center,All Supplier Contact,Tất cả Liên hệ Nhà cung cấp
 DocType: Support Settings,Support Settings,Cài đặt hỗ trợ
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,Ngày dự kiến kết thúc không thể nhỏ hơn Ngày bắt đầu dự kiến
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Ngày dự kiến kết thúc không thể nhỏ hơn Ngày bắt đầu dự kiến
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,hàng # {0}: giá phải giống {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Đơn xin nghỉ phép mới
 ,Batch Item Expiry Status,Tình trạng hết lô hàng
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Hối phiếu ngân hàng
 DocType: Mode of Payment Account,Mode of Payment Account,Phương thức thanh toán Tài khoản
 DocType: Consultation,Consultation,Tư vấn
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Bán hàng và Trả hàng
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Hiện biến thể
 DocType: Academic Term,Academic Term,Thời hạn học tập
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Vật liệu
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Chăm sóc sức khỏe
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Chậm trễ trong thanh toán (Ngày)
 DocType: Lab Prescription,Lab Prescription,Lab Prescription
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Sắp xếp theo Giá
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Chi phí dịch vụ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},Số sê-ri: {0} đã được tham chiếu trong Hóa đơn bán hàng: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,Hóa đơn
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},Số sê-ri: {0} đã được tham chiếu trong Hóa đơn bán hàng: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Hóa đơn
 DocType: Maintenance Schedule Item,Periodicity,Tính tuần hoàn
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Năm tài chính {0} là cần thiết
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Quốc phòng
@@ -91,19 +94,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Hàng # {0}:
 DocType: Timesheet,Total Costing Amount,Tổng chi phí
 DocType: Delivery Note,Vehicle No,Phương tiện số
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,Vui lòng chọn Bảng giá
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Vui lòng chọn Bảng giá
 DocType: Accounts Settings,Currency Exchange Settings,Cài đặt Exchange tiền tệ
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,hàng # {0}: Tài liệu thanh toán là cần thiết để hoàn thành giao dịch
 DocType: Production Order Operation,Work In Progress,Đang trong tiến độ hoàn thành
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Vui lòng chọn ngày
 DocType: Employee,Holiday List,Danh sách kỳ nghỉ
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Vui lòng thiết lập hệ thống đặt tên giảng viên trong trường học&gt; Cài đặt trường học
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Kế toán viên
+DocType: Hub Settings,Selling Price List,Bảng giá bán
 DocType: Patient,Tobacco Current Use,Sử dụng thuốc lá
 DocType: Cost Center,Stock User,Cổ khoản
 DocType: Company,Phone No,Số điện thoại
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Lịch khóa học tạo:
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},New {0}: #{1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},New {0}: #{1}
 ,Sales Partners Commission,Hoa hồng đại lý bán hàng
 DocType: Purchase Invoice,Rounding Adjustment,Điều chỉnh làm tròn
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Tên viết tắt không thể có nhiều hơn 5 ký tự
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,chi tiết tên tài liệu gốc
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Tham khảo: {0}, Mã hàng: {1} và Khách hàng: {2}"
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kg
-DocType: Student Log,Log,Đăng nhập
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Mở đầu cho một công việc.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0} Đã gửi kết quả
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Đã gửi kết quả
 DocType: Item Attribute,Increment,Tăng
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Thời gian
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Chọn nhà kho ...
@@ -135,7 +137,7 @@
 DocType: Patient,Married,Kết hôn
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Không được phép cho {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Lấy dữ liệu từ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},Hàng tồn kho không thể được cập nhật gắn với giấy giao hàng {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},Hàng tồn kho không thể được cập nhật gắn với giấy giao hàng {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Sản phẩm {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Không có mẫu nào được liệt kê
 DocType: Payment Reconciliation,Reconcile,Hòa giải
@@ -145,29 +147,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Quỹ lương hưu
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Kỳ hạn khấu hao tiếp theo không thể trước ngày mua hàng
 DocType: Consultation,Consultation Date,Ngày tham vấn
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Danh sách sản phẩm và khám phá cho người dùng ERPNext
 DocType: SMS Center,All Sales Person,Tất cả nhân viên kd
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Đóng góp hàng tháng ** giúp bạn đóng góp vào Ngân sách/Mục tiêu qua các tháng nếu việc kinh doanh của bạn có tính thời vụ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,Không tìm thấy mặt hàng
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,Cơ cấu tiền lương Thiếu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,Không tìm thấy mặt hàng
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Cơ cấu tiền lương Thiếu
 DocType: Lead,Person Name,Tên người
 DocType: Sales Invoice Item,Sales Invoice Item,Hóa đơn bán hàng hàng
 DocType: Account,Credit,Tín dụng
 DocType: POS Profile,Write Off Cost Center,Viết tắt trung tâm chi phí
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",ví dụ: &quot;Trường Tiểu học&quot; hay &quot;Đại học&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",ví dụ: &quot;Trường Tiểu học&quot; hay &quot;Đại học&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Báo cáo hàng tồn kho
 DocType: Warehouse,Warehouse Detail,Chi tiết kho
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Hạn mức tín dụng đã được thông qua cho khách hàng {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Những ngày cuối kỳ không thể muộn hơn so với ngày cuối năm của năm học mà điều khoản này được liên kết (Năm học {}). Xin vui lòng sửa ngày và thử lại.
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Là Tài Sản Cố Định"" không thể bỏ đánh dấu, vì bản ghi Tài Sản tồn tại đối nghịch với vật liệu"
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Là Tài Sản Cố Định"" không thể bỏ đánh dấu, vì bản ghi Tài Sản tồn tại đối nghịch với vật liệu"
 DocType: Vehicle Service,Brake Oil,dầu phanh
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Khách hàng&gt; Nhóm Khách hàng&gt; Lãnh thổ
 DocType: Tax Rule,Tax Type,Loại thuế
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,Lượng nhập chịu thuế
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Bạn không được phép thêm hoặc cập nhật bút toán trước ngày {0}
 DocType: BOM,Item Image (if not slideshow),Hình ảnh mẫu hàng (nếu không phải là slideshow)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,tên khách hàng đã tồn tại
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tỷ lệ giờ / 60) * Thời gian hoạt động thực tế
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Hàng # {0}: Loại tài liệu tham khảo phải là một trong Yêu cầu bồi thường hoặc Đăng ký tạp chí
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,Chọn BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Hàng # {0}: Loại tài liệu tham khảo phải là một trong Yêu cầu bồi thường hoặc Đăng ký tạp chí
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Chọn BOM
 DocType: SMS Log,SMS Log,Đăng nhập tin nhắn SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Chi phí của mục Delivered
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Các kỳ nghỉ vào {0} không ở giữa 'từ ngày' và 'tới ngày'
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,nhân viên vay
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Nhật ký công việc:
 DocType: Fee Schedule,Send Payment Request Email,Gửi Email yêu cầu thanh toán
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,Mục {0} không tồn tại trong hệ thống hoặc đã hết hạn
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,Mục {0} không tồn tại trong hệ thống hoặc đã hết hạn
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,địa ốc
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Báo cáo cuả  Tài khoản
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Dược phẩm
@@ -210,18 +213,23 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Nhập khẩu Đăng nhập
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Kéo Chất liệu Yêu cầu của loại hình sản xuất dựa trên các tiêu chí trên
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,Đã đăng ký thành công.
 DocType: Training Result Employee,Grade,Cấp
+DocType: Restaurant Table,No of Seats,Số ghế
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Để thêm chủ đề động, hãy sử dụng thẻ jinja như <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Giao By Nhà cung cấp
 DocType: SMS Center,All Contact,Tất cả Liên hệ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,Sản xuất theo thứ tự đã được tạo ra cho tất cả các mục có BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Sản xuất theo thứ tự đã được tạo ra cho tất cả các mục có BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Mức lương hàng năm
 DocType: Daily Work Summary,Daily Work Summary,Tóm tắt công việc hàng ngày
 DocType: Period Closing Voucher,Closing Fiscal Year,Đóng cửa năm tài chính
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0}{1} bị đóng băng
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,Vui lòng chọn Công ty hiện có để tạo biểu đồ của tài khoản
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0}{1} bị đóng băng
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Vui lòng chọn Công ty hiện có để tạo biểu đồ của tài khoản
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Chi phí hàng tồn kho
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Chọn Kho mục tiêu
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Chọn Kho mục tiêu
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Chọn Kho mục tiêu
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Chọn Kho mục tiêu
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Vui lòng nhập Preferred Liên hệ Email
 DocType: Program Enrollment,School Bus,Xe buýt trường học
 DocType: Journal Entry,Contra Entry,Contra nhập
@@ -239,9 +247,10 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Tải file mẫu, điền dữ liệu thích hợp và đính kèm các tập tin sửa đổi.
  Tất cả các ngày và nhân viên kết hợp trong giai đoạn sẽ có trong bản mẫu,  với bản ghi chấm công hiện có"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,Mục {0} không hoạt động hoặc kết thúc của cuộc sống đã đạt tới
+DocType: Student Admission Program,Minimum Age,Tuổi tối thiểu
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Ví dụ: cơ bản Toán học
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Bao gồm thuế hàng {0} trong tỷ lệ khoản, các loại thuế tại hàng {1} cũng phải được thêm vào"
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Cài đặt cho nhân sự Mô-đun
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,Cài đặt cho nhân sự Mô-đun
 DocType: SMS Center,SMS Center,Trung tâm nhắn tin
 DocType: Sales Invoice,Change Amount,thay đổi Số tiền
 DocType: BOM Update Tool,New BOM,Mới BOM
@@ -251,7 +260,7 @@
 DocType: Lead,Request Type,Yêu cầu Loại
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Tạo nhân viên
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Phát thanh truyền hình
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,Thêm phòng
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Chế độ cài đặt POS (Trực tuyến / Ngoại tuyến)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Thực hiện
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Chi tiết về các hoạt động thực hiện.
 DocType: Serial No,Maintenance Status,Tình trạng bảo trì
@@ -274,6 +283,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Bảng giá phải được áp dụng cho mua hàng hoặc bán hàng
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Ngày cài đặt không thể trước ngày giao hàng cho hàng {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Giảm giá Giá Tỷ lệ (%)
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Hóa sinh
 DocType: Offer Letter,Select Terms and Conditions,Chọn Điều khoản và Điều kiện
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,Giá trị hiện
 DocType: Production Planning Tool,Sales Orders,Đơn đặt hàng bán hàng
@@ -308,15 +318,15 @@
 DocType: Sales Partner,Reseller,Đại lý bán lẻ
 DocType: Codification Table,Medical Code,Mã y tế
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Nếu được kiểm tra, sẽ bao gồm các mặt hàng không tồn kho trong các yêu cầu vật liệu."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Vui lòng nhập Công ty
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Vui lòng nhập Công ty
 DocType: Delivery Note Item,Against Sales Invoice Item,Theo hàng hóa có hóa đơn
 ,Production Orders in Progress,Đơn đặt hàng sản xuất trong tiến độ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Tiền thuần từ tài chính
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save","Cục bộ là đầy đủ, không lưu"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","Cục bộ là đầy đủ, không lưu"
 DocType: Lead,Address & Contact,Địa chỉ & Liên hệ
 DocType: Leave Allocation,Add unused leaves from previous allocations,Thêm lá không sử dụng từ phân bổ trước
 DocType: Sales Partner,Partner website,trang web đối tác
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Thêm mục
+DocType: Restaurant Order Entry,Add Item,Thêm mục
 DocType: Lab Test,Custom Result,Kết quả Tuỳ chỉnh
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Tên Liên hệ
 DocType: Course Assessment Criteria,Course Assessment Criteria,Các tiêu chí đánh giá khóa học
@@ -329,7 +339,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Yêu cầu để mua hàng.
 DocType: Lab Test,Submitted Date,Ngày nộp đơn
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Điều này được dựa trên Thời gian biểu  được tạo ra với dự án này
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,Tiền thực trả không thể ít hơn 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Tiền thực trả không thể ít hơn 0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Để ngừng gửi các thông báo lỗi lặp đi lặp lại từ hệ thống, chúng tôi đã kiểm tra trường Tắt trong đăng ký"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Chỉ chọn Để lại phê duyệt có thể gửi ứng dụng Để lại này
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Giảm ngày phải lớn hơn ngày của Tham gia
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Các di dời mỗi năm
@@ -338,9 +349,10 @@
 DocType: Email Digest,Profit & Loss,Mất lợi nhuận
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,lít
 DocType: Task,Total Costing Amount (via Time Sheet),Tổng chi phí (thông qua thời gian biểu)
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Xin vui lòng thiết lập Sinh viên theo Nhóm sinh viên
 DocType: Item Website Specification,Item Website Specification,Mục Trang Thông số kỹ thuật
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Đã chặn việc dời đi
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},Mục {0} đã đạt đến kết thúc của sự sống trên {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Mục {0} đã đạt đến kết thúc của sự sống trên {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,Bút toán Ngân hàng
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Hàng năm
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Mẫu cổ phiếu hòa giải
@@ -349,7 +361,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Nhóm Sinh viên Công cụ tạo khóa học
 DocType: Lead,Do Not Contact,Không Liên hệ
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,Những người giảng dạy tại các tổ chức của bạn
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Id duy nhất để theo dõi tất cả các hoá đơn định kỳ. Nó được tạo ra để duyệt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Phần mềm phát triển
 DocType: Item,Minimum Order Qty,Số lượng đặt hàng tối thiểu
 DocType: Pricing Rule,Supplier Type,Loại nhà cung cấp
@@ -359,17 +370,19 @@
 DocType: Item,Publish in Hub,Xuất bản trong trung tâm
 DocType: Student Admission,Student Admission,Nhập học sinh viên
 ,Terretory,Khu vực
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,Mục {0} bị hủy bỏ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,Yêu cầu nguyên liệu
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,Mục {0} bị hủy bỏ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Yêu cầu nguyên liệu
 DocType: Bank Reconciliation,Update Clearance Date,Cập nhật thông quan ngày
 DocType: Item,Purchase Details,Thông tin chi tiết mua hàng
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Mục {0} không tìm thấy trong &#39;Nguyên liệu Supplied&#39; bảng trong Purchase Order {1}
 DocType: Patient Relation,Relation,Mối quan hệ
 DocType: Shipping Rule,Worldwide Shipping,Vận chuyển trên toàn thế giới
 DocType: Patient Relation,Mother,Mẹ
+DocType: Restaurant Reservation,Reservation End Time,Thời gian Kết thúc Đặt phòng
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Đơn hàng đã được khách xác nhận
 DocType: Purchase Receipt Item,Rejected Quantity,Số lượng bị từ chối
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,Đã tạo yêu cầu thanh toán {0}
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,Đã tạo yêu cầu thanh toán {0}
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Độ nhạy thấp
 DocType: Notification Control,Notification Control,Kiểm soát thông báo
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Vui lòng xác nhận khi bạn đã hoàn thành khóa học
 DocType: Lead,Suggestions,Đề xuất
@@ -389,7 +402,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,trượt email lương cho nhân viên dựa trên email ưa thích lựa chọn trong nhân viên
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Người phê duyệt di dời đầu tiên trong danh sách sẽ được thiết lập như là người phê duyệt di dời mặc định
 DocType: Tax Rule,Shipping County,vận Chuyển trong quận
-apps/erpnext/erpnext/config/desktop.py +158,Learn,Học
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Học
 DocType: Asset,Next Depreciation Date,Kỳ hạn khấu hao tiếp theo
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Chi phí hoạt động cho một nhân viên
 DocType: Accounts Settings,Settings for Accounts,Cài đặt cho tài khoản
@@ -400,13 +413,13 @@
 DocType: Item,Synced With Hub,Đồng bộ hóa Với Hub
 DocType: Vehicle,Fleet Manager,Người quản lý đội tàu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Hàng # {0}: {1} không thể là số âm cho mặt hàng {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,Sai Mật Khẩu
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Sai Mật Khẩu
 DocType: Item,Variant Of,biến thể của
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Đã hoàn thành Số lượng không có thể lớn hơn 'SL đặt Sản xuất'
 DocType: Period Closing Voucher,Closing Account Head,Đóng Trưởng Tài khoản
 DocType: Employee,External Work History,Bên ngoài Quá trình công tác
 DocType: Physician,Time per Appointment,Thời gian cho mỗi cuộc hẹn
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Thông tư tham khảo Lỗi
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Thông tư tham khảo Lỗi
 DocType: Appointment Type,Is Inpatient,Là bệnh nhân nội trú
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Tên Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Trong từ (xuất khẩu) sẽ được hiển thị khi bạn lưu Giao hàng tận nơi Lưu ý.
@@ -415,19 +428,18 @@
 DocType: Lead,Industry,Ngành công nghiệp
 DocType: Employee,Job Profile,Hồ sơ công việc
 DocType: BOM Item,Rate & Amount,Tỷ lệ &amp; Số tiền
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Xin vui lòng thiết lập số cho loạt bài tham dự thông qua Setup&gt; Numbering Series
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Điều này dựa trên các giao dịch đối với Công ty này. Xem dòng thời gian bên dưới để biết chi tiết
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Thông báo qua email trên tạo ra các yêu cầu vật liệu tự động
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Kháng cự
 DocType: Journal Entry,Multi Currency,Đa ngoại tệ
 DocType: Payment Reconciliation Invoice,Invoice Type,Loại hóa đơn
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Khách hàng&gt; Nhóm Khách hàng&gt; Lãnh thổ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Giao hàng Ghi
 DocType: Consultation,Encounter Impression,Gặp Ấn tượng
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Thiết lập Thuế
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Chi phí của tài sản bán
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,Bút toán thanh toán đã được sửa lại sau khi bạn kéo ra. Vui lòng kéo lại 1 lần nữa
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0} Đã nhập hai lần vào Thuế vật tư
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Tóm tắt cho tuần này và các hoạt động cấp phát
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} Đã nhập hai lần vào Thuế vật tư
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Tóm tắt cho tuần này và các hoạt động cấp phát
 DocType: Student Applicant,Admitted,Thừa nhận
 DocType: Workstation,Rent Cost,Chi phí thuê
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Số tiền Sau khi khấu hao
@@ -442,36 +454,35 @@
 DocType: Shipping Rule,Valid for Countries,Hợp lệ cho các nước
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Mục này là một mẫu và không thể được sử dụng trong các giao dịch. Thuộc tính mẫu hàng sẽ được sao chép vào các biến thể trừ  khi'Không sao chép' được thiết lập
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Tổng số đơn hàng được xem xét
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Chỉ định nhân viên (ví dụ: Giám đốc điều hành, Giám đốc vv.)"
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Chỉ định nhân viên (ví dụ: Giám đốc điều hành, Giám đốc vv.)"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tỷ Giá được quy đổi từ tỷ giá của khách hàng về tỷ giá khách hàng chung
 DocType: Course Scheduling Tool,Course Scheduling Tool,Khóa học Lập kế hoạch cụ
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Hàng # {0}: Mua hóa đơn không thể được thực hiện đối với một tài sản hiện có {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[Khẩn cấp] Lỗi trong khi tạo định kỳ% s cho% s
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Khẩn cấp] Lỗi trong khi tạo định kỳ% s cho% s
 DocType: Item Tax,Tax Rate,Thuế suất
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} đã được phân phối cho nhân viên {1} cho kỳ {2} đến {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,Chọn nhiều Item
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Mua hóa đơn {0} đã gửi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Chọn nhiều Item
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,Hóa đơn mua hàng {0} đã gửi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Hàng # {0}:  Số hiệu lô hàng phải giống như {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Chuyển đổi sang non-Group
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Một lô sản phẩm
 DocType: C-Form Invoice Detail,Invoice Date,Hóa đơn ngày
 DocType: GL Entry,Debit Amount,Số tiền ghi nợ
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},Chỉ có thể có 1 tài khoản cho mỗi công ty trong {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,Xin vui lòng xem file đính kèm
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Chỉ có thể có 1 tài khoản cho mỗi công ty trong {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,Xin vui lòng xem file đính kèm
 DocType: Purchase Order,% Received,% đã nhận
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Tạo Sinh viên nhóm
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Đã thiết lập hoàn chỉnh!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Đã thiết lập hoàn chỉnh!
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Số lượng ghi chú tín dụng
 DocType: Setup Progress Action,Action Document,Tài liệu hành động
 ,Finished Goods,Hoàn thành Hàng
 DocType: Delivery Note,Instructions,Hướng dẫn
 DocType: Quality Inspection,Inspected By,Kiểm tra bởi
 DocType: Maintenance Visit,Maintenance Type,Loại bảo trì
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0} - {1} không được ghi danh vào Khóa học {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Mã hàng&gt; Nhóm mặt hàng&gt; Thương hiệu
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} không được ghi danh vào Khóa học {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Không nối tiếp {0} không thuộc về Giao hàng tận nơi Lưu ý {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Thêm mục
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Thêm mục
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Kiểm tra chất lượng sản phẩm Thông số
 DocType: Leave Application,Leave Approver Name,Để lại Tên Người phê duyệt
 DocType: Depreciation Schedule,Schedule Date,Lịch trình ngày
@@ -492,7 +503,7 @@
 DocType: Salary Slip Timesheet,Working Hours,Giờ làm việc
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Thay đổi bắt đầu / hiện số thứ tự của một loạt hiện có.
 DocType: Dosage Strength,Strength,Sức mạnh
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,Tạo một khách hàng mới
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Tạo một khách hàng mới
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Nếu nhiều quy giá tiếp tục chiếm ưu thế, người dùng được yêu cầu để thiết lập ưu tiên bằng tay để giải quyết xung đột."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Tạo đơn đặt hàng mua
 ,Purchase Register,Đăng ký mua
@@ -511,7 +522,7 @@
 DocType: Lab Test Template,Single,DUy nhất
 DocType: Salary Slip,Total Loan Repayment,Tổng số trả nợ
 DocType: Account,Cost of Goods Sold,Chi phí hàng bán
-DocType: Purchase Invoice,Yearly,Hàng năm
+DocType: Subscription,Yearly,Hàng năm
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Vui lòng nhập Bộ phận Chi phí
 DocType: Drug Prescription,Dosage,Liều dùng
 DocType: Journal Entry Account,Sales Order,Đơn đặt hàng
@@ -542,7 +553,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Thiết lập chung cho tất cả quá trình sản xuất.
 DocType: Accounts Settings,Accounts Frozen Upto,Đóng băng tài khoản đến ngày
 DocType: SMS Log,Sent On,Gửi On
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,Thuộc tính {0} được chọn nhiều lần trong Thuộc tính Bảng
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Thuộc tính {0} được chọn nhiều lần trong Thuộc tính Bảng
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,Không áp dụng
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Chủ lễ.
@@ -568,13 +579,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Tổng số nghỉ phép được phân bổ là bắt buộc
 DocType: Patient,AB Positive,AB Tích cực
 DocType: Job Opening,Description of a Job Opening,Mô tả công việc một Opening
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Hoạt động cấp phát cho ngày hôm nay
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,Hoạt động cấp phát cho ngày hôm nay
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Kỷ lục tham dự.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Phần lương cho bảng thời gian biểu dựa trên bảng lương
 DocType: Sales Order Item,Used for Production Plan,Sử dụng cho kế hoạch sản xuất
 DocType: Employee Loan,Total Payment,Tổng tiền thanh toán
 DocType: Manufacturing Settings,Time Between Operations (in mins),Thời gian giữa các thao tác (bằng phút)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1} đã được hủy nên thao tác không thể hoàn thành
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1} đã được hủy nên thao tác không thể hoàn thành
 DocType: Customer,Buyer of Goods and Services.,Người mua hàng hoá và dịch vụ.
 DocType: Journal Entry,Accounts Payable,Tài khoản Phải trả
 DocType: Patient,Allergies,Dị ứng
@@ -586,23 +597,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Lệnh mua hàng cảnh báo
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,lên danh sách một vài khách hàng của bạn. Họ có thể là các tổ chức hoặc cá nhân
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Phần đủ để xây dựng
+DocType: POS Profile User,POS Profile User,Người dùng Hồ sơ POS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Thu nhập trực tiếp
 DocType: Patient Appointment,Date TIme,Ngày giờ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Không thể lọc dựa trên tài khoản, nếu nhóm theo tài khoản"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Nhân viên hành chính
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Vui lòng chọn Khoá học
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,Vui lòng chọn Khoá học
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Vui lòng chọn Khoá học
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Vui lòng chọn Khoá học
 DocType: Codification Table,Codification Table,Bảng mã hoá
 DocType: Timesheet Detail,Hrs,giờ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Vui lòng chọn Công ty
 DocType: Stock Entry Detail,Difference Account,Tài khoản chênh lệch
 DocType: Purchase Invoice,Supplier GSTIN,Mã số nhà cung cấp
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Không thể nhiệm vụ gần như là nhiệm vụ của nó phụ thuộc {0} là không đóng cửa.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,Vui lòng nhập kho mà Chất liệu Yêu cầu sẽ được nâng lên
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Không thể nhiệm vụ gần như là nhiệm vụ của nó phụ thuộc {0} là không đóng cửa.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Vui lòng nhập kho mà Chất liệu Yêu cầu sẽ được nâng lên
 DocType: Production Order,Additional Operating Cost,Chi phí điều hành khác
 DocType: Lab Test Template,Lab Routine,Lab Routine
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Mỹ phẩm
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items","Để Sáp nhập, tài sản sau đây phải giống nhau cho cả hai mục"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Để Sáp nhập, tài sản sau đây phải giống nhau cho cả hai mục"
 DocType: Shipping Rule,Net Weight,Trọng lượng tịnh
 DocType: Employee,Emergency Phone,Điện thoại khẩn cấp
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Mua
@@ -613,7 +625,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Vui lòng xác định mức cho ngưỡng 0%
 DocType: Sales Order,To Deliver,Giao Hàng
 DocType: Purchase Invoice Item,Item,Hạng mục
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,Nối tiếp không có mục không thể là một phần
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Độ nhạy cao
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Nối tiếp không có mục không thể là một phần
 DocType: Journal Entry,Difference (Dr - Cr),Sự khác biệt (Tiến sĩ - Cr)
 DocType: Account,Profit and Loss,Báo cáo kết quả hoạt động kinh doanh
 DocType: Patient,Risk Factors,Các yếu tố rủi ro
@@ -622,7 +635,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Quản lý Hợp đồng phụ
 DocType: Vital Signs,Body Temperature,Thân nhiệt
 DocType: Project,Project will be accessible on the website to these users,Dự án sẽ có thể truy cập vào các trang web tới những người sử dụng
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,Xác định loại Dự án.
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Xác định loại Dự án.
 DocType: Supplier Scorecard,Weighting Function,Chức năng Trọng lượng
 DocType: Physician,OP Consulting Charge,OP phí tư vấn
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,Thiết lập
@@ -636,7 +649,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Tăng không thể là 0
 DocType: Production Planning Tool,Material Requirement,Yêu cầu  nguyên liệu
 DocType: Company,Delete Company Transactions,Xóa Giao dịch Công ty
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,Số tham khảo và Kỳ hạn tham khảo là bắt buộc đối với giao dịch ngân hàng
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,Số tham khảo và Kỳ hạn tham khảo là bắt buộc đối với giao dịch ngân hàng
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Thêm / Sửa Thuế và phí
 DocType: Payment Entry Reference,Supplier Invoice No,Nhà cung cấp hóa đơn Không
 DocType: Territory,For reference,Để tham khảo
@@ -644,21 +657,21 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Không thể xóa số Seri {0}, vì nó được sử dụng trong các giao dịch hàng tồn kho"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Đóng cửa (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,xin chào
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Di chuyển mục
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,Di chuyển mục
 DocType: Serial No,Warranty Period (Days),Thời gian bảo hành (ngày)
 DocType: Installation Note Item,Installation Note Item,Lưu ý cài đặt hàng
 DocType: Production Plan Item,Pending Qty,Số lượng cấp phát
 DocType: Budget,Ignore,Bỏ qua
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} không hoạt động
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} không hoạt động
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,kích thước thiết lập kiểm tra cho in ấn
 DocType: Salary Slip,Salary Slip Timesheet,Bảng phiếu lương
-apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Nhà cung cấp kho bắt buộc đối với thầu phụ mua hóa đơn
+apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Kho nhà cung cấp là bắt buộc đối với Hóa đơn mua hàng thầu phụ
 DocType: Pricing Rule,Valid From,Từ hợp lệ
 DocType: Sales Invoice,Total Commission,Tổng tiền Hoa hồng
 DocType: Pricing Rule,Sales Partner,Đại lý bán hàng
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Tất cả phiếu ghi của Nhà cung cấp.
 DocType: Buying Settings,Purchase Receipt Required,Hóa đơn mua hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Tỷ lệ đánh giá là bắt buộc nếu cổ phiếu mở đã được nhập vào
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,Tỷ lệ đánh giá là bắt buộc nếu cổ phiếu mở đã được nhập vào
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Không cóbản ghi được tìm thấy trong bảng hóa đơn
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Vui lòng chọn Công ty và Đảng Loại đầu tiên
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Năm tài chính / kế toán.
@@ -695,7 +708,7 @@
 DocType: Quotation,Quotation To,định giá tới
 DocType: Lead,Middle Income,Thu nhập trung bình
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Mở (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Mặc định Đơn vị đo lường cho mục {0} không thể thay đổi trực tiếp bởi vì bạn đã thực hiện một số giao dịch (s) với Ươm khác. Bạn sẽ cần phải tạo ra một khoản mới để sử dụng một định Ươm khác nhau.
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Mặc định Đơn vị đo lường cho mục {0} không thể thay đổi trực tiếp bởi vì bạn đã thực hiện một số giao dịch (s) với Ươm khác. Bạn sẽ cần phải tạo ra một khoản mới để sử dụng một định Ươm khác nhau.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Số lượng phân bổ không thể phủ định
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Hãy đặt Công ty
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Hãy đặt Công ty
@@ -710,6 +723,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Chọn tài khoản thanh toán để làm cho Ngân hàng nhập
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Tạo hồ sơ nhân viên để quản lý lá, tuyên bố chi phí và biên chế"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Thời kỳ Kê toa
+DocType: Restaurant Reservation,Restaurant Reservation,Đặt phòng khách sạn
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Đề nghị Viết
 DocType: Payment Entry Deduction,Payment Entry Deduction,Bút toán thanh toán khấu trừ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Nhân viên kd {0} đã tồn tại
@@ -717,7 +731,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Chủ
 DocType: Assessment Plan,Maximum Assessment Score,Điểm đánh giá tối đa
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Ngày giao dịch Cập nhật Ngân hàng
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,theo dõi thời gian
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,theo dõi thời gian
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,ĐƠN XEM CHO TRANSPORTER
 DocType: Fiscal Year Company,Fiscal Year Company,Công ty tài chính Năm
 DocType: Packing Slip Item,DN Detail,DN chi tiết
@@ -726,8 +740,9 @@
 DocType: Batch,Batch Description,Mô tả Lô hàng
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Tạo nhóm sinh viên
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Tạo nhóm sinh viên
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.","Cổng thanh toán tài khoản không được tạo ra, hãy tạo một cách thủ công."
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Cổng thanh toán tài khoản không được tạo ra, hãy tạo một cách thủ công."
 DocType: Supplier Scorecard,Per Year,Mỗi năm
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Không đủ điều kiện tham gia vào chương trình này theo DOB
 DocType: Sales Invoice,Sales Taxes and Charges,Thuế bán hàng và lệ phí
 DocType: Employee,Organization Profile,Hồ sơ Tổ chức
 DocType: Vital Signs,Height (In Meter),Chiều cao (In Meter)
@@ -763,7 +778,7 @@
 DocType: Student Batch Name,Batch Name,Tên đợt hàng
 DocType: Fee Validity,Max number of visit,Số lần truy cập tối đa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Thời gian biểu  đã tạo:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},Xin vui lòng thiết lập mặc định hoặc tiền trong tài khoản ngân hàng Phương thức thanh toán {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},Xin vui lòng thiết lập mặc định hoặc tiền trong tài khoản ngân hàng Phương thức thanh toán {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,Ghi danh
 DocType: GST Settings,GST Settings,Cài đặt GST
 DocType: Selling Settings,Customer Naming By,đặt tên khách hàng theo
@@ -795,16 +810,16 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Thuế Chi phí hạ cánh và Lệ phí
 DocType: Production Order Operation,Actual Start Time,Thời điểm bắt đầu thực tế
 DocType: BOM Operation,Operation Time,Thời gian hoạt động
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,Hoàn thành
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,Hoàn thành
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,Cơ sở
 DocType: Timesheet,Total Billed Hours,Tổng số giờ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,Viết Tắt Số tiền
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Viết Tắt Số tiền
 DocType: Leave Block List Allow,Allow User,Cho phép tài
 DocType: Journal Entry,Bill No,Hóa đơn số
 DocType: Company,Gain/Loss Account on Asset Disposal,TK Lãi/Lỗ thanh lý tài sản
 DocType: Vehicle Log,Service Details,Chi tiết dịch vụ
 DocType: Vehicle Log,Service Details,Chi tiết dịch vụ
-DocType: Purchase Invoice,Quarterly,Quý
+DocType: Subscription,Quarterly,Quý
 DocType: Lab Test Template,Grouped,Nhóm
 DocType: Selling Settings,Delivery Note Required,Lưu ý giao hàng được yêu cầu
 DocType: Bank Guarantee,Bank Guarantee Number,Số bảo lãnh ngân hàng
@@ -814,12 +829,12 @@
 DocType: Student Attendance,Student Attendance,Tham dự sinh
 DocType: Sales Invoice Timesheet,Time Sheet,Thời gian biểu
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Súc rửa nguyên liệu thô được dựa vào
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,Xin vui lòng nhập các chi tiết sản phẩm
 DocType: Interest,Interest,Quan tâm
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre Sales
 DocType: Purchase Receipt,Other Details,Các chi tiết khác
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Lab Test,Test Template,Mẫu thử nghiệm
+DocType: Restaurant Order Entry Item,Served,Phục vụ
 DocType: Account,Accounts,Tài khoản kế toán
 DocType: Vehicle,Odometer Value (Last),Giá trị đo đường (cuối)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Mẫu tiêu chí của nhà cung cấp thẻ điểm.
@@ -831,26 +846,28 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,Xem trước bảng lương
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Tài khoản {0} đã được nhập nhiều lần
 DocType: Account,Expenses Included In Valuation,Chi phí bao gồm trong định giá
-DocType: Hub Settings,Seller City,Người bán Thành phố
 ,Absent Student Report,Báo cáo Sinh viên vắng mặt
 DocType: Email Digest,Next email will be sent on:,Email tiếp theo sẽ được gửi vào:
 DocType: Offer Letter Term,Offer Letter Term,Hạn thư mời
 DocType: Supplier Scorecard,Per Week,Mỗi tuần
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,Mục có các biến thể.
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,Mục có các biến thể.
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Tổng số sinh viên
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Mục {0} không tìm thấy
 DocType: Bin,Stock Value,Giá trị tồn
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,Hồ sơ lệ phí sẽ được tạo ra trong nền. Trong trường hợp có lỗi nào thì thông báo lỗi sẽ được cập nhật trong Schedule.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Công ty {0} không tồn tại
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0} có giá trị lệ phí đến {1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} có giá trị lệ phí đến {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Loại cây biểu thị
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Số lượng tiêu thụ trung bình mỗi đơn vị
 DocType: Serial No,Warranty Expiry Date,Ngày Bảo hành hết hạn
 DocType: Material Request Item,Quantity and Warehouse,Số lượng và kho
+DocType: Hub Settings,Unregister,Hủy đăng ký
 DocType: Sales Invoice,Commission Rate (%),Hoa hồng Tỷ lệ (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Vui lòng chọn Chương trình
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,Vui lòng chọn Chương trình
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Vui lòng chọn Chương trình
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Vui lòng chọn Chương trình
 DocType: Project,Estimated Cost,Chi phí ước tính
 DocType: Purchase Order,Link to material requests,Liên kết để yêu cầu tài liệu
+DocType: Hub Settings,Publish,Công bố
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Hàng không vũ trụ
 DocType: Journal Entry,Credit Card Entry,Thẻ tín dụng nhập
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Công ty và các tài khoản
@@ -861,13 +878,12 @@
 DocType: Selling Settings,Close Opportunity After Days,Đóng Opportunity Sau ngày
 ,Reserved,Ltd
 DocType: Purchase Order,Supply Raw Materials,Cung cấp Nguyên liệu thô
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Ngày danh đơn tiếp theo được lập sẽ được duyệt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Tài sản ngắn hạn
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} không phải là 1 vật liệu tồn kho
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',Vui lòng chia sẻ phản hồi của bạn cho buổi tập huấn bằng cách nhấp vào &#39;Phản hồi đào tạo&#39; và sau đó &#39;Mới&#39;
 DocType: Mode of Payment Account,Default Account,Tài khoản mặc định
 DocType: Payment Entry,Received Amount (Company Currency),Số tiền nhận được (Công ty ngoại tệ)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,Lead phải được thiết lập nếu Cơ hội được tạo từ Lead
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,Lead phải được thiết lập nếu Cơ hội được tạo từ Lead
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Vui lòng chọn ngày nghỉ hàng tuần
 DocType: Patient,O Negative,O tiêu cực
 DocType: Production Order Operation,Planned End Time,Thời gian  kết thúc kế hoạch
@@ -883,10 +899,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Năng lượng
 DocType: Opportunity,Opportunity From,CƠ hội từ
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Báo cáo tiền lương hàng tháng.
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,Thêm công ty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Hàng {0}: {1} Số sêri cần có cho mục {2}. Bạn đã cung cấp {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Hàng {0}: {1} Số sêri cần có cho mục {2}. Bạn đã cung cấp {3}.
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Vui lòng chọn một bảng
 DocType: BOM,Website Specifications,Thông số kỹ thuật website
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0} là địa chỉ email không hợp lệ trong &#39;Người nhận&#39;
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} là địa chỉ email không hợp lệ trong &#39;Người nhận&#39;
 DocType: Special Test Items,Particulars,Các chi tiết
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Kháng sinh.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Từ {0} của loại {1}
@@ -894,11 +910,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Hàng {0}: Nhân tố chuyển đổi là bắt buộc
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Nhiều quy Giá tồn tại với cùng một tiêu chuẩn, xin vui lòng giải quyết xung đột bằng cách gán ưu tiên. Nội quy Giá: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,Không thể tắt hoặc hủy bỏ BOM như nó được liên kết với BOMs khác
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,Không thể tắt hoặc hủy bỏ BOM như nó được liên kết với BOMs khác
 DocType: Opportunity,Maintenance,Bảo trì
 DocType: Item Attribute Value,Item Attribute Value,GIá trị thuộc tính mẫu hàng
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Các chiến dịch bán hàng.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,Tạo thời gian biểu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Tạo thời gian biểu
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -936,12 +952,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Vui lòng nhập mục đầu tiên
 DocType: Account,Liability,Trách nhiệm
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Số tiền bị xử phạt không thể lớn hơn so với yêu cầu bồi thường Số tiền trong Row {0}.
+DocType: Salary Detail,Do not include in total,Không bao gồm trong tổng số
 DocType: Company,Default Cost of Goods Sold Account,Mặc định Chi phí tài khoản hàng bán
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,Danh sách giá không được chọn
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Danh sách giá không được chọn
 DocType: Employee,Family Background,Gia đình nền
 DocType: Request for Quotation Supplier,Send Email,Gởi thư
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Cảnh báo: Tập tin đính kèm {0} ko hợp lệ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,Không quyền hạn
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Cảnh báo: Tập tin đính kèm {0} ko hợp lệ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Không quyền hạn
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Yêu cầu được yêu cầu
 DocType: Vital Signs,Heart Rate / Pulse,Nhịp tim / Pulse
 DocType: Company,Default Bank Account,Tài khoản Ngân hàng mặc định
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Để lọc dựa vào Đối tác, chọn loại đối tác đầu tiên"
@@ -969,12 +987,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Dãy mẫu vật {idx}: {DOCTYPE} {DOCNAME} không tồn tại trên '{DOCTYPE}' bảng
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,thời gian biểu{0} đã được hoàn thành hoặc bị hủy bỏ
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,không nhiệm vụ
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Các ngày trong tháng mà danh đơn tự động sẽ được tạo ra ví dụ như 05, 28 vv"
 DocType: Item Variant Settings,Copy Fields to Variant,Sao chép trường sang biến thể
 DocType: Asset,Opening Accumulated Depreciation,Mở Khấu hao lũy kế
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Điểm số phải nhỏ hơn hoặc bằng 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Chương trình Công cụ ghi danh
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C - Bản ghi mẫu
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C - Bản ghi mẫu
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Khách hàng và Nhà cung cấp
 DocType: Email Digest,Email Digest Settings,Thiết lập mục Email nhắc việc
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Cảm ơn vì công việc kinh doanh của bạn !
@@ -992,13 +1009,13 @@
 DocType: Request for Quotation Supplier,Quote Status,Trạng thái xác nhận
 DocType: Maintenance Visit,Completion Status,Tình trạng hoàn thành
 DocType: HR Settings,Enter retirement age in years,Nhập tuổi nghỉ hưu trong năm
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Mục tiêu kho
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,Vui lòng chọn kho
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Mục tiêu kho
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Vui lòng chọn kho
 DocType: Cheque Print Template,Starting location from left edge,Bắt đầu từ vị trí từ cạnh trái
 DocType: Item,Allow over delivery or receipt upto this percent,Cho phép trên giao nhận tối đa tỷ lệ này
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Nhập khẩu tham dự
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Tất cả các nhóm hàng
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Tất cả các nhóm hàng
 DocType: Process Payroll,Activity Log,Nhật ký hoạt động
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Lợi nhuận ròng / lỗ
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Tự động soạn tin nhắn trên trình giao dịch.
@@ -1010,14 +1027,15 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,SL của Dự án
 DocType: Sales Invoice,Payment Due Date,Thanh toán đáo hạo
 DocType: Drug Prescription,Interval UOM,Interval UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,Biến thể mẫu hàng {0} đã tồn tại với cùng một thuộc tính
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Biến thể mẫu hàng {0} đã tồn tại với cùng một thuộc tính
+DocType: Item,Hub Publishing Details,Chi tiết Xuất bản Trung tâm
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening','Đang mở'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Mở để làm
 DocType: Notification Control,Delivery Note Message,Tin nhắn lưu ý cho việc giao hàng
 DocType: Lab Test Template,Result Format,Định dạng kết quả
 DocType: Expense Claim,Expenses,Chi phí
 DocType: Item Variant Attribute,Item Variant Attribute,Thuộc tính biến thể mẫu hàng
-,Purchase Receipt Trends,Xu hướng mua hóa đơn
+,Purchase Receipt Trends,Xu hướng hóa đơn mua hàng
 DocType: Process Payroll,Bimonthly,hai tháng một lần
 DocType: Vehicle Service,Brake Pad,đệm phanh
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Research & Development,Nghiên cứu & Phát triể
@@ -1030,10 +1048,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: Nguyên liệu thô không thể giống với mặt hàng chính
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Tổng phí tại biên lai mua các mẫu hàng phải giống như tổng các loại thuế và phí
 DocType: Sales Team,Incentives,Ưu đãi
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Đăng ký Hub
 DocType: SMS Log,Requested Numbers,Số yêu cầu
 DocType: Production Planning Tool,Only Obtain Raw Materials,Chỉ Lấy Nguyên liệu thô
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Đánh giá hiệu quả.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Bật &#39;Sử dụng cho Giỏ hàng &quot;, như Giỏ hàng được kích hoạt và phải có ít nhất một Rule thuế cho Giỏ hàng"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Bật &#39;Sử dụng cho Giỏ hàng &quot;, như Giỏ hàng được kích hoạt và phải có ít nhất một Rule thuế cho Giỏ hàng"
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Bút toán thanh toán {0} được liên với thứ tự {1}, kiểm tra xem nó nên được kéo như trước trong hóa đơn này."
 DocType: Sales Invoice Item,Stock Details,Chi tiết hàng tồn kho
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Giá trị dự án
@@ -1052,15 +1071,17 @@
 DocType: Salary Slip,Working Days,Ngày làm việc
 DocType: Serial No,Incoming Rate,Tỷ lệ đến
 DocType: Packing Slip,Gross Weight,Tổng trọng lượng
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,Tên của công ty bạn đang thiết lập hệ thống này.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Kích hoạt Hub
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,Tên của công ty bạn đang thiết lập hệ thống này.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Bao gồm các ngày lễ trong Tổng số. của các ngày làm việc
 DocType: Job Applicant,Hold,tổ chức
 DocType: Employee,Date of Joining,ngày gia nhập
 DocType: Naming Series,Update Series,Cập nhật sê ri
 DocType: Supplier Quotation,Is Subcontracted,Được ký hợp đồng phụ
+DocType: Restaurant Table,Minimum Seating,Ghế tối thiểu
 DocType: Item Attribute,Item Attribute Values,Các giá trị thuộc tính mẫu hàng
 DocType: Examination Result,Examination Result,Kết quả kiểm tra
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Mua hóa đơn
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Hóa đơn mua hàng
 ,Received Items To Be Billed,Những mẫu hàng nhận được để lập hóa đơn
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Submitted Salary Slips,Trượt chân Mức lương nộp
 apps/erpnext/erpnext/config/accounts.py +311,Currency exchange rate master.,Tổng tỷ giá hối đoái.
@@ -1068,13 +1089,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Không thể tìm khe thời gian trong {0} ngày tới cho hoạt động {1}
 DocType: Production Order,Plan material for sub-assemblies,Lên nguyên liệu cho các lần lắp ráp phụ
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Đại lý bán hàng và địa bàn
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0} phải hoạt động
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0} phải hoạt động
 DocType: Journal Entry,Depreciation Entry,Nhập Khấu hao
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Hãy chọn các loại tài liệu đầu tiên
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Hủy bỏ {0} thăm Vật liệu trước khi hủy bỏ bảo trì đăng nhập này
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Không nối tiếp {0} không thuộc về hàng {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Số lượng yêu cầu
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,Các kho hàng với giao dịch hiện tại không thể được chuyển đổi sang sổ cái.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Các kho hàng với giao dịch hiện tại không thể được chuyển đổi sang sổ cái.
 DocType: Bank Reconciliation,Total Amount,Tổng số
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Xuất bản Internet
 DocType: Prescription Duration,Number,Con số
@@ -1085,7 +1106,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Danh sách bán hàng giá
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Nếu được chọn, một khách hàng sẽ được tạo, được ánh xạ tới Bệnh nhân. Hoá đơn Bệnh nhân sẽ được tạo ra đối với Khách hàng này. Bạn cũng có thể chọn Khách hàng hiện tại trong khi tạo Bệnh nhân."
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Xuất bản để đồng bộ các hạng mục
 DocType: Bank Reconciliation,Account Currency,Tiền tệ Tài khoản
 DocType: Lab Test,Sample ID,ID mẫu
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,Xin đề cập đến Round tài khoản tại Công ty Tắt
@@ -1094,11 +1114,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Nhân viên {0} không hoạt động hoặc không tồn tại
 DocType: Fee Structure,Components,Các thành phần
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},Vui lòng nhập loại tài sản trong mục {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,Các biến thể mục {0} cập nhật
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Các biến thể mục {0} cập nhật
 DocType: Quality Inspection Reading,Reading 6,Đọc 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,Không thể {0} {1} {2} không có bất kỳ hóa đơn xuất sắc tiêu cực
-DocType: Purchase Invoice Advance,Purchase Invoice Advance,Mua hóa đơn cao cấp
-DocType: Hub Settings,Sync Now,Bây giờ Sync
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this","được tạo ra. Nếu bị trì hoãn, bạn sẽ phải thay đổi thủ công trường &quot;Lặp lại vào ngày của tháng&quot; trong trường hợp này"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,Không thể {0} {1} {2} không có bất kỳ hóa đơn xuất sắc tiêu cực
+DocType: Purchase Invoice Advance,Purchase Invoice Advance,Hóa đơn mua hàng cao cấp
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Hàng {0}: lối vào tín dụng không thể được liên kết với một {1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Xác định ngân sách cho năm tài chính.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Ngân hàng mặc định/ TK tiền mặt sẽ được tự động cập nhật trên hóa đơn của điểm bán hàng POS khi chế độ này được chọn.
@@ -1108,15 +1129,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +47,The Brand,Thương hiệu
 DocType: Employee,Exit Interview Details,Chi tiết thoát Phỏng vấn
 DocType: Item,Is Purchase Item,Là mua hàng
-DocType: Asset,Purchase Invoice,Mua hóa đơn
+DocType: Asset,Purchase Invoice,Hóa đơn mua hàng
 DocType: Stock Ledger Entry,Voucher Detail No,Chứng từ chi tiết số
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,Hóa đơn bán hàng mới
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Hóa đơn bán hàng mới
 DocType: Stock Entry,Total Outgoing Value,Tổng giá trị ngoài
 DocType: Physician,Appointments,Các cuộc hẹn
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Khai mạc Ngày và ngày kết thúc nên trong năm tài chính tương tự
 DocType: Lead,Request for Information,Yêu cầu thông tin
 ,LeaderBoard,Bảng thành tích
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,Đồng bộ hóa offline Hoá đơn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Đồng bộ hóa offline Hoá đơn
 DocType: Payment Request,Paid,Đã trả
 DocType: Program Fee,Program Fee,Phí chương trình
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1135,11 +1156,12 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Mua hàng mục
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Thu nhập gián tiếp
 DocType: Student Attendance Tool,Student Attendance Tool,Công cụ điểm danh sinh viên
+DocType: Restaurant Menu,Price List (Auto created),Bảng Giá (Tự động tạo ra)
 DocType: Cheque Print Template,Date Settings,Cài đặt ngày
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,phương sai
 ,Company Name,Tên công ty
 DocType: SMS Center,Total Message(s),Tổng số tin nhắn (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,Chọn mục Chuyển giao
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Chọn mục Chuyển giao
 DocType: Purchase Invoice,Additional Discount Percentage,Tỷ lệ giảm giá bổ sung
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Xem danh sách tất cả các video giúp đỡ
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Chọn đầu tài khoản của ngân hàng nơi kiểm tra đã được gửi.
@@ -1157,6 +1179,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Mét
 DocType: Workstation,Electricity Cost,Chi phí điện
 DocType: HR Settings,Don't send Employee Birthday Reminders,Không gửi nhân viên sinh Nhắc nhở
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Lưu các thiết lập
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,Yêu cầu Sản phẩm
 DocType: Item,Inspection Criteria,Tiêu chuẩn kiểm tra
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Nhận chuyển nhượng
 DocType: BOM Website Item,BOM Website Item,Mẫu hàng Website BOM
@@ -1174,11 +1198,11 @@
 DocType: Journal Entry,Total Amount in Words,Tổng tiền bằng chữ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Có một lỗi.Có thể là là bạn đã không lưu mẫu đơn. Vui lòng liên hệ support@erpnext.com nếu rắc rối vẫn tồn tại.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Giỏ hàng
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Loại thứ tự phải là một trong {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Loại thứ tự phải là một trong {0}
 DocType: Lead,Next Contact Date,Ngày Liên hệ Tiếp theo
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Số lượng mở đầu
 DocType: Healthcare Settings,Appointment Reminder,Nhắc nhở bổ nhiệm
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,Vui lòng nhập tài khoản để thay đổi Số tiền
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,Vui lòng nhập tài khoản để thay đổi Số tiền
 DocType: Student Batch Name,Student Batch Name,Tên sinh viên hàng loạt
 DocType: Consultation,Doctor,Bác sĩ
 DocType: Holiday List,Holiday List Name,Tên Danh Sách Kỳ Nghỉ
@@ -1186,12 +1210,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,lịch học
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Tùy chọn hàng tồn kho
 DocType: Journal Entry Account,Expense Claim,Chi phí bồi thường
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Bạn có thực sự muốn khôi phục lại tài sản bị tháo dỡ này?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},Số lượng cho {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,Bạn có thực sự muốn khôi phục lại tài sản bị tháo dỡ này?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Số lượng cho {0}
 DocType: Leave Application,Leave Application,Để lại ứng dụng
 DocType: Patient,Patient Relation,Quan hệ Bệnh nhân
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Công cụ để phân bổ
+DocType: Item,Hub Category to Publish,Danh mục Hub để Xuất bản
 DocType: Leave Block List,Leave Block List Dates,Để lại các kỳ hạn cho danh sách chặn
+DocType: Sales Invoice,Billing Address GSTIN,Địa chỉ thanh toán GSTIN
 DocType: Workstation,Net Hour Rate,Tỷ giá giờ thuần
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Hóa đơn mua hàng chi phí hạ cánh
 DocType: Company,Default Terms,Mặc định khoản
@@ -1201,11 +1227,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Vui lòng ghi rõ {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Các mục gỡ bỏ không có thay đổi về số lượng hoặc giá trị.
 DocType: Delivery Note,Delivery To,Để giao hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,Bảng thuộc tính là bắt buộc
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Bảng thuộc tính là bắt buộc
 DocType: Production Planning Tool,Get Sales Orders,Chọn đơn đặt hàng
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} không được âm
 DocType: Training Event,Self-Study,Tự học
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,Giảm giá
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Giảm giá
 DocType: Asset,Total Number of Depreciations,Tổng Số khấu hao
 DocType: Sales Invoice Item,Rate With Margin,Tỷ lệ chênh lệch
 DocType: Sales Invoice Item,Rate With Margin,Tỷ lệ Giãn
@@ -1213,10 +1239,10 @@
 DocType: Task,Urgent,Khẩn cấp
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},Hãy xác định một ID Row hợp lệ cho {0} hàng trong bảng {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Không thể tìm thấy biến:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,Vui lòng chọn một trường để chỉnh sửa từ numpad
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Vui lòng chọn một trường để chỉnh sửa từ numpad
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Tới màn h ình nền và bắt đầu sử dụng ERPNext
 DocType: Item,Manufacturer,Nhà sản xuất
-DocType: Landed Cost Item,Purchase Receipt Item,Mua hóa đơn hàng
+DocType: Landed Cost Item,Purchase Receipt Item,Mục hóa đơn mua hàng
 DocType: Purchase Receipt,PREC-RET-,Prec-RET-
 DocType: POS Profile,Sales Invoice Payment,Thanh toán hóa đơn bán hàng
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,tồn kho dự trữ cho đơn hàng / SP hoàn thành
@@ -1244,8 +1270,8 @@
 DocType: GL Entry,Against,Chống lại
 DocType: Item,Default Selling Cost Center,Bộ phận chi phí bán hàng mặc định
 DocType: Sales Partner,Implementation Partner,Đối tác thực hiện
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,Mã Bưu Chính
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},Đơn hàng {0} là {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Mã Bưu Chính
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Đơn hàng {0} là {1}
 DocType: Opportunity,Contact Info,Thông tin Liên hệ
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Làm Bút toán tồn kho
 DocType: Packing Slip,Net Weight UOM,Trọng lượng  tịnh UOM
@@ -1256,6 +1282,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Nhận ngày nghỉ hàng tuần
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Ngày kết thúc không thể nhỏ hơn Bắt đầu ngày
 DocType: Sales Person,Select company name first.,Chọn tên công ty đầu tiên.
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Thấp đến cao
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Báo giá nhận được từ nhà cung cấp.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Thay thế Hội đồng quản trị và cập nhật giá mới nhất trong tất cả các BOMs
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},Để {0} | {1} {2}
@@ -1276,7 +1303,7 @@
 DocType: Program Enrollment,Transportation,Vận chuyển
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Thuộc tính không hợp lệ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1} phải được đệ trình
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Số lượng phải nhỏ hơn hoặc bằng {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},Số lượng phải nhỏ hơn hoặc bằng {0}
 DocType: SMS Center,Total Characters,Tổng số chữ
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},Vui lòng chọn BOM BOM trong lĩnh vực cho hàng {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C- Mẫu hóa đơn chi tiết
@@ -1291,7 +1318,7 @@
 ,Ordered Items To Be Billed,Các mặt hàng đã đặt hàng phải được thanh toán
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Từ Phạm vi có thể ít hơn Để Phạm vi
 DocType: Global Defaults,Global Defaults,Mặc định toàn cầu
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,Lời mời hợp tác dự án
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Lời mời hợp tác dự án
 DocType: Salary Slip,Deductions,Các khoản giảm trừ
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Tên hành động
@@ -1309,13 +1336,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Hóa đơn bán hàng trước
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Không có gì để yêu cầu
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Một kỷ lục Ngân sách &#39;{0}&#39; đã tồn tại đối với {1} {2} &#39;cho năm tài chính {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','Ngày Bắt đầu Thực tế' không thể sau 'Ngày Kết thúc Thực tế'
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','Ngày Bắt đầu Thực tế' không thể sau 'Ngày Kết thúc Thực tế'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Quản lý
 DocType: Cheque Print Template,Payer Settings,Cài đặt người trả tiền
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Điều này sẽ được nối thêm vào các mã hàng của các biến thể. Ví dụ, nếu bạn viết tắt là ""SM"", và các mã hàng là ""T-shirt"", các mã hàng của các biến thể sẽ là ""T-shirt-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Tiền thực phải trả (bằng chữ) sẽ hiện ra khi bạn lưu bảng lương
 DocType: Purchase Invoice,Is Return,Là trả lại
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,Cảnh cáo
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Cảnh cáo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Trả về /Ghi chú nợ
 DocType: Price List Country,Price List Country,Giá Danh sách Country
 DocType: Item,UOMs,UOMs
@@ -1330,17 +1357,18 @@
 DocType: Account,Balance Sheet,Bảng Cân đối kế toán
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Cost Center For Item with Item Code '
 DocType: Fee Validity,Valid Till,Hợp lệ đến
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Chế độ thanh toán không đượcđịnh hình. Vui lòng kiểm tra, dù tài khoản đã được thiết lập trên chế độ thanh toán hoặc trên hồ sơ POS"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Chế độ thanh toán không đượcđịnh hình. Vui lòng kiểm tra, dù tài khoản đã được thiết lập trên chế độ thanh toán hoặc trên hồ sơ POS"
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Cùng mục không thể được nhập nhiều lần.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Các tài khoản khác có thể tiếp tục đượctạo ra theo nhóm, nhưng các bút toán có thể được thực hiện đối với các nhóm không tồn tại"
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Phải trả
 DocType: Course,Course Intro,Khóa học Giới thiệu
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Bút toán hàng tồn kho {0} đã tạo
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Xin vui lòng thiết lập số cho loạt bài tham dự thông qua Setup&gt; Numbering Series
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,Bút toán hàng tồn kho {0} đã tạo
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,Hàng # {0}: Bị từ chối Số lượng không thể được nhập vào Hàng trả lại
 ,Purchase Order Items To Be Billed,Các mẫu hóa đơn mua hàng được lập hóa đơn
 DocType: Purchase Invoice Item,Net Rate,Tỷ giá thuần
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,Vui lòng chọn một khách hàng
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Vui lòng chọn một khách hàng
 DocType: Purchase Invoice Item,Purchase Invoice Item,Hóa đơn mua hàng
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Bút toán sổ cái hàng tồn kho  và bút toán GL được đăng lại cho các biên lai mua hàng được chọn
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Khoản 1
@@ -1361,7 +1389,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Hàng trùng lặp {0} với cùng {1}
 ,Trial Balance,số dư thử nghiệm
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Năm tài chính {0} không tìm thấy
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Thiết lập Nhân viên
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Thiết lập Nhân viên
 DocType: Sales Order,SO-,SO-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Vui lòng chọn tiền tố đầu tiên
 DocType: Employee,O-,O-
@@ -1373,12 +1401,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Xem sổ cái
 DocType: Grading Scale,Intervals,khoảng thời gian
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Sớm nhất
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group","Một mục Nhóm tồn tại với cùng một tên, hãy thay đổi tên mục hoặc đổi tên nhóm mặt hàng"
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Một mục Nhóm tồn tại với cùng một tên, hãy thay đổi tên mục hoặc đổi tên nhóm mặt hàng"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Sinh viên Điện thoại di động số
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,Phần còn lại của Thế giới
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Phần còn lại của Thế giới
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Mẫu hàng {0} không thể theo lô
 ,Budget Variance Report,Báo cáo chênh lệch ngân sách
 DocType: Salary Slip,Gross Pay,Tổng trả
+DocType: Item,Is Item from Hub,Mục từ Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Dãy {0}: Loại hoạt động là bắt buộc.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Cổ tức trả tiền
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Sổ cái hạch toán
@@ -1388,8 +1417,9 @@
 DocType: Vehicle Log,Service Detail,Chi tiết dịch vụ
 DocType: BOM,Item Description,Mô tả hạng mục
 DocType: Student Sibling,Student Sibling,sinh viên anh chị em ruột
-DocType: Purchase Invoice,Is Recurring,Là định kỳ
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,Chế độ thanh toán
 DocType: Purchase Invoice,Supplied Items,Hàng đã cung cấp
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Vui lòng đặt một menu hoạt động cho Nhà hàng {0}
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Số lượng Để sản xuất
 DocType: Email Digest,New Income,thu nhập mới
@@ -1400,6 +1430,7 @@
 ,Student and Guardian Contact Details,Sinh viên và người giám hộ Chi tiết liên lạc
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,Hàng  {0}: Đối với nhà cung cấp {0} Địa chỉ email được yêu cầu để gửi email
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Mở cửa tạm thời
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,Xem Hub
 ,Employee Leave Balance,Để lại cân nhân viên
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Số dư cho Tài khoản {0} luôn luôn phải {1}
 DocType: Patient Appointment,More Info,Xem thông tin
@@ -1419,13 +1450,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Đơn đặt hàng {0} không hợp lệ
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Cảnh báo cho Yêu cầu Báo giá Mới
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,đơn đặt hàng giúp bạn lập kế hoạch và theo dõi mua hàng của bạn
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Xin lỗi, không thể hợp nhất các công ty"
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Xin lỗi, không thể hợp nhất các công ty"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Prescriptions
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Tổng khối lượng phát hành / Chuyển {0} trong Chất liệu Yêu cầu {1} \ không thể nhiều hơn số lượng yêu cầu {2} cho mục {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Nhỏ
 DocType: Employee,Employee Number,Số nhân viên
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Không trường hợp (s) đã được sử dụng. Cố gắng từ Trường hợp thứ {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Không trường hợp (s) đã được sử dụng. Cố gắng từ Trường hợp thứ {0}
 DocType: Project,% Completed,% Hoàn thành
 ,Invoiced Amount (Exculsive Tax),Số tiền ghi trên hóa đơn (thuế độc quyền )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Khoản 2
@@ -1440,11 +1471,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Chi phí gián tiếp
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Hàng {0}: Số lượng là bắt buộc
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Nông nghiệp
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,Dữ liệu Sync Thạc sĩ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Dữ liệu Sync Thạc sĩ
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Sản phẩm hoặc dịch vụ của bạn
 DocType: Special Test Items,Special Test Items,Các bài kiểm tra đặc biệt
 DocType: Mode of Payment,Mode of Payment,Hình thức thanh toán
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,Hình ảnh website phải là một tập tin công cộng hoặc URL của trang web
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,Hình ảnh website phải là một tập tin công cộng hoặc URL của trang web
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Đây là một nhóm mục gốc và không thể được chỉnh sửa.
@@ -1452,9 +1483,9 @@
 DocType: Vehicle,Fuel UOM,nhiên liệu Đơn vị đo lường
 DocType: Warehouse,Warehouse Contact Info,Kho Thông tin Liên hệ
 DocType: Payment Entry,Write Off Difference Amount,Viết Tắt Chênh lệch Số tiền
-DocType: Purchase Invoice,Recurring Type,Định kỳ Loại
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent",{0}: không tìm thấy email của nhân viên. do đó không gửi được email
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent",{0}: không tìm thấy email của nhân viên. do đó không gửi được email
 DocType: Item,Foreign Trade Details,Chi tiết Ngoại thương
+,Assessment Plan Status,Kế hoạch Đánh giá Tình trạng
 DocType: Email Digest,Annual Income,Thu nhập hàng năm
 DocType: Serial No,Serial No Details,Không có chi tiết nối tiếp
 DocType: Purchase Invoice Item,Item Tax Rate,Tỷ giá thuế mẫu hàng
@@ -1462,15 +1493,14 @@
 DocType: Student Group Student,Group Roll Number,Số cuộn nhóm
 DocType: Student Group Student,Group Roll Number,Số cuộn nhóm
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Đối với {0}, tài khoản tín dụng chỉ có thể được liên kết chống lại mục nợ khác"
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Tổng khối lượng nhiệm vụ nhiệm vụ cần được 1. Vui lòng điều chỉnh khối lượng của tất cả các công việc của dự án một cách hợp lý
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,Giao hàng Ghi {0} không nộp
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Tổng khối lượng nhiệm vụ nhiệm vụ cần được 1. Vui lòng điều chỉnh khối lượng của tất cả các công việc của dự án một cách hợp lý
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,Giao hàng Ghi {0} không nộp
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Mục {0} phải là một mục phụ ký hợp đồng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Thiết bị vốn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Luật giá được lựa chọn đầu tiên dựa vào trường ""áp dụng vào"", có thể trở thành mẫu hàng, nhóm mẫu hàng, hoặc nhãn hiệu."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,Vui lòng đặt mã mục đầu tiên
-DocType: Hub Settings,Seller Website,Người bán website
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Vui lòng đặt mã mục đầu tiên
 DocType: Item,ITEM-,MỤC-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Tổng tỷ lệ phần trăm phân bổ cho đội ngũ bán hàng nên được 100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,Tổng tỷ lệ phần trăm phân bổ cho đội ngũ bán hàng nên được 100
 DocType: Sales Invoice Item,Edit Description,Chỉnh sửa Mô tả
 DocType: Antibiotic,Antibiotic,Kháng sinh
 ,Team Updates,Cập nhật nhóm
@@ -1491,12 +1521,12 @@
 DocType: Purchase Invoice,Total (Company Currency),Tổng số (Tiền công ty )
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Nối tiếp số {0} vào nhiều hơn một lần
 DocType: Depreciation Schedule,Journal Entry,Bút toán nhật ký
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0} mục trong tiến trình
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} mục trong tiến trình
 DocType: Workstation,Workstation Name,Tên máy trạm
 DocType: Grading Scale Interval,Grade Code,Mã lớp
 DocType: POS Item Group,POS Item Group,Nhóm POS
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0} không thuộc mục {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} không thuộc mục {1}
 DocType: Sales Partner,Target Distribution,phân bổ mục tiêu
 DocType: Salary Slip,Bank Account No.,Tài khoản ngân hàng số
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Đây là số lượng các giao dịch tạo ra cuối cùng với tiền tố này
@@ -1513,10 +1543,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Yêu cầu báo giá Nhà cung cấp
 DocType: Healthcare Settings,Registration Message,Thông báo Đăng ký
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Phần cứng
-DocType: Sales Order,Recurring Upto,Định kỳ cho tới
 DocType: Prescription Dosage,Prescription Dosage,Liều kê đơn
 DocType: Attendance,HR Manager,Trưởng phòng Nhân sự
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Hãy lựa chọn một công ty
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Hãy lựa chọn một công ty
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Để lại đặc quyền
 DocType: Purchase Invoice,Supplier Invoice Date,Nhà cung cấp hóa đơn ngày
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,trên
@@ -1532,10 +1561,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,Điều kiện chồng chéo tìm thấy giữa:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Chống Journal nhập {0} đã được điều chỉnh đối với một số chứng từ khác
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Tổng giá trị theo thứ tự
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,Thực phẩm
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Thực phẩm
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Phạm vi Ageing 3
 DocType: Maintenance Schedule Item,No of Visits,Số lần thăm
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Lịch bảo trì {0} tồn tại với {0}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Bạn có muốn xuất bản Mục của bạn vào Hub không?
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,sinh viên ghi danh
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Đồng tiền của tài khoản bế phải là {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Sum điểm cho tất cả các mục tiêu phải 100. Nó là {0}
@@ -1546,9 +1576,9 @@
 DocType: Authorization Rule,Average Discount,Giảm giá trung bình
 DocType: Purchase Invoice Item,UOM,Đơn vị đo lường
 DocType: Rename Tool,Utilities,Tiện ích
-DocType: Purchase Invoice Item,Accounting,Kế toán
+DocType: POS Profile,Accounting,Kế toán
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,Vui lòng chọn lô cho mục hàng loạt
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Vui lòng chọn lô cho mục hàng loạt
 DocType: Asset,Depreciation Schedules,Lịch khấu hao
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Kỳ ứng dụng không thể có thời gian phân bổ nghỉ bên ngoài
 DocType: Activity Cost,Projects,Dự án
@@ -1564,7 +1594,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',"Tình trạng phê duyệt phải được ""chấp thuận"" hoặc ""từ chối"""
 DocType: Physician,Contacts and Address,Địa chỉ liên hệ và Địa chỉ
 DocType: Purchase Invoice,Contact Person,Người Liên hệ
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Ngày Bắt đầu Dự kiến' không a  thể sau 'Ngày Kết thúc Dự kiến'
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','Ngày Bắt đầu Dự kiến' không a  thể sau 'Ngày Kết thúc Dự kiến'
 DocType: Course Scheduling Tool,Course End Date,Khóa học Ngày kết thúc
 DocType: Holiday List,Holidays,Ngày lễ
 DocType: Sales Order Item,Planned Quantity,Số lượng dự kiến
@@ -1572,10 +1602,11 @@
 DocType: Item,Maintain Stock,Duy trì hàng tồn kho
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Các bút toán hàng tồn kho đã tạo ra cho sản xuất theo thứ tự
 DocType: Employee,Prefered Email,Email  đề xuất
+DocType: Student Admission,Eligibility and Details,Tính hợp lệ và chi tiết
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Chênh lệch giá tịnh  trong Tài sản cố định
 DocType: Leave Control Panel,Leave blank if considered for all designations,Để trống nếu xem xét tất cả các chỉ định
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Phí của loại 'thực tế' {0} hàng không có thể được bao gồm trong mục Rate
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},Tối đa: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},Tối đa: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Từ Datetime
 DocType: Email Digest,For Company,Đối với công ty
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Đăng nhập thông tin liên lạc.
@@ -1583,19 +1614,19 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Quy mô ghi điểm của nhà cung cấp thẻ chấm điểm
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Số tiền mua
 DocType: Sales Invoice,Shipping Address Name,tên địa chỉ vận chuyển
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,Danh mục tài khoản
 DocType: Material Request,Terms and Conditions Content,Điều khoản và Điều kiện nội dung
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,không có thể lớn hơn 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,Mục {0} không phải là một cổ phiếu hàng
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Mục {0} không phải là một cổ phiếu hàng
 DocType: Maintenance Visit,Unscheduled,Đột xuất
 DocType: Employee,Owned,Sở hữu
 DocType: Salary Detail,Depends on Leave Without Pay,Phụ thuộc vào Leave Nếu không phải trả tiền
 DocType: Pricing Rule,"Higher the number, higher the priority","Số càng cao, thì mức độ ưu tiên càng cao"
 ,Purchase Invoice Trends,Mua xu hướng hóa đơn
 DocType: Employee,Better Prospects,Triển vọng tốt hơn
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Hàng # {0}: Hàng {1} chỉ có {2} số lượng. Vui lòng chọn một lô khác có {3} có sẵn hoặc phân chia hàng thành nhiều hàng, để phân phối / xuất phát từ nhiều đợt"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Hàng # {0}: Hàng {1} chỉ có {2} số lượng. Vui lòng chọn một lô khác có {3} có sẵn hoặc phân chia hàng thành nhiều hàng, để phân phối / xuất phát từ nhiều đợt"
 DocType: Vehicle,License Plate,Giấy phép mảng
 DocType: Appraisal,Goals,Mục tiêu
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Chọn Hồ sơ POS
 DocType: Warranty Claim,Warranty / AMC Status,Bảo hành /tình trạng AMC
 ,Accounts Browser,Trình duyệt tài khoản
 DocType: Payment Entry Reference,Payment Entry Reference,Bút toán thanh toán tham khảo
@@ -1613,7 +1644,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Nhân viên không thể báo cáo với chính mình.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Nếu tài khoản bị đóng băng, các mục được phép sử dụng hạn chế."
 DocType: Email Digest,Bank Balance,số dư Ngân hàng
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},Hạch toán kế toán cho {0}: {1} chỉ có thể được thực hiện bằng loại tiền tệ: {2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Hạch toán kế toán cho {0}: {1} chỉ có thể được thực hiện bằng loại tiền tệ: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Hồ sơ công việc, trình độ chuyên môn cần thiết vv"
 DocType: Journal Entry Account,Account Balance,Số dư Tài khoản
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Luật thuế cho các giao dịch
@@ -1622,8 +1653,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Tổng số thuế và lệ phí (Công ty tiền tệ)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Hiện P &amp; L số dư năm tài chính không khép kín
 DocType: Lab Test Template,Collection Details,Chi tiết bộ sưu tập
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0","chọn cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date từ tabConsultation ct, `tabLab Prescription` cp ở đó ct.patient = &#39;{0}&#39; và cp.parent = ct. tên và cp.test_created = 0"
 DocType: Shipping Rule,Shipping Account,Tài khoản vận chuyển
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Tài khoản {2} không hoạt động
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Tạo các đơn bán hàng để giúp bạn trong việc lập kế hoạch và vận chuyển đúng thời gian
@@ -1640,7 +1669,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Bảng đóng gói
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Thuê văn phòng
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Cài đặt thiết lập cổng SMS
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Nhập thất bại!
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Nhập thất bại!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Chưa có địa chỉ nào được bổ sung.
 DocType: Workstation Working Hour,Workstation Working Hour,Giờ làm việc tại trạm
 DocType: Vital Signs,Blood Pressure,Huyết áp
@@ -1665,7 +1694,7 @@
 DocType: Sales Invoice,Source,Nguồn
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Hiển thị đã đóng
 DocType: Leave Type,Is Leave Without Pay,là rời đi mà không trả
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Asset loại là bắt buộc cho mục tài sản cố định
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Asset loại là bắt buộc cho mục tài sản cố định
 DocType: Fee Validity,Fee Validity,Tính lệ phí
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Không có bản ghi được tìm thấy trong bảng thanh toán
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},{0} xung đột với {1} cho {2} {3}
@@ -1684,13 +1713,14 @@
 DocType: Student,Date of Leaving,Ngày Rời
 DocType: Pricing Rule,For Price List,Đối với Bảng giá
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Điều hành Tìm kiếm
-apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,tạo Chào
+apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,Tạo mới đầu mối kinh doanh
 DocType: Maintenance Schedule,Schedules,Lịch
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,Cần phải có Hồ sơ POS để sử dụng Điểm bán hàng
 DocType: Purchase Invoice Item,Net Amount,Số lượng tịnh
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} chưa có nên thao tác sẽ không thể hoàn thành
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} chưa có nên thao tác sẽ không thể hoàn thành
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} chưa có nên thao tác sẽ không thể hoàn thành
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1} chưa có nên thao tác sẽ không thể hoàn thành
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} chưa có nên thao tác sẽ không thể hoàn thành
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} chưa có nên thao tác sẽ không thể hoàn thành
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} chưa có nên thao tác sẽ không thể hoàn thành
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} chưa có nên thao tác sẽ không thể hoàn thành
 DocType: Purchase Order Item Supplied,BOM Detail No,số hiệu BOM chi tiết
 DocType: Landed Cost Voucher,Additional Charges,Phí bổ sung
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Thêm GIẢM Số tiền (Công ty tiền tệ)
@@ -1699,7 +1729,7 @@
 ,Support Hour Distribution,Phân phối Giờ Hỗ trợ
 DocType: Maintenance Visit,Maintenance Visit,Bảo trì đăng nhập
 DocType: Student,Leaving Certificate Number,Di dời số chứng chỉ
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}","Đã hủy cuộc hẹn, hãy xem lại và hủy bỏ hóa đơn {0}"
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}","Đã hủy cuộc hẹn, hãy xem lại và hủy bỏ hóa đơn {0}"
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Hàng loạt sẵn Qty tại Kho
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Cập nhật Kiểu in
 DocType: Landed Cost Voucher,Landed Cost Help,Chi phí giúp hạ cánh
@@ -1722,8 +1752,8 @@
 DocType: Patient,Tobacco Past Use,Sử dụng thuốc lá quá khứ
 DocType: Sales Invoice Item,Brand Name,Tên nhãn hàng
 DocType: Purchase Receipt,Transporter Details,Chi tiết người vận chuyển
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Người dùng {0} đã được chỉ định cho Bác sĩ {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,Mặc định kho là cần thiết cho mục đã chọn
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Người dùng {0} đã được chỉ định cho Bác sĩ {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Mặc định kho là cần thiết cho mục đã chọn
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,hộp
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,Nhà cung cấp có thể
 DocType: Budget,Monthly Distribution,Phân phối hàng tháng
@@ -1733,8 +1763,8 @@
 DocType: Sales Partner,Sales Partner Target,Mục tiêu DT của Đại lý
 DocType: Loan Type,Maximum Loan Amount,Số tiền cho vay tối đa
 DocType: Pricing Rule,Pricing Rule,Quy tắc định giá
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Số cuộn trùng nhau cho sinh viên {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},Số cuộn trùng nhau cho sinh viên {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Số cuộn trùng nhau cho sinh viên {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Số cuộn trùng nhau cho sinh viên {0}
 DocType: Budget,Action if Annual Budget Exceeded,Hành động nếu ngân sách hàng năm vượt trội
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Yêu cầu vật liệu để đặt hóa đơn
 DocType: Shopping Cart Settings,Payment Success URL,Thanh toán thành công URL
@@ -1751,7 +1781,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} chỉ được xuất hiện một lần
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Không được phép để chuyển hơn {0} {1} hơn so với mua hàng {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Các di dời  được phân bổ thành công cho {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Không có mẫu hàng để đóng gói
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Không có mẫu hàng để đóng gói
 DocType: Shipping Rule Condition,From Value,Từ giá trị gia tăng
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Số lượng sản xuất là bắt buộc
 DocType: Employee Loan,Repayment Method,Phương pháp trả nợ
@@ -1765,6 +1795,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Phải trả Hàng tồn kho
 DocType: Purchase Invoice,Supplier Warehouse,Nhà cung cấp kho
 DocType: Opportunity,Contact Mobile No,Số Di động Liên hệ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Chọn công ty
 ,Material Requests for which Supplier Quotations are not created,Các yêu cầu vật chất mà Trích dẫn Nhà cung cấp không được tạo ra
 DocType: Student Group,Set 0 for no limit,Đặt 0 để không giới hạn
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Ngày (s) mà bạn đang nộp đơn xin nghỉ phép là ngày nghỉ. Bạn không cần phải nộp đơn xin nghỉ phép.
@@ -1774,24 +1805,24 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Tạo báo giá
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Báo cáo khác
 DocType: Dependent Task,Dependent Task,Nhiệm vụ phụ thuộc
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},Yếu tố chuyển đổi cho Đơn vị đo mặc định phải là 1 trong hàng {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Yếu tố chuyển đổi cho Đơn vị đo mặc định phải là 1 trong hàng {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Rời khỏi loại {0} không thể dài hơn {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Hãy thử lên kế hoạch hoạt động cho ngày X trước.
 DocType: HR Settings,Stop Birthday Reminders,Ngừng nhắc nhở ngày sinh nhật
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},Hãy thiết lập mặc định Account Payable lương tại Công ty {0}
 DocType: SMS Center,Receiver List,Danh sách người nhận
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,Tìm hàng
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,Tìm hàng
 DocType: Patient Appointment,Referring Physician,Bác sĩ giới thiệu
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Số tiền được tiêu thụ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Chênh lệch giá tịnh trong tiền mặt
 DocType: Assessment Plan,Grading Scale,Phân loại
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Đơn vị đo lường {0} đã được nhập vào nhiều hơn một lần trong Bảng yếu tổ chuyển đổi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,Đã hoàn thành
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Đơn vị đo lường {0} đã được nhập vào nhiều hơn một lần trong Bảng yếu tổ chuyển đổi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,Đã hoàn thành
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Hàng có sẵn
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Yêu cầu thanh toán đã tồn tại {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Chi phí của Items Ban hành
 DocType: Physician,Hospital,Bệnh viện
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},Số lượng không phải lớn hơn {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},Số lượng không phải lớn hơn {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,tài chính Trước năm không đóng cửa
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Tuổi (Ngày)
 DocType: Quotation Item,Quotation Item,Báo giá mẫu hàng
@@ -1800,18 +1831,19 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,"""Từ ngày"" không có thể lớn hơn ""Đến ngày"""
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Không nối tiếp {0} {1} số lượng không thể là một phần nhỏ
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Loại nhà cung cấp tổng thể.
-DocType: Purchase Order Item,Supplier Part Number,Nhà cung cấp Phần số
+DocType: Purchase Order Item,Supplier Part Number,Mã số của Nhà cung cấp
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,Tỷ lệ chuyển đổi không thể là 0 hoặc 1
-DocType: Sales Invoice,Reference Document,Tài liệu tham khảo
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1} đã huỷ bỏ hoặc đã dừng
+DocType: Subscription,Reference Document,Tài liệu tham khảo
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} đã huỷ bỏ hoặc đã dừng
 DocType: Accounts Settings,Credit Controller,Bộ điều khiển tín dụng
 DocType: Delivery Note,Vehicle Dispatch Date,Ngày gửi phương tiện
 DocType: Healthcare Settings,Default Medical Code Standard,Tiêu chuẩn Mã y tế Mặc định
 DocType: Purchase Invoice Item,HSN/SAC,HSN / SAC
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +234,Purchase Receipt {0} is not submitted,Mua hóa đơn {0} không nộp
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +234,Purchase Receipt {0} is not submitted,Hóa đơn mua hàng {0} chưa được gửi
 DocType: Company,Default Payable Account,Mặc định Account Payable
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Cài đặt cho các giỏ hàng mua sắm trực tuyến chẳng hạn như các quy tắc vận chuyển, bảng giá, vv"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% hóa đơn đã lập
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Sắp xếp theo Giá ...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Số lượng dự trữ
 DocType: Party Account,Party Account,Tài khoản của bên đối tác
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Nhân sự
@@ -1823,13 +1855,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Tạo bút toán giải ngân
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Dãy {0}: Cấp cao đối với nhà cung cấp phải là khoản nợ
 DocType: Company,Default Values,Giá trị mặc định
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Tần suất} phân loại
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{Tần suất} phân loại
 DocType: Expense Claim,Total Amount Reimbursed,Tổng số tiền bồi hoàn
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Điều này được dựa trên các bản ghi với xe này. Xem thời gian dưới đây để biết chi tiết
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Gắn với hóa đơn NCC {0} ngày {1}
 DocType: Customer,Default Price List,Mặc định Giá liệt kê
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,kỷ lục Phong trào Asset {0} đã tạo
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Bạn không thể xóa năm tài chính {0}. Năm tài chính {0} được thiết lập mặc định như trong Global Settings
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Một khách hàng có cùng tên đã tồn tại
 DocType: Journal Entry,Entry Type,Loại mục
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Không có kế hoạch đánh giá kết hợp với nhóm đánh giá này
 ,Customer Credit Balance,số dư tín dụng của khách hàng
@@ -1840,7 +1873,7 @@
 DocType: Quotation,Term Details,Chi tiết điều khoản
 DocType: Project,Total Sales Cost (via Sales Order),Tổng chi phí bán hàng (thông qua đặt hàng bán hàng)
 DocType: Project,Total Sales Cost (via Sales Order),Tổng chi phí bán hàng (thông qua đặt hàng bán hàng)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,Không thể ghi danh hơn {0} sinh viên cho nhóm sinh viên này.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Không thể ghi danh hơn {0} sinh viên cho nhóm sinh viên này.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Đếm Lead
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Đếm lead
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} phải lớn hơn 0
@@ -1858,9 +1891,11 @@
 DocType: Lab Test,Technician Name,Tên kỹ thuật viên
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Bỏ liên kết Thanh toán Hủy hóa đơn
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Hiện đo dặm đọc vào phải lớn hơn ban đầu Xe máy đo dặm {0}
+DocType: Restaurant Reservation,No Show,Không hiển thị
 DocType: Shipping Rule Country,Shipping Rule Country,QUy tắc vận chuyển quốc gia
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Để lại và chấm công
 DocType: Maintenance Visit,Partially Completed,Một phần hoàn thành
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Độ nhạy trung bình
 DocType: Leave Type,Include holidays within leaves as leaves,Bao gồm các ngày lễ trong các lần nghỉ như là các lần nghỉ
 DocType: Sales Invoice,Packed Items,Hàng đóng gói
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Yêu cầu bảo hành theo Số sê ri
@@ -1877,13 +1912,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),Số tiền thanh toán (Công ty tiền tệ)
 DocType: Purchase Invoice,Additional Discount,Chiết khấu giảm giá
 DocType: Selling Settings,Selling Settings,thiết lập thông số bán hàng
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Xác nhận hành động
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Đấu giá trực tuyến
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Xin vui lòng chỉ định hoặc lượng hoặc Tỷ lệ định giá hoặc cả hai
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,hoàn thành
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Xem Giỏ hàng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Chi phí tiếp thị
 ,Item Shortage Report,Thiếu mục Báo cáo
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Trọng lượng được đề cập, \n Xin đề cập đến cả  ""Weight UOM"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Trọng lượng được đề cập, \n Xin đề cập đến cả  ""Weight UOM"""
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Phiếu NVL sử dụng để làm chứng từ nhập kho
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Kỳ hạn khấu hao tiếp theo là bắt buộc đối với tài sản
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Khóa học riêng biệt cho từng nhóm
@@ -1896,12 +1932,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Thực hiện bút toán kế toán cho tất cả các chuyển động chứng khoán
 DocType: Leave Allocation,Total Leaves Allocated,Tổng số nghỉ phép được phân bố
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},phải có kho tại dòng số {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,Vui lòng nhập tài chính hợp lệ Năm Start và Ngày End
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,Vui lòng nhập tài chính hợp lệ Năm Start và Ngày End
 DocType: Employee,Date Of Retirement,Ngày nghỉ hưu
 DocType: Upload Attendance,Get Template,Nhận Mẫu
 DocType: Material Request,Transferred,Đã được vận chuyển
 DocType: Vehicle,Doors,cửa ra vào
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext Hoàn tất thiết lập!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext Hoàn tất thiết lập!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Thu Phí Đăng ký Bệnh nhân
 DocType: Course Assessment Criteria,Weightage,Trọng lượng
 DocType: Purchase Invoice,Tax Breakup,Chia thuế
@@ -1920,37 +1956,37 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Nếu mặt hàng này có các biến thể, thì sau đó nó có thể không được lựa chọn trong các đơn đặt hàng  vv"
 DocType: Lead,Next Contact By,Liên hệ tiếp theo bằng
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},Số lượng cần thiết cho mục {0} trong hàng {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Số lượng cần thiết cho mục {0} trong hàng {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Không xóa được Kho {0} vì vẫn còn {1} tồn kho
 DocType: Quotation,Order Type,Loại đặt hàng
-DocType: Purchase Invoice,Notification Email Address,Thông báo Địa chỉ Email
 ,Item-wise Sales Register,Mẫu hàng - Đăng ký mua hàng thông minh
 DocType: Asset,Gross Purchase Amount,Tổng Chi phí mua hàng
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Số dư mở
 DocType: Asset,Depreciation Method,Phương pháp Khấu hao
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,ẩn
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,ẩn
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Thuế này đã gồm trong giá gốc?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Tổng số mục tiêu
 DocType: Job Applicant,Applicant for a Job,Nộp đơn xin việc
 DocType: Production Plan Material Request,Production Plan Material Request,Sản xuất Kế hoạch Chất liệu Yêu cầu
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Không có đơn đặt hàng sản xuất tạo ra
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,Không có đơn đặt hàng sản xuất tạo ra
 DocType: Stock Reconciliation,Reconciliation JSON,Hòa giải JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Quá nhiều cột. Xuất báo cáo và in nó sử dụng một ứng dụng bảng tính.
 DocType: Purchase Invoice Item,Batch No,Số hiệu lô
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Yêu cầu Báo giá: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Cho phép nhiều đơn bán cùng trên 1 đơn mua hàng của khách
 DocType: Student Group Instructor,Student Group Instructor,Hướng dẫn nhóm sinh viên
 DocType: Student Group Instructor,Student Group Instructor,Hướng dẫn nhóm sinh viên
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Số di động Guardian2
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Chính
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Chính
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Biến thể
 DocType: Naming Series,Set prefix for numbering series on your transactions,Thiết lập tiền tố cho đánh số hàng loạt các giao dịch của bạn
 DocType: Employee Attendance Tool,Employees HTML,Nhân viên HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,BOM mặc định ({0}) phải được hoạt động cho mục này hoặc mẫu của mình
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,BOM mặc định ({0}) phải được hoạt động cho mục này hoặc mẫu của mình
 DocType: Employee,Leave Encashed?,Chi phiếu đã nhận ?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Cơ hội Từ lĩnh vực là bắt buộc
 DocType: Email Digest,Annual Expenses,Chi phí hàng năm
 DocType: Item,Variants,Biến thể
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,Đặt mua
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Đặt mua
 DocType: SMS Center,Send To,Để gửi
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Không có đủ số dư để lại cho Loại di dời {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Số lượng phân bổ
@@ -1968,6 +2004,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Sức mạnh Nhóm Sinh viên
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Chống Journal nhập {0} không có bất kỳ chưa từng có {1} nhập
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,đánh giá
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Sự kiện đào tạo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Trùng lặp số sê  ri đã nhập cho mẫu hàng {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,1 điều kiện cho quy tắc giao hàng
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Vui lòng nhập
@@ -1977,7 +2014,7 @@
 DocType: Sales Order,To Deliver and Bill,Giao hàng và thanh toán
 DocType: Student Group,Instructors,Giảng viên
 DocType: GL Entry,Credit Amount in Account Currency,Số tiền trong tài khoản ngoại tệ tín dụng
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0} phải được đệ trình
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} phải được đệ trình
 DocType: Authorization Control,Authorization Control,Cho phép điều khiển
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Hàng  # {0}: Nhà Kho bị hủy là bắt buộc với mẫu hàng bị hủy {1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Thanh toán
@@ -1996,11 +2033,11 @@
 DocType: Quotation Item,Actual Qty,Số lượng thực tế
 DocType: Sales Invoice Item,References,Tài liệu tham khảo
 DocType: Quality Inspection Reading,Reading 10,Đọc 10
-DocType: Hub Settings,Hub Node,Nút trung tâm
+DocType: Hub Category,Hub Node,Nút trung tâm
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Bạn đã nhập các mục trùng lặp. Xin khắc phục và thử lại.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Liên kết
 DocType: Asset Movement,Asset Movement,Phong trào Asset
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,Giỏ hàng mới
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,Giỏ hàng mới
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Mục {0} không phải là một khoản đăng
 DocType: SMS Center,Create Receiver List,Tạo ra nhận Danh sách
 DocType: Vehicle,Wheels,Các bánh xe
@@ -2014,15 +2051,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Viễn thông
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Chỉ ra rằng gói này một phần của việc phân phối (Chỉ bản nháp)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Thực hiện thanh toán nhập
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Số lượng cho hàng {0} phải nhỏ hơn {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Số lượng cho hàng {0} phải nhỏ hơn {1}
 ,Sales Invoice Trends,Hóa đơn bán hàng Xu hướng
 DocType: Leave Application,Apply / Approve Leaves,Áp dụng / Phê duyệt Leaves
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Đối với
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Đối với
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'
 DocType: Sales Order Item,Delivery Warehouse,Kho nhận hàng
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Cây biểu thị các trung tâm chi phí tài chính
 DocType: Serial No,Delivery Document No,Giao văn bản số
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Hãy thiết lập &#39;Gain tài khoản / Mất Xử lý tài sản trong doanh nghiệp {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Hãy thiết lập &#39;Gain tài khoản / Mất Xử lý tài sản trong doanh nghiệp {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Nhận mẫu hàng Từ biên nhận mua hàng
 DocType: Serial No,Creation Date,Ngày Khởi tạo
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Mục {0} xuất hiện nhiều lần trong Giá liệt kê {1}
@@ -2033,12 +2070,13 @@
 DocType: Student,Student Mobile Number,Số di động Sinh viên
 DocType: Item,Has Variants,Có biến thể
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Cập nhật phản hồi
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},Bạn đã chọn các mục từ {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Bạn đã chọn các mục từ {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Tên phân phối hàng tháng
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ID hàng loạt là bắt buộc
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ID hàng loạt là bắt buộc
 DocType: Sales Person,Parent Sales Person,Người bán hàng tổng
-DocType: Purchase Invoice,Recurring Invoice,Hóa đơn định kỳ
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Cao đến thấp
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Chọn chương trình đầu tiên
 DocType: Patient Appointment,Patient Age,Tuổi bệnh nhân
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Quản lý dự án
 DocType: Supplier,Supplier of Goods or Services.,Nhà cung cấp hàng hóa hoặc dịch vụ.
@@ -2046,8 +2084,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Tài khoản phải thu mặc định sẽ được sử dụng nếu không đặt trong Bệnh nhân để ghi chi phí tư vấn.
 DocType: Vehicle Log,Fuel Price,nhiên liệu Giá
 DocType: Budget,Budget,Ngân sách
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,Đặt Mở
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Tài sản cố định mục phải là một mẫu hàng không tồn kho.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Đặt Mở
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Tài sản cố định mục phải là một mẫu hàng không tồn kho.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Ngân sách không thể được chỉ định đối với {0}, vì nó không phải là một tài khoản thu nhập hoặc phí tổn"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Đạt được
 DocType: Student Admission,Application Form Route,Mẫu đơn Route
@@ -2061,12 +2099,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Mục {0} không phải là thiết lập cho Serial Nos Kiểm tra mục chủ
 DocType: Maintenance Visit,Maintenance Time,Thời gian bảo trì
 ,Amount to Deliver,Số tiền để Cung cấp
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},Cùng một mục đã được nhập nhiều lần. {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Ngày bắt đầu hạn không thể sớm hơn Ngày Năm Bắt đầu của năm học mà điều khoản này được liên kết (Năm học{}). Xin vui lòng sửa ngày và thử lại.
 DocType: Guardian,Guardian Interests,người giám hộ Sở thích
 DocType: Naming Series,Current Value,Giá trị hiện tại
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Nhiều năm tài chính tồn tại cho ngày {0}. Hãy thiết lập công ty trong năm tài chính
 DocType: School Settings,Instructor Records to be created by,Tài liệu hướng dẫn được tạo ra bởi
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} được tạo ra
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} được tạo ra
 DocType: Delivery Note Item,Against Sales Order,Theo đơn đặt hàng
 ,Serial No Status,Serial No Tình trạng
 DocType: Payment Entry Reference,Outstanding,Nổi bật
@@ -2077,10 +2116,10 @@
  phải lớn hơn hoặc bằng {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Điều này được dựa trên chuyển động chứng khoán. Xem {0} để biết chi tiết
 DocType: Pricing Rule,Selling,Bán hàng
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},Số tiền {0} {1} giảm trừ {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Số tiền {0} {1} giảm trừ {2}
 DocType: Employee,Salary Information,Thông tin tiền lương
 DocType: Sales Person,Name and Employee ID,Tên và ID nhân viên
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,Ngày đến hạn không thể trước ngày ghi sổ
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Ngày đến hạn không thể trước ngày ghi sổ
 DocType: Website Item Group,Website Item Group,Nhóm các mục Website
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Nhiệm vụ và thuế
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Vui lòng nhập ngày tham khảo
@@ -2106,7 +2145,7 @@
 DocType: Issue,Resolution Details,Chi tiết giải quyết
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,phân bổ
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Tiêu chí chấp nhận
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Vui lòng nhập yêu cầu Chất liệu trong bảng trên
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Vui lòng nhập yêu cầu Chất liệu trong bảng trên
 DocType: Item Attribute,Attribute Name,Tên thuộc tính
 DocType: BOM,Show In Website,Hiện Trong Website
 DocType: Shopping Cart Settings,Show Quantity in Website,Hiện Số lượng trong Website
@@ -2115,7 +2154,7 @@
 DocType: Item Reorder,Check in (group),Kiểm tra trong (nhóm)
 ,Qty to Order,Số lượng đặt hàng
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Người đứng đầu tài khoản dưới trách nhiệm pháp lý hoặc vốn chủ sở hữu, trong đó lợi nhuận / lỗ sẽ được đặt"
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,Biểu đồ Gantt của tất cả tác vụ.
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,Biểu đồ Gantt của tất cả tác vụ.
 DocType: Opportunity,Mins to First Response,Các điều tối thiểu đầu tiên để phản hồi
 DocType: Pricing Rule,Margin Type,Loại Dự trữ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} giờ
@@ -2137,36 +2176,36 @@
 DocType: Patient,Surgical History,Lịch sử phẫu thuật
 DocType: Employee,Resignation Letter Date,Ngày viết đơn nghỉ hưu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Nội quy định giá được tiếp tục lọc dựa trên số lượng.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Vui lòng đặt Ngày Tham gia cho nhân viên {0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},Vui lòng đặt Ngày Tham gia cho nhân viên {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Vui lòng đặt Ngày Tham gia cho nhân viên {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Vui lòng đặt Ngày Tham gia cho nhân viên {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Tổng số tiền thanh toán (thông qua Thời gian biểu)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Lặp lại Doanh thu khách hàng
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) phải có vai trò 'Người duyệt thu chi"""
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Đôi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,Chọn BOM và Số lượng cho sản xuất
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Chọn BOM và Số lượng cho sản xuất
 DocType: Asset,Depreciation Schedule,Kế hoạch khấu hao
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Địa chỉ đối tác bán hàng và liên hệ
 DocType: Bank Reconciliation Detail,Against Account,Đối với tài khoản
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,"Kỳ hạn nửa ngày nên ở giữa mục ""từ ngày"" và ""tới ngày"""
 DocType: Maintenance Schedule Detail,Actual Date,Ngày thực tế
 DocType: Item,Has Batch No,Có hàng loạt Không
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},Thanh toán hàng năm: {0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Thanh toán hàng năm: {0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Hàng hóa và thuế dịch vụ (GTS Ấn Độ)
 DocType: Delivery Note,Excise Page Number,Tiêu thụ đặc biệt số trang
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Công ty, Từ ngày và Đến ngày là bắt buộc"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Nhận được từ Tư vấn
 DocType: Asset,Purchase Date,Ngày mua hàng
 DocType: Employee,Personal Details,Thông tin chi tiết cá nhân
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},Hãy thiết lập &#39;Trung tâm Lưu Khấu hao chi phí trong doanh nghiệp {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Hãy thiết lập &#39;Trung tâm Lưu Khấu hao chi phí trong doanh nghiệp {0}
 ,Maintenance Schedules,Lịch bảo trì
 DocType: Task,Actual End Date (via Time Sheet),Ngày kết thúc thực tế (thông qua thời gian biểu)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},Số tiền {0} {1} với {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Số tiền {0} {1} với {2} {3}
 ,Quotation Trends,Các Xu hướng dự kê giá
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Nhóm mục không được đề cập trong mục tổng thể cho mục {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,tài khoản nợ phải nhận được tiền
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,tài khoản nợ phải nhận được tiền
 DocType: Shipping Rule Condition,Shipping Amount,Số tiền vận chuyển
 DocType: Supplier Scorecard Period,Period Score,Điểm thời gian
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,Thêm khách hàng
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Thêm khách hàng
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Số tiền cấp phát
 DocType: Lab Test Template,Special,Đặc biệt
 DocType: Purchase Invoice Item,Conversion Factor,Yếu tố chuyển đổi
@@ -2174,13 +2213,14 @@
 ,Vehicle Expenses,Chi phí phương tiện
 DocType: Serial No,Invoice Details,Chi tiết hóa đơn
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},giá trị dự kiến sau khi cuộc sống hữu ích phải lớn hơn hoặc bằng {0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Bắt đầu vào
+DocType: Hub Category,Hub Category,Danh mục Trung tâm
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Số phương tiện
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,Ngày mà hóa đơn định kỳ sẽ được dừng lại
 DocType: Employee Loan,Loan Amount,Số tiền vay
 DocType: Program Enrollment,Self-Driving Vehicle,Phương tiện tự lái
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Nhà cung cấp thẻ điểm chấm điểm
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},Dãy {0}: Hóa đơn nguyên vật liệu không được tìm thấy cho mẫu hàng {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Dãy {0}: Hóa đơn nguyên vật liệu không được tìm thấy cho mẫu hàng {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Tổng số di dời được phân bổ {0} không thể ít hơn so với  số di dời được phê duyệt {1} cho giai đoạn
 DocType: Journal Entry,Accounts Receivable,Tài khoản Phải thu
 ,Supplier-Wise Sales Analytics,Nhà cung cấp-Wise Doanh Analytics
@@ -2192,7 +2232,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Dòng gốc (để trống, nếu đây không phải là một phần của Dòng gốc)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Để trống nếu xem xét tất cả các loại nhân viên
 DocType: Landed Cost Voucher,Distribute Charges Based On,Phân phối Phí Dựa Trên
-apps/erpnext/erpnext/hooks.py +131,Timesheets,các bảng thời gian biẻu
+apps/erpnext/erpnext/hooks.py +140,Timesheets,các bảng thời gian biẻu
 DocType: HR Settings,HR Settings,Thiết lập nhân sự
 DocType: Salary Slip,net pay info,thông tin tiền thực phải trả
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Giá trị này được cập nhật trong Bảng giá bán Mặc định.
@@ -2203,7 +2243,7 @@
 DocType: Patient,B Positive,B dương tính
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Hàng  # {0}: Số lượng phải là 1, mục là một tài sản cố định. Vui lòng sử dụng hàng riêng biệt cho đa dạng số lượng"
 DocType: Leave Block List Allow,Leave Block List Allow,Để lại danh sách chặn cho phép
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Viết tắt ko được để trống
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Viết tắt ko được để trống
 DocType: Patient Medical Record,Patient Medical Record,Hồ sơ Y khoa Bệnh nhân
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Nhóm Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Các môn thể thao
@@ -2220,9 +2260,10 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Không thể tìm thấy tỷ giá cho {0} đến {1} cho ngày chính {2}. Vui lòng tạo một bản ghi tiền tệ bằng tay
 DocType: POS Profile,Price List,Bảng giá
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0}  giờ là năm tài chính mặc định. Xin vui lòng làm mới trình duyệt của bạn để  thay đổi có hiệu lực.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Claims Expense
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Claims Expense
 DocType: Issue,Support,Hỗ trợ
 ,BOM Search,Tìm kiếm BOM
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Xuất bản &quot;In Stock&quot; hoặc &quot;Not in stock&quot; trên Hub dựa trên cổ phiếu có sẵn trong kho này.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Đóng cửa (mở cửa + Các tổng số)
 DocType: Vehicle,Fuel Type,Loại nhiên liệu
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Hãy xác định tiền tệ của Công ty
@@ -2234,16 +2275,16 @@
 DocType: Healthcare Settings,Remind Before,Nhắc trước
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Yếu tố UOM chuyển đổi là cần thiết trong hàng {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Hàng # {0}: Tài liệu tham khảo Tài liệu Loại phải là một trong các đơn đặt hàng, hóa đơn hàng hóa, hoặc bút toán nhật ký"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Hàng # {0}: Tài liệu tham khảo Tài liệu Loại phải là một trong các đơn đặt hàng, hóa đơn hàng hóa, hoặc bút toán nhật ký"
 DocType: Salary Component,Deduction,Khấu trừ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Hàng{0}: Từ Thời gian và Tới thời gin là bắt buộc.
 DocType: Stock Reconciliation Item,Amount Difference,Số tiền khác biệt
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},Giá mẫu hàng được thêm vào cho {0} trong danh sách giá {1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Giá mẫu hàng được thêm vào cho {0} trong danh sách giá {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Vui lòng nhập Id nhân viên của người bán hàng này
 DocType: Territory,Classification of Customers by region,Phân loại khách hàng theo vùng
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Chênh lệch Số tiền phải bằng không
 DocType: Project,Gross Margin,Tổng lợi nhuận
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,Vui lòng nhập sản xuất hàng đầu tiên
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Vui lòng nhập sản xuất hàng đầu tiên
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Số dư trên bảng kê Ngân hàng tính ra
 DocType: Normal Test Template,Normal Test Template,Mẫu kiểm tra thông thường
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,đã vô hiệu hóa người dùng
@@ -2253,21 +2294,22 @@
 DocType: Salary Slip,Total Deduction,Tổng số trích
 ,Production Analytics,Analytics sản xuất
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Điều này dựa trên các giao dịch đối với Bệnh nhân này. Xem dòng thời gian bên dưới để biết chi tiết
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,Chi phí đã được cập nhật
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Chi phí đã được cập nhật
 DocType: Employee,Date of Birth,Ngày sinh
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Mục {0} đã được trả lại
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Năm tài chính** đại diện cho một năm tài chính. Tất cả các bút toán kế toán và giao dịch chính khác được theo dõi  với **năm tài chính **.
 DocType: Opportunity,Customer / Lead Address,Địa chỉ Khách hàng / Tiềm năng
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Cài đặt Thẻ điểm của nhà cung cấp
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Cảnh báo: Chứng nhận SSL không hợp lệ đối với đính kèm {0}
-DocType: Student Admission,Eligibility,Đủ điều kiện
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Tên Kế hoạch Đánh giá
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Cảnh báo: Chứng nhận SSL không hợp lệ đối với đính kèm {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Lead giúp bạn có được việc kinh doanh, thêm tất cả các địa chỉ liên lạc của bạn và nhiều hơn nữa như Lead của bạn"
 DocType: Production Order Operation,Actual Operation Time,Thời gian hoạt động thực tế
 DocType: Authorization Rule,Applicable To (User),Để áp dụng (Thành viên)
 DocType: Purchase Taxes and Charges,Deduct,Trích
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Mô Tả Công Việc
 DocType: Student Applicant,Applied,Ứng dụng
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Mở lại
 DocType: Sales Invoice Item,Qty as per Stock UOM,Số lượng theo như chứng khoán UOM
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Tên Guardian2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Kí tự đặc biệt ngoại trừ ""-"" ""."", ""#"", và ""/"" không được phép khi đặt tên hàng loạt"
@@ -2279,7 +2321,7 @@
 DocType: Request for Quotation,Manufacturing Manager,QUản lý sản xuất
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Không nối tiếp {0} được bảo hành tối đa {1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Phân chia ghi chú giao hàng vào các gói hàng
-apps/erpnext/erpnext/hooks.py +98,Shipments,Lô hàng
+apps/erpnext/erpnext/hooks.py +107,Shipments,Lô hàng
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Tổng số tiền được phân bổ (Công ty ngoại tệ)
 DocType: Purchase Order Item,To be delivered to customer,Sẽ được chuyển giao cho khách hàng
 DocType: BOM,Scrap Material Cost,Chi phí phế liệu
@@ -2302,8 +2344,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Cài đặt Variant Item
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Chọn Công ty ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Để trống nếu xem xét tất cả các phòng ban
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Loại lao động (thường xuyên, hợp đồng, vv tập)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0} là bắt buộc đối với mục {1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Loại lao động (thường xuyên, hợp đồng, vv tập)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} là bắt buộc đối với mục {1}
 DocType: Process Payroll,Fortnightly,mổi tháng hai lần
 DocType: Currency Exchange,From Currency,Từ tệ
 DocType: Vital Signs,Weight (In Kilogram),Trọng lượng (tính bằng kilogram)
@@ -2328,7 +2370,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Vui lòng click vào 'Tạo Lịch trình' để có được lịch trình
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Có lỗi khi xóa lịch trình sau đây:
 DocType: Bin,Ordered Quantity,Số lượng đặt hàng
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""","ví dụ như ""Xây dựng các công cụ cho các nhà thầu"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","ví dụ như ""Xây dựng các công cụ cho các nhà thầu"""
 DocType: Grading Scale,Grading Scale Intervals,Phân loại các khoảng thời gian
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Bút Toán Kế toán cho {2} chỉ có thể được tạo ra với tiền tệ: {3}
 DocType: Production Order,In Process,Trong quá trình
@@ -2352,11 +2394,10 @@
 DocType: Purchase Invoice,With Payment of Tax,Với việc thanh toán thuế
 DocType: Expense Claim Detail,Expense Claim Detail,Chi phí bồi thường chi tiết
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICATE CHO CUNG CẤP
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,Vui lòng chọn đúng tài khoản
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Vui lòng chọn đúng tài khoản
 DocType: Item,Weight UOM,Trọng lượng UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Cơ cấu tiền lương của nhân viên
 DocType: Patient,Blood Group,Nhóm máu
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,Chờ
 DocType: Course,Course Name,Tên khóa học
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Người dùng có thể duyệt các ứng dụng nghỉ phép một nhân viên nào đó
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Thiết bị văn phòng
@@ -2375,7 +2416,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Giá sẽ không được hiển thị nếu thực Giá liệt kê không được thiết lập
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Hãy xác định một quốc gia cho Rule Shipping này hoặc kiểm tra vận chuyển trên toàn thế giới
 DocType: Stock Entry,Total Incoming Value,Tổng giá trị tới
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,nợ được yêu cầu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,nợ được yêu cầu
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","các bảng thời gian biểu giúp theo dõi thời gian, chi phí và thanh toán cho các hoạt động được thực hiện bởi nhóm của bạn"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Danh sách mua Giá
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Mẫu của các biến thẻ điểm của nhà cung cấp.
@@ -2385,7 +2426,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Hòa giải thanh toán
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Vui lòng chọn tên incharge của Người
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Công nghệ
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},Tổng số chưa được thanh toán: {0}
+DocType: Hub Settings,Unregister from Hub,Hủy đăng ký từ Hub
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Tổng số chưa được thanh toán: {0}
 DocType: BOM Website Operation,BOM Website Operation,Hoạt động Website BOM
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Thư mời
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Các yêu cầu tạo ra vật liệu (MRP) và đơn đặt hàng sản xuất.
@@ -2397,7 +2439,9 @@
 DocType: Physician Schedule Time Slot,To Time,Giờ
 DocType: Authorization Rule,Approving Role (above authorized value),Phê duyệt Role (trên giá trị ủy quyền)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Để tín dụng tài khoản phải có một tài khoản phải trả
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM đệ quy: {0} khôg thể là loại tổng hoặc loại con của {2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Vui lòng chọn Sinh viên nhập học là bắt buộc đối với sinh viên nộp phí
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM đệ quy: {0} khôg thể là loại tổng hoặc loại con của {2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Vui lòng chọn Bảng giá để xuất bản giá
 DocType: Production Order Operation,Completed Qty,Số lượng hoàn thành
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Đối với {0}, chỉ tài khoản ghi nợ có thể được liên kết với mục tín dụng khác"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Danh sách giá {0} bị vô hiệu hóa
@@ -2410,39 +2454,40 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} những dãy số được yêu cầu cho vật liệu {1}. Bạn đã cung cấp {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Hiện tại Rate Định giá
 DocType: Item,Customer Item Codes,Mã mục khách hàng (Customer Item Codes)
+DocType: Training Event,Advance,Nâng cao
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,để lặp lại.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Trao đổi Lãi / lỗ
 DocType: Opportunity,Lost Reason,Lý do bị mất
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Địa chỉ mới
 DocType: Quality Inspection,Sample Size,Kích thước mẫu
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Vui lòng nhập Document Receipt
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,Tất cả các mục đã được lập hoá đơn
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Vui lòng xác định hợp lệ ""Từ trường hợp số '"
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',"Vui lòng xác định hợp lệ ""Từ trường hợp số '"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,các trung tâm chi phí  khác có thể được tạo ra bằng các nhóm nhưng các bút toán có thể được tạo ra với các nhóm không tồn tại
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Người sử dụng và Quyền
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},Đơn đặt hàng sản xuất đã tạo: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Đơn đặt hàng sản xuất đã tạo: {0}
 DocType: Branch,Branch,Chi Nhánh
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,In ấn và xây dựng thương hiệu
 DocType: Company,Total Monthly Sales,Tổng doanh thu hàng tháng
 DocType: Bin,Actual Quantity,Số lượng thực tế
 DocType: Shipping Rule,example: Next Day Shipping,Ví dụ: Ngày hôm sau Vận chuyển
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Số thứ tự {0} không tìm thấy
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},Đăng ký đã được {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Đăng ký đã được {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Chương trình Biểu phí
 DocType: Fee Schedule Program,Student Batch,hàng loạt sinh viên
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,chọn * từ `tabVital Signs` ở đó bệnh nhân = &#39;{0}&#39; theo thứ tự sign_date desc limit 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Tạo Sinh viên
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Min Grade
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},Bạn được lời mời cộng tác trong dự án: {0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},Bác sĩ không có mặt trên {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Bạn được lời mời cộng tác trong dự án: {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Bác sĩ không có mặt trên {0}
 DocType: Leave Block List Date,Block Date,Khối kỳ hạn
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},Thêm Id đăng ký trường tùy chỉnh trong loại doctype {0}
 DocType: Purchase Receipt,Supplier Delivery Note,Lưu ý của Nhà cung cấp
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Áp dụng ngay bây giờ
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Áp dụng ngay bây giờ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Số thực tế {0} / Số lượng chờ {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Số thực tế {0} / Số lượng chờ {1}
 DocType: Purchase Invoice,E-commerce GSTIN,Thương mại điện tử GSTIN
 DocType: Sales Order,Not Delivered,Không được vận chuyển
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,Ngày dự kiến không thể trước ngày giao dịch
 ,Bank Clearance Summary,Bản tóm lược giải tỏa ngân hàng
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Tạo và quản lý hàng ngày, hàng tuần và hàng tháng tiêu hóa email."
 DocType: Appraisal Goal,Appraisal Goal,Thẩm định mục tiêu
@@ -2450,12 +2495,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Các tòa nhà
 DocType: Fee Schedule,Fee Structure,Cơ cấu phí
 DocType: Timesheet Detail,Costing Amount,Chi phí tiền
-DocType: Student Admission,Application Fee,Phí đăng ký
+DocType: Student Admission Program,Application Fee,Phí đăng ký
 DocType: Process Payroll,Submit Salary Slip,Trình Lương trượt
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Giảm giá tối đa cho mục {0} {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Giảm giá tối đa cho mục {0} {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Nhập khẩu với số lượng lớn
 DocType: Sales Partner,Address & Contacts,Địa chỉ & Liên hệ
 DocType: SMS Log,Sender Name,Tên người gửi
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,Sắp xếp theo Tiêu chí
 DocType: POS Profile,[Select],[Chọn]
 DocType: Vital Signs,Blood Pressure (diastolic),Huyết áp (tâm trương)
 DocType: SMS Log,Sent To,Gửi Đến
@@ -2464,14 +2510,14 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Ngày Liên hệ Tiếp theo không thể  ở dạng quá khứ
 DocType: Company,For Reference Only.,Chỉ để tham khảo.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},Bác sĩ {0} không có mặt trên {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,Chọn Batch No
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Chọn Batch No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Không hợp lệ {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,Inv Inv
 DocType: Sales Invoice Advance,Advance Amount,Số tiền ứng trước
 DocType: Manufacturing Settings,Capacity Planning,Kế hoạch công suất
 DocType: Supplier Quotation,Rounding Adjustment (Company Currency,Điều chỉnh làm tròn (Đơn vị tiền tệ của công ty
-apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,"""Từ ngày"" là cần thiết"
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,"""Từ ngày"" là bắt buộc"
 DocType: Journal Entry,Reference Number,Số liệu tham khảo
 DocType: Employee,Employment Details,Chi tiết việc làm
 DocType: Employee,New Workplace,Nơi làm việc mới
@@ -2480,15 +2526,15 @@
 DocType: Normal Test Items,Require Result Value,Yêu cầu Giá trị Kết quả
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Trường hợp số không thể là 0
 DocType: Item,Show a slideshow at the top of the page,Hiển thị một slideshow ở trên cùng của trang
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,BOMs
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,Cửa hàng
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,BOMs
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Cửa hàng
 DocType: Project Type,Projects Manager,Quản lý dự án
 DocType: Serial No,Delivery Time,Thời gian giao hàng
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Người cao tuổi Dựa trên
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,Huỷ bỏ cuộc
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,Huỷ bỏ cuộc
 DocType: Item,End of Life,Kết thúc của cuộc sống
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,Du lịch
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,Không có cấu trúc lương có hiệu lực hoặc mặc định được tìm thấy cho nhân viên {0} với các kỳ hạn có sẵn
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Du lịch
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,Không có cấu trúc lương có hiệu lực hoặc mặc định được tìm thấy cho nhân viên {0} với các kỳ hạn có sẵn
 DocType: Leave Block List,Allow Users,Cho phép người sử dụng
 DocType: Purchase Order,Customer Mobile No,Số điện thoại khách hàng
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Định kỳ
@@ -2497,12 +2543,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Cập nhật giá
 DocType: Item Reorder,Item Reorder,Mục Sắp xếp lại
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Trượt Hiện Lương
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,Vật liệu chuyển
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Vật liệu chuyển
 DocType: Fees,Send Payment Request,Gửi yêu cầu thanh toán
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Xác định các hoạt động, chi phí vận hành và số hiệu của  một hoạt động độc nhất tới các hoạt động của bạn"
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Tài liệu này bị quá giới hạn bởi {0} {1} cho mục {4}. bạn đang làm cho một {3} so với cùng {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,Xin hãy thiết lập định kỳ sau khi tiết kiệm
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,tài khoản số lượng Chọn thay đổi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,tài khoản số lượng Chọn thay đổi
 DocType: Purchase Invoice,Price List Currency,Danh sách giá ngoại tệ
 DocType: Naming Series,User must always select,Người sử dụng phải luôn luôn chọn
 DocType: Stock Settings,Allow Negative Stock,Cho phép tồn kho âm
@@ -2513,7 +2559,7 @@
 DocType: Quality Inspection,Verified By,Xác nhận bởi
 apps/erpnext/erpnext/setup/doctype/company/company.py +70,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Không thể thay đổi tiền tệ mặc định của công ty, bởi vì có giao dịch hiện có. Giao dịch phải được hủy bỏ để thay đổi tiền tệ mặc định."
 DocType: Grading Scale Interval,Grade Description,lớp Mô tả
-DocType: Stock Entry,Purchase Receipt No,Mua hóa đơn Không
+DocType: Stock Entry,Purchase Receipt No,Số hóa đơn mua hàng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Tiền cọc
 DocType: Process Payroll,Create Salary Slip,Tạo Mức lương trượt
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Truy xuất nguồn gốc
@@ -2522,7 +2568,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,Nhân viên
 DocType: Sample Collection,Collected Time,Thời gian thu thập
 DocType: Company,Sales Monthly History,Lịch sử hàng tháng bán hàng
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,Chọn Batch
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Chọn Batch
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} đã được lập hóa đơn đầy đủ
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Các dấu hiệu sống
 DocType: Training Event,End Time,End Time
@@ -2530,21 +2576,23 @@
 DocType: Payment Entry,Payment Deductions or Loss,Các khoản giảm trừ thanh toán hoặc mất
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Điều khoản hợp đồng tiêu chuẩn cho bán hàng hoặc mua hàng.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Nhóm theo Phiếu
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Bạn có chắc chắn muốn hủy cuộc hẹn này không?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Đường ống dẫn bán hàng
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},Hãy thiết lập tài khoản mặc định trong phần Lương {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Đã yêu cầu với
 DocType: Rename Tool,File to Rename,Đổi tên tệp tin
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Vui lòng chọn BOM cho Item trong Row {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Vui lòng chọn BOM cho Item trong Row {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Tài khoảng {0} không phù hợp với Công ty {1} tại phương thức tài khoản: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},Quy định BOM {0} không tồn tại cho mục {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Lịch trình bảo trì {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
+DocType: POS Profile,Applicable for Users,Áp dụng cho người dùng
 DocType: Notification Control,Expense Claim Approved,Chi phí bồi thường được phê duyệt
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,Phiếu lương của nhân viên {0} đã được tạo ra trong giai đoạn này
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Phiếu lương của nhân viên {0} đã được tạo ra trong giai đoạn này
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Dược phẩm
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Chi phí Mua Items
 DocType: Selling Settings,Sales Order Required,Đơn đặt hàng đã yêu cầu
 DocType: Purchase Invoice,Credit To,Để tín dụng
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Leads / Khách hàng có hiệu lực
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Đầu mối kinh doanh / Khách hàng
 DocType: Employee Education,Post Graduate,Sau đại học
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Lịch trình bảo dưỡng chi tiết
 DocType: Supplier Scorecard,Warn for new Purchase Orders,Cảnh báo đối với Đơn mua hàng mới
@@ -2564,6 +2612,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Cơ quan
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,Cơ quan
 DocType: BOM Update Tool,BOM Update Tool,Công cụ cập nhật BOM
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","Tài khoản của bên thứ ba không được chỉ định, vui lòng thiết lập tài khoản bên mặc định trong công ty"
 DocType: SG Creation Tool Course,Student Group Name,Tên nhóm học sinh
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Tạo các khoản phí
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Hãy chắc chắn rằng bạn thực sự muốn xóa tất cả các giao dịch cho công ty này. Dữ liệu tổng thể của bạn vẫn được giữ nguyên. Thao tác này không thể được hoàn tác.
@@ -2572,29 +2621,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) không được lớn hơn số lượng trong kế hoạch ({2}) trong lệnh sản xuất {3}
 DocType: Shipping Rule,Shipping Rule Label,Quy tắc vận chuyển nhãn hàng
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Diễn đàn người dùng
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,Nguyên liệu thô không thể để trống.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.","Không thể cập nhật tồn kho, hóa đơn chứa vật tư vận chuyển tận nơi."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Nguyên liệu thô không thể để trống.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.","Không thể cập nhật tồn kho, hóa đơn chứa vật tư vận chuyển tận nơi."
 DocType: Lab Test Sample,Lab Test Sample,Mẫu thử nghiệm phòng thí nghiệm
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Bút toán nhật ký
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Bạn không thể thay đổi tỷ lệ nếu BOM đã được đối ứng với vật tư bất kỳ.
+DocType: Restaurant,Invoice Series Prefix,Tiền tố của Dòng hoá đơn
 DocType: Employee,Previous Work Experience,Kinh nghiệm làm việc trước đây
 DocType: Stock Entry,For Quantity,Đối với lượng
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Vui lòng nhập theo kế hoạch Số lượng cho hàng {0} tại hàng {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Vui lòng nhập theo kế hoạch Số lượng cho hàng {0} tại hàng {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} chưa được đệ trình
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Yêu cầu cho các hạng mục.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Để sản xuất riêng biệt sẽ được tạo ra cho mỗi mục tốt đã hoàn thành.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} phải là số âm trong tài liệu trả về
 ,Minutes to First Response for Issues,Các phút tới phản hồi đầu tiên cho kết quả
 DocType: Purchase Invoice,Terms and Conditions1,Điều khoản và Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,Tên của tổ chức  mà bạn đang thiết lập hệ thống này.
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,Tên của tổ chức  mà bạn đang thiết lập hệ thống này.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Bút toán hạch toán đã đóng băng đến ngày này, không ai có thể làm / sửa đổi nào ngoại trừ người có vai trò xác định dưới đây."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Xin vui lòng lưu các tài liệu trước khi tạo ra lịch trình bảo trì
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Giá mới nhất được cập nhật trong tất cả các BOMs
 DocType: Fee Schedule,Successful,Thành công
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Tình trạng dự án
 DocType: UOM,Check this to disallow fractions. (for Nos),Kiểm tra này để không cho phép các phần phân đoạn. (Cho Nos)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,Các đơn đặt hàng sản xuất sau đây được tạo ra:
-DocType: Student Admission,Naming Series (for Student Applicant),Đặt tên Series (cho sinh viên nộp đơn)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Các đơn đặt hàng sản xuất sau đây được tạo ra:
+DocType: Student Admission Program,Naming Series (for Student Applicant),Đặt tên Series (cho sinh viên nộp đơn)
 DocType: Delivery Note,Transporter Name,Tên người vận chuyển
 DocType: Authorization Rule,Authorized Value,Giá trị được ủy quyền
 DocType: BOM,Show Operations,Hiện Operations
@@ -2618,7 +2668,7 @@
 ,Employees working on a holiday,Nhân viên làm việc trên một kỳ nghỉ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Đánh dấu hiện tại
 DocType: Project,% Complete Method,% Hoàn thành phương pháp
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,Thuốc uống
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Thuốc uống
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Bảo trì ngày bắt đầu không thể trước ngày giao hàng cho dãy số {0}
 DocType: Production Order,Actual End Date,Ngày kết thúc thực tế
 DocType: BOM,Operating Cost (Company Currency),Chi phí điều hành (Công ty ngoại tệ)
@@ -2634,15 +2684,15 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +10,Assessment Group: ,Nhóm đánh giá:
 DocType: Item Reorder,Request for,Yêu cầu đối với
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Phê duyệt Người dùng không thể được giống như sử dụng các quy tắc là áp dụng để
-DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Tỷ giá cơ bản (theo như hàng hóa UOM)
+DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Tỷ giá cơ bản (trên mỗi đơn vị chuẩn của hàng hóa)
 DocType: SMS Log,No of Requested SMS,Số  SMS được yêu cầu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,Để lại Nếu không phải trả tiền không phù hợp với hồ sơ Để lại ứng dụng đã được phê duyệt
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Để lại Nếu không phải trả tiền không phù hợp với hồ sơ Để lại ứng dụng đã được phê duyệt
 DocType: Campaign,Campaign-.####,Chiến dịch.# # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Những bước tiếp theo
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Vui lòng cung cấp mục cụ thể với mức giá tốt nhất có thể
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Làm cho hóa đơn
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto Cơ hội gần thi hành sau 15 ngày
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Đơn đặt hàng mua không được cho {0} do bảng điểm của điểm số {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Đơn đặt hàng mua không được cho {0} do bảng điểm của điểm số {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,cuối Năm
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2679,7 +2729,6 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","Mẫu thuế tiêu chuẩn có thể được chấp thuận với tất cả các giao dịch mua bán. Mẫu vật này có thể bao gồm danh sách các đầu thuế và cũng có thể là các đầu phí tổn như ""vận chuyển"",,""Bảo hiểm"",""Xử lý"" vv.#### Lưu ý: tỷ giá thuế mà bạn định hình ở đây sẽ là tỷ giá thuế tiêu chuẩn cho tất cả các **mẫu hàng**. Nếu có **các mẫu hàng** có các tỷ giá khác nhau, chúng phải được thêm vào bảng **Thuế mẫu hàng** tại **mẫu hàng** chủ. #### Mô tả của các cột 1. Kiểu tính toán: -Điều này có thể vào  **tổng thuần** (tổng số lượng cơ bản).-** Tại hàng tổng trước đó / Số lượng** (đối với các loại thuế hoặc phân bổ tích lũy)... Nếu bạn chọn phần này, thuế sẽ được chấp thuận như một phần trong phần trăm của cột trước đó (trong bảng thuế) số lượng hoặc tổng. -**Thực tế** (như đã đề cập tới).2. Đầu tài khoản: Tài khoản sổ cái nơi mà loại thuế này sẽ được đặt 3. Trung tâm chi phí: Nếu thuế / sự phân bổ là môt loại thu nhập (giống như vận chuyển) hoặc là chi phí, nó cần được đặt trước với một trung tâm chi phí. 4 Mô tả: Mô tả của loại thuế (sẽ được in vào hóa đơn/ giấy báo giá) 5. Tỷ giá: Tỷ giá thuế. 6 Số lượng: SỐ lượng thuế 7.Tổng: Tổng tích lũy tại điểm này. 8. nhập dòng: Nếu được dựa trên ""Hàng tổng trước đó"" bạn có thể lựa chọn số hàng nơi sẽ được làm nền cho việc tính toán (mặc định là hàng trước đó).9. Loại thuế này có bao gồm trong tỷ giá cơ bản ?: Nếu bạn kiểm tra nó, nghĩa là loại thuế này sẽ không được hiển thị bên dưới bảng mẫu hàng, nhưng sẽ được bao gồm tại tỷ giá cơ bản tại bảng mẫu hàng chính của bạn.. Điều này rất hữu ích bất cứ khi nào bạn muốn đưa ra một loại giá sàn (bao gồm tất cả các loại thuế) đối với khách hàng,"
 DocType: Homepage,Homepage,Trang chủ
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Chọn Bác sĩ ...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',cập nhật tabConsultation set invoice = &#39;{0}&#39; với tên = &#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,số lượng REcd
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Hồ sơ Phí Tạo - {0}
 DocType: Asset Category Account,Asset Category Account,Loại tài khoản tài sản
@@ -2691,7 +2740,7 @@
 DocType: Asset,Manual,Hướng dẫn sử dụng
 DocType: Salary Component Account,Salary Component Account,Tài khoản phần lương
 DocType: Global Defaults,Hide Currency Symbol,Ẩn Ký hiệu tiền tệ
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card","ví dụ như Ngân hàng, tiền mặt, thẻ tín dụng"
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","ví dụ như Ngân hàng, tiền mặt, thẻ tín dụng"
 DocType: Lead Source,Source Name,Tên nguồn
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Huyết áp nghỉ ngơi bình thường ở người lớn là khoảng 120 mmHg tâm thu và huyết áp tâm trương 80 mmHg, viết tắt là &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Tín dụng Ghi chú
@@ -2710,16 +2759,16 @@
 DocType: Patient,Occupation,Nghề Nghiệp
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Hàng {0}: Ngày bắt đầu phải trước khi kết thúc ngày
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Tổng số (SL)
-DocType: Sales Invoice,This Document,Tài liệu này
 DocType: Installation Note Item,Installed Qty,Số lượng cài đặt
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Điều này có thể là do một số địa chỉ email không hợp lệ trong
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Bạn đã thêm
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Kết quả đào tạo
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Kết quả đào tạo
 DocType: Purchase Invoice,Is Paid,Được thanh toán
 DocType: Salary Structure,Total Earning,Tổng số Lợi nhuận
 DocType: Purchase Receipt,Time at which materials were received,Thời gian mà các tài liệu đã nhận được
 DocType: Stock Ledger Entry,Outgoing Rate,Tỷ giá đầu ra
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Chủ chi nhánh tổ chức.
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Chủ chi nhánh tổ chức.
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,hoặc
 DocType: Sales Order,Billing Status,Tình trạng thanh toán
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Báo lỗi
@@ -2734,8 +2783,9 @@
 DocType: Notification Control,Sales Order Message,Thông báo đơn đặt hàng
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Thiết lập giá trị mặc định như Công ty, tiền tệ, năm tài chính hiện tại, vv"
 DocType: Payment Entry,Payment Type,Loại thanh toán
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vui lòng chọn một lô hàng {0}. Không thể tìm thấy lô hàng nào đáp ứng yêu cầu này
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vui lòng chọn một  lô hàng  {0}. Không thể tìm thấy lô hàng nào đáp ứng yêu cầu này
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vui lòng chọn một lô hàng {0}. Không thể tìm thấy lô hàng nào đáp ứng yêu cầu này
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vui lòng chọn một  lô hàng  {0}. Không thể tìm thấy lô hàng nào đáp ứng yêu cầu này
+DocType: Hub Category,Parent Category,Gia phả
 DocType: Process Payroll,Select Employees,Chọn nhân viên
 DocType: Opportunity,Potential Sales Deal,Sales tiềm năng Deal
 DocType: Complaint,Complaints,Khiếu nại
@@ -2773,8 +2823,8 @@
 DocType: Bin,Reserved Quantity,Số lượng được dự trữ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Vui lòng nhập địa chỉ email hợp lệ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Vui lòng nhập địa chỉ email hợp lệ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,Vui lòng chọn một mục trong giỏ hàng
-DocType: Landed Cost Voucher,Purchase Receipt Items,Mua hóa đơn mục
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Vui lòng chọn một mục trong giỏ hàng
+DocType: Landed Cost Voucher,Purchase Receipt Items,Các mục trong hóa đơn mua hàng
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Các hình thức tùy biến
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,tiền còn thiếu
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Khấu hao Số tiền trong giai đoạn này
@@ -2783,15 +2833,15 @@
 DocType: Payment Request,Amount in customer's currency,Tiền quy đổi theo ngoại tệ của khách
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Giao hàng
 DocType: Stock Reconciliation Item,Current Qty,Số lượng hiện tại
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,Thêm nhà cung cấp
+DocType: Restaurant Menu,Restaurant Menu,Thực đơn nhà hàng
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Trước đó
 DocType: Appraisal Goal,Key Responsibility Area,Trách nhiệm chính
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Các đợt sinh viên giúp bạn theo dõi chuyên cần, đánh giá và lệ phí cho sinh viên"
 DocType: Payment Entry,Total Allocated Amount,Tổng số tiền phân bổ
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,Thiết lập tài khoản kho mặc định cho kho vĩnh viễn
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,Thiết lập tài khoản kho mặc định cho kho vĩnh viễn
 DocType: Item Reorder,Material Request Type,Loại nguyên liệu yêu cầu
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Sổ nhật biên kế toán phát sinh dành cho lương lương từ {0} đến {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save","Lưu trữ Cục bộ là đầy đủ, không lưu"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","Lưu trữ Cục bộ là đầy đủ, không lưu"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Hàng {0}: Nhân tố thay đổi UOM là bắt buộc
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Dung tích phòng
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Tài liệu tham khảo
@@ -2830,16 +2880,18 @@
 DocType: Project,Task Completion,nhiệm vụ hoàn thành
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Không trong kho
 DocType: Appraisal,HR User,Người sử dụng nhân sự
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Thuế và lệ phí được khấu trừ
-apps/erpnext/erpnext/hooks.py +129,Issues,Vấn đề
+apps/erpnext/erpnext/hooks.py +138,Issues,Vấn đề
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Tình trạng phải là một trong {0}
 DocType: Sales Invoice,Debit To,nợ với
+DocType: Restaurant Menu Item,Restaurant Menu Item,Danh mục thực đơn nhà hàng
 DocType: Delivery Note,Required only for sample item.,Yêu cầu chỉ cho mục mẫu.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Số lượng thực tế Sau khi giao dịch
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Không có bảng lương được  tìm thấy giữa {0} và {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Không có bảng lương được  tìm thấy giữa {0} và {1}
 ,Pending SO Items For Purchase Request,Trong khi chờ SO mục Đối với mua Yêu cầu
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Tuyển sinh
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1} bị vô hiệu
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Tuyển sinh
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} bị vô hiệu
 DocType: Supplier,Billing Currency,Ngoại tệ thanh toán
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Cực lớn
@@ -2862,6 +2914,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Xin đề cập không có các yêu cầu thăm
 DocType: Stock Settings,Default Valuation Method,Phương pháp mặc định Định giá
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,Chi phí
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Đang cập nhật. Nó có thể mất một thời gian.
 DocType: Vehicle Log,Fuel Qty,nhiên liệu Số lượng
 DocType: Production Order Operation,Planned Start Time,Planned Start Time
 DocType: Course,Assessment,"Thẩm định, lượng định, đánh giá"
@@ -2877,7 +2930,7 @@
 DocType: Price List,Price List Master,Giá Danh sách Thầy
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Tất cả các giao dịch bán hàng đều được gắn tag với nhiều **Nhân viên kd **  vì thế bạn có thể thiết lập và giám sát các mục tiêu kinh doanh
 ,S.O. No.,SO số
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},Vui lòng tạo Khách hàng từ Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},Vui lòng tạo Khách hàng từ Lead {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Chọn bệnh nhân
 DocType: Price List,Applicable for Countries,Áp dụng đối với các nước
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Tên thông số
@@ -2921,27 +2974,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Chi phí tài khoản / khác biệt ({0}) phải là một ""lợi nhuận hoặc lỗ 'tài khoản"
 DocType: Project,Copied From,Sao chép từ
 DocType: Project,Copied From,Sao chép từ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},Tên lỗi: {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Sự thiếu
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Tên lỗi: {0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,Sự thiếu
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} không liên kết với {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Tại nhà cho nhân viên {0} đã được đánh dấu
 DocType: Packing Slip,If more than one package of the same type (for print),Nếu có nhiều hơn một gói cùng loại (đối với in)
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Vui lòng đặt khách hàng mặc định trong Cài đặt nhà hàng
 ,Salary Register,Mức lương Đăng ký
 DocType: Warehouse,Parent Warehouse,Kho chính
 DocType: C-Form Invoice Detail,Net Total,Tổng thuần
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},Không tìm thấy BOM mặc định cho Mục {0} và Dự án {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Không tìm thấy BOM mặc định cho Mục {0} và Dự án {1}
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Xác định các loại cho vay khác nhau
 DocType: Bin,FCFS Rate,FCFS Tỷ giá
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Số tiền nợ
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Thời gian (bằng phút)
 DocType: Project Task,Working,Làm việc
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Cổ phiếu xếp hàng (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,Năm tài chính
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Năm tài chính
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} không thuộc về Công ty {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,Không thể giải quyết chức năng điểm số tiêu chuẩn cho {0}. Đảm bảo công thức là hợp lệ.
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Chi phí như trên
 DocType: Healthcare Settings,Out Patient Settings,Cài đặt bệnh nhân ra ngoài
 DocType: Account,Round Off,Làm Tròn Số
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,Số lượng phải là dương
 ,Requested Qty,Số lượng yêu cầu
 DocType: Tax Rule,Use for Shopping Cart,Sử dụng cho Giỏ hàng
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Giá trị {0} cho thuộc tính {1} không tồn tại trong danh sách các giá trị mục Giá trị thuộc tính cho mục {2}
@@ -2950,7 +3005,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Phí sẽ được phân phối không cân xứng dựa trên mục qty hoặc số tiền, theo lựa chọn của bạn"
 DocType: Maintenance Visit,Purposes,Mục đích
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Ít nhất một mặt hàng cần được nhập với số lượng tiêu cực trong tài liệu trở lại
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,Thêm các Khóa học
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Hoạt động {0} lâu hơn bất kỳ giờ làm việc có sẵn trong máy trạm {1}, phá vỡ các hoạt động vào nhiều hoạt động"
 ,Requested,Yêu cầu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Không có lưu ý
@@ -2962,6 +3016,8 @@
 DocType: Employee Loan,Repaid/Closed,Hoàn trả / đóng
 DocType: Item,Total Projected Qty,Tổng số lượng đã được lên dự án
 DocType: Monthly Distribution,Distribution Name,Tên phân phối
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Nhà cung cấp&gt; Loại nhà cung cấp
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Tỷ lệ định giá không tìm thấy cho Mục {0}, yêu cầu phải làm các mục kế toán cho {1} {2}. Nếu mục đang giao dịch dưới dạng mục tỷ lệ không bằng giá trị trong {1}, vui lòng đề cập rằng trong mục {1} Bảng mục. Nếu không, vui lòng tạo một giao dịch chứng khoán đến cho mặt hàng hoặc đề cập đến tỷ lệ định giá trong bản ghi mục, và sau đó thử gửi / hủy mục nhập này"
 DocType: Course,Course Code,Mã khóa học
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Duyệt chất lượng là cần thiết cho mục {0}
 DocType: POS Settings,Use POS in Offline Mode,Sử dụng POS trong chế độ Ngoại tuyến
@@ -2972,14 +3028,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Quản lý Cây thư mục địa bàn
 DocType: Journal Entry Account,Sales Invoice,Hóa đơn bán hàng
 DocType: Journal Entry Account,Party Balance,Số dư đối tác
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,Vui lòng chọn Apply Discount On
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Vui lòng chọn Apply Discount On
 DocType: Company,Default Receivable Account,Mặc định Tài khoản phải thu
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Tạo Ngân hàng xuất nhập cảnh để tổng tiền lương trả cho các tiêu chí lựa chọn ở trên
 DocType: Physician,Physician Schedule,Lịch bác sĩ
 DocType: Purchase Invoice,Deemed Export,Xuất khẩu được cho là hợp pháp
 DocType: Stock Entry,Material Transfer for Manufacture,Vận chuyển nguyên liệu để sản xuất
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Tỷ lệ phần trăm giảm giá có thể được áp dụng hoặc chống lại một danh sách giá hay cho tất cả Bảng giá.
-DocType: Purchase Invoice,Half-yearly,Nửa năm
+DocType: Subscription,Half-yearly,Nửa năm
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Hạch toán kế toán cho hàng tồn kho
 DocType: Lab Test,LabTest Approver,Người ước lượng LabTest
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Bạn đã đánh giá các tiêu chí đánh giá {}.
@@ -3008,13 +3064,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Tắm nhỏ
 DocType: Company,Standard Template,Mẫu chuẩn
 DocType: Training Event,Theory,Lý thuyết
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,Cảnh báo: vật tư yêu cầu có số lượng ít hơn mức tối thiểu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Cảnh báo: vật tư yêu cầu có số lượng ít hơn mức tối thiểu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Tài khoản {0} bị đóng băng
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pháp nhân / Công ty con với một biểu đồ riêng của tài khoản thuộc Tổ chức.
 DocType: Payment Request,Mute Email,Tắt tiếng email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Thực phẩm, đồ uống và thuốc lá"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},Chỉ có thể thực hiện thanh toán cho các phiếu chưa thanh toán {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Tỷ lệ hoa hồng không có thể lớn hơn 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Chỉ có thể thực hiện thanh toán cho các phiếu chưa thanh toán {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,Tỷ lệ hoa hồng không có thể lớn hơn 100
 DocType: Stock Entry,Subcontract,Cho thầu lại
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,Vui lòng nhập {0} đầu tiên
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,Không có trả lời từ
@@ -3032,10 +3088,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Màu
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Tiêu chuẩn Kế hoạch đánh giá
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Ngăn chặn Đơn đặt hàng
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Nhạy cảm
 DocType: Patient Appointment,Scheduled,Dự kiến
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Yêu cầu báo giá.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vui lòng cài đặt Hệ thống Đặt tên Nhân viên trong Nguồn nhân lực&gt; Cài đặt Nhân sự
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Vui lòng chọn ""theo dõi qua kho"" là ""Không"" và ""là Hàng bán"" là ""Có"" và không có sản phẩm theo lô nào khác"
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,Chọn khách hàng
 DocType: Student Log,Academic,học tập
 DocType: Patient,Personal and Social History,Lịch sử cá nhân và xã hội
 DocType: Fee Schedule,Fee Breakup for each student,Phí phân chia cho mỗi học sinh
@@ -3045,7 +3102,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Định giá
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Dầu diesel
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,Danh sách giá ngoại tệ không được chọn
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,Danh sách giá ngoại tệ không được chọn
 apps/erpnext/erpnext/config/healthcare.py +46,Results,Các kết quả
 ,Student Monthly Attendance Sheet,Sinh viên tham dự hàng tháng Bảng
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Nhân viên {0} đã áp dụng cho {1} {2} giữa và {3}
@@ -3061,7 +3118,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Quản lý bán hàng đối tác.
 DocType: Quality Inspection,Inspection Type,Loại kiểm tra
 DocType: Fee Validity,Visited yet,Đã truy cập
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,Các kho hàng với giao dịch hiện tại không thể được chuyển đổi sang nhóm.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Các kho hàng với giao dịch hiện tại không thể được chuyển đổi sang nhóm.
 DocType: Assessment Result Tool,Result HTML,kết quả HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Hết hạn vào
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Thêm sinh viên
@@ -3088,7 +3145,7 @@
 DocType: Healthcare Settings,Result Printed,Kết quả in
 DocType: Asset Category Account,Depreciation Expense Account,TK Chi phí Khấu hao
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Thời gian thử việc
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},Xem {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Xem {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Chỉ các nút lá được cho phép trong giao dịch
 DocType: Expense Claim,Expense Approver,Người phê duyệt chi phí
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Dòng số {0}: Khách hàng tạm ứng phải bên Có
@@ -3100,7 +3157,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Tới ngày giờ
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Lịch khóa học xóa:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Các đăng nhập cho việc duy trì tin nhắn  tình trạng giao hàng
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,Đặt mục tiêu bán hàng
 DocType: Accounts Settings,Make Payment via Journal Entry,Hãy thanh toán qua Journal nhập
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,In vào
 DocType: Item,Inspection Required before Delivery,Kiểm tra bắt buộc trước khi giao hàng
@@ -3108,7 +3164,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Các hoạt động cấp phát
 DocType: Patient Appointment,Reminded,Được nhắc nhở
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,Tổ chức của bạn
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,Tổ chức của bạn
 DocType: Fee Component,Fees Category,phí Thể loại
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Vui lòng nhập ngày giảm.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
@@ -3120,7 +3176,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Sắp xếp lại Cấp
 DocType: Company,Chart Of Accounts Template,Chart of Accounts Template
 DocType: Attendance,Attendance Date,Ngày có mặt
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},Giá mẫu hàng cập nhật cho {0} trong Danh sách  {1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Giá mẫu hàng cập nhật cho {0} trong Danh sách  {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Chia tiền lương dựa trên thu nhập và khấu trừ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Tài khoản có các nút TK con không thể chuyển đổi sang sổ cái được
 DocType: Purchase Invoice Item,Accepted Warehouse,Kho nhận
@@ -3136,9 +3192,10 @@
 ,Employee Birthday,Nhân viên sinh nhật
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Công cụ điểm danh sinh viên hàng loạt
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,Giới hạn chéo
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Lên lịch Upto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Vốn liên doanh
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Một học kỳ với điều này &quot;Academic Year &#39;{0} và&#39; Tên hạn &#39;{1} đã tồn tại. Hãy thay đổi những mục này và thử lại.
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}","Như có những giao dịch hiện tại chống lại {0} mục, bạn không thể thay đổi giá trị của {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Như có những giao dịch hiện tại chống lại {0} mục, bạn không thể thay đổi giá trị của {1}"
 DocType: UOM,Must be Whole Number,Phải có nguyên số
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Những sự cho phép mới được phân bổ (trong nhiều ngày)
 DocType: Purchase Invoice,Invoice Copy,Bản sao hoá đơn
@@ -3148,7 +3205,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Số hóa đơn
 DocType: Shopping Cart Settings,Orders,Đơn đặt hàng
 DocType: Employee Leave Approver,Leave Approver,Để phê duyệt
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,Vui lòng chọn một đợt
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Vui lòng chọn một đợt
 DocType: Assessment Group,Assessment Group Name,Tên Nhóm Đánh giá
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Nguyên liệu được chuyển giao cho sản xuất
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Người dùng với vai trò ""Người duyệt chi"""
@@ -3163,7 +3220,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Bút toán kết thúc kỳ hạn
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Chọn Sở ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Chi phí bộ phận với các phát sinh đang có không thể chuyển đổi sang nhóm
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},Số tiền {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Số tiền {0} {1} {2} {3}
 DocType: Account,Depreciation,Khấu hao
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Nhà cung cấp (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Nhân viên Công cụ Attendance
@@ -3175,30 +3232,33 @@
 DocType: GL Entry,Voucher No,Chứng từ số
 ,Lead Owner Efficiency,Hiệu quả Chủ đầu tư
 ,Lead Owner Efficiency,Hiệu quả Chủ đầu tư
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,Phổ biến nhất
 DocType: Leave Allocation,Leave Allocation,Phân bổ lại
 DocType: Payment Request,Recipient Message And Payment Details,Tin nhắn người nhận và chi tiết thanh toán
 DocType: Training Event,Trainer Email,email người huấn luyện
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Các yêu cầu nguyên liệu {0} đã được tiến hành
+DocType: Restaurant Reservation,No of People,Số người
 DocType: Production Planning Tool,Include sub-contracted raw materials,Bao gồm các nguyên liệu phụ ký hợp đồng
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Mẫu thời hạn hoặc hợp đồng.
 DocType: Purchase Invoice,Address and Contact,Địa chỉ và Liên hệ
 DocType: Cheque Print Template,Is Account Payable,Là tài khoản phải trả
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Stock cannot be updated against Purchase Receipt {0},Hàng tồn kho thể cập nhật với biên lai mua hàng {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Stock cannot be updated against Purchase Receipt {0},Hàng tồn kho thể cập nhật từ phiếu nhận hàng {0}
 DocType: Supplier,Last Day of the Next Month,Ngày cuối cùng của tháng kế tiếp
 DocType: Support Settings,Auto close Issue after 7 days,Auto Issue gần sau 7 ngày
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Việc nghỉ không thể được phân bổ trước khi {0},  vì cân bằng nghỉ phép đã được chuyển tiếp trong bản ghi phân bổ nghỉ phép trong tương lai {1}"
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Lưu ý:  ngày tham chiếu/đến hạn vượt quá số ngày được phép của khách hàng là {0} ngày
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Lưu ý:  ngày tham chiếu/đến hạn vượt quá số ngày được phép của khách hàng là {0} ngày
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,sinh viên nộp đơn
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,HƯỚNG D ORN ĐỂ NHẬN
 DocType: Asset Category Account,Accumulated Depreciation Account,Tài khoản khấu hao lũy kế
-DocType: Stock Settings,Freeze Stock Entries,Bút toán đóng băng cổ phiếu
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Email này được tạo tự động
+DocType: Stock Settings,Freeze Stock Entries,Bút toán đóng băng tồn kho
 DocType: Program Enrollment,Boarding Student,Sinh viên nội trú
 DocType: Asset,Expected Value After Useful Life,Giá trị dự kiến After Life viết
 DocType: Item,Reorder level based on Warehouse,mức đèn đỏ mua vật tư (phải bổ xung hoặc đặt mua thêm)
 DocType: Activity Cost,Billing Rate,Tỷ giá thanh toán
 ,Qty to Deliver,Số lượng để Cung cấp
 ,Stock Analytics,Phân tích hàng tồn kho
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,Hoạt động không thể để trống
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Hoạt động không thể để trống
 DocType: Maintenance Visit Purpose,Against Document Detail No,Đối với tài liệu chi tiết Không
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Kiểu đối tác  bắt buộc
 DocType: Quality Inspection,Outgoing,Đi
@@ -3221,7 +3281,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Chọn sinh viên theo cách thủ công cho Nhóm dựa trên hoạt động
 DocType: Journal Entry,User Remark,Lưu ý người dùng
 DocType: Lead,Market Segment,Phân khúc thị trường
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},Số tiền trả không có thể lớn hơn tổng số dư âm {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},Số tiền trả không có thể lớn hơn tổng số dư âm {0}
 DocType: Supplier Scorecard Period,Variables,Biến
 DocType: Employee Internal Work History,Employee Internal Work History,Lịch sử nhân viên nội bộ làm việc
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Đóng cửa (Tiến sĩ)
@@ -3251,21 +3311,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Nhận thông tin cập nhật
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Tài khoản {2} không thuộc về Công ty {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Yêu cầu nguyên liệu {0} được huỷ bỏ hoặc dừng lại
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,Rời khỏi quản lý
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,Rời khỏi quản lý
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Nhóm bởi tài khoản
 DocType: Sales Order,Fully Delivered,Giao đầy đủ
 DocType: Lead,Lower Income,Thu nhập thấp
+DocType: Restaurant Order Entry,Current Order,Đơn hàng hiện tại
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Nguồn và kho đích không thể giống nhau tại hàng {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Tài khoản chênh lệch phải là một loại tài khoản tài sản / trách nhiệm pháp lý, kể từ khi hòa giải cổ này là một Entry Mở"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Số tiền giải ngân không thể lớn hơn Số tiền vay {0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Đi đến Chương trình
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Số mua hàng cần thiết cho mục {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,Thao tác đặt hàng sản phẩm không được tạo ra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Thao tác đặt hàng sản phẩm không được tạo ra
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Từ Ngày' phải sau 'Đến Ngày'
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Không thể thay đổi tình trạng như sinh viên {0} được liên kết với các ứng dụng sinh viên {1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Không thể thay đổi tình trạng như sinh viên {0} được liên kết với các ứng dụng sinh viên {1}
 DocType: Asset,Fully Depreciated,khấu hao hết
-,Stock Projected Qty,Dự kiến cổ phiếu Số lượng
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},Khách hàng {0} không thuộc về dự án {1}
+,Stock Projected Qty,Dự kiến số lượng tồn kho
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Khách hàng {0} không thuộc về dự án {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Đánh dấu có mặt HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Báo giá là đề xuất, giá thầu bạn đã gửi cho khách hàng"
 DocType: Sales Order,Customer's Purchase Order,Đơn Mua hàng của khách hàng
@@ -3276,8 +3337,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Hãy thiết lập Số khấu hao Thẻ vàng
 DocType: Supplier Scorecard Period,Calculations,Tính toán
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Giá trị hoặc lượng
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,Đơn đặt hàng sản xuất không thể được nâng lên cho:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Đơn đặt hàng sản xuất không thể được nâng lên cho:
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Phút
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vui lòng đặt Naming Series cho {0} qua Cài đặt&gt; Cài đặt&gt; Đặt tên Series
 DocType: Purchase Invoice,Purchase Taxes and Charges,Mua các loại thuế và các loại tiền công
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Chuyển đến Nhà cung cấp
 ,Qty to Receive,Số lượng để nhận
@@ -3291,7 +3353,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Để tín dụng tài khoản phải có một tài khoản Cân đối kế toán
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Nhà cung cấp tất cả các loại
 DocType: Global Defaults,Disable In Words,"Vô hiệu hóa ""Số tiền bằng chữ"""
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,Mục Mã số là bắt buộc vì mục không tự động đánh số
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,Mục Mã số là bắt buộc vì mục không tự động đánh số
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Báo giá {0} không thuộc loại {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Lịch trình bảo trì hàng
 DocType: Sales Order,%  Delivered,% Đã giao
@@ -3313,23 +3375,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Khai mạc Balance Equity
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Hòa giải
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,còn lại
 DocType: Appraisal,Appraisal,Thẩm định
 DocType: Purchase Invoice,GST Details,Chi tiết GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},Email đã được gửi đến NCC {0}
+DocType: Item,Default Sales Unit of Measure,Đơn vị Bán hàng mặc định của Đo lường
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Ngày lặp lại
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Ký Ủy quyền
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Để phê duyệt phải là một trong {0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Tạo phí
-DocType: Hub Settings,Seller Email,Người bán Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Tổng Chi phí mua hàng (thông qua danh đơn thu mua)
 DocType: Training Event,Start Time,Thời gian bắt đầu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,Chọn Số lượng
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Chọn Số lượng
 DocType: Customs Tariff Number,Customs Tariff Number,Số thuế hải quan
 DocType: Patient Appointment,Patient Appointment,Bổ nhiệm Bệnh nhân
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Phê duyệt Vai trò không thể giống như vai trò của quy tắc là áp dụng để
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Hủy đăng ký từ Email phân hạng này
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Hủy đăng ký từ Email phân hạng này
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Nhận các nhà cung cấp theo
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} không tìm thấy cho khoản {1}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Đi tới các Khoá học
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Gửi tin nhắn
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Không thể thiết lập là sổ cái vì Tài khoản có các node TK con
@@ -3342,17 +3407,19 @@
 DocType: Production Order,Material Transferred for Manufacturing,Chất liệu được chuyển giao cho sản xuất
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Tài khoản {0} không tồn tại
 DocType: Project,Project Type,Loại dự án
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Child Task tồn tại cho tác vụ này. Bạn không thể xóa Tác vụ này.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Hoặc SL mục tiêu hoặc số lượng mục tiêu là bắt buộc.
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Chi phí hoạt động khác nhau
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,Không còn kết quả
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Chi phí hoạt động khác nhau
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Thiết kiện để {0}, vì các nhân viên thuộc dưới Sales Người không có một ID người dùng {1}"
 DocType: Timesheet,Billing Details,Chi tiết Thanh toán
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Nguồn và kho đích phải khác nhau
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,Nguồn và kho đích phải khác nhau
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Không được cập nhật giao dịch tồn kho cũ hơn {0}
 DocType: Purchase Invoice Item,PR Detail,PR chi tiết
 DocType: Sales Order,Fully Billed,Được quảng cáo đầy đủ
 DocType: Vital Signs,BMI,BMI
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Tiền mặt trong tay
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +136,Delivery warehouse required for stock item {0},Kho giao hàng yêu cầu cho mục cổ phiếu {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +136,Delivery warehouse required for stock item {0},Cần nhập kho giao/nhận cho hàng hóa {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Tổng trọng lượng của gói. Thường là khối lượng tịnh + trọng lượng vật liệu. (Đối với việc in)
 apps/erpnext/erpnext/schools/doctype/course/course.js +3,Program,chương trình
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Người sử dụng với vai trò này được phép thiết lập tài khoản phong toả và tạo / sửa đổi ghi sổ kế toán đối với tài khoản phong toả
@@ -3373,7 +3440,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Chuyển khoản
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Kiểm tra tất cả
 DocType: Vehicle Log,Invoice Ref,Tham chiếu hóa đơn
-DocType: Purchase Order,Recurring Order,Đặt hàng theo định kỳ
 DocType: Company,Default Income Account,Tài khoản thu nhập mặc định
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Nhóm khách hàng / khách hàng
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Khép lại năm tài chính năm Lợi nhuận / Lỗ (tín dụng)
@@ -3387,9 +3453,9 @@
 DocType: Patient,A Negative,Âm bản
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Không có gì hơn để hiển thị.
 DocType: Lead,From Customer,Từ khách hàng
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,Các Cuộc gọi
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Các Cuộc gọi
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Một sản phẩm
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,Hàng loạt
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,Hàng loạt
 DocType: Project,Total Costing Amount (via Time Logs),Tổng số tiền Chi phí (thông qua Đăng nhập thời gian)
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Lập biểu phí
 DocType: Purchase Order Item Supplied,Stock UOM,Đơn vị tính Hàng tồn kho
@@ -3414,7 +3480,7 @@
 DocType: School Settings,Current Academic Term,Học thuật hiện tại
 DocType: School Settings,Current Academic Term,Học thuật hiện tại
 DocType: Sales Order,Not Billed,Không lập được hóa đơn
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,Cả 2 Kho hàng phải thuộc cùng một công ty
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Cả 2 Kho hàng phải thuộc cùng một công ty
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Chưa có liên hệ nào được bổ sung.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Lượng chứng thư chi phí hạ cánh
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Hóa đơn từ NCC
@@ -3423,7 +3489,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Số tiền giảm giá
 DocType: Purchase Invoice,Return Against Purchase Invoice,Trả về với hóa đơn mua hàng
 DocType: Item,Warranty Period (in days),Thời gian bảo hành (trong...ngày)
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',cập nhật `tabPatient Appointment` set sales_invoice = &#39;{0}&#39; với tên = &#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Mối quan hệ với Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Tiền thuần từ hoạt động
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Khoản 4
@@ -3432,8 +3497,8 @@
 DocType: Journal Entry Account,Journal Entry Account,Tài khoản bút toán kế toán
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Nhóm sinh viên
 DocType: Shopping Cart Settings,Quotation Series,Báo giá seri
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Một mục tồn tại với cùng một tên ({0}), hãy thay đổi tên nhóm mục hoặc đổi tên mục"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,Vui lòng chọn của khách hàng
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Một mục tồn tại với cùng một tên ({0}), hãy thay đổi tên nhóm mục hoặc đổi tên mục"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Vui lòng chọn của khách hàng
 DocType: C-Form,I,tôi
 DocType: Company,Asset Depreciation Cost Center,Chi phí bộ phận - khấu hao tài sản
 DocType: Sales Order Item,Sales Order Date,Ngày đơn đặt hàng
@@ -3442,6 +3507,7 @@
 DocType: Assessment Plan,Assessment Plan,Kế hoạch đánh giá
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Đã tạo {0} khách hàng.
 DocType: Stock Settings,Limit Percent,phần trăm giới hạn
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Hiện tại không có kho dự trữ nào trong kho
 ,Payment Period Based On Invoice Date,Thời hạn thanh toán Dựa trên hóa đơn ngày
 DocType: Sample Collection,No. of print,Số lượng in
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Thiếu ngoại tệ Tỷ giá ngoại tệ cho {0}
@@ -3497,13 +3563,14 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Tổng trả- Tổng Trích - trả nợ
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,BOM BOM hiện tại và mới không thể giống nhau
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,ID Phiếu lương
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,ID Phiếu lương
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Ngày nghỉ hưu phải lớn hơn ngày gia nhập
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Có lỗi trong khi lập kế hoạch khóa học về:
 DocType: Sales Invoice,Against Income Account,Đối với tài khoản thu nhập
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Đã giao hàng
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Mục {0}: qty Ra lệnh {1} không thể ít hơn qty đặt hàng tối thiểu {2} (quy định tại khoản).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Mục {0}: qty Ra lệnh {1} không thể ít hơn qty đặt hàng tối thiểu {2} (quy định tại khoản).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Tỷ lệ phân phối hàng tháng
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Vui lòng đăng nhập như một người dùng khác.
 DocType: Territory,Territory Targets,Các mục tiêu tại khu vực
 DocType: Delivery Note,Transporter Info,Thông tin người  vận chuyển
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Hãy thiết lập mặc định {0} trong Công ty {1}
@@ -3511,13 +3578,14 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Cùng nhà cung cấp đã được nhập nhiều lần
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Tổng lợi nhuận / lỗ
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Mua hàng mục Cung cấp
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,Tên Công ty không thể công ty
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Tên Công ty không thể công ty
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Tiêu đề trang cho các mẫu tài liệu in
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Tiêu đề cho các mẫu in, ví dụ như hóa đơn chiếu lệ."
 DocType: Program Enrollment,Walking,Đi dạo
 DocType: Student Guardian,Student Guardian,Người giám hộ sinh viên
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Phí kiểu định giá không thể đánh dấu là toàn bộ
 DocType: POS Profile,Update Stock,Cập nhật hàng tồn kho
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,trong đăng ký
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM khác nhau cho các hạng mục sẽ dẫn đến (Tổng) giá trị Trọng lượng Tịnh không chính xác. Hãy chắc chắn rằng Trọng lượng Tịnh của mỗi hạng mục là trong cùng một UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Tỷ giá BOM
 DocType: Asset,Journal Entry for Scrap,BÚt toán nhật ký cho hàng phế liệu
@@ -3567,15 +3635,17 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Hệ thống người dùng (đăng nhập) ID. Nếu được thiết lập, nó sẽ trở thành mặc định cho tất cả các hình thức nhân sự."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Từ {1}
 DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Hàng đợi để cập nhật giá mới nhất trong tất cả Hóa đơn. Có thể mất vài phút.
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Hàng đợi để cập nhật giá mới nhất trong tất cả Hóa đơn. Có thể mất vài phút.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Tên tài khoản mới. Lưu ý: Vui lòng không tạo tài khoản cho khách hàng và nhà cung cấp
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Nước khôn ngoan Địa chỉ mặc định Templates
 DocType: Sales Order Item,Supplier delivers to Customer,Nhà cung cấp mang đến cho khách hàng
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/Item/{0}) không còn hàng
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},Ngày đến hạn /ngày tham chiếu không được sau {0}
+,Sales Payment Summary,Tóm tắt thanh toán bán hàng
+DocType: Restaurant,Restaurant,Nhà hàng
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},Ngày đến hạn /ngày tham chiếu không được sau {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,dữ liệu nhập và xuất
 DocType: Patient,Account Details,Chi tiết tài khoản
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,Không có học sinh Tìm thấy
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,Không có học sinh Tìm thấy
 DocType: Medical Department,Medical Department,Bộ phận y tế
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Bảng ghi điểm của Người cung cấp Thẻ điểm
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Hóa đơn viết bài ngày
@@ -3586,8 +3656,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Vui lòng chọn ngày đăng bài trước khi lựa chọn đối tác
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Của AMC
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Vui lòng chọn Báo giá
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,Vui lòng chọn Báo giá
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Vui lòng chọn Báo giá
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Vui lòng chọn Báo giá
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Số khấu hao Thẻ vàng không thể lớn hơn Tổng số khấu hao
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Thực hiện bảo trì đăng nhập
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,Vui lòng liên hệ với người Quản lý Bán hàng Chính {0}
@@ -3595,7 +3665,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Quản trị Công ty (không phải khách hàng hoặc nhà cung cấp)
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Điều này được dựa trên sự tham gia của sinh viên này
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,Không có học sinh trong
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Thêm nhiều mặt hàng hoặc hình thức mở đầy đủ
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Thêm nhiều mặt hàng hoặc hình thức mở đầy đủ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Phiếu giao hàng {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Chuyển đến Người dùng
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Số tiền thanh toán + Viết Tắt Số tiền không thể lớn hơn Tổng cộng
@@ -3615,37 +3685,40 @@
 DocType: Fee Schedule,Fee Schedule,Biểu phí
 DocType: Hub Settings,Publish Availability,Xuất bản hiệu lực
 DocType: Company,Create Chart Of Accounts Based On,Tạo Chart of Accounts Dựa On
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Không thể chuyển nó sang nhóm không. Nhiệm vụ trẻ em tồn tại.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Ngày sinh thể không được lớn hơn ngày hôm nay.
 ,Stock Ageing,Hàng tồn kho cũ dần
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Sinh viên {0} tồn tại đối với người nộp đơn sinh viên {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Điều chỉnh Làm tròn (Đơn vị tiền tệ của Công ty)
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,Thời gian biểu
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Thời gian biểu
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' bị vô hiệu hóa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Đặt làm mở
 DocType: Cheque Print Template,Scanned Cheque,quét Séc
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Gửi email tự động tới các Liên hệ khi Đệ trình các giao dịch.
 DocType: Timesheet,Total Billable Amount,Tổng số tiền được Lập hoá đơn
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Khoản 3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Đăng nhập
 DocType: Purchase Order,Customer Contact Email,Email Liên hệ Khách hàng
 DocType: Warranty Claim,Item and Warranty Details,Hàng và bảo hành chi tiết
 DocType: Sales Team,Contribution (%),Đóng góp (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Lưu ý: Bút toán thanh toán sẽ không được tạo ra từ 'tiền mặt hoặc tài khoản ngân hàng' không được xác định
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,Dự án {0} đã tồn tại
 DocType: Medical Department,Nursing User,Người điều dưỡng
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Trách nhiệm
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,Thời hạn hiệu lực của báo giá này đã kết thúc.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Thời hạn hiệu lực của báo giá này đã kết thúc.
 DocType: Expense Claim Account,Expense Claim Account,Tài khoản chi phí bồi thường
 DocType: Accounts Settings,Allow Stale Exchange Rates,Cho phép tỷ giá hối đoái cũ
 DocType: Sales Person,Sales Person Name,Người bán hàng Tên
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Vui lòng nhập ít nhất 1 hóa đơn trong bảng
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,Thêm người dùng
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Thêm người dùng
 DocType: POS Item Group,Item Group,Nhóm hàng
 DocType: Item,Safety Stock,Hàng hóa dự trữ
 DocType: Healthcare Settings,Healthcare Settings,Cài đặt Y tế
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Tiến% cho một nhiệm vụ không thể có nhiều hơn 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Tiến% cho một nhiệm vụ không thể có nhiều hơn 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Trước bảng điều hòa
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Để {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Thuế và Phí bổ sung (tiền tệ công ty)
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Dãy thuế mẫu hàng{0} phải có tài khoản của các loại thuế, thu nhập hoặc chi phí hoặc có thu phí"
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Dãy thuế mẫu hàng{0} phải có tài khoản của các loại thuế, thu nhập hoặc chi phí hoặc có thu phí"
 DocType: Sales Order,Partly Billed,Được quảng cáo một phần
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Mục {0} phải là một tài sản cố định mục
 DocType: Item,Default BOM,BOM mặc định
@@ -3661,6 +3734,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,biến số
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Giao hàng tận nơi từ Lưu ý
 DocType: Student,Student Email Address,Địa chỉ Email Sinh viên
+DocType: Item,Hub Warehouse,Kho trung tâm
 DocType: Physician Schedule Time Slot,From Time,Từ thời gian
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Trong kho:
 DocType: Notification Control,Custom Message,Tùy chỉnh tin nhắn
@@ -3669,9 +3743,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Địa chỉ của sinh viên
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Địa chỉ của sinh viên
 DocType: Purchase Invoice,Price List Exchange Rate,Danh sách Tỷ giá
+DocType: POS Profile,POS Profile Name,Tên Hồ sơ POS
 DocType: Purchase Invoice Item,Rate,Đơn giá
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Tập
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,Tên địa chỉ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,Tên địa chỉ
 DocType: Stock Entry,From BOM,Từ BOM
 DocType: Assessment Code,Assessment Code,Mã Đánh giá
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Cơ bản
@@ -3685,11 +3760,12 @@
 DocType: Salary Slip,Salary Structure,Cơ cấu tiền lương
 DocType: Account,Bank,Ngân hàng
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Hãng hàng không
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,Vấn đề liệu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Vấn đề liệu
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Đã xảy ra lỗi khi tạo định kỳ
 DocType: Material Request Item,For Warehouse,Cho kho hàng
 DocType: Employee,Offer Date,Kỳ hạn Yêu cầu
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Các bản dự kê giá
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,Bạn đang ở chế độ offline. Bạn sẽ không thể để lại cho đến khi bạn có mạng.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,Bạn đang ở chế độ offline. Bạn sẽ không thể để lại cho đến khi bạn có mạng.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Không có nhóm học sinh được tạo ra.
 DocType: Purchase Invoice Item,Serial No,Không nối tiếp
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,SỐ tiền trả  hàng tháng không thể lớn hơn Số tiền vay
@@ -3699,17 +3775,18 @@
 DocType: Salary Slip,Total Working Hours,Tổng số giờ làm việc
 DocType: Subscription,Next Schedule Date,Ngày Lịch kế tiếp
 DocType: Stock Entry,Including items for sub assemblies,Bao gồm các mặt hàng cho các tiểu hội
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,Nhập giá trị phải được tích cực
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,Tất cả các vùng lãnh thổ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Nhập giá trị phải được tích cực
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Tất cả các vùng lãnh thổ
 DocType: Purchase Invoice,Items,Khoản mục
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Sinh viên đã được ghi danh.
 DocType: Fiscal Year,Year Name,Tên năm
 DocType: Process Payroll,Process Payroll,Quá trình tính lương
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,Có nhiều ngày lễ hơn ngày làm việc trong tháng này.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Có nhiều ngày lễ hơn ngày làm việc trong tháng này.
 DocType: Product Bundle Item,Product Bundle Item,Gói sản phẩm hàng
 DocType: Sales Partner,Sales Partner Name,Tên đại lý
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,Yêu cầu Báo giá
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Yêu cầu Báo giá
 DocType: Payment Reconciliation,Maximum Invoice Amount,Số tiền Hoá đơn tối đa
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Huyết học
 DocType: Normal Test Items,Normal Test Items,Các bài kiểm tra thông thường
 DocType: Student Language,Student Language,Ngôn ngữ học
 apps/erpnext/erpnext/config/selling.py +23,Customers,các khách hàng
@@ -3721,10 +3798,11 @@
 DocType: Issue,Opening Time,Thời gian mở
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"""Từ ngày đến ngày"" phải có"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Chứng khoán và Sở Giao dịch hàng hóa
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Mặc định Đơn vị đo lường cho Variant &#39;{0}&#39; phải giống như trong Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Mặc định Đơn vị đo lường cho Variant &#39;{0}&#39; phải giống như trong Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Tính toán dựa trên
 DocType: Delivery Note Item,From Warehouse,Từ kho
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,Không có mẫu hàng với hóa đơn nguyên liệu để sản xuất
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,Không có mẫu hàng với hóa đơn nguyên liệu để sản xuất
+DocType: Restaurant,Default Customer,Khách hàng Mặc định
 DocType: Assessment Plan,Supervisor Name,Tên Supervisor
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Không xác nhận nếu cuộc hẹn được tạo ra cho cùng một ngày
 DocType: Program Enrollment Course,Program Enrollment Course,Khóa học ghi danh chương trình
@@ -3752,7 +3830,7 @@
 DocType: Payment Entry,Internal Transfer,Chuyển nội bộ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Tài khoản con tồn tại cho tài khoản này. Bạn không thể xóa tài khoản này.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,số lượng mục tiêu là bắt buộc
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},Không có BOM mặc định tồn tại cho mẫu  {0}
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},Không có BOM mặc định tồn tại cho mẫu  {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Vui lòng chọn ngày đăng bài đầu tiên
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Ngày Khai mạc nên trước ngày kết thúc
 DocType: Leave Control Panel,Carry Forward,Carry Forward
@@ -3788,6 +3866,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Tổng số hiện tại
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,Báo cáo kế toán
 DocType: Drug Prescription,Hour,Giờ
+DocType: Restaurant Order Entry,Last Sales Invoice,Hóa đơn bán hàng cuối cùng
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Dãy số mới không thể có  kho hàng. Kho hàng phải đượcthiết lập bởi Bút toán kho dự trữ  hoặc biên lai mua hàng
 DocType: Lead,Lead Type,Loại Lead
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Bạn không được uỷ quyền phê duyệt nghỉ trên Các khối kỳ hạn
@@ -3824,65 +3903,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,tạo người dùng
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,Gram
 DocType: Supplier Scorecard,Per Month,Mỗi tháng
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,Số lượng để sản xuất phải lớn hơn 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Số lượng để sản xuất phải lớn hơn 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Thăm báo cáo cho các cuộc gọi bảo trì.
 DocType: Stock Entry,Update Rate and Availability,Cập nhật tỷ giá và hiệu lực
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Tỷ lệ phần trăm bạn được phép nhận hoặc cung cấp nhiều so với số lượng đặt hàng. Ví dụ: Nếu bạn đã đặt mua 100 đơn vị. và Trợ cấp của bạn là 10% sau đó bạn được phép nhận 110 đơn vị.
 DocType: POS Customer Group,Customer Group,Nhóm khách hàng
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),ID hàng loạt mới (Tùy chọn)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),ID hàng loạt mới (Tùy chọn)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),ID hàng loạt mới (Tùy chọn)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),ID hàng loạt mới (Tùy chọn)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},Tài khoản chi phí là bắt buộc đối với mục {0}
 DocType: BOM,Website Description,Mô tả Website
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Chênh lệch giá tịnh trong vốn sở hữu
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Mới nhất
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Hãy hủy hóa đơn mua hàng {0} đầu tiên
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Địa chỉ email phải là duy nhất, đã tồn tại cho {0}"
 DocType: Serial No,AMC Expiry Date,Ngày hết hạn hợp đồng bảo hành (AMC)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,Biên lai
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,Phiếu nhận
 ,Sales Register,Đăng ký bán hàng
 DocType: Daily Work Summary Settings Company,Send Emails At,Gửi email Tại
 DocType: Quotation,Quotation Lost Reason,lý do bảng báo giá mất
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Chọn tên miền của bạn
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',chọn * từ tabPatient với tên = &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},tham chiếu giao dịch không có {0} ngày {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},tham chiếu giao dịch không có {0} ngày {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Không có gì phải chỉnh sửa.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,Xem Mẫu
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Tóm tắt cho tháng này và các hoạt động cấp phát
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Xem Mẫu
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Tóm tắt cho tháng này và các hoạt động cấp phát
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Thêm người dùng vào tổ chức của bạn, ngoài chính bạn."
 DocType: Customer Group,Customer Group Name,Tên Nhóm khách hàng
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Chưa có Khách!
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Chưa có Khách!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Báo cáo lưu chuyển tiền mặt
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Số tiền cho vay không thể vượt quá Số tiền cho vay tối đa của {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,bằng
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},Hãy loại bỏ hóa đơn này {0} từ C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},Hãy loại bỏ hóa đơn này {0} từ C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vui lòng chọn Carry Forward nếu bạn cũng muốn bao gồm cân bằng tài chính của năm trước để lại cho năm tài chính này
 DocType: GL Entry,Against Voucher Type,Loại chống lại Voucher
 DocType: Physician,Phone (R),Điện thoại (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,Đã thêm khe thời gian
 DocType: Item,Attributes,Thuộc tính
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Bật Mẫu
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vui lòng đặt Naming Series cho {0} qua Cài đặt&gt; Cài đặt&gt; Đặt tên Series
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Vui lòng nhập Viết Tắt tài khoản
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Kỳ hạn đặt cuối cùng
 DocType: Patient,B Negative,B Phủ định
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Tài khoản {0} không thuộc về công ty {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,Số sê-ri trong hàng {0} không khớp với Lưu lượng giao hàng
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,Số sê-ri trong hàng {0} không khớp với Lưu lượng giao hàng
 DocType: Student,Guardian Details,Chi tiết người giám hộ
 DocType: C-Form,C-Form,C - Mẫu
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Đánh dấu  cho nhiều nhân viên
 DocType: Vehicle,Chassis No,chassis Không
 DocType: Payment Request,Initiated,Được khởi xướng
 DocType: Production Order,Planned Start Date,Ngày bắt đầu lên kế hoạch
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Vui lòng chọn một BOM
 DocType: Serial No,Creation Document Type,Loại tài liệu sáng tạo
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,Ngày kết thúc phải lớn hơn ngày bắt đầu
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Ngày kết thúc phải lớn hơn ngày bắt đầu
 DocType: Leave Type,Is Encash,Là thâu tiền bạc
 DocType: Leave Allocation,New Leaves Allocated,Những sự cho phép mới được phân bổ
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Dữ liệu chuyên-dự án không có sẵn cho báo giá
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Kết thúc vào
 DocType: Project,Expected End Date,Ngày Dự kiến kết thúc
 DocType: Budget Account,Budget Amount,Số tiền ngân sách
 DocType: Appraisal Template,Appraisal Template Title,Thẩm định Mẫu Tiêu đề
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Từ ngày {0} cho nhân viên {1} không được trước ngày gia nhập của nhân viên {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,Thương mại
 DocType: Patient,Alcohol Current Use,Sử dụng rượu
+DocType: Student Admission Program,Student Admission Program,Chương trình nhập học cho sinh viên
 DocType: Payment Entry,Account Paid To,Tài khoản Thụ hưởng
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Mẫu gốc {0} không thể là mẫu tồn kho
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Tất cả sản phẩm hoặc dịch vụ.
@@ -3891,30 +3972,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Ngân sách cho tài khoản {1} đối với {2} {3} là {4}. Nó sẽ vượt qua {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',"Hàng {0} # Tài khoản phải được loại 'tài sản cố định """
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Số lượng ra
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,Quy tắc để tính toán tiền vận chuyển để bán
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,và unchcked Disabled trong
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Series là bắt buộc
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Dịch vụ tài chính
 DocType: Student Sibling,Student ID,thẻ học sinh
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,Các loại hoạt động Thời gian Logs
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Email nhà cung cấp
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Các loại hoạt động Thời gian Logs
 DocType: Tax Rule,Sales,Bán hàng
 DocType: Stock Entry Detail,Basic Amount,Số tiền cơ bản
 DocType: Training Event,Exam,Thi
 DocType: Complaint,Complaint,Lời phàn nàn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},phải có kho cho vật tư {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},phải có kho cho vật tư {0}
 DocType: Leave Allocation,Unused leaves,Quyền nghỉ phép chưa sử dụng
 DocType: Patient,Alcohol Past Use,Uống rượu quá khứ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
 DocType: Tax Rule,Billing State,Bang thanh toán
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Truyền
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),Lấy BOM nổ (bao gồm các cụm chi tiết)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Truyền
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Lấy BOM nổ (bao gồm các cụm chi tiết)
 DocType: Authorization Rule,Applicable To (Employee),Để áp dụng (nhân viên)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,Ngày đến hạn là bắt buộc
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,Ngày đến hạn là bắt buộc
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Tăng cho thuộc tính  {0} không thể là 0
 DocType: Journal Entry,Pay To / Recd From,Để trả / Recd Từ
 DocType: Naming Series,Setup Series,Thiết lập Dòng
 DocType: Payment Reconciliation,To Invoice Date,Tới ngày lập hóa đơn
 DocType: Supplier,Contact HTML,HTML Liên hệ
 ,Inactive Customers,Khách hàng không được kích hoạt
+DocType: Student Admission Program,Maximum Age,Tuổi tối đa
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Hóa đơn mua hàng
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Làm thế nào giá Quy tắc được áp dụng?
@@ -3933,6 +4016,7 @@
 DocType: GL Entry,Remarks,Ghi chú
 DocType: Payment Entry,Account Paid From,Tài khoản Trích nợ
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Mã nguyên liệu thô của mặt hàng
+DocType: Task,Parent Task,Công việc của Phụ Huynh
 DocType: Journal Entry,Write Off Based On,Viết Tắt Dựa trên
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Hãy Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,In và Văn phòng phẩm
@@ -3941,20 +4025,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Mức lương đã được xử lý cho giai đoạn giữa {0} và {1}, Giai đoạn bỏ ứng dụng không thể giữa khoảng kỳ hạn này"
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Bản ghi cài đặt cho một sê ri số
 DocType: Guardian Interest,Guardian Interest,người giám hộ lãi
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Thiết lập các giá trị mặc định cho các hoá đơn POS
 apps/erpnext/erpnext/config/hr.py +177,Training,Đào tạo
 DocType: Timesheet,Employee Detail,Nhân viên chi tiết
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ID Email Guardian1
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ID Email Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,Ngày của kỳ hạn tiếp theo và Ngày lặp lại của tháng phải bằng nhau
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Ngày của kỳ hạn tiếp theo và Ngày lặp lại của tháng phải bằng nhau
 DocType: Lab Prescription,Test Code,Mã kiểm tra
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Cài đặt cho trang chủ của trang web
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},Các yêu cầu RFQ không được phép trong {0} do bảng điểm của điểm số {1}
 DocType: Offer Letter,Awaiting Response,Đang chờ Response
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Ở trên
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},Tổng số Tiền {0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},thuộc tính không hợp lệ {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Tổng số Tiền {0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},thuộc tính không hợp lệ {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Đề cập đến tài khoản phải trả phi tiêu chuẩn
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},Mặt hàng tương tự đã được thêm vào nhiều lần {danh sách}
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',Vui lòng chọn nhóm đánh giá khác với &#39;Tất cả các Nhóm Đánh giá&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Hàng {0}: Yêu cầu trung tâm chi phí cho một mặt hàng {1}
 DocType: Training Event Employee,Optional,Không bắt buộc
@@ -3964,7 +4048,7 @@
 DocType: Holiday List,Weekly Off,Nghỉ hàng tuần
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Ví dụ như năm 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +96,Provisional Profit / Loss (Credit),Lợi nhuận tạm thời / lỗ (tín dụng)
-DocType: Sales Invoice,Return Against Sales Invoice,Trả về với biên lai mua hàng
+DocType: Sales Invoice,Return Against Sales Invoice,Trả về hàng bán
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Mục 5
 DocType: Serial No,Creation Time,Thời gian tạo
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Tổng doanh thu
@@ -3977,13 +4061,15 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}:Trung tâm chi phí là bắt buộc đối với vật liệu {2}
 DocType: Vehicle,Policy No,chính sách Không
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Chọn mục từ Sản phẩm theo lô
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Khi cổ phiếu tồn tại đối với một mục {0}, bạn không thể bật có thuộc tính biến thể"
 DocType: Asset,Straight Line,Đường thẳng
 DocType: Project User,Project User,Dự án tài
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Chia
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Chia
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Chia
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,Chia
 DocType: GL Entry,Is Advance,Là Trước
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,"""Có mặt từ ngày"" tham gia và ""có mặt đến ngày"" là bắt buộc"
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,Vui lòng nhập 'là hợp đồng phụ' như là Có hoặc Không
+DocType: Item,Default Purchase Unit of Measure,Đơn vị mua hàng mặc định của biện pháp
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Ngày Trao Đổi Cuối
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Ngày Giao Tiếp Cuối
 DocType: Sales Team,Contact No.,Mã số Liên hệ
@@ -3992,7 +4078,6 @@
 DocType: Production Order,Check if material transfer entry is not required,Kiểm tra xem mục nhập chuyển nhượng vật liệu không bắt buộc
 DocType: Production Order,Check if material transfer entry is not required,Kiểm tra xem mục nhập chuyển nhượng vật liệu không bắt buộc
 DocType: Program Enrollment Tool,Get Students From,Nhận Sinh viên Từ
-DocType: Hub Settings,Seller Country,Người bán Country
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Xuất bản mục trên Website
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,Nhóm sinh viên của bạn theo lô
 DocType: Authorization Rule,Authorization Rule,Quy tắc ủy quyền
@@ -4002,7 +4087,7 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Thuế doanh thu và lệ phí mẫu
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Tổng số (tín dụng)
 DocType: Repayment Schedule,Payment Date,Ngày thanh toán
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Số lượng hàng loạt mới
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Số lượng hàng loạt mới
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,May mặc và phụ kiện
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,Không thể giải quyết chức năng điểm số trọng số. Đảm bảo công thức là hợp lệ.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Số thứ tự
@@ -4020,6 +4105,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Hàng # {0}: {1} tài sản không thể gửi, nó đã được {2}"
 DocType: Tax Rule,Billing Country,Quốc gia thanh toán
 DocType: Purchase Order Item,Expected Delivery Date,Ngày Dự kiến giao hàng
+DocType: Restaurant Order Entry,Restaurant Order Entry,Đăng nhập
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Thẻ ghi nợ và tín dụng không bằng với {0} # {1}. Sự khác biệt là {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Chi phí Giải trí
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Hãy Chất liệu Yêu cầu
@@ -4032,9 +4118,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Không thể xóa TK vì vẫn còn giao dịch
 DocType: Vehicle,Last Carbon Check,Kiểm tra Carbon lần cuối
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Chi phí pháp lý
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,Vui lòng chọn số lượng trên hàng
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Vui lòng chọn số lượng trên hàng
 DocType: Purchase Invoice,Posting Time,Thời gian gửi bài
 DocType: Timesheet,% Amount Billed,% Số tiền đã ghi hóa đơn
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Time Per Appointment&quot; đã không được thiết lập cho Dr {0}. Thêm nó vào Master Bác sĩ.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Chi phí điện thoại
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Kiểm tra này nếu bạn muốn ép buộc người dùng lựa chọn một loạt trước khi lưu. Sẽ không có mặc định nếu bạn kiểm tra này.
@@ -4045,6 +4132,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Doanh thu khách hàng mới
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Chi phí đi lại
 DocType: Maintenance Visit,Breakdown,Hỏng
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Thêm Đăng ký trường tùy chỉnh trong doctype {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,Không thể chọn được Tài khoản: {0} với loại tiền tệ: {1}
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Cập nhật BOM tự động thông qua Scheduler, dựa trên tỷ lệ định giá mới nhất / tỷ giá / tỷ lệ mua cuối cùng của nguyên vật liệu."
 DocType: Bank Reconciliation Detail,Cheque Date,Séc ngày
@@ -4069,7 +4157,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Tổng số tiền Thanh toán (thông qua Các đăng nhập thời gian)
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Nhà cung cấp Id
 DocType: Payment Request,Payment Gateway Details,Chi tiết Cổng thanh toán
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,Số lượng phải lớn hơn 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Số lượng phải lớn hơn 0
 DocType: Journal Entry,Cash Entry,Cash nhập
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,nút con chỉ có thể được tạo ra dưới &#39;Nhóm&#39; nút loại
 DocType: Leave Application,Half Day Date,Kỳ hạn nửa ngày
@@ -4087,12 +4175,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Lưu ý: Item {0} nhập nhiều lần
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Tất cả Liên hệ.
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Công ty viết tắt
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Người sử dụng {0} không tồn tại
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,Người sử dụng {0} không tồn tại
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Rút gọn
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Bút toán thanh toán đã tồn tại
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Không được phép từ {0} vượt qua các giới hạn
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Lương mẫu chủ.
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Bệnh học
+DocType: Restaurant Order Entry,Restaurant Table,Bàn ăn
 DocType: Leave Type,Max Days Leave Allowed,Để lại tối đa ngày phép
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Đặt Rule thuế cho giỏ hàng
 DocType: Purchase Invoice,Taxes and Charges Added,Thuế và phí bổ sung
@@ -4104,10 +4194,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Báo giá cho Leads hoặc Khách hàng.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Vai trò được phép chỉnh sửa cổ phiếu đóng băng
 ,Territory Target Variance Item Group-Wise,Phương sai mục tiêu mẫu hàng theo khu vực Nhóm - Thông minh
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,Tất cả các nhóm khách hàng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Tất cả các nhóm khách hàng
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,tích lũy hàng tháng
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} là bắt buộc. Bản ghi thu đổi ngoại tệ có thể không được tạo ra cho {1} tới {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,Mẫu thuế là bắt buộc
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,Mẫu thuế là bắt buộc
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Tài khoản {0}: tài khoản mẹ {1} không tồn tại
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Danh sách giá Tỷ lệ (Công ty tiền tệ)
 DocType: Products Settings,Products Settings,Cài đặt sản phẩm
@@ -4133,13 +4223,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,mục chi tiết thuế thông minh
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Viện Tên viết tắt
 ,Item-wise Price List Rate,Mẫu hàng - danh sách tỷ giá thông minh
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,Báo giá của NCC
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Báo giá của NCC
 DocType: Quotation,In Words will be visible once you save the Quotation.,"""Bằng chữ"" sẽ được hiển thị ngay khi bạn lưu các báo giá."
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Số lượng ({0}) không thể là một phân số trong hàng {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Số lượng ({0}) không thể là một phân số trong hàng {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},Mã vạch {0} đã được sử dụng trong mục {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Mã vạch {0} đã được sử dụng trong mục {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Quy tắc để thêm chi phí vận chuyển.
 DocType: Item,Opening Stock,Cổ phiếu mở đầu
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Khách hàng phải có
@@ -4157,9 +4247,8 @@
 DocType: Customer,From Lead,Từ  Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Đơn đặt hàng phát hành cho sản phẩm.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Chọn năm tài chính ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,POS hồ sơ cần thiết để làm cho POS nhập
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS hồ sơ cần thiết để làm cho POS nhập
 DocType: Program Enrollment Tool,Enroll Students,Ghi danh học sinh
-DocType: Hub Settings,Name Token,Tên Mã thông báo
 DocType: Lab Test,Approved Date,Ngày được chấp thuận
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Bán hàng tiêu chuẩn
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Ít nhất một kho là bắt buộc
@@ -4177,7 +4266,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Nguồn Nhân Lực
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Hòa giải thanh toán thanh toán
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Thuế tài sản
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},Đơn hàng sản xuất đã được {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Đơn hàng sản xuất đã được {0}
 DocType: BOM Item,BOM No,số hiệu BOM
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Tạp chí nhập {0} không có tài khoản {1} hoặc đã đối chiếu với các chứng từ khác
@@ -4190,15 +4279,15 @@
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Tải lên tham gia từ một tập tin csv.
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Amt nổi bật
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Mục tiêu đề ra mục Nhóm-khôn ngoan cho người bán hàng này.
-DocType: Stock Settings,Freeze Stocks Older Than [Days],Cổ phiếu đóng băng cũ hơn [Ngày]
+DocType: Stock Settings,Freeze Stocks Older Than [Days],Đóng băng tồn kho cũ hơn [Ngày]
 apps/erpnext/erpnext/controllers/accounts_controller.py +535,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Hàng # {0}: tài sản là bắt buộc đối với tài sản cố định mua / bán
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Nếu hai hoặc nhiều Rules giá được tìm thấy dựa trên các điều kiện trên, ưu tiên được áp dụng. Ưu tiên là một số từ 0 đến 20, trong khi giá trị mặc định là số không (trống). Số cao hơn có nghĩa là nó sẽ được ưu tiên nếu có nhiều Rules giá với điều kiện tương tự."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Năm tài chính: {0} không tồn tại
 DocType: Currency Exchange,To Currency,Tới tiền tệ
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Cho phép người sử dụng sau phê duyệt ứng dụng Để lại cho khối ngày.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Các loại chi phí yêu cầu bồi thường.
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Tỷ lệ bán hàng cho mặt hàng {0} thấp hơn {1} của nó. Tỷ lệ bán hàng phải là ít nhất {2}
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Tỷ lệ bán hàng cho mặt hàng {0} thấp hơn {1} của nó. Tỷ lệ bán hàng phải là ít nhất {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Tỷ lệ bán hàng cho mặt hàng {0} thấp hơn {1} của nó. Tỷ lệ bán hàng phải là ít nhất {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Tỷ lệ bán hàng cho mặt hàng {0} thấp hơn {1} của nó. Tỷ lệ bán hàng phải là ít nhất {2}
 DocType: Item,Taxes,Các loại thuế
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,đã trả và không chuyển
 DocType: Project,Default Cost Center,Bộ phận chi phí mặc định
@@ -4212,15 +4301,15 @@
 DocType: Employee Loan,Fully Disbursed,giải ngân đầy đủ
 DocType: Maintenance Visit,Customer Feedback,Phản hồi từ khách hàng
 DocType: Account,Expense,chi tiêu
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Điểm không thể lớn hơn số điểm tối đa
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Điểm không thể lớn hơn số điểm tối đa
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Khách hàng và nhà cung cấp
 DocType: Item Attribute,From Range,Từ Phạm vi
 DocType: BOM,Set rate of sub-assembly item based on BOM,Đặt tỷ lệ phụ lắp ráp dựa trên BOM
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},Lỗi cú pháp trong công thức hoặc điều kiện: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Lỗi cú pháp trong công thức hoặc điều kiện: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Cài đặt tóm tắt công việc hàng ngày công ty
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,Mục {0} bỏ qua vì nó không phải là một mục kho
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,Trình tự sản xuất này để chế biến tiếp.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Trình tự sản xuất này để chế biến tiếp.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Không áp dụng giá quy tắc trong giao dịch cụ thể, tất cả các quy giá áp dụng phải được vô hiệu hóa."
 DocType: Assessment Group,Parent Assessment Group,Nhóm đánh giá gốc
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,việc làm
@@ -4237,12 +4326,13 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Vui lòng đặt Bộ lọc của Công ty trống nếu Nhóm theo là &#39;Công ty&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Viết bài ngày không thể ngày trong tương lai
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Hàng # {0}: Số sê ri{1} không phù hợp với {2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,để tạo ra định kỳ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Để lại bình thường
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Lab Test UOM.
 DocType: Batch,Batch ID,Căn cước của lô
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Lưu ý: {0}
 ,Delivery Note Trends,Xu hướng lưu ý cho việc giao hàng
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Tóm tắt tuần này
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Tóm tắt tuần này
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Số lượng hàng trong kho
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Tài khoản: {0} chỉ có thể được cập nhật thông qua bút toán kho
 DocType: Student Group Creation Tool,Get Courses,Nhận Học
@@ -4251,12 +4341,11 @@
 DocType: Variant Field,Variant Field,Trường biến thể
 DocType: Sales Order,Delivery Date,Ngày Giao hàng
 DocType: Opportunity,Opportunity Date,Kỳ hạn tới cơ hội
-DocType: Purchase Receipt,Return Against Purchase Receipt,Trả về với biên lai mua hàng
+DocType: Purchase Receipt,Return Against Purchase Receipt,Trả lại hàng mua
 DocType: Request for Quotation Item,Request for Quotation Item,Yêu cầu cho báo giá khoản mục
 DocType: Purchase Order,To Bill,Tới hóa đơn
 DocType: Material Request,% Ordered,% đã đặt
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Đối với Nhóm Sinh viên dựa trên Khóa học, khóa học sẽ được xác nhận cho mỗi Sinh viên từ các môn học ghi danh tham gia vào Chương trình Ghi danh."
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Nhập Địa chỉ Email cách nhau bởi dấu phẩy, hóa đơn sẽ được gửi tự động vào ngày cụ thể"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Việc làm ăn khoán
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Giá mua bình quân
 DocType: Task,Actual Time (in Hours),Thời gian thực tế (tính bằng giờ)
@@ -4270,7 +4359,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Mục {0} không phải là thiết lập cho Serial Nos Cột phải bỏ trống
 DocType: Accounts Settings,Accounts Settings,Thiết lập các Tài khoản
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,Tán thành
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,Không có kết quả để gửi
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Không có kết quả để gửi
 DocType: Customer,Sales Partner and Commission,Đại lý bán hàng và hoa hồng
 DocType: Employee Loan,Rate of Interest (%) / Year,Lãi suất thị trường (%) / năm
 ,Project Quantity,Dự án Số lượng
@@ -4282,55 +4371,54 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Đen
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Item
 DocType: Account,Auditor,Người kiểm tra
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0} mục được sản xuất
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} mục được sản xuất
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Tìm hiểu thêm
 DocType: Cheque Print Template,Distance from top edge,Khoảng cách từ mép trên
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,Danh sách Price {0} bị vô hiệu hóa hoặc không tồn tại
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,Danh sách Price {0} bị vô hiệu hóa hoặc không tồn tại
 DocType: Purchase Invoice,Return,Trả về
 DocType: Production Order Operation,Production Order Operation,Thao tác đặt hàng sản phẩm
 DocType: Pricing Rule,Disable,Vô hiệu hóa
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Phương thức thanh toán là cần thiết để thực hiện thanh toán
 DocType: Project Task,Pending Review,Đang chờ xem xét
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Bổ nhiệm và Tham vấn
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1} không được ghi danh trong Batch {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} không được ghi danh trong Batch {2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Tài sản {0} không thể được loại bỏ, vì nó đã được {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Tổng số yêu cầu bồi thường chi phí (thông qua số yêu cầu bồi thường chi phí )
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Đánh dấu vắng mặt
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Hàng {0}: Tiền tệ của BOM # {1} phải bằng tiền mà bạn chọn {2}
 DocType: Journal Entry Account,Exchange Rate,Tỷ giá
 DocType: Patient,Additional information regarding the patient,Thông tin bổ sung về bệnh nhân
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,Đơn đặt hàng {0} chưa duyệt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Đơn đặt hàng {0} chưa duyệt
 DocType: Homepage,Tag Line,Dòng đánh dấu
 DocType: Fee Component,Fee Component,phí Component
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Quản lý đội tàu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,Thêm các mục từ
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Quản lý đội tàu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Thêm các mục từ
 DocType: Cheque Print Template,Regular,quy luật
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Tổng trọng lượng của tất cả các tiêu chí đánh giá phải là 100%
-DocType: BOM,Last Purchase Rate,Tỷ giá đặt hàng cuối cùng
+DocType: Purchase Order Item,Last Purchase Rate,Tỷ giá đặt hàng cuối cùng
 DocType: Account,Asset,Tài sản
 DocType: Project Task,Task ID,ID công việc
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Hàng tồn kho không thể tồn tại cho mẫu hàng {0} vì có các biến thể
 DocType: Lab Test,Mobile,Điện thoại di động
 ,Sales Person-wise Transaction Summary,Người khôn ngoan bán hàng Tóm tắt thông tin giao dịch
 DocType: Training Event,Contact Number,Số Liên hệ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,Kho {0} không tồn tại
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Đăng ký cho  ERPNext Hub
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Kho {0} không tồn tại
 DocType: Monthly Distribution,Monthly Distribution Percentages,Tỷ lệ phân phối hàng tháng
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Các sản phẩm được chọn không thể có hàng loạt
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Tỷ lệ đánh giá không tìm thấy cho {0} mẫu hàng, được yêu cầu để làm bút toán cho {1} {2}. Nếu mục được giao dịch như là một mục mẫu trong {1}, hãy đề cập rằng trong {1} mục bảng. Nếu không, hãy tạo ra một giao dịch chứng khoán đến cho tỷ lệ định giá mục hoặc đề cập trong hồ sơ mẫu hàng, và sau đó thử duyệt / hủy mục này"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% của nguyên vật liệu đã được giao với phiếu xuất kho này.
+DocType: Training Event,Has Certificate,Có Chứng chỉ
 DocType: Project,Customer Details,Chi tiết khách hàng
 DocType: Employee,Reports to,Báo cáo
 ,Unpaid Expense Claim,Yêu cầu bồi thường chi phí chưa thanh toán
 DocType: Payment Entry,Paid Amount,Số tiền thanh toán
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Khám phá chu kỳ bán hàng
 DocType: Assessment Plan,Supervisor,Giám sát viên
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,Trực tuyến
-,Available Stock for Packing Items,Có sẵn cổ phiếu cho mục đóng gói
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,Trực tuyến
+,Available Stock for Packing Items,Có sẵn tồn kho để đóng gói sản phẩm
 DocType: Item Variant,Item Variant,Biến thể mẫu hàng
 DocType: Assessment Result Tool,Assessment Result Tool,Công cụ đánh giá kết quả
 DocType: BOM Scrap Item,BOM Scrap Item,BOM mẫu hàng phế thải
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,đơn đặt hàng gửi không thể bị xóa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,đơn đặt hàng gửi không thể bị xóa
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Tài khoản đang dư Nợ, bạn không được phép thiết lập 'Số Dư TK phải' là 'Có'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Quản lý chất lượng
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Mục {0} đã bị vô hiệu hóa
@@ -4351,7 +4439,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Cho phép Tỷ lệ Đánh giá Không
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Cho phép Tỷ lệ Đánh giá Không
 DocType: Training Event Employee,Invited,mời
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,Nhiều cấu trúc lương hoạt động tìm thấy cho {0} nhân viên cho những ngày được
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Nhiều cấu trúc lương hoạt động tìm thấy cho {0} nhân viên cho những ngày được
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Thiết lập các tài khoản Gateway.
 DocType: Employee,Employment Type,Loại việc làm
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Tài sản cố định
@@ -4363,7 +4451,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Email ID Sinh viên
 DocType: Employee,Notice (days),Thông báo (ngày)
 DocType: Tax Rule,Sales Tax Template,Template Thuế bán hàng
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,Chọn mục để lưu các hoá đơn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Chọn mục để lưu các hoá đơn
 DocType: Employee,Encashment Date,Encashment Date
 DocType: Training Event,Internet,Internet
 DocType: Special Test Template,Special Test Template,Mẫu Thử nghiệm Đặc biệt
@@ -4373,7 +4461,7 @@
 DocType: Academic Term,Term Start Date,Ngày bắt đầu kỳ hạn
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Đếm ngược
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Đếm ngược
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},{0} # Xin vui lòng tìm thấy kèm theo {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},{0} # Xin vui lòng tìm thấy kèm theo {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Báo cáo số dư ngân hàng theo Sổ cái tổng
 DocType: Job Applicant,Applicant Name,Tên đơn
 DocType: Authorization Rule,Customer / Item Name,Khách hàng / tên hàng hóa
@@ -4393,7 +4481,7 @@
 DocType: Guardian,Guardian Of ,người giám hộ của
 DocType: Grading Scale Interval,Threshold,ngưỡng
 DocType: BOM Update Tool,Current BOM,BOM hiện tại
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,Thêm Serial No
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,Thêm Serial No
 DocType: Production Order Item,Available Qty at Source Warehouse,Số lượng có sẵn tại Kho nguồn
 apps/erpnext/erpnext/config/support.py +22,Warranty,Bảo hành
 DocType: Purchase Invoice,Debit Note Issued,nợ tiền mặt được công nhận
@@ -4416,10 +4504,9 @@
 DocType: Account,Receivable,phải thu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Hàng# {0}: Không được phép thay đổi nhà cung cấp vì đơn Mua hàng đã tồn tại
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Vai trò được phép trình giao dịch vượt quá hạn mức tín dụng được thiết lập.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,Chọn mục để Sản xuất
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time","Thạc sĩ dữ liệu đồng bộ, nó có thể mất một thời gian"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Chọn mục để Sản xuất
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Thạc sĩ dữ liệu đồng bộ, nó có thể mất một thời gian"
 DocType: Item,Material Issue,Nguyên vật liệu
-DocType: Hub Settings,Seller Description,Người bán Mô tả
 DocType: Employee Education,Qualification,Trình độ chuyên môn
 DocType: Item Price,Item Price,Giá mục
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Xà phòng và chất tẩy rửa
@@ -4427,7 +4514,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Từ Thời gian không thể lớn hơn  Tới thời gian
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Điện ảnh & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ra lệnh
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,Tiếp tục
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Tiếp tục
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Nếu được bật, hệ thống sẽ không cập nhật các trường của các biến thể từ mẫu nhưng sẽ sao chép dữ liệu của các trường dưới đây đề cập đến trong khi tạo ra biến thể mới"
 DocType: Salary Detail,Component,Hợp phần
 DocType: Assessment Criteria,Assessment Criteria Group,Các tiêu chí đánh giá Nhóm
 DocType: Healthcare Settings,Patient Name By,Tên bệnh nhân theo
@@ -4437,7 +4525,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Vui lòng nhập Phê duyệt hoặc phê duyệt Vai trò tài
 DocType: Journal Entry,Write Off Entry,Viết Tắt bút toán
 DocType: BOM,Rate Of Materials Based On,Tỷ giá vật liệu dựa trên
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Nhà cung cấp&gt; Loại nhà cung cấp
+DocType: Item Variant Settings,Do not Update Variants,Không cập nhật biến thể
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Hỗ trợ Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,Bỏ chọn tất cả
 DocType: POS Profile,Terms and Conditions,Các Điều khoản/Điều kiện
@@ -4446,7 +4534,7 @@
 DocType: Leave Block List,Applies to Company,Áp dụng đối với Công ty
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,Không thể hủy bỏ vì chứng từ hàng tôn kho gửi duyệt{0} đã  tồn tại
 DocType: Employee Loan,Disbursement Date,ngày giải ngân
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;Người nhận&#39; không được chỉ định
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Người nhận&#39; không được chỉ định
 DocType: BOM Update Tool,Update latest price in all BOMs,Cập nhật giá mới nhất trong tất cả các BOMs
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,Hồ sơ y tế
 DocType: Vehicle,Vehicle,phương tiện
@@ -4462,14 +4550,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Ngược/Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Khấu hao và dư tài sản
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},Số tiền {0} {1} chuyển từ {2} để {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Số tiền {0} {1} chuyển từ {2} để {3}
 DocType: Sales Invoice,Get Advances Received,Được nhận trước
 DocType: Email Digest,Add/Remove Recipients,Thêm/Xóa người nhận
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},Giao dịch không được phép với Các đơn đặt hàng sản phẩm đã bị dừng lại {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Thiết lập năm tài chính này như mặc định, nhấp vào 'Đặt như mặc định'"
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,Tham gia
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,Tham gia
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Lượng thiếu hụt
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,Biến thể mẫu hàng {0} tồn tại với cùng một thuộc tính
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Biến thể mẫu hàng {0} tồn tại với cùng một thuộc tính
 DocType: Employee Loan,Repay from Salary,Trả nợ từ lương
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Yêu cầu thanh toán đối với {0} {1} cho số tiền {2}
@@ -4482,7 +4570,7 @@
 DocType: Sales Invoice Item,Sales Order Item,Hàng đặt mua
 DocType: Salary Slip,Payment Days,Ngày thanh toán
 DocType: Patient,Dormant,không hoạt động
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,Các kho hàng với các nút con không thể được chuyển đổi sang sổ cái
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,Các kho hàng với các nút con không thể được chuyển đổi sang sổ cái
 DocType: BOM,Manage cost of operations,Quản lý chi phí hoạt động
 DocType: Accounts Settings,Stale Days,Stale Days
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Khi giao dịch đã đánh dấu bất kỳ được ""Đệ trình"", một cửa sổ tự động mở ra để gửi một email tới ""Liên hệ"" có liên quan trong giao dịch đó, cùng tệp đính kèm là giao dịch. Người dùng có thể gửi hoặc không gửi email."
@@ -4496,10 +4584,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Không nối tiếp {0} đã được nhận
 ,Requested Items To Be Transferred,Mục yêu cầu được chuyển giao
 DocType: Expense Claim,Vehicle Log,nhật ký phương tiện
-DocType: Purchase Invoice,Recurring Id,Id định kỳ
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Sự có mặt của sốt (nhiệt độ&gt; 38,5 ° C / 101,3 ° F hoặc nhiệt độ ổn định&gt; 38 ° C / 100,4 ° F)"
 DocType: Customer,Sales Team Details,Thông tin chi tiết Nhóm bán hàng
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,Xóa vĩnh viễn?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Xóa vĩnh viễn?
 DocType: Expense Claim,Total Claimed Amount,Tổng số tiền được công bố
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Cơ hội tiềm năng bán hàng
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Không hợp lệ {0}
@@ -4509,7 +4596,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Cửa hàng bách
 ,Item Delivery Date,Ngày Giao hàng
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,Thiết lập trường của mình trong ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Thiết lập trường của mình trong ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Thay đổi Số tiền cơ sở (Công ty ngoại tệ)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,Không có bút toán kế toán cho các kho tiếp theo
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Lưu tài liệu đầu tiên.
@@ -4521,13 +4608,12 @@
 DocType: Task,Is Milestone,Là cột mốc
 DocType: Daily Work Summary,Email Sent To,Thư điện tử đã được gửi đến
 DocType: Budget,Warn,Cảnh báo
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Bạn có chắc chắn muốn hủy đăng ký?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bất kỳ nhận xét khác, nỗ lực đáng chú ý mà nên đi vào biên bản."
 DocType: BOM,Manufacturing User,Người dùng sản xuất
 DocType: Purchase Invoice,Raw Materials Supplied,Nguyên liệu thô đã được cung cấp
-DocType: Purchase Invoice,Recurring Print Format,Định kỳ Print Format
 DocType: C-Form,Series,Series
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},Đơn vị tiền tệ của bảng giá {0} phải là {1} hoặc {2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,Thêm sản phẩm
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},Đơn vị tiền tệ của bảng giá {0} phải là {1} hoặc {2}
 DocType: Appraisal,Appraisal Template,Thẩm định mẫu
 DocType: Item Group,Item Classification,PHân loại mẫu hàng
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Giám đốc phát triển kinh doanh
@@ -4541,7 +4627,7 @@
 DocType: Item Attribute Value,Attribute Value,Attribute Value
 ,Itemwise Recommended Reorder Level,Mẫu hàng thông minh được gợi ý sắp xếp lại theo cấp độ
 DocType: Salary Detail,Salary Detail,Chi tiết lương
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,Vui lòng chọn {0} đầu tiên
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Vui lòng chọn {0} đầu tiên
 DocType: Appointment Type,Physician,Bác sĩ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Lô {0} của mục {1} đã hết hạn.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Tham vấn
@@ -4552,7 +4638,7 @@
 DocType: Salary Detail,Default Amount,Số tiền mặc định
 DocType: Lab Test Template,Descriptive,Mô tả
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Không tìm thấy kho này trong hệ thống
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Tóm tắt của tháng này
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Tóm tắt của tháng này
 DocType: Quality Inspection Reading,Quality Inspection Reading,Đọc kiểm tra chất lượng
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,'đóng băng hàng tồn kho cũ hơn' nên nhỏ hơn %d ngày
 DocType: Tax Rule,Purchase Tax Template,Mua  mẫu thuế
@@ -4575,12 +4661,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,Sự kiện/kết quả huấn luyện
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Khấu hao lũy kế như trên
 DocType: Sales Invoice,C-Form Applicable,C - Mẫu áp dụng
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},Thời gian hoạt động phải lớn hơn 0 cho hoạt động {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Thời gian hoạt động phải lớn hơn 0 cho hoạt động {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Kho là bắt buộc
 DocType: Supplier,Address and Contacts,Địa chỉ và Liên hệ
 DocType: UOM Conversion Detail,UOM Conversion Detail,Xem chi tiết UOM Chuyển đổi
 DocType: Program,Program Abbreviation,Tên viết tắt chương trình
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,Đơn đặt sản phẩm không thể được tạo ra với một mẫu mặt hàng
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Đơn đặt sản phẩm không thể được tạo ra với một mẫu mặt hàng
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Cước phí được cập nhật trên Phiếu nhận hàng gắn với từng vật tư
 DocType: Warranty Claim,Resolved By,Giải quyết bởi
 DocType: Bank Guarantee,Start Date,Ngày bắt đầu
@@ -4606,27 +4692,28 @@
 DocType: Employee,Educational Qualification,Trình độ chuyên môn giáo dục
 DocType: Workstation,Operating Costs,Chi phí điều hành
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Hành động nếu tích lũy ngân sách hàng tháng  vượt trội
-DocType: Purchase Invoice,Submit on creation,Gửi về sáng tạo
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},Đồng tiền cho {0} phải là {1}
+DocType: Subscription,Submit on creation,Gửi về sáng tạo
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Đồng tiền cho {0} phải là {1}
 DocType: Asset,Disposal Date,Xử ngày
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Email sẽ được gửi đến tất cả các nhân viên tích cực của công ty tại các giờ nhất định, nếu họ không có ngày nghỉ. Tóm tắt phản hồi sẽ được gửi vào lúc nửa đêm."
 DocType: Employee Leave Approver,Employee Leave Approver,Nhân viên Để lại phê duyệt
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},Dãy {0}: Một mục Sắp xếp lại đã tồn tại cho nhà kho này {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Không thể khai báo mất, bởi vì báo giá đã được thực hiện."
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Đào tạo phản hồi
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Dãy {0}: Một mục Sắp xếp lại đã tồn tại cho nhà kho này {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","Không thể khai báo mất, bởi vì báo giá đã được thực hiện."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Đào tạo phản hồi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,Đơn Đặt hàng {0} phải được gửi
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Tiêu chí Điểm Tiêu chí của Nhà cung cấp
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Vui lòng chọn ngày bắt đầu và ngày kết thúc cho hàng {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Tất nhiên là bắt buộc trong hàng {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Cho đến ngày không có thể trước khi từ ngày
 DocType: Supplier Quotation Item,Prevdoc DocType,Dạng tài liệu prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,Thêm / Sửa giá
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Thêm / Sửa giá
 DocType: Batch,Parent Batch,Nhóm gốc
 DocType: Batch,Parent Batch,Nhóm gốc
 DocType: Cheque Print Template,Cheque Print Template,Mẫu In Séc
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Biểu đồ Bộ phận chi phí
 DocType: Lab Test Template,Sample Collection,Bộ sưu tập mẫu
 ,Requested Items To Be Ordered,Mục yêu cầu để trở thứ tự
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Đơn hàng của tôi
 DocType: Price List,Price List Name,Danh sách giá Tên
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Tóm tắt công việc hàng ngày cho {0}
 DocType: Employee Loan,Totals,{0}{/0}{1}{/1} {2}{/2}Tổng giá trị
@@ -4645,12 +4732,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} đơn vị của {1} cần thiết trong {2} trên {3} {4} cho {5} để hoàn thành giao dịch này.
 DocType: Fee Schedule,Student Category,sinh viên loại
 DocType: Announcement,Student,Sinh viên
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Đơn vị tổ chức (bộ phận) làm chủ.
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Đơn vị tổ chức (bộ phận) làm chủ.
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Đi đến Phòng
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Vui lòng nhập tin nhắn trước khi gửi
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,NGƯỜI CUNG CẤP
 DocType: Email Digest,Pending Quotations,Báo giá cấp phát
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,Point-of-Sale hồ sơ
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Point-of-Sale hồ sơ
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Lab Test Configurations.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Các khoản cho vay không có bảo đảm
 DocType: Cost Center,Cost Center Name,Tên bộ phận chi phí
@@ -4660,6 +4747,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Tổng Amt được trả
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Thư lớn hơn 160 ký tự sẽ được chia thành nhiều tin nhắn
 DocType: Purchase Receipt Item,Received and Accepted,Nhận được và chấp nhận
+DocType: Hub Settings,Company and Seller Profile,Hồ sơ Công ty và Người bán
 ,GST Itemised Sales Register,Đăng ký mua bán GST chi tiết
 ,Serial No Service Contract Expiry,Không nối tiếp Hợp đồng dịch vụ hết hạn
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Bạn không ghi có và ghi nợ trên cùng một tài khoản cùng một lúc
@@ -4669,10 +4757,11 @@
 DocType: Item,Variant Based On,Ngôn ngữ địa phương dựa trên
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Tổng số trọng lượng ấn định nên là 100%. Nó là {0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Các nhà cung cấp của bạn
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Hãy sửa lại
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,"Không thể thiết lập là ""thất bại"" vì đơn đặt hàng đã được tạo"
-DocType: Request for Quotation Item,Supplier Part No,Nhà cung cấp Phần Không
+DocType: Request for Quotation Item,Supplier Part No,Mã số của Nhà cung cấp
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',không thể trừ khi mục là cho &#39;định giá&#39; hoặc &#39;Vaulation và Total&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,Nhận được từ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Nhận được từ
 DocType: Lead,Converted,Chuyển đổi
 DocType: Item,Has Serial No,Có sê ri số
 DocType: Employee,Date of Issue,Ngày phát hành
@@ -4680,7 +4769,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","THeo các cài đặt mua bán, nếu biên lai đặt hàng đã yêu cầu == 'CÓ', với việc tạo lập hóa đơn mua hàng, người dùng cần phải tạo lập biên lai mua hàng đầu tiên cho danh mục {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},Hàng # {0}: Thiết lập Nhà cung cấp cho mặt hàng {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,Hàng{0}: Giá trị giờ phải lớn hơn không.
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Hình ảnh website {0} đính kèm vào mục {1} không tìm thấy
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,Hình ảnh website {0} đính kèm vào mục {1} không tìm thấy
 DocType: Issue,Content Type,Loại nội dung
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Máy tính
 DocType: Item,List this Item in multiple groups on the website.,Danh sách sản phẩm này trong nhiều nhóm trên trang web.
@@ -4691,14 +4780,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,Nhận Bút toán không hài hòa
 DocType: Payment Reconciliation,From Invoice Date,Từ ngày lập danh đơn
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,Bạn không được phép nộp
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,tiền tệ thanh toán phải bằng tiền tệ của cả tiền tệ mặc định của công ty cũng như của tài khoản đối tác
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,tiền tệ thanh toán phải bằng tiền tệ của cả tiền tệ mặc định của công ty cũng như của tài khoản đối tác
 DocType: Healthcare Settings,Laboratory Settings,Cài đặt Phòng thí nghiệm
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,Nhận chi phiếu
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,Làm gì ?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,đến kho
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Tất cả Tuyển sinh Sinh viên
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Làm gì ?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,đến kho
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Tất cả Tuyển sinh Sinh viên
 ,Average Commission Rate,Ủy ban trung bình Tỷ giá
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,'Có chuỗi số' không thể là 'Có' cho vật liệu không lưu kho
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,'Có chuỗi số' không thể là 'Có' cho vật liệu không lưu kho
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Chọn Trạng thái
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Không thể Chấm công cho những ngày tương lai
 DocType: Pricing Rule,Pricing Rule Help,Quy tắc định giá giúp
@@ -4716,41 +4805,41 @@
 DocType: Item,Customer Code,Mã số khách hàng
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Nhắc ngày sinh nhật cho {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ngày tính từ lần yêu cầu cuối cùng
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,nợ tài khoản phải khớp với giấy tờ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,nợ tài khoản phải khớp với giấy tờ
 DocType: Buying Settings,Naming Series,Đặt tên series
 DocType: Leave Block List,Leave Block List Name,Để lại tên danh sách chặn
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ngày Bảo hiểm bắt đầu phải ít hơn ngày kết thúc Bảo hiểm
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Vui lòng thiết lập hệ thống đặt tên giảng viên trong trường học&gt; Cài đặt trường học
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Tài sản hàng tồn kho
 DocType: Timesheet,Production Detail,Chi tiết sản phẩm
+DocType: Restaurant,Active Menu,Menu hoạt động
 DocType: Target Detail,Target Qty,Số lượng mục tiêu
 DocType: Shopping Cart Settings,Checkout Settings,Thiết lập Checkout
 DocType: Attendance,Present,Nay
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Giao hàng Ghi {0} không phải nộp
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Giao hàng Ghi {0} không phải nộp
 DocType: Notification Control,Sales Invoice Message,Hóa đơn bán hàng nhắn
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Đóng tài khoản {0} phải được loại trách nhiệm pháp lý / Vốn chủ sở hữu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},Phiếu lương của nhân viên {0} đã được tạo ra cho bảng thời gian {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Phiếu lương của nhân viên {0} đã được tạo ra cho bảng thời gian {1}
 DocType: Vehicle Log,Odometer,mét kế
 DocType: Sales Order Item,Ordered Qty,Số lượng đặt hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,Mục {0} bị vô hiệu hóa
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Mục {0} bị vô hiệu hóa
 DocType: Stock Settings,Stock Frozen Upto,Hàng tồn kho đóng băng cho tới
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM không chứa bất kỳ mẫu hàng tồn kho nào
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Hoạt động dự án / nhiệm vụ.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM không chứa bất kỳ mẫu hàng tồn kho nào
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Hoạt động dự án / nhiệm vụ.
 DocType: Vehicle Log,Refuelling Details,Chi tiết Nạp nhiên liệu
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Tạo ra bảng lương
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","QUá trình mua bán phải được đánh dấu, nếu ""Được áp dụng cho"" được lựa chọn là  {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Giảm giá phải được ít hơn 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,Tỷ giá đặt hàng cuối cùng không được tìm thấy
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Viết Tắt Số tiền (Tiền công ty)
 DocType: Sales Invoice Timesheet,Billing Hours,Giờ Thanh toán
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,BOM mặc định cho {0} không tìm thấy
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Hàng # {0}: Hãy thiết lập số lượng đặt hàng
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM mặc định cho {0} không tìm thấy
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Hàng # {0}: Hãy thiết lập số lượng đặt hàng
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Chạm vào mục để thêm chúng vào đây
 DocType: Fees,Program Enrollment,chương trình tuyển sinh
 DocType: Landed Cost Voucher,Landed Cost Voucher,Chứng Thư Chi phí hạ cánh
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Hãy đặt {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Lặp lại vào ngày của tháng
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} là sinh viên không hoạt động
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0} - {1} là sinh viên không hoạt động
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} là sinh viên không hoạt động
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} là sinh viên không hoạt động
 DocType: Employee,Health Details,Thông tin chi tiết về sức khỏe
 DocType: Offer Letter,Offer Letter Terms,Hạn thư mơi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Để tạo tài liệu tham chiếu yêu cầu thanh toán là bắt buộc
@@ -4759,7 +4848,6 @@
 DocType: Employee External Work History,Salary,Lương
 DocType: Serial No,Delivery Document Type,Loại tài liệu giao hàng
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Gửi tất cả các phiếu lương cho các tiêu chí lựa chọn ở trên
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} các mục đã được đồng bộ hóa
 DocType: Sales Order,Partly Delivered,Một phần được Giao
 DocType: Email Digest,Receivables,Các khoản phải thu
 DocType: Lead Source,Lead Source,NguồnLead
@@ -4781,9 +4869,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing đun 2
 DocType: SG Creation Tool Course,Max Strength,Sức tối đa
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM đã thay thế
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,Chọn các mục dựa trên ngày giao hàng
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Chọn các mục dựa trên ngày giao hàng
 ,Sales Analytics,Bán hàng Analytics
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Sẵn {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Sẵn {0}
 ,Prospects Engaged But Not Converted,Triển vọng tham gia nhưng không chuyển đổi
 ,Prospects Engaged But Not Converted,Triển vọng tham gia nhưng không chuyển đổi
 DocType: Manufacturing Settings,Manufacturing Settings,Thiết lập sản xuất
@@ -4791,10 +4879,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Số di động của Guardian1
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Vui lòng nhập tiền tệ mặc định trong Công ty Thạc sĩ
 DocType: Stock Entry Detail,Stock Entry Detail,Chi tiết phiếu nhập kho
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Nhắc nhở hàng ngày
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Nhắc nhở hàng ngày
 DocType: Products Settings,Home Page is Products,Trang chủ là sản phẩm
 ,Asset Depreciation Ledger,Tài sản khấu hao Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},Luật thuế xung khắc  với {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},Luật thuế xung khắc  với {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Tên tài khoản mới
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Chi phí nguyên liệu thô được cung cấp
 DocType: Selling Settings,Settings for Selling Module,Thiết lập module bán hàng
@@ -4808,8 +4896,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Mục {0} phải là một hàng tồn kho
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Kho SP dở dang mặc định
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Thiết lập mặc định cho các giao dịch kế toán.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vui lòng cài đặt Hệ thống Đặt tên Nhân viên trong Nguồn nhân lực&gt; Cài đặt Nhân sự
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Ngày Dự kiến không thể trước ngày yêu cầu vật tư
+DocType: Restaurant,Default Tax Template,Mẫu Thuế Mặc định
 DocType: Fees,Student Details,Chi tiết Sinh viên
 DocType: Purchase Invoice Item,Stock Qty,Số lượng cổ phiếu
 DocType: Purchase Invoice Item,Stock Qty,Số lượng cổ phiếu
@@ -4828,8 +4917,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Đi tới Mục
 DocType: Sales Partner,Partner Type,Loại đối tác
 DocType: Purchase Taxes and Charges,Actual,Dựa trên tiền thực tế
+DocType: Restaurant Menu,Restaurant Manager,Quản lý nhà hàng
 DocType: Authorization Rule,Customerwise Discount,Giảm giá 1 cách thông minh
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,thời gian biểu cho các công việc
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,thời gian biểu cho các công việc
 DocType: Purchase Invoice,Against Expense Account,Đối với tài khoản chi phí
 DocType: Production Order,Production Order,Đơn Đặt hàng
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,Lưu ý cài đặt {0} đã được gửi
@@ -4837,7 +4927,6 @@
 DocType: Quotation Item,Against Docname,Chống lại Docname
 DocType: SMS Center,All Employee (Active),Tất cả các nhân viên (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Xem ngay bây giờ
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Chọn khoảng thời gian khi hóa đơn sẽ được tạo tự động
 DocType: BOM,Raw Material Cost,Chi phí nguyên liệu thô
 DocType: Item Reorder,Re-Order Level,mức đặt mua lại
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Nhập các mặt hàng và qty kế hoạch mà bạn muốn nâng cao các đơn đặt hàng sản xuất hoặc tải nguyên liệu để phân tích.
@@ -4850,24 +4939,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Loại Báo cáo là bắt buộc
 DocType: Item,Serial Number Series,Serial Number Dòng
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Phải có Kho cho vật tư {0} trong hàng {1}
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,Thêm chương trình
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Bán Lẻ & Bán
 DocType: Issue,First Responded On,Đã trả lời đầu tiên On
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Hội Chữ thập Danh bạ nhà hàng ở nhiều nhóm
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Ngày bắt đầu năm tài chính và ngày kết thúc năm tài chính đã được thiết lập trong năm tài chính {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Clearance Ngày cập nhật
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Phân chia lô hàng
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Phân chia lô hàng
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Phân chia lô hàng
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Phân chia lô hàng
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Hòa giải thành công
 DocType: Request for Quotation Supplier,Download PDF,Tải về PDF
 DocType: Production Order,Planned End Date,Ngày kết thúc kế hoạch
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Vui lòng nhập Lịch biểu Ngày
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Nơi các mặt hàng được lưu trữ.
 DocType: Request for Quotation,Supplier Detail,Nhà cung cấp chi tiết
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},Lỗi trong công thức hoặc điều kiện: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Lỗi trong công thức hoặc điều kiện: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Số tiền ghi trên hoá đơn
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Tiêu chí trọng lượng phải bổ sung lên đến 100%
 DocType: Attendance,Attendance,Tham gia
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,các mẫu hàng tồn kho
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,các mẫu hàng tồn kho
 DocType: BOM,Materials,Nguyên liệu
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Nếu không kiểm tra, danh sách sẽ phải được thêm vào mỗi Bộ, nơi nó đã được áp dụng."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Nguồn và kho đích không được giống nhau
@@ -4885,6 +4974,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,tính trên tổng tiền
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Giá trị thuộc tính {0} phải nằm trong phạm vi của {1} để {2} trong gia số của {3} cho mục {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Kho hàng mục tiêu trong {0} phải được giống như sản xuất theo thứ tự
+DocType: Restaurant Reservation,Waitlisted,Chờ đợi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Tiền tệ không thể thay đổi sau khi thực hiện các mục sử dụng một số loại tiền tệ khác
 DocType: Vehicle Service,Clutch Plate,Clutch tấm
 DocType: Company,Round Off Account,tài khoản làm tròn số
@@ -4901,7 +4991,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Tên  người bán hàng mới
 DocType: Packing Slip,Gross Weight UOM,Tổng trọng lượng UOM
 DocType: Delivery Note Item,Against Sales Invoice,Theo hóa đơn bán hàng
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,Vui lòng nhập số sê-ri cho mục hàng
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,Vui lòng nhập số sê-ri cho mục hàng
 DocType: Bin,Reserved Qty for Production,Số lượng được dự trữ cho việc sản xuất
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Hãy bỏ chọn nếu bạn không muốn xem xét lô trong khi làm cho các nhóm dựa trên khóa học.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Hãy bỏ chọn nếu bạn không muốn xem xét lô trong khi làm cho các nhóm dựa trên khóa học.
@@ -4913,7 +5003,7 @@
 DocType: Lab Test,Test Group,Nhóm thử nghiệm
 DocType: Payment Reconciliation,Receivable / Payable Account,Tài khoản phải thu/phải trả
 DocType: Delivery Note Item,Against Sales Order Item,Theo hàng hóa được đặt mua
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},Hãy xác định thuộc tính Giá trị thuộc tính {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},Hãy xác định thuộc tính Giá trị thuộc tính {0}
 DocType: Item,Default Warehouse,Kho mặc định
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Ngân sách không thể được chỉ định đối với tài khoản Nhóm {0}
 DocType: Healthcare Settings,Patient Registration,Đăng ký bệnh nhân
@@ -4943,6 +5033,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Người bán hàng
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Ngân sách và Trung tâm chi phí
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,Không cho phép nhiều chế độ mặc định
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,cho
 ,Appointment Analytics,Analytics bổ nhiệm
 DocType: Vehicle Service,Half Yearly,Nửa năm
 DocType: Lead,Blog Subscriber,Người theo dõi blog
@@ -4962,7 +5053,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Báo giá
 ,BOM Stock Report,Báo cáo hàng tồn kho BOM
 DocType: Stock Reconciliation Item,Quantity Difference,SỰ khác biệt về số lượng
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Chế biến lương
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Chế biến lương
 DocType: Opportunity Item,Basic Rate,Tỷ giá cơ bản
 DocType: GL Entry,Credit Amount,Số tiền tín dụng
 DocType: Cheque Print Template,Signatory Position,chức vụ người ký
@@ -4976,12 +5067,12 @@
 DocType: Tax Rule,Tax Rule,Luật thuế
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Duy trì cùng tỷ giá Trong suốt chu kỳ kinh doanh
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Lên kế hoạch cho các lần đăng nhập ngoài giờ làm việc của máy trạm
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Khách hàng ở Queue
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,Bác sĩ {0} không có Lịch Bác Sĩ. Thêm nó vào Thầy thuốc
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Khách hàng ở Queue
 DocType: Student,Nationality,Quốc tịch
 ,Items To Be Requested,Các mục được yêu cầu
-DocType: Purchase Order,Get Last Purchase Rate,Tỷ giá nhận cuối
 DocType: Company,Company Info,Thông tin công ty
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,Chọn hoặc thêm khách hàng mới
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Chọn hoặc thêm khách hàng mới
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,trung tâm chi phí là cần thiết để đặt yêu cầu bồi thường chi phí
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Ứng dụng của Quỹ (tài sản)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Điều này được dựa trên sự tham gia của nhân viên này
@@ -4989,16 +5080,18 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Nợ TK
 DocType: Fiscal Year,Year Start Date,Ngày bắt đầu năm
 DocType: Attendance,Employee Name,Tên nhân viên
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Nhà hàng Order Entry Item
 DocType: Sales Invoice,Rounded Total (Company Currency),Tròn số (quy đổi theo tiền tệ của công ty )
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Không thể bí mật với đoàn vì Loại tài khoản được chọn.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} đã được sửa đổi. Xin vui lòng làm mới.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Ngăn chặn người dùng từ việc để lai ứng dụng vào những ngày sau.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Chi phí mua hàng
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +259,Supplier Quotation {0} created,Nhà cung cấp bảng báo giá {0} đã tạo
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +259,Supplier Quotation {0} created,Báo giá của Nhà cung cấp {0} đã tạo
 apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Cuối năm không thể được trước khi bắt đầu năm
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Lợi ích của nhân viên
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},Số lượng đóng gói phải bằng số lượng cho hàng {0} trong hàng {1}
 DocType: Production Order,Manufactured Qty,Số lượng sản xuất
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Hóa đơn đã tạo
 DocType: Purchase Receipt Item,Accepted Quantity,Số lượng chấp nhận
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Hãy thiết lập mặc định Tốt Danh sách nhân viên với {0} hoặc Công ty {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} không tồn tại
@@ -5008,18 +5101,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Hàng số {0}: Số tiền có thể không được lớn hơn khi chờ Số tiền yêu cầu bồi thường đối với Chi {1}. Trong khi chờ Số tiền là {2}
 DocType: Maintenance Schedule,Schedule,Lập lịch quét
 DocType: Account,Parent Account,Tài khoản gốc
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,Khả dụng
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Khả dụng
 DocType: Quality Inspection Reading,Reading 3,Đọc 3
 ,Hub,Trung tâm
 DocType: GL Entry,Voucher Type,Loại chứng từ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,Danh sách giá không tìm thấy hoặc bị vô hiệu hóa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,Danh sách giá không tìm thấy hoặc bị vô hiệu hóa
 DocType: Lab Test,Approved,Đã được phê duyệt
 DocType: Pricing Rule,Price,Giá
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',Nhân viên bớt căng thẳng trên {0} phải được thiết lập như là 'trái'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Nhân viên bớt căng thẳng trên {0} phải được thiết lập như là 'trái'
+DocType: Hub Settings,Last Sync On,Đồng bộ lần cuối cùng
 DocType: Guardian,Guardian,người bảo vệ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Đánh giá {0} được tạo ra cho nhân viên {1} trong phạm vi ngày nhất định
 DocType: Employee,Education,Đào tạo
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,Del
 DocType: Selling Settings,Campaign Naming By,Đặt tên chiến dịch theo
 DocType: Employee,Current Address Is,Địa chỉ hiện tại là
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Mục tiêu bán hàng hàng tháng (
@@ -5034,7 +5128,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Mã khóa học:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Vui lòng nhập tài khoản chi phí
 DocType: Account,Stock,Kho
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Hàng  # {0}: Tài liệu tham khảo Tài liệu Loại phải là một trong mua hàng đặt hàng, mua hóa đơn hoặc  bút toán nhật ký"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Hàng  # {0}: Tài liệu tham khảo Tài liệu Loại phải là một trong mua hàng đặt hàng, mua hóa đơn hoặc  bút toán nhật ký"
 DocType: Employee,Current Address,Địa chỉ hiện tại
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Nếu tài liệu là một biến thể của một item sau đó mô tả, hình ảnh, giá cả, thuế vv sẽ được thiết lập từ các mẫu trừ khi được quy định một cách rõ ràng"
 DocType: Serial No,Purchase / Manufacture Details,Thông tin chi tiết mua / Sản xuất
@@ -5056,7 +5150,7 @@
 DocType: Purchase Invoice,Net Total (Company Currency),Tổng thuần (tiền tệ công ty)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,Ngày kết thúc của năm không thể sớm hơn ngày bắt đầu năm. Xin vui lòng sửa ngày và thử lại.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Hàng {0}: Loại đối tác và đối tác là chỉ áp dụng đối với tài khoản phải thu/phải trả
-DocType: Notification Control,Purchase Receipt Message,Thông báo mua hóa đơn
+DocType: Notification Control,Purchase Receipt Message,Thông báo Hóa đơn mua hàng
 DocType: BOM,Scrap Items,phế liệu mục
 DocType: Production Order,Actual Start Date,Ngày bắt đầu thực tế
 DocType: Sales Order,% of materials delivered against this Sales Order,% của nguyên vật liệu đã được giao gắn với đơn đặt hàng này
@@ -5065,7 +5159,7 @@
 DocType: Hub Settings,Hub Settings,Thiết lập trung tâm
 DocType: Project,Gross Margin %,Tổng lợi nhuận %
 DocType: BOM,With Operations,Với hoạt động
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Ghi sổ kế toán đã được thực hiện bằng loại tiền tệ {0} cho công ty {1}. Hãy lựa chọn một tài khoản phải thu hoặc phải trả với loại tiền tệ{0}.
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Ghi sổ kế toán đã được thực hiện bằng loại tiền tệ {0} cho công ty {1}. Hãy lựa chọn một tài khoản phải thu hoặc phải trả với loại tiền tệ{0}.
 DocType: Asset,Is Existing Asset,Là hiện tại tài sản
 DocType: Salary Detail,Statistical Component,Hợp phần Thống kê
 DocType: Salary Detail,Statistical Component,Hợp phần Thống kê
@@ -5074,13 +5168,14 @@
 DocType: BOM Operation,BOM Operation,Thao tác BOM
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Dựa trên lượng thô trước đó
 DocType: Student,Home Address,Địa chỉ nhà
+DocType: Item,Has Expiry Date,Ngày Hết Hạn
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Cài đặt Variant Item.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,chuyển nhượng tài sản
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,chuyển nhượng tài sản
 DocType: POS Profile,POS Profile,hồ sơ POS
 DocType: Training Event,Event Name,Tên tổ chức sự kiện
 DocType: Physician,Phone (Office),Điện thoại (Văn phòng)
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,Nhận vào
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Tuyển sinh cho {0}
+apps/erpnext/erpnext/hooks.py +147,Admission,Nhận vào
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Tuyển sinh cho {0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","Tính mùa vụ để thiết lập ngân sách, mục tiêu, vv"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Tên biến
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Mục {0} là một mẫu, xin vui lòng chọn một trong các biến thể của nó"
@@ -5089,7 +5184,7 @@
 DocType: Assessment Plan,Room,Phòng
 DocType: Purchase Order,Advance Paid,Trước Paid
 DocType: Item,Item Tax,Thuế mẫu hàng
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,Nguyên liệu tới nhà cung cấp
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Nguyên liệu tới nhà cung cấp
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Tiêu thụ đặc biệt Invoice
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Ngưỡng {0}% xuất hiện nhiều lần
 DocType: Expense Claim,Employees Email Id,Nhân viên Email Id
@@ -5100,32 +5195,30 @@
 DocType: Program,Program Name,Tên chương trình
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Xem xét thuế hoặc phí cho
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Số lượng thực tế là bắt buộc
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} hiện đang có {1} Bảng xếp hạng của Nhà cung cấp và Đơn hàng mua cho nhà cung cấp này nên được cấp một cách thận trọng.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} hiện đang có {1} Bảng xếp hạng của Nhà cung cấp và Đơn hàng mua cho nhà cung cấp này nên được cấp một cách thận trọng.
 DocType: Employee Loan,Loan Type,Loại cho vay
 DocType: Scheduling Tool,Scheduling Tool,Công cụ lập kế hoạch
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Thẻ tín dụng
 DocType: BOM,Item to be manufactured or repacked,Mục được sản xuất hoặc đóng gói lại
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Thiết lập mặc định cho các giao dịch hàng tồn kho.
-DocType: Purchase Invoice,Next Date,Kỳ hạn tiếp theo
 DocType: Employee Education,Major/Optional Subjects,Chính / Đối tượng bắt buộc
 DocType: Sales Invoice Item,Drop Ship,Thả tàu
+DocType: Hub Settings,Suspended,Đình chỉ
 DocType: Training Event,Attendees,Những người tham dự
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Ở đây bạn có thể duy trì chi tiết gia đình như tên và nghề nghiệp của cha mẹ, vợ, chồng và con cái"
 DocType: Academic Term,Term End Date,Ngày kết thúc kỳ hạn
-DocType: Hub Settings,Seller Name,Tên người bán
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Thuế và Phí được khấu trừ (Theo tiền tệ Cty)
 DocType: Item Group,General Settings,Thiết lập chung
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Từ tiền tệ và ngoại tệ để không thể giống nhau
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,Thêm Người hướng dẫn
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Bạn phải lưu mẫu trước khi tiếp tục
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Trước tiên hãy chọn Công ty
 DocType: Item Attribute,Numeric Values,Giá trị Số
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Logo đính kèm
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Mức cổ phiếu
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Mức cổ phiếu
 DocType: Customer,Commission Rate,Tỷ lệ hoa hồng
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,Đã tạo {0} phiếu ghi điểm cho {1} giữa:
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,Tạo khác biệt
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Tạo khác biệt
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Block leave applications by department.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Loại thanh toán phải là một trong nhận, trả  và chuyển giao nội bộ"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,phân tích
@@ -5140,11 +5233,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Tồn kho ban đầu
 DocType: Shopping Cart Settings,Show Public Attachments,Hiển thị các tệp đính kèm công khai
 DocType: Packing Slip,Package Weight Details,Gói Trọng lượng chi tiết
+DocType: Restaurant Reservation,Reservation Time,Thời gian đặt trước
 DocType: Payment Gateway Account,Payment Gateway Account,Tài khoản của Cổng thanh toán
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Sau khi hoàn thành thanh toán chuyển hướng người dùng đến trang lựa chọn.
 DocType: Company,Existing Company,Công ty hiện có
 DocType: Healthcare Settings,Result Emailed,Kết quả Gửi Email
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items","Phân loại thuế được chuyển thành ""Tổng"" bởi tất cả các mẫu hàng đều là mẫu không nhập kho"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Mã hàng&gt; Nhóm mặt hàng&gt; Thương hiệu
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Vui lòng chọn một tập tin csv
 DocType: Student Leave Application,Mark as Present,Đánh dấu như hiện tại
 DocType: Supplier Scorecard,Indicator Color,Màu chỉ thị
@@ -5169,11 +5264,11 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Tạo đợt sinh viên
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Được truyền thẳng về phía trước
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,Được mục từ BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Được mục từ BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Các ngày Thời gian Lead
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Hàng # {0}: Đăng ngày phải giống như ngày mua {1} tài sản {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Kiểm tra điều này nếu Sinh viên đang cư trú tại Nhà nghỉ của Viện.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Vui lòng nhập hàng đơn đặt hàng trong bảng trên
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Vui lòng nhập hàng đơn đặt hàng trong bảng trên
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,Các bảng lương không được thông qua
 ,Stock Summary,Tóm tắt cổ phiếu
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Chuyển tài sản từ kho này sang kho khác
@@ -5189,5 +5284,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Hàng {0}: Nợ mục không thể được liên kết với một {1}
 DocType: Journal Entry,Subscription Section,Phần đăng ký
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,Tài khoản {0} không tồn tại
+DocType: Training Event,Training Program,Chương trình đào tạo
 DocType: Account,Cash,Tiền mặt
 DocType: Employee,Short biography for website and other publications.,Tiểu sử ngắn cho trang web và các ấn phẩm khác.
diff --git a/erpnext/translations/zh-TW.csv b/erpnext/translations/zh-TW.csv
index 3c69d69..d5bad24 100644
--- a/erpnext/translations/zh-TW.csv
+++ b/erpnext/translations/zh-TW.csv
@@ -1,5 +1,4 @@
 DocType: Patient,Divorced,離婚
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,項目已同步
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,允許項目在一個交易中被多次新增
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,材質訪問{0}之前取消此保修索賠取消
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,消費類產品
@@ -16,9 +15,10 @@
 DocType: Employee,Leave Approvers,休假審批人
 DocType: Sales Partner,Dealer,零售商
 DocType: Consultation,Investigations,調查
+DocType: Restaurant Order Entry,Click Enter To Add,點擊輸入要添加
 DocType: POS Profile,Applicable for User,適用於用戶
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生產訂單無法取消，首先Unstop它取消
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,難道你真的想放棄這項資產？
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,難道你真的想放棄這項資產？
 DocType: Drug Prescription,Update Schedule,更新時間表
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,選擇默認供應商
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},價格表{0}需填入貨幣種類
@@ -27,7 +27,6 @@
 DocType: Patient Appointment,Check availability,檢查可用性
 DocType: Job Applicant,Job Applicant,求職者
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,這是基於對這種供應商的交易。詳情請參閱以下時間表
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,沒有更多的結果。
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},實際類型稅不能被包含在商品率排{0}
 DocType: Bank Guarantee,Customer,客戶
 DocType: Purchase Receipt Item,Required By,需求來自
@@ -36,26 +35,28 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),匯率必須一致{0} {1}（{2}）
 DocType: Sales Invoice,Customer Name,客戶名稱
 DocType: Vehicle,Natural Gas,天然氣
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},銀行賬戶不能命名為{0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},銀行賬戶不能命名為{0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,頭（或組）針對其會計分錄是由和平衡得以維持。
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),傑出的{0}不能小於零（ {1} ）
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,沒有提交工資單要處理。
 DocType: Manufacturing Settings,Default 10 mins,預設為10分鐘
 DocType: Leave Type,Leave Type Name,休假類型名稱
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,公開顯示
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,今天有必要採取這一行動，重複上述
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural日記帳分錄提交
 DocType: Pricing Rule,Apply On,適用於
 DocType: Item Price,Multiple Item prices.,多個項目的價格。
 ,Purchase Order Items To Be Received,未到貨的採購訂單項目
 DocType: SMS Center,All Supplier Contact,所有供應商聯絡
 DocType: Support Settings,Support Settings,支持設置
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,預計結束日期不能小於預期開始日期
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,預計結束日期不能小於預期開始日期
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：速率必須與{1}：{2}（{3} / {4}）
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,新假期申請
 ,Batch Item Expiry Status,批處理項到期狀態
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,銀行匯票
 DocType: Mode of Payment Account,Mode of Payment Account,支付帳戶模式
 DocType: Consultation,Consultation,會診
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,銷售和退貨
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,顯示變體
 DocType: Academic Term,Academic Term,學期
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +670,Quantity,數量
@@ -70,28 +71,29 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,保健
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),延遲支付（天）
 DocType: Lab Prescription,Lab Prescription,實驗室處方
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,按價格排序
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,服務費用
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},序號：{0}已在銷售發票中引用：{1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,發票
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},序號：{0}已在銷售發票中引用：{1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,發票
 DocType: Maintenance Schedule Item,Periodicity,週期性
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,會計年度{0}是必需的
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,防禦
 DocType: Salary Component,Abbr,縮寫
 DocType: Timesheet,Total Costing Amount,總成本計算金額
 DocType: Delivery Note,Vehicle No,車輛牌照號碼
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,請選擇價格表
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,請選擇價格表
 DocType: Accounts Settings,Currency Exchange Settings,貨幣兌換設置
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,列＃{0}：付款單據才能完成trasaction
 DocType: Production Order Operation,Work In Progress,在製品
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,請選擇日期
 DocType: Employee,Holiday List,假日列表
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,請在學校設置教師命名系統&gt;學校設置
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,會計人員
+DocType: Hub Settings,Selling Price List,賣價格表
 DocType: Patient,Tobacco Current Use,煙草當前使用
 DocType: Cost Center,Stock User,庫存用戶
 DocType: Company,Phone No,電話號碼
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,課程表創建：
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},新{0}：＃{1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},新{0}：＃{1}
 ,Sales Partners Commission,銷售合作夥伴佣金
 DocType: Purchase Invoice,Rounding Adjustment,舍入調整
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,縮寫不能有超過5個字符
@@ -110,16 +112,15 @@
 DocType: Packed Item,Parent Detail docname,家長可採用DocName細節
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",參考：{0}，商品編號：{1}和顧客：{2}
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,公斤
-DocType: Student Log,Log,日誌
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,開放的工作。
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0}結果提交
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0}結果提交
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,時間跨度
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,選擇倉庫...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,廣告
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同一家公司進入不止一次
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},不允許{0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,取得項目來源
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},送貨單{0}不能更新庫存
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},送貨單{0}不能更新庫存
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},產品{0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,沒有列出項目
 DocType: Payment Reconciliation,Reconcile,調和
@@ -129,28 +130,29 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,養老基金
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,接下來折舊日期不能購買日期之前
 DocType: Consultation,Consultation Date,諮詢日期
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNext用戶的產品列表和發現
 DocType: SMS Center,All Sales Person,所有的銷售人員
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**月度分配**幫助你分配預算/目標跨越幾個月，如果你在你的業務有季節性。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,未找到項目
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,薪酬結構缺失
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,未找到項目
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,薪酬結構缺失
 DocType: Sales Invoice Item,Sales Invoice Item,銷售發票項目
 DocType: Account,Credit,信用
 DocType: POS Profile,Write Off Cost Center,沖銷成本中心
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",如“小學”或“大學”
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",如“小學”或“大學”
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,庫存報告
 DocType: Warehouse,Warehouse Detail,倉庫的詳細資訊
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},信用額度已經越過了客戶{0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,該期限結束日期不能晚於學年年終日期到這個詞聯繫在一起（學年{}）。請更正日期，然後再試一次。
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",“是固定的資產”不能選中，作為資產記錄存在對項目
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",“是固定的資產”不能選中，作為資產記錄存在對項目
 DocType: Vehicle Service,Brake Oil,剎車油
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,客戶&gt;客戶組&gt;地區
 DocType: Tax Rule,Tax Type,稅收類型
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,應稅金額
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},你無權添加或更新{0}之前的條目
 DocType: BOM,Item Image (if not slideshow),產品圖片（如果不是幻燈片）
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,一個客戶存在具有相同名稱
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,（工時率/ 60）*實際操作時間
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,行＃{0}：參考文檔類型必須是費用索賠或日記帳分錄之一
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,選擇BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,行＃{0}：參考文檔類型必須是費用索賠或日記帳分錄之一
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,選擇BOM
 DocType: SMS Log,SMS Log,短信日誌
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,交付項目成本
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,在{0}這個節日之間沒有從日期和結束日期
@@ -178,7 +180,7 @@
 DocType: Journal Entry Account,Employee Loan,員工貸款
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,活動日誌：
 DocType: Fee Schedule,Send Payment Request Email,發送付款請求電子郵件
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,項目{0}不存在於系統中或已過期
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,項目{0}不存在於系統中或已過期
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,房地產
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,帳戶狀態
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,製藥
@@ -190,17 +192,22 @@
 apps/erpnext/erpnext/hr/email_alert/training_scheduled/training_scheduled.html +7,Event Location,活動地點
 DocType: Upload Attendance,Import Log,導入日誌
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,拉根據上述標準型的製造材料要求
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,成功註銷。
 DocType: Training Result Employee,Grade,年級
+DocType: Restaurant Table,No of Seats,座位數
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>",要添加動態主題，請使用jinja標籤<div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>
 DocType: Sales Invoice Item,Delivered By Supplier,交付供應商
 DocType: SMS Center,All Contact,所有聯絡
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,生產訂單已經與BOM的所有項目創建
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,生產訂單已經與BOM的所有項目創建
 DocType: Daily Work Summary,Daily Work Summary,每日工作總結
 DocType: Period Closing Voucher,Closing Fiscal Year,截止會計年度
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1}被凍結
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,請選擇現有的公司創建會計科目表
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1}被凍結
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,請選擇現有的公司創建會計科目表
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,庫存費用
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,選擇目標倉庫
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,選擇目標倉庫
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,選擇目標倉庫
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,選擇目標倉庫
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,請輸入首選電子郵件聯繫
 DocType: Program Enrollment,School Bus,校車
 DocType: Journal Entry,Contra Entry,魂斗羅進入
@@ -217,9 +224,10 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","下載模板，填寫相應的數據，並附加了修改過的文件。
 在選定時間段內所有時間和員工的組合會在模板中，與現有的考勤記錄"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,項目{0}不活躍或生命的盡頭已經達到
+DocType: Student Admission Program,Minimum Age,最低年齡
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,例如：基礎數學
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括稅款，行{0}項率，稅收行{1}也必須包括在內
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,設定人力資源模塊
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,設定人力資源模塊
 DocType: Sales Invoice,Change Amount,漲跌額
 DocType: BOM Update Tool,New BOM,新的物料清單
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +117,Please enter Delivery Date,請輸入交貨日期
@@ -227,7 +235,7 @@
 DocType: Lead,Request Type,請求類型
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,使員工
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,廣播
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,添加房間
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),POS（在線/離線）的設置模式
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,執行
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,進行的作業細節。
 DocType: Serial No,Maintenance Status,維修狀態
@@ -250,6 +258,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,價格表必須適用於購買或出售
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},品項{0}的安裝日期不能早於交貨日期
 DocType: Pricing Rule,Discount on Price List Rate (%),折扣價目表率（％）
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,生物化學
 DocType: Offer Letter,Select Terms and Conditions,選擇條款和條件
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,輸出值
 DocType: Production Planning Tool,Sales Orders,銷售訂單
@@ -283,15 +292,15 @@
 DocType: Sales Partner,Reseller,經銷商
 DocType: Codification Table,Medical Code,醫療法
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.",如果選中，將包括材料要求非庫存物品。
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,請輸入公司名稱
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,請輸入公司名稱
 DocType: Delivery Note Item,Against Sales Invoice Item,對銷售發票項目
 ,Production Orders in Progress,進行中生產訂單
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,從融資淨現金
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save",localStorage的滿了，沒救
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save",localStorage的滿了，沒救
 DocType: Lead,Address & Contact,地址及聯絡方式
 DocType: Leave Allocation,Add unused leaves from previous allocations,從以前的分配添加未使用的休假
 DocType: Sales Partner,Partner website,合作夥伴網站
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,新增項目
+DocType: Restaurant Order Entry,Add Item,新增項目
 DocType: Lab Test,Custom Result,自定義結果
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,聯絡人姓名
 DocType: Course Assessment Criteria,Course Assessment Criteria,課程評價標準
@@ -301,7 +310,8 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Assessment Plan: ,評估計劃：
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,請求您的報價。
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,這是基於對這個項目產生的考勤表
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,淨工資不能低於0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,淨工資不能低於0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",要停止從系統發送重複的錯誤通知，我們已經在訂閱中選中了“禁用”字段
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,只有選擇的休假審批者可以提交此請假
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,解除日期必須大於加入的日期
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,每年葉
@@ -309,9 +319,10 @@
 apps/erpnext/erpnext/stock/utils.py +212,Warehouse {0} does not belong to company {1},倉庫{0}不屬於公司{1}
 DocType: Email Digest,Profit & Loss,利潤損失
 DocType: Task,Total Costing Amount (via Time Sheet),總成本計算量（通過時間表）
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,請設置學生組的學生
 DocType: Item Website Specification,Item Website Specification,項目網站規格
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,禁假的
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,銀行條目
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,庫存調整項目
 DocType: Stock Entry,Sales Invoice No,銷售發票號碼
@@ -319,7 +330,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,學生組創建工具課程
 DocType: Lead,Do Not Contact,不要聯絡
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,誰在您的組織教人
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,唯一ID來跟踪所有的經常性發票。它是在提交生成的。
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,軟件開發人員
 DocType: Item,Minimum Order Qty,最低起訂量
 DocType: Pricing Rule,Supplier Type,供應商類型
@@ -329,17 +339,19 @@
 DocType: Item,Publish in Hub,在發布中心
 DocType: Student Admission,Student Admission,學生入學
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,項{0}將被取消
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,物料需求
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,項{0}將被取消
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,物料需求
 DocType: Bank Reconciliation,Update Clearance Date,更新日期間隙
 DocType: Item,Purchase Details,採購詳情
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},項目{0}未發現“原材料提供&#39;表中的採購訂單{1}
 DocType: Patient Relation,Relation,關係
 DocType: Shipping Rule,Worldwide Shipping,全球航運
 DocType: Patient Relation,Mother,母親
+DocType: Restaurant Reservation,Reservation End Time,預訂結束時間
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,確認客戶的訂單。
 DocType: Purchase Receipt Item,Rejected Quantity,拒絕數量
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,已創建付款請求{0}
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,已創建付款請求{0}
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,低靈敏度
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,完成培訓後請確認
 DocType: Lead,Suggestions,建議
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,在此地域設定跨群組項目間的預算。您還可以通過設定分配來包含季節性。
@@ -356,7 +368,7 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,電子郵件工資單員工根據員工選擇首選的電子郵件
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,該列表中的第一個請假審核將被設定為預設請假審核
 DocType: Tax Rule,Shipping County,航運縣
-apps/erpnext/erpnext/config/desktop.py +158,Learn,學習
+apps/erpnext/erpnext/config/desktop.py +159,Learn,學習
 DocType: Asset,Next Depreciation Date,接下來折舊日期
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,每個員工活動費用
 DocType: Accounts Settings,Settings for Accounts,設置帳戶
@@ -367,13 +379,13 @@
 DocType: Item,Synced With Hub,同步轂
 DocType: Vehicle,Fleet Manager,車隊經理
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},行＃{0}：{1}不能為負值對項{2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,密碼錯誤
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,密碼錯誤
 DocType: Item,Variant Of,變種
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',完成數量不能大於“數量來製造”
 DocType: Period Closing Voucher,Closing Account Head,關閉帳戶頭
 DocType: Employee,External Work History,外部工作經歷
 DocType: Physician,Time per Appointment,每任命時間
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,循環引用錯誤
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,循環引用錯誤
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1名稱
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,送貨單一被儲存，(Export)就會顯示出來。
 DocType: Cheque Print Template,Distance from left edge,從左側邊緣的距離
@@ -381,18 +393,16 @@
 DocType: Lead,Industry,行業
 DocType: Employee,Job Profile,工作簡介
 DocType: BOM Item,Rate & Amount,價格和金額
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,請通過設置&gt;編號系列設置出席人數編號
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,這是基於對本公司的交易。有關詳情，請參閱下面的時間表
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,在建立自動材料需求時以電子郵件通知
 DocType: Journal Entry,Multi Currency,多幣種
 DocType: Payment Reconciliation Invoice,Invoice Type,發票類型
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,客戶&gt;客戶群&gt;地區
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,送貨單
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,建立稅
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,出售資產的成本
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,付款項被修改，你把它之後。請重新拉。
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0}輸入兩次項目稅
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,本週和待活動總結
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0}輸入兩次項目稅
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,本週和待活動總結
 DocType: Student Applicant,Admitted,錄取
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,折舊金額後
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,即將到來的日曆事件
@@ -405,34 +415,33 @@
 DocType: Shipping Rule,Valid for Countries,有效的國家
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,這個項目是一個模板，並且可以在交易不能使用。項目的屬性將被複製到變型，除非“不複製”設置
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,總訂貨考慮
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",員工指定（例如總裁，總監等） 。
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).",員工指定（例如總裁，總監等） 。
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,公司貨幣被換算成客戶基礎貨幣的匯率
 DocType: Course Scheduling Tool,Course Scheduling Tool,排課工具
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行＃{0}：採購發票不能對現有資產進行{1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[緊急]為％s創建循環％s時出錯
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[緊急]為％s創建循環％s時出錯
 DocType: Item Tax,Tax Rate,稅率
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0}已分配給員工{1}週期為{2}到{3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,選擇項目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,選擇項目
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,採購發票{0}已經提交
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},行＃{0}：批號必須與{1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,轉換為非集團
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,一批該產品的（很多）。
 DocType: C-Form Invoice Detail,Invoice Date,發票日期
 DocType: GL Entry,Debit Amount,借方金額
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},只能有每公司1帳戶{0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,請參閱附件
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},只能有每公司1帳戶{0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,請參閱附件
 DocType: Purchase Order,% Received,％ 已收
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,創建挺起胸
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,安裝已經完成！
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,安裝已經完成！
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,信用額度
 DocType: Setup Progress Action,Action Document,行動文件
 DocType: Delivery Note,Instructions,說明
 DocType: Quality Inspection,Inspected By,視察
 DocType: Maintenance Visit,Maintenance Type,維護類型
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0}  -  {1}未加入課程{2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,商品編號&gt;商品組&gt;品牌
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0}  -  {1}未加入課程{2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},序列號{0}不屬於送貨單{1}
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,添加項目
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,添加項目
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,產品質量檢驗參數
 DocType: Leave Application,Leave Approver Name,離開批准人姓名
 DocType: Depreciation Schedule,Schedule Date,排定日期
@@ -454,7 +463,7 @@
 DocType: Salary Slip Timesheet,Working Hours,工作時間
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,更改現有系列的開始/當前的序列號。
 DocType: Dosage Strength,Strength,強度
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,創建一個新的客戶
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,創建一個新的客戶
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",如果有多個定價規則繼續有效，用戶將被要求手動設定優先順序來解決衝突。
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,創建採購訂單
 ,Purchase Register,購買註冊
@@ -500,7 +509,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,所有製造過程中的全域設定。
 DocType: Accounts Settings,Accounts Frozen Upto,帳戶被凍結到
 DocType: SMS Log,Sent On,發送於
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
 DocType: HR Settings,Employee record is created using selected field. ,使用所選欄位創建員工記錄。
 DocType: Sales Order,Not Applicable,不適用
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,假日高手。
@@ -523,13 +532,13 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,總葉分配是必須的
 DocType: Patient,AB Positive,AB積極
 DocType: Job Opening,Description of a Job Opening,一個空缺職位的說明
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,今天待定活動
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,今天待定活動
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,考勤記錄。
 DocType: Salary Structure,Salary Component for timesheet based payroll.,薪酬部分基於時間表工資。
 DocType: Sales Order Item,Used for Production Plan,用於生產計劃
 DocType: Employee Loan,Total Payment,總付款
 DocType: Manufacturing Settings,Time Between Operations (in mins),作業間隔時間（以分鐘計）
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1}被取消，因此無法完成操作
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1}被取消，因此無法完成操作
 DocType: Customer,Buyer of Goods and Services.,買家商品和服務。
 DocType: Journal Entry,Accounts Payable,應付帳款
 DocType: Patient,Allergies,過敏
@@ -539,22 +548,23 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,警告採購訂單
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,列出一些你的客戶。他們可以是組織或個人。
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,足夠的配件組裝
+DocType: POS Profile User,POS Profile User,POS配置文件用戶
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,直接收入
 DocType: Patient Appointment,Date TIme,約會時間
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",7 。總計：累積總數達到了這一點。
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,政務主任
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,請選擇課程
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,請選擇課程
 DocType: Codification Table,Codification Table,編纂表
 DocType: Timesheet Detail,Hrs,小時
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,請選擇公司
 DocType: Stock Entry Detail,Difference Account,差異帳戶
 DocType: Purchase Invoice,Supplier GSTIN,供應商GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,不能因為其依賴的任務{0}沒有關閉關閉任務。
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,請輸入物料需求欲增加的倉庫
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,不能因為其依賴的任務{0}沒有關閉關閉任務。
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,請輸入物料需求欲增加的倉庫
 DocType: Production Order,Additional Operating Cost,額外的運營成本
 DocType: Lab Test Template,Lab Routine,實驗室常規
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,化妝品
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items",若要合併，以下屬性必須為這兩個項目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items",若要合併，以下屬性必須為這兩個項目是相同的
 DocType: Shipping Rule,Net Weight,淨重
 DocType: Employee,Emergency Phone,緊急電話
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,購買
@@ -565,7 +575,8 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,請定義等級為閾值0％
 DocType: Sales Order,To Deliver,為了提供
 DocType: Purchase Invoice Item,Item,項目
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,序號項目不能是一個分數
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,高靈敏度
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,序號項目不能是一個分數
 DocType: Journal Entry,Difference (Dr - Cr),差異（Dr - Cr）
 DocType: Account,Profit and Loss,損益
 DocType: Patient,Risk Factors,風險因素
@@ -574,7 +585,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,管理轉包
 DocType: Vital Signs,Body Temperature,體溫
 DocType: Project,Project will be accessible on the website to these users,項目將在網站向這些用戶上訪問
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,定義項目類型。
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,定義項目類型。
 DocType: Supplier Scorecard,Weighting Function,加權函數
 DocType: Physician,OP Consulting Charge,OP諮詢費
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,設置你的
@@ -586,18 +597,18 @@
 DocType: BOM,Operating Cost,營業成本
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,增量不能為0
 DocType: Company,Delete Company Transactions,刪除公司事務
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,參考編號和參考日期是強制性的銀行交易
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,參考編號和參考日期是強制性的銀行交易
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,新增 / 編輯稅金及費用
 DocType: Payment Entry Reference,Supplier Invoice No,供應商發票號碼
 DocType: Territory,For reference,供參考
 DocType: Healthcare Settings,Appointment Confirmation,預約確認
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions",無法刪除序列號{0}，因為它採用的是現貨交易
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),關閉（Cr）
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,移動項目
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,移動項目
 DocType: Serial No,Warranty Period (Days),保修期限（天數）
 DocType: Installation Note Item,Installation Note Item,安裝注意項
 DocType: Production Plan Item,Pending Qty,待定數量
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1}是不活動
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1}是不活動
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,設置檢查尺寸打印
 DocType: Salary Slip,Salary Slip Timesheet,工資單時間表
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,對於轉包的採購入庫單，供應商倉庫是強制性輸入的。
@@ -605,7 +616,7 @@
 DocType: Pricing Rule,Sales Partner,銷售合作夥伴
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,所有供應商記分卡。
 DocType: Buying Settings,Purchase Receipt Required,需要採購入庫單
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,估價費用是強制性的，如果打開股票進入
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,估價費用是強制性的，如果打開股票進入
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,沒有在發票表中找到記錄
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,請選擇公司和黨的第一型
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,財務／會計年度。
@@ -639,7 +650,7 @@
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,客戶數據庫。
 DocType: Quotation,Quotation To,報價到
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),開啟（Cr ）
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,測度項目的默認單位{0}不能直接改變，因為你已經做了一些交易（S）與其他計量單位。您將需要創建一個新的項目，以使用不同的默認計量單位。
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,測度項目的默認單位{0}不能直接改變，因為你已經做了一些交易（S）與其他計量單位。您將需要創建一個新的項目，以使用不同的默認計量單位。
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,分配金額不能為負
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,請設定公司
 DocType: Purchase Order Item,Billed Amt,已結算額
@@ -652,6 +663,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,選擇付款賬戶，使銀行進入
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll",建立員工檔案管理葉，報銷和工資
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,處方期
+DocType: Restaurant Reservation,Restaurant Reservation,餐廳預訂
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,提案寫作
 DocType: Payment Entry Deduction,Payment Entry Deduction,輸入付款扣除
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,另外銷售人員{0}存在具有相同員工ID
@@ -659,7 +671,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,資料主檔
 DocType: Assessment Plan,Maximum Assessment Score,最大考核評分
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,更新銀行交易日期
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,時間跟踪
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,時間跟踪
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,輸送機重複
 DocType: Fiscal Year Company,Fiscal Year Company,會計年度公司
 DocType: Packing Slip Item,DN Detail,DN詳細
@@ -668,7 +680,8 @@
 DocType: Batch,Batch Description,批次說明
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,創建學生組
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,創建學生組
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.",支付網關帳戶沒有創建，請手動創建一個。
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.",支付網關帳戶沒有創建，請手動創建一個。
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,按照DOB的規定，沒有資格參加本計劃
 DocType: Sales Invoice,Sales Taxes and Charges,銷售稅金及費用
 DocType: Employee,Organization Profile,組織簡介
 DocType: Student,Sibling Details,兄弟姐妹詳情
@@ -699,7 +712,7 @@
 DocType: Lab Test Template,Compound,複合
 DocType: Fee Validity,Max number of visit,最大訪問次數
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,創建時間表：
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,註冊
 DocType: GST Settings,GST Settings,GST設置
 DocType: Selling Settings,Customer Naming By,客戶命名由
@@ -731,13 +744,13 @@
 DocType: BOM Operation,Operation Time,操作時間
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,基礎
 DocType: Timesheet,Total Billed Hours,帳單總時間
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,核銷金額
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,核銷金額
 DocType: Leave Block List Allow,Allow User,允許用戶
 DocType: Journal Entry,Bill No,帳單號碼
 DocType: Company,Gain/Loss Account on Asset Disposal,在資產處置收益/損失帳戶
 DocType: Vehicle Log,Service Details,服務細節
 DocType: Vehicle Log,Service Details,服務細節
-DocType: Purchase Invoice,Quarterly,每季
+DocType: Subscription,Quarterly,每季
 DocType: Lab Test Template,Grouped,分組
 DocType: Selling Settings,Delivery Note Required,要求送貨單
 DocType: Bank Guarantee,Bank Guarantee Number,銀行擔保編號
@@ -747,7 +760,6 @@
 DocType: Student Attendance,Student Attendance,學生出勤
 DocType: Sales Invoice Timesheet,Time Sheet,時間表
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,倒沖原物料基於
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,請輸入項目細節
 DocType: Purchase Receipt,Other Details,其他詳細資訊
 DocType: Lab Test,Test Template,測試模板
 DocType: Account,Accounts,會計
@@ -761,12 +773,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,預覽工資單
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,帳戶{0}已多次輸入
 DocType: Account,Expenses Included In Valuation,支出計入估值
-DocType: Hub Settings,Seller City,賣家市
 ,Absent Student Report,缺席學生報告
 DocType: Email Digest,Next email will be sent on:,接下來的電子郵件將被發送：
 DocType: Offer Letter Term,Offer Letter Term,報價函期限
 DocType: Supplier Scorecard,Per Week,每個星期
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,項目已變種。
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,項目已變種。
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,學生總數
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,項{0}未找到
 DocType: Bin,Stock Value,庫存價值
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,費用記錄將在後台創建。如果有任何錯誤，錯誤信息將在附表中更新。
@@ -774,11 +786,13 @@
 DocType: BOM Explosion Item,Qty Consumed Per Unit,數量消耗每單位
 DocType: Serial No,Warranty Expiry Date,保證期到期日
 DocType: Material Request Item,Quantity and Warehouse,數量和倉庫
+DocType: Hub Settings,Unregister,註銷
 DocType: Sales Invoice,Commission Rate (%),佣金比率（％）
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,請選擇程序
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,請選擇程序
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,請選擇程序
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,請選擇程序
 DocType: Project,Estimated Cost,估計成本
 DocType: Purchase Order,Link to material requests,鏈接到材料請求
+DocType: Hub Settings,Publish,發布
 DocType: Journal Entry,Credit Card Entry,信用卡進入
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,公司與賬戶
 apps/erpnext/erpnext/config/healthcare.py +108,Appointment Type Master,預約類型大師
@@ -787,13 +801,12 @@
 DocType: Lead,Campaign Name,活動名稱
 DocType: Selling Settings,Close Opportunity After Days,關閉機會後日
 DocType: Purchase Order,Supply Raw Materials,供應原料
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,在這接下來的發票將生成的日期。它在提交生成。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,流動資產
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0}不是庫存項目
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',請通過點擊“培訓反饋”，然後點擊“新建”
 DocType: Mode of Payment Account,Default Account,預設帳戶
 DocType: Payment Entry,Received Amount (Company Currency),收到的款項（公司幣種）
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,如果機會是由前導而來，前導必須被設定
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,如果機會是由前導而來，前導必須被設定
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,請選擇每週休息日
 DocType: Patient,O Negative,O負面
 DocType: Production Order Operation,Planned End Time,計劃結束時間
@@ -808,18 +821,19 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,預留製造
 DocType: Opportunity,Opportunity From,機會從
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,月薪聲明。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}：{1}項目{2}所需的序列號。你已經提供{3}。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}：{1}項目{2}所需的序列號。你已經提供{3}。
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,請選擇一張桌子
 DocType: BOM,Website Specifications,網站規格
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0}是“收件人”中的無效電子郵件地址
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0}是“收件人”中的無效電子郵件地址
 DocType: Special Test Items,Particulars,細節
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}：從{0}類型{1}
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,列#{0}：轉換係數是強制性的
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海報價格規則，同樣的標準存在，請通過分配優先解決衝突。價格規則：{0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,無法關閉或取消BOM，因為它是與其他材料明細表鏈接
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,無法關閉或取消BOM，因為它是與其他材料明細表鏈接
 DocType: Opportunity,Maintenance,維護
 DocType: Item Attribute Value,Item Attribute Value,項目屬性值
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,銷售活動。
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,製作時間表
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,製作時間表
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -874,11 +888,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,請先輸入品項
 DocType: Account,Liability,責任
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金額不能大於索賠額行{0}。
+DocType: Salary Detail,Do not include in total,不包括在內
 DocType: Company,Default Cost of Goods Sold Account,銷貨帳戶的預設成本
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,未選擇價格列表
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,未選擇價格列表
 DocType: Request for Quotation Supplier,Send Email,發送電子郵件
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},警告：無效的附件{0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,無權限
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},警告：無效的附件{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,無權限
 DocType: Vital Signs,Heart Rate / Pulse,心率/脈搏
 DocType: Company,Default Bank Account,預設銀行帳戶
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",要根據黨的篩選，選擇黨第一類型
@@ -906,12 +921,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,項目行的{idx} {文檔類型} {} DOCNAME上面不存在&#39;{}的文檔類型“表
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,時間表{0}已完成或取消
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,沒有任務
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",該月的一天，在這汽車的發票將產生如05，28等
 DocType: Item Variant Settings,Copy Fields to Variant,將字段複製到變式
 DocType: Asset,Opening Accumulated Depreciation,打開累計折舊
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,得分必須小於或等於5
 DocType: Program Enrollment Tool,Program Enrollment Tool,計劃註冊工具
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C-往績紀錄
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C-往績紀錄
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,客戶和供應商
 DocType: Email Digest,Email Digest Settings,電子郵件摘要設定
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,感謝您的業務！
@@ -929,12 +943,12 @@
 DocType: Request for Quotation Supplier,Quote Status,報價狀態
 DocType: Maintenance Visit,Completion Status,完成狀態
 DocType: HR Settings,Enter retirement age in years,在年內進入退休年齡
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,目標倉庫
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,請選擇一個倉庫
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,目標倉庫
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,請選擇一個倉庫
 DocType: Cheque Print Template,Starting location from left edge,從左邊起始位置
 DocType: Item,Allow over delivery or receipt upto this percent,允許在交付或接收高達百分之這
 DocType: Upload Attendance,Import Attendance,進口出席
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,所有項目群組
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,所有項目群組
 DocType: Process Payroll,Activity Log,活動日誌
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,淨利／虧損
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,自動編寫郵件在提交交易。
@@ -945,7 +959,8 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,採購訂單到付款
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,預計數量
 DocType: Drug Prescription,Interval UOM,間隔UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,項目變種{0}已經具有相同屬性的存在
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,項目變種{0}已經具有相同屬性的存在
+DocType: Item,Hub Publishing Details,Hub發布細節
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',“開放”
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,開做
 DocType: Notification Control,Delivery Note Message,送貨單留言
@@ -964,9 +979,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,物料清單＃{0}：原始材料與主要項目不能相同
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,在外購入庫單項目表總的相關費用必須是相同的總稅費
 DocType: Sales Team,Incentives,獎勵
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,註冊Hub
 DocType: SMS Log,Requested Numbers,請求號碼
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,績效考核。
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",作為啟用的購物車已啟用“使用購物車”，而應該有購物車至少有一個稅務規則
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",作為啟用的購物車已啟用“使用購物車”，而應該有購物車至少有一個稅務規則
 apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",付款輸入{0}對訂單{1}，檢查它是否應該被拉到作為預先在該發票聯。
 DocType: Sales Invoice Item,Stock Details,庫存詳細訊息
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,專案值
@@ -983,7 +999,8 @@
 DocType: Setup Progress Action,Action Field,行動領域
 DocType: Healthcare Settings,Manage Customer,管理客戶
 DocType: Serial No,Incoming Rate,傳入速率
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,您的公司要為其設立這個系統的名稱。
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,啟用集線器
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,您的公司要為其設立這個系統的名稱。
 DocType: HR Settings,Include holidays in Total no. of Working Days,包括節假日的總數。工作日
 DocType: Employee,Date of Joining,加入日期
 DocType: Supplier Quotation,Is Subcontracted,轉包
@@ -997,13 +1014,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},找不到時隙在未來{0}天操作{1}
 DocType: Production Order,Plan material for sub-assemblies,計劃材料為子組件
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,銷售合作夥伴和地區
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM {0}必須是積極的
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM {0}必須是積極的
 DocType: Journal Entry,Depreciation Entry,折舊分錄
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,請先選擇文檔類型
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,取消取消此保養訪問之前，材質訪問{0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},序列號{0}不屬於項目{1}
 DocType: Purchase Receipt Item Supplied,Required Qty,所需數量
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,與現有的交易倉庫不能轉換到總帳。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,與現有的交易倉庫不能轉換到總帳。
 DocType: Bank Reconciliation,Total Amount,總金額
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,互聯網出版
 DocType: Prescription Duration,Number,數
@@ -1014,7 +1031,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,銷售價格表
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.",如果選中，將創建一個客戶，映射到患者。將針對該客戶創建病人發票。您也可以在創建患者時選擇現有客戶。
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,發布同步項目
 DocType: Bank Reconciliation,Account Currency,賬戶幣種
 DocType: Lab Test,Sample ID,樣品編號
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,請註明舍入賬戶的公司
@@ -1023,9 +1039,11 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,員工{0}不活躍或不存在
 DocType: Fee Structure,Components,組件
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},請輸入項目資產類別{0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,項目變種{0}更新
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,項目變種{0}更新
 DocType: Quality Inspection Reading,Reading 6,6閱讀
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,無法{0} {1} {2}沒有任何負面的優秀發票
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this",被生成。如果延遲，您將不得不手動更改“每月重複”字段
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,無法{0} {1} {2}沒有任何負面的優秀發票
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,購買發票提前
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},行{0}：信用記錄無法被鏈接的{1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,定義預算財政年度。
@@ -1036,12 +1054,12 @@
 DocType: Item,Is Purchase Item,是購買項目
 DocType: Asset,Purchase Invoice,採購發票
 DocType: Stock Ledger Entry,Voucher Detail No,券詳細說明暫無
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,新的銷售發票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,新的銷售發票
 DocType: Stock Entry,Total Outgoing Value,出貨總計值
 DocType: Physician,Appointments,約會
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,開幕日期和截止日期應在同一會計年度
 DocType: Lead,Request for Information,索取資料
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,同步離線發票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,同步離線發票
 DocType: Payment Request,Paid,付費
 DocType: Program Fee,Program Fee,課程費用
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1059,10 +1077,11 @@
 DocType: Purchase Invoice Item,Purchase Order Item,採購訂單項目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,間接收入
 DocType: Student Attendance Tool,Student Attendance Tool,學生考勤工具
+DocType: Restaurant Menu,Price List (Auto created),價目表（自動創建）
 DocType: Cheque Print Template,Date Settings,日期設定
 ,Company Name,公司名稱
 DocType: SMS Center,Total Message(s),訊息總和（s ）
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,對於轉讓項目選擇
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,對於轉讓項目選擇
 DocType: Purchase Invoice,Additional Discount Percentage,額外折扣百分比
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,查看所有幫助影片名單
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,選取支票存入該銀行帳戶的頭。
@@ -1080,25 +1099,29 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,儀表
 DocType: Workstation,Electricity Cost,電力成本
 DocType: HR Settings,Don't send Employee Birthday Reminders,不要送員工生日提醒
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,保存設置
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,請求的產品
 DocType: Item,Inspection Criteria,檢驗標準
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,轉移
 DocType: BOM Website Item,BOM Website Item,BOM網站項目
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,Upload your letter head and logo. (you can edit them later).,上傳你的信頭和標誌。 （您可以在以後對其進行編輯）。
+DocType: Timesheet Detail,Bill,法案
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,接下來折舊日期輸入為過去的日期
 DocType: SMS Center,All Lead (Open),所有鉛（開放）
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),行{0}：數量不適用於{4}在倉庫{1}在發布條目的時間（{2} {3}）
 DocType: Purchase Invoice,Get Advances Paid,獲取有償進展
 DocType: Item,Automatically Create New Batch,自動創建新批
 DocType: Item,Automatically Create New Batch,自動創建新批
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Make ,使
 DocType: Student Admission,Admission Start Date,入學開始日期
 DocType: Journal Entry,Total Amount in Words,總金額大寫
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,有一個錯誤。一個可能的原因可能是因為您沒有保存的形式。請聯繫support@erpnext.com如果問題仍然存在。
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,我的購物車
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},訂單類型必須是一個{0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},訂單類型必須是一個{0}
 DocType: Lead,Next Contact Date,下次聯絡日期
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,開放數量
 DocType: Healthcare Settings,Appointment Reminder,預約提醒
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,對於漲跌額請輸入帳號
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,對於漲跌額請輸入帳號
 DocType: Student Batch Name,Student Batch Name,學生批名
 DocType: Consultation,Doctor,醫生
 DocType: Holiday List,Holiday List Name,假日列表名稱
@@ -1106,12 +1129,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,課程時間表
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,股票期權
 DocType: Journal Entry Account,Expense Claim,報銷
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,難道你真的想恢復這個報廢的資產？
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},數量為{0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,難道你真的想恢復這個報廢的資產？
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},數量為{0}
 DocType: Leave Application,Leave Application,休假申請
 DocType: Patient,Patient Relation,患者關係
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,排假工具
+DocType: Item,Hub Category to Publish,集線器類別發布
 DocType: Leave Block List,Leave Block List Dates,休假區塊清單日期表
+DocType: Sales Invoice,Billing Address GSTIN,帳單地址GSTIN
 DocType: Workstation,Net Hour Rate,淨小時率
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,到岸成本採購入庫單
 DocType: Company,Default Terms,默認條款
@@ -1121,7 +1146,7 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},請指定{0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,刪除的項目在數量或價值沒有變化。
 DocType: Delivery Note,Delivery To,交貨給
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,屬性表是強制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,屬性表是強制性的
 DocType: Production Planning Tool,Get Sales Orders,獲取銷售訂單
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0}不能為負數
 DocType: Training Event,Self-Study,自習
@@ -1132,7 +1157,7 @@
 DocType: Task,Urgent,緊急
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},請指定行{0}在表中的有效行ID {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,無法找到變量：
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,請選擇要從數字鍵盤編輯的字段
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,請選擇要從數字鍵盤編輯的字段
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,轉到桌面和開始使用ERPNext
 DocType: Item,Manufacturer,生產廠家
 DocType: Landed Cost Item,Purchase Receipt Item,採購入庫項目
@@ -1146,6 +1171,7 @@
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation_dashboard.py +11,Records,記錄
 DocType: Asset,Scrapped,報廢
 apps/erpnext/erpnext/config/stock.py +200,"Attributes for Item Variants. e.g Size, Color etc.",屬性的項目變體。如大小，顏色等。
+DocType: Purchase Invoice,Returns,返回
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP倉庫
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},序列號{0}在維護合約期間內直到{1}
 DocType: Lead,Organization Name,組織名稱
@@ -1160,8 +1186,8 @@
 DocType: GL Entry,Against,針對
 DocType: Item,Default Selling Cost Center,預設銷售成本中心
 DocType: Sales Partner,Implementation Partner,實施合作夥伴
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,郵政編碼
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},銷售訂單{0} {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,郵政編碼
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},銷售訂單{0} {1}
 DocType: Opportunity,Contact Info,聯絡方式
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,製作Stock條目
 DocType: Packing Slip,Net Weight UOM,淨重計量單位
@@ -1172,6 +1198,7 @@
 DocType: Holiday List,Get Weekly Off Dates,獲取每週關閉日期
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,結束日期不能小於開始日期
 DocType: Sales Person,Select company name first.,先選擇公司名稱。
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,從低到高
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,從供應商收到的報價。
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,更換BOM並更新所有BOM中的最新價格
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,平均年齡
@@ -1190,7 +1217,7 @@
 DocType: Program Enrollment,Transportation,運輸
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,無效屬性
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1}必須提交
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},量必須小於或等於{0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},量必須小於或等於{0}
 DocType: SMS Center,Total Characters,總字元數
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},請BOM字段中選擇BOM的項目{0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-表 發票詳細資訊
@@ -1205,7 +1232,7 @@
 ,Ordered Items To Be Billed,預付款的訂購物品
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,從範圍必須小於要範圍
 DocType: Global Defaults,Global Defaults,全域預設值
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,項目合作邀請
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,項目合作邀請
 DocType: Salary Slip,Deductions,扣除
 DocType: Setup Progress Action,Action Name,動作名稱
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,開始年份
@@ -1222,7 +1249,7 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,銷售發票提前
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,無需求
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},另一個預算記錄“{0}”已存在對{1}“{2}”為年度{3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',“實際開始日期”不能大於“實際結束日期'
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',“實際開始日期”不能大於“實際結束日期'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,管理
 DocType: Cheque Print Template,Payer Settings,付款人設置
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",這將追加到變異的項目代碼。例如，如果你的英文縮寫為“SM”，而該項目的代碼是“T-SHIRT”，該變種的項目代碼將是“T-SHIRT-SM”
@@ -1240,17 +1267,18 @@
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,供應商數據庫。
 DocType: Account,Balance Sheet,資產負債表
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',成本中心與項目代碼“項目
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。請檢查是否帳戶已就付款方式或POS機配置文件中設置。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。請檢查是否帳戶已就付款方式或POS機配置文件中設置。
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,同一項目不能輸入多次。
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",進一步帳戶可以根據組進行，但條目可針對非組進行
 DocType: Lead,Lead,潛在客戶
 DocType: Email Digest,Payables,應付賬款
 DocType: Course,Course Intro,課程介紹
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,股票輸入{0}創建
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,請通過設置&gt;編號系列設置考勤編號系列
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,股票輸入{0}創建
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：駁回採購退貨數量不能進入
 ,Purchase Order Items To Be Billed,欲付款的採購訂單品項
 DocType: Purchase Invoice Item,Net Rate,淨費率
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,請選擇一個客戶
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,請選擇一個客戶
 DocType: Purchase Invoice Item,Purchase Invoice Item,採購發票項目
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,針對所選的採購入庫單，存貨帳分錄和總帳分錄已經重新登錄。
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,項目1
@@ -1271,7 +1299,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},重複的行{0}同{1}
 ,Trial Balance,試算表
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,會計年度{0}未找到
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,建立職工
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,建立職工
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,請先選擇前綴稱號
 DocType: Maintenance Visit Purpose,Work Done,工作完成
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,請指定屬性表中的至少一個屬性
@@ -1279,12 +1307,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,項{0}必須是一個非庫存項目
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,查看總帳
 DocType: Grading Scale,Intervals,間隔
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group",具有具有相同名稱的項目群組存在，請更改項目名稱或重新命名該項目群組
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group",具有具有相同名稱的項目群組存在，請更改項目名稱或重新命名該項目群組
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,學生手機號碼
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,世界其他地區
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,世界其他地區
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,該項目{0}不能有批
 ,Budget Variance Report,預算差異報告
 DocType: Salary Slip,Gross Pay,工資總額
+DocType: Item,Is Item from Hub,是來自Hub的Item
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,行{0}：活動類型是強制性的。
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,會計總帳
 DocType: Stock Reconciliation,Difference Amount,差額
@@ -1292,8 +1321,8 @@
 DocType: Vehicle Log,Service Detail,服務細節
 DocType: BOM,Item Description,項目說明
 DocType: Student Sibling,Student Sibling,學生兄弟
-DocType: Purchase Invoice,Is Recurring,是經常性
 DocType: Purchase Invoice,Supplied Items,提供的物品
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},請設置餐館{0}的有效菜單
 DocType: Production Order,Qty To Manufacture,製造數量
 DocType: School Settings,School Settings,學校設置
 DocType: School Settings,School Settings,學校設置
@@ -1321,12 +1350,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,銷售訂單{0}無效
 DocType: Supplier Scorecard,Warn for new Request for Quotations,警告新的報價請求
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,採購訂單幫助您規劃和跟進您的購買
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged",對不起，企業不能合併
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged",對不起，企業不能合併
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,實驗室測試處方
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",在材質要求總發行/傳輸量{0} {1} \不能超過請求的數量{2}的項目更大的{3}
 DocType: Employee,Employee Number,員工人數
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},案例編號已在使用中（ S） 。從案例沒有嘗試{0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},案例編號已在使用中（ S） 。從案例沒有嘗試{0}
 DocType: Project,% Completed,％已完成
 ,Invoiced Amount (Exculsive Tax),發票金額（Exculsive稅）
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,項目2
@@ -1339,34 +1368,33 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,間接費用
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,列#{0}：數量是強制性的
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,農業
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,同步主數據
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,同步主數據
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,您的產品或服務
 DocType: Special Test Items,Special Test Items,特殊測試項目
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,網站形象應該是一個公共文件或網站網址
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,網站形象應該是一個公共文件或網站網址
 DocType: Student Applicant,AP,美聯社
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,這是個根項目群組，且無法被編輯。
 DocType: Journal Entry Account,Purchase Order,採購訂單
 DocType: Vehicle,Fuel UOM,燃油計量單位
 DocType: Warehouse,Warehouse Contact Info,倉庫聯絡方式
 DocType: Payment Entry,Write Off Difference Amount,核銷金額差異
-DocType: Purchase Invoice,Recurring Type,經常性類型
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent",{0}：未發現員工的電子郵件，因此，電子郵件未發
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent",{0}：未發現員工的電子郵件，因此，電子郵件未發
 DocType: Item,Foreign Trade Details,外貿詳細
+,Assessment Plan Status,評估計劃狀態
 DocType: Serial No,Serial No Details,序列號詳細資訊
 DocType: Purchase Invoice Item,Item Tax Rate,項目稅率
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,請選擇醫師和日期
 DocType: Student Group Student,Group Roll Number,組卷編號
 DocType: Student Group Student,Group Roll Number,組卷編號
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0}，只有貸方帳戶可以連接另一個借方分錄
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,所有任務的權重合計應為1。請相應調整的所有項目任務重
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,送貨單{0}未提交
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,所有任務的權重合計應為1。請相應調整的所有項目任務重
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,送貨單{0}未提交
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,項{0}必須是一個小項目簽約
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,資本設備
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",基於“適用於”欄位是「項目」，「項目群組」或「品牌」，而選擇定價規則。
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,請先設定商品代碼
-DocType: Hub Settings,Seller Website,賣家網站
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,請先設定商品代碼
 DocType: Item,ITEM-,項目-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,對於銷售團隊總分配比例應為100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,對於銷售團隊總分配比例應為100
 DocType: Sales Invoice Item,Edit Description,編輯說明
 ,Team Updates,團隊更新
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +885,For Supplier,對供應商
@@ -1385,12 +1413,12 @@
 DocType: Purchase Invoice,Total (Company Currency),總計（公司貨幣）
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,序號{0}多次輸入
 DocType: Depreciation Schedule,Journal Entry,日記帳分錄
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,正在進行{0}項目
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,正在進行{0}項目
 DocType: Workstation,Workstation Name,工作站名稱
 DocType: Grading Scale Interval,Grade Code,等級代碼
 DocType: POS Item Group,POS Item Group,POS項目組
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,電子郵件摘要：
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM {0}不屬於項目{1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0}不屬於項目{1}
 DocType: Sales Partner,Target Distribution,目標分佈
 DocType: Salary Slip,Bank Account No.,銀行賬號
 DocType: Naming Series,This is the number of the last created transaction with this prefix,這就是以這個前綴的最後一個創建的事務數
@@ -1404,10 +1432,9 @@
 DocType: Accounts Settings,Book Asset Depreciation Entry Automatically,自動存入資產折舊條目
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,詢價供應商
 DocType: Healthcare Settings,Registration Message,註冊信息
-DocType: Sales Order,Recurring Upto,經常性高達
 DocType: Prescription Dosage,Prescription Dosage,處方用量
 DocType: Attendance,HR Manager,人力資源經理
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,請選擇一個公司
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,請選擇一個公司
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,特權休假
 DocType: Purchase Invoice,Supplier Invoice Date,供應商發票日期
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,您需要啟用購物車
@@ -1421,10 +1448,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,存在重疊的條件：
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,對日記條目{0}已經調整一些其他的優惠券
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,總訂單價值
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,食物
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,食物
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,老齡範圍3
 DocType: Maintenance Schedule Item,No of Visits,沒有訪問量的
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},針對{1}存在維護計劃{0}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,你想把你的物品發佈到Hub嗎？
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,招生學生
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},在關閉帳戶的貨幣必須是{0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},對所有目標點的總和應該是100。{0}
@@ -1432,9 +1460,10 @@
 ,Delivered Items To Be Billed,交付項目要被收取
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},開放BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,倉庫不能改變序列號
+DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,公用事業
-DocType: Purchase Invoice Item,Accounting,會計
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,請為批量選擇批次
+DocType: POS Profile,Accounting,會計
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,請為批量選擇批次
 DocType: Asset,Depreciation Schedules,折舊計劃
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,申請期間不能請假外分配週期
 DocType: Activity Cost,Projects,專案
@@ -1450,17 +1479,18 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',審批狀態必須被“批准”或“拒絕”
 DocType: Physician,Contacts and Address,聯繫人和地址
 DocType: Purchase Invoice,Contact Person,聯絡人
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',“預計開始日期”不能大於“預計結束日期'
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',“預計開始日期”不能大於“預計結束日期'
 DocType: Course Scheduling Tool,Course End Date,課程結束日期
 DocType: Sales Order Item,Planned Quantity,計劃數量
 DocType: Purchase Invoice Item,Item Tax Amount,項目稅額
 DocType: Item,Maintain Stock,維護庫存資料
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,生產訂單已創建Stock條目
 DocType: Employee,Prefered Email,首選電子郵件
+DocType: Student Admission,Eligibility and Details,資格和細節
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,在固定資產淨變動
 DocType: Leave Control Panel,Leave blank if considered for all designations,離開，如果考慮所有指定空白
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費，不能被包含在項目單價
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},最大數量：{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},最大數量：{0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,從日期時間
 DocType: Email Digest,For Company,對於公司
 apps/erpnext/erpnext/config/support.py +17,Communication log.,通信日誌。
@@ -1470,14 +1500,15 @@
 DocType: Sales Invoice,Shipping Address Name,送貨地址名稱
 DocType: Material Request,Terms and Conditions Content,條款及細則內容
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,不能大於100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,項{0}不是缺貨登記
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,項{0}不是缺貨登記
 DocType: Maintenance Visit,Unscheduled,計劃外
 DocType: Employee,Owned,擁有的
 DocType: Salary Detail,Depends on Leave Without Pay,依賴於無薪休假
 DocType: Pricing Rule,"Higher the number, higher the priority",數字越大，優先級越高
 ,Purchase Invoice Trends,購買發票趨勢
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",行＃{0}：批次{1}只有{2}數量。請選擇具有{3}數量的其他批次，或將該行拆分成多個行，以便從多個批次中傳遞/發布
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",行＃{0}：批次{1}只有{2}數量。請選擇具有{3}數量的其他批次，或將該行拆分成多個行，以便從多個批次中傳遞/發布
 DocType: Appraisal,Goals,目標
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,選擇POS配置文件
 DocType: Warranty Claim,Warranty / AMC Status,保修/ AMC狀態
 ,Accounts Browser,帳戶瀏覽器
 DocType: Payment Entry Reference,Payment Entry Reference,付款輸入參考
@@ -1493,7 +1524,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,員工不能報告自己。
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",如果帳戶被凍結，條目被允許受限制的用戶。
 DocType: Email Digest,Bank Balance,銀行結餘
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},會計分錄為{0}：{1}只能在貨幣做：{2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},會計分錄為{0}：{1}只能在貨幣做：{2}
 DocType: Job Opening,"Job profile, qualifications required etc.",所需的工作概況，學歷等。
 DocType: Journal Entry Account,Account Balance,帳戶餘額
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,稅收規則進行的交易。
@@ -1502,8 +1533,6 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),總稅費和費用（公司貨幣）
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,顯示未關閉的會計年度的盈虧平衡
 DocType: Lab Test Template,Collection Details,收集細節
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0",選擇cp.name，cp.test_code，cp.parent，cp.invoice，ct.physician，ct.consultation_date from tabConsultation ct，`tabLab Prescription` cp其中ct.patient =&#39;{0}&#39;和cp.parent = ct。 name和cp.test_created = 0
 DocType: Shipping Rule,Shipping Account,送貨帳戶
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}帳戶{2}無效
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,製作銷售訂單，以幫助你計劃你的工作和按時交付
@@ -1518,7 +1547,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,包裝單
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,辦公室租金
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,設置短信閘道設置
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,導入失敗！
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,導入失敗！
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,尚未新增地址。
 DocType: Workstation Working Hour,Workstation Working Hour,工作站工作時間
 DocType: Vital Signs,Blood Pressure,血壓
@@ -1539,7 +1568,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1017,Select Possible Supplier,選擇潛在供應商
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,顯示關閉
 DocType: Leave Type,Is Leave Without Pay,是無薪休假
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,資產類別是強制性的固定資產項目
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,資產類別是強制性的固定資產項目
 DocType: Fee Validity,Fee Validity,費用有效期
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,沒有在支付表中找到記錄
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},此{0}衝突{1}在{2} {3}
@@ -1560,8 +1589,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,獵頭
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,建立潛在客戶
 DocType: Maintenance Schedule,Schedules,時間表
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,POS配置文件需要使用銷售點
 DocType: Purchase Invoice Item,Net Amount,淨額
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1}尚未提交，因此無法完成此操作
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1}尚未提交，因此無法完成此操作
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM表詳細編號
 DocType: Landed Cost Voucher,Additional Charges,附加費用
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),額外的優惠金額（公司貨幣）
@@ -1570,7 +1600,7 @@
 ,Support Hour Distribution,支持小時分配
 DocType: Maintenance Visit,Maintenance Visit,維護訪問
 DocType: Student,Leaving Certificate Number,畢業證書號碼
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}",預約已取消，請查看並取消發票{0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}",預約已取消，請查看並取消發票{0}
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,可用的批次數量在倉庫
 DocType: Landed Cost Voucher,Landed Cost Help,到岸成本幫助
 DocType: Purchase Invoice,Select Shipping Address,選擇送貨地址
@@ -1591,8 +1621,8 @@
 DocType: Patient,Tobacco Past Use,煙草過去使用
 DocType: Sales Invoice Item,Brand Name,商標名稱
 DocType: Purchase Receipt,Transporter Details,貨運公司細節
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},用戶{0}已分配給醫師{1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,默認倉庫需要選中的項目
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},用戶{0}已分配給醫師{1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,默認倉庫需要選中的項目
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,可能的供應商
 DocType: Budget,Monthly Distribution,月度分佈
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,收受方列表為空。請創建收受方列表
@@ -1601,8 +1631,8 @@
 DocType: Sales Partner,Sales Partner Target,銷售合作夥伴目標
 DocType: Loan Type,Maximum Loan Amount,最高貸款額度
 DocType: Pricing Rule,Pricing Rule,定價規則
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},學生{0}的重複卷號
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},學生{0}的重複卷號
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},學生{0}的重複卷號
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},學生{0}的重複卷號
 DocType: Budget,Action if Annual Budget Exceeded,如果行動年度預算超標
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,材料要求採購訂單
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},行＃{0}：返回的項目{1}不存在{2} {3}
@@ -1614,7 +1644,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0}必須只出現一次
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},不允許轉院更多{0}不是{1}對採購訂單{2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},{0}的排假成功
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,無項目包裝
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,無項目包裝
 DocType: Shipping Rule Condition,From Value,從價值
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,生產數量是必填的
 DocType: Employee Loan,Repayment Method,還款方式
@@ -1628,6 +1658,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,現貨負債
 DocType: Purchase Invoice,Supplier Warehouse,供應商倉庫
 DocType: Opportunity,Contact Mobile No,聯絡手機號碼
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,選擇公司
 ,Material Requests for which Supplier Quotations are not created,尚未建立供應商報價的材料需求
 DocType: Student Group,Set 0 for no limit,為不限制設為0
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,這一天（S）對你所申請休假的假期。你不需要申請許可。
@@ -1637,21 +1668,21 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,請報價
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,其他報告
 DocType: Dependent Task,Dependent Task,相關任務
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},預設計量單位的轉換因子必須是1在行{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},預設計量單位的轉換因子必須是1在行{0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},請假類型{0}不能長於{1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,嘗試提前X天規劃作業。
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},請公司設定默認應付職工薪酬帳戶{0}
 DocType: SMS Center,Receiver List,收受方列表
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,搜索項目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,搜索項目
 DocType: Patient Appointment,Referring Physician,參考醫師
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,現金淨變動
 DocType: Assessment Plan,Grading Scale,分級量表
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{0}已經進入不止一次在轉換係數表
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,已經完成
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{0}已經進入不止一次在轉換係數表
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,已經完成
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,庫存在手
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},付款申請已經存在{0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,發布項目成本
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},數量必須不超過{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},數量必須不超過{0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,上一財政年度未關閉
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),時間（天）
 DocType: Quotation Item,Quotation Item,產品報價
@@ -1662,7 +1693,7 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,供應商類型高手。
 DocType: Purchase Order Item,Supplier Part Number,供應商零件編號
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,轉化率不能為0或1
-DocType: Sales Invoice,Reference Document,參考文獻
+DocType: Subscription,Reference Document,參考文獻
 DocType: Accounts Settings,Credit Controller,信用控制器
 DocType: Delivery Note,Vehicle Dispatch Date,車輛調度日期
 DocType: Healthcare Settings,Default Medical Code Standard,默認醫療代碼標準
@@ -1670,6 +1701,7 @@
 DocType: Company,Default Payable Account,預設應付賬款
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",設定線上購物車，如航運規則，價格表等
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}％已開立帳單
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,按價格排序...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,保留數量
 DocType: Party Account,Party Account,黨的帳戶
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,人力資源
@@ -1686,6 +1718,7 @@
 DocType: Customer,Default Price List,預設價格表
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,資產運動記錄{0}創建
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,您不能刪除會計年度{0}。會計年度{0}設置為默認的全局設置
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,一個同名的客戶已經存在
 DocType: Journal Entry,Entry Type,條目類型
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,沒有評估計劃與此評估組相關聯
 ,Customer Credit Balance,客戶信用平衡
@@ -1696,7 +1729,7 @@
 DocType: Quotation,Term Details,長期詳情
 DocType: Project,Total Sales Cost (via Sales Order),總銷售成本（通過銷售訂單）
 DocType: Project,Total Sales Cost (via Sales Order),總銷售成本（通過銷售訂單）
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,不能註冊超過{0}學生該學生群體更多。
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,不能註冊超過{0}學生該學生群體更多。
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,鉛計數
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,鉛計數
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0}必須大於0
@@ -1714,6 +1747,7 @@
 DocType: Lab Test,Technician Name,技術員姓名
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,取消鏈接在發票上的取消付款
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},進入當前的里程表讀數應該比最初的車輛里程表更大的{0}
+DocType: Restaurant Reservation,No Show,沒有出現
 DocType: Shipping Rule Country,Shipping Rule Country,航運規則國家
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,離開和考勤
 DocType: Leave Type,Include holidays within leaves as leaves,休假中包含節日做休假
@@ -1731,12 +1765,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),支付的金額（公司貨幣）
 DocType: Purchase Invoice,Additional Discount,更多優惠
 DocType: Selling Settings,Selling Settings,銷售設置
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,確認操作
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,網上拍賣
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,請註明無論是數量或估價率或兩者
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,履行
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,查看你的購物車
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,市場推廣開支
 ,Item Shortage Report,商品短缺報告
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，請同時註明“重量計量單位”
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，請同時註明“重量計量單位”
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,做此存貨分錄所需之物料需求
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,接下來折舊日期是強制性的新資產
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,為每個批次分離基於課程的組
@@ -1749,12 +1785,12 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,為每股份轉移做會計分錄
 DocType: Leave Allocation,Total Leaves Allocated,已安排的休假總計
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},在第{0}行需要倉庫
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,請輸入有效的財政年度開始和結束日期
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,請輸入有效的財政年度開始和結束日期
 DocType: Employee,Date Of Retirement,退休日
 DocType: Upload Attendance,Get Template,獲取模板
 DocType: Material Request,Transferred,轉入
 DocType: Vehicle,Doors,門
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext設定完成！
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext設定完成！
 DocType: Healthcare Settings,Collect Fee for Patient Registration,收取病人登記費
 DocType: Course Assessment Criteria,Weightage,權重
 DocType: Purchase Invoice,Tax Breakup,稅收分解
@@ -1771,38 +1807,39 @@
 DocType: Fee Schedule Student Group,Fee Schedule Student Group,費用計劃學生組
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",如果此項目已變種，那麼它不能在銷售訂單等選擇
 DocType: Lead,Next Contact By,下一個聯絡人由
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},列{1}項目{0}必須有數量
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},列{1}項目{0}必須有數量
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},倉庫{0} 不能被刪除因為項目{1}還有庫存
 DocType: Quotation,Order Type,訂單類型
-DocType: Purchase Invoice,Notification Email Address,通知電子郵件地址
 ,Item-wise Sales Register,項目明智的銷售登記
 DocType: Asset,Gross Purchase Amount,總購買金額
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,期初餘額
 DocType: Asset,Depreciation Method,折舊方法
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,離線
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,離線
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,包括在基本速率此稅？
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,總目標
 DocType: Job Applicant,Applicant for a Job,申請人作業
 DocType: Production Plan Material Request,Production Plan Material Request,生產計劃申請材料
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,沒有創建生產訂單
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,沒有創建生產訂單
 DocType: Stock Reconciliation,Reconciliation JSON,JSON對賬
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,過多的列數。請導出報表，並使用試算表程式進行列印。
 DocType: Purchase Invoice Item,Batch No,批號
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},要求報價：{0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,允許多個銷售訂單對客戶的採購訂單
 DocType: Student Group Instructor,Student Group Instructor,學生組教練
 DocType: Student Group Instructor,Student Group Instructor,學生組教練
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2手機號碼
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,主頁
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,主頁
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,變種
 DocType: Naming Series,Set prefix for numbering series on your transactions,為你的交易編號序列設置的前綴
 DocType: Employee Attendance Tool,Employees HTML,員工HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,預設BOM（{0}）必須是活動的這個項目或者其模板
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,預設BOM（{0}）必須是活動的這個項目或者其模板
 DocType: Employee,Leave Encashed?,離開兌現？
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,機會從字段是強制性的
 DocType: Item,Variants,變種
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,製作採購訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,製作採購訂單
 DocType: SMS Center,Send To,發送到
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},沒有足夠的餘額休假請假類型{0}
+DocType: Payment Reconciliation Payment,Allocated amount,分配量
 DocType: Sales Team,Contribution to Net Total,貢獻淨合計
 DocType: Sales Invoice Item,Customer's Item Code,客戶的產品編號
 DocType: Stock Reconciliation,Stock Reconciliation,庫存調整
@@ -1817,6 +1854,7 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,學生群體力量
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,對日記條目{0}沒有任何無與倫比{1}進入
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,估價
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,培訓活動
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},重複的序列號輸入的項目{0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,為運輸規則的條件
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,請輸入
@@ -1826,7 +1864,7 @@
 DocType: Sales Order,To Deliver and Bill,準備交貨及開立發票
 DocType: Student Group,Instructors,教師
 DocType: GL Entry,Credit Amount in Account Currency,在賬戶幣金額
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM {0}必須提交
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0}必須提交
 DocType: Authorization Control,Authorization Control,授權控制
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：拒絕倉庫是強制性的反對否決項{1}
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.",倉庫{0}未與任何帳戶關聯，請在倉庫記錄中提及該帳戶，或在公司{1}中設置默認庫存帳戶。
@@ -1844,11 +1882,11 @@
 DocType: Quotation Item,Actual Qty,實際數量
 DocType: Sales Invoice Item,References,參考
 DocType: Quality Inspection Reading,Reading 10,閱讀10
-DocType: Hub Settings,Hub Node,樞紐節點
+DocType: Hub Category,Hub Node,樞紐節點
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,您輸入重複的項目。請糾正，然後再試一次。
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,關聯
 DocType: Asset Movement,Asset Movement,資產運動
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,新的車
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,新的車
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,項{0}不是一個序列化的項目
 DocType: SMS Center,Create Receiver List,創建接收器列表
 DocType: Vehicle,Wheels,車輪
@@ -1860,15 +1898,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,電信
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),表示該包是這個交付的一部分（僅草案）
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,製作付款分錄
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},項目{0}的數量必須小於{1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},項目{0}的數量必須小於{1}
 ,Sales Invoice Trends,銷售發票趨勢
 DocType: Leave Application,Apply / Approve Leaves,申請/審批葉
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,對於
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,對於
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',可以參考的行只有在充電類型是“在上一行量'或'前行總計”
 DocType: Sales Order Item,Delivery Warehouse,交貨倉庫
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,財務成本中心的樹。
 DocType: Serial No,Delivery Document No,交貨證明文件號碼
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},請公司制定“關於資產處置收益/損失帳戶”{0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},請公司制定“關於資產處置收益/損失帳戶”{0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,從採購入庫單取得項目
 DocType: Serial No,Creation Date,創建日期
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},項{0}中多次出現價格表{1}
@@ -1879,12 +1917,13 @@
 DocType: Student,Student Mobile Number,學生手機號碼
 DocType: Item,Has Variants,有變種
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,更新響應
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},您已經選擇從項目{0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},您已經選擇從項目{0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,每月分配的名稱
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,批號是必需的
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,批號是必需的
 DocType: Sales Person,Parent Sales Person,母公司銷售人員
-DocType: Purchase Invoice,Recurring Invoice,經常性發票
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,從高到低
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,首先選擇程序
 DocType: Patient Appointment,Patient Age,患者年齡
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,項目管理
 DocType: Supplier,Supplier of Goods or Services.,供應商的商品或服務。
@@ -1892,8 +1931,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,如果沒有在患者中設置隱性應收帳款，請諮詢費用。
 DocType: Vehicle Log,Fuel Price,燃油價格
 DocType: Budget,Budget,預算
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,設置打開
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,固定資產項目必須是一個非庫存項目。
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,設置打開
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,固定資產項目必須是一個非庫存項目。
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",財政預算案不能對{0}指定的，因為它不是一個收入或支出帳戶
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,已實現
 DocType: Student Admission,Application Form Route,申請表路線
@@ -1906,12 +1945,13 @@
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,項目群組的樹狀結構
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,項目{0}的序列號未設定，請檢查項目主檔
 DocType: Maintenance Visit,Maintenance Time,維護時間
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},相同的物品已被多次輸入。 {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,這個詞開始日期不能超過哪個術語鏈接學年的開學日期較早（學年{}）。請更正日期，然後再試一次。
 DocType: Guardian,Guardian Interests,守護興趣
 DocType: Naming Series,Current Value,當前值
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,多個會計年度的日期{0}存在。請設置公司財年
 DocType: School Settings,Instructor Records to be created by,導師記錄由
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0}已新增
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0}已新增
 DocType: Delivery Note Item,Against Sales Order,對銷售訂單
 ,Serial No Status,序列號狀態
 DocType: Payment Entry Reference,Outstanding,優秀
@@ -1921,10 +1961,10 @@
 之間差必須大於或等於{2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,這是基於庫存移動。見{0}詳情
 DocType: Pricing Rule,Selling,銷售
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},金額{0} {1}抵扣{2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},金額{0} {1}抵扣{2}
 DocType: Employee,Salary Information,薪資資訊
 DocType: Sales Person,Name and Employee ID,姓名和僱員ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,到期日不能在寄發日期之前
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,到期日不能在寄發日期之前
 DocType: Website Item Group,Website Item Group,網站項目群組
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,關稅和稅款
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,參考日期請輸入
@@ -1947,7 +1987,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,投資
 DocType: Issue,Resolution Details,詳細解析
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,驗收標準
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,請輸入在上表請求材料
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,請輸入在上表請求材料
 DocType: Item Attribute,Attribute Name,屬性名稱
 DocType: BOM,Show In Website,顯示在網站
 DocType: Shopping Cart Settings,Show Quantity in Website,顯示在網站數量
@@ -1956,7 +1996,7 @@
 DocType: Item Reorder,Check in (group),檢查（組）
 ,Qty to Order,訂購數量
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked",負債或權益下的帳戶頭，其中利潤/虧損將被黃牌警告
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,所有任務的甘特圖。
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,所有任務的甘特圖。
 DocType: Opportunity,Mins to First Response,分鐘為第一個反應
 DocType: Pricing Rule,Margin Type,保證金類型
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0}小時
@@ -1974,36 +2014,36 @@
 DocType: Patient,Surgical History,手術史
 DocType: Employee,Resignation Letter Date,辭退信日期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,定價規則進一步過濾基於數量。
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},請為員工{0}設置加入日期
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},請為員工{0}設置加入日期
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},請為員工{0}設置加入日期
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},請為員工{0}設置加入日期
 DocType: Task,Total Billing Amount (via Time Sheet),總開票金額（通過時間表）
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,重複客戶收入
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) 必須有“支出審批”權限
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,對
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,選擇BOM和數量生產
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,選擇BOM和數量生產
 DocType: Asset,Depreciation Schedule,折舊計劃
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,銷售合作夥伴地址和聯繫人
 DocType: Bank Reconciliation Detail,Against Account,針對帳戶
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,半天時間應該是從之間的日期和終止日期
 DocType: Maintenance Schedule Detail,Actual Date,實際日期
 DocType: Item,Has Batch No,有批號
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},年度結算：{0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},年度結算：{0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),商品和服務稅（印度消費稅）
 DocType: Delivery Note,Excise Page Number,消費頁碼
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory",公司，從日期和結束日期是必須
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,從諮詢中獲取
 DocType: Asset,Purchase Date,購買日期
 DocType: Employee,Personal Details,個人資料
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},請設置在公司的資產折舊成本中心“{0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},請設置在公司的資產折舊成本中心“{0}
 ,Maintenance Schedules,保養時間表
 DocType: Task,Actual End Date (via Time Sheet),實際結束日期（通過時間表）
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},量{0} {1}對{2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},量{0} {1}對{2} {3}
 ,Quotation Trends,報價趨勢
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},項目{0}之項目主檔未提及之項目群組
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,借方帳戶必須是應收帳款帳戶
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,借方帳戶必須是應收帳款帳戶
 DocType: Shipping Rule Condition,Shipping Amount,航運量
 DocType: Supplier Scorecard Period,Period Score,期間得分
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,添加客戶
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,添加客戶
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,待審核金額
 DocType: Lab Test Template,Special,特別
 DocType: Purchase Invoice Item,Conversion Factor,轉換因子
@@ -2011,12 +2051,13 @@
 ,Vehicle Expenses,車輛費用
 DocType: Serial No,Invoice Details,發票明細
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},使用壽命後預期值必須大於或等於{0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,開始
+DocType: Hub Category,Hub Category,中心類別
 DocType: Purchase Receipt,Vehicle Number,車號
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,在其經常性發票將被停止日期
 DocType: Employee Loan,Loan Amount,貸款額度
 DocType: Program Enrollment,Self-Driving Vehicle,自駕車
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,供應商記分卡站立
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},行{0}：材料清單未找到項目{1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},行{0}：材料清單未找到項目{1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,共分配葉{0}不能小於已經批准葉{1}期間
 DocType: Journal Entry,Accounts Receivable,應收帳款
 ,Supplier-Wise Sales Analytics,供應商相關的銷售分析
@@ -2028,7 +2069,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)",家長課程（如果不是家長課程的一部分，請留空）
 DocType: Leave Control Panel,Leave blank if considered for all employee types,保持空白如果考慮到所有的員工類型
 DocType: Landed Cost Voucher,Distribute Charges Based On,分銷費基於
-apps/erpnext/erpnext/hooks.py +131,Timesheets,時間表
+apps/erpnext/erpnext/hooks.py +140,Timesheets,時間表
 DocType: HR Settings,HR Settings,人力資源設置
 DocType: Salary Slip,net pay info,淨工資信息
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,該值在默認銷售價格表中更新。
@@ -2039,7 +2080,7 @@
 DocType: Patient,B Positive,B積極
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行＃{0}：訂購數量必須是1，因為項目是固定資產。請使用單獨的行多數量。
 DocType: Leave Block List Allow,Leave Block List Allow,休假區塊清單准許
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,縮寫不能為空或空間
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,縮寫不能為空或空間
 DocType: Patient Medical Record,Patient Medical Record,病人醫療記錄
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,集團以非組
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,體育
@@ -2056,7 +2097,8 @@
 apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,無法為關鍵日期{2}查找{0}到{1}的匯率。請手動創建貨幣兌換記錄
 DocType: POS Profile,Price List,價格表
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0}是現在預設的會計年度。請重新載入您的瀏覽器，以使更改生效。
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,報銷
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,報銷
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",基於倉庫中的庫存，在Hub上發布“庫存”或“庫存”。
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),截止（開標+總計）
 DocType: Vehicle,Fuel Type,燃料類型
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,請公司指定的貨幣
@@ -2066,15 +2108,15 @@
 DocType: Email Digest,Pending Sales Orders,待完成銷售訂單
 apps/erpnext/erpnext/controllers/accounts_controller.py +279,Account {0} is invalid. Account Currency must be {1},帳戶{0}是無效的。帳戶貨幣必須是{1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},計量單位換算係數是必需的行{0}
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行＃{0}：參考文件類型必須是銷售訂單之一，銷售發票或日記帳分錄
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行＃{0}：參考文件類型必須是銷售訂單之一，銷售發票或日記帳分錄
 DocType: Salary Component,Deduction,扣除
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,行{0}：從時間和時間是強制性的。
 DocType: Stock Reconciliation Item,Amount Difference,金額差異
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},加入項目價格為{0}價格表{1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},加入項目價格為{0}價格表{1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,請輸入這個銷售人員的員工標識
 DocType: Territory,Classification of Customers by region,客戶按區域分類
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,差量必須是零
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,請先輸入生產項目
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,請先輸入生產項目
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,計算的銀行對賬單餘額
 DocType: Normal Test Template,Normal Test Template,正常測試模板
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,禁用的用戶
@@ -2087,13 +2129,15 @@
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**財年**表示財政年度。所有的會計輸入項目和其他重大交易針對**財年**進行追蹤。
 DocType: Opportunity,Customer / Lead Address,客戶/鉛地址
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,供應商記分卡設置
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},警告：附件無效的SSL證書{0}
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,評估計劃名稱
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},警告：附件無效的SSL證書{0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads",信息幫助你的業務，你所有的聯繫人和更添加為您的線索
 DocType: Production Order Operation,Actual Operation Time,實際操作時間
 DocType: Authorization Rule,Applicable To (User),適用於（用戶）
 DocType: Purchase Taxes and Charges,Deduct,扣除
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,職位描述
 DocType: Student Applicant,Applied,應用的
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,重新打開
 DocType: Sales Invoice Item,Qty as per Stock UOM,數量按庫存計量單位
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2名稱
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",特殊字符除了“ - ”，“”，“＃”，和“/”未命名序列允許
@@ -2104,7 +2148,7 @@
 DocType: Request for Quotation,Manufacturing Manager,生產經理
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},序列號{0}在保修期內直到{1}
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,拆分送貨單成數個包裝。
-apps/erpnext/erpnext/hooks.py +98,Shipments,發貨
+apps/erpnext/erpnext/hooks.py +107,Shipments,發貨
 DocType: Payment Entry,Total Allocated Amount (Company Currency),總撥款額（公司幣種）
 DocType: Purchase Order Item,To be delivered to customer,要傳送給客戶
 DocType: BOM,Scrap Material Cost,廢料成本
@@ -2124,8 +2168,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,項目變式設置
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,選擇公司...
 DocType: Leave Control Panel,Leave blank if considered for all departments,保持空白如果考慮到全部部門
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",就業（永久，合同，實習生等）的類型。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0}是強制性的項目{1}
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).",就業（永久，合同，實習生等）的類型。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0}是強制性的項目{1}
 DocType: Currency Exchange,From Currency,從貨幣
 DocType: Vital Signs,Weight (In Kilogram),體重（公斤）
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",請ATLEAST一行選擇分配金額，發票類型和發票號碼
@@ -2148,7 +2192,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,請在“產生排程”點擊以得到排程表
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,有錯誤，同時刪除以下時間表：
 DocType: Bin,Ordered Quantity,訂購數量
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",例如「建設建設者工具“
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",例如「建設建設者工具“
 DocType: Grading Scale,Grading Scale Intervals,分級刻度間隔
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}在{2}會計分錄只能在貨幣言：{3}
 DocType: Production Order,In Process,在過程
@@ -2170,10 +2214,9 @@
 DocType: Purchase Invoice,With Payment of Tax,繳納稅款
 DocType: Expense Claim Detail,Expense Claim Detail,報銷詳情
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,供應商提供服務
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,請選擇正確的帳戶
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,請選擇正確的帳戶
 DocType: Item,Weight UOM,重量計量單位
 DocType: Salary Structure Employee,Salary Structure Employee,薪資結構員工
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,擱置
 DocType: Course,Course Name,課程名
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,用戶可以批准特定員工的休假申請
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,辦公設備
@@ -2192,7 +2235,7 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,價格將不會顯示如果沒有設置價格
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,請指定一個國家的這種運輸規則或檢查全世界運輸
 DocType: Stock Entry,Total Incoming Value,總收入值
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,借方是必填項
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,借方是必填項
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",時間表幫助追踪的時間，費用和結算由你的團隊做activites
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,採購價格表
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,供應商記分卡變數模板。
@@ -2202,7 +2245,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,付款對帳
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,請選擇Incharge人的名字
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,技術
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},總未付：{0}
+DocType: Hub Settings,Unregister from Hub,從Hub註銷
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},總未付：{0}
 DocType: BOM Website Operation,BOM Website Operation,BOM網站運營
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,報價函
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,產生物料需求（MRP）和生產訂單。
@@ -2213,7 +2257,9 @@
 DocType: Physician Schedule Time Slot,To Time,要時間
 DocType: Authorization Rule,Approving Role (above authorized value),批准角色（上述授權值）
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,信用帳戶必須是應付賬款
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM遞歸： {0}不能父母或兒童{2}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,請選擇付費學生申請者必須入學的學生
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM遞歸： {0}不能父母或兒童{2}
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,請選擇一個價目表來發布價格
 DocType: Production Order Operation,Completed Qty,完成數量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",{0}，只有借方帳戶可以連接另一個貸方分錄
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,價格表{0}被禁用
@@ -2226,46 +2272,48 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0}產品{1}需要的序號。您已提供{2}。
 DocType: Stock Reconciliation Item,Current Valuation Rate,目前的估值價格
 DocType: Item,Customer Item Codes,客戶項目代碼
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,再次重複出現。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,兌換收益/損失
 DocType: Opportunity,Lost Reason,失落的原因
 DocType: Quality Inspection,Sample Size,樣本大小
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,請輸入收據憑證
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,所有項目已開具發票
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',請指定一個有效的“從案號”
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',請指定一個有效的“從案號”
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,進一步的成本中心可以根據組進行，但項可以對非組進行
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,用戶和權限
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},生產訂單創建：{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},生產訂單創建：{0}
 DocType: Branch,Branch,分支機構
 DocType: Company,Total Monthly Sales,每月銷售總額
 DocType: Bin,Actual Quantity,實際數量
 DocType: Shipping Rule,example: Next Day Shipping,例如：次日發貨
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,序列號{0}未找到
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},訂閱已經{0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},訂閱已經{0}
 DocType: Fee Schedule Program,Fee Schedule Program,費用計劃計劃
 DocType: Fee Schedule Program,Student Batch,學生批
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,使學生
 DocType: Supplier Scorecard Scoring Standing,Min Grade,最小成績
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},您已被邀請在項目上進行合作：{0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},醫師不適用於{0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},您已被邀請在項目上進行合作：{0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},醫師不適用於{0}
 DocType: Leave Block List Date,Block Date,封鎖日期
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},在doctype {0}中添加自定義字段Subscription Id
 DocType: Purchase Receipt,Supplier Delivery Note,供應商交貨單
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,現在申請
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,現在申請
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},實際數量{0} /等待數量{1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},實際數量{0} /等待數量{1}
 DocType: Purchase Invoice,E-commerce GSTIN,電子商務GSTIN
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,預計日期不能在交易日期之前
 ,Bank Clearance Summary,銀行結算摘要
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",建立和管理每日，每週和每月的電子郵件摘要。
 DocType: Appraisal Goal,Appraisal Goal,考核目標
 DocType: Stock Reconciliation Item,Current Amount,電流量
 DocType: Fee Schedule,Fee Structure,費用結構
 DocType: Timesheet Detail,Costing Amount,成本核算金額
-DocType: Student Admission,Application Fee,報名費
+DocType: Student Admission Program,Application Fee,報名費
 DocType: Process Payroll,Submit Salary Slip,提交工資單
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,品項{0}的最大折扣：{1}％
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,品項{0}的最大折扣：{1}％
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,進口散裝
 DocType: Sales Partner,Address & Contacts,地址及聯絡方式
 DocType: SMS Log,Sender Name,發件人名稱
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,按標準排序
 DocType: POS Profile,[Select],[選擇]
 DocType: Vital Signs,Blood Pressure (diastolic),血壓（舒張）
 DocType: SMS Log,Sent To,發給
@@ -2274,7 +2322,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,接下來跟日期不能過去
 DocType: Company,For Reference Only.,僅供參考。
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},{1}醫生{0}不可用
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,選擇批號
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,選擇批號
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},無效的{0}：{1}
 DocType: Fee Validity,Reference Inv,參考文獻
 DocType: Sales Invoice Advance,Advance Amount,提前量
@@ -2288,27 +2336,27 @@
 DocType: Normal Test Items,Require Result Value,需要結果值
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,案號不能為0
 DocType: Item,Show a slideshow at the top of the page,顯示幻燈片在頁面頂部
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,物料清單
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,商店
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,物料清單
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,商店
 DocType: Project Type,Projects Manager,項目經理
 DocType: Serial No,Delivery Time,交貨時間
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,老齡化基於
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,預約被取消
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,預約被取消
 DocType: Item,End of Life,壽命結束
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,旅遊
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,發現員工{0}對於給定的日期沒有活動或默認的薪酬結構
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,旅遊
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,發現員工{0}對於給定的日期沒有活動或默認的薪酬結構
 DocType: Leave Block List,Allow Users,允許用戶
 DocType: Purchase Order,Customer Mobile No,客戶手機號碼
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,經常性
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,跟踪獨立收入和支出進行產品垂直或部門。
 DocType: Item Reorder,Item Reorder,項目重新排序
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,顯示工資單
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,轉印材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,轉印材料
 DocType: Fees,Send Payment Request,發送付款請求
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",指定作業、作業成本並給予該作業一個專屬的作業編號。
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,這份文件是超過限制，通過{0} {1}項{4}。你在做另一個{3}對同一{2}？
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,請設置保存後復發
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,選擇變化量賬戶
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,選擇變化量賬戶
 DocType: Purchase Invoice,Price List Currency,價格表之貨幣
 DocType: Naming Series,User must always select,用戶必須始終選擇
 DocType: Stock Settings,Allow Negative Stock,允許負庫存
@@ -2327,7 +2375,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,僱員
 DocType: Sample Collection,Collected Time,收集時間
 DocType: Company,Sales Monthly History,銷售月曆
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,選擇批次
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,選擇批次
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1}}已開票
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,生命體徵
 DocType: Training Event,End Time,結束時間
@@ -2335,14 +2383,16 @@
 DocType: Payment Entry,Payment Deductions or Loss,付款扣除或損失
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,銷售或採購的標準合同條款。
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,集團透過券
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,你確定要取消這個預約嗎？
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,銷售渠道
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},請薪酬部分設置默認帳戶{0}
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},請行選擇BOM為項目{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},請行選擇BOM為項目{0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},帳戶{0}與帳戶模式{2}中的公司{1}不符
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},指定BOM {0}的項目不存在{1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,維護時間表{0}必須取消早於取消這個銷售訂單
+DocType: POS Profile,Applicable for Users,適用於用戶
 DocType: Notification Control,Expense Claim Approved,報銷批准
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,員工的工資單{0}已為這一時期創建
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,員工的工資單{0}已為這一時期創建
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,製藥
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,購買的物品成本
 DocType: Selling Settings,Sales Order Required,銷售訂單需求
@@ -2364,6 +2414,7 @@
 DocType: Offer Letter,Accepted,接受的
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,組織
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,組織
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company",未指定派對帳戶，請在公司設置默認派對帳戶
 DocType: SG Creation Tool Course,Student Group Name,學生組名稱
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,創造費用
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,請確保你真的要刪除這家公司的所有交易。主數據將保持原樣。這個動作不能撤消。
@@ -2373,27 +2424,28 @@
 ({2})生產訂單的 {3}"
 DocType: Shipping Rule,Shipping Rule Label,送貨規則標籤
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,用戶論壇
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,原材料不能為空。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.",無法更新庫存，發票包含下降航運項目。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,原材料不能為空。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.",無法更新庫存，發票包含下降航運項目。
 DocType: Lab Test Sample,Lab Test Sample,實驗室測試樣品
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,快速日記帳分錄
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,你不能改變速度，如果BOM中提到反對的任何項目
+DocType: Restaurant,Invoice Series Prefix,發票系列前綴
 DocType: Employee,Previous Work Experience,以前的工作經驗
 DocType: Stock Entry,For Quantity,對於數量
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},請輸入列{1}的品項{0}的計劃數量
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},請輸入列{1}的品項{0}的計劃數量
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,需求的項目。
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,將對每個成品項目建立獨立的生產訂單。
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0}必須返回文檔中負
 ,Minutes to First Response for Issues,分鐘的問題第一個反應
 DocType: Purchase Invoice,Terms and Conditions1,條款及條件1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,該機構的名稱要為其建立這個系統。
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,該機構的名稱要為其建立這個系統。
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",會計分錄凍結至該日期，除以下指定職位權限外，他人無法修改。
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,請在產生維護計畫前儲存文件
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,最新價格在所有BOM中更新
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,項目狀態
 DocType: UOM,Check this to disallow fractions. (for Nos),勾選此選項則禁止分數。 （對於NOS）
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,創建以下生產訂單：
-DocType: Student Admission,Naming Series (for Student Applicant),命名系列（面向學生申請人）
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,創建以下生產訂單：
+DocType: Student Admission Program,Naming Series (for Student Applicant),命名系列（面向學生申請人）
 DocType: Delivery Note,Transporter Name,貨運公司名稱
 DocType: Authorization Rule,Authorized Value,授權值
 DocType: BOM,Show Operations,顯示操作
@@ -2415,7 +2467,7 @@
 DocType: Student,Joining Date,入職日期
 ,Employees working on a holiday,員工在假期工作
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,馬克現在
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,藥物
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,藥物
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},序號{0}的維護開始日期不能早於交貨日期
 DocType: Production Order,Actual End Date,實際結束日期
 DocType: BOM,Operating Cost (Company Currency),營業成本（公司貨幣）
@@ -2430,18 +2482,19 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,批准用戶作為用戶的規則適用於不能相同
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),基本速率（按庫存計量單位）
 DocType: SMS Log,No of Requested SMS,無的請求短信
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,停薪留職不批准請假的記錄相匹配
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,停薪留職不批准請假的記錄相匹配
 DocType: Campaign,Campaign-.####,運動 - ＃＃ ＃ ＃
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,請在提供最好的利率規定的項目
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,製作發票
 DocType: Selling Settings,Auto close Opportunity after 15 days,15天之後自動關閉商機
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,由於{1}的記分卡，{0}不允許採購訂單。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,由於{1}的記分卡，{0}不允許採購訂單。
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,結束年份
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,報價/鉛％
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,報價/鉛％
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,合同結束日期必須大於加入的日期
 DocType: Vital Signs,Nutrition Values,營養價值觀
 DocType: Lab Test Template,Is billable,是可計費的
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",“醫師時間表”和“每次預約時間”都必須為{0}醫生設置
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,第三方分銷商/經銷商/代理商/分支機構/分銷商誰銷售公司產品的佣金。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0}針對採購訂單{1}
 DocType: Patient,Patient Demographics,患者人口統計學
@@ -2502,7 +2555,7 @@
 DocType: Asset,Manual,手冊
 DocType: Salary Component Account,Salary Component Account,薪金部分賬戶
 DocType: Global Defaults,Hide Currency Symbol,隱藏貨幣符號
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card",例如：銀行，現金，信用卡
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card",例如：銀行，現金，信用卡
 DocType: Lead Source,Source Name,源名稱
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""",成年人的正常靜息血壓約為收縮期120mmHg，舒張壓80mmHg，縮寫為“120 / 80mmHg”
 DocType: Journal Entry,Credit Note,信用票據
@@ -2520,13 +2573,13 @@
 DocType: Patient,Occupation,佔用
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,列#{0}：開始日期必須早於結束日期
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),總計（數量）
-DocType: Sales Invoice,This Document,本文檔
 DocType: Installation Note Item,Installed Qty,安裝數量
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,訓練結果
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,這可能是因為一些無效的電子郵件地址
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,訓練結果
 DocType: Salary Structure,Total Earning,總盈利
 DocType: Purchase Receipt,Time at which materials were received,物料收到的時間
 DocType: Stock Ledger Entry,Outgoing Rate,傳出率
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,組織分支主檔。
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,組織分支主檔。
 DocType: Sales Order,Billing Status,計費狀態
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,報告問題
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Education (beta),教育（測試版）
@@ -2539,8 +2592,9 @@
 DocType: Notification Control,Sales Order Message,銷售訂單訊息
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",設定預設值如公司，貨幣，當前財政年度等
 DocType: Payment Entry,Payment Type,付款類型
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,請選擇項目{0}的批次。無法找到滿足此要求的單個批次
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,請選擇項目{0}的批次。無法找到滿足此要求的單個批次
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,請選擇項目{0}的批次。無法找到滿足此要求的單個批次
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,請選擇項目{0}的批次。無法找到滿足此要求的單個批次
+DocType: Hub Category,Parent Category,父類別
 DocType: Process Payroll,Select Employees,選擇僱員
 DocType: Opportunity,Potential Sales Deal,潛在的銷售交易
 DocType: Complaint,Complaints,投訴
@@ -2576,7 +2630,7 @@
 DocType: Bin,Reserved Quantity,保留數量
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,請輸入有效的電子郵件地址
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,請輸入有效的電子郵件地址
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,請在購物車中選擇一個項目
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,請在購物車中選擇一個項目
 DocType: Landed Cost Voucher,Purchase Receipt Items,採購入庫項目
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,自定義表單
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,期間折舊額
@@ -2585,15 +2639,15 @@
 DocType: Payment Request,Amount in customer's currency,量客戶的貨幣
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,交貨
 DocType: Stock Reconciliation Item,Current Qty,目前數量
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,添加供應商
+DocType: Restaurant Menu,Restaurant Menu,餐廳菜單
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,上一頁
 DocType: Appraisal Goal,Key Responsibility Area,關鍵責任區
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",學生批幫助您跟踪學生的出勤，評估和費用
 DocType: Payment Entry,Total Allocated Amount,總撥款額
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,設置永久庫存的默認庫存帳戶
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,設置永久庫存的默認庫存帳戶
 DocType: Item Reorder,Material Request Type,材料需求類型
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural日記條目從{0}薪金{1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save",localStorage的是滿的，沒救
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save",localStorage的是滿的，沒救
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,行{0}：計量單位轉換係數是必需的
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,房間容量
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,參考
@@ -2628,15 +2682,16 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,沒存貨
 DocType: Appraisal,HR User,HR用戶
 DocType: Purchase Invoice,Taxes and Charges Deducted,稅收和費用扣除
-apps/erpnext/erpnext/hooks.py +129,Issues,問題
+apps/erpnext/erpnext/hooks.py +138,Issues,問題
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},狀態必須是一個{0}
 DocType: Sales Invoice,Debit To,借方
+DocType: Restaurant Menu Item,Restaurant Menu Item,餐廳菜單項
 DocType: Delivery Note,Required only for sample item.,只對樣品項目所需。
 DocType: Stock Ledger Entry,Actual Qty After Transaction,交易後實際數量
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},沒有找到之間的工資單{0}和{1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},沒有找到之間的工資單{0}和{1}
 ,Pending SO Items For Purchase Request,待處理的SO項目對於採購申請
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,學生入學
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1}被禁用
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,學生入學
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1}被禁用
 DocType: Supplier,Billing Currency,結算貨幣
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,特大號
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,葉總
@@ -2656,6 +2711,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,請註明無需訪問
 DocType: Stock Settings,Default Valuation Method,預設的估值方法
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,費用
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,正在更新。它可能需要一段時間。
 DocType: Vehicle Log,Fuel Qty,燃油數量
 DocType: Production Order Operation,Planned Start Time,計劃開始時間
 DocType: Course,Assessment,評定
@@ -2671,7 +2727,7 @@
 DocType: Price List,Price List Master,價格表主檔
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,所有的銷售交易，可以用來標記針對多個**銷售**的人，這樣你可以設置和監控目標。
 ,S.O. No.,SO號
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},請牽頭建立客戶{0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},請牽頭建立客戶{0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,選擇患者
 DocType: Price List,Applicable for Countries,適用於國家
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,參數名稱
@@ -2714,24 +2770,26 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,費用/差異帳戶（{0}）必須是一個'溢利或虧損的帳戶
 DocType: Project,Copied From,複製自
 DocType: Project,Copied From,複製自
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},名稱錯誤：{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},名稱錯誤：{0}
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1}不關聯{2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,員工{0}的考勤已標記
 DocType: Packing Slip,If more than one package of the same type (for print),如果不止一個相同類型的包裹（用於列印）
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,請在“餐廳設置”中設置默認客戶
 ,Salary Register,薪酬註冊
 DocType: Warehouse,Parent Warehouse,家長倉庫
 DocType: C-Form Invoice Detail,Net Total,總淨值
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},項目{0}和項目{1}找不到默認BOM
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},項目{0}和項目{1}找不到默認BOM
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,定義不同的貸款類型
 DocType: Payment Reconciliation Invoice,Outstanding Amount,未償還的金額
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),時間（分鐘）
 DocType: Project Task,Working,工作的
 DocType: Stock Ledger Entry,Stock Queue (FIFO),庫存序列（先進先出）
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,財政年度
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,財政年度
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0}不屬於公司{1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,無法解決{0}的標準分數函數。確保公式有效。
 DocType: Healthcare Settings,Out Patient Settings,出患者設置
 DocType: Account,Round Off,四捨五入
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,數量必須是正數
 ,Requested Qty,要求數量
 DocType: Tax Rule,Use for Shopping Cart,使用的購物車
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},值{0}的屬性{1}不在有效的項目列表中存在的屬性值項{2}
@@ -2739,7 +2797,6 @@
 DocType: BOM Item,Scrap %,廢鋼％
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",費用將被分配比例根據項目數量或金額，按您的選擇
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,ATLEAST一個項目應該負數量回報文檔中輸入
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,添加課程
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",操作{0}比任何可用的工作時間更長工作站{1}，分解成運行多個操作
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,暫無產品說明
 DocType: Purchase Invoice,Overdue,過期的
@@ -2750,6 +2807,8 @@
 DocType: Employee Loan,Repaid/Closed,償還/關閉
 DocType: Item,Total Projected Qty,預計總數量
 DocType: Monthly Distribution,Distribution Name,分配名稱
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,供應商&gt;供應商類型
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",對於{1} {2}進行會計分錄所需的項目{0}，找不到估值。如果該項目在{1}中作為零估值率項目進行交易，請在{1}項目表中提及。否則，請在項目記錄中創建貨物的進貨庫存交易或提交估值費率，然後嘗試提交/取消此條目
 DocType: Course,Course Code,課程代碼
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},項目{0}需要品質檢驗
 DocType: POS Settings,Use POS in Offline Mode,在離線模式下使用POS
@@ -2760,14 +2819,14 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,管理領地樹。
 DocType: Journal Entry Account,Sales Invoice,銷售發票
 DocType: Journal Entry Account,Party Balance,黨平衡
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,請選擇適用的折扣
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,請選擇適用的折扣
 DocType: Company,Default Receivable Account,預設應收帳款
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,對支付上述選擇條件的薪資總額新增銀行分錄
 DocType: Physician,Physician Schedule,醫師表
 DocType: Purchase Invoice,Deemed Export,被視為出口
 DocType: Stock Entry,Material Transfer for Manufacture,物料轉倉用於製造
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,折扣百分比可以應用於單一價目表或所有價目表。
-DocType: Purchase Invoice,Half-yearly,每半年一次
+DocType: Subscription,Half-yearly,每半年一次
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,存貨的會計分錄
 DocType: Lab Test,LabTest Approver,LabTest審批者
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,您已經評估了評估標準{}。
@@ -2794,13 +2853,13 @@
 DocType: Purchase Invoice Item,Quality Inspection,品質檢驗
 DocType: Company,Standard Template,標準模板
 DocType: Training Event,Theory,理論
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料需求的數量低於最少訂購量
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料需求的數量低於最少訂購量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,帳戶{0}被凍結
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,法人/子公司與帳戶的獨立走勢屬於該組織。
 DocType: Payment Request,Mute Email,靜音電子郵件
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",食品、飲料＆煙草
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},只能使支付對未付款的{0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,佣金比率不能大於100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},只能使支付對未付款的{0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,佣金比率不能大於100
 DocType: Stock Entry,Subcontract,轉包
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,請輸入{0}第一
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,從沒有回复
@@ -2820,8 +2879,8 @@
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,防止採購訂單
 DocType: Patient Appointment,Scheduled,預定
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,詢價。
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,請在人力資源&gt;人力資源設置中設置員工命名系統
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",請選擇項，其中“正股項”是“否”和“是銷售物品”是“是”，沒有其他產品捆綁
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,選擇客戶
 DocType: Student Log,Academic,學術的
 DocType: Patient,Personal and Social History,個人和社會史
 DocType: Fee Schedule,Fee Breakup for each student,每名學生的費用分手
@@ -2830,7 +2889,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,更改代碼
 DocType: Stock Reconciliation,SR/,序號 /
 DocType: Vehicle,Diesel,柴油機
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,尚未選擇價格表之貨幣
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,尚未選擇價格表之貨幣
 apps/erpnext/erpnext/config/healthcare.py +46,Results,結果
 ,Student Monthly Attendance Sheet,學生每月考勤表
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},員工{0}已經申請了{1}的{2}和{3}
@@ -2845,7 +2904,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,管理銷售合作夥伴。
 DocType: Quality Inspection,Inspection Type,檢驗類型
 DocType: Fee Validity,Visited yet,已訪問
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,與現有的交易倉庫不能轉換為組。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,與現有的交易倉庫不能轉換為組。
 DocType: Assessment Result Tool,Result HTML,結果HTML
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,新增學生
 DocType: C-Form,C-Form No,C-表格編號
@@ -2881,12 +2940,11 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,以日期時間
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,課程表刪除：
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,日誌維護短信發送狀態
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,設置銷售目標
 DocType: Accounts Settings,Make Payment via Journal Entry,通過日記帳分錄進行付款
 DocType: Item,Inspection Required before Delivery,分娩前檢查所需
 DocType: Item,Inspection Required before Purchase,購買前檢查所需
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,待活動
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,你的組織
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,你的組織
 DocType: Fee Component,Fees Category,費用類別
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,請輸入解除日期。
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
@@ -2897,7 +2955,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +114,Expected Delivery Date should be after Sales Order Date,預計交貨日期應在銷售訂單日期之後
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,重新排序級別
 DocType: Company,Chart Of Accounts Template,圖表帳戶模板
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},項目價格更新{0}價格表{1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},項目價格更新{0}價格表{1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,工資分手基於盈利和演繹。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,有子節點的帳不能轉換到總帳
 DocType: Purchase Invoice Item,Accepted Warehouse,收料倉庫
@@ -2911,9 +2969,10 @@
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,銷售訂單一被儲存，就會顯示出來。
 ,Employee Birthday,員工生日
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,學生考勤批處理工具
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,計劃的高級
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,創業投資
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,這個“學年”一個學期{0}和“術語名稱”{1}已經存在。請修改這些條目，然後再試一次。
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}",由於有對項目{0}現有的交易，你不能改變的值{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}",由於有對項目{0}現有的交易，你不能改變的值{1}
 DocType: UOM,Must be Whole Number,必須是整數
 DocType: Leave Control Panel,New Leaves Allocated (In Days),新的排假（天）
 DocType: Purchase Invoice,Invoice Copy,發票副本
@@ -2922,7 +2981,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,發票號碼
 DocType: Shopping Cart Settings,Orders,訂單
 DocType: Employee Leave Approver,Leave Approver,休假審批人
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,請選擇一個批次
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,請選擇一個批次
 DocType: Assessment Group,Assessment Group Name,評估小組名稱
 DocType: Manufacturing Settings,Material Transferred for Manufacture,轉移至製造的物料
 DocType: Expense Claim,"A user with ""Expense Approver"" role",與“費用審批人”角色的用戶
@@ -2937,7 +2996,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,期末進入
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,選擇部門...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,與現有的交易成本中心，不能轉化為組
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},金額{0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},金額{0} {1} {2} {3}
 DocType: Account,Depreciation,折舊
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),供應商（S）
 DocType: Employee Attendance Tool,Employee Attendance Tool,員工考勤工具
@@ -2948,10 +3007,12 @@
 DocType: GL Entry,Voucher No,憑證編號
 ,Lead Owner Efficiency,主導效率
 ,Lead Owner Efficiency,主導效率
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,最受歡迎
 DocType: Leave Allocation,Leave Allocation,排假
 DocType: Payment Request,Recipient Message And Payment Details,收件人郵件和付款細節
 DocType: Training Event,Trainer Email,教練電子郵件
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,{0}物料需求已建立
+DocType: Restaurant Reservation,No of People,沒有人
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,模板條款或合同。
 DocType: Purchase Invoice,Address and Contact,地址和聯絡方式
 DocType: Cheque Print Template,Is Account Payable,為應付賬款
@@ -2959,9 +3020,10 @@
 DocType: Supplier,Last Day of the Next Month,下個月的最後一天
 DocType: Support Settings,Auto close Issue after 7 days,7天之後自動關閉問題
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",假，不是之前分配{0}，因為休假餘額已經結轉轉發在未來的假期分配記錄{1}
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),註：由於/參考日期由{0}天超過了允許客戶的信用天數（S）
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),註：由於/參考日期由{0}天超過了允許客戶的信用天數（S）
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,學生申請
 DocType: Asset Category Account,Accumulated Depreciation Account,累計折舊科目
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,此電子郵件是自動生成的
 DocType: Stock Settings,Freeze Stock Entries,凍結庫存項目
 DocType: Program Enrollment,Boarding Student,寄宿學生
 DocType: Asset,Expected Value After Useful Life,期望值使用壽命結束後
@@ -2989,7 +3051,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,為基於活動的組手動選擇學生
 DocType: Journal Entry,User Remark,用戶備註
 DocType: Lead,Market Segment,市場分類
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},支付的金額不能超過總負餘額大於{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},支付的金額不能超過總負餘額大於{0}
 DocType: Supplier Scorecard Period,Variables,變量
 DocType: Employee Internal Work History,Employee Internal Work History,員工內部工作經歷
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),關閉（Dr）
@@ -3016,20 +3078,21 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,獲取更新
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}帳戶{2}不屬於公司{3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,材料需求{0}被取消或停止
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,離開管理
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,離開管理
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,以帳戶分群組
 DocType: Lead,Lower Income,較低的收入
+DocType: Restaurant Order Entry,Current Order,當前訂單
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},列{0}的來源和目標倉庫不可相同
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差異帳戶必須是資產/負債類型的帳戶，因為此庫存調整是一個開始分錄
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},支付額不能超過貸款金額較大的{0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,轉到程序
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},所需物品{0}的採購訂單號
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,生產訂單未創建
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,生產訂單未創建
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',“起始日期”必須經過'終止日期'
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},無法改變地位的學生{0}與學生申請鏈接{1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},無法改變地位的學生{0}與學生申請鏈接{1}
 DocType: Asset,Fully Depreciated,已提足折舊
 ,Stock Projected Qty,存貨預計數量
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},客戶{0}不屬於項目{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},客戶{0}不屬於項目{1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,顯著的考勤HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",語錄是建議，你已經發送到你的客戶提高出價
 DocType: Sales Order,Customer's Purchase Order,客戶採購訂單
@@ -3039,8 +3102,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,請設置折舊數預訂
 DocType: Supplier Scorecard Period,Calculations,計算
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,價值或數量
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,製作訂單不能上調：
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,製作訂單不能上調：
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,分鐘
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,請通過設置&gt;設置&gt;命名系列為{0}設置命名系列
 DocType: Purchase Invoice,Purchase Taxes and Charges,購置稅和費
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,去供應商
 ,Qty to Receive,未到貨量
@@ -3053,7 +3117,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,信用帳戶必須是資產負債表科目
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,所有供應商類型
 DocType: Global Defaults,Disable In Words,禁用詞
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,產品編號是強制性的，因為項目沒有自動編號
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,產品編號是強制性的，因為項目沒有自動編號
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},報價{0}非為{1}類型
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,維護計劃項目
 DocType: Sales Order,%  Delivered,％交付
@@ -3071,22 +3135,24 @@
 DocType: Lab Test Groups,Normal Range,普通範圍
 DocType: Academic Term,Academic Year,學年
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,期初餘額權益
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,剩餘
 DocType: Appraisal,Appraisal,評價
 DocType: Purchase Invoice,GST Details,消費稅細節
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},電子郵件發送到供應商{0}
+DocType: Item,Default Sales Unit of Measure,默認銷售單位
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,日期重複
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,授權簽字人
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},休假審批人必須是一個{0}
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,創造費用
-DocType: Hub Settings,Seller Email,賣家電子郵件
 DocType: Project,Total Purchase Cost (via Purchase Invoice),總購買成本（通過採購發票）
 DocType: Training Event,Start Time,開始時間
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,選擇數量
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,選擇數量
 DocType: Customs Tariff Number,Customs Tariff Number,海關稅則號
 DocType: Patient Appointment,Patient Appointment,患者預約
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,審批角色作為角色的規則適用於不能相同
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,從該電子郵件摘要退訂
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,從該電子郵件摘要退訂
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,獲得供應商
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},找不到項目{1} {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,去課程
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,發送訊息
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,帳戶與子節點不能被設置為分類帳
@@ -3098,11 +3164,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,物料轉倉用於製造
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,帳戶{0}不存在
 DocType: Project,Project Type,專案類型
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,子任務存在這個任務。你不能刪除這個任務。
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,無論是數量目標或目標量是強制性的。
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,各種活動的費用
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,沒有更多的結果
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,各種活動的費用
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",設置活動為{0}，因為附連到下面的銷售者的僱員不具有用戶ID {1}
 DocType: Timesheet,Billing Details,結算明細
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,源和目標倉庫必須是不同的
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,源和目標倉庫必須是不同的
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},不允許更新比{0}舊的庫存交易
 DocType: Purchase Invoice Item,PR Detail,詳細新聞稿
 DocType: Sales Order,Fully Billed,完全開票
@@ -3126,7 +3194,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,電匯
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,全面檢查
 DocType: Vehicle Log,Invoice Ref,發票編號
-DocType: Purchase Order,Recurring Order,經常訂購
 DocType: Company,Default Income Account,預設之收入帳戶
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,客戶群組／客戶
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),未關閉的財年利潤/損失（信用）
@@ -3139,7 +3206,7 @@
 DocType: Patient,A Negative,一個負面的
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,沒有更多的表現。
 DocType: Lead,From Customer,從客戶
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,電話
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,電話
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,一個產品
 DocType: Project,Total Costing Amount (via Time Logs),總成本核算金額（經由時間日誌）
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,製作費用表
@@ -3164,7 +3231,7 @@
 DocType: School Settings,Current Academic Term,當前學術期限
 DocType: School Settings,Current Academic Term,當前學術期限
 DocType: Sales Order,Not Billed,不發單
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,這兩個倉庫必須屬於同一個公司
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,這兩個倉庫必須屬於同一個公司
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,尚未新增聯絡人。
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,到岸成本憑證金額
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,由供應商提出的帳單。
@@ -3180,8 +3247,8 @@
 DocType: Journal Entry Account,Journal Entry Account,日記帳分錄帳號
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,學生組
 DocType: Shopping Cart Settings,Quotation Series,報價系列
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",具有相同名稱的項目存在（ {0} ） ，請更改項目群組名或重新命名該項目
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,請選擇客戶
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item",具有相同名稱的項目存在（ {0} ） ，請更改項目群組名或重新命名該項目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,請選擇客戶
 DocType: C-Form,I,一世
 DocType: Company,Asset Depreciation Cost Center,資產折舊成本中心
 DocType: Sales Order Item,Sales Order Date,銷售訂單日期
@@ -3189,6 +3256,7 @@
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",如果選中，各個生產項目的所有孩子將被列入材料請求。
 DocType: Assessment Plan,Assessment Plan,評估計劃
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,客戶{0}已創建。
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,目前沒有任何倉庫可用的庫存
 ,Payment Period Based On Invoice Date,基於發票日的付款期
 DocType: Sample Collection,No. of print,打印數量
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},缺少貨幣匯率{0}
@@ -3236,12 +3304,13 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,在從倉庫可用的批次數量
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,工資總額 - 扣除總額 - 貸款還款
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,當前BOM和新BOM不能相同
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,工資單編號
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,工資單編號
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,日期退休必須大於加入的日期
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,有錯誤，同時在調度過程：
 DocType: Sales Invoice,Against Income Account,對收入帳戶
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,項目{0}：有序數量{1}不能低於最低訂貨量{2}（項中定義）。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,項目{0}：有序數量{1}不能低於最低訂貨量{2}（項中定義）。
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,每月分配比例
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,請以其他用戶身份登錄。
 DocType: Territory,Territory Targets,境內目標
 DocType: Delivery Note,Transporter Info,貨運公司資訊
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},請設置在默認情況下公司{0} {1}
@@ -3249,12 +3318,13 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,同一個供應商已多次輸入
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,總利潤/虧損
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,採購訂單項目供應商
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,公司名稱不能為公司
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,公司名稱不能為公司
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,信頭的列印模板。
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"列印模板的標題, 例如 Proforma Invoice。"
 DocType: Student Guardian,Student Guardian,學生家長
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,估值類型罪名不能標記為包容性
 DocType: POS Profile,Update Stock,庫存更新
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,在訂閱
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,不同計量單位的項目會導致不正確的（總）淨重值。確保每個項目的淨重是在同一個計量單位。
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM率
 DocType: Asset,Journal Entry for Scrap,日記帳分錄報廢
@@ -3302,15 +3372,17 @@
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,註銷項款
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",系統用戶（登錄）的標識。如果設定，這將成為的所有人力資源的預設形式。
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}：從{1}
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,排隊更新所有材料清單中的最新價格。可能需要幾分鐘。
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,排隊更新所有材料清單中的最新價格。可能需要幾分鐘。
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新帳戶的名稱。注：請不要創建帳戶的客戶和供應商
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,依據國家別啟發式的預設地址模板
 DocType: Sales Order Item,Supplier delivers to Customer,供應商提供給客戶
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}]（＃窗體/項目/ {0}）缺貨
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},由於/參考日期不能後{0}
+,Sales Payment Summary,銷售付款摘要
+DocType: Restaurant,Restaurant,餐廳
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},由於/參考日期不能後{0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,資料輸入和輸出
 DocType: Patient,Account Details,帳戶細節
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,沒有發現學生
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,沒有發現學生
 DocType: Medical Department,Medical Department,醫學系
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,供應商記分卡評分標準
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,發票發布日期
@@ -3321,8 +3393,8 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,在選擇之前，甲方請選擇發布日期
 DocType: Program Enrollment,School House,學校議院
 DocType: Serial No,Out of AMC,出資產管理公司
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,請選擇報價
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,請選擇報價
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,請選擇報價
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,請選擇報價
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,預訂折舊數不能超過折舊總數更大
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,使維護訪問
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,請聯絡，誰擁有碩士學位的銷售經理{0}角色的用戶
@@ -3330,7 +3402,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,公司（不是客戶或供應商）的主人。
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,這是基於這名學生出席
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,沒有學生
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,添加更多項目或全開放形式
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,添加更多項目或全開放形式
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷貨訂單
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,轉到用戶
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金額+寫的抵銷金額不能大於總計
@@ -3350,35 +3422,38 @@
 DocType: Fee Schedule,Fee Schedule,收費表
 DocType: Hub Settings,Publish Availability,發布房源
 DocType: Company,Create Chart Of Accounts Based On,創建圖表的帳戶根據
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,無法將其轉換為非組。子任務存在。
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,出生日期不能大於今天。
 ,Stock Ageing,存貨帳齡分析表
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},學生{0}存在針對學生申請{1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),四捨五入調整（公司貨幣）
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,時間表
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,時間表
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,設置為打開
 DocType: Cheque Print Template,Scanned Cheque,支票掃描
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,對提交的交易，自動發送電子郵件給聯絡人。
 DocType: Timesheet,Total Billable Amount,總結算金額
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,項目3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,訂單輸入
 DocType: Purchase Order,Customer Contact Email,客戶聯絡電子郵件
 DocType: Warranty Claim,Item and Warranty Details,項目和保修細節
 DocType: Sales Team,Contribution (%),貢獻（％）
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注：付款項將不會被創建因為“現金或銀行帳戶”未指定
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,項目{0}已經存在
 DocType: Medical Department,Nursing User,護理用戶
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,職責
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,此報價的有效期已經結束。
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,此報價的有效期已經結束。
 DocType: Expense Claim Account,Expense Claim Account,報銷賬戶
 DocType: Accounts Settings,Allow Stale Exchange Rates,允許陳舊的匯率
 DocType: Sales Person,Sales Person Name,銷售人員的姓名
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,請在表中輸入至少一筆發票
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,添加用戶
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,添加用戶
 DocType: POS Item Group,Item Group,項目群組
 DocType: Item,Safety Stock,安全庫存
 DocType: Healthcare Settings,Healthcare Settings,醫療設置
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,為任務進度百分比不能超過100個。
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,為任務進度百分比不能超過100個。
 DocType: Stock Reconciliation Item,Before reconciliation,調整前
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),稅收和收費上架（公司貨幣）
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,商品稅行{0}必須有帳戶類型稅或收入或支出或課稅的
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,商品稅行{0}必須有帳戶類型稅或收入或支出或課稅的
 DocType: Sales Order,Partly Billed,天色帳單
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,項{0}必須是固定資產項目
 DocType: Item,Default BOM,預設的BOM
@@ -3393,6 +3468,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,變量
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,從送貨單
 DocType: Student,Student Email Address,學生的電子郵件地址
+DocType: Item,Hub Warehouse,Hub倉庫
 DocType: Physician Schedule Time Slot,From Time,從時間
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,有現貨：
 DocType: Notification Control,Custom Message,自定義訊息
@@ -3401,9 +3477,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,學生地址
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,學生地址
 DocType: Purchase Invoice,Price List Exchange Rate,價目表匯率
+DocType: POS Profile,POS Profile Name,POS配置文件名稱
 DocType: Purchase Invoice Item,Rate,單價
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,實習生
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,地址名稱
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,地址名稱
 DocType: Stock Entry,From BOM,從BOM
 DocType: Assessment Code,Assessment Code,評估準則
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,基本的
@@ -3416,11 +3493,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,加入日期必須大於出生日期
 DocType: Salary Slip,Salary Structure,薪酬結構
 DocType: Account,Bank,銀行
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,發行材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,發行材料
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,創建循環時出現錯誤
 DocType: Material Request Item,For Warehouse,對於倉庫
 DocType: Employee,Offer Date,到職日期
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,語錄
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,您在離線模式。您將無法重新加載，直到你有網絡。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,您在離線模式。您將無法重新加載，直到你有網絡。
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,沒有學生團體創建的。
 DocType: Purchase Invoice Item,Serial No,序列號
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,每月還款額不能超過貸款金額較大
@@ -3430,17 +3508,18 @@
 DocType: Salary Slip,Total Working Hours,總的工作時間
 DocType: Subscription,Next Schedule Date,下一個附表日期
 DocType: Stock Entry,Including items for sub assemblies,包括子組件項目
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,輸入值必須為正
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,所有的領土
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,輸入值必須為正
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,所有的領土
 DocType: Purchase Invoice,Items,項目
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,學生已經註冊。
 DocType: Fiscal Year,Year Name,年結名稱
 DocType: Process Payroll,Process Payroll,處理工資
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,還有比這個月工作日更多的假期。
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,還有比這個月工作日更多的假期。
 DocType: Product Bundle Item,Product Bundle Item,產品包項目
 DocType: Sales Partner,Sales Partner Name,銷售合作夥伴名稱
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,索取報價
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,索取報價
 DocType: Payment Reconciliation,Maximum Invoice Amount,最大發票額
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,血液學
 DocType: Normal Test Items,Normal Test Items,正常測試項目
 DocType: Student Language,Student Language,學生語言
 apps/erpnext/erpnext/config/selling.py +23,Customers,顧客
@@ -3452,10 +3531,11 @@
 DocType: Issue,Opening Time,開放時間
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,需要起始和到達日期
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,證券及商品交易所
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',測度變異的默認單位“{0}”必須是相同模板“{1}”
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',測度變異的默認單位“{0}”必須是相同模板“{1}”
 DocType: Shipping Rule,Calculate Based On,計算的基礎上
 DocType: Delivery Note Item,From Warehouse,從倉庫
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,不與物料清單的項目，以製造
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,不與物料清單的項目，以製造
+DocType: Restaurant,Default Customer,默認客戶
 DocType: Assessment Plan,Supervisor Name,主管名稱
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,不要確認是否在同一天創建約會
 DocType: Program Enrollment Course,Program Enrollment Course,課程註冊課程
@@ -3482,7 +3562,7 @@
 DocType: Payment Entry,Internal Transfer,內部轉賬
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,此帳戶存在子帳戶。您無法刪除此帳戶。
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,無論是數量目標或目標量是必需的
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},項目{0}不存在預設的的BOM
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},項目{0}不存在預設的的BOM
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,請選擇發布日期第一
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,開業日期應該是截止日期之前，
 DocType: Leave Control Panel,Carry Forward,發揚
@@ -3514,6 +3594,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,總現
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,會計報表
 DocType: Drug Prescription,Hour,小時
+DocType: Restaurant Order Entry,Last Sales Invoice,上次銷售發票
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新的序列號不能有倉庫。倉庫必須由存貨分錄或採購入庫單進行設定
 DocType: Lead,Lead Type,引線型
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,在限制的日期，您無權批准休假
@@ -3546,62 +3627,65 @@
 DocType: Manufacturing Settings,Update BOM Cost Automatically,自動更新BOM成本
 DocType: Lab Test,Test Name,測試名稱
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,創建用戶
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,量生產必須大於0。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,量生產必須大於0。
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,訪問報告維修電話。
+DocType: Stock Entry,Update Rate and Availability,更新率和可用性
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,相對於訂單量允許接受或交付的變動百分比額度。例如：如果你下定100個單位量，而你的許可額度是10%，那麼你可以收到最多110個單位量。
 DocType: POS Customer Group,Customer Group,客戶群組
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),新批號（可選）
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),新批號（可選）
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),新批號（可選）
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),新批號（可選）
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},交際費是強制性的項目{0}
 DocType: BOM,Website Description,網站簡介
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,在淨資產收益變化
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,請取消採購發票{0}第一
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",電子郵件地址必須是唯一的，已經存在了{0}
 DocType: Serial No,AMC Expiry Date,AMC到期時間
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,收據
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,收據
 ,Sales Register,銷售登記
 DocType: Daily Work Summary Settings Company,Send Emails At,發送電子郵件在
 DocType: Quotation,Quotation Lost Reason,報價遺失原因
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,選擇您的域名
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},交易參考編號{0}日{1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},交易參考編號{0}日{1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,無內容可供編輯
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,表單視圖
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,本月和待活動總結
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,表單視圖
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,本月和待活動總結
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.",將用戶添加到您的組織，而不是您自己。
 DocType: Customer Group,Customer Group Name,客戶群組名稱
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,還沒有客戶！
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,還沒有客戶！
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,現金流量表
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},貸款額不能超過最高貸款額度{0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,執照
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},請刪除此發票{0}從C-表格{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},請刪除此發票{0}從C-表格{1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,請選擇結轉，如果你還需要包括上一會計年度的資產負債葉本財年
 DocType: GL Entry,Against Voucher Type,對憑證類型
 DocType: Physician,Phone (R),電話（R）
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,添加時隙
 DocType: Item,Attributes,屬性
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,啟用模板
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,請通過設置&gt;設置&gt;命名系列為{0}設置命名系列
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,請輸入核銷帳戶
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,最後訂購日期
 DocType: Patient,B Negative,B負面
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},帳戶{0}不屬於公司{1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列號與交貨單不匹配
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列號與交貨單不匹配
 DocType: Student,Guardian Details,衛詳細
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,馬克出席了多個員工
 DocType: Vehicle,Chassis No,底盤無
 DocType: Payment Request,Initiated,啟動
 DocType: Production Order,Planned Start Date,計劃開始日期
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,請選擇一個物料清單
 DocType: Serial No,Creation Document Type,創建文件類型
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,結束日期必須大於開始日期
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,結束日期必須大於開始日期
 DocType: Leave Type,Is Encash,為兌現
 DocType: Leave Allocation,New Leaves Allocated,新的排假
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,項目明智的數據不適用於報價
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,結束
 DocType: Project,Expected End Date,預計結束日期
 DocType: Budget Account,Budget Amount,預算額
 DocType: Appraisal Template,Appraisal Template Title,評估模板標題
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},從日期{0}為僱員{1}不能僱員的接合日期之前{2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,商業
 DocType: Patient,Alcohol Current Use,酒精當前使用
+DocType: Student Admission Program,Student Admission Program,學生入學計劃
 DocType: Payment Entry,Account Paid To,賬戶付至
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,父項{0}不能是庫存產品
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,所有的產品或服務。
@@ -3610,29 +3694,30 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0}預算帳戶{1}對{2} {3}是{4}。這將超過{5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',行{0}＃賬戶的類型必須是&#39;固定資產&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,輸出數量
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,規則用於計算銷售運輸量
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,並unchcked在禁用
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,系列是強制性的
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,金融服務
 DocType: Student Sibling,Student ID,學生卡
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,活動類型的時間記錄
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,供應商電郵
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,活動類型的時間記錄
 DocType: Tax Rule,Sales,銷售
 DocType: Stock Entry Detail,Basic Amount,基本金額
 DocType: Training Event,Exam,考試
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},倉庫需要現貨產品{0}
-DocType: Leave Allocation,Unused leaves,未使用的休假
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},倉庫需要現貨產品{0}
 DocType: Patient,Alcohol Past Use,酒精過去使用
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,鉻
 DocType: Tax Rule,Billing State,計費狀態
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,轉讓
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM（包括子組件）
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,轉讓
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM（包括子組件）
 DocType: Authorization Rule,Applicable To (Employee),適用於（員工）
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,截止日期是強制性的
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,截止日期是強制性的
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,增量屬性{0}不能為0
 DocType: Journal Entry,Pay To / Recd From,支付/ 接收
 DocType: Naming Series,Setup Series,設置系列
 DocType: Payment Reconciliation,To Invoice Date,要發票日期
 DocType: Supplier,Contact HTML,聯繫HTML
 ,Inactive Customers,不活躍的客戶
+DocType: Student Admission Program,Maximum Age,最大年齡
 DocType: Landed Cost Voucher,Purchase Receipts,採購入庫
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,定價規則被如何應用？
 DocType: Stock Entry,Delivery Note No,送貨單號
@@ -3647,6 +3732,7 @@
 DocType: GL Entry,Remarks,備註
 DocType: Payment Entry,Account Paid From,帳戶支付從
 DocType: Purchase Order Item Supplied,Raw Material Item Code,原料產品編號
+DocType: Task,Parent Task,父任務
 DocType: Journal Entry,Write Off Based On,核銷的基礎上
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,使鉛
 DocType: Stock Settings,Show Barcode Field,顯示條形碼域
@@ -3654,19 +3740,19 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",工資已經處理了與{0}和{1}，留下申請期之間不能在此日期範圍內的時期。
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,對於一個序列號安裝記錄
 DocType: Guardian Interest,Guardian Interest,衛利息
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,設置POS發票的默認值
 apps/erpnext/erpnext/config/hr.py +177,Training,訓練
 DocType: Timesheet,Employee Detail,員工詳細信息
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1電子郵件ID
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1電子郵件ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,下一個日期的一天，重複上月的天必須相等
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,下一個日期的一天，重複上月的天必須相等
 DocType: Lab Prescription,Test Code,測試代碼
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,對網站的主頁設置
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},由於{1}的記分卡，{0}不允許使用RFQ
 DocType: Offer Letter,Awaiting Response,正在等待回應
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},總金額{0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},無效的屬性{0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},總金額{0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},無效的屬性{0} {1}
 DocType: Supplier,Mention if non-standard payable account,如果非標準應付賬款提到
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},相同的物品已被多次輸入。 {}名單
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',請選擇“所有評估組”以外的評估組
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},行{0}：項目{1}需要費用中心
 DocType: Training Event Employee,Optional,可選的
@@ -3687,11 +3773,13 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,報廢資產成本
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：成本中心是強制性的項目{2}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,從產品包取得項目
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property",由於庫存針對的是項目{0}，因此無法啟用變體屬性
 DocType: Asset,Straight Line,直線
 DocType: Project User,Project User,項目用戶
 DocType: GL Entry,Is Advance,為進
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,考勤起始日期和出席的日期，是強制性的
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,請輸入'轉包' YES或NO
+DocType: Item,Default Purchase Unit of Measure,默認採購單位
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,最後通訊日期
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,最後通訊日期
 DocType: Sales Team,Contact No.,聯絡電話
@@ -3700,7 +3788,6 @@
 DocType: Production Order,Check if material transfer entry is not required,檢查是否不需要材料轉移條目
 DocType: Production Order,Check if material transfer entry is not required,檢查是否不需要材料轉移條目
 DocType: Program Enrollment Tool,Get Students From,讓學生從
-DocType: Hub Settings,Seller Country,賣家國家
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,公佈於網頁上的項目
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,一群學生在分批
 DocType: Authorization Rule,Authorization Rule,授權規則
@@ -3725,6 +3812,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行＃{0}：資產{1}無法提交，這已經是{2}
 DocType: Tax Rule,Billing Country,結算國家
 DocType: Purchase Order Item,Expected Delivery Date,預計交貨日期
+DocType: Restaurant Order Entry,Restaurant Order Entry,餐廳訂單錄入
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,借貸{0}＃不等於{1}。區別是{2}。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,娛樂費用
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,製作材料要求
@@ -3737,9 +3825,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,帳戶與現有的交易不能被刪除
 DocType: Vehicle,Last Carbon Check,最後檢查炭
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,法律費用
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,請選擇行數量
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,請選擇行數量
 DocType: Purchase Invoice,Posting Time,登錄時間
 DocType: Timesheet,% Amount Billed,（％）金額已開立帳單
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",沒有為{0}博士設置“每次約會的時間”，將其添加到主治醫師。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,電話費
 DocType: Sales Partner,Logo,標誌
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,如果要強制用戶在儲存之前選擇了一系列，則勾選此項。如果您勾選此項，則將沒有預設值。
@@ -3750,6 +3839,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,新客戶收入
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,差旅費
 DocType: Maintenance Visit,Breakdown,展開
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},在文檔類型{0}中添加自定義字段訂閱
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,帳號：{0}幣種：{1}不能選擇
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",根據最新的估值/價格清單率/最近的原材料採購率，通過計劃程序自動更新BOM成本。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},帳戶{0}：父帳戶{1}不屬於公司：{2}
@@ -3772,7 +3862,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),總結算金額（經由時間日誌）
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,供應商編號
 DocType: Payment Request,Payment Gateway Details,支付網關細節
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,量應大於0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,量應大於0
 DocType: Journal Entry,Cash Entry,現金分錄
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,子節點可以在&#39;集團&#39;類型的節點上創建
 DocType: Academic Year,Academic Year Name,學年名稱
@@ -3788,7 +3878,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,注：項目{0}多次輸入
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,所有聯絡人。
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,公司縮寫
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,用戶{0}不存在
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,用戶{0}不存在
 DocType: Item Attribute Value,Abbreviation,縮寫
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,付款項目已存在
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,不允許因為{0}超出範圍
@@ -3804,10 +3894,10 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,行情到引線或客戶。
 DocType: Stock Settings,Role Allowed to edit frozen stock,此角色可以編輯凍結的庫存
 ,Territory Target Variance Item Group-Wise,地域內跨項目群組間的目標差異
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,所有客戶群組
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,所有客戶群組
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,每月累計
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是強制性的。也許外幣兌換記錄為{1}到{2}尚未建立。
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,稅務模板是強制性的。
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,稅務模板是強制性的。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,帳戶{0}：父帳戶{1}不存在
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),價格列表費率（公司貨幣）
 DocType: Products Settings,Products Settings,產品設置
@@ -3815,6 +3905,7 @@
 DocType: Healthcare Settings,Custom Signature in Print,自定義簽名打印
 DocType: Account,Temporary,臨時
 DocType: Program,Courses,培訓班
+DocType: Monthly Distribution Percentage,Percentage Allocation,百分比分配
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +124,Secretary,秘書
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",如果禁用“，在詞”字段不會在任何交易可見
 DocType: Serial No,Distinct unit of an Item,一個項目的不同的單元
@@ -3824,17 +3915,18 @@
 DocType: HR Settings,Employee Records to be created by,員工紀錄的創造者
 DocType: Patient,AB Negative,AB陰性
 DocType: POS Profile,Apply Discount On,申請折扣
+,Reqd By Date,REQD按日期
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,債權人
 DocType: Assessment Plan,Assessment Name,評估名稱
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No is mandatory,行＃{0}：序列號是必需的
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,項目智者稅制明細
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,研究所縮寫
 ,Item-wise Price List Rate,全部項目的價格表
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,供應商報價
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,供應商報價
 DocType: Quotation,In Words will be visible once you save the Quotation.,報價一被儲存，就會顯示出來。
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},數量（{0}）不能是行{1}中的分數
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},數量（{0}）不能是行{1}中的分數
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},條碼{0}已經用在項目{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},條碼{0}已經用在項目{1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,增加運輸成本的規則。
 DocType: Item,Opening Stock,打開股票
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,客戶是必需的
@@ -3850,8 +3942,7 @@
 DocType: Customer,From Lead,從鉛
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,發布生產訂單。
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,選擇會計年度...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,所需的POS資料，使POS進入
-DocType: Hub Settings,Name Token,名令牌
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,所需的POS資料，使POS進入
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,標準銷售
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,至少要有一間倉庫
 DocType: BOM Update Tool,Replace,更換
@@ -3865,7 +3956,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,人力資源
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,付款方式付款對賬
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,所得稅資產
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},生產訂單已經{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},生產訂單已經{0}
 DocType: BOM Item,BOM No,BOM No.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,日記條目{0}沒有帳號{1}或已經匹配其他憑證
 DocType: Item,Moving Average,移動平均線
@@ -3883,8 +3974,8 @@
 DocType: Currency Exchange,To Currency,到貨幣
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,允許以下用戶批准許可申請的區塊天。
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,報銷的類型。
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},項目{0}的銷售價格低於其{1}。售價應至少為{2}
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},項目{0}的銷售價格低於其{1}。售價應至少為{2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},項目{0}的銷售價格低於其{1}。售價應至少為{2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},項目{0}的銷售價格低於其{1}。售價應至少為{2}
 DocType: Item,Taxes,稅
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,支付和未送達
 DocType: Project,Default Cost Center,預設的成本中心
@@ -3898,14 +3989,14 @@
 DocType: Employee Loan,Fully Disbursed,全額支付
 DocType: Maintenance Visit,Customer Feedback,客戶反饋
 DocType: Account,Expense,費用
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,分數不能超過最高得分更大
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,分數不能超過最高得分更大
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,客戶和供應商
 DocType: Item Attribute,From Range,從範圍
 DocType: BOM,Set rate of sub-assembly item based on BOM,基於BOM設置子組合項目的速率
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},式或條件語法錯誤：{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},式或條件語法錯誤：{0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,每日工作總結公司的設置
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,項目{0}被忽略，因為它不是一個庫存項目
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,提交此生產訂單進行進一步的處理。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,提交此生產訂單進行進一步的處理。
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",要在一個特定的交易不適用於定價規則，所有適用的定價規則應該被禁用。
 DocType: Assessment Group,Parent Assessment Group,家長評估小組
 ,Sales Order Trends,銷售訂單趨勢
@@ -3921,9 +4012,10 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',如果Group By是“Company”，請設置公司過濾器空白
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,發布日期不能是未來的日期
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：序列號{1}不相匹配{2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,用於生成循環
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,實驗室測試UOM
 ,Delivery Note Trends,送貨單趨勢
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,本週的總結
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,本週的總結
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,庫存數量
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,帳號：{0}只能通過股票的交易進行更新
 DocType: Student Group Creation Tool,Get Courses,獲取課程
@@ -3936,7 +4028,6 @@
 DocType: Purchase Order,To Bill,發票待輸入
 DocType: Material Request,% Ordered,% 已訂購
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",對於基於課程的學生小組，課程將從入學課程中的每個學生確認。
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date",用逗號分隔的輸入電子郵件地址，發票就會自動在特定日期郵寄
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,計件工作
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,平均。買入價
 DocType: Task,Actual Time (in Hours),實際時間（小時）
@@ -3949,7 +4040,7 @@
 DocType: Sales Invoice,Tax ID,稅號
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,項目{0}不是設定為序列號，此列必須為空白
 DocType: Accounts Settings,Accounts Settings,帳戶設定
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,沒有結果提交
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,沒有結果提交
 DocType: Customer,Sales Partner and Commission,銷售合作夥伴及佣金
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",共有{0}所有項目為零，可能是你應該“基於分佈式費用”改變
 DocType: Opportunity,To Discuss,為了討論
@@ -3957,54 +4048,53 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,臨時帳戶
 DocType: BOM Explosion Item,BOM Explosion Item,BOM展開項目
 DocType: Account,Auditor,核數師
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,生產{0}項目
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,生產{0}項目
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,學到更多
 DocType: Cheque Print Template,Distance from top edge,從頂邊的距離
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,價格表{0}禁用或不存在
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,價格表{0}禁用或不存在
 DocType: Purchase Invoice,Return,退貨
 DocType: Production Order Operation,Production Order Operation,生產訂單操作
 DocType: Pricing Rule,Disable,關閉
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,付款方式需要進行付款
 DocType: Project Task,Pending Review,待審核
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,預約和諮詢
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0}  -  {1}未註冊批次{2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0}  -  {1}未註冊批次{2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",資產{0}不能被廢棄，因為它已經是{1}
 DocType: Task,Total Expense Claim (via Expense Claim),總費用報銷（通過費用報銷）
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,馬克缺席
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},行{0}：BOM＃的貨幣{1}應等於所選貨幣{2}
 DocType: Journal Entry Account,Exchange Rate,匯率
 DocType: Patient,Additional information regarding the patient,有關患者的其他信息
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,銷售訂單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,銷售訂單{0}未提交
 DocType: Homepage,Tag Line,標語
 DocType: Fee Component,Fee Component,收費組件
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,車隊的管理
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,新增項目從
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,車隊的管理
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,新增項目從
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,所有評估標準的權重總數要達到100％
-DocType: BOM,Last Purchase Rate,最後預訂價
+DocType: Purchase Order Item,Last Purchase Rate,最後預訂價
 DocType: Account,Asset,財富
 DocType: Project Task,Task ID,任務ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,股票可以為項目不存在{0}，因為有變種
 DocType: Lab Test,Mobile,移動
 ,Sales Person-wise Transaction Summary,銷售人員相關的交易匯總
 DocType: Training Event,Contact Number,聯繫電話
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,倉庫{0}不存在
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,立即註冊ERPNext中心
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,倉庫{0}不存在
 DocType: Monthly Distribution,Monthly Distribution Percentages,每月分佈百分比
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,所選項目不能批
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",估值率未找到項{0}，這是需要做用於記帳條目{1} {2}。如果該項目交易作為樣本項目{1}，請提及的是，在{1}項目表。否則，請創建傳入股票的交易在項目記錄的項目或提估價率，然後嘗試submiting /取消此條
 DocType: Delivery Note,% of materials delivered against this Delivery Note,針對這張送貨單物料已交貨的百分比(%)
+DocType: Training Event,Has Certificate,有證書
 DocType: Project,Customer Details,客戶詳細資訊
 DocType: Employee,Reports to,隸屬於
 ,Unpaid Expense Claim,未付費用報銷
 DocType: Payment Entry,Paid Amount,支付的金額
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,探索銷售週期
 DocType: Assessment Plan,Supervisor,監
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,線上
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,線上
 ,Available Stock for Packing Items,可用庫存包裝項目
 DocType: Item Variant,Item Variant,項目變
 DocType: Assessment Result Tool,Assessment Result Tool,評價結果工具
 DocType: BOM Scrap Item,BOM Scrap Item,BOM項目廢料
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,提交的訂單不能被刪除
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,提交的訂單不能被刪除
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",帳戶餘額已歸為借方帳戶，不允許設為信用帳戶
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,品質管理
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,項{0}已被禁用
@@ -4024,7 +4114,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,允許零估值
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,允許零估值
 DocType: Training Event Employee,Invited,邀請
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,發現員工{0}對於給定的日期多個活動薪金結構
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,發現員工{0}對於給定的日期多個活動薪金結構
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,設置網關帳戶。
 DocType: Employee,Employment Type,就業類型
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,固定資產
@@ -4035,7 +4125,7 @@
 DocType: Item Group,Default Expense Account,預設費用帳戶
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,學生的電子郵件ID
 DocType: Tax Rule,Sales Tax Template,銷售稅模板
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,選取要保存發票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,選取要保存發票
 DocType: Employee,Encashment Date,兌現日期
 DocType: Training Event,Internet,互聯網
 DocType: Special Test Template,Special Test Template,特殊測試模板
@@ -4043,7 +4133,7 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},默認情況下存在作業成本的活動類型 -  {0}
 DocType: Production Order,Planned Operating Cost,計劃運營成本
 DocType: Academic Term,Term Start Date,期限起始日期
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},隨函附上{0}＃{1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},隨函附上{0}＃{1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,銀行對賬單餘額按總帳
 DocType: Job Applicant,Applicant Name,申請人名稱
 DocType: Authorization Rule,Customer / Item Name,客戶／品項名稱
@@ -4063,7 +4153,7 @@
 DocType: Guardian,Guardian Of ,守護者
 DocType: Grading Scale Interval,Threshold,閾
 DocType: BOM Update Tool,Current BOM,當前BOM表
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,添加序列號
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,添加序列號
 DocType: Production Order Item,Available Qty at Source Warehouse,源倉庫可用數量
 apps/erpnext/erpnext/config/support.py +22,Warranty,保證
 DocType: Purchase Invoice,Debit Note Issued,借記發行說明
@@ -4084,10 +4174,9 @@
 DocType: Account,Receivable,應收賬款
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供應商的採購訂單已經存在
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,此角色是允許提交超過所設定信用額度的交易。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,選擇項目，以製造
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time",主數據同步，這可能需要一些時間
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,選擇項目，以製造
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time",主數據同步，這可能需要一些時間
 DocType: Item,Material Issue,發料
-DocType: Hub Settings,Seller Description,賣家描述
 DocType: Employee Education,Qualification,合格
 DocType: Item Price,Item Price,商品價格
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,肥皂和洗滌劑
@@ -4095,7 +4184,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,從時間不能超過結束時間大。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,電影和視頻
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,已訂購
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,恢復
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,恢復
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,如果啟用，那麼系統將不會更新模板中變體的字段，但會在製作新變體時復制下面提到的字段的數據
 DocType: Assessment Criteria,Assessment Criteria Group,評估標準組
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},打開累計折舊必須小於等於{0}
 DocType: Warehouse,Warehouse Name,倉庫名稱
@@ -4103,7 +4193,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,請輸入核准角色或審批用戶
 DocType: Journal Entry,Write Off Entry,核銷進入
 DocType: BOM,Rate Of Materials Based On,材料成本基於
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,供應商&gt;供應商類型
+DocType: Item Variant Settings,Do not Update Variants,不要更新變體
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,支援分析
 DocType: POS Profile,Terms and Conditions,條款和條件
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},日期應該是在財政年度內。假設終止日期= {0}
@@ -4120,13 +4210,13 @@
 DocType: Sales Order Item,For Production,對於生產
 DocType: Project Task,View Task,查看任務
 ,Asset Depreciations and Balances,資產折舊和平衡
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},金額{0} {1}從轉移{2}到{3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},金額{0} {1}從轉移{2}到{3}
 DocType: Sales Invoice,Get Advances Received,取得預先付款
 DocType: Email Digest,Add/Remove Recipients,添加／刪除收件人
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},交易不反對停止生產訂單允許{0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",要設定這個財政年度為預設值，點擊“設為預設”
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,短缺數量
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
 DocType: Employee Loan,Repay from Salary,從工資償還
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},請求對付款{0} {1}量{2}
 DocType: Salary Slip,Salary Slip,工資單
@@ -4137,7 +4227,7 @@
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",產生交貨的包裝單。用於通知箱號，內容及重量。
 DocType: Sales Invoice Item,Sales Order Item,銷售訂單項目
 DocType: Salary Slip,Payment Days,付款日
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,與子節點倉庫不能轉換為分類賬
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,與子節點倉庫不能轉換為分類賬
 DocType: BOM,Manage cost of operations,管理作業成本
 DocType: Accounts Settings,Stale Days,陳舊的日子
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",當任何選取的交易都是“已提交”時，郵件會自動自動打開，發送電子郵件到相關的“聯絡人”通知相關交易，並用該交易作為附件。用戶可決定是否發送電子郵件。
@@ -4151,10 +4241,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,已收到序號{0}
 ,Requested Items To Be Transferred,將要轉倉的需求項目
 DocType: Expense Claim,Vehicle Log,車輛登錄
-DocType: Purchase Invoice,Recurring Id,經常性標識
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),發燒（溫度&gt; 38.5°C / 101.3°F或持續溫度&gt; 38°C / 100.4°F）
 DocType: Customer,Sales Team Details,銷售團隊詳細
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,永久刪除？
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,永久刪除？
 DocType: Expense Claim,Total Claimed Amount,總索賠額
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,潛在的銷售機會。
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},無效的{0}
@@ -4163,7 +4252,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,百貨
 ,Item Delivery Date,物品交貨日期
 DocType: Warehouse,PIN,銷
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,設置你的ERPNext學校
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,設置你的ERPNext學校
 DocType: Sales Invoice,Base Change Amount (Company Currency),基地漲跌額（公司幣種）
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,沒有以下的倉庫會計分錄
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,首先保存文檔。
@@ -4173,12 +4262,11 @@
 DocType: Item,Max Discount (%),最大折讓（％）
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,最後訂單金額
 DocType: Daily Work Summary,Email Sent To,電子郵件發送給
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,你確定要取消註冊？
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",任何其他言論，值得一提的努力，應該在記錄中。
 DocType: BOM,Manufacturing User,製造業用戶
 DocType: Purchase Invoice,Raw Materials Supplied,提供供應商原物料
-DocType: Purchase Invoice,Recurring Print Format,經常列印格式
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},價目表{0}的貨幣必須是{1}或{2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,添加產品
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},價目表{0}的貨幣必須是{1}或{2}
 DocType: Appraisal,Appraisal Template,評估模板
 DocType: Item Group,Item Classification,項目分類
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,業務發展經理
@@ -4191,7 +4279,7 @@
 DocType: Item Attribute Value,Attribute Value,屬性值
 ,Itemwise Recommended Reorder Level,Itemwise推薦級別重新排序
 DocType: Salary Detail,Salary Detail,薪酬詳細
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,請先選擇{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,請先選擇{0}
 DocType: Appointment Type,Physician,醫師
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,一批項目的{0} {1}已過期。
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,時間表製造。
@@ -4221,12 +4309,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,培訓活動/結果
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,作為累計折舊
 DocType: Sales Invoice,C-Form Applicable,C-表格適用
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},運行時間必須大於0的操作{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},運行時間必須大於0的操作{0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,倉庫是強制性的
 DocType: Supplier,Address and Contacts,地址和聯絡方式
 DocType: UOM Conversion Detail,UOM Conversion Detail,計量單位換算詳細
 DocType: Program,Program Abbreviation,計劃縮寫
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,生產訂單不能對一個項目提出的模板
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,生產訂單不能對一個項目提出的模板
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,費用對在採購入庫單內的每個項目更新
 DocType: Warranty Claim,Resolved By,議決
 DocType: Bank Guarantee,Start Date,開始日期
@@ -4250,23 +4338,24 @@
 DocType: Employee,Educational Qualification,學歷
 DocType: Workstation,Operating Costs,運營成本
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,如果積累了每月預算超出行動
-DocType: Purchase Invoice,Submit on creation,提交關於創建
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},貨幣{0}必須{1}
+DocType: Subscription,Submit on creation,提交關於創建
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},貨幣{0}必須{1}
 DocType: Asset,Disposal Date,處置日期
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",電子郵件將在指定的時間發送給公司的所有在職職工，如果他們沒有假期。回复摘要將在午夜被發送。
 DocType: Employee Leave Approver,Employee Leave Approver,員工請假審批
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一個重新排序條目已存在這個倉庫{1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.",不能聲明為丟失，因為報價已經取得進展。
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,培訓反饋
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一個重新排序條目已存在這個倉庫{1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.",不能聲明為丟失，因為報價已經取得進展。
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,培訓反饋
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,生產訂單{0}必須提交
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,供應商記分卡標準
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},請選擇項目{0}的開始日期和結束日期
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},當然是行強制性{0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,無效的主名稱
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,新增 / 編輯價格
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,新增 / 編輯價格
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,成本中心的圖
 DocType: Lab Test Template,Sample Collection,樣品收集
 ,Requested Items To Be Ordered,將要採購的需求項目
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,我的訂單
 DocType: Price List,Price List Name,價格列表名稱
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},每日工作總結{0}
 DocType: Employee Loan,Totals,總計
@@ -4282,12 +4371,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1}在需要{2}在{3} {4}：{5}來完成這一交易單位。
 DocType: Fee Schedule,Student Category,學生組
 DocType: Announcement,Student,學生
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,組織單位（部門）的主人。
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,組織單位（部門）的主人。
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,去房間
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,在發送前，請填寫留言
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,供應商重複
 DocType: Email Digest,Pending Quotations,待語錄
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,簡介銷售點的
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,簡介銷售點的
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,實驗室測試配置。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,無抵押貸款
 DocType: Cost Center,Cost Center Name,成本中心名稱
@@ -4296,6 +4385,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,數金額金額
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,大於160個字元的訊息將被分割成多個訊息送出
 DocType: Purchase Receipt Item,Received and Accepted,收貨及允收
+DocType: Hub Settings,Company and Seller Profile,公司和賣方簡介
 ,GST Itemised Sales Register,消費稅商品銷售登記冊
 ,Serial No Service Contract Expiry,序號服務合同到期
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,你無法將貸方與借方在同一時間記在同一帳戶
@@ -4305,10 +4395,11 @@
 DocType: Item,Variant Based On,基於變異對
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},分配的總權重應為100 ％ 。這是{0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,您的供應商
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,請更正
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,不能設置為失落的銷售訂單而成。
 DocType: Request for Quotation Item,Supplier Part No,供應商部件號
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',當類是“估值”或“Vaulation和總&#39;不能扣除
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,從......收到
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,從......收到
 DocType: Lead,Converted,轉換
 DocType: Item,Has Serial No,有序列號
 DocType: Employee,Date of Issue,發行日期
@@ -4316,7 +4407,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",根據購買設置，如果需要購買記錄==“是”，則為了創建採購發票，用戶需要首先為項目{0}創建採購憑證
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},行＃{0}：設置供應商項目{1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,行{0}：小時值必須大於零。
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,網站圖像{0}附加到物品{1}無法找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,網站圖像{0}附加到物品{1}無法找到
 DocType: Issue,Content Type,內容類型
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,電腦
 DocType: Item,List this Item in multiple groups on the website.,列出這個項目在網站上多個組。
@@ -4327,14 +4418,14 @@
 DocType: Payment Reconciliation,Get Unreconciled Entries,獲取未調節項
 DocType: Payment Reconciliation,From Invoice Date,從發票日期
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,您沒有權限提交
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,結算幣種必須等於要么默認業公司的貨幣或一方賬戶貨幣
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,結算幣種必須等於要么默認業公司的貨幣或一方賬戶貨幣
 DocType: Healthcare Settings,Laboratory Settings,實驗室設置
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,離開兌現
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,它有什麼作用？
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,到倉庫
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,所有學生入學
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,它有什麼作用？
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,到倉庫
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,所有學生入學
 ,Average Commission Rate,平均佣金比率
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,非庫存項目不能有序號
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,非庫存項目不能有序號
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,選擇狀態
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,考勤不能標記為未來的日期
 DocType: Pricing Rule,Pricing Rule Help,定價規則說明
@@ -4351,39 +4442,39 @@
 DocType: Item,Customer Code,客戶代碼
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},生日提醒{0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,天自上次訂購
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,借方帳戶必須是資產負債表科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,借方帳戶必須是資產負債表科目
 DocType: Leave Block List,Leave Block List Name,休假區塊清單名稱
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,保險開始日期應小於保險終止日期
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,請在學校&gt;學校設置中設置教師命名系統
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,庫存資產
 DocType: Timesheet,Production Detail,生產細節
+DocType: Restaurant,Active Menu,活動菜單
 DocType: Target Detail,Target Qty,目標數量
 DocType: Shopping Cart Settings,Checkout Settings,結帳設定
 DocType: Attendance,Present,現在
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,送貨單{0}不能提交
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,送貨單{0}不能提交
 DocType: Notification Control,Sales Invoice Message,銷售發票訊息
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,關閉帳戶{0}的類型必須是負債/權益
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},員工的工資單{0}已為時間表創建{1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},員工的工資單{0}已為時間表創建{1}
 DocType: Sales Order Item,Ordered Qty,訂購數量
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,項目{0}無效
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,項目{0}無效
 DocType: Stock Settings,Stock Frozen Upto,存貨凍結到...為止
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM不包含任何庫存項目
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,專案活動／任務。
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM不包含任何庫存項目
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,專案活動／任務。
 DocType: Vehicle Log,Refuelling Details,加油詳情
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,生成工資條
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}",採購必須進行檢查，如果適用於被選擇為{0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,折扣必須小於100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,最後購買率未找到
 DocType: Purchase Invoice,Write Off Amount (Company Currency),核銷金額（公司貨幣）
 DocType: Sales Invoice Timesheet,Billing Hours,結算時間
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,默認BOM {0}未找到
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,行＃{0}：請設置再訂購數量
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,默認BOM {0}未找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,行＃{0}：請設置再訂購數量
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,點擊項目將其添加到此處
 DocType: Fees,Program Enrollment,招生計劃
 DocType: Landed Cost Voucher,Landed Cost Voucher,到岸成本憑證
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},請設置{0}
-DocType: Purchase Invoice,Repeat on Day of Month,在月內的一天重複
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0}  -  {1}是非活動學生
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0}  -  {1}是非活動學生
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0}  -  {1}是非活動學生
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0}  -  {1}是非活動學生
 DocType: Employee,Health Details,健康細節
 DocType: Offer Letter,Offer Letter Terms,報價函條款
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,要創建付款請求參考文檔是必需的
@@ -4392,7 +4483,6 @@
 DocType: Employee External Work History,Salary,薪水
 DocType: Serial No,Delivery Document Type,交付文件類型
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,對上面選擇的條件提交所有工資單
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0}項目已同步
 DocType: Email Digest,Receivables,應收賬款
 DocType: Lead Source,Lead Source,鉛源
 DocType: Customer,Additional information regarding the customer.,對於客戶的其他訊息。
@@ -4411,7 +4501,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +319,BOM and Manufacturing Quantity are required,BOM和生產量是必需的
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,老齡範圍2
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM取代
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,根據交付日期選擇項目
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,根據交付日期選擇項目
 ,Sales Analytics,銷售分析
 DocType: Manufacturing Settings,Manufacturing Settings,製造設定
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,設定電子郵件
@@ -4420,7 +4510,7 @@
 DocType: Stock Entry Detail,Stock Entry Detail,存貨分錄明細
 DocType: Products Settings,Home Page is Products,首頁是產品頁
 ,Asset Depreciation Ledger,資產減值總帳
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},稅收規範衝突{0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},稅收規範衝突{0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,新帳號名稱
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,原料供應成本
 DocType: Selling Settings,Settings for Selling Module,設置銷售模塊
@@ -4433,7 +4523,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,項{0}必須是一個缺貨登記
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,預設在製品倉庫
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,會計交易的預設設定。
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,訊息大於160個字符將會被分成多個訊息
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,請在人力資源&gt;人力資源設置中設置員工命名系統
+DocType: Restaurant,Default Tax Template,默認稅收模板
 DocType: Fees,Student Details,學生細節
 DocType: Purchase Invoice Item,Stock Qty,庫存數量
 DocType: Purchase Invoice Item,Stock Qty,庫存數量
@@ -4452,8 +4543,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,轉到項目
 DocType: Sales Partner,Partner Type,合作夥伴類型
 DocType: Purchase Taxes and Charges,Actual,實際
+DocType: Restaurant Menu,Restaurant Manager,餐廳經理
 DocType: Authorization Rule,Customerwise Discount,Customerwise折扣
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,時間表的任務。
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,時間表的任務。
 DocType: Purchase Invoice,Against Expense Account,對費用帳戶
 DocType: Production Order,Production Order,生產訂單
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,安裝注意{0}已提交
@@ -4461,7 +4553,6 @@
 DocType: Quotation Item,Against Docname,對Docname
 DocType: SMS Center,All Employee (Active),所有員工（活動）
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,立即觀看
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,選擇發票會自動生成期間
 DocType: Item Reorder,Re-Order Level,重新排序級別
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,輸入您想要提高生產訂單或下載的原材料進行分析的項目和計劃數量。
 apps/erpnext/erpnext/projects/doctype/project/project.js +64,Gantt Chart,甘特圖
@@ -4479,13 +4570,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,不甘心成功
 DocType: Request for Quotation Supplier,Download PDF,下載PDF
 DocType: Production Order,Planned End Date,計劃的結束日期
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,請輸入計劃日期
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,項目的存儲位置。
 DocType: Request for Quotation,Supplier Detail,供應商詳細
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},誤差在式或條件：{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},誤差在式或條件：{0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,發票金額
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,標準重量必須達100％
 DocType: Attendance,Attendance,出勤
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,庫存產品
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,庫存產品
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",如果未選取，則該列表將被加到每個應被應用到的部門。
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,源和目標倉庫不能相同
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +535,Posting date and posting time is mandatory,登錄日期和登錄時間是必需的
@@ -4501,6 +4593,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,在總淨
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},為屬性{0}值必須的範圍內{1}到{2}中的增量{3}為項目{4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,行目標倉庫{0}必須與生產訂單
+DocType: Restaurant Reservation,Waitlisted,輪候
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,貨幣不能使用其他貨幣進行輸入後更改
 DocType: Vehicle Service,Clutch Plate,離合器壓盤
 DocType: Company,Round Off Account,四捨五入賬戶
@@ -4516,7 +4609,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,新銷售人員的姓名
 DocType: Packing Slip,Gross Weight UOM,毛重計量單位
 DocType: Delivery Note Item,Against Sales Invoice,對銷售發票
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,請輸入序列號序列號
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,請輸入序列號序列號
 DocType: Bin,Reserved Qty for Production,預留數量生產
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在製作基於課程的組時考慮批量，請不要選中。
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在製作基於課程的組時考慮批量，請不要選中。
@@ -4528,7 +4621,7 @@
 DocType: Lab Test,Test Group,測試組
 DocType: Payment Reconciliation,Receivable / Payable Account,應收/應付賬款
 DocType: Delivery Note Item,Against Sales Order Item,對銷售訂單項目
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
 DocType: Item,Default Warehouse,預設倉庫
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},不能指定預算給群組帳目{0}
 DocType: Healthcare Settings,Patient Registration,病人登記
@@ -4555,6 +4648,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,銷售人員
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,預算和成本中心
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,不允許多種默認付款方式
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,為了
 ,Appointment Analytics,預約分析
 DocType: Lead,Blog Subscriber,網誌訂閱者
 DocType: Guardian,Alternate Number,備用號碼
@@ -4572,7 +4666,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,報價計數
 ,BOM Stock Report,BOM庫存報告
 DocType: Stock Reconciliation Item,Quantity Difference,數量差異
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,處理工資單
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,處理工資單
 DocType: Opportunity Item,Basic Rate,基礎匯率
 DocType: GL Entry,Credit Amount,信貸金額
 DocType: Cheque Print Template,Signatory Position,簽署的位置
@@ -4586,18 +4680,19 @@
 DocType: Tax Rule,Tax Rule,稅務規則
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,保持同樣的速度在整個銷售週期
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,在工作站的工作時間以外計畫時間日誌。
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,在排隊的客戶
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,醫生{0}沒有醫師時間表。將其添加到醫師大師
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,在排隊的客戶
 DocType: Student,Nationality,國籍
 ,Items To Be Requested,需求項目
-DocType: Purchase Order,Get Last Purchase Rate,取得最新採購價格
 DocType: Company,Company Info,公司資訊
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,選擇或添加新客戶
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,選擇或添加新客戶
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,成本中心需要預訂費用報銷
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),基金中的應用（資產）
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,這是基於該員工的考勤
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,出席人數
 DocType: Fiscal Year,Year Start Date,年結開始日期
 DocType: Attendance,Employee Name,員工姓名
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,餐廳訂單錄入項目
 DocType: Sales Invoice,Rounded Total (Company Currency),整數總計（公司貨幣）
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,不能隱蔽到組，因為帳戶類型選擇的。
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} 已修改。請更新。
@@ -4608,6 +4703,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,員工福利
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},盒裝數量必須等於{1}列品項{0}的數量
 DocType: Production Order,Manufactured Qty,生產數量
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,已創建發票
 DocType: Purchase Receipt Item,Accepted Quantity,允收數量
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},請設置一個默認的假日列表為員工{0}或公司{1}
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +75,Select Batch Numbers,選擇批號
@@ -4619,13 +4715,14 @@
 DocType: Quality Inspection Reading,Reading 3,閱讀3
 ,Hub,樞紐
 DocType: GL Entry,Voucher Type,憑證類型
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,價格表未找到或被禁用
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,價格表未找到或被禁用
 DocType: Lab Test,Approved,批准
 DocType: Pricing Rule,Price,價格
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',員工解除對{0}必須設定為“左”
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',員工解除對{0}必須設定為“左”
+DocType: Hub Settings,Last Sync On,上次同步開啟
 DocType: Guardian,Guardian,監護人
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,鑑定{0}為員工在給定日期範圍{1}創建
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,刪除
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,刪除
 DocType: Selling Settings,Campaign Naming By,活動命名由
 DocType: Employee,Current Address Is,當前地址是
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,每月銷售目標（
@@ -4639,7 +4736,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,課程編號：
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,請輸入您的費用帳戶
 DocType: Account,Stock,庫存
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行＃{0}：參考文件類型必須是採購訂單之一，購買發票或日記帳分錄
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行＃{0}：參考文件類型必須是採購訂單之一，購買發票或日記帳分錄
 DocType: Employee,Current Address,當前地址
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",如果項目是另一項目，然後描述，圖像，定價，稅費等會從模板中設定的一個變體，除非明確指定
 DocType: Serial No,Purchase / Manufacture Details,採購／製造詳細資訊
@@ -4666,7 +4763,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +57,Set default mode of payment,設置默認付款方式
 DocType: Hub Settings,Hub Settings,中心設定
 DocType: BOM,With Operations,加入作業
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,會計分錄已取得貨幣{0}為公司{1}。請選擇一個應收或應付賬戶幣種{0}。
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,會計分錄已取得貨幣{0}為公司{1}。請選擇一個應收或應付賬戶幣種{0}。
 DocType: Asset,Is Existing Asset,是對現有資產
 DocType: Salary Detail,Statistical Component,統計組成部分
 DocType: Salary Detail,Statistical Component,統計組成部分
@@ -4674,12 +4771,13 @@
 DocType: Purchase Invoice,Without Payment of Tax,不繳納稅款
 DocType: BOM Operation,BOM Operation,BOM的操作
 DocType: Purchase Taxes and Charges,On Previous Row Amount,在上一行金額
+DocType: Item,Has Expiry Date,有過期日期
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,項目變式設置。
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,轉讓資產
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,轉讓資產
 DocType: POS Profile,POS Profile,POS簡介
 DocType: Training Event,Event Name,事件名稱
 DocType: Physician,Phone (Office),電話（辦公室）
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,入場
+apps/erpnext/erpnext/hooks.py +147,Admission,入場
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.",季節性設置預算，目標等。
 DocType: Supplier Scorecard Scoring Variable,Variable Name,變量名
 apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",項目{0}是一個模板，請選擇它的一個變體
@@ -4688,7 +4786,7 @@
 DocType: Assessment Plan,Room,房間
 DocType: Purchase Order,Advance Paid,提前支付
 DocType: Item,Item Tax,產品稅
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,材料到供應商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,材料到供應商
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,消費稅發票
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}出現％不止一次
 DocType: Expense Claim,Employees Email Id,員工的電子郵件ID
@@ -4699,28 +4797,26 @@
 DocType: Program,Program Name,程序名稱
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,考慮稅收或收費
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,實際數量是強制性
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0}目前擁有{1}供應商記分卡，而採購訂單應謹慎提供給供應商。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0}目前擁有{1}供應商記分卡，而採購訂單應謹慎提供給供應商。
 DocType: Employee Loan,Loan Type,貸款類型
 DocType: Scheduling Tool,Scheduling Tool,調度工具
 DocType: BOM,Item to be manufactured or repacked,產品被製造或重新包裝
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,庫存交易的預設設定。
-DocType: Purchase Invoice,Next Date,下一個日期
 DocType: Employee Education,Major/Optional Subjects,大/選修課
 DocType: Sales Invoice Item,Drop Ship,直接發運給客戶
+DocType: Hub Settings,Suspended,暫停
 DocType: Training Event,Attendees,與會者
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",在這裡，您可以維護家庭的詳細訊息，如父母，配偶和子女的姓名及職業
 DocType: Academic Term,Term End Date,期限結束日期
-DocType: Hub Settings,Seller Name,賣家名稱
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),稅收和扣除（公司貨幣）
 DocType: Item Group,General Settings,一般設定
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,原始貨幣和目標貨幣不能相同
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,添加教練
 DocType: Stock Entry,Repack,重新包裝
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,在繼續之前，您必須儲存表單
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,請先選擇公司
 DocType: Item Attribute,Numeric Values,數字值
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,附加標誌
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,庫存水平
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,庫存水平
 DocType: Customer,Commission Rate,佣金比率
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,為{1}創建{0}記分卡：
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,按部門封鎖請假申請。
@@ -4734,11 +4830,13 @@
 DocType: Sales Order,Customer's Purchase Order Date,客戶的採購訂單日期
 DocType: Shopping Cart Settings,Show Public Attachments,顯示公共附件
 DocType: Packing Slip,Package Weight Details,包裝重量詳情
+DocType: Restaurant Reservation,Reservation Time,預訂時間
 DocType: Payment Gateway Account,Payment Gateway Account,網路支付閘道帳戶
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,支付完成後重定向用戶選擇的頁面。
 DocType: Company,Existing Company,現有的公司
 DocType: Healthcare Settings,Result Emailed,電子郵件結果
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",稅項類別已更改為“合計”，因為所有物品均為非庫存物品
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,項目代碼&gt;項目組&gt;品牌
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,請選擇一個csv文件
 DocType: Student Leave Application,Mark as Present,標記為現
 DocType: Supplier Scorecard,Indicator Color,指示燈顏色
@@ -4761,11 +4859,11 @@
 DocType: Supplier,Credit Days,信貸天
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,讓學生批
 DocType: Leave Type,Is Carry Forward,是弘揚
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,從物料清單取得項目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,從物料清單取得項目
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,交貨期天
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},行＃{0}：過帳日期必須是相同的購買日期{1}資產的{2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,如果學生住在學院的旅館，請檢查。
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,請在上表中輸入銷售訂單
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,請在上表中輸入銷售訂單
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,未提交工資單
 ,Stock Summary,股票摘要
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,從一個倉庫轉移資產到另一
@@ -4779,5 +4877,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},行{0}：借方條目不能與{1}連接
 DocType: Journal Entry,Subscription Section,認購科
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,帳戶{0}不存在
+DocType: Training Event,Training Program,培訓計劃
 DocType: Account,Cash,現金
 DocType: Employee,Short biography for website and other publications.,網站和其他出版物的短的傳記。
diff --git a/erpnext/translations/zh.csv b/erpnext/translations/zh.csv
index 3d0a0d1..d22cc85 100644
--- a/erpnext/translations/zh.csv
+++ b/erpnext/translations/zh.csv
@@ -1,12 +1,12 @@
 DocType: Employee,Salary Mode,薪酬模式
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +67,Register,寄存器
 DocType: Patient,Divorced,离异
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,项目已同步
-DocType: Buying Settings,Allow Item to be added multiple times in a transaction,允许项目将在一个事务中多次添加
+DocType: Buying Settings,Allow Item to be added multiple times in a transaction,允许一个交易中存在相同物料
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,取消此保修要求之前请先取消物料访问{0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,消费类产品
 DocType: Purchase Receipt,Subscription Detail,订阅细节
 DocType: Supplier Scorecard,Notify Supplier,通知供应商
-DocType: Item,Customer Items,客户项目
+DocType: Item,Customer Items,客户物料
 DocType: Project,Costing and Billing,成本核算和计费
 apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,科目{0}的上级科目{1}不能是分类账
 DocType: Item,Publish Item to hub.erpnext.com,发布项目hub.erpnext.com
@@ -17,13 +17,14 @@
 DocType: Employee,Leave Approvers,假期审批人
 DocType: Sales Partner,Dealer,经销商
 DocType: Consultation,Investigations,调查
+DocType: Restaurant Order Entry,Click Enter To Add,点击输入要添加
 DocType: Employee,Rented,租
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,适用于用户
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生产订单无法取消，首先Unstop它取消
 DocType: Vehicle Service,Mileage,里程
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,难道你真的想放弃这项资产？
-DocType: Drug Prescription,Update Schedule,更新时间表
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,难道你真的想放弃这项资产？
+DocType: Drug Prescription,Update Schedule,更新时间排程
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,选择默认供应商
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},价格表{0}需要制定货币
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,*将被计算在该交易内。
@@ -31,7 +32,6 @@
 DocType: Patient Appointment,Check availability,检查可用性
 DocType: Job Applicant,Job Applicant,求职者
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,这是基于对这种供应商的交易。详情请参阅以下时间表
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,没有更多结果。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,法律
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},实际类型税不能被包含在商品率排{0}
 DocType: Bank Guarantee,Customer,客户
@@ -41,13 +41,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),汇率必须一致{0} {1}（{2}）
 DocType: Sales Invoice,Customer Name,客户名称
 DocType: Vehicle,Natural Gas,天然气
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},银行账户不能命名为{0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},银行账户不能命名为{0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,会计分录和维护余额操作针对的组(头)
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),杰出的{0}不能小于零（ {1} ）
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),未付{0}不能小于零（ {1} ）
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,没有提交工资单要处理。
 DocType: Manufacturing Settings,Default 10 mins,默认为10分钟
 DocType: Leave Type,Leave Type Name,假期类型名称
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,公开显示
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,今天有必要采取这一行动，重复上述
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,系列已成功更新
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,查看
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural日记帐分录提交
@@ -56,13 +57,14 @@
 ,Purchase Order Items To Be Received,采购订单项目可收
 DocType: SMS Center,All Supplier Contact,所有供应商联系人
 DocType: Support Settings,Support Settings,支持设置
-apps/erpnext/erpnext/projects/doctype/project/project.py +65,Expected End Date can not be less than Expected Start Date,预计结束日期不能小于预期开始日期
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,预计结束日期不能小于预期开始日期
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：速率必须与{1}：{2}（{3} / {4}）
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,新建假期申请
 ,Batch Item Expiry Status,批处理项到期状态
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,银行汇票
 DocType: Mode of Payment Account,Mode of Payment Account,付款方式账户
 DocType: Consultation,Consultation,会诊
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,销售和退货
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,显示变体
 DocType: Academic Term,Academic Term,学期
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,材料
@@ -70,7 +72,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,账表不能为空。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),借款（负债）
 DocType: Employee Education,Year of Passing,按年排序
-DocType: Item,Country of Origin,出生国家
+DocType: Item,Country of Origin,原产国
 apps/erpnext/erpnext/templates/includes/product_page.js +24,In Stock,库存
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,开放式问题
 DocType: Production Plan Item,Production Plan Item,生产计划项目
@@ -79,9 +81,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,医疗保健
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),延迟支付（天）
 DocType: Lab Prescription,Lab Prescription,实验室处方
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,按价格排序
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,服务费用
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Serial Number: {0} is already referenced in Sales Invoice: {1},序号：{0}已在销售发票中引用：{1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +824,Invoice,发票
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},序号：{0}已在销售发票中引用：{1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,发票
 DocType: Maintenance Schedule Item,Periodicity,周期性
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,会计年度{0}是必需的
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defense
@@ -91,24 +94,24 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,行＃{0}：
 DocType: Timesheet,Total Costing Amount,总成本计算金额
 DocType: Delivery Note,Vehicle No,车辆编号
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +157,Please select Price List,请选择价格表
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,请选择价格表
 DocType: Accounts Settings,Currency Exchange Settings,货币兑换设置
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,列＃{0}：付款单据才能完成trasaction
 DocType: Production Order Operation,Work In Progress,在制品
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,请选择日期
 DocType: Employee,Holiday List,假期列表
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,请在学校设置教师命名系统&gt;学校设置
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,会计
+DocType: Hub Settings,Selling Price List,卖价格表
 DocType: Patient,Tobacco Current Use,烟草当前使用
 DocType: Cost Center,Stock User,库存用户
 DocType: Company,Phone No,电话号码
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,课程表创建：
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +182,New {0}: #{1},新{0}：#{1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},新{0}：#{1}
 ,Sales Partners Commission,销售合作伙伴佣金
 DocType: Purchase Invoice,Rounding Adjustment,舍入调整
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,缩写不能超过5个字符
 DocType: Physician Schedule Time Slot,Physician Schedule Time Slot,医师计划时间表
-DocType: Payment Request,Payment Request,付钱请求
+DocType: Payment Request,Payment Request,付款请求
 DocType: Asset,Value After Depreciation,折旧后
 DocType: Employee,O+,O +
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +18,Related,有关
@@ -124,9 +127,8 @@
 DocType: Packed Item,Parent Detail docname,家长可采用DocName细节
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",参考：{0}，商品编号：{1}和顾客：{2}
 apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,千克
-DocType: Student Log,Log,日志
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,开放的工作。
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +146,{0} Result submittted,{0}结果提交
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0}结果提交
 DocType: Item Attribute,Increment,增量
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,时间跨度
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,选择仓库...
@@ -134,40 +136,41 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同一家公司进入不止一次
 DocType: Patient,Married,已婚
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},不允许{0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,从获得项目
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,从获取物料
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},产品{0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,没有列出项目
-DocType: Payment Reconciliation,Reconcile,对账
+DocType: Payment Reconciliation,Reconcile,核消（对帐）
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,杂货
 DocType: Quality Inspection Reading,Reading 1,阅读1
 DocType: Process Payroll,Make Bank Entry,创建银行分录
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,养老基金
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,接下来折旧日期不能购买日期之前
 DocType: Consultation,Consultation Date,咨询日期
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNext用户的产品列表和发现
 DocType: SMS Center,All Sales Person,所有的销售人员
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**月度分配**帮助你分配预算/目标跨越几个月，如果你在你的业务有季节性。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1750,Not items found,未找到项目
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Salary Structure Missing,薪酬结构缺失
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,未找到项目
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,薪酬结构缺失
 DocType: Lead,Person Name,人姓名
 DocType: Sales Invoice Item,Sales Invoice Item,销售发票品目
 DocType: Account,Credit,贷方
 DocType: POS Profile,Write Off Cost Center,核销成本中心
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,"e.g. ""Primary School"" or ""University""",如“小学”或“大学”
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",如“小学”或“大学”
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,库存报告
 DocType: Warehouse,Warehouse Detail,仓库详细信息
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},客户{0} 的信用额度已经越过 {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,该期限结束日期不能晚于学年年终日期到这个词联系在一起（学年{}）。请更正日期，然后再试一次。
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",是固定资产不能被反选，因为存在资产记录的项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",是固定资产不能被反选，因为存在资产记录的项目
 DocType: Vehicle Service,Brake Oil,刹车油
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,客户&gt;客户组&gt;地区
 DocType: Tax Rule,Tax Type,税收类型
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,应税金额
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},你没有权限在{0}前添加或更改分录。
 DocType: BOM,Item Image (if not slideshow),项目图片(如果没有指定幻灯片)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,同名客户已存在
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,（小时率/ 60）*实际操作时间
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1055,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,行＃{0}：参考文档类型必须是费用索赔或日记帐分录之一
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +913,Select BOM,选择BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,行＃{0}：参考文档类型必须是费用索赔或日记帐分录之一
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,选择BOM
 DocType: SMS Log,SMS Log,短信日志
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,交付品目成本
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,在{0}这个节日之间没有从日期和结束日期
@@ -195,7 +198,7 @@
 DocType: Journal Entry Account,Employee Loan,员工贷款
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,活动日志：
 DocType: Fee Schedule,Send Payment Request Email,发送付款请求电子邮件
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +250,Item {0} does not exist in the system or has expired,项目{0}不存在于系统中或已过期
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,物料{0}不存在于系统中或已过期
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,房地产
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,对账单
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,制药
@@ -210,18 +213,23 @@
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,导入日志
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,拉根据上述标准型的制造材料要求
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,成功注销。
 DocType: Training Result Employee,Grade,年级
+DocType: Restaurant Table,No of Seats,座位数
+DocType: Subscription,"To add dynamic subject, use jinja tags like
+
+<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>",要添加动态主题，请使用jinja标签<div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>
 DocType: Sales Invoice Item,Delivered By Supplier,交付供应商
 DocType: SMS Center,All Contact,所有联系人
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Production Order already created for all items with BOM,生产订单已经与BOM的所有项目创建
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,生产订单已经与BOM的所有项目创建
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,年薪
 DocType: Daily Work Summary,Daily Work Summary,每日工作总结
 DocType: Period Closing Voucher,Closing Fiscal Year,结算财年
-apps/erpnext/erpnext/accounts/party.py +357,{0} {1} is frozen,{0} {1}已冻结
-apps/erpnext/erpnext/setup/doctype/company/company.py +136,Please select Existing Company for creating Chart of Accounts,请选择现有的公司创建会计科目表
+apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1}已冻结
+apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,请选择现有的公司创建会计科目表
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,库存费用
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,选择目标仓库
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,选择目标仓库
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,选择目标仓库
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,选择目标仓库
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,请输入首选电子邮件联系
 DocType: Program Enrollment,School Bus,校车
 DocType: Journal Entry,Contra Entry,对销分录
@@ -233,14 +241,15 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +325,Accepted + Rejected Qty must be equal to Received quantity for Item {0},已接受+已拒绝的数量必须等于条目{0}的已接收数量
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,供应原料采购
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +149,At least one mode of payment is required for POS invoice.,付款中的至少一个模式需要POS发票。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +149,At least one mode of payment is required for POS invoice.,需要为POS发票定义至少付款模式
 DocType: Products Settings,Show Products as a List,产品展示作为一个列表
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",下载此模板，填写相应的数据后上传。所有的日期和员工出勤记录将显示在模板里。
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,项目{0}处于非活动或寿命终止状态
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,物料{0}处于非活动或寿命终止状态
+DocType: Student Admission Program,Minimum Age,最低年龄
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,例如：基础数学
 apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括税款，行{0}项率，税收行{1}也必须包括在内
-apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,人力资源模块的设置
+apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,人力资源模块的设置
 DocType: SMS Center,SMS Center,短信中心
 DocType: Sales Invoice,Change Amount,涨跌额
 DocType: BOM Update Tool,New BOM,新建物料清单
@@ -250,11 +259,11 @@
 DocType: Lead,Request Type,请求类型
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,使员工
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,广播
-apps/erpnext/erpnext/utilities/user_progress.py +206,Add Rooms,添加房间
+apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),POS（在线/离线）的设置模式
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,执行
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,生产操作详情。
 DocType: Serial No,Maintenance Status,维护状态
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}：需要对供应商支付的账款{2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}：供应商对于应付账款科目来说是必输的{2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,项目和定价
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},总时间：{0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},起始日期应该在财年之内。财年起始日是{0}
@@ -273,6 +282,7 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,房产价格必须适用于购买或出售
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},项目{0}的安装日期不能早于交付日期
 DocType: Pricing Rule,Discount on Price List Rate (%),折扣价目表率（％）
+apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,生物化学
 DocType: Offer Letter,Select Terms and Conditions,选择条款和条件
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,输出值
 DocType: Production Planning Tool,Sales Orders,销售订单
@@ -307,15 +317,15 @@
 DocType: Sales Partner,Reseller,经销商
 DocType: Codification Table,Medical Code,医疗法
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.",如果选中，将包括材料要求非库存物品。
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,你不能输入行没有。大于或等于当前行没有。这种充电式
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,你不能输入行没有。大于或等于当前行没有。这种充电式
 DocType: Delivery Note Item,Against Sales Invoice Item,对销售发票项目
 ,Production Orders in Progress,在建生产订单
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,从融资净现金
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2329,"LocalStorage is full , did not save",localStorage的满了，没救
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save",localStorage的满了，没救
 DocType: Lead,Address & Contact,地址及联系方式
-DocType: Leave Allocation,Add unused leaves from previous allocations,添加未使用的叶子从以前的分配
+DocType: Leave Allocation,Add unused leaves from previous allocations,从以前的分配中添加未使用的休假
 DocType: Sales Partner,Partner website,合作伙伴网站
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,新增项目
+DocType: Restaurant Order Entry,Add Item,新增项目
 DocType: Lab Test,Custom Result,自定义结果
 apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,联系人姓名
 DocType: Course Assessment Criteria,Course Assessment Criteria,课程评价标准
@@ -328,7 +338,8 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,请求您的报价。
 DocType: Lab Test,Submitted Date,提交日期
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,这是基于对这个项目产生的考勤表
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +385,Net Pay cannot be less than 0,净工资不能低于0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,净工资不能低于0
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",要停止从系统发送重复的错误通知，我们已经在订阅中选中了“禁用”字段
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,只有选择的休假审批者可以提交此请假
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,解除日期必须大于加入的日期
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,每年叶
@@ -337,9 +348,10 @@
 DocType: Email Digest,Profit & Loss,利润损失
 apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,升
 DocType: Task,Total Costing Amount (via Time Sheet),总成本计算量（通过时间表）
+apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,请设置学生组的学生
 DocType: Item Website Specification,Item Website Specification,项目网站规格
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,已禁止请假
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} has reached its end of life on {1},项目{0}已经到达寿命终止日期{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},物料{0}已经到达寿命终止日期{1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,银行条目
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,全年
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,库存盘点品目
@@ -348,7 +360,6 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,学生组创建工具课程
 DocType: Lead,Do Not Contact,不要联系
 apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,谁在您的组织教人
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,跟踪所有周期性发票的唯一ID，提交时自动生成。
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,软件开发人员
 DocType: Item,Minimum Order Qty,最小起订量
 DocType: Pricing Rule,Supplier Type,供应商类型
@@ -358,17 +369,19 @@
 DocType: Item,Publish in Hub,在发布中心
 DocType: Student Admission,Student Admission,学生入学
 ,Terretory,区域
-apps/erpnext/erpnext/stock/doctype/item/item.py +711,Item {0} is cancelled,项目{0}已取消
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +903,Material Request,物料申请
-DocType: Bank Reconciliation,Update Clearance Date,更新清拆日期
+apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,物料{0}已取消
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,物料申请
+DocType: Bank Reconciliation,Update Clearance Date,更新清算日期
 DocType: Item,Purchase Details,购买详情
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},项目{0}未发现“原材料提供&#39;表中的采购订单{1}
 DocType: Patient Relation,Relation,关系
 DocType: Shipping Rule,Worldwide Shipping,全球航运
 DocType: Patient Relation,Mother,母亲
+DocType: Restaurant Reservation,Reservation End Time,预订结束时间
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,确认客户订单。
 DocType: Purchase Receipt Item,Rejected Quantity,拒绝数量
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +79,Payment request {0} created,已创建付款请求{0}
+apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,已创建付款请求{0}
+apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,低灵敏度
 DocType: Notification Control,Notification Control,通知控制
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,完成培训后请确认
 DocType: Lead,Suggestions,建议
@@ -386,26 +399,26 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,最高等级
 DocType: Email Digest,New Quotations,新报价
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,电子邮件工资单员工根据员工选择首选的电子邮件
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,假期审批人列表的第一个将被设为默认审批人
+DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,休假审批人列表中的第一个将被设为默认审批人
 DocType: Tax Rule,Shipping County,航运县
-apps/erpnext/erpnext/config/desktop.py +158,Learn,学习
+apps/erpnext/erpnext/config/desktop.py +159,Learn,学习
 DocType: Asset,Next Depreciation Date,接下来折旧日期
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,每个员工活动费用
 DocType: Accounts Settings,Settings for Accounts,帐户设置
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +663,Supplier Invoice No exists in Purchase Invoice {0},供应商发票不存在采购发票{0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,管理销售人员。
 DocType: Job Applicant,Cover Letter,求职信
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,杰出的支票及存款清除
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,待清帐支票及存款
 DocType: Item,Synced With Hub,与Hub同步
 DocType: Vehicle,Fleet Manager,车队经理
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},行＃{0}：{1}不能为负值对项{2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +80,Wrong Password,密码错误
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,密码错误
 DocType: Item,Variant Of,变体自
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',完成数量不能大于“生产数量”
 DocType: Period Closing Voucher,Closing Account Head,结算帐户头
 DocType: Employee,External Work History,外部就职经历
 DocType: Physician,Time per Appointment,每任命时间
-apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,循环引用错误
+apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,循环引用错误
 DocType: Appointment Type,Is Inpatient,住院病人
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1名称
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,大写金额（出口）将在送货单保存后显示。
@@ -414,19 +427,18 @@
 DocType: Lead,Industry,行业
 DocType: Employee,Job Profile,工作简介
 DocType: BOM Item,Rate & Amount,价格和金额
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请通过设置&gt;编号系列设置出席人数编号
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,这是基于对本公司的交易。有关详情，请参阅下面的时间表
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,自动创建物料申请时通过邮件通知
+apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,耐
 DocType: Journal Entry,Multi Currency,多币种
 DocType: Payment Reconciliation Invoice,Invoice Type,发票类型
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,客户&gt;客户群&gt;地区
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,送货单
 DocType: Consultation,Encounter Impression,遇到印象
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,建立税
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,出售资产的成本
-apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,付款项被修改，你把它之后。请重新拉。
-apps/erpnext/erpnext/stock/doctype/item/item.py +437,{0} entered twice in Item Tax,{0}输入了两次税项
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,本周和待活动总结
+apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,获取付款记录后有修改，请重获取。
+apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0}输入了两次税项
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,本周和待活动总结
 DocType: Student Applicant,Admitted,录取
 DocType: Workstation,Rent Cost,租金成本
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,折旧金额后
@@ -437,40 +449,39 @@
 DocType: Supplier Scorecard,Scoring Standings,得分排名
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,订单价值
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,订单价值
-apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,银行/现金对一方或内部转让交易
+apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,针对往来单位或内部转帐的银行/现金交易
 DocType: Shipping Rule,Valid for Countries,有效的国家
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,这个项目是一个模板，并且可以在交易不能使用。项目的属性将被复制到变型，除非“不复制”设置
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,总订货考虑
-apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",雇员指派(例如总裁，总监等) 。
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,总订货
+apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).",雇员职位(例如总裁，总监等) 。
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,客户货币转换为客户的基础货币后的单价
 DocType: Course Scheduling Tool,Course Scheduling Tool,排课工具
 apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行＃{0}：采购发票不能对现有资产进行{1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +189,[Urgent] Error while creating recurring %s for %s,[紧急]为％s创建循环％s时出错
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[紧急]为％s创建循环％s时出错
 DocType: Item Tax,Tax Rate,税率
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0}已分配给员工{1}的时期{2}到{3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +870,Select Item,选择项目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,选择项目
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,采购发票{0}已经提交
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},行＃{0}：批号必须与{1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,转换为非集团
 apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,产品批次(patch)/批(lot)。
 DocType: C-Form Invoice Detail,Invoice Date,发票日期
 DocType: GL Entry,Debit Amount,借方金额
-apps/erpnext/erpnext/accounts/party.py +246,There can only be 1 Account per Company in {0} {1},只能有每公司1帐户{0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +402,Please see attachment,请参阅附件
+apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},只能有每公司1帐户{0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,请参阅附件
 DocType: Purchase Order,% Received,％已收货
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,创建挺起胸
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,安装已经完成！
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,安装已经完成！
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,信用额度
 DocType: Setup Progress Action,Action Document,行动文件
 ,Finished Goods,成品
 DocType: Delivery Note,Instructions,说明
 DocType: Quality Inspection,Inspected By,验货人
 DocType: Maintenance Visit,Maintenance Type,维护类型
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,{0} - {1} is not enrolled in the Course {2},{0}  -  {1}未加入课程{2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,商品编号&gt;商品组&gt;品牌
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0}  -  {1}未加入课程{2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},序列号{0}不属于送货单{1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext演示
-apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,添加项目
+apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,添加项目
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,项目质量检验参数
 DocType: Leave Application,Leave Approver Name,假期审批人姓名
 DocType: Depreciation Schedule,Schedule Date,计划任务日期
@@ -492,10 +503,10 @@
 DocType: Salary Slip Timesheet,Working Hours,工作时间
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,更改现有系列的起始/当前序列号。
 DocType: Dosage Strength,Strength,强度
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Create a new Customer,创建一个新的客户
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,创建一个新的客户
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",如果几条价格规则同时使用，系统将提醒用户设置优先级。
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,创建采购订单
-,Purchase Register,购买注册
+,Purchase Register,采购台帐
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,适用费用
 DocType: Workstation,Consumable Cost,耗材成本
@@ -504,14 +515,14 @@
 DocType: Student Log,Medical,医药
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,原因丢失
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,铅所有者不能等同于铅
-apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,分配的金额不能超过未调整的量更大
+apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,已核销金额不能超过未调整金额
 DocType: Announcement,Receiver,接收器
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},工作站在以下假期关闭：{0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,机会
 DocType: Lab Test Template,Single,单身
 DocType: Salary Slip,Total Loan Repayment,总贷款还款
 DocType: Account,Cost of Goods Sold,销货成本
-DocType: Purchase Invoice,Yearly,每年
+DocType: Subscription,Yearly,每年
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,请输入成本中心
 DocType: Drug Prescription,Dosage,剂量
 DocType: Journal Entry Account,Sales Order,销售订单
@@ -542,7 +553,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,所有生产流程的全局设置。
 DocType: Accounts Settings,Accounts Frozen Upto,账户被冻结到...为止
 DocType: SMS Log,Sent On,发送日期
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
 DocType: HR Settings,Employee record is created using selected field. ,使用所选字段创建员工记录。
 DocType: Sales Order,Not Applicable,不适用
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,假期大师
@@ -565,16 +576,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,证券及存款
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",不能改变估值方法，因为有一些项目没有自己的估值方法的交易
 apps/erpnext/erpnext/config/healthcare.py +133,Test Sample Master.,测试样品师。
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,总叶分配是必须的
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,请填写总已核销休假
 DocType: Patient,AB Positive,AB积极
 DocType: Job Opening,Description of a Job Opening,空缺职位的说明
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,今天待定活动
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,今天待定活动
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,考勤记录。
 DocType: Salary Structure,Salary Component for timesheet based payroll.,薪酬部分基于时间表工资。
 DocType: Sales Order Item,Used for Production Plan,用于生产计划
 DocType: Employee Loan,Total Payment,总付款
 DocType: Manufacturing Settings,Time Between Operations (in mins),时间操作之间（以分钟）
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1}被取消，因此无法完成操作
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +129,{0} {1} is cancelled so the action cannot be completed,{0} {1}被取消，因此无法完成操作
 DocType: Customer,Buyer of Goods and Services.,产品和服务购买者。
 DocType: Journal Entry,Accounts Payable,应付帐款
 DocType: Patient,Allergies,过敏
@@ -586,23 +597,24 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,警告采购订单
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,列出一些你的客户，他们可以是组织或个人。
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,足够的配件组装
+DocType: POS Profile User,POS Profile User,POS配置文件用户
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,直接收益
 DocType: Patient Appointment,Date TIme,约会时间
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",按科目分类后不能根据科目过滤
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,行政主任
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,请选择课程
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,请选择课程
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,请选择课程
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,请选择课程
 DocType: Codification Table,Codification Table,编纂表
 DocType: Timesheet Detail,Hrs,小时
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,请选择公司
 DocType: Stock Entry Detail,Difference Account,差异科目
 DocType: Purchase Invoice,Supplier GSTIN,供应商GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,不能因为其依赖的任务{0}没有关闭关闭任务。
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +434,Please enter Warehouse for which Material Request will be raised,请重新拉。
+apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,不能因为其依赖的任务{0}没有关闭关闭任务。
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,请重新拉。
 DocType: Production Order,Additional Operating Cost,额外的运营成本
 DocType: Lab Test Template,Lab Routine,实验室常规
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,化妆品
-apps/erpnext/erpnext/stock/doctype/item/item.py +534,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
 DocType: Shipping Rule,Net Weight,净重
 DocType: Employee,Emergency Phone,紧急电话
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,购买
@@ -612,8 +624,9 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,请定义等级为阈值0％
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,请定义等级为阈值0％
 DocType: Sales Order,To Deliver,为了提供
-DocType: Purchase Invoice Item,Item,产品
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2501,Serial no item cannot be a fraction,序号项目不能是一个分数
+DocType: Purchase Invoice Item,Item,物料
+apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,高灵敏度
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,序号项目不能是一个分数
 DocType: Journal Entry,Difference (Dr - Cr),差异(贷方-借方)
 DocType: Account,Profit and Loss,损益
 DocType: Patient,Risk Factors,风险因素
@@ -622,7 +635,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,管理转包
 DocType: Vital Signs,Body Temperature,体温
 DocType: Project,Project will be accessible on the website to these users,项目将在网站向这些用户上访问
-apps/erpnext/erpnext/config/projects.py +23,Define Project type.,定义项目类型。
+apps/erpnext/erpnext/config/projects.py +24,Define Project type.,定义项目类型。
 DocType: Supplier Scorecard,Weighting Function,加权函数
 DocType: Physician,OP Consulting Charge,OP咨询费
 apps/erpnext/erpnext/utilities/user_progress.py +25,Setup your ,设置你的
@@ -630,13 +643,13 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +62,Account {0} does not belong to company: {1},科目{0}不属于公司：{1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +51,Abbreviation already used for another company,缩写已用于另一家公司
 DocType: Selling Settings,Default Customer Group,默认客户群组
-DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",如果禁用，“舍入总计”字段将不在交易中显示
+DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",如果禁用，“元整后金额”字段将不在任何交易中显示
 DocType: BOM,Operating Cost,营业成本
 DocType: Sales Order Item,Gross Profit,毛利
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,增量不能为0
 DocType: Production Planning Tool,Material Requirement,物料需求
 DocType: Company,Delete Company Transactions,删除公司事务
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +345,Reference No and Reference Date is mandatory for Bank transaction,参考编号和参考日期是强制性的银行交易
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,参考编号和参考日期是强制性的银行交易
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,添加/编辑税金及费用
 DocType: Payment Entry Reference,Supplier Invoice No,供应商发票编号
 DocType: Territory,For reference,供参考
@@ -644,23 +657,23 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions",无法删除序列号{0}，因为它采用的是现货交易
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),结算(信用)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,你好
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,移动项目
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,移动项目
 DocType: Serial No,Warranty Period (Days),保修期限（天数）
 DocType: Installation Note Item,Installation Note Item,安装单项目
 DocType: Production Plan Item,Pending Qty,待定数量
 DocType: Budget,Ignore,忽略
-apps/erpnext/erpnext/accounts/party.py +361,{0} {1} is not active,{0} {1} 未激活
+apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} 未激活
 apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,设置检查尺寸打印
 DocType: Salary Slip,Salary Slip Timesheet,工资单时间表
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,外包采购收据必须指定供应商仓库
 DocType: Pricing Rule,Valid From,有效期自
-DocType: Sales Invoice,Total Commission,总委员会
+DocType: Sales Invoice,Total Commission,总佣金
 DocType: Pricing Rule,Sales Partner,销售合作伙伴
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,所有供应商记分卡。
 DocType: Buying Settings,Purchase Receipt Required,外购入库单要求
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,估价费用是强制性的，如果打开股票进入
+apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,估价费用是强制性的，如果打开股票进入
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,没有在发票表中找到记录
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,请选择公司和党的第一型
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,请先选择公司和往来单位类型
 apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,财务/会计年度。
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,累积值
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged",抱歉，序列号无法合并
@@ -690,12 +703,12 @@
 DocType: Item,Delivered by Supplier (Drop Ship),由供应商交货（直接发运）
 DocType: Healthcare Settings,Confirmation Message,确认讯息
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,潜在客户数据库。
-DocType: Authorization Rule,Customer or Item,客户或项目
+DocType: Authorization Rule,Customer or Item,客户或物料
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,客户数据库。
 DocType: Quotation,Quotation To,报价对象
 DocType: Lead,Middle Income,中等收入
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),开幕（CR ）
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,测度项目的默认单位{0}不能直接改变，因为你已经做了一些交易（S）与其他计量单位。您将需要创建一个新的项目，以使用不同的默认计量单位。
+apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,因为该物料已经有使用别的计量单位的交易记录存在了，不再允许直接修改其默认单位{0}了。如果需要请创建一个新物料，以使用不同的默认计量单位。
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,调配数量不能为负
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,请设定公司
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,请设定公司
@@ -710,6 +723,7 @@
 DocType: Process Payroll,Select Payment Account to make Bank Entry,选择付款账户，使银行进入
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll",建立员工档案管理叶，报销和工资
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,处方期
+DocType: Restaurant Reservation,Restaurant Reservation,餐厅预订
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,提案写作
 DocType: Payment Entry Deduction,Payment Entry Deduction,输入付款扣除
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,另外销售人员{0}存在具有相同员工ID
@@ -717,7 +731,7 @@
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,主数据
 DocType: Assessment Plan,Maximum Assessment Score,最大考核评分
 apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,更新银行交易日期
-apps/erpnext/erpnext/config/projects.py +35,Time Tracking,时间跟踪
+apps/erpnext/erpnext/config/projects.py +36,Time Tracking,时间跟踪
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,输送机重复
 DocType: Fiscal Year Company,Fiscal Year Company,公司财政年度
 DocType: Packing Slip Item,DN Detail,送货单详情
@@ -725,8 +739,9 @@
 DocType: Timesheet,Billed,已开票
 DocType: Batch,Batch Description,批次说明
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,创建学生组
-apps/erpnext/erpnext/accounts/utils.py +723,"Payment Gateway Account not created, please create one manually.",支付网关帐户没有创建，请手动创建一个。
+apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.",支付网关帐户没有创建，请手动创建一个。
 DocType: Supplier Scorecard,Per Year,每年
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,按照DOB的规定，没有资格参加本计划
 DocType: Sales Invoice,Sales Taxes and Charges,销售税费
 DocType: Employee,Organization Profile,组织简介
 DocType: Vital Signs,Height (In Meter),身高（米）
@@ -752,7 +767,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,与关系Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +120,Manager,经理
 DocType: Payment Entry,Payment From / To,支付自/至
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +127,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新的信用额度小于当前余额为客户着想。信用额度是ATLEAST {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +127,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新的信用额度小于该客户未付总额。信用额度至少应该是 {0}
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,“根据”和“分组依据”不能相同
 DocType: Sales Person,Sales Person Targets,销售人员目标
 DocType: Installation Note,IN-,在-
@@ -762,7 +777,7 @@
 DocType: Student Batch Name,Batch Name,批名
 DocType: Fee Validity,Max number of visit,最大访问次数
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,创建时间表：
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +907,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,注册
 DocType: GST Settings,GST Settings,GST设置
 DocType: Selling Settings,Customer Naming By,客户命名方式
@@ -789,21 +804,21 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +211,Opening (Dr),开幕（博士）
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},发布时间标记必须经过{0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,复制文件
-,GST Itemised Purchase Register,GST成品采购登记册
+,GST Itemised Purchase Register,GST物料明细台帐
 DocType: Employee Loan,Total Interest Payable,合计应付利息
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,到岸成本税费
 DocType: Production Order Operation,Actual Start Time,实际开始时间
 DocType: BOM Operation,Operation Time,操作时间
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +285,Finish,完
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,完
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,基础
 DocType: Timesheet,Total Billed Hours,帐单总时间
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1187,Write Off Amount,核销金额
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,核销金额
 DocType: Leave Block List Allow,Allow User,允许用户
 DocType: Journal Entry,Bill No,账单编号
 DocType: Company,Gain/Loss Account on Asset Disposal,在资产处置收益/损失帐户
 DocType: Vehicle Log,Service Details,服务细节
 DocType: Vehicle Log,Service Details,服务细节
-DocType: Purchase Invoice,Quarterly,季度
+DocType: Subscription,Quarterly,季度
 DocType: Lab Test Template,Grouped,分组
 DocType: Selling Settings,Delivery Note Required,送货单是必须项
 DocType: Bank Guarantee,Bank Guarantee Number,银行担保编号
@@ -812,44 +827,46 @@
 DocType: BOM Item,Basic Rate (Company Currency),基础利率（公司货币）
 DocType: Student Attendance,Student Attendance,学生出勤
 DocType: Sales Invoice Timesheet,Time Sheet,时间表
-DocType: Manufacturing Settings,Backflush Raw Materials Based On,反吹为原材料的开
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +84,Please enter item details,请输入项目细节
+DocType: Manufacturing Settings,Backflush Raw Materials Based On,基于..进行原物料倒扣账
 DocType: Interest,Interest,利益
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,售前
 DocType: Purchase Receipt,Other Details,其他详细信息
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,测试模板
+DocType: Restaurant Order Entry Item,Served,曾任
 DocType: Account,Accounts,会计
 DocType: Vehicle,Odometer Value (Last),里程表值（最后）
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,供应商计分卡标准模板。
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Marketing,市场营销
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +290,Payment Entry is already created,已创建付款输入
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +290,Payment Entry is already created,付款记录已创建
 DocType: Request for Quotation,Get Suppliers,获取供应商
 DocType: Purchase Receipt Item Supplied,Current Stock,当前库存
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} does not linked to Item {2},行＃{0}：资产{1}不挂项目{2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,预览工资单
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,帐户{0}已多次输入
 DocType: Account,Expenses Included In Valuation,开支计入估值
-DocType: Hub Settings,Seller City,卖家城市
 ,Absent Student Report,缺席学生报告
 DocType: Email Digest,Next email will be sent on:,下次邮件发送时间：
-DocType: Offer Letter Term,Offer Letter Term,报价函期限
+DocType: Offer Letter Term,Offer Letter Term,录取通知条款
 DocType: Supplier Scorecard,Per Week,每个星期
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Item has variants.,项目有变体。
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,项目有变体。
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,学生总数
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,项目{0}未找到
 DocType: Bin,Stock Value,库存值
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,费用记录将在后台创建。如果有任何错误，错误信息将在附表中更新。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,公司{0}不存在
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +37,{0} has fee validity till {1},{0}有效期至{1}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0}有效期至{1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,树类型
 DocType: BOM Explosion Item,Qty Consumed Per Unit,每单位消耗数量
 DocType: Serial No,Warranty Expiry Date,保修到期日
 DocType: Material Request Item,Quantity and Warehouse,数量和仓库
+DocType: Hub Settings,Unregister,注销
 DocType: Sales Invoice,Commission Rate (%),佣金率（％）
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,请选择程序
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +23,Please select Program,请选择程序
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,请选择程序
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,请选择程序
 DocType: Project,Estimated Cost,估计成本
 DocType: Purchase Order,Link to material requests,链接到材料请求
+DocType: Hub Settings,Publish,发布
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,航天
 DocType: Journal Entry,Credit Card Entry,信用卡分录
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,公司与账户
@@ -860,20 +877,19 @@
 DocType: Selling Settings,Close Opportunity After Days,关闭机会后日
 ,Reserved,保留的
 DocType: Purchase Order,Supply Raw Materials,供应原料
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,下一次发票生成的日期，提交时将会生成。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,流动资产
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0}不是一个库存品目
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',请通过点击“培训反馈”，然后点击“新建”
 DocType: Mode of Payment Account,Default Account,默认帐户
 DocType: Payment Entry,Received Amount (Company Currency),收到的款项（公司币种）
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +174,Lead must be set if Opportunity is made from Lead,如果商机的来源是“线索”的话，必须指定线索
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,如果商机的来源是“线索”的话，必须指定线索
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,请选择每周休息日
 DocType: Patient,O Negative,O负面
 DocType: Production Order Operation,Planned End Time,计划结束时间
 ,Sales Person Target Variance Item Group-Wise,品目组特定的销售人员目标差异
 apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,有交易的科目不能被转换为分类账
 DocType: Delivery Note,Customer's Purchase Order No,客户的采购订单号
-DocType: Budget,Budget Against,反对财政预算案
+DocType: Budget,Budget Against,预算对象
 DocType: Employee,Cell Number,手机号码
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,汽车材料的要求生成
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,丧失
@@ -882,10 +898,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,能源
 DocType: Opportunity,Opportunity From,从机会
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,月度工资结算
-apps/erpnext/erpnext/utilities/user_progress.py +23,Add Company,添加公司
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +875,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}：{1}项目{2}所需的序列号。你已经提供{3}。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}：{1}项目{2}所需的序列号。你已经提供{3}。
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,请选择一张桌子
 DocType: BOM,Website Specifications,网站规格
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +59,{0} is an invalid email address in 'Recipients',{0}是“收件人”中的无效电子邮件地址
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0}是“收件人”中的无效电子邮件地址
 DocType: Special Test Items,Particulars,细节
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,抗生素。
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}：申请者{0} 假期类型{1}
@@ -893,11 +909,11 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,行{0}：转换系数是强制性的
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海报价格规则，同样的标准存在，请分配优先级解决冲突。价格规则：{0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,Cannot deactivate or cancel BOM as it is linked with other BOMs,无法停用或取消BOM，因为它被其他BOM引用。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,无法停用或取消BOM，因为它被其他BOM引用。
 DocType: Opportunity,Maintenance,维护
 DocType: Item Attribute Value,Item Attribute Value,项目属性值
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,销售活动。
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,制作时间表
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,制作时间表
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -917,18 +933,18 @@
 6. Amount: Tax amount.
 7. Total: Cumulative total to this point.
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
-9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","可应用到所有销售交易中的标准税项模板。此模板可以包含多个税项及其他的开支/收益项(例如“运费”，“保险费”，“处理费”等)。
-###需要注意的是，这里指定的是所有品目的标准税费率。如果品目存在不同的税费率，你必须在“品目大师”内的“品目税项”内添加。
+9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","标准税项模板可应用到所有销售交易中。此模板可以包含多个税项及其他的开支/收益项(例如“运费”，“保险费”，“处理费”等)。
+###需要注意的是，这里指定的是适用于整张单据所有物料的标准税费率。如果某些物料的税费率与这里指定的标准税费率，则您必须在“物料主数据”内的“物料税项”内添加。
 ####列说明
 1. 计算类型：-“净总计”(即基本总额)；-“基于前一行的总计/金额”(用于累计税费率)，选择此项则税费将基于前一行的总计/金额按百分比计算；-“实际”(按实际输入)。
-2. 账户头： 此税费对应的会计分类帐。
+2. 科目： 此税费对应的会计分类帐。
 3. 成本中心： 如果此税费为收益或支出，那么必须指定一个成本中心。
 4. 说明：税费项的说明，会被用于如发票/报价的打印中。
 5. 税率：税项的比率
 6. 金额：税项金额
 7. 总计：到这里为止的累计
 8. 输入行： 如果选择了“基于前一行的总计/金额”，你可以选择此税项基于的行数(默认为前一行)。
-9. 基本税率是否包含此税费？：勾选此项则意味着此税项不会显示在品目表下，但会出现在品目主表的标注费率内。如果你需要向客户提供一个统一售价(即包含所有税费)，这个选项会很有用。"
+9. 价内税？：勾选此项则意味着此税项不会再单独出现在销售订单物料明细清单下方，此税费率会体现再物料售价中。如果您需要向客户提供打包价而不是明细价格(即包含所有税费)，此选项就会很有用。"
 DocType: Employee,Bank A/C No.,银行账号
 DocType: Bank Guarantee,Project,项目
 DocType: Quality Inspection Reading,Reading 7,阅读7
@@ -946,20 +962,22 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,没有客户或供应商帐户发现。账户是根据\确定
 DocType: Account,Liability,负债
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金额不能大于索赔额行{0}。
-DocType: Company,Default Cost of Goods Sold Account,销货账户的默认成本
-apps/erpnext/erpnext/stock/get_item_details.py +310,Price List not selected,价格列表没有选择
+DocType: Salary Detail,Do not include in total,不包括在内
+DocType: Company,Default Cost of Goods Sold Account,默认销货成本科目
+apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,价格列表没有选择
 DocType: Employee,Family Background,家庭背景
 DocType: Request for Quotation Supplier,Send Email,发送电子邮件
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},警告：无效的附件{0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,无此权限
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},警告：无效的附件{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,无此权限
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,引用要求
 DocType: Vital Signs,Heart Rate / Pulse,心率/脉搏
 DocType: Company,Default Bank Account,默认银行账户
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",要根据党的筛选，选择党第一类型
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",如果基于往来单位过滤，请先选择往来单位类型
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},“库存更新'校验不通过，因为{0}中的退货条目未交付
 DocType: Vehicle,Acquisition Date,采集日期
 apps/erpnext/erpnext/utilities/user_progress.py +125,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,具有较高权重的项目将显示更高的可
-DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,银行对帐详细
+DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,银行对帐明细
 apps/erpnext/erpnext/controllers/accounts_controller.py +549,Row #{0}: Asset {1} must be submitted,行＃{0}：资产{1}必须提交
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,未找到任何雇员
 DocType: Subscription,Stopped,已停止
@@ -979,12 +997,11 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,项目行{idx}: {文档类型}上不存在'{文档类型}'表
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,时间表{0}已完成或取消
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,没有任务
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",每月自动生成发票的日期，例如5号，28号等
 DocType: Item Variant Settings,Copy Fields to Variant,将字段复制到变式
 DocType: Asset,Opening Accumulated Depreciation,打开累计折旧
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,得分必须小于或等于5
 DocType: Program Enrollment Tool,Program Enrollment Tool,计划注册工具
-apps/erpnext/erpnext/config/accounts.py +338,C-Form records,C-表记录
+apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C-表记录
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,客户和供应商
 DocType: Email Digest,Email Digest Settings,邮件摘要设置
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,感谢您的业务！
@@ -1002,13 +1019,13 @@
 DocType: Request for Quotation Supplier,Quote Status,报价状态
 DocType: Maintenance Visit,Completion Status,完成状态
 DocType: HR Settings,Enter retirement age in years,在年内进入退休年龄
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,目标仓库
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +108,Please select a warehouse,请选择一个仓库
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,目标仓库
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,请选择一个仓库
 DocType: Cheque Print Template,Starting location from left edge,从左边起始位置
 DocType: Item,Allow over delivery or receipt upto this percent,允许在交付或接收高达百分之这
 DocType: Stock Entry,STE-,甜菊
 DocType: Upload Attendance,Import Attendance,导入考勤记录
-apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,所有品目群组
+apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,所有品目群组
 DocType: Process Payroll,Activity Log,活动日志
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,净利润/亏损
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,在提交交易时自动编写信息。
@@ -1020,7 +1037,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,预计数量
 DocType: Sales Invoice,Payment Due Date,付款到期日
 DocType: Drug Prescription,Interval UOM,间隔UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +355,Item Variant {0} already exists with same attributes,项目变体{0}已经具有相同属性的存在
+apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,项目变体{0}已经具有相同属性的存在
+DocType: Item,Hub Publishing Details,Hub发布细节
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',“打开”
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,开做
 DocType: Notification Control,Delivery Note Message,送货单留言
@@ -1031,20 +1049,21 @@
 DocType: Process Payroll,Bimonthly,半月刊
 DocType: Vehicle Service,Brake Pad,刹车片
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Research & Development,研究与发展
-apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,帐单数额
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,待开票金额
 DocType: Company,Registration Details,报名详情
 DocType: Timesheet,Total Billed Amount,总开单金额
 DocType: Item Reorder,Re-Order Qty,再次订货数量
 DocType: Leave Block List Date,Leave Block List Date,禁离日日期
 DocType: Pricing Rule,Price or Discount,价格或折扣
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,物料清单＃{0}：原始材料与主要项目不能相同
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,物料清单＃{0}：原始材料不能是BOM产出物料
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,在外购入库单项目表总的相关费用必须是相同的总税费
 DocType: Sales Team,Incentives,奖励
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,注册Hub
 DocType: SMS Log,Requested Numbers,请求号码
 DocType: Production Planning Tool,Only Obtain Raw Materials,只有取得原料
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,绩效考核。
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +96,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",作为启用的购物车已启用“使用购物车”，而应该有购物车至少有一个税务规则
-apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",付款输入{0}对订单{1}，检查它是否应该被拉到作为预先在该发票联。
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",作为启用的购物车已启用“使用购物车”，而应该有购物车至少有一个税务规则
+apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",付款记录{0}已关联到订单{1}，请看看是否可以作为预付款关联到本发票。
 DocType: Sales Invoice Item,Stock Details,库存详细信息
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,项目价值
 apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,销售点
@@ -1062,12 +1081,14 @@
 DocType: Salary Slip,Working Days,工作日
 DocType: Serial No,Incoming Rate,入库价格
 DocType: Packing Slip,Gross Weight,毛重
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,The name of your company for which you are setting up this system.,贵公司的名称
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,启用集线器
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,贵公司的名称
 DocType: HR Settings,Include holidays in Total no. of Working Days,将假期包含在工作日内
 DocType: Job Applicant,Hold,持有
 DocType: Employee,Date of Joining,入职日期
 DocType: Naming Series,Update Series,更新系列
 DocType: Supplier Quotation,Is Subcontracted,是否外包
+DocType: Restaurant Table,Minimum Seating,最小的座位
 DocType: Item Attribute,Item Attribute Values,项目属性值
 DocType: Examination Result,Examination Result,考试成绩
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,外购入库单
@@ -1075,16 +1096,16 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Submitted Salary Slips,提交工资单
 apps/erpnext/erpnext/config/accounts.py +311,Currency exchange rate master.,货币汇率大师
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +198,Reference Doctype must be one of {0},参考文档类型必须是一个{0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},找不到时隙在未来{0}天操作{1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},在未来{0}天操作{1}无可用时间（档期）
 DocType: Production Order,Plan material for sub-assemblies,计划材料为子组件
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,销售合作伙伴和地区
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +575,BOM {0} must be active,BOM{0}处于非活动状态
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,BOM{0}必须处于激活状态
 DocType: Journal Entry,Depreciation Entry,折旧分录
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,请选择文档类型第一
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,取消此上门保养之前请先取消物料访问{0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},序列号{0}不属于品目{1}
 DocType: Purchase Receipt Item Supplied,Required Qty,所需数量
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,与现有的交易仓库不能转换到总帐。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,与现有的交易仓库不能转换到总帐。
 DocType: Bank Reconciliation,Total Amount,总金额
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,互联网出版
 DocType: Prescription Duration,Number,数
@@ -1095,7 +1116,6 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,销售价格表
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.",如果选中，将创建一个客户，映射到患者。将针对该客户创建病人发票。您也可以在创建患者时选择现有客户。
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,发布同步项目
 DocType: Bank Reconciliation,Account Currency,账户币种
 DocType: Lab Test,Sample ID,样品编号
 apps/erpnext/erpnext/accounts/general_ledger.py +165,Please mention Round Off Account in Company,请注明舍入账户的公司
@@ -1104,11 +1124,12 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,雇员{0}非活动或不存在
 DocType: Fee Structure,Components,组件
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},请输入项目资产类别{0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +627,Item Variants {0} updated,项目变体{0}已更新
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,项目变体{0}已更新
 DocType: Quality Inspection Reading,Reading 6,阅读6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +928,Cannot {0} {1} {2} without any negative outstanding invoice,无法{0} {1} {2}没有任何负面的优秀发票
-DocType: Purchase Invoice Advance,Purchase Invoice Advance,购买发票提前
-DocType: Hub Settings,Sync Now,立即同步
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
+of this",被生成。如果延迟，您将不得不手动更改“每月重复”字段
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,没有未付发票（负数），无法{0} {1} {2}
+DocType: Purchase Invoice Advance,Purchase Invoice Advance,购买发票
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},行{0}：信用记录无法被链接的{1}
 apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,定义预算财政年度。
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,选择此模式时POS发票的银行/现金账户将会被自动更新。
@@ -1117,21 +1138,21 @@
 DocType: Production Order Operation,Operation completed for how many finished goods?,操作完成多少成品？
 apps/erpnext/erpnext/public/js/setup_wizard.js +47,The Brand,你的品牌
 DocType: Employee,Exit Interview Details,退出面试细节
-DocType: Item,Is Purchase Item,是否采购项目
-DocType: Asset,Purchase Invoice,购买发票
+DocType: Item,Is Purchase Item,可采购？
+DocType: Asset,Purchase Invoice,采购发票
 DocType: Stock Ledger Entry,Voucher Detail No,凭证详情编号
-apps/erpnext/erpnext/accounts/page/pos/pos.js +759,New Sales Invoice,新的销售发票
-DocType: Stock Entry,Total Outgoing Value,即将离任的总价值
+apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,新的销售发票
+DocType: Stock Entry,Total Outgoing Value,总待付款价值
 DocType: Physician,Appointments,约会
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,开幕日期和截止日期应在同一会计年度
 DocType: Lead,Request for Information,索取资料
 ,LeaderBoard,排行榜
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,Sync Offline Invoices,同步离线发票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,同步离线发票
 DocType: Payment Request,Paid,付费
 DocType: Program Fee,Program Fee,课程费用
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
 It also updates latest price in all the BOMs.",替换使用所有其他BOM的特定BOM。它将替换旧的BOM链接，更新成本，并按照新的BOM重新生成“BOM爆炸项目”表。它还更新了所有BOM中的最新价格。
-DocType: Salary Slip,Total in words,总字
+DocType: Salary Slip,Total in words,总金额（文字）
 DocType: Material Request Item,Lead Time Date,交货时间日期
 DocType: Guardian,Guardian Name,监护人姓名
 DocType: Cheque Print Template,Has Print Format,拥有打印格式
@@ -1145,13 +1166,14 @@
 DocType: Purchase Invoice Item,Purchase Order Item,采购订单项目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,间接收益
 DocType: Student Attendance Tool,Student Attendance Tool,学生考勤工具
+DocType: Restaurant Menu,Price List (Auto created),价目表（自动创建）
 DocType: Cheque Print Template,Date Settings,日期设定
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,方差
 ,Company Name,公司名称
 DocType: SMS Center,Total Message(s),总信息（s ）
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Select Item for Transfer,对于转让项目选择
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,对于转让项目选择
 DocType: Purchase Invoice,Additional Discount Percentage,额外折扣百分比
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,查看所有帮助影片名单
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,查看所有帮助视频清单
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,请选择支票存入的银行账户头。
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,允许用户编辑交易中的价目表率。
 DocType: Pricing Rule,Max Qty,最大数量
@@ -1167,27 +1189,29 @@
 apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,仪表
 DocType: Workstation,Electricity Cost,电力成本
 DocType: HR Settings,Don't send Employee Birthday Reminders,不要发送员工生日提醒
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,保存设置
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,请求的产品
 DocType: Item,Inspection Criteria,检验标准
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,转移
 DocType: BOM Website Item,BOM Website Item,BOM网站项目
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,Upload your letter head and logo. (you can edit them later).,上传你的信头和logo。(您可以在以后对其进行编辑）。
-DocType: Timesheet Detail,Bill,法案
+DocType: Timesheet Detail,Bill,账单
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,接下来折旧日期输入为过去的日期
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +204,White,白
 DocType: SMS Center,All Lead (Open),所有潜在客户（开放）
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),行{0}：数量不适用于{4}在仓库{1}在发布条目的时间（{2} {3}）
 DocType: Purchase Invoice,Get Advances Paid,获取已付预付款
 DocType: Item,Automatically Create New Batch,自动创建新批
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Make ,使
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Make ,生成
 DocType: Student Admission,Admission Start Date,入学开始日期
 DocType: Journal Entry,Total Amount in Words,总金额词
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,发生了错误，一个可能的原因可能是您没有保存表单。如果问题仍然存在请联系管理员或support@erpnext.com。
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,我的购物车
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},订单类型必须是一个{0}
+apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},订单类型必须是一个{0}
 DocType: Lead,Next Contact Date,下次联络日期
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,开放数量
 DocType: Healthcare Settings,Appointment Reminder,预约提醒
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Please enter Account for Change Amount,对于涨跌额请输入帐号
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,对于涨跌额请输入帐号
 DocType: Student Batch Name,Student Batch Name,学生批名
 DocType: Consultation,Doctor,医生
 DocType: Holiday List,Holiday List Name,假期列表名称
@@ -1195,12 +1219,14 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,课程时间表
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,库存选项
 DocType: Journal Entry Account,Expense Claim,报销
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,难道你真的想恢复这个报废的资产？
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},{0}数量
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,难道你真的想恢复这个报废的资产？
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},{0}数量
 DocType: Leave Application,Leave Application,假期申请
 DocType: Patient,Patient Relation,患者关系
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,假期调配工具
+DocType: Item,Hub Category to Publish,集线器类别发布
 DocType: Leave Block List,Leave Block List Dates,禁离日列表日期
+DocType: Sales Invoice,Billing Address GSTIN,帐单地址GSTIN
 DocType: Workstation,Net Hour Rate,净小时价格
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,到岸成本采购收据
 DocType: Company,Default Terms,默认条款
@@ -1210,11 +1236,11 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},请指定{0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,删除的项目在数量或价值没有变化。
 DocType: Delivery Note,Delivery To,交货对象
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Attribute table is mandatory,属性表是强制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,属性表是强制性的
 DocType: Production Planning Tool,Get Sales Orders,获取销售订单
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0}不能为负
 DocType: Training Event,Self-Study,自习
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +384,Discount,折扣
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,折扣
 DocType: Asset,Total Number of Depreciations,折旧总数
 DocType: Sales Invoice Item,Rate With Margin,利率保证金
 DocType: Sales Invoice Item,Rate With Margin,利率保证金
@@ -1222,7 +1248,7 @@
 DocType: Task,Urgent,加急
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},请指定行{0}在表中的有效行ID {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,无法找到变量：
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +556,Please select a field to edit from numpad,请选择要从数字键盘编辑的字段
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,请选择要从数字键盘编辑的字段
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,转到桌面和开始使用ERPNext
 DocType: Item,Manufacturer,制造商
 DocType: Landed Cost Item,Purchase Receipt Item,采购入库项目
@@ -1237,7 +1263,7 @@
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation_dashboard.py +11,Records,记录
 DocType: Asset,Scrapped,报废
 apps/erpnext/erpnext/config/stock.py +200,"Attributes for Item Variants. e.g Size, Color etc.",品目变体的属性。如大小，颜色等。
-DocType: Purchase Invoice,Returns,返回
+DocType: Purchase Invoice,Returns,退货
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,在制品仓库
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},序列号{0}截至至{1}之前在年度保养合同内。
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,招聘
@@ -1246,15 +1272,15 @@
 ,Projected Quantity as Source,预计库存量的来源
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,项目必须要由“从采购收据获取品目”添加
 DocType: Employee,A-,A-
-DocType: Production Planning Tool,Include non-stock items,包括非股票项目
+DocType: Production Planning Tool,Include non-stock items,包括非库存管理物料
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,销售费用
 DocType: Consultation,Diagnosis,诊断
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,标准采购
 DocType: GL Entry,Against,针对
 DocType: Item,Default Selling Cost Center,默认销售成本中心
 DocType: Sales Partner,Implementation Partner,实施合作伙伴
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1621,ZIP Code,邮编
-apps/erpnext/erpnext/controllers/selling_controller.py +270,Sales Order {0} is {1},销售订单{0} {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,邮编
+apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},销售订单{0} {1}
 DocType: Opportunity,Contact Info,联系方式
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,制作Stock条目
 DocType: Packing Slip,Net Weight UOM,净重计量单位
@@ -1265,6 +1291,7 @@
 DocType: Holiday List,Get Weekly Off Dates,获取周末日期
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,结束日期不能小于开始日期
 DocType: Sales Person,Select company name first.,请先选择公司名称。
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,从低到高
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,从供应商收到的报价。
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,更换BOM并更新所有BOM中的最新价格
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},{0} | {1} {2}
@@ -1285,7 +1312,7 @@
 DocType: Program Enrollment,Transportation,运输
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,无效属性
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} {1}必须提交
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},量必须小于或等于{0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},量必须小于或等于{0}
 DocType: SMS Center,Total Characters,总字符
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},请BOM字段中选择BOM的项目{0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-形式发票详细信息
@@ -1300,7 +1327,7 @@
 ,Ordered Items To Be Billed,订购物品被标榜
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,从范围必须小于要范围
 DocType: Global Defaults,Global Defaults,全局默认值
-apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,项目合作邀请
+apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,项目合作邀请
 DocType: Salary Slip,Deductions,扣款列表
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,动作名称
@@ -1309,7 +1336,7 @@
 DocType: Purchase Invoice,Start date of current invoice's period,当前发票周期的起始日期
 DocType: Salary Slip,Leave Without Pay,无薪假期
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,容量规划错误
-,Trial Balance for Party,试算表的派对
+,Trial Balance for Party,往来单位试算平衡表
 DocType: Lead,Consultant,顾问
 DocType: Salary Slip,Earnings,盈余
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +391,Finished Item {0} must be entered for Manufacture type entry,完成项目{0}必须为制造类条目进入
@@ -1318,14 +1345,14 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,销售发票预付款
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,没有申请内容
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},另一个预算记录“{0}”已存在对{1}“{2}”为年度{3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',“实际开始日期”不能大于“实际结束日期'
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',“实际开始日期”不能大于“实际结束日期'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,管理人员
 DocType: Cheque Print Template,Payer Settings,付款人设置
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",这将追加到变异的项目代码。例如，如果你的英文缩写为“SM”，而该项目的代码是“T-SHIRT”，该变种的项目代码将是“T-SHIRT-SM”
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,保存工资单后会显示净支付金额(大写)。
 DocType: Purchase Invoice,Is Return,再来
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Caution,警告
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,返回/借记注
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,警告
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,退货/借记单
 DocType: Price List Country,Price List Country,价目表国家
 DocType: Item,UOMs,计量单位
 apps/erpnext/erpnext/stock/utils.py +205,{0} valid serial nos for Item {1},品目{1}有{0}个有效序列号
@@ -1333,23 +1360,24 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +26,POS Profile {0} already created for user: {1} and company {2},POS简介{0}已经为用户创建：{1}和公司{2}
 DocType: Sales Invoice Item,UOM Conversion Factor,计量单位换算系数
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +23,Please enter Item Code to get Batch Number,请输入产品代码来获得批号
-DocType: Stock Settings,Default Item Group,默认品目群组
+DocType: Stock Settings,Default Item Group,默认物料群组
 DocType: Employee Loan,Partially Disbursed,部分已支付
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,供应商数据库。
 DocType: Account,Balance Sheet,资产负债表
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',成本中心：品目代码‘
 DocType: Fee Validity,Valid Till,有效期至
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2462,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。请检查是否帐户已就付款方式或POS机配置文件中设置。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。请检查付款方式或POS机配置中有设置账户。
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,同一项目不能输入多次。
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",进一步帐户可以根据组进行，但条目可针对非组进行
 DocType: Lead,Lead,线索
 DocType: Email Digest,Payables,应付账款
 DocType: Course,Course Intro,课程介绍
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,库存输入{0}创建
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请通过设置&gt;编号系列设置考勤编号系列
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,库存输入{0}创建
 apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：驳回采购退货数量不能进入
-,Purchase Order Items To Be Billed,采购订单的项目被标榜
+,Purchase Order Items To Be Billed,待开票采购订单明细
 DocType: Purchase Invoice Item,Net Rate,净费率
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +131,Please select a customer,请选择一个客户
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,请选择一个客户
 DocType: Purchase Invoice Item,Purchase Invoice Item,采购发票项目
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,采购收据不能在存库分类帐分录和日记账分录下重复提交
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,项目1
@@ -1363,14 +1391,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +20,Order Count,订单数量
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +20,Order Count,订单数量
 DocType: Global Defaults,Current Fiscal Year,当前财年
-DocType: Purchase Order,Group same items,组相同的项目
-DocType: Global Defaults,Disable Rounded Total,禁用总计化整
+DocType: Purchase Order,Group same items,合并相同物料
+DocType: Global Defaults,Disable Rounded Total,禁用元整后金额
 DocType: Employee Loan Application,Repayment Info,还款信息
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,“分录”不能为空
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},重复的行{0}同{1}
-,Trial Balance,试算表
+,Trial Balance,试算平衡表
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,会计年度{0}未找到
-apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,建立职工
+apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,建立职工
 DocType: Sales Order,SO-,所以-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,请选择前缀第一
 DocType: Employee,O-,O-
@@ -1378,16 +1406,17 @@
 DocType: Maintenance Visit Purpose,Work Done,已完成工作
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,请指定属性表中的至少一个属性
 DocType: Announcement,All Students,所有学生
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,项目{0}必须是一个非库存项目
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,物料{0}必须是一个非库存物料
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,查看总帐
 DocType: Grading Scale,Intervals,间隔
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最早
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,"An Item Group exists with same name, please change the item name or rename the item group",同名品目群组已存在，请修改品目名或群组名
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group",同名品目群组已存在，请修改品目名或群组名
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,学生手机号码
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +379,Rest Of The World,世界其他地区
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,世界其他地区
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,物件{0}不能有批次
 ,Budget Variance Report,预算差异报告
 DocType: Salary Slip,Gross Pay,工资总额
+DocType: Item,Is Item from Hub,是来自Hub的Item
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,行{0}：活动类型是强制性的。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,股利支付
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,会计总帐
@@ -1397,8 +1426,9 @@
 DocType: Vehicle Log,Service Detail,服务细节
 DocType: BOM,Item Description,项目说明
 DocType: Student Sibling,Student Sibling,学生兄弟
-DocType: Purchase Invoice,Is Recurring,是否周期性
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,付款方式
 DocType: Purchase Invoice,Supplied Items,供应的品目
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},请设置餐馆{0}的有效菜单
 DocType: Student,STUD.,螺柱。
 DocType: Production Order,Qty To Manufacture,生产数量
 DocType: Email Digest,New Income,新的收入
@@ -1409,6 +1439,7 @@
 ,Student and Guardian Contact Details,学生和监护人联系方式
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +51,Row {0}: For supplier {0} Email Address is required to send email,行{0}：对于供应商{0}的电邮地址发送电子邮件
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,临时开通
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +10,View Hub,查看中心
 ,Employee Leave Balance,雇员假期余量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},账户{0}的余额必须总是{1}
 DocType: Patient Appointment,More Info,更多信息
@@ -1418,23 +1449,23 @@
 DocType: Purchase Invoice,Rejected Warehouse,拒绝仓库
 DocType: GL Entry,Against Voucher,对凭证
 DocType: Item,Default Buying Cost Center,默认采购成本中心
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",为了获得最好ERPNext，我们建议您花一些时间和观看这些帮助视频。
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",为了用好ERPNext，我们建议您花一些时间来观看这些帮助视频。
 apps/erpnext/erpnext/accounts/page/pos/pos.js +74, to ,至
 DocType: Supplier Quotation Item,Lead Time in days,在天交货期
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,应付帐款摘要
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +337,Payment of salary from {0} to {1},从{0}工资支付{1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},无权修改冻结帐户{0}
-DocType: Journal Entry,Get Outstanding Invoices,获取未清发票
+DocType: Journal Entry,Get Outstanding Invoices,获取未付发票
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,销售订单{0}无效
 DocType: Supplier Scorecard,Warn for new Request for Quotations,警告新的报价请求
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,采购订单帮助您规划和跟进您的购买
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged",抱歉，公司不能合并
+apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged",抱歉，公司不能合并
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,实验室测试处方
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",在材质要求总发行/传输量{0} {1} \不能超过请求的数量{2}的项目更大的{3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,小
 DocType: Employee,Employee Number,雇员编号
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},箱号已被使用，请尝试从{0}开始
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},箱号已被使用，请尝试从{0}开始
 DocType: Project,% Completed,% 已完成
 ,Invoiced Amount (Exculsive Tax),已开票金额（未含税）
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,项目2
@@ -1449,11 +1480,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,间接支出
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,行{0}：数量是强制性的
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,农业
-apps/erpnext/erpnext/accounts/page/pos/pos.js +764,Sync Master Data,同步主数据
+apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,同步主数据
 apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,您的产品或服务
 DocType: Special Test Items,Special Test Items,特殊测试项目
 DocType: Mode of Payment,Mode of Payment,付款方式
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
+apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
 DocType: Student Applicant,AP,美联社
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,这是一个root群组，无法被编辑。
@@ -1461,9 +1492,9 @@
 DocType: Vehicle,Fuel UOM,燃油计量单位
 DocType: Warehouse,Warehouse Contact Info,仓库联系方式
 DocType: Payment Entry,Write Off Difference Amount,核销金额差异
-DocType: Purchase Invoice,Recurring Type,经常性类型
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +410,"{0}: Employee email not found, hence email not sent",{0}：未发现员工的电子邮件，因此，电子邮件未发
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent",{0}：未发现员工的电子邮件，因此，电子邮件未发
 DocType: Item,Foreign Trade Details,外贸详细
+,Assessment Plan Status,评估计划状态
 DocType: Email Digest,Annual Income,年收入
 DocType: Serial No,Serial No Details,序列号详情
 DocType: Purchase Invoice Item,Item Tax Rate,项目税率
@@ -1471,15 +1502,14 @@
 DocType: Student Group Student,Group Roll Number,组卷编号
 DocType: Student Group Student,Group Roll Number,组卷编号
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",对于{0}，贷方分录只能选择贷方账户
-apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,所有任务的权重合计应为1。请相应调整的所有项目任务重
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Delivery Note {0} is not submitted,送货单{0}未提交
+apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,所有任务的权重合计应为1。请相应调整的所有项目任务重
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,送货单{0}未提交
 apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,项目{0}必须是外包项目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,资本设备
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",定价规则是第一选择是基于“应用在”字段，可以是项目，项目组或品牌。
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,请先设定商品代码
-DocType: Hub Settings,Seller Website,卖家网站
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,请先设定商品代码
 DocType: Item,ITEM-,项目-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,对于销售团队总分配比例应为100
+apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,对于销售团队总分配比例应为100
 DocType: Sales Invoice Item,Edit Description,编辑说明
 DocType: Antibiotic,Antibiotic,抗生素
 ,Team Updates,团队更新
@@ -1490,7 +1520,7 @@
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +5,Fee Created,创建费用
 apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},没有找到所谓的任何项目{0}
 DocType: Supplier Scorecard Criteria,Criteria Formula,标准配方
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,即将离任的总
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,总待付款
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +47,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",“至值”为0或为空的运输规则条件最多只能有一个
 DocType: Authorization Rule,Transaction,交易
 DocType: Patient Appointment,Duration,持续时间
@@ -1500,12 +1530,12 @@
 DocType: Purchase Invoice,Total (Company Currency),总（公司货币）
 apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,序列号{0}已多次输入
 DocType: Depreciation Schedule,Journal Entry,日记帐分录
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,{0}操作中的单品
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0}操作中的单品
 DocType: Workstation,Workstation Name,工作站名称
 DocType: Grading Scale Interval,Grade Code,等级代码
 DocType: POS Item Group,POS Item Group,POS项目组
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,邮件摘要：
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} does not belong to Item {1},BOM{0}不属于品目{1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM{0}不属于品目{1}
 DocType: Sales Partner,Target Distribution,目标分布
 DocType: Salary Slip,Bank Account No.,银行账号
 DocType: Naming Series,This is the number of the last created transaction with this prefix,这就是以这个前缀的最后一个创建的事务数
@@ -1522,10 +1552,9 @@
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,询价供应商
 DocType: Healthcare Settings,Registration Message,注册信息
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,硬件
-DocType: Sales Order,Recurring Upto,经常性高达
 DocType: Prescription Dosage,Prescription Dosage,处方用量
 DocType: Attendance,HR Manager,人力资源经理
-apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,请选择一个公司
+apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,请选择一个公司
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,特权休假
 DocType: Purchase Invoice,Supplier Invoice Date,供应商发票日期
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,每
@@ -1534,17 +1563,18 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,评估目标模板
 DocType: Salary Component,Earning,盈余
 DocType: Supplier Scorecard,Scoring Criteria,评分标准
-DocType: Purchase Invoice,Party Account Currency,党的账户币种
+DocType: Purchase Invoice,Party Account Currency,往来单位科目币种
 ,BOM Browser,BOM浏览器
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,请更新此培训活动的状态
 DocType: Purchase Taxes and Charges,Add or Deduct,添加或扣除
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,之间存在重叠的条件：
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,日记帐分录{0}已经被其他凭证调整
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,总订单价值
-apps/erpnext/erpnext/demo/setup/setup_data.py +326,Food,食品
+apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,食品
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,账龄范围3
 DocType: Maintenance Schedule Item,No of Visits,访问数量
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},针对{1}存在维护计划{0}
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,你想把你的物品发布到Hub吗？
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,招生学生
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},在关闭帐户的货币必须是{0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},对所有目标点的总和应该是100。{0}
@@ -1553,11 +1583,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},开放BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,仓库不能为序列号变更
 DocType: Authorization Rule,Average Discount,平均折扣
-DocType: Purchase Invoice Item,UOM,UOM
+DocType: Purchase Invoice Item,UOM,计量单位
 DocType: Rename Tool,Utilities,公用事业
-DocType: Purchase Invoice Item,Accounting,会计
+DocType: POS Profile,Accounting,会计
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +113,Please select batches for batched item ,请为批量选择批次
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,请为批量选择批次
 DocType: Asset,Depreciation Schedules,折旧计划
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,申请期间不能请假外分配周期
 DocType: Activity Cost,Projects,项目
@@ -1573,7 +1603,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',审批状态必须被“已批准”或“已拒绝”
 DocType: Physician,Contacts and Address,联系人和地址
 DocType: Purchase Invoice,Contact Person,联络人
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',“预计开始日期”不能大于“预计结束日期'
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',“预计开始日期”不能大于“预计结束日期'
 DocType: Course Scheduling Tool,Course End Date,课程结束日期
 DocType: Holiday List,Holidays,假期
 DocType: Sales Order Item,Planned Quantity,计划数量
@@ -1581,10 +1611,11 @@
 DocType: Item,Maintain Stock,库存维护
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,生产订单已创建库存条目
 DocType: Employee,Prefered Email,首选电子邮件
+DocType: Student Admission,Eligibility and Details,资格和细节
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,在固定资产净变动
 DocType: Leave Control Panel,Leave blank if considered for all designations,如果针对所有 职位请留空
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“品目税率”
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},最大值：{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},最大值：{0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,起始时间日期
 DocType: Email Digest,For Company,对公司
 apps/erpnext/erpnext/config/support.py +17,Communication log.,通信日志。
@@ -1592,22 +1623,22 @@
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,供应商记分卡评分变量
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,采购数量
 DocType: Sales Invoice,Shipping Address Name,送货地址姓名
-apps/erpnext/erpnext/accounts/doctype/account/account.js +58,Chart of Accounts,科目表
 DocType: Material Request,Terms and Conditions Content,条款和条件内容
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,不能大于100
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Item {0} is not a stock Item,项目{0}不是库存项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,物料{0}不是库存物料
 DocType: Maintenance Visit,Unscheduled,计划外
 DocType: Employee,Owned,资
 DocType: Salary Detail,Depends on Leave Without Pay,依赖于无薪休假
 DocType: Pricing Rule,"Higher the number, higher the priority",数字越大，优先级越高
 ,Purchase Invoice Trends,购买发票趋势
 DocType: Employee,Better Prospects,更好的前景
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +114,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",行＃{0}：批次{1}只有{2}数量。请选择具有{3}数量的其他批次，或将该行拆分成多个行，以便从多个批次中传递/发布
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",行＃{0}：批次{1}只有{2}数量。请选择具有{3}数量的其他批次，或将该行拆分成多个行，以便从多个批次中传递/发布
 DocType: Vehicle,License Plate,牌照
 DocType: Appraisal,Goals,目标
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,选择POS配置文件
 DocType: Warranty Claim,Warranty / AMC Status,保修/ 年度保养合同状态
 ,Accounts Browser,科目列表
-DocType: Payment Entry Reference,Payment Entry Reference,付款输入参考
+DocType: Payment Entry Reference,Payment Entry Reference,付款参考
 DocType: GL Entry,GL Entry,总账分录
 DocType: HR Settings,Employee Settings,雇员设置
 ,Batch-Wise Balance History,批次余额历史
@@ -1622,17 +1653,15 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,雇员不能向自己报告。
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",如果科目被冻结，则只有特定用户才能创建分录。
 DocType: Email Digest,Bank Balance,银行存款余额
-apps/erpnext/erpnext/accounts/party.py +238,Accounting Entry for {0}: {1} can only be made in currency: {2},会计分录为{0}：{1}只能在货币做：{2}
+apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},会计分录为{0}：{1}只能在货币做：{2}
 DocType: Job Opening,"Job profile, qualifications required etc.",工作概况，要求的学历等。
 DocType: Journal Entry Account,Account Balance,账户余额
 apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,税收规则进行的交易。
-DocType: Rename Tool,Type of document to rename.,的文件类型进行重命名。
+DocType: Rename Tool,Type of document to rename.,需重命名的文件类型。
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}：需要客户支付的应收账款{2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),总税费和费用（公司货币）
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,显示未关闭的会计年度的盈亏平衡
 DocType: Lab Test Template,Collection Details,收集细节
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +294,"select cp.name, cp.test_code, cp.parent, cp.invoice, ct.physician, ct.consultation_date from tabConsultation ct,
-	`tabLab Prescription` cp where ct.patient='{0}' and cp.parent=ct.name and cp.test_created=0",选择cp.name，cp.test_code，cp.parent，cp.invoice，ct.physician，ct.consultation_date from tabConsultation ct，`tabLab Prescription` cp其中ct.patient =&#39;{0}&#39;和cp.parent = ct。 name和cp.test_created = 0
 DocType: Shipping Rule,Shipping Account,送货账户
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: 帐户{2}无效
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,制作销售订单，以帮助你计划你的工作和按时交付
@@ -1642,14 +1671,14 @@
 DocType: BOM,Scrap Material Cost(Company Currency),废料成本（公司货币）
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Sub Assemblies,半成品
 DocType: Asset,Asset Name,资产名称
-DocType: Project,Task Weight,任务重
+DocType: Project,Task Weight,任务权重
 DocType: Shipping Rule Condition,To Value,To值
 DocType: Asset Movement,Stock Manager,库存管理
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},行{0}中源仓库为必须项
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,装箱单
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,办公室租金
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,短信网关的设置
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,导入失败！
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,导入失败！
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,未添加地址。
 DocType: Workstation Working Hour,Workstation Working Hour,工作站工作时间
 DocType: Vital Signs,Blood Pressure,血压
@@ -1674,7 +1703,7 @@
 DocType: Sales Invoice,Source,源
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,显示关闭
 DocType: Leave Type,Is Leave Without Pay,是无薪休假
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,资产类别是强制性的固定资产项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,资产类别是强制性的固定资产项目
 DocType: Fee Validity,Fee Validity,费用有效期
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,没有在支付表中找到记录
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},此{0}冲突{1}在{2} {3}
@@ -1684,7 +1713,7 @@
 DocType: Employee External Work History,Total Experience,总经验
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,打开项目
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,Packing Slip(s) cancelled,装箱单（ S）取消
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,从投资现金流
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,投资现金流
 DocType: Program Course,Program Course,课程计划
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,货运及转运费
 DocType: Homepage,Company Tagline for website homepage,公司标语的网站主页
@@ -1695,8 +1724,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,猎头
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,建立潜在客户
 DocType: Maintenance Schedule,Schedules,计划任务
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,POS配置文件需要使用销售点
 DocType: Purchase Invoice Item,Net Amount,净额
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1}尚未提交，因此无法完成此操作
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1}尚未提交，因此无法完成此操作
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM详情编号
 DocType: Landed Cost Voucher,Additional Charges,附加费用
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),额外的优惠金额（公司货币）
@@ -1705,7 +1735,7 @@
 ,Support Hour Distribution,支持小时分配
 DocType: Maintenance Visit,Maintenance Visit,维护访问
 DocType: Student,Leaving Certificate Number,毕业证书号码
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +50,"Appointment cancelled, Please review and cancel the invoice {0}",预约已取消，请查看并取消发票{0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +63,"Appointment cancelled, Please review and cancel the invoice {0}",预约已取消，请查看并取消发票{0}
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,可用的批次数量在仓库
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,更新打印格式
 DocType: Landed Cost Voucher,Landed Cost Help,到岸成本帮助
@@ -1728,8 +1758,8 @@
 DocType: Patient,Tobacco Past Use,烟草过去使用
 DocType: Sales Invoice Item,Brand Name,品牌名称
 DocType: Purchase Receipt,Transporter Details,转运详细
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},用户{0}已分配给医师{1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2646,Default warehouse is required for selected item,默认仓库需要选中的项目
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},用户{0}已分配给医师{1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,默认仓库需要选中的项目
 apps/erpnext/erpnext/utilities/user_progress.py +125,Box,箱
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,可能的供应商
 DocType: Budget,Monthly Distribution,月度分布
@@ -1739,8 +1769,8 @@
 DocType: Sales Partner,Sales Partner Target,销售合作伙伴目标
 DocType: Loan Type,Maximum Loan Amount,最高贷款额度
 DocType: Pricing Rule,Pricing Rule,定价规则
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},学生{0}的重复卷号
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +53,Duplicate roll number for student {0},学生{0}的重复卷号
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},学生{0}的重复卷号
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},学生{0}的重复卷号
 DocType: Budget,Action if Annual Budget Exceeded,如果行动年度预算超标
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,材料要求采购订单
 DocType: Shopping Cart Settings,Payment Success URL,付款成功URL
@@ -1757,7 +1787,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0}只能出现一次
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},不允许转院更多{0}不是{1}对采购订单{2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},已成功为{0}调配假期
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,未选择品目
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,未选择品目
 DocType: Shipping Rule Condition,From Value,起始值
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,生产数量为必须项
 DocType: Employee Loan,Repayment Method,还款方式
@@ -1771,33 +1801,34 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,库存负债
 DocType: Purchase Invoice,Supplier Warehouse,供应商仓库
 DocType: Opportunity,Contact Mobile No,联系人手机号码
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,选择公司
 ,Material Requests for which Supplier Quotations are not created,无供应商报价的物料申请
 DocType: Student Group,Set 0 for no limit,为不限制设为0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,这一天（S）对你所申请休假的假期。你不需要申请许可。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,您申请的休假日期是节假日，无需申请休假。
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,重新发送付款电子邮件
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,新任务
 DocType: Consultation,Appointment,约定
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,请报价
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,其他报告
 DocType: Dependent Task,Dependent Task,相关任务
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Conversion factor for default Unit of Measure must be 1 in row {0},行{0}中默认计量单位的转换系数必须是1
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},行{0}中默认计量单位的转换系数必须是1
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},类型为{0}的假期不能长于{1}天
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,尝试规划X天行动提前。
 DocType: HR Settings,Stop Birthday Reminders,停止生日提醒
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},请公司设定默认应付职工薪酬帐户{0}
 DocType: SMS Center,Receiver List,接收人列表
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1092,Search Item,搜索项目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,搜索项目
 DocType: Patient Appointment,Referring Physician,参考医师
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,消耗量
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,现金净变动
 DocType: Assessment Plan,Grading Scale,分级量表
-apps/erpnext/erpnext/stock/doctype/item/item.py +398,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +607,Already completed,已经完成
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,已经完成
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,库存在手
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},付款申请已经存在{0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,已发料品目成本
 DocType: Physician,Hospital,醫院
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},数量不能超过{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},数量不能超过{0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,上一财政年度未关闭
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),时间（天）
 DocType: Quotation Item,Quotation Item,报价品目
@@ -1808,8 +1839,8 @@
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,主要的供应商类型。
 DocType: Purchase Order Item,Supplier Part Number,供应商零件编号
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,汇率不能为0或1
-DocType: Sales Invoice,Reference Document,参考文献
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1}被取消或停止
+DocType: Subscription,Reference Document,参考文献
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1}被取消或停止
 DocType: Accounts Settings,Credit Controller,信用控制人
 DocType: Delivery Note,Vehicle Dispatch Date,车辆调度日期
 DocType: Healthcare Settings,Default Medical Code Standard,默认医疗代码标准
@@ -1818,8 +1849,9 @@
 DocType: Company,Default Payable Account,默认应付账户
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",网上购物车，如配送规则，价格表等的设置
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}％帐单
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,按价格排序...
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,保留数量
-DocType: Party Account,Party Account,党的帐户
+DocType: Party Account,Party Account,往来单位科目
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,人力资源
 DocType: Lead,Upper Income,高收入
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +41,Reject,拒绝
@@ -1829,13 +1861,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,请输入支付
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,行{0}：提前对供应商必须扣除
 DocType: Company,Default Values,默认值
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{frequency}摘要
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{frequency}摘要
 DocType: Expense Claim,Total Amount Reimbursed,报销金额合计
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,这是基于对本车辆的日志。详情请参阅以下时间表
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},对日期为{1}的供应商发票{0}
 DocType: Customer,Default Price List,默认价格表
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,资产运动记录{0}创建
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,您不能删除会计年度{0}。会计年度{0}被设置为默认的全局设置
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,一个同名的客户已经存在
 DocType: Journal Entry,Entry Type,条目类型
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,没有评估计划与此评估组相关联
 ,Customer Credit Balance,客户贷方余额
@@ -1845,7 +1878,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,价钱
 DocType: Quotation,Term Details,条款详情
 DocType: Project,Total Sales Cost (via Sales Order),总销售成本（通过销售订单）
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +29,Cannot enroll more than {0} students for this student group.,不能注册超过{0}学生该学生群体更多。
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,不能注册超过{0}学生该学生群体更多。
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,铅计数
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,铅计数
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0}必须大于0
@@ -1861,12 +1894,14 @@
 DocType: Purchase Invoice,End date of current invoice's period,当前发票周期的结束日期
 DocType: Pricing Rule,Applicable For,适用于
 DocType: Lab Test,Technician Name,技术员姓名
-DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,取消链接在发票上的取消付款
+DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,取消发票时去掉关联的付款
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},进入当前的里程表读数应该比最初的车辆里程表更大的{0}
+DocType: Restaurant Reservation,No Show,没有出现
 DocType: Shipping Rule Country,Shipping Rule Country,航运规则国家
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,离开和考勤
 DocType: Maintenance Visit,Partially Completed,部分完成
-DocType: Leave Type,Include holidays within leaves as leaves,叶叶子中包括节假日
+apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,中等敏感度
+DocType: Leave Type,Include holidays within leaves as leaves,包括休假期间的节假日
 DocType: Sales Invoice,Packed Items,盒装项目
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,针对序列号提出的保修申请
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,'Total',&#39;总&#39;
@@ -1882,13 +1917,14 @@
 DocType: Payment Entry,Paid Amount (Company Currency),支付的金额（公司货币）
 DocType: Purchase Invoice,Additional Discount,更多优惠
 DocType: Selling Settings,Selling Settings,销售设置
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,确认操作
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,网上拍卖
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,请注明无论是数量或估价率或两者
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,履行
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,订单履行
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,查看你的购物车
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,市场营销开支
 ,Item Shortage Report,项目短缺报告
-apps/erpnext/erpnext/stock/doctype/item/item.js +271,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，\n请注明“重量计量单位”
+apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，\n请注明“重量计量单位”
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,创建此库存记录的物料申请
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,接下来折旧日期是强制性的新资产
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,为每个批次分离基于课程的组
@@ -1899,19 +1935,19 @@
 ,Student Fee Collection,学生费征收
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +23,Appointment Duration (mins),预约时间（分钟）
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,为每个库存变动创建会计分录
-DocType: Leave Allocation,Total Leaves Allocated,分配的总叶
+DocType: Leave Allocation,Total Leaves Allocated,总已核销休假
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},在行无需仓库{0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +135,Please enter valid Financial Year Start and End Dates,请输入有效的财政年度开始和结束日期
+apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,请输入有效的财政年度开始和结束日期
 DocType: Employee,Date Of Retirement,退休日期
 DocType: Upload Attendance,Get Template,获取模板
 DocType: Material Request,Transferred,转入
 DocType: Vehicle,Doors,门
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +208,ERPNext Setup Complete!,ERPNext设置完成！
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext设置完成！
 DocType: Healthcare Settings,Collect Fee for Patient Registration,收取病人登记费
 DocType: Course Assessment Criteria,Weightage,权重
 DocType: Purchase Invoice,Tax Breakup,税收分解
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}：需要的损益“账户成本中心{2}。请设置为公司默认的成本中心。
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}：成本中心对于损益类科目来说是必须的{2}。请为公司设置一个默认的成本中心。
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +118,A Customer Group exists with same name please change the Customer name or rename the Customer Group,同名的客户组已经存在，请更改客户姓名或重命名该客户组
 apps/erpnext/erpnext/public/js/templates/contact_list.html +37,New Contact,新建联系人
 DocType: Territory,Parent Territory,家长领地
@@ -1925,39 +1961,39 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",如果此项目有变体，那么它不能在销售订单等选择
 DocType: Lead,Next Contact By,下次联络人
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Quantity required for Item {0} in row {1},行{1}中的品目{0}必须指定数量
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},行{1}中的品目{0}必须指定数量
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},仓库{0}无法删除，因为产品{1}有库存量
 DocType: Quotation,Order Type,订单类型
-DocType: Purchase Invoice,Notification Email Address,通知邮件地址
 ,Item-wise Sales Register,逐项销售登记
 DocType: Asset,Gross Purchase Amount,总购买金额
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,期初余额
 DocType: Asset,Depreciation Method,折旧方法
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +57,Offline,离线
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,离线
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,此税项是否包含在基本价格中？
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,总目标
 DocType: Job Applicant,Applicant for a Job,求职申请
 DocType: Production Plan Material Request,Production Plan Material Request,生产计划申请材料
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,暂无生产订单
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,暂无生产订单
 DocType: Stock Reconciliation,Reconciliation JSON,基于JSON格式对账
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,太多的列。导出报表，并使用电子表格应用程序进行打印。
 DocType: Purchase Invoice Item,Batch No,批号
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},要求报价：{0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,允许多个销售订单对客户的采购订单
 DocType: Student Group Instructor,Student Group Instructor,学生组教练
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2手机号码
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,主
+apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,主
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,变体
 DocType: Naming Series,Set prefix for numbering series on your transactions,为交易设置编号系列的前缀
 DocType: Employee Attendance Tool,Employees HTML,HTML员工
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,Default BOM ({0}) must be active for this item or its template,默认BOM（{0}）必须是活动的这个项目或者其模板
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,默认BOM（{0}）必须是活动的这个项目或者其模板
 DocType: Employee,Leave Encashed?,假期已使用？
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,从机会是必选项
 DocType: Email Digest,Annual Expenses,年度支出
 DocType: Item,Variants,变种
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Make Purchase Order,创建采购订单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,创建采购订单
 DocType: SMS Center,Send To,发送到
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},假期类型{0}的余额不足了
-DocType: Payment Reconciliation Payment,Allocated amount,分配量
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},假期类型{0}的剩余天数不足了
+DocType: Payment Reconciliation Payment,Allocated amount,已核销金额
 DocType: Sales Team,Contribution to Net Total,贡献净总计
 DocType: Sales Invoice Item,Customer's Item Code,客户的品目编号
 DocType: Stock Reconciliation,Stock Reconciliation,库存盘点
@@ -1971,7 +2007,8 @@
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,学生群体力量
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,学生群体力量
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,日记帐分录{0}没有不符合的{1}分录
-apps/erpnext/erpnext/config/hr.py +137,Appraisals,估价
+apps/erpnext/erpnext/config/hr.py +137,Appraisals,绩效评估
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,培训活动
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},品目{0}的序列号重复
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,发货规则的一个条件
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,请输入
@@ -1981,11 +2018,11 @@
 DocType: Sales Order,To Deliver and Bill,为了提供与比尔
 DocType: Student Group,Instructors,教师
 DocType: GL Entry,Credit Amount in Account Currency,在账户币金额
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +578,BOM {0} must be submitted,BOM{0}未提交
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM{0}未提交
 DocType: Authorization Control,Authorization Control,授权控制
 apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：拒绝仓库是强制性的反对否决项{1}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,付款
-apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.",仓库{0}未与任何帐户关联，请在仓库记录中提及该帐户，或在公司{1}中设置默认库存帐户。
+apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.",仓库{0}未与任何科目关联，请在仓库或公司{1}主数据中设置默认库存科目。
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,管理您的订单
 DocType: Production Order Operation,Actual Time and Cost,实际时间和成本
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},销售订单{2}中品目{1}的最大物流申请量为{0}
@@ -1996,16 +2033,16 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},员工{0}上半天{1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},总的工作时间不应超过最高工时更大{0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,于
-apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,在销售时捆绑品目。
+apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,用于销售的产品组合。
 DocType: Quotation Item,Actual Qty,实际数量
 DocType: Sales Invoice Item,References,参考
 DocType: Quality Inspection Reading,Reading 10,阅读10
-DocType: Hub Settings,Hub Node,Hub节点
+DocType: Hub Category,Hub Node,Hub节点
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,您输入了重复的条目。请纠正然后重试。
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,协理
 DocType: Asset Movement,Asset Movement,资产运动
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,新的车
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,项目{0}不是一个序列项目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,新的车
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,物料{0}未启用序列好管理
 DocType: SMS Center,Create Receiver List,创建接收人列表
 DocType: Vehicle,Wheels,车轮
 DocType: Packing Slip,To Package No.,以包号
@@ -2018,16 +2055,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,电信
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),表示该打包是这个交付的一部分（仅草稿）
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,创建付款分录
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},品目{0}的数量必须小于{1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},品目{0}的数量必须小于{1}
 ,Sales Invoice Trends,销售发票趋势
 DocType: Leave Application,Apply / Approve Leaves,申请/审批假期
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,对于
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,对于
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',收取类型类型必须是“基于上一行的金额”或者“前一行的总计”才能引用组
 DocType: Sales Order Item,Delivery Warehouse,交货仓库
 apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,财务成本中心的树。
 DocType: Serial No,Delivery Document No,交货文档编号
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +190,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},请公司制定“关于资产处置收益/损失帐户”{0}
-DocType: Landed Cost Voucher,Get Items From Purchase Receipts,从购买收据获取品目
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},请公司制定“关于资产处置收益/损失帐户”{0}
+DocType: Landed Cost Voucher,Get Items From Purchase Receipts,从采购收获单获取物料
 DocType: Serial No,Creation Date,创建日期
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},产品{0}多次出现价格表{1}
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +40,"Selling must be checked, if Applicable For is selected as {0}",如果“适用于”的值为{0}，则必须选择“销售”
@@ -2037,12 +2074,13 @@
 DocType: Student,Student Mobile Number,学生手机号码
 DocType: Item,Has Variants,有变体
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,更新响应
-apps/erpnext/erpnext/public/js/utils.js +222,You have already selected items from {0} {1},您已经选择从项目{0} {1}
+apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},您已经选择从项目{0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,月度分布名称
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,批号是必需的
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,批号是必需的
 DocType: Sales Person,Parent Sales Person,母公司销售人员
-DocType: Purchase Invoice,Recurring Invoice,常用发票
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,从高到低
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,首先选择程序
 DocType: Patient Appointment,Patient Age,患者年龄
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,项目管理
 DocType: Supplier,Supplier of Goods or Services.,提供商品或服务的供应商。
@@ -2050,30 +2088,31 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,如果没有在患者中设置隐性应收帐款，请咨询费用。
 DocType: Vehicle Log,Fuel Price,燃油价格
 DocType: Budget,Budget,预算
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +35,Set Open,设置打开
-apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,固定资产项目必须是一个非库存项目。
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,设置打开
+apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,固定资产项目必须是一个非库存项目。
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",财政预算案不能对{0}指定的，因为它不是一个收入或支出帐户
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,已实现
 DocType: Student Admission,Application Form Route,申请表路线
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,区域/客户
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,休假类型{0}，因为它是停薪留职无法分配
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},行{0}：已分配量{1}必须小于或等于发票余额{2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},行{0}：已分配金额{1}必须小于或等于发票余额{2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,大写金额将在销售发票保存后显示。
 DocType: Lead,Follow Up,跟进
-DocType: Item,Is Sales Item,是否销售项目
+DocType: Item,Is Sales Item,可销售？
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,项目群组树
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,项目{0}没有设置序列号，请进入主项目中修改
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,物料{0}没有启用序列号管理功能，请进入物料主数据中修改
 DocType: Maintenance Visit,Maintenance Time,维护时间
 ,Amount to Deliver,量交付
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},相同的物品已被多次输入。 {0}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,这个词开始日期不能超过哪个术语链接学年的开学日期较早（学年{}）。请更正日期，然后再试一次。
 DocType: Guardian,Guardian Interests,守护兴趣
 DocType: Naming Series,Current Value,当前值
 apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,多个会计年度的日期{0}存在。请设置公司财年
 DocType: School Settings,Instructor Records to be created by,导师记录由
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0}已创建
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0}已创建
 DocType: Delivery Note Item,Against Sales Order,对销售订单
 ,Serial No Status,序列号状态
-DocType: Payment Entry Reference,Outstanding,优秀
+DocType: Payment Entry Reference,Outstanding,未付
 DocType: Supplier,Warn POs,警告PO
 ,Daily Timesheet Summary,每日时间表摘要
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
@@ -2081,14 +2120,14 @@
 之间差必须大于或等于{2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,这是基于库存移动。见{0}详情
 DocType: Pricing Rule,Selling,销售
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} deducted against {2},金额{0} {1}抵扣{2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},金额{0} {1}抵扣{2}
 DocType: Employee,Salary Information,薪资信息
 DocType: Sales Person,Name and Employee ID,姓名和雇员ID
-apps/erpnext/erpnext/accounts/party.py +303,Due Date cannot be before Posting Date,到期日不能前于过账日期
+apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,到期日不能前于过账日期
 DocType: Website Item Group,Website Item Group,网站物件组
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,关税与税项
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,参考日期请输入
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0}付款项不能由{1}过滤
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0}付款记录不能由{1}过滤
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,将在网站显示的物件表
 DocType: Purchase Order Item Supplied,Supplied Qty,附送数量
 DocType: Purchase Order Item,Material Request Item,物料申请品目
@@ -2110,7 +2149,7 @@
 DocType: Issue,Resolution Details,详细解析
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,分配
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,验收标准
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,请输入在上表请求材料
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,请输入在上表请求材料
 DocType: Item Attribute,Attribute Name,属性名称
 DocType: BOM,Show In Website,在网站上显示
 DocType: Shopping Cart Settings,Show Quantity in Website,显示在网站数量
@@ -2119,7 +2158,7 @@
 DocType: Item Reorder,Check in (group),检查（组）
 ,Qty to Order,订购数量
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked",负债或权益下的帐户头，其中利润/亏损将被黄牌警告
-apps/erpnext/erpnext/config/projects.py +30,Gantt chart of all tasks.,所有任务的甘特图。
+apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,所有任务的甘特图。
 DocType: Opportunity,Mins to First Response,分钟为第一个反应
 DocType: Pricing Rule,Margin Type,保证金类型
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0}小时
@@ -2137,40 +2176,40 @@
 ,Campaign Efficiency,运动效率
 ,Campaign Efficiency,运动效率
 DocType: Discussion,Discussion,讨论
-DocType: Payment Entry,Transaction ID,事务ID
+DocType: Payment Entry,Transaction ID,交易ID
 DocType: Patient,Surgical History,手术史
 DocType: Employee,Resignation Letter Date,辞职信日期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,定价规则进一步过滤基于数量。
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},请为员工{0}设置加入日期
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +333,Please set the Date Of Joining for employee {0},请为员工{0}设置加入日期
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},请为员工{0}设置加入日期
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},请为员工{0}设置加入日期
 DocType: Task,Total Billing Amount (via Time Sheet),总开票金额（通过时间表）
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,重复客户收入
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} {1}必须有“费用审批人”的角色
 apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,对
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +908,Select BOM and Qty for Production,选择BOM和数量生产
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,选择BOM和数量生产
 DocType: Asset,Depreciation Schedule,折旧计划
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,销售合作伙伴地址和联系人
 DocType: Bank Reconciliation Detail,Against Account,针对科目
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,半天时间应该是从之间的日期和终止日期
 DocType: Maintenance Schedule Detail,Actual Date,实际日期
 DocType: Item,Has Batch No,有批号
-apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},年度结算：{0}
+apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},年度结算：{0}
 apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),商品和服务税（印度消费税）
 DocType: Delivery Note,Excise Page Number,Excise页码
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory",公司，从日期和结束日期是必须
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,从咨询中获取
 DocType: Asset,Purchase Date,购买日期
 DocType: Employee,Personal Details,个人资料
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +192,Please set 'Asset Depreciation Cost Center' in Company {0},请设置在公司的资产折旧成本中心“{0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},请设置在公司的资产折旧成本中心“{0}
 ,Maintenance Schedules,维护计划
 DocType: Task,Actual End Date (via Time Sheet),实际结束日期（通过时间表）
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} against {2} {3},数量 {0}{1} 对应 {2}{3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},数量 {0}{1} 对应 {2}{3}
 ,Quotation Trends,报价趋势
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},项目{0}的项目群组没有设置
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Debit To account must be a Receivable account,入借帐户必须是应收账科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,入借帐户必须是应收账科目
 DocType: Shipping Rule Condition,Shipping Amount,发货数量
 DocType: Supplier Scorecard Period,Period Score,期间得分
-apps/erpnext/erpnext/utilities/user_progress.py +61,Add Customers,添加客户
+apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,添加客户
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,待审核金额
 DocType: Lab Test Template,Special,特别
 DocType: Purchase Invoice Item,Conversion Factor,转换系数
@@ -2178,13 +2217,14 @@
 ,Vehicle Expenses,车辆费用
 DocType: Serial No,Invoice Details,发票明细
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},使用寿命后预期值必须大于或等于{0}
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,开始
+DocType: Hub Category,Hub Category,中心类别
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,车号
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,经常性发票终止日期
 DocType: Employee Loan,Loan Amount,贷款额度
 DocType: Program Enrollment,Self-Driving Vehicle,自驾车
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,供应商记分卡站立
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,Row {0}: Bill of Materials not found for the Item {1},行{0}：材料清单未找到项目{1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},行{0}：材料清单未找到项目{1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,共分配叶{0}不能小于已经批准叶{1}期间
 DocType: Journal Entry,Accounts Receivable,应收帐款
 ,Supplier-Wise Sales Analytics,供应商特定的销售分析
@@ -2196,7 +2236,7 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)",家长课程（如果不是家长课程的一部分，请留空）
 DocType: Leave Control Panel,Leave blank if considered for all employee types,如果针对所有雇员类型请留空
 DocType: Landed Cost Voucher,Distribute Charges Based On,费用分配基于
-apps/erpnext/erpnext/hooks.py +131,Timesheets,时间表
+apps/erpnext/erpnext/hooks.py +140,Timesheets,时间表
 DocType: HR Settings,HR Settings,人力资源设置
 DocType: Salary Slip,net pay info,净工资信息
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,该值在默认销售价格表中更新。
@@ -2207,7 +2247,7 @@
 DocType: Patient,B Positive,B积极
 apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行＃{0}：订购数量必须是1，因为项目是固定资产。请使用单独的行多数量。
 DocType: Leave Block List Allow,Leave Block List Allow,例外用户
-apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,缩写不能为空或空格
+apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,缩写不能为空或空格
 DocType: Patient Medical Record,Patient Medical Record,病人医疗记录
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,集团以非组
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,体育
@@ -2221,12 +2261,13 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,维护拒收物件的仓库
 DocType: Production Order,Skip Material Transfer,跳过材料转移
 DocType: Production Order,Skip Material Transfer,跳过材料转移
-apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,无法为关键日期{2}查找{0}到{1}的汇率。请手动创建货币兑换记录
+apps/erpnext/erpnext/setup/utils.py +109,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,无法为关键日期{2}查找{0}到{1}的汇率。请手动创建汇率记录
 DocType: POS Profile,Price List,价格表
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,默认财政年度已经更新为{0}。请刷新您的浏览器以使更改生效。
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,报销
+apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,报销
 DocType: Issue,Support,支持
 ,BOM Search,BOM搜索
+DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",基于仓库中的库存，在Hub上发布“库存”或“库存”。
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),截止（开标+总计）
 DocType: Vehicle,Fuel Type,燃料类型
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,请公司指定的货币
@@ -2238,16 +2279,16 @@
 DocType: Healthcare Settings,Remind Before,提醒之前
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},行{0}计量单位换算系数是必须项
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1039,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行＃{0}：参考文件类型必须是销售订单之一，销售发票或日记帐分录
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行＃{0}：参考文件类型必须是销售订单之一，销售发票或日记帐分录
 DocType: Salary Component,Deduction,扣款
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,行{0}：从时间和时间是强制性的。
 DocType: Stock Reconciliation Item,Amount Difference,金额差异
-apps/erpnext/erpnext/stock/get_item_details.py +297,Item Price added for {0} in Price List {1},加入项目价格为{0}价格表{1}
+apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},加入项目价格为{0}价格表{1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,请输入这个销售人员的员工标识
 DocType: Territory,Classification of Customers by region,客户按区域分类
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,差量必须是零
 DocType: Project,Gross Margin,毛利
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,请先输入生产项目
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,请先输入生产项目
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,计算的银行对账单余额
 DocType: Normal Test Template,Normal Test Template,正常测试模板
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,已禁用用户
@@ -2257,25 +2298,26 @@
 DocType: Salary Slip,Total Deduction,扣除总额
 ,Production Analytics,生产Analytics（分析）
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,这是基于对这个病人的交易。有关详情，请参阅下面的时间表
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +195,Cost Updated,成本更新
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,成本更新
 DocType: Employee,Date of Birth,出生日期
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,项目{0}已被退回
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,物料{0}已被退回
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**财年**表示财政年度。所有的会计分录和其他重大交易将根据**财年**跟踪。
 DocType: Opportunity,Customer / Lead Address,客户/潜在客户地址
 DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,供应商记分卡设置
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},警告：附件{0}中存在无效的SSL证书
-DocType: Student Admission,Eligibility,合格
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,评估计划名称
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},警告：附件{0}中存在无效的SSL证书
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads",信息帮助你的业务，你所有的联系人和更添加为您的线索
 DocType: Production Order Operation,Actual Operation Time,实际操作时间
 DocType: Authorization Rule,Applicable To (User),适用于(用户)
 DocType: Purchase Taxes and Charges,Deduct,扣款
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,职位描述
 DocType: Student Applicant,Applied,应用的
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,重新打开
 DocType: Sales Invoice Item,Qty as per Stock UOM,按库存计量单位数量
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2名称
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","命名序列中不能输入特殊符号，""-""，""#""，"".""和""/""除外"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",追踪销售活动。追踪来自活动的潜在客户，报价，销售订单等，统计投资回报率。
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",追踪营销活动。追踪来自营销活动的线索，报价，销售订单等，统计投资回报率。
 DocType: Expense Claim,Approver,审批者
 ,SO Qty,销售订单数量
 DocType: Guardian,Work Address,工作地址
@@ -2283,9 +2325,9 @@
 DocType: Request for Quotation,Manufacturing Manager,生产经理
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},序列号{0}截至至{1}之前在保修内。
 apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,分裂送货单成包。
-apps/erpnext/erpnext/hooks.py +98,Shipments,发货
+apps/erpnext/erpnext/hooks.py +107,Shipments,发货
 DocType: Payment Entry,Total Allocated Amount (Company Currency),总拨款额（公司币种）
-DocType: Purchase Order Item,To be delivered to customer,要传送给客户
+DocType: Purchase Order Item,To be delivered to customer,由供应商直接出货给客户（直接发运）
 DocType: BOM,Scrap Material Cost,废料成本
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +227,Serial No {0} does not belong to any Warehouse,序列号{0}不属于任何仓库
 DocType: Purchase Invoice,In Words (Company Currency),大写金额（公司货币）
@@ -2306,8 +2348,8 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,项目变式设置
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,选择公司...
 DocType: Leave Control Panel,Leave blank if considered for all departments,如果针对所有部门请留空
-apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",就业（永久，合同，实习生等）的类型。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,{0} is mandatory for Item {1},{0}是{1}的必填项
+apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).",就业（永久，合同，实习生等）的类型。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0}是{1}的必填项
 DocType: Process Payroll,Fortnightly,半月刊
 DocType: Currency Exchange,From Currency,源货币
 DocType: Vital Signs,Weight (In Kilogram),体重（公斤）
@@ -2332,7 +2374,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,请在“生成表”点击获取时间表
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,删除以下计划时发生错误：
 DocType: Bin,Ordered Quantity,订购数量
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,"e.g. ""Build tools for builders""",例如“建筑工人的建筑工具！”
+apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",例如“建筑工人的建筑工具！”
 DocType: Grading Scale,Grading Scale Intervals,分级刻度间隔
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}在{2}会计分录只能用货币单位：{3}
 DocType: Production Order,In Process,进行中
@@ -2347,7 +2389,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0}创建学生组。
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0}创建学生组。
 DocType: Sales Invoice,Total Billing Amount,总结算金额
-apps/erpnext/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py +17,There must be a default incoming Email Account enabled for this to work. Please setup a default incoming Email Account (POP/IMAP) and try again.,必须有这个工作，启用默认进入的电子邮件帐户。请设置一个默认的传入电子邮件帐户（POP / IMAP），然后再试一次。
+apps/erpnext/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py +17,There must be a default incoming Email Account enabled for this to work. Please setup a default incoming Email Account (POP/IMAP) and try again.,要启用该功能，请设置一个默认的收件电子邮件帐户（POP / IMAP），然后再试一次。
 DocType: Healthcare Settings,Receivable Account,应收账款
 apps/erpnext/erpnext/controllers/accounts_controller.py +553,Row #{0}: Asset {1} is already {2},行＃{0}：资产{1}已经是{2}
 DocType: Quotation Item,Stock Balance,库存余额
@@ -2356,11 +2398,10 @@
 DocType: Purchase Invoice,With Payment of Tax,缴纳税款
 DocType: Expense Claim Detail,Expense Claim Detail,报销详情
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,供应商提供服务
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,请选择正确的帐户
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,请选择正确的帐户
 DocType: Item,Weight UOM,重量计量单位
 DocType: Salary Structure Employee,Salary Structure Employee,薪资结构员工
 DocType: Patient,Blood Group,血型
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +961,Pending,有待
 DocType: Course,Course Name,课程名
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,可以为特定用户批准假期的用户
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,办公设备
@@ -2379,19 +2420,20 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,价格将不会显示如果没有设置价格
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,请指定一个国家的这种运输规则或检查全世界运输
 DocType: Stock Entry,Total Incoming Value,总传入值
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Debit To is required,借记是必需的
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,借记是必需的
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",时间表帮助追踪的时间，费用和结算由你的团队做activites
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,采购价格表
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,供应商记分卡变数模板。
-DocType: Offer Letter Term,Offer Term,要约期限
+DocType: Offer Letter Term,Offer Term,录取通知条款
 DocType: Quality Inspection,Quality Manager,质量经理
 DocType: Job Applicant,Job Opening,职务空缺
 DocType: Payment Reconciliation,Payment Reconciliation,付款对账
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,请选择Incharge人的名字
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,技术
-apps/erpnext/erpnext/public/js/utils.js +98,Total Unpaid: {0},总未付：{0}
+DocType: Hub Settings,Unregister from Hub,从Hub注销
+apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},总未付：{0}
 DocType: BOM Website Operation,BOM Website Operation,BOM网站运营
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,报价函
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,录取通知
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,生成材料要求(MRP)和生产订单。
 DocType: Supplier Scorecard,Supplier Score,供应商分数
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +76,Total Invoiced Amt,总开票金额
@@ -2401,7 +2443,9 @@
 DocType: Physician Schedule Time Slot,To Time,要时间
 DocType: Authorization Rule,Approving Role (above authorized value),批准角色（上述授权值）
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,入贷科目必须是一个“应付”科目
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +329,BOM recursion: {0} cannot be parent or child of {2},BOM {0}不能是{2}的上级或下级
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,请选择付费学生申请者必须入学的学生
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM {0}不能是{2}的上级或下级
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,请选择一个价目表来发布价格
 DocType: Production Order Operation,Completed Qty,已完成数量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",对于{0}，借方分录只能选择借方账户
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,价格表{0}被禁用
@@ -2413,40 +2457,41 @@
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +6,Add Time Slots,添加时间插槽
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,物料{1}需要{0}的序列号。您已提供{2}。
 DocType: Stock Reconciliation Item,Current Valuation Rate,目前的估值价格
-DocType: Item,Customer Item Codes,客户项目代码
+DocType: Item,Customer Item Codes,客户物料代码
+DocType: Training Event,Advance,提前
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,再次重复出现。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,兑换收益/损失
 DocType: Opportunity,Lost Reason,丧失原因
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,新地址
 DocType: Quality Inspection,Sample Size,样本大小
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,请输入收据凭证
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,所有品目已开具发票
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',请指定一个有效的“从案号”
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',请指定一个有效的“从案号”
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,进一步的成本中心可以根据组进行，但项可以对非组进行
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,用户和权限
 DocType: Vehicle Log,VLOG.,VLOG。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +941,Production Orders Created: {0},生产订单创建：{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},生产订单创建：{0}
 DocType: Branch,Branch,分支
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,印刷及品牌
 DocType: Company,Total Monthly Sales,每月销售总额
 DocType: Bin,Actual Quantity,实际数量
 DocType: Shipping Rule,example: Next Day Shipping,例如：次日发货
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,序列号{0}未找到
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +220,Subscription has been {0},订阅已经{0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},订阅已经{0}
 DocType: Fee Schedule Program,Fee Schedule Program,费用计划计划
 DocType: Fee Schedule Program,Student Batch,学生批
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +117,select * from `tabVital Signs` where patient='{0}' order by signs_date desc limit 1,select * from`tabVital Signs&#39;where patient =&#39;{0}&#39;order by signs_date desc limit 1
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,使学生
 DocType: Supplier Scorecard Scoring Standing,Min Grade,最小成绩
-apps/erpnext/erpnext/projects/doctype/project/project.py +198,You have been invited to collaborate on the project: {0},您已被邀请在项目上进行合作：{0}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +73,Physician not available on {0},医师不适用于{0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},您已被邀请在项目上进行合作：{0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},医师不适用于{0}
 DocType: Leave Block List Date,Block Date,禁离日期
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +70,Add custom field Subscription Id in the doctype {0},在doctype {0}中添加自定义字段Subscription Id
 DocType: Purchase Receipt,Supplier Delivery Note,供应商交货单
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,现在申请
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,现在申请
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},实际数量{0} /等待数量{1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},实际数量{0} /等待数量{1}
 DocType: Purchase Invoice,E-commerce GSTIN,电子商务GSTIN
 DocType: Sales Order,Not Delivered,未交付
+apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,预计日期不能在交易日期之前
 ,Bank Clearance Summary,银行结算摘要
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",创建和管理每日，每周和每月的电子邮件摘要。
 DocType: Appraisal Goal,Appraisal Goal,评估目标
@@ -2454,12 +2499,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,房屋
 DocType: Fee Schedule,Fee Structure,费用结构
 DocType: Timesheet Detail,Costing Amount,成本核算金额
-DocType: Student Admission,Application Fee,报名费
+DocType: Student Admission Program,Application Fee,报名费
 DocType: Process Payroll,Submit Salary Slip,提交工资单
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,品目{0}的最大折扣为 {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,品目{0}的最大折扣为 {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,进口散装
 DocType: Sales Partner,Address & Contacts,地址及联系方式
 DocType: SMS Log,Sender Name,发件人名称
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,按标准排序
 DocType: POS Profile,[Select],[选择]
 DocType: Vital Signs,Blood Pressure (diastolic),血压（舒张）
 DocType: SMS Log,Sent To,发给
@@ -2468,7 +2514,7 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,接下来跟日期不能过去
 DocType: Company,For Reference Only.,仅供参考。
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},{1}医生{0}不可用
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2527,Select Batch No,选择批号
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,选择批号
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},无效的{0}：{1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,参考文献
@@ -2484,15 +2530,15 @@
 DocType: Normal Test Items,Require Result Value,需要结果值
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,箱号不能为0
 DocType: Item,Show a slideshow at the top of the page,在页面顶部显示幻灯片
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Boms,物料清单
-apps/erpnext/erpnext/stock/doctype/item/item.py +138,Stores,仓库
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,物料清单
+apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,仓库
 DocType: Project Type,Projects Manager,项目经理
 DocType: Serial No,Delivery Time,交货时间
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,账龄基于
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +52,Appointment cancelled,预约被取消
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +66,Appointment cancelled,预约被取消
 DocType: Item,End of Life,寿命结束
-apps/erpnext/erpnext/demo/setup/setup_data.py +329,Travel,旅游
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +180,No active or default Salary Structure found for employee {0} for the given dates,发现员工{0}对于给定的日期没有活动或默认的薪酬结构
+apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,出差
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +182,No active or default Salary Structure found for employee {0} for the given dates,发现员工{0}对于给定的日期没有活动或默认的薪酬结构
 DocType: Leave Block List,Allow Users,允许用户(多个)
 DocType: Purchase Order,Customer Mobile No,客户手机号码
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,经常性
@@ -2501,18 +2547,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,更新成本
 DocType: Item Reorder,Item Reorder,项目重新排序
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,显示工资单
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +814,Transfer Material,转印材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,转印材料
 DocType: Fees,Send Payment Request,发送付款请求
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",设定流程，操作成本及向流程指定唯一的流程编号
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,这份文件是超过限制，通过{0} {1}项{4}。你在做另一个{3}对同一{2}？
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,请设置保存后复发
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +757,Select change amount account,选择变化量账户
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,选择变化量账户
 DocType: Purchase Invoice,Price List Currency,价格表货币
 DocType: Naming Series,User must always select,用户必须始终选择
 DocType: Stock Settings,Allow Negative Stock,允许负库存
 DocType: Installation Note,Installation Note,安装注意事项
 DocType: Topic,Topic,话题
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,从融资现金流
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,融资现金流
 DocType: Budget Account,Budget Account,预算科目
 DocType: Quality Inspection,Verified By,认证机构
 apps/erpnext/erpnext/setup/doctype/company/company.py +70,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",因为已有交易不能改变公司的默认货币，请先取消交易。
@@ -2526,7 +2572,7 @@
 DocType: Supplier Scorecard Scoring Standing,Employee,雇员
 DocType: Sample Collection,Collected Time,收集时间
 DocType: Company,Sales Monthly History,销售月历
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +190,Select Batch,选择批次
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,选择批次
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1}已完全开票
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,生命体征
 DocType: Training Event,End Time,结束时间
@@ -2534,16 +2580,18 @@
 DocType: Payment Entry,Payment Deductions or Loss,付款扣除或损失
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,销售或采购的标准合同条款。
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,基于凭证分组
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,你确定要取消这个预约吗？
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,销售渠道
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},请薪酬部分设置默认帐户{0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,要求在
 DocType: Rename Tool,File to Rename,文件重命名
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},请行选择BOM为项目{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},请行选择BOM为项目{0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},帐户{0}与帐户模式{2}中的公司{1}不符
 apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},品目{1}指定的BOM{0}不存在
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护计划{0}
+DocType: POS Profile,Applicable for Users,适用于用户
 DocType: Notification Control,Expense Claim Approved,报销批准
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +319,Salary Slip of employee {0} already created for this period,员工的工资单{0}已为这一时期创建
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,员工的工资单{0}已为这一时期创建
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,医药
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,采购品目成本
 DocType: Selling Settings,Sales Order Required,销售订单为必须项
@@ -2567,6 +2615,7 @@
 DocType: Offer Letter,Accepted,已接受
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,组织
 DocType: BOM Update Tool,BOM Update Tool,BOM更新工具
+apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company",未指定派对帐户，请在公司设置默认派对帐户
 DocType: SG Creation Tool Course,Student Group Name,学生组名称
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,创造费用
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,请确保你真的要删除这家公司的所有交易。主数据将保持原样。这个动作不能撤消。
@@ -2575,30 +2624,31 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} {1}不能大于生产订单{3}的计划数量({2})
 DocType: Shipping Rule,Shipping Rule Label,配送规则标签
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,用户论坛
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +299,Raw Materials cannot be blank.,原材料不能为空。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +487,"Could not update stock, invoice contains drop shipping item.",无法更新库存，发票包含下降航运项目。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,原材料不能为空。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.",无法更新库存，发票包含由供应商交货（直接发运）项目。
 DocType: Lab Test Sample,Lab Test Sample,实验室测试样品
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,快速日记帐分录
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,如果任何条目中引用了BOM，你不能更改其税率
+DocType: Restaurant,Invoice Series Prefix,发票系列前缀
 DocType: Employee,Previous Work Experience,以前的工作经验
 DocType: Stock Entry,For Quantity,对于数量
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},请输入计划数量的项目{0}在行{1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},请输入计划数量的项目{0}在行{1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1}未提交
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,请求的项目。
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,独立的生产订单将每个成品项目被创建。
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0}在返回文档中必须为负
 ,Minutes to First Response for Issues,分钟的问题第一个反应
 DocType: Purchase Invoice,Terms and Conditions1,条款和条件1
-apps/erpnext/erpnext/public/js/setup_wizard.js +102,The name of the institute for which you are setting up this system.,该机构的名称要为其建立这个系统。
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,该机构的名称要为其建立这个系统。
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",会计分录冻结截止至此日期，除了以下角色禁止录入/修改。
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,9 。考虑税收或支出：在本部分中，您可以指定，如果税务/充电仅适用于估值（总共不一部分） ，或只为总（不增加价值的项目） ，或两者兼有。
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,最新价格在所有BOM中更新
 DocType: Fee Schedule,Successful,成功
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,项目状态
 DocType: UOM,Check this to disallow fractions. (for Nos),要对编号禁止分数，请勾选此项。
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +428,The following Production Orders were created:,创建以下生产订单：
-DocType: Student Admission,Naming Series (for Student Applicant),命名系列（面向学生申请人）
-DocType: Delivery Note,Transporter Name,转运名称
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,创建以下生产订单：
+DocType: Student Admission Program,Naming Series (for Student Applicant),命名系列（面向学生申请人）
+DocType: Delivery Note,Transporter Name,承运商名称
 DocType: Authorization Rule,Authorized Value,授权值
 DocType: BOM,Show Operations,显示操作
 ,Minutes to First Response for Opportunity,分钟的机会第一个反应
@@ -2621,7 +2671,7 @@
 ,Employees working on a holiday,员工在假期工作
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,马克现在
 DocType: Project,% Complete Method,完成百分比法
-apps/erpnext/erpnext/setup/setup_wizard/healthcare.py +186,Drug,药物
+apps/erpnext/erpnext/healthcare/setup.py +180,Drug,药物
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},序列号为{0}的开始日期不能早于交付日期
 DocType: Production Order,Actual End Date,实际结束日期
 DocType: BOM,Operating Cost (Company Currency),营业成本（公司货币）
@@ -2639,13 +2689,13 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,审批与被审批用户不能相同
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),基础利率（按库存计量单位）
 DocType: SMS Log,No of Requested SMS,请求短信数量
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +243,Leave Without Pay does not match with approved Leave Application records,停薪留职不批准请假的记录相匹配
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,停薪留职不批准请假的记录相匹配
 DocType: Campaign,Campaign-.####,活动-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,下一步
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,请在提供最好的利率规定的项目
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,创建发票
 DocType: Selling Settings,Auto close Opportunity after 15 days,15天之后自动关闭商机
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +74,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,由于{1}的记分卡，{0}不允许采购订单。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,由于{1}的记分卡，{0}不允许采购订单。
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,结束年份
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,报价/铅％
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,报价/铅％
@@ -2653,6 +2703,7 @@
 DocType: Vital Signs,Nutrition Values,营养价值观
 DocType: Lab Test Template,Is billable,是可计费的
 DocType: Delivery Note,DN-,DN-
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",“医师时间表”和“每次预约时间”都必须为{0}医生设置
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,授权销售公司产品的第三方分销商/经销商/授权代理商/分支机构/转销商
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0}不允许采购订单{1}
 DocType: Patient,Patient Demographics,患者人口统计学
@@ -2679,8 +2730,8 @@
 7. Total: Cumulative total to this point.
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
-10. Add or Deduct: Whether you want to add or deduct the tax.","可应用到所有采购交易中的标准税项模板。此模板可以包含多个税项及其他的开支项(例如“运费”，“保险费”，“处理费”等)。
-###需要注意的是，这里指定的是所有品目的标准税费率。如果品目存在不同的税费率，你必须在“品目大师”内的“品目税项”内添加。
+10. Add or Deduct: Whether you want to add or deduct the tax.","标准税项模板可应用到所有采购交易中。此模板可以包含多个税项及其他的开支项(例如“运费”，“保险费”，“处理费”等)。
+###需要注意的是，这里指定的是试用于相关单据中所有物料的标准税费率。如果某些物料的税费率与标准税费率不同，则您必须在“物料主数据”内的“物料税项”内添加。
 ####列说明
 1. 计算类型：-“净总计”(即基本总额)；-“基于前一行的总计/金额”(用于累计税费率)，选择此项则税费将基于前一行的总计/金额按百分比计算；-“实际”(按实际输入)。
 2. 账户头： 此税费对应的会计分类帐。
@@ -2690,11 +2741,10 @@
 6. 金额：税项金额
 7. 总计：到这里为止的累计
 8. 输入行： 如果选择了“基于前一行的总计/金额”，你可以选择此税项基于的行数(默认为前一行)。
-9. 税费应用于：你可以在这个部分指定此税费仅应用于评估(即不影响总计)， 或者仅应用于总计(即不会应用到单个品目)，或者两者。
+9. 税费应用于：你可以在此部分指定此税费影响库存计价(即不再是总计的一部分)， 或者仅作为总计的一部分，而不单独附加到每个物料上，或两者。
 10. 添加或扣除： 添加还是扣除此税费。"
 DocType: Homepage,Homepage,主页
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,选择医师...
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +81,update tabConsultation set invoice='{0}' where name='{1}',update tabConsultation set invoice =&#39;{0}&#39;，其中name =&#39;{1}&#39;
 DocType: Purchase Receipt Item,Recd Quantity,记录数量
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},费纪录创造 -  {0}
 DocType: Asset Category Account,Asset Category Account,资产类别的帐户
@@ -2706,7 +2756,7 @@
 DocType: Asset,Manual,手册
 DocType: Salary Component Account,Salary Component Account,薪金部分账户
 DocType: Global Defaults,Hide Currency Symbol,隐藏货币符号
-apps/erpnext/erpnext/config/accounts.py +333,"e.g. Bank, Cash, Credit Card",例如：银行，现金，信用卡
+apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card",例如：银行，现金，信用卡
 DocType: Lead Source,Source Name,源名称
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""",成年人的正常静息血压约为收缩期120mmHg，舒张压80mmHg，缩写为“120 / 80mmHg”
 DocType: Journal Entry,Credit Note,信用票据
@@ -2725,16 +2775,16 @@
 DocType: Patient,Occupation,占用
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,行{0} ：开始日期必须是之前结束日期
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),总计（数量）
-DocType: Sales Invoice,This Document,本文档
 DocType: Installation Note Item,Installed Qty,已安装数量
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,这可能是因为一些无效的电子邮件地址
 apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,你加了
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,训练结果
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,培训结果
 DocType: Purchase Invoice,Is Paid,支付
 DocType: Salary Structure,Total Earning,总盈利
 DocType: Purchase Receipt,Time at which materials were received,收到材料在哪个时间
 DocType: Stock Ledger Entry,Outgoing Rate,传出率
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,组织分支主。
+apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,组织分支主。
 apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,或
 DocType: Sales Order,Billing Status,账单状态
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,报告问题
@@ -2748,16 +2798,17 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +113,No employee for the above selected criteria OR salary slip already created,已创建的任何雇员对上述选择标准或工资单
 DocType: Notification Control,Sales Order Message,销售订单信息
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",设置例如公司，货币，当前财政年度等的默认值
-DocType: Payment Entry,Payment Type,针对选择您要分配款项的发票。
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,请选择项目{0}的批次。无法找到满足此要求的单个批次
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +130,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,请选择项目{0}的批次。无法找到满足此要求的单个批次
+DocType: Payment Entry,Payment Type,付款类型
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,请选择项目{0}的批次。无法找到满足此要求的单个批次
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,请选择项目{0}的批次。无法找到满足此要求的单个批次
+DocType: Hub Category,Parent Category,父类别
 DocType: Process Payroll,Select Employees,选择雇员
 DocType: Opportunity,Potential Sales Deal,潜在的销售交易
 DocType: Complaint,Complaints,投诉
 DocType: Payment Entry,Cheque/Reference Date,支票/参考日期
 DocType: Purchase Invoice,Total Taxes and Charges,总营业税金及费用
 DocType: Employee,Emergency Contact,紧急联络人
-DocType: Bank Reconciliation Detail,Payment Entry,付款输入
+DocType: Bank Reconciliation Detail,Payment Entry,付款记录
 DocType: Item,Quality Parameters,质量参数
 ,sales-browser,销售浏览器
 apps/erpnext/erpnext/accounts/doctype/account/account.js +73,Ledger,分类账
@@ -2788,25 +2839,25 @@
 DocType: Bin,Reserved Quantity,保留数量
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,请输入有效的电子邮件地址
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,请输入有效的电子邮件地址
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +546,Please select an item in the cart,请在购物车中选择一个项目
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,请在购物车中选择一个项目
 DocType: Landed Cost Voucher,Purchase Receipt Items,采购入库项目
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,自定义表单
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,拖欠
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,期间折旧额
-apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,残疾人模板必须不能默认模板
+apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,被禁用模板不能设为默认模板
 DocType: Account,Income Account,收益账户
 DocType: Payment Request,Amount in customer's currency,量客户的货币
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,交货
 DocType: Stock Reconciliation Item,Current Qty,目前数量
-apps/erpnext/erpnext/utilities/user_progress.py +85,Add Suppliers,添加供应商
+DocType: Restaurant Menu,Restaurant Menu,餐厅菜单
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,上一页
 DocType: Appraisal Goal,Key Responsibility Area,关键责任区
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",学生批帮助您跟踪学生的出勤，评估和费用
 DocType: Payment Entry,Total Allocated Amount,总拨款额
-apps/erpnext/erpnext/setup/doctype/company/company.py +147,Set default inventory account for perpetual inventory,设置永久库存的默认库存帐户
+apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,设置永续库存模式下的默认库存科目
 DocType: Item Reorder,Material Request Type,物料申请类型
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Accural日记条目从{0}薪金{1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +817,"LocalStorage is full, did not save",localStorage的是满的，没救
+apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save",localStorage的是满的，没救
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,行{0}：计量单位转换系数是必需的
 apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,房间容量
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,参考
@@ -2845,25 +2896,27 @@
 DocType: Project,Task Completion,任务完成
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,断货
 DocType: Appraisal,HR User,HR用户
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS？
 DocType: Purchase Invoice,Taxes and Charges Deducted,已扣除税费
-apps/erpnext/erpnext/hooks.py +129,Issues,问题
+apps/erpnext/erpnext/hooks.py +138,Issues,问题
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},状态必须是{0}中的一个
 DocType: Sales Invoice,Debit To,入借
+DocType: Restaurant Menu Item,Restaurant Menu Item,餐厅菜单项
 DocType: Delivery Note,Required only for sample item.,只对样品项目所需。
-DocType: Stock Ledger Entry,Actual Qty After Transaction,事务后实际数量
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},没有找到之间的工资单{0}和{1}
+DocType: Stock Ledger Entry,Actual Qty After Transaction,交易过帐后实际数量
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},没有找到之间的工资单{0}和{1}
 ,Pending SO Items For Purchase Request,待处理的SO项目对于采购申请
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,学生入学
-apps/erpnext/erpnext/accounts/party.py +353,{0} {1} is disabled,{0} {1}已禁用
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,学生入学
+apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1}已禁用
 DocType: Supplier,Billing Currency,结算货币
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,特大号
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,叶总
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,总休假
 DocType: Consultation,In print,已出版
 ,Profit and Loss Statement,损益表
 DocType: Bank Reconciliation Detail,Cheque Number,支票号码
 ,Sales Browser,销售列表
-DocType: Journal Entry,Total Credit,总积分
+DocType: Journal Entry,Total Credit,总贷方金额
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},警告：针对库存记录{2}存在另一个{0}＃{1}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +51,Local,当地
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),贷款及垫款（资产）
@@ -2877,22 +2930,23 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,请注明无需访问
 DocType: Stock Settings,Default Valuation Method,默认估值方法
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,费用
+apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,正在更新。请稍等。
 DocType: Vehicle Log,Fuel Qty,燃油数量
 DocType: Production Order Operation,Planned Start Time,计划开始时间
 DocType: Course,Assessment,评定
-DocType: Payment Entry Reference,Allocated,已调配
+DocType: Payment Entry Reference,Allocated,已核销
 apps/erpnext/erpnext/config/accounts.py +275,Close Balance Sheet and book Profit or Loss.,关闭资产负债表，打开损益表。
 DocType: Student Applicant,Application Status,应用现状
 DocType: Sensitivity Test Items,Sensitivity Test Items,灵敏度测试项目
 DocType: Fees,Fees,费用
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,指定货币兑换的汇率
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +158,Quotation {0} is cancelled,报价{0}已被取消
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Outstanding Amount,未偿还总额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Outstanding Amount,总待处理金额
 DocType: Sales Partner,Targets,目标
 DocType: Price List,Price List Master,价格表大师
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,所有的销售交易都可以标记多个**销售人员**，方便你设置和监控目标。
 ,S.O. No.,销售订单号
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +204,Please create Customer from Lead {0},请牵头建立客户{0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},请牵头建立客户{0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,选择患者
 DocType: Price List,Applicable for Countries,适用于国家
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,参数名称
@@ -2924,27 +2978,29 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,开支/差异帐户({0})必须是一个“益损”账户
 DocType: Project,Copied From,复制自
 DocType: Project,Copied From,复制自
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Name error: {0},名称错误：{0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,短缺
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},名称错误：{0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,短缺
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} 没有关联 {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,雇员{0}的考勤已标记
 DocType: Packing Slip,If more than one package of the same type (for print),如果有多个同样类型的打包（用于打印）
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,请在“餐厅设置”中设置默认客户
 ,Salary Register,薪酬注册
 DocType: Warehouse,Parent Warehouse,家长仓库
 DocType: C-Form Invoice Detail,Net Total,总净
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},项目{0}和项目{1}找不到默认BOM
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},项目{0}和项目{1}找不到默认BOM
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,定义不同的贷款类型
 DocType: Bin,FCFS Rate,FCFS率
-DocType: Payment Reconciliation Invoice,Outstanding Amount,未偿还的金额
+DocType: Payment Reconciliation Invoice,Outstanding Amount,未付金额
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),时间（分钟）
 DocType: Project Task,Working,工作
 DocType: Stock Ledger Entry,Stock Queue (FIFO),库存队列(先进先出)
-apps/erpnext/erpnext/public/js/setup_wizard.js +120,Financial Year,财政年度
+apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,财政年度
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0}不属于公司{1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,无法解决{0}的标准分数函数。确保公式有效。
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,成本上
 DocType: Healthcare Settings,Out Patient Settings,出患者设置
 DocType: Account,Round Off,四舍五入
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,数量必须是正数
 ,Requested Qty,请求数量
 DocType: Tax Rule,Use for Shopping Cart,使用的购物车
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},值{0}的属性{1}不在有效的项目列表中存在的属性值项{2}
@@ -2953,7 +3009,6 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",费用会根据你选择的品目数量和金额按比例分配。
 DocType: Maintenance Visit,Purposes,用途
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,ATLEAST一个项目应该负数量回报文档中输入
-apps/erpnext/erpnext/utilities/user_progress.py +166,Add Courses,添加课程
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",操作{0}比任何可用的工作时间更长工作站{1}，分解成运行多个操作
 ,Requested,要求
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,暂无说明
@@ -2965,6 +3020,8 @@
 DocType: Employee Loan,Repaid/Closed,偿还/关闭
 DocType: Item,Total Projected Qty,预计总数量
 DocType: Monthly Distribution,Distribution Name,分配名称
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,供应商&gt;供应商类型
+apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",对于{1} {2}进行会计分录所需的项目{0}，找不到估值。如果该项目在{1}中作为零估值率项目进行交易，请在{1}项目表中提及。否则，请在项目记录中创建货物的进货库存交易或提交估值费率，然后尝试提交/取消此条目
 DocType: Course,Course Code,课程代码
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},品目{0}要求质量检验
 DocType: POS Settings,Use POS in Offline Mode,在离线模式下使用POS
@@ -2974,24 +3031,24 @@
 DocType: Salary Detail,Condition and Formula Help,条件和公式帮助
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,管理区域
 DocType: Journal Entry Account,Sales Invoice,销售发票
-DocType: Journal Entry Account,Party Balance,党平衡
-apps/erpnext/erpnext/accounts/page/pos/pos.js +479,Please select Apply Discount On,请选择适用的折扣
-DocType: Company,Default Receivable Account,默认应收账户
+DocType: Journal Entry Account,Party Balance,往来单位余额
+apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,请选择适用的折扣
+DocType: Company,Default Receivable Account,默认应收科目
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,为上述选择条件支付的工资总计创建银行分录
 DocType: Physician,Physician Schedule,医师表
 DocType: Purchase Invoice,Deemed Export,被视为出口
 DocType: Stock Entry,Material Transfer for Manufacture,用于生产的物料转移
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,折扣百分比可以应用于一个或所有的价目表。
-DocType: Purchase Invoice,Half-yearly,半年一次
+DocType: Subscription,Half-yearly,半年一次
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,库存的会计分录
 DocType: Lab Test,LabTest Approver,LabTest审批者
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,您已经评估了评估标准{}。
 DocType: Vehicle Service,Engine Oil,机油
 DocType: Sales Invoice,Sales Team1,销售团队1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,产品{0}不存在
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,物料{0}不存在
 DocType: Sales Invoice,Customer Address,客户地址
 DocType: Employee Loan,Loan Details,贷款详情
-DocType: Company,Default Inventory Account,默认库存帐户
+DocType: Company,Default Inventory Account,默认存货科目
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,行{0}：已完成数量必须大于零。
 DocType: Antibiotic,Antibiotic Name,抗生素名称
 DocType: Purchase Invoice,Apply Additional Discount On,收取额外折扣
@@ -3011,13 +3068,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,超小
 DocType: Company,Standard Template,标准模板
 DocType: Training Event,Theory,理论
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +777,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料请求的数量低于最低起订量
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料请求的数量低于最低起订量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,科目{0}已冻结
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,属于本机构的，带独立科目表的法人/附属机构。
 DocType: Payment Request,Mute Email,静音电子邮件
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",食品，饮料与烟草
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +684,Can only make payment against unbilled {0},只能使支付对未付款的{0}
-apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,佣金率不能大于100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},只能针对未开票部分付款{0}
+apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,佣金率不能大于100
 DocType: Stock Entry,Subcontract,外包
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,请输入{0}第一
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,从没有回复
@@ -3025,7 +3082,7 @@
 DocType: Production Planning Tool,Download Materials Required,下载所需物料
 DocType: Item,Manufacturer Part Number,制造商零件编号
 DocType: Production Order Operation,Estimated Time and Cost,预计时间和成本
-DocType: Bin,Bin,仓位
+DocType: Bin,Bin,储位
 DocType: SMS Log,No of Sent SMS,发送短信数量
 DocType: Antibiotic,Healthcare Administrator,医疗管理员
 apps/erpnext/erpnext/utilities/user_progress.py +44,Set a Target,设定目标
@@ -3035,10 +3092,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,颜色
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,评估计划标准
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,防止采购订单
+apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,易感
 DocType: Patient Appointment,Scheduled,已计划
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,询价。
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,请在人力资源&gt;人力资源设置中设置员工命名系统
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",请选择项，其中“正股项”是“否”和“是销售物品”是“是”，没有其他产品捆绑
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,选择客户
 DocType: Student Log,Academic,学术的
 DocType: Patient,Personal and Social History,个人和社会史
 DocType: Fee Schedule,Fee Breakup for each student,每名学生的费用分手
@@ -3048,7 +3106,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,估值率
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,柴油机
-apps/erpnext/erpnext/stock/get_item_details.py +329,Price List Currency not selected,价格表货币没有选择
+apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,价格表货币没有选择
 apps/erpnext/erpnext/config/healthcare.py +46,Results,结果
 ,Student Monthly Attendance Sheet,学生每月考勤表
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},雇员{0}申请了{1}，时间是{2}至{3}
@@ -3064,7 +3122,7 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,管理销售合作伙伴。
 DocType: Quality Inspection,Inspection Type,检验类型
 DocType: Fee Validity,Visited yet,已访问
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +131,Warehouses with existing transaction can not be converted to group.,与现有的交易仓库不能转换为组。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,与现有的交易仓库不能转换为组。
 DocType: Assessment Result Tool,Result HTML,结果HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,到期
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,新增学生
@@ -3076,7 +3134,7 @@
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,计划注册学生工具
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,姓名或电子邮件是强制性
 apps/erpnext/erpnext/config/stock.py +168,Incoming quality inspection.,来料质量检验。
-DocType: Purchase Order Item,Returned Qty,返回的数量
+DocType: Purchase Order Item,Returned Qty,退货数量
 DocType: Employee,Exit,退出
 apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,根类型是强制性的
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0}目前拥有{1}供应商记分卡，并且谨慎地向该供应商发出询价。
@@ -3091,7 +3149,7 @@
 DocType: Healthcare Settings,Result Printed,结果打印
 DocType: Asset Category Account,Depreciation Expense Account,折旧费用帐户
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,试用期
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +25,View {0},查看{0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},查看{0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,只有叶节点中允许交易
 DocType: Expense Claim,Expense Approver,开支审批人
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,行{0}：提前对客户必须是信用
@@ -3103,7 +3161,6 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,以日期时间
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,课程表删除：
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,日志维护短信发送状态
-apps/erpnext/erpnext/patches/v8_9/add_setup_progress_actions.py +14,Set Sales Target,设置销售目标
 DocType: Accounts Settings,Make Payment via Journal Entry,通过日记帐分录进行付款
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,印上
 DocType: Item,Inspection Required before Delivery,分娩前检查所需
@@ -3111,7 +3168,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,待活动
 DocType: Patient Appointment,Reminded,提醒
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +99,Your Organization,你的组织
+apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,你的组织
 DocType: Fee Component,Fees Category,费用类别
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,请输入解除日期。
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,金额
@@ -3123,7 +3180,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,重新排序级别
 DocType: Company,Chart Of Accounts Template,图表帐户模板
 DocType: Attendance,Attendance Date,考勤日期
-apps/erpnext/erpnext/stock/get_item_details.py +293,Item Price updated for {0} in Price List {1},项目价格更新{0}价格表{1}
+apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},项目价格更新{0}价格表{1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,基于收入和扣款的工资明细。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,科目与子节点不能转换为分类账
 DocType: Purchase Invoice Item,Accepted Warehouse,已接收的仓库
@@ -3139,9 +3196,10 @@
 ,Employee Birthday,雇员生日
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,学生考勤批处理工具
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,限制交叉
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,计划的高级
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,创业投资
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,这个“学年”一个学期{0}和“术语名称”{1}已经存在。请修改这些条目，然后再试一次。
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions against item {0}, you can not change the value of {1}",由于有对项目{0}现有的交易，你不能改变的值{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}",由于有对项目{0}现有的交易，你不能改变的值{1}
 DocType: UOM,Must be Whole Number,必须是整数
 DocType: Leave Control Panel,New Leaves Allocated (In Days),新调配的假期(天数)
 DocType: Purchase Invoice,Invoice Copy,发票副本
@@ -3151,13 +3209,13 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,发票号码
 DocType: Shopping Cart Settings,Orders,订单
 DocType: Employee Leave Approver,Leave Approver,假期审批人
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +258,Please select a batch,请选择一个批次
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,请选择一个批次
 DocType: Assessment Group,Assessment Group Name,评估小组名称
 DocType: Manufacturing Settings,Material Transferred for Manufacture,材料移送制造
 DocType: Expense Claim,"A user with ""Expense Approver"" role",有“费用审批人”角色的用户
 DocType: Landed Cost Item,Receipt Document Type,收据凭证类型
 DocType: Daily Work Summary Settings,Select Companies,选择公司
-,Issued Items Against Production Order,生产订单已发料的品目
+,Issued Items Against Production Order,向生产订单发料的物料
 DocType: Antibiotic,Healthcare,卫生保健
 DocType: Target Detail,Target Detail,目标详细信息
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,所有职位
@@ -3166,7 +3224,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,期末进入
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,选择部门...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,有交易的成本中心不能转化为组
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +355,Amount {0} {1} {2} {3},金额{0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},金额{0} {1} {2} {3}
 DocType: Account,Depreciation,折旧
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),供应商
 DocType: Employee Attendance Tool,Employee Attendance Tool,员工考勤工具
@@ -3174,14 +3232,16 @@
 DocType: Supplier,Credit Limit,信用额度
 DocType: Production Plan Sales Order,Salse Order Date,Salse订单日期
 DocType: Salary Component,Salary Component,薪金部分
-apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,付款项{0}是联合国联
+apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,付款记录{0}没有关联
 DocType: GL Entry,Voucher No,凭证编号
 ,Lead Owner Efficiency,主导效率
 ,Lead Owner Efficiency,主导效率
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,最受欢迎
 DocType: Leave Allocation,Leave Allocation,假期调配
 DocType: Payment Request,Recipient Message And Payment Details,收件人邮件和付款细节
-DocType: Training Event,Trainer Email,教练电子邮件
+DocType: Training Event,Trainer Email,讲师电子邮件
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,物料申请{0}已创建
+DocType: Restaurant Reservation,No of People,没有人
 DocType: Production Planning Tool,Include sub-contracted raw materials,包括分包原料
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,条款或合同模板。
 DocType: Purchase Invoice,Address and Contact,地址和联系方式
@@ -3190,10 +3250,11 @@
 DocType: Supplier,Last Day of the Next Month,下个月的最后一天
 DocType: Support Settings,Auto close Issue after 7 days,7天之后自动关闭问题
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",假，不是之前分配{0}，因为休假余额已经结转转发在未来的假期分配记录{1}
-apps/erpnext/erpnext/accounts/party.py +312,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注意：到期日/计入日已超过客户信用日期{0}天。
+apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注意：到期日/计入日已超过客户信用日期{0}天。
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,学生申请
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,收件人原件
 DocType: Asset Category Account,Accumulated Depreciation Account,累计折旧科目
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,此电子邮件是自动生成的
 DocType: Stock Settings,Freeze Stock Entries,冻结仓储记录
 DocType: Program Enrollment,Boarding Student,寄宿学生
 DocType: Asset,Expected Value After Useful Life,期望值使用寿命结束后
@@ -3201,9 +3262,9 @@
 DocType: Activity Cost,Billing Rate,结算利率
 ,Qty to Deliver,交付数量
 ,Stock Analytics,库存分析
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +499,Operations cannot be left blank,操作不能留空
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,操作不能留空
 DocType: Maintenance Visit Purpose,Against Document Detail No,对文档详情编号
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,党的类型是强制性
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,请输入往来单位类型
 DocType: Quality Inspection,Outgoing,传出
 DocType: Material Request,Requested For,对于要求
 DocType: Quotation Item,Against Doctype,对文档类型
@@ -3223,14 +3284,14 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,为基于活动的组手动选择学生
 DocType: Journal Entry,User Remark,用户备注
 DocType: Lead,Market Segment,市场分类
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +933,Paid Amount cannot be greater than total negative outstanding amount {0},支付的金额不能超过总负余额大于{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},支付金额不能大于总未付金额{0}
 DocType: Supplier Scorecard Period,Variables,变量
 DocType: Employee Internal Work History,Employee Internal Work History,雇员内部就职经历
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),结算(借记)
 DocType: Cheque Print Template,Cheque Size,支票大小
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +232,Serial No {0} not in stock,序列号{0}无库存
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,销售业务的税务模板。
-DocType: Sales Invoice,Write Off Outstanding Amount,核销未付金额
+DocType: Sales Invoice,Write Off Outstanding Amount,注销未付金额
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},帐户{0}与公司{1}不符
 DocType: School Settings,Current Academic Year,当前学年
 DocType: Stock Settings,Default Stock UOM,默认库存计量单位
@@ -3252,21 +3313,22 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,获取更新
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}帐户{2}不属于公司{3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,物料申请{0}已取消或已停止
-apps/erpnext/erpnext/config/hr.py +301,Leave Management,离开管理
+apps/erpnext/erpnext/config/hr.py +305,Leave Management,离开管理
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,基于账户分组
 DocType: Sales Order,Fully Delivered,完全交付
 DocType: Lead,Lower Income,较低收益
+DocType: Restaurant Order Entry,Current Order,当前订单
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},行{0}中的源和目标仓库不能相同
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差异帐户必须是资产/负债类型的帐户，因为此库存盘点在期初进行
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},支付额不能超过贷款金额较大的{0}
 apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,转到程序
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},所需物品的采购订单号{0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +892,Production Order not created,生产订单未创建
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,生产订单未创建
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',“起始日期”必须早于'终止日期'
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},无法改变地位的学生{0}与学生申请链接{1}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},无法改变地位的学生{0}与学生申请链接{1}
 DocType: Asset,Fully Depreciated,已提足折旧
 ,Stock Projected Qty,预计库存量
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,显着的考勤HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",语录是建议，你已经发送到你的客户提高出价
 DocType: Sales Order,Customer's Purchase Order,客户采购订单
@@ -3277,8 +3339,9 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,请设置折旧数预订
 DocType: Supplier Scorecard Period,Calculations,计算
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,价值或数量
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,制作订单不能上调：
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,制作订单不能上调：
 apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,分钟
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请通过设置&gt;设置&gt;命名系列为{0}设置命名系列
 DocType: Purchase Invoice,Purchase Taxes and Charges,购置税和费
 apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,去供应商
 ,Qty to Receive,接收数量
@@ -3292,7 +3355,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,信用帐户必须是资产负债表科目
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,所有供应商类型
 DocType: Global Defaults,Disable In Words,禁用词
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,项目编号是必须项，因为项目没有自动编号
+apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,项目编号是必须项，因为项目没有自动编号
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},报价{0} 不属于{1}类型
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,维护计划品目
 DocType: Sales Order,%  Delivered,％已交付
@@ -3304,7 +3367,7 @@
 DocType: Physician Schedule,Schedule Name,计划名称
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,创建工资单
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +813,Add All Suppliers,添加所有供应商
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +81,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,行＃{0}：分配金额不能大于未结算金额。
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +81,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,行＃{0}：已分配金额不能大于未付金额。
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,浏览BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,抵押贷款
 DocType: Purchase Invoice,Edit Posting Date and Time,编辑投稿时间
@@ -3314,23 +3377,26 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,期初余额权益
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,ñ
-DocType: Appraisal,Appraisal,评估
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,和解
+apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,剩余
+DocType: Appraisal,Appraisal,绩效评估
 DocType: Purchase Invoice,GST Details,消费税细节
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},电子邮件发送到供应商{0}
+DocType: Item,Default Sales Unit of Measure,默认销售单位
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,日期重复
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,授权签字人
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},假期审批人有{0}的角色
 apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,创造费用
-DocType: Hub Settings,Seller Email,卖家电子邮件
 DocType: Project,Total Purchase Cost (via Purchase Invoice),总购买成本（通过采购发票）
 DocType: Training Event,Start Time,开始时间
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,选择数量
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,选择数量
 DocType: Customs Tariff Number,Customs Tariff Number,海关税则号
 DocType: Patient Appointment,Patient Appointment,患者预约
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,审批与被审批角色不能相同
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,从该电子邮件摘要退订
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,从该电子邮件摘要退订
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,获得供应商
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},找不到项目{1} {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,去课程
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,消息已发送
 apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,帐户与子节点不能被设置为分类帐
@@ -3343,11 +3409,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,材料移送制造
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,科目{0}不存在
 DocType: Project,Project Type,项目类型
+apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,子任务存在这个任务。你不能删除这个任务。
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,需要指定目标数量和金额。
-apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,各种活动的费用
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +731,No more results,没有更多的结果
+apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,各种活动的费用
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",设置活动为{0}，因为附连到下面的销售者的雇员不具有用户ID {1}
 DocType: Timesheet,Billing Details,结算明细
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,源和目标仓库必须是不同的
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,源和目标仓库必须是不同的
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},不允许对早于{0}的库存交易进行更新
 DocType: Purchase Invoice Item,PR Detail,PR详细
 DocType: Sales Order,Fully Billed,完全开票
@@ -3374,10 +3442,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,电汇
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,全面检查
 DocType: Vehicle Log,Invoice Ref,发票编号
-DocType: Purchase Order,Recurring Order,周期性订单
-DocType: Company,Default Income Account,默认收益账户
+DocType: Company,Default Income Account,默认收入科目
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,客户群组/客户
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),未关闭的财年利润/损失（信用）
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),未关闭的财年利润/损失
 DocType: Sales Invoice,Time Sheets,考勤表
 DocType: Lab Test Template,Change In Item,更改项目
 DocType: Payment Gateway Account,Default Payment Request Message,默认的付款请求消息
@@ -3388,9 +3455,9 @@
 DocType: Patient,A Negative,一个负面的
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,没有更多内容。
 DocType: Lead,From Customer,源客户
-apps/erpnext/erpnext/demo/setup/setup_data.py +325,Calls,电话
+apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,电话
 apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,一个产品
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Batches,批
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,批
 DocType: Project,Total Costing Amount (via Time Logs),总成本核算金额（通过时间日志）
 apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,制作费用表
 DocType: Purchase Order Item Supplied,Stock UOM,库存计量单位
@@ -3411,11 +3478,11 @@
 DocType: Purchase Receipt Item,Rate and Amount,单价及小计
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +165,Account Type for {0} must be {1},帐户类型为{0}必须{1}
 DocType: Healthcare Settings,Default income accounts to be used if not set in Physician to book Consultation charges.,如果没有在医师中设置默认收入帐户来预订咨询费用。
-apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,叶子度假
+apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,休假与节假日
 DocType: School Settings,Current Academic Term,当前学术期限
 DocType: School Settings,Current Academic Term,当前学术期限
 DocType: Sales Order,Not Billed,未开票
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +75,Both Warehouse must belong to same Company,两个仓库必须属于同一公司
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,两个仓库必须属于同一公司
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,暂无联系人。
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,到岸成本凭证金额
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,供应商开出的账单
@@ -3424,7 +3491,6 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,折扣金额
 DocType: Purchase Invoice,Return Against Purchase Invoice,回到对采购发票
 DocType: Item,Warranty Period (in days),保修期限（天数）
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +128,update `tabPatient Appointment` set sales_invoice='{0}' where name='{1}',更新`tabPatient Appointment` set sales_invoice =&#39;{0}&#39;其中name =&#39;{1}&#39;
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,与关系Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,从运营的净现金
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,项目4
@@ -3433,8 +3499,8 @@
 DocType: Journal Entry Account,Journal Entry Account,日记帐分录帐号
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,学生组
 DocType: Shopping Cart Settings,Quotation Series,报价系列
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",具有名称 {0} 的品目已存在，请更名
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2022,Please select customer,请选择客户
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item",具有名称 {0} 的品目已存在，请更名
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,请选择客户
 DocType: C-Form,I,I
 DocType: Company,Asset Depreciation Cost Center,资产折旧成本中心
 DocType: Sales Order Item,Sales Order Date,销售订单日期
@@ -3443,6 +3509,7 @@
 DocType: Assessment Plan,Assessment Plan,评估计划
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,客户{0}已创建。
 DocType: Stock Settings,Limit Percent,限制百分比
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,目前没有任何仓库可用的库存
 ,Payment Period Based On Invoice Date,已经提交。
 DocType: Sample Collection,No. of print,打印数量
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},{0}没有货币汇率
@@ -3463,7 +3530,7 @@
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,评估报告
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,总消费金额是强制性
 DocType: Lead,Address Desc,地址倒序
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +101,Party is mandatory,党是强制性
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +101,Party is mandatory,请输入往来单位
 DocType: Journal Entry,JV-,将N-
 DocType: Topic,Topic Name,主题名称
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,必须至少选择'销售'或'采购'其中的一项
@@ -3498,27 +3565,29 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,工资总额 - 扣除总额 - 贷款还款
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,当前BOM和新BOM不能相同
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,工资单编号
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,工资单编号
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,退休日期必须大于入职日期
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,有错误，同时在调度过程：
 DocType: Sales Invoice,Against Income Account,对收益账目
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}％交付
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +94,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,项目{0}：有序数量{1}不能低于最低订货量{2}（项中定义）。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,项目{0}：有序数量{1}不能低于最低订货量{2}（项中定义）。
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,月度分布比例
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,请以其他用户身份登录。
 DocType: Territory,Territory Targets,区域目标
-DocType: Delivery Note,Transporter Info,转运信息
+DocType: Delivery Note,Transporter Info,承运商信息
 apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},请设置在默认情况下公司{0} {1}
 DocType: Cheque Print Template,Starting position from top edge,起价顶边位置
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,同一个供应商已多次输入
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,总利润/亏损
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,采购订单项目提供
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Company Name cannot be Company,公司名称不能为公司
+apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,公司名称不能为公司
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,打印模板的信头。
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,标题打印模板例如形式发票。
 DocType: Program Enrollment,Walking,步行
 DocType: Student Guardian,Student Guardian,学生家长
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,估值类型罪名不能标记为包容性
 DocType: POS Profile,Update Stock,更新库存
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,在订阅
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,不同计量单位的项目会导致不正确的（总）净重值。请确保每个品目的净重使用同一个计量单位。
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM税率
 DocType: Asset,Journal Entry for Scrap,日记帐分录报废
@@ -3537,7 +3606,7 @@
 DocType: Sales Invoice Item,Delivery Note Item,送货单品目
 DocType: Expense Claim,Task,任务
 DocType: Purchase Taxes and Charges,Reference Row #,参考行＃
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},品目{0}必须指定批次号
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},物料{0}必须指定批次号
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,这是一个root销售人员，无法被编辑。
 DocType: Salary Detail,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ",如果选择此项，则在此组件中指定或计算的值不会对收入或扣除贡献。但是，它的值可以被添加或扣除的其他组件引用。
 DocType: Salary Detail,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ",如果选择此项，则在此组件中指定或计算的值不会对收入或扣除贡献。但是，它的值可以被添加或扣除的其他组件引用。
@@ -3557,7 +3626,7 @@
 DocType: Supplier Scorecard Criteria,Max Score,最高分数
 DocType: Cheque Print Template,Width of amount in word,在字量的宽度
 DocType: Company,Default Letter Head,默认信头
-DocType: Purchase Order,Get Items from Open Material Requests,获得从公开材料请求项目，
+DocType: Purchase Order,Get Items from Open Material Requests,从公未完成材料申请获取物料
 DocType: Lab Test Template,Standard Selling Rate,标准销售率
 DocType: Account,Rate at which this tax is applied,应用此税率的单价
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +65,Reorder Qty,再订购数量
@@ -3568,27 +3637,29 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",系统用户的（登录）ID，将作为人力资源表单的默认ID。
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}：来自{1}
 DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +48,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,排队更新所有材料清单中的最新价格。可能需要几分钟。
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,排队更新所有材料清单中的最新价格。可能需要几分钟。
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新帐户的名称。注：请不要创建帐户的客户和供应商
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,国家的默认地址模板
 DocType: Sales Order Item,Supplier delivers to Customer,供应商提供给客户
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/Item/{0}) 超出了库存
-apps/erpnext/erpnext/accounts/party.py +315,Due / Reference Date cannot be after {0},到期/参照日期不能迟于{0}
+,Sales Payment Summary,销售付款摘要
+DocType: Restaurant,Restaurant,餐厅
+apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},到期/参照日期不能迟于{0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,数据导入和导出
 DocType: Patient,Account Details,帐户明细
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,没有发现学生
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,没有发现学生
 DocType: Medical Department,Medical Department,医学系
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,供应商记分卡评分标准
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,发票发布日期
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,卖
-DocType: Sales Invoice,Rounded Total,总圆角
+DocType: Sales Invoice,Rounded Total,元整后金额
 DocType: Product Bundle,List items that form the package.,打包的品目列表。
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,百分比分配应该等于100 ％
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,在选择之前，甲方请选择发布日期
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,在选择往来单位之前请先选择记帐日期
 DocType: Program Enrollment,School House,学校议院
 DocType: Serial No,Out of AMC,出资产管理公司
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,请选择报价
-apps/erpnext/erpnext/public/js/utils.js +259,Please select Quotations,请选择报价
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,请选择报价
+apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,请选择报价
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,预订折旧数不能超过折旧总数更大
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,创建维护访问
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,请联系，谁拥有硕士学位的销售经理{0}角色的用户
@@ -3596,7 +3667,7 @@
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,公司(非客户或供应商)大师。
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,这是基于这名学生出席
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,没有学生
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,添加更多项目或全开放形式
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,添加更多项目或全开放形式
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,取消这个销售订单之前必须取消送货单{0}
 apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,转到用户
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金额+写的抵销金额不能大于总计
@@ -3608,7 +3679,7 @@
 DocType: Item,Supplier Items,供应商品目
 DocType: Opportunity,Opportunity Type,机会类型
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,新建公司
-apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,交易只能由公司的创建者被删除
+apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,交易只能由公司的创建者删除
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,总帐分录发现错误数字，你可能在交易中选择了错误的科目。
 DocType: Employee,Prefered Contact Email,首选联系邮箱
 DocType: Cheque Print Template,Cheque Width,支票宽度
@@ -3616,52 +3687,56 @@
 DocType: Fee Schedule,Fee Schedule,收费表
 DocType: Hub Settings,Publish Availability,发布房源
 DocType: Company,Create Chart Of Accounts Based On,创建图表的帐户根据
+apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,无法将其转换为非组。子任务存在。
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,出生日期不能大于今天。
 ,Stock Ageing,库存账龄
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},学生{0}存在针对学生申请{1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),四舍五入调整（公司货币）
-apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,时间表
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,时间表
 apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0}“{1}”被禁用
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,设置为打开
 DocType: Cheque Print Template,Scanned Cheque,支票扫描
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,交易提交时自动向联系人发送电子邮件。
 DocType: Timesheet,Total Billable Amount,总结算金额
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,项目3
+apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,订单输入
 DocType: Purchase Order,Customer Contact Email,客户联系电子邮件
 DocType: Warranty Claim,Item and Warranty Details,项目和保修细节
 DocType: Sales Team,Contribution (%),贡献（％）
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注意：付款分录不会创建，因为“现金或银行账户”没有指定
+apps/erpnext/erpnext/projects/doctype/project/project.py +65,Project {0} already exists,项目{0}已经存在
 DocType: Medical Department,Nursing User,护理用户
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,职责
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +130,Validity period of this quotation has ended.,此报价的有效期已经结束。
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,此报价的有效期已经结束。
 DocType: Expense Claim Account,Expense Claim Account,报销账户
 DocType: Accounts Settings,Allow Stale Exchange Rates,允许陈旧的汇率
 DocType: Sales Person,Sales Person Name,销售人员姓名
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,请在表中输入ATLEAST 1发票
-apps/erpnext/erpnext/utilities/user_progress.py +225,Add Users,添加用户
+apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,添加用户
 DocType: POS Item Group,Item Group,项目群组
 DocType: Item,Safety Stock,安全库存
 DocType: Healthcare Settings,Healthcare Settings,医疗设置
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,为任务进度百分比不能超过100个。
+apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,为任务进度百分比不能超过100个。
 DocType: Stock Reconciliation Item,Before reconciliation,在对账前
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),已添加的税费（公司货币）
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,项目税项的行{0}中必须指定类型为税项/收益/支出/应课的账户。
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,项目税项的行{0}中必须指定类型为税项/收益/支出/应课的账户。
 DocType: Sales Order,Partly Billed,天色帐单
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,项目{0}必须是固定资产项目
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,物料{0}必须被定义为是固定资产
 DocType: Item,Default BOM,默认的BOM
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Debit Note Amount,借方票据金额
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Please re-type company name to confirm,请确认重新输入公司名称
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +79,Total Outstanding Amt,总街货量金额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +79,Total Outstanding Amt,总待处理金额
 DocType: Journal Entry,Printing Settings,打印设置
 DocType: Sales Invoice,Include Payment (POS),包括支付（POS）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,Total Debit must be equal to Total Credit. The difference is {0},总借记必须等于总积分。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,Total Debit must be equal to Total Credit. The difference is {0},总借方必须等于总贷方金额，差异{0}。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,汽车
 DocType: Vehicle,Insurance Company,保险公司
 DocType: Asset Category Account,Fixed Asset Account,固定资产帐户
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,变量
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,来自送货单
 DocType: Student,Student Email Address,学生的电子邮件地址
+DocType: Item,Hub Warehouse,Hub仓库
 DocType: Physician Schedule Time Slot,From Time,起始时间
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,有现货
 DocType: Notification Control,Custom Message,自定义消息
@@ -3670,9 +3745,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,学生地址
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,学生地址
 DocType: Purchase Invoice,Price List Exchange Rate,价目表汇率
+DocType: POS Profile,POS Profile Name,POS配置文件名称
 DocType: Purchase Invoice Item,Rate,单价
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,实习生
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1592,Address Name,地址名称
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,地址名称
 DocType: Stock Entry,From BOM,从BOM
 DocType: Assessment Code,Assessment Code,评估准则
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,基本
@@ -3686,11 +3762,12 @@
 DocType: Salary Slip,Salary Structure,薪酬结构
 DocType: Account,Bank,银行
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空公司
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +818,Issue Material,发料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,发料
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,创建循环时出现错误
 DocType: Material Request Item,For Warehouse,对仓库
-DocType: Employee,Offer Date,报价有效期
+DocType: Employee,Offer Date,录取日期
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,语录
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,You are in offline mode. You will not be able to reload until you have network.,您在离线模式。您将无法重新加载，直到你有网络。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,您在离线模式。您将无法重新加载，直到你有网络。
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,没有学生团体创建的。
 DocType: Purchase Invoice Item,Serial No,序列号
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,每月还款额不能超过贷款金额较大
@@ -3700,17 +3777,18 @@
 DocType: Salary Slip,Total Working Hours,总的工作时间
 DocType: Subscription,Next Schedule Date,下一个附表日期
 DocType: Stock Entry,Including items for sub assemblies,包括子组件项目
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1951,Enter value must be positive,输入值必须为正
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +389,All Territories,所有的区域
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,输入值必须为正
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,所有的区域
 DocType: Purchase Invoice,Items,项目
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,学生已经注册。
 DocType: Fiscal Year,Year Name,年度名称
 DocType: Process Payroll,Process Payroll,处理工资
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +238,There are more holidays than working days this month.,这个月的假期比工作日多。
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,这个月的假期比工作日多。
 DocType: Product Bundle Item,Product Bundle Item,产品包项目
 DocType: Sales Partner,Sales Partner Name,销售合作伙伴名称
-apps/erpnext/erpnext/hooks.py +123,Request for Quotations,索取报价
+apps/erpnext/erpnext/hooks.py +132,Request for Quotations,索取报价
 DocType: Payment Reconciliation,Maximum Invoice Amount,最大发票额
+apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,血液学
 DocType: Normal Test Items,Normal Test Items,正常测试项目
 DocType: Student Language,Student Language,学生语言
 apps/erpnext/erpnext/config/selling.py +23,Customers,客户
@@ -3722,10 +3800,11 @@
 DocType: Issue,Opening Time,开放时间
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,必须指定起始和结束日期
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,证券及商品交易
-apps/erpnext/erpnext/stock/doctype/item/item.py +643,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',测度变异的默认单位“{0}”必须是相同模板“{1}”
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',物料变体的默认单位“{0}”必须与模板默认单位一致“{1}”
 DocType: Shipping Rule,Calculate Based On,计算基于
 DocType: Delivery Note Item,From Warehouse,从仓库
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,No Items with Bill of Materials to Manufacture,不与物料清单的项目，以制造
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,不与物料清单的项目，以制造
+DocType: Restaurant,Default Customer,默认客户
 DocType: Assessment Plan,Supervisor Name,主管名称
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,不要确认是否在同一天创建约会
 DocType: Program Enrollment Course,Program Enrollment Course,课程注册课程
@@ -3753,7 +3832,7 @@
 DocType: Payment Entry,Internal Transfer,内部转账
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,此科目有子科目，无法删除。
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,需要指定目标数量和金额
-apps/erpnext/erpnext/stock/get_item_details.py +527,No default BOM exists for Item {0},品目{0}没有默认的BOM
+apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},品目{0}没有默认的BOM
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,请选择发布日期第一
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,开业日期应该是截止日期之前，
 DocType: Leave Control Panel,Carry Forward,顺延
@@ -3763,7 +3842,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +118,Created Salary Slips,创建工资单
 DocType: Item,Item Code for Suppliers,对于供应商项目编号
 DocType: Issue,Raised By (Email),提出（电子邮件）
-DocType: Training Event,Trainer Name,培训师姓名
+DocType: Training Event,Trainer Name,讲师姓名
 DocType: Mode of Payment,General,一般
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最后沟通
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最后沟通
@@ -3771,7 +3850,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +234,Serial Nos Required for Serialized Item {0},序列化的品目{0}必须指定序列号
 apps/erpnext/erpnext/config/accounts.py +152,Match Payments with Invoices,匹配付款与发票
 DocType: Journal Entry,Bank Entry,银行记录
-DocType: Authorization Rule,Applicable To (Designation),适用于(指定)
+DocType: Authorization Rule,Applicable To (Designation),适用于(职位)
 ,Profitability Analysis,盈利能力分析
 DocType: Fees,Student Email,学生电子邮件
 DocType: Supplier,Prevent POs,防止PO
@@ -3789,13 +3868,14 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,总现
 apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,会计报表
 DocType: Drug Prescription,Hour,小时
+DocType: Restaurant Order Entry,Last Sales Invoice,上次销售发票
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新序列号不能有仓库，仓库只能通过库存记录和采购收据设置。
 DocType: Lead,Lead Type,线索类型
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,您无权批准叶子座日期
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,您无权批准锁定日期内的休假
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +383,All these items have already been invoiced,这些品目都已开具发票
 DocType: Company,Monthly Sales Target,每月销售目标
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},可以被{0}的批准
-DocType: Item,Default Material Request Type,默认材料请求类型
+DocType: Item,Default Material Request Type,默认物料申请类型
 DocType: Supplier Scorecard,Evaluation Period,评估期
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,未知
 DocType: Shipping Rule,Shipping Rule Conditions,配送规则条件
@@ -3825,65 +3905,67 @@
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,创建用户
 apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,公克
 DocType: Supplier Scorecard,Per Month,每月
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,量生产必须大于0。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,量生产必须大于0。
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,保养电话的现场报告。
-DocType: Stock Entry,Update Rate and Availability,更新率和可用性
+DocType: Stock Entry,Update Rate and Availability,更新存货估价和可用性数量
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,百分比你被允许接收或传递更多针对订购的数量。例如：如果您订购100个单位。和你的津贴是10％，那么你被允许接收110个单位。
 DocType: POS Customer Group,Customer Group,客户群组
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),新批号（可选）
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),新批号（可选）
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),新批号（可选）
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),新批号（可选）
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},品目{0}必须指定开支账户
 DocType: BOM,Website Description,网站简介
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,在净资产收益变化
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,最新
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,请取消采购发票{0}第一
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",电子邮件地址必须是唯一的，已经存在了{0}
 DocType: Serial No,AMC Expiry Date,AMC到期时间
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +815,Receipt,收据
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,收据
 ,Sales Register,销售记录
 DocType: Daily Work Summary Settings Company,Send Emails At,发送电子邮件在
 DocType: Quotation,Quotation Lost Reason,报价丧失原因
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,选择您的域名
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +114,select * from tabPatient where name='{0}',select * from tabPatient where name =&#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +362,Transaction reference no {0} dated {1},交易参考编号{0}日{1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},交易参考编号{0}日{1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,无需编辑。
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +325,Form View,表单视图
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,本月和待活动总结
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,表单视图
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,本月和待活动总结
 apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.",将用户添加到您的组织，而不是您自己。
 DocType: Customer Group,Customer Group Name,客户群组名称
-apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,还没有客户！
+apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,还没有客户！
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,现金流量表
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},贷款额不能超过最高贷款额度{0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,执照
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +480,Please remove this Invoice {0} from C-Form {1},请删除此发票{0}从C-表格{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},请删除此发票{0}从C-表格{1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,请选择结转，如果你还需要包括上一会计年度的资产负债叶本财年
 DocType: GL Entry,Against Voucher Type,对凭证类型
 DocType: Physician,Phone (R),电话（R）
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,添加时隙
 DocType: Item,Attributes,属性
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,启用模板
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请通过设置&gt;设置&gt;命名系列为{0}设置命名系列
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,请输入核销帐户
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,最后订购日期
 DocType: Patient,B Negative,B负面
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},帐户{0}不属于公司{1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +872,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列号与交货单不匹配
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列号与交货单不匹配
 DocType: Student,Guardian Details,卫详细
 DocType: C-Form,C-Form,C-表
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,马克出席了多个员工
 DocType: Vehicle,Chassis No,底盘无
 DocType: Payment Request,Initiated,启动
 DocType: Production Order,Planned Start Date,计划开始日期
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,请选择一个物料清单
 DocType: Serial No,Creation Document Type,创建文件类型
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +35,End date must be greater than start date,结束日期必须大于开始日期
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,结束日期必须大于开始日期
 DocType: Leave Type,Is Encash,是否兑现
 DocType: Leave Allocation,New Leaves Allocated,新调配的假期
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,项目明智的数据不适用于报价
+apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,结束
 DocType: Project,Expected End Date,预计结束日期
 DocType: Budget Account,Budget Amount,预算额
 DocType: Appraisal Template,Appraisal Template Title,评估模板标题
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},从日期{0}为雇员{1}不能雇员的接合日期之前{2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,商业
 DocType: Patient,Alcohol Current Use,酒精当前使用
+DocType: Student Admission Program,Student Admission Program,学生入学计划
 DocType: Payment Entry,Account Paid To,账户付至
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,父项{0}不能是库存产品
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,所有的产品或服务。
@@ -3892,30 +3974,32 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} 账户{1}对于{2}{3}的预算是{4}. 预期增加{5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',行{0}＃账户的类型必须是&#39;固定资产&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,输出数量
-apps/erpnext/erpnext/config/accounts.py +322,Rules to calculate shipping amount for a sale,用来计算销售运输量的规则
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,并unchcked在禁用
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,系列是必须项
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,金融服务
 DocType: Student Sibling,Student ID,学生卡
-apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Logs,活动类型的时间记录
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,供应商电邮
+apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,用于工时记录的活动类型
 DocType: Tax Rule,Sales,销售
 DocType: Stock Entry Detail,Basic Amount,基本金额
 DocType: Training Event,Exam,考试
 DocType: Complaint,Complaint,抱怨
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Warehouse required for stock Item {0},物件{0}需要指定仓库
-DocType: Leave Allocation,Unused leaves,未使用的叶子
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},物件{0}需要指定仓库
+DocType: Leave Allocation,Unused leaves,未使用的休假
 DocType: Patient,Alcohol Past Use,酒精过去使用
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,信用
 DocType: Tax Rule,Billing State,计费状态
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,转让
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子品目）
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,转让
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子品目）
 DocType: Authorization Rule,Applicable To (Employee),适用于(员工)
-apps/erpnext/erpnext/controllers/accounts_controller.py +110,Due Date is mandatory,截止日期是强制性的
+apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,截止日期是强制性的
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,增量属性{0}不能为0
 DocType: Journal Entry,Pay To / Recd From,支付/ RECD从
 DocType: Naming Series,Setup Series,设置系列
 DocType: Payment Reconciliation,To Invoice Date,要发票日期
 DocType: Supplier,Contact HTML,联系HTML
 ,Inactive Customers,不活跃的客户
+DocType: Student Admission Program,Maximum Age,最大年龄
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,购买收据
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,定价规则如何被应用？
@@ -3930,10 +4014,11 @@
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,购置税和费模板
 DocType: Upload Attendance,Download Template,下载模板
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}：无论是借方或贷方金额需要{2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}：借方或贷方金额是必输的{2}
 DocType: GL Entry,Remarks,备注
 DocType: Payment Entry,Account Paid From,帐户支付从
 DocType: Purchase Order Item Supplied,Raw Material Item Code,原料产品编号
+DocType: Task,Parent Task,父任务
 DocType: Journal Entry,Write Off Based On,核销基于
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,使铅
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,打印和文具
@@ -3942,20 +4027,20 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",工资已经处理了与{0}和{1}，留下申请期之间不能在此日期范围内的时期。
 apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,一个序列号的安装记录
 DocType: Guardian Interest,Guardian Interest,卫利息
-apps/erpnext/erpnext/config/hr.py +177,Training,训练
+apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,设置POS发票的默认值
+apps/erpnext/erpnext/config/hr.py +177,Training,培训
 DocType: Timesheet,Employee Detail,员工详细信息
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1电子邮件ID
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1电子邮件ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +49,Next Date's day and Repeat on Day of Month must be equal,下一个日期的一天，重复上月的天必须相等
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,下一个日期的一天，重复上月的天必须相等
 DocType: Lab Prescription,Test Code,测试代码
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,对网站的主页设置
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},由于{1}的记分卡，{0}不允许使用RFQ
 DocType: Offer Letter,Awaiting Response,正在等待回应
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,以上
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1113,Total Amount {0},总金额{0}
-apps/erpnext/erpnext/controllers/item_variant.py +217,Invalid attribute {0} {1},无效的属性{0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},总金额{0}
+apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},无效的属性{0} {1}
 DocType: Supplier,Mention if non-standard payable account,如果非标准应付账款提到
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +315,Same item has been entered multiple times. {list},相同的物品已被多次输入。 {}名单
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',请选择“所有评估组”以外的评估组
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},行{0}：项目{1}需要费用中心
 DocType: Training Event Employee,Optional,可选的
@@ -3977,14 +4062,16 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,报废资产成本
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：成本中心是品目{2}的必须项
 DocType: Vehicle,Policy No,政策：
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,获取从产品捆绑项目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,从产品包获取物料
+apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property",由于库存针对的是项目{0}，因此无法启用变体属性
 DocType: Asset,Straight Line,直线
 DocType: Project User,Project User,项目用户
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,分裂
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,分裂
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,分裂
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,分裂
 DocType: GL Entry,Is Advance,是否预付款
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,必须指定考勤起始日期和结束日期
 apps/erpnext/erpnext/controllers/buying_controller.py +153,Please enter 'Is Subcontracted' as Yes or No,请输入'转包' YES或NO
+DocType: Item,Default Purchase Unit of Measure,默认采购单位
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,最后通讯日期
 DocType: Sales Team,Contact No.,联络人电话
 DocType: Bank Reconciliation,Payment Entries,付款项
@@ -3992,7 +4079,6 @@
 DocType: Production Order,Check if material transfer entry is not required,检查是否不需要材料转移条目
 DocType: Production Order,Check if material transfer entry is not required,检查是否不需要材料转移条目
 DocType: Program Enrollment Tool,Get Students From,让学生从
-DocType: Hub Settings,Seller Country,卖家国家
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,公布于网页上的项目
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,一群学生在分批
 DocType: Authorization Rule,Authorization Rule,授权规则
@@ -4002,8 +4088,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,营业税金及费用模板
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),总（信用）
 DocType: Repayment Schedule,Payment Date,付款日期
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,新批量
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,新批量
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,新批量
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,新批量
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,服装及配饰
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,无法解决加权分数函数。确保公式有效。
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,订购次数
@@ -4021,6 +4107,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行＃{0}：资产{1}无法提交，这已经是{2}
 DocType: Tax Rule,Billing Country,结算国家
 DocType: Purchase Order Item,Expected Delivery Date,预计交货日期
+DocType: Restaurant Order Entry,Restaurant Order Entry,餐厅订单录入
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,借贷{0}＃不等于{1}。不同的是{2}。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,娱乐费用
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,制作材料要求
@@ -4033,9 +4120,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,有交易的科目不能被删除
 DocType: Vehicle,Last Carbon Check,最后检查炭
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,法律费用
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +119,Please select quantity on row ,请选择行数量
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,请选择行数量
 DocType: Purchase Invoice,Posting Time,发布时间
 DocType: Timesheet,% Amount Billed,（％）金额帐单
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",没有为{0}博士设置“每次约会的时间”，将其添加到主治医师。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,电话费
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,要用户手动选择序列的话请勾选。勾选此项后将不会选择默认序列。
@@ -4046,8 +4134,9 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,新客户收入
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,差旅费
 DocType: Maintenance Visit,Breakdown,细目
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},在文档类型{0}中添加自定义字段订阅
 apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,帐号：{0}币种：{1}不能选择
-DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",根据最新的估值/价格清单率/最近的原材料采购率，通过计划程序自动更新BOM成本。
+DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",通过后台排程程序基于最新的存货估价/价格表单价/最近的原材料采购单价自动更新BOM成本。
 DocType: Bank Reconciliation Detail,Cheque Date,支票日期
 apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},科目{0}的上级科目{1}不属于公司{2}
 DocType: Program Enrollment Tool,Student Applicants,学生申请
@@ -4059,7 +4148,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Probation,缓刑
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,工资组件
 DocType: Program Enrollment Tool,New Academic Year,新学年
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +762,Return / Credit Note,返回/信用票据
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +762,Return / Credit Note,退货/退款单
 DocType: Stock Settings,Auto insert Price List rate if missing,自动插入价目表率，如果丢失
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +23,Total Paid Amount,总支付金额
 DocType: Production Order Item,Transferred Qty,转让数量
@@ -4069,14 +4158,14 @@
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +14,Student Activity,学生活动
 DocType: Project,Total Billing Amount (via Time Logs),总结算金额（通过时间日志）
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,供应商编号
-DocType: Payment Request,Payment Gateway Details,支付网关细节
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Quantity should be greater than 0,量应大于0
+DocType: Payment Request,Payment Gateway Details,支付网关详情
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,量应大于0
 DocType: Journal Entry,Cash Entry,现金分录
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,子节点可以在&#39;集团&#39;类型的节点上创建
 DocType: Leave Application,Half Day Date,半天日期
 DocType: Academic Year,Academic Year Name,学年名称
 DocType: Sales Partner,Contact Desc,联系人倒序
-apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",叶似漫不经心，生病等类型
+apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",休假类型，比如调休，病假等
 DocType: Email Digest,Send regular summary reports via Email.,通过电子邮件发送定期汇总报告。
 DocType: Payment Entry,PE-,PE-
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +254,Please set default account in Expense Claim Type {0},请报销类型设置默认帐户{0}
@@ -4088,12 +4177,14 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,注意：品目{0}已多次输入
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,所有联系人。
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,公司缩写
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,用户{0}不存在
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,用户{0}不存在
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,缩写
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,付款项目已存在
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,付款记录已存在
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,不允许，因为{0}超出范围
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,薪资模板大师。
+apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,病理
+DocType: Restaurant Order Entry,Restaurant Table,餐桌
 DocType: Leave Type,Max Days Leave Allowed,允许的最长假期天数
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,购物车设置税收规则
 DocType: Purchase Invoice,Taxes and Charges Added,已添加的税费
@@ -4104,19 +4195,19 @@
 ,Qty to Transfer,转移数量
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,向潜在客户或客户发出的报价。
 DocType: Stock Settings,Role Allowed to edit frozen stock,角色可以编辑冻结库存
-,Territory Target Variance Item Group-Wise,按物件组的区域目标波动
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +139,All Customer Groups,所有客户群组
+,Territory Target Variance Item Group-Wise,按物料组的区域目标差异
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,所有客户群组
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,每月累计
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是必填项。{1}和{2}的货币转换记录可能还未生成。
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +40,Tax Template is mandatory.,税务模板是强制性的。
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,税务模板是强制性的。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,科目{0}的上级科目{1}不存在
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),价格列表费率（公司货币）
 DocType: Products Settings,Products Settings,产品设置
-DocType: Lab Prescription,Test Created,测试创建
+DocType: Lab Prescription,Test Created,测试已创建
 DocType: Healthcare Settings,Custom Signature in Print,自定义签名打印
 DocType: Account,Temporary,临时
 DocType: Program,Courses,培训班
-DocType: Monthly Distribution Percentage,Percentage Allocation,百分比分配
+DocType: Monthly Distribution Percentage,Percentage Allocation,核销百分比
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +124,Secretary,秘书
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",如果禁用“，在词”字段不会在任何交易可见
 DocType: Serial No,Distinct unit of an Item,品目的属性
@@ -4127,20 +4218,20 @@
 DocType: Patient,AB Negative,AB阴性
 DocType: Sample Collection,SMPL-,SMPL-
 DocType: POS Profile,Apply Discount On,申请折扣
-,Reqd By Date,REQD按日期
+,Reqd By Date,需求日期
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,债权人
 DocType: Assessment Plan,Assessment Name,评估名称
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No is mandatory,行＃{0}：序列号是必需的
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,项目特定的税项详情
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,研究所缩写
 ,Item-wise Price List Rate,逐项价目表率
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +921,Supplier Quotation,供应商报价
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,供应商报价
 DocType: Quotation,In Words will be visible once you save the Quotation.,大写金额将在报价单保存后显示。
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},数量（{0}）不能是行{1}中的分数
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},数量（{0}）不能是行{1}中的分数
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +446,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
+apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,规则增加运输成本。
 DocType: Item,Opening Stock,期初库存
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,客户是必须项
@@ -4149,7 +4240,7 @@
 DocType: Purchase Order,To Receive,接受
 apps/erpnext/erpnext/utilities/user_progress.py +231,user@example.com,user@example.com
 DocType: Employee,Personal Email,个人电子邮件
-apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,总方差
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,总差异
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",如果启用，系统将自动为库存创建会计分录。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,佣金
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,考勤员工{0}已标记为这一天
@@ -4158,9 +4249,8 @@
 DocType: Customer,From Lead,来自潜在客户
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,发布生产订单。
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,选择财政年度...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +556,POS Profile required to make POS Entry,需要POS资料，使POS进入
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,需要POS资料，使POS进入
 DocType: Program Enrollment Tool,Enroll Students,招生
-DocType: Hub Settings,Name Token,名称令牌
 DocType: Lab Test,Approved Date,批准日期
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,标准销售
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,必须选择至少一个仓库
@@ -4178,7 +4268,7 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,人力资源
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,付款方式付款对账
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,所得税资产
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +621,Production Order has been {0},生产订单已经{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},生产订单已经{0}
 DocType: BOM Item,BOM No,BOM编号
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,日记帐分录{0}没有科目{1}或已经匹配其他凭证
@@ -4189,7 +4279,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,假期天数必须为0.5的倍数
 DocType: Production Order,Operation Cost,运营成本
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,由.csv文件上传考勤记录
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,优秀的金额
+apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,未付金额
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,为销售人员设置品次群组特定的目标
 DocType: Stock Settings,Freeze Stocks Older Than [Days],冻结老于此天数的库存
 apps/erpnext/erpnext/controllers/accounts_controller.py +535,Row #{0}: Asset is mandatory for fixed asset purchase/sale,行＃{0}：资产是必须的固定资产购买/销售
@@ -4197,9 +4287,9 @@
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,会计年度：{0}不存在
 DocType: Currency Exchange,To Currency,以货币
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,允许以下用户批准在禁离日请假的申请。
-apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,报销的类型。
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},项目{0}的销售价格低于其{1}。售价应至少为{2}
-apps/erpnext/erpnext/controllers/selling_controller.py +175,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},项目{0}的销售价格低于其{1}。售价应至少为{2}
+apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,费用报销类型。
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},项目{0}的销售价格低于其{1}。售价应至少为{2}
+apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},项目{0}的销售价格低于其{1}。售价应至少为{2}
 DocType: Item,Taxes,税
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,支付和未送达
 DocType: Project,Default Cost Center,默认成本中心
@@ -4213,15 +4303,15 @@
 DocType: Employee Loan,Fully Disbursed,全额支付
 DocType: Maintenance Visit,Customer Feedback,客户反馈
 DocType: Account,Expense,开支
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,分数不能超过最高得分更大
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,分数不能超过最高得分更大
 apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,客户和供应商
 DocType: Item Attribute,From Range,从范围
 DocType: BOM,Set rate of sub-assembly item based on BOM,基于BOM设置子组合项目的速率
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Syntax error in formula or condition: {0},式或条件语法错误：{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},式或条件语法错误：{0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,每日工作总结公司的设置
 apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,产品{0}不属于库存产品，因此被忽略
 DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,提交此生产订单以进行下一步处理。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,提交此生产订单以进行下一步处理。
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",要在一个特定的交易不适用于定价规则，所有适用的定价规则应该被禁用。
 DocType: Assessment Group,Parent Assessment Group,家长评估小组
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,工作
@@ -4238,26 +4328,26 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',如果Group By是“Company”，请设置公司过滤器空白
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,发布日期不能是未来的日期
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：序列号{1}不相匹配{2} {3}
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,用于生成循环
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,事假
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,实验室测试UOM
 DocType: Batch,Batch ID,批次ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},注： {0}
 ,Delivery Note Trends,送货单趋势
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,本周的总结
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,本周的总结
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,库存量
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,科目{0}只能通过库存处理更新
 DocType: Student Group Creation Tool,Get Courses,获取课程
-DocType: GL Entry,Party,一方
+DocType: GL Entry,Party,往来单位
 DocType: Healthcare Settings,Patient Name,患者姓名
 DocType: Variant Field,Variant Field,变种场
 DocType: Sales Order,Delivery Date,交货日期
 DocType: Opportunity,Opportunity Date,日期机会
 DocType: Purchase Receipt,Return Against Purchase Receipt,回到对外购入库单
 DocType: Request for Quotation Item,Request for Quotation Item,询价项目
-DocType: Purchase Order,To Bill,比尔
+DocType: Purchase Order,To Bill,待开票
 DocType: Material Request,% Ordered,%  已排序
 DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",对于基于课程的学生组，课程将从入学课程中的每个学生确认。
-DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date",用逗号分隔的输入电子邮件地址，发票就会自动在特定日期邮寄
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,计件工作
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,平均买入价
 DocType: Task,Actual Time (in Hours),实际时间（小时）
@@ -4268,10 +4358,10 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +82,Same item has been entered multiple times,同一项目已进入多次
 DocType: Department,Leave Block List,禁离日列表
 DocType: Sales Invoice,Tax ID,税号
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,项目{0}没有设置序列号，序列号必须留空
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,项目{0}没有启用序列好管理功能，序列号必须留空
 DocType: Accounts Settings,Accounts Settings,账户设置
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,批准
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +148,No Result to submit,没有结果提交
+apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,没有结果提交
 DocType: Customer,Sales Partner and Commission,销售合作伙伴及佣金
 DocType: Employee Loan,Rate of Interest (%) / Year,利息（％）/年的速率
 ,Project Quantity,工程量
@@ -4283,58 +4373,57 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,黑
 DocType: BOM Explosion Item,BOM Explosion Item,BOM展开品目
 DocType: Account,Auditor,审计员
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,{0}项目已产生
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0}物料已生产
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,学到更多
 DocType: Cheque Print Template,Distance from top edge,从顶边的距离
-apps/erpnext/erpnext/stock/get_item_details.py +308,Price List {0} is disabled or does not exist,价格表{0}禁用或不存在
+apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,价格表{0}禁用或不存在
 DocType: Purchase Invoice,Return,回报
 DocType: Production Order Operation,Production Order Operation,生产订单操作
 DocType: Pricing Rule,Disable,禁用
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,付款方式需要进行付款
 DocType: Project Task,Pending Review,待审核
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,预约和咨询
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0}  -  {1}未注册批次{2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0}  -  {1}未注册批次{2}
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",资产{0}不能被废弃，因为它已经是{1}
 DocType: Task,Total Expense Claim (via Expense Claim),总费用报销（通过费用报销）
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,马克缺席
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},行{0}：BOM＃的货币{1}应等于所选货币{2}
 DocType: Journal Entry Account,Exchange Rate,汇率
 DocType: Patient,Additional information regarding the patient,有关患者的其他信息
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,Sales Order {0} is not submitted,销售订单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,销售订单{0}未提交
 DocType: Homepage,Tag Line,标语
 DocType: Fee Component,Fee Component,收费组件
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,车队的管理
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +919,Add items from,添加的项目
+apps/erpnext/erpnext/config/hr.py +199,Fleet Management,车队的管理
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,添加的项目
 DocType: Cheque Print Template,Regular,定期
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,所有评估标准的权重总数要达到100％
-DocType: BOM,Last Purchase Rate,最后采购价格
+DocType: Purchase Order Item,Last Purchase Rate,最后采购价格
 DocType: Account,Asset,资产
 DocType: Project Task,Task ID,任务ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,品目{0}不能有库存，因为他存在变体
 DocType: Lab Test,Mobile,移动
 ,Sales Person-wise Transaction Summary,销售人员特定的交易汇总
 DocType: Training Event,Contact Number,联系电话
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Warehouse {0} does not exist,仓库{0}不存在
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,立即注册ERPNext中心
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,仓库{0}不存在
 DocType: Monthly Distribution,Monthly Distribution Percentages,月度分布比例
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,所选项目不能有批次
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",估值率未找到项{0}，这是需要做用于记帐条目{1} {2}。如果该项目交易作为样本项目{1}，请提及的是，在{1}项目表。否则，请创建传入股票的交易在项目记录的项目或提估价率，然后尝试submiting /取消此条
 DocType: Delivery Note,% of materials delivered against this Delivery Note,此出货单% 的材料已交货。
+DocType: Training Event,Has Certificate,有证书
 DocType: Project,Customer Details,客户详细信息
 DocType: Employee,Reports to,报告以
 ,Unpaid Expense Claim,未付费用报销
 DocType: Payment Entry,Paid Amount,支付的金额
 apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,探索销售周期
 DocType: Assessment Plan,Supervisor,监
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +63,Online,线上
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,线上
 ,Available Stock for Packing Items,库存可用打包品目
 DocType: Item Variant,Item Variant,项目变体
 DocType: Assessment Result Tool,Assessment Result Tool,评价结果工具
 DocType: BOM Scrap Item,BOM Scrap Item,BOM项目废料
-apps/erpnext/erpnext/accounts/page/pos/pos.js +894,Submitted orders can not be deleted,提交的订单不能被删除
+apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,提交的订单不能被删除
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",账户余额已设置为'借方'，不能设置为'贷方'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,质量管理
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,项目{0}已被禁用
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,物料{0}已被禁用
 DocType: Employee Loan,Repay Fixed Amount per Period,偿还每期固定金额
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},请输入量的项目{0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +78,Credit Note Amt,信用证
@@ -4352,19 +4441,19 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,允许零估值
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,允许零估值
 DocType: Training Event Employee,Invited,邀请
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Multiple active Salary Structures found for employee {0} for the given dates,发现员工{0}对于给定的日期多个活动薪金结构
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,发现员工{0}对于给定的日期多个活动薪金结构
 apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,设置网关帐户。
 DocType: Employee,Employment Type,就职类型
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,固定资产
 DocType: Payment Entry,Set Exchange Gain / Loss,设置兑换收益/损失
-,GST Purchase Register,消费税购买登记册
-,Cash Flow,现金周转
+,GST Purchase Register,消费税相关采购台账
+,Cash Flow,现金流量表
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,申请期间不能跨两个alocation记录
-DocType: Item Group,Default Expense Account,默认支出账户
+DocType: Item Group,Default Expense Account,默认费用科目
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,学生的电子邮件ID
 DocType: Employee,Notice (days),通告（天）
 DocType: Tax Rule,Sales Tax Template,销售税模板
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2456,Select items to save the invoice,选取要保存发票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,选取要保存发票
 DocType: Employee,Encashment Date,兑现日期
 DocType: Training Event,Internet,互联网
 DocType: Special Test Template,Special Test Template,特殊测试模板
@@ -4374,7 +4463,7 @@
 DocType: Academic Term,Term Start Date,合同起始日期
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +183,Please find attached {0} #{1},随函附上{0}＃{1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +242,Please find attached {0} #{1},随函附上{0}＃{1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,银行对账单余额按总帐
 DocType: Job Applicant,Applicant Name,申请人姓名
 DocType: Authorization Rule,Customer / Item Name,客户/项目名称
@@ -4394,7 +4483,7 @@
 DocType: Guardian,Guardian Of ,守护者
 DocType: Grading Scale Interval,Threshold,阈
 DocType: BOM Update Tool,Current BOM,当前BOM
-apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,添加序列号
+apps/erpnext/erpnext/public/js/utils.js +49,Add Serial No,添加序列号
 DocType: Production Order Item,Available Qty at Source Warehouse,源仓库可用数量
 apps/erpnext/erpnext/config/support.py +22,Warranty,质量保证
 DocType: Purchase Invoice,Debit Note Issued,借记发行说明
@@ -4417,10 +4506,9 @@
 DocType: Account,Receivable,应收账款
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供应商的采购订单已经存在
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,作用是允许提交超过设定信用额度交易的。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +925,Select Items to Manufacture,选择项目，以制造
-apps/erpnext/erpnext/accounts/page/pos/pos.js +962,"Master data syncing, it might take some time",主数据同步，这可能需要一些时间
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,选择项目，以制造
+apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time",主数据同步，这可能需要一些时间
 DocType: Item,Material Issue,发料
-DocType: Hub Settings,Seller Description,卖家描述
 DocType: Employee Education,Qualification,学历
 DocType: Item Price,Item Price,项目价格
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,肥皂和洗涤剂
@@ -4428,7 +4516,8 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,从时间不能超过结束时间大。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,影视业
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,订购
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +44,Resume,恢复
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,恢复
+DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,如果启用，那么系统将不会更新模板中变体的字段，但会在创建新变体时复制下面提到的字段的数据
 DocType: Salary Detail,Component,零件
 DocType: Assessment Criteria,Assessment Criteria Group,评估标准组
 DocType: Healthcare Settings,Patient Name By,病人姓名By
@@ -4438,7 +4527,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,请输入角色核准或审批用户
 DocType: Journal Entry,Write Off Entry,核销分录
 DocType: BOM,Rate Of Materials Based On,基于以下的物料单价
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,供应商&gt;供应商类型
+DocType: Item Variant Settings,Do not Update Variants,不要更新变体
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,客户支持分析
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,取消所有
 DocType: POS Profile,Terms and Conditions,条款和条件
@@ -4447,7 +4536,7 @@
 DocType: Leave Block List,Applies to Company,适用于公司
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,不能取消，因为提交的仓储记录{0}已经存在
 DocType: Employee Loan,Disbursement Date,支付日期
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +61,'Recipients' not specified,&#39;收件人&#39;未指定
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;收件人&#39;未指定
 DocType: BOM Update Tool,Update latest price in all BOMs,更新所有BOM的最新价格
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +40,Medical Record,医疗记录
 DocType: Vehicle,Vehicle,车辆
@@ -4463,14 +4552,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead％
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,资产折旧和平衡
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} transferred from {2} to {3},金额{0} {1}从转移{2}到{3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},金额{0} {1}从转移{2}到{3}
 DocType: Sales Invoice,Get Advances Received,获取已收预付款
 DocType: Email Digest,Add/Remove Recipients,添加/删除收件人
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},交易不反对停止生产订单允许{0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},生产订单已关闭，不允许此交易{0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",要设置这个财政年度为默认值，点击“设为默认”
-apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,加入
+apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,加入
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,短缺数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item variant {0} exists with same attributes,项目变体{0}存在具有相同属性
+apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,项目变体{0}存在具有相同属性
 DocType: Employee Loan,Repay from Salary,从工资偿还
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},请求对付款{0} {1}量{2}
@@ -4481,9 +4570,9 @@
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,“结束日期”必需设置
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",生成要发货品目的装箱单，包括包号，内容和重量。
 DocType: Sales Invoice Item,Sales Order Item,销售订单品目
-DocType: Salary Slip,Payment Days,金天
+DocType: Salary Slip,Payment Days,付款天数
 DocType: Patient,Dormant,休眠
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +121,Warehouses with child nodes cannot be converted to ledger,与子节点仓库不能转换为分类账
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,与子节点仓库不能转换为分类账
 DocType: BOM,Manage cost of operations,管理流程成本
 DocType: Accounts Settings,Stale Days,陈旧的日子
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",当所选的业务状态更改为“已提交”时，自动打开一个弹出窗口向有关的联系人编写邮件，业务将作为附件添加。用户可以选择发送或者不发送邮件。
@@ -4497,10 +4586,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,序列号{0}已收到过
 ,Requested Items To Be Transferred,要求要传输的项目
 DocType: Expense Claim,Vehicle Log,车辆登录
-DocType: Purchase Invoice,Recurring Id,经常性ID
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),发烧（温度&gt; 38.5°C / 101.3°F或持续温度&gt; 38°C / 100.4°F）
 DocType: Customer,Sales Team Details,销售团队详情
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1349,Delete permanently?,永久删除？
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,永久删除？
 DocType: Expense Claim,Total Claimed Amount,总索赔额
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,销售的潜在机会
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},无效的{0}
@@ -4510,7 +4598,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,百货
 ,Item Delivery Date,物品交货日期
 DocType: Warehouse,PIN,销
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +109,Setup your School in ERPNext,设置你的ERPNext学校
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,设置你的ERPNext学校
 DocType: Sales Invoice,Base Change Amount (Company Currency),基地涨跌额（公司币种）
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,没有以下仓库的会计分录
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,首先保存文档。
@@ -4522,13 +4610,12 @@
 DocType: Task,Is Milestone,是里程碑
 DocType: Daily Work Summary,Email Sent To,电子邮件发送给
 DocType: Budget,Warn,警告
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,你确定要取消注册？
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",任何其他言论，值得一提的努力，应该在记录中。
 DocType: BOM,Manufacturing User,生产用户
 DocType: Purchase Invoice,Raw Materials Supplied,供应的原料
-DocType: Purchase Invoice,Recurring Print Format,常用打印格式
 DocType: C-Form,Series,系列
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Currency of the price list {0} must be {1} or {2},价目表{0}的货币必须是{1}或{2}
-apps/erpnext/erpnext/utilities/user_progress.py +114,Add Products,添加产品
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},价目表{0}的货币必须是{1}或{2}
 DocType: Appraisal,Appraisal Template,评估模板
 DocType: Item Group,Item Classification,项目分类
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,业务发展经理
@@ -4537,14 +4624,14 @@
 DocType: Drug Prescription,Period,期
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,总帐
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},雇员{0}上离开{1}
-apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,查看信息
+apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,查看（销售）线索
 DocType: Program Enrollment Tool,New Program,新程序
 DocType: Item Attribute Value,Attribute Value,属性值
 ,Itemwise Recommended Reorder Level,项目特定的推荐重订购级别
 DocType: Salary Detail,Salary Detail,薪酬详细
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1022,Please select {0} first,请选择{0}第一
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,请选择{0}第一
 DocType: Appointment Type,Physician,医师
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,一批项目的{0} {1}已过期。
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,物料{1}的批号{0} 已过期。
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,磋商
 DocType: Sales Invoice,Commission,佣金
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,时间表制造。
@@ -4553,7 +4640,7 @@
 DocType: Salary Detail,Default Amount,默认金额
 DocType: Lab Test Template,Descriptive,描述的
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,仓库在系统中未找到
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,本月摘要
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,本月摘要
 DocType: Quality Inspection Reading,Quality Inspection Reading,质量检验报告
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`冻结老于此天数的库存`应该比％d天小。
 DocType: Tax Rule,Purchase Tax Template,购置税模板
@@ -4576,12 +4663,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,培训活动/结果
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,作为累计折旧
 DocType: Sales Invoice,C-Form Applicable,C-表格适用
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},运行时间必须大于0的操作{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},运行时间必须大于0的操作{0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,仓库是强制性的
 DocType: Supplier,Address and Contacts,地址和联系方式
 DocType: UOM Conversion Detail,UOM Conversion Detail,计量单位换算详情
 DocType: Program,Program Abbreviation,计划缩写
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,生产订单不能对一个项目提出的模板
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,生产订单不能对一个项目提出的模板
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,费用会在每个品目的采购收据中更新
 DocType: Warranty Claim,Resolved By,议决
 DocType: Bank Guarantee,Start Date,开始日期
@@ -4591,7 +4678,7 @@
 DocType: Purchase Invoice Item,Price List Rate,价格列表费率
 apps/erpnext/erpnext/utilities/activation.py +72,Create customer quotes,创建客户报价
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",根据此仓库显示“有库存”或“无库存”状态。
-apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),材料清单(BOM)
+apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),物料清单(BOM)
 DocType: Item,Average time taken by the supplier to deliver,采取供应商的平均时间交付
 DocType: Sample Collection,Collected By,收藏者
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +22,Assessment Result,评价结果
@@ -4607,27 +4694,28 @@
 DocType: Employee,Educational Qualification,学历
 DocType: Workstation,Operating Costs,运营成本
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,如果积累了每月预算超出行动
-DocType: Purchase Invoice,Submit on creation,提交关于创建
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +464,Currency for {0} must be {1},货币{0}必须{1}
+DocType: Subscription,Submit on creation,提交关于创建
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},货币{0}必须{1}
 DocType: Asset,Disposal Date,处置日期
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",电子邮件将在指定的时间发送给公司的所有在职职工，如果他们没有假期。回复摘要将在午夜被发送。
 DocType: Employee Leave Approver,Employee Leave Approver,雇员假期审批者
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一个重新排序条目已存在这个仓库{1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.",不能更改状态为丧失，因为已有报价。
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,培训反馈
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一个重新排序条目已存在这个仓库{1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.",不能更改状态为丧失，因为已有报价。
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,培训反馈
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,生产订单{0}必须提交
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,供应商记分卡标准
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},请选择开始日期和结束日期的项目{0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},当然是行强制性{0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,无效的主名称
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc的DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +264,Add / Edit Prices,添加/编辑价格
+apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,添加/编辑价格
 DocType: Batch,Parent Batch,父母批
 DocType: Batch,Parent Batch,父母批
 DocType: Cheque Print Template,Cheque Print Template,支票打印模板
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,成本中心表
 DocType: Lab Test Template,Sample Collection,样品收集
 ,Requested Items To Be Ordered,要求项目要订购
+apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,我的订单
 DocType: Price List,Price List Name,价格列表名称
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},每日工作总结{0}
 DocType: Employee Loan,Totals,总计
@@ -4646,12 +4734,12 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1}在需要{2}在{3} {4}：{5}来完成这一交易单位。
 DocType: Fee Schedule,Student Category,学生组
 DocType: Announcement,Student,学生
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,组织单位（部门）的主人。
+apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,组织单位（部门）的主人。
 apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,去房间
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,在发送前，请填写留言
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,供应商重复
 DocType: Email Digest,Pending Quotations,待语录
-apps/erpnext/erpnext/config/accounts.py +321,Point-of-Sale Profile,简介销售点的
+apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,简介销售点的
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,实验室测试配置。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,无担保贷款
 DocType: Cost Center,Cost Center Name,成本中心名称
@@ -4661,6 +4749,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,数金额金额
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,大于160个字符的消息将被分割为多条消息
 DocType: Purchase Receipt Item,Received and Accepted,收到并接受
+DocType: Hub Settings,Company and Seller Profile,公司和卖方简介
 ,GST Itemised Sales Register,消费税商品销售登记册
 ,Serial No Service Contract Expiry,序列号/年度保养合同过期
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,您不可以将一个账户同时设置为借方和贷方。
@@ -4670,10 +4759,11 @@
 DocType: Item,Variant Based On,基于变异对
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},分配的总权重应为100 ％ 。这是{0}
 apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,您的供应商
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,请更正
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,不能更改状态为丧失，因为已有销售订单。
 DocType: Request for Quotation Item,Supplier Part No,供应商部件号
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',当类是“估值”或“Vaulation和总&#39;不能扣除
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +358,Received From,从......收到
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,从......收到
 DocType: Lead,Converted,已转换
 DocType: Item,Has Serial No,有序列号
 DocType: Employee,Date of Issue,签发日期
@@ -4681,7 +4771,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",根据购买设置，如果需要购买记录==“是”，则为了创建采购发票，用户需要首先为项目{0}创建采购凭证
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},行＃{0}：设置供应商项目{1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,行{0}：小时值必须大于零。
-apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,网站图像{0}附加到物品{1}无法找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,网站图像{0}附加到物品{1}无法找到
 DocType: Issue,Content Type,内容类型
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,电脑
 DocType: Item,List this Item in multiple groups on the website.,在网站上的多个组中显示此品目
@@ -4689,17 +4779,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +323,Please check Multi Currency option to allow accounts with other currency,请检查多币种选项，允许帐户与其他货币
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +85,Item: {0} does not exist in the system,项目{0}不存在
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,您没有权限设定冻结值
-DocType: Payment Reconciliation,Get Unreconciled Entries,获取未调节分录
+DocType: Payment Reconciliation,Get Unreconciled Entries,获取未对帐/结清分录
 DocType: Payment Reconciliation,From Invoice Date,从发票日期
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,您没有权限提交
-apps/erpnext/erpnext/accounts/party.py +261,Billing currency must be equal to either default comapany's currency or party account currency,结算币种必须等于要么默认业公司的货币或一方账户货币
+apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,帐单币种必须与公司的默认货币或往来单位账户货币一致
 DocType: Healthcare Settings,Laboratory Settings,实验室设置
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,离开兑现
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,What does it do?,贵公司的标语
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,到仓库
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,所有学生入学
+apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,贵公司的标语
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,到仓库
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,所有学生入学
 ,Average Commission Rate,平均佣金率
-apps/erpnext/erpnext/stock/doctype/item/item.py +407,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
+apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,选择状态
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,考勤不能标记为未来的日期
 DocType: Pricing Rule,Pricing Rule Help,定价规则说明
@@ -4717,56 +4807,55 @@
 DocType: Item,Customer Code,客户代码
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},{0}的生日提醒
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,自上次订购天数
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,Debit To account must be a Balance Sheet account,借记帐户必须是资产负债表科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,借记帐户必须是资产负债表科目
 DocType: Buying Settings,Naming Series,命名系列
 DocType: Leave Block List,Leave Block List Name,禁离日列表名称
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,保险开始日期应小于保险终止日期
+apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,请在学校&gt;学校设置中设置教师命名系统
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,库存资产
 DocType: Timesheet,Production Detail,生产细节
+DocType: Restaurant,Active Menu,活动菜单
 DocType: Target Detail,Target Qty,目标数量
 DocType: Shopping Cart Settings,Checkout Settings,结帐设置
 DocType: Attendance,Present,现
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,送货单{0}不能提交
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,送货单{0}不能提交
 DocType: Notification Control,Sales Invoice Message,销售发票信息
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,关闭帐户{0}的类型必须是负债/权益
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,Salary Slip of employee {0} already created for time sheet {1},员工的工资单{0}已为时间表创建{1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},员工的工资单{0}已为时间表创建{1}
 DocType: Vehicle Log,Odometer,里程表
 DocType: Sales Order Item,Ordered Qty,订购数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is disabled,项目{0}无效
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,物料{0}已被禁用
 DocType: Stock Settings,Stock Frozen Upto,库存冻结止
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +895,BOM does not contain any stock item,BOM不包含任何库存项目
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,项目活动/任务。
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM不包含任何库存项目
+apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,项目活动/任务。
 DocType: Vehicle Log,Refuelling Details,加油详情
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,生成工资条
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}",“适用于”为{0}时必须勾选“采购”
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,折扣必须小于100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +121,Last purchase rate not found,最后购买率未找到
 DocType: Purchase Invoice,Write Off Amount (Company Currency),核销金额（公司货币）
 DocType: Sales Invoice Timesheet,Billing Hours,结算时间
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,默认BOM {0}未找到
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,行＃{0}：请设置再订购数量
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,默认BOM {0}未找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,行＃{0}：请设置再订购数量
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,点击项目将其添加到此处
 DocType: Fees,Program Enrollment,招生计划
 DocType: Landed Cost Voucher,Landed Cost Voucher,到岸成本凭证
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},请设置{0}
-DocType: Purchase Invoice,Repeat on Day of Month,重复上月的日
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0}  -  {1}是非活动学生
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,{0} - {1} is inactive student,{0}  -  {1}是非活动学生
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0}  -  {1}是非活动学生
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0}  -  {1}是非活动学生
 DocType: Employee,Health Details,健康细节
-DocType: Offer Letter,Offer Letter Terms,报价函条款
+DocType: Offer Letter,Offer Letter Terms,录取通知条款
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,要创建付款请求参考文档是必需的
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,要创建付款请求参考文档是必需的
 DocType: Payment Entry,Allocate Payment Amount,分配付款金额
 DocType: Employee External Work History,Salary,工资
 DocType: Serial No,Delivery Document Type,交货文档类型
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,根据上述所选条件提交工资单
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0}项目已同步
 DocType: Sales Order,Partly Delivered,部分交付
 DocType: Email Digest,Receivables,应收款
 DocType: Lead Source,Lead Source,线索来源
 DocType: Customer,Additional information regarding the customer.,对于客户的其他信息。
 DocType: Quality Inspection Reading,Reading 5,阅读5
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +225,"{0} {1} is associated with {2}, but Party Account is {3}",{0} {1}与{2}相关联，但Party Account为{3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +225,"{0} {1} is associated with {2}, but Party Account is {3}",{0} {1}与{2}相关联，但业务伙伴科目为{3}
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,查看实验室测试
 DocType: Purchase Invoice,Y,ÿ
 DocType: Maintenance Visit,Maintenance Date,维护日期
@@ -4782,35 +4871,36 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,账龄范围2
 DocType: SG Creation Tool Course,Max Strength,最大力量
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM已替换
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +988,Select Items based on Delivery Date,根据交付日期选择项目
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,根据交付日期选择项目
 ,Sales Analytics,销售分析
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},可用{0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},可用{0}
 ,Prospects Engaged But Not Converted,展望未成熟
 ,Prospects Engaged But Not Converted,展望未成熟
 DocType: Manufacturing Settings,Manufacturing Settings,生产设置
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,设置电子邮件
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1手机号码
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,请在公司主输入默认货币
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,请在公司设置中维护默认货币
 DocType: Stock Entry Detail,Stock Entry Detail,库存记录详情
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,每日提醒
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,每日提醒
 DocType: Products Settings,Home Page is Products,首页显示产品
 ,Asset Depreciation Ledger,资产减值总帐
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +87,Tax Rule Conflicts with {0},税收规范冲突{0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +88,Tax Rule Conflicts with {0},税收规范冲突{0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,新建账户名称
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,供应的原料成本
 DocType: Selling Settings,Settings for Selling Module,销售模块的设置
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Customer Service,顾客服务
 DocType: BOM,Thumbnail,缩略图
 DocType: Item Customer Detail,Item Customer Detail,项目客户详情
-apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,报价候选作业。
+apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,为求职者提供一份工作
 DocType: Notification Control,Prompt for Email on Submission of,提示电子邮件的提交
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,分配的总叶多天的期限
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,总已核销休假大于此期间天数
 DocType: Pricing Rule,Percentage,百分比
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,项目{0}必须是库存项目
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,默认工作正在进行仓库
 apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,业务会计的默认设置。
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,请在人力资源&gt;人力资源设置中设置员工命名系统
 DocType: Maintenance Visit,MV,MV
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,预计日期不能早于物料申请时间
+DocType: Restaurant,Default Tax Template,默认税收模板
 DocType: Fees,Student Details,学生细节
 DocType: Purchase Invoice Item,Stock Qty,库存数量
 DocType: Purchase Invoice Item,Stock Qty,库存数量
@@ -4819,18 +4909,19 @@
 DocType: Naming Series,Update Series Number,更新序列号
 DocType: Account,Equity,权益
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +78,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}：“损益”帐户类型{2}不允许进入开
-DocType: Sales Order,Printing Details,印刷详情
+DocType: Sales Order,Printing Details,打印设置
 DocType: Task,Closing Date,结算日期
 DocType: Sales Order Item,Produced Quantity,生产的产品数量
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +122,Engineer,工程师
 DocType: Journal Entry,Total Amount Currency,总金额币种
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,搜索子组件
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Item Code required at Row No {0},行{0}中的项目编号是必须项
-apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,转到项目
+apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,转到物料主数据
 DocType: Sales Partner,Partner Type,合作伙伴类型
 DocType: Purchase Taxes and Charges,Actual,实际
+DocType: Restaurant Menu,Restaurant Manager,餐厅经理
 DocType: Authorization Rule,Customerwise Discount,客户折扣
-apps/erpnext/erpnext/config/projects.py +40,Timesheet for tasks.,时间表的任务。
+apps/erpnext/erpnext/config/projects.py +41,Timesheet for tasks.,时间表的任务。
 DocType: Purchase Invoice,Against Expense Account,对开支账目
 DocType: Production Order,Production Order,生产订单
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,安装单{0}已经提交过
@@ -4838,7 +4929,6 @@
 DocType: Quotation Item,Against Docname,对文档名称
 DocType: SMS Center,All Employee (Active),所有员工（活动）
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,立即查看
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,选择周期性发票生成的时间间隔
 DocType: BOM,Raw Material Cost,原材料成本
 DocType: Item Reorder,Re-Order Level,再次订货级别
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,输入要生产的品目和数量或者下载物料清单。
@@ -4851,24 +4941,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,报告类型是强制性的
 DocType: Item,Serial Number Series,序列号系列
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},行{1}中的物件{0}必须指定仓库
-apps/erpnext/erpnext/utilities/user_progress.py +145,Add Programs,添加程序
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,零售及批发
 DocType: Issue,First Responded On,首次回复时间
 DocType: Website Item Group,Cross Listing of Item in multiple groups,多个群组品目交叉显示
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},财政年度开始日期和结束日期已经在财年{0}中设置
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,间隙更新日期
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,拆分批
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,拆分批
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,对账/盘点成功
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,拆分批
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,拆分批
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,核消/对账成功
 DocType: Request for Quotation Supplier,Download PDF,下载PDF
 DocType: Production Order,Planned End Date,计划的结束日期
+apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,请输入计划日期
 apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,物件的存储位置。
 DocType: Request for Quotation,Supplier Detail,供应商详细
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Error in formula or condition: {0},公式或条件错误:{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},公式或条件错误:{0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,已开票金额
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,标准重量必须达100％
 DocType: Attendance,Attendance,考勤
-apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,库存产品
+apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,库存产品
 DocType: BOM,Materials,物料
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",如果未选中，此列表将需要手动添加到部门。
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,源和目标仓库不能相同
@@ -4886,6 +4976,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,基于净总计
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},为属性{0}值必须的范围内{1}到{2}中的增量{3}为项目{4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,行{0}的目标仓库必须与生产订单的仓库相同
+DocType: Restaurant Reservation,Waitlisted,轮候
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,货币不能使用其他货币进行输入后更改
 DocType: Vehicle Service,Clutch Plate,离合器压盘
 DocType: Company,Round Off Account,四舍五入账户
@@ -4902,7 +4993,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,新销售人员的姓名
 DocType: Packing Slip,Gross Weight UOM,毛重计量单位
 DocType: Delivery Note Item,Against Sales Invoice,对销售发票
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please enter serial numbers for serialized item ,请输入序列号序列号
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,请输入序列号序列号
 DocType: Bin,Reserved Qty for Production,预留数量生产
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在制作基于课程的组时考虑批量，请不要选中。
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在制作基于课程的组时考虑批量，请不要选中。
@@ -4914,7 +5005,7 @@
 DocType: Lab Test,Test Group,测试组
 DocType: Payment Reconciliation,Receivable / Payable Account,应收/应付账款
 DocType: Delivery Note Item,Against Sales Order Item,对销售订单项目
-apps/erpnext/erpnext/stock/doctype/item/item.py +662,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
 DocType: Item,Default Warehouse,默认仓库
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},财政预算案不能对集团客户分配{0}
 DocType: Healthcare Settings,Patient Registration,病人登记
@@ -4939,11 +5030,12 @@
 DocType: Student Log,Achievement,成就
 DocType: Batch,Source Document Type,源文档类型
 DocType: Batch,Source Document Type,源文档类型
-DocType: Journal Entry,Total Debit,总借记
+DocType: Journal Entry,Total Debit,总借方金额
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,默认成品仓库
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,销售人员
 apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,预算和成本中心
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,不允许多种默认付款方式
+apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,为了
 ,Appointment Analytics,预约分析
 DocType: Vehicle Service,Half Yearly,半年度
 DocType: Lead,Blog Subscriber,博客订阅者
@@ -4963,13 +5055,13 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,报价计数
 ,BOM Stock Report,BOM库存报告
 DocType: Stock Reconciliation Item,Quantity Difference,数量差异
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,处理工资单
+apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,处理工资单
 DocType: Opportunity Item,Basic Rate,基础税率
 DocType: GL Entry,Credit Amount,信贷金额
 DocType: Cheque Print Template,Signatory Position,签署的位置
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,设置为丧失
 DocType: Timesheet,Total Billable Hours,总计费时间
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,付款收货注意事项
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,付款收据
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,这是基于对这个顾客的交易。详情请参阅以下时间表
 DocType: Supplier,Credit Days Based On,信贷天基于
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +161,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},行{0}：分配金额{1}必须小于或等于输入付款金额{2}
@@ -4977,12 +5069,12 @@
 DocType: Tax Rule,Tax Rule,税务规则
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,在整个销售周期使用同一价格
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,规划工作站工作时间以外的时间日志。
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,在排队的客户
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +92,Dr {0} does not have a Physician Schedule. Add it in Physician master,医生{0}没有医师时间表。将其添加到医师大师
+apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,在排队的客户
 DocType: Student,Nationality,国籍
 ,Items To Be Requested,要申请的项目
-DocType: Purchase Order,Get Last Purchase Rate,获取最新的采购税率
 DocType: Company,Company Info,公司简介
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1382,Select or add new customer,选择或添加新客户
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,选择或添加新客户
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,成本中心需要预订费用报销
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),资金(资产)申请
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,这是基于该员工的考勤
@@ -4990,7 +5082,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,借方科目
 DocType: Fiscal Year,Year Start Date,年度起始日期
 DocType: Attendance,Employee Name,雇员姓名
-DocType: Sales Invoice,Rounded Total (Company Currency),圆润的总计（公司货币）
+DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,餐厅订单录入项目
+DocType: Sales Invoice,Rounded Total (Company Currency),元整后金额（公司货币）
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,不能转换到组，因为你选择的是帐户类型。
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1}已被修改过，请刷新。
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,禁止用户在以下日期提交假期申请。
@@ -5000,6 +5093,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,员工福利
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},盒装数量必须等于量项目{0}行{1}
 DocType: Production Order,Manufactured Qty,已生产数量
+apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,已创建发票
 DocType: Purchase Receipt Item,Accepted Quantity,已接收数量
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},请设置一个默认的假日列表为员工{0}或公司{1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}：{1}不存在
@@ -5009,18 +5103,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行无{0}：金额不能大于金额之前对报销{1}。待审核金额为{2}
 DocType: Maintenance Schedule,Schedule,计划任务
 DocType: Account,Parent Account,父帐户
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +239,Available,可用的
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,可用的
 DocType: Quality Inspection Reading,Reading 3,阅读3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,凭证类型
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1714,Price List not found or disabled,价格表未找到或禁用
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,价格表未找到或禁用
 DocType: Lab Test,Approved,已批准
 DocType: Pricing Rule,Price,价格
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,Employee relieved on {0} must be set as 'Left',{0}的假期批准后，雇员的状态必须设置为“离开”
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',{0}的假期批准后，雇员的状态必须设置为“离开”
+DocType: Hub Settings,Last Sync On,上次同步开启
 DocType: Guardian,Guardian,监护人
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,雇员{1}的限期评估{0}已经创建
 DocType: Employee,Education,教育
-apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,德尔
+apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,德尔
 DocType: Selling Settings,Campaign Naming By,活动命名：
 DocType: Employee,Current Address Is,当前地址是
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,每月销售目标（
@@ -5031,16 +5126,16 @@
 DocType: Delivery Note Item,Available Qty at From Warehouse,可用数量从仓库
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,请选择员工记录第一。
 DocType: POS Profile,Account for Change Amount,帐户涨跌额
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：甲方/客户不与匹配{1} / {2} {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：往来单位/科目{1} / {2}与{3} {4}不匹配
 apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,课程编号：
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,请输入您的费用帐户
 DocType: Account,Stock,库存
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1047,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行＃{0}：参考文件类型必须是采购订单之一，购买发票或日记帐分录
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行＃{0}：参考文件类型必须是采购订单之一，购买发票或日记帐分录
 DocType: Employee,Current Address,当前地址
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",如果品目为另一品目的变体，那么它的描述，图片，价格，税率等将从模板自动设置。你也可以手动设置。
 DocType: Serial No,Purchase / Manufacture Details,采购/制造详细信息
 DocType: Assessment Group,Assessment Group,评估小组
-apps/erpnext/erpnext/config/stock.py +325,Batch Inventory,批量库存
+apps/erpnext/erpnext/config/stock.py +325,Batch Inventory,批号库存
 DocType: Employee,Contract End Date,合同结束日期
 DocType: Sales Order,Track this Sales Order against any Project,跟踪对任何项目这个销售订单
 DocType: Sales Invoice Item,Discount and Margin,折扣和保证金
@@ -5056,7 +5151,7 @@
 DocType: Stock Entry,Default Target Warehouse,默认目标仓库
 DocType: Purchase Invoice,Net Total (Company Currency),总净金额（公司货币）
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,年末日期不能超过年度开始日期。请更正日期，然后再试一次。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：党的类型和党的只适用对应收/应付帐户
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：往来单位类型和往来单位只适用于应收/应付帐户
 DocType: Notification Control,Purchase Receipt Message,外购入库单信息
 DocType: BOM,Scrap Items,废物品
 DocType: Production Order,Actual Start Date,实际开始日期
@@ -5066,7 +5161,7 @@
 DocType: Hub Settings,Hub Settings,Hub设置
 DocType: Project,Gross Margin %,毛利率％
 DocType: BOM,With Operations,带工艺
-apps/erpnext/erpnext/accounts/party.py +257,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,会计分录已取得货币{0}为公司{1}。请选择一个应收或应付账户币种{0}。
+apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,会计分录已取得货币{0}为公司{1}。请选择一个应收或应付账户币种{0}。
 DocType: Asset,Is Existing Asset,是对现有资产
 DocType: Salary Detail,Statistical Component,统计组成部分
 DocType: Salary Detail,Statistical Component,统计组成部分
@@ -5075,22 +5170,23 @@
 DocType: BOM Operation,BOM Operation,BOM操作
 DocType: Purchase Taxes and Charges,On Previous Row Amount,基于前一行的金额
 DocType: Student,Home Address,家庭地址
+DocType: Item,Has Expiry Date,有过期日期
 apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,项目变式设置。
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,转让资产
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,转让资产
 DocType: POS Profile,POS Profile,POS简介
 DocType: Training Event,Event Name,事件名称
 DocType: Physician,Phone (Office),电话（办公室）
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,入场
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},招生{0}
+apps/erpnext/erpnext/hooks.py +147,Admission,入场
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},招生{0}
 apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.",设置季节性的预算，目标等。
 DocType: Supplier Scorecard Scoring Variable,Variable Name,变量名
-apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",项目{0}是一个模板，请选择它的一个变体
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",物料{0}是一个模板，请选择它的一个变体
 DocType: Asset,Asset Category,资产类别
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,净支付金额不能为负数
 DocType: Assessment Plan,Room,房间
 DocType: Purchase Order,Advance Paid,已支付的预付款
 DocType: Item,Item Tax,项目税项
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +818,Material to Supplier,材料到供应商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,材料到供应商
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,消费税发票
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}出现％不止一次
 DocType: Expense Claim,Employees Email Id,雇员的邮件地址
@@ -5101,32 +5197,30 @@
 DocType: Program,Program Name,程序名称
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,考虑税收或收费
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,实际数量是必须项
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0}目前拥有{1}供应商记分卡，而采购订单应谨慎提供给供应商。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0}目前拥有{1}供应商记分卡，而采购订单应谨慎提供给供应商。
 DocType: Employee Loan,Loan Type,贷款类型
 DocType: Scheduling Tool,Scheduling Tool,调度工具
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,信用卡
 DocType: BOM,Item to be manufactured or repacked,要生产或者重新包装的项目
 apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,仓储业务的默认设置。
-DocType: Purchase Invoice,Next Date,下次日期
 DocType: Employee Education,Major/Optional Subjects,主修/选修科目
-DocType: Sales Invoice Item,Drop Ship,落船
+DocType: Sales Invoice Item,Drop Ship,由供应商交货（直接发运）
+DocType: Hub Settings,Suspended,暂停
 DocType: Training Event,Attendees,与会者
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",在这里，您可以维系家庭的详细信息，如姓名的父母，配偶和子女及职业
 DocType: Academic Term,Term End Date,合同结束日期
-DocType: Hub Settings,Seller Name,卖家名称
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),已扣除税费（公司货币）
 DocType: Item Group,General Settings,常规设置
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,源货币和目标货币不能相同
-apps/erpnext/erpnext/utilities/user_progress.py +186,Add Instructors,添加教练
 DocType: Stock Entry,Repack,改装
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,在继续之前，您必须保存表单
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,请先选择公司
 DocType: Item Attribute,Numeric Values,数字值
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,附加标志
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,库存水平
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,库存水平
 DocType: Customer,Commission Rate,佣金率
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,为{1}创建{0}记分卡：
-apps/erpnext/erpnext/stock/doctype/item/item.js +338,Make Variant,在Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,在Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,按部门禁止假期申请。
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer",付款方式必须是接收之一，收费和内部转账
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics（分析）
@@ -5135,17 +5229,19 @@
 DocType: Production Order,Actual Operating Cost,实际运行成本
 DocType: Payment Entry,Cheque/Reference No,支票/参考编号
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,根不能被编辑。
-DocType: Item,Units of Measure,测量的单位
+DocType: Item,Units of Measure,计量单位
 DocType: Manufacturing Settings,Allow Production on Holidays,允许在假日生产
 DocType: Sales Order,Customer's Purchase Order Date,客户的采购订单日期
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,股本
 DocType: Shopping Cart Settings,Show Public Attachments,显示公共附件
 DocType: Packing Slip,Package Weight Details,包装重量详情
+DocType: Restaurant Reservation,Reservation Time,预订时间
 DocType: Payment Gateway Account,Payment Gateway Account,支付网关账户
-DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,支付完成后重定向用户选择的页面。
+DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,支付完成后将用户转到所选网页。
 DocType: Company,Existing Company,现有的公司
 DocType: Healthcare Settings,Result Emailed,电子邮件结果
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",税项类别已更改为“合计”，因为所有物品均为非库存物品
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,项目代码&gt;项目组&gt;品牌
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,请选择一个csv文件
 DocType: Student Leave Application,Mark as Present,标记为现
 DocType: Supplier Scorecard,Indicator Color,指示灯颜色
@@ -5159,7 +5255,7 @@
 DocType: Terms and Conditions,Terms and Conditions Help,条款和条件帮助
 ,Item-wise Purchase Register,逐项采购记录
 DocType: Batch,Expiry Date,到期时间
-DocType: Healthcare Settings,Employee name and designation in print,员工姓名和印刷品名称
+DocType: Healthcare Settings,Employee name and designation in print,打印出来显示的员工姓名和职位
 ,accounts-browser,账户浏览器
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +351,Please select Category first,属性是相同的两个记录。
 apps/erpnext/erpnext/config/projects.py +13,Project master.,项目主。
@@ -5170,17 +5266,17 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,让学生批
 DocType: Fee Schedule,FRQ.,FRQ。
 DocType: Leave Type,Is Carry Forward,是否顺延假期
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Get Items from BOM,从物料清单获取品目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,从物料清单获取物料
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,交货天数
 apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},行＃{0}：过帐日期必须是相同的购买日期{1}资产的{2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,如果学生住在学院的旅馆，请检查。
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,请在上表中输入销售订单
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,请在上表中输入销售订单
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,未提交工资单
 ,Stock Summary,库存摘要
 apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,从一个仓库转移资产到另一
 DocType: Vehicle,Petrol,汽油
 apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,材料清单
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：党的类型和党的需要应收/应付帐户{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：请为应收/应付科目输入{1}往来单位类型和往来单位
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,参考日期
 DocType: Employee,Reason for Leaving,离职原因
 DocType: BOM Operation,Operating Cost(Company Currency),营业成本（公司货币）
@@ -5190,5 +5286,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},行{0}：借记条目不能与连接的{1}
 DocType: Journal Entry,Subscription Section,认购科
 apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,科目{0}不存在
+DocType: Training Event,Training Program,培训计划
 DocType: Account,Cash,现金
 DocType: Employee,Short biography for website and other publications.,在网站或其他出版物使用的个人简介。
diff --git a/erpnext/utilities/product.py b/erpnext/utilities/product.py
index 1ad8b6e..10366be 100644
--- a/erpnext/utilities/product.py
+++ b/erpnext/utilities/product.py
@@ -16,7 +16,7 @@
 		warehouse = frappe.db.get_value("Item", template_item_code, item_warehouse_field)
 
 	if warehouse:
-		stock_qty = frappe.db.sql("""select actual_qty from tabBin where
+		stock_qty = frappe.db.sql("""select GREATEST(actual_qty - reserved_qty, 0) from tabBin where
 			item_code=%s and warehouse=%s""", (item_code, warehouse))
 		if stock_qty:
 			in_stock = stock_qty[0][0] > 0 and 1 or 0
diff --git a/erpnext/utilities/user_progress.py b/erpnext/utilities/user_progress.py
index 2509511..aa93c65 100644
--- a/erpnext/utilities/user_progress.py
+++ b/erpnext/utilities/user_progress.py
@@ -81,6 +81,24 @@
 				}
 			]
 		),
+
+		frappe._dict(
+			action_name='Add Letterhead',
+			domains=('Manufacturing', 'Services', 'Retail', 'Distribution', 'Education'),
+			title=_("Add Letterhead"),
+			help=_("Upload your letter head (Keep it web friendly as 900px by 100px)"),
+			fields=[
+				{"fieldtype":"Attach Image", "fieldname":"letterhead",
+					"is_private": 0,
+					"align": "center"
+				},
+			],
+			mandatory_entry=1,
+			submit_method="erpnext.utilities.user_progress_utils.create_letterhead",
+			done_state_title=_("Go to Letterheads"),
+			done_state_title_route=["List", "Letter Head"]
+		),
+
 		frappe._dict(
 			action_name='Add Suppliers',
 			domains=('Manufacturing', 'Services', 'Retail', 'Distribution'),
@@ -140,7 +158,7 @@
 			]
 		),
 
-		# School slides begin
+		# Education slides begin
 		frappe._dict(
 			action_name='Add Programs',
 			domains=("Education"),
@@ -219,7 +237,7 @@
 			done_state_title_route=["List", "Room"],
 			help_links=[]
 		),
-		# School slides end
+		# Education slides end
 
 		frappe._dict(
 			action_name='Add Users',
@@ -254,10 +272,9 @@
 	slides = []
 	slide_settings = get_slide_settings()
 
-	domain = frappe.db.get_value('Company', erpnext.get_default_company(), 'domain')
-
+	domains = frappe.get_active_domains()
 	for s in slide_settings:
-		if not s.domains or (domain and domain in s.domains):
+		if not s.domains or any(d in domains for d in s.domains):
 			s.mark_as_done_method = "erpnext.setup.doctype.setup_progress.setup_progress.set_action_completed_state"
 			s.done = get_action_completed_state(s.action_name) or 0
 			slides.append(s)
diff --git a/erpnext/utilities/user_progress_utils.py b/erpnext/utilities/user_progress_utils.py
index 709da57..08dd7ef 100644
--- a/erpnext/utilities/user_progress_utils.py
+++ b/erpnext/utilities/user_progress_utils.py
@@ -38,6 +38,21 @@
 				pass
 
 @frappe.whitelist()
+def create_letterhead(args_data):
+	args = json.loads(args_data)
+	letterhead = args.get("letterhead")
+	if letterhead:
+		try:
+			frappe.get_doc({
+					"doctype":"Letter Head",
+					"content":"""<div><img src="{0}" style='max-width: 100%%;'><br></div>""".format(letterhead),
+					"letter_head_name": _("Standard"),
+					"is_default": 1
+			}).insert()
+		except frappe.NameError:
+			pass
+
+@frappe.whitelist()
 def create_suppliers(args_data):
 	args = json.loads(args_data)
 	defaults = frappe.defaults.get_defaults()
@@ -117,7 +132,7 @@
 		"price_list_rate": item_price
 	}).insert()
 
-# Schools
+# Education
 @frappe.whitelist()
 def create_program(args_data):
 	args = json.loads(args_data)
diff --git a/license.txt b/license.txt
index 2a99aee..a238a97 100644
--- a/license.txt
+++ b/license.txt
@@ -663,7 +663,7 @@
 use an "about box".
 
 You should also get your employer (if you work as a programmer) or
-school, if any, to sign a "copyright disclaimer" for the program, if
+institute, if any, to sign a "copyright disclaimer" for the program, if
 necessary. For more information on this, and how to apply and follow
 the GNU GPL, see <http://www.gnu.org/licenses/>.
 
diff --git a/requirements.txt b/requirements.txt
index 0e81b15..a6cfaf2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,4 @@
 frappe
 unidecode
+pygithub
+googlemaps